diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 400349f15..000000000
--- a/.clang-format
+++ /dev/null
@@ -1,75 +0,0 @@
----
-BasedOnStyle: LLVM
-BreakBeforeBraces: Stroustrup
-IndentWidth: 4
-TabWidth: 4
-AlignAfterOpenBracket: AlwaysBreak
-AlignConsecutiveMacros: 'true'
-AlignConsecutiveAssignments: 'false'
-AlignConsecutiveDeclarations: 'false'
-AlignEscapedNewlines: Right
-AlignOperands: 'true'
-AlignTrailingComments: 'true'
-AllowAllArgumentsOnNextLine: 'false'
-AllowAllConstructorInitializersOnNextLine: 'false'
-AllowAllParametersOfDeclarationOnNextLine: 'false'
-AllowShortBlocksOnASingleLine: 'true'
-AllowShortCaseLabelsOnASingleLine: 'false'
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: Never
-AlwaysBreakAfterReturnType: None
-BinPackArguments: 'false'
-BinPackParameters: 'false'
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeTernaryOperators: 'true'
-BreakConstructorInitializers: BeforeComma
-BreakInheritanceList: BeforeComma
-CompactNamespaces: 'false'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
-ConstructorInitializerIndentWidth: '4'
-ContinuationIndentWidth: '4'
-Cpp11BracedListStyle: 'false'
-FixNamespaceComments: 'true'
-IncludeBlocks: Regroup
-IndentCaseLabels: 'true'
-IndentPPDirectives: None
-IndentWrappedFunctionNames: 'false'
-KeepEmptyLinesAtTheStartOfBlocks: 'false'
-MaxEmptyLinesToKeep: '1'
-NamespaceIndentation: None
-PointerAlignment: Left
-ReflowComments: 'true'
-SortIncludes: 'true'
-SortUsingDeclarations: 'true'
-SpaceAfterCStyleCast: 'false'
-SpaceAfterLogicalNot: 'true'
-SpaceAfterTemplateKeyword: 'true'
-SpaceBeforeAssignmentOperators: 'true'
-SpaceBeforeCpp11BracedList: 'true'
-SpaceBeforeCtorInitializerColon: 'true'
-SpaceBeforeInheritanceColon: 'true'
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: 'true'
-SpaceInEmptyParentheses: 'false'
-SpacesBeforeTrailingComments: '3'
-SpacesInAngles: 'false'
-SpacesInCStyleCastParentheses: 'false'
-SpacesInContainerLiterals: 'true'
-SpacesInParentheses: 'false'
-SpacesInSquareBrackets: 'false'
-UseTab: 'Always'
-
----
-Language: Cpp
-Standard: Cpp03
-ColumnLimit: '240'
----
-Language: ObjC
-ColumnLimit: '240'
----
-Language: Java
-ColumnLimit: '240'
----
-Language: CSharp
-ColumnLimit: '240'
-...
diff --git a/.clangd b/.clangd
deleted file mode 100644
index cd9c5e1db..000000000
--- a/.clangd
+++ /dev/null
@@ -1,9 +0,0 @@
-CompileFlags:
-  Add:
-    - "-std=c++17"
-    - "-I../ext"
-    - "-I../ext/prometheus-cpp-lite-1.0/core/include"
-    - "-I../ext/prometheus-cpp-lite-1.0/simpleapi/include"
-    - "-I./ext"
-    - "-I./ext/prometheus-cpp-lite-1.0/core/include"
-    - "-I./ext/prometheus-cpp-lite-1.0/simpleapi/include"
diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 4acef401c..000000000
--- a/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.git/
-workspace/
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index dbe5330ba..000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-ext/bin/tap-windows-ndis6/x64/zttap300.inf eol=crlf
-ext/bin/tap-windows-ndis6/x64.old/zttap300.inf eol=crlf
-ext/bin/tap-windows-ndis6/x86/zttap300.inf eol=crlf
-windows/TapDriver6/zttap300.inf eol=crlf
diff --git a/.github/ISSUE_TEMPLATE/bugs-and-issues.md b/.github/ISSUE_TEMPLATE/bugs-and-issues.md
deleted file mode 100644
index 92e6978c2..000000000
--- a/.github/ISSUE_TEMPLATE/bugs-and-issues.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Bugs and Issues
-about: Create a report to help us improve
-title: ''
-labels: NEEDS TRIAGE
-assignees: ''
-
----
-
-# Before filing a Bug Report
-
-_Using these will ensure you get quicker support, and make this space available for code-related issues. Thank you!_
-
-- [Docs Site](https://docs.zerotier.com/zerotier/troubleshooting) => Troubleshooting, quickstarts, and more advanced topics.
-- [Discuss Forum](https://discuss.zerotier.com/) => Our discussion forum for users and support to mutually resolve issues & suggest ideas.
-- [Reddit](https://www.reddit.com/r/zerotier/) => Our subreddit, which we monitor regularly and is fairly active.
-- [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview) => Older wiki.
-
-If you are having a connection issue, it's much easier to diagnose through the discussion forum or the ticket system. 
-
-
-# If you still want to file a Bug Report
-
-## Please let us know
-
-- What you expect to be happening.
-- What is actually happening?
-- Any steps to reproduce the error.
-- Any relevant console output or screenshots.
-- What operating system and ZeroTier version. Please try the latest ZeroTier release. 
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 5a1e094c3..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[Feature Request] "
-labels: suggestion
-assignees: ''
-
----
-
-If there is something you'd like to have added to ZeroTier, to go to https://discuss.zerotier.com/c/feature-requests/ instead. Issues there can be voted on and discussed in-depth.
-
-
-Thank you!
diff --git a/.github/ISSUE_TEMPLATE/game-connection-issue.md b/.github/ISSUE_TEMPLATE/game-connection-issue.md
deleted file mode 100644
index d7b3a9b2d..000000000
--- a/.github/ISSUE_TEMPLATE/game-connection-issue.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: Game Connection Issue
-about: Game issues are better served by forum posts
-title: Please go to our Discuss or Reddit for game-related issues. Thanks!
-labels: wontfix
-assignees: ''
-
----
-
-Are you having trouble connecting to a game on your virtual network after installing ZeroTier?
-
-- [ ] Yes
-- [ ] No
-
-If you answered yes, then it is very likely that your question would be better answered on our [Community Forums](https://discuss.zerotier.com) or [Reddit](https://www.reddit.com/r/zerotier/) community; we monitor both regularly. We also have extensive documentation on our [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview). Thank you!
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index fee6dd338..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-on:
-  pull_request:
-  push:
-  workflow_dispatch:
-
-jobs:
-  build_ubuntu:
-    runs-on: ubuntu-latest
-    steps:
-    - name: gitconfig
-      run: |
-        git config --global core.autocrlf input
-      #        git config --global core.eol lf
-    - name: checkout
-      uses: actions/checkout@v4
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        toolchain: stable
-        targets: x86_64-unknown-linux-gnu
-        components: rustfmt, clippy
-
-    - name: Set up cargo cache
-      uses: Swatinem/rust-cache@v2
-      continue-on-error: false
-      with:
-        key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
-        shared-key: ${{ runner.os }}-cargo-
-        workspaces: |
-          rustybits/
-
-    - name: make
-      run: make
-    - name: selftest
-      run: |
-        make selftest
-        ./zerotier-selftest
-    - name: 'Tar files' # keeps permissions (execute)
-      run: tar -cvf zerotier-one.tar zerotier-one
-    - name: Archive production artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: zerotier-one-ubuntu-x64
-        path: zerotier-one.tar
-        retention-days: 7
-
-  build_macos:
-    runs-on: macos-latest
-    steps:
-    - name: gitconfig
-      run: |
-        git config --global core.autocrlf input
-      #        git config --global core.eol lf
-    - name: checkout
-      uses: actions/checkout@v4
-    - name: Install Rust aarch64
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        toolchain: stable
-        target: aarch64-apple-darwin
-        components: rustfmt, clippy
-    - name: Install Rust x86_64
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        toolchain: stable
-        target: x86_64-apple-darwin
-        components: rustfmt, clippy
-    - name: Set up cargo cache
-      uses: Swatinem/rust-cache@v2
-      continue-on-error: false
-      with:
-        key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
-        shared-key: ${{ runner.os }}-cargo-
-        workspaces: |
-          rustybits/
-    - name: make
-      run: make
-    - name: selftest
-      run: |
-        make selftest
-        ./zerotier-selftest
-    - name: 'Tar files' # keeps permissions (execute)
-      run: tar -cvf zerotier-one.tar zerotier-one
-    - name: Archive production artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: zerotier-one-mac
-        path: zerotier-one.tar
-        retention-days: 7
-
-
-  build_windows:
-    runs-on: windows-latest
-    steps:
-    - name: gitconfig
-      run: |
-        git config --global core.autocrlf true
-      #        git config --global core.eol lf
-    - name: checkout
-      uses: actions/checkout@v4
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        toolchain: stable
-        target: aarch64-apple-darwin
-        components: rustfmt, clippy
-    - name: Set up cargo cache
-      uses: Swatinem/rust-cache@v2
-      continue-on-error: false
-      with:
-        key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
-        shared-key: ${{ runner.os }}-cargo-
-        workspaces: |
-          rustybits/
-
-    - name: setup msbuild
-      uses: microsoft/setup-msbuild@v2
-    - name: msbuild
-      run: |
-        msbuild windows\ZeroTierOne.sln /m /p:Configuration=Release  /property:Platform=x64 /t:ZeroTierOne
-    - name: Archive production artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: zerotier-one-windows
-        path: windows/Build
-        retention-days: 7
diff --git a/.github/workflows/validate-linux.sh b/.github/workflows/validate-linux.sh
deleted file mode 100755
index a661f6f6c..000000000
--- a/.github/workflows/validate-linux.sh
+++ /dev/null
@@ -1,497 +0,0 @@
-#!/bin/bash
-
-# This test script joins Earth and pokes some stuff
-
-TEST_NETWORK=8056c2e21c000001
-RUN_LENGTH=30
-TEST_FINISHED=false
-ZTO_VER=$(git describe --tags $(git rev-list --tags --max-count=1))
-ZTO_COMMIT=$(git rev-parse HEAD)
-ZTO_COMMIT_SHORT=$(git rev-parse --short HEAD)
-TEST_DIR_PREFIX="$ZTO_VER-$ZTO_COMMIT_SHORT-test-results"
-
-TEST_OK=0
-TEST_FAIL=1
-
-echo "Performing test on: $ZTO_VER-$ZTO_COMMIT_SHORT"
-TEST_FILEPATH_PREFIX="$TEST_DIR_PREFIX/$ZTO_COMMIT_SHORT"
-mkdir $TEST_DIR_PREFIX
-
-# How long we will wait for ZT to come online before considering it a failure
-MAX_WAIT_SECS=30
-
-ZT_PORT_NODE_1=9996
-ZT_PORT_NODE_2=9997
-
-################################################################################
-# Multi-node connectivity and performance test                                 #
-################################################################################
-
-test() {
-
-	echo -e "\nPerforming pre-flight checks"
-
-	check_exit_on_invalid_identity
-
-	echo -e "\nRunning test for $RUN_LENGTH seconds"
-
-	export NS1="ip netns exec ns1"
-	export NS2="ip netns exec ns2"
-
-	export ZT1="$NS1 ./zerotier-cli -p9996 -D$(pwd)/node1"
-	# Specify custom port on one node to ensure that feature works
-	export ZT2="$NS2 ./zerotier-cli -p9997 -D$(pwd)/node2"
-
-	echo -e "\nSetting up network namespaces..."
-	echo "Setting up ns1"
-
-	ip netns add ns1
-	$NS1 ip link set dev lo up
-	ip link add veth0 type veth peer name veth1
-	ip link set veth1 netns ns1
-	ip addr add 192.168.0.1/24 dev veth0
-	ip link set dev veth0 up
-
-	$NS1 ip addr add 192.168.0.2/24 dev veth1
-	$NS1 ip link set dev veth1 up
-
-	# Add default route
-	$NS1 ip route add default via 192.168.0.1
-
-	iptables -t nat -A POSTROUTING -s 192.168.0.0/255.255.255.0 \
-		-o eth0 -j MASQUERADE
-	iptables -A FORWARD -i eth0 -o veth0 -j ACCEPT
-	iptables -A FORWARD -o eth0 -i veth0 -j ACCEPT
-
-	echo "Setting up ns2"
-	ip netns add ns2
-	$NS2 ip link set dev lo up
-	ip link add veth2 type veth peer name veth3
-	ip link set veth3 netns ns2
-	ip addr add 192.168.1.1/24 dev veth2
-	ip link set dev veth2 up
-
-	$NS2 ip addr add 192.168.1.2/24 dev veth3
-	$NS2 ip link set dev veth3 up
-	$NS2 ip route add default via 192.168.1.1
-
-	iptables -t nat -A POSTROUTING -s 192.168.1.0/255.255.255.0 \
-		-o eth0 -j MASQUERADE
-	iptables -A FORWARD -i eth0 -o veth2 -j ACCEPT
-	iptables -A FORWARD -o eth0 -i veth2 -j ACCEPT
-
-	# Allow forwarding
-	sysctl -w net.ipv4.ip_forward=1
-
-	################################################################################
-	# Memory Leak Check                                                            #
-	################################################################################
-
-	export FILENAME_MEMORY_LOG="$TEST_FILEPATH_PREFIX-memory.log"
-
-	echo -e "\nStarting a ZeroTier instance in each namespace..."
-
-	export time_test_start=$(date +%s)
-
-	# Spam the CLI as ZeroTier is starting
-	spam_cli 100
-
-	echo "Starting memory leak check"
-	$NS1 sudo valgrind --demangle=yes --exit-on-first-error=yes \
-		--error-exitcode=1 \
-		--xml=yes \
-		--xml-file=$FILENAME_MEMORY_LOG \
-		--leak-check=full \
-		./zerotier-one node1 -p$ZT_PORT_NODE_1 -U >>node_1.log 2>&1 &
-
-	# Second instance, not run in memory profiler
-	# Don't set up internet access until _after_ zerotier is running
-	# This has been a source of stuckness in the past.
-	$NS2 ip addr del 192.168.1.2/24 dev veth3
-	$NS2 sudo ./zerotier-one node2 -U -p$ZT_PORT_NODE_2 >>node_2.log 2>&1 &
-
-	sleep 10; # New HTTP control plane is a bit sluggish, so we delay here
-
-	check_bind_to_correct_ports $ZT_PORT_NODE_1
-	check_bind_to_correct_ports $ZT_PORT_NODE_2
-
-	$NS2 ip addr add 192.168.1.2/24 dev veth3
-	$NS2 ip route add default via 192.168.1.1
-
-	echo -e "\nPing from host to namespaces"
-
-	ping -c 3 192.168.0.1
-	ping -c 3 192.168.1.1
-
-	echo -e "\nPing from namespace to host"
-
-	$NS1 ping -c 3 192.168.0.1
-	$NS1 ping -c 3 192.168.0.1
-	$NS2 ping -c 3 192.168.0.2
-	$NS2 ping -c 3 192.168.0.2
-
-	echo -e "\nPing from ns1 to ns2"
-
-	$NS1 ping -c 3 192.168.0.1
-
-	echo -e "\nPing from ns2 to ns1"
-
-	$NS2 ping -c 3 192.168.0.1
-
-	################################################################################
-	# Online Check                                                                 #
-	################################################################################
-
-	echo "Waiting for ZeroTier to come online before attempting test..."
-	node1_online=false
-	node2_online=false
-	both_instances_online=false
-	time_zt_node1_start=$(date +%s)
-	time_zt_node2_start=$(date +%s)
-
-	for ((s = 0; s <= $MAX_WAIT_SECS; s++)); do
-		node1_online="$($ZT1 -j info | jq '.online' 2>/dev/null)"
-		node2_online="$($ZT2 -j info | jq '.online' 2>/dev/null)"
-		echo "Checking for online status: try #$s, node1:$node1_online, node2:$node2_online"
-		if [[ "$node2_online" == "true" && "$node1_online" == "true" ]]; then
-			export both_instances_online=true
-			export time_to_both_nodes_online=$(date +%s)
-			break
-		fi
-		sleep 1
-	done
-
-	echo -e "\n\nContents of ZeroTier home paths:"
-
-	ls -lga node1
-	tree node1
-	ls -lga node2
-	tree node2
-
-	echo -e "\n\nRunning ZeroTier processes:"
-	echo -e "\nNode 1:\n"
-	$NS1 ps aux | grep zerotier-one
-	echo -e "\nNode 2:\n"
-	$NS2 ps aux | grep zerotier-one
-
-	echo -e "\n\nStatus of each instance:"
-
-	echo -e "\n\nNode 1:\n"
-	$ZT1 status
-	echo -e "\n\nNode 2:\n"
-	$ZT2 status
-
-	if [[ "$both_instances_online" != "true" ]]; then
-		exit_test_and_generate_report $TEST_FAIL "one or more nodes failed to come online"
-	fi
-
-	echo -e "\nJoining networks"
-
-	$ZT1 join $TEST_NETWORK
-	$ZT2 join $TEST_NETWORK
-
-	sleep 10
-
-	node1_ip4=$($ZT1 get $TEST_NETWORK ip4)
-	node2_ip4=$($ZT2 get $TEST_NETWORK ip4)
-
-	echo "node1_ip4=$node1_ip4"
-	echo "node2_ip4=$node2_ip4"
-
-	echo -e "\nPinging each node"
-
-	PING12_FILENAME="$TEST_FILEPATH_PREFIX-ping-1-to-2.txt"
-	PING21_FILENAME="$TEST_FILEPATH_PREFIX-ping-2-to-1.txt"
-
-	$NS1 ping -c 16 $node2_ip4 >$PING12_FILENAME
-	$NS2 ping -c 16 $node1_ip4 >$PING21_FILENAME
-
-	ping_loss_percent_1_to_2=$(cat $PING12_FILENAME |
-		grep "packet loss" | awk '{print $6}' | sed 's/%//')
-	ping_loss_percent_2_to_1=$(cat $PING21_FILENAME |
-		grep "packet loss" | awk '{print $6}' | sed 's/%//')
-
-	# Normalize loss value
-	export ping_loss_percent_1_to_2=$(echo "scale=2; $ping_loss_percent_1_to_2/100.0" | bc)
-	export ping_loss_percent_2_to_1=$(echo "scale=2; $ping_loss_percent_2_to_1/100.0" | bc)
-
-	################################################################################
-	# CLI Check                                                                    #
-	################################################################################
-
-	echo "Testing basic CLI functionality..."
-
-	spam_cli 10
-
-	$ZT1 join $TEST_NETWORK
-
-	$ZT1 -h
-	$ZT1 -v
-	$ZT1 status
-	$ZT1 info
-	$ZT1 listnetworks
-	$ZT1 peers
-	$ZT1 listpeers
-
-	$ZT1 -j status
-	$ZT1 -j info
-	$ZT1 -j listnetworks
-	$ZT1 -j peers
-	$ZT1 -j listpeers
-
-	$ZT1 dump
-
-	$ZT1 get $TEST_NETWORK allowDNS
-	$ZT1 get $TEST_NETWORK allowDefault
-	$ZT1 get $TEST_NETWORK allowGlobal
-	$ZT1 get $TEST_NETWORK allowManaged
-	$ZT1 get $TEST_NETWORK bridge
-	$ZT1 get $TEST_NETWORK broadcastEnabled
-	$ZT1 get $TEST_NETWORK dhcp
-	$ZT1 get $TEST_NETWORK id
-	$ZT1 get $TEST_NETWORK mac
-	$ZT1 get $TEST_NETWORK mtu
-	$ZT1 get $TEST_NETWORK name
-	$ZT1 get $TEST_NETWORK netconfRevision
-	$ZT1 get $TEST_NETWORK nwid
-	$ZT1 get $TEST_NETWORK portDeviceName
-	$ZT1 get $TEST_NETWORK portError
-	$ZT1 get $TEST_NETWORK status
-	$ZT1 get $TEST_NETWORK type
-
-	# Test an invalid command
-	$ZT1 get $TEST_NETWORK derpderp
-
-	# TODO: Validate JSON
-
-	# Performance Test
-
-	export FILENAME_PERF_JSON="$TEST_FILEPATH_PREFIX-iperf.json"
-
-	echo -e "\nBeginning performance test:"
-
-	echo -e "\nStarting server:"
-
-	echo "$NS1 iperf3 -s &"
-	sleep 1
-
-	echo -e "\nStarting client:"
-	sleep 1
-
-	echo "$NS2 iperf3 --json -c $node1_ip4 > $FILENAME_PERF_JSON"
-
-	cat $FILENAME_PERF_JSON
-
-	# Let ZeroTier idle long enough for various timers
-
-	echo -e "\nIdling ZeroTier for $RUN_LENGTH seconds..."
-	sleep $RUN_LENGTH
-
-	echo -e "\nLeaving networks"
-
-	$ZT1 leave $TEST_NETWORK
-	$ZT2 leave $TEST_NETWORK
-
-	sleep 5
-
-	exit_test_and_generate_report $TEST_OK "completed test"
-}
-
-################################################################################
-# Generate report                                                              #
-################################################################################
-
-exit_test_and_generate_report() {
-
-	echo -e "\nStopping memory check..."
-	sudo pkill -15 -f valgrind
-	sleep 10
-
-	time_test_end=$(date +%s)
-
-	echo "Exiting test with reason: $2 ($1)"
-
-	# Collect ZeroTier dump files
-
-	echo -e "\nCollecting ZeroTier dump files"
-
-	node1_id=$($ZT1 -j status | jq -r .address)
-	node2_id=$($ZT2 -j status | jq -r .address)
-
-	$ZT1 dump
-	mv zerotier_dump.txt "$TEST_FILEPATH_PREFIX-node-dump-$node1_id.txt"
-
-	$ZT2 dump
-	mv zerotier_dump.txt "$TEST_FILEPATH_PREFIX-node-dump-$node2_id.txt"
-
-	# Copy ZeroTier stdout/stderr logs
-
-	cp node_1.log "$TEST_FILEPATH_PREFIX-node-log-$node1_id.txt"
-	cp node_2.log "$TEST_FILEPATH_PREFIX-node-log-$node2_id.txt"
-
-	# Generate report
-
-	cat $FILENAME_MEMORY_LOG
-
-	DEFINITELY_LOST=$(xmlstarlet sel -t -v '/valgrindoutput/error/xwhat' \
-		$FILENAME_MEMORY_LOG | grep "definitely" | awk '{print $1;}')
-	POSSIBLY_LOST=$(xmlstarlet sel -t -v '/valgrindoutput/error/xwhat' \
-		$FILENAME_MEMORY_LOG | grep "possibly" | awk '{print $1;}')
-
-	# Generate coverage report artifact and summary
-
-	FILENAME_COVERAGE_JSON="$TEST_FILEPATH_PREFIX-coverage.json"
-	FILENAME_COVERAGE_HTML="$TEST_FILEPATH_PREFIX-coverage.html"
-
-	echo -e "\nGenerating coverage test report..."
-
-	gcovr -r . --exclude ext --json-summary $FILENAME_COVERAGE_JSON \
-		--html >$FILENAME_COVERAGE_HTML
-
-	cat $FILENAME_COVERAGE_JSON
-
-	COVERAGE_LINE_COVERED=$(cat $FILENAME_COVERAGE_JSON | jq .line_covered)
-	COVERAGE_LINE_TOTAL=$(cat $FILENAME_COVERAGE_JSON | jq .line_total)
-	COVERAGE_LINE_PERCENT=$(cat $FILENAME_COVERAGE_JSON | jq .line_percent)
-
-	COVERAGE_LINE_COVERED="${COVERAGE_LINE_COVERED:-0}"
-	COVERAGE_LINE_TOTAL="${COVERAGE_LINE_TOTAL:-0}"
-	COVERAGE_LINE_PERCENT="${COVERAGE_LINE_PERCENT:-0}"
-
-	# Default values
-
-	DEFINITELY_LOST="${DEFINITELY_LOST:-0}"
-	POSSIBLY_LOST="${POSSIBLY_LOST:-0}"
-	ping_loss_percent_1_to_2="${ping_loss_percent_1_to_2:-100.0}"
-	ping_loss_percent_2_to_1="${ping_loss_percent_2_to_1:-100.0}"
-	time_to_both_nodes_online="${time_to_both_nodes_online:--1}"
-
-	# Summarize and emit json for trend reporting
-
-	FILENAME_SUMMARY="$TEST_FILEPATH_PREFIX-summary.json"
-
-	time_length_test=$((time_test_end - time_test_start))
-	if [[ $time_to_both_nodes_online != -1 ]];
-	then
-		time_to_both_nodes_online=$((time_to_both_nodes_online - time_test_start))
-	fi
-	#time_length_zt_join=$((time_zt_join_end-time_zt_join_start))
-	#time_length_zt_leave=$((time_zt_leave_end-time_zt_leave_start))
-	#time_length_zt_can_still_ping=$((time_zt_can_still_ping-time_zt_leave_start))
-
-	summary=$(
-		cat <<EOF
-{
-  "version":"$ZTO_VER",
-  "commit":"$ZTO_COMMIT",
-  "arch_m":"$(uname -m)",
-  "arch_a":"$(uname -a)",
-  "binary_size":"$(stat -c %s zerotier-one)",
-  "time_length_test":$time_length_test,
-  "time_to_both_nodes_online":$time_to_both_nodes_online,
-  "num_possible_bytes_lost": $POSSIBLY_LOST,
-  "num_definite_bytes_lost": $DEFINITELY_LOST,
-  "num_bad_formattings": $POSSIBLY_LOST,
-  "coverage_lines_covered": $COVERAGE_LINE_COVERED,
-  "coverage_lines_total": $COVERAGE_LINE_TOTAL,
-  "coverage_lines_percent": $COVERAGE_LINE_PERCENT,
-  "ping_loss_percent_1_to_2": $ping_loss_percent_1_to_2,
-  "ping_loss_percent_2_to_1": $ping_loss_percent_2_to_1,
-  "test_exit_code": $1,
-  "test_exit_reason":"$2"
-}
-EOF
-	)
-
-	echo $summary >$FILENAME_SUMMARY
-	cat $FILENAME_SUMMARY
-
-	exit 0
-}
-
-################################################################################
-# CLI Check                                                                    #
-################################################################################
-
-spam_cli() {
-	echo "Spamming CLI..."
-	# Rapidly spam the CLI with joins/leaves
-
-	MAX_TRIES="${1:-10}"
-
-	for ((s = 0; s <= MAX_TRIES; s++)); do
-		$ZT1 status
-		$ZT2 status
-		sleep 0.1
-	done
-
-	SPAM_TRIES=128
-
-	for ((s = 0; s <= SPAM_TRIES; s++)); do
-		$ZT1 join $TEST_NETWORK
-	done
-
-	for ((s = 0; s <= SPAM_TRIES; s++)); do
-		$ZT1 leave $TEST_NETWORK
-	done
-
-	for ((s = 0; s <= SPAM_TRIES; s++)); do
-		$ZT1 leave $TEST_NETWORK
-		$ZT1 join $TEST_NETWORK
-	done
-}
-
-################################################################################
-# Check for proper exit on load of invalid identity                            #
-################################################################################
-
-check_exit_on_invalid_identity() {
-	echo "Checking ZeroTier exits on invalid identity..."
-	mkdir -p $(pwd)/exit_test
-	ZT1="sudo ./zerotier-one -p9999 $(pwd)/exit_test"
-	echo "asdfasdfasdfasdf" > $(pwd)/exit_test/identity.secret
-	echo "asdfasdfasdfasdf" > $(pwd)/exit_test/authtoken.secret
-
-	echo "Launch ZeroTier with an invalid identity"
-	$ZT1 &
-	my_pid=$!
-
-	echo "Waiting 5 seconds"
-	sleep 5
-
-	# check if process is running
-	kill -0 $my_pid
-	if [ $? -eq 0 ]; then
-		exit_test_and_generate_report $TEST_FAIL "Exit test FAILED: Process still running after being fed an invalid identity"
-	fi
-}
-
-################################################################################
-# Check that we're binding to the primary port for TCP/TCP6/UDP                #
-################################################################################
-
-check_bind_to_correct_ports() {
-	PORT_NUMBER=$1
-	echo "Checking bound ports:"
-	sudo netstat -anp | grep "$PORT_NUMBER" | grep "zerotier"
-	if [[ $(sudo netstat -anp | grep "$PORT_NUMBER" | grep "zerotier" | grep "tcp") ]];
-	then
-		:
-	else
-		exit_test_and_generate_report $TEST_FAIL "ZeroTier did not bind to tcp/$1"
-	fi
-	if [[ $(sudo netstat -anp | grep "$PORT_NUMBER" | grep "zerotier" | grep "tcp6") ]];
-	then
-		:
-	else
-		exit_test_and_generate_report $TEST_FAIL "ZeroTier did not bind to tcp6/$1"
-	fi
-	if [[ $(sudo netstat -anp | grep "$PORT_NUMBER" | grep "zerotier" | grep "udp") ]];
-	then
-		:
-	else
-		exit_test_and_generate_report $TEST_FAIL "ZeroTier did not bind to udp/$1"
-	fi
-}
-
-test "$@"
diff --git a/.github/workflows/validate-report.sh b/.github/workflows/validate-report.sh
deleted file mode 100755
index 3ae4e1a16..000000000
--- a/.github/workflows/validate-report.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-################################################################################
-# Set exit code depending on tool reports                                      #
-################################################################################
-
-DEFINITELY_LOST=$(cat *test-results/*summary.json | jq .num_definite_bytes_lost)
-EXIT_CODE=$(cat *test-results/*summary.json | jq .exit_code)
-EXIT_REASON=$(cat *test-results/*summary.json | jq .exit_reason)
-
-cat *test-results/*summary.json
-
-echo -e "\nBytes of memory definitely lost: $DEFINITELY_LOST"
-
-if [[ "$DEFINITELY_LOST" -gt 0 ]]; then
-      exit 1
-fi
-
-# Catch-all for other non-zero exit codes
-
-if [[ "$EXIT_CODE" -gt 0 ]]; then
-      echo "Test failed: $EXIT_REASON"
-      exit 1
-fi
\ No newline at end of file
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
deleted file mode 100644
index bbc107660..000000000
--- a/.github/workflows/validate.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-on:
-  pull_request:
-  push:
-  workflow_dispatch:
-
-jobs:
-  build_ubuntu:
-    runs-on: ubuntu-latest
-    steps:
-    - name: gitconfig
-      run: |
-        git config --global core.autocrlf input
-
-    - name: checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        target: x86_64-unknown-linux-gnu
-        override: true
-        components: rustfmt, clippy
-
-    - name: Set up cargo cache
-      uses: Swatinem/rust-cache@v2
-      continue-on-error: false
-      with:
-        key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
-        shared-key: ${{ runner.os }}-cargo-
-        workspaces: |
-          zeroidc/
-
-    - name: validate-1m-linux
-      env:
-        CC: 'gcc'
-        CXX: 'g++'
-        BRANCH: ${{  github.ref_name }}
-      run: |
-        sudo apt update && sudo apt install -y valgrind xmlstarlet gcovr iperf3 tree
-        make one ZT_COVERAGE=1 ZT_TRACE=1
-        sudo chmod +x ./.github/workflows/validate-linux.sh
-        sudo ./.github/workflows/validate-linux.sh
-
-    - name: Archive test results
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{github.sha}}-test-results
-        path: "*test-results*"
-
-    - name: final-report
-      run: |
-        sudo chmod +x ./.github/workflows/validate-report.sh
-        sudo ./.github/workflows/validate-report.sh
-
diff --git a/.gitignore b/.gitignore
index 04a7d1eac..9c87a061e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,10 @@
 # Main binaries created in *nix builds
-/zerotier-one
-/zerotier-idtool
-/zerotier-cli
-/zerotier-selftest
-/zerotier
-/nltest
-
-# IDE stuff
-/.idea
-/.nova
-/compile_commands.json
+/zerotier-*
 
 # OS-created garbage files from various platforms
 .DS_Store
 .Apple*
 Thumbs.db
-@eaDir
-._*
 
 # Windows build droppings
 /windows/ZeroTierOne.sdf
@@ -33,19 +21,10 @@ Thumbs.db
 /windows/Release
 /windows/WebUIWrapper/bin
 /windows/WebUIWrapper/obj
-/windows/lib
 /ext/installfiles/windows/ZeroTier One-SetupFiles
+/ext/installfiles/windows/Prerequisites
 /ext/installfiles/windows/*-cache
 /ZeroTier One.msi
-*.vcxproj.backup
-/windows/TapDriver6/Win7Debug
-/windows/TapDriver6/win7Release
-/windows/*.db
-/windows/*.opendb
-enc_temp_folder
-/windows/copyutil/bin
-/windows/copyutil/obj
-.vs/
 
 # *nix/Mac build droppings
 /build-*
@@ -54,19 +33,18 @@ enc_temp_folder
 /examples/docker/test-*.env
 /world/mkworld
 /world/*.c25519
-zt1-src.tar.gz
-/MacEthernetTapAgent
 
 # Miscellaneous temporaries, build files, etc.
 *.log
 *.opensdf
 *.user
 *.cache
+*.obj
 *.tlog
 *.pid
 *.pkg
 *.o
-/*.a
+*.a
 *.dylib
 *.so
 *.so.*
@@ -78,13 +56,16 @@ zt1-src.tar.gz
 *.tmp
 .depend
 node_modules
-zt1_update_*
-debian/files
-debian/zerotier-one
-debian/zerotier-one*.debhelper
-debian/*.log
-debian/zerotier-one.substvars
-root-watcher/config.json
+cluster-geo/cluster-geo/config.js
+cluster-geo/cluster-geo/cache.*
+tests/http/zerotier-one
+tests/http/big-test-hosts
+netcon/httpstub
+
+# MacGap wrapper build files
+/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/*
+/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/xcuserdata/*
+/ext/mac-ui-macgap1-wrapper/src/build
 
 # Java/Android/JNI build droppings
 java/obj/
@@ -98,46 +79,5 @@ java/build_win32/
 windows/WinUI/obj/
 windows/WinUI/bin/
 windows/ZeroTierOne/Debug/
-/ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg
-
-# Miscellaneous mac/Xcode droppings
-.DS_Store
-.Trashes
-*.swp
-*~.nib
-DerivedData/
-*.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
-!default.pbxuser
-!default.mode1v3
-!default.mode2v3
-!default.perspectivev3
-*.xccheckout
-xcuserdata/
-.vscode
-__pycache__
-*~
-attic/world/*.c25519
-attic/world/mkworld
-workspace/
-workspace2/
-zeroidc/target/
-tcp-proxy/target
-
-#snapcraft specifics
-/parts/
-/stage/
-/prime/
-
-*.snap
-
-.snapcraft
-__pycache__
-*.pyc
-*_source.tar.bz2
-snap/.snapcraft
-tcp-proxy/tcp-proxy
-rustybits/target
-ext/installfiles/windows/*.back*.aip
+/doc/*.1
+/doc/*.8
diff --git a/AUTHORS.md b/AUTHORS.md
new file mode 100644
index 000000000..6b21f572e
--- /dev/null
+++ b/AUTHORS.md
@@ -0,0 +1,77 @@
+## Primary Authors
+
+ * ZeroTier protocol design and core network virtualization engine, ZeroTier One service, React web UI, packaging for most platforms, kitchen sink...<br>
+   Adam Ierymenko / adam.ierymenko@zerotier.com
+
+ * Java JNI Interface to enable Android application development, and Android app itself (code for that is elsewhere)<br>
+   Grant Limberg / glimberg@gmail.com
+
+ * Network Containers for Linux, iOS, Android<br>
+   Joseph Henry / joseph.henry@zerotier.com
+
+## Third Party Contributors
+
+ * A number of fixes and improvements to the new controller, other stuff.<br>
+   Kees Bos / https://github.com/keesbos/
+
+ * Debugging and testing, OpenWRT support fixes.<br>
+   Moritz Warning / moritzwarning@web.de
+
+ * Debian GNU/Linux packaging, manual pages, and license compliance edits.<br>
+   Ben Finney <ben+zerotier@benfinney.id.au>
+
+ * Several others made smaller contributions, which GitHub tracks here:<br>
+   https://github.com/zerotier/ZeroTierOne/graphs/contributors/
+
+## Third-Party Code
+
+ * LZ4 compression algorithm by Yann Collet
+
+   * Files: ext/lz4/*
+   * Home page: http://code.google.com/p/lz4/
+   * License grant: BSD attribution
+
+ * http-parser by Joyent, Inc. (many authors)
+
+   * Files: ext/http-parser/*
+   * Home page: https://github.com/joyent/http-parser/
+   * License grant: MIT/Expat
+
+ * json-parser by James McLaughlin
+
+   * Files: ext/json-parser/*
+   * Home page: https://github.com/udp/json-parser/
+   * License grant: BSD attribution
+
+ * TunTapOSX by Mattias Nissler
+
+   * Files: ext/tap-mac/tuntap/*
+   * Home page: http://tuntaposx.sourceforge.net/
+   * License grant: BSD attribution no-endorsement
+
+ * tap-windows and tap-windows6 by the OpenVPN project
+
+   * Files: windows/TapDriver6/*
+   * Home page:
+       https://github.com/OpenVPN/tap-windows/
+       https://github.com/OpenVPN/tap-windows6/
+   * License grant: GNU GPL v2
+
+ * Salsa20 stream cipher, Curve25519 elliptic curve cipher, Ed25519
+   digital signature algorithm, and Poly1305 MAC algorithm, all by
+   Daniel J. Bernstein
+
+   * Files:
+       node/Salsa20.hpp
+       node/C25519.hpp
+       node/Poly1305.hpp
+   * Home page: http://cr.yp.to/
+   * License grant: public domain
+
+ * MiniUPNPC by Thomas Bernard
+
+   * Files:
+       ext/libnatpmp/*
+       ext/miniupnpc/*
+   * Home page: http://miniupnp.free.fr/
+   * License grant: BSD attribution no-endorsement
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index fff7808e1..000000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# CMake build script for libzerotiercore.a
-
-cmake_minimum_required (VERSION 2.8)
-project (zerotiercore)
-
-set (PROJ_DIR ${PROJECT_SOURCE_DIR})
-set (ZT_DEFS -std=c++11)
-
-file(GLOB core_src_glob ${PROJ_DIR}/node/*.cpp)
-add_library(zerotiercore STATIC ${core_src_glob})
-
-target_compile_options(zerotiercore PRIVATE ${ZT_DEFS})
diff --git a/COPYING b/COPYING
index 7f0801e20..23d42dfa1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,8 +1,13 @@
 ZeroTier One, an endpoint server for the ZeroTier virtual network layer.
-Copyright © 2011–2019 ZeroTier, Inc.
+Copyright © 2011–2016 ZeroTier, Inc.
 
-ZeroTier is released under the terms of the BUSL version 1.1. See the
-file LICENSE.txt for details.
+ZeroTier One is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or (at
+your option) any later version.
+
+See the file ‘LICENSE.GPL-3’ for the text of the GNU GPL version 3.
+If that file is not present, see <http://www.gnu.org/licenses/>.
 
 ..
     Local variables:
diff --git a/Dockerfile.ci b/Dockerfile.ci
deleted file mode 100644
index 9ff3b011a..000000000
--- a/Dockerfile.ci
+++ /dev/null
@@ -1,28 +0,0 @@
-# vim: ft=dockerfile
-
-FROM ubuntu:21.04 as stage
-
-RUN apt-get update -qq && apt-get -qq install make clang
-COPY . .
-RUN /usr/bin/make
-RUN echo $PWD
-RUN cp zerotier-one /usr/sbin
-
-FROM ubuntu:21.04
-
-COPY --from=stage /zerotier-one /usr/sbin
-RUN ln -sf /usr/sbin/zerotier-one /usr/sbin/zerotier-idtool
-RUN ln -sf /usr/sbin/zerotier-one /usr/sbin/zerotier-cli
-
-RUN echo "${VERSION}" > /etc/zerotier-version
-RUN rm -rf /var/lib/zerotier-one
-
-
-RUN apt-get -qq update
-RUN apt-get -qq install iproute2 net-tools fping 2ping iputils-ping iputils-arping
-
-COPY entrypoint.sh.release /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-
-CMD []
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/Dockerfile.release b/Dockerfile.release
deleted file mode 100644
index 2a289cead..000000000
--- a/Dockerfile.release
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim: ft=dockerfile
-
-FROM debian:bookworm
-
-ARG VERSION
-
-RUN apt-get update -qq && apt-get install curl gpg -y
-RUN mkdir -p /usr/share/zerotier && \
-    curl -o /usr/share/zerotier/tmp.asc "https://download.zerotier.com/contact%40zerotier.com.gpg" && \
-    gpg --no-default-keyring --keyring /usr/share/zerotier/zerotier.gpg --import /usr/share/zerotier/tmp.asc && \
-    rm -f /usr/share/zerotier/tmp.asc && \
-    echo "deb [signed-by=/usr/share/zerotier/zerotier.gpg] http://download.zerotier.com/debian/bookworm bookworm main" > /etc/apt/sources.list.d/zerotier.list
-
-RUN apt-get update -qq && apt-get install zerotier-one=${VERSION} curl iproute2 net-tools iputils-ping openssl libssl3 -y
-RUN rm -rf /var/lib/zerotier-one
-
-COPY entrypoint.sh.release /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-
-HEALTHCHECK --interval=1s CMD bash /healthcheck.sh
-
-CMD []
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/LICENSE.GPL-2 b/LICENSE.GPL-2
new file mode 100644
index 000000000..d159169d1
--- /dev/null
+++ b/LICENSE.GPL-2
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/attic/historic/anode/LICENSE.txt b/LICENSE.GPL-3
similarity index 100%
rename from attic/historic/anode/LICENSE.txt
rename to LICENSE.GPL-3
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 06a3fad64..000000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,149 +0,0 @@
------------------------------------------------------------------------------
-
-Business Source License 1.1
-
-License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
-"Business Source License" is a trademark of MariaDB Corporation Ab.
-
------------------------------------------------------------------------------
-
-Parameters
-
-Licensor:             ZeroTier, Inc.
-Licensed Work:        ZeroTier Network Virtualization Engine 1.4.4
-                      The Licensed Work is (c)2019 ZeroTier, Inc.
-Additional Use Grant: You may make use of the Licensed Work, provided you
-                      do not use it in any of the following ways:
-
-                      * Sell hosted ZeroTier services as a "SaaS" Product
-
-                      (1) Operate or sell access to ZeroTier root servers,
-                      network controllers, or authorization key or certificate
-                      generation components of the Licensed Work as a
-                      for-profit service, regardless of whether the use of
-                      these components is sold alone or is bundled with other
-                      services. Note that this does not apply to the use of
-                      ZeroTier behind the scenes to operate a service not
-                      related to ZeroTier network administration.
-
-                      * Create Non-Open-Source Commercial Derivative Works
-
-                      (2) Link or directly include the Licensed Work in a
-                      commercial or for-profit application or other product
-                      not distributed under an Open Source Initiative (OSI)
-                      compliant license. See: https://opensource.org/licenses
-
-                      (3) Remove the name, logo, copyright, or other branding
-                      material from the Licensed Work to create a "rebranded"
-                      or "white labeled" version to distribute as part of
-                      any commercial or for-profit product or service.
-
-                      * Certain Government Uses
-
-                      (4) Use or deploy the Licensed Work in a government
-                      setting in support of any active government function
-                      or operation with the exception of the following:
-                      physical or mental health care, family and social
-                      services, social welfare, senior care, child care, and
-                      the care of persons with disabilities.
-
-Change Date:          2026-01-01
-
-Change License:       Apache License version 2.0 as published by the Apache
-                      Software Foundation
-											https://www.apache.org/licenses/
-
-Alternative Licensing
-
-If you would like to use the Licensed Work in any way that conflicts with
-the stipulations of the Additional Use Grant, contact ZeroTier, Inc. to
-obtain an alternative commercial license.
-
-Visit us on the web at: https://www.zerotier.com/
-
-Notice
-
-The Business Source License (this document, or the "License") is not an Open
-Source license. However, the Licensed Work will eventually be made available
-under an Open Source License, as stated in this License.
-
-For more information on the use of the Business Source License for ZeroTier
-products, please visit our pricing page which contains license details and
-and license FAQ: https://zerotier.com/pricing
-
-For more information on the use of the Business Source License generally,
-please visit the Adopting and Developing Business Source License FAQ at
-https://mariadb.com/bsl-faq-adopting.
-
------------------------------------------------------------------------------
-
-Business Source License 1.1
-
-Terms
-
-The Licensor hereby grants you the right to copy, modify, create derivative
-works, redistribute, and make non-production use of the Licensed Work. The
-Licensor may make an Additional Use Grant, above, permitting limited
-production use.
-
-Effective on the Change Date, or the fourth anniversary of the first publicly
-available distribution of a specific version of the Licensed Work under this
-License, whichever comes first, the Licensor hereby grants you rights under
-the terms of the Change License, and the rights granted in the paragraph
-above terminate.
-
-If your use of the Licensed Work does not comply with the requirements
-currently in effect as described in this License, you must purchase a
-commercial license from the Licensor, its affiliated entities, or authorized
-resellers, or you must refrain from using the Licensed Work.
-
-All copies of the original and modified Licensed Work, and derivative works
-of the Licensed Work, are subject to this License. This License applies
-separately for each version of the Licensed Work and the Change Date may vary
-for each version of the Licensed Work released by Licensor.
-
-You must conspicuously display this License on each original or modified copy
-of the Licensed Work. If you receive the Licensed Work in original or
-modified form from a third party, the terms and conditions set forth in this
-License apply to your use of that work.
-
-Any use of the Licensed Work in violation of this License will automatically
-terminate your rights under this License for the current and all other
-versions of the Licensed Work.
-
-This License does not grant you any right in any trademark or logo of
-Licensor or its affiliates (provided that you may use a trademark or logo of
-Licensor as expressly required by this License).
-
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
-AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
-EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
-TITLE.
-
------------------------------------------------------------------------------
-
-MariaDB hereby grants you permission to use this License’s text to license
-your works, and to refer to it using the trademark "Business Source License",
-as long as you comply with the Covenants of Licensor below.
-
-Covenants of Licensor
-
-In consideration of the right to use this License’s text and the "Business
-Source License" name and trademark, Licensor covenants to MariaDB, and to all
-other recipients of the licensed work to be provided by Licensor:
-
-1. To specify as the Change License the GPL Version 2.0 or any later version,
-   or a license that is compatible with GPL Version 2.0 or a later version,
-   where "compatible" means that software provided under the Change License can
-   be included in a program with software provided under GPL Version 2.0 or a
-   later version. Licensor may specify additional Change Licenses without
-   limitation.
-
-2. To either: (a) specify an additional grant of rights to use that does not
-   impose any additional restriction on the right granted in this License, as
-   the Additional Use Grant; or (b) insert the text "None".
-
-3. To specify a Change Date.
-
-4. Not to modify this License in any other way.
diff --git a/Makefile b/Makefile
index f77767fb8..5a5f6605e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,26 +11,8 @@ ifeq ($(OSTYPE),Linux)
 endif
 
 ifeq ($(OSTYPE),FreeBSD)
-	CC=clang
-	CXX=clang++
-	ZT_BUILD_PLATFORM=7
-	include make-bsd.mk
+	include make-freebsd.mk
 endif
 ifeq ($(OSTYPE),OpenBSD)
-	CC=clang
-	CXX=clang++
-	ZT_BUILD_PLATFORM=9
-	include make-bsd.mk
+	include make-freebsd.mk
 endif
-
-ifeq ($(OSTYPE),NetBSD)
-	include make-netbsd.mk
-endif
-
-drone:
-	@echo "rendering .drone.yaml from .drone.jsonnet"
-	drone jsonnet --format --stream
-	drone sign zerotier/ZeroTierOne --save
-
-clang-format:
-	find node osdep service tcp-proxy controller -iname '*.cpp' -o -iname '*.hpp' | xargs clang-format -i
diff --git a/OFFICIAL-RELEASE-STEPS.md b/OFFICIAL-RELEASE-STEPS.md
deleted file mode 100644
index 0c198bd68..000000000
--- a/OFFICIAL-RELEASE-STEPS.md
+++ /dev/null
@@ -1,33 +0,0 @@
-ZeroTier Official Release Steps
-======
-
-This is mostly for ZeroTier internal use, but others who want to do builds might find it helpful.
-
-Note: Many of these steps will require GPG and other signing keys that are kept in cold storage and must be mounted.
-
-# Bumping the Version and Preparing Installers
-
-The version must be incremented in all of the following files:
-
-    /version.h
-    /zerotier-one.spec
-    /debian/changelog
-    /ext/installfiles/mac/ZeroTier One.pkgproj
-    /ext/installfiles/windows/ZeroTier One.aip
-  ../DesktopUI/mac-app-template/ZeroTier.app/Contents/Info.plist
-
-The final .AIP file can only be edited on Windows with [Advanced Installer Enterprise](http://www.advancedinstaller.com/). In addition to incrementing the version be sure that a new product code is generated. (The "upgrade code" GUID on the other hand must never change.)
-
-# Building for Supported Platforms
-
-## Macintosh
-
-Mac's easy. Just type:
-
-    make official
-
-You will need [Packages](http://s.sudre.free.fr/Software/Packages/about.html) and our release signing key in the keychain.
-
-## Windows
-
-First load the Visual Studio solution and rebuild the UI and ZeroTier One in both x64, i386, and arm64 `Release` mode. Then load [Advanced Installer Enterprise](http://www.advancedinstaller.com/), check that the version is correct, and build. The build will fail if any build artifacts are missing, and Windows must have our product singing key (from DigiCert) available to sign the resulting MSI file. The MSI must then be tested on at least a few different CLEAN Windows VMs to ensure that the installer is valid and properly signed.
diff --git a/README.docker.md b/README.docker.md
deleted file mode 100644
index 5b046e320..000000000
--- a/README.docker.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# ZeroTier One in a container!
-
-**NOTE:** _Most of this information pertains to the docker image only. For more information about ZeroTier, check out the repository_: [here](https://github.com/zerotier/ZeroTierOne) or the [commercial website](https://www.zerotier.com).
-
-[ZeroTier](https://www.zerotier.com) is a smart programmable Ethernet switch for planet Earth. It allows all networked devices, VMs, containers, and applications to communicate as if they all reside in the same physical data center or cloud region.
-
-This is accomplished by combining a cryptographically addressed and secure peer to peer network (termed VL1) with an Ethernet emulation layer somewhat similar to VXLAN (termed VL2). Our VL2 Ethernet virtualization layer includes advanced enterprise SDN features like fine grained access control rules for network micro-segmentation and security monitoring.
-
-All ZeroTier traffic is encrypted end-to-end using secret keys that only you control. Most traffic flows peer to peer, though we offer free (but slow) relaying for users who cannot establish peer to peer connections.
-
-The goals and design principles of ZeroTier are inspired by among other things the original [Google BeyondCorp](https://static.googleusercontent.com/media/research.google.com/en//pubs/archive/43231.pdf) paper and the [Jericho Forum](https://en.wikipedia.org/wiki/Jericho_Forum) with its notion of "deperimeterization."
-
-Visit [ZeroTier's site](https://www.zerotier.com/) for more information and [pre-built binary packages](https://www.zerotier.com/download/). Apps for Android and iOS are available for free in the Google Play and Apple app stores.
-
-ZeroTier is licensed under the [BSL version 1.1](https://mariadb.com/bsl11/). See [LICENSE.txt](https://github.com/zerotier/ZeroTierOne/blob/master/LICENSE.txt) and the [ZeroTier pricing page](https://www.zerotier.com/pricing) for details. ZeroTier is free to use internally in businesses and academic institutions and for non-commercial purposes. Certain types of commercial use such as building closed-source apps and devices based on ZeroTier or offering ZeroTier network controllers and network management as a SaaS service require a commercial license.
-
-A small amount of third party code is also included in ZeroTier and is not subject to our BSL license. See [AUTHORS.md](https://github.com/zerotier/ZeroTierOne/blob/master/AUTHORS.md) for a list of third party code, where it is included, and the licenses that apply to it. All of the third party code in ZeroTier is liberally licensed (MIT, BSD, Apache, public domain, etc.).
-
-## Building the docker image
-
-Due to the network being a substrate for most applications and not an application unto itself, it makes sense that many people would want to build their own image based on our formula.
-
-The image is based on `debian:buster`.
-
-The `Dockerfile.release` file contains build instructions for building the described image in the rest of the README. The build is multi-arch and multi-release capable.
-
-These build arguments power the build:
-
-- `PACKAGE_BASEURL`: The base URL of the package repository to fetch from. (default: `https://download.zerotier.com/debian/buster/pool/main/z/zerotier-one/`)
-- `ARCH`: The architecture of the package, in debian format. Must match your image arch. (default: `amd64`)
-- `VERSION`: **REQUIRED** the version of ZeroTier to fetch.
-
-You can build this image like so:
-
-```
-docker build -f Dockerfile.release -t mybuild --build-arg VERSION=1.6.5 .
-```
-
-## Using the docker image
-
-The `entrypoint.sh` in the docker image is a little different; zerotier will be spawned in the background and the "main process" is actually just a sleeping shell script. This allows `zerotier-one` to gracefully terminate in some situations largely unique to docker.
-
-The `zerotier/zerotier` image requires the `CAP_NET_ADMIN` capability and the `/dev/net/tun` device must be forwarded to it.
-
-To join a network, simply supply it on the command-line; you can supply multiple networks.
-
-```
-docker run --name myzerotier --rm --cap-add NET_ADMIN --device /dev/net/tun zerotier/zerotier:latest abcdefdeadbeef00
-```
-
-Once joining all the networks you have provided, it will sleep until terminated. Note that in ZeroTier, joining a network does not necessarily mean you have an IP or can do anything, really. You will want to probe the control socket:
-
-```
-docker exec myzerotier zerotier-cli listnetworks
-```
-
-To ensure you have a network available before trying to listen on it. Without pre-configuring the identity, this usually means going to the central admin panel and clicking the checkmark against your zerotier identity.
-
-### Environment Variables
-
-You can control a few settings including the identity used and the authtoken used to interact with the control socket (which you can forward and access through `localhost:9993`).
-
-- `ZEROTIER_JOIN_NETWORKS`: additional way to set networks to join.
-- `ZEROTIER_API_SECRET`: replaces the `authtoken.secret` before booting and allows you to manage the control socket's authentication key.
-- `ZEROTIER_IDENTITY_PUBLIC`: the `identity.public` file for zerotier-one. Use `zerotier-idtool` to generate one of these for you.
-- `ZEROTIER_IDENTITY_SECRET`: the `identity.secret` file for zerotier-one. Use `zerotier-idtool` to generate one of these for you.
-- `ZEROTIER_LOCAL_CONF`: Sets the the `local.conf` file content for zerotier-one
-
-### Tips
-
-- Forwarding port `<dockerip>:9993` to somewhere outside is probably a good idea for highly trafficked services.
-- Forwarding `localhost:9993` to a control network where you can drive it remotely might be a good idea, just be sure to set your authtoken properly through environment variables.
-- Pre-generating your identities could be much simpler to do via our [terraform plugin](https://github.com/zerotier/terraform-provider-zerotier)
diff --git a/README.md b/README.md
index e881ce810..1a93a4348 100644
--- a/README.md
+++ b/README.md
@@ -1,197 +1,175 @@
-ZeroTier - Global Area Networking
+ZeroTier One
 ======
 
-*This document is written for a software developer audience. For information on using ZeroTier, see the: [Website](https://www.zerotier.com), [Documentation Site](https://docs.zerotier.com), and [Discussion Forum](https://discuss.zerotier.com).*
+ZeroTier is a software defined networking layer for Earth.
 
-ZeroTier is a smart programmable Ethernet switch for planet Earth. It allows all networked devices, VMs, containers, and applications to communicate as if they all reside in the same physical data center or cloud region.
+It can be used for on-premise network virtualization, as a peer to peer VPN for mobile teams, for hybrid or multi-data-center cloud deployments, or just about anywhere else secure software defined virtual networking is useful.
 
-This is accomplished by combining a cryptographically addressed and secure peer to peer network (termed VL1) with an Ethernet emulation layer somewhat similar to VXLAN (termed VL2). Our VL2 Ethernet virtualization layer includes advanced enterprise SDN features like fine grained access control rules for network micro-segmentation and security monitoring.
+ZeroTier One is our OS-level client service. It allows Mac, Linux, Windows, FreeBSD, and soon other types of clients to join ZeroTier virtual networks like conventional VPNs or VLANs. It can run on native systems, VMs, or containers (Docker, OpenVZ, etc.).
 
-All ZeroTier traffic is encrypted end-to-end using secret keys that only you control. Most traffic flows peer to peer, though we offer free (but slow) relaying for users who cannot establish peer to peer connections.
+Visit [ZeroTier's site](https://www.zerotier.com/) for more information. You can also download professionally packaged binary installers/packages for a variety of supported OSes there if you don't want to build ZeroTier One from source.
 
-The goals and design principles of ZeroTier are inspired by among other things the original [Google BeyondCorp](https://static.googleusercontent.com/media/research.google.com/en//pubs/archive/43231.pdf) paper and the [Jericho Forum](https://en.wikipedia.org/wiki/Jericho_Forum) with its notion of "deperimeterization."
+### Building from Source
 
-Visit [ZeroTier's site](https://www.zerotier.com/) for more information and [pre-built binary packages](https://www.zerotier.com/download/). Apps for Android and iOS are available for free in the Google Play and Apple app stores.
+For Mac, Linux, and BSD, just type "make" (or "gmake" on BSD). You won't need much installed; here are the requirements for various platforms:
 
-ZeroTier is licensed under the [BSL version 1.1](https://mariadb.com/bsl11/). See [LICENSE.txt](LICENSE.txt) and the [ZeroTier pricing page](https://www.zerotier.com/pricing) for details. ZeroTier is free to use internally in businesses and academic institutions and for non-commercial purposes. Certain types of commercial use such as building closed-source apps and devices based on ZeroTier or offering ZeroTier network controllers and network management as a SaaS service require a commercial license.
+ * Mac: Xcode command line tools, and [Packages](http://s.sudre.free.fr/Software/Packages/about.html) if you want to build an OSX .pkg installer ("make mac-dist-pkg"). It should build on OSX 10.7 or newer.
+ * Linux: gcc/g++ or clang/clang++ (Makefile will use clang by default if available.)
+ * FreeBSD (and other BSD): C++ compiler (G++ usually) and GNU make (gmake).
 
-A small amount of third party code is also included in ZeroTier and is not subject to our BSL license. See [AUTHORS.md](AUTHORS.md) for a list of third party code, where it is included, and the licenses that apply to it. All of the third party code in ZeroTier is liberally licensed (MIT, BSD, Apache, public domain, etc.).
+Each supported platform has its own *make-XXX.mk* file that contains the actual make rules for the platform. The right .mk file is included by the main Makefile based on the GNU make *OSTYPE* variable. Take a look at the .mk file for your platform for other targets, debug build rules, etc.
 
-### Getting Started
+Windows, of course, is special. We build for Windows with Microsoft Visual Studio 2012 on Windows 7. A solution file is located in the *windows* subfolder. Newer versions of Visual Studio (and Windows) may work but haven't been tested. Older versions almost certainly will not, since they lack things like *stdint.h* and certain STL features. MinGW or other ports of gcc/clang to Windows should also work but haven't been tested. Build steps for Windows are a bit more complicated. For the moment you are on your own there.
 
-Everything in the ZeroTier world is controlled by two types of identifier: 40-bit/10-digit *ZeroTier addresses* and 64-bit/16-digit *network IDs*. These identifiers are easily distinguished by their length. A ZeroTier address identifies a node or "device" (laptop, phone, server, VM, app, etc.) while a network ID identifies a virtual Ethernet network that can be joined by devices.
+Mobile versions are in progress. They don't work yet, and in any case only the glue code will be included in this repository. The full mobile apps are in private repositories on our own git server.
 
-ZeroTier addresses can be thought of as port numbers on an enormous planet-wide enterprise Ethernet smart switch supporting VLANs. Network IDs are VLAN IDs to which these ports may be assigned. A single port can be assigned to more than one VLAN.
+### Supported Platforms
 
-A ZeroTier address looks like `8056c2e21c` and a network ID looks like `8056c2e21c000001`. Network IDs are composed of the ZeroTier address of that network's primary controller and an arbitrary 24-bit ID that identifies the network on this controller. Network controllers are roughly analogous to SDN controllers in SDN protocols like [OpenFlow](https://en.wikipedia.org/wiki/OpenFlow), though as with the analogy between VXLAN and VL2 this should not be read to imply that the protocols or design are the same. You can use our convenient and inexpensive SaaS hosted controllers at [my.zerotier.com](https://my.zerotier.com/) or [run your own controller](controller/) if you don't mind messing around with JSON configuration files or writing scripts to do so.
+CPU architecture shouldn't matter unless it's smaller than 32-bit or something really bizarre like a "middle-endian" processor. We have reports of ZeroTier One running on arm32, arm64, and MIPS. It builds and runs out of the box on Raspberry Pi, BeagleBone, BananaPi, and other ARM-based developer/hobbyist boards.
 
-### Project Layout
+ZeroTier is written in C and C++ (C++03 / ISO/IEC 14882:2003) and uses data structures and algorithms from the C++03 STL. We do not use any C++11 features (yet), since we want to support a few old and embedded platforms that don't have C++11 compilers. You *will* require a compiler and headers new enough to support 64-bit integers (long long) and the *stdint.h* header. The latter could also be faked by adding defines for things like *uint32\_t*, *int64\_t*, etc.
 
-The base path contains the ZeroTier One service main entry point (`one.cpp`), self test code, makefiles, etc.
-
- - `artwork/`: icons, logos, etc.
- - `attic/`: old stuff and experimental code that we want to keep around for reference.
- - `controller/`: the reference network controller implementation, which is built and included by default on desktop and server build targets.
- - `debian/`: files for building Debian packages on Linux.
- - `doc/`: manual pages and other documentation.
- - `ext/`: third party libraries, binaries that we ship for convenience on some platforms (Mac and Windows), and installation support files.
- - `include/`: include files for the ZeroTier core.
- - `java/`: a JNI wrapper used with our Android mobile app. (The whole Android app is not open source but may be made so in the future.)
- - `node/`: the ZeroTier virtual Ethernet switch core, which is designed to be entirely separate from the rest of the code and able to be built as a stand-alone OS-independent library. Note to developers: do not use C++11 features in here, since we want this to build on old embedded platforms that lack C++11 support. C++11 can be used elsewhere.
- - `osdep/`: code to support and integrate with OSes, including platform-specific stuff only built for certain targets.
- - `rule-compiler/`: JavaScript rules language compiler for defining network-level rules.
- - `service/`: the ZeroTier One service, which wraps the ZeroTier core and provides VPN-like connectivity to virtual networks for desktops, laptops, servers, VMs, and containers.
- - `windows/`: Visual Studio solution files, Windows service code, and the Windows task bar app UI.
- - `zeroidc/`: OIDC implementation used by ZeroTier service to log into SSO-enabled networks. (This part is written in Rust, and more Rust will be appearing in this repository in the future.)
-
-### Contributing
-
-Please do pull requests off of the `dev` branch.
-
-Releases are done by merging `dev` into `main` and then tagging and doing builds. 
-
-### Build and Platform Notes
-
-To build on Mac and Linux just type `make`. On FreeBSD and OpenBSD `gmake` (GNU make) is required and can be installed from packages or ports. For Windows there is a Visual Studio solution in `windows/`.
-
- - **Mac**
-   - Xcode command line tools for macOS 10.13 or newer are required.
-   - Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
- - **Linux**
-   - The minimum compiler versions required are GCC/G++ 8.x or CLANG/CLANG++ 5.x.
-   - Linux makefiles automatically detect and prefer clang/clang++ if present as it produces smaller and slightly faster binaries in most cases. You can override by supplying CC and CXX variables on the make command line.
-   - Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
- - **Windows**
-   - Visual Studio 2022 on Windows 10 or newer.
-   - Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
- - **FreeBSD**
-   - GNU make is required. Type `gmake` to build.
-   - `binutils` is required.  Type `pkg install binutils` to install.
-   - Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
- - **OpenBSD**
-   - There is a limit of four network memberships on OpenBSD as there are only four tap devices (`/dev/tap0` through `/dev/tap3`).
-   - GNU make is required. Type `gmake` to build.
-   - Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
-
-Typing `make selftest` will build a *zerotier-selftest* binary which unit tests various internals and reports on a few aspects of the build environment. It's a good idea to try this on novel platforms or architectures.
+Typing "make selftest" will build a *zerotier-selftest* binary which unit tests various internals and reports on a few aspects of the build environment. It's a good idea to try this on novel platforms or architectures.
 
 ### Running
 
-Running *zerotier-one* with `-h` option will show help.
+Running *zerotier-one* with -h will show help.
 
-On Linux and BSD, if you built from source, you can start the service with:
+On Linux and BSD you can start the service with:
 
     sudo ./zerotier-one -d
 
-On most distributions, macOS, and Windows, the installer will start the service and set it up to start on boot.
-
 A home folder for your system will automatically be created.
 
-The service is controlled via the JSON API, which by default is available at `127.0.0.1:9993`. It also listens on `0.0.0.0:9993` which is only usable if `allowManagementFrom` is properly configured in `local.conf`. We include a *zerotier-cli* command line utility to make API calls for standard things like joining and leaving networks. The *authtoken.secret* file in the home folder contains the secret token for accessing this API. See [service/README.md](service/README.md) for API documentation.
+The service is controlled via the JSON API, which by default is available at 127.0.0.1 port 9993. We include a *zerotier-cli* command line utility to make API calls for standard things like joining and leaving networks. The *authtoken.secret* file in the home folder contains the secret token for accessing this API. See README.md in [service/](service/) for API documentation.
 
 Here's where home folders live (by default) on each OS:
 
- * **Linux**: `/var/lib/zerotier-one`
- * **FreeBSD** / **OpenBSD**: `/var/db/zerotier-one`
- * **Mac**: `/Library/Application Support/ZeroTier/One`
- * **Windows**: `\ProgramData\ZeroTier\One` (That's the default. The base 'shared app data' folder might be different if Windows is installed with a non-standard drive letter assignment or layout.)
+ * Linux: /var/lib/zerotier-one
+ * BSD: /var/db/zerotier-one
+ * Mac: /Library/Application Support/ZeroTier/One
+ * Windows: \\ProgramData\\ZeroTier\\One (That's for Windows 7. The base 'shared app data' folder might be different on different Windows versions.)
 
-### Basic Troubleshooting
+Running ZeroTier One on a Mac is the same, but OSX requires a kernel extension. We ship a signed binary build of the ZeroTier tap device driver, which can be installed on Mac with:
+
+    sudo make install-mac-tap
+
+This will create the home folder for Mac, place *tap.kext* there, and set its modes correctly to enable ZeroTier One to manage it with *kextload* and *kextunload*.
+
+We recommend using our binary packages on Windows, since there are several prerequisites such as a tap driver that must be installed on the system *and* in the home folder.
+
+### Joining A Network
+
+ZeroTier virtual networks are identified by 16-digit hexadecimal network IDs, while devices are identified by 10-digit addresses. To get your address run:
+
+    sudo zerotier-cli status
+
+(Use ./zerotier-cli if you're running it right from your build folder.)
+
+You should see something like:
+
+    200 info ########## ONLINE #.#.#
+
+That 10-digit hex code is you. It's derived via a one-way proof of work function from your cryptographic public key. Your public key can be found in *identity.public* in ZeroTier's home folder, while *identity.secret* contains your full identity including the secret portion of the key pair.
+
+(The identity files define your device's *identity*. Moving them to another system will move that identity. Be careful when cloning virtual machines that have identities stored on them. If two devices have the same identity, they'll "fight" over it and you won't know which device will receive network packets.)
+
+If you want to do a quick test, you can join [Earth](https://www.zerotier.com/earth.html). It's a global public network that anyone can join. Type:
+
+    sudo zerotier-cli join 8056c2e21c000001
+
+Then:
+
+    sudo zerotier-cli listnetworks
+
+At first it'll be in *REQUESTING\_CONFIGURATION* state. In a few seconds to a minute you should see something like:
+
+    200 listnetworks 8056c2e21c000001 earth.zerotier.net ##:##:##:##:##:## OK PUBLIC zt0 ##.##.##.##/##
+
+Earth will assign you an IP address in the "unofficially available" globally unrouted 28.0.0.0/7 IP block so as to avoid conflicts with local networks. (Your networks can use any IP scheme, or can even leave IP addresses unmanaged.) Once you get an IP, you should be able to ping something:
+
+    ping earth.zerotier.net
+
+Go to [http://earth.zerotier.net/](http://earth.zerotier.net/) to see a short little welcome page that will tell you your IP and Ethernet MAC address.
+
+Earth is a public place. If you don't want to stick around run:
+
+    sudo zerotier-cli leave 8056c2e21c000001
+
+The network (and associated interface) should be gone.
+
+Networks are created and administrated by network controllers. Most users will want to use our hosted controllers. Visit [our web site](https://www.zerotier.com/) for more information. Later in this README there are brief instructions about building ZeroTier One with network controller support for those who want to try running their own.
+
+Macintosh and Windows installers also install a GUI application.
+
+### Installing
+
+We don't have a "make install" rule quite yet. On Linux you can type:
+
+    make installer
+
+This will build a binary that, when run, will install ZeroTier One on most current Linux distributions. We also have RPM and DEB build files in *ext/installfiles/linux* that wrap this installer in packages for RedHat/CentOS and Debian/Ubuntu derived distributions. If *rpmbuild* is present on the system, the RPM will be built. If *dpkg-deb* is present, the DEB package will be built.
+
+On Mac the best way is to install [Packages](http://s.sudre.free.fr/Software/Packages/about.html) and use:
+
+    make mac-dist-pkg
+
+This builds a .pkg file that can be installed.
+
+In FreeBSD there is now an official .pkg in the FreeBSD repository. Type "pkg install zerotier". It can also be built and installed from source.
+
+Linux/BSD and Mac installations have an *uninstall.sh* file in their ZeroTier home folder that cleanly removes ZeroTier One from the system. Run this with:
+
+    sudo /path/to/ZeroTier/home/folder/uninstall.sh
+
+Windows installers are insane. We build our .MSI installers with [Advanced Installer Enterprise](http://www.advancedinstaller.com). The Advanced Installer project file is in *ext/installfiles/windows*. To avoid lasting psychological trauma we recommend leaving Windows installers alone and using the pre-built Windows binaries on our web site.
+
+### Using ZeroTier One in Docker Containers
+
+To run the ZeroTier One service in a Docker container, run it with "--device=/dev/net/tun --cap-add=NET_ADMIN". This will allow ZeroTier One to open a "tap" virtual network port inside the container.
+
+Alternately, you can use Ethernet bridging to bridge the *docker0* device on your system to a ZeroTier virtual network. This allows you to run ZeroTier One on the host and bridge the entire Docker network backplane to a virtual network or other hosts.
+
+We're working on better "official" Docker support. In the meantime there is a [user-contributed project here](https://github.com/davide/docker-zerotier).
+
+### Building with Network Controller Support
+
+**Warning: as of beta version 1.0.3 the new network controller is not heavily tested. We recommend waiting for 1.0.4 to deploy this in production.**
+
+Network controllers are nodes responsible for issuing configurations and certificates to members of ZeroTier virtual networks. Most users won't need to run their own, so this code is by default not included in the ZeroTier One binary.
+
+You can build a network controller on Linux or Mac with:
+
+    make ZT_ENABLE_NETWORK_CONTROLLER=1
+
+This will build a version that contains the Sqlite-backed network controller and associated extensions to the JSON local service control API. You will need the development headers for sqlite3 installed. On Mac these ship as part of Xcode, while on Linux they'll be found in packages for the various distributions.
+
+See the JSON API documentation in [service/](service/) for more information about how to control controllers.
+
+### Troubleshooting
 
 For most users, it just works.
 
-If you are running a local system firewall, we recommend adding a rules permitting zerotier. If you installed binaries for Windows this should be done automatically. Other platforms might require manual editing of local firewall rules depending on your configuration.
+If you are running a local system firewall, we recommend adding a rule permitting UDP port 9993 inbound and outbound. If you installed binaries for Windows this should be done automatically. Other platforms might require manual editing of local firewall rules depending on your configuration.
 
-See the [documentation site](https://docs.zerotier.com/zerotier/troubleshooting) for more information.
+The Mac firewall can be found under "Security" in System Preferences. Linux has a variety of firewall configuration systems and tools. If you're using Ubuntu's *ufw*, you can do this:
 
-The Mac firewall can be found under "Security" in System Preferences. Linux has a variety of firewall configuration systems and tools.
+    sudo ufw allow 9993/udp
 
-On CentOS check `/etc/sysconfig/iptables` for IPTables rules. For other distributions consult your distribution's documentation. You'll also have to check the UIs or documentation for commercial third party firewall applications like Little Snitch (Mac), McAfee Firewall Enterprise (Windows), etc. if you are running any of those. Some corporate environments might have centrally managed firewall software, so you might also have to contact IT.
+On CentOS check */etc/sysconfig/iptables* for IPTables rules. For other distributions consult your distribution's documentation. You'll also have to check the UIs or documentation for commercial third party firewall applications like Little Snitch (Mac), McAfee Firewall Enterprise (Windows), etc. if you are running any of those. Some corporate environments might have centrally managed firewall software, so you might also have to contact IT.
 
 ZeroTier One peers will automatically locate each other and communicate directly over a local wired LAN *if UDP port 9993 inbound is open*. If that port is filtered, they won't be able to see each others' LAN announcement packets. If you're experiencing poor performance between devices on the same physical network, check their firewall settings. Without LAN auto-location peers must attempt "loopback" NAT traversal, which sometimes fails and in any case requires that every packet traverse your external router twice.
 
-Users behind certain types of firewalls and "symmetric" NAT devices may not be able to connect to external peers directly at all. ZeroTier has limited support for port prediction and will *attempt* to traverse symmetric NATs, but this doesn't always work. If P2P connectivity fails you'll be bouncing UDP packets off our relay servers resulting in slower performance. Some NAT router(s) have a configurable NAT mode, and setting this to "full cone" will eliminate this problem. If you do this you may also see a magical improvement for things like VoIP phones, Skype, BitTorrent, WebRTC, certain games, etc., since all of these use NAT traversal techniques similar to ours.
+Users behind certain types of firewalls and "symmetric" NAT devices may not able able to connect to external peers directly at all. ZeroTier has limited support for port prediction and will *attempt* to traverse symmetric NATs, but this doesn't always work. If P2P connectivity fails you'll be bouncing UDP packets off our relay servers resulting in slower performance. Some NAT router(s) have a configurable NAT mode, and setting this to "full cone" will eliminate this problem. If you do this you may also see a magical improvement for things like VoIP phones, Skype, BitTorrent, WebRTC, certain games, etc., since all of these use NAT traversal techniques similar to ours.
+
+If you're interested, there's a [technical deep dive about NAT traversal on our blog](https://www.zerotier.com/blog/?p=226). A troubleshooting tool to help you diagnose NAT issues is planned for the future as are uPnP/IGD/NAT-PMP and IPv6 transport.
 
 If a firewall between you and the Internet blocks ZeroTier's UDP traffic, you will fall back to last-resort TCP tunneling to rootservers over port 443 (https impersonation). This will work almost anywhere but is *very slow* compared to UDP or direct peer to peer connectivity.
 
-Additional help can be found in our [knowledge base](https://zerotier.atlassian.net/wiki/spaces/SD/overview).
+### Contributing
 
-### Prometheus Metrics
+There are three main branches: **edge**, **test**, and **master**. Other branches may be for specific features, tests, or use cases. In general **edge** is "bleeding" and may or may not work, while **test** should be relatively stable and **master** is the latest tagged release. Pull requests should generally be done against **test** or **edge**, since pull requests against **master** may be working against a branch that is somewhat out of date.
 
-Prometheus Metrics are available at the `/metrics` API endpoint.  This endpoint is protected by an API key stored in `metricstoken.secret` to prevent unwanted information leakage.  Information that could be gleaned from the metrics include joined networks and peers your instance is talking to. 
+### License
 
-Access control is via the ZeroTier control interface itself and `metricstoken.secret`. This can be sent as a bearer auth token, via the `X-ZT1-Auth` HTTP header field, or appended to the URL as `?auth=<token>`. You can see the current metrics via `cURL` with the following command:
-
-    // Linux
-    curl -H "X-ZT1-Auth: $(sudo cat /var/lib/zerotier-one/metricstoken.secret)" http://localhost:9993/metrics
-
-    // macOS
-    curl -H "X-ZT1-Auth: $(sudo cat /Library/Application\ Support/ZeroTier/One/metricstoken.secret)" http://localhost:9993/metrics
-
-    // Windows PowerShell (Admin)
-    Invoke-RestMethod -Headers @{'X-ZT1-Auth' = "$(Get-Content C:\ProgramData\ZeroTier\One\metricstoken.secret)"; } -Uri http://localhost:9993/metrics
-
-To configure a scrape job in Prometheus on the machine ZeroTier is running on, add this to your Prometheus `scrape_config`:
-
-    - job_name: zerotier-one
-      honor_labels: true
-      scrape_interval: 15s
-      metrics_path: /metrics
-      static_configs:
-      - targets:
-        - 127.0.0.1:9993
-        labels:
-          group: zerotier-one
-          node_id: $YOUR_10_CHARACTER_NODE_ID
-      authorization:
-        credentials: $YOUR_METRICS_TOKEN_SECRET
-
-If neither of these methods are desirable, it is probably possible to distribute metrics via [Prometheus Proxy](https://github.com/pambrose/prometheus-proxy) or some other tool.  Note: We have not tested this internally, but will probably work with the correct configuration.
-
-Metrics are also available on disk in ZeroTier's working directory:
-
-   // Linux
-   /var/lib/zerotier-one/metrics.prom
-
-   // macOS
-   /Library/Application\ Support/ZeroTier/One/metrics.prom
-
-   //Windows
-   C:\ProgramData\ZeroTier\One\metrics.prom
-
-#### Available Metrics
-
-| Metric Name | Labels | Metric Type | Description |
-| ---         | ---    | ---         | ---         |
-| zt_packet | packet_type, direction | Counter | ZeroTier packet type counts |
-| zt_packet_error | error_type, direction | Counter | ZeroTier packet errors|
-| zt_data | protocol, direction | Counter | number of bytes ZeroTier has transmitted or received |
-| zt_num_networks | | Gauge | number of networks this instance is joined to |
-| zt_network_multicast_groups_subscribed | network_id | Gauge | number of multicast groups networks are subscribed to |
-| zt_network_packets | network_id, direction | Counter | number of incoming/outgoing packets per network |
-| zt_peer_latency | node_id | Histogram | peer latency (ms) |
-| zt_peer_path_count | node_id, status | Gauge | number of paths to peer |
-| zt_peer_packets | node_id, direction | Counter | number of packets to/from a peer |
-| zt_peer_packet_errors | node_id | Counter | number of incoming packet errors from a peer |
-
-If there are other metrics you'd like to see tracked, ask us in an Issue or send us a Pull Request!
-
-### HTTP / App server
-
-There is a static http file server suitable for hosting Single Page Apps at http://localhost:9993/app/<app-path>
-
-Use `zerotier-cli info -j` to find your zerotier-one service's homeDir
-
-``` sh
-cd $ZT_HOME
-sudo mkdir -p app/app1
-sudo mkdir -p app/appB
-echo '<html><meta charset=utf-8><title>appA</title><body><h1>hello world A' | sudo tee app/appA/index.html 
-echo '<html><meta charset=utf-8><title>app2</title><body><h1>hello world 2' | sudo tee app/app2/index.html 
-curl -sL http://localhost:9993/app/appA http://localhost:9993/app/app2 
-```
-
-Then visit [http://localhost:9993/app/app1/](http://localhost:9993/app/app1/) and [http://localhost:9993/app/appB/](http://localhost:9993/app/appB/)
-
-Requests to paths don't exist return the app root index.html, as is customary for SPAs. 
-If you want, you can write some javascript that talks to the service or controller [api](https://docs.zerotier.com/service/v1).
+The ZeroTier source code is open source and is licensed under the GNU GPL v3 (not LGPL). If you'd like to embed it in a closed-source commercial product or appliance, please e-mail [contact@zerotier.com](mailto:contact@zerotier.com) to discuss commercial licensing. Otherwise it can be used for free.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
deleted file mode 100644
index e6582207e..000000000
--- a/RELEASE-NOTES.md
+++ /dev/null
@@ -1,506 +0,0 @@
-ZeroTier Release Notes
-======
-
-# 2024-10-23 -- Version 1.14.2
-
-  * Fix for missing entitlement on macOS Sequoia.
-  * Fix for a problem correctly parsing local.conf to enable low bandwidth mode.
-  * Increment versions of some dependent libraries.
-  * Other fixes.
-
-# 2024-09-12 -- Version 1.14.1
-
-  * Multithreaded packet I/O support! Currently this is just for Linux and must
-    be enabled in local.conf. It will likely make the largest difference on small
-    multi-core devices where CPU is a bottleneck and high throughput is desired.
-    It may be enabled by default in the future but we want it to be thoroughly
-    tested. It's a little harder than it seems at first glance due to the need
-    to keep packets in sequence and balance load.
-  * Several multipath bug fixes.
-  * Updated the versions on a number of libraries related to OIDC support and HTTP.
-  * MacOS .app now shows the correct version in its Info.plist manifest.
-  * Sanitize MAC addresses in JSON format rules parser.
-  * Some basic information about the platform (OS, CPU architecture) is now reported
-    to network controllers when networks are joined so it can be displayed to
-    network admins and in the future used in policy checking and inventory operations.
-
-# 2024-05-02 -- Version 1.14.0
-
-  * Linux I/O performance improvements under heavy load
-  * Improvements to multipath
-  * Fix for port rebinding "coma" bug after periods offline (some laptop users)
-  * Fixed a rules engine quirk/ambiguity (GitHub Issue #2200)
-  * Controller API enhancements: node names and other node meta-data
-  * Other bug fixes
-
-# 2023-09-12 -- Version 1.12.2
-
-  * More improvements to macOS full tunnel mode.
-  * Faster recovery after changes to physical network settings.
-
-# 2023-08-25 -- Version 1.12.1
-
-  * Minor release to fix a port binding issue in Linux.
-  * Update Debian dependencies.
-  * No changes for other platforms.
-
-# 2023-08-23 -- Version 1.12.0
-
-  * Experimental Windows ARM64 support
-  * Fix numerous sleep/wake issues on macOS and other platforms
-  * Faster recovery after changes to physical network settings
-  * Prometheus compatible metrics support!
-  * Fix full tunnel mode on recent macOS versions
-  * Numerous macOS DNS fixes
-  * 10-30% speed improvement on Linux
-
-# 2023-03-23 -- Version 1.10.6
-
-  * Prevent binding temporary ipv6 addresses on macos (#1910)
-  * Prevent path-learning loops (#1914)
-  * Prevent infinite loop of UAC prompts in tray app
-
-# 2023-03-10 -- Version 1.10.5
-
- * Fix for high CPU usage bug on Windows
-
-# 2023-03-07 -- Version 1.10.4
-
- * SECURITY FIX (Windows): this version fixes a file permission problem on
-   Windows that could allow non-privileged users on a Windows system to read
-   privileged files in the ZeroTier service's working directory. This could
-   allow an unprivileged local Windows user to administrate the local ZeroTier
-   instance without appropriate local permissions. This issue is not remotely
-   exploitable unless a remote user can read arbitrary local files, and does
-   not impact other operating systems.
-
- * Fix a bug in the handling of multiple IP address assignments to virtual
-   interfaces on macOS.
-
-# 2023-02-15 -- Version 1.10.3
-
- * Fix for duplicate paths in client. Could cause connectivity issues. Affects all platforms.
- * Fix for Ethernet Tap MTU setting, would not properly apply on Linux.
- * Fix default route bugs (macOS.)
- * Enable Ping automatically for ZeroTier Adapters (Windows.)
- * SSO updates and minor bugfixes.
- * Add low-bandwidth mode.
- * Add forceTcpRelay mode (optionally enabled.)
- * Fix bug that prevented setting of custom TCP relay address.
- * Build script improvements and bug fixes.
-
-# 2022-11-01 -- Version 1.10.2
-
- * Fix another SSO "stuck client" issue in zeroidc.
- * Expose root-reported external IP/port information via the local JSON API for better diagnostics.
- * Multipath: CLI output improvement for inspecting bonds
- * Multipath: balance-aware mode
- * Multipath: Custom policies
- * Multipath: Link quality measurement improvements
-
-Note that releases are coming few and far between because most of our dev effort is going into version 2.
-
-# 2022-06-27 -- Version 1.10.1
-
- * Fix an issue that could cause SSO clients to get "stuck" on stale auth URLs.
- * A few other SSO related bug fixes.
-
-# 2022-06-07 -- Version 1.10.0
-
- * Fix formatting problem in `zerotier-cli` when using SSO networks.
- * Fix a few other minor bugs in SSO signin to prepare for general availability.
- * Remove requirement for webview in desktop UI and instead just make everything available via the tray pulldown/menu. Use [libui-ng](https://github.com/libui-ng/libui-ng) for minor prompt dialogs. Saves space and eliminates installation headaches on Windows.
- * Fix SSO "spam" bug in desktop UI.
- * Use system default browser for SSO login so all your plugins, MFA devices, password managers, etc. will work as you have them configured.
- * Minor fix for bonding/multipath.
-
-# 2022-05-10 -- Version 1.8.10
-
- * Fixed a bug preventing SSO sign-on on Windows.
-
-# 2022-04-25 -- Version 1.8.9
-
- * Fixed a long-standing and strange bug that was causing sporadic "phantom" packet authentication failures. Not a security problem but could be behind sporadic reports of link failures under some conditions.
- * Fixed a memory leak in SSO/OIDC support.
- * Fixed SSO/OIDC display error on CLI.
- * Fixed a bug causing nodes to sometimes fail to push certs to each other (primarily affects SSO/OIDC use cases).
- * Fixed a deadlock bug on leaving SSO/OIDC managed networks.
- * Added some new Linux distributions to the build subsystem.
-
-# 2022-04-11 -- Version 1.8.8
-
- * Fix a local privilege escalation bug in the Windows installer.
- * Dependency fix for some Ubuntu versions.
- * No changes for other platforms. Windows upgrade recommended, everyone else optional.
-
-# 2022-03-30 -- Version 1.8.7
-
- * Fix for dependency installations in Windows MSI package.
- * Fix for desktop UI setup when run by a non-super-user.
- * Bug fix in local OIDC / SSO support for auth0 and other providers.
- * Other minor fixes for e.g. old Linux distributions.
-
-# 2022-03-04 -- Version 1.8.6
-
- * Fixed an issue that could cause the UI to be non-responsive if not joined to any networks.
- * Fix dependency issues in Debian and RedHat packages for some distributions (Fedora, Mint).
- * Bumped the peer cache serialization version to prevent "coma" issues on upgrade due to changes in path logic behaving badly with old values.
-
-# 2022-02-22 -- Version 1.8.5
-
- * Plumbing under the hood for endpoint device SSO support.
- * Fix in LinuxEthernetTap to tap device support on very old (2.6) Linux kernels.
- * Fix an issue that could cause self-hosted roots ("moons") to fail to assist peers in making direct links. (GitHub issue #1512)
- * Merge a series of changes by Joseph Henry (of ZeroTier) that should fix some edge cases where ZeroTier would "forget" valid paths.
- * Minor multipath improvements for automatic path negotiation.
-
-# 2021-11-30 -- Version 1.8.4
-
- * Fixed an ugly font problem on some older macOS versions.
- * Fixed a bug that could cause the desktop tray app control panel to stop opening after a while on Windows.
- * Fixed a possible double "release" in macOS tray app code that crashed on older macOS versions.
- * Fixed installation on 32-bit Windows 10.
- * Fixed a build flags issue that could cause ZeroTier to crash on older ARM32 CPUs.
-
-# 2021-11-15 -- Version 1.8.3
-
- * Remove problematic spinlock, which was only used on x86_64 anyway. Just use pthread always.
- * Fix fd leak on MacOS that caused non-responsiveness after some time.
- * Fix Debian install scripts to set /usr/sbin/nologin as shell on service user.
- * Fix regression that could prevent managed routes from being deleted.
- * DesktopUI: Remove NSDate:now() call, now works on MacOS 10.13 or newer!
-
-# 2021-11-08 -- Version 1.8.2
-
- * Fix multicast on linux.
- * Fix a bug that could cause the tap adapter to have the wrong MAC on Linux.
- * Update build flags to possibly support MacOS older than 10.14, but more work needs to be done. It may not work yet.
- * Fix path variable setting on Windows.
-
-# 2021-10-28 -- Version 1.8.1
-
- * Fix numerous UI issues from 1.8.0 (never fully released).
- * Remove support for REALLY ancient 1.1.6 or earlier network controllers.
- * MacOS IPv6 no longer binds to temporary addresses as these can cause interruptions if they expire.
- * Added additional hardening against address impersonation on networks (also in 1.6.6).
- * Fix an issue that could cause clobbering of MacOS IP route settings on restart.
-
- * NOTE: Windows 7 is no longer supported! Windows 7 users will have to use version 1.6.5 or earlier.
-
-# 2021-09-15 -- Version 1.8.0 (preview release only)
-
- * A *completely* rewritten desktop UI for Mac and Windows!
- * Implement a workaround for one potential source of a "coma" bug, which can occur if buggy NATs/routers stop allowing the service to communicate on a given port. ZeroTier now reassigns a new secondary port if it's offline for a while unless a secondary port is manually specified in local.conf. Working around crummy buggy routers is an ongoing effort.
- * Fix for MacOS MTU capping issue on feth devices
- * Fix for mistakenly using v6 source addresses for v4 routes on some platforms
- * Stop binding to temporary IPv6 addresses
- * Set MAC address before bringing up Linux TAP link
- * Check if DNS servers need to be applied on macOS
- * Upgrade json.hpp dependency to version 3.10.2
-
-# 2021-09-21 -- Version 1.6.6
-
- * Backport COM hash check mitigation against network member impersonation.
-
-# 2021-04-13 -- Version 1.6.5
-
- * Fix a bug in potential network path filtering that could in some circumstances lead to "software laser" effects.
- * Fix a printf overflow in zerotier-cli (not exploitable or a security risk)
- * Windows now looks up the name of ZeroTier devices instead of relying on them having "ZeroTier" in them.
-
-# 2021-02-15 -- Version 1.6.4
-
- * The groundhog saw his shadow, which meant that the "connection coma" bug still wasn't gone. We think we found it this time.
-
-# 2021-02-02 -- Version 1.6.3
-
- * Likely fix for GitHub issue #1334, an issue that could cause ZeroTier to
-   go into a "coma" on some networks.
- * Also groundhog day
-
-# 2020-11-30 -- Version 1.6.2
-
- * Fix an ARM hardware AES crypto issue (not an exploitable vulnerability).
- * Fix a Linux network leave hang due to a mutex deadlock.
-
-# 2020-11-24 -- Version 1.6.1
-
-This release fixes some minor bugs and other issues in 1.6.0.
-
- * Fixed a bug that caused IP addresses in the 203.0.0.0/8 block to be miscategorized as not being in global scope.
- * Changed Linux builds to (hopefully) fix LXC and SELinux issues.
- * Fixed unaligned memory access that caused crash on FreeBSD systems on the ARM architecture.
- * Merged CLI options for controlling bonded devices into the beta multipath code.
- * Updated Windows driver with Microsoft cross-signing to fix issues on some Windows systems.
-
-# 2020-11-19 -- Version 1.6.0
-
-Version 1.6.0 is a major release that incorporates back-ported features from the 2.0 branch, which is still under development. It also fixes a number of issues.
-
-New features and improvements (including those listed under 1.5.0):
-
- * **Apple Silicon** (MacOS ARM64) native support via universal binary. ZeroTier now requires the very latest Xcode to build.
- * **Linux performance improvements** for up to 25% faster tun/tap I/O performance on multi-core systems.
- * **Multipath support** with modes modeled after the Linux kernel's bonding driver. This includes active-passive and active-active modes with fast failover and load balancing. See section 2.1.5 of the manual.
- * **DNS configuration** push from network controllers to end nodes, with locally configurable permissions for whether or not push is allowed.
- * **AES-GMAC-SIV** encryption mode, which is both somewhat more secure and significantly faster than the old Salsa20/12-Poly1305 mode on hardware that supports AES acceleration. This includes virtually all X86-64 chips and most ARM64. This mode is based on AES-SIV and has been audited by Trail of Bits to ensure that it is equivalent security-wise.
-
-Bug fixes:
-
- * **Managed route assignment fixes** to eliminate missing routes on Linux and what we believe to be the source of sporadic high CPU usage on MacOS.
- * **Hang on shutdown** issues should be fixed.
- * **Sporadic multicast outages** should be fixed.
-
-Known remaining issues:
-
- * AES hardware acceleration is not yet supported on 32-bit ARM, PowerPC (32 or 64), or MIPS (32 or 64) systems. Currently supported are X86-64 and ARM64/AARCH64 with crypto extensions.
-
-# 2020-10-05 -- Version 1.5.0 (actually 1.6.0-beta1)
-
-Version 1.6.0 (1.5.0 is a beta!) is a significant release that incorporates a number of back-ported fixes and features from the ZeroTier 2.0 tree.
-
-Major new features are:
-
- * **Multipath support** with modes modeled after the Linux kernel's bonding driver. This includes active-passive and active-active modes with fast failover and load balancing. See section 2.1.5 of the manual.
- * **DNS configuration** push from network controllers to end nodes, with locally configurable permissions for whether or not push is allowed.
- * **AES-GMAC-SIV** encryption mode, which is both somewhat more secure and significantly faster than the old Salsa20/12-Poly1305 mode on hardware that supports AES acceleration. This includes virtually all X86-64 chips and most ARM64. This mode is based on AES-SIV and has been audited by Trail of Bits to ensure that it is equivalent security-wise.
-
-Known issues that are not yet fixed in this beta:
-
- * Some Mac users have reported periods of 100% CPU in kernel_task and connection instability after leaving networks that have been joined for a period of time, or needing to kill ZeroTier and restart it to finish leaving a network. This doesn't appear to affect all users and we haven't diagnosed the root cause yet.
- * The service sometimes hangs on shutdown requiring a kill -9. This also does not affect all systems or users.
- * AES hardware acceleration is not yet supported on 32-bit ARM, PowerPC (32 or 64), or MIPS (32 or 64) systems. Currently supported are X86-64 and ARM64/AARCH64 with crypto extensions.
- * Some users have reported multicast/broadcast outages on networks lasting up to 30 seconds. Still investigating.
-
-We're trying to fix all these issues before the 1.6.0 release. Stay tuned.
-
-# 2019-08-30 -- Version 1.4.6
-
- * Update default root list to latest
- * ARM32 platform build and flag fixes
- * Add a clarification line to LICENSE.txt
- * Fix license message in CLI
- * Windows service now looks for service command line arguments
- * Fixed a bug that could cause excessive queued multicasts
-
-# 2019-08-23 -- Version 1.4.4
-
- * Change license from GPL3 to BSL 1.1, see LICENSE.txt
- * Fix an issue with the "ipauth" rule and auto-generated unforgeable IPv6 addresses
- * Fix socket/bind errors setting IPs and routes on Linux
-
-# 2019-08-12 -- Version 1.4.2
-
- * Fix high CPU use bug on some platforms
- * Fix issues with PostgreSQL controller DB (only affects Central)
- * Restore backward compatibility with MacOS versions prior to 10.13
-
-# 2019-07-29 -- Version 1.4.0
-
-### Major Changes
-
- * Mac version no longer requires a kernel extension, instead making use of the [feth interfaces](https://apple.stackexchange.com/questions/337715/fake-ethernet-interfaces-feth-if-fake-anyone-ever-seen-this).
- * Added support for concurrent multipath (multiple paths at once) with traffic weighting by link quality and faster recovery from lost links.
- * Added under-the-hood support for QoS (not yet exposed) that will eventually be configurable via our rules engine.
-
-### Minor Changes and Bug Fixes
-
- * Experimental controller DB driver for [LF](https://github.com/zerotier/lf) to store network controller data (LFDB.cpp / LFDB.hpp).
- * Modified credential push and direct path push timings and algorithms to somewhat reduce "chattiness" of the protocol when idle. More radical background overhead reductions will have to wait for the 2.x line.
- * Removed our beta/half-baked integration of Central with the Windows UI. We're going to do a whole new UI of some kind in the future at least for Windows and Mac.
- * Fixed stack overflow issues on Linux versions using musl libc.
- * Fixed some alignment problems reported on ARM and ARM64, but some reports we could not reproduce so please report any issues with exact chip, OS/distro, and ZeroTier version in use.
- * Fixed numerous other small issues and bugs such as ARM alignment issues causing crashes on some devices.
- * Windows now sets the adapter name such that it is consistent in both the Windows UI and command line utilities.
-
-# 2018-07-27 -- Version 1.2.12
-
- * Fixed a bug that caused exits to take a long time on Mac due to huge numbers of redundant attempts to delete managed routes.
- * Fixed a socket limit problem on Windows that caused the ZeroTier service to run out of sockets, causing the UI and CLI to be unable to access the API.
- * Fixed a threading bug in the ZeroTier Core, albeit one that never manifested on the regular ZeroTier One service/client.
- * Fixed a bug that could cause the service to crash if an authorized local client accessed an invalid URL via the control API. (Not exploitable since you needed admin access anyway.)
-
-# 2018-05-08 -- Version 1.2.10
-
- * Fix bug loading `moons.d/` files for federated root operation.
- * Fix compile problem with ZT_DEBUG on some versions of `clang`
- * Fix slow network startup bug related to loading of `networks.d/` cache files
-
-# 2018-04-27 -- Version 1.2.8
-
- * Linux version once again builds with PIE (position independent executable) flags
- * Fixed bug in zerotier-idtool file sign and verify
- * Fixed minor OSX app typo
- * Merged alpha NetBSD support (mostly untested, so YMMV)
- * Merged several minor typo and one-liner bug fixes
-
-# 2018-04-17 -- Version 1.2.6
-
- * Features and Core Improvements
-    * Path selection has been overhauled to improve path stability, simplify code, and prepare for multi-path and trunking in the next major release.
-    * This version introduces remote tracing for remote diagnostics. Network controllers can set a node (usually the controller itself) to receive remote tracing events from all members of the network or from select members. Events are only sent if they pertain to a given network for security reasons.
-    * Multicast replication can now be done by designated multicast replicators on a network (flagged as such at the controller) rather than by the sender. Most users won't want this, but it's useful for specialized use cases on hub-and-spoke networks and for low-power devices.
-    * Cryptographic performance improvements on several platforms.
-    * Multithreaded performance improvements throughout the code base, including the use of an inline lightweight spinlock for low-contention resources.
- * Bugs fixed
-    * Disappearing routes on Mac (GitHub issue #600)
-    * Route flapping and path instability in some dual-stack V4/V6 networks
-    * Blacklist (in local.conf) doesn't work reliably (GitHub issue #656)
-    * Connection instabilities due to unsigned integer overflows in timing comparisons (use int64_t instead of uint64_t)
-    * Binaries don't run on some older or lower-end 32-bit ARM chips (build problem)
-    * ARM NEON crypto code crashes (build problem)
-    * Fixed some lock ordering issues revealed by "valgrind" tool
-    * The "zerotier-idtool" command could not be accessed from "zerotier-one" via command line switch
-    * Leaking sockets on some platforms when uPnP/NAT-PMP is enabled
-    * Fixed two very rare multithreading issues that were only observed on certain systems
- * Platform-Specific Changes
-    * MacOS
-        * Installer now loads the kernel extension right away so that High Sierra users will see the prompt to authorize it. This is done in the "Security & Privacy" preference pane and must be done directly on the console (not via remote desktop). On High Sierra and newer kexts must be authorized at the console via security settings system preferences pane.
-    * Windows
-        * The Windows installer should now install the driver without requiring a special prompt in most cases. This should make it easier for our packages to be accepted into and updated in the Chocolatey repository and should make it easier to perform remote installs across groups of machines using IT management and provisioning tools.
-        * The Windows official packages are now signed with an EV certificate (with hardware key).
-        * The Windows UI can now log into ZeroTier Central and join networks via the Central API.
-        * The `zerotier-idtool` command should now work on Windows without ugly hacks.
-        * Upgraded the installer version.
-        * Made a few changes to hopefully fix sporadic "will not uninstall" problems, though we cannot duplicate these issues ourselves.
-    * Linux
-        * Device names are now generated deterministically based on network IDs for all newly joined networks.
-    * Android
-        * Multicast now works on Android in most cases! Android apps can send and receive multicast and subscribe to multicast group IPs. Note that in some cases the app must bind to the specific correct interface for this to work.
-        * IPv6 can be disabled in UI for cases where it causes problems.
-
-# 2017-04-20 -- Version 1.2.4
-
- * Managed routes are now only bifurcated for the default route. This is a change in behavior, though few people will probably notice. Bifurcating all managed routes was causing more trouble than it was worth for most users.
- * Up to 2X crypto speedup on x86-64 (except Windows, which will take some porting) and 32-bit ARM platforms due to integration of fast assembly language implementations of Salsa20/12 from the [supercop](http://bench.cr.yp.to/supercop.html) code base. These were written by Daniel J. Bernstein and are in the public domain. My MacBook Pro (Core i5 2.8ghz) now does almost 1.5GiB/sec Salsa20/12 per core and a Raspberry Pi got a 2X boost. 64-bit ARM support and Windows support will take some work but should not be too hard.
- * Refactored code that manages credentials to greatly reduce memory use in most cases. This may also result in a small performance improvement.
- * Reworked and simplified path selection and priority logic to fix path instability and dead path persistence edge cases. There have been some sporadic reports of persistent path instabilities and dead paths hanging around that take minutes to resolve. These have proven difficult to reproduce in house, but hopefully this will fix them. In any case it seems to speed up path establishment in our tests and it makes the code simpler and more readable.
- * Eliminated some unused cruft from the code around path management and in the peer class.
- * Fixed an issue causing build problems on some MIPS architecture systems.
- * Fixed Windows forgetting routes on sleep/wake or in some other circumstances. (GitHub issue #465)
-
-# 2017-03-17 -- Version 1.2.2
-
- * A bug causing unreliable multicast propagation (GitHub issue #461).
- * A crash in ARM binaries due to a build chain and flags problem.
- * A bug in the network controller preventing members from being listed (GitHub issue #460).
-
-# 2017-03-14 -- Version 1.2.0
-
-Version 1.2.0 is a major milestone release representing almost nine months of work. It includes our rules engine for distributed network packet filtering and security monitoring, federated roots, and many other architectural and UI improvements and bug fixes.
-
-## New Features in 1.2.0
-
-### The ZeroTier Rules Engine
-
-The largest new feature in 1.2.0, and the product of many months of work, is our advanced network rules engine. With this release we achieve traffic control, security monitoring, and micro-segmentation capability on par with many enterprise SDN solutions designed for use in advanced data centers and corporate networks.
-
-Rules allow you to filter packets on your network and vector traffic to security observers. Security observation can be performed in-band using REDIRECT or out of band using TEE.
-
-Tags and capabilities provide advanced methods for implementing fine grained permission structures and micro-segmentation schemes without bloating the size and complexity of your rules table.
-
-See the [rules engine announcement blog post](https://www.zerotier.com/blog/?p=927) for an in-depth discussion of theory and implementation. The [manual](https://www.zerotier.com/manual.shtml) contains detailed information on rule, tag, and capability use, and the `rule-compiler/` subfolder of the ZeroTier source tree contains a JavaScript function to compile rules in our human-readable rule definition language into rules suitable for import into a network controller. (ZeroTier Central uses this same script to compile rules on [my.zerotier.com](https://my.zerotier.com/).)
-
-### Root Server Federation
-
-It's now possible to create your own root servers and add them to the root server pool on your nodes. This is done by creating what's called a "moon," which is a signed enumeration of root servers and their stable points on the network. Refer to the [manual](https://www.zerotier.com/manual.shtml) for instructions.
-
-Federated roots achieve a number of things:
-
- * You can deploy your own infrastructure to reduce dependency on ours.
- * You can deploy roots *inside your LAN* to ensure that network connectivity inside your facility still works if the Internet goes down. This is the first step toward making ZeroTier viable as an in-house SDN solution.
- * Roots can be deployed inside national boundaries for countries with data residency laws or "great firewalls." (As of 1.2.0 there is still no way to force all traffic to use these roots, but that will be easy to do in a later version.)
- * Last but not least this makes ZeroTier somewhat less centralized by eliminating any hard dependency on ZeroTier, Inc.'s infrastructure.
-
-Our roots will of course remain and continue to provide zero-configuration instant-on deployment, a secure global authority for identities, and free traffic relaying for those who can't establish peer to peer connections.
-
-### Local Configuration
-
-An element of our design philosophy is "features are bugs." This isn't an absolute dogma but more of a guiding principle. We try as hard as we can to avoid adding features, especially "knobs" that must be tweaked by a user.
-
-As of 1.2.0 we've decided that certain knobs are unavoidable, and so there is now a `local.conf` file that can be used to configure them. See the ZeroTier One documentation for these. They include:
-
- * Blacklisting interfaces you want to make sure ZeroTier doesn't use for network traffic, such as VPNs, slow links, or backplanes designated for only certain kinds of traffic.
- * Turning uPnP/NAT-PMP on or off.
- * Configuring software updates on Windows and Mac platforms.
- * Defining trusted paths (the old trusted paths file is now deprecated)
- * Setting the ZeroTier main port so it doesn't have to be changed on the command line, which is very inconvenient in many cases.
-
-### Improved In-Band Software Updates
-
-A good software update system for Windows and Mac clients has been a missing feature in previous versions. It does exist but we've been shy about using it so far due to its fragility in some environments.
-
-We've greatly improved this mechanism in 1.2.0. Not only does it now do a better job of actually invoking the update, but it also transfers updates in-band using the ZeroTier protocol. This means it can work in environments that do not allows http/https traffic or that force it through proxies. There's also now an update channel setting: `beta` or `release` (the default).
-
-Software updates are authenticated three ways:
-
- 1. ZeroTier's own signing key is used to sign all updates and this signature is checked prior to installation. ZeroTier, Inc.'s signatures are performed on an air-gapped machine.
-
- 2. Updates for Mac and Windows are signed using Apple and Microsoft (DigiCert EV) keys and will not install unless these signatures are also valid.
-
- 3. The new in-band update mechanism also authenticates the source of the update via ZeroTier's built-in security features. This provides transport security, while 1 and 2 provide security of the update at rest.
-
-Updates are now configurable via `local.conf`. There are three options: `disable`, `download`, and `apply`. The third (apply) is the default for official builds on Windows and Mac, making updates happen silently and automatically as they do for popular browsers like Chrome and Firefox. Updates are disabled by default on Linux and other Unix-type systems as these are typically updated through package managers.
-
-### Path Link Quality Awareness
-
-Version 1.2.0 is now aware of the link quality of direct paths with other 1.2.0 nodes. This information isn't used yet but is visible through the JSON API. (Quality always shows as 100% with pre-1.2.0 nodes.) Quality is measured passively with no additional overhead using a counter based packet loss detection algorithm.
-
-This information is visible from the command line via `listpeers`:
-
-    200 listpeers XXXXXXXXXX 199.XXX.XXX.XXX/9993;10574;15250;1.00 48 1.2.0 LEAF
-    200 listpeers XXXXXXXXXX 195.XXX.XXX.XXX/45584;467;7608;0.44 290 1.2.0 LEAF
-
-The first peer's path is at 100% (1.00), while the second peer's path is suffering quite a bit of packet loss (0.44).
-
-Link quality awareness is a precursor to intelligent multi-path and QoS support, which will in future versions bring us to feature parity with SD-WAN products like Cisco iWAN.
-
-### Security Improvements
-
-Version 1.2.0 adds anti-DOS (denial of service) rate limits and other hardening for improved resiliency against a number of denial of service attack scenarios.
-
-It also adds a mechanism for instantaneous credential revocation. This can be used to revoke certificates of membership instantly to kick a node off a network (for private networks) and also to revoke capabilities and tags. The new controller sends revocations by default when a peer is de-authorized.
-
-Revocations propagate using a "rumor mill" peer to peer algorithm. This means that a controller need only successfully send a revocation to at least one member of a network with connections to other active members. At this point the revocation will flood through the network peer to peer very quickly. This helps make revocations more robust in the face of poor connectivity with the controller or attempts to incapacitate the controller with denial of service attacks, as well as making revocations faster on huge networks.
-
-### Windows and Macintosh UI Improvements (ZeroTier One)
-
-The Mac has a whole new UI built natively in Objective-C. It provides a pulldown similar in appearance and operation to the Mac WiFi task bar menu.
-
-The Windows UI has also been improved and now provides a task bar icon that can be right-clicked to manage networks. Both now expose managed route and IP permissions, allowing nodes to easily opt in to full tunnel operation if you have a router configured on your network.
-
-### Ad-Hoc Networks
-
-A special kind of public network called an ad-hoc network may be accessed by joining a network ID with the format:
-
-    ffSSSSEEEE000000
-    | |   |   |
-    | |   |   Reserved for future use, must be 0
-    | |   End of port range (hex)
-    | Start of port range (hex)
-    Reserved ZeroTier address prefix indicating a controller-less network
-
-Ad-hoc networks are public (no access control) networks that have no network controller. Instead their configuration and other credentials are generated locally. Ad-hoc networks permit only IPv6 UDP and TCP unicast traffic (no multicast or broadcast) using 6plane format NDP-emulated IPv6 addresses. In addition an ad-hoc network ID encodes an IP port range. UDP packets and TCP SYN (connection open) packets are only allowed to destination ports within the encoded range.
-
-For example `ff00160016000000` is an ad-hoc network allowing only SSH, while `ff0000ffff000000` is an ad-hoc network allowing any UDP or TCP port.
-
-Keep in mind that these networks are public and anyone in the entire world can join them. Care must be taken to avoid exposing vulnerable services or sharing unwanted files or other resources.
-
-### Network Controller (Partial) Rewrite
-
-The network controller has been largely rewritten to use a simple in-filesystem JSON data store in place of SQLite, and it is now included by default in all Windows, Mac, Linux, and BSD builds. This means any desktop or server node running ZeroTier One can now be a controller with no recompilation needed.
-
-If you have data in an old SQLite3 controller we've included a NodeJS script in `controller/migrate-sqlite` to migrate data to the new format. If you don't migrate, members will start getting `NOT_FOUND` when they attempt to query for updates.
-
-## Major Bug Fixes in 1.2.0
-
- * **The Windows HyperV 100% CPU bug is FINALLY DEAD**: This long-running problem turns out to have been an issue with Windows itself, but one we were triggering by placing invalid data into the Windows registry. Microsoft is aware of the issue but we've also fixed the triggering problem on our side. ZeroTier should now co-exist quite well with HyperV and should now be able to be bridged with a HyperV virtual switch.
- * **Segmentation faults on musl-libc based Linux systems**: Alpine Linux and some embedded Linux systems that use musl libc (a minimal libc) experienced segmentation faults. These were due to a smaller default stack size. A work-around that sets the stack size for new threads has been added.
- * **Windows firewall blocks local JSON API**: On some Windows systems the firewall likes to block 127.0.0.1:9993 for mysterious reasons. This is now fixed in the installer via the addition of another firewall exemption rule.
- * **UI crash on embedded Windows due to missing fonts**: The MSI installer now ships fonts and will install them if they are not present, so this should be fixed.
-
-## Other Improvements in 1.2.0
-
- * **Improved dead path detection**: ZeroTier is now more aggressive about expiring paths that do not seem to be active. If a path seems marginal it is re-confirmed before re-use.
- * **Minor performance improvements**: We've reduced unnecessary memcpy's and made a few other performance improvements in the core.
- * **Linux static binaries**: For our official packages (the ones in the download.zerotier.com apt and yum repositories) we now build Linux binaries with static linking. Hopefully this will stop all the bug reports relating to library inconsistencies, as well as allowing our deb packages to run on a wider variety of Debian-based distributions. (There are far too many of these to support officially!) The overhead for this is very small, especially since we built our static versions against musl-libc. Distribution maintainers are of course free to build dynamically linked versions for inclusion into distributions; this only affects our official binaries.
diff --git a/SECURITY.md b/SECURITY.md
deleted file mode 100644
index c539ed6a2..000000000
--- a/SECURITY.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# Security
-
-ZeroTier takes the security of our software products and services seriously, which 
-includes all source code repositories managed through our GitHub organization.
-
-## Supported Versions
-
-The following versions of ZeroTier One receive security updates
-
-| Version  | Supported          |
-| -------- | ------------------ |
-| 1.14.x   | :white_check_mark: |
-| 1.12.x   | :white_check_mark: |
-| < 1.12.0 | :x:                |
-
-## Reporting a Vulnerability
-
-**Please do not report security issues through public GitHub issues**
-
-Instead, please report vulnerabilities via email to security@zerotier.com. If possible,
-please encrypt with our PGP key (see below).
-
-Please include the following information, or as much as you can provide to help us 
-understand the nature and scope of the issue:
-
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
-  * Full paths of source file(s) related to the manifestation of the issue
-  * The location of the affected source code (tag/branch/commit or direct URL)
-  * Any special configuration required to reproduce the issue
-  * Step-by-step instructions to reproduce the issue
-  * Proof-of-concept or exploit code (if possible)
-  * Impact of the issue, including how an attacker might exploit the issue
-
-## Preferred Languages
-
-We prefer all communications to be in English.
-
-## security@zerotier.com PGP key
-
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGQGOVIBEACalXTnNqaiSOVLFEiqHpDMg8N/OI5D5850Xy1ZEvx3B3rz7cbn
-k30ozHtJKbh+vqpyItE7DjyQAuF19gP5Q64Yh0Y+MmLHq60q/GwOwAYz7cI+UzA3
-5x8YqcmTp32LAM1xJn+iMlMLBuAmJl4kULKmOXPlpqPiyTFs5saizvm7fgRmfgJJ
-HpsnIrTkaDFJhAR+jvMJohVYwmhuydeI0DsHu7KGpG1ddcHDrUjOPNqXnnAPSPwx
-llw4yfKlQb8GYErsv/G5QVyzd5+SxEuiI4MARRnrk8LlMQ33CR6pzIQ/Bk5AAmye
-mHqfEAknkiOf++urYhRs9BL3Kz3MdV0cg92zr9EFOg0u56jxf5OnAiTOhGUUA0hn
-dS7peVGl46R9Oy2JYIazNDGi+4NIsYDFXsnsss9xOQVygPyeQd71zFHfix0jct9w
-j3o/kj7Egsnm9nc13354bYT6bbalqXiRWwGH1eAFpjueNWiVFwZS6NZUP3WeNDiY
-BlPo1LodvolbXiJcTILTCyEkERJPCK2zoE2nTdVfvTLWsuehw1M6Yd2/q74TVYy/
-RY+KjHkrChEBQ9PqXsXRHj6opKbT8JLfZkvU5k+3IiqqxOpB+QXFI/whj493CxWW
-so7QAmzOCyJq8GDVPxzkwUac22YIkXdiOmb8i/HWq+kLY/HjQE259Gx6KwARAQAB
-tClaZXJvVGllciBTZWN1cml0eSA8c2VjdXJpdHlAemVyb3RpZXIuY29tPokCTAQT
-AQoANhYhBH1HQGb+4jzl6mnFqf09m6uqADkABQJkBjlSAhsDBAsJCAcEFQoJCAUW
-AgMBAAIeAQIXgAAKCRD9PZurqgA5ACqPD/sFt6SG6Tu0HwTY2ofJtYsa2GBLL0pf
-dYlX4cWSs1PVB5+m5Oj18y+GB2umA9GnsVtmvaSfp3XEngt2zNWX27uUsVfL35b2
-/5TVVe8RjzOedqMN+lQWMvO+f/C1zmWYXjjpC+iGjgMMaRRrofkkn+7uL4N9y6gY
-rcXtpACT1rYFC+i1AKnZfUO8Vr5ji7odq0f7bDkN/N38rB0kRRwEmO8wqdpQK6gK
-nxf9vgJl5ggimDk5Xtz1sfd3y28bf5N4hdOCkXUbd10nUFY3wDNTM4VxozxTGJeG
-imdcc19Wuw/1fGUZ5SIjgPanCdPLGYwSTr+M6Fuern9uTtlC1GOby3BUtmVGP6EU
-1pSAJSRpmoBPHKKOYtSMwV8PCboXru9P1ab8y8STKM3SKyghUJrl17gdc0LaksZa
-E54pJudGPIQMFRqZjMdV6jgMuaLTozjZ4mW8EThf4mkX4xDkO8l7cOn0225ZYJZC
-lZKpdnwzk9owkJA80u4KBNJxTtB4ZAPzjBsD5hFzCZQTLNQp/psU3EjZsau28eXT
-E/C1QjEQHgy4ohkgQlCm1H1+clKssCWcdmsVGXuS1u8gh4K6X9b0Z6LeCGRaQvH2
-+DB8oTAdqp9nUZv9rP4pbo+sR4fF67CFLriVuxjedAiFkbM4uHMFcL4tc/X9+DRo
-YN5X7oEkZvO507kCDQRkBjlSARAAz58UMF7K1qKyQjzKTcutaYZ5SaIGky9lCLZn
-/2vjpFCoBogkxS/6IKQcwZk8b4S9QstaaQZDFEkxqNeKC0GiFTAMAb6SmYcK495h
-EZnHl0NA5Nc2dBlZk5E/ENzTCz2bXaxCcVESc2z+xCzu07brbhGrqvliKiwOUzt9
-JzqEsar6I95OutBcZvkFCs44/Uf9bS1qf1w4klE8w3vdMtGH23umrET4tFZ+sh6o
-ZFtQx0u2eKjsRdn/RMtsxLNaJlcE1DdIAqBpQrcmuwMC8v5wUGfCGZjhClzmyQlq
-akUkayir7UtbHbFT/mgO+YI77YGXWk5QrwPscqqT2l8KB/YMujNDmaWa/0KV1lIY
-zr5s4dzVeiwqFLR9ANFIhzFwzf3JLi6XSx123Qix0TxZoYPZCHl7yoi9qi6qybz5
-0Od2LSz3jbApeKYymZ+zjE+YV5y9DI6Wzy1j2M1FogNvTO9fMk+6dLt4HhTdSNvH
-cKya462YCcy+tnZTkhmh+FTebbJlV6D4wG7skE5KCdBhjm53xLwp6XW9L6n2CrkL
-W1IDBcCz0oPd1sMkXbO3wnxdXprV2XurCfsg/R2nszSNzvdJ8/xj3cr9hpoJ714R
-qqyoEDRZ1Ss9kGL166o5MpN5qb/EewdkqGgWP7YFXbhsdHQiW7Z7dAqzjoaybD4O
-nakkwyUAEQEAAYkCNgQYAQoAIBYhBH1HQGb+4jzl6mnFqf09m6uqADkABQJkBjlS
-AhsMAAoJEP09m6uqADkAax0P/Rh8EZYRqW6dPYTl1YQusAK10rAcRNq3ekjofXGk
-oXK1S7HWGoFgl5++5nfSfNgFJ5VLcgIM56wtIf49zFjWe5oC6fw8k+ghh4d2chMP
-hdDILx6e0c30Iq1+EvovGR9hWa0wJ4cKTdzlwhY9ZC09q0ia+bl2mwpie1JQDR0c
-zXCjt+PldLeeK9z1/XT0Q7KowYC+U18oR+KFm+EaRV4QT85JVequnIeGkmaHJrHB
-lH4T5A5ib7y8edon1c0Zx3GsaxJUojkEJ0SX7ffVDu6ztUZfkHfCVpMW4VzUeGA/
-m+CtFO9ciLRGZEkRa+zhIGoBvwEXU0GiwiF4nZ0F2C8UioeW0YIEV9zl3nXJctYE
-ZKc2whSENQRTGgaYHVoVZhznt71LKWgFLshwBo81UCXVkzwAjMW1ActDnmPw5M7q
-xR5Qp5G49Z1GmfSozazha0HVFPKNV5i3RlTzs4yLUnZyH0yC9IvtOefMHcLjG96L
-N5miEV97gvJJjrn8rhRvpUwAWgmT/9IuYjBNQTtNN40arto5HxezR76WCjdKYxdL
-p3dM1iiBDShHNm7LdyZlLFhTOMU0tNBxJJ7B09ar5gakeZjD+2aB1ODX9VuFtozL
-onBjI2gIkry0UIkuznHfFw05lZAZAiqHEVgVi/WTk4C/bklDZNgE0lx+IWzEz2iS
-L455
-=lheL
------END PGP PUBLIC KEY BLOCK-----
-```
diff --git a/artwork/AppIcon_1024x1024.png b/artwork/AppIcon_1024x1024.png
deleted file mode 100644
index c423c4f73..000000000
Binary files a/artwork/AppIcon_1024x1024.png and /dev/null differ
diff --git a/artwork/AppIcon_20x20.png b/artwork/AppIcon_20x20.png
deleted file mode 100644
index bb10b4781..000000000
Binary files a/artwork/AppIcon_20x20.png and /dev/null differ
diff --git a/artwork/AppIcon_60x60.png b/artwork/AppIcon_60x60.png
deleted file mode 100644
index bb46ae750..000000000
Binary files a/artwork/AppIcon_60x60.png and /dev/null differ
diff --git a/artwork/AppIcon_90x90.png b/artwork/AppIcon_90x90.png
deleted file mode 100644
index 0a618bbbb..000000000
Binary files a/artwork/AppIcon_90x90.png and /dev/null differ
diff --git a/artwork/ZeroTierIcon32x32.png b/artwork/ZeroTierIcon32x32.png
deleted file mode 100644
index 24ff0a1cc..000000000
Binary files a/artwork/ZeroTierIcon32x32.png and /dev/null differ
diff --git a/attic/Filter.cpp b/attic/Filter.cpp
new file mode 100644
index 000000000..a701e8b70
--- /dev/null
+++ b/attic/Filter.cpp
@@ -0,0 +1,408 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include <algorithm>
+
+#include "RuntimeEnvironment.hpp"
+#include "Logger.hpp"
+#include "Filter.hpp"
+#include "Utils.hpp"
+
+namespace ZeroTier {
+
+const char *const Filter::UNKNOWN_NAME = "(unknown)";
+const Range<unsigned int> Filter::ANY;
+
+static inline Range<unsigned int> __parseRange(char *r)
+	throw(std::invalid_argument)
+{
+	char *saveptr = (char *)0;
+	unsigned int a = 0;
+	unsigned int b = 0;
+	unsigned int fn = 0;
+	for(char *f=Utils::stok(r,"-",&saveptr);(f);f=Utils::stok((char *)0,"-",&saveptr)) {
+		if (*f) {
+			switch(fn++) {
+				case 0:
+					if (*f != '*')
+						a = b = (unsigned int)strtoul(f,(char **)0,10);
+					break;
+				case 1:
+					if (*f != '*')
+						b = (unsigned int)strtoul(f,(char **)0,10);
+					break;
+				default:
+					throw std::invalid_argument("rule range must be <int>, <int>-<int>, or *");
+			}
+		}
+	}
+	return Range<unsigned int>(a,b);
+}
+
+Filter::Rule::Rule(const char *s)
+	throw(std::invalid_argument)
+{
+	char *saveptr = (char *)0;
+	char tmp[256];
+	if (!Utils::scopy(tmp,sizeof(tmp),s))
+		throw std::invalid_argument("rule string too long");
+	unsigned int fn = 0;
+	for(char *f=Utils::stok(tmp,";",&saveptr);(f);f=Utils::stok((char *)0,";",&saveptr)) {
+		if (*f) {
+			switch(fn++) {
+				case 0:
+					_etherType = __parseRange(f);
+					break;
+				case 1:
+					_protocol = __parseRange(f);
+					break;
+				case 2:
+					_port = __parseRange(f);
+					break;
+				default:
+					throw std::invalid_argument("rule string has unknown extra fields");
+			}
+		}
+	}
+	if (fn != 3)
+		throw std::invalid_argument("rule string must contain 3 fields");
+}
+
+bool Filter::Rule::operator()(unsigned int etype,const void *data,unsigned int len) const
+	throw(std::invalid_argument)
+{
+	if ((!_etherType)||(_etherType(etype))) { // ethertype is ANY, or matches
+		// Ethertype determines meaning of protocol and port
+		switch(etype) {
+			case ZT_ETHERTYPE_IPV4:
+				if (len > 20) {
+					if ((!_protocol)||(_protocol(((const uint8_t *)data)[9]))) { // protocol is ANY or match
+						if (!_port) // port is ANY
+							return true;
+
+						// Don't match on fragments beyond fragment 0. If we've blocked
+						// fragment 0, further fragments will fall on deaf ears anyway.
+						if ((Utils::ntoh(((const uint16_t *)data)[3]) & 0x1fff))
+							return false;
+
+						// Internet header length determines where data begins, in multiples of 32 bits
+						unsigned int ihl = 4 * (((const uint8_t *)data)[0] & 0x0f);
+
+						switch(((const uint8_t *)data)[9]) { // port's meaning depends on IP protocol
+							case ZT_IPPROTO_ICMP:
+								// For ICMP, port is ICMP type
+								return _port(((const uint8_t *)data)[ihl]);
+							case ZT_IPPROTO_TCP:
+							case ZT_IPPROTO_UDP:
+							case ZT_IPPROTO_SCTP:
+							case ZT_IPPROTO_UDPLITE:
+								// For these, port is destination port. Protocol designers were
+								// nice enough to put the field in the same place.
+								return _port(((const uint16_t *)data)[(ihl / 2) + 1]);
+							default:
+								// port has no meaning for other IP types, so ignore it
+								return true;
+						}
+
+						return false; // no match on port
+					}
+				} else throw std::invalid_argument("undersized IPv4 packet");
+				break;
+
+			case ZT_ETHERTYPE_IPV6:
+				if (len > 40) {
+					int nextHeader = ((const uint8_t *)data)[6];
+					unsigned int pos = 40;
+					while ((pos < len)&&(nextHeader >= 0)&&(nextHeader != 59)) { // 59 == no next header
+						fprintf(stderr,"[rule] V6: start header parse, header %.2x pos %d\n",nextHeader,pos);
+
+						switch(nextHeader) {
+							case 0: // hop-by-hop options
+							case 60: // destination options
+							case 43: // routing
+							case 135: // mobility (mobile IPv6 options)
+								if (_protocol((unsigned int)nextHeader))
+									return true; // match if our goal was to match any of these
+								nextHeader = ((const uint8_t *)data)[pos];
+								pos += 8 + (8 * ((const uint8_t *)data)[pos + 1]);
+								break;
+							case 44: // fragment
+								if (_protocol(44))
+									return true; // match if our goal was to match fragments
+								nextHeader = ((const uint8_t *)data)[pos];
+								pos += 8;
+								break;
+							case ZT_IPPROTO_AH: // AH
+								return _protocol(ZT_IPPROTO_AH); // true if AH is matched protocol, otherwise false since packet will be IPsec
+							case ZT_IPPROTO_ESP: // ESP
+								return _protocol(ZT_IPPROTO_ESP); // true if ESP is matched protocol, otherwise false since packet will be IPsec
+							case ZT_IPPROTO_ICMPV6:
+								// Only match ICMPv6 if we've selected it specifically
+								if (_protocol(ZT_IPPROTO_ICMPV6)) {
+									// Port is interpreted as ICMPv6 type
+									if ((!_port)||(_port(((const uint8_t *)data)[pos])))
+										return true;
+								}
+								break;
+							case ZT_IPPROTO_TCP:
+							case ZT_IPPROTO_UDP:
+							case ZT_IPPROTO_SCTP:
+							case ZT_IPPROTO_UDPLITE:
+								// If we encounter any of these, match if protocol matches or is wildcard as
+								// we'll consider these the "real payload" if present.
+								if ((!_protocol)||(_protocol(nextHeader))) {
+									if ((!_port)||(_port(((const uint16_t *)data)[(pos / 2) + 1])))
+										return true; // protocol matches or is ANY, port is ANY or matches
+								}
+								break;
+							default: {
+								char foo[128];
+								Utils::snprintf(foo,sizeof(foo),"unrecognized IPv6 header type %d",(int)nextHeader);
+								throw std::invalid_argument(foo);
+							}
+						}
+
+						fprintf(stderr,"[rule] V6: end header parse, next header %.2x, new pos %d\n",nextHeader,pos);
+					}
+				} else throw std::invalid_argument("undersized IPv6 packet");
+				break;
+
+			default:
+				// For other ethertypes, protocol and port are ignored. What would they mean?
+				return true;
+		}
+	}
+
+	return false;
+}
+
+std::string Filter::Rule::toString() const
+{
+	char buf[128];
+	std::string s;
+
+	switch(_etherType.magnitude()) {
+		case 0:
+			s.push_back('*');
+			break;
+		case 1:
+			Utils::snprintf(buf,sizeof(buf),"%u",_etherType.start);
+			s.append(buf);
+			break;
+		default:
+			Utils::snprintf(buf,sizeof(buf),"%u-%u",_etherType.start,_etherType.end);
+			s.append(buf);
+			break;
+	}
+	s.push_back(';');
+	switch(_protocol.magnitude()) {
+		case 0:
+			s.push_back('*');
+			break;
+		case 1:
+			Utils::snprintf(buf,sizeof(buf),"%u",_protocol.start);
+			s.append(buf);
+			break;
+		default:
+			Utils::snprintf(buf,sizeof(buf),"%u-%u",_protocol.start,_protocol.end);
+			s.append(buf);
+			break;
+	}
+	s.push_back(';');
+	switch(_port.magnitude()) {
+		case 0:
+			s.push_back('*');
+			break;
+		case 1:
+			Utils::snprintf(buf,sizeof(buf),"%u",_port.start);
+			s.append(buf);
+			break;
+		default:
+			Utils::snprintf(buf,sizeof(buf),"%u-%u",_port.start,_port.end);
+			s.append(buf);
+			break;
+	}
+
+	return s;
+}
+
+Filter::Filter(const char *s)
+	throw(std::invalid_argument)
+{
+	char tmp[16384];
+	if (!Utils::scopy(tmp,sizeof(tmp),s))
+		throw std::invalid_argument("filter string too long");
+	char *saveptr = (char *)0;
+	unsigned int fn = 0;
+	for(char *f=Utils::stok(tmp,",",&saveptr);(f);f=Utils::stok((char *)0,",",&saveptr)) {
+		try {
+			_rules.push_back(Rule(f));
+			++fn;
+		} catch (std::invalid_argument &exc) {
+			char tmp[256];
+			Utils::snprintf(tmp,sizeof(tmp),"invalid rule at index %u: %s",fn,exc.what());
+			throw std::invalid_argument(tmp);
+		}
+	}
+	std::sort(_rules.begin(),_rules.end());
+}
+
+std::string Filter::toString() const
+{
+	std::string s;
+
+	for(std::vector<Rule>::const_iterator r(_rules.begin());r!=_rules.end();++r) {
+		if (s.length() > 0)
+			s.push_back(',');
+		s.append(r->toString());
+	}
+
+	return s;
+}
+
+void Filter::add(const Rule &r)
+{
+	for(std::vector<Rule>::iterator rr(_rules.begin());rr!=_rules.end();++rr) {
+		if (r == *rr)
+			return;
+	}
+	_rules.push_back(r);
+	std::sort(_rules.begin(),_rules.end());
+}
+
+const char *Filter::etherTypeName(const unsigned int etherType)
+	throw()
+{
+	switch(etherType) {
+		case ZT_ETHERTYPE_IPV4:  return "ETHERTYPE_IPV4";
+		case ZT_ETHERTYPE_ARP:   return "ETHERTYPE_ARP";
+		case ZT_ETHERTYPE_RARP:  return "ETHERTYPE_RARP";
+		case ZT_ETHERTYPE_ATALK: return "ETHERTYPE_ATALK";
+		case ZT_ETHERTYPE_AARP:  return "ETHERTYPE_AARP";
+		case ZT_ETHERTYPE_IPX_A: return "ETHERTYPE_IPX_A";
+		case ZT_ETHERTYPE_IPX_B: return "ETHERTYPE_IPX_B";
+		case ZT_ETHERTYPE_IPV6:  return "ETHERTYPE_IPV6";
+	}
+	return UNKNOWN_NAME;
+}
+
+const char *Filter::ipProtocolName(const unsigned int ipp)
+	throw()
+{
+	switch(ipp) {
+		case ZT_IPPROTO_ICMP:    return "IPPROTO_ICMP";
+		case ZT_IPPROTO_IGMP:    return "IPPROTO_IGMP";
+		case ZT_IPPROTO_TCP:     return "IPPROTO_TCP";
+		case ZT_IPPROTO_UDP:     return "IPPROTO_UDP";
+		case ZT_IPPROTO_GRE:     return "IPPROTO_GRE";
+		case ZT_IPPROTO_ESP:     return "IPPROTO_ESP";
+		case ZT_IPPROTO_AH:      return "IPPROTO_AH";
+		case ZT_IPPROTO_ICMPV6:  return "IPPROTO_ICMPV6";
+		case ZT_IPPROTO_OSPF:    return "IPPROTO_OSPF";
+		case ZT_IPPROTO_IPIP:    return "IPPROTO_IPIP";
+		case ZT_IPPROTO_IPCOMP:  return "IPPROTO_IPCOMP";
+		case ZT_IPPROTO_L2TP:    return "IPPROTO_L2TP";
+		case ZT_IPPROTO_SCTP:    return "IPPROTO_SCTP";
+		case ZT_IPPROTO_FC:      return "IPPROTO_FC";
+		case ZT_IPPROTO_UDPLITE: return "IPPROTO_UDPLITE";
+		case ZT_IPPROTO_HIP:     return "IPPROTO_HIP";
+	}
+	return UNKNOWN_NAME;
+}
+
+const char *Filter::icmpTypeName(const unsigned int icmpType)
+	throw()
+{
+	switch(icmpType) {
+		case ZT_ICMP_ECHO_REPLY:                  return "ICMP_ECHO_REPLY";
+		case ZT_ICMP_DESTINATION_UNREACHABLE:     return "ICMP_DESTINATION_UNREACHABLE";
+		case ZT_ICMP_SOURCE_QUENCH:               return "ICMP_SOURCE_QUENCH";
+		case ZT_ICMP_REDIRECT:                    return "ICMP_REDIRECT";
+		case ZT_ICMP_ALTERNATE_HOST_ADDRESS:      return "ICMP_ALTERNATE_HOST_ADDRESS";
+		case ZT_ICMP_ECHO_REQUEST:                return "ICMP_ECHO_REQUEST";
+		case ZT_ICMP_ROUTER_ADVERTISEMENT:        return "ICMP_ROUTER_ADVERTISEMENT";
+		case ZT_ICMP_ROUTER_SOLICITATION:         return "ICMP_ROUTER_SOLICITATION";
+		case ZT_ICMP_TIME_EXCEEDED:               return "ICMP_TIME_EXCEEDED";
+		case ZT_ICMP_BAD_IP_HEADER:               return "ICMP_BAD_IP_HEADER";
+		case ZT_ICMP_TIMESTAMP:                   return "ICMP_TIMESTAMP";
+		case ZT_ICMP_TIMESTAMP_REPLY:             return "ICMP_TIMESTAMP_REPLY";
+		case ZT_ICMP_INFORMATION_REQUEST:         return "ICMP_INFORMATION_REQUEST";
+		case ZT_ICMP_INFORMATION_REPLY:           return "ICMP_INFORMATION_REPLY";
+		case ZT_ICMP_ADDRESS_MASK_REQUEST:        return "ICMP_ADDRESS_MASK_REQUEST";
+		case ZT_ICMP_ADDRESS_MASK_REPLY:          return "ICMP_ADDRESS_MASK_REPLY";
+		case ZT_ICMP_TRACEROUTE:                  return "ICMP_TRACEROUTE";
+		case ZT_ICMP_MOBILE_HOST_REDIRECT:        return "ICMP_MOBILE_HOST_REDIRECT";
+		case ZT_ICMP_MOBILE_REGISTRATION_REQUEST: return "ICMP_MOBILE_REGISTRATION_REQUEST";
+		case ZT_ICMP_MOBILE_REGISTRATION_REPLY:   return "ICMP_MOBILE_REGISTRATION_REPLY";
+	}
+	return UNKNOWN_NAME;
+}
+
+const char *Filter::icmp6TypeName(const unsigned int icmp6Type)
+	throw()
+{
+	switch(icmp6Type) {
+		case ZT_ICMP6_DESTINATION_UNREACHABLE:              return "ICMP6_DESTINATION_UNREACHABLE";
+		case ZT_ICMP6_PACKET_TOO_BIG:                       return "ICMP6_PACKET_TOO_BIG";
+		case ZT_ICMP6_TIME_EXCEEDED:                        return "ICMP6_TIME_EXCEEDED";
+		case ZT_ICMP6_PARAMETER_PROBLEM:                    return "ICMP6_PARAMETER_PROBLEM";
+		case ZT_ICMP6_ECHO_REQUEST:                         return "ICMP6_ECHO_REQUEST";
+		case ZT_ICMP6_ECHO_REPLY:                           return "ICMP6_ECHO_REPLY";
+		case ZT_ICMP6_MULTICAST_LISTENER_QUERY:             return "ICMP6_MULTICAST_LISTENER_QUERY";
+		case ZT_ICMP6_MULTICAST_LISTENER_REPORT:            return "ICMP6_MULTICAST_LISTENER_REPORT";
+		case ZT_ICMP6_MULTICAST_LISTENER_DONE:              return "ICMP6_MULTICAST_LISTENER_DONE";
+		case ZT_ICMP6_ROUTER_SOLICITATION:                  return "ICMP6_ROUTER_SOLICITATION";
+		case ZT_ICMP6_ROUTER_ADVERTISEMENT:                 return "ICMP6_ROUTER_ADVERTISEMENT";
+		case ZT_ICMP6_NEIGHBOR_SOLICITATION:                return "ICMP6_NEIGHBOR_SOLICITATION";
+		case ZT_ICMP6_NEIGHBOR_ADVERTISEMENT:               return "ICMP6_NEIGHBOR_ADVERTISEMENT";
+		case ZT_ICMP6_REDIRECT_MESSAGE:                     return "ICMP6_REDIRECT_MESSAGE";
+		case ZT_ICMP6_ROUTER_RENUMBERING:                   return "ICMP6_ROUTER_RENUMBERING";
+		case ZT_ICMP6_NODE_INFORMATION_QUERY:               return "ICMP6_NODE_INFORMATION_QUERY";
+		case ZT_ICMP6_NODE_INFORMATION_RESPONSE:            return "ICMP6_NODE_INFORMATION_RESPONSE";
+		case ZT_ICMP6_INV_NEIGHBOR_SOLICITATION:            return "ICMP6_INV_NEIGHBOR_SOLICITATION";
+		case ZT_ICMP6_INV_NEIGHBOR_ADVERTISEMENT:           return "ICMP6_INV_NEIGHBOR_ADVERTISEMENT";
+		case ZT_ICMP6_MLDV2:                                return "ICMP6_MLDV2";
+		case ZT_ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REQUEST: return "ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REQUEST";
+		case ZT_ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REPLY:   return "ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REPLY";
+		case ZT_ICMP6_MOBILE_PREFIX_SOLICITATION:           return "ICMP6_MOBILE_PREFIX_SOLICITATION";
+		case ZT_ICMP6_MOBILE_PREFIX_ADVERTISEMENT:          return "ICMP6_MOBILE_PREFIX_ADVERTISEMENT";
+		case ZT_ICMP6_CERTIFICATION_PATH_SOLICITATION:      return "ICMP6_CERTIFICATION_PATH_SOLICITATION";
+		case ZT_ICMP6_CERTIFICATION_PATH_ADVERTISEMENT:     return "ICMP6_CERTIFICATION_PATH_ADVERTISEMENT";
+		case ZT_ICMP6_MULTICAST_ROUTER_ADVERTISEMENT:       return "ICMP6_MULTICAST_ROUTER_ADVERTISEMENT";
+		case ZT_ICMP6_MULTICAST_ROUTER_SOLICITATION:        return "ICMP6_MULTICAST_ROUTER_SOLICITATION";
+		case ZT_ICMP6_MULTICAST_ROUTER_TERMINATION:         return "ICMP6_MULTICAST_ROUTER_TERMINATION";
+		case ZT_ICMP6_RPL_CONTROL_MESSAGE:                  return "ICMP6_RPL_CONTROL_MESSAGE";
+	}
+	return UNKNOWN_NAME;
+}
+
+} // namespace ZeroTier
diff --git a/attic/Filter.hpp b/attic/Filter.hpp
new file mode 100644
index 000000000..4bea3715d
--- /dev/null
+++ b/attic/Filter.hpp
@@ -0,0 +1,284 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef _ZT_FILTER_HPP
+#define _ZT_FILTER_HPP
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <stdexcept>
+
+#include "Range.hpp"
+
+/* Ethernet frame types that might be relevant to us */
+#define ZT_ETHERTYPE_IPV4 0x0800
+#define ZT_ETHERTYPE_ARP 0x0806
+#define ZT_ETHERTYPE_RARP 0x8035
+#define ZT_ETHERTYPE_ATALK 0x809b
+#define ZT_ETHERTYPE_AARP 0x80f3
+#define ZT_ETHERTYPE_IPX_A 0x8137
+#define ZT_ETHERTYPE_IPX_B 0x8138
+#define ZT_ETHERTYPE_IPV6 0x86dd
+
+/* IP protocols we might care about */
+#define ZT_IPPROTO_ICMP 0x01
+#define ZT_IPPROTO_IGMP 0x02
+#define ZT_IPPROTO_TCP 0x06
+#define ZT_IPPROTO_UDP 0x11
+#define ZT_IPPROTO_GRE 0x2f
+#define ZT_IPPROTO_ESP 0x32
+#define ZT_IPPROTO_AH 0x33
+#define ZT_IPPROTO_ICMPV6 0x3a
+#define ZT_IPPROTO_OSPF 0x59
+#define ZT_IPPROTO_IPIP 0x5e
+#define ZT_IPPROTO_IPCOMP 0x6c
+#define ZT_IPPROTO_L2TP 0x73
+#define ZT_IPPROTO_SCTP 0x84
+#define ZT_IPPROTO_FC 0x85
+#define ZT_IPPROTO_UDPLITE 0x88
+#define ZT_IPPROTO_HIP 0x8b
+
+/* IPv4 ICMP types */
+#define ZT_ICMP_ECHO_REPLY 0
+#define ZT_ICMP_DESTINATION_UNREACHABLE 3
+#define ZT_ICMP_SOURCE_QUENCH 4
+#define ZT_ICMP_REDIRECT 5
+#define ZT_ICMP_ALTERNATE_HOST_ADDRESS 6
+#define ZT_ICMP_ECHO_REQUEST 8
+#define ZT_ICMP_ROUTER_ADVERTISEMENT 9
+#define ZT_ICMP_ROUTER_SOLICITATION 10
+#define ZT_ICMP_TIME_EXCEEDED 11
+#define ZT_ICMP_BAD_IP_HEADER 12
+#define ZT_ICMP_TIMESTAMP 13
+#define ZT_ICMP_TIMESTAMP_REPLY 14
+#define ZT_ICMP_INFORMATION_REQUEST 15
+#define ZT_ICMP_INFORMATION_REPLY 16
+#define ZT_ICMP_ADDRESS_MASK_REQUEST 17
+#define ZT_ICMP_ADDRESS_MASK_REPLY 18
+#define ZT_ICMP_TRACEROUTE 30
+#define ZT_ICMP_MOBILE_HOST_REDIRECT 32
+#define ZT_ICMP_MOBILE_REGISTRATION_REQUEST 35
+#define ZT_ICMP_MOBILE_REGISTRATION_REPLY 36
+
+/* IPv6 ICMP types */
+#define ZT_ICMP6_DESTINATION_UNREACHABLE 1
+#define ZT_ICMP6_PACKET_TOO_BIG 2
+#define ZT_ICMP6_TIME_EXCEEDED 3
+#define ZT_ICMP6_PARAMETER_PROBLEM 4
+#define ZT_ICMP6_ECHO_REQUEST 128
+#define ZT_ICMP6_ECHO_REPLY 129
+#define ZT_ICMP6_MULTICAST_LISTENER_QUERY 130
+#define ZT_ICMP6_MULTICAST_LISTENER_REPORT 131
+#define ZT_ICMP6_MULTICAST_LISTENER_DONE 132
+#define ZT_ICMP6_ROUTER_SOLICITATION 133
+#define ZT_ICMP6_ROUTER_ADVERTISEMENT 134
+#define ZT_ICMP6_NEIGHBOR_SOLICITATION 135
+#define ZT_ICMP6_NEIGHBOR_ADVERTISEMENT 136
+#define ZT_ICMP6_REDIRECT_MESSAGE 137
+#define ZT_ICMP6_ROUTER_RENUMBERING 138
+#define ZT_ICMP6_NODE_INFORMATION_QUERY 139
+#define ZT_ICMP6_NODE_INFORMATION_RESPONSE 140
+#define ZT_ICMP6_INV_NEIGHBOR_SOLICITATION 141
+#define ZT_ICMP6_INV_NEIGHBOR_ADVERTISEMENT 142
+#define ZT_ICMP6_MLDV2 143
+#define ZT_ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REQUEST 144
+#define ZT_ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REPLY 145
+#define ZT_ICMP6_MOBILE_PREFIX_SOLICITATION 146
+#define ZT_ICMP6_MOBILE_PREFIX_ADVERTISEMENT 147
+#define ZT_ICMP6_CERTIFICATION_PATH_SOLICITATION 148
+#define ZT_ICMP6_CERTIFICATION_PATH_ADVERTISEMENT 149
+#define ZT_ICMP6_MULTICAST_ROUTER_ADVERTISEMENT 151
+#define ZT_ICMP6_MULTICAST_ROUTER_SOLICITATION 152
+#define ZT_ICMP6_MULTICAST_ROUTER_TERMINATION 153
+#define ZT_ICMP6_RPL_CONTROL_MESSAGE 155
+
+namespace ZeroTier {
+
+class RuntimeEnvironment;
+
+/**
+ * A simple Ethernet frame level filter
+ *
+ * This doesn't specify actions, since it's used as a deny filter. The rule
+ * in ZT1 is "that which is not explicitly prohibited is allowed." (Except for
+ * ethertypes, which are handled by a whitelist.)
+ */
+class Filter
+{
+public:
+	/**
+	 * Value returned by etherTypeName, etc. on unknown
+	 *
+	 * These static methods return precisely this, so a pointer equality
+	 * check will work.
+	 */
+	static const char *const UNKNOWN_NAME;
+
+	/**
+	 * An empty range as a more idiomatic way of specifying a wildcard match
+	 */
+	static const Range<unsigned int> ANY;
+
+	/**
+	 * A filter rule
+	 */
+	class Rule
+	{
+	public:
+		Rule()
+			throw() :
+			_etherType(),
+			_protocol(),
+			_port()
+		{
+		}
+
+		/**
+		 * Construct a rule from a string-serialized value
+		 *
+		 * @param s String formatted rule, such as returned by toString()
+		 * @throws std::invalid_argument String formatted rule is not valid
+		 */
+		Rule(const char *s)
+			throw(std::invalid_argument);
+
+		/**
+		 * Construct a new rule
+		 *
+		 * @param etype Ethernet type or empty range for ANY
+		 * @param prot Protocol or empty range for ANY (meaning depends on ethertype, e.g. IP protocol numbers)
+		 * @param prt Port or empty range for ANY (only applies to some protocols)
+		 */
+		Rule(const Range<unsigned int> &etype,const Range<unsigned int> &prot,const Range<unsigned int> &prt)
+			throw() :
+			_etherType(etype),
+			_protocol(prot),
+			_port(prt)
+		{
+		}
+
+		inline const Range<unsigned int> &etherType() const throw() { return _etherType; }
+		inline const Range<unsigned int> &protocol() const throw() { return _protocol; }
+		inline const Range<unsigned int> &port() const throw() { return _port; }
+
+		/**
+		 * Test this rule against a frame
+		 *
+		 * @param etype Type of ethernet frame
+		 * @param data Ethernet frame data
+		 * @param len Length of ethernet frame
+		 * @return True if rule matches
+		 * @throws std::invalid_argument Frame invalid or not parseable
+		 */
+		bool operator()(unsigned int etype,const void *data,unsigned int len) const
+			throw(std::invalid_argument);
+
+		/**
+		 * Serialize rule as string
+		 *
+		 * @return Human readable representation of rule
+		 */
+		std::string toString() const;
+
+		inline bool operator==(const Rule &r) const throw() { return ((_etherType == r._etherType)&&(_protocol == r._protocol)&&(_port == r._port)); }
+		inline bool operator!=(const Rule &r) const throw() { return !(*this == r); }
+		inline bool operator<(const Rule &r) const
+			throw()
+		{
+			if (_etherType < r._etherType)
+				return true;
+			else if (_etherType == r._etherType) {
+				if (_protocol < r._protocol)
+					return true;
+				else if (_protocol == r._protocol) {
+					if (_port < r._port)
+						return true;
+				}
+			}
+			return false;
+		}
+		inline bool operator>(const Rule &r) const throw() { return (r < *this); }
+		inline bool operator<=(const Rule &r) const throw() { return !(r < *this); }
+		inline bool operator>=(const Rule &r) const throw() { return !(*this < r); }
+
+	private:
+		Range<unsigned int> _etherType;
+		Range<unsigned int> _protocol;
+		Range<unsigned int> _port;
+	};
+
+	Filter() {}
+
+	/**
+	 * @param s String-serialized filter representation
+	 */
+	Filter(const char *s)
+		throw(std::invalid_argument);
+
+	/**
+	 * @return Comma-delimited list of string-format rules
+	 */
+	std::string toString() const;
+
+	/**
+	 * Add a rule to this filter
+	 *
+	 * @param r Rule to add to filter
+	 */
+	void add(const Rule &r);
+
+	inline bool operator()(unsigned int etype,const void *data,unsigned int len) const
+		throw(std::invalid_argument)
+	{
+		for(std::vector<Rule>::const_iterator r(_rules.begin());r!=_rules.end();++r) {
+			if ((*r)(etype,data,len))
+				return true;
+		}
+		return false;
+	}
+
+	static const char *etherTypeName(const unsigned int etherType)
+		throw();
+	static const char *ipProtocolName(const unsigned int ipp)
+		throw();
+	static const char *icmpTypeName(const unsigned int icmpType)
+		throw();
+	static const char *icmp6TypeName(const unsigned int icmp6Type)
+		throw();
+
+private:
+	std::vector<Rule> _rules;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/attic/OSXEthernetTap.cpp.pcap-with-bridge-test b/attic/OSXEthernetTap.cpp.pcap-with-bridge-test
new file mode 100644
index 000000000..60194421c
--- /dev/null
+++ b/attic/OSXEthernetTap.cpp.pcap-with-bridge-test
@@ -0,0 +1,651 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <unistd.h>
+#include <signal.h>
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <sys/select.h>
+#include <sys/cdefs.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/route.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <netinet6/in6_var.h>
+#include <netinet/in_var.h>
+#include <netinet/icmp6.h>
+
+#include <pcap/pcap.h>
+
+// OSX compile fix... in6_var defines this in a struct which namespaces it for C++ ... why?!?
+struct prf_ra {
+	u_char onlink : 1;
+	u_char autonomous : 1;
+	u_char reserved : 6;
+} prf_ra;
+
+#include <netinet6/nd6.h>
+#include <ifaddrs.h>
+
+// These are KERNEL_PRIVATE... why?
+#ifndef SIOCAUTOCONF_START
+#define SIOCAUTOCONF_START _IOWR('i', 132, struct in6_ifreq)    /* accept rtadvd on this interface */
+#endif
+#ifndef SIOCAUTOCONF_STOP
+#define SIOCAUTOCONF_STOP _IOWR('i', 133, struct in6_ifreq)    /* stop accepting rtadv for this interface */
+#endif
+
+#ifndef ETH_ALEN
+#define ETH_ALEN 6
+#endif
+
+// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+// This source is from:
+// http://www.opensource.apple.com/source/Libinfo/Libinfo-406.17/gen.subproj/getifmaddrs.c?txt
+// It's here because OSX 10.6 does not have this convenience function.
+
+#define	SALIGN	(sizeof(uint32_t) - 1)
+#define	SA_RLEN(sa)	((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : \
+(SALIGN + 1))
+#define	MAX_SYSCTL_TRY	5
+#define	RTA_MASKS	(RTA_GATEWAY | RTA_IFP | RTA_IFA)
+
+/* FreeBSD uses NET_RT_IFMALIST and RTM_NEWMADDR from <sys/socket.h> */
+/* We can use NET_RT_IFLIST2 and RTM_NEWMADDR2 on Darwin */
+//#define DARWIN_COMPAT
+
+//#ifdef DARWIN_COMPAT
+#define GIM_SYSCTL_MIB NET_RT_IFLIST2
+#define GIM_RTM_ADDR RTM_NEWMADDR2
+//#else
+//#define GIM_SYSCTL_MIB NET_RT_IFMALIST
+//#define GIM_RTM_ADDR RTM_NEWMADDR
+//#endif
+
+// Not in 10.6 includes so use our own
+struct _intl_ifmaddrs {
+	struct _intl_ifmaddrs *ifma_next;
+	struct sockaddr *ifma_name;
+	struct sockaddr *ifma_addr;
+	struct sockaddr *ifma_lladdr;
+};
+
+static inline int _intl_getifmaddrs(struct _intl_ifmaddrs **pif)
+{
+	int icnt = 1;
+	int dcnt = 0;
+	int ntry = 0;
+	size_t len;
+	size_t needed;
+	int mib[6];
+	int i;
+	char *buf;
+	char *data;
+	char *next;
+	char *p;
+	struct ifma_msghdr2 *ifmam;
+	struct _intl_ifmaddrs *ifa, *ift;
+	struct rt_msghdr *rtm;
+	struct sockaddr *sa;
+
+	mib[0] = CTL_NET;
+	mib[1] = PF_ROUTE;
+	mib[2] = 0;             /* protocol */
+	mib[3] = 0;             /* wildcard address family */
+	mib[4] = GIM_SYSCTL_MIB;
+	mib[5] = 0;             /* no flags */
+	do {
+		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+			return (-1);
+		if ((buf = (char *)malloc(needed)) == NULL)
+			return (-1);
+		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
+				free(buf);
+				return (-1);
+			}
+			free(buf);
+			buf = NULL;
+		}
+	} while (buf == NULL);
+
+	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
+		rtm = (struct rt_msghdr *)(void *)next;
+		if (rtm->rtm_version != RTM_VERSION)
+			continue;
+		switch (rtm->rtm_type) {
+			case GIM_RTM_ADDR:
+				ifmam = (struct ifma_msghdr2 *)(void *)rtm;
+				if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
+					break;
+				icnt++;
+				p = (char *)(ifmam + 1);
+				for (i = 0; i < RTAX_MAX; i++) {
+					if ((RTA_MASKS & ifmam->ifmam_addrs &
+						 (1 << i)) == 0)
+						continue;
+					sa = (struct sockaddr *)(void *)p;
+					len = SA_RLEN(sa);
+					dcnt += len;
+					p += len;
+				}
+				break;
+		}
+	}
+
+	data = (char *)malloc(sizeof(struct _intl_ifmaddrs) * icnt + dcnt);
+	if (data == NULL) {
+		free(buf);
+		return (-1);
+	}
+
+	ifa = (struct _intl_ifmaddrs *)(void *)data;
+	data += sizeof(struct _intl_ifmaddrs) * icnt;
+
+	memset(ifa, 0, sizeof(struct _intl_ifmaddrs) * icnt);
+	ift = ifa;
+
+	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
+		rtm = (struct rt_msghdr *)(void *)next;
+		if (rtm->rtm_version != RTM_VERSION)
+			continue;
+
+		switch (rtm->rtm_type) {
+			case GIM_RTM_ADDR:
+				ifmam = (struct ifma_msghdr2 *)(void *)rtm;
+				if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
+					break;
+
+				p = (char *)(ifmam + 1);
+				for (i = 0; i < RTAX_MAX; i++) {
+					if ((RTA_MASKS & ifmam->ifmam_addrs &
+						 (1 << i)) == 0)
+						continue;
+					sa = (struct sockaddr *)(void *)p;
+					len = SA_RLEN(sa);
+					switch (i) {
+						case RTAX_GATEWAY:
+							ift->ifma_lladdr =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						case RTAX_IFP:
+							ift->ifma_name =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						case RTAX_IFA:
+							ift->ifma_addr =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						default:
+							data += len;
+							break;
+					}
+					p += len;
+				}
+				ift->ifma_next = ift + 1;
+				ift = ift->ifma_next;
+				break;
+		}
+	}
+
+	free(buf);
+
+	if (ift > ifa) {
+		ift--;
+		ift->ifma_next = NULL;
+		*pif = ifa;
+	} else {
+		*pif = NULL;
+		free(ifa);
+	}
+	return (0);
+}
+
+static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs *ifmp)
+{
+	free(ifmp);
+}
+
+// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+
+#include <string>
+#include <map>
+#include <set>
+#include <algorithm>
+
+#include "../node/Constants.hpp"
+#include "../node/Utils.hpp"
+#include "../node/Mutex.hpp"
+#include "../node/Dictionary.hpp"
+#include "OSUtils.hpp"
+#include "OSXEthernetTap.hpp"
+
+// ff:ff:ff:ff:ff:ff with no ADI
+static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff),0);
+
+static inline bool _setIpv6Stuff(const char *ifname,bool performNUD,bool acceptRouterAdverts)
+{
+	struct in6_ndireq nd;
+	struct in6_ifreq ifr;
+
+	int s = socket(AF_INET6,SOCK_DGRAM,0);
+	if (s <= 0)
+		return false;
+
+	memset(&nd,0,sizeof(nd));
+	strncpy(nd.ifname,ifname,sizeof(nd.ifname));
+
+	if (ioctl(s,SIOCGIFINFO_IN6,&nd)) {
+		close(s);
+		return false;
+	}
+
+	unsigned long oldFlags = (unsigned long)nd.ndi.flags;
+
+	if (performNUD)
+		nd.ndi.flags |= ND6_IFF_PERFORMNUD;
+	else nd.ndi.flags &= ~ND6_IFF_PERFORMNUD;
+
+	if (oldFlags != (unsigned long)nd.ndi.flags) {
+		if (ioctl(s,SIOCSIFINFO_FLAGS,&nd)) {
+			close(s);
+			return false;
+		}
+	}
+
+	memset(&ifr,0,sizeof(ifr));
+	strncpy(ifr.ifr_name,ifname,sizeof(ifr.ifr_name));
+	if (ioctl(s,acceptRouterAdverts ? SIOCAUTOCONF_START : SIOCAUTOCONF_STOP,&ifr)) {
+		close(s);
+		return false;
+	}
+
+	close(s);
+	return true;
+}
+
+namespace ZeroTier {
+
+static std::set<std::string> globalDeviceNames;
+static Mutex globalTapCreateLock;
+
+OSXEthernetTap::OSXEthernetTap(
+	const char *homePath,
+	const MAC &mac,
+	unsigned int mtu,
+	unsigned int metric,
+	uint64_t nwid,
+	const char *friendlyName,
+	void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *data,unsigned int len),
+	void *arg) :
+	_handler(handler),
+	_arg(arg),
+	_pcap((void *)0),
+	_nwid(nwid),
+	_mac(mac),
+	_homePath(homePath),
+	_mtu(mtu),
+	_metric(metric),
+	_enabled(true)
+{
+	char errbuf[PCAP_ERRBUF_SIZE];
+	char devname[64],ethaddr[64],mtustr[32],metstr[32],nwids[32];
+
+	Utils::snprintf(nwids,sizeof(nwids),"%.16llx",nwid);
+
+	if (mtu > 2800)
+		throw std::runtime_error("max tap MTU is 2800");
+
+	Mutex::Lock _gl(globalTapCreateLock);
+
+	std::string desiredDevice;
+	Dictionary devmap;
+	{
+		std::string devmapbuf;
+		if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmapbuf)) {
+			devmap.fromString(devmapbuf);
+			desiredDevice = devmap.get(nwids,"");
+		}
+	}
+
+	if ((desiredDevice.length() >= 9)&&(desiredDevice.substr(0,6) == "bridge")) {
+		// length() >= 9 matches bridge### or bridge####
+		_dev = desiredDevice;
+	} else {
+		if (globalDeviceNames.size() >= (10000 - 128)) // sanity check... this would be nuts
+			throw std::runtime_error("too many devices!");
+		unsigned int pseudoBridgeNo = (unsigned int)((nwid ^ (nwid >> 32)) % (10000 - 128)) + 128; // range: bridge128 to bridge9999
+		sprintf(devname,"bridge%u",pseudoBridgeNo);
+		while (globalDeviceNames.count(std::string(devname)) > 0) {
+			++pseudoBridgeNo;
+			if (pseudoBridgeNo > 9999)
+				pseudoBridgeNo = 64;
+			sprintf(devname,"bridge%u",pseudoBridgeNo);
+		}
+		_dev = devname;
+	}
+
+	// Configure MAC address and MTU, bring interface up
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"create",(const char *)0);
+		::_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		::waitpid(cpid,&exitcode,0);
+		if (exitcode != 0)
+			throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
+	} else throw std::runtime_error("unable to fork()");
+	Utils::snprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
+	Utils::snprintf(mtustr,sizeof(mtustr),"%u",_mtu);
+	Utils::snprintf(metstr,sizeof(metstr),"%u",_metric);
+	cpid = (long)vfork();
+	if (cpid == 0) {
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"lladdr",ethaddr,"mtu",mtustr,"metric",metstr,"up",(const char *)0);
+		::_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		::waitpid(cpid,&exitcode,0);
+		if (exitcode != 0)
+			throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
+	} else throw std::runtime_error("unable to fork()");
+
+	_setIpv6Stuff(_dev.c_str(),true,false);
+
+	_pcap = (void *)pcap_create(_dev.c_str(),errbuf);
+	if (!_pcap) {
+		cpid = (long)vfork();
+		if (cpid == 0) {
+			::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"destroy",(const char *)0);
+			::_exit(-1);
+		} else if (cpid > 0) {
+			int exitcode = -1;
+			::waitpid(cpid,&exitcode,0);
+		}
+		throw std::runtime_error((std::string("pcap_create() on new bridge device failed: ") + errbuf).c_str());
+	}
+	pcap_set_promisc(reinterpret_cast<pcap_t *>(_pcap),1);
+	pcap_set_timeout(reinterpret_cast<pcap_t *>(_pcap),120000);
+	pcap_set_immediate_mode(reinterpret_cast<pcap_t *>(_pcap),1);
+	if (pcap_set_buffer_size(reinterpret_cast<pcap_t *>(_pcap),1024 * 1024 * 16) != 0) // 16MB
+		fprintf(stderr,"WARNING: pcap_set_buffer_size() failed!\n");
+	if (pcap_set_snaplen(reinterpret_cast<pcap_t *>(_pcap),4096) != 0)
+		fprintf(stderr,"WARNING: pcap_set_snaplen() failed!\n");
+	if (pcap_activate(reinterpret_cast<pcap_t *>(_pcap)) != 0) {
+		pcap_close(reinterpret_cast<pcap_t *>(_pcap));
+		cpid = (long)vfork();
+		if (cpid == 0) {
+			::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"destroy",(const char *)0);
+			::_exit(-1);
+		} else if (cpid > 0) {
+			int exitcode = -1;
+			::waitpid(cpid,&exitcode,0);
+		}
+		throw std::runtime_error("pcap_activate() on new bridge device failed.");
+	}
+
+	globalDeviceNames.insert(_dev);
+
+	devmap[nwids] = _dev;
+	OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmap.toString());
+
+	_thread = Thread::start(this);
+}
+
+OSXEthernetTap::~OSXEthernetTap()
+{
+	_enabled = false;
+
+	Mutex::Lock _gl(globalTapCreateLock);
+	globalDeviceNames.erase(_dev);
+
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"destroy",(const char *)0);
+		::_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		::waitpid(cpid,&exitcode,0);
+		if (exitcode == 0) {
+			// Destroying the interface nukes pcap and terminates the thread.
+			Thread::join(_thread);
+		}
+	}
+
+	pcap_close(reinterpret_cast<pcap_t *>(_pcap));
+}
+
+static bool ___removeIp(const std::string &_dev,const InetAddress &ip)
+{
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"inet",ip.toIpString().c_str(),"-alias",(const char *)0);
+		_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		waitpid(cpid,&exitcode,0);
+		return (exitcode == 0);
+	}
+	return false; // never reached, make compiler shut up about return value
+}
+
+bool OSXEthernetTap::addIp(const InetAddress &ip)
+{
+	if (!ip)
+		return false;
+
+	std::vector<InetAddress> allIps(ips());
+	if (std::binary_search(allIps.begin(),allIps.end(),ip))
+		return true;
+
+	// Remove and reconfigure if address is the same but netmask is different
+	for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
+		if ((i->ipsEqual(ip))&&(i->netmaskBits() != ip.netmaskBits())) {
+			if (___removeIp(_dev,*i))
+				break;
+		}
+	}
+
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),ip.isV4() ? "inet" : "inet6",ip.toString().c_str(),"alias",(const char *)0);
+		::_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		::waitpid(cpid,&exitcode,0);
+		return (exitcode == 0);
+	} // else return false...
+
+	return false;
+}
+
+bool OSXEthernetTap::removeIp(const InetAddress &ip)
+{
+	if (!ip)
+		return true;
+	std::vector<InetAddress> allIps(ips());
+	if (!std::binary_search(allIps.begin(),allIps.end(),ip)) {
+		if (___removeIp(_dev,ip))
+			return true;
+	}
+	return false;
+}
+
+std::vector<InetAddress> OSXEthernetTap::ips() const
+{
+	struct ifaddrs *ifa = (struct ifaddrs *)0;
+	if (getifaddrs(&ifa))
+		return std::vector<InetAddress>();
+
+	std::vector<InetAddress> r;
+
+	struct ifaddrs *p = ifa;
+	while (p) {
+		if ((!strcmp(p->ifa_name,_dev.c_str()))&&(p->ifa_addr)&&(p->ifa_netmask)&&(p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
+			switch(p->ifa_addr->sa_family) {
+				case AF_INET: {
+					struct sockaddr_in *sin = (struct sockaddr_in *)p->ifa_addr;
+					struct sockaddr_in *nm = (struct sockaddr_in *)p->ifa_netmask;
+					r.push_back(InetAddress(&(sin->sin_addr.s_addr),4,Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
+				}	break;
+				case AF_INET6: {
+					struct sockaddr_in6 *sin = (struct sockaddr_in6 *)p->ifa_addr;
+					struct sockaddr_in6 *nm = (struct sockaddr_in6 *)p->ifa_netmask;
+					uint32_t b[4];
+					memcpy(b,nm->sin6_addr.s6_addr,sizeof(b));
+					r.push_back(InetAddress(sin->sin6_addr.s6_addr,16,Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
+				}	break;
+			}
+		}
+		p = p->ifa_next;
+	}
+
+	if (ifa)
+		freeifaddrs(ifa);
+
+	std::sort(r.begin(),r.end());
+	std::unique(r.begin(),r.end());
+
+	return r;
+}
+
+void OSXEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
+{
+	char putBuf[4096];
+	if ((len <= _mtu)&&(_enabled)) {
+		to.copyTo(putBuf,6);
+		from.copyTo(putBuf + 6,6);
+		*((uint16_t *)(putBuf + 12)) = htons((uint16_t)etherType);
+		memcpy(putBuf + 14,data,len);
+		len += 14;
+		int r = pcap_inject(reinterpret_cast<pcap_t *>(_pcap),putBuf,len);
+		if (r <= 0) {
+			printf("%s: pcap_inject() failed\n",_dev.c_str());
+			return;
+		}
+		printf("%s: inject %s -> %s etherType==%u len=%u r==%d\n",_dev.c_str(),from.toString().c_str(),to.toString().c_str(),etherType,len,r);
+	}
+}
+
+std::string OSXEthernetTap::deviceName() const
+{
+	return _dev;
+}
+
+void OSXEthernetTap::setFriendlyName(const char *friendlyName)
+{
+}
+
+void OSXEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
+{
+	std::vector<MulticastGroup> newGroups;
+
+	struct _intl_ifmaddrs *ifmap = (struct _intl_ifmaddrs *)0;
+	if (!_intl_getifmaddrs(&ifmap)) {
+		struct _intl_ifmaddrs *p = ifmap;
+		while (p) {
+			if (p->ifma_addr->sa_family == AF_LINK) {
+				struct sockaddr_dl *in = (struct sockaddr_dl *)p->ifma_name;
+				struct sockaddr_dl *la = (struct sockaddr_dl *)p->ifma_addr;
+				if ((la->sdl_alen == 6)&&(in->sdl_nlen <= _dev.length())&&(!memcmp(_dev.data(),in->sdl_data,in->sdl_nlen)))
+					newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen,6),0));
+			}
+			p = p->ifma_next;
+		}
+		_intl_freeifmaddrs(ifmap);
+	}
+
+	std::vector<InetAddress> allIps(ips());
+	for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
+		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
+
+	std::sort(newGroups.begin(),newGroups.end());
+	std::unique(newGroups.begin(),newGroups.end());
+
+	for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
+		if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
+			added.push_back(*m);
+	}
+	for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
+		if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
+			removed.push_back(*m);
+	}
+
+	_multicastGroups.swap(newGroups);
+}
+
+static void _pcapHandler(u_char *ptr,const struct pcap_pkthdr *hdr,const u_char *data)
+{
+	OSXEthernetTap *tap = reinterpret_cast<OSXEthernetTap *>(ptr);
+	if (hdr->caplen > 14) {
+		MAC to(data,6);
+		MAC from(data + 6,6);
+		if (from == tap->_mac) {
+			unsigned int etherType = ntohs(((const uint16_t *)data)[6]);
+			printf("%s: %s -> %s etherType==%u len==%u\n",tap->_dev.c_str(),from.toString().c_str(),to.toString().c_str(),etherType,(unsigned int)hdr->caplen);
+			// TODO: VLAN support
+			tap->_handler(tap->_arg,tap->_nwid,from,to,etherType,0,(const void *)(data + 14),hdr->len - 14);
+		}
+	}
+}
+
+void OSXEthernetTap::threadMain()
+	throw()
+{
+	pcap_loop(reinterpret_cast<pcap_t *>(_pcap),-1,&_pcapHandler,reinterpret_cast<u_char *>(this));
+}
+
+} // namespace ZeroTier
diff --git a/attic/OSXEthernetTap.cpp.utun-work-in-progress b/attic/OSXEthernetTap.cpp.utun-work-in-progress
new file mode 100644
index 000000000..b7a05334d
--- /dev/null
+++ b/attic/OSXEthernetTap.cpp.utun-work-in-progress
@@ -0,0 +1,832 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <unistd.h>
+#include <signal.h>
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <sys/select.h>
+#include <sys/cdefs.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/sys_domain.h>
+#include <sys/kern_control.h>
+#include <net/if_utun.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/route.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <netinet6/in6_var.h>
+#include <netinet/in_var.h>
+#include <netinet/icmp6.h>
+
+// OSX compile fix... in6_var defines this in a struct which namespaces it for C++ ... why?!?
+struct prf_ra {
+	u_char onlink : 1;
+	u_char autonomous : 1;
+	u_char reserved : 6;
+} prf_ra;
+
+#include <netinet6/nd6.h>
+#include <ifaddrs.h>
+
+// These are KERNEL_PRIVATE... why?
+#ifndef SIOCAUTOCONF_START
+#define SIOCAUTOCONF_START _IOWR('i', 132, struct in6_ifreq)    /* accept rtadvd on this interface */
+#endif
+#ifndef SIOCAUTOCONF_STOP
+#define SIOCAUTOCONF_STOP _IOWR('i', 133, struct in6_ifreq)    /* stop accepting rtadv for this interface */
+#endif
+
+// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+// This source is from:
+// http://www.opensource.apple.com/source/Libinfo/Libinfo-406.17/gen.subproj/getifmaddrs.c?txt
+// It's here because OSX 10.6 does not have this convenience function.
+
+#define	SALIGN	(sizeof(uint32_t) - 1)
+#define	SA_RLEN(sa)	((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : \
+(SALIGN + 1))
+#define	MAX_SYSCTL_TRY	5
+#define	RTA_MASKS	(RTA_GATEWAY | RTA_IFP | RTA_IFA)
+
+/* FreeBSD uses NET_RT_IFMALIST and RTM_NEWMADDR from <sys/socket.h> */
+/* We can use NET_RT_IFLIST2 and RTM_NEWMADDR2 on Darwin */
+//#define DARWIN_COMPAT
+
+//#ifdef DARWIN_COMPAT
+#define GIM_SYSCTL_MIB NET_RT_IFLIST2
+#define GIM_RTM_ADDR RTM_NEWMADDR2
+//#else
+//#define GIM_SYSCTL_MIB NET_RT_IFMALIST
+//#define GIM_RTM_ADDR RTM_NEWMADDR
+//#endif
+
+// Not in 10.6 includes so use our own
+struct _intl_ifmaddrs {
+	struct _intl_ifmaddrs *ifma_next;
+	struct sockaddr *ifma_name;
+	struct sockaddr *ifma_addr;
+	struct sockaddr *ifma_lladdr;
+};
+
+static inline int _intl_getifmaddrs(struct _intl_ifmaddrs **pif)
+{
+	int icnt = 1;
+	int dcnt = 0;
+	int ntry = 0;
+	size_t len;
+	size_t needed;
+	int mib[6];
+	int i;
+	char *buf;
+	char *data;
+	char *next;
+	char *p;
+	struct ifma_msghdr2 *ifmam;
+	struct _intl_ifmaddrs *ifa, *ift;
+	struct rt_msghdr *rtm;
+	struct sockaddr *sa;
+
+	mib[0] = CTL_NET;
+	mib[1] = PF_ROUTE;
+	mib[2] = 0;             /* protocol */
+	mib[3] = 0;             /* wildcard address family */
+	mib[4] = GIM_SYSCTL_MIB;
+	mib[5] = 0;             /* no flags */
+	do {
+		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+			return (-1);
+		if ((buf = (char *)malloc(needed)) == NULL)
+			return (-1);
+		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
+				free(buf);
+				return (-1);
+			}
+			free(buf);
+			buf = NULL;
+		}
+	} while (buf == NULL);
+
+	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
+		rtm = (struct rt_msghdr *)(void *)next;
+		if (rtm->rtm_version != RTM_VERSION)
+			continue;
+		switch (rtm->rtm_type) {
+			case GIM_RTM_ADDR:
+				ifmam = (struct ifma_msghdr2 *)(void *)rtm;
+				if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
+					break;
+				icnt++;
+				p = (char *)(ifmam + 1);
+				for (i = 0; i < RTAX_MAX; i++) {
+					if ((RTA_MASKS & ifmam->ifmam_addrs &
+						 (1 << i)) == 0)
+						continue;
+					sa = (struct sockaddr *)(void *)p;
+					len = SA_RLEN(sa);
+					dcnt += len;
+					p += len;
+				}
+				break;
+		}
+	}
+
+	data = (char *)malloc(sizeof(struct _intl_ifmaddrs) * icnt + dcnt);
+	if (data == NULL) {
+		free(buf);
+		return (-1);
+	}
+
+	ifa = (struct _intl_ifmaddrs *)(void *)data;
+	data += sizeof(struct _intl_ifmaddrs) * icnt;
+
+	memset(ifa, 0, sizeof(struct _intl_ifmaddrs) * icnt);
+	ift = ifa;
+
+	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
+		rtm = (struct rt_msghdr *)(void *)next;
+		if (rtm->rtm_version != RTM_VERSION)
+			continue;
+
+		switch (rtm->rtm_type) {
+			case GIM_RTM_ADDR:
+				ifmam = (struct ifma_msghdr2 *)(void *)rtm;
+				if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
+					break;
+
+				p = (char *)(ifmam + 1);
+				for (i = 0; i < RTAX_MAX; i++) {
+					if ((RTA_MASKS & ifmam->ifmam_addrs &
+						 (1 << i)) == 0)
+						continue;
+					sa = (struct sockaddr *)(void *)p;
+					len = SA_RLEN(sa);
+					switch (i) {
+						case RTAX_GATEWAY:
+							ift->ifma_lladdr =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						case RTAX_IFP:
+							ift->ifma_name =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						case RTAX_IFA:
+							ift->ifma_addr =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						default:
+							data += len;
+							break;
+					}
+					p += len;
+				}
+				ift->ifma_next = ift + 1;
+				ift = ift->ifma_next;
+				break;
+		}
+	}
+
+	free(buf);
+
+	if (ift > ifa) {
+		ift--;
+		ift->ifma_next = NULL;
+		*pif = ifa;
+	} else {
+		*pif = NULL;
+		free(ifa);
+	}
+	return (0);
+}
+
+static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs *ifmp)
+{
+	free(ifmp);
+}
+
+// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+
+#include <string>
+#include <map>
+#include <set>
+#include <algorithm>
+
+#include "../node/Constants.hpp"
+#include "../node/Utils.hpp"
+#include "../node/Mutex.hpp"
+#include "../node/Dictionary.hpp"
+#include "Arp.hpp"
+#include "OSUtils.hpp"
+#include "OSXEthernetTap.hpp"
+
+// ff:ff:ff:ff:ff:ff with no ADI
+static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff),0);
+
+static inline bool _setIpv6Stuff(const char *ifname,bool performNUD,bool acceptRouterAdverts)
+{
+	struct in6_ndireq nd;
+	struct in6_ifreq ifr;
+
+	int s = socket(AF_INET6,SOCK_DGRAM,0);
+	if (s <= 0)
+		return false;
+
+	memset(&nd,0,sizeof(nd));
+	strncpy(nd.ifname,ifname,sizeof(nd.ifname));
+
+	if (ioctl(s,SIOCGIFINFO_IN6,&nd)) {
+		close(s);
+		return false;
+	}
+
+	unsigned long oldFlags = (unsigned long)nd.ndi.flags;
+
+	if (performNUD)
+		nd.ndi.flags |= ND6_IFF_PERFORMNUD;
+	else nd.ndi.flags &= ~ND6_IFF_PERFORMNUD;
+
+	if (oldFlags != (unsigned long)nd.ndi.flags) {
+		if (ioctl(s,SIOCSIFINFO_FLAGS,&nd)) {
+			close(s);
+			return false;
+		}
+	}
+
+	memset(&ifr,0,sizeof(ifr));
+	strncpy(ifr.ifr_name,ifname,sizeof(ifr.ifr_name));
+	if (ioctl(s,acceptRouterAdverts ? SIOCAUTOCONF_START : SIOCAUTOCONF_STOP,&ifr)) {
+		close(s);
+		return false;
+	}
+
+	close(s);
+	return true;
+}
+
+// Create an OSX-native utun device (utun# where # is desiredNumber)
+// Adapted from public domain utun example code by Jonathan Levin
+static int _make_utun(int desiredNumber)
+{
+	struct sockaddr_ctl sc;
+	struct ctl_info ctlInfo;
+	struct ifreq ifr;
+
+	memset(&ctlInfo, 0, sizeof(ctlInfo));
+	if (strlcpy(ctlInfo.ctl_name, UTUN_CONTROL_NAME, sizeof(ctlInfo.ctl_name)) >= sizeof(ctlInfo.ctl_name)) {
+		return -1;
+	}
+
+	int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
+	if (fd == -1)
+		return -1;
+	if (ioctl(fd, CTLIOCGINFO, &ctlInfo) == -1) {
+		close(fd);
+		return -1;
+	}
+
+	sc.sc_id = ctlInfo.ctl_id;
+	sc.sc_len = sizeof(sc);
+	sc.sc_family = AF_SYSTEM;
+	sc.ss_sysaddr = AF_SYS_CONTROL;
+	sc.sc_unit = desiredNumber + 1;
+
+	if (connect(fd, (struct sockaddr *)&sc, sizeof(sc)) == -1) {
+		close(fd);
+		return -1;
+	}
+
+	memset(&ifr,0,sizeof(ifr));
+	sprintf(ifr.ifr_name,"utun%d",desiredNumber);
+	if (ioctl(fd,SIOCGIFFLAGS,(void *)&ifr) < 0) {
+		printf("SIOCGIFFLAGS failed\n");
+	}
+	ifr.ifr_flags &= ~IFF_POINTOPOINT;
+	if (ioctl(fd,SIOCSIFFLAGS,(void *)&ifr) < 0) {
+		printf("clear IFF_POINTOPOINT failed\n");
+	}
+
+	return fd;
+}
+
+namespace ZeroTier {
+
+static long globalTapsRunning = 0;
+static Mutex globalTapCreateLock;
+
+OSXEthernetTap::OSXEthernetTap(
+	const char *homePath,
+	const MAC &mac,
+	unsigned int mtu,
+	unsigned int metric,
+	uint64_t nwid,
+	const char *friendlyName,
+	void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *data,unsigned int len),
+	void *arg) :
+	_handler(handler),
+	_arg(arg),
+	_arp((Arp *)0),
+	_nwid(nwid),
+	_homePath(homePath),
+	_mtu(mtu),
+	_metric(metric),
+	_fd(0),
+	_utun(false),
+	_enabled(true)
+{
+	char devpath[64],ethaddr[64],mtustr[32],metstr[32],nwids[32];
+	struct stat stattmp;
+
+	Utils::snprintf(nwids,sizeof(nwids),"%.16llx",nwid);
+
+	if (mtu > 2800)
+		throw std::runtime_error("max tap MTU is 2800");
+
+	Mutex::Lock _gl(globalTapCreateLock);
+
+	// Read remembered previous device name, if any -- we'll try to reuse
+	Dictionary devmap;
+	std::string desiredDevice;
+	{
+		std::string devmapbuf;
+		if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmapbuf)) {
+			devmap.fromString(devmapbuf);
+			desiredDevice = devmap.get(nwids,"");
+		}
+	}
+
+	if (::stat((_homePath + ZT_PATH_SEPARATOR_S + "tap.kext").c_str(),&stattmp) == 0) {
+		// Try to init kext if it's there, otherwise revert to utun mode
+
+		if (::stat("/dev/zt0",&stattmp)) {
+			long kextpid = (long)vfork();
+			if (kextpid == 0) {
+				::chdir(homePath);
+				OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
+				::execl("/sbin/kextload","/sbin/kextload","-q","-repository",homePath,"tap.kext",(const char *)0);
+				::_exit(-1);
+			} else if (kextpid > 0) {
+				int exitcode = -1;
+				::waitpid(kextpid,&exitcode,0);
+			}
+			::usleep(500); // give tap device driver time to start up and try again
+			if (::stat("/dev/zt0",&stattmp))
+				_utun = true;
+		}
+
+		if (!_utun) {
+			// See if we can re-use the last device we had.
+			bool recalledDevice = false;
+			if (desiredDevice.length() > 2) {
+				Utils::snprintf(devpath,sizeof(devpath),"/dev/%s",desiredDevice.c_str());
+				if (stat(devpath,&stattmp) == 0) {
+					_fd = ::open(devpath,O_RDWR);
+					if (_fd > 0) {
+						_dev = desiredDevice;
+						recalledDevice = true;
+					}
+				}
+			}
+
+			// Open the first unused tap device if we didn't recall a previous one.
+			if (!recalledDevice) {
+				for(int i=0;i<64;++i) {
+					Utils::snprintf(devpath,sizeof(devpath),"/dev/zt%d",i);
+					if (stat(devpath,&stattmp)) {
+						_utun = true;
+						break;
+					}
+					_fd = ::open(devpath,O_RDWR);
+					if (_fd > 0) {
+						char foo[16];
+						Utils::snprintf(foo,sizeof(foo),"zt%d",i);
+						_dev = foo;
+						break;
+					}
+				}
+			}
+			if (_fd <= 0)
+				_utun = true;
+		}
+	} else {
+		_utun = true;
+	}
+
+	if (_utun) {
+		// Use OSX built-in utun device if kext is not available or doesn't work
+
+		int utunNo = 0;
+
+		if ((desiredDevice.length() > 4)&&(desiredDevice.substr(0,4) == "utun")) {
+			utunNo = Utils::strToInt(desiredDevice.substr(4).c_str());
+			if (utunNo >= 0)
+				_fd = _make_utun(utunNo);
+		}
+
+		if (_fd <= 0) {
+			// Start at utun8 to leave lower utuns unused since other stuff might
+			// want them -- OpenVPN, cjdns, etc. I'm not sure if those are smart
+			// enough to scan upward like this.
+			for(utunNo=8;utunNo<=256;++utunNo) {
+				if ((_fd = _make_utun(utunNo)) > 0)
+					break;
+			}
+		}
+
+		if (_fd <= 0)
+			throw std::runtime_error("unable to find/load ZeroTier tap driver OR use built-in utun driver in OSX; permission or system problem or too many open devices?");
+
+		Utils::snprintf(devpath,sizeof(devpath),"utun%d",utunNo);
+		_dev = devpath;
+
+		// Configure address and bring it up
+		Utils::snprintf(mtustr,sizeof(mtustr),"%u",_mtu);
+		Utils::snprintf(metstr,sizeof(metstr),"%u",_metric);
+		long cpid = (long)vfork();
+		if (cpid == 0) {
+			::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"mtu",mtustr,"metric",metstr,"up",(const char *)0);
+			::_exit(-1);
+		} else if (cpid > 0) {
+			int exitcode = -1;
+			::waitpid(cpid,&exitcode,0);
+			if (exitcode) {
+				::close(_fd);
+				throw std::runtime_error("ifconfig failure activating utun interface");
+			}
+		}
+
+	} else {
+		// Use our ZeroTier OSX tun/tap driver for zt# Ethernet tap device
+
+		if (fcntl(_fd,F_SETFL,fcntl(_fd,F_GETFL) & ~O_NONBLOCK) == -1) {
+			::close(_fd);
+			throw std::runtime_error("unable to set flags on file descriptor for TAP device");
+		}
+
+		// Configure MAC address and MTU, bring interface up
+		Utils::snprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
+		Utils::snprintf(mtustr,sizeof(mtustr),"%u",_mtu);
+		Utils::snprintf(metstr,sizeof(metstr),"%u",_metric);
+		long cpid = (long)vfork();
+		if (cpid == 0) {
+			::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"lladdr",ethaddr,"mtu",mtustr,"metric",metstr,"up",(const char *)0);
+			::_exit(-1);
+		} else if (cpid > 0) {
+			int exitcode = -1;
+			::waitpid(cpid,&exitcode,0);
+			if (exitcode) {
+				::close(_fd);
+				throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
+			}
+		}
+
+		_setIpv6Stuff(_dev.c_str(),true,false);
+	}
+
+	// Set close-on-exec so that devices cannot persist if we fork/exec for update
+	fcntl(_fd,F_SETFD,fcntl(_fd,F_GETFD) | FD_CLOEXEC);
+
+	::pipe(_shutdownSignalPipe);
+
+	++globalTapsRunning;
+
+	devmap[nwids] = _dev;
+	OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmap.toString());
+
+	_thread = Thread::start(this);
+}
+
+OSXEthernetTap::~OSXEthernetTap()
+{
+	Mutex::Lock _gl(globalTapCreateLock);
+
+	::write(_shutdownSignalPipe[1],(const void *)this,1); // writing a byte causes thread to exit
+	Thread::join(_thread);
+
+	::close(_fd);
+	::close(_shutdownSignalPipe[0]);
+	::close(_shutdownSignalPipe[1]);
+
+	if (_utun) {
+		delete _arp;
+	} else {
+		if (--globalTapsRunning <= 0) {
+			globalTapsRunning = 0; // sanity check -- should not be possible
+
+			char tmp[16384];
+			sprintf(tmp,"%s/%s",_homePath.c_str(),"tap.kext");
+			long kextpid = (long)vfork();
+			if (kextpid == 0) {
+				OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
+				::execl("/sbin/kextunload","/sbin/kextunload",tmp,(const char *)0);
+				::_exit(-1);
+			} else if (kextpid > 0) {
+				int exitcode = -1;
+				::waitpid(kextpid,&exitcode,0);
+			}
+		}
+	}
+}
+
+void OSXEthernetTap::setEnabled(bool en)
+{
+	_enabled = en;
+	// TODO: interface status change
+}
+
+bool OSXEthernetTap::enabled() const
+{
+	return _enabled;
+}
+
+static bool ___removeIp(const std::string &_dev,const InetAddress &ip)
+{
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"inet",ip.toIpString().c_str(),"-alias",(const char *)0);
+		_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		waitpid(cpid,&exitcode,0);
+		return (exitcode == 0);
+	}
+	return false; // never reached, make compiler shut up about return value
+}
+
+bool OSXEthernetTap::addIp(const InetAddress &ip)
+{
+	if (!ip)
+		return false;
+
+	std::vector<InetAddress> allIps(ips());
+	if (std::binary_search(allIps.begin(),allIps.end(),ip))
+		return true;
+
+	// Remove and reconfigure if address is the same but netmask is different
+	for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
+		if ((i->ipsEqual(ip))&&(i->netmaskBits() != ip.netmaskBits())) {
+			if (___removeIp(_dev,*i))
+				break;
+		}
+	}
+
+	if (_utun) {
+		long cpid = (long)vfork();
+		if (cpid == 0) {
+			if (ip.ss_family == AF_INET6) {
+				::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"inet6",ip.toString().c_str(),"alias",(const char *)0);
+			} else {
+				::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),ip.toString().c_str(),ip.toIpString().c_str(),"alias",(const char *)0);
+			}
+			::_exit(-1);
+		} else if (cpid > 0) {
+			int exitcode = -1;
+			::waitpid(cpid,&exitcode,0);
+
+			if (exitcode == 0) {
+				if (ip.ss_family == AF_INET) {
+					// Add route to network over tun for IPv4 -- otherwise it behaves
+					// as a simple point to point tunnel instead of a true route.
+					cpid = (long)vfork();
+					if (cpid == 0) {
+						::close(STDERR_FILENO);
+						::close(STDOUT_FILENO);
+						::execl("/sbin/route","/sbin/route","add",ip.network().toString().c_str(),ip.toIpString().c_str(),(const char *)0);
+						::exit(-1);
+					} else if (cpid > 0) {
+						int exitcode = -1;
+						::waitpid(cpid,&exitcode,0);
+						return (exitcode == 0);
+					}
+				} else return true;
+			}
+		}
+	} else {
+		long cpid = (long)vfork();
+		if (cpid == 0) {
+			::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),ip.isV4() ? "inet" : "inet6",ip.toString().c_str(),"alias",(const char *)0);
+			::_exit(-1);
+		} else if (cpid > 0) {
+			int exitcode = -1;
+			::waitpid(cpid,&exitcode,0);
+			return (exitcode == 0);
+		}
+	}
+
+	return false;
+}
+
+bool OSXEthernetTap::removeIp(const InetAddress &ip)
+{
+	if (!ip)
+		return true;
+	std::vector<InetAddress> allIps(ips());
+	if (!std::binary_search(allIps.begin(),allIps.end(),ip)) {
+		if (___removeIp(_dev,ip))
+			return true;
+	}
+	return false;
+}
+
+std::vector<InetAddress> OSXEthernetTap::ips() const
+{
+	struct ifaddrs *ifa = (struct ifaddrs *)0;
+	if (getifaddrs(&ifa))
+		return std::vector<InetAddress>();
+
+	std::vector<InetAddress> r;
+
+	struct ifaddrs *p = ifa;
+	while (p) {
+		if ((!strcmp(p->ifa_name,_dev.c_str()))&&(p->ifa_addr)&&(p->ifa_netmask)&&(p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
+			switch(p->ifa_addr->sa_family) {
+				case AF_INET: {
+					struct sockaddr_in *sin = (struct sockaddr_in *)p->ifa_addr;
+					struct sockaddr_in *nm = (struct sockaddr_in *)p->ifa_netmask;
+					r.push_back(InetAddress(&(sin->sin_addr.s_addr),4,Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
+				}	break;
+				case AF_INET6: {
+					struct sockaddr_in6 *sin = (struct sockaddr_in6 *)p->ifa_addr;
+					struct sockaddr_in6 *nm = (struct sockaddr_in6 *)p->ifa_netmask;
+					uint32_t b[4];
+					memcpy(b,nm->sin6_addr.s6_addr,sizeof(b));
+					r.push_back(InetAddress(sin->sin6_addr.s6_addr,16,Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
+				}	break;
+			}
+		}
+		p = p->ifa_next;
+	}
+
+	if (ifa)
+		freeifaddrs(ifa);
+
+	std::sort(r.begin(),r.end());
+	std::unique(r.begin(),r.end());
+
+	return r;
+}
+
+void OSXEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
+{
+	char putBuf[4096];
+	if ((_fd > 0)&&(len <= _mtu)&&(_enabled)) {
+		to.copyTo(putBuf,6);
+		from.copyTo(putBuf + 6,6);
+		*((uint16_t *)(putBuf + 12)) = htons((uint16_t)etherType);
+		memcpy(putBuf + 14,data,len);
+		len += 14;
+		::write(_fd,putBuf,len);
+	}
+}
+
+std::string OSXEthernetTap::deviceName() const
+{
+	return _dev;
+}
+
+void OSXEthernetTap::setFriendlyName(const char *friendlyName)
+{
+}
+
+void OSXEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
+{
+	std::vector<MulticastGroup> newGroups;
+
+	struct _intl_ifmaddrs *ifmap = (struct _intl_ifmaddrs *)0;
+	if (!_intl_getifmaddrs(&ifmap)) {
+		struct _intl_ifmaddrs *p = ifmap;
+		while (p) {
+			if (p->ifma_addr->sa_family == AF_LINK) {
+				struct sockaddr_dl *in = (struct sockaddr_dl *)p->ifma_name;
+				struct sockaddr_dl *la = (struct sockaddr_dl *)p->ifma_addr;
+				if ((la->sdl_alen == 6)&&(in->sdl_nlen <= _dev.length())&&(!memcmp(_dev.data(),in->sdl_data,in->sdl_nlen)))
+					newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen,6),0));
+			}
+			p = p->ifma_next;
+		}
+		_intl_freeifmaddrs(ifmap);
+	}
+
+	std::vector<InetAddress> allIps(ips());
+	for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
+		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
+
+	std::sort(newGroups.begin(),newGroups.end());
+	std::unique(newGroups.begin(),newGroups.end());
+
+	for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
+		if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
+			added.push_back(*m);
+	}
+	for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
+		if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
+			removed.push_back(*m);
+	}
+
+	_multicastGroups.swap(newGroups);
+}
+
+void OSXEthernetTap::threadMain()
+	throw()
+{
+	fd_set readfds,nullfds;
+	MAC to,from;
+	int n,nfds,r;
+	char getBuf[8194];
+
+	Thread::sleep(500);
+
+	FD_ZERO(&readfds);
+	FD_ZERO(&nullfds);
+	nfds = (int)std::max(_shutdownSignalPipe[0],_fd) + 1;
+
+	r = 0;
+	for(;;) {
+		FD_SET(_shutdownSignalPipe[0],&readfds);
+		FD_SET(_fd,&readfds);
+		select(nfds,&readfds,&nullfds,&nullfds,(struct timeval *)0);
+
+		if (FD_ISSET(_shutdownSignalPipe[0],&readfds)) // writes to shutdown pipe terminate thread
+			break;
+
+		if (FD_ISSET(_fd,&readfds)) {
+			n = (int)::read(_fd,getBuf + r,sizeof(getBuf) - r);
+			if (n < 0) {
+				if ((errno != EINTR)&&(errno != ETIMEDOUT))
+					break;
+			} else {
+				// Some tap drivers like to send the ethernet frame and the
+				// payload in two chunks, so handle that by accumulating
+				// data until we have at least a frame.
+				r += n;
+				if (r > 14) {
+					if (r > ((int)_mtu + 14)) // sanity check for weird TAP behavior on some platforms
+						r = _mtu + 14;
+
+					if (_enabled) {
+						to.setTo(getBuf,6);
+						from.setTo(getBuf + 6,6);
+						unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]);
+						// TODO: VLAN support
+						_handler(_arg,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14);
+					}
+
+					r = 0;
+				}
+			}
+		}
+	}
+}
+
+} // namespace ZeroTier
diff --git a/attic/OSXEthernetTap.hpp.pcap-with-bridge-test b/attic/OSXEthernetTap.hpp.pcap-with-bridge-test
new file mode 100644
index 000000000..33f1948c1
--- /dev/null
+++ b/attic/OSXEthernetTap.hpp.pcap-with-bridge-test
@@ -0,0 +1,96 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_OSXETHERNETTAP_HPP
+#define ZT_OSXETHERNETTAP_HPP
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#include "../node/Constants.hpp"
+#include "../node/MAC.hpp"
+#include "../node/InetAddress.hpp"
+#include "../node/MulticastGroup.hpp"
+
+#include "Thread.hpp"
+
+namespace ZeroTier {
+
+/**
+ * OSX Ethernet tap using ZeroTier kernel extension zt# devices
+ */
+class OSXEthernetTap
+{
+public:
+	OSXEthernetTap(
+		const char *homePath,
+		const MAC &mac,
+		unsigned int mtu,
+		unsigned int metric,
+		uint64_t nwid,
+		const char *friendlyName,
+		void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+		void *arg);
+
+	~OSXEthernetTap();
+
+	inline void setEnabled(bool en) { _enabled = en; }
+	inline bool enabled() const { return _enabled; }
+	bool addIp(const InetAddress &ip);
+	bool removeIp(const InetAddress &ip);
+	std::vector<InetAddress> ips() const;
+	void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
+	std::string deviceName() const;
+	void setFriendlyName(const char *friendlyName);
+	void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
+
+	void threadMain()
+		throw();
+
+	// Private members of OSXEthernetTap have public visibility to be accessable
+	// from an internal bounce function; don't modify directly.
+	void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
+	void *_arg;
+	void *_pcap; // pcap_t *
+	uint64_t _nwid;
+	MAC _mac;
+	Thread _thread;
+	std::string _homePath;
+	std::string _dev;
+	std::vector<MulticastGroup> _multicastGroups;
+	unsigned int _mtu;
+	unsigned int _metric;
+	volatile bool _enabled;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/attic/OSXEthernetTap.hpp.utun-work-in-progress b/attic/OSXEthernetTap.hpp.utun-work-in-progress
new file mode 100644
index 000000000..8ece87b31
--- /dev/null
+++ b/attic/OSXEthernetTap.hpp.utun-work-in-progress
@@ -0,0 +1,101 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_OSXETHERNETTAP_HPP
+#define ZT_OSXETHERNETTAP_HPP
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#include "../node/Constants.hpp"
+#include "../node/MAC.hpp"
+#include "../node/InetAddress.hpp"
+#include "../node/MulticastGroup.hpp"
+
+#include "Thread.hpp"
+
+namespace ZeroTier {
+
+class Arp;
+
+/**
+ * OSX Ethernet tap supporting either ZeroTier tun/tap kext or OSX-native utun
+ */
+class OSXEthernetTap
+{
+public:
+	OSXEthernetTap(
+		const char *homePath,
+		const MAC &mac,
+		unsigned int mtu,
+		unsigned int metric,
+		uint64_t nwid,
+		const char *friendlyName,
+		void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+		void *arg);
+
+	~OSXEthernetTap();
+
+	void setEnabled(bool en);
+	bool enabled() const;
+	bool addIp(const InetAddress &ip);
+	bool removeIp(const InetAddress &ip);
+	std::vector<InetAddress> ips() const;
+	void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
+	std::string deviceName() const;
+	void setFriendlyName(const char *friendlyName);
+	void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
+
+	inline bool isNativeUtun() const { return _utun; }
+
+	void threadMain()
+		throw();
+
+private:
+	void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
+	void *_arg;
+	Arp *_arp; // created and used if utun is enabled
+	uint64_t _nwid;
+	Thread _thread;
+	std::string _homePath;
+	std::string _dev;
+	std::vector<MulticastGroup> _multicastGroups;
+	unsigned int _mtu;
+	unsigned int _metric;
+	int _fd;
+	int _shutdownSignalPipe[2];
+	bool _utun;
+	volatile bool _enabled;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/attic/README.md b/attic/README.md
new file mode 100644
index 000000000..768bccd4a
--- /dev/null
+++ b/attic/README.md
@@ -0,0 +1,4 @@
+Retired Code and Miscellaneous Junk
+======
+
+This directory is for old code that isn't used but we don't want to lose track of, and for anything else random like debug scripts.
diff --git a/attic/big-http-test/2015-11-10_01_50000.out.xz b/attic/big-http-test/2015-11-10_01_50000.out.xz
new file mode 100644
index 000000000..d3e2a6666
Binary files /dev/null and b/attic/big-http-test/2015-11-10_01_50000.out.xz differ
diff --git a/attic/big-http-test/2015-11-10_02_50000.out.xz b/attic/big-http-test/2015-11-10_02_50000.out.xz
new file mode 100644
index 000000000..0154da791
Binary files /dev/null and b/attic/big-http-test/2015-11-10_02_50000.out.xz differ
diff --git a/attic/big-http-test/2015-11-10_03_12500_ec2-east-only.out.xz b/attic/big-http-test/2015-11-10_03_12500_ec2-east-only.out.xz
new file mode 100644
index 000000000..3ae3555e6
Binary files /dev/null and b/attic/big-http-test/2015-11-10_03_12500_ec2-east-only.out.xz differ
diff --git a/attic/big-http-test/Dockerfile b/attic/big-http-test/Dockerfile
new file mode 100644
index 000000000..e19b3feef
--- /dev/null
+++ b/attic/big-http-test/Dockerfile
@@ -0,0 +1,24 @@
+FROM centos:latest
+
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+ADD nodesource-el.repo /etc/yum.repos.d/nodesource-el.repo
+RUN yum -y update && yum install -y nodejs && yum clean all
+
+RUN mkdir -p /var/lib/zerotier-one
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+RUN touch /var/lib/zerotier-one/networks.d/ffffffffffffffff.conf
+
+ADD package.json /
+RUN npm install
+
+ADD zerotier-one /
+RUN chmod a+x /zerotier-one
+
+ADD agent.js /
+ADD docker-main.sh /
+RUN chmod a+x /docker-main.sh
+
+CMD ["./docker-main.sh"]
diff --git a/attic/big-http-test/README.md b/attic/big-http-test/README.md
new file mode 100644
index 000000000..23a956054
--- /dev/null
+++ b/attic/big-http-test/README.md
@@ -0,0 +1,12 @@
+HTTP one-to-all test
+======
+
+*This is really internal use code. You're free to test it out but expect to do some editing/tweaking to make it work. We used this to run some massive scale tests of our new geo-cluster-based root server infrastructure prior to taking it live.*
+
+Before using this code you will want to edit agent.js to change SERVER_HOST to the IP address of where you will run server.js. This should typically be an open Internet IP, since this makes reporting not dependent upon the thing being tested. Also note that this thing does no security of any kind. It's designed for one-off tests run over a short period of time, not to be anything that runs permanently. You will also want to edit the Dockerfile if you want to build containers and change the network ID to the network you want to run tests over.
+
+This code can be deployed across a large number of VMs or containers to test and benchmark HTTP traffic within a virtual network at scale. The agent acts as a server and can query other agents, while the server collects agent data and tells agents about each other. It's designed to use RFC4193-based ZeroTier IPv6 addresses within the cluster, which allows the easy provisioning of a large cluster without IP conflicts.
+
+The Dockerfile builds an image that launches the agent. The image must be "docker run" with "--device=/dev/net/tun --privileged" to permit it to open a tun/tap device within the container. (Unfortunately CAP_NET_ADMIN may not work due to a bug in Docker and/or Linux.) You can run a bunch with a command like:
+
+    for ((n=0;n<10;n++)); do docker run --device=/dev/net/tun --privileged -d zerotier/http-test; done
diff --git a/attic/big-http-test/agent.js b/attic/big-http-test/agent.js
new file mode 100644
index 000000000..9ab2e019b
--- /dev/null
+++ b/attic/big-http-test/agent.js
@@ -0,0 +1,196 @@
+// ZeroTier distributed HTTP test agent
+
+// ---------------------------------------------------------------------------
+// Customizable parameters:
+
+// Time between startup and first test attempt
+var TEST_STARTUP_LAG = 10000;
+
+// Maximum interval between test attempts (actual timing is random % this)
+var TEST_INTERVAL_MAX = (60000 * 10);
+
+// Test timeout in ms
+var TEST_TIMEOUT = 30000;
+
+// Where should I get other agents' IDs and POST results?
+var SERVER_HOST = '52.26.196.147';
+var SERVER_PORT = 18080;
+
+// Which port do agents use to serve up test data to each other?
+var AGENT_PORT = 18888;
+
+// Payload size in bytes
+var PAYLOAD_SIZE = 5000;
+
+// ---------------------------------------------------------------------------
+
+var ipaddr = require('ipaddr.js');
+var os = require('os');
+var http = require('http');
+var async = require('async');
+
+var express = require('express');
+var app = express();
+
+// Find our ZeroTier-assigned RFC4193 IPv6 address
+var thisAgentId = null;
+var interfaces = os.networkInterfaces();
+if (!interfaces) {
+	console.error('FATAL: os.networkInterfaces() failed.');
+	process.exit(1);
+}
+for(var ifname in interfaces) {
+	var ifaddrs = interfaces[ifname];
+	if (Array.isArray(ifaddrs)) {
+		for(var i=0;i<ifaddrs.length;++i) {
+			if (ifaddrs[i].family == 'IPv6') {
+				try {
+					var ipbytes = ipaddr.parse(ifaddrs[i].address).toByteArray();
+					if ((ipbytes.length === 16)&&(ipbytes[0] == 0xfd)&&(ipbytes[9] == 0x99)&&(ipbytes[10] == 0x93)) {
+						thisAgentId = '';
+						for(var j=0;j<16;++j) {
+							var tmp = ipbytes[j].toString(16);
+							if (tmp.length === 1)
+								thisAgentId += '0';
+							thisAgentId += tmp;
+						}
+					}
+				} catch (e) {
+					console.error(e);
+				}
+			}
+		}
+	}
+}
+if (thisAgentId === null) {
+	console.error('FATAL: no ZeroTier-assigned RFC4193 IPv6 addresses found on any local interface!');
+	process.exit(1);
+}
+
+//console.log(thisAgentId);
+
+// Create a random (and therefore not very compressable) payload
+var payload = new Buffer(PAYLOAD_SIZE);
+for(var xx=0;xx<PAYLOAD_SIZE;++xx) {
+	payload.writeUInt8(Math.round(Math.random() * 255.0),xx);
+}
+
+function agentIdToIp(agentId)
+{
+	var ip = '';
+	ip += agentId.substr(0,4);
+	ip += ':';
+	ip += agentId.substr(4,4);
+	ip += ':';
+	ip += agentId.substr(8,4);
+	ip += ':';
+	ip += agentId.substr(12,4);
+	ip += ':';
+	ip += agentId.substr(16,4);
+	ip += ':';
+	ip += agentId.substr(20,4);
+	ip += ':';
+	ip += agentId.substr(24,4);
+	ip += ':';
+	ip += agentId.substr(28,4);
+	return ip;
+};
+
+var lastTestResult = null;
+var allOtherAgents = {};
+
+function doTest()
+{
+	var submit = http.request({
+		host: SERVER_HOST,
+		port: SERVER_PORT,
+		path: '/'+thisAgentId,
+		method: 'POST'
+	},function(res) {
+		var body = '';
+		res.on('data',function(chunk) { body += chunk.toString(); });
+		res.on('end',function() {
+
+			if (body) {
+				try {
+					var peers = JSON.parse(body);
+					if (Array.isArray(peers)) {
+						for(var xx=0;xx<peers.length;++xx)
+							allOtherAgents[peers[xx]] = true;
+					}
+				} catch (e) {}
+			}
+
+			var agents = Object.keys(allOtherAgents);
+			if (agents.length > 1) {
+
+				var target = agents[Math.floor(Math.random() * agents.length)];
+				while (target === thisAgentId)
+					target = agents[Math.floor(Math.random() * agents.length)];
+
+				var testRequest = null;
+				var timeoutId = null;
+				timeoutId = setTimeout(function() {
+					if (testRequest !== null)
+						testRequest.abort();
+					timeoutId = null;
+				},TEST_TIMEOUT);
+				var startTime = Date.now();
+
+				testRequest = http.get({
+					host: agentIdToIp(target),
+					port: AGENT_PORT,
+					path: '/'
+				},function(res) {
+					var bytes = 0;
+					res.on('data',function(chunk) { bytes += chunk.length; });
+					res.on('end',function() {
+						lastTestResult = {
+							source: thisAgentId,
+							target: target,
+							time: (Date.now() - startTime),
+							bytes: bytes,
+							timedOut: (timeoutId === null),
+							error: null
+						};
+						if (timeoutId !== null)
+							clearTimeout(timeoutId);
+						return setTimeout(doTest,Math.round(Math.random() * TEST_INTERVAL_MAX) + 1);
+					});
+				}).on('error',function(e) {
+					lastTestResult = {
+						source: thisAgentId,
+						target: target,
+						time: (Date.now() - startTime),
+						bytes: 0,
+						timedOut: (timeoutId === null),
+						error: e.toString()
+					};
+					if (timeoutId !== null)
+						clearTimeout(timeoutId);
+					return setTimeout(doTest,Math.round(Math.random() * TEST_INTERVAL_MAX) + 1);
+				});
+
+			} else {
+				return setTimeout(doTest,1000);
+			}
+
+		});
+	}).on('error',function(e) {
+		console.log('POST failed: '+e.toString());
+		return setTimeout(doTest,1000);
+	});
+	if (lastTestResult !== null) {
+		submit.write(JSON.stringify(lastTestResult));
+		lastTestResult = null;
+	}
+	submit.end();
+};
+
+// Agents just serve up a test payload
+app.get('/',function(req,res) { return res.status(200).send(payload); });
+
+var expressServer = app.listen(AGENT_PORT,function () {
+	// Start timeout-based loop
+	setTimeout(doTest(),TEST_STARTUP_LAG);
+});
diff --git a/attic/big-http-test/big-test-kill.sh b/attic/big-http-test/big-test-kill.sh
new file mode 100755
index 000000000..fa7f3cc46
--- /dev/null
+++ b/attic/big-http-test/big-test-kill.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Kills all running Docker containers on all big-test-hosts
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/usr/sbin:/sbin
+
+pssh -h big-test-hosts -x '-t -t' -i -OUserKnownHostsFile=/dev/null -OStrictHostKeyChecking=no -t 0 -p 256 "sudo docker ps -aq | xargs -r sudo docker rm -f"
+
+exit 0
diff --git a/attic/big-http-test/big-test-start.sh b/attic/big-http-test/big-test-start.sh
new file mode 100755
index 000000000..2411eeda4
--- /dev/null
+++ b/attic/big-http-test/big-test-start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# More than 500 container seems to result in a lot of sporadic failures, probably due to Linux kernel scaling issues with virtual network ports
+# 250 with a 16GB RAM VM like Amazon m4.xlarge seems good
+NUM_CONTAINERS=250
+CONTAINER_IMAGE=zerotier/http-test
+SCALE_UP_DELAY=10
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/usr/sbin:/sbin
+
+pssh -h big-test-hosts -x '-t -t' -i -OUserKnownHostsFile=/dev/null -OStrictHostKeyChecking=no -t 0 -p 256 "sudo sysctl -w net.netfilter.nf_conntrack_max=262144 ; for ((n=0;n<$NUM_CONTAINERS;n++)); do sudo docker run --device=/dev/net/tun --privileged -d $CONTAINER_IMAGE; sleep $SCALE_UP_DELAY; done"
+
+exit 0
diff --git a/attic/big-http-test/crunch-results.js b/attic/big-http-test/crunch-results.js
new file mode 100644
index 000000000..50e5c49a4
--- /dev/null
+++ b/attic/big-http-test/crunch-results.js
@@ -0,0 +1,65 @@
+//
+// Pipe the output of server.js into this to convert raw test results into bracketed statistics
+// suitable for graphing.
+//
+
+// Time duration per statistical bracket
+var BRACKET_SIZE = 10000;
+
+// Number of bytes expected from each test
+var EXPECTED_BYTES = 5000;
+
+var readline = require('readline');
+var rl = readline.createInterface({
+	input: process.stdin,
+	output: process.stdout,
+	terminal: false
+});
+
+var count = 0.0;
+var overallCount = 0.0;
+var totalFailures = 0.0;
+var totalOverallFailures = 0.0;
+var totalMs = 0;
+var totalData = 0;
+var devices = {};
+var lastBracketTs = 0;
+
+rl.on('line',function(line) {
+	line = line.trim();
+	var ls = line.split(',');
+	if (ls.length == 7) {
+		var ts = parseInt(ls[0]);
+		var fromId = ls[1];
+		var toId = ls[2];
+		var ms = parseFloat(ls[3]);
+		var bytes = parseInt(ls[4]);
+		var timedOut = (ls[5] == 'true') ? true : false;
+		var errMsg = ls[6];
+
+		count += 1.0;
+		overallCount += 1.0;
+		if ((bytes !== EXPECTED_BYTES)||(timedOut)) {
+			totalFailures += 1.0;
+			totalOverallFailures += 1.0;
+		}
+		totalMs += ms;
+		totalData += bytes;
+
+		devices[fromId] = true;
+		devices[toId] = true;
+
+		if (lastBracketTs === 0)
+			lastBracketTs = ts;
+
+		if (((ts - lastBracketTs) >= BRACKET_SIZE)&&(count > 0.0)) {
+			console.log(count.toString()+','+overallCount.toString()+','+(totalMs / count)+','+(totalFailures / count)+','+(totalOverallFailures / overallCount)+','+totalData+','+Object.keys(devices).length);
+
+			count = 0.0;
+			totalFailures = 0.0;
+			totalMs = 0;
+			totalData = 0;
+			lastBracketTs = ts;
+		}
+	} // else ignore junk
+});
diff --git a/attic/big-http-test/docker-main.sh b/attic/big-http-test/docker-main.sh
new file mode 100755
index 000000000..29cdced9c
--- /dev/null
+++ b/attic/big-http-test/docker-main.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
+
+/zerotier-one -d >>zerotier-one.out 2>&1
+
+# Wait for ZeroTier to start and join the network
+while [ ! -d "/proc/sys/net/ipv6/conf/zt0" ]; do
+	sleep 0.25
+done
+
+# Wait just a bit longer for stuff to settle
+sleep 5
+
+exec node --harmony /agent.js >>agent.out 2>&1
+#exec node --harmony /agent.js
diff --git a/attic/big-http-test/nodesource-el.repo b/attic/big-http-test/nodesource-el.repo
new file mode 100644
index 000000000..b785d3d07
--- /dev/null
+++ b/attic/big-http-test/nodesource-el.repo
@@ -0,0 +1,6 @@
+[nodesource]
+name=Node.js Packages for Enterprise Linux 7 - $basearch
+baseurl=https://rpm.nodesource.com/pub_4.x/el/7/$basearch
+failovermethod=priority
+enabled=1
+gpgcheck=0
diff --git a/attic/big-http-test/package.json b/attic/big-http-test/package.json
new file mode 100644
index 000000000..173a6f99b
--- /dev/null
+++ b/attic/big-http-test/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "zerotier-test-http",
+  "version": "1.0.0",
+  "description": "ZeroTier in-network HTTP test",
+  "main": "agent.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "ZeroTier, Inc.",
+  "license": "GPL-3.0",
+  "dependencies": {
+    "async": "^1.5.0",
+    "express": "^4.13.3",
+    "ipaddr.js": "^1.0.3"
+  }
+}
diff --git a/attic/big-http-test/server.js b/attic/big-http-test/server.js
new file mode 100644
index 000000000..629784da3
--- /dev/null
+++ b/attic/big-http-test/server.js
@@ -0,0 +1,53 @@
+// ZeroTier distributed HTTP test coordinator and result-reporting server
+
+// ---------------------------------------------------------------------------
+// Customizable parameters:
+
+var SERVER_PORT = 18080;
+
+// ---------------------------------------------------------------------------
+
+var fs = require('fs');
+
+var express = require('express');
+var app = express();
+
+app.use(function(req,res,next) {
+	req.rawBody = '';
+	req.on('data', function(chunk) { req.rawBody += chunk.toString(); });
+	req.on('end', function() { return next(); });
+});
+
+var knownAgents = {};
+
+app.post('/:agentId',function(req,res) {
+	var agentId = req.params.agentId;
+	if ((!agentId)||(agentId.length !== 32))
+		return res.status(404).send('');
+
+	if (req.rawBody) {
+		var receiveTime = Date.now();
+		var resultData = null;
+		try {
+			resultData = JSON.parse(req.rawBody);
+			console.log(Date.now().toString()+','+resultData.source+','+resultData.target+','+resultData.time+','+resultData.bytes+','+resultData.timedOut+',"'+((resultData.error) ? resultData.error : '')+'"');
+		} catch (e) {}
+	}
+
+	knownAgents[agentId] = true;
+	var thisUpdate = [];
+	var agents = Object.keys(knownAgents);
+	if (agents.length < 100)
+		thisUpdate = agents;
+	else {
+		for(var xx=0;xx<100;++xx)
+			thisUpdate.push(agents[Math.floor(Math.random() * agents.length)]);
+	}
+
+	return res.status(200).send(JSON.stringify(thisUpdate));
+});
+
+var expressServer = app.listen(SERVER_PORT,function () {
+	console.log('LISTENING ON '+SERVER_PORT);
+	console.log('');
+});
diff --git a/attic/historic/anode/config.mk.Darwin b/attic/historic/anode/config.mk.Darwin
deleted file mode 100644
index a5cbeeecf..000000000
--- a/attic/historic/anode/config.mk.Darwin
+++ /dev/null
@@ -1,17 +0,0 @@
-CC=gcc
-CXX=g++
-
-#ARCH_FLAGS=-arch x86_64 -arch i386 -arch ppc
-
-DEFS=-DHAS_DEV_URANDOM
-CXXDEFS=-DBOOST_DISABLE_ASSERTS -DBOOST_NO_TYPEID -DNDEBUG
-
-CFLAGS=-mmacosx-version-min=10.4 -std=c99 -O6 -ftree-vectorize -Wall $(DEFS) $(ARCH_FLAGS)
-CXXFLAGS=-mmacosx-version-min=10.4 -Drestrict=__restrict__ -O6 -ftree-vectorize -Wall $(DEFS) $(CXXDEFS) $(ARCH_FLAGS)
-
-LDFLAGS=-mmacosx-version-min=10.4 $(ARCH_FLAGS)
-DLLFLAGS=$(ARCH_FLAGS) -shared
-DLLEXT=dylib
-
-LIBANODE_LIBS=-lcrypto -lpthread -lresolv
-LIBSPARK_LIBS=-lz
diff --git a/attic/historic/anode/config.mk.Linux b/attic/historic/anode/config.mk.Linux
deleted file mode 100644
index 072fa4ceb..000000000
--- a/attic/historic/anode/config.mk.Linux
+++ /dev/null
@@ -1,17 +0,0 @@
-CC=gcc
-CXX=g++
-
-DEFS=-DHAS_DEV_URANDOM
-
-CFLAGS=-std=c99 -O6 -fPIC -Wall $(DEFS)
-CXXFLAGS=-Drestrict=__restrict__ -O6 -Wall $(DEFS) -I..
-
-#CFLAGS=-g -Wall $(DEFS)
-#CXXFLAGS=-g -Wall $(DEFS)
-
-LDFLAGS=
-DLLFLAGS=-shared
-DLLEXT=so
-
-LIBANODE_LIBS=-lcrypto -lresolv -pthread
-LIBSPARK_LIBS=-lz
diff --git a/attic/historic/anode/docs/anode_protocol.txt b/attic/historic/anode/docs/anode_protocol.txt
deleted file mode 100644
index 0adb92367..000000000
--- a/attic/historic/anode/docs/anode_protocol.txt
+++ /dev/null
@@ -1,764 +0,0 @@
-*****************************************************************************
-Anode Protocol Specification Draft
-Version 0.8
-
-(c)2009-2010 Adam Ierymenko
-*****************************************************************************
-
-Table of Contents
-
-*****************************************************************************
-
-1. Introduction
-
-Anode provides three components that work together to provide a global,
-secure, and mobile addressing system for computer networks:
-
-1) An addressing system based on public key cryptography enabling network
-   devices or applications to assign themselves secure, unique, and globally
-   reachable network addresses in a flat address space.
-
-2) A system enabling network participants holding global addresses to locate
-   one another on local or global networks with "zero configuration."
-
-3) A communications protocol for communication between addressed network
-   participants that requires no special operating system support and no
-   changes to existing network infrastructure.
-
-Using Anode, both fixed and mobile applications and devices can communicate
-directly as if they were all connected to the same VPN. Anode restores the
-original vision of the Internet as a "flat" network where anything can talk
-to anything, and adds the added benefits of address mobility and strong
-protection against address spoofing and other protocol level attacks.
-
-1.1. Design Philosophy
-
-Anode's design philosophy is the classical "KISS" principle: "Keep It Simple
-Stupid." Anode's design principles are:
-
-#1: Do not try to solve too many problems at once, and stay in scope.
-
-Anode does not attempt to solve too many problems at once. It attempts to
-solve the problems of mobile addressing, address portability, and "flat"
-addressing in the presence of NAT or other barriers.
-
-It does not attempt to duplicate the full functionality of SSL, X.509, SSH,
-XMPP, an enterprise service bus, a pub/sub architecture, BitTorrent, etc. All
-of those protocols and services can be used over Anode if their functionality
-is desired.
-
-#2: Avoid state management.
-
-State multiplies the complexity and failure modes of network protocols. State
-also tends to get in the way of the achievement of new features implicitly
-(see principle #4). Avoid state whenever possible.
-
-#3: Avoid algorithm and dependency bloat.
-
-Anode uses only elliptic curve Diffie-Hellman (EC-DH) and AES-256. No other
-cryptographic algorithms or hash functions are presently necessary. This
-yields implementations compact enough for embedded devices.
-
-Anode also requires few or no dependencies, depending on whether the two
-needed cryptographic algorithms are obtained through a library or included.
-No other protocols or libraries are required in an implementation.
-
-#4: Achieve features implicitly.
-
-Use a simple stateless design that allows features to be achieved implicitly
-rather than specified explicitly. For example, Anode can do multi-homing and
-could be used to build a mesh network, but neither of these features is
-explicitly specified.
-
-*****************************************************************************
-
-2. Core Concepts and Algorithms
-
-This section describes addresses, zones, common algorithms, and other core
-concepts.
-
-2.1. Zones
-
-A zone is a 32-bit integer encoded into every Anode address. Zones serve to
-assist in the location of peers by address on global IP networks. They are
-not presently significant for local communications, though they could be
-used to partition addresses into groups or link them with configuration
-options.
-
-Each zone has a corresponding zone file which can be fetched in a number of
-ways (see below). A zone file is a flat text format dictionary of the format
-"key=value" separated by carriage returns. Line feeds are ignored, and any
-character may be escaped with a backslash (\) character. Blank lines are
-ignored.
-
-The following entries must appear in a zone file:
-
-n=<zone name>
-d=<zone description>
-c=<zone contact, e-mail address of zone administrator>
-r=<zone revision, monotonically increasing integer with each edit>
-ttl=<seconds before zone file should be re-checked for changes>
-
-Additional fields may appear as well, including fields specific to special
-applications or protocols supported within the zone. Some of these are
-defined in this document.
-
-Zone file fetching mechanisms are described below. Multiple mechanisms are
-specified to enable fallback in the event that one mechanism is not available.
-
-2.1.1. Zone File Retrieval
-
-Zone files are retrieved via HTTP, with the HTTP address being formed in one
-of two ways.
-
-The preferred DNS method:
-
-To fetch a zone file via DNS, use the zone ID to generate a host name and URI
-of the form:
-
-  http://a--XXXXXXXX.net/z
-
-The XXXXXXXX field is the zone ID in hexadecimal.
-
-The fallback IP method:
-
-For fallback in the absence of DNS, the zone ID can be used directly as an
-IPv4 or IPv4-mapped-to-IPv6 IP address. A URI is generated of the form:
-
-  http://ip_address/z
-
-Support for this method requires that a zone ID be chosen to correspond to a
-permanent IPv4 (preferably mappable to IPv6 space as well) IP address.
-
-2.1.2. Zone ID Reservation
-
-By convention, a zone ID is considered reserved when a domain of the form
-"a--XXXXXXXX.net" (where XXXXXXXX is the ID in hex) is registered.
-
-It is recommended that this be done even for zone IDs not used for global
-address location in order to globally reserve them.
-
-2.2. Addresses
-
-Anode addresses are binary strings containing a 32-bit zone ID, a public key,
-and possibly other fields. Only one address type is presently defined:
-
-|---------------------------------------------------------------------------|
-| Name         | Type ID | Elliptic Curve Parameters         | Total Length |
-|---------------------------------------------------------------------------|
-| ANODE-256-40 | 1       | NIST-P-256                        | 40           |
-|---------------------------------------------------------------------------|
-
-|---------------------------------------------------------------------------|
-| Name         | Binary Layout                                              |
-|---------------------------------------------------------------------------|
-| ANODE-256-40 | <type[1]><zone[4]><unused[2]><public key[33]>              |
-|---------------------------------------------------------------------------|
-
-The public key is a "compressed" form elliptic curve public key as described
-in RFC5480.
-
-The unused section of the address must be zero. These bytes are reserved for
-future use.
-
-2.2.1. ASCII Format For Addresses
-
-Addresses are encoded in ASCII using base-32, which provides a quotable and
-printable encoding that is of manageable length and is case-insensitive. For
-example, an ANODE-256-40 address is 64 characters long in base-32 encoding.
-
-2.3. Relaying
-
-An Anode peer may optionally relay packets to any other reachable peer.
-Relaying is accomplished by sending a packet to a peer with the recipient set
-to the final recipient. The receiving peer will, if relaying is allowed and if
-it knows of or can reach the recipient, forward the packet.
-
-No error is returned if relaying fails, so relay paths are treated as possible
-paths for communication until a return is received in the same way as direct
-paths.
-
-Relaying can be used by peers to send messages indirectly, locate one
-another, and determine network location information to facilitate the
-establishment of direct communications.
-
-Peers may refuse to relay or may limit the transmission rate at which packets
-can be relayed.
-
-2.3.1. Zone Relays
-
-If a zone's addresses are globally reachable on global IP networks, it must
-have one or more zone relays. These must have globally reachable public
-static IP addresses.
-
-Zone relays are specified in the zone file in the following format:
-
-  zr.<address checksum>=<ip>[,<ip>]:<udp port>:<tcp port>:<anode addresses>
-
-The address checksum is the sum of the bytes in the Anode address modulus
-the number of "zr" entries, in hexadecimal. For example, if a zone had four
-global relays its zone file could contain the lines:
-
-  zr.0=1.2.3.4:4343:4344:klj4j3...
-  zr.1=2.3.4.5:4343:4344:00194j...
-  zr.2=3.4.5.6:4343:4344:1j42zz...
-  zr.3=4.5.6.7:4343:4344:z94j1q...
-
-The relay would be chosen by taking the sum of the bytes in the address
-modulo 4. For example, if the bytes of an address sum to 5081 then relay
-zr.1 would be used to communicate with that address.
-
-If more than one IP address is listed for a given relay, the peer must choose
-at random from among the addresses of the desired type (IPv4 or IPv6).
-
-Each relay must have one Anode address for every address type supported within
-the zone. (At present there is only one address type defined.)
-
-Peers should prefer UDP and fall back to TCP only if UDP is not available.
-
-To make itself available, a peer must make itself known to its designated zone
-relay. This is accomplished by sending a PING message.
-
-2.4. Key Agreement and Derivation
-
-Key agreement is performed using elliptic curve Diffie-Hellman. This yields
-a raw key whose size depends on the elliptic curve parameters in use.
-
-The following algorithm is used to derive a key of any length from a raw
-key generated through key agreement:
-
-1) Zero the derived key buffer.
-2) Determine the largest of the original raw key or the derived key.
-3) Loop from 0 to the largest length determined in step 2, XOR each byte of
-   the derived key buffer with the corresponding byte of the original key
-   buffer with each index being modulus the length of the respective buffer.
-
-2.5. Message Authentication
-
-For message authentication, CMAC-AES (with AES-256) is used. This is also
-known in some literature as OMAC1-AES. The key is derived from key agreement
-between the key pair of the sending peer and the address of the recipient.
-
-2.6. AES-DIGEST
-
-To maintain cryptographic algorithm frugality, a cryptographic hash function
-is constructed from the AES-256 cipher. This hash function uses the common
-Davis-Meyer construction with Merkle-Damgård length padding.
-
-It is described by the following pseudocode:
-
-  byte previous_digest[16] 
-  byte digest[16] = { 0,0,... } 
-  byte block[32] = { 0,0,... } 
-  integer block_counter = 0 
-
-  ; digest message 
-  for each byte b of message 
-    block[block_counter] = b 
-    block_counter = block_counter + 1 
-    if block_counter == 32 then 
-      block_counter = 0 
-      save digest[] in previous_digest[] 
-      encrypt digest[] with aes-256 using block[] as 256-bit aes-256 key 
-      xor digest[] with previous_digest[] 
-    end if 
-  next 
-
-  ; append end marker, do final block 
-  block[block_counter] = 0x80 
-  block_counter = block_counter + 1 
-  zero rest of block[] from block_counter to 15 
-  save digest[] in previous_digest[] 
-  encrypt digest[] with aes-256 using block[] as 256-bit aes-256 key 
-  xor digest[] with previous_digest[] 
-
-  ; Merkle-Damgård length padding 
-  zero first 8 bytes of block[] 
-  fill last 8 bytes of block[] w/64-bit length in big-endian order 
-  save digest[] in previous_digest[] 
-  encrypt digest[] with aes-256 using block[] as 256-bit aes-128 key 
-  xor digest[] with previous_digest[] 
-
-  ; digest[] now contains 128-bit message digest 
-
-2.7. Short Address Identifiers (Address IDs)
-
-A short 8-byte version of the Anode address is used in the protocol to reduce
-transmission overhead when both sides are already aware of the other's full
-address.
-
-The short address identifier is formed by computing the AES-DIGEST of the
-full address and then XORing the first 8 bytes of the digest with the last
-8 bytes to yield an 8-byte shortened digest.
-
-2.8. DNS Resolution of Anode Addresses
-
-Anode addresses can be saved in DNS TXT records in the following format:
-
-anode:<address in base32 ASCII encoding>
-
-This permits Anode addresses to be resolved from normal DNS host name.
-
-2.9. Packet Transmission Mechanisms
-
-2.9.1. UDP Transmission
-
-The recommended method of sending Anode packets is UDP. Each packet is simply
-sent as a UDP packet.
-
-2.9.2. TCP Transmission
-
-To send packets over TCP, each packet is prefixed by its size as a 16-bit
-integer.
-
-2.9.3. HTTP Transmission
-
-Anode packets may be submitted in HTTP POST transactions for transport over
-networks where HTTP is the only available protocol.
-
-Anode packets are simply prefixed with a 16-byte packet size and concatenated
-together just as they are in a TCP stream. One or more packets may be sent
-with each HTTP POST transaction for improved performance.
-
-Since this method is intended for use in "hostile" or highly restricted
-circumstances, no additional details such as special headers or MIME types
-are specified to allow maximum flexibility. Peers should ignore anything
-other than the payload.
-
-2.10. Endpoints
-
-An endpoint indicates a place where Anode packets may be sent. The following
-endpoint types are specified:
-
-|---------------------------------------------------------------------------|
-| Endpoint Type | Description   | Address Format                            |
-|---------------------------------------------------------------------------|
-| 0x00          | Unspecified   | (none)                                    |
-| 0x01          | Ethernet      | <mac[6]>                                  |
-| 0x02          | UDP/IPv4      | <ip[4]><port[2]>                          |
-| 0x03          | TCP/IPv4      | <ip[4]><port[2]>                          |
-| 0x04          | UDP/IPv6      | <ip[16]><port[2]>                         |
-| 0x05          | TCP/IPv6      | <ip[16]><port[2]>                         |
-| 0x06          | HTTP          | <null-terminated full URI>                |
-|---------------------------------------------------------------------------|
-
-Endpoints are encoded by beginning with a single byte indicating the endpoint
-type followed by the address information required for the given type.
-
-Note that IP ports bear no relationship to Anode protocol ports.
-
-2.11. Notes
-
-All integers in the protocol are transmitted in network (big endian) byte
-order.
-
-*****************************************************************************
-
-3. Common Packet Format
-
-A common header is used for all Anode packets:
-
-|---------------------------------------------------------------------------|
-| Field                    | Length | Description                           |
-|---------------------------------------------------------------------------|
-| Hop Count                | 1      | 8-bit hop count (not included in MAC) |
-| Flags                    | 1      | 8-bit flags                           |
-| MAC                      | 8      | 8 byte shortened CMAC-AES of packet   |
-| Sender Address           | ?      | Full address or short ID of sender    |
-| Recipient Address        | ?      | Full address or short ID of recipient |
-| Peer IDs                 | 1      | Two 4-bit peer IDs: sender, recipient |
-| Message Type             | 1      | 8-bit message type                    |
-| Message                  | ?      | Message payload                       |
-|---------------------------------------------------------------------------|
-
-3.1. Hop Count
-
-The hop count begins at zero and must be incremented by each peer that relays
-the packet to another peer. The hop count must not wrap to zero at 255.
-
-Because the hop count is modified in transit, it is not included in MAC
-calculation or authentication.
-
-The hop count is used to prioritize endpoints that are direct over endpoints
-that involve relaying, or to prioritize closer routes over more distant
-ones.
-
-3.2. Flags and Flag Behavior
-
-|---------------------------------------------------------------------------|
-| Flag  | Description                                                       |
-|---------------------------------------------------------------------------|
-| 0x01  | Sender address fully specified                                    |
-| 0x02  | Recipient address fully specified                                 |
-| 0x04  | Authentication error response                                     |
-|---------------------------------------------------------------------------|
-
-If flag 0x01 is set, then the sender address will be the full address rather
-than a short address identifier. The length of the address can be determined
-from the first byte of the address, which always specifies the address type.
-Flag 0x02 has the same meaning for the recipient address.
-
-A peer must send fully specified sender addresses until it receives a response
-from the recipient. At this point the sender may assume that the recipient
-knows its address and use short a short sender address instead. This
-assumption should time out, with a recommended timeout of 60 seconds.
-
-There is presently no need to send fully specified recipient addresses, but
-the flag is present in case it is needed and must be honored.
-
-Flag 0x04 indicates that this is an error response containing a failed
-authentication error. Since authentication failed, this packet may not have
-a valid MAC. Packets with this flag must never have any effect other than
-to inform of an error. This error, since it is unauthenticated, must never
-have any side effects such as terminating a connection.
-
-3.3. MAC
-
-The MAC is calculated as follows:
-
-1) Temporarily set the 64-bit/8-byte MAC field in the packet to the packet's
-   size as a 64-bit big-endian integer.
-2) Calculate the MAC for the entire packet (excluding the first byte) using
-   the key agreed upon between the sender and the recipient, resulting in a
-   16 byte full CMAC-AES MAC.
-3) Derive the 8 byte packet MAC by XORing the first 8 bytes of the full 16
-   byte CMAC-AES MAC with the last 8 bytes. Place this into the packet's MAC
-   field.
-
-3.4. Peer IDs
-
-Peer IDs provide a method for up to 15 different peers to share an address,
-each with a unique ID allowing packets to be routed to them individually.
-
-A peer ID of zero indicates "any" or "unspecified." Real peers must have a
-nonzero peer ID. In the normal single peer per address case, any peer ID may
-be used. If multiple peers are to share an address, some implementation-
-dependent method must be used to ensure that each peer has a unique peer ID.
-
-Relaying peers must follow these rules based on the recipient peer ID when
-relaying messages:
-
- - IF the peer ID is zero or if the peer ID is not known, the message must
-   be forwarded to a random endpoint for the given recipient address.
- - IF the peer ID is nonzero and matches one or more known endpoints for the
-   given recipient address and peer ID, the message must only be sent to
-   a matching endpoint.
-
-A receiving peer should process any message that it receives regardless of
-whether its recipient peer ID is correct. The peer ID is primarily for relays.
-
-Peers should typically send messages with a nonzero recipient peer ID when
-responding to or involved in a conversation with a specific peer (e.g. a
-streaming connection), and send zero recipient peer IDs otherwise.
-
-3.5. Short Address Conflict Disambiguation
-
-In the unlikely event of two Anode addresses with the same short identifier,
-the recipient should use MAC validation to disambiguate. The peer ID must not
-be relied upon for this purpose.
-
-*****************************************************************************
-
-4. Basic Signaling and Transport Protocol
-
-4.1. Message Types
-
-|---------------------------------------------------------------------------|
-| Type        | ID   | Description                                          |
-|---------------------------------------------------------------------------|
-| ERROR       | 0x00 | Error response                                       |
-| PING        | 0x01 | Echo request                                         |
-| PONG        | 0x02 | Echo response                                        |
-| EPC_REQ     | 0x03 | Endpoint check request                               |
-| EPC         | 0x04 | Endpoint check response                              |
-| EPI         | 0x05 | Endpoint information                                 |
-| NAT_T       | 0x06 | NAT traversal message                                |
-| NETID_REQ   | 0x07 | Request network address identification and/or test   |
-| NETID       | 0x08 | Response to network address identification request   |
-| DGRAM       | 0x09 | Simple UDP-like datagram                             |
-|---------------------------------------------------------------------------|
-
-4.2. Message Details
-
-4.2.1. ERROR
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Error Code        | 2      | 16-bit error code                            |
-| Error Arguments   | ?      | Error arguments, depending on error type     |
-|---------------------------------------------------------------------------|
-
-Error arguments are empty unless otherwise stated below.
-
-Error codes:
-
-|---------------------------------------------------------------------------|
-| Error Code | Description                                                  |
-|---------------------------------------------------------------------------|
-| 0x01       | Message not valid                                            |
-| 0x02       | Message authentication or decryption failed                  |
-| 0x03       | Relaying and related features not authorized                 |
-| 0x04       | Relay recipient not reachable                                |
-|---------------------------------------------------------------------------|
-
-Generation of errors is optional. A peer may choose to ignore invalid
-messages or to throttle the sending of errors.
-
-4.2.2. PING
-
-(Payload unspecified.)
-
-Request echo of payload as PONG message.
-
-4.2.3. PONG
-
-(Payload unspecified.)
-
-Echoed payload of received PING message.
-
-4.2.4. EPC_REQ
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Request ID        | 4      | 32-bit request ID                            |
-|---------------------------------------------------------------------------|
-
-Request echo of request ID in EPC message, used to check and learn endpoints.
-
-To learn a network endpoint for a peer, CHECK_REQ is sent. If CHECK is
-returned with a valid request ID, the endpoint is considered valid.
-
-4.2.5. EPC
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Request ID        | 4      | 32-bit request ID echoed back                |
-|---------------------------------------------------------------------------|
-
-Response to EPC_REQ containing request ID.
-
-4.2.6. EPI
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Flags             | 1      | 8-bit flags                                  |
-| Endpoint          | ?      | Endpoint type and address                    |
-| NAT-T mode        | 1      | 8-bit NAT traversal mode                     |
-| NAT-T options     | ?      | Options related to specified NAT-T mode      |
-|---------------------------------------------------------------------------|
-
-EPI stands for EndPoint Identification, and is sent to notify another peer of
-a network endpoint where the sending peer is reachable.
-
-If the receiving peer is interested in communicating with the sending peer,
-the receiving peer must send EPC_REQ to the sending peer at the specified
-endpoint to check the validity of that endpoint. The endpoint is learned if a
-valid EPC is returned.
-
-If the endpoint in EPI is unspecified, the actual source of the EPI message
-is the endpoint. This allows EPI messages to be broadcast on a local LAN
-segment to advertise the presence of an address on a local network. EPI
-broadcasts on local IP networks must be made to UDP port 8737.
-
-Usually EPI is sent via relays (usually zone relays) to inform a peer of an
-endpoint for direct communication.
-
-There are presently no flags, so flags must be zero.
-
-4.2.7. NAT_T
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| NAT-T mode        | 1      | 8-bit NAT traversal mode                     |
-| NAT-T options     | ?      | Options related to specified NAT-T mode      |
-|---------------------------------------------------------------------------|
-
-NAT_T is used to send messages specific to certain NAT traversal modes.
-
-4.2.8. NETID_REQ
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Request ID        | 4      | 32-bit request ID                            |
-| Endpoint          | ?      | Endpoint type and address information        |
-|---------------------------------------------------------------------------|
-
-When a NETID_REQ message is received, the recipient attempts to echo it back
-as a NETID message to the specified endpoint address. If the endpoint is
-unspecified, the recipient must fill it in with the actual origin of the
-NETID_REQ message. This allows a peer to cooperate with another peer (usually
-a zone relay) to empirically determine its externally visible network
-address information.
-
-A peer may ignore NETID_REQ or respond with an error if it does not allow
-relaying.
-
-4.2.9. NETID
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Request ID        | 4      | 32-bit request ID echoed back                |
-| Endpoint Type     | 1      | 8-bit endpoint type                          |
-| Endpoint Address  | ?      | Endpoint Address (size depends on type)      |
-|---------------------------------------------------------------------------|
-
-NETID is sent in response to NETID_REQ to the specified endpoint address. It
-always contains the endpoint address to which it was sent.
-
-4.2.10. DGRAM
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Source Port       | 2      | 16-bit source port                           |
-| Destination Port  | 2      | 16-bit destination port                      |
-| Payload           | ?      | Datagram packet payload                      |
-|---------------------------------------------------------------------------|
-
-A datagram is a UDP-like message without flow control or delivery assurance.
-
-*****************************************************************************
-
-5. Stream Protocol
-
-The stream protocol is very similar to TCP, though it omits some features
-that are not required since they are taken care of by the encapsulating
-protocol. SCTP was also an inspiration in the design.
-
-5.1. Message Types
-
-|---------------------------------------------------------------------------|
-| Type      | ID | Description                                              |
-|---------------------------------------------------------------------------|
-| S_OPEN    | 20 | Initiate a streaming connection (like TCP SYN)           |
-| S_CLOSE   | 21 | Terminate a streaming connection (like TCP RST/FIN)      |
-| S_DATA    | 22 | Data packet                                              |
-| S_ACK     | 23 | Acknowedge receipt of one or more data packets           |
-| S_DACK    | 24 | Combination of DATA and ACK                              |
-|---------------------------------------------------------------------------|
-
-5.2. Message Details
-
-5.2.1. S_OPEN
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Sender Link ID    | 2      | 16-bit sender link ID                        |
-| Destination Port  | 2      | 16-bit destination port                      |
-| Window Size       | 2      | 16-bit window size in 1024-byte increments   |
-| Init. Seq. Number | 4      | 32-bit initial sequence number               |
-| Flags             | 1      | 8-bit flags                                  |
-|---------------------------------------------------------------------------|
-
-The OPEN message corresponds to TCP SYN, and initiates a connection. It
-specifies the initial window size for the sender and the sender's initial
-sequence number, which should be randomly chosen to prevent replay attacks.
-
-If OPEN is successful, the recipient sends its own OPEN to establish the
-connetion. If OPEN is unsuccessful, CLOSE is sent with its initial and current
-sequence numbers equal and an appropriate reason such as "connection refused."
-
-The sender link ID must be unique for a given recipient.
-
-If flag 01 is set, the sender link ID is actually a source port where the
-sender might be listening for connections as well. This exactly duplicates
-the behavior of standard TCP. Otherwise, the sender link ID is simply an
-arbitrary number that the sender uses to identify the connection with this
-recipient and there is no port of origin. Ports of origin are optional for
-Anode streaming connections to permit greater scalability.
-
-5.2.2. S_CLOSE
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Sender Link ID    | 2      | 16-bit sender link ID                        |
-| Destination Port  | 2      | 16-bit destination port                      |
-| Flags             | 1      | 8-bit flags                                  |
-| Reason            | 1      | 8-bit close reason                           |
-| Init. Seq. Number | 4      | 32-bit initial sequence number               |
-| Sequence Number   | 4      | 32-bit current sequence number               |
-|---------------------------------------------------------------------------|
-
-The CLOSE message serves a function similar to TCP FIN. The initial sequence
-number is the original starting sequence number sent with S_OPEN, while the
-current sequence number is the sequence number corresponding to the close
-and must be ACKed to complete the close operation. The use of the initial
-sequence number helps to serve as a key to prevent replay attacks.
-
-CLOSE is also used to indicate a failed OPEN attempt. In this case the current
-sequence number will be equal to the initial sequence number and no ACK will
-be expected.
-
-There are currently no flags, so flags must be zero.
-
-The reason field describes the reason for the close:
-
-|---------------------------------------------------------------------------|
-| Reason Code | Description                                                 |
-|---------------------------------------------------------------------------|
-| 00          | Application closed connection                               |
-| 01          | Connection refused                                          |
-| 02          | Protocol error                                              |
-| 03          | Timed out                                                   |
-|---------------------------------------------------------------------------|
-
-Established connections will usually be closed with reason 00, while reason
-01 is usually provided if an OPEN is received but the port is not bound.
-
-5.2.3. S_DATA
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Sender Link ID    | 2      | 16-bit sender link ID                        |
-| Destination Port  | 2      | 16-bit destination port                      |
-| Sequence Number   | 4      | 32-bit sequence number                       |
-| Payload           | ?      | Data payload                                 |
-|---------------------------------------------------------------------------|
-
-The DATA message carries a packet of data, with the sequence number
-determining order. The sequence number is monotonically incremented with
-each data packet, and wraps at the maximum value of an unsigned 32-bit
-integer.
-
-5.2.4. S_ACK
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Sender Link ID    | 2      | 16-bit sender link ID                        |
-| Destination Port  | 2      | 16-bit destination port                      |
-| Window Size       | 2      | 16-bit window size in 1024-byte increments   |
-| Acknowledgements  | ?      | One or more acknowledgements (see below)     |
-|---------------------------------------------------------------------------|
-
-Each acknowledgement is a 32-bit integer followed by an 8-bit integer (5 bytes
-total). The 32-bit integer is the first sequence number to acknowledge, and
-the 8-bit integer is the number of sequential following sequence numbers to
-acknowledge. For example "1, 4" would acknowledge sequence numbers 1, 2, 3,
-and 4.
-
-5.2.5. S_DACK
-
-|---------------------------------------------------------------------------|
-| Field             | Length | Description                                  |
-|---------------------------------------------------------------------------|
-| Sender Link ID    | 2      | 16-bit sender link ID                        |
-| Destination Port  | 2      | 16-bit destination port                      |
-| Window Size       | 2      | 16-bit window size in 1024-byte increments   |
-| Num. Acks         | 1      | 8-bit number of acknowledgements             |
-| Acknowledgements  | ?      | One or more acknowledgements                 |
-| Payload           | ?      | Data payload                                 |
-|---------------------------------------------------------------------------|
-
-The DACK message combines ACK and DATA, allowing two peers that are both
-transmitting data to efficiently ACK without a separate packet.
diff --git a/attic/historic/anode/libanode/Makefile b/attic/historic/anode/libanode/Makefile
deleted file mode 100644
index 088587bdd..000000000
--- a/attic/historic/anode/libanode/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-SYSNAME:=${shell uname}
-SYSNAME!=uname
-include ../config.mk.${SYSNAME}
-
-LIBANODE_OBJS= \
-  impl/aes.o \
-  impl/dictionary.o \
-  impl/dns_txt.o \
-  impl/ec.o \
-  impl/environment.o \
-  impl/misc.o \
-  impl/thread.o \
-  address.o \
-  aes_digest.o \
-  errors.o \
-  identity.o \
-  network_address.o \
-  secure_random.o \
-  system_transport.o \
-  uri.o
-#  zone.o
-
-all:	$(LIBANODE_OBJS)
-	ar rcs libanode.a $(LIBANODE_OBJS)
-	ranlib libanode.a
-	$(CC) $(CFLAGS) -o utils/anode-make-identity utils/anode-make-identity.c $(LIBANODE_OBJS) $(LIBANODE_LIBS)
-
-clean: force
-	rm -f $(LIBANODE_OBJS)
-	rm -f libanode.$(DLLEXT) libanode.a
-	rm -f utils/anode-make-identity
-
-force: ;
diff --git a/attic/historic/anode/libanode/address.c b/attic/historic/anode/libanode/address.c
deleted file mode 100644
index e7ab78378..000000000
--- a/attic/historic/anode/libanode/address.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include "impl/aes.h"
-#include "impl/ec.h"
-#include "impl/misc.h"
-#include "impl/types.h"
-#include "anode.h"
-
-int AnodeAddress_calc_short_id(
-  const AnodeAddress *address,
-  AnodeAddressId *short_address_id)
-{
-  unsigned char digest[16];
-
-  switch(AnodeAddress_get_type(address)) {
-    case ANODE_ADDRESS_ANODE_256_40:
-      Anode_aes_digest(address->bits,ANODE_ADDRESS_LENGTH_ANODE_256_40,digest);
-      break;
-    default:
-      return ANODE_ERR_ADDRESS_INVALID;
-  }
-
-  *((uint64_t *)short_address_id->bits) = ((uint64_t *)digest)[0] ^ ((uint64_t *)digest)[1];
-
-  return 0;
-}
-
-int AnodeAddress_get_zone(const AnodeAddress *address,AnodeZone *zone)
-{
-  switch(AnodeAddress_get_type(address)) {
-    case ANODE_ADDRESS_ANODE_256_40:
-      *((uint32_t *)&(zone->bits[0])) = *((uint32_t *)&(address->bits[1]));
-      return 0;
-  }
-  return ANODE_ERR_ADDRESS_INVALID;
-}
-
-int AnodeAddress_to_string(const AnodeAddress *address,char *buf,int len)
-{
-  const unsigned char *inptr;
-  char *outptr;
-  unsigned int i;
-
-  switch(AnodeAddress_get_type(address)) {
-    case ANODE_ADDRESS_ANODE_256_40:
-      if (len < (((ANODE_ADDRESS_LENGTH_ANODE_256_40 / 5) * 8) + 1))
-        return ANODE_ERR_BUFFER_TOO_SMALL;
-      inptr = (const unsigned char *)address->bits;
-      outptr = buf;
-      for(i=0;i<(ANODE_ADDRESS_LENGTH_ANODE_256_40 / 5);++i) {
-        Anode_base32_5_to_8(inptr,outptr);
-        inptr += 5;
-        outptr += 8;
-      }
-      *outptr = (char)0;
-      return ((ANODE_ADDRESS_LENGTH_ANODE_256_40 / 5) * 8);
-  }
-  return ANODE_ERR_ADDRESS_INVALID;
-}
-
-int AnodeAddress_from_string(const char *str,AnodeAddress *address)
-{
-  const char *blk_start = str;
-  const char *ptr = str;
-  unsigned int address_len = 0;
-
-  while (*ptr) {
-    if ((unsigned long)(ptr - blk_start) == 8) {
-      if ((address_len + 5) > sizeof(address->bits))
-        return ANODE_ERR_ADDRESS_INVALID;
-      Anode_base32_8_to_5(blk_start,(unsigned char *)&(address->bits[address_len]));
-      address_len += 5;
-      blk_start = ptr;
-    }
-    ++ptr;
-  }
-
-  if (ptr != blk_start)
-    return ANODE_ERR_ADDRESS_INVALID;
-  if (AnodeAddress_get_type(address) != ANODE_ADDRESS_ANODE_256_40)
-    return ANODE_ERR_ADDRESS_INVALID;
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/aes_digest.c b/attic/historic/anode/libanode/aes_digest.c
deleted file mode 100644
index 07b0fc7ac..000000000
--- a/attic/historic/anode/libanode/aes_digest.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include "anode.h"
-#include "impl/aes.h"
-#include "impl/misc.h"
-#include "impl/types.h"
-
-void Anode_aes_digest(const void *const message,unsigned long message_len,void *const hash)
-{
-  unsigned char previous_digest[16];
-  unsigned char digest[16];
-  unsigned char block[32];
-  const unsigned char *in = (const unsigned char *)message;
-  const unsigned char *end = in + message_len;
-  unsigned long block_counter;
-  AnodeAesExpandedKey expkey;
-
-  ((uint64_t *)digest)[0] = 0ULL;
-  ((uint64_t *)digest)[1] = 0ULL;
-  ((uint64_t *)block)[0] = 0ULL;
-  ((uint64_t *)block)[1] = 0ULL;
-  ((uint64_t *)block)[2] = 0ULL;
-  ((uint64_t *)block)[3] = 0ULL;
-
-  /* Davis-Meyer hash function built from block cipher */
-  block_counter = 0;
-  while (in != end) {
-    block[block_counter++] = *(in++);
-    if (block_counter == 32) {
-      block_counter = 0;
-      ((uint64_t *)previous_digest)[0] = ((uint64_t *)digest)[0];
-      ((uint64_t *)previous_digest)[1] = ((uint64_t *)digest)[1];
-      Anode_aes256_expand_key(block,&expkey);
-      Anode_aes256_encrypt(&expkey,digest,digest);
-      ((uint64_t *)digest)[0] ^= ((uint64_t *)previous_digest)[0];
-      ((uint64_t *)digest)[1] ^= ((uint64_t *)previous_digest)[1];
-    }
-  }
-
-  /* Davis-Meyer end marker */
-  block[block_counter++] = 0x80;
-  while (block_counter != 32) block[block_counter++] = 0;
-  ((uint64_t *)previous_digest)[0] = ((uint64_t *)digest)[0];
-  ((uint64_t *)previous_digest)[1] = ((uint64_t *)digest)[1];
-  Anode_aes256_expand_key(block,&expkey);
-  Anode_aes256_encrypt(&expkey,digest,digest);
-  ((uint64_t *)digest)[0] ^= ((uint64_t *)previous_digest)[0];
-  ((uint64_t *)digest)[1] ^= ((uint64_t *)previous_digest)[1];
-
-  /* Merkle-Damgård length padding */
-  ((uint64_t *)block)[0] = 0ULL;
-  if (sizeof(message_len) >= 8) { /* 32/64 bit? this will get optimized out */
-    block[8] = (uint8_t)((uint64_t)message_len >> 56);
-    block[9] = (uint8_t)((uint64_t)message_len >> 48);
-    block[10] = (uint8_t)((uint64_t)message_len >> 40);
-    block[11] = (uint8_t)((uint64_t)message_len >> 32);
-  } else ((uint32_t *)block)[2] = 0;
-  block[12] = (uint8_t)(message_len >> 24);
-  block[13] = (uint8_t)(message_len >> 16);
-  block[14] = (uint8_t)(message_len >> 8);
-  block[15] = (uint8_t)message_len;
-  ((uint64_t *)previous_digest)[0] = ((uint64_t *)digest)[0];
-  ((uint64_t *)previous_digest)[1] = ((uint64_t *)digest)[1];
-  Anode_aes256_expand_key(block,&expkey);
-  Anode_aes256_encrypt(&expkey,digest,digest);
-  ((uint64_t *)digest)[0] ^= ((uint64_t *)previous_digest)[0];
-  ((uint64_t *)digest)[1] ^= ((uint64_t *)previous_digest)[1];
-
-  ((uint64_t *)hash)[0] = ((uint64_t *)digest)[0];
-  ((uint64_t *)hash)[1] = ((uint64_t *)digest)[1];
-}
diff --git a/attic/historic/anode/libanode/anode.h b/attic/historic/anode/libanode/anode.h
deleted file mode 100644
index e0c51e2eb..000000000
--- a/attic/historic/anode/libanode/anode.h
+++ /dev/null
@@ -1,795 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _ANODE_ANODE_H
-#define _ANODE_ANODE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
-#define ANODE_ADDRESS_LENGTH_ANODE_256_40 40
-#define ANODE_ADDRESS_MAX_LENGTH 40
-#define ANODE_ADDRESS_SECRET_LENGTH_ANODE_256_40 32
-#define ANODE_ADDRESS_MAX_SECRET_LENGTH 32
-
-#define ANODE_ADDRESS_ID_LENGTH 8
-#define ANODE_ZONE_LENGTH 4
-
-#define ANODE_ERR_NONE 0
-#define ANODE_ERR_INVALID_ARGUMENT (-10000)
-#define ANODE_ERR_OUT_OF_MEMORY (-10001)
-#define ANODE_ERR_INVALID_URI (-10002)
-#define ANODE_ERR_BUFFER_TOO_SMALL (-10003)
-#define ANODE_ERR_ADDRESS_INVALID (-10010)
-#define ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED (-10011)
-#define ANODE_ERR_CONNECTION_CLOSED (-10012)
-#define ANODE_ERR_CONNECTION_CLOSED_BY_REMOTE (-10013)
-#define ANODE_ERR_CONNECT_FAILED (-10014)
-#define ANODE_ERR_UNABLE_TO_BIND (-10015)
-#define ANODE_ERR_TOO_MANY_OPEN_SOCKETS (-10016)
-#define ANODE_ERR_DNS_NAME_NOT_FOUND_OR_TIMED_OUT (-10017)
-
-/**
- * Get a human-readable error description for an error code
- *
- * The value of 'err' can be either negative or positive.
- *
- * @param err Error code
- * @return Human-readable description
- */
-extern const char *Anode_strerror(int err);
-
-/* ----------------------------------------------------------------------- */
-/* Secure random source                                                    */
-/* ----------------------------------------------------------------------- */
-
-/**
- * Opaque secure random instance
- */
-typedef void AnodeSecureRandom;
-
-/**
- * Initialize a secure random source
- *
- * No cleanup/destructor is necessary.
- *
- * @param srng Random structure to initialize
- */
-extern AnodeSecureRandom *AnodeSecureRandom_new();
-
-/**
- * Generate random bytes
- *
- * @param srng Secure random source
- * @param buf Buffer to fill
- * @param count Number of bytes to generate
- */
-extern void AnodeSecureRandom_gen_bytes(AnodeSecureRandom *srng,void *buf,long count);
-
-/**
- * Destroy and free a secure random instance
- *
- * @param srng Secure random source
- */
-extern void AnodeSecureRandom_delete(AnodeSecureRandom *srng);
-
-/* ----------------------------------------------------------------------- */
-/* AES-256 derived Davis-Meyer hash function                               */
-/* ----------------------------------------------------------------------- */
-
-/**
- * Digest a message using AES-DIGEST to yield a 16-byte hash code
- *
- * @param message Message to digest
- * @param message_len Length of message in bytes
- * @param hash Buffer to store 16 byte hash code
- */
-extern void Anode_aes_digest(
-  const void *const message,
-  unsigned long message_len,
-  void *const hash);
-
-/* ----------------------------------------------------------------------- */
-/* Address Types and Components                                            */
-/* ----------------------------------------------------------------------- */
-
-/**
- * Anode address
- *
- * The first byte always identifies the address type, which right now can
- * only be type 1 (ANODE-256-40).
- */
-typedef struct
-{
-  char bits[ANODE_ADDRESS_MAX_LENGTH];
-} AnodeAddress;
-
-/**
- * 8-byte short Anode address ID
- */
-typedef struct
-{
-  char bits[ANODE_ADDRESS_ID_LENGTH];
-} AnodeAddressId;
-
-/**
- * 4-byte Anode zone ID
- */
-typedef struct
-{
-  char bits[ANODE_ZONE_LENGTH];
-} AnodeZone;
-
-/**
- * Anode address types
- */
-enum AnodeAddressType
-{
-  ANODE_ADDRESS_ANODE_256_40 = 1
-};
-
-/**
- * Get the type of an Anode address
- *
- * This is a shortcut macro for just looking at the first byte and casting
- * it to the AnodeAddressType enum.
- *
- * @param a Pointer to address
- * @return Type as enum AnodeAddressType
- */
-#define AnodeAddress_get_type(a) ((enum AnodeAddressType)((a)->bits[0]))
-
-/**
- * Calculate the short 8 byte address ID from an address
- *
- * @param address Binary address
- * @param short_address_id Buffer to store 8-byte short address ID
- * @return 0 on success or error code on failure
- */
-extern int AnodeAddress_calc_short_id(
-  const AnodeAddress *address,
-  AnodeAddressId *short_address_id);
-
-/**
- * Extract the zone from an anode address
- *
- * @param address Binary address
- * @param zone Zone value-result parameter to fill on success
- * @return 0 on success or error code on failure
- */
-extern int AnodeAddress_get_zone(const AnodeAddress *address,AnodeZone *zone);
-
-/**
- * Convert an address to an ASCII string
- *
- * Anode addresses are 64 characters in ASCII form, so the buffer should
- * have 65 bytes of space.
- *
- * @param address Address to convert
- * @param buf Buffer to receive address in string form (should have 65 bytes of space)
- * @param len Length of buffer
- * @return Length of resulting string or a negative error code on error
- */
-extern int AnodeAddress_to_string(const AnodeAddress *address,char *buf,int len);
-
-/**
- * Convert a string into an address
- *
- * @param str Address in string form
- * @param address Address buffer to receive result
- * @return Zero on sucess or error code on error
- */
-extern int AnodeAddress_from_string(const char *str,AnodeAddress *address);
-
-/**
- * Supported network address types
- */
-enum AnodeNetworkAddressType
-{
-  ANODE_NETWORK_ADDRESS_IPV4 = 0,
-  ANODE_NETWORK_ADDRESS_IPV6 = 1,
-  ANODE_NETWORK_ADDRESS_ETHERNET = 2,  /* reserved but unused */
-  ANODE_NETWORK_ADDRESS_USB = 3,       /* reserved but unused */
-  ANODE_NETWORK_ADDRESS_BLUETOOTH = 4, /* reserved but unused */
-  ANODE_NETWORK_ADDRESS_IPC = 5,       /* reserved but unused */
-  ANODE_NETWORK_ADDRESS_80211S = 6,    /* reserved but unused */
-  ANODE_NETWORK_ADDRESS_SERIAL = 7,    /* reserved but unused */
-  ANODE_NETWORK_ADDRESS_ANODE_256_40 = 8
-};
-
-/**
- * Anode network address
- *
- * This can contain an address of any type: IPv4, IPv6, or Anode, and is used
- * with the common transport API.
- *
- * The length of the address stored in bits[] is determined by the type.
- */
-typedef struct
-{
-  enum AnodeNetworkAddressType type;
-  char bits[ANODE_ADDRESS_MAX_LENGTH];
-} AnodeNetworkAddress;
-
-/**
- * An endpoint with an address and a port
- */
-typedef struct
-{
-  AnodeNetworkAddress address;
-  int port;
-} AnodeNetworkEndpoint;
-
-/* Constants for binding to any address (v4 or v6) */
-extern const AnodeNetworkAddress AnodeNetworkAddress_IP_ANY_V4;
-extern const AnodeNetworkAddress AnodeNetworkAddress_IP_ANY_V6;
-
-/* Local host address in v4 and v6 */
-extern const AnodeNetworkAddress AnodeNetworkAddress_IP_LOCAL_V4;
-extern const AnodeNetworkAddress AnodeNetworkAddress_IP_LOCAL_V6;
-
-/**
- * Convert a network address to an ASCII string
- *
- * The buffer must have room for a 15 character string for IPv4, a 40 byte
- * string for IPv6, and a 64 byte string for Anode addresses. This does not
- * include the trailing null.
- *
- * @param address Address to convert
- * @param buf Buffer to receive address in string form
- * @param len Length of buffer
- * @return Length of resulting string or a negative error code on error
- */
-extern int AnodeNetworkAddress_to_string(const AnodeNetworkAddress *address,char *buf,int len);
-
-/**
- * Convert a string into a network address of the correct type
- *
- * @param str Address in string form
- * @param address Address buffer to receive result
- * @return Zero on sucess or error code on error
- */
-extern int AnodeNetworkAddress_from_string(const char *str,AnodeNetworkAddress *address);
-
-/**
- * Fill a network endpoint from a C-API sockaddr structure
- *
- * The argument must be struct sockaddr_in for IPv4 or sockaddr_in6 for IPv6.
- * The common sin_family field will be used to differentiate.
- *
- * @param sockaddr Pointer to proper sockaddr structure
- * @param endpoint Endpoint structure to fill
- * @return Zero on success or error on failure
- */
-extern int AnodeNetworkEndpoint_from_sockaddr(const void *sockaddr,AnodeNetworkEndpoint *endpoint);
-
-/**
- * Fill a sockaddr from a network endpoint
- *
- * To support either IPv4 or IPv6 addresses, there is a sockaddr_storage
- * structure in most C APIs. If you supply anything other than an IP address
- * such as an Anode address, this will return an error.
- *
- * @param endpoint Endpoint structure to convert
- * @param sockaddr Sockaddr structure storage
- * @param sockaddr_len Length of sockaddr structure storage in bytes
- * @return Zero on success or error on failure
- */
-extern int AnodeNetworkEndpoint_to_sockaddr(const AnodeNetworkEndpoint *endpoint,void *sockaddr,int sockaddr_len);
-
-/* ----------------------------------------------------------------------- */
-/* Identity Generation and Management                                      */
-/* ----------------------------------------------------------------------- */
-
-/**
- * Anode identity structure containing address and secret key
- *
- * This structure is memcpy-safe, and its members are accessible.
- */
-typedef struct
-{
-  /* The public Anode address */
-  AnodeAddress address;
-
-  /* Short address ID */
-  AnodeAddressId address_id;
-
-  /* The secret key corresponding with the public address */
-  /* Secret length is determined by address type */
-  char secret[ANODE_ADDRESS_MAX_SECRET_LENGTH];
-} AnodeIdentity;
-
-/**
- * Generate a new identity
- *
- * This generates a public/private key pair and from that generates an
- * identity containing an address and a secret key.
- *
- * @param identity Destination structure to store new identity
- * @param zone Zone ID
- * @param type Type of identity to generate
- * @return Zero on success, error on failure
- */
-extern int AnodeIdentity_generate(
-  AnodeIdentity *identity,
-  const AnodeZone *zone,
-  enum AnodeAddressType type);
-
-/**
- * Convert an Anode identity to a string representation
- *
- * @param identity Identity to convert
- * @param dest String buffer
- * @param dest_len Length of string buffer
- * @return Length of string created or negative error code on failure
- */
-extern int AnodeIdentity_to_string(
-  const AnodeIdentity *identity,
-  char *dest,
-  int dest_len);
-
-/**
- * Convert a string representation to an Anode identity structure
- *
- * @param identity Destination structure to fill
- * @param str C-string containing string representation
- * @return Zero on success or negative error code on failure
- */
-extern int AnodeIdentity_from_string(
-  AnodeIdentity *identity,
-  const char *str);
-
-/* ----------------------------------------------------------------------- */
-/* Transport API                                                           */
-/* ----------------------------------------------------------------------- */
-
-struct _AnodeTransport;
-typedef struct _AnodeTransport AnodeTransport;
-struct _AnodeEvent;
-typedef struct _AnodeEvent AnodeEvent;
-
-/**
- * Anode socket
- */
-typedef struct
-{
-  /* Type of socket (read-only) */
-  enum {
-    ANODE_SOCKET_DATAGRAM = 1,
-    ANODE_SOCKET_STREAM_LISTEN = 2,
-    ANODE_SOCKET_STREAM_CONNECTION = 3
-  } type;
-
-  /* Socket state */
-  enum {
-    ANODE_SOCKET_CLOSED = 0,
-    ANODE_SOCKET_OPEN = 1,
-    ANODE_SOCKET_CONNECTING = 2,
-  } state;
-
-  /* Local address or remote address for stream connections (read-only) */
-  AnodeNetworkEndpoint endpoint;
-
-  /* Name of owning class (read-only) */
-  const char *class_name;
-
-  /* Pointers for end user use (writable) */
-  void *user_ptr[2];
-
-  /* Special handler to receive events or null for default (writable) */
-  void (*event_handler)(const AnodeEvent *event);
-} AnodeSocket;
-
-/**
- * Anode transport I/O event
- */
-struct _AnodeEvent
-{
-  enum {
-    ANODE_TRANSPORT_EVENT_DATAGRAM_RECEIVED = 1,
-    ANODE_TRANSPORT_EVENT_STREAM_INCOMING_CONNECT = 2,
-    ANODE_TRANSPORT_EVENT_STREAM_OUTGOING_CONNECT_ESTABLISHED = 3,
-    ANODE_TRANSPORT_EVENT_STREAM_OUTGOING_CONNECT_FAILED = 4,
-    ANODE_TRANSPORT_EVENT_STREAM_CLOSED = 5,
-    ANODE_TRANSPORT_EVENT_STREAM_DATA_RECEIVED = 6,
-    ANODE_TRANSPORT_EVENT_STREAM_AVAILABLE_FOR_WRITE = 7,
-    ANODE_TRANSPORT_EVENT_DNS_RESULT = 8
-  } type;
-
-  AnodeTransport *transport;
-
-  /* Anode socket corresponding to this event */
-  AnodeSocket *sock;
-
-  /* Originating endpoint for incoming datagrams */
-  AnodeNetworkEndpoint *datagram_from;
-
-  /* DNS lookup results */
-  const char *dns_name;
-  AnodeNetworkAddress *dns_addresses;
-  int dns_address_count;
-
-  /* Error code or 0 for none */
-  int error_code;
-
-  /* Data for incoming datagrams and stream received events */
-  int data_length;
-  char *data;
-};
-
-/**
- * Enum used for dns_resolve method in transport to specify query rules
- *
- * This can be specified for ipv4, ipv6, and Anode address types to tell the
- * DNS resolver when to bother querying for addresses of the given type.
- * NEVER means to never query for this type, and ALWAYS means to always
- * query. IF_NO_PREVIOUS means to query for this type if no addresses were
- * found in previous queries. Addresses are queried in the order of ipv4,
- * ipv6, then Anode, so if you specify IF_NO_PREVIOUS for all three you will
- * get addresses in that order of priority.
- */
-enum AnodeTransportDnsIncludeMode
-{
-  ANODE_TRANSPORT_DNS_QUERY_NEVER = 0,
-  ANODE_TRANSPORT_DNS_QUERY_ALWAYS = 1,
-  ANODE_TRANSPORT_DNS_QUERY_IF_NO_PREVIOUS = 2
-};
-
-struct _AnodeTransport
-{
-  /**
-   * Set the default event handler
-   *
-   * @param transport Transport engine
-   * @param event_handler Default event handler
-   */
-  void (*set_default_event_handler)(AnodeTransport *transport,
-    void (*event_handler)(const AnodeEvent *event));
-
-  /**
-   * Enqueue a function to be executed during a subsequent call to poll()
-   *
-   * This can be called from other threads, so it can be used to pass a
-   * message to the I/O thread in multithreaded applications.
-   *
-   * If it is called from the same thread, the function is still queued to be
-   * run later rather than being run instantly.
-   *
-   * The order in which invoked functions are called is undefined.
-   *
-   * @param transport Transport engine
-   * @param ptr Arbitrary pointer to pass to function to be called
-   * @param func Function to be called
-   */
-  void (*invoke)(AnodeTransport *transport,
-    void *ptr,
-    void (*func)(void *));
-
-  /**
-   * Initiate a forward DNS query
-   *
-   * @param transport Transport instance
-   * @param name DNS name to query
-   * @param event_handler Event handler or null for default event path
-   * @param ipv4_include_mode Inclusion mode for IPv4 addresses
-   * @param ipv6_include_mode Inclusion mode for IPv6 addresses
-   * @param anode_include_mode Inclusion mode for Anode addresses
-   */
-  void (*dns_resolve)(AnodeTransport *transport,
-    const char *name,
-    void (*event_handler)(const AnodeEvent *),
-    enum AnodeTransportDnsIncludeMode ipv4_include_mode,
-    enum AnodeTransportDnsIncludeMode ipv6_include_mode,
-    enum AnodeTransportDnsIncludeMode anode_include_mode);
-
-  /**
-   * Open a datagram socket
-   *
-   * @param transport Transport instance
-   * @param local_address Local address to bind
-   * @param local_port Local port to bind
-   * @param error_code Value-result parameter to receive error code on error
-   * @return Listen socket or null if error (check error_code in error case)
-   */
-  AnodeSocket *(*datagram_listen)(AnodeTransport *transport,
-    const AnodeNetworkAddress *local_address,
-    int local_port,
-    int *error_code);
-
-  /**
-   * Open a socket to listen for incoming stream connections
-   *
-   * @param transport Transport instance
-   * @param local_address Local address to bind
-   * @param local_port Local port to bind
-   * @param error_code Value-result parameter to receive error code on error
-   * @return Listen socket or null if error (check error_code in error case)
-   */
-  AnodeSocket *(*stream_listen)(AnodeTransport *transport,
-    const AnodeNetworkAddress *local_address,
-    int local_port,
-    int *error_code);
-
-  /**
-   * Send a datagram to a network endpoint
-   *
-   * @param transport Transport instance
-   * @param socket Originating datagram socket
-   * @param data Data to send
-   * @param data_len Length of data to send
-   * @param to_endpoint Destination endpoint
-   * @return Zero on success or error code on error
-   */
-  int (*datagram_send)(AnodeTransport *transport,
-    AnodeSocket *sock,
-    const void *data,
-    int data_len,
-    const AnodeNetworkEndpoint *to_endpoint);
-
-  /**
-   * Initiate an outgoing stream connection attempt
-   *
-   * For IPv4 and IPv6 addresses, this will initiate a TCP connection. For
-   * Anode addresses, Anode's internal streaming protocol will be used.
-   *
-   * @param transport Transport instance
-   * @param to_endpoint Destination endpoint
-   * @param error_code Error code value-result parameter, filled on error
-   * @return Stream socket object or null on error (check error_code)
-   */
-  AnodeSocket *(*stream_connect)(AnodeTransport *transport,
-    const AnodeNetworkEndpoint *to_endpoint,
-    int *error_code);
-
-  /**
-   * Indicate that you are interested in writing to a stream
-   *
-   * This does nothing if the socket is not a stream connection or is not
-   * connected.
-   *
-   * @param transport Transport instance
-   * @param sock Stream connection
-   */
-  void (*stream_start_writing)(AnodeTransport *transport,
-    AnodeSocket *sock);
-
-  /**
-   * Indicate that you are no longer interested in writing to a stream
-   *
-   * This does nothing if the socket is not a stream connection or is not
-   * connected.
-   *
-   * @param transport Transport instance
-   * @param sock Stream connection
-   */
-  void (*stream_stop_writing)(AnodeTransport *transport,
-    AnodeSocket *sock);
-
-  /**
-   * Send data to a stream connection
-   *
-   * This must be called after a stream is indicated to be ready for writing.
-   * It returns the number of bytes actually written, or a negative error
-   * code on failure.
-   *
-   * A return value of zero can occur here, and simply indicates that nothing
-   * was sent. This may occur with certain network stacks on certain
-   * platforms.
-   *
-   * @param transport Transport engine
-   * @param sock Stream socket
-   * @param data Data to send
-   * @param data_len Maximum data to send in bytes
-   * @return Actual data sent or negative error code on error
-   */
-  int (*stream_send)(AnodeTransport *transport,
-    AnodeSocket *sock,
-    const void *data,
-    int data_len);
-
-  /**
-   * Close a socket
-   *
-   * If the socket is a stream connection in the connected state, this
-   * will generate a stream closed event with a zero error_code to indicate
-   * a normal close.
-   *
-   * @param transport Transport engine
-   * @param sock Socket object
-   */
-  void (*close)(AnodeTransport *transport,
-    AnodeSocket *sock);
-
-  /**
-   * Run main polling loop
-   *
-   * This should be called repeatedly from the I/O thread of your main
-   * process. It blocks until one or more events occur, and then returns
-   * the number of events. Error returns here are fatal and indicate
-   * serious problems such as build or platform issues or a lack of any
-   * network interface.
-   *
-   * Functions queued with invoke() are also called inside here.
-   *
-   * @param transport Transport engine
-   * @return Number of events handled or negative on (fatal) error
-   */
-  int (*poll)(AnodeTransport *transport);
-
-  /**
-   * Check whether transport supports an address type
-   *
-   * Inheriting classes should call their base if they do not natively
-   * speak the specified type.
-   *
-   * @param transport Transport engine
-   * @param at Address type
-   * @return Nonzero if true
-   */
-  int (*supports_address_type)(const AnodeTransport *transport,
-    enum AnodeNetworkAddressType at);
-
-  /**
-   * Get the instance of AnodeTransport under this one (if any)
-   *
-   * @param transport Transport engine
-   * @return Base instance or null if none
-   */
-  AnodeTransport *(*base_instance)(const AnodeTransport *transport);
-
-  /**
-   * @param transport Transport engine
-   * @return Class name of this instance
-   */
-  const char *(*class_name)(AnodeTransport *transport);
-
-  /**
-   * Delete this transport and its base transports
-   *
-   * The 'transport' pointer and any streams or sockets it owns are no longer
-   * valid after this call.
-   *
-   * @param transport Transport engine
-   */
-  void (*delete)(AnodeTransport *transport);
-};
-
-/**
- * Construct a new system transport
- *
- * This is the default base for AnodeTransport, and it is constructed
- * automatically if 'base' is null in AnodeTransport_new(). However, it also
- * exposed to the user so that specialized transports (such as those that use
- * proxy servers) can be developed on top of it. These in turn can be supplied
- * as 'base' to AnodeTransport_new() to talk Anode over these transports.
- *
- * The system transport supports IP protocols and possibly others.
- *
- * @param base Base class or null for none (usually null)
- * @return Base transport engine instance
- */
-extern AnodeTransport *AnodeSystemTransport_new(AnodeTransport *base);
-
-/**
- * Construct a new Anode core transport
- *
- * This is the transport that talks Anode using the specified base transport.
- * Requests for other address types are passed through to the base. If the
- * base is null, an instance of AnodeSystemTransport is used.
- *
- * Since transport engines inherit their functionality, this transport
- * will also do standard IP and everything else that the system transport
- * supports. Most users will just want to construct this with a null base.
- *
- * @param base Base transport to use, or null to use SystemTransport
- * @return Anode transport engine or null on error
- */
-extern AnodeTransport *AnodeCoreTransport_new(AnodeTransport *base);
-
-/* ----------------------------------------------------------------------- */
-/* URI Parser                                                              */
-/* ----------------------------------------------------------------------- */
-
-/**
- * URI broken down by component
- */
-typedef struct
-{
-  char scheme[8];
-  char username[64];
-  char password[64];
-  char host[128];
-  char path[256];
-  char query[256];
-  char fragment[64];
-  int port;
-} AnodeURI;
-
-/**
- * URI parser
- *
- * A buffer too small error will occur if any field is too large for the
- * AnodeURI structure.
- *
- * @param parsed_uri Structure to fill with parsed URI data
- * @param uri_string URI in string format
- * @return Zero on success or error on failure
- */
-extern int AnodeURI_parse(AnodeURI *parsed_uri,const char *uri_string);
-
-/**
- * Output a URI in string format
- *
- * @param uri URI to output as string
- * @param buf Buffer to store URI string
- * @param len Length of buffer
- * @return Buffer or null on error
- */
-extern char *AnodeURI_to_string(const AnodeURI *uri,char *buf,int len);
-
-/* ----------------------------------------------------------------------- */
-/* Zone File Lookup and Dictionary                                         */
-/* ----------------------------------------------------------------------- */
-
-/**
- * Zone file dictionary
- */
-typedef void AnodeZoneFile;
-
-/**
- * Start asynchronous zone fetch
- *
- * When the zone is retrieved, the lookup handler is called. If zone lookup
- * failed, the zone file argument to the handler will be null.
- *
- * @param transport Transport engine
- * @param zone Zone ID
- * @param user_ptr User pointer
- * @param zone_lookup_handler Handler for Anode zone lookup
- */
-extern void AnodeZoneFile_lookup(
-  AnodeTransport *transport,
-  const AnodeZone *zone,
-  void *ptr,
-  void (*zone_lookup_handler)(const AnodeZone *,AnodeZoneFile *,void *));
-
-/**
- * Look up a key in a zone file
- *
- * @param zone Zone file object
- * @param key Key to get in zone file
- */
-extern const char *AnodeZoneFile_get(const AnodeZoneFile *zone,const char *key);
-
-/**
- * Free a zone file
- *
- * @param zone Zone to free
- */
-extern void AnodeZoneFile_free(AnodeZoneFile *zone);
-
-/* ----------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/attic/historic/anode/libanode/errors.c b/attic/historic/anode/libanode/errors.c
deleted file mode 100644
index 6836bdc44..000000000
--- a/attic/historic/anode/libanode/errors.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include "anode.h"
-
-struct AnodeErrDesc
-{
-  int code;
-  const char *desc;
-};
-
-#define TOTAL_ERRORS 12
-static const struct AnodeErrDesc ANODE_ERRORS[TOTAL_ERRORS] = {
-  { ANODE_ERR_NONE, "No error (success)" },
-  { ANODE_ERR_INVALID_ARGUMENT, "Invalid argument" },
-  { ANODE_ERR_OUT_OF_MEMORY, "Out of memory" },
-  { ANODE_ERR_INVALID_URI, "Invalid URI" },
-  { ANODE_ERR_BUFFER_TOO_SMALL, "Supplied buffer too small" },
-  { ANODE_ERR_ADDRESS_INVALID, "Address invalid" },
-  { ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED, "Address type not supported"},
-  { ANODE_ERR_CONNECTION_CLOSED, "Connection closed"},
-  { ANODE_ERR_CONNECT_FAILED, "Connect failed"},
-  { ANODE_ERR_UNABLE_TO_BIND, "Unable to bind to address"},
-  { ANODE_ERR_TOO_MANY_OPEN_SOCKETS, "Too many open sockets"},
-  { ANODE_ERR_DNS_NAME_NOT_FOUND_OR_TIMED_OUT, "DNS name not found or timed out"}
-};
-
-extern const char *Anode_strerror(int err)
-{
-  int i;
-  int negerr = -err;
-
-  for(i=0;i<TOTAL_ERRORS;++i) {
-    if ((ANODE_ERRORS[i].code == err)||(ANODE_ERRORS[i].code == negerr))
-      return ANODE_ERRORS[i].desc;
-  }
-
-  return "Unknown error";
-}
diff --git a/attic/historic/anode/libanode/identity.c b/attic/historic/anode/libanode/identity.c
deleted file mode 100644
index a40f69874..000000000
--- a/attic/historic/anode/libanode/identity.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "impl/types.h"
-#include "impl/ec.h"
-#include "impl/misc.h"
-#include "anode.h"
-
-int AnodeIdentity_generate(AnodeIdentity *identity,const AnodeZone *zone,enum AnodeAddressType type)
-{
-  struct AnodeECKeyPair kp;
-
-  switch(type) {
-    case ANODE_ADDRESS_ANODE_256_40:
-      if (!AnodeECKeyPair_generate(&kp))
-        return ANODE_ERR_OUT_OF_MEMORY;
-
-      identity->address.bits[0] = (unsigned char)ANODE_ADDRESS_ANODE_256_40;
-
-      identity->address.bits[1] = zone->bits[0];
-      identity->address.bits[2] = zone->bits[1];
-      identity->address.bits[3] = zone->bits[2];
-      identity->address.bits[4] = zone->bits[3];
-
-      identity->address.bits[5] = 0;
-      identity->address.bits[6] = 0;
-
-      Anode_memcpy((void *)&(identity->address.bits[7]),(const void *)kp.pub.key,ANODE_EC_PUBLIC_KEY_BYTES);
-      Anode_memcpy((void *)identity->secret,(const void *)kp.priv.key,kp.priv.bytes);
-
-      AnodeAddress_calc_short_id(&identity->address,&identity->address_id);
-
-      AnodeECKeyPair_destroy(&kp);
-
-      return 0;
-  }
-
-  return ANODE_ERR_INVALID_ARGUMENT;
-}
-
-int AnodeIdentity_to_string(const AnodeIdentity *identity,char *dest,int dest_len)
-{
-  char hexbuf[128];
-  char strbuf[128];
-  int n;
-
-  if ((n = AnodeAddress_to_string(&identity->address,strbuf,sizeof(strbuf))) <= 0)
-    return n;
-
-  switch(AnodeAddress_get_type(&identity->address)) {
-    case ANODE_ADDRESS_ANODE_256_40:
-      Anode_to_hex((const unsigned char *)identity->secret,ANODE_ADDRESS_SECRET_LENGTH_ANODE_256_40,hexbuf,sizeof(hexbuf));
-      n = snprintf(dest,dest_len,"ANODE-256-40:%s:%s",strbuf,hexbuf);
-      if (n >= dest_len)
-        return ANODE_ERR_BUFFER_TOO_SMALL;
-      return n;
-  }
-
-  return ANODE_ERR_INVALID_ARGUMENT;
-}
-
-int AnodeIdentity_from_string(AnodeIdentity *identity,const char *str)
-{
-  char buf[1024];
-  char *id_name;
-  char *address;
-  char *secret;
-  int ec;
-
-  Anode_str_copy(buf,str,sizeof(buf));
-
-  id_name = buf;
-  if (!id_name) return 0;
-  if (!*id_name) return 0;
-  address = (char *)Anode_strchr(id_name,':');
-  if (!address) return 0;
-  if (!*address) return 0;
-  *(address++) = (char)0;
-  secret = (char *)Anode_strchr(address,':');
-  if (!secret) return 0;
-  if (!*secret) return 0;
-  *(secret++) = (char)0;
-
-  if (Anode_strcaseeq("ANODE-256-40",id_name)) {
-    if ((ec = AnodeAddress_from_string(address,&identity->address)))
-      return ec;
-    if (Anode_strlen(secret) != (ANODE_ADDRESS_SECRET_LENGTH_ANODE_256_40 * 2))
-      return ANODE_ERR_INVALID_ARGUMENT;
-    Anode_from_hex(secret,(unsigned char *)identity->secret,sizeof(identity->secret));
-    AnodeAddress_calc_short_id(&identity->address,&identity->address_id);
-    return 0;
-  }
-
-  return ANODE_ERR_INVALID_ARGUMENT;
-}
diff --git a/attic/historic/anode/libanode/impl/aes.c b/attic/historic/anode/libanode/impl/aes.c
deleted file mode 100644
index 90e5e23ba..000000000
--- a/attic/historic/anode/libanode/impl/aes.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include "aes.h"
-
-void Anode_cmac_aes256(
-  const AnodeAesExpandedKey *expkey,
-  const unsigned char *restrict data,
-  unsigned long data_len,
-  unsigned char *restrict mac)
-{
-  unsigned char cbc[16];
-  unsigned char pad[16];
-  const unsigned char *restrict pos = data;
-  unsigned long i;
-  unsigned long remaining = data_len;
-  unsigned char c;
-
-  ((uint64_t *)((void *)cbc))[0] = 0ULL;
-  ((uint64_t *)((void *)cbc))[1] = 0ULL;
-
-  while (remaining >= 16) {
-    ((uint64_t *)((void *)cbc))[0] ^= ((uint64_t *)((void *)pos))[0];
-    ((uint64_t *)((void *)cbc))[1] ^= ((uint64_t *)((void *)pos))[1];
-    pos += 16;
-    if (remaining > 16)
-      Anode_aes256_encrypt(expkey,cbc,cbc);
-    remaining -= 16;
-  }
-
-  ((uint64_t *)((void *)pad))[0] = 0ULL;
-  ((uint64_t *)((void *)pad))[1] = 0ULL;
-  Anode_aes256_encrypt(expkey,pad,pad);
-
-  c = pad[0] & 0x80;
-  for(i=0;i<15;++i)
-    pad[i] = (pad[i] << 1) | (pad[i + 1] >> 7);
-  pad[15] <<= 1;
-  if (c)
-    pad[15] ^= 0x87;
-
-  if (remaining||(!data_len)) {
-    for(i=0;i<remaining;++i)
-      cbc[i] ^= *(pos++);
-    cbc[remaining] ^= 0x80;
-
-    c = pad[0] & 0x80;
-    for(i=0;i<15;++i)
-      pad[i] = (pad[i] << 1) | (pad[i + 1] >> 7);
-    pad[15] <<= 1;
-    if (c)
-      pad[15] ^= 0x87;
-  }
-
-  ((uint64_t *)((void *)mac))[0] = ((uint64_t *)((void *)pad))[0] ^ ((uint64_t *)((void *)cbc))[0];
-  ((uint64_t *)((void *)mac))[1] = ((uint64_t *)((void *)pad))[1] ^ ((uint64_t *)((void *)cbc))[1];
-
-  Anode_aes256_encrypt(expkey,mac,mac);
-}
diff --git a/attic/historic/anode/libanode/impl/aes.h b/attic/historic/anode/libanode/impl/aes.h
deleted file mode 100644
index 25e33933d..000000000
--- a/attic/historic/anode/libanode/impl/aes.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _ANODE_AES_H
-#define _ANODE_AES_H
-
-#include <openssl/aes.h>
-#include "types.h"
-
-/* This just glues us to OpenSSL's built-in AES-256 implementation */
-
-#define ANODE_AES_BLOCK_SIZE 16
-#define ANODE_AES_KEY_SIZE 32
-
-typedef AES_KEY AnodeAesExpandedKey;
-
-#define Anode_aes256_expand_key(k,ek) AES_set_encrypt_key((const unsigned char *)(k),256,(AES_KEY *)(ek))
-
-/* Note: in and out can be the same thing */
-#define Anode_aes256_encrypt(ek,in,out) AES_encrypt((const unsigned char *)(in),(unsigned char *)(out),(const AES_KEY *)(ek))
-
-/* Note: iv is modified */
-static inline void Anode_aes256_cfb_encrypt(
-  const AnodeAesExpandedKey *expkey,
-  const unsigned char *in,
-  unsigned char *out,
-  unsigned char *iv,
-  unsigned long len)
-{
-  int tmp = 0;
-  AES_cfb128_encrypt(in,out,len,(const AES_KEY *)expkey,iv,&tmp,AES_ENCRYPT);
-}
-static inline void Anode_aes256_cfb_decrypt(
-  const AnodeAesExpandedKey *expkey,
-  const unsigned char *in,
-  unsigned char *out,
-  unsigned char *iv,
-  unsigned long len)
-{
-  int tmp = 0;
-  AES_cfb128_encrypt(in,out,len,(const AES_KEY *)expkey,iv,&tmp,AES_DECRYPT);
-}
-
-/* CMAC message authentication code */
-void Anode_cmac_aes256(
-  const AnodeAesExpandedKey *expkey,
-  const unsigned char *restrict data,
-  unsigned long data_len,
-  unsigned char *restrict mac);
-
-#endif
diff --git a/attic/historic/anode/libanode/impl/dictionary.c b/attic/historic/anode/libanode/impl/dictionary.c
deleted file mode 100644
index 060c38150..000000000
--- a/attic/historic/anode/libanode/impl/dictionary.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "dictionary.h"
-
-static const char *EMPTY_STR = "";
-
-void AnodeDictionary_clear(struct AnodeDictionary *d)
-{
-  struct AnodeDictionaryEntry *e,*ne;
-  int oldcs;
-  unsigned int i;
-
-  oldcs = d->case_sensitive;
-
-  for(i=0;i<ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE;++i) {
-    e = d->ht[i];
-    while (e) {
-      ne = e->next;
-      if ((e->key)&&(e->key != EMPTY_STR)) free((void *)e->key);
-      if ((e->value)&&(e->value != EMPTY_STR)) free((void *)e->value);
-      free((void *)e);
-      e = ne;
-    }
-  }
-
-  Anode_zero((void *)d,sizeof(struct AnodeDictionary));
-
-  d->case_sensitive = oldcs;
-}
-
-void AnodeDictionary_put(struct AnodeDictionary *d,const char *key,const char *value)
-{
-  struct AnodeDictionaryEntry *e;
-  char *p1;
-  const char *p2;
-  unsigned int bucket = (d->case_sensitive) ? AnodeDictionary__get_bucket(key) : AnodeDictionary__get_bucket_ci(key);
-  unsigned int len,i;
-
-  e = d->ht[bucket];
-  while (e) {
-    if (((d->case_sensitive) ? Anode_streq(key,e->key) : Anode_strcaseeq(key,e->key))) {
-      if (!d->case_sensitive) {
-        p1 = e->key;
-        p2 = key;
-        while (*p2) *(p1++) = *(p2++);
-      }
-
-      len = 0;
-      while (value[len]) ++len;
-      if (len) {
-        if ((e->value)&&(e->value != EMPTY_STR))
-          e->value = (char *)realloc((void *)e->value,len + 1);
-        else e->value = (char *)malloc(len + 1);
-        for(i=0;i<len;++i) e->value[i] = value[i];
-        e->value[i] = (char)0;
-      } else {
-        if ((e->value)&&(e->value != EMPTY_STR)) free((void *)e->value);
-        e->value = (char *)EMPTY_STR;
-      }
-      return;
-    }
-    e = e->next;
-  }
-
-  e = (struct AnodeDictionaryEntry *)malloc(sizeof(struct AnodeDictionaryEntry));
-
-  len = 0;
-  while (key[len]) ++len;
-  if (len) {
-    e->key = (char *)malloc(len + 1);
-    for(i=0;i<len;++i) e->key[i] = key[i];
-    e->key[i] = (char)0;
-  } else e->key = (char *)EMPTY_STR;
-
-  len = 0;
-  while (value[len]) ++len;
-  if (len) {
-    e->value = (char *)malloc(len + 1);
-    for(i=0;i<len;++i) e->value[i] = value[i];
-    e->value[i] = (char)0;
-  } else e->value = (char *)EMPTY_STR;
-
-  e->next = d->ht[bucket];
-  d->ht[bucket] = e;
-
-  ++d->size;
-}
-
-void AnodeDictionary_read(
-  struct AnodeDictionary *d,
-  char *in,
-  const char *line_breaks,
-  const char *kv_breaks,
-  const char *comment_chars,
-  char escape_char,
-  int trim_whitespace_from_keys,
-  int trim_whitespace_from_values)
-{
-  char *line = in;
-  char *key;
-  char *value;
-  char *p1,*p2,*p3;
-  char last = ~escape_char;
-  int eof_state = 0;
-
-  for(;;) {
-    if ((!*in)||((Anode_strchr(line_breaks,*in))&&((last != escape_char)||(!escape_char)))) {
-      if (!*in)
-        eof_state = 1;
-      else *in = (char)0;
-
-      if ((*line)&&((comment_chars)&&(!Anode_strchr(comment_chars,*line)))) {
-        key = line;
-
-        while (*line) {
-          if ((Anode_strchr(kv_breaks,*line))&&((last != escape_char)||(!escape_char))) {
-            *(line++) = (char)0;
-            break;
-          } else last = *(line++);
-        }
-        while ((*line)&&(Anode_strchr(kv_breaks,*line))&&((last != escape_char)||(!escape_char)))
-          last = *(line++);
-        value = line;
-
-        if (escape_char) {
-          p1 = key;
-          while (*p1) {
-            if (*p1 == escape_char) {
-              p2 = p1;
-              p3 = p1 + 1;
-              while (*p3)
-                *(p2++) = *(p3++);
-              *p2 = (char)0;
-            }
-            ++p1;
-          }
-          p1 = value;
-          while (*p1) {
-            if (*p1 == escape_char) {
-              p2 = p1;
-              p3 = p1 + 1;
-              while (*p3)
-                *(p2++) = *(p3++);
-              *p2 = (char)0;
-            }
-            ++p1;
-          }
-        }
-
-        if (trim_whitespace_from_keys)
-          Anode_trim(key);
-        if (trim_whitespace_from_values)
-          Anode_trim(value);
-
-        AnodeDictionary_put(d,key,value);
-      }
-
-      if (eof_state)
-        break;
-      else line = in + 1;
-    }
-    last = *(in++);
-  }
-}
-
-long AnodeDictionary_write(
-  struct AnodeDictionary *d,
-  char *out,
-  long out_size,
-  const char *line_break,
-  const char *kv_break)
-{
-  struct AnodeDictionaryEntry *e;
-  const char *tmp;
-  long ptr = 0;
-  unsigned int bucket;
-
-  if (out_size <= 0)
-    return -1;
-
-  for(bucket=0;bucket<ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE;++bucket) {
-    e = d->ht[bucket];
-    while (e) {
-      tmp = e->key;
-      if (tmp) {
-        while (*tmp) {
-          out[ptr++] = *tmp++;
-          if (ptr >= (out_size - 1)) return -1;
-        }
-      }
-
-      tmp = kv_break;
-      if (tmp) {
-        while (*tmp) {
-          out[ptr++] = *tmp++;
-          if (ptr >= (out_size - 1)) return -1;
-        }
-      }
-
-      tmp = e->value;
-      if (tmp) {
-        while (*tmp) {
-          out[ptr++] = *tmp++;
-          if (ptr >= (out_size - 1)) return -1;
-        }
-      }
-
-      tmp = line_break;
-      if (tmp) {
-        while (*tmp) {
-          out[ptr++] = *tmp++;
-          if (ptr >= (out_size - 1)) return -1;
-        }
-      }
-
-      e = e->next;
-    }
-  }
-
-  out[ptr] = (char)0;
-
-  return ptr;
-}
diff --git a/attic/historic/anode/libanode/impl/dictionary.h b/attic/historic/anode/libanode/impl/dictionary.h
deleted file mode 100644
index 48e1642a0..000000000
--- a/attic/historic/anode/libanode/impl/dictionary.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-/* This is a simple string hash table suitable for small tables such as zone
- * files or HTTP header lists. */
-
-#ifndef _ANODE_DICTIONARY_H
-#define _ANODE_DICTIONARY_H
-
-#include "misc.h"
-
-/* This is a fixed hash table and is designed for relatively small numbers
- * of keys for things like zone files. */
-#define ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE 16
-#define ANODE_DICTIONARY_FIXED_HASH_TABLE_MASK 15
-
-/* Computes a hash code for a string and returns the hash bucket */
-static inline unsigned int AnodeDictionary__get_bucket(const char *s)
-{
-  unsigned int hc = 3;
-  while (*s)
-    hc = ((hc << 4) + hc) + (unsigned int)*(s++);
-  return ((hc ^ (hc >> 4)) & ANODE_DICTIONARY_FIXED_HASH_TABLE_MASK);
-}
-/* Case insensitive version of get_bucket */
-static inline unsigned int AnodeDictionary__get_bucket_ci(const char *s)
-{
-  unsigned int hc = 3;
-  while (*s)
-    hc = ((hc << 4) + hc) + (unsigned int)Anode_tolower(*(s++));
-  return ((hc ^ (hc >> 4)) & ANODE_DICTIONARY_FIXED_HASH_TABLE_MASK);
-}
-
-struct AnodeDictionaryEntry
-{
-  char *key;
-  char *value;
-  struct AnodeDictionaryEntry *next;
-};
-
-struct AnodeDictionary
-{
-  struct AnodeDictionaryEntry *ht[ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE];
-  unsigned int size;
-  int case_sensitive;
-};
-
-static inline void AnodeDictionary_init(struct AnodeDictionary *d,int case_sensitive)
-{
-  Anode_zero((void *)d,sizeof(struct AnodeDictionary));
-  d->case_sensitive = case_sensitive;
-}
-
-void AnodeDictionary_clear(struct AnodeDictionary *d);
-
-static inline void AnodeDictionary_destroy(struct AnodeDictionary *d)
-{
-  AnodeDictionary_clear(d);
-}
-
-void AnodeDictionary_put(struct AnodeDictionary *d,const char *key,const char *value);
-
-static inline const char *AnodeDictionary_get(struct AnodeDictionary *d,const char *key)
-{
-  struct AnodeDictionaryEntry *e;
-  unsigned int bucket = (d->case_sensitive) ? AnodeDictionary__get_bucket(key) : AnodeDictionary__get_bucket_ci(key);
-
-  e = d->ht[bucket];
-  while (e) {
-    if ((d->case_sensitive ? Anode_streq(key,e->key) : Anode_strcaseeq(key,e->key)))
-      return e->value;
-    e = e->next;
-  }
-
-  return (const char *)0;
-}
-
-static inline void AnodeDictionary_iterate(
-  struct AnodeDictionary *d,
-  void *arg,
-  int (*func)(void *,const char *,const char *))
-{
-  struct AnodeDictionaryEntry *e;
-  unsigned int bucket;
-
-  for(bucket=0;bucket<ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE;++bucket) {
-    e = d->ht[bucket];
-    while (e) {
-      if (!func(arg,e->key,e->value))
-        return;
-      e = e->next;
-    }
-  }
-}
-
-void AnodeDictionary_read(
-  struct AnodeDictionary *d,
-  char *in,
-  const char *line_breaks,
-  const char *kv_breaks,
-  const char *comment_chars,
-  char escape_char,
-  int trim_whitespace_from_keys,
-  int trim_whitespace_from_values);
-
-long AnodeDictionary_write(
-  struct AnodeDictionary *d,
-  char *out,
-  long out_size,
-  const char *line_break,
-  const char *kv_break);
-
-#endif
diff --git a/attic/historic/anode/libanode/impl/dns_txt.c b/attic/historic/anode/libanode/impl/dns_txt.c
deleted file mode 100644
index b5cf13184..000000000
--- a/attic/historic/anode/libanode/impl/dns_txt.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <netdb.h>
-#include "dns_txt.h"
-
-#ifndef C_IN
-#define C_IN ns_c_in
-#endif
-#ifndef T_TXT
-#define T_TXT ns_t_txt
-#endif
-
-static volatile int Anode_resolver_initialized = 0;
-
-int Anode_sync_resolve_txt(const char *host,char *txt,unsigned int txt_len)
-{
-  unsigned char answer[16384],*pptr,*end;
-  char name[16384];
-  int len,explen,i;
-
-  if (!Anode_resolver_initialized) {
-    Anode_resolver_initialized = 1;
-    res_init();
-  }
-
-  /* Do not taunt happy fun ball. */
-
-  len = res_search(host,C_IN,T_TXT,answer,sizeof(answer));
-  if (len > 12) {
-    pptr = answer + 12;
-    end = answer + len;
-
-    explen = dn_expand(answer,end,pptr,name,sizeof(name));
-    if (explen > 0) {
-      pptr += explen;
-
-      if ((pptr + 2) >= end) return 2;
-      if (ntohs(*((uint16_t *)pptr)) == T_TXT) {
-        pptr += 4;
-        if (pptr >= end) return 2;
-
-        explen = dn_expand(answer,end,pptr,name,sizeof(name));
-        if (explen > 0) {
-          pptr += explen;
-
-          if ((pptr + 2) >= end) return 2;
-          if (ntohs(*((uint16_t *)pptr)) == T_TXT) {
-            pptr += 10;
-            if (pptr >= end) return 2;
-
-            len = *(pptr++);
-            if (len <= 0) return 2;
-            if ((pptr + len) > end) return 2;
-
-            if (txt_len < (len + 1))
-              return 4;
-            else {
-              for(i=0;i<len;++i)
-                txt[i] = pptr[i];
-              txt[len] = (char)0;
-              return 0;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  return 1;
-}
-
diff --git a/attic/historic/anode/libanode/impl/dns_txt.h b/attic/historic/anode/libanode/impl/dns_txt.h
deleted file mode 100644
index 252865df3..000000000
--- a/attic/historic/anode/libanode/impl/dns_txt.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _ANODE_DNS_TXT_H
-#define _ANODE_DNS_TXT_H
-
-/**
- * Synchronous TXT resolver routine
- *
- * Error codes:
- *  1 - I/O error
- *  2 - Invalid response
- *  3 - TXT record not found
- *  4 - Destination buffer too small for result
- *
- * @param host Host name
- * @param txt Buffer to store TXT result
- * @param txt_len Size of buffer
- * @return Zero on success, special error code on failure
- */
-int Anode_sync_resolve_txt(const char *host,char *txt,unsigned int txt_len);
-
-#endif
-
diff --git a/attic/historic/anode/libanode/impl/ec.c b/attic/historic/anode/libanode/impl/ec.c
deleted file mode 100644
index 2604b4a97..000000000
--- a/attic/historic/anode/libanode/impl/ec.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/bn.h>
-#include <openssl/obj_mac.h>
-#include <openssl/rand.h>
-#include <openssl/ec.h>
-#include <openssl/ecdh.h>
-#include <openssl/ecdsa.h>
-#include "types.h"
-#include "misc.h"
-#include "ec.h"
-
-static EC_GROUP *AnodeEC_group = (EC_GROUP *)0;
-
-static void *AnodeEC_KDF(const void *in,size_t inlen,void *out,size_t *outlen)
-{
-  unsigned long i,longest_length;
-
-  if (!*outlen)
-    return out;
-
-  for(i=0;i<(unsigned long)*outlen;++i)
-    ((unsigned char *)out)[i] = (unsigned char)0;
-
-  longest_length = inlen;
-  if (longest_length < *outlen)
-    longest_length = *outlen;
-  for(i=0;i<longest_length;++i)
-    ((unsigned char *)out)[i % (unsigned long)*outlen] ^= ((const unsigned char *)in)[i % (unsigned long)inlen];
-
-  return out;
-}
-
-int AnodeECKeyPair_generate(struct AnodeECKeyPair *pair)
-{
-  EC_KEY *key;
-  int len;
-
-#ifdef HAS_DEV_URANDOM
-  char buf[128];
-  FILE *f = fopen("/dev/urandom","r");
-  if (f) {
-    if (fread(buf,1,sizeof(buf),f) == sizeof(buf))
-      RAND_add(buf,sizeof(buf),sizeof(buf)/2);
-    fclose(f);
-  }
-#endif
-
-  if (!AnodeEC_group) {
-    AnodeEC_group = EC_GROUP_new_by_curve_name(ANODE_EC_GROUP);
-    if (!AnodeEC_group) return 0;
-  }
-
-  key = EC_KEY_new();
-  if (!key) return 0;
-
-  if (!EC_KEY_set_group(key,AnodeEC_group)) {
-    EC_KEY_free(key);
-    return 0;
-  }
-
-  if (!EC_KEY_generate_key(key)) {
-    EC_KEY_free(key);
-    return 0;
-  }
-
-  Anode_zero(pair,sizeof(struct AnodeECKeyPair));
-
-  /* Stuff the private key into priv.key */
-  len = BN_num_bytes(EC_KEY_get0_private_key(key));
-  if ((len > ANODE_EC_PRIME_BYTES)||(len < 0)) {
-    EC_KEY_free(key);
-    return 0;
-  }
-  BN_bn2bin(EC_KEY_get0_private_key(key),&(pair->priv.key[ANODE_EC_PRIME_BYTES - len]));
-  pair->priv.bytes = ANODE_EC_PRIME_BYTES;
-
-  len = EC_POINT_point2oct(AnodeEC_group,EC_KEY_get0_public_key(key),POINT_CONVERSION_COMPRESSED,pair->pub.key,sizeof(pair->pub.key),0);
-  if (len != ANODE_EC_PUBLIC_KEY_BYTES) {
-    EC_KEY_free(key);
-    return 0;
-  }
-  pair->pub.bytes = ANODE_EC_PUBLIC_KEY_BYTES;
-
-  /* Keep a copy of OpenSSL's structure around so we don't have to re-init
-   * it every time we use our key pair structure. */
-  pair->internal_key = key;
-
-  return 1;
-}
-
-int AnodeECKeyPair_init(struct AnodeECKeyPair *pair,const struct AnodeECKey *pub,const struct AnodeECKey *priv)
-{
-  EC_KEY *key;
-  EC_POINT *kxy;
-  BIGNUM *pn;
-
-  if (!AnodeEC_group) {
-    AnodeEC_group = EC_GROUP_new_by_curve_name(ANODE_EC_GROUP);
-    if (!AnodeEC_group) return 0;
-  }
-
-  key = EC_KEY_new();
-  if (!key)
-    return 0;
-
-  if (!EC_KEY_set_group(key,AnodeEC_group)) {
-    EC_KEY_free(key);
-    return 0;
-  }
-
-  /* Grab the private key */
-  if (priv->bytes != ANODE_EC_PRIME_BYTES) {
-    EC_KEY_free(key);
-    return 0;
-  }
-  pn = BN_new();
-  if (!pn) {
-    EC_KEY_free(key);
-    return 0;
-  }
-  if (!BN_bin2bn(priv->key,ANODE_EC_PRIME_BYTES,pn)) {
-    BN_free(pn);
-    EC_KEY_free(key);
-    return 0;
-  }
-  if (!EC_KEY_set_private_key(key,pn)) {
-    BN_free(pn);
-    EC_KEY_free(key);
-    return 0;
-  }
-  BN_free(pn);
-
-  /* Set the public key */
-  if (pub->bytes != ANODE_EC_PUBLIC_KEY_BYTES) {
-    EC_KEY_free(key);
-    return 0;
-  }
-  kxy = EC_POINT_new(AnodeEC_group);
-  if (!kxy) {
-    EC_KEY_free(key);
-    return 0;
-  }
-  EC_POINT_oct2point(AnodeEC_group,kxy,pub->key,ANODE_EC_PUBLIC_KEY_BYTES,0);
-  if (!EC_KEY_set_public_key(key,kxy)) {
-    EC_POINT_free(kxy);
-    EC_KEY_free(key);
-    return 0;
-  }
-  EC_POINT_free(kxy);
-
-  Anode_zero(pair,sizeof(struct AnodeECKeyPair));
-  Anode_memcpy((void *)&(pair->pub),(const void *)pub,sizeof(struct AnodeECKey));
-  Anode_memcpy((void *)&(pair->priv),(const void *)priv,sizeof(struct AnodeECKey));
-  pair->internal_key = key;
-
-  return 1;
-}
-
-void AnodeECKeyPair_destroy(struct AnodeECKeyPair *pair)
-{
-  if (pair) {
-    if (pair->internal_key)
-      EC_KEY_free((EC_KEY *)pair->internal_key);
-  }
-}
-
-int AnodeECKeyPair_agree(const struct AnodeECKeyPair *my_key_pair,const struct AnodeECKey *their_pub_key,unsigned char *key_buf,unsigned int key_len)
-{
-  EC_POINT *pub;
-  int i;
-
-  if (!AnodeEC_group) {
-    AnodeEC_group = EC_GROUP_new_by_curve_name(ANODE_EC_GROUP);
-    if (!AnodeEC_group) return 0;
-  }
-
-  if (!my_key_pair->internal_key)
-    return 0;
-
-  if (their_pub_key->bytes != ANODE_EC_PUBLIC_KEY_BYTES)
-    return 0;
-  pub = EC_POINT_new(AnodeEC_group);
-  if (!pub)
-    return 0;
-  EC_POINT_oct2point(AnodeEC_group,pub,their_pub_key->key,ANODE_EC_PUBLIC_KEY_BYTES,0);
-
-  i = ECDH_compute_key(key_buf,key_len,pub,(EC_KEY *)my_key_pair->internal_key,&AnodeEC_KDF);
-  if (i != (int)key_len) {
-    EC_POINT_free(pub);
-    return 0;
-  }
-
-  EC_POINT_free(pub);
-
-  return 1;
-}
-
-void AnodeEC_random(unsigned char *buf,unsigned int len)
-{
-  RAND_pseudo_bytes(buf,len);
-}
diff --git a/attic/historic/anode/libanode/impl/ec.h b/attic/historic/anode/libanode/impl/ec.h
deleted file mode 100644
index f1262664d..000000000
--- a/attic/historic/anode/libanode/impl/ec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-/* Elliptic curve glue -- hides OpenSSL code behind this source module */
-
-#ifndef _ANODE_EC_H
-#define _ANODE_EC_H
-
-#include "misc.h"
-
-/* Right now, only one mode is supported: NIST-P-256. This is the only mode
- * supported in the spec as well, and should be good for quite some time.
- * If other modes are needed this code will need to be refactored. */
-
-/* NIST-P-256 prime size in bytes */
-#define ANODE_EC_PRIME_BYTES 32
-
-/* Sizes of key fields */
-#define ANODE_EC_GROUP NID_X9_62_prime256v1
-#define ANODE_EC_PUBLIC_KEY_BYTES (ANODE_EC_PRIME_BYTES + 1)
-#define ANODE_EC_PRIVATE_KEY_BYTES ANODE_EC_PRIME_BYTES
-
-/* Larger of public or private key bytes, used for buffers */
-#define ANODE_EC_MAX_BYTES ANODE_EC_PUBLIC_KEY_BYTES
-
-struct AnodeECKey
-{
-  unsigned char key[ANODE_EC_MAX_BYTES];
-  unsigned int bytes;
-};
-
-struct AnodeECKeyPair
-{
-  struct AnodeECKey pub;
-  struct AnodeECKey priv;
-  void *internal_key;
-};
-
-/* Key management functions */
-int AnodeECKeyPair_generate(struct AnodeECKeyPair *pair);
-int AnodeECKeyPair_init(struct AnodeECKeyPair *pair,const struct AnodeECKey *pub,const struct AnodeECKey *priv);
-void AnodeECKeyPair_destroy(struct AnodeECKeyPair *pair);
-int AnodeECKeyPair_agree(const struct AnodeECKeyPair *my_key_pair,const struct AnodeECKey *their_pub_key,unsigned char *key_buf,unsigned int key_len);
-
-/* Provides access to the secure PRNG used to generate keys */
-void AnodeEC_random(unsigned char *buf,unsigned int len);
-
-#endif
diff --git a/attic/historic/anode/libanode/impl/environment.c b/attic/historic/anode/libanode/impl/environment.c
deleted file mode 100644
index 16e8ebe3d..000000000
--- a/attic/historic/anode/libanode/impl/environment.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "environment.h"
-
-#ifdef WINDOWS
-#include <windows.h>
-#else
-#include <sys/stat.h>
-#include <string.h>
-#endif
-
-static char Anode_cache_base[1024] = { 0 };
-
-const char *Anode_get_cache()
-{
-  if (Anode_cache_base[0])
-    return Anode_cache_base;
-
-#ifdef WINDOWS
-#else
-  char tmp[1024];
-  char home[1024];
-  unsigned int i;
-  struct stat st;
-  const char *_home = getenv("HOME");
-
-  if (!_home)
-    return (const char *)0;
-  for(i=0;i<sizeof(home);++i) {
-    home[i] = _home[i];
-    if (!home[i]) {
-      if (i == 0)
-        return (const char *)0;
-      else if (home[i-1] == ANODE_PATH_SEPARATOR)
-        home[i-1] = (char)0;
-      break;
-    }
-  }
-  if (i == sizeof(home))
-    return (const char *)0;
-
-#ifdef __APPLE__
-  snprintf(tmp,sizeof(tmp),"%s%cLibrary",home,ANODE_PATH_SEPARATOR);
-  tmp[sizeof(tmp)-1] = (char)0;
-  if (!stat(tmp,&st)) {
-    sprintf(tmp,"%s%cLibrary%cCaches",home,ANODE_PATH_SEPARATOR,ANODE_PATH_SEPARATOR);
-    if (stat(tmp,&st)) {
-      if (mkdir(tmp,0700))
-        return (const char *)0;
-    }
-    snprintf(Anode_cache_base,sizeof(Anode_cache_base),"%s%ccom.zerotier.anode",tmp,ANODE_PATH_SEPARATOR);
-    Anode_cache_base[sizeof(Anode_cache_base)-1] = (char)0;
-    if (stat(Anode_cache_base,&st)) {
-      if (mkdir(Anode_cache_base,0700)) {
-        Anode_cache_base[0] = (char)0;
-        return (const char *)0;
-      }
-    }
-    return Anode_cache_base;
-  }
-#endif
-
-  snprintf(tmp,sizeof(tmp),"%s%c.anode",home,ANODE_PATH_SEPARATOR);
-  tmp[sizeof(tmp)-1] = (char)0;
-  if (stat(tmp,&st)) {
-    if (mkdir(tmp,0700)) {
-      Anode_cache_base[0] = (char)0;
-      return (const char *)0;
-    }
-  }
-  snprintf(Anode_cache_base,sizeof(Anode_cache_base),"%s%ccaches",tmp,ANODE_PATH_SEPARATOR);
-  Anode_cache_base[sizeof(Anode_cache_base)-1] = (char)0;
-  if (stat(Anode_cache_base,&st)) {
-    if (mkdir(Anode_cache_base,0700)) {
-      Anode_cache_base[0] = (char)0;
-      return (const char *)0;
-    }
-  }
-
-  return Anode_cache_base;
-#endif
-}
-
-char *Anode_get_cache_sub(const char *cache_subdir,char *buf,unsigned int len)
-{
-  struct stat st;
-  const char *cache_base = Anode_get_cache();
-
-  if (!len)
-    return (char *)0;
-  if (!cache_base)
-    return (char *)0;
-
-  snprintf(buf,len,"%s%c%s",cache_base,ANODE_PATH_SEPARATOR,cache_subdir);
-  buf[len-1] = (char)0;
-  if (stat(buf,&st)) {
-    if (mkdir(buf,0700))
-      return (char *)0;
-  }
-
-  return buf;
-}
diff --git a/attic/historic/anode/libanode/impl/environment.h b/attic/historic/anode/libanode/impl/environment.h
deleted file mode 100644
index ecebdc11f..000000000
--- a/attic/historic/anode/libanode/impl/environment.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _ANODE_ENVIRONMENT_H
-#define _ANODE_ENVIRONMENT_H
-
-#ifdef WINDOWS
-#define ANODE_PATH_SEPARATOR '\\'
-#else
-#define ANODE_PATH_SEPARATOR '/'
-#endif
-
-const char *Anode_get_cache();
-char *Anode_get_cache_sub(const char *cache_subdir,char *buf,unsigned int len);
-
-#endif
-
diff --git a/attic/historic/anode/libanode/impl/http_client.c b/attic/historic/anode/libanode/impl/http_client.c
deleted file mode 100644
index a398a5857..000000000
--- a/attic/historic/anode/libanode/impl/http_client.c
+++ /dev/null
@@ -1,558 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include "http_client.h"
-#include "misc.h"
-#include "types.h"
-
-/* How much to increment read buffer at each capacity top? */
-#define ANODE_HTTP_CAPACITY_INCREMENT 4096
-
-static void AnodeHttpClient_close_and_fail(struct AnodeHttpClient *client)
-{
-  if (client->impl.tcp_connection) {
-    client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
-    client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
-  }
-
-  client->response.data_length = 0;
-  client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
-
-  if (client->handler)
-    client->handler(client);
-}
-
-static void AnodeHttpClient_do_initiate_client(struct AnodeHttpClient *client)
-{
-  const char *method = "";
-  long l,i;
-
-  switch(client->method) {
-    case ANODE_HTTP_GET: method = "GET"; break;
-    case ANODE_HTTP_HEAD: method = "HEAD"; break;
-    case ANODE_HTTP_POST: method = "POST"; break;
-  }
-  client->impl.outbuf_len = snprintf((char *)client->impl.outbuf,sizeof(client->impl.outbuf),
-    "%s %s%s%s HTTP/1.1\r\nHost: %s:%d\r\n%s",
-    method,
-    client->uri.path,
-    ((client->uri.query[0]) ? "?" : ""),
-    client->uri.query,
-    client->uri.host,
-    ((client->uri.port > 0) ? client->uri.port : 80),
-    ((client->keepalive) ? "" : "Connection: close\r\n")
-  );
-  if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) {
-    client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
-    AnodeHttpClient_close_and_fail(client);
-    return;
-  }
-
-  if (client->method == ANODE_HTTP_POST) {
-    if ((client->data)&&(client->data_length)) {
-      client->impl.outbuf_len += snprintf((char *)client->impl.outbuf + client->impl.outbuf_len,sizeof(client->impl.outbuf) - client->impl.outbuf_len,
-        "Content-Type: %s\r\n",
-        (client->data_content_type ? client->data_content_type : "application/x-www-form-urlencoded")
-      );
-      if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) {
-        client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
-        AnodeHttpClient_close_and_fail(client);
-        return;
-      }
-      client->impl.outbuf_len += snprintf((char *)client->impl.outbuf + client->impl.outbuf_len,sizeof(client->impl.outbuf) - client->impl.outbuf_len,
-        "Content-Length: %u\r\n",
-        client->data_length
-      );
-      if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) {
-        client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
-        AnodeHttpClient_close_and_fail(client);
-        return;
-      }
-    } else {
-      client->impl.outbuf_len += snprintf((char *)client->impl.outbuf + client->impl.outbuf_len,sizeof(client->impl.outbuf) - client->impl.outbuf_len,
-        "Content-Length: 0\r\n"
-      );
-      if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) {
-        client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
-        AnodeHttpClient_close_and_fail(client);
-        return;
-      }
-    }
-  }
-
-  l = AnodeDictionary_write(&(client->headers),(char *)client->impl.outbuf + client->impl.outbuf_len,(long)(sizeof(client->impl.outbuf) - client->impl.outbuf_len - 2),"\r\n",": ");
-  if (l < 0) {
-    client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
-    AnodeHttpClient_close_and_fail(client);
-    return;
-  }
-
-  client->impl.outbuf_len += (unsigned int)l;
-  if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) { /* sanity check */
-    client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
-    AnodeHttpClient_close_and_fail(client);
-    return;
-  }
-
-  client->impl.outbuf[client->impl.outbuf_len++] = '\r';
-  client->impl.outbuf[client->impl.outbuf_len++] = '\n';
-
-  if ((client->method == ANODE_HTTP_POST)&&(client->data)&&(client->data_length)) {
-    i = sizeof(client->impl.outbuf) - client->impl.outbuf_len;
-    if (i > client->data_length)
-      i = client->data_length;
-    Anode_memcpy((client->impl.outbuf + client->impl.outbuf_len),client->data,i);
-    client->impl.request_data_ptr += i;
-    client->impl.outbuf_len += i;
-  }
-
-  client->impl.phase = ANODE_HTTP_REQUEST_PHASE_SEND;
-  client->impl.transport_engine->tcp_start_writing(client->impl.transport_engine,client->impl.tcp_connection);
-}
-
-static void AnodeHttpClient_tcp_outgoing_connect_handler(
-  AnodeTransportEngine *transport,
-  AnodeTransportTcpConnection *connection,
-  int error_code)
-{
-  struct AnodeHttpClient *client;
-
-  if (!(client = (struct AnodeHttpClient *)(connection->ptr)))
-    return;
-
-  if ((client->impl.phase == ANODE_HTTP_REQUEST_PHASE_CONNECT)&&(!client->impl.freed)) {
-    if (error_code) {
-      client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_CONNECT_FAILED;
-      AnodeHttpClient_close_and_fail(client);
-    } else {
-      client->impl.tcp_connection = connection;
-      AnodeHttpClient_do_initiate_client(client);
-    }
-  } else transport->tcp_close(transport,connection);
-}
-
-static void AnodeHttpClient_tcp_connection_terminated_handler(
-  AnodeTransportEngine *transport,
-  AnodeTransportTcpConnection *connection,
-  int error_code)
-{
-  struct AnodeHttpClient *client;
-
-  if (!(client = (struct AnodeHttpClient *)(connection->ptr)))
-    return;
-  if (client->impl.freed)
-    return;
-
-  client->response.data_length = 0;
-  client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
-  if ((client->impl.phase != ANODE_HTTP_REQUEST_PHASE_KEEPALIVE)&&(client->impl.phase != ANODE_HTTP_REQUEST_PHASE_CLOSED)) {
-    client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_SERVER_CLOSED_CONNECTION;
-    client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
-    AnodeHttpClient_close_and_fail(client);
-  } else client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
-}
-
-static void AnodeHttpClient_tcp_receive_handler(
-  AnodeTransportEngine *transport,
-  AnodeTransportTcpConnection *connection,
-  void *data,
-  unsigned int data_length)
-{
-  struct AnodeHttpClient *client;
-  char *p1,*p2;
-  unsigned int i;
-  long l;
-
-  if (!(client = (struct AnodeHttpClient *)(connection->ptr)))
-    return;
-  if (client->impl.freed) {
-    transport->tcp_close(transport,connection);
-    return;
-  }
-
-  if (!client->response.data)
-    client->response.data = malloc(client->impl.response_data_capacity = ANODE_HTTP_CAPACITY_INCREMENT);
-
-  i = 0;
-  while (i < data_length) {
-    switch(client->impl.read_mode) {
-      case ANODE_HTTP_READ_MODE_WAITING:
-        for(;i<data_length;++i) {
-          if (((const char *)data)[i] == '\n') {
-            ((char *)client->response.data)[client->response.data_length] = (char)0;
-            client->response.data_length = 0;
-
-            p1 = (char *)Anode_strchr((char *)client->response.data,' ');
-            if (!p1)
-              p1 = (char *)Anode_strchr((char *)client->response.data,'\t');
-            if (p1) {
-              while ((*p1 == ' ')||(*p1 == '\t')) ++p1;
-              if (!*p1) {
-                client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE;
-                AnodeHttpClient_close_and_fail(client);
-                return;
-              }
-              p2 = p1 + 1;
-              while (*p2) {
-                if ((*p2 == ' ')||(*p2 == '\t')||(*p2 == '\r')||(*p2 == '\n')) {
-                  *p2 = (char)0;
-                  break;
-                } else ++p2;
-              }
-              client->response.code = (int)strtol(p1,(char **)0,10);
-              client->impl.read_mode = ANODE_HTTP_READ_MODE_HEADERS;
-              ++i; break; /* Exit inner for() */
-            }
-          } else {
-            ((char *)client->response.data)[client->response.data_length++] = ((const char *)data)[i];
-            if (client->response.data_length >= client->impl.response_data_capacity)
-              client->response.data = realloc(client->response.data,client->impl.response_data_capacity += ANODE_HTTP_CAPACITY_INCREMENT);
-          }
-        }
-        break;
-      case ANODE_HTTP_READ_MODE_HEADERS:
-      case ANODE_HTTP_READ_MODE_CHUNKED_FOOTER:
-        for(;i<data_length;++i) {
-          if (((const char *)data)[i] == '\n') {
-            client->impl.header_line_buf[client->impl.header_line_buf_ptr] = (char)0;
-            client->impl.header_line_buf_ptr = 0;
-
-            if ((!client->impl.header_line_buf[0])||((client->impl.header_line_buf[0] == '\r')&&(!client->impl.header_line_buf[1]))) {
-              /* If the line is empty (or is empty with \r\n as the
-               * line terminator), we're at the end. */
-              if (client->impl.read_mode == ANODE_HTTP_READ_MODE_CHUNKED_FOOTER) {
-                /* If this is a chunked footer, we finally end the
-                 * chunked response. */
-                client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
-                if (client->keepalive)
-                  client->impl.phase = ANODE_HTTP_REQUEST_PHASE_KEEPALIVE;
-                else {
-                  client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
-                  client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
-                  client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
-                }
-                if (client->handler)
-                  client->handler(client);
-                if (client->impl.freed)
-                  return;
-              } else {
-                /* Otherwise, this is a regular header block */
-                if (client->response.code == 100) {
-                  /* Ignore 100 Continue messages */
-                  client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
-                  ++i; break; /* Exit inner for() */
-                } else if ((client->response.code == 200)&&(client->method != ANODE_HTTP_HEAD)) {
-                  /* Other messages get their headers parsed to determine
-                   * how to read them. */
-                  p1 = (char *)AnodeDictionary_get(&(client->response.headers),"transfer-encoding");
-                  if ((p1)&&(Anode_strcaseeq(p1,"chunked"))) {
-                    /* Chunked encoding enters chunked mode */
-                    client->impl.header_line_buf_ptr = 0;
-                    client->impl.read_mode = ANODE_HTTP_READ_MODE_CHUNKED_CHUNK_SIZE;
-                    ++i; break; /* Exit inner for() */
-                  } else {
-                    /* Else we must have a Content-Length header */
-                    p1 = (char *)AnodeDictionary_get(&(client->response.headers),"content-length");
-                    if (!p1) {
-                      /* No chunked or content length is not supported */
-                      client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE;
-                      AnodeHttpClient_close_and_fail(client);
-                      return;
-                    } else {
-                      /* Enter block read mode with content length */
-                      l = strtol(p1,(char **)0,10);
-                      if (l <= 0) {
-                        /* Zero length data is all done... */
-                        client->impl.expecting_response_length = 0;
-                        client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
-                        if (client->keepalive)
-                          client->impl.phase = ANODE_HTTP_REQUEST_PHASE_KEEPALIVE;
-                        else {
-                          client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
-                          client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
-                          client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
-                        }
-
-                        if (client->handler)
-                          client->handler(client);
-                        if (client->impl.freed)
-                          return;
-
-                        ++i; break; /* Exit inner for() */
-                      } else {
-                        /* Else start reading... */
-                        client->impl.expecting_response_length = (unsigned int)l;
-                        client->impl.read_mode = ANODE_HTTP_READ_MODE_BLOCK;
-                        ++i; break; /* Exit inner for() */
-                      }
-                    }
-                  }
-                } else {
-                  /* HEAD clients or non-200 codes get headers only */
-                  client->impl.expecting_response_length = 0;
-                  client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
-                  if (client->keepalive)
-                    client->impl.phase = ANODE_HTTP_REQUEST_PHASE_KEEPALIVE;
-                  else {
-                    client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
-                    client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
-                    client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
-                  }
-
-                  if (client->handler)
-                    client->handler(client);
-                  if (client->impl.freed)
-                    return;
-
-                  ++i; break; /* Exit inner for() */
-                }
-              }
-            } else {
-              /* Otherwise this is another header, add to dictionary */
-              AnodeDictionary_read(
-                &(client->response.headers),
-                client->impl.header_line_buf,
-                "\r\n",
-                ": \t",
-                "",
-                (char)0,
-                1,
-                1
-              );
-            }
-          } else {
-            client->impl.header_line_buf[client->impl.header_line_buf_ptr++] = ((const char *)data)[i];
-            if (client->impl.header_line_buf_ptr >= sizeof(client->impl.header_line_buf)) {
-              client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE;
-              AnodeHttpClient_close_and_fail(client);
-              return;
-            }
-          }
-        }
-        break;
-      case ANODE_HTTP_READ_MODE_BLOCK:
-        if ((client->response.data_length + client->impl.expecting_response_length) > client->impl.response_data_capacity)
-          client->response.data = realloc(client->response.data,client->impl.response_data_capacity = (client->response.data_length + client->impl.expecting_response_length));
-
-        for(;((i<data_length)&&(client->impl.expecting_response_length));++i) {
-          ((char *)client->response.data)[client->response.data_length++] = ((const char *)data)[i];
-          --client->impl.expecting_response_length;
-        }
-
-        if (!client->impl.expecting_response_length) {
-          client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
-          if (client->keepalive)
-            client->impl.phase = ANODE_HTTP_REQUEST_PHASE_KEEPALIVE;
-          else {
-            client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
-            client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
-            client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
-          }
-
-          if (client->handler)
-            client->handler(client);
-          if (client->impl.freed)
-            return;
-        }
-        break;
-      case ANODE_HTTP_READ_MODE_CHUNKED_CHUNK_SIZE:
-        for(;i<data_length;++i) {
-          if (((const char *)data)[i] == '\n') {
-            client->impl.header_line_buf[client->impl.header_line_buf_ptr] = (char)0;
-            client->impl.header_line_buf_ptr = 0;
-
-            p1 = client->impl.header_line_buf;
-            while (*p1) {
-              if ((*p1 == ';')||(*p1 == ' ')||(*p1 == '\r')||(*p1 == '\n')||(*p1 == '\t')) {
-                *p1 = (char)0;
-                break;
-              } else ++p1;
-            }
-
-            if (client->impl.header_line_buf[0]) {
-              l = strtol(client->impl.header_line_buf,(char **)0,16);
-              if (l <= 0) {
-                /* Zero length ends chunked and enters footer mode */
-                client->impl.expecting_response_length = 0;
-                client->impl.read_mode = ANODE_HTTP_READ_MODE_CHUNKED_FOOTER;
-              } else {
-                /* Otherwise the next chunk is to be read */
-                client->impl.expecting_response_length = (unsigned int)l;
-                client->impl.read_mode = ANODE_HTTP_READ_MODE_CHUNKED_DATA;
-              }
-              ++i; break; /* Exit inner for() */
-            }
-          } else {
-            client->impl.header_line_buf[client->impl.header_line_buf_ptr++] = ((const char *)data)[i];
-            if (client->impl.header_line_buf_ptr >= sizeof(client->impl.header_line_buf)) {
-              client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE;
-              AnodeHttpClient_close_and_fail(client);
-              return;
-            }
-          }
-        }
-        break;
-      case ANODE_HTTP_READ_MODE_CHUNKED_DATA:
-        if ((client->response.data_length + client->impl.expecting_response_length) > client->impl.response_data_capacity)
-          client->response.data = realloc(client->response.data,client->impl.response_data_capacity = (client->response.data_length + client->impl.expecting_response_length));
-
-        for(;((i<data_length)&&(client->impl.expecting_response_length));++i) {
-          ((char *)client->response.data)[client->response.data_length++] = ((const char *)data)[i];
-          --client->impl.expecting_response_length;
-        }
-
-        if (!client->impl.expecting_response_length)
-          client->impl.read_mode = ANODE_HTTP_READ_MODE_CHUNKED_CHUNK_SIZE;
-        break;
-    }
-  }
-}
-
-static void AnodeHttpClient_tcp_available_for_write_handler(
-  AnodeTransportEngine *transport,
-  AnodeTransportTcpConnection *connection)
-{
-  struct AnodeHttpClient *client;
-  unsigned int i,j;
-  int n;
-
-  if (!(client = (struct AnodeHttpClient *)(connection->ptr)))
-    return;
-  if (client->impl.freed) {
-    transport->tcp_close(transport,connection);
-    return;
-  }
-
-  if (client->impl.phase == ANODE_HTTP_REQUEST_PHASE_SEND) {
-    n = client->impl.transport_engine->tcp_send(client->impl.transport_engine,client->impl.tcp_connection,(const void *)client->impl.outbuf,(int)client->impl.outbuf_len);
-    if (n < 0) {
-      client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_SERVER_CLOSED_CONNECTION;
-      AnodeHttpClient_close_and_fail(client);
-    } else if (n > 0) {
-      for(i=0,j=(client->impl.outbuf_len - (unsigned int)n);i<j;++i)
-        client->impl.outbuf[i] = client->impl.outbuf[i + (unsigned int)n];
-      client->impl.outbuf_len -= (unsigned int)n;
-
-      if ((client->method == ANODE_HTTP_POST)&&(client->data)&&(client->data_length)) {
-        i = sizeof(client->impl.outbuf) - client->impl.outbuf_len;
-        j = client->data_length - client->impl.request_data_ptr;
-        if (i > j)
-          i = j;
-        Anode_memcpy((client->impl.outbuf + client->impl.outbuf_len),client->data,i);
-        client->impl.request_data_ptr += i;
-        client->impl.outbuf_len += i;
-      }
-
-      if (!client->impl.outbuf_len) {
-        client->impl.transport_engine->tcp_stop_writing(client->impl.transport_engine,client->impl.tcp_connection);
-        client->impl.phase = ANODE_HTTP_REQUEST_PHASE_RECEIVE;
-      }
-    }
-  } else client->impl.transport_engine->tcp_stop_writing(client->impl.transport_engine,client->impl.tcp_connection);
-}
-
-static void AnodeHttpClient_dns_result_handler(
-  AnodeTransportEngine *transport,
-  void *ptr,
-  int error_code,
-  const char *name,
-  const AnodeTransportIpAddress *ip_addresses,
-  unsigned int ip_address_count,
-  const AnodeAddress *anode_address)
-{
-  struct AnodeHttpClient *client;
-  AnodeTransportIpEndpoint to_endpoint;
-
-  if (!(client = (struct AnodeHttpClient *)ptr))
-    return;
-  if (client->impl.freed)
-    return;
-
-  if ((error_code)||(!ip_address_count)) {
-    if (client->impl.phase == ANODE_HTTP_REQUEST_PHASE_RESOLVE) {
-      client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_DNS_RESOLVE_FAILED;
-      AnodeHttpClient_close_and_fail(client);
-    }
-  } else {
-    client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CONNECT;
-    Anode_memcpy(&to_endpoint.address,ip_addresses,sizeof(AnodeTransportIpAddress));
-    to_endpoint.port = (client->uri.port > 0) ? client->uri.port : 80;
-    client->impl.transport_engine->tcp_connect(
-      client->impl.transport_engine,
-      client,
-      &AnodeHttpClient_tcp_outgoing_connect_handler,
-      &AnodeHttpClient_tcp_connection_terminated_handler,
-      &AnodeHttpClient_tcp_receive_handler,
-      &AnodeHttpClient_tcp_available_for_write_handler,
-      &to_endpoint);
-  }
-}
-
-struct AnodeHttpClient *AnodeHttpClient_new(AnodeTransportEngine *transport_engine)
-{
-  struct AnodeHttpClient *req = malloc(sizeof(struct AnodeHttpClient));
-  Anode_zero(req,sizeof(struct AnodeHttpClient));
-
-  AnodeDictionary_init(&(req->headers),0);
-  AnodeDictionary_init(&(req->response.headers),0);
-
-  req->impl.transport_engine = transport_engine;
-
-  return req;
-}
-
-void AnodeHttpClient_send(struct AnodeHttpClient *client)
-{
-  client->response.code = 0;
-  client->response.data_length = 0;
-  AnodeDictionary_clear(&(client->response.headers));
-
-  client->impl.request_data_ptr = 0;
-  client->impl.expecting_response_length = 0;
-  client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
-  client->impl.outbuf_len = 0;
-
-  if (!client->impl.tcp_connection) {
-    client->impl.transport_engine->dns_resolve(
-      client->impl.transport_engine,
-      &AnodeHttpClient_dns_result_handler,
-      client,
-      client->uri.host,
-      ANODE_TRANSPORT_DNS_QUERY_ALWAYS,
-      ANODE_TRANSPORT_DNS_QUERY_IF_NO_PREVIOUS,
-      ANODE_TRANSPORT_DNS_QUERY_NEVER);
-  } else AnodeHttpClient_do_initiate_client(client);
-}
-
-void AnodeHttpClient_free(struct AnodeHttpClient *client)
-{
-  AnodeDictionary_destroy(&(client->headers));
-  AnodeDictionary_destroy(&(client->response.headers));
-
-  if (client->impl.tcp_connection) {
-    client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
-    client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
-  }
-
-  if (client->response.data)
-    free(client->response.data);
-
-  client->impl.freed = 1;
-  client->impl.transport_engine->run_later(client->impl.transport_engine,client,&free);
-}
diff --git a/attic/historic/anode/libanode/impl/http_client.h b/attic/historic/anode/libanode/impl/http_client.h
deleted file mode 100644
index f16730976..000000000
--- a/attic/historic/anode/libanode/impl/http_client.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _ANODE_HTTP_CLIENT_H
-#define _ANODE_HTTP_CLIENT_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "dictionary.h"
-#include "../anode.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * HTTP request type
- */
-enum AnodeHttpClientRequestMethod
-{
-  ANODE_HTTP_GET = 0,
-  ANODE_HTTP_HEAD = 1,
-  ANODE_HTTP_POST = 2
-};
-
-/*
- * Special response codes to indicate I/O errors
- */
-#define ANODE_HTTP_SPECIAL_RESPONSE_DNS_RESOLVE_FAILED -1
-#define ANODE_HTTP_SPECIAL_RESPONSE_CONNECT_FAILED -2
-#define ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE -3
-#define ANODE_HTTP_SPECIAL_RESPONSE_SERVER_CLOSED_CONNECTION -4
-#define ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE -5
-
-/**
- * Simple HTTP client
- */
-struct AnodeHttpClient
-{
-  /**
-   * Request URI
-   */
-  AnodeURI uri;
-
-  /**
-   * Request method: GET, PUT, HEAD, or POST
-   */
-  enum AnodeHttpClientRequestMethod method;
-
-  /**
-   * Data for POST requests
-   *
-   * It is your responsibility to manage and/or free this pointer. The HTTP
-   * client only reads from it.
-   */
-  const void *data;
-  unsigned int data_length;
-
-  /**
-   * Content type for data, or null for application/x-www-form-urlencoded
-   */
-  const char *data_content_type;
-
-  /**
-   * Set to non-zero to use HTTP connection keepalive
-   *
-   * If keepalive is enabled, this request can be modified and re-used and
-   * its associated connection will stay open (being reopened if needed)
-   * until it is freed.
-   *
-   * Note that this client is too dumb to pool connections and pick them on
-   * the basis of host. Keepalive mode should only be set if the next request
-   * will be from the same host and port, otherwise you will get a '404'.
-   */
-  int keepalive;
-
-  /**
-   * Function pointer to be called when request is complete (or fails)
-   */
-  void (*handler)(struct AnodeHttpClient *);
-
-  /**
-   * Two arbitrary pointers that can be stored here for use by the handler.
-   * These are not accessed or modified by the client.
-   */
-  void *ptr[2];
-
-  /**
-   * Request headers
-   */
-  struct AnodeDictionary headers;
-
-  struct {
-    /**
-     * Response code, set on completion or failure before handler is called
-     *
-     * Also check for the special response codes defined in http_client.h as
-     * these negative codes indicate network or other errors.
-     */
-    int code;
-
-    /**
-     * Response data, for GET and POST requests
-     */
-    void *data;
-
-    /**
-     * Length of response data
-     */
-    unsigned int data_length;
-
-    /**
-     * Response headers
-     */
-    struct AnodeDictionary headers;
-  } response;
-
-  /**
-   * Internal fields used by implementation
-   */
-  struct {
-    /* Transport engine being used by request */
-    AnodeTransportEngine *transport_engine;
-
-    /* Connection to which request has been sent, or null if none */
-    struct AnodeHttpConnection *connection;
-
-    /* Buffer for reading chunked mode chunk lines (can't use data buf) */
-    char header_line_buf[256];
-    unsigned int header_line_buf_ptr;
-
-    /* Where are we in sending request data? */
-    unsigned int request_data_ptr;
-
-    /* Capacity of response_data buffer */
-    unsigned int response_data_capacity;
-
-    /* How much response data are we currently expecting? */
-    /* This is content-length in block mode or chunk length in chunked mode */
-    unsigned int expecting_response_length;
-
-    /* Read mode */
-    enum {
-      ANODE_HTTP_READ_MODE_WAITING = 0,
-      ANODE_HTTP_READ_MODE_HEADERS = 1,
-      ANODE_HTTP_READ_MODE_BLOCK = 2,
-      ANODE_HTTP_READ_MODE_CHUNKED_CHUNK_SIZE = 3,
-      ANODE_HTTP_READ_MODE_CHUNKED_DATA = 4,
-      ANODE_HTTP_READ_MODE_CHUNKED_FOOTER = 5
-    } read_mode;
-
-    /* Connection from transport engine */
-    AnodeTransportTcpConnection *tcp_connection;
-
-    /* Write buffer */
-    unsigned char outbuf[16384];
-    unsigned int outbuf_len;
-
-    /* Phase of request state machine */
-    enum {
-      ANODE_HTTP_REQUEST_PHASE_RESOLVE = 0,
-      ANODE_HTTP_REQUEST_PHASE_CONNECT = 1,
-      ANODE_HTTP_REQUEST_PHASE_SEND = 2,
-      ANODE_HTTP_REQUEST_PHASE_RECEIVE = 3,
-      ANODE_HTTP_REQUEST_PHASE_KEEPALIVE = 4,
-      ANODE_HTTP_REQUEST_PHASE_CLOSED = 5
-    } phase;
-
-    /* Has request object been freed? */
-    int freed;
-
-    /**
-     * Pointer used internally for putting requests into linked lists
-     */
-    struct AnodeHttpClient *next;
-  } impl;
-};
-
-struct AnodeHttpClient *AnodeHttpClient_new(AnodeTransportEngine *transport_engine);
-void AnodeHttpClient_send(struct AnodeHttpClient *client);
-void AnodeHttpClient_free(struct AnodeHttpClient *client);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/attic/historic/anode/libanode/impl/misc.c b/attic/historic/anode/libanode/impl/misc.c
deleted file mode 100644
index edc73978c..000000000
--- a/attic/historic/anode/libanode/impl/misc.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "misc.h"
-#include "types.h"
-
-static const char Anode_hex_chars[16] = {
-  '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'
-};
-
-static const char Anode_base32_chars[32] = {
-  'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q',
-  'r','s','t','u','v','w','x','y','z','2','3','4','5','6','7'
-};
-static const unsigned char Anode_base32_bits[256] = {
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,26,27,28,29,30,31,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,
-  6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,0,0,0,0,0,0,0,1,2,
-  3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-};
-
-/* Table for converting ASCII chars to lower case */
-const unsigned char Anode_ascii_tolower_table[256] = {
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-  0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-  0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-  0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-  0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-  0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-  0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
-  0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-  0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-  0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-  0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-  0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-  0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-  0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-  0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-  0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-};
-
-void Anode_trim(char *s)
-{
-  char *dest = s;
-  char *last;
-  while ((*s)&&((*s == ' ')||(*s == '\t')||(*s == '\r')||(*s == '\n')))
-    ++s;
-  last = s;
-  while ((*dest = *s)) {
-    if ((*dest != ' ')&&(*dest != '\t')&&(*dest != '\r')&&(*dest != '\n'))
-      last = dest;
-    ++dest;
-    ++s;
-  }
-  if (*last)
-    *(++last) = (char)0;
-}
-
-unsigned int Anode_rand()
-{
-  static volatile int need_seed = 1;
-
-  if (need_seed) {
-    need_seed = 0;
-    srandom((unsigned long)Anode_time64());
-  }
-
-  return (unsigned int)random();
-}
-
-void Anode_to_hex(const unsigned char *b,unsigned int len,char *h,unsigned int hlen)
-{
-  unsigned int i;
-
-  if ((len * 2) >= hlen)
-    len = (hlen - 1) / 2;
-
-  for(i=0;i<len;++i) {
-    *(h++) = Anode_hex_chars[b[i] >> 4];
-    *(h++) = Anode_hex_chars[b[i] & 0xf];
-  }
-  *h = (char)0;
-}
-
-void Anode_from_hex(const char *h,unsigned char *b,unsigned int blen)
-{
-  unsigned char *end = b + blen;
-  unsigned char v = (unsigned char)0;
-
-  while (b != end) {
-    switch(*(h++)) {
-      case '0': v = 0x00; break;
-      case '1': v = 0x10; break;
-      case '2': v = 0x20; break;
-      case '3': v = 0x30; break;
-      case '4': v = 0x40; break;
-      case '5': v = 0x50; break;
-      case '6': v = 0x60; break;
-      case '7': v = 0x70; break;
-      case '8': v = 0x80; break;
-      case '9': v = 0x90; break;
-      case 'a': v = 0xa0; break;
-      case 'b': v = 0xb0; break;
-      case 'c': v = 0xc0; break;
-      case 'd': v = 0xd0; break;
-      case 'e': v = 0xe0; break;
-      case 'f': v = 0xf0; break;
-      default: return;
-    }
-
-    switch(*(h++)) {
-      case '0': v |= 0x00; break;
-      case '1': v |= 0x01; break;
-      case '2': v |= 0x02; break;
-      case '3': v |= 0x03; break;
-      case '4': v |= 0x04; break;
-      case '5': v |= 0x05; break;
-      case '6': v |= 0x06; break;
-      case '7': v |= 0x07; break;
-      case '8': v |= 0x08; break;
-      case '9': v |= 0x09; break;
-      case 'a': v |= 0x0a; break;
-      case 'b': v |= 0x0b; break;
-      case 'c': v |= 0x0c; break;
-      case 'd': v |= 0x0d; break;
-      case 'e': v |= 0x0e; break;
-      case 'f': v |= 0x0f; break;
-      default: return;
-    }
-
-    *(b++) = v;
-  }
-}
-
-void Anode_base32_5_to_8(const unsigned char *in,char *out)
-{
-  out[0] = Anode_base32_chars[(in[0]) >> 3];
-  out[1] = Anode_base32_chars[(in[0] & 0x07) << 2 | (in[1] & 0xc0) >> 6];
-  out[2] = Anode_base32_chars[(in[1] & 0x3e) >> 1];
-  out[3] = Anode_base32_chars[(in[1] & 0x01) << 4 | (in[2] & 0xf0) >> 4];
-  out[4] = Anode_base32_chars[(in[2] & 0x0f) << 1 | (in[3] & 0x80) >> 7];
-  out[5] = Anode_base32_chars[(in[3] & 0x7c) >> 2];
-  out[6] = Anode_base32_chars[(in[3] & 0x03) << 3 | (in[4] & 0xe0) >> 5];
-  out[7] = Anode_base32_chars[(in[4] & 0x1f)];
-}
-
-void Anode_base32_8_to_5(const char *in,unsigned char *out)
-{
-  out[0] = ((Anode_base32_bits[(unsigned int)in[0]]) << 3) | (Anode_base32_bits[(unsigned int)in[1]] & 0x1C) >> 2;
-  out[1] = ((Anode_base32_bits[(unsigned int)in[1]] & 0x03) << 6) | (Anode_base32_bits[(unsigned int)in[2]]) << 1 | (Anode_base32_bits[(unsigned int)in[3]] & 0x10) >> 4;
-  out[2] = ((Anode_base32_bits[(unsigned int)in[3]] & 0x0F) << 4) | (Anode_base32_bits[(unsigned int)in[4]] & 0x1E) >> 1;
-  out[3] = ((Anode_base32_bits[(unsigned int)in[4]] & 0x01) << 7) | (Anode_base32_bits[(unsigned int)in[5]]) << 2 | (Anode_base32_bits[(unsigned int)in[6]] & 0x18) >> 3;
-  out[4] = ((Anode_base32_bits[(unsigned int)in[6]] & 0x07) << 5) | (Anode_base32_bits[(unsigned int)in[7]]);
-}
diff --git a/attic/historic/anode/libanode/impl/misc.h b/attic/historic/anode/libanode/impl/misc.h
deleted file mode 100644
index 38ddea7c0..000000000
--- a/attic/historic/anode/libanode/impl/misc.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-/* This contains miscellaneous functions, including some re-implementations
- * of some functions from string.h. This is to help us port to some platforms
- * (cough Windows Mobile cough) that lack a lot of the basic C library. */
-
-#ifndef _ANODE_MISC_H
-#define _ANODE_MISC_H
-
-#include <time.h>
-#include <sys/time.h>
-#include "types.h"
-
-#ifndef ANODE_NO_STRING_H
-#include <string.h>
-#include <stdlib.h>
-#endif
-
-/* Table mapping ASCII characters to themselves or their lower case */
-extern const unsigned char Anode_ascii_tolower_table[256];
-
-/* Get the lower case version of an ASCII char */
-#define Anode_tolower(c) ((char)Anode_ascii_tolower_table[((unsigned long)((unsigned char)(c)))])
-
-/* Test strings for equality, return nonzero if equal */
-static inline unsigned int Anode_streq(const char *restrict a,const char *restrict b)
-{
-  if ((!a)||(!b))
-    return 0;
-  while (*a == *(b++)) {
-    if (!*(a++))
-      return 1;
-  }
-  return 0;
-}
-
-/* Equality test ignoring (ASCII) case */
-static inline unsigned int Anode_strcaseeq(const char *restrict a,const char *restrict b)
-{
-  if ((!a)||(!b))
-    return 0;
-  while (Anode_tolower(*a) == Anode_tolower(*(b++))) {
-    if (!*(a++))
-      return 1;
-  }
-  return 0;
-}
-
-/* Safe c-string copy, ensuring that dest[] always ends with zero */
-static inline void Anode_str_copy(char *restrict dest,const char *restrict src,unsigned int dest_size)
-{
-  char *restrict dest_end = dest + (dest_size - 1);
-  while ((*src)&&(dest != dest_end))
-    *(dest++) = *(src++);
-  *dest = (char)0;
-}
-
-/* Simple memcpy() */
-#ifdef ANODE_NO_STRING_H
-static inline void Anode_memcpy(void *restrict dest,const void *restrict src,unsigned int len)
-{
-  unsigned int i;
-  for(i=0;i<len;++i)
-    ((unsigned char *restrict)dest)[i] = ((const unsigned char *restrict)src)[i];
-}
-#else
-#define Anode_memcpy(d,s,l) memcpy((d),(s),(l))
-#endif
-
-/* Memory test for equality */
-#ifdef ANODE_NO_STRING_H
-static inline unsigned int Anode_mem_eq(const void *restrict a,const void *restrict b,unsigned int len)
-{
-  unsigned int i;
-  for(i=0;i<len;++i) {
-    if (((const unsigned char *restrict)a)[i] != ((const unsigned char *restrict)b)[i])
-      return 0;
-  }
-  return 1;
-}
-#else
-#define Anode_mem_eq(a,b,l) (!memcmp((a),(b),(l)))
-#endif
-
-/* Zero memory */
-#ifdef ANODE_NO_STRING_H
-static inline void Anode_zero(void *restrict ptr,unsigned int len)
-{
-  unsigned int i;
-  for(i=0;i<len;++i)
-    ((unsigned char *restrict)ptr)[i] = (unsigned char)0;
-}
-#else
-#define Anode_zero(p,l) memset((p),0,(l))
-#endif
-
-/* Get a pointer to the first occurrance of a character in a string */
-#ifdef ANODE_NO_STRING_H
-static inline const char *Anode_strchr(const char *s,char c)
-{
-  while (*s) {
-    if (*s == c)
-      return s;
-    ++s;
-  }
-  return (char *)0;
-}
-#else
-#define Anode_strchr(s,c) strchr((s),(c))
-#endif
-
-static inline unsigned int Anode_count_char(const char *s,char c)
-{
-  unsigned int cnt = 0;
-  while (s) {
-    if (*s == c)
-      ++cnt;
-    ++s;
-  }
-  return cnt;
-}
-
-/* Strip all of a given set of characters from a string */
-static inline void Anode_strip_all(char *s,const char *restrict schars)
-{
-  char *d = s;
-
-  while (*s) {
-    if (!Anode_strchr(schars,*s))
-      *(d++) = *s;
-    ++s;
-  }
-  *d = (char)0;
-}
-
-/* Trim whitespace from beginning and end of string */
-void Anode_trim(char *s);
-
-/* Get the length of a string */
-#ifdef ANODE_NO_STRING_H
-static inline unsigned int Anode_strlen(const char *s)
-{
-  const char *ptr = s;
-  while (*ptr) ++ptr;
-  return (unsigned int)(ptr - s);
-}
-#else
-#define Anode_strlen(s) strlen((s))
-#endif
-
-/* Returns number of milliseconds since the epoch (Java-style) */
-static inline uint64_t Anode_time64()
-{
-  struct timeval tv;
-  gettimeofday(&tv,(void *)0);
-  return ( (((uint64_t)tv.tv_sec) / 1000ULL) + ((uint64_t)(tv.tv_usec / 1000ULL)) );
-}
-
-/* Returns number of seconds since the epoch (*nix style) */
-static inline unsigned long Anode_time()
-{
-  struct timeval tv;
-  gettimeofday(&tv,(void *)0);
-  return (unsigned long)tv.tv_sec;
-}
-
-/* Simple random function, not cryptographically safe */
-unsigned int Anode_rand();
-
-/* Fast hex/ascii conversion */
-void Anode_to_hex(const unsigned char *b,unsigned int len,char *h,unsigned int hlen);
-void Anode_from_hex(const char *h,unsigned char *b,unsigned int blen);
-
-/* Convert back and forth from base32 encoding */
-/* 5 bytes -> 8 base32 characters and vice versa */
-void Anode_base32_5_to_8(const unsigned char *in,char *out);
-void Anode_base32_8_to_5(const char *in,unsigned char *out);
-
-#endif
diff --git a/attic/historic/anode/libanode/impl/mutex.h b/attic/historic/anode/libanode/impl/mutex.h
deleted file mode 100644
index b20eb82bd..000000000
--- a/attic/historic/anode/libanode/impl/mutex.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _ANODE_MUTEX_H
-#define _ANODE_MUTEX_H
-
-#ifdef WINDOWS
-
-#else /* WINDOWS */
-
-#include <pthread.h>
-
-#define AnodeMutex pthread_mutex_t
-#define AnodeMutex_init(m) pthread_mutex_init((m),(const pthread_mutexattr_t *)0)
-#define AnodeMutex_destroy(m) pthread_mutex_destroy((m))
-#define AnodeMutex_lock(m) pthread_mutex_lock((m))
-#define AnodeMutex_unlock(m) pthread_mutex_unlock((m))
-
-#endif /* WINDOWS */
-
-#endif
diff --git a/attic/historic/anode/libanode/impl/thread.c b/attic/historic/anode/libanode/impl/thread.c
deleted file mode 100644
index c20704622..000000000
--- a/attic/historic/anode/libanode/impl/thread.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include "thread.h"
-#include <stdlib.h>
-
-#ifdef WINDOWS
-
-#else /* not WINDOWS */
-
-struct _AnodeThread
-{
-  void (*func)(void *);
-  void *arg;
-  int wait_for_join;
-  pthread_t thread;
-};
-
-static void *_AnodeThread_main(void *arg)
-{
-  ((struct _AnodeThread *)arg)->func(((struct _AnodeThread *)arg)->arg);
-  if (!((struct _AnodeThread *)arg)->wait_for_join)
-    free(arg);
-  return (void *)0;
-}
-
-AnodeThread *AnodeThread_create(void (*func)(void *),void *arg,int wait_for_join)
-{
-  struct _AnodeThread *t = malloc(sizeof(struct _AnodeThread));
-  t->func = func;
-  t->arg = arg;
-  t->wait_for_join = wait_for_join;
-  pthread_create(&t->thread,(const pthread_attr_t *)0,&_AnodeThread_main,(void *)t);
-  if (!wait_for_join)
-    pthread_detach(t->thread);
-  return (AnodeThread *)t;
-}
-
-void AnodeThread_join(AnodeThread *thread)
-{
-  pthread_join(((struct _AnodeThread *)thread)->thread,(void **)0);
-  free((void *)thread);
-}
-
-#endif /* WINDOWS / not WINDOWS */
diff --git a/attic/historic/anode/libanode/impl/thread.h b/attic/historic/anode/libanode/impl/thread.h
deleted file mode 100644
index accf173ac..000000000
--- a/attic/historic/anode/libanode/impl/thread.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _ANODE_THREAD_H
-#define _ANODE_THREAD_H
-
-#ifdef WINDOWS
-
-#include <windows.h>
-#include <thread.h>
-typedef DWORD AnodeThreadId;
-
-#else /* not WINDOWS */
-
-#include <pthread.h>
-typedef pthread_t AnodeThreadId;
-
-#define AnodeThread_self() pthread_self()
-#define AnodeThreadId_equal(a,b) pthread_equal((pthread_t)(a),(pthread_t)(b))
-
-#endif
-
-typedef void AnodeThread;
-
-/**
- * Create and launch a new thread
- *
- * If wait_for_join is true (nonzero), the thread can and must be joined. The
- * thread object won't be freed until join is called and returns. If
- * wait_for_join is false, the thread object frees itself automatically on
- * termination.
- *
- * If wait_for_join is false (zero), there is really no need to keep track of
- * the thread object.
- *
- * @param func Function to call as thread main
- * @param arg Argument to pass to function
- * @param wait_for_join If false, thread deletes itself when it terminates
- */
-AnodeThread *AnodeThread_create(void (*func)(void *),void *arg,int wait_for_join);
-
-/**
- * Wait for a thread to terminate and delete thread object
- *
- * This can only be used for threads created with wait_for_join set to true.
- * The thread object is no longer valid after this call.
- *
- * @param thread Thread to wait for termination and delete
- */
-void AnodeThread_join(AnodeThread *thread);
-
-#endif
diff --git a/attic/historic/anode/libanode/impl/types.h b/attic/historic/anode/libanode/impl/types.h
deleted file mode 100644
index 5f070e5a4..000000000
--- a/attic/historic/anode/libanode/impl/types.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _ANODE_TYPES_H
-#define _ANODE_TYPES_H
-
-#ifdef WINDOWS
-#else
-#include <stdint.h>
-#endif
-
-#endif
diff --git a/attic/historic/anode/libanode/network_address.c b/attic/historic/anode/libanode/network_address.c
deleted file mode 100644
index 86ec054f1..000000000
--- a/attic/historic/anode/libanode/network_address.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include "impl/misc.h"
-#include "impl/types.h"
-#include "anode.h"
-
-const AnodeNetworkAddress AnodeNetworkAddress_ANY4 = {
-  ANODE_NETWORK_ADDRESS_IPV4,
-  { 0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
-};
-const AnodeNetworkAddress AnodeNetworkAddress_ANY6 = {
-  ANODE_NETWORK_ADDRESS_IPV6,
-  { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
-};
-const AnodeNetworkAddress AnodeNetworkAddress_LOCAL4 = {
-  ANODE_NETWORK_ADDRESS_IPV4,
-  { 127,0,0,1, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
-};
-const AnodeNetworkAddress AnodeNetworkAddress_LOCAL6 = {
-  ANODE_NETWORK_ADDRESS_IPV6,
-  { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 ,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
-};
-
-int AnodeNetworkAddress_to_string(const AnodeNetworkAddress *address,char *buf,int len)
-{
-  const char *s;
-
-  switch(address->type) {
-    case ANODE_NETWORK_ADDRESS_IPV4:
-      s = inet_ntop(AF_INET,(const void *)address->bits,buf,len);
-      if (s)
-        return Anode_strlen(s);
-      else return ANODE_ERR_INVALID_ARGUMENT;
-      break;
-    case ANODE_NETWORK_ADDRESS_IPV6:
-      s = inet_ntop(AF_INET6,address->bits,buf,len);
-      if (s)
-        return Anode_strlen(s);
-      else return ANODE_ERR_INVALID_ARGUMENT;
-    /*
-    case ANODE_NETWORK_ADDRESS_ETHERNET:
-      break;
-    case ANODE_NETWORK_ADDRESS_USB:
-      break;
-    case ANODE_NETWORK_ADDRESS_BLUETOOTH:
-      break;
-    case ANODE_NETWORK_ADDRESS_IPC:
-      break;
-    case ANODE_NETWORK_ADDRESS_80211S:
-      break;
-    case ANODE_NETWORK_ADDRESS_SERIAL:
-      break;
-    */
-    case ANODE_NETWORK_ADDRESS_ANODE_256_40:
-      return AnodeAddress_to_string((const AnodeAddress *)address->bits,buf,len);
-    default:
-      return ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED;
-  }
-}
-
-int AnodeNetworkAddress_from_string(const char *str,AnodeNetworkAddress *address)
-{
-  unsigned int dots = Anode_count_char(str,'.');
-  unsigned int colons = Anode_count_char(str,':');
-
-  if ((dots == 3)&&(!colons)) {
-    address->type = ANODE_NETWORK_ADDRESS_IPV4;
-    if (inet_pton(AF_INET,str,address->bits) > 0)
-      return 0;
-    else return ANODE_ERR_INVALID_ARGUMENT;
-  } else if ((colons)&&(!dots)) {
-    address->type = ANODE_NETWORK_ADDRESS_IPV6;
-    if (inet_pton(AF_INET6,str,address->bits) > 0)
-      return 0;
-    else return ANODE_ERR_INVALID_ARGUMENT;
-  } else {
-    address->type = ANODE_NETWORK_ADDRESS_ANODE_256_40;
-    return AnodeAddress_from_string(str,(AnodeAddress *)address->bits);
-  }
-}
-
-int AnodeNetworkEndpoint_from_sockaddr(const void *sockaddr,AnodeNetworkEndpoint *endpoint)
-{
-  switch(((struct sockaddr_storage *)sockaddr)->ss_family) {
-    case AF_INET:
-      *((uint32_t *)endpoint->address.bits) = (uint32_t)(((struct sockaddr_in *)sockaddr)->sin_addr.s_addr);
-      endpoint->port = (int)ntohs(((struct sockaddr_in *)sockaddr)->sin_port);
-      return 0;
-    case AF_INET6:
-      Anode_memcpy(endpoint->address.bits,((struct sockaddr_in6 *)sockaddr)->sin6_addr.s6_addr,16);
-      endpoint->port = (int)ntohs(((struct sockaddr_in6 *)sockaddr)->sin6_port);
-      return 0;
-    default:
-      return ANODE_ERR_INVALID_ARGUMENT;
-  }
-}
-
-int AnodeNetworkEndpoint_to_sockaddr(const AnodeNetworkEndpoint *endpoint,void *sockaddr,int sockaddr_len)
-{
-  switch(endpoint->address.type) {
-    case ANODE_NETWORK_ADDRESS_IPV4:
-      if (sockaddr_len < (int)sizeof(struct sockaddr_in))
-        return ANODE_ERR_BUFFER_TOO_SMALL;
-      Anode_zero(sockaddr,sizeof(struct sockaddr_in));
-      ((struct sockaddr_in *)sockaddr)->sin_family = AF_INET;
-      ((struct sockaddr_in *)sockaddr)->sin_port = htons((uint16_t)endpoint->port);
-      ((struct sockaddr_in *)sockaddr)->sin_addr.s_addr = *((uint32_t *)endpoint->address.bits);
-      return 0;
-    case ANODE_NETWORK_ADDRESS_IPV6:
-      if (sockaddr_len < (int)sizeof(struct sockaddr_in6))
-        return ANODE_ERR_BUFFER_TOO_SMALL;
-      Anode_zero(sockaddr,sizeof(struct sockaddr_in6));
-      ((struct sockaddr_in6 *)sockaddr)->sin6_family = AF_INET6;
-      ((struct sockaddr_in6 *)sockaddr)->sin6_port = htons((uint16_t)endpoint->port);
-      Anode_memcpy(((struct sockaddr_in6 *)sockaddr)->sin6_addr.s6_addr,endpoint->address.bits,16);
-      return 0;
-    default:
-      return ANODE_ERR_INVALID_ARGUMENT;
-  }
-}
diff --git a/attic/historic/anode/libanode/secure_random.c b/attic/historic/anode/libanode/secure_random.c
deleted file mode 100644
index 4322d7de6..000000000
--- a/attic/historic/anode/libanode/secure_random.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "impl/aes.h"
-#include "impl/misc.h"
-#include "anode.h"
-
-#ifdef WINDOWS
-#include <windows.h>
-#include <wincrypt.h>
-#endif
-
-struct AnodeSecureRandomImpl
-{
-  AnodeAesExpandedKey key;
-  unsigned char state[ANODE_AES_BLOCK_SIZE];
-  unsigned char block[ANODE_AES_BLOCK_SIZE];
-  unsigned int ptr;
-};
-
-AnodeSecureRandom *AnodeSecureRandom_new()
-{
-  unsigned char keybuf[ANODE_AES_KEY_SIZE + ANODE_AES_BLOCK_SIZE + ANODE_AES_BLOCK_SIZE];
-  unsigned int i;
-  struct AnodeSecureRandomImpl *srng;
-
-#ifdef WINDOWS
-  HCRYPTPROV hProv;
-  if (CryptAcquireContext(&hProv,NULL,NULL,PROV_RSA_FULL,CRYPT_VERIFYCONTEXT|CRYPT_SILENT)) {
-    CryptGenRandom(hProv,sizeof(keybuf),keybuf);
-    CryptReleaseContext(hProv,0);
-  }
-#else
-  FILE *urandf = fopen("/dev/urandom","rb");
-  if (urandf) {
-    fread((void *)keybuf,sizeof(keybuf),1,urandf);
-    fclose(urandf);
-  }
-#endif
-
-  for(i=0;i<sizeof(keybuf);++i)
-    keybuf[i] ^= (unsigned char)(Anode_rand() >> 5);
-
-  srng = malloc(sizeof(struct AnodeSecureRandomImpl));
-  Anode_aes256_expand_key(keybuf,&srng->key);
-  for(i=0;i<ANODE_AES_BLOCK_SIZE;++i)
-    srng->state[i] = keybuf[ANODE_AES_KEY_SIZE + i];
-  for(i=0;i<ANODE_AES_BLOCK_SIZE;++i)
-    srng->block[i] = keybuf[ANODE_AES_KEY_SIZE + ANODE_AES_KEY_SIZE + i];
-  srng->ptr = ANODE_AES_BLOCK_SIZE;
-
-  return (AnodeSecureRandom *)srng;
-}
-
-void AnodeSecureRandom_gen_bytes(AnodeSecureRandom *srng,void *buf,long count)
-{
-  long i,j;
-
-  for(i=0;i<count;++i) {
-    if (((struct AnodeSecureRandomImpl *)srng)->ptr == ANODE_AES_BLOCK_SIZE) {
-      Anode_aes256_encrypt(&((struct AnodeSecureRandomImpl *)srng)->key,((struct AnodeSecureRandomImpl *)srng)->state,((struct AnodeSecureRandomImpl *)srng)->state);
-      for(j=0;j<ANODE_AES_KEY_SIZE;++j)
-        ((struct AnodeSecureRandomImpl *)srng)->block[j] ^= ((struct AnodeSecureRandomImpl *)srng)->state[j];
-      ((struct AnodeSecureRandomImpl *)srng)->ptr = 0;
-    }
-    ((unsigned char *)buf)[i] = ((struct AnodeSecureRandomImpl *)srng)->block[((struct AnodeSecureRandomImpl *)srng)->ptr++];
-  }
-}
-
-void AnodeSecureRandom_delete(AnodeSecureRandom *srng)
-{
-  free(srng);
-}
diff --git a/attic/historic/anode/libanode/system_transport.c b/attic/historic/anode/libanode/system_transport.c
deleted file mode 100644
index 4bfb143ee..000000000
--- a/attic/historic/anode/libanode/system_transport.c
+++ /dev/null
@@ -1,948 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include "anode.h"
-#include "impl/mutex.h"
-#include "impl/thread.h"
-#include "impl/misc.h"
-#include "impl/dns_txt.h"
-
-#ifdef WINDOWS
-#include <windows.h>
-#include <winsock2.h>
-#define AnodeSystemTransport__close_socket(s) closesocket((s))
-#define ANODE_USE_SELECT 1
-#else
-#include <poll.h>
-#include <unistd.h>
-#define AnodeSystemTransport__close_socket(s) close((s))
-#endif
-
-static const char *AnodeSystemTransport_CLASS = "SystemTransport";
-
-/* ======================================================================== */
-
-struct AnodeSystemTransport;
-
-struct AnodeSystemTransport_AnodeSocket
-{
-  AnodeSocket base; /* must be first */
-  unsigned int entry_idx;
-};
-
-#define ANODE_SYSTEM_TRANSPORT_DNS_MAX_RESULTS 16
-struct AnodeSystemTransport__dns_request
-{
-  struct AnodeSystemTransport__dns_request *next;
-
-  AnodeThread *thread;
-  struct AnodeSystemTransport *owner;
-
-  void (*event_handler)(const AnodeEvent *event);
-
-  char name[256];  
-  enum AnodeTransportDnsIncludeMode ipv4_include_mode;
-  enum AnodeTransportDnsIncludeMode ipv6_include_mode;
-  enum AnodeTransportDnsIncludeMode anode_include_mode;
-
-  AnodeNetworkAddress addresses[ANODE_SYSTEM_TRANSPORT_DNS_MAX_RESULTS];
-  unsigned int address_count;
-
-  int error_code;
-};
-
-#ifdef ANODE_USE_SELECT
-typedef int AnodeSystemTransport__poll_fd; /* for select() */
-#else
-typedef struct pollfd AnodeSystemTransport__poll_fd; /* for poll() */
-#endif
-
-struct AnodeSystemTransport
-{
-  AnodeTransport interface; /* must be first */
-
-  AnodeTransport *base;
-
-#ifdef ANODE_USE_SELECT
-  FD_SET readfds;
-  FD_SET writefds;
-#endif
-
-  void (*default_event_handler)(const AnodeEvent *event);
-
-  AnodeSystemTransport__poll_fd *fds;
-  struct AnodeSystemTransport_AnodeSocket *sockets;
-  unsigned int fd_count;
-  unsigned int fd_capacity;
-
-  struct AnodeSystemTransport__dns_request *pending_dns_requests;
-
-  int invoke_pipe[2];
-  AnodeMutex invoke_pipe_m;
-  void *invoke_pipe_buf[2];
-  unsigned int invoke_pipe_buf_ptr;
-};
-
-/* ======================================================================== */
-/* Internal helper methods                                                  */
-
-static unsigned int AnodeSystemTransport__add_entry(struct AnodeSystemTransport *transport)
-{
-  if ((transport->fd_count + 1) > transport->fd_capacity) {
-    transport->fd_capacity += 8;
-    transport->fds = realloc(transport->fds,sizeof(AnodeSystemTransport__poll_fd) * transport->fd_capacity);
-    transport->sockets = realloc(transport->sockets,sizeof(struct AnodeSystemTransport_AnodeSocket) * transport->fd_capacity);
-  }
-  return transport->fd_count++;
-}
-
-static void AnodeSystemTransport__remove_entry(struct AnodeSystemTransport *transport,const unsigned int idx)
-{
-  unsigned int i;
-
-  --transport->fd_count;
-  for(i=idx;i<transport->fd_count;++i) {
-    Anode_memcpy(&transport->fds[i],&transport->fds[i+1],sizeof(AnodeSystemTransport__poll_fd));
-    Anode_memcpy(&transport->sockets[i],&transport->sockets[i+1],sizeof(struct AnodeSystemTransport_AnodeSocket));
-  }
-
-  if ((transport->fd_capacity - transport->fd_count) > 16) {
-    transport->fd_capacity -= 16;
-    transport->fds = realloc(transport->fds,sizeof(AnodeSystemTransport__poll_fd) * transport->fd_capacity);
-    transport->sockets = realloc(transport->sockets,sizeof(struct AnodeSystemTransport_AnodeSocket) * transport->fd_capacity);
-  }
-}
-
-static void AnodeSystemTransport__dns_invoke_on_completion(void *_dreq)
-{
-  struct AnodeSystemTransport__dns_request *dreq = (struct AnodeSystemTransport__dns_request *)_dreq;
-  struct AnodeSystemTransport__dns_request *ptr,**lastnext;
-
-  AnodeThread_join(dreq->thread);
-
-  ptr = dreq->owner->pending_dns_requests;
-  lastnext = &dreq->owner->pending_dns_requests;
-  while (ptr) {
-    if (ptr == dreq) {
-      *lastnext = ptr->next;
-      break;
-    } else {
-      lastnext = &ptr->next;
-      ptr = ptr->next;
-    }
-  }
-
-  free(dreq);
-}
-
-static void AnodeSystemTransport__dns_thread_main(void *_dreq)
-{
-  struct AnodeSystemTransport__dns_request *dreq = (struct AnodeSystemTransport__dns_request *)_dreq;
-
-  dreq->owner->interface.invoke((AnodeTransport *)dreq->owner,dreq,&AnodeSystemTransport__dns_invoke_on_completion);
-}
-
-static void AnodeSystemTransport__do_close(struct AnodeSystemTransport *transport,struct AnodeSystemTransport_AnodeSocket *sock,const int error_code,const int generate_event)
-{
-  AnodeEvent evbuf;
-  int fd;
-
-  if (sock->base.class_name == AnodeSystemTransport_CLASS) {
-#ifdef ANODE_USE_SELECT
-    fd = (int)(transport->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx]);
-#else
-    fd = transport->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx].fd;
-#endif
-
-    if ((sock->base.type == ANODE_SOCKET_STREAM_CONNECTION)&&(sock->base.state != ANODE_SOCKET_CLOSED)) {
-      sock->base.state = ANODE_SOCKET_CLOSED;
-
-      if (generate_event) {
-        evbuf.type = ANODE_TRANSPORT_EVENT_STREAM_CLOSED;
-        evbuf.transport = (AnodeTransport *)transport;
-        evbuf.sock = (AnodeSocket *)sock;
-        evbuf.datagram_from = NULL;
-        evbuf.dns_name = NULL;
-        evbuf.dns_addresses = NULL;
-        evbuf.dns_address_count = 0;
-        evbuf.error_code = error_code;
-        evbuf.data_length = 0;
-        evbuf.data = NULL;
-
-        if (sock->base.event_handler)
-          sock->base.event_handler(&evbuf);
-        else if (transport->default_event_handler)
-          transport->default_event_handler(&evbuf);
-      }
-    }
-
-    AnodeSystemTransport__close_socket(fd);
-    AnodeSystemTransport__remove_entry(transport,((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx);
-
-#ifdef ANODE_USE_SELECT
-    FD_CLR(sock,&THIS->readfds);
-    FD_CLR(sock,&THIS->writefds);
-#endif
-  } else transport->base->close(transport->base,(AnodeSocket *)sock);
-}
-
-static int AnodeSystemTransport__populate_network_endpoint(const struct sockaddr_storage *saddr,AnodeNetworkEndpoint *ep)
-{
-  switch(saddr->ss_family) {
-    case AF_INET:
-      ep->address.type = ANODE_NETWORK_ADDRESS_IPV4;
-      *((uint32_t *)ep->address.bits) = ((struct sockaddr_in *)saddr)->sin_addr.s_addr;
-      ep->port = ntohs(((struct sockaddr_in *)saddr)->sin_port);
-      return 1;
-    case AF_INET6:
-      ep->address.type = ANODE_NETWORK_ADDRESS_IPV6;
-      Anode_memcpy(ep->address.bits,((struct sockaddr_in6 *)saddr)->sin6_addr.s6_addr,16);
-      ep->port = ntohs(((struct sockaddr_in6 *)saddr)->sin6_port);
-      return 1;
-  }
-  return 0;
-}
-
-/* ======================================================================== */
-
-#ifdef THIS
-#undef THIS
-#endif
-#define THIS ((struct AnodeSystemTransport *)transport)
-
-static void AnodeSystemTransport_invoke(AnodeTransport *transport,
-  void *ptr,
-  void (*func)(void *))
-{
-  void *invoke_msg[2];
-
-  invoke_msg[0] = ptr;
-  invoke_msg[1] = (void *)func;
-
-  AnodeMutex_lock(&THIS->invoke_pipe_m);
-  write(THIS->invoke_pipe[1],(void *)(&invoke_msg),sizeof(invoke_msg));
-  AnodeMutex_unlock(&THIS->invoke_pipe_m);
-}
-
-static void AnodeSystemTransport_dns_resolve(AnodeTransport *transport,
-  const char *name,
-  void (*event_handler)(const AnodeEvent *),
-  enum AnodeTransportDnsIncludeMode ipv4_include_mode,
-  enum AnodeTransportDnsIncludeMode ipv6_include_mode,
-  enum AnodeTransportDnsIncludeMode anode_include_mode)
-{
-  struct AnodeSystemTransport__dns_request *dreq = malloc(sizeof(struct AnodeSystemTransport__dns_request));
-
-  dreq->owner = THIS;
-  dreq->event_handler = event_handler;
-  Anode_str_copy(dreq->name,name,sizeof(dreq->name));
-  dreq->ipv4_include_mode = ipv4_include_mode;
-  dreq->ipv6_include_mode = ipv6_include_mode;
-  dreq->anode_include_mode = anode_include_mode;
-
-  dreq->address_count = 0;
-  dreq->error_code = 0;
-
-  dreq->next = THIS->pending_dns_requests;
-  THIS->pending_dns_requests = dreq;
-
-  dreq->thread = AnodeThread_create(&AnodeSystemTransport__dns_thread_main,dreq,0);
-}
-
-static AnodeSocket *AnodeSystemTransport_datagram_listen(AnodeTransport *transport,
-  const AnodeNetworkAddress *local_address,
-  int local_port,
-  int *error_code)
-{
-  struct sockaddr_in sin4;
-  struct sockaddr_in6 sin6;
-  struct AnodeSystemTransport_AnodeSocket *sock;
-  unsigned int entry_idx;
-  int fd;
-  int tmp;
-
-  switch(local_address->type) {
-    case ANODE_NETWORK_ADDRESS_IPV4:
-      fd = socket(AF_INET,SOCK_DGRAM,0);
-      if (fd <= 0) {
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      tmp = 1;
-      setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,&tmp,sizeof(tmp));
-      fcntl(fd,F_SETFL,O_NONBLOCK);
-
-      Anode_zero(&sin4,sizeof(struct sockaddr_in));
-      sin4.sin_family = AF_INET;
-      sin4.sin_port = htons(local_port);
-      sin4.sin_addr.s_addr = *((uint32_t *)local_address->bits);
-
-      if (bind(fd,(const struct sockaddr *)&sin4,sizeof(sin4))) {
-        AnodeSystemTransport__close_socket(fd);
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      break;
-    case ANODE_NETWORK_ADDRESS_IPV6:
-      fd = socket(AF_INET6,SOCK_DGRAM,0);
-      if (fd <= 0) {
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      tmp = 1; setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,&tmp,sizeof(tmp));
-      fcntl(fd,F_SETFL,O_NONBLOCK);
-#ifdef IPV6_V6ONLY
-      tmp = 1; setsockopt(fd,IPPROTO_IPV6,IPV6_V6ONLY,&tmp,sizeof(tmp));
-#endif
-
-      Anode_zero(&sin6,sizeof(struct sockaddr_in6));
-      sin6.sin6_family = AF_INET6;
-      sin6.sin6_port = htons(local_port);
-      Anode_memcpy(sin6.sin6_addr.s6_addr,local_address->bits,16);
-
-      if (bind(fd,(const struct sockaddr *)&sin6,sizeof(sin6))) {
-        AnodeSystemTransport__close_socket(fd);
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      break;
-    default:
-      if (THIS->base)
-        return THIS->base->datagram_listen(THIS->base,local_address,local_port,error_code);
-      else {
-        *error_code = ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED;
-        return (AnodeSocket *)0;
-      }
-  }
-
-  entry_idx = AnodeSystemTransport__add_entry(THIS);
-  sock = &(THIS->sockets[entry_idx]);
-
-  sock->base.type = ANODE_SOCKET_DATAGRAM;
-  sock->base.state = ANODE_SOCKET_OPEN;
-  Anode_memcpy(&sock->base.endpoint.address,local_address,sizeof(AnodeNetworkAddress));
-  sock->base.endpoint.port = local_port;
-  sock->base.class_name = AnodeSystemTransport_CLASS;
-  sock->base.user_ptr[0] = NULL;
-  sock->base.user_ptr[1] = NULL;
-  sock->base.event_handler = NULL;
-  sock->entry_idx = entry_idx;
-
-  THIS->fds[entry_idx].fd = fd;
-  THIS->fds[entry_idx].events = POLLIN;
-  THIS->fds[entry_idx].revents = 0;
-
-  *error_code = 0;
-  return (AnodeSocket *)sock;
-}
-
-static AnodeSocket *AnodeSystemTransport_stream_listen(AnodeTransport *transport,
-  const AnodeNetworkAddress *local_address,
-  int local_port,
-  int *error_code)
-{
-  struct sockaddr_in sin4;
-  struct sockaddr_in6 sin6;
-  struct AnodeSystemTransport_AnodeSocket *sock;
-  unsigned int entry_idx;
-  int fd;
-  int tmp;
-
-  switch(local_address->type) {
-    case ANODE_NETWORK_ADDRESS_IPV4:
-      fd = socket(AF_INET,SOCK_STREAM,0);
-      if (fd < 0) {
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      fcntl(fd,F_SETFL,O_NONBLOCK);
-
-      Anode_zero(&sin4,sizeof(struct sockaddr_in));
-      sin4.sin_family = AF_INET;
-      sin4.sin_port = htons(local_port);
-      sin4.sin_addr.s_addr = *((uint32_t *)local_address->bits);
-
-      if (bind(fd,(const struct sockaddr *)&sin4,sizeof(sin4))) {
-        AnodeSystemTransport__close_socket(fd);
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      if (listen(fd,8)) {
-        AnodeSystemTransport__close_socket(fd);
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      break;
-    case ANODE_NETWORK_ADDRESS_IPV6:
-      fd = socket(AF_INET6,SOCK_STREAM,0);
-      if (fd < 0) {
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      fcntl(fd,F_SETFL,O_NONBLOCK);
-#ifdef IPV6_V6ONLY
-      tmp = 1; setsockopt(fd,IPPROTO_IPV6,IPV6_V6ONLY,&tmp,sizeof(tmp));
-#endif
-
-      Anode_zero(&sin6,sizeof(struct sockaddr_in6));
-      sin6.sin6_family = AF_INET6;
-      sin6.sin6_port = htons(local_port);
-      Anode_memcpy(sin6.sin6_addr.s6_addr,local_address->bits,16);
-
-      if (bind(fd,(const struct sockaddr *)&sin6,sizeof(sin6))) {
-        AnodeSystemTransport__close_socket(fd);
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      if (listen(fd,8)) {
-        AnodeSystemTransport__close_socket(fd);
-        *error_code = ANODE_ERR_UNABLE_TO_BIND;
-        return (AnodeSocket *)0;
-      }
-      break;
-    default:
-      if (THIS->base)
-        return THIS->base->stream_listen(THIS->base,local_address,local_port,error_code);
-      else {
-        *error_code = ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED;
-        return (AnodeSocket *)0;
-      }
-  }
-
-  entry_idx = AnodeSystemTransport__add_entry(THIS);
-  sock = &(THIS->sockets[entry_idx]);
-
-  sock->base.type = ANODE_SOCKET_STREAM_LISTEN;
-  sock->base.state = ANODE_SOCKET_OPEN;
-  Anode_memcpy(&sock->base.endpoint.address,local_address,sizeof(AnodeNetworkAddress));
-  sock->base.endpoint.port = local_port;
-  sock->base.class_name = AnodeSystemTransport_CLASS;
-  sock->base.user_ptr[0] = NULL;
-  sock->base.user_ptr[1] = NULL;
-  sock->base.event_handler = NULL;
-  sock->entry_idx = entry_idx;
-
-  THIS->fds[entry_idx].fd = fd;
-  THIS->fds[entry_idx].events = POLLIN;
-  THIS->fds[entry_idx].revents = 0;
-
-  *error_code = 0;
-  return (AnodeSocket *)sock;
-}
-
-static int AnodeSystemTransport_datagram_send(AnodeTransport *transport,
-  AnodeSocket *sock,
-  const void *data,
-  int data_len,
-  const AnodeNetworkEndpoint *to_endpoint)
-{
-  struct sockaddr_in sin4;
-  struct sockaddr_in6 sin6;
-
-#ifdef ANODE_USE_SELECT
-  const int fd = (int)(THIS->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx]);
-#else
-  const int fd = THIS->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx].fd;
-#endif
-
-  switch(to_endpoint->address.type) {
-    case ANODE_NETWORK_ADDRESS_IPV4:
-      Anode_zero(&sin4,sizeof(struct sockaddr_in));
-      sin4.sin_family = AF_INET;
-      sin4.sin_port = htons((uint16_t)to_endpoint->port);
-      sin4.sin_addr.s_addr = *((uint32_t *)to_endpoint->address.bits);
-      sendto(fd,data,data_len,0,(struct sockaddr *)&sin4,sizeof(sin4));
-      return 0;
-    case ANODE_NETWORK_ADDRESS_IPV6:
-      Anode_zero(&sin6,sizeof(struct sockaddr_in6));
-      sin6.sin6_family = AF_INET6;
-      sin6.sin6_port = htons((uint16_t)to_endpoint->port);
-      Anode_memcpy(sin6.sin6_addr.s6_addr,to_endpoint->address.bits,16);
-      sendto(fd,data,data_len,0,(struct sockaddr *)&sin6,sizeof(sin6));
-      return 0;
-    default:
-      if (THIS->base)
-        return THIS->base->datagram_send(THIS->base,sock,data,data_len,to_endpoint);
-      else return ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED;
-  }
-}
-
-static AnodeSocket *AnodeSystemTransport_stream_connect(AnodeTransport *transport,
-  const AnodeNetworkEndpoint *to_endpoint,
-  int *error_code)
-{
-  struct sockaddr_in sin4;
-  struct sockaddr_in6 sin6;
-  struct AnodeSystemTransport_AnodeSocket *sock;
-  unsigned int entry_idx;
-  int fd;
-
-  switch(to_endpoint->address.type) {
-    case ANODE_NETWORK_ADDRESS_IPV4:
-      Anode_zero(&sin4,sizeof(struct sockaddr_in));
-      sin4.sin_family = AF_INET;
-      sin4.sin_port = htons(to_endpoint->port);
-      sin4.sin_addr.s_addr = *((uint32_t *)to_endpoint->address.bits);
-
-      fd = socket(AF_INET,SOCK_STREAM,0);
-      if (fd < 0) {
-        *error_code = ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED;
-        return (AnodeSocket *)0;
-      }
-      fcntl(fd,F_SETFL,O_NONBLOCK);
-
-      if (connect(fd,(struct sockaddr *)&sin4,sizeof(sin4))) {
-        if (errno != EINPROGRESS) {
-          *error_code = ANODE_ERR_CONNECT_FAILED;
-          AnodeSystemTransport__close_socket(fd);
-          return (AnodeSocket *)0;
-        }
-      }
-      break;
-    case ANODE_NETWORK_ADDRESS_IPV6:
-      Anode_zero(&sin6,sizeof(struct sockaddr_in6));
-      sin6.sin6_family = AF_INET6;
-      sin6.sin6_port = htons(to_endpoint->port);
-      Anode_memcpy(sin6.sin6_addr.s6_addr,to_endpoint->address.bits,16);
-
-      fd = socket(AF_INET6,SOCK_STREAM,0);
-      if (fd < 0) {
-        *error_code = ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED;
-        return (AnodeSocket *)0;
-      }
-      fcntl(fd,F_SETFL,O_NONBLOCK);
-
-      if (connect(fd,(struct sockaddr *)&sin6,sizeof(sin6))) {
-        if (errno == EINPROGRESS) {
-          *error_code = ANODE_ERR_CONNECT_FAILED;
-          AnodeSystemTransport__close_socket(fd);
-          return (AnodeSocket *)0;
-        }
-      }
-      break;
-    default:
-      if (THIS->base)
-        return THIS->base->stream_connect(THIS->base,to_endpoint,error_code);
-      else {
-        *error_code = ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED;
-        return (AnodeSocket *)0;
-      }
-  }
-
-  entry_idx = AnodeSystemTransport__add_entry(THIS);
-  sock = &(THIS->sockets[entry_idx]);
-
-  sock->base.type = ANODE_SOCKET_STREAM_CONNECTION;
-  sock->base.state = ANODE_SOCKET_CONNECTING;
-  Anode_memcpy(&sock->base.endpoint,to_endpoint,sizeof(AnodeNetworkEndpoint));
-  sock->base.class_name = AnodeSystemTransport_CLASS;
-  sock->base.user_ptr[0] = NULL;
-  sock->base.user_ptr[1] = NULL;
-  sock->base.event_handler = NULL;
-  sock->entry_idx = entry_idx;
-
-  THIS->fds[entry_idx].fd = fd;
-  THIS->fds[entry_idx].events = POLLIN|POLLOUT;
-  THIS->fds[entry_idx].revents = 0;
-
-  return (AnodeSocket *)sock;
-}
-
-static void AnodeSystemTransport_stream_start_writing(AnodeTransport *transport,
-  AnodeSocket *sock)
-{
-  if ((sock->type == ANODE_SOCKET_STREAM_CONNECTION)&&(((struct AnodeSystemTransport_AnodeSocket *)sock)->base.state == ANODE_SOCKET_OPEN)) {
-    if (sock->class_name == AnodeSystemTransport_CLASS) {
-#ifdef ANODE_USE_SELECT
-      FD_SET((int)(THIS->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx]),&THIS->writefds);
-#else
-      THIS->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx].events = (POLLIN|POLLOUT);
-#endif
-    } else THIS->base->stream_start_writing(THIS->base,sock);
-  }
-}
-
-static void AnodeSystemTransport_stream_stop_writing(AnodeTransport *transport,
-  AnodeSocket *sock)
-{
-  if ((sock->type == ANODE_SOCKET_STREAM_CONNECTION)&&(((struct AnodeSystemTransport_AnodeSocket *)sock)->base.state == ANODE_SOCKET_OPEN)) {
-    if (sock->class_name == AnodeSystemTransport_CLASS) {
-#ifdef ANODE_USE_SELECT
-      FD_CLR((int)(THIS->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx]),&THIS->writefds);
-#else
-      THIS->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx].events = POLLIN;
-#endif
-    } else THIS->base->stream_stop_writing(THIS->base,sock);
-  }
-}
-
-static int AnodeSystemTransport_stream_send(AnodeTransport *transport,
-  AnodeSocket *sock,
-  const void *data,
-  int data_len)
-{
-  int result;
-
-  if (sock->type == ANODE_SOCKET_STREAM_CONNECTION) {
-    if (sock->class_name == AnodeSystemTransport_CLASS) {
-      if (((struct AnodeSystemTransport_AnodeSocket *)sock)->base.state != ANODE_SOCKET_OPEN)
-        return ANODE_ERR_CONNECTION_CLOSED;
-
-#ifdef ANODE_USE_SELECT
-      result = send((int)(THIS->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx]),data,data_len,0);
-#else
-      result = send(THIS->fds[((struct AnodeSystemTransport_AnodeSocket *)sock)->entry_idx].fd,data,data_len,0);
-#endif
-
-      if (result >= 0)
-        return result;
-      else {
-        AnodeSystemTransport__do_close(THIS,(struct AnodeSystemTransport_AnodeSocket *)sock,ANODE_ERR_CONNECTION_CLOSED_BY_REMOTE,1);
-        return ANODE_ERR_CONNECTION_CLOSED;
-      }
-    } else return THIS->base->stream_send(THIS->base,sock,data,data_len);
-  } else return ANODE_ERR_INVALID_ARGUMENT;
-}
-
-static void AnodeSystemTransport_close(AnodeTransport *transport,
-  AnodeSocket *sock)
-{
-  AnodeSystemTransport__do_close(THIS,(struct AnodeSystemTransport_AnodeSocket *)sock,0,1);
-}
-
-static void AnodeSystemTransport__poll_do_read_datagram(struct AnodeSystemTransport *transport,int fd,struct AnodeSystemTransport_AnodeSocket *sock)
-{
-  char buf[16384];
-  struct sockaddr_storage fromaddr;
-  AnodeNetworkEndpoint tmp_ep;
-  AnodeEvent evbuf;
-  socklen_t addrlen;
-  int n;
-
-  addrlen = sizeof(struct sockaddr_storage);
-  n = recvfrom(fd,buf,sizeof(buf),0,(struct sockaddr *)&fromaddr,&addrlen);
-  if ((n >= 0)&&(AnodeSystemTransport__populate_network_endpoint(&fromaddr,&tmp_ep))) {
-    evbuf.type = ANODE_TRANSPORT_EVENT_DATAGRAM_RECEIVED;
-    evbuf.transport = (AnodeTransport *)transport;
-    evbuf.sock = (AnodeSocket *)sock;
-    evbuf.datagram_from = &tmp_ep;
-    evbuf.dns_name = NULL;
-    evbuf.dns_addresses = NULL;
-    evbuf.dns_address_count = 0;
-    evbuf.error_code = 0;
-    evbuf.data_length = n;
-    evbuf.data = buf;
-
-    if (sock->base.event_handler)
-      sock->base.event_handler(&evbuf);
-    else if (transport->default_event_handler)
-      transport->default_event_handler(&evbuf);
-  }
-}
-
-static void AnodeSystemTransport__poll_do_accept_incoming_connection(struct AnodeSystemTransport *transport,int fd,struct AnodeSystemTransport_AnodeSocket *sock)
-{
-  struct sockaddr_storage fromaddr;
-  AnodeNetworkEndpoint tmp_ep;
-  AnodeEvent evbuf;
-  struct AnodeSystemTransport_AnodeSocket *newsock;
-  socklen_t addrlen;
-  int n;
-  unsigned int entry_idx;
-
-  addrlen = sizeof(struct sockaddr_storage);
-  n = accept(fd,(struct sockaddr *)&fromaddr,&addrlen);
-  if ((n >= 0)&&(AnodeSystemTransport__populate_network_endpoint(&fromaddr,&tmp_ep))) {
-    entry_idx = AnodeSystemTransport__add_entry(transport);
-    newsock = &(transport->sockets[entry_idx]);
-
-    newsock->base.type = ANODE_SOCKET_STREAM_CONNECTION;
-    newsock->base.state = ANODE_SOCKET_OPEN;
-    Anode_memcpy(&newsock->base.endpoint,&tmp_ep,sizeof(AnodeNetworkEndpoint));
-    newsock->base.class_name = AnodeSystemTransport_CLASS;
-    newsock->base.user_ptr[0] = NULL;
-    newsock->base.user_ptr[1] = NULL;
-    newsock->base.event_handler = NULL;
-    newsock->entry_idx = entry_idx;
-
-    THIS->fds[entry_idx].fd = n;
-    THIS->fds[entry_idx].events = POLLIN;
-    THIS->fds[entry_idx].revents = 0;
-
-    evbuf.type = ANODE_TRANSPORT_EVENT_STREAM_INCOMING_CONNECT;
-    evbuf.transport = (AnodeTransport *)transport;
-    evbuf.sock = (AnodeSocket *)newsock;
-    evbuf.datagram_from = NULL;
-    evbuf.dns_name = NULL;
-    evbuf.dns_addresses = NULL;
-    evbuf.dns_address_count = 0;
-    evbuf.error_code = 0;
-    evbuf.data_length = 0;
-    evbuf.data = NULL;
-
-    if (sock->base.event_handler)
-      sock->base.event_handler(&evbuf);
-    else if (transport->default_event_handler)
-      transport->default_event_handler(&evbuf);
-  }
-}
-
-static void AnodeSystemTransport__poll_do_read_stream(struct AnodeSystemTransport *transport,int fd,struct AnodeSystemTransport_AnodeSocket *sock)
-{
-  char buf[65536];
-  AnodeEvent evbuf;
-  int n;
-
-  n = recv(fd,buf,sizeof(buf),0);
-  if (n > 0) {
-    evbuf.type = ANODE_TRANSPORT_EVENT_STREAM_DATA_RECEIVED;
-    evbuf.transport = (AnodeTransport *)transport;
-    evbuf.sock = (AnodeSocket *)sock;
-    evbuf.datagram_from = NULL;
-    evbuf.dns_name = NULL;
-    evbuf.dns_addresses = NULL;
-    evbuf.dns_address_count = 0;
-    evbuf.error_code = 0;
-    evbuf.data_length = n;
-    evbuf.data = buf;
-
-    if (sock->base.event_handler)
-      sock->base.event_handler(&evbuf);
-    else if (transport->default_event_handler)
-      transport->default_event_handler(&evbuf);
-  } else AnodeSystemTransport__do_close(transport,sock,ANODE_ERR_CONNECTION_CLOSED_BY_REMOTE,1);
-}
-
-static void AnodeSystemTransport__poll_do_stream_available_for_write(struct AnodeSystemTransport *transport,int fd,struct AnodeSystemTransport_AnodeSocket *sock)
-{
-  AnodeEvent evbuf;
-
-  evbuf.type = ANODE_TRANSPORT_EVENT_STREAM_DATA_RECEIVED;
-  evbuf.transport = (AnodeTransport *)transport;
-  evbuf.sock = (AnodeSocket *)sock;
-  evbuf.datagram_from = NULL;
-  evbuf.dns_name = NULL;
-  evbuf.dns_addresses = NULL;
-  evbuf.dns_address_count = 0;
-  evbuf.error_code = 0;
-  evbuf.data_length = 0;
-  evbuf.data = NULL;
-
-  if (sock->base.event_handler)
-    sock->base.event_handler(&evbuf);
-  else if (transport->default_event_handler)
-    transport->default_event_handler(&evbuf);
-}
-
-static void AnodeSystemTransport__poll_do_outgoing_connect(struct AnodeSystemTransport *transport,int fd,struct AnodeSystemTransport_AnodeSocket *sock)
-{
-  AnodeEvent evbuf;
-  int err_code;
-  socklen_t optlen;
-
-  optlen = sizeof(err_code);
-  if (getsockopt(fd,SOL_SOCKET,SO_ERROR,(void *)&err_code,&optlen)) {
-    /* Error getting result, so we assume a failure */
-    evbuf.type = ANODE_TRANSPORT_EVENT_STREAM_OUTGOING_CONNECT_FAILED;
-    evbuf.transport = (AnodeTransport *)transport;
-    evbuf.sock = (AnodeSocket *)sock;
-    evbuf.datagram_from = NULL;
-    evbuf.dns_name = NULL;
-    evbuf.dns_addresses = NULL;
-    evbuf.dns_address_count = 0;
-    evbuf.error_code = ANODE_ERR_CONNECT_FAILED;
-    evbuf.data_length = 0;
-    evbuf.data = NULL;
-
-    AnodeSystemTransport__do_close(transport,sock,0,0);
-  } else if (err_code) {
-    /* Error code is nonzero, so connect failed */
-    evbuf.type = ANODE_TRANSPORT_EVENT_STREAM_OUTGOING_CONNECT_FAILED;
-    evbuf.transport = (AnodeTransport *)transport;
-    evbuf.sock = (AnodeSocket *)sock;
-    evbuf.datagram_from = NULL;
-    evbuf.dns_name = NULL;
-    evbuf.dns_addresses = NULL;
-    evbuf.dns_address_count = 0;
-    evbuf.error_code = ANODE_ERR_CONNECT_FAILED;
-    evbuf.data_length = 0;
-    evbuf.data = NULL;
-
-    AnodeSystemTransport__do_close(transport,sock,0,0);
-  } else {
-    /* Connect succeeded */
-    evbuf.type = ANODE_TRANSPORT_EVENT_STREAM_OUTGOING_CONNECT_ESTABLISHED;
-    evbuf.transport = (AnodeTransport *)transport;
-    evbuf.sock = (AnodeSocket *)sock;
-    evbuf.datagram_from = NULL;
-    evbuf.dns_name = NULL;
-    evbuf.dns_addresses = NULL;
-    evbuf.dns_address_count = 0;
-    evbuf.error_code = 0;
-    evbuf.data_length = 0;
-    evbuf.data = NULL;
-  }
-
-  if (sock->base.event_handler)
-    sock->base.event_handler(&evbuf);
-  else if (transport->default_event_handler)
-    transport->default_event_handler(&evbuf);
-}
-
-static int AnodeSystemTransport_poll(AnodeTransport *transport)
-{
-  int timeout = -1;
-  unsigned int fd_idx;
-  int event_count = 0;
-  int n;
-
-  if (poll((struct pollfd *)THIS->fds,THIS->fd_count,timeout) > 0) {
-    for(fd_idx=0;fd_idx<THIS->fd_count;++fd_idx) {
-      if ((THIS->fds[fd_idx].revents & (POLLERR|POLLHUP|POLLNVAL))) {
-        if (THIS->sockets[fd_idx].base.type == ANODE_SOCKET_STREAM_CONNECTION) {
-          if (THIS->sockets[fd_idx].base.state == ANODE_SOCKET_CONNECTING)
-            AnodeSystemTransport__poll_do_outgoing_connect(THIS,THIS->fds[fd_idx].fd,&THIS->sockets[fd_idx]);
-          else AnodeSystemTransport__do_close(THIS,&THIS->sockets[fd_idx],ANODE_ERR_CONNECTION_CLOSED_BY_REMOTE,1);
-          ++event_count;
-        }
-      } else {
-        if ((THIS->fds[fd_idx].revents & POLLIN)) {
-          if (THIS->fds[fd_idx].fd == THIS->invoke_pipe[0]) {
-            n = read(THIS->invoke_pipe[0],&(((unsigned char *)(&(THIS->invoke_pipe_buf)))[THIS->invoke_pipe_buf_ptr]),sizeof(THIS->invoke_pipe_buf) - THIS->invoke_pipe_buf_ptr);
-            if (n > 0) {
-              THIS->invoke_pipe_buf_ptr += (unsigned int)n;
-              if (THIS->invoke_pipe_buf_ptr >= sizeof(THIS->invoke_pipe_buf)) {
-                THIS->invoke_pipe_buf_ptr -= sizeof(THIS->invoke_pipe_buf);
-                ((void (*)(void *))(THIS->invoke_pipe_buf[1]))(THIS->invoke_pipe_buf[0]);
-              }
-            }
-          } else {
-            switch(THIS->sockets[fd_idx].base.type) {
-              case ANODE_SOCKET_DATAGRAM:
-                AnodeSystemTransport__poll_do_read_datagram(THIS,THIS->fds[fd_idx].fd,&THIS->sockets[fd_idx]);
-                break;
-              case ANODE_SOCKET_STREAM_LISTEN:
-                AnodeSystemTransport__poll_do_accept_incoming_connection(THIS,THIS->fds[fd_idx].fd,&THIS->sockets[fd_idx]);
-                break;
-              case ANODE_SOCKET_STREAM_CONNECTION:
-                if (THIS->sockets[fd_idx].base.state == ANODE_SOCKET_CONNECTING)
-                  AnodeSystemTransport__poll_do_outgoing_connect(THIS,THIS->fds[fd_idx].fd,&THIS->sockets[fd_idx]);
-                else AnodeSystemTransport__poll_do_read_stream(THIS,THIS->fds[fd_idx].fd,&THIS->sockets[fd_idx]);
-                break;
-            }
-            ++event_count;
-          }
-        }
-
-        if ((THIS->fds[fd_idx].revents & POLLOUT)) {
-          if (THIS->sockets[fd_idx].base.state == ANODE_SOCKET_CONNECTING)
-            AnodeSystemTransport__poll_do_outgoing_connect(THIS,THIS->fds[fd_idx].fd,&THIS->sockets[fd_idx]);
-          else AnodeSystemTransport__poll_do_stream_available_for_write(THIS,THIS->fds[fd_idx].fd,&THIS->sockets[fd_idx]);
-          ++event_count;
-        }
-      }
-    }
-  }
-
-  return event_count;
-}
-
-static int AnodeSystemTransport_supports_address_type(const AnodeTransport *transport,
-  enum AnodeNetworkAddressType at)
-{
-  switch(at) {
-    case ANODE_NETWORK_ADDRESS_IPV4:
-      return 1;
-    case ANODE_NETWORK_ADDRESS_IPV6:
-      return 1;
-    default:
-      if (THIS->base)
-        return THIS->base->supports_address_type(THIS->base,at);
-      return 0;
-  }
-}
-
-static AnodeTransport *AnodeSystemTransport_base_instance(const AnodeTransport *transport)
-{
-  return THIS->base;
-}
-
-static const char *AnodeSystemTransport_class_name(AnodeTransport *transport)
-{
-  return AnodeSystemTransport_CLASS;
-}
-
-static void AnodeSystemTransport_delete(AnodeTransport *transport)
-{
-  close(THIS->invoke_pipe[0]);
-  close(THIS->invoke_pipe[1]);
-
-  AnodeMutex_destroy(&THIS->invoke_pipe_m);
-
-  if (THIS->fds) free(THIS->fds);
-  if (THIS->sockets) free(THIS->sockets);
-
-  if (THIS->base) THIS->base->delete(THIS->base);
-
-  free(transport);
-}
-
-/* ======================================================================== */
-
-AnodeTransport *AnodeSystemTransport_new(AnodeTransport *base)
-{
-  struct AnodeSystemTransport *t;
-  unsigned int entry_idx;
-
-  t = malloc(sizeof(struct AnodeSystemTransport));
-  if (!t) return (AnodeTransport *)0;
-  Anode_zero(t,sizeof(struct AnodeSystemTransport));
-
-  t->interface.invoke = &AnodeSystemTransport_invoke;
-  t->interface.dns_resolve = &AnodeSystemTransport_dns_resolve;
-  t->interface.datagram_listen = &AnodeSystemTransport_datagram_listen;
-  t->interface.stream_listen = &AnodeSystemTransport_stream_listen;
-  t->interface.datagram_send = &AnodeSystemTransport_datagram_send;
-  t->interface.stream_connect = &AnodeSystemTransport_stream_connect;
-  t->interface.stream_start_writing = &AnodeSystemTransport_stream_start_writing;
-  t->interface.stream_stop_writing = &AnodeSystemTransport_stream_stop_writing;
-  t->interface.stream_send = &AnodeSystemTransport_stream_send;
-  t->interface.close = &AnodeSystemTransport_close;
-  t->interface.poll = &AnodeSystemTransport_poll;
-  t->interface.supports_address_type = &AnodeSystemTransport_supports_address_type;
-  t->interface.base_instance = &AnodeSystemTransport_base_instance;
-  t->interface.class_name = &AnodeSystemTransport_class_name;
-  t->interface.delete = &AnodeSystemTransport_delete;
-
-  t->base = base;
-
-  pipe(t->invoke_pipe);
-  fcntl(t->invoke_pipe[0],F_SETFL,O_NONBLOCK);
-  entry_idx = AnodeSystemTransport__add_entry(t);
-  t->fds[entry_idx].fd = t->invoke_pipe[0];
-  t->fds[entry_idx].events = POLLIN;
-  t->fds[entry_idx].revents = 0;
-  AnodeMutex_init(&t->invoke_pipe_m);
-
-  return (AnodeTransport *)t;
-}
diff --git a/attic/historic/anode/libanode/tests/Makefile b/attic/historic/anode/libanode/tests/Makefile
deleted file mode 100644
index a479092c2..000000000
--- a/attic/historic/anode/libanode/tests/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-all: force clean anode-utils-test anode-zone-test aes-test ec-test
-
-aes-test:
-	gcc -Wall -O6 -ftree-vectorize -std=c99 -o aes-test aes-test.c ../aes_digest.c -lcrypto
-
-http_client-test:
-	gcc -O0 -g -std=c99 -o http_client-test http_client-test.c ../anode-utils.c ../misc.c ../http_client.c ../dictionary.c ../iptransport.c ../anode-transport.c -lcrypto
-
-anode-utils-test:
-	gcc -O0 -g -std=c99 -o anode-utils-test anode-utils-test.c ../anode-utils.c ../misc.c
-
-ec-test:
-	gcc -O0 -g -std=c99 -o ec-test ec-test.c ../impl/ec.c ../impl/misc.c -lcrypto
-
-anode-zone-test:
-	gcc -O0 -g -std=c99 -o anode-zone-test anode-zone-test.c ../anode-zone.c ../http_client.c ../dictionary.c ../misc.c ../anode-transport.c ../iptransport.c ../environment.c
-
-system_transport-test:
-	gcc -O0 -g -std=c99 -o system_transport-test system_transport-test.c ../system_transport.c ../network_address.c ../address.c ../aes_digest.c ../impl/misc.c ../impl/thread.c ../impl/dns_txt.c ../impl/aes.c -lresolv -lcrypto
-
-clean:	force
-	rm -rf *.dSYM
-	rm -f http_client-test anode-utils-test anode-zone-test ec-test aes-test system_transport-test
-
-force: ;
diff --git a/attic/historic/anode/libanode/tests/aes-test.c b/attic/historic/anode/libanode/tests/aes-test.c
deleted file mode 100644
index bca63b892..000000000
--- a/attic/historic/anode/libanode/tests/aes-test.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <time.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "../impl/aes.h"
-#include "../anode.h"
-
-static const unsigned char AES_TEST_KEY[32] = {
-  0x08,0x09,0x0A,0x0B,0x0D,0x0E,0x0F,0x10,0x12,0x13,0x14,0x15,0x17,0x18,0x19,0x1A,
-  0x1C,0x1D,0x1E,0x1F,0x21,0x22,0x23,0x24,0x26,0x27,0x28,0x29,0x2B,0x2C,0x2D,0x2E
-};
-static const unsigned char AES_TEST_IN[16] = {
-  0x06,0x9A,0x00,0x7F,0xC7,0x6A,0x45,0x9F,0x98,0xBA,0xF9,0x17,0xFE,0xDF,0x95,0x21
-};
-static const unsigned char AES_TEST_OUT[16] = {
-  0x08,0x0e,0x95,0x17,0xeb,0x16,0x77,0x71,0x9a,0xcf,0x72,0x80,0x86,0x04,0x0a,0xe3
-};
-
-static const unsigned char CMAC_TEST_KEY[32] = {
-  0x60,0x3d,0xeb,0x10,0x15,0xca,0x71,0xbe,0x2b,0x73,0xae,0xf0,0x85,0x7d,0x77,0x81,
-  0x1f,0x35,0x2c,0x07,0x3b,0x61,0x08,0xd7,0x2d,0x98,0x10,0xa3,0x09,0x14,0xdf,0xf4
-};
-
-static const unsigned char CMAC_TEST1_OUT[16] = {
-  0x02,0x89,0x62,0xf6,0x1b,0x7b,0xf8,0x9e,0xfc,0x6b,0x55,0x1f,0x46,0x67,0xd9,0x83
-};
-
-static const unsigned char CMAC_TEST2_IN[16] = {
-  0x6b,0xc1,0xbe,0xe2,0x2e,0x40,0x9f,0x96,0xe9,0x3d,0x7e,0x11,0x73,0x93,0x17,0x2a
-};
-static const unsigned char CMAC_TEST2_OUT[16] = {
-  0x28,0xa7,0x02,0x3f,0x45,0x2e,0x8f,0x82,0xbd,0x4b,0xf2,0x8d,0x8c,0x37,0xc3,0x5c
-};
-
-static const unsigned char CMAC_TEST3_IN[40] = {
-  0x6b,0xc1,0xbe,0xe2,0x2e,0x40,0x9f,0x96,0xe9,0x3d,0x7e,0x11,0x73,0x93,0x17,0x2a,
-  0xae,0x2d,0x8a,0x57,0x1e,0x03,0xac,0x9c,0x9e,0xb7,0x6f,0xac,0x45,0xaf,0x8e,0x51,
-  0x30,0xc8,0x1c,0x46,0xa3,0x5c,0xe4,0x11  
-};
-static const unsigned char CMAC_TEST3_OUT[16] = {
-  0xaa,0xf3,0xd8,0xf1,0xde,0x56,0x40,0xc2,0x32,0xf5,0xb1,0x69,0xb9,0xc9,0x11,0xe6
-};
-
-static const unsigned char CMAC_TEST4_IN[64] = {
-  0x6b,0xc1,0xbe,0xe2,0x2e,0x40,0x9f,0x96,0xe9,0x3d,0x7e,0x11,0x73,0x93,0x17,0x2a,
-  0xae,0x2d,0x8a,0x57,0x1e,0x03,0xac,0x9c,0x9e,0xb7,0x6f,0xac,0x45,0xaf,0x8e,0x51,
-  0x30,0xc8,0x1c,0x46,0xa3,0x5c,0xe4,0x11,0xe5,0xfb,0xc1,0x19,0x1a,0x0a,0x52,0xef,
-  0xf6,0x9f,0x24,0x45,0xdf,0x4f,0x9b,0x17,0xad,0x2b,0x41,0x7b,0xe6,0x6c,0x37,0x10
-};
-static const unsigned char CMAC_TEST4_OUT[16] = {
-  0xe1,0x99,0x21,0x90,0x54,0x9f,0x6e,0xd5,0x69,0x6a,0x2c,0x05,0x6c,0x31,0x54,0x10
-};
-
-static void test_cmac(const AnodeAesExpandedKey *expkey,const unsigned char *in,unsigned int inlen,const unsigned char *expected)
-{
-  unsigned int i;
-  unsigned char out[16];
-
-  printf("Testing CMAC with %u byte input:\n",inlen);
-  printf("  IN:  ");
-  for(i=0;i<inlen;++i)
-    printf("%.2x",(int)in[i]);
-  printf("\n");
-  printf("  EXP: ");
-  for(i=0;i<16;++i)
-    printf("%.2x",(int)expected[i]);
-  printf("\n");
-  Anode_cmac_aes256(expkey,in,inlen,out);
-  printf("  OUT: ");
-  for(i=0;i<16;++i)
-    printf("%.2x",(int)out[i]);
-  printf("\n");
-  if (memcmp(expected,out,16)) {
-    printf("FAILED!\n");
-    exit(1);
-  } else printf("Passed.\n");
-}
-
-static void test_cfb(const AnodeAesExpandedKey *expkey,const unsigned char *in,unsigned int inlen,unsigned char *iv,const unsigned char *expected)
-{
-  unsigned char tmp[131072];
-  unsigned char tmp2[131072];
-  unsigned char tmpiv[16];
-
-  printf("Testing AES-256 CFB mode with %u bytes: ",inlen);
-  fflush(stdout);
-
-  memcpy(tmpiv,iv,16);
-  Anode_aes256_cfb_encrypt(expkey,in,tmp,tmpiv,inlen);
-  if (!memcmp(tmp,expected,inlen)) {
-    printf("FAILED (didn't encrypt)!\n");
-    exit(1);
-  }
-  memcpy(tmpiv,iv,16);
-  Anode_aes256_cfb_decrypt(expkey,tmp,tmp2,tmpiv,inlen);
-  if (memcmp(tmp2,expected,inlen)) {
-    printf("FAILED (didn't encrypt)!\n");
-    exit(1);
-  } else printf("Passed.\n");
-}
-
-static const char *AES_DIGEST_TEST_1 = "test";
-static const char *AES_DIGEST_TEST_2 = "supercalifragilisticexpealidocious";
-static const char *AES_DIGEST_TEST_3 = "12345678";
-static const char *AES_DIGEST_TEST_4 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-
-int main(int argc,char **argv)
-{
-  AnodeAesExpandedKey expkey;
-  unsigned int i;
-  unsigned char aestestbuf[16];
-  unsigned char cfbin[131072];
-  unsigned char iv[16];
-
-  printf("Testing AES-256:");
-  Anode_aes256_expand_key(AES_TEST_KEY,&expkey);
-  printf("  IN:  ");
-  for(i=0;i<16;++i)
-    printf("%.2x",(int)AES_TEST_IN[i]);
-  printf("\n");
-  printf("  EXP: ");
-  for(i=0;i<16;++i)
-    printf("%.2x",(int)AES_TEST_OUT[i]);
-  printf("\n");
-  Anode_aes256_encrypt(&expkey,AES_TEST_IN,aestestbuf);
-  printf("  OUT: ");
-  for(i=0;i<16;++i)
-    printf("%.2x",(int)aestestbuf[i]);
-  printf("\n");
-  if (memcmp(AES_TEST_OUT,aestestbuf,16)) {
-    printf("FAILED!\n");
-    return 1;
-  } else printf("Passed.\n");
-  printf("\n");
-
-  Anode_aes256_expand_key(CMAC_TEST_KEY,&expkey);
-  test_cmac(&expkey,(unsigned char *)0,0,CMAC_TEST1_OUT);
-  test_cmac(&expkey,CMAC_TEST2_IN,16,CMAC_TEST2_OUT);
-  test_cmac(&expkey,CMAC_TEST3_IN,40,CMAC_TEST3_OUT);
-  test_cmac(&expkey,CMAC_TEST4_IN,64,CMAC_TEST4_OUT);
-  printf("\n");
-
-  for(i=0;i<131072;++i)
-    cfbin[i] = (unsigned char)(i & 0xff);
-  for(i=0;i<16;++i)
-    iv[i] = (unsigned char)(i & 0xff);
-  for(i=12345;i<131072;i+=7777)
-    test_cfb(&expkey,cfbin,i,iv,cfbin);
-
-  printf("\nTesting AES-DIGEST...\n");
-  printf("0 bytes: ");
-  Anode_aes_digest(cfbin,0,iv);
-  for(i=0;i<16;++i) printf("%.2x",(unsigned int)iv[i]);
-  printf("\n");
-  printf("%d bytes: ",(int)strlen(AES_DIGEST_TEST_1));
-  Anode_aes_digest(AES_DIGEST_TEST_1,strlen(AES_DIGEST_TEST_1),iv);
-  for(i=0;i<16;++i) printf("%.2x",(unsigned int)iv[i]);
-  printf("\n");
-  printf("%d bytes: ",(int)strlen(AES_DIGEST_TEST_2));
-  Anode_aes_digest(AES_DIGEST_TEST_2,strlen(AES_DIGEST_TEST_2),iv);
-  for(i=0;i<16;++i) printf("%.2x",(unsigned int)iv[i]);
-  printf("\n");
-  printf("%d bytes: ",(int)strlen(AES_DIGEST_TEST_3));
-  Anode_aes_digest(AES_DIGEST_TEST_3,strlen(AES_DIGEST_TEST_3),iv);
-  for(i=0;i<16;++i) printf("%.2x",(unsigned int)iv[i]);
-  printf("\n");
-  printf("%d bytes: ",(int)strlen(AES_DIGEST_TEST_4));
-  Anode_aes_digest(AES_DIGEST_TEST_4,strlen(AES_DIGEST_TEST_4),iv);
-  for(i=0;i<16;++i) printf("%.2x",(unsigned int)iv[i]);
-  printf("\n");
-
-  return 0;
-}
-
diff --git a/attic/historic/anode/libanode/tests/anode-secure_random-test.c b/attic/historic/anode/libanode/tests/anode-secure_random-test.c
deleted file mode 100644
index a69836537..000000000
--- a/attic/historic/anode/libanode/tests/anode-secure_random-test.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "../anode.h"
-#include "../misc.h"
-
-int main(int argc,char **argv)
-{
-  unsigned char test[10005];
-  unsigned int i;
-  AnodeSecureRandom srng;
-
-  AnodeSecureRandom_init(&srng);
-
-  AnodeSecureRandom_gen_bytes(&srng,test,sizeof(test));
-
-  for(i=0;i<sizeof(test);++i) {
-    printf("%.2x",(unsigned int)test[i]);
-    if ((i % 20) == 19)
-      printf("\n");
-  }
-  printf("\n");
-}
diff --git a/attic/historic/anode/libanode/tests/anode-utils-test.c b/attic/historic/anode/libanode/tests/anode-utils-test.c
deleted file mode 100644
index 85bfe3247..000000000
--- a/attic/historic/anode/libanode/tests/anode-utils-test.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "../anode.h"
-#include "../misc.h"
-
-static const char *testuris[22] = {
-  "http://www.test.com",
-  "http://www.test.com/",
-  "http://www.test.com/path/to/something",
-  "http://user@www.test.com",
-  "http://user@www.test.com/path/to/something",
-  "http://user:password@www.test.com/path/to/something",
-  "http://www.test.com/path/to/something?query=foo&bar=baz",
-  "http://www.test.com/path/to/something#fragment",
-  "http://www.test.com/path/to/something?query=foo&bar=baz#fragment",
-  "http://user:password@www.test.com/path/to/something#fragment",
-  "http://user:password@www.test.com/path/to/something?query=foo&bar=baz#fragment",
-  "http://@www.test.com/",
-  "http://:@www.test.com/",
-  "http://www.test.com:8080/path/to/something",
-  "http://user:password@www.test.com:8080/path/to/something?query=foo#fragment",
-  "http://",
-  "http://www.test.com/path/to/something?#",
-  "http://www.test.com/path/to/something?#fragment",
-  "http:",
-  "http",
-  "mailto:this_is_a_urn@somedomain.com",
-  ""
-};
-
-int main(int argc,char **argv)
-{
-  int i,r;
-  char reconstbuf[2048];
-  char *reconst;
-  AnodeURI uri;
-
-  for(i=0;i<22;++i) {
-    printf("\"%s\":\n",testuris[i]);
-    r = AnodeURI_parse(&uri,testuris[i]);
-    if (r) {
-      printf("  error: %d\n",r);
-    } else {
-      printf("  scheme: %s\n",uri.scheme);
-      printf("  username: %s\n",uri.username);
-      printf("  password: %s\n",uri.password);
-      printf("  host: %s\n",uri.host);
-      printf("  port: %d\n",uri.port);
-      printf("  path: %s\n",uri.path);
-      printf("  query: %s\n",uri.query);
-      printf("  fragment: %s\n",uri.fragment);
-    }
-    reconst = AnodeURI_to_string(&uri,reconstbuf,sizeof(reconstbuf));
-    printf("Reconstituted URI: %s\n",reconst ? reconst : "(null)");
-    printf("\n");
-  }
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/tests/anode-zone-test.c b/attic/historic/anode/libanode/tests/anode-zone-test.c
deleted file mode 100644
index 08396716c..000000000
--- a/attic/historic/anode/libanode/tests/anode-zone-test.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "../anode.h"
-#include "../dictionary.h"
-
-static int got_it = 0;
-
-static void zone_lookup_handler(void *ptr,long zone_id,AnodeZone *zone)
-{
-  if (zone)
-    printf("got %.8lx: %d entries\n",(unsigned long)zone_id & 0xffffffff,((struct AnodeDictionary *)zone)->size);
-  else printf("failed.\n");
-  got_it = 1;
-}
-
-int main(int argc,char **argv)
-{
-  AnodeTransportEngine transport;
-
-  Anode_init_ip_transport_engine(&transport);
-
-  AnodeZone_lookup(&transport,0,0,&zone_lookup_handler);
-
-  while (!got_it)
-    transport.poll(&transport);
-
-  transport.destroy(&transport);
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/tests/dictionary-test.c b/attic/historic/anode/libanode/tests/dictionary-test.c
deleted file mode 100644
index 12a5fb2fd..000000000
--- a/attic/historic/anode/libanode/tests/dictionary-test.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-#include "../dictionary.h"
-
-static const char *HASH_TESTS[16] = {
-  "test",
-  "testt",
-  "",
-  "foo",
-  "fooo",
-  "1",
-  "2",
-  "3",
-  "4",
-  "11",
-  "22",
-  "33",
-  "44",
-  "adklfjklejrer",
-  "erngnetbekjrq",
-  "erklerqqqqre"
-};
-
-int diterate(void *arg,const char *key,const char *value)
-{
-  printf("  %s: %s\n",key ? key : "(null)",value ? value : "(null)");
-  return 1;
-}
-
-int main(int argc,char **argv)
-{
-  char tmp[1024];
-  char fuzzparam1[16],fuzzparam2[16],fuzzparam3[16];
-  struct AnodeDictionary d;
-  unsigned int i,j,k,cs;
-
-  srandom(time(0));
-
-  printf("Trying out hash function a little...\n");
-  for(i=0;i<16;++i)
-    printf("  %s: %u\n",HASH_TESTS[i],(unsigned int)AnodeDictionary__get_bucket(HASH_TESTS[i]));
-
-  for(cs=0;cs<2;++cs) {
-    printf("\nTesting with case sensitivity = %d\n",cs);
-    AnodeDictionary_init(&d,cs);
-
-    printf("\nTesting dictionary by adding and retrieving some keys...\n");
-    AnodeDictionary_put(&d,"test1","This is the first test");
-    AnodeDictionary_put(&d,"test2","This is the second test");
-    AnodeDictionary_put(&d,"test3","This is the third test (lower case)");
-    AnodeDictionary_put(&d,"TEST3","This is the third test (UPPER CASE)");
-    AnodeDictionary_iterate(&d,(void *)0,&diterate);
-    if (d.size != (cs ? 4 : 3)) {
-      printf("Failed (size).\n");
-      return 1;
-    }
-
-    AnodeDictionary_clear(&d);
-    if (d.size||(AnodeDictionary_get(&d,"test1"))) {
-      printf("Failed (clear).\n");
-      return 1;
-    }
-
-    printf("\nTesting read, trial 1: simple key=value with unterminated line\n");
-    strcpy(tmp,"foo=bar\nbar=baz\ntest1=Happy happy joyjoy!\ntest2=foobarbaz\nlinewithnocr=thisworked");  
-    AnodeDictionary_read(&d,tmp,"\r\n","=","",'\\',0,0);
-    printf("Results:\n");
-    AnodeDictionary_iterate(&d,(void *)0,&diterate);
-    AnodeDictionary_clear(&d);
-
-    printf("\nTesting read, trial 2: key=value with escape chars, escaped CRs\n");
-    strcpy(tmp,"foo=bar\r\nbar==baz\nte\\=st1=\\=Happy happy joyjoy!\ntest2=foobarbaz\\\nfoobarbaz on next line\r\n");  
-    AnodeDictionary_read(&d,tmp,"\r\n","=","",'\\',0,0);
-    printf("Results:\n");
-    AnodeDictionary_iterate(&d,(void *)0,&diterate);
-    AnodeDictionary_clear(&d);
-
-    printf("\nTesting read, trial 3: HTTP header-like dictionary\n");
-    strcpy(tmp,"Host: some.host.net\r\nX-Some-Header: foo bar\r\nX-Some-Other-Header: y0y0y0y0y0\r\n");  
-    AnodeDictionary_read(&d,tmp,"\r\n",": ","",0,0,0);
-    printf("Results:\n");
-    AnodeDictionary_iterate(&d,(void *)0,&diterate);
-    AnodeDictionary_clear(&d);
-
-    printf("\nTesting read, trial 4: single line key/value\n");
-    strcpy(tmp,"Header: one line only");
-    AnodeDictionary_read(&d,tmp,"\r\n",": ","",0,0,0);
-    printf("Results:\n");
-    AnodeDictionary_iterate(&d,(void *)0,&diterate);
-    AnodeDictionary_clear(&d);
-
-    printf("\nFuzzing dictionary reader...\n"); fflush(stdout);
-    for(i=0;i<200000;++i) {
-      j = random() % (sizeof(tmp) - 1);
-      for(k=0;k<j;++k) {
-        tmp[k] = (char)((unsigned int)random() >> 3);
-        if (!tmp[k]) tmp[k] = 1;
-      }
-      tmp[j] = (char)0;
-
-      j = random() % (sizeof(fuzzparam1) - 1);
-      for(k=0;k<j;++k) {
-        fuzzparam1[k] = (char)((unsigned int)random() >> 3);
-        if (!fuzzparam1[k]) fuzzparam1[k] = 1;
-      }
-      fuzzparam1[j] = (char)0;
-
-      j = random() % (sizeof(fuzzparam2) - 1);
-      for(k=0;k<j;++k) {
-        fuzzparam1[k] = (char)((unsigned int)random() >> 3);
-        if (!fuzzparam2[k]) fuzzparam2[k] = 1;
-      }
-      fuzzparam2[j] = (char)0;
-
-      j = random() % (sizeof(fuzzparam3) - 1);
-      for(k=0;k<j;++k) {
-        fuzzparam3[k] = (char)((unsigned int)random() >> 3);
-        if (!fuzzparam3[k]) fuzzparam3[k] = 1;
-      }
-      fuzzparam3[j] = (char)0;
-
-      AnodeDictionary_read(&d,tmp,fuzzparam1,fuzzparam2,fuzzparam3,random() & 3,random() & 1,random() & 1);
-      AnodeDictionary_clear(&d);
-    }
-
-    AnodeDictionary_destroy(&d);
-  }
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/tests/ec-test.c b/attic/historic/anode/libanode/tests/ec-test.c
deleted file mode 100644
index 49f04265b..000000000
--- a/attic/historic/anode/libanode/tests/ec-test.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "../impl/ec.h"
-#include "../impl/misc.h"
-
-#define TEST_KEY_LEN 128
-#define AnodeEC_key_to_hex(k,b,l) Anode_to_hex((k)->key,(k)->bytes,(b),l)
-
-int main(int argc,char **argv)
-{
-  struct AnodeECKeyPair pair1;
-  struct AnodeECKeyPair pair2;
-  struct AnodeECKeyPair pair3;
-  unsigned char key[TEST_KEY_LEN];
-  char str[16384];
-
-  printf("Creating key pair #1...\n");
-  if (!AnodeECKeyPair_generate(&pair1)) {
-    printf("Could not create key pair.\n");
-    return 1;
-  }
-  AnodeEC_key_to_hex(&pair1.pub,str,sizeof(str));
-  printf("Public:  %s\n",str);
-  AnodeEC_key_to_hex(&pair1.priv,str,sizeof(str));
-  printf("Private: %s\n\n",str);
-
-  printf("Creating key pair #2...\n");
-  if (!AnodeECKeyPair_generate(&pair2)) {
-    printf("Could not create key pair.\n");
-    return 1;
-  }
-  AnodeEC_key_to_hex(&pair2.pub,str,sizeof(str));
-  printf("Public:  %s\n",str);
-  AnodeEC_key_to_hex(&pair2.priv,str,sizeof(str));
-  printf("Private: %s\n\n",str);
-
-  printf("Key agreement between public #2 and private #1...\n");
-  if (!AnodeECKeyPair_agree(&pair1,&pair2.pub,key,TEST_KEY_LEN)) {
-    printf("Agreement failed.\n");
-    return 1;
-  }
-  Anode_to_hex(key,TEST_KEY_LEN,str,sizeof(str));
-  printf("Agreed secret: %s\n\n",str);
-
-  printf("Key agreement between public #1 and private #2...\n");
-  if (!AnodeECKeyPair_agree(&pair2,&pair1.pub,key,TEST_KEY_LEN)) {
-    printf("Agreement failed.\n");
-    return 1;
-  }
-  Anode_to_hex(key,TEST_KEY_LEN,str,sizeof(str));
-  printf("Agreed secret: %s\n\n",str);
-
-  printf("Testing key pair init function (init #3 from #2's parts)...\n");
-  if (!AnodeECKeyPair_init(&pair3,&(pair2.pub),&(pair2.priv))) {
-    printf("Init failed.\n");
-    return 1;
-  }
-
-  printf("Key agreement between public #1 and private #3...\n");
-  if (!AnodeECKeyPair_agree(&pair3,&pair1.pub,key,TEST_KEY_LEN)) {
-    printf("Agreement failed.\n");
-    return 1;
-  }
-  Anode_to_hex(key,TEST_KEY_LEN,str,sizeof(str));
-  printf("Agreed secret: %s\n\n",str);
-
-  printf("Key agreement between public #1 and private #1...\n");
-  if (!AnodeECKeyPair_agree(&pair1,&pair1.pub,key,TEST_KEY_LEN)) {
-    printf("Agreement failed.\n");
-    return 1;
-  }
-  Anode_to_hex(key,TEST_KEY_LEN,str,sizeof(str));
-  printf("Agreed secret (should not match): %s\n\n",str);
-
-  AnodeECKeyPair_destroy(&pair1);
-  AnodeECKeyPair_destroy(&pair2);
-  AnodeECKeyPair_destroy(&pair3);
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/tests/environment-test.c b/attic/historic/anode/libanode/tests/environment-test.c
deleted file mode 100644
index c481a1296..000000000
--- a/attic/historic/anode/libanode/tests/environment-test.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "../environment.h"
-
-int main(int argc,char **argv)
-{
-  const char *cache = Anode_get_cache();
-
-  printf("Cache folder: %s\n",cache ? cache : "(null)");
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/tests/http_client-test.c b/attic/historic/anode/libanode/tests/http_client-test.c
deleted file mode 100644
index e1f93967f..000000000
--- a/attic/historic/anode/libanode/tests/http_client-test.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <openssl/sha.h>
-#include "../anode.h"
-#include "../misc.h"
-#include "../http_client.h"
-#include "../dictionary.h"
-
-struct TestCase
-{
-  int method;
-  AnodeURI uri;
-  const void *client_data;
-  unsigned int client_data_len;
-  const char *expected_sha1;
-  char actual_sha1[64];
-  int got_it;
-  int keepalive;
-  struct TestCase *next;
-};
-
-#define NUM_TEST_CASES 7
-static struct TestCase test_cases[NUM_TEST_CASES];
-
-static void init_test_cases(int keepalive)
-{
-  AnodeURI_parse(&(test_cases[0].uri),"http://zerotier.com/for_unit_tests/test1.txt");
-  test_cases[0].method = ANODE_HTTP_GET;
-  test_cases[0].client_data_len = 0;
-  test_cases[0].expected_sha1 = "0828324174b10cc867b7255a84a8155cf89e1b8b";
-  test_cases[0].actual_sha1[0] = (char)0;
-  test_cases[0].got_it = 0;
-  test_cases[0].keepalive = keepalive;
-  test_cases[0].next = &(test_cases[1]);
-
-  AnodeURI_parse(&(test_cases[1].uri),"http://zerotier.com/for_unit_tests/test2.bin");
-  test_cases[1].method = ANODE_HTTP_GET;
-  test_cases[1].client_data_len = 0;
-  test_cases[1].expected_sha1 = "6b67c635786ab52666211d02412c0d0f0372980d";
-  test_cases[1].actual_sha1[0] = (char)0;
-  test_cases[1].got_it = 0;
-  test_cases[1].keepalive = keepalive;
-  test_cases[1].next = &(test_cases[2]);
-
-  AnodeURI_parse(&(test_cases[2].uri),"http://zerotier.com/for_unit_tests/test3.bin");
-  test_cases[2].method = ANODE_HTTP_GET;
-  test_cases[2].client_data_len = 0;
-  test_cases[2].expected_sha1 = "efa7722029fdbb6abd0e3ed32a0b44bfb982cff0";
-  test_cases[2].actual_sha1[0] = (char)0;
-  test_cases[2].got_it = 0;
-  test_cases[2].keepalive = keepalive;
-  test_cases[2].next = &(test_cases[3]);
-
-  AnodeURI_parse(&(test_cases[3].uri),"http://zerotier.com/for_unit_tests/test4.bin");
-  test_cases[3].method = ANODE_HTTP_GET;
-  test_cases[3].client_data_len = 0;
-  test_cases[3].expected_sha1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709";
-  test_cases[3].actual_sha1[0] = (char)0;
-  test_cases[3].got_it = 0;
-  test_cases[3].keepalive = keepalive;
-  test_cases[3].next = &(test_cases[4]);
-
-  AnodeURI_parse(&(test_cases[4].uri),"http://zerotier.com/for_unit_tests/echo.php?echo=foobar");
-  test_cases[4].method = ANODE_HTTP_GET;
-  test_cases[4].client_data_len = 0;
-  test_cases[4].expected_sha1 = "8843d7f92416211de9ebb963ff4ce28125932878";
-  test_cases[4].actual_sha1[0] = (char)0;
-  test_cases[4].got_it = 0;
-  test_cases[4].keepalive = keepalive;
-  test_cases[4].next = &(test_cases[5]);
-
-  AnodeURI_parse(&(test_cases[5].uri),"http://zerotier.com/for_unit_tests/echo.php");
-  test_cases[5].method = ANODE_HTTP_POST;
-  test_cases[5].client_data = "echo=foobar";
-  test_cases[5].client_data_len = strlen((char *)test_cases[5].client_data);
-  test_cases[5].expected_sha1 = "8843d7f92416211de9ebb963ff4ce28125932878";
-  test_cases[5].actual_sha1[0] = (char)0;
-  test_cases[5].got_it = 0;
-  test_cases[5].keepalive = keepalive;
-  test_cases[5].next = &(test_cases[6]);
-
-  AnodeURI_parse(&(test_cases[6].uri),"http://zerotier.com/for_unit_tests/test3.bin");
-  test_cases[6].method = ANODE_HTTP_HEAD;
-  test_cases[6].client_data_len = 0;
-  test_cases[6].expected_sha1 = "da39a3ee5e6b4b0d3255bfef95601890afd80709";
-  test_cases[6].actual_sha1[0] = (char)0;
-  test_cases[6].got_it = 0;
-  test_cases[6].keepalive = keepalive;
-  test_cases[6].next = 0;
-}
-
-static int http_handler_dump_headers(void *arg,const char *key,const char *value)
-{
-  printf(" H %s: %s\n",key,value);
-  return 1;
-}
-
-static void http_handler(struct AnodeHttpClient *client)
-{
-  const char *method = "???";
-  char buf[1024];
-  unsigned char sha[20];
-  struct TestCase *test = (struct TestCase *)client->ptr[0];
-
-  switch(client->method) {
-    case ANODE_HTTP_GET:
-      method = "GET";
-      break;
-    case ANODE_HTTP_HEAD:
-      method = "HEAD";
-      break;
-    case ANODE_HTTP_POST:
-      method = "POST";
-      break;
-  }
-
-  if (client->response.code == 200) {
-    SHA1((unsigned char *)client->response.data,client->response.data_length,sha);
-    Anode_to_hex(sha,20,test->actual_sha1,sizeof(test->actual_sha1));
-    printf("%s %s\n * SHA1: %s exp: %s\n",method,AnodeURI_to_string(&(test->uri),buf,sizeof(buf)),test->actual_sha1,test->expected_sha1);
-    if (strcmp(test->actual_sha1,test->expected_sha1))
-      printf(" ! SHA1 MISMATCH!\n");
-    AnodeDictionary_iterate(&(client->response.headers),0,&http_handler_dump_headers);
-  } else printf("%s %s: ERROR: %d\n",method,AnodeURI_to_string(&(test->uri),buf,sizeof(buf)),client->response.code);
-
-  test->got_it = 1;
-
-  if (!test->keepalive)
-    AnodeHttpClient_free(client);
-  else {
-    test = test->next;
-    if (test) {
-      memcpy((void *)&(client->uri),(const void *)&(test->uri),sizeof(AnodeURI));
-
-      client->data = test->client_data;
-      client->data_length = test->client_data_len;
-      client->ptr[0] = test;
-      client->keepalive = test->keepalive;
-      client->method = test->method;
-      client->handler = &http_handler;
-
-      AnodeHttpClient_send(client);
-    } else {
-      AnodeHttpClient_free(client);
-    }
-  }
-}
-
-int main(int argc,char **argv)
-{
-  struct AnodeHttpClient *client;
-  AnodeTransportEngine transport_engine;
-  int i;
-
-  if (Anode_init_ip_transport_engine(&transport_engine)) {
-    printf("Failed (transport engine init)\n");
-    return 1;
-  }
-
-  printf("Testing without keepalive...\n\n");
-  init_test_cases(0);
-  for(i=0;i<NUM_TEST_CASES;++i) {
-    client = AnodeHttpClient_new(&transport_engine);
-
-    memcpy((void *)&(client->uri),(const void *)&(test_cases[i].uri),sizeof(AnodeURI));
-    client->data = test_cases[i].client_data;
-    client->data_length = test_cases[i].client_data_len;
-    client->ptr[0] = &test_cases[i];
-    client->keepalive = test_cases[i].keepalive;
-    client->method = test_cases[i].method;
-    client->handler = &http_handler;
-
-    AnodeHttpClient_send(client);
-  }
-
-  for(;;) {
-    for(i=0;i<NUM_TEST_CASES;++i) {
-      if (!test_cases[i].got_it)
-        break;
-    }
-    if (i == NUM_TEST_CASES)
-      break;
-    transport_engine.poll(&transport_engine);
-  }
-  printf("\n\n");
-
-  printf("Testing with keepalive...\n\n");
-  init_test_cases(1);
-
-  client = AnodeHttpClient_new(&transport_engine);
-
-  i = 0;
-  memcpy((void *)&(client->uri),(const void *)&(test_cases[i].uri),sizeof(AnodeURI));
-  client->data = test_cases[i].client_data;
-  client->data_length = test_cases[i].client_data_len;
-  client->ptr[0] = &test_cases[i];
-  client->keepalive = test_cases[i].keepalive;
-  client->method = test_cases[i].method;
-  client->handler = &http_handler;
-
-  AnodeHttpClient_send(client);
-
-  for(;;) {
-    for(i=0;i<NUM_TEST_CASES;++i) {
-      if (!test_cases[i].got_it)
-        break;
-    }
-    if (i == NUM_TEST_CASES)
-      break;
-    transport_engine.poll(&transport_engine);
-  }
-
-  transport_engine.destroy(&transport_engine);
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/tests/misc-test.c b/attic/historic/anode/libanode/tests/misc-test.c
deleted file mode 100644
index e5b9085f9..000000000
--- a/attic/historic/anode/libanode/tests/misc-test.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-#include "../misc.h"
-
-int main(int argc,char **argv)
-{
-  const char *base32TestStr = "asdf";
-  char *fields[16];
-  char buf[1024];
-  char buf2[1024];
-  char buf3[4096];
-  unsigned int i;
-  unsigned long tmpl,tmpl2;
-  unsigned long long tmp64;
-
-  srand(time(0));
-
-  Anode_base32_5_to_8((const unsigned char *)base32TestStr,buf);
-  printf("Base32 from test string: %s\n",buf);
-  Anode_base32_8_to_5("MFZWIZQA",(unsigned char *)buf2);
-  printf("Test string from Base32 (upper case): %s\n",buf2);
-  Anode_base32_8_to_5("mfzwizqa",(unsigned char *)buf2);
-  printf("Test string from Base32 (lower case): %s\n",buf2);
-  printf("Testing variable length encoding/decoded with pad5 functions...\n");
-  for(i=0;i<1024;++i) {
-    tmpl = rand() % (sizeof(buf) - 8);
-    if (!tmpl)
-      tmpl = 1;
-    for(tmpl2=0;tmpl2<tmpl;++tmpl2)
-      buf[tmpl2] = (buf2[tmpl2] = (char)(rand() >> 3));
-    if (!Anode_base32_encode_pad5(buf2,tmpl,buf3,sizeof(buf3))) {
-      printf("Failed (encode failed).\n");
-      return 1;
-    }
-    memset(buf2,0,sizeof(buf2));
-    if (!Anode_base32_decode_pad5(buf3,buf2,sizeof(buf2))) {
-      printf("Failed (decode failed).\n");
-      return 1;
-    }
-    if (memcmp(buf,buf2,tmpl)) {
-      printf("Failed (compare failed).\n");
-      return 1;
-    }
-  }
-
-  printf("Anode_htonll(0x0102030405060708) == 0x%.16llx\n",tmp64 = Anode_htonll(0x0102030405060708ULL));
-  printf("Anode_ntohll(0x%.16llx) == 0x%.16llx\n",tmp64,Anode_ntohll(tmp64));
-  if (Anode_ntohll(tmp64) != 0x0102030405060708ULL) {
-    printf("Failed.\n");
-    return 1;
-  }
-
-  strcpy(buf,"foo bar baz");
-  Anode_trim(buf);
-  printf("Testing string trim: 'foo bar baz' -> '%s'\n",buf);
-  strcpy(buf,"foo bar baz  ");
-  Anode_trim(buf);
-  printf("Testing string trim: 'foo bar baz  ' -> '%s'\n",buf);
-  strcpy(buf,"  foo bar baz");
-  Anode_trim(buf);
-  printf("Testing string trim: '  foo bar baz' -> '%s'\n",buf);
-  strcpy(buf,"  foo bar baz  ");
-  Anode_trim(buf);
-  printf("Testing string trim: '  foo bar baz  ' -> '%s'\n",buf);
-  strcpy(buf,"");
-  Anode_trim(buf);
-  printf("Testing string trim: '' -> '%s'\n",buf);
-  strcpy(buf,"  ");
-  Anode_trim(buf);
-  printf("Testing string trim: '  ' -> '%s'\n",buf);
-
-  printf("Testing string split.\n");
-  strcpy(buf,"66.246.138.121,5323,0");
-  i = Anode_split(buf,';',fields,16);
-  if (i != 1) {
-    printf("Failed.\n");
-    return 1;
-  } else printf("Fields: %s\n",fields[0]);
-  strcpy(buf,"a;b;c");
-  i = Anode_split(buf,';',fields,16);
-  if (i != 3) {
-    printf("Failed.\n");
-    return 1;
-  } else printf("Fields: %s %s %s\n",fields[0],fields[1],fields[2]);
-  strcpy(buf,";;");
-  i = Anode_split(buf,';',fields,16);
-  if (i != 3) {
-    printf("Failed.\n");
-    return 1;
-  } else printf("Fields: %s %s %s\n",fields[0],fields[1],fields[2]);
-  strcpy(buf,"a;b;");
-  i = Anode_split(buf,';',fields,16);
-  if (i != 3) {
-    printf("Failed.\n");
-    return 1;
-  } else printf("Fields: %s %s %s\n",fields[0],fields[1],fields[2]);
-  strcpy(buf,"a;;c");
-  i = Anode_split(buf,';',fields,16);
-  if (i != 3) {
-    printf("Failed.\n");
-    return 1;
-  } else printf("Fields: %s %s %s\n",fields[0],fields[1],fields[2]);
-  strcpy(buf,";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;");
-  i = Anode_split(buf,';',fields,16);
-  if (i != 16) {
-    printf("Failed.\n");
-    return 1;
-  }
-  strcpy(buf,"");
-  i = Anode_split(buf,';',fields,16);
-  if (i != 0) {
-    printf("Failed.\n");
-    return 1;
-  }
-  printf("Passed.\n");
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/tests/system_transport-test.c b/attic/historic/anode/libanode/tests/system_transport-test.c
deleted file mode 100644
index bda575ed8..000000000
--- a/attic/historic/anode/libanode/tests/system_transport-test.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include "../anode.h"
-#include "../impl/thread.h"
-
-static int do_client()
-{
-  AnodeTransport *st;
-  AnodeSocket *udp_sock;
-  int run = 1;
-
-  st = AnodeSystemTransport_new(NULL);
-  if (!st) {
-    printf("FAILED: unable to construct AnodeSystemTransport.\n");
-    return -1;
-  }
-  printf("Created AnodeSystemTransport.\n");
-
-  while (run)
-    st->poll(st);
-}
-
-static int do_server()
-{
-  AnodeTransport *st;
-  AnodeSocket *udp_sock;
-  AnodeSocket *tcp_sock;
-  int run = 1;
-
-  st = AnodeSystemTransport_new(NULL);
-  if (!st) {
-    printf("FAILED: unable to construct AnodeSystemTransport.\n");
-    return -1;
-  }
-  printf("Created AnodeSystemTransport.\n");
-
-  while (run)
-    st->poll(st);
-}
-
-int main(int argc,char **argv)
-{
-  if (argc == 2) {
-    if (!strcmp(argv[1],"client"))
-      return do_client();
-    else if (!strcmp(argv[1],"server"))
-      return do_server();
-  }
-
-  printf("Usage: system_transport-test <client / server>\n");
-  return -1;
-}
diff --git a/attic/historic/anode/libanode/uri.c b/attic/historic/anode/libanode/uri.c
deleted file mode 100644
index ca644b6aa..000000000
--- a/attic/historic/anode/libanode/uri.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "impl/misc.h"
-#include "anode.h"
-
-int AnodeURI_parse(AnodeURI *parsed_uri,const char *uri_string)
-{
-  char buf[sizeof(AnodeURI)];
-  unsigned long ptr = 0;
-  char c;
-  char *p1,*p2;
-
-  Anode_zero((void *)parsed_uri,sizeof(AnodeURI));
-
-  /* Get the scheme */
-  for(;;) {
-    c = *(uri_string++);
-    if (!c) {
-      parsed_uri->scheme[ptr] = (char)0;
-      return ANODE_ERR_INVALID_URI;
-    } else if (c == ':') {
-      parsed_uri->scheme[ptr] = (char)0;
-      break;
-    } else {
-      parsed_uri->scheme[ptr++] = c;
-      if (ptr == sizeof(parsed_uri->scheme))
-        return ANODE_ERR_BUFFER_TOO_SMALL;
-    }
-  }
-
-  if (*uri_string == '/') {
-    /* If it starts with /, it's a URL */
-
-    /* Skip double slash */
-    if (!(*(++uri_string)))
-      return 0; /* Scheme with no path */
-    if (*uri_string == '/') {
-      if (!(*(++uri_string)))
-        return 0; /* Scheme with no path */
-    }
-
-    /* Get the host section and put it in buf[] */
-    ptr = 0;
-    while ((*uri_string)&&(*uri_string != '/')) {
-      buf[ptr++] = *(uri_string++);
-      if (ptr == sizeof(buf))
-        return ANODE_ERR_BUFFER_TOO_SMALL;
-    }
-    buf[ptr] = (char)0;
-
-    /* Parse host section for host, username, password, and port */
-    if (buf[0]) {
-      p1 = (char *)Anode_strchr(buf,'@');
-      if (p1) {
-        *(p1++) = (char)0;
-        if (*p1) {
-          p2 = (char *)Anode_strchr(buf,':');
-          if (p2) {
-            *(p2++) = (char)0;
-            Anode_str_copy(parsed_uri->password,p2,sizeof(parsed_uri->password));
-          }
-          Anode_str_copy(parsed_uri->username,buf,sizeof(parsed_uri->username));
-        } else return ANODE_ERR_INVALID_URI;
-      } else p1 = buf;
-
-      p2 = (char *)Anode_strchr(p1,':');
-      if (p2) {
-        *(p2++) = (char)0;
-        if (*p2)
-          parsed_uri->port = (int)strtoul(p2,(char **)0,10);
-      }
-      Anode_str_copy(parsed_uri->host,p1,sizeof(parsed_uri->host));
-    }
-
-    /* Get the path, query, and fragment section and put it in buf[] */
-    ptr = 0;
-    while ((buf[ptr++] = *(uri_string++))) {
-      if (ptr == sizeof(buf))
-        return ANODE_ERR_BUFFER_TOO_SMALL;
-    }
-
-    /* Parse path section for path, query, and fragment */
-    if (buf[0]) {
-      p1 = (char *)Anode_strchr(buf,'?');
-      if (p1) {
-        *(p1++) = (char)0;
-        p2 = (char *)Anode_strchr(p1,'#');
-        if (p2) {
-          *(p2++) = (char)0;
-          Anode_str_copy(parsed_uri->fragment,p2,sizeof(parsed_uri->fragment));
-        }
-        Anode_str_copy(parsed_uri->query,p1,sizeof(parsed_uri->query));
-      } else {
-        p2 = (char *)Anode_strchr(buf,'#');
-        if (p2) {
-          *(p2++) = (char)0;
-          Anode_str_copy(parsed_uri->fragment,p2,sizeof(parsed_uri->fragment));
-        }
-      }
-      Anode_str_copy(parsed_uri->path,buf,sizeof(parsed_uri->path));
-    }
-  } else {
-    /* Otherwise, it's a URN and what remains is all path */
-    ptr = 0;
-    while ((parsed_uri->path[ptr++] = *(uri_string++))) {
-      if (ptr == sizeof(parsed_uri->path))
-        return ANODE_ERR_BUFFER_TOO_SMALL;
-    }
-  }
-
-  return 0;
-}
-
-char *AnodeURI_to_string(const AnodeURI *uri,char *buf,int len)
-{
-  int i = 0;
-  char portbuf[16];
-  const char *p;
-
-  p = uri->scheme;
-  while (*p) { buf[i++] = *(p++); if (i >= len) return (char *)0; }
-
-  buf[i++] = ':'; if (i >= len) return (char *)0;
-
-  if (uri->host[0]) {
-    buf[i++] = '/'; if (i >= len) return (char *)0;
-    buf[i++] = '/'; if (i >= len) return (char *)0;
-
-    if (uri->username[0]) {
-      p = uri->username;
-      while (*p) { buf[i++] = *(p++); if (i >= len) return (char *)0; }
-      if (uri->password[0]) {
-        buf[i++] = ':'; if (i >= len) return (char *)0;
-        p = uri->password;
-        while (*p) { buf[i++] = *(p++); if (i >= len) return (char *)0; }
-      }
-      buf[i++] = '@'; if (i >= len) return (char *)0;
-    }
-
-    p = uri->host;
-    while (*p) { buf[i++] = *(p++); if (i >= len) return (char *)0; }
-
-    if ((uri->port > 0)&&(uri->port <= 0xffff)) {
-      buf[i++] = ':'; if (i >= len) return (char *)0;
-      snprintf(portbuf,sizeof(portbuf),"%d",uri->port);
-      p = portbuf;
-      while (*p) { buf[i++] = *(p++); if (i >= len) return (char *)0; }
-    }
-  }
-
-  p = uri->path;
-  while (*p) { buf[i++] = *(p++); if (i >= len) return (char *)0; }
-
-  if (uri->query[0]) {
-    buf[i++] = '?'; if (i >= len) return (char *)0;
-    p = uri->query;
-    while (*p) { buf[i++] = *(p++); if (i >= len) return (char *)0; }
-  }
-
-  if (uri->fragment[0]) {
-    buf[i++] = '#'; if (i >= len) return (char *)0;
-    p = uri->fragment;
-    while (*p) { buf[i++] = *(p++); if (i >= len) return (char *)0; }
-  }
-
-  buf[i] = (char)0;
-
-  return buf;
-}
diff --git a/attic/historic/anode/libanode/utils/anode-make-identity.c b/attic/historic/anode/libanode/utils/anode-make-identity.c
deleted file mode 100644
index 99a3897a4..000000000
--- a/attic/historic/anode/libanode/utils/anode-make-identity.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <arpa/inet.h>
-#include "../anode.h"
-#include "../impl/misc.h"
-#include "../impl/types.h"
-
-int main(int argc,char **argv)
-{
-  char str[1024];
-  AnodeZone zone;
-  AnodeIdentity identity;
-
-  if (argc < 2) {
-    printf("Usage: anode-make-identity <32-bit zone ID hex>\n");
-    return 0;
-  }
-
-  *((uint32_t *)zone.bits) = htonl((uint32_t)strtoul(argv[1],(char **)0,16));
-
-  if (AnodeIdentity_generate(&identity,&zone,ANODE_ADDRESS_ANODE_256_40)) {
-    fprintf(stderr,"Error: identity key pair generation failed (check build settings).\n");
-    return 1;
-  }
-  if (AnodeIdentity_to_string(&identity,str,sizeof(str)) <= 0) {
-    fprintf(stderr,"Error: internal error converting identity to string.\n");
-    return -1;
-  }
-
-  printf("%s\n",str);
-
-  return 0;
-}
diff --git a/attic/historic/anode/libanode/zone.c b/attic/historic/anode/libanode/zone.c
deleted file mode 100644
index a6e397ae8..000000000
--- a/attic/historic/anode/libanode/zone.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "impl/types.h"
-#include "impl/misc.h"
-#include "impl/dictionary.h"
-#include "impl/environment.h"
-#include "impl/http_client.h"
-#include "anode.h"
-
-static const char *_MONTHS[12] = { "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" };
-static const char *_DAYS_OF_WEEK[7] = { "Sun","Mon","Tue","Wed","Thu","Fri","Sat" };
-static inline unsigned long get_file_time_for_http(const char *path,char *buf,unsigned int len)
-{
-  struct stat st;
-  struct tm *gmt;
-
-  if (!stat(path,(struct stat *)&st)) {
-    gmt = gmtime(&st.st_mtime);
-    if (gmt) {
-      snprintf(buf,len,"%s, %d %s %d %d:%d:%d GMT",
-        _DAYS_OF_WEEK[gmt->tm_wday],
-        gmt->tm_mday,
-        _MONTHS[gmt->tm_mon],
-        (1900 + gmt->tm_year),
-        gmt->tm_hour,
-        gmt->tm_min,
-        gmt->tm_sec);
-      buf[len - 1] = (char)0;
-      return (unsigned long)st.st_size;
-    }
-  }
-
-  return 0;
-}
-
-struct AnodeZoneLookupJob
-{
-  char cached_zone_file[2048];
-  struct AnodeDictionary *zone_dict;
-  AnodeZone zone;
-  void *ptr;
-  void (*zone_lookup_handler)(void *,const AnodeZone *,AnodeZoneFile *);
-  int had_cached_zone;
-};
-
-static void AnodeZone_lookup_http_handler(struct AnodeHttpClient *client)
-{
-  char *data_tmp;
-  struct AnodeZoneLookupJob *job = (struct AnodeZoneLookupJob *)client->ptr[0];
-  FILE *zf;
-
-  if ((client->response.code == 200)&&(client->response.data_length > 0)) {
-    zf = fopen(job->cached_zone_file,"w");
-    if (zf) {
-      fwrite(client->response.data,1,client->response.data_length,zf);
-      fclose(zf);
-    }
-
-    data_tmp = (char *)malloc(client->response.data_length + 1);
-    Anode_memcpy((void *)data_tmp,client->response.data,client->response.data_length);
-    data_tmp[client->response.data_length] = (char)0;
-
-    AnodeDictionary_clear(job->zone_dict);
-    AnodeDictionary_read(
-      job->zone_dict,
-      data_tmp,
-      "\r\n",
-      "=",
-      ";",
-      '\\',
-      1,1);
-
-    free((void *)data_tmp);
-
-    job->zone_lookup_handler(job->ptr,&job->zone,(AnodeZoneFile *)job->zone_dict);
-  } else if (job->had_cached_zone)
-    job->zone_lookup_handler(job->ptr,&job->zone,(AnodeZoneFile *)job->zone_dict);
-  else {
-    AnodeDictionary_destroy(job->zone_dict);
-    free((void *)job->zone_dict);
-    job->zone_lookup_handler(job->ptr,&job->zone,(AnodeZoneFile *)0);
-  }
-
-  free((void *)job);
-  AnodeHttpClient_free(client);
-}
-
-void AnodeZone_lookup(
-  AnodeTransportEngine *transport,
-  const AnodeZone *zone,
-  void *ptr,
-  void (*zone_lookup_handler)(void *,const AnodeZone *,AnodeZone *))
-{
-  char cached_zones_folder[2048];
-  char cached_zone_file[2048];
-  char if_modified_since[256];
-  unsigned long file_size;
-  struct AnodeZoneLookupJob *job;
-  struct AnodeHttpClient *client;
-  char *file_data;
-  FILE *zf;
-
-  if (Anode_get_cache_sub("zones",cached_zones_folder,sizeof(cached_zones_folder))) {
-    snprintf(cached_zone_file,sizeof(cached_zone_file),"%s%c%.2x%.2x%.2x%.2x.z",cached_zones_folder,ANODE_PATH_SEPARATOR,(unsigned int)zone->bits[0],(unsigned int)zone->bits[1],(unsigned int)zone->bits[2],(unsigned int)zone->bits[3]);
-    cached_zone_file[sizeof(cached_zone_file)-1] = (char)0;
-
-    job = (struct AnodeZoneLookupJob *)malloc(sizeof(struct AnodeZoneLookupJob));
-    Anode_str_copy(job->cached_zone_file,cached_zone_file,sizeof(job->cached_zone_file));
-    job->zone_dict = (struct AnodeDictionary *)malloc(sizeof(struct AnodeDictionary));
-    AnodeDictionary_init(job->zone_dict,0);
-    job->zone.bits[0] = zone->bits[0];
-    job->zone.bits[1] = zone->bits[1];
-    job->zone.bits[2] = zone->bits[2];
-    job->zone.bits[3] = zone->bits[3];
-    job->ptr = ptr;
-    job->zone_lookup_handler = zone_lookup_handler;
-    job->had_cached_zone = 0;
-
-    client = AnodeHttpClient_new(transport);
-
-    Anode_str_copy(client->uri.scheme,"http",sizeof(client->uri.scheme));
-    snprintf(client->uri.host,sizeof(client->uri.host),"a--%.2x%.2x%.2x%.2x.net",(unsigned int)zone->bits[0],(unsigned int)zone->bits[1],(unsigned int)zone->bits[2],(unsigned int)zone->bits[3]);
-    client->uri.host[sizeof(client->uri.host)-1] = (char)0;
-    Anode_str_copy(client->uri.path,"/z",sizeof(client->uri.path));
-
-    client->handler = &AnodeZone_lookup_http_handler;
-    client->ptr[0] = job;
-
-    if ((file_size = get_file_time_for_http(cached_zone_file,if_modified_since,sizeof(if_modified_since)))) {
-      zf = fopen(cached_zone_file,"r");
-      if (zf) {
-        AnodeDictionary_put(&client->headers,"If-Modified-Since",if_modified_since);
-        file_data = (char *)malloc(file_size + 1);
-        if (fread((void *)file_data,1,file_size,zf)) {
-          file_data[file_size] = (char)0;
-          AnodeDictionary_read(
-            job->zone_dict,
-            file_data,
-            "\r\n",
-            "=",
-            ";",
-            '\\',
-            1,1);
-          job->had_cached_zone = 1;
-        }
-        free((void *)file_data);
-        fclose(zf);
-      }
-    }
-
-    AnodeHttpClient_send(client);
-  } else zone_lookup_handler(ptr,zone,(AnodeZone *)0);
-}
-
-const char *AnodeZoneFile_get(AnodeZoneFile *zone,const char *key)
-{
-  return AnodeDictionary_get((struct AnodeDictionary *)zone,key);
-}
-
-void AnodeZoneFile_free(AnodeZoneFile *zone)
-{
-  AnodeDictionary_destroy((struct AnodeDictionary *)zone);
-  free((void *)zone);
-}
diff --git a/attic/historic/anode/libspark/Makefile b/attic/historic/anode/libspark/Makefile
deleted file mode 100644
index 0d3fedd87..000000000
--- a/attic/historic/anode/libspark/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-SYSNAME:=${shell uname}
-SYSNAME!=uname
-include ../config.mk.${SYSNAME}
-
-LIBSPARK_OBJS=
-
-all: libspark
-
-libspark: $(LIBSPARK_OBJS)
-	ar rcs libspark.a $(LIBSPARK_OBJS)
-	ranlib libspark.a
-
-clean: force
-	rm -f *.a *.so *.dylib *.dll *.lib *.exe *.o
-
-force: ;
diff --git a/attic/historic/anode/libspark/experiments/FindGoodSegmentDelimiters.cpp b/attic/historic/anode/libspark/experiments/FindGoodSegmentDelimiters.cpp
deleted file mode 100644
index 9b1ecaa15..000000000
--- a/attic/historic/anode/libspark/experiments/FindGoodSegmentDelimiters.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// Searches for good delimiters to cut streams into relatively well sized
-// segments.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-#include <boost/cstdint.hpp>
-#include <boost/array.hpp>
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
-#include <iostream>
-#include <vector>
-#include <map>
-
-// Desired size range
-#define MIN_DESIRED_SIZE 4096
-#define MAX_DESIRED_SIZE 131072
-
-#define DELIMITER_SET_SIZE 1
-typedef boost::array<boost::uint16_t,DELIMITER_SET_SIZE> DelimArray;
-
-struct BestEntry
-{
-  DelimArray best;
-  double bestScore;
-  std::vector<unsigned char> data;
-};
-
-boost::mutex bestLock;
-boost::mutex outLock;
-std::map<std::string,BestEntry> best;
-
-static void runThread(const std::string &fileName)
-{
-  char tmp[4096];
-
-  boost::mt19937 prng;
-  {
-    boost::uint32_t seed;
-    FILE *ur = fopen("/dev/urandom","r");
-    fread((void *)&seed,1,sizeof(seed),ur);
-    fclose(ur);
-    prng.seed(seed);
-  }
-
-  BestEntry *myEntry;
-  {
-    boost::mutex::scoped_lock l(bestLock);
-    myEntry = &(best[fileName]);
-    myEntry->bestScore = 99999999.0;
-  }
-
-  {
-    boost::mutex::scoped_lock l(outLock);
-
-    std::cout << "*** Reading test data from: " << fileName << std::endl;
-    FILE *f = fopen(fileName.c_str(),"r");
-    if (f) {
-      int n;
-      while ((n = fread((void *)tmp,1,sizeof(tmp),f)) > 0) {
-        for(int i=0;i<n;++i)
-          myEntry->data.push_back((unsigned char)tmp[i]);
-      }
-      fclose(f);
-    }
-
-    if (myEntry->data.size() <= 0) {
-      std::cout << "Error: no data read." << std::endl;
-      exit(1);
-    } else std::cout << "*** Read " << myEntry->data.size() << " bytes of test data." << std::endl;
-
-    std::cout.flush();
-  }
-
-  DelimArray current;
-  for(unsigned int i=0;i<DELIMITER_SET_SIZE;++i)
-    current[i] = (boost::uint16_t)prng();
-
-  for(;;) {
-    unsigned long numTooShort = 0;
-    unsigned long numTooLong = 0;
-    unsigned long numGood = 0;
-
-    boost::uint32_t shiftRegister = 0;
-    unsigned long segSize = 0;
-    for(std::vector<unsigned char>::iterator i=myEntry->data.begin();i!=myEntry->data.end();++i) {
-      shiftRegister <<= 1;
-      shiftRegister |= (((boost::uint32_t)*i) & 1);
-
-      ++segSize;
-
-      boost::uint16_t transformedShiftRegister = (boost::uint16_t)(shiftRegister);
-
-      for(DelimArray::iterator d=current.begin();d!=current.end();++d) {
-        if (transformedShiftRegister == *d) {
-          if (segSize < MIN_DESIRED_SIZE)
-            ++numTooShort;
-          else if (segSize > MAX_DESIRED_SIZE)
-            ++numTooLong;
-          else ++numGood;
-          segSize = 0;
-          break;
-        }
-      }
-    }
-    if (segSize) {
-      if (segSize < MIN_DESIRED_SIZE)
-        ++numTooShort;
-      else if (segSize > MAX_DESIRED_SIZE)
-        ++numTooLong;
-      else ++numGood;
-    }
-
-    if (numGood) {
-      double score = ((double)(numTooShort + numTooLong)) / ((double)numGood);
-
-      if (score < myEntry->bestScore) {
-        myEntry->best = current;
-        myEntry->bestScore = score;
-
-        boost::mutex::scoped_lock l(outLock);
-
-        std::cout << fileName << ": ";
-
-        for(DelimArray::iterator d=current.begin();d!=current.end();++d) {
-          sprintf(tmp,"0x%.4x",(unsigned int)*d);
-          if (d != current.begin())
-            std::cout << ',';
-          std::cout << tmp;
-        }
-
-        std::cout << ": " << numTooShort << " / " << numGood << " / " << numTooLong << " (" << score << ")" << std::endl;
-        std::cout.flush();
-
-        if ((numTooShort == 0)&&(numTooLong == 0))
-          break;
-      }
-    }
-
-    for(DelimArray::iterator i=current.begin();i!=current.end();++i)
-      *i = (boost::uint16_t)prng();
-  }
-}
-
-int main(int argc,char **argv)
-{
-  std::vector< boost::shared_ptr<boost::thread> > threads;
-
-  for(int i=1;i<argc;++i) {
-    boost::shared_ptr<boost::thread> t(new boost::thread(boost::bind(&runThread,std::string(argv[i]))));
-    threads.push_back(t);
-  }
-
-  for(std::vector< boost::shared_ptr<boost::thread> >::iterator i=threads.begin();i!=threads.end();++i)
-    (*i)->join();
-
-  return 0;
-}
diff --git a/attic/historic/anode/libspark/experiments/Makefile b/attic/historic/anode/libspark/experiments/Makefile
deleted file mode 100644
index 83aa4f67b..000000000
--- a/attic/historic/anode/libspark/experiments/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	g++ -O6 -ftree-vectorize -o FindGoodSegmentDelimiters FindGoodSegmentDelimiters.cpp -lboost_thread -lpthread
-
-clean:
-	rm FindGoodSegmentDelimiters
diff --git a/attic/historic/anode/libspark/streamencoder.h b/attic/historic/anode/libspark/streamencoder.h
deleted file mode 100644
index b487ca402..000000000
--- a/attic/historic/anode/libspark/streamencoder.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _SPARK_STREAMENCODER_H
-#define _SPARK_STREAMENCODER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-  unsigned char *input_buf;
-  unsigned long input_buf_capacity;
-  unsigned long input_length;
-
-  unsigned char *stream_out_buf;
-  unsigned long stream_out_buf_capacity;
-  unsigned long stream_out_length;
-
-  void (*data_segment_add_func)(const void *data,unsigned long len,const void *global_hash,unsigned long global_hash_len);
-} SparkStreamEncoder;
-
-/**
- * Initialize a spark stream encoder
- *
- * @param enc Encoder structure to initialize
- * @param data_segment_add_func Function to call to store or cache data
- */
-void SparkStreamEncoder_init(
-  SparkStreamEncoder *enc,
-  void (*data_segment_add_func)(
-    const void *data,
-    unsigned long len,
-    const void *global_hash,
-    unsigned long global_hash_len));
-
-/**
- * Clean up a spark stream encoder structure
- *
- * @param enc Structure to clear
- */
-void SparkStreamEncoder_destroy(SparkStreamEncoder *enc);
-
-/**
- * Add data to encode
- *
- * @param enc Encoder structure
- * @param data Data to encode
- * @param len Length of data in bytes
- * @return Number of bytes of result stream now available
- */
-unsigned long SparkStreamEncoder_put(
-  SparkStreamEncoder *enc,
-  const void *data,
-  unsigned long len);
-
-/**
- * Flush all data currently in input buffer
- *
- * @param enc Encoder structure to flush
- */
-void SparkStreamEncoder_flush(SparkStreamEncoder *enc);
-
-/**
- * @return Number of bytes of output stream available
- */
-static inline unsigned long SparkStreamEncoder_available(SparkStreamEncoder *enc)
-{
-  return enc->stream_out_length;
-}
-
-/**
- * @return Pointer to result stream bytes (may return null if none available)
- */
-static inline const void *SparkStreamEncoder_get(SparkStreamEncoder *enc)
-{
-  return (const void *)(enc->stream_out_buf);
-}
-
-/**
- * @return "Consume" result stream bytes after they're read or sent
- */
-static inline void SparkStreamEncoder_consume(SparkStreamEncoder *enc,unsigned long len)
-{
-  unsigned long i;
-  for(i=len;i<enc->stream_out_length;++i)
-    enc->stream_out_buf[i - len] = enc->stream_out_buf[i];
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/attic/historic/anode/libspark/wrapper.h b/attic/historic/anode/libspark/wrapper.h
deleted file mode 100644
index eb8c593da..000000000
--- a/attic/historic/anode/libspark/wrapper.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* libanode: the Anode C reference implementation
- * Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _SPARK_WRAPPER_H
-#define _SPARK_WRAPPER_H
-
-#include <openssl/sha.h>
-#include "../libanode/aes128.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Spark uses SHA-256 with hash length 32 */
-#define SPARK_HASH_LENGTH 32
-
-// Wrap a segment for forward propagation
-static inline void Spark_wrap(void *data,unsigned long len,void *plaintext_hash_buf,void *global_hash_buf)
-{
-  unsigned char expkey[ANODE_AES128_EXP_KEY_SIZE];
-
-  SHA256((const unsigned char *)data,len,(unsigned char *)plaintext_hash_buf);
-
-  Anode_aes128_expand_key(expkey,(const unsigned char *)plaintext_hash_buf);
-  Anode_aes128_cfb_encrypt(expkey,((const unsigned char *)plaintext_hash_buf) + 16,(unsigned char *)data,len);
-
-  SHA256((const unsigned char *)data,len,(unsigned char *)global_hash_buf);
-}
-
-// Unwrap a segment and check its integrity
-static inline int Spark_unwrap(void *data,unsigned long len,const void *plaintext_hash)
-{
-  unsigned char expkey[ANODE_AES128_EXP_KEY_SIZE];
-  unsigned char check_hash[32];
-  unsigned long i;
-
-  Anode_aes128_expand_key(expkey,(const unsigned char *)plaintext_hash);
-  Anode_aes128_cfb_decrypt(expkey,((const unsigned char *)plaintext_hash) + 16,(unsigned char *)data,len);
-
-  SHA256((const unsigned char *)data,len,check_hash);
-
-  for(i=0;i<32;++i) {
-    if (check_hash[i] != ((const unsigned char *)plaintext_hash)[i])
-      return 0;
-  }
-  return 1;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/attic/world/build.sh b/attic/world/build.sh
deleted file mode 100755
index f3bcfabc9..000000000
--- a/attic/world/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-c++ -std=c++11 -I../.. -I../../ext -I.. -g -o mkworld ../../node/C25519.cpp ../../node/Salsa20.cpp ../../node/SHA512.cpp ../../node/Identity.cpp ../../node/Utils.cpp ../../node/InetAddress.cpp ../../osdep/OSUtils.cpp mkworld.cpp -lm
diff --git a/attic/world/mkworld.cpp b/attic/world/mkworld.cpp
deleted file mode 100644
index ed2c499a0..000000000
--- a/attic/world/mkworld.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This utility makes the World from the configuration specified below.
- * It probably won't be much use to anyone outside ZeroTier, Inc. except
- * for testing and experimentation purposes.
- *
- * If you want to make your own World you must edit this file.
- *
- * When run, it expects two files in the current directory:
- *
- * previous.c25519 - key pair to sign this world (key from previous world)
- * current.c25519 - key pair whose public key should be embedded in this world
- *
- * If these files do not exist, they are both created with the same key pair
- * and a self-signed initial World is born.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-#include <algorithm>
-
-#include <node/Constants.hpp>
-#include <node/World.hpp>
-#include <node/ECC.hpp>
-#include <node/Identity.hpp>
-#include <node/InetAddress.hpp>
-#include <osdep/OSUtils.hpp>
-
-using namespace ZeroTier;
-
-int main(int argc,char **argv)
-{
-	std::string previous,current;
-	if ((!OSUtils::readFile("previous.c25519",previous))||(!OSUtils::readFile("current.c25519",current))) {
-		ECC::Pair np(ECC::generate());
-		previous = std::string();
-		previous.append((const char *)np.pub.data,ZT_C25519_PUBLIC_KEY_LEN);
-		previous.append((const char *)np.priv.data,ZT_C25519_PRIVATE_KEY_LEN);
-		current = previous;
-		OSUtils::writeFile("previous.c25519",previous);
-		OSUtils::writeFile("current.c25519",current);
-		fprintf(stderr,"INFO: created initial world keys: previous.c25519 and current.c25519 (both initially the same)" ZT_EOL_S);
-	}
-
-	if ((previous.length() != (ZT_C25519_PUBLIC_KEY_LEN + ZT_C25519_PRIVATE_KEY_LEN))||(current.length() != (ZT_C25519_PUBLIC_KEY_LEN + ZT_C25519_PRIVATE_KEY_LEN))) {
-		fprintf(stderr,"FATAL: previous.c25519 or current.c25519 empty or invalid" ZT_EOL_S);
-		return 1;
-	}
-	ECC::Pair previousKP;
-	memcpy(previousKP.pub.data,previous.data(),ZT_C25519_PUBLIC_KEY_LEN);
-	memcpy(previousKP.priv.data,previous.data() + ZT_C25519_PUBLIC_KEY_LEN,ZT_C25519_PRIVATE_KEY_LEN);
-	ECC::Pair currentKP;
-	memcpy(currentKP.pub.data,current.data(),ZT_C25519_PUBLIC_KEY_LEN);
-	memcpy(currentKP.priv.data,current.data() + ZT_C25519_PUBLIC_KEY_LEN,ZT_C25519_PRIVATE_KEY_LEN);
-
-	// =========================================================================
-	// EDIT BELOW HERE
-
-	std::vector<World::Root> roots;
-
-	const uint64_t id = ZT_WORLD_ID_EARTH;
-	const uint64_t ts = 1567191349589ULL; // August 30th, 2019
-
-	// Los Angeles
-	roots.push_back(World::Root());
-	roots.back().identity = Identity("3a46f1bf30:0:76e66fab33e28549a62ee2064d1843273c2c300ba45c3f20bef02dbad225723bb59a9bb4b13535730961aeecf5a163ace477cceb0727025b99ac14a5166a09a3");
-	roots.back().stableEndpoints.push_back(InetAddress("185.180.13.82/9993"));
-	roots.back().stableEndpoints.push_back(InetAddress("2a02:6ea0:c815::/9993"));
-
-	// Miami
-	roots.push_back(World::Root());
-	roots.back().identity = Identity("de8950a8b2:0:1b3ada8251b91b6b6fa6535b8c7e2460918f4f729abdec97d3c7f3796868fb02f0de0b0ee554b2d59fc3524743eebfcf5315e790ed6d92db5bd10c28c09b40ef");
-	roots.back().stableEndpoints.push_back(InetAddress("207.246.73.245/443"));
-	roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:9002:5cb:ec4:7aff:fe8f:69d9/443"));
-
-	// Tokyo
-	roots.push_back(World::Root());
-	roots.back().identity = Identity("34e0a5e174:0:93efb50934788f856d5cfb9ca5be88e85b40965586b75befac900df77352c145a1ba7007569d37c77bfe52c0999f3bdc67a47a4a6000b720a883ce47aa2fb7f8");
-	roots.back().stableEndpoints.push_back(InetAddress("147.75.92.2/443"));
-	roots.back().stableEndpoints.push_back(InetAddress("2604:1380:3000:7100::1/443"));
-
-	// Amsterdam
-	roots.push_back(World::Root());
-	roots.back().identity = Identity("992fcf1db7:0:206ed59350b31916f749a1f85dffb3a8787dcbf83b8c6e9448d4e3ea0e3369301be716c3609344a9d1533850fb4460c50af43322bcfc8e13d3301a1f1003ceb6");
-	roots.back().stableEndpoints.push_back(InetAddress("195.181.173.159/443"));
-	roots.back().stableEndpoints.push_back(InetAddress("2a02:6ea0:c024::/443"));
-
-	// Alice
-	//roots.push_back(World::Root());
-	//roots.back().identity = Identity("9d219039f3:0:01f0922a98e3b34ebcbff333269dc265d7a020aab69d72be4d4acc9c8c9294785771256cd1d942a90d1bd1d2dca3ea84ef7d85afe6611fb43ff0b74126d90a6e");
-	//roots.back().stableEndpoints.push_back(InetAddress("188.166.94.177/9993")); // Amsterdam
-	//roots.back().stableEndpoints.push_back(InetAddress("2a03:b0c0:2:d0::7d:1/9993")); // Amsterdam
-	//roots.back().stableEndpoints.push_back(InetAddress("154.66.197.33/9993")); // Johannesburg
-	//roots.back().stableEndpoints.push_back(InetAddress("2c0f:f850:154:197::33/9993")); // Johannesburg
-	//roots.back().stableEndpoints.push_back(InetAddress("159.203.97.171/9993")); // New York
-	//roots.back().stableEndpoints.push_back(InetAddress("2604:a880:800:a1::54:6001/9993")); // New York
-	//roots.back().stableEndpoints.push_back(InetAddress("131.255.6.16/9993")); // Buenos Aires
-	//roots.back().stableEndpoints.push_back(InetAddress("2803:eb80:0:e::2/9993")); // Buenos Aires
-	//roots.back().stableEndpoints.push_back(InetAddress("107.170.197.14/9993")); // San Francisco
-	//roots.back().stableEndpoints.push_back(InetAddress("2604:a880:1:20::200:e001/9993")); // San Francisco
-	//roots.back().stableEndpoints.push_back(InetAddress("128.199.197.217/9993")); // Singapore
-	//roots.back().stableEndpoints.push_back(InetAddress("2400:6180:0:d0::b7:4001/9993")); // Singapore
-
-	// Bob
-	//roots.push_back(World::Root());
-	//roots.back().identity = Identity("8841408a2e:0:bb1d31f2c323e264e9e64172c1a74f77899555ed10751cd56e86405cde118d02dffe555d462ccf6a85b5631c12350c8d5dc409ba10b9025d0f445cf449d92b1c");
-	//roots.back().stableEndpoints.push_back(InetAddress("45.32.198.130/9993")); // Dallas
-	//roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:6400:81c3:5400:00ff:fe18:1d61/9993")); // Dallas
-	//roots.back().stableEndpoints.push_back(InetAddress("46.101.160.249/9993")); // Frankfurt
-	//roots.back().stableEndpoints.push_back(InetAddress("2a03:b0c0:3:d0::6a:3001/9993")); // Frankfurt
-	//roots.back().stableEndpoints.push_back(InetAddress("107.191.46.210/9993")); // Paris
-	//roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:6800:83a4::64/9993")); // Paris
-	//roots.back().stableEndpoints.push_back(InetAddress("45.32.246.179/9993")); // Sydney
-	//roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:5800:8bf8:5400:ff:fe15:b39a/9993")); // Sydney
-	//roots.back().stableEndpoints.push_back(InetAddress("45.32.248.87/9993")); // Tokyo
-	//roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:7000:9bc9:5400:00ff:fe15:c4f5/9993")); // Tokyo
-	//roots.back().stableEndpoints.push_back(InetAddress("159.203.2.154/9993")); // Toronto
-	//roots.back().stableEndpoints.push_back(InetAddress("2604:a880:cad:d0::26:7001/9993")); // Toronto
-
-	// END WORLD DEFINITION
-	// =========================================================================
-
-	fprintf(stderr,"INFO: generating and signing id==%llu ts==%llu" ZT_EOL_S,(unsigned long long)id,(unsigned long long)ts);
-
-	World nw = World::make(World::TYPE_PLANET,id,ts,currentKP.pub,roots,previousKP);
-
-	Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> outtmp;
-	nw.serialize(outtmp,false);
-	World testw;
-	testw.deserialize(outtmp,0);
-	if (testw != nw) {
-		fprintf(stderr,"FATAL: serialization test failed!" ZT_EOL_S);
-		return 1;
-	}
-
-	OSUtils::writeFile("world.bin",std::string((const char *)outtmp.data(),outtmp.size()));
-	fprintf(stderr,"INFO: world.bin written with %u bytes of binary world data." ZT_EOL_S,outtmp.size());
-
-	fprintf(stdout,ZT_EOL_S);
-	fprintf(stdout,"#define ZT_DEFAULT_WORLD_LENGTH %u" ZT_EOL_S,outtmp.size());
-	fprintf(stdout,"static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {");
-	for(unsigned int i=0;i<outtmp.size();++i) {
-		const unsigned char *d = (const unsigned char *)outtmp.data();
-		if (i > 0)
-			fprintf(stdout,",");
-		fprintf(stdout,"0x%.2x",(unsigned int)d[i]);
-	}
-	fprintf(stdout,"};" ZT_EOL_S);
-
-	return 0;
-}
diff --git a/attic/world/world.bin b/attic/world/world.bin
deleted file mode 100644
index 88049ccdc..000000000
Binary files a/attic/world/world.bin and /dev/null differ
diff --git a/attic/world/world.c b/attic/world/world.c
deleted file mode 100644
index ecf30e6f0..000000000
--- a/attic/world/world.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#define ZT_DEFAULT_WORLD_LENGTH 732
-static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {0x01,0x00,0x00,0x00,0x00,0x08,0xea,0xc9,0x0a,0x00,0x00,0x01,0x6b,0xd4,0x16,0x08,0xc1,0xb8,0xb3,0x88,0xa4,0x69,0x22,0x14,0x91,0xaa,0x9a,0xcd,0x66,0xcc,0x76,0x4c,0xde,0xfd,0x56,0x03,0x9f,0x10,0x67,0xae,0x15,0xe6,0x9c,0x6f,0xb4,0x2d,0x7b,0x55,0x33,0x0e,0x3f,0xda,0xac,0x52,0x9c,0x07,0x92,0xfd,0x73,0x40,0xa6,0xaa,0x21,0xab,0xa8,0xa4,0x89,0xfd,0xae,0xa4,0x4a,0x39,0xbf,0x2d,0x00,0x65,0x9a,0xc9,0xc8,0x18,0xeb,0x16,0x93,0xf4,0xe5,0xbd,0x20,0xda,0x10,0xad,0xc7,0x05,0xf4,0x99,0xfe,0x04,0x08,0x9b,0xe0,0x9e,0x77,0x1d,0x9f,0x47,0x16,0xaa,0x92,0x4f,0x10,0x16,0x3d,0xc7,0xec,0xd3,0x90,0x9e,0xd1,0x74,0xfc,0xb3,0xb5,0x07,0x9c,0x4d,0x95,0xc5,0x17,0x8b,0x3d,0x0b,0x60,0x76,0xe8,0x51,0xbb,0xb6,0x3d,0x74,0xb5,0x21,0x83,0x7b,0x95,0x1d,0x02,0x9b,0xcd,0xaf,0x5c,0x3e,0x96,0xdf,0x37,0x2c,0x56,0x6d,0xfa,0x75,0x0f,0xda,0x55,0x85,0x13,0xf4,0x76,0x1a,0x66,0x4d,0x3b,0x8d,0xcf,0x12,0xc9,0x34,0xb9,0x0d,0x61,0x03,0x3a,0x46,0xf1,0xbf,0x30,0x00,0x76,0xe6,0x6f,0xab,0x33,0xe2,0x85,0x49,0xa6,0x2e,0xe2,0x06,0x4d,0x18,0x43,0x27,0x3c,0x2c,0x30,0x0b,0xa4,0x5c,0x3f,0x20,0xbe,0xf0,0x2d,0xba,0xd2,0x25,0x72,0x3b,0xb5,0x9a,0x9b,0xb4,0xb1,0x35,0x35,0x73,0x09,0x61,0xae,0xec,0xf5,0xa1,0x63,0xac,0xe4,0x77,0xcc,0xeb,0x07,0x27,0x02,0x5b,0x99,0xac,0x14,0xa5,0x16,0x6a,0x09,0xa3,0x00,0x02,0x04,0xb9,0xb4,0x0d,0x52,0x27,0x09,0x06,0x2a,0x02,0x6e,0xa0,0xc8,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x27,0x09,0x9d,0x21,0x90,0x39,0xf3,0x00,0x01,0xf0,0x92,0x2a,0x98,0xe3,0xb3,0x4e,0xbc,0xbf,0xf3,0x33,0x26,0x9d,0xc2,0x65,0xd7,0xa0,0x20,0xaa,0xb6,0x9d,0x72,0xbe,0x4d,0x4a,0xcc,0x9c,0x8c,0x92,0x94,0x78,0x57,0x71,0x25,0x6c,0xd1,0xd9,0x42,0xa9,0x0d,0x1b,0xd1,0xd2,0xdc,0xa3,0xea,0x84,0xef,0x7d,0x85,0xaf,0xe6,0x61,0x1f,0xb4,0x3f,0xf0,0xb7,0x41,0x26,0xd9,0x0a,0x6e,0x00,0x0c,0x04,0xbc,0xa6,0x5e,0xb1,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x7d,0x00,0x01,0x27,0x09,0x04,0x9a,0x42,0xc5,0x21,0x27,0x09,0x06,0x2c,0x0f,0xf8,0x50,0x01,0x54,0x01,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x27,0x09,0x04,0x9f,0xcb,0x61,0xab,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,0x54,0x60,0x01,0x27,0x09,0x04,0x83,0xff,0x06,0x10,0x27,0x09,0x06,0x28,0x03,0xeb,0x80,0x00,0x00,0x00,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x27,0x09,0x04,0x6b,0xaa,0xc5,0x0e,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x02,0x00,0xe0,0x01,0x27,0x09,0x04,0x80,0xc7,0xc5,0xd9,0x27,0x09,0x06,0x24,0x00,0x61,0x80,0x00,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0xb7,0x40,0x01,0x27,0x09,0x88,0x41,0x40,0x8a,0x2e,0x00,0xbb,0x1d,0x31,0xf2,0xc3,0x23,0xe2,0x64,0xe9,0xe6,0x41,0x72,0xc1,0xa7,0x4f,0x77,0x89,0x95,0x55,0xed,0x10,0x75,0x1c,0xd5,0x6e,0x86,0x40,0x5c,0xde,0x11,0x8d,0x02,0xdf,0xfe,0x55,0x5d,0x46,0x2c,0xcf,0x6a,0x85,0xb5,0x63,0x1c,0x12,0x35,0x0c,0x8d,0x5d,0xc4,0x09,0xba,0x10,0xb9,0x02,0x5d,0x0f,0x44,0x5c,0xf4,0x49,0xd9,0x2b,0x1c,0x00,0x0c,0x04,0x2d,0x20,0xc6,0x82,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x64,0x00,0x81,0xc3,0x54,0x00,0x00,0xff,0xfe,0x18,0x1d,0x61,0x27,0x09,0x04,0x2e,0x65,0xa0,0xf9,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x6a,0x30,0x01,0x27,0x09,0x04,0x6b,0xbf,0x2e,0xd2,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x68,0x00,0x83,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x27,0x09,0x04,0x2d,0x20,0xf6,0xb3,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x58,0x00,0x8b,0xf8,0x54,0x00,0x00,0xff,0xfe,0x15,0xb3,0x9a,0x27,0x09,0x04,0x2d,0x20,0xf8,0x57,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x70,0x00,0x9b,0xc9,0x54,0x00,0x00,0xff,0xfe,0x15,0xc4,0xf5,0x27,0x09,0x04,0x9f,0xcb,0x02,0x9a,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x0c,0xad,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x26,0x70,0x01,0x27,0x09};
diff --git a/ci/Dockerfile-build.deb b/ci/Dockerfile-build.deb
deleted file mode 100644
index 09ed717f8..000000000
--- a/ci/Dockerfile-build.deb
+++ /dev/null
@@ -1,13 +0,0 @@
-ARG ZT_NAME
-FROM 084037375216.dkr.ecr.us-east-2.amazonaws.com/${ZT_NAME}-builder as builder
-WORKDIR /work/build
-COPY . .
-RUN pwd
-RUN ls -la .
-RUN make clean
-RUN make debian
-RUN ls -ls /work
-
-FROM scratch AS export
-ARG ZT_NAME
-COPY --from=builder /work/*.deb ./${ZT_NAME}/
diff --git a/ci/Dockerfile-build.el6 b/ci/Dockerfile-build.el6
deleted file mode 100644
index c5848c984..000000000
--- a/ci/Dockerfile-build.el6
+++ /dev/null
@@ -1,36 +0,0 @@
-ARG DOCKER_ARCH
-FROM --platform=linux/${DOCKER_ARCH} alpine:edge AS builder
-
-RUN apk update
-RUN apk add curl
-RUN apk add bash
-RUN apk add file
-RUN apk add rust
-RUN apk add cargo
-RUN apk add make
-RUN apk add cmake
-RUN apk add clang
-RUN apk add openssl-dev
-RUN apk add linux-headers
-RUN apk add build-base
-RUN apk add openssl-libs-static
-
-COPY . .
-RUN ZT_STATIC=1 make
-RUN ls -la
-
-ARG DOCKER_ARCH
-FROM --platform=linux/${DOCKER_ARCH} centos:6 AS stage
-WORKDIR /root/rpmbuild/BUILD
-COPY . .
-COPY --from=builder zerotier-* ./
-RUN curl https://gist.githubusercontent.com/someara/b363002ba6e57b3c474dd027d4daef85/raw/4ac5534139752fc92fbe1a53599a390214f69615/el6%2520vault --output /etc/yum.repos.d/CentOS-Base.repo
-RUN uname -a
-RUN yum -y install make gcc rpm-build
-RUN pwd
-RUN ls -la
-RUN make redhat
-
-FROM scratch AS export
-ARG ZT_NAME
-COPY --from=stage /root/rpmbuild/RPMS/*/*.rpm ./${ZT_NAME}/
diff --git a/ci/Dockerfile-build.rpm b/ci/Dockerfile-build.rpm
deleted file mode 100644
index cab00a06d..000000000
--- a/ci/Dockerfile-build.rpm
+++ /dev/null
@@ -1,9 +0,0 @@
-ARG ZT_NAME
-FROM 084037375216.dkr.ecr.us-east-2.amazonaws.com/${ZT_NAME}-builder as builder
-WORKDIR /root/rpmbuild/BUILD
-COPY . .
-RUN make redhat
-
-FROM scratch AS export
-ARG ZT_NAME
-COPY --from=builder /root/rpmbuild/RPMS/*/*.rpm ./${ZT_NAME}/
diff --git a/ci/Dockerfile-test.deb b/ci/Dockerfile-test.deb
deleted file mode 100644
index 7c709a863..000000000
--- a/ci/Dockerfile-test.deb
+++ /dev/null
@@ -1,13 +0,0 @@
-ARG ZT_NAME
-FROM 084037375216.dkr.ecr.us-east-2.amazonaws.com/${ZT_NAME}-tester
-ARG BASEURL
-ARG VERSION
-ARG DEB_ARCH
-ARG ZT_NAME
-ARG DISTRO
-RUN curl -s http://${BASEURL}/key.gpg -o /etc/apt/trusted.gpg.d/zerotier.gpg
-RUN echo "deb [arch=${DEB_ARCH} signed-by=/etc/apt/trusted.gpg.d/zerotier.gpg] http://${BASEURL}/${DISTRO} ${ZT_NAME} main" > /etc/apt/sources.list.d/zerotier.list
-RUN apt-get -qq update
-RUN apt-get -qq install zerotier-one=${VERSION}
-
-RUN ldd $(which zerotier-cli)
diff --git a/ci/Dockerfile-test.el6 b/ci/Dockerfile-test.el6
deleted file mode 100644
index 499667313..000000000
--- a/ci/Dockerfile-test.el6
+++ /dev/null
@@ -1,4 +0,0 @@
-ARG DOCKER_ARCH
-FROM --platform=linux/${DOCKER_ARCH} centos:6
-RUN printf "[C6.10-base]\nname=CentOS-6.10 - Base\nbaseurl=http://vault.epel.cloud/6.10/os/\$basearch/\ngpgcheck=1\ngpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6\nenabled=1\nmetadata_expire=never\n" > /etc/yum.repos.d/CentOS-Base.repo
-RUN yum -y install curl
diff --git a/ci/Dockerfile-test.rpm b/ci/Dockerfile-test.rpm
deleted file mode 100644
index 6a98607b9..000000000
--- a/ci/Dockerfile-test.rpm
+++ /dev/null
@@ -1,17 +0,0 @@
-ARG ZT_NAME
-FROM 084037375216.dkr.ecr.us-east-2.amazonaws.com/${ZT_NAME}-tester
-ARG BASEURL
-ARG VERSION
-ARG DEB_ARCH
-ARG ZT_NAME
-ARG DISTRO
-ARG DNF_ARCH
-RUN curl -s http://${BASEURL}/key.asc -o /etc/pki/rpm-gpg/RPM-GPG-KEY-zerotier
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-zerotier
-RUN rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n'
-RUN printf "[zerotier]\nname=zerotier\nbaseurl=http://${BASEURL}/${DISTRO}/${ZT_NAME}/$basearch/\nenabled=1\ngpgcheck=1\ngpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-zerotier\n" > /etc/yum.repos.d/zerotier.repo
-
-# RUN yum -v repolist
-RUN setarch ${DNF_ARCH} yum -y install zerotier-one-${VERSION}
-RUN file $(which zerotier-cli)
-RUN ldd $(which zerotier-cli)
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
deleted file mode 100755
index a4b8ca94b..000000000
--- a/ci/scripts/build.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-ZT_NAME="$1" ; shift
-DISTRO="$1" ; shift
-ZT_ISA="$1" ; shift
-VERSION="$1" ; shift
-BUILD_EVENT="$1" ; shift
-
-source "$(dirname $0)/lib.sh"
-
-if [ -f "ci/Dockerfile-build.${ZT_NAME}" ]; then
-    DOCKERFILE="ci/Dockerfile-build.${ZT_NAME}"
-else
-    DOCKERFILE="ci/Dockerfile-build.${PKGFMT}"
-fi
-
-echo "#~~~~~~~~~~~~~~~~~~~~"
-echo "$0 variables:"
-echo "nproc: $(nproc)"
-echo "ZT_NAME: ${ZT_NAME}"
-echo "DISTRO: ${DISTRO}"
-echo "ZT_ISA: ${ZT_ISA}"
-echo "VERSION: ${VERSION}"
-echo "BUILD_EVENT: ${BUILD_EVENT}"
-echo "DOCKER_ARCH: ${DOCKER_ARCH}"
-echo "DNF_ARCH: ${DNF_ARCH}"
-echo "RUST_TRIPLET: ${RUST_TRIPLET}"
-echo "PKGFMT: ${PKGFMT}"
-echo "PWD: ${PWD}"
-echo "DOCKERFILE: ${DOCKERFILE}"
-echo "#~~~~~~~~~~~~~~~~~~~~"
-
-make munge_rpm zerotier-one.spec VERSION=${VERSION}
-make munge_deb debian/changelog VERSION=${VERSION}
-
-docker buildx build \
-       --no-cache=true \
-       --build-arg ZT_NAME="${ZT_NAME}" \
-       --build-arg RUST_TRIPLET="${RUST_TRIPLET}" \
-       --build-arg DOCKER_ARCH="${DOCKER_ARCH}" \
-       --build-arg DNF_ARCH="${DNF_ARCH}" \
-       --platform linux/${DOCKER_ARCH} \
-       -f ${DOCKERFILE} \
-       -t build \
-       . \
-       --output type=local,dest=. \
-       --target export
diff --git a/ci/scripts/lib.sh b/ci/scripts/lib.sh
deleted file mode 100755
index 43c35762b..000000000
--- a/ci/scripts/lib.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-
-case $ZT_NAME in
-    el*|fc*|amzn*)
-        export PKGFMT=rpm
-        ;;
-    *)
-        export PKGFMT=deb
-esac
-
-case $ZT_ISA in
-    386)
-        export DOCKER_ARCH=386
-        export DEB_ARCH=i386
-        export DNF_ARCH=i686
-        export RUST_TRIPLET=i686-unknown-linux-gnu
-        ;;
-    amd64)
-        export DOCKER_ARCH=amd64
-        export DEB_ARCH=amd64
-        export DNF_ARCH=x86_64
-        export RUST_TRIPLET=x86_64-unknown-linux-gnu
-        ;;
-    armv7)
-        export DOCKER_ARCH=arm/v7
-        export DNF_ARCH=armv7
-        export DEB_ARCH=armhf
-        export RUST_TRIPLET=armv7-unknown-linux-gnueabihf
-        ;;
-    arm64)
-        export DOCKER_ARCH=arm64/v8
-        export DEB_ARCH=arm64
-        export DNF_ARCH=linux64
-        export RUST_TRIPLET=aarch64-unknown-linux-gnu
-        ;;
-    riscv64)
-        export DOCKER_ARCH=riscv64
-        export DEB_ARCH=riscv64
-        export DNF_ARCH=riscv64
-        export RUST_TRIPLET=riscv64gc-unknown-linux-gnu
-        ;;
-    ppc64le)
-        export DOCKER_ARCH=ppc64le
-        export DEB_ARCH=ppc64el
-        export DNF_ARCH=ppc64le
-        export RUST_TRIPLET=powerpc64le-unknown-linux-gnu
-        ;;
-    mips64le)
-        export DOCKER_ARCH=mips64le
-        export DEB_ARCH=mips64le
-        export DNF_ARCH=mips64le
-        export RUST_TRIPLET=mips64el-unknown-linux-gnuabi64
-        ;;
-    s390x)
-        export DOCKER_ARCH=s390x
-        export DEB_ARCH=s390x
-        export DNF_ARCH=s390x
-        export RUST_TRIPLET=s390x-unknown-linux-gnu
-        ;;
-    *)
-        echo "ERROR: could not determine architecture settings. PLEASE FIX ME"
-        exit 1
-        ;;
-esac
diff --git a/ci/scripts/munge_debian_changelog.sh b/ci/scripts/munge_debian_changelog.sh
deleted file mode 100755
index d37cb0638..000000000
--- a/ci/scripts/munge_debian_changelog.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-export FILE=$1
-export VERSION=$2
-export NAME=$3
-export MESSAGE=$4
-export DATE=$(date "+%a, %d %b %Y %T %z")
-# export DATE=$(date "+%a %b %d %Y")
-
-set +e
-grep --version | grep BSD &> /dev/null
-if [ $? == 0 ]; then BSDGREP=true ; else BSDGREP=false ; fi
-set -e
-
-# echo "#~~~~~~~~~~~~~~~~~~~~"
-# echo "$0 variables:"
-# echo "VERSION: ${VERSION}"
-# echo "NAME: ${NAME}"
-# echo "MESSAGE: ${MESSAGE}"
-# echo "DATE: ${DATE}"
-# echo "BSDGREP: ${BSDGREP}"
-# echo "#~~~~~~~~~~~~~~~~~~~~"
-# echo
-
-if $BSDGREP ; then    
-    sed -i '' s/^Version:.*/"Version:        ${VERSION}"/ ${FILE}
-else
-    sed -i s/^Version:.*/"Version:        ${VERSION}"/ ${FILE}
-fi
-
-awk -v version=${VERSION} -v date=${DATE} -v name=${NAME} -v message=${MESSAGE} \
-    'BEGIN{print "zerotier-one (" version ") stable; urgency=medium\n\n  * " message "\n\n -- " name "  " date "\n" }{ print }' \
-    ${FILE} > ${FILE}.new
-
-mv ${FILE}.new ${FILE}
diff --git a/ci/scripts/munge_rpm_spec.sh b/ci/scripts/munge_rpm_spec.sh
deleted file mode 100755
index 289df1ed4..000000000
--- a/ci/scripts/munge_rpm_spec.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-export FILE=$1
-export VERSION=$2
-export NAME=$3
-export MESSAGE=$4
-export DATE=$(date "+%a %b %d %Y")
-
-set +e
-grep --version | grep BSD &> /dev/null
-if [ $? == 0 ]; then BSDGREP=true ; else BSDGREP=false ; fi
-set -e
-
-# echo "#~~~~~~~~~~~~~~~~~~~~"
-# echo "$0 variables:"
-# echo "VERSION: ${VERSION}"
-# echo "NAME: ${NAME}"
-# echo "MESSAGE: ${MESSAGE}"
-# echo "DATE: ${DATE}"
-# echo "BSDGREP: ${BSDGREP}"
-# echo "#~~~~~~~~~~~~~~~~~~~~"
-# echo
-
-if $BSDGREP ; then    
-    sed -i '' s/^Version:.*/"Version:        ${VERSION}"/ ${FILE}
-else
-    sed -i s/^Version:.*/"Version:        ${VERSION}"/ ${FILE}
-fi
-
-awk -v version=${VERSION} -v date=${DATE} -v name=${NAME} -v message=${MESSAGE} \
-    'FNR==NR{ if (/%changelog/) p=NR; next} 1; FNR==p{ print "* " date  " " name " - " version "\n- " message "\n" }' \
-    ${FILE} ${FILE} > ${FILE}.new
-
-mv ${FILE}.new ${FILE}
diff --git a/ci/scripts/publish.sh b/ci/scripts/publish.sh
deleted file mode 100755
index fa1e2468a..000000000
--- a/ci/scripts/publish.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-ZT_NAME="$1" ; shift
-DISTRO="$1" ; shift
-ZT_ISA="$1" ; shift
-VERSION="$1" ; shift
-BUILD_EVENT="$1" ; shift
-
-source "$(dirname $0)/lib.sh"
-
-if [ ${BUILD_EVENT} == "tag" ]; then
-    CHANNEL="zerotier-releases"
-else
-    CHANNEL="zerotier-builds"
-fi
-
-function publish_rpm {
-    mkdir -p /${CHANNEL}/${DISTRO}
-    ls -la /${CHANNEL}    
-    ls -la .
-    cp -a ${ZT_NAME} /${CHANNEL}/${DISTRO}
-}
-
-function publish_deb {
-    mkdir -p /${CHANNEL}/${DISTRO}/pool/dists/${ZT_NAME}/main
-    cp -a ${ZT_NAME}/* /${CHANNEL}/${DISTRO}/pool/dists/${ZT_NAME}/main
-}
-
-case ${PKGFMT} in
-    "rpm")
-        publish_rpm
-        ;;
-    "deb")
-        publish_deb
-esac
-            
diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh
deleted file mode 100755
index 931e9bb91..000000000
--- a/ci/scripts/test.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-ZT_NAME="$1" ; shift
-DISTRO="$1" ; shift
-ZT_ISA="$1" ; shift
-VERSION="$1" ; shift
-BUILD_EVENT="$1" ; shift
-
-source "$(dirname $0)/lib.sh"
-
-if [ -f "ci/Dockerfile-test.${ZT_NAME}" ]; then
-    DOCKERFILE="ci/Dockerfile-test.${ZT_NAME}"
-else
-    DOCKERFILE="ci/Dockerfile-test.${PKGFMT}"
-fi
-
-if [ ${BUILD_EVENT} == "tag" ]; then
-    BASEURL="zerotier-releases.home.arpa"
-else
-    BASEURL="zerotier-builds.home.arpa"
-fi
-
-echo "#~~~~~~~~~~~~~~~~~~~~"
-echo "$0 variables:"
-echo "nproc: $(nproc)"
-echo "ZT_NAME: ${ZT_NAME}"
-echo "DISTRO: ${DISTRO}"
-echo "ZT_ISA: ${ZT_ISA}"
-echo "VERSION: ${VERSION}"
-echo "BUILD_EVENT: ${BUILD_EVENT}"
-echo "DOCKER_ARCH: ${DOCKER_ARCH}"
-echo "DNF_ARCH: ${DNF_ARCH}"
-echo "RUST_TRIPLET: ${RUST_TRIPLET}"
-echo "PKGFMT: ${PKGFMT}"
-echo "PWD: ${PWD}"
-echo "DOCKERFILE: ${DOCKERFILE}"
-echo "#~~~~~~~~~~~~~~~~~~~~"
-
-# docker pull -q --platform="linux/${DOCKER_ARCH}" 084037375216.dkr.ecr.us-east-2.amazonaws.com/${ZT_NAME}-tester
-
-docker buildx build \
-       --build-arg BASEURL="${BASEURL}" \
-       --build-arg ZT_NAME="${ZT_NAME}" \
-       --build-arg DISTRO="${DISTRO}" \
-       --build-arg DEB_ARCH="${DEB_ARCH}" \
-       --build-arg DNF_ARCH="${DNF_ARCH}" \
-       --build-arg VERSION="${VERSION}" \
-       --build-arg DOCKER_ARCH="${DOCKER_ARCH}" \
-       --platform "linux/${DOCKER_ARCH}" \
-       --no-cache \
-       -f ${DOCKERFILE} \
-       -t test \
-       .
diff --git a/controller/CV1.cpp b/controller/CV1.cpp
deleted file mode 100644
index 95d85a280..000000000
--- a/controller/CV1.cpp
+++ /dev/null
@@ -1,2092 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "CV1.hpp"
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-
-#include "../node/Constants.hpp"
-#include "../node/SHA512.hpp"
-#include "../version.h"
-#include "CtlUtil.hpp"
-#include "EmbeddedNetworkController.hpp"
-#include "Redis.hpp"
-#include "opentelemetry/trace/provider.h"
-
-#include <chrono>
-#include <climits>
-#include <iomanip>
-#include <libpq-fe.h>
-#include <smeeclient.h>
-#include <sstream>
-
-// #define REDIS_TRACE 1
-
-using json = nlohmann::json;
-
-namespace {
-
-static const int DB_MINIMUM_VERSION = 38;
-
-}	// anonymous namespace
-
-using namespace ZeroTier;
-
-using Attrs = std::vector<std::pair<std::string, std::string> >;
-using Item = std::pair<std::string, Attrs>;
-using ItemStream = std::vector<Item>;
-
-CV1::CV1(const Identity& myId, const char* path, int listenPort, RedisConfig* rc)
-	: DB()
-	, _pool()
-	, _myId(myId)
-	, _myAddress(myId.address())
-	, _ready(0)
-	, _connected(1)
-	, _run(1)
-	, _waitNoticePrinted(false)
-	, _listenPort(listenPort)
-	, _rc(rc)
-	, _redis(NULL)
-	, _cluster(NULL)
-	, _redisMemberStatus(false)
-	, _smee(NULL)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::CV1");
-	auto scope = tracer->WithActiveSpan(span);
-
-	char myAddress[64];
-	_myAddressStr = myId.address().toString(myAddress);
-	_connString = std::string(path);
-	auto f = std::make_shared<PostgresConnFactory>(_connString);
-	_pool = std::make_shared<ConnectionPool<PostgresConnection> >(15, 5, std::static_pointer_cast<ConnectionFactory>(f));
-
-	memset(_ssoPsk, 0, sizeof(_ssoPsk));
-	char* const ssoPskHex = getenv("ZT_SSO_PSK");
-#ifdef ZT_TRACE
-	fprintf(stderr, "ZT_SSO_PSK: %s\n", ssoPskHex);
-#endif
-	if (ssoPskHex) {
-		// SECURITY: note that ssoPskHex will always be null-terminated if libc actually
-		// returns something non-NULL. If the hex encodes something shorter than 48 bytes,
-		// it will be padded at the end with zeroes. If longer, it'll be truncated.
-		Utils::unhex(ssoPskHex, _ssoPsk, sizeof(_ssoPsk));
-	}
-	const char* redisMemberStatus = getenv("ZT_REDIS_MEMBER_STATUS");
-	if (redisMemberStatus && (strcmp(redisMemberStatus, "true") == 0)) {
-		_redisMemberStatus = true;
-		fprintf(stderr, "Using redis for member status\n");
-	}
-
-	auto c = _pool->borrow();
-	pqxx::work txn { *c->c };
-
-	pqxx::row r { txn.exec1("SELECT version FROM ztc_database") };
-	int dbVersion = r[0].as<int>();
-	txn.commit();
-
-	if (dbVersion < DB_MINIMUM_VERSION) {
-		fprintf(stderr, "Central database schema version too low.  This controller version requires a minimum schema version of %d. Please upgrade your Central instance", DB_MINIMUM_VERSION);
-		exit(1);
-	}
-	_pool->unborrow(c);
-
-	if (_rc != NULL) {
-		auto innerspan = tracer->StartSpan("cv1::CV1::configureRedis");
-		auto innerscope = tracer->WithActiveSpan(innerspan);
-
-		sw::redis::ConnectionOptions opts;
-		sw::redis::ConnectionPoolOptions poolOpts;
-		opts.host = _rc->hostname;
-		opts.port = _rc->port;
-		opts.password = _rc->password;
-		opts.db = 0;
-		opts.keep_alive = true;
-		opts.connect_timeout = std::chrono::seconds(3);
-		poolOpts.size = 25;
-		poolOpts.wait_timeout = std::chrono::seconds(5);
-		poolOpts.connection_lifetime = std::chrono::minutes(3);
-		poolOpts.connection_idle_time = std::chrono::minutes(1);
-		if (_rc->clusterMode) {
-			innerspan->SetAttribute("cluster_mode", "true");
-			fprintf(stderr, "Using Redis in Cluster Mode\n");
-			_cluster = std::make_shared<sw::redis::RedisCluster>(opts, poolOpts);
-		}
-		else {
-			innerspan->SetAttribute("cluster_mode", "false");
-			fprintf(stderr, "Using Redis in Standalone Mode\n");
-			_redis = std::make_shared<sw::redis::Redis>(opts, poolOpts);
-		}
-	}
-
-	_readyLock.lock();
-
-	fprintf(stderr, "[%s] NOTICE: %.10llx controller PostgreSQL waiting for initial data download..." ZT_EOL_S, ::_timestr(), (unsigned long long)_myAddress.toInt());
-	_waitNoticePrinted = true;
-
-	initializeNetworks();
-	initializeMembers();
-
-	_heartbeatThread = std::thread(&CV1::heartbeat, this);
-	_membersDbWatcher = std::thread(&CV1::membersDbWatcher, this);
-	_networksDbWatcher = std::thread(&CV1::networksDbWatcher, this);
-	for (int i = 0; i < ZT_CENTRAL_CONTROLLER_COMMIT_THREADS; ++i) {
-		_commitThread[i] = std::thread(&CV1::commitThread, this);
-	}
-	_onlineNotificationThread = std::thread(&CV1::onlineNotificationThread, this);
-
-	configureSmee();
-}
-
-CV1::~CV1()
-{
-	if (_smee != NULL) {
-		smeeclient::smee_client_delete(_smee);
-		_smee = NULL;
-	}
-
-	_run = 0;
-	std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-	_heartbeatThread.join();
-	_membersDbWatcher.join();
-	_networksDbWatcher.join();
-	_commitQueue.stop();
-	for (int i = 0; i < ZT_CENTRAL_CONTROLLER_COMMIT_THREADS; ++i) {
-		_commitThread[i].join();
-	}
-	_onlineNotificationThread.join();
-}
-
-void CV1::configureSmee()
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::configureSmee");
-	auto scope = tracer->WithActiveSpan(span);
-
-	const char* TEMPORAL_SCHEME = "ZT_TEMPORAL_SCHEME";
-	const char* TEMPORAL_HOST = "ZT_TEMPORAL_HOST";
-	const char* TEMPORAL_PORT = "ZT_TEMPORAL_PORT";
-	const char* TEMPORAL_NAMESPACE = "ZT_TEMPORAL_NAMESPACE";
-	const char* SMEE_TASK_QUEUE = "ZT_SMEE_TASK_QUEUE";
-
-	const char* scheme = getenv(TEMPORAL_SCHEME);
-	if (scheme == NULL) {
-		scheme = "http";
-	}
-	const char* host = getenv(TEMPORAL_HOST);
-	const char* port = getenv(TEMPORAL_PORT);
-	const char* ns = getenv(TEMPORAL_NAMESPACE);
-	const char* task_queue = getenv(SMEE_TASK_QUEUE);
-
-	if (scheme != NULL && host != NULL && port != NULL && ns != NULL && task_queue != NULL) {
-		fprintf(stderr, "creating smee client\n");
-		std::string hostPort = std::string(scheme) + std::string("://") + std::string(host) + std::string(":") + std::string(port);
-		this->_smee = smeeclient::smee_client_new(hostPort.c_str(), ns, task_queue);
-	}
-	else {
-		fprintf(stderr, "Smee client not configured\n");
-	}
-}
-
-bool CV1::waitForReady()
-{
-	while (_ready < 2) {
-		_readyLock.lock();
-		_readyLock.unlock();
-	}
-	return true;
-}
-
-bool CV1::isReady()
-{
-	return ((_ready == 2) && (_connected));
-}
-
-bool CV1::save(nlohmann::json& record, bool notifyListeners)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::save");
-	auto scope = tracer->WithActiveSpan(span);
-
-	bool modified = false;
-	try {
-		if (! record.is_object()) {
-			fprintf(stderr, "record is not an object?!?\n");
-			return false;
-		}
-		const std::string objtype = record["objtype"];
-		if (objtype == "network") {
-			// fprintf(stderr, "network save\n");
-			const uint64_t nwid = OSUtils::jsonIntHex(record["id"], 0ULL);
-			if (nwid) {
-				nlohmann::json old;
-				get(nwid, old);
-				if ((! old.is_object()) || (! _compareRecords(old, record))) {
-					record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
-					_commitQueue.post(std::pair<nlohmann::json, bool>(record, notifyListeners));
-					modified = true;
-				}
-			}
-		}
-		else if (objtype == "member") {
-			std::string networkId = record["nwid"];
-			std::string memberId = record["id"];
-			const uint64_t nwid = OSUtils::jsonIntHex(record["nwid"], 0ULL);
-			const uint64_t id = OSUtils::jsonIntHex(record["id"], 0ULL);
-			// fprintf(stderr, "member save %s-%s\n", networkId.c_str(), memberId.c_str());
-			if ((id) && (nwid)) {
-				nlohmann::json network, old;
-				get(nwid, network, id, old);
-				if ((! old.is_object()) || (! _compareRecords(old, record))) {
-					// fprintf(stderr, "commit queue post\n");
-					record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
-					_commitQueue.post(std::pair<nlohmann::json, bool>(record, notifyListeners));
-					modified = true;
-				}
-				else {
-					// fprintf(stderr, "no change\n");
-				}
-			}
-		}
-		else {
-			fprintf(stderr, "uhh waaat\n");
-		}
-	}
-	catch (std::exception& e) {
-		fprintf(stderr, "Error on PostgreSQL::save: %s\n", e.what());
-	}
-	catch (...) {
-		fprintf(stderr, "Unknown error on PostgreSQL::save\n");
-	}
-	return modified;
-}
-
-void CV1::eraseNetwork(const uint64_t networkId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::eraseNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-
-	fprintf(stderr, "PostgreSQL::eraseNetwork\n");
-	char tmp2[24];
-	waitForReady();
-	Utils::hex(networkId, tmp2);
-	std::pair<nlohmann::json, bool> tmp;
-	tmp.first["id"] = tmp2;
-	tmp.first["objtype"] = "_delete_network";
-	tmp.second = true;
-	_commitQueue.post(tmp);
-	nlohmann::json nullJson;
-	_networkChanged(tmp.first, nullJson, true);
-}
-
-void CV1::eraseMember(const uint64_t networkId, const uint64_t memberId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::eraseMember");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-
-	fprintf(stderr, "PostgreSQL::eraseMember\n");
-	char tmp2[24];
-	waitForReady();
-	std::pair<nlohmann::json, bool> tmp, nw;
-	Utils::hex(networkId, tmp2);
-	tmp.first["nwid"] = tmp2;
-	Utils::hex(memberId, tmp2);
-	tmp.first["id"] = tmp2;
-	tmp.first["objtype"] = "_delete_member";
-	tmp.second = true;
-	_commitQueue.post(tmp);
-	nlohmann::json nullJson;
-	_memberChanged(tmp.first, nullJson, true);
-}
-
-void CV1::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::nodeIsOnline");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	char ipStr[INET6_ADDRSTRLEN];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-	span->SetAttribute("physical_address", physicalAddress.toString(ipStr));
-	span->SetAttribute("os_arch", osArch);
-
-	std::lock_guard<std::mutex> l(_lastOnline_l);
-	NodeOnlineRecord& i = _lastOnline[std::pair<uint64_t, uint64_t>(networkId, memberId)];
-	i.lastSeen = OSUtils::now();
-	if (physicalAddress) {
-		i.physicalAddress = physicalAddress;
-	}
-	i.osArch = std::string(osArch);
-}
-
-void CV1::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress)
-{
-	this->nodeIsOnline(networkId, memberId, physicalAddress, "unknown/unknown");
-}
-
-AuthInfo CV1::getSSOAuthInfo(const nlohmann::json& member, const std::string& redirectURL)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::getSSOAuthInfo");
-	auto scope = tracer->WithActiveSpan(span);
-
-	Metrics::db_get_sso_info++;
-	// NONCE is just a random character string.  no semantic meaning
-	// state = HMAC SHA384 of Nonce based on shared sso key
-	//
-	// need nonce timeout in database? make sure it's used within X time
-	// X is 5 minutes for now.  Make configurable later?
-	//
-	// how do we tell when a nonce is used? if auth_expiration_time is set
-	std::string networkId = member["nwid"];
-	std::string memberId = member["id"];
-
-	char authenticationURL[4096] = { 0 };
-	AuthInfo info;
-	info.enabled = true;
-
-	// if (memberId == "a10dccea52" && networkId == "8056c2e21c24673d") {
-	//	fprintf(stderr, "invalid authinfo for grant's machine\n");
-	//	info.version=1;
-	//	return info;
-	// }
-	//  fprintf(stderr, "PostgreSQL::updateMemberOnLoad: %s-%s\n", networkId.c_str(), memberId.c_str());
-	std::shared_ptr<PostgresConnection> c;
-	try {
-		c = _pool->borrow();
-		pqxx::work w(*c->c);
-
-		char nonceBytes[16] = { 0 };
-		std::string nonce = "";
-
-		// check if the member exists first.
-		pqxx::row count = w.exec_params1("SELECT count(id) FROM ztc_member WHERE id = $1 AND network_id = $2 AND deleted = false", memberId, networkId);
-		if (count[0].as<int>() == 1) {
-			// get active nonce, if exists.
-			pqxx::result r = w.exec_params(
-				"SELECT nonce FROM ztc_sso_expiry "
-				"WHERE network_id = $1 AND member_id = $2 "
-				"AND ((NOW() AT TIME ZONE 'UTC') <= authentication_expiry_time) AND ((NOW() AT TIME ZONE 'UTC') <= nonce_expiration)",
-				networkId,
-				memberId);
-
-			if (r.size() == 0) {
-				// no active nonce.
-				// find an unused nonce, if one exists.
-				pqxx::result r = w.exec_params(
-					"SELECT nonce FROM ztc_sso_expiry "
-					"WHERE network_id = $1 AND member_id = $2 "
-					"AND authentication_expiry_time IS NULL AND ((NOW() AT TIME ZONE 'UTC') <= nonce_expiration)",
-					networkId,
-					memberId);
-
-				if (r.size() == 1) {
-					// we have an existing nonce.  Use it
-					nonce = r.at(0)[0].as<std::string>();
-					Utils::unhex(nonce.c_str(), nonceBytes, sizeof(nonceBytes));
-				}
-				else if (r.empty()) {
-					// create a nonce
-					Utils::getSecureRandom(nonceBytes, 16);
-					char nonceBuf[64] = { 0 };
-					Utils::hex(nonceBytes, sizeof(nonceBytes), nonceBuf);
-					nonce = std::string(nonceBuf);
-
-					pqxx::result ir = w.exec_params0(
-						"INSERT INTO ztc_sso_expiry "
-						"(nonce, nonce_expiration, network_id, member_id) VALUES "
-						"($1, TO_TIMESTAMP($2::double precision/1000), $3, $4)",
-						nonce,
-						OSUtils::now() + 300000,
-						networkId,
-						memberId);
-
-					w.commit();
-				}
-				else {
-					// > 1 ?!?  Thats an error!
-					fprintf(stderr, "> 1 unused nonce!\n");
-					exit(6);
-				}
-			}
-			else if (r.size() == 1) {
-				nonce = r.at(0)[0].as<std::string>();
-				Utils::unhex(nonce.c_str(), nonceBytes, sizeof(nonceBytes));
-			}
-			else {
-				// more than 1 nonce in use?  Uhhh...
-				fprintf(stderr, "> 1 nonce in use for network member?!?\n");
-				exit(7);
-			}
-
-			r = w.exec_params(
-				"SELECT oc.client_id, oc.authorization_endpoint, oc.issuer, oc.provider, oc.sso_impl_version "
-				"FROM ztc_network AS n "
-				"INNER JOIN ztc_org o "
-				"  ON o.owner_id = n.owner_id "
-				"LEFT OUTER JOIN ztc_network_oidc_config noc "
-				"  ON noc.network_id = n.id "
-				"LEFT OUTER JOIN ztc_oidc_config oc "
-				"  ON noc.client_id = oc.client_id AND oc.org_id = o.org_id "
-				"WHERE n.id = $1 AND n.sso_enabled = true",
-				networkId);
-
-			std::string client_id = "";
-			std::string authorization_endpoint = "";
-			std::string issuer = "";
-			std::string provider = "";
-			uint64_t sso_version = 0;
-
-			if (r.size() == 1) {
-				client_id = r.at(0)[0].as<std::optional<std::string> >().value_or("");
-				authorization_endpoint = r.at(0)[1].as<std::optional<std::string> >().value_or("");
-				issuer = r.at(0)[2].as<std::optional<std::string> >().value_or("");
-				provider = r.at(0)[3].as<std::optional<std::string> >().value_or("");
-				sso_version = r.at(0)[4].as<std::optional<uint64_t> >().value_or(1);
-			}
-			else if (r.size() > 1) {
-				fprintf(stderr, "ERROR: More than one auth endpoint for an organization?!?!? NetworkID: %s\n", networkId.c_str());
-			}
-			else {
-				fprintf(stderr, "No client or auth endpoint?!?\n");
-			}
-
-			info.version = sso_version;
-
-			// no catch all else because we don't actually care if no records exist here. just continue as normal.
-			if ((! client_id.empty()) && (! authorization_endpoint.empty())) {
-				uint8_t state[48];
-				HMACSHA384(_ssoPsk, nonceBytes, sizeof(nonceBytes), state);
-				char state_hex[256];
-				Utils::hex(state, 48, state_hex);
-
-				if (info.version == 0) {
-					char url[2048] = { 0 };
-					OSUtils::ztsnprintf(
-						url,
-						sizeof(authenticationURL),
-						"%s?response_type=id_token&response_mode=form_post&scope=openid+email+profile&redirect_uri=%s&nonce=%s&state=%s&client_id=%s",
-						authorization_endpoint.c_str(),
-						url_encode(redirectURL).c_str(),
-						nonce.c_str(),
-						state_hex,
-						client_id.c_str());
-					info.authenticationURL = std::string(url);
-				}
-				else if (info.version == 1) {
-					info.ssoClientID = client_id;
-					info.issuerURL = issuer;
-					info.ssoProvider = provider;
-					info.ssoNonce = nonce;
-					info.ssoState = std::string(state_hex) + "_" + networkId;
-					info.centralAuthURL = redirectURL;
-#ifdef ZT_DEBUG
-					fprintf(
-						stderr,
-						"ssoClientID: %s\nissuerURL: %s\nssoNonce: %s\nssoState: %s\ncentralAuthURL: %s\nprovider: %s\n",
-						info.ssoClientID.c_str(),
-						info.issuerURL.c_str(),
-						info.ssoNonce.c_str(),
-						info.ssoState.c_str(),
-						info.centralAuthURL.c_str(),
-						provider.c_str());
-#endif
-				}
-			}
-			else {
-				fprintf(stderr, "client_id: %s\nauthorization_endpoint: %s\n", client_id.c_str(), authorization_endpoint.c_str());
-			}
-		}
-
-		_pool->unborrow(c);
-	}
-	catch (std::exception& e) {
-		span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-		fprintf(stderr, "ERROR: Error updating member on load for network %s: %s\n", networkId.c_str(), e.what());
-	}
-
-	return info;   // std::string(authenticationURL);
-}
-
-void CV1::initializeNetworks()
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::initializeNetworks");
-	auto scope = tracer->WithActiveSpan(span);
-
-	try {
-		std::string setKey = "networks:{" + _myAddressStr + "}";
-
-		fprintf(stderr, "Initializing Networks...\n");
-
-		if (_redisMemberStatus) {
-			fprintf(stderr, "Init Redis for networks...\n");
-			try {
-				if (_rc->clusterMode) {
-					_cluster->del(setKey);
-				}
-				else {
-					_redis->del(setKey);
-				}
-			}
-			catch (sw::redis::Error& e) {
-				// ignore. if this key doesn't exist, there's no reason to delete it
-			}
-		}
-
-		std::unordered_set<std::string> networkSet;
-
-		char qbuf[2048] = { 0 };
-		sprintf(
-			qbuf,
-			"SELECT n.id, (EXTRACT(EPOCH FROM n.creation_time AT TIME ZONE 'UTC')*1000)::bigint as creation_time, n.capabilities, "
-			"n.enable_broadcast, (EXTRACT(EPOCH FROM n.last_modified AT TIME ZONE 'UTC')*1000)::bigint AS last_modified, n.mtu, n.multicast_limit, n.name, n.private, n.remote_trace_level, "
-			"n.remote_trace_target, n.revision, n.rules, n.tags, n.v4_assign_mode, n.v6_assign_mode, n.sso_enabled, (CASE WHEN n.sso_enabled THEN noc.client_id ELSE NULL END) as client_id, "
-			"(CASE WHEN n.sso_enabled THEN oc.authorization_endpoint ELSE NULL END) as authorization_endpoint, "
-			"(CASE WHEN n.sso_enabled THEN oc.provider ELSE NULL END) as provider, d.domain, d.servers, "
-			"ARRAY(SELECT CONCAT(host(ip_range_start),'|', host(ip_range_end)) FROM ztc_network_assignment_pool WHERE network_id = n.id) AS assignment_pool, "
-			"ARRAY(SELECT CONCAT(host(address),'/',bits::text,'|',COALESCE(host(via), 'NULL'))FROM ztc_network_route WHERE network_id = n.id) AS routes "
-			"FROM ztc_network n "
-			"LEFT OUTER JOIN ztc_org o "
-			" ON o.owner_id = n.owner_id "
-			"LEFT OUTER JOIN ztc_network_oidc_config noc "
-			"	ON noc.network_id = n.id "
-			"LEFT OUTER JOIN ztc_oidc_config oc "
-			"	ON noc.client_id = oc.client_id AND oc.org_id = o.org_id "
-			"LEFT OUTER JOIN ztc_network_dns d "
-			"	ON d.network_id = n.id "
-			"WHERE deleted = false AND controller_id = '%s'",
-			_myAddressStr.c_str());
-		auto c = _pool->borrow();
-		auto c2 = _pool->borrow();
-		pqxx::work w { *c->c };
-
-		fprintf(stderr, "Load networks from psql...\n");
-		auto stream = pqxx::stream_from::query(w, qbuf);
-
-		std::tuple<
-			std::string	  // network ID
-			,
-			std::optional<int64_t>	 // creationTime
-			,
-			std::optional<std::string>	 // capabilities
-			,
-			std::optional<bool>	  // enableBroadcast
-			,
-			std::optional<uint64_t>	  // lastModified
-			,
-			std::optional<int>	 // mtu
-			,
-			std::optional<int>	 // multicastLimit
-			,
-			std::optional<std::string>	 // name
-			,
-			bool   // private
-			,
-			std::optional<int>	 // remoteTraceLevel
-			,
-			std::optional<std::string>	 // remoteTraceTarget
-			,
-			std::optional<uint64_t>	  // revision
-			,
-			std::optional<std::string>	 // rules
-			,
-			std::optional<std::string>	 // tags
-			,
-			std::optional<std::string>	 // v4AssignMode
-			,
-			std::optional<std::string>	 // v6AssignMode
-			,
-			std::optional<bool>	  // ssoEnabled
-			,
-			std::optional<std::string>	 // clientId
-			,
-			std::optional<std::string>	 // authorizationEndpoint
-			,
-			std::optional<std::string>	 // ssoProvider
-			,
-			std::optional<std::string>	 // domain
-			,
-			std::optional<std::string>	 // servers
-			,
-			std::string	  // assignmentPoolString
-			,
-			std::string	  // routeString
-			>
-			row;
-
-		uint64_t count = 0;
-		auto tmp = std::chrono::high_resolution_clock::now();
-		uint64_t total = 0;
-		while (stream >> row) {
-			auto start = std::chrono::high_resolution_clock::now();
-
-			json empty;
-			json config;
-
-			initNetwork(config);
-
-			std::string nwid = std::get<0>(row);
-			std::optional<int64_t> creationTime = std::get<1>(row);
-			std::optional<std::string> capabilities = std::get<2>(row);
-			std::optional<bool> enableBroadcast = std::get<3>(row);
-			std::optional<uint64_t> lastModified = std::get<4>(row);
-			std::optional<int> mtu = std::get<5>(row);
-			std::optional<int> multicastLimit = std::get<6>(row);
-			std::optional<std::string> name = std::get<7>(row);
-			bool isPrivate = std::get<8>(row);
-			std::optional<int> remoteTraceLevel = std::get<9>(row);
-			std::optional<std::string> remoteTraceTarget = std::get<10>(row);
-			std::optional<uint64_t> revision = std::get<11>(row);
-			std::optional<std::string> rules = std::get<12>(row);
-			std::optional<std::string> tags = std::get<13>(row);
-			std::optional<std::string> v4AssignMode = std::get<14>(row);
-			std::optional<std::string> v6AssignMode = std::get<15>(row);
-			std::optional<bool> ssoEnabled = std::get<16>(row);
-			std::optional<std::string> clientId = std::get<17>(row);
-			std::optional<std::string> authorizationEndpoint = std::get<18>(row);
-			std::optional<std::string> ssoProvider = std::get<19>(row);
-			std::optional<std::string> dnsDomain = std::get<20>(row);
-			std::optional<std::string> dnsServers = std::get<21>(row);
-			std::string assignmentPoolString = std::get<22>(row);
-			std::string routesString = std::get<23>(row);
-
-			config["id"] = nwid;
-			config["nwid"] = nwid;
-			config["creationTime"] = creationTime.value_or(0);
-			config["capabilities"] = json::parse(capabilities.value_or("[]"));
-			config["enableBroadcast"] = enableBroadcast.value_or(false);
-			config["lastModified"] = lastModified.value_or(0);
-			config["mtu"] = mtu.value_or(2800);
-			config["multicastLimit"] = multicastLimit.value_or(64);
-			config["name"] = name.value_or("");
-			config["private"] = isPrivate;
-			config["remoteTraceLevel"] = remoteTraceLevel.value_or(0);
-			config["remoteTraceTarget"] = remoteTraceTarget.value_or("");
-			config["revision"] = revision.value_or(0);
-			config["rules"] = json::parse(rules.value_or("[]"));
-			config["tags"] = json::parse(tags.value_or("[]"));
-			config["v4AssignMode"] = json::parse(v4AssignMode.value_or("{}"));
-			config["v6AssignMode"] = json::parse(v6AssignMode.value_or("{}"));
-			config["ssoEnabled"] = ssoEnabled.value_or(false);
-			config["objtype"] = "network";
-			config["ipAssignmentPools"] = json::array();
-			config["routes"] = json::array();
-			config["clientId"] = clientId.value_or("");
-			config["authorizationEndpoint"] = authorizationEndpoint.value_or("");
-			config["provider"] = ssoProvider.value_or("");
-
-			networkSet.insert(nwid);
-
-			if (dnsDomain.has_value()) {
-				std::string serverList = dnsServers.value();
-				json obj;
-				auto servers = json::array();
-				if (serverList.rfind("{", 0) != std::string::npos) {
-					serverList = serverList.substr(1, serverList.size() - 2);
-					std::stringstream ss(serverList);
-					while (ss.good()) {
-						std::string server;
-						std::getline(ss, server, ',');
-						servers.push_back(server);
-					}
-				}
-				obj["domain"] = dnsDomain.value();
-				obj["servers"] = servers;
-				config["dns"] = obj;
-			}
-
-			config["ipAssignmentPools"] = json::array();
-			if (assignmentPoolString != "{}") {
-				std::string tmp = assignmentPoolString.substr(1, assignmentPoolString.size() - 2);
-				std::vector<std::string> assignmentPools = split(tmp, ',');
-				for (auto it = assignmentPools.begin(); it != assignmentPools.end(); ++it) {
-					std::vector<std::string> r = split(*it, '|');
-					json ip;
-					ip["ipRangeStart"] = r[0];
-					ip["ipRangeEnd"] = r[1];
-					config["ipAssignmentPools"].push_back(ip);
-				}
-			}
-
-			config["routes"] = json::array();
-			if (routesString != "{}") {
-				std::string tmp = routesString.substr(1, routesString.size() - 2);
-				std::vector<std::string> routes = split(tmp, ',');
-				for (auto it = routes.begin(); it != routes.end(); ++it) {
-					std::vector<std::string> r = split(*it, '|');
-					json route;
-					route["target"] = r[0];
-					route["via"] = ((route["via"] == "NULL") ? nullptr : r[1]);
-					config["routes"].push_back(route);
-				}
-			}
-
-			Metrics::network_count++;
-
-			_networkChanged(empty, config, false);
-
-			auto end = std::chrono::high_resolution_clock::now();
-			auto dur = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-			;
-			total += dur.count();
-			++count;
-			if (count > 0 && count % 10000 == 0) {
-				fprintf(stderr, "Averaging %llu us per network\n", (total / count));
-			}
-		}
-
-		if (count > 0) {
-			fprintf(stderr, "Took %llu us per network to load\n", (total / count));
-		}
-		stream.complete();
-
-		w.commit();
-		_pool->unborrow(c2);
-		_pool->unborrow(c);
-		fprintf(stderr, "done.\n");
-
-		if (! networkSet.empty()) {
-			if (_redisMemberStatus) {
-				fprintf(stderr, "adding networks to redis...\n");
-				if (_rc->clusterMode) {
-					auto tx = _cluster->transaction(_myAddressStr, true, false);
-					uint64_t count = 0;
-					for (std::string nwid : networkSet) {
-						tx.sadd(setKey, nwid);
-						if (++count % 30000 == 0) {
-							tx.exec();
-							tx = _cluster->transaction(_myAddressStr, true, false);
-						}
-					}
-					tx.exec();
-				}
-				else {
-					auto tx = _redis->transaction(true, false);
-					uint64_t count = 0;
-					for (std::string nwid : networkSet) {
-						tx.sadd(setKey, nwid);
-						if (++count % 30000 == 0) {
-							tx.exec();
-							tx = _redis->transaction(true, false);
-						}
-					}
-					tx.exec();
-				}
-				fprintf(stderr, "done.\n");
-			}
-		}
-
-		if (++this->_ready == 2) {
-			if (_waitNoticePrinted) {
-				fprintf(stderr, "[%s] NOTICE: %.10llx controller PostgreSQL data download complete." ZT_EOL_S, _timestr(), (unsigned long long)_myAddress.toInt());
-			}
-			_readyLock.unlock();
-		}
-		fprintf(stderr, "network init done.\n");
-	}
-	catch (sw::redis::Error& e) {
-		span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-		fprintf(stderr, "ERROR: Error initializing networks in Redis: %s\n", e.what());
-		std::this_thread::sleep_for(std::chrono::milliseconds(5000));
-		exit(-1);
-	}
-	catch (std::exception& e) {
-		span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-		fprintf(stderr, "ERROR: Error initializing networks: %s\n", e.what());
-		std::this_thread::sleep_for(std::chrono::milliseconds(5000));
-		exit(-1);
-	}
-}
-
-void CV1::initializeMembers()
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::initializeMembers");
-	auto scope = tracer->WithActiveSpan(span);
-
-	std::string memberId;
-	std::string networkId;
-	try {
-		std::unordered_map<std::string, std::string> networkMembers;
-		fprintf(stderr, "Initializing Members...\n");
-
-		std::string setKeyBase = "network-nodes-all:{" + _myAddressStr + "}:";
-
-		if (_redisMemberStatus) {
-			fprintf(stderr, "Initialize Redis for members...\n");
-			std::unique_lock<std::shared_mutex> l(_networks_l);
-			std::unordered_set<std::string> deletes;
-			for (auto it : _networks) {
-				uint64_t nwid_i = it.first;
-				char nwidTmp[64] = { 0 };
-				OSUtils::ztsnprintf(nwidTmp, sizeof(nwidTmp), "%.16llx", nwid_i);
-				std::string nwid(nwidTmp);
-				std::string key = setKeyBase + nwid;
-				deletes.insert(key);
-			}
-
-			if (! deletes.empty()) {
-				try {
-					if (_rc->clusterMode) {
-						auto tx = _cluster->transaction(_myAddressStr, true, false);
-						for (std::string k : deletes) {
-							tx.del(k);
-						}
-						tx.exec();
-					}
-					else {
-						auto tx = _redis->transaction(true, false);
-						for (std::string k : deletes) {
-							tx.del(k);
-						}
-						tx.exec();
-					}
-				}
-				catch (sw::redis::Error& e) {
-					// ignore
-				}
-			}
-		}
-
-		char qbuf[2048];
-		sprintf(
-			qbuf,
-			"SELECT m.id, m.network_id, m.active_bridge, m.authorized, m.capabilities, "
-			"(EXTRACT(EPOCH FROM m.creation_time AT TIME ZONE 'UTC')*1000)::bigint, m.identity, "
-			"(EXTRACT(EPOCH FROM m.last_authorized_time AT TIME ZONE 'UTC')*1000)::bigint, "
-			"(EXTRACT(EPOCH FROM m.last_deauthorized_time AT TIME ZONE 'UTC')*1000)::bigint, "
-			"m.remote_trace_level, m.remote_trace_target, m.tags, m.v_major, m.v_minor, m.v_rev, m.v_proto, "
-			"m.no_auto_assign_ips, m.revision, m.sso_exempt, "
-			"(CASE WHEN n.sso_enabled = TRUE AND m.sso_exempt = FALSE THEN "
-			" ( "
-			"	SELECT (EXTRACT(EPOCH FROM e.authentication_expiry_time)*1000)::bigint "
-			"	FROM ztc_sso_expiry e "
-			"	INNER JOIN ztc_network n1 "
-			"	ON n1.id = e.network_id  AND n1.deleted = TRUE "
-			"	WHERE e.network_id = m.network_id AND e.member_id = m.id AND n.sso_enabled = TRUE AND e.authentication_expiry_time IS NOT NULL "
-			"	ORDER BY e.authentication_expiry_time DESC LIMIT 1 "
-			" ) "
-			" ELSE NULL "
-			" END) AS authentication_expiry_time, "
-			"ARRAY(SELECT DISTINCT address FROM ztc_member_ip_assignment WHERE member_id = m.id AND network_id = m.network_id) AS assigned_addresses "
-			"FROM ztc_member m "
-			"INNER JOIN ztc_network n "
-			"	ON n.id = m.network_id "
-			"WHERE n.controller_id = '%s' AND n.deleted = FALSE AND m.deleted = FALSE",
-			_myAddressStr.c_str());
-		auto c = _pool->borrow();
-		auto c2 = _pool->borrow();
-		pqxx::work w { *c->c };
-
-		fprintf(stderr, "Load members from psql...\n");
-		auto stream = pqxx::stream_from::query(w, qbuf);
-
-		std::tuple<
-			std::string	  // memberId
-			,
-			std::string	  // memberId
-			,
-			std::optional<bool>	  // activeBridge
-			,
-			std::optional<bool>	  // authorized
-			,
-			std::optional<std::string>	 // capabilities
-			,
-			std::optional<uint64_t>	  // creationTime
-			,
-			std::optional<std::string>	 // identity
-			,
-			std::optional<uint64_t>	  // lastAuthorizedTime
-			,
-			std::optional<uint64_t>	  // lastDeauthorizedTime
-			,
-			std::optional<int>	 // remoteTraceLevel
-			,
-			std::optional<std::string>	 // remoteTraceTarget
-			,
-			std::optional<std::string>	 // tags
-			,
-			std::optional<int>	 // vMajor
-			,
-			std::optional<int>	 // vMinor
-			,
-			std::optional<int>	 // vRev
-			,
-			std::optional<int>	 // vProto
-			,
-			std::optional<bool>	  // noAutoAssignIps
-			,
-			std::optional<uint64_t>	  // revision
-			,
-			std::optional<bool>	  // ssoExempt
-			,
-			std::optional<uint64_t>	  // authenticationExpiryTime
-			,
-			std::string	  // assignedAddresses
-			>
-			row;
-
-		uint64_t count = 0;
-		auto tmp = std::chrono::high_resolution_clock::now();
-		uint64_t total = 0;
-		while (stream >> row) {
-			auto start = std::chrono::high_resolution_clock::now();
-			json empty;
-			json config;
-
-			initMember(config);
-
-			memberId = std::get<0>(row);
-			networkId = std::get<1>(row);
-			std::optional<bool> activeBridge = std::get<2>(row);
-			std::optional<bool> authorized = std::get<3>(row);
-			std::optional<std::string> capabilities = std::get<4>(row);
-			std::optional<uint64_t> creationTime = std::get<5>(row);
-			std::optional<std::string> identity = std::get<6>(row);
-			std::optional<uint64_t> lastAuthorizedTime = std::get<7>(row);
-			std::optional<uint64_t> lastDeauthorizedTime = std::get<8>(row);
-			std::optional<int> remoteTraceLevel = std::get<9>(row);
-			std::optional<std::string> remoteTraceTarget = std::get<10>(row);
-			std::optional<std::string> tags = std::get<11>(row);
-			std::optional<int> vMajor = std::get<12>(row);
-			std::optional<int> vMinor = std::get<13>(row);
-			std::optional<int> vRev = std::get<14>(row);
-			std::optional<int> vProto = std::get<15>(row);
-			std::optional<bool> noAutoAssignIps = std::get<16>(row);
-			std::optional<uint64_t> revision = std::get<17>(row);
-			std::optional<bool> ssoExempt = std::get<18>(row);
-			std::optional<uint64_t> authenticationExpiryTime = std::get<19>(row);
-			std::string assignedAddresses = std::get<20>(row);
-
-			networkMembers.insert(std::pair<std::string, std::string>(setKeyBase + networkId, memberId));
-
-			config["id"] = memberId;
-			config["address"] = memberId;
-			config["nwid"] = networkId;
-			config["activeBridge"] = activeBridge.value_or(false);
-			config["authorized"] = authorized.value_or(false);
-			config["capabilities"] = json::parse(capabilities.value_or("[]"));
-			config["creationTime"] = creationTime.value_or(0);
-			config["identity"] = identity.value_or("");
-			config["lastAuthorizedTime"] = lastAuthorizedTime.value_or(0);
-			config["lastDeauthorizedTime"] = lastDeauthorizedTime.value_or(0);
-			config["remoteTraceLevel"] = remoteTraceLevel.value_or(0);
-			config["remoteTraceTarget"] = remoteTraceTarget.value_or("");
-			config["tags"] = json::parse(tags.value_or("[]"));
-			config["vMajor"] = vMajor.value_or(-1);
-			config["vMinor"] = vMinor.value_or(-1);
-			config["vRev"] = vRev.value_or(-1);
-			config["vProto"] = vProto.value_or(-1);
-			config["noAutoAssignIps"] = noAutoAssignIps.value_or(false);
-			config["revision"] = revision.value_or(0);
-			config["ssoExempt"] = ssoExempt.value_or(false);
-			config["authenticationExpiryTime"] = authenticationExpiryTime.value_or(0);
-			config["objtype"] = "member";
-			config["ipAssignments"] = json::array();
-
-			if (assignedAddresses != "{}") {
-				std::string tmp = assignedAddresses.substr(1, assignedAddresses.size() - 2);
-				std::vector<std::string> addrs = split(tmp, ',');
-				for (auto it = addrs.begin(); it != addrs.end(); ++it) {
-					config["ipAssignments"].push_back(*it);
-				}
-			}
-
-			Metrics::member_count++;
-
-			_memberChanged(empty, config, false);
-
-			memberId = "";
-			networkId = "";
-
-			auto end = std::chrono::high_resolution_clock::now();
-			auto dur = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-			total += dur.count();
-			++count;
-			if (count > 0 && count % 10000 == 0) {
-				fprintf(stderr, "Averaging %llu us per member\n", (total / count));
-			}
-		}
-		if (count > 0) {
-			fprintf(stderr, "Took %llu us per member to load\n", (total / count));
-		}
-
-		stream.complete();
-
-		w.commit();
-		_pool->unborrow(c2);
-		_pool->unborrow(c);
-		fprintf(stderr, "done.\n");
-
-		if (! networkMembers.empty()) {
-			if (_redisMemberStatus) {
-				fprintf(stderr, "Load member data into redis...\n");
-				if (_rc->clusterMode) {
-					auto tx = _cluster->transaction(_myAddressStr, true, false);
-					uint64_t count = 0;
-					for (auto it : networkMembers) {
-						tx.sadd(it.first, it.second);
-						if (++count % 30000 == 0) {
-							tx.exec();
-							tx = _cluster->transaction(_myAddressStr, true, false);
-						}
-					}
-					tx.exec();
-				}
-				else {
-					auto tx = _redis->transaction(true, false);
-					uint64_t count = 0;
-					for (auto it : networkMembers) {
-						tx.sadd(it.first, it.second);
-						if (++count % 30000 == 0) {
-							tx.exec();
-							tx = _redis->transaction(true, false);
-						}
-					}
-					tx.exec();
-				}
-				fprintf(stderr, "done.\n");
-			}
-		}
-
-		fprintf(stderr, "Done loading members...\n");
-
-		if (++this->_ready == 2) {
-			if (_waitNoticePrinted) {
-				fprintf(stderr, "[%s] NOTICE: %.10llx controller PostgreSQL data download complete." ZT_EOL_S, _timestr(), (unsigned long long)_myAddress.toInt());
-			}
-			_readyLock.unlock();
-		}
-	}
-	catch (sw::redis::Error& e) {
-		span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-		fprintf(stderr, "ERROR: Error initializing members (redis): %s\n", e.what());
-		exit(-1);
-	}
-	catch (std::exception& e) {
-		span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-		fprintf(stderr, "ERROR: Error initializing member: %s-%s %s\n", networkId.c_str(), memberId.c_str(), e.what());
-		exit(-1);
-	}
-}
-
-void CV1::heartbeat()
-{
-	char publicId[1024];
-	char hostnameTmp[1024];
-	_myId.toString(false, publicId);
-	if (gethostname(hostnameTmp, sizeof(hostnameTmp)) != 0) {
-		hostnameTmp[0] = (char)0;
-	}
-	else {
-		for (int i = 0; i < (int)sizeof(hostnameTmp); ++i) {
-			if ((hostnameTmp[i] == '.') || (hostnameTmp[i] == 0)) {
-				hostnameTmp[i] = (char)0;
-				break;
-			}
-		}
-	}
-	const char* controllerId = _myAddressStr.c_str();
-	const char* publicIdentity = publicId;
-	const char* hostname = hostnameTmp;
-
-	while (_run == 1) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv1");
-		auto span = tracer->StartSpan("cv1::heartbeat");
-		auto scope = tracer->WithActiveSpan(span);
-
-		// fprintf(stderr, "%s: heartbeat\n", controllerId);
-		auto c = _pool->borrow();
-		int64_t ts = OSUtils::now();
-
-		if (c->c) {
-			std::string major = std::to_string(ZEROTIER_ONE_VERSION_MAJOR);
-			std::string minor = std::to_string(ZEROTIER_ONE_VERSION_MINOR);
-			std::string rev = std::to_string(ZEROTIER_ONE_VERSION_REVISION);
-			std::string build = std::to_string(ZEROTIER_ONE_VERSION_BUILD);
-			std::string now = std::to_string(ts);
-			std::string host_port = std::to_string(_listenPort);
-			std::string use_redis = (_rc != NULL) ? "true" : "false";
-			std::string redis_mem_status = (_redisMemberStatus) ? "true" : "false";
-
-			try {
-				pqxx::work w { *c->c };
-
-				pqxx::result res = w.exec0(
-					"INSERT INTO ztc_controller (id, cluster_host, last_alive, public_identity, v_major, v_minor, v_rev, v_build, host_port, use_redis, redis_member_status) "
-					"VALUES ("
-					+ w.quote(controllerId) + ", " + w.quote(hostname) + ", TO_TIMESTAMP(" + now + "::double precision/1000), " + w.quote(publicIdentity) + ", " + major + ", " + minor + ", " + rev + ", " + build + ", " + host_port + ", "
-					+ use_redis + ", " + redis_mem_status
-					+ ") "
-					  "ON CONFLICT (id) DO UPDATE SET cluster_host = EXCLUDED.cluster_host, last_alive = EXCLUDED.last_alive, "
-					  "public_identity = EXCLUDED.public_identity, v_major = EXCLUDED.v_major, v_minor = EXCLUDED.v_minor, "
-					  "v_rev = EXCLUDED.v_rev, v_build = EXCLUDED.v_rev, host_port = EXCLUDED.host_port, "
-					  "use_redis = EXCLUDED.use_redis, redis_member_status = EXCLUDED.redis_member_status");
-				w.commit();
-			}
-			catch (std::exception& e) {
-				fprintf(stderr, "%s: Heartbeat update failed: %s\n", controllerId, e.what());
-				span->End();
-				std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-				continue;
-			}
-		}
-		_pool->unborrow(c);
-
-		try {
-			if (_redisMemberStatus) {
-				if (_rc->clusterMode) {
-					_cluster->zadd("controllers", "controllerId", ts);
-				}
-				else {
-					_redis->zadd("controllers", "controllerId", ts);
-				}
-			}
-		}
-		catch (sw::redis::Error& e) {
-			fprintf(stderr, "ERROR: Redis error in heartbeat thread: %s\n", e.what());
-		}
-
-		span->End();
-		std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-	}
-	fprintf(stderr, "Exited heartbeat thread\n");
-}
-
-void CV1::membersDbWatcher()
-{
-	if (_rc) {
-		_membersWatcher_Redis();
-	}
-	else {
-		_membersWatcher_Postgres();
-	}
-
-	if (_run == 1) {
-		fprintf(stderr, "ERROR: %s membersDbWatcher should still be running! Exiting Controller.\n", _myAddressStr.c_str());
-		exit(9);
-	}
-	fprintf(stderr, "Exited membersDbWatcher\n");
-}
-
-void CV1::_membersWatcher_Postgres()
-{
-	auto c = _pool->borrow();
-
-	std::string stream = "member_" + _myAddressStr;
-
-	fprintf(stderr, "Listening to member stream: %s\n", stream.c_str());
-	MemberNotificationReceiver<CV1> m(this, *c->c, stream);
-
-	while (_run == 1) {
-		c->c->await_notification(5, 0);
-	}
-
-	_pool->unborrow(c);
-}
-
-void CV1::_membersWatcher_Redis()
-{
-	char buf[11] = { 0 };
-	std::string key = "member-stream:{" + std::string(_myAddress.toString(buf)) + "}";
-	std::string lastID = "0";
-	fprintf(stderr, "Listening to member stream: %s\n", key.c_str());
-	while (_run == 1) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv1");
-		auto span = tracer->StartSpan("cv1::_membersWatcher_Redis");
-		auto scope = tracer->WithActiveSpan(span);
-
-		try {
-			json tmp;
-			std::unordered_map<std::string, ItemStream> result;
-			if (_rc->clusterMode) {
-				_cluster->xread(key, lastID, std::chrono::seconds(1), 0, std::inserter(result, result.end()));
-			}
-			else {
-				_redis->xread(key, lastID, std::chrono::seconds(1), 0, std::inserter(result, result.end()));
-			}
-			if (! result.empty()) {
-				for (auto element : result) {
-#ifdef REDIS_TRACE
-					fprintf(stdout, "Received notification from: %s\n", element.first.c_str());
-#endif
-					for (auto rec : element.second) {
-						std::string id = rec.first;
-						auto attrs = rec.second;
-#ifdef REDIS_TRACE
-						fprintf(stdout, "Record ID: %s\n", id.c_str());
-						fprintf(stdout, "attrs len: %lu\n", attrs.size());
-#endif
-						for (auto a : attrs) {
-#ifdef REDIS_TRACE
-							fprintf(stdout, "key: %s\nvalue: %s\n", a.first.c_str(), a.second.c_str());
-#endif
-							try {
-								tmp = json::parse(a.second);
-								json& ov = tmp["old_val"];
-								json& nv = tmp["new_val"];
-								json oldConfig, newConfig;
-								if (ov.is_object())
-									oldConfig = ov;
-								if (nv.is_object())
-									newConfig = nv;
-								if (oldConfig.is_object() || newConfig.is_object()) {
-									_memberChanged(oldConfig, newConfig, (this->_ready >= 2));
-								}
-							}
-							catch (...) {
-								fprintf(stderr, "json parse error in _membersWatcher_Redis: %s\n", a.second.c_str());
-							}
-						}
-						if (_rc->clusterMode) {
-							_cluster->xdel(key, id);
-						}
-						else {
-							_redis->xdel(key, id);
-						}
-						lastID = id;
-						Metrics::redis_mem_notification++;
-					}
-				}
-			}
-		}
-		catch (sw::redis::Error& e) {
-			span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-			fprintf(stderr, "Error in Redis members watcher: %s\n", e.what());
-		}
-	}
-	fprintf(stderr, "membersWatcher ended\n");
-}
-
-void CV1::networksDbWatcher()
-{
-	if (_rc) {
-		_networksWatcher_Redis();
-	}
-	else {
-		_networksWatcher_Postgres();
-	}
-
-	if (_run == 1) {
-		fprintf(stderr, "ERROR: %s networksDbWatcher should still be running! Exiting Controller.\n", _myAddressStr.c_str());
-		exit(8);
-	}
-	fprintf(stderr, "Exited networksDbWatcher\n");
-}
-
-void CV1::_networksWatcher_Postgres()
-{
-	std::string stream = "network_" + _myAddressStr;
-
-	fprintf(stderr, "Listening to member stream: %s\n", stream.c_str());
-
-	auto c = _pool->borrow();
-
-	NetworkNotificationReceiver<CV1> n(this, *c->c, stream);
-
-	while (_run == 1) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv1");
-		auto span = tracer->StartSpan("cv1::_networksWatcher_Postgres");
-		auto scope = tracer->WithActiveSpan(span);
-
-		c->c->await_notification(5, 0);
-	}
-}
-
-void CV1::_networksWatcher_Redis()
-{
-	char buf[11] = { 0 };
-	std::string key = "network-stream:{" + std::string(_myAddress.toString(buf)) + "}";
-	std::string lastID = "0";
-	while (_run == 1) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv1");
-		auto span = tracer->StartSpan("cv1::_networksWatcher_Redis");
-		auto scope = tracer->WithActiveSpan(span);
-
-		try {
-			json tmp;
-			std::unordered_map<std::string, ItemStream> result;
-			if (_rc->clusterMode) {
-				_cluster->xread(key, lastID, std::chrono::seconds(1), 0, std::inserter(result, result.end()));
-			}
-			else {
-				_redis->xread(key, lastID, std::chrono::seconds(1), 0, std::inserter(result, result.end()));
-			}
-
-			if (! result.empty()) {
-				for (auto element : result) {
-#ifdef REDIS_TRACE
-					fprintf(stdout, "Received notification from: %s\n", element.first.c_str());
-#endif
-					for (auto rec : element.second) {
-						std::string id = rec.first;
-						auto attrs = rec.second;
-#ifdef REDIS_TRACE
-						fprintf(stdout, "Record ID: %s\n", id.c_str());
-						fprintf(stdout, "attrs len: %lu\n", attrs.size());
-#endif
-						for (auto a : attrs) {
-#ifdef REDIS_TRACE
-							fprintf(stdout, "key: %s\nvalue: %s\n", a.first.c_str(), a.second.c_str());
-#endif
-							try {
-								tmp = json::parse(a.second);
-								json& ov = tmp["old_val"];
-								json& nv = tmp["new_val"];
-								json oldConfig, newConfig;
-								if (ov.is_object())
-									oldConfig = ov;
-								if (nv.is_object())
-									newConfig = nv;
-								if (oldConfig.is_object() || newConfig.is_object()) {
-									_networkChanged(oldConfig, newConfig, (this->_ready >= 2));
-								}
-							}
-							catch (std::exception& e) {
-								fprintf(stderr, "json parse error in networkWatcher_Redis: what: %s json: %s\n", e.what(), a.second.c_str());
-							}
-						}
-						if (_rc->clusterMode) {
-							_cluster->xdel(key, id);
-						}
-						else {
-							_redis->xdel(key, id);
-						}
-						lastID = id;
-					}
-					Metrics::redis_net_notification++;
-				}
-			}
-		}
-		catch (sw::redis::Error& e) {
-			span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-			fprintf(stderr, "Error in Redis networks watcher: %s\n", e.what());
-		}
-	}
-	fprintf(stderr, "networksWatcher ended\n");
-}
-
-void CV1::commitThread()
-{
-	fprintf(stderr, "%s: commitThread start\n", _myAddressStr.c_str());
-	std::pair<nlohmann::json, bool> qitem;
-	while (_commitQueue.get(qitem) & (_run == 1)) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv1");
-		auto span = tracer->StartSpan("cv1::commitThread");
-		auto scope = tracer->WithActiveSpan(span);
-
-		// fprintf(stderr, "commitThread tick\n");
-		if (! qitem.first.is_object()) {
-			fprintf(stderr, "not an object\n");
-			continue;
-		}
-
-		std::shared_ptr<PostgresConnection> c;
-		try {
-			c = _pool->borrow();
-		}
-		catch (std::exception& e) {
-			fprintf(stderr, "ERROR: %s\n", e.what());
-			continue;
-		}
-
-		if (! c) {
-			fprintf(stderr, "Error getting database connection\n");
-			continue;
-		}
-
-		Metrics::pgsql_commit_ticks++;
-		try {
-			nlohmann::json& config = (qitem.first);
-			const std::string objtype = config["objtype"];
-			if (objtype == "member") {
-				auto mspan = tracer->StartSpan("cv1::commitThread::member");
-				auto mscope = tracer->WithActiveSpan(mspan);
-
-				// fprintf(stderr, "%s: commitThread: member\n", _myAddressStr.c_str());
-				std::string memberId;
-				std::string networkId;
-				try {
-					pqxx::work w(*c->c);
-
-					memberId = config["id"];
-					networkId = config["nwid"];
-
-					std::string target = "NULL";
-					if (! config["remoteTraceTarget"].is_null()) {
-						target = config["remoteTraceTarget"];
-					}
-
-					pqxx::row nwrow = w.exec_params1("SELECT COUNT(id) FROM ztc_network WHERE id = $1", networkId);
-					int nwcount = nwrow[0].as<int>();
-
-					if (nwcount != 1) {
-						fprintf(stderr, "network %s does not exist.  skipping member upsert\n", networkId.c_str());
-						w.abort();
-						_pool->unborrow(c);
-						continue;
-					}
-
-					pqxx::row mrow = w.exec_params1("SELECT COUNT(id) FROM ztc_member WHERE id = $1 AND network_id = $2", memberId, networkId);
-					int membercount = mrow[0].as<int>();
-
-					bool isNewMember = false;
-					if (membercount == 0) {
-						// new member
-						isNewMember = true;
-						pqxx::result res = w.exec_params0(
-							"INSERT INTO ztc_member (id, network_id, active_bridge, authorized, capabilities, "
-							"identity, last_authorized_time, last_deauthorized_time, no_auto_assign_ips, "
-							"remote_trace_level, remote_trace_target, revision, tags, v_major, v_minor, v_rev, v_proto) "
-							"VALUES ($1, $2, $3, $4, $5, $6, "
-							"TO_TIMESTAMP($7::double precision/1000), TO_TIMESTAMP($8::double precision/1000), "
-							"$9, $10, $11, $12, $13, $14, $15, $16, $17)",
-							memberId,
-							networkId,
-							(bool)config["activeBridge"],
-							(bool)config["authorized"],
-							OSUtils::jsonDump(config["capabilities"], -1),
-							OSUtils::jsonString(config["identity"], ""),
-							(uint64_t)config["lastAuthorizedTime"],
-							(uint64_t)config["lastDeauthorizedTime"],
-							(bool)config["noAutoAssignIps"],
-							(int)config["remoteTraceLevel"],
-							target,
-							(uint64_t)config["revision"],
-							OSUtils::jsonDump(config["tags"], -1),
-							(int)config["vMajor"],
-							(int)config["vMinor"],
-							(int)config["vRev"],
-							(int)config["vProto"]);
-					}
-					else {
-						// existing member
-						pqxx::result res = w.exec_params0(
-							"UPDATE ztc_member "
-							"SET active_bridge = $3, authorized = $4, capabilities = $5, identity = $6, "
-							"last_authorized_time = TO_TIMESTAMP($7::double precision/1000), "
-							"last_deauthorized_time = TO_TIMESTAMP($8::double precision/1000), "
-							"no_auto_assign_ips = $9, remote_trace_level = $10, remote_trace_target= $11, "
-							"revision = $12, tags = $13, v_major = $14, v_minor = $15, v_rev = $16, v_proto = $17 "
-							"WHERE id = $1 AND network_id = $2",
-							memberId,
-							networkId,
-							(bool)config["activeBridge"],
-							(bool)config["authorized"],
-							OSUtils::jsonDump(config["capabilities"], -1),
-							OSUtils::jsonString(config["identity"], ""),
-							(uint64_t)config["lastAuthorizedTime"],
-							(uint64_t)config["lastDeauthorizedTime"],
-							(bool)config["noAutoAssignIps"],
-							(int)config["remoteTraceLevel"],
-							target,
-							(uint64_t)config["revision"],
-							OSUtils::jsonDump(config["tags"], -1),
-							(int)config["vMajor"],
-							(int)config["vMinor"],
-							(int)config["vRev"],
-							(int)config["vProto"]);
-					}
-
-					if (! isNewMember) {
-						pqxx::result res = w.exec_params0("DELETE FROM ztc_member_ip_assignment WHERE member_id = $1 AND network_id = $2", memberId, networkId);
-					}
-
-					std::vector<std::string> assignments;
-					bool ipAssignError = false;
-					for (auto i = config["ipAssignments"].begin(); i != config["ipAssignments"].end(); ++i) {
-						std::string addr = *i;
-
-						if (std::find(assignments.begin(), assignments.end(), addr) != assignments.end()) {
-							continue;
-						}
-
-						pqxx::result res = w.exec_params0("INSERT INTO ztc_member_ip_assignment (member_id, network_id, address) VALUES ($1, $2, $3) ON CONFLICT (network_id, member_id, address) DO NOTHING", memberId, networkId, addr);
-
-						assignments.push_back(addr);
-					}
-					if (ipAssignError) {
-						fprintf(stderr, "%s: ipAssignError\n", _myAddressStr.c_str());
-						w.abort();
-						_pool->unborrow(c);
-						c.reset();
-						continue;
-					}
-
-					w.commit();
-
-					if (_smee != NULL && isNewMember) {
-						pqxx::row row = w.exec_params1(
-							"SELECT "
-							"	count(h.hook_id) "
-							"FROM "
-							"	ztc_hook h "
-							"	INNER JOIN ztc_org o ON o.org_id = h.org_id "
-							"   INNER JOIN ztc_network n ON n.owner_id = o.owner_id "
-							" WHERE "
-							"n.id = $1 ",
-							networkId);
-						int64_t hookCount = row[0].as<int64_t>();
-						if (hookCount > 0) {
-							notifyNewMember(networkId, memberId);
-						}
-					}
-
-					const uint64_t nwidInt = OSUtils::jsonIntHex(config["nwid"], 0ULL);
-					const uint64_t memberidInt = OSUtils::jsonIntHex(config["id"], 0ULL);
-					if (nwidInt && memberidInt) {
-						nlohmann::json nwOrig;
-						nlohmann::json memOrig;
-
-						nlohmann::json memNew(config);
-
-						get(nwidInt, nwOrig, memberidInt, memOrig);
-
-						_memberChanged(memOrig, memNew, qitem.second);
-					}
-					else {
-						fprintf(stderr, "%s: Can't notify of change.  Error parsing nwid or memberid: %llu-%llu\n", _myAddressStr.c_str(), (unsigned long long)nwidInt, (unsigned long long)memberidInt);
-					}
-				}
-				catch (std::exception& e) {
-					fprintf(stderr, "%s ERROR: Error updating member %s-%s: %s\n", _myAddressStr.c_str(), networkId.c_str(), memberId.c_str(), e.what());
-					mspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-				}
-			}
-			else if (objtype == "network") {
-				auto nspan = tracer->StartSpan("cv1::commitThread::network");
-				auto nscope = tracer->WithActiveSpan(nspan);
-
-				try {
-					// fprintf(stderr, "%s: commitThread: network\n", _myAddressStr.c_str());
-					pqxx::work w(*c->c);
-
-					std::string id = config["id"];
-					std::string remoteTraceTarget = "";
-					if (! config["remoteTraceTarget"].is_null()) {
-						remoteTraceTarget = config["remoteTraceTarget"];
-					}
-					std::string rulesSource = "";
-					if (config["rulesSource"].is_string()) {
-						rulesSource = config["rulesSource"];
-					}
-
-					// This ugly query exists because when we want to mirror networks to/from
-					// another data store (e.g. FileDB or LFDB) it is possible to get a network
-					// that doesn't exist in Central's database. This does an upsert and sets
-					// the owner_id to the "first" global admin in the user DB if the record
-					// did not previously exist. If the record already exists owner_id is left
-					// unchanged, so owner_id should be left out of the update clause.
-					pqxx::result res = w.exec_params0(
-						"INSERT INTO ztc_network (id, creation_time, owner_id, controller_id, capabilities, enable_broadcast, "
-						"last_modified, mtu, multicast_limit, name, private, "
-						"remote_trace_level, remote_trace_target, rules, rules_source, "
-						"tags, v4_assign_mode, v6_assign_mode, sso_enabled) VALUES ("
-						"$1, TO_TIMESTAMP($5::double precision/1000), "
-						"(SELECT user_id AS owner_id FROM ztc_global_permissions WHERE authorize = true AND del = true AND modify = true AND read = true LIMIT 1),"
-						"$2, $3, $4, TO_TIMESTAMP($5::double precision/1000), "
-						"$6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) "
-						"ON CONFLICT (id) DO UPDATE set controller_id = EXCLUDED.controller_id, "
-						"capabilities = EXCLUDED.capabilities, enable_broadcast = EXCLUDED.enable_broadcast, "
-						"last_modified = EXCLUDED.last_modified, mtu = EXCLUDED.mtu, "
-						"multicast_limit = EXCLUDED.multicast_limit, name = EXCLUDED.name, "
-						"private = EXCLUDED.private, remote_trace_level = EXCLUDED.remote_trace_level, "
-						"remote_trace_target = EXCLUDED.remote_trace_target, rules = EXCLUDED.rules, "
-						"rules_source = EXCLUDED.rules_source, tags = EXCLUDED.tags, "
-						"v4_assign_mode = EXCLUDED.v4_assign_mode, v6_assign_mode = EXCLUDED.v6_assign_mode, "
-						"sso_enabled = EXCLUDED.sso_enabled",
-						id,
-						_myAddressStr,
-						OSUtils::jsonDump(config["capabilities"], -1),
-						(bool)config["enableBroadcast"],
-						OSUtils::now(),
-						(int)config["mtu"],
-						(int)config["multicastLimit"],
-						OSUtils::jsonString(config["name"], ""),
-						(bool)config["private"],
-						(int)config["remoteTraceLevel"],
-						remoteTraceTarget,
-						OSUtils::jsonDump(config["rules"], -1),
-						rulesSource,
-						OSUtils::jsonDump(config["tags"], -1),
-						OSUtils::jsonDump(config["v4AssignMode"], -1),
-						OSUtils::jsonDump(config["v6AssignMode"], -1),
-						OSUtils::jsonBool(config["ssoEnabled"], false));
-
-					res = w.exec_params0("DELETE FROM ztc_network_assignment_pool WHERE network_id = $1", 0);
-
-					auto pool = config["ipAssignmentPools"];
-					bool err = false;
-					for (auto i = pool.begin(); i != pool.end(); ++i) {
-						std::string start = (*i)["ipRangeStart"];
-						std::string end = (*i)["ipRangeEnd"];
-
-						res = w.exec_params0(
-							"INSERT INTO ztc_network_assignment_pool (network_id, ip_range_start, ip_range_end) "
-							"VALUES ($1, $2, $3)",
-							id,
-							start,
-							end);
-					}
-
-					res = w.exec_params0("DELETE FROM ztc_network_route WHERE network_id = $1", id);
-
-					auto routes = config["routes"];
-					err = false;
-					for (auto i = routes.begin(); i != routes.end(); ++i) {
-						std::string t = (*i)["target"];
-						std::vector<std::string> target;
-						std::istringstream f(t);
-						std::string s;
-						while (std::getline(f, s, '/')) {
-							target.push_back(s);
-						}
-						if (target.empty() || target.size() != 2) {
-							continue;
-						}
-						std::string targetAddr = target[0];
-						std::string targetBits = target[1];
-						std::string via = "NULL";
-						if (! (*i)["via"].is_null()) {
-							via = (*i)["via"];
-						}
-
-						res = w.exec_params0("INSERT INTO ztc_network_route (network_id, address, bits, via) VALUES ($1, $2, $3, $4)", id, targetAddr, targetBits, (via == "NULL" ? NULL : via.c_str()));
-					}
-					if (err) {
-						fprintf(stderr, "%s: route add error\n", _myAddressStr.c_str());
-						w.abort();
-						_pool->unborrow(c);
-						continue;
-					}
-
-					auto dns = config["dns"];
-					std::string domain = dns["domain"];
-					std::stringstream servers;
-					servers << "{";
-					for (auto j = dns["servers"].begin(); j < dns["servers"].end(); ++j) {
-						servers << *j;
-						if ((j + 1) != dns["servers"].end()) {
-							servers << ",";
-						}
-					}
-					servers << "}";
-
-					std::string s = servers.str();
-
-					res = w.exec_params0("INSERT INTO ztc_network_dns (network_id, domain, servers) VALUES ($1, $2, $3) ON CONFLICT (network_id) DO UPDATE SET domain = EXCLUDED.domain, servers = EXCLUDED.servers", id, domain, s);
-
-					w.commit();
-
-					const uint64_t nwidInt = OSUtils::jsonIntHex(config["nwid"], 0ULL);
-					if (nwidInt) {
-						nlohmann::json nwOrig;
-						nlohmann::json nwNew(config);
-
-						get(nwidInt, nwOrig);
-
-						_networkChanged(nwOrig, nwNew, qitem.second);
-					}
-					else {
-						fprintf(stderr, "%s: Can't notify network changed: %llu\n", _myAddressStr.c_str(), (unsigned long long)nwidInt);
-					}
-				}
-				catch (std::exception& e) {
-					nspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-					fprintf(stderr, "%s ERROR: Error updating network: %s\n", _myAddressStr.c_str(), e.what());
-				}
-				if (_redisMemberStatus) {
-					try {
-						std::string id = config["id"];
-						std::string controllerId = _myAddressStr.c_str();
-						std::string key = "networks:{" + controllerId + "}";
-						if (_rc->clusterMode) {
-							_cluster->sadd(key, id);
-						}
-						else {
-							_redis->sadd(key, id);
-						}
-					}
-					catch (sw::redis::Error& e) {
-						nspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-						fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what());
-					}
-				}
-			}
-			else if (objtype == "_delete_network") {
-				auto dspan = tracer->StartSpan("cv1::commitThread::_delete_network");
-				auto dscope = tracer->WithActiveSpan(dspan);
-
-				// fprintf(stderr, "%s: commitThread: delete network\n", _myAddressStr.c_str());
-				try {
-					pqxx::work w(*c->c);
-
-					std::string networkId = config["nwid"];
-
-					pqxx::result res = w.exec_params0("UPDATE ztc_network SET deleted = true WHERE id = $1", networkId);
-
-					w.commit();
-				}
-				catch (std::exception& e) {
-					dspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-					fprintf(stderr, "%s ERROR: Error deleting network: %s\n", _myAddressStr.c_str(), e.what());
-				}
-				if (_redisMemberStatus) {
-					try {
-						std::string id = config["id"];
-						std::string controllerId = _myAddressStr.c_str();
-						std::string key = "networks:{" + controllerId + "}";
-						if (_rc->clusterMode) {
-							_cluster->srem(key, id);
-							_cluster->del("network-nodes-online:{" + controllerId + "}:" + id);
-						}
-						else {
-							_redis->srem(key, id);
-							_redis->del("network-nodes-online:{" + controllerId + "}:" + id);
-						}
-					}
-					catch (sw::redis::Error& e) {
-						dspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-						fprintf(stderr, "ERROR: Error adding network to Redis: %s\n", e.what());
-					}
-				}
-			}
-			else if (objtype == "_delete_member") {
-				auto mspan = tracer->StartSpan("cv1::commitThread::_delete_member");
-				auto mscope = tracer->WithActiveSpan(mspan);
-
-				// fprintf(stderr, "%s commitThread: delete member\n", _myAddressStr.c_str());
-				try {
-					pqxx::work w(*c->c);
-
-					std::string memberId = config["id"];
-					std::string networkId = config["nwid"];
-
-					pqxx::result res = w.exec_params0("UPDATE ztc_member SET hidden = true, deleted = true WHERE id = $1 AND network_id = $2", memberId, networkId);
-
-					w.commit();
-				}
-				catch (std::exception& e) {
-					mspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-					fprintf(stderr, "%s ERROR: Error deleting member: %s\n", _myAddressStr.c_str(), e.what());
-				}
-				if (_redisMemberStatus) {
-					try {
-						std::string memberId = config["id"];
-						std::string networkId = config["nwid"];
-						std::string controllerId = _myAddressStr.c_str();
-						std::string key = "network-nodes-all:{" + controllerId + "}:" + networkId;
-						if (_rc->clusterMode) {
-							_cluster->srem(key, memberId);
-							_cluster->del("member:{" + controllerId + "}:" + networkId + ":" + memberId);
-						}
-						else {
-							_redis->srem(key, memberId);
-							_redis->del("member:{" + controllerId + "}:" + networkId + ":" + memberId);
-						}
-					}
-					catch (sw::redis::Error& e) {
-						mspan->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-						fprintf(stderr, "ERROR: Error deleting member from Redis: %s\n", e.what());
-					}
-				}
-			}
-			else {
-				fprintf(stderr, "%s ERROR: unknown objtype\n", _myAddressStr.c_str());
-			}
-		}
-		catch (std::exception& e) {
-			span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-			fprintf(stderr, "%s ERROR: Error getting objtype: %s\n", _myAddressStr.c_str(), e.what());
-		}
-		_pool->unborrow(c);
-		c.reset();
-	}
-
-	fprintf(stderr, "%s commitThread finished\n", _myAddressStr.c_str());
-}
-
-void CV1::notifyNewMember(const std::string& networkID, const std::string& memberID)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::notifyNewMember");
-	auto scope = tracer->WithActiveSpan(span);
-
-	smeeclient::smee_client_notify_network_joined(_smee, networkID.c_str(), memberID.c_str());
-}
-
-void CV1::onlineNotificationThread()
-{
-	waitForReady();
-	if (_redisMemberStatus) {
-		onlineNotification_Redis();
-	}
-	else {
-		onlineNotification_Postgres();
-	}
-}
-
-/**
- * ONLY UNCOMMENT FOR TEMPORARY DB MAINTENANCE
- *
- * This define temporarily turns off writing to the member status table
- * so it can be reindexed when the indexes get too large.
- */
-
-// #define DISABLE_MEMBER_STATUS 1
-
-void CV1::onlineNotification_Postgres()
-{
-	_connected = 1;
-
-	nlohmann::json jtmp1, jtmp2;
-	while (_run == 1) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv1");
-		auto span = tracer->StartSpan("cv1::onlineNotification_Postgres");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto c = _pool->borrow();
-		auto c2 = _pool->borrow();
-		try {
-			fprintf(stderr, "%s onlineNotification_Postgres\n", _myAddressStr.c_str());
-			std::unordered_map<std::pair<uint64_t, uint64_t>, NodeOnlineRecord, _PairHasher> lastOnline;
-			{
-				std::lock_guard<std::mutex> l(_lastOnline_l);
-				lastOnline.swap(_lastOnline);
-			}
-
-#ifndef DISABLE_MEMBER_STATUS
-			pqxx::work w(*c->c);
-			pqxx::work w2(*c2->c);
-
-			fprintf(stderr, "online notification tick\n");
-
-			bool firstRun = true;
-			bool memberAdded = false;
-			int updateCount = 0;
-
-			pqxx::pipeline pipe(w);
-
-			for (auto i = lastOnline.begin(); i != lastOnline.end(); ++i) {
-				updateCount += 1;
-				uint64_t nwid_i = i->first.first;
-				char nwidTmp[64];
-				char memTmp[64];
-				char ipTmp[64];
-				OSUtils::ztsnprintf(nwidTmp, sizeof(nwidTmp), "%.16llx", nwid_i);
-				OSUtils::ztsnprintf(memTmp, sizeof(memTmp), "%.10llx", i->first.second);
-
-				if (! get(nwid_i, jtmp1, i->first.second, jtmp2)) {
-					continue;	// skip non existent networks/members
-				}
-
-				std::string networkId(nwidTmp);
-				std::string memberId(memTmp);
-
-				try {
-					pqxx::row r = w2.exec_params1("SELECT id, network_id FROM ztc_member WHERE network_id = $1 AND id = $2", networkId, memberId);
-				}
-				catch (pqxx::unexpected_rows& e) {
-					continue;
-				}
-
-				int64_t ts = i->second.lastSeen;
-				std::string ipAddr = i->second.physicalAddress.toIpString(ipTmp);
-				std::string timestamp = std::to_string(ts);
-				std::string osArch = i->second.osArch;
-
-				std::stringstream memberUpdate;
-				memberUpdate << "INSERT INTO ztc_member_status (network_id, member_id, address, last_updated) VALUES "
-							 << "('" << networkId << "', '" << memberId << "', ";
-				if (ipAddr.empty()) {
-					memberUpdate << "NULL, ";
-				}
-				else {
-					memberUpdate << "'" << ipAddr << "', ";
-				}
-				memberUpdate << "TO_TIMESTAMP(" << timestamp << "::double precision/1000)) "
-							 << " ON CONFLICT (network_id, member_id) DO UPDATE SET address = EXCLUDED.address, last_updated = EXCLUDED.last_updated";
-
-				pipe.insert(memberUpdate.str());
-				Metrics::pgsql_node_checkin++;
-			}
-			while (! pipe.empty()) {
-				pipe.retrieve();
-			}
-
-			pipe.complete();
-			w.commit();
-			fprintf(stderr, "%s: Updated online status of %d members\n", _myAddressStr.c_str(), updateCount);
-#endif
-		}
-		catch (std::exception& e) {
-			fprintf(stderr, "%s: error in onlinenotification thread: %s\n", _myAddressStr.c_str(), e.what());
-		}
-		_pool->unborrow(c2);
-		_pool->unborrow(c);
-
-		ConnectionPoolStats stats = _pool->get_stats();
-		fprintf(stderr, "%s pool stats: in use size: %llu, available size: %llu, total: %llu\n", _myAddressStr.c_str(), stats.borrowed_size, stats.pool_size, (stats.borrowed_size + stats.pool_size));
-
-		span->End();
-
-		std::this_thread::sleep_for(std::chrono::seconds(10));
-	}
-	fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
-	if (_run == 1) {
-		fprintf(stderr, "ERROR: %s onlineNotificationThread should still be running! Exiting Controller.\n", _myAddressStr.c_str());
-		exit(6);
-	}
-}
-
-void CV1::onlineNotification_Redis()
-{
-	_connected = 1;
-
-	char buf[11] = { 0 };
-	std::string controllerId = std::string(_myAddress.toString(buf));
-
-	while (_run == 1) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv1");
-		auto span = tracer->StartSpan("cv1::onlineNotification_Redis");
-		auto scope = tracer->WithActiveSpan(span);
-
-		fprintf(stderr, "onlineNotification tick\n");
-		auto start = std::chrono::high_resolution_clock::now();
-		uint64_t count = 0;
-
-		std::unordered_map<std::pair<uint64_t, uint64_t>, NodeOnlineRecord, _PairHasher> lastOnline;
-		{
-			std::lock_guard<std::mutex> l(_lastOnline_l);
-			lastOnline.swap(_lastOnline);
-		}
-		try {
-			if (! lastOnline.empty()) {
-				if (_rc->clusterMode) {
-					auto tx = _cluster->transaction(controllerId, true, false);
-					count = _doRedisUpdate(tx, controllerId, lastOnline);
-				}
-				else {
-					auto tx = _redis->transaction(true, false);
-					count = _doRedisUpdate(tx, controllerId, lastOnline);
-				}
-			}
-		}
-		catch (sw::redis::Error& e) {
-			fprintf(stderr, "Error in online notification thread (redis): %s\n", e.what());
-		}
-
-		auto end = std::chrono::high_resolution_clock::now();
-		auto dur = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
-		auto total = dur.count();
-
-		fprintf(stderr, "onlineNotification ran in %llu ms\n", total);
-		span->End();
-
-		std::this_thread::sleep_for(std::chrono::seconds(5));
-	}
-}
-
-uint64_t CV1::_doRedisUpdate(sw::redis::Transaction& tx, std::string& controllerId, std::unordered_map<std::pair<uint64_t, uint64_t>, NodeOnlineRecord, _PairHasher>& lastOnline)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv1");
-	auto span = tracer->StartSpan("cv1::_doRedisUpdate");
-	auto scope = tracer->WithActiveSpan(span);
-
-	nlohmann::json jtmp1, jtmp2;
-	uint64_t count = 0;
-	for (auto i = lastOnline.begin(); i != lastOnline.end(); ++i) {
-		uint64_t nwid_i = i->first.first;
-		uint64_t memberid_i = i->first.second;
-		char nwidTmp[64];
-		char memTmp[64];
-		char ipTmp[64];
-		OSUtils::ztsnprintf(nwidTmp, sizeof(nwidTmp), "%.16llx", nwid_i);
-		OSUtils::ztsnprintf(memTmp, sizeof(memTmp), "%.10llx", memberid_i);
-
-		if (! get(nwid_i, jtmp1, memberid_i, jtmp2)) {
-			continue;	// skip non existent members/networks
-		}
-
-		std::string networkId(nwidTmp);
-		std::string memberId(memTmp);
-
-		int64_t ts = i->second.lastSeen;
-		std::string ipAddr = i->second.physicalAddress.toIpString(ipTmp);
-		std::string timestamp = std::to_string(ts);
-		std::string osArch = i->second.osArch;
-
-		std::unordered_map<std::string, std::string> record = { { "id", memberId }, { "address", ipAddr }, { "last_updated", std::to_string(ts) } };
-		tx.zadd("nodes-online:{" + controllerId + "}", memberId, ts)
-			.zadd("nodes-online2:{" + controllerId + "}", networkId + "-" + memberId, ts)
-			.zadd("network-nodes-online:{" + controllerId + "}:" + networkId, memberId, ts)
-			.zadd("active-networks:{" + controllerId + "}", networkId, ts)
-			.sadd("network-nodes-all:{" + controllerId + "}:" + networkId, memberId)
-			.hmset("member:{" + controllerId + "}:" + networkId + ":" + memberId, record.begin(), record.end());
-		++count;
-		Metrics::redis_node_checkin++;
-	}
-
-	// expire records from all-nodes and network-nodes member list
-	uint64_t expireOld = OSUtils::now() - 300000;
-
-	tx.zremrangebyscore("nodes-online:{" + controllerId + "}", sw::redis::RightBoundedInterval<double>(expireOld, sw::redis::BoundType::LEFT_OPEN));
-	tx.zremrangebyscore("nodes-online2:{" + controllerId + "}", sw::redis::RightBoundedInterval<double>(expireOld, sw::redis::BoundType::LEFT_OPEN));
-	tx.zremrangebyscore("active-networks:{" + controllerId + "}", sw::redis::RightBoundedInterval<double>(expireOld, sw::redis::BoundType::LEFT_OPEN));
-	{
-		std::shared_lock<std::shared_mutex> l(_networks_l);
-		for (const auto& it : _networks) {
-			uint64_t nwid_i = it.first;
-			char nwidTmp[64];
-			OSUtils::ztsnprintf(nwidTmp, sizeof(nwidTmp), "%.16llx", nwid_i);
-			tx.zremrangebyscore("network-nodes-online:{" + controllerId + "}:" + nwidTmp, sw::redis::RightBoundedInterval<double>(expireOld, sw::redis::BoundType::LEFT_OPEN));
-		}
-	}
-	tx.exec();
-	fprintf(stderr, "%s: Updated online status of %d members\n", _myAddressStr.c_str(), count);
-
-	return count;
-}
-
-#endif	 // ZT_CONTROLLER_USE_LIBPQ
diff --git a/controller/CV1.hpp b/controller/CV1.hpp
deleted file mode 100644
index b1a362798..000000000
--- a/controller/CV1.hpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "DB.hpp"
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-
-#ifndef ZT_CONTROLLER_CV1_HPP
-#define ZT_CONTROLLER_CV1_HPP
-
-#define ZT_CENTRAL_CONTROLLER_COMMIT_THREADS 4
-
-#include "../node/Metrics.hpp"
-#include "ConnectionPool.hpp"
-#include "PostgreSQL.hpp"
-
-#include <memory>
-#include <pqxx/pqxx>
-#include <redis++/redis++.h>
-
-namespace smeeclient {
-struct SmeeClient;
-}
-
-namespace ZeroTier {
-
-struct RedisConfig;
-
-/**
- * A controller database driver that talks to  PostgreSQL
- *
- * This is for use with ZeroTier Central.  Others are free to build and use it
- * but be aware that we might change it at any time.
- */
-class CV1 : public DB {
-	friend class MemberNotificationReceiver<CV1>;
-	friend class NetworkNotificationReceiver<CV1>;
-
-  public:
-	CV1(const Identity& myId, const char* path, int listenPort, RedisConfig* rc);
-	virtual ~CV1();
-
-	virtual bool waitForReady();
-	virtual bool isReady();
-	virtual bool save(nlohmann::json& record, bool notifyListeners);
-	virtual void eraseNetwork(const uint64_t networkId);
-	virtual void eraseMember(const uint64_t networkId, const uint64_t memberId);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch);
-	virtual AuthInfo getSSOAuthInfo(const nlohmann::json& member, const std::string& redirectURL);
-
-	virtual bool ready()
-	{
-		return _ready == 2;
-	}
-
-  protected:
-	struct _PairHasher {
-		inline std::size_t operator()(const std::pair<uint64_t, uint64_t>& p) const
-		{
-			return (std::size_t)(p.first ^ p.second);
-		}
-	};
-	virtual void _memberChanged(nlohmann::json& old, nlohmann::json& memberConfig, bool notifyListeners)
-	{
-		DB::_memberChanged(old, memberConfig, notifyListeners);
-	}
-
-	virtual void _networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, bool notifyListeners)
-	{
-		DB::_networkChanged(old, networkConfig, notifyListeners);
-	}
-
-  private:
-	void initializeNetworks();
-	void initializeMembers();
-	void heartbeat();
-	void membersDbWatcher();
-	void _membersWatcher_Postgres();
-	void networksDbWatcher();
-	void _networksWatcher_Postgres();
-
-	void _membersWatcher_Redis();
-	void _networksWatcher_Redis();
-
-	void commitThread();
-	void onlineNotificationThread();
-	void onlineNotification_Postgres();
-	void onlineNotification_Redis();
-	uint64_t _doRedisUpdate(sw::redis::Transaction& tx, std::string& controllerId, std::unordered_map<std::pair<uint64_t, uint64_t>, NodeOnlineRecord, _PairHasher>& lastOnline);
-
-	void configureSmee();
-	void notifyNewMember(const std::string& networkID, const std::string& memberID);
-
-	enum OverrideMode { ALLOW_PGBOUNCER_OVERRIDE = 0, NO_OVERRIDE = 1 };
-
-	std::shared_ptr<ConnectionPool<PostgresConnection> > _pool;
-
-	const Identity _myId;
-	const Address _myAddress;
-	std::string _myAddressStr;
-	std::string _connString;
-
-	BlockingQueue<std::pair<nlohmann::json, bool> > _commitQueue;
-
-	std::thread _heartbeatThread;
-	std::thread _membersDbWatcher;
-	std::thread _networksDbWatcher;
-	std::thread _commitThread[ZT_CENTRAL_CONTROLLER_COMMIT_THREADS];
-	std::thread _onlineNotificationThread;
-
-	std::unordered_map<std::pair<uint64_t, uint64_t>, NodeOnlineRecord, _PairHasher> _lastOnline;
-
-	mutable std::mutex _lastOnline_l;
-	mutable std::mutex _readyLock;
-	std::atomic<int> _ready, _connected, _run;
-	mutable volatile bool _waitNoticePrinted;
-
-	int _listenPort;
-	uint8_t _ssoPsk[48];
-
-	RedisConfig* _rc;
-	std::shared_ptr<sw::redis::Redis> _redis;
-	std::shared_ptr<sw::redis::RedisCluster> _cluster;
-	bool _redisMemberStatus;
-
-	smeeclient::SmeeClient* _smee;
-};
-
-}	// namespace ZeroTier
-
-#endif	 // ZT_CONTROLLER_CV1_HPP
-
-#endif	 // ZT_CONTROLLER_USE_LIBPQ
diff --git a/controller/CV2.cpp b/controller/CV2.cpp
deleted file mode 100644
index db9effb3c..000000000
--- a/controller/CV2.cpp
+++ /dev/null
@@ -1,1244 +0,0 @@
-/*
- * Copyright (c)2025 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "CV2.hpp"
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-
-#include "../node/Constants.hpp"
-#include "../node/SHA512.hpp"
-#include "../version.h"
-#include "CtlUtil.hpp"
-#include "EmbeddedNetworkController.hpp"
-#include "opentelemetry/trace/provider.h"
-
-#include <chrono>
-#include <climits>
-#include <iomanip>
-#include <libpq-fe.h>
-#include <sstream>
-
-using json = nlohmann::json;
-
-namespace {
-
-}
-
-using namespace ZeroTier;
-
-CV2::CV2(const Identity& myId, const char* path, int listenPort) : DB(), _pool(), _myId(myId), _myAddress(myId.address()), _ready(0), _connected(1), _run(1), _waitNoticePrinted(false), _listenPort(listenPort)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv2");
-	auto span = tracer->StartSpan("cv2::CV2");
-	auto scope = tracer->WithActiveSpan(span);
-
-	fprintf(stderr, "CV2::CV2\n");
-	char myAddress[64];
-	_myAddressStr = myId.address().toString(myAddress);
-
-	_connString = std::string(path);
-
-	auto f = std::make_shared<PostgresConnFactory>(_connString);
-	_pool = std::make_shared<ConnectionPool<PostgresConnection> >(15, 5, std::static_pointer_cast<ConnectionFactory>(f));
-
-	memset(_ssoPsk, 0, sizeof(_ssoPsk));
-	char* const ssoPskHex = getenv("ZT_SSO_PSK");
-#ifdef ZT_TRACE
-	fprintf(stderr, "ZT_SSO_PSK: %s\n", ssoPskHex);
-#endif
-	if (ssoPskHex) {
-		// SECURITY: note that ssoPskHex will always be null-terminated if libc actually
-		// returns something non-NULL. If the hex encodes something shorter than 48 bytes,
-		// it will be padded at the end with zeroes. If longer, it'll be truncated.
-		Utils::unhex(ssoPskHex, _ssoPsk, sizeof(_ssoPsk));
-	}
-
-	_readyLock.lock();
-
-	fprintf(stderr, "[%s] NOTICE: %.10llx controller PostgreSQL waiting for initial data download..." ZT_EOL_S, ::_timestr(), (unsigned long long)_myAddress.toInt());
-	_waitNoticePrinted = true;
-
-	initializeNetworks();
-	initializeMembers();
-
-	_heartbeatThread = std::thread(&CV2::heartbeat, this);
-	_membersDbWatcher = std::thread(&CV2::membersDbWatcher, this);
-	_networksDbWatcher = std::thread(&CV2::networksDbWatcher, this);
-	for (int i = 0; i < ZT_CENTRAL_CONTROLLER_COMMIT_THREADS; ++i) {
-		_commitThread[i] = std::thread(&CV2::commitThread, this);
-	}
-	_onlineNotificationThread = std::thread(&CV2::onlineNotificationThread, this);
-}
-
-CV2::~CV2()
-{
-	_run = 0;
-	std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-	_heartbeatThread.join();
-	_membersDbWatcher.join();
-	_networksDbWatcher.join();
-	_commitQueue.stop();
-	for (int i = 0; i < ZT_CENTRAL_CONTROLLER_COMMIT_THREADS; ++i) {
-		_commitThread[i].join();
-	}
-	_onlineNotificationThread.join();
-}
-
-bool CV2::waitForReady()
-{
-	while (_ready < 2) {
-		_readyLock.lock();
-		_readyLock.unlock();
-	}
-	return true;
-}
-
-bool CV2::isReady()
-{
-	return (_ready == 2) && _connected;
-}
-
-void CV2::_memberChanged(nlohmann::json& old, nlohmann::json& memberConfig, bool notifyListeners)
-{
-	DB::_memberChanged(old, memberConfig, notifyListeners);
-}
-
-void CV2::_networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, bool notifyListeners)
-{
-	DB::_networkChanged(old, networkConfig, notifyListeners);
-}
-
-bool CV2::save(nlohmann::json& record, bool notifyListeners)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv2");
-	auto span = tracer->StartSpan("cv2::save");
-	auto scope = tracer->WithActiveSpan(span);
-
-	bool modified = false;
-	try {
-		if (! record.is_object()) {
-			fprintf(stderr, "record is not an object?!?\n");
-			return false;
-		}
-		const std::string objtype = record["objtype"];
-		if (objtype == "network") {
-			auto nspan = tracer->StartSpan("cv2::save::network");
-			auto nscope = tracer->WithActiveSpan(nspan);
-
-			// fprintf(stderr, "network save\n");
-			const uint64_t nwid = OSUtils::jsonIntHex(record["id"], 0ULL);
-			if (nwid) {
-				nlohmann::json old;
-				get(nwid, old);
-				if ((! old.is_object()) || (! _compareRecords(old, record))) {
-					record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
-					_commitQueue.post(std::pair<nlohmann::json, bool>(record, notifyListeners));
-					modified = true;
-				}
-			}
-		}
-		else if (objtype == "member") {
-			auto mspan = tracer->StartSpan("cv2::save::member");
-			auto mscope = tracer->WithActiveSpan(mspan);
-
-			std::string networkId = record["nwid"];
-			std::string memberId = record["id"];
-			const uint64_t nwid = OSUtils::jsonIntHex(record["nwid"], 0ULL);
-			const uint64_t id = OSUtils::jsonIntHex(record["id"], 0ULL);
-			// fprintf(stderr, "member save %s-%s\n", networkId.c_str(), memberId.c_str());
-			if ((id) && (nwid)) {
-				nlohmann::json network, old;
-				get(nwid, network, id, old);
-				if ((! old.is_object()) || (! _compareRecords(old, record))) {
-					// fprintf(stderr, "commit queue post\n");
-					record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
-					_commitQueue.post(std::pair<nlohmann::json, bool>(record, notifyListeners));
-					modified = true;
-				}
-				else {
-					// fprintf(stderr, "no change\n");
-				}
-			}
-		}
-		else {
-			fprintf(stderr, "uhh waaat\n");
-		}
-	}
-	catch (std::exception& e) {
-		fprintf(stderr, "Error on PostgreSQL::save: %s\n", e.what());
-	}
-	catch (...) {
-		fprintf(stderr, "Unknown error on PostgreSQL::save\n");
-	}
-	return modified;
-}
-
-void CV2::eraseNetwork(const uint64_t networkId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv2");
-	auto span = tracer->StartSpan("cv2::eraseNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	std::string nwid = Utils::hex(networkId, networkIdStr);
-	span->SetAttribute("network_id", nwid);
-
-	fprintf(stderr, "CV2::eraseNetwork\n");
-	waitForReady();
-	std::pair<nlohmann::json, bool> tmp;
-	tmp.first["id"] = nwid;
-	tmp.first["objtype"] = "_delete_network";
-	tmp.second = true;
-	_commitQueue.post(tmp);
-	// nlohmann::json nullJson;
-	//_networkChanged(tmp.first, nullJson, isReady());
-}
-
-void CV2::eraseMember(const uint64_t networkId, const uint64_t memberId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv2");
-	auto span = tracer->StartSpan("cv2::eraseMember");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-
-	fprintf(stderr, "PostgreSQL::eraseMember\n");
-	char tmp2[24];
-	waitForReady();
-	std::pair<nlohmann::json, bool> tmp, nw;
-	Utils::hex(networkId, tmp2);
-	tmp.first["nwid"] = tmp2;
-	Utils::hex(memberId, tmp2);
-	tmp.first["id"] = tmp2;
-	tmp.first["objtype"] = "_delete_member";
-	tmp.second = true;
-	_commitQueue.post(tmp);
-	// nlohmann::json nullJson;
-	//_memberChanged(tmp.first, nullJson, isReady());
-}
-
-void CV2::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv2");
-	auto span = tracer->StartSpan("cv2::nodeIsOnline");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	char ipAddressStr[INET6_ADDRSTRLEN];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-	span->SetAttribute("physical_address", ipAddressStr);
-	span->SetAttribute("os_arch", osArch);
-
-	std::lock_guard<std::mutex> l(_lastOnline_l);
-	NodeOnlineRecord& i = _lastOnline[std::pair<uint64_t, uint64_t>(networkId, memberId)];
-	i.lastSeen = OSUtils::now();
-	if (physicalAddress) {
-		i.physicalAddress = physicalAddress;
-	}
-	i.osArch = std::string(osArch);
-}
-
-void CV2::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress)
-{
-	this->nodeIsOnline(networkId, memberId, physicalAddress, "unknown/unknown");
-}
-
-AuthInfo CV2::getSSOAuthInfo(const nlohmann::json& member, const std::string& redirectURL)
-{
-	// TODO: Redo this for CV2
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv2");
-	auto span = tracer->StartSpan("cv2::getSSOAuthInfo");
-	auto scope = tracer->WithActiveSpan(span);
-
-	Metrics::db_get_sso_info++;
-	// NONCE is just a random character string.  no semantic meaning
-	// state = HMAC SHA384 of Nonce based on shared sso key
-	//
-	// need nonce timeout in database? make sure it's used within X time
-	// X is 5 minutes for now.  Make configurable later?
-	//
-	// how do we tell when a nonce is used? if auth_expiration_time is set
-	std::string networkId = member["nwid"];
-	std::string memberId = member["id"];
-
-	char authenticationURL[4096] = { 0 };
-	AuthInfo info;
-	info.enabled = true;
-
-	// if (memberId == "a10dccea52" && networkId == "8056c2e21c24673d") {
-	//	fprintf(stderr, "invalid authinfo for grant's machine\n");
-	//	info.version=1;
-	//	return info;
-	// }
-	//  fprintf(stderr, "PostgreSQL::updateMemberOnLoad: %s-%s\n", networkId.c_str(), memberId.c_str());
-	std::shared_ptr<PostgresConnection> c;
-	try {
-		// 		c = _pool->borrow();
-		// 		pqxx::work w(*c->c);
-
-		// 		char nonceBytes[16] = {0};
-		// 		std::string nonce = "";
-
-		// 		// check if the member exists first.
-		// 		pqxx::row count = w.exec_params1("SELECT count(id) FROM ztc_member WHERE id = $1 AND network_id = $2 AND deleted = false", memberId, networkId);
-		// 		if (count[0].as<int>() == 1) {
-		// 			// get active nonce, if exists.
-		// 			pqxx::result r = w.exec_params("SELECT nonce FROM ztc_sso_expiry "
-		// 				"WHERE network_id = $1 AND member_id = $2 "
-		// 				"AND ((NOW() AT TIME ZONE 'UTC') <= authentication_expiry_time) AND ((NOW() AT TIME ZONE 'UTC') <= nonce_expiration)",
-		// 				networkId, memberId);
-
-		// 			if (r.size() == 0) {
-		// 				// no active nonce.
-		// 				// find an unused nonce, if one exists.
-		// 				pqxx::result r = w.exec_params("SELECT nonce FROM ztc_sso_expiry "
-		// 					"WHERE network_id = $1 AND member_id = $2 "
-		// 					"AND authentication_expiry_time IS NULL AND ((NOW() AT TIME ZONE 'UTC') <= nonce_expiration)",
-		// 					networkId, memberId);
-
-		// 				if (r.size() == 1) {
-		// 					// we have an existing nonce.  Use it
-		// 					nonce = r.at(0)[0].as<std::string>();
-		// 					Utils::unhex(nonce.c_str(), nonceBytes, sizeof(nonceBytes));
-		// 				} else if (r.empty()) {
-		// 					// create a nonce
-		// 					Utils::getSecureRandom(nonceBytes, 16);
-		// 					char nonceBuf[64] = {0};
-		// 					Utils::hex(nonceBytes, sizeof(nonceBytes), nonceBuf);
-		// 					nonce = std::string(nonceBuf);
-
-		// 					pqxx::result ir = w.exec_params0("INSERT INTO ztc_sso_expiry "
-		// 						"(nonce, nonce_expiration, network_id, member_id) VALUES "
-		// 						"($1, TO_TIMESTAMP($2::double precision/1000), $3, $4)",
-		// 						nonce, OSUtils::now() + 300000, networkId, memberId);
-
-		// 					w.commit();
-		// 				}  else {
-		// 					// > 1 ?!?  Thats an error!
-		// 					fprintf(stderr, "> 1 unused nonce!\n");
-		// 					exit(6);
-		// 				}
-		// 			} else if (r.size() == 1) {
-		// 				nonce = r.at(0)[0].as<std::string>();
-		// 				Utils::unhex(nonce.c_str(), nonceBytes, sizeof(nonceBytes));
-		// 			} else {
-		// 				// more than 1 nonce in use?  Uhhh...
-		// 				fprintf(stderr, "> 1 nonce in use for network member?!?\n");
-		// 				exit(7);
-		// 			}
-
-		// 			r = w.exec_params(
-		// 				"SELECT oc.client_id, oc.authorization_endpoint, oc.issuer, oc.provider, oc.sso_impl_version "
-		// 				"FROM ztc_network AS n "
-		// 				"INNER JOIN ztc_org o "
-		// 				"  ON o.owner_id = n.owner_id "
-		// 			    "LEFT OUTER JOIN ztc_network_oidc_config noc "
-		// 				"  ON noc.network_id = n.id "
-		// 				"LEFT OUTER JOIN ztc_oidc_config oc "
-		// 				"  ON noc.client_id = oc.client_id AND oc.org_id = o.org_id "
-		// 				"WHERE n.id = $1 AND n.sso_enabled = true", networkId);
-
-		// 			std::string client_id = "";
-		// 			std::string authorization_endpoint = "";
-		// 			std::string issuer = "";
-		// 			std::string provider = "";
-		// 			uint64_t sso_version = 0;
-
-		// 			if (r.size() == 1) {
-		// 				client_id = r.at(0)[0].as<std::optional<std::string>>().value_or("");
-		// 				authorization_endpoint = r.at(0)[1].as<std::optional<std::string>>().value_or("");
-		// 				issuer = r.at(0)[2].as<std::optional<std::string>>().value_or("");
-		// 				provider = r.at(0)[3].as<std::optional<std::string>>().value_or("");
-		// 				sso_version = r.at(0)[4].as<std::optional<uint64_t>>().value_or(1);
-		// 			} else if (r.size() > 1) {
-		// 				fprintf(stderr, "ERROR: More than one auth endpoint for an organization?!?!? NetworkID: %s\n", networkId.c_str());
-		// 			} else {
-		// 				fprintf(stderr, "No client or auth endpoint?!?\n");
-		// 			}
-
-		// 			info.version = sso_version;
-
-		// 			// no catch all else because we don't actually care if no records exist here. just continue as normal.
-		// 			if ((!client_id.empty())&&(!authorization_endpoint.empty())) {
-
-		// 				uint8_t state[48];
-		// 				HMACSHA384(_ssoPsk, nonceBytes, sizeof(nonceBytes), state);
-		// 				char state_hex[256];
-		// 				Utils::hex(state, 48, state_hex);
-
-		// 				if (info.version == 0) {
-		// 					char url[2048] = {0};
-		// 					OSUtils::ztsnprintf(url, sizeof(authenticationURL),
-		// 						"%s?response_type=id_token&response_mode=form_post&scope=openid+email+profile&redirect_uri=%s&nonce=%s&state=%s&client_id=%s",
-		// 						authorization_endpoint.c_str(),
-		// 						url_encode(redirectURL).c_str(),
-		// 						nonce.c_str(),
-		// 						state_hex,
-		// 						client_id.c_str());
-		// 					info.authenticationURL = std::string(url);
-		// 				} else if (info.version == 1) {
-		// 					info.ssoClientID = client_id;
-		// 					info.issuerURL = issuer;
-		// 					info.ssoProvider = provider;
-		// 					info.ssoNonce = nonce;
-		// 					info.ssoState = std::string(state_hex) + "_" +networkId;
-		// 					info.centralAuthURL = redirectURL;
-		// #ifdef ZT_DEBUG
-		// 					fprintf(
-		// 						stderr,
-		// 						"ssoClientID: %s\nissuerURL: %s\nssoNonce: %s\nssoState: %s\ncentralAuthURL: %s\nprovider: %s\n",
-		// 						info.ssoClientID.c_str(),
-		// 						info.issuerURL.c_str(),
-		// 						info.ssoNonce.c_str(),
-		// 						info.ssoState.c_str(),
-		// 						info.centralAuthURL.c_str(),
-		// 						provider.c_str());
-		// #endif
-		// 				}
-		// 			}  else {
-		// 				fprintf(stderr, "client_id: %s\nauthorization_endpoint: %s\n", client_id.c_str(), authorization_endpoint.c_str());
-		// 			}
-		// 		}
-
-		// 		_pool->unborrow(c);
-	}
-	catch (std::exception& e) {
-		fprintf(stderr, "ERROR: Error updating member on load for network %s: %s\n", networkId.c_str(), e.what());
-		span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-	}
-
-	return info;   // std::string(authenticationURL);
-}
-
-void CV2::initializeNetworks()
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv2");
-	auto span = tracer->StartSpan("cv2::initializeNetworks");
-	auto scope = tracer->WithActiveSpan(span);
-
-	fprintf(stderr, "Initializing networks...\n");
-
-	try {
-		char qbuf[2048];
-		sprintf(
-			qbuf,
-			"SELECT id, name, configuration , (EXTRACT(EPOCH FROM creation_time AT TIME ZONE 'UTC')*1000)::bigint, "
-			"(EXTRACT(EPOCH FROM last_modified AT TIME ZONE 'UTC')*1000)::bigint, revision "
-			"FROM networks_ctl WHERE controller_id = '%s'",
-			_myAddressStr.c_str());
-
-		auto c = _pool->borrow();
-		pqxx::work w(*c->c);
-
-		fprintf(stderr, "Load networks from psql...\n");
-		auto stream = pqxx::stream_from::query(w, qbuf);
-		std::tuple<
-			std::string	  // network ID
-			,
-			std::optional<std::string>	 // name
-			,
-			std::string	  // configuration
-			,
-			std::optional<uint64_t>	  // creation_time
-			,
-			std::optional<uint64_t>	  // last_modified
-			,
-			std::optional<uint64_t>	  // revision
-			>
-			row;
-		uint64_t count = 0;
-		uint64_t total = 0;
-		while (stream >> row) {
-			auto start = std::chrono::high_resolution_clock::now();
-
-			json empty;
-			json config;
-
-			initNetwork(config);
-
-			std::string nwid = std::get<0>(row);
-			std::string name = std::get<1>(row).value_or("");
-			json cfgtmp = json::parse(std::get<2>(row));
-			std::optional<uint64_t> created_at = std::get<3>(row);
-			std::optional<uint64_t> last_modified = std::get<4>(row);
-			std::optional<uint64_t> revision = std::get<5>(row);
-
-			config["id"] = nwid;
-			config["name"] = name;
-			config["creationTime"] = created_at.value_or(0);
-			config["lastModified"] = last_modified.value_or(0);
-			config["revision"] = revision.value_or(0);
-			config["capabilities"] = cfgtmp["capabilities"].is_array() ? cfgtmp["capabilities"] : json::array();
-			config["enableBroadcast"] = cfgtmp["enableBroadcast"].is_boolean() ? cfgtmp["enableBroadcast"].get<bool>() : false;
-			config["mtu"] = cfgtmp["mtu"].is_number() ? cfgtmp["mtu"].get<int32_t>() : 2800;
-			config["multicastLimit"] = cfgtmp["multicastLimit"].is_number() ? cfgtmp["multicastLimit"].get<int32_t>() : 64;
-			config["private"] = cfgtmp["private"].is_boolean() ? cfgtmp["private"].get<bool>() : true;
-			config["remoteTraceLevel"] = cfgtmp["remoteTraceLevel"].is_number() ? cfgtmp["remoteTraceLevel"].get<int32_t>() : 0;
-			config["remoteTraceTarget"] = cfgtmp["remoteTraceTarget"].is_string() ? cfgtmp["remoteTraceTarget"].get<std::string>() : "";
-			config["revision"] = revision.value_or(0);
-			config["rules"] = cfgtmp["rules"].is_array() ? cfgtmp["rules"] : json::array();
-			config["tags"] = cfgtmp["tags"].is_array() ? cfgtmp["tags"] : json::array();
-			if (cfgtmp["v4AssignMode"].is_object()) {
-				config["v4AssignMode"] = cfgtmp["v4AssignMode"];
-			}
-			else {
-				config["v4AssignMode"] = json::object();
-				config["v4AssignMode"]["zt"] = true;
-			}
-			if (cfgtmp["v6AssignMode"].is_object()) {
-				config["v6AssignMode"] = cfgtmp["v6AssignMode"];
-			}
-			else {
-				config["v6AssignMode"] = json::object();
-				config["v6AssignMode"]["zt"] = true;
-				config["v6AssignMode"]["6plane"] = true;
-				config["v6AssignMode"]["rfc4193"] = false;
-			}
-			config["ssoEnabled"] = cfgtmp["ssoEnabled"].is_boolean() ? cfgtmp["ssoEnabled"].get<bool>() : false;
-			config["objtype"] = "network";
-			config["routes"] = cfgtmp["routes"].is_array() ? cfgtmp["routes"] : json::array();
-			config["clientId"] = cfgtmp["clientId"].is_string() ? cfgtmp["clientId"].get<std::string>() : "";
-			config["authorizationEndpoint"] = cfgtmp["authorizationEndpoint"].is_string() ? cfgtmp["authorizationEndpoint"].get<std::string>() : nullptr;
-			config["provider"] = cfgtmp["ssoProvider"].is_string() ? cfgtmp["ssoProvider"].get<std::string>() : "";
-			if (! cfgtmp["dns"].is_object()) {
-				cfgtmp["dns"] = json::object();
-				cfgtmp["dns"]["domain"] = "";
-				cfgtmp["dns"]["servers"] = json::array();
-			}
-			else {
-				config["dns"] = cfgtmp["dns"];
-			}
-			config["ipAssignmentPools"] = cfgtmp["ipAssignmentPools"].is_array() ? cfgtmp["ipAssignmentPools"] : json::array();
-
-			Metrics::network_count++;
-
-			_networkChanged(empty, config, false);
-
-			auto end = std::chrono::high_resolution_clock::now();
-			auto dur = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-			;
-			total += dur.count();
-			++count;
-			if (count > 0 && count % 10000 == 0) {
-				fprintf(stderr, "Averaging %lu us per network\n", (total / count));
-			}
-		}
-
-		w.commit();
-		_pool->unborrow(c);
-		fprintf(stderr, "done.\n");
-
-		if (++this->_ready == 2) {
-			if (_waitNoticePrinted) {
-				fprintf(stderr, "[%s] NOTICE: %.10llx controller PostgreSQL data download complete." ZT_EOL_S, _timestr(), (unsigned long long)_myAddress.toInt());
-			}
-			_readyLock.unlock();
-		}
-		fprintf(stderr, "network init done\n");
-	}
-	catch (std::exception& e) {
-		fprintf(stderr, "ERROR: Error initializing networks: %s\n", e.what());
-		span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-		std::this_thread::sleep_for(std::chrono::milliseconds(5000));
-		exit(-1);
-	}
-}
-
-void CV2::initializeMembers()
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("cv2");
-	auto span = tracer->StartSpan("cv2::initializeMembers");
-	auto scope = tracer->WithActiveSpan(span);
-
-	std::string memberId;
-	std::string networkId;
-	try {
-		char qbuf[2048];
-		sprintf(
-			qbuf,
-			"SELECT nm.device_id, nm.network_id, nm.authorized, nm.active_bridge, nm.ip_assignments, nm.no_auto_assign_ips, "
-			"nm.sso_exempt, (EXTRACT(EPOCH FROM nm.authentication_expiry_time AT TIME ZONE 'UTC')*1000)::bigint, "
-			"(EXTRACT(EPOCH FROM nm.creation_time AT TIME ZONE 'UTC')*1000)::bigint, nm.identity, "
-			"(EXTRACT(EPOCH FROM nm.last_authorized_time AT TIME ZONE 'UTC')*1000)::bigint, "
-			"(EXTRACT(EPOCH FROM nm.last_deauthorized_time AT TIME ZONE 'UTC')*1000)::bigint, "
-			"nm.remote_trace_level, nm.remote_trace_target, nm.revision, nm.capabilities, nm.tags "
-			"FROM network_memberships_ctl nm "
-			"INNER JOIN networks_ctl n "
-			"  ON nm.network_id = n.id "
-			"WHERE n.controller_id = '%s'",
-			_myAddressStr.c_str());
-
-		auto c = _pool->borrow();
-		pqxx::work w(*c->c);
-		fprintf(stderr, "Load members from psql...\n");
-		auto stream = pqxx::stream_from::query(w, qbuf);
-		std::tuple<
-			std::string	  // device ID
-			,
-			std::string	  // network ID
-			,
-			bool   // authorized
-			,
-			std::optional<bool>	  // active_bridge
-			,
-			std::optional<std::string>	 // ip_assignments
-			,
-			std::optional<bool>	  // no_auto_assign_ips
-			,
-			std::optional<bool>	  // sso_exempt
-			,
-			std::optional<uint64_t>	  // authentication_expiry_time
-			,
-			std::optional<uint64_t>	  // creation_time
-			,
-			std::optional<std::string>	 // identity
-			,
-			std::optional<uint64_t>	  // last_authorized_time
-			,
-			std::optional<uint64_t>	  // last_deauthorized_time
-			,
-			std::optional<int32_t>	 // remote_trace_level
-			,
-			std::optional<std::string>	 // remote_trace_target
-			,
-			std::optional<uint64_t>	  // revision
-			,
-			std::optional<std::string>	 // capabilities
-			,
-			std::optional<std::string>	 // tags
-			>
-			row;
-
-		uint64_t count = 0;
-		uint64_t total = 0;
-		while (stream >> row) {
-			auto start = std::chrono::high_resolution_clock::now();
-			json empty;
-			json config;
-
-			initMember(config);
-
-			memberId = std::get<0>(row);
-			networkId = std::get<1>(row);
-			bool authorized = std::get<2>(row);
-			std::optional<bool> active_bridge = std::get<3>(row);
-			std::string ip_assignments = std::get<4>(row).value_or("");
-			std::optional<bool> no_auto_assign_ips = std::get<5>(row);
-			std::optional<bool> sso_exempt = std::get<6>(row);
-			std::optional<uint64_t> authentication_expiry_time = std::get<7>(row);
-			std::optional<uint64_t> creation_time = std::get<8>(row);
-			std::optional<std::string> identity = std::get<9>(row);
-			std::optional<uint64_t> last_authorized_time = std::get<10>(row);
-			std::optional<uint64_t> last_deauthorized_time = std::get<11>(row);
-			std::optional<int32_t> remote_trace_level = std::get<12>(row);
-			std::optional<std::string> remote_trace_target = std::get<13>(row);
-			std::optional<uint64_t> revision = std::get<14>(row);
-			std::optional<std::string> capabilities = std::get<15>(row);
-			std::optional<std::string> tags = std::get<16>(row);
-
-			config["objtype"] = "member";
-			config["id"] = memberId;
-			config["address"] = identity.value_or("");
-			config["nwid"] = networkId;
-			config["authorized"] = authorized;
-			config["activeBridge"] = active_bridge.value_or(false);
-			config["ipAssignments"] = json::array();
-			if (ip_assignments != "{}") {
-				std::string tmp = ip_assignments.substr(1, ip_assignments.length() - 2);
-				std::vector<std::string> addrs = split(tmp, ',');
-				for (auto it = addrs.begin(); it != addrs.end(); ++it) {
-					config["ipAssignments"].push_back(*it);
-				}
-			}
-			config["capabilities"] = json::parse(capabilities.value_or("[]"));
-			config["creationTime"] = creation_time.value_or(0);
-			config["lastAuthorizedTime"] = last_authorized_time.value_or(0);
-			config["lastDeauthorizedTime"] = last_deauthorized_time.value_or(0);
-			config["noAutoAssignIPs"] = no_auto_assign_ips.value_or(false);
-			config["remoteTraceLevel"] = remote_trace_level.value_or(0);
-			config["remoteTraceTarget"] = remote_trace_target.value_or(nullptr);
-			config["revision"] = revision.value_or(0);
-			config["ssoExempt"] = sso_exempt.value_or(false);
-			config["authenticationExpiryTime"] = authentication_expiry_time.value_or(0);
-			config["tags"] = json::parse(tags.value_or("[]"));
-
-			Metrics::member_count++;
-
-			_memberChanged(empty, config, false);
-
-			memberId = "";
-			networkId = "";
-
-			auto end = std::chrono::high_resolution_clock::now();
-			auto dur = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-			total += dur.count();
-			++count;
-			if (count > 0 && count % 10000 == 0) {
-				fprintf(stderr, "Averaging %lu us per member\n", (total / count));
-			}
-		}
-		if (count > 0) {
-			fprintf(stderr, "Took %lu us per member to load\n", (total / count));
-		}
-
-		stream.complete();
-		w.commit();
-		_pool->unborrow(c);
-		fprintf(stderr, "done.\n");
-
-		if (++this->_ready == 2) {
-			if (_waitNoticePrinted) {
-				fprintf(stderr, "[%s] NOTICE: %.10llx controller PostgreSQL data download complete." ZT_EOL_S, _timestr(), (unsigned long long)_myAddress.toInt());
-			}
-			_readyLock.unlock();
-		}
-		fprintf(stderr, "member init done\n");
-	}
-	catch (std::exception& e) {
-		fprintf(stderr, "ERROR: Error initializing member: %s-%s %s\n", networkId.c_str(), memberId.c_str(), e.what());
-		span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-		exit(-1);
-	}
-}
-
-void CV2::heartbeat()
-{
-	char publicId[1024];
-	char hostnameTmp[1024];
-	_myId.toString(false, publicId);
-	if (gethostname(hostnameTmp, sizeof(hostnameTmp)) != 0) {
-		hostnameTmp[0] = (char)0;
-	}
-	else {
-		for (int i = 0; i < (int)sizeof(hostnameTmp); ++i) {
-			if ((hostnameTmp[i] == '.') || (hostnameTmp[i] == 0)) {
-				hostnameTmp[i] = (char)0;
-				break;
-			}
-		}
-	}
-	const char* controllerId = _myAddressStr.c_str();
-	const char* publicIdentity = publicId;
-	const char* hostname = hostnameTmp;
-
-	while (_run == 1) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv2");
-		auto span = tracer->StartSpan("cv2::heartbeat");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto c = _pool->borrow();
-		int64_t ts = OSUtils::now();
-
-		if (c->c) {
-			std::string major = std::to_string(ZEROTIER_ONE_VERSION_MAJOR);
-			std::string minor = std::to_string(ZEROTIER_ONE_VERSION_MINOR);
-			std::string rev = std::to_string(ZEROTIER_ONE_VERSION_REVISION);
-			std::string version = major + "." + minor + "." + rev;
-			std::string versionStr = "v" + version;
-
-			try {
-				pqxx::work w { *c->c };
-				w.exec_params0(
-					"INSERT INTO controllers_ctl (id, hostname, last_heartbeat, public_identity, version) VALUES "
-					"($1, $2, TO_TIMESTAMP($3::double precision/1000), $4, $5) "
-					"ON CONFLICT (id) DO UPDATE SET hostname = EXCLUDED.hostname, last_heartbeat = EXCLUDED.last_heartbeat, "
-					"public_identity = EXCLUDED.public_identity, version = EXCLUDED.version",
-					controllerId,
-					hostname,
-					ts,
-					publicIdentity,
-					versionStr);
-				w.commit();
-			}
-			catch (std::exception& e) {
-				fprintf(stderr, "ERROR: Error in heartbeat: %s\n", e.what());
-				span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-				continue;
-			}
-			catch (...) {
-				fprintf(stderr, "ERROR: Unknown error in heartbeat\n");
-				span->SetStatus(opentelemetry::trace::StatusCode::kError, "Unknown error in heartbeat");
-				continue;
-			}
-		}
-
-		_pool->unborrow(c);
-		span->End();
-
-		std::this_thread::sleep_for(std::chrono::seconds(1));
-	}
-	fprintf(stderr, "Exited heartbeat thread\n");
-}
-
-void CV2::membersDbWatcher()
-{
-	auto c = _pool->borrow();
-
-	std::string stream = "member_" + _myAddressStr;
-
-	fprintf(stderr, "Listening to member stream: %s\n", stream.c_str());
-	MemberNotificationReceiver<CV2> m(this, *c->c, stream);
-
-	while (_run == 1) {
-		c->c->await_notification(5, 0);
-	}
-
-	_pool->unborrow(c);
-
-	fprintf(stderr, "Exited membersDbWatcher\n");
-}
-
-void CV2::networksDbWatcher()
-{
-	std::string stream = "network_" + _myAddressStr;
-
-	fprintf(stderr, "Listening to member stream: %s\n", stream.c_str());
-
-	auto c = _pool->borrow();
-
-	NetworkNotificationReceiver<CV2> n(this, *c->c, stream);
-
-	while (_run == 1) {
-		c->c->await_notification(5, 0);
-	}
-
-	_pool->unborrow(c);
-	fprintf(stderr, "Exited networksDbWatcher\n");
-}
-
-void CV2::commitThread()
-{
-	fprintf(stderr, "%s: commitThread start\n", _myAddressStr.c_str());
-	std::pair<nlohmann::json, bool> qitem;
-	while (_commitQueue.get(qitem) && (_run == 1)) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv2");
-		auto span = tracer->StartSpan("cv2::commitThread");
-		auto scope = tracer->WithActiveSpan(span);
-
-		// fprintf(stderr, "commitThread tick\n");
-		if (! qitem.first.is_object()) {
-			fprintf(stderr, "not an object\n");
-			continue;
-		}
-
-		std::shared_ptr<PostgresConnection> c;
-		try {
-			c = _pool->borrow();
-		}
-		catch (std::exception& e) {
-			fprintf(stderr, "ERROR: %s\n", e.what());
-			continue;
-		}
-
-		if (! c) {
-			fprintf(stderr, "Error getting database connection\n");
-			continue;
-		}
-
-		Metrics::pgsql_commit_ticks++;
-		try {
-			nlohmann::json& config = (qitem.first);
-			const std::string objtype = config["objtype"];
-			if (objtype == "member") {
-				auto mspan = tracer->StartSpan("cv2::commitThread::member");
-				auto mscope = tracer->WithActiveSpan(span);
-
-				// fprintf(stderr, "%s: commitThread: member\n", _myAddressStr.c_str());
-				std::string memberId;
-				std::string networkId;
-				try {
-					pqxx::work w(*c->c);
-
-					memberId = config["id"];
-					networkId = config["nwid"];
-
-					std::string target = "NULL";
-					if (! config["remoteTraceTarget"].is_null()) {
-						target = config["remoteTraceTarget"];
-					}
-
-					pqxx::row nwrow = w.exec_params1("SELECT COUNT(id) FROM networks WHERE id = $1", networkId);
-					int nwcount = nwrow[0].as<int>();
-
-					if (nwcount != 1) {
-						fprintf(stderr, "network %s does not exist.  skipping member upsert\n", networkId.c_str());
-						w.abort();
-						_pool->unborrow(c);
-						continue;
-					}
-
-					// only needed for hooks, and no hooks for now
-					// pqxx::row mrow = w.exec_params1("SELECT COUNT(id) FROM device_networks WHERE device_id = $1 AND network_id = $2", memberId, networkId);
-					// int membercount = mrow[0].as<int>();
-					// bool isNewMember = (membercount == 0);
-
-					pqxx::result res = w.exec_params0(
-						"INSERT INTO network_memberships_ctl (device_id, network_id, authorized, active_bridge, ip_assignments, "
-						"no_auto_assign_ips, sso_exempt, authentication_expiry_time, capabilities, creation_time, "
-						"identity, last_authorized_time, last_deauthorized_time, "
-						"remote_trace_level, remote_trace_target, revision, tags, version_major, version_minor, "
-						"version_revision, version_protocol) "
-						"VALUES ($1, $2, $3, $4, $5, $6, $7, TO_TIMESTAMP($8::double precision/1000), $9, "
-						"TO_TIMESTAMP($10::double precision/1000), $11, TO_TIMESTAMP($12::double precision/1000), "
-						"TO_TIMESTAMP($13::double precision/1000), $14, $15, $16, $17, $18, $19, $20, $21) "
-						"ON CONFLICT (device_id, network_id) DO UPDATE SET "
-						"authorized = EXCLUDED.authorized, active_bridge = EXCLUDED.active_bridge, "
-						"ip_assignments = EXCLUDED.ip_assignments, no_auto_assign_ips = EXCLUDED.no_auto_assign_ips, "
-						"sso_exempt = EXCLUDED.sso_exempt, authentication_expiry_time = EXCLUDED.authentication_expiry_time, "
-						"capabilities = EXCLUDED.capabilities, creation_time = EXCLUDED.creation_time, "
-						"identity = EXCLUDED.identity, last_authorized_time = EXCLUDED.last_authorized_time, "
-						"last_deauthorized_time = EXCLUDED.last_deauthorized_time, "
-						"remote_trace_level = EXCLUDED.remote_trace_level, remote_trace_target = EXCLUDED.remote_trace_target, "
-						"revision = EXCLUDED.revision, tags = EXCLUDED.tags, version_major = EXCLUDED.version_major, "
-						"version_minor = EXCLUDED.version_minor, version_revision = EXCLUDED.version_revision, "
-						"version_protocol = EXCLUDED.version_protocol",
-						memberId,
-						networkId,
-						(bool)config["authorized"],
-						(bool)config["activeBridge"],
-						config["ipAssignments"].get<std::vector<std::string> >(),
-						(bool)config["noAutoAssignIps"],
-						(bool)config["ssoExempt"],
-						(uint64_t)config["authenticationExpiryTime"],
-						OSUtils::jsonDump(config["capabilities"], -1),
-						(uint64_t)config["creationTime"],
-						OSUtils::jsonString(config["identity"], ""),
-						(uint64_t)config["lastAuthorizedTime"],
-						(uint64_t)config["lastDeauthorizedTime"],
-						(int)config["remoteTraceLevel"],
-						target,
-						(uint64_t)config["revision"],
-						OSUtils::jsonDump(config["tags"], -1),
-						(int)config["vMajor"],
-						(int)config["vMinor"],
-						(int)config["vRev"],
-						(int)config["vProto"]);
-
-					w.commit();
-
-					// No hooks for now
-					// if (_smee != NULL && isNewMember) {
-					// 	pqxx::row row = w.exec_params1(
-					// 		"SELECT "
-					// 		"	count(h.hook_id) "
-					// 		"FROM "
-					// 		"	ztc_hook h "
-					// 		"	INNER JOIN ztc_org o ON o.org_id = h.org_id "
-					// 		"   INNER JOIN ztc_network n ON n.owner_id = o.owner_id "
-					// 		" WHERE "
-					// 		"n.id = $1 ",
-					// 		networkId
-					// 	);
-					// 	int64_t hookCount = row[0].as<int64_t>();
-					// 	if (hookCount > 0) {
-					// 		notifyNewMember(networkId, memberId);
-					// 	}
-					// }
-
-					const uint64_t nwidInt = OSUtils::jsonIntHex(config["nwid"], 0ULL);
-					const uint64_t memberidInt = OSUtils::jsonIntHex(config["id"], 0ULL);
-					if (nwidInt && memberidInt) {
-						nlohmann::json nwOrig;
-						nlohmann::json memOrig;
-
-						nlohmann::json memNew(config);
-
-						get(nwidInt, nwOrig, memberidInt, memOrig);
-
-						_memberChanged(memOrig, memNew, qitem.second);
-					}
-					else {
-						fprintf(stderr, "%s: Can't notify of change.  Error parsing nwid or memberid: %llu-%llu\n", _myAddressStr.c_str(), (unsigned long long)nwidInt, (unsigned long long)memberidInt);
-					}
-				}
-				catch (pqxx::data_exception& e) {
-					std::string cfgDump = OSUtils::jsonDump(config, 2);
-					fprintf(stderr, "Member save %s-%s: %s\n", networkId.c_str(), memberId.c_str(), cfgDump.c_str());
-
-					const pqxx::sql_error* s = dynamic_cast<const pqxx::sql_error*>(&e);
-					fprintf(stderr, "%s ERROR: Error updating member: %s\n", _myAddressStr.c_str(), e.what());
-					if (s) {
-						fprintf(stderr, "%s ERROR: SQL error: %s\n", _myAddressStr.c_str(), s->query().c_str());
-					}
-					mspan->SetStatus(opentelemetry::trace::StatusCode::kError, "pqxx::data_exception");
-					mspan->SetAttribute("error", e.what());
-					mspan->SetAttribute("config", cfgDump);
-				}
-				catch (std::exception& e) {
-					std::string cfgDump = OSUtils::jsonDump(config, 2);
-					fprintf(stderr, "%s ERROR: Error updating member %s-%s: %s\njsonDump: %s\n", _myAddressStr.c_str(), networkId.c_str(), memberId.c_str(), e.what(), cfgDump.c_str());
-					mspan->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
-					mspan->SetAttribute("error", e.what());
-					mspan->SetAttribute("config", cfgDump);
-				}
-			}
-			else if (objtype == "network") {
-				auto nspan = tracer->StartSpan("cv2::commitThread::network");
-				auto nscope = tracer->WithActiveSpan(span);
-
-				try {
-					// fprintf(stderr, "%s: commitThread: network\n", _myAddressStr.c_str());
-					pqxx::work w(*c->c);
-
-					std::string id = config["id"];
-
-					// network must already exist
-					pqxx::result res = w.exec_params0(
-						"INSERT INTO networks_ctl (id, name, configuration, controller_id, revision) "
-						"VALUES ($1, $2, $3, $4, $5) "
-						"ON CONFLICT (id) DO UPDATE SET "
-						"name = EXCLUDED.name, configuration = EXCLUDED.configuration, revision = EXCLUDED.revision+1",
-						id,
-						OSUtils::jsonString(config["name"], ""),
-						OSUtils::jsonDump(config, -1),
-						_myAddressStr,
-						((uint64_t)config["revision"]));
-
-					w.commit();
-
-					const uint64_t nwidInt = OSUtils::jsonIntHex(config["nwid"], 0ULL);
-					if (nwidInt) {
-						nlohmann::json nwOrig;
-						nlohmann::json nwNew(config);
-
-						get(nwidInt, nwOrig);
-
-						_networkChanged(nwOrig, nwNew, qitem.second);
-					}
-					else {
-						fprintf(stderr, "%s: Can't notify network changed: %llu\n", _myAddressStr.c_str(), (unsigned long long)nwidInt);
-					}
-				}
-				catch (pqxx::data_exception& e) {
-					const pqxx::sql_error* s = dynamic_cast<const pqxx::sql_error*>(&e);
-					fprintf(stderr, "%s ERROR: Error updating network: %s\n", _myAddressStr.c_str(), e.what());
-					if (s) {
-						fprintf(stderr, "%s ERROR: SQL error: %s\n", _myAddressStr.c_str(), s->query().c_str());
-					}
-					nspan->SetStatus(opentelemetry::trace::StatusCode::kError, "pqxx::data_exception");
-					nspan->SetAttribute("error", e.what());
-					nspan->SetAttribute("config", OSUtils::jsonDump(config, 2));
-				}
-				catch (std::exception& e) {
-					fprintf(stderr, "%s ERROR: Error updating network: %s\n", _myAddressStr.c_str(), e.what());
-					nspan->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
-					nspan->SetAttribute("error", e.what());
-					nspan->SetAttribute("config", OSUtils::jsonDump(config, 2));
-				}
-			}
-			else if (objtype == "_delete_network") {
-				auto dspan = tracer->StartSpan("cv2::commitThread::delete_network");
-				auto dscope = tracer->WithActiveSpan(span);
-
-				// fprintf(stderr, "%s: commitThread: delete network\n", _myAddressStr.c_str());
-				try {
-					pqxx::work w(*c->c);
-					std::string networkId = config["id"];
-					fprintf(stderr, "Deleting network %s\n", networkId.c_str());
-					w.exec_params0("DELETE FROM network_memberships_ctl WHERE network_id = $1", networkId);
-					w.exec_params0("DELETE FROM networks_ctl WHERE id = $1", networkId);
-
-					w.commit();
-
-					uint64_t nwidInt = OSUtils::jsonIntHex(config["nwid"], 0ULL);
-					json oldConfig;
-					get(nwidInt, oldConfig);
-					json empty;
-					_networkChanged(oldConfig, empty, qitem.second);
-				}
-				catch (std::exception& e) {
-					fprintf(stderr, "%s ERROR: Error deleting network: %s\n", _myAddressStr.c_str(), e.what());
-					dspan->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
-					dspan->SetAttribute("error", e.what());
-					dspan->SetAttribute("config", OSUtils::jsonDump(config, 2));
-				}
-			}
-			else if (objtype == "_delete_member") {
-				auto dspan = tracer->StartSpan("cv2::commitThread::delete_member");
-				auto dscope = tracer->WithActiveSpan(span);
-
-				// fprintf(stderr, "%s commitThread: delete member\n", _myAddressStr.c_str());
-				try {
-					pqxx::work w(*c->c);
-
-					std::string memberId = config["id"];
-					std::string networkId = config["nwid"];
-
-					pqxx::result res = w.exec_params0("DELETE FROM network_memberships_ctl WHERE device_id = $1 AND network_id = $2", memberId, networkId);
-
-					w.commit();
-
-					uint64_t nwidInt = OSUtils::jsonIntHex(config["nwid"], 0ULL);
-					uint64_t memberidInt = OSUtils::jsonIntHex(config["id"], 0ULL);
-
-					nlohmann::json networkConfig;
-					nlohmann::json oldConfig;
-
-					get(nwidInt, networkConfig, memberidInt, oldConfig);
-					json empty;
-					_memberChanged(oldConfig, empty, qitem.second);
-				}
-				catch (std::exception& e) {
-					fprintf(stderr, "%s ERROR: Error deleting member: %s\n", _myAddressStr.c_str(), e.what());
-					dspan->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
-					dspan->SetAttribute("error", e.what());
-					dspan->SetAttribute("config", OSUtils::jsonDump(config, 2));
-				}
-			}
-			else {
-				fprintf(stderr, "%s ERROR: unknown objtype\n", _myAddressStr.c_str());
-			}
-		}
-		catch (std::exception& e) {
-			fprintf(stderr, "%s ERROR: Error getting objtype: %s\n", _myAddressStr.c_str(), e.what());
-			span->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
-			span->SetAttribute("error", e.what());
-		}
-		_pool->unborrow(c);
-		c.reset();
-	}
-
-	fprintf(stderr, "%s commitThread finished\n", _myAddressStr.c_str());
-}
-
-void CV2::onlineNotificationThread()
-{
-	waitForReady();
-
-	_connected = 1;
-
-	nlohmann::json jtmp1, jtmp2;
-	while (_run == 1) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("cv2");
-		auto span = tracer->StartSpan("cv2::onlineNotificationThread");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto c = _pool->borrow();
-		auto c2 = _pool->borrow();
-
-		try {
-			fprintf(stderr, "%s onlineNotificationThread\n", _myAddressStr.c_str());
-
-			std::unordered_map<std::pair<uint64_t, uint64_t>, NodeOnlineRecord, _PairHasher> lastOnline;
-			{
-				std::lock_guard<std::mutex> l(_lastOnline_l);
-				lastOnline.swap(_lastOnline);
-			}
-
-			pqxx::work w(*c->c);
-			pqxx::work w2(*c2->c);
-
-			bool firstRun = true;
-			bool memberAdded = false;
-			uint64_t updateCount = 0;
-
-			pqxx::pipeline pipe(w);
-
-			for (auto i = lastOnline.begin(); i != lastOnline.end(); ++i) {
-				updateCount++;
-
-				uint64_t nwid_i = i->first.first;
-				char nwidTmp[64];
-				char memTmp[64];
-				char ipTmp[64];
-
-				OSUtils::ztsnprintf(nwidTmp, sizeof(nwidTmp), "%.16llx", nwid_i);
-				OSUtils::ztsnprintf(memTmp, sizeof(memTmp), "%.10llx", i->first.second);
-
-				if (! get(nwid_i, jtmp1, i->first.second, jtmp2)) {
-					continue;	// skip non existent networks/members
-				}
-
-				std::string networkId(nwidTmp);
-				std::string memberId(memTmp);
-
-				try {
-					pqxx::row r = w2.exec_params1("SELECT device_id, network_id FROM network_memberships_ctl WHERE network_id = $1 AND device_id = $2", networkId, memberId);
-				}
-				catch (pqxx::unexpected_rows& e) {
-					continue;
-				}
-
-				int64_t ts = i->second.lastSeen;
-				std::string ipAddr = i->second.physicalAddress.toIpString(ipTmp);
-				std::string timestamp = std::to_string(ts);
-				std::string osArch = i->second.osArch;
-				std::vector<std::string> osArchSplit = split(osArch, '/');
-				std::string os = osArchSplit[0];
-				std::string arch = osArchSplit[1];
-
-				if (ipAddr.empty()) {
-					ipAddr = "relayed";
-				}
-
-				json record = {
-					{ ipAddr, ts },
-				};
-
-				std::string device_network_insert = "INSERT INTO network_memberships_ctl (device_id, network_id, last_seen, os, arch) "
-													"VALUES ('"
-													+ w2.esc(memberId) + "', '" + w2.esc(networkId) + "', '" + w2.esc(record.dump())
-													+ "'::JSONB, "
-													  "'"
-													+ w2.esc(os) + "', '" + w2.esc(arch)
-													+ "') "
-													  "ON CONFLICT (device_id, network_id) DO UPDATE SET os = EXCLUDED.os, arch = EXCLUDED.arch, "
-													  "last_seen = network_memberships_ctl.last_seen || EXCLUDED.last_seen";
-				pipe.insert(device_network_insert);
-
-				Metrics::pgsql_node_checkin++;
-			}
-
-			pipe.complete();
-			;
-			w2.commit();
-			w.commit();
-			fprintf(stderr, "%s: Updated online status of %lu members\n", _myAddressStr.c_str(), updateCount);
-		}
-		catch (std::exception& e) {
-			fprintf(stderr, "%s ERROR: Error in onlineNotificationThread: %s\n", _myAddressStr.c_str(), e.what());
-			span->SetStatus(opentelemetry::trace::StatusCode::kError, "std::exception");
-			span->SetAttribute("error", e.what());
-		}
-		catch (...) {
-			fprintf(stderr, "%s ERROR: Unknown error in onlineNotificationThread\n", _myAddressStr.c_str());
-			span->SetStatus(opentelemetry::trace::StatusCode::kError, "unknown");
-		}
-		_pool->unborrow(c2);
-		_pool->unborrow(c);
-		span->End();
-
-		std::this_thread::sleep_for(std::chrono::seconds(10));
-	}
-
-	fprintf(stderr, "%s: Fell out of run loop in onlineNotificationThread\n", _myAddressStr.c_str());
-	if (_run == 1) {
-		fprintf(stderr, "ERROR: %s onlineNotificationThread should still be running! Exiting Controller.\n", _myAddressStr.c_str());
-		exit(6);
-	}
-}
-#endif	 // ZT_CONTROLLER_USE_LIBPQ
\ No newline at end of file
diff --git a/controller/CV2.hpp b/controller/CV2.hpp
deleted file mode 100644
index 09501e021..000000000
--- a/controller/CV2.hpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c)2025 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "DB.hpp"
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-
-#ifndef ZT_CONTROLLER_CV2_HPP
-#define ZT_CONTROLLER_CV2_HPP
-
-#define ZT_CENTRAL_CONTROLLER_COMMIT_THREADS 4
-
-#include "../node/Metrics.hpp"
-#include "ConnectionPool.hpp"
-#include "PostgreSQL.hpp"
-
-#include <memory>
-#include <pqxx/pqxx>
-#include <redis++/redis++.h>
-
-namespace ZeroTier {
-
-class CV2 : public DB {
-	friend class MemberNotificationReceiver<CV2>;
-	friend class NetworkNotificationReceiver<CV2>;
-
-  public:
-	CV2(const Identity& myId, const char* path, int listenPort);
-	virtual ~CV2();
-
-	virtual bool waitForReady();
-	virtual bool isReady();
-	virtual bool save(nlohmann::json& record, bool notifyListeners);
-	virtual void eraseNetwork(const uint64_t networkId);
-	virtual void eraseMember(const uint64_t networkId, const uint64_t memberId);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch);
-	virtual AuthInfo getSSOAuthInfo(const nlohmann::json& member, const std::string& redirectURL);
-
-	virtual bool ready()
-	{
-		return _ready == 2;
-	}
-
-  protected:
-	struct _PairHasher {
-		inline std::size_t operator()(const std::pair<uint64_t, uint64_t>& p) const
-		{
-			return (std::size_t)(p.first ^ p.second);
-		}
-	};
-	virtual void _memberChanged(nlohmann::json& old, nlohmann::json& memberConfig, bool notifyListeners);
-
-	virtual void _networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, bool notifyListeners);
-
-  private:
-	void initializeNetworks();
-	void initializeMembers();
-	void heartbeat();
-	void membersDbWatcher();
-	void networksDbWatcher();
-
-	void commitThread();
-	void onlineNotificationThread();
-
-	// void notifyNewMember(const std::string &networkID, const std::string &memberID);
-
-	enum OverrideMode { ALLOW_PGBOUNCER_OVERRIDE = 0, NO_OVERRIDE = 1 };
-
-	std::shared_ptr<ConnectionPool<PostgresConnection> > _pool;
-
-	const Identity _myId;
-	const Address _myAddress;
-	std::string _myAddressStr;
-	std::string _connString;
-
-	BlockingQueue<std::pair<nlohmann::json, bool> > _commitQueue;
-
-	std::thread _heartbeatThread;
-	std::thread _membersDbWatcher;
-	std::thread _networksDbWatcher;
-	std::thread _commitThread[ZT_CENTRAL_CONTROLLER_COMMIT_THREADS];
-	std::thread _onlineNotificationThread;
-
-	std::unordered_map<std::pair<uint64_t, uint64_t>, NodeOnlineRecord, _PairHasher> _lastOnline;
-
-	mutable std::mutex _lastOnline_l;
-	mutable std::mutex _readyLock;
-	std::atomic<int> _ready, _connected, _run;
-	mutable volatile bool _waitNoticePrinted;
-
-	int _listenPort;
-	uint8_t _ssoPsk[48];
-};
-
-}	// namespace ZeroTier
-
-#endif	 // ZT_CONTROLLER_CV2_HPP
-#endif	 // ZT_CONTROLLER_USE_LIBPQ
\ No newline at end of file
diff --git a/controller/ConnectionPool.hpp b/controller/ConnectionPool.hpp
deleted file mode 100644
index 75690fab4..000000000
--- a/controller/ConnectionPool.hpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c)2021 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_CONNECTION_POOL_H_
-#define ZT_CONNECTION_POOL_H_
-
-#ifndef _DEBUG
-#define _DEBUG(x)
-#endif
-
-#include "../node/Metrics.hpp"
-#include "opentelemetry/trace/provider.h"
-
-#include <deque>
-#include <exception>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <string>
-
-namespace ZeroTier {
-
-struct ConnectionUnavailable : std::exception {
-	char const* what() const throw()
-	{
-		return "Unable to allocate connection";
-	};
-};
-
-class Connection {
-  public:
-	virtual ~Connection() {};
-};
-
-class ConnectionFactory {
-  public:
-	virtual ~ConnectionFactory() {};
-	virtual std::shared_ptr<Connection> create() = 0;
-};
-
-struct ConnectionPoolStats {
-	size_t pool_size;
-	size_t borrowed_size;
-};
-
-template <class T> class ConnectionPool {
-  public:
-	ConnectionPool(size_t max_pool_size, size_t min_pool_size, std::shared_ptr<ConnectionFactory> factory) : m_maxPoolSize(max_pool_size), m_minPoolSize(min_pool_size), m_factory(factory)
-	{
-		Metrics::max_pool_size += max_pool_size;
-		Metrics::min_pool_size += min_pool_size;
-		while (m_pool.size() < m_minPoolSize) {
-			m_pool.push_back(m_factory->create());
-			Metrics::pool_avail++;
-		}
-	};
-
-	ConnectionPoolStats get_stats()
-	{
-		std::unique_lock<std::mutex> lock(m_poolMutex);
-
-		ConnectionPoolStats stats;
-		stats.pool_size = m_pool.size();
-		stats.borrowed_size = m_borrowed.size();
-
-		return stats;
-	};
-
-	~ConnectionPool() {};
-
-	/**
-	 * Borrow
-	 *
-	 * Borrow a connection for temporary use
-	 *
-	 * When done, either (a) call unborrow() to return it, or (b) (if it's bad) just let it go out of scope.  This will cause it to automatically be replaced.
-	 * @retval a shared_ptr to the connection object
-	 */
-	std::shared_ptr<T> borrow()
-	{
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("connection_pool");
-		auto span = tracer->StartSpan("connection_pool::borrow");
-		auto scope = tracer->WithActiveSpan(span);
-
-		std::unique_lock<std::mutex> l(m_poolMutex);
-
-		while ((m_pool.size() + m_borrowed.size()) < m_minPoolSize) {
-			std::shared_ptr<Connection> conn = m_factory->create();
-			m_pool.push_back(conn);
-			Metrics::pool_avail++;
-		}
-
-		if (m_pool.size() == 0) {
-			if ((m_pool.size() + m_borrowed.size()) < m_maxPoolSize) {
-				try {
-					std::shared_ptr<Connection> conn = m_factory->create();
-					m_borrowed.insert(conn);
-					Metrics::pool_in_use++;
-					return std::static_pointer_cast<T>(conn);
-				}
-				catch (std::exception& e) {
-					span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-					Metrics::pool_errors++;
-					throw ConnectionUnavailable();
-				}
-			}
-			else {
-				for (auto it = m_borrowed.begin(); it != m_borrowed.end(); ++it) {
-					if ((*it).unique()) {
-						// This connection has been abandoned! Destroy it and create a new connection
-						try {
-							// If we are able to create a new connection, return it
-							_DEBUG("Creating new connection to replace discarded connection");
-							std::shared_ptr<Connection> conn = m_factory->create();
-							m_borrowed.erase(it);
-							m_borrowed.insert(conn);
-							return std::static_pointer_cast<T>(conn);
-						}
-						catch (std::exception& e) {
-							span->SetStatus(opentelemetry::trace::StatusCode::kError, e.what());
-							// Error creating a replacement connection
-							Metrics::pool_errors++;
-							throw ConnectionUnavailable();
-						}
-					}
-				}
-
-				span->SetStatus(opentelemetry::trace::StatusCode::kError, "No available connections in pool");
-				// Nothing available
-				Metrics::pool_errors++;
-				throw ConnectionUnavailable();
-			}
-		}
-
-		// Take one off the front
-		std::shared_ptr<Connection> conn = m_pool.front();
-		m_pool.pop_front();
-		Metrics::pool_avail--;
-		// Add it to the borrowed list
-		m_borrowed.insert(conn);
-		Metrics::pool_in_use++;
-		return std::static_pointer_cast<T>(conn);
-	};
-
-	/**
-	 * Unborrow a connection
-	 *
-	 * Only call this if you are returning a working connection.  If the connection was bad, just let it go out of scope (so the connection manager can replace it).
-	 * @param the connection
-	 */
-	void unborrow(std::shared_ptr<T> conn)
-	{
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("connection_pool");
-		auto span = tracer->StartSpan("connection_pool::unborrow");
-		auto scope = tracer->WithActiveSpan(span);
-
-		// Lock
-		std::unique_lock<std::mutex> lock(m_poolMutex);
-		m_borrowed.erase(conn);
-		Metrics::pool_in_use--;
-		if ((m_pool.size() + m_borrowed.size()) < m_maxPoolSize) {
-			Metrics::pool_avail++;
-			m_pool.push_back(conn);
-		}
-	};
-
-  protected:
-	size_t m_maxPoolSize;
-	size_t m_minPoolSize;
-	std::shared_ptr<ConnectionFactory> m_factory;
-	std::deque<std::shared_ptr<Connection> > m_pool;
-	std::set<std::shared_ptr<Connection> > m_borrowed;
-	std::mutex m_poolMutex;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/controller/CtlUtil.cpp b/controller/CtlUtil.cpp
deleted file mode 100644
index e1e82f7a3..000000000
--- a/controller/CtlUtil.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "CtlUtil.hpp"
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-
-#include <iomanip>
-#include <sstream>
-
-namespace ZeroTier {
-
-const char* _timestr()
-{
-	time_t t = time(0);
-	char* ts = ctime(&t);
-	char* p = ts;
-	if (! p)
-		return "";
-	while (*p) {
-		if (*p == '\n') {
-			*p = (char)0;
-			break;
-		}
-		++p;
-	}
-	return ts;
-}
-
-std::vector<std::string> split(std::string str, char delim)
-{
-	std::istringstream iss(str);
-	std::vector<std::string> tokens;
-	std::string item;
-	while (std::getline(iss, item, delim)) {
-		tokens.push_back(item);
-	}
-	return tokens;
-}
-
-std::string url_encode(const std::string& value)
-{
-	std::ostringstream escaped;
-	escaped.fill('0');
-	escaped << std::hex;
-
-	for (std::string::const_iterator i = value.begin(), n = value.end(); i != n; ++i) {
-		std::string::value_type c = (*i);
-
-		// Keep alphanumeric and other accepted characters intact
-		if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~') {
-			escaped << c;
-			continue;
-		}
-
-		// Any other characters are percent-encoded
-		escaped << std::uppercase;
-		escaped << '%' << std::setw(2) << int((unsigned char)c);
-		escaped << std::nouppercase;
-	}
-
-	return escaped.str();
-}
-
-}	// namespace ZeroTier
-
-#endif
\ No newline at end of file
diff --git a/controller/CtlUtil.hpp b/controller/CtlUtil.hpp
deleted file mode 100644
index 0ba665af3..000000000
--- a/controller/CtlUtil.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef ZT_CTLUTIL_HPP
-#define ZT_CTLUTIL_HPP
-
-#include <string>
-#include <vector>
-
-namespace ZeroTier {
-
-const char* _timestr();
-
-std::vector<std::string> split(std::string str, char delim);
-
-std::string url_encode(const std::string& value);
-}	// namespace ZeroTier
-
-#endif	 // namespace ZeroTier
\ No newline at end of file
diff --git a/controller/DB.cpp b/controller/DB.cpp
deleted file mode 100644
index 4cce312ed..000000000
--- a/controller/DB.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "DB.hpp"
-
-#include "../node/Metrics.hpp"
-#include "EmbeddedNetworkController.hpp"
-#include "opentelemetry/trace/provider.h"
-
-#include <algorithm>
-#include <chrono>
-#include <stdexcept>
-
-using json = nlohmann::json;
-
-namespace ZeroTier {
-
-void DB::initNetwork(nlohmann::json& network)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::initNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-
-	if (! network.count("private"))
-		network["private"] = true;
-	if (! network.count("creationTime"))
-		network["creationTime"] = OSUtils::now();
-	if (! network.count("name"))
-		network["name"] = "";
-	if (! network.count("multicastLimit"))
-		network["multicastLimit"] = (uint64_t)32;
-	if (! network.count("enableBroadcast"))
-		network["enableBroadcast"] = true;
-	if (! network.count("v4AssignMode"))
-		network["v4AssignMode"] = { { "zt", false } };
-	if (! network.count("v6AssignMode"))
-		network["v6AssignMode"] = { { "rfc4193", false }, { "zt", false }, { "6plane", false } };
-	if (! network.count("authTokens"))
-		network["authTokens"] = { {} };
-	if (! network.count("capabilities"))
-		network["capabilities"] = nlohmann::json::array();
-	if (! network.count("tags"))
-		network["tags"] = nlohmann::json::array();
-	if (! network.count("routes"))
-		network["routes"] = nlohmann::json::array();
-	if (! network.count("ipAssignmentPools"))
-		network["ipAssignmentPools"] = nlohmann::json::array();
-	if (! network.count("mtu"))
-		network["mtu"] = ZT_DEFAULT_MTU;
-	if (! network.count("remoteTraceTarget"))
-		network["remoteTraceTarget"] = nlohmann::json();
-	if (! network.count("removeTraceLevel"))
-		network["remoteTraceLevel"] = 0;
-	if (! network.count("rulesSource"))
-		network["rulesSource"] = "";
-	if (! network.count("rules")) {
-		// If unspecified, rules are set to allow anything and behave like a flat L2 segment
-		network["rules"] = { { { "not", false }, { "or", false }, { "type", "ACTION_ACCEPT" } } };
-	}
-	if (! network.count("dns"))
-		network["dns"] = nlohmann::json::array();
-	if (! network.count("ssoEnabled"))
-		network["ssoEnabled"] = false;
-	if (! network.count("clientId"))
-		network["clientId"] = "";
-	if (! network.count("authorizationEndpoint"))
-		network["authorizationEndpoint"] = "";
-
-	network["objtype"] = "network";
-}
-
-void DB::initMember(nlohmann::json& member)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::initMember");
-	auto scope = tracer->WithActiveSpan(span);
-
-	if (! member.count("authorized"))
-		member["authorized"] = false;
-	if (! member.count("ssoExempt"))
-		member["ssoExempt"] = false;
-	if (! member.count("ipAssignments"))
-		member["ipAssignments"] = nlohmann::json::array();
-	if (! member.count("activeBridge"))
-		member["activeBridge"] = false;
-	if (! member.count("tags"))
-		member["tags"] = nlohmann::json::array();
-	if (! member.count("capabilities"))
-		member["capabilities"] = nlohmann::json::array();
-	if (! member.count("creationTime"))
-		member["creationTime"] = OSUtils::now();
-	if (! member.count("noAutoAssignIps"))
-		member["noAutoAssignIps"] = false;
-	if (! member.count("revision"))
-		member["revision"] = 0ULL;
-	if (! member.count("lastDeauthorizedTime"))
-		member["lastDeauthorizedTime"] = 0ULL;
-	if (! member.count("lastAuthorizedTime"))
-		member["lastAuthorizedTime"] = 0ULL;
-	if (! member.count("lastAuthorizedCredentialType"))
-		member["lastAuthorizedCredentialType"] = nlohmann::json();
-	if (! member.count("lastAuthorizedCredential"))
-		member["lastAuthorizedCredential"] = nlohmann::json();
-	if (! member.count("authenticationExpiryTime"))
-		member["authenticationExpiryTime"] = 0LL;
-	if (! member.count("vMajor"))
-		member["vMajor"] = -1;
-	if (! member.count("vMinor"))
-		member["vMinor"] = -1;
-	if (! member.count("vRev"))
-		member["vRev"] = -1;
-	if (! member.count("vProto"))
-		member["vProto"] = -1;
-	if (! member.count("remoteTraceTarget"))
-		member["remoteTraceTarget"] = nlohmann::json();
-	if (! member.count("removeTraceLevel"))
-		member["remoteTraceLevel"] = 0;
-	member["objtype"] = "member";
-}
-
-void DB::cleanNetwork(nlohmann::json& network)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::cleanNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-
-	network.erase("clock");
-	network.erase("authorizedMemberCount");
-	network.erase("activeMemberCount");
-	network.erase("totalMemberCount");
-	network.erase("lastModified");
-}
-
-void DB::cleanMember(nlohmann::json& member)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::cleanMember");
-	auto scope = tracer->WithActiveSpan(span);
-
-	member.erase("clock");
-	member.erase("physicalAddr");
-	member.erase("recentLog");
-	member.erase("lastModified");
-	member.erase("lastRequestMetaData");
-	member.erase("authenticationURL");		  // computed
-	member.erase("authenticationClientID");	  // computed
-}
-
-DB::DB()
-{
-}
-DB::~DB()
-{
-}
-
-bool DB::get(const uint64_t networkId, nlohmann::json& network)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::getNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-
-	waitForReady();
-	Metrics::db_get_network++;
-	std::shared_ptr<_Network> nw;
-	{
-		std::shared_lock<std::shared_mutex> l(_networks_l);
-		auto nwi = _networks.find(networkId);
-		if (nwi == _networks.end())
-			return false;
-		nw = nwi->second;
-	}
-	{
-		std::shared_lock<std::shared_mutex> l2(nw->lock);
-		network = nw->config;
-	}
-	return true;
-}
-
-bool DB::get(const uint64_t networkId, nlohmann::json& network, const uint64_t memberId, nlohmann::json& member)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::getNetworkAndMember");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex(networkId, memberIdStr));
-
-	waitForReady();
-	Metrics::db_get_network_and_member++;
-	std::shared_ptr<_Network> nw;
-	{
-		std::shared_lock<std::shared_mutex> l(_networks_l);
-		auto nwi = _networks.find(networkId);
-		if (nwi == _networks.end())
-			return false;
-		nw = nwi->second;
-	}
-	{
-		std::shared_lock<std::shared_mutex> l2(nw->lock);
-		network = nw->config;
-		auto m = nw->members.find(memberId);
-		if (m == nw->members.end())
-			return false;
-		member = m->second;
-	}
-	return true;
-}
-
-bool DB::get(const uint64_t networkId, nlohmann::json& network, const uint64_t memberId, nlohmann::json& member, NetworkSummaryInfo& info)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::getNetworkAndMemberAndSummary");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex(memberId, memberIdStr));
-
-	waitForReady();
-	Metrics::db_get_network_and_member_and_summary++;
-	std::shared_ptr<_Network> nw;
-	{
-		std::shared_lock<std::shared_mutex> l(_networks_l);
-		auto nwi = _networks.find(networkId);
-		if (nwi == _networks.end())
-			return false;
-		nw = nwi->second;
-	}
-	{
-		std::shared_lock<std::shared_mutex> l2(nw->lock);
-		network = nw->config;
-		_fillSummaryInfo(nw, info);
-		auto m = nw->members.find(memberId);
-		if (m == nw->members.end())
-			return false;
-		member = m->second;
-	}
-
-	return true;
-}
-
-bool DB::get(const uint64_t networkId, nlohmann::json& network, std::vector<nlohmann::json>& members)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::getNetworkAndMembers");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-
-	waitForReady();
-	Metrics::db_get_member_list++;
-	std::shared_ptr<_Network> nw;
-	{
-		std::shared_lock<std::shared_mutex> l(_networks_l);
-		auto nwi = _networks.find(networkId);
-		if (nwi == _networks.end())
-			return false;
-		nw = nwi->second;
-	}
-	{
-		std::shared_lock<std::shared_mutex> l2(nw->lock);
-		network = nw->config;
-		for (auto m = nw->members.begin(); m != nw->members.end(); ++m) {
-			members.push_back(m->second);
-		}
-	}
-	return true;
-}
-
-void DB::networks(std::set<uint64_t>& networks)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::networks");
-	auto scope = tracer->WithActiveSpan(span);
-
-	waitForReady();
-	Metrics::db_get_network_list++;
-	std::shared_lock<std::shared_mutex> l(_networks_l);
-	for (auto n = _networks.begin(); n != _networks.end(); ++n)
-		networks.insert(n->first);
-}
-
-void DB::_memberChanged(nlohmann::json& old, nlohmann::json& memberConfig, bool notifyListeners)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::_memberChanged");
-	auto scope = tracer->WithActiveSpan(span);
-
-	Metrics::db_member_change++;
-	uint64_t memberId = 0;
-	uint64_t networkId = 0;
-	bool isAuth = false;
-	bool wasAuth = false;
-	std::shared_ptr<_Network> nw;
-
-	if (old.is_object()) {
-		memberId = OSUtils::jsonIntHex(old["id"], 0ULL);
-		networkId = OSUtils::jsonIntHex(old["nwid"], 0ULL);
-		if ((memberId) && (networkId)) {
-			{
-				std::unique_lock<std::shared_mutex> l(_networks_l);
-				auto nw2 = _networks.find(networkId);
-				if (nw2 != _networks.end()) {
-					nw = nw2->second;
-				}
-			}
-			if (nw) {
-				std::unique_lock<std::shared_mutex> l(nw->lock);
-				if (OSUtils::jsonBool(old["activeBridge"], false)) {
-					nw->activeBridgeMembers.erase(memberId);
-				}
-				wasAuth = OSUtils::jsonBool(old["authorized"], false);
-				if (wasAuth) {
-					nw->authorizedMembers.erase(memberId);
-				}
-				json& ips = old["ipAssignments"];
-				if (ips.is_array()) {
-					for (unsigned long i = 0; i < ips.size(); ++i) {
-						json& ipj = ips[i];
-						if (ipj.is_string()) {
-							const std::string ips = ipj;
-							InetAddress ipa(ips.c_str());
-							ipa.setPort(0);
-							nw->allocatedIps.erase(ipa);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if (memberConfig.is_object()) {
-		if (! nw) {
-			memberId = OSUtils::jsonIntHex(memberConfig["id"], 0ULL);
-			networkId = OSUtils::jsonIntHex(memberConfig["nwid"], 0ULL);
-			if ((! memberId) || (! networkId))
-				return;
-			std::unique_lock<std::shared_mutex> l(_networks_l);
-			std::shared_ptr<_Network>& nw2 = _networks[networkId];
-			if (! nw2)
-				nw2.reset(new _Network);
-			nw = nw2;
-		}
-
-		{
-			std::unique_lock<std::shared_mutex> l(nw->lock);
-
-			nw->members[memberId] = memberConfig;
-
-			if (OSUtils::jsonBool(memberConfig["activeBridge"], false)) {
-				nw->activeBridgeMembers.insert(memberId);
-			}
-			isAuth = OSUtils::jsonBool(memberConfig["authorized"], false);
-			if (isAuth) {
-				Metrics::member_auths++;
-				nw->authorizedMembers.insert(memberId);
-			}
-			json& ips = memberConfig["ipAssignments"];
-			if (ips.is_array()) {
-				for (unsigned long i = 0; i < ips.size(); ++i) {
-					json& ipj = ips[i];
-					if (ipj.is_string()) {
-						const std::string ips = ipj;
-						InetAddress ipa(ips.c_str());
-						ipa.setPort(0);
-						nw->allocatedIps.insert(ipa);
-					}
-				}
-			}
-
-			if (! isAuth) {
-				const int64_t ldt = (int64_t)OSUtils::jsonInt(memberConfig["lastDeauthorizedTime"], 0ULL);
-				if (ldt > nw->mostRecentDeauthTime)
-					nw->mostRecentDeauthTime = ldt;
-			}
-		}
-
-		if (notifyListeners) {
-			std::unique_lock<std::shared_mutex> ll(_changeListeners_l);
-			for (auto i = _changeListeners.begin(); i != _changeListeners.end(); ++i) {
-				(*i)->onNetworkMemberUpdate(this, networkId, memberId, memberConfig);
-			}
-		}
-	}
-	else if (memberId) {
-		if (nw) {
-			std::unique_lock<std::shared_mutex> l(nw->lock);
-			nw->members.erase(memberId);
-		}
-		if (networkId) {
-			std::unique_lock<std::shared_mutex> l(_networks_l);
-			auto er = _networkByMember.equal_range(memberId);
-			for (auto i = er.first; i != er.second; ++i) {
-				if (i->second == networkId) {
-					_networkByMember.erase(i);
-					break;
-				}
-			}
-		}
-	}
-
-	if (notifyListeners) {
-		if (networkId != 0 && memberId != 0 && old.is_object() && ! memberConfig.is_object()) {
-			// member delete
-			Metrics::member_count--;
-		}
-		else if (networkId != 0 && memberId != 0 && ! old.is_object() && memberConfig.is_object()) {
-			// new member
-			Metrics::member_count++;
-		}
-
-		if (! wasAuth && isAuth) {
-			Metrics::member_auths++;
-		}
-		else if (wasAuth && ! isAuth) {
-			Metrics::member_deauths++;
-		}
-		else {
-			Metrics::member_changes++;
-		}
-	}
-
-	if ((notifyListeners) && ((wasAuth) && (! isAuth) && (networkId) && (memberId))) {
-		std::unique_lock<std::shared_mutex> ll(_changeListeners_l);
-		for (auto i = _changeListeners.begin(); i != _changeListeners.end(); ++i) {
-			(*i)->onNetworkMemberDeauthorize(this, networkId, memberId);
-		}
-	}
-}
-
-void DB::_networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, bool notifyListeners)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::_networkChanged");
-	span->SetAttribute("old_network_config", old.dump());
-	span->SetAttribute("network_config", networkConfig.dump());
-	span->SetAttribute("notify_listeners", notifyListeners);
-	auto scope = tracer->WithActiveSpan(span);
-
-	Metrics::db_network_change++;
-	if (notifyListeners) {
-		if (old.is_object() && old.contains("id") && networkConfig.is_object() && networkConfig.contains("id")) {
-			Metrics::network_changes++;
-		}
-		else if (! old.is_object() && networkConfig.is_object() && networkConfig.contains("id")) {
-			Metrics::network_count++;
-		}
-		else if (old.is_object() && old.contains("id") && ! networkConfig.is_object()) {
-			Metrics::network_count--;
-		}
-	}
-
-	if (networkConfig.is_object()) {
-		const std::string ids = networkConfig["id"];
-		const uint64_t networkId = Utils::hexStrToU64(ids.c_str());
-		if (networkId) {
-			std::shared_ptr<_Network> nw;
-			{
-				std::unique_lock<std::shared_mutex> l(_networks_l);
-				std::shared_ptr<_Network>& nw2 = _networks[networkId];
-				if (! nw2)
-					nw2.reset(new _Network);
-				nw = nw2;
-			}
-			{
-				std::unique_lock<std::shared_mutex> l2(nw->lock);
-				nw->config = networkConfig;
-			}
-			if (notifyListeners) {
-				std::unique_lock<std::shared_mutex> ll(_changeListeners_l);
-				for (auto i = _changeListeners.begin(); i != _changeListeners.end(); ++i) {
-					(*i)->onNetworkUpdate(this, networkId, networkConfig);
-				}
-			}
-		}
-	}
-	else if (old.is_object()) {
-		const std::string ids = old["id"];
-		const uint64_t networkId = Utils::hexStrToU64(ids.c_str());
-		if (networkId) {
-			try {
-				// deauth all members on the network
-				nlohmann::json network;
-				std::vector<nlohmann::json> members;
-				this->get(networkId, network, members);
-				for (auto i = members.begin(); i != members.end(); ++i) {
-					const std::string nodeID = (*i)["id"];
-					const uint64_t memberId = Utils::hexStrToU64(nodeID.c_str());
-					std::unique_lock<std::shared_mutex> ll(_changeListeners_l);
-					for (auto j = _changeListeners.begin(); j != _changeListeners.end(); ++j) {
-						(*j)->onNetworkMemberDeauthorize(this, networkId, memberId);
-					}
-				}
-			}
-			catch (std::exception& e) {
-				std::cerr << "Error deauthorizing members on network delete: " << e.what() << std::endl;
-			}
-
-			// delete the network
-			std::unique_lock<std::shared_mutex> l(_networks_l);
-			_networks.erase(networkId);
-		}
-	}
-}
-
-void DB::_fillSummaryInfo(const std::shared_ptr<_Network>& nw, NetworkSummaryInfo& info)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db");
-	auto span = tracer->StartSpan("db::_fillSummaryInfo");
-	auto scope = tracer->WithActiveSpan(span);
-
-	for (auto ab = nw->activeBridgeMembers.begin(); ab != nw->activeBridgeMembers.end(); ++ab)
-		info.activeBridges.push_back(Address(*ab));
-	std::sort(info.activeBridges.begin(), info.activeBridges.end());
-	for (auto ip = nw->allocatedIps.begin(); ip != nw->allocatedIps.end(); ++ip)
-		info.allocatedIps.push_back(*ip);
-	std::sort(info.allocatedIps.begin(), info.allocatedIps.end());
-	info.authorizedMemberCount = (unsigned long)nw->authorizedMembers.size();
-	info.totalMemberCount = (unsigned long)nw->members.size();
-	info.mostRecentDeauthTime = nw->mostRecentDeauthTime;
-}
-
-}	// namespace ZeroTier
diff --git a/controller/DB.hpp b/controller/DB.hpp
deleted file mode 100644
index 01b6f1266..000000000
--- a/controller/DB.hpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_CONTROLLER_DB_HPP
-#define ZT_CONTROLLER_DB_HPP
-
-// #define ZT_CONTROLLER_USE_LIBPQ
-
-#include "../node/Constants.hpp"
-#include "../node/Identity.hpp"
-#include "../node/InetAddress.hpp"
-#include "../osdep/BlockingQueue.hpp"
-#include "../osdep/OSUtils.hpp"
-
-#include <atomic>
-#include <map>
-#include <memory>
-#include <nlohmann/json.hpp>
-#include <prometheus/simpleapi.h>
-#include <set>
-#include <shared_mutex>
-#include <string>
-#include <thread>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#define ZT_MEMBER_AUTH_TIMEOUT_NOTIFY_BEFORE 25000
-
-namespace ZeroTier {
-
-struct AuthInfo {
-  public:
-	AuthInfo() : enabled(false), version(0), authenticationURL(), authenticationExpiryTime(0), issuerURL(), centralAuthURL(), ssoNonce(), ssoState(), ssoClientID(), ssoProvider("default")
-	{
-	}
-
-	bool enabled;
-	uint64_t version;
-	std::string authenticationURL;
-	uint64_t authenticationExpiryTime;
-	std::string issuerURL;
-	std::string centralAuthURL;
-	std::string ssoNonce;
-	std::string ssoState;
-	std::string ssoClientID;
-	std::string ssoProvider;
-};
-
-/**
- * Base class with common infrastructure for all controller DB implementations
- */
-class DB {
-  public:
-	class ChangeListener {
-	  public:
-		ChangeListener()
-		{
-		}
-		virtual ~ChangeListener()
-		{
-		}
-		virtual void onNetworkUpdate(const void* db, uint64_t networkId, const nlohmann::json& network)
-		{
-		}
-		virtual void onNetworkMemberUpdate(const void* db, uint64_t networkId, uint64_t memberId, const nlohmann::json& member)
-		{
-		}
-		virtual void onNetworkMemberDeauthorize(const void* db, uint64_t networkId, uint64_t memberId)
-		{
-		}
-	};
-
-	struct NetworkSummaryInfo {
-		NetworkSummaryInfo() : authorizedMemberCount(0), totalMemberCount(0), mostRecentDeauthTime(0)
-		{
-		}
-		std::vector<Address> activeBridges;
-		std::vector<InetAddress> allocatedIps;
-		unsigned long authorizedMemberCount;
-		unsigned long totalMemberCount;
-		int64_t mostRecentDeauthTime;
-	};
-
-	static void initNetwork(nlohmann::json& network);
-	static void initMember(nlohmann::json& member);
-	static void cleanNetwork(nlohmann::json& network);
-	static void cleanMember(nlohmann::json& member);
-
-	DB();
-	virtual ~DB();
-
-	virtual bool waitForReady() = 0;
-	virtual bool isReady() = 0;
-
-	inline bool hasNetwork(const uint64_t networkId) const
-	{
-		std::shared_lock<std::shared_mutex> l(_networks_l);
-		return (_networks.find(networkId) != _networks.end());
-	}
-
-	bool get(const uint64_t networkId, nlohmann::json& network);
-	bool get(const uint64_t networkId, nlohmann::json& network, const uint64_t memberId, nlohmann::json& member);
-	bool get(const uint64_t networkId, nlohmann::json& network, const uint64_t memberId, nlohmann::json& member, NetworkSummaryInfo& info);
-	bool get(const uint64_t networkId, nlohmann::json& network, std::vector<nlohmann::json>& members);
-
-	void networks(std::set<uint64_t>& networks);
-
-	template <typename F> inline void each(F f)
-	{
-		nlohmann::json nullJson;
-		std::unique_lock<std::shared_mutex> lck(_networks_l);
-		for (auto nw = _networks.begin(); nw != _networks.end(); ++nw) {
-			f(nw->first, nw->second->config, 0, nullJson);	 // first provide network with 0 for member ID
-			for (auto m = nw->second->members.begin(); m != nw->second->members.end(); ++m) {
-				f(nw->first, nw->second->config, m->first, m->second);
-			}
-		}
-	}
-
-	virtual bool save(nlohmann::json& record, bool notifyListeners) = 0;
-	virtual void eraseNetwork(const uint64_t networkId) = 0;
-	virtual void eraseMember(const uint64_t networkId, const uint64_t memberId) = 0;
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress) = 0;
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch) = 0;
-
-	virtual AuthInfo getSSOAuthInfo(const nlohmann::json& member, const std::string& redirectURL)
-	{
-		return AuthInfo();
-	}
-
-	inline void addListener(DB::ChangeListener* const listener)
-	{
-		std::unique_lock<std::shared_mutex> l(_changeListeners_l);
-		_changeListeners.push_back(listener);
-	}
-
-  protected:
-	static inline bool _compareRecords(const nlohmann::json& a, const nlohmann::json& b)
-	{
-		if (a.is_object() == b.is_object()) {
-			if (a.is_object()) {
-				if (a.size() != b.size())
-					return false;
-				auto amap = a.get<nlohmann::json::object_t>();
-				auto bmap = b.get<nlohmann::json::object_t>();
-				for (auto ai = amap.begin(); ai != amap.end(); ++ai) {
-					if (ai->first != "revision") {	 // ignore revision, compare only non-revision-counter fields
-						auto bi = bmap.find(ai->first);
-						if ((bi == bmap.end()) || (bi->second != ai->second))
-							return false;
-					}
-				}
-				return true;
-			}
-			return (a == b);
-		}
-		return false;
-	}
-
-	struct _Network {
-		_Network() : mostRecentDeauthTime(0)
-		{
-		}
-		nlohmann::json config;
-		std::unordered_map<uint64_t, nlohmann::json> members;
-		std::unordered_set<uint64_t> activeBridgeMembers;
-		std::unordered_set<uint64_t> authorizedMembers;
-		std::unordered_set<InetAddress, InetAddress::Hasher> allocatedIps;
-		int64_t mostRecentDeauthTime;
-		std::shared_mutex lock;
-	};
-
-	virtual void _memberChanged(nlohmann::json& old, nlohmann::json& memberConfig, bool notifyListeners);
-	virtual void _networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, bool notifyListeners);
-	void _fillSummaryInfo(const std::shared_ptr<_Network>& nw, NetworkSummaryInfo& info);
-
-	std::vector<DB::ChangeListener*> _changeListeners;
-	std::unordered_map<uint64_t, std::shared_ptr<_Network> > _networks;
-	std::unordered_multimap<uint64_t, uint64_t> _networkByMember;
-	mutable std::shared_mutex _changeListeners_l;
-	mutable std::shared_mutex _networks_l;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/controller/DBMirrorSet.cpp b/controller/DBMirrorSet.cpp
deleted file mode 100644
index f8c6f0366..000000000
--- a/controller/DBMirrorSet.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "DBMirrorSet.hpp"
-
-#include "opentelemetry/trace/provider.h"
-
-namespace ZeroTier {
-
-DBMirrorSet::DBMirrorSet(DB::ChangeListener* listener) : _listener(listener), _running(true), _syncCheckerThread(), _dbs(), _dbs_l()
-{
-	_syncCheckerThread = std::thread([this]() {
-		for (;;) {
-			for (int i = 0; i < 120; ++i) {	  // 1 minute delay between checks
-				if (! _running)
-					return;
-				std::this_thread::sleep_for(std::chrono::milliseconds(500));
-			}
-
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("db_mirror_set");
-			auto span = tracer->StartSpan("db::syncChecker");
-			auto scope = tracer->WithActiveSpan(span);
-
-			std::vector<std::shared_ptr<DB> > dbs;
-			{
-				std::unique_lock<std::shared_mutex> l(_dbs_l);
-				if (_dbs.size() <= 1)
-					continue;	// no need to do this if there's only one DB, so skip the iteration
-				dbs = _dbs;
-			}
-
-			for (auto db = dbs.begin(); db != dbs.end(); ++db) {
-				(*db)->each([&dbs, &db](uint64_t networkId, const nlohmann::json& network, uint64_t memberId, const nlohmann::json& member) {
-					try {
-						if (network.is_object()) {
-							if (memberId == 0) {
-								for (auto db2 = dbs.begin(); db2 != dbs.end(); ++db2) {
-									if (db->get() != db2->get()) {
-										nlohmann::json nw2;
-										if ((! (*db2)->get(networkId, nw2)) || ((nw2.is_object()) && (OSUtils::jsonInt(nw2["revision"], 0) < OSUtils::jsonInt(network["revision"], 0)))) {
-											nw2 = network;
-											(*db2)->save(nw2, false);
-										}
-									}
-								}
-							}
-							else if (member.is_object()) {
-								for (auto db2 = dbs.begin(); db2 != dbs.end(); ++db2) {
-									if (db->get() != db2->get()) {
-										nlohmann::json nw2, m2;
-										if ((! (*db2)->get(networkId, nw2, memberId, m2)) || ((m2.is_object()) && (OSUtils::jsonInt(m2["revision"], 0) < OSUtils::jsonInt(member["revision"], 0)))) {
-											m2 = member;
-											(*db2)->save(m2, false);
-										}
-									}
-								}
-							}
-						}
-					}
-					catch (...) {
-					}	// skip entries that generate JSON errors
-				});
-			}
-		}
-	});
-}
-
-DBMirrorSet::~DBMirrorSet()
-{
-	_running = false;
-	_syncCheckerThread.join();
-}
-
-bool DBMirrorSet::hasNetwork(const uint64_t networkId) const
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::hasNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		if ((*d)->hasNetwork(networkId))
-			return true;
-	}
-	return false;
-}
-
-bool DBMirrorSet::get(const uint64_t networkId, nlohmann::json& network)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::getNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		if ((*d)->get(networkId, network)) {
-			return true;
-		}
-	}
-	return false;
-}
-
-bool DBMirrorSet::get(const uint64_t networkId, nlohmann::json& network, const uint64_t memberId, nlohmann::json& member)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::getNetworkAndMember");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		if ((*d)->get(networkId, network, memberId, member))
-			return true;
-	}
-	return false;
-}
-
-bool DBMirrorSet::get(const uint64_t networkId, nlohmann::json& network, const uint64_t memberId, nlohmann::json& member, DB::NetworkSummaryInfo& info)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::getNetworkAndMemberWithSummary");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		if ((*d)->get(networkId, network, memberId, member, info))
-			return true;
-	}
-	return false;
-}
-
-bool DBMirrorSet::get(const uint64_t networkId, nlohmann::json& network, std::vector<nlohmann::json>& members)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::getNetworkAndMembers");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		if ((*d)->get(networkId, network, members))
-			return true;
-	}
-	return false;
-}
-
-AuthInfo DBMirrorSet::getSSOAuthInfo(const nlohmann::json& member, const std::string& redirectURL)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::getSSOAuthInfo");
-	auto scope = tracer->WithActiveSpan(span);
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		AuthInfo info = (*d)->getSSOAuthInfo(member, redirectURL);
-		if (info.enabled) {
-			return info;
-		}
-	}
-	return AuthInfo();
-}
-
-void DBMirrorSet::networks(std::set<uint64_t>& networks)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::networks");
-	auto scope = tracer->WithActiveSpan(span);
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		(*d)->networks(networks);
-	}
-}
-
-bool DBMirrorSet::waitForReady()
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::waitForReady");
-	auto scope = tracer->WithActiveSpan(span);
-
-	bool r = false;
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		r |= (*d)->waitForReady();
-	}
-	return r;
-}
-
-bool DBMirrorSet::isReady()
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::isReady");
-	auto scope = tracer->WithActiveSpan(span);
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		if (! (*d)->isReady())
-			return false;
-	}
-	return true;
-}
-
-bool DBMirrorSet::save(nlohmann::json& record, bool notifyListeners)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::save");
-	auto scope = tracer->WithActiveSpan(span);
-
-	std::vector<std::shared_ptr<DB> > dbs;
-	{
-		std::unique_lock<std::shared_mutex> l(_dbs_l);
-		dbs = _dbs;
-	}
-	if (notifyListeners) {
-		for (auto d = dbs.begin(); d != dbs.end(); ++d) {
-			if ((*d)->save(record, true))
-				return true;
-		}
-		return false;
-	}
-	else {
-		bool modified = false;
-		for (auto d = dbs.begin(); d != dbs.end(); ++d) {
-			modified |= (*d)->save(record, false);
-		}
-		return modified;
-	}
-}
-
-void DBMirrorSet::eraseNetwork(const uint64_t networkId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::eraseNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-
-	std::unique_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		(*d)->eraseNetwork(networkId);
-	}
-}
-
-void DBMirrorSet::eraseMember(const uint64_t networkId, const uint64_t memberId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::eraseMember");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-
-	std::unique_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		(*d)->eraseMember(networkId, memberId);
-	}
-}
-
-void DBMirrorSet::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::nodeIsOnline");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	char phyAddressStr[INET6_ADDRSTRLEN];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-	span->SetAttribute("physical_address", physicalAddress.toString(phyAddressStr));
-	span->SetAttribute("os_arch", osArch);
-
-	std::shared_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		(*d)->nodeIsOnline(networkId, memberId, physicalAddress, osArch);
-	}
-}
-
-void DBMirrorSet::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress)
-{
-	this->nodeIsOnline(networkId, memberId, physicalAddress, "unknown/unknown");
-}
-
-void DBMirrorSet::onNetworkUpdate(const void* db, uint64_t networkId, const nlohmann::json& network)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::onNetworkUpdate");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-
-	nlohmann::json record(network);
-	std::unique_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		if (d->get() != db) {
-			(*d)->save(record, false);
-		}
-	}
-	_listener->onNetworkUpdate(this, networkId, network);
-}
-
-void DBMirrorSet::onNetworkMemberUpdate(const void* db, uint64_t networkId, uint64_t memberId, const nlohmann::json& member)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::onNetworkMemberUpdate");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-
-	nlohmann::json record(member);
-	std::unique_lock<std::shared_mutex> l(_dbs_l);
-	for (auto d = _dbs.begin(); d != _dbs.end(); ++d) {
-		if (d->get() != db) {
-			(*d)->save(record, false);
-		}
-	}
-	_listener->onNetworkMemberUpdate(this, networkId, memberId, member);
-}
-
-void DBMirrorSet::onNetworkMemberDeauthorize(const void* db, uint64_t networkId, uint64_t memberId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("db_mirror_set");
-	auto span = tracer->StartSpan("db_mirror_set::onNetworkMemberDeauthorize");
-	auto scope = tracer->WithActiveSpan(span);
-	char networkIdStr[17];
-	char memberIdStr[11];
-	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
-	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
-
-	_listener->onNetworkMemberDeauthorize(this, networkId, memberId);
-}
-
-}	// namespace ZeroTier
diff --git a/controller/DBMirrorSet.hpp b/controller/DBMirrorSet.hpp
deleted file mode 100644
index 50230c545..000000000
--- a/controller/DBMirrorSet.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_DBMIRRORSET_HPP
-#define ZT_DBMIRRORSET_HPP
-
-#include "DB.hpp"
-
-#include <memory>
-#include <set>
-#include <shared_mutex>
-#include <thread>
-#include <vector>
-
-namespace ZeroTier {
-
-class DBMirrorSet : public DB::ChangeListener {
-  public:
-	DBMirrorSet(DB::ChangeListener* listener);
-	virtual ~DBMirrorSet();
-
-	bool hasNetwork(const uint64_t networkId) const;
-
-	bool get(const uint64_t networkId, nlohmann::json& network);
-	bool get(const uint64_t networkId, nlohmann::json& network, const uint64_t memberId, nlohmann::json& member);
-	bool get(const uint64_t networkId, nlohmann::json& network, const uint64_t memberId, nlohmann::json& member, DB::NetworkSummaryInfo& info);
-	bool get(const uint64_t networkId, nlohmann::json& network, std::vector<nlohmann::json>& members);
-
-	void networks(std::set<uint64_t>& networks);
-
-	bool waitForReady();
-	bool isReady();
-	bool save(nlohmann::json& record, bool notifyListeners);
-	void eraseNetwork(const uint64_t networkId);
-	void eraseMember(const uint64_t networkId, const uint64_t memberId);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch);
-
-	// These are called by various DB instances when changes occur.
-	virtual void onNetworkUpdate(const void* db, uint64_t networkId, const nlohmann::json& network);
-	virtual void onNetworkMemberUpdate(const void* db, uint64_t networkId, uint64_t memberId, const nlohmann::json& member);
-	virtual void onNetworkMemberDeauthorize(const void* db, uint64_t networkId, uint64_t memberId);
-
-	AuthInfo getSSOAuthInfo(const nlohmann::json& member, const std::string& redirectURL);
-
-	inline void addDB(const std::shared_ptr<DB>& db)
-	{
-		db->addListener(this);
-		std::unique_lock<std::shared_mutex> l(_dbs_l);
-		_dbs.push_back(db);
-	}
-
-  private:
-	DB::ChangeListener* const _listener;
-	std::atomic_bool _running;
-	std::thread _syncCheckerThread;
-	std::vector<std::shared_ptr<DB> > _dbs;
-	mutable std::shared_mutex _dbs_l;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
deleted file mode 100644
index b7ba04299..000000000
--- a/controller/EmbeddedNetworkController.cpp
+++ /dev/null
@@ -1,2396 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <type_traits>
-
-#ifndef _WIN32
-#include <sys/time.h>
-#endif
-#include "../include/ZeroTierOne.h"
-#include "../version.h"
-#include "EmbeddedNetworkController.hpp"
-#include "FileDB.hpp"
-#include "LFDB.hpp"
-
-#include <algorithm>
-#include <cctype>
-#include <iomanip>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <stdexcept>
-#include <sys/types.h>
-#include <thread>
-#include <utility>
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-#include "CV1.hpp"
-#include "CV2.hpp"
-#endif
-
-#include "../node/CertificateOfMembership.hpp"
-#include "../node/Dictionary.hpp"
-#include "../node/MAC.hpp"
-#include "../node/NetworkConfig.hpp"
-#include "../node/Node.hpp"
-#include "opentelemetry/trace/provider.h"
-
-using json = nlohmann::json;
-
-// API version reported via JSON control plane
-#define ZT_NETCONF_CONTROLLER_API_VERSION 4
-
-// Min duration between requests for an address/nwid combo to prevent floods
-#define ZT_NETCONF_MIN_REQUEST_PERIOD 1000
-
-// Global maximum size of arrays in JSON objects
-#define ZT_CONTROLLER_MAX_ARRAY_SIZE 16384
-
-namespace ZeroTier {
-
-namespace {
-
-static json _renderRule(ZT_VirtualNetworkRule& rule)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::renderRule");
-	auto scope = tracer->WithActiveSpan(span);
-
-	char tmp[128];
-	json r = json::object();
-	const ZT_VirtualNetworkRuleType rt = (ZT_VirtualNetworkRuleType)(rule.t & 0x3f);
-
-	switch (rt) {
-		case ZT_NETWORK_RULE_ACTION_DROP:
-			r["type"] = "ACTION_DROP";
-			break;
-		case ZT_NETWORK_RULE_ACTION_ACCEPT:
-			r["type"] = "ACTION_ACCEPT";
-			break;
-		case ZT_NETWORK_RULE_ACTION_TEE:
-			r["type"] = "ACTION_TEE";
-			r["address"] = Address(rule.v.fwd.address).toString(tmp);
-			r["flags"] = (unsigned int)rule.v.fwd.flags;
-			r["length"] = (unsigned int)rule.v.fwd.length;
-			break;
-		case ZT_NETWORK_RULE_ACTION_WATCH:
-			r["type"] = "ACTION_WATCH";
-			r["address"] = Address(rule.v.fwd.address).toString(tmp);
-			r["flags"] = (unsigned int)rule.v.fwd.flags;
-			r["length"] = (unsigned int)rule.v.fwd.length;
-			break;
-		case ZT_NETWORK_RULE_ACTION_REDIRECT:
-			r["type"] = "ACTION_REDIRECT";
-			r["address"] = Address(rule.v.fwd.address).toString(tmp);
-			r["flags"] = (unsigned int)rule.v.fwd.flags;
-			break;
-		case ZT_NETWORK_RULE_ACTION_BREAK:
-			r["type"] = "ACTION_BREAK";
-			break;
-		default:
-			break;
-	}
-
-	if (r.empty()) {
-		switch (rt) {
-			case ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS:
-				r["type"] = "MATCH_SOURCE_ZEROTIER_ADDRESS";
-				r["zt"] = Address(rule.v.zt).toString(tmp);
-				break;
-			case ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS:
-				r["type"] = "MATCH_DEST_ZEROTIER_ADDRESS";
-				r["zt"] = Address(rule.v.zt).toString(tmp);
-				break;
-			case ZT_NETWORK_RULE_MATCH_VLAN_ID:
-				r["type"] = "MATCH_VLAN_ID";
-				r["vlanId"] = (unsigned int)rule.v.vlanId;
-				break;
-			case ZT_NETWORK_RULE_MATCH_VLAN_PCP:
-				r["type"] = "MATCH_VLAN_PCP";
-				r["vlanPcp"] = (unsigned int)rule.v.vlanPcp;
-				break;
-			case ZT_NETWORK_RULE_MATCH_VLAN_DEI:
-				r["type"] = "MATCH_VLAN_DEI";
-				r["vlanDei"] = (unsigned int)rule.v.vlanDei;
-				break;
-			case ZT_NETWORK_RULE_MATCH_MAC_SOURCE:
-				r["type"] = "MATCH_MAC_SOURCE";
-				OSUtils::ztsnprintf(
-					tmp,
-					sizeof(tmp),
-					"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
-					(unsigned int)rule.v.mac[0],
-					(unsigned int)rule.v.mac[1],
-					(unsigned int)rule.v.mac[2],
-					(unsigned int)rule.v.mac[3],
-					(unsigned int)rule.v.mac[4],
-					(unsigned int)rule.v.mac[5]);
-				r["mac"] = tmp;
-				break;
-			case ZT_NETWORK_RULE_MATCH_MAC_DEST:
-				r["type"] = "MATCH_MAC_DEST";
-				OSUtils::ztsnprintf(
-					tmp,
-					sizeof(tmp),
-					"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
-					(unsigned int)rule.v.mac[0],
-					(unsigned int)rule.v.mac[1],
-					(unsigned int)rule.v.mac[2],
-					(unsigned int)rule.v.mac[3],
-					(unsigned int)rule.v.mac[4],
-					(unsigned int)rule.v.mac[5]);
-				r["mac"] = tmp;
-				break;
-			case ZT_NETWORK_RULE_MATCH_IPV4_SOURCE:
-				r["type"] = "MATCH_IPV4_SOURCE";
-				r["ip"] = InetAddress(&(rule.v.ipv4.ip), 4, (unsigned int)rule.v.ipv4.mask).toString(tmp);
-				break;
-			case ZT_NETWORK_RULE_MATCH_IPV4_DEST:
-				r["type"] = "MATCH_IPV4_DEST";
-				r["ip"] = InetAddress(&(rule.v.ipv4.ip), 4, (unsigned int)rule.v.ipv4.mask).toString(tmp);
-				break;
-			case ZT_NETWORK_RULE_MATCH_IPV6_SOURCE:
-				r["type"] = "MATCH_IPV6_SOURCE";
-				r["ip"] = InetAddress(rule.v.ipv6.ip, 16, (unsigned int)rule.v.ipv6.mask).toString(tmp);
-				break;
-			case ZT_NETWORK_RULE_MATCH_IPV6_DEST:
-				r["type"] = "MATCH_IPV6_DEST";
-				r["ip"] = InetAddress(rule.v.ipv6.ip, 16, (unsigned int)rule.v.ipv6.mask).toString(tmp);
-				break;
-			case ZT_NETWORK_RULE_MATCH_IP_TOS:
-				r["type"] = "MATCH_IP_TOS";
-				r["mask"] = (unsigned int)rule.v.ipTos.mask;
-				r["start"] = (unsigned int)rule.v.ipTos.value[0];
-				r["end"] = (unsigned int)rule.v.ipTos.value[1];
-				break;
-			case ZT_NETWORK_RULE_MATCH_IP_PROTOCOL:
-				r["type"] = "MATCH_IP_PROTOCOL";
-				r["ipProtocol"] = (unsigned int)rule.v.ipProtocol;
-				break;
-			case ZT_NETWORK_RULE_MATCH_ETHERTYPE:
-				r["type"] = "MATCH_ETHERTYPE";
-				r["etherType"] = (unsigned int)rule.v.etherType;
-				break;
-			case ZT_NETWORK_RULE_MATCH_ICMP:
-				r["type"] = "MATCH_ICMP";
-				r["icmpType"] = (unsigned int)rule.v.icmp.type;
-				if ((rule.v.icmp.flags & 0x01) != 0)
-					r["icmpCode"] = (unsigned int)rule.v.icmp.code;
-				else
-					r["icmpCode"] = json();
-				break;
-			case ZT_NETWORK_RULE_MATCH_IP_SOURCE_PORT_RANGE:
-				r["type"] = "MATCH_IP_SOURCE_PORT_RANGE";
-				r["start"] = (unsigned int)rule.v.port[0];
-				r["end"] = (unsigned int)rule.v.port[1];
-				break;
-			case ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE:
-				r["type"] = "MATCH_IP_DEST_PORT_RANGE";
-				r["start"] = (unsigned int)rule.v.port[0];
-				r["end"] = (unsigned int)rule.v.port[1];
-				break;
-			case ZT_NETWORK_RULE_MATCH_CHARACTERISTICS:
-				r["type"] = "MATCH_CHARACTERISTICS";
-				OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.16llx", rule.v.characteristics);
-				r["mask"] = tmp;
-				break;
-			case ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE:
-				r["type"] = "MATCH_FRAME_SIZE_RANGE";
-				r["start"] = (unsigned int)rule.v.frameSize[0];
-				r["end"] = (unsigned int)rule.v.frameSize[1];
-				break;
-			case ZT_NETWORK_RULE_MATCH_RANDOM:
-				r["type"] = "MATCH_RANDOM";
-				r["probability"] = (unsigned long)rule.v.randomProbability;
-				break;
-			case ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE:
-				r["type"] = "MATCH_TAGS_DIFFERENCE";
-				r["id"] = rule.v.tag.id;
-				r["value"] = rule.v.tag.value;
-				break;
-			case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_AND:
-				r["type"] = "MATCH_TAGS_BITWISE_AND";
-				r["id"] = rule.v.tag.id;
-				r["value"] = rule.v.tag.value;
-				break;
-			case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_OR:
-				r["type"] = "MATCH_TAGS_BITWISE_OR";
-				r["id"] = rule.v.tag.id;
-				r["value"] = rule.v.tag.value;
-				break;
-			case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_XOR:
-				r["type"] = "MATCH_TAGS_BITWISE_XOR";
-				r["id"] = rule.v.tag.id;
-				r["value"] = rule.v.tag.value;
-				break;
-			case ZT_NETWORK_RULE_MATCH_TAGS_EQUAL:
-				r["type"] = "MATCH_TAGS_EQUAL";
-				r["id"] = rule.v.tag.id;
-				r["value"] = rule.v.tag.value;
-				break;
-			case ZT_NETWORK_RULE_MATCH_TAG_SENDER:
-				r["type"] = "MATCH_TAG_SENDER";
-				r["id"] = rule.v.tag.id;
-				r["value"] = rule.v.tag.value;
-				break;
-			case ZT_NETWORK_RULE_MATCH_TAG_RECEIVER:
-				r["type"] = "MATCH_TAG_RECEIVER";
-				r["id"] = rule.v.tag.id;
-				r["value"] = rule.v.tag.value;
-				break;
-			case ZT_NETWORK_RULE_MATCH_INTEGER_RANGE:
-				r["type"] = "INTEGER_RANGE";
-				OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.16llx", rule.v.intRange.start);
-				r["start"] = tmp;
-				OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.16llx", rule.v.intRange.start + (uint64_t)rule.v.intRange.end);
-				r["end"] = tmp;
-				r["idx"] = rule.v.intRange.idx;
-				r["little"] = ((rule.v.intRange.format & 0x80) != 0);
-				r["bits"] = (rule.v.intRange.format & 63) + 1;
-				break;
-			default:
-				break;
-		}
-
-		if (! r.empty()) {
-			r["not"] = ((rule.t & 0x80) != 0);
-			r["or"] = ((rule.t & 0x40) != 0);
-		}
-	}
-
-	return r;
-}
-
-static bool _parseRule(json& r, ZT_VirtualNetworkRule& rule)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::parseRule");
-	auto scope = tracer->WithActiveSpan(span);
-
-	if (! r.is_object())
-		return false;
-
-	const std::string t(OSUtils::jsonString(r["type"], ""));
-	memset(&rule, 0, sizeof(ZT_VirtualNetworkRule));
-
-	if (OSUtils::jsonBool(r["not"], false))
-		rule.t = 0x80;
-	else
-		rule.t = 0x00;
-	if (OSUtils::jsonBool(r["or"], false))
-		rule.t |= 0x40;
-
-	bool tag = false;
-	if (t == "ACTION_DROP") {
-		rule.t |= ZT_NETWORK_RULE_ACTION_DROP;
-		return true;
-	}
-	else if (t == "ACTION_ACCEPT") {
-		rule.t |= ZT_NETWORK_RULE_ACTION_ACCEPT;
-		return true;
-	}
-	else if (t == "ACTION_TEE") {
-		rule.t |= ZT_NETWORK_RULE_ACTION_TEE;
-		rule.v.fwd.address = Utils::hexStrToU64(OSUtils::jsonString(r["address"], "0").c_str()) & 0xffffffffffULL;
-		rule.v.fwd.flags = (uint32_t)(OSUtils::jsonInt(r["flags"], 0ULL) & 0xffffffffULL);
-		rule.v.fwd.length = (uint16_t)(OSUtils::jsonInt(r["length"], 0ULL) & 0xffffULL);
-		return true;
-	}
-	else if (t == "ACTION_WATCH") {
-		rule.t |= ZT_NETWORK_RULE_ACTION_WATCH;
-		rule.v.fwd.address = Utils::hexStrToU64(OSUtils::jsonString(r["address"], "0").c_str()) & 0xffffffffffULL;
-		rule.v.fwd.flags = (uint32_t)(OSUtils::jsonInt(r["flags"], 0ULL) & 0xffffffffULL);
-		rule.v.fwd.length = (uint16_t)(OSUtils::jsonInt(r["length"], 0ULL) & 0xffffULL);
-		return true;
-	}
-	else if (t == "ACTION_REDIRECT") {
-		rule.t |= ZT_NETWORK_RULE_ACTION_REDIRECT;
-		rule.v.fwd.address = Utils::hexStrToU64(OSUtils::jsonString(r["address"], "0").c_str()) & 0xffffffffffULL;
-		rule.v.fwd.flags = (uint32_t)(OSUtils::jsonInt(r["flags"], 0ULL) & 0xffffffffULL);
-		return true;
-	}
-	else if (t == "ACTION_BREAK") {
-		rule.t |= ZT_NETWORK_RULE_ACTION_BREAK;
-		return true;
-	}
-	else if (t == "MATCH_SOURCE_ZEROTIER_ADDRESS") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS;
-		rule.v.zt = Utils::hexStrToU64(OSUtils::jsonString(r["zt"], "0").c_str()) & 0xffffffffffULL;
-		return true;
-	}
-	else if (t == "MATCH_DEST_ZEROTIER_ADDRESS") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS;
-		rule.v.zt = Utils::hexStrToU64(OSUtils::jsonString(r["zt"], "0").c_str()) & 0xffffffffffULL;
-		return true;
-	}
-	else if (t == "MATCH_VLAN_ID") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_VLAN_ID;
-		rule.v.vlanId = (uint16_t)(OSUtils::jsonInt(r["vlanId"], 0ULL) & 0xffffULL);
-		return true;
-	}
-	else if (t == "MATCH_VLAN_PCP") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_VLAN_PCP;
-		rule.v.vlanPcp = (uint8_t)(OSUtils::jsonInt(r["vlanPcp"], 0ULL) & 0xffULL);
-		return true;
-	}
-	else if (t == "MATCH_VLAN_DEI") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_VLAN_DEI;
-		rule.v.vlanDei = (uint8_t)(OSUtils::jsonInt(r["vlanDei"], 0ULL) & 0xffULL);
-		return true;
-	}
-	else if (t == "MATCH_MAC_SOURCE") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_MAC_SOURCE;
-		std::string mac(OSUtils::jsonString(r["mac"], "0"));
-		Utils::cleanMac(mac);
-		Utils::unhex(mac.c_str(), (unsigned int)mac.length(), rule.v.mac, 6);
-		return true;
-	}
-	else if (t == "MATCH_MAC_DEST") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_MAC_DEST;
-		std::string mac(OSUtils::jsonString(r["mac"], "0"));
-		Utils::cleanMac(mac);
-		Utils::unhex(mac.c_str(), (unsigned int)mac.length(), rule.v.mac, 6);
-		return true;
-	}
-	else if (t == "MATCH_IPV4_SOURCE") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_IPV4_SOURCE;
-		InetAddress ip(OSUtils::jsonString(r["ip"], "0.0.0.0").c_str());
-		rule.v.ipv4.ip = reinterpret_cast<struct sockaddr_in*>(&ip)->sin_addr.s_addr;
-		rule.v.ipv4.mask = Utils::ntoh(reinterpret_cast<struct sockaddr_in*>(&ip)->sin_port) & 0xff;
-		if (rule.v.ipv4.mask > 32)
-			rule.v.ipv4.mask = 32;
-		return true;
-	}
-	else if (t == "MATCH_IPV4_DEST") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_IPV4_DEST;
-		InetAddress ip(OSUtils::jsonString(r["ip"], "0.0.0.0").c_str());
-		rule.v.ipv4.ip = reinterpret_cast<struct sockaddr_in*>(&ip)->sin_addr.s_addr;
-		rule.v.ipv4.mask = Utils::ntoh(reinterpret_cast<struct sockaddr_in*>(&ip)->sin_port) & 0xff;
-		if (rule.v.ipv4.mask > 32)
-			rule.v.ipv4.mask = 32;
-		return true;
-	}
-	else if (t == "MATCH_IPV6_SOURCE") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_IPV6_SOURCE;
-		InetAddress ip(OSUtils::jsonString(r["ip"], "::0").c_str());
-		memcpy(rule.v.ipv6.ip, reinterpret_cast<struct sockaddr_in6*>(&ip)->sin6_addr.s6_addr, 16);
-		rule.v.ipv6.mask = Utils::ntoh(reinterpret_cast<struct sockaddr_in6*>(&ip)->sin6_port) & 0xff;
-		if (rule.v.ipv6.mask > 128)
-			rule.v.ipv6.mask = 128;
-		return true;
-	}
-	else if (t == "MATCH_IPV6_DEST") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_IPV6_DEST;
-		InetAddress ip(OSUtils::jsonString(r["ip"], "::0").c_str());
-		memcpy(rule.v.ipv6.ip, reinterpret_cast<struct sockaddr_in6*>(&ip)->sin6_addr.s6_addr, 16);
-		rule.v.ipv6.mask = Utils::ntoh(reinterpret_cast<struct sockaddr_in6*>(&ip)->sin6_port) & 0xff;
-		if (rule.v.ipv6.mask > 128)
-			rule.v.ipv6.mask = 128;
-		return true;
-	}
-	else if (t == "MATCH_IP_TOS") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_IP_TOS;
-		rule.v.ipTos.mask = (uint8_t)(OSUtils::jsonInt(r["mask"], 0ULL) & 0xffULL);
-		rule.v.ipTos.value[0] = (uint8_t)(OSUtils::jsonInt(r["start"], 0ULL) & 0xffULL);
-		rule.v.ipTos.value[1] = (uint8_t)(OSUtils::jsonInt(r["end"], 0ULL) & 0xffULL);
-		return true;
-	}
-	else if (t == "MATCH_IP_PROTOCOL") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_IP_PROTOCOL;
-		rule.v.ipProtocol = (uint8_t)(OSUtils::jsonInt(r["ipProtocol"], 0ULL) & 0xffULL);
-		return true;
-	}
-	else if (t == "MATCH_ETHERTYPE") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_ETHERTYPE;
-		rule.v.etherType = (uint16_t)(OSUtils::jsonInt(r["etherType"], 0ULL) & 0xffffULL);
-		return true;
-	}
-	else if (t == "MATCH_ICMP") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_ICMP;
-		rule.v.icmp.type = (uint8_t)(OSUtils::jsonInt(r["icmpType"], 0ULL) & 0xffULL);
-		json& code = r["icmpCode"];
-		if (code.is_null()) {
-			rule.v.icmp.code = 0;
-			rule.v.icmp.flags = 0x00;
-		}
-		else {
-			rule.v.icmp.code = (uint8_t)(OSUtils::jsonInt(code, 0ULL) & 0xffULL);
-			rule.v.icmp.flags = 0x01;
-		}
-		return true;
-	}
-	else if (t == "MATCH_IP_SOURCE_PORT_RANGE") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_IP_SOURCE_PORT_RANGE;
-		rule.v.port[0] = (uint16_t)(OSUtils::jsonInt(r["start"], 0ULL) & 0xffffULL);
-		rule.v.port[1] = (uint16_t)(OSUtils::jsonInt(r["end"], (uint64_t)rule.v.port[0]) & 0xffffULL);
-		return true;
-	}
-	else if (t == "MATCH_IP_DEST_PORT_RANGE") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE;
-		rule.v.port[0] = (uint16_t)(OSUtils::jsonInt(r["start"], 0ULL) & 0xffffULL);
-		rule.v.port[1] = (uint16_t)(OSUtils::jsonInt(r["end"], (uint64_t)rule.v.port[0]) & 0xffffULL);
-		return true;
-	}
-	else if (t == "MATCH_CHARACTERISTICS") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_CHARACTERISTICS;
-		if (r.count("mask")) {
-			json& v = r["mask"];
-			if (v.is_number()) {
-				rule.v.characteristics = v;
-			}
-			else {
-				std::string tmp = v;
-				rule.v.characteristics = Utils::hexStrToU64(tmp.c_str());
-			}
-		}
-		return true;
-	}
-	else if (t == "MATCH_FRAME_SIZE_RANGE") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE;
-		rule.v.frameSize[0] = (uint16_t)(OSUtils::jsonInt(r["start"], 0ULL) & 0xffffULL);
-		rule.v.frameSize[1] = (uint16_t)(OSUtils::jsonInt(r["end"], (uint64_t)rule.v.frameSize[0]) & 0xffffULL);
-		return true;
-	}
-	else if (t == "MATCH_RANDOM") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_RANDOM;
-		rule.v.randomProbability = (uint32_t)(OSUtils::jsonInt(r["probability"], 0ULL) & 0xffffffffULL);
-		return true;
-	}
-	else if (t == "MATCH_TAGS_DIFFERENCE") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE;
-		tag = true;
-	}
-	else if (t == "MATCH_TAGS_BITWISE_AND") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_AND;
-		tag = true;
-	}
-	else if (t == "MATCH_TAGS_BITWISE_OR") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_OR;
-		tag = true;
-	}
-	else if (t == "MATCH_TAGS_BITWISE_XOR") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_XOR;
-		tag = true;
-	}
-	else if (t == "MATCH_TAGS_EQUAL") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_TAGS_EQUAL;
-		tag = true;
-	}
-	else if (t == "MATCH_TAG_SENDER") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_TAG_SENDER;
-		tag = true;
-	}
-	else if (t == "MATCH_TAG_RECEIVER") {
-		rule.t |= ZT_NETWORK_RULE_MATCH_TAG_RECEIVER;
-		tag = true;
-	}
-	else if (t == "INTEGER_RANGE") {
-		json& s = r["start"];
-		if (s.is_string()) {
-			std::string tmp = s;
-			rule.v.intRange.start = Utils::hexStrToU64(tmp.c_str());
-		}
-		else {
-			rule.v.intRange.start = OSUtils::jsonInt(s, 0ULL);
-		}
-		json& e = r["end"];
-		if (e.is_string()) {
-			std::string tmp = e;
-			rule.v.intRange.end = (uint32_t)(Utils::hexStrToU64(tmp.c_str()) - rule.v.intRange.start);
-		}
-		else {
-			rule.v.intRange.end = (uint32_t)(OSUtils::jsonInt(e, 0ULL) - rule.v.intRange.start);
-		}
-		rule.v.intRange.idx = (uint16_t)OSUtils::jsonInt(r["idx"], 0ULL);
-		rule.v.intRange.format = (OSUtils::jsonBool(r["little"], false)) ? 0x80 : 0x00;
-		rule.v.intRange.format |= (uint8_t)((OSUtils::jsonInt(r["bits"], 1ULL) - 1) & 63);
-	}
-
-	if (tag) {
-		rule.v.tag.id = (uint32_t)(OSUtils::jsonInt(r["id"], 0ULL) & 0xffffffffULL);
-		rule.v.tag.value = (uint32_t)(OSUtils::jsonInt(r["value"], 0ULL) & 0xffffffffULL);
-		return true;
-	}
-
-	return false;
-}
-
-}	// anonymous namespace
-
-EmbeddedNetworkController::EmbeddedNetworkController(Node* node, const char* ztPath, const char* dbPath, int listenPort, RedisConfig* rc)
-	: _startTime(OSUtils::now())
-	, _listenPort(listenPort)
-	, _node(node)
-	, _ztPath(ztPath)
-	, _path(dbPath)
-	, _signingId()
-	, _signingIdAddressString()
-	, _sender((NetworkController::Sender*)0)
-	, _db(this)
-	, _queue()
-	, _threads()
-	, _threads_l()
-	, _memberStatus()
-	, _memberStatus_l()
-	, _expiringSoon()
-	, _expiringSoon_l()
-	, _rc(rc)
-	, _ssoExpiryRunning(true)
-	, _ssoExpiry(std::thread(&EmbeddedNetworkController::_ssoExpiryThread, this))
-
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	, _member_status_lookup { "nc_member_status_lookup", "" }
-	, _member_status_lookup_count { "nc_member_status_lookup_count", "" }
-	, _node_is_online { "nc_node_is_online", "" }
-	, _node_is_online_count { "nc_node_is_online_count", "" }
-	, _get_and_init_member { "nc_get_and_init_member", "" }
-	, _get_and_init_member_count { "nc_get_and_init_member_count", "" }
-	, _have_identity { "nc_have_identity", "" }
-	, _have_identity_count { "nc_have_identity_count", "" }
-	, _determine_auth { "nc_determine_auth", "" }
-	, _determine_auth_count { "nc_determine_auth_count", "" }
-	, _sso_check { "nc_sso_check", "" }
-	, _sso_check_count { "nc_sso_check_count", "" }
-	, _auth_check { "nc_auth_check", "" }
-	, _auth_check_count { "nc_auth_check_count", "" }
-	, _json_schlep { "nc_json_schlep", "" }
-	, _json_schlep_count { "nc_json_schlep_count", "" }
-	, _issue_certificate { "nc_issue_certificate", "" }
-	, _issue_certificate_count { "nc_issue_certificate_count", "" }
-	, _save_member { "nc_save_member", "" }
-	, _save_member_count { "nc_save_member_count", "" }
-	, _send_netconf { "nc_send_netconf2", "" }
-	, _send_netconf_count { "nc_send_netconf2_count", "" }
-#endif
-{
-}
-
-EmbeddedNetworkController::~EmbeddedNetworkController()
-{
-	std::lock_guard<std::mutex> l(_threads_l);
-	_queue.stop();
-	for (auto t = _threads.begin(); t != _threads.end(); ++t) {
-		t->join();
-	}
-	_ssoExpiryRunning = false;
-	_ssoExpiry.join();
-}
-
-void EmbeddedNetworkController::setSSORedirectURL(const std::string& url)
-{
-	_ssoRedirectURL = url;
-}
-
-void EmbeddedNetworkController::init(const Identity& signingId, Sender* sender)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::init");
-	auto scope = tracer->WithActiveSpan(span);
-
-	char tmp[64];
-	_signingId = signingId;
-	_sender = sender;
-	_signingIdAddressString = signingId.address().toString(tmp);
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-	if ((_path.length() > 9) && (_path.substr(0, 9) == "postgres:")) {
-		fprintf(stderr, "CV1\n");
-		_db.addDB(std::shared_ptr<CV1>(new CV1(_signingId, _path.substr(9).c_str(), _listenPort, _rc)));
-	}
-	else if ((_path.length() > 4) && (_path.substr(0, 4) == "cv2:")) {
-		fprintf(stderr, "CV2\n");
-		_db.addDB(std::shared_ptr<CV2>(new CV2(_signingId, _path.substr(4).c_str(), _listenPort)));
-	}
-	else {
-		fprintf(stderr, "FileDB\n");
-#endif
-		_db.addDB(std::shared_ptr<FileDB>(new FileDB(_path.c_str())));
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-	}
-#endif
-
-	std::string lfJSON;
-	OSUtils::readFile((_ztPath + ZT_PATH_SEPARATOR_S "local.conf").c_str(), lfJSON);
-	if (lfJSON.length() > 0) {
-		nlohmann::json lfConfig(OSUtils::jsonParse(lfJSON));
-		nlohmann::json& settings = lfConfig["settings"];
-		if (settings.is_object()) {
-			nlohmann::json& controllerDb = settings["controllerDb"];
-			if (controllerDb.is_object()) {
-				std::string type = controllerDb["type"];
-				if (type == "lf") {
-					std::string lfOwner = controllerDb["owner"];
-					std::string lfHost = controllerDb["host"];
-					int lfPort = controllerDb["port"];
-					bool storeOnlineState = controllerDb["storeOnlineState"];
-					if ((lfOwner.length()) && (lfHost.length()) && (lfPort > 0) && (lfPort < 65536)) {
-						std::size_t pubHdrLoc = lfOwner.find("Public: ");
-						if ((pubHdrLoc > 0) && ((pubHdrLoc + 8) < lfOwner.length())) {
-							std::string lfOwnerPublic = lfOwner.substr(pubHdrLoc + 8);
-							std::size_t pubHdrEnd = lfOwnerPublic.find_first_of("\n\r\t ");
-							if (pubHdrEnd != std::string::npos) {
-								lfOwnerPublic = lfOwnerPublic.substr(0, pubHdrEnd);
-								_db.addDB(std::shared_ptr<DB>(new LFDB(_signingId, _path.c_str(), lfOwner.c_str(), lfOwnerPublic.c_str(), lfHost.c_str(), lfPort, storeOnlineState)));
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	_db.waitForReady();
-}
-
-void EmbeddedNetworkController::request(uint64_t nwid, const InetAddress& fromAddr, uint64_t requestPacketId, const Identity& identity, const Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY>& metaData)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::request");
-	auto scope = tracer->WithActiveSpan(span);
-
-	if (((! _signingId) || (! _signingId.hasPrivate())) || (_signingId.address().toInt() != (nwid >> 24)) || (! _sender))
-		return;
-	_startThreads();
-
-	const int64_t now = OSUtils::now();
-
-	if (requestPacketId) {
-		std::lock_guard<std::mutex> l(_memberStatus_l);
-		_MemberStatus& ms = _memberStatus[_MemberStatusKey(nwid, identity.address().toInt())];
-		if ((now - ms.lastRequestTime) <= ZT_NETCONF_MIN_REQUEST_PERIOD) {
-			return;
-		}
-		ms.lastRequestTime = now;
-	}
-
-	_RQEntry* qe = new _RQEntry;
-	qe->nwid = nwid;
-	qe->requestPacketId = requestPacketId;
-	qe->fromAddr = fromAddr;
-	qe->identity = identity;
-	qe->metaData = metaData;
-	qe->type = _RQEntry::RQENTRY_TYPE_REQUEST;
-	_queue.post(qe);
-}
-
-std::string EmbeddedNetworkController::networkUpdateFromPostData(uint64_t networkID, const std::string& body)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::networkUpdateFromPostData");
-	auto scope = tracer->WithActiveSpan(span);
-
-	json b = OSUtils::jsonParse(body);
-
-	char nwids[24];
-	OSUtils::ztsnprintf(nwids, sizeof(nwids), "%.16llx", networkID);
-
-	json network;
-	_db.get(networkID, network);
-	DB::initNetwork(network);
-	if (b.count("name"))
-		network["name"] = OSUtils::jsonString(b["name"], "");
-	if (b.count("private"))
-		network["private"] = OSUtils::jsonBool(b["private"], true);
-	if (b.count("enableBroadcast"))
-		network["enableBroadcast"] = OSUtils::jsonBool(b["enableBroadcast"], false);
-	if (b.count("multicastLimit"))
-		network["multicastLimit"] = OSUtils::jsonInt(b["multicastLimit"], 32ULL);
-	if (b.count("mtu"))
-		network["mtu"] = std::max(std::min((unsigned int)OSUtils::jsonInt(b["mtu"], ZT_DEFAULT_MTU), (unsigned int)ZT_MAX_MTU), (unsigned int)ZT_MIN_MTU);
-
-	if (b.count("remoteTraceTarget")) {
-		const std::string rtt(OSUtils::jsonString(b["remoteTraceTarget"], ""));
-		if (rtt.length() == 10) {
-			network["remoteTraceTarget"] = rtt;
-		}
-		else {
-			network["remoteTraceTarget"] = json();
-		}
-	}
-	if (b.count("remoteTraceLevel"))
-		network["remoteTraceLevel"] = OSUtils::jsonInt(b["remoteTraceLevel"], 0ULL);
-
-	if (b.count("v4AssignMode")) {
-		json nv4m;
-		json& v4m = b["v4AssignMode"];
-		if (v4m.is_string()) {	 // backward compatibility
-			nv4m["zt"] = (OSUtils::jsonString(v4m, "") == "zt");
-		}
-		else if (v4m.is_object()) {
-			nv4m["zt"] = OSUtils::jsonBool(v4m["zt"], false);
-		}
-		else
-			nv4m["zt"] = false;
-		network["v4AssignMode"] = nv4m;
-	}
-
-	if (b.count("v6AssignMode")) {
-		json nv6m;
-		json& v6m = b["v6AssignMode"];
-		if (! nv6m.is_object())
-			nv6m = json::object();
-		if (v6m.is_string()) {	 // backward compatibility
-			std::vector<std::string> v6ms(OSUtils::split(OSUtils::jsonString(v6m, "").c_str(), ",", "", ""));
-			std::sort(v6ms.begin(), v6ms.end());
-			v6ms.erase(std::unique(v6ms.begin(), v6ms.end()), v6ms.end());
-			nv6m["rfc4193"] = false;
-			nv6m["zt"] = false;
-			nv6m["6plane"] = false;
-			for (std::vector<std::string>::iterator i(v6ms.begin()); i != v6ms.end(); ++i) {
-				if (*i == "rfc4193")
-					nv6m["rfc4193"] = true;
-				else if (*i == "zt")
-					nv6m["zt"] = true;
-				else if (*i == "6plane")
-					nv6m["6plane"] = true;
-			}
-		}
-		else if (v6m.is_object()) {
-			if (v6m.count("rfc4193"))
-				nv6m["rfc4193"] = OSUtils::jsonBool(v6m["rfc4193"], false);
-			if (v6m.count("zt"))
-				nv6m["zt"] = OSUtils::jsonBool(v6m["zt"], false);
-			if (v6m.count("6plane"))
-				nv6m["6plane"] = OSUtils::jsonBool(v6m["6plane"], false);
-		}
-		else {
-			nv6m["rfc4193"] = false;
-			nv6m["zt"] = false;
-			nv6m["6plane"] = false;
-		}
-		network["v6AssignMode"] = nv6m;
-	}
-
-	if (b.count("routes")) {
-		json& rts = b["routes"];
-		if (rts.is_array()) {
-			json nrts = json::array();
-			for (unsigned long i = 0; i < rts.size(); ++i) {
-				json& rt = rts[i];
-				if (rt.is_object()) {
-					json& target = rt["target"];
-					json& via = rt["via"];
-					if (target.is_string()) {
-						InetAddress t(target.get<std::string>().c_str());
-						InetAddress v;
-						if (via.is_string())
-							v.fromString(via.get<std::string>().c_str());
-						if (((t.ss_family == AF_INET) || (t.ss_family == AF_INET6)) && (t.netmaskBitsValid())) {
-							json tmp;
-							char tmp2[64];
-							tmp["target"] = t.toString(tmp2);
-							if (v.ss_family == t.ss_family)
-								tmp["via"] = v.toIpString(tmp2);
-							else
-								tmp["via"] = json();
-							nrts.push_back(tmp);
-							if (nrts.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-								break;
-						}
-					}
-				}
-			}
-			network["routes"] = nrts;
-		}
-	}
-
-	if (b.count("ipAssignmentPools")) {
-		json& ipp = b["ipAssignmentPools"];
-		if (ipp.is_array()) {
-			json nipp = json::array();
-			for (unsigned long i = 0; i < ipp.size(); ++i) {
-				json& ip = ipp[i];
-				if ((ip.is_object()) && (ip.count("ipRangeStart")) && (ip.count("ipRangeEnd"))) {
-					InetAddress f(OSUtils::jsonString(ip["ipRangeStart"], "").c_str());
-					InetAddress t(OSUtils::jsonString(ip["ipRangeEnd"], "").c_str());
-					if (((f.ss_family == AF_INET) || (f.ss_family == AF_INET6)) && (f.ss_family == t.ss_family)) {
-						json tmp = json::object();
-						char tmp2[64];
-						tmp["ipRangeStart"] = f.toIpString(tmp2);
-						tmp["ipRangeEnd"] = t.toIpString(tmp2);
-						nipp.push_back(tmp);
-						if (nipp.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-							break;
-					}
-				}
-			}
-			network["ipAssignmentPools"] = nipp;
-		}
-	}
-
-	if (b.count("rules")) {
-		json& rules = b["rules"];
-		if (rules.is_array()) {
-			json nrules = json::array();
-			for (unsigned long i = 0; i < rules.size(); ++i) {
-				json& rule = rules[i];
-				if (rule.is_object()) {
-					ZT_VirtualNetworkRule ztr;
-					if (_parseRule(rule, ztr)) {
-						nrules.push_back(_renderRule(ztr));
-						if (nrules.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-							break;
-					}
-				}
-			}
-			network["rules"] = nrules;
-		}
-	}
-
-	if (b.count("authTokens")) {
-		json& authTokens = b["authTokens"];
-		if (authTokens.is_object()) {
-			json nat;
-			for (json::iterator t(authTokens.begin()); t != authTokens.end(); ++t) {
-				if ((t.value().is_number()) && (t.value() >= 0))
-					nat[t.key()] = t.value();
-			}
-			network["authTokens"] = nat;
-		}
-		else {
-			network["authTokens"] = { {} };
-		}
-	}
-
-	if (b.count("capabilities")) {
-		json& capabilities = b["capabilities"];
-		if (capabilities.is_array()) {
-			std::map<uint64_t, json> ncaps;
-			for (unsigned long i = 0; i < capabilities.size(); ++i) {
-				json& cap = capabilities[i];
-				if (cap.is_object()) {
-					json ncap = json::object();
-					const uint64_t capId = OSUtils::jsonInt(cap["id"], 0ULL);
-					ncap["id"] = capId;
-					ncap["default"] = OSUtils::jsonBool(cap["default"], false);
-
-					json& rules = cap["rules"];
-					json nrules = json::array();
-					if (rules.is_array()) {
-						for (unsigned long i = 0; i < rules.size(); ++i) {
-							json& rule = rules[i];
-							if (rule.is_object()) {
-								ZT_VirtualNetworkRule ztr;
-								if (_parseRule(rule, ztr)) {
-									nrules.push_back(_renderRule(ztr));
-									if (nrules.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-										break;
-								}
-							}
-						}
-					}
-					ncap["rules"] = nrules;
-
-					ncaps[capId] = ncap;
-				}
-			}
-
-			json ncapsa = json::array();
-			for (std::map<uint64_t, json>::iterator c(ncaps.begin()); c != ncaps.end(); ++c) {
-				ncapsa.push_back(c->second);
-				if (ncapsa.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-					break;
-			}
-			network["capabilities"] = ncapsa;
-		}
-	}
-
-	if (b.count("tags")) {
-		json& tags = b["tags"];
-		if (tags.is_array()) {
-			std::map<uint64_t, json> ntags;
-			for (unsigned long i = 0; i < tags.size(); ++i) {
-				json& tag = tags[i];
-				if (tag.is_object()) {
-					json ntag = json::object();
-					const uint64_t tagId = OSUtils::jsonInt(tag["id"], 0ULL);
-					ntag["id"] = tagId;
-					json& dfl = tag["default"];
-					if (dfl.is_null())
-						ntag["default"] = dfl;
-					else
-						ntag["default"] = OSUtils::jsonInt(dfl, 0ULL);
-					ntags[tagId] = ntag;
-				}
-			}
-
-			json ntagsa = json::array();
-			for (std::map<uint64_t, json>::iterator t(ntags.begin()); t != ntags.end(); ++t) {
-				ntagsa.push_back(t->second);
-				if (ntagsa.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-					break;
-			}
-			network["tags"] = ntagsa;
-		}
-	}
-
-	if (b.count("dns")) {
-		json& dns = b["dns"];
-		if (dns.is_object()) {
-			json nd;
-
-			nd["domain"] = dns["domain"];
-
-			json& srv = dns["servers"];
-			if (srv.is_array()) {
-				json ns = json::array();
-				for (unsigned int i = 0; i < srv.size(); ++i) {
-					ns.push_back(srv[i]);
-				}
-				nd["servers"] = ns;
-			}
-
-			network["dns"] = nd;
-		}
-	}
-
-	network["id"] = nwids;
-	network["nwid"] = nwids;
-
-	DB::cleanNetwork(network);
-	_db.save(network, true);
-
-	return network.dump();
-}
-
-void EmbeddedNetworkController::configureHTTPControlPlane(httplib::Server& s, httplib::Server& sv6, const std::function<void(const httplib::Request&, httplib::Response&, std::string)> setContent)
-{
-	// Control plane Endpoints
-	std::string controllerPath = "/controller";
-	std::string networkListPath = "/controller/network";
-	std::string networkListPath2 = "/unstable/controller/network";
-	std::string networkPath = "/controller/network/([0-9a-fA-F]{16})";
-	std::string oldAndBustedNetworkCreatePath = "/controller/network/([0-9a-fA-F]{10})______";
-	std::string memberListPath = "/controller/network/([0-9a-fA-F]{16})/member";
-	std::string memberListPath2 = "/unstable/controller/network/([0-9a-fA-F]{16})/member";
-	std::string memberPath = "/controller/network/([0-9a-fA-F]{16})/member/([0-9a-fA-F]{10})";
-
-	auto controllerGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::controllerGet");
-		auto scope = tracer->WithActiveSpan(span);
-
-		char tmp[4096];
-		const bool dbOk = _db.isReady();
-		OSUtils::ztsnprintf(
-			tmp,
-			sizeof(tmp),
-			"{\n\t\"controller\": true,\n\t\"apiVersion\": %d,\n\t\"clock\": %llu,\n\t\"databaseReady\": %s\n}\n",
-			ZT_NETCONF_CONTROLLER_API_VERSION,
-			(unsigned long long)OSUtils::now(),
-			dbOk ? "true" : "false");
-
-		if (! dbOk) {
-			res.status = 503;
-		}
-
-		setContent(req, res, tmp);
-	};
-	s.Get(controllerPath, controllerGet);
-	sv6.Get(controllerPath, controllerGet);
-
-	auto networkListGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::networkListGet");
-		auto scope = tracer->WithActiveSpan(span);
-
-		std::set<uint64_t> networkIds;
-		_db.networks(networkIds);
-		char tmp[64];
-
-		auto out = json::array();
-		for (std::set<uint64_t>::const_iterator i(networkIds.begin()); i != networkIds.end(); ++i) {
-			OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.16llx", *i);
-			out.push_back(tmp);
-		}
-
-		setContent(req, res, out.dump());
-	};
-	s.Get(networkListPath, networkListGet);
-	sv6.Get(networkListPath, networkListGet);
-
-	auto networkListGet2 = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::networkListGet2");
-		auto scope = tracer->WithActiveSpan(span);
-
-		std::set<uint64_t> networkIds;
-		_db.networks(networkIds);
-
-		auto meta = json::object();
-		auto data = json::array();
-		uint64_t networkCount = 0;
-
-		for (std::set<uint64_t>::const_iterator nwid(networkIds.begin()); nwid != networkIds.end(); ++nwid) {
-			json network;
-			if (! _db.get(*nwid, network)) {
-				continue;
-			}
-
-			std::vector<json> memTmp;
-			if (_db.get(*nwid, network, memTmp)) {
-				if (! network.is_null()) {
-					uint64_t authorizedCount = 0;
-					uint64_t totalCount = memTmp.size();
-					networkCount++;
-
-					for (auto m = memTmp.begin(); m != memTmp.end(); ++m) {
-						bool a = OSUtils::jsonBool((*m)["authorized"], 0);
-						if (a) {
-							authorizedCount++;
-						}
-					}
-
-					auto nwMeta = json::object();
-					nwMeta["totalMemberCount"] = totalCount;
-					nwMeta["authorizedMemberCount"] = authorizedCount;
-					network["meta"] = nwMeta;
-
-					data.push_back(network);
-				}
-			}
-		}
-		meta["networkCount"] = networkCount;
-
-		auto out = json::object();
-		out["data"] = data;
-		out["meta"] = meta;
-
-		setContent(req, res, out.dump());
-	};
-	s.Get(networkListPath2, networkListGet2);
-	sv6.Get(networkListPath2, networkListGet2);
-
-	auto networkGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::networkGet");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto networkID = req.matches[1];
-		uint64_t nwid = Utils::hexStrToU64(networkID.str().c_str());
-		json network;
-		if (! _db.get(nwid, network)) {
-			res.status = 404;
-			return;
-		}
-
-		setContent(req, res, network.dump());
-	};
-	s.Get(networkPath, networkGet);
-	sv6.Get(networkPath, networkGet);
-
-	auto createNewNetwork = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::createNewNetwork");
-		auto scope = tracer->WithActiveSpan(span);
-
-		// fprintf(stderr, "creating new network (new style)\n");
-		uint64_t nwid = 0;
-		uint64_t nwidPrefix = (Utils::hexStrToU64(_signingIdAddressString.c_str()) << 24) & 0xffffffffff000000ULL;
-		uint64_t nwidPostfix = 0;
-		for (unsigned long k = 0; k < 100000; ++k) {   // sanity limit on trials
-			Utils::getSecureRandom(&nwidPostfix, sizeof(nwidPostfix));
-			uint64_t tryNwid = nwidPrefix | (nwidPostfix & 0xffffffULL);
-			if ((tryNwid & 0xffffffULL) == 0ULL)
-				tryNwid |= 1ULL;
-			if (! _db.hasNetwork(tryNwid)) {
-				nwid = tryNwid;
-				break;
-			}
-		}
-		if (! nwid) {
-			res.status = 503;
-			return;
-		}
-
-		setContent(req, res, networkUpdateFromPostData(nwid, req.body));
-	};
-	s.Put(networkListPath, createNewNetwork);
-	s.Post(networkListPath, createNewNetwork);
-	sv6.Put(networkListPath, createNewNetwork);
-	sv6.Post(networkListPath, createNewNetwork);
-
-	auto createNewNetworkOldAndBusted = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::createNewNetworkOldAndBusted");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto inID = req.matches[1].str();
-
-		if (inID != _signingIdAddressString) {
-			res.status = 400;
-			return;
-		}
-
-		uint64_t nwid = 0;
-		uint64_t nwidPrefix = (Utils::hexStrToU64(inID.c_str()) << 24) & 0xffffffffff000000ULL;
-		uint64_t nwidPostfix = 0;
-		for (unsigned long k = 0; k < 100000; ++k) {   // sanity limit on trials
-			Utils::getSecureRandom(&nwidPostfix, sizeof(nwidPostfix));
-			uint64_t tryNwid = nwidPrefix | (nwidPostfix & 0xffffffULL);
-			if ((tryNwid & 0xffffffULL) == 0ULL)
-				tryNwid |= 1ULL;
-			if (! _db.hasNetwork(tryNwid)) {
-				nwid = tryNwid;
-				break;
-			}
-		}
-		if (! nwid) {
-			res.status = 503;
-			return;
-		}
-		setContent(req, res, networkUpdateFromPostData(nwid, req.body));
-	};
-	s.Put(oldAndBustedNetworkCreatePath, createNewNetworkOldAndBusted);
-	s.Post(oldAndBustedNetworkCreatePath, createNewNetworkOldAndBusted);
-	sv6.Put(oldAndBustedNetworkCreatePath, createNewNetworkOldAndBusted);
-	sv6.Post(oldAndBustedNetworkCreatePath, createNewNetworkOldAndBusted);
-
-	auto networkPost = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::networkPost");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto networkID = req.matches[1].str();
-		uint64_t nwid = Utils::hexStrToU64(networkID.c_str());
-
-		res.status = 200;
-		setContent(req, res, networkUpdateFromPostData(nwid, req.body));
-	};
-	s.Put(networkPath, networkPost);
-	s.Post(networkPath, networkPost);
-	sv6.Put(networkPath, networkPost);
-	sv6.Post(networkPath, networkPost);
-
-	auto networkDelete = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::networkDelete");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto networkID = req.matches[1].str();
-		uint64_t nwid = Utils::hexStrToU64(networkID.c_str());
-
-		json network;
-		if (! _db.get(nwid, network)) {
-			res.status = 404;
-			return;
-		}
-
-		_db.eraseNetwork(nwid);
-		setContent(req, res, network.dump());
-	};
-	s.Delete(networkPath, networkDelete);
-	sv6.Delete(networkPath, networkDelete);
-
-	auto memberListGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::memberListGet");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto networkID = req.matches[1];
-		uint64_t nwid = Utils::hexStrToU64(networkID.str().c_str());
-		json network;
-		if (! _db.get(nwid, network)) {
-			res.status = 404;
-			return;
-		}
-
-		json out = json::object();
-		std::vector<json> memTmp;
-		if (_db.get(nwid, network, memTmp)) {
-			for (auto m = memTmp.begin(); m != memTmp.end(); ++m) {
-				int revision = OSUtils::jsonInt((*m)["revision"], 0);
-				std::string id = OSUtils::jsonString((*m)["id"], "");
-				if (id.length() == 10) {
-					out[id] = revision;
-				}
-			}
-		}
-
-		setContent(req, res, out.dump());
-	};
-	s.Get(memberListPath, memberListGet);
-	sv6.Get(memberListPath, memberListGet);
-
-	auto memberListGet2 = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::memberListGet2");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto networkID = req.matches[1];
-		uint64_t nwid = Utils::hexStrToU64(networkID.str().c_str());
-		json network;
-		if (! _db.get(nwid, network)) {
-			res.status = 404;
-			return;
-		}
-
-		auto out = nlohmann::json::object();
-		auto meta = nlohmann::json::object();
-		std::vector<json> memTmp;
-		if (_db.get(nwid, network, memTmp)) {
-			uint64_t authorizedCount = 0;
-			uint64_t totalCount = memTmp.size();
-			for (auto m = memTmp.begin(); m != memTmp.end(); ++m) {
-				bool a = OSUtils::jsonBool((*m)["authorized"], 0);
-				if (a) {
-					authorizedCount++;
-				}
-			}
-
-			meta["totalCount"] = totalCount;
-			meta["authorizedCount"] = authorizedCount;
-
-			out["data"] = memTmp;
-			out["meta"] = meta;
-
-			setContent(req, res, out.dump());
-		}
-		else {
-			res.status = 404;
-			return;
-		}
-	};
-	s.Get(memberListPath2, memberListGet2);
-	sv6.Get(memberListPath2, memberListGet2);
-
-	auto memberGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::memberGet");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto networkID = req.matches[1];
-		auto memberID = req.matches[2];
-		uint64_t nwid = Utils::hexStrToU64(networkID.str().c_str());
-		uint64_t memid = Utils::hexStrToU64(memberID.str().c_str());
-		json network;
-		json member;
-		if (! _db.get(nwid, network, memid, member)) {
-			res.status = 404;
-			return;
-		}
-
-		setContent(req, res, member.dump());
-	};
-	s.Get(memberPath, memberGet);
-	sv6.Get(memberPath, memberGet);
-
-	auto memberPost = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::memberPost");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto networkID = req.matches[1].str();
-		auto memberID = req.matches[2].str();
-		uint64_t nwid = Utils::hexStrToU64(networkID.c_str());
-		uint64_t memid = Utils::hexStrToU64(memberID.c_str());
-
-		if (! _db.hasNetwork(nwid)) {
-			res.status = 404;
-			return;
-		}
-
-		json network;
-		json member;
-		_db.get(nwid, network, memid, member);
-		DB::initMember(member);
-
-		json b = OSUtils::jsonParse(req.body);
-
-		if (b.count("activeBridge"))
-			member["activeBridge"] = OSUtils::jsonBool(b["activeBridge"], false);
-		if (b.count("noAutoAssignIps"))
-			member["noAutoAssignIps"] = OSUtils::jsonBool(b["noAutoAssignIps"], false);
-		if (b.count("authenticationExpiryTime"))
-			member["authenticationExpiryTime"] = (uint64_t)OSUtils::jsonInt(b["authenticationExpiryTime"], 0ULL);
-		if (b.count("authenticationURL"))
-			member["authenticationURL"] = OSUtils::jsonString(b["authenticationURL"], "");
-		if (b.count("name"))
-			member["name"] = OSUtils::jsonString(b["name"], "");
-
-		if (b.count("remoteTraceTarget")) {
-			const std::string rtt(OSUtils::jsonString(b["remoteTraceTarget"], ""));
-			if (rtt.length() == 10) {
-				member["remoteTraceTarget"] = rtt;
-			}
-			else {
-				member["remoteTraceTarget"] = json();
-			}
-		}
-		if (b.count("remoteTraceLevel"))
-			member["remoteTraceLevel"] = OSUtils::jsonInt(b["remoteTraceLevel"], 0ULL);
-
-		if (b.count("authorized")) {
-			const bool newAuth = OSUtils::jsonBool(b["authorized"], false);
-			if (newAuth != OSUtils::jsonBool(member["authorized"], false)) {
-				member["authorized"] = newAuth;
-				member[((newAuth) ? "lastAuthorizedTime" : "lastDeauthorizedTime")] = OSUtils::now();
-				if (newAuth) {
-					member["lastAuthorizedCredentialType"] = "api";
-					member["lastAuthorizedCredential"] = json();
-				}
-			}
-		}
-
-		if (b.count("ipAssignments")) {
-			json& ipa = b["ipAssignments"];
-			if (ipa.is_array()) {
-				json mipa(json::array());
-				for (unsigned long i = 0; i < ipa.size(); ++i) {
-					std::string ips = ipa[i];
-					InetAddress ip(ips.c_str());
-					if ((ip.ss_family == AF_INET) || (ip.ss_family == AF_INET6)) {
-						char tmpip[64];
-						mipa.push_back(ip.toIpString(tmpip));
-						if (mipa.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-							break;
-					}
-				}
-				member["ipAssignments"] = mipa;
-			}
-		}
-
-		if (b.count("tags")) {
-			json& tags = b["tags"];
-			if (tags.is_array()) {
-				std::map<uint64_t, uint64_t> mtags;
-				for (unsigned long i = 0; i < tags.size(); ++i) {
-					json& tag = tags[i];
-					if ((tag.is_array()) && (tag.size() == 2))
-						mtags[OSUtils::jsonInt(tag[0], 0ULL) & 0xffffffffULL] = OSUtils::jsonInt(tag[1], 0ULL) & 0xffffffffULL;
-				}
-				json mtagsa = json::array();
-				for (std::map<uint64_t, uint64_t>::iterator t(mtags.begin()); t != mtags.end(); ++t) {
-					json ta = json::array();
-					ta.push_back(t->first);
-					ta.push_back(t->second);
-					mtagsa.push_back(ta);
-					if (mtagsa.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-						break;
-				}
-				member["tags"] = mtagsa;
-			}
-		}
-
-		if (b.count("capabilities")) {
-			json& capabilities = b["capabilities"];
-			if (capabilities.is_array()) {
-				json mcaps = json::array();
-				for (unsigned long i = 0; i < capabilities.size(); ++i) {
-					mcaps.push_back(OSUtils::jsonInt(capabilities[i], 0ULL));
-					if (mcaps.size() >= ZT_CONTROLLER_MAX_ARRAY_SIZE)
-						break;
-				}
-				std::sort(mcaps.begin(), mcaps.end());
-				mcaps.erase(std::unique(mcaps.begin(), mcaps.end()), mcaps.end());
-				member["capabilities"] = mcaps;
-			}
-		}
-
-		member["id"] = memberID;
-		member["address"] = memberID;
-		member["nwid"] = networkID;
-
-		DB::cleanMember(member);
-		_db.save(member, true);
-
-		setContent(req, res, member.dump());
-	};
-	s.Put(memberPath, memberPost);
-	s.Post(memberPath, memberPost);
-	sv6.Put(memberPath, memberPost);
-	sv6.Post(memberPath, memberPost);
-
-	auto memberDelete = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_controller");
-		auto span = tracer->StartSpan("embedded_controller::memberDelete");
-		auto scope = tracer->WithActiveSpan(span);
-
-		auto networkID = req.matches[1].str();
-		auto memberID = req.matches[2].str();
-
-		uint64_t nwid = Utils::hexStrToU64(networkID.c_str());
-		uint64_t address = Utils::hexStrToU64(memberID.c_str());
-		json network, member;
-
-		if (! _db.get(nwid, network, address, member)) {
-			res.status = 404;
-			return;
-		}
-
-		if (! member.size()) {
-			res.status = 404;
-			return;
-		}
-
-		_db.eraseMember(nwid, address);
-
-		setContent(req, res, member.dump());
-	};
-	s.Delete(memberPath, memberDelete);
-	sv6.Delete(memberPath, memberDelete);
-}
-
-void EmbeddedNetworkController::handleRemoteTrace(const ZT_RemoteTrace& rt)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::handleRemoteTrace");
-	auto scope = tracer->WithActiveSpan(span);
-
-	static volatile unsigned long idCounter = 0;
-	char id[128], tmp[128];
-	std::string k, v;
-
-	try {
-		// Convert Dictionary into JSON object
-		json d;
-		char* saveptr = (char*)0;
-		for (char* l = Utils::stok(rt.data, "\n", &saveptr); (l); l = Utils::stok((char*)0, "\n", &saveptr)) {
-			char* eq = strchr(l, '=');
-			if (eq > l) {
-				k.assign(l, (unsigned long)(eq - l));
-				v.clear();
-				++eq;
-				while (*eq) {
-					if (*eq == '\\') {
-						++eq;
-						if (*eq) {
-							switch (*eq) {
-								case 'r':
-									v.push_back('\r');
-									break;
-								case 'n':
-									v.push_back('\n');
-									break;
-								case '0':
-									v.push_back((char)0);
-									break;
-								case 'e':
-									v.push_back('=');
-									break;
-								default:
-									v.push_back(*eq);
-									break;
-							}
-							++eq;
-						}
-					}
-					else {
-						v.push_back(*(eq++));
-					}
-				}
-				if ((k.length() > 0) && (v.length() > 0))
-					d[k] = v;
-			}
-		}
-
-		const int64_t now = OSUtils::now();
-		OSUtils::ztsnprintf(id, sizeof(id), "%.10llx-%.16llx-%.10llx-%.4x", _signingId.address().toInt(), now, rt.origin, (unsigned int)(idCounter++ & 0xffff));
-		d["id"] = id;
-		d["objtype"] = "trace";
-		d["ts"] = now;
-		d["nodeId"] = Utils::hex10(rt.origin, tmp);
-		_db.save(d, true);
-	}
-	catch (...) {
-		// drop invalid trace messages if an error occurs
-	}
-}
-
-void EmbeddedNetworkController::onNetworkUpdate(const void* db, uint64_t networkId, const nlohmann::json& network)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::onNetworkUpdate");
-	auto scope = tracer->WithActiveSpan(span);
-
-	// Send an update to all members of the network that are online
-	const int64_t now = OSUtils::now();
-	std::lock_guard<std::mutex> l(_memberStatus_l);
-	for (auto i = _memberStatus.begin(); i != _memberStatus.end(); ++i) {
-		if ((i->first.networkId == networkId) && (i->second.online(now)) && (i->second.lastRequestMetaData))
-			request(networkId, InetAddress(), 0, i->second.identity, i->second.lastRequestMetaData);
-	}
-}
-
-void EmbeddedNetworkController::onNetworkMemberUpdate(const void* db, uint64_t networkId, uint64_t memberId, const nlohmann::json& member)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::onNetworkMemberUpdate");
-	auto scope = tracer->WithActiveSpan(span);
-
-	// Push update to member if online
-	try {
-		std::lock_guard<std::mutex> l(_memberStatus_l);
-		_MemberStatus& ms = _memberStatus[_MemberStatusKey(networkId, memberId)];
-		if ((ms.online(OSUtils::now())) && (ms.lastRequestMetaData))
-			request(networkId, InetAddress(), 0, ms.identity, ms.lastRequestMetaData);
-	}
-	catch (...) {
-	}
-}
-
-void EmbeddedNetworkController::onNetworkMemberDeauthorize(const void* db, uint64_t networkId, uint64_t memberId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::onNetworkMemberDeauthorize");
-	auto scope = tracer->WithActiveSpan(span);
-
-	const int64_t now = OSUtils::now();
-	Revocation rev((uint32_t)_node->prng(), networkId, 0, now, ZT_REVOCATION_FLAG_FAST_PROPAGATE, Address(memberId), Revocation::CREDENTIAL_TYPE_COM);
-	rev.sign(_signingId);
-	{
-		std::lock_guard<std::mutex> l(_memberStatus_l);
-		for (auto i = _memberStatus.begin(); i != _memberStatus.end(); ++i) {
-			if ((i->first.networkId == networkId) && (i->second.online(now)))
-				_node->ncSendRevocation(Address(i->first.nodeId), rev);
-		}
-	}
-}
-
-void EmbeddedNetworkController::_request(uint64_t nwid, const InetAddress& fromAddr, uint64_t requestPacketId, const Identity& identity, const Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY>& metaData)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_controller");
-	auto span = tracer->StartSpan("embedded_controller::_request");
-	auto scope = tracer->WithActiveSpan(span);
-
-	Metrics::network_config_request++;
-	auto tid = std::this_thread::get_id();
-	std::stringstream ss;
-	ss << tid;
-	std::string threadID = ss.str();
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	auto b1 = _member_status_lookup.Add({ { "thread", threadID } });
-	auto c1 = _member_status_lookup_count.Add({ { "thread", threadID } });
-	c1++;
-	b1.start();
-#endif
-
-	char nwids[24];
-	DB::NetworkSummaryInfo ns;
-	json network, member;
-
-	if (((! _signingId) || (! _signingId.hasPrivate())) || (_signingId.address().toInt() != (nwid >> 24)) || (! _sender)) {
-		return;
-	}
-
-	const int64_t now = OSUtils::now();
-
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b1.stop();
-	auto b2 = _node_is_online.Add({ { "thread", threadID } });
-	auto c2 = _node_is_online_count.Add({ { "thread", threadID } });
-	c2++;
-	b2.start();
-#endif
-	char osArch[256];
-	metaData.get(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_OS_ARCH, osArch, sizeof(osArch));
-	// fprintf(stderr, "Network Config Request: nwid=%.16llx, nodeid=%.10llx, osArch=%s\n",
-	// 	nwid, identity.address().toInt(), osArch);
-	_db.nodeIsOnline(nwid, identity.address().toInt(), fromAddr, osArch);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b2.stop();
-
-	auto b3 = _get_and_init_member.Add({ { "thread", threadID } });
-	auto c3 = _get_and_init_member_count.Add({ { "thread", threadID } });
-	c3++;
-	b3.start();
-#endif
-	Utils::hex(nwid, nwids);
-	_db.get(nwid, network, identity.address().toInt(), member, ns);
-	if ((! network.is_object()) || (network.empty())) {
-		_sender->ncSendError(nwid, requestPacketId, identity.address(), NetworkController::NC_ERROR_OBJECT_NOT_FOUND, nullptr, 0);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-		b3.stop();
-#endif
-		return;
-	}
-	const bool newMember = ((! member.is_object()) || (member.empty()));
-	DB::initMember(member);
-	_MemberStatusKey msk(nwid, identity.address().toInt());
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b3.stop();
-#endif
-
-	{
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-		auto b4 = _have_identity.Add({ { "thread", threadID } });
-		auto c4 = _have_identity_count.Add({ { "thread", threadID } });
-		c4++;
-		b4.start();
-#endif
-		const std::string haveIdStr(OSUtils::jsonString(member["identity"], ""));
-		if (haveIdStr.length() > 0) {
-			// If we already know this member's identity perform a full compare. This prevents
-			// a "collision" from being able to auth onto our network in place of an already
-			// known member.
-			try {
-				if (Identity(haveIdStr.c_str()) != identity) {
-					_sender->ncSendError(nwid, requestPacketId, identity.address(), NetworkController::NC_ERROR_ACCESS_DENIED, nullptr, 0);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-					b4.stop();
-#endif
-					return;
-				}
-			}
-			catch (...) {
-				_sender->ncSendError(nwid, requestPacketId, identity.address(), NetworkController::NC_ERROR_ACCESS_DENIED, nullptr, 0);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-				b4.stop();
-#endif
-				return;
-			}
-		}
-		else {
-			// If we do not yet know this member's identity, learn it.
-			char idtmp[1024];
-			member["identity"] = identity.toString(false, idtmp);
-		}
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-		b4.stop();
-#endif
-	}
-
-	// These are always the same, but make sure they are set
-	{
-		char tmpid[128];
-		const std::string addrs(identity.address().toString(tmpid));
-		member["id"] = addrs;
-		member["address"] = addrs;
-		member["nwid"] = nwids;
-	}
-
-	// Determine whether and how member is authorized
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	auto b5 = _determine_auth.Add({ { "thread", threadID } });
-	auto c5 = _determine_auth_count.Add({ { "thread", threadID } });
-	c5++;
-	b5.start();
-#endif
-	bool authorized = false;
-	bool autoAuthorized = false;
-	json autoAuthCredentialType, autoAuthCredential;
-	if (OSUtils::jsonBool(member["authorized"], false)) {
-		authorized = true;
-	}
-	else if (! OSUtils::jsonBool(network["private"], true)) {
-		authorized = true;
-		autoAuthorized = true;
-		autoAuthCredentialType = "public";
-	}
-	else {
-		char presentedAuth[512];
-		if (metaData.get(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_AUTH, presentedAuth, sizeof(presentedAuth)) > 0) {
-			presentedAuth[511] = (char)0;	// sanity check
-			if ((strlen(presentedAuth) > 6) && (! strncmp(presentedAuth, "token:", 6))) {
-				const char* const presentedToken = presentedAuth + 6;
-				json authTokens(network["authTokens"]);
-				json& tokenExpires = authTokens[presentedToken];
-				if (tokenExpires.is_number()) {
-					if ((tokenExpires == 0) || (tokenExpires > now)) {
-						authorized = true;
-						autoAuthorized = true;
-						autoAuthCredentialType = "token";
-						autoAuthCredential = presentedToken;
-					}
-				}
-			}
-		}
-	}
-
-	// If we auto-authorized, update member record
-	if ((autoAuthorized) && (authorized)) {
-		member["authorized"] = true;
-		member["lastAuthorizedTime"] = now;
-		member["lastAuthorizedCredentialType"] = autoAuthCredentialType;
-		member["lastAuthorizedCredential"] = autoAuthCredential;
-	}
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b5.stop();
-#endif
-
-	// Should we check SSO Stuff?
-	// If network is configured with SSO, and the member is not marked exempt: yes
-	// Otherwise no, we use standard auth logic.
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	auto b6 = _sso_check.Add({ { "thread", threadID } });
-	auto c6 = _sso_check_count.Add({ { "thread", threadID } });
-	c6++;
-	b6.start();
-#endif
-	AuthInfo info;
-	int64_t authenticationExpiryTime = -1;
-	bool networkSSOEnabled = OSUtils::jsonBool(network["ssoEnabled"], false);
-	bool memberSSOExempt = OSUtils::jsonBool(member["ssoExempt"], false);
-	if (networkSSOEnabled && ! memberSSOExempt) {
-		authenticationExpiryTime = (int64_t)OSUtils::jsonInt(member["authenticationExpiryTime"], 0);
-		info = _db.getSSOAuthInfo(member, _ssoRedirectURL);
-		assert(info.enabled == networkSSOEnabled);
-		if (authenticationExpiryTime <= now) {
-			if (info.version == 0) {
-				Dictionary<4096> authInfo;
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_VERSION, (uint64_t)0ULL);
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_AUTHENTICATION_URL, info.authenticationURL.c_str());
-				_sender->ncSendError(nwid, requestPacketId, identity.address(), NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED, authInfo.data(), authInfo.sizeBytes());
-			}
-			else if (info.version == 1) {
-				Dictionary<8192> authInfo;
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_VERSION, info.version);
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_ISSUER_URL, info.issuerURL.c_str());
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_CENTRAL_ENDPOINT_URL, info.centralAuthURL.c_str());
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_NONCE, info.ssoNonce.c_str());
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_STATE, info.ssoState.c_str());
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_CLIENT_ID, info.ssoClientID.c_str());
-				authInfo.add(ZT_AUTHINFO_DICT_KEY_SSO_PROVIDER, info.ssoProvider.c_str());
-				_sender->ncSendError(nwid, requestPacketId, identity.address(), NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED, authInfo.data(), authInfo.sizeBytes());
-			}
-			DB::cleanMember(member);
-			_db.save(member, true);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-			b6.stop();
-#endif
-			return;
-		}
-	}
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b6.stop();
-
-	auto b7 = _auth_check.Add({ { "thread", threadID } });
-	auto c7 = _auth_check_count.Add({ { "thread", threadID } });
-	c7++;
-	b7.start();
-#endif
-	if (authorized) {
-		// Update version info and meta-data if authorized and if this is a genuine request
-		if (requestPacketId) {
-			const uint64_t vMajor = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MAJOR_VERSION, 0);
-			const uint64_t vMinor = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MINOR_VERSION, 0);
-			const uint64_t vRev = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_REVISION, 0);
-			const uint64_t vProto = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_PROTOCOL_VERSION, 0);
-
-			member["vMajor"] = vMajor;
-			member["vMinor"] = vMinor;
-			member["vRev"] = vRev;
-			member["vProto"] = vProto;
-
-			{
-				std::lock_guard<std::mutex> l(_memberStatus_l);
-				_MemberStatus& ms = _memberStatus[msk];
-				ms.authenticationExpiryTime = authenticationExpiryTime;
-				ms.vMajor = (int)vMajor;
-				ms.vMinor = (int)vMinor;
-				ms.vRev = (int)vRev;
-				ms.vProto = (int)vProto;
-				ms.lastRequestMetaData = metaData;
-				ms.identity = identity;
-			}
-
-			if (authenticationExpiryTime > 0) {
-				std::lock_guard<std::mutex> l(_expiringSoon_l);
-				_expiringSoon.insert(std::pair<int64_t, _MemberStatusKey>(authenticationExpiryTime, msk));
-			}
-		}
-	}
-	else {
-		// If they are not authorized, STOP!
-		DB::cleanMember(member);
-		_db.save(member, true);
-		_sender->ncSendError(nwid, requestPacketId, identity.address(), NetworkController::NC_ERROR_ACCESS_DENIED, nullptr, 0);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-		b7.stop();
-#endif
-		return;
-	}
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b7.stop();
-#endif
-
-	// -------------------------------------------------------------------------
-	// If we made it this far, they are authorized (and authenticated).
-	// -------------------------------------------------------------------------
-
-	// Default timeout: 15 minutes. Maximum: two hours. Can be specified by an optional field in the network config
-	// if something longer than 15 minutes is desired. Minimum is 5 minutes since shorter than that would be flaky.
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	auto b8 = _json_schlep.Add({ { "thread", threadID } });
-	auto c8 = _json_schlep_count.Add({ { "thread", threadID } });
-	c8++;
-	b8.start();
-#endif
-	int64_t credentialtmd = ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_DFL_MAX_DELTA;
-	if (network.contains("certificateTimeoutWindowSize")) {
-		credentialtmd = (int64_t)network["certificateTimeoutWindowSize"];
-	}
-	credentialtmd = std::max(std::min(credentialtmd, ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MAX_MAX_DELTA), ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MIN_MAX_DELTA);
-
-	std::unique_ptr<NetworkConfig> nc(new NetworkConfig());
-
-	nc->networkId = nwid;
-	nc->type = OSUtils::jsonBool(network["private"], true) ? ZT_NETWORK_TYPE_PRIVATE : ZT_NETWORK_TYPE_PUBLIC;
-	nc->timestamp = now;
-	nc->credentialTimeMaxDelta = credentialtmd;
-	nc->revision = OSUtils::jsonInt(network["revision"], 0ULL);
-	nc->issuedTo = identity.address();
-	if (OSUtils::jsonBool(network["enableBroadcast"], true))
-		nc->flags |= ZT_NETWORKCONFIG_FLAG_ENABLE_BROADCAST;
-	Utils::scopy(nc->name, sizeof(nc->name), OSUtils::jsonString(network["name"], "").c_str());
-	nc->mtu = std::max(std::min((unsigned int)OSUtils::jsonInt(network["mtu"], ZT_DEFAULT_MTU), (unsigned int)ZT_MAX_MTU), (unsigned int)ZT_MIN_MTU);
-	nc->multicastLimit = (unsigned int)OSUtils::jsonInt(network["multicastLimit"], 32ULL);
-
-	nc->ssoEnabled = networkSSOEnabled;	  // OSUtils::jsonBool(network["ssoEnabled"], false);
-	nc->ssoVersion = info.version;
-
-	if (info.version == 0) {
-		nc->authenticationExpiryTime = OSUtils::jsonInt(member["authenticationExpiryTime"], 0LL);
-		if (! info.authenticationURL.empty()) {
-			Utils::scopy(nc->authenticationURL, sizeof(nc->authenticationURL), info.authenticationURL.c_str());
-		}
-	}
-	else if (info.version == 1) {
-		nc->authenticationExpiryTime = OSUtils::jsonInt(member["authenticationExpiryTime"], 0LL);
-		if (! info.authenticationURL.empty()) {
-			Utils::scopy(nc->authenticationURL, sizeof(nc->authenticationURL), info.authenticationURL.c_str());
-		}
-		if (! info.centralAuthURL.empty()) {
-			Utils::scopy(nc->centralAuthURL, sizeof(nc->centralAuthURL), info.centralAuthURL.c_str());
-		}
-		if (! info.issuerURL.empty()) {
-#ifdef ZT_DEBUG
-			fprintf(stderr, "copying issuerURL to nc: %s\n", info.issuerURL.c_str());
-#endif
-			Utils::scopy(nc->issuerURL, sizeof(nc->issuerURL), info.issuerURL.c_str());
-		}
-		if (! info.ssoNonce.empty()) {
-			Utils::scopy(nc->ssoNonce, sizeof(nc->ssoNonce), info.ssoNonce.c_str());
-		}
-		if (! info.ssoState.empty()) {
-			Utils::scopy(nc->ssoState, sizeof(nc->ssoState), info.ssoState.c_str());
-		}
-		if (! info.ssoClientID.empty()) {
-			Utils::scopy(nc->ssoClientID, sizeof(nc->ssoClientID), info.ssoClientID.c_str());
-		}
-	}
-
-	std::string rtt(OSUtils::jsonString(member["remoteTraceTarget"], ""));
-	if (rtt.length() == 10) {
-		nc->remoteTraceTarget = Address(Utils::hexStrToU64(rtt.c_str()));
-		nc->remoteTraceLevel = (Trace::Level)OSUtils::jsonInt(member["remoteTraceLevel"], 0ULL);
-	}
-	else {
-		rtt = OSUtils::jsonString(network["remoteTraceTarget"], "");
-		if (rtt.length() == 10) {
-			nc->remoteTraceTarget = Address(Utils::hexStrToU64(rtt.c_str()));
-		}
-		else {
-			nc->remoteTraceTarget.zero();
-		}
-		nc->remoteTraceLevel = (Trace::Level)OSUtils::jsonInt(network["remoteTraceLevel"], 0ULL);
-	}
-
-	for (std::vector<Address>::const_iterator ab(ns.activeBridges.begin()); ab != ns.activeBridges.end(); ++ab) {
-		nc->addSpecialist(*ab, ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE);
-	}
-
-	json& v4AssignMode = network["v4AssignMode"];
-	json& v6AssignMode = network["v6AssignMode"];
-	json& ipAssignmentPools = network["ipAssignmentPools"];
-	json& routes = network["routes"];
-	json& rules = network["rules"];
-	json& capabilities = network["capabilities"];
-	json& tags = network["tags"];
-	json& memberCapabilities = member["capabilities"];
-	json& memberTags = member["tags"];
-	json& dns = network["dns"];
-
-	// fprintf(stderr, "IP Assignment Pools for Network %s: %s\n", nwids, OSUtils::jsonDump(ipAssignmentPools, 2).c_str());
-
-	if (metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_RULES_ENGINE_REV, 0) <= 0) {
-		// Old versions with no rules engine support get an allow everything rule.
-		// Since rules are enforced bidirectionally, newer versions *will* still
-		// enforce rules on the inbound side.
-		nc->ruleCount = 1;
-		nc->rules[0].t = ZT_NETWORK_RULE_ACTION_ACCEPT;
-	}
-	else {
-		if (rules.is_array()) {
-			for (unsigned long i = 0; i < rules.size(); ++i) {
-				if (nc->ruleCount >= ZT_MAX_NETWORK_RULES)
-					break;
-				if (_parseRule(rules[i], nc->rules[nc->ruleCount]))
-					++nc->ruleCount;
-			}
-		}
-
-		std::map<uint64_t, json*> capsById;
-		if (! memberCapabilities.is_array())
-			memberCapabilities = json::array();
-		if (capabilities.is_array()) {
-			for (unsigned long i = 0; i < capabilities.size(); ++i) {
-				json& cap = capabilities[i];
-				if (cap.is_object()) {
-					const uint64_t id = OSUtils::jsonInt(cap["id"], 0ULL) & 0xffffffffULL;
-					capsById[id] = &cap;
-					if ((newMember) && (OSUtils::jsonBool(cap["default"], false))) {
-						bool have = false;
-						for (unsigned long i = 0; i < memberCapabilities.size(); ++i) {
-							if (id == (OSUtils::jsonInt(memberCapabilities[i], 0ULL) & 0xffffffffULL)) {
-								have = true;
-								break;
-							}
-						}
-						if (! have)
-							memberCapabilities.push_back(id);
-					}
-				}
-			}
-		}
-		for (unsigned long i = 0; i < memberCapabilities.size(); ++i) {
-			const uint64_t capId = OSUtils::jsonInt(memberCapabilities[i], 0ULL) & 0xffffffffULL;
-			std::map<uint64_t, json*>::const_iterator ctmp = capsById.find(capId);
-			if (ctmp != capsById.end()) {
-				json* cap = ctmp->second;
-				if ((cap) && (cap->is_object()) && (! cap->empty())) {
-					ZT_VirtualNetworkRule capr[ZT_MAX_CAPABILITY_RULES];
-					unsigned int caprc = 0;
-					json& caprj = (*cap)["rules"];
-					if ((caprj.is_array()) && (! caprj.empty())) {
-						for (unsigned long j = 0; j < caprj.size(); ++j) {
-							if (caprc >= ZT_MAX_CAPABILITY_RULES)
-								break;
-							if (_parseRule(caprj[j], capr[caprc]))
-								++caprc;
-						}
-					}
-					nc->capabilities[nc->capabilityCount] = Capability((uint32_t)capId, nwid, now, 1, capr, caprc);
-					if (nc->capabilities[nc->capabilityCount].sign(_signingId, identity.address()))
-						++nc->capabilityCount;
-					if (nc->capabilityCount >= ZT_MAX_NETWORK_CAPABILITIES)
-						break;
-				}
-			}
-		}
-
-		std::map<uint32_t, uint32_t> memberTagsById;
-		if (memberTags.is_array()) {
-			for (unsigned long i = 0; i < memberTags.size(); ++i) {
-				json& t = memberTags[i];
-				if ((t.is_array()) && (t.size() == 2))
-					memberTagsById[(uint32_t)(OSUtils::jsonInt(t[0], 0ULL) & 0xffffffffULL)] = (uint32_t)(OSUtils::jsonInt(t[1], 0ULL) & 0xffffffffULL);
-			}
-		}
-		if (tags.is_array()) {	 // check network tags array for defaults that are not present in member tags
-			for (unsigned long i = 0; i < tags.size(); ++i) {
-				json& t = tags[i];
-				if (t.is_object()) {
-					const uint32_t id = (uint32_t)(OSUtils::jsonInt(t["id"], 0) & 0xffffffffULL);
-					json& dfl = t["default"];
-					if ((dfl.is_number()) && (memberTagsById.find(id) == memberTagsById.end())) {
-						memberTagsById[id] = (uint32_t)(OSUtils::jsonInt(dfl, 0) & 0xffffffffULL);
-						json mt = json::array();
-						mt.push_back(id);
-						mt.push_back(dfl);
-						memberTags.push_back(mt);	// add default to member tags if not present
-					}
-				}
-			}
-		}
-		for (std::map<uint32_t, uint32_t>::const_iterator t(memberTagsById.begin()); t != memberTagsById.end(); ++t) {
-			if (nc->tagCount >= ZT_MAX_NETWORK_TAGS)
-				break;
-			nc->tags[nc->tagCount] = Tag(nwid, now, identity.address(), t->first, t->second);
-			if (nc->tags[nc->tagCount].sign(_signingId))
-				++nc->tagCount;
-		}
-	}
-
-	if (routes.is_array()) {
-		for (unsigned long i = 0; i < routes.size(); ++i) {
-			if (nc->routeCount >= ZT_MAX_NETWORK_ROUTES)
-				break;
-			json& route = routes[i];
-			json& target = route["target"];
-			json& via = route["via"];
-			if (target.is_string()) {
-				const InetAddress t(target.get<std::string>().c_str());
-				InetAddress v;
-				if (via.is_string())
-					v.fromString(via.get<std::string>().c_str());
-				if ((t.ss_family == AF_INET) || (t.ss_family == AF_INET6)) {
-					ZT_VirtualNetworkRoute* r = &(nc->routes[nc->routeCount]);
-					*(reinterpret_cast<InetAddress*>(&(r->target))) = t;
-					if (v.ss_family == t.ss_family)
-						*(reinterpret_cast<InetAddress*>(&(r->via))) = v;
-					++nc->routeCount;
-				}
-			}
-		}
-	}
-
-	const bool noAutoAssignIps = OSUtils::jsonBool(member["noAutoAssignIps"], false);
-
-	if ((v6AssignMode.is_object()) && (! noAutoAssignIps)) {
-		if ((OSUtils::jsonBool(v6AssignMode["rfc4193"], false)) && (nc->staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES)) {
-			nc->staticIps[nc->staticIpCount++] = InetAddress::makeIpv6rfc4193(nwid, identity.address().toInt());
-			nc->flags |= ZT_NETWORKCONFIG_FLAG_ENABLE_IPV6_NDP_EMULATION;
-		}
-		if ((OSUtils::jsonBool(v6AssignMode["6plane"], false)) && (nc->staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES)) {
-			nc->staticIps[nc->staticIpCount++] = InetAddress::makeIpv66plane(nwid, identity.address().toInt());
-			nc->flags |= ZT_NETWORKCONFIG_FLAG_ENABLE_IPV6_NDP_EMULATION;
-		}
-	}
-
-	bool haveManagedIpv4AutoAssignment = false;
-	bool haveManagedIpv6AutoAssignment = false;		// "special" NDP-emulated address types do not count
-	json ipAssignments = member["ipAssignments"];	// we want to make a copy
-	if (ipAssignments.is_array()) {
-		for (unsigned long i = 0; i < ipAssignments.size(); ++i) {
-			if (ipAssignments[i].is_string()) {
-				const std::string ips = ipAssignments[i];
-				InetAddress ip(ips.c_str());
-
-				int routedNetmaskBits = -1;
-				for (unsigned int rk = 0; rk < nc->routeCount; ++rk) {
-					if (reinterpret_cast<const InetAddress*>(&(nc->routes[rk].target))->containsAddress(ip)) {
-						const int nb = (int)(reinterpret_cast<const InetAddress*>(&(nc->routes[rk].target))->netmaskBits());
-						if (nb > routedNetmaskBits)
-							routedNetmaskBits = nb;
-					}
-				}
-
-				if (routedNetmaskBits >= 0) {
-					if (nc->staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES) {
-						ip.setPort(routedNetmaskBits);
-						nc->staticIps[nc->staticIpCount++] = ip;
-					}
-					if (ip.ss_family == AF_INET)
-						haveManagedIpv4AutoAssignment = true;
-					else if (ip.ss_family == AF_INET6)
-						haveManagedIpv6AutoAssignment = true;
-				}
-			}
-		}
-	}
-	else {
-		ipAssignments = json::array();
-	}
-
-	if ((ipAssignmentPools.is_array()) && ((v6AssignMode.is_object()) && (OSUtils::jsonBool(v6AssignMode["zt"], false))) && (! haveManagedIpv6AutoAssignment) && (! noAutoAssignIps)) {
-		for (unsigned long p = 0; ((p < ipAssignmentPools.size()) && (! haveManagedIpv6AutoAssignment)); ++p) {
-			json& pool = ipAssignmentPools[p];
-			if (pool.is_object()) {
-				InetAddress ipRangeStart(OSUtils::jsonString(pool["ipRangeStart"], "").c_str());
-				InetAddress ipRangeEnd(OSUtils::jsonString(pool["ipRangeEnd"], "").c_str());
-				if ((ipRangeStart.ss_family == AF_INET6) && (ipRangeEnd.ss_family == AF_INET6)) {
-					uint64_t s[2], e[2], x[2], xx[2];
-					memcpy(s, ipRangeStart.rawIpData(), 16);
-					memcpy(e, ipRangeEnd.rawIpData(), 16);
-					s[0] = Utils::ntoh(s[0]);
-					s[1] = Utils::ntoh(s[1]);
-					e[0] = Utils::ntoh(e[0]);
-					e[1] = Utils::ntoh(e[1]);
-					x[0] = s[0];
-					x[1] = s[1];
-
-					for (unsigned int trialCount = 0; trialCount < 1000; ++trialCount) {
-						if ((trialCount == 0) && (e[1] > s[1]) && ((e[1] - s[1]) >= 0xffffffffffULL)) {
-							// First see if we can just cram a ZeroTier ID into the higher 64 bits. If so do that.
-							xx[0] = Utils::hton(x[0]);
-							xx[1] = Utils::hton(x[1] + identity.address().toInt());
-						}
-						else {
-							// Otherwise pick random addresses -- this technically doesn't explore the whole range if the lower 64 bit range is >= 1 but that won't matter since that would be huge anyway
-							Utils::getSecureRandom((void*)xx, 16);
-							if ((e[0] > s[0]))
-								xx[0] %= (e[0] - s[0]);
-							else
-								xx[0] = 0;
-							if ((e[1] > s[1]))
-								xx[1] %= (e[1] - s[1]);
-							else
-								xx[1] = 0;
-							xx[0] = Utils::hton(x[0] + xx[0]);
-							xx[1] = Utils::hton(x[1] + xx[1]);
-						}
-
-						InetAddress ip6((const void*)xx, 16, 0);
-
-						// Check if this IP is within a local-to-Ethernet routed network
-						int routedNetmaskBits = 0;
-						for (unsigned int rk = 0; rk < nc->routeCount; ++rk) {
-							if ((! nc->routes[rk].via.ss_family) && (nc->routes[rk].target.ss_family == AF_INET6) && (reinterpret_cast<const InetAddress*>(&(nc->routes[rk].target))->containsAddress(ip6)))
-								routedNetmaskBits = reinterpret_cast<const InetAddress*>(&(nc->routes[rk].target))->netmaskBits();
-						}
-
-						// If it's routed, then try to claim and assign it and if successful end loop
-						if ((routedNetmaskBits > 0) && (! std::binary_search(ns.allocatedIps.begin(), ns.allocatedIps.end(), ip6))) {
-							char tmpip[64];
-							const std::string ipStr(ip6.toIpString(tmpip));
-							if (std::find(ipAssignments.begin(), ipAssignments.end(), ipStr) == ipAssignments.end()) {
-								ipAssignments.push_back(ipStr);
-								member["ipAssignments"] = ipAssignments;
-								ip6.setPort((unsigned int)routedNetmaskBits);
-								if (nc->staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES)
-									nc->staticIps[nc->staticIpCount++] = ip6;
-								haveManagedIpv6AutoAssignment = true;
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if ((ipAssignmentPools.is_array()) && ((v4AssignMode.is_object()) && (OSUtils::jsonBool(v4AssignMode["zt"], false))) && (! haveManagedIpv4AutoAssignment) && (! noAutoAssignIps)) {
-		for (unsigned long p = 0; ((p < ipAssignmentPools.size()) && (! haveManagedIpv4AutoAssignment)); ++p) {
-			json& pool = ipAssignmentPools[p];
-			if (pool.is_object()) {
-				InetAddress ipRangeStartIA(OSUtils::jsonString(pool["ipRangeStart"], "").c_str());
-				InetAddress ipRangeEndIA(OSUtils::jsonString(pool["ipRangeEnd"], "").c_str());
-				if ((ipRangeStartIA.ss_family == AF_INET) && (ipRangeEndIA.ss_family == AF_INET)) {
-					uint32_t ipRangeStart = Utils::ntoh((uint32_t)(reinterpret_cast<struct sockaddr_in*>(&ipRangeStartIA)->sin_addr.s_addr));
-					uint32_t ipRangeEnd = Utils::ntoh((uint32_t)(reinterpret_cast<struct sockaddr_in*>(&ipRangeEndIA)->sin_addr.s_addr));
-
-					if ((ipRangeEnd < ipRangeStart) || (ipRangeStart == 0))
-						continue;
-					uint32_t ipRangeLen = ipRangeEnd - ipRangeStart;
-
-					// Start with the LSB of the member's address
-					uint32_t ipTrialCounter = (uint32_t)(identity.address().toInt() & 0xffffffff);
-
-					for (uint32_t k = ipRangeStart, trialCount = 0; ((k <= ipRangeEnd) && (trialCount < 1000)); ++k, ++trialCount) {
-						uint32_t ip = (ipRangeLen > 0) ? (ipRangeStart + (ipTrialCounter % ipRangeLen)) : ipRangeStart;
-						++ipTrialCounter;
-						if ((ip & 0x000000ff) == 0x000000ff) {
-							continue;	// don't allow addresses that end in .255
-						}
-
-						// Check if this IP is within a local-to-Ethernet routed network
-						int routedNetmaskBits = -1;
-						for (unsigned int rk = 0; rk < nc->routeCount; ++rk) {
-							if (nc->routes[rk].target.ss_family == AF_INET) {
-								uint32_t targetIp = Utils::ntoh((uint32_t)(reinterpret_cast<const struct sockaddr_in*>(&(nc->routes[rk].target))->sin_addr.s_addr));
-								int targetBits = Utils::ntoh((uint16_t)(reinterpret_cast<const struct sockaddr_in*>(&(nc->routes[rk].target))->sin_port));
-								if ((ip & (0xffffffff << (32 - targetBits))) == targetIp) {
-									routedNetmaskBits = targetBits;
-									break;
-								}
-							}
-						}
-
-						// If it's routed, then try to claim and assign it and if successful end loop
-						const InetAddress ip4(Utils::hton(ip), 0);
-						if ((routedNetmaskBits > 0) && (! std::binary_search(ns.allocatedIps.begin(), ns.allocatedIps.end(), ip4))) {
-							char tmpip[64];
-							const std::string ipStr(ip4.toIpString(tmpip));
-							if (std::find(ipAssignments.begin(), ipAssignments.end(), ipStr) == ipAssignments.end()) {
-								ipAssignments.push_back(ipStr);
-								member["ipAssignments"] = ipAssignments;
-								if (nc->staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES) {
-									struct sockaddr_in* const v4ip = reinterpret_cast<struct sockaddr_in*>(&(nc->staticIps[nc->staticIpCount++]));
-									v4ip->sin_family = AF_INET;
-									v4ip->sin_port = Utils::hton((uint16_t)routedNetmaskBits);
-									v4ip->sin_addr.s_addr = Utils::hton(ip);
-								}
-								haveManagedIpv4AutoAssignment = true;
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if (dns.is_object()) {
-		std::string domain = OSUtils::jsonString(dns["domain"], "");
-		memcpy(nc->dns.domain, domain.c_str(), domain.size());
-		json& addrArray = dns["servers"];
-		if (addrArray.is_array()) {
-			for (unsigned int j = 0; j < addrArray.size() && j < ZT_MAX_DNS_SERVERS; ++j) {
-				json& addr = addrArray[j];
-				nc->dns.server_addr[j] = InetAddress(OSUtils::jsonString(addr, "").c_str());
-			}
-		}
-	}
-	else {
-		dns = json::object();
-	}
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b8.stop();
-#endif
-
-	// Issue a certificate of ownership for all static IPs
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	auto b9 = _issue_certificate.Add({ { "thread", threadID } });
-	auto c9 = _issue_certificate_count.Add({ { "thread", threadID } });
-	c9++;
-	b9.start();
-#endif
-	if (nc->staticIpCount) {
-		nc->certificatesOfOwnership[0] = CertificateOfOwnership(nwid, now, identity.address(), 1);
-		for (unsigned int i = 0; i < nc->staticIpCount; ++i) {
-			nc->certificatesOfOwnership[0].addThing(nc->staticIps[i]);
-		}
-		nc->certificatesOfOwnership[0].sign(_signingId);
-		nc->certificateOfOwnershipCount = 1;
-	}
-
-	CertificateOfMembership com(now, credentialtmd, nwid, identity);
-	if (com.sign(_signingId)) {
-		nc->com = com;
-	}
-	else {
-		_sender->ncSendError(nwid, requestPacketId, identity.address(), NetworkController::NC_ERROR_INTERNAL_SERVER_ERROR, nullptr, 0);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-		b9.stop();
-#endif
-		return;
-	}
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b9.stop();
-
-	auto b10 = _save_member.Add({ { "thread", threadID } });
-	auto c10 = _save_member_count.Add({ { "thread", threadID } });
-	c10++;
-	b10.start();
-#endif
-	DB::cleanMember(member);
-	_db.save(member, true);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b10.stop();
-
-	auto b11 = _send_netconf.Add({ { "thread", threadID } });
-	auto c11 = _send_netconf_count.Add({ { "thread", threadID } });
-	c11++;
-	b11.start();
-#endif
-	_sender->ncSendConfig(nwid, requestPacketId, identity.address(), *(nc.get()), metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_VERSION, 0) < 6);
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	b11.stop();
-#endif
-}
-
-void EmbeddedNetworkController::_startThreads()
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("embedded_network_controller");
-	auto span = tracer->StartSpan("embedded_network_controller::_startThreads");
-	auto scope = tracer->WithActiveSpan(span);
-
-	std::lock_guard<std::mutex> l(_threads_l);
-	if (! _threads.empty()) {
-		return;
-	}
-	const long hwc = std::max((long)std::thread::hardware_concurrency(), (long)1);
-	for (long t = 0; t < hwc; ++t) {
-		_threads.emplace_back([this]() {
-			Metrics::network_config_request_threads++;
-			for (;;) {
-				_RQEntry* qe = (_RQEntry*)0;
-				Metrics::network_config_request_queue_size = _queue.size();
-				auto timedWaitResult = _queue.get(qe, 1000);
-				if (timedWaitResult == BlockingQueue<_RQEntry*>::STOP) {
-					break;
-				}
-				else if (timedWaitResult == BlockingQueue<_RQEntry*>::OK) {
-					if (qe) {
-						try {
-							_request(qe->nwid, qe->fromAddr, qe->requestPacketId, qe->identity, qe->metaData);
-						}
-						catch (std::exception& e) {
-							fprintf(stderr, "ERROR: exception in controller request handling thread: %s" ZT_EOL_S, e.what());
-						}
-						catch (...) {
-							fprintf(stderr, "ERROR: exception in controller request handling thread: unknown exception" ZT_EOL_S);
-						}
-						delete qe;
-						qe = nullptr;
-					}
-				}
-			}
-			Metrics::network_config_request_threads--;
-		});
-	}
-}
-
-void EmbeddedNetworkController::_ssoExpiryThread()
-{
-	while (_ssoExpiryRunning) {
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("embedded_network_controller");
-		auto span = tracer->StartSpan("embedded_network_controller::_ssoExpiryThread");
-		auto scope = tracer->WithActiveSpan(span);
-
-		std::vector<_MemberStatusKey> expired;
-		nlohmann::json network, member;
-		int64_t now = OSUtils::now();
-		{
-			std::lock_guard<std::mutex> l(_expiringSoon_l);
-			for (auto s = _expiringSoon.begin(); s != _expiringSoon.end();) {
-				Metrics::sso_expiration_checks++;
-				const int64_t when = s->first;
-				if (when <= now) {
-					// The user may have re-authorized, so we must actually look it up and check.
-					network.clear();
-					member.clear();
-					if (_db.get(s->second.networkId, network, s->second.nodeId, member)) {
-						int64_t authenticationExpiryTime = (int64_t)OSUtils::jsonInt(member["authenticationExpiryTime"], 0);
-						if (authenticationExpiryTime <= now) {
-							expired.push_back(s->second);
-						}
-					}
-					s = _expiringSoon.erase(s);
-				}
-				else {
-					// Don't bother going further into the future than necessary.
-					break;
-				}
-			}
-		}
-		for (auto e = expired.begin(); e != expired.end(); ++e) {
-			Metrics::sso_member_deauth++;
-			onNetworkMemberDeauthorize(nullptr, e->networkId, e->nodeId);
-		}
-		span->End();
-		std::this_thread::sleep_for(std::chrono::milliseconds(500));
-	}
-}
-
-}	// namespace ZeroTier
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp
deleted file mode 100644
index 111417bfb..000000000
--- a/controller/EmbeddedNetworkController.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_SQLITENETWORKCONTROLLER_HPP
-#define ZT_SQLITENETWORKCONTROLLER_HPP
-
-#include "../node/Address.hpp"
-#include "../node/Constants.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/NetworkController.hpp"
-#include "../node/Utils.hpp"
-#include "../osdep/BlockingQueue.hpp"
-#include "../osdep/OSUtils.hpp"
-#include "../osdep/Thread.hpp"
-#include "DB.hpp"
-#include "DBMirrorSet.hpp"
-
-#include <atomic>
-#include <cpp-httplib/httplib.h>
-#include <list>
-#include <map>
-#include <nlohmann/json.hpp>
-#include <set>
-#include <stdint.h>
-#include <string>
-#include <thread>
-#include <unordered_map>
-#include <vector>
-
-namespace ZeroTier {
-
-class Node;
-struct RedisConfig;
-
-class EmbeddedNetworkController
-	: public NetworkController
-	, public DB::ChangeListener {
-  public:
-	/**
-	 * @param node Parent node
-	 * @param dbPath Database path (file path or database credentials)
-	 */
-	EmbeddedNetworkController(Node* node, const char* ztPath, const char* dbPath, int listenPort, RedisConfig* rc);
-	virtual ~EmbeddedNetworkController();
-
-	virtual void init(const Identity& signingId, Sender* sender);
-
-	void setSSORedirectURL(const std::string& url);
-
-	virtual void request(uint64_t nwid, const InetAddress& fromAddr, uint64_t requestPacketId, const Identity& identity, const Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY>& metaData);
-
-	void configureHTTPControlPlane(httplib::Server& s, httplib::Server& sV6, const std::function<void(const httplib::Request&, httplib::Response&, std::string)>);
-
-	void handleRemoteTrace(const ZT_RemoteTrace& rt);
-
-	virtual void onNetworkUpdate(const void* db, uint64_t networkId, const nlohmann::json& network);
-	virtual void onNetworkMemberUpdate(const void* db, uint64_t networkId, uint64_t memberId, const nlohmann::json& member);
-	virtual void onNetworkMemberDeauthorize(const void* db, uint64_t networkId, uint64_t memberId);
-
-  private:
-	void _request(uint64_t nwid, const InetAddress& fromAddr, uint64_t requestPacketId, const Identity& identity, const Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY>& metaData);
-	void _startThreads();
-	void _ssoExpiryThread();
-
-	std::string networkUpdateFromPostData(uint64_t networkID, const std::string& body);
-
-	struct _RQEntry {
-		uint64_t nwid;
-		uint64_t requestPacketId;
-		InetAddress fromAddr;
-		Identity identity;
-		Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY> metaData;
-		enum { RQENTRY_TYPE_REQUEST = 0 } type;
-	};
-
-	struct _MemberStatusKey {
-		_MemberStatusKey() : networkId(0), nodeId(0)
-		{
-		}
-		_MemberStatusKey(const uint64_t nwid, const uint64_t nid) : networkId(nwid), nodeId(nid)
-		{
-		}
-		uint64_t networkId;
-		uint64_t nodeId;
-		inline bool operator==(const _MemberStatusKey& k) const
-		{
-			return ((k.networkId == networkId) && (k.nodeId == nodeId));
-		}
-		inline bool operator<(const _MemberStatusKey& k) const
-		{
-			return (k.networkId < networkId) || ((k.networkId == networkId) && (k.nodeId < nodeId));
-		}
-	};
-	struct _MemberStatus {
-		_MemberStatus() : lastRequestTime(0), authenticationExpiryTime(-1), vMajor(-1), vMinor(-1), vRev(-1), vProto(-1)
-		{
-		}
-		int64_t lastRequestTime;
-		int64_t authenticationExpiryTime;
-		int vMajor, vMinor, vRev, vProto;
-		Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY> lastRequestMetaData;
-		Identity identity;
-		inline bool online(const int64_t now) const
-		{
-			return ((now - lastRequestTime) < (ZT_NETWORK_AUTOCONF_DELAY * 2));
-		}
-	};
-	struct _MemberStatusHash {
-		inline std::size_t operator()(const _MemberStatusKey& networkIdNodeId) const
-		{
-			return (std::size_t)(networkIdNodeId.networkId + networkIdNodeId.nodeId);
-		}
-	};
-
-	const int64_t _startTime;
-	int _listenPort;
-	Node* const _node;
-	std::string _ztPath;
-	std::string _path;
-	Identity _signingId;
-	std::string _signingIdAddressString;
-	NetworkController::Sender* _sender;
-
-	DBMirrorSet _db;
-	BlockingQueue<_RQEntry*> _queue;
-
-	std::vector<std::thread> _threads;
-	std::mutex _threads_l;
-
-	std::unordered_map<_MemberStatusKey, _MemberStatus, _MemberStatusHash> _memberStatus;
-	std::mutex _memberStatus_l;
-
-	std::set<std::pair<int64_t, _MemberStatusKey> > _expiringSoon;
-	std::mutex _expiringSoon_l;
-
-	RedisConfig* _rc;
-	std::string _ssoRedirectURL;
-
-	bool _ssoExpiryRunning;
-	std::thread _ssoExpiry;
-
-#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
-	prometheus::simpleapi::benchmark_family_t _member_status_lookup;
-	prometheus::simpleapi::counter_family_t _member_status_lookup_count;
-	prometheus::simpleapi::benchmark_family_t _node_is_online;
-	prometheus::simpleapi::counter_family_t _node_is_online_count;
-	prometheus::simpleapi::benchmark_family_t _get_and_init_member;
-	prometheus::simpleapi::counter_family_t _get_and_init_member_count;
-	prometheus::simpleapi::benchmark_family_t _have_identity;
-	prometheus::simpleapi::counter_family_t _have_identity_count;
-	prometheus::simpleapi::benchmark_family_t _determine_auth;
-	prometheus::simpleapi::counter_family_t _determine_auth_count;
-	prometheus::simpleapi::benchmark_family_t _sso_check;
-	prometheus::simpleapi::counter_family_t _sso_check_count;
-	prometheus::simpleapi::benchmark_family_t _auth_check;
-	prometheus::simpleapi::counter_family_t _auth_check_count;
-	prometheus::simpleapi::benchmark_family_t _json_schlep;
-	prometheus::simpleapi::counter_family_t _json_schlep_count;
-	prometheus::simpleapi::benchmark_family_t _issue_certificate;
-	prometheus::simpleapi::counter_family_t _issue_certificate_count;
-	prometheus::simpleapi::benchmark_family_t _save_member;
-	prometheus::simpleapi::counter_family_t _save_member_count;
-	prometheus::simpleapi::benchmark_family_t _send_netconf;
-	prometheus::simpleapi::counter_family_t _send_netconf_count;
-#endif
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/controller/FileDB.cpp b/controller/FileDB.cpp
deleted file mode 100644
index 6472022e2..000000000
--- a/controller/FileDB.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "FileDB.hpp"
-
-#include "../node/Metrics.hpp"
-#include "opentelemetry/trace/provider.h"
-
-namespace ZeroTier {
-
-FileDB::FileDB(const char* path) : DB(), _path(path), _networksPath(_path + ZT_PATH_SEPARATOR_S + "network"), _tracePath(_path + ZT_PATH_SEPARATOR_S + "trace"), _running(true)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("filedb");
-	auto span = tracer->StartSpan("filedb::FileDB");
-	auto scope = tracer->WithActiveSpan(span);
-
-	OSUtils::mkdir(_path.c_str());
-	OSUtils::lockDownFile(_path.c_str(), true);
-	OSUtils::mkdir(_networksPath.c_str());
-	OSUtils::mkdir(_tracePath.c_str());
-
-	std::vector<std::string> networks(OSUtils::listDirectory(_networksPath.c_str(), false));
-	std::string buf;
-	for (auto n = networks.begin(); n != networks.end(); ++n) {
-		buf.clear();
-		if ((n->length() == 21) && (OSUtils::readFile((_networksPath + ZT_PATH_SEPARATOR_S + *n).c_str(), buf))) {
-			try {
-				nlohmann::json network(OSUtils::jsonParse(buf));
-				const std::string nwids = network["id"];
-				if (nwids.length() == 16) {
-					nlohmann::json nullJson;
-					_networkChanged(nullJson, network, false);
-					Metrics::network_count++;
-					std::string membersPath(_networksPath + ZT_PATH_SEPARATOR_S + nwids + ZT_PATH_SEPARATOR_S "member");
-					std::vector<std::string> members(OSUtils::listDirectory(membersPath.c_str(), false));
-					for (auto m = members.begin(); m != members.end(); ++m) {
-						buf.clear();
-						if ((m->length() == 15) && (OSUtils::readFile((membersPath + ZT_PATH_SEPARATOR_S + *m).c_str(), buf))) {
-							try {
-								nlohmann::json member(OSUtils::jsonParse(buf));
-								const std::string addrs = member["id"];
-								if (addrs.length() == 10) {
-									nlohmann::json nullJson2;
-									_memberChanged(nullJson2, member, false);
-									Metrics::member_count++;
-								}
-							}
-							catch (...) {
-							}
-						}
-					}
-				}
-			}
-			catch (...) {
-			}
-		}
-	}
-}
-
-FileDB::~FileDB()
-{
-	try {
-		_online_l.lock();
-		_running = false;
-		_online_l.unlock();
-		_onlineUpdateThread.join();
-	}
-	catch (...) {
-	}
-}
-
-bool FileDB::waitForReady()
-{
-	return true;
-}
-bool FileDB::isReady()
-{
-	return true;
-}
-
-bool FileDB::save(nlohmann::json& record, bool notifyListeners)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("filedb");
-	auto span = tracer->StartSpan("filedb::save");
-	auto scope = tracer->WithActiveSpan(span);
-
-	char p1[4096], p2[4096], pb[4096];
-	bool modified = false;
-	try {
-		const std::string objtype = record["objtype"];
-		if (objtype == "network") {
-			auto span = tracer->StartSpan("filedb::save::network");
-			auto scope = tracer->WithActiveSpan(span);
-
-			const uint64_t nwid = OSUtils::jsonIntHex(record["id"], 0ULL);
-			if (nwid) {
-				nlohmann::json old;
-				get(nwid, old);
-				if ((! old.is_object()) || (! _compareRecords(old, record))) {
-					record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
-					OSUtils::ztsnprintf(p1, sizeof(p1), "%s" ZT_PATH_SEPARATOR_S "%.16llx.json", _networksPath.c_str(), nwid);
-					if (! OSUtils::writeFile(p1, OSUtils::jsonDump(record, -1))) {
-						fprintf(stderr, "WARNING: controller unable to write to path: %s" ZT_EOL_S, p1);
-					}
-					_networkChanged(old, record, notifyListeners);
-					modified = true;
-				}
-			}
-		}
-		else if (objtype == "member") {
-			auto span = tracer->StartSpan("filedb::save::member");
-			auto scope = tracer->WithActiveSpan(span);
-
-			const uint64_t id = OSUtils::jsonIntHex(record["id"], 0ULL);
-			const uint64_t nwid = OSUtils::jsonIntHex(record["nwid"], 0ULL);
-			if ((id) && (nwid)) {
-				nlohmann::json network, old;
-				get(nwid, network, id, old);
-				if ((! old.is_object()) || (! _compareRecords(old, record))) {
-					record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
-					OSUtils::ztsnprintf(pb, sizeof(pb), "%s" ZT_PATH_SEPARATOR_S "%.16llx" ZT_PATH_SEPARATOR_S "member", _networksPath.c_str(), (unsigned long long)nwid);
-					OSUtils::ztsnprintf(p1, sizeof(p1), "%s" ZT_PATH_SEPARATOR_S "%.10llx.json", pb, (unsigned long long)id);
-					if (! OSUtils::writeFile(p1, OSUtils::jsonDump(record, -1))) {
-						OSUtils::ztsnprintf(p2, sizeof(p2), "%s" ZT_PATH_SEPARATOR_S "%.16llx", _networksPath.c_str(), (unsigned long long)nwid);
-						OSUtils::mkdir(p2);
-						OSUtils::mkdir(pb);
-						if (! OSUtils::writeFile(p1, OSUtils::jsonDump(record, -1))) {
-							fprintf(stderr, "WARNING: controller unable to write to path: %s" ZT_EOL_S, p1);
-						}
-					}
-					_memberChanged(old, record, notifyListeners);
-					modified = true;
-				}
-			}
-		}
-	}
-	catch (...) {
-	}	// drop invalid records missing fields
-	return modified;
-}
-
-void FileDB::eraseNetwork(const uint64_t networkId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("filedb");
-	auto span = tracer->StartSpan("filedb::eraseNetwork");
-	auto scope = tracer->WithActiveSpan(span);
-
-	nlohmann::json network, nullJson;
-	get(networkId, network);
-	char p[16384];
-	OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "%.16llx.json", _networksPath.c_str(), networkId);
-	OSUtils::rm(p);
-	OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "%.16llx", _networksPath.c_str(), (unsigned long long)networkId);
-	OSUtils::rmDashRf(p);
-	_networkChanged(network, nullJson, true);
-	std::lock_guard<std::mutex> l(this->_online_l);
-	this->_online.erase(networkId);
-}
-
-void FileDB::eraseMember(const uint64_t networkId, const uint64_t memberId)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("filedb");
-	auto span = tracer->StartSpan("filedb::eraseMember");
-	auto scope = tracer->WithActiveSpan(span);
-
-	nlohmann::json network, member, nullJson;
-	get(networkId, network, memberId, member);
-	char p[4096];
-	OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "%.16llx" ZT_PATH_SEPARATOR_S "member" ZT_PATH_SEPARATOR_S "%.10llx.json", _networksPath.c_str(), networkId, memberId);
-	OSUtils::rm(p);
-	_memberChanged(member, nullJson, true);
-	std::lock_guard<std::mutex> l(this->_online_l);
-	this->_online[networkId].erase(memberId);
-}
-
-void FileDB::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch)
-{
-	auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-	auto tracer = provider->GetTracer("filedb");
-	auto span = tracer->StartSpan("filedb::nodeIsOnline");
-	auto scope = tracer->WithActiveSpan(span);
-
-	char mid[32], atmp[64];
-	OSUtils::ztsnprintf(mid, sizeof(mid), "%.10llx", (unsigned long long)memberId);
-	physicalAddress.toString(atmp);
-	std::lock_guard<std::mutex> l(this->_online_l);
-	this->_online[networkId][memberId][OSUtils::now()] = physicalAddress;
-}
-
-void FileDB::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress)
-{
-	this->nodeIsOnline(networkId, memberId, physicalAddress, "unknown/unknown");
-}
-
-}	// namespace ZeroTier
diff --git a/controller/FileDB.hpp b/controller/FileDB.hpp
deleted file mode 100644
index e10753223..000000000
--- a/controller/FileDB.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_CONTROLLER_FILEDB_HPP
-#define ZT_CONTROLLER_FILEDB_HPP
-
-#include "DB.hpp"
-
-namespace ZeroTier {
-
-class FileDB : public DB {
-  public:
-	FileDB(const char* path);
-	virtual ~FileDB();
-
-	virtual bool waitForReady();
-	virtual bool isReady();
-	virtual bool save(nlohmann::json& record, bool notifyListeners);
-	virtual void eraseNetwork(const uint64_t networkId);
-	virtual void eraseMember(const uint64_t networkId, const uint64_t memberId);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch);
-
-  protected:
-	std::string _path;
-	std::string _networksPath;
-	std::string _tracePath;
-	std::thread _onlineUpdateThread;
-	std::map<uint64_t, std::map<uint64_t, std::map<int64_t, InetAddress> > > _online;
-	std::mutex _online_l;
-	bool _running;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/controller/LFDB.cpp b/controller/LFDB.cpp
deleted file mode 100644
index 77fa8ffe1..000000000
--- a/controller/LFDB.cpp
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "LFDB.hpp"
-
-#include "../ext/cpp-httplib/httplib.h"
-#include "../osdep/OSUtils.hpp"
-
-#include <chrono>
-#include <iostream>
-#include <sstream>
-#include <thread>
-
-namespace ZeroTier {
-
-LFDB::LFDB(const Identity& myId, const char* path, const char* lfOwnerPrivate, const char* lfOwnerPublic, const char* lfNodeHost, int lfNodePort, bool storeOnlineState)
-	: DB()
-	, _myId(myId)
-	, _lfOwnerPrivate((lfOwnerPrivate) ? lfOwnerPrivate : "")
-	, _lfOwnerPublic((lfOwnerPublic) ? lfOwnerPublic : "")
-	, _lfNodeHost((lfNodeHost) ? lfNodeHost : "127.0.0.1")
-	, _lfNodePort(((lfNodePort > 0) && (lfNodePort < 65536)) ? lfNodePort : 9980)
-	, _running(true)
-	, _ready(false)
-	, _storeOnlineState(storeOnlineState)
-{
-	_syncThread = std::thread([this]() {
-		char controllerAddress[24];
-		const uint64_t controllerAddressInt = _myId.address().toInt();
-		_myId.address().toString(controllerAddress);
-		std::string networksSelectorName("com.zerotier.controller.lfdb:");
-		networksSelectorName.append(controllerAddress);
-		networksSelectorName.append("/network");
-
-		// LF record masking key is the first 32 bytes of SHA512(controller private key) in hex,
-		// hiding record values from anything but the controller or someone who has its key.
-		uint8_t sha512pk[64];
-		_myId.sha512PrivateKey(sha512pk);
-		char maskingKey[128];
-		Utils::hex(sha512pk, 32, maskingKey);
-
-		httplib::Client htcli(_lfNodeHost.c_str(), _lfNodePort);
-		int64_t timeRangeStart = 0;
-		while (_running.load()) {
-			{
-				std::lock_guard<std::mutex> sl(_state_l);
-				for (auto ns = _state.begin(); ns != _state.end(); ++ns) {
-					if (ns->second.dirty) {
-						nlohmann::json network;
-						if (get(ns->first, network)) {
-							nlohmann::json newrec, selector0;
-							selector0["Name"] = networksSelectorName;
-							selector0["Ordinal"] = ns->first;
-							newrec["Selectors"].push_back(selector0);
-							newrec["Value"] = network.dump();
-							newrec["OwnerPrivate"] = _lfOwnerPrivate;
-							newrec["MaskingKey"] = maskingKey;
-							newrec["PulseIfUnchanged"] = true;
-							try {
-								auto resp = htcli.Post("/makerecord", newrec.dump(), "application/json");
-								if (resp) {
-									if (resp->status == 200) {
-										ns->second.dirty = false;
-										// printf("SET network %.16llx %s\n",ns->first,resp->body.c_str());
-									}
-									else {
-										fprintf(stderr, "ERROR: LFDB: %d from node (create/update network): %s" ZT_EOL_S, resp->status, resp->body.c_str());
-									}
-								}
-								else {
-									fprintf(stderr, "ERROR: LFDB: node is offline" ZT_EOL_S);
-								}
-							}
-							catch (std::exception& e) {
-								fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (create/update network): %s" ZT_EOL_S, e.what());
-							}
-							catch (...) {
-								fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (create/update network): unknown exception" ZT_EOL_S);
-							}
-						}
-					}
-
-					for (auto ms = ns->second.members.begin(); ms != ns->second.members.end(); ++ms) {
-						if ((_storeOnlineState) && (ms->second.lastOnlineDirty) && (ms->second.lastOnlineAddress)) {
-							nlohmann::json newrec, selector0, selector1, selectors, ip;
-							char tmp[1024], tmp2[128];
-							OSUtils::ztsnprintf(tmp, sizeof(tmp), "com.zerotier.controller.lfdb:%s/network/%.16llx/online", controllerAddress, (unsigned long long)ns->first);
-							ms->second.lastOnlineAddress.toIpString(tmp2);
-							selector0["Name"] = tmp;
-							selector0["Ordinal"] = ms->first;
-							selector1["Name"] = tmp2;
-							selector1["Ordinal"] = 0;
-							selectors.push_back(selector0);
-							selectors.push_back(selector1);
-							newrec["Selectors"] = selectors;
-							const uint8_t* const rawip = (const uint8_t*)ms->second.lastOnlineAddress.rawIpData();
-							switch (ms->second.lastOnlineAddress.ss_family) {
-								case AF_INET:
-									for (int j = 0; j < 4; ++j)
-										ip.push_back((unsigned int)rawip[j]);
-									break;
-								case AF_INET6:
-									for (int j = 0; j < 16; ++j)
-										ip.push_back((unsigned int)rawip[j]);
-									break;
-								default:
-									ip = tmp2;	 // should never happen since only IP transport is currently supported
-									break;
-							}
-							newrec["Value"] = ip;
-							newrec["OwnerPrivate"] = _lfOwnerPrivate;
-							newrec["MaskingKey"] = maskingKey;
-							newrec["Timestamp"] = ms->second.lastOnlineTime;
-							newrec["PulseIfUnchanged"] = true;
-							try {
-								auto resp = htcli.Post("/makerecord", newrec.dump(), "application/json");
-								if (resp) {
-									if (resp->status == 200) {
-										ms->second.lastOnlineDirty = false;
-										// printf("SET member online %.16llx %.10llx %s\n",ns->first,ms->first,resp->body.c_str());
-									}
-									else {
-										fprintf(stderr, "ERROR: LFDB: %d from node (create/update member online status): %s" ZT_EOL_S, resp->status, resp->body.c_str());
-									}
-								}
-								else {
-									fprintf(stderr, "ERROR: LFDB: node is offline" ZT_EOL_S);
-								}
-							}
-							catch (std::exception& e) {
-								fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (create/update member online status): %s" ZT_EOL_S, e.what());
-							}
-							catch (...) {
-								fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (create/update member online status): unknown exception" ZT_EOL_S);
-							}
-						}
-
-						if (ms->second.dirty) {
-							nlohmann::json network, member;
-							if (get(ns->first, network, ms->first, member)) {
-								nlohmann::json newrec, selector0, selector1, selectors;
-								selector0["Name"] = networksSelectorName;
-								selector0["Ordinal"] = ns->first;
-								selector1["Name"] = "member";
-								selector1["Ordinal"] = ms->first;
-								selectors.push_back(selector0);
-								selectors.push_back(selector1);
-								newrec["Selectors"] = selectors;
-								newrec["Value"] = member.dump();
-								newrec["OwnerPrivate"] = _lfOwnerPrivate;
-								newrec["MaskingKey"] = maskingKey;
-								newrec["PulseIfUnchanged"] = true;
-								try {
-									auto resp = htcli.Post("/makerecord", newrec.dump(), "application/json");
-									if (resp) {
-										if (resp->status == 200) {
-											ms->second.dirty = false;
-											// printf("SET member %.16llx %.10llx %s\n",ns->first,ms->first,resp->body.c_str());
-										}
-										else {
-											fprintf(stderr, "ERROR: LFDB: %d from node (create/update member): %s" ZT_EOL_S, resp->status, resp->body.c_str());
-										}
-									}
-									else {
-										fprintf(stderr, "ERROR: LFDB: node is offline" ZT_EOL_S);
-									}
-								}
-								catch (std::exception& e) {
-									fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (create/update member): %s" ZT_EOL_S, e.what());
-								}
-								catch (...) {
-									fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (create/update member): unknown exception" ZT_EOL_S);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			try {
-				std::ostringstream query;
-				query << "{"
-						 "\"Ranges\":[{"
-						 "\"Name\":\""
-					  << networksSelectorName
-					  << "\","
-						 "\"Range\":[0,18446744073709551615]"
-						 "}],"
-						 "\"TimeRange\":["
-					  << timeRangeStart
-					  << ",9223372036854775807],"
-						 "\"MaskingKey\":\""
-					  << maskingKey
-					  << "\","
-						 "\"Owners\":[\""
-					  << _lfOwnerPublic
-					  << "\"]"
-						 "}";
-				auto resp = htcli.Post("/query", query.str(), "application/json");
-				if (resp) {
-					if (resp->status == 200) {
-						nlohmann::json results(OSUtils::jsonParse(resp->body));
-						if ((results.is_array()) && (! results.empty())) {
-							for (std::size_t ri = 0; ri < results.size(); ++ri) {
-								nlohmann::json& rset = results[ri];
-								if ((rset.is_array()) && (! rset.empty())) {
-									nlohmann::json& result = rset[0];
-									if (result.is_object()) {
-										nlohmann::json& record = result["Record"];
-										if (record.is_object()) {
-											const std::string recordValue = result["Value"];
-											// printf("GET network %s\n",recordValue.c_str());
-											nlohmann::json network(OSUtils::jsonParse(recordValue));
-											if (network.is_object()) {
-												const std::string idstr = network["id"];
-												const uint64_t id = Utils::hexStrToU64(idstr.c_str());
-												if ((id >> 24) == controllerAddressInt) {	// sanity check
-
-													nlohmann::json oldNetwork;
-													if ((timeRangeStart > 0) && (get(id, oldNetwork))) {
-														const uint64_t revision = network["revision"];
-														const uint64_t prevRevision = oldNetwork["revision"];
-														if (prevRevision < revision) {
-															_networkChanged(oldNetwork, network, timeRangeStart > 0);
-														}
-													}
-													else {
-														nlohmann::json nullJson;
-														_networkChanged(nullJson, network, timeRangeStart > 0);
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-					else {
-						fprintf(stderr, "ERROR: LFDB: %d from node (check for network updates): %s" ZT_EOL_S, resp->status, resp->body.c_str());
-					}
-				}
-				else {
-					fprintf(stderr, "ERROR: LFDB: node is offline" ZT_EOL_S);
-				}
-			}
-			catch (std::exception& e) {
-				fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (check for network updates): %s" ZT_EOL_S, e.what());
-			}
-			catch (...) {
-				fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (check for network updates): unknown exception" ZT_EOL_S);
-			}
-
-			try {
-				std::ostringstream query;
-				query << "{"
-						 "\"Ranges\":[{"
-						 "\"Name\":\""
-					  << networksSelectorName
-					  << "\","
-						 "\"Range\":[0,18446744073709551615]"
-						 "},{"
-						 "\"Name\":\"member\","
-						 "\"Range\":[0,18446744073709551615]"
-						 "}],"
-						 "\"TimeRange\":["
-					  << timeRangeStart
-					  << ",9223372036854775807],"
-						 "\"MaskingKey\":\""
-					  << maskingKey
-					  << "\","
-						 "\"Owners\":[\""
-					  << _lfOwnerPublic
-					  << "\"]"
-						 "}";
-				auto resp = htcli.Post("/query", query.str(), "application/json");
-				if (resp) {
-					if (resp->status == 200) {
-						nlohmann::json results(OSUtils::jsonParse(resp->body));
-						if ((results.is_array()) && (! results.empty())) {
-							for (std::size_t ri = 0; ri < results.size(); ++ri) {
-								nlohmann::json& rset = results[ri];
-								if ((rset.is_array()) && (! rset.empty())) {
-									nlohmann::json& result = rset[0];
-									if (result.is_object()) {
-										nlohmann::json& record = result["Record"];
-										if (record.is_object()) {
-											const std::string recordValue = result["Value"];
-											// printf("GET member %s\n",recordValue.c_str());
-											nlohmann::json member(OSUtils::jsonParse(recordValue));
-											if (member.is_object()) {
-												const std::string nwidstr = member["nwid"];
-												const std::string idstr = member["id"];
-												const uint64_t nwid = Utils::hexStrToU64(nwidstr.c_str());
-												const uint64_t id = Utils::hexStrToU64(idstr.c_str());
-												if ((id) && ((nwid >> 24) == controllerAddressInt)) {	// sanity check
-
-													nlohmann::json network, oldMember;
-													if ((timeRangeStart > 0) && (get(nwid, network, id, oldMember))) {
-														const uint64_t revision = member["revision"];
-														const uint64_t prevRevision = oldMember["revision"];
-														if (prevRevision < revision)
-															_memberChanged(oldMember, member, timeRangeStart > 0);
-													}
-													else if (hasNetwork(nwid)) {
-														nlohmann::json nullJson;
-														_memberChanged(nullJson, member, timeRangeStart > 0);
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-					else {
-						fprintf(stderr, "ERROR: LFDB: %d from node (check for member updates): %s" ZT_EOL_S, resp->status, resp->body.c_str());
-					}
-				}
-				else {
-					fprintf(stderr, "ERROR: LFDB: node is offline" ZT_EOL_S);
-				}
-			}
-			catch (std::exception& e) {
-				fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (check for member updates): %s" ZT_EOL_S, e.what());
-			}
-			catch (...) {
-				fprintf(stderr, "ERROR: LFDB: unexpected exception querying node (check for member updates): unknown exception" ZT_EOL_S);
-			}
-
-			timeRangeStart = time(nullptr) - 120;	// start next query 2m before now to avoid losing updates
-			_ready.store(true);
-
-			for (int k = 0; k < 4; ++k) {	// 2s delay between queries for remotely modified networks or members
-				if (! _running.load())
-					return;
-				std::this_thread::sleep_for(std::chrono::milliseconds(500));
-			}
-		}
-	});
-}
-
-LFDB::~LFDB()
-{
-	_running.store(false);
-	_syncThread.join();
-}
-
-bool LFDB::waitForReady()
-{
-	while (! _ready.load()) {
-		std::this_thread::sleep_for(std::chrono::milliseconds(500));
-	}
-	return true;
-}
-
-bool LFDB::isReady()
-{
-	return (_ready.load());
-}
-
-bool LFDB::save(nlohmann::json& record, bool notifyListeners)
-{
-	bool modified = false;
-	const std::string objtype = record["objtype"];
-	if (objtype == "network") {
-		const uint64_t nwid = OSUtils::jsonIntHex(record["id"], 0ULL);
-		if (nwid) {
-			nlohmann::json old;
-			get(nwid, old);
-			if ((! old.is_object()) || (! _compareRecords(old, record))) {
-				record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
-				_networkChanged(old, record, notifyListeners);
-				{
-					std::lock_guard<std::mutex> l(_state_l);
-					_state[nwid].dirty = true;
-				}
-				modified = true;
-			}
-		}
-	}
-	else if (objtype == "member") {
-		const uint64_t nwid = OSUtils::jsonIntHex(record["nwid"], 0ULL);
-		const uint64_t id = OSUtils::jsonIntHex(record["id"], 0ULL);
-		if ((id) && (nwid)) {
-			nlohmann::json network, old;
-			get(nwid, network, id, old);
-			if ((! old.is_object()) || (! _compareRecords(old, record))) {
-				record["revision"] = OSUtils::jsonInt(record["revision"], 0ULL) + 1ULL;
-				_memberChanged(old, record, notifyListeners);
-				{
-					std::lock_guard<std::mutex> l(_state_l);
-					_state[nwid].members[id].dirty = true;
-				}
-				modified = true;
-			}
-		}
-	}
-	return modified;
-}
-
-void LFDB::eraseNetwork(const uint64_t networkId)
-{
-	// TODO
-}
-
-void LFDB::eraseMember(const uint64_t networkId, const uint64_t memberId)
-{
-	// TODO
-}
-
-void LFDB::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch)
-{
-	std::lock_guard<std::mutex> l(_state_l);
-	auto nw = _state.find(networkId);
-	if (nw != _state.end()) {
-		auto m = nw->second.members.find(memberId);
-		if (m != nw->second.members.end()) {
-			m->second.lastOnlineTime = OSUtils::now();
-			if (physicalAddress)
-				m->second.lastOnlineAddress = physicalAddress;
-			m->second.lastOnlineDirty = true;
-		}
-	}
-}
-
-void LFDB::nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress)
-{
-	this->nodeIsOnline(networkId, memberId, physicalAddress, "unknown/unknown");
-}
-
-}	// namespace ZeroTier
diff --git a/controller/LFDB.hpp b/controller/LFDB.hpp
deleted file mode 100644
index 3632e483f..000000000
--- a/controller/LFDB.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_CONTROLLER_LFDB_HPP
-#define ZT_CONTROLLER_LFDB_HPP
-
-#include "DB.hpp"
-
-#include <atomic>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-
-namespace ZeroTier {
-
-/**
- * DB implementation for controller that stores data in LF
- */
-class LFDB : public DB {
-  public:
-	/**
-	 * @param myId This controller's identity
-	 * @param path Base path for ZeroTier node itself
-	 * @param lfOwnerPrivate LF owner private in PEM format
-	 * @param lfOwnerPublic LF owner public in @base62 format
-	 * @param lfNodeHost LF node host
-	 * @param lfNodePort LF node http (not https) port
-	 * @param storeOnlineState If true, store online/offline state and IP info in LF (a lot of data, only for private networks!)
-	 */
-	LFDB(const Identity& myId, const char* path, const char* lfOwnerPrivate, const char* lfOwnerPublic, const char* lfNodeHost, int lfNodePort, bool storeOnlineState);
-	virtual ~LFDB();
-
-	virtual bool waitForReady();
-	virtual bool isReady();
-	virtual bool save(nlohmann::json& record, bool notifyListeners);
-	virtual void eraseNetwork(const uint64_t networkId);
-	virtual void eraseMember(const uint64_t networkId, const uint64_t memberId);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress);
-	virtual void nodeIsOnline(const uint64_t networkId, const uint64_t memberId, const InetAddress& physicalAddress, const char* osArch);
-
-  protected:
-	const Identity _myId;
-
-	std::string _lfOwnerPrivate, _lfOwnerPublic;
-	std::string _lfNodeHost;
-	int _lfNodePort;
-
-	struct _MemberState {
-		_MemberState() : lastOnlineAddress(), lastOnlineTime(0), dirty(false), lastOnlineDirty(false)
-		{
-		}
-		InetAddress lastOnlineAddress;
-		int64_t lastOnlineTime;
-		bool dirty;
-		bool lastOnlineDirty;
-	};
-	struct _NetworkState {
-		_NetworkState() : members(), dirty(false)
-		{
-		}
-		std::unordered_map<uint64_t, _MemberState> members;
-		bool dirty;
-	};
-	std::unordered_map<uint64_t, _NetworkState> _state;
-	std::mutex _state_l;
-
-	std::atomic_bool _running;
-	std::atomic_bool _ready;
-	std::thread _syncThread;
-	bool _storeOnlineState;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp
deleted file mode 100644
index 3bc864601..000000000
--- a/controller/PostgreSQL.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-
-#include "PostgreSQL.hpp"
-
-#include <nlohmann/json.hpp>
-
-using namespace nlohmann;
-
-using namespace ZeroTier;
-
-#endif
\ No newline at end of file
diff --git a/controller/PostgreSQL.hpp b/controller/PostgreSQL.hpp
deleted file mode 100644
index 41f36e3c5..000000000
--- a/controller/PostgreSQL.hpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c)2025 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-
-#ifndef ZT_CONTROLLER_POSTGRESQL_HPP
-#define ZT_CONTROLLER_POSTGRESQL_HPP
-
-#include "ConnectionPool.hpp"
-#include "DB.hpp"
-#include "opentelemetry/trace/provider.h"
-
-#include <memory>
-#include <nlohmann/json.hpp>
-#include <pqxx/pqxx>
-
-namespace ZeroTier {
-
-extern "C" {
-typedef struct pg_conn PGconn;
-}
-
-class PostgresConnection : public Connection {
-  public:
-	virtual ~PostgresConnection()
-	{
-	}
-
-	std::shared_ptr<pqxx::connection> c;
-	int a;
-};
-
-class PostgresConnFactory : public ConnectionFactory {
-  public:
-	PostgresConnFactory(std::string& connString) : m_connString(connString)
-	{
-	}
-
-	virtual std::shared_ptr<Connection> create()
-	{
-		Metrics::conn_counter++;
-		auto c = std::shared_ptr<PostgresConnection>(new PostgresConnection());
-		c->c = std::make_shared<pqxx::connection>(m_connString);
-		return std::static_pointer_cast<Connection>(c);
-	}
-
-  private:
-	std::string m_connString;
-};
-
-template <typename T> class MemberNotificationReceiver : public pqxx::notification_receiver {
-  public:
-	MemberNotificationReceiver(T* p, pqxx::connection& c, const std::string& channel) : pqxx::notification_receiver(c, channel), _psql(p)
-	{
-		fprintf(stderr, "initialize MemberNotificationReceiver\n");
-	}
-
-	virtual ~MemberNotificationReceiver()
-	{
-		fprintf(stderr, "MemberNotificationReceiver destroyed\n");
-	}
-
-	virtual void operator()(const std::string& payload, int backendPid)
-	{
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("db_member_notification");
-		auto span = tracer->StartSpan("db_member_notification::operator()");
-		auto scope = tracer->WithActiveSpan(span);
-		span->SetAttribute("payload", payload);
-		span->SetAttribute("psqlReady", _psql->isReady());
-
-		fprintf(stderr, "Member Notification received: %s\n", payload.c_str());
-		Metrics::pgsql_mem_notification++;
-		nlohmann::json tmp(nlohmann::json::parse(payload));
-		nlohmann::json& ov = tmp["old_val"];
-		nlohmann::json& nv = tmp["new_val"];
-		nlohmann::json oldConfig, newConfig;
-		if (ov.is_object())
-			oldConfig = ov;
-		if (nv.is_object())
-			newConfig = nv;
-
-		if (oldConfig.is_object() && newConfig.is_object()) {
-			_psql->save(newConfig, _psql->isReady());
-			fprintf(stderr, "payload sent\n");
-		}
-		else if (newConfig.is_object() && ! oldConfig.is_object()) {
-			// new member
-			Metrics::member_count++;
-			_psql->save(newConfig, _psql->isReady());
-			fprintf(stderr, "new member payload sent\n");
-		}
-		else if (! newConfig.is_object() && oldConfig.is_object()) {
-			// member delete
-			uint64_t networkId = OSUtils::jsonIntHex(oldConfig["nwid"], 0ULL);
-			uint64_t memberId = OSUtils::jsonIntHex(oldConfig["id"], 0ULL);
-			if (memberId && networkId) {
-				_psql->eraseMember(networkId, memberId);
-				fprintf(stderr, "member delete payload sent\n");
-			}
-		}
-	}
-
-  private:
-	T* _psql;
-};
-
-template <typename T> class NetworkNotificationReceiver : public pqxx::notification_receiver {
-  public:
-	NetworkNotificationReceiver(T* p, pqxx::connection& c, const std::string& channel) : pqxx::notification_receiver(c, channel), _psql(p)
-	{
-		fprintf(stderr, "initialize NetworkrNotificationReceiver\n");
-	}
-
-	virtual ~NetworkNotificationReceiver()
-	{
-		fprintf(stderr, "NetworkNotificationReceiver destroyed\n");
-	};
-
-	virtual void operator()(const std::string& payload, int packend_pid)
-	{
-		auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-		auto tracer = provider->GetTracer("db_network_notification");
-		auto span = tracer->StartSpan("db_network_notification::operator()");
-		auto scope = tracer->WithActiveSpan(span);
-		span->SetAttribute("payload", payload);
-		span->SetAttribute("psqlReady", _psql->isReady());
-
-		fprintf(stderr, "Network Notification received: %s\n", payload.c_str());
-		Metrics::pgsql_net_notification++;
-		nlohmann::json tmp(nlohmann::json::parse(payload));
-
-		nlohmann::json& ov = tmp["old_val"];
-		nlohmann::json& nv = tmp["new_val"];
-		nlohmann::json oldConfig, newConfig;
-
-		if (ov.is_object())
-			oldConfig = ov;
-		if (nv.is_object())
-			newConfig = nv;
-
-		if (oldConfig.is_object() && newConfig.is_object()) {
-			std::string nwid = oldConfig["id"];
-			span->SetAttribute("action", "network_change");
-			span->SetAttribute("network_id", nwid);
-			_psql->save(newConfig, _psql->isReady());
-			fprintf(stderr, "payload sent\n");
-		}
-		else if (newConfig.is_object() && ! oldConfig.is_object()) {
-			std::string nwid = newConfig["id"];
-			span->SetAttribute("network_id", nwid);
-			span->SetAttribute("action", "new_network");
-			// new network
-			_psql->save(newConfig, _psql->isReady());
-			fprintf(stderr, "new network payload sent\n");
-		}
-		else if (! newConfig.is_object() && oldConfig.is_object()) {
-			// network delete
-			span->SetAttribute("action", "delete_network");
-			std::string nwid = oldConfig["id"];
-			span->SetAttribute("network_id", nwid);
-			uint64_t networkId = Utils::hexStrToU64(nwid.c_str());
-			span->SetAttribute("network_id_int", networkId);
-			if (networkId) {
-				_psql->eraseNetwork(networkId);
-				fprintf(stderr, "network delete payload sent\n");
-			}
-		}
-	}
-
-  private:
-	T* _psql;
-};
-
-struct NodeOnlineRecord {
-	uint64_t lastSeen;
-	InetAddress physicalAddress;
-	std::string osArch;
-};
-
-}	// namespace ZeroTier
-
-#endif	 // ZT_CONTROLLER_POSTGRESQL_HPP
-
-#endif	 // ZT_CONTROLLER_USE_LIBPQ
\ No newline at end of file
diff --git a/controller/README.md b/controller/README.md
index 41cfd3ff3..6989e98d9 100644
--- a/controller/README.md
+++ b/controller/README.md
@@ -1,55 +1,32 @@
-Network Controller Microservice
+Network Controller Implementation
 ======
 
-Every ZeroTier virtual network has a *network controller* responsible for admitting members to the network, issuing certificates, and issuing default configuration information.
+This folder contains code implementing the node/NetworkController.hpp interface to allow ZeroTier nodes to create and manage virtual networks.
 
-This is our reference controller implementation and is almost the same as the one we use to power our own hosted services at [my.zerotier.com](https://my.zerotier.com/). The only difference is the database backend used. 
+### Building
 
-Controller data is stored in JSON format under `controller.d` in the ZeroTier working directory. It can be copied, rsync'd, placed in `git`, etc. The files under `controller.d` should not be modified in place while the controller is running or data loss may result, and if they are edited directly take care not to save corrupt JSON since that can also lead to data loss when the controller is restarted. Going through the API is strongly preferred to directly modifying these files.
+By default this code is not built or included in the client. To build on Linux, BSD, or Mac add ZT_\ENABLE_\NETWORK_\CONTROLLER=1 to the make command line. You'll need the development headers for Sqlite3 installed. They ship as part of OSX and Xcode. On Linux or BSD you'll probably need to install a package.
 
-See the API section below for information about controlling the controller.
+### Running
 
-### Scalability and Reliability
+When started, a controller-enabled build of ZeroTier One will automatically create and initialize a *controller.db* in its home folder. This is where all the controller's data and persistent state lives.
 
-Controllers can in theory host up to 2^24 networks and serve many millions of devices (or more), but we recommend spreading large numbers of networks across many controllers for load balancing and fault tolerance reasons. Since the controller uses the filesystem as its data store we recommend fast filesystems and fast SSD drives for heavily loaded controllers.
+Since Sqlite3 supports multiple processes attached to the same database, it is safe to back up a running database with the command line *sqlite3* utility:
 
-Since ZeroTier nodes are mobile and do not need static IPs, implementing high availability fail-over for controllers is easy. Just replicate their working directories from master to backup and have something automatically fire up the backup if the master goes down. Modern orchestration tools like Nomad and Kubernetes can be of help here.
+    sqlite3 /path/to/controller.db .dump
 
-### Dockerizing Controllers
+In production ZeroTier runs this frequently and keeps many timestamped copies going back about a week. These are also backed up (encrypted) to Amazon S3 along with the rest of our data.
 
-ZeroTier network controllers can easily be run in Docker or other container systems. Since containers do not need to actually join networks, extra privilege options like "--device=/dev/net/tun --privileged" are not needed. You'll just need to map the local JSON API port of the running controller and allow it to access the Internet (over UDP/9993 at a minimum) so things can reach and query it.
+### Administrating
 
-### Upgrading from Older (1.1.14 or earlier) Versions
+See service/README.md for documentation on the JSON API presented by this network controller implementation. Also see *nodejs-zt1-client* for a NodeJS JavaScript interface.
 
-Older versions of this code used a SQLite database instead of in-filesystem JSON. A migration utility called `migrate-sqlite` is included here and *must* be used to migrate this data to the new format. If the controller is started with an old `controller.db` in its working directory it will terminate after printing an error to *stderr*. This is done to prevent "surprises" for those running DIY controllers using the old code.
+### Reliability
 
-The migration tool is written in nodeJS and can be used like this:
+Network controllers can go offline without affecting already-configured members of running networks. You just won't be able to change anything and new members will not be able to join.
 
-    cd migrate-sqlite
-    npm install
-    node migrate.js </path/to/controller.db> </path/to/controller.d>
+High-availability can be implemented through fail-over. A simple method involves making a frequent backup of the SQLite database (use the SQLite command line client to do this safely) and the network configuration master's working directory. Then, if the master goes down, another instance of it can rapidly be provisioned elsewhere. Since ZeroTier addresses are mobile, the new instance will quickly (usually no more than 30s) take over for the old one and service requests.
 
-### Network Controller API
+### Limits
 
-The controller API is hosted via the same JSON API endpoint that ZeroTier One uses for local control (usually at 127.0.0.1 port 9993). All controller options are routed under the `/controller` base path.
-
-The controller microservice itself does not implement any fine-grained access control. Access control is via the ZeroTier control interface itself and `authtoken.secret`. This can be sent as the `X-ZT1-Auth` HTTP header field or appended to the URL as `?auth=<token>`. Take care when doing the latter that request URLs are not being logged.
-
-While networks with any valid ID can be added to the controller's database, it will only actually work to control networks whose first 10 hex digits correspond with the network controller's ZeroTier ID. See [section 2.2.1 of the ZeroTier manual](https://zerotier.com/manual.shtml#2_2_1).
-
-The controller JSON API is *very* sensitive about types. Integers must be integers and strings strings, etc. Incorrect types may be ignored, set to default values, or set to undefined values.
-
-Full documentation of the Controller API can be found on our [documentation site](https://docs.zerotier.com/service/v1#tag/controller)
-
-### Prometheus Metrics
-
-Controller specific metrics are available from the `/metrics` endpoint.
-
-| Metric Name | Type | Description |
-| --- | --- | --- |
-| controller_network_count | Gauge | number of networks the controller is serving | 
-| controller_member_count | Gauge | number of network members the controller is serving |
-| controller_network_change_count | Counter | number of times a network configuration is changed |
-| controller_member_change_count | Counter | number of times a network member configuration is changed |
-| controller_member_auth_count | Counter | number of network member auths |
-| controller_member_deauth_count | Counter | number of network member deauths|
+A single network configuration master can administrate up to 2^24 (~16m) networks as per the ZeroTier protocol limit. There is no hard limit on the number of clients, though millions or more would impose significant CPU demands on a server. Optimizations could be implemented such as memoization/caching to reduce this.
diff --git a/controller/Redis.hpp b/controller/Redis.hpp
deleted file mode 100644
index c6845d517..000000000
--- a/controller/Redis.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ZT_CONTROLLER_REDIS_HPP
-#define ZT_CONTROLLER_REDIS_HPP
-
-#include <string>
-
-namespace ZeroTier {
-struct RedisConfig {
-	std::string hostname;
-	int port;
-	std::string password;
-	bool clusterMode;
-};
-}	// namespace ZeroTier
-
-#endif
\ No newline at end of file
diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp
new file mode 100644
index 000000000..bef9cfc16
--- /dev/null
+++ b/controller/SqliteNetworkController.cpp
@@ -0,0 +1,2159 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include <algorithm>
+#include <utility>
+#include <stdexcept>
+#include <set>
+
+#include "../include/ZeroTierOne.h"
+#include "../node/Constants.hpp"
+
+#include "../ext/json-parser/json.h"
+
+#include "SqliteNetworkController.hpp"
+
+#include "../node/Node.hpp"
+#include "../node/Utils.hpp"
+#include "../node/CertificateOfMembership.hpp"
+#include "../node/NetworkConfig.hpp"
+#include "../node/InetAddress.hpp"
+#include "../node/MAC.hpp"
+#include "../node/Address.hpp"
+
+#include "../osdep/OSUtils.hpp"
+
+// Include ZT_NETCONF_SCHEMA_SQL constant to init database
+#include "schema.sql.c"
+
+// Stored in database as schemaVersion key in Config.
+// If not present, database is assumed to be empty and at the current schema version
+// and this key/value is added automatically.
+#define ZT_NETCONF_SQLITE_SCHEMA_VERSION 2
+#define ZT_NETCONF_SQLITE_SCHEMA_VERSION_STR "2"
+
+// API version reported via JSON control plane
+#define ZT_NETCONF_CONTROLLER_API_VERSION 1
+
+// Min duration between requests for an address/nwid combo to prevent floods
+#define ZT_NETCONF_MIN_REQUEST_PERIOD 1000
+
+// Delay between backups in milliseconds
+#define ZT_NETCONF_BACKUP_PERIOD 300000
+
+// Number of NodeHistory entries to maintain per node and network (can be changed)
+#define ZT_NETCONF_NODE_HISTORY_LENGTH 64
+
+// Nodes are considered active if they've queried in less than this long
+#define ZT_NETCONF_NODE_ACTIVE_THRESHOLD ((ZT_NETWORK_AUTOCONF_DELAY * 2) + 5000)
+
+namespace ZeroTier {
+
+namespace {
+
+static std::string _jsonEscape(const char *s)
+{
+	if (!s)
+		return std::string();
+	std::string buf;
+	for(const char *p=s;(*p);++p) {
+		switch(*p) {
+			case '\t': buf.append("\\t");  break;
+			case '\b': buf.append("\\b");  break;
+			case '\r': buf.append("\\r");  break;
+			case '\n': buf.append("\\n");  break;
+			case '\f': buf.append("\\f");  break;
+			case '"':  buf.append("\\\""); break;
+			case '\\': buf.append("\\\\"); break;
+			case '/':  buf.append("\\/");  break;
+			default:   buf.push_back(*p);  break;
+		}
+	}
+	return buf;
+}
+static std::string _jsonEscape(const std::string &s) { return _jsonEscape(s.c_str()); }
+
+struct MemberRecord {
+	int64_t rowid;
+	char nodeId[16];
+	bool authorized;
+	bool activeBridge;
+};
+
+struct NetworkRecord {
+	char id[24];
+	const char *name;
+	const char *v4AssignMode;
+	const char *v6AssignMode;
+	bool isPrivate;
+	bool enableBroadcast;
+	bool allowPassiveBridging;
+	int multicastLimit;
+	uint64_t creationTime;
+	uint64_t revision;
+	uint64_t memberRevisionCounter;
+};
+
+} // anonymous namespace
+
+SqliteNetworkController::SqliteNetworkController(Node *node,const char *dbPath,const char *circuitTestPath) :
+	_node(node),
+	_backupThreadRun(true),
+	_dbPath(dbPath),
+	_circuitTestPath(circuitTestPath),
+	_db((sqlite3 *)0)
+{
+	if (sqlite3_open_v2(dbPath,&_db,SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE,(const char *)0) != SQLITE_OK)
+		throw std::runtime_error("SqliteNetworkController cannot open database file");
+	sqlite3_busy_timeout(_db,10000);
+
+	sqlite3_exec(_db,"PRAGMA synchronous = OFF",0,0,0);
+	sqlite3_exec(_db,"PRAGMA journal_mode = MEMORY",0,0,0);
+
+	sqlite3_stmt *s = (sqlite3_stmt *)0;
+	if ((sqlite3_prepare_v2(_db,"SELECT v FROM Config WHERE k = 'schemaVersion';",-1,&s,(const char **)0) == SQLITE_OK)&&(s)) {
+		int schemaVersion = -1234;
+		if (sqlite3_step(s) == SQLITE_ROW) {
+			schemaVersion = sqlite3_column_int(s,0);
+		}
+
+		sqlite3_finalize(s);
+
+		if (schemaVersion == -1234) {
+			sqlite3_close(_db);
+			throw std::runtime_error("SqliteNetworkController schemaVersion not found in Config table (init failure?)");
+		} else if (schemaVersion == 1) {
+			// Create NodeHistory table to upgrade from version 1 to version 2
+			if (sqlite3_exec(_db,
+					"CREATE TABLE NodeHistory (\n"
+					"  nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,\n"
+					"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"
+					"  networkVisitCounter INTEGER NOT NULL DEFAULT(0),\n"
+					"  networkRequestAuthorized INTEGER NOT NULL DEFAULT(0),\n"
+					"  requestTime INTEGER NOT NULL DEFAULT(0),\n"
+					"  clientMajorVersion INTEGER NOT NULL DEFAULT(0),\n"
+					"  clientMinorVersion INTEGER NOT NULL DEFAULT(0),\n"
+					"  clientRevision INTEGER NOT NULL DEFAULT(0),\n"
+					"  networkRequestMetaData VARCHAR(1024),\n"
+					"  fromAddress VARCHAR(128)\n"
+					");\n"
+					"\n"
+					"CREATE INDEX NodeHistory_nodeId ON NodeHistory (nodeId);\n"
+					"CREATE INDEX NodeHistory_networkId ON NodeHistory (networkId);\n"
+					"CREATE INDEX NodeHistory_requestTime ON NodeHistory (requestTime);\n"
+					"\n"
+					"UPDATE \"Config\" SET \"v\" = 2 WHERE \"k\" = 'schemaVersion';\n"
+				,0,0,0) != SQLITE_OK) {
+				char err[1024];
+				Utils::snprintf(err,sizeof(err),"SqliteNetworkController cannot upgrade the database to version 2: %s",sqlite3_errmsg(_db));
+				sqlite3_close(_db);
+				throw std::runtime_error(err);
+			}
+		} else if (schemaVersion != ZT_NETCONF_SQLITE_SCHEMA_VERSION) {
+			sqlite3_close(_db);
+			throw std::runtime_error("SqliteNetworkController database schema version mismatch");
+		}
+	} else {
+		// Prepare statement will fail if Config table doesn't exist, which means our DB
+		// needs to be initialized.
+		if (sqlite3_exec(_db,ZT_NETCONF_SCHEMA_SQL"INSERT INTO Config (k,v) VALUES ('schemaVersion',"ZT_NETCONF_SQLITE_SCHEMA_VERSION_STR");",0,0,0) != SQLITE_OK) {
+			char err[1024];
+			Utils::snprintf(err,sizeof(err),"SqliteNetworkController cannot initialize database and/or insert schemaVersion into Config table: %s",sqlite3_errmsg(_db));
+			sqlite3_close(_db);
+			throw std::runtime_error(err);
+		}
+	}
+
+	if (
+
+			/* Network */
+			  (sqlite3_prepare_v2(_db,"SELECT name,private,enableBroadcast,allowPassiveBridging,v4AssignMode,v6AssignMode,multicastLimit,creationTime,revision,memberRevisionCounter,(SELECT COUNT(1) FROM Member WHERE Member.networkId = Network.id AND Member.authorized > 0) FROM Network WHERE id = ?",-1,&_sGetNetworkById,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT revision FROM Network WHERE id = ?",-1,&_sGetNetworkRevision,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"UPDATE Network SET revision = ? WHERE id = ?",-1,&_sSetNetworkRevision,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT INTO Network (id,name,creationTime,revision) VALUES (?,?,?,1)",-1,&_sCreateNetwork,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM Network WHERE id = ?",-1,&_sDeleteNetwork,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT id FROM Network ORDER BY id ASC",-1,&_sListNetworks,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"UPDATE Network SET memberRevisionCounter = (memberRevisionCounter + 1) WHERE id = ?",-1,&_sIncrementMemberRevisionCounter,(const char **)0) != SQLITE_OK)
+
+			/* Node */
+			||(sqlite3_prepare_v2(_db,"SELECT identity FROM Node WHERE id = ?",-1,&_sGetNodeIdentity,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT OR REPLACE INTO Node (id,identity) VALUES (?,?)",-1,&_sCreateOrReplaceNode,(const char **)0) != SQLITE_OK)
+
+			/* NodeHistory */
+			||(sqlite3_prepare_v2(_db,"SELECT IFNULL(MAX(networkVisitCounter),0) FROM NodeHistory WHERE networkId = ? AND nodeId = ?",-1,&_sGetMaxNodeHistoryNetworkVisitCounter,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT INTO NodeHistory (nodeId,networkId,networkVisitCounter,networkRequestAuthorized,requestTime,clientMajorVersion,clientMinorVersion,clientRevision,networkRequestMetaData,fromAddress) VALUES (?,?,?,?,?,?,?,?,?,?)",-1,&_sAddNodeHistoryEntry,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM NodeHistory WHERE networkId = ? AND nodeId = ? AND networkVisitCounter <= ?",-1,&_sDeleteOldNodeHistoryEntries,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT nodeId,requestTime,clientMajorVersion,clientMinorVersion,clientRevision,fromAddress,networkRequestAuthorized FROM NodeHistory WHERE networkId = ? AND requestTime IN (SELECT MAX(requestTime) FROM NodeHistory WHERE networkId = ? AND requestTime >= ? GROUP BY nodeId) ORDER BY nodeId ASC,requestTime DESC",-1,&_sGetActiveNodesOnNetwork,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT networkVisitCounter,networkRequestAuthorized,requestTime,clientMajorVersion,clientMinorVersion,clientRevision,networkRequestMetaData,fromAddress FROM NodeHistory WHERE networkId = ? AND nodeId = ? ORDER BY requestTime DESC",-1,&_sGetNodeHistory,(const char **)0) != SQLITE_OK)
+
+			/* Rule */
+			||(sqlite3_prepare_v2(_db,"SELECT etherType FROM Rule WHERE networkId = ? AND \"action\" = 'accept'",-1,&_sGetEtherTypesFromRuleTable,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT INTO Rule (networkId,ruleNo,nodeId,sourcePort,destPort,vlanId,vlanPcP,etherType,macSource,macDest,ipSource,ipDest,ipTos,ipProtocol,ipSourcePort,ipDestPort,flags,invFlags,\"action\") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",-1,&_sCreateRule,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT ruleNo,nodeId,sourcePort,destPort,vlanId,vlanPcp,etherType,macSource,macDest,ipSource,ipDest,ipTos,ipProtocol,ipSourcePort,ipDestPort,\"flags\",invFlags,\"action\" FROM Rule WHERE networkId = ? ORDER BY ruleNo ASC",-1,&_sListRules,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM Rule WHERE networkId = ?",-1,&_sDeleteRulesForNetwork,(const char **)0) != SQLITE_OK)
+
+			/* IpAssignmentPool */
+			||(sqlite3_prepare_v2(_db,"SELECT ipRangeStart,ipRangeEnd FROM IpAssignmentPool WHERE networkId = ? AND ipVersion = ?",-1,&_sGetIpAssignmentPools,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT ipRangeStart,ipRangeEnd,ipVersion FROM IpAssignmentPool WHERE networkId = ? ORDER BY ipRangeStart ASC",-1,&_sGetIpAssignmentPools2,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT INTO IpAssignmentPool (networkId,ipRangeStart,ipRangeEnd,ipVersion) VALUES (?,?,?,?)",-1,&_sCreateIpAssignmentPool,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM IpAssignmentPool WHERE networkId = ?",-1,&_sDeleteIpAssignmentPoolsForNetwork,(const char **)0) != SQLITE_OK)
+
+			/* IpAssignment */
+			||(sqlite3_prepare_v2(_db,"SELECT \"type\",ip,ipNetmaskBits FROM IpAssignment WHERE networkId = ? AND (nodeId = ? OR nodeId IS NULL) AND ipVersion = ?",-1,&_sGetIpAssignmentsForNode,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT ip,ipNetmaskBits,ipVersion FROM IpAssignment WHERE networkId = ? AND nodeId = ? AND \"type\" = ? ORDER BY ip ASC",-1,&_sGetIpAssignmentsForNode2,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT ip,ipNetmaskBits,ipVersion FROM IpAssignment WHERE networkId = ? AND nodeId IS NULL AND \"type\" = ?",-1,&_sGetLocalRoutes,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT 1 FROM IpAssignment WHERE networkId = ? AND ip = ? AND ipVersion = ? AND \"type\" = ?",-1,&_sCheckIfIpIsAllocated,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT INTO IpAssignment (networkId,nodeId,\"type\",ip,ipNetmaskBits,ipVersion) VALUES (?,?,?,?,?,?)",-1,&_sAllocateIp,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM IpAssignment WHERE networkId = ? AND nodeId = ? AND \"type\" = ?",-1,&_sDeleteIpAllocations,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM IpAssignment WHERE networkId = ? AND nodeId IS NULL AND \"type\" = ?",-1,&_sDeleteLocalRoutes,(const char **)0) != SQLITE_OK)
+
+			/* Relay */
+			||(sqlite3_prepare_v2(_db,"SELECT \"address\",\"phyAddress\" FROM Relay WHERE \"networkId\" = ? ORDER BY \"address\" ASC",-1,&_sGetRelays,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM Relay WHERE networkId = ?",-1,&_sDeleteRelaysForNetwork,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT INTO Relay (\"networkId\",\"address\",\"phyAddress\") VALUES (?,?,?)",-1,&_sCreateRelay,(const char **)0) != SQLITE_OK)
+
+			/* Member */
+			||(sqlite3_prepare_v2(_db,"SELECT rowid,authorized,activeBridge FROM Member WHERE networkId = ? AND nodeId = ?",-1,&_sGetMember,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT m.authorized,m.activeBridge,m.memberRevision,n.identity FROM Member AS m LEFT OUTER JOIN Node AS n ON n.id = m.nodeId WHERE m.networkId = ? AND m.nodeId = ?",-1,&_sGetMember2,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT INTO Member (networkId,nodeId,authorized,activeBridge,memberRevision) VALUES (?,?,?,0,(SELECT memberRevisionCounter FROM Network WHERE id = ?))",-1,&_sCreateMember,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT nodeId FROM Member WHERE networkId = ? AND activeBridge > 0 AND authorized > 0",-1,&_sGetActiveBridges,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"SELECT m.nodeId,m.memberRevision FROM Member AS m WHERE m.networkId = ? ORDER BY m.nodeId ASC",-1,&_sListNetworkMembers,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"UPDATE Member SET authorized = ?,memberRevision = (SELECT memberRevisionCounter FROM Network WHERE id = ?) WHERE rowid = ?",-1,&_sUpdateMemberAuthorized,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"UPDATE Member SET activeBridge = ?,memberRevision = (SELECT memberRevisionCounter FROM Network WHERE id = ?) WHERE rowid = ?",-1,&_sUpdateMemberActiveBridge,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM Member WHERE networkId = ? AND nodeId = ?",-1,&_sDeleteMember,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM Member WHERE networkId = ?",-1,&_sDeleteAllNetworkMembers,(const char **)0) != SQLITE_OK)
+
+			/* Gateway */
+			||(sqlite3_prepare_v2(_db,"SELECT \"ip\",ipVersion,metric FROM Gateway WHERE networkId = ? ORDER BY metric ASC",-1,&_sGetGateways,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"DELETE FROM Gateway WHERE networkId = ?",-1,&_sDeleteGateways,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT INTO Gateway (networkId,\"ip\",ipVersion,metric) VALUES (?,?,?,?)",-1,&_sCreateGateway,(const char **)0) != SQLITE_OK)
+
+			/* Config */
+			||(sqlite3_prepare_v2(_db,"SELECT \"v\" FROM \"Config\" WHERE \"k\" = ?",-1,&_sGetConfig,(const char **)0) != SQLITE_OK)
+			||(sqlite3_prepare_v2(_db,"INSERT OR REPLACE INTO \"Config\" (\"k\",\"v\") VALUES (?,?)",-1,&_sSetConfig,(const char **)0) != SQLITE_OK)
+
+		 ) {
+		std::string err(std::string("SqliteNetworkController unable to initialize one or more prepared statements: ") + sqlite3_errmsg(_db));
+		sqlite3_close(_db);
+		throw std::runtime_error(err);
+	}
+
+	/* Generate a 128-bit / 32-character "instance ID" if one isn't already
+	 * defined. Clients can use this to determine if this is the same controller
+	 * database they know and love. */
+	sqlite3_reset(_sGetConfig);
+	sqlite3_bind_text(_sGetConfig,1,"instanceId",10,SQLITE_STATIC);
+	if (sqlite3_step(_sGetConfig) != SQLITE_ROW) {
+		unsigned char sr[32];
+		Utils::getSecureRandom(sr,32);
+		for(unsigned int i=0;i<32;++i)
+			_instanceId.push_back("0123456789abcdef"[(unsigned int)sr[i] & 0xf]);
+
+		sqlite3_reset(_sSetConfig);
+		sqlite3_bind_text(_sSetConfig,1,"instanceId",10,SQLITE_STATIC);
+		sqlite3_bind_text(_sSetConfig,2,_instanceId.c_str(),-1,SQLITE_STATIC);
+		if (sqlite3_step(_sSetConfig) != SQLITE_DONE)
+			throw std::runtime_error("SqliteNetworkController unable to read or initialize instanceId");
+	} else {
+		const char *iid = reinterpret_cast<const char *>(sqlite3_column_text(_sGetConfig,0));
+		if (!iid)
+			throw std::runtime_error("SqliteNetworkController unable to read instanceId (it's NULL)");
+		_instanceId = iid;
+	}
+
+	_backupThread = Thread::start(this);
+}
+
+SqliteNetworkController::~SqliteNetworkController()
+{
+	_backupThreadRun = false;
+	Thread::join(_backupThread);
+
+	Mutex::Lock _l(_lock);
+	if (_db) {
+		sqlite3_finalize(_sGetNetworkById);
+		sqlite3_finalize(_sGetMember);
+		sqlite3_finalize(_sCreateMember);
+		sqlite3_finalize(_sGetNodeIdentity);
+		sqlite3_finalize(_sCreateOrReplaceNode);
+		sqlite3_finalize(_sGetMaxNodeHistoryNetworkVisitCounter);
+		sqlite3_finalize(_sAddNodeHistoryEntry);
+		sqlite3_finalize(_sDeleteOldNodeHistoryEntries);
+		sqlite3_finalize(_sGetActiveNodesOnNetwork);
+		sqlite3_finalize(_sGetNodeHistory);
+		sqlite3_finalize(_sGetEtherTypesFromRuleTable);
+		sqlite3_finalize(_sGetActiveBridges);
+		sqlite3_finalize(_sGetIpAssignmentsForNode);
+		sqlite3_finalize(_sGetIpAssignmentPools);
+		sqlite3_finalize(_sGetLocalRoutes);
+		sqlite3_finalize(_sCheckIfIpIsAllocated);
+		sqlite3_finalize(_sAllocateIp);
+		sqlite3_finalize(_sDeleteIpAllocations);
+		sqlite3_finalize(_sDeleteLocalRoutes);
+		sqlite3_finalize(_sGetRelays);
+		sqlite3_finalize(_sListNetworks);
+		sqlite3_finalize(_sListNetworkMembers);
+		sqlite3_finalize(_sGetMember2);
+		sqlite3_finalize(_sGetIpAssignmentPools2);
+		sqlite3_finalize(_sListRules);
+		sqlite3_finalize(_sCreateRule);
+		sqlite3_finalize(_sCreateNetwork);
+		sqlite3_finalize(_sGetNetworkRevision);
+		sqlite3_finalize(_sSetNetworkRevision);
+		sqlite3_finalize(_sGetIpAssignmentsForNode2);
+		sqlite3_finalize(_sDeleteRelaysForNetwork);
+		sqlite3_finalize(_sCreateRelay);
+		sqlite3_finalize(_sDeleteIpAssignmentPoolsForNetwork);
+		sqlite3_finalize(_sDeleteRulesForNetwork);
+		sqlite3_finalize(_sCreateIpAssignmentPool);
+		sqlite3_finalize(_sUpdateMemberAuthorized);
+		sqlite3_finalize(_sUpdateMemberActiveBridge);
+		sqlite3_finalize(_sDeleteMember);
+		sqlite3_finalize(_sDeleteAllNetworkMembers);
+		sqlite3_finalize(_sDeleteNetwork);
+		sqlite3_finalize(_sGetGateways);
+		sqlite3_finalize(_sDeleteGateways);
+		sqlite3_finalize(_sCreateGateway);
+		sqlite3_finalize(_sIncrementMemberRevisionCounter);
+		sqlite3_finalize(_sGetConfig);
+		sqlite3_finalize(_sSetConfig);
+		sqlite3_close(_db);
+	}
+}
+
+NetworkController::ResultCode SqliteNetworkController::doNetworkConfigRequest(const InetAddress &fromAddr,const Identity &signingId,const Identity &identity,uint64_t nwid,const Dictionary &metaData,Dictionary &netconf)
+{
+	Mutex::Lock _l(_lock);
+	return _doNetworkConfigRequest(fromAddr,signingId,identity,nwid,metaData,netconf);
+}
+
+unsigned int SqliteNetworkController::handleControlPlaneHttpGET(
+	const std::vector<std::string> &path,
+	const std::map<std::string,std::string> &urlArgs,
+	const std::map<std::string,std::string> &headers,
+	const std::string &body,
+	std::string &responseBody,
+	std::string &responseContentType)
+{
+	Mutex::Lock _l(_lock);
+	return _doCPGet(path,urlArgs,headers,body,responseBody,responseContentType);
+}
+
+unsigned int SqliteNetworkController::handleControlPlaneHttpPOST(
+	const std::vector<std::string> &path,
+	const std::map<std::string,std::string> &urlArgs,
+	const std::map<std::string,std::string> &headers,
+	const std::string &body,
+	std::string &responseBody,
+	std::string &responseContentType)
+{
+	if (path.empty())
+		return 404;
+	Mutex::Lock _l(_lock);
+
+	if (path[0] == "network") {
+
+		if ((path.size() >= 2)&&(path[1].length() == 16)) {
+			uint64_t nwid = Utils::hexStrToU64(path[1].c_str());
+			char nwids[24];
+			Utils::snprintf(nwids,sizeof(nwids),"%.16llx",(unsigned long long)nwid);
+
+			int64_t revision = 0;
+			sqlite3_reset(_sGetNetworkRevision);
+			sqlite3_bind_text(_sGetNetworkRevision,1,nwids,16,SQLITE_STATIC);
+			bool networkExists = false;
+			if (sqlite3_step(_sGetNetworkRevision) == SQLITE_ROW) {
+				networkExists = true;
+				revision = sqlite3_column_int64(_sGetNetworkRevision,0);
+			}
+
+			if (path.size() >= 3) {
+
+				if (!networkExists)
+					return 404;
+
+				if ((path.size() == 4)&&(path[2] == "member")&&(path[3].length() == 10)) {
+					uint64_t address = Utils::hexStrToU64(path[3].c_str());
+					char addrs[24];
+					Utils::snprintf(addrs,sizeof(addrs),"%.10llx",address);
+
+					int64_t addToNetworkRevision = 0;
+
+					int64_t memberRowId = 0;
+					sqlite3_reset(_sGetMember);
+					sqlite3_bind_text(_sGetMember,1,nwids,16,SQLITE_STATIC);
+					sqlite3_bind_text(_sGetMember,2,addrs,10,SQLITE_STATIC);
+					bool memberExists = false;
+					if (sqlite3_step(_sGetMember) == SQLITE_ROW) {
+						memberExists = true;
+						memberRowId = sqlite3_column_int64(_sGetMember,0);
+					}
+
+					if (!memberExists) {
+						sqlite3_reset(_sCreateMember);
+						sqlite3_bind_text(_sCreateMember,1,nwids,16,SQLITE_STATIC);
+						sqlite3_bind_text(_sCreateMember,2,addrs,10,SQLITE_STATIC);
+						sqlite3_bind_int(_sCreateMember,3,0);
+						sqlite3_bind_text(_sCreateMember,4,nwids,16,SQLITE_STATIC);
+						if (sqlite3_step(_sCreateMember) != SQLITE_DONE)
+							return 500;
+						memberRowId = (int64_t)sqlite3_last_insert_rowid(_db);
+
+						sqlite3_reset(_sIncrementMemberRevisionCounter);
+						sqlite3_bind_text(_sIncrementMemberRevisionCounter,1,nwids,16,SQLITE_STATIC);
+						sqlite3_step(_sIncrementMemberRevisionCounter);
+						addToNetworkRevision = 1;
+					}
+
+					json_value *j = json_parse(body.c_str(),body.length());
+					if (j) {
+						if (j->type == json_object) {
+							for(unsigned int k=0;k<j->u.object.length;++k) {
+
+								if (!strcmp(j->u.object.values[k].name,"authorized")) {
+									if (j->u.object.values[k].value->type == json_boolean) {
+										sqlite3_reset(_sUpdateMemberAuthorized);
+										sqlite3_bind_int(_sUpdateMemberAuthorized,1,(j->u.object.values[k].value->u.boolean == 0) ? 0 : 1);
+										sqlite3_bind_text(_sUpdateMemberAuthorized,2,nwids,16,SQLITE_STATIC);
+										sqlite3_bind_int64(_sUpdateMemberAuthorized,3,memberRowId);
+										if (sqlite3_step(_sUpdateMemberAuthorized) != SQLITE_DONE)
+											return 500;
+
+										sqlite3_reset(_sIncrementMemberRevisionCounter);
+										sqlite3_bind_text(_sIncrementMemberRevisionCounter,1,nwids,16,SQLITE_STATIC);
+										sqlite3_step(_sIncrementMemberRevisionCounter);
+										addToNetworkRevision = 1;
+									}
+								} else if (!strcmp(j->u.object.values[k].name,"activeBridge")) {
+									if (j->u.object.values[k].value->type == json_boolean) {
+										sqlite3_reset(_sUpdateMemberActiveBridge);
+										sqlite3_bind_int(_sUpdateMemberActiveBridge,1,(j->u.object.values[k].value->u.boolean == 0) ? 0 : 1);
+										sqlite3_bind_text(_sUpdateMemberActiveBridge,2,nwids,16,SQLITE_STATIC);
+										sqlite3_bind_int64(_sUpdateMemberActiveBridge,3,memberRowId);
+										if (sqlite3_step(_sUpdateMemberActiveBridge) != SQLITE_DONE)
+											return 500;
+
+										sqlite3_reset(_sIncrementMemberRevisionCounter);
+										sqlite3_bind_text(_sIncrementMemberRevisionCounter,1,nwids,16,SQLITE_STATIC);
+										sqlite3_step(_sIncrementMemberRevisionCounter);
+										addToNetworkRevision = 1;
+									}
+								} else if (!strcmp(j->u.object.values[k].name,"ipAssignments")) {
+									if (j->u.object.values[k].value->type == json_array) {
+										sqlite3_reset(_sDeleteIpAllocations);
+										sqlite3_bind_text(_sDeleteIpAllocations,1,nwids,16,SQLITE_STATIC);
+										sqlite3_bind_text(_sDeleteIpAllocations,2,addrs,10,SQLITE_STATIC);
+										sqlite3_bind_int(_sDeleteIpAllocations,3,(int)ZT_IP_ASSIGNMENT_TYPE_ADDRESS);
+										if (sqlite3_step(_sDeleteIpAllocations) != SQLITE_DONE)
+											return 500;
+										for(unsigned int kk=0;kk<j->u.object.values[k].value->u.array.length;++kk) {
+											json_value *ipalloc = j->u.object.values[k].value->u.array.values[kk];
+											if (ipalloc->type == json_string) {
+												InetAddress a(ipalloc->u.string.ptr);
+												char ipBlob[16];
+												int ipVersion = 0;
+												switch(a.ss_family) {
+													case AF_INET:
+														if ((a.netmaskBits() > 0)&&(a.netmaskBits() <= 32)) {
+															memset(ipBlob,0,12);
+															memcpy(ipBlob + 12,a.rawIpData(),4);
+															ipVersion = 4;
+														}
+														break;
+													case AF_INET6:
+														if ((a.netmaskBits() > 0)&&(a.netmaskBits() <= 128)) {
+															memcpy(ipBlob,a.rawIpData(),16);
+															ipVersion = 6;
+														}
+														break;
+												}
+												if (ipVersion > 0) {
+													sqlite3_reset(_sAllocateIp);
+													sqlite3_bind_text(_sAllocateIp,1,nwids,16,SQLITE_STATIC);
+													sqlite3_bind_text(_sAllocateIp,2,addrs,10,SQLITE_STATIC);
+													sqlite3_bind_int(_sAllocateIp,3,(int)ZT_IP_ASSIGNMENT_TYPE_ADDRESS);
+													sqlite3_bind_blob(_sAllocateIp,4,(const void *)ipBlob,16,SQLITE_STATIC);
+													sqlite3_bind_int(_sAllocateIp,5,(int)a.netmaskBits());
+													sqlite3_bind_int(_sAllocateIp,6,ipVersion);
+													if (sqlite3_step(_sAllocateIp) != SQLITE_DONE)
+														return 500;
+												}
+											}
+										}
+										addToNetworkRevision = 1;
+									}
+								} else if (!strcmp(j->u.object.values[k].name,"identity")) {
+									// Identity is technically an immutable field, but if the member's Node has
+									// no identity we allow it to be populated. This is primarily for migrating
+									// node data from another controller.
+									json_value *idstr = j->u.object.values[k].value;
+									if (idstr->type == json_string) {
+										bool alreadyHaveIdentity = false;
+
+										sqlite3_reset(_sGetNodeIdentity);
+										sqlite3_bind_text(_sGetNodeIdentity,1,addrs,10,SQLITE_STATIC);
+										if (sqlite3_step(_sGetNodeIdentity) == SQLITE_ROW) {
+											const char *tmp2 = (const char *)sqlite3_column_text(_sGetNodeIdentity,0);
+											if ((tmp2)&&(tmp2[0]))
+												alreadyHaveIdentity = true;
+										}
+
+										if (!alreadyHaveIdentity) {
+											try {
+												Identity id2(idstr->u.string.ptr);
+												if (id2) {
+													std::string idstr2(id2.toString(false)); // object must persist until after sqlite3_step() for SQLITE_STATIC
+													sqlite3_reset(_sCreateOrReplaceNode);
+													sqlite3_bind_text(_sCreateOrReplaceNode,1,addrs,10,SQLITE_STATIC);
+													sqlite3_bind_text(_sCreateOrReplaceNode,2,idstr2.c_str(),-1,SQLITE_STATIC);
+													sqlite3_step(_sCreateOrReplaceNode);
+												}
+											} catch ( ... ) {} // ignore invalid identities
+										}
+									}
+								}
+
+							}
+						}
+						json_value_free(j);
+					}
+
+					if ((addToNetworkRevision > 0)&&(revision > 0)) {
+						sqlite3_reset(_sSetNetworkRevision);
+						sqlite3_bind_int64(_sSetNetworkRevision,1,revision + addToNetworkRevision);
+						sqlite3_bind_text(_sSetNetworkRevision,2,nwids,16,SQLITE_STATIC);
+						sqlite3_step(_sSetNetworkRevision);
+					}
+
+					return _doCPGet(path,urlArgs,headers,body,responseBody,responseContentType);
+				} else if ((path.size() == 3)&&(path[2] == "test")) {
+					ZT_CircuitTest *test = (ZT_CircuitTest *)malloc(sizeof(ZT_CircuitTest));
+					memset(test,0,sizeof(ZT_CircuitTest));
+
+					Utils::getSecureRandom(&(test->testId),sizeof(test->testId));
+					test->credentialNetworkId = nwid;
+					test->ptr = (void *)this;
+
+					json_value *j = json_parse(body.c_str(),body.length());
+					if (j) {
+						if (j->type == json_object) {
+							for(unsigned int k=0;k<j->u.object.length;++k) {
+
+								if (!strcmp(j->u.object.values[k].name,"hops")) {
+									if (j->u.object.values[k].value->type == json_array) {
+										for(unsigned int kk=0;kk<j->u.object.values[k].value->u.array.length;++kk) {
+											json_value *hop = j->u.object.values[k].value->u.array.values[kk];
+											if (hop->type == json_array) {
+												for(unsigned int kkk=0;kkk<hop->u.array.length;++kkk) {
+													if (hop->u.array.values[kkk]->type == json_string) {
+														test->hops[test->hopCount].addresses[test->hops[test->hopCount].breadth++] = Utils::hexStrToU64(hop->u.array.values[kkk]->u.string.ptr) & 0xffffffffffULL;
+													}
+												}
+												++test->hopCount;
+											}
+										}
+									}
+								} else if (!strcmp(j->u.object.values[k].name,"reportAtEveryHop")) {
+									if (j->u.object.values[k].value->type == json_boolean)
+										test->reportAtEveryHop = (j->u.object.values[k].value->u.boolean == 0) ? 0 : 1;
+								}
+
+							}
+						}
+						json_value_free(j);
+					}
+
+					if (!test->hopCount) {
+						::free((void *)test);
+						return 500;
+					}
+
+					test->timestamp = OSUtils::now();
+
+					_CircuitTestEntry &te = _circuitTests[test->testId];
+					te.test = test;
+					te.jsonResults = "";
+
+					_node->circuitTestBegin(test,&(SqliteNetworkController::_circuitTestCallback));
+
+					char json[1024];
+					Utils::snprintf(json,sizeof(json),"{\"testId\":\"%.16llx\"}",test->testId);
+					responseBody = json;
+					responseContentType = "application/json";
+
+					return 200;
+				} // else 404
+
+			} else {
+				std::vector<std::string> path_copy(path);
+
+				if (!networkExists) {
+					if (path[1].substr(10) == "______") {
+						// A special POST /network/##########______ feature lets users create a network
+						// with an arbitrary unused network number at this controller.
+						nwid = 0;
+
+						uint64_t nwidPrefix = (Utils::hexStrToU64(path[1].substr(0,10).c_str()) << 24) & 0xffffffffff000000ULL;
+						uint64_t nwidPostfix = 0;
+						Utils::getSecureRandom(&nwidPostfix,sizeof(nwidPostfix));
+						uint64_t nwidOriginalPostfix = nwidPostfix;
+						do {
+							uint64_t tryNwid = nwidPrefix | (nwidPostfix & 0xffffffULL);
+							if (!nwidPostfix)
+								tryNwid |= 1;
+							Utils::snprintf(nwids,sizeof(nwids),"%.16llx",(unsigned long long)tryNwid);
+
+							sqlite3_reset(_sGetNetworkRevision);
+							sqlite3_bind_text(_sGetNetworkRevision,1,nwids,16,SQLITE_STATIC);
+							if (sqlite3_step(_sGetNetworkRevision) != SQLITE_ROW) {
+								nwid = tryNwid;
+								break;
+							}
+
+							++nwidPostfix;
+						} while (nwidPostfix != nwidOriginalPostfix);
+
+						// 503 means we have no more free IDs for this prefix. You shouldn't host anywhere
+						// near 16 million networks on the same controller, so shouldn't happen.
+						if (!nwid)
+							return 503;
+					}
+
+					sqlite3_reset(_sCreateNetwork);
+					sqlite3_bind_text(_sCreateNetwork,1,nwids,16,SQLITE_STATIC);
+					sqlite3_bind_text(_sCreateNetwork,2,"",0,SQLITE_STATIC);
+					sqlite3_bind_int64(_sCreateNetwork,3,(long long)OSUtils::now());
+					if (sqlite3_step(_sCreateNetwork) != SQLITE_DONE)
+						return 500;
+					path_copy[1].assign(nwids);
+				}
+
+				json_value *j = json_parse(body.c_str(),body.length());
+				if (j) {
+					if (j->type == json_object) {
+						for(unsigned int k=0;k<j->u.object.length;++k) {
+							sqlite3_stmt *stmt = (sqlite3_stmt *)0;
+
+							if (!strcmp(j->u.object.values[k].name,"name")) {
+								if ((j->u.object.values[k].value->type == json_string)&&(j->u.object.values[k].value->u.string.ptr[0])) {
+									if (sqlite3_prepare_v2(_db,"UPDATE Network SET \"name\" = ? WHERE id = ?",-1,&stmt,(const char **)0) == SQLITE_OK)
+										sqlite3_bind_text(stmt,1,j->u.object.values[k].value->u.string.ptr,-1,SQLITE_STATIC);
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"private")) {
+								if (j->u.object.values[k].value->type == json_boolean) {
+									if (sqlite3_prepare_v2(_db,"UPDATE Network SET \"private\" = ? WHERE id = ?",-1,&stmt,(const char **)0) == SQLITE_OK)
+										sqlite3_bind_int(stmt,1,(j->u.object.values[k].value->u.boolean == 0) ? 0 : 1);
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"enableBroadcast")) {
+								if (j->u.object.values[k].value->type == json_boolean) {
+									if (sqlite3_prepare_v2(_db,"UPDATE Network SET enableBroadcast = ? WHERE id = ?",-1,&stmt,(const char **)0) == SQLITE_OK)
+										sqlite3_bind_int(stmt,1,(j->u.object.values[k].value->u.boolean == 0) ? 0 : 1);
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"allowPassiveBridging")) {
+								if (j->u.object.values[k].value->type == json_boolean) {
+									if (sqlite3_prepare_v2(_db,"UPDATE Network SET allowPassiveBridging = ? WHERE id = ?",-1,&stmt,(const char **)0) == SQLITE_OK)
+										sqlite3_bind_int(stmt,1,(j->u.object.values[k].value->u.boolean == 0) ? 0 : 1);
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"v4AssignMode")) {
+								if (j->u.object.values[k].value->type == json_string) {
+									if (sqlite3_prepare_v2(_db,"UPDATE Network SET v4AssignMode = ? WHERE id = ?",-1,&stmt,(const char **)0) == SQLITE_OK)
+										sqlite3_bind_text(stmt,1,j->u.object.values[k].value->u.string.ptr,-1,SQLITE_STATIC);
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"v6AssignMode")) {
+								if (j->u.object.values[k].value->type == json_string) {
+									if (sqlite3_prepare_v2(_db,"UPDATE Network SET v6AssignMode = ? WHERE id = ?",-1,&stmt,(const char **)0) == SQLITE_OK)
+										sqlite3_bind_text(stmt,1,j->u.object.values[k].value->u.string.ptr,-1,SQLITE_STATIC);
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"multicastLimit")) {
+								if (j->u.object.values[k].value->type == json_integer) {
+									if (sqlite3_prepare_v2(_db,"UPDATE Network SET multicastLimit = ? WHERE id = ?",-1,&stmt,(const char **)0) == SQLITE_OK)
+										sqlite3_bind_int(stmt,1,(int)j->u.object.values[k].value->u.integer);
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"relays")) {
+								if (j->u.object.values[k].value->type == json_array) {
+									std::map<Address,InetAddress> nodeIdToPhyAddress;
+									for(unsigned int kk=0;kk<j->u.object.values[k].value->u.array.length;++kk) {
+										json_value *relay = j->u.object.values[k].value->u.array.values[kk];
+										const char *address = (const char *)0;
+										const char *phyAddress = (const char *)0;
+										if ((relay)&&(relay->type == json_object)) {
+											for(unsigned int rk=0;rk<relay->u.object.length;++rk) {
+												if ((!strcmp(relay->u.object.values[rk].name,"address"))&&(relay->u.object.values[rk].value->type == json_string))
+													address = relay->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(relay->u.object.values[rk].name,"phyAddress"))&&(relay->u.object.values[rk].value->type == json_string))
+													phyAddress = relay->u.object.values[rk].value->u.string.ptr;
+											}
+										}
+										if ((address)&&(phyAddress))
+											nodeIdToPhyAddress[Address(address)] = InetAddress(phyAddress);
+									}
+
+									sqlite3_reset(_sDeleteRelaysForNetwork);
+									sqlite3_bind_text(_sDeleteRelaysForNetwork,1,nwids,16,SQLITE_STATIC);
+									sqlite3_step(_sDeleteRelaysForNetwork);
+
+									for(std::map<Address,InetAddress>::iterator rl(nodeIdToPhyAddress.begin());rl!=nodeIdToPhyAddress.end();++rl) {
+										sqlite3_reset(_sCreateRelay);
+										sqlite3_bind_text(_sCreateRelay,1,nwids,16,SQLITE_STATIC);
+										std::string a(rl->first.toString()),b(rl->second.toString()); // don't destroy strings until sqlite3_step()
+										sqlite3_bind_text(_sCreateRelay,2,a.c_str(),-1,SQLITE_STATIC);
+										sqlite3_bind_text(_sCreateRelay,3,b.c_str(),-1,SQLITE_STATIC);
+										sqlite3_step(_sCreateRelay);
+									}
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"gateways")) {
+								sqlite3_reset(_sDeleteGateways);
+								sqlite3_bind_text(_sDeleteGateways,1,nwids,16,SQLITE_STATIC);
+								sqlite3_step(_sDeleteGateways);
+								if (j->u.object.values[k].value->type == json_array) {
+									for(unsigned int kk=0;kk<j->u.object.values[k].value->u.array.length;++kk) {
+										json_value *gateway = j->u.object.values[k].value->u.array.values[kk];
+										if ((gateway)&&(gateway->type == json_string)) {
+											InetAddress gwip(gateway->u.string.ptr);
+											sqlite3_reset(_sCreateGateway);
+											sqlite3_bind_text(_sCreateGateway,1,nwids,16,SQLITE_STATIC);
+											sqlite3_bind_int(_sCreateGateway,4,(int)gwip.metric());
+											if (gwip.ss_family == AF_INET) {
+												char ipBlob[16];
+												memset(ipBlob,0,12);
+												memcpy(ipBlob + 12,gwip.rawIpData(),4);
+												sqlite3_bind_blob(_sCreateGateway,2,(const void *)ipBlob,16,SQLITE_STATIC);
+												sqlite3_bind_int(_sCreateGateway,3,4);
+												sqlite3_step(_sCreateGateway);
+											} else if (gwip.ss_family == AF_INET6) {
+												sqlite3_bind_blob(_sCreateGateway,2,gwip.rawIpData(),16,SQLITE_STATIC);
+												sqlite3_bind_int(_sCreateGateway,3,6);
+												sqlite3_step(_sCreateGateway);
+											}
+										}
+									}
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"ipLocalRoutes")) {
+								sqlite3_reset(_sDeleteLocalRoutes);
+								sqlite3_bind_text(_sDeleteLocalRoutes,1,nwids,16,SQLITE_STATIC);
+								sqlite3_bind_int(_sDeleteLocalRoutes,2,(int)ZT_IP_ASSIGNMENT_TYPE_NETWORK);
+								sqlite3_step(_sDeleteLocalRoutes);
+								if (j->u.object.values[k].value->type == json_array) {
+									for(unsigned int kk=0;kk<j->u.object.values[k].value->u.array.length;++kk) {
+										json_value *localRoute = j->u.object.values[k].value->u.array.values[kk];
+										if ((localRoute)&&(localRoute->type == json_string)) {
+											InetAddress lr(localRoute->u.string.ptr);
+											if (lr.ss_family == AF_INET) {
+												char ipBlob[16];
+												memset(ipBlob,0,12);
+												memcpy(ipBlob + 12,lr.rawIpData(),4);
+												sqlite3_reset(_sAllocateIp);
+												sqlite3_bind_text(_sAllocateIp,1,nwids,16,SQLITE_STATIC);
+												sqlite3_bind_null(_sAllocateIp,2);
+												sqlite3_bind_int(_sAllocateIp,3,(int)ZT_IP_ASSIGNMENT_TYPE_NETWORK);
+												sqlite3_bind_blob(_sAllocateIp,4,(const void *)ipBlob,16,SQLITE_STATIC);
+												sqlite3_bind_int(_sAllocateIp,5,lr.netmaskBits());
+												sqlite3_bind_int(_sAllocateIp,6,4);
+												sqlite3_step(_sAllocateIp);
+											} else if (lr.ss_family == AF_INET6) {
+												sqlite3_reset(_sAllocateIp);
+												sqlite3_bind_text(_sAllocateIp,1,nwids,16,SQLITE_STATIC);
+												sqlite3_bind_null(_sAllocateIp,2);
+												sqlite3_bind_int(_sAllocateIp,3,(int)ZT_IP_ASSIGNMENT_TYPE_NETWORK);
+												sqlite3_bind_blob(_sAllocateIp,4,lr.rawIpData(),16,SQLITE_STATIC);
+												sqlite3_bind_int(_sAllocateIp,5,lr.netmaskBits());
+												sqlite3_bind_int(_sAllocateIp,6,6);
+												sqlite3_step(_sAllocateIp);
+											}
+										}
+									}
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"ipAssignmentPools")) {
+								if (j->u.object.values[k].value->type == json_array) {
+									std::vector< std::pair<InetAddress,InetAddress> > pools;
+									for(unsigned int kk=0;kk<j->u.object.values[k].value->u.array.length;++kk) {
+										json_value *pool = j->u.object.values[k].value->u.array.values[kk];
+										const char *iprs = (const char *)0;
+										const char *ipre = (const char *)0;
+										if ((pool)&&(pool->type == json_object)) {
+											for(unsigned int rk=0;rk<pool->u.object.length;++rk) {
+												if ((!strcmp(pool->u.object.values[rk].name,"ipRangeStart"))&&(pool->u.object.values[rk].value->type == json_string))
+													iprs = pool->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(pool->u.object.values[rk].name,"ipRangeEnd"))&&(pool->u.object.values[rk].value->type == json_string))
+													ipre = pool->u.object.values[rk].value->u.string.ptr;
+											}
+										}
+										if ((iprs)&&(ipre)) {
+											InetAddress iprs2(iprs);
+											InetAddress ipre2(ipre);
+											if (iprs2.ss_family == ipre2.ss_family) {
+												iprs2.setPort(0);
+												ipre2.setPort(0);
+												pools.push_back(std::pair<InetAddress,InetAddress>(iprs2,ipre2));
+											}
+										}
+									}
+									std::sort(pools.begin(),pools.end());
+									pools.erase(std::unique(pools.begin(),pools.end()),pools.end());
+
+									sqlite3_reset(_sDeleteIpAssignmentPoolsForNetwork);
+									sqlite3_bind_text(_sDeleteIpAssignmentPoolsForNetwork,1,nwids,16,SQLITE_STATIC);
+									sqlite3_step(_sDeleteIpAssignmentPoolsForNetwork);
+
+									for(std::vector< std::pair<InetAddress,InetAddress> >::const_iterator p(pools.begin());p!=pools.end();++p) {
+										char ipBlob1[16],ipBlob2[16];
+										sqlite3_reset(_sCreateIpAssignmentPool);
+										sqlite3_bind_text(_sCreateIpAssignmentPool,1,nwids,16,SQLITE_STATIC);
+										if (p->first.ss_family == AF_INET) {
+											memset(ipBlob1,0,12);
+											memcpy(ipBlob1 + 12,p->first.rawIpData(),4);
+											memset(ipBlob2,0,12);
+											memcpy(ipBlob2 + 12,p->second.rawIpData(),4);
+											sqlite3_bind_blob(_sCreateIpAssignmentPool,2,(const void *)ipBlob1,16,SQLITE_STATIC);
+											sqlite3_bind_blob(_sCreateIpAssignmentPool,3,(const void *)ipBlob2,16,SQLITE_STATIC);
+											sqlite3_bind_int(_sCreateIpAssignmentPool,4,4);
+										} else if (p->first.ss_family == AF_INET6) {
+											sqlite3_bind_blob(_sCreateIpAssignmentPool,2,p->first.rawIpData(),16,SQLITE_STATIC);
+											sqlite3_bind_blob(_sCreateIpAssignmentPool,3,p->second.rawIpData(),16,SQLITE_STATIC);
+											sqlite3_bind_int(_sCreateIpAssignmentPool,4,6);
+										} else continue;
+										sqlite3_step(_sCreateIpAssignmentPool);
+									}
+								}
+							} else if (!strcmp(j->u.object.values[k].name,"rules")) {
+								if (j->u.object.values[k].value->type == json_array) {
+									sqlite3_reset(_sDeleteRulesForNetwork);
+									sqlite3_bind_text(_sDeleteRulesForNetwork,1,nwids,16,SQLITE_STATIC);
+									sqlite3_step(_sDeleteRulesForNetwork);
+
+									for(unsigned int kk=0;kk<j->u.object.values[k].value->u.array.length;++kk) {
+										json_value *rj = j->u.object.values[k].value->u.array.values[kk];
+										if ((rj)&&(rj->type == json_object)) {
+											struct { // NULL pointers indicate missing or NULL -- wildcards
+												const json_int_t *ruleNo;
+												const char *nodeId;
+												const char *sourcePort;
+												const char *destPort;
+												const json_int_t *vlanId;
+												const json_int_t *vlanPcp;
+												const json_int_t *etherType;
+												const char *macSource;
+												const char *macDest;
+												const char *ipSource;
+												const char *ipDest;
+												const json_int_t *ipTos;
+												const json_int_t *ipProtocol;
+												const json_int_t *ipSourcePort;
+												const json_int_t *ipDestPort;
+												const json_int_t *flags;
+												const json_int_t *invFlags;
+												const char *action;
+											} rule;
+											memset(&rule,0,sizeof(rule));
+
+											for(unsigned int rk=0;rk<rj->u.object.length;++rk) {
+												if ((!strcmp(rj->u.object.values[rk].name,"ruleNo"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.ruleNo = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"nodeId"))&&(rj->u.object.values[rk].value->type == json_string))
+													rule.nodeId = rj->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(rj->u.object.values[rk].name,"sourcePort"))&&(rj->u.object.values[rk].value->type == json_string))
+													rule.sourcePort = rj->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(rj->u.object.values[rk].name,"destPort"))&&(rj->u.object.values[rk].value->type == json_string))
+													rule.destPort = rj->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(rj->u.object.values[rk].name,"vlanId"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.vlanId = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"vlanPcp"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.vlanPcp = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"etherType"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.etherType = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"macSource"))&&(rj->u.object.values[rk].value->type == json_string))
+													rule.macSource = rj->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(rj->u.object.values[rk].name,"macDest"))&&(rj->u.object.values[rk].value->type == json_string))
+													rule.macDest = rj->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(rj->u.object.values[rk].name,"ipSource"))&&(rj->u.object.values[rk].value->type == json_string))
+													rule.ipSource = rj->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(rj->u.object.values[rk].name,"ipDest"))&&(rj->u.object.values[rk].value->type == json_string))
+													rule.ipDest = rj->u.object.values[rk].value->u.string.ptr;
+												else if ((!strcmp(rj->u.object.values[rk].name,"ipTos"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.ipTos = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"ipProtocol"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.ipProtocol = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"ipSourcePort"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.ipSourcePort = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"ipDestPort"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.ipDestPort = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"flags"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.flags = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"invFlags"))&&(rj->u.object.values[rk].value->type == json_integer))
+													rule.invFlags = &(rj->u.object.values[rk].value->u.integer);
+												else if ((!strcmp(rj->u.object.values[rk].name,"action"))&&(rj->u.object.values[rk].value->type == json_string))
+													rule.action = rj->u.object.values[rk].value->u.string.ptr;
+											}
+
+											if ((rule.ruleNo)&&(rule.action)&&(rule.action[0])) {
+												char mactmp1[16],mactmp2[16];
+												sqlite3_reset(_sCreateRule);
+												sqlite3_bind_text(_sCreateRule,1,nwids,16,SQLITE_STATIC);
+												sqlite3_bind_int64(_sCreateRule,2,*rule.ruleNo);
+
+												// Optional values: null by default
+												for(int i=3;i<=18;++i)
+													sqlite3_bind_null(_sCreateRule,i);
+												if ((rule.nodeId)&&(strlen(rule.nodeId) == 10)) sqlite3_bind_text(_sCreateRule,3,rule.nodeId,10,SQLITE_STATIC);
+												if ((rule.sourcePort)&&(strlen(rule.sourcePort) == 10)) sqlite3_bind_text(_sCreateRule,4,rule.sourcePort,10,SQLITE_STATIC);
+												if ((rule.destPort)&&(strlen(rule.destPort) == 10)) sqlite3_bind_text(_sCreateRule,5,rule.destPort,10,SQLITE_STATIC);
+												if (rule.vlanId) sqlite3_bind_int(_sCreateRule,6,(int)*rule.vlanId);
+												if (rule.vlanPcp) sqlite3_bind_int(_sCreateRule,7,(int)*rule.vlanPcp);
+												if (rule.etherType) sqlite3_bind_int(_sCreateRule,8,(int)*rule.etherType & (int)0xffff);
+												if (rule.macSource) {
+													MAC m(rule.macSource);
+													Utils::snprintf(mactmp1,sizeof(mactmp1),"%.12llx",(unsigned long long)m.toInt());
+													sqlite3_bind_text(_sCreateRule,9,mactmp1,-1,SQLITE_STATIC);
+												}
+												if (rule.macDest) {
+													MAC m(rule.macDest);
+													Utils::snprintf(mactmp2,sizeof(mactmp2),"%.12llx",(unsigned long long)m.toInt());
+													sqlite3_bind_text(_sCreateRule,10,mactmp2,-1,SQLITE_STATIC);
+												}
+												if (rule.ipSource) sqlite3_bind_text(_sCreateRule,11,rule.ipSource,-1,SQLITE_STATIC);
+												if (rule.ipDest) sqlite3_bind_text(_sCreateRule,12,rule.ipDest,-1,SQLITE_STATIC);
+												if (rule.ipTos) sqlite3_bind_int(_sCreateRule,13,(int)*rule.ipTos);
+												if (rule.ipProtocol) sqlite3_bind_int(_sCreateRule,14,(int)*rule.ipProtocol);
+												if (rule.ipSourcePort) sqlite3_bind_int(_sCreateRule,15,(int)*rule.ipSourcePort & (int)0xffff);
+												if (rule.ipDestPort) sqlite3_bind_int(_sCreateRule,16,(int)*rule.ipDestPort & (int)0xffff);
+												if (rule.flags) sqlite3_bind_int64(_sCreateRule,17,(int64_t)*rule.flags);
+												if (rule.invFlags) sqlite3_bind_int64(_sCreateRule,18,(int64_t)*rule.invFlags);
+
+												sqlite3_bind_text(_sCreateRule,19,rule.action,-1,SQLITE_STATIC);
+												sqlite3_step(_sCreateRule);
+											}
+										}
+									}
+								}
+							}
+
+							if (stmt) {
+								sqlite3_bind_text(stmt,2,nwids,16,SQLITE_STATIC);
+								sqlite3_step(stmt);
+								sqlite3_finalize(stmt);
+							}
+						}
+					}
+					json_value_free(j);
+				}
+
+				sqlite3_reset(_sSetNetworkRevision);
+				sqlite3_bind_int64(_sSetNetworkRevision,1,revision += 1);
+				sqlite3_bind_text(_sSetNetworkRevision,2,nwids,16,SQLITE_STATIC);
+				sqlite3_step(_sSetNetworkRevision);
+
+				return _doCPGet(path_copy,urlArgs,headers,body,responseBody,responseContentType);
+			}
+
+		} // else 404
+
+	} // else 404
+
+	return 404;
+}
+
+unsigned int SqliteNetworkController::handleControlPlaneHttpDELETE(
+	const std::vector<std::string> &path,
+	const std::map<std::string,std::string> &urlArgs,
+	const std::map<std::string,std::string> &headers,
+	const std::string &body,
+	std::string &responseBody,
+	std::string &responseContentType)
+{
+	if (path.empty())
+		return 404;
+	Mutex::Lock _l(_lock);
+
+	if (path[0] == "network") {
+
+		if ((path.size() >= 2)&&(path[1].length() == 16)) {
+			uint64_t nwid = Utils::hexStrToU64(path[1].c_str());
+			char nwids[24];
+			Utils::snprintf(nwids,sizeof(nwids),"%.16llx",(unsigned long long)nwid);
+
+			sqlite3_reset(_sGetNetworkById);
+			sqlite3_bind_text(_sGetNetworkById,1,nwids,16,SQLITE_STATIC);
+			if (sqlite3_step(_sGetNetworkById) != SQLITE_ROW)
+				return 404;
+
+			if (path.size() >= 3) {
+
+				if ((path.size() == 4)&&(path[2] == "member")&&(path[3].length() == 10)) {
+					uint64_t address = Utils::hexStrToU64(path[3].c_str());
+					char addrs[24];
+					Utils::snprintf(addrs,sizeof(addrs),"%.10llx",address);
+
+					sqlite3_reset(_sGetMember);
+					sqlite3_bind_text(_sGetMember,1,nwids,16,SQLITE_STATIC);
+					sqlite3_bind_text(_sGetMember,2,addrs,10,SQLITE_STATIC);
+					if (sqlite3_step(_sGetMember) != SQLITE_ROW)
+						return 404;
+
+					sqlite3_reset(_sDeleteIpAllocations);
+					sqlite3_bind_text(_sDeleteIpAllocations,1,nwids,16,SQLITE_STATIC);
+					sqlite3_bind_text(_sDeleteIpAllocations,2,addrs,10,SQLITE_STATIC);
+					sqlite3_bind_int(_sDeleteIpAllocations,3,(int)ZT_IP_ASSIGNMENT_TYPE_ADDRESS);
+					if (sqlite3_step(_sDeleteIpAllocations) == SQLITE_DONE) {
+						sqlite3_reset(_sDeleteMember);
+						sqlite3_bind_text(_sDeleteMember,1,nwids,16,SQLITE_STATIC);
+						sqlite3_bind_text(_sDeleteMember,2,addrs,10,SQLITE_STATIC);
+						if (sqlite3_step(_sDeleteMember) != SQLITE_DONE)
+							return 500;
+					} else return 500;
+
+					return 200;
+				}
+
+			} else {
+
+				sqlite3_reset(_sDeleteNetwork);
+				sqlite3_bind_text(_sDeleteNetwork,1,nwids,16,SQLITE_STATIC);
+				if (sqlite3_step(_sDeleteNetwork) == SQLITE_DONE) {
+					sqlite3_reset(_sDeleteAllNetworkMembers);
+					sqlite3_bind_text(_sDeleteAllNetworkMembers,1,nwids,16,SQLITE_STATIC);
+					sqlite3_step(_sDeleteAllNetworkMembers);
+					return 200;
+				} else return 500;
+
+			}
+		} // else 404
+
+	} // else 404
+
+	return 404;
+}
+
+void SqliteNetworkController::threadMain()
+	throw()
+{
+	uint64_t lastBackupTime = OSUtils::now();
+	uint64_t lastCleanupTime = OSUtils::now();
+
+	while (_backupThreadRun) {
+		if ((OSUtils::now() - lastCleanupTime) >= 5000) {
+			const uint64_t now = OSUtils::now();
+			lastCleanupTime = now;
+
+			Mutex::Lock _l(_lock);
+
+			// Clean out really old circuit tests to prevent memory build-up
+			for(std::map< uint64_t,_CircuitTestEntry >::iterator ct(_circuitTests.begin());ct!=_circuitTests.end();) {
+				if (!ct->second.test) {
+					_circuitTests.erase(ct++);
+				} else if ((now - ct->second.test->timestamp) >= ZT_SQLITENETWORKCONTROLLER_CIRCUIT_TEST_TIMEOUT) {
+					_node->circuitTestEnd(ct->second.test);
+					::free((void *)ct->second.test);
+					_circuitTests.erase(ct++);
+				} else ++ct;
+			}
+		}
+
+		if ((OSUtils::now() - lastBackupTime) >= ZT_NETCONF_BACKUP_PERIOD) {
+			lastBackupTime = OSUtils::now();
+
+			char backupPath[4096],backupPath2[4096];
+			Utils::snprintf(backupPath,sizeof(backupPath),"%s.backupInProgress",_dbPath.c_str());
+			Utils::snprintf(backupPath2,sizeof(backupPath),"%s.backup",_dbPath.c_str());
+			OSUtils::rm(backupPath); // delete any unfinished backups
+
+			sqlite3 *bakdb = (sqlite3 *)0;
+			sqlite3_backup *bak = (sqlite3_backup *)0;
+			if (sqlite3_open_v2(backupPath,&bakdb,SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE,(const char *)0) != SQLITE_OK) {
+				fprintf(stderr,"SqliteNetworkController: CRITICAL: backup failed on sqlite3_open_v2()"ZT_EOL_S);
+				continue;
+			}
+			bak = sqlite3_backup_init(bakdb,"main",_db,"main");
+			if (!bak) {
+				sqlite3_close(bakdb);
+				OSUtils::rm(backupPath); // delete any unfinished backups
+				fprintf(stderr,"SqliteNetworkController: CRITICAL: backup failed on sqlite3_backup_init()"ZT_EOL_S);
+				continue;
+			}
+
+			int rc = SQLITE_OK;
+			for(;;) {
+				if (!_backupThreadRun) {
+					sqlite3_backup_finish(bak);
+					sqlite3_close(bakdb);
+					OSUtils::rm(backupPath);
+					return;
+				}
+				_lock.lock();
+				rc = sqlite3_backup_step(bak,64);
+				_lock.unlock();
+				if ((rc == SQLITE_OK)||(rc == SQLITE_LOCKED)||(rc == SQLITE_BUSY))
+					Thread::sleep(50);
+				else break;
+			}
+
+			sqlite3_backup_finish(bak);
+			sqlite3_close(bakdb);
+
+			OSUtils::rm(backupPath2);
+			::rename(backupPath,backupPath2);
+		}
+
+		Thread::sleep(250);
+	}
+}
+
+unsigned int SqliteNetworkController::_doCPGet(
+	const std::vector<std::string> &path,
+	const std::map<std::string,std::string> &urlArgs,
+	const std::map<std::string,std::string> &headers,
+	const std::string &body,
+	std::string &responseBody,
+	std::string &responseContentType)
+{
+	// Assumes _lock is locked
+	char json[65536];
+
+	if ((path.size() > 0)&&(path[0] == "network")) {
+
+		if ((path.size() >= 2)&&(path[1].length() == 16)) {
+			uint64_t nwid = Utils::hexStrToU64(path[1].c_str());
+			char nwids[24];
+			Utils::snprintf(nwids,sizeof(nwids),"%.16llx",(unsigned long long)nwid);
+
+			if (path.size() >= 3) {
+				// /network/<nwid>/...
+
+				if (path[2] == "member") {
+
+					if (path.size() >= 4) {
+						// Get specific member info
+
+						uint64_t address = Utils::hexStrToU64(path[3].c_str());
+						char addrs[24];
+						Utils::snprintf(addrs,sizeof(addrs),"%.10llx",address);
+
+						sqlite3_reset(_sGetMember2);
+						sqlite3_bind_text(_sGetMember2,1,nwids,16,SQLITE_STATIC);
+						sqlite3_bind_text(_sGetMember2,2,addrs,10,SQLITE_STATIC);
+						if (sqlite3_step(_sGetMember2) == SQLITE_ROW) {
+							const char *memberIdStr = (const char *)sqlite3_column_text(_sGetMember2,3);
+
+							// If testSingingId is included in the URL or X-ZT1-TestSigningId in the headers
+							// and if it contains an identity with a secret portion, the resturned JSON
+							// will contain an extra field called _testConf. This will contain several
+							// fields that report the result of doNetworkConfigRequest() for this member.
+							std::string testFields;
+							{
+								Identity testOutputSigningId;
+								std::map<std::string,std::string>::const_iterator sid(urlArgs.find("testSigningId"));
+								if (sid != urlArgs.end()) {
+									testOutputSigningId.fromString(sid->second.c_str());
+								} else {
+									sid = headers.find("x-zt1-testsigningid");
+									if (sid != headers.end())
+										testOutputSigningId.fromString(sid->second.c_str());
+								}
+
+								if ((testOutputSigningId.hasPrivate())&&(memberIdStr)) {
+									Dictionary testNetconf;
+									NetworkController::ResultCode rc = this->_doNetworkConfigRequest(
+										InetAddress(),
+										testOutputSigningId,
+										Identity(memberIdStr),
+										nwid,
+										Dictionary(), // TODO: allow passing of meta-data for testing
+										testNetconf);
+									char rcs[16];
+									Utils::snprintf(rcs,sizeof(rcs),"%d,\n",(int)rc);
+									testFields.append("\t\"_test\": {\n");
+									testFields.append("\t\t\"resultCode\": "); testFields.append(rcs);
+									testFields.append("\t\t\"result\": \""); testFields.append(_jsonEscape(testNetconf.toString().c_str()).c_str()); testFields.append("\",\n");
+									testFields.append("\t\t\"resultJson\": {\n");
+									for(Dictionary::const_iterator i(testNetconf.begin());i!=testNetconf.end();++i) {
+										if (i != testNetconf.begin())
+											testFields.append(",\n");
+										testFields.append("\t\t\t\"");
+										testFields.append(i->first);
+										testFields.append("\": \"");
+										testFields.append(_jsonEscape(i->second.c_str()));
+										testFields.push_back('"');
+									}
+									testFields.append("\n\t\t}\n");
+									testFields.append("\t},\n");
+								}
+							}
+
+							Utils::snprintf(json,sizeof(json),
+								"{\n%s"
+								"\t\"nwid\": \"%s\",\n"
+								"\t\"address\": \"%s\",\n"
+								"\t\"controllerInstanceId\": \"%s\",\n"
+								"\t\"authorized\": %s,\n"
+								"\t\"activeBridge\": %s,\n"
+								"\t\"memberRevision\": %llu,\n"
+								"\t\"clock\": %llu,\n"
+								"\t\"identity\": \"%s\",\n"
+								"\t\"ipAssignments\": [",
+								testFields.c_str(),
+								nwids,
+								addrs,
+								_instanceId.c_str(),
+								(sqlite3_column_int(_sGetMember2,0) > 0) ? "true" : "false",
+								(sqlite3_column_int(_sGetMember2,1) > 0) ? "true" : "false",
+								(unsigned long long)sqlite3_column_int64(_sGetMember2,2),
+								(unsigned long long)OSUtils::now(),
+								_jsonEscape(memberIdStr).c_str());
+							responseBody = json;
+
+							sqlite3_reset(_sGetIpAssignmentsForNode2);
+							sqlite3_bind_text(_sGetIpAssignmentsForNode2,1,nwids,16,SQLITE_STATIC);
+							sqlite3_bind_text(_sGetIpAssignmentsForNode2,2,addrs,10,SQLITE_STATIC);
+							sqlite3_bind_int(_sGetIpAssignmentsForNode2,3,(int)ZT_IP_ASSIGNMENT_TYPE_ADDRESS);
+							bool firstIp = true;
+							while (sqlite3_step(_sGetIpAssignmentsForNode2) == SQLITE_ROW) {
+								int ipversion = sqlite3_column_int(_sGetIpAssignmentsForNode2,2);
+								char ipBlob[16];
+								memcpy(ipBlob,(const void *)sqlite3_column_blob(_sGetIpAssignmentsForNode2,0),16);
+								InetAddress ip(
+									(const void *)(ipversion == 6 ? ipBlob : &ipBlob[12]),
+									(ipversion == 6 ? 16 : 4),
+									(unsigned int)sqlite3_column_int(_sGetIpAssignmentsForNode2,1)
+								);
+								responseBody.append(firstIp ? "\"" : ",\"");
+								responseBody.append(_jsonEscape(ip.toString()));
+								responseBody.push_back('"');
+								firstIp = false;
+							}
+
+							responseBody.append("],\n\t\"recentLog\": [");
+
+							sqlite3_reset(_sGetNodeHistory);
+							sqlite3_bind_text(_sGetNodeHistory,1,nwids,16,SQLITE_STATIC);
+							sqlite3_bind_text(_sGetNodeHistory,2,addrs,10,SQLITE_STATIC);
+							bool firstHistory = true;
+							while (sqlite3_step(_sGetNodeHistory) == SQLITE_ROW) {
+								responseBody.append(firstHistory ? "{" : ",{");
+								responseBody.append("\"ts\":");
+								responseBody.append((const char *)sqlite3_column_text(_sGetNodeHistory,2));
+								responseBody.append((sqlite3_column_int(_sGetNodeHistory,1) == 0) ? ",\"authorized\":false,\"clientMajorVersion\":" : ",\"authorized\":true,\"clientMajorVersion\":");
+								responseBody.append((const char *)sqlite3_column_text(_sGetNodeHistory,3));
+								responseBody.append(",\"clientMinorVersion\":");
+								responseBody.append((const char *)sqlite3_column_text(_sGetNodeHistory,4));
+								responseBody.append(",\"clientRevision\":");
+								responseBody.append((const char *)sqlite3_column_text(_sGetNodeHistory,5));
+								responseBody.append(",\"fromAddr\":");
+								const char *fa = (const char *)sqlite3_column_text(_sGetNodeHistory,7);
+								if (fa) {
+									responseBody.push_back('"');
+									responseBody.append(_jsonEscape(fa));
+									responseBody.append("\"}");
+								} else responseBody.append("null}");
+								firstHistory = false;
+							}
+							responseBody.append("]\n}\n");
+
+							responseContentType = "application/json";
+							return 200;
+						} // else 404
+
+					} else {
+						// List members
+
+						sqlite3_reset(_sListNetworkMembers);
+						sqlite3_bind_text(_sListNetworkMembers,1,nwids,16,SQLITE_STATIC);
+						responseBody.push_back('{');
+						bool firstMember = true;
+						while (sqlite3_step(_sListNetworkMembers) == SQLITE_ROW) {
+							responseBody.append(firstMember ? "\"" : ",\"");
+							firstMember = false;
+							responseBody.append((const char *)sqlite3_column_text(_sListNetworkMembers,0));
+							responseBody.append("\":");
+							responseBody.append((const char *)sqlite3_column_text(_sListNetworkMembers,1));
+						}
+						responseBody.push_back('}');
+						responseContentType = "application/json";
+						return 200;
+
+					}
+
+				} else if ((path[2] == "active")&&(path.size() == 3)) {
+
+					sqlite3_reset(_sGetActiveNodesOnNetwork);
+					sqlite3_bind_text(_sGetActiveNodesOnNetwork,1,nwids,16,SQLITE_STATIC);
+					sqlite3_bind_text(_sGetActiveNodesOnNetwork,2,nwids,16,SQLITE_STATIC);
+					sqlite3_bind_int64(_sGetActiveNodesOnNetwork,3,(int64_t)(OSUtils::now() - ZT_NETCONF_NODE_ACTIVE_THRESHOLD));
+
+					responseBody.push_back('{');
+					bool firstMember = true;
+					uint64_t lastNodeId = 0;
+					while (sqlite3_step(_sGetActiveNodesOnNetwork) == SQLITE_ROW) {
+						const char *nodeId = (const char *)sqlite3_column_text(_sGetActiveNodesOnNetwork,0);
+						if (nodeId) {
+							const uint64_t nodeIdInt = Utils::hexStrToU64(nodeId);
+							if (nodeIdInt == lastNodeId) // technically that SQL query could (rarely) generate a duplicate for a given nodeId, in which case we want the first
+								continue;
+							lastNodeId = nodeIdInt;
+
+							responseBody.append(firstMember ? "\"" : ",\"");
+							firstMember = false;
+							responseBody.append(nodeId);
+							responseBody.append("\":{");
+							responseBody.append("\"ts\":");
+							responseBody.append((const char *)sqlite3_column_text(_sGetActiveNodesOnNetwork,1));
+							responseBody.append((sqlite3_column_int(_sGetActiveNodesOnNetwork,6) > 0) ? ",\"authorized\":true" : ",\"authorized\":false");
+							responseBody.append(",\"clientMajorVersion\":");
+							responseBody.append((const char *)sqlite3_column_text(_sGetActiveNodesOnNetwork,2));
+							responseBody.append(",\"clientMinorVersion\":");
+							responseBody.append((const char *)sqlite3_column_text(_sGetActiveNodesOnNetwork,3));
+							responseBody.append(",\"clientRevision\":");
+							responseBody.append((const char *)sqlite3_column_text(_sGetActiveNodesOnNetwork,4));
+							const char *fromAddr = (const char *)sqlite3_column_text(_sGetActiveNodesOnNetwork,5);
+							if ((fromAddr)&&(fromAddr[0])) {
+								responseBody.append(",\"fromAddr\":\"");
+								responseBody.append(_jsonEscape(fromAddr));
+								responseBody.append("\"}");
+							} else {
+								responseBody.append(",\"fromAddr\":null}");
+							}
+						}
+					}
+					responseBody.push_back('}');
+
+					responseContentType = "application/json";
+					return 200;
+
+				} else if ((path[2] == "test")&&(path.size() >= 4)) {
+
+					std::map< uint64_t,_CircuitTestEntry >::iterator cte(_circuitTests.find(Utils::hexStrToU64(path[3].c_str())));
+					if ((cte != _circuitTests.end())&&(cte->second.test)) {
+
+						responseBody = "[";
+						responseBody.append(cte->second.jsonResults);
+						responseBody.push_back(']');
+						responseContentType = "application/json";
+
+						return 200;
+
+					} // else 404
+
+				} // else 404
+
+			} else {
+
+				sqlite3_reset(_sGetNetworkById);
+				sqlite3_bind_text(_sGetNetworkById,1,nwids,16,SQLITE_STATIC);
+				if (sqlite3_step(_sGetNetworkById) == SQLITE_ROW) {
+					Utils::snprintf(json,sizeof(json),
+						"{\n"
+						"\t\"nwid\": \"%s\",\n"
+						"\t\"controllerInstanceId\": \"%s\",\n"
+						"\t\"clock\": %llu,\n"
+						"\t\"name\": \"%s\",\n"
+						"\t\"private\": %s,\n"
+						"\t\"enableBroadcast\": %s,\n"
+						"\t\"allowPassiveBridging\": %s,\n"
+						"\t\"v4AssignMode\": \"%s\",\n"
+						"\t\"v6AssignMode\": \"%s\",\n"
+						"\t\"multicastLimit\": %d,\n"
+						"\t\"creationTime\": %llu,\n"
+						"\t\"revision\": %llu,\n"
+						"\t\"memberRevisionCounter\": %llu,\n"
+						"\t\"authorizedMemberCount\": %llu,\n"
+						"\t\"relays\": [",
+						nwids,
+						_instanceId.c_str(),
+						(unsigned long long)OSUtils::now(),
+						_jsonEscape((const char *)sqlite3_column_text(_sGetNetworkById,0)).c_str(),
+						(sqlite3_column_int(_sGetNetworkById,1) > 0) ? "true" : "false",
+						(sqlite3_column_int(_sGetNetworkById,2) > 0) ? "true" : "false",
+						(sqlite3_column_int(_sGetNetworkById,3) > 0) ? "true" : "false",
+						_jsonEscape((const char *)sqlite3_column_text(_sGetNetworkById,4)).c_str(),
+						_jsonEscape((const char *)sqlite3_column_text(_sGetNetworkById,5)).c_str(),
+						sqlite3_column_int(_sGetNetworkById,6),
+						(unsigned long long)sqlite3_column_int64(_sGetNetworkById,7),
+						(unsigned long long)sqlite3_column_int64(_sGetNetworkById,8),
+						(unsigned long long)sqlite3_column_int64(_sGetNetworkById,9),
+						(unsigned long long)sqlite3_column_int64(_sGetNetworkById,10));
+					responseBody = json;
+
+					sqlite3_reset(_sGetRelays);
+					sqlite3_bind_text(_sGetRelays,1,nwids,16,SQLITE_STATIC);
+					bool firstRelay = true;
+					while (sqlite3_step(_sGetRelays) == SQLITE_ROW) {
+						responseBody.append(firstRelay ? "\n\t\t" : ",\n\t\t");
+						firstRelay = false;
+						responseBody.append("{\"address\":\"");
+						responseBody.append((const char *)sqlite3_column_text(_sGetRelays,0));
+						responseBody.append("\",\"phyAddress\":\"");
+						responseBody.append(_jsonEscape((const char *)sqlite3_column_text(_sGetRelays,1)));
+						responseBody.append("\"}");
+					}
+
+					responseBody.append("],\n\t\"gateways\": [");
+
+					sqlite3_reset(_sGetGateways);
+					sqlite3_bind_text(_sGetGateways,1,nwids,16,SQLITE_STATIC);
+					bool firstGateway = true;
+					while (sqlite3_step(_sGetGateways) == SQLITE_ROW) {
+						char tmp[128];
+						const unsigned char *ip = (const unsigned char *)sqlite3_column_blob(_sGetGateways,0);
+						switch(sqlite3_column_int(_sGetGateways,1)) { // ipVersion
+							case 4:
+								Utils::snprintf(tmp,sizeof(tmp),"%s%d.%d.%d.%d/%d\"",
+									(firstGateway) ? "\"" : ",\"",
+									(int)ip[12],
+									(int)ip[13],
+									(int)ip[14],
+									(int)ip[15],
+									(int)sqlite3_column_int(_sGetGateways,2)); // metric
+								break;
+							case 6:
+								Utils::snprintf(tmp,sizeof(tmp),"%s%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x/%d\"",
+									(firstGateway) ? "\"" : ",\"",
+									(int)ip[0],
+									(int)ip[1],
+									(int)ip[2],
+									(int)ip[3],
+									(int)ip[4],
+									(int)ip[5],
+									(int)ip[6],
+									(int)ip[7],
+									(int)ip[8],
+									(int)ip[9],
+									(int)ip[10],
+									(int)ip[11],
+									(int)ip[12],
+									(int)ip[13],
+									(int)ip[14],
+									(int)ip[15],
+									(int)sqlite3_column_int(_sGetGateways,2)); // metric
+								break;
+						}
+						responseBody.append(tmp);
+						firstGateway = false;
+					}
+
+					responseBody.append("],\n\t\"ipLocalRoutes\": [");
+
+					sqlite3_reset(_sGetLocalRoutes);
+					sqlite3_bind_text(_sGetLocalRoutes,1,nwids,16,SQLITE_STATIC);
+					sqlite3_bind_int(_sGetLocalRoutes,2,(int)ZT_IP_ASSIGNMENT_TYPE_NETWORK);
+					bool firstLocalRoute = true;
+					while (sqlite3_step(_sGetLocalRoutes) == SQLITE_ROW) {
+						char tmp[128];
+						const unsigned char *ip = (const unsigned char *)sqlite3_column_blob(_sGetLocalRoutes,0);
+						switch (sqlite3_column_int(_sGetLocalRoutes,2)) {
+							case 4:
+								Utils::snprintf(tmp,sizeof(tmp),"%s%d.%d.%d.%d/%d\"",
+									(firstLocalRoute) ? "\"" : ",\"",
+									(int)ip[12],
+									(int)ip[13],
+									(int)ip[14],
+									(int)ip[15],
+									(int)sqlite3_column_int(_sGetLocalRoutes,1)); // netmask bits
+								break;
+							case 6:
+								Utils::snprintf(tmp,sizeof(tmp),"%s%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x/%d\"",
+									(firstLocalRoute) ? "\"" : ",\"",
+									(int)ip[0],
+									(int)ip[1],
+									(int)ip[2],
+									(int)ip[3],
+									(int)ip[4],
+									(int)ip[5],
+									(int)ip[6],
+									(int)ip[7],
+									(int)ip[8],
+									(int)ip[9],
+									(int)ip[10],
+									(int)ip[11],
+									(int)ip[12],
+									(int)ip[13],
+									(int)ip[14],
+									(int)ip[15],
+									(int)sqlite3_column_int(_sGetLocalRoutes,1)); // netmask bits
+								break;
+						}
+						responseBody.append(tmp);
+						firstLocalRoute = false;
+					}
+
+					responseBody.append("],\n\t\"ipAssignmentPools\": [");
+
+					sqlite3_reset(_sGetIpAssignmentPools2);
+					sqlite3_bind_text(_sGetIpAssignmentPools2,1,nwids,16,SQLITE_STATIC);
+					bool firstIpAssignmentPool = true;
+					while (sqlite3_step(_sGetIpAssignmentPools2) == SQLITE_ROW) {
+						const char *ipRangeStartB = reinterpret_cast<const char *>(sqlite3_column_blob(_sGetIpAssignmentPools2,0));
+						const char *ipRangeEndB = reinterpret_cast<const char *>(sqlite3_column_blob(_sGetIpAssignmentPools2,1));
+						if ((ipRangeStartB)&&(ipRangeEndB)) {
+							InetAddress ipps,ippe;
+							int ipVersion = sqlite3_column_int(_sGetIpAssignmentPools2,2);
+							if (ipVersion == 4) {
+								ipps.set((const void *)(ipRangeStartB + 12),4,0);
+								ippe.set((const void *)(ipRangeEndB + 12),4,0);
+							} else if (ipVersion == 6) {
+								ipps.set((const void *)ipRangeStartB,16,0);
+								ippe.set((const void *)ipRangeEndB,16,0);
+							}
+							if (ipps) {
+								responseBody.append(firstIpAssignmentPool ? "\n\t\t" : ",\n\t\t");
+								firstIpAssignmentPool = false;
+								Utils::snprintf(json,sizeof(json),"{\"ipRangeStart\":\"%s\",\"ipRangeEnd\":\"%s\"}",
+									_jsonEscape(ipps.toIpString()).c_str(),
+									_jsonEscape(ippe.toIpString()).c_str());
+								responseBody.append(json);
+							}
+						}
+					}
+
+					responseBody.append("],\n\t\"rules\": [");
+
+					sqlite3_reset(_sListRules);
+					sqlite3_bind_text(_sListRules,1,nwids,16,SQLITE_STATIC);
+					bool firstRule = true;
+					while (sqlite3_step(_sListRules) == SQLITE_ROW) {
+						responseBody.append(firstRule ? "\n\t{\n" : ",{\n");
+						firstRule = false;
+						Utils::snprintf(json,sizeof(json),"\t\t\"ruleNo\": %lld,\n",sqlite3_column_int64(_sListRules,0));
+						responseBody.append(json);
+						if (sqlite3_column_type(_sListRules,1) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"nodeId\": \"%s\",\n",(const char *)sqlite3_column_text(_sListRules,1));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,2) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"sourcePort\": \"%s\",\n",(const char *)sqlite3_column_text(_sListRules,2));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,3) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"destPort\": \"%s\",\n",(const char *)sqlite3_column_text(_sListRules,3));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,4) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"vlanId\": %d,\n",sqlite3_column_int(_sListRules,4));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,5) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"vlanPcp\": %d,\n",sqlite3_column_int(_sListRules,5));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,6) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"etherType\": %d,\n",sqlite3_column_int(_sListRules,6));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,7) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"macSource\": \"%s\",\n",MAC((const char *)sqlite3_column_text(_sListRules,7)).toString().c_str());
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,8) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"macDest\": \"%s\",\n",MAC((const char *)sqlite3_column_text(_sListRules,8)).toString().c_str());
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,9) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"ipSource\": \"%s\",\n",_jsonEscape((const char *)sqlite3_column_text(_sListRules,9)).c_str());
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,10) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"ipDest\": \"%s\",\n",_jsonEscape((const char *)sqlite3_column_text(_sListRules,10)).c_str());
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,11) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"ipTos\": %d,\n",sqlite3_column_int(_sListRules,11));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,12) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"ipProtocol\": %d,\n",sqlite3_column_int(_sListRules,12));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,13) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"ipSourcePort\": %d,\n",sqlite3_column_int(_sListRules,13));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,14) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"ipDestPort\": %d,\n",sqlite3_column_int(_sListRules,14));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,15) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"flags\": %lu,\n",(unsigned long)sqlite3_column_int64(_sListRules,15));
+							responseBody.append(json);
+						}
+						if (sqlite3_column_type(_sListRules,16) != SQLITE_NULL) {
+							Utils::snprintf(json,sizeof(json),"\t\t\"invFlags\": %lu,\n",(unsigned long)sqlite3_column_int64(_sListRules,16));
+							responseBody.append(json);
+						}
+						responseBody.append("\t\t\"action\": \"");
+						responseBody.append(_jsonEscape( (sqlite3_column_type(_sListRules,17) == SQLITE_NULL) ? "drop" : (const char *)sqlite3_column_text(_sListRules,17) ));
+						responseBody.append("\"\n\t}");
+					}
+
+					responseBody.append("]\n}\n");
+					responseContentType = "application/json";
+					return 200;
+				} // else 404
+			}
+		} else if (path.size() == 1) {
+			// list networks
+			sqlite3_reset(_sListNetworks);
+			responseContentType = "application/json";
+			responseBody = "[";
+			bool first = true;
+			while (sqlite3_step(_sListNetworks) == SQLITE_ROW) {
+				if (first) {
+					first = false;
+					responseBody.push_back('"');
+				} else responseBody.append(",\"");
+				responseBody.append((const char *)sqlite3_column_text(_sListNetworks,0));
+				responseBody.push_back('"');
+			}
+			responseBody.push_back(']');
+			return 200;
+		} // else 404
+
+	} else {
+		// GET /controller returns status and API version if controller is supported
+		Utils::snprintf(json,sizeof(json),"{\n\t\"controller\": true,\n\t\"apiVersion\": %d,\n\t\"clock\": %llu,\n\t\"instanceId\": \"%s\"\n}\n",ZT_NETCONF_CONTROLLER_API_VERSION,(unsigned long long)OSUtils::now(),_instanceId.c_str());
+		responseBody = json;
+		responseContentType = "application/json";
+		return 200;
+	}
+
+	return 404;
+}
+
+NetworkController::ResultCode SqliteNetworkController::_doNetworkConfigRequest(const InetAddress &fromAddr,const Identity &signingId,const Identity &identity,uint64_t nwid,const Dictionary &metaData,Dictionary &netconf)
+{
+	// Assumes _lock is locked
+
+	// Decode some stuff from metaData
+	const unsigned int clientMajorVersion = (unsigned int)metaData.getHexUInt(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MAJOR_VERSION,0);
+	const unsigned int clientMinorVersion = (unsigned int)metaData.getHexUInt(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MINOR_VERSION,0);
+	const unsigned int clientRevision = (unsigned int)metaData.getHexUInt(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_REVISION,0);
+	const bool clientIs104 = (Utils::compareVersion(clientMajorVersion,clientMinorVersion,clientRevision,1,0,4) >= 0);
+
+	// Note: we can't reuse prepared statements that return const char * pointers without
+	// making our own copy in e.g. a std::string first.
+
+	if ((!signingId)||(!signingId.hasPrivate())) {
+		netconf["error"] = "signing identity invalid or lacks private key";
+		return NetworkController::NETCONF_QUERY_INTERNAL_SERVER_ERROR;
+	}
+	if (signingId.address().toInt() != (nwid >> 24)) {
+		netconf["error"] = "signing identity address does not match most significant 40 bits of network ID";
+		return NetworkController::NETCONF_QUERY_INTERNAL_SERVER_ERROR;
+	}
+
+	const uint64_t now = OSUtils::now();
+
+	// Check rate limit circuit breaker to prevent flooding
+	{
+		uint64_t &lrt = _lastRequestTime[std::pair<uint64_t,uint64_t>(identity.address().toInt(),nwid)];
+		if ((now - lrt) <= ZT_NETCONF_MIN_REQUEST_PERIOD)
+			return NetworkController::NETCONF_QUERY_IGNORE;
+		lrt = now;
+	}
+
+	NetworkRecord network;
+	memset(&network,0,sizeof(network));
+	Utils::snprintf(network.id,sizeof(network.id),"%.16llx",(unsigned long long)nwid);
+
+	MemberRecord member;
+	memset(&member,0,sizeof(member));
+	Utils::snprintf(member.nodeId,sizeof(member.nodeId),"%.10llx",(unsigned long long)identity.address().toInt());
+
+	// Create Node record or do full identity check if we already have one
+
+	sqlite3_reset(_sGetNodeIdentity);
+	sqlite3_bind_text(_sGetNodeIdentity,1,member.nodeId,10,SQLITE_STATIC);
+	if (sqlite3_step(_sGetNodeIdentity) == SQLITE_ROW) {
+		try {
+			Identity alreadyKnownIdentity((const char *)sqlite3_column_text(_sGetNodeIdentity,0));
+			if (alreadyKnownIdentity != identity)
+				return NetworkController::NETCONF_QUERY_ACCESS_DENIED;
+		} catch ( ... ) { // identity stored in database is not valid or is NULL
+			return NetworkController::NETCONF_QUERY_ACCESS_DENIED;
+		}
+	} else {
+		std::string idstr(identity.toString(false));
+		sqlite3_reset(_sCreateOrReplaceNode);
+		sqlite3_bind_text(_sCreateOrReplaceNode,1,member.nodeId,10,SQLITE_STATIC);
+		sqlite3_bind_text(_sCreateOrReplaceNode,2,idstr.c_str(),-1,SQLITE_STATIC);
+		if (sqlite3_step(_sCreateOrReplaceNode) != SQLITE_DONE) {
+			netconf["error"] = "unable to create new Node record";
+			return NetworkController::NETCONF_QUERY_INTERNAL_SERVER_ERROR;
+		}
+	}
+
+	// Fetch Network record
+
+	sqlite3_reset(_sGetNetworkById);
+	sqlite3_bind_text(_sGetNetworkById,1,network.id,16,SQLITE_STATIC);
+	if (sqlite3_step(_sGetNetworkById) == SQLITE_ROW) {
+		network.name = (const char *)sqlite3_column_text(_sGetNetworkById,0);
+		network.isPrivate = (sqlite3_column_int(_sGetNetworkById,1) > 0);
+		network.enableBroadcast = (sqlite3_column_int(_sGetNetworkById,2) > 0);
+		network.allowPassiveBridging = (sqlite3_column_int(_sGetNetworkById,3) > 0);
+		network.v4AssignMode = (const char *)sqlite3_column_text(_sGetNetworkById,4);
+		network.v6AssignMode = (const char *)sqlite3_column_text(_sGetNetworkById,5);
+		network.multicastLimit = sqlite3_column_int(_sGetNetworkById,6);
+		network.creationTime = (uint64_t)sqlite3_column_int64(_sGetNetworkById,7);
+		network.revision = (uint64_t)sqlite3_column_int64(_sGetNetworkById,8);
+		network.memberRevisionCounter = (uint64_t)sqlite3_column_int64(_sGetNetworkById,9);
+	} else {
+		return NetworkController::NETCONF_QUERY_OBJECT_NOT_FOUND;
+	}
+
+	// Fetch Member record
+
+	bool foundMember = false;
+	sqlite3_reset(_sGetMember);
+	sqlite3_bind_text(_sGetMember,1,network.id,16,SQLITE_STATIC);
+	sqlite3_bind_text(_sGetMember,2,member.nodeId,10,SQLITE_STATIC);
+	if (sqlite3_step(_sGetMember) == SQLITE_ROW) {
+		foundMember = true;
+		member.rowid = (int64_t)sqlite3_column_int64(_sGetMember,0);
+		member.authorized = (sqlite3_column_int(_sGetMember,1) > 0);
+		member.activeBridge = (sqlite3_column_int(_sGetMember,2) > 0);
+	}
+
+	// Create Member record for unknown nodes, auto-authorizing if network is public
+
+	if (!foundMember) {
+		member.authorized = (network.isPrivate ? false : true);
+		member.activeBridge = false;
+		sqlite3_reset(_sCreateMember);
+		sqlite3_bind_text(_sCreateMember,1,network.id,16,SQLITE_STATIC);
+		sqlite3_bind_text(_sCreateMember,2,member.nodeId,10,SQLITE_STATIC);
+		sqlite3_bind_int(_sCreateMember,3,(member.authorized ? 1 : 0));
+		sqlite3_bind_text(_sCreateMember,4,network.id,16,SQLITE_STATIC);
+		if (sqlite3_step(_sCreateMember) != SQLITE_DONE) {
+			netconf["error"] = "unable to create new member record";
+			return NetworkController::NETCONF_QUERY_INTERNAL_SERVER_ERROR;
+		}
+		member.rowid = (int64_t)sqlite3_last_insert_rowid(_db);
+
+		sqlite3_reset(_sIncrementMemberRevisionCounter);
+		sqlite3_bind_text(_sIncrementMemberRevisionCounter,1,network.id,16,SQLITE_STATIC);
+		sqlite3_step(_sIncrementMemberRevisionCounter);
+	}
+
+	// Update NodeHistory with new log entry and delete expired entries
+
+	{
+		int64_t nextVC = 1;
+		sqlite3_reset(_sGetMaxNodeHistoryNetworkVisitCounter);
+		sqlite3_bind_text(_sGetMaxNodeHistoryNetworkVisitCounter,1,network.id,16,SQLITE_STATIC);
+		sqlite3_bind_text(_sGetMaxNodeHistoryNetworkVisitCounter,2,member.nodeId,10,SQLITE_STATIC);
+		if (sqlite3_step(_sGetMaxNodeHistoryNetworkVisitCounter) == SQLITE_ROW) {
+			nextVC = (int64_t)sqlite3_column_int64(_sGetMaxNodeHistoryNetworkVisitCounter,0) + 1;
+		}
+
+		std::string mdstr(metaData.toString());
+		if (mdstr.length() > 1024)
+			mdstr = mdstr.substr(0,1024);
+		std::string fastr;
+		if (fromAddr)
+			fastr = fromAddr.toString();
+
+		sqlite3_reset(_sAddNodeHistoryEntry);
+		sqlite3_bind_text(_sAddNodeHistoryEntry,1,member.nodeId,10,SQLITE_STATIC);
+		sqlite3_bind_text(_sAddNodeHistoryEntry,2,network.id,16,SQLITE_STATIC);
+		sqlite3_bind_int64(_sAddNodeHistoryEntry,3,nextVC);
+		sqlite3_bind_int(_sAddNodeHistoryEntry,4,(member.authorized ? 1 : 0));
+		sqlite3_bind_int64(_sAddNodeHistoryEntry,5,(long long)now);
+		sqlite3_bind_int(_sAddNodeHistoryEntry,6,(int)clientMajorVersion);
+		sqlite3_bind_int(_sAddNodeHistoryEntry,7,(int)clientMinorVersion);
+		sqlite3_bind_int(_sAddNodeHistoryEntry,8,(int)clientRevision);
+		sqlite3_bind_text(_sAddNodeHistoryEntry,9,mdstr.c_str(),-1,SQLITE_STATIC);
+		if (fastr.length() > 0)
+			sqlite3_bind_text(_sAddNodeHistoryEntry,10,fastr.c_str(),-1,SQLITE_STATIC);
+		else sqlite3_bind_null(_sAddNodeHistoryEntry,10);
+		sqlite3_step(_sAddNodeHistoryEntry);
+
+		nextVC -= ZT_NETCONF_NODE_HISTORY_LENGTH;
+		if (nextVC >= 0) {
+			sqlite3_reset(_sDeleteOldNodeHistoryEntries);
+			sqlite3_bind_text(_sDeleteOldNodeHistoryEntries,1,network.id,16,SQLITE_STATIC);
+			sqlite3_bind_text(_sDeleteOldNodeHistoryEntries,2,member.nodeId,10,SQLITE_STATIC);
+			sqlite3_bind_int64(_sDeleteOldNodeHistoryEntries,3,nextVC);
+			sqlite3_step(_sDeleteOldNodeHistoryEntries);
+		}
+	}
+
+	// Check member authorization
+
+	if (!member.authorized)
+		return NetworkController::NETCONF_QUERY_ACCESS_DENIED;
+
+	// Create and sign netconf
+
+	netconf.clear();
+	{
+		char tss[24],rs[24];
+		Utils::snprintf(tss,sizeof(tss),"%.16llx",(unsigned long long)now);
+		Utils::snprintf(rs,sizeof(rs),"%.16llx",(unsigned long long)network.revision);
+		netconf[ZT_NETWORKCONFIG_DICT_KEY_TIMESTAMP] = tss;
+		netconf[ZT_NETWORKCONFIG_DICT_KEY_REVISION] = rs;
+		netconf[ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID] = network.id;
+		netconf[ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO] = member.nodeId;
+		netconf[ZT_NETWORKCONFIG_DICT_KEY_PRIVATE] = network.isPrivate ? "1" : "0";
+		netconf[ZT_NETWORKCONFIG_DICT_KEY_NAME] = (network.name) ? network.name : "";
+		netconf[ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST] = network.enableBroadcast ? "1" : "0";
+		netconf[ZT_NETWORKCONFIG_DICT_KEY_ALLOW_PASSIVE_BRIDGING] = network.allowPassiveBridging ? "1" : "0";
+
+		{	// TODO: right now only etherTypes are supported in rules
+			std::vector<int> allowedEtherTypes;
+			sqlite3_reset(_sGetEtherTypesFromRuleTable);
+			sqlite3_bind_text(_sGetEtherTypesFromRuleTable,1,network.id,16,SQLITE_STATIC);
+			while (sqlite3_step(_sGetEtherTypesFromRuleTable) == SQLITE_ROW) {
+				if (sqlite3_column_type(_sGetEtherTypesFromRuleTable,0) == SQLITE_NULL) {
+					allowedEtherTypes.clear();
+					allowedEtherTypes.push_back(0); // NULL 'allow' matches ANY
+					break;
+				} else {
+					int et = sqlite3_column_int(_sGetEtherTypesFromRuleTable,0);
+					if ((et >= 0)&&(et <= 0xffff))
+						allowedEtherTypes.push_back(et);
+				}
+			}
+			std::sort(allowedEtherTypes.begin(),allowedEtherTypes.end());
+			allowedEtherTypes.erase(std::unique(allowedEtherTypes.begin(),allowedEtherTypes.end()),allowedEtherTypes.end());
+			std::string allowedEtherTypesCsv;
+			for(std::vector<int>::const_iterator i(allowedEtherTypes.begin());i!=allowedEtherTypes.end();++i) {
+				if (allowedEtherTypesCsv.length())
+					allowedEtherTypesCsv.push_back(',');
+				char tmp[16];
+				Utils::snprintf(tmp,sizeof(tmp),"%.4x",(unsigned int)*i);
+				allowedEtherTypesCsv.append(tmp);
+			}
+			netconf[ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES] = allowedEtherTypesCsv;
+		}
+
+		if (network.multicastLimit > 0) {
+			char ml[16];
+			Utils::snprintf(ml,sizeof(ml),"%lx",(unsigned long)network.multicastLimit);
+			netconf[ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT] = ml;
+		}
+
+		bool amActiveBridge = false;
+		{
+			std::string activeBridges;
+			sqlite3_reset(_sGetActiveBridges);
+			sqlite3_bind_text(_sGetActiveBridges,1,network.id,16,SQLITE_STATIC);
+			while (sqlite3_step(_sGetActiveBridges) == SQLITE_ROW) {
+				const char *ab = (const char *)sqlite3_column_text(_sGetActiveBridges,0);
+				if ((ab)&&(strlen(ab) == 10)) {
+					if (activeBridges.length())
+						activeBridges.push_back(',');
+					activeBridges.append(ab);
+					if (!strcmp(member.nodeId,ab))
+						amActiveBridge = true;
+				}
+				if (activeBridges.length() > 1024) // sanity check -- you can't have too many active bridges at the moment
+					break;
+			}
+			if (activeBridges.length())
+				netconf[ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES] = activeBridges;
+		}
+
+		// Do not send relays to 1.1.0 since it had a serious bug in using them
+		// 1.1.0 will still work, it'll just fall back to roots instead of using network preferred relays
+		if (!((clientMajorVersion == 1)&&(clientMinorVersion == 1)&&(clientRevision == 0))) {
+			std::string relays;
+			sqlite3_reset(_sGetRelays);
+			sqlite3_bind_text(_sGetRelays,1,network.id,16,SQLITE_STATIC);
+			while (sqlite3_step(_sGetRelays) == SQLITE_ROW) {
+				const char *n = (const char *)sqlite3_column_text(_sGetRelays,0);
+				const char *a = (const char *)sqlite3_column_text(_sGetRelays,1);
+				if ((n)&&(a)) {
+					Address node(n);
+					InetAddress addr(a);
+					if ((node)&&(addr)) {
+						if (relays.length())
+							relays.push_back(',');
+						relays.append(node.toString());
+						relays.push_back(';');
+						relays.append(addr.toString());
+					}
+				}
+			}
+			if (relays.length())
+				netconf[ZT_NETWORKCONFIG_DICT_KEY_RELAYS] = relays;
+		}
+
+		{
+			char tmp[128];
+			std::string gateways;
+			sqlite3_reset(_sGetGateways);
+			sqlite3_bind_text(_sGetGateways,1,network.id,16,SQLITE_STATIC);
+			while (sqlite3_step(_sGetGateways) == SQLITE_ROW) {
+				const unsigned char *ip = (const unsigned char *)sqlite3_column_blob(_sGetGateways,0);
+				switch(sqlite3_column_int(_sGetGateways,1)) { // ipVersion
+					case 4:
+						Utils::snprintf(tmp,sizeof(tmp),"%s%d.%d.%d.%d/%d",
+							(gateways.length() > 0) ? "," : "",
+							(int)ip[12],
+							(int)ip[13],
+							(int)ip[14],
+							(int)ip[15],
+							(int)sqlite3_column_int(_sGetGateways,2)); // metric
+						gateways.append(tmp);
+						break;
+					case 6:
+						Utils::snprintf(tmp,sizeof(tmp),"%s%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x/%d",
+							(gateways.length() > 0) ? "," : "",
+							(int)ip[0],
+							(int)ip[1],
+							(int)ip[2],
+							(int)ip[3],
+							(int)ip[4],
+							(int)ip[5],
+							(int)ip[6],
+							(int)ip[7],
+							(int)ip[8],
+							(int)ip[9],
+							(int)ip[10],
+							(int)ip[11],
+							(int)ip[12],
+							(int)ip[13],
+							(int)ip[14],
+							(int)ip[15],
+							(int)sqlite3_column_int(_sGetGateways,2)); // metric
+						gateways.append(tmp);
+						break;
+				}
+			}
+			if (gateways.length())
+				netconf[ZT_NETWORKCONFIG_DICT_KEY_GATEWAYS] = gateways;
+		}
+
+		if ((network.v4AssignMode)&&(!strcmp(network.v4AssignMode,"zt"))) {
+			std::string v4s;
+
+			// Get existing IPv4 IP assignments and network routes -- keep routes in a
+			// vector for use in auto-assign if we need them.
+			std::vector< std::pair<uint32_t,int> > routedNetworks;
+			bool haveStaticIpAssignment = false;
+			sqlite3_reset(_sGetIpAssignmentsForNode);
+			sqlite3_bind_text(_sGetIpAssignmentsForNode,1,network.id,16,SQLITE_STATIC);
+			sqlite3_bind_text(_sGetIpAssignmentsForNode,2,member.nodeId,10,SQLITE_STATIC);
+			sqlite3_bind_int(_sGetIpAssignmentsForNode,3,4); // 4 == IPv4
+			while (sqlite3_step(_sGetIpAssignmentsForNode) == SQLITE_ROW) {
+				const unsigned char *ip = (const unsigned char *)sqlite3_column_blob(_sGetIpAssignmentsForNode,1);
+				if ((!ip)||(sqlite3_column_bytes(_sGetIpAssignmentsForNode,1) != 16))
+					continue;
+				int ipNetmaskBits = sqlite3_column_int(_sGetIpAssignmentsForNode,2);
+				if ((ipNetmaskBits <= 0)||(ipNetmaskBits > 32))
+					continue;
+
+				const IpAssignmentType ipt = (IpAssignmentType)sqlite3_column_int(_sGetIpAssignmentsForNode,0);
+				switch(ipt) {
+					case ZT_IP_ASSIGNMENT_TYPE_ADDRESS:
+						haveStaticIpAssignment = true;
+						break;
+					case ZT_IP_ASSIGNMENT_TYPE_NETWORK:
+						routedNetworks.push_back(std::pair<uint32_t,int>(Utils::ntoh(*(reinterpret_cast<const uint32_t *>(ip + 12))),ipNetmaskBits));
+						break;
+					default:
+						continue;
+				}
+
+				// 1.0.4 or newer clients support network routes in addition to IPs.
+				// Older clients only support IP address / netmask entries.
+				if ((clientIs104)||(ipt == ZT_IP_ASSIGNMENT_TYPE_ADDRESS)) {
+					char tmp[32];
+					Utils::snprintf(tmp,sizeof(tmp),"%d.%d.%d.%d/%d",(int)ip[12],(int)ip[13],(int)ip[14],(int)ip[15],ipNetmaskBits);
+					if (v4s.length())
+						v4s.push_back(',');
+					v4s.append(tmp);
+				}
+			}
+
+			if ((!haveStaticIpAssignment)&&(!amActiveBridge)) {
+				// Attempt to auto-assign an IPv4 address from an available routed pool
+				sqlite3_reset(_sGetIpAssignmentPools);
+				sqlite3_bind_text(_sGetIpAssignmentPools,1,network.id,16,SQLITE_STATIC);
+				sqlite3_bind_int(_sGetIpAssignmentPools,2,4); // 4 == IPv4
+
+				while (sqlite3_step(_sGetIpAssignmentPools) == SQLITE_ROW) {
+					const unsigned char *ipRangeStartB = reinterpret_cast<const unsigned char *>(sqlite3_column_blob(_sGetIpAssignmentPools,0));
+					const unsigned char *ipRangeEndB = reinterpret_cast<const unsigned char *>(sqlite3_column_blob(_sGetIpAssignmentPools,1));
+					if ((!ipRangeStartB)||(!ipRangeEndB)||(sqlite3_column_bytes(_sGetIpAssignmentPools,0) != 16)||(sqlite3_column_bytes(_sGetIpAssignmentPools,1) != 16))
+						continue;
+
+					uint32_t ipRangeStart = Utils::ntoh(*(reinterpret_cast<const uint32_t *>(ipRangeStartB + 12)));
+					uint32_t ipRangeEnd = Utils::ntoh(*(reinterpret_cast<const uint32_t *>(ipRangeEndB + 12)));
+					if ((ipRangeEnd <= ipRangeStart)||(ipRangeStart == 0))
+						continue;
+					uint32_t ipRangeLen = ipRangeEnd - ipRangeStart;
+
+					// Start with the LSB of the member's address
+					uint32_t ipTrialCounter = (uint32_t)(identity.address().toInt() & 0xffffffff);
+
+					for(uint32_t k=ipRangeStart,l=0;(k<=ipRangeEnd)&&(l < 1000000);++k,++l) {
+						uint32_t ip = (ipRangeLen > 0) ? (ipRangeStart + (ipTrialCounter % ipRangeLen)) : ipRangeStart;
+						++ipTrialCounter;
+						if ((ip & 0x000000ff) == 0x000000ff)
+							continue; // don't allow addresses that end in .255
+
+						for(std::vector< std::pair<uint32_t,int> >::const_iterator r(routedNetworks.begin());r!=routedNetworks.end();++r) {
+							if ((ip & (0xffffffff << (32 - r->second))) == r->first) {
+								// IP is included in a routed network, so check if it's allocated
+
+								uint32_t ipBlob[4];
+								ipBlob[0] = 0; ipBlob[1] = 0; ipBlob[2] = 0; ipBlob[3] = Utils::hton(ip);
+
+								sqlite3_reset(_sCheckIfIpIsAllocated);
+								sqlite3_bind_text(_sCheckIfIpIsAllocated,1,network.id,16,SQLITE_STATIC);
+								sqlite3_bind_blob(_sCheckIfIpIsAllocated,2,(const void *)ipBlob,16,SQLITE_STATIC);
+								sqlite3_bind_int(_sCheckIfIpIsAllocated,3,4); // 4 == IPv4
+								sqlite3_bind_int(_sCheckIfIpIsAllocated,4,(int)ZT_IP_ASSIGNMENT_TYPE_ADDRESS);
+								if (sqlite3_step(_sCheckIfIpIsAllocated) != SQLITE_ROW) {
+									// No rows returned, so the IP is available
+									sqlite3_reset(_sAllocateIp);
+									sqlite3_bind_text(_sAllocateIp,1,network.id,16,SQLITE_STATIC);
+									sqlite3_bind_text(_sAllocateIp,2,member.nodeId,10,SQLITE_STATIC);
+									sqlite3_bind_int(_sAllocateIp,3,(int)ZT_IP_ASSIGNMENT_TYPE_ADDRESS);
+									sqlite3_bind_blob(_sAllocateIp,4,(const void *)ipBlob,16,SQLITE_STATIC);
+									sqlite3_bind_int(_sAllocateIp,5,r->second); // IP netmask bits from matching route
+									sqlite3_bind_int(_sAllocateIp,6,4); // 4 == IPv4
+									if (sqlite3_step(_sAllocateIp) == SQLITE_DONE) {
+										char tmp[32];
+										Utils::snprintf(tmp,sizeof(tmp),"%d.%d.%d.%d/%d",(int)((ip >> 24) & 0xff),(int)((ip >> 16) & 0xff),(int)((ip >> 8) & 0xff),(int)(ip & 0xff),r->second);
+										if (v4s.length())
+											v4s.push_back(',');
+										v4s.append(tmp);
+										haveStaticIpAssignment = true; // break outer loop
+									}
+								}
+
+								break; // stop checking routed networks
+							}
+						}
+
+						if (haveStaticIpAssignment)
+							break;
+					}
+				}
+			}
+
+			if (v4s.length())
+				netconf[ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC] = v4s;
+		}
+
+		if ((network.v6AssignMode)&&(!strcmp(network.v6AssignMode,"rfc4193"))) {
+			InetAddress rfc4193Addr(InetAddress::makeIpv6rfc4193(nwid,identity.address().toInt()));
+			netconf[ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC] = rfc4193Addr.toString();
+		}
+
+		if (network.isPrivate) {
+			CertificateOfMembership com(now,ZT_NETWORK_COM_DEFAULT_REVISION_MAX_DELTA,nwid,identity.address());
+			if (com.sign(signingId)) // basically can't fail unless our identity is invalid
+				netconf[ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP] = com.toString();
+			else {
+				netconf["error"] = "unable to sign COM";
+				return NETCONF_QUERY_INTERNAL_SERVER_ERROR;
+			}
+		}
+
+		if (!netconf.sign(signingId,now)) {
+			netconf["error"] = "unable to sign netconf dictionary";
+			return NETCONF_QUERY_INTERNAL_SERVER_ERROR;
+		}
+	}
+
+	return NetworkController::NETCONF_QUERY_OK;
+}
+
+void SqliteNetworkController::_circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report)
+{
+	char tmp[65535];
+	SqliteNetworkController *const self = reinterpret_cast<SqliteNetworkController *>(test->ptr);
+
+	if (!test)
+		return;
+	if (!report)
+		return;
+
+	Mutex::Lock _l(self->_lock);
+	std::map< uint64_t,_CircuitTestEntry >::iterator cte(self->_circuitTests.find(test->testId));
+
+	if (cte == self->_circuitTests.end()) { // sanity check: a circuit test we didn't launch?
+		self->_node->circuitTestEnd(test);
+		::free((void *)test);
+		return;
+	}
+
+	Utils::snprintf(tmp,sizeof(tmp),
+		"%s{\n"
+		"\t\"timestamp\": %llu,"ZT_EOL_S
+		"\t\"testId\": \"%.16llx\","ZT_EOL_S
+		"\t\"upstream\": \"%.10llx\","ZT_EOL_S
+		"\t\"current\": \"%.10llx\","ZT_EOL_S
+		"\t\"receivedTimestamp\": %llu,"ZT_EOL_S
+		"\t\"remoteTimestamp\": %llu,"ZT_EOL_S
+		"\t\"sourcePacketId\": \"%.16llx\","ZT_EOL_S
+		"\t\"flags\": %llu,"ZT_EOL_S
+		"\t\"sourcePacketHopCount\": %u,"ZT_EOL_S
+		"\t\"errorCode\": %u,"ZT_EOL_S
+		"\t\"vendor\": %d,"ZT_EOL_S
+		"\t\"protocolVersion\": %u,"ZT_EOL_S
+		"\t\"majorVersion\": %u,"ZT_EOL_S
+		"\t\"minorVersion\": %u,"ZT_EOL_S
+		"\t\"revision\": %u,"ZT_EOL_S
+		"\t\"platform\": %d,"ZT_EOL_S
+		"\t\"architecture\": %d,"ZT_EOL_S
+		"\t\"receivedOnLocalAddress\": \"%s\","ZT_EOL_S
+		"\t\"receivedFromRemoteAddress\": \"%s\""ZT_EOL_S
+		"}",
+		((cte->second.jsonResults.length() > 0) ? ",\n" : ""),
+		(unsigned long long)report->timestamp,
+		(unsigned long long)test->testId,
+		(unsigned long long)report->upstream,
+		(unsigned long long)report->current,
+		(unsigned long long)OSUtils::now(),
+		(unsigned long long)report->remoteTimestamp,
+		(unsigned long long)report->sourcePacketId,
+		(unsigned long long)report->flags,
+		report->sourcePacketHopCount,
+		report->errorCode,
+		(int)report->vendor,
+		report->protocolVersion,
+		report->majorVersion,
+		report->minorVersion,
+		report->revision,
+		(int)report->platform,
+		(int)report->architecture,
+		reinterpret_cast<const InetAddress *>(&(report->receivedOnLocalAddress))->toString().c_str(),
+		reinterpret_cast<const InetAddress *>(&(report->receivedFromRemoteAddress))->toString().c_str());
+
+	cte->second.jsonResults.append(tmp);
+}
+
+} // namespace ZeroTier
diff --git a/controller/SqliteNetworkController.hpp b/controller/SqliteNetworkController.hpp
new file mode 100644
index 000000000..11be9db47
--- /dev/null
+++ b/controller/SqliteNetworkController.hpp
@@ -0,0 +1,191 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_SQLITENETWORKCONTROLLER_HPP
+#define ZT_SQLITENETWORKCONTROLLER_HPP
+
+#include <stdint.h>
+
+#include <sqlite3.h>
+
+#include <string>
+#include <map>
+#include <vector>
+
+#include "../node/Constants.hpp"
+#include "../node/NetworkController.hpp"
+#include "../node/Mutex.hpp"
+#include "../osdep/Thread.hpp"
+
+// Number of in-memory last log entries to maintain per user
+#define ZT_SQLITENETWORKCONTROLLER_IN_MEMORY_LOG_SIZE 32
+
+// How long do circuit tests last before they're forgotten?
+#define ZT_SQLITENETWORKCONTROLLER_CIRCUIT_TEST_TIMEOUT 60000
+
+namespace ZeroTier {
+
+class Node;
+
+class SqliteNetworkController : public NetworkController
+{
+public:
+	SqliteNetworkController(Node *node,const char *dbPath,const char *circuitTestPath);
+	virtual ~SqliteNetworkController();
+
+	virtual NetworkController::ResultCode doNetworkConfigRequest(
+		const InetAddress &fromAddr,
+		const Identity &signingId,
+		const Identity &identity,
+		uint64_t nwid,
+		const Dictionary &metaData,
+		Dictionary &netconf);
+
+	unsigned int handleControlPlaneHttpGET(
+		const std::vector<std::string> &path,
+		const std::map<std::string,std::string> &urlArgs,
+		const std::map<std::string,std::string> &headers,
+		const std::string &body,
+		std::string &responseBody,
+		std::string &responseContentType);
+	unsigned int handleControlPlaneHttpPOST(
+		const std::vector<std::string> &path,
+		const std::map<std::string,std::string> &urlArgs,
+		const std::map<std::string,std::string> &headers,
+		const std::string &body,
+		std::string &responseBody,
+		std::string &responseContentType);
+	unsigned int handleControlPlaneHttpDELETE(
+		const std::vector<std::string> &path,
+		const std::map<std::string,std::string> &urlArgs,
+		const std::map<std::string,std::string> &headers,
+		const std::string &body,
+		std::string &responseBody,
+		std::string &responseContentType);
+
+	// threadMain() for backup thread -- do not call directly
+	void threadMain()
+		throw();
+
+private:
+	enum IpAssignmentType {
+		// IP assignment is a static IP address
+		ZT_IP_ASSIGNMENT_TYPE_ADDRESS = 0,
+		// IP assignment is a network -- a route via this interface, not an address
+		ZT_IP_ASSIGNMENT_TYPE_NETWORK = 1
+	};
+
+	unsigned int _doCPGet(
+		const std::vector<std::string> &path,
+		const std::map<std::string,std::string> &urlArgs,
+		const std::map<std::string,std::string> &headers,
+		const std::string &body,
+		std::string &responseBody,
+		std::string &responseContentType);
+	NetworkController::ResultCode _doNetworkConfigRequest(
+		const InetAddress &fromAddr,
+		const Identity &signingId,
+		const Identity &identity,
+		uint64_t nwid,
+		const Dictionary &metaData,
+		Dictionary &netconf);
+
+	static void _circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report);
+
+	Node *_node;
+	Thread _backupThread;
+	volatile bool _backupThreadRun;
+	std::string _dbPath;
+	std::string _circuitTestPath;
+	std::string _instanceId;
+
+	// Circuit tests outstanding
+	struct _CircuitTestEntry
+	{
+		ZT_CircuitTest *test;
+		std::string jsonResults;
+	};
+	std::map< uint64_t,_CircuitTestEntry > _circuitTests;
+
+	// Last request time by address, for rate limitation
+	std::map< std::pair<uint64_t,uint64_t>,uint64_t > _lastRequestTime;
+
+	sqlite3 *_db;
+
+	sqlite3_stmt *_sGetNetworkById;
+	sqlite3_stmt *_sGetMember;
+	sqlite3_stmt *_sCreateMember;
+	sqlite3_stmt *_sGetNodeIdentity;
+	sqlite3_stmt *_sCreateOrReplaceNode;
+	sqlite3_stmt *_sGetMaxNodeHistoryNetworkVisitCounter;
+	sqlite3_stmt *_sAddNodeHistoryEntry;
+	sqlite3_stmt *_sDeleteOldNodeHistoryEntries;
+	sqlite3_stmt *_sGetActiveNodesOnNetwork;
+	sqlite3_stmt *_sGetNodeHistory;
+	sqlite3_stmt *_sGetEtherTypesFromRuleTable;
+	sqlite3_stmt *_sGetActiveBridges;
+	sqlite3_stmt *_sGetIpAssignmentsForNode;
+	sqlite3_stmt *_sGetIpAssignmentPools;
+	sqlite3_stmt *_sGetLocalRoutes;
+	sqlite3_stmt *_sCheckIfIpIsAllocated;
+	sqlite3_stmt *_sAllocateIp;
+	sqlite3_stmt *_sDeleteIpAllocations;
+	sqlite3_stmt *_sDeleteLocalRoutes;
+	sqlite3_stmt *_sGetRelays;
+	sqlite3_stmt *_sListNetworks;
+	sqlite3_stmt *_sListNetworkMembers;
+	sqlite3_stmt *_sGetMember2;
+	sqlite3_stmt *_sGetIpAssignmentPools2;
+	sqlite3_stmt *_sListRules;
+	sqlite3_stmt *_sCreateRule;
+	sqlite3_stmt *_sCreateNetwork;
+	sqlite3_stmt *_sGetNetworkRevision;
+	sqlite3_stmt *_sSetNetworkRevision;
+	sqlite3_stmt *_sGetIpAssignmentsForNode2;
+	sqlite3_stmt *_sDeleteRelaysForNetwork;
+	sqlite3_stmt *_sCreateRelay;
+	sqlite3_stmt *_sDeleteIpAssignmentPoolsForNetwork;
+	sqlite3_stmt *_sDeleteRulesForNetwork;
+	sqlite3_stmt *_sCreateIpAssignmentPool;
+	sqlite3_stmt *_sUpdateMemberAuthorized;
+	sqlite3_stmt *_sUpdateMemberActiveBridge;
+	sqlite3_stmt *_sDeleteMember;
+	sqlite3_stmt *_sDeleteAllNetworkMembers;
+	sqlite3_stmt *_sDeleteNetwork;
+	sqlite3_stmt *_sGetGateways;
+	sqlite3_stmt *_sDeleteGateways;
+	sqlite3_stmt *_sCreateGateway;
+	sqlite3_stmt *_sIncrementMemberRevisionCounter;
+	sqlite3_stmt *_sGetConfig;
+	sqlite3_stmt *_sSetConfig;
+
+	Mutex _lock;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/controller/schema.sql b/controller/schema.sql
new file mode 100644
index 000000000..aff088273
--- /dev/null
+++ b/controller/schema.sql
@@ -0,0 +1,127 @@
+CREATE TABLE Config (
+  k varchar(16) PRIMARY KEY NOT NULL,
+  v varchar(1024) NOT NULL
+);
+
+CREATE TABLE Network (
+  id char(16) PRIMARY KEY NOT NULL,
+  name varchar(128) NOT NULL,
+  private integer NOT NULL DEFAULT(1),
+  enableBroadcast integer NOT NULL DEFAULT(1),
+  allowPassiveBridging integer NOT NULL DEFAULT(0),
+  v4AssignMode varchar(8) NOT NULL DEFAULT('none'),
+  v6AssignMode varchar(8) NOT NULL DEFAULT('none'),
+  multicastLimit integer NOT NULL DEFAULT(32),
+  creationTime integer NOT NULL DEFAULT(0),
+  revision integer NOT NULL DEFAULT(1),
+  memberRevisionCounter integer NOT NULL DEFAULT(1)
+);
+
+CREATE TABLE AuthToken (
+  id integer PRIMARY KEY NOT NULL,
+  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
+  authMode integer NOT NULL DEFAULT(1),
+  useCount integer NOT NULL DEFAULT(0),
+  maxUses integer NOT NULL DEFAULT(0),
+  expiresAt integer NOT NULL DEFAULT(0),
+  token varchar(256) NOT NULL
+);
+
+CREATE INDEX AuthToken_networkId_token ON AuthToken(networkId,token);
+
+CREATE TABLE Node (
+  id char(10) PRIMARY KEY NOT NULL,
+  identity varchar(4096) NOT NULL
+);
+
+CREATE TABLE NodeHistory (
+  nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,
+  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
+  networkVisitCounter INTEGER NOT NULL DEFAULT(0),
+  networkRequestAuthorized INTEGER NOT NULL DEFAULT(0),
+  requestTime INTEGER NOT NULL DEFAULT(0),
+  clientMajorVersion INTEGER NOT NULL DEFAULT(0),
+  clientMinorVersion INTEGER NOT NULL DEFAULT(0),
+  clientRevision INTEGER NOT NULL DEFAULT(0),
+  networkRequestMetaData VARCHAR(1024),
+  fromAddress VARCHAR(128)
+);
+
+CREATE INDEX NodeHistory_nodeId ON NodeHistory (nodeId);
+CREATE INDEX NodeHistory_networkId ON NodeHistory (networkId);
+CREATE INDEX NodeHistory_requestTime ON NodeHistory (requestTime);
+
+CREATE TABLE Gateway (
+  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
+  ip blob(16) NOT NULL,
+  ipVersion integer NOT NULL DEFAULT(4),
+  metric integer NOT NULL DEFAULT(0)
+);
+
+CREATE UNIQUE INDEX Gateway_networkId_ip ON Gateway (networkId, ip);
+
+CREATE TABLE IpAssignment (
+  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
+  nodeId char(10) REFERENCES Node(id) ON DELETE CASCADE,
+  type integer NOT NULL DEFAULT(0),
+  ip blob(16) NOT NULL,
+  ipNetmaskBits integer NOT NULL DEFAULT(0),
+  ipVersion integer NOT NULL DEFAULT(4)
+);
+
+CREATE UNIQUE INDEX IpAssignment_networkId_ip ON IpAssignment (networkId, ip);
+
+CREATE INDEX IpAssignment_networkId_nodeId ON IpAssignment (networkId, nodeId);
+
+CREATE TABLE IpAssignmentPool (
+  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
+  ipRangeStart blob(16) NOT NULL,
+  ipRangeEnd blob(16) NOT NULL,
+  ipVersion integer NOT NULL DEFAULT(4)
+);
+
+CREATE UNIQUE INDEX IpAssignmentPool_networkId_ipRangeStart ON IpAssignmentPool (networkId,ipRangeStart);
+
+CREATE TABLE Member (
+  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
+  nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,
+  authorized integer NOT NULL DEFAULT(0),
+  activeBridge integer NOT NULL DEFAULT(0),
+  memberRevision integer NOT NULL DEFAULT(0),
+  PRIMARY KEY (networkId, nodeId)
+);
+
+CREATE INDEX Member_networkId_activeBridge ON Member(networkId, activeBridge);
+CREATE INDEX Member_networkId_memberRevision ON Member(networkId, memberRevision);
+
+CREATE TABLE Relay (
+  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
+  address char(10) NOT NULL,
+  phyAddress varchar(64) NOT NULL
+);
+
+CREATE UNIQUE INDEX Relay_networkId_address ON Relay (networkId,address);
+
+CREATE TABLE Rule (
+  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
+  ruleNo integer NOT NULL,
+  nodeId char(10) REFERENCES Node(id),
+  sourcePort char(10),
+  destPort char(10),
+  vlanId integer,
+  vlanPcp integer,
+  etherType integer,
+  macSource char(12),
+  macDest char(12),
+  ipSource varchar(64),
+  ipDest varchar(64),
+  ipTos integer,
+  ipProtocol integer,
+  ipSourcePort integer,
+  ipDestPort integer,
+  flags integer,
+  invFlags integer,
+  "action" varchar(4096) NOT NULL DEFAULT('accept')
+);
+
+CREATE UNIQUE INDEX Rule_networkId_ruleNo ON Rule (networkId, ruleNo);
diff --git a/controller/schema.sql.c b/controller/schema.sql.c
new file mode 100644
index 000000000..4b524547e
--- /dev/null
+++ b/controller/schema.sql.c
@@ -0,0 +1,129 @@
+#define ZT_NETCONF_SCHEMA_SQL \
+"CREATE TABLE Config (\n"\
+"  k varchar(16) PRIMARY KEY NOT NULL,\n"\
+"  v varchar(1024) NOT NULL\n"\
+");\n"\
+"\n"\
+"CREATE TABLE Network (\n"\
+"  id char(16) PRIMARY KEY NOT NULL,\n"\
+"  name varchar(128) NOT NULL,\n"\
+"  private integer NOT NULL DEFAULT(1),\n"\
+"  enableBroadcast integer NOT NULL DEFAULT(1),\n"\
+"  allowPassiveBridging integer NOT NULL DEFAULT(0),\n"\
+"  v4AssignMode varchar(8) NOT NULL DEFAULT('none'),\n"\
+"  v6AssignMode varchar(8) NOT NULL DEFAULT('none'),\n"\
+"  multicastLimit integer NOT NULL DEFAULT(32),\n"\
+"  creationTime integer NOT NULL DEFAULT(0),\n"\
+"  revision integer NOT NULL DEFAULT(1),\n"\
+"  memberRevisionCounter integer NOT NULL DEFAULT(1)\n"\
+");\n"\
+"\n"\
+"CREATE TABLE AuthToken (\n"\
+"  id integer PRIMARY KEY NOT NULL,\n"\
+"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
+"  authMode integer NOT NULL DEFAULT(1),\n"\
+"  useCount integer NOT NULL DEFAULT(0),\n"\
+"  maxUses integer NOT NULL DEFAULT(0),\n"\
+"  expiresAt integer NOT NULL DEFAULT(0),\n"\
+"  token varchar(256) NOT NULL\n"\
+");\n"\
+"\n"\
+"CREATE INDEX AuthToken_networkId_token ON AuthToken(networkId,token);\n"\
+"\n"\
+"CREATE TABLE Node (\n"\
+"  id char(10) PRIMARY KEY NOT NULL,\n"\
+"  identity varchar(4096) NOT NULL\n"\
+");\n"\
+"\n"\
+"CREATE TABLE NodeHistory (\n"\
+"  nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,\n"\
+"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
+"  networkVisitCounter INTEGER NOT NULL DEFAULT(0),\n"\
+"  networkRequestAuthorized INTEGER NOT NULL DEFAULT(0),\n"\
+"  requestTime INTEGER NOT NULL DEFAULT(0),\n"\
+"  clientMajorVersion INTEGER NOT NULL DEFAULT(0),\n"\
+"  clientMinorVersion INTEGER NOT NULL DEFAULT(0),\n"\
+"  clientRevision INTEGER NOT NULL DEFAULT(0),\n"\
+"  networkRequestMetaData VARCHAR(1024),\n"\
+"  fromAddress VARCHAR(128)\n"\
+");\n"\
+"\n"\
+"CREATE INDEX NodeHistory_nodeId ON NodeHistory (nodeId);\n"\
+"CREATE INDEX NodeHistory_networkId ON NodeHistory (networkId);\n"\
+"CREATE INDEX NodeHistory_requestTime ON NodeHistory (requestTime);\n"\
+"\n"\
+"CREATE TABLE Gateway (\n"\
+"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
+"  ip blob(16) NOT NULL,\n"\
+"  ipVersion integer NOT NULL DEFAULT(4),\n"\
+"  metric integer NOT NULL DEFAULT(0)\n"\
+");\n"\
+"\n"\
+"CREATE UNIQUE INDEX Gateway_networkId_ip ON Gateway (networkId, ip);\n"\
+"\n"\
+"CREATE TABLE IpAssignment (\n"\
+"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
+"  nodeId char(10) REFERENCES Node(id) ON DELETE CASCADE,\n"\
+"  type integer NOT NULL DEFAULT(0),\n"\
+"  ip blob(16) NOT NULL,\n"\
+"  ipNetmaskBits integer NOT NULL DEFAULT(0),\n"\
+"  ipVersion integer NOT NULL DEFAULT(4)\n"\
+");\n"\
+"\n"\
+"CREATE UNIQUE INDEX IpAssignment_networkId_ip ON IpAssignment (networkId, ip);\n"\
+"\n"\
+"CREATE INDEX IpAssignment_networkId_nodeId ON IpAssignment (networkId, nodeId);\n"\
+"\n"\
+"CREATE TABLE IpAssignmentPool (\n"\
+"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
+"  ipRangeStart blob(16) NOT NULL,\n"\
+"  ipRangeEnd blob(16) NOT NULL,\n"\
+"  ipVersion integer NOT NULL DEFAULT(4)\n"\
+");\n"\
+"\n"\
+"CREATE UNIQUE INDEX IpAssignmentPool_networkId_ipRangeStart ON IpAssignmentPool (networkId,ipRangeStart);\n"\
+"\n"\
+"CREATE TABLE Member (\n"\
+"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
+"  nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,\n"\
+"  authorized integer NOT NULL DEFAULT(0),\n"\
+"  activeBridge integer NOT NULL DEFAULT(0),\n"\
+"  memberRevision integer NOT NULL DEFAULT(0),\n"\
+"  PRIMARY KEY (networkId, nodeId)\n"\
+");\n"\
+"\n"\
+"CREATE INDEX Member_networkId_activeBridge ON Member(networkId, activeBridge);\n"\
+"CREATE INDEX Member_networkId_memberRevision ON Member(networkId, memberRevision);\n"\
+"\n"\
+"CREATE TABLE Relay (\n"\
+"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
+"  address char(10) NOT NULL,\n"\
+"  phyAddress varchar(64) NOT NULL\n"\
+");\n"\
+"\n"\
+"CREATE UNIQUE INDEX Relay_networkId_address ON Relay (networkId,address);\n"\
+"\n"\
+"CREATE TABLE Rule (\n"\
+"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
+"  ruleNo integer NOT NULL,\n"\
+"  nodeId char(10) REFERENCES Node(id),\n"\
+"  sourcePort char(10),\n"\
+"  destPort char(10),\n"\
+"  vlanId integer,\n"\
+"  vlanPcp integer,\n"\
+"  etherType integer,\n"\
+"  macSource char(12),\n"\
+"  macDest char(12),\n"\
+"  ipSource varchar(64),\n"\
+"  ipDest varchar(64),\n"\
+"  ipTos integer,\n"\
+"  ipProtocol integer,\n"\
+"  ipSourcePort integer,\n"\
+"  ipDestPort integer,\n"\
+"  flags integer,\n"\
+"  invFlags integer,\n"\
+"  \"action\" varchar(4096) NOT NULL DEFAULT('accept')\n"\
+");\n"\
+"\n"\
+"CREATE UNIQUE INDEX Rule_networkId_ruleNo ON Rule (networkId, ruleNo);\n"\
+""
diff --git a/controller/schema2c.sh b/controller/schema2c.sh
new file mode 100755
index 000000000..4f4f1647c
--- /dev/null
+++ b/controller/schema2c.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Run this file to package the .sql file into a .c file whenever the SQL changes.
+
+rm -f schema.sql.c
+echo '#define ZT_NETCONF_SCHEMA_SQL \' >schema.sql.c
+cat schema.sql | sed 's/"/\\"/g' | sed 's/^/"/' | sed 's/$/\\n"\\/' >>schema.sql.c
+echo '""' >>schema.sql.c
diff --git a/cycle_controllers.sh b/cycle_controllers.sh
deleted file mode 100755
index 34acacf4e..000000000
--- a/cycle_controllers.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-CONTROLLERS=`kubectl get pods -o=name | grep controller | sed "s/^.\{4\}//"`
-
-for c in ${CONTROLLERS[@]}
-do
-    kubectl delete pod ${c}
-    sleep 30
-done
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index fdc85f860..000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,318 +0,0 @@
-zerotier-one (1.14.2) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Wed, 23 Oct 2024 01:00:00 -0700
-
-zerotier-one (1.14.1) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Wed, 11 Sep 2024 01:00:00 -0700
-
-zerotier-one (1.14.0) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 19 Mar 2024 01:00:00 -0700
-
-zerotier-one (1.12.2) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 12 Sep 2023 01:00:00 -0700
-
-zerotier-one (1.12.1) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 25 Aug 2023 01:00:00 -0700
-
-zerotier-one (1.12.0) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 17 Aug 2023 01:00:00 -0700
-
-zerotier-one (1.10.6) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 21 Mar 2023 01:00:00 -0700
-
-zerotier-one (1.10.5) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 10 Mar 2023 01:00:00 -0700
-
-zerotier-one (1.10.4) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 06 Mar 2023 01:00:00 -0700
-
-zerotier-one (1.10.3) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Sat, 21 Jan 2023 01:00:00 -0700
-
-zerotier-one (1.10.2) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 13 Oct 2022 01:00:00 -0700
-
-zerotier-one (1.10.1) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 27 Jun 2022 01:00:00 -0700
-
-zerotier-one (1.10.0) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 03 Jun 2022 01:00:00 -0700
-
-zerotier-one (1.8.10) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 10 May 2022 01:00:00 -0700
-
-zerotier-one (1.8.9) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 25 Apr 2022 01:00:00 -0700
-
-zerotier-one (1.8.8) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 11 Apr 2022 01:00:00 -0700
-
-zerotier-one (1.8.7) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 21 Mar 2022 01:00:00 -0700
-
-zerotier-one (1.8.6) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 07 Mar 2022 01:00:00 -0700
-
-zerotier-one (1.8.5) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 17 Dec 2021 01:00:00 -0700
-
-zerotier-one (1.8.4) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 23 Nov 2021 01:00:00 -0700
-
-zerotier-one (1.8.3) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 15 Nov 2021 01:00:00 -0700
-
-zerotier-one (1.8.2) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 08 Nov 2021 01:00:00 -0700
-
-zerotier-one (1.8.1) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Wed, 20 Oct 2021 01:00:00 -0700
-
-zerotier-one (1.8.0) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Wed, 15 Sep 2021 01:00:00 -0700
-
-zerotier-one (1.6.6) unstable; urgency=medium
-
-  * Backport endpoint mitigation against address collision attack.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 21 Sep 2021 01:00:00 -0700
-
-zerotier-one (1.6.5) unstable; urgency=medium
-
-  * Fix path filtering bug that could cause "software laser" effect.
-  * Fix printf overflow in CLI (not exploitable or security related)
-  * Fix Windows device enumeration issue.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 13 Apr 2021 01:00:00 -0700
-
-zerotier-one (1.6.4) unstable; urgency=medium
-
-  * REALLY fix a problem causing nodes to go into a "coma" with some network configurations.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 15 Feb 2021 01:00:00 -0700
-
-zerotier-one (1.6.3-1) unstable; urgency=medium
-
-  * Fix a problem causing nodes to go into a "coma" with some network configurations.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 02 Feb 2021 01:00:00 -0700
-
-zerotier-one (1.6.2-2) unstable; urgency=medium
-
-  * This is a minor update to the 1.6.2 package to address issues with
-    running on ARMv6 CPUs like the Raspberry Pi Zero and original v1 Pi.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 31 Nov 2020 01:00:00 -0700
-
-zerotier-one (1.6.2) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 30 Nov 2020 01:00:00 -0700
-
-zerotier-one (1.6.1) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 24 Nov 2020 01:00:00 -0700
-
-zerotier-one (1.6.0) unstable; urgency=medium
-
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 19 Nov 2020 01:00:00 -0700
-
-zerotier-one (1.5.0) unstable; urgency=medium
-
-  * Version 1.5.0 is actually 1.6.0-beta1
-  * See RELEASE-NOTES.md for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 05 Aug 2020 01:00:00 -0700
-
-zerotier-one (1.4.6) unstable; urgency=medium
-
-  * Update default root server list
-  * Fix build flags on "armhf" (32-bit ARM) platforms for better
-    compatibility with Pi Zero and other devices.
-  * Fix license text in one.cpp.
-  * Add a clarification to LICENSE.txt.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 30 Aug 2019 01:00:00 -0700
-
-zerotier-one (1.4.4) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-  * License changed to BSL 1.1
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 23 Aug 2019 01:00:00 -0700
-
-zerotier-one (1.4.2-2) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-  * This is a new build that fixes a binary build issue with containers and SELinux
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 04 Aug 2019 01:00:00 -0700
-
-zerotier-one (1.4.2) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 04 Aug 2019 01:00:00 -0700
-
-zerotier-one (1.4.0) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 29 Jul 2019 01:00:00 -0700
-
-zerotier-one (1.2.12) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 25 Jul 2018 01:00:00 -0700
-
-zerotier-one (1.2.10) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 08 May 2018 01:00:00 -0700
-
-zerotier-one (1.2.8) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 27 Apr 2018 01:00:00 -0700
-
-zerotier-one (1.2.6) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 17 Apr 2018 01:00:00 -0700
-
-zerotier-one (1.2.4) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 24 Mar 2017 01:00:00 -0700
-
-zerotier-one (1.2.2) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 17 Mar 2017 01:00:00 -0700
-
-zerotier-one (1.2.0) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 14 Mar 2017 09:08:00 -0700
-
-zerotier-one (1.1.14) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 21 Jul 2016 07:14:12 -0700
-
-zerotier-one (1.1.12) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 12 Jul 2016 03:02:22 -0700
-
-zerotier-one (1.1.10) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-  * ZeroTier Debian packages no longer depend on http-parser since its ABI is too unstable.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 12 Jul 2016 12:29:00 -0700
-
-zerotier-one (1.1.8) unstable; urgency=low
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 08 Jul 2016 01:56:00 -0700
-
-zerotier-one (1.1.6) unstable; urgency=medium
-
-  * First Debian release on ZeroTier, Inc. private apt repository.
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 24 Jun 2016 10:00:00 -0700
-
-zerotier-one (1.1.5) UNRELEASED; urgency=medium
-
-  * Development package -- first clean Debian packaging test.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Wed, 08 Jun 2016 10:05:01 -0700
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 9a037142a..000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
\ No newline at end of file
diff --git a/debian/control b/debian/control
deleted file mode 100644
index b0c178ab1..000000000
--- a/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: zerotier-one
-Maintainer: Adam Ierymenko <adam.ierymenko@zerotier.com>
-Section: net
-Priority: optional
-Standards-Version: 3.9.6
-Build-Depends: debhelper
-Vcs-Git: git://github.com/zerotier/ZeroTierOne
-Vcs-Browser: https://github.com/zerotier/ZeroTierOne
-Homepage: https://www.zerotier.com/
-
-Package: zerotier-one
-Architecture: any
-Depends: adduser, libstdc++6 (>= 5), openssl
-Homepage: https://www.zerotier.com/
-Description: ZeroTier network virtualization service
- ZeroTier One lets you join ZeroTier virtual networks and
- have them appear as tun/tap ports on your system. See
- https://www.zerotier.com/ for instructions and
- documentation.
diff --git a/debian/control.wheezy b/debian/control.wheezy
deleted file mode 100644
index fbbc40d93..000000000
--- a/debian/control.wheezy
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: zerotier-one
-Maintainer: Adam Ierymenko <adam.ierymenko@zerotier.com>
-Section: net
-Priority: optional
-Standards-Version: 3.9.4
-Build-Depends: debhelper
-Vcs-Git: git://github.com/zerotier/ZeroTierOne
-Vcs-Browser: https://github.com/zerotier/ZeroTierOne
-Homepage: https://www.zerotier.com/
-
-Package: zerotier-one
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstdc++6
-Homepage: https://www.zerotier.com/
-Description: ZeroTier network virtualization service
- ZeroTier One lets you join ZeroTier virtual networks and
- have them appear as tun/tap ports on your system. See
- https://www.zerotier.com/ for instructions and
- documentation.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index da3678d52..000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,18 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: zerotier-one
-Source: https://github.com/zerotier/ZeroTierOne
-
-Files: *
-Copyright: 2011-2016 ZeroTier, Inc.
-License: ZeroTier BSL 1.1
-
-License: ZeroTier BSL 1.1
- Copyright (c)2019 ZeroTier, Inc.
-
- Use of this software is governed by the Business Source License included
- in the LICENSE.TXT file in the project's root directory.
-
- Change Date: 2026-01-01
-
- On the date above, in accordance with the Business Source License, use
- of this software will be governed by version 2.0 of the Apache License.
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index b6e7471c4..000000000
--- a/debian/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-  configure)
-      if ! id zerotier-one >>/dev/null 2>&1; then
-        useradd --system --user-group --home-dir /var/lib/zerotier-one --shell /usr/sbin/nologin --no-create-home zerotier-one
-      fi
-      ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
deleted file mode 100644
index 81fde680b..000000000
--- a/debian/rules
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/make -f
-
-CFLAGS=-O3 -fstack-protector-strong
-CXXFLAGS=-O3 -fstack-protector-strong
-
-%:
-	dh $@ --with systemd
-
-override_dh_auto_build:
-	make
-
-override_dh_systemd_start:
-	dh_systemd_start --restart-after-upgrade
-
-override_dh_installinit:
-	dh_installinit --name=zerotier-one -- defaults
diff --git a/debian/rules.static b/debian/rules.static
deleted file mode 100644
index 72c529552..000000000
--- a/debian/rules.static
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/make -f
-
-CFLAGS=-O3 -fstack-protector-strong
-CXXFLAGS=-O3 -fstack-protector-strong
-
-%:
-	dh $@ --with systemd
-
-override_dh_auto_build:
-#	make -j 2
-
-override_dh_systemd_start:
-	dh_systemd_start --restart-after-upgrade
-
-override_dh_installinit:
-	dh_installinit --name=zerotier-one -- defaults
diff --git a/debian/rules.wheezy b/debian/rules.wheezy
deleted file mode 100644
index 55e2647a2..000000000
--- a/debian/rules.wheezy
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/make -f
-
-CFLAGS=-O3 -fstack-protector
-CXXFLAGS=-O3 -fstack-protector
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	make -j 2
-
diff --git a/debian/rules.wheezy.static b/debian/rules.wheezy.static
deleted file mode 100644
index 0165be37e..000000000
--- a/debian/rules.wheezy.static
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/make -f
-
-CFLAGS=-O3 -fstack-protector
-CXXFLAGS=-O3 -fstack-protector
-
-%:
-	dh $@
-
-override_dh_auto_build:
-#	make -j 2
-
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 46ebe0266..000000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
\ No newline at end of file
diff --git a/debian/ufw-zerotier-one b/debian/ufw-zerotier-one
deleted file mode 100644
index 7c2908941..000000000
--- a/debian/ufw-zerotier-one
+++ /dev/null
@@ -1,4 +0,0 @@
-[zerotier-one]
-title=ZeroTier One
-description=A planetary Ethernet switch
-ports=9993/udp
diff --git a/debian/zerotier-one.init b/debian/zerotier-one.init
deleted file mode 100644
index 41a22a50d..000000000
--- a/debian/zerotier-one.init
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          zerotier-one
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: ZeroTier One network virtualization service
-### END INIT INFO
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DESC="zerotier-one daemon"
-NAME=zerotier-one
-DAEMON=/usr/sbin/zerotier-one
-PIDFILE=/var/lib/zerotier-one/zerotier-one.pid
-SCRIPTNAME=/etc/init.d/"$NAME"
-EXTRA_OPTS=-d
-
-test -f $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-case "$1" in
-start)	log_daemon_msg "Starting ZeroTier One" "zerotier-one"
-        start_daemon -p $PIDFILE $DAEMON $EXTRA_OPTS
-        log_end_msg $?
-	;;
-stop)	log_daemon_msg "Stopping ZeroTier One" "zerotier-one"
-        killproc -p $PIDFILE $DAEMON
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && [ -e "$PIDFILE" ] && rm -f $PIDFILE
-        log_end_msg $RETVAL
-        ;;
-restart) log_daemon_msg "Restarting ZeroTier One" "zerotier-one" 
-        $0 stop
-        $0 start
-        ;;
-reload|force-reload) log_daemon_msg "Reloading ZeroTier One" "zerotier-one"
-        log_end_msg 0
-        ;;
-status)
-        status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
-        ;;
-*)	log_action_msg "Usage: /etc/init.d/cron {start|stop|status|restart|reload|force-reload}"
-        exit 2
-        ;;
-esac
-exit 0
diff --git a/debian/zerotier-one.service b/debian/zerotier-one.service
deleted file mode 100644
index 9d6a21b0a..000000000
--- a/debian/zerotier-one.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=ZeroTier One
-After=network-online.target network.target
-Wants=network-online.target
-
-[Service]
-ExecStart=/usr/sbin/zerotier-one
-Restart=always
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/debian/zerotier-one.upstart b/debian/zerotier-one.upstart
deleted file mode 100644
index 7753580a8..000000000
--- a/debian/zerotier-one.upstart
+++ /dev/null
@@ -1,14 +0,0 @@
-description "ZeroTier One upstart startup script"
-
-author "Adam Ierymenko <adam.ierymenko@zerotier.com>"
-
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [!2345]
-
-respawn
-respawn limit 2 300
-
-#pre-start script
-#end script
-
-exec /usr/sbin/zerotier-one
diff --git a/doc/README.md b/doc/README.md
deleted file mode 100644
index 681954cc5..000000000
--- a/doc/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Manual Pages and Other Documentation
-=====
-
-Use "./build.sh" to build the manual pages.
-
-You'll need either Node.js/npm installed (script will then automatically install the npm *marked-man* package) or */usr/bin/ronn*. The latter is a Ruby program packaged on some distributions as *rubygem-ronn* or *ruby-ronn* or installable as *gem install ronn*. The Node *marked-man* package and *ronn* from RubyGems are two roughly equivalent alternatives for compiling Markdown into roff/man format.
diff --git a/doc/build.sh b/doc/build.sh
deleted file mode 100755
index 9df72a333..000000000
--- a/doc/build.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin
-
-if [ ! -f zerotier-cli.1.md ]; then
-	echo 'This script must be run from the doc/ subfolder of the ZeroTier tree.'
-fi
-
-rm -f *.1 *.2 *.8
-
-if [ -e /usr/bin/ronn -o -e /usr/local/bin/ronn ]; then
-	# Use 'ronn' which is available as a package on many distros including Debian
-	ronn -r zerotier-cli.1.md
-	ronn -r zerotier-idtool.1.md
-	ronn -r zerotier-one.8.md
-else
-	# Use 'marked-man' from npm
-	NODE=/usr/bin/node
-	if [ ! -e $NODE ]; then
-		if [ -e /usr/bin/nodejs ]; then
-			NODE=/usr/bin/nodejs
-		elif [ -e /usr/local/bin/node ]; then
-			NODE=/usr/local/bin/node
-		elif [ -e /usr/local/bin/nodejs ]; then
-			NODE=/usr/local/bin/nodejs
-		else
-			echo 'Unable to find ronn or node/npm -- cannot build man pages!'
-			exit 1
-		fi
-	fi
-
-	if [ ! -f node_modules/marked-man/bin/marked-man ]; then
-		echo 'Installing npm package "marked-man" -- MarkDown to ROFF converter...'
-		npm install marked-man
-	fi
-
-	$NODE node_modules/marked-man/bin/marked-man zerotier-cli.1.md >zerotier-cli.1
-	$NODE node_modules/marked-man/bin/marked-man zerotier-idtool.1.md >zerotier-idtool.1
-	$NODE node_modules/marked-man/bin/marked-man zerotier-one.8.md >zerotier-one.8
-fi
-
-exit 0
diff --git a/doc/contact@zerotier.com.gpg b/doc/contact@zerotier.com.gpg
deleted file mode 100644
index dc7d6455c..000000000
--- a/doc/contact@zerotier.com.gpg
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: GPGTools - https://gpgtools.org
-
-mQINBFdQq7oBEADEVhyRiaL8dEjMPlI/idO8tA7adjhfvejxrJ3Axxi9YIuIKhWU
-5hNjDjZAiV9iSCMfJN3TjC3EDA+7nFyU6nDKeAMkXPbaPk7ti+Tb1nA4TJsBfBlm
-CC14aGWLItpp8sI00FUzorxLWRmU4kOkrRUJCq2kAMzbYWmHs0hHkWmvj8gGu6mJ
-WU3sDIjvdsm3hlgtqr9grPEnj+gA7xetGs3oIfp6YDKymGAV49HZmVAvSeoqfL1p
-pEKlNQ1aO9uNfHLdx6+4pS1miyo7D1s7ru2IcqhTDhg40cHTL/VldC3d8vXRFLIi
-Uo2tFZ6J1jyQP5c1K4rTpw3UNVne3ob7uCME+T1+ePeuM5Y/cpcCvAhJhO0rrlr0
-dP3lOKrVdZg4qhtFAspC85ivcuxWNWnfTOBrgnvxCA1fmBX+MLNUEDsuu55LBNQT
-5+WyrSchSlsczq+9EdomILhixUflDCShHs+Efvh7li6Pg56fwjEfj9DJYFhRvEvQ
-7GZ7xtysFzx4AYD4/g5kCDsMTbc9W4Jv+JrMt3JsXt2zqwI0P4R1cIAu0J6OZ4Xa
-dJ7Ci1WisQuJRcCUtBTUxcYAClNGeors5Nhl4zDrNIM7zIJp+GfPYdWKVSuW10mC
-r3OS9QctMSeVPX/KE85TexeRtmyd4zUdio49+WKgoBhM8Z9MpTaafn2OPQARAQAB
-tFBaZXJvVGllciwgSW5jLiAoWmVyb1RpZXIgU3VwcG9ydCBhbmQgUmVsZWFzZSBT
-aWduaW5nIEtleSkgPGNvbnRhY3RAemVyb3RpZXIuY29tPokCNwQTAQoAIQUCV1Cr
-ugIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRAWVxmII+UqYViGEACnC3+3
-lRzfv7f7JLWo23FSHjlF3IiWfYd+47BLDx706SDih1H6Qt8CqRy706bWbtictEJ/
-xTaWgTEDzY/lRalYO5NAFTgK9h2zBP1t8zdEA/rmtVPOWOzd6jr0q3l3pKQTeMF0
-6g+uaMDG1OkBz6MCwdg9counz6oa8OHK76tXNIBEnGOPBW375z1O+ExyddQOHDcS
-IIsUlFmtIL1yBa7Q5NSfLofPLfS0/o2FItn0riSaAh866nXHynQemjTrqkUxf5On
-65RLM+AJQaEkX17vDlsSljHrtYLKrhEueqeq50e89c2Ya4ucmSVeC9lrSqfyvGOO
-P3aT/hrmeE9XBf7a9vozq7XhtViEC/ZSd1/z/oeypv4QYenfw8CtXP5bW1mKNK/M
-8xnrnYwo9BUMclX2ZAvu1rTyiUvGre9fEGfhlS0rjmCgYfMgBZ+R/bFGiNdn6gAd
-PSY/8fP8KFZl0xUzh2EnWe/bptoZ67CKkDbVZnfWtuKA0Ui7anitkjZiv+6wanv4
-+5A3k/H3D4JofIjRNgx/gdVPhJfWjAoutIgGeIWrkfcAP9EpsR5swyc4KuE6kJ/Y
-wXXVDQiju0xE1EdNx/S1UOeq0EHhOFqazuu00ojATekUPWenNjPWIjBYQ0Ag4ycL
-KU558PFLzqYaHphdWYgxfGR+XSgzVTN1r7lW87kCDQRXUKu6ARAA2wWOywNMzEiP
-ZK6CqLYGZqrpfx+drOxSowwfwjP3odcK8shR/3sxOmYVqZi0XVZtb9aJVz578rNb
-e4Vfugql1Yt6w3V84z/mtfj6ZbTOOU5yAGZQixm6fkXAnpG5Eer/C8Aw8dH1EreP
-Na1gIVcUzlpg2Ql23qjr5LqvGtUB4BqJSF4X8efNi/y0hj/GaivUMqCF6+Vvh3GG
-fhvzhgBPku/5wK2XwBL9BELqaQ/tWOXuztMw0xFH/De75IH3LIvQYCuv1pnM4hJL
-XYnpAGAWfmFtmXNnPVon6g542Z6c0G/qi657xA5vr6OSSbazDJXNiHXhgBYEzRrH
-napcohTQwFKEA3Q4iftrsTDX/eZVTrO9x6qKxwoBVTGwSE52InWAxkkcnZM6tkfV
-n7Ukc0oixZ6E70Svls27zFgaWbUFJQ6JFoC6h+5AYbaga6DwKCYOP3AR+q0ZkcH/
-oJIdvKuhF9zDZbQhd76b4gK3YXnMpVsj9sQ9P23gh61RkAQ1HIlGOBrHS/XYcvpk
-DcfIlJXKC3V1ggrG+BpKu46kiiYmRR1/yM0EXH2n99XhLNSxxFxxWhjyw8RcR6iG
-ovDxWAULW+bJHjaNJdgb8Kab7j2nT2odUjUHMP42uLJgvS5LgRn39IvtzjoScAqg
-8I817m8yLU/91D2f5qmJIwFI6ELwImkAEQEAAYkCHwQYAQoACQUCV1CrugIbDAAK
-CRAWVxmII+UqYWSSEACxaR/hhr8xUIXkIV52BeD+2BOS8FNOi0aM67L4fEVplrsV
-Op9fvAnUNmoiQo+RFdUdaD2Rpq+yUjQHHbj92mlk6Cmaon46wU+5bAWGYpV1Uf+o
-wbKw1Xv83Uj9uHo7zv9WDtOUXUiTe/S792icTfRYrKbwkfI8iCltgNhTQNX0lFX/
-Sr2y1/dGCTCMEuA/ClqGKCm9lIYdu+4z32V9VXTSX85DsUjLOCO/hl9SHaelJgmi
-IJzRY1XLbNDK4IH5eWtbaprkTNIGt00QhsnM5w+rn1tO80giSxXFpKBE+/pAx8PQ
-RdVFzxHtTUGMCkZcgOJolk8y+DJWtX8fP+3a4Vq11a3qKJ19VXk3qnuC1aeW7OQF
-j6ISyHsNNsnBw5BRaS5tdrpLXw6Z7TKr1eq+FylmoOK0pIw5xOdRmSVoFm4lVcI5
-e5EwB7IIRF00IFqrXe8dCT0oDT9RXc6CNh6GIs9D9YKwDPRD/NKQlYoegfa13Jz7
-S3RIXtOXudT1+A1kaBpGKnpXOYD3w7jW2l0zAd6a53AAGy4SnL1ac4cml76NIWiF
-m2KYzvMJZBk5dAtFa0SgLK4fg8X6Ygoo9E0JsXxSrW9I1JVfo6Ia//YOBMtt4XuN
-Awqahjkq87yxOYYTnJmr2OZtQuFboymfMhNqj3G2DYmZ/ZIXXPgwHx0fnd3R0Q==
-=JgAv
------END PGP PUBLIC KEY BLOCK-----
diff --git a/doc/module.mk b/doc/module.mk
new file mode 100644
index 000000000..34fdbaebf
--- /dev/null
+++ b/doc/module.mk
@@ -0,0 +1,52 @@
+# doc/module.mk
+# Part of ZeroTier One, a software-defined network layer.
+#
+# Copyright © 2016 Ben Finney <ben+zerotier@benfinney.id.au>
+# This is free software: you may copy, modify, and/or distribute this
+# work under the terms of the GNU General Public License, version 3 or
+# later as published by the Free Software Foundation.
+# No warranty expressed or implied.
+# See the file ‘LICENSE.txt’ for details.
+
+# Makefile module for ZeroTier One documentation.
+
+TEMPFILE_SUFFIX = .tmp
+.INTERMEDIATE: ${DOCUMENTATION_DIR}/*${TEMPFILE_SUFFIX}
+
+RST_SUFFIX = .txt
+manpage_sections = 1 2 3 4 5 6 7 8
+manpage_names += zerotier-one.8
+manpage_names += zerotier-idtool.1
+manpage_names += zerotier-cli.1
+manpage_source_paths = $(addprefix ${DOC_DIR}/, \
+	$(addsuffix ${RST_SUFFIX},${manpage_names}))
+manpage_paths = $(addprefix ${DOC_DIR}/,${manpage_names})
+manpage_encoding_stub = ${DOC_DIR}/manpage_encoding_declaration.UTF-8
+
+GENERATED_FILES += $(addprefix ${DOC_DIR}/,\
+	$(foreach section,${manpage_sections},*.${section}))
+
+RST2MAN = rst2man
+RST2MAN_OPTS =
+
+
+.PHONY: doc
+doc: manpages
+
+.PHONY: manpages
+manpages: ${manpage_paths}
+
+%.1: %.1${RST_SUFFIX}
+	$(RST2MAN) "$<" > "$@"${TEMPFILE_SUFFIX}
+	cat ${manpage_encoding_stub} "$@"${TEMPFILE_SUFFIX} > "$@"
+
+%.8: %.8${RST_SUFFIX}
+	$(RST2MAN) "$<" > "$@"${TEMPFILE_SUFFIX}
+	cat ${manpage_encoding_stub} "$@"${TEMPFILE_SUFFIX} > "$@"
+
+
+# Local variables:
+# coding: utf-8
+# mode: makefile
+# End:
+# vim: fileencoding=utf-8 filetype=make :
diff --git a/doc/zerotier-cli.1 b/doc/zerotier-cli.1
deleted file mode 100644
index 167109ec9..000000000
--- a/doc/zerotier-cli.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.TH "ZEROTIER\-CLI" "1" "December 2016" "" ""
-.SH "NAME"
-\fBzerotier-cli\fR \- control local ZeroTier virtual network service
-.SH SYNOPSIS
-.P
-\fBzerotier\-cli\fP [\-switches] <command> [arguments]
-.SH DESCRIPTION
-.P
-\fBzerotier\-cli\fR provides a simple command line interface to the local JSON API of the ZeroTier virtual network endpoint service zerotier\-one(8)\.
-.P
-By default \fBzerotier\-cli\fR must be run as root or with \fBsudo\fP\|\. If you want to allow an unprivileged user to use \fBzerotier\-cli\fR to control the system ZeroTier service, you can create a local copy of the ZeroTier service authorization token in the user's home directory:
-.P
-.RS 2
-.nf
-sudo cp /var/lib/zerotier\-one/authtoken\.secret /home/user/\.zeroTierOneAuthToken
-chown user /home/user/\.zeroTierOneAuthToken
-chmod 0600 /home/user/\.zeroTierOneAuthToken
-.fi
-.RE
-.P
-(The location of ZeroTier's service home may differ by platform\. See zerotier\-one(8)\.)
-.P
-Note that this gives the user the power to connect or disconnect the system to or from any virtual network, which is a significant permission\.
-.P
-\fBzerotier\-cli\fR has several command line arguments that are visible in \fBhelp\fP output\. The two most commonly used are \fB\-j\fP for raw JSON output and \fB\-D<path>\fP to specify an alternative ZeroTier service working directory\. Raw JSON output is easier to parse in scripts and also contains verbose details not present in the tabular output\. The \fB\-D<path>\fP option specifies where the service's zerotier\-one\.port and authtoken\.secret files are located if the service is not running at the default location for your system\.
-.SH COMMANDS
-.RS 0
-.IP \(bu 2
-\fBhelp\fP:
-Displays \fBzerotier\-cli\fR help\.
-.IP \(bu 2
-\fBinfo\fP:
-Shows information about this device including its 10\-digit ZeroTier address and apparent connection status\. Use \fB\-j\fP for more verbose output\.
-.IP \(bu 2
-\fBlistpeers\fP:
-This command lists the ZeroTier VL1 (virtual layer 1, the peer to peer network) peers this service knows about and has recently (within the past 30 minutes or so) communicated with\. These are not necessarily all the devices on your virtual network(s), and may also include a few devices not on any virtual network you've joined\. These are typically either root servers or network controllers\.
-.IP \(bu 2
-\fBlistnetworks\fP:
-This lists the networks your system belongs to and some information about them, such as any ZeroTier\-managed IP addresses you have been assigned\. (IP addresses assigned manually to ZeroTier interfaces will not be listed here\. Use the standard network interface commands to see these\.)
-.IP \(bu 2
-\fBjoin\fP:
-To join a network just use \fBjoin\fP and its 16\-digit hex network ID\. That's it\. Then use \fBlistnetworks\fP to see the status\. You'll either get a reply from the network controller with a certificate and other info such as IP assignments, or you'll get "access denied\." In this case you'll need the administrator of this network to authorize your device by its 10\-digit device ID (visible with \fBinfo\fP) on the network's controller\.
-.IP \(bu 2
-\fBleave\fP:
-Leaving a network is as easy as joining it\. This disconnects from the network and deletes its interface from the system\. Note that peers on the network may hang around in \fBlistpeers\fP for up to 30 minutes until they time out due to lack of traffic\. But if they no longer share a network with you, they can't actually communicate with you in any meaningful way\.
-
-.RE
-.SH EXAMPLES
-.P
-Join "Earth," ZeroTier's big public party line network:
-.P
-.RS 2
-.nf
-$ sudo zerotier\-cli join 8056c2e21c000001
-$ sudo zerotier\-cli listnetworks
-( wait until you get an Earth IP )
-$ ping earth\.zerotier\.net
-( you should now be able to ping our Earth test IP )
-.fi
-.RE
-.P
-Leave "Earth":
-.P
-.RS 2
-.nf
-$ sudo zerotier\-cli leave 8056c2e21c000001
-.fi
-.RE
-.P
-List VL1 peers:
-.P
-.RS 2
-.nf
-$ sudo zerotier\-cli listpeers
-.fi
-.RE
-.SH COPYRIGHT
-.P
-(c)2011\-2016 ZeroTier, Inc\. \-\- https://www\.zerotier\.com/ \-\- https://github\.com/zerotier
-.SH SEE ALSO
-.P
-zerotier\-one(8), zerotier\-idtool(1)
-
diff --git a/doc/zerotier-cli.1.md b/doc/zerotier-cli.1.md
deleted file mode 100644
index 6252d452f..000000000
--- a/doc/zerotier-cli.1.md
+++ /dev/null
@@ -1,68 +0,0 @@
-zerotier-cli(1) -- control local ZeroTier virtual network service
-=================================================================
-
-## SYNOPSIS
-
-`zerotier-cli` [-switches] <command> [arguments]
-
-## DESCRIPTION
-
-**zerotier-cli** provides a simple command line interface to the local JSON API of the ZeroTier virtual network endpoint service zerotier-one(8).
-
-By default **zerotier-cli** must be run as root or with `sudo`. If you want to allow an unprivileged user to use **zerotier-cli** to control the system ZeroTier service, you can create a local copy of the ZeroTier service authorization token in the user's home directory:
-
-    sudo cp /var/lib/zerotier-one/authtoken.secret /home/user/.zeroTierOneAuthToken
-    chown user /home/user/.zeroTierOneAuthToken
-    chmod 0600 /home/user/.zeroTierOneAuthToken
-
-(The location of ZeroTier's service home may differ by platform. See zerotier-one(8).)
-
-Note that this gives the user the power to connect or disconnect the system to or from any virtual network, which is a significant permission.
-
-**zerotier-cli** has several command line arguments that are visible in `help` output. The two most commonly used are `-j` for raw JSON output and `-D<path>` to specify an alternative ZeroTier service working directory. Raw JSON output is easier to parse in scripts and also contains verbose details not present in the tabular output. The `-D<path>` option specifies where the service's zerotier-one.port and authtoken.secret files are located if the service is not running at the default location for your system.
-
-## COMMANDS
-
- * `help`:
-   Displays **zerotier-cli** help.
-
- * `info`:
-   Shows information about this device including its 10-digit ZeroTier address and apparent connection status. Use `-j` for more verbose output.
-
- * `listpeers`:
-   This command lists the ZeroTier VL1 (virtual layer 1, the peer to peer network) peers this service knows about and has recently (within the past 30 minutes or so) communicated with. These are not necessarily all the devices on your virtual network(s), and may also include a few devices not on any virtual network you've joined. These are typically either root servers or network controllers.
-
- * `listnetworks`:
-   This lists the networks your system belongs to and some information about them, such as any ZeroTier-managed IP addresses you have been assigned. (IP addresses assigned manually to ZeroTier interfaces will not be listed here. Use the standard network interface commands to see these.)
-
- * `join`:
-   To join a network just use `join` and its 16-digit hex network ID. That's it. Then use `listnetworks` to see the status. You'll either get a reply from the network controller with a certificate and other info such as IP assignments, or you'll get "access denied." In this case you'll need the administrator of this network to authorize your device by its 10-digit device ID (visible with `info`) on the network's controller.
-
- * `leave`:
-   Leaving a network is as easy as joining it. This disconnects from the network and deletes its interface from the system. Note that peers on the network may hang around in `listpeers` for up to 30 minutes until they time out due to lack of traffic. But if they no longer share a network with you, they can't actually communicate with you in any meaningful way.
-
-## EXAMPLES
-
-Join "Earth," ZeroTier's big public party line network:
-
-    $ sudo zerotier-cli join 8056c2e21c000001
-    $ sudo zerotier-cli listnetworks
-    ( wait until you get an Earth IP )
-    $ ping earth.zerotier.net
-    ( you should now be able to ping our Earth test IP )
-
-Leave "Earth":
-
-    $ sudo zerotier-cli leave 8056c2e21c000001
-
-List VL1 peers:
-
-    $ sudo zerotier-cli listpeers
-
-## COPYRIGHT
-
-(c)2011-2016 ZeroTier, Inc. -- https://www.zerotier.com/ -- https://github.com/zerotier
-
-## SEE ALSO
-
-zerotier-one(8), zerotier-idtool(1)
diff --git a/doc/zerotier-cli.1.txt b/doc/zerotier-cli.1.txt
new file mode 100644
index 000000000..ae8a4af77
--- /dev/null
+++ b/doc/zerotier-cli.1.txt
@@ -0,0 +1,109 @@
+============
+zerotier-cli
+============
+
+--------------------------------------------------
+management interface for ZeroTier One peer process
+--------------------------------------------------
+
+:Author: |author|
+:Date: 2016-03-04
+:Copyright:
+    Copyright © 2016 ZeroTier Inc.
+:Manual section: 1
+:Manual group: ZeroTier
+
+..  |command| replace:: **zerotier-cli**
+..  |license| replace::
+    `GNU General Public License, version 3 or later
+    <https://www.gnu.org/licenses/#GPL>`__
+
+
+SYNOPSIS
+========
+
+| |command| [ **-j** ] [ **-D** `HOMEDIR` ] [ **-p** `PORT` ] [ **-t** `AUTH_TOKEN` ] \
+  `command` [ `COMMAND_ARG` ]
+
+
+DESCRIPTION
+===========
+
+|command| is a tool to manage the running **zerotier-one**\ (8)
+process.
+
+*ZeroTier* is a peer-to-peer virtual network. Its “virtual layer 1”
+(VL1) is implemented in the communication between ZeroTier One peers.
+This provides the OSI layer 1 functionality on which to build further
+network services.
+
+
+COMMANDS
+========
+
+|command| **info**
+
+    *FIXME*: display status info
+
+|command| **listpeers**
+
+    *FIXME*: list all peers
+
+|command| **listnetworks**
+
+    *FIXME*: list all networks
+
+|command| **join** `NETWORK`
+
+    *FIXME*: join the network `NETWORK`
+
+|command| **leave** `NETWORK`
+
+    *FIXME*: leave the network `NETWORK`
+
+
+FILES
+=====
+
+The |command| process will discover the running **zerotier-one**\ (8)
+process by examining the specified `HOMEDIR` directory (default:
+``/var/lib/zerotier-one``).
+
+
+SEE ALSO
+========
+
+* **zerotier-one**\ (8)
+
+* ZeroTier One documentation:
+
+  * Product page `<https://www.zerotier.com/product-one.shtml>`__.
+  * Configuration guide `<https://www.zerotier.com/config.shtml>`__.
+  * Technical FAQ `<https://www.zerotier.com/tech_faq.shtml>`__.
+
+
+HISTORY
+=======
+
+The |command| program is developed by ZeroTier Inc.
+
+This manual page was written by |author|. This is free software: you
+may copy, modify and/or distribute this work under the terms of the
+|license| as published by the Free Software Foundation. No warranty
+expressed or implied.
+
+..  |author| replace:: |authorname| |authoremail|
+..  |authorname| replace:: Ben Finney
+..  |authoremail| replace:: <ben+zerotier@benfinney.id.au>
+
+
+..
+    Local variables:
+    mode: rst
+    coding: utf-8
+    time-stamp-format: "%:y-%02m-%02d"
+    time-stamp-start: "^:Date:[         ]+"
+    time-stamp-end: "$"
+    time-stamp-line-limit: 20
+    End:
+    vim: filetype=rst fileencoding=utf-8 :
diff --git a/doc/zerotier-idtool.1 b/doc/zerotier-idtool.1
deleted file mode 100644
index fbc367a6a..000000000
--- a/doc/zerotier-idtool.1
+++ /dev/null
@@ -1,84 +0,0 @@
-.TH "ZEROTIER\-IDTOOL" "1" "December 2016" "" ""
-.SH "NAME"
-\fBzerotier-idtool\fR \- tool for creating and manipulating ZeroTier identities
-.SH SYNOPSIS
-.P
-\fBzerotier\-idtool\fP <command> [args]
-.SH DESCRIPTION
-.P
-\fBzerotier\-idtool\fR is a command line utility for doing things with ZeroTier identities\. A ZeroTier identity consists of a public/private key pair (or just the public if it's only an identity\.public) and a 10\-digit hexadecimal ZeroTier address derived from the public key by way of a proof of work based hash function\.
-.SH COMMANDS
-.P
-When command arguments call for a public or secret (full) identity, the identity can be specified as a path to a file or directly on the command line\.
-.RS 0
-.IP \(bu 2
-\fBhelp\fP:
-Display help\. (Also running with no command does this\.)
-.IP \(bu 2
-\fBgenerate\fP [secret file] [public file] [vanity]:
-Generate a new ZeroTier identity\. If a secret file is specified, the full identity including the private key will be written to this file\. If the public file is specified, the public portion will be written there\. If no file paths are specified the full secret identity is output to STDOUT\. The vanity prefix is a series of hexadecimal digits that the generated identity's address should start with\. Typically this isn't used, and if it's specified generation can take a very long time due to the intrinsic cost of generating identities with their proof of work function\. Generating an identity with a known 16\-bit (4 digit) prefix on a 2\.8ghz Core i5 (using one core) takes an average of two hours\.
-.IP \(bu 2
-\fBvalidate\fP <identity, only public part required>:
-Locally validate an identity's key and proof of work function correspondence\.
-.IP \(bu 2
-\fBgetpublic\fP <full identity with secret>:
-Extract the public portion of an identity\.secret and print to STDOUT\.
-.IP \(bu 2
-\fBsign\fP <full identity with secret> <file to sign>:
-Sign a file's contents with SHA512+ECC\-256 (ed25519)\. The signature is output in hex to STDOUT\.
-.IP \(bu 2
-\fBverify\fP <identity, only public part required> <file to check> <signature in hex>:
-Verify a signature created with \fBsign\fP\|\.
-.IP \(bu 2
-\fBmkcom\fP <full identity with secret> [id,value,maxdelta] [\|\.\.\.]:
-Create and sign a network membership certificate\. This is not generally useful since network controllers do this automatically and is included mostly for testing purposes\.
-
-.RE
-.SH EXAMPLES
-.P
-Generate and dump a new identity:
-.P
-.RS 2
-.nf
-$ zerotier\-idtool generate
-.fi
-.RE
-.P
-Generate and write a new identity, both secret and public parts:
-.P
-.RS 2
-.nf
-$ zerotier\-idtool generate identity\.secret identity\.public
-.fi
-.RE
-.P
-Generate a vanity address that begins with the hex digits "beef" (this will take a while!):
-.P
-.RS 2
-.nf
-$ zerotier\-idtool generate beef\.secret beef\.public beef
-.fi
-.RE
-.P
-Sign a file with an identity's secret key:
-.P
-.RS 2
-.nf
-$ zerotier\-idtool sign identity\.secret last_will_and_testament\.txt
-.fi
-.RE
-.P
-Verify a file's signature with a public key:
-.P
-.RS 2
-.nf
-$ zerotier\-idtool verify identity\.public last_will_and_testament\.txt
-.fi
-.RE
-.SH COPYRIGHT
-.P
-(c)2011\-2016 ZeroTier, Inc\. \-\- https://www\.zerotier\.com/ \-\- https://github\.com/zerotier
-.SH SEE ALSO
-.P
-zerotier\-one(8), zerotier\-cli(1)
-
diff --git a/doc/zerotier-idtool.1.md b/doc/zerotier-idtool.1.md
deleted file mode 100644
index 52a586c11..000000000
--- a/doc/zerotier-idtool.1.md
+++ /dev/null
@@ -1,65 +0,0 @@
-zerotier-idtool(1) -- tool for creating and manipulating ZeroTier identities
-============================================================================
-
-## SYNOPSIS
-
-`zerotier-idtool` <command> [args]
-
-## DESCRIPTION
-
-**zerotier-idtool** is a command line utility for doing things with ZeroTier identities. A ZeroTier identity consists of a public/private key pair (or just the public if it's only an identity.public) and a 10-digit hexadecimal ZeroTier address derived from the public key by way of a proof of work based hash function.
-
-## COMMANDS
-
-When command arguments call for a public or secret (full) identity, the identity can be specified as a path to a file or directly on the command line.
-
- * `help`:
-   Display help. (Also running with no command does this.)
-
- * `generate` [secret file] [public file] [vanity]:
-   Generate a new ZeroTier identity. If a secret file is specified, the full identity including the private key will be written to this file. If the public file is specified, the public portion will be written there. If no file paths are specified the full secret identity is output to STDOUT. The vanity prefix is a series of hexadecimal digits that the generated identity's address should start with. Typically this isn't used, and if it's specified generation can take a very long time due to the intrinsic cost of generating identities with their proof of work function. Generating an identity with a known 16-bit (4 digit) prefix on a 2.8ghz Core i5 (using one core) takes an average of two hours.
-
- * `validate` <identity, only public part required>:
-   Locally validate an identity's key and proof of work function correspondence.
-
- * `getpublic` <full identity with secret>:
-   Extract the public portion of an identity.secret and print to STDOUT.
-
- * `sign` <full identity with secret> <file to sign>:
-   Sign a file's contents with SHA512+ECC-256 (ed25519). The signature is output in hex to STDOUT.
-
- * `verify` <identity, only public part required> <file to check> <signature in hex>:
-   Verify a signature created with `sign`.
-
- * `mkcom` <full identity with secret> [id,value,maxdelta] [...]:
-   Create and sign a network membership certificate. This is not generally useful since network controllers do this automatically and is included mostly for testing purposes.
-
-## EXAMPLES
-
-Generate and dump a new identity:
-
-    $ zerotier-idtool generate
-
-Generate and write a new identity, both secret and public parts:
-
-    $ zerotier-idtool generate identity.secret identity.public
-
-Generate a vanity address that begins with the hex digits "beef" (this will take a while!):
-
-    $ zerotier-idtool generate beef.secret beef.public beef
-
-Sign a file with an identity's secret key:
-
-    $ zerotier-idtool sign identity.secret last_will_and_testament.txt
-
-Verify a file's signature with a public key:
-
-    $ zerotier-idtool verify identity.public last_will_and_testament.txt
-
-## COPYRIGHT
-
-(c)2011-2016 ZeroTier, Inc. -- https://www.zerotier.com/ -- https://github.com/zerotier
-
-## SEE ALSO
-
-zerotier-one(8), zerotier-cli(1)
diff --git a/doc/zerotier-idtool.1.txt b/doc/zerotier-idtool.1.txt
new file mode 100644
index 000000000..2ff0e4c1c
--- /dev/null
+++ b/doc/zerotier-idtool.1.txt
@@ -0,0 +1,115 @@
+===============
+zerotier-idtool
+===============
+
+----------------------------------------------
+identity management tool for ZeroTier One peer
+----------------------------------------------
+
+:Author: |author|
+:Date: 2016-03-04
+:Copyright:
+    Copyright © 2016 ZeroTier Inc.
+:Manual section: 1
+:Manual group: ZeroTier
+
+..  |command| replace:: **zerotier-idtool**
+..  |license| replace::
+    `GNU General Public License, version 3 or later
+    <https://www.gnu.org/licenses/#GPL>`__
+
+
+SYNOPSIS
+========
+
+| |command| **generate** [ `SECRET` ] [ `PUBLIC` ]
+| |command| **validate** `SECRET`
+| |command| **getpublic** `SECRET`
+| |command| **sign** `SECRET`
+| |command| **verify** `IDENTITY` `FILE` `SIGNATURE`
+| |command| **mkcom** `SECRET` `ID`\ **,**\ `VALUE`\ **,**\ `MAX_DELTA` [ ... ] `IDENTITY`
+
+
+DESCRIPTION
+===========
+
+|command| is a tool to manage identities for the **zerotier-one**\ (8)
+program.
+
+*ZeroTier* is a peer-to-peer virtual network. Its “virtual layer 1”
+(VL1) is implemented in the communication between ZeroTier One peers.
+This provides the OSI layer 1 functionality on which to build further
+network services.
+
+
+COMMANDS
+========
+
+|command| **generate** [ `SECRET` ] [ `PUBLIC` ]
+
+    *FIXME*: generate an identity
+
+|command| **validate** `SECRET`
+
+    *FIXME*: validate a secret identity
+
+|command| **getpublic** `SECRET`
+
+    *FIXME*: get a public identity
+
+|command| **sign** `SECRET`
+
+    *FIXME*: sign a secret identity
+
+|command| **verify** `IDENTITY` `FILE` `SIGNATURE`
+
+    *FIXME*: verify a signature
+
+|command| **mkcom** `SECRET` `ID`\ **,**\ `VALUE`\ **,**\ `MAX_DELTA` [ ... ] `IDENTITY`
+
+    *FIXME*: mkcom
+
+
+FILES
+=====
+
+*FIXME*: how does the process know its home directory?
+
+
+SEE ALSO
+========
+
+* **zerotier-one**\ (8)
+
+* ZeroTier One documentation:
+
+  * Product page `<https://www.zerotier.com/product-one.shtml>`__.
+  * Configuration guide `<https://www.zerotier.com/config.shtml>`__.
+  * Technical FAQ `<https://www.zerotier.com/tech_faq.shtml>`__.
+
+
+HISTORY
+=======
+
+The |command| program is developed by ZeroTier Inc.
+
+This manual page was written by |author|. This is free software: you
+may copy, modify and/or distribute this work under the terms of the
+|license| as published by the Free Software Foundation. No warranty
+expressed or implied.
+
+..  |author| replace:: |authorname| |authoremail|
+..  |authorname| replace:: Ben Finney
+..  |authoremail| replace:: <ben+zerotier@benfinney.id.au>
+
+
+..
+    Local variables:
+    mode: rst
+    coding: utf-8
+    time-stamp-format: "%:y-%02m-%02d"
+    time-stamp-start: "^:Date:[         ]+"
+    time-stamp-end: "$"
+    time-stamp-line-limit: 20
+    End:
+    vim: filetype=rst fileencoding=utf-8 :
diff --git a/doc/zerotier-one.8 b/doc/zerotier-one.8
deleted file mode 100644
index 4ad7a15d0..000000000
--- a/doc/zerotier-one.8
+++ /dev/null
@@ -1,104 +0,0 @@
-.TH "ZEROTIER\-ONE" "8" "December 2016" "" ""
-.SH "NAME"
-\fBzerotier-one\fR \- ZeroTier virtual network endpoint service
-.SH SYNOPSIS
-.P
-\fBzerotier\-one\fP [\-switches] [working directory]
-.SH DESCRIPTION
-.P
-\fBzerotier\-one\fR is the service/daemon responsible for connecting a Unix (Linux/BSD/OSX) system to one or more ZeroTier virtual networks and presenting those networks to the system as virtual network ports\. You can think of it as a peer to peer VPN client\.
-.P
-It's typically run by init systems like systemd (Linux) or launchd (Mac) rather than directly by the user, and it must be run as root unless you give it the \fB\-U\fP switch and don't plan on actually joining networks (e\.g\. to run a network controller microservice only)\.
-.P
-The \fBzerotier\-one\fR service keeps its state and other files in a working directory\. If this directory is not specified at launch it defaults to "/var/lib/zerotier\-one" on Linux, "/Library/Application Support/ZeroTier/One" on Mac, and "/var/db/zerotier\-one" on FreeBSD and other similar BSDs\. The working directory should persist\. It shouldn't be automatically cleaned by system cleanup daemons or stored in a volatile location\. Loss of its identity\.secret file results in loss of this system's unique 10\-digit ZeroTier address and key\.
-.P
-Multiple instances of \fBzerotier\-one\fR can be run on the same system as long as they are run with different primary ports (see switches) and a different working directory\. But since a single service can join any number of networks, typically there's no point in doing this\.
-.P
-The \fBzerotier\-one\fR service is controlled via a JSON API available at 127\.0\.0\.1:<primary port> with the default primary port being 9993\. Access to this API requires an authorization token normally found in the authtoken\.secret file in the service's working directory\. On some platforms access may be guarded by other measures such as socket peer UID/GID lookup if additional security options are enabled (this is not the default)\.
-.P
-The first time the service is started in a fresh working directory, it generates a ZeroTier identity\. On slow systems this process can take ten seconds or more due to an anti\-DDOS/anti\-counterfeit proof of work function used by ZeroTier in address generation\. This only happens once, and once generated the result is saved in identity\.secret in the working directory\. This file represents and defines/claims your ZeroTier address and associated ECC\-256 key pair\.
-.SH SWITCHES
-.RS 0
-.IP \(bu 2
-\fB\-h\fP:
-Display help\.
-.IP \(bu 2
-\fB\-v\fP:
-Display ZeroTier One version\.
-.IP \(bu 2
-\fB\-U\fP:
-Skip privilege check and allow to be run by non\-privileged user\. This is typically used when \fBzerotier\-one\fR is built with the network controller option included\. In this case the ZeroTier service might only be acting as a network controller and might never actually join networks, in which case it does not require elevated system permissions\.
-.IP \(bu 2
-\fB\-p<port>\fP:
-Specify a different primary port\. If this is not given the default is 9993\. If zero is given a random port is chosen each time\.
-.IP \(bu 2
-\fB\-d\fP:
-Fork and run as a daemon\.
-.IP \(bu 2
-\fB\-i\fP:
-Invoke the \fBzerotier\-idtool\fR personality, in which case the binary behaves like zerotier\-idtool(1)\. This happens automatically if the name of the binary (or a symlink to it) is zerotier\-idtool\.
-.IP \(bu 2
-\fB\-q\fP:
-Invoke the \fBzerotier\-cli\fR personality, in which case the binary behaves like zerotier\-cli(1)\. This happens automatically if the name of the binary (or a symlink to it) is zerotier\-cli\.
-
-.RE
-.SH EXAMPLES
-.P
-Run as daemon with OS default working directory and default port:
-.P
-.RS 2
-.nf
-$ sudo zerotier\-one \-d
-.fi
-.RE
-.P
-Run as daemon with a different working directory and port:
-.P
-.RS 2
-.nf
-$ sudo zerotier\-one \-d \-p12345 /tmp/zerotier\-working\-directory\-test
-.fi
-.RE
-.SH FILES
-.P
-These are found in the service's working directory\.
-.RS 0
-.IP \(bu 2
-\fBidentity\.public\fP:
-The public portion of your ZeroTier identity, which is your 10\-digit hex address and the associated public key\.
-.IP \(bu 2
-\fBidentity\.secret\fP:
-Your full ZeroTier identity including its private key\. This file identifies the system on the network, which means you can move a ZeroTier address around by copying this file and you should back up this file if you want to save your system's static ZeroTier address\. This file must be protected, since theft of its secret key will allow anyone to impersonate your device on any network and decrypt traffic\. For network controllers this file is particularly sensitive since it constitutes the private key for a certificate authority for the controller's networks\.
-.IP \(bu 2
-\fBauthtoken\.secret\fP:
-The secret token used to authenticate requests to the service's local JSON API\. If it does not exist it is generated from a secure random source on service start\. To use, send it in the "X\-ZT1\-Auth" header with HTTP requests to 127\.0\.0\.1:<primary port>\|\.
-.IP \(bu 2
-\fBdevicemap\fP:
-Remembers mappings of zt# interface numbers to ZeroTier networks so they'll persist across restarts\. On some systems that support longer interface names that can encode the network ID (such as FreeBSD) this file may not be present\.
-.IP \(bu 2
-\fBzerotier\-one\.pid\fP:
-ZeroTier's PID\. This file is deleted on normal shutdown\.
-.IP \(bu 2
-\fBzerotier\-one\.port\fP:
-ZeroTier's primary port, which is also where its JSON API is found at 127\.0\.0\.1:<this port>\|\. This file is created on startup and is read by zerotier\-cli(1) to determine where it should find the control API\.
-.IP \(bu 2
-\fBcontroller\.db\fP:
-If the ZeroTier One service is built with the network controller enabled, this file contains the controller's SQLite3 database\.
-.IP \(bu 2
-\fBcontroller\.db\.backup\fP:
-If the ZeroTier One service is built with the network controller enabled, it periodically backs up its controller\.db database in this file (currently every 5 minutes if there have been changes)\. Since this file is not a currently in use SQLite3 database it's safer to back up without corruption\. On new backups the file is rotated out rather than being rewritten in place\.
-.IP \(bu 2
-\fBiddb\.d/\fP (directory):
-Caches the public identity of every peer ZeroTier has spoken with in the last 60 days\. This directory and its contents can be deleted, but this may result in slower connection initations since it will require that we go out and re\-fetch full identities for peers we're speaking to\.
-.IP \(bu 2
-\fBnetworks\.d\fP (directory):
-This caches network configurations and certificate information for networks you belong to\. ZeroTier scans this directory for <network ID>\|\.conf files on startup to recall its networks, so "touch"ing an empty <network ID>\|\.conf file in this directory is a way of pre\-configuring ZeroTier to join a specific network on startup without using the API\. If the config file is empty ZeroTIer will just fetch it from the network's controller\.
-
-.RE
-.SH COPYRIGHT
-.P
-(c)2011\-2016 ZeroTier, Inc\. \-\- https://www\.zerotier\.com/ \-\- https://github\.com/zerotier
-.SH SEE ALSO
-.P
-zerotier\-cli(1), zerotier\-idtool(1)
-
diff --git a/doc/zerotier-one.8.md b/doc/zerotier-one.8.md
deleted file mode 100644
index 4f4655076..000000000
--- a/doc/zerotier-one.8.md
+++ /dev/null
@@ -1,95 +0,0 @@
-zerotier-one(8) -- ZeroTier virtual network endpoint service
-============================================================
-
-## SYNOPSIS
-
-`zerotier-one` [-switches] [working directory]
-
-## DESCRIPTION
-
-**zerotier-one** is the service/daemon responsible for connecting a Unix (Linux/BSD/OSX) system to one or more ZeroTier virtual networks and presenting those networks to the system as virtual network ports. You can think of it as a peer to peer VPN client.
-
-It's typically run by init systems like systemd (Linux) or launchd (Mac) rather than directly by the user, and it must be run as root unless you give it the `-U` switch and don't plan on actually joining networks (e.g. to run a network controller microservice only).
-
-The **zerotier-one** service keeps its state and other files in a working directory. If this directory is not specified at launch it defaults to "/var/lib/zerotier-one" on Linux, "/Library/Application Support/ZeroTier/One" on Mac, and "/var/db/zerotier-one" on FreeBSD and other similar BSDs. The working directory should persist. It shouldn't be automatically cleaned by system cleanup daemons or stored in a volatile location. Loss of its identity.secret file results in loss of this system's unique 10-digit ZeroTier address and key.
-
-Multiple instances of **zerotier-one** can be run on the same system as long as they are run with different primary ports (see switches) and a different working directory. But since a single service can join any number of networks, typically there's no point in doing this.
-
-The **zerotier-one** service is controlled via a JSON API available at 127.0.0.1:<primary port> with the default primary port being 9993. Access to this API requires an authorization token normally found in the authtoken.secret file in the service's working directory. On some platforms access may be guarded by other measures such as socket peer UID/GID lookup if additional security options are enabled (this is not the default).
-
-The first time the service is started in a fresh working directory, it generates a ZeroTier identity. On slow systems this process can take ten seconds or more due to an anti-DDOS/anti-counterfeit proof of work function used by ZeroTier in address generation. This only happens once, and once generated the result is saved in identity.secret in the working directory. This file represents and defines/claims your ZeroTier address and associated ECC-256 key pair.
-
-## SWITCHES
-
- * `-h`:
-   Display help.
-
- * `-v`:
-   Display ZeroTier One version.
-
- * `-U`:
-   Skip privilege check and allow to be run by non-privileged user. This is typically used when **zerotier-one** is built with the network controller option included. In this case the ZeroTier service might only be acting as a network controller and might never actually join networks, in which case it does not require elevated system permissions.
-
- * `-p<port>`:
-   Specify a different primary port. If this is not given the default is 9993. If zero is given a random port is chosen each time.
-
- * `-d`:
-   Fork and run as a daemon.
-
- * `-i`:
-   Invoke the **zerotier-idtool** personality, in which case the binary behaves like zerotier-idtool(1). This happens automatically if the name of the binary (or a symlink to it) is zerotier-idtool.
-
- * `-q`:
-   Invoke the **zerotier-cli** personality, in which case the binary behaves like zerotier-cli(1). This happens automatically if the name of the binary (or a symlink to it) is zerotier-cli.
-
-## EXAMPLES
-
-Run as daemon with OS default working directory and default port:
-
-    $ sudo zerotier-one -d
-
-Run as daemon with a different working directory and port:
-
-    $ sudo zerotier-one -d -p12345 /tmp/zerotier-working-directory-test
-
-## FILES
-
-These are found in the service's working directory.
-
- * `identity.public`:
-   The public portion of your ZeroTier identity, which is your 10-digit hex address and the associated public key.
-
- * `identity.secret`:
-   Your full ZeroTier identity including its private key. This file identifies the system on the network, which means you can move a ZeroTier address around by copying this file and you should back up this file if you want to save your system's static ZeroTier address. This file must be protected, since theft of its secret key will allow anyone to impersonate your device on any network and decrypt traffic. For network controllers this file is particularly sensitive since it constitutes the private key for a certificate authority for the controller's networks.
-
- * `authtoken.secret`:
-   The secret token used to authenticate requests to the service's local JSON API. If it does not exist it is generated from a secure random source on service start. To use, send it in the "X-ZT1-Auth" header with HTTP requests to 127.0.0.1:<primary port>.
-
- * `devicemap`:
-   Remembers mappings of zt# interface numbers to ZeroTier networks so they'll persist across restarts. On some systems that support longer interface names that can encode the network ID (such as FreeBSD) this file may not be present.
-
- * `zerotier-one.pid`:
-   ZeroTier's PID. This file is deleted on normal shutdown.
-
- * `zerotier-one.port`:
-   ZeroTier's primary port, which is also where its JSON API is found at 127.0.0.1:<this port>. This file is created on startup and is read by zerotier-cli(1) to determine where it should find the control API.
-
- * `controller.db`:
-   If the ZeroTier One service is built with the network controller enabled, this file contains the controller's SQLite3 database.
-
- * `controller.db.backup`:
-   If the ZeroTier One service is built with the network controller enabled, it periodically backs up its controller.db database in this file (currently every 5 minutes if there have been changes). Since this file is not a currently in use SQLite3 database it's safer to back up without corruption. On new backups the file is rotated out rather than being rewritten in place.
-
- * `iddb.d/` (directory):
-   Caches the public identity of every peer ZeroTier has spoken with in the last 60 days. This directory and its contents can be deleted, but this may result in slower connection initiations since it will require that we go out and re-fetch full identities for peers we're speaking to.
-
- * `networks.d` (directory):
-   This caches network configurations and certificate information for networks you belong to. ZeroTier scans this directory for <network ID>.conf files on startup to recall its networks, so "touch"ing an empty <network ID>.conf file in this directory is a way of pre-configuring ZeroTier to join a specific network on startup without using the API. If the config file is empty ZeroTIer will just fetch it from the network's controller.
-
-## COPYRIGHT
-
-(c)2011-2016 ZeroTier, Inc. -- https://www.zerotier.com/ -- https://github.com/zerotier
-
-## SEE ALSO
-
-zerotier-cli(1), zerotier-idtool(1)
diff --git a/doc/zerotier-one.8.txt b/doc/zerotier-one.8.txt
new file mode 100644
index 000000000..e730130e3
--- /dev/null
+++ b/doc/zerotier-one.8.txt
@@ -0,0 +1,119 @@
+============
+zerotier-one
+============
+
+-------------------------------------------------
+end-point peer for ZeroTier virtual network layer
+-------------------------------------------------
+
+:Author: |author|
+:Date: 2016-03-04
+:Copyright:
+    Copyright © 2016 ZeroTier Inc.
+:Manual section: 8
+:Manual group: ZeroTier
+
+..  |command| replace:: **zerotier-one**
+..  |license| replace::
+    `GNU General Public License, version 3 or later
+    <https://www.gnu.org/licenses/#GPL>`__
+
+
+SYNOPSIS
+========
+
+| |command| [ **-U** ] [ **-p** `PORT` ] [ **-d** ] [ `HOMEDIR` ]
+| |command| **-i** [ `IDTOOL_ARG` ... ]
+| |command| **-q** [ `QUERY_ARG` ... ]
+| |command| **-h**
+| |command| **-v**
+
+
+DESCRIPTION
+===========
+
+**ZeroTier One** is the end-point peer for the ZeroTier
+software-defined network layer.
+
+*ZeroTier* is a peer-to-peer virtual network. Its “virtual layer 1”
+(VL1) is implemented in the communication between ZeroTier One peers.
+This provides the OSI layer 1 functionality on which to build further
+network services.
+
+
+OPTIONS
+=======
+
+**-h**
+    Display concise help on command usage.
+
+**-v**
+    Display program version.
+
+**-U**
+    Run as unprivileged user (skip privilege check).
+
+**-p** `PORT`
+    Communicate on network port `PORT` (either TCP or UDP).
+
+**-d**
+    Become a conventional daemon process. Only available on Unix-like
+    operating systems.
+
+**-i** [ `IDTOOL_ARG` ... ]
+    Generate and manage identities.
+
+    This is equivalent to running the **zerotier-idtool** command with
+    all the specified `IDTOOL_ARG` parameters.
+
+**-q** [ `QUERY_ARG` ... ]
+    Query the running ZeroTier One process.
+
+    This is equivalent to running the **zerotier-cli** command with
+    all the specified `QUERY_ARG` parameters.
+
+
+FILES
+=====
+
+The |command| process will store its state in files within the
+specified `HOMEDIR` directory (default: ``/var/lib/zerotier-one``).
+
+
+SEE ALSO
+========
+
+* **zerotier-idtool**\ (1), **zerotier-cli**\ (1)
+
+* ZeroTier One documentation:
+
+  * Product page `<https://www.zerotier.com/product-one.shtml>`__.
+  * Configuration guide `<https://www.zerotier.com/config.shtml>`__.
+  * Technical FAQ `<https://www.zerotier.com/tech_faq.shtml>`__.
+
+
+HISTORY
+=======
+
+The |command| program is developed by ZeroTier Inc.
+
+This manual page was written by |author|. This is free software: you
+may copy, modify and/or distribute this work under the terms of the
+|license| as published by the Free Software Foundation. No warranty
+expressed or implied.
+
+..  |author| replace:: |authorname| |authoremail|
+..  |authorname| replace:: Ben Finney
+..  |authoremail| replace:: <ben+zerotier@benfinney.id.au>
+
+
+..
+    Local variables:
+    mode: rst
+    coding: utf-8
+    time-stamp-format: "%:y-%02m-%02d"
+    time-stamp-start: "^:Date:[         ]+"
+    time-stamp-end: "$"
+    time-stamp-line-limit: 20
+    End:
+    vim: filetype=rst fileencoding=utf-8 :
diff --git a/entrypoint.sh.release b/entrypoint.sh.release
deleted file mode 100644
index da9b8f8c8..000000000
--- a/entrypoint.sh.release
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-
-grepzt() {
-  [ -f /var/lib/zerotier-one/zerotier-one.pid -a -n "$(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)" -a -d "/proc/$(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)" ]
-  return $?
-}
-
-mkztfile() {
-  file=$1
-  mode=$2
-  content=$3
-  echo "creating $file"
-  mkdir -p /var/lib/zerotier-one
-  echo -n "$content" > "/var/lib/zerotier-one/$file"
-  chmod "$mode" "/var/lib/zerotier-one/$file"
-}
-
-if [ "x$ZEROTIER_API_SECRET" != "x" ]
-then
-  mkztfile authtoken.secret 0600 "$ZEROTIER_API_SECRET"
-  mkztfile metricstoken.secret 0600 "$ZEROTIER_API_SECRET"
-fi
-
-if [ "x$ZEROTIER_IDENTITY_PUBLIC" != "x" ]
-then
-  mkztfile identity.public 0644 "$ZEROTIER_IDENTITY_PUBLIC"
-fi
-
-if [ "x$ZEROTIER_IDENTITY_SECRET" != "x" ]
-then
-  mkztfile identity.secret 0600 "$ZEROTIER_IDENTITY_SECRET"
-fi
-
-if [ "x$ZEROTIER_LOCAL_CONF" != "x" ]
-then
-  mkztfile local.conf 0644 "$ZEROTIER_LOCAL_CONF"
-fi
-
-mkztfile zerotier-one.port 0600 "9993"
-
-killzerotier() {
-  log "Killing zerotier"
-  kill $(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)
-  exit 0
-}
-
-log_header() {
-  echo -n "\r=>"
-}
-
-log_detail_header() {
-  echo -n "\r===>"
-}
-
-log() {
-  echo "$(log_header)" "$@"
-}
-
-log_params() {
-  title=$1
-  shift
-  log "$title" "[$@]"
-}
-
-log_detail() {
-  echo "$(log_detail_header)" "$@"
-}
-
-log_detail_params() {
-  title=$1
-  shift
-  log_detail "$title" "[$@]"
-}
-
-trap killzerotier INT TERM
-
-log "Configuring networks to join"
-mkdir -p /var/lib/zerotier-one/networks.d
-
-log_params "Joining networks from command line:" $@
-for i in "$@"
-do
-  log_detail_params "Configuring join:" "$i"
-  touch "/var/lib/zerotier-one/networks.d/${i}.conf"
-done
-
-if [ "x$ZEROTIER_JOIN_NETWORKS" != "x" ]
-then
-  log_params "Joining networks from environment:" $ZEROTIER_JOIN_NETWORKS
-  for i in $ZEROTIER_JOIN_NETWORKS
-  do
-    log_detail_params "Configuring join:" "$i"
-    touch "/var/lib/zerotier-one/networks.d/${i}.conf"
-  done
-fi
-
-log "Starting ZeroTier"
-nohup /usr/sbin/zerotier-one &
-
-while ! grepzt
-do
-  log_detail "ZeroTier hasn't started, waiting a second"
-
-  if [ -f nohup.out ]
-  then
-    tail -n 10 nohup.out
-  fi
-
-  sleep 1
-done
-
-log_params "Writing healthcheck for networks:" $@
-
-cat >/healthcheck.sh <<EOF
-#!/bin/bash
-for i in $@ $ZEROTIER_JOIN_NETWORKS
-do
-  [ "\$(zerotier-cli get \$i status)" = "OK" ] || exit 1
-done
-EOF
-
-chmod +x /healthcheck.sh
-
-log_params "zerotier-cli info:" "$(zerotier-cli info)"
-
-log "Sleeping infinitely"
-while true
-do
-  sleep 1
-done
diff --git a/ext/README.md b/ext/README.md
index be9484c51..f296fa55c 100644
--- a/ext/README.md
+++ b/ext/README.md
@@ -1,10 +1 @@
-Miscellaneous Stuff
-======
-
-This subfolder contains:
-
- * Bundled third party libraries that are compiled into the binary on platforms and Linux distributions where they are not available on the system.
-
- * Pre-compiled binaries for some platforms, such as pre-built and signed drivers for Mac and Windows.
-
- * Miscellaneous files used by installers and packages on various platform targets.
+The ext/ folder contains third party code, drivers, installation support files, etc.
\ No newline at end of file
diff --git a/ext/arm32-neon-salsa2012-asm/README.md b/ext/arm32-neon-salsa2012-asm/README.md
deleted file mode 100644
index 54fc6f5fa..000000000
--- a/ext/arm32-neon-salsa2012-asm/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-ARM NEON (32-bit) ASM implementation of Salsa20/12
-======
-
-This is from [supercop](http://bench.cr.yp.to/supercop.html) and was originally written by Daniel J. Bernstein. Code is in the public domain like the rest of Salsa20. It's much faster than the naive implementation.
-
-It's included automatically in 32-bit Linux ARM builds. It likely will not work on 64-bit ARM, so it'll need to be ported at least. That will unfortunately keep it out of mobile versions for now since those are all going 64-bit.
diff --git a/ext/arm32-neon-salsa2012-asm/salsa2012.h b/ext/arm32-neon-salsa2012-asm/salsa2012.h
deleted file mode 100644
index 262c9b9b5..000000000
--- a/ext/arm32-neon-salsa2012-asm/salsa2012.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef ZT_SALSA2012_ARM32NEON_ASM
-#define ZT_SALSA2012_ARM32NEON_ASM
-
-#if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux)
-#include <sys/auxv.h>
-#include <asm/hwcap.h>
-#define zt_arm_has_neon() ((getauxval(AT_HWCAP) & HWCAP_NEON) != 0)
-#elif defined(__ARM_NEON__) || defined(__ARM_NEON)
-#define zt_arm_has_neon() (true)
-#else
-#define zt_arm_has_neon() (false)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ciphertext buffer, message/NULL, length, nonce (8 bytes), key (32 bytes)
-extern int zt_salsa2012_armneon3_xor(unsigned char *c,const unsigned char *m,unsigned long long len,const unsigned char *n,const unsigned char *k);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/arm32-neon-salsa2012-asm/salsa2012.s b/ext/arm32-neon-salsa2012-asm/salsa2012.s
deleted file mode 100644
index 9e5989cd3..000000000
--- a/ext/arm32-neon-salsa2012-asm/salsa2012.s
+++ /dev/null
@@ -1,2231 +0,0 @@
-
-# qhasm: int32 input_0
-
-# qhasm: int32 input_1
-
-# qhasm: int32 input_2
-
-# qhasm: int32 input_3
-
-# qhasm: stack32 input_4
-
-# qhasm: stack32 input_5
-
-# qhasm: stack32 input_6
-
-# qhasm: stack32 input_7
-
-# qhasm: int32 caller_r4
-
-# qhasm: int32 caller_r5
-
-# qhasm: int32 caller_r6
-
-# qhasm: int32 caller_r7
-
-# qhasm: int32 caller_r8
-
-# qhasm: int32 caller_r9
-
-# qhasm: int32 caller_r10
-
-# qhasm: int32 caller_r11
-
-# qhasm: int32 caller_r14
-
-# qhasm: reg128 caller_q4
-
-# qhasm: reg128 caller_q5
-
-# qhasm: reg128 caller_q6
-
-# qhasm: reg128 caller_q7
-
-# qhasm: startcode
-.fpu neon
-.text
-
-# qhasm: constant sigma:
-.align 2
-sigma:
-
-# qhasm:   const32 1634760805
-.word 1634760805
-
-# qhasm:   const32 857760878
-.word 857760878
-
-# qhasm:   const32 2036477234
-.word 2036477234
-
-# qhasm:   const32 1797285236
-.word 1797285236
-
-# qhasm: int128 abab
-
-# qhasm: int128 diag0
-
-# qhasm: int128 diag1
-
-# qhasm: int128 diag2
-
-# qhasm: int128 diag3
-
-# qhasm: int128 a0
-
-# qhasm: int128 a1
-
-# qhasm: int128 a2
-
-# qhasm: int128 a3
-
-# qhasm: int128 b0
-
-# qhasm: int128 b1
-
-# qhasm: int128 b2
-
-# qhasm: int128 b3
-
-# qhasm: int128 next_diag0
-
-# qhasm: int128 next_diag1
-
-# qhasm: int128 next_diag2
-
-# qhasm: int128 next_diag3
-
-# qhasm: int128 next_a0
-
-# qhasm: int128 next_a1
-
-# qhasm: int128 next_a2
-
-# qhasm: int128 next_a3
-
-# qhasm: int128 next_b0
-
-# qhasm: int128 next_b1
-
-# qhasm: int128 next_b2
-
-# qhasm: int128 next_b3
-
-# qhasm: int128 x0x5x10x15
-
-# qhasm: int128 x12x1x6x11
-
-# qhasm: int128 x8x13x2x7
-
-# qhasm: int128 x4x9x14x3
-
-# qhasm: int128 x0x1x10x11
-
-# qhasm: int128 x12x13x6x7
-
-# qhasm: int128 x8x9x2x3
-
-# qhasm: int128 x4x5x14x15
-
-# qhasm: int128 x0x1x2x3
-
-# qhasm: int128 x4x5x6x7
-
-# qhasm: int128 x8x9x10x11
-
-# qhasm: int128 x12x13x14x15
-
-# qhasm: int128 m0m1m2m3
-
-# qhasm: int128 m4m5m6m7
-
-# qhasm: int128 m8m9m10m11
-
-# qhasm: int128 m12m13m14m15
-
-# qhasm: int128 start0
-
-# qhasm: int128 start1
-
-# qhasm: int128 start2
-
-# qhasm: int128 start3
-
-# qhasm: stack128 stack_start3
-
-# qhasm: stack128 next_start2
-
-# qhasm: stack128 next_start3
-
-# qhasm: int128 k0k1k2k3
-
-# qhasm: int128 k4k5k6k7
-
-# qhasm: int128 k1n1k7k2
-
-# qhasm: int128 n2n3n3n2
-
-# qhasm: int128 k2k3k6k7
-
-# qhasm: int128 nextblock
-
-# qhasm: stack128 stack_q4
-
-# qhasm: stack128 stack_q5
-
-# qhasm: stack128 stack_q6
-
-# qhasm: stack128 stack_q7
-
-# qhasm: stack32 stack_r4
-
-# qhasm: stack128 k2k3k6k7_stack
-
-# qhasm: stack128 k1n1k7k2_stack
-
-# qhasm: stack512 tmp
-
-# qhasm: stack32 savec
-
-# qhasm: int32 i
-
-# qhasm: int32 ci
-
-# qhasm: int32 mi
-
-# qhasm: enter zt_salsa2012_armneon3_xor
-.align 2
-.global _zt_salsa2012_armneon3_xor
-.global zt_salsa2012_armneon3_xor
-.type _zt_salsa2012_armneon3_xor STT_FUNC
-.type zt_salsa2012_armneon3_xor STT_FUNC
-_zt_salsa2012_armneon3_xor:
-zt_salsa2012_armneon3_xor:
-sub sp,sp,#256
-
-# qhasm: new stack_q4
-
-# qhasm: new stack_q5
-
-# qhasm: new stack_q6
-
-# qhasm: new stack_q7
-
-# qhasm: stack_q4 bot = caller_q4 bot
-# asm 1: vstr <caller_q4=reg128#5%bot,<stack_q4=stack128#1
-# asm 2: vstr <caller_q4=d8,<stack_q4=[sp,#96]
-vstr d8,[sp,#96]
-
-# qhasm: stack_q4 top = caller_q4 top
-# asm 1: vstr <caller_q4=reg128#5%top,<stack_q4=stack128#1
-# asm 2: vstr <caller_q4=d9,<stack_q4=[sp,#104]
-vstr d9,[sp,#104]
-
-# qhasm: stack_q5 bot = caller_q5 bot
-# asm 1: vstr <caller_q5=reg128#6%bot,<stack_q5=stack128#2
-# asm 2: vstr <caller_q5=d10,<stack_q5=[sp,#112]
-vstr d10,[sp,#112]
-
-# qhasm: stack_q5 top = caller_q5 top
-# asm 1: vstr <caller_q5=reg128#6%top,<stack_q5=stack128#2
-# asm 2: vstr <caller_q5=d11,<stack_q5=[sp,#120]
-vstr d11,[sp,#120]
-
-# qhasm: stack_q6 bot = caller_q6 bot
-# asm 1: vstr <caller_q6=reg128#7%bot,<stack_q6=stack128#3
-# asm 2: vstr <caller_q6=d12,<stack_q6=[sp,#128]
-vstr d12,[sp,#128]
-
-# qhasm: stack_q6 top = caller_q6 top
-# asm 1: vstr <caller_q6=reg128#7%top,<stack_q6=stack128#3
-# asm 2: vstr <caller_q6=d13,<stack_q6=[sp,#136]
-vstr d13,[sp,#136]
-
-# qhasm: stack_q7 bot = caller_q7 bot
-# asm 1: vstr <caller_q7=reg128#8%bot,<stack_q7=stack128#4
-# asm 2: vstr <caller_q7=d14,<stack_q7=[sp,#144]
-vstr d14,[sp,#144]
-
-# qhasm: stack_q7 top = caller_q7 top
-# asm 1: vstr <caller_q7=reg128#8%top,<stack_q7=stack128#4
-# asm 2: vstr <caller_q7=d15,<stack_q7=[sp,#152]
-vstr d15,[sp,#152]
-
-# qhasm: new stack_r4
-
-# qhasm: stack_r4 = caller_r4
-# asm 1: str <caller_r4=int32#5,>stack_r4=stack32#2
-# asm 2: str <caller_r4=r4,>stack_r4=[sp,#68]
-str r4,[sp,#68]
-
-# qhasm: int32 c
-
-# qhasm: c = input_0
-# asm 1: mov >c=int32#1,<input_0=int32#1
-# asm 2: mov >c=r0,<input_0=r0
-mov r0,r0
-
-# qhasm: int32 m
-
-# qhasm: m = input_1
-# asm 1: mov >m=int32#2,<input_1=int32#2
-# asm 2: mov >m=r1,<input_1=r1
-mov r1,r1
-
-# qhasm: int32 mlenlow
-
-# qhasm: mlenlow = input_2
-# asm 1: mov >mlenlow=int32#3,<input_2=int32#3
-# asm 2: mov >mlenlow=r2,<input_2=r2
-mov r2,r2
-
-# qhasm: int32 mlenhigh
-
-# qhasm: mlenhigh = input_3
-# asm 1: mov >mlenhigh=int32#4,<input_3=int32#4
-# asm 2: mov >mlenhigh=r3,<input_3=r3
-mov r3,r3
-
-# qhasm: int32 n
-
-# qhasm: n = input_4
-# asm 1: ldr >n=int32#5,<input_4=stack32#arg1
-# asm 2: ldr >n=r4,<input_4=[sp,#256]
-ldr r4,[sp,#256]
-
-# qhasm: int32 k
-
-# qhasm: k = input_5
-# asm 1: ldr >k=int32#13,<input_5=stack32#arg2
-# asm 2: ldr >k=r12,<input_5=[sp,#260]
-ldr r12,[sp,#260]
-
-# qhasm: k0k1k2k3 = mem128[k]
-# asm 1: vld1.8 {>k0k1k2k3=reg128#1%bot->k0k1k2k3=reg128#1%top},[<k=int32#13]
-# asm 2: vld1.8 {>k0k1k2k3=d0->k0k1k2k3=d1},[<k=r12]
-vld1.8 {d0-d1},[r12]
-
-# qhasm: k += 16
-# asm 1: add <k=int32#13,<k=int32#13,#16
-# asm 2: add <k=r12,<k=r12,#16
-add r12,r12,#16
-
-# qhasm: k4k5k6k7 = mem128[k]
-# asm 1: vld1.8 {>k4k5k6k7=reg128#2%bot->k4k5k6k7=reg128#2%top},[<k=int32#13]
-# asm 2: vld1.8 {>k4k5k6k7=d2->k4k5k6k7=d3},[<k=r12]
-vld1.8 {d2-d3},[r12]
-
-# qhasm: i = sigma
-# asm 1: ldr >i=int32#13,=sigma
-# asm 2: ldr >i=r12,=sigma
-ldr r12,=sigma
-
-# qhasm: start0 = mem128[i]
-# asm 1: vld1.8 {>start0=reg128#3%bot->start0=reg128#3%top},[<i=int32#13]
-# asm 2: vld1.8 {>start0=d4->start0=d5},[<i=r12]
-vld1.8 {d4-d5},[r12]
-
-# qhasm: 2x start1 = 0
-# asm 1: vmov.i64 >start1=reg128#4,#0
-# asm 2: vmov.i64 >start1=q3,#0
-vmov.i64 q3,#0
-
-# qhasm: start1 bot = mem64[n]                            
-# asm 1: vld1.8 {<start1=reg128#4%bot},[<n=int32#5]
-# asm 2: vld1.8 {<start1=d6},[<n=r4]
-vld1.8 {d6},[r4]
-
-# qhasm: start1 = start1[1] start1[0] start1[2,3]         
-# asm 1: vext.32 <start1=reg128#4%bot,<start1=reg128#4%bot,<start1=reg128#4%bot,#1
-# asm 2: vext.32 <start1=d6,<start1=d6,<start1=d6,#1
-vext.32 d6,d6,d6,#1
-
-# qhasm: start1 = start1[0,1] start1[1] k4k5k6k7[0]       
-# asm 1: vext.32 <start1=reg128#4%top,<start1=reg128#4%bot,<k4k5k6k7=reg128#2%bot,#1
-# asm 2: vext.32 <start1=d7,<start1=d6,<k4k5k6k7=d2,#1
-vext.32 d7,d6,d2,#1
-
-# qhasm: new k1n1k7k2
-
-# qhasm: k1n1k7k2 = k0k1k2k3[1] start1[0] k1n1k7k2[2,3]   
-# asm 1: vext.32 <k1n1k7k2=reg128#5%bot,<k0k1k2k3=reg128#1%bot,<start1=reg128#4%bot,#1
-# asm 2: vext.32 <k1n1k7k2=d8,<k0k1k2k3=d0,<start1=d6,#1
-vext.32 d8,d0,d6,#1
-
-# qhasm: k1n1k7k2 = k1n1k7k2[0,1] k4k5k6k7[3] k0k1k2k3[2] 
-# asm 1: vext.32 <k1n1k7k2=reg128#5%top,<k4k5k6k7=reg128#2%top,<k0k1k2k3=reg128#1%top,#1
-# asm 2: vext.32 <k1n1k7k2=d9,<k4k5k6k7=d3,<k0k1k2k3=d1,#1
-vext.32 d9,d3,d1,#1
-
-# qhasm: k2k3k6k7 = k4k5k6k7
-# asm 1: vmov >k2k3k6k7=reg128#6,<k4k5k6k7=reg128#2
-# asm 2: vmov >k2k3k6k7=q5,<k4k5k6k7=q1
-vmov q5,q1
-
-# qhasm: k2k3k6k7 = k0k1k2k3[2,3] k2k3k6k7[2,3]
-# asm 1: vmov <k2k3k6k7=reg128#6%bot,<k0k1k2k3=reg128#1%top
-# asm 2: vmov <k2k3k6k7=d10,<k0k1k2k3=d1
-vmov d10,d1
-
-# qhasm: start1 = k4k5k6k7[1] k0k1k2k3[0] start1[2,3]     
-# asm 1: vext.32 <start1=reg128#4%bot,<k4k5k6k7=reg128#2%bot,<k0k1k2k3=reg128#1%bot,#1
-# asm 2: vext.32 <start1=d6,<k4k5k6k7=d2,<k0k1k2k3=d0,#1
-vext.32 d6,d2,d0,#1
-
-# qhasm: new k2k3k6k7_stack
-
-# qhasm: k2k3k6k7_stack bot = k2k3k6k7 bot
-# asm 1: vstr <k2k3k6k7=reg128#6%bot,<k2k3k6k7_stack=stack128#5
-# asm 2: vstr <k2k3k6k7=d10,<k2k3k6k7_stack=[sp,#160]
-vstr d10,[sp,#160]
-
-# qhasm: k2k3k6k7_stack top = k2k3k6k7 top
-# asm 1: vstr <k2k3k6k7=reg128#6%top,<k2k3k6k7_stack=stack128#5
-# asm 2: vstr <k2k3k6k7=d11,<k2k3k6k7_stack=[sp,#168]
-vstr d11,[sp,#168]
-
-# qhasm: new k1n1k7k2_stack
-
-# qhasm: k1n1k7k2_stack bot = k1n1k7k2 bot
-# asm 1: vstr <k1n1k7k2=reg128#5%bot,<k1n1k7k2_stack=stack128#6
-# asm 2: vstr <k1n1k7k2=d8,<k1n1k7k2_stack=[sp,#176]
-vstr d8,[sp,#176]
-
-# qhasm: k1n1k7k2_stack top = k1n1k7k2 top
-# asm 1: vstr <k1n1k7k2=reg128#5%top,<k1n1k7k2_stack=stack128#6
-# asm 2: vstr <k1n1k7k2=d9,<k1n1k7k2_stack=[sp,#184]
-vstr d9,[sp,#184]
-
-# qhasm: 2x n2n3n3n2 = 0
-# asm 1: vmov.i64 >n2n3n3n2=reg128#1,#0
-# asm 2: vmov.i64 >n2n3n3n2=q0,#0
-vmov.i64 q0,#0
-
-# qhasm:                         unsigned<? mlenlow - 128
-# asm 1: cmp <mlenlow=int32#3,#128
-# asm 2: cmp <mlenlow=r2,#128
-cmp r2,#128
-
-# qhasm: goto mlenlowbelow128 if unsigned<
-blo ._mlenlowbelow128
-
-# qhasm: mlenatleast128:
-._mlenatleast128:
-
-# qhasm:   new k2k3k6k7
-
-# qhasm:   k2k3k6k7 bot = k2k3k6k7_stack bot
-# asm 1: vldr <k2k3k6k7=reg128#2%bot,<k2k3k6k7_stack=stack128#5
-# asm 2: vldr <k2k3k6k7=d2,<k2k3k6k7_stack=[sp,#160]
-vldr d2,[sp,#160]
-
-# qhasm:   k2k3k6k7 top = k2k3k6k7_stack top
-# asm 1: vldr <k2k3k6k7=reg128#2%top,<k2k3k6k7_stack=stack128#5
-# asm 2: vldr <k2k3k6k7=d3,<k2k3k6k7_stack=[sp,#168]
-vldr d3,[sp,#168]
-
-# qhasm:   new k1n1k7k2
-
-# qhasm:   k1n1k7k2 bot = k1n1k7k2_stack bot
-# asm 1: vldr <k1n1k7k2=reg128#5%bot,<k1n1k7k2_stack=stack128#6
-# asm 2: vldr <k1n1k7k2=d8,<k1n1k7k2_stack=[sp,#176]
-vldr d8,[sp,#176]
-
-# qhasm:   k1n1k7k2 top = k1n1k7k2_stack top
-# asm 1: vldr <k1n1k7k2=reg128#5%top,<k1n1k7k2_stack=stack128#6
-# asm 2: vldr <k1n1k7k2=d9,<k1n1k7k2_stack=[sp,#184]
-vldr d9,[sp,#184]
-
-# qhasm:   n2n3n3n2 = n2n3n3n2[0,1] n2n3n3n2[1] n2n3n3n2[0]
-# asm 1: vext.32 <n2n3n3n2=reg128#1%top,<n2n3n3n2=reg128#1%bot,<n2n3n3n2=reg128#1%bot,#1
-# asm 2: vext.32 <n2n3n3n2=d1,<n2n3n3n2=d0,<n2n3n3n2=d0,#1
-vext.32 d1,d0,d0,#1
-
-# qhasm:   new diag2
-
-# qhasm:   diag2 = diag2[0,1] k1n1k7k2[0,1]             
-# asm 1: vmov <diag2=reg128#6%top,<k1n1k7k2=reg128#5%bot
-# asm 2: vmov <diag2=d11,<k1n1k7k2=d8
-vmov d11,d8
-
-# qhasm:   diag2 = n2n3n3n2[3] k2k3k6k7[2] diag2[2,3]   
-# asm 1: vext.32 <diag2=reg128#6%bot,<n2n3n3n2=reg128#1%top,<k2k3k6k7=reg128#2%top,#1
-# asm 2: vext.32 <diag2=d10,<n2n3n3n2=d1,<k2k3k6k7=d3,#1
-vext.32 d10,d1,d3,#1
-
-# qhasm:   new diag3
-
-# qhasm:   diag3 = diag3[0,1] k1n1k7k2[2,3]             
-# asm 1: vmov <diag3=reg128#7%top,<k1n1k7k2=reg128#5%top
-# asm 2: vmov <diag3=d13,<k1n1k7k2=d9
-vmov d13,d9
-
-# qhasm:   diag3 = k2k3k6k7[1] n2n3n3n2[2] diag3[2,3]   
-# asm 1: vext.32 <diag3=reg128#7%bot,<k2k3k6k7=reg128#2%bot,<n2n3n3n2=reg128#1%top,#1
-# asm 2: vext.32 <diag3=d12,<k2k3k6k7=d2,<n2n3n3n2=d1,#1
-vext.32 d12,d2,d1,#1
-
-# qhasm:   diag0 = start0
-# asm 1: vmov >diag0=reg128#8,<start0=reg128#3
-# asm 2: vmov >diag0=q7,<start0=q2
-vmov q7,q2
-
-# qhasm:   diag1 = start1
-# asm 1: vmov >diag1=reg128#9,<start1=reg128#4
-# asm 2: vmov >diag1=q8,<start1=q3
-vmov q8,q3
-
-# qhasm:   start2 = diag2
-# asm 1: vmov >start2=reg128#10,<diag2=reg128#6
-# asm 2: vmov >start2=q9,<diag2=q5
-vmov q9,q5
-
-# qhasm:   new stack_start3
-
-# qhasm:   stack_start3 bot = diag3 bot
-# asm 1: vstr <diag3=reg128#7%bot,<stack_start3=stack128#9
-# asm 2: vstr <diag3=d12,<stack_start3=[sp,#224]
-vstr d12,[sp,#224]
-
-# qhasm:   stack_start3 top = diag3 top
-# asm 1: vstr <diag3=reg128#7%top,<stack_start3=stack128#9
-# asm 2: vstr <diag3=d13,<stack_start3=[sp,#232]
-vstr d13,[sp,#232]
-
-# qhasm:   2x nextblock = 0xff
-# asm 1: vmov.i64 >nextblock=reg128#11,#0xff
-# asm 2: vmov.i64 >nextblock=q10,#0xff
-vmov.i64 q10,#0xff
-
-# qhasm:   4x nextblock unsigned>>= 7
-# asm 1: vshr.u32 >nextblock=reg128#11,<nextblock=reg128#11,#7
-# asm 2: vshr.u32 >nextblock=q10,<nextblock=q10,#7
-vshr.u32 q10,q10,#7
-
-# qhasm:   2x n2n3n3n2 += nextblock
-# asm 1: vadd.i64 >n2n3n3n2=reg128#1,<n2n3n3n2=reg128#1,<nextblock=reg128#11
-# asm 2: vadd.i64 >n2n3n3n2=q0,<n2n3n3n2=q0,<nextblock=q10
-vadd.i64 q0,q0,q10
-
-# qhasm:   n2n3n3n2 = n2n3n3n2[0,1] n2n3n3n2[1] n2n3n3n2[0]
-# asm 1: vext.32 <n2n3n3n2=reg128#1%top,<n2n3n3n2=reg128#1%bot,<n2n3n3n2=reg128#1%bot,#1
-# asm 2: vext.32 <n2n3n3n2=d1,<n2n3n3n2=d0,<n2n3n3n2=d0,#1
-vext.32 d1,d0,d0,#1
-
-# qhasm:   new next_diag2
-
-# qhasm:   next_diag2 = next_diag2[0,1] k1n1k7k2[0,1]
-# asm 1: vmov <next_diag2=reg128#12%top,<k1n1k7k2=reg128#5%bot
-# asm 2: vmov <next_diag2=d23,<k1n1k7k2=d8
-vmov d23,d8
-
-# qhasm:   next_diag2 = n2n3n3n2[3] k2k3k6k7[2] next_diag2[2,3]
-# asm 1: vext.32 <next_diag2=reg128#12%bot,<n2n3n3n2=reg128#1%top,<k2k3k6k7=reg128#2%top,#1
-# asm 2: vext.32 <next_diag2=d22,<n2n3n3n2=d1,<k2k3k6k7=d3,#1
-vext.32 d22,d1,d3,#1
-
-# qhasm:   new next_diag3
-
-# qhasm:   next_diag3 = next_diag3[0,1] k1n1k7k2[2,3]
-# asm 1: vmov <next_diag3=reg128#13%top,<k1n1k7k2=reg128#5%top
-# asm 2: vmov <next_diag3=d25,<k1n1k7k2=d9
-vmov d25,d9
-
-# qhasm:   next_diag3 = k2k3k6k7[1] n2n3n3n2[2] next_diag3[2,3]
-# asm 1: vext.32 <next_diag3=reg128#13%bot,<k2k3k6k7=reg128#2%bot,<n2n3n3n2=reg128#1%top,#1
-# asm 2: vext.32 <next_diag3=d24,<k2k3k6k7=d2,<n2n3n3n2=d1,#1
-vext.32 d24,d2,d1,#1
-
-# qhasm:   2x n2n3n3n2 += nextblock
-# asm 1: vadd.i64 >n2n3n3n2=reg128#1,<n2n3n3n2=reg128#1,<nextblock=reg128#11
-# asm 2: vadd.i64 >n2n3n3n2=q0,<n2n3n3n2=q0,<nextblock=q10
-vadd.i64 q0,q0,q10
-
-# qhasm:   next_diag0 = diag0
-# asm 1: vmov >next_diag0=reg128#2,<diag0=reg128#8
-# asm 2: vmov >next_diag0=q1,<diag0=q7
-vmov q1,q7
-
-# qhasm:   next_diag1 = diag1
-# asm 1: vmov >next_diag1=reg128#5,<diag1=reg128#9
-# asm 2: vmov >next_diag1=q4,<diag1=q8
-vmov q4,q8
-
-# qhasm:   next_start2 bot = next_diag2 bot
-# asm 1: vstr <next_diag2=reg128#12%bot,<next_start2=stack128#7
-# asm 2: vstr <next_diag2=d22,<next_start2=[sp,#192]
-vstr d22,[sp,#192]
-
-# qhasm:   next_start2 top = next_diag2 top
-# asm 1: vstr <next_diag2=reg128#12%top,<next_start2=stack128#7
-# asm 2: vstr <next_diag2=d23,<next_start2=[sp,#200]
-vstr d23,[sp,#200]
-
-# qhasm:   next_start3 bot = next_diag3 bot
-# asm 1: vstr <next_diag3=reg128#13%bot,<next_start3=stack128#8
-# asm 2: vstr <next_diag3=d24,<next_start3=[sp,#208]
-vstr d24,[sp,#208]
-
-# qhasm:   next_start3 top = next_diag3 top
-# asm 1: vstr <next_diag3=reg128#13%top,<next_start3=stack128#8
-# asm 2: vstr <next_diag3=d25,<next_start3=[sp,#216]
-vstr d25,[sp,#216]
-
-# qhasm:   i = 12
-# asm 1: ldr >i=int32#5,=12
-# asm 2: ldr >i=r4,=12
-ldr r4,=12
-
-# qhasm:   mainloop2:
-._mainloop2:
-
-# qhasm:     4x a0 = diag1 + diag0
-# asm 1: vadd.i32 >a0=reg128#11,<diag1=reg128#9,<diag0=reg128#8
-# asm 2: vadd.i32 >a0=q10,<diag1=q8,<diag0=q7
-vadd.i32 q10,q8,q7
-
-# qhasm:    					4x next_a0 = next_diag1 + next_diag0
-# asm 1: vadd.i32 >next_a0=reg128#14,<next_diag1=reg128#5,<next_diag0=reg128#2
-# asm 2: vadd.i32 >next_a0=q13,<next_diag1=q4,<next_diag0=q1
-vadd.i32 q13,q4,q1
-
-# qhasm:     4x b0 = a0 << 7
-# asm 1: vshl.i32 >b0=reg128#15,<a0=reg128#11,#7
-# asm 2: vshl.i32 >b0=q14,<a0=q10,#7
-vshl.i32 q14,q10,#7
-
-# qhasm:     					4x next_b0 = next_a0 << 7
-# asm 1: vshl.i32 >next_b0=reg128#16,<next_a0=reg128#14,#7
-# asm 2: vshl.i32 >next_b0=q15,<next_a0=q13,#7
-vshl.i32 q15,q13,#7
-
-# qhasm:     4x b0 insert= a0 >> 25
-# asm 1: vsri.i32 <b0=reg128#15,<a0=reg128#11,#25
-# asm 2: vsri.i32 <b0=q14,<a0=q10,#25
-vsri.i32 q14,q10,#25
-
-# qhasm:     					4x next_b0 insert= next_a0 >> 25
-# asm 1: vsri.i32 <next_b0=reg128#16,<next_a0=reg128#14,#25
-# asm 2: vsri.i32 <next_b0=q15,<next_a0=q13,#25
-vsri.i32 q15,q13,#25
-
-# qhasm:        diag3 ^= b0
-# asm 1: veor >diag3=reg128#7,<diag3=reg128#7,<b0=reg128#15
-# asm 2: veor >diag3=q6,<diag3=q6,<b0=q14
-veor q6,q6,q14
-
-# qhasm:        					next_diag3 ^= next_b0
-# asm 1: veor >next_diag3=reg128#11,<next_diag3=reg128#13,<next_b0=reg128#16
-# asm 2: veor >next_diag3=q10,<next_diag3=q12,<next_b0=q15
-veor q10,q12,q15
-
-# qhasm:     4x a1 = diag0 + diag3
-# asm 1: vadd.i32 >a1=reg128#13,<diag0=reg128#8,<diag3=reg128#7
-# asm 2: vadd.i32 >a1=q12,<diag0=q7,<diag3=q6
-vadd.i32 q12,q7,q6
-
-# qhasm:     					4x next_a1 = next_diag0 + next_diag3
-# asm 1: vadd.i32 >next_a1=reg128#14,<next_diag0=reg128#2,<next_diag3=reg128#11
-# asm 2: vadd.i32 >next_a1=q13,<next_diag0=q1,<next_diag3=q10
-vadd.i32 q13,q1,q10
-
-# qhasm:     4x b1 = a1 << 9
-# asm 1: vshl.i32 >b1=reg128#15,<a1=reg128#13,#9
-# asm 2: vshl.i32 >b1=q14,<a1=q12,#9
-vshl.i32 q14,q12,#9
-
-# qhasm:     					4x next_b1 = next_a1 << 9
-# asm 1: vshl.i32 >next_b1=reg128#16,<next_a1=reg128#14,#9
-# asm 2: vshl.i32 >next_b1=q15,<next_a1=q13,#9
-vshl.i32 q15,q13,#9
-
-# qhasm:     4x b1 insert= a1 >> 23
-# asm 1: vsri.i32 <b1=reg128#15,<a1=reg128#13,#23
-# asm 2: vsri.i32 <b1=q14,<a1=q12,#23
-vsri.i32 q14,q12,#23
-
-# qhasm:     					4x next_b1 insert= next_a1 >> 23
-# asm 1: vsri.i32 <next_b1=reg128#16,<next_a1=reg128#14,#23
-# asm 2: vsri.i32 <next_b1=q15,<next_a1=q13,#23
-vsri.i32 q15,q13,#23
-
-# qhasm:        diag2 ^= b1
-# asm 1: veor >diag2=reg128#6,<diag2=reg128#6,<b1=reg128#15
-# asm 2: veor >diag2=q5,<diag2=q5,<b1=q14
-veor q5,q5,q14
-
-# qhasm:        					next_diag2 ^= next_b1
-# asm 1: veor >next_diag2=reg128#12,<next_diag2=reg128#12,<next_b1=reg128#16
-# asm 2: veor >next_diag2=q11,<next_diag2=q11,<next_b1=q15
-veor q11,q11,q15
-
-# qhasm:     4x a2 = diag3 + diag2
-# asm 1: vadd.i32 >a2=reg128#13,<diag3=reg128#7,<diag2=reg128#6
-# asm 2: vadd.i32 >a2=q12,<diag3=q6,<diag2=q5
-vadd.i32 q12,q6,q5
-
-# qhasm:             diag3 = diag3[3] diag3[0,1,2]
-# asm 1: vext.32 >diag3=reg128#7,<diag3=reg128#7,<diag3=reg128#7,#3
-# asm 2: vext.32 >diag3=q6,<diag3=q6,<diag3=q6,#3
-vext.32 q6,q6,q6,#3
-
-# qhasm:     					4x next_a2 = next_diag3 + next_diag2
-# asm 1: vadd.i32 >next_a2=reg128#14,<next_diag3=reg128#11,<next_diag2=reg128#12
-# asm 2: vadd.i32 >next_a2=q13,<next_diag3=q10,<next_diag2=q11
-vadd.i32 q13,q10,q11
-
-# qhasm:     4x b2 = a2 << 13
-# asm 1: vshl.i32 >b2=reg128#15,<a2=reg128#13,#13
-# asm 2: vshl.i32 >b2=q14,<a2=q12,#13
-vshl.i32 q14,q12,#13
-
-# qhasm:             					next_diag3 = next_diag3[3] next_diag3[0,1,2]
-# asm 1: vext.32 >next_diag3=reg128#11,<next_diag3=reg128#11,<next_diag3=reg128#11,#3
-# asm 2: vext.32 >next_diag3=q10,<next_diag3=q10,<next_diag3=q10,#3
-vext.32 q10,q10,q10,#3
-
-# qhasm:     					4x next_b2 = next_a2 << 13
-# asm 1: vshl.i32 >next_b2=reg128#16,<next_a2=reg128#14,#13
-# asm 2: vshl.i32 >next_b2=q15,<next_a2=q13,#13
-vshl.i32 q15,q13,#13
-
-# qhasm:     4x b2 insert= a2 >> 19
-# asm 1: vsri.i32 <b2=reg128#15,<a2=reg128#13,#19
-# asm 2: vsri.i32 <b2=q14,<a2=q12,#19
-vsri.i32 q14,q12,#19
-
-# qhasm:     					4x next_b2 insert= next_a2 >> 19
-# asm 1: vsri.i32 <next_b2=reg128#16,<next_a2=reg128#14,#19
-# asm 2: vsri.i32 <next_b2=q15,<next_a2=q13,#19
-vsri.i32 q15,q13,#19
-
-# qhasm:        diag1 ^= b2
-# asm 1: veor >diag1=reg128#9,<diag1=reg128#9,<b2=reg128#15
-# asm 2: veor >diag1=q8,<diag1=q8,<b2=q14
-veor q8,q8,q14
-
-# qhasm:        					next_diag1 ^= next_b2
-# asm 1: veor >next_diag1=reg128#5,<next_diag1=reg128#5,<next_b2=reg128#16
-# asm 2: veor >next_diag1=q4,<next_diag1=q4,<next_b2=q15
-veor q4,q4,q15
-
-# qhasm:     4x a3 = diag2 + diag1
-# asm 1: vadd.i32 >a3=reg128#13,<diag2=reg128#6,<diag1=reg128#9
-# asm 2: vadd.i32 >a3=q12,<diag2=q5,<diag1=q8
-vadd.i32 q12,q5,q8
-
-# qhasm:             diag2 = diag2[2,3] diag2[0,1]
-# asm 1: vswp <diag2=reg128#6%bot,<diag2=reg128#6%top
-# asm 2: vswp <diag2=d10,<diag2=d11
-vswp d10,d11
-
-# qhasm:     					4x next_a3 = next_diag2 + next_diag1
-# asm 1: vadd.i32 >next_a3=reg128#14,<next_diag2=reg128#12,<next_diag1=reg128#5
-# asm 2: vadd.i32 >next_a3=q13,<next_diag2=q11,<next_diag1=q4
-vadd.i32 q13,q11,q4
-
-# qhasm:     4x b3 = a3 << 18
-# asm 1: vshl.i32 >b3=reg128#15,<a3=reg128#13,#18
-# asm 2: vshl.i32 >b3=q14,<a3=q12,#18
-vshl.i32 q14,q12,#18
-
-# qhasm:             					next_diag2 = next_diag2[2,3] next_diag2[0,1]
-# asm 1: vswp <next_diag2=reg128#12%bot,<next_diag2=reg128#12%top
-# asm 2: vswp <next_diag2=d22,<next_diag2=d23
-vswp d22,d23
-
-# qhasm:     					4x next_b3 = next_a3 << 18
-# asm 1: vshl.i32 >next_b3=reg128#16,<next_a3=reg128#14,#18
-# asm 2: vshl.i32 >next_b3=q15,<next_a3=q13,#18
-vshl.i32 q15,q13,#18
-
-# qhasm:     4x b3 insert= a3 >> 14
-# asm 1: vsri.i32 <b3=reg128#15,<a3=reg128#13,#14
-# asm 2: vsri.i32 <b3=q14,<a3=q12,#14
-vsri.i32 q14,q12,#14
-
-# qhasm:             diag1 = diag1[1,2,3] diag1[0]
-# asm 1: vext.32 >diag1=reg128#9,<diag1=reg128#9,<diag1=reg128#9,#1
-# asm 2: vext.32 >diag1=q8,<diag1=q8,<diag1=q8,#1
-vext.32 q8,q8,q8,#1
-
-# qhasm:     					4x next_b3 insert= next_a3 >> 14
-# asm 1: vsri.i32 <next_b3=reg128#16,<next_a3=reg128#14,#14
-# asm 2: vsri.i32 <next_b3=q15,<next_a3=q13,#14
-vsri.i32 q15,q13,#14
-
-# qhasm:        diag0 ^= b3
-# asm 1: veor >diag0=reg128#8,<diag0=reg128#8,<b3=reg128#15
-# asm 2: veor >diag0=q7,<diag0=q7,<b3=q14
-veor q7,q7,q14
-
-# qhasm:             					next_diag1 = next_diag1[1,2,3] next_diag1[0]
-# asm 1: vext.32 >next_diag1=reg128#5,<next_diag1=reg128#5,<next_diag1=reg128#5,#1
-# asm 2: vext.32 >next_diag1=q4,<next_diag1=q4,<next_diag1=q4,#1
-vext.32 q4,q4,q4,#1
-
-# qhasm:        					next_diag0 ^= next_b3
-# asm 1: veor >next_diag0=reg128#2,<next_diag0=reg128#2,<next_b3=reg128#16
-# asm 2: veor >next_diag0=q1,<next_diag0=q1,<next_b3=q15
-veor q1,q1,q15
-
-# qhasm:     4x a0 = diag3 + diag0
-# asm 1: vadd.i32 >a0=reg128#13,<diag3=reg128#7,<diag0=reg128#8
-# asm 2: vadd.i32 >a0=q12,<diag3=q6,<diag0=q7
-vadd.i32 q12,q6,q7
-
-# qhasm:     					4x next_a0 = next_diag3 + next_diag0
-# asm 1: vadd.i32 >next_a0=reg128#14,<next_diag3=reg128#11,<next_diag0=reg128#2
-# asm 2: vadd.i32 >next_a0=q13,<next_diag3=q10,<next_diag0=q1
-vadd.i32 q13,q10,q1
-
-# qhasm:     4x b0 = a0 << 7
-# asm 1: vshl.i32 >b0=reg128#15,<a0=reg128#13,#7
-# asm 2: vshl.i32 >b0=q14,<a0=q12,#7
-vshl.i32 q14,q12,#7
-
-# qhasm:     					4x next_b0 = next_a0 << 7
-# asm 1: vshl.i32 >next_b0=reg128#16,<next_a0=reg128#14,#7
-# asm 2: vshl.i32 >next_b0=q15,<next_a0=q13,#7
-vshl.i32 q15,q13,#7
-
-# qhasm:     4x b0 insert= a0 >> 25
-# asm 1: vsri.i32 <b0=reg128#15,<a0=reg128#13,#25
-# asm 2: vsri.i32 <b0=q14,<a0=q12,#25
-vsri.i32 q14,q12,#25
-
-# qhasm:     					4x next_b0 insert= next_a0 >> 25
-# asm 1: vsri.i32 <next_b0=reg128#16,<next_a0=reg128#14,#25
-# asm 2: vsri.i32 <next_b0=q15,<next_a0=q13,#25
-vsri.i32 q15,q13,#25
-
-# qhasm:        diag1 ^= b0
-# asm 1: veor >diag1=reg128#9,<diag1=reg128#9,<b0=reg128#15
-# asm 2: veor >diag1=q8,<diag1=q8,<b0=q14
-veor q8,q8,q14
-
-# qhasm:        					next_diag1 ^= next_b0
-# asm 1: veor >next_diag1=reg128#5,<next_diag1=reg128#5,<next_b0=reg128#16
-# asm 2: veor >next_diag1=q4,<next_diag1=q4,<next_b0=q15
-veor q4,q4,q15
-
-# qhasm:     4x a1 = diag0 + diag1
-# asm 1: vadd.i32 >a1=reg128#13,<diag0=reg128#8,<diag1=reg128#9
-# asm 2: vadd.i32 >a1=q12,<diag0=q7,<diag1=q8
-vadd.i32 q12,q7,q8
-
-# qhasm:     					4x next_a1 = next_diag0 + next_diag1
-# asm 1: vadd.i32 >next_a1=reg128#14,<next_diag0=reg128#2,<next_diag1=reg128#5
-# asm 2: vadd.i32 >next_a1=q13,<next_diag0=q1,<next_diag1=q4
-vadd.i32 q13,q1,q4
-
-# qhasm:     4x b1 = a1 << 9
-# asm 1: vshl.i32 >b1=reg128#15,<a1=reg128#13,#9
-# asm 2: vshl.i32 >b1=q14,<a1=q12,#9
-vshl.i32 q14,q12,#9
-
-# qhasm:     					4x next_b1 = next_a1 << 9
-# asm 1: vshl.i32 >next_b1=reg128#16,<next_a1=reg128#14,#9
-# asm 2: vshl.i32 >next_b1=q15,<next_a1=q13,#9
-vshl.i32 q15,q13,#9
-
-# qhasm:     4x b1 insert= a1 >> 23
-# asm 1: vsri.i32 <b1=reg128#15,<a1=reg128#13,#23
-# asm 2: vsri.i32 <b1=q14,<a1=q12,#23
-vsri.i32 q14,q12,#23
-
-# qhasm:                   						unsigned>? i -= 2
-# asm 1: subs <i=int32#5,<i=int32#5,#2
-# asm 2: subs <i=r4,<i=r4,#2
-subs r4,r4,#2
-
-# qhasm:     					4x next_b1 insert= next_a1 >> 23
-# asm 1: vsri.i32 <next_b1=reg128#16,<next_a1=reg128#14,#23
-# asm 2: vsri.i32 <next_b1=q15,<next_a1=q13,#23
-vsri.i32 q15,q13,#23
-
-# qhasm:        diag2 ^= b1
-# asm 1: veor >diag2=reg128#6,<diag2=reg128#6,<b1=reg128#15
-# asm 2: veor >diag2=q5,<diag2=q5,<b1=q14
-veor q5,q5,q14
-
-# qhasm:        					next_diag2 ^= next_b1
-# asm 1: veor >next_diag2=reg128#12,<next_diag2=reg128#12,<next_b1=reg128#16
-# asm 2: veor >next_diag2=q11,<next_diag2=q11,<next_b1=q15
-veor q11,q11,q15
-
-# qhasm:     4x a2 = diag1 + diag2
-# asm 1: vadd.i32 >a2=reg128#13,<diag1=reg128#9,<diag2=reg128#6
-# asm 2: vadd.i32 >a2=q12,<diag1=q8,<diag2=q5
-vadd.i32 q12,q8,q5
-
-# qhasm:             diag1 = diag1[3] diag1[0,1,2]
-# asm 1: vext.32 >diag1=reg128#9,<diag1=reg128#9,<diag1=reg128#9,#3
-# asm 2: vext.32 >diag1=q8,<diag1=q8,<diag1=q8,#3
-vext.32 q8,q8,q8,#3
-
-# qhasm:     					4x next_a2 = next_diag1 + next_diag2
-# asm 1: vadd.i32 >next_a2=reg128#14,<next_diag1=reg128#5,<next_diag2=reg128#12
-# asm 2: vadd.i32 >next_a2=q13,<next_diag1=q4,<next_diag2=q11
-vadd.i32 q13,q4,q11
-
-# qhasm:     4x b2 = a2 << 13
-# asm 1: vshl.i32 >b2=reg128#15,<a2=reg128#13,#13
-# asm 2: vshl.i32 >b2=q14,<a2=q12,#13
-vshl.i32 q14,q12,#13
-
-# qhasm:             					next_diag1 = next_diag1[3] next_diag1[0,1,2]
-# asm 1: vext.32 >next_diag1=reg128#5,<next_diag1=reg128#5,<next_diag1=reg128#5,#3
-# asm 2: vext.32 >next_diag1=q4,<next_diag1=q4,<next_diag1=q4,#3
-vext.32 q4,q4,q4,#3
-
-# qhasm:     					4x next_b2 = next_a2 << 13
-# asm 1: vshl.i32 >next_b2=reg128#16,<next_a2=reg128#14,#13
-# asm 2: vshl.i32 >next_b2=q15,<next_a2=q13,#13
-vshl.i32 q15,q13,#13
-
-# qhasm:     4x b2 insert= a2 >> 19
-# asm 1: vsri.i32 <b2=reg128#15,<a2=reg128#13,#19
-# asm 2: vsri.i32 <b2=q14,<a2=q12,#19
-vsri.i32 q14,q12,#19
-
-# qhasm:     					4x next_b2 insert= next_a2 >> 19
-# asm 1: vsri.i32 <next_b2=reg128#16,<next_a2=reg128#14,#19
-# asm 2: vsri.i32 <next_b2=q15,<next_a2=q13,#19
-vsri.i32 q15,q13,#19
-
-# qhasm:        diag3 ^= b2
-# asm 1: veor >diag3=reg128#7,<diag3=reg128#7,<b2=reg128#15
-# asm 2: veor >diag3=q6,<diag3=q6,<b2=q14
-veor q6,q6,q14
-
-# qhasm:        					next_diag3 ^= next_b2
-# asm 1: veor >next_diag3=reg128#11,<next_diag3=reg128#11,<next_b2=reg128#16
-# asm 2: veor >next_diag3=q10,<next_diag3=q10,<next_b2=q15
-veor q10,q10,q15
-
-# qhasm:     4x a3 = diag2 + diag3
-# asm 1: vadd.i32 >a3=reg128#13,<diag2=reg128#6,<diag3=reg128#7
-# asm 2: vadd.i32 >a3=q12,<diag2=q5,<diag3=q6
-vadd.i32 q12,q5,q6
-
-# qhasm:             diag2 = diag2[2,3] diag2[0,1]
-# asm 1: vswp <diag2=reg128#6%bot,<diag2=reg128#6%top
-# asm 2: vswp <diag2=d10,<diag2=d11
-vswp d10,d11
-
-# qhasm:     					4x next_a3 = next_diag2 + next_diag3
-# asm 1: vadd.i32 >next_a3=reg128#14,<next_diag2=reg128#12,<next_diag3=reg128#11
-# asm 2: vadd.i32 >next_a3=q13,<next_diag2=q11,<next_diag3=q10
-vadd.i32 q13,q11,q10
-
-# qhasm:     4x b3 = a3 << 18
-# asm 1: vshl.i32 >b3=reg128#15,<a3=reg128#13,#18
-# asm 2: vshl.i32 >b3=q14,<a3=q12,#18
-vshl.i32 q14,q12,#18
-
-# qhasm:             					next_diag2 = next_diag2[2,3] next_diag2[0,1]
-# asm 1: vswp <next_diag2=reg128#12%bot,<next_diag2=reg128#12%top
-# asm 2: vswp <next_diag2=d22,<next_diag2=d23
-vswp d22,d23
-
-# qhasm:     					4x next_b3 = next_a3 << 18
-# asm 1: vshl.i32 >next_b3=reg128#16,<next_a3=reg128#14,#18
-# asm 2: vshl.i32 >next_b3=q15,<next_a3=q13,#18
-vshl.i32 q15,q13,#18
-
-# qhasm:     4x b3 insert= a3 >> 14
-# asm 1: vsri.i32 <b3=reg128#15,<a3=reg128#13,#14
-# asm 2: vsri.i32 <b3=q14,<a3=q12,#14
-vsri.i32 q14,q12,#14
-
-# qhasm:             diag3 = diag3[1,2,3] diag3[0]
-# asm 1: vext.32 >diag3=reg128#7,<diag3=reg128#7,<diag3=reg128#7,#1
-# asm 2: vext.32 >diag3=q6,<diag3=q6,<diag3=q6,#1
-vext.32 q6,q6,q6,#1
-
-# qhasm:     					4x next_b3 insert= next_a3 >> 14
-# asm 1: vsri.i32 <next_b3=reg128#16,<next_a3=reg128#14,#14
-# asm 2: vsri.i32 <next_b3=q15,<next_a3=q13,#14
-vsri.i32 q15,q13,#14
-
-# qhasm:        diag0 ^= b3
-# asm 1: veor >diag0=reg128#8,<diag0=reg128#8,<b3=reg128#15
-# asm 2: veor >diag0=q7,<diag0=q7,<b3=q14
-veor q7,q7,q14
-
-# qhasm:             					next_diag3 = next_diag3[1,2,3] next_diag3[0]
-# asm 1: vext.32 >next_diag3=reg128#13,<next_diag3=reg128#11,<next_diag3=reg128#11,#1
-# asm 2: vext.32 >next_diag3=q12,<next_diag3=q10,<next_diag3=q10,#1
-vext.32 q12,q10,q10,#1
-
-# qhasm:        					next_diag0 ^= next_b3
-# asm 1: veor >next_diag0=reg128#2,<next_diag0=reg128#2,<next_b3=reg128#16
-# asm 2: veor >next_diag0=q1,<next_diag0=q1,<next_b3=q15
-veor q1,q1,q15
-
-# qhasm:   goto mainloop2 if unsigned>
-bhi ._mainloop2
-
-# qhasm:   2x abab = 0xffffffff
-# asm 1: vmov.i64 >abab=reg128#11,#0xffffffff
-# asm 2: vmov.i64 >abab=q10,#0xffffffff
-vmov.i64 q10,#0xffffffff
-
-# qhasm:   new x4x9x14x3
-
-# qhasm:   x4x9x14x3 bot = stack_start3 bot
-# asm 1: vldr <x4x9x14x3=reg128#14%bot,<stack_start3=stack128#9
-# asm 2: vldr <x4x9x14x3=d26,<stack_start3=[sp,#224]
-vldr d26,[sp,#224]
-
-# qhasm:   x4x9x14x3 top = stack_start3 top
-# asm 1: vldr <x4x9x14x3=reg128#14%top,<stack_start3=stack128#9
-# asm 2: vldr <x4x9x14x3=d27,<stack_start3=[sp,#232]
-vldr d27,[sp,#232]
-
-# qhasm:   4x x0x5x10x15 = diag0 + start0
-# asm 1: vadd.i32 >x0x5x10x15=reg128#8,<diag0=reg128#8,<start0=reg128#3
-# asm 2: vadd.i32 >x0x5x10x15=q7,<diag0=q7,<start0=q2
-vadd.i32 q7,q7,q2
-
-# qhasm:   4x x12x1x6x11 = diag1 + start1
-# asm 1: vadd.i32 >x12x1x6x11=reg128#9,<diag1=reg128#9,<start1=reg128#4
-# asm 2: vadd.i32 >x12x1x6x11=q8,<diag1=q8,<start1=q3
-vadd.i32 q8,q8,q3
-
-# qhasm:   4x x8x13x2x7 = diag2 + start2
-# asm 1: vadd.i32 >x8x13x2x7=reg128#6,<diag2=reg128#6,<start2=reg128#10
-# asm 2: vadd.i32 >x8x13x2x7=q5,<diag2=q5,<start2=q9
-vadd.i32 q5,q5,q9
-
-# qhasm:   4x x4x9x14x3 += diag3
-# asm 1: vadd.i32 >x4x9x14x3=reg128#7,<x4x9x14x3=reg128#14,<diag3=reg128#7
-# asm 2: vadd.i32 >x4x9x14x3=q6,<x4x9x14x3=q13,<diag3=q6
-vadd.i32 q6,q13,q6
-
-# qhasm:   x0x1x10x11 = x0x5x10x15
-# asm 1: vmov >x0x1x10x11=reg128#10,<x0x5x10x15=reg128#8
-# asm 2: vmov >x0x1x10x11=q9,<x0x5x10x15=q7
-vmov q9,q7
-
-# qhasm:   x12x13x6x7 = x12x1x6x11
-# asm 1: vmov >x12x13x6x7=reg128#14,<x12x1x6x11=reg128#9
-# asm 2: vmov >x12x13x6x7=q13,<x12x1x6x11=q8
-vmov q13,q8
-
-# qhasm:   x8x9x2x3 = x8x13x2x7
-# asm 1: vmov >x8x9x2x3=reg128#15,<x8x13x2x7=reg128#6
-# asm 2: vmov >x8x9x2x3=q14,<x8x13x2x7=q5
-vmov q14,q5
-
-# qhasm:   x4x5x14x15 = x4x9x14x3
-# asm 1: vmov >x4x5x14x15=reg128#16,<x4x9x14x3=reg128#7
-# asm 2: vmov >x4x5x14x15=q15,<x4x9x14x3=q6
-vmov q15,q6
-
-# qhasm:   x0x1x10x11 = (abab & x0x1x10x11) | (~abab & x12x1x6x11)
-# asm 1: vbif <x0x1x10x11=reg128#10,<x12x1x6x11=reg128#9,<abab=reg128#11
-# asm 2: vbif <x0x1x10x11=q9,<x12x1x6x11=q8,<abab=q10
-vbif q9,q8,q10
-
-# qhasm:   x12x13x6x7 = (abab & x12x13x6x7) | (~abab & x8x13x2x7)
-# asm 1: vbif <x12x13x6x7=reg128#14,<x8x13x2x7=reg128#6,<abab=reg128#11
-# asm 2: vbif <x12x13x6x7=q13,<x8x13x2x7=q5,<abab=q10
-vbif q13,q5,q10
-
-# qhasm:   x8x9x2x3 = (abab & x8x9x2x3) | (~abab & x4x9x14x3)
-# asm 1: vbif <x8x9x2x3=reg128#15,<x4x9x14x3=reg128#7,<abab=reg128#11
-# asm 2: vbif <x8x9x2x3=q14,<x4x9x14x3=q6,<abab=q10
-vbif q14,q6,q10
-
-# qhasm:   x4x5x14x15 = (abab & x4x5x14x15) | (~abab & x0x5x10x15)
-# asm 1: vbif <x4x5x14x15=reg128#16,<x0x5x10x15=reg128#8,<abab=reg128#11
-# asm 2: vbif <x4x5x14x15=q15,<x0x5x10x15=q7,<abab=q10
-vbif q15,q7,q10
-
-# qhasm:   x0x1x2x3 = x0x1x10x11
-# asm 1: vmov >x0x1x2x3=reg128#6,<x0x1x10x11=reg128#10
-# asm 2: vmov >x0x1x2x3=q5,<x0x1x10x11=q9
-vmov q5,q9
-
-# qhasm:   x4x5x6x7 = x4x5x14x15
-# asm 1: vmov >x4x5x6x7=reg128#7,<x4x5x14x15=reg128#16
-# asm 2: vmov >x4x5x6x7=q6,<x4x5x14x15=q15
-vmov q6,q15
-
-# qhasm:   x8x9x10x11 = x8x9x2x3
-# asm 1: vmov >x8x9x10x11=reg128#8,<x8x9x2x3=reg128#15
-# asm 2: vmov >x8x9x10x11=q7,<x8x9x2x3=q14
-vmov q7,q14
-
-# qhasm:   x12x13x14x15 = x12x13x6x7
-# asm 1: vmov >x12x13x14x15=reg128#9,<x12x13x6x7=reg128#14
-# asm 2: vmov >x12x13x14x15=q8,<x12x13x6x7=q13
-vmov q8,q13
-
-# qhasm:   x0x1x2x3 = x0x1x2x3[0,1] x8x9x2x3[2,3]
-# asm 1: vmov <x0x1x2x3=reg128#6%top,<x8x9x2x3=reg128#15%top
-# asm 2: vmov <x0x1x2x3=d11,<x8x9x2x3=d29
-vmov d11,d29
-
-# qhasm:   x4x5x6x7 = x4x5x6x7[0,1] x12x13x6x7[2,3]
-# asm 1: vmov <x4x5x6x7=reg128#7%top,<x12x13x6x7=reg128#14%top
-# asm 2: vmov <x4x5x6x7=d13,<x12x13x6x7=d27
-vmov d13,d27
-
-# qhasm:   x8x9x10x11 = x8x9x10x11[0,1] x0x1x10x11[2,3]
-# asm 1: vmov <x8x9x10x11=reg128#8%top,<x0x1x10x11=reg128#10%top
-# asm 2: vmov <x8x9x10x11=d15,<x0x1x10x11=d19
-vmov d15,d19
-
-# qhasm:   x12x13x14x15 = x12x13x14x15[0,1] x4x5x14x15[2,3]
-# asm 1: vmov <x12x13x14x15=reg128#9%top,<x4x5x14x15=reg128#16%top
-# asm 2: vmov <x12x13x14x15=d17,<x4x5x14x15=d31
-vmov d17,d31
-
-# qhasm:                      =? m - 0
-# asm 1: cmp <m=int32#2,#0
-# asm 2: cmp <m=r1,#0
-cmp r1,#0
-
-# qhasm:   goto nomessage2 if =
-beq ._nomessage2
-
-# qhasm:     m0m1m2m3 = mem128[m]
-# asm 1: vld1.8 {>m0m1m2m3=reg128#10%bot->m0m1m2m3=reg128#10%top},[<m=int32#2]
-# asm 2: vld1.8 {>m0m1m2m3=d18->m0m1m2m3=d19},[<m=r1]
-vld1.8 {d18-d19},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m4m5m6m7 = mem128[m]
-# asm 1: vld1.8 {>m4m5m6m7=reg128#14%bot->m4m5m6m7=reg128#14%top},[<m=int32#2]
-# asm 2: vld1.8 {>m4m5m6m7=d26->m4m5m6m7=d27},[<m=r1]
-vld1.8 {d26-d27},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m8m9m10m11 = mem128[m]
-# asm 1: vld1.8 {>m8m9m10m11=reg128#15%bot->m8m9m10m11=reg128#15%top},[<m=int32#2]
-# asm 2: vld1.8 {>m8m9m10m11=d28->m8m9m10m11=d29},[<m=r1]
-vld1.8 {d28-d29},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m12m13m14m15 = mem128[m]
-# asm 1: vld1.8 {>m12m13m14m15=reg128#16%bot->m12m13m14m15=reg128#16%top},[<m=int32#2]
-# asm 2: vld1.8 {>m12m13m14m15=d30->m12m13m14m15=d31},[<m=r1]
-vld1.8 {d30-d31},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     x0x1x2x3 ^= m0m1m2m3
-# asm 1: veor >x0x1x2x3=reg128#6,<x0x1x2x3=reg128#6,<m0m1m2m3=reg128#10
-# asm 2: veor >x0x1x2x3=q5,<x0x1x2x3=q5,<m0m1m2m3=q9
-veor q5,q5,q9
-
-# qhasm:     x4x5x6x7 ^= m4m5m6m7
-# asm 1: veor >x4x5x6x7=reg128#7,<x4x5x6x7=reg128#7,<m4m5m6m7=reg128#14
-# asm 2: veor >x4x5x6x7=q6,<x4x5x6x7=q6,<m4m5m6m7=q13
-veor q6,q6,q13
-
-# qhasm:     x8x9x10x11 ^= m8m9m10m11
-# asm 1: veor >x8x9x10x11=reg128#8,<x8x9x10x11=reg128#8,<m8m9m10m11=reg128#15
-# asm 2: veor >x8x9x10x11=q7,<x8x9x10x11=q7,<m8m9m10m11=q14
-veor q7,q7,q14
-
-# qhasm:     x12x13x14x15 ^= m12m13m14m15
-# asm 1: veor >x12x13x14x15=reg128#9,<x12x13x14x15=reg128#9,<m12m13m14m15=reg128#16
-# asm 2: veor >x12x13x14x15=q8,<x12x13x14x15=q8,<m12m13m14m15=q15
-veor q8,q8,q15
-
-# qhasm:   nomessage2:
-._nomessage2:
-
-# qhasm:   mem128[c] = x0x1x2x3
-# asm 1: vst1.8 {<x0x1x2x3=reg128#6%bot-<x0x1x2x3=reg128#6%top},[<c=int32#1]
-# asm 2: vst1.8 {<x0x1x2x3=d10-<x0x1x2x3=d11},[<c=r0]
-vst1.8 {d10-d11},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x4x5x6x7
-# asm 1: vst1.8 {<x4x5x6x7=reg128#7%bot-<x4x5x6x7=reg128#7%top},[<c=int32#1]
-# asm 2: vst1.8 {<x4x5x6x7=d12-<x4x5x6x7=d13},[<c=r0]
-vst1.8 {d12-d13},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x8x9x10x11
-# asm 1: vst1.8 {<x8x9x10x11=reg128#8%bot-<x8x9x10x11=reg128#8%top},[<c=int32#1]
-# asm 2: vst1.8 {<x8x9x10x11=d14-<x8x9x10x11=d15},[<c=r0]
-vst1.8 {d14-d15},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x12x13x14x15
-# asm 1: vst1.8 {<x12x13x14x15=reg128#9%bot-<x12x13x14x15=reg128#9%top},[<c=int32#1]
-# asm 2: vst1.8 {<x12x13x14x15=d16-<x12x13x14x15=d17},[<c=r0]
-vst1.8 {d16-d17},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   new x8x13x2x7
-
-# qhasm:   x8x13x2x7 bot = next_start2 bot
-# asm 1: vldr <x8x13x2x7=reg128#6%bot,<next_start2=stack128#7
-# asm 2: vldr <x8x13x2x7=d10,<next_start2=[sp,#192]
-vldr d10,[sp,#192]
-
-# qhasm:   x8x13x2x7 top = next_start2 top
-# asm 1: vldr <x8x13x2x7=reg128#6%top,<next_start2=stack128#7
-# asm 2: vldr <x8x13x2x7=d11,<next_start2=[sp,#200]
-vldr d11,[sp,#200]
-
-# qhasm:   new x4x9x14x3
-
-# qhasm:   x4x9x14x3 bot = next_start3 bot
-# asm 1: vldr <x4x9x14x3=reg128#7%bot,<next_start3=stack128#8
-# asm 2: vldr <x4x9x14x3=d12,<next_start3=[sp,#208]
-vldr d12,[sp,#208]
-
-# qhasm:   x4x9x14x3 top = next_start3 top
-# asm 1: vldr <x4x9x14x3=reg128#7%top,<next_start3=stack128#8
-# asm 2: vldr <x4x9x14x3=d13,<next_start3=[sp,#216]
-vldr d13,[sp,#216]
-
-# qhasm:   4x x0x5x10x15 = next_diag0 + start0
-# asm 1: vadd.i32 >x0x5x10x15=reg128#2,<next_diag0=reg128#2,<start0=reg128#3
-# asm 2: vadd.i32 >x0x5x10x15=q1,<next_diag0=q1,<start0=q2
-vadd.i32 q1,q1,q2
-
-# qhasm:   4x x12x1x6x11 = next_diag1 + start1
-# asm 1: vadd.i32 >x12x1x6x11=reg128#5,<next_diag1=reg128#5,<start1=reg128#4
-# asm 2: vadd.i32 >x12x1x6x11=q4,<next_diag1=q4,<start1=q3
-vadd.i32 q4,q4,q3
-
-# qhasm:   4x x8x13x2x7 += next_diag2
-# asm 1: vadd.i32 >x8x13x2x7=reg128#6,<x8x13x2x7=reg128#6,<next_diag2=reg128#12
-# asm 2: vadd.i32 >x8x13x2x7=q5,<x8x13x2x7=q5,<next_diag2=q11
-vadd.i32 q5,q5,q11
-
-# qhasm:   4x x4x9x14x3 += next_diag3
-# asm 1: vadd.i32 >x4x9x14x3=reg128#7,<x4x9x14x3=reg128#7,<next_diag3=reg128#13
-# asm 2: vadd.i32 >x4x9x14x3=q6,<x4x9x14x3=q6,<next_diag3=q12
-vadd.i32 q6,q6,q12
-
-# qhasm:   x0x1x10x11 = x0x5x10x15
-# asm 1: vmov >x0x1x10x11=reg128#8,<x0x5x10x15=reg128#2
-# asm 2: vmov >x0x1x10x11=q7,<x0x5x10x15=q1
-vmov q7,q1
-
-# qhasm:   x12x13x6x7 = x12x1x6x11
-# asm 1: vmov >x12x13x6x7=reg128#9,<x12x1x6x11=reg128#5
-# asm 2: vmov >x12x13x6x7=q8,<x12x1x6x11=q4
-vmov q8,q4
-
-# qhasm:   x8x9x2x3 = x8x13x2x7
-# asm 1: vmov >x8x9x2x3=reg128#10,<x8x13x2x7=reg128#6
-# asm 2: vmov >x8x9x2x3=q9,<x8x13x2x7=q5
-vmov q9,q5
-
-# qhasm:   x4x5x14x15 = x4x9x14x3
-# asm 1: vmov >x4x5x14x15=reg128#12,<x4x9x14x3=reg128#7
-# asm 2: vmov >x4x5x14x15=q11,<x4x9x14x3=q6
-vmov q11,q6
-
-# qhasm:   x0x1x10x11 = (abab & x0x1x10x11) | (~abab & x12x1x6x11)
-# asm 1: vbif <x0x1x10x11=reg128#8,<x12x1x6x11=reg128#5,<abab=reg128#11
-# asm 2: vbif <x0x1x10x11=q7,<x12x1x6x11=q4,<abab=q10
-vbif q7,q4,q10
-
-# qhasm:   x12x13x6x7 = (abab & x12x13x6x7) | (~abab & x8x13x2x7)
-# asm 1: vbif <x12x13x6x7=reg128#9,<x8x13x2x7=reg128#6,<abab=reg128#11
-# asm 2: vbif <x12x13x6x7=q8,<x8x13x2x7=q5,<abab=q10
-vbif q8,q5,q10
-
-# qhasm:   x8x9x2x3 = (abab & x8x9x2x3) | (~abab & x4x9x14x3)
-# asm 1: vbif <x8x9x2x3=reg128#10,<x4x9x14x3=reg128#7,<abab=reg128#11
-# asm 2: vbif <x8x9x2x3=q9,<x4x9x14x3=q6,<abab=q10
-vbif q9,q6,q10
-
-# qhasm:   x4x5x14x15 = (abab & x4x5x14x15) | (~abab & x0x5x10x15)
-# asm 1: vbif <x4x5x14x15=reg128#12,<x0x5x10x15=reg128#2,<abab=reg128#11
-# asm 2: vbif <x4x5x14x15=q11,<x0x5x10x15=q1,<abab=q10
-vbif q11,q1,q10
-
-# qhasm:   x0x1x2x3 = x0x1x10x11
-# asm 1: vmov >x0x1x2x3=reg128#2,<x0x1x10x11=reg128#8
-# asm 2: vmov >x0x1x2x3=q1,<x0x1x10x11=q7
-vmov q1,q7
-
-# qhasm:   x4x5x6x7 = x4x5x14x15
-# asm 1: vmov >x4x5x6x7=reg128#5,<x4x5x14x15=reg128#12
-# asm 2: vmov >x4x5x6x7=q4,<x4x5x14x15=q11
-vmov q4,q11
-
-# qhasm:   x8x9x10x11 = x8x9x2x3
-# asm 1: vmov >x8x9x10x11=reg128#6,<x8x9x2x3=reg128#10
-# asm 2: vmov >x8x9x10x11=q5,<x8x9x2x3=q9
-vmov q5,q9
-
-# qhasm:   x12x13x14x15 = x12x13x6x7
-# asm 1: vmov >x12x13x14x15=reg128#7,<x12x13x6x7=reg128#9
-# asm 2: vmov >x12x13x14x15=q6,<x12x13x6x7=q8
-vmov q6,q8
-
-# qhasm:   x0x1x2x3 = x0x1x2x3[0,1] x8x9x2x3[2,3]
-# asm 1: vmov <x0x1x2x3=reg128#2%top,<x8x9x2x3=reg128#10%top
-# asm 2: vmov <x0x1x2x3=d3,<x8x9x2x3=d19
-vmov d3,d19
-
-# qhasm:   x4x5x6x7 = x4x5x6x7[0,1] x12x13x6x7[2,3]
-# asm 1: vmov <x4x5x6x7=reg128#5%top,<x12x13x6x7=reg128#9%top
-# asm 2: vmov <x4x5x6x7=d9,<x12x13x6x7=d17
-vmov d9,d17
-
-# qhasm:   x8x9x10x11 = x8x9x10x11[0,1] x0x1x10x11[2,3]
-# asm 1: vmov <x8x9x10x11=reg128#6%top,<x0x1x10x11=reg128#8%top
-# asm 2: vmov <x8x9x10x11=d11,<x0x1x10x11=d15
-vmov d11,d15
-
-# qhasm:   x12x13x14x15 = x12x13x14x15[0,1] x4x5x14x15[2,3]
-# asm 1: vmov <x12x13x14x15=reg128#7%top,<x4x5x14x15=reg128#12%top
-# asm 2: vmov <x12x13x14x15=d13,<x4x5x14x15=d23
-vmov d13,d23
-
-# qhasm:                      =? m - 0
-# asm 1: cmp <m=int32#2,#0
-# asm 2: cmp <m=r1,#0
-cmp r1,#0
-
-# qhasm:   goto nomessage2next if =
-beq ._nomessage2next
-
-# qhasm:     m0m1m2m3 = mem128[m]
-# asm 1: vld1.8 {>m0m1m2m3=reg128#8%bot->m0m1m2m3=reg128#8%top},[<m=int32#2]
-# asm 2: vld1.8 {>m0m1m2m3=d14->m0m1m2m3=d15},[<m=r1]
-vld1.8 {d14-d15},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m4m5m6m7 = mem128[m]
-# asm 1: vld1.8 {>m4m5m6m7=reg128#9%bot->m4m5m6m7=reg128#9%top},[<m=int32#2]
-# asm 2: vld1.8 {>m4m5m6m7=d16->m4m5m6m7=d17},[<m=r1]
-vld1.8 {d16-d17},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m8m9m10m11 = mem128[m]
-# asm 1: vld1.8 {>m8m9m10m11=reg128#10%bot->m8m9m10m11=reg128#10%top},[<m=int32#2]
-# asm 2: vld1.8 {>m8m9m10m11=d18->m8m9m10m11=d19},[<m=r1]
-vld1.8 {d18-d19},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m12m13m14m15 = mem128[m]
-# asm 1: vld1.8 {>m12m13m14m15=reg128#11%bot->m12m13m14m15=reg128#11%top},[<m=int32#2]
-# asm 2: vld1.8 {>m12m13m14m15=d20->m12m13m14m15=d21},[<m=r1]
-vld1.8 {d20-d21},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     x0x1x2x3 ^= m0m1m2m3
-# asm 1: veor >x0x1x2x3=reg128#2,<x0x1x2x3=reg128#2,<m0m1m2m3=reg128#8
-# asm 2: veor >x0x1x2x3=q1,<x0x1x2x3=q1,<m0m1m2m3=q7
-veor q1,q1,q7
-
-# qhasm:     x4x5x6x7 ^= m4m5m6m7
-# asm 1: veor >x4x5x6x7=reg128#5,<x4x5x6x7=reg128#5,<m4m5m6m7=reg128#9
-# asm 2: veor >x4x5x6x7=q4,<x4x5x6x7=q4,<m4m5m6m7=q8
-veor q4,q4,q8
-
-# qhasm:     x8x9x10x11 ^= m8m9m10m11
-# asm 1: veor >x8x9x10x11=reg128#6,<x8x9x10x11=reg128#6,<m8m9m10m11=reg128#10
-# asm 2: veor >x8x9x10x11=q5,<x8x9x10x11=q5,<m8m9m10m11=q9
-veor q5,q5,q9
-
-# qhasm:     x12x13x14x15 ^= m12m13m14m15
-# asm 1: veor >x12x13x14x15=reg128#7,<x12x13x14x15=reg128#7,<m12m13m14m15=reg128#11
-# asm 2: veor >x12x13x14x15=q6,<x12x13x14x15=q6,<m12m13m14m15=q10
-veor q6,q6,q10
-
-# qhasm:   nomessage2next:
-._nomessage2next:
-
-# qhasm:   mem128[c] = x0x1x2x3
-# asm 1: vst1.8 {<x0x1x2x3=reg128#2%bot-<x0x1x2x3=reg128#2%top},[<c=int32#1]
-# asm 2: vst1.8 {<x0x1x2x3=d2-<x0x1x2x3=d3},[<c=r0]
-vst1.8 {d2-d3},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x4x5x6x7
-# asm 1: vst1.8 {<x4x5x6x7=reg128#5%bot-<x4x5x6x7=reg128#5%top},[<c=int32#1]
-# asm 2: vst1.8 {<x4x5x6x7=d8-<x4x5x6x7=d9},[<c=r0]
-vst1.8 {d8-d9},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x8x9x10x11
-# asm 1: vst1.8 {<x8x9x10x11=reg128#6%bot-<x8x9x10x11=reg128#6%top},[<c=int32#1]
-# asm 2: vst1.8 {<x8x9x10x11=d10-<x8x9x10x11=d11},[<c=r0]
-vst1.8 {d10-d11},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x12x13x14x15
-# asm 1: vst1.8 {<x12x13x14x15=reg128#7%bot-<x12x13x14x15=reg128#7%top},[<c=int32#1]
-# asm 2: vst1.8 {<x12x13x14x15=d12-<x12x13x14x15=d13},[<c=r0]
-vst1.8 {d12-d13},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   carry? mlenlow -= 128
-# asm 1: subs <mlenlow=int32#3,<mlenlow=int32#3,#128
-# asm 2: subs <mlenlow=r2,<mlenlow=r2,#128
-subs r2,r2,#128
-
-# qhasm:   mlenhigh -= 0 - carry
-# asm 1: sbc <mlenhigh=int32#4,<mlenhigh=int32#4,#0
-# asm 2: sbc <mlenhigh=r3,<mlenhigh=r3,#0
-sbc r3,r3,#0
-
-# qhasm:                         unsigned<? mlenlow - 128
-# asm 1: cmp <mlenlow=int32#3,#128
-# asm 2: cmp <mlenlow=r2,#128
-cmp r2,#128
-
-# qhasm: goto mlenatleast128 if !unsigned<
-bhs ._mlenatleast128
-
-# qhasm: mlenlowbelow128:
-._mlenlowbelow128:
-
-# qhasm:                        unsigned>? mlenhigh - 0
-# asm 1: cmp <mlenhigh=int32#4,#0
-# asm 2: cmp <mlenhigh=r3,#0
-cmp r3,#0
-
-# qhasm: goto mlenatleast128 if unsigned>
-bhi ._mlenatleast128
-
-# qhasm:              =? mlenlow - 0
-# asm 1: cmp <mlenlow=int32#3,#0
-# asm 2: cmp <mlenlow=r2,#0
-cmp r2,#0
-
-# qhasm: goto done if =
-beq ._done
-
-# qhasm: mlenatleast1:
-._mlenatleast1:
-
-# qhasm:                          unsigned<? mlenlow - 64
-# asm 1: cmp <mlenlow=int32#3,#64
-# asm 2: cmp <mlenlow=r2,#64
-cmp r2,#64
-
-# qhasm:   goto mlenatleast64 if !unsigned<
-bhs ._mlenatleast64
-
-# qhasm:     savec = c
-# asm 1: str <c=int32#1,>savec=stack32#1
-# asm 2: str <c=r0,>savec=[sp,#64]
-str r0,[sp,#64]
-
-# qhasm:     c = &tmp
-# asm 1: lea >c=int32#1,<tmp=stack512#1
-# asm 2: lea >c=r0,<tmp=[sp,#0]
-add r0,sp,#0
-
-# qhasm:                           =? m - 0
-# asm 1: cmp <m=int32#2,#0
-# asm 2: cmp <m=r1,#0
-cmp r1,#0
-
-# qhasm:     goto mlenatleast64 if =
-beq ._mlenatleast64
-
-# qhasm:     i = 0
-# asm 1: ldr >i=int32#4,=0
-# asm 2: ldr >i=r3,=0
-ldr r3,=0
-
-# qhasm:     mcopy:
-._mcopy:
-
-# qhasm:       mi = mem8[m + 0]
-# asm 1: ldrb >mi=int32#5,[<m=int32#2,#0]
-# asm 2: ldrb >mi=r4,[<m=r1,#0]
-ldrb r4,[r1,#0]
-
-# qhasm:       mem8[c + 0] = mi
-# asm 1: strb <mi=int32#5,[<c=int32#1,#0]
-# asm 2: strb <mi=r4,[<c=r0,#0]
-strb r4,[r0,#0]
-
-# qhasm:       m += 1
-# asm 1: add <m=int32#2,<m=int32#2,#1
-# asm 2: add <m=r1,<m=r1,#1
-add r1,r1,#1
-
-# qhasm:       c += 1
-# asm 1: add <c=int32#1,<c=int32#1,#1
-# asm 2: add <c=r0,<c=r0,#1
-add r0,r0,#1
-
-# qhasm:       i += 1
-# asm 1: add <i=int32#4,<i=int32#4,#1
-# asm 2: add <i=r3,<i=r3,#1
-add r3,r3,#1
-
-# qhasm:                   unsigned<? i - mlenlow
-# asm 1: cmp <i=int32#4,<mlenlow=int32#3
-# asm 2: cmp <i=r3,<mlenlow=r2
-cmp r3,r2
-
-# qhasm:     goto mcopy if unsigned<
-blo ._mcopy
-
-# qhasm:     mi = 0
-# asm 1: ldr >mi=int32#2,=0
-# asm 2: ldr >mi=r1,=0
-ldr r1,=0
-
-# qhasm:     pad:
-._pad:
-
-# qhasm:       mem8[c + 0] = mi
-# asm 1: strb <mi=int32#2,[<c=int32#1,#0]
-# asm 2: strb <mi=r1,[<c=r0,#0]
-strb r1,[r0,#0]
-
-# qhasm:       c += 1
-# asm 1: add <c=int32#1,<c=int32#1,#1
-# asm 2: add <c=r0,<c=r0,#1
-add r0,r0,#1
-
-# qhasm:       i += 1
-# asm 1: add <i=int32#4,<i=int32#4,#1
-# asm 2: add <i=r3,<i=r3,#1
-add r3,r3,#1
-
-# qhasm:                 unsigned<? i - 64
-# asm 1: cmp <i=int32#4,#64
-# asm 2: cmp <i=r3,#64
-cmp r3,#64
-
-# qhasm:     goto pad if unsigned<
-blo ._pad
-
-# qhasm:     c -= 64
-# asm 1: sub <c=int32#1,<c=int32#1,#64
-# asm 2: sub <c=r0,<c=r0,#64
-sub r0,r0,#64
-
-# qhasm:     m = &tmp
-# asm 1: lea >m=int32#2,<tmp=stack512#1
-# asm 2: lea >m=r1,<tmp=[sp,#0]
-add r1,sp,#0
-
-# qhasm:   mlenatleast64:
-._mlenatleast64:
-
-# qhasm:   new k2k3k6k7
-
-# qhasm:   k2k3k6k7 bot = k2k3k6k7_stack bot
-# asm 1: vldr <k2k3k6k7=reg128#2%bot,<k2k3k6k7_stack=stack128#5
-# asm 2: vldr <k2k3k6k7=d2,<k2k3k6k7_stack=[sp,#160]
-vldr d2,[sp,#160]
-
-# qhasm:   k2k3k6k7 top = k2k3k6k7_stack top
-# asm 1: vldr <k2k3k6k7=reg128#2%top,<k2k3k6k7_stack=stack128#5
-# asm 2: vldr <k2k3k6k7=d3,<k2k3k6k7_stack=[sp,#168]
-vldr d3,[sp,#168]
-
-# qhasm:   new k1n1k7k2
-
-# qhasm:   k1n1k7k2 bot = k1n1k7k2_stack bot
-# asm 1: vldr <k1n1k7k2=reg128#5%bot,<k1n1k7k2_stack=stack128#6
-# asm 2: vldr <k1n1k7k2=d8,<k1n1k7k2_stack=[sp,#176]
-vldr d8,[sp,#176]
-
-# qhasm:   k1n1k7k2 top = k1n1k7k2_stack top
-# asm 1: vldr <k1n1k7k2=reg128#5%top,<k1n1k7k2_stack=stack128#6
-# asm 2: vldr <k1n1k7k2=d9,<k1n1k7k2_stack=[sp,#184]
-vldr d9,[sp,#184]
-
-# qhasm:   n2n3n3n2 = n2n3n3n2[0,1] n2n3n3n2[1] n2n3n3n2[0]
-# asm 1: vext.32 <n2n3n3n2=reg128#1%top,<n2n3n3n2=reg128#1%bot,<n2n3n3n2=reg128#1%bot,#1
-# asm 2: vext.32 <n2n3n3n2=d1,<n2n3n3n2=d0,<n2n3n3n2=d0,#1
-vext.32 d1,d0,d0,#1
-
-# qhasm:   new start2
-
-# qhasm:   start2 = start2[0,1] k1n1k7k2[0,1]             
-# asm 1: vmov <start2=reg128#6%top,<k1n1k7k2=reg128#5%bot
-# asm 2: vmov <start2=d11,<k1n1k7k2=d8
-vmov d11,d8
-
-# qhasm:   start2 = n2n3n3n2[3] k2k3k6k7[2] start2[2,3]   
-# asm 1: vext.32 <start2=reg128#6%bot,<n2n3n3n2=reg128#1%top,<k2k3k6k7=reg128#2%top,#1
-# asm 2: vext.32 <start2=d10,<n2n3n3n2=d1,<k2k3k6k7=d3,#1
-vext.32 d10,d1,d3,#1
-
-# qhasm:   new start3
-
-# qhasm:   start3 = start3[0,1] k1n1k7k2[2,3]             
-# asm 1: vmov <start3=reg128#7%top,<k1n1k7k2=reg128#5%top
-# asm 2: vmov <start3=d13,<k1n1k7k2=d9
-vmov d13,d9
-
-# qhasm:   start3 = k2k3k6k7[1] n2n3n3n2[2] start3[2,3]   
-# asm 1: vext.32 <start3=reg128#7%bot,<k2k3k6k7=reg128#2%bot,<n2n3n3n2=reg128#1%top,#1
-# asm 2: vext.32 <start3=d12,<k2k3k6k7=d2,<n2n3n3n2=d1,#1
-vext.32 d12,d2,d1,#1
-
-# qhasm:   diag0 = start0
-# asm 1: vmov >diag0=reg128#2,<start0=reg128#3
-# asm 2: vmov >diag0=q1,<start0=q2
-vmov q1,q2
-
-# qhasm:   diag1 = start1
-# asm 1: vmov >diag1=reg128#5,<start1=reg128#4
-# asm 2: vmov >diag1=q4,<start1=q3
-vmov q4,q3
-
-# qhasm:   diag2 = start2
-# asm 1: vmov >diag2=reg128#8,<start2=reg128#6
-# asm 2: vmov >diag2=q7,<start2=q5
-vmov q7,q5
-
-# qhasm:   diag3 = start3
-# asm 1: vmov >diag3=reg128#9,<start3=reg128#7
-# asm 2: vmov >diag3=q8,<start3=q6
-vmov q8,q6
-
-# qhasm:   2x nextblock = 0xff
-# asm 1: vmov.i64 >nextblock=reg128#10,#0xff
-# asm 2: vmov.i64 >nextblock=q9,#0xff
-vmov.i64 q9,#0xff
-
-# qhasm:   4x nextblock unsigned>>= 7
-# asm 1: vshr.u32 >nextblock=reg128#10,<nextblock=reg128#10,#7
-# asm 2: vshr.u32 >nextblock=q9,<nextblock=q9,#7
-vshr.u32 q9,q9,#7
-
-# qhasm:   2x n2n3n3n2 += nextblock
-# asm 1: vadd.i64 >n2n3n3n2=reg128#1,<n2n3n3n2=reg128#1,<nextblock=reg128#10
-# asm 2: vadd.i64 >n2n3n3n2=q0,<n2n3n3n2=q0,<nextblock=q9
-vadd.i64 q0,q0,q9
-
-# qhasm:   i = 12
-# asm 1: ldr >i=int32#4,=12
-# asm 2: ldr >i=r3,=12
-ldr r3,=12
-
-# qhasm:   mainloop1:
-._mainloop1:
-
-# qhasm:     4x a0 = diag1 + diag0
-# asm 1: vadd.i32 >a0=reg128#10,<diag1=reg128#5,<diag0=reg128#2
-# asm 2: vadd.i32 >a0=q9,<diag1=q4,<diag0=q1
-vadd.i32 q9,q4,q1
-
-# qhasm:     4x b0 = a0 << 7
-# asm 1: vshl.i32 >b0=reg128#11,<a0=reg128#10,#7
-# asm 2: vshl.i32 >b0=q10,<a0=q9,#7
-vshl.i32 q10,q9,#7
-
-# qhasm:     4x b0 insert= a0 >> 25
-# asm 1: vsri.i32 <b0=reg128#11,<a0=reg128#10,#25
-# asm 2: vsri.i32 <b0=q10,<a0=q9,#25
-vsri.i32 q10,q9,#25
-
-# qhasm:        diag3 ^= b0
-# asm 1: veor >diag3=reg128#9,<diag3=reg128#9,<b0=reg128#11
-# asm 2: veor >diag3=q8,<diag3=q8,<b0=q10
-veor q8,q8,q10
-
-# qhasm:     4x a1 = diag0 + diag3
-# asm 1: vadd.i32 >a1=reg128#10,<diag0=reg128#2,<diag3=reg128#9
-# asm 2: vadd.i32 >a1=q9,<diag0=q1,<diag3=q8
-vadd.i32 q9,q1,q8
-
-# qhasm:     4x b1 = a1 << 9
-# asm 1: vshl.i32 >b1=reg128#11,<a1=reg128#10,#9
-# asm 2: vshl.i32 >b1=q10,<a1=q9,#9
-vshl.i32 q10,q9,#9
-
-# qhasm:     4x b1 insert= a1 >> 23
-# asm 1: vsri.i32 <b1=reg128#11,<a1=reg128#10,#23
-# asm 2: vsri.i32 <b1=q10,<a1=q9,#23
-vsri.i32 q10,q9,#23
-
-# qhasm:        diag2 ^= b1
-# asm 1: veor >diag2=reg128#8,<diag2=reg128#8,<b1=reg128#11
-# asm 2: veor >diag2=q7,<diag2=q7,<b1=q10
-veor q7,q7,q10
-
-# qhasm:     4x a2 = diag3 + diag2
-# asm 1: vadd.i32 >a2=reg128#10,<diag3=reg128#9,<diag2=reg128#8
-# asm 2: vadd.i32 >a2=q9,<diag3=q8,<diag2=q7
-vadd.i32 q9,q8,q7
-
-# qhasm:             diag3 = diag3[3] diag3[0,1,2]
-# asm 1: vext.32 >diag3=reg128#9,<diag3=reg128#9,<diag3=reg128#9,#3
-# asm 2: vext.32 >diag3=q8,<diag3=q8,<diag3=q8,#3
-vext.32 q8,q8,q8,#3
-
-# qhasm:     4x b2 = a2 << 13
-# asm 1: vshl.i32 >b2=reg128#11,<a2=reg128#10,#13
-# asm 2: vshl.i32 >b2=q10,<a2=q9,#13
-vshl.i32 q10,q9,#13
-
-# qhasm:     4x b2 insert= a2 >> 19
-# asm 1: vsri.i32 <b2=reg128#11,<a2=reg128#10,#19
-# asm 2: vsri.i32 <b2=q10,<a2=q9,#19
-vsri.i32 q10,q9,#19
-
-# qhasm:        diag1 ^= b2
-# asm 1: veor >diag1=reg128#5,<diag1=reg128#5,<b2=reg128#11
-# asm 2: veor >diag1=q4,<diag1=q4,<b2=q10
-veor q4,q4,q10
-
-# qhasm:     4x a3 = diag2 + diag1
-# asm 1: vadd.i32 >a3=reg128#10,<diag2=reg128#8,<diag1=reg128#5
-# asm 2: vadd.i32 >a3=q9,<diag2=q7,<diag1=q4
-vadd.i32 q9,q7,q4
-
-# qhasm:             diag2 = diag2[2,3] diag2[0,1]
-# asm 1: vswp <diag2=reg128#8%bot,<diag2=reg128#8%top
-# asm 2: vswp <diag2=d14,<diag2=d15
-vswp d14,d15
-
-# qhasm:     4x b3 = a3 << 18
-# asm 1: vshl.i32 >b3=reg128#11,<a3=reg128#10,#18
-# asm 2: vshl.i32 >b3=q10,<a3=q9,#18
-vshl.i32 q10,q9,#18
-
-# qhasm:     4x b3 insert= a3 >> 14
-# asm 1: vsri.i32 <b3=reg128#11,<a3=reg128#10,#14
-# asm 2: vsri.i32 <b3=q10,<a3=q9,#14
-vsri.i32 q10,q9,#14
-
-# qhasm:             diag1 = diag1[1,2,3] diag1[0]
-# asm 1: vext.32 >diag1=reg128#5,<diag1=reg128#5,<diag1=reg128#5,#1
-# asm 2: vext.32 >diag1=q4,<diag1=q4,<diag1=q4,#1
-vext.32 q4,q4,q4,#1
-
-# qhasm:        diag0 ^= b3
-# asm 1: veor >diag0=reg128#2,<diag0=reg128#2,<b3=reg128#11
-# asm 2: veor >diag0=q1,<diag0=q1,<b3=q10
-veor q1,q1,q10
-
-# qhasm:     4x a0 = diag3 + diag0
-# asm 1: vadd.i32 >a0=reg128#10,<diag3=reg128#9,<diag0=reg128#2
-# asm 2: vadd.i32 >a0=q9,<diag3=q8,<diag0=q1
-vadd.i32 q9,q8,q1
-
-# qhasm:     4x b0 = a0 << 7
-# asm 1: vshl.i32 >b0=reg128#11,<a0=reg128#10,#7
-# asm 2: vshl.i32 >b0=q10,<a0=q9,#7
-vshl.i32 q10,q9,#7
-
-# qhasm:     4x b0 insert= a0 >> 25
-# asm 1: vsri.i32 <b0=reg128#11,<a0=reg128#10,#25
-# asm 2: vsri.i32 <b0=q10,<a0=q9,#25
-vsri.i32 q10,q9,#25
-
-# qhasm:        diag1 ^= b0
-# asm 1: veor >diag1=reg128#5,<diag1=reg128#5,<b0=reg128#11
-# asm 2: veor >diag1=q4,<diag1=q4,<b0=q10
-veor q4,q4,q10
-
-# qhasm:     4x a1 = diag0 + diag1
-# asm 1: vadd.i32 >a1=reg128#10,<diag0=reg128#2,<diag1=reg128#5
-# asm 2: vadd.i32 >a1=q9,<diag0=q1,<diag1=q4
-vadd.i32 q9,q1,q4
-
-# qhasm:     4x b1 = a1 << 9
-# asm 1: vshl.i32 >b1=reg128#11,<a1=reg128#10,#9
-# asm 2: vshl.i32 >b1=q10,<a1=q9,#9
-vshl.i32 q10,q9,#9
-
-# qhasm:     4x b1 insert= a1 >> 23
-# asm 1: vsri.i32 <b1=reg128#11,<a1=reg128#10,#23
-# asm 2: vsri.i32 <b1=q10,<a1=q9,#23
-vsri.i32 q10,q9,#23
-
-# qhasm:                   						unsigned>? i -= 2
-# asm 1: subs <i=int32#4,<i=int32#4,#2
-# asm 2: subs <i=r3,<i=r3,#2
-subs r3,r3,#2
-
-# qhasm:        diag2 ^= b1
-# asm 1: veor >diag2=reg128#8,<diag2=reg128#8,<b1=reg128#11
-# asm 2: veor >diag2=q7,<diag2=q7,<b1=q10
-veor q7,q7,q10
-
-# qhasm:     4x a2 = diag1 + diag2
-# asm 1: vadd.i32 >a2=reg128#10,<diag1=reg128#5,<diag2=reg128#8
-# asm 2: vadd.i32 >a2=q9,<diag1=q4,<diag2=q7
-vadd.i32 q9,q4,q7
-
-# qhasm:             diag1 = diag1[3] diag1[0,1,2]
-# asm 1: vext.32 >diag1=reg128#5,<diag1=reg128#5,<diag1=reg128#5,#3
-# asm 2: vext.32 >diag1=q4,<diag1=q4,<diag1=q4,#3
-vext.32 q4,q4,q4,#3
-
-# qhasm:     4x b2 = a2 << 13
-# asm 1: vshl.i32 >b2=reg128#11,<a2=reg128#10,#13
-# asm 2: vshl.i32 >b2=q10,<a2=q9,#13
-vshl.i32 q10,q9,#13
-
-# qhasm:     4x b2 insert= a2 >> 19
-# asm 1: vsri.i32 <b2=reg128#11,<a2=reg128#10,#19
-# asm 2: vsri.i32 <b2=q10,<a2=q9,#19
-vsri.i32 q10,q9,#19
-
-# qhasm:        diag3 ^= b2
-# asm 1: veor >diag3=reg128#9,<diag3=reg128#9,<b2=reg128#11
-# asm 2: veor >diag3=q8,<diag3=q8,<b2=q10
-veor q8,q8,q10
-
-# qhasm:     4x a3 = diag2 + diag3
-# asm 1: vadd.i32 >a3=reg128#10,<diag2=reg128#8,<diag3=reg128#9
-# asm 2: vadd.i32 >a3=q9,<diag2=q7,<diag3=q8
-vadd.i32 q9,q7,q8
-
-# qhasm:             diag2 = diag2[2,3] diag2[0,1]
-# asm 1: vswp <diag2=reg128#8%bot,<diag2=reg128#8%top
-# asm 2: vswp <diag2=d14,<diag2=d15
-vswp d14,d15
-
-# qhasm:     4x b3 = a3 << 18
-# asm 1: vshl.i32 >b3=reg128#11,<a3=reg128#10,#18
-# asm 2: vshl.i32 >b3=q10,<a3=q9,#18
-vshl.i32 q10,q9,#18
-
-# qhasm:     4x b3 insert= a3 >> 14
-# asm 1: vsri.i32 <b3=reg128#11,<a3=reg128#10,#14
-# asm 2: vsri.i32 <b3=q10,<a3=q9,#14
-vsri.i32 q10,q9,#14
-
-# qhasm:             diag3 = diag3[1,2,3] diag3[0]
-# asm 1: vext.32 >diag3=reg128#9,<diag3=reg128#9,<diag3=reg128#9,#1
-# asm 2: vext.32 >diag3=q8,<diag3=q8,<diag3=q8,#1
-vext.32 q8,q8,q8,#1
-
-# qhasm:        diag0 ^= b3
-# asm 1: veor >diag0=reg128#2,<diag0=reg128#2,<b3=reg128#11
-# asm 2: veor >diag0=q1,<diag0=q1,<b3=q10
-veor q1,q1,q10
-
-# qhasm:   goto mainloop1 if unsigned>
-bhi ._mainloop1
-
-# qhasm:   2x abab = 0xffffffff
-# asm 1: vmov.i64 >abab=reg128#10,#0xffffffff
-# asm 2: vmov.i64 >abab=q9,#0xffffffff
-vmov.i64 q9,#0xffffffff
-
-# qhasm:   4x x0x5x10x15 = diag0 + start0
-# asm 1: vadd.i32 >x0x5x10x15=reg128#2,<diag0=reg128#2,<start0=reg128#3
-# asm 2: vadd.i32 >x0x5x10x15=q1,<diag0=q1,<start0=q2
-vadd.i32 q1,q1,q2
-
-# qhasm:   4x x12x1x6x11 = diag1 + start1
-# asm 1: vadd.i32 >x12x1x6x11=reg128#5,<diag1=reg128#5,<start1=reg128#4
-# asm 2: vadd.i32 >x12x1x6x11=q4,<diag1=q4,<start1=q3
-vadd.i32 q4,q4,q3
-
-# qhasm:   4x x8x13x2x7 = diag2 + start2
-# asm 1: vadd.i32 >x8x13x2x7=reg128#6,<diag2=reg128#8,<start2=reg128#6
-# asm 2: vadd.i32 >x8x13x2x7=q5,<diag2=q7,<start2=q5
-vadd.i32 q5,q7,q5
-
-# qhasm:   4x x4x9x14x3 = diag3 + start3
-# asm 1: vadd.i32 >x4x9x14x3=reg128#7,<diag3=reg128#9,<start3=reg128#7
-# asm 2: vadd.i32 >x4x9x14x3=q6,<diag3=q8,<start3=q6
-vadd.i32 q6,q8,q6
-
-# qhasm:   x0x1x10x11 = x0x5x10x15
-# asm 1: vmov >x0x1x10x11=reg128#8,<x0x5x10x15=reg128#2
-# asm 2: vmov >x0x1x10x11=q7,<x0x5x10x15=q1
-vmov q7,q1
-
-# qhasm:   x12x13x6x7 = x12x1x6x11
-# asm 1: vmov >x12x13x6x7=reg128#9,<x12x1x6x11=reg128#5
-# asm 2: vmov >x12x13x6x7=q8,<x12x1x6x11=q4
-vmov q8,q4
-
-# qhasm:   x8x9x2x3 = x8x13x2x7
-# asm 1: vmov >x8x9x2x3=reg128#11,<x8x13x2x7=reg128#6
-# asm 2: vmov >x8x9x2x3=q10,<x8x13x2x7=q5
-vmov q10,q5
-
-# qhasm:   x4x5x14x15 = x4x9x14x3
-# asm 1: vmov >x4x5x14x15=reg128#12,<x4x9x14x3=reg128#7
-# asm 2: vmov >x4x5x14x15=q11,<x4x9x14x3=q6
-vmov q11,q6
-
-# qhasm:   x0x1x10x11 = (abab & x0x1x10x11) | (~abab & x12x1x6x11)
-# asm 1: vbif <x0x1x10x11=reg128#8,<x12x1x6x11=reg128#5,<abab=reg128#10
-# asm 2: vbif <x0x1x10x11=q7,<x12x1x6x11=q4,<abab=q9
-vbif q7,q4,q9
-
-# qhasm:   x12x13x6x7 = (abab & x12x13x6x7) | (~abab & x8x13x2x7)
-# asm 1: vbif <x12x13x6x7=reg128#9,<x8x13x2x7=reg128#6,<abab=reg128#10
-# asm 2: vbif <x12x13x6x7=q8,<x8x13x2x7=q5,<abab=q9
-vbif q8,q5,q9
-
-# qhasm:   x8x9x2x3 = (abab & x8x9x2x3) | (~abab & x4x9x14x3)
-# asm 1: vbif <x8x9x2x3=reg128#11,<x4x9x14x3=reg128#7,<abab=reg128#10
-# asm 2: vbif <x8x9x2x3=q10,<x4x9x14x3=q6,<abab=q9
-vbif q10,q6,q9
-
-# qhasm:   x4x5x14x15 = (abab & x4x5x14x15) | (~abab & x0x5x10x15)
-# asm 1: vbif <x4x5x14x15=reg128#12,<x0x5x10x15=reg128#2,<abab=reg128#10
-# asm 2: vbif <x4x5x14x15=q11,<x0x5x10x15=q1,<abab=q9
-vbif q11,q1,q9
-
-# qhasm:   x0x1x2x3 = x0x1x10x11
-# asm 1: vmov >x0x1x2x3=reg128#2,<x0x1x10x11=reg128#8
-# asm 2: vmov >x0x1x2x3=q1,<x0x1x10x11=q7
-vmov q1,q7
-
-# qhasm:   x4x5x6x7 = x4x5x14x15
-# asm 1: vmov >x4x5x6x7=reg128#5,<x4x5x14x15=reg128#12
-# asm 2: vmov >x4x5x6x7=q4,<x4x5x14x15=q11
-vmov q4,q11
-
-# qhasm:   x8x9x10x11 = x8x9x2x3
-# asm 1: vmov >x8x9x10x11=reg128#6,<x8x9x2x3=reg128#11
-# asm 2: vmov >x8x9x10x11=q5,<x8x9x2x3=q10
-vmov q5,q10
-
-# qhasm:   x12x13x14x15 = x12x13x6x7
-# asm 1: vmov >x12x13x14x15=reg128#7,<x12x13x6x7=reg128#9
-# asm 2: vmov >x12x13x14x15=q6,<x12x13x6x7=q8
-vmov q6,q8
-
-# qhasm:   x0x1x2x3 = x0x1x2x3[0,1] x8x9x2x3[2,3]
-# asm 1: vmov <x0x1x2x3=reg128#2%top,<x8x9x2x3=reg128#11%top
-# asm 2: vmov <x0x1x2x3=d3,<x8x9x2x3=d21
-vmov d3,d21
-
-# qhasm:   x4x5x6x7 = x4x5x6x7[0,1] x12x13x6x7[2,3]
-# asm 1: vmov <x4x5x6x7=reg128#5%top,<x12x13x6x7=reg128#9%top
-# asm 2: vmov <x4x5x6x7=d9,<x12x13x6x7=d17
-vmov d9,d17
-
-# qhasm:   x8x9x10x11 = x8x9x10x11[0,1] x0x1x10x11[2,3]
-# asm 1: vmov <x8x9x10x11=reg128#6%top,<x0x1x10x11=reg128#8%top
-# asm 2: vmov <x8x9x10x11=d11,<x0x1x10x11=d15
-vmov d11,d15
-
-# qhasm:   x12x13x14x15 = x12x13x14x15[0,1] x4x5x14x15[2,3]
-# asm 1: vmov <x12x13x14x15=reg128#7%top,<x4x5x14x15=reg128#12%top
-# asm 2: vmov <x12x13x14x15=d13,<x4x5x14x15=d23
-vmov d13,d23
-
-# qhasm:                      =? m - 0
-# asm 1: cmp <m=int32#2,#0
-# asm 2: cmp <m=r1,#0
-cmp r1,#0
-
-# qhasm:   goto nomessage1 if =
-beq ._nomessage1
-
-# qhasm:     m0m1m2m3 = mem128[m]
-# asm 1: vld1.8 {>m0m1m2m3=reg128#8%bot->m0m1m2m3=reg128#8%top},[<m=int32#2]
-# asm 2: vld1.8 {>m0m1m2m3=d14->m0m1m2m3=d15},[<m=r1]
-vld1.8 {d14-d15},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m4m5m6m7 = mem128[m]
-# asm 1: vld1.8 {>m4m5m6m7=reg128#9%bot->m4m5m6m7=reg128#9%top},[<m=int32#2]
-# asm 2: vld1.8 {>m4m5m6m7=d16->m4m5m6m7=d17},[<m=r1]
-vld1.8 {d16-d17},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m8m9m10m11 = mem128[m]
-# asm 1: vld1.8 {>m8m9m10m11=reg128#10%bot->m8m9m10m11=reg128#10%top},[<m=int32#2]
-# asm 2: vld1.8 {>m8m9m10m11=d18->m8m9m10m11=d19},[<m=r1]
-vld1.8 {d18-d19},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     m12m13m14m15 = mem128[m]
-# asm 1: vld1.8 {>m12m13m14m15=reg128#11%bot->m12m13m14m15=reg128#11%top},[<m=int32#2]
-# asm 2: vld1.8 {>m12m13m14m15=d20->m12m13m14m15=d21},[<m=r1]
-vld1.8 {d20-d21},[r1]
-
-# qhasm:     m += 16
-# asm 1: add <m=int32#2,<m=int32#2,#16
-# asm 2: add <m=r1,<m=r1,#16
-add r1,r1,#16
-
-# qhasm:     x0x1x2x3 ^= m0m1m2m3
-# asm 1: veor >x0x1x2x3=reg128#2,<x0x1x2x3=reg128#2,<m0m1m2m3=reg128#8
-# asm 2: veor >x0x1x2x3=q1,<x0x1x2x3=q1,<m0m1m2m3=q7
-veor q1,q1,q7
-
-# qhasm:     x4x5x6x7 ^= m4m5m6m7
-# asm 1: veor >x4x5x6x7=reg128#5,<x4x5x6x7=reg128#5,<m4m5m6m7=reg128#9
-# asm 2: veor >x4x5x6x7=q4,<x4x5x6x7=q4,<m4m5m6m7=q8
-veor q4,q4,q8
-
-# qhasm:     x8x9x10x11 ^= m8m9m10m11
-# asm 1: veor >x8x9x10x11=reg128#6,<x8x9x10x11=reg128#6,<m8m9m10m11=reg128#10
-# asm 2: veor >x8x9x10x11=q5,<x8x9x10x11=q5,<m8m9m10m11=q9
-veor q5,q5,q9
-
-# qhasm:     x12x13x14x15 ^= m12m13m14m15
-# asm 1: veor >x12x13x14x15=reg128#7,<x12x13x14x15=reg128#7,<m12m13m14m15=reg128#11
-# asm 2: veor >x12x13x14x15=q6,<x12x13x14x15=q6,<m12m13m14m15=q10
-veor q6,q6,q10
-
-# qhasm:   nomessage1:
-._nomessage1:
-
-# qhasm:   mem128[c] = x0x1x2x3
-# asm 1: vst1.8 {<x0x1x2x3=reg128#2%bot-<x0x1x2x3=reg128#2%top},[<c=int32#1]
-# asm 2: vst1.8 {<x0x1x2x3=d2-<x0x1x2x3=d3},[<c=r0]
-vst1.8 {d2-d3},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x4x5x6x7
-# asm 1: vst1.8 {<x4x5x6x7=reg128#5%bot-<x4x5x6x7=reg128#5%top},[<c=int32#1]
-# asm 2: vst1.8 {<x4x5x6x7=d8-<x4x5x6x7=d9},[<c=r0]
-vst1.8 {d8-d9},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x8x9x10x11
-# asm 1: vst1.8 {<x8x9x10x11=reg128#6%bot-<x8x9x10x11=reg128#6%top},[<c=int32#1]
-# asm 2: vst1.8 {<x8x9x10x11=d10-<x8x9x10x11=d11},[<c=r0]
-vst1.8 {d10-d11},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:   mem128[c] = x12x13x14x15
-# asm 1: vst1.8 {<x12x13x14x15=reg128#7%bot-<x12x13x14x15=reg128#7%top},[<c=int32#1]
-# asm 2: vst1.8 {<x12x13x14x15=d12-<x12x13x14x15=d13},[<c=r0]
-vst1.8 {d12-d13},[r0]
-
-# qhasm:   c += 16
-# asm 1: add <c=int32#1,<c=int32#1,#16
-# asm 2: add <c=r0,<c=r0,#16
-add r0,r0,#16
-
-# qhasm:                           unsigned<? mlenlow - 64
-# asm 1: cmp <mlenlow=int32#3,#64
-# asm 2: cmp <mlenlow=r2,#64
-cmp r2,#64
-
-# qhasm:   goto xmlenatleast64 if !unsigned<
-bhs ._xmlenatleast64
-
-# qhasm:     i = 0
-# asm 1: ldr >i=int32#4,=0
-# asm 2: ldr >i=r3,=0
-ldr r3,=0
-
-# qhasm:     m = c - 64
-# asm 1: sub >m=int32#2,<c=int32#1,#64
-# asm 2: sub >m=r1,<c=r0,#64
-sub r1,r0,#64
-
-# qhasm:     c = savec
-# asm 1: ldr >c=int32#1,<savec=stack32#1
-# asm 2: ldr >c=r0,<savec=[sp,#64]
-ldr r0,[sp,#64]
-
-# qhasm:     ccopy:
-._ccopy:
-
-# qhasm:       ci = mem8[m + 0]
-# asm 1: ldrb >ci=int32#5,[<m=int32#2,#0]
-# asm 2: ldrb >ci=r4,[<m=r1,#0]
-ldrb r4,[r1,#0]
-
-# qhasm:       mem8[c + 0] = ci
-# asm 1: strb <ci=int32#5,[<c=int32#1,#0]
-# asm 2: strb <ci=r4,[<c=r0,#0]
-strb r4,[r0,#0]
-
-# qhasm:       m += 1
-# asm 1: add <m=int32#2,<m=int32#2,#1
-# asm 2: add <m=r1,<m=r1,#1
-add r1,r1,#1
-
-# qhasm:       c += 1
-# asm 1: add <c=int32#1,<c=int32#1,#1
-# asm 2: add <c=r0,<c=r0,#1
-add r0,r0,#1
-
-# qhasm:       i += 1
-# asm 1: add <i=int32#4,<i=int32#4,#1
-# asm 2: add <i=r3,<i=r3,#1
-add r3,r3,#1
-
-# qhasm:                   unsigned<? i - mlenlow
-# asm 1: cmp <i=int32#4,<mlenlow=int32#3
-# asm 2: cmp <i=r3,<mlenlow=r2
-cmp r3,r2
-
-# qhasm:     goto ccopy if unsigned<
-blo ._ccopy
-
-# qhasm:   xmlenatleast64:
-._xmlenatleast64:
-
-# qhasm:                      unsigned>? mlenlow -= 64
-# asm 1: subs <mlenlow=int32#3,<mlenlow=int32#3,#64
-# asm 2: subs <mlenlow=r2,<mlenlow=r2,#64
-subs r2,r2,#64
-
-# qhasm: goto mlenatleast1 if unsigned>
-bhi ._mlenatleast1
-
-# qhasm: done:
-._done:
-
-# qhasm: new caller_r4
-
-# qhasm: caller_r4 = stack_r4
-# asm 1: ldr >caller_r4=int32#5,<stack_r4=stack32#2
-# asm 2: ldr >caller_r4=r4,<stack_r4=[sp,#68]
-ldr r4,[sp,#68]
-
-# qhasm: new caller_q4
-
-# qhasm: new caller_q5
-
-# qhasm: new caller_q6
-
-# qhasm: new caller_q7
-
-# qhasm: caller_q4 bot = stack_q4 bot
-# asm 1: vldr <caller_q4=reg128#5%bot,<stack_q4=stack128#1
-# asm 2: vldr <caller_q4=d8,<stack_q4=[sp,#96]
-vldr d8,[sp,#96]
-
-# qhasm: caller_q4 top = stack_q4 top
-# asm 1: vldr <caller_q4=reg128#5%top,<stack_q4=stack128#1
-# asm 2: vldr <caller_q4=d9,<stack_q4=[sp,#104]
-vldr d9,[sp,#104]
-
-# qhasm: caller_q5 bot = stack_q5 bot
-# asm 1: vldr <caller_q5=reg128#6%bot,<stack_q5=stack128#2
-# asm 2: vldr <caller_q5=d10,<stack_q5=[sp,#112]
-vldr d10,[sp,#112]
-
-# qhasm: caller_q5 top = stack_q5 top
-# asm 1: vldr <caller_q5=reg128#6%top,<stack_q5=stack128#2
-# asm 2: vldr <caller_q5=d11,<stack_q5=[sp,#120]
-vldr d11,[sp,#120]
-
-# qhasm: caller_q6 bot = stack_q6 bot
-# asm 1: vldr <caller_q6=reg128#7%bot,<stack_q6=stack128#3
-# asm 2: vldr <caller_q6=d12,<stack_q6=[sp,#128]
-vldr d12,[sp,#128]
-
-# qhasm: caller_q6 top = stack_q6 top
-# asm 1: vldr <caller_q6=reg128#7%top,<stack_q6=stack128#3
-# asm 2: vldr <caller_q6=d13,<stack_q6=[sp,#136]
-vldr d13,[sp,#136]
-
-# qhasm: caller_q7 bot = stack_q7 bot
-# asm 1: vldr <caller_q7=reg128#8%bot,<stack_q7=stack128#4
-# asm 2: vldr <caller_q7=d14,<stack_q7=[sp,#144]
-vldr d14,[sp,#144]
-
-# qhasm: caller_q7 top = stack_q7 top
-# asm 1: vldr <caller_q7=reg128#8%top,<stack_q7=stack128#4
-# asm 2: vldr <caller_q7=d15,<stack_q7=[sp,#152]
-vldr d15,[sp,#152]
-
-# qhasm: int32 result
-
-# qhasm: result = 0
-# asm 1: ldr >result=int32#1,=0
-# asm 2: ldr >result=r0,=0
-ldr r0,=0
-
-# qhasm: return result
-add sp,sp,#256
-bx lr
diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/Info.plist b/ext/bin/tap-mac/tap.kext.old/Contents/Info.plist
new file mode 100644
index 000000000..45c2839ad
--- /dev/null
+++ b/ext/bin/tap-mac/tap.kext.old/Contents/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>tap</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zerotier.tap</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>tap</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleShortVersionString</key>
+	<string>20131028</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.apple.kpi.mach</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.bsd</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.unsupported</key>
+		<string>8.0</string>
+	</dict>
+</dict>
+</plist>
+
diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap b/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap
new file mode 100755
index 000000000..6a9021a74
Binary files /dev/null and b/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap differ
diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory
new file mode 100644
index 000000000..58c421c29
Binary files /dev/null and b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory differ
diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements
new file mode 100644
index 000000000..1df931292
Binary files /dev/null and b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements differ
diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources
new file mode 100644
index 000000000..0710b4008
--- /dev/null
+++ b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict/>
+	<key>files2</key>
+	<dict/>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature
new file mode 100644
index 000000000..644297271
Binary files /dev/null and b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature differ
diff --git a/ext/bin/tap-mac/tap.kext/Contents/Info.plist b/ext/bin/tap-mac/tap.kext/Contents/Info.plist
new file mode 100644
index 000000000..c20eefa58
--- /dev/null
+++ b/ext/bin/tap-mac/tap.kext/Contents/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>tap</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zerotier.tap</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>tap</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleShortVersionString</key>
+	<string>20150118</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.apple.kpi.mach</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.bsd</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.unsupported</key>
+		<string>8.0</string>
+	</dict>
+</dict>
+</plist>
+
diff --git a/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap b/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap
new file mode 100755
index 000000000..48bf96255
Binary files /dev/null and b/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap differ
diff --git a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeResources b/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeResources
new file mode 100644
index 000000000..0710b4008
--- /dev/null
+++ b/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeResources
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict/>
+	<key>files2</key>
+	<dict/>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/ext/bin/tap-windows-ndis5/x64/WdfCoinstaller01011.dll b/ext/bin/tap-windows-ndis5/x64/WdfCoinstaller01011.dll
new file mode 100644
index 000000000..d49d29132
Binary files /dev/null and b/ext/bin/tap-windows-ndis5/x64/WdfCoinstaller01011.dll differ
diff --git a/ext/bin/tap-windows-ndis5/x64/zttap200.cat b/ext/bin/tap-windows-ndis5/x64/zttap200.cat
new file mode 100644
index 000000000..a3769e405
Binary files /dev/null and b/ext/bin/tap-windows-ndis5/x64/zttap200.cat differ
diff --git a/ext/bin/tap-windows-ndis5/x64/zttap200.inf b/ext/bin/tap-windows-ndis5/x64/zttap200.inf
new file mode 100644
index 000000000..dc1a74227
--- /dev/null
+++ b/ext/bin/tap-windows-ndis5/x64/zttap200.inf
@@ -0,0 +1,79 @@
+[Version]
+Signature="$WINDOWS NT$"
+Class=Net
+ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318}
+Provider=%Provider%
+CatalogFile=zttap200.cat
+DriverVer=01/23/2014,15.19.17.816
+
+[Strings]
+DeviceDescription = "ZeroTier One Virtual Network Port"
+Provider = "ZeroTier Networks LLC"
+
+; To build for x86, take NTamd64 off this and off the named section manually, build, then put it back!
+[Manufacturer]
+%Provider%=zttap200,NTamd64
+
+[zttap200]
+%DeviceDescription%=zttap200.ndi,zttap200
+
+[ztTap200.NTamd64]
+%DeviceDescription%=zttap200.ndi,zttap200
+
+[zttap200.ndi]
+CopyFiles       = zttap200.driver,zttap200.files
+AddReg          = zttap200.reg
+AddReg          = zttap200.params.reg
+Characteristics = 0x81
+
+[zttap200.ndi.Services]
+AddService = zttap200,        2, zttap200.service
+
+[zttap200.reg]
+HKR, Ndi,            Service,      0, "zttap200"
+HKR, Ndi\Interfaces, UpperRange,   0, "ndis5"
+HKR, Ndi\Interfaces, LowerRange,   0, "ethernet"
+HKR, ,               Manufacturer, 0, "%Provider%"
+HKR, ,               ProductName,  0, "%DeviceDescription%"
+
+[zttap200.params.reg]
+HKR, Ndi\params\MTU,                  ParamDesc, 0, "MTU"
+HKR, Ndi\params\MTU,                  Type,      0, "int"
+HKR, Ndi\params\MTU,                  Default,   0, "2800"
+HKR, Ndi\params\MTU,                  Optional,  0, "0"
+HKR, Ndi\params\MTU,                  Min,       0, "100"
+HKR, Ndi\params\MTU,                  Max,       0, "2800"
+HKR, Ndi\params\MTU,                  Step,      0, "1"
+HKR, Ndi\params\MediaStatus,          ParamDesc, 0, "Media Status"
+HKR, Ndi\params\MediaStatus,          Type,      0, "enum"
+HKR, Ndi\params\MediaStatus,          Default,   0, "0"
+HKR, Ndi\params\MediaStatus,          Optional,  0, "0"
+HKR, Ndi\params\MediaStatus\enum,     "0",       0, "Application Controlled"
+HKR, Ndi\params\MediaStatus\enum,     "1",       0, "Always Connected"
+HKR, Ndi\params\MAC,                  ParamDesc, 0, "MAC Address"
+HKR, Ndi\params\MAC,                  Type,      0, "edit"
+HKR, Ndi\params\MAC,                  Optional,  0, "1"
+
+[zttap200.service]
+DisplayName = %DeviceDescription%
+ServiceType = 1
+StartType = 3
+ErrorControl = 1
+LoadOrderGroup = NDIS
+ServiceBinary = %12%\zttap200.sys
+
+[SourceDisksNames]
+1 = %DeviceDescription%, zttap200.sys
+
+[SourceDisksFiles]
+zttap200.sys = 1
+
+[DestinationDirs]
+zttap200.files  = 11
+zttap200.driver = 12
+
+[zttap200.files]
+;
+
+[zttap200.driver]
+zttap200.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
diff --git a/ext/bin/tap-windows-ndis5/x64/zttap200.sys b/ext/bin/tap-windows-ndis5/x64/zttap200.sys
new file mode 100644
index 000000000..339351fb3
Binary files /dev/null and b/ext/bin/tap-windows-ndis5/x64/zttap200.sys differ
diff --git a/ext/bin/tap-windows-ndis5/x86/WdfCoinstaller01011.dll b/ext/bin/tap-windows-ndis5/x86/WdfCoinstaller01011.dll
new file mode 100644
index 000000000..e943ea45e
Binary files /dev/null and b/ext/bin/tap-windows-ndis5/x86/WdfCoinstaller01011.dll differ
diff --git a/ext/bin/tap-windows-ndis5/x86/zttap200.cat b/ext/bin/tap-windows-ndis5/x86/zttap200.cat
new file mode 100644
index 000000000..d90ecbbee
Binary files /dev/null and b/ext/bin/tap-windows-ndis5/x86/zttap200.cat differ
diff --git a/ext/bin/tap-windows-ndis5/x86/zttap200.inf b/ext/bin/tap-windows-ndis5/x86/zttap200.inf
new file mode 100644
index 000000000..99aac9f2b
--- /dev/null
+++ b/ext/bin/tap-windows-ndis5/x86/zttap200.inf
@@ -0,0 +1,76 @@
+[Version]
+Signature="$WINDOWS NT$"
+Class=Net
+ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318}
+Provider=%Provider%
+CatalogFile=zttap200.cat
+DriverVer=01/24/2014,17.25.51.226
+
+[Strings]
+DeviceDescription = "ZeroTier One Virtual Network Port"
+Provider = "ZeroTier Networks LLC"
+
+; To build for x86, take NTamd64 off this and off the named section manually, build, then put it back!
+[Manufacturer]
+%Provider%=zttap200
+
+[zttap200]
+%DeviceDescription%=zttap200.ndi,zttap200
+
+[zttap200.ndi]
+CopyFiles       = zttap200.driver,zttap200.files
+AddReg          = zttap200.reg
+AddReg          = zttap200.params.reg
+Characteristics = 0x81
+
+[zttap200.ndi.Services]
+AddService = zttap200,        2, zttap200.service
+
+[zttap200.reg]
+HKR, Ndi,            Service,      0, "zttap200"
+HKR, Ndi\Interfaces, UpperRange,   0, "ndis5"
+HKR, Ndi\Interfaces, LowerRange,   0, "ethernet"
+HKR, ,               Manufacturer, 0, "%Provider%"
+HKR, ,               ProductName,  0, "%DeviceDescription%"
+
+[zttap200.params.reg]
+HKR, Ndi\params\MTU,                  ParamDesc, 0, "MTU"
+HKR, Ndi\params\MTU,                  Type,      0, "int"
+HKR, Ndi\params\MTU,                  Default,   0, "2800"
+HKR, Ndi\params\MTU,                  Optional,  0, "0"
+HKR, Ndi\params\MTU,                  Min,       0, "100"
+HKR, Ndi\params\MTU,                  Max,       0, "2800"
+HKR, Ndi\params\MTU,                  Step,      0, "1"
+HKR, Ndi\params\MediaStatus,          ParamDesc, 0, "Media Status"
+HKR, Ndi\params\MediaStatus,          Type,      0, "enum"
+HKR, Ndi\params\MediaStatus,          Default,   0, "0"
+HKR, Ndi\params\MediaStatus,          Optional,  0, "0"
+HKR, Ndi\params\MediaStatus\enum,     "0",       0, "Application Controlled"
+HKR, Ndi\params\MediaStatus\enum,     "1",       0, "Always Connected"
+HKR, Ndi\params\MAC,                  ParamDesc, 0, "MAC Address"
+HKR, Ndi\params\MAC,                  Type,      0, "edit"
+HKR, Ndi\params\MAC,                  Optional,  0, "1"
+
+[zttap200.service]
+DisplayName = %DeviceDescription%
+ServiceType = 1
+StartType = 3
+ErrorControl = 1
+LoadOrderGroup = NDIS
+ServiceBinary = %12%\zttap200.sys
+
+[SourceDisksNames]
+1 = %DeviceDescription%, zttap200.sys
+
+[SourceDisksFiles]
+zttap200.sys = 1
+
+[DestinationDirs]
+zttap200.files  = 11
+zttap200.driver = 12
+
+[zttap200.files]
+;
+
+[zttap200.driver]
+zttap200.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
diff --git a/ext/bin/tap-windows-ndis5/x86/zttap200.sys b/ext/bin/tap-windows-ndis5/x86/zttap200.sys
new file mode 100644
index 000000000..b7b11fbe8
Binary files /dev/null and b/ext/bin/tap-windows-ndis5/x86/zttap200.sys differ
diff --git a/ext/bin/tap-windows-ndis6/arm64/zttap300.cat b/ext/bin/tap-windows-ndis6/arm64/zttap300.cat
deleted file mode 100644
index 906a15a4b..000000000
Binary files a/ext/bin/tap-windows-ndis6/arm64/zttap300.cat and /dev/null differ
diff --git a/ext/bin/tap-windows-ndis6/arm64/zttap300.inf b/ext/bin/tap-windows-ndis6/arm64/zttap300.inf
deleted file mode 100644
index 8e74daab1..000000000
--- a/ext/bin/tap-windows-ndis6/arm64/zttap300.inf
+++ /dev/null
@@ -1,145 +0,0 @@
-;
-; ****************************************************************************
-; * Copyright (C) 2002-2014 OpenVPN Technologies, Inc.                       *
-; *  This program is free software; you can redistribute it and/or modify    *
-; *  it under the terms of the GNU General Public License version 2          *
-; *  as published by the Free Software Foundation.                           *
-; ****************************************************************************
-;
-
-;
-; ZeroTier One Virtual Network Port NDIS6 Driver
-;
-; Modified by ZeroTier, Inc. - https://www.zerotier.com/
-;
-; (1) Comment out 'tun' functionality and related features such as DHCP
-;     emulation, since we don't use any of that. Just want straight 'tap'.
-; (2) Added custom IOCTL to enumerate L2 multicast memberships.
-; (3) Increase maximum number of multicast memberships to 128.
-; (4) Set default and max device MTU to 2800.
-; (5) Rename/rebrand driver as ZeroTier network port driver.
-;
-; Original copyright below. Modifications released under GPLv2 as well.
-
-[Version]
-Signature = "$Windows NT$"
-CatalogFile = zttap300.cat
-ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318}
-Provider = %Provider%
-Class = Net
-DriverVer=11/24/2020,3.00.00.1
-
-[Strings]
-DeviceDescription = "ZeroTier Virtual Port"
-Provider = "ZeroTier"
-
-[Manufacturer]
-%Provider%=zttap300,NTx86
-%Provider%=zttap300,NTamd64
-%Provider%=zttap300,NTarm64
-
-[zttap300.NTx86]
-%DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
-%DeviceDescription% = zttap300.ndi, zttap300      ; Legacy
-
-[zttap300.NTamd64]
-%DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
-%DeviceDescription% = zttap300.ndi, zttap300      ; Legacy
-
-[zttap300.NTarm64]
-%DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
-%DeviceDescription% = zttap300.ndi, zttap300      ; Legacy
-
-;----------------- Characteristics ------------
-;    NCF_PHYSICAL = 0x04
-;    NCF_VIRTUAL = 0x01
-;    NCF_SOFTWARE_ENUMERATED = 0x02
-;    NCF_HIDDEN = 0x08
-;    NCF_NO_SERVICE = 0x10
-;    NCF_HAS_UI = 0x80
-;----------------- Characteristics ------------
-[zttap300.ndi]
-CopyFiles       = zttap300.driver, zttap300.files
-AddReg          = zttap300.reg
-AddReg          = zttap300.params.reg
-Characteristics = 0x81
-*IfType            = 0x6 ; IF_TYPE_ETHERNET_CSMACD
-*MediaType         = 0x0 ; NdisMedium802_3
-*PhysicalMediaType = 14  ; NdisPhysicalMedium802_3
-
-[zttap300.ndi.Services]
-AddService = zttap300,        2, zttap300.service
-
-[zttap300.reg]
-HKR, Ndi,            Service,      0, "zttap300"
-HKR, Ndi\Interfaces, UpperRange,   0, "ndis5" ; yes, 'ndis5' is correct... yup, Windows.
-HKR, Ndi\Interfaces, LowerRange,   0, "ethernet"
-HKR, ,               Manufacturer, 0, "%Provider%"
-HKR, ,               ProductName,  0, "%DeviceDescription%"
-
-[zttap300.params.reg]
-HKR, Ndi\params\MTU,                  ParamDesc, 0, "MTU"
-HKR, Ndi\params\MTU,                  Type,      0, "int"
-HKR, Ndi\params\MTU,                  Default,   0, "2800"
-HKR, Ndi\params\MTU,                  Optional,  0, "0"
-HKR, Ndi\params\MTU,                  Min,       0, "100"
-HKR, Ndi\params\MTU,                  Max,       0, "2800"
-HKR, Ndi\params\MTU,                  Step,      0, "1"
-HKR, Ndi\params\MediaStatus,          ParamDesc, 0, "Media Status"
-HKR, Ndi\params\MediaStatus,          Type,      0, "enum"
-HKR, Ndi\params\MediaStatus,          Default,   0, "0"
-HKR, Ndi\params\MediaStatus,          Optional,  0, "0"
-HKR, Ndi\params\MediaStatus\enum,     "0",       0, "Application Controlled"
-HKR, Ndi\params\MediaStatus\enum,     "1",       0, "Always Connected"
-HKR, Ndi\params\MAC,                  ParamDesc, 0, "MAC Address"
-HKR, Ndi\params\MAC,                  Type,      0, "edit"
-HKR, Ndi\params\MAC,                  Optional,  0, "1"
-HKR, Ndi\params\AllowNonAdmin,        ParamDesc, 0, "Non-Admin Access"
-HKR, Ndi\params\AllowNonAdmin,        Type,      0, "enum"
-HKR, Ndi\params\AllowNonAdmin,        Default,   0, "0"
-HKR, Ndi\params\AllowNonAdmin,        Optional,  0, "0"
-HKR, Ndi\params\AllowNonAdmin\enum,   "0",       0, "Not Allowed"
-HKR, Ndi\params\AllowNonAdmin\enum,   "1",       0, "Allowed"
-
-;---------- Service Type -------------
-;    SERVICE_KERNEL_DRIVER     = 0x01
-;    SERVICE_WIN32_OWN_PROCESS = 0x10
-;---------- Service Type -------------
-
-;---------- Start Mode ---------------
-;    SERVICE_BOOT_START   = 0x0
-;    SERVICE_SYSTEM_START = 0x1
-;    SERVICE_AUTO_START   = 0x2
-;    SERVICE_DEMAND_START = 0x3
-;    SERVICE_DISABLED     = 0x4
-;---------- Start Mode ---------------
-
-[zttap300.service]
-DisplayName = %DeviceDescription%
-ServiceType = 1
-StartType = 3
-ErrorControl = 1
-LoadOrderGroup = NDIS
-ServiceBinary = %12%\zttap300.sys
-
-;----------------- Copy Flags ------------
-;    COPYFLG_NOSKIP = 0x02
-;    COPYFLG_NOVERSIONCHECK = 0x04
-;----------------- Copy Flags ------------
-
-[SourceDisksNames]
-1 = %DeviceDescription%, zttap300.sys
-
-[SourceDisksFiles]
-zttap300.sys = 1
-
-[DestinationDirs]
-zttap300.files  = 11
-zttap300.driver = 12
-
-[zttap300.files]
-;
-
-[zttap300.driver]
-zttap300.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
-
diff --git a/ext/bin/tap-windows-ndis6/arm64/zttap300.sys b/ext/bin/tap-windows-ndis6/arm64/zttap300.sys
deleted file mode 100644
index ae1a16f4b..000000000
Binary files a/ext/bin/tap-windows-ndis6/arm64/zttap300.sys and /dev/null differ
diff --git a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi
new file mode 100644
index 000000000..818796f4d
Binary files /dev/null and b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi differ
diff --git a/ext/bin/tap-windows-ndis6/x64/zttap300.cat b/ext/bin/tap-windows-ndis6/x64/zttap300.cat
index 6eef79ff8..8b9114c71 100644
Binary files a/ext/bin/tap-windows-ndis6/x64/zttap300.cat and b/ext/bin/tap-windows-ndis6/x64/zttap300.cat differ
diff --git a/ext/bin/tap-windows-ndis6/x64/zttap300.inf b/ext/bin/tap-windows-ndis6/x64/zttap300.inf
index e05038dae..453797b38 100644
--- a/ext/bin/tap-windows-ndis6/x64/zttap300.inf
+++ b/ext/bin/tap-windows-ndis6/x64/zttap300.inf
@@ -30,11 +30,11 @@ CatalogFile = zttap300.cat
 ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318}
 Provider = %Provider%
 Class = Net
-DriverVer=11/24/2020,3.00.00.1
+DriverVer=08/13/2015,6.2.9200.20557
 
 [Strings]
-DeviceDescription = "ZeroTier Virtual Port"
-Provider = "ZeroTier"
+DeviceDescription = "ZeroTier One Virtual Port"
+Provider = "ZeroTier Networks LLC" ; We're ZeroTier, Inc. now but kernel mode certs are $300+ so fuqdat.
 
 ; To build for x86, take NTamd64 off this and off the named section manually, build, then put it back!
 [Manufacturer]
@@ -141,4 +141,3 @@ zttap300.driver = 12
 [zttap300.driver]
 zttap300.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
 
-
diff --git a/ext/bin/tap-windows-ndis6/x64/zttap300.sys b/ext/bin/tap-windows-ndis6/x64/zttap300.sys
index 2c7922b39..3d846a53a 100644
Binary files a/ext/bin/tap-windows-ndis6/x64/zttap300.sys and b/ext/bin/tap-windows-ndis6/x64/zttap300.sys differ
diff --git a/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi
new file mode 100644
index 000000000..b9e2d7eac
Binary files /dev/null and b/ext/bin/tap-windows-ndis6/x86/ZeroTierOne_NDIS6_x86.msi differ
diff --git a/ext/bin/tap-windows-ndis6/x86/zttap300.cat b/ext/bin/tap-windows-ndis6/x86/zttap300.cat
index f6021aa88..44347f54f 100644
Binary files a/ext/bin/tap-windows-ndis6/x86/zttap300.cat and b/ext/bin/tap-windows-ndis6/x86/zttap300.cat differ
diff --git a/ext/bin/tap-windows-ndis6/x86/zttap300.inf b/ext/bin/tap-windows-ndis6/x86/zttap300.inf
index a562e9d64..453797b38 100644
--- a/ext/bin/tap-windows-ndis6/x86/zttap300.inf
+++ b/ext/bin/tap-windows-ndis6/x86/zttap300.inf
@@ -1,15 +1,10 @@
-;
-; ****************************************************************************
-; * Copyright (C) 2002-2014 OpenVPN Technologies, Inc.                       *
-; *  This program is free software; you can redistribute it and/or modify    *
-; *  it under the terms of the GNU General Public License version 2          *
-; *  as published by the Free Software Foundation.                           *
-; ****************************************************************************
-;
-
 ;
 ; ZeroTier One Virtual Network Port NDIS6 Driver
 ;
+; Based on the OpenVPN tap-windows6 driver version 9.21.1 git
+; commit 48f027cfca52b16b5fd23d82e6016ed8a91fc4d3.
+; See: https://github.com/OpenVPN/tap-windows6
+;
 ; Modified by ZeroTier, Inc. - https://www.zerotier.com/
 ;
 ; (1) Comment out 'tun' functionality and related features such as DHCP
@@ -20,6 +15,14 @@
 ; (5) Rename/rebrand driver as ZeroTier network port driver.
 ;
 ; Original copyright below. Modifications released under GPLv2 as well.
+;
+; ****************************************************************************
+; * Copyright (C) 2002-2014 OpenVPN Technologies, Inc.                       *
+; *  This program is free software; you can redistribute it and/or modify    *
+; *  it under the terms of the GNU General Public License version 2          *
+; *  as published by the Free Software Foundation.                           *
+; ****************************************************************************
+;
 
 [Version]
 Signature = "$Windows NT$"
@@ -27,17 +30,17 @@ CatalogFile = zttap300.cat
 ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318}
 Provider = %Provider%
 Class = Net
-DriverVer=11/24/2020,3.00.00.1
+DriverVer=08/13/2015,6.2.9200.20557
 
 [Strings]
-DeviceDescription = "ZeroTier Virtual Port"
-Provider = "ZeroTier"
+DeviceDescription = "ZeroTier One Virtual Port"
+Provider = "ZeroTier Networks LLC" ; We're ZeroTier, Inc. now but kernel mode certs are $300+ so fuqdat.
 
+; To build for x86, take NTamd64 off this and off the named section manually, build, then put it back!
 [Manufacturer]
-%Provider%=zttap300,NTx86
-;%Provider%=zttap300,NTamd64
+%Provider%=zttap300,NTamd64
 
-[zttap300.NTx86]
+[zttap300]
 %DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
 %DeviceDescription% = zttap300.ndi, zttap300      ; Legacy
 
@@ -138,4 +141,3 @@ zttap300.driver = 12
 [zttap300.driver]
 zttap300.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
 
-
diff --git a/ext/bin/tap-windows-ndis6/x86/zttap300.sys b/ext/bin/tap-windows-ndis6/x86/zttap300.sys
index 86e51a3ea..664398e93 100644
Binary files a/ext/bin/tap-windows-ndis6/x86/zttap300.sys and b/ext/bin/tap-windows-ndis6/x86/zttap300.sys differ
diff --git a/ext/central-controller-docker/Dockerfile b/ext/central-controller-docker/Dockerfile
deleted file mode 100644
index 29670ec68..000000000
--- a/ext/central-controller-docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Dockerfile for ZeroTier Central Controllers
-FROM registry.zerotier.com/zerotier/ctlbuild:2025-07-14 AS builder
-ADD . /ZeroTierOne
-RUN export PATH=$PATH:~/.cargo/bin && cd ZeroTierOne && make clean && make central-controller -j8
-
-FROM golang:bookworm AS go_base
-RUN go install -tags 'postgres' github.com/golang-migrate/migrate/v4/cmd/migrate@latest
-
-FROM registry.zerotier.com/zerotier/ctlrun:2025-07-14 AS run_base
-COPY --from=builder /ZeroTierOne/zerotier-one /usr/local/bin/zerotier-one
-COPY --from=builder /ZeroTierOne/ext/opentelemetry-cpp-1.21.0/localinstall/lib/*.so /usr/local/lib64/
-COPY --from=go_base /go/bin/migrate /usr/local/bin/migrate
-COPY ext/central-controller-docker/migrations /migrations
-
-RUN chmod a+x /usr/local/bin/zerotier-one
-RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/usr-local-lib64.conf && ldconfig
-
-ADD ext/central-controller-docker/main.sh /
-RUN chmod a+x /main.sh
-
-ENTRYPOINT /main.sh
diff --git a/ext/central-controller-docker/Dockerfile.builder b/ext/central-controller-docker/Dockerfile.builder
deleted file mode 100644
index 6e10db887..000000000
--- a/ext/central-controller-docker/Dockerfile.builder
+++ /dev/null
@@ -1,34 +0,0 @@
-# Dockerfile for building ZeroTier Central Controllers
-FROM debian:bookworm
-
-RUN apt update && apt upgrade -y
-RUN apt -y install \
-    build-essential \
-    pkg-config \
-    bash \
-    clang \
-    libjemalloc2 \
-    libjemalloc-dev \
-    libpq5 \
-    libpq-dev \
-    openssl \
-    libssl-dev \
-    postgresql-client \
-    postgresql-client-common \
-    curl \
-    libcurl4-openssl-dev \
-    google-perftools \
-    libgoogle-perftools-dev \
-    protobuf-compiler \
-    protobuf-compiler-grpc \
-    protobuf-c-compiler \
-    grpc-proto \
-    libgrpc++1.51 \
-    libgrpc++-dev \
-    libgrpc-dev \
-    libgrpc29 \
-    cmake \
-    git
-
-
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
diff --git a/ext/central-controller-docker/Dockerfile.run_base b/ext/central-controller-docker/Dockerfile.run_base
deleted file mode 100644
index fb5d0e2d5..000000000
--- a/ext/central-controller-docker/Dockerfile.run_base
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM debian:bookworm
-
-
-
-RUN apt update && apt upgrade -y
-RUN apt -y install \
-    netcat-traditional \
-    postgresql-client \
-    postgresql-client-common \
-    libjemalloc2 \
-    libpq5 \
-    curl \
-    binutils \
-    perf-tools-unstable \
-    google-perftools \
-    gnupg \
-    libgrpc++1.51 \
-    libgrpc29 
-
diff --git a/ext/central-controller-docker/Makefile b/ext/central-controller-docker/Makefile
deleted file mode 100644
index 2318d2903..000000000
--- a/ext/central-controller-docker/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-registry = registry.zerotier.com/zerotier
-
-all:	controller-builder controller-runbase
-
-buildx:
-	@echo "docker buildx create"
-	# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-	docker run --privileged --rm tonistiigi/binfmt --install all
-	@echo docker buildx create --name multiarch --driver docker-container --use
-	@echo docker buildx inspect --bootstrap
-
-controller-builder:	buildx
-	docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t $(registry)/ctlbuild:$(shell date +"%Y-%m-%d") -f Dockerfile.builder . --push 
-
-controller-runbase: buildx
-	docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t $(registry)/ctlrun:$(shell date +"%Y-%m-%d") -f Dockerfile.run_base . --push 
diff --git a/ext/central-controller-docker/README.md b/ext/central-controller-docker/README.md
deleted file mode 100644
index a954b1c37..000000000
--- a/ext/central-controller-docker/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ZeroTier Central Controller Docker Image
-
-Dockerfile & startup script for use with [ZeroTier Central](https://my.zerotier.com).  Not intended for public use.
diff --git a/ext/central-controller-docker/main.sh b/ext/central-controller-docker/main.sh
deleted file mode 100755
index b1c4b4cbc..000000000
--- a/ext/central-controller-docker/main.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-if [ -z "$ZT_DB_HOST" ]; then
-    echo '*** FAILED: ZT_DB_HOST environment variable not defined'
-    exit 1
-fi
-if [ -z "$ZT_DB_PORT" ]; then
-    echo '*** FAILED: ZT_DB_PORT environment variable not defined'
-    exit 1
-fi
-if [ -z "$ZT_DB_NAME" ]; then
-    echo '*** FAILED: ZT_DB_NAME environment variable not defined'
-    exit 1
-fi
-if [ -z "$ZT_DB_USER" ]; then
-    echo '*** FAILED: ZT_DB_USER environment variable not defined'
-    exit 1
-fi
-if [ -z "$ZT_DB_PASSWORD" ]; then
-    echo '*** FAILED: ZT_DB_PASSWORD environment variable not defined'
-    exit 1
-fi
-if [ -z "$ZT_DB_TYPE" ]; then
-    ZT_DB_TYPE="postgres"
-fi
-
-REDIS=""
-if [ "$ZT_USE_REDIS" == "true" ]; then
-    if [ -z "$ZT_REDIS_HOST" ]; then
-        echo '*** FAILED: ZT_REDIS_HOST environment variable not defined'
-        exit 1
-    fi
-
-    if [ -z "$ZT_REDIS_PORT" ]; then
-        echo '*** FAILED: ZT_REDIS_PORT enivronment variable not defined'
-        exit 1
-    fi
-
-    if [ -z "$ZT_REDIS_CLUSTER_MODE" ]; then
-        echo '*** FAILED: ZT_REDIS_CLUSTER_MODE environment variable not defined'
-        exit 1
-    fi
-
-    REDIS="\"redis\": {
-            \"hostname\": \"${ZT_REDIS_HOST}\",
-            \"port\": ${ZT_REDIS_PORT},
-            \"clusterMode\": ${ZT_REDIS_CLUSTER_MODE},
-            \"password\": \"${ZT_REDIS_PASSWORD}\"
-        }
-    "
-else
-    REDIS="\"redis\": null"
-fi
-
-mkdir -p /var/lib/zerotier-one
-
-pushd /var/lib/zerotier-one
-if [ -d "$ZT_IDENTITY_PATH" ]; then
-    echo '*** Using existing ZT identity from path $ZT_IDENTITY_PATH'
-
-    ln -s $ZT_IDENTITY_PATH/identity.public identity.public
-    ln -s $ZT_IDENTITY_PATH/identity.secret identity.secret
-    if [ -f  "$ZT_IDENTITY_PATH/authtoken.secret" ]; then
-        ln -s $ZT_IDENTITY_PATH/authtoken.secret authtoken.secret
-    fi
-fi
-popd
-
-DEFAULT_PORT=9993
-DEFAULT_LB_MODE=false
-
-APP_NAME="controller-$(cat /var/lib/zerotier-one/identity.public | cut -d ':' -f 1)"
-
-echo "{
-    \"settings\": {
-        \"controllerDbPath\": \"${ZT_DB_TYPE}:host=${ZT_DB_HOST} port=${ZT_DB_PORT} dbname=${ZT_DB_NAME} user=${ZT_DB_USER} password=${ZT_DB_PASSWORD} application_name=${APP_NAME} sslmode=prefer sslcert=${DB_CLIENT_CERT} sslkey=${DB_CLIENT_KEY} sslrootcert=${DB_SERVER_CA}\",
-        \"portMappingEnabled\": true,
-        \"softwareUpdate\": \"disable\",
-        \"interfacePrefixBlacklist\": [
-            \"inot\",
-            \"nat64\"
-        ],
-        \"lowBandwidthMode\": ${ZT_LB_MODE:-$DEFAULT_LB_MODE},
-        \"ssoRedirectURL\": \"${ZT_SSO_REDIRECT_URL}\",
-        \"allowManagementFrom\": [\"127.0.0.1\", \"::1\", \"10.0.0.0/8\"],
-        \"otel\": {
-            \"exporterEndpoint\": \"${ZT_EXPORTER_ENDPOINT}\",
-            \"exporterSampleRate\": ${ZT_EXPORTER_SAMPLE_RATE:-0}
-        },
-        ${REDIS}
-    }
-}    
-" > /var/lib/zerotier-one/local.conf
-
-if [ -n "$DB_SERVER_CA" ]; then
-    echo "secret list"
-    chmod 600 /secrets/db/*.pem
-    ls -l /secrets/db/
-    until /usr/bin/pg_isready -h ${ZT_DB_HOST} -p ${ZT_DB_PORT} -d "sslmode=prefer sslcert=${DB_CLIENT_CERT} sslkey=${DB_CLIENT_KEY} sslrootcert=${DB_SERVER_CA}"; do
-	    echo "Waiting for PostgreSQL...";
-	    sleep 2;
-    done
-else
-    until /usr/bin/pg_isready -h ${ZT_DB_HOST} -p ${ZT_DB_PORT}; do
-	    echo "Waiting for PostgreSQL...";
-	    sleep 2;
-    done
-fi
-
-if [ "$ZT_DB_TYPE" == "cv2" ]; then
-    echo "Migrating database (if needed)..."
-    if [ -n "$DB_SERVER_CA" ]; then
-        /usr/local/bin/migrate -source file:///migrations -database "postgres://$ZT_DB_USER:$ZT_DB_PASSWORD@$ZT_DB_HOST:$ZT_DB_PORT/$ZT_DB_NAME?x-migrations-table=controller_migrations&sslmode=verify-full&sslrootcert=$DB_SERVER_CA&sslcert=$DB_CLIENT_CERT&sslkey=$DB_CLIENT_KEY" up  
-    else 
-        /usr/local/bin/migrate -source file:///migrations -database "postgres://$ZT_DB_USER:$ZT_DB_PASSWORD@$ZT_DB_HOST:$ZT_DB_PORT/$ZT_DB_NAME?x-migrations-table=controller_migrations&sslmode=disable" up
-    fi
-fi
-
-if [ -n "$ZT_TEMPORAL_HOST" ] && [ -n "$ZT_TEMPORAL_PORT" ]; then
-    echo "waiting for temporal..."
-    while ! nc -z ${ZT_TEMPORAL_HOST} ${ZT_TEMPORAL_PORT}; do
-        echo "waiting...";
-        sleep 1;
-    done
-    echo "Temporal is up"
-fi
-
-export GLIBCXX_FORCE_NEW=1
-export GLIBCPP_FORCE_NEW=1
-export LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
-exec /usr/local/bin/zerotier-one -p${ZT_CONTROLLER_PORT:-$DEFAULT_PORT} /var/lib/zerotier-one
diff --git a/ext/central-controller-docker/migrations/0001_init.down.sql b/ext/central-controller-docker/migrations/0001_init.down.sql
deleted file mode 100644
index 03dc63c81..000000000
--- a/ext/central-controller-docker/migrations/0001_init.down.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DROP TABLE IF EXISTS network_memberships_ctl;
-DROP TABLE IF EXISTS networks_ctl;
-DROP TABLE IF EXISTS controllers_ctl;
\ No newline at end of file
diff --git a/ext/central-controller-docker/migrations/0001_init.up.sql b/ext/central-controller-docker/migrations/0001_init.up.sql
deleted file mode 100644
index 90d29e889..000000000
--- a/ext/central-controller-docker/migrations/0001_init.up.sql
+++ /dev/null
@@ -1,47 +0,0 @@
--- inits controller db schema
-
-CREATE TABLE IF NOT EXISTS controllers_ctl (
-    id text NOT NULL PRIMARY KEY,
-    hostname text,
-    last_heartbeat timestamp with time zone,
-    public_identity text NOT NULL,
-    version text
-);
-
-CREATE TABLE IF NOT EXISTS networks_ctl (
-    id character varying(22) NOT NULL PRIMARY KEY,
-    name text NOT NULL,
-    configuration jsonb DEFAULT '{}'::jsonb NOT NULL,
-    controller_id text REFERENCES controllers_ctl(id),
-    revision integer DEFAULT 0 NOT NULL,
-    last_modified timestamp with time zone DEFAULT now(),
-    creation_time timestamp with time zone DEFAULT now()
-);
-
-CREATE TABLE IF NOT EXISTS network_memberships_ctl (
-    device_id character varying(22) NOT NULL,
-    network_id character varying(22) NOT NULL REFERENCES networks_ctl(id),
-    authorized boolean,
-    active_bridge boolean,
-    ip_assignments text[],
-    no_auto_assign_ips boolean,
-    sso_exempt boolean,
-    authentication_expiry_time timestamp with time zone,
-    capabilities jsonb,
-    creation_time timestamp with time zone DEFAULT now(),
-    last_modified timestamp with time zone DEFAULT now(),
-    identity text DEFAULT ''::text,
-    last_authorized_credential text,
-    last_authorized_time timestamp with time zone,
-    last_deauthorized_time timestamp with time zone,
-    last_seen jsonb DEFAULT '{}'::jsonb NOT NULL, -- in the context of the network
-    remote_trace_level integer DEFAULT 0 NOT NULL,
-    remote_trace_target text DEFAULT ''::text NOT NULL,
-    revision integer DEFAULT 0 NOT NULL,
-    tags jsonb,
-    version_major integer DEFAULT 0 NOT NULL,
-    version_minor integer DEFAULT 0 NOT NULL,
-    version_revision integer DEFAULT 0 NOT NULL,
-    version_protocol integer DEFAULT 0 NOT NULL,
-    PRIMARY KEY (device_id, network_id)
-);
diff --git a/ext/central-controller-docker/migrations/0002_os_arch.down.sql b/ext/central-controller-docker/migrations/0002_os_arch.down.sql
deleted file mode 100644
index 3c90f0a2e..000000000
--- a/ext/central-controller-docker/migrations/0002_os_arch.down.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE network_memberships_ctl
-    DROP COLUMN os,
-    DROP COLUMN arch;
\ No newline at end of file
diff --git a/ext/central-controller-docker/migrations/0002_os_arch.up.sql b/ext/central-controller-docker/migrations/0002_os_arch.up.sql
deleted file mode 100644
index 095f7c698..000000000
--- a/ext/central-controller-docker/migrations/0002_os_arch.up.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE network_memberships_ctl
-    ADD COLUMN os TEXT NOT NULL DEFAULT 'unknown',
-    ADD COLUMN arch TEXT NOT NULL DEFAULT 'unknown';
\ No newline at end of file
diff --git a/ext/contrib/README.md b/ext/contrib/README.md
new file mode 100644
index 000000000..feb9ae643
--- /dev/null
+++ b/ext/contrib/README.md
@@ -0,0 +1,15 @@
+You are reading this file because you want to build a new copy of the LwIP library for
+use in ZeroTier.
+
+Subdirectories:
+
+ ports/ -- contains ports for various architectures (for our purposes, unix)
+
+In order for the Network Containers feature to work in ZeroTier, a copy of the LwIP libary
+is needed since we dynamically load it into memory. You can build a new copy of the libary 
+by going to /contrib/ports/unix/proj/lib and running make.
+
+This will generate: liblwip.so
+
+You can enable LwIP debug traces by adding the flag -DLWIP_DEBUG
+See additional debug info here: http://lwip.wikia.com/wiki/Debugging_lwIP 
diff --git a/ext/contrib/ports/unix/proj/lib/Makefile b/ext/contrib/ports/unix/proj/lib/Makefile
new file mode 100644
index 000000000..5bb6a1f36
--- /dev/null
+++ b/ext/contrib/ports/unix/proj/lib/Makefile
@@ -0,0 +1,106 @@
+#
+# Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+# SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+# OF SUCH DAMAGE.
+#
+# This file is part of the lwIP TCP/IP stack.
+#
+# Author: Adam Dunkels <adam@sics.se>
+#
+
+CONTRIBDIR=../../../..
+LWIPARCH=$(CONTRIBDIR)/ports/unix
+
+#Set this to where you have the lwip core module checked out from CVS
+#default assumes it's a dir named lwip at the same level as the contrib module
+LWIPDIR=$(CONTRIBDIR)/../lwip/src
+
+
+CCDEP=gcc
+CC=gcc
+CFLAGS=-g -Wall -DIPv4 -fPIC
+
+CFLAGS:=$(CFLAGS) \
+	-I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
+	-I$(LWIPDIR) -I.
+
+
+# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
+COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \
+	$(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c $(LWIPDIR)/core/stats.c \
+	$(LWIPDIR)/core/sys.c $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \
+	$(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/dhcp.c \
+	$(LWIPDIR)/core/init.c $(LWIPDIR)/core/timers.c $(LWIPDIR)/core/def.c
+CORE4FILES=$(wildcard $(LWIPDIR)/core/ipv4/*.c) $(LWIPDIR)/core/ipv4/inet.c \
+	$(LWIPDIR)/core/ipv4/inet_chksum.c
+
+# SNMPFILES: Extra SNMPv1 agent
+SNMPFILES=$(LWIPDIR)/core/snmp/asn1_dec.c $(LWIPDIR)/core/snmp/asn1_enc.c \
+	$(LWIPDIR)/core/snmp/mib2.c $(LWIPDIR)/core/snmp/mib_structs.c \
+	$(LWIPDIR)/core/snmp/msg_in.c $(LWIPDIR)/core/snmp/msg_out.c
+
+# APIFILES: The files which implement the sequential and socket APIs.
+APIFILES=$(LWIPDIR)/api/api_lib.c $(LWIPDIR)/api/api_msg.c $(LWIPDIR)/api/tcpip.c \
+	$(LWIPDIR)/api/err.c $(LWIPDIR)/api/sockets.c $(LWIPDIR)/api/netbuf.c $(LWIPDIR)/api/netdb.c
+
+# NETIFFILES: Files implementing various generic network interface functions.'
+NETIFFILES=$(LWIPDIR)/netif/etharp.c $(LWIPDIR)/netif/slipif.c
+
+# NETIFFILES: Add PPP netif
+NETIFFILES+=$(LWIPDIR)/netif/ppp/auth.c $(LWIPDIR)/netif/ppp/chap.c \
+	$(LWIPDIR)/netif/ppp/chpms.c $(LWIPDIR)/netif/ppp/fsm.c \
+	$(LWIPDIR)/netif/ppp/ipcp.c $(LWIPDIR)/netif/ppp/lcp.c \
+	$(LWIPDIR)/netif/ppp/magic.c $(LWIPDIR)/netif/ppp/md5.c \
+	$(LWIPDIR)/netif/ppp/pap.c $(LWIPDIR)/netif/ppp/ppp.c \
+	$(LWIPDIR)/netif/ppp/randm.c $(LWIPDIR)/netif/ppp/vj.c
+
+# ARCHFILES: Architecture specific files.
+ARCHFILES=$(wildcard $(LWIPARCH)/*.c $(LWIPARCH)tapif.c $(LWIPARCH)/netif/list.c $(LWIPARCH)/netif/tcpdump.c)
+
+
+# LWIPFILES: All the above.
+LWIPFILES=$(COREFILES) $(CORE4FILES) $(SNMPFILES) $(APIFILES) $(NETIFFILES) $(ARCHFILES)
+LWIPFILESW=$(wildcard $(LWIPFILES))
+LWIPOBJS=$(notdir $(LWIPFILESW:.c=.o))
+
+LWIPLIB=liblwip.so
+
+%.o:
+	$(CC) $(CFLAGS) -c $(<:.o=.c)
+
+all: $(LWIPLIB)
+.PHONY: all
+
+clean:
+	rm -f *.o $(LWIPLIB) *.s .depend* *.core core
+
+depend dep: .depend
+
+include .depend
+
+$(LWIPLIB): $(LWIPOBJS) unixlib.o
+	$(CC) -g -nostartfiles -shared -o $@ $^
+
+.depend: unixlib.c $(LWIPFILES)
+	$(CCDEP) $(CFLAGS) -MM $^ > .depend || rm -f .depend
diff --git a/ext/contrib/ports/unix/proj/lib/README b/ext/contrib/ports/unix/proj/lib/README
new file mode 100644
index 000000000..cd6cc7b74
--- /dev/null
+++ b/ext/contrib/ports/unix/proj/lib/README
@@ -0,0 +1,31 @@
+This directory contains an example of how to compile lwIP as a self
+initialising shared library on Linux.
+
+Some brief instructions:
+ 
+* Compile the code:
+
+ > make clean all
+
+ This should produce liblwip4unixlib.so.  This is the shared library.
+
+* Link an application against the shared library
+
+ If you're using gcc you can do this by including -llwip4unixlib in
+your link command. 
+
+* Run your application
+ 
+ Ensure that LD_LIBRARY_PATH includes the directory that contains
+liblwip4unixlib.so (ie. this directory)
+
+
+
+If you are unsure about shared libraries and libraries on linux in
+general, you might find this HOWTO useful:
+
+<http://www.tldp.org/HOWTO/Program-Library-HOWTO/>
+
+
+
+Kieran Mansley, October 2002.
\ No newline at end of file
diff --git a/ext/contrib/ports/unix/proj/lib/lwipopts.h b/ext/contrib/ports/unix/proj/lib/lwipopts.h
new file mode 100644
index 000000000..48d35f3df
--- /dev/null
+++ b/ext/contrib/ports/unix/proj/lib/lwipopts.h
@@ -0,0 +1,468 @@
+/**
+ * @file
+ *
+ * lwIP Options Configuration
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIPOPTS_H__
+#define __LWIPOPTS_H__
+
+/*
+ * Include user defined options first. Anything not defined in these files
+ * will be set to standard values. Override anything you dont like!
+ */
+#include "lwipopts.h"
+#include "lwip/debug.h"
+
+
+//#define LWIP_DEBUG 0
+//#define TCP_DEBUG LWIP_DBG_OFF
+
+/*
+
+#define LWIP_MALLOC_MEMPOOL 1
+*/
+
+/*
+#define LWIP_CHECKSUM_ON_COPY 1
+
+#define TCP_OVERSIZE TCP_MSS
+*/
+
+#ifndef TCP_SND_QUEUELEN
+#define TCP_SND_QUEUELEN                ((4 * (TCP_SND_BUF) + (TCP_MSS - 1))/(TCP_MSS))
+#endif
+
+//#define TCP_WND
+
+
+//#define PBUF_POOL_BUFSIZE 2048
+
+/*------------------------------------------------------------------------------
+---------------------------------- Timers --------------------------------------
+------------------------------------------------------------------------------*/
+
+/* these are originally defined in tcp_impl.h */
+#ifndef TCP_TMR_INTERVAL
+/* The TCP timer interval in milliseconds. */
+#define TCP_TMR_INTERVAL       25
+#endif /* TCP_TMR_INTERVAL */
+
+#ifndef TCP_FAST_INTERVAL
+/* the fine grained timeout in milliseconds */
+#define TCP_FAST_INTERVAL      TCP_TMR_INTERVAL
+#endif /* TCP_FAST_INTERVAL */
+
+#ifndef TCP_SLOW_INTERVALs
+/* the coarse grained timeout in milliseconds */
+#define TCP_SLOW_INTERVAL      (2*TCP_TMR_INTERVAL)
+#endif /* TCP_SLOW_INTERVAL */
+
+
+/*------------------------------------------------------------------------------
+--------------------------- Platform specific locking -------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * SYS_LIGHTWEIGHT_PROT==1: if you want inter-task protection for certain
+ * critical regions during buffer allocation, deallocation and memory
+ * allocation and deallocation.
+ */
+#define SYS_LIGHTWEIGHT_PROT            0
+
+/**
+ * NO_SYS==1: Provides VERY minimal functionality. Otherwise,
+ * use lwIP facilities.
+ */
+
+/* set to 1 so we have no thread behaviour */
+#define NO_SYS                          1
+
+/* set to 1 so we can use our own timers */
+#define NO_SYS_NO_TIMERS                1
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- Memory options --------------------------------
+------------------------------------------------------------------------------*/
+
+
+#define LWIP_CHKSUM_ALGORITHM 2
+
+
+/**
+ * MEM_ALIGNMENT: should be set to the alignment of the CPU
+ *    4 byte alignment -> #define MEM_ALIGNMENT 4
+ *    2 byte alignment -> #define MEM_ALIGNMENT 2
+ */
+#define MEM_ALIGNMENT                   1
+
+/**
+ * MEM_SIZE: the size of the heap memory. If the application will send
+ * a lot of data that needs to be copied, this should be set high.
+ */
+#define MEM_SIZE                        1024 * 1024 * 64
+#define TCP_SND_BUF                     1024 * 63
+
+
+/*------------------------------------------------------------------------------
+-------------------------- Internal Memory Pool Sizes --------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * MEMP_NUM_PBUF: the number of memp struct pbufs (used for PBUF_ROM and PBUF_REF).
+ * If the application sends a lot of data out of ROM (or other static memory),
+ * this should be set high.
+ */
+#define MEMP_NUM_PBUF                   256
+
+/**
+ * MEMP_NUM_RAW_PCB: Number of raw connection PCBs
+ * (requires the LWIP_RAW option)
+ */
+#define MEMP_NUM_RAW_PCB                32
+
+/**
+ * MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
+ * per active UDP "connection".
+ * (requires the LWIP_UDP option)
+ */
+#define MEMP_NUM_UDP_PCB                4
+
+/**
+ * MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections.
+ * (requires the LWIP_TCP option)
+ */
+#define MEMP_NUM_TCP_PCB                128
+
+/**
+ * MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections.
+ * (requires the LWIP_TCP option)
+ */
+#define MEMP_NUM_TCP_PCB_LISTEN         128
+
+/**
+ * MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments.
+ * (requires the LWIP_TCP option)
+ */
+#define MEMP_NUM_TCP_SEG                TCP_SND_QUEUELEN
+
+/**
+ * MEMP_NUM_REASSDATA: the number of simultaneously IP packets queued for
+ * reassembly (whole packets, not fragments!)
+ */
+#define MEMP_NUM_REASSDATA              1
+
+/**
+ * MEMP_NUM_ARP_QUEUE: the number of simulateously queued outgoing
+ * packets (pbufs) that are waiting for an ARP request (to resolve
+ * their destination address) to finish.
+ * (requires the ARP_QUEUEING option)
+ */
+#define MEMP_NUM_ARP_QUEUE              2
+
+/**
+ * MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts.
+ * (requires NO_SYS==0)
+ */
+#define MEMP_NUM_SYS_TIMEOUT            3
+
+/**
+ * MEMP_NUM_NETBUF: the number of struct netbufs.
+ * (only needed if you use the sequential API, like api_lib.c)
+ */
+#define MEMP_NUM_NETBUF                 2
+
+/**
+ * MEMP_NUM_NETCONN: the number of struct netconns.
+ * (only needed if you use the sequential API, like api_lib.c)
+ */
+#define MEMP_NUM_NETCONN                4
+
+/**
+ * MEMP_NUM_TCPIP_MSG_API: the number of struct tcpip_msg, which are used
+ * for callback/timeout API communication.
+ * (only needed if you use tcpip.c)
+ */
+#define MEMP_NUM_TCPIP_MSG_API          8
+
+/**
+ * MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used
+ * for incoming packets.
+ * (only needed if you use tcpip.c)
+ */
+#define MEMP_NUM_TCPIP_MSG_INPKT        8
+
+/**
+ * PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
+ */
+#define PBUF_POOL_SIZE                  128 /* was 32 */
+
+
+/*------------------------------------------------------------------------------
+----------------------------------- ARP options --------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_ARP==1: Enable ARP functionality.
+ */
+#define LWIP_ARP                        1
+
+
+/*------------------------------------------------------------------------------
+------------------------------------ IP options---------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * IP_FORWARD==1: Enables the ability to forward IP packets across network
+ * interfaces. If you are going to run lwIP on a device with only one network
+ * interface, define this to 0.
+ */
+#define IP_FORWARD                      0
+
+/**
+ * IP_OPTIONS: Defines the behavior for IP options.
+ *      IP_OPTIONS_ALLOWED==0: All packets with IP options are dropped.
+ *      IP_OPTIONS_ALLOWED==1: IP options are allowed (but not parsed).
+ */
+#define IP_OPTIONS_ALLOWED              1
+
+/**
+ * IP_REASSEMBLY==1: Reassemble incoming fragmented IP packets. Note that
+ * this option does not affect outgoing packet sizes, which can be controlled
+ * via IP_FRAG.
+ */
+#define IP_REASSEMBLY                   1
+
+/**
+ * IP_FRAG==1: Fragment outgoing IP packets if their size exceeds MTU. Note
+ * that this option does not affect incoming packet sizes, which can be
+ * controlled via IP_REASSEMBLY.
+ */
+#define IP_FRAG                         1
+
+/**
+ * IP_REASS_MAXAGE: Maximum time (in multiples of IP_TMR_INTERVAL - so seconds, normally)
+ * a fragmented IP packet waits for all fragments to arrive. If not all fragments arrived
+ * in this time, the whole packet is discarded.
+ */
+#define IP_REASS_MAXAGE                 3
+
+/**
+ * IP_REASS_MAX_PBUFS: Total maximum amount of pbufs waiting to be reassembled.
+ * Since the received pbufs are enqueued, be sure to configure
+ * PBUF_POOL_SIZE > IP_REASS_MAX_PBUFS so that the stack is still able to receive
+ * packets even if the maximum amount of fragments is enqueued for reassembly!
+ */
+#define IP_REASS_MAX_PBUFS              4
+
+/**
+ * IP_FRAG_USES_STATIC_BUF==1: Use a static MTU-sized buffer for IP
+ * fragmentation. Otherwise pbufs are allocated and reference the original
+    * packet data to be fragmented.
+*/
+#define IP_FRAG_USES_STATIC_BUF         0
+
+/**
+ * IP_DEFAULT_TTL: Default value for Time-To-Live used by transport layers.
+ */
+#define IP_DEFAULT_TTL                  255
+
+
+/*------------------------------------------------------------------------------
+------------------------------- ICMP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_ICMP==1: Enable ICMP module inside the IP stack.
+ * Be careful, disable that make your product non-compliant to RFC1122
+ */
+#define LWIP_ICMP                       1
+
+
+/*------------------------------------------------------------------------------
+------------------------------- RAW Options ------------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_RAW==1: Enable application layer to hook into the IP layer itself.
+ */
+#define LWIP_RAW                        1
+
+
+/*------------------------------------------------------------------------------
+------------------------------- DHCP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_DHCP==1: Enable DHCP module.
+ */
+#define LWIP_DHCP                       0
+
+
+/*------------------------------------------------------------------------------
+------------------------------ AUTOIP Options ----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_AUTOIP==1: Enable AUTOIP module.
+ */
+#define LWIP_AUTOIP                     0
+
+
+/*------------------------------------------------------------------------------
+------------------------------- SNMP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_SNMP==1: Turn on SNMP module. UDP must be available for SNMP
+ * transport.
+ */
+#define LWIP_SNMP                       0
+
+
+/*------------------------------------------------------------------------------
+------------------------------- IGMP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_IGMP==1: Turn on IGMP module.
+ */
+#define LWIP_IGMP                       0
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- DNS Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_DNS==1: Turn on DNS module. UDP must be available for DNS
+ * transport.
+ */
+#define LWIP_DNS                        0
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- UDP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_UDP==1: Turn on UDP.
+ */
+#define LWIP_UDP                        1
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- TCP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_TCP==1: Turn on TCP.
+ */
+#define LWIP_TCP                        1
+
+#define LWIP_LISTEN_BACKLOG             0
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- Pbuf Options ----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * PBUF_LINK_HLEN: the number of bytes that should be allocated for a
+ * link level header. The default is 14, the standard value for
+ * Ethernet.
+ */
+#define PBUF_LINK_HLEN                  16
+
+/**
+ * PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. The default is
+ * designed to accomodate single full size TCP frame in one pbuf, including
+ * TCP_MSS, IP header, and link header.
+*
+ */
+#define PBUF_POOL_BUFSIZE               LWIP_MEM_ALIGN_SIZE(TCP_MSS+40+PBUF_LINK_HLEN)
+
+
+/*------------------------------------------------------------------------------
+--------------------------------- LOOPIF Options -------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_HAVE_LOOPIF==1: Support loop interface (127.0.0.1) and loopif.c
+ */
+#define LWIP_HAVE_LOOPIF                0
+
+
+/*------------------------------------------------------------------------------
+---------------------------- Sequential Layer Options --------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
+ */
+#define LWIP_NETCONN                    0
+
+
+/*------------------------------------------------------------------------------
+--------------------------------- Socket Options -------------------------------
+------------------------------------------------------------------------------*/
+/**
+ * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
+ */
+#define LWIP_SOCKET                     0
+
+
+/*------------------------------------------------------------------------------
+------------------------------ Statistics Options ------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_STATS==1: Enable statistics collection in lwip_stats.
+ */
+#define LWIP_STATS                      1
+
+/*------------------------------------------------------------------------------
+--------------------------------- PPP Options ----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * PPP_SUPPORT==1: Enable PPP.
+ */
+#define PPP_SUPPORT                     0
+
+
+/* Misc */
+
+#endif /* __LWIPOPTS_H__ */
diff --git a/ext/contrib/ports/unix/proj/lib/unixlib.c b/ext/contrib/ports/unix/proj/lib/unixlib.c
new file mode 100644
index 000000000..950ae1cae
--- /dev/null
+++ b/ext/contrib/ports/unix/proj/lib/unixlib.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Kieran Mansley <kjm25@cam.ac.uk>
+ *
+ * $Id: unixlib.c,v 1.10 2010/02/17 16:52:30 goldsimon Exp $
+ */
+
+/*-----------------------------------------------------------------------------------*/
+/* unixlib.c
+ *
+ * The initialisation functions for a shared library
+ *
+ * You may need to configure this file to your own needs - it is only an example
+ * of how lwIP can be used as a self initialising shared library.
+ *
+ * In particular, you should change the gateway, ipaddr, and netmask to be the values
+ * you would like the stack to use.
+ */
+/*-----------------------------------------------------------------------------------*/
+
+/*
+#include "lwip/init.h"
+#include "lwip/sys.h"
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+#include "lwip/pbuf.h"
+#include "lwip/tcp.h"
+#include "lwip/tcpip.h"
+#include "lwip/netif.h"
+#include "lwip/stats.h"
+#include "lwip/sockets.h"
+
+#include "netif/tapif.h"
+
+struct netif netif;
+*/
+
+static void
+tcpip_init_done(void *arg)
+{
+
+}
+
+void _init(void){
+
+}
+
+void _fini(void){
+}
diff --git a/ext/cpp-httplib/httplib.h b/ext/cpp-httplib/httplib.h
deleted file mode 100644
index 862e97e9e..000000000
--- a/ext/cpp-httplib/httplib.h
+++ /dev/null
@@ -1,9442 +0,0 @@
-//
-//  httplib.h
-//
-//  Copyright (c) 2024 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#ifndef CPPHTTPLIB_HTTPLIB_H
-#define CPPHTTPLIB_HTTPLIB_H
-
-#define CPPHTTPLIB_VERSION "0.15.3"
-
-/*
- * Configuration
- */
-
-#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND
-#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_KEEPALIVE_MAX_COUNT
-#define CPPHTTPLIB_KEEPALIVE_MAX_COUNT 5
-#endif
-
-#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND
-#define CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND 300
-#endif
-
-#ifndef CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND
-#define CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_READ_TIMEOUT_SECOND
-#define CPPHTTPLIB_READ_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_READ_TIMEOUT_USECOND
-#define CPPHTTPLIB_READ_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_WRITE_TIMEOUT_SECOND
-#define CPPHTTPLIB_WRITE_TIMEOUT_SECOND 5
-#endif
-
-#ifndef CPPHTTPLIB_WRITE_TIMEOUT_USECOND
-#define CPPHTTPLIB_WRITE_TIMEOUT_USECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_IDLE_INTERVAL_SECOND
-#define CPPHTTPLIB_IDLE_INTERVAL_SECOND 0
-#endif
-
-#ifndef CPPHTTPLIB_IDLE_INTERVAL_USECOND
-#ifdef _WIN32
-#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 10000
-#else
-#define CPPHTTPLIB_IDLE_INTERVAL_USECOND 0
-#endif
-#endif
-
-#ifndef CPPHTTPLIB_REQUEST_URI_MAX_LENGTH
-#define CPPHTTPLIB_REQUEST_URI_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_HEADER_MAX_LENGTH
-#define CPPHTTPLIB_HEADER_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_REDIRECT_MAX_COUNT
-#define CPPHTTPLIB_REDIRECT_MAX_COUNT 20
-#endif
-
-#ifndef CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT
-#define CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT 1024
-#endif
-
-#ifndef CPPHTTPLIB_PAYLOAD_MAX_LENGTH
-#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH ((std::numeric_limits<size_t>::max)())
-#endif
-
-#ifndef CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH
-#define CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
-#endif
-
-#ifndef CPPHTTPLIB_RANGE_MAX_COUNT
-#define CPPHTTPLIB_RANGE_MAX_COUNT 1024
-#endif
-
-#ifndef CPPHTTPLIB_TCP_NODELAY
-#define CPPHTTPLIB_TCP_NODELAY false
-#endif
-
-#ifndef CPPHTTPLIB_RECV_BUFSIZ
-#define CPPHTTPLIB_RECV_BUFSIZ size_t(4096u)
-#endif
-
-#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
-#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u)
-#endif
-
-#ifndef CPPHTTPLIB_THREAD_POOL_COUNT
-#define CPPHTTPLIB_THREAD_POOL_COUNT                                           \
-  ((std::max)(8u, std::thread::hardware_concurrency() > 0                      \
-                      ? std::thread::hardware_concurrency() - 1                \
-                      : 0))
-#endif
-
-#ifndef CPPHTTPLIB_RECV_FLAGS
-#define CPPHTTPLIB_RECV_FLAGS 0
-#endif
-
-#ifndef CPPHTTPLIB_SEND_FLAGS
-#define CPPHTTPLIB_SEND_FLAGS 0
-#endif
-
-#ifndef CPPHTTPLIB_LISTEN_BACKLOG
-#define CPPHTTPLIB_LISTEN_BACKLOG 5
-#endif
-
-/*
- * Headers
- */
-
-#ifdef _WIN32
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS
-#endif //_CRT_SECURE_NO_WARNINGS
-
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE
-#endif //_CRT_NONSTDC_NO_DEPRECATE
-
-#if defined(_MSC_VER)
-#if _MSC_VER < 1900
-#error Sorry, Visual Studio versions prior to 2015 are not supported
-#endif
-
-#pragma comment(lib, "ws2_32.lib")
-
-#ifdef _WIN64
-using ssize_t = __int64;
-#else
-using ssize_t = long;
-#endif
-#endif // _MSC_VER
-
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
-#endif // S_ISREG
-
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
-#endif // S_ISDIR
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif // NOMINMAX
-
-#include <io.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-
-#ifndef WSA_FLAG_NO_HANDLE_INHERIT
-#define WSA_FLAG_NO_HANDLE_INHERIT 0x80
-#endif
-
-using socket_t = SOCKET;
-#ifdef CPPHTTPLIB_USE_POLL
-#define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)
-#endif
-
-#else // not _WIN32
-
-#include <arpa/inet.h>
-#if !defined(_AIX) && !defined(__MVS__)
-#include <ifaddrs.h>
-#endif
-#ifdef __MVS__
-#include <strings.h>
-#ifndef NI_MAXHOST
-#define NI_MAXHOST 1025
-#endif
-#endif
-#include <net/if.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#ifdef __linux__
-#include <resolv.h>
-#endif
-#include <netinet/tcp.h>
-#ifdef CPPHTTPLIB_USE_POLL
-#include <poll.h>
-#endif
-#include <csignal>
-#include <pthread.h>
-#include <sys/mman.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-
-using socket_t = int;
-#ifndef INVALID_SOCKET
-#define INVALID_SOCKET (-1)
-#endif
-#endif //_WIN32
-
-#include <algorithm>
-#include <array>
-#include <atomic>
-#include <cassert>
-#include <cctype>
-#include <climits>
-#include <condition_variable>
-#include <cstring>
-#include <errno.h>
-#include <exception>
-#include <fcntl.h>
-#include <fstream>
-#include <functional>
-#include <iomanip>
-#include <iostream>
-#include <list>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <regex>
-#include <set>
-#include <sstream>
-#include <string>
-#include <sys/stat.h>
-#include <thread>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-#ifdef _WIN32
-#include <wincrypt.h>
-
-// these are defined in wincrypt.h and it breaks compilation if BoringSSL is
-// used
-#undef X509_NAME
-#undef X509_CERT_PAIR
-#undef X509_EXTENSIONS
-#undef PKCS7_SIGNER_INFO
-
-#ifdef _MSC_VER
-#pragma comment(lib, "crypt32.lib")
-#endif
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#include <TargetConditionals.h>
-#if TARGET_OS_OSX
-#include <CoreFoundation/CoreFoundation.h>
-#include <Security/Security.h>
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/ssl.h>
-#include <openssl/x509v3.h>
-
-#if defined(_WIN32) && defined(OPENSSL_USE_APPLINK)
-#include <openssl/applink.c>
-#endif
-
-#include <iostream>
-#include <sstream>
-
-#if OPENSSL_VERSION_NUMBER < 0x30000000L
-#error Sorry, OpenSSL versions prior to 3.0.0 are not supported
-#endif
-
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-#include <zlib.h>
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-#include <brotli/decode.h>
-#include <brotli/encode.h>
-#endif
-
-/*
- * Declaration
- */
-namespace httplib {
-
-namespace detail {
-
-/*
- * Backport std::make_unique from C++14.
- *
- * NOTE: This code came up with the following stackoverflow post:
- * https://stackoverflow.com/questions/10149840/c-arrays-and-make-unique
- *
- */
-
-template <class T, class... Args>
-typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
-make_unique(Args &&...args) {
-  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-
-template <class T>
-typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
-make_unique(std::size_t n) {
-  typedef typename std::remove_extent<T>::type RT;
-  return std::unique_ptr<T>(new RT[n]);
-}
-
-struct ci {
-  bool operator()(const std::string &s1, const std::string &s2) const {
-    return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(),
-                                        s2.end(),
-                                        [](unsigned char c1, unsigned char c2) {
-                                          return ::tolower(c1) < ::tolower(c2);
-                                        });
-  }
-};
-
-// This is based on
-// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
-
-struct scope_exit {
-  explicit scope_exit(std::function<void(void)> &&f)
-      : exit_function(std::move(f)), execute_on_destruction{true} {}
-
-  scope_exit(scope_exit &&rhs) noexcept
-      : exit_function(std::move(rhs.exit_function)),
-        execute_on_destruction{rhs.execute_on_destruction} {
-    rhs.release();
-  }
-
-  ~scope_exit() {
-    if (execute_on_destruction) { this->exit_function(); }
-  }
-
-  void release() { this->execute_on_destruction = false; }
-
-private:
-  scope_exit(const scope_exit &) = delete;
-  void operator=(const scope_exit &) = delete;
-  scope_exit &operator=(scope_exit &&) = delete;
-
-  std::function<void(void)> exit_function;
-  bool execute_on_destruction;
-};
-
-} // namespace detail
-
-enum StatusCode {
-  // Information responses
-  Continue_100 = 100,
-  SwitchingProtocol_101 = 101,
-  Processing_102 = 102,
-  EarlyHints_103 = 103,
-
-  // Successful responses
-  OK_200 = 200,
-  Created_201 = 201,
-  Accepted_202 = 202,
-  NonAuthoritativeInformation_203 = 203,
-  NoContent_204 = 204,
-  ResetContent_205 = 205,
-  PartialContent_206 = 206,
-  MultiStatus_207 = 207,
-  AlreadyReported_208 = 208,
-  IMUsed_226 = 226,
-
-  // Redirection messages
-  MultipleChoices_300 = 300,
-  MovedPermanently_301 = 301,
-  Found_302 = 302,
-  SeeOther_303 = 303,
-  NotModified_304 = 304,
-  UseProxy_305 = 305,
-  unused_306 = 306,
-  TemporaryRedirect_307 = 307,
-  PermanentRedirect_308 = 308,
-
-  // Client error responses
-  BadRequest_400 = 400,
-  Unauthorized_401 = 401,
-  PaymentRequired_402 = 402,
-  Forbidden_403 = 403,
-  NotFound_404 = 404,
-  MethodNotAllowed_405 = 405,
-  NotAcceptable_406 = 406,
-  ProxyAuthenticationRequired_407 = 407,
-  RequestTimeout_408 = 408,
-  Conflict_409 = 409,
-  Gone_410 = 410,
-  LengthRequired_411 = 411,
-  PreconditionFailed_412 = 412,
-  PayloadTooLarge_413 = 413,
-  UriTooLong_414 = 414,
-  UnsupportedMediaType_415 = 415,
-  RangeNotSatisfiable_416 = 416,
-  ExpectationFailed_417 = 417,
-  ImATeapot_418 = 418,
-  MisdirectedRequest_421 = 421,
-  UnprocessableContent_422 = 422,
-  Locked_423 = 423,
-  FailedDependency_424 = 424,
-  TooEarly_425 = 425,
-  UpgradeRequired_426 = 426,
-  PreconditionRequired_428 = 428,
-  TooManyRequests_429 = 429,
-  RequestHeaderFieldsTooLarge_431 = 431,
-  UnavailableForLegalReasons_451 = 451,
-
-  // Server error responses
-  InternalServerError_500 = 500,
-  NotImplemented_501 = 501,
-  BadGateway_502 = 502,
-  ServiceUnavailable_503 = 503,
-  GatewayTimeout_504 = 504,
-  HttpVersionNotSupported_505 = 505,
-  VariantAlsoNegotiates_506 = 506,
-  InsufficientStorage_507 = 507,
-  LoopDetected_508 = 508,
-  NotExtended_510 = 510,
-  NetworkAuthenticationRequired_511 = 511,
-};
-
-using Headers = std::multimap<std::string, std::string, detail::ci>;
-
-using Params = std::multimap<std::string, std::string>;
-using Match = std::smatch;
-
-using Progress = std::function<bool(uint64_t current, uint64_t total)>;
-
-struct Response;
-using ResponseHandler = std::function<bool(const Response &response)>;
-
-struct MultipartFormData {
-  std::string name;
-  std::string content;
-  std::string filename;
-  std::string content_type;
-};
-using MultipartFormDataItems = std::vector<MultipartFormData>;
-using MultipartFormDataMap = std::multimap<std::string, MultipartFormData>;
-
-class DataSink {
-public:
-  DataSink() : os(&sb_), sb_(*this) {}
-
-  DataSink(const DataSink &) = delete;
-  DataSink &operator=(const DataSink &) = delete;
-  DataSink(DataSink &&) = delete;
-  DataSink &operator=(DataSink &&) = delete;
-
-  std::function<bool(const char *data, size_t data_len)> write;
-  std::function<bool()> is_writable;
-  std::function<void()> done;
-  std::function<void(const Headers &trailer)> done_with_trailer;
-  std::ostream os;
-
-private:
-  class data_sink_streambuf : public std::streambuf {
-  public:
-    explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {}
-
-  protected:
-    std::streamsize xsputn(const char *s, std::streamsize n) override {
-      sink_.write(s, static_cast<size_t>(n));
-      return n;
-    }
-
-  private:
-    DataSink &sink_;
-  };
-
-  data_sink_streambuf sb_;
-};
-
-using ContentProvider =
-    std::function<bool(size_t offset, size_t length, DataSink &sink)>;
-
-using ContentProviderWithoutLength =
-    std::function<bool(size_t offset, DataSink &sink)>;
-
-using ContentProviderResourceReleaser = std::function<void(bool success)>;
-
-struct MultipartFormDataProvider {
-  std::string name;
-  ContentProviderWithoutLength provider;
-  std::string filename;
-  std::string content_type;
-};
-using MultipartFormDataProviderItems = std::vector<MultipartFormDataProvider>;
-
-using ContentReceiverWithProgress =
-    std::function<bool(const char *data, size_t data_length, uint64_t offset,
-                       uint64_t total_length)>;
-
-using ContentReceiver =
-    std::function<bool(const char *data, size_t data_length)>;
-
-using MultipartContentHeader =
-    std::function<bool(const MultipartFormData &file)>;
-
-class ContentReader {
-public:
-  using Reader = std::function<bool(ContentReceiver receiver)>;
-  using MultipartReader = std::function<bool(MultipartContentHeader header,
-                                             ContentReceiver receiver)>;
-
-  ContentReader(Reader reader, MultipartReader multipart_reader)
-      : reader_(std::move(reader)),
-        multipart_reader_(std::move(multipart_reader)) {}
-
-  bool operator()(MultipartContentHeader header,
-                  ContentReceiver receiver) const {
-    return multipart_reader_(std::move(header), std::move(receiver));
-  }
-
-  bool operator()(ContentReceiver receiver) const {
-    return reader_(std::move(receiver));
-  }
-
-  Reader reader_;
-  MultipartReader multipart_reader_;
-};
-
-using Range = std::pair<ssize_t, ssize_t>;
-using Ranges = std::vector<Range>;
-
-struct Request {
-  std::string method;
-  std::string path;
-  Headers headers;
-  std::string body;
-
-  std::string remote_addr;
-  int remote_port = -1;
-  std::string local_addr;
-  int local_port = -1;
-
-  // for server
-  std::string version;
-  std::string target;
-  Params params;
-  MultipartFormDataMap files;
-  Ranges ranges;
-  Match matches;
-  std::unordered_map<std::string, std::string> path_params;
-
-  // for client
-  ResponseHandler response_handler;
-  ContentReceiverWithProgress content_receiver;
-  Progress progress;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  const SSL *ssl = nullptr;
-#endif
-
-  bool has_header(const std::string &key) const;
-  std::string get_header_value(const std::string &key, size_t id = 0) const;
-  uint64_t get_header_value_u64(const std::string &key, size_t id = 0) const;
-  size_t get_header_value_count(const std::string &key) const;
-  void set_header(const std::string &key, const std::string &val);
-
-  bool has_param(const std::string &key) const;
-  std::string get_param_value(const std::string &key, size_t id = 0) const;
-  size_t get_param_value_count(const std::string &key) const;
-
-  bool is_multipart_form_data() const;
-
-  bool has_file(const std::string &key) const;
-  MultipartFormData get_file_value(const std::string &key) const;
-  std::vector<MultipartFormData> get_file_values(const std::string &key) const;
-
-  // private members...
-  size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT;
-  size_t content_length_ = 0;
-  ContentProvider content_provider_;
-  bool is_chunked_content_provider_ = false;
-  size_t authorization_count_ = 0;
-};
-
-struct Response {
-  std::string version;
-  int status = -1;
-  std::string reason;
-  Headers headers;
-  std::string body;
-  std::string location; // Redirect location
-
-  bool has_header(const std::string &key) const;
-  std::string get_header_value(const std::string &key, size_t id = 0) const;
-  uint64_t get_header_value_u64(const std::string &key, size_t id = 0) const;
-  size_t get_header_value_count(const std::string &key) const;
-  void set_header(const std::string &key, const std::string &val);
-
-  void set_redirect(const std::string &url, int status = StatusCode::Found_302);
-  void set_content(const char *s, size_t n, const std::string &content_type);
-  void set_content(const std::string &s, const std::string &content_type);
-  void set_content(std::string &&s, const std::string &content_type);
-
-  void set_content_provider(
-      size_t length, const std::string &content_type, ContentProvider provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  void set_content_provider(
-      const std::string &content_type, ContentProviderWithoutLength provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  void set_chunked_content_provider(
-      const std::string &content_type, ContentProviderWithoutLength provider,
-      ContentProviderResourceReleaser resource_releaser = nullptr);
-
-  Response() = default;
-  Response(const Response &) = default;
-  Response &operator=(const Response &) = default;
-  Response(Response &&) = default;
-  Response &operator=(Response &&) = default;
-  ~Response() {
-    if (content_provider_resource_releaser_) {
-      content_provider_resource_releaser_(content_provider_success_);
-    }
-  }
-
-  // private members...
-  size_t content_length_ = 0;
-  ContentProvider content_provider_;
-  ContentProviderResourceReleaser content_provider_resource_releaser_;
-  bool is_chunked_content_provider_ = false;
-  bool content_provider_success_ = false;
-};
-
-class Stream {
-public:
-  virtual ~Stream() = default;
-
-  virtual bool is_readable() const = 0;
-  virtual bool is_writable() const = 0;
-
-  virtual ssize_t read(char *ptr, size_t size) = 0;
-  virtual ssize_t write(const char *ptr, size_t size) = 0;
-  virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0;
-  virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0;
-  virtual socket_t socket() const = 0;
-
-  template <typename... Args>
-  ssize_t write_format(const char *fmt, const Args &...args);
-  ssize_t write(const char *ptr);
-  ssize_t write(const std::string &s);
-};
-
-class TaskQueue {
-public:
-  TaskQueue() = default;
-  virtual ~TaskQueue() = default;
-
-  virtual bool enqueue(std::function<void()> fn) = 0;
-  virtual void shutdown() = 0;
-
-  virtual void on_idle() {}
-};
-
-class ThreadPool : public TaskQueue {
-public:
-  explicit ThreadPool(size_t n, size_t mqr = 0)
-      : shutdown_(false), max_queued_requests_(mqr) {
-    while (n) {
-      threads_.emplace_back(worker(*this));
-      n--;
-    }
-  }
-
-  ThreadPool(const ThreadPool &) = delete;
-  ~ThreadPool() override = default;
-
-  bool enqueue(std::function<void()> fn) override {
-    {
-      std::unique_lock<std::mutex> lock(mutex_);
-      if (max_queued_requests_ > 0 && jobs_.size() >= max_queued_requests_) {
-        return false;
-      }
-      jobs_.push_back(std::move(fn));
-    }
-
-    cond_.notify_one();
-    return true;
-  }
-
-  void shutdown() override {
-    // Stop all worker threads...
-    {
-      std::unique_lock<std::mutex> lock(mutex_);
-      shutdown_ = true;
-    }
-
-    cond_.notify_all();
-
-    // Join...
-    for (auto &t : threads_) {
-      t.join();
-    }
-  }
-
-private:
-  struct worker {
-    explicit worker(ThreadPool &pool) : pool_(pool) {}
-
-    void operator()() {
-      for (;;) {
-        std::function<void()> fn;
-        {
-          std::unique_lock<std::mutex> lock(pool_.mutex_);
-
-          pool_.cond_.wait(
-              lock, [&] { return !pool_.jobs_.empty() || pool_.shutdown_; });
-
-          if (pool_.shutdown_ && pool_.jobs_.empty()) { break; }
-
-          fn = std::move(pool_.jobs_.front());
-          pool_.jobs_.pop_front();
-        }
-
-        assert(true == static_cast<bool>(fn));
-        fn();
-      }
-    }
-
-    ThreadPool &pool_;
-  };
-  friend struct worker;
-
-  std::vector<std::thread> threads_;
-  std::list<std::function<void()>> jobs_;
-
-  bool shutdown_;
-  size_t max_queued_requests_ = 0;
-
-  std::condition_variable cond_;
-  std::mutex mutex_;
-};
-
-using Logger = std::function<void(const Request &, const Response &)>;
-
-using SocketOptions = std::function<void(socket_t sock)>;
-
-void default_socket_options(socket_t sock);
-
-const char *status_message(int status);
-
-std::string get_bearer_token_auth(const Request &req);
-
-namespace detail {
-
-class MatcherBase {
-public:
-  virtual ~MatcherBase() = default;
-
-  // Match request path and populate its matches and
-  virtual bool match(Request &request) const = 0;
-};
-
-/**
- * Captures parameters in request path and stores them in Request::path_params
- *
- * Capture name is a substring of a pattern from : to /.
- * The rest of the pattern is matched agains the request path directly
- * Parameters are captured starting from the next character after
- * the end of the last matched static pattern fragment until the next /.
- *
- * Example pattern:
- * "/path/fragments/:capture/more/fragments/:second_capture"
- * Static fragments:
- * "/path/fragments/", "more/fragments/"
- *
- * Given the following request path:
- * "/path/fragments/:1/more/fragments/:2"
- * the resulting capture will be
- * {{"capture", "1"}, {"second_capture", "2"}}
- */
-class PathParamsMatcher : public MatcherBase {
-public:
-  PathParamsMatcher(const std::string &pattern);
-
-  bool match(Request &request) const override;
-
-private:
-  static constexpr char marker = ':';
-  // Treat segment separators as the end of path parameter capture
-  // Does not need to handle query parameters as they are parsed before path
-  // matching
-  static constexpr char separator = '/';
-
-  // Contains static path fragments to match against, excluding the '/' after
-  // path params
-  // Fragments are separated by path params
-  std::vector<std::string> static_fragments_;
-  // Stores the names of the path parameters to be used as keys in the
-  // Request::path_params map
-  std::vector<std::string> param_names_;
-};
-
-/**
- * Performs std::regex_match on request path
- * and stores the result in Request::matches
- *
- * Note that regex match is performed directly on the whole request.
- * This means that wildcard patterns may match multiple path segments with /:
- * "/begin/(.*)/end" will match both "/begin/middle/end" and "/begin/1/2/end".
- */
-class RegexMatcher : public MatcherBase {
-public:
-  RegexMatcher(const std::string &pattern) : regex_(pattern) {}
-
-  bool match(Request &request) const override;
-
-private:
-  std::regex regex_;
-};
-
-ssize_t write_headers(Stream &strm, const Headers &headers);
-
-} // namespace detail
-
-class Server {
-public:
-  using Handler = std::function<void(const Request &, Response &)>;
-
-  using ExceptionHandler =
-      std::function<void(const Request &, Response &, std::exception_ptr ep)>;
-
-  enum class HandlerResponse {
-    Handled,
-    Unhandled,
-  };
-  using HandlerWithResponse =
-      std::function<HandlerResponse(const Request &, Response &)>;
-
-  using HandlerWithContentReader = std::function<void(
-      const Request &, Response &, const ContentReader &content_reader)>;
-
-  using Expect100ContinueHandler =
-      std::function<int(const Request &, Response &)>;
-
-  Server();
-
-  virtual ~Server();
-
-  virtual bool is_valid() const;
-
-  Server &Get(const std::string &pattern, Handler handler);
-  Server &Post(const std::string &pattern, Handler handler);
-  Server &Post(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Put(const std::string &pattern, Handler handler);
-  Server &Put(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Patch(const std::string &pattern, Handler handler);
-  Server &Patch(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Delete(const std::string &pattern, Handler handler);
-  Server &Delete(const std::string &pattern, HandlerWithContentReader handler);
-  Server &Options(const std::string &pattern, Handler handler);
-
-  bool set_base_dir(const std::string &dir,
-                    const std::string &mount_point = std::string());
-  bool set_mount_point(const std::string &mount_point, const std::string &dir,
-                       Headers headers = Headers());
-  bool remove_mount_point(const std::string &mount_point);
-  Server &set_file_extension_and_mimetype_mapping(const std::string &ext,
-                                                  const std::string &mime);
-  Server &set_default_file_mimetype(const std::string &mime);
-  Server &set_file_request_handler(Handler handler);
-
-  Server &set_error_handler(HandlerWithResponse handler);
-  Server &set_error_handler(Handler handler);
-  Server &set_exception_handler(ExceptionHandler handler);
-  Server &set_pre_routing_handler(HandlerWithResponse handler);
-  Server &set_post_routing_handler(Handler handler);
-
-  Server &set_expect_100_continue_handler(Expect100ContinueHandler handler);
-  Server &set_logger(Logger logger);
-
-  Server &set_address_family(int family);
-  Server &set_tcp_nodelay(bool on);
-  Server &set_socket_options(SocketOptions socket_options);
-
-  Server &set_default_headers(Headers headers);
-  Server &
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  Server &set_keep_alive_max_count(size_t count);
-  Server &set_keep_alive_timeout(time_t sec);
-
-  Server &set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_idle_interval(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  Server &set_idle_interval(const std::chrono::duration<Rep, Period> &duration);
-
-  Server &set_payload_max_length(size_t length);
-
-  bool bind_to_port(const std::string &host, int port, int socket_flags = 0);
-  int bind_to_any_port(const std::string &host, int socket_flags = 0);
-  bool listen_after_bind();
-
-  bool listen(const std::string &host, int port, int socket_flags = 0);
-
-  bool is_running() const;
-  void wait_until_ready() const;
-  void stop();
-
-  std::function<TaskQueue *(void)> new_task_queue;
-
-  bool routing(Request &req, Response &res, Stream &strm);
-
-protected:
-  bool process_request(Stream &strm, bool close_connection,
-                       bool &connection_closed,
-                       const std::function<void(Request &)> &setup_request);
-
-  std::atomic<socket_t> svr_sock_{INVALID_SOCKET};
-  size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT;
-  time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND;
-  time_t read_timeout_sec_ = CPPHTTPLIB_READ_TIMEOUT_SECOND;
-  time_t read_timeout_usec_ = CPPHTTPLIB_READ_TIMEOUT_USECOND;
-  time_t write_timeout_sec_ = CPPHTTPLIB_WRITE_TIMEOUT_SECOND;
-  time_t write_timeout_usec_ = CPPHTTPLIB_WRITE_TIMEOUT_USECOND;
-  time_t idle_interval_sec_ = CPPHTTPLIB_IDLE_INTERVAL_SECOND;
-  time_t idle_interval_usec_ = CPPHTTPLIB_IDLE_INTERVAL_USECOND;
-  size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
-
-private:
-  using Handlers =
-      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
-  using HandlersForContentReader =
-      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>,
-                            HandlerWithContentReader>>;
-
-  static std::unique_ptr<detail::MatcherBase>
-  make_matcher(const std::string &pattern);
-
-  socket_t create_server_socket(const std::string &host, int port,
-                                int socket_flags,
-                                SocketOptions socket_options) const;
-  int bind_internal(const std::string &host, int port, int socket_flags);
-  bool listen_internal();
-
-  bool handle_file_request(const Request &req, Response &res,
-                           bool head = false);
-  bool dispatch_request(Request &req, Response &res,
-                        const Handlers &handlers) const;
-  bool dispatch_request_for_content_reader(
-      Request &req, Response &res, ContentReader content_reader,
-      const HandlersForContentReader &handlers) const;
-
-  bool parse_request_line(const char *s, Request &req) const;
-  void apply_ranges(const Request &req, Response &res,
-                    std::string &content_type, std::string &boundary) const;
-  bool write_response(Stream &strm, bool close_connection, Request &req,
-                      Response &res);
-  bool write_response_with_content(Stream &strm, bool close_connection,
-                                   const Request &req, Response &res);
-  bool write_response_core(Stream &strm, bool close_connection,
-                           const Request &req, Response &res,
-                           bool need_apply_ranges);
-  bool write_content_with_provider(Stream &strm, const Request &req,
-                                   Response &res, const std::string &boundary,
-                                   const std::string &content_type);
-  bool read_content(Stream &strm, Request &req, Response &res);
-  bool
-  read_content_with_content_receiver(Stream &strm, Request &req, Response &res,
-                                     ContentReceiver receiver,
-                                     MultipartContentHeader multipart_header,
-                                     ContentReceiver multipart_receiver);
-  bool read_content_core(Stream &strm, Request &req, Response &res,
-                         ContentReceiver receiver,
-                         MultipartContentHeader multipart_header,
-                         ContentReceiver multipart_receiver) const;
-
-  virtual bool process_and_close_socket(socket_t sock);
-
-  std::atomic<bool> is_running_{false};
-  std::atomic<bool> done_{false};
-
-  struct MountPointEntry {
-    std::string mount_point;
-    std::string base_dir;
-    Headers headers;
-  };
-  std::vector<MountPointEntry> base_dirs_;
-  std::map<std::string, std::string> file_extension_and_mimetype_map_;
-  std::string default_file_mimetype_ = "application/octet-stream";
-  Handler file_request_handler_;
-
-  Handlers get_handlers_;
-  Handlers post_handlers_;
-  HandlersForContentReader post_handlers_for_content_reader_;
-  Handlers put_handlers_;
-  HandlersForContentReader put_handlers_for_content_reader_;
-  Handlers patch_handlers_;
-  HandlersForContentReader patch_handlers_for_content_reader_;
-  Handlers delete_handlers_;
-  HandlersForContentReader delete_handlers_for_content_reader_;
-  Handlers options_handlers_;
-
-  HandlerWithResponse error_handler_;
-  ExceptionHandler exception_handler_;
-  HandlerWithResponse pre_routing_handler_;
-  Handler post_routing_handler_;
-  Expect100ContinueHandler expect_100_continue_handler_;
-
-  Logger logger_;
-
-  int address_family_ = AF_UNSPEC;
-  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
-  SocketOptions socket_options_ = default_socket_options;
-
-  Headers default_headers_;
-  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
-      detail::write_headers;
-};
-
-enum class Error {
-  Success = 0,
-  Unknown,
-  Connection,
-  BindIPAddress,
-  Read,
-  Write,
-  ExceedRedirectCount,
-  Canceled,
-  SSLConnection,
-  SSLLoadingCerts,
-  SSLServerVerification,
-  UnsupportedMultipartBoundaryChars,
-  Compression,
-  ConnectionTimeout,
-  ProxyConnection,
-
-  // For internal use only
-  SSLPeerCouldBeClosed_,
-};
-
-std::string to_string(Error error);
-
-std::ostream &operator<<(std::ostream &os, const Error &obj);
-
-class Result {
-public:
-  Result() = default;
-  Result(std::unique_ptr<Response> &&res, Error err,
-         Headers &&request_headers = Headers{})
-      : res_(std::move(res)), err_(err),
-        request_headers_(std::move(request_headers)) {}
-  // Response
-  operator bool() const { return res_ != nullptr; }
-  bool operator==(std::nullptr_t) const { return res_ == nullptr; }
-  bool operator!=(std::nullptr_t) const { return res_ != nullptr; }
-  const Response &value() const { return *res_; }
-  Response &value() { return *res_; }
-  const Response &operator*() const { return *res_; }
-  Response &operator*() { return *res_; }
-  const Response *operator->() const { return res_.get(); }
-  Response *operator->() { return res_.get(); }
-
-  // Error
-  Error error() const { return err_; }
-
-  // Request Headers
-  bool has_request_header(const std::string &key) const;
-  std::string get_request_header_value(const std::string &key,
-                                       size_t id = 0) const;
-  uint64_t get_request_header_value_u64(const std::string &key,
-                                        size_t id = 0) const;
-  size_t get_request_header_value_count(const std::string &key) const;
-
-private:
-  std::unique_ptr<Response> res_;
-  Error err_ = Error::Unknown;
-  Headers request_headers_;
-};
-
-class ClientImpl {
-public:
-  explicit ClientImpl(const std::string &host);
-
-  explicit ClientImpl(const std::string &host, int port);
-
-  explicit ClientImpl(const std::string &host, int port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path);
-
-  virtual ~ClientImpl();
-
-  virtual bool is_valid() const;
-
-  Result Get(const std::string &path);
-  Result Get(const std::string &path, const Headers &headers);
-  Result Get(const std::string &path, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             Progress progress);
-  Result Get(const std::string &path, ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler, ContentReceiver content_receiver,
-             Progress progress);
-
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ContentReceiver content_receiver,
-             Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress = nullptr);
-
-  Result Head(const std::string &path);
-  Result Head(const std::string &path, const Headers &headers);
-
-  Result Post(const std::string &path);
-  Result Post(const std::string &path, const Headers &headers);
-  Result Post(const std::string &path, const char *body, size_t content_length,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type);
-  Result Post(const std::string &path, size_t content_length,
-              ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              size_t content_length, ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params);
-  Result Post(const std::string &path, const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items, const std::string &boundary);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items,
-              const MultipartFormDataProviderItems &provider_items);
-
-  Result Put(const std::string &path);
-  Result Put(const std::string &path, const char *body, size_t content_length,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type);
-  Result Put(const std::string &path, size_t content_length,
-             ContentProvider content_provider, const std::string &content_type);
-  Result Put(const std::string &path,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             size_t content_length, ContentProvider content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params);
-  Result Put(const std::string &path, const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items, const std::string &boundary);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items);
-
-  Result Patch(const std::string &path);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type);
-  Result Patch(const std::string &path, size_t content_length,
-               ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               size_t content_length, ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-
-  Result Delete(const std::string &path);
-  Result Delete(const std::string &path, const Headers &headers);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type);
-
-  Result Options(const std::string &path);
-  Result Options(const std::string &path, const Headers &headers);
-
-  bool send(Request &req, Response &res, Error &error);
-  Result send(const Request &req);
-
-  void stop();
-
-  std::string host() const;
-  int port() const;
-
-  size_t is_socket_open() const;
-  socket_t socket() const;
-
-  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
-
-  void set_default_headers(Headers headers);
-
-  void
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  void set_address_family(int family);
-  void set_tcp_nodelay(bool on);
-  void set_socket_options(SocketOptions socket_options);
-
-  void set_connection_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void
-  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_basic_auth(const std::string &username, const std::string &password);
-  void set_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_digest_auth(const std::string &username,
-                       const std::string &password);
-#endif
-
-  void set_keep_alive(bool on);
-  void set_follow_location(bool on);
-
-  void set_url_encode(bool on);
-
-  void set_compress(bool on);
-
-  void set_decompress(bool on);
-
-  void set_interface(const std::string &intf);
-
-  void set_proxy(const std::string &host, int port);
-  void set_proxy_basic_auth(const std::string &username,
-                            const std::string &password);
-  void set_proxy_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_proxy_digest_auth(const std::string &username,
-                             const std::string &password);
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_ca_cert_path(const std::string &ca_cert_file_path,
-                        const std::string &ca_cert_dir_path = std::string());
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void enable_server_certificate_verification(bool enabled);
-#endif
-
-  void set_logger(Logger logger);
-
-protected:
-  struct Socket {
-    socket_t sock = INVALID_SOCKET;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    SSL *ssl = nullptr;
-#endif
-
-    bool is_open() const { return sock != INVALID_SOCKET; }
-  };
-
-  virtual bool create_and_connect_socket(Socket &socket, Error &error);
-
-  // All of:
-  //   shutdown_ssl
-  //   shutdown_socket
-  //   close_socket
-  // should ONLY be called when socket_mutex_ is locked.
-  // Also, shutdown_ssl and close_socket should also NOT be called concurrently
-  // with a DIFFERENT thread sending requests using that socket.
-  virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully);
-  void shutdown_socket(Socket &socket) const;
-  void close_socket(Socket &socket);
-
-  bool process_request(Stream &strm, Request &req, Response &res,
-                       bool close_connection, Error &error);
-
-  bool write_content_with_provider(Stream &strm, const Request &req,
-                                   Error &error) const;
-
-  void copy_settings(const ClientImpl &rhs);
-
-  // Socket endpoint information
-  const std::string host_;
-  const int port_;
-  const std::string host_and_port_;
-
-  // Current open socket
-  Socket socket_;
-  mutable std::mutex socket_mutex_;
-  std::recursive_mutex request_mutex_;
-
-  // These are all protected under socket_mutex
-  size_t socket_requests_in_flight_ = 0;
-  std::thread::id socket_requests_are_from_thread_ = std::thread::id();
-  bool socket_should_be_closed_when_request_is_done_ = false;
-
-  // Hostname-IP map
-  std::map<std::string, std::string> addr_map_;
-
-  // Default headers
-  Headers default_headers_;
-
-  // Header writer
-  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
-      detail::write_headers;
-
-  // Settings
-  std::string client_cert_path_;
-  std::string client_key_path_;
-
-  time_t connection_timeout_sec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND;
-  time_t connection_timeout_usec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND;
-  time_t read_timeout_sec_ = CPPHTTPLIB_READ_TIMEOUT_SECOND;
-  time_t read_timeout_usec_ = CPPHTTPLIB_READ_TIMEOUT_USECOND;
-  time_t write_timeout_sec_ = CPPHTTPLIB_WRITE_TIMEOUT_SECOND;
-  time_t write_timeout_usec_ = CPPHTTPLIB_WRITE_TIMEOUT_USECOND;
-
-  std::string basic_auth_username_;
-  std::string basic_auth_password_;
-  std::string bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string digest_auth_username_;
-  std::string digest_auth_password_;
-#endif
-
-  bool keep_alive_ = false;
-  bool follow_location_ = false;
-
-  bool url_encode_ = true;
-
-  int address_family_ = AF_UNSPEC;
-  bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
-  SocketOptions socket_options_ = nullptr;
-
-  bool compress_ = false;
-  bool decompress_ = true;
-
-  std::string interface_;
-
-  std::string proxy_host_;
-  int proxy_port_ = -1;
-
-  std::string proxy_basic_auth_username_;
-  std::string proxy_basic_auth_password_;
-  std::string proxy_bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string proxy_digest_auth_username_;
-  std::string proxy_digest_auth_password_;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  std::string ca_cert_file_path_;
-  std::string ca_cert_dir_path_;
-
-  X509_STORE *ca_cert_store_ = nullptr;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  bool server_certificate_verification_ = true;
-#endif
-
-  Logger logger_;
-
-private:
-  bool send_(Request &req, Response &res, Error &error);
-  Result send_(Request &&req);
-
-  socket_t create_client_socket(Error &error) const;
-  bool read_response_line(Stream &strm, const Request &req,
-                          Response &res) const;
-  bool write_request(Stream &strm, Request &req, bool close_connection,
-                     Error &error);
-  bool redirect(Request &req, Response &res, Error &error);
-  bool handle_request(Stream &strm, Request &req, Response &res,
-                      bool close_connection, Error &error);
-  std::unique_ptr<Response> send_with_content_provider(
-      Request &req, const char *body, size_t content_length,
-      ContentProvider content_provider,
-      ContentProviderWithoutLength content_provider_without_length,
-      const std::string &content_type, Error &error);
-  Result send_with_content_provider(
-      const std::string &method, const std::string &path,
-      const Headers &headers, const char *body, size_t content_length,
-      ContentProvider content_provider,
-      ContentProviderWithoutLength content_provider_without_length,
-      const std::string &content_type);
-  ContentProviderWithoutLength get_multipart_content_provider(
-      const std::string &boundary, const MultipartFormDataItems &items,
-      const MultipartFormDataProviderItems &provider_items) const;
-
-  std::string adjust_host_string(const std::string &host) const;
-
-  virtual bool process_socket(const Socket &socket,
-                              std::function<bool(Stream &strm)> callback);
-  virtual bool is_ssl() const;
-};
-
-class Client {
-public:
-  // Universal interface
-  explicit Client(const std::string &scheme_host_port);
-
-  explicit Client(const std::string &scheme_host_port,
-                  const std::string &client_cert_path,
-                  const std::string &client_key_path);
-
-  // HTTP only interface
-  explicit Client(const std::string &host, int port);
-
-  explicit Client(const std::string &host, int port,
-                  const std::string &client_cert_path,
-                  const std::string &client_key_path);
-
-  Client(Client &&) = default;
-
-  ~Client();
-
-  bool is_valid() const;
-
-  Result Get(const std::string &path);
-  Result Get(const std::string &path, const Headers &headers);
-  Result Get(const std::string &path, Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             Progress progress);
-  Result Get(const std::string &path, ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, const Headers &headers,
-             ContentReceiver content_receiver, Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler,
-             ContentReceiver content_receiver);
-  Result Get(const std::string &path, const Headers &headers,
-             ResponseHandler response_handler, ContentReceiver content_receiver,
-             Progress progress);
-  Result Get(const std::string &path, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress);
-
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ContentReceiver content_receiver,
-             Progress progress = nullptr);
-  Result Get(const std::string &path, const Params &params,
-             const Headers &headers, ResponseHandler response_handler,
-             ContentReceiver content_receiver, Progress progress = nullptr);
-
-  Result Head(const std::string &path);
-  Result Head(const std::string &path, const Headers &headers);
-
-  Result Post(const std::string &path);
-  Result Post(const std::string &path, const Headers &headers);
-  Result Post(const std::string &path, const char *body, size_t content_length,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers, const char *body,
-              size_t content_length, const std::string &content_type);
-  Result Post(const std::string &path, const std::string &body,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              const std::string &body, const std::string &content_type);
-  Result Post(const std::string &path, size_t content_length,
-              ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              size_t content_length, ContentProvider content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Headers &headers,
-              ContentProviderWithoutLength content_provider,
-              const std::string &content_type);
-  Result Post(const std::string &path, const Params &params);
-  Result Post(const std::string &path, const Headers &headers,
-              const Params &params);
-  Result Post(const std::string &path, const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items, const std::string &boundary);
-  Result Post(const std::string &path, const Headers &headers,
-              const MultipartFormDataItems &items,
-              const MultipartFormDataProviderItems &provider_items);
-
-  Result Put(const std::string &path);
-  Result Put(const std::string &path, const char *body, size_t content_length,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers, const char *body,
-             size_t content_length, const std::string &content_type);
-  Result Put(const std::string &path, const std::string &body,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             const std::string &body, const std::string &content_type);
-  Result Put(const std::string &path, size_t content_length,
-             ContentProvider content_provider, const std::string &content_type);
-  Result Put(const std::string &path,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             size_t content_length, ContentProvider content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Headers &headers,
-             ContentProviderWithoutLength content_provider,
-             const std::string &content_type);
-  Result Put(const std::string &path, const Params &params);
-  Result Put(const std::string &path, const Headers &headers,
-             const Params &params);
-  Result Put(const std::string &path, const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items, const std::string &boundary);
-  Result Put(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items);
-
-  Result Patch(const std::string &path);
-  Result Patch(const std::string &path, const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const char *body, size_t content_length,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const std::string &body,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               const std::string &body, const std::string &content_type);
-  Result Patch(const std::string &path, size_t content_length,
-               ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               size_t content_length, ContentProvider content_provider,
-               const std::string &content_type);
-  Result Patch(const std::string &path, const Headers &headers,
-               ContentProviderWithoutLength content_provider,
-               const std::string &content_type);
-
-  Result Delete(const std::string &path);
-  Result Delete(const std::string &path, const Headers &headers);
-  Result Delete(const std::string &path, const char *body,
-                size_t content_length, const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const char *body, size_t content_length,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const std::string &body,
-                const std::string &content_type);
-  Result Delete(const std::string &path, const Headers &headers,
-                const std::string &body, const std::string &content_type);
-
-  Result Options(const std::string &path);
-  Result Options(const std::string &path, const Headers &headers);
-
-  bool send(Request &req, Response &res, Error &error);
-  Result send(const Request &req);
-
-  void stop();
-
-  std::string host() const;
-  int port() const;
-
-  size_t is_socket_open() const;
-  socket_t socket() const;
-
-  void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
-
-  void set_default_headers(Headers headers);
-
-  void
-  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
-
-  void set_address_family(int family);
-  void set_tcp_nodelay(bool on);
-  void set_socket_options(SocketOptions socket_options);
-
-  void set_connection_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void
-  set_connection_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_read_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_read_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_write_timeout(time_t sec, time_t usec = 0);
-  template <class Rep, class Period>
-  void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
-
-  void set_basic_auth(const std::string &username, const std::string &password);
-  void set_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_digest_auth(const std::string &username,
-                       const std::string &password);
-#endif
-
-  void set_keep_alive(bool on);
-  void set_follow_location(bool on);
-
-  void set_url_encode(bool on);
-
-  void set_compress(bool on);
-
-  void set_decompress(bool on);
-
-  void set_interface(const std::string &intf);
-
-  void set_proxy(const std::string &host, int port);
-  void set_proxy_basic_auth(const std::string &username,
-                            const std::string &password);
-  void set_proxy_bearer_token_auth(const std::string &token);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_proxy_digest_auth(const std::string &username,
-                             const std::string &password);
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void enable_server_certificate_verification(bool enabled);
-#endif
-
-  void set_logger(Logger logger);
-
-  // SSL
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_ca_cert_path(const std::string &ca_cert_file_path,
-                        const std::string &ca_cert_dir_path = std::string());
-
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  void load_ca_cert_store(const char *ca_cert, std::size_t size);
-
-  long get_openssl_verify_result() const;
-
-  SSL_CTX *ssl_context() const;
-#endif
-
-private:
-  std::unique_ptr<ClientImpl> cli_;
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  bool is_ssl_ = false;
-#endif
-};
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-class SSLServer : public Server {
-public:
-  SSLServer(const char *cert_path, const char *private_key_path,
-            const char *client_ca_cert_file_path = nullptr,
-            const char *client_ca_cert_dir_path = nullptr,
-            const char *private_key_password = nullptr);
-
-  SSLServer(X509 *cert, EVP_PKEY *private_key,
-            X509_STORE *client_ca_cert_store = nullptr);
-
-  SSLServer(
-      const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback);
-
-  ~SSLServer() override;
-
-  bool is_valid() const override;
-
-  SSL_CTX *ssl_context() const;
-
-private:
-  bool process_and_close_socket(socket_t sock) override;
-
-  SSL_CTX *ctx_;
-  std::mutex ctx_mutex_;
-};
-
-class SSLClient : public ClientImpl {
-public:
-  explicit SSLClient(const std::string &host);
-
-  explicit SSLClient(const std::string &host, int port);
-
-  explicit SSLClient(const std::string &host, int port,
-                     const std::string &client_cert_path,
-                     const std::string &client_key_path);
-
-  explicit SSLClient(const std::string &host, int port, X509 *client_cert,
-                     EVP_PKEY *client_key);
-
-  ~SSLClient() override;
-
-  bool is_valid() const override;
-
-  void set_ca_cert_store(X509_STORE *ca_cert_store);
-  void load_ca_cert_store(const char *ca_cert, std::size_t size);
-
-  long get_openssl_verify_result() const;
-
-  SSL_CTX *ssl_context() const;
-
-private:
-  bool create_and_connect_socket(Socket &socket, Error &error) override;
-  void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override;
-  void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully);
-
-  bool process_socket(const Socket &socket,
-                      std::function<bool(Stream &strm)> callback) override;
-  bool is_ssl() const override;
-
-  bool connect_with_proxy(Socket &sock, Response &res, bool &success,
-                          Error &error);
-  bool initialize_ssl(Socket &socket, Error &error);
-
-  bool load_certs();
-
-  bool verify_host(X509 *server_cert) const;
-  bool verify_host_with_subject_alt_name(X509 *server_cert) const;
-  bool verify_host_with_common_name(X509 *server_cert) const;
-  bool check_host_name(const char *pattern, size_t pattern_len) const;
-
-  SSL_CTX *ctx_;
-  std::mutex ctx_mutex_;
-  std::once_flag initialize_cert_;
-
-  std::vector<std::string> host_components_;
-
-  long verify_result_ = 0;
-
-  friend class ClientImpl;
-};
-#endif
-
-/*
- * Implementation of template methods.
- */
-
-namespace detail {
-
-template <typename T, typename U>
-inline void duration_to_sec_and_usec(const T &duration, U callback) {
-  auto sec = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
-  auto usec = std::chrono::duration_cast<std::chrono::microseconds>(
-                  duration - std::chrono::seconds(sec))
-                  .count();
-  callback(static_cast<time_t>(sec), static_cast<time_t>(usec));
-}
-
-inline uint64_t get_header_value_u64(const Headers &headers,
-                                     const std::string &key, size_t id,
-                                     uint64_t def) {
-  auto rng = headers.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) {
-    return std::strtoull(it->second.data(), nullptr, 10);
-  }
-  return def;
-}
-
-} // namespace detail
-
-inline uint64_t Request::get_header_value_u64(const std::string &key,
-                                              size_t id) const {
-  return detail::get_header_value_u64(headers, key, id, 0);
-}
-
-inline uint64_t Response::get_header_value_u64(const std::string &key,
-                                               size_t id) const {
-  return detail::get_header_value_u64(headers, key, id, 0);
-}
-
-template <typename... Args>
-inline ssize_t Stream::write_format(const char *fmt, const Args &...args) {
-  const auto bufsiz = 2048;
-  std::array<char, bufsiz> buf{};
-
-  auto sn = snprintf(buf.data(), buf.size() - 1, fmt, args...);
-  if (sn <= 0) { return sn; }
-
-  auto n = static_cast<size_t>(sn);
-
-  if (n >= buf.size() - 1) {
-    std::vector<char> glowable_buf(buf.size());
-
-    while (n >= glowable_buf.size() - 1) {
-      glowable_buf.resize(glowable_buf.size() * 2);
-      n = static_cast<size_t>(
-          snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...));
-    }
-    return write(&glowable_buf[0], n);
-  } else {
-    return write(buf.data(), n);
-  }
-}
-
-inline void default_socket_options(socket_t sock) {
-  int yes = 1;
-#ifdef _WIN32
-  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-             reinterpret_cast<const char *>(&yes), sizeof(yes));
-  setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
-             reinterpret_cast<const char *>(&yes), sizeof(yes));
-#else
-#ifdef SO_REUSEPORT
-  setsockopt(sock, SOL_SOCKET, SO_REUSEPORT,
-             reinterpret_cast<const void *>(&yes), sizeof(yes));
-#else
-  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-             reinterpret_cast<const void *>(&yes), sizeof(yes));
-#endif
-#endif
-}
-
-inline const char *status_message(int status) {
-  switch (status) {
-  case StatusCode::Continue_100: return "Continue";
-  case StatusCode::SwitchingProtocol_101: return "Switching Protocol";
-  case StatusCode::Processing_102: return "Processing";
-  case StatusCode::EarlyHints_103: return "Early Hints";
-  case StatusCode::OK_200: return "OK";
-  case StatusCode::Created_201: return "Created";
-  case StatusCode::Accepted_202: return "Accepted";
-  case StatusCode::NonAuthoritativeInformation_203:
-    return "Non-Authoritative Information";
-  case StatusCode::NoContent_204: return "No Content";
-  case StatusCode::ResetContent_205: return "Reset Content";
-  case StatusCode::PartialContent_206: return "Partial Content";
-  case StatusCode::MultiStatus_207: return "Multi-Status";
-  case StatusCode::AlreadyReported_208: return "Already Reported";
-  case StatusCode::IMUsed_226: return "IM Used";
-  case StatusCode::MultipleChoices_300: return "Multiple Choices";
-  case StatusCode::MovedPermanently_301: return "Moved Permanently";
-  case StatusCode::Found_302: return "Found";
-  case StatusCode::SeeOther_303: return "See Other";
-  case StatusCode::NotModified_304: return "Not Modified";
-  case StatusCode::UseProxy_305: return "Use Proxy";
-  case StatusCode::unused_306: return "unused";
-  case StatusCode::TemporaryRedirect_307: return "Temporary Redirect";
-  case StatusCode::PermanentRedirect_308: return "Permanent Redirect";
-  case StatusCode::BadRequest_400: return "Bad Request";
-  case StatusCode::Unauthorized_401: return "Unauthorized";
-  case StatusCode::PaymentRequired_402: return "Payment Required";
-  case StatusCode::Forbidden_403: return "Forbidden";
-  case StatusCode::NotFound_404: return "Not Found";
-  case StatusCode::MethodNotAllowed_405: return "Method Not Allowed";
-  case StatusCode::NotAcceptable_406: return "Not Acceptable";
-  case StatusCode::ProxyAuthenticationRequired_407:
-    return "Proxy Authentication Required";
-  case StatusCode::RequestTimeout_408: return "Request Timeout";
-  case StatusCode::Conflict_409: return "Conflict";
-  case StatusCode::Gone_410: return "Gone";
-  case StatusCode::LengthRequired_411: return "Length Required";
-  case StatusCode::PreconditionFailed_412: return "Precondition Failed";
-  case StatusCode::PayloadTooLarge_413: return "Payload Too Large";
-  case StatusCode::UriTooLong_414: return "URI Too Long";
-  case StatusCode::UnsupportedMediaType_415: return "Unsupported Media Type";
-  case StatusCode::RangeNotSatisfiable_416: return "Range Not Satisfiable";
-  case StatusCode::ExpectationFailed_417: return "Expectation Failed";
-  case StatusCode::ImATeapot_418: return "I'm a teapot";
-  case StatusCode::MisdirectedRequest_421: return "Misdirected Request";
-  case StatusCode::UnprocessableContent_422: return "Unprocessable Content";
-  case StatusCode::Locked_423: return "Locked";
-  case StatusCode::FailedDependency_424: return "Failed Dependency";
-  case StatusCode::TooEarly_425: return "Too Early";
-  case StatusCode::UpgradeRequired_426: return "Upgrade Required";
-  case StatusCode::PreconditionRequired_428: return "Precondition Required";
-  case StatusCode::TooManyRequests_429: return "Too Many Requests";
-  case StatusCode::RequestHeaderFieldsTooLarge_431:
-    return "Request Header Fields Too Large";
-  case StatusCode::UnavailableForLegalReasons_451:
-    return "Unavailable For Legal Reasons";
-  case StatusCode::NotImplemented_501: return "Not Implemented";
-  case StatusCode::BadGateway_502: return "Bad Gateway";
-  case StatusCode::ServiceUnavailable_503: return "Service Unavailable";
-  case StatusCode::GatewayTimeout_504: return "Gateway Timeout";
-  case StatusCode::HttpVersionNotSupported_505:
-    return "HTTP Version Not Supported";
-  case StatusCode::VariantAlsoNegotiates_506: return "Variant Also Negotiates";
-  case StatusCode::InsufficientStorage_507: return "Insufficient Storage";
-  case StatusCode::LoopDetected_508: return "Loop Detected";
-  case StatusCode::NotExtended_510: return "Not Extended";
-  case StatusCode::NetworkAuthenticationRequired_511:
-    return "Network Authentication Required";
-
-  default:
-  case StatusCode::InternalServerError_500: return "Internal Server Error";
-  }
-}
-
-inline std::string get_bearer_token_auth(const Request &req) {
-  if (req.has_header("Authorization")) {
-    static std::string BearerHeaderPrefix = "Bearer ";
-    return req.get_header_value("Authorization")
-        .substr(BearerHeaderPrefix.length());
-  }
-  return "";
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
-  return *this;
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
-  return *this;
-}
-
-template <class Rep, class Period>
-inline Server &
-Server::set_idle_interval(const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_idle_interval(sec, usec); });
-  return *this;
-}
-
-inline std::string to_string(const Error error) {
-  switch (error) {
-  case Error::Success: return "Success (no error)";
-  case Error::Connection: return "Could not establish connection";
-  case Error::BindIPAddress: return "Failed to bind IP address";
-  case Error::Read: return "Failed to read connection";
-  case Error::Write: return "Failed to write connection";
-  case Error::ExceedRedirectCount: return "Maximum redirect count exceeded";
-  case Error::Canceled: return "Connection handling canceled";
-  case Error::SSLConnection: return "SSL connection failed";
-  case Error::SSLLoadingCerts: return "SSL certificate loading failed";
-  case Error::SSLServerVerification: return "SSL server verification failed";
-  case Error::UnsupportedMultipartBoundaryChars:
-    return "Unsupported HTTP multipart boundary characters";
-  case Error::Compression: return "Compression failed";
-  case Error::ConnectionTimeout: return "Connection timed out";
-  case Error::ProxyConnection: return "Proxy connection failed";
-  case Error::Unknown: return "Unknown";
-  default: break;
-  }
-
-  return "Invalid";
-}
-
-inline std::ostream &operator<<(std::ostream &os, const Error &obj) {
-  os << to_string(obj);
-  os << " (" << static_cast<std::underlying_type<Error>::type>(obj) << ')';
-  return os;
-}
-
-inline uint64_t Result::get_request_header_value_u64(const std::string &key,
-                                                     size_t id) const {
-  return detail::get_header_value_u64(request_headers_, key, id, 0);
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_connection_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(duration, [&](time_t sec, time_t usec) {
-    set_connection_timeout(sec, usec);
-  });
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_read_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); });
-}
-
-template <class Rep, class Period>
-inline void ClientImpl::set_write_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  detail::duration_to_sec_and_usec(
-      duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); });
-}
-
-template <class Rep, class Period>
-inline void Client::set_connection_timeout(
-    const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_connection_timeout(duration);
-}
-
-template <class Rep, class Period>
-inline void
-Client::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_read_timeout(duration);
-}
-
-template <class Rep, class Period>
-inline void
-Client::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
-  cli_->set_write_timeout(duration);
-}
-
-/*
- * Forward declarations and types that will be part of the .h file if split into
- * .h + .cc.
- */
-
-std::string hosted_at(const std::string &hostname);
-
-void hosted_at(const std::string &hostname, std::vector<std::string> &addrs);
-
-std::string append_query_params(const std::string &path, const Params &params);
-
-std::pair<std::string, std::string> make_range_header(const Ranges &ranges);
-
-std::pair<std::string, std::string>
-make_basic_authentication_header(const std::string &username,
-                                 const std::string &password,
-                                 bool is_proxy = false);
-
-namespace detail {
-
-std::string encode_query_param(const std::string &value);
-
-std::string decode_url(const std::string &s, bool convert_plus_to_space);
-
-void read_file(const std::string &path, std::string &out);
-
-std::string trim_copy(const std::string &s);
-
-void split(const char *b, const char *e, char d,
-           std::function<void(const char *, const char *)> fn);
-
-void split(const char *b, const char *e, char d, size_t m,
-           std::function<void(const char *, const char *)> fn);
-
-bool process_client_socket(socket_t sock, time_t read_timeout_sec,
-                           time_t read_timeout_usec, time_t write_timeout_sec,
-                           time_t write_timeout_usec,
-                           std::function<bool(Stream &)> callback);
-
-socket_t create_client_socket(
-    const std::string &host, const std::string &ip, int port,
-    int address_family, bool tcp_nodelay, SocketOptions socket_options,
-    time_t connection_timeout_sec, time_t connection_timeout_usec,
-    time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
-    time_t write_timeout_usec, const std::string &intf, Error &error);
-
-const char *get_header_value(const Headers &headers, const std::string &key,
-                             size_t id = 0, const char *def = nullptr);
-
-std::string params_to_query_str(const Params &params);
-
-void parse_query_text(const std::string &s, Params &params);
-
-bool parse_multipart_boundary(const std::string &content_type,
-                              std::string &boundary);
-
-bool parse_range_header(const std::string &s, Ranges &ranges);
-
-int close_socket(socket_t sock);
-
-ssize_t send_socket(socket_t sock, const void *ptr, size_t size, int flags);
-
-ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags);
-
-enum class EncodingType { None = 0, Gzip, Brotli };
-
-EncodingType encoding_type(const Request &req, const Response &res);
-
-class BufferStream : public Stream {
-public:
-  BufferStream() = default;
-  ~BufferStream() override = default;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-
-  const std::string &get_buffer() const;
-
-private:
-  std::string buffer;
-  size_t position = 0;
-};
-
-class compressor {
-public:
-  virtual ~compressor() = default;
-
-  typedef std::function<bool(const char *data, size_t data_len)> Callback;
-  virtual bool compress(const char *data, size_t data_length, bool last,
-                        Callback callback) = 0;
-};
-
-class decompressor {
-public:
-  virtual ~decompressor() = default;
-
-  virtual bool is_valid() const = 0;
-
-  typedef std::function<bool(const char *data, size_t data_len)> Callback;
-  virtual bool decompress(const char *data, size_t data_length,
-                          Callback callback) = 0;
-};
-
-class nocompressor : public compressor {
-public:
-  ~nocompressor() override = default;
-
-  bool compress(const char *data, size_t data_length, bool /*last*/,
-                Callback callback) override;
-};
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-class gzip_compressor : public compressor {
-public:
-  gzip_compressor();
-  ~gzip_compressor() override;
-
-  bool compress(const char *data, size_t data_length, bool last,
-                Callback callback) override;
-
-private:
-  bool is_valid_ = false;
-  z_stream strm_;
-};
-
-class gzip_decompressor : public decompressor {
-public:
-  gzip_decompressor();
-  ~gzip_decompressor() override;
-
-  bool is_valid() const override;
-
-  bool decompress(const char *data, size_t data_length,
-                  Callback callback) override;
-
-private:
-  bool is_valid_ = false;
-  z_stream strm_;
-};
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-class brotli_compressor : public compressor {
-public:
-  brotli_compressor();
-  ~brotli_compressor();
-
-  bool compress(const char *data, size_t data_length, bool last,
-                Callback callback) override;
-
-private:
-  BrotliEncoderState *state_ = nullptr;
-};
-
-class brotli_decompressor : public decompressor {
-public:
-  brotli_decompressor();
-  ~brotli_decompressor();
-
-  bool is_valid() const override;
-
-  bool decompress(const char *data, size_t data_length,
-                  Callback callback) override;
-
-private:
-  BrotliDecoderResult decoder_r;
-  BrotliDecoderState *decoder_s = nullptr;
-};
-#endif
-
-// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer`
-// to store data. The call can set memory on stack for performance.
-class stream_line_reader {
-public:
-  stream_line_reader(Stream &strm, char *fixed_buffer,
-                     size_t fixed_buffer_size);
-  const char *ptr() const;
-  size_t size() const;
-  bool end_with_crlf() const;
-  bool getline();
-
-private:
-  void append(char c);
-
-  Stream &strm_;
-  char *fixed_buffer_;
-  const size_t fixed_buffer_size_;
-  size_t fixed_buffer_used_size_ = 0;
-  std::string glowable_buffer_;
-};
-
-class mmap {
-public:
-  mmap(const char *path);
-  ~mmap();
-
-  bool open(const char *path);
-  void close();
-
-  bool is_open() const;
-  size_t size() const;
-  const char *data() const;
-
-private:
-#if defined(_WIN32)
-  HANDLE hFile_;
-  HANDLE hMapping_;
-#else
-  int fd_;
-#endif
-  size_t size_;
-  void *addr_;
-};
-
-} // namespace detail
-
-// ----------------------------------------------------------------------------
-
-/*
- * Implementation that will be part of the .cc file if split into .h + .cc.
- */
-
-namespace detail {
-
-inline bool is_hex(char c, int &v) {
-  if (0x20 <= c && isdigit(c)) {
-    v = c - '0';
-    return true;
-  } else if ('A' <= c && c <= 'F') {
-    v = c - 'A' + 10;
-    return true;
-  } else if ('a' <= c && c <= 'f') {
-    v = c - 'a' + 10;
-    return true;
-  }
-  return false;
-}
-
-inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
-                          int &val) {
-  if (i >= s.size()) { return false; }
-
-  val = 0;
-  for (; cnt; i++, cnt--) {
-    if (!s[i]) { return false; }
-    auto v = 0;
-    if (is_hex(s[i], v)) {
-      val = val * 16 + v;
-    } else {
-      return false;
-    }
-  }
-  return true;
-}
-
-inline std::string from_i_to_hex(size_t n) {
-  static const auto charset = "0123456789abcdef";
-  std::string ret;
-  do {
-    ret = charset[n & 15] + ret;
-    n >>= 4;
-  } while (n > 0);
-  return ret;
-}
-
-inline size_t to_utf8(int code, char *buff) {
-  if (code < 0x0080) {
-    buff[0] = static_cast<char>(code & 0x7F);
-    return 1;
-  } else if (code < 0x0800) {
-    buff[0] = static_cast<char>(0xC0 | ((code >> 6) & 0x1F));
-    buff[1] = static_cast<char>(0x80 | (code & 0x3F));
-    return 2;
-  } else if (code < 0xD800) {
-    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
-    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
-    return 3;
-  } else if (code < 0xE000) { // D800 - DFFF is invalid...
-    return 0;
-  } else if (code < 0x10000) {
-    buff[0] = static_cast<char>(0xE0 | ((code >> 12) & 0xF));
-    buff[1] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | (code & 0x3F));
-    return 3;
-  } else if (code < 0x110000) {
-    buff[0] = static_cast<char>(0xF0 | ((code >> 18) & 0x7));
-    buff[1] = static_cast<char>(0x80 | ((code >> 12) & 0x3F));
-    buff[2] = static_cast<char>(0x80 | ((code >> 6) & 0x3F));
-    buff[3] = static_cast<char>(0x80 | (code & 0x3F));
-    return 4;
-  }
-
-  // NOTREACHED
-  return 0;
-}
-
-// NOTE: This code came up with the following stackoverflow post:
-// https://stackoverflow.com/questions/180947/base64-decode-snippet-in-c
-inline std::string base64_encode(const std::string &in) {
-  static const auto lookup =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  std::string out;
-  out.reserve(in.size());
-
-  auto val = 0;
-  auto valb = -6;
-
-  for (auto c : in) {
-    val = (val << 8) + static_cast<uint8_t>(c);
-    valb += 8;
-    while (valb >= 0) {
-      out.push_back(lookup[(val >> valb) & 0x3F]);
-      valb -= 6;
-    }
-  }
-
-  if (valb > -6) { out.push_back(lookup[((val << 8) >> (valb + 8)) & 0x3F]); }
-
-  while (out.size() % 4) {
-    out.push_back('=');
-  }
-
-  return out;
-}
-
-inline bool is_file(const std::string &path) {
-#ifdef _WIN32
-  return _access_s(path.c_str(), 0) == 0;
-#else
-  struct stat st;
-  return stat(path.c_str(), &st) >= 0 && S_ISREG(st.st_mode);
-#endif
-}
-
-inline bool is_dir(const std::string &path) {
-  struct stat st;
-  return stat(path.c_str(), &st) >= 0 && S_ISDIR(st.st_mode);
-}
-
-inline bool is_valid_path(const std::string &path) {
-  size_t level = 0;
-  size_t i = 0;
-
-  // Skip slash
-  while (i < path.size() && path[i] == '/') {
-    i++;
-  }
-
-  while (i < path.size()) {
-    // Read component
-    auto beg = i;
-    while (i < path.size() && path[i] != '/') {
-      if (path[i] == '\0') {
-        return false;
-      } else if (path[i] == '\\') {
-        return false;
-      }
-      i++;
-    }
-
-    auto len = i - beg;
-    assert(len > 0);
-
-    if (!path.compare(beg, len, ".")) {
-      ;
-    } else if (!path.compare(beg, len, "..")) {
-      if (level == 0) { return false; }
-      level--;
-    } else {
-      level++;
-    }
-
-    // Skip slash
-    while (i < path.size() && path[i] == '/') {
-      i++;
-    }
-  }
-
-  return true;
-}
-
-inline std::string encode_query_param(const std::string &value) {
-  std::ostringstream escaped;
-  escaped.fill('0');
-  escaped << std::hex;
-
-  for (auto c : value) {
-    if (std::isalnum(static_cast<uint8_t>(c)) || c == '-' || c == '_' ||
-        c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' ||
-        c == ')') {
-      escaped << c;
-    } else {
-      escaped << std::uppercase;
-      escaped << '%' << std::setw(2)
-              << static_cast<int>(static_cast<unsigned char>(c));
-      escaped << std::nouppercase;
-    }
-  }
-
-  return escaped.str();
-}
-
-inline std::string encode_url(const std::string &s) {
-  std::string result;
-  result.reserve(s.size());
-
-  for (size_t i = 0; s[i]; i++) {
-    switch (s[i]) {
-    case ' ': result += "%20"; break;
-    case '+': result += "%2B"; break;
-    case '\r': result += "%0D"; break;
-    case '\n': result += "%0A"; break;
-    case '\'': result += "%27"; break;
-    case ',': result += "%2C"; break;
-    // case ':': result += "%3A"; break; // ok? probably...
-    case ';': result += "%3B"; break;
-    default:
-      auto c = static_cast<uint8_t>(s[i]);
-      if (c >= 0x80) {
-        result += '%';
-        char hex[4];
-        auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c);
-        assert(len == 2);
-        result.append(hex, static_cast<size_t>(len));
-      } else {
-        result += s[i];
-      }
-      break;
-    }
-  }
-
-  return result;
-}
-
-inline std::string decode_url(const std::string &s,
-                              bool convert_plus_to_space) {
-  std::string result;
-
-  for (size_t i = 0; i < s.size(); i++) {
-    if (s[i] == '%' && i + 1 < s.size()) {
-      if (s[i + 1] == 'u') {
-        auto val = 0;
-        if (from_hex_to_i(s, i + 2, 4, val)) {
-          // 4 digits Unicode codes
-          char buff[4];
-          size_t len = to_utf8(val, buff);
-          if (len > 0) { result.append(buff, len); }
-          i += 5; // 'u0000'
-        } else {
-          result += s[i];
-        }
-      } else {
-        auto val = 0;
-        if (from_hex_to_i(s, i + 1, 2, val)) {
-          // 2 digits hex codes
-          result += static_cast<char>(val);
-          i += 2; // '00'
-        } else {
-          result += s[i];
-        }
-      }
-    } else if (convert_plus_to_space && s[i] == '+') {
-      result += ' ';
-    } else {
-      result += s[i];
-    }
-  }
-
-  return result;
-}
-
-inline void read_file(const std::string &path, std::string &out) {
-  std::ifstream fs(path, std::ios_base::binary);
-  fs.seekg(0, std::ios_base::end);
-  auto size = fs.tellg();
-  fs.seekg(0);
-  out.resize(static_cast<size_t>(size));
-  fs.read(&out[0], static_cast<std::streamsize>(size));
-}
-
-inline std::string file_extension(const std::string &path) {
-  std::smatch m;
-  static auto re = std::regex("\\.([a-zA-Z0-9]+)$");
-  if (std::regex_search(path, m, re)) { return m[1].str(); }
-  return std::string();
-}
-
-inline bool is_space_or_tab(char c) { return c == ' ' || c == '\t'; }
-
-inline std::pair<size_t, size_t> trim(const char *b, const char *e, size_t left,
-                                      size_t right) {
-  while (b + left < e && is_space_or_tab(b[left])) {
-    left++;
-  }
-  while (right > 0 && is_space_or_tab(b[right - 1])) {
-    right--;
-  }
-  return std::make_pair(left, right);
-}
-
-inline std::string trim_copy(const std::string &s) {
-  auto r = trim(s.data(), s.data() + s.size(), 0, s.size());
-  return s.substr(r.first, r.second - r.first);
-}
-
-inline std::string trim_double_quotes_copy(const std::string &s) {
-  if (s.length() >= 2 && s.front() == '"' && s.back() == '"') {
-    return s.substr(1, s.size() - 2);
-  }
-  return s;
-}
-
-inline void split(const char *b, const char *e, char d,
-                  std::function<void(const char *, const char *)> fn) {
-  return split(b, e, d, (std::numeric_limits<size_t>::max)(), std::move(fn));
-}
-
-inline void split(const char *b, const char *e, char d, size_t m,
-                  std::function<void(const char *, const char *)> fn) {
-  size_t i = 0;
-  size_t beg = 0;
-  size_t count = 1;
-
-  while (e ? (b + i < e) : (b[i] != '\0')) {
-    if (b[i] == d && count < m) {
-      auto r = trim(b, e, beg, i);
-      if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
-      beg = i + 1;
-      count++;
-    }
-    i++;
-  }
-
-  if (i) {
-    auto r = trim(b, e, beg, i);
-    if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
-  }
-}
-
-inline stream_line_reader::stream_line_reader(Stream &strm, char *fixed_buffer,
-                                              size_t fixed_buffer_size)
-    : strm_(strm), fixed_buffer_(fixed_buffer),
-      fixed_buffer_size_(fixed_buffer_size) {}
-
-inline const char *stream_line_reader::ptr() const {
-  if (glowable_buffer_.empty()) {
-    return fixed_buffer_;
-  } else {
-    return glowable_buffer_.data();
-  }
-}
-
-inline size_t stream_line_reader::size() const {
-  if (glowable_buffer_.empty()) {
-    return fixed_buffer_used_size_;
-  } else {
-    return glowable_buffer_.size();
-  }
-}
-
-inline bool stream_line_reader::end_with_crlf() const {
-  auto end = ptr() + size();
-  return size() >= 2 && end[-2] == '\r' && end[-1] == '\n';
-}
-
-inline bool stream_line_reader::getline() {
-  fixed_buffer_used_size_ = 0;
-  glowable_buffer_.clear();
-
-  for (size_t i = 0;; i++) {
-    char byte;
-    auto n = strm_.read(&byte, 1);
-
-    if (n < 0) {
-      return false;
-    } else if (n == 0) {
-      if (i == 0) {
-        return false;
-      } else {
-        break;
-      }
-    }
-
-    append(byte);
-
-    if (byte == '\n') { break; }
-  }
-
-  return true;
-}
-
-inline void stream_line_reader::append(char c) {
-  if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) {
-    fixed_buffer_[fixed_buffer_used_size_++] = c;
-    fixed_buffer_[fixed_buffer_used_size_] = '\0';
-  } else {
-    if (glowable_buffer_.empty()) {
-      assert(fixed_buffer_[fixed_buffer_used_size_] == '\0');
-      glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_);
-    }
-    glowable_buffer_ += c;
-  }
-}
-
-inline mmap::mmap(const char *path)
-#if defined(_WIN32)
-    : hFile_(NULL), hMapping_(NULL)
-#else
-    : fd_(-1)
-#endif
-      ,
-      size_(0), addr_(nullptr) {
-  open(path);
-}
-
-inline mmap::~mmap() { close(); }
-
-inline bool mmap::open(const char *path) {
-  close();
-
-#if defined(_WIN32)
-  hFile_ = ::CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL,
-                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-  if (hFile_ == INVALID_HANDLE_VALUE) { return false; }
-
-  size_ = ::GetFileSize(hFile_, NULL);
-
-  hMapping_ = ::CreateFileMapping(hFile_, NULL, PAGE_READONLY, 0, 0, NULL);
-
-  if (hMapping_ == NULL) {
-    close();
-    return false;
-  }
-
-  addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0);
-#else
-  fd_ = ::open(path, O_RDONLY);
-  if (fd_ == -1) { return false; }
-
-  struct stat sb;
-  if (fstat(fd_, &sb) == -1) {
-    close();
-    return false;
-  }
-  size_ = static_cast<size_t>(sb.st_size);
-
-  addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0);
-#endif
-
-  if (addr_ == nullptr) {
-    close();
-    return false;
-  }
-
-  return true;
-}
-
-inline bool mmap::is_open() const { return addr_ != nullptr; }
-
-inline size_t mmap::size() const { return size_; }
-
-inline const char *mmap::data() const {
-  return static_cast<const char *>(addr_);
-}
-
-inline void mmap::close() {
-#if defined(_WIN32)
-  if (addr_) {
-    ::UnmapViewOfFile(addr_);
-    addr_ = nullptr;
-  }
-
-  if (hMapping_) {
-    ::CloseHandle(hMapping_);
-    hMapping_ = NULL;
-  }
-
-  if (hFile_ != INVALID_HANDLE_VALUE) {
-    ::CloseHandle(hFile_);
-    hFile_ = INVALID_HANDLE_VALUE;
-  }
-#else
-  if (addr_ != nullptr) {
-    munmap(addr_, size_);
-    addr_ = nullptr;
-  }
-
-  if (fd_ != -1) {
-    ::close(fd_);
-    fd_ = -1;
-  }
-#endif
-  size_ = 0;
-}
-inline int close_socket(socket_t sock) {
-#ifdef _WIN32
-  return closesocket(sock);
-#else
-  return close(sock);
-#endif
-}
-
-template <typename T> inline ssize_t handle_EINTR(T fn) {
-  ssize_t res = 0;
-  while (true) {
-    res = fn();
-    if (res < 0 && errno == EINTR) { continue; }
-    break;
-  }
-  return res;
-}
-
-inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) {
-  return handle_EINTR([&]() {
-    return recv(sock,
-#ifdef _WIN32
-                static_cast<char *>(ptr), static_cast<int>(size),
-#else
-                ptr, size,
-#endif
-                flags);
-  });
-}
-
-inline ssize_t send_socket(socket_t sock, const void *ptr, size_t size,
-                           int flags) {
-  return handle_EINTR([&]() {
-    return send(sock,
-#ifdef _WIN32
-                static_cast<const char *>(ptr), static_cast<int>(size),
-#else
-                ptr, size,
-#endif
-                flags);
-  });
-}
-
-inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) {
-#ifdef CPPHTTPLIB_USE_POLL
-  struct pollfd pfd_read;
-  pfd_read.fd = sock;
-  pfd_read.events = POLLIN;
-
-  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
-
-  return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
-#else
-#ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return -1; }
-#endif
-
-  fd_set fds;
-  FD_ZERO(&fds);
-  FD_SET(sock, &fds);
-
-  timeval tv;
-  tv.tv_sec = static_cast<long>(sec);
-  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
-
-  return handle_EINTR([&]() {
-    return select(static_cast<int>(sock + 1), &fds, nullptr, nullptr, &tv);
-  });
-#endif
-}
-
-inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) {
-#ifdef CPPHTTPLIB_USE_POLL
-  struct pollfd pfd_read;
-  pfd_read.fd = sock;
-  pfd_read.events = POLLOUT;
-
-  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
-
-  return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
-#else
-#ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return -1; }
-#endif
-
-  fd_set fds;
-  FD_ZERO(&fds);
-  FD_SET(sock, &fds);
-
-  timeval tv;
-  tv.tv_sec = static_cast<long>(sec);
-  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
-
-  return handle_EINTR([&]() {
-    return select(static_cast<int>(sock + 1), nullptr, &fds, nullptr, &tv);
-  });
-#endif
-}
-
-inline Error wait_until_socket_is_ready(socket_t sock, time_t sec,
-                                        time_t usec) {
-#ifdef CPPHTTPLIB_USE_POLL
-  struct pollfd pfd_read;
-  pfd_read.fd = sock;
-  pfd_read.events = POLLIN | POLLOUT;
-
-  auto timeout = static_cast<int>(sec * 1000 + usec / 1000);
-
-  auto poll_res = handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
-
-  if (poll_res == 0) { return Error::ConnectionTimeout; }
-
-  if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) {
-    auto error = 0;
-    socklen_t len = sizeof(error);
-    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
-                          reinterpret_cast<char *>(&error), &len);
-    auto successful = res >= 0 && !error;
-    return successful ? Error::Success : Error::Connection;
-  }
-
-  return Error::Connection;
-#else
-#ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return Error::Connection; }
-#endif
-
-  fd_set fdsr;
-  FD_ZERO(&fdsr);
-  FD_SET(sock, &fdsr);
-
-  auto fdsw = fdsr;
-  auto fdse = fdsr;
-
-  timeval tv;
-  tv.tv_sec = static_cast<long>(sec);
-  tv.tv_usec = static_cast<decltype(tv.tv_usec)>(usec);
-
-  auto ret = handle_EINTR([&]() {
-    return select(static_cast<int>(sock + 1), &fdsr, &fdsw, &fdse, &tv);
-  });
-
-  if (ret == 0) { return Error::ConnectionTimeout; }
-
-  if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) {
-    auto error = 0;
-    socklen_t len = sizeof(error);
-    auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
-                          reinterpret_cast<char *>(&error), &len);
-    auto successful = res >= 0 && !error;
-    return successful ? Error::Success : Error::Connection;
-  }
-  return Error::Connection;
-#endif
-}
-
-inline bool is_socket_alive(socket_t sock) {
-  const auto val = detail::select_read(sock, 0, 0);
-  if (val == 0) {
-    return true;
-  } else if (val < 0 && errno == EBADF) {
-    return false;
-  }
-  char buf[1];
-  return detail::read_socket(sock, &buf[0], sizeof(buf), MSG_PEEK) > 0;
-}
-
-class SocketStream : public Stream {
-public:
-  SocketStream(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec,
-               time_t write_timeout_sec, time_t write_timeout_usec);
-  ~SocketStream() override;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-
-private:
-  socket_t sock_;
-  time_t read_timeout_sec_;
-  time_t read_timeout_usec_;
-  time_t write_timeout_sec_;
-  time_t write_timeout_usec_;
-
-  std::vector<char> read_buff_;
-  size_t read_buff_off_ = 0;
-  size_t read_buff_content_size_ = 0;
-
-  static const size_t read_buff_size_ = 1024l * 4;
-};
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-class SSLSocketStream : public Stream {
-public:
-  SSLSocketStream(socket_t sock, SSL *ssl, time_t read_timeout_sec,
-                  time_t read_timeout_usec, time_t write_timeout_sec,
-                  time_t write_timeout_usec);
-  ~SSLSocketStream() override;
-
-  bool is_readable() const override;
-  bool is_writable() const override;
-  ssize_t read(char *ptr, size_t size) override;
-  ssize_t write(const char *ptr, size_t size) override;
-  void get_remote_ip_and_port(std::string &ip, int &port) const override;
-  void get_local_ip_and_port(std::string &ip, int &port) const override;
-  socket_t socket() const override;
-
-private:
-  socket_t sock_;
-  SSL *ssl_;
-  time_t read_timeout_sec_;
-  time_t read_timeout_usec_;
-  time_t write_timeout_sec_;
-  time_t write_timeout_usec_;
-};
-#endif
-
-inline bool keep_alive(socket_t sock, time_t keep_alive_timeout_sec) {
-  using namespace std::chrono;
-  auto start = steady_clock::now();
-  while (true) {
-    auto val = select_read(sock, 0, 10000);
-    if (val < 0) {
-      return false;
-    } else if (val == 0) {
-      auto current = steady_clock::now();
-      auto duration = duration_cast<milliseconds>(current - start);
-      auto timeout = keep_alive_timeout_sec * 1000;
-      if (duration.count() > timeout) { return false; }
-      std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    } else {
-      return true;
-    }
-  }
-}
-
-template <typename T>
-inline bool
-process_server_socket_core(const std::atomic<socket_t> &svr_sock, socket_t sock,
-                           size_t keep_alive_max_count,
-                           time_t keep_alive_timeout_sec, T callback) {
-  assert(keep_alive_max_count > 0);
-  auto ret = false;
-  auto count = keep_alive_max_count;
-  while (svr_sock != INVALID_SOCKET && count > 0 &&
-         keep_alive(sock, keep_alive_timeout_sec)) {
-    auto close_connection = count == 1;
-    auto connection_closed = false;
-    ret = callback(close_connection, connection_closed);
-    if (!ret || connection_closed) { break; }
-    count--;
-  }
-  return ret;
-}
-
-template <typename T>
-inline bool
-process_server_socket(const std::atomic<socket_t> &svr_sock, socket_t sock,
-                      size_t keep_alive_max_count,
-                      time_t keep_alive_timeout_sec, time_t read_timeout_sec,
-                      time_t read_timeout_usec, time_t write_timeout_sec,
-                      time_t write_timeout_usec, T callback) {
-  return process_server_socket_core(
-      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
-      [&](bool close_connection, bool &connection_closed) {
-        SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
-                          write_timeout_sec, write_timeout_usec);
-        return callback(strm, close_connection, connection_closed);
-      });
-}
-
-inline bool process_client_socket(socket_t sock, time_t read_timeout_sec,
-                                  time_t read_timeout_usec,
-                                  time_t write_timeout_sec,
-                                  time_t write_timeout_usec,
-                                  std::function<bool(Stream &)> callback) {
-  SocketStream strm(sock, read_timeout_sec, read_timeout_usec,
-                    write_timeout_sec, write_timeout_usec);
-  return callback(strm);
-}
-
-inline int shutdown_socket(socket_t sock) {
-#ifdef _WIN32
-  return shutdown(sock, SD_BOTH);
-#else
-  return shutdown(sock, SHUT_RDWR);
-#endif
-}
-
-template <typename BindOrConnect>
-socket_t create_socket(const std::string &host, const std::string &ip, int port,
-                       int address_family, int socket_flags, bool tcp_nodelay,
-                       SocketOptions socket_options,
-                       BindOrConnect bind_or_connect) {
-  // Get address info
-  const char *node = nullptr;
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-
-  if (!ip.empty()) {
-    node = ip.c_str();
-    // Ask getaddrinfo to convert IP in c-string to address
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_flags = AI_NUMERICHOST;
-  } else {
-    if (!host.empty()) { node = host.c_str(); }
-    hints.ai_family = address_family;
-    hints.ai_flags = socket_flags;
-  }
-
-#ifndef _WIN32
-  if (hints.ai_family == AF_UNIX) {
-    const auto addrlen = host.length();
-    if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; }
-
-    auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
-    if (sock != INVALID_SOCKET) {
-      sockaddr_un addr{};
-      addr.sun_family = AF_UNIX;
-      std::copy(host.begin(), host.end(), addr.sun_path);
-
-      hints.ai_addr = reinterpret_cast<sockaddr *>(&addr);
-      hints.ai_addrlen = static_cast<socklen_t>(
-          sizeof(addr) - sizeof(addr.sun_path) + addrlen);
-
-      fcntl(sock, F_SETFD, FD_CLOEXEC);
-      if (socket_options) { socket_options(sock); }
-
-      if (!bind_or_connect(sock, hints)) {
-        close_socket(sock);
-        sock = INVALID_SOCKET;
-      }
-    }
-    return sock;
-  }
-#endif
-
-  auto service = std::to_string(port);
-
-  if (getaddrinfo(node, service.c_str(), &hints, &result)) {
-#if defined __linux__ && !defined __ANDROID__
-    res_init();
-#endif
-    return INVALID_SOCKET;
-  }
-
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    // Create a socket
-#ifdef _WIN32
-    auto sock =
-        WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0,
-                   WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED);
-    /**
-     * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1
-     * and above the socket creation fails on older Windows Systems.
-     *
-     * Let's try to create a socket the old way in this case.
-     *
-     * Reference:
-     * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa
-     *
-     * WSA_FLAG_NO_HANDLE_INHERIT:
-     * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with
-     * SP1, and later
-     *
-     */
-    if (sock == INVALID_SOCKET) {
-      sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    }
-#else
-    auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-#endif
-    if (sock == INVALID_SOCKET) { continue; }
-
-#ifndef _WIN32
-    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
-      close_socket(sock);
-      continue;
-    }
-#endif
-
-    if (tcp_nodelay) {
-      auto yes = 1;
-#ifdef _WIN32
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                 reinterpret_cast<const char *>(&yes), sizeof(yes));
-#else
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                 reinterpret_cast<const void *>(&yes), sizeof(yes));
-#endif
-    }
-
-    if (socket_options) { socket_options(sock); }
-
-    if (rp->ai_family == AF_INET6) {
-      auto no = 0;
-#ifdef _WIN32
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 reinterpret_cast<const char *>(&no), sizeof(no));
-#else
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 reinterpret_cast<const void *>(&no), sizeof(no));
-#endif
-    }
-
-    // bind or connect
-    if (bind_or_connect(sock, *rp)) {
-      freeaddrinfo(result);
-      return sock;
-    }
-
-    close_socket(sock);
-  }
-
-  freeaddrinfo(result);
-  return INVALID_SOCKET;
-}
-
-inline void set_nonblocking(socket_t sock, bool nonblocking) {
-#ifdef _WIN32
-  auto flags = nonblocking ? 1UL : 0UL;
-  ioctlsocket(sock, FIONBIO, &flags);
-#else
-  auto flags = fcntl(sock, F_GETFL, 0);
-  fcntl(sock, F_SETFL,
-        nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK)));
-#endif
-}
-
-inline bool is_connection_error() {
-#ifdef _WIN32
-  return WSAGetLastError() != WSAEWOULDBLOCK;
-#else
-  return errno != EINPROGRESS;
-#endif
-}
-
-inline bool bind_ip_address(socket_t sock, const std::string &host) {
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-
-  if (getaddrinfo(host.c_str(), "0", &hints, &result)) { return false; }
-
-  auto ret = false;
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    const auto &ai = *rp;
-    if (!::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
-      ret = true;
-      break;
-    }
-  }
-
-  freeaddrinfo(result);
-  return ret;
-}
-
-#if !defined _WIN32 && !defined ANDROID && !defined _AIX && !defined __MVS__
-#define USE_IF2IP
-#endif
-
-#ifdef USE_IF2IP
-inline std::string if2ip(int address_family, const std::string &ifn) {
-  struct ifaddrs *ifap;
-  getifaddrs(&ifap);
-  std::string addr_candidate;
-  for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) {
-    if (ifa->ifa_addr && ifn == ifa->ifa_name &&
-        (AF_UNSPEC == address_family ||
-         ifa->ifa_addr->sa_family == address_family)) {
-      if (ifa->ifa_addr->sa_family == AF_INET) {
-        auto sa = reinterpret_cast<struct sockaddr_in *>(ifa->ifa_addr);
-        char buf[INET_ADDRSTRLEN];
-        if (inet_ntop(AF_INET, &sa->sin_addr, buf, INET_ADDRSTRLEN)) {
-          freeifaddrs(ifap);
-          return std::string(buf, INET_ADDRSTRLEN);
-        }
-      } else if (ifa->ifa_addr->sa_family == AF_INET6) {
-        auto sa = reinterpret_cast<struct sockaddr_in6 *>(ifa->ifa_addr);
-        if (!IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) {
-          char buf[INET6_ADDRSTRLEN] = {};
-          if (inet_ntop(AF_INET6, &sa->sin6_addr, buf, INET6_ADDRSTRLEN)) {
-            // equivalent to mac's IN6_IS_ADDR_UNIQUE_LOCAL
-            auto s6_addr_head = sa->sin6_addr.s6_addr[0];
-            if (s6_addr_head == 0xfc || s6_addr_head == 0xfd) {
-              addr_candidate = std::string(buf, INET6_ADDRSTRLEN);
-            } else {
-              freeifaddrs(ifap);
-              return std::string(buf, INET6_ADDRSTRLEN);
-            }
-          }
-        }
-      }
-    }
-  }
-  freeifaddrs(ifap);
-  return addr_candidate;
-}
-#endif
-
-inline socket_t create_client_socket(
-    const std::string &host, const std::string &ip, int port,
-    int address_family, bool tcp_nodelay, SocketOptions socket_options,
-    time_t connection_timeout_sec, time_t connection_timeout_usec,
-    time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
-    time_t write_timeout_usec, const std::string &intf, Error &error) {
-  auto sock = create_socket(
-      host, ip, port, address_family, 0, tcp_nodelay, std::move(socket_options),
-      [&](socket_t sock2, struct addrinfo &ai) -> bool {
-        if (!intf.empty()) {
-#ifdef USE_IF2IP
-          auto ip_from_if = if2ip(address_family, intf);
-          if (ip_from_if.empty()) { ip_from_if = intf; }
-          if (!bind_ip_address(sock2, ip_from_if)) {
-            error = Error::BindIPAddress;
-            return false;
-          }
-#endif
-        }
-
-        set_nonblocking(sock2, true);
-
-        auto ret =
-            ::connect(sock2, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen));
-
-        if (ret < 0) {
-          if (is_connection_error()) {
-            error = Error::Connection;
-            return false;
-          }
-          error = wait_until_socket_is_ready(sock2, connection_timeout_sec,
-                                             connection_timeout_usec);
-          if (error != Error::Success) { return false; }
-        }
-
-        set_nonblocking(sock2, false);
-
-        {
-#ifdef _WIN32
-          auto timeout = static_cast<uint32_t>(read_timeout_sec * 1000 +
-                                               read_timeout_usec / 1000);
-          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
-                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-          timeval tv;
-          tv.tv_sec = static_cast<long>(read_timeout_sec);
-          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec);
-          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
-                     reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-        }
-        {
-
-#ifdef _WIN32
-          auto timeout = static_cast<uint32_t>(write_timeout_sec * 1000 +
-                                               write_timeout_usec / 1000);
-          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
-                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-          timeval tv;
-          tv.tv_sec = static_cast<long>(write_timeout_sec);
-          tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec);
-          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
-                     reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-        }
-
-        error = Error::Success;
-        return true;
-      });
-
-  if (sock != INVALID_SOCKET) {
-    error = Error::Success;
-  } else {
-    if (error == Error::Success) { error = Error::Connection; }
-  }
-
-  return sock;
-}
-
-inline bool get_ip_and_port(const struct sockaddr_storage &addr,
-                            socklen_t addr_len, std::string &ip, int &port) {
-  if (addr.ss_family == AF_INET) {
-    port = ntohs(reinterpret_cast<const struct sockaddr_in *>(&addr)->sin_port);
-  } else if (addr.ss_family == AF_INET6) {
-    port =
-        ntohs(reinterpret_cast<const struct sockaddr_in6 *>(&addr)->sin6_port);
-  } else {
-    return false;
-  }
-
-  std::array<char, NI_MAXHOST> ipstr{};
-  if (getnameinfo(reinterpret_cast<const struct sockaddr *>(&addr), addr_len,
-                  ipstr.data(), static_cast<socklen_t>(ipstr.size()), nullptr,
-                  0, NI_NUMERICHOST)) {
-    return false;
-  }
-
-  ip = ipstr.data();
-  return true;
-}
-
-inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) {
-  struct sockaddr_storage addr;
-  socklen_t addr_len = sizeof(addr);
-  if (!getsockname(sock, reinterpret_cast<struct sockaddr *>(&addr),
-                   &addr_len)) {
-    get_ip_and_port(addr, addr_len, ip, port);
-  }
-}
-
-inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) {
-  struct sockaddr_storage addr;
-  socklen_t addr_len = sizeof(addr);
-
-  if (!getpeername(sock, reinterpret_cast<struct sockaddr *>(&addr),
-                   &addr_len)) {
-#ifndef _WIN32
-    if (addr.ss_family == AF_UNIX) {
-#if defined(__linux__)
-      struct ucred ucred;
-      socklen_t len = sizeof(ucred);
-      if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) {
-        port = ucred.pid;
-      }
-#elif defined(SOL_LOCAL) && defined(SO_PEERPID) // __APPLE__
-      pid_t pid;
-      socklen_t len = sizeof(pid);
-      if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) {
-        port = pid;
-      }
-#endif
-      return;
-    }
-#endif
-    get_ip_and_port(addr, addr_len, ip, port);
-  }
-}
-
-inline constexpr unsigned int str2tag_core(const char *s, size_t l,
-                                           unsigned int h) {
-  return (l == 0)
-             ? h
-             : str2tag_core(
-                   s + 1, l - 1,
-                   // Unsets the 6 high bits of h, therefore no overflow happens
-                   (((std::numeric_limits<unsigned int>::max)() >> 6) &
-                    h * 33) ^
-                       static_cast<unsigned char>(*s));
-}
-
-inline unsigned int str2tag(const std::string &s) {
-  return str2tag_core(s.data(), s.size(), 0);
-}
-
-namespace udl {
-
-inline constexpr unsigned int operator"" _t(const char *s, size_t l) {
-  return str2tag_core(s, l, 0);
-}
-
-} // namespace udl
-
-inline std::string
-find_content_type(const std::string &path,
-                  const std::map<std::string, std::string> &user_data,
-                  const std::string &default_content_type) {
-  auto ext = file_extension(path);
-
-  auto it = user_data.find(ext);
-  if (it != user_data.end()) { return it->second; }
-
-  using udl::operator""_t;
-
-  switch (str2tag(ext)) {
-  default: return default_content_type;
-
-  case "css"_t: return "text/css";
-  case "csv"_t: return "text/csv";
-  case "htm"_t:
-  case "html"_t: return "text/html";
-  case "js"_t:
-  case "mjs"_t: return "text/javascript";
-  case "txt"_t: return "text/plain";
-  case "vtt"_t: return "text/vtt";
-
-  case "apng"_t: return "image/apng";
-  case "avif"_t: return "image/avif";
-  case "bmp"_t: return "image/bmp";
-  case "gif"_t: return "image/gif";
-  case "png"_t: return "image/png";
-  case "svg"_t: return "image/svg+xml";
-  case "webp"_t: return "image/webp";
-  case "ico"_t: return "image/x-icon";
-  case "tif"_t: return "image/tiff";
-  case "tiff"_t: return "image/tiff";
-  case "jpg"_t:
-  case "jpeg"_t: return "image/jpeg";
-
-  case "mp4"_t: return "video/mp4";
-  case "mpeg"_t: return "video/mpeg";
-  case "webm"_t: return "video/webm";
-
-  case "mp3"_t: return "audio/mp3";
-  case "mpga"_t: return "audio/mpeg";
-  case "weba"_t: return "audio/webm";
-  case "wav"_t: return "audio/wave";
-
-  case "otf"_t: return "font/otf";
-  case "ttf"_t: return "font/ttf";
-  case "woff"_t: return "font/woff";
-  case "woff2"_t: return "font/woff2";
-
-  case "7z"_t: return "application/x-7z-compressed";
-  case "atom"_t: return "application/atom+xml";
-  case "pdf"_t: return "application/pdf";
-  case "json"_t: return "application/json";
-  case "rss"_t: return "application/rss+xml";
-  case "tar"_t: return "application/x-tar";
-  case "xht"_t:
-  case "xhtml"_t: return "application/xhtml+xml";
-  case "xslt"_t: return "application/xslt+xml";
-  case "xml"_t: return "application/xml";
-  case "gz"_t: return "application/gzip";
-  case "zip"_t: return "application/zip";
-  case "wasm"_t: return "application/wasm";
-  }
-}
-
-inline bool can_compress_content_type(const std::string &content_type) {
-  using udl::operator""_t;
-
-  auto tag = str2tag(content_type);
-
-  switch (tag) {
-  case "image/svg+xml"_t:
-  case "application/javascript"_t:
-  case "application/json"_t:
-  case "application/xml"_t:
-  case "application/protobuf"_t:
-  case "application/xhtml+xml"_t: return true;
-
-  default:
-    return !content_type.rfind("text/", 0) && tag != "text/event-stream"_t;
-  }
-}
-
-inline EncodingType encoding_type(const Request &req, const Response &res) {
-  auto ret =
-      detail::can_compress_content_type(res.get_header_value("Content-Type"));
-  if (!ret) { return EncodingType::None; }
-
-  const auto &s = req.get_header_value("Accept-Encoding");
-  (void)(s);
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-  // TODO: 'Accept-Encoding' has br, not br;q=0
-  ret = s.find("br") != std::string::npos;
-  if (ret) { return EncodingType::Brotli; }
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  // TODO: 'Accept-Encoding' has gzip, not gzip;q=0
-  ret = s.find("gzip") != std::string::npos;
-  if (ret) { return EncodingType::Gzip; }
-#endif
-
-  return EncodingType::None;
-}
-
-inline bool nocompressor::compress(const char *data, size_t data_length,
-                                   bool /*last*/, Callback callback) {
-  if (!data_length) { return true; }
-  return callback(data, data_length);
-}
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-inline gzip_compressor::gzip_compressor() {
-  std::memset(&strm_, 0, sizeof(strm_));
-  strm_.zalloc = Z_NULL;
-  strm_.zfree = Z_NULL;
-  strm_.opaque = Z_NULL;
-
-  is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8,
-                           Z_DEFAULT_STRATEGY) == Z_OK;
-}
-
-inline gzip_compressor::~gzip_compressor() { deflateEnd(&strm_); }
-
-inline bool gzip_compressor::compress(const char *data, size_t data_length,
-                                      bool last, Callback callback) {
-  assert(is_valid_);
-
-  do {
-    constexpr size_t max_avail_in =
-        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
-
-    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
-        (std::min)(data_length, max_avail_in));
-    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
-
-    data_length -= strm_.avail_in;
-    data += strm_.avail_in;
-
-    auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH;
-    auto ret = Z_OK;
-
-    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-    do {
-      strm_.avail_out = static_cast<uInt>(buff.size());
-      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
-
-      ret = deflate(&strm_, flush);
-      if (ret == Z_STREAM_ERROR) { return false; }
-
-      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
-        return false;
-      }
-    } while (strm_.avail_out == 0);
-
-    assert((flush == Z_FINISH && ret == Z_STREAM_END) ||
-           (flush == Z_NO_FLUSH && ret == Z_OK));
-    assert(strm_.avail_in == 0);
-  } while (data_length > 0);
-
-  return true;
-}
-
-inline gzip_decompressor::gzip_decompressor() {
-  std::memset(&strm_, 0, sizeof(strm_));
-  strm_.zalloc = Z_NULL;
-  strm_.zfree = Z_NULL;
-  strm_.opaque = Z_NULL;
-
-  // 15 is the value of wbits, which should be at the maximum possible value
-  // to ensure that any gzip stream can be decoded. The offset of 32 specifies
-  // that the stream type should be automatically detected either gzip or
-  // deflate.
-  is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK;
-}
-
-inline gzip_decompressor::~gzip_decompressor() { inflateEnd(&strm_); }
-
-inline bool gzip_decompressor::is_valid() const { return is_valid_; }
-
-inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
-                                          Callback callback) {
-  assert(is_valid_);
-
-  auto ret = Z_OK;
-
-  do {
-    constexpr size_t max_avail_in =
-        (std::numeric_limits<decltype(strm_.avail_in)>::max)();
-
-    strm_.avail_in = static_cast<decltype(strm_.avail_in)>(
-        (std::min)(data_length, max_avail_in));
-    strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
-
-    data_length -= strm_.avail_in;
-    data += strm_.avail_in;
-
-    std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-    while (strm_.avail_in > 0 && ret == Z_OK) {
-      strm_.avail_out = static_cast<uInt>(buff.size());
-      strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
-
-      ret = inflate(&strm_, Z_NO_FLUSH);
-
-      assert(ret != Z_STREAM_ERROR);
-      switch (ret) {
-      case Z_NEED_DICT:
-      case Z_DATA_ERROR:
-      case Z_MEM_ERROR: inflateEnd(&strm_); return false;
-      }
-
-      if (!callback(buff.data(), buff.size() - strm_.avail_out)) {
-        return false;
-      }
-    }
-
-    if (ret != Z_OK && ret != Z_STREAM_END) { return false; }
-
-  } while (data_length > 0);
-
-  return true;
-}
-#endif
-
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-inline brotli_compressor::brotli_compressor() {
-  state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
-}
-
-inline brotli_compressor::~brotli_compressor() {
-  BrotliEncoderDestroyInstance(state_);
-}
-
-inline bool brotli_compressor::compress(const char *data, size_t data_length,
-                                        bool last, Callback callback) {
-  std::array<uint8_t, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-
-  auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS;
-  auto available_in = data_length;
-  auto next_in = reinterpret_cast<const uint8_t *>(data);
-
-  for (;;) {
-    if (last) {
-      if (BrotliEncoderIsFinished(state_)) { break; }
-    } else {
-      if (!available_in) { break; }
-    }
-
-    auto available_out = buff.size();
-    auto next_out = buff.data();
-
-    if (!BrotliEncoderCompressStream(state_, operation, &available_in, &next_in,
-                                     &available_out, &next_out, nullptr)) {
-      return false;
-    }
-
-    auto output_bytes = buff.size() - available_out;
-    if (output_bytes) {
-      callback(reinterpret_cast<const char *>(buff.data()), output_bytes);
-    }
-  }
-
-  return true;
-}
-
-inline brotli_decompressor::brotli_decompressor() {
-  decoder_s = BrotliDecoderCreateInstance(0, 0, 0);
-  decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT
-                        : BROTLI_DECODER_RESULT_ERROR;
-}
-
-inline brotli_decompressor::~brotli_decompressor() {
-  if (decoder_s) { BrotliDecoderDestroyInstance(decoder_s); }
-}
-
-inline bool brotli_decompressor::is_valid() const { return decoder_s; }
-
-inline bool brotli_decompressor::decompress(const char *data,
-                                            size_t data_length,
-                                            Callback callback) {
-  if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
-      decoder_r == BROTLI_DECODER_RESULT_ERROR) {
-    return 0;
-  }
-
-  auto next_in = reinterpret_cast<const uint8_t *>(data);
-  size_t avail_in = data_length;
-  size_t total_out;
-
-  decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
-
-  std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-  while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
-    char *next_out = buff.data();
-    size_t avail_out = buff.size();
-
-    decoder_r = BrotliDecoderDecompressStream(
-        decoder_s, &avail_in, &next_in, &avail_out,
-        reinterpret_cast<uint8_t **>(&next_out), &total_out);
-
-    if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; }
-
-    if (!callback(buff.data(), buff.size() - avail_out)) { return false; }
-  }
-
-  return decoder_r == BROTLI_DECODER_RESULT_SUCCESS ||
-         decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT;
-}
-#endif
-
-inline bool has_header(const Headers &headers, const std::string &key) {
-  return headers.find(key) != headers.end();
-}
-
-inline const char *get_header_value(const Headers &headers,
-                                    const std::string &key, size_t id,
-                                    const char *def) {
-  auto rng = headers.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) { return it->second.c_str(); }
-  return def;
-}
-
-inline bool compare_case_ignore(const std::string &a, const std::string &b) {
-  if (a.size() != b.size()) { return false; }
-  for (size_t i = 0; i < b.size(); i++) {
-    if (::tolower(a[i]) != ::tolower(b[i])) { return false; }
-  }
-  return true;
-}
-
-template <typename T>
-inline bool parse_header(const char *beg, const char *end, T fn) {
-  // Skip trailing spaces and tabs.
-  while (beg < end && is_space_or_tab(end[-1])) {
-    end--;
-  }
-
-  auto p = beg;
-  while (p < end && *p != ':') {
-    p++;
-  }
-
-  if (p == end) { return false; }
-
-  auto key_end = p;
-
-  if (*p++ != ':') { return false; }
-
-  while (p < end && is_space_or_tab(*p)) {
-    p++;
-  }
-
-  if (p < end) {
-    auto key_len = key_end - beg;
-    if (!key_len) { return false; }
-
-    auto key = std::string(beg, key_end);
-    auto val = compare_case_ignore(key, "Location")
-                   ? std::string(p, end)
-                   : decode_url(std::string(p, end), false);
-    fn(std::move(key), std::move(val));
-    return true;
-  }
-
-  return false;
-}
-
-inline bool read_headers(Stream &strm, Headers &headers) {
-  const auto bufsiz = 2048;
-  char buf[bufsiz];
-  stream_line_reader line_reader(strm, buf, bufsiz);
-
-  for (;;) {
-    if (!line_reader.getline()) { return false; }
-
-    // Check if the line ends with CRLF.
-    auto line_terminator_len = 2;
-    if (line_reader.end_with_crlf()) {
-      // Blank line indicates end of headers.
-      if (line_reader.size() == 2) { break; }
-#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-    } else {
-      // Blank line indicates end of headers.
-      if (line_reader.size() == 1) { break; }
-      line_terminator_len = 1;
-    }
-#else
-    } else {
-      continue; // Skip invalid line.
-    }
-#endif
-
-    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-
-    // Exclude line terminator
-    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
-
-    parse_header(line_reader.ptr(), end,
-                 [&](std::string &&key, std::string &&val) {
-                   headers.emplace(std::move(key), std::move(val));
-                 });
-  }
-
-  return true;
-}
-
-inline bool read_content_with_length(Stream &strm, uint64_t len,
-                                     Progress progress,
-                                     ContentReceiverWithProgress out) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-
-  uint64_t r = 0;
-  while (r < len) {
-    auto read_len = static_cast<size_t>(len - r);
-    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
-    if (n <= 0) { return false; }
-
-    if (!out(buf, static_cast<size_t>(n), r, len)) { return false; }
-    r += static_cast<uint64_t>(n);
-
-    if (progress) {
-      if (!progress(r, len)) { return false; }
-    }
-  }
-
-  return true;
-}
-
-inline void skip_content_with_length(Stream &strm, uint64_t len) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-  uint64_t r = 0;
-  while (r < len) {
-    auto read_len = static_cast<size_t>(len - r);
-    auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ));
-    if (n <= 0) { return; }
-    r += static_cast<uint64_t>(n);
-  }
-}
-
-inline bool read_content_without_length(Stream &strm,
-                                        ContentReceiverWithProgress out) {
-  char buf[CPPHTTPLIB_RECV_BUFSIZ];
-  uint64_t r = 0;
-  for (;;) {
-    auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
-    if (n <= 0) { return true; }
-
-    if (!out(buf, static_cast<size_t>(n), r, 0)) { return false; }
-    r += static_cast<uint64_t>(n);
-  }
-
-  return true;
-}
-
-template <typename T>
-inline bool read_content_chunked(Stream &strm, T &x,
-                                 ContentReceiverWithProgress out) {
-  const auto bufsiz = 16;
-  char buf[bufsiz];
-
-  stream_line_reader line_reader(strm, buf, bufsiz);
-
-  if (!line_reader.getline()) { return false; }
-
-  unsigned long chunk_len;
-  while (true) {
-    char *end_ptr;
-
-    chunk_len = std::strtoul(line_reader.ptr(), &end_ptr, 16);
-
-    if (end_ptr == line_reader.ptr()) { return false; }
-    if (chunk_len == ULONG_MAX) { return false; }
-
-    if (chunk_len == 0) { break; }
-
-    if (!read_content_with_length(strm, chunk_len, nullptr, out)) {
-      return false;
-    }
-
-    if (!line_reader.getline()) { return false; }
-
-    if (strcmp(line_reader.ptr(), "\r\n") != 0) { return false; }
-
-    if (!line_reader.getline()) { return false; }
-  }
-
-  assert(chunk_len == 0);
-
-  // Trailer
-  if (!line_reader.getline()) { return false; }
-
-  while (strcmp(line_reader.ptr(), "\r\n") != 0) {
-    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-
-    // Exclude line terminator
-    constexpr auto line_terminator_len = 2;
-    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
-
-    parse_header(line_reader.ptr(), end,
-                 [&](std::string &&key, std::string &&val) {
-                   x.headers.emplace(std::move(key), std::move(val));
-                 });
-
-    if (!line_reader.getline()) { return false; }
-  }
-
-  return true;
-}
-
-inline bool is_chunked_transfer_encoding(const Headers &headers) {
-  return compare_case_ignore(
-      get_header_value(headers, "Transfer-Encoding", 0, ""), "chunked");
-}
-
-template <typename T, typename U>
-bool prepare_content_receiver(T &x, int &status,
-                              ContentReceiverWithProgress receiver,
-                              bool decompress, U callback) {
-  if (decompress) {
-    std::string encoding = x.get_header_value("Content-Encoding");
-    std::unique_ptr<decompressor> decompressor;
-
-    if (encoding == "gzip" || encoding == "deflate") {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-      decompressor = detail::make_unique<gzip_decompressor>();
-#else
-      status = StatusCode::UnsupportedMediaType_415;
-      return false;
-#endif
-    } else if (encoding.find("br") != std::string::npos) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-      decompressor = detail::make_unique<brotli_decompressor>();
-#else
-      status = StatusCode::UnsupportedMediaType_415;
-      return false;
-#endif
-    }
-
-    if (decompressor) {
-      if (decompressor->is_valid()) {
-        ContentReceiverWithProgress out = [&](const char *buf, size_t n,
-                                              uint64_t off, uint64_t len) {
-          return decompressor->decompress(buf, n,
-                                          [&](const char *buf2, size_t n2) {
-                                            return receiver(buf2, n2, off, len);
-                                          });
-        };
-        return callback(std::move(out));
-      } else {
-        status = StatusCode::InternalServerError_500;
-        return false;
-      }
-    }
-  }
-
-  ContentReceiverWithProgress out = [&](const char *buf, size_t n, uint64_t off,
-                                        uint64_t len) {
-    return receiver(buf, n, off, len);
-  };
-  return callback(std::move(out));
-}
-
-template <typename T>
-bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
-                  Progress progress, ContentReceiverWithProgress receiver,
-                  bool decompress) {
-  return prepare_content_receiver(
-      x, status, std::move(receiver), decompress,
-      [&](const ContentReceiverWithProgress &out) {
-        auto ret = true;
-        auto exceed_payload_max_length = false;
-
-        if (is_chunked_transfer_encoding(x.headers)) {
-          ret = read_content_chunked(strm, x, out);
-        } else if (!has_header(x.headers, "Content-Length")) {
-          ret = read_content_without_length(strm, out);
-        } else {
-          auto len = get_header_value_u64(x.headers, "Content-Length", 0, 0);
-          if (len > payload_max_length) {
-            exceed_payload_max_length = true;
-            skip_content_with_length(strm, len);
-            ret = false;
-          } else if (len > 0) {
-            ret = read_content_with_length(strm, len, std::move(progress), out);
-          }
-        }
-
-        if (!ret) {
-          status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413
-                                             : StatusCode::BadRequest_400;
-        }
-        return ret;
-      });
-} // namespace detail
-
-inline ssize_t write_headers(Stream &strm, const Headers &headers) {
-  ssize_t write_len = 0;
-  for (const auto &x : headers) {
-    auto len =
-        strm.write_format("%s: %s\r\n", x.first.c_str(), x.second.c_str());
-    if (len < 0) { return len; }
-    write_len += len;
-  }
-  auto len = strm.write("\r\n");
-  if (len < 0) { return len; }
-  write_len += len;
-  return write_len;
-}
-
-inline bool write_data(Stream &strm, const char *d, size_t l) {
-  size_t offset = 0;
-  while (offset < l) {
-    auto length = strm.write(d + offset, l - offset);
-    if (length < 0) { return false; }
-    offset += static_cast<size_t>(length);
-  }
-  return true;
-}
-
-template <typename T>
-inline bool write_content(Stream &strm, const ContentProvider &content_provider,
-                          size_t offset, size_t length, T is_shutting_down,
-                          Error &error) {
-  size_t end_offset = offset + length;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      if (strm.is_writable() && write_data(strm, d, l)) {
-        offset += l;
-      } else {
-        ok = false;
-      }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  while (offset < end_offset && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      error = Error::Write;
-      return false;
-    } else if (!content_provider(offset, end_offset - offset, data_sink)) {
-      error = Error::Canceled;
-      return false;
-    } else if (!ok) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  error = Error::Success;
-  return true;
-}
-
-template <typename T>
-inline bool write_content(Stream &strm, const ContentProvider &content_provider,
-                          size_t offset, size_t length,
-                          const T &is_shutting_down) {
-  auto error = Error::Success;
-  return write_content(strm, content_provider, offset, length, is_shutting_down,
-                       error);
-}
-
-template <typename T>
-inline bool
-write_content_without_length(Stream &strm,
-                             const ContentProvider &content_provider,
-                             const T &is_shutting_down) {
-  size_t offset = 0;
-  auto data_available = true;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      offset += l;
-      if (!strm.is_writable() || !write_data(strm, d, l)) { ok = false; }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  data_sink.done = [&](void) { data_available = false; };
-
-  while (data_available && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      return false;
-    } else if (!content_provider(offset, 0, data_sink)) {
-      return false;
-    } else if (!ok) {
-      return false;
-    }
-  }
-  return true;
-}
-
-template <typename T, typename U>
-inline bool
-write_content_chunked(Stream &strm, const ContentProvider &content_provider,
-                      const T &is_shutting_down, U &compressor, Error &error) {
-  size_t offset = 0;
-  auto data_available = true;
-  auto ok = true;
-  DataSink data_sink;
-
-  data_sink.write = [&](const char *d, size_t l) -> bool {
-    if (ok) {
-      data_available = l > 0;
-      offset += l;
-
-      std::string payload;
-      if (compressor.compress(d, l, false,
-                              [&](const char *data, size_t data_len) {
-                                payload.append(data, data_len);
-                                return true;
-                              })) {
-        if (!payload.empty()) {
-          // Emit chunked response header and footer for each chunk
-          auto chunk =
-              from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
-          if (!strm.is_writable() ||
-              !write_data(strm, chunk.data(), chunk.size())) {
-            ok = false;
-          }
-        }
-      } else {
-        ok = false;
-      }
-    }
-    return ok;
-  };
-
-  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
-
-  auto done_with_trailer = [&](const Headers *trailer) {
-    if (!ok) { return; }
-
-    data_available = false;
-
-    std::string payload;
-    if (!compressor.compress(nullptr, 0, true,
-                             [&](const char *data, size_t data_len) {
-                               payload.append(data, data_len);
-                               return true;
-                             })) {
-      ok = false;
-      return;
-    }
-
-    if (!payload.empty()) {
-      // Emit chunked response header and footer for each chunk
-      auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
-      if (!strm.is_writable() ||
-          !write_data(strm, chunk.data(), chunk.size())) {
-        ok = false;
-        return;
-      }
-    }
-
-    static const std::string done_marker("0\r\n");
-    if (!write_data(strm, done_marker.data(), done_marker.size())) {
-      ok = false;
-    }
-
-    // Trailer
-    if (trailer) {
-      for (const auto &kv : *trailer) {
-        std::string field_line = kv.first + ": " + kv.second + "\r\n";
-        if (!write_data(strm, field_line.data(), field_line.size())) {
-          ok = false;
-        }
-      }
-    }
-
-    static const std::string crlf("\r\n");
-    if (!write_data(strm, crlf.data(), crlf.size())) { ok = false; }
-  };
-
-  data_sink.done = [&](void) { done_with_trailer(nullptr); };
-
-  data_sink.done_with_trailer = [&](const Headers &trailer) {
-    done_with_trailer(&trailer);
-  };
-
-  while (data_available && !is_shutting_down()) {
-    if (!strm.is_writable()) {
-      error = Error::Write;
-      return false;
-    } else if (!content_provider(offset, 0, data_sink)) {
-      error = Error::Canceled;
-      return false;
-    } else if (!ok) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  error = Error::Success;
-  return true;
-}
-
-template <typename T, typename U>
-inline bool write_content_chunked(Stream &strm,
-                                  const ContentProvider &content_provider,
-                                  const T &is_shutting_down, U &compressor) {
-  auto error = Error::Success;
-  return write_content_chunked(strm, content_provider, is_shutting_down,
-                               compressor, error);
-}
-
-template <typename T>
-inline bool redirect(T &cli, Request &req, Response &res,
-                     const std::string &path, const std::string &location,
-                     Error &error) {
-  Request new_req = req;
-  new_req.path = path;
-  new_req.redirect_count_ -= 1;
-
-  if (res.status == StatusCode::SeeOther_303 &&
-      (req.method != "GET" && req.method != "HEAD")) {
-    new_req.method = "GET";
-    new_req.body.clear();
-    new_req.headers.clear();
-  }
-
-  Response new_res;
-
-  auto ret = cli.send(new_req, new_res, error);
-  if (ret) {
-    req = new_req;
-    res = new_res;
-
-    if (res.location.empty()) { res.location = location; }
-  }
-  return ret;
-}
-
-inline std::string params_to_query_str(const Params &params) {
-  std::string query;
-
-  for (auto it = params.begin(); it != params.end(); ++it) {
-    if (it != params.begin()) { query += "&"; }
-    query += it->first;
-    query += "=";
-    query += encode_query_param(it->second);
-  }
-  return query;
-}
-
-inline void parse_query_text(const std::string &s, Params &params) {
-  std::set<std::string> cache;
-  split(s.data(), s.data() + s.size(), '&', [&](const char *b, const char *e) {
-    std::string kv(b, e);
-    if (cache.find(kv) != cache.end()) { return; }
-    cache.insert(kv);
-
-    std::string key;
-    std::string val;
-    split(b, e, '=', [&](const char *b2, const char *e2) {
-      if (key.empty()) {
-        key.assign(b2, e2);
-      } else {
-        val.assign(b2, e2);
-      }
-    });
-
-    if (!key.empty()) {
-      params.emplace(decode_url(key, true), decode_url(val, true));
-    }
-  });
-}
-
-inline bool parse_multipart_boundary(const std::string &content_type,
-                                     std::string &boundary) {
-  auto boundary_keyword = "boundary=";
-  auto pos = content_type.find(boundary_keyword);
-  if (pos == std::string::npos) { return false; }
-  auto end = content_type.find(';', pos);
-  auto beg = pos + strlen(boundary_keyword);
-  boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg));
-  return !boundary.empty();
-}
-
-inline void parse_disposition_params(const std::string &s, Params &params) {
-  std::set<std::string> cache;
-  split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) {
-    std::string kv(b, e);
-    if (cache.find(kv) != cache.end()) { return; }
-    cache.insert(kv);
-
-    std::string key;
-    std::string val;
-    split(b, e, '=', [&](const char *b2, const char *e2) {
-      if (key.empty()) {
-        key.assign(b2, e2);
-      } else {
-        val.assign(b2, e2);
-      }
-    });
-
-    if (!key.empty()) {
-      params.emplace(trim_double_quotes_copy((key)),
-                     trim_double_quotes_copy((val)));
-    }
-  });
-}
-
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-inline bool parse_range_header(const std::string &s, Ranges &ranges) {
-#else
-inline bool parse_range_header(const std::string &s, Ranges &ranges) try {
-#endif
-  static auto re_first_range = std::regex(R"(bytes=(\d*-\d*(?:,\s*\d*-\d*)*))");
-  std::smatch m;
-  if (std::regex_match(s, m, re_first_range)) {
-    auto pos = static_cast<size_t>(m.position(1));
-    auto len = static_cast<size_t>(m.length(1));
-    auto all_valid_ranges = true;
-    split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) {
-      if (!all_valid_ranges) { return; }
-      static auto re_another_range = std::regex(R"(\s*(\d*)-(\d*))");
-      std::cmatch cm;
-      if (std::regex_match(b, e, cm, re_another_range)) {
-        ssize_t first = -1;
-        if (!cm.str(1).empty()) {
-          first = static_cast<ssize_t>(std::stoll(cm.str(1)));
-        }
-
-        ssize_t last = -1;
-        if (!cm.str(2).empty()) {
-          last = static_cast<ssize_t>(std::stoll(cm.str(2)));
-        }
-
-        if (first != -1 && last != -1 && first > last) {
-          all_valid_ranges = false;
-          return;
-        }
-        ranges.emplace_back(std::make_pair(first, last));
-      }
-    });
-    return all_valid_ranges;
-  }
-  return false;
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-}
-#else
-} catch (...) { return false; }
-#endif
-
-class MultipartFormDataParser {
-public:
-  MultipartFormDataParser() = default;
-
-  void set_boundary(std::string &&boundary) {
-    boundary_ = boundary;
-    dash_boundary_crlf_ = dash_ + boundary_ + crlf_;
-    crlf_dash_boundary_ = crlf_ + dash_ + boundary_;
-  }
-
-  bool is_valid() const { return is_valid_; }
-
-  bool parse(const char *buf, size_t n, const ContentReceiver &content_callback,
-             const MultipartContentHeader &header_callback) {
-
-    buf_append(buf, n);
-
-    while (buf_size() > 0) {
-      switch (state_) {
-      case 0: { // Initial boundary
-        buf_erase(buf_find(dash_boundary_crlf_));
-        if (dash_boundary_crlf_.size() > buf_size()) { return true; }
-        if (!buf_start_with(dash_boundary_crlf_)) { return false; }
-        buf_erase(dash_boundary_crlf_.size());
-        state_ = 1;
-        break;
-      }
-      case 1: { // New entry
-        clear_file_info();
-        state_ = 2;
-        break;
-      }
-      case 2: { // Headers
-        auto pos = buf_find(crlf_);
-        if (pos > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
-        while (pos < buf_size()) {
-          // Empty line
-          if (pos == 0) {
-            if (!header_callback(file_)) {
-              is_valid_ = false;
-              return false;
-            }
-            buf_erase(crlf_.size());
-            state_ = 3;
-            break;
-          }
-
-          const auto header = buf_head(pos);
-
-          if (!parse_header(header.data(), header.data() + header.size(),
-                            [&](std::string &&, std::string &&) {})) {
-            is_valid_ = false;
-            return false;
-          }
-
-          static const std::string header_content_type = "Content-Type:";
-
-          if (start_with_case_ignore(header, header_content_type)) {
-            file_.content_type =
-                trim_copy(header.substr(header_content_type.size()));
-          } else {
-            static const std::regex re_content_disposition(
-                R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~",
-                std::regex_constants::icase);
-
-            std::smatch m;
-            if (std::regex_match(header, m, re_content_disposition)) {
-              Params params;
-              parse_disposition_params(m[1], params);
-
-              auto it = params.find("name");
-              if (it != params.end()) {
-                file_.name = it->second;
-              } else {
-                is_valid_ = false;
-                return false;
-              }
-
-              it = params.find("filename");
-              if (it != params.end()) { file_.filename = it->second; }
-
-              it = params.find("filename*");
-              if (it != params.end()) {
-                // Only allow UTF-8 enconnding...
-                static const std::regex re_rfc5987_encoding(
-                    R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase);
-
-                std::smatch m2;
-                if (std::regex_match(it->second, m2, re_rfc5987_encoding)) {
-                  file_.filename = decode_url(m2[1], false); // override...
-                } else {
-                  is_valid_ = false;
-                  return false;
-                }
-              }
-            }
-          }
-          buf_erase(pos + crlf_.size());
-          pos = buf_find(crlf_);
-        }
-        if (state_ != 3) { return true; }
-        break;
-      }
-      case 3: { // Body
-        if (crlf_dash_boundary_.size() > buf_size()) { return true; }
-        auto pos = buf_find(crlf_dash_boundary_);
-        if (pos < buf_size()) {
-          if (!content_callback(buf_data(), pos)) {
-            is_valid_ = false;
-            return false;
-          }
-          buf_erase(pos + crlf_dash_boundary_.size());
-          state_ = 4;
-        } else {
-          auto len = buf_size() - crlf_dash_boundary_.size();
-          if (len > 0) {
-            if (!content_callback(buf_data(), len)) {
-              is_valid_ = false;
-              return false;
-            }
-            buf_erase(len);
-          }
-          return true;
-        }
-        break;
-      }
-      case 4: { // Boundary
-        if (crlf_.size() > buf_size()) { return true; }
-        if (buf_start_with(crlf_)) {
-          buf_erase(crlf_.size());
-          state_ = 1;
-        } else {
-          if (dash_.size() > buf_size()) { return true; }
-          if (buf_start_with(dash_)) {
-            buf_erase(dash_.size());
-            is_valid_ = true;
-            buf_erase(buf_size()); // Remove epilogue
-          } else {
-            return true;
-          }
-        }
-        break;
-      }
-      }
-    }
-
-    return true;
-  }
-
-private:
-  void clear_file_info() {
-    file_.name.clear();
-    file_.filename.clear();
-    file_.content_type.clear();
-  }
-
-  bool start_with_case_ignore(const std::string &a,
-                              const std::string &b) const {
-    if (a.size() < b.size()) { return false; }
-    for (size_t i = 0; i < b.size(); i++) {
-      if (::tolower(a[i]) != ::tolower(b[i])) { return false; }
-    }
-    return true;
-  }
-
-  const std::string dash_ = "--";
-  const std::string crlf_ = "\r\n";
-  std::string boundary_;
-  std::string dash_boundary_crlf_;
-  std::string crlf_dash_boundary_;
-
-  size_t state_ = 0;
-  bool is_valid_ = false;
-  MultipartFormData file_;
-
-  // Buffer
-  bool start_with(const std::string &a, size_t spos, size_t epos,
-                  const std::string &b) const {
-    if (epos - spos < b.size()) { return false; }
-    for (size_t i = 0; i < b.size(); i++) {
-      if (a[i + spos] != b[i]) { return false; }
-    }
-    return true;
-  }
-
-  size_t buf_size() const { return buf_epos_ - buf_spos_; }
-
-  const char *buf_data() const { return &buf_[buf_spos_]; }
-
-  std::string buf_head(size_t l) const { return buf_.substr(buf_spos_, l); }
-
-  bool buf_start_with(const std::string &s) const {
-    return start_with(buf_, buf_spos_, buf_epos_, s);
-  }
-
-  size_t buf_find(const std::string &s) const {
-    auto c = s.front();
-
-    size_t off = buf_spos_;
-    while (off < buf_epos_) {
-      auto pos = off;
-      while (true) {
-        if (pos == buf_epos_) { return buf_size(); }
-        if (buf_[pos] == c) { break; }
-        pos++;
-      }
-
-      auto remaining_size = buf_epos_ - pos;
-      if (s.size() > remaining_size) { return buf_size(); }
-
-      if (start_with(buf_, pos, buf_epos_, s)) { return pos - buf_spos_; }
-
-      off = pos + 1;
-    }
-
-    return buf_size();
-  }
-
-  void buf_append(const char *data, size_t n) {
-    auto remaining_size = buf_size();
-    if (remaining_size > 0 && buf_spos_ > 0) {
-      for (size_t i = 0; i < remaining_size; i++) {
-        buf_[i] = buf_[buf_spos_ + i];
-      }
-    }
-    buf_spos_ = 0;
-    buf_epos_ = remaining_size;
-
-    if (remaining_size + n > buf_.size()) { buf_.resize(remaining_size + n); }
-
-    for (size_t i = 0; i < n; i++) {
-      buf_[buf_epos_ + i] = data[i];
-    }
-    buf_epos_ += n;
-  }
-
-  void buf_erase(size_t size) { buf_spos_ += size; }
-
-  std::string buf_;
-  size_t buf_spos_ = 0;
-  size_t buf_epos_ = 0;
-};
-
-inline std::string to_lower(const char *beg, const char *end) {
-  std::string out;
-  auto it = beg;
-  while (it != end) {
-    out += static_cast<char>(::tolower(*it));
-    it++;
-  }
-  return out;
-}
-
-inline std::string random_string(size_t length) {
-  static const char data[] =
-      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-  // std::random_device might actually be deterministic on some
-  // platforms, but due to lack of support in the c++ standard library,
-  // doing better requires either some ugly hacks or breaking portability.
-  static std::random_device seed_gen;
-
-  // Request 128 bits of entropy for initialization
-  static std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(),
-                                     seed_gen()};
-
-  static std::mt19937 engine(seed_sequence);
-
-  std::string result;
-  for (size_t i = 0; i < length; i++) {
-    result += data[engine() % (sizeof(data) - 1)];
-  }
-  return result;
-}
-
-inline std::string make_multipart_data_boundary() {
-  return "--cpp-httplib-multipart-data-" + detail::random_string(16);
-}
-
-inline bool is_multipart_boundary_chars_valid(const std::string &boundary) {
-  auto valid = true;
-  for (size_t i = 0; i < boundary.size(); i++) {
-    auto c = boundary[i];
-    if (!std::isalnum(c) && c != '-' && c != '_') {
-      valid = false;
-      break;
-    }
-  }
-  return valid;
-}
-
-template <typename T>
-inline std::string
-serialize_multipart_formdata_item_begin(const T &item,
-                                        const std::string &boundary) {
-  std::string body = "--" + boundary + "\r\n";
-  body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
-  if (!item.filename.empty()) {
-    body += "; filename=\"" + item.filename + "\"";
-  }
-  body += "\r\n";
-  if (!item.content_type.empty()) {
-    body += "Content-Type: " + item.content_type + "\r\n";
-  }
-  body += "\r\n";
-
-  return body;
-}
-
-inline std::string serialize_multipart_formdata_item_end() { return "\r\n"; }
-
-inline std::string
-serialize_multipart_formdata_finish(const std::string &boundary) {
-  return "--" + boundary + "--\r\n";
-}
-
-inline std::string
-serialize_multipart_formdata_get_content_type(const std::string &boundary) {
-  return "multipart/form-data; boundary=" + boundary;
-}
-
-inline std::string
-serialize_multipart_formdata(const MultipartFormDataItems &items,
-                             const std::string &boundary, bool finish = true) {
-  std::string body;
-
-  for (const auto &item : items) {
-    body += serialize_multipart_formdata_item_begin(item, boundary);
-    body += item.content + serialize_multipart_formdata_item_end();
-  }
-
-  if (finish) { body += serialize_multipart_formdata_finish(boundary); }
-
-  return body;
-}
-
-inline bool range_error(Request &req, Response &res) {
-  if (!req.ranges.empty() && 200 <= res.status && res.status < 300) {
-    ssize_t contant_len = static_cast<ssize_t>(
-        res.content_length_ ? res.content_length_ : res.body.size());
-
-    ssize_t prev_first_pos = -1;
-    ssize_t prev_last_pos = -1;
-    size_t overwrapping_count = 0;
-
-    // NOTE: The following Range check is based on '14.2. Range' in RFC 9110
-    // 'HTTP Semantics' to avoid potential denial-of-service attacks.
-    // https://www.rfc-editor.org/rfc/rfc9110#section-14.2
-
-    // Too many ranges
-    if (req.ranges.size() > CPPHTTPLIB_RANGE_MAX_COUNT) { return true; }
-
-    for (auto &r : req.ranges) {
-      auto &first_pos = r.first;
-      auto &last_pos = r.second;
-
-      if (first_pos == -1 && last_pos == -1) {
-        first_pos = 0;
-        last_pos = contant_len;
-      }
-
-      if (first_pos == -1) {
-        first_pos = contant_len - last_pos;
-        last_pos = contant_len - 1;
-      }
-
-      if (last_pos == -1) { last_pos = contant_len - 1; }
-
-      // Range must be within content length
-      if (!(0 <= first_pos && first_pos <= last_pos &&
-            last_pos <= contant_len - 1)) {
-        return true;
-      }
-
-      // Ranges must be in ascending order
-      if (first_pos <= prev_first_pos) { return true; }
-
-      // Request must not have more than two overlapping ranges
-      if (first_pos <= prev_last_pos) {
-        overwrapping_count++;
-        if (overwrapping_count > 2) { return true; }
-      }
-
-      prev_first_pos = (std::max)(prev_first_pos, first_pos);
-      prev_last_pos = (std::max)(prev_last_pos, last_pos);
-    }
-  }
-
-  return false;
-}
-
-inline std::pair<size_t, size_t>
-get_range_offset_and_length(Range r, size_t content_length) {
-  assert(r.first != -1 && r.second != -1);
-  assert(0 <= r.first && r.first < static_cast<ssize_t>(content_length));
-  assert(r.first <= r.second &&
-         r.second < static_cast<ssize_t>(content_length));
-
-  return std::make_pair(r.first, static_cast<size_t>(r.second - r.first) + 1);
-}
-
-inline std::string make_content_range_header_field(
-    const std::pair<size_t, size_t> &offset_and_length, size_t content_length) {
-  auto st = offset_and_length.first;
-  auto ed = st + offset_and_length.second - 1;
-
-  std::string field = "bytes ";
-  field += std::to_string(st);
-  field += "-";
-  field += std::to_string(ed);
-  field += "/";
-  field += std::to_string(content_length);
-  return field;
-}
-
-template <typename SToken, typename CToken, typename Content>
-bool process_multipart_ranges_data(const Request &req,
-                                   const std::string &boundary,
-                                   const std::string &content_type,
-                                   size_t content_length, SToken stoken,
-                                   CToken ctoken, Content content) {
-  for (size_t i = 0; i < req.ranges.size(); i++) {
-    ctoken("--");
-    stoken(boundary);
-    ctoken("\r\n");
-    if (!content_type.empty()) {
-      ctoken("Content-Type: ");
-      stoken(content_type);
-      ctoken("\r\n");
-    }
-
-    auto offset_and_length =
-        get_range_offset_and_length(req.ranges[i], content_length);
-
-    ctoken("Content-Range: ");
-    stoken(make_content_range_header_field(offset_and_length, content_length));
-    ctoken("\r\n");
-    ctoken("\r\n");
-
-    if (!content(offset_and_length.first, offset_and_length.second)) {
-      return false;
-    }
-    ctoken("\r\n");
-  }
-
-  ctoken("--");
-  stoken(boundary);
-  ctoken("--");
-
-  return true;
-}
-
-inline void make_multipart_ranges_data(const Request &req, Response &res,
-                                       const std::string &boundary,
-                                       const std::string &content_type,
-                                       size_t content_length,
-                                       std::string &data) {
-  process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { data += token; },
-      [&](const std::string &token) { data += token; },
-      [&](size_t offset, size_t length) {
-        assert(offset + length <= content_length);
-        data += res.body.substr(offset, length);
-        return true;
-      });
-}
-
-inline size_t get_multipart_ranges_data_length(const Request &req,
-                                               const std::string &boundary,
-                                               const std::string &content_type,
-                                               size_t content_length) {
-  size_t data_length = 0;
-
-  process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { data_length += token.size(); },
-      [&](const std::string &token) { data_length += token.size(); },
-      [&](size_t /*offset*/, size_t length) {
-        data_length += length;
-        return true;
-      });
-
-  return data_length;
-}
-
-template <typename T>
-inline bool
-write_multipart_ranges_data(Stream &strm, const Request &req, Response &res,
-                            const std::string &boundary,
-                            const std::string &content_type,
-                            size_t content_length, const T &is_shutting_down) {
-  return process_multipart_ranges_data(
-      req, boundary, content_type, content_length,
-      [&](const std::string &token) { strm.write(token); },
-      [&](const std::string &token) { strm.write(token); },
-      [&](size_t offset, size_t length) {
-        return write_content(strm, res.content_provider_, offset, length,
-                             is_shutting_down);
-      });
-}
-
-inline bool expect_content(const Request &req) {
-  if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" ||
-      req.method == "PRI" || req.method == "DELETE") {
-    return true;
-  }
-  // TODO: check if Content-Length is set
-  return false;
-}
-
-inline bool has_crlf(const std::string &s) {
-  auto p = s.c_str();
-  while (*p) {
-    if (*p == '\r' || *p == '\n') { return true; }
-    p++;
-  }
-  return false;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline std::string message_digest(const std::string &s, const EVP_MD *algo) {
-  auto context = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>(
-      EVP_MD_CTX_new(), EVP_MD_CTX_free);
-
-  unsigned int hash_length = 0;
-  unsigned char hash[EVP_MAX_MD_SIZE];
-
-  EVP_DigestInit_ex(context.get(), algo, nullptr);
-  EVP_DigestUpdate(context.get(), s.c_str(), s.size());
-  EVP_DigestFinal_ex(context.get(), hash, &hash_length);
-
-  std::stringstream ss;
-  for (auto i = 0u; i < hash_length; ++i) {
-    ss << std::hex << std::setw(2) << std::setfill('0')
-       << static_cast<unsigned int>(hash[i]);
-  }
-
-  return ss.str();
-}
-
-inline std::string MD5(const std::string &s) {
-  return message_digest(s, EVP_md5());
-}
-
-inline std::string SHA_256(const std::string &s) {
-  return message_digest(s, EVP_sha256());
-}
-
-inline std::string SHA_512(const std::string &s) {
-  return message_digest(s, EVP_sha512());
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-#ifdef _WIN32
-// NOTE: This code came up with the following stackoverflow post:
-// https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store
-inline bool load_system_certs_on_windows(X509_STORE *store) {
-  auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT");
-  if (!hStore) { return false; }
-
-  auto result = false;
-  PCCERT_CONTEXT pContext = NULL;
-  while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) !=
-         nullptr) {
-    auto encoded_cert =
-        static_cast<const unsigned char *>(pContext->pbCertEncoded);
-
-    auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded);
-    if (x509) {
-      X509_STORE_add_cert(store, x509);
-      X509_free(x509);
-      result = true;
-    }
-  }
-
-  CertFreeCertificateContext(pContext);
-  CertCloseStore(hStore, 0);
-
-  return result;
-}
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#if TARGET_OS_OSX
-template <typename T>
-using CFObjectPtr =
-    std::unique_ptr<typename std::remove_pointer<T>::type, void (*)(CFTypeRef)>;
-
-inline void cf_object_ptr_deleter(CFTypeRef obj) {
-  if (obj) { CFRelease(obj); }
-}
-
-inline bool retrieve_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
-  CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef};
-  CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll,
-                        kCFBooleanTrue};
-
-  CFObjectPtr<CFDictionaryRef> query(
-      CFDictionaryCreate(nullptr, reinterpret_cast<const void **>(keys), values,
-                         sizeof(keys) / sizeof(keys[0]),
-                         &kCFTypeDictionaryKeyCallBacks,
-                         &kCFTypeDictionaryValueCallBacks),
-      cf_object_ptr_deleter);
-
-  if (!query) { return false; }
-
-  CFTypeRef security_items = nullptr;
-  if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess ||
-      CFArrayGetTypeID() != CFGetTypeID(security_items)) {
-    return false;
-  }
-
-  certs.reset(reinterpret_cast<CFArrayRef>(security_items));
-  return true;
-}
-
-inline bool retrieve_root_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
-  CFArrayRef root_security_items = nullptr;
-  if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) {
-    return false;
-  }
-
-  certs.reset(root_security_items);
-  return true;
-}
-
-inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) {
-  auto result = false;
-  for (auto i = 0; i < CFArrayGetCount(certs); ++i) {
-    const auto cert = reinterpret_cast<const __SecCertificate *>(
-        CFArrayGetValueAtIndex(certs, i));
-
-    if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { continue; }
-
-    CFDataRef cert_data = nullptr;
-    if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) !=
-        errSecSuccess) {
-      continue;
-    }
-
-    CFObjectPtr<CFDataRef> cert_data_ptr(cert_data, cf_object_ptr_deleter);
-
-    auto encoded_cert = static_cast<const unsigned char *>(
-        CFDataGetBytePtr(cert_data_ptr.get()));
-
-    auto x509 =
-        d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get()));
-
-    if (x509) {
-      X509_STORE_add_cert(store, x509);
-      X509_free(x509);
-      result = true;
-    }
-  }
-
-  return result;
-}
-
-inline bool load_system_certs_on_macos(X509_STORE *store) {
-  auto result = false;
-  CFObjectPtr<CFArrayRef> certs(nullptr, cf_object_ptr_deleter);
-  if (retrieve_certs_from_keychain(certs) && certs) {
-    result = add_certs_to_x509_store(certs.get(), store);
-  }
-
-  if (retrieve_root_certs_from_keychain(certs) && certs) {
-    result = add_certs_to_x509_store(certs.get(), store) || result;
-  }
-
-  return result;
-}
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-#endif // CPPHTTPLIB_OPENSSL_SUPPORT
-
-#ifdef _WIN32
-class WSInit {
-public:
-  WSInit() {
-    WSADATA wsaData;
-    if (WSAStartup(0x0002, &wsaData) == 0) is_valid_ = true;
-  }
-
-  ~WSInit() {
-    if (is_valid_) WSACleanup();
-  }
-
-  bool is_valid_ = false;
-};
-
-static WSInit wsinit_;
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline std::pair<std::string, std::string> make_digest_authentication_header(
-    const Request &req, const std::map<std::string, std::string> &auth,
-    size_t cnonce_count, const std::string &cnonce, const std::string &username,
-    const std::string &password, bool is_proxy = false) {
-  std::string nc;
-  {
-    std::stringstream ss;
-    ss << std::setfill('0') << std::setw(8) << std::hex << cnonce_count;
-    nc = ss.str();
-  }
-
-  std::string qop;
-  if (auth.find("qop") != auth.end()) {
-    qop = auth.at("qop");
-    if (qop.find("auth-int") != std::string::npos) {
-      qop = "auth-int";
-    } else if (qop.find("auth") != std::string::npos) {
-      qop = "auth";
-    } else {
-      qop.clear();
-    }
-  }
-
-  std::string algo = "MD5";
-  if (auth.find("algorithm") != auth.end()) { algo = auth.at("algorithm"); }
-
-  std::string response;
-  {
-    auto H = algo == "SHA-256"   ? detail::SHA_256
-             : algo == "SHA-512" ? detail::SHA_512
-                                 : detail::MD5;
-
-    auto A1 = username + ":" + auth.at("realm") + ":" + password;
-
-    auto A2 = req.method + ":" + req.path;
-    if (qop == "auth-int") { A2 += ":" + H(req.body); }
-
-    if (qop.empty()) {
-      response = H(H(A1) + ":" + auth.at("nonce") + ":" + H(A2));
-    } else {
-      response = H(H(A1) + ":" + auth.at("nonce") + ":" + nc + ":" + cnonce +
-                   ":" + qop + ":" + H(A2));
-    }
-  }
-
-  auto opaque = (auth.find("opaque") != auth.end()) ? auth.at("opaque") : "";
-
-  auto field = "Digest username=\"" + username + "\", realm=\"" +
-               auth.at("realm") + "\", nonce=\"" + auth.at("nonce") +
-               "\", uri=\"" + req.path + "\", algorithm=" + algo +
-               (qop.empty() ? ", response=\""
-                            : ", qop=" + qop + ", nc=" + nc + ", cnonce=\"" +
-                                  cnonce + "\", response=\"") +
-               response + "\"" +
-               (opaque.empty() ? "" : ", opaque=\"" + opaque + "\"");
-
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, field);
-}
-#endif
-
-inline bool parse_www_authenticate(const Response &res,
-                                   std::map<std::string, std::string> &auth,
-                                   bool is_proxy) {
-  auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate";
-  if (res.has_header(auth_key)) {
-    static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~");
-    auto s = res.get_header_value(auth_key);
-    auto pos = s.find(' ');
-    if (pos != std::string::npos) {
-      auto type = s.substr(0, pos);
-      if (type == "Basic") {
-        return false;
-      } else if (type == "Digest") {
-        s = s.substr(pos + 1);
-        auto beg = std::sregex_iterator(s.begin(), s.end(), re);
-        for (auto i = beg; i != std::sregex_iterator(); ++i) {
-          const auto &m = *i;
-          auto key = s.substr(static_cast<size_t>(m.position(1)),
-                              static_cast<size_t>(m.length(1)));
-          auto val = m.length(2) > 0
-                         ? s.substr(static_cast<size_t>(m.position(2)),
-                                    static_cast<size_t>(m.length(2)))
-                         : s.substr(static_cast<size_t>(m.position(3)),
-                                    static_cast<size_t>(m.length(3)));
-          auth[key] = val;
-        }
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-class ContentProviderAdapter {
-public:
-  explicit ContentProviderAdapter(
-      ContentProviderWithoutLength &&content_provider)
-      : content_provider_(content_provider) {}
-
-  bool operator()(size_t offset, size_t, DataSink &sink) {
-    return content_provider_(offset, sink);
-  }
-
-private:
-  ContentProviderWithoutLength content_provider_;
-};
-
-} // namespace detail
-
-inline std::string hosted_at(const std::string &hostname) {
-  std::vector<std::string> addrs;
-  hosted_at(hostname, addrs);
-  if (addrs.empty()) { return std::string(); }
-  return addrs[0];
-}
-
-inline void hosted_at(const std::string &hostname,
-                      std::vector<std::string> &addrs) {
-  struct addrinfo hints;
-  struct addrinfo *result;
-
-  memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_family = AF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_protocol = 0;
-
-  if (getaddrinfo(hostname.c_str(), nullptr, &hints, &result)) {
-#if defined __linux__ && !defined __ANDROID__
-    res_init();
-#endif
-    return;
-  }
-
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    const auto &addr =
-        *reinterpret_cast<struct sockaddr_storage *>(rp->ai_addr);
-    std::string ip;
-    auto dummy = -1;
-    if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip,
-                                dummy)) {
-      addrs.push_back(ip);
-    }
-  }
-
-  freeaddrinfo(result);
-}
-
-inline std::string append_query_params(const std::string &path,
-                                       const Params &params) {
-  std::string path_with_query = path;
-  const static std::regex re("[^?]+\\?.*");
-  auto delm = std::regex_match(path, re) ? '&' : '?';
-  path_with_query += delm + detail::params_to_query_str(params);
-  return path_with_query;
-}
-
-// Header utilities
-inline std::pair<std::string, std::string>
-make_range_header(const Ranges &ranges) {
-  std::string field = "bytes=";
-  auto i = 0;
-  for (const auto &r : ranges) {
-    if (i != 0) { field += ", "; }
-    if (r.first != -1) { field += std::to_string(r.first); }
-    field += '-';
-    if (r.second != -1) { field += std::to_string(r.second); }
-    i++;
-  }
-  return std::make_pair("Range", std::move(field));
-}
-
-inline std::pair<std::string, std::string>
-make_basic_authentication_header(const std::string &username,
-                                 const std::string &password, bool is_proxy) {
-  auto field = "Basic " + detail::base64_encode(username + ":" + password);
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, std::move(field));
-}
-
-inline std::pair<std::string, std::string>
-make_bearer_token_authentication_header(const std::string &token,
-                                        bool is_proxy = false) {
-  auto field = "Bearer " + token;
-  auto key = is_proxy ? "Proxy-Authorization" : "Authorization";
-  return std::make_pair(key, std::move(field));
-}
-
-// Request implementation
-inline bool Request::has_header(const std::string &key) const {
-  return detail::has_header(headers, key);
-}
-
-inline std::string Request::get_header_value(const std::string &key,
-                                             size_t id) const {
-  return detail::get_header_value(headers, key, id, "");
-}
-
-inline size_t Request::get_header_value_count(const std::string &key) const {
-  auto r = headers.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline void Request::set_header(const std::string &key,
-                                const std::string &val) {
-  if (!detail::has_crlf(key) && !detail::has_crlf(val)) {
-    headers.emplace(key, val);
-  }
-}
-
-inline bool Request::has_param(const std::string &key) const {
-  return params.find(key) != params.end();
-}
-
-inline std::string Request::get_param_value(const std::string &key,
-                                            size_t id) const {
-  auto rng = params.equal_range(key);
-  auto it = rng.first;
-  std::advance(it, static_cast<ssize_t>(id));
-  if (it != rng.second) { return it->second; }
-  return std::string();
-}
-
-inline size_t Request::get_param_value_count(const std::string &key) const {
-  auto r = params.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline bool Request::is_multipart_form_data() const {
-  const auto &content_type = get_header_value("Content-Type");
-  return !content_type.rfind("multipart/form-data", 0);
-}
-
-inline bool Request::has_file(const std::string &key) const {
-  return files.find(key) != files.end();
-}
-
-inline MultipartFormData Request::get_file_value(const std::string &key) const {
-  auto it = files.find(key);
-  if (it != files.end()) { return it->second; }
-  return MultipartFormData();
-}
-
-inline std::vector<MultipartFormData>
-Request::get_file_values(const std::string &key) const {
-  std::vector<MultipartFormData> values;
-  auto rng = files.equal_range(key);
-  for (auto it = rng.first; it != rng.second; it++) {
-    values.push_back(it->second);
-  }
-  return values;
-}
-
-// Response implementation
-inline bool Response::has_header(const std::string &key) const {
-  return headers.find(key) != headers.end();
-}
-
-inline std::string Response::get_header_value(const std::string &key,
-                                              size_t id) const {
-  return detail::get_header_value(headers, key, id, "");
-}
-
-inline size_t Response::get_header_value_count(const std::string &key) const {
-  auto r = headers.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-inline void Response::set_header(const std::string &key,
-                                 const std::string &val) {
-  if (!detail::has_crlf(key) && !detail::has_crlf(val)) {
-    headers.emplace(key, val);
-  }
-}
-
-inline void Response::set_redirect(const std::string &url, int stat) {
-  if (!detail::has_crlf(url)) {
-    set_header("Location", url);
-    if (300 <= stat && stat < 400) {
-      this->status = stat;
-    } else {
-      this->status = StatusCode::Found_302;
-    }
-  }
-}
-
-inline void Response::set_content(const char *s, size_t n,
-                                  const std::string &content_type) {
-  body.assign(s, n);
-
-  auto rng = headers.equal_range("Content-Type");
-  headers.erase(rng.first, rng.second);
-  set_header("Content-Type", content_type);
-}
-
-inline void Response::set_content(const std::string &s,
-                                  const std::string &content_type) {
-  set_content(s.data(), s.size(), content_type);
-}
-
-inline void Response::set_content(std::string &&s,
-                                  const std::string &content_type) {
-  body = std::move(s);
-
-  auto rng = headers.equal_range("Content-Type");
-  headers.erase(rng.first, rng.second);
-  set_header("Content-Type", content_type);
-}
-
-inline void Response::set_content_provider(
-    size_t in_length, const std::string &content_type, ContentProvider provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = in_length;
-  if (in_length > 0) { content_provider_ = std::move(provider); }
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = false;
-}
-
-inline void Response::set_content_provider(
-    const std::string &content_type, ContentProviderWithoutLength provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = 0;
-  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = false;
-}
-
-inline void Response::set_chunked_content_provider(
-    const std::string &content_type, ContentProviderWithoutLength provider,
-    ContentProviderResourceReleaser resource_releaser) {
-  set_header("Content-Type", content_type);
-  content_length_ = 0;
-  content_provider_ = detail::ContentProviderAdapter(std::move(provider));
-  content_provider_resource_releaser_ = std::move(resource_releaser);
-  is_chunked_content_provider_ = true;
-}
-
-// Result implementation
-inline bool Result::has_request_header(const std::string &key) const {
-  return request_headers_.find(key) != request_headers_.end();
-}
-
-inline std::string Result::get_request_header_value(const std::string &key,
-                                                    size_t id) const {
-  return detail::get_header_value(request_headers_, key, id, "");
-}
-
-inline size_t
-Result::get_request_header_value_count(const std::string &key) const {
-  auto r = request_headers_.equal_range(key);
-  return static_cast<size_t>(std::distance(r.first, r.second));
-}
-
-// Stream implementation
-inline ssize_t Stream::write(const char *ptr) {
-  return write(ptr, strlen(ptr));
-}
-
-inline ssize_t Stream::write(const std::string &s) {
-  return write(s.data(), s.size());
-}
-
-namespace detail {
-
-// Socket stream implementation
-inline SocketStream::SocketStream(socket_t sock, time_t read_timeout_sec,
-                                  time_t read_timeout_usec,
-                                  time_t write_timeout_sec,
-                                  time_t write_timeout_usec)
-    : sock_(sock), read_timeout_sec_(read_timeout_sec),
-      read_timeout_usec_(read_timeout_usec),
-      write_timeout_sec_(write_timeout_sec),
-      write_timeout_usec_(write_timeout_usec), read_buff_(read_buff_size_, 0) {}
-
-inline SocketStream::~SocketStream() = default;
-
-inline bool SocketStream::is_readable() const {
-  return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
-}
-
-inline bool SocketStream::is_writable() const {
-  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
-         is_socket_alive(sock_);
-}
-
-inline ssize_t SocketStream::read(char *ptr, size_t size) {
-#ifdef _WIN32
-  size =
-      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
-#else
-  size = (std::min)(size,
-                    static_cast<size_t>((std::numeric_limits<ssize_t>::max)()));
-#endif
-
-  if (read_buff_off_ < read_buff_content_size_) {
-    auto remaining_size = read_buff_content_size_ - read_buff_off_;
-    if (size <= remaining_size) {
-      memcpy(ptr, read_buff_.data() + read_buff_off_, size);
-      read_buff_off_ += size;
-      return static_cast<ssize_t>(size);
-    } else {
-      memcpy(ptr, read_buff_.data() + read_buff_off_, remaining_size);
-      read_buff_off_ += remaining_size;
-      return static_cast<ssize_t>(remaining_size);
-    }
-  }
-
-  if (!is_readable()) { return -1; }
-
-  read_buff_off_ = 0;
-  read_buff_content_size_ = 0;
-
-  if (size < read_buff_size_) {
-    auto n = read_socket(sock_, read_buff_.data(), read_buff_size_,
-                         CPPHTTPLIB_RECV_FLAGS);
-    if (n <= 0) {
-      return n;
-    } else if (n <= static_cast<ssize_t>(size)) {
-      memcpy(ptr, read_buff_.data(), static_cast<size_t>(n));
-      return n;
-    } else {
-      memcpy(ptr, read_buff_.data(), size);
-      read_buff_off_ = size;
-      read_buff_content_size_ = static_cast<size_t>(n);
-      return static_cast<ssize_t>(size);
-    }
-  } else {
-    return read_socket(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS);
-  }
-}
-
-inline ssize_t SocketStream::write(const char *ptr, size_t size) {
-  if (!is_writable()) { return -1; }
-
-#if defined(_WIN32) && !defined(_WIN64)
-  size =
-      (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
-#endif
-
-  return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS);
-}
-
-inline void SocketStream::get_remote_ip_and_port(std::string &ip,
-                                                 int &port) const {
-  return detail::get_remote_ip_and_port(sock_, ip, port);
-}
-
-inline void SocketStream::get_local_ip_and_port(std::string &ip,
-                                                int &port) const {
-  return detail::get_local_ip_and_port(sock_, ip, port);
-}
-
-inline socket_t SocketStream::socket() const { return sock_; }
-
-// Buffer stream implementation
-inline bool BufferStream::is_readable() const { return true; }
-
-inline bool BufferStream::is_writable() const { return true; }
-
-inline ssize_t BufferStream::read(char *ptr, size_t size) {
-#if defined(_MSC_VER) && _MSC_VER < 1910
-  auto len_read = buffer._Copy_s(ptr, size, size, position);
-#else
-  auto len_read = buffer.copy(ptr, size, position);
-#endif
-  position += static_cast<size_t>(len_read);
-  return static_cast<ssize_t>(len_read);
-}
-
-inline ssize_t BufferStream::write(const char *ptr, size_t size) {
-  buffer.append(ptr, size);
-  return static_cast<ssize_t>(size);
-}
-
-inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/,
-                                                 int & /*port*/) const {}
-
-inline void BufferStream::get_local_ip_and_port(std::string & /*ip*/,
-                                                int & /*port*/) const {}
-
-inline socket_t BufferStream::socket() const { return 0; }
-
-inline const std::string &BufferStream::get_buffer() const { return buffer; }
-
-inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) {
-  // One past the last ending position of a path param substring
-  std::size_t last_param_end = 0;
-
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-  // Needed to ensure that parameter names are unique during matcher
-  // construction
-  // If exceptions are disabled, only last duplicate path
-  // parameter will be set
-  std::unordered_set<std::string> param_name_set;
-#endif
-
-  while (true) {
-    const auto marker_pos = pattern.find(marker, last_param_end);
-    if (marker_pos == std::string::npos) { break; }
-
-    static_fragments_.push_back(
-        pattern.substr(last_param_end, marker_pos - last_param_end));
-
-    const auto param_name_start = marker_pos + 1;
-
-    auto sep_pos = pattern.find(separator, param_name_start);
-    if (sep_pos == std::string::npos) { sep_pos = pattern.length(); }
-
-    auto param_name =
-        pattern.substr(param_name_start, sep_pos - param_name_start);
-
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-    if (param_name_set.find(param_name) != param_name_set.cend()) {
-      std::string msg = "Encountered path parameter '" + param_name +
-                        "' multiple times in route pattern '" + pattern + "'.";
-      throw std::invalid_argument(msg);
-    }
-#endif
-
-    param_names_.push_back(std::move(param_name));
-
-    last_param_end = sep_pos + 1;
-  }
-
-  if (last_param_end < pattern.length()) {
-    static_fragments_.push_back(pattern.substr(last_param_end));
-  }
-}
-
-inline bool PathParamsMatcher::match(Request &request) const {
-  request.matches = std::smatch();
-  request.path_params.clear();
-  request.path_params.reserve(param_names_.size());
-
-  // One past the position at which the path matched the pattern last time
-  std::size_t starting_pos = 0;
-  for (size_t i = 0; i < static_fragments_.size(); ++i) {
-    const auto &fragment = static_fragments_[i];
-
-    if (starting_pos + fragment.length() > request.path.length()) {
-      return false;
-    }
-
-    // Avoid unnecessary allocation by using strncmp instead of substr +
-    // comparison
-    if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(),
-                     fragment.length()) != 0) {
-      return false;
-    }
-
-    starting_pos += fragment.length();
-
-    // Should only happen when we have a static fragment after a param
-    // Example: '/users/:id/subscriptions'
-    // The 'subscriptions' fragment here does not have a corresponding param
-    if (i >= param_names_.size()) { continue; }
-
-    auto sep_pos = request.path.find(separator, starting_pos);
-    if (sep_pos == std::string::npos) { sep_pos = request.path.length(); }
-
-    const auto &param_name = param_names_[i];
-
-    request.path_params.emplace(
-        param_name, request.path.substr(starting_pos, sep_pos - starting_pos));
-
-    // Mark everythin up to '/' as matched
-    starting_pos = sep_pos + 1;
-  }
-  // Returns false if the path is longer than the pattern
-  return starting_pos >= request.path.length();
-}
-
-inline bool RegexMatcher::match(Request &request) const {
-  request.path_params.clear();
-  return std::regex_match(request.path, request.matches, regex_);
-}
-
-} // namespace detail
-
-// HTTP server implementation
-inline Server::Server()
-    : new_task_queue(
-          [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }) {
-#ifndef _WIN32
-  signal(SIGPIPE, SIG_IGN);
-#endif
-}
-
-inline Server::~Server() = default;
-
-inline std::unique_ptr<detail::MatcherBase>
-Server::make_matcher(const std::string &pattern) {
-  if (pattern.find("/:") != std::string::npos) {
-    return detail::make_unique<detail::PathParamsMatcher>(pattern);
-  } else {
-    return detail::make_unique<detail::RegexMatcher>(pattern);
-  }
-}
-
-inline Server &Server::Get(const std::string &pattern, Handler handler) {
-  get_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Post(const std::string &pattern, Handler handler) {
-  post_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Post(const std::string &pattern,
-                            HandlerWithContentReader handler) {
-  post_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                 std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Put(const std::string &pattern, Handler handler) {
-  put_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Put(const std::string &pattern,
-                           HandlerWithContentReader handler) {
-  put_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Patch(const std::string &pattern, Handler handler) {
-  patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Patch(const std::string &pattern,
-                             HandlerWithContentReader handler) {
-  patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                  std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Delete(const std::string &pattern, Handler handler) {
-  delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Delete(const std::string &pattern,
-                              HandlerWithContentReader handler) {
-  delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
-                                                   std::move(handler));
-  return *this;
-}
-
-inline Server &Server::Options(const std::string &pattern, Handler handler) {
-  options_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
-  return *this;
-}
-
-inline bool Server::set_base_dir(const std::string &dir,
-                                 const std::string &mount_point) {
-  return set_mount_point(mount_point, dir);
-}
-
-inline bool Server::set_mount_point(const std::string &mount_point,
-                                    const std::string &dir, Headers headers) {
-  if (detail::is_dir(dir)) {
-    std::string mnt = !mount_point.empty() ? mount_point : "/";
-    if (!mnt.empty() && mnt[0] == '/') {
-      base_dirs_.push_back({mnt, dir, std::move(headers)});
-      return true;
-    }
-  }
-  return false;
-}
-
-inline bool Server::remove_mount_point(const std::string &mount_point) {
-  for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) {
-    if (it->mount_point == mount_point) {
-      base_dirs_.erase(it);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline Server &
-Server::set_file_extension_and_mimetype_mapping(const std::string &ext,
-                                                const std::string &mime) {
-  file_extension_and_mimetype_map_[ext] = mime;
-  return *this;
-}
-
-inline Server &Server::set_default_file_mimetype(const std::string &mime) {
-  default_file_mimetype_ = mime;
-  return *this;
-}
-
-inline Server &Server::set_file_request_handler(Handler handler) {
-  file_request_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_error_handler(HandlerWithResponse handler) {
-  error_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_error_handler(Handler handler) {
-  error_handler_ = [handler](const Request &req, Response &res) {
-    handler(req, res);
-    return HandlerResponse::Handled;
-  };
-  return *this;
-}
-
-inline Server &Server::set_exception_handler(ExceptionHandler handler) {
-  exception_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) {
-  pre_routing_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_post_routing_handler(Handler handler) {
-  post_routing_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_logger(Logger logger) {
-  logger_ = std::move(logger);
-  return *this;
-}
-
-inline Server &
-Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) {
-  expect_100_continue_handler_ = std::move(handler);
-  return *this;
-}
-
-inline Server &Server::set_address_family(int family) {
-  address_family_ = family;
-  return *this;
-}
-
-inline Server &Server::set_tcp_nodelay(bool on) {
-  tcp_nodelay_ = on;
-  return *this;
-}
-
-inline Server &Server::set_socket_options(SocketOptions socket_options) {
-  socket_options_ = std::move(socket_options);
-  return *this;
-}
-
-inline Server &Server::set_default_headers(Headers headers) {
-  default_headers_ = std::move(headers);
-  return *this;
-}
-
-inline Server &Server::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  header_writer_ = writer;
-  return *this;
-}
-
-inline Server &Server::set_keep_alive_max_count(size_t count) {
-  keep_alive_max_count_ = count;
-  return *this;
-}
-
-inline Server &Server::set_keep_alive_timeout(time_t sec) {
-  keep_alive_timeout_sec_ = sec;
-  return *this;
-}
-
-inline Server &Server::set_read_timeout(time_t sec, time_t usec) {
-  read_timeout_sec_ = sec;
-  read_timeout_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_write_timeout(time_t sec, time_t usec) {
-  write_timeout_sec_ = sec;
-  write_timeout_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_idle_interval(time_t sec, time_t usec) {
-  idle_interval_sec_ = sec;
-  idle_interval_usec_ = usec;
-  return *this;
-}
-
-inline Server &Server::set_payload_max_length(size_t length) {
-  payload_max_length_ = length;
-  return *this;
-}
-
-inline bool Server::bind_to_port(const std::string &host, int port,
-                                 int socket_flags) {
-  return bind_internal(host, port, socket_flags) >= 0;
-}
-inline int Server::bind_to_any_port(const std::string &host, int socket_flags) {
-  return bind_internal(host, 0, socket_flags);
-}
-
-inline bool Server::listen_after_bind() {
-  auto se = detail::scope_exit([&]() { done_ = true; });
-  return listen_internal();
-}
-
-inline bool Server::listen(const std::string &host, int port,
-                           int socket_flags) {
-  auto se = detail::scope_exit([&]() { done_ = true; });
-  return bind_to_port(host, port, socket_flags) && listen_internal();
-}
-
-inline bool Server::is_running() const { return is_running_; }
-
-inline void Server::wait_until_ready() const {
-  while (!is_running() && !done_) {
-    std::this_thread::sleep_for(std::chrono::milliseconds{1});
-  }
-}
-
-inline void Server::stop() {
-  if (is_running_) {
-    assert(svr_sock_ != INVALID_SOCKET);
-    std::atomic<socket_t> sock(svr_sock_.exchange(INVALID_SOCKET));
-    detail::shutdown_socket(sock);
-    detail::close_socket(sock);
-  }
-}
-
-inline bool Server::parse_request_line(const char *s, Request &req) const {
-  auto len = strlen(s);
-  if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { return false; }
-  len -= 2;
-
-  {
-    size_t count = 0;
-
-    detail::split(s, s + len, ' ', [&](const char *b, const char *e) {
-      switch (count) {
-      case 0: req.method = std::string(b, e); break;
-      case 1: req.target = std::string(b, e); break;
-      case 2: req.version = std::string(b, e); break;
-      default: break;
-      }
-      count++;
-    });
-
-    if (count != 3) { return false; }
-  }
-
-  static const std::set<std::string> methods{
-      "GET",     "HEAD",    "POST",  "PUT",   "DELETE",
-      "CONNECT", "OPTIONS", "TRACE", "PATCH", "PRI"};
-
-  if (methods.find(req.method) == methods.end()) { return false; }
-
-  if (req.version != "HTTP/1.1" && req.version != "HTTP/1.0") { return false; }
-
-  {
-    // Skip URL fragment
-    for (size_t i = 0; i < req.target.size(); i++) {
-      if (req.target[i] == '#') {
-        req.target.erase(i);
-        break;
-      }
-    }
-
-    size_t count = 0;
-
-    detail::split(req.target.data(), req.target.data() + req.target.size(), '?',
-                  2, [&](const char *b, const char *e) {
-                    switch (count) {
-                    case 0:
-                      req.path = detail::decode_url(std::string(b, e), false);
-                      break;
-                    case 1: {
-                      if (e - b > 0) {
-                        detail::parse_query_text(std::string(b, e), req.params);
-                      }
-                      break;
-                    }
-                    default: break;
-                    }
-                    count++;
-                  });
-
-    if (count > 2) { return false; }
-  }
-
-  return true;
-}
-
-inline bool Server::write_response(Stream &strm, bool close_connection,
-                                   Request &req, Response &res) {
-  // NOTE: `req.ranges` should be empty, otherwise it will be applied
-  // incorrectly to the error content.
-  req.ranges.clear();
-  return write_response_core(strm, close_connection, req, res, false);
-}
-
-inline bool Server::write_response_with_content(Stream &strm,
-                                                bool close_connection,
-                                                const Request &req,
-                                                Response &res) {
-  return write_response_core(strm, close_connection, req, res, true);
-}
-
-inline bool Server::write_response_core(Stream &strm, bool close_connection,
-                                        const Request &req, Response &res,
-                                        bool need_apply_ranges) {
-  assert(res.status != -1);
-
-  if (400 <= res.status && error_handler_ &&
-      error_handler_(req, res) == HandlerResponse::Handled) {
-    need_apply_ranges = true;
-  }
-
-  std::string content_type;
-  std::string boundary;
-  if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); }
-
-  // Prepare additional headers
-  if (close_connection || req.get_header_value("Connection") == "close") {
-    res.set_header("Connection", "close");
-  } else {
-    std::stringstream ss;
-    ss << "timeout=" << keep_alive_timeout_sec_
-       << ", max=" << keep_alive_max_count_;
-    res.set_header("Keep-Alive", ss.str());
-  }
-
-  if (!res.has_header("Content-Type") &&
-      (!res.body.empty() || res.content_length_ > 0 || res.content_provider_)) {
-    res.set_header("Content-Type", "text/plain");
-  }
-
-  if (!res.has_header("Content-Length") && res.body.empty() &&
-      !res.content_length_ && !res.content_provider_) {
-    res.set_header("Content-Length", "0");
-  }
-
-  if (!res.has_header("Accept-Ranges") && req.method == "HEAD") {
-    res.set_header("Accept-Ranges", "bytes");
-  }
-
-  if (post_routing_handler_) { post_routing_handler_(req, res); }
-
-  // Response line and headers
-  {
-    detail::BufferStream bstrm;
-
-    if (!bstrm.write_format("HTTP/1.1 %d %s\r\n", res.status,
-                            status_message(res.status))) {
-      return false;
-    }
-
-    if (!header_writer_(bstrm, res.headers)) { return false; }
-
-    // Flush buffer
-    auto &data = bstrm.get_buffer();
-    detail::write_data(strm, data.data(), data.size());
-  }
-
-  // Body
-  auto ret = true;
-  if (req.method != "HEAD") {
-    if (!res.body.empty()) {
-      if (!detail::write_data(strm, res.body.data(), res.body.size())) {
-        ret = false;
-      }
-    } else if (res.content_provider_) {
-      if (write_content_with_provider(strm, req, res, boundary, content_type)) {
-        res.content_provider_success_ = true;
-      } else {
-        ret = false;
-      }
-    }
-  }
-
-  // Log
-  if (logger_) { logger_(req, res); }
-
-  return ret;
-}
-
-inline bool
-Server::write_content_with_provider(Stream &strm, const Request &req,
-                                    Response &res, const std::string &boundary,
-                                    const std::string &content_type) {
-  auto is_shutting_down = [this]() {
-    return this->svr_sock_ == INVALID_SOCKET;
-  };
-
-  if (res.content_length_ > 0) {
-    if (req.ranges.empty()) {
-      return detail::write_content(strm, res.content_provider_, 0,
-                                   res.content_length_, is_shutting_down);
-    } else if (req.ranges.size() == 1) {
-      auto offset_and_length = detail::get_range_offset_and_length(
-          req.ranges[0], res.content_length_);
-
-      return detail::write_content(strm, res.content_provider_,
-                                   offset_and_length.first,
-                                   offset_and_length.second, is_shutting_down);
-    } else {
-      return detail::write_multipart_ranges_data(
-          strm, req, res, boundary, content_type, res.content_length_,
-          is_shutting_down);
-    }
-  } else {
-    if (res.is_chunked_content_provider_) {
-      auto type = detail::encoding_type(req, res);
-
-      std::unique_ptr<detail::compressor> compressor;
-      if (type == detail::EncodingType::Gzip) {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-        compressor = detail::make_unique<detail::gzip_compressor>();
-#endif
-      } else if (type == detail::EncodingType::Brotli) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-        compressor = detail::make_unique<detail::brotli_compressor>();
-#endif
-      } else {
-        compressor = detail::make_unique<detail::nocompressor>();
-      }
-      assert(compressor != nullptr);
-
-      return detail::write_content_chunked(strm, res.content_provider_,
-                                           is_shutting_down, *compressor);
-    } else {
-      return detail::write_content_without_length(strm, res.content_provider_,
-                                                  is_shutting_down);
-    }
-  }
-}
-
-inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
-  MultipartFormDataMap::iterator cur;
-  auto file_count = 0;
-  if (read_content_core(
-          strm, req, res,
-          // Regular
-          [&](const char *buf, size_t n) {
-            if (req.body.size() + n > req.body.max_size()) { return false; }
-            req.body.append(buf, n);
-            return true;
-          },
-          // Multipart
-          [&](const MultipartFormData &file) {
-            if (file_count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) {
-              return false;
-            }
-            cur = req.files.emplace(file.name, file);
-            return true;
-          },
-          [&](const char *buf, size_t n) {
-            auto &content = cur->second.content;
-            if (content.size() + n > content.max_size()) { return false; }
-            content.append(buf, n);
-            return true;
-          })) {
-    const auto &content_type = req.get_header_value("Content-Type");
-    if (!content_type.find("application/x-www-form-urlencoded")) {
-      if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) {
-        res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414?
-        return false;
-      }
-      detail::parse_query_text(req.body, req.params);
-    }
-    return true;
-  }
-  return false;
-}
-
-inline bool Server::read_content_with_content_receiver(
-    Stream &strm, Request &req, Response &res, ContentReceiver receiver,
-    MultipartContentHeader multipart_header,
-    ContentReceiver multipart_receiver) {
-  return read_content_core(strm, req, res, std::move(receiver),
-                           std::move(multipart_header),
-                           std::move(multipart_receiver));
-}
-
-inline bool
-Server::read_content_core(Stream &strm, Request &req, Response &res,
-                          ContentReceiver receiver,
-                          MultipartContentHeader multipart_header,
-                          ContentReceiver multipart_receiver) const {
-  detail::MultipartFormDataParser multipart_form_data_parser;
-  ContentReceiverWithProgress out;
-
-  if (req.is_multipart_form_data()) {
-    const auto &content_type = req.get_header_value("Content-Type");
-    std::string boundary;
-    if (!detail::parse_multipart_boundary(content_type, boundary)) {
-      res.status = StatusCode::BadRequest_400;
-      return false;
-    }
-
-    multipart_form_data_parser.set_boundary(std::move(boundary));
-    out = [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) {
-      /* For debug
-      size_t pos = 0;
-      while (pos < n) {
-        auto read_size = (std::min)<size_t>(1, n - pos);
-        auto ret = multipart_form_data_parser.parse(
-            buf + pos, read_size, multipart_receiver, multipart_header);
-        if (!ret) { return false; }
-        pos += read_size;
-      }
-      return true;
-      */
-      return multipart_form_data_parser.parse(buf, n, multipart_receiver,
-                                              multipart_header);
-    };
-  } else {
-    out = [receiver](const char *buf, size_t n, uint64_t /*off*/,
-                     uint64_t /*len*/) { return receiver(buf, n); };
-  }
-
-  if (req.method == "DELETE" && !req.has_header("Content-Length")) {
-    return true;
-  }
-
-  if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr,
-                            out, true)) {
-    return false;
-  }
-
-  if (req.is_multipart_form_data()) {
-    if (!multipart_form_data_parser.is_valid()) {
-      res.status = StatusCode::BadRequest_400;
-      return false;
-    }
-  }
-
-  return true;
-}
-
-inline bool Server::handle_file_request(const Request &req, Response &res,
-                                        bool head) {
-  for (const auto &entry : base_dirs_) {
-    // Prefix match
-    if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) {
-      std::string sub_path = "/" + req.path.substr(entry.mount_point.size());
-      if (detail::is_valid_path(sub_path)) {
-        auto path = entry.base_dir + sub_path;
-        if (path.back() == '/') { path += "index.html"; }
-
-        if (detail::is_file(path)) {
-          for (const auto &kv : entry.headers) {
-            res.set_header(kv.first, kv.second);
-          }
-
-          auto mm = std::make_shared<detail::mmap>(path.c_str());
-          if (!mm->is_open()) { return false; }
-
-          res.set_content_provider(
-              mm->size(),
-              detail::find_content_type(path, file_extension_and_mimetype_map_,
-                                        default_file_mimetype_),
-              [mm](size_t offset, size_t length, DataSink &sink) -> bool {
-                sink.write(mm->data() + offset, length);
-                return true;
-              });
-
-          if (!head && file_request_handler_) {
-            file_request_handler_(req, res);
-          }
-
-          return true;
-        }
-      }
-    }
-  }
-  return false;
-}
-
-inline socket_t
-Server::create_server_socket(const std::string &host, int port,
-                             int socket_flags,
-                             SocketOptions socket_options) const {
-  return detail::create_socket(
-      host, std::string(), port, address_family_, socket_flags, tcp_nodelay_,
-      std::move(socket_options),
-      [](socket_t sock, struct addrinfo &ai) -> bool {
-        if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
-          return false;
-        }
-        if (::listen(sock, CPPHTTPLIB_LISTEN_BACKLOG)) { return false; }
-        return true;
-      });
-}
-
-inline int Server::bind_internal(const std::string &host, int port,
-                                 int socket_flags) {
-  if (!is_valid()) { return -1; }
-
-  svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_);
-  if (svr_sock_ == INVALID_SOCKET) { return -1; }
-
-  if (port == 0) {
-    struct sockaddr_storage addr;
-    socklen_t addr_len = sizeof(addr);
-    if (getsockname(svr_sock_, reinterpret_cast<struct sockaddr *>(&addr),
-                    &addr_len) == -1) {
-      return -1;
-    }
-    if (addr.ss_family == AF_INET) {
-      return ntohs(reinterpret_cast<struct sockaddr_in *>(&addr)->sin_port);
-    } else if (addr.ss_family == AF_INET6) {
-      return ntohs(reinterpret_cast<struct sockaddr_in6 *>(&addr)->sin6_port);
-    } else {
-      return -1;
-    }
-  } else {
-    return port;
-  }
-}
-
-inline bool Server::listen_internal() {
-  auto ret = true;
-  is_running_ = true;
-  auto se = detail::scope_exit([&]() { is_running_ = false; });
-
-  {
-    std::unique_ptr<TaskQueue> task_queue(new_task_queue());
-
-    while (svr_sock_ != INVALID_SOCKET) {
-#ifndef _WIN32
-      if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) {
-#endif
-        auto val = detail::select_read(svr_sock_, idle_interval_sec_,
-                                       idle_interval_usec_);
-        if (val == 0) { // Timeout
-          task_queue->on_idle();
-          continue;
-        }
-#ifndef _WIN32
-      }
-#endif
-      socket_t sock = accept(svr_sock_, nullptr, nullptr);
-
-      if (sock == INVALID_SOCKET) {
-        if (errno == EMFILE) {
-          // The per-process limit of open file descriptors has been reached.
-          // Try to accept new connections after a short sleep.
-          std::this_thread::sleep_for(std::chrono::milliseconds(1));
-          continue;
-        } else if (errno == EINTR || errno == EAGAIN) {
-          continue;
-        }
-        if (svr_sock_ != INVALID_SOCKET) {
-          detail::close_socket(svr_sock_);
-          ret = false;
-        } else {
-          ; // The server socket was closed by user.
-        }
-        break;
-      }
-
-      {
-#ifdef _WIN32
-        auto timeout = static_cast<uint32_t>(read_timeout_sec_ * 1000 +
-                                             read_timeout_usec_ / 1000);
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-        timeval tv;
-        tv.tv_sec = static_cast<long>(read_timeout_sec_);
-        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_);
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
-                   reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-      }
-      {
-
-#ifdef _WIN32
-        auto timeout = static_cast<uint32_t>(write_timeout_sec_ * 1000 +
-                                             write_timeout_usec_ / 1000);
-        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
-                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-#else
-        timeval tv;
-        tv.tv_sec = static_cast<long>(write_timeout_sec_);
-        tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec_);
-        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
-                   reinterpret_cast<const void *>(&tv), sizeof(tv));
-#endif
-      }
-
-      if (!task_queue->enqueue(
-              [this, sock]() { process_and_close_socket(sock); })) {
-        detail::shutdown_socket(sock);
-        detail::close_socket(sock);
-      }
-    }
-
-    task_queue->shutdown();
-  }
-
-  return ret;
-}
-
-inline bool Server::routing(Request &req, Response &res, Stream &strm) {
-  if (pre_routing_handler_ &&
-      pre_routing_handler_(req, res) == HandlerResponse::Handled) {
-    return true;
-  }
-
-  // File handler
-  auto is_head_request = req.method == "HEAD";
-  if ((req.method == "GET" || is_head_request) &&
-      handle_file_request(req, res, is_head_request)) {
-    return true;
-  }
-
-  if (detail::expect_content(req)) {
-    // Content reader handler
-    {
-      ContentReader reader(
-          [&](ContentReceiver receiver) {
-            return read_content_with_content_receiver(
-                strm, req, res, std::move(receiver), nullptr, nullptr);
-          },
-          [&](MultipartContentHeader header, ContentReceiver receiver) {
-            return read_content_with_content_receiver(strm, req, res, nullptr,
-                                                      std::move(header),
-                                                      std::move(receiver));
-          });
-
-      if (req.method == "POST") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                post_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "PUT") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                put_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "PATCH") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                patch_handlers_for_content_reader_)) {
-          return true;
-        }
-      } else if (req.method == "DELETE") {
-        if (dispatch_request_for_content_reader(
-                req, res, std::move(reader),
-                delete_handlers_for_content_reader_)) {
-          return true;
-        }
-      }
-    }
-
-    // Read content into `req.body`
-    if (!read_content(strm, req, res)) { return false; }
-  }
-
-  // Regular handler
-  if (req.method == "GET" || req.method == "HEAD") {
-    return dispatch_request(req, res, get_handlers_);
-  } else if (req.method == "POST") {
-    return dispatch_request(req, res, post_handlers_);
-  } else if (req.method == "PUT") {
-    return dispatch_request(req, res, put_handlers_);
-  } else if (req.method == "DELETE") {
-    return dispatch_request(req, res, delete_handlers_);
-  } else if (req.method == "OPTIONS") {
-    return dispatch_request(req, res, options_handlers_);
-  } else if (req.method == "PATCH") {
-    return dispatch_request(req, res, patch_handlers_);
-  }
-
-  res.status = StatusCode::BadRequest_400;
-  return false;
-}
-
-inline bool Server::dispatch_request(Request &req, Response &res,
-                                     const Handlers &handlers) const {
-  for (const auto &x : handlers) {
-    const auto &matcher = x.first;
-    const auto &handler = x.second;
-
-    if (matcher->match(req)) {
-      handler(req, res);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline void Server::apply_ranges(const Request &req, Response &res,
-                                 std::string &content_type,
-                                 std::string &boundary) const {
-  if (req.ranges.size() > 1) {
-    auto it = res.headers.find("Content-Type");
-    if (it != res.headers.end()) {
-      content_type = it->second;
-      res.headers.erase(it);
-    }
-
-    boundary = detail::make_multipart_data_boundary();
-
-    res.set_header("Content-Type",
-                   "multipart/byteranges; boundary=" + boundary);
-  }
-
-  auto type = detail::encoding_type(req, res);
-
-  if (res.body.empty()) {
-    if (res.content_length_ > 0) {
-      size_t length = 0;
-      if (req.ranges.empty()) {
-        length = res.content_length_;
-      } else if (req.ranges.size() == 1) {
-        auto offset_and_length = detail::get_range_offset_and_length(
-            req.ranges[0], res.content_length_);
-
-        length = offset_and_length.second;
-
-        auto content_range = detail::make_content_range_header_field(
-            offset_and_length, res.content_length_);
-        res.set_header("Content-Range", content_range);
-      } else {
-        length = detail::get_multipart_ranges_data_length(
-            req, boundary, content_type, res.content_length_);
-      }
-      res.set_header("Content-Length", std::to_string(length));
-    } else {
-      if (res.content_provider_) {
-        if (res.is_chunked_content_provider_) {
-          res.set_header("Transfer-Encoding", "chunked");
-          if (type == detail::EncodingType::Gzip) {
-            res.set_header("Content-Encoding", "gzip");
-          } else if (type == detail::EncodingType::Brotli) {
-            res.set_header("Content-Encoding", "br");
-          }
-        }
-      }
-    }
-  } else {
-    if (req.ranges.empty()) {
-      ;
-    } else if (req.ranges.size() == 1) {
-      auto offset_and_length =
-          detail::get_range_offset_and_length(req.ranges[0], res.body.size());
-      auto offset = offset_and_length.first;
-      auto length = offset_and_length.second;
-
-      auto content_range = detail::make_content_range_header_field(
-          offset_and_length, res.body.size());
-      res.set_header("Content-Range", content_range);
-
-      assert(offset + length <= res.body.size());
-      res.body = res.body.substr(offset, length);
-    } else {
-      std::string data;
-      detail::make_multipart_ranges_data(req, res, boundary, content_type,
-                                         res.body.size(), data);
-      res.body.swap(data);
-    }
-
-    if (type != detail::EncodingType::None) {
-      std::unique_ptr<detail::compressor> compressor;
-      std::string content_encoding;
-
-      if (type == detail::EncodingType::Gzip) {
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-        compressor = detail::make_unique<detail::gzip_compressor>();
-        content_encoding = "gzip";
-#endif
-      } else if (type == detail::EncodingType::Brotli) {
-#ifdef CPPHTTPLIB_BROTLI_SUPPORT
-        compressor = detail::make_unique<detail::brotli_compressor>();
-        content_encoding = "br";
-#endif
-      }
-
-      if (compressor) {
-        std::string compressed;
-        if (compressor->compress(res.body.data(), res.body.size(), true,
-                                 [&](const char *data, size_t data_len) {
-                                   compressed.append(data, data_len);
-                                   return true;
-                                 })) {
-          res.body.swap(compressed);
-          res.set_header("Content-Encoding", content_encoding);
-        }
-      }
-    }
-
-    auto length = std::to_string(res.body.size());
-    res.set_header("Content-Length", length);
-  }
-}
-
-inline bool Server::dispatch_request_for_content_reader(
-    Request &req, Response &res, ContentReader content_reader,
-    const HandlersForContentReader &handlers) const {
-  for (const auto &x : handlers) {
-    const auto &matcher = x.first;
-    const auto &handler = x.second;
-
-    if (matcher->match(req)) {
-      handler(req, res, content_reader);
-      return true;
-    }
-  }
-  return false;
-}
-
-inline bool
-Server::process_request(Stream &strm, bool close_connection,
-                        bool &connection_closed,
-                        const std::function<void(Request &)> &setup_request) {
-  std::array<char, 2048> buf{};
-
-  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
-
-  // Connection has been closed on client
-  if (!line_reader.getline()) { return false; }
-
-  Request req;
-
-  Response res;
-  res.version = "HTTP/1.1";
-  res.headers = default_headers_;
-
-#ifdef _WIN32
-  // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL).
-#else
-#ifndef CPPHTTPLIB_USE_POLL
-  // Socket file descriptor exceeded FD_SETSIZE...
-  if (strm.socket() >= FD_SETSIZE) {
-    Headers dummy;
-    detail::read_headers(strm, dummy);
-    res.status = StatusCode::InternalServerError_500;
-    return write_response(strm, close_connection, req, res);
-  }
-#endif
-#endif
-
-  // Check if the request URI doesn't exceed the limit
-  if (line_reader.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
-    Headers dummy;
-    detail::read_headers(strm, dummy);
-    res.status = StatusCode::UriTooLong_414;
-    return write_response(strm, close_connection, req, res);
-  }
-
-  // Request line and headers
-  if (!parse_request_line(line_reader.ptr(), req) ||
-      !detail::read_headers(strm, req.headers)) {
-    res.status = StatusCode::BadRequest_400;
-    return write_response(strm, close_connection, req, res);
-  }
-
-  if (req.get_header_value("Connection") == "close") {
-    connection_closed = true;
-  }
-
-  if (req.version == "HTTP/1.0" &&
-      req.get_header_value("Connection") != "Keep-Alive") {
-    connection_closed = true;
-  }
-
-  strm.get_remote_ip_and_port(req.remote_addr, req.remote_port);
-  req.set_header("REMOTE_ADDR", req.remote_addr);
-  req.set_header("REMOTE_PORT", std::to_string(req.remote_port));
-
-  strm.get_local_ip_and_port(req.local_addr, req.local_port);
-  req.set_header("LOCAL_ADDR", req.local_addr);
-  req.set_header("LOCAL_PORT", std::to_string(req.local_port));
-
-  if (req.has_header("Range")) {
-    const auto &range_header_value = req.get_header_value("Range");
-    if (!detail::parse_range_header(range_header_value, req.ranges)) {
-      res.status = StatusCode::RangeNotSatisfiable_416;
-      return write_response(strm, close_connection, req, res);
-    }
-  }
-
-  if (setup_request) { setup_request(req); }
-
-  if (req.get_header_value("Expect") == "100-continue") {
-    int status = StatusCode::Continue_100;
-    if (expect_100_continue_handler_) {
-      status = expect_100_continue_handler_(req, res);
-    }
-    switch (status) {
-    case StatusCode::Continue_100:
-    case StatusCode::ExpectationFailed_417:
-      strm.write_format("HTTP/1.1 %d %s\r\n\r\n", status,
-                        status_message(status));
-      break;
-    default: return write_response(strm, close_connection, req, res);
-    }
-  }
-
-  // Routing
-  auto routed = false;
-#ifdef CPPHTTPLIB_NO_EXCEPTIONS
-  routed = routing(req, res, strm);
-#else
-  try {
-    routed = routing(req, res, strm);
-  } catch (std::exception &e) {
-    if (exception_handler_) {
-      auto ep = std::current_exception();
-      exception_handler_(req, res, ep);
-      routed = true;
-    } else {
-      res.status = StatusCode::InternalServerError_500;
-      std::string val;
-      auto s = e.what();
-      for (size_t i = 0; s[i]; i++) {
-        switch (s[i]) {
-        case '\r': val += "\\r"; break;
-        case '\n': val += "\\n"; break;
-        default: val += s[i]; break;
-        }
-      }
-      res.set_header("EXCEPTION_WHAT", val);
-    }
-  } catch (...) {
-    if (exception_handler_) {
-      auto ep = std::current_exception();
-      exception_handler_(req, res, ep);
-      routed = true;
-    } else {
-      res.status = StatusCode::InternalServerError_500;
-      res.set_header("EXCEPTION_WHAT", "UNKNOWN");
-    }
-  }
-#endif
-  if (routed) {
-    if (res.status == -1) {
-      res.status = req.ranges.empty() ? StatusCode::OK_200
-                                      : StatusCode::PartialContent_206;
-    }
-
-    if (detail::range_error(req, res)) {
-      res.body.clear();
-      res.content_length_ = 0;
-      res.content_provider_ = nullptr;
-      res.status = StatusCode::RangeNotSatisfiable_416;
-      return write_response(strm, close_connection, req, res);
-    }
-
-    return write_response_with_content(strm, close_connection, req, res);
-  } else {
-    if (res.status == -1) { res.status = StatusCode::NotFound_404; }
-
-    return write_response(strm, close_connection, req, res);
-  }
-}
-
-inline bool Server::is_valid() const { return true; }
-
-inline bool Server::process_and_close_socket(socket_t sock) {
-  auto ret = detail::process_server_socket(
-      svr_sock_, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
-      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_,
-      [this](Stream &strm, bool close_connection, bool &connection_closed) {
-        return process_request(strm, close_connection, connection_closed,
-                               nullptr);
-      });
-
-  detail::shutdown_socket(sock);
-  detail::close_socket(sock);
-  return ret;
-}
-
-// HTTP client implementation
-inline ClientImpl::ClientImpl(const std::string &host)
-    : ClientImpl(host, 80, std::string(), std::string()) {}
-
-inline ClientImpl::ClientImpl(const std::string &host, int port)
-    : ClientImpl(host, port, std::string(), std::string()) {}
-
-inline ClientImpl::ClientImpl(const std::string &host, int port,
-                              const std::string &client_cert_path,
-                              const std::string &client_key_path)
-    : host_(host), port_(port),
-      host_and_port_(adjust_host_string(host) + ":" + std::to_string(port)),
-      client_cert_path_(client_cert_path), client_key_path_(client_key_path) {}
-
-inline ClientImpl::~ClientImpl() {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-  shutdown_socket(socket_);
-  close_socket(socket_);
-}
-
-inline bool ClientImpl::is_valid() const { return true; }
-
-inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
-  client_cert_path_ = rhs.client_cert_path_;
-  client_key_path_ = rhs.client_key_path_;
-  connection_timeout_sec_ = rhs.connection_timeout_sec_;
-  read_timeout_sec_ = rhs.read_timeout_sec_;
-  read_timeout_usec_ = rhs.read_timeout_usec_;
-  write_timeout_sec_ = rhs.write_timeout_sec_;
-  write_timeout_usec_ = rhs.write_timeout_usec_;
-  basic_auth_username_ = rhs.basic_auth_username_;
-  basic_auth_password_ = rhs.basic_auth_password_;
-  bearer_token_auth_token_ = rhs.bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  digest_auth_username_ = rhs.digest_auth_username_;
-  digest_auth_password_ = rhs.digest_auth_password_;
-#endif
-  keep_alive_ = rhs.keep_alive_;
-  follow_location_ = rhs.follow_location_;
-  url_encode_ = rhs.url_encode_;
-  address_family_ = rhs.address_family_;
-  tcp_nodelay_ = rhs.tcp_nodelay_;
-  socket_options_ = rhs.socket_options_;
-  compress_ = rhs.compress_;
-  decompress_ = rhs.decompress_;
-  interface_ = rhs.interface_;
-  proxy_host_ = rhs.proxy_host_;
-  proxy_port_ = rhs.proxy_port_;
-  proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_;
-  proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_;
-  proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_;
-  proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_;
-#endif
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  ca_cert_file_path_ = rhs.ca_cert_file_path_;
-  ca_cert_dir_path_ = rhs.ca_cert_dir_path_;
-  ca_cert_store_ = rhs.ca_cert_store_;
-#endif
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  server_certificate_verification_ = rhs.server_certificate_verification_;
-#endif
-  logger_ = rhs.logger_;
-}
-
-inline socket_t ClientImpl::create_client_socket(Error &error) const {
-  if (!proxy_host_.empty() && proxy_port_ != -1) {
-    return detail::create_client_socket(
-        proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_,
-        socket_options_, connection_timeout_sec_, connection_timeout_usec_,
-        read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-        write_timeout_usec_, interface_, error);
-  }
-
-  // Check is custom IP specified for host_
-  std::string ip;
-  auto it = addr_map_.find(host_);
-  if (it != addr_map_.end()) { ip = it->second; }
-
-  return detail::create_client_socket(
-      host_, ip, port_, address_family_, tcp_nodelay_, socket_options_,
-      connection_timeout_sec_, connection_timeout_usec_, read_timeout_sec_,
-      read_timeout_usec_, write_timeout_sec_, write_timeout_usec_, interface_,
-      error);
-}
-
-inline bool ClientImpl::create_and_connect_socket(Socket &socket,
-                                                  Error &error) {
-  auto sock = create_client_socket(error);
-  if (sock == INVALID_SOCKET) { return false; }
-  socket.sock = sock;
-  return true;
-}
-
-inline void ClientImpl::shutdown_ssl(Socket & /*socket*/,
-                                     bool /*shutdown_gracefully*/) {
-  // If there are any requests in flight from threads other than us, then it's
-  // a thread-unsafe race because individual ssl* objects are not thread-safe.
-  assert(socket_requests_in_flight_ == 0 ||
-         socket_requests_are_from_thread_ == std::this_thread::get_id());
-}
-
-inline void ClientImpl::shutdown_socket(Socket &socket) const {
-  if (socket.sock == INVALID_SOCKET) { return; }
-  detail::shutdown_socket(socket.sock);
-}
-
-inline void ClientImpl::close_socket(Socket &socket) {
-  // If there are requests in flight in another thread, usually closing
-  // the socket will be fine and they will simply receive an error when
-  // using the closed socket, but it is still a bug since rarely the OS
-  // may reassign the socket id to be used for a new socket, and then
-  // suddenly they will be operating on a live socket that is different
-  // than the one they intended!
-  assert(socket_requests_in_flight_ == 0 ||
-         socket_requests_are_from_thread_ == std::this_thread::get_id());
-
-  // It is also a bug if this happens while SSL is still active
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  assert(socket.ssl == nullptr);
-#endif
-  if (socket.sock == INVALID_SOCKET) { return; }
-  detail::close_socket(socket.sock);
-  socket.sock = INVALID_SOCKET;
-}
-
-inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
-                                           Response &res) const {
-  std::array<char, 2048> buf{};
-
-  detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
-
-  if (!line_reader.getline()) { return false; }
-
-#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n");
-#else
-  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
-#endif
-
-  std::cmatch m;
-  if (!std::regex_match(line_reader.ptr(), m, re)) {
-    return req.method == "CONNECT";
-  }
-  res.version = std::string(m[1]);
-  res.status = std::stoi(std::string(m[2]));
-  res.reason = std::string(m[3]);
-
-  // Ignore '100 Continue'
-  while (res.status == StatusCode::Continue_100) {
-    if (!line_reader.getline()) { return false; } // CRLF
-    if (!line_reader.getline()) { return false; } // next response line
-
-    if (!std::regex_match(line_reader.ptr(), m, re)) { return false; }
-    res.version = std::string(m[1]);
-    res.status = std::stoi(std::string(m[2]));
-    res.reason = std::string(m[3]);
-  }
-
-  return true;
-}
-
-inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
-  std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_);
-  auto ret = send_(req, res, error);
-  if (error == Error::SSLPeerCouldBeClosed_) {
-    assert(!ret);
-    ret = send_(req, res, error);
-  }
-  return ret;
-}
-
-inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
-  {
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-
-    // Set this to false immediately - if it ever gets set to true by the end of
-    // the request, we know another thread instructed us to close the socket.
-    socket_should_be_closed_when_request_is_done_ = false;
-
-    auto is_alive = false;
-    if (socket_.is_open()) {
-      is_alive = detail::is_socket_alive(socket_.sock);
-      if (!is_alive) {
-        // Attempt to avoid sigpipe by shutting down nongracefully if it seems
-        // like the other side has already closed the connection Also, there
-        // cannot be any requests in flight from other threads since we locked
-        // request_mutex_, so safe to close everything immediately
-        const bool shutdown_gracefully = false;
-        shutdown_ssl(socket_, shutdown_gracefully);
-        shutdown_socket(socket_);
-        close_socket(socket_);
-      }
-    }
-
-    if (!is_alive) {
-      if (!create_and_connect_socket(socket_, error)) { return false; }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      // TODO: refactoring
-      if (is_ssl()) {
-        auto &scli = static_cast<SSLClient &>(*this);
-        if (!proxy_host_.empty() && proxy_port_ != -1) {
-          auto success = false;
-          if (!scli.connect_with_proxy(socket_, res, success, error)) {
-            return success;
-          }
-        }
-
-        if (!scli.initialize_ssl(socket_, error)) { return false; }
-      }
-#endif
-    }
-
-    // Mark the current socket as being in use so that it cannot be closed by
-    // anyone else while this request is ongoing, even though we will be
-    // releasing the mutex.
-    if (socket_requests_in_flight_ > 1) {
-      assert(socket_requests_are_from_thread_ == std::this_thread::get_id());
-    }
-    socket_requests_in_flight_ += 1;
-    socket_requests_are_from_thread_ = std::this_thread::get_id();
-  }
-
-  for (const auto &header : default_headers_) {
-    if (req.headers.find(header.first) == req.headers.end()) {
-      req.headers.insert(header);
-    }
-  }
-
-  auto ret = false;
-  auto close_connection = !keep_alive_;
-
-  auto se = detail::scope_exit([&]() {
-    // Briefly lock mutex in order to mark that a request is no longer ongoing
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-    socket_requests_in_flight_ -= 1;
-    if (socket_requests_in_flight_ <= 0) {
-      assert(socket_requests_in_flight_ == 0);
-      socket_requests_are_from_thread_ = std::thread::id();
-    }
-
-    if (socket_should_be_closed_when_request_is_done_ || close_connection ||
-        !ret) {
-      shutdown_ssl(socket_, true);
-      shutdown_socket(socket_);
-      close_socket(socket_);
-    }
-  });
-
-  ret = process_socket(socket_, [&](Stream &strm) {
-    return handle_request(strm, req, res, close_connection, error);
-  });
-
-  if (!ret) {
-    if (error == Error::Success) { error = Error::Unknown; }
-  }
-
-  return ret;
-}
-
-inline Result ClientImpl::send(const Request &req) {
-  auto req2 = req;
-  return send_(std::move(req2));
-}
-
-inline Result ClientImpl::send_(Request &&req) {
-  auto res = detail::make_unique<Response>();
-  auto error = Error::Success;
-  auto ret = send(req, *res, error);
-  return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)};
-}
-
-inline bool ClientImpl::handle_request(Stream &strm, Request &req,
-                                       Response &res, bool close_connection,
-                                       Error &error) {
-  if (req.path.empty()) {
-    error = Error::Connection;
-    return false;
-  }
-
-  auto req_save = req;
-
-  bool ret;
-
-  if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) {
-    auto req2 = req;
-    req2.path = "http://" + host_and_port_ + req.path;
-    ret = process_request(strm, req2, res, close_connection, error);
-    req = req2;
-    req.path = req_save.path;
-  } else {
-    ret = process_request(strm, req, res, close_connection, error);
-  }
-
-  if (!ret) { return false; }
-
-  if (res.get_header_value("Connection") == "close" ||
-      (res.version == "HTTP/1.0" && res.reason != "Connection established")) {
-    // TODO this requires a not-entirely-obvious chain of calls to be correct
-    // for this to be safe.
-
-    // This is safe to call because handle_request is only called by send_
-    // which locks the request mutex during the process. It would be a bug
-    // to call it from a different thread since it's a thread-safety issue
-    // to do these things to the socket if another thread is using the socket.
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-    shutdown_ssl(socket_, true);
-    shutdown_socket(socket_);
-    close_socket(socket_);
-  }
-
-  if (300 < res.status && res.status < 400 && follow_location_) {
-    req = req_save;
-    ret = redirect(req, res, error);
-  }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  if ((res.status == StatusCode::Unauthorized_401 ||
-       res.status == StatusCode::ProxyAuthenticationRequired_407) &&
-      req.authorization_count_ < 5) {
-    auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407;
-    const auto &username =
-        is_proxy ? proxy_digest_auth_username_ : digest_auth_username_;
-    const auto &password =
-        is_proxy ? proxy_digest_auth_password_ : digest_auth_password_;
-
-    if (!username.empty() && !password.empty()) {
-      std::map<std::string, std::string> auth;
-      if (detail::parse_www_authenticate(res, auth, is_proxy)) {
-        Request new_req = req;
-        new_req.authorization_count_ += 1;
-        new_req.headers.erase(is_proxy ? "Proxy-Authorization"
-                                       : "Authorization");
-        new_req.headers.insert(detail::make_digest_authentication_header(
-            req, auth, new_req.authorization_count_, detail::random_string(10),
-            username, password, is_proxy));
-
-        Response new_res;
-
-        ret = send(new_req, new_res, error);
-        if (ret) { res = new_res; }
-      }
-    }
-  }
-#endif
-
-  return ret;
-}
-
-inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
-  if (req.redirect_count_ == 0) {
-    error = Error::ExceedRedirectCount;
-    return false;
-  }
-
-  auto location = res.get_header_value("location");
-  if (location.empty()) { return false; }
-
-  const static std::regex re(
-      R"((?:(https?):)?(?://(?:\[([\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)");
-
-  std::smatch m;
-  if (!std::regex_match(location, m, re)) { return false; }
-
-  auto scheme = is_ssl() ? "https" : "http";
-
-  auto next_scheme = m[1].str();
-  auto next_host = m[2].str();
-  if (next_host.empty()) { next_host = m[3].str(); }
-  auto port_str = m[4].str();
-  auto next_path = m[5].str();
-  auto next_query = m[6].str();
-
-  auto next_port = port_;
-  if (!port_str.empty()) {
-    next_port = std::stoi(port_str);
-  } else if (!next_scheme.empty()) {
-    next_port = next_scheme == "https" ? 443 : 80;
-  }
-
-  if (next_scheme.empty()) { next_scheme = scheme; }
-  if (next_host.empty()) { next_host = host_; }
-  if (next_path.empty()) { next_path = "/"; }
-
-  auto path = detail::decode_url(next_path, true) + next_query;
-
-  if (next_scheme == scheme && next_host == host_ && next_port == port_) {
-    return detail::redirect(*this, req, res, path, location, error);
-  } else {
-    if (next_scheme == "https") {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      SSLClient cli(next_host, next_port);
-      cli.copy_settings(*this);
-      if (ca_cert_store_) { cli.set_ca_cert_store(ca_cert_store_); }
-      return detail::redirect(cli, req, res, path, location, error);
-#else
-      return false;
-#endif
-    } else {
-      ClientImpl cli(next_host, next_port);
-      cli.copy_settings(*this);
-      return detail::redirect(cli, req, res, path, location, error);
-    }
-  }
-}
-
-inline bool ClientImpl::write_content_with_provider(Stream &strm,
-                                                    const Request &req,
-                                                    Error &error) const {
-  auto is_shutting_down = []() { return false; };
-
-  if (req.is_chunked_content_provider_) {
-    // TODO: Brotli support
-    std::unique_ptr<detail::compressor> compressor;
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-    if (compress_) {
-      compressor = detail::make_unique<detail::gzip_compressor>();
-    } else
-#endif
-    {
-      compressor = detail::make_unique<detail::nocompressor>();
-    }
-
-    return detail::write_content_chunked(strm, req.content_provider_,
-                                         is_shutting_down, *compressor, error);
-  } else {
-    return detail::write_content(strm, req.content_provider_, 0,
-                                 req.content_length_, is_shutting_down, error);
-  }
-}
-
-inline bool ClientImpl::write_request(Stream &strm, Request &req,
-                                      bool close_connection, Error &error) {
-  // Prepare additional headers
-  if (close_connection) {
-    if (!req.has_header("Connection")) {
-      req.set_header("Connection", "close");
-    }
-  }
-
-  if (!req.has_header("Host")) {
-    if (is_ssl()) {
-      if (port_ == 443) {
-        req.set_header("Host", host_);
-      } else {
-        req.set_header("Host", host_and_port_);
-      }
-    } else {
-      if (port_ == 80) {
-        req.set_header("Host", host_);
-      } else {
-        req.set_header("Host", host_and_port_);
-      }
-    }
-  }
-
-  if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); }
-
-#ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT
-  if (!req.has_header("User-Agent")) {
-    auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION;
-    req.set_header("User-Agent", agent);
-  }
-#endif
-
-  if (req.body.empty()) {
-    if (req.content_provider_) {
-      if (!req.is_chunked_content_provider_) {
-        if (!req.has_header("Content-Length")) {
-          auto length = std::to_string(req.content_length_);
-          req.set_header("Content-Length", length);
-        }
-      }
-    } else {
-      if (req.method == "POST" || req.method == "PUT" ||
-          req.method == "PATCH") {
-        req.set_header("Content-Length", "0");
-      }
-    }
-  } else {
-    if (!req.has_header("Content-Type")) {
-      req.set_header("Content-Type", "text/plain");
-    }
-
-    if (!req.has_header("Content-Length")) {
-      auto length = std::to_string(req.body.size());
-      req.set_header("Content-Length", length);
-    }
-  }
-
-  if (!basic_auth_password_.empty() || !basic_auth_username_.empty()) {
-    if (!req.has_header("Authorization")) {
-      req.headers.insert(make_basic_authentication_header(
-          basic_auth_username_, basic_auth_password_, false));
-    }
-  }
-
-  if (!proxy_basic_auth_username_.empty() &&
-      !proxy_basic_auth_password_.empty()) {
-    if (!req.has_header("Proxy-Authorization")) {
-      req.headers.insert(make_basic_authentication_header(
-          proxy_basic_auth_username_, proxy_basic_auth_password_, true));
-    }
-  }
-
-  if (!bearer_token_auth_token_.empty()) {
-    if (!req.has_header("Authorization")) {
-      req.headers.insert(make_bearer_token_authentication_header(
-          bearer_token_auth_token_, false));
-    }
-  }
-
-  if (!proxy_bearer_token_auth_token_.empty()) {
-    if (!req.has_header("Proxy-Authorization")) {
-      req.headers.insert(make_bearer_token_authentication_header(
-          proxy_bearer_token_auth_token_, true));
-    }
-  }
-
-  // Request line and headers
-  {
-    detail::BufferStream bstrm;
-
-    const auto &path = url_encode_ ? detail::encode_url(req.path) : req.path;
-    bstrm.write_format("%s %s HTTP/1.1\r\n", req.method.c_str(), path.c_str());
-
-    header_writer_(bstrm, req.headers);
-
-    // Flush buffer
-    auto &data = bstrm.get_buffer();
-    if (!detail::write_data(strm, data.data(), data.size())) {
-      error = Error::Write;
-      return false;
-    }
-  }
-
-  // Body
-  if (req.body.empty()) {
-    return write_content_with_provider(strm, req, error);
-  }
-
-  if (!detail::write_data(strm, req.body.data(), req.body.size())) {
-    error = Error::Write;
-    return false;
-  }
-
-  return true;
-}
-
-inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
-    Request &req, const char *body, size_t content_length,
-    ContentProvider content_provider,
-    ContentProviderWithoutLength content_provider_without_length,
-    const std::string &content_type, Error &error) {
-  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  if (compress_) { req.set_header("Content-Encoding", "gzip"); }
-#endif
-
-#ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  if (compress_ && !content_provider_without_length) {
-    // TODO: Brotli support
-    detail::gzip_compressor compressor;
-
-    if (content_provider) {
-      auto ok = true;
-      size_t offset = 0;
-      DataSink data_sink;
-
-      data_sink.write = [&](const char *data, size_t data_len) -> bool {
-        if (ok) {
-          auto last = offset + data_len == content_length;
-
-          auto ret = compressor.compress(
-              data, data_len, last,
-              [&](const char *compressed_data, size_t compressed_data_len) {
-                req.body.append(compressed_data, compressed_data_len);
-                return true;
-              });
-
-          if (ret) {
-            offset += data_len;
-          } else {
-            ok = false;
-          }
-        }
-        return ok;
-      };
-
-      while (ok && offset < content_length) {
-        if (!content_provider(offset, content_length - offset, data_sink)) {
-          error = Error::Canceled;
-          return nullptr;
-        }
-      }
-    } else {
-      if (!compressor.compress(body, content_length, true,
-                               [&](const char *data, size_t data_len) {
-                                 req.body.append(data, data_len);
-                                 return true;
-                               })) {
-        error = Error::Compression;
-        return nullptr;
-      }
-    }
-  } else
-#endif
-  {
-    if (content_provider) {
-      req.content_length_ = content_length;
-      req.content_provider_ = std::move(content_provider);
-      req.is_chunked_content_provider_ = false;
-    } else if (content_provider_without_length) {
-      req.content_length_ = 0;
-      req.content_provider_ = detail::ContentProviderAdapter(
-          std::move(content_provider_without_length));
-      req.is_chunked_content_provider_ = true;
-      req.set_header("Transfer-Encoding", "chunked");
-    } else {
-      req.body.assign(body, content_length);
-    }
-  }
-
-  auto res = detail::make_unique<Response>();
-  return send(req, *res, error) ? std::move(res) : nullptr;
-}
-
-inline Result ClientImpl::send_with_content_provider(
-    const std::string &method, const std::string &path, const Headers &headers,
-    const char *body, size_t content_length, ContentProvider content_provider,
-    ContentProviderWithoutLength content_provider_without_length,
-    const std::string &content_type) {
-  Request req;
-  req.method = method;
-  req.headers = headers;
-  req.path = path;
-
-  auto error = Error::Success;
-
-  auto res = send_with_content_provider(
-      req, body, content_length, std::move(content_provider),
-      std::move(content_provider_without_length), content_type, error);
-
-  return Result{std::move(res), error, std::move(req.headers)};
-}
-
-inline std::string
-ClientImpl::adjust_host_string(const std::string &host) const {
-  if (host.find(':') != std::string::npos) { return "[" + host + "]"; }
-  return host;
-}
-
-inline bool ClientImpl::process_request(Stream &strm, Request &req,
-                                        Response &res, bool close_connection,
-                                        Error &error) {
-  // Send request
-  if (!write_request(strm, req, close_connection, error)) { return false; }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  if (is_ssl()) {
-    auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1;
-    if (!is_proxy_enabled) {
-      char buf[1];
-      if (SSL_peek(socket_.ssl, buf, 1) == 0 &&
-          SSL_get_error(socket_.ssl, 0) == SSL_ERROR_ZERO_RETURN) {
-        error = Error::SSLPeerCouldBeClosed_;
-        return false;
-      }
-    }
-  }
-#endif
-
-  // Receive response and headers
-  if (!read_response_line(strm, req, res) ||
-      !detail::read_headers(strm, res.headers)) {
-    error = Error::Read;
-    return false;
-  }
-
-  // Body
-  if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" &&
-      req.method != "CONNECT") {
-    auto redirect = 300 < res.status && res.status < 400 && follow_location_;
-
-    if (req.response_handler && !redirect) {
-      if (!req.response_handler(res)) {
-        error = Error::Canceled;
-        return false;
-      }
-    }
-
-    auto out =
-        req.content_receiver
-            ? static_cast<ContentReceiverWithProgress>(
-                  [&](const char *buf, size_t n, uint64_t off, uint64_t len) {
-                    if (redirect) { return true; }
-                    auto ret = req.content_receiver(buf, n, off, len);
-                    if (!ret) { error = Error::Canceled; }
-                    return ret;
-                  })
-            : static_cast<ContentReceiverWithProgress>(
-                  [&](const char *buf, size_t n, uint64_t /*off*/,
-                      uint64_t /*len*/) {
-                    if (res.body.size() + n > res.body.max_size()) {
-                      return false;
-                    }
-                    res.body.append(buf, n);
-                    return true;
-                  });
-
-    auto progress = [&](uint64_t current, uint64_t total) {
-      if (!req.progress || redirect) { return true; }
-      auto ret = req.progress(current, total);
-      if (!ret) { error = Error::Canceled; }
-      return ret;
-    };
-
-    int dummy_status;
-    if (!detail::read_content(strm, res, (std::numeric_limits<size_t>::max)(),
-                              dummy_status, std::move(progress), std::move(out),
-                              decompress_)) {
-      if (error != Error::Canceled) { error = Error::Read; }
-      return false;
-    }
-  }
-
-  // Log
-  if (logger_) { logger_(req, res); }
-
-  return true;
-}
-
-inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider(
-    const std::string &boundary, const MultipartFormDataItems &items,
-    const MultipartFormDataProviderItems &provider_items) const {
-  size_t cur_item = 0;
-  size_t cur_start = 0;
-  // cur_item and cur_start are copied to within the std::function and maintain
-  // state between successive calls
-  return [&, cur_item, cur_start](size_t offset,
-                                  DataSink &sink) mutable -> bool {
-    if (!offset && !items.empty()) {
-      sink.os << detail::serialize_multipart_formdata(items, boundary, false);
-      return true;
-    } else if (cur_item < provider_items.size()) {
-      if (!cur_start) {
-        const auto &begin = detail::serialize_multipart_formdata_item_begin(
-            provider_items[cur_item], boundary);
-        offset += begin.size();
-        cur_start = offset;
-        sink.os << begin;
-      }
-
-      DataSink cur_sink;
-      auto has_data = true;
-      cur_sink.write = sink.write;
-      cur_sink.done = [&]() { has_data = false; };
-
-      if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) {
-        return false;
-      }
-
-      if (!has_data) {
-        sink.os << detail::serialize_multipart_formdata_item_end();
-        cur_item++;
-        cur_start = 0;
-      }
-      return true;
-    } else {
-      sink.os << detail::serialize_multipart_formdata_finish(boundary);
-      sink.done();
-      return true;
-    }
-  };
-}
-
-inline bool
-ClientImpl::process_socket(const Socket &socket,
-                           std::function<bool(Stream &strm)> callback) {
-  return detail::process_client_socket(
-      socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_, std::move(callback));
-}
-
-inline bool ClientImpl::is_ssl() const { return false; }
-
-inline Result ClientImpl::Get(const std::string &path) {
-  return Get(path, Headers(), Progress());
-}
-
-inline Result ClientImpl::Get(const std::string &path, Progress progress) {
-  return Get(path, Headers(), std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers) {
-  return Get(path, headers, Progress());
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              Progress progress) {
-  Request req;
-  req.method = "GET";
-  req.path = path;
-  req.headers = headers;
-  req.progress = std::move(progress);
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ContentReceiver content_receiver) {
-  return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, Headers(), nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ContentReceiver content_receiver) {
-  return Get(path, headers, nullptr, std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, headers, nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver) {
-  return Get(path, Headers(), std::move(response_handler),
-             std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver) {
-  return Get(path, headers, std::move(response_handler),
-             std::move(content_receiver), nullptr);
-}
-
-inline Result ClientImpl::Get(const std::string &path,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, Headers(), std::move(response_handler),
-             std::move(content_receiver), std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  Request req;
-  req.method = "GET";
-  req.path = path;
-  req.headers = headers;
-  req.response_handler = std::move(response_handler);
-  req.content_receiver =
-      [content_receiver](const char *data, size_t data_length,
-                         uint64_t /*offset*/, uint64_t /*total_length*/) {
-        return content_receiver(data, data_length);
-      };
-  req.progress = std::move(progress);
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers, Progress progress) {
-  if (params.empty()) { return Get(path, headers); }
-
-  std::string path_with_query = append_query_params(path, params);
-  return Get(path_with_query, headers, std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  return Get(path, params, headers, nullptr, std::move(content_receiver),
-             std::move(progress));
-}
-
-inline Result ClientImpl::Get(const std::string &path, const Params &params,
-                              const Headers &headers,
-                              ResponseHandler response_handler,
-                              ContentReceiver content_receiver,
-                              Progress progress) {
-  if (params.empty()) {
-    return Get(path, headers, std::move(response_handler),
-               std::move(content_receiver), std::move(progress));
-  }
-
-  std::string path_with_query = append_query_params(path, params);
-  return Get(path_with_query, headers, std::move(response_handler),
-             std::move(content_receiver), std::move(progress));
-}
-
-inline Result ClientImpl::Head(const std::string &path) {
-  return Head(path, Headers());
-}
-
-inline Result ClientImpl::Head(const std::string &path,
-                               const Headers &headers) {
-  Request req;
-  req.method = "HEAD";
-  req.headers = headers;
-  req.path = path;
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Post(const std::string &path) {
-  return Post(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               const Headers &headers) {
-  return Post(path, headers, nullptr, 0, std::string());
-}
-
-inline Result ClientImpl::Post(const std::string &path, const char *body,
-                               size_t content_length,
-                               const std::string &content_type) {
-  return Post(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const char *body, size_t content_length,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const std::string &body,
-                               const std::string &content_type) {
-  return Post(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const std::string &body,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr,
-                                    content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Params &params) {
-  return Post(path, Headers(), params);
-}
-
-inline Result ClientImpl::Post(const std::string &path, size_t content_length,
-                               ContentProvider content_provider,
-                               const std::string &content_type) {
-  return Post(path, Headers(), content_length, std::move(content_provider),
-              content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               ContentProviderWithoutLength content_provider,
-                               const std::string &content_type) {
-  return Post(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               size_t content_length,
-                               ContentProvider content_provider,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               ContentProviderWithoutLength content_provider,
-                               const std::string &content_type) {
-  return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const Params &params) {
-  auto query = detail::params_to_query_str(params);
-  return Post(path, headers, query, "application/x-www-form-urlencoded");
-}
-
-inline Result ClientImpl::Post(const std::string &path,
-                               const MultipartFormDataItems &items) {
-  return Post(path, Headers(), items);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const MultipartFormDataItems &items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Post(path, headers, body, content_type);
-}
-
-inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
-                               const MultipartFormDataItems &items,
-                               const std::string &boundary) {
-  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
-    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
-  }
-
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Post(path, headers, body, content_type);
-}
-
-inline Result
-ClientImpl::Post(const std::string &path, const Headers &headers,
-                 const MultipartFormDataItems &items,
-                 const MultipartFormDataProviderItems &provider_items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  return send_with_content_provider(
-      "POST", path, headers, nullptr, 0, nullptr,
-      get_multipart_content_provider(boundary, items, provider_items),
-      content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path) {
-  return Put(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Put(const std::string &path, const char *body,
-                              size_t content_length,
-                              const std::string &content_type) {
-  return Put(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const char *body, size_t content_length,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, body, content_length,
-                                    nullptr, nullptr, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const std::string &body,
-                              const std::string &content_type) {
-  return Put(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const std::string &body,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr,
-                                    content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, size_t content_length,
-                              ContentProvider content_provider,
-                              const std::string &content_type) {
-  return Put(path, Headers(), content_length, std::move(content_provider),
-             content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path,
-                              ContentProviderWithoutLength content_provider,
-                              const std::string &content_type) {
-  return Put(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              size_t content_length,
-                              ContentProvider content_provider,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              ContentProviderWithoutLength content_provider,
-                              const std::string &content_type) {
-  return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Params &params) {
-  return Put(path, Headers(), params);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const Params &params) {
-  auto query = detail::params_to_query_str(params);
-  return Put(path, headers, query, "application/x-www-form-urlencoded");
-}
-
-inline Result ClientImpl::Put(const std::string &path,
-                              const MultipartFormDataItems &items) {
-  return Put(path, Headers(), items);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const MultipartFormDataItems &items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Put(path, headers, body, content_type);
-}
-
-inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
-                              const MultipartFormDataItems &items,
-                              const std::string &boundary) {
-  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
-    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
-  }
-
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  const auto &body = detail::serialize_multipart_formdata(items, boundary);
-  return Put(path, headers, body, content_type);
-}
-
-inline Result
-ClientImpl::Put(const std::string &path, const Headers &headers,
-                const MultipartFormDataItems &items,
-                const MultipartFormDataProviderItems &provider_items) {
-  const auto &boundary = detail::make_multipart_data_boundary();
-  const auto &content_type =
-      detail::serialize_multipart_formdata_get_content_type(boundary);
-  return send_with_content_provider(
-      "PUT", path, headers, nullptr, 0, nullptr,
-      get_multipart_content_provider(boundary, items, provider_items),
-      content_type);
-}
-inline Result ClientImpl::Patch(const std::string &path) {
-  return Patch(path, std::string(), std::string());
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const char *body,
-                                size_t content_length,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const char *body, size_t content_length,
-                                const std::string &content_type) {
-  return send_with_content_provider("PATCH", path, headers, body,
-                                    content_length, nullptr, nullptr,
-                                    content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path,
-                                const std::string &body,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), body, content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                const std::string &body,
-                                const std::string &content_type) {
-  return send_with_content_provider("PATCH", path, headers, body.data(),
-                                    body.size(), nullptr, nullptr,
-                                    content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, size_t content_length,
-                                ContentProvider content_provider,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), content_length, std::move(content_provider),
-               content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path,
-                                ContentProviderWithoutLength content_provider,
-                                const std::string &content_type) {
-  return Patch(path, Headers(), std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                size_t content_length,
-                                ContentProvider content_provider,
-                                const std::string &content_type) {
-  return send_with_content_provider("PATCH", path, headers, nullptr,
-                                    content_length, std::move(content_provider),
-                                    nullptr, content_type);
-}
-
-inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
-                                ContentProviderWithoutLength content_provider,
-                                const std::string &content_type) {
-  return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr,
-                                    std::move(content_provider), content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path) {
-  return Delete(path, Headers(), std::string(), std::string());
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers) {
-  return Delete(path, headers, std::string(), std::string());
-}
-
-inline Result ClientImpl::Delete(const std::string &path, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type) {
-  return Delete(path, Headers(), body, content_length, content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers, const char *body,
-                                 size_t content_length,
-                                 const std::string &content_type) {
-  Request req;
-  req.method = "DELETE";
-  req.headers = headers;
-  req.path = path;
-
-  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
-  req.body.assign(body, content_length);
-
-  return send_(std::move(req));
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const std::string &body,
-                                 const std::string &content_type) {
-  return Delete(path, Headers(), body.data(), body.size(), content_type);
-}
-
-inline Result ClientImpl::Delete(const std::string &path,
-                                 const Headers &headers,
-                                 const std::string &body,
-                                 const std::string &content_type) {
-  return Delete(path, headers, body.data(), body.size(), content_type);
-}
-
-inline Result ClientImpl::Options(const std::string &path) {
-  return Options(path, Headers());
-}
-
-inline Result ClientImpl::Options(const std::string &path,
-                                  const Headers &headers) {
-  Request req;
-  req.method = "OPTIONS";
-  req.headers = headers;
-  req.path = path;
-
-  return send_(std::move(req));
-}
-
-inline void ClientImpl::stop() {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-
-  // If there is anything ongoing right now, the ONLY thread-safe thing we can
-  // do is to shutdown_socket, so that threads using this socket suddenly
-  // discover they can't read/write any more and error out. Everything else
-  // (closing the socket, shutting ssl down) is unsafe because these actions are
-  // not thread-safe.
-  if (socket_requests_in_flight_ > 0) {
-    shutdown_socket(socket_);
-
-    // Aside from that, we set a flag for the socket to be closed when we're
-    // done.
-    socket_should_be_closed_when_request_is_done_ = true;
-    return;
-  }
-
-  // Otherwise, still holding the mutex, we can shut everything down ourselves
-  shutdown_ssl(socket_, true);
-  shutdown_socket(socket_);
-  close_socket(socket_);
-}
-
-inline std::string ClientImpl::host() const { return host_; }
-
-inline int ClientImpl::port() const { return port_; }
-
-inline size_t ClientImpl::is_socket_open() const {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-  return socket_.is_open();
-}
-
-inline socket_t ClientImpl::socket() const { return socket_.sock; }
-
-inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) {
-  connection_timeout_sec_ = sec;
-  connection_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) {
-  read_timeout_sec_ = sec;
-  read_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) {
-  write_timeout_sec_ = sec;
-  write_timeout_usec_ = usec;
-}
-
-inline void ClientImpl::set_basic_auth(const std::string &username,
-                                       const std::string &password) {
-  basic_auth_username_ = username;
-  basic_auth_password_ = password;
-}
-
-inline void ClientImpl::set_bearer_token_auth(const std::string &token) {
-  bearer_token_auth_token_ = token;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_digest_auth(const std::string &username,
-                                        const std::string &password) {
-  digest_auth_username_ = username;
-  digest_auth_password_ = password;
-}
-#endif
-
-inline void ClientImpl::set_keep_alive(bool on) { keep_alive_ = on; }
-
-inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; }
-
-inline void ClientImpl::set_url_encode(bool on) { url_encode_ = on; }
-
-inline void
-ClientImpl::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
-  addr_map_ = std::move(addr_map);
-}
-
-inline void ClientImpl::set_default_headers(Headers headers) {
-  default_headers_ = std::move(headers);
-}
-
-inline void ClientImpl::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  header_writer_ = writer;
-}
-
-inline void ClientImpl::set_address_family(int family) {
-  address_family_ = family;
-}
-
-inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; }
-
-inline void ClientImpl::set_socket_options(SocketOptions socket_options) {
-  socket_options_ = std::move(socket_options);
-}
-
-inline void ClientImpl::set_compress(bool on) { compress_ = on; }
-
-inline void ClientImpl::set_decompress(bool on) { decompress_ = on; }
-
-inline void ClientImpl::set_interface(const std::string &intf) {
-  interface_ = intf;
-}
-
-inline void ClientImpl::set_proxy(const std::string &host, int port) {
-  proxy_host_ = host;
-  proxy_port_ = port;
-}
-
-inline void ClientImpl::set_proxy_basic_auth(const std::string &username,
-                                             const std::string &password) {
-  proxy_basic_auth_username_ = username;
-  proxy_basic_auth_password_ = password;
-}
-
-inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) {
-  proxy_bearer_token_auth_token_ = token;
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_proxy_digest_auth(const std::string &username,
-                                              const std::string &password) {
-  proxy_digest_auth_username_ = username;
-  proxy_digest_auth_password_ = password;
-}
-
-inline void ClientImpl::set_ca_cert_path(const std::string &ca_cert_file_path,
-                                         const std::string &ca_cert_dir_path) {
-  ca_cert_file_path_ = ca_cert_file_path;
-  ca_cert_dir_path_ = ca_cert_dir_path;
-}
-
-inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (ca_cert_store && ca_cert_store != ca_cert_store_) {
-    ca_cert_store_ = ca_cert_store;
-  }
-}
-
-inline X509_STORE *ClientImpl::create_ca_cert_store(const char *ca_cert,
-                                                    std::size_t size) const {
-  auto mem = BIO_new_mem_buf(ca_cert, static_cast<int>(size));
-  if (!mem) { return nullptr; }
-
-  auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr);
-  if (!inf) {
-    BIO_free_all(mem);
-    return nullptr;
-  }
-
-  auto cts = X509_STORE_new();
-  if (cts) {
-    for (auto i = 0; i < static_cast<int>(sk_X509_INFO_num(inf)); i++) {
-      auto itmp = sk_X509_INFO_value(inf, i);
-      if (!itmp) { continue; }
-
-      if (itmp->x509) { X509_STORE_add_cert(cts, itmp->x509); }
-      if (itmp->crl) { X509_STORE_add_crl(cts, itmp->crl); }
-    }
-  }
-
-  sk_X509_INFO_pop_free(inf, X509_INFO_free);
-  BIO_free_all(mem);
-  return cts;
-}
-
-inline void ClientImpl::enable_server_certificate_verification(bool enabled) {
-  server_certificate_verification_ = enabled;
-}
-#endif
-
-inline void ClientImpl::set_logger(Logger logger) {
-  logger_ = std::move(logger);
-}
-
-/*
- * SSL Implementation
- */
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-namespace detail {
-
-template <typename U, typename V>
-inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex,
-                    U SSL_connect_or_accept, V setup) {
-  SSL *ssl = nullptr;
-  {
-    std::lock_guard<std::mutex> guard(ctx_mutex);
-    ssl = SSL_new(ctx);
-  }
-
-  if (ssl) {
-    set_nonblocking(sock, true);
-    auto bio = BIO_new_socket(static_cast<int>(sock), BIO_NOCLOSE);
-    BIO_set_nbio(bio, 1);
-    SSL_set_bio(ssl, bio, bio);
-
-    if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) {
-      SSL_shutdown(ssl);
-      {
-        std::lock_guard<std::mutex> guard(ctx_mutex);
-        SSL_free(ssl);
-      }
-      set_nonblocking(sock, false);
-      return nullptr;
-    }
-    BIO_set_nbio(bio, 0);
-    set_nonblocking(sock, false);
-  }
-
-  return ssl;
-}
-
-inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl,
-                       bool shutdown_gracefully) {
-  // sometimes we may want to skip this to try to avoid SIGPIPE if we know
-  // the remote has closed the network connection
-  // Note that it is not always possible to avoid SIGPIPE, this is merely a
-  // best-efforts.
-  if (shutdown_gracefully) { SSL_shutdown(ssl); }
-
-  std::lock_guard<std::mutex> guard(ctx_mutex);
-  SSL_free(ssl);
-}
-
-template <typename U>
-bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl,
-                                       U ssl_connect_or_accept,
-                                       time_t timeout_sec,
-                                       time_t timeout_usec) {
-  auto res = 0;
-  while ((res = ssl_connect_or_accept(ssl)) != 1) {
-    auto err = SSL_get_error(ssl, res);
-    switch (err) {
-    case SSL_ERROR_WANT_READ:
-      if (select_read(sock, timeout_sec, timeout_usec) > 0) { continue; }
-      break;
-    case SSL_ERROR_WANT_WRITE:
-      if (select_write(sock, timeout_sec, timeout_usec) > 0) { continue; }
-      break;
-    default: break;
-    }
-    return false;
-  }
-  return true;
-}
-
-template <typename T>
-inline bool process_server_socket_ssl(
-    const std::atomic<socket_t> &svr_sock, SSL *ssl, socket_t sock,
-    size_t keep_alive_max_count, time_t keep_alive_timeout_sec,
-    time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
-    time_t write_timeout_usec, T callback) {
-  return process_server_socket_core(
-      svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec,
-      [&](bool close_connection, bool &connection_closed) {
-        SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
-                             write_timeout_sec, write_timeout_usec);
-        return callback(strm, close_connection, connection_closed);
-      });
-}
-
-template <typename T>
-inline bool
-process_client_socket_ssl(SSL *ssl, socket_t sock, time_t read_timeout_sec,
-                          time_t read_timeout_usec, time_t write_timeout_sec,
-                          time_t write_timeout_usec, T callback) {
-  SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec,
-                       write_timeout_sec, write_timeout_usec);
-  return callback(strm);
-}
-
-class SSLInit {
-public:
-  SSLInit() {
-    OPENSSL_init_ssl(
-        OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-  }
-};
-
-// SSL socket stream implementation
-inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL *ssl,
-                                        time_t read_timeout_sec,
-                                        time_t read_timeout_usec,
-                                        time_t write_timeout_sec,
-                                        time_t write_timeout_usec)
-    : sock_(sock), ssl_(ssl), read_timeout_sec_(read_timeout_sec),
-      read_timeout_usec_(read_timeout_usec),
-      write_timeout_sec_(write_timeout_sec),
-      write_timeout_usec_(write_timeout_usec) {
-  SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
-}
-
-inline SSLSocketStream::~SSLSocketStream() = default;
-
-inline bool SSLSocketStream::is_readable() const {
-  return detail::select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
-}
-
-inline bool SSLSocketStream::is_writable() const {
-  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
-         is_socket_alive(sock_);
-}
-
-inline ssize_t SSLSocketStream::read(char *ptr, size_t size) {
-  if (SSL_pending(ssl_) > 0) {
-    return SSL_read(ssl_, ptr, static_cast<int>(size));
-  } else if (is_readable()) {
-    auto ret = SSL_read(ssl_, ptr, static_cast<int>(size));
-    if (ret < 0) {
-      auto err = SSL_get_error(ssl_, ret);
-      auto n = 1000;
-#ifdef _WIN32
-      while (--n >= 0 && (err == SSL_ERROR_WANT_READ ||
-                          (err == SSL_ERROR_SYSCALL &&
-                           WSAGetLastError() == WSAETIMEDOUT))) {
-#else
-      while (--n >= 0 && err == SSL_ERROR_WANT_READ) {
-#endif
-        if (SSL_pending(ssl_) > 0) {
-          return SSL_read(ssl_, ptr, static_cast<int>(size));
-        } else if (is_readable()) {
-          std::this_thread::sleep_for(std::chrono::milliseconds(1));
-          ret = SSL_read(ssl_, ptr, static_cast<int>(size));
-          if (ret >= 0) { return ret; }
-          err = SSL_get_error(ssl_, ret);
-        } else {
-          return -1;
-        }
-      }
-    }
-    return ret;
-  }
-  return -1;
-}
-
-inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) {
-  if (is_writable()) {
-    auto handle_size = static_cast<int>(
-        std::min<size_t>(size, (std::numeric_limits<int>::max)()));
-
-    auto ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
-    if (ret < 0) {
-      auto err = SSL_get_error(ssl_, ret);
-      auto n = 1000;
-#ifdef _WIN32
-      while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE ||
-                          (err == SSL_ERROR_SYSCALL &&
-                           WSAGetLastError() == WSAETIMEDOUT))) {
-#else
-      while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) {
-#endif
-        if (is_writable()) {
-          std::this_thread::sleep_for(std::chrono::milliseconds(1));
-          ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
-          if (ret >= 0) { return ret; }
-          err = SSL_get_error(ssl_, ret);
-        } else {
-          return -1;
-        }
-      }
-    }
-    return ret;
-  }
-  return -1;
-}
-
-inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip,
-                                                    int &port) const {
-  detail::get_remote_ip_and_port(sock_, ip, port);
-}
-
-inline void SSLSocketStream::get_local_ip_and_port(std::string &ip,
-                                                   int &port) const {
-  detail::get_local_ip_and_port(sock_, ip, port);
-}
-
-inline socket_t SSLSocketStream::socket() const { return sock_; }
-
-static SSLInit sslinit_;
-
-} // namespace detail
-
-// SSL HTTP server implementation
-inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
-                            const char *client_ca_cert_file_path,
-                            const char *client_ca_cert_dir_path,
-                            const char *private_key_password) {
-  ctx_ = SSL_CTX_new(TLS_server_method());
-
-  if (ctx_) {
-    SSL_CTX_set_options(ctx_,
-                        SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-
-    SSL_CTX_set_min_proto_version(ctx_, TLS1_1_VERSION);
-
-    // add default password callback before opening encrypted private key
-    if (private_key_password != nullptr && (private_key_password[0] != '\0')) {
-      SSL_CTX_set_default_passwd_cb_userdata(
-          ctx_,
-          reinterpret_cast<void *>(const_cast<char *>(private_key_password)));
-    }
-
-    if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 ||
-        SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) !=
-            1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    } else if (client_ca_cert_file_path || client_ca_cert_dir_path) {
-      SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path,
-                                    client_ca_cert_dir_path);
-
-      SSL_CTX_set_verify(
-          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
-    }
-  }
-}
-
-inline SSLServer::SSLServer(X509 *cert, EVP_PKEY *private_key,
-                            X509_STORE *client_ca_cert_store) {
-  ctx_ = SSL_CTX_new(TLS_server_method());
-
-  if (ctx_) {
-    SSL_CTX_set_options(ctx_,
-                        SSL_OP_NO_COMPRESSION |
-                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-
-    SSL_CTX_set_min_proto_version(ctx_, TLS1_1_VERSION);
-
-    if (SSL_CTX_use_certificate(ctx_, cert) != 1 ||
-        SSL_CTX_use_PrivateKey(ctx_, private_key) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    } else if (client_ca_cert_store) {
-      SSL_CTX_set_cert_store(ctx_, client_ca_cert_store);
-
-      SSL_CTX_set_verify(
-          ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
-    }
-  }
-}
-
-inline SSLServer::SSLServer(
-    const std::function<bool(SSL_CTX &ssl_ctx)> &setup_ssl_ctx_callback) {
-  ctx_ = SSL_CTX_new(TLS_method());
-  if (ctx_) {
-    if (!setup_ssl_ctx_callback(*ctx_)) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLServer::~SSLServer() {
-  if (ctx_) { SSL_CTX_free(ctx_); }
-}
-
-inline bool SSLServer::is_valid() const { return ctx_; }
-
-inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; }
-
-inline bool SSLServer::process_and_close_socket(socket_t sock) {
-  auto ssl = detail::ssl_new(
-      sock, ctx_, ctx_mutex_,
-      [&](SSL *ssl2) {
-        return detail::ssl_connect_or_accept_nonblocking(
-            sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_);
-      },
-      [](SSL * /*ssl2*/) { return true; });
-
-  auto ret = false;
-  if (ssl) {
-    ret = detail::process_server_socket_ssl(
-        svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
-        read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-        write_timeout_usec_,
-        [this, ssl](Stream &strm, bool close_connection,
-                    bool &connection_closed) {
-          return process_request(strm, close_connection, connection_closed,
-                                 [&](Request &req) { req.ssl = ssl; });
-        });
-
-    // Shutdown gracefully if the result seemed successful, non-gracefully if
-    // the connection appeared to be closed.
-    const bool shutdown_gracefully = ret;
-    detail::ssl_delete(ctx_mutex_, ssl, shutdown_gracefully);
-  }
-
-  detail::shutdown_socket(sock);
-  detail::close_socket(sock);
-  return ret;
-}
-
-// SSL HTTP client implementation
-inline SSLClient::SSLClient(const std::string &host)
-    : SSLClient(host, 443, std::string(), std::string()) {}
-
-inline SSLClient::SSLClient(const std::string &host, int port)
-    : SSLClient(host, port, std::string(), std::string()) {}
-
-inline SSLClient::SSLClient(const std::string &host, int port,
-                            const std::string &client_cert_path,
-                            const std::string &client_key_path)
-    : ClientImpl(host, port, client_cert_path, client_key_path) {
-  ctx_ = SSL_CTX_new(TLS_client_method());
-
-  detail::split(&host_[0], &host_[host_.size()], '.',
-                [&](const char *b, const char *e) {
-                  host_components_.emplace_back(b, e);
-                });
-
-  if (!client_cert_path.empty() && !client_key_path.empty()) {
-    if (SSL_CTX_use_certificate_file(ctx_, client_cert_path.c_str(),
-                                     SSL_FILETYPE_PEM) != 1 ||
-        SSL_CTX_use_PrivateKey_file(ctx_, client_key_path.c_str(),
-                                    SSL_FILETYPE_PEM) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLClient::SSLClient(const std::string &host, int port,
-                            X509 *client_cert, EVP_PKEY *client_key)
-    : ClientImpl(host, port) {
-  ctx_ = SSL_CTX_new(TLS_client_method());
-
-  detail::split(&host_[0], &host_[host_.size()], '.',
-                [&](const char *b, const char *e) {
-                  host_components_.emplace_back(b, e);
-                });
-
-  if (client_cert != nullptr && client_key != nullptr) {
-    if (SSL_CTX_use_certificate(ctx_, client_cert) != 1 ||
-        SSL_CTX_use_PrivateKey(ctx_, client_key) != 1) {
-      SSL_CTX_free(ctx_);
-      ctx_ = nullptr;
-    }
-  }
-}
-
-inline SSLClient::~SSLClient() {
-  if (ctx_) { SSL_CTX_free(ctx_); }
-  // Make sure to shut down SSL since shutdown_ssl will resolve to the
-  // base function rather than the derived function once we get to the
-  // base class destructor, and won't free the SSL (causing a leak).
-  shutdown_ssl_impl(socket_, true);
-}
-
-inline bool SSLClient::is_valid() const { return ctx_; }
-
-inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (ca_cert_store) {
-    if (ctx_) {
-      if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) {
-        // Free memory allocated for old cert and use new store `ca_cert_store`
-        SSL_CTX_set_cert_store(ctx_, ca_cert_store);
-      }
-    } else {
-      X509_STORE_free(ca_cert_store);
-    }
-  }
-}
-
-inline void SSLClient::load_ca_cert_store(const char *ca_cert,
-                                          std::size_t size) {
-  set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size));
-}
-
-inline long SSLClient::get_openssl_verify_result() const {
-  return verify_result_;
-}
-
-inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; }
-
-inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) {
-  return is_valid() && ClientImpl::create_and_connect_socket(socket, error);
-}
-
-// Assumes that socket_mutex_ is locked and that there are no requests in flight
-inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res,
-                                          bool &success, Error &error) {
-  success = true;
-  Response proxy_res;
-  if (!detail::process_client_socket(
-          socket.sock, read_timeout_sec_, read_timeout_usec_,
-          write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) {
-            Request req2;
-            req2.method = "CONNECT";
-            req2.path = host_and_port_;
-            return process_request(strm, req2, proxy_res, false, error);
-          })) {
-    // Thread-safe to close everything because we are assuming there are no
-    // requests in flight
-    shutdown_ssl(socket, true);
-    shutdown_socket(socket);
-    close_socket(socket);
-    success = false;
-    return false;
-  }
-
-  if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) {
-    if (!proxy_digest_auth_username_.empty() &&
-        !proxy_digest_auth_password_.empty()) {
-      std::map<std::string, std::string> auth;
-      if (detail::parse_www_authenticate(proxy_res, auth, true)) {
-        proxy_res = Response();
-        if (!detail::process_client_socket(
-                socket.sock, read_timeout_sec_, read_timeout_usec_,
-                write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) {
-                  Request req3;
-                  req3.method = "CONNECT";
-                  req3.path = host_and_port_;
-                  req3.headers.insert(detail::make_digest_authentication_header(
-                      req3, auth, 1, detail::random_string(10),
-                      proxy_digest_auth_username_, proxy_digest_auth_password_,
-                      true));
-                  return process_request(strm, req3, proxy_res, false, error);
-                })) {
-          // Thread-safe to close everything because we are assuming there are
-          // no requests in flight
-          shutdown_ssl(socket, true);
-          shutdown_socket(socket);
-          close_socket(socket);
-          success = false;
-          return false;
-        }
-      }
-    }
-  }
-
-  // If status code is not 200, proxy request is failed.
-  // Set error to ProxyConnection and return proxy response
-  // as the response of the request
-  if (proxy_res.status != StatusCode::OK_200) {
-    error = Error::ProxyConnection;
-    res = std::move(proxy_res);
-    // Thread-safe to close everything because we are assuming there are
-    // no requests in flight
-    shutdown_ssl(socket, true);
-    shutdown_socket(socket);
-    close_socket(socket);
-    return false;
-  }
-
-  return true;
-}
-
-inline bool SSLClient::load_certs() {
-  auto ret = true;
-
-  std::call_once(initialize_cert_, [&]() {
-    std::lock_guard<std::mutex> guard(ctx_mutex_);
-    if (!ca_cert_file_path_.empty()) {
-      if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(),
-                                         nullptr)) {
-        ret = false;
-      }
-    } else if (!ca_cert_dir_path_.empty()) {
-      if (!SSL_CTX_load_verify_locations(ctx_, nullptr,
-                                         ca_cert_dir_path_.c_str())) {
-        ret = false;
-      }
-    } else {
-      auto loaded = false;
-#ifdef _WIN32
-      loaded =
-          detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
-#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
-#if TARGET_OS_OSX
-      loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_));
-#endif // TARGET_OS_OSX
-#endif // _WIN32
-      if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); }
-    }
-  });
-
-  return ret;
-}
-
-inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
-  auto ssl = detail::ssl_new(
-      socket.sock, ctx_, ctx_mutex_,
-      [&](SSL *ssl2) {
-        if (server_certificate_verification_) {
-          if (!load_certs()) {
-            error = Error::SSLLoadingCerts;
-            return false;
-          }
-          SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr);
-        }
-
-        if (!detail::ssl_connect_or_accept_nonblocking(
-                socket.sock, ssl2, SSL_connect, connection_timeout_sec_,
-                connection_timeout_usec_)) {
-          error = Error::SSLConnection;
-          return false;
-        }
-
-        if (server_certificate_verification_) {
-          verify_result_ = SSL_get_verify_result(ssl2);
-
-          if (verify_result_ != X509_V_OK) {
-            error = Error::SSLServerVerification;
-            return false;
-          }
-
-          auto server_cert = SSL_get1_peer_certificate(ssl2);
-
-          if (server_cert == nullptr) {
-            error = Error::SSLServerVerification;
-            return false;
-          }
-
-          if (!verify_host(server_cert)) {
-            X509_free(server_cert);
-            error = Error::SSLServerVerification;
-            return false;
-          }
-          X509_free(server_cert);
-        }
-
-        return true;
-      },
-      [&](SSL *ssl2) {
-        // NOTE: Direct call instead of using the OpenSSL macro to suppress
-        // -Wold-style-cast warning
-        // SSL_set_tlsext_host_name(ssl2, host_.c_str());
-        SSL_ctrl(ssl2, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name,
-                 static_cast<void *>(const_cast<char *>(host_.c_str())));
-        return true;
-      });
-
-  if (ssl) {
-    socket.ssl = ssl;
-    return true;
-  }
-
-  shutdown_socket(socket);
-  close_socket(socket);
-  return false;
-}
-
-inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) {
-  shutdown_ssl_impl(socket, shutdown_gracefully);
-}
-
-inline void SSLClient::shutdown_ssl_impl(Socket &socket,
-                                         bool shutdown_gracefully) {
-  if (socket.sock == INVALID_SOCKET) {
-    assert(socket.ssl == nullptr);
-    return;
-  }
-  if (socket.ssl) {
-    detail::ssl_delete(ctx_mutex_, socket.ssl, shutdown_gracefully);
-    socket.ssl = nullptr;
-  }
-  assert(socket.ssl == nullptr);
-}
-
-inline bool
-SSLClient::process_socket(const Socket &socket,
-                          std::function<bool(Stream &strm)> callback) {
-  assert(socket.ssl);
-  return detail::process_client_socket_ssl(
-      socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_,
-      write_timeout_sec_, write_timeout_usec_, std::move(callback));
-}
-
-inline bool SSLClient::is_ssl() const { return true; }
-
-inline bool SSLClient::verify_host(X509 *server_cert) const {
-  /* Quote from RFC2818 section 3.1 "Server Identity"
-
-     If a subjectAltName extension of type dNSName is present, that MUST
-     be used as the identity. Otherwise, the (most specific) Common Name
-     field in the Subject field of the certificate MUST be used. Although
-     the use of the Common Name is existing practice, it is deprecated and
-     Certification Authorities are encouraged to use the dNSName instead.
-
-     Matching is performed using the matching rules specified by
-     [RFC2459].  If more than one identity of a given type is present in
-     the certificate (e.g., more than one dNSName name, a match in any one
-     of the set is considered acceptable.) Names may contain the wildcard
-     character * which is considered to match any single domain name
-     component or component fragment. E.g., *.a.com matches foo.a.com but
-     not bar.foo.a.com. f*.com matches foo.com but not bar.com.
-
-     In some cases, the URI is specified as an IP address rather than a
-     hostname. In this case, the iPAddress subjectAltName must be present
-     in the certificate and must exactly match the IP in the URI.
-
-  */
-  return verify_host_with_subject_alt_name(server_cert) ||
-         verify_host_with_common_name(server_cert);
-}
-
-inline bool
-SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
-  auto ret = false;
-
-  auto type = GEN_DNS;
-
-  struct in6_addr addr6 {};
-  struct in_addr addr {};
-  size_t addr_len = 0;
-
-#ifndef __MINGW32__
-  if (inet_pton(AF_INET6, host_.c_str(), &addr6)) {
-    type = GEN_IPADD;
-    addr_len = sizeof(struct in6_addr);
-  } else if (inet_pton(AF_INET, host_.c_str(), &addr)) {
-    type = GEN_IPADD;
-    addr_len = sizeof(struct in_addr);
-  }
-#endif
-
-  auto alt_names = static_cast<const struct stack_st_GENERAL_NAME *>(
-      X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr));
-
-  if (alt_names) {
-    auto dsn_matched = false;
-    auto ip_matched = false;
-
-    auto count = sk_GENERAL_NAME_num(alt_names);
-
-    for (decltype(count) i = 0; i < count && !dsn_matched; i++) {
-      auto val = sk_GENERAL_NAME_value(alt_names, i);
-      if (val->type == type) {
-        auto name =
-            reinterpret_cast<const char *>(ASN1_STRING_get0_data(val->d.ia5));
-        auto name_len = static_cast<size_t>(ASN1_STRING_length(val->d.ia5));
-
-        switch (type) {
-        case GEN_DNS: dsn_matched = check_host_name(name, name_len); break;
-
-        case GEN_IPADD:
-          if (!memcmp(&addr6, name, addr_len) ||
-              !memcmp(&addr, name, addr_len)) {
-            ip_matched = true;
-          }
-          break;
-        }
-      }
-    }
-
-    if (dsn_matched || ip_matched) { ret = true; }
-  }
-
-  GENERAL_NAMES_free(const_cast<STACK_OF(GENERAL_NAME) *>(
-      reinterpret_cast<const STACK_OF(GENERAL_NAME) *>(alt_names)));
-  return ret;
-}
-
-inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const {
-  const auto subject_name = X509_get_subject_name(server_cert);
-
-  if (subject_name != nullptr) {
-    char name[BUFSIZ];
-    auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
-                                              name, sizeof(name));
-
-    if (name_len != -1) {
-      return check_host_name(name, static_cast<size_t>(name_len));
-    }
-  }
-
-  return false;
-}
-
-inline bool SSLClient::check_host_name(const char *pattern,
-                                       size_t pattern_len) const {
-  if (host_.size() == pattern_len && host_ == pattern) { return true; }
-
-  // Wildcard match
-  // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484
-  std::vector<std::string> pattern_components;
-  detail::split(&pattern[0], &pattern[pattern_len], '.',
-                [&](const char *b, const char *e) {
-                  pattern_components.emplace_back(b, e);
-                });
-
-  if (host_components_.size() != pattern_components.size()) { return false; }
-
-  auto itr = pattern_components.begin();
-  for (const auto &h : host_components_) {
-    auto &p = *itr;
-    if (p != h && p != "*") {
-      auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' &&
-                            !p.compare(0, p.size() - 1, h));
-      if (!partial_match) { return false; }
-    }
-    ++itr;
-  }
-
-  return true;
-}
-#endif
-
-// Universal client implementation
-inline Client::Client(const std::string &scheme_host_port)
-    : Client(scheme_host_port, std::string(), std::string()) {}
-
-inline Client::Client(const std::string &scheme_host_port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path) {
-  const static std::regex re(
-      R"((?:([a-z]+):\/\/)?(?:\[([\d:]+)\]|([^:/?#]+))(?::(\d+))?)");
-
-  std::smatch m;
-  if (std::regex_match(scheme_host_port, m, re)) {
-    auto scheme = m[1].str();
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    if (!scheme.empty() && (scheme != "http" && scheme != "https")) {
-#else
-    if (!scheme.empty() && scheme != "http") {
-#endif
-#ifndef CPPHTTPLIB_NO_EXCEPTIONS
-      std::string msg = "'" + scheme + "' scheme is not supported.";
-      throw std::invalid_argument(msg);
-#endif
-      return;
-    }
-
-    auto is_ssl = scheme == "https";
-
-    auto host = m[2].str();
-    if (host.empty()) { host = m[3].str(); }
-
-    auto port_str = m[4].str();
-    auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80);
-
-    if (is_ssl) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      cli_ = detail::make_unique<SSLClient>(host, port, client_cert_path,
-                                            client_key_path);
-      is_ssl_ = is_ssl;
-#endif
-    } else {
-      cli_ = detail::make_unique<ClientImpl>(host, port, client_cert_path,
-                                             client_key_path);
-    }
-  } else {
-    cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80,
-                                           client_cert_path, client_key_path);
-  }
-}
-
-inline Client::Client(const std::string &host, int port)
-    : cli_(detail::make_unique<ClientImpl>(host, port)) {}
-
-inline Client::Client(const std::string &host, int port,
-                      const std::string &client_cert_path,
-                      const std::string &client_key_path)
-    : cli_(detail::make_unique<ClientImpl>(host, port, client_cert_path,
-                                           client_key_path)) {}
-
-inline Client::~Client() = default;
-
-inline bool Client::is_valid() const {
-  return cli_ != nullptr && cli_->is_valid();
-}
-
-inline Result Client::Get(const std::string &path) { return cli_->Get(path); }
-inline Result Client::Get(const std::string &path, const Headers &headers) {
-  return cli_->Get(path, headers);
-}
-inline Result Client::Get(const std::string &path, Progress progress) {
-  return cli_->Get(path, std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          Progress progress) {
-  return cli_->Get(path, headers, std::move(progress));
-}
-inline Result Client::Get(const std::string &path,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, headers, std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, headers, std::move(content_receiver),
-                   std::move(progress));
-}
-inline Result Client::Get(const std::string &path,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, std::move(response_handler),
-                   std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver) {
-  return cli_->Get(path, headers, std::move(response_handler),
-                   std::move(content_receiver));
-}
-inline Result Client::Get(const std::string &path,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, headers, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(content_receiver),
-                   std::move(progress));
-}
-inline Result Client::Get(const std::string &path, const Params &params,
-                          const Headers &headers,
-                          ResponseHandler response_handler,
-                          ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, params, headers, std::move(response_handler),
-                   std::move(content_receiver), std::move(progress));
-}
-
-inline Result Client::Head(const std::string &path) { return cli_->Head(path); }
-inline Result Client::Head(const std::string &path, const Headers &headers) {
-  return cli_->Head(path, headers);
-}
-
-inline Result Client::Post(const std::string &path) { return cli_->Post(path); }
-inline Result Client::Post(const std::string &path, const Headers &headers) {
-  return cli_->Post(path, headers);
-}
-inline Result Client::Post(const std::string &path, const char *body,
-                           size_t content_length,
-                           const std::string &content_type) {
-  return cli_->Post(path, body, content_length, content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const char *body, size_t content_length,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, body, content_length, content_type);
-}
-inline Result Client::Post(const std::string &path, const std::string &body,
-                           const std::string &content_type) {
-  return cli_->Post(path, body, content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const std::string &body,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, body, content_type);
-}
-inline Result Client::Post(const std::string &path, size_t content_length,
-                           ContentProvider content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, content_length, std::move(content_provider),
-                    content_type);
-}
-inline Result Client::Post(const std::string &path,
-                           ContentProviderWithoutLength content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, std::move(content_provider), content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           size_t content_length,
-                           ContentProvider content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, content_length, std::move(content_provider),
-                    content_type);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           ContentProviderWithoutLength content_provider,
-                           const std::string &content_type) {
-  return cli_->Post(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Post(const std::string &path, const Params &params) {
-  return cli_->Post(path, params);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const Params &params) {
-  return cli_->Post(path, headers, params);
-}
-inline Result Client::Post(const std::string &path,
-                           const MultipartFormDataItems &items) {
-  return cli_->Post(path, items);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const MultipartFormDataItems &items) {
-  return cli_->Post(path, headers, items);
-}
-inline Result Client::Post(const std::string &path, const Headers &headers,
-                           const MultipartFormDataItems &items,
-                           const std::string &boundary) {
-  return cli_->Post(path, headers, items, boundary);
-}
-inline Result
-Client::Post(const std::string &path, const Headers &headers,
-             const MultipartFormDataItems &items,
-             const MultipartFormDataProviderItems &provider_items) {
-  return cli_->Post(path, headers, items, provider_items);
-}
-inline Result Client::Put(const std::string &path) { return cli_->Put(path); }
-inline Result Client::Put(const std::string &path, const char *body,
-                          size_t content_length,
-                          const std::string &content_type) {
-  return cli_->Put(path, body, content_length, content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const char *body, size_t content_length,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, body, content_length, content_type);
-}
-inline Result Client::Put(const std::string &path, const std::string &body,
-                          const std::string &content_type) {
-  return cli_->Put(path, body, content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const std::string &body,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, body, content_type);
-}
-inline Result Client::Put(const std::string &path, size_t content_length,
-                          ContentProvider content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, content_length, std::move(content_provider),
-                   content_type);
-}
-inline Result Client::Put(const std::string &path,
-                          ContentProviderWithoutLength content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, std::move(content_provider), content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          size_t content_length,
-                          ContentProvider content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, content_length, std::move(content_provider),
-                   content_type);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          ContentProviderWithoutLength content_provider,
-                          const std::string &content_type) {
-  return cli_->Put(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Put(const std::string &path, const Params &params) {
-  return cli_->Put(path, params);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const Params &params) {
-  return cli_->Put(path, headers, params);
-}
-inline Result Client::Put(const std::string &path,
-                          const MultipartFormDataItems &items) {
-  return cli_->Put(path, items);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const MultipartFormDataItems &items) {
-  return cli_->Put(path, headers, items);
-}
-inline Result Client::Put(const std::string &path, const Headers &headers,
-                          const MultipartFormDataItems &items,
-                          const std::string &boundary) {
-  return cli_->Put(path, headers, items, boundary);
-}
-inline Result
-Client::Put(const std::string &path, const Headers &headers,
-            const MultipartFormDataItems &items,
-            const MultipartFormDataProviderItems &provider_items) {
-  return cli_->Put(path, headers, items, provider_items);
-}
-inline Result Client::Patch(const std::string &path) {
-  return cli_->Patch(path);
-}
-inline Result Client::Patch(const std::string &path, const char *body,
-                            size_t content_length,
-                            const std::string &content_type) {
-  return cli_->Patch(path, body, content_length, content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const char *body, size_t content_length,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, body, content_length, content_type);
-}
-inline Result Client::Patch(const std::string &path, const std::string &body,
-                            const std::string &content_type) {
-  return cli_->Patch(path, body, content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            const std::string &body,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, body, content_type);
-}
-inline Result Client::Patch(const std::string &path, size_t content_length,
-                            ContentProvider content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, content_length, std::move(content_provider),
-                     content_type);
-}
-inline Result Client::Patch(const std::string &path,
-                            ContentProviderWithoutLength content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, std::move(content_provider), content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            size_t content_length,
-                            ContentProvider content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, content_length, std::move(content_provider),
-                     content_type);
-}
-inline Result Client::Patch(const std::string &path, const Headers &headers,
-                            ContentProviderWithoutLength content_provider,
-                            const std::string &content_type) {
-  return cli_->Patch(path, headers, std::move(content_provider), content_type);
-}
-inline Result Client::Delete(const std::string &path) {
-  return cli_->Delete(path);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers) {
-  return cli_->Delete(path, headers);
-}
-inline Result Client::Delete(const std::string &path, const char *body,
-                             size_t content_length,
-                             const std::string &content_type) {
-  return cli_->Delete(path, body, content_length, content_type);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const char *body, size_t content_length,
-                             const std::string &content_type) {
-  return cli_->Delete(path, headers, body, content_length, content_type);
-}
-inline Result Client::Delete(const std::string &path, const std::string &body,
-                             const std::string &content_type) {
-  return cli_->Delete(path, body, content_type);
-}
-inline Result Client::Delete(const std::string &path, const Headers &headers,
-                             const std::string &body,
-                             const std::string &content_type) {
-  return cli_->Delete(path, headers, body, content_type);
-}
-inline Result Client::Options(const std::string &path) {
-  return cli_->Options(path);
-}
-inline Result Client::Options(const std::string &path, const Headers &headers) {
-  return cli_->Options(path, headers);
-}
-
-inline bool Client::send(Request &req, Response &res, Error &error) {
-  return cli_->send(req, res, error);
-}
-
-inline Result Client::send(const Request &req) { return cli_->send(req); }
-
-inline void Client::stop() { cli_->stop(); }
-
-inline std::string Client::host() const { return cli_->host(); }
-
-inline int Client::port() const { return cli_->port(); }
-
-inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); }
-
-inline socket_t Client::socket() const { return cli_->socket(); }
-
-inline void
-Client::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
-  cli_->set_hostname_addr_map(std::move(addr_map));
-}
-
-inline void Client::set_default_headers(Headers headers) {
-  cli_->set_default_headers(std::move(headers));
-}
-
-inline void Client::set_header_writer(
-    std::function<ssize_t(Stream &, Headers &)> const &writer) {
-  cli_->set_header_writer(writer);
-}
-
-inline void Client::set_address_family(int family) {
-  cli_->set_address_family(family);
-}
-
-inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); }
-
-inline void Client::set_socket_options(SocketOptions socket_options) {
-  cli_->set_socket_options(std::move(socket_options));
-}
-
-inline void Client::set_connection_timeout(time_t sec, time_t usec) {
-  cli_->set_connection_timeout(sec, usec);
-}
-
-inline void Client::set_read_timeout(time_t sec, time_t usec) {
-  cli_->set_read_timeout(sec, usec);
-}
-
-inline void Client::set_write_timeout(time_t sec, time_t usec) {
-  cli_->set_write_timeout(sec, usec);
-}
-
-inline void Client::set_basic_auth(const std::string &username,
-                                   const std::string &password) {
-  cli_->set_basic_auth(username, password);
-}
-inline void Client::set_bearer_token_auth(const std::string &token) {
-  cli_->set_bearer_token_auth(token);
-}
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_digest_auth(const std::string &username,
-                                    const std::string &password) {
-  cli_->set_digest_auth(username, password);
-}
-#endif
-
-inline void Client::set_keep_alive(bool on) { cli_->set_keep_alive(on); }
-inline void Client::set_follow_location(bool on) {
-  cli_->set_follow_location(on);
-}
-
-inline void Client::set_url_encode(bool on) { cli_->set_url_encode(on); }
-
-inline void Client::set_compress(bool on) { cli_->set_compress(on); }
-
-inline void Client::set_decompress(bool on) { cli_->set_decompress(on); }
-
-inline void Client::set_interface(const std::string &intf) {
-  cli_->set_interface(intf);
-}
-
-inline void Client::set_proxy(const std::string &host, int port) {
-  cli_->set_proxy(host, port);
-}
-inline void Client::set_proxy_basic_auth(const std::string &username,
-                                         const std::string &password) {
-  cli_->set_proxy_basic_auth(username, password);
-}
-inline void Client::set_proxy_bearer_token_auth(const std::string &token) {
-  cli_->set_proxy_bearer_token_auth(token);
-}
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_proxy_digest_auth(const std::string &username,
-                                          const std::string &password) {
-  cli_->set_proxy_digest_auth(username, password);
-}
-#endif
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::enable_server_certificate_verification(bool enabled) {
-  cli_->enable_server_certificate_verification(enabled);
-}
-#endif
-
-inline void Client::set_logger(Logger logger) {
-  cli_->set_logger(std::move(logger));
-}
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path,
-                                     const std::string &ca_cert_dir_path) {
-  cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path);
-}
-
-inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) {
-  if (is_ssl_) {
-    static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store);
-  } else {
-    cli_->set_ca_cert_store(ca_cert_store);
-  }
-}
-
-inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) {
-  set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size));
-}
-
-inline long Client::get_openssl_verify_result() const {
-  if (is_ssl_) {
-    return static_cast<SSLClient &>(*cli_).get_openssl_verify_result();
-  }
-  return -1; // NOTE: -1 doesn't match any of X509_V_ERR_???
-}
-
-inline SSL_CTX *Client::ssl_context() const {
-  if (is_ssl_) { return static_cast<SSLClient &>(*cli_).ssl_context(); }
-  return nullptr;
-}
-#endif
-
-// ----------------------------------------------------------------------------
-
-} // namespace httplib
-
-#if defined(_WIN32) && defined(CPPHTTPLIB_USE_POLL)
-#undef poll
-#endif
-
-#endif // CPPHTTPLIB_HTTPLIB_H
diff --git a/ext/ed25519-amd64-asm/batch.c b/ext/ed25519-amd64-asm/batch.c
deleted file mode 100644
index 955392eac..000000000
--- a/ext/ed25519-amd64-asm/batch.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include "crypto_sign.h"
-
-#include "crypto_verify_32.h"
-#include "crypto_hash_sha512.h"
-#include "randombytes.h"
-
-#include "ge25519.h"
-#include "hram.h"
-
-#define MAXBATCH 64
-
-int crypto_sign_open_batch(
-    unsigned char* const m[],unsigned long long mlen[],
-    unsigned char* const sm[],const unsigned long long smlen[],
-    unsigned char* const pk[], 
-    unsigned long long num
-    )
-{
-  int ret = 0;
-  unsigned long long i, j;
-  shortsc25519 r[MAXBATCH];
-  sc25519 scalars[2*MAXBATCH+1];
-  ge25519 points[2*MAXBATCH+1];
-  unsigned char hram[crypto_hash_sha512_BYTES];
-  unsigned long long batchsize;
-
-  for (i = 0;i < num;++i) mlen[i] = -1;
-
-  while (num >= 3) {
-    batchsize = num;
-    if (batchsize > MAXBATCH) batchsize = MAXBATCH;
-
-    for (i = 0;i < batchsize;++i)
-      if (smlen[i] < 64) goto fallback;
-
-    randombytes((unsigned char*)r,sizeof(shortsc25519) * batchsize);
-
-    /* Computing scalars[0] = ((r1s1 + r2s2 + ...)) */
-    for(i=0;i<batchsize;i++)
-    {
-      sc25519_from32bytes(&scalars[i], sm[i]+32); 
-      sc25519_mul_shortsc(&scalars[i], &scalars[i], &r[i]);
-    }
-    for(i=1;i<batchsize;i++)
-      sc25519_add(&scalars[0], &scalars[0], &scalars[i]);
-    
-    /* Computing scalars[1] ... scalars[batchsize] as r[i]*H(R[i],A[i],m[i]) */
-    for(i=0;i<batchsize;i++)
-    {
-      get_hram(hram, sm[i], pk[i], m[i], smlen[i]);
-      sc25519_from64bytes(&scalars[i+1],hram);
-      sc25519_mul_shortsc(&scalars[i+1],&scalars[i+1],&r[i]);
-    }
-    /* Setting scalars[batchsize+1] ... scalars[2*batchsize] to r[i] */
-    for(i=0;i<batchsize;i++)
-      sc25519_from_shortsc(&scalars[batchsize+i+1],&r[i]);
-  
-    /* Computing points */
-    points[0] = ge25519_base;
-  
-    for(i=0;i<batchsize;i++)
-      if (ge25519_unpackneg_vartime(&points[i+1], pk[i])) goto fallback;
-    for(i=0;i<batchsize;i++)
-      if (ge25519_unpackneg_vartime(&points[batchsize+i+1], sm[i])) goto fallback;
-  
-    ge25519_multi_scalarmult_vartime(points, points, scalars, 2*batchsize+1);
-  
-    if (ge25519_isneutral_vartime(points)) {
-      for(i=0;i<batchsize;i++)
-      {
-        for(j=0;j<smlen[i]-64;j++)
-          m[i][j] = sm[i][j + 64];
-        mlen[i] = smlen[i]-64;
-      }
-    } else {
-      fallback:
-
-      for (i = 0;i < batchsize;++i)
-        ret |= crypto_sign_open(m[i], &mlen[i], sm[i], smlen[i], pk[i]);
-    }
-
-    m += batchsize;
-    mlen += batchsize;
-    sm += batchsize;
-    smlen += batchsize;
-    pk += batchsize;
-    num -= batchsize;
-  }
-
-  for (i = 0;i < num;++i)
-    ret |= crypto_sign_open(m[i], &mlen[i], sm[i], smlen[i], pk[i]);
-
-  return ret;
-}
diff --git a/ext/ed25519-amd64-asm/choose_t.s b/ext/ed25519-amd64-asm/choose_t.s
deleted file mode 100644
index f10d8b8b3..000000000
--- a/ext/ed25519-amd64-asm/choose_t.s
+++ /dev/null
@@ -1,1565 +0,0 @@
-
-# qhasm: int64 tp
-
-# qhasm: int64 pos
-
-# qhasm: int64 b
-
-# qhasm: int64 basep
-
-# qhasm: input tp
-
-# qhasm: input pos
-
-# qhasm: input b
-
-# qhasm: input basep
-
-# qhasm: int64 mask
-
-# qhasm: int64 u
-
-# qhasm: int64 tysubx0
-
-# qhasm: int64 tysubx1
-
-# qhasm: int64 tysubx2
-
-# qhasm: int64 tysubx3
-
-# qhasm: int64 txaddy0
-
-# qhasm: int64 txaddy1
-
-# qhasm: int64 txaddy2
-
-# qhasm: int64 txaddy3
-
-# qhasm: int64 tt2d0
-
-# qhasm: int64 tt2d1
-
-# qhasm: int64 tt2d2
-
-# qhasm: int64 tt2d3
-
-# qhasm: int64 tt0
-
-# qhasm: int64 tt1
-
-# qhasm: int64 tt2
-
-# qhasm: int64 tt3
-
-# qhasm: int64 subt0
-
-# qhasm: int64 subt1
-
-# qhasm: int64 t
-
-# qhasm: stack64 tp_stack
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_choose_t
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_choose_t
-.globl crypto_sign_ed25519_amd64_64_choose_t
-_crypto_sign_ed25519_amd64_64_choose_t:
-crypto_sign_ed25519_amd64_64_choose_t:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: tp_stack = tp
-# asm 1: movq <tp=int64#1,>tp_stack=stack64#8
-# asm 2: movq <tp=%rdi,>tp_stack=56(%rsp)
-movq %rdi,56(%rsp)
-
-# qhasm: pos *= 768
-# asm 1: imulq  $768,<pos=int64#2,>pos=int64#1
-# asm 2: imulq  $768,<pos=%rsi,>pos=%rdi
-imulq  $768,%rsi,%rdi
-
-# qhasm: mask = b
-# asm 1: mov  <b=int64#3,>mask=int64#2
-# asm 2: mov  <b=%rdx,>mask=%rsi
-mov  %rdx,%rsi
-
-# qhasm: (int64) mask >>= 7
-# asm 1: sar  $7,<mask=int64#2
-# asm 2: sar  $7,<mask=%rsi
-sar  $7,%rsi
-
-# qhasm: u = b
-# asm 1: mov  <b=int64#3,>u=int64#5
-# asm 2: mov  <b=%rdx,>u=%r8
-mov  %rdx,%r8
-
-# qhasm: u += mask
-# asm 1: add  <mask=int64#2,<u=int64#5
-# asm 2: add  <mask=%rsi,<u=%r8
-add  %rsi,%r8
-
-# qhasm: u ^= mask
-# asm 1: xor  <mask=int64#2,<u=int64#5
-# asm 2: xor  <mask=%rsi,<u=%r8
-xor  %rsi,%r8
-
-# qhasm: tysubx0 = 1
-# asm 1: mov  $1,>tysubx0=int64#2
-# asm 2: mov  $1,>tysubx0=%rsi
-mov  $1,%rsi
-
-# qhasm: tysubx1 = 0
-# asm 1: mov  $0,>tysubx1=int64#6
-# asm 2: mov  $0,>tysubx1=%r9
-mov  $0,%r9
-
-# qhasm: tysubx2 = 0
-# asm 1: mov  $0,>tysubx2=int64#7
-# asm 2: mov  $0,>tysubx2=%rax
-mov  $0,%rax
-
-# qhasm: tysubx3 = 0
-# asm 1: mov  $0,>tysubx3=int64#8
-# asm 2: mov  $0,>tysubx3=%r10
-mov  $0,%r10
-
-# qhasm: txaddy0 = 1
-# asm 1: mov  $1,>txaddy0=int64#9
-# asm 2: mov  $1,>txaddy0=%r11
-mov  $1,%r11
-
-# qhasm: txaddy1 = 0
-# asm 1: mov  $0,>txaddy1=int64#10
-# asm 2: mov  $0,>txaddy1=%r12
-mov  $0,%r12
-
-# qhasm: txaddy2 = 0
-# asm 1: mov  $0,>txaddy2=int64#11
-# asm 2: mov  $0,>txaddy2=%r13
-mov  $0,%r13
-
-# qhasm: txaddy3 = 0
-# asm 1: mov  $0,>txaddy3=int64#12
-# asm 2: mov  $0,>txaddy3=%r14
-mov  $0,%r14
-
-# qhasm: =? u - 1
-# asm 1: cmp  $1,<u=int64#5
-# asm 2: cmp  $1,<u=%r8
-cmp  $1,%r8
-
-# qhasm: t = *(uint64 *)(basep + 0 + pos)
-# asm 1: movq   0(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   0(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   0(%rcx,%rdi),%r15
-
-# qhasm: tysubx0 = t if =
-# asm 1: cmove <t=int64#13,<tysubx0=int64#2
-# asm 2: cmove <t=%r15,<tysubx0=%rsi
-cmove %r15,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 8 + pos)
-# asm 1: movq   8(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   8(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   8(%rcx,%rdi),%r15
-
-# qhasm: tysubx1 = t if =
-# asm 1: cmove <t=int64#13,<tysubx1=int64#6
-# asm 2: cmove <t=%r15,<tysubx1=%r9
-cmove %r15,%r9
-
-# qhasm: t = *(uint64 *)(basep + 16 + pos)
-# asm 1: movq   16(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   16(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   16(%rcx,%rdi),%r15
-
-# qhasm: tysubx2 = t if =
-# asm 1: cmove <t=int64#13,<tysubx2=int64#7
-# asm 2: cmove <t=%r15,<tysubx2=%rax
-cmove %r15,%rax
-
-# qhasm: t = *(uint64 *)(basep + 24 + pos)
-# asm 1: movq   24(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   24(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   24(%rcx,%rdi),%r15
-
-# qhasm: tysubx3 = t if =
-# asm 1: cmove <t=int64#13,<tysubx3=int64#8
-# asm 2: cmove <t=%r15,<tysubx3=%r10
-cmove %r15,%r10
-
-# qhasm: t = *(uint64 *)(basep + 32 + pos)
-# asm 1: movq   32(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   32(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   32(%rcx,%rdi),%r15
-
-# qhasm: txaddy0 = t if =
-# asm 1: cmove <t=int64#13,<txaddy0=int64#9
-# asm 2: cmove <t=%r15,<txaddy0=%r11
-cmove %r15,%r11
-
-# qhasm: t = *(uint64 *)(basep + 40 + pos)
-# asm 1: movq   40(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   40(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   40(%rcx,%rdi),%r15
-
-# qhasm: txaddy1 = t if =
-# asm 1: cmove <t=int64#13,<txaddy1=int64#10
-# asm 2: cmove <t=%r15,<txaddy1=%r12
-cmove %r15,%r12
-
-# qhasm: t = *(uint64 *)(basep + 48 + pos)
-# asm 1: movq   48(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   48(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   48(%rcx,%rdi),%r15
-
-# qhasm: txaddy2 = t if =
-# asm 1: cmove <t=int64#13,<txaddy2=int64#11
-# asm 2: cmove <t=%r15,<txaddy2=%r13
-cmove %r15,%r13
-
-# qhasm: t = *(uint64 *)(basep + 56 + pos)
-# asm 1: movq   56(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   56(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   56(%rcx,%rdi),%r15
-
-# qhasm: txaddy3 = t if =
-# asm 1: cmove <t=int64#13,<txaddy3=int64#12
-# asm 2: cmove <t=%r15,<txaddy3=%r14
-cmove %r15,%r14
-
-# qhasm: =? u - 2
-# asm 1: cmp  $2,<u=int64#5
-# asm 2: cmp  $2,<u=%r8
-cmp  $2,%r8
-
-# qhasm: t = *(uint64 *)(basep + 96 + pos)
-# asm 1: movq   96(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   96(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   96(%rcx,%rdi),%r15
-
-# qhasm: tysubx0 = t if =
-# asm 1: cmove <t=int64#13,<tysubx0=int64#2
-# asm 2: cmove <t=%r15,<tysubx0=%rsi
-cmove %r15,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 104 + pos)
-# asm 1: movq   104(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   104(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   104(%rcx,%rdi),%r15
-
-# qhasm: tysubx1 = t if =
-# asm 1: cmove <t=int64#13,<tysubx1=int64#6
-# asm 2: cmove <t=%r15,<tysubx1=%r9
-cmove %r15,%r9
-
-# qhasm: t = *(uint64 *)(basep + 112 + pos)
-# asm 1: movq   112(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   112(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   112(%rcx,%rdi),%r15
-
-# qhasm: tysubx2 = t if =
-# asm 1: cmove <t=int64#13,<tysubx2=int64#7
-# asm 2: cmove <t=%r15,<tysubx2=%rax
-cmove %r15,%rax
-
-# qhasm: t = *(uint64 *)(basep + 120 + pos)
-# asm 1: movq   120(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   120(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   120(%rcx,%rdi),%r15
-
-# qhasm: tysubx3 = t if =
-# asm 1: cmove <t=int64#13,<tysubx3=int64#8
-# asm 2: cmove <t=%r15,<tysubx3=%r10
-cmove %r15,%r10
-
-# qhasm: t = *(uint64 *)(basep + 128 + pos)
-# asm 1: movq   128(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   128(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   128(%rcx,%rdi),%r15
-
-# qhasm: txaddy0 = t if =
-# asm 1: cmove <t=int64#13,<txaddy0=int64#9
-# asm 2: cmove <t=%r15,<txaddy0=%r11
-cmove %r15,%r11
-
-# qhasm: t = *(uint64 *)(basep + 136 + pos)
-# asm 1: movq   136(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   136(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   136(%rcx,%rdi),%r15
-
-# qhasm: txaddy1 = t if =
-# asm 1: cmove <t=int64#13,<txaddy1=int64#10
-# asm 2: cmove <t=%r15,<txaddy1=%r12
-cmove %r15,%r12
-
-# qhasm: t = *(uint64 *)(basep + 144 + pos)
-# asm 1: movq   144(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   144(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   144(%rcx,%rdi),%r15
-
-# qhasm: txaddy2 = t if =
-# asm 1: cmove <t=int64#13,<txaddy2=int64#11
-# asm 2: cmove <t=%r15,<txaddy2=%r13
-cmove %r15,%r13
-
-# qhasm: t = *(uint64 *)(basep + 152 + pos)
-# asm 1: movq   152(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   152(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   152(%rcx,%rdi),%r15
-
-# qhasm: txaddy3 = t if =
-# asm 1: cmove <t=int64#13,<txaddy3=int64#12
-# asm 2: cmove <t=%r15,<txaddy3=%r14
-cmove %r15,%r14
-
-# qhasm: =? u - 3
-# asm 1: cmp  $3,<u=int64#5
-# asm 2: cmp  $3,<u=%r8
-cmp  $3,%r8
-
-# qhasm: t = *(uint64 *)(basep + 192 + pos)
-# asm 1: movq   192(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   192(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   192(%rcx,%rdi),%r15
-
-# qhasm: tysubx0 = t if =
-# asm 1: cmove <t=int64#13,<tysubx0=int64#2
-# asm 2: cmove <t=%r15,<tysubx0=%rsi
-cmove %r15,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 200 + pos)
-# asm 1: movq   200(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   200(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   200(%rcx,%rdi),%r15
-
-# qhasm: tysubx1 = t if =
-# asm 1: cmove <t=int64#13,<tysubx1=int64#6
-# asm 2: cmove <t=%r15,<tysubx1=%r9
-cmove %r15,%r9
-
-# qhasm: t = *(uint64 *)(basep + 208 + pos)
-# asm 1: movq   208(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   208(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   208(%rcx,%rdi),%r15
-
-# qhasm: tysubx2 = t if =
-# asm 1: cmove <t=int64#13,<tysubx2=int64#7
-# asm 2: cmove <t=%r15,<tysubx2=%rax
-cmove %r15,%rax
-
-# qhasm: t = *(uint64 *)(basep + 216 + pos)
-# asm 1: movq   216(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   216(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   216(%rcx,%rdi),%r15
-
-# qhasm: tysubx3 = t if =
-# asm 1: cmove <t=int64#13,<tysubx3=int64#8
-# asm 2: cmove <t=%r15,<tysubx3=%r10
-cmove %r15,%r10
-
-# qhasm: t = *(uint64 *)(basep + 224 + pos)
-# asm 1: movq   224(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   224(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   224(%rcx,%rdi),%r15
-
-# qhasm: txaddy0 = t if =
-# asm 1: cmove <t=int64#13,<txaddy0=int64#9
-# asm 2: cmove <t=%r15,<txaddy0=%r11
-cmove %r15,%r11
-
-# qhasm: t = *(uint64 *)(basep + 232 + pos)
-# asm 1: movq   232(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   232(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   232(%rcx,%rdi),%r15
-
-# qhasm: txaddy1 = t if =
-# asm 1: cmove <t=int64#13,<txaddy1=int64#10
-# asm 2: cmove <t=%r15,<txaddy1=%r12
-cmove %r15,%r12
-
-# qhasm: t = *(uint64 *)(basep + 240 + pos)
-# asm 1: movq   240(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   240(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   240(%rcx,%rdi),%r15
-
-# qhasm: txaddy2 = t if =
-# asm 1: cmove <t=int64#13,<txaddy2=int64#11
-# asm 2: cmove <t=%r15,<txaddy2=%r13
-cmove %r15,%r13
-
-# qhasm: t = *(uint64 *)(basep + 248 + pos)
-# asm 1: movq   248(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   248(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   248(%rcx,%rdi),%r15
-
-# qhasm: txaddy3 = t if =
-# asm 1: cmove <t=int64#13,<txaddy3=int64#12
-# asm 2: cmove <t=%r15,<txaddy3=%r14
-cmove %r15,%r14
-
-# qhasm: =? u - 4
-# asm 1: cmp  $4,<u=int64#5
-# asm 2: cmp  $4,<u=%r8
-cmp  $4,%r8
-
-# qhasm: t = *(uint64 *)(basep + 288 + pos)
-# asm 1: movq   288(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   288(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   288(%rcx,%rdi),%r15
-
-# qhasm: tysubx0 = t if =
-# asm 1: cmove <t=int64#13,<tysubx0=int64#2
-# asm 2: cmove <t=%r15,<tysubx0=%rsi
-cmove %r15,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 296 + pos)
-# asm 1: movq   296(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   296(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   296(%rcx,%rdi),%r15
-
-# qhasm: tysubx1 = t if =
-# asm 1: cmove <t=int64#13,<tysubx1=int64#6
-# asm 2: cmove <t=%r15,<tysubx1=%r9
-cmove %r15,%r9
-
-# qhasm: t = *(uint64 *)(basep + 304 + pos)
-# asm 1: movq   304(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   304(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   304(%rcx,%rdi),%r15
-
-# qhasm: tysubx2 = t if =
-# asm 1: cmove <t=int64#13,<tysubx2=int64#7
-# asm 2: cmove <t=%r15,<tysubx2=%rax
-cmove %r15,%rax
-
-# qhasm: t = *(uint64 *)(basep + 312 + pos)
-# asm 1: movq   312(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   312(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   312(%rcx,%rdi),%r15
-
-# qhasm: tysubx3 = t if =
-# asm 1: cmove <t=int64#13,<tysubx3=int64#8
-# asm 2: cmove <t=%r15,<tysubx3=%r10
-cmove %r15,%r10
-
-# qhasm: t = *(uint64 *)(basep + 320 + pos)
-# asm 1: movq   320(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   320(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   320(%rcx,%rdi),%r15
-
-# qhasm: txaddy0 = t if =
-# asm 1: cmove <t=int64#13,<txaddy0=int64#9
-# asm 2: cmove <t=%r15,<txaddy0=%r11
-cmove %r15,%r11
-
-# qhasm: t = *(uint64 *)(basep + 328 + pos)
-# asm 1: movq   328(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   328(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   328(%rcx,%rdi),%r15
-
-# qhasm: txaddy1 = t if =
-# asm 1: cmove <t=int64#13,<txaddy1=int64#10
-# asm 2: cmove <t=%r15,<txaddy1=%r12
-cmove %r15,%r12
-
-# qhasm: t = *(uint64 *)(basep + 336 + pos)
-# asm 1: movq   336(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   336(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   336(%rcx,%rdi),%r15
-
-# qhasm: txaddy2 = t if =
-# asm 1: cmove <t=int64#13,<txaddy2=int64#11
-# asm 2: cmove <t=%r15,<txaddy2=%r13
-cmove %r15,%r13
-
-# qhasm: t = *(uint64 *)(basep + 344 + pos)
-# asm 1: movq   344(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   344(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   344(%rcx,%rdi),%r15
-
-# qhasm: txaddy3 = t if =
-# asm 1: cmove <t=int64#13,<txaddy3=int64#12
-# asm 2: cmove <t=%r15,<txaddy3=%r14
-cmove %r15,%r14
-
-# qhasm: =? u - 5
-# asm 1: cmp  $5,<u=int64#5
-# asm 2: cmp  $5,<u=%r8
-cmp  $5,%r8
-
-# qhasm: t = *(uint64 *)(basep + 384 + pos)
-# asm 1: movq   384(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   384(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   384(%rcx,%rdi),%r15
-
-# qhasm: tysubx0 = t if =
-# asm 1: cmove <t=int64#13,<tysubx0=int64#2
-# asm 2: cmove <t=%r15,<tysubx0=%rsi
-cmove %r15,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 392 + pos)
-# asm 1: movq   392(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   392(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   392(%rcx,%rdi),%r15
-
-# qhasm: tysubx1 = t if =
-# asm 1: cmove <t=int64#13,<tysubx1=int64#6
-# asm 2: cmove <t=%r15,<tysubx1=%r9
-cmove %r15,%r9
-
-# qhasm: t = *(uint64 *)(basep + 400 + pos)
-# asm 1: movq   400(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   400(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   400(%rcx,%rdi),%r15
-
-# qhasm: tysubx2 = t if =
-# asm 1: cmove <t=int64#13,<tysubx2=int64#7
-# asm 2: cmove <t=%r15,<tysubx2=%rax
-cmove %r15,%rax
-
-# qhasm: t = *(uint64 *)(basep + 408 + pos)
-# asm 1: movq   408(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   408(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   408(%rcx,%rdi),%r15
-
-# qhasm: tysubx3 = t if =
-# asm 1: cmove <t=int64#13,<tysubx3=int64#8
-# asm 2: cmove <t=%r15,<tysubx3=%r10
-cmove %r15,%r10
-
-# qhasm: t = *(uint64 *)(basep + 416 + pos)
-# asm 1: movq   416(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   416(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   416(%rcx,%rdi),%r15
-
-# qhasm: txaddy0 = t if =
-# asm 1: cmove <t=int64#13,<txaddy0=int64#9
-# asm 2: cmove <t=%r15,<txaddy0=%r11
-cmove %r15,%r11
-
-# qhasm: t = *(uint64 *)(basep + 424 + pos)
-# asm 1: movq   424(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   424(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   424(%rcx,%rdi),%r15
-
-# qhasm: txaddy1 = t if =
-# asm 1: cmove <t=int64#13,<txaddy1=int64#10
-# asm 2: cmove <t=%r15,<txaddy1=%r12
-cmove %r15,%r12
-
-# qhasm: t = *(uint64 *)(basep + 432 + pos)
-# asm 1: movq   432(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   432(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   432(%rcx,%rdi),%r15
-
-# qhasm: txaddy2 = t if =
-# asm 1: cmove <t=int64#13,<txaddy2=int64#11
-# asm 2: cmove <t=%r15,<txaddy2=%r13
-cmove %r15,%r13
-
-# qhasm: t = *(uint64 *)(basep + 440 + pos)
-# asm 1: movq   440(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   440(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   440(%rcx,%rdi),%r15
-
-# qhasm: txaddy3 = t if =
-# asm 1: cmove <t=int64#13,<txaddy3=int64#12
-# asm 2: cmove <t=%r15,<txaddy3=%r14
-cmove %r15,%r14
-
-# qhasm: =? u - 6
-# asm 1: cmp  $6,<u=int64#5
-# asm 2: cmp  $6,<u=%r8
-cmp  $6,%r8
-
-# qhasm: t = *(uint64 *)(basep + 480 + pos)
-# asm 1: movq   480(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   480(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   480(%rcx,%rdi),%r15
-
-# qhasm: tysubx0 = t if =
-# asm 1: cmove <t=int64#13,<tysubx0=int64#2
-# asm 2: cmove <t=%r15,<tysubx0=%rsi
-cmove %r15,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 488 + pos)
-# asm 1: movq   488(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   488(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   488(%rcx,%rdi),%r15
-
-# qhasm: tysubx1 = t if =
-# asm 1: cmove <t=int64#13,<tysubx1=int64#6
-# asm 2: cmove <t=%r15,<tysubx1=%r9
-cmove %r15,%r9
-
-# qhasm: t = *(uint64 *)(basep + 496 + pos)
-# asm 1: movq   496(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   496(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   496(%rcx,%rdi),%r15
-
-# qhasm: tysubx2 = t if =
-# asm 1: cmove <t=int64#13,<tysubx2=int64#7
-# asm 2: cmove <t=%r15,<tysubx2=%rax
-cmove %r15,%rax
-
-# qhasm: t = *(uint64 *)(basep + 504 + pos)
-# asm 1: movq   504(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   504(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   504(%rcx,%rdi),%r15
-
-# qhasm: tysubx3 = t if =
-# asm 1: cmove <t=int64#13,<tysubx3=int64#8
-# asm 2: cmove <t=%r15,<tysubx3=%r10
-cmove %r15,%r10
-
-# qhasm: t = *(uint64 *)(basep + 512 + pos)
-# asm 1: movq   512(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   512(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   512(%rcx,%rdi),%r15
-
-# qhasm: txaddy0 = t if =
-# asm 1: cmove <t=int64#13,<txaddy0=int64#9
-# asm 2: cmove <t=%r15,<txaddy0=%r11
-cmove %r15,%r11
-
-# qhasm: t = *(uint64 *)(basep + 520 + pos)
-# asm 1: movq   520(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   520(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   520(%rcx,%rdi),%r15
-
-# qhasm: txaddy1 = t if =
-# asm 1: cmove <t=int64#13,<txaddy1=int64#10
-# asm 2: cmove <t=%r15,<txaddy1=%r12
-cmove %r15,%r12
-
-# qhasm: t = *(uint64 *)(basep + 528 + pos)
-# asm 1: movq   528(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   528(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   528(%rcx,%rdi),%r15
-
-# qhasm: txaddy2 = t if =
-# asm 1: cmove <t=int64#13,<txaddy2=int64#11
-# asm 2: cmove <t=%r15,<txaddy2=%r13
-cmove %r15,%r13
-
-# qhasm: t = *(uint64 *)(basep + 536 + pos)
-# asm 1: movq   536(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   536(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   536(%rcx,%rdi),%r15
-
-# qhasm: txaddy3 = t if =
-# asm 1: cmove <t=int64#13,<txaddy3=int64#12
-# asm 2: cmove <t=%r15,<txaddy3=%r14
-cmove %r15,%r14
-
-# qhasm: =? u - 7
-# asm 1: cmp  $7,<u=int64#5
-# asm 2: cmp  $7,<u=%r8
-cmp  $7,%r8
-
-# qhasm: t = *(uint64 *)(basep + 576 + pos)
-# asm 1: movq   576(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   576(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   576(%rcx,%rdi),%r15
-
-# qhasm: tysubx0 = t if =
-# asm 1: cmove <t=int64#13,<tysubx0=int64#2
-# asm 2: cmove <t=%r15,<tysubx0=%rsi
-cmove %r15,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 584 + pos)
-# asm 1: movq   584(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   584(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   584(%rcx,%rdi),%r15
-
-# qhasm: tysubx1 = t if =
-# asm 1: cmove <t=int64#13,<tysubx1=int64#6
-# asm 2: cmove <t=%r15,<tysubx1=%r9
-cmove %r15,%r9
-
-# qhasm: t = *(uint64 *)(basep + 592 + pos)
-# asm 1: movq   592(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   592(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   592(%rcx,%rdi),%r15
-
-# qhasm: tysubx2 = t if =
-# asm 1: cmove <t=int64#13,<tysubx2=int64#7
-# asm 2: cmove <t=%r15,<tysubx2=%rax
-cmove %r15,%rax
-
-# qhasm: t = *(uint64 *)(basep + 600 + pos)
-# asm 1: movq   600(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   600(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   600(%rcx,%rdi),%r15
-
-# qhasm: tysubx3 = t if =
-# asm 1: cmove <t=int64#13,<tysubx3=int64#8
-# asm 2: cmove <t=%r15,<tysubx3=%r10
-cmove %r15,%r10
-
-# qhasm: t = *(uint64 *)(basep + 608 + pos)
-# asm 1: movq   608(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   608(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   608(%rcx,%rdi),%r15
-
-# qhasm: txaddy0 = t if =
-# asm 1: cmove <t=int64#13,<txaddy0=int64#9
-# asm 2: cmove <t=%r15,<txaddy0=%r11
-cmove %r15,%r11
-
-# qhasm: t = *(uint64 *)(basep + 616 + pos)
-# asm 1: movq   616(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   616(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   616(%rcx,%rdi),%r15
-
-# qhasm: txaddy1 = t if =
-# asm 1: cmove <t=int64#13,<txaddy1=int64#10
-# asm 2: cmove <t=%r15,<txaddy1=%r12
-cmove %r15,%r12
-
-# qhasm: t = *(uint64 *)(basep + 624 + pos)
-# asm 1: movq   624(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   624(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   624(%rcx,%rdi),%r15
-
-# qhasm: txaddy2 = t if =
-# asm 1: cmove <t=int64#13,<txaddy2=int64#11
-# asm 2: cmove <t=%r15,<txaddy2=%r13
-cmove %r15,%r13
-
-# qhasm: t = *(uint64 *)(basep + 632 + pos)
-# asm 1: movq   632(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   632(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   632(%rcx,%rdi),%r15
-
-# qhasm: txaddy3 = t if =
-# asm 1: cmove <t=int64#13,<txaddy3=int64#12
-# asm 2: cmove <t=%r15,<txaddy3=%r14
-cmove %r15,%r14
-
-# qhasm: =? u - 8
-# asm 1: cmp  $8,<u=int64#5
-# asm 2: cmp  $8,<u=%r8
-cmp  $8,%r8
-
-# qhasm: t = *(uint64 *)(basep + 672 + pos)
-# asm 1: movq   672(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   672(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   672(%rcx,%rdi),%r15
-
-# qhasm: tysubx0 = t if =
-# asm 1: cmove <t=int64#13,<tysubx0=int64#2
-# asm 2: cmove <t=%r15,<tysubx0=%rsi
-cmove %r15,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 680 + pos)
-# asm 1: movq   680(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   680(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   680(%rcx,%rdi),%r15
-
-# qhasm: tysubx1 = t if =
-# asm 1: cmove <t=int64#13,<tysubx1=int64#6
-# asm 2: cmove <t=%r15,<tysubx1=%r9
-cmove %r15,%r9
-
-# qhasm: t = *(uint64 *)(basep + 688 + pos)
-# asm 1: movq   688(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   688(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   688(%rcx,%rdi),%r15
-
-# qhasm: tysubx2 = t if =
-# asm 1: cmove <t=int64#13,<tysubx2=int64#7
-# asm 2: cmove <t=%r15,<tysubx2=%rax
-cmove %r15,%rax
-
-# qhasm: t = *(uint64 *)(basep + 696 + pos)
-# asm 1: movq   696(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   696(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   696(%rcx,%rdi),%r15
-
-# qhasm: tysubx3 = t if =
-# asm 1: cmove <t=int64#13,<tysubx3=int64#8
-# asm 2: cmove <t=%r15,<tysubx3=%r10
-cmove %r15,%r10
-
-# qhasm: t = *(uint64 *)(basep + 704 + pos)
-# asm 1: movq   704(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   704(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   704(%rcx,%rdi),%r15
-
-# qhasm: txaddy0 = t if =
-# asm 1: cmove <t=int64#13,<txaddy0=int64#9
-# asm 2: cmove <t=%r15,<txaddy0=%r11
-cmove %r15,%r11
-
-# qhasm: t = *(uint64 *)(basep + 712 + pos)
-# asm 1: movq   712(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   712(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   712(%rcx,%rdi),%r15
-
-# qhasm: txaddy1 = t if =
-# asm 1: cmove <t=int64#13,<txaddy1=int64#10
-# asm 2: cmove <t=%r15,<txaddy1=%r12
-cmove %r15,%r12
-
-# qhasm: t = *(uint64 *)(basep + 720 + pos)
-# asm 1: movq   720(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   720(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   720(%rcx,%rdi),%r15
-
-# qhasm: txaddy2 = t if =
-# asm 1: cmove <t=int64#13,<txaddy2=int64#11
-# asm 2: cmove <t=%r15,<txaddy2=%r13
-cmove %r15,%r13
-
-# qhasm: t = *(uint64 *)(basep + 728 + pos)
-# asm 1: movq   728(<basep=int64#4,<pos=int64#1),>t=int64#13
-# asm 2: movq   728(<basep=%rcx,<pos=%rdi),>t=%r15
-movq   728(%rcx,%rdi),%r15
-
-# qhasm: txaddy3 = t if =
-# asm 1: cmove <t=int64#13,<txaddy3=int64#12
-# asm 2: cmove <t=%r15,<txaddy3=%r14
-cmove %r15,%r14
-
-# qhasm: signed<? b - 0
-# asm 1: cmp  $0,<b=int64#3
-# asm 2: cmp  $0,<b=%rdx
-cmp  $0,%rdx
-
-# qhasm: t = tysubx0
-# asm 1: mov  <tysubx0=int64#2,>t=int64#13
-# asm 2: mov  <tysubx0=%rsi,>t=%r15
-mov  %rsi,%r15
-
-# qhasm: tysubx0 = txaddy0 if signed<
-# asm 1: cmovl <txaddy0=int64#9,<tysubx0=int64#2
-# asm 2: cmovl <txaddy0=%r11,<tysubx0=%rsi
-cmovl %r11,%rsi
-
-# qhasm: txaddy0 = t if signed<
-# asm 1: cmovl <t=int64#13,<txaddy0=int64#9
-# asm 2: cmovl <t=%r15,<txaddy0=%r11
-cmovl %r15,%r11
-
-# qhasm: t = tysubx1
-# asm 1: mov  <tysubx1=int64#6,>t=int64#13
-# asm 2: mov  <tysubx1=%r9,>t=%r15
-mov  %r9,%r15
-
-# qhasm: tysubx1 = txaddy1 if signed<
-# asm 1: cmovl <txaddy1=int64#10,<tysubx1=int64#6
-# asm 2: cmovl <txaddy1=%r12,<tysubx1=%r9
-cmovl %r12,%r9
-
-# qhasm: txaddy1 = t if signed<
-# asm 1: cmovl <t=int64#13,<txaddy1=int64#10
-# asm 2: cmovl <t=%r15,<txaddy1=%r12
-cmovl %r15,%r12
-
-# qhasm: t = tysubx2
-# asm 1: mov  <tysubx2=int64#7,>t=int64#13
-# asm 2: mov  <tysubx2=%rax,>t=%r15
-mov  %rax,%r15
-
-# qhasm: tysubx2 = txaddy2 if signed<
-# asm 1: cmovl <txaddy2=int64#11,<tysubx2=int64#7
-# asm 2: cmovl <txaddy2=%r13,<tysubx2=%rax
-cmovl %r13,%rax
-
-# qhasm: txaddy2 = t if signed<
-# asm 1: cmovl <t=int64#13,<txaddy2=int64#11
-# asm 2: cmovl <t=%r15,<txaddy2=%r13
-cmovl %r15,%r13
-
-# qhasm: t = tysubx3
-# asm 1: mov  <tysubx3=int64#8,>t=int64#13
-# asm 2: mov  <tysubx3=%r10,>t=%r15
-mov  %r10,%r15
-
-# qhasm: tysubx3 = txaddy3 if signed<
-# asm 1: cmovl <txaddy3=int64#12,<tysubx3=int64#8
-# asm 2: cmovl <txaddy3=%r14,<tysubx3=%r10
-cmovl %r14,%r10
-
-# qhasm: txaddy3 = t if signed<
-# asm 1: cmovl <t=int64#13,<txaddy3=int64#12
-# asm 2: cmovl <t=%r15,<txaddy3=%r14
-cmovl %r15,%r14
-
-# qhasm: tp = tp_stack
-# asm 1: movq <tp_stack=stack64#8,>tp=int64#13
-# asm 2: movq <tp_stack=56(%rsp),>tp=%r15
-movq 56(%rsp),%r15
-
-# qhasm: *(uint64 *)(tp + 0) = tysubx0
-# asm 1: movq   <tysubx0=int64#2,0(<tp=int64#13)
-# asm 2: movq   <tysubx0=%rsi,0(<tp=%r15)
-movq   %rsi,0(%r15)
-
-# qhasm: *(uint64 *)(tp + 8) = tysubx1
-# asm 1: movq   <tysubx1=int64#6,8(<tp=int64#13)
-# asm 2: movq   <tysubx1=%r9,8(<tp=%r15)
-movq   %r9,8(%r15)
-
-# qhasm: *(uint64 *)(tp + 16) = tysubx2
-# asm 1: movq   <tysubx2=int64#7,16(<tp=int64#13)
-# asm 2: movq   <tysubx2=%rax,16(<tp=%r15)
-movq   %rax,16(%r15)
-
-# qhasm: *(uint64 *)(tp + 24) = tysubx3
-# asm 1: movq   <tysubx3=int64#8,24(<tp=int64#13)
-# asm 2: movq   <tysubx3=%r10,24(<tp=%r15)
-movq   %r10,24(%r15)
-
-# qhasm: *(uint64 *)(tp + 32) = txaddy0
-# asm 1: movq   <txaddy0=int64#9,32(<tp=int64#13)
-# asm 2: movq   <txaddy0=%r11,32(<tp=%r15)
-movq   %r11,32(%r15)
-
-# qhasm: *(uint64 *)(tp + 40) = txaddy1
-# asm 1: movq   <txaddy1=int64#10,40(<tp=int64#13)
-# asm 2: movq   <txaddy1=%r12,40(<tp=%r15)
-movq   %r12,40(%r15)
-
-# qhasm: *(uint64 *)(tp + 48) = txaddy2
-# asm 1: movq   <txaddy2=int64#11,48(<tp=int64#13)
-# asm 2: movq   <txaddy2=%r13,48(<tp=%r15)
-movq   %r13,48(%r15)
-
-# qhasm: *(uint64 *)(tp + 56) = txaddy3
-# asm 1: movq   <txaddy3=int64#12,56(<tp=int64#13)
-# asm 2: movq   <txaddy3=%r14,56(<tp=%r15)
-movq   %r14,56(%r15)
-
-# qhasm: tt2d0 = 0
-# asm 1: mov  $0,>tt2d0=int64#2
-# asm 2: mov  $0,>tt2d0=%rsi
-mov  $0,%rsi
-
-# qhasm: tt2d1 = 0
-# asm 1: mov  $0,>tt2d1=int64#6
-# asm 2: mov  $0,>tt2d1=%r9
-mov  $0,%r9
-
-# qhasm: tt2d2 = 0
-# asm 1: mov  $0,>tt2d2=int64#7
-# asm 2: mov  $0,>tt2d2=%rax
-mov  $0,%rax
-
-# qhasm: tt2d3 = 0
-# asm 1: mov  $0,>tt2d3=int64#8
-# asm 2: mov  $0,>tt2d3=%r10
-mov  $0,%r10
-
-# qhasm: =? u - 1
-# asm 1: cmp  $1,<u=int64#5
-# asm 2: cmp  $1,<u=%r8
-cmp  $1,%r8
-
-# qhasm: t = *(uint64 *)(basep + 64 + pos)
-# asm 1: movq   64(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   64(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   64(%rcx,%rdi),%r11
-
-# qhasm: tt2d0 = t if =
-# asm 1: cmove <t=int64#9,<tt2d0=int64#2
-# asm 2: cmove <t=%r11,<tt2d0=%rsi
-cmove %r11,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 72 + pos)
-# asm 1: movq   72(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   72(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   72(%rcx,%rdi),%r11
-
-# qhasm: tt2d1 = t if =
-# asm 1: cmove <t=int64#9,<tt2d1=int64#6
-# asm 2: cmove <t=%r11,<tt2d1=%r9
-cmove %r11,%r9
-
-# qhasm: t = *(uint64 *)(basep + 80 + pos)
-# asm 1: movq   80(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   80(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   80(%rcx,%rdi),%r11
-
-# qhasm: tt2d2 = t if =
-# asm 1: cmove <t=int64#9,<tt2d2=int64#7
-# asm 2: cmove <t=%r11,<tt2d2=%rax
-cmove %r11,%rax
-
-# qhasm: t = *(uint64 *)(basep + 88 + pos)
-# asm 1: movq   88(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   88(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   88(%rcx,%rdi),%r11
-
-# qhasm: tt2d3 = t if =
-# asm 1: cmove <t=int64#9,<tt2d3=int64#8
-# asm 2: cmove <t=%r11,<tt2d3=%r10
-cmove %r11,%r10
-
-# qhasm: =? u - 2
-# asm 1: cmp  $2,<u=int64#5
-# asm 2: cmp  $2,<u=%r8
-cmp  $2,%r8
-
-# qhasm: t = *(uint64 *)(basep + 160 + pos)
-# asm 1: movq   160(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   160(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   160(%rcx,%rdi),%r11
-
-# qhasm: tt2d0 = t if =
-# asm 1: cmove <t=int64#9,<tt2d0=int64#2
-# asm 2: cmove <t=%r11,<tt2d0=%rsi
-cmove %r11,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 168 + pos)
-# asm 1: movq   168(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   168(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   168(%rcx,%rdi),%r11
-
-# qhasm: tt2d1 = t if =
-# asm 1: cmove <t=int64#9,<tt2d1=int64#6
-# asm 2: cmove <t=%r11,<tt2d1=%r9
-cmove %r11,%r9
-
-# qhasm: t = *(uint64 *)(basep + 176 + pos)
-# asm 1: movq   176(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   176(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   176(%rcx,%rdi),%r11
-
-# qhasm: tt2d2 = t if =
-# asm 1: cmove <t=int64#9,<tt2d2=int64#7
-# asm 2: cmove <t=%r11,<tt2d2=%rax
-cmove %r11,%rax
-
-# qhasm: t = *(uint64 *)(basep + 184 + pos)
-# asm 1: movq   184(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   184(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   184(%rcx,%rdi),%r11
-
-# qhasm: tt2d3 = t if =
-# asm 1: cmove <t=int64#9,<tt2d3=int64#8
-# asm 2: cmove <t=%r11,<tt2d3=%r10
-cmove %r11,%r10
-
-# qhasm: =? u - 3
-# asm 1: cmp  $3,<u=int64#5
-# asm 2: cmp  $3,<u=%r8
-cmp  $3,%r8
-
-# qhasm: t = *(uint64 *)(basep + 256 + pos)
-# asm 1: movq   256(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   256(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   256(%rcx,%rdi),%r11
-
-# qhasm: tt2d0 = t if =
-# asm 1: cmove <t=int64#9,<tt2d0=int64#2
-# asm 2: cmove <t=%r11,<tt2d0=%rsi
-cmove %r11,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 264 + pos)
-# asm 1: movq   264(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   264(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   264(%rcx,%rdi),%r11
-
-# qhasm: tt2d1 = t if =
-# asm 1: cmove <t=int64#9,<tt2d1=int64#6
-# asm 2: cmove <t=%r11,<tt2d1=%r9
-cmove %r11,%r9
-
-# qhasm: t = *(uint64 *)(basep + 272 + pos)
-# asm 1: movq   272(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   272(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   272(%rcx,%rdi),%r11
-
-# qhasm: tt2d2 = t if =
-# asm 1: cmove <t=int64#9,<tt2d2=int64#7
-# asm 2: cmove <t=%r11,<tt2d2=%rax
-cmove %r11,%rax
-
-# qhasm: t = *(uint64 *)(basep + 280 + pos)
-# asm 1: movq   280(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   280(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   280(%rcx,%rdi),%r11
-
-# qhasm: tt2d3 = t if =
-# asm 1: cmove <t=int64#9,<tt2d3=int64#8
-# asm 2: cmove <t=%r11,<tt2d3=%r10
-cmove %r11,%r10
-
-# qhasm: =? u - 4
-# asm 1: cmp  $4,<u=int64#5
-# asm 2: cmp  $4,<u=%r8
-cmp  $4,%r8
-
-# qhasm: t = *(uint64 *)(basep + 352 + pos)
-# asm 1: movq   352(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   352(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   352(%rcx,%rdi),%r11
-
-# qhasm: tt2d0 = t if =
-# asm 1: cmove <t=int64#9,<tt2d0=int64#2
-# asm 2: cmove <t=%r11,<tt2d0=%rsi
-cmove %r11,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 360 + pos)
-# asm 1: movq   360(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   360(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   360(%rcx,%rdi),%r11
-
-# qhasm: tt2d1 = t if =
-# asm 1: cmove <t=int64#9,<tt2d1=int64#6
-# asm 2: cmove <t=%r11,<tt2d1=%r9
-cmove %r11,%r9
-
-# qhasm: t = *(uint64 *)(basep + 368 + pos)
-# asm 1: movq   368(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   368(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   368(%rcx,%rdi),%r11
-
-# qhasm: tt2d2 = t if =
-# asm 1: cmove <t=int64#9,<tt2d2=int64#7
-# asm 2: cmove <t=%r11,<tt2d2=%rax
-cmove %r11,%rax
-
-# qhasm: t = *(uint64 *)(basep + 376 + pos)
-# asm 1: movq   376(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   376(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   376(%rcx,%rdi),%r11
-
-# qhasm: tt2d3 = t if =
-# asm 1: cmove <t=int64#9,<tt2d3=int64#8
-# asm 2: cmove <t=%r11,<tt2d3=%r10
-cmove %r11,%r10
-
-# qhasm: =? u - 5
-# asm 1: cmp  $5,<u=int64#5
-# asm 2: cmp  $5,<u=%r8
-cmp  $5,%r8
-
-# qhasm: t = *(uint64 *)(basep + 448 + pos)
-# asm 1: movq   448(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   448(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   448(%rcx,%rdi),%r11
-
-# qhasm: tt2d0 = t if =
-# asm 1: cmove <t=int64#9,<tt2d0=int64#2
-# asm 2: cmove <t=%r11,<tt2d0=%rsi
-cmove %r11,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 456 + pos)
-# asm 1: movq   456(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   456(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   456(%rcx,%rdi),%r11
-
-# qhasm: tt2d1 = t if =
-# asm 1: cmove <t=int64#9,<tt2d1=int64#6
-# asm 2: cmove <t=%r11,<tt2d1=%r9
-cmove %r11,%r9
-
-# qhasm: t = *(uint64 *)(basep + 464 + pos)
-# asm 1: movq   464(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   464(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   464(%rcx,%rdi),%r11
-
-# qhasm: tt2d2 = t if =
-# asm 1: cmove <t=int64#9,<tt2d2=int64#7
-# asm 2: cmove <t=%r11,<tt2d2=%rax
-cmove %r11,%rax
-
-# qhasm: t = *(uint64 *)(basep + 472 + pos)
-# asm 1: movq   472(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   472(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   472(%rcx,%rdi),%r11
-
-# qhasm: tt2d3 = t if =
-# asm 1: cmove <t=int64#9,<tt2d3=int64#8
-# asm 2: cmove <t=%r11,<tt2d3=%r10
-cmove %r11,%r10
-
-# qhasm: =? u - 6
-# asm 1: cmp  $6,<u=int64#5
-# asm 2: cmp  $6,<u=%r8
-cmp  $6,%r8
-
-# qhasm: t = *(uint64 *)(basep + 544 + pos)
-# asm 1: movq   544(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   544(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   544(%rcx,%rdi),%r11
-
-# qhasm: tt2d0 = t if =
-# asm 1: cmove <t=int64#9,<tt2d0=int64#2
-# asm 2: cmove <t=%r11,<tt2d0=%rsi
-cmove %r11,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 552 + pos)
-# asm 1: movq   552(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   552(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   552(%rcx,%rdi),%r11
-
-# qhasm: tt2d1 = t if =
-# asm 1: cmove <t=int64#9,<tt2d1=int64#6
-# asm 2: cmove <t=%r11,<tt2d1=%r9
-cmove %r11,%r9
-
-# qhasm: t = *(uint64 *)(basep + 560 + pos)
-# asm 1: movq   560(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   560(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   560(%rcx,%rdi),%r11
-
-# qhasm: tt2d2 = t if =
-# asm 1: cmove <t=int64#9,<tt2d2=int64#7
-# asm 2: cmove <t=%r11,<tt2d2=%rax
-cmove %r11,%rax
-
-# qhasm: t = *(uint64 *)(basep + 568 + pos)
-# asm 1: movq   568(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   568(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   568(%rcx,%rdi),%r11
-
-# qhasm: tt2d3 = t if =
-# asm 1: cmove <t=int64#9,<tt2d3=int64#8
-# asm 2: cmove <t=%r11,<tt2d3=%r10
-cmove %r11,%r10
-
-# qhasm: =? u - 7
-# asm 1: cmp  $7,<u=int64#5
-# asm 2: cmp  $7,<u=%r8
-cmp  $7,%r8
-
-# qhasm: t = *(uint64 *)(basep + 640 + pos)
-# asm 1: movq   640(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   640(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   640(%rcx,%rdi),%r11
-
-# qhasm: tt2d0 = t if =
-# asm 1: cmove <t=int64#9,<tt2d0=int64#2
-# asm 2: cmove <t=%r11,<tt2d0=%rsi
-cmove %r11,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 648 + pos)
-# asm 1: movq   648(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   648(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   648(%rcx,%rdi),%r11
-
-# qhasm: tt2d1 = t if =
-# asm 1: cmove <t=int64#9,<tt2d1=int64#6
-# asm 2: cmove <t=%r11,<tt2d1=%r9
-cmove %r11,%r9
-
-# qhasm: t = *(uint64 *)(basep + 656 + pos)
-# asm 1: movq   656(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   656(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   656(%rcx,%rdi),%r11
-
-# qhasm: tt2d2 = t if =
-# asm 1: cmove <t=int64#9,<tt2d2=int64#7
-# asm 2: cmove <t=%r11,<tt2d2=%rax
-cmove %r11,%rax
-
-# qhasm: t = *(uint64 *)(basep + 664 + pos)
-# asm 1: movq   664(<basep=int64#4,<pos=int64#1),>t=int64#9
-# asm 2: movq   664(<basep=%rcx,<pos=%rdi),>t=%r11
-movq   664(%rcx,%rdi),%r11
-
-# qhasm: tt2d3 = t if =
-# asm 1: cmove <t=int64#9,<tt2d3=int64#8
-# asm 2: cmove <t=%r11,<tt2d3=%r10
-cmove %r11,%r10
-
-# qhasm: =? u - 8
-# asm 1: cmp  $8,<u=int64#5
-# asm 2: cmp  $8,<u=%r8
-cmp  $8,%r8
-
-# qhasm: t = *(uint64 *)(basep + 736 + pos)
-# asm 1: movq   736(<basep=int64#4,<pos=int64#1),>t=int64#5
-# asm 2: movq   736(<basep=%rcx,<pos=%rdi),>t=%r8
-movq   736(%rcx,%rdi),%r8
-
-# qhasm: tt2d0 = t if =
-# asm 1: cmove <t=int64#5,<tt2d0=int64#2
-# asm 2: cmove <t=%r8,<tt2d0=%rsi
-cmove %r8,%rsi
-
-# qhasm: t = *(uint64 *)(basep + 744 + pos)
-# asm 1: movq   744(<basep=int64#4,<pos=int64#1),>t=int64#5
-# asm 2: movq   744(<basep=%rcx,<pos=%rdi),>t=%r8
-movq   744(%rcx,%rdi),%r8
-
-# qhasm: tt2d1 = t if =
-# asm 1: cmove <t=int64#5,<tt2d1=int64#6
-# asm 2: cmove <t=%r8,<tt2d1=%r9
-cmove %r8,%r9
-
-# qhasm: t = *(uint64 *)(basep + 752 + pos)
-# asm 1: movq   752(<basep=int64#4,<pos=int64#1),>t=int64#5
-# asm 2: movq   752(<basep=%rcx,<pos=%rdi),>t=%r8
-movq   752(%rcx,%rdi),%r8
-
-# qhasm: tt2d2 = t if =
-# asm 1: cmove <t=int64#5,<tt2d2=int64#7
-# asm 2: cmove <t=%r8,<tt2d2=%rax
-cmove %r8,%rax
-
-# qhasm: t = *(uint64 *)(basep + 760 + pos)
-# asm 1: movq   760(<basep=int64#4,<pos=int64#1),>t=int64#1
-# asm 2: movq   760(<basep=%rcx,<pos=%rdi),>t=%rdi
-movq   760(%rcx,%rdi),%rdi
-
-# qhasm: tt2d3 = t if =
-# asm 1: cmove <t=int64#1,<tt2d3=int64#8
-# asm 2: cmove <t=%rdi,<tt2d3=%r10
-cmove %rdi,%r10
-
-# qhasm: tt0 = 0
-# asm 1: mov  $0,>tt0=int64#1
-# asm 2: mov  $0,>tt0=%rdi
-mov  $0,%rdi
-
-# qhasm: tt1 = 0
-# asm 1: mov  $0,>tt1=int64#4
-# asm 2: mov  $0,>tt1=%rcx
-mov  $0,%rcx
-
-# qhasm: tt2 = 0
-# asm 1: mov  $0,>tt2=int64#5
-# asm 2: mov  $0,>tt2=%r8
-mov  $0,%r8
-
-# qhasm: tt3 = 0
-# asm 1: mov  $0,>tt3=int64#9
-# asm 2: mov  $0,>tt3=%r11
-mov  $0,%r11
-
-# qhasm: carry? tt0 -= tt2d0
-# asm 1: sub  <tt2d0=int64#2,<tt0=int64#1
-# asm 2: sub  <tt2d0=%rsi,<tt0=%rdi
-sub  %rsi,%rdi
-
-# qhasm: carry? tt1 -= tt2d1 - carry
-# asm 1: sbb  <tt2d1=int64#6,<tt1=int64#4
-# asm 2: sbb  <tt2d1=%r9,<tt1=%rcx
-sbb  %r9,%rcx
-
-# qhasm: carry? tt2 -= tt2d2 - carry
-# asm 1: sbb  <tt2d2=int64#7,<tt2=int64#5
-# asm 2: sbb  <tt2d2=%rax,<tt2=%r8
-sbb  %rax,%r8
-
-# qhasm: carry? tt3 -= tt2d3 - carry
-# asm 1: sbb  <tt2d3=int64#8,<tt3=int64#9
-# asm 2: sbb  <tt2d3=%r10,<tt3=%r11
-sbb  %r10,%r11
-
-# qhasm: subt0 = 0
-# asm 1: mov  $0,>subt0=int64#10
-# asm 2: mov  $0,>subt0=%r12
-mov  $0,%r12
-
-# qhasm: subt1 = 38
-# asm 1: mov  $38,>subt1=int64#11
-# asm 2: mov  $38,>subt1=%r13
-mov  $38,%r13
-
-# qhasm: subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#10,<subt1=int64#11
-# asm 2: cmovae <subt0=%r12,<subt1=%r13
-cmovae %r12,%r13
-
-# qhasm: carry? tt0 -= subt1
-# asm 1: sub  <subt1=int64#11,<tt0=int64#1
-# asm 2: sub  <subt1=%r13,<tt0=%rdi
-sub  %r13,%rdi
-
-# qhasm: carry? tt1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#10,<tt1=int64#4
-# asm 2: sbb  <subt0=%r12,<tt1=%rcx
-sbb  %r12,%rcx
-
-# qhasm: carry? tt2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#10,<tt2=int64#5
-# asm 2: sbb  <subt0=%r12,<tt2=%r8
-sbb  %r12,%r8
-
-# qhasm: carry? tt3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#10,<tt3=int64#9
-# asm 2: sbb  <subt0=%r12,<tt3=%r11
-sbb  %r12,%r11
-
-# qhasm: subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#11,<subt0=int64#10
-# asm 2: cmovc <subt1=%r13,<subt0=%r12
-cmovc %r13,%r12
-
-# qhasm: tt0 -= subt0
-# asm 1: sub  <subt0=int64#10,<tt0=int64#1
-# asm 2: sub  <subt0=%r12,<tt0=%rdi
-sub  %r12,%rdi
-
-# qhasm: signed<? b - 0
-# asm 1: cmp  $0,<b=int64#3
-# asm 2: cmp  $0,<b=%rdx
-cmp  $0,%rdx
-
-# qhasm: tt2d0 = tt0 if signed<
-# asm 1: cmovl <tt0=int64#1,<tt2d0=int64#2
-# asm 2: cmovl <tt0=%rdi,<tt2d0=%rsi
-cmovl %rdi,%rsi
-
-# qhasm: tt2d1 = tt1 if signed<
-# asm 1: cmovl <tt1=int64#4,<tt2d1=int64#6
-# asm 2: cmovl <tt1=%rcx,<tt2d1=%r9
-cmovl %rcx,%r9
-
-# qhasm: tt2d2 = tt2 if signed<
-# asm 1: cmovl <tt2=int64#5,<tt2d2=int64#7
-# asm 2: cmovl <tt2=%r8,<tt2d2=%rax
-cmovl %r8,%rax
-
-# qhasm: tt2d3 = tt3 if signed<
-# asm 1: cmovl <tt3=int64#9,<tt2d3=int64#8
-# asm 2: cmovl <tt3=%r11,<tt2d3=%r10
-cmovl %r11,%r10
-
-# qhasm: *(uint64 *)(tp + 64) = tt2d0
-# asm 1: movq   <tt2d0=int64#2,64(<tp=int64#13)
-# asm 2: movq   <tt2d0=%rsi,64(<tp=%r15)
-movq   %rsi,64(%r15)
-
-# qhasm: *(uint64 *)(tp + 72) = tt2d1
-# asm 1: movq   <tt2d1=int64#6,72(<tp=int64#13)
-# asm 2: movq   <tt2d1=%r9,72(<tp=%r15)
-movq   %r9,72(%r15)
-
-# qhasm: *(uint64 *)(tp + 80) = tt2d2
-# asm 1: movq   <tt2d2=int64#7,80(<tp=int64#13)
-# asm 2: movq   <tt2d2=%rax,80(<tp=%r15)
-movq   %rax,80(%r15)
-
-# qhasm: *(uint64 *)(tp + 88) = tt2d3
-# asm 1: movq   <tt2d3=int64#8,88(<tp=int64#13)
-# asm 2: movq   <tt2d3=%r10,88(<tp=%r15)
-movq   %r10,88(%r15)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/consts.s b/ext/ed25519-amd64-asm/consts.s
deleted file mode 100644
index c272383f6..000000000
--- a/ext/ed25519-amd64-asm/consts.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.data
-
-.globl crypto_sign_ed25519_amd64_64_121666
-.globl crypto_sign_ed25519_amd64_64_MU0
-.globl crypto_sign_ed25519_amd64_64_MU1
-.globl crypto_sign_ed25519_amd64_64_MU2
-.globl crypto_sign_ed25519_amd64_64_MU3
-.globl crypto_sign_ed25519_amd64_64_MU4
-.globl crypto_sign_ed25519_amd64_64_ORDER0
-.globl crypto_sign_ed25519_amd64_64_ORDER1
-.globl crypto_sign_ed25519_amd64_64_ORDER2
-.globl crypto_sign_ed25519_amd64_64_ORDER3
-.globl crypto_sign_ed25519_amd64_64_EC2D0
-.globl crypto_sign_ed25519_amd64_64_EC2D1
-.globl crypto_sign_ed25519_amd64_64_EC2D2
-.globl crypto_sign_ed25519_amd64_64_EC2D3
-.globl crypto_sign_ed25519_amd64_64_38
-
-.p2align 4
-
-crypto_sign_ed25519_amd64_64_121666:     .quad 121666
-
-crypto_sign_ed25519_amd64_64_MU0:         .quad 0xED9CE5A30A2C131B
-crypto_sign_ed25519_amd64_64_MU1:         .quad 0x2106215D086329A7
-crypto_sign_ed25519_amd64_64_MU2:         .quad 0xFFFFFFFFFFFFFFEB
-crypto_sign_ed25519_amd64_64_MU3:         .quad 0xFFFFFFFFFFFFFFFF
-crypto_sign_ed25519_amd64_64_MU4:         .quad 0x000000000000000F
-
-crypto_sign_ed25519_amd64_64_ORDER0:      .quad 0x5812631A5CF5D3ED
-crypto_sign_ed25519_amd64_64_ORDER1:      .quad 0x14DEF9DEA2F79CD6
-crypto_sign_ed25519_amd64_64_ORDER2:      .quad 0x0000000000000000
-crypto_sign_ed25519_amd64_64_ORDER3:      .quad 0x1000000000000000
-
-crypto_sign_ed25519_amd64_64_EC2D0:       .quad 0xEBD69B9426B2F146
-crypto_sign_ed25519_amd64_64_EC2D1:       .quad 0x00E0149A8283B156
-crypto_sign_ed25519_amd64_64_EC2D2:       .quad 0x198E80F2EEF3D130
-crypto_sign_ed25519_amd64_64_EC2D3:       .quad 0xA406D9DC56DFFCE7
-
-crypto_sign_ed25519_amd64_64_38:         .quad 38
diff --git a/ext/ed25519-amd64-asm/fe25519.h b/ext/ed25519-amd64-asm/fe25519.h
deleted file mode 100644
index 33ffabbe7..000000000
--- a/ext/ed25519-amd64-asm/fe25519.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef FE25519_H
-#define FE25519_H
-
-#define fe25519                crypto_sign_ed25519_amd64_64_fe25519
-#define fe25519_freeze         crypto_sign_ed25519_amd64_64_fe25519_freeze
-#define fe25519_unpack         crypto_sign_ed25519_amd64_64_fe25519_unpack
-#define fe25519_pack           crypto_sign_ed25519_amd64_64_fe25519_pack
-#define fe25519_iszero_vartime crypto_sign_ed25519_amd64_64_fe25519_iszero_vartime
-#define fe25519_iseq_vartime   crypto_sign_ed25519_amd64_64_fe25519_iseq_vartime
-#define fe25519_cmov           crypto_sign_ed25519_amd64_64_fe25519_cmov
-#define fe25519_setint         crypto_sign_ed25519_amd64_64_fe25519_setint
-#define fe25519_neg            crypto_sign_ed25519_amd64_64_fe25519_neg
-#define fe25519_getparity      crypto_sign_ed25519_amd64_64_fe25519_getparity
-#define fe25519_add            crypto_sign_ed25519_amd64_64_fe25519_add
-#define fe25519_sub            crypto_sign_ed25519_amd64_64_fe25519_sub
-#define fe25519_mul            crypto_sign_ed25519_amd64_64_fe25519_mul
-#define fe25519_mul121666      crypto_sign_ed25519_amd64_64_fe25519_mul121666
-#define fe25519_square         crypto_sign_ed25519_amd64_64_fe25519_square
-#define fe25519_invert         crypto_sign_ed25519_amd64_64_fe25519_invert
-#define fe25519_pow2523        crypto_sign_ed25519_amd64_64_fe25519_pow2523
-
-typedef struct 
-{
-  unsigned long long v[4]; 
-}
-fe25519;
-
-void fe25519_freeze(fe25519 *r);
-
-void fe25519_unpack(fe25519 *r, const unsigned char x[32]);
-
-void fe25519_pack(unsigned char r[32], const fe25519 *x);
-
-void fe25519_cmov(fe25519 *r, const fe25519 *x, unsigned char b);
-
-void fe25519_cswap(fe25519 *r, fe25519 *x, unsigned char b);
-
-void fe25519_setint(fe25519 *r, unsigned int v);
-
-void fe25519_neg(fe25519 *r, const fe25519 *x);
-
-unsigned char fe25519_getparity(const fe25519 *x);
-
-int fe25519_iszero_vartime(const fe25519 *x);
-
-int fe25519_iseq_vartime(const fe25519 *x, const fe25519 *y);
-
-void fe25519_add(fe25519 *r, const fe25519 *x, const fe25519 *y);
-
-void fe25519_sub(fe25519 *r, const fe25519 *x, const fe25519 *y);
-
-void fe25519_mul(fe25519 *r, const fe25519 *x, const fe25519 *y);
-
-void fe25519_mul121666(fe25519 *r, const fe25519 *x);
-
-void fe25519_square(fe25519 *r, const fe25519 *x);
-
-void fe25519_pow(fe25519 *r, const fe25519 *x, const unsigned char *e);
-
-void fe25519_invert(fe25519 *r, const fe25519 *x);
-
-void fe25519_pow2523(fe25519 *r, const fe25519 *x);
-
-#endif
diff --git a/ext/ed25519-amd64-asm/fe25519_add.s b/ext/ed25519-amd64-asm/fe25519_add.s
deleted file mode 100644
index b2e562520..000000000
--- a/ext/ed25519-amd64-asm/fe25519_add.s
+++ /dev/null
@@ -1,189 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 xp
-
-# qhasm: int64 yp
-
-# qhasm: input rp
-
-# qhasm: input xp
-
-# qhasm: input yp
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm: int64 addt0
-
-# qhasm: int64 addt1
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_add
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_add
-.globl crypto_sign_ed25519_amd64_64_fe25519_add
-_crypto_sign_ed25519_amd64_64_fe25519_add:
-crypto_sign_ed25519_amd64_64_fe25519_add:
-mov %rsp,%r11
-and $31,%r11
-add $0,%r11
-sub %r11,%rsp
-
-# qhasm: r0 = *(uint64 *)(xp + 0)
-# asm 1: movq   0(<xp=int64#2),>r0=int64#4
-# asm 2: movq   0(<xp=%rsi),>r0=%rcx
-movq   0(%rsi),%rcx
-
-# qhasm: r1 = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>r1=int64#5
-# asm 2: movq   8(<xp=%rsi),>r1=%r8
-movq   8(%rsi),%r8
-
-# qhasm: r2 = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>r2=int64#6
-# asm 2: movq   16(<xp=%rsi),>r2=%r9
-movq   16(%rsi),%r9
-
-# qhasm: r3 = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>r3=int64#2
-# asm 2: movq   24(<xp=%rsi),>r3=%rsi
-movq   24(%rsi),%rsi
-
-# qhasm:   carry? r0 += *(uint64 *)(yp + 0) 
-# asm 1: addq 0(<yp=int64#3),<r0=int64#4
-# asm 2: addq 0(<yp=%rdx),<r0=%rcx
-addq 0(%rdx),%rcx
-
-# qhasm:   carry? r1 += *(uint64 *)(yp + 8) + carry
-# asm 1: adcq 8(<yp=int64#3),<r1=int64#5
-# asm 2: adcq 8(<yp=%rdx),<r1=%r8
-adcq 8(%rdx),%r8
-
-# qhasm:   carry? r2 += *(uint64 *)(yp + 16) + carry
-# asm 1: adcq 16(<yp=int64#3),<r2=int64#6
-# asm 2: adcq 16(<yp=%rdx),<r2=%r9
-adcq 16(%rdx),%r9
-
-# qhasm:   carry? r3 += *(uint64 *)(yp + 24) + carry
-# asm 1: adcq 24(<yp=int64#3),<r3=int64#2
-# asm 2: adcq 24(<yp=%rdx),<r3=%rsi
-adcq 24(%rdx),%rsi
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#3
-# asm 2: mov  $0,>addt0=%rdx
-mov  $0,%rdx
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#7
-# asm 2: mov  $38,>addt1=%rax
-mov  $38,%rax
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#3,<addt1=int64#7
-# asm 2: cmovae <addt0=%rdx,<addt1=%rax
-cmovae %rdx,%rax
-
-# qhasm:   carry? r0 += addt1
-# asm 1: add  <addt1=int64#7,<r0=int64#4
-# asm 2: add  <addt1=%rax,<r0=%rcx
-add  %rax,%rcx
-
-# qhasm:   carry? r1 += addt0 + carry
-# asm 1: adc <addt0=int64#3,<r1=int64#5
-# asm 2: adc <addt0=%rdx,<r1=%r8
-adc %rdx,%r8
-
-# qhasm:   carry? r2 += addt0 + carry
-# asm 1: adc <addt0=int64#3,<r2=int64#6
-# asm 2: adc <addt0=%rdx,<r2=%r9
-adc %rdx,%r9
-
-# qhasm:   carry? r3 += addt0 + carry
-# asm 1: adc <addt0=int64#3,<r3=int64#2
-# asm 2: adc <addt0=%rdx,<r3=%rsi
-adc %rdx,%rsi
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#7,<addt0=int64#3
-# asm 2: cmovc <addt1=%rax,<addt0=%rdx
-cmovc %rax,%rdx
-
-# qhasm:   r0 += addt0
-# asm 1: add  <addt0=int64#3,<r0=int64#4
-# asm 2: add  <addt0=%rdx,<r0=%rcx
-add  %rdx,%rcx
-
-# qhasm: *(uint64 *)(rp + 0) = r0
-# asm 1: movq   <r0=int64#4,0(<rp=int64#1)
-# asm 2: movq   <r0=%rcx,0(<rp=%rdi)
-movq   %rcx,0(%rdi)
-
-# qhasm: *(uint64 *)(rp + 8) = r1
-# asm 1: movq   <r1=int64#5,8(<rp=int64#1)
-# asm 2: movq   <r1=%r8,8(<rp=%rdi)
-movq   %r8,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#6,16(<rp=int64#1)
-# asm 2: movq   <r2=%r9,16(<rp=%rdi)
-movq   %r9,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#2,24(<rp=int64#1)
-# asm 2: movq   <r3=%rsi,24(<rp=%rdi)
-movq   %rsi,24(%rdi)
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/fe25519_freeze.s b/ext/ed25519-amd64-asm/fe25519_freeze.s
deleted file mode 100644
index dea290212..000000000
--- a/ext/ed25519-amd64-asm/fe25519_freeze.s
+++ /dev/null
@@ -1,322 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: input rp
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm: int64 two63
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_freeze
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_freeze
-.globl crypto_sign_ed25519_amd64_64_fe25519_freeze
-_crypto_sign_ed25519_amd64_64_fe25519_freeze:
-crypto_sign_ed25519_amd64_64_fe25519_freeze:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: r0 = *(uint64 *) (rp + 0)
-# asm 1: movq   0(<rp=int64#1),>r0=int64#2
-# asm 2: movq   0(<rp=%rdi),>r0=%rsi
-movq   0(%rdi),%rsi
-
-# qhasm: r1 = *(uint64 *) (rp + 8)
-# asm 1: movq   8(<rp=int64#1),>r1=int64#3
-# asm 2: movq   8(<rp=%rdi),>r1=%rdx
-movq   8(%rdi),%rdx
-
-# qhasm: r2 = *(uint64 *) (rp + 16)
-# asm 1: movq   16(<rp=int64#1),>r2=int64#4
-# asm 2: movq   16(<rp=%rdi),>r2=%rcx
-movq   16(%rdi),%rcx
-
-# qhasm: r3 = *(uint64 *) (rp + 24)
-# asm 1: movq   24(<rp=int64#1),>r3=int64#5
-# asm 2: movq   24(<rp=%rdi),>r3=%r8
-movq   24(%rdi),%r8
-
-# qhasm: t0 = r0
-# asm 1: mov  <r0=int64#2,>t0=int64#6
-# asm 2: mov  <r0=%rsi,>t0=%r9
-mov  %rsi,%r9
-
-# qhasm: t1 = r1
-# asm 1: mov  <r1=int64#3,>t1=int64#7
-# asm 2: mov  <r1=%rdx,>t1=%rax
-mov  %rdx,%rax
-
-# qhasm: t2 = r2
-# asm 1: mov  <r2=int64#4,>t2=int64#8
-# asm 2: mov  <r2=%rcx,>t2=%r10
-mov  %rcx,%r10
-
-# qhasm: t3 = r3
-# asm 1: mov  <r3=int64#5,>t3=int64#9
-# asm 2: mov  <r3=%r8,>t3=%r11
-mov  %r8,%r11
-
-# qhasm: two63 = 1
-# asm 1: mov  $1,>two63=int64#10
-# asm 2: mov  $1,>two63=%r12
-mov  $1,%r12
-
-# qhasm: two63 <<= 63
-# asm 1: shl  $63,<two63=int64#10
-# asm 2: shl  $63,<two63=%r12
-shl  $63,%r12
-
-# qhasm: carry? t0 += 19
-# asm 1: add  $19,<t0=int64#6
-# asm 2: add  $19,<t0=%r9
-add  $19,%r9
-
-# qhasm: carry? t1 += 0 + carry
-# asm 1: adc $0,<t1=int64#7
-# asm 2: adc $0,<t1=%rax
-adc $0,%rax
-
-# qhasm: carry? t2 += 0 + carry
-# asm 1: adc $0,<t2=int64#8
-# asm 2: adc $0,<t2=%r10
-adc $0,%r10
-
-# qhasm: carry? t3 += two63 + carry
-# asm 1: adc <two63=int64#10,<t3=int64#9
-# asm 2: adc <two63=%r12,<t3=%r11
-adc %r12,%r11
-
-# qhasm: r0 = t0 if carry
-# asm 1: cmovc <t0=int64#6,<r0=int64#2
-# asm 2: cmovc <t0=%r9,<r0=%rsi
-cmovc %r9,%rsi
-
-# qhasm: r1 = t1 if carry
-# asm 1: cmovc <t1=int64#7,<r1=int64#3
-# asm 2: cmovc <t1=%rax,<r1=%rdx
-cmovc %rax,%rdx
-
-# qhasm: r2 = t2 if carry
-# asm 1: cmovc <t2=int64#8,<r2=int64#4
-# asm 2: cmovc <t2=%r10,<r2=%rcx
-cmovc %r10,%rcx
-
-# qhasm: r3 = t3 if carry
-# asm 1: cmovc <t3=int64#9,<r3=int64#5
-# asm 2: cmovc <t3=%r11,<r3=%r8
-cmovc %r11,%r8
-
-# qhasm: t0 = r0
-# asm 1: mov  <r0=int64#2,>t0=int64#6
-# asm 2: mov  <r0=%rsi,>t0=%r9
-mov  %rsi,%r9
-
-# qhasm: t1 = r1
-# asm 1: mov  <r1=int64#3,>t1=int64#7
-# asm 2: mov  <r1=%rdx,>t1=%rax
-mov  %rdx,%rax
-
-# qhasm: t2 = r2
-# asm 1: mov  <r2=int64#4,>t2=int64#8
-# asm 2: mov  <r2=%rcx,>t2=%r10
-mov  %rcx,%r10
-
-# qhasm: t3 = r3
-# asm 1: mov  <r3=int64#5,>t3=int64#9
-# asm 2: mov  <r3=%r8,>t3=%r11
-mov  %r8,%r11
-
-# qhasm: carry? t0 += 19
-# asm 1: add  $19,<t0=int64#6
-# asm 2: add  $19,<t0=%r9
-add  $19,%r9
-
-# qhasm: carry? t1 += 0 + carry
-# asm 1: adc $0,<t1=int64#7
-# asm 2: adc $0,<t1=%rax
-adc $0,%rax
-
-# qhasm: carry? t2 += 0 + carry
-# asm 1: adc $0,<t2=int64#8
-# asm 2: adc $0,<t2=%r10
-adc $0,%r10
-
-# qhasm: carry? t3 += two63 + carry
-# asm 1: adc <two63=int64#10,<t3=int64#9
-# asm 2: adc <two63=%r12,<t3=%r11
-adc %r12,%r11
-
-# qhasm: r0 = t0 if carry
-# asm 1: cmovc <t0=int64#6,<r0=int64#2
-# asm 2: cmovc <t0=%r9,<r0=%rsi
-cmovc %r9,%rsi
-
-# qhasm: r1 = t1 if carry
-# asm 1: cmovc <t1=int64#7,<r1=int64#3
-# asm 2: cmovc <t1=%rax,<r1=%rdx
-cmovc %rax,%rdx
-
-# qhasm: r2 = t2 if carry
-# asm 1: cmovc <t2=int64#8,<r2=int64#4
-# asm 2: cmovc <t2=%r10,<r2=%rcx
-cmovc %r10,%rcx
-
-# qhasm: r3 = t3 if carry
-# asm 1: cmovc <t3=int64#9,<r3=int64#5
-# asm 2: cmovc <t3=%r11,<r3=%r8
-cmovc %r11,%r8
-
-# qhasm: *(uint64 *)(rp + 0) = r0
-# asm 1: movq   <r0=int64#2,0(<rp=int64#1)
-# asm 2: movq   <r0=%rsi,0(<rp=%rdi)
-movq   %rsi,0(%rdi)
-
-# qhasm: *(uint64 *)(rp + 8) = r1
-# asm 1: movq   <r1=int64#3,8(<rp=int64#1)
-# asm 2: movq   <r1=%rdx,8(<rp=%rdi)
-movq   %rdx,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#4,16(<rp=int64#1)
-# asm 2: movq   <r2=%rcx,16(<rp=%rdi)
-movq   %rcx,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#5,24(<rp=int64#1)
-# asm 2: movq   <r3=%r8,24(<rp=%rdi)
-movq   %r8,24(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/fe25519_getparity.c b/ext/ed25519-amd64-asm/fe25519_getparity.c
deleted file mode 100644
index a003ec8f5..000000000
--- a/ext/ed25519-amd64-asm/fe25519_getparity.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "fe25519.h"
-
-unsigned char fe25519_getparity(const fe25519 *x)
-{
-  fe25519 t = *x;
-  fe25519_freeze(&t);
-  return (unsigned char)t.v[0] & 1;
-}
diff --git a/ext/ed25519-amd64-asm/fe25519_invert.c b/ext/ed25519-amd64-asm/fe25519_invert.c
deleted file mode 100644
index a46d141ff..000000000
--- a/ext/ed25519-amd64-asm/fe25519_invert.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "fe25519.h"
-
-void fe25519_invert(fe25519 *r, const fe25519 *x)
-{
-	fe25519 z2;
-	fe25519 z9;
-	fe25519 z11;
-	fe25519 z2_5_0;
-	fe25519 z2_10_0;
-	fe25519 z2_20_0;
-	fe25519 z2_50_0;
-	fe25519 z2_100_0;
-	fe25519 t;
-	int i;
-	
-	/* 2 */ fe25519_square(&z2,x);
-	/* 4 */ fe25519_square(&t,&z2);
-	/* 8 */ fe25519_square(&t,&t);
-	/* 9 */ fe25519_mul(&z9,&t,x);
-	/* 11 */ fe25519_mul(&z11,&z9,&z2);
-	/* 22 */ fe25519_square(&t,&z11);
-	/* 2^5 - 2^0 = 31 */ fe25519_mul(&z2_5_0,&t,&z9);
-
-	/* 2^6 - 2^1 */ fe25519_square(&t,&z2_5_0);
-	/* 2^20 - 2^10 */ for (i = 1;i < 5;i++) { fe25519_square(&t,&t); }
-	/* 2^10 - 2^0 */ fe25519_mul(&z2_10_0,&t,&z2_5_0);
-
-	/* 2^11 - 2^1 */ fe25519_square(&t,&z2_10_0);
-	/* 2^20 - 2^10 */ for (i = 1;i < 10;i++) { fe25519_square(&t,&t); }
-	/* 2^20 - 2^0 */ fe25519_mul(&z2_20_0,&t,&z2_10_0);
-
-	/* 2^21 - 2^1 */ fe25519_square(&t,&z2_20_0);
-	/* 2^40 - 2^20 */ for (i = 1;i < 20;i++) { fe25519_square(&t,&t); }
-	/* 2^40 - 2^0 */ fe25519_mul(&t,&t,&z2_20_0);
-
-	/* 2^41 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^50 - 2^10 */ for (i = 1;i < 10;i++) { fe25519_square(&t,&t); }
-	/* 2^50 - 2^0 */ fe25519_mul(&z2_50_0,&t,&z2_10_0);
-
-	/* 2^51 - 2^1 */ fe25519_square(&t,&z2_50_0);
-	/* 2^100 - 2^50 */ for (i = 1;i < 50;i++) { fe25519_square(&t,&t); }
-	/* 2^100 - 2^0 */ fe25519_mul(&z2_100_0,&t,&z2_50_0);
-
-	/* 2^101 - 2^1 */ fe25519_square(&t,&z2_100_0);
-	/* 2^200 - 2^100 */ for (i = 1;i < 100;i++) { fe25519_square(&t,&t); }
-	/* 2^200 - 2^0 */ fe25519_mul(&t,&t,&z2_100_0);
-
-	/* 2^201 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^250 - 2^50 */ for (i = 1;i < 50;i++) { fe25519_square(&t,&t); }
-	/* 2^250 - 2^0 */ fe25519_mul(&t,&t,&z2_50_0);
-
-	/* 2^251 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^252 - 2^2 */ fe25519_square(&t,&t);
-	/* 2^253 - 2^3 */ fe25519_square(&t,&t);
-
-	/* 2^254 - 2^4 */ fe25519_square(&t,&t);
-
-	/* 2^255 - 2^5 */ fe25519_square(&t,&t);
-	/* 2^255 - 21 */ fe25519_mul(r,&t,&z11);
-}
diff --git a/ext/ed25519-amd64-asm/fe25519_iseq.c b/ext/ed25519-amd64-asm/fe25519_iseq.c
deleted file mode 100644
index bf72f8c91..000000000
--- a/ext/ed25519-amd64-asm/fe25519_iseq.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "fe25519.h"
-
-int fe25519_iseq_vartime(const fe25519 *x, const fe25519 *y)
-{
-  fe25519 t1 = *x;
-  fe25519 t2 = *y;
-  fe25519_freeze(&t1);
-  fe25519_freeze(&t2);
-  if(t1.v[0] != t2.v[0]) return 0;
-  if(t1.v[1] != t2.v[1]) return 0;
-  if(t1.v[2] != t2.v[2]) return 0;
-  if(t1.v[3] != t2.v[3]) return 0;
-  return 1;
-}
diff --git a/ext/ed25519-amd64-asm/fe25519_iszero.c b/ext/ed25519-amd64-asm/fe25519_iszero.c
deleted file mode 100644
index 99e4dafa7..000000000
--- a/ext/ed25519-amd64-asm/fe25519_iszero.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "fe25519.h"
-
-int fe25519_iszero_vartime(const fe25519 *x)
-{
-  fe25519 t = *x;
-  fe25519_freeze(&t);
-  if (t.v[0]) return 0;
-  if (t.v[1]) return 0;
-  if (t.v[2]) return 0;
-  if (t.v[3]) return 0;
-  return 1;
-}
diff --git a/ext/ed25519-amd64-asm/fe25519_mul.s b/ext/ed25519-amd64-asm/fe25519_mul.s
deleted file mode 100644
index 147842811..000000000
--- a/ext/ed25519-amd64-asm/fe25519_mul.s
+++ /dev/null
@@ -1,865 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 xp
-
-# qhasm: int64 yp
-
-# qhasm: input rp
-
-# qhasm: input xp
-
-# qhasm: input yp
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 mulr4
-
-# qhasm: int64 mulr5
-
-# qhasm: int64 mulr6
-
-# qhasm: int64 mulr7
-
-# qhasm: int64 mulr8
-
-# qhasm: int64 mulrax
-
-# qhasm: int64 mulrdx
-
-# qhasm: int64 mulx0
-
-# qhasm: int64 mulx1
-
-# qhasm: int64 mulx2
-
-# qhasm: int64 mulx3
-
-# qhasm: int64 mulc
-
-# qhasm: int64 mulzero
-
-# qhasm: int64 muli38
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_mul
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_mul
-.globl crypto_sign_ed25519_amd64_64_fe25519_mul
-_crypto_sign_ed25519_amd64_64_fe25519_mul:
-crypto_sign_ed25519_amd64_64_fe25519_mul:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: yp = yp
-# asm 1: mov  <yp=int64#3,>yp=int64#4
-# asm 2: mov  <yp=%rdx,>yp=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = *(uint64 *)(xp + 0)
-# asm 1: movq   0(<xp=int64#2),>mulx0=int64#10
-# asm 2: movq   0(<xp=%rsi),>mulx0=%r12
-movq   0(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(yp + 0)
-# asm 1: movq   0(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<yp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   r0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>r0=int64#11
-# asm 2: mov  <mulrax=%rax,>r0=%r13
-mov  %rax,%r13
-
-# qhasm:   r1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>r1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>r1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(yp + 8)
-# asm 1: movq   8(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<yp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? r1 += mulrax
-# asm 1: add  <mulrax=int64#7,<r1=int64#12
-# asm 2: add  <mulrax=%rax,<r1=%r14
-add  %rax,%r14
-
-# qhasm:   r2 = 0
-# asm 1: mov  $0,>r2=int64#13
-# asm 2: mov  $0,>r2=%r15
-mov  $0,%r15
-
-# qhasm:   r2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<r2=int64#13
-# asm 2: adc <mulrdx=%rdx,<r2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(yp + 16)
-# asm 1: movq   16(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<yp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? r2 += mulrax
-# asm 1: add  <mulrax=int64#7,<r2=int64#13
-# asm 2: add  <mulrax=%rax,<r2=%r15
-add  %rax,%r15
-
-# qhasm:   r3 = 0
-# asm 1: mov  $0,>r3=int64#14
-# asm 2: mov  $0,>r3=%rbx
-mov  $0,%rbx
-
-# qhasm:   r3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<r3=int64#14
-# asm 2: adc <mulrdx=%rdx,<r3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(yp + 24)
-# asm 1: movq   24(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<yp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? r3 += mulrax
-# asm 1: add  <mulrax=int64#7,<r3=int64#14
-# asm 2: add  <mulrax=%rax,<r3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>mulx1=int64#10
-# asm 2: movq   8(<xp=%rsi),>mulx1=%r12
-movq   8(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(yp + 0)
-# asm 1: movq   0(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<yp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? r1 += mulrax
-# asm 1: add  <mulrax=int64#7,<r1=int64#12
-# asm 2: add  <mulrax=%rax,<r1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(yp + 8)
-# asm 1: movq   8(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<yp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? r2 += mulrax
-# asm 1: add  <mulrax=int64#7,<r2=int64#13
-# asm 2: add  <mulrax=%rax,<r2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? r2 += mulc
-# asm 1: add  <mulc=int64#15,<r2=int64#13
-# asm 2: add  <mulc=%rbp,<r2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(yp + 16)
-# asm 1: movq   16(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<yp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? r3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<r3=int64#14
-# asm 2: add  <mulrax=%rax,<r3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? r3 += mulc
-# asm 1: add  <mulc=int64#15,<r3=int64#14
-# asm 2: add  <mulc=%rbp,<r3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(yp + 24)
-# asm 1: movq   24(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<yp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>mulx2=int64#10
-# asm 2: movq   16(<xp=%rsi),>mulx2=%r12
-movq   16(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(yp + 0)
-# asm 1: movq   0(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<yp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? r2 += mulrax
-# asm 1: add  <mulrax=int64#7,<r2=int64#13
-# asm 2: add  <mulrax=%rax,<r2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(yp + 8)
-# asm 1: movq   8(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<yp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? r3 += mulrax
-# asm 1: add  <mulrax=int64#7,<r3=int64#14
-# asm 2: add  <mulrax=%rax,<r3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? r3 += mulc
-# asm 1: add  <mulc=int64#15,<r3=int64#14
-# asm 2: add  <mulc=%rbp,<r3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(yp + 16)
-# asm 1: movq   16(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<yp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(yp + 24)
-# asm 1: movq   24(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<yp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>mulx3=int64#2
-# asm 2: movq   24(<xp=%rsi),>mulx3=%rsi
-movq   24(%rsi),%rsi
-
-# qhasm:   mulrax = *(uint64 *)(yp + 0)
-# asm 1: movq   0(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<yp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? r3 += mulrax
-# asm 1: add  <mulrax=int64#7,<r3=int64#14
-# asm 2: add  <mulrax=%rax,<r3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(yp + 8)
-# asm 1: movq   8(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<yp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#10,<mulr4=int64#5
-# asm 2: add  <mulc=%r12,<mulr4=%r8
-add  %r12,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(yp + 16)
-# asm 1: movq   16(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<yp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#10,<mulr5=int64#6
-# asm 2: add  <mulc=%r12,<mulr5=%r9
-add  %r12,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(yp + 24)
-# asm 1: movq   24(<yp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<yp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#10,<mulr6=int64#8
-# asm 2: add  <mulc=%r12,<mulr6=%r10
-add  %r12,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? r0 += mulr4
-# asm 1: add  <mulr4=int64#2,<r0=int64#11
-# asm 2: add  <mulr4=%rsi,<r0=%r13
-add  %rsi,%r13
-
-# qhasm:   carry? r1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<r1=int64#12
-# asm 2: adc <mulr5=%rcx,<r1=%r14
-adc %rcx,%r14
-
-# qhasm:   carry? r2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<r2=int64#13
-# asm 2: adc <mulr6=%r8,<r2=%r15
-adc %r8,%r15
-
-# qhasm:   carry? r3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<r3=int64#14
-# asm 2: adc <mulr7=%r9,<r3=%rbx
-adc %r9,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? r0 += mulr8
-# asm 1: add  <mulr8=int64#3,<r0=int64#11
-# asm 2: add  <mulr8=%rdx,<r0=%r13
-add  %rdx,%r13
-
-# qhasm:   carry? r1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<r1=int64#12
-# asm 2: adc <mulzero=%rsi,<r1=%r14
-adc %rsi,%r14
-
-# qhasm:   carry? r2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<r2=int64#13
-# asm 2: adc <mulzero=%rsi,<r2=%r15
-adc %rsi,%r15
-
-# qhasm:   carry? r3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<r3=int64#14
-# asm 2: adc <mulzero=%rsi,<r3=%rbx
-adc %rsi,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   r0 += mulzero
-# asm 1: add  <mulzero=int64#2,<r0=int64#11
-# asm 2: add  <mulzero=%rsi,<r0=%r13
-add  %rsi,%r13
-
-# qhasm: *(uint64 *)(rp + 8) = r1
-# asm 1: movq   <r1=int64#12,8(<rp=int64#1)
-# asm 2: movq   <r1=%r14,8(<rp=%rdi)
-movq   %r14,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#13,16(<rp=int64#1)
-# asm 2: movq   <r2=%r15,16(<rp=%rdi)
-movq   %r15,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#14,24(<rp=int64#1)
-# asm 2: movq   <r3=%rbx,24(<rp=%rdi)
-movq   %rbx,24(%rdi)
-
-# qhasm: *(uint64 *)(rp + 0) = r0
-# asm 1: movq   <r0=int64#11,0(<rp=int64#1)
-# asm 2: movq   <r0=%r13,0(<rp=%rdi)
-movq   %r13,0(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/fe25519_neg.c b/ext/ed25519-amd64-asm/fe25519_neg.c
deleted file mode 100644
index 235b209dd..000000000
--- a/ext/ed25519-amd64-asm/fe25519_neg.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "fe25519.h"
-
-void fe25519_neg(fe25519 *r, const fe25519 *x)
-{
-  fe25519 t;
-  fe25519_setint(&t,0);
-  fe25519_sub(r,&t,x);
-}
diff --git a/ext/ed25519-amd64-asm/fe25519_pack.c b/ext/ed25519-amd64-asm/fe25519_pack.c
deleted file mode 100644
index caf518530..000000000
--- a/ext/ed25519-amd64-asm/fe25519_pack.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "fe25519.h"
-
-/* Assumes input x being reduced below 2^255 */
-void fe25519_pack(unsigned char r[32], const fe25519 *x)
-{
-  int i;
-  fe25519 t;
-  t = *x;
-  fe25519_freeze(&t);
-  /* assuming little-endian */
-  for(i=0;i<32;i++) r[i] = i[(unsigned char *)&t.v]; 
-}
-
diff --git a/ext/ed25519-amd64-asm/fe25519_pow2523.c b/ext/ed25519-amd64-asm/fe25519_pow2523.c
deleted file mode 100644
index 60042a0a1..000000000
--- a/ext/ed25519-amd64-asm/fe25519_pow2523.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "fe25519.h"
-
-void fe25519_pow2523(fe25519 *r, const fe25519 *x)
-{
-	fe25519 z2;
-	fe25519 z9;
-	fe25519 z11;
-	fe25519 z2_5_0;
-	fe25519 z2_10_0;
-	fe25519 z2_20_0;
-	fe25519 z2_50_0;
-	fe25519 z2_100_0;
-	fe25519 t;
-	int i;
-		
-	/* 2 */ fe25519_square(&z2,x);
-	/* 4 */ fe25519_square(&t,&z2);
-	/* 8 */ fe25519_square(&t,&t);
-	/* 9 */ fe25519_mul(&z9,&t,x);
-	/* 11 */ fe25519_mul(&z11,&z9,&z2);
-	/* 22 */ fe25519_square(&t,&z11);
-	/* 2^5 - 2^0 = 31 */ fe25519_mul(&z2_5_0,&t,&z9);
-
-	/* 2^6 - 2^1 */ fe25519_square(&t,&z2_5_0);
-	/* 2^10 - 2^5 */ for (i = 1;i < 5;i++) { fe25519_square(&t,&t); }
-	/* 2^10 - 2^0 */ fe25519_mul(&z2_10_0,&t,&z2_5_0);
-
-	/* 2^11 - 2^1 */ fe25519_square(&t,&z2_10_0);
-	/* 2^20 - 2^10 */ for (i = 1;i < 10;i++) { fe25519_square(&t,&t); }
-	/* 2^20 - 2^0 */ fe25519_mul(&z2_20_0,&t,&z2_10_0);
-
-	/* 2^21 - 2^1 */ fe25519_square(&t,&z2_20_0);
-	/* 2^40 - 2^20 */ for (i = 1;i < 20;i++) { fe25519_square(&t,&t); }
-	/* 2^40 - 2^0 */ fe25519_mul(&t,&t,&z2_20_0);
-
-	/* 2^41 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^50 - 2^10 */ for (i = 1;i < 10;i++) { fe25519_square(&t,&t); }
-	/* 2^50 - 2^0 */ fe25519_mul(&z2_50_0,&t,&z2_10_0);
-
-	/* 2^51 - 2^1 */ fe25519_square(&t,&z2_50_0);
-	/* 2^100 - 2^50 */ for (i = 1;i < 50;i++) { fe25519_square(&t,&t); }
-	/* 2^100 - 2^0 */ fe25519_mul(&z2_100_0,&t,&z2_50_0);
-
-	/* 2^101 - 2^1 */ fe25519_square(&t,&z2_100_0);
-	/* 2^200 - 2^100 */ for (i = 1;i < 100;i++) { fe25519_square(&t,&t); }
-	/* 2^200 - 2^0 */ fe25519_mul(&t,&t,&z2_100_0);
-
-	/* 2^201 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^250 - 2^50 */ for (i = 1;i < 50;i++) { fe25519_square(&t,&t); }
-	/* 2^250 - 2^0 */ fe25519_mul(&t,&t,&z2_50_0);
-
-	/* 2^251 - 2^1 */ fe25519_square(&t,&t);
-	/* 2^252 - 2^2 */ fe25519_square(&t,&t);
-	/* 2^252 - 3 */ fe25519_mul(r,&t,x);
-}
diff --git a/ext/ed25519-amd64-asm/fe25519_setint.c b/ext/ed25519-amd64-asm/fe25519_setint.c
deleted file mode 100644
index 585c4bdd5..000000000
--- a/ext/ed25519-amd64-asm/fe25519_setint.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "fe25519.h"
-
-void fe25519_setint(fe25519 *r, unsigned int v)
-{
-  r->v[0] = v;
-  r->v[1] = 0;
-  r->v[2] = 0;
-  r->v[3] = 0;
-}
diff --git a/ext/ed25519-amd64-asm/fe25519_square.s b/ext/ed25519-amd64-asm/fe25519_square.s
deleted file mode 100644
index a74d9e888..000000000
--- a/ext/ed25519-amd64-asm/fe25519_square.s
+++ /dev/null
@@ -1,639 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 xp
-
-# qhasm: input rp
-
-# qhasm: input xp
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 squarer4
-
-# qhasm: int64 squarer5
-
-# qhasm: int64 squarer6
-
-# qhasm: int64 squarer7
-
-# qhasm: int64 squarer8
-
-# qhasm: int64 squarerax
-
-# qhasm: int64 squarerdx
-
-# qhasm: int64 squaret1
-
-# qhasm: int64 squaret2
-
-# qhasm: int64 squaret3
-
-# qhasm: int64 squarec
-
-# qhasm: int64 squarezero
-
-# qhasm: int64 squarei38
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_square
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_square
-.globl crypto_sign_ed25519_amd64_64_fe25519_square
-_crypto_sign_ed25519_amd64_64_fe25519_square:
-crypto_sign_ed25519_amd64_64_fe25519_square:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#4
-# asm 2: mov  $0,>squarer7=%rcx
-mov  $0,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   8(<xp=%rsi),>squarerax=%rax
-movq   8(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 0)
-# asm 1: mulq  0(<xp=int64#2)
-# asm 2: mulq  0(<xp=%rsi)
-mulq  0(%rsi)
-
-# qhasm:   r1 = squarerax
-# asm 1: mov  <squarerax=int64#7,>r1=int64#5
-# asm 2: mov  <squarerax=%rax,>r1=%r8
-mov  %rax,%r8
-
-# qhasm:   r2 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>r2=int64#6
-# asm 2: mov  <squarerdx=%rdx,>r2=%r9
-mov  %rdx,%r9
-
-# qhasm:   squarerax = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   16(<xp=%rsi),>squarerax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 8)
-# asm 1: mulq  8(<xp=int64#2)
-# asm 2: mulq  8(<xp=%rsi)
-mulq  8(%rsi)
-
-# qhasm:   r3 = squarerax 
-# asm 1: mov  <squarerax=int64#7,>r3=int64#8
-# asm 2: mov  <squarerax=%rax,>r3=%r10
-mov  %rax,%r10
-
-# qhasm:   squarer4 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer4=int64#9
-# asm 2: mov  <squarerdx=%rdx,>squarer4=%r11
-mov  %rdx,%r11
-
-# qhasm:   squarerax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   24(<xp=%rsi),>squarerax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 16)
-# asm 1: mulq  16(<xp=int64#2)
-# asm 2: mulq  16(<xp=%rsi)
-mulq  16(%rsi)
-
-# qhasm:   squarer5 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer5=int64#10
-# asm 2: mov  <squarerax=%rax,>squarer5=%r12
-mov  %rax,%r12
-
-# qhasm:   squarer6 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer6=int64#11
-# asm 2: mov  <squarerdx=%rdx,>squarer6=%r13
-mov  %rdx,%r13
-
-# qhasm:   squarerax = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   16(<xp=%rsi),>squarerax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 0)
-# asm 1: mulq  0(<xp=int64#2)
-# asm 2: mulq  0(<xp=%rsi)
-mulq  0(%rsi)
-
-# qhasm:   carry? r2 += squarerax
-# asm 1: add  <squarerax=int64#7,<r2=int64#6
-# asm 2: add  <squarerax=%rax,<r2=%r9
-add  %rax,%r9
-
-# qhasm:   carry? r3 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<r3=int64#8
-# asm 2: adc <squarerdx=%rdx,<r3=%r10
-adc %rdx,%r10
-
-# qhasm:   squarer4 += 0 + carry
-# asm 1: adc $0,<squarer4=int64#9
-# asm 2: adc $0,<squarer4=%r11
-adc $0,%r11
-
-# qhasm:   squarerax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   24(<xp=%rsi),>squarerax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 8)
-# asm 1: mulq  8(<xp=int64#2)
-# asm 2: mulq  8(<xp=%rsi)
-mulq  8(%rsi)
-
-# qhasm:   carry? squarer4 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer4=int64#9
-# asm 2: add  <squarerax=%rax,<squarer4=%r11
-add  %rax,%r11
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r12
-adc %rdx,%r12
-
-# qhasm:   squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarerax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   24(<xp=%rsi),>squarerax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 0)
-# asm 1: mulq  0(<xp=int64#2)
-# asm 2: mulq  0(<xp=%rsi)
-mulq  0(%rsi)
-
-# qhasm:   carry? r3 += squarerax
-# asm 1: add  <squarerax=int64#7,<r3=int64#8
-# asm 2: add  <squarerax=%rax,<r3=%r10
-add  %rax,%r10
-
-# qhasm:   carry? squarer4 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer4=int64#9
-# asm 2: adc <squarerdx=%rdx,<squarer4=%r11
-adc %rdx,%r11
-
-# qhasm:   carry? squarer5 += 0 + carry
-# asm 1: adc $0,<squarer5=int64#10
-# asm 2: adc $0,<squarer5=%r12
-adc $0,%r12
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarer7 += 0 + carry
-# asm 1: adc $0,<squarer7=int64#4
-# asm 2: adc $0,<squarer7=%rcx
-adc $0,%rcx
-
-# qhasm:   carry? r1 += r1
-# asm 1: add  <r1=int64#5,<r1=int64#5
-# asm 2: add  <r1=%r8,<r1=%r8
-add  %r8,%r8
-
-# qhasm:   carry? r2 += r2 + carry
-# asm 1: adc <r2=int64#6,<r2=int64#6
-# asm 2: adc <r2=%r9,<r2=%r9
-adc %r9,%r9
-
-# qhasm:   carry? r3 += r3 + carry
-# asm 1: adc <r3=int64#8,<r3=int64#8
-# asm 2: adc <r3=%r10,<r3=%r10
-adc %r10,%r10
-
-# qhasm:   carry? squarer4 += squarer4 + carry
-# asm 1: adc <squarer4=int64#9,<squarer4=int64#9
-# asm 2: adc <squarer4=%r11,<squarer4=%r11
-adc %r11,%r11
-
-# qhasm:   carry? squarer5 += squarer5 + carry
-# asm 1: adc <squarer5=int64#10,<squarer5=int64#10
-# asm 2: adc <squarer5=%r12,<squarer5=%r12
-adc %r12,%r12
-
-# qhasm:   carry? squarer6 += squarer6 + carry
-# asm 1: adc <squarer6=int64#11,<squarer6=int64#11
-# asm 2: adc <squarer6=%r13,<squarer6=%r13
-adc %r13,%r13
-
-# qhasm:   squarer7 += squarer7 + carry
-# asm 1: adc <squarer7=int64#4,<squarer7=int64#4
-# asm 2: adc <squarer7=%rcx,<squarer7=%rcx
-adc %rcx,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(xp + 0)
-# asm 1: movq   0(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   0(<xp=%rsi),>squarerax=%rax
-movq   0(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 0)
-# asm 1: mulq  0(<xp=int64#2)
-# asm 2: mulq  0(<xp=%rsi)
-mulq  0(%rsi)
-
-# qhasm:   r0 = squarerax
-# asm 1: mov  <squarerax=int64#7,>r0=int64#12
-# asm 2: mov  <squarerax=%rax,>r0=%r14
-mov  %rax,%r14
-
-# qhasm:   squaret1 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret1=int64#13
-# asm 2: mov  <squarerdx=%rdx,>squaret1=%r15
-mov  %rdx,%r15
-
-# qhasm:   squarerax = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   8(<xp=%rsi),>squarerax=%rax
-movq   8(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 8)
-# asm 1: mulq  8(<xp=int64#2)
-# asm 2: mulq  8(<xp=%rsi)
-mulq  8(%rsi)
-
-# qhasm:   squaret2 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squaret2=int64#14
-# asm 2: mov  <squarerax=%rax,>squaret2=%rbx
-mov  %rax,%rbx
-
-# qhasm:   squaret3 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret3=int64#15
-# asm 2: mov  <squarerdx=%rdx,>squaret3=%rbp
-mov  %rdx,%rbp
-
-# qhasm:   squarerax = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   16(<xp=%rsi),>squarerax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 16)
-# asm 1: mulq  16(<xp=int64#2)
-# asm 2: mulq  16(<xp=%rsi)
-mulq  16(%rsi)
-
-# qhasm:   carry? r1 += squaret1
-# asm 1: add  <squaret1=int64#13,<r1=int64#5
-# asm 2: add  <squaret1=%r15,<r1=%r8
-add  %r15,%r8
-
-# qhasm:   carry? r2 += squaret2 + carry
-# asm 1: adc <squaret2=int64#14,<r2=int64#6
-# asm 2: adc <squaret2=%rbx,<r2=%r9
-adc %rbx,%r9
-
-# qhasm:   carry? r3 += squaret3 + carry
-# asm 1: adc <squaret3=int64#15,<r3=int64#8
-# asm 2: adc <squaret3=%rbp,<r3=%r10
-adc %rbp,%r10
-
-# qhasm:   carry? squarer4 += squarerax + carry
-# asm 1: adc <squarerax=int64#7,<squarer4=int64#9
-# asm 2: adc <squarerax=%rax,<squarer4=%r11
-adc %rax,%r11
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r12
-adc %rdx,%r12
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarer7 += 0 + carry 
-# asm 1: adc $0,<squarer7=int64#4
-# asm 2: adc $0,<squarer7=%rcx
-adc $0,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>squarerax=int64#7
-# asm 2: movq   24(<xp=%rsi),>squarerax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(xp + 24)
-# asm 1: mulq  24(<xp=int64#2)
-# asm 2: mulq  24(<xp=%rsi)
-mulq  24(%rsi)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#11
-# asm 2: add  <squarerax=%rax,<squarer6=%r13
-add  %rax,%r13
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#4
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
-adc %rdx,%rcx
-
-# qhasm:   squarerax = squarer4
-# asm 1: mov  <squarer4=int64#9,>squarerax=int64#7
-# asm 2: mov  <squarer4=%r11,>squarerax=%rax
-mov  %r11,%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   squarer4 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer4=int64#2
-# asm 2: mov  <squarerax=%rax,>squarer4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   squarerax = squarer5
-# asm 1: mov  <squarer5=int64#10,>squarerax=int64#7
-# asm 2: mov  <squarer5=%r12,>squarerax=%rax
-mov  %r12,%rax
-
-# qhasm:   squarer5 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer5=int64#9
-# asm 2: mov  <squarerdx=%rdx,>squarer5=%r11
-mov  %rdx,%r11
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer5 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer5=int64#9
-# asm 2: add  <squarerax=%rax,<squarer5=%r11
-add  %rax,%r11
-
-# qhasm:   squarerax = squarer6
-# asm 1: mov  <squarer6=int64#11,>squarerax=int64#7
-# asm 2: mov  <squarer6=%r13,>squarerax=%rax
-mov  %r13,%rax
-
-# qhasm:   squarer6 = 0
-# asm 1: mov  $0,>squarer6=int64#10
-# asm 2: mov  $0,>squarer6=%r12
-mov  $0,%r12
-
-# qhasm:   squarer6 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer6=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer6=%r12
-adc %rdx,%r12
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#10
-# asm 2: add  <squarerax=%rax,<squarer6=%r12
-add  %rax,%r12
-
-# qhasm:   squarerax = squarer7
-# asm 1: mov  <squarer7=int64#4,>squarerax=int64#7
-# asm 2: mov  <squarer7=%rcx,>squarerax=%rax
-mov  %rcx,%rax
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#4
-# asm 2: mov  $0,>squarer7=%rcx
-mov  $0,%rcx
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#4
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
-adc %rdx,%rcx
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer7 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer7=int64#4
-# asm 2: add  <squarerax=%rax,<squarer7=%rcx
-add  %rax,%rcx
-
-# qhasm:   squarer8 = 0
-# asm 1: mov  $0,>squarer8=int64#7
-# asm 2: mov  $0,>squarer8=%rax
-mov  $0,%rax
-
-# qhasm:   squarer8 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer8=int64#7
-# asm 2: adc <squarerdx=%rdx,<squarer8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? r0 += squarer4
-# asm 1: add  <squarer4=int64#2,<r0=int64#12
-# asm 2: add  <squarer4=%rsi,<r0=%r14
-add  %rsi,%r14
-
-# qhasm:   carry? r1 += squarer5 + carry
-# asm 1: adc <squarer5=int64#9,<r1=int64#5
-# asm 2: adc <squarer5=%r11,<r1=%r8
-adc %r11,%r8
-
-# qhasm:   carry? r2 += squarer6 + carry
-# asm 1: adc <squarer6=int64#10,<r2=int64#6
-# asm 2: adc <squarer6=%r12,<r2=%r9
-adc %r12,%r9
-
-# qhasm:   carry? r3 += squarer7 + carry
-# asm 1: adc <squarer7=int64#4,<r3=int64#8
-# asm 2: adc <squarer7=%rcx,<r3=%r10
-adc %rcx,%r10
-
-# qhasm:   squarezero = 0
-# asm 1: mov  $0,>squarezero=int64#2
-# asm 2: mov  $0,>squarezero=%rsi
-mov  $0,%rsi
-
-# qhasm:   squarer8 += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<squarer8=int64#7
-# asm 2: adc <squarezero=%rsi,<squarer8=%rax
-adc %rsi,%rax
-
-# qhasm:   squarer8 *= 38
-# asm 1: imulq  $38,<squarer8=int64#7,>squarer8=int64#3
-# asm 2: imulq  $38,<squarer8=%rax,>squarer8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? r0 += squarer8
-# asm 1: add  <squarer8=int64#3,<r0=int64#12
-# asm 2: add  <squarer8=%rdx,<r0=%r14
-add  %rdx,%r14
-
-# qhasm:   carry? r1 += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<r1=int64#5
-# asm 2: adc <squarezero=%rsi,<r1=%r8
-adc %rsi,%r8
-
-# qhasm:   carry? r2 += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<r2=int64#6
-# asm 2: adc <squarezero=%rsi,<r2=%r9
-adc %rsi,%r9
-
-# qhasm:   carry? r3 += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<r3=int64#8
-# asm 2: adc <squarezero=%rsi,<r3=%r10
-adc %rsi,%r10
-
-# qhasm:   squarezero += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<squarezero=int64#2
-# asm 2: adc <squarezero=%rsi,<squarezero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   squarezero *= 38
-# asm 1: imulq  $38,<squarezero=int64#2,>squarezero=int64#2
-# asm 2: imulq  $38,<squarezero=%rsi,>squarezero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   r0 += squarezero
-# asm 1: add  <squarezero=int64#2,<r0=int64#12
-# asm 2: add  <squarezero=%rsi,<r0=%r14
-add  %rsi,%r14
-
-# qhasm: *(uint64 *)(rp + 8) = r1
-# asm 1: movq   <r1=int64#5,8(<rp=int64#1)
-# asm 2: movq   <r1=%r8,8(<rp=%rdi)
-movq   %r8,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#6,16(<rp=int64#1)
-# asm 2: movq   <r2=%r9,16(<rp=%rdi)
-movq   %r9,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#8,24(<rp=int64#1)
-# asm 2: movq   <r3=%r10,24(<rp=%rdi)
-movq   %r10,24(%rdi)
-
-# qhasm: *(uint64 *)(rp + 0) = r0
-# asm 1: movq   <r0=int64#12,0(<rp=int64#1)
-# asm 2: movq   <r0=%r14,0(<rp=%rdi)
-movq   %r14,0(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/fe25519_sub.s b/ext/ed25519-amd64-asm/fe25519_sub.s
deleted file mode 100644
index 0b395bce7..000000000
--- a/ext/ed25519-amd64-asm/fe25519_sub.s
+++ /dev/null
@@ -1,189 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 xp
-
-# qhasm: int64 yp
-
-# qhasm: input rp
-
-# qhasm: input xp
-
-# qhasm: input yp
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm: int64 subt0
-
-# qhasm: int64 subt1
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_fe25519_sub
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_fe25519_sub
-.globl crypto_sign_ed25519_amd64_64_fe25519_sub
-_crypto_sign_ed25519_amd64_64_fe25519_sub:
-crypto_sign_ed25519_amd64_64_fe25519_sub:
-mov %rsp,%r11
-and $31,%r11
-add $0,%r11
-sub %r11,%rsp
-
-# qhasm: r0 = *(uint64 *)(xp + 0)
-# asm 1: movq   0(<xp=int64#2),>r0=int64#4
-# asm 2: movq   0(<xp=%rsi),>r0=%rcx
-movq   0(%rsi),%rcx
-
-# qhasm: r1 = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>r1=int64#5
-# asm 2: movq   8(<xp=%rsi),>r1=%r8
-movq   8(%rsi),%r8
-
-# qhasm: r2 = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>r2=int64#6
-# asm 2: movq   16(<xp=%rsi),>r2=%r9
-movq   16(%rsi),%r9
-
-# qhasm: r3 = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>r3=int64#2
-# asm 2: movq   24(<xp=%rsi),>r3=%rsi
-movq   24(%rsi),%rsi
-
-# qhasm:   carry? r0 -= *(uint64 *)(yp + 0) 
-# asm 1: subq 0(<yp=int64#3),<r0=int64#4
-# asm 2: subq 0(<yp=%rdx),<r0=%rcx
-subq 0(%rdx),%rcx
-
-# qhasm:   carry? r1 -= *(uint64 *)(yp + 8) - carry
-# asm 1: sbbq 8(<yp=int64#3),<r1=int64#5
-# asm 2: sbbq 8(<yp=%rdx),<r1=%r8
-sbbq 8(%rdx),%r8
-
-# qhasm:   carry? r2 -= *(uint64 *)(yp + 16) - carry
-# asm 1: sbbq 16(<yp=int64#3),<r2=int64#6
-# asm 2: sbbq 16(<yp=%rdx),<r2=%r9
-sbbq 16(%rdx),%r9
-
-# qhasm:   carry? r3 -= *(uint64 *)(yp + 24) - carry
-# asm 1: sbbq 24(<yp=int64#3),<r3=int64#2
-# asm 2: sbbq 24(<yp=%rdx),<r3=%rsi
-sbbq 24(%rdx),%rsi
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#3
-# asm 2: mov  $0,>subt0=%rdx
-mov  $0,%rdx
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#7
-# asm 2: mov  $38,>subt1=%rax
-mov  $38,%rax
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#3,<subt1=int64#7
-# asm 2: cmovae <subt0=%rdx,<subt1=%rax
-cmovae %rdx,%rax
-
-# qhasm:   carry? r0 -= subt1
-# asm 1: sub  <subt1=int64#7,<r0=int64#4
-# asm 2: sub  <subt1=%rax,<r0=%rcx
-sub  %rax,%rcx
-
-# qhasm:   carry? r1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#3,<r1=int64#5
-# asm 2: sbb  <subt0=%rdx,<r1=%r8
-sbb  %rdx,%r8
-
-# qhasm:   carry? r2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#3,<r2=int64#6
-# asm 2: sbb  <subt0=%rdx,<r2=%r9
-sbb  %rdx,%r9
-
-# qhasm:   carry? r3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#3,<r3=int64#2
-# asm 2: sbb  <subt0=%rdx,<r3=%rsi
-sbb  %rdx,%rsi
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#7,<subt0=int64#3
-# asm 2: cmovc <subt1=%rax,<subt0=%rdx
-cmovc %rax,%rdx
-
-# qhasm:   r0 -= subt0
-# asm 1: sub  <subt0=int64#3,<r0=int64#4
-# asm 2: sub  <subt0=%rdx,<r0=%rcx
-sub  %rdx,%rcx
-
-# qhasm: *(uint64 *)(rp + 0) = r0
-# asm 1: movq   <r0=int64#4,0(<rp=int64#1)
-# asm 2: movq   <r0=%rcx,0(<rp=%rdi)
-movq   %rcx,0(%rdi)
-
-# qhasm: *(uint64 *)(rp + 8) = r1
-# asm 1: movq   <r1=int64#5,8(<rp=int64#1)
-# asm 2: movq   <r1=%r8,8(<rp=%rdi)
-movq   %r8,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#6,16(<rp=int64#1)
-# asm 2: movq   <r2=%r9,16(<rp=%rdi)
-movq   %r9,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#2,24(<rp=int64#1)
-# asm 2: movq   <r3=%rsi,24(<rp=%rdi)
-movq   %rsi,24(%rdi)
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/fe25519_unpack.c b/ext/ed25519-amd64-asm/fe25519_unpack.c
deleted file mode 100644
index b3b0f4d58..000000000
--- a/ext/ed25519-amd64-asm/fe25519_unpack.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "fe25519.h"
-
-void fe25519_unpack(fe25519 *r, const unsigned char x[32])
-{
-  /* assuming little-endian */
-  r->v[0] = *(unsigned long long *)x;
-  r->v[1] = *(((unsigned long long *)x)+1);
-  r->v[2] = *(((unsigned long long *)x)+2);
-  r->v[3] = *(((unsigned long long *)x)+3);
-  r->v[3] &= 0x7fffffffffffffffULL;
-}
diff --git a/ext/ed25519-amd64-asm/ge25519.h b/ext/ed25519-amd64-asm/ge25519.h
deleted file mode 100644
index 0b15136b9..000000000
--- a/ext/ed25519-amd64-asm/ge25519.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef GE25519_H
-#define GE25519_H
-
-#include "fe25519.h"
-#include "sc25519.h"
-
-#define ge25519                           crypto_sign_ed25519_amd64_64_ge25519
-#define ge25519_base                      crypto_sign_ed25519_amd64_64_ge25519_base
-#define ge25519_unpackneg_vartime         crypto_sign_ed25519_amd64_64_unpackneg_vartime
-#define ge25519_pack                      crypto_sign_ed25519_amd64_64_pack
-#define ge25519_isneutral_vartime         crypto_sign_ed25519_amd64_64_isneutral_vartime
-#define ge25519_add                       crypto_sign_ed25519_amd64_64_ge25519_add
-#define ge25519_double                    crypto_sign_ed25519_amd64_64_ge25519_double
-#define ge25519_double_scalarmult_vartime crypto_sign_ed25519_amd64_64_double_scalarmult_vartime
-#define ge25519_multi_scalarmult_vartime  crypto_sign_ed25519_amd64_64_ge25519_multi_scalarmult_vartime
-#define ge25519_scalarmult_base           crypto_sign_ed25519_amd64_64_scalarmult_base
-#define ge25519_p1p1_to_p2                crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2
-#define ge25519_p1p1_to_p3                crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3
-#define ge25519_add_p1p1                  crypto_sign_ed25519_amd64_64_ge25519_add_p1p1
-#define ge25519_dbl_p1p1                  crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1
-#define choose_t                          crypto_sign_ed25519_amd64_64_choose_t
-#define ge25519_nielsadd2                 crypto_sign_ed25519_amd64_64_ge25519_nielsadd2
-#define ge25519_nielsadd_p1p1             crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1
-#define ge25519_pnielsadd_p1p1            crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1
-
-
-#define ge25519_p3 ge25519
-
-typedef struct
-{
-  fe25519 x;
-  fe25519 y;
-  fe25519 z;
-  fe25519 t;
-} ge25519;
-
-typedef struct
-{
-  fe25519 x;
-  fe25519 z;
-  fe25519 y;
-  fe25519 t;
-} ge25519_p1p1;
-
-typedef struct
-{
-  fe25519 x;
-  fe25519 y;
-  fe25519 z;
-} ge25519_p2;
-
-typedef struct
-{
-  fe25519 ysubx;
-  fe25519 xaddy;
-  fe25519 t2d;
-} ge25519_niels;
-
-typedef struct
-{
-  fe25519 ysubx;
-  fe25519 xaddy;
-  fe25519 z;
-  fe25519 t2d;
-} ge25519_pniels;
-
-extern void ge25519_p1p1_to_p2(ge25519_p2 *r, const ge25519_p1p1 *p);
-extern void ge25519_p1p1_to_p3(ge25519_p3 *r, const ge25519_p1p1 *p);
-extern void ge25519_add_p1p1(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_p3 *q);
-extern void ge25519_dbl_p1p1(ge25519_p1p1 *r, const ge25519_p2 *p);
-extern void choose_t(ge25519_niels *t, unsigned long long pos, signed long long b, const ge25519_niels *base_multiples);
-extern void ge25519_nielsadd2(ge25519_p3 *r, const ge25519_niels *q);
-extern void ge25519_nielsadd_p1p1(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_niels *q);
-extern void ge25519_pnielsadd_p1p1(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_pniels *q);
-
-extern const ge25519 ge25519_base;
-
-extern int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]);
-
-extern void ge25519_pack(unsigned char r[32], const ge25519 *p);
-
-extern int ge25519_isneutral_vartime(const ge25519 *p);
-
-extern void ge25519_add(ge25519 *r, const ge25519 *p, const ge25519 *q);
-
-extern void ge25519_double(ge25519 *r, const ge25519 *p);
-
-/* computes [s1]p1 + [s2]ge25519_base */
-extern void ge25519_double_scalarmult_vartime(ge25519 *r, const ge25519 *p1, const sc25519 *s1, const sc25519 *s2);
-
-extern void ge25519_multi_scalarmult_vartime(ge25519 *r, ge25519 *p, sc25519 *s, const unsigned long long npoints);
-
-extern void ge25519_scalarmult_base(ge25519 *r, const sc25519 *s);
-
-#endif
diff --git a/ext/ed25519-amd64-asm/ge25519_add.c b/ext/ed25519-amd64-asm/ge25519_add.c
deleted file mode 100644
index c4d1c68a4..000000000
--- a/ext/ed25519-amd64-asm/ge25519_add.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "ge25519.h"
-
-void ge25519_add(ge25519_p3 *r, const ge25519_p3 *p, const ge25519_p3 *q)
-{
-  ge25519_p1p1 grp1p1;
-  ge25519_add_p1p1(&grp1p1, p, q);
-  ge25519_p1p1_to_p3(r, &grp1p1);
-}
diff --git a/ext/ed25519-amd64-asm/ge25519_add_p1p1.s b/ext/ed25519-amd64-asm/ge25519_add_p1p1.s
deleted file mode 100644
index 0cb138980..000000000
--- a/ext/ed25519-amd64-asm/ge25519_add_p1p1.s
+++ /dev/null
@@ -1,4554 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 pp
-
-# qhasm: int64 qp
-
-# qhasm: input rp
-
-# qhasm: input pp
-
-# qhasm: input qp
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 a0
-
-# qhasm: int64 a1
-
-# qhasm: int64 a2
-
-# qhasm: int64 a3
-
-# qhasm: stack64 a0_stack
-
-# qhasm: stack64 a1_stack
-
-# qhasm: stack64 a2_stack
-
-# qhasm: stack64 a3_stack
-
-# qhasm: int64 b0
-
-# qhasm: int64 b1
-
-# qhasm: int64 b2
-
-# qhasm: int64 b3
-
-# qhasm: stack64 b0_stack
-
-# qhasm: stack64 b1_stack
-
-# qhasm: stack64 b2_stack
-
-# qhasm: stack64 b3_stack
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: stack64 c0_stack
-
-# qhasm: stack64 c1_stack
-
-# qhasm: stack64 c2_stack
-
-# qhasm: stack64 c3_stack
-
-# qhasm: int64 d0
-
-# qhasm: int64 d1
-
-# qhasm: int64 d2
-
-# qhasm: int64 d3
-
-# qhasm: stack64 d0_stack
-
-# qhasm: stack64 d1_stack
-
-# qhasm: stack64 d2_stack
-
-# qhasm: stack64 d3_stack
-
-# qhasm: int64 t10
-
-# qhasm: int64 t11
-
-# qhasm: int64 t12
-
-# qhasm: int64 t13
-
-# qhasm: stack64 t10_stack
-
-# qhasm: stack64 t11_stack
-
-# qhasm: stack64 t12_stack
-
-# qhasm: stack64 t13_stack
-
-# qhasm: int64 t20
-
-# qhasm: int64 t21
-
-# qhasm: int64 t22
-
-# qhasm: int64 t23
-
-# qhasm: stack64 t20_stack
-
-# qhasm: stack64 t21_stack
-
-# qhasm: stack64 t22_stack
-
-# qhasm: stack64 t23_stack
-
-# qhasm: int64 rx0
-
-# qhasm: int64 rx1
-
-# qhasm: int64 rx2
-
-# qhasm: int64 rx3
-
-# qhasm: int64 ry0
-
-# qhasm: int64 ry1
-
-# qhasm: int64 ry2
-
-# qhasm: int64 ry3
-
-# qhasm: int64 rz0
-
-# qhasm: int64 rz1
-
-# qhasm: int64 rz2
-
-# qhasm: int64 rz3
-
-# qhasm: int64 rt0
-
-# qhasm: int64 rt1
-
-# qhasm: int64 rt2
-
-# qhasm: int64 rt3
-
-# qhasm: int64 x0
-
-# qhasm: int64 x1
-
-# qhasm: int64 x2
-
-# qhasm: int64 x3
-
-# qhasm: int64 mulr4
-
-# qhasm: int64 mulr5
-
-# qhasm: int64 mulr6
-
-# qhasm: int64 mulr7
-
-# qhasm: int64 mulr8
-
-# qhasm: int64 mulrax
-
-# qhasm: int64 mulrdx
-
-# qhasm: int64 mulx0
-
-# qhasm: int64 mulx1
-
-# qhasm: int64 mulx2
-
-# qhasm: int64 mulx3
-
-# qhasm: int64 mulc
-
-# qhasm: int64 mulzero
-
-# qhasm: int64 muli38
-
-# qhasm: int64 addt0
-
-# qhasm: int64 addt1
-
-# qhasm: int64 subt0
-
-# qhasm: int64 subt1
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_add_p1p1
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_add_p1p1
-.globl crypto_sign_ed25519_amd64_64_ge25519_add_p1p1
-_crypto_sign_ed25519_amd64_64_ge25519_add_p1p1:
-crypto_sign_ed25519_amd64_64_ge25519_add_p1p1:
-mov %rsp,%r11
-and $31,%r11
-add $192,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: qp = qp
-# asm 1: mov  <qp=int64#3,>qp=int64#4
-# asm 2: mov  <qp=%rdx,>qp=%rcx
-mov  %rdx,%rcx
-
-# qhasm: a0 = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>a0=int64#3
-# asm 2: movq   32(<pp=%rsi),>a0=%rdx
-movq   32(%rsi),%rdx
-
-# qhasm: a1 = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>a1=int64#5
-# asm 2: movq   40(<pp=%rsi),>a1=%r8
-movq   40(%rsi),%r8
-
-# qhasm: a2 = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>a2=int64#6
-# asm 2: movq   48(<pp=%rsi),>a2=%r9
-movq   48(%rsi),%r9
-
-# qhasm: a3 = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>a3=int64#7
-# asm 2: movq   56(<pp=%rsi),>a3=%rax
-movq   56(%rsi),%rax
-
-# qhasm: b0 = a0
-# asm 1: mov  <a0=int64#3,>b0=int64#8
-# asm 2: mov  <a0=%rdx,>b0=%r10
-mov  %rdx,%r10
-
-# qhasm: b1 = a1
-# asm 1: mov  <a1=int64#5,>b1=int64#9
-# asm 2: mov  <a1=%r8,>b1=%r11
-mov  %r8,%r11
-
-# qhasm: b2 = a2
-# asm 1: mov  <a2=int64#6,>b2=int64#10
-# asm 2: mov  <a2=%r9,>b2=%r12
-mov  %r9,%r12
-
-# qhasm: b3 = a3
-# asm 1: mov  <a3=int64#7,>b3=int64#11
-# asm 2: mov  <a3=%rax,>b3=%r13
-mov  %rax,%r13
-
-# qhasm:   carry? a0 -= *(uint64 *)(pp + 0) 
-# asm 1: subq 0(<pp=int64#2),<a0=int64#3
-# asm 2: subq 0(<pp=%rsi),<a0=%rdx
-subq 0(%rsi),%rdx
-
-# qhasm:   carry? a1 -= *(uint64 *)(pp + 8) - carry
-# asm 1: sbbq 8(<pp=int64#2),<a1=int64#5
-# asm 2: sbbq 8(<pp=%rsi),<a1=%r8
-sbbq 8(%rsi),%r8
-
-# qhasm:   carry? a2 -= *(uint64 *)(pp + 16) - carry
-# asm 1: sbbq 16(<pp=int64#2),<a2=int64#6
-# asm 2: sbbq 16(<pp=%rsi),<a2=%r9
-sbbq 16(%rsi),%r9
-
-# qhasm:   carry? a3 -= *(uint64 *)(pp + 24) - carry
-# asm 1: sbbq 24(<pp=int64#2),<a3=int64#7
-# asm 2: sbbq 24(<pp=%rsi),<a3=%rax
-sbbq 24(%rsi),%rax
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#12
-# asm 2: mov  $0,>subt0=%r14
-mov  $0,%r14
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#13
-# asm 2: mov  $38,>subt1=%r15
-mov  $38,%r15
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#12,<subt1=int64#13
-# asm 2: cmovae <subt0=%r14,<subt1=%r15
-cmovae %r14,%r15
-
-# qhasm:   carry? a0 -= subt1
-# asm 1: sub  <subt1=int64#13,<a0=int64#3
-# asm 2: sub  <subt1=%r15,<a0=%rdx
-sub  %r15,%rdx
-
-# qhasm:   carry? a1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a1=int64#5
-# asm 2: sbb  <subt0=%r14,<a1=%r8
-sbb  %r14,%r8
-
-# qhasm:   carry? a2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a2=int64#6
-# asm 2: sbb  <subt0=%r14,<a2=%r9
-sbb  %r14,%r9
-
-# qhasm:   carry? a3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a3=int64#7
-# asm 2: sbb  <subt0=%r14,<a3=%rax
-sbb  %r14,%rax
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#13,<subt0=int64#12
-# asm 2: cmovc <subt1=%r15,<subt0=%r14
-cmovc %r15,%r14
-
-# qhasm:   a0 -= subt0
-# asm 1: sub  <subt0=int64#12,<a0=int64#3
-# asm 2: sub  <subt0=%r14,<a0=%rdx
-sub  %r14,%rdx
-
-# qhasm:   carry? b0 += *(uint64 *)(pp + 0) 
-# asm 1: addq 0(<pp=int64#2),<b0=int64#8
-# asm 2: addq 0(<pp=%rsi),<b0=%r10
-addq 0(%rsi),%r10
-
-# qhasm:   carry? b1 += *(uint64 *)(pp + 8) + carry
-# asm 1: adcq 8(<pp=int64#2),<b1=int64#9
-# asm 2: adcq 8(<pp=%rsi),<b1=%r11
-adcq 8(%rsi),%r11
-
-# qhasm:   carry? b2 += *(uint64 *)(pp + 16) + carry
-# asm 1: adcq 16(<pp=int64#2),<b2=int64#10
-# asm 2: adcq 16(<pp=%rsi),<b2=%r12
-adcq 16(%rsi),%r12
-
-# qhasm:   carry? b3 += *(uint64 *)(pp + 24) + carry
-# asm 1: adcq 24(<pp=int64#2),<b3=int64#11
-# asm 2: adcq 24(<pp=%rsi),<b3=%r13
-adcq 24(%rsi),%r13
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#12
-# asm 2: mov  $0,>addt0=%r14
-mov  $0,%r14
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#13
-# asm 2: mov  $38,>addt1=%r15
-mov  $38,%r15
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#12,<addt1=int64#13
-# asm 2: cmovae <addt0=%r14,<addt1=%r15
-cmovae %r14,%r15
-
-# qhasm:   carry? b0 += addt1
-# asm 1: add  <addt1=int64#13,<b0=int64#8
-# asm 2: add  <addt1=%r15,<b0=%r10
-add  %r15,%r10
-
-# qhasm:   carry? b1 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b1=int64#9
-# asm 2: adc <addt0=%r14,<b1=%r11
-adc %r14,%r11
-
-# qhasm:   carry? b2 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b2=int64#10
-# asm 2: adc <addt0=%r14,<b2=%r12
-adc %r14,%r12
-
-# qhasm:   carry? b3 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b3=int64#11
-# asm 2: adc <addt0=%r14,<b3=%r13
-adc %r14,%r13
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#13,<addt0=int64#12
-# asm 2: cmovc <addt1=%r15,<addt0=%r14
-cmovc %r15,%r14
-
-# qhasm:   b0 += addt0
-# asm 1: add  <addt0=int64#12,<b0=int64#8
-# asm 2: add  <addt0=%r14,<b0=%r10
-add  %r14,%r10
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#3,>a0_stack=stack64#8
-# asm 2: movq <a0=%rdx,>a0_stack=56(%rsp)
-movq %rdx,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#5,>a1_stack=stack64#9
-# asm 2: movq <a1=%r8,>a1_stack=64(%rsp)
-movq %r8,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#6,>a2_stack=stack64#10
-# asm 2: movq <a2=%r9,>a2_stack=72(%rsp)
-movq %r9,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#7,>a3_stack=stack64#11
-# asm 2: movq <a3=%rax,>a3_stack=80(%rsp)
-movq %rax,80(%rsp)
-
-# qhasm: b0_stack = b0
-# asm 1: movq <b0=int64#8,>b0_stack=stack64#12
-# asm 2: movq <b0=%r10,>b0_stack=88(%rsp)
-movq %r10,88(%rsp)
-
-# qhasm: b1_stack = b1
-# asm 1: movq <b1=int64#9,>b1_stack=stack64#13
-# asm 2: movq <b1=%r11,>b1_stack=96(%rsp)
-movq %r11,96(%rsp)
-
-# qhasm: b2_stack = b2
-# asm 1: movq <b2=int64#10,>b2_stack=stack64#14
-# asm 2: movq <b2=%r12,>b2_stack=104(%rsp)
-movq %r12,104(%rsp)
-
-# qhasm: b3_stack = b3
-# asm 1: movq <b3=int64#11,>b3_stack=stack64#15
-# asm 2: movq <b3=%r13,>b3_stack=112(%rsp)
-movq %r13,112(%rsp)
-
-# qhasm: t10 = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>t10=int64#3
-# asm 2: movq   32(<qp=%rcx),>t10=%rdx
-movq   32(%rcx),%rdx
-
-# qhasm: t11 = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>t11=int64#5
-# asm 2: movq   40(<qp=%rcx),>t11=%r8
-movq   40(%rcx),%r8
-
-# qhasm: t12 = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>t12=int64#6
-# asm 2: movq   48(<qp=%rcx),>t12=%r9
-movq   48(%rcx),%r9
-
-# qhasm: t13 = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>t13=int64#7
-# asm 2: movq   56(<qp=%rcx),>t13=%rax
-movq   56(%rcx),%rax
-
-# qhasm: t20 = t10
-# asm 1: mov  <t10=int64#3,>t20=int64#8
-# asm 2: mov  <t10=%rdx,>t20=%r10
-mov  %rdx,%r10
-
-# qhasm: t21 = t11
-# asm 1: mov  <t11=int64#5,>t21=int64#9
-# asm 2: mov  <t11=%r8,>t21=%r11
-mov  %r8,%r11
-
-# qhasm: t22 = t12
-# asm 1: mov  <t12=int64#6,>t22=int64#10
-# asm 2: mov  <t12=%r9,>t22=%r12
-mov  %r9,%r12
-
-# qhasm: t23 = t13
-# asm 1: mov  <t13=int64#7,>t23=int64#11
-# asm 2: mov  <t13=%rax,>t23=%r13
-mov  %rax,%r13
-
-# qhasm:   carry? t10 -= *(uint64 *) (qp + 0) 
-# asm 1: subq 0(<qp=int64#4),<t10=int64#3
-# asm 2: subq 0(<qp=%rcx),<t10=%rdx
-subq 0(%rcx),%rdx
-
-# qhasm:   carry? t11 -= *(uint64 *) (qp + 8) - carry
-# asm 1: sbbq 8(<qp=int64#4),<t11=int64#5
-# asm 2: sbbq 8(<qp=%rcx),<t11=%r8
-sbbq 8(%rcx),%r8
-
-# qhasm:   carry? t12 -= *(uint64 *) (qp + 16) - carry
-# asm 1: sbbq 16(<qp=int64#4),<t12=int64#6
-# asm 2: sbbq 16(<qp=%rcx),<t12=%r9
-sbbq 16(%rcx),%r9
-
-# qhasm:   carry? t13 -= *(uint64 *) (qp + 24) - carry
-# asm 1: sbbq 24(<qp=int64#4),<t13=int64#7
-# asm 2: sbbq 24(<qp=%rcx),<t13=%rax
-sbbq 24(%rcx),%rax
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#12
-# asm 2: mov  $0,>subt0=%r14
-mov  $0,%r14
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#13
-# asm 2: mov  $38,>subt1=%r15
-mov  $38,%r15
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#12,<subt1=int64#13
-# asm 2: cmovae <subt0=%r14,<subt1=%r15
-cmovae %r14,%r15
-
-# qhasm:   carry? t10 -= subt1
-# asm 1: sub  <subt1=int64#13,<t10=int64#3
-# asm 2: sub  <subt1=%r15,<t10=%rdx
-sub  %r15,%rdx
-
-# qhasm:   carry? t11 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<t11=int64#5
-# asm 2: sbb  <subt0=%r14,<t11=%r8
-sbb  %r14,%r8
-
-# qhasm:   carry? t12 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<t12=int64#6
-# asm 2: sbb  <subt0=%r14,<t12=%r9
-sbb  %r14,%r9
-
-# qhasm:   carry? t13 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<t13=int64#7
-# asm 2: sbb  <subt0=%r14,<t13=%rax
-sbb  %r14,%rax
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#13,<subt0=int64#12
-# asm 2: cmovc <subt1=%r15,<subt0=%r14
-cmovc %r15,%r14
-
-# qhasm:   t10 -= subt0
-# asm 1: sub  <subt0=int64#12,<t10=int64#3
-# asm 2: sub  <subt0=%r14,<t10=%rdx
-sub  %r14,%rdx
-
-# qhasm:   carry? t20 += *(uint64 *) (qp + 0) 
-# asm 1: addq 0(<qp=int64#4),<t20=int64#8
-# asm 2: addq 0(<qp=%rcx),<t20=%r10
-addq 0(%rcx),%r10
-
-# qhasm:   carry? t21 += *(uint64 *) (qp + 8) + carry
-# asm 1: adcq 8(<qp=int64#4),<t21=int64#9
-# asm 2: adcq 8(<qp=%rcx),<t21=%r11
-adcq 8(%rcx),%r11
-
-# qhasm:   carry? t22 += *(uint64 *) (qp + 16) + carry
-# asm 1: adcq 16(<qp=int64#4),<t22=int64#10
-# asm 2: adcq 16(<qp=%rcx),<t22=%r12
-adcq 16(%rcx),%r12
-
-# qhasm:   carry? t23 += *(uint64 *) (qp + 24) + carry
-# asm 1: adcq 24(<qp=int64#4),<t23=int64#11
-# asm 2: adcq 24(<qp=%rcx),<t23=%r13
-adcq 24(%rcx),%r13
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#12
-# asm 2: mov  $0,>addt0=%r14
-mov  $0,%r14
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#13
-# asm 2: mov  $38,>addt1=%r15
-mov  $38,%r15
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#12,<addt1=int64#13
-# asm 2: cmovae <addt0=%r14,<addt1=%r15
-cmovae %r14,%r15
-
-# qhasm:   carry? t20 += addt1
-# asm 1: add  <addt1=int64#13,<t20=int64#8
-# asm 2: add  <addt1=%r15,<t20=%r10
-add  %r15,%r10
-
-# qhasm:   carry? t21 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<t21=int64#9
-# asm 2: adc <addt0=%r14,<t21=%r11
-adc %r14,%r11
-
-# qhasm:   carry? t22 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<t22=int64#10
-# asm 2: adc <addt0=%r14,<t22=%r12
-adc %r14,%r12
-
-# qhasm:   carry? t23 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<t23=int64#11
-# asm 2: adc <addt0=%r14,<t23=%r13
-adc %r14,%r13
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#13,<addt0=int64#12
-# asm 2: cmovc <addt1=%r15,<addt0=%r14
-cmovc %r15,%r14
-
-# qhasm:   t20 += addt0
-# asm 1: add  <addt0=int64#12,<t20=int64#8
-# asm 2: add  <addt0=%r14,<t20=%r10
-add  %r14,%r10
-
-# qhasm: t10_stack = t10
-# asm 1: movq <t10=int64#3,>t10_stack=stack64#16
-# asm 2: movq <t10=%rdx,>t10_stack=120(%rsp)
-movq %rdx,120(%rsp)
-
-# qhasm: t11_stack = t11
-# asm 1: movq <t11=int64#5,>t11_stack=stack64#17
-# asm 2: movq <t11=%r8,>t11_stack=128(%rsp)
-movq %r8,128(%rsp)
-
-# qhasm: t12_stack = t12
-# asm 1: movq <t12=int64#6,>t12_stack=stack64#18
-# asm 2: movq <t12=%r9,>t12_stack=136(%rsp)
-movq %r9,136(%rsp)
-
-# qhasm: t13_stack = t13
-# asm 1: movq <t13=int64#7,>t13_stack=stack64#19
-# asm 2: movq <t13=%rax,>t13_stack=144(%rsp)
-movq %rax,144(%rsp)
-
-# qhasm: t20_stack = t20
-# asm 1: movq <t20=int64#8,>t20_stack=stack64#20
-# asm 2: movq <t20=%r10,>t20_stack=152(%rsp)
-movq %r10,152(%rsp)
-
-# qhasm: t21_stack = t21
-# asm 1: movq <t21=int64#9,>t21_stack=stack64#21
-# asm 2: movq <t21=%r11,>t21_stack=160(%rsp)
-movq %r11,160(%rsp)
-
-# qhasm: t22_stack = t22
-# asm 1: movq <t22=int64#10,>t22_stack=stack64#22
-# asm 2: movq <t22=%r12,>t22_stack=168(%rsp)
-movq %r12,168(%rsp)
-
-# qhasm: t23_stack = t23
-# asm 1: movq <t23=int64#11,>t23_stack=stack64#23
-# asm 2: movq <t23=%r13,>t23_stack=176(%rsp)
-movq %r13,176(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = a0_stack
-# asm 1: movq <a0_stack=stack64#8,>mulx0=int64#10
-# asm 2: movq <a0_stack=56(%rsp),>mulx0=%r12
-movq 56(%rsp),%r12
-
-# qhasm:   mulrax = t10_stack
-# asm 1: movq <t10_stack=stack64#16,>mulrax=int64#7
-# asm 2: movq <t10_stack=120(%rsp),>mulrax=%rax
-movq 120(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   a0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>a0=int64#11
-# asm 2: mov  <mulrax=%rax,>a0=%r13
-mov  %rax,%r13
-
-# qhasm:   a1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>a1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>a1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = t11_stack
-# asm 1: movq <t11_stack=stack64#17,>mulrax=int64#7
-# asm 2: movq <t11_stack=128(%rsp),>mulrax=%rax
-movq 128(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a1 += mulrax
-# asm 1: add  <mulrax=int64#7,<a1=int64#12
-# asm 2: add  <mulrax=%rax,<a1=%r14
-add  %rax,%r14
-
-# qhasm:   a2 = 0
-# asm 1: mov  $0,>a2=int64#13
-# asm 2: mov  $0,>a2=%r15
-mov  $0,%r15
-
-# qhasm:   a2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<a2=int64#13
-# asm 2: adc <mulrdx=%rdx,<a2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = t12_stack
-# asm 1: movq <t12_stack=stack64#18,>mulrax=int64#7
-# asm 2: movq <t12_stack=136(%rsp),>mulrax=%rax
-movq 136(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   a3 = 0
-# asm 1: mov  $0,>a3=int64#14
-# asm 2: mov  $0,>a3=%rbx
-mov  $0,%rbx
-
-# qhasm:   a3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<a3=int64#14
-# asm 2: adc <mulrdx=%rdx,<a3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = t13_stack
-# asm 1: movq <t13_stack=stack64#19,>mulrax=int64#7
-# asm 2: movq <t13_stack=144(%rsp),>mulrax=%rax
-movq 144(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = a1_stack
-# asm 1: movq <a1_stack=stack64#9,>mulx1=int64#10
-# asm 2: movq <a1_stack=64(%rsp),>mulx1=%r12
-movq 64(%rsp),%r12
-
-# qhasm:   mulrax = t10_stack
-# asm 1: movq <t10_stack=stack64#16,>mulrax=int64#7
-# asm 2: movq <t10_stack=120(%rsp),>mulrax=%rax
-movq 120(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a1 += mulrax
-# asm 1: add  <mulrax=int64#7,<a1=int64#12
-# asm 2: add  <mulrax=%rax,<a1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t11_stack
-# asm 1: movq <t11_stack=stack64#17,>mulrax=int64#7
-# asm 2: movq <t11_stack=128(%rsp),>mulrax=%rax
-movq 128(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a2 += mulc
-# asm 1: add  <mulc=int64#15,<a2=int64#13
-# asm 2: add  <mulc=%rbp,<a2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t12_stack
-# asm 1: movq <t12_stack=stack64#18,>mulrax=int64#7
-# asm 2: movq <t12_stack=136(%rsp),>mulrax=%rax
-movq 136(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a3 += mulc
-# asm 1: add  <mulc=int64#15,<a3=int64#14
-# asm 2: add  <mulc=%rbp,<a3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t13_stack
-# asm 1: movq <t13_stack=stack64#19,>mulrax=int64#7
-# asm 2: movq <t13_stack=144(%rsp),>mulrax=%rax
-movq 144(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = a2_stack
-# asm 1: movq <a2_stack=stack64#10,>mulx2=int64#10
-# asm 2: movq <a2_stack=72(%rsp),>mulx2=%r12
-movq 72(%rsp),%r12
-
-# qhasm:   mulrax = t10_stack
-# asm 1: movq <t10_stack=stack64#16,>mulrax=int64#7
-# asm 2: movq <t10_stack=120(%rsp),>mulrax=%rax
-movq 120(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t11_stack
-# asm 1: movq <t11_stack=stack64#17,>mulrax=int64#7
-# asm 2: movq <t11_stack=128(%rsp),>mulrax=%rax
-movq 128(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a3 += mulc
-# asm 1: add  <mulc=int64#15,<a3=int64#14
-# asm 2: add  <mulc=%rbp,<a3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t12_stack
-# asm 1: movq <t12_stack=stack64#18,>mulrax=int64#7
-# asm 2: movq <t12_stack=136(%rsp),>mulrax=%rax
-movq 136(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t13_stack
-# asm 1: movq <t13_stack=stack64#19,>mulrax=int64#7
-# asm 2: movq <t13_stack=144(%rsp),>mulrax=%rax
-movq 144(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = a3_stack
-# asm 1: movq <a3_stack=stack64#11,>mulx3=int64#10
-# asm 2: movq <a3_stack=80(%rsp),>mulx3=%r12
-movq 80(%rsp),%r12
-
-# qhasm:   mulrax = t10_stack
-# asm 1: movq <t10_stack=stack64#16,>mulrax=int64#7
-# asm 2: movq <t10_stack=120(%rsp),>mulrax=%rax
-movq 120(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t11_stack
-# asm 1: movq <t11_stack=stack64#17,>mulrax=int64#7
-# asm 2: movq <t11_stack=128(%rsp),>mulrax=%rax
-movq 128(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t12_stack
-# asm 1: movq <t12_stack=stack64#18,>mulrax=int64#7
-# asm 2: movq <t12_stack=136(%rsp),>mulrax=%rax
-movq 136(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t13_stack
-# asm 1: movq <t13_stack=stack64#19,>mulrax=int64#7
-# asm 2: movq <t13_stack=144(%rsp),>mulrax=%rax
-movq 144(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? a0 += mulr4
-# asm 1: add  <mulr4=int64#5,<a0=int64#11
-# asm 2: add  <mulr4=%r8,<a0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? a1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<a1=int64#12
-# asm 2: adc <mulr5=%r9,<a1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? a2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<a2=int64#13
-# asm 2: adc <mulr6=%r10,<a2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? a3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<a3=int64#14
-# asm 2: adc <mulr7=%r11,<a3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? a0 += mulr8
-# asm 1: add  <mulr8=int64#5,<a0=int64#11
-# asm 2: add  <mulr8=%r8,<a0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? a1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a1=int64#12
-# asm 2: adc <mulzero=%rdx,<a1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? a2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a2=int64#13
-# asm 2: adc <mulzero=%rdx,<a2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? a3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a3=int64#14
-# asm 2: adc <mulzero=%rdx,<a3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   a0 += mulzero
-# asm 1: add  <mulzero=int64#3,<a0=int64#11
-# asm 2: add  <mulzero=%rdx,<a0=%r13
-add  %rdx,%r13
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#11,>a0_stack=stack64#8
-# asm 2: movq <a0=%r13,>a0_stack=56(%rsp)
-movq %r13,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#12,>a1_stack=stack64#9
-# asm 2: movq <a1=%r14,>a1_stack=64(%rsp)
-movq %r14,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#13,>a2_stack=stack64#10
-# asm 2: movq <a2=%r15,>a2_stack=72(%rsp)
-movq %r15,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#14,>a3_stack=stack64#11
-# asm 2: movq <a3=%rbx,>a3_stack=80(%rsp)
-movq %rbx,80(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = b0_stack
-# asm 1: movq <b0_stack=stack64#12,>mulx0=int64#10
-# asm 2: movq <b0_stack=88(%rsp),>mulx0=%r12
-movq 88(%rsp),%r12
-
-# qhasm:   mulrax = t20_stack
-# asm 1: movq <t20_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <t20_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   rx0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rx0=int64#11
-# asm 2: mov  <mulrax=%rax,>rx0=%r13
-mov  %rax,%r13
-
-# qhasm:   rx1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rx1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>rx1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = t21_stack
-# asm 1: movq <t21_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <t21_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#12
-# asm 2: add  <mulrax=%rax,<rx1=%r14
-add  %rax,%r14
-
-# qhasm:   rx2 = 0
-# asm 1: mov  $0,>rx2=int64#13
-# asm 2: mov  $0,>rx2=%r15
-mov  $0,%r15
-
-# qhasm:   rx2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx2=int64#13
-# asm 2: adc <mulrdx=%rdx,<rx2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = t22_stack
-# asm 1: movq <t22_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <t22_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#13
-# asm 2: add  <mulrax=%rax,<rx2=%r15
-add  %rax,%r15
-
-# qhasm:   rx3 = 0
-# asm 1: mov  $0,>rx3=int64#14
-# asm 2: mov  $0,>rx3=%rbx
-mov  $0,%rbx
-
-# qhasm:   rx3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx3=int64#14
-# asm 2: adc <mulrdx=%rdx,<rx3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = t23_stack
-# asm 1: movq <t23_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <t23_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#14
-# asm 2: add  <mulrax=%rax,<rx3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = b1_stack
-# asm 1: movq <b1_stack=stack64#13,>mulx1=int64#10
-# asm 2: movq <b1_stack=96(%rsp),>mulx1=%r12
-movq 96(%rsp),%r12
-
-# qhasm:   mulrax = t20_stack
-# asm 1: movq <t20_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <t20_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#12
-# asm 2: add  <mulrax=%rax,<rx1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t21_stack
-# asm 1: movq <t21_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <t21_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#13
-# asm 2: add  <mulrax=%rax,<rx2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx2 += mulc
-# asm 1: add  <mulc=int64#15,<rx2=int64#13
-# asm 2: add  <mulc=%rbp,<rx2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t22_stack
-# asm 1: movq <t22_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <t22_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rx3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rx3=int64#14
-# asm 2: add  <mulrax=%rax,<rx3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#15,<rx3=int64#14
-# asm 2: add  <mulc=%rbp,<rx3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t23_stack
-# asm 1: movq <t23_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <t23_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = b2_stack
-# asm 1: movq <b2_stack=stack64#14,>mulx2=int64#10
-# asm 2: movq <b2_stack=104(%rsp),>mulx2=%r12
-movq 104(%rsp),%r12
-
-# qhasm:   mulrax = t20_stack
-# asm 1: movq <t20_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <t20_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#13
-# asm 2: add  <mulrax=%rax,<rx2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t21_stack
-# asm 1: movq <t21_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <t21_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#14
-# asm 2: add  <mulrax=%rax,<rx3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#15,<rx3=int64#14
-# asm 2: add  <mulc=%rbp,<rx3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t22_stack
-# asm 1: movq <t22_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <t22_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t23_stack
-# asm 1: movq <t23_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <t23_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = b3_stack
-# asm 1: movq <b3_stack=stack64#15,>mulx3=int64#10
-# asm 2: movq <b3_stack=112(%rsp),>mulx3=%r12
-movq 112(%rsp),%r12
-
-# qhasm:   mulrax = t20_stack
-# asm 1: movq <t20_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <t20_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#14
-# asm 2: add  <mulrax=%rax,<rx3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t21_stack
-# asm 1: movq <t21_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <t21_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t22_stack
-# asm 1: movq <t22_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <t22_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = t23_stack
-# asm 1: movq <t23_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <t23_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rx0 += mulr4
-# asm 1: add  <mulr4=int64#5,<rx0=int64#11
-# asm 2: add  <mulr4=%r8,<rx0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? rx1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<rx1=int64#12
-# asm 2: adc <mulr5=%r9,<rx1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? rx2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<rx2=int64#13
-# asm 2: adc <mulr6=%r10,<rx2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? rx3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<rx3=int64#14
-# asm 2: adc <mulr7=%r11,<rx3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? rx0 += mulr8
-# asm 1: add  <mulr8=int64#5,<rx0=int64#11
-# asm 2: add  <mulr8=%r8,<rx0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? rx1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx1=int64#12
-# asm 2: adc <mulzero=%rdx,<rx1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? rx2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx2=int64#13
-# asm 2: adc <mulzero=%rdx,<rx2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? rx3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx3=int64#14
-# asm 2: adc <mulzero=%rdx,<rx3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   rx0 += mulzero
-# asm 1: add  <mulzero=int64#3,<rx0=int64#11
-# asm 2: add  <mulzero=%rdx,<rx0=%r13
-add  %rdx,%r13
-
-# qhasm: ry0 = rx0
-# asm 1: mov  <rx0=int64#11,>ry0=int64#3
-# asm 2: mov  <rx0=%r13,>ry0=%rdx
-mov  %r13,%rdx
-
-# qhasm: ry1 = rx1
-# asm 1: mov  <rx1=int64#12,>ry1=int64#5
-# asm 2: mov  <rx1=%r14,>ry1=%r8
-mov  %r14,%r8
-
-# qhasm: ry2 = rx2
-# asm 1: mov  <rx2=int64#13,>ry2=int64#6
-# asm 2: mov  <rx2=%r15,>ry2=%r9
-mov  %r15,%r9
-
-# qhasm: ry3 = rx3
-# asm 1: mov  <rx3=int64#14,>ry3=int64#7
-# asm 2: mov  <rx3=%rbx,>ry3=%rax
-mov  %rbx,%rax
-
-# qhasm:   carry? ry0 += a0_stack 
-# asm 1: addq <a0_stack=stack64#8,<ry0=int64#3
-# asm 2: addq <a0_stack=56(%rsp),<ry0=%rdx
-addq 56(%rsp),%rdx
-
-# qhasm:   carry? ry1 += a1_stack + carry
-# asm 1: adcq <a1_stack=stack64#9,<ry1=int64#5
-# asm 2: adcq <a1_stack=64(%rsp),<ry1=%r8
-adcq 64(%rsp),%r8
-
-# qhasm:   carry? ry2 += a2_stack + carry
-# asm 1: adcq <a2_stack=stack64#10,<ry2=int64#6
-# asm 2: adcq <a2_stack=72(%rsp),<ry2=%r9
-adcq 72(%rsp),%r9
-
-# qhasm:   carry? ry3 += a3_stack + carry
-# asm 1: adcq <a3_stack=stack64#11,<ry3=int64#7
-# asm 2: adcq <a3_stack=80(%rsp),<ry3=%rax
-adcq 80(%rsp),%rax
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#8
-# asm 2: mov  $0,>addt0=%r10
-mov  $0,%r10
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#9
-# asm 2: mov  $38,>addt1=%r11
-mov  $38,%r11
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#8,<addt1=int64#9
-# asm 2: cmovae <addt0=%r10,<addt1=%r11
-cmovae %r10,%r11
-
-# qhasm:   carry? ry0 += addt1
-# asm 1: add  <addt1=int64#9,<ry0=int64#3
-# asm 2: add  <addt1=%r11,<ry0=%rdx
-add  %r11,%rdx
-
-# qhasm:   carry? ry1 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<ry1=int64#5
-# asm 2: adc <addt0=%r10,<ry1=%r8
-adc %r10,%r8
-
-# qhasm:   carry? ry2 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<ry2=int64#6
-# asm 2: adc <addt0=%r10,<ry2=%r9
-adc %r10,%r9
-
-# qhasm:   carry? ry3 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<ry3=int64#7
-# asm 2: adc <addt0=%r10,<ry3=%rax
-adc %r10,%rax
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#9,<addt0=int64#8
-# asm 2: cmovc <addt1=%r11,<addt0=%r10
-cmovc %r11,%r10
-
-# qhasm:   ry0 += addt0
-# asm 1: add  <addt0=int64#8,<ry0=int64#3
-# asm 2: add  <addt0=%r10,<ry0=%rdx
-add  %r10,%rdx
-
-# qhasm:   carry? rx0 -= a0_stack 
-# asm 1: subq <a0_stack=stack64#8,<rx0=int64#11
-# asm 2: subq <a0_stack=56(%rsp),<rx0=%r13
-subq 56(%rsp),%r13
-
-# qhasm:   carry? rx1 -= a1_stack - carry
-# asm 1: sbbq <a1_stack=stack64#9,<rx1=int64#12
-# asm 2: sbbq <a1_stack=64(%rsp),<rx1=%r14
-sbbq 64(%rsp),%r14
-
-# qhasm:   carry? rx2 -= a2_stack - carry
-# asm 1: sbbq <a2_stack=stack64#10,<rx2=int64#13
-# asm 2: sbbq <a2_stack=72(%rsp),<rx2=%r15
-sbbq 72(%rsp),%r15
-
-# qhasm:   carry? rx3 -= a3_stack - carry
-# asm 1: sbbq <a3_stack=stack64#11,<rx3=int64#14
-# asm 2: sbbq <a3_stack=80(%rsp),<rx3=%rbx
-sbbq 80(%rsp),%rbx
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#8
-# asm 2: mov  $0,>subt0=%r10
-mov  $0,%r10
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#9
-# asm 2: mov  $38,>subt1=%r11
-mov  $38,%r11
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#8,<subt1=int64#9
-# asm 2: cmovae <subt0=%r10,<subt1=%r11
-cmovae %r10,%r11
-
-# qhasm:   carry? rx0 -= subt1
-# asm 1: sub  <subt1=int64#9,<rx0=int64#11
-# asm 2: sub  <subt1=%r11,<rx0=%r13
-sub  %r11,%r13
-
-# qhasm:   carry? rx1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<rx1=int64#12
-# asm 2: sbb  <subt0=%r10,<rx1=%r14
-sbb  %r10,%r14
-
-# qhasm:   carry? rx2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<rx2=int64#13
-# asm 2: sbb  <subt0=%r10,<rx2=%r15
-sbb  %r10,%r15
-
-# qhasm:   carry? rx3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<rx3=int64#14
-# asm 2: sbb  <subt0=%r10,<rx3=%rbx
-sbb  %r10,%rbx
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#9,<subt0=int64#8
-# asm 2: cmovc <subt1=%r11,<subt0=%r10
-cmovc %r11,%r10
-
-# qhasm:   rx0 -= subt0
-# asm 1: sub  <subt0=int64#8,<rx0=int64#11
-# asm 2: sub  <subt0=%r10,<rx0=%r13
-sub  %r10,%r13
-
-# qhasm: *(uint64 *) (rp + 0) = rx0
-# asm 1: movq   <rx0=int64#11,0(<rp=int64#1)
-# asm 2: movq   <rx0=%r13,0(<rp=%rdi)
-movq   %r13,0(%rdi)
-
-# qhasm: *(uint64 *) (rp + 8) = rx1
-# asm 1: movq   <rx1=int64#12,8(<rp=int64#1)
-# asm 2: movq   <rx1=%r14,8(<rp=%rdi)
-movq   %r14,8(%rdi)
-
-# qhasm: *(uint64 *) (rp + 16) = rx2
-# asm 1: movq   <rx2=int64#13,16(<rp=int64#1)
-# asm 2: movq   <rx2=%r15,16(<rp=%rdi)
-movq   %r15,16(%rdi)
-
-# qhasm: *(uint64 *) (rp + 24) = rx3
-# asm 1: movq   <rx3=int64#14,24(<rp=int64#1)
-# asm 2: movq   <rx3=%rbx,24(<rp=%rdi)
-movq   %rbx,24(%rdi)
-
-# qhasm: *(uint64 *) (rp + 64) = ry0
-# asm 1: movq   <ry0=int64#3,64(<rp=int64#1)
-# asm 2: movq   <ry0=%rdx,64(<rp=%rdi)
-movq   %rdx,64(%rdi)
-
-# qhasm: *(uint64 *) (rp + 72) = ry1
-# asm 1: movq   <ry1=int64#5,72(<rp=int64#1)
-# asm 2: movq   <ry1=%r8,72(<rp=%rdi)
-movq   %r8,72(%rdi)
-
-# qhasm: *(uint64 *) (rp + 80) = ry2
-# asm 1: movq   <ry2=int64#6,80(<rp=int64#1)
-# asm 2: movq   <ry2=%r9,80(<rp=%rdi)
-movq   %r9,80(%rdi)
-
-# qhasm: *(uint64 *) (rp + 88) = ry3
-# asm 1: movq   <ry3=int64#7,88(<rp=int64#1)
-# asm 2: movq   <ry3=%rax,88(<rp=%rdi)
-movq   %rax,88(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulx0=int64#10
-# asm 2: movq   96(<pp=%rsi),>mulx0=%r12
-movq   96(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 96)
-# asm 1: movq   96(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   96(<qp=%rcx),>mulrax=%rax
-movq   96(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   c0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>c0=int64#11
-# asm 2: mov  <mulrax=%rax,>c0=%r13
-mov  %rax,%r13
-
-# qhasm:   c1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>c1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>c1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 104)
-# asm 1: movq   104(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   104(<qp=%rcx),>mulrax=%rax
-movq   104(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#12
-# asm 2: add  <mulrax=%rax,<c1=%r14
-add  %rax,%r14
-
-# qhasm:   c2 = 0
-# asm 1: mov  $0,>c2=int64#13
-# asm 2: mov  $0,>c2=%r15
-mov  $0,%r15
-
-# qhasm:   c2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c2=int64#13
-# asm 2: adc <mulrdx=%rdx,<c2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 112)
-# asm 1: movq   112(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   112(<qp=%rcx),>mulrax=%rax
-movq   112(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   c3 = 0
-# asm 1: mov  $0,>c3=int64#14
-# asm 2: mov  $0,>c3=%rbx
-mov  $0,%rbx
-
-# qhasm:   c3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c3=int64#14
-# asm 2: adc <mulrdx=%rdx,<c3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 120)
-# asm 1: movq   120(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   120(<qp=%rcx),>mulrax=%rax
-movq   120(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulx1=int64#10
-# asm 2: movq   104(<pp=%rsi),>mulx1=%r12
-movq   104(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 96)
-# asm 1: movq   96(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   96(<qp=%rcx),>mulrax=%rax
-movq   96(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#12
-# asm 2: add  <mulrax=%rax,<c1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 104)
-# asm 1: movq   104(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   104(<qp=%rcx),>mulrax=%rax
-movq   104(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c2 += mulc
-# asm 1: add  <mulc=int64#15,<c2=int64#13
-# asm 2: add  <mulc=%rbp,<c2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 112)
-# asm 1: movq   112(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   112(<qp=%rcx),>mulrax=%rax
-movq   112(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#15,<c3=int64#14
-# asm 2: add  <mulc=%rbp,<c3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 120)
-# asm 1: movq   120(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   120(<qp=%rcx),>mulrax=%rax
-movq   120(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulx2=int64#10
-# asm 2: movq   112(<pp=%rsi),>mulx2=%r12
-movq   112(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 96)
-# asm 1: movq   96(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   96(<qp=%rcx),>mulrax=%rax
-movq   96(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 104)
-# asm 1: movq   104(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   104(<qp=%rcx),>mulrax=%rax
-movq   104(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#15,<c3=int64#14
-# asm 2: add  <mulc=%rbp,<c3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 112)
-# asm 1: movq   112(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   112(<qp=%rcx),>mulrax=%rax
-movq   112(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 120)
-# asm 1: movq   120(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   120(<qp=%rcx),>mulrax=%rax
-movq   120(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulx3=int64#10
-# asm 2: movq   120(<pp=%rsi),>mulx3=%r12
-movq   120(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 96)
-# asm 1: movq   96(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   96(<qp=%rcx),>mulrax=%rax
-movq   96(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 104)
-# asm 1: movq   104(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   104(<qp=%rcx),>mulrax=%rax
-movq   104(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 112)
-# asm 1: movq   112(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   112(<qp=%rcx),>mulrax=%rax
-movq   112(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 120)
-# asm 1: movq   120(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   120(<qp=%rcx),>mulrax=%rax
-movq   120(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? c0 += mulr4
-# asm 1: add  <mulr4=int64#5,<c0=int64#11
-# asm 2: add  <mulr4=%r8,<c0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? c1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<c1=int64#12
-# asm 2: adc <mulr5=%r9,<c1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? c2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<c2=int64#13
-# asm 2: adc <mulr6=%r10,<c2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? c3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<c3=int64#14
-# asm 2: adc <mulr7=%r11,<c3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? c0 += mulr8
-# asm 1: add  <mulr8=int64#5,<c0=int64#11
-# asm 2: add  <mulr8=%r8,<c0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? c1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c1=int64#12
-# asm 2: adc <mulzero=%rdx,<c1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? c2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c2=int64#13
-# asm 2: adc <mulzero=%rdx,<c2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? c3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c3=int64#14
-# asm 2: adc <mulzero=%rdx,<c3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   c0 += mulzero
-# asm 1: add  <mulzero=int64#3,<c0=int64#11
-# asm 2: add  <mulzero=%rdx,<c0=%r13
-add  %rdx,%r13
-
-# qhasm: c0_stack = c0
-# asm 1: movq <c0=int64#11,>c0_stack=stack64#8
-# asm 2: movq <c0=%r13,>c0_stack=56(%rsp)
-movq %r13,56(%rsp)
-
-# qhasm: c1_stack = c1
-# asm 1: movq <c1=int64#12,>c1_stack=stack64#9
-# asm 2: movq <c1=%r14,>c1_stack=64(%rsp)
-movq %r14,64(%rsp)
-
-# qhasm: c2_stack = c2
-# asm 1: movq <c2=int64#13,>c2_stack=stack64#10
-# asm 2: movq <c2=%r15,>c2_stack=72(%rsp)
-movq %r15,72(%rsp)
-
-# qhasm: c3_stack = c3
-# asm 1: movq <c3=int64#14,>c3_stack=stack64#11
-# asm 2: movq <c3=%rbx,>c3_stack=80(%rsp)
-movq %rbx,80(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = c0_stack
-# asm 1: movq <c0_stack=stack64#8,>mulx0=int64#10
-# asm 2: movq <c0_stack=56(%rsp),>mulx0=%r12
-movq 56(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D0
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D0(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   c0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>c0=int64#11
-# asm 2: mov  <mulrax=%rax,>c0=%r13
-mov  %rax,%r13
-
-# qhasm:   c1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>c1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>c1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D1
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D1(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#12
-# asm 2: add  <mulrax=%rax,<c1=%r14
-add  %rax,%r14
-
-# qhasm:   c2 = 0
-# asm 1: mov  $0,>c2=int64#13
-# asm 2: mov  $0,>c2=%r15
-mov  $0,%r15
-
-# qhasm:   c2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c2=int64#13
-# asm 2: adc <mulrdx=%rdx,<c2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D2
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D2(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   c3 = 0
-# asm 1: mov  $0,>c3=int64#14
-# asm 2: mov  $0,>c3=%rbx
-mov  $0,%rbx
-
-# qhasm:   c3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c3=int64#14
-# asm 2: adc <mulrdx=%rdx,<c3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D3
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D3(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = c1_stack
-# asm 1: movq <c1_stack=stack64#9,>mulx1=int64#10
-# asm 2: movq <c1_stack=64(%rsp),>mulx1=%r12
-movq 64(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D0
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D0(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#12
-# asm 2: add  <mulrax=%rax,<c1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D1
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D1(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c2 += mulc
-# asm 1: add  <mulc=int64#15,<c2=int64#13
-# asm 2: add  <mulc=%rbp,<c2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D2
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D2(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#15,<c3=int64#14
-# asm 2: add  <mulc=%rbp,<c3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D3
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D3(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = c2_stack
-# asm 1: movq <c2_stack=stack64#10,>mulx2=int64#10
-# asm 2: movq <c2_stack=72(%rsp),>mulx2=%r12
-movq 72(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D0
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D0(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D1
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D1(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#15,<c3=int64#14
-# asm 2: add  <mulc=%rbp,<c3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D2
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D2(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D3
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D3(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = c3_stack
-# asm 1: movq <c3_stack=stack64#11,>mulx3=int64#10
-# asm 2: movq <c3_stack=80(%rsp),>mulx3=%r12
-movq 80(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D0
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D0,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D0(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D1
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D1,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D1(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D2
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D2,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D2(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)&crypto_sign_ed25519_amd64_64_EC2D3
-# asm 1: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=int64#7
-# asm 2: movq crypto_sign_ed25519_amd64_64_EC2D3,>mulrax=%rax
-movq crypto_sign_ed25519_amd64_64_EC2D3(%rip),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? c0 += mulr4
-# asm 1: add  <mulr4=int64#5,<c0=int64#11
-# asm 2: add  <mulr4=%r8,<c0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? c1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<c1=int64#12
-# asm 2: adc <mulr5=%r9,<c1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? c2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<c2=int64#13
-# asm 2: adc <mulr6=%r10,<c2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? c3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<c3=int64#14
-# asm 2: adc <mulr7=%r11,<c3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? c0 += mulr8
-# asm 1: add  <mulr8=int64#5,<c0=int64#11
-# asm 2: add  <mulr8=%r8,<c0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? c1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c1=int64#12
-# asm 2: adc <mulzero=%rdx,<c1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? c2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c2=int64#13
-# asm 2: adc <mulzero=%rdx,<c2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? c3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c3=int64#14
-# asm 2: adc <mulzero=%rdx,<c3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   c0 += mulzero
-# asm 1: add  <mulzero=int64#3,<c0=int64#11
-# asm 2: add  <mulzero=%rdx,<c0=%r13
-add  %rdx,%r13
-
-# qhasm: c0_stack = c0
-# asm 1: movq <c0=int64#11,>c0_stack=stack64#8
-# asm 2: movq <c0=%r13,>c0_stack=56(%rsp)
-movq %r13,56(%rsp)
-
-# qhasm: c1_stack = c1
-# asm 1: movq <c1=int64#12,>c1_stack=stack64#9
-# asm 2: movq <c1=%r14,>c1_stack=64(%rsp)
-movq %r14,64(%rsp)
-
-# qhasm: c2_stack = c2
-# asm 1: movq <c2=int64#13,>c2_stack=stack64#10
-# asm 2: movq <c2=%r15,>c2_stack=72(%rsp)
-movq %r15,72(%rsp)
-
-# qhasm: c3_stack = c3
-# asm 1: movq <c3=int64#14,>c3_stack=stack64#11
-# asm 2: movq <c3=%rbx,>c3_stack=80(%rsp)
-movq %rbx,80(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>mulx0=int64#10
-# asm 2: movq   64(<pp=%rsi),>mulx0=%r12
-movq   64(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   rt0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rt0=int64#11
-# asm 2: mov  <mulrax=%rax,>rt0=%r13
-mov  %rax,%r13
-
-# qhasm:   rt1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rt1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>rt1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rt1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt1=int64#12
-# asm 2: add  <mulrax=%rax,<rt1=%r14
-add  %rax,%r14
-
-# qhasm:   rt2 = 0
-# asm 1: mov  $0,>rt2=int64#13
-# asm 2: mov  $0,>rt2=%r15
-mov  $0,%r15
-
-# qhasm:   rt2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rt2=int64#13
-# asm 2: adc <mulrdx=%rdx,<rt2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#13
-# asm 2: add  <mulrax=%rax,<rt2=%r15
-add  %rax,%r15
-
-# qhasm:   rt3 = 0
-# asm 1: mov  $0,>rt3=int64#14
-# asm 2: mov  $0,>rt3=%rbx
-mov  $0,%rbx
-
-# qhasm:   rt3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rt3=int64#14
-# asm 2: adc <mulrdx=%rdx,<rt3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#14
-# asm 2: add  <mulrax=%rax,<rt3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>mulx1=int64#10
-# asm 2: movq   72(<pp=%rsi),>mulx1=%r12
-movq   72(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rt1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt1=int64#12
-# asm 2: add  <mulrax=%rax,<rt1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#13
-# asm 2: add  <mulrax=%rax,<rt2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt2 += mulc
-# asm 1: add  <mulc=int64#15,<rt2=int64#13
-# asm 2: add  <mulc=%rbp,<rt2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rt3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rt3=int64#14
-# asm 2: add  <mulrax=%rax,<rt3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt3 += mulc
-# asm 1: add  <mulc=int64#15,<rt3=int64#14
-# asm 2: add  <mulc=%rbp,<rt3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>mulx2=int64#10
-# asm 2: movq   80(<pp=%rsi),>mulx2=%r12
-movq   80(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#13
-# asm 2: add  <mulrax=%rax,<rt2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#14
-# asm 2: add  <mulrax=%rax,<rt3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt3 += mulc
-# asm 1: add  <mulc=int64#15,<rt3=int64#14
-# asm 2: add  <mulc=%rbp,<rt3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>mulx3=int64#2
-# asm 2: movq   88(<pp=%rsi),>mulx3=%rsi
-movq   88(%rsi),%rsi
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#14
-# asm 2: add  <mulrax=%rax,<rt3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#10,<mulr4=int64#5
-# asm 2: add  <mulc=%r12,<mulr4=%r8
-add  %r12,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#10,<mulr5=int64#6
-# asm 2: add  <mulc=%r12,<mulr5=%r9
-add  %r12,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#10,<mulr6=int64#8
-# asm 2: add  <mulc=%r12,<mulr6=%r10
-add  %r12,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rt0 += mulr4
-# asm 1: add  <mulr4=int64#2,<rt0=int64#11
-# asm 2: add  <mulr4=%rsi,<rt0=%r13
-add  %rsi,%r13
-
-# qhasm:   carry? rt1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<rt1=int64#12
-# asm 2: adc <mulr5=%rcx,<rt1=%r14
-adc %rcx,%r14
-
-# qhasm:   carry? rt2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<rt2=int64#13
-# asm 2: adc <mulr6=%r8,<rt2=%r15
-adc %r8,%r15
-
-# qhasm:   carry? rt3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<rt3=int64#14
-# asm 2: adc <mulr7=%r9,<rt3=%rbx
-adc %r9,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? rt0 += mulr8
-# asm 1: add  <mulr8=int64#3,<rt0=int64#11
-# asm 2: add  <mulr8=%rdx,<rt0=%r13
-add  %rdx,%r13
-
-# qhasm:   carry? rt1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt1=int64#12
-# asm 2: adc <mulzero=%rsi,<rt1=%r14
-adc %rsi,%r14
-
-# qhasm:   carry? rt2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt2=int64#13
-# asm 2: adc <mulzero=%rsi,<rt2=%r15
-adc %rsi,%r15
-
-# qhasm:   carry? rt3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt3=int64#14
-# asm 2: adc <mulzero=%rsi,<rt3=%rbx
-adc %rsi,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   rt0 += mulzero
-# asm 1: add  <mulzero=int64#2,<rt0=int64#11
-# asm 2: add  <mulzero=%rsi,<rt0=%r13
-add  %rsi,%r13
-
-# qhasm:   carry? rt0 += rt0 
-# asm 1: add  <rt0=int64#11,<rt0=int64#11
-# asm 2: add  <rt0=%r13,<rt0=%r13
-add  %r13,%r13
-
-# qhasm:   carry? rt1 += rt1 + carry
-# asm 1: adc <rt1=int64#12,<rt1=int64#12
-# asm 2: adc <rt1=%r14,<rt1=%r14
-adc %r14,%r14
-
-# qhasm:   carry? rt2 += rt2 + carry
-# asm 1: adc <rt2=int64#13,<rt2=int64#13
-# asm 2: adc <rt2=%r15,<rt2=%r15
-adc %r15,%r15
-
-# qhasm:   carry? rt3 += rt3 + carry
-# asm 1: adc <rt3=int64#14,<rt3=int64#14
-# asm 2: adc <rt3=%rbx,<rt3=%rbx
-adc %rbx,%rbx
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#2
-# asm 2: mov  $0,>addt0=%rsi
-mov  $0,%rsi
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#3
-# asm 2: mov  $38,>addt1=%rdx
-mov  $38,%rdx
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#2,<addt1=int64#3
-# asm 2: cmovae <addt0=%rsi,<addt1=%rdx
-cmovae %rsi,%rdx
-
-# qhasm:   carry? rt0 += addt1
-# asm 1: add  <addt1=int64#3,<rt0=int64#11
-# asm 2: add  <addt1=%rdx,<rt0=%r13
-add  %rdx,%r13
-
-# qhasm:   carry? rt1 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rt1=int64#12
-# asm 2: adc <addt0=%rsi,<rt1=%r14
-adc %rsi,%r14
-
-# qhasm:   carry? rt2 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rt2=int64#13
-# asm 2: adc <addt0=%rsi,<rt2=%r15
-adc %rsi,%r15
-
-# qhasm:   carry? rt3 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rt3=int64#14
-# asm 2: adc <addt0=%rsi,<rt3=%rbx
-adc %rsi,%rbx
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#3,<addt0=int64#2
-# asm 2: cmovc <addt1=%rdx,<addt0=%rsi
-cmovc %rdx,%rsi
-
-# qhasm:   rt0 += addt0
-# asm 1: add  <addt0=int64#2,<rt0=int64#11
-# asm 2: add  <addt0=%rsi,<rt0=%r13
-add  %rsi,%r13
-
-# qhasm: rz0 = rt0
-# asm 1: mov  <rt0=int64#11,>rz0=int64#2
-# asm 2: mov  <rt0=%r13,>rz0=%rsi
-mov  %r13,%rsi
-
-# qhasm: rz1 = rt1
-# asm 1: mov  <rt1=int64#12,>rz1=int64#3
-# asm 2: mov  <rt1=%r14,>rz1=%rdx
-mov  %r14,%rdx
-
-# qhasm: rz2 = rt2
-# asm 1: mov  <rt2=int64#13,>rz2=int64#4
-# asm 2: mov  <rt2=%r15,>rz2=%rcx
-mov  %r15,%rcx
-
-# qhasm: rz3 = rt3
-# asm 1: mov  <rt3=int64#14,>rz3=int64#5
-# asm 2: mov  <rt3=%rbx,>rz3=%r8
-mov  %rbx,%r8
-
-# qhasm:   carry? rz0 += c0_stack 
-# asm 1: addq <c0_stack=stack64#8,<rz0=int64#2
-# asm 2: addq <c0_stack=56(%rsp),<rz0=%rsi
-addq 56(%rsp),%rsi
-
-# qhasm:   carry? rz1 += c1_stack + carry
-# asm 1: adcq <c1_stack=stack64#9,<rz1=int64#3
-# asm 2: adcq <c1_stack=64(%rsp),<rz1=%rdx
-adcq 64(%rsp),%rdx
-
-# qhasm:   carry? rz2 += c2_stack + carry
-# asm 1: adcq <c2_stack=stack64#10,<rz2=int64#4
-# asm 2: adcq <c2_stack=72(%rsp),<rz2=%rcx
-adcq 72(%rsp),%rcx
-
-# qhasm:   carry? rz3 += c3_stack + carry
-# asm 1: adcq <c3_stack=stack64#11,<rz3=int64#5
-# asm 2: adcq <c3_stack=80(%rsp),<rz3=%r8
-adcq 80(%rsp),%r8
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#6
-# asm 2: mov  $0,>addt0=%r9
-mov  $0,%r9
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#7
-# asm 2: mov  $38,>addt1=%rax
-mov  $38,%rax
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#6,<addt1=int64#7
-# asm 2: cmovae <addt0=%r9,<addt1=%rax
-cmovae %r9,%rax
-
-# qhasm:   carry? rz0 += addt1
-# asm 1: add  <addt1=int64#7,<rz0=int64#2
-# asm 2: add  <addt1=%rax,<rz0=%rsi
-add  %rax,%rsi
-
-# qhasm:   carry? rz1 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<rz1=int64#3
-# asm 2: adc <addt0=%r9,<rz1=%rdx
-adc %r9,%rdx
-
-# qhasm:   carry? rz2 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<rz2=int64#4
-# asm 2: adc <addt0=%r9,<rz2=%rcx
-adc %r9,%rcx
-
-# qhasm:   carry? rz3 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<rz3=int64#5
-# asm 2: adc <addt0=%r9,<rz3=%r8
-adc %r9,%r8
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#7,<addt0=int64#6
-# asm 2: cmovc <addt1=%rax,<addt0=%r9
-cmovc %rax,%r9
-
-# qhasm:   rz0 += addt0
-# asm 1: add  <addt0=int64#6,<rz0=int64#2
-# asm 2: add  <addt0=%r9,<rz0=%rsi
-add  %r9,%rsi
-
-# qhasm:   carry? rt0 -= c0_stack 
-# asm 1: subq <c0_stack=stack64#8,<rt0=int64#11
-# asm 2: subq <c0_stack=56(%rsp),<rt0=%r13
-subq 56(%rsp),%r13
-
-# qhasm:   carry? rt1 -= c1_stack - carry
-# asm 1: sbbq <c1_stack=stack64#9,<rt1=int64#12
-# asm 2: sbbq <c1_stack=64(%rsp),<rt1=%r14
-sbbq 64(%rsp),%r14
-
-# qhasm:   carry? rt2 -= c2_stack - carry
-# asm 1: sbbq <c2_stack=stack64#10,<rt2=int64#13
-# asm 2: sbbq <c2_stack=72(%rsp),<rt2=%r15
-sbbq 72(%rsp),%r15
-
-# qhasm:   carry? rt3 -= c3_stack - carry
-# asm 1: sbbq <c3_stack=stack64#11,<rt3=int64#14
-# asm 2: sbbq <c3_stack=80(%rsp),<rt3=%rbx
-sbbq 80(%rsp),%rbx
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#6
-# asm 2: mov  $0,>subt0=%r9
-mov  $0,%r9
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#7
-# asm 2: mov  $38,>subt1=%rax
-mov  $38,%rax
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#6,<subt1=int64#7
-# asm 2: cmovae <subt0=%r9,<subt1=%rax
-cmovae %r9,%rax
-
-# qhasm:   carry? rt0 -= subt1
-# asm 1: sub  <subt1=int64#7,<rt0=int64#11
-# asm 2: sub  <subt1=%rax,<rt0=%r13
-sub  %rax,%r13
-
-# qhasm:   carry? rt1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#6,<rt1=int64#12
-# asm 2: sbb  <subt0=%r9,<rt1=%r14
-sbb  %r9,%r14
-
-# qhasm:   carry? rt2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#6,<rt2=int64#13
-# asm 2: sbb  <subt0=%r9,<rt2=%r15
-sbb  %r9,%r15
-
-# qhasm:   carry? rt3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#6,<rt3=int64#14
-# asm 2: sbb  <subt0=%r9,<rt3=%rbx
-sbb  %r9,%rbx
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#7,<subt0=int64#6
-# asm 2: cmovc <subt1=%rax,<subt0=%r9
-cmovc %rax,%r9
-
-# qhasm:   rt0 -= subt0
-# asm 1: sub  <subt0=int64#6,<rt0=int64#11
-# asm 2: sub  <subt0=%r9,<rt0=%r13
-sub  %r9,%r13
-
-# qhasm: *(uint64 *)(rp + 32) = rz0
-# asm 1: movq   <rz0=int64#2,32(<rp=int64#1)
-# asm 2: movq   <rz0=%rsi,32(<rp=%rdi)
-movq   %rsi,32(%rdi)
-
-# qhasm: *(uint64 *)(rp + 40) = rz1
-# asm 1: movq   <rz1=int64#3,40(<rp=int64#1)
-# asm 2: movq   <rz1=%rdx,40(<rp=%rdi)
-movq   %rdx,40(%rdi)
-
-# qhasm: *(uint64 *)(rp + 48) = rz2
-# asm 1: movq   <rz2=int64#4,48(<rp=int64#1)
-# asm 2: movq   <rz2=%rcx,48(<rp=%rdi)
-movq   %rcx,48(%rdi)
-
-# qhasm: *(uint64 *)(rp + 56) = rz3
-# asm 1: movq   <rz3=int64#5,56(<rp=int64#1)
-# asm 2: movq   <rz3=%r8,56(<rp=%rdi)
-movq   %r8,56(%rdi)
-
-# qhasm: *(uint64 *)(rp + 96) = rt0
-# asm 1: movq   <rt0=int64#11,96(<rp=int64#1)
-# asm 2: movq   <rt0=%r13,96(<rp=%rdi)
-movq   %r13,96(%rdi)
-
-# qhasm: *(uint64 *)(rp + 104) = rt1
-# asm 1: movq   <rt1=int64#12,104(<rp=int64#1)
-# asm 2: movq   <rt1=%r14,104(<rp=%rdi)
-movq   %r14,104(%rdi)
-
-# qhasm: *(uint64 *)(rp + 112) = rt2
-# asm 1: movq   <rt2=int64#13,112(<rp=int64#1)
-# asm 2: movq   <rt2=%r15,112(<rp=%rdi)
-movq   %r15,112(%rdi)
-
-# qhasm: *(uint64 *)(rp + 120) = rt3
-# asm 1: movq   <rt3=int64#14,120(<rp=int64#1)
-# asm 2: movq   <rt3=%rbx,120(<rp=%rdi)
-movq   %rbx,120(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/ge25519_base.c b/ext/ed25519-amd64-asm/ge25519_base.c
deleted file mode 100644
index a7ae97864..000000000
--- a/ext/ed25519-amd64-asm/ge25519_base.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "ge25519.h"
-
-const ge25519 ge25519_base = {{{0xC9562D608F25D51A, 0x692CC7609525A7B2, 0xC0A4E231FDD6DC5C, 0x216936D3CD6E53FE}},
-                              {{0x6666666666666658, 0x6666666666666666, 0x6666666666666666, 0x6666666666666666}},
-                              {{0x0000000000000001, 0x0000000000000000, 0x0000000000000000, 000000000000000000}},
-                              {{0x6DDE8AB3A5B7DDA3, 0x20F09F80775152F5, 0x66EA4E8E64ABE37D, 0x67875F0FD78B7665}}};
-
diff --git a/ext/ed25519-amd64-asm/ge25519_base_niels.data b/ext/ed25519-amd64-asm/ge25519_base_niels.data
deleted file mode 100644
index 8e3300cf4..000000000
--- a/ext/ed25519-amd64-asm/ge25519_base_niels.data
+++ /dev/null
@@ -1,1536 +0,0 @@
-{{{0x9d103905d740913e, 0xfd399f05d140beb3, 0xa5c18434688f8a09, 0x44fd2f9298f81267}},
- {{0x2fbc93c6f58c3b85, 0xcf932dc6fb8c0e19, 0x270b4898643d42c2, 0x07cf9d3a33d4ba65}},
- {{0xdbbd15674b6fbb59, 0x41e13f00eea2a5ea, 0xcdd49d1cc957c6fa, 0x4f0ebe1faf16ecca}}},
-{{{0x8a99a56042b4d5a8, 0x8f2b810c4e60acf6, 0xe09e236bb16e37aa, 0x6bb595a669c92555}},
- {{0x9224e7fc933c71d7, 0x9f469d967a0ff5b5, 0x5aa69a65e1d60702, 0x590c063fa87d2e2e}},
- {{0x6e347eaadad36802, 0xbaf3599383ee4805, 0x3bcabe10e6076826, 0x49314f0a165ed1b8}}},
-{{{0x56611fe8a4fcd265, 0x3bd353fde5c1ba7d, 0x8131f31a214bd6bd, 0x2ab91587555bda62}},
- {{0xaf25b0a84cee9730, 0x025a8430e8864b8a, 0xc11b50029f016732, 0x7a164e1b9a80f8f4}},
- {{0x9bf211f4f1674834, 0xb84e6b17f62df895, 0xd7de6f075b722a4e, 0x549a04b963bb2a21}}},
-{{{0x95fe050a056818bf, 0x327e89715660faa9, 0xc3e8e3cd06a05073, 0x27933f4c7445a49a}},
- {{0x287351b98efc099f, 0x6765c6f47dfd2538, 0xca348d3dfb0a9265, 0x680e910321e58727}},
- {{0xbf1e45ece51426b0, 0xe32bc63d6dba0f94, 0xe42974d58cf852c0, 0x44f079b1b0e64c18}}},
-{{{0x7f9182c3a447d6ba, 0xd50014d14b2729b7, 0xe33cf11cb864a087, 0x154a7e73eb1b55f3}},
- {{0xa212bc4408a5bb33, 0x8d5048c3c75eed02, 0xdd1beb0c5abfec44, 0x2945ccf146e206eb}},
- {{0xc832a179e7d003b3, 0x5f729d0a00124d7e, 0x62c1d4a10e6d8ff3, 0x68b8ac5938b27a98}}},
-{{{0x499806b67b7d8ca4, 0x575be28427d22739, 0xbb085ce7204553b9, 0x38b64c41ae417884}},
- {{0x3a0ceeeb77157131, 0x9b27158900c8af88, 0x8065b668da59a736, 0x51e57bb6a2cc38bd}},
- {{0x8f9dad91689de3a4, 0x175f2428f8fb9137, 0x050ab5329fcfb988, 0x7865dfa21354c09f}}},
-{{{0xba6f2c9aaa3221b1, 0x6ca021533bba23a7, 0x9dea764f92192c3a, 0x1d6edd5d2e5317e0}},
- {{0x6b1a5cd0944ea3bf, 0x7470353ab39dc0d2, 0x71b2528228542e49, 0x461bea69283c927e}},
- {{0x217a8aacab0fda36, 0xa528c6543d3549c8, 0x37d05b8b13ab7568, 0x233cef623a2cbc37}}},
-{{{0xe2a75dedf39234d9, 0x963d7680e1b558f9, 0x2c2741ac6e3c23fb, 0x3a9024a1320e01c3}},
- {{0x59b7596604dd3e8f, 0x6cb30377e288702c, 0xb1339c665ed9c323, 0x0915e76061bce52f}},
- {{0xdf7de835a834a37e, 0x8be19cda689857ea, 0x2c1185367167b326, 0x589eb3d9dbefd5c2}}},
-{{{0x7ec851ca553e2df3, 0xa71284cba64878b3, 0xe6b5e4193288d1e7, 0x4cf210ec5a9a8883}},
- {{0x322d04a52d9021f6, 0xb9c19f3375c6bf9c, 0x587a3a4342d20b09, 0x143b1cf8aa64fe61}},
- {{0x9f867c7d968acaab, 0x5f54258e27092729, 0xd0a7d34bea180975, 0x21b546a3374126e1}}},
-{{{0xa94ff858a2888343, 0xce0ed4565313ed3c, 0xf55c3dcfb5bf34fa, 0x0a653ca5c9eab371}},
- {{0x490a7a45d185218f, 0x9a15377846049335, 0x0060ea09cc31e1f6, 0x7e041577f86ee965}},
- {{0x66b2a496ce5b67f3, 0xff5492d8bd569796, 0x503cec294a592cd0, 0x566943650813acb2}}},
-{{{0xb818db0c26620798, 0x5d5c31d9606e354a, 0x0982fa4f00a8cdc7, 0x17e12bcd4653e2d4}},
- {{0x5672f9eb1dabb69d, 0xba70b535afe853fc, 0x47ac0f752796d66d, 0x32a5351794117275}},
- {{0xd3a644a6df648437, 0x703b6559880fbfdd, 0xcb852540ad3a1aa5, 0x0900b3f78e4c6468}}},
-{{{0x0a851b9f679d651b, 0xe108cb61033342f2, 0xd601f57fe88b30a3, 0x371f3acaed2dd714}},
- {{0xed280fbec816ad31, 0x52d9595bd8e6efe3, 0x0fe71772f6c623f5, 0x4314030b051e293c}},
- {{0xd560005efbf0bcad, 0x8eb70f2ed1870c5e, 0x201f9033d084e6a0, 0x4c3a5ae1ce7b6670}}},
-{{{0x4138a434dcb8fa95, 0x870cf67d6c96840b, 0xde388574297be82c, 0x7c814db27262a55a}},
- {{0xbaf875e4c93da0dd, 0xb93282a771b9294d, 0x80d63fb7f4c6c460, 0x6de9c73dea66c181}},
- {{0x478904d5a04df8f2, 0xfafbae4ab10142d3, 0xf6c8ac63555d0998, 0x5aac4a412f90b104}}},
-{{{0xc64f326b3ac92908, 0x5551b282e663e1e0, 0x476b35f54a1a4b83, 0x1b9da3fe189f68c2}},
- {{0x603a0d0abd7f5134, 0x8089c932e1d3ae46, 0xdf2591398798bd63, 0x1c145cd274ba0235}},
- {{0x32e8386475f3d743, 0x365b8baf6ae5d9ef, 0x825238b6385b681e, 0x234929c1167d65e1}}},
-{{{0x984decaba077ade8, 0x383f77ad19eb389d, 0xc7ec6b7e2954d794, 0x59c77b3aeb7c3a7a}},
- {{0x48145cc21d099fcf, 0x4535c192cc28d7e5, 0x80e7c1e548247e01, 0x4a5f28743b2973ee}},
- {{0xd3add725225ccf62, 0x911a3381b2152c5d, 0xd8b39fad5b08f87d, 0x6f05606b4799fe3b}}},
-{{{0x9ffe9e92177ba962, 0x98aee71d0de5cae1, 0x3ff4ae942d831044, 0x714de12e58533ac8}},
- {{0x5b433149f91b6483, 0xadb5dc655a2cbf62, 0x87fa8412632827b3, 0x60895e91ab49f8d8}},
- {{0xe9ecf2ed0cf86c18, 0xb46d06120735dfd4, 0xbc9da09804b96be7, 0x73e2e62fd96dc26b}}},
-{{{0xed5b635449aa515e, 0xa865c49f0bc6823a, 0x850c1fe95b42d1c4, 0x30d76d6f03d315b9}},
- {{0x2eccdd0e632f9c1d, 0x51d0b69676893115, 0x52dfb76ba8637a58, 0x6dd37d49a00eef39}},
- {{0x6c4444172106e4c7, 0xfb53d680928d7f69, 0xb4739ea4694d3f26, 0x10c697112e864bb0}}},
-{{{0x6493c4277dbe5fde, 0x265d4fad19ad7ea2, 0x0e00dfc846304590, 0x25e61cabed66fe09}},
- {{0x0ca62aa08358c805, 0x6a3d4ae37a204247, 0x7464d3a63b11eddc, 0x03bf9baf550806ef}},
- {{0x3f13e128cc586604, 0x6f5873ecb459747e, 0xa0b63dedcc1268f5, 0x566d78634586e22c}}},
-{{{0x1637a49f9cc10834, 0xbc8e56d5a89bc451, 0x1cb5ec0f7f7fd2db, 0x33975bca5ecc35d9}},
- {{0xa1054285c65a2fd0, 0x6c64112af31667c3, 0x680ae240731aee58, 0x14fba5f34793b22a}},
- {{0x3cd746166985f7d4, 0x593e5e84c9c80057, 0x2fc3f2b67b61131e, 0x14829cea83fc526c}}},
-{{{0xff437b8497dd95c2, 0x6c744e30aa4eb5a7, 0x9e0c5d613c85e88b, 0x2fd9c71e5f758173}},
- {{0x21e70b2f4e71ecb8, 0xe656ddb940a477e3, 0xbf6556cece1d4f80, 0x05fc3bc4535d7b7e}},
- {{0x24b8b3ae52afdedd, 0x3495638ced3b30cf, 0x33a4bc83a9be8195, 0x373767475c651f04}}},
-{{{0x2fba99fd40d1add9, 0xb307166f96f4d027, 0x4363f05215f03bae, 0x1fbea56c3b18f999}},
- {{0x634095cb14246590, 0xef12144016c15535, 0x9e38140c8910bc60, 0x6bf5905730907c8c}},
- {{0x0fa778f1e1415b8a, 0x06409ff7bac3a77e, 0x6f52d7b89aa29a50, 0x02521cf67a635a56}}},
-{{{0x513fee0b0a9d5294, 0x8f98e75c0fdf5a66, 0xd4618688bfe107ce, 0x3fa00a7e71382ced}},
- {{0xb1146720772f5ee4, 0xe8f894b196079ace, 0x4af8224d00ac824a, 0x001753d9f7cd6cc4}},
- {{0x3c69232d963ddb34, 0x1dde87dab4973858, 0xaad7d1f9a091f285, 0x12b5fe2fa048edb6}}},
-{{{0x71f0fbc496fce34d, 0x73b9826badf35bed, 0xd2047261ff28c561, 0x749b76f96fb1206f}},
- {{0xdf2b7c26ad6f1e92, 0x4b66d323504b8913, 0x8c409dc0751c8bc3, 0x6f7e93c20796c7b8}},
- {{0x1f5af604aea6ae05, 0xc12351f1bee49c99, 0x61a808b5eeff6b66, 0x0fcec10f01e02151}}},
-{{{0x644d58a649fe1e44, 0x21fcaea231ad777e, 0x02441c5a887fd0d2, 0x4901aa7183c511f3}},
- {{0x3df2d29dc4244e45, 0x2b020e7493d8de0a, 0x6cc8067e820c214d, 0x413779166feab90a}},
- {{0x08b1b7548c1af8f0, 0xce0f7a7c246299b4, 0xf760b0f91e06d939, 0x41bb887b726d1213}}},
-{{{0x9267806c567c49d8, 0x066d04ccca791e6a, 0xa69f5645e3cc394b, 0x5c95b686a0788cd2}},
- {{0x97d980e0aa39f7d2, 0x35d0384252c6b51c, 0x7d43f49307cd55aa, 0x56bd36cfb78ac362}},
- {{0x2ac519c10d14a954, 0xeaf474b494b5fa90, 0xe6af8382a9f87a5a, 0x0dea6db1879be094}}},
-{{{0xaa66bf547344e5ab, 0xda1258888f1b4309, 0x5e87d2b3fd564b2f, 0x5b2c78885483b1dd}},
- {{0x15baeb74d6a8797a, 0x7ef55cf1fac41732, 0x29001f5a3c8b05c5, 0x0ad7cc8752eaccfb}},
- {{0x52151362793408cf, 0xeb0f170319963d94, 0xa833b2fa883d9466, 0x093a7fa775003c78}}},
-{{{0xe5107de63a16d7be, 0xa377ffdc9af332cf, 0x70d5bf18440b677f, 0x6a252b19a4a31403}},
- {{0xb8e9604460a91286, 0x7f3fd8047778d3de, 0x67d01e31bf8a5e2d, 0x7b038a06c27b653e}},
- {{0x9ed919d5d36990f3, 0x5213aebbdb4eb9f2, 0xc708ea054cb99135, 0x58ded57f72260e56}}},
-{{{0x78e79dade9413d77, 0xf257f9d59729e67d, 0x59db910ee37aa7e6, 0x6aa11b5bbb9e039c}},
- {{0xda6d53265b0fd48b, 0x8960823193bfa988, 0xd78ac93261d57e28, 0x79f2942d3a5c8143}},
- {{0x97da2f25b6c88de9, 0x251ba7eaacf20169, 0x09b44f87ef4eb4e4, 0x7d90ab1bbc6a7da5}}},
-{{{0x9acca683a7016bfe, 0x90505f4df2c50b6d, 0x6b610d5fcce435aa, 0x19a10d446198ff96}},
- {{0x1a07a3f496b3c397, 0x11ceaa188f4e2532, 0x7d9498d5a7751bf0, 0x19ed161f508dd8a0}},
- {{0x560a2cd687dce6ca, 0x7f3568c48664cf4d, 0x8741e95222803a38, 0x483bdab1595653fc}}},
-{{{0xfa780f148734fa49, 0x106f0b70360534e0, 0x2210776fe3e307bd, 0x3286c109dde6a0fe}},
- {{0xd6cf4d0ab4da80f6, 0x82483e45f8307fe0, 0x05005269ae6f9da4, 0x1c7052909cf7877a}},
- {{0x32ee7de2874e98d4, 0x14c362e9b97e0c60, 0x5781dcde6a60a38a, 0x217dd5eaaa7aa840}}},
-{{{0x9db7c4d0248e1eb0, 0xe07697e14d74bf52, 0x1e6a9b173c562354, 0x7fa7c21f795a4965}},
- {{0x8bdf1fb9be8c0ec8, 0x00bae7f8e30a0282, 0x4963991dad6c4f6c, 0x07058a6e5df6f60a}},
- {{0xe9eb02c4db31f67f, 0xed25fd8910bcfb2b, 0x46c8131f5c5cddb4, 0x33b21c13a0cb9bce}}},
-{{{0x360692f8087d8e31, 0xf4dcc637d27163f7, 0x25a4e62065ea5963, 0x659bf72e5ac160d9}},
- {{0x9aafb9b05ee38c5b, 0xbf9d2d4e071a13c7, 0x8eee6e6de933290a, 0x1c3bab17ae109717}},
- {{0x1c9ab216c7cab7b0, 0x7d65d37407bbc3cc, 0x52744750504a58d5, 0x09f2606b131a2990}}},
-{{{0x40e87d44744346be, 0x1d48dad415b52b25, 0x7c3a8a18a13b603e, 0x4eb728c12fcdbdf7}},
- {{0x7e234c597c6691ae, 0x64889d3d0a85b4c8, 0xdae2c90c354afae7, 0x0a871e070c6a9e1d}},
- {{0x3301b5994bbc8989, 0x736bae3a5bdd4260, 0x0d61ade219d59e3c, 0x3ee7300f2685d464}}},
-{{{0xf5d255e49e7dd6b7, 0x8016115c610b1eac, 0x3c99975d92e187ca, 0x13815762979125c2}},
- {{0x43fa7947841e7518, 0xe5c6fa59639c46d7, 0xa1065e1de3052b74, 0x7d47c6a2cfb89030}},
- {{0x3fdad0148ef0d6e0, 0x9d3e749a91546f3c, 0x71ec621026bb8157, 0x148cf58d34c9ec80}}},
-{{{0x46a492f67934f027, 0x469984bef6840aa9, 0x5ca1bc2a89611854, 0x3ff2fa1ebd5dbbd4}},
- {{0xe2572f7d9ae4756d, 0x56c345bb88f3487f, 0x9fd10b6d6960a88d, 0x278febad4eaea1b9}},
- {{0xb1aa681f8c933966, 0x8c21949c20290c98, 0x39115291219d3c52, 0x4104dd02fe9c677b}}},
-{{{0x72b2bf5e1124422a, 0xa1fa0c3398a33ab5, 0x94cb6101fa52b666, 0x2c863b00afaf53d5}},
- {{0x81214e06db096ab8, 0x21a8b6c90ce44f35, 0x6524c12a409e2af5, 0x0165b5a48efca481}},
- {{0xf190a474a0846a76, 0x12eff984cd2f7cc0, 0x695e290658aa2b8f, 0x591b67d9bffec8b8}}},
-{{{0x312f0d1c80b49bfa, 0x5979515eabf3ec8a, 0x727033c09ef01c88, 0x3de02ec7ca8f7bcb}},
- {{0x99b9b3719f18b55d, 0xe465e5faa18c641e, 0x61081136c29f05ed, 0x489b4f867030128b}},
- {{0xd232102d3aeb92ef, 0xe16253b46116a861, 0x3d7eabe7190baa24, 0x49f5fbba496cbebf}}},
-{{{0x30949a108a5bcfd4, 0xdc40dd70bc6473eb, 0x92c294c1307c0d1c, 0x5604a86dcbfa6e74}},
- {{0x155d628c1e9c572e, 0x8a4d86acc5884741, 0x91a352f6515763eb, 0x06a1a6c28867515b}},
- {{0x7288d1d47c1764b6, 0x72541140e0418b51, 0x9f031a6018acf6d1, 0x20989e89fe2742c6}}},
-{{{0x499777fd3a2dcc7f, 0x32857c2ca54fd892, 0xa279d864d207e3a0, 0x0403ed1d0ca67e29}},
- {{0x1674278b85eaec2e, 0x5621dc077acb2bdf, 0x640a4c1661cbf45a, 0x730b9950f70595d3}},
- {{0xc94b2d35874ec552, 0xc5e6c8cf98246f8d, 0xf7cb46fa16c035ce, 0x5bd7454308303dcc}}},
-{{{0x7f9ad19528b24cc2, 0x7f6b54656335c181, 0x66b8b66e4fc07236, 0x133a78007380ad83}},
- {{0x85c4932115e7792a, 0xc64c89a2bdcdddc9, 0x9d1e3da8ada3d762, 0x5bb7db123067f82c}},
- {{0x0961f467c6ca62be, 0x04ec21d6211952ee, 0x182360779bd54770, 0x740dca6d58f0e0d2}}},
-{{{0x50b70bf5d3f0af0b, 0x4feaf48ae32e71f7, 0x60e84ed3a55bbd34, 0x00ed489b3f50d1ed}},
- {{0x3906c72aed261ae5, 0x9ab68fd988e100f7, 0xf5e9059af3360197, 0x0e53dc78bf2b6d47}},
- {{0xb90829bf7971877a, 0x5e4444636d17e631, 0x4d05c52e18276893, 0x27632d9a5a4a4af5}}},
-{{{0xd11ff05154b260ce, 0xd86dc38e72f95270, 0x601fcd0d267cc138, 0x2b67916429e90ccd}},
- {{0xa98285d187eaffdb, 0xa5b4fbbbd8d0a864, 0xb658f27f022663f7, 0x3bbc2b22d99ce282}},
- {{0xb917c952583c0a58, 0x653ff9b80fe4c6f3, 0x9b0da7d7bcdf3c0c, 0x43a0eeb6ab54d60e}}},
-{{{0x396966a46d4a5487, 0xf811a18aac2bb3ba, 0x66e4685b5628b26b, 0x70a477029d929b92}},
- {{0x3ac6322357875fe8, 0xd9d4f4ecf5fbcb8f, 0x8dee8493382bb620, 0x50c5eaa14c799fdc}},
- {{0xdd0edc8bd6f2fb3c, 0x54c63aa79cc7b7a0, 0xae0b032b2c8d9f1a, 0x6f9ce107602967fb}}},
-{{{0xad1054b1cde1c22a, 0xc4a8e90248eb32df, 0x5f3e7b33accdc0ea, 0x72364713fc79963e}},
- {{0x139693063520e0b5, 0x437fcf7c88ea03fe, 0xf7d4c40bd3c959bc, 0x699154d1f893ded9}},
- {{0x315d5c75b4b27526, 0xcccb842d0236daa5, 0x22f0c8a3345fee8e, 0x73975a617d39dbed}}},
-{{{0xe4024df96375da10, 0x78d3251a1830c870, 0x902b1948658cd91c, 0x7e18b10b29b7438a}},
- {{0x6f37f392f4433e46, 0x0e19b9a11f566b18, 0x220fb78a1fd1d662, 0x362a4258a381c94d}},
- {{0x9071d9132b6beb2f, 0x0f26e9ad28418247, 0xeab91ec9bdec925d, 0x4be65bc8f48af2de}}},
-{{{0x78487feba36e7028, 0x5f3f13001dd8ce34, 0x934fb12d4b30c489, 0x056c244d397f0a2b}},
- {{0x1d50fba257c26234, 0x7bd4823adeb0678b, 0xc2b0dc6ea6538af5, 0x5665eec6351da73e}},
- {{0xdb3ee00943bfb210, 0x4972018720800ac2, 0x26ab5d6173bd8667, 0x20b209c2ab204938}}},
-{{{0x549e342ac07fb34b, 0x02d8220821373d93, 0xbc262d70acd1f567, 0x7a92c9fdfbcac784}},
- {{0x1fcca94516bd3289, 0x448d65aa41420428, 0x59c3b7b216a55d62, 0x49992cc64e612cd8}},
- {{0x65bd1bea70f801de, 0x1befb7c0fe49e28a, 0xa86306cdb1b2ae4a, 0x3b7ac0cd265c2a09}}},
-{{{0x822bee438c01bcec, 0x530cb525c0fbc73b, 0x48519034c1953fe9, 0x265cc261e09a0f5b}},
- {{0xf0d54e4f22ed39a7, 0xa2aae91e5608150a, 0xf421b2e9eddae875, 0x31bc531d6b7de992}},
- {{0xdf3d134da980f971, 0x7a4fb8d1221a22a7, 0x3df7d42035aad6d8, 0x2a14edcc6a1a125e}}},
-{{{0xdf48ee0752cfce4e, 0xc3fffaf306ec08b7, 0x05710b2ab95459c4, 0x161d25fa963ea38d}},
- {{0x231a8c570478433c, 0xb7b5270ec281439d, 0xdbaa99eae3d9079f, 0x2c03f5256c2b03d9}},
- {{0x790f18757b53a47d, 0x307b0130cf0c5879, 0x31903d77257ef7f9, 0x699468bdbd96bbaf}}},
-{{{0xbd1f2f46f4dafecf, 0x7cef0114a47fd6f7, 0xd31ffdda4a47b37f, 0x525219a473905785}},
- {{0xd8dd3de66aa91948, 0x485064c22fc0d2cc, 0x9b48246634fdea2f, 0x293e1c4e6c4a2e3a}},
- {{0x376e134b925112e1, 0x703778b5dca15da0, 0xb04589af461c3111, 0x5b605c447f032823}}},
-{{{0xb965805920c47c89, 0xe7f0100c923b8fcc, 0x0001256502e2ef77, 0x24a76dcea8aeb3ee}},
- {{0x3be9fec6f0e7f04c, 0x866a579e75e34962, 0x5542ef161e1de61a, 0x2f12fef4cc5abdd5}},
- {{0x0a4522b2dfc0c740, 0x10d06e7f40c9a407, 0xc6cf144178cff668, 0x5e607b2518a43790}}},
-{{{0x58b31d8f6cdf1818, 0x35cfa74fc36258a2, 0xe1b3ff4f66e61d6e, 0x5067acab6ccdd5f7}},
- {{0xa02c431ca596cf14, 0xe3c42d40aed3e400, 0xd24526802e0f26db, 0x201f33139e457068}},
- {{0xfd527f6b08039d51, 0x18b14964017c0006, 0xd5220eb02e25a4a8, 0x397cba8862460375}}},
-{{{0x30c13093f05959b2, 0xe23aa18de9a97976, 0x222fd491721d5e26, 0x2339d320766e6c3a}},
- {{0x7815c3fbc81379e7, 0xa6619420dde12af1, 0xffa9c0f885a8fdd5, 0x771b4022c1e1c252}},
- {{0xd87dd986513a2fa7, 0xf5ac9b71f9d4cf08, 0xd06bc31b1ea283b3, 0x331a189219971a76}}},
-{{{0xf5166f45fb4f80c6, 0x9c36c7de61c775cf, 0xe3d4e81b9041d91c, 0x31167c6b83bdfe21}},
- {{0x26512f3a9d7572af, 0x5bcbe28868074a9e, 0x84edc1c11180f7c4, 0x1ac9619ff649a67b}},
- {{0xf22b3842524b1068, 0x5068343bee9ce987, 0xfc9d71844a6250c8, 0x612436341f08b111}}},
-{{{0xd99d41db874e898d, 0x09fea5f16c07dc20, 0x793d2c67d00f9bbc, 0x46ebe2309e5eff40}},
- {{0x8b6349e31a2d2638, 0x9ddfb7009bd3fd35, 0x7f8bf1b8a3a06ba4, 0x1522aa3178d90445}},
- {{0x2c382f5369614938, 0xdafe409ab72d6d10, 0xe8c83391b646f227, 0x45fe70f50524306c}}},
-{{{0xda4875a6960c0b8c, 0x5b68d076ef0e2f20, 0x07fb51cf3d0b8fd4, 0x428d1623a0e392d4}},
- {{0x62f24920c8951491, 0x05f007c83f630ca2, 0x6fbb45d2f5c9d4b8, 0x16619f6db57a2245}},
- {{0x084f4a4401a308fd, 0xa82219c376a5caac, 0xdeb8de4643d1bc7d, 0x1d81592d60bd38c6}}},
-{{{0xd833d7beec2a4c38, 0x2c9162830acc20ed, 0xe93a47aa92df7581, 0x702d67a3333c4a81}},
- {{0x3a4a369a2f89c8a1, 0x63137a1d7c8de80d, 0xbcac008a78eda015, 0x2cb8b3a5b483b03f}},
- {{0x36e417cbcb1b90a1, 0x33b3ddaa7f11794e, 0x3f510808885bc607, 0x24141dc0e6a8020d}}},
-{{{0x59f73c773fefee9d, 0xb3f1ef89c1cf989d, 0xe35dfb42e02e545f, 0x5766120b47a1b47c}},
- {{0x91925dccbd83157d, 0x3ca1205322cc8094, 0x28e57f183f90d6e4, 0x1a4714cede2e767b}},
- {{0xdb20ba0fb8b6b7ff, 0xb732c3b677511fa1, 0xa92b51c099f02d89, 0x4f3875ad489ca5f1}}},
-{{{0xc7fc762f4932ab22, 0x7ac0edf72f4c3c1b, 0x5f6b55aa9aa895e8, 0x3680274dad0a0081}},
- {{0x79ed13f6ee73eec0, 0xa5c6526d69110bb1, 0xe48928c38603860c, 0x722a1446fd7059f5}},
- {{0xd0959fe9a8cf8819, 0xd0a995508475a99c, 0x6eac173320b09cc5, 0x628ecf04331b1095}}},
-{{{0x98bcb118a9d0ddbc, 0xee449e3408b4802b, 0x87089226b8a6b104, 0x685f349a45c7915d}},
- {{0x9b41acf85c74ccf1, 0xb673318108265251, 0x99c92aed11adb147, 0x7a47d70d34ecb40f}},
- {{0x60a0c4cbcc43a4f5, 0x775c66ca3677bea9, 0xa17aa1752ff8f5ed, 0x11ded9020e01fdc0}}},
-{{{0x890e7809caefe704, 0x8728296de30e8c6c, 0x4c5cd2a392aeb1c9, 0x194263d15771531f}},
- {{0x471f95b03bea93b7, 0x0552d7d43313abd3, 0xbd9370e2e17e3f7b, 0x7b120f1db20e5bec}},
- {{0x17d2fb3d86502d7a, 0xb564d84450a69352, 0x7da962c8a60ed75d, 0x00d0f85b318736aa}}},
-{{{0x978b142e777c84fd, 0xf402644705a8c062, 0xa67ad51be7e612c7, 0x2f7b459698dd6a33}},
- {{0xa6753c1efd7621c1, 0x69c0b4a7445671f5, 0x971f527405b23c11, 0x387bc74851a8c7cd}},
- {{0x81894b4d4a52a9a8, 0xadd93e12f6b8832f, 0x184d8548b61bd638, 0x3f1c62dbd6c9f6cd}}},
-{{{0x2e8f1f0091910c1f, 0xa4df4fe0bff2e12c, 0x60c6560aee927438, 0x6338283facefc8fa}},
- {{0x3fad3e40148f693d, 0x052656e194eb9a72, 0x2f4dcbfd184f4e2f, 0x406f8db1c482e18b}},
- {{0x9e630d2c7f191ee4, 0x4fbf8301bc3ff670, 0x787d8e4e7afb73c4, 0x50d83d5be8f58fa5}}},
-{{{0x85683916c11a1897, 0x2d69a4efe506d008, 0x39af1378f664bd01, 0x65942131361517c6}},
- {{0xc0accf90b4d3b66d, 0xa7059de561732e60, 0x033d1f7870c6b0ba, 0x584161cd26d946e4}},
- {{0xbbf2b1a072d27ca2, 0xbf393c59fbdec704, 0xe98dbbcee262b81e, 0x02eebd0b3029b589}}},
-{{{0x61368756a60dac5f, 0x17e02f6aebabdc57, 0x7f193f2d4cce0f7d, 0x20234a7789ecdcf0}},
- {{0x8765b69f7b85c5e8, 0x6ff0678bd168bab2, 0x3a70e77c1d330f9b, 0x3a5f6d51b0af8e7c}},
- {{0x76d20db67178b252, 0x071c34f9d51ed160, 0xf62a4a20b3e41170, 0x7cd682353cffe366}}},
-{{{0x0be1a45bd887fab6, 0x2a846a32ba403b6e, 0xd9921012e96e6000, 0x2838c8863bdc0943}},
- {{0xa665cd6068acf4f3, 0x42d92d183cd7e3d3, 0x5759389d336025d9, 0x3ef0253b2b2cd8ff}},
- {{0xd16bb0cf4a465030, 0xfa496b4115c577ab, 0x82cfae8af4ab419d, 0x21dcb8a606a82812}}},
-{{{0x5c6004468c9d9fc8, 0x2540096ed42aa3cb, 0x125b4d4c12ee2f9c, 0x0bc3d08194a31dab}},
- {{0x9a8d00fabe7731ba, 0x8203607e629e1889, 0xb2cc023743f3d97f, 0x5d840dbf6c6f678b}},
- {{0x706e380d309fe18b, 0x6eb02da6b9e165c7, 0x57bbba997dae20ab, 0x3a4276232ac196dd}}},
-{{{0x4b42432c8a7084fa, 0x898a19e3dfb9e545, 0xbe9f00219c58e45d, 0x1ff177cea16debd1}},
- {{0x3bf8c172db447ecb, 0x5fcfc41fc6282dbd, 0x80acffc075aa15fe, 0x0770c9e824e1a9f9}},
- {{0xcf61d99a45b5b5fd, 0x860984e91b3a7924, 0xe7300919303e3e89, 0x39f264fd41500b1e}}},
-{{{0xa7ad3417dbe7e29c, 0xbd94376a2b9c139c, 0xa0e91b8e93597ba9, 0x1712d73468889840}},
- {{0xd19b4aabfe097be1, 0xa46dfce1dfe01929, 0xc3c908942ca6f1ff, 0x65c621272c35f14e}},
- {{0xe72b89f8ce3193dd, 0x4d103356a125c0bb, 0x0419a93d2e1cfe83, 0x22f9800ab19ce272}}},
-{{{0x605a368a3e9ef8cb, 0xe3e9c022a5504715, 0x553d48b05f24248f, 0x13f416cd647626e5}},
- {{0x42029fdd9a6efdac, 0xb912cebe34a54941, 0x640f64b987bdf37b, 0x4171a4d38598cab4}},
- {{0xfa2758aa99c94c8c, 0x23006f6fb000b807, 0xfbd291ddadda5392, 0x508214fa574bd1ab}}},
-{{{0xc20269153ed6fe4b, 0xa65a6739511d77c4, 0xcbde26462c14af94, 0x22f960ec6faba74b}},
- {{0x461a15bb53d003d6, 0xb2102888bcf3c965, 0x27c576756c683a5a, 0x3a7758a4c86cb447}},
- {{0x548111f693ae5076, 0x1dae21df1dfd54a6, 0x12248c90f3115e65, 0x5d9fd15f8de7f494}}},
-{{{0x031408d36d63727f, 0x6a379aefd7c7b533, 0xa9e18fc5ccaee24b, 0x332f35914f8fbed3}},
- {{0x3f244d2aeed7521e, 0x8e3a9028432e9615, 0xe164ba772e9c16d4, 0x3bc187fa47eb98d8}},
- {{0x6d470115ea86c20c, 0x998ab7cb6c46d125, 0xd77832b53a660188, 0x450d81ce906fba03}}},
-{{{0xf8ae4d2ad8453902, 0x7018058ee8db2d1d, 0xaab3995fc7d2c11e, 0x53b16d2324ccca79}},
- {{0x23264d66b2cae0b5, 0x7dbaed33ebca6576, 0x030ebed6f0d24ac8, 0x2a887f78f7635510}},
- {{0x2a23b9e75c012d4f, 0x0c974651cae1f2ea, 0x2fb63273675d70ca, 0x0ba7250b864403f5}}},
-{{{0xbb0d18fd029c6421, 0xbc2d142189298f02, 0x8347f8e68b250e96, 0x7b9f2fe8032d71c9}},
- {{0xdd63589386f86d9c, 0x61699176e13a85a4, 0x2e5111954eaa7d57, 0x32c21b57fb60bdfb}},
- {{0xd87823cd319e0780, 0xefc4cfc1897775c5, 0x4854fb129a0ab3f7, 0x12c49d417238c371}}},
-{{{0x0950b533ffe83769, 0x21861c1d8e1d6bd1, 0xf022d8381302e510, 0x2509200c6391cab4}},
- {{0x09b3a01783799542, 0x626dd08faad5ee3f, 0xba00bceeeb70149f, 0x1421b246a0a444c9}},
- {{0x4aa43a8e8c24a7c7, 0x04c1f540d8f05ef5, 0xadba5e0c0b3eb9dc, 0x2ab5504448a49ce3}}},
-{{{0x2ed227266f0f5dec, 0x9824ee415ed50824, 0x807bec7c9468d415, 0x7093bae1b521e23f}},
- {{0xdc07ac631c5d3afa, 0x58615171f9df8c6c, 0x72a079d89d73e2b0, 0x7301f4ceb4eae15d}},
- {{0x6409e759d6722c41, 0xa674e1cf72bf729b, 0xbc0a24eb3c21e569, 0x390167d24ebacb23}}},
-{{{0x27f58e3bba353f1c, 0x4c47764dbf6a4361, 0xafbbc4e56e562650, 0x07db2ee6aae1a45d}},
- {{0xd7bb054ba2f2120b, 0xe2b9ceaeb10589b7, 0x3fe8bac8f3c0edbe, 0x4cbd40767112cb69}},
- {{0x0b603cc029c58176, 0x5988e3825cb15d61, 0x2bb61413dcf0ad8d, 0x7b8eec6c74183287}}},
-{{{0xe4ca40782cd27cb0, 0xdaf9c323fbe967bd, 0xb29bd34a8ad41e9e, 0x72810497626ede4d}},
- {{0x32fee570fc386b73, 0xda8b0141da3a8cc7, 0x975ffd0ac8968359, 0x6ee809a1b132a855}},
- {{0x9444bb31fcfd863a, 0x2fe3690a3e4e48c5, 0xdc29c867d088fa25, 0x13bd1e38d173292e}}},
-{{{0xd32b4cd8696149b5, 0xe55937d781d8aab7, 0x0bcb2127ae122b94, 0x41e86fcfb14099b0}},
- {{0x223fb5cf1dfac521, 0x325c25316f554450, 0x030b98d7659177ac, 0x1ed018b64f88a4bd}},
- {{0x3630dfa1b802a6b0, 0x880f874742ad3bd5, 0x0af90d6ceec5a4d4, 0x746a247a37cdc5d9}}},
-{{{0xd531b8bd2b7b9af6, 0x5005093537fc5b51, 0x232fcf25c593546d, 0x20a365142bb40f49}},
- {{0x6eccd85278d941ed, 0x2254ae83d22f7843, 0xc522d02e7bbfcdb7, 0x681e3351bff0e4e2}},
- {{0x8b64b59d83034f45, 0x2f8b71f21fa20efb, 0x69249495ba6550e4, 0x539ef98e45d5472b}}},
-{{{0x6e7bb6a1a6205275, 0xaa4f21d7413c8e83, 0x6f56d155e88f5cb2, 0x2de25d4ba6345be1}},
- {{0xd074d8961cae743f, 0xf86d18f5ee1c63ed, 0x97bdc55be7f4ed29, 0x4cbad279663ab108}},
- {{0x80d19024a0d71fcd, 0xc525c20afb288af8, 0xb1a3974b5f3a6419, 0x7d7fbcefe2007233}}},
-{{{0xfaef1e6a266b2801, 0x866c68c4d5739f16, 0xf68a2fbc1b03762c, 0x5975435e87b75a8d}},
- {{0xcd7c5dc5f3c29094, 0xc781a29a2a9105ab, 0x80c61d36421c3058, 0x4f9cd196dcd8d4d7}},
- {{0x199297d86a7b3768, 0xd0d058241ad17a63, 0xba029cad5c1c0c17, 0x7ccdd084387a0307}}},
-{{{0xdca6422c6d260417, 0xae153d50948240bd, 0xa9c0c1b4fb68c677, 0x428bd0ed61d0cf53}},
- {{0x9b0c84186760cc93, 0xcdae007a1ab32a99, 0xa88dec86620bda18, 0x3593ca848190ca44}},
- {{0x9213189a5e849aa7, 0xd4d8c33565d8facd, 0x8c52545b53fdbbd1, 0x27398308da2d63e6}}},
-{{{0x42c38d28435ed413, 0xbd50f3603278ccc9, 0xbb07ab1a79da03ef, 0x269597aebe8c3355}},
- {{0xb9a10e4c0a702453, 0x0fa25866d57d1bde, 0xffb9d9b5cd27daf7, 0x572c2945492c33fd}},
- {{0xc77fc745d6cd30be, 0xe4dfe8d3e3baaefb, 0xa22c8830aa5dda0c, 0x7f985498c05bca80}}},
-{{{0x3849ce889f0be117, 0x8005ad1b7b54a288, 0x3da3c39f23fc921c, 0x76c2ec470a31f304}},
- {{0xd35615520fbf6363, 0x08045a45cf4dfba6, 0xeec24fbc873fa0c2, 0x30f2653cd69b12e7}},
- {{0x8a08c938aac10c85, 0x46179b60db276bcb, 0xa920c01e0e6fac70, 0x2f1273f1596473da}}},
-{{{0x4739fc7c8ae01e11, 0xfd5274904a6aab9f, 0x41d98a8287728f2e, 0x5d9e572ad85b69f2}},
- {{0x30488bd755a70bc0, 0x06d6b5a4f1d442e7, 0xead1a69ebc596162, 0x38ac1997edc5f784}},
- {{0x0666b517a751b13b, 0x747d06867e9b858c, 0xacacc011454dde49, 0x22dfcd9cbfe9e69c}}},
-{{{0x8ddbd2e0c30d0cd9, 0xad8e665facbb4333, 0x8f6b258c322a961f, 0x6b2916c05448c1c7}},
- {{0x56ec59b4103be0a1, 0x2ee3baecd259f969, 0x797cb29413f5cd32, 0x0fe9877824cde472}},
- {{0x7edb34d10aba913b, 0x4ea3cd822e6dac0e, 0x66083dff6578f815, 0x4c303f307ff00a17}}},
-{{{0xd30a3bd617b28c85, 0xc5d377b739773bea, 0xc6c6e78c1e6a5cbf, 0x0d61b8f78b2ab7c4}},
- {{0x29fc03580dd94500, 0xecd27aa46fbbec93, 0x130a155fc2e2a7f8, 0x416b151ab706a1d5}},
- {{0x56a8d7efe9c136b0, 0xbd07e5cd58e44b20, 0xafe62fda1b57e0ab, 0x191a2af74277e8d2}}},
-{{{0xd550095bab6f4985, 0x04f4cd5b4fbfaf1a, 0x9d8e2ed12a0c7540, 0x2bc24e04b2212286}},
- {{0x09d4b60b2fe09a14, 0xc384f0afdbb1747e, 0x58e2ea8978b5fd6e, 0x519ef577b5e09b0a}},
- {{0x1863d7d91124cca9, 0x7ac08145b88a708e, 0x2bcd7309857031f5, 0x62337a6e8ab8fae5}}},
-{{{0x4bcef17f06ffca16, 0xde06e1db692ae16a, 0x0753702d614f42b0, 0x5f6041b45b9212d0}},
- {{0xd1ab324e1b3a1273, 0x18947cf181055340, 0x3b5d9567a98c196e, 0x7fa00425802e1e68}},
- {{0x7d531574028c2705, 0x80317d69db0d75fe, 0x30fface8ef8c8ddd, 0x7e9de97bb6c3e998}}},
-{{{0x1558967b9e6585a3, 0x97c99ce098e98b92, 0x10af149b6eb3adad, 0x42181fe8f4d38cfa}},
- {{0xf004be62a24d40dd, 0xba0659910452d41f, 0x81c45ee162a44234, 0x4cb829d8a22266ef}},
- {{0x1dbcaa8407b86681, 0x081f001e8b26753b, 0x3cd7ce6a84048e81, 0x78af11633f25f22c}}},
-{{{0x8416ebd40b50babc, 0x1508722628208bee, 0xa3148fafb9c1c36d, 0x0d07daacd32d7d5d}},
- {{0x3241c00e7d65318c, 0xe6bee5dcd0e86de7, 0x118b2dc2fbc08c26, 0x680d04a7fc603dc3}},
- {{0xf9c2414a695aa3eb, 0xdaa42c4c05a68f21, 0x7c6c23987f93963e, 0x210e8cd30c3954e3}}},
-{{{0xac4201f210a71c06, 0x6a65e0aef3bfb021, 0xbc42c35c393632f7, 0x56ea8db1865f0742}},
- {{0x2b50f16137fe6c26, 0xe102bcd856e404d8, 0x12b0f1414c561f6b, 0x51b17bc8d028ec91}},
- {{0xfff5fb4bcf535119, 0xf4989d79df1108a0, 0xbdfcea659a3ba325, 0x18a11f1174d1a6f2}}},
-{{{0x407375ab3f6bba29, 0x9ec3b6d8991e482e, 0x99c80e82e55f92e9, 0x307c13b6fb0c0ae1}},
- {{0xfbd63cdad27a5f2c, 0xf00fc4bc8aa106d7, 0x53fb5c1a8e64a430, 0x04eaabe50c1a2e85}},
- {{0x24751021cb8ab5e7, 0xfc2344495c5010eb, 0x5f1e717b4e5610a1, 0x44da5f18c2710cd5}}},
-{{{0x033cc55ff1b82eb5, 0xb15ae36d411cae52, 0xba40b6198ffbacd3, 0x768edce1532e861f}},
- {{0x9156fe6b89d8eacc, 0xe6b79451e23126a1, 0xbd7463d93944eb4e, 0x726373f6767203ae}},
- {{0xe305ca72eb7ef68a, 0x662cf31f70eadb23, 0x18f026fdb4c45b68, 0x513b5384b5d2ecbd}}},
-{{{0x46d46280c729989e, 0x4b93fbd05368a5dd, 0x63df3f81d1765a89, 0x34cebd64b9a0a223}},
- {{0x5e2702878af34ceb, 0x900b0409b946d6ae, 0x6512ebf7dabd8512, 0x61d9b76988258f81}},
- {{0xa6c5a71349b7d94b, 0xa3f3d15823eb9446, 0x0416fbd277484834, 0x69d45e6f2c70812f}}},
-{{{0xce16f74bc53c1431, 0x2b9725ce2072edde, 0xb8b9c36fb5b23ee7, 0x7e2e0e450b5cc908}},
- {{0x9fe62b434f460efb, 0xded303d4a63607d6, 0xf052210eb7a0da24, 0x237e7dbe00545b93}},
- {{0x013575ed6701b430, 0x231094e69f0bfd10, 0x75320f1583e47f22, 0x71afa699b11155e3}}},
-{{{0x65ce6f9b3953b61d, 0xc65839eaafa141e6, 0x0f435ffda9f759fe, 0x021142e9c2b1c28e}},
- {{0xea423c1c473b50d6, 0x51e87a1f3b38ef10, 0x9b84bf5fb2c9be95, 0x00731fbc78f89a1c}},
- {{0xe430c71848f81880, 0xbf960c225ecec119, 0xb6dae0836bba15e3, 0x4c4d6f3347e15808}}},
-{{{0x18f7eccfc17d1fc9, 0x6c75f5a651403c14, 0xdbde712bf7ee0cdf, 0x193fddaaa7e47a22}},
- {{0x2f0cddfc988f1970, 0x6b916227b0b9f51b, 0x6ec7b6c4779176be, 0x38bf9500a88f9fa8}},
- {{0x1fd2c93c37e8876f, 0xa2f61e5a18d1462c, 0x5080f58239241276, 0x6a6fb99ebf0d4969}}},
-{{{0x6a46c1bb560855eb, 0x2416bb38f893f09d, 0xd71d11378f71acc1, 0x75f76914a31896ea}},
- {{0xeeb122b5b6e423c6, 0x939d7010f286ff8e, 0x90a92a831dcf5d8c, 0x136fda9f42c5eb10}},
- {{0xf94cdfb1a305bdd1, 0x0f364b9d9ff82c08, 0x2a87d8a5c3bb588a, 0x022183510be8dcba}}},
-{{{0x4af766385ead2d14, 0xa08ed880ca7c5830, 0x0d13a6e610211e3d, 0x6a071ce17b806c03}},
- {{0x9d5a710143307a7f, 0xb063de9ec47da45f, 0x22bbfe52be927ad3, 0x1387c441fd40426c}},
- {{0xb5d3c3d187978af8, 0x722b5a3d7f0e4413, 0x0d7b4848bb477ca0, 0x3171b26aaf1edc92}}},
-{{{0xa92f319097564ca8, 0xff7bb84c2275e119, 0x4f55fe37a4875150, 0x221fd4873cf0835a}},
- {{0xa60db7d8b28a47d1, 0xa6bf14d61770a4f1, 0xd4a1f89353ddbd58, 0x6c514a63344243e9}},
- {{0x2322204f3a156341, 0xfb73e0e9ba0a032d, 0xfce0dd4c410f030e, 0x48daa596fb924aaa}}},
-{{{0x6eca8e665ca59cc7, 0xa847254b2e38aca0, 0x31afc708d21e17ce, 0x676dd6fccad84af7}},
- {{0x14f61d5dc84c9793, 0x9941f9e3ef418206, 0xcdf5b88f346277ac, 0x58c837fa0e8a79a9}},
- {{0x0cf9688596fc9058, 0x1ddcbbf37b56a01b, 0xdcc2e77d4935d66a, 0x1c4f73f2c6a57f0a}}},
-{{{0x0e7a4fbd305fa0bb, 0x829d4ce054c663ad, 0xf421c3832fe33848, 0x795ac80d1bf64c42}},
- {{0xb36e706efc7c3484, 0x73dfc9b4c3c1cf61, 0xeb1d79c9781cc7e5, 0x70459adb7daf675c}},
- {{0x1b91db4991b42bb3, 0x572696234b02dcca, 0x9fdf9ee51f8c78dc, 0x5fe162848ce21fd3}}},
-{{{0xe2790aae4d077c41, 0x8b938270db7469a3, 0x6eb632dc8abd16a2, 0x720814ecaa064b72}},
- {{0x315c29c795115389, 0xd7e0e507862f74ce, 0x0c4a762185927432, 0x72de6c984a25a1e4}},
- {{0xae9ab553bf6aa310, 0x050a50a9806d6e1b, 0x92bb7403adff5139, 0x0394d27645be618b}}},
-{{{0x4d572251857eedf4, 0xe3724edde19e93c5, 0x8a71420e0b797035, 0x3b3c833687abe743}},
- {{0xf5396425b23545a4, 0x15a7a27e98fbb296, 0xab6c52bc636fdd86, 0x79d995a8419334ee}},
- {{0xcd8a8ea61195dd75, 0xa504d8a81dd9a82f, 0x540dca81a35879b6, 0x60dd16a379c86a8a}}},
-{{{0x35a2c8487381e559, 0x596ffea6d78082cb, 0xcb9771ebdba7b653, 0x5a08b5019b4da685}},
- {{0x3501d6f8153e47b8, 0xb7a9675414a2f60c, 0x112ee8b6455d9523, 0x4e62a3c18112ea8a}},
- {{0xc8d4ac04516ab786, 0x595af3215295b23d, 0xd6edd234db0230c1, 0x0929efe8825b41cc}}},
-{{{0x5f0601d1cbd0f2d3, 0x736e412f6132bb7f, 0x83604432238dde87, 0x1e3a5272f5c0753c}},
- {{0x8b3172b7ad56651d, 0x01581b7a3fabd717, 0x2dc94df6424df6e4, 0x30376e5d2c29284f}},
- {{0xd2918da78159a59c, 0x6bdc1cd93f0713f3, 0x565f7a934acd6590, 0x53daacec4cb4c128}}},
-{{{0x4ca73bd79cc8a7d6, 0x4d4a738f47e9a9b2, 0xf4cbf12942f5fe00, 0x01a13ff9bdbf0752}},
- {{0x99852bc3852cfdb0, 0x2cc12e9559d6ed0b, 0x70f9e2bf9b5ac27b, 0x4f3b8c117959ae99}},
- {{0x55b6c9c82ff26412, 0x1ac4a8c91fb667a8, 0xd527bfcfeb778bf2, 0x303337da7012a3be}}},
-{{{0x955422228c1c9d7c, 0x01fac1371a9b340f, 0x7e8d9177925b48d7, 0x53f8ad5661b3e31b}},
- {{0x976d3ccbfad2fdd1, 0xcb88839737a640a8, 0x2ff00c1d6734cb25, 0x269ff4dc789c2d2b}},
- {{0x0c003fbdc08d678d, 0x4d982fa37ead2b17, 0xc07e6bcdb2e582f1, 0x296c7291df412a44}}},
-{{{0x7903de2b33daf397, 0xd0ff0619c9a624b3, 0x8a1d252b555b3e18, 0x2b6d581c52e0b7c0}},
- {{0xdfb23205dab8b59e, 0x465aeaa0c8092250, 0xd133c1189a725d18, 0x2327370261f117d1}},
- {{0x3d0543d3623e7986, 0x679414c2c278a354, 0xae43f0cc726196f6, 0x7836c41f8245eaba}}},
-{{{0xe7a254db49e95a81, 0x5192d5d008b0ad73, 0x4d20e5b1d00afc07, 0x5d55f8012cf25f38}},
- {{0xca651e848011937c, 0xc6b0c46e6ef41a28, 0xb7021ba75f3f8d52, 0x119dff99ead7b9fd}},
- {{0x43eadfcbf4b31d4d, 0xc6503f7411148892, 0xfeee68c5060d3b17, 0x329293b3dd4a0ac8}}},
-{{{0x4e59214fe194961a, 0x49be7dc70d71cd4f, 0x9300cfd23b50f22d, 0x4789d446fc917232}},
- {{0x2879852d5d7cb208, 0xb8dedd70687df2e7, 0xdc0bffab21687891, 0x2b44c043677daa35}},
- {{0x1a1c87ab074eb78e, 0xfac6d18e99daf467, 0x3eacbbcd484f9067, 0x60c52eef2bb9a4e4}}},
-{{{0x0b5d89bc3bfd8bf1, 0xb06b9237c9f3551a, 0x0e4c16b0d53028f5, 0x10bc9c312ccfcaab}},
- {{0x702bc5c27cae6d11, 0x44c7699b54a48cab, 0xefbc4056ba492eb2, 0x70d77248d9b6676d}},
- {{0xaa8ae84b3ec2a05b, 0x98699ef4ed1781e0, 0x794513e4708e85d1, 0x63755bd3a976f413}}},
-{{{0xb55fa03e2ad10853, 0x356f75909ee63569, 0x9ff9f1fdbe69b890, 0x0d8cc1c48bc16f84}},
- {{0x3dc7101897f1acb7, 0x5dda7d5ec165bbd8, 0x508e5b9c0fa1020f, 0x2763751737c52a56}},
- {{0x029402d36eb419a9, 0xf0b44e7e77b460a5, 0xcfa86230d43c4956, 0x70c2dd8a7ad166e7}}},
-{{{0x656194509f6fec0e, 0xee2e7ea946c6518d, 0x9733c1f367e09b5c, 0x2e0fac6363948495}},
- {{0x91d4967db8ed7e13, 0x74252f0ad776817a, 0xe40982e00d852564, 0x32b8613816a53ce5}},
- {{0x79e7f7bee448cd64, 0x6ac83a67087886d0, 0xf89fd4d9a0e4db2e, 0x4179215c735a4f41}}},
-{{{0x8c7094e7d7dced2a, 0x97fb8ac347d39c70, 0xe13be033a906d902, 0x700344a30cd99d76}},
- {{0xe4ae33b9286bcd34, 0xb7ef7eb6559dd6dc, 0x278b141fb3d38e1f, 0x31fa85662241c286}},
- {{0xaf826c422e3622f4, 0xc12029879833502d, 0x9bc1b7e12b389123, 0x24bb2312a9952489}}},
-{{{0xb1a8ed1732de67c3, 0x3cb49418461b4948, 0x8ebd434376cfbcd2, 0x0fee3e871e188008}},
- {{0x41f80c2af5f85c6b, 0x687284c304fa6794, 0x8945df99a3ba1bad, 0x0d1d2af9ffeb5d16}},
- {{0xa9da8aa132621edf, 0x30b822a159226579, 0x4004197ba79ac193, 0x16acd79718531d76}}},
-{{{0x72df72af2d9b1d3d, 0x63462a36a432245a, 0x3ecea07916b39637, 0x123e0ef6b9302309}},
- {{0xc959c6c57887b6ad, 0x94e19ead5f90feba, 0x16e24e62a342f504, 0x164ed34b18161700}},
- {{0x487ed94c192fe69a, 0x61ae2cea3a911513, 0x877bf6d3b9a4de27, 0x78da0fc61073f3eb}}},
-{{{0x5bf15d28e52bc66a, 0x2c47e31870f01a8e, 0x2419afbc06c28bdd, 0x2d25deeb256b173a}},
- {{0xa29f80f1680c3a94, 0x71f77e151ae9e7e6, 0x1100f15848017973, 0x054aa4b316b38ddd}},
- {{0xdfc8468d19267cb8, 0x0b28789c66e54daf, 0x2aeb1d2a666eec17, 0x134610a6ab7da760}}},
-{{{0xcaf55ec27c59b23f, 0x99aeed3e154d04f2, 0x68441d72e14141f4, 0x140345133932a0a2}},
- {{0xd91430e0dc028c3c, 0x0eb955a85217c771, 0x4b09e1ed2c99a1fa, 0x42881af2bd6a743c}},
- {{0x7bfec69aab5cad3d, 0xc23e8cd34cb2cfad, 0x685dd14bfb37d6a2, 0x0ad6d64415677a18}}},
-{{{0x781a439e417becb5, 0x4ac5938cd10e0266, 0x5da385110692ac24, 0x11b065a2ade31233}},
- {{0x7914892847927e9f, 0x33dad6ef370aa877, 0x1f8f24fa11122703, 0x5265ac2f2adf9592}},
- {{0x405fdd309afcb346, 0xd9723d4428e63f54, 0x94c01df05f65aaae, 0x43e4dc3ae14c0809}}},
-{{{0xbc12c7f1a938a517, 0x473028ab3180b2e1, 0x3f78571efbcd254a, 0x74e534426ff6f90f}},
- {{0xea6f7ac3adc2c6a3, 0xd0e928f6e9717c94, 0xe2d379ead645eaf5, 0x46dd8785c51ffbbe}},
- {{0x709801be375c8898, 0x4b06dab5e3fd8348, 0x75880ced27230714, 0x2b09468fdd2f4c42}}},
-{{{0x97c749eeb701cb96, 0x83f438d4b6a369c3, 0x62962b8b9a402cd9, 0x6976c7509888df7b}},
- {{0x5b97946582ffa02a, 0xda096a51fea8f549, 0xa06351375f77af9b, 0x1bcfde61201d1e76}},
- {{0x4a4a5490246a59a2, 0xd63ebddee87fdd90, 0xd9437c670d2371fa, 0x69e87308d30f8ed6}}},
-{{{0x435a8bb15656beb0, 0xf8fac9ba4f4d5bca, 0xb9b278c41548c075, 0x3eb0ef76e892b622}},
- {{0x0f80bf028bc80303, 0x6aae16b37a18cefb, 0xdd47ea47d72cd6a3, 0x61943588f4ed39aa}},
- {{0xd26e5c3e91039f85, 0xc0e9e77df6f33aa9, 0xe8968c5570066a93, 0x3c34d1881faaaddd}}},
-{{{0x3f9d2b5ea09f9ec0, 0x1dab3b6fb623a890, 0xa09ba3ea72d926c4, 0x374193513fd8b36d}},
- {{0xbd5b0b8f2fffe0d9, 0x6aa254103ed24fb9, 0x2ac7d7bcb26821c4, 0x605b394b60dca36a}},
- {{0xb4e856e45a9d1ed2, 0xefe848766c97a9a2, 0xb104cf641e5eee7d, 0x2f50b81c88a71c8f}}},
-{{{0x31723c61fc6811bb, 0x9cb450486211800f, 0x768933d347995753, 0x3491a53502752fcd}},
- {{0x2b552ca0a7da522a, 0x3230b336449b0250, 0xf2c4c5bca4b99fb9, 0x7b2c674958074a22}},
- {{0xd55165883ed28cdf, 0x12d84fd2d362de39, 0x0a874ad3e3378e4f, 0x000d2b1f7c763e74}}},
-{{{0x3d420811d06d4a67, 0xbefc048590e0ffe3, 0xf870c6b7bd487bde, 0x6e2a7316319afa28}},
- {{0x9624778c3e94a8ab, 0x0ad6f3cee9a78bec, 0x948ac7810d743c4f, 0x76627935aaecfccc}},
- {{0x56a8ac24d6d59a9f, 0xc8db753e3096f006, 0x477f41e68f4c5299, 0x588d851cf6c86114}}},
-{{{0x51138ec78df6b0fe, 0x5397da89e575f51b, 0x09207a1d717af1b9, 0x2102fdba2b20d650}},
- {{0xcd2a65e777d1f515, 0x548991878faa60f1, 0xb1b73bbcdabc06e5, 0x654878cba97cc9fb}},
- {{0x969ee405055ce6a1, 0x36bca7681251ad29, 0x3a1af517aa7da415, 0x0ad725db29ecb2ba}}},
-{{{0xdc4267b1834e2457, 0xb67544b570ce1bc5, 0x1af07a0bf7d15ed7, 0x4aefcffb71a03650}},
- {{0xfec7bc0c9b056f85, 0x537d5268e7f5ffd7, 0x77afc6624312aefa, 0x4f675f5302399fd9}},
- {{0xc32d36360415171e, 0xcd2bef118998483b, 0x870a6eadd0945110, 0x0bccbb72a2a86561}}},
-{{{0x185e962feab1a9c8, 0x86e7e63565147dcd, 0xb092e031bb5b6df2, 0x4024f0ab59d6b73e}},
- {{0x186d5e4c50fe1296, 0xe0397b82fee89f7e, 0x3bc7f6c5507031b0, 0x6678fd69108f37c2}},
- {{0x1586fa31636863c2, 0x07f68c48572d33f2, 0x4f73cc9f789eaefc, 0x2d42e2108ead4701}}},
-{{{0x97f5131594dfd29b, 0x6155985d313f4c6a, 0xeba13f0708455010, 0x676b2608b8d2d322}},
- {{0x21717b0d0f537593, 0x914e690b131e064c, 0x1bb687ae752ae09f, 0x420bf3a79b423c6e}},
- {{0x8138ba651c5b2b47, 0x8671b6ec311b1b80, 0x7bff0cb1bc3135b0, 0x745d2ffa9c0cf1e0}}},
-{{{0xbf525a1e2bc9c8bd, 0xea5b260826479d81, 0xd511c70edf0155db, 0x1ae23ceb960cf5d0}},
- {{0x6036df5721d34e6a, 0xb1db8827997bb3d0, 0xd3c209c3c8756afa, 0x06e15be54c1dc839}},
- {{0x5b725d871932994a, 0x32351cb5ceb1dab0, 0x7dc41549dab7ca05, 0x58ded861278ec1f7}}},
-{{{0xd8173793f266c55c, 0xc8c976c5cc454e49, 0x5ce382f8bc26c3a8, 0x2ff39de85485f6f9}},
- {{0x2dfb5ba8b6c2c9a8, 0x48eeef8ef52c598c, 0x33809107f12d1573, 0x08ba696b531d5bd8}},
- {{0x77ed3eeec3efc57a, 0x04e05517d4ff4811, 0xea3d7a3ff1a671cb, 0x120633b4947cfe54}}},
-{{{0x0b94987891610042, 0x4ee7b13cecebfae8, 0x70be739594f0a4c0, 0x35d30a99b4d59185}},
- {{0x82bd31474912100a, 0xde237b6d7e6fbe06, 0xe11e761911ea79c6, 0x07433be3cb393bde}},
- {{0xff7944c05ce997f4, 0x575d3de4b05c51a3, 0x583381fd5a76847c, 0x2d873ede7af6da9f}}},
-{{{0x157a316443373409, 0xfab8b7eef4aa81d9, 0xb093fee6f5a64806, 0x2e773654707fa7b6}},
- {{0xaa6202e14e5df981, 0xa20d59175015e1f5, 0x18a275d3bae21d6c, 0x0543618a01600253}},
- {{0x0deabdf4974c23c1, 0xaa6f0a259dce4693, 0x04202cb8a29aba2c, 0x4b1443362d07960d}}},
-{{{0x47b837f753242cec, 0x256dc48cc04212f2, 0xe222fbfbe1d928c5, 0x48ea295bad8a2c07}},
- {{0x299b1c3f57c5715e, 0x96cb929e6b686d90, 0x3004806447235ab3, 0x2c435c24a44d9fe1}},
- {{0x0607c97c80f8833f, 0x0e851578ca25ec5b, 0x54f7450b161ebb6f, 0x7bcb4792a0def80e}}},
-{{{0x8487e3d02bc73659, 0x4baf8445059979df, 0xd17c975adcad6fbf, 0x57369f0bdefc96b6}},
- {{0x1cecd0a0045224c2, 0x757f1b1b69e53952, 0x775b7a925289f681, 0x1b6cc62016736148}},
- {{0xf1a9990175638698, 0x353dd1beeeaa60d3, 0x849471334c9ba488, 0x63fa6e6843ade311}}},
-{{{0xd15c20536597c168, 0x9f73740098d28789, 0x18aee7f13257ba1f, 0x3418bfda07346f14}},
- {{0x2195becdd24b5eb7, 0x5e41f18cc0cd44f9, 0xdf28074441ca9ede, 0x07073b98f35b7d67}},
- {{0xd03c676c4ce530d4, 0x0b64c0473b5df9f4, 0x065cef8b19b3a31e, 0x3084d661533102c9}}},
-{{{0xe1f6b79ebf8469ad, 0x15801004e2663135, 0x9a498330af74181b, 0x3ba2504f049b673c}},
- {{0x9a6ce876760321fd, 0x7fe2b5109eb63ad8, 0x00e7d4ae8ac80592, 0x73d86b7abb6f723a}},
- {{0x0b52b5606dba5ab6, 0xa9134f0fbbb1edab, 0x30a9520d9b04a635, 0x6813b8f37973e5db}}},
-{{{0x9854b054334127c1, 0x105d047882fbff25, 0xdb49f7f944186f4f, 0x1768e838bed0b900}},
- {{0xf194ca56f3157e29, 0x136d35705ef528a5, 0xdd4cef778b0599bc, 0x7d5472af24f833ed}},
- {{0xd0ef874daf33da47, 0x00d3be5db6e339f9, 0x3f2a8a2f9c9ceece, 0x5d1aeb792352435a}}},
-{{{0xf59e6bb319cd63ca, 0x670c159221d06839, 0xb06d565b2150cab6, 0x20fb199d104f12a3}},
- {{0x12c7bfaeb61ba775, 0xb84e621fe263bffd, 0x0b47a5c35c840dcf, 0x7e83be0bccaf8634}},
- {{0x61943dee6d99c120, 0x86101f2e460b9fe0, 0x6bb2f1518ee8598d, 0x76b76289fcc475cc}}},
-{{{0x791b4cc1756286fa, 0xdbced317d74a157c, 0x7e732421ea72bde6, 0x01fe18491131c8e9}},
- {{0x4245f1a1522ec0b3, 0x558785b22a75656d, 0x1d485a2548a1b3c0, 0x60959eccd58fe09f}},
- {{0x3ebfeb7ba8ed7a09, 0x49fdc2bbe502789c, 0x44ebce5d3c119428, 0x35e1eb55be947f4a}}},
-{{{0xdbdae701c5738dd3, 0xf9c6f635b26f1bee, 0x61e96a8042f15ef4, 0x3aa1d11faf60a4d8}},
- {{0x14fd6dfa726ccc74, 0x3b084cfe2f53b965, 0xf33ae4f552a2c8b4, 0x59aab07a0d40166a}},
- {{0x77bcec4c925eac25, 0x1848718460137738, 0x5b374337fea9f451, 0x1865e78ec8e6aa46}}},
-{{{0xccc4b7c7b66e1f7a, 0x44157e25f50c2f7e, 0x3ef06dfc713eaf1c, 0x582f446752da63f7}},
- {{0x967c54e91c529ccb, 0x30f6269264c635fb, 0x2747aff478121965, 0x17038418eaf66f5c}},
- {{0xc6317bd320324ce4, 0xa81042e8a4488bc4, 0xb21ef18b4e5a1364, 0x0c2a1c4bcda28dc9}}},
-{{{0xd24dc7d06f1f0447, 0xb2269e3edb87c059, 0xd15b0272fbb2d28f, 0x7c558bd1c6f64877}},
- {{0xedc4814869bd6945, 0x0d6d907dbe1c8d22, 0xc63bd212d55cc5ab, 0x5a6a9b30a314dc83}},
- {{0xd0ec1524d396463d, 0x12bb628ac35a24f0, 0xa50c3a791cbc5fa4, 0x0404a5ca0afbafc3}}},
-{{{0x8c1f40070aa743d6, 0xccbad0cb5b265ee8, 0x574b046b668fd2de, 0x46395bfdcadd9633}},
- {{0x62bc9e1b2a416fd1, 0xb5c6f728e350598b, 0x04343fd83d5d6967, 0x39527516e7f8ee98}},
- {{0x117fdb2d1a5d9a9c, 0x9c7745bcd1005c2a, 0xefd4bef154d56fea, 0x76579a29e822d016}}},
-{{{0x45b68e7e49c02a17, 0x23cd51a2bca9a37f, 0x3ed65f11ec224c1b, 0x43a384dc9e05bdb1}},
- {{0x333cb51352b434f2, 0xd832284993de80e1, 0xb5512887750d35ce, 0x02c514bb2a2777c1}},
- {{0x684bd5da8bf1b645, 0xfb8bd37ef6b54b53, 0x313916d7a9b0d253, 0x1160920961548059}}},
-{{{0xb44d166929dacfaa, 0xda529f4c8413598f, 0xe9ef63ca453d5559, 0x351e125bc5698e0b}},
- {{0x7a385616369b4dcd, 0x75c02ca7655c3563, 0x7dc21bf9d4f18021, 0x2f637d7491e6e042}},
- {{0xd4b49b461af67bbe, 0xd603037ac8ab8961, 0x71dee19ff9a699fb, 0x7f182d06e7ce2a9a}}},
-{{{0x7a7c8e64ab0168ec, 0xcb5a4a5515edc543, 0x095519d347cd0eda, 0x67d4ac8c343e93b0}},
- {{0x09454b728e217522, 0xaa58e8f4d484b8d8, 0xd358254d7f46903c, 0x44acc043241c5217}},
- {{0x1c7d6bbb4f7a5777, 0x8b35fed4918313e1, 0x4adca1c6c96b4684, 0x556d1c8312ad71bd}}},
-{{{0x17ef40e30c8d3982, 0x31f7073e15a3fa34, 0x4f21f3cb0773646e, 0x746c6c6d1d824eff}},
- {{0x81f06756b11be821, 0x0faff82310a3f3dd, 0xf8b2d0556a99465d, 0x097abe38cc8c7f05}},
- {{0x0c49c9877ea52da4, 0x4c4369559bdc1d43, 0x022c3809f7ccebd2, 0x577e14a34bee84bd}}},
-{{{0xf0e268ac61a73b0a, 0xf2fafa103791a5f5, 0xc1e13e826b6d00e9, 0x60fa7ee96fd78f42}},
- {{0x94fecebebd4dd72b, 0xf46a4fda060f2211, 0x124a5977c0c8d1ff, 0x705304b8fb009295}},
- {{0xb63d1d354d296ec6, 0xf3c3053e5fad31d8, 0x670b958cb4bd42ec, 0x21398e0ca16353fd}}},
-{{{0x216ab2ca8da7d2ef, 0x366ad9dd99f42827, 0xae64b9004fdd3c75, 0x403a395b53909e62}},
- {{0x86c5fc16861b7e9a, 0xf6a330476a27c451, 0x01667267a1e93597, 0x05ffb9cd6082dfeb}},
- {{0xa617fa9ff53f6139, 0x60f2b5e513e66cb6, 0xd7a8beefb3448aa4, 0x7a2932856f5ea192}}},
-{{{0x0b39d761b02de888, 0x5f550e7ed2414e1f, 0xa6bfa45822e1a940, 0x050a2f7dfd447b99}},
- {{0xb89c444879639302, 0x4ae4f19350c67f2c, 0xf0b35da8c81af9c6, 0x39d0003546871017}},
- {{0x437c3b33a650db77, 0x6bafe81dbac52bb2, 0xfe99402d2db7d318, 0x2b5b7eec372ba6ce}}},
-{{{0xb3bc4bbd83f50eef, 0x508f0c998c927866, 0x43e76587c8b7e66e, 0x0f7655a3a47f98d9}},
- {{0xa694404d613ac8f4, 0x500c3c2bfa97e72c, 0x874104d21fcec210, 0x1b205fb38604a8ee}},
- {{0x55ecad37d24b133c, 0x441e147d6038c90b, 0x656683a1d62c6fee, 0x0157d5dc87e0ecae}}},
-{{{0xf2a7af510354c13d, 0xd7a0b145aa372b60, 0x2869b96a05a3d470, 0x6528e42d82460173}},
- {{0x95265514d71eb524, 0xe603d8815df14593, 0x147cdf410d4de6b7, 0x5293b1730437c850}},
- {{0x23d0e0814bccf226, 0x92c745cd8196fb93, 0x8b61796c59541e5b, 0x40a44df0c021f978}}},
-{{{0xdaa869894f20ea6a, 0xea14a3d14c620618, 0x6001fccb090bf8be, 0x35f4e822947e9cf0}},
- {{0x86c96e514bc5d095, 0xf20d4098fca6804a, 0x27363d89c826ea5d, 0x39ca36565719cacf}},
- {{0x97506f2f6f87b75c, 0xc624aea0034ae070, 0x1ec856e3aad34dd6, 0x055b0be0e440e58f}}},
-{{{0x6469a17d89735d12, 0xdb6f27d5e662b9f1, 0x9fcba3286a395681, 0x363b8004d269af25}},
- {{0x4d12a04b6ea33da2, 0x57cf4c15e36126dd, 0x90ec9675ee44d967, 0x64ca348d2a985aac}},
- {{0x99588e19e4c4912d, 0xefcc3b4e1ca5ce6b, 0x4522ea60fa5b98d5, 0x7064bbab1de4a819}}},
-{{{0xb919e1515a770641, 0xa9a2e2c74e7f8039, 0x7527250b3df23109, 0x756a7330ac27b78b}},
- {{0xa290c06142542129, 0xf2e2c2aebe8d5b90, 0xcf2458db76abfe1b, 0x02157ade83d626bf}},
- {{0x3e46972a1b9a038b, 0x2e4ee66a7ee03fb4, 0x81a248776edbb4ca, 0x1a944ee88ecd0563}}},
-{{{0xd5a91d1151039372, 0x2ed377b799ca26de, 0xa17202acfd366b6b, 0x0730291bd6901995}},
- {{0xbb40a859182362d6, 0xb99f55778a4d1abb, 0x8d18b427758559f6, 0x26c20fe74d26235a}},
- {{0x648d1d9fe9cc22f5, 0x66bc561928dd577c, 0x47d3ed21652439d1, 0x49d271acedaf8b49}}},
-{{{0x89f5058a382b33f3, 0x5ae2ba0bad48c0b4, 0x8f93b503a53db36e, 0x5aa3ed9d95a232e6}},
- {{0x2798aaf9b4b75601, 0x5eac72135c8dad72, 0xd2ceaa6161b7a023, 0x1bbfb284e98f7d4e}},
- {{0x656777e9c7d96561, 0xcb2b125472c78036, 0x65053299d9506eee, 0x4a07e14e5e8957cc}}},
-{{{0x4ee412cb980df999, 0xa315d76f3c6ec771, 0xbba5edde925c77fd, 0x3f0bac391d313402}},
- {{0x240b58cdc477a49b, 0xfd38dade6447f017, 0x19928d32a7c86aad, 0x50af7aed84afa081}},
- {{0x6e4fde0115f65be5, 0x29982621216109b2, 0x780205810badd6d9, 0x1921a316baebd006}}},
-{{{0x89422f7edfb870fc, 0x2c296beb4f76b3bd, 0x0738f1d436c24df7, 0x6458df41e273aeb0}},
- {{0xd75aad9ad9f3c18b, 0x566a0eef60b1c19c, 0x3e9a0bac255c0ed9, 0x7b049deca062c7f5}},
- {{0xdccbe37a35444483, 0x758879330fedbe93, 0x786004c312c5dd87, 0x6093dccbc2950e64}}},
-{{{0x1ff39a8585e0706d, 0x36d0a5d8b3e73933, 0x43b9f2e1718f453b, 0x57d1ea084827a97c}},
- {{0x6bdeeebe6084034b, 0x3199c2b6780fb854, 0x973376abb62d0695, 0x6e3180c98b647d90}},
- {{0xee7ab6e7a128b071, 0xa4c1596d93a88baa, 0xf7b4de82b2216130, 0x363e999ddd97bd18}}},
-{{{0x96a843c135ee1fc4, 0x976eb35508e4c8cf, 0xb42f6801b58cd330, 0x48ee9b78693a052b}},
- {{0x2f1848dce24baec6, 0x769b7255babcaf60, 0x90cb3c6e3cefe931, 0x231f979bc6f9b355}},
- {{0x5c31de4bcc2af3c6, 0xb04bb030fe208d1f, 0xb78d7009c14fb466, 0x079bfa9b08792413}}},
-{{{0xe3903a51da300df4, 0x843964233da95ab0, 0xed3cf12d0b356480, 0x038c77f684817194}},
- {{0xf3c9ed80a2d54245, 0x0aa08b7877f63952, 0xd76dac63d1085475, 0x1ef4fb159470636b}},
- {{0x854e5ee65b167bec, 0x59590a4296d0cdc2, 0x72b2df3498102199, 0x575ee92a4a0bff56}}},
-{{{0xd4c080908a182fcf, 0x30e170c299489dbd, 0x05babd5752f733de, 0x43d4e7112cd3fd00}},
- {{0x5d46bc450aa4d801, 0xc3af1227a533b9d8, 0x389e3b262b8906c2, 0x200a1e7e382f581b}},
- {{0x518db967eaf93ac5, 0x71bc989b056652c0, 0xfe2b85d9567197f5, 0x050eca52651e4e38}}},
-{{{0xc3431ade453f0c9c, 0xe9f5045eff703b9b, 0xfcd97ac9ed847b3d, 0x4b0ee6c21c58f4c6}},
- {{0x97ac397660e668ea, 0x9b19bbfe153ab497, 0x4cb179b534eca79f, 0x6151c09fa131ae57}},
- {{0x3af55c0dfdf05d96, 0xdd262ee02ab4ee7a, 0x11b2bb8712171709, 0x1fef24fa800f030b}}},
-{{{0xb496123a6b6c6609, 0xa750fe8580ab5938, 0xf471bf39b7c27a5f, 0x507903ce77ac193c}},
- {{0xff91a66a90166220, 0xf22552ae5bf1e009, 0x7dff85d87f90df7c, 0x4f620ffe0c736fb9}},
- {{0x62f90d65dfde3e34, 0xcf28c592b9fa5fad, 0x99c86ef9c6164510, 0x25d448044a256c84}}},
-{{{0xbd68230ec7e9b16f, 0x0eb1b9c1c1c5795d, 0x7943c8c495b6b1ff, 0x2f9faf620bbacf5e}},
- {{0x2c7c4415c9022b55, 0x56a0d241812eb1fe, 0xf02ea1c9d7b65e0d, 0x4180512fd5323b26}},
- {{0xa4ff3e698a48a5db, 0xba6a3806bd95403b, 0x9f7ce1af47d5b65d, 0x15e087e55939d2fb}}},
-{{{0x12207543745c1496, 0xdaff3cfdda38610c, 0xe4e797272c71c34f, 0x39c07b1934bdede9}},
- {{0x8894186efb963f38, 0x48a00e80dc639bd5, 0xa4e8092be96c1c99, 0x5a097d54ca573661}},
- {{0x2d45892b17c9e755, 0xd033fd7289308df8, 0x6c2fe9d9525b8bd9, 0x2edbecf1c11cc079}}},
-{{{0x1616a4e3c715a0d2, 0x53623cb0f8341d4d, 0x96ef5329c7e899cb, 0x3d4e8dbba668baa6}},
- {{0xee0f0fddd087a25f, 0x9c7531555c3e34ee, 0x660c572e8fab3ab5, 0x0854fc44544cd3b2}},
- {{0x61eba0c555edad19, 0x24b533fef0a83de6, 0x3b77042883baa5f8, 0x678f82b898a47e8d}}},
-{{{0xb1491d0bd6900c54, 0x3539722c9d132636, 0x4db928920b362bc9, 0x4d7cd1fea68b69df}},
- {{0x1e09d94057775696, 0xeed1265c3cd951db, 0xfa9dac2b20bce16f, 0x0f7f76e0e8d089f4}},
- {{0x36d9ebc5d485b00c, 0xa2596492e4adb365, 0xc1659480c2119ccd, 0x45306349186e0d5f}}},
-{{{0x94ddd0c1a6cdff1d, 0x55f6f115e84213ae, 0x6c935f85992fcf6a, 0x067ee0f54a37f16f}},
- {{0x96a414ec2b072491, 0x1bb2218127a7b65b, 0x6d2849596e8a4af0, 0x65f3b08ccd27765f}},
- {{0xecb29fff199801f7, 0x9d361d1fa2a0f72f, 0x25f11d2375fd2f49, 0x124cefe80fe10fe2}}},
-{{{0x4c126cf9d18df255, 0xc1d471e9147a63b6, 0x2c6d3c73f3c93b5f, 0x6be3a6a2e3ff86a2}},
- {{0x1518e85b31b16489, 0x8faadcb7db710bfb, 0x39b0bdf4a14ae239, 0x05f4cbea503d20c1}},
- {{0xce040e9ec04145bc, 0xc71ff4e208f6834c, 0xbd546e8dab8847a3, 0x64666aa0a4d2aba5}}},
-{{{0x6841435a7c06d912, 0xca123c21bb3f830b, 0xd4b37b27b1cbe278, 0x1d753b84c76f5046}},
- {{0xb0c53bf73337e94c, 0x7cb5697e11e14f15, 0x4b84abac1930c750, 0x28dd4abfe0640468}},
- {{0x7dc0b64c44cb9f44, 0x18a3e1ace3925dbf, 0x7a3034862d0457c4, 0x4c498bf78a0c892e}}},
-{{{0x37d653fb1aa73196, 0x0f9495303fd76418, 0xad200b09fb3a17b2, 0x544d49292fc8613e}},
- {{0x22d2aff530976b86, 0x8d90b806c2d24604, 0xdca1896c4de5bae5, 0x28005fe6c8340c17}},
- {{0x6aefba9f34528688, 0x5c1bff9425107da1, 0xf75bbbcd66d94b36, 0x72e472930f316dfa}}},
-{{{0x2695208c9781084f, 0xb1502a0b23450ee1, 0xfd9daea603efde02, 0x5a9d2e8c2733a34c}},
- {{0x07f3f635d32a7627, 0x7aaa4d865f6566f0, 0x3c85e79728d04450, 0x1fee7f000fe06438}},
- {{0x765305da03dbf7e5, 0xa4daf2491434cdbd, 0x7b4ad5cdd24a88ec, 0x00f94051ee040543}}},
-{{{0x8d356b23c3d330b2, 0xf21c8b9bb0471b06, 0xb36c316c6e42b83c, 0x07d79c7e8beab10d}},
- {{0xd7ef93bb07af9753, 0x583ed0cf3db766a7, 0xce6998bf6e0b1ec5, 0x47b7ffd25dd40452}},
- {{0x87fbfb9cbc08dd12, 0x8a066b3ae1eec29b, 0x0d57242bdb1fc1bf, 0x1c3520a35ea64bb6}}},
-{{{0x80d253a6bccba34a, 0x3e61c3a13838219b, 0x90c3b6019882e396, 0x1c3d05775d0ee66f}},
- {{0xcda86f40216bc059, 0x1fbb231d12bcd87e, 0xb4956a9e17c70990, 0x38750c3b66d12e55}},
- {{0x692ef1409422e51a, 0xcbc0c73c2b5df671, 0x21014fe7744ce029, 0x0621e2c7d330487c}}},
-{{{0xaf9860cc8259838d, 0x90ea48c1c69f9adc, 0x6526483765581e30, 0x0007d6097bd3a5bc}},
- {{0xb7ae1796b0dbf0f3, 0x54dfafb9e17ce196, 0x25923071e9aaa3b4, 0x5d8e589ca1002e9d}},
- {{0xc0bf1d950842a94b, 0xb2d3c363588f2e3e, 0x0a961438bb51e2ef, 0x1583d7783c1cbf86}}},
-{{{0xeceea2ef5da27ae1, 0x597c3a1455670174, 0xc9a62a126609167a, 0x252a5f2e81ed8f70}},
- {{0x90034704cc9d28c7, 0x1d1b679ef72cc58f, 0x16e12b5fbe5b8726, 0x4958064e83c5580a}},
- {{0x0d2894265066e80d, 0xfcc3f785307c8c6b, 0x1b53da780c1112fd, 0x079c170bd843b388}}},
-{{{0x0506ece464fa6fff, 0xbee3431e6205e523, 0x3579422451b8ea42, 0x6dec05e34ac9fb00}},
- {{0xcdd6cd50c0d5d056, 0x9af7686dbb03573b, 0x3ca6723ff3c3ef48, 0x6768c0d7317b8acc}},
- {{0x94b625e5f155c1b3, 0x417bf3a7997b7b91, 0xc22cbddc6d6b2600, 0x51445e14ddcd52f4}}},
-{{{0x57502b4b3b144951, 0x8e67ff6b444bbcb3, 0xb8bd6927166385db, 0x13186f31e39295c8}},
- {{0x893147ab2bbea455, 0x8c53a24f92079129, 0x4b49f948be30f7a7, 0x12e990086e4fd43d}},
- {{0xf10c96b37fdfbb2e, 0x9f9a935e121ceaf9, 0xdf1136c43a5b983f, 0x77b2e3f05d3e99af}}},
-{{{0xfd0d75879cf12657, 0xe82fef94e53a0e29, 0xcc34a7f05bbb4be7, 0x0b251172a50c38a2}},
- {{0x9532f48fcc5cd29b, 0x2ba851bea3ce3671, 0x32dacaa051122941, 0x478d99d9350004f2}},
- {{0x1d5ad94890bb02c0, 0x50e208b10ec25115, 0xa26a22894ef21702, 0x4dc923343b524805}}},
-{{{0xe3828c400f8086b6, 0x3f77e6f7979f0dc8, 0x7ef6de304df42cb4, 0x5265797cb6abd784}},
- {{0x3ad3e3ebf36c4975, 0xd75d25a537862125, 0xe873943da025a516, 0x6bbc7cb4c411c847}},
- {{0x3c6f9cd1d4a50d56, 0xb6244077c6feab7e, 0x6ff9bf483580972e, 0x00375883b332acfb}}},
-{{{0x0001b2cd28cb0940, 0x63fb51a06f1c24c9, 0xb5ad8691dcd5ca31, 0x67238dbd8c450660}},
- {{0xc98bec856c75c99c, 0xe44184c000e33cf4, 0x0a676b9bba907634, 0x669e2cb571f379d7}},
- {{0xcb116b73a49bd308, 0x025aad6b2392729e, 0xb4793efa3f55d9b1, 0x72a1056140678bb9}}},
-{{{0xa2b6812b1cc9249d, 0x62866eee21211f58, 0x2cb5c5b85df10ece, 0x03a6b259e263ae00}},
- {{0x0d8d2909e2e505b6, 0x98ca78abc0291230, 0x77ef5569a9b12327, 0x7c77897b81439b47}},
- {{0xf1c1b5e2de331cb5, 0x5a9f5d8e15fca420, 0x9fa438f17bd932b1, 0x2a381bf01c6146e7}}},
-{{{0xac9b9879cfc811c1, 0x8b7d29813756e567, 0x50da4e607c70edfc, 0x5dbca62f884400b6}},
- {{0xf7c0be32b534166f, 0x27e6ca6419cf70d4, 0x934df7d7a957a759, 0x5701461dabdec2aa}},
- {{0x2c6747402c915c25, 0x1bdcd1a80b0d340a, 0x5e5601bd07b43f5f, 0x2555b4e05539a242}}},
-{{{0x6fc09f5266ddd216, 0xdce560a7c8e37048, 0xec65939da2df62fd, 0x7a869ae7e52ed192}},
- {{0x78409b1d87e463d4, 0xad4da95acdfb639d, 0xec28773755259b9c, 0x69c806e9c31230ab}},
- {{0x7b48f57414bb3f22, 0x68c7cee4aedccc88, 0xed2f936179ed80be, 0x25d70b885f77bc4b}}},
-{{{0x4151c3d9762bf4de, 0x083f435f2745d82b, 0x29775a2e0d23ddd5, 0x138e3a6269a5db24}},
- {{0x98459d29bb1ae4d4, 0x56b9c4c739f954ec, 0x832743f6c29b4b3e, 0x21ea8e2798b6878a}},
- {{0x87bef4b46a5a7b9c, 0xd2299d1b5fc1d062, 0x82409818dd321648, 0x5c5abeb1e5a2e03d}}},
-{{{0x14722af4b73c2ddb, 0xbc470c5f5a05060d, 0x00943eac2581b02e, 0x0e434b3b1f499c8f}},
- {{0x02cde6de1306a233, 0x7b5a52a2116f8ec7, 0xe1c681f4c1163b5b, 0x241d350660d32643}},
- {{0x6be4404d0ebc52c7, 0xae46233bb1a791f5, 0x2aec170ed25db42b, 0x1d8dfd966645d694}}},
-{{{0x296fa9c59c2ec4de, 0xbc8b61bf4f84f3cb, 0x1c7706d917a8f908, 0x63b795fc7ad3255d}},
- {{0xd598639c12ddb0a4, 0xa5d19f30c024866b, 0xd17c2f0358fce460, 0x07a195152e095e8a}},
- {{0xa8368f02389e5fc8, 0x90433b02cf8de43b, 0xafa1fd5dc5412643, 0x3e8fe83d032f0137}}},
-{{{0x2f8b15b90570a294, 0x94f2427067084549, 0xde1c5ae161bbfd84, 0x75ba3b797fac4007}},
- {{0x08704c8de8efd13c, 0xdfc51a8e33e03731, 0xa59d5da51260cde3, 0x22d60899a6258c86}},
- {{0x6239dbc070cdd196, 0x60fe8a8b6c7d8a9a, 0xb38847bceb401260, 0x0904d07b87779e5e}}},
-{{{0xb4ce1fd4ddba919c, 0xcf31db3ec74c8daa, 0x2c63cc63ad86cc51, 0x43e2143fbc1dde07}},
- {{0xf4322d6648f940b9, 0x06952f0cbd2d0c39, 0x167697ada081f931, 0x6240aacebaf72a6c}},
- {{0xf834749c5ba295a0, 0xd6947c5bca37d25a, 0x66f13ba7e7c9316a, 0x56bdaf238db40cac}}},
-{{{0x362ab9e3f53533eb, 0x338568d56eb93d40, 0x9e0e14521d5a5572, 0x1d24a86d83741318}},
- {{0x1310d36cc19d3bb2, 0x062a6bb7622386b9, 0x7c9b8591d7a14f5c, 0x03aa31507e1e5754}},
- {{0xf4ec7648ffd4ce1f, 0xe045eaf054ac8c1c, 0x88d225821d09357c, 0x43b261dc9aeb4859}}},
-{{{0xe55b1e1988bb79bb, 0xa09ed07dc17a359d, 0xb02c2ee2603dea33, 0x326055cf5b276bc2}},
- {{0x19513d8b6c951364, 0x94fe7126000bf47b, 0x028d10ddd54f9567, 0x02b4d5e242940964}},
- {{0xb4a155cb28d18df2, 0xeacc4646186ce508, 0xc49cf4936c824389, 0x27a6c809ae5d3410}}},
-{{{0x8ba6ebcd1f0db188, 0x37d3d73a675a5be8, 0xf22edfa315f5585a, 0x2cb67174ff60a17e}},
- {{0xcd2c270ac43d6954, 0xdd4a3e576a66cab2, 0x79fa592469d7036c, 0x221503603d8c2599}},
- {{0x59eecdf9390be1d0, 0xa9422044728ce3f1, 0x82891c667a94f0f4, 0x7b1df4b73890f436}}},
-{{{0xe492f2e0b3b2a224, 0x7c6c9e062b551160, 0x15eb8fe20d7f7b0e, 0x61fcef2658fc5992}},
- {{0x5f2e221807f8f58c, 0xe3555c9fd49409d4, 0xb2aaa88d1fb6a630, 0x68698245d352e03d}},
- {{0xdbb15d852a18187a, 0xf3e4aad386ddacd7, 0x44bae2810ff6c482, 0x46cf4c473daf01cf}}},
-{{{0x426525ed9ec4e5f9, 0x0e5eda0116903303, 0x72b1a7f2cbe5cadc, 0x29387bcd14eb5f40}},
- {{0x213c6ea7f1498140, 0x7c1e7ef8392b4854, 0x2488c38c5629ceba, 0x1065aae50d8cc5bb}},
- {{0x1c2c4525df200d57, 0x5c3b2dd6bfca674a, 0x0a07e7b1e1834030, 0x69a198e64f1ce716}}},
-{{{0x7afcd613efa9d697, 0x0cc45aa41c067959, 0xa56fe104c1fada96, 0x3a73b70472e40365}},
- {{0x7b26e56b9e2d4734, 0xc4c7132b81c61675, 0xef5c9525ec9cde7f, 0x39c80b16e71743ad}},
- {{0x0f196e0d1b826c68, 0xf71ff0e24960e3db, 0x6113167023b7436c, 0x0cf0ea5877da7282}}},
-{{{0x196c80a4ddd4ccbd, 0x22e6f55d95f2dd9d, 0xc75e33c740d6c71b, 0x7bb51279cb3c042f}},
- {{0xe332ced43ba6945a, 0xde0b1361e881c05d, 0x1ad40f095e67ed3b, 0x5da8acdab8c63d5d}},
- {{0xc4b6664a3a70159f, 0x76194f0f0a904e14, 0xa5614c39a4096c13, 0x6cd0ff50979feced}}},
-{{{0xc0e067e78f4428ac, 0x14835ab0a61135e3, 0xf21d14f338062935, 0x6390a4c8df04849c}},
- {{0x7fecfabdb04ba18e, 0xd0fc7bfc3bddbcf7, 0xa41d486e057a131c, 0x641a4391f2223a61}},
- {{0xc5c6b95aa606a8db, 0x914b7f9eb06825f1, 0x2a731f6b44fc9eff, 0x30ddf38562705cfc}}},
-{{{0x4e3dcbdad1bff7f9, 0xc9118e8220645717, 0xbacccebc0f189d56, 0x1b4822e9d4467668}},
- {{0x33bef2bd68bcd52c, 0xc649dbb069482ef2, 0xb5b6ee0c41cb1aee, 0x5c294d270212a7e5}},
- {{0xab360a7f25563781, 0x2512228a480f7958, 0xc75d05276114b4e3, 0x222d9625d976fe2a}}},
-{{{0x1c717f85b372ace1, 0x81930e694638bf18, 0x239cad056bc08b58, 0x0b34271c87f8fff4}},
- {{0x0f94be7e0a344f85, 0xeb2faa8c87f22c38, 0x9ce1e75e4ee16f0f, 0x43e64e5418a08dea}},
- {{0x8155e2521a35ce63, 0xbe100d4df912028e, 0xbff80bf8a57ddcec, 0x57342dc96d6bc6e4}}},
-{{{0xefeef065c8ce5998, 0xbf029510b5cbeaa2, 0x8c64a10620b7c458, 0x35134fb231c24855}},
- {{0xf3c3bcb71e707bf6, 0x351d9b8c7291a762, 0x00502e6edad69a33, 0x522f521f1ec8807f}},
- {{0x272c1f46f9a3902b, 0xc91ba3b799657bcc, 0xae614b304f8a1c0e, 0x7afcaad70b99017b}}},
-{{{0xc25ded54a4b8be41, 0x902d13e11bb0e2dd, 0x41f43233cde82ab2, 0x1085faa5c3aae7cb}},
- {{0xa88141ecef842b6b, 0x55e7b14797abe6c5, 0x8c748f9703784ffe, 0x5b50a1f7afcd00b7}},
- {{0x9b840f66f1361315, 0x18462242701003e9, 0x65ed45fae4a25080, 0x0a2862393fda7320}}},
-{{{0x46ab13c8347cbc9d, 0x3849e8d499c12383, 0x4cea314087d64ac9, 0x1f354134b1a29ee7}},
- {{0x960e737b6ecb9d17, 0xfaf24948d67ceae1, 0x37e7a9b4d55e1b89, 0x5cb7173cb46c59eb}},
- {{0x4a89e68b82b7abf0, 0xf41cd9279ba6b7b9, 0x16e6c210e18d876f, 0x7cacdb0f7f1b09c6}}},
-{{{0x9062b2e0d91a78bc, 0x47c9889cc8509667, 0x9df54a66405070b8, 0x7369e6a92493a1bf}},
- {{0xe1014434dcc5caed, 0x47ed5d963c84fb33, 0x70019576ed86a0e7, 0x25b2697bd267f9e4}},
- {{0x9d673ffb13986864, 0x3ca5fbd9415dc7b8, 0xe04ecc3bdf273b5e, 0x1420683db54e4cd2}}},
-{{{0xb478bd1e249dd197, 0x620c35005e58c102, 0xfb02d32fccbaac5c, 0x60b63bebf508a72d}},
- {{0x34eebb6fc1cc5ad0, 0x6a1b0ce99646ac8b, 0xd3b0da49a66bde53, 0x31e83b4161d081c1}},
- {{0x97e8c7129e062b4f, 0x49e48f4f29320ad8, 0x5bece14b6f18683f, 0x55cf1eb62d550317}}},
-{{{0x5879101065c23d58, 0x8b9d086d5094819c, 0xe2402fa912c55fa7, 0x669a6564570891d4}},
- {{0x3076b5e37df58c52, 0xd73ab9dde799cc36, 0xbd831ce34913ee20, 0x1a56fbaa62ba0133}},
- {{0x943e6b505c9dc9ec, 0x302557bba77c371a, 0x9873ae5641347651, 0x13c4836799c58a5c}}},
-{{{0x423a5d465ab3e1b9, 0xfc13c187c7f13f61, 0x19f83664ecb5b9b6, 0x66f80c93a637b607}},
- {{0xc4dcfb6a5d8bd080, 0xdeebc4ec571a4842, 0xd4b2e883b8e55365, 0x50bdc87dc8e5b827}},
- {{0x606d37836edfe111, 0x32353e15f011abd9, 0x64b03ac325b73b96, 0x1dd56444725fd5ae}}},
-{{{0x8fa47ff83362127d, 0xbc9f6ac471cd7c15, 0x6e71454349220c8b, 0x0e645912219f732e}},
- {{0xc297e60008bac89a, 0x7d4cea11eae1c3e0, 0xf3e38be19fe7977c, 0x3a3a450f63a305cd}},
- {{0x078f2f31d8394627, 0x389d3183de94a510, 0xd1e36c6d17996f80, 0x318c8d9393a9a87b}}},
-{{{0xf2745d032afffe19, 0x0c9f3c497f24db66, 0xbc98d3e3ba8598ef, 0x224c7c679a1d5314}},
- {{0x5d669e29ab1dd398, 0xfc921658342d9e3b, 0x55851dfdf35973cd, 0x509a41c325950af6}},
- {{0xbdc06edca6f925e9, 0x793ef3f4641b1f33, 0x82ec12809d833e89, 0x05bff02328a11389}}},
-{{{0x3632137023cae00b, 0x544acf0ad1accf59, 0x96741049d21a1c88, 0x780b8cc3fa2a44a7}},
- {{0x6881a0dd0dc512e4, 0x4fe70dc844a5fafe, 0x1f748e6b8f4a5240, 0x576277cdee01a3ea}},
- {{0x1ef38abc234f305f, 0x9a577fbd1405de08, 0x5e82a51434e62a0d, 0x5ff418726271b7a1}}},
-{{{0x398e080c1789db9d, 0xa7602025f3e778f5, 0xfa98894c06bd035d, 0x106a03dc25a966be}},
- {{0xe5db47e813b69540, 0xf35d2a3b432610e1, 0xac1f26e938781276, 0x29d4db8ca0a0cb69}},
- {{0xd9ad0aaf333353d0, 0x38669da5acd309e5, 0x3c57658ac888f7f0, 0x4ab38a51052cbefa}}},
-{{{0xdfdacbee4324c0e9, 0x054442883f955bb7, 0xdef7aaa8ea31609f, 0x68aee70642287cff}},
- {{0xf68fe2e8809de054, 0xe3bc096a9c82bad1, 0x076353d40aadbf45, 0x7b9b1fb5dea1959e}},
- {{0xf01cc8f17471cc0c, 0x95242e37579082bb, 0x27776093d3e46b5f, 0x2d13d55a28bd85fb}}},
-{{{0xfac5d2065b35b8da, 0xa8da8a9a85624bb7, 0xccd2ca913d21cd0f, 0x6b8341ee8bf90d58}},
- {{0xbf019cce7aee7a52, 0xa8ded2b6e454ead3, 0x3c619f0b87a8bb19, 0x3619b5d7560916d8}},
- {{0x3579f26b0282c4b2, 0x64d592f24fafefae, 0xb7cded7b28c8c7c0, 0x6a927b6b7173a8d7}}},
-{{{0x1f6db24f986e4656, 0x1021c02ed1e9105b, 0xf8ff3fff2cc0a375, 0x1d2a6bf8c6c82592}},
- {{0x8d7040863ece88eb, 0xf0e307a980eec08c, 0xac2250610d788fda, 0x056d92a43a0d478d}},
- {{0x1b05a196fc3da5a1, 0x77d7a8c243b59ed0, 0x06da3d6297d17918, 0x66fbb494f12353f7}}},
-{{{0x751a50b9d85c0fb8, 0xd1afdc258bcf097b, 0x2f16a6a38309a969, 0x14ddff9ee5b00659}},
- {{0xd6d70996f12309d6, 0xdbfb2385e9c3d539, 0x46d602b0f7552411, 0x270a0b0557843e0c}},
- {{0x61ff0640a7862bcc, 0x81cac09a5f11abfe, 0x9047830455d12abb, 0x19a4bde1945ae873}}},
-{{{0x9b9f26f520a6200a, 0x64804443cf13eaf8, 0x8a63673f8631edd3, 0x72bbbce11ed39dc1}},
- {{0x40c709dec076c49f, 0x657bfaf27f3e53f6, 0x40662331eca042c4, 0x14b375487eb4df04}},
- {{0xae853c94ab66dc47, 0xeb62343edf762d6e, 0xf08e0e186fb2f7d1, 0x4f0b1c02700ab37a}}},
-{{{0xe1706787d81951fa, 0xa10a2c8eb290c77b, 0xe7382fa03ed66773, 0x0a4d84710bcc4b54}},
- {{0x79fd21ccc1b2e23f, 0x4ae7c281453df52a, 0xc8172ec9d151486b, 0x68abe9443e0a7534}},
- {{0xda12c6c407831dcb, 0x0da230d74d5c510d, 0x4ab1531e6bd404e1, 0x4106b166bcf440ef}}},
-{{{0x02e57a421cd23668, 0x4ad9fb5d0eaef6fd, 0x954e6727b1244480, 0x7f792f9d2699f331}},
- {{0xa485ccd539e4ecf2, 0x5aa3f3ad0555bab5, 0x145e3439937df82d, 0x1238b51e1214283f}},
- {{0x0b886b925fd4d924, 0x60906f7a3626a80d, 0xecd367b4b98abd12, 0x2876beb1def344cf}}},
-{{{0xdc84e93563144691, 0x632fe8a0d61f23f4, 0x4caa800612a9a8d5, 0x48f9dbfa0e9918d3}},
- {{0xd594b3333a8a85f8, 0x4ea37689e78d7d58, 0x73bf9f455e8e351f, 0x5507d7d2bc41ebb4}},
- {{0x1ceb2903299572fc, 0x7c8ccaa29502d0ee, 0x91bfa43411cce67b, 0x5784481964a831e7}}},
-{{{0xda7c2b256768d593, 0x98c1c0574422ca13, 0xf1a80bd5ca0ace1d, 0x29cdd1adc088a690}},
- {{0xd6cfd1ef5fddc09c, 0xe82b3efdf7575dce, 0x25d56b5d201634c2, 0x3041c6bb04ed2b9b}},
- {{0x0ff2f2f9d956e148, 0xade797759f356b2e, 0x1a4698bb5f6c025c, 0x104bbd6814049a7b}}},
-{{{0x51f0fd3168f1ed67, 0x2c811dcdd86f3bc2, 0x44dc5c4304d2f2de, 0x5be8cc57092a7149}},
- {{0xa95d9a5fd67ff163, 0xe92be69d4cc75681, 0xb7f8024cde20f257, 0x204f2a20fb072df5}},
- {{0xc8143b3d30ebb079, 0x7589155abd652e30, 0x653c3c318f6d5c31, 0x2570fb17c279161f}}},
-{{{0x3efa367f2cb61575, 0xf5f96f761cd6026c, 0xe8c7142a65b52562, 0x3dcb65ea53030acd}},
- {{0x192ea9550bb8245a, 0xc8e6fba88f9050d1, 0x7986ea2d88a4c935, 0x241c5f91de018668}},
- {{0x28d8172940de6caa, 0x8fbf2cf022d9733a, 0x16d7fcdd235b01d1, 0x08420edd5fcdf0e5}}},
-{{{0xcdff20ab8362fa4a, 0x57e118d4e21a3e6e, 0xe3179617fc39e62b, 0x0d9a53efbc1769fd}},
- {{0x0358c34e04f410ce, 0xb6135b5a276e0685, 0x5d9670c7ebb91521, 0x04d654f321db889c}},
- {{0x5e7dc116ddbdb5d5, 0x2954deb68da5dd2d, 0x1cb608173334a292, 0x4a7a4f2618991ad7}}},
-{{{0xf4a718025fb15f95, 0x3df65f346b5c1b8f, 0xcdfcf08500e01112, 0x11b50c4cddd31848}},
- {{0x24c3b291af372a4b, 0x93da8270718147f2, 0xdd84856486899ef2, 0x4a96314223e0ee33}},
- {{0xa6e8274408a4ffd6, 0x738e177e9c1576d9, 0x773348b63d02b3f2, 0x4f4bce4dce6bcc51}}},
-{{{0xa71fce5ae2242584, 0x26ea725692f58a9e, 0xd21a09d71cea3cf4, 0x73fcdd14b71c01e6}},
- {{0x30e2616ec49d0b6f, 0xe456718fcaec2317, 0x48eb409bf26b4fa6, 0x3042cee561595f37}},
- {{0x427e7079449bac41, 0x855ae36dbce2310a, 0x4cae76215f841a7c, 0x389e740c9a9ce1d6}}},
-{{{0x64fcb3ae34dcb9ce, 0x97500323e348d0ad, 0x45b3f07d62c6381b, 0x61545379465a6788}},
- {{0xc9bd78f6570eac28, 0xe55b0b3227919ce1, 0x65fc3eaba19b91ed, 0x25c425e5d6263690}},
- {{0x3f3e06a6f1d7de6e, 0x3ef976278e062308, 0x8c14f6264e8a6c77, 0x6539a08915484759}}},
-{{{0xe9d21f74c3d2f773, 0xc150544125c46845, 0x624e5ce8f9b99e33, 0x11c5e4aac5cd186c}},
- {{0xddc4dbd414bb4a19, 0x19b2bc3c98424f8e, 0x48a89fd736ca7169, 0x0f65320ef019bd90}},
- {{0xd486d1b1cafde0c6, 0x4f3fe6e3163b5181, 0x59a8af0dfaf2939a, 0x4cabc7bdec33072a}}},
-{{{0x16faa8fb532f7428, 0xdbd42ea046a4e272, 0x5337653b8b9ea480, 0x4065947223973f03}},
- {{0xf7c0a19c1a54a044, 0x4a1c5e2477bd9fbb, 0xa6e3ca115af22972, 0x1819bb953f2e9e0d}},
- {{0x498fbb795e042e84, 0x7d0dd89a7698b714, 0x8bfb0ba427fe6295, 0x36ba82e721200524}}},
-{{{0xd60ecbb74245ec41, 0xfd9be89e34348716, 0xc9240afee42284de, 0x4472f648d0531db4}},
- {{0xc8d69d0a57274ed5, 0x45ba803260804b17, 0xdf3cda102255dfac, 0x77d221232709b339}},
- {{0x498a6d7064ad94d8, 0xa5b5c8fd9af62263, 0x8ca8ed0545c141f4, 0x2c63bec3662d358c}}},
-{{{0x7fe60d8bea787955, 0xb9dc117eb5f401b7, 0x91c7c09a19355cce, 0x22692ef59442bedf}},
- {{0x9a518b3a8586f8bf, 0x9ee71af6cbb196f0, 0xaa0625e6a2385cf2, 0x1deb2176ddd7c8d1}},
- {{0x8563d19a2066cf6c, 0x401bfd8c4dcc7cd7, 0xd976a6becd0d8f62, 0x67cfd773a278b05e}}},
-{{{0x8dec31faef3ee475, 0x99dbff8a9e22fd92, 0x512d11594e26cab1, 0x0cde561eec4310b9}},
- {{0x2d5fa9855a4e586a, 0x65f8f7a449beab7e, 0xaa074dddf21d33d3, 0x185cba721bcb9dee}},
- {{0x93869da3f4e3cb41, 0xbf0392f540f7977e, 0x026204fcd0463b83, 0x3ec91a769eec6eed}}},
-{{{0x1e9df75bf78166ad, 0x4dfda838eb0cd7af, 0xba002ed8c1eaf988, 0x13fedb3e11f33cfc}},
- {{0x0fad2fb7b0a3402f, 0x46615ecbfb69f4a8, 0xf745bcc8c5f8eaa6, 0x7a5fa8794a94e896}},
- {{0x52958faa13cd67a1, 0x965ee0818bdbb517, 0x16e58daa2e8845b3, 0x357d397d5499da8f}}},
-{{{0x1ebfa05fb0bace6c, 0xc934620c1caf9a1e, 0xcc771cc41d82b61a, 0x2d94a16aa5f74fec}},
- {{0x481dacb4194bfbf8, 0x4d77e3f1bae58299, 0x1ef4612e7d1372a0, 0x3a8d867e70ff69e1}},
- {{0x6f58cd5d55aff958, 0xba3eaa5c75567721, 0x75c123999165227d, 0x69be1343c2f2b35e}}},
-{{{0x0e091d5ee197c92a, 0x4f51019f2945119f, 0x143679b9f034e99c, 0x7d88112e4d24c696}},
- {{0x82bbbdac684b8de3, 0xa2f4c7d03fca0718, 0x337f92fbe096aaa8, 0x200d4d8c63587376}},
- {{0x208aed4b4893b32b, 0x3efbf23ebe59b964, 0xd762deb0dba5e507, 0x69607bd681bd9d94}}},
-{{{0xf6be021068de1ce1, 0xe8d518e70edcbc1f, 0xe3effdd01b5505a5, 0x35f63353d3ec3fd0}},
- {{0x3b7f3bd49323a902, 0x7c21b5566b2c6e53, 0xe5ba8ff53a7852a7, 0x28bc77a5838ece00}},
- {{0x63ba78a8e25d8036, 0x63651e0094333490, 0x48d82f20288ce532, 0x3a31abfa36b57524}}},
-{{{0x239e9624089c0a2e, 0xc748c4c03afe4738, 0x17dbed2a764fa12a, 0x639b93f0321c8582}},
- {{0xc08f788f3f78d289, 0xfe30a72ca1404d9f, 0xf2778bfccf65cc9d, 0x7ee498165acb2021}},
- {{0x7bd508e39111a1c3, 0x2b2b90d480907489, 0xe7d2aec2ae72fd19, 0x0edf493c85b602a6}}},
-{{{0xaecc8158599b5a68, 0xea574f0febade20e, 0x4fe41d7422b67f07, 0x403b92e3019d4fb4}},
- {{0x6767c4d284764113, 0xa090403ff7f5f835, 0x1c8fcffacae6bede, 0x04c00c54d1dfa369}},
- {{0x4dc22f818b465cf8, 0x71a0f35a1480eff8, 0xaee8bfad04c7d657, 0x355bb12ab26176f4}}},
-{{{0xa71e64cc7493bbf4, 0xe5bd84d9eca3b0c3, 0x0a6bc50cfa05e785, 0x0f9b8132182ec312}},
- {{0xa301dac75a8c7318, 0xed90039db3ceaa11, 0x6f077cbf3bae3f2d, 0x7518eaf8e052ad8e}},
- {{0xa48859c41b7f6c32, 0x0f2d60bcf4383298, 0x1815a929c9b1d1d9, 0x47c3871bbb1755c4}}},
-{{{0x5144539771ec4f48, 0xf805b17dc98c5d6e, 0xf762c11a47c3c66b, 0x00b89b85764699dc}},
- {{0xfbe65d50c85066b0, 0x62ecc4b0b3a299b0, 0xe53754ea441ae8e0, 0x08fea02ce8d48d5f}},
- {{0x824ddd7668deead0, 0xc86445204b685d23, 0xb514cfcd5d89d665, 0x473829a74f75d537}}},
-{{{0x82d2da754679c418, 0xe63bd7d8b2618df0, 0x355eef24ac47eb0a, 0x2078684c4833c6b4}},
- {{0x23d9533aad3902c9, 0x64c2ddceef03588f, 0x15257390cfe12fb4, 0x6c668b4d44e4d390}},
- {{0x3b48cf217a78820c, 0xf76a0ab281273e97, 0xa96c65a78c8eed7b, 0x7411a6054f8a433f}}},
-{{{0x4d659d32b99dc86d, 0x044cdc75603af115, 0xb34c712cdcc2e488, 0x7c136574fb8134ff}},
- {{0x579ae53d18b175b4, 0x68713159f392a102, 0x8455ecba1eef35f5, 0x1ec9a872458c398f}},
- {{0xb8e6a4d400a2509b, 0x9b81d7020bc882b4, 0x57e7cc9bf1957561, 0x3add88a5c7cd6460}}},
-{{{0xab895770b635dcf2, 0x02dfef6cf66c1fbc, 0x85530268beb6d187, 0x249929fccc879e74}},
- {{0x85c298d459393046, 0x8f7e35985ff659ec, 0x1d2ca22af2f66e3a, 0x61ba1131a406a720}},
- {{0xa3d0a0f116959029, 0x023b6b6cba7ebd89, 0x7bf15a3e26783307, 0x5620310cbbd8ece7}}},
-{{{0x528993434934d643, 0xb9dbf806a51222f5, 0x8f6d878fc3f41c22, 0x37676a2a4d9d9730}},
- {{0x6646b5f477e285d6, 0x40e8ff676c8f6193, 0xa6ec7311abb594dd, 0x7ec846f3658cec4d}},
- {{0x9b5e8f3f1da22ec7, 0x130f1d776c01cd13, 0x214c8fcfa2989fb8, 0x6daaf723399b9dd5}}},
-{{{0x591e4a5610628564, 0x2a4bb87ca8b4df34, 0xde2a2572e7a38e43, 0x3cbdabd9fee5046e}},
- {{0x81aebbdd2cd13070, 0x962e4325f85a0e9e, 0xde9391aacadffecb, 0x53177fda52c230e6}},
- {{0xa7bc970650b9de79, 0x3d12a7fbc301b59b, 0x02652e68d36ae38c, 0x79d739835a6199dc}}},
-{{{0xd9354df64131c1bd, 0x758094a186ec5822, 0x4464ee12e459f3c2, 0x6c11fce4cb133282}},
- {{0x21c9d9920d591737, 0x9bea41d2e9b46cd6, 0xe20e84200d89bfca, 0x79d99f946eae5ff8}},
- {{0xf17b483568673205, 0x387deae83caad96c, 0x61b471fd56ffe386, 0x31741195b745a599}}},
-{{{0xe8d10190b77a360b, 0x99b983209995e702, 0xbd4fdff8fa0247aa, 0x2772e344e0d36a87}},
- {{0x17f8ba683b02a047, 0x50212096feefb6c8, 0x70139be21556cbe2, 0x203e44a11d98915b}},
- {{0xd6863eba37b9e39f, 0x105bc169723b5a23, 0x104f6459a65c0762, 0x567951295b4d38d4}}},
-{{{0x535fd60613037524, 0xe210adf6b0fbc26a, 0xac8d0a9b23e990ae, 0x47204d08d72fdbf9}},
- {{0x07242eb30d4b497f, 0x1ef96306b9bccc87, 0x37950934d8116f45, 0x05468d6201405b04}},
- {{0x00f565a9f93267de, 0xcecfd78dc0d58e8a, 0xa215e2dcf318e28e, 0x4599ee919b633352}}},
-{{{0xd3c220ca70e0e76b, 0xb12bea58ea9f3094, 0x294ddec8c3271282, 0x0c3539e1a1d1d028}},
- {{0xac746d6b861ae579, 0x31ab0650f6aea9dc, 0x241d661140256d4c, 0x2f485e853d21a5de}},
- {{0x329744839c0833f3, 0x6fe6257fd2abc484, 0x5327d1814b358817, 0x65712585893fe9bc}}},
-{{{0x9c102fb732a61161, 0xe48e10dd34d520a8, 0x365c63546f9a9176, 0x32f6fe4c046f6006}},
- {{0x81c29f1bd708ee3f, 0xddcb5a05ae6407d0, 0x97aec1d7d2a3eba7, 0x1590521a91d50831}},
- {{0x40a3a11ec7910acc, 0x9013dff8f16d27ae, 0x1a9720d8abb195d4, 0x1bb9fe452ea98463}}},
-{{{0xe9d1d950b3d54f9e, 0x2d5f9cbee00d33c1, 0x51c2c656a04fc6ac, 0x65c091ee3c1cbcc9}},
- {{0xcf5e6c95cc36747c, 0x294201536b0bc30d, 0x453ac67cee797af0, 0x5eae6ab32a8bb3c9}},
- {{0x7083661114f118ea, 0x2b37b87b94349cad, 0x7273f51cb4e99f40, 0x78a2a95823d75698}}},
-{{{0xa2b072e95c8c2ace, 0x69cffc96651e9c4b, 0x44328ef842e7b42b, 0x5dd996c122aadeb3}},
- {{0xb4f23c425ef83207, 0xabf894d3c9a934b5, 0xd0708c1339fd87f7, 0x1876789117166130}},
- {{0x925b5ef0670c507c, 0x819bc842b93c33bf, 0x10792e9a70dd003f, 0x59ad4b7a6e28dc74}}},
-{{{0x5f3a7562eb3dbe47, 0xf7ea38548ebda0b8, 0x00c3e53145747299, 0x1304e9e71627d551}},
- {{0x583b04bfacad8ea2, 0x29b743e8148be884, 0x2b1e583b0810c5db, 0x2b5449e58eb3bbaa}},
- {{0x789814d26adc9cfe, 0x3c1bab3f8b48dd0b, 0xda0fe1fff979c60a, 0x4468de2d7c2dd693}}},
-{{{0x51bb355e9419469e, 0x33e6dc4c23ddc754, 0x93a5b6d6447f9962, 0x6cce7c6ffb44bd63}},
- {{0x4b9ad8c6f86307ce, 0x21113531435d0c28, 0xd4a866c5657a772c, 0x5da6427e63247352}},
- {{0x1a94c688deac22ca, 0xb9066ef7bbae1ff8, 0x88ad8c388d59580f, 0x58f29abfe79f2ca8}}},
-{{{0xe90ecfab8de73e68, 0x54036f9f377e76a5, 0xf0495b0bbe015982, 0x577629c4a7f41e36}},
- {{0x4b5a64bf710ecdf6, 0xb14ce538462c293c, 0x3643d056d50b3ab9, 0x6af93724185b4870}},
- {{0x3220024509c6a888, 0xd2e036134b558973, 0x83e236233c33289f, 0x701f25bb0caec18f}}},
-{{{0xc3a8b0f8e4616ced, 0xf700660e9e25a87d, 0x61e3061ff4bca59c, 0x2e0c92bfbdc40be9}},
- {{0x9d18f6d97cbec113, 0x844a06e674bfdbe4, 0x20f5b522ac4e60d6, 0x720a5bc050955e51}},
- {{0x0c3f09439b805a35, 0xe84e8b376242abfc, 0x691417f35c229346, 0x0e9b9cbb144ef0ec}}},
-{{{0xfbbad48ffb5720ad, 0xee81916bdbf90d0e, 0xd4813152635543bf, 0x221104eb3f337bd8}},
- {{0x8dee9bd55db1beee, 0xc9c3ab370a723fb9, 0x44a8f1bf1c68d791, 0x366d44191cfd3cde}},
- {{0x9e3c1743f2bc8c14, 0x2eda26fcb5856c3b, 0xccb82f0e68a7fb97, 0x4167a4e6bc593244}}},
-{{{0x643b9d2876f62700, 0x5d1d9d400e7668eb, 0x1b4b430321fc0684, 0x7938bb7e2255246a}},
- {{0xc2be2665f8ce8fee, 0xe967ff14e880d62c, 0xf12e6e7e2f364eee, 0x34b33370cb7ed2f6}},
- {{0xcdc591ee8681d6cc, 0xce02109ced85a753, 0xed7485c158808883, 0x1176fc6e2dfe65e4}}},
-{{{0xb4af6cd05b9c619b, 0x2ddfc9f4b2a58480, 0x3d4fa502ebe94dc4, 0x08fc3a4c677d5f34}},
- {{0xdb90e28949770eb8, 0x98fbcc2aacf440a3, 0x21354ffeded7879b, 0x1f6a3e54f26906b6}},
- {{0x60a4c199d30734ea, 0x40c085b631165cd6, 0xe2333e23f7598295, 0x4f2fad0116b900d1}}},
-{{{0x44beb24194ae4e54, 0x5f541c511857ef6c, 0xa61e6b2d368d0498, 0x445484a4972ef7ab}},
- {{0x962cd91db73bb638, 0xe60577aafc129c08, 0x6f619b39f3b61689, 0x3451995f2944ee81}},
- {{0x9152fcd09fea7d7c, 0x4a816c94b0935cf6, 0x258e9aaa47285c40, 0x10b89ca6042893b7}}},
-{{{0x9b2a426e3b646025, 0x32127190385ce4cf, 0xa25cffc2dd6dea45, 0x06409010bea8de75}},
- {{0xd67cded679d34aa0, 0xcc0b9ec0cc4db39f, 0xa535a456e35d190f, 0x2e05d9eaf61f6fef}},
- {{0xc447901ad61beb59, 0x661f19bce5dc880a, 0x24685482b7ca6827, 0x293c778cefe07f26}}},
-{{{0x86809e7007069096, 0xaad75b15e4e50189, 0x07f35715a21a0147, 0x0487f3f112815d5e}},
- {{0x16c795d6a11ff200, 0xcb70d0e2b15815c9, 0x89f293209b5395b5, 0x50b8c2d031e47b4f}},
- {{0x48350c08068a4962, 0x6ffdd05351092c9a, 0x17af4f4aaf6fc8dd, 0x4b0553b53cdba58b}}},
-{{{0x9c65fcbe1b32ff79, 0xeb75ea9f03b50f9b, 0xfced2a6c6c07e606, 0x35106cd551717908}},
- {{0xbf05211b27c152d4, 0x5ec26849bd1af639, 0x5e0b2caa8e6fab98, 0x054c8bdd50bd0840}},
- {{0x38a0b12f1dcf073d, 0x4b60a8a3b7f6a276, 0xfed5ac25d3404f9a, 0x72e82d5e5505c229}}},
-{{{0x6b0b697ff0d844c8, 0xbb12f85cd979cb49, 0xd2a541c6c1da0f1f, 0x7b7c242958ce7211}},
- {{0x00d9cdfd69771d02, 0x410276cd6cfbf17e, 0x4c45306c1cb12ec7, 0x2857bf1627500861}},
- {{0x9f21903f0101689e, 0xd779dfd3bf861005, 0xa122ee5f3deb0f1b, 0x510df84b485a00d4}}},
-{{{0xa54133bb9277a1fa, 0x74ec3b6263991237, 0x1a3c54dc35d2f15a, 0x2d347144e482ba3a}},
- {{0x24b3c887c70ac15e, 0xb0f3a557fb81b732, 0x9b2cde2fe578cc1b, 0x4cf7ed0703b54f8e}},
- {{0x6bd47c6598fbee0f, 0x9e4733e2ab55be2d, 0x1093f624127610c5, 0x4e05e26ad0a1eaa4}}},
-{{{0xda9b6b624b531f20, 0x429a760e77509abb, 0xdbe9f522e823cb80, 0x618f1856880c8f82}},
- {{0x1833c773e18fe6c0, 0xe3c4711ad3c87265, 0x3bfd3c4f0116b283, 0x1955875eb4cd4db8}},
- {{0x6da6de8f0e399799, 0x7ad61aa440fda178, 0xb32cd8105e3563dd, 0x15f6beae2ae340ae}}},
-{{{0x862bcb0c31ec3a62, 0x810e2b451138f3c2, 0x788ec4b839dac2a4, 0x28f76867ae2a9281}},
- {{0xba9a0f7b9245e215, 0xf368612dd98c0dbb, 0x2e84e4cbf220b020, 0x6ba92fe962d90eda}},
- {{0x3e4df9655884e2aa, 0xbd62fbdbdbd465a5, 0xd7596caa0de9e524, 0x6e8042ccb2b1b3d7}}},
-{{{0xf10d3c29ce28ca6e, 0xbad34540fcb6093d, 0xe7426ed7a2ea2d3f, 0x08af9d4e4ff298b9}},
- {{0x1530653616521f7e, 0x660d06b896203dba, 0x2d3989bc545f0879, 0x4b5303af78ebd7b0}},
- {{0x72f8a6c3bebcbde8, 0x4f0fca4adc3a8e89, 0x6fa9d4e8c7bfdf7a, 0x0dcf2d679b624eb7}}},
-{{{0x3d5947499718289c, 0x12ebf8c524533f26, 0x0262bfcb14c3ef15, 0x20b878d577b7518e}},
- {{0x753941be5a45f06e, 0xd07caeed6d9c5f65, 0x11776b9c72ff51b6, 0x17d2d1d9ef0d4da9}},
- {{0x27f2af18073f3e6a, 0xfd3fe519d7521069, 0x22e3b72c3ca60022, 0x72214f63cc65c6a7}}},
-{{{0xb4e37f405307a693, 0xaba714d72f336795, 0xd6fbd0a773761099, 0x5fdf48c58171cbc9}},
- {{0x1d9db7b9f43b29c9, 0xd605824a4f518f75, 0xf2c072bd312f9dc4, 0x1f24ac855a1545b0}},
- {{0x24d608328e9505aa, 0x4748c1d10c1420ee, 0xc7ffe45c06fb25a2, 0x00ba739e2ae395e6}}},
-{{{0x592e98de5c8790d6, 0xe5bfb7d345c2a2df, 0x115a3b60f9b49922, 0x03283a3e67ad78f3}},
- {{0xae4426f5ea88bb26, 0x360679d984973bfb, 0x5c9f030c26694e50, 0x72297de7d518d226}},
- {{0x48241dc7be0cb939, 0x32f19b4d8b633080, 0xd3dfc90d02289308, 0x05e1296846271945}}},
-{{{0xba82eeb32d9c495a, 0xceefc8fcf12bb97c, 0xb02dabae93b5d1e0, 0x39c00c9c13698d9b}},
- {{0xadbfbbc8242c4550, 0xbcc80cecd03081d9, 0x843566a6f5c8df92, 0x78cf25d38258ce4c}},
- {{0x15ae6b8e31489d68, 0xaa851cab9c2bf087, 0xc9a75a97f04efa05, 0x006b52076b3ff832}}},
-{{{0x29e0cfe19d95781c, 0xb681df18966310e2, 0x57df39d370516b39, 0x4d57e3443bc76122}},
- {{0xf5cb7e16b9ce082d, 0x3407f14c417abc29, 0xd4b36bce2bf4a7ab, 0x7de2e9561a9f75ce}},
- {{0xde70d4f4b6a55ecb, 0x4801527f5d85db99, 0xdbc9c440d3ee9a81, 0x6b2a90af1a6029ed}}},
-{{{0x6923f4fc9ae61e97, 0x5735281de03f5fd1, 0xa764ae43e6edd12d, 0x5fd8f4e9d12d3e4a}},
- {{0x77ebf3245bb2d80a, 0xd8301b472fb9079b, 0xc647e6f24cee7333, 0x465812c8276c2109}},
- {{0x4d43beb22a1062d9, 0x7065fb753831dc16, 0x180d4a7bde2968d7, 0x05b32c2b1cb16790}}},
-{{{0xc8c05eccd24da8fd, 0xa1cf1aac05dfef83, 0xdbbeeff27df9cd61, 0x3b5556a37b471e99}},
- {{0xf7fca42c7ad58195, 0x3214286e4333f3cc, 0xb6c29d0d340b979d, 0x31771a48567307e1}},
- {{0x32b0c524e14dd482, 0xedb351541a2ba4b6, 0xa3d16048282b5af3, 0x4fc079d27a7336eb}}},
-{{{0x51c938b089bf2f7f, 0x2497bd6502dfe9a7, 0xffffc09c7880e453, 0x124567cecaf98e92}},
- {{0xdc348b440c86c50d, 0x1337cbc9cc94e651, 0x6422f74d643e3cb9, 0x241170c2bae3cd08}},
- {{0x3ff9ab860ac473b4, 0xf0911dee0113e435, 0x4ae75060ebc6c4af, 0x3f8612966c87000d}}},
-{{{0x0c9c5303f7957be4, 0xa3c31a20e085c145, 0xb0721d71d0850050, 0x0aba390eab0bf2da}},
- {{0x529fdffe638c7bf3, 0xdf2b9e60388b4995, 0xe027b34f1bad0249, 0x7bc92fc9b9fa74ed}},
- {{0x9f97ef2e801ad9f9, 0x83697d5479afda3a, 0xe906b3ffbd596b50, 0x02672b37dd3fb8e0}}},
-{{{0x48b2ca8b260885e4, 0xa4286bec82b34c1c, 0x937e1a2617f58f74, 0x741d1fcbab2ca2a5}},
- {{0xee9ba729398ca7f5, 0xeb9ca6257a4849db, 0x29eb29ce7ec544e1, 0x232ca21ef736e2c8}},
- {{0xbf61423d253fcb17, 0x08803ceafa39eb14, 0xf18602df9851c7af, 0x0400f3a049e3414b}}},
-{{{0xabce0476ba61c55b, 0x36a3d6d7c4d39716, 0x6eb259d5e8d82d09, 0x0c9176e984d756fb}},
- {{0x2efba412a06e7b06, 0x146785452c8d2560, 0xdf9713ebd67a91c7, 0x32830ac7157eadf3}},
- {{0x0e782a7ab73769e8, 0x04a05d7875b18e2c, 0x29525226ebcceae1, 0x0d794f8383eba820}}},
-{{{0xff35f5cb9e1516f4, 0xee805bcf648aae45, 0xf0d73c2bb93a9ef3, 0x097b0bf22092a6c2}},
- {{0x7be44ce7a7a2e1ac, 0x411fd93efad1b8b7, 0x1734a1d70d5f7c9b, 0x0d6592233127db16}},
- {{0xc48bab1521a9d733, 0xa6c2eaead61abb25, 0x625c6c1cc6cb4305, 0x7fc90fea93eb3a67}}},
-{{{0x0408f1fe1f5c5926, 0x1a8f2f5e3b258bf4, 0x40a951a2fdc71669, 0x6598ee93c98b577e}},
- {{0xc527deb59c7cb23d, 0x955391695328404e, 0xd64392817ccf2c7a, 0x6ce97dabf7d8fa11}},
- {{0x25b5a8e50ef7c48f, 0xeb6034116f2ce532, 0xc5e75173e53de537, 0x73119fa08c12bb03}}},
-{{{0xed30129453f1a4cb, 0xbce621c9c8f53787, 0xfacb2b1338bee7b9, 0x3025798a9ea8428c}},
- {{0x7845b94d21f4774d, 0xbf62f16c7897b727, 0x671857c03c56522b, 0x3cd6a85295621212}},
- {{0x3fecde923aeca999, 0xbdaa5b0062e8c12f, 0x67b99dfc96988ade, 0x3f52c02852661036}}},
-{{{0xffeaa48e2a1351c6, 0x28624754fa7f53d7, 0x0b5ba9e57582ddf1, 0x60c0104ba696ac59}},
- {{0x9258bf99eec416c6, 0xac8a5017a9d2f671, 0x629549ab16dea4ab, 0x05d0e85c99091569}},
- {{0x051de020de9cbe97, 0xfa07fc56b50bcf74, 0x378cec9f0f11df65, 0x36853c69ab96de4d}}},
-{{{0x36d9b8de78f39b2d, 0x7f42ed71a847b9ec, 0x241cd1d679bd3fde, 0x6a704fec92fbce6b}},
- {{0x4433c0b0fac5e7be, 0x724bae854c08dcbe, 0xf1f24cc446978f9b, 0x4a0aff6d62825fc8}},
- {{0xe917fb9e61095301, 0xc102df9402a092f8, 0xbf09e2f5fa66190b, 0x681109bee0dcfe37}}},
-{{{0x559a0cc9782a0dde, 0x551dcdb2ea718385, 0x7f62865b31ef238c, 0x504aa7767973613d}},
- {{0x9c18fcfa36048d13, 0x29159db373899ddd, 0xdc9f350b9f92d0aa, 0x26f57eee878a19d4}},
- {{0x0cab2cd55687efb1, 0x5180d162247af17b, 0x85c15a344f5a2467, 0x4041943d9dba3069}}},
-{{{0xc3c0eeba43ebcc96, 0x8d749c9c26ea9caf, 0xd9fa95ee1c77ccc6, 0x1420a1d97684340f}},
- {{0x4b217743a26caadd, 0x47a6b424648ab7ce, 0xcb1d4f7a03fbc9e3, 0x12d931429800d019}},
- {{0x00c67799d337594f, 0x5e3c5140b23aa47b, 0x44182854e35ff395, 0x1b4f92314359a012}}},
-{{{0x3e5c109d89150951, 0x39cefa912de9696a, 0x20eae43f975f3020, 0x239b572a7f132dae}},
- {{0x33cf3030a49866b1, 0x251f73d2215f4859, 0xab82aa4051def4f6, 0x5ff191d56f9a23f6}},
- {{0x819ed433ac2d9068, 0x2883ab795fc98523, 0xef4572805593eb3d, 0x020c526a758f36cb}}},
-{{{0x779834f89ed8dbbc, 0xc8f2aaf9dc7ca46c, 0xa9524cdca3e1b074, 0x02aacc4615313877}},
- {{0xe931ef59f042cc89, 0x2c589c9d8e124bb6, 0xadc8e18aaec75997, 0x452cfe0a5602c50c}},
- {{0x86a0f7a0647877df, 0xbbc464270e607c9f, 0xab17ea25f1fb11c9, 0x4cfb7d7b304b877b}}},
-{{{0x72b43d6cb89b75fe, 0x54c694d99c6adc80, 0xb8c3aa373ee34c9f, 0x14b4622b39075364}},
- {{0xe28699c29789ef12, 0x2b6ecd71df57190d, 0xc343c857ecc970d0, 0x5b1d4cbc434d3ac5}},
- {{0xb6fb2615cc0a9f26, 0x3a4f0e2bb88dcce5, 0x1301498b3369a705, 0x2f98f71258592dd1}}},
-{{{0x0c94a74cb50f9e56, 0x5b1ff4a98e8e1320, 0x9a2acc2182300f67, 0x3a6ae249d806aaf9}},
- {{0x2e12ae444f54a701, 0xfcfe3ef0a9cbd7de, 0xcebf890d75835de0, 0x1d8062e9e7614554}},
- {{0x657ada85a9907c5a, 0x1a0ea8b591b90f62, 0x8d0e1dfbdf34b4e9, 0x298b8ce8aef25ff3}}},
-{{{0x2a927953eff70cb2, 0x4b89c92a79157076, 0x9418457a30a7cf6a, 0x34b8a8404d5ce485}},
- {{0x837a72ea0a2165de, 0x3fab07b40bcf79f6, 0x521636c77738ae70, 0x6ba6271803a7d7dc}},
- {{0xc26eecb583693335, 0xd5a813df63b5fefd, 0xa293aa9aa4b22573, 0x71d62bdd465e1c6a}}},
-{{{0x6533cc28d378df80, 0xf6db43790a0fa4b4, 0xe3645ff9f701da5a, 0x74d5f317f3172ba4}},
- {{0xcd2db5dab1f75ef5, 0xd77f95cf16b065f5, 0x14571fea3f49f085, 0x1c333621262b2b3d}},
- {{0xa86fe55467d9ca81, 0x398b7c752b298c37, 0xda6d0892e3ac623b, 0x4aebcc4547e9d98c}}},
-{{{0x53175a7205d21a77, 0xb0c04422d3b934d4, 0xadd9f24bdd5deadc, 0x074f46e69f10ff8c}},
- {{0x0de9b204a059a445, 0xe15cb4aa4b17ad0f, 0xe1bbec521f79c557, 0x2633f1b9d071081b}},
- {{0xc1fb4177018b9910, 0xa6ea20dc6c0fe140, 0xd661f3e74354c6ff, 0x5ecb72e6f1a3407a}}},
-{{{0xa515a31b2259fb4e, 0x0960f3972bcac52f, 0xedb52fec8d3454cb, 0x382e2720c476c019}},
- {{0xfeeae106e8e86997, 0x9863337f98d09383, 0x9470480eaa06ebef, 0x038b6898d4c5c2d0}},
- {{0xf391c51d8ace50a6, 0x3142d0b9ae2d2948, 0xdb4d5a1a7f24ca80, 0x21aeba8b59250ea8}}},
-{{{0x24f13b34cf405530, 0x3c44ea4a43088af7, 0x5dd5c5170006a482, 0x118eb8f8890b086d}},
- {{0x53853600f0087f23, 0x4c461879da7d5784, 0x6af303deb41f6860, 0x0a3c16c5c27c18ed}},
- {{0x17e49c17cc947f3d, 0xccc6eda6aac1d27b, 0xdf6092ceb0f08e56, 0x4909b3e22c67c36b}}},
-{{{0x9c9c85ea63fe2e89, 0xbe1baf910e9412ec, 0x8f7baa8a86fbfe7b, 0x0fb17f9fef968b6c}},
- {{0x59a16676706ff64e, 0x10b953dd0d86a53d, 0x5848e1e6ce5c0b96, 0x2d8b78e712780c68}},
- {{0x79d5c62eafc3902b, 0x773a215289e80728, 0xc38ae640e10120b9, 0x09ae23717b2b1a6d}}},
-{{{0xbb6a192a4e4d083c, 0x34ace0630029e192, 0x98245a59aafabaeb, 0x6d9c8a9ada97faac}},
- {{0x10ab8fa1ad32b1d0, 0xe9aced1be2778b24, 0xa8856bc0373de90f, 0x66f35ddddda53996}},
- {{0xd27d9afb24997323, 0x1bb7e07ef6f01d2e, 0x2ba7472df52ecc7f, 0x03019b4f646f9dc8}}},
-{{{0x04a186b5565345cd, 0xeee76610bcc4116a, 0x689c73b478fb2a45, 0x387dcbff65697512}},
- {{0xaf09b214e6b3dc6b, 0x3f7573b5ad7d2f65, 0xd019d988100a23b0, 0x392b63a58b5c35f7}},
- {{0x4093addc9c07c205, 0xc565be15f532c37e, 0x63dbecfd1583402a, 0x61722b4aef2e032e}}},
-{{{0x0012aafeecbd47af, 0x55a266fb1cd46309, 0xf203eb680967c72c, 0x39633944ca3c1429}},
- {{0xd6b07a5581cb0e3c, 0x290ff006d9444969, 0x08680b6a16dcda1f, 0x5568d2b75a06de59}},
- {{0x8d0cb88c1b37cfe1, 0x05b6a5a3053818f3, 0xf2e9bc04b787d959, 0x6beba1249add7f64}}},
-{{{0x1d06005ca5b1b143, 0x6d4c6bb87fd1cda2, 0x6ef5967653fcffe7, 0x097c29e8c1ce1ea5}},
- {{0x5c3cecb943f5a53b, 0x9cc9a61d06c08df2, 0xcfba639a85895447, 0x5a845ae80df09fd5}},
- {{0x4ce97dbe5deb94ca, 0x38d0a4388c709c48, 0xc43eced4a169d097, 0x0a1249fff7e587c3}}},
-{{{0x12f0071b276d01c9, 0xe7b8bac586c48c70, 0x5308129b71d6fba9, 0x5d88fbf95a3db792}},
- {{0x0b408d9e7354b610, 0x806b32535ba85b6e, 0xdbe63a034a58a207, 0x173bd9ddc9a1df2c}},
- {{0x2b500f1efe5872df, 0x58d6582ed43918c1, 0xe6ed278ec9673ae0, 0x06e1cd13b19ea319}}},
-{{{0x40d0ad516f166f23, 0x118e32931fab6abe, 0x3fe35e14a04d088e, 0x3080603526e16266}},
- {{0x472baf629e5b0353, 0x3baa0b90278d0447, 0x0c785f469643bf27, 0x7f3a6a1a8d837b13}},
- {{0xf7e644395d3d800b, 0x95a8d555c901edf6, 0x68cd7830592c6339, 0x30d0fded2e51307e}}},
-{{{0xe0594d1af21233b3, 0x1bdbe78ef0cc4d9c, 0x6965187f8f499a77, 0x0a9214202c099868}},
- {{0x9cb4971e68b84750, 0xa09572296664bbcf, 0x5c8de72672fa412b, 0x4615084351c589d9}},
- {{0xbc9019c0aeb9a02e, 0x55c7110d16034cae, 0x0e6df501659932ec, 0x3bca0d2895ca5dfe}}},
-{{{0x40f031bc3c5d62a4, 0x19fc8b3ecff07a60, 0x98183da2130fb545, 0x5631deddae8f13cd}},
- {{0x9c688eb69ecc01bf, 0xf0bc83ada644896f, 0xca2d955f5f7a9fe2, 0x4ea8b4038df28241}},
- {{0x2aed460af1cad202, 0x46305305a48cee83, 0x9121774549f11a5f, 0x24ce0930542ca463}}},
-{{{0x1fe890f5fd06c106, 0xb5c468355d8810f2, 0x827808fe6e8caf3e, 0x41d4e3c28a06d74b}},
- {{0x3fcfa155fdf30b85, 0xd2f7168e36372ea4, 0xb2e064de6492f844, 0x549928a7324f4280}},
- {{0xf26e32a763ee1a2e, 0xae91e4b7d25ffdea, 0xbc3bd33bd17f4d69, 0x491b66dec0dcff6a}}},
-{{{0x98f5b13dc7ea32a7, 0xe3d5f8cc7e16db98, 0xac0abf52cbf8d947, 0x08f338d0c85ee4ac}},
- {{0x75f04a8ed0da64a1, 0xed222caf67e2284b, 0x8234a3791f7b7ba4, 0x4cf6b8b0b7018b67}},
- {{0xc383a821991a73bd, 0xab27bc01df320c7a, 0xc13d331b84777063, 0x530d4a82eb078a99}}},
-{{{0x004c3630e1f94825, 0x7e2d78268cab535a, 0xc7482323cc84ff8b, 0x65ea753f101770b9}},
- {{0x6d6973456c9abf9e, 0x257fb2fc4900a880, 0x2bacf412c8cfb850, 0x0db3e7e00cbfbd5b}},
- {{0x3d66fc3ee2096363, 0x81d62c7f61b5cb6b, 0x0fbe044213443b1a, 0x02a4ec1921e1a1db}}},
-{{{0x5ce6259a3b24b8a2, 0xb8577acc45afa0b8, 0xcccbe6e88ba07037, 0x3d143c51127809bf}},
- {{0xf5c86162f1cf795f, 0x118c861926ee57f2, 0x172124851c063578, 0x36d12b5dec067fcf}},
- {{0x126d279179154557, 0xd5e48f5cfc783a0a, 0x36bdb6e8df179bac, 0x2ef517885ba82859}}},
-{{{0x88bd438cd11e0d4a, 0x30cb610d43ccf308, 0xe09a0e3791937bcc, 0x4559135b25b1720c}},
- {{0x1ea436837c6da1e9, 0xf9c189af1fb9bdbe, 0x303001fcce5dd155, 0x28a7c99ebc57be52}},
- {{0xb8fd9399e8d19e9d, 0x908191cb962423ff, 0xb2b948d747c742a3, 0x37f33226d7fb44c4}}},
-{{{0x0dae8767b55f6e08, 0x4a43b3b35b203a02, 0xe3725a6e80af8c79, 0x0f7a7fd1705fa7a3}},
- {{0x33912553c821b11d, 0x66ed42c241e301df, 0x066fcc11104222fd, 0x307a3b41c192168f}},
- {{0x8eeb5d076eb55ce0, 0x2fc536bfaa0d925a, 0xbe81830fdcb6c6e8, 0x556c7045827baf52}}},
-{{{0x8e2b517302e9d8b7, 0xe3e52269248714e8, 0xbd4fbd774ca960b5, 0x6f4b4199c5ecada9}},
- {{0xb94b90022bf44406, 0xabd4237eff90b534, 0x7600a960faf86d3a, 0x2f45abdac2322ee3}},
- {{0x61af4912c8ef8a6a, 0xe58fa4fe43fb6e5e, 0xb5afcc5d6fd427cf, 0x6a5393281e1e11eb}}},
-{{{0xf3da5139a5d1ee89, 0x8145457cff936988, 0x3f622fed00e188c4, 0x0f513815db8b5a3d}},
- {{0x0fff04fe149443cf, 0x53cac6d9865cddd7, 0x31385b03531ed1b7, 0x5846a27cacd1039d}},
- {{0x4ff5cdac1eb08717, 0x67e8b29590f2e9bc, 0x44093b5e237afa99, 0x0d414bed8708b8b2}}},
-{{{0xcfb68265fd0e75f6, 0xe45b3e28bb90e707, 0x7242a8de9ff92c7a, 0x685b3201933202dd}},
- {{0x81886a92294ac9e8, 0x23162b45d55547be, 0x94cfbc4403715983, 0x50eb8fdb134bc401}},
- {{0xc0b73ec6d6b330cd, 0x84e44807132faff1, 0x732b7352c4a5dee1, 0x5d7c7cf1aa7cd2d2}}},
-{{{0xaf3b46bf7a4aafa2, 0xb78705ec4d40d411, 0x114f0c6aca7c15e3, 0x3f364faaa9489d4d}},
- {{0x33d1013e9b73a562, 0x925cef5748ec26e1, 0xa7fce614dd468058, 0x78b0fad41e9aa438}},
- {{0xbf56a431ed05b488, 0xa533e66c9c495c7e, 0xe8652baf87f3651a, 0x0241800059d66c33}}},
-{{{0xceb077fea37a5be4, 0xdb642f02e5a5eeb7, 0xc2e6d0c5471270b8, 0x4771b65538e4529c}},
- {{0x28350c7dcf38ea01, 0x7c6cdbc0b2917ab6, 0xace7cfbe857082f7, 0x4d2845aba2d9a1e0}},
- {{0xbb537fe0447070de, 0xcba744436dd557df, 0xd3b5a3473600dbcb, 0x4aeabbe6f9ffd7f8}}},
-{{{0x4630119e40d8f78c, 0xa01a9bc53c710e11, 0x486d2b258910dd79, 0x1e6c47b3db0324e5}},
- {{0x6a2134bcc4a9c8f2, 0xfbf8fd1c8ace2e37, 0x000ae3049911a0ba, 0x046e3a616bc89b9e}},
- {{0x14e65442f03906be, 0x4a019d54e362be2a, 0x68ccdfec8dc230c7, 0x7cfb7e3faf6b861c}}},
-{{{0x4637974e8c58aedc, 0xb9ef22fbabf041a4, 0xe185d956e980718a, 0x2f1b78fab143a8a6}},
- {{0x96eebffb305b2f51, 0xd3f938ad889596b8, 0xf0f52dc746d5dd25, 0x57968290bb3a0095}},
- {{0xf71ab8430a20e101, 0xf393658d24f0ec47, 0xcf7509a86ee2eed1, 0x7dc43e35dc2aa3e1}}},
-{{{0x85966665887dd9c3, 0xc90f9b314bb05355, 0xc6e08df8ef2079b1, 0x7ef72016758cc12f}},
- {{0x5a782a5c273e9718, 0x3576c6995e4efd94, 0x0f2ed8051f237d3e, 0x044fb81d82d50a99}},
- {{0xc1df18c5a907e3d9, 0x57b3371dce4c6359, 0xca704534b201bb49, 0x7f79823f9c30dd2e}}},
-{{{0x8334d239a3b513e8, 0xc13670d4b91fa8d8, 0x12b54136f590bd33, 0x0a4e0373d784d9b4}},
- {{0x6a9c1ff068f587ba, 0x0827894e0050c8de, 0x3cbf99557ded5be7, 0x64a9b0431c06d6f0}},
- {{0x2eb3d6a15b7d2919, 0xb0b4f6a0d53a8235, 0x7156ce4389a45d47, 0x071a7d0ace18346c}}},
-{{{0xd3072daac887ba0b, 0x01262905bfa562ee, 0xcf543002c0ef768b, 0x2c3bcc7146ea7e9c}},
- {{0xcc0c355220e14431, 0x0d65950709b15141, 0x9af5621b209d5f36, 0x7c69bcf7617755d3}},
- {{0x07f0d7eb04e8295f, 0x10db18252f50f37d, 0xe951a9a3171798d7, 0x6f5a9a7322aca51d}}},
-{{{0x8ba1000c2f41c6c5, 0xc49f79c10cfefb9b, 0x4efa47703cc51c9f, 0x494e21a2e147afca}},
- {{0xe729d4eba3d944be, 0x8d9e09408078af9e, 0x4525567a47869c03, 0x02ab9680ee8d3b24}},
- {{0xefa48a85dde50d9a, 0x219a224e0fb9a249, 0xfa091f1dd91ef6d9, 0x6b5d76cbea46bb34}}},
-{{{0x8857556cec0cd994, 0x6472dc6f5cd01dba, 0xaf0169148f42b477, 0x0ae333f685277354}},
- {{0xe0f941171e782522, 0xf1e6ae74036936d3, 0x408b3ea2d0fcc746, 0x16fb869c03dd313e}},
- {{0x288e199733b60962, 0x24fc72b4d8abe133, 0x4811f7ed0991d03e, 0x3f81e38b8f70d075}}},
-{{{0x7f910fcc7ed9affe, 0x545cb8a12465874b, 0xa8397ed24b0c4704, 0x50510fc104f50993}},
- {{0x0adb7f355f17c824, 0x74b923c3d74299a4, 0xd57c3e8bcbf8eaf7, 0x0ad3e2d34cdedc3d}},
- {{0x6f0c0fc5336e249d, 0x745ede19c331cfd9, 0xf2d6fd0009eefe1c, 0x127c158bf0fa1ebe}}},
-{{{0xf6197c422e9879a2, 0xa44addd452ca3647, 0x9b413fc14b4eaccb, 0x354ef87d07ef4f68}},
- {{0xdea28fc4ae51b974, 0x1d9973d3744dfe96, 0x6240680b873848a8, 0x4ed82479d167df95}},
- {{0xfee3b52260c5d975, 0x50352efceb41b0b8, 0x8808ac30a9f6653c, 0x302d92d20539236d}}},
-{{{0x4c59023fcb3efb7c, 0x6c2fcb99c63c2a94, 0xba4190e2c3c7e084, 0x0e545daea51874d9}},
- {{0x957b8b8b0df53c30, 0x2a1c770a8e60f098, 0xbbc7a670345796de, 0x22a48f9a90c99bc9}},
- {{0x6b7dc0dc8d3fac58, 0x5497cd6ce6e42bfd, 0x542f7d1bf400d305, 0x4159f47f048d9136}}},
-{{{0x20ad660839e31e32, 0xf81e1bd58405be50, 0xf8064056f4dabc69, 0x14d23dd4ce71b975}},
- {{0x748515a8bbd24839, 0x77128347afb02b55, 0x50ba2ac649a2a17f, 0x060525513ad730f1}},
- {{0xf2398e098aa27f82, 0x6d7982bb89a1b024, 0xfa694084214dd24c, 0x71ab966fa32301c3}}},
-{{{0x2dcbd8e34ded02fc, 0x1151f3ec596f22aa, 0xbca255434e0328da, 0x35768fbe92411b22}},
- {{0xb1088a0702809955, 0x43b273ea0b43c391, 0xca9b67aefe0686ed, 0x605eecbf8335f4ed}},
- {{0x83200a656c340431, 0x9fcd71678ee59c2f, 0x75d4613f71300f8a, 0x7a912faf60f542f9}}},
-{{{0xb204585e5edc1a43, 0x9f0e16ee5897c73c, 0x5b82c0ae4e70483c, 0x624a170e2bddf9be}},
- {{0x253f4f8dfa2d5597, 0x25e49c405477130c, 0x00c052e5996b1102, 0x33cb966e33bb6c4a}},
- {{0x597028047f116909, 0x828ac41c1e564467, 0x70417dbde6217387, 0x721627aefbac4384}}},
-{{{0x97d03bc38736add5, 0x2f1422afc532b130, 0x3aa68a057101bbc4, 0x4c946cf7e74f9fa7}},
- {{0xfd3097bc410b2f22, 0xf1a05da7b5cfa844, 0x61289a1def57ca74, 0x245ea199bb821902}},
- {{0xaedca66978d477f8, 0x1898ba3c29117fe1, 0xcf73f983720cbd58, 0x67da12e6b8b56351}}},
-{{{0x7067e187b4bd6e07, 0x6e8f0203c7d1fe74, 0x93c6aa2f38c85a30, 0x76297d1f3d75a78a}},
- {{0x2b7ef3d38ec8308c, 0x828fd7ec71eb94ab, 0x807c3b36c5062abd, 0x0cb64cb831a94141}},
- {{0x3030fc33534c6378, 0xb9635c5ce541e861, 0x15d9a9bed9b2c728, 0x49233ea3f3775dcb}}},
-{{{0x629398fa8dbffc3a, 0xe12fe52dd54db455, 0xf3be11dfdaf25295, 0x628b140dce5e7b51}},
- {{0x7b3985fe1c9f249b, 0x4fd6b2d5a1233293, 0xceb345941adf4d62, 0x6987ff6f542de50c}},
- {{0x47e241428f83753c, 0x6317bebc866af997, 0xdabb5b433d1a9829, 0x074d8d245287fb2d}}},
-{{{0x8337d9cd440bfc31, 0x729d2ca1af318fd7, 0xa040a4a4772c2070, 0x46002ef03a7349be}},
- {{0x481875c6c0e31488, 0x219429b2e22034b4, 0x7223c98a31283b65, 0x3420d60b342277f9}},
- {{0xfaa23adeaffe65f7, 0x78261ed45be0764c, 0x441c0a1e2f164403, 0x5aea8e567a87d395}}},
-{{{0x7813c1a2bca4283d, 0xed62f091a1863dd9, 0xaec7bcb8c268fa86, 0x10e5d3b76f1cae4c}},
- {{0x2dbc6fb6e4e0f177, 0x04e1bf29a4bd6a93, 0x5e1966d4787af6e8, 0x0edc5f5eb426d060}},
- {{0x5453bfd653da8e67, 0xe9dc1eec24a9f641, 0xbf87263b03578a23, 0x45b46c51361cba72}}},
-{{{0xa9402abf314f7fa1, 0xe257f1dc8e8cf450, 0x1dbbd54b23a8be84, 0x2177bfa36dcb713b}},
- {{0xce9d4ddd8a7fe3e4, 0xab13645676620e30, 0x4b594f7bb30e9958, 0x5c1c0aef321229df}},
- {{0x37081bbcfa79db8f, 0x6048811ec25f59b3, 0x087a76659c832487, 0x4ae619387d8ab5bb}}},
-{{{0x8ddbf6aa5344a32e, 0x7d88eab4b41b4078, 0x5eb0eb974a130d60, 0x1a00d91b17bf3e03}},
- {{0x61117e44985bfb83, 0xfce0462a71963136, 0x83ac3448d425904b, 0x75685abe5ba43d64}},
- {{0x6e960933eb61f2b2, 0x543d0fa8c9ff4952, 0xdf7275107af66569, 0x135529b623b0e6aa}}},
-{{{0x18f0dbd7add1d518, 0x979f7888cfc11f11, 0x8732e1f07114759b, 0x79b5b81a65ca3a01}},
- {{0xf5c716bce22e83fe, 0xb42beb19e80985c1, 0xec9da63714254aae, 0x5972ea051590a613}},
- {{0x0fd4ac20dc8f7811, 0x9a9ad294ac4d4fa8, 0xc01b2d64b3360434, 0x4f7e9c95905f3bdb}}},
-{{{0x62674bbc5781302e, 0xd8520f3989addc0f, 0x8c2999ae53fbd9c6, 0x31993ad92e638e4c}},
- {{0x71c8443d355299fe, 0x8bcd3b1cdbebead7, 0x8092499ef1a49466, 0x1942eec4a144adc8}},
- {{0x7dac5319ae234992, 0x2c1b3d910cea3e92, 0x553ce494253c1122, 0x2a0a65314ef9ca75}}},
-{{{0x2db7937ff7f927c2, 0xdb741f0617d0a635, 0x5982f3a21155af76, 0x4cf6e218647c2ded}},
- {{0xcf361acd3c1c793a, 0x2f9ebcac5a35bc3b, 0x60e860e9a8cda6ab, 0x055dc39b6dea1a13}},
- {{0xb119227cc28d5bb6, 0x07e24ebc774dffab, 0xa83c78cee4a32c89, 0x121a307710aa24b6}}},
-{{{0xe4db5d5e9f034a97, 0xe153fc093034bc2d, 0x460546919551d3b1, 0x333fc76c7a40e52d}},
- {{0xd659713ec77483c9, 0x88bfe077b82b96af, 0x289e28231097bcd3, 0x527bb94a6ced3a9b}},
- {{0x563d992a995b482e, 0x3405d07c6e383801, 0x485035de2f64d8e5, 0x6b89069b20a7a9f7}}},
-{{{0x812aa0416270220d, 0x995a89faf9245b4e, 0xffadc4ce5072ef05, 0x23bc2103aa73eb73}},
- {{0x4082fa8cb5c7db77, 0x068686f8c734c155, 0x29e6c8d9f6e7a57e, 0x0473d308a7639bcf}},
- {{0xcaee792603589e05, 0x2b4b421246dcc492, 0x02a1ef74e601a94f, 0x102f73bfde04341a}}},
-{{{0xb5a2d50c7ec20d3e, 0xc64bdd6ea0c97263, 0x56e89052c1ff734d, 0x4929c6f72b2ffaba}},
- {{0x358ecba293a36247, 0xaf8f9862b268fd65, 0x412f7e9968a01c89, 0x5786f312cd754524}},
- {{0x337788ffca14032c, 0xf3921028447f1ee3, 0x8b14071f231bccad, 0x4c817b4bf2344783}}},
-{{{0x0ff853852871b96e, 0xe13e9fab60c3f1bb, 0xeefd595325344402, 0x0a37c37075b7744b}},
- {{0x413ba057a40b4484, 0xba4c2e1a4f5f6a43, 0x614ba0a5aee1d61c, 0x78a1531a8b05dc53}},
- {{0x6cbdf1703ad0562b, 0x8ecf4830c92521a3, 0xdaebd303fd8424e7, 0x72ad82a42e5ec56f}}},
-{{{0x3f9e8e35bafb65f6, 0x39d69ec8f27293a1, 0x6cb8cd958cf6a3d0, 0x1734778173adae6d}},
- {{0xc368939167024bc3, 0x8e69d16d49502fda, 0xfcf2ec3ce45f4b29, 0x065f669ea3b4cbc4}},
- {{0x8a00aec75532db4d, 0xb869a4e443e31bb1, 0x4a0f8552d3a7f515, 0x19adeb7c303d7c08}}},
-{{{0xc720cb6153ead9a3, 0x55b2c97f512b636e, 0xb1e35b5fd40290b1, 0x2fd9ccf13b530ee2}},
- {{0x9d05ba7d43c31794, 0x2470c8ff93322526, 0x8323dec816197438, 0x2852709881569b53}},
- {{0x07bd475b47f796b8, 0xd2c7b013542c8f54, 0x2dbd23f43b24f87e, 0x6551afd77b0901d6}}},
-{{{0x4546baaf54aac27f, 0xf6f66fecb2a45a28, 0x582d1b5b562bcfe8, 0x44b123f3920f785f}},
- {{0x68a24ce3a1d5c9ac, 0xbb77a33d10ff6461, 0x0f86ce4425d3166e, 0x56507c0950b9623b}},
- {{0x1206f0b7d1713e63, 0x353fe3d915bafc74, 0x194ceb970ad9d94d, 0x62fadd7cf9d03ad3}}},
-{{{0xc6b5967b5598a074, 0x5efe91ce8e493e25, 0xd4b72c4549280888, 0x20ef1149a26740c2}},
- {{0x3cd7bc61e7ce4594, 0xcd6b35a9b7dd267e, 0xa080abc84366ef27, 0x6ec7c46f59c79711}},
- {{0x2f07ad636f09a8a2, 0x8697e6ce24205e7d, 0xc0aefc05ee35a139, 0x15e80958b5f9d897}}},
-{{{0x25a5ef7d0c3e235b, 0x6c39c17fbe134ee7, 0xc774e1342dc5c327, 0x021354b892021f39}},
- {{0x4dd1ed355bb061c4, 0x42dc0cef941c0700, 0x61305dc1fd86340e, 0x56b2cc930e55a443}},
- {{0x1df79da6a6bfc5a2, 0x02f3a2749fde4369, 0xb323d9f2cda390a7, 0x7be0847b8774d363}}},
-{{{0x8c99cc5a8b3f55c3, 0x0611d7253fded2a0, 0xed2995ff36b70a36, 0x1f699a54d78a2619}},
- {{0x1466f5af5307fa11, 0x817fcc7ded6c0af2, 0x0a6de44ec3a4a3fb, 0x74071475bc927d0b}},
- {{0xe77292f373e7ea8a, 0x296537d2cb045a31, 0x1bd0653ed3274fde, 0x2f9a2c4476bd2966}}},
-{{{0xeb18b9ab7f5745c6, 0x023a8aee5787c690, 0xb72712da2df7afa9, 0x36597d25ea5c013d}},
- {{0xa2b4dae0b5511c9a, 0x7ac860292bffff06, 0x981f375df5504234, 0x3f6bd725da4ea12d}},
- {{0x734d8d7b106058ac, 0xd940579e6fc6905f, 0x6466f8f99202932d, 0x7b7ecc19da60d6d0}}},
-{{{0x78c2373c695c690d, 0xdd252e660642906e, 0x951d44444ae12bd2, 0x4235ad7601743956}},
- {{0x6dae4a51a77cfa9b, 0x82263654e7a38650, 0x09bbffcd8f2d82db, 0x03bedc661bf5caba}},
- {{0x6258cb0d078975f5, 0x492942549189f298, 0xa0cab423e2e36ee4, 0x0e7ce2b0cdf066a1}}},
-{{{0xc494643ac48c85a3, 0xfd361df43c6139ad, 0x09db17dd3ae94d48, 0x666e0a5d8fb4674a}},
- {{0xfea6fedfd94b70f9, 0xf130c051c1fcba2d, 0x4882d47e7f2fab89, 0x615256138aeceeb5}},
- {{0x2abbf64e4870cb0d, 0xcd65bcf0aa458b6b, 0x9abe4eba75e8985d, 0x7f0bc810d514dee4}}},
-{{{0xb9006ba426f4136f, 0x8d67369e57e03035, 0xcbc8dfd94f463c28, 0x0d1f8dbcf8eedbf5}},
- {{0x83ac9dad737213a0, 0x9ff6f8ba2ef72e98, 0x311e2edd43ec6957, 0x1d3a907ddec5ab75}},
- {{0xba1693313ed081dc, 0x29329fad851b3480, 0x0128013c030321cb, 0x00011b44a31bfde3}}},
-{{{0x3fdfa06c3fc66c0c, 0x5d40e38e4dd60dd2, 0x7ae38b38268e4d71, 0x3ac48d916e8357e1}},
- {{0x16561f696a0aa75c, 0xc1bf725c5852bd6a, 0x11a8dd7f9a7966ad, 0x63d988a2d2851026}},
- {{0x00120753afbd232e, 0xe92bceb8fdd8f683, 0xf81669b384e72b91, 0x33fad52b2368a066}}},
-{{{0x540649c6c5e41e16, 0x0af86430333f7735, 0xb2acfcd2f305e746, 0x16c0f429a256dca7}},
- {{0x8d2cc8d0c422cfe8, 0x072b4f7b05a13acb, 0xa3feb6e6ecf6a56f, 0x3cc355ccb90a71e2}},
- {{0xe9b69443903e9131, 0xb8a494cb7a5637ce, 0xc87cd1a4baba9244, 0x631eaf426bae7568}}},
-{{{0xb3e90410da66fe9f, 0x85dd4b526c16e5a6, 0xbc3d97611ef9bf83, 0x5599648b1ea919b5}},
- {{0x47d975b9a3700de8, 0x7280c5fbe2f80552, 0x53658f2732e45de1, 0x431f2c7f665f80b5}},
- {{0xd6026344858f7b19, 0x14ab352fa1ea514a, 0x8900441a2090a9d7, 0x7b04715f91253b26}}},
-{{{0x83edbd28acf6ae43, 0x86357c8b7d5c7ab4, 0xc0404769b7eb2c44, 0x59b37bf5c2f6583f}},
- {{0xb376c280c4e6bac6, 0x970ed3dd6d1d9b0b, 0xb09a9558450bf944, 0x48d0acfa57cde223}},
- {{0xb60f26e47dabe671, 0xf1d1a197622f3a37, 0x4208ce7ee9960394, 0x16234191336d3bdb}}},
-{{{0xf19aeac733a63aef, 0x2c7fba5d4442454e, 0x5da87aa04795e441, 0x413051e1a4e0b0f5}},
- {{0x852dd1fd3d578bbe, 0x2b65ce72c3286108, 0x658c07f4eace2273, 0x0933f804ec38ab40}},
- {{0xa7ab69798d496476, 0x8121aadefcb5abc8, 0xa5dc12ef7b539472, 0x07fd47065e45351a}}},
-{{{0xc8583c3d258d2bcd, 0x17029a4daf60b73f, 0xfa0fc9d6416a3781, 0x1c1e5fba38b3fb23}},
- {{0x304211559ae8e7c3, 0xf281b229944882a5, 0x8a13ac2e378250e4, 0x014afa0954ba48f4}},
- {{0xcb3197001bb3666c, 0x330060524bffecb9, 0x293711991a88233c, 0x291884363d4ed364}}},
-{{{0x033c6805dc4babfa, 0x2c15bf5e5596ecc1, 0x1bc70624b59b1d3b, 0x3ede9850a19f0ec5}},
- {{0xfb9d37c3bc1ab6eb, 0x02be14534d57a240, 0xf4d73415f8a5e1f6, 0x5964f4300ccc8188}},
- {{0xe44a23152d096800, 0x5c08c55970866996, 0xdf2db60a46affb6e, 0x579155c1f856fd89}}},
-{{{0x96324edd12e0c9ef, 0x468b878df2420297, 0x199a3776a4f573be, 0x1e7fbcf18e91e92a}},
- {{0xb5f16b630817e7a6, 0x808c69233c351026, 0x324a983b54cef201, 0x53c092084a485345}},
- {{0xd2d41481f1cbafbf, 0x231d2db6716174e5, 0x0b7d7656e2a55c98, 0x3e955cd82aa495f6}}},
-{{{0xe48f535e3ed15433, 0xd075692a0d7270a3, 0x40fbd21daade6387, 0x14264887cf4495f5}},
- {{0xab39f3ef61bb3a3f, 0x8eb400652eb9193e, 0xb5de6ecc38c11f74, 0x654d7e9626f3c49f}},
- {{0xe564cfdd5c7d2ceb, 0x82eeafded737ccb9, 0x6107db62d1f9b0ab, 0x0b6baac3b4358dbb}}},
-{{{0x7ae62bcb8622fe98, 0x47762256ceb891af, 0x1a5a92bcf2e406b4, 0x7d29401784e41501}},
- {{0x204abad63700a93b, 0xbe0023d3da779373, 0xd85f0346633ab709, 0x00496dc490820412}},
- {{0x1c74b88dc27e6360, 0x074854268d14850c, 0xa145fb7b3e0dcb30, 0x10843f1b43803b23}}},
-{{{0xc5f90455376276dd, 0xce59158dd7645cd9, 0x92f65d511d366b39, 0x11574b6e526996c4}},
- {{0xd56f672de324689b, 0xd1da8aedb394a981, 0xdd7b58fe9168cfed, 0x7ce246cd4d56c1e8}},
- {{0xb8f4308e7f80be53, 0x5f3cb8cb34a9d397, 0x18a961bd33cc2b2c, 0x710045fb3a9af671}}},
-{{{0x73f93d36101b95eb, 0xfaef33794f6f4486, 0x5651735f8f15e562, 0x7fa3f19058b40da1}},
- {{0xa03fc862059d699e, 0x2370cfa19a619e69, 0xc4fe3b122f823deb, 0x1d1b056fa7f0844e}},
- {{0x1bc64631e56bf61f, 0xd379ab106e5382a3, 0x4d58c57e0540168d, 0x566256628442d8e4}}},
-{{{0xb9e499def6267ff6, 0x7772ca7b742c0843, 0x23a0153fe9a4f2b1, 0x2cdfdfecd5d05006}},
- {{0xdd499cd61ff38640, 0x29cd9bc3063625a0, 0x51e2d8023dd73dc3, 0x4a25707a203b9231}},
- {{0x2ab7668a53f6ed6a, 0x304242581dd170a1, 0x4000144c3ae20161, 0x5721896d248e49fc}}},
-{{{0x0b6e5517fd181bae, 0x9022629f2bb963b4, 0x5509bce932064625, 0x578edd74f63c13da}},
- {{0x285d5091a1d0da4e, 0x4baa6fa7b5fe3e08, 0x63e5177ce19393b3, 0x03c935afc4b030fd}},
- {{0x997276c6492b0c3d, 0x47ccc2c4dfe205fc, 0xdcd29b84dd623a3c, 0x3ec2ab590288c7a2}}},
-{{{0xa1a0d27be4d87bb9, 0xa98b4deb61391aed, 0x99a0ddd073cb9b83, 0x2dd5c25a200fcace}},
- {{0xa7213a09ae32d1cb, 0x0f2b87df40f5c2d5, 0x0baea4c6e81eab29, 0x0e1bf66c6adbac5e}},
- {{0xe2abd5e9792c887e, 0x1a020018cb926d5d, 0xbfba69cdbaae5f1e, 0x730548b35ae88f5f}}},
-{{{0xc43551a3cba8b8ee, 0x65a26f1db2115f16, 0x760f4f52ab8c3850, 0x3043443b411db8ca}},
- {{0x805b094ba1d6e334, 0xbf3ef17709353f19, 0x423f06cb0622702b, 0x585a2277d87845dd}},
- {{0xa18a5f8233d48962, 0x6698c4b5ec78257f, 0xa78e6fa5373e41ff, 0x7656278950ef981f}}},
-{{{0x38c3cf59d51fc8c0, 0x9bedd2fd0506b6f2, 0x26bf109fab570e8f, 0x3f4160a8c1b846a6}},
- {{0xe17073a3ea86cf9d, 0x3a8cfbb707155fdc, 0x4853e7fc31838a8e, 0x28bbf484b613f616}},
- {{0xf2612f5c6f136c7c, 0xafead107f6dd11be, 0x527e9ad213de6f33, 0x1e79cb358188f75d}}},
-{{{0x013436c3eef7e3f1, 0x828b6a7ffe9e10f8, 0x7ff908e5bcf9defc, 0x65d7951b3a3b3831}},
- {{0x77e953d8f5e08181, 0x84a50c44299dded9, 0xdc6c2d0c864525e5, 0x478ab52d39d1f2f4}},
- {{0x66a6a4d39252d159, 0xe5dde1bc871ac807, 0xb82c6b40a6c1c96f, 0x16d87a411a212214}}},
-{{{0xb3bd7e5a42066215, 0x879be3cd0c5a24c1, 0x57c05db1d6f994b7, 0x28f87c8165f38ca6}},
- {{0xfba4d5e2d54e0583, 0xe21fafd72ebd99fa, 0x497ac2736ee9778f, 0x1f990b577a5a6dde}},
- {{0xa3344ead1be8f7d6, 0x7d1e50ebacea798f, 0x77c6569e520de052, 0x45882fe1534d6d3e}}},
-{{{0x6669345d757983d6, 0x62b6ed1117aa11a6, 0x7ddd1857985e128f, 0x688fe5b8f626f6dd}},
- {{0xd8ac9929943c6fe4, 0xb5f9f161a38392a2, 0x2699db13bec89af3, 0x7dcf843ce405f074}},
- {{0x6c90d6484a4732c0, 0xd52143fdca563299, 0xb3be28c3915dc6e1, 0x6739687e7327191b}}},
-{{{0x9f65c5ea200814cf, 0x840536e169a31740, 0x8b0ed13925c8b4ad, 0x0080dbafe936361d}},
- {{0x8ce5aad0c9cb971f, 0x1156aaa99fd54a29, 0x41f7247015af9b78, 0x1fe8cca8420f49aa}},
- {{0x72a1848f3c0cc82a, 0x38c560c2877c9e54, 0x5004e228ce554140, 0x042418a103429d71}}},
-{{{0x899dea51abf3ff5f, 0x9b93a8672fc2d8ba, 0x2c38cb97be6ebd5c, 0x114d578497263b5d}},
- {{0x58e84c6f20816247, 0x8db2b2b6e36fd793, 0x977182561d484d85, 0x0822024f8632abd7}},
- {{0xb301bb7c6b1beca3, 0x55393f6dc6eb1375, 0x910d281097b6e4eb, 0x1ad4548d9d479ea3}}},
-{{{0xcd5a7da0389a48fd, 0xb38fa4aa9a78371e, 0xc6d9761b2cdb8e6c, 0x35cf51dbc97e1443}},
- {{0xa06fe66d0fe9fed3, 0xa8733a401c587909, 0x30d14d800df98953, 0x41ce5876c7b30258}},
- {{0x59ac3bc5d670c022, 0xeae67c109b119406, 0x9798bdf0b3782fda, 0x651e3201fd074092}}},
-{{{0xd63d8483ef30c5cf, 0x4cd4b4962361cc0c, 0xee90e500a48426ac, 0x0af51d7d18c14eeb}},
- {{0xa57ba4a01efcae9e, 0x769f4beedc308a94, 0xd1f10eeb3603cb2e, 0x4099ce5e7e441278}},
- {{0x1ac98e4f8a5121e9, 0x7dae9544dbfa2fe0, 0x8320aa0dd6430df9, 0x667282652c4a2fb5}}},
-{{{0x874621f4d86bc9ab, 0xb54c7bbe56fe6fea, 0x077a24257fadc22c, 0x1ab53be419b90d39}},
- {{0xada8b6e02946db23, 0x1c0ce51a7b253ab7, 0x8448c85a66dd485b, 0x7f1fc025d0675adf}},
- {{0xd8ee1b18319ea6aa, 0x004d88083a21f0da, 0x3bd6aa1d883a4f4b, 0x4db9a3a6dfd9fd14}}},
-{{{0x8ce7b23bb99c0755, 0x35c5d6edc4f50f7a, 0x7e1e2ed2ed9b50c3, 0x36305f16e8934da1}},
- {{0xd95b00bbcbb77c68, 0xddbc846a91f17849, 0x7cf700aebe28d9b3, 0x5ce1285c85d31f3e}},
- {{0x31b6972d98b0bde8, 0x7d920706aca6de5b, 0xe67310f8908a659f, 0x50fac2a6efdf0235}}},
-{{{0xf3d3a9f35b880f5a, 0xedec050cdb03e7c2, 0xa896981ff9f0b1a2, 0x49a4ae2bac5e34a4}},
- {{0x295b1c86f6f449bc, 0x51b2e84a1f0ab4dd, 0xc001cb30aa8e551d, 0x6a28d35944f43662}},
- {{0x28bb12ee04a740e0, 0x14313bbd9bce8174, 0x72f5b5e4e8c10c40, 0x7cbfb19936adcd5b}}},
-{{{0xa311ddc26b89792d, 0x1b30b4c6da512664, 0x0ca77b4ccf150859, 0x1de443df1b009408}},
- {{0x8e793a7acc36e6e0, 0xf9fab7a37d586eed, 0x3a4f9692bae1f4e4, 0x1c14b03eff5f447e}},
- {{0x19647bd114a85291, 0x57b76cb21034d3af, 0x6329db440f9d6dfa, 0x5ef43e586a571493}}},
-{{{0xef782014385675a6, 0xa2649f30aafda9e8, 0x4cd1eb505cdfa8cb, 0x46115aba1d4dc0b3}},
- {{0xa66dcc9dc80c1ac0, 0x97a05cf41b38a436, 0xa7ebf3be95dbd7c6, 0x7da0b8f68d7e7dab}},
- {{0xd40f1953c3b5da76, 0x1dac6f7321119e9b, 0x03cc6021feb25960, 0x5a5f887e83674b4b}}},
-{{{0x8f6301cf70a13d11, 0xcfceb815350dd0c4, 0xf70297d4a4bca47e, 0x3669b656e44d1434}},
- {{0x9e9628d3a0a643b9, 0xb5c3cb00e6c32064, 0x9b5302897c2dec32, 0x43e37ae2d5d1c70c}},
- {{0x387e3f06eda6e133, 0x67301d5199a13ac0, 0xbd5ad8f836263811, 0x6a21e6cd4fd5e9be}}},
-{{{0xf1c6170a3046e65f, 0x58712a2a00d23524, 0x69dbbd3c8c82b755, 0x586bf9f1a195ff57}},
- {{0xef4129126699b2e3, 0x71d30847708d1301, 0x325432d01182b0bd, 0x45371b07001e8b36}},
- {{0xa6db088d5ef8790b, 0x5278f0dc610937e5, 0xac0349d261a16eb8, 0x0eafb03790e52179}}},
-{{{0x960555c13748042f, 0x219a41e6820baa11, 0x1c81f73873486d0c, 0x309acc675a02c661}},
- {{0x5140805e0f75ae1d, 0xec02fbe32662cc30, 0x2cebdf1eea92396d, 0x44ae3344c5435bb3}},
- {{0x9cf289b9bba543ee, 0xf3760e9d5ac97142, 0x1d82e5c64f9360aa, 0x62d5221b7f94678f}}},
-{{{0x524c299c18d0936d, 0xc86bb56c8a0c1a0c, 0xa375052edb4a8631, 0x5c0efde4bc754562}},
- {{0x7585d4263af77a3c, 0xdfae7b11fee9144d, 0xa506708059f7193d, 0x14f29a5383922037}},
- {{0xdf717edc25b2d7f5, 0x21f970db99b53040, 0xda9234b7c3ed4c62, 0x5e72365c7bee093e}}},
-{{{0x575bfc074571217f, 0x3779675d0694d95b, 0x9a0a37bbf4191e33, 0x77f1104c47b4eabc}},
- {{0x7d9339062f08b33e, 0x5b9659e5df9f32be, 0xacff3dad1f9ebdfd, 0x70b20555cb7349b7}},
- {{0xbe5113c555112c4c, 0x6688423a9a881fcd, 0x446677855e503b47, 0x0e34398f4a06404a}}},
-{{{0xb67d22d93ecebde8, 0x09b3e84127822f07, 0x743fa61fb05b6d8d, 0x5e5405368a362372}},
- {{0x18930b093e4b1928, 0x7de3e10e73f3f640, 0xf43217da73395d6f, 0x6f8aded6ca379c3e}},
- {{0xe340123dfdb7b29a, 0x487b97e1a21ab291, 0xf9967d02fde6949e, 0x780de72ec8d3de97}}},
-{{{0x0ae28545089ae7bc, 0x388ddecf1c7f4d06, 0x38ac15510a4811b8, 0x0eb28bf671928ce4}},
- {{0x671feaf300f42772, 0x8f72eb2a2a8c41aa, 0x29a17fd797373292, 0x1defc6ad32b587a6}},
- {{0xaf5bbe1aef5195a7, 0x148c1277917b15ed, 0x2991f7fb7ae5da2e, 0x467d201bf8dd2867}}},
-{{{0x7906ee72f7bd2e6b, 0x05d270d6109abf4e, 0x8d5cfe45b941a8a4, 0x44c218671c974287}},
- {{0x745f9d56296bc318, 0x993580d4d8152e65, 0xb0e5b13f5839e9ce, 0x51fc2b28d43921c0}},
- {{0x1b8fd11795e2a98c, 0x1c4e5ee12b6b6291, 0x5b30e7107424b572, 0x6e6b9de84c4f4ac6}}},
-{{{0xdff25fce4b1de151, 0xd841c0c7e11c4025, 0x2554b3c854749c87, 0x2d292459908e0df9}},
- {{0x6b7c5f10f80cb088, 0x736b54dc56e42151, 0xc2b620a5c6ef99c4, 0x5f4c802cc3a06f42}},
- {{0x9b65c8f17d0752da, 0x881ce338c77ee800, 0xc3b514f05b62f9e3, 0x66ed5dd5bec10d48}}},
-{{{0x7d38a1c20bb2089d, 0x808334e196ccd412, 0xc4a70b8c6c97d313, 0x2eacf8bc03007f20}},
- {{0xf0adf3c9cbca047d, 0x81c3b2cbf4552f6b, 0xcfda112d44735f93, 0x1f23a0c77e20048c}},
- {{0xf235467be5bc1570, 0x03d2d9020dbab38c, 0x27529aa2fcf9e09e, 0x0840bef29d34bc50}}},
-{{{0x796dfb35dc10b287, 0x27176bcd5c7ff29d, 0x7f3d43e8c7b24905, 0x0304f5a191c54276}},
- {{0xcd54e06b7f37e4eb, 0x8cc15f87f5e96cca, 0xb8248bb0d3597dce, 0x246affa06074400c}},
- {{0x37d88e68fbe45321, 0x86097548c0d75032, 0x4e9b13ef894a0d35, 0x25a83cac5753d325}}},
-{{{0x10222f48eed8165e, 0x623fc1234b8bcf3a, 0x1e145c09c221e8f0, 0x7ccfa59fca782630}},
- {{0x9f0f66293952b6e2, 0x33db5e0e0934267b, 0xff45252bd609fedc, 0x06be10f5c506e0c9}},
- {{0x1a9615a9b62a345f, 0x22050c564a52fecc, 0xa7a2788528bc0dfe, 0x5e82770a1a1ee71d}}},
-{{{0x35425183ad896a5c, 0xe8673afbe78d52f6, 0x2c66f25f92a35f64, 0x09d04f3b3b86b102}},
- {{0xe802e80a42339c74, 0x34175166a7fffae5, 0x34865d1f1c408cae, 0x2cca982c605bc5ee}},
- {{0xfd2d5d35197dbe6e, 0x207c2eea8be4ffa3, 0x2613d8db325ae918, 0x7a325d1727741d3e}}},
-{{{0xd036b9bbd16dfde2, 0xa2055757c497a829, 0x8e6cc966a7f12667, 0x4d3b1a791239c180}},
- {{0xecd27d017e2a076a, 0xd788689f1636495e, 0x52a61af0919233e5, 0x2a479df17bb1ae64}},
- {{0x9e5eee8e33db2710, 0x189854ded6c43ca5, 0xa41c22c592718138, 0x27ad5538a43a5e9b}}},
-{{{0x2746dd4b15350d61, 0xd03fcbc8ee9521b7, 0xe86e365a138672ca, 0x510e987f7e7d89e2}},
- {{0xcb5a7d638e47077c, 0x8db7536120a1c059, 0x549e1e4d8bedfdcc, 0x080153b7503b179d}},
- {{0xdda69d930a3ed3e3, 0x3d386ef1cd60a722, 0xc817ad58bdaa4ee6, 0x23be8d554fe7372a}}},
-{{{0x95fe919a74ef4fad, 0x3a827becf6a308a2, 0x964e01d309a47b01, 0x71c43c4f5ba3c797}},
- {{0xbc1ef4bd567ae7a9, 0x3f624cb2d64498bd, 0xe41064d22c1f4ec8, 0x2ef9c5a5ba384001}},
- {{0xb6fd6df6fa9e74cd, 0xf18278bce4af267a, 0x8255b3d0f1ef990e, 0x5a758ca390c5f293}}},
-{{{0xa2b72710d9462495, 0x3aa8c6d2d57d5003, 0xe3d400bfa0b487ca, 0x2dbae244b3eb72ec}},
- {{0x8ce0918b1d61dc94, 0x8ded36469a813066, 0xd4e6a829afe8aad3, 0x0a738027f639d43f}},
- {{0x980f4a2f57ffe1cc, 0x00670d0de1839843, 0x105c3f4a49fb15fd, 0x2698ca635126a69c}}},
-{{{0xe765318832b0ba78, 0x381831f7925cff8b, 0x08a81b91a0291fcc, 0x1fb43dcc49caeb07}},
- {{0x2e3d702f5e3dd90e, 0x9e3f0918e4d25386, 0x5e773ef6024da96a, 0x3c004b0c4afa3332}},
- {{0x9aa946ac06f4b82b, 0x1ca284a5a806c4f3, 0x3ed3265fc6cd4787, 0x6b43fd01cd1fd217}}},
-{{{0xc7a75d4b4697c544, 0x15fdf848df0fffbf, 0x2868b9ebaa46785a, 0x5a68d7105b52f714}},
- {{0xb5c742583e760ef3, 0x75dc52b9ee0ab990, 0xbf1427c2072b923f, 0x73420b2d6ff0d9f0}},
- {{0xaf2cf6cb9e851e06, 0x8f593913c62238c4, 0xda8ab89699fbf373, 0x3db5632fea34bc9e}}},
-{{{0xf46eee2bf75dd9d8, 0x0d17b1f6396759a5, 0x1bf2d131499e7273, 0x04321adf49d75f13}},
- {{0x2e4990b1829825d5, 0xedeaeb873e9a8991, 0xeef03d394c704af8, 0x59197ea495df2b0e}},
- {{0x04e16019e4e55aae, 0xe77b437a7e2f92e9, 0xc7ce2dc16f159aa4, 0x45eafdc1f4d70cc0}}},
-{{{0x698401858045d72b, 0x4c22faa2cf2f0651, 0x941a36656b222dc6, 0x5a5eebc80362dade}},
- {{0xb60e4624cfccb1ed, 0x59dbc292bd5c0395, 0x31a09d1ddc0481c9, 0x3f73ceea5d56d940}},
- {{0xb7a7bfd10a4e8dc6, 0xbe57007e44c9b339, 0x60c1207f1557aefa, 0x26058891266218db}}},
-{{{0x59f704a68360ff04, 0xc3d93fde7661e6f4, 0x831b2a7312873551, 0x54ad0c2e4e615d57}},
- {{0x4c818e3cc676e542, 0x5e422c9303ceccad, 0xec07cccab4129f08, 0x0dedfa10b24443b8}},
- {{0xee3b67d5b82b522a, 0x36f163469fa5c1eb, 0xa5b4d2f26ec19fd3, 0x62ecb2baa77a9408}}},
-{{{0xe5ed795261152b3d, 0x4962357d0eddd7d1, 0x7482c8d0b96b4c71, 0x2e59f919a966d8be}},
- {{0x92072836afb62874, 0x5fcd5e8579e104a5, 0x5aad01adc630a14a, 0x61913d5075663f98}},
- {{0x0dc62d361a3231da, 0xfa47583294200270, 0x02d801513f9594ce, 0x3ddbc2a131c05d5c}}},
-{{{0x3f50a50a4ffb81ef, 0xb1e035093bf420bf, 0x9baa8e1cc6aa2cd0, 0x32239861fa237a40}},
- {{0xfb735ac2004a35d1, 0x31de0f433a6607c3, 0x7b8591bfc528d599, 0x55be9a25f5bb050c}},
- {{0x0d005acd33db3dbf, 0x0111b37c80ac35e2, 0x4892d66c6f88ebeb, 0x770eadb16508fbcd}}},
-{{{0x8451f9e05e4e89dd, 0xc06302ffbc793937, 0x5d22749556a6495c, 0x09a6755ca05603fb}},
- {{0xf1d3b681a05071b9, 0x2207659a3592ff3a, 0x5f0169297881e40e, 0x16bedd0e86ba374e}},
- {{0x5ecccc4f2c2737b5, 0x43b79e0c2dccb703, 0x33e008bc4ec43df3, 0x06c1b840f07566c0}}},
-{{{0x7688a5c6a388f877, 0x02a96c14deb2b6ac, 0x64c9f3431b8c2af8, 0x3628435554a1eed6}},
- {{0x69ee9e7f9b02805c, 0xcbff828a547d1640, 0x3d93a869b2430968, 0x46b7b8cd3fe26972}},
- {{0xe9812086fe7eebe0, 0x4cba6be72f515437, 0x1d04168b516efae9, 0x5ea1391043982cb9}}},
-{{{0x49125c9cf4702ee1, 0x4520b71f8b25b32d, 0x33193026501fef7e, 0x656d8997c8d2eb2b}},
- {{0x6f2b3be4d5d3b002, 0xafec33d96a09c880, 0x035f73a4a8bcc4cc, 0x22c5b9284662198b}},
- {{0xcb58c8fe433d8939, 0x89a0cb2e6a8d7e50, 0x79ca955309fbbe5a, 0x0c626616cd7fc106}}},
-{{{0x1ffeb80a4879b61f, 0x6396726e4ada21ed, 0x33c7b093368025ba, 0x471aa0c6f3c31788}},
- {{0x8fdfc379fbf454b1, 0x45a5a970f1a4b771, 0xac921ef7bad35915, 0x42d088dca81c2192}},
- {{0x8fda0f37a0165199, 0x0adadb77c8a0e343, 0x20fbfdfcc875e820, 0x1cf2bea80c2206e7}}},
-{{{0xc2ddf1deb36202ac, 0x92a5fe09d2e27aa5, 0x7d1648f6fc09f1d3, 0x74c2cc0513bc4959}},
- {{0x982d6e1a02c0412f, 0x90fa4c83db58e8fe, 0x01c2f5bcdcb18bc0, 0x686e0c90216abc66}},
- {{0x1fadbadba54395a7, 0xb41a02a0ae0da66a, 0xbf19f598bba37c07, 0x6a12b8acde48430d}}},
-{{{0xf8daea1f39d495d9, 0x592c190e525f1dfc, 0xdb8cbd04c9991d1b, 0x11f7fda3d88f0cb7}},
- {{0x793bdd801aaeeb5f, 0x00a2a0aac1518871, 0xe8a373a31f2136b4, 0x48aab888fc91ef19}},
- {{0x041f7e925830f40e, 0x002d6ca979661c06, 0x86dc9ff92b046a2e, 0x760360928b0493d1}}},
-{{{0x21bb41c6120cf9c6, 0xeab2aa12decda59b, 0xc1a72d020aa48b34, 0x215d4d27e87d3b68}},
- {{0xb43108e5695a0b05, 0x6cb00ee8ad37a38b, 0x5edad6eea3537381, 0x3f2602d4b6dc3224}},
- {{0xc8b247b65bcaf19c, 0x49779dc3b1b2c652, 0x89a180bbd5ece2e2, 0x13f098a3cec8e039}}},
-{{{0x9adc0ff9ce5ec54b, 0x039c2a6b8c2f130d, 0x028007c7f0f89515, 0x78968314ac04b36b}},
- {{0xf3aa57a22796bb14, 0x883abab79b07da21, 0xe54be21831a0391c, 0x5ee7fb38d83205f9}},
- {{0x538dfdcb41446a8e, 0xa5acfda9434937f9, 0x46af908d263c8c78, 0x61d0633c9bca0d09}}},
-{{{0x63744935ffdb2566, 0xc5bd6b89780b68bb, 0x6f1b3280553eec03, 0x6e965fd847aed7f5}},
- {{0xada328bcf8fc73df, 0xee84695da6f037fc, 0x637fb4db38c2a909, 0x5b23ac2df8067bdc}},
- {{0x9ad2b953ee80527b, 0xe88f19aafade6d8d, 0x0e711704150e82cf, 0x79b9bbb9dd95dedc}}},
-{{{0xebb355406a3126c2, 0xd26383a868c8c393, 0x6c0c6429e5b97a82, 0x5065f158c9fd2147}},
- {{0xd1997dae8e9f7374, 0xa032a2f8cfbb0816, 0xcd6cba126d445f0a, 0x1ba811460accb834}},
- {{0x708169fb0c429954, 0xe14600acd76ecf67, 0x2eaab98a70e645ba, 0x3981f39e58a4faf2}}},
-{{{0x18fb8a7559230a93, 0x1d168f6960e6f45d, 0x3a85a94514a93cb5, 0x38dc083705acd0fd}},
- {{0xc845dfa56de66fde, 0xe152a5002c40483a, 0xe9d2e163c7b4f632, 0x30f4452edcbc1b65}},
- {{0x856d2782c5759740, 0xfa134569f99cbecc, 0x8844fc73c0ea4e71, 0x632d9a1a593f2469}}},
-{{{0xf6bb6b15b807cba6, 0x1823c7dfbc54f0d7, 0xbb1d97036e29670b, 0x0b24f48847ed4a57}},
- {{0xbf09fd11ed0c84a7, 0x63f071810d9f693a, 0x21908c2d57cf8779, 0x3a5a7df28af64ba2}},
- {{0xdcdad4be511beac7, 0xa4538075ed26ccf2, 0xe19cff9f005f9a65, 0x34fcf74475481f63}}},
-{{{0xc197e04c789767ca, 0xb8714dcb38d9467d, 0x55de888283f95fa8, 0x3d3bdc164dfa63f7}},
- {{0xa5bb1dab78cfaa98, 0x5ceda267190b72f2, 0x9309c9110a92608e, 0x0119a3042fb374b0}},
- {{0x67a2d89ce8c2177d, 0x669da5f66895d0c1, 0xf56598e5b282a2b0, 0x56c088f1ede20a73}}},
-{{{0x336d3d1110a86e17, 0xd7f388320b75b2fa, 0xf915337625072988, 0x09674c6b99108b87}},
- {{0x581b5fac24f38f02, 0xa90be9febae30cbd, 0x9a2169028acf92f0, 0x038b7ea48359038f}},
- {{0x9f4ef82199316ff8, 0x2f49d282eaa78d4f, 0x0971a5ab5aef3174, 0x6e5e31025969eb65}}},
-{{{0xb16c62f587e593fb, 0x4999eddeca5d3e71, 0xb491c1e014cc3e6d, 0x08f5114789a8dba8}},
- {{0x3304fb0e63066222, 0xfb35068987acba3f, 0xbd1924778c1061a3, 0x3058ad43d1838620}},
- {{0x323c0ffde57663d0, 0x05c3df38a22ea610, 0xbdc78abdac994f9a, 0x26549fa4efe3dc99}}},
-{{{0x738b38d787ce8f89, 0xb62658e24179a88d, 0x30738c9cf151316d, 0x49128c7f727275c9}},
- {{0x04dbbc17f75396b9, 0x69e6a2d7d2f86746, 0xc6409d99f53eabc6, 0x606175f6332e25d2}},
- {{0x4021370ef540e7dd, 0x0910d6f5a1f1d0a5, 0x4634aacd5b06b807, 0x6a39e6356944f235}}},
-{{{0x96cd5640df90f3e7, 0x6c3a760edbfa25ea, 0x24f3ef0959e33cc4, 0x42889e7e530d2e58}},
- {{0x1da1965774049e9d, 0xfbcd6ea198fe352b, 0xb1cbcd50cc5236a6, 0x1f5ec83d3f9846e2}},
- {{0x8efb23c3328ccb75, 0xaf42a207dd876ee9, 0x20fbdadc5dfae796, 0x241e246b06bf9f51}}},
-{{{0x29e68e57ad6e98f6, 0x4c9260c80b462065, 0x3f00862ea51ebb4b, 0x5bc2c77fb38d9097}},
- {{0x7eaafc9a6280bbb8, 0x22a70f12f403d809, 0x31ce40bb1bfc8d20, 0x2bc65635e8bd53ee}},
- {{0xe8d5dc9fa96bad93, 0xe58fb17dde1947dc, 0x681532ea65185fa3, 0x1fdd6c3b034a7830}}},
-{{{0x0a64e28c55dc18fe, 0xe3df9e993399ebdd, 0x79ac432370e2e652, 0x35ff7fc33ae4cc0e}},
- {{0x9c13a6a52dd8f7a9, 0x2dbb1f8c3efdcabf, 0x961e32405e08f7b5, 0x48c8a121bbe6c9e5}},
- {{0xfc415a7c59646445, 0xd224b2d7c128b615, 0x6035c9c905fbb912, 0x42d7a91274429fab}}},
-{{{0x4e6213e3eaf72ed3, 0x6794981a43acd4e7, 0xff547cde6eb508cb, 0x6fed19dd10fcb532}},
- {{0xa9a48947933da5bc, 0x4a58920ec2e979ec, 0x96d8800013e5ac4c, 0x453692d74b48b147}},
- {{0xdd775d99a8559c6f, 0xf42a2140df003e24, 0x5223e229da928a66, 0x063f46ba6d38f22c}}},
-{{{0xd2d242895f536694, 0xca33a2c542939b2c, 0x986fada6c7ddb95c, 0x5a152c042f712d5d}},
- {{0x39843cb737346921, 0xa747fb0738c89447, 0xcb8d8031a245307e, 0x67810f8e6d82f068}},
- {{0x3eeb8fbcd2287db4, 0x72c7d3a301a03e93, 0x5473e88cbd98265a, 0x7324aa515921b403}}},
-{{{0x857942f46c3cbe8e, 0xa1d364b14730c046, 0x1c8ed914d23c41bf, 0x0838e161eef6d5d2}},
- {{0xad23f6dae82354cb, 0x6962502ab6571a6d, 0x9b651636e38e37d1, 0x5cac5005d1a3312f}},
- {{0x8cc154cce9e39904, 0x5b3a040b84de6846, 0xc4d8a61cb1be5d6e, 0x40fb897bd8861f02}}},
-{{{0x84c5aa9062de37a1, 0x421da5000d1d96e1, 0x788286306a9242d9, 0x3c5e464a690d10da}},
- {{0xe57ed8475ab10761, 0x71435e206fd13746, 0x342f824ecd025632, 0x4b16281ea8791e7b}},
- {{0xd1c101d50b813381, 0xdee60f1176ee6828, 0x0cb68893383f6409, 0x6183c565f6ff484a}}},
-{{{0x741d5a461e6bf9d6, 0x2305b3fc7777a581, 0xd45574a26474d3d9, 0x1926e1dc6401e0ff}},
- {{0xdb468549af3f666e, 0xd77fcf04f14a0ea5, 0x3df23ff7a4ba0c47, 0x3a10dfe132ce3c85}},
- {{0xe07f4e8aea17cea0, 0x2fd515463a1fc1fd, 0x175322fd31f2c0f1, 0x1fa1d01d861e5d15}}},
-{{{0xcc8055947d599832, 0x1e4656da37f15520, 0x99f6f7744e059320, 0x773563bc6a75cf33}},
- {{0x38dcac00d1df94ab, 0x2e712bddd1080de9, 0x7f13e93efdd5e262, 0x73fced18ee9a01e5}},
- {{0x06b1e90863139cb3, 0xa493da67c5a03ecd, 0x8d77cec8ad638932, 0x1f426b701b864f44}}},
-{{{0xefc9264c41911c01, 0xf1a3b7b817a22c25, 0x5875da6bf30f1447, 0x4e1af5271d31b090}},
- {{0xf17e35c891a12552, 0xb76b8153575e9c76, 0xfa83406f0d9b723e, 0x0b76bb1b3fa7e438}},
- {{0x08b8c1f97f92939b, 0xbe6771cbd444ab6e, 0x22e5646399bb8017, 0x7b6dd61eb772a955}}},
-{{{0xb7adc1e850f33d92, 0x7998fa4f608cd5cf, 0xad962dbd8dfc5bdb, 0x703e9bceaf1d2f4f}},
- {{0x5730abf9ab01d2c7, 0x16fb76dc40143b18, 0x866cbe65a0cbb281, 0x53fa9b659bff6afe}},
- {{0x6c14c8e994885455, 0x843a5d6665aed4e5, 0x181bb73ebcd65af1, 0x398d93e5c4c61f50}}},
-{{{0x1c4bd16733e248f3, 0xbd9e128715bf0a5f, 0xd43f8cf0a10b0376, 0x53b09b5ddf191b13}},
- {{0xc3877c60d2e7e3f2, 0x3b34aaa030828bb1, 0x283e26e7739ef138, 0x699c9c9002c30577}},
- {{0xf306a7235946f1cc, 0x921718b5cce5d97d, 0x28cdd24781b4e975, 0x51caf30c6fcdd907}}},
-{{{0xa60ba7427674e00a, 0x630e8570a17a7bf3, 0x3758563dcf3324cc, 0x5504aa292383fdaa}},
- {{0x737af99a18ac54c7, 0x903378dcc51cb30f, 0x2b89bc334ce10cc7, 0x12ae29c189f8e99a}},
- {{0xa99ec0cb1f0d01cf, 0x0dd1efcc3a34f7ae, 0x55ca7521d09c4e22, 0x5fd14fe958eba5ea}}},
-{{{0xb5dc2ddf2845ab2c, 0x069491b10a7fe993, 0x4daaf3d64002e346, 0x093ff26e586474d1}},
- {{0x3c42fe5ebf93cb8e, 0xbedfa85136d4565f, 0xe0f0859e884220e8, 0x7dd73f960725d128}},
- {{0xb10d24fe68059829, 0x75730672dbaf23e5, 0x1367253ab457ac29, 0x2f59bcbc86b470a4}}},
-{{{0x83847d429917135f, 0xad1b911f567d03d7, 0x7e7748d9be77aad1, 0x5458b42e2e51af4a}},
- {{0x7041d560b691c301, 0x85201b3fadd7e71e, 0x16c2e16311335585, 0x2aa55e3d010828b1}},
- {{0xed5192e60c07444f, 0x42c54e2d74421d10, 0x352b4c82fdb5c864, 0x13e9004a8a768664}}},
-{{{0xcbb5b5556c032bff, 0xdf7191b729297a3a, 0xc1ff7326aded81bb, 0x71ade8bb68be03f5}},
- {{0x1e6284c5806b467c, 0xc5f6997be75d607b, 0x8b67d958b378d262, 0x3d88d66a81cd8b70}},
- {{0x8b767a93204ed789, 0x762fcacb9fa0ae2a, 0x771febcc6dce4887, 0x343062158ff05fb3}}},
-{{{0xe05da1a7e1f5bf49, 0x26457d6dd4736092, 0x77dcb07773cc32f6, 0x0a5d94969cdd5fcd}},
- {{0xfce219072a7b31b4, 0x4d7adc75aa578016, 0x0ec276a687479324, 0x6d6d9d5d1fda4beb}},
- {{0x22b1a58ae9b08183, 0xfd95d071c15c388b, 0xa9812376850a0517, 0x33384cbabb7f335e}}},
-{{{0x3c6fa2680ca2c7b5, 0x1b5082046fb64fda, 0xeb53349c5431d6de, 0x5278b38f6b879c89}},
- {{0x33bc627a26218b8d, 0xea80b21fc7a80c61, 0x9458b12b173e9ee6, 0x076247be0e2f3059}},
- {{0x52e105f61416375a, 0xec97af3685abeba4, 0x26e6b50623a67c36, 0x5cf0e856f3d4fb01}}},
-{{{0xf6c968731ae8cab4, 0x5e20741ecb4f92c5, 0x2da53be58ccdbc3e, 0x2dddfea269970df7}},
- {{0xbeaece313db342a8, 0xcba3635b842db7ee, 0xe88c6620817f13ef, 0x1b9438aa4e76d5c6}},
- {{0x8a50777e166f031a, 0x067b39f10fb7a328, 0x1925c9a6010fbd76, 0x6df9b575cc740905}}},
-{{{0x42c1192927f6bdcf, 0x8f91917a403d61ca, 0xdc1c5a668b9e1f61, 0x1596047804ec0f8d}},
- {{0xecdfc35b48cade41, 0x6a88471fb2328270, 0x740a4a2440a01b6a, 0x471e5796003b5f29}},
- {{0xda96bbb3aced37ac, 0x7a2423b5e9208cea, 0x24cc5c3038aebae2, 0x50c356afdc5dae2f}}},
-{{{0x09dcbf4341c30318, 0xeeba061183181dce, 0xc179c0cedc1e29a1, 0x1dbf7b89073f35b0}},
- {{0xcfed9cdf1b31b964, 0xf486a9858ca51af3, 0x14897265ea8c1f84, 0x784a53dd932acc00}},
- {{0x2d99f9df14fc4920, 0x76ccb60cc4499fe5, 0xa4132cbbe5cf0003, 0x3f93d82354f000ea}}},
-{{{0x8183e7689e04ce85, 0x678fb71e04465341, 0xad92058f6688edac, 0x5da350d3532b099a}},
- {{0xeaac12d179e14978, 0xff923ff3bbebff5e, 0x4af663e40663ce27, 0x0fd381a811a5f5ff}},
- {{0xf256aceca436df54, 0x108b6168ae69d6e8, 0x20d986cb6b5d036c, 0x655957b9fee2af50}}},
-{{{0xaea8b07fa902030f, 0xf88c766af463d143, 0x15b083663c787a60, 0x08eab1148267a4a8}},
- {{0xbdc1409bd002d0ac, 0x66660245b5ccd9a6, 0x82317dc4fade85ec, 0x02fe934b6ad7df0d}},
- {{0xef5cf100cfb7ea74, 0x22897633a1cb42ac, 0xd4ce0c54cef285e2, 0x30408c048a146a55}}},
-{{{0x739d8845832fcedb, 0xfa38d6c9ae6bf863, 0x32bc0dcab74ffef7, 0x73937e8814bce45e}},
- {{0xbb2e00c9193b877f, 0xece3a890e0dc506b, 0xecf3b7c036de649f, 0x5f46040898de9e1a}},
- {{0xb9037116297bf48d, 0xa9d13b22d4f06834, 0xe19715574696bdc6, 0x2cf8a4e891d5e835}}},
-{{{0x6d93fd8707110f67, 0xdd4c09d37c38b549, 0x7cb16a4cc2736a86, 0x2049bd6e58252a09}},
- {{0x2cb5487e17d06ba2, 0x24d2381c3950196b, 0xd7659c8185978a30, 0x7a6f7f2891d6a4f6}},
- {{0x7d09fd8d6a9aef49, 0xf0ee60be5b3db90b, 0x4c21b52c519ebfd4, 0x6011aadfc545941d}}},
-{{{0x5f67926dcf95f83c, 0x7c7e856171289071, 0xd6a1e7f3998f7a5b, 0x6fc5cc1b0b62f9e0}},
- {{0x63ded0c802cbf890, 0xfbd098ca0dff6aaa, 0x624d0afdb9b6ed99, 0x69ce18b779340b1e}},
- {{0xd1ef5528b29879cb, 0xdd1aae3cd47e9092, 0x127e0442189f2352, 0x15596b3ae57101f1}}},
-{{{0x462739d23f9179a2, 0xff83123197d6ddcf, 0x1307deb553f2148a, 0x0d2237687b5f4dda}},
- {{0x09ff31167e5124ca, 0x0be4158bd9c745df, 0x292b7d227ef556e5, 0x3aa4e241afb6d138}},
- {{0x2cc138bf2a3305f5, 0x48583f8fa2e926c3, 0x083ab1a25549d2eb, 0x32fcaa6e4687a36c}}},
-{{{0x7bc56e8dc57d9af5, 0x3e0bd2ed9df0bdf2, 0xaac014de22efe4a3, 0x4627e9cefebd6a5c}},
- {{0x3207a4732787ccdf, 0x17e31908f213e3f8, 0xd5b2ecd7f60d964e, 0x746f6336c2600be9}},
- {{0x3f4af345ab6c971c, 0xe288eb729943731f, 0x33596a8a0344186d, 0x7b4917007ed66293}}},
-{{{0x2d85fb5cab84b064, 0x497810d289f3bc14, 0x476adc447b15ce0c, 0x122ba376f844fd7b}},
- {{0x54341b28dd53a2dd, 0xaa17905bdf42fc3f, 0x0ff592d94dd2f8f4, 0x1d03620fe08cd37d}},
- {{0xc20232cda2b4e554, 0x9ed0fd42115d187f, 0x2eabb4be7dd479d9, 0x02c70bf52b68ec4c}}},
-{{{0xa287ec4b5d0b2fbb, 0x415c5790074882ca, 0xe044a61ec1d0815c, 0x26334f0a409ef5e0}},
- {{0xace532bf458d72e1, 0x5be768e07cb73cb5, 0x56cf7d94ee8bbde7, 0x6b0697e3feb43a03}},
- {{0xb6c8f04adf62a3c0, 0x3ef000ef076da45d, 0x9c9cb95849f0d2a9, 0x1cc37f43441b2fae}}},
-{{{0x508f565a5cc7324f, 0xd061c4c0e506a922, 0xfb18abdb5c45ac19, 0x6c6809c10380314a}},
- {{0xd76656f1c9ceaeb9, 0x1c5b15f818e5656a, 0x26e72832844c2334, 0x3a346f772f196838}},
- {{0xd2d55112e2da6ac8, 0xe9bd0331b1e851ed, 0x960746dd8ec67262, 0x05911b9f6ef7c5d0}}},
-{{{0xe9dcd756b637ff2d, 0xec4c348fc987f0c4, 0xced59285f3fbc7b7, 0x3305354793e1ea87}},
- {{0x01c18980c5fe9f94, 0xcd656769716fd5c8, 0x816045c3d195a086, 0x6e2b7f3266cc7982}},
- {{0xcc802468f7c3568f, 0x9de9ba8219974cb3, 0xabb7229cb5b81360, 0x44e2017a6fbeba62}}},
-{{{0xc4c2a74354dab774, 0x8e5d4c3c4eaf031a, 0xb76c23d242838f17, 0x749a098f68dce4ea}},
- {{0x87f82cf3b6ca6ecd, 0x580f893e18f4a0c2, 0x058930072604e557, 0x6cab6ac256d19c1d}},
- {{0xdcdfe0a02cc1de60, 0x032665ff51c5575b, 0x2c0c32f1073abeeb, 0x6a882014cd7b8606}}},
-{{{0xa52a92fea4747fb5, 0xdc12a4491fa5ab89, 0xd82da94bb847a4ce, 0x4d77edce9512cc4e}},
- {{0xd111d17caf4feb6e, 0x050bba42b33aa4a3, 0x17514c3ceeb46c30, 0x54bedb8b1bc27d75}},
- {{0x77c8e14577e2189c, 0xa3e46f6aff99c445, 0x3144dfc86d335343, 0x3a96559e7c4216a9}}},
-{{{0x12550d37f42ad2ee, 0x8b78e00498a1fbf5, 0x5d53078233894cb2, 0x02c84e4e3e498d0c}},
- {{0x4493896880baaa52, 0x4c98afc4f285940e, 0xef4aa79ba45448b6, 0x5278c510a57aae7f}},
- {{0xa54dd074294c0b94, 0xf55d46b8df18ffb6, 0xf06fecc58dae8366, 0x588657668190d165}}},
-{{{0xd47712311aef7117, 0x50343101229e92c7, 0x7a95e1849d159b97, 0x2449959b8b5d29c9}},
- {{0xbf5834f03de25cc3, 0xb887c8aed6815496, 0x5105221a9481e892, 0x6760ed19f7723f93}},
- {{0x669ba3b7ac35e160, 0x2eccf73fba842056, 0x1aec1f17c0804f07, 0x0d96bc031856f4e7}}},
-{{{0x3318be7775c52d82, 0x4cb764b554d0aab9, 0xabcf3d27cc773d91, 0x3bf4d1848123288a}},
- {{0xb1d534b0cc7505e1, 0x32cd003416c35288, 0xcb36a5800762c29d, 0x5bfe69b9237a0bf8}},
- {{0x183eab7e78a151ab, 0xbbe990c999093763, 0xff717d6e4ac7e335, 0x4c5cddb325f39f88}}},
-{{{0xc0f6b74d6190a6eb, 0x20ea81a42db8f4e4, 0xa8bd6f7d97315760, 0x33b1d60262ac7c21}},
- {{0x57750967e7a9f902, 0x2c37fdfc4f5b467e, 0xb261663a3177ba46, 0x3a375e78dc2d532b}},
- {{0x8141e72f2d4dddea, 0xe6eafe9862c607c8, 0x23c28458573cafd0, 0x46b9476f4ff97346}}},
-{{{0x0c1ffea44f901e5c, 0x2b0b6fb72184b782, 0xe587ff910114db88, 0x37130f364785a142}},
- {{0x1215505c0d58359f, 0x2a2013c7fc28c46b, 0x24a0a1af89ea664e, 0x4400b638a1130e1f}},
- {{0x3a01b76496ed19c3, 0x31e00ab0ed327230, 0x520a885783ca15b1, 0x06aab9875accbec7}}},
-{{{0xc1339983f5df0ebb, 0xc0f3758f512c4cac, 0x2cf1130a0bb398e1, 0x6b3cecf9aa270c62}},
- {{0x5349acf3512eeaef, 0x20c141d31cc1cb49, 0x24180c07a99a688d, 0x555ef9d1c64b2d17}},
- {{0x36a770ba3b73bd08, 0x624aef08a3afbf0c, 0x5737ff98b40946f2, 0x675f4de13381749d}}},
-{{{0x0e2c52036b1782fc, 0x64816c816cad83b4, 0xd0dcbdd96964073e, 0x13d99df70164c520}},
- {{0xa12ff6d93bdab31d, 0x0725d80f9d652dfe, 0x019c4ff39abe9487, 0x60f450b882cd3c43}},
- {{0x014b5ec321e5c0ca, 0x4fcb69c9d719bfa2, 0x4e5f1c18750023a0, 0x1c06de9e55edac80}}},
-{{{0x990f7ad6a33ec4e2, 0x6608f938be2ee08e, 0x9ca143c563284515, 0x4cf38a1fec2db60d}},
- {{0xffd52b40ff6d69aa, 0x34530b18dc4049bb, 0x5e4a5c2fa34d9897, 0x78096f8e7d32ba2d}},
- {{0xa0aaaa650dfa5ce7, 0xf9c49e2a48b5478c, 0x4f09cc7d7003725b, 0x373cad3a26091abe}}},
-{{{0xb294634d82c9f57c, 0x1fcbfde124934536, 0x9e9c4db3418cdb5a, 0x0040f3d9454419fc}},
- {{0xf1bea8fb89ddbbad, 0x3bcb2cbc61aeaecb, 0x8f58a7bb1f9b8d9d, 0x21547eda5112a686}},
- {{0xdefde939fd5986d3, 0xf4272c89510a380c, 0xb72ba407bb3119b9, 0x63550a334a254df4}}},
-{{{0x6507d6edb569cf37, 0x178429b00ca52ee1, 0xea7c0090eb6bd65d, 0x3eea62c7daf78f51}},
- {{0x9bba584572547b49, 0xf305c6fae2c408e0, 0x60e8fa69c734f18d, 0x39a92bafaa7d767a}},
- {{0x9d24c713e693274e, 0x5f63857768dbd375, 0x70525560eb8ab39a, 0x68436a0665c9c4cd}}},
-{{{0xbc0235e8202f3f27, 0xc75c00e264f975b0, 0x91a4e9d5a38c2416, 0x17b6e7f68ab789f9}},
- {{0x1e56d317e820107c, 0xc5266844840ae965, 0xc1e0a1c6320ffc7a, 0x5373669c91611472}},
- {{0x5d2814ab9a0e5257, 0x908f2084c9cab3fc, 0xafcaf5885b2d1eca, 0x1cb4b5a678f87d11}}},
-{{{0xb664c06b394afc6c, 0x0c88de2498da5fb1, 0x4f8d03164bcad834, 0x330bca78de7434a2}},
- {{0x6b74aa62a2a007e7, 0xf311e0b0f071c7b1, 0x5707e438000be223, 0x2dc0fd2d82ef6eac}},
- {{0x982eff841119744e, 0xf9695e962b074724, 0xc58ac14fbfc953fb, 0x3c31be1b369f1cf5}}},
-{{{0xb0f4864d08948aee, 0x07dc19ee91ba1c6f, 0x7975cdaea6aca158, 0x330b61134262d4bb}},
- {{0xc168bc93f9cb4272, 0xaeb8711fc7cedb98, 0x7f0e52aa34ac8d7a, 0x41cec1097e7d55bb}},
- {{0xf79619d7a26d808a, 0xbb1fd49e1d9e156d, 0x73d7c36cdba1df27, 0x26b44cd91f28777d}}},
-{{{0x300a9035393aa6d8, 0x2b501131a12bb1cd, 0x7b1ff677f093c222, 0x4309c1f8cab82bad}},
- {{0xaf44842db0285f37, 0x8753189047efc8df, 0x9574e091f820979a, 0x0e378d6069615579}},
- {{0xd9fa917183075a55, 0x4bdb5ad26b009fdc, 0x7829ad2cd63def0e, 0x078fc54975fd3877}}},
-{{{0x87dfbd1428878f2d, 0x134636dd1e9421a1, 0x4f17c951257341a3, 0x5df98d4bad296cb8}},
- {{0xe2004b5bb833a98a, 0x44775dec2d4c3330, 0x3aa244067eace913, 0x272630e3d58e00a9}},
- {{0xf3678fd0ecc90b54, 0xf001459b12043599, 0x26725fbc3758b89b, 0x4325e4aa73a719ae}}},
-{{{0x657dc6ef433c3493, 0x65375e9f80dbf8c3, 0x47fd2d465b372dae, 0x4966ab79796e7947}},
- {{0xed24629acf69f59d, 0x2a4a1ccedd5abbf4, 0x3535ca1f56b2d67b, 0x5d8c68d043b1b42d}},
- {{0xee332d4de3b42b0a, 0xd84e5a2b16a4601c, 0x78243877078ba3e4, 0x77ed1eb4184ee437}}},
-{{{0xbfd4e13f201839a0, 0xaeefffe23e3df161, 0xb65b04f06b5d1fe3, 0x52e085fb2b62fbc0}},
- {{0x185d43f89e92ed1a, 0xb04a1eeafe4719c6, 0x499fbe88a6f03f4f, 0x5d8b0d2f3c859bdd}},
- {{0x124079eaa54cf2ba, 0xd72465eb001b26e7, 0x6843bcfdc97af7fd, 0x0524b42b55eacd02}}},
-{{{0xfd0d5dbee45447b0, 0x6cec351a092005ee, 0x99a47844567579cb, 0x59d242a216e7fa45}},
- {{0xbc18dcad9b829eac, 0x23ae7d28b5f579d0, 0xc346122a69384233, 0x1a6110b2e7d4ac89}},
- {{0x4f833f6ae66997ac, 0x6849762a361839a4, 0x6985dec1970ab525, 0x53045e89dcb1f546}}},
-{{{0xcb8bb346d75353db, 0xfcfcb24bae511e22, 0xcba48d40d50ae6ef, 0x26e3bae5f4f7cb5d}},
- {{0x84da3cde8d45fe12, 0xbd42c218e444e2d2, 0xa85196781f7e3598, 0x7642c93f5616e2b2}},
- {{0x2323daa74595f8e4, 0xde688c8b857abeb4, 0x3fc48e961c59326e, 0x0b2e73ca15c9b8ba}}},
-{{{0xd6bb4428c17f5026, 0x9eb27223fb5a9ca7, 0xe37ba5031919c644, 0x21ce380db59a6602}},
- {{0x0e3fbfaf79c03a55, 0x3077af054cbb5acf, 0xd5c55245db3de39f, 0x015e68c1476a4af7}},
- {{0xc1d5285220066a38, 0x95603e523570aef3, 0x832659a7226b8a4d, 0x5dd689091f8eedc9}}},
-{{{0xcbac84debfd3c856, 0x1624c348b35ff244, 0xb7f88dca5d9cad07, 0x3b0e574da2c2ebe8}},
- {{0x1d022591a5313084, 0xca2d4aaed6270872, 0x86a12b852f0bfd20, 0x56e6c439ad7da748}},
- {{0xc704ff4942bdbae6, 0x5e21ade2b2de1f79, 0xe95db3f35652fad8, 0x0822b5378f08ebc1}}},
-{{{0x51f048478f387475, 0xb25dbcf49cbecb3c, 0x9aab1244d99f2055, 0x2c709e6c1c10a5d6}},
- {{0xe1b7f29362730383, 0x4b5279ffebca8a2c, 0xdafc778abfd41314, 0x7deb10149c72610f}},
- {{0xcb62af6a8766ee7a, 0x66cbec045553cd0e, 0x588001380f0be4b5, 0x08e68e9ff62ce2ea}}},
-{{{0x34ad500a4bc130ad, 0x8d38db493d0bd49c, 0xa25c3d98500a89be, 0x2f1f3f87eeba3b09}},
- {{0x2f2d09d50ab8f2f9, 0xacb9218dc55923df, 0x4a8f342673766cb9, 0x4cb13bd738f719f5}},
- {{0xf7848c75e515b64a, 0xa59501badb4a9038, 0xc20d313f3f751b50, 0x19a1e353c0ae2ee8}}},
-{{{0x7d1c7560bafa05c3, 0xb3e1a0a0c6e55e61, 0xe3529718c0d66473, 0x41546b11c20c3486}},
- {{0xb42172cdd596bdbd, 0x93e0454398eefc40, 0x9fb15347b44109b5, 0x736bd3990266ae34}},
- {{0x85532d509334b3b4, 0x46fd114b60816573, 0xcc5f5f30425c8375, 0x412295a2b87fab5c}}},
-{{{0x19c99b88f57ed6e9, 0x5393cb266df8c825, 0x5cee3213b30ad273, 0x14e153ebb52d2e34}},
- {{0x2e655261e293eac6, 0x845a92032133acdb, 0x460975cb7900996b, 0x0760bb8d195add80}},
- {{0x413e1a17cde6818a, 0x57156da9ed69a084, 0x2cbf268f46caccb1, 0x6b34be9bc33ac5f2}}},
-{{{0xf3df2f643a78c0b2, 0x4c3e971ef22e027c, 0xec7d1c5e49c1b5a3, 0x2012c18f0922dd2d}},
- {{0x11fc69656571f2d3, 0xc6c9e845530e737a, 0xe33ae7a2d4fe5035, 0x01b9c7b62e6dd30b}},
- {{0x880b55e55ac89d29, 0x1483241f45a0a763, 0x3d36efdfc2e76c1f, 0x08af5b784e4bade8}}},
-{{{0x283499dc881f2533, 0x9d0525da779323b6, 0x897addfb673441f4, 0x32b79d71163a168d}},
- {{0xe27314d289cc2c4b, 0x4be4bd11a287178d, 0x18d528d6fa3364ce, 0x6423c1d5afd9826e}},
- {{0xcc85f8d9edfcb36a, 0x22bcc28f3746e5f9, 0xe49de338f9e5d3cd, 0x480a5efbc13e2dcc}}},
-{{{0x0b51e70b01622071, 0x06b505cf8b1dafc5, 0x2c6bb061ef5aabcd, 0x47aa27600cb7bf31}},
- {{0xb6614ce442ce221f, 0x6e199dcc4c053928, 0x663fb4a4dc1cbe03, 0x24b31d47691c8e06}},
- {{0x2a541eedc015f8c3, 0x11a4fe7e7c693f7c, 0xf0af66134ea278d6, 0x545b585d14dda094}}},
-{{{0x67bf275ea0d43a0f, 0xade68e34089beebe, 0x4289134cd479e72e, 0x0f62f9c332ba5454}},
- {{0x6204e4d0e3b321e1, 0x3baa637a28ff1e95, 0x0b0ccffd5b99bd9e, 0x4d22dc3e64c8d071}},
- {{0xfcb46589d63b5f39, 0x5cae6a3f57cbcf61, 0xfebac2d2953afa05, 0x1c0fa01a36371436}}},
-{{{0xe7547449bc7cd692, 0x0f9abeaae6f73ddf, 0x4af01ca700837e29, 0x63ab1b5d3f1bc183}},
- {{0xc11ee5e854c53fae, 0x6a0b06c12b4f3ff4, 0x33540f80e0b67a72, 0x15f18fc3cd07e3ef}},
- {{0x32750763b028f48c, 0x06020740556a065f, 0xd53bd812c3495b58, 0x08706c9b865f508d}}},
-{{{0xf37ca2ab3d343dff, 0x1a8c6a2d80abc617, 0x8e49e035d4ccffca, 0x48b46beebaa1d1b9}},
- {{0xcc991b4138b41246, 0x243b9c526f9ac26b, 0xb9ef494db7cbabbd, 0x5fba433dd082ed00}},
- {{0x9c49e355c9941ad0, 0xb9734ade74498f84, 0x41c3fed066663e5c, 0x0ecfedf8e8e710b3}}},
-{{{0x76430f9f9cd470d9, 0xb62acc9ba42f6008, 0x1898297c59adad5e, 0x7789dd2db78c5080}},
- {{0x744f7463e9403762, 0xf79a8dee8dfcc9c9, 0x163a649655e4cde3, 0x3b61788db284f435}},
- {{0xb22228190d6ef6b2, 0xa94a66b246ce4bfa, 0x46c1a77a4f0b6cc7, 0x4236ccffeb7338cf}}},
-{{{0x8497404d0d55e274, 0x6c6663d9c4ad2b53, 0xec2fb0d9ada95734, 0x2617e120cdb8f73c}},
- {{0x3bd82dbfda777df6, 0x71b177cc0b98369e, 0x1d0e8463850c3699, 0x5a71945b48e2d1f1}},
- {{0x6f203dd5405b4b42, 0x327ec60410b24509, 0x9c347230ac2a8846, 0x77de29fc11ffeb6a}}},
-{{{0xb0ac57c983b778a8, 0x53cdcca9d7fe912c, 0x61c2b854ff1f59dc, 0x3a1a2cf0f0de7dac}},
- {{0x835e138fecced2ca, 0x8c9eaf13ea963b9a, 0xc95fbfc0b2160ea6, 0x575e66f3ad877892}},
- {{0x99803a27c88fcb3a, 0x345a6789275ec0b0, 0x459789d0ff6c2be5, 0x62f882651e70a8b2}}},
-{{{0x085ae2c759ff1be4, 0x149145c93b0e40b7, 0xc467e7fa7ff27379, 0x4eeecf0ad5c73a95}},
- {{0x6d822986698a19e0, 0xdc9821e174d78a71, 0x41a85f31f6cb1f47, 0x352721c2bcda9c51}},
- {{0x48329952213fc985, 0x1087cf0d368a1746, 0x8e5261b166c15aa5, 0x2d5b2d842ed24c21}}},
-{{{0x02cfebd9ebd3ded1, 0xd45b217739021974, 0x7576f813fe30a1b7, 0x5691b6f9a34ef6c2}},
- {{0x5eb7d13d196ac533, 0x377234ecdb80be2b, 0xe144cffc7cf5ae24, 0x5226bcf9c441acec}},
- {{0x79ee6c7223e5b547, 0x6f5f50768330d679, 0xed73e1e96d8adce9, 0x27c3da1e1d8ccc03}}},
-{{{0x7eb9efb23fe24c74, 0x3e50f49f1651be01, 0x3ea732dc21858dea, 0x17377bd75bb810f9}},
- {{0x28302e71630ef9f6, 0xc2d4a2032b64cee0, 0x090820304b6292be, 0x5fca747aa82adf18}},
- {{0x232a03c35c258ea5, 0x86f23a2c6bcb0cf1, 0x3dad8d0d2e442166, 0x04a8933cab76862b}}},
-{{{0xd2c604b622943dff, 0xbc8cbece44cfb3a0, 0x5d254ff397808678, 0x0fa3614f3b1ca6bf}},
- {{0x69082b0e8c936a50, 0xf9c9a035c1dac5b6, 0x6fb73e54c4dfb634, 0x4005419b1d2bc140}},
- {{0xa003febdb9be82f0, 0x2089c1af3a44ac90, 0xf8499f911954fa8e, 0x1fba218aef40ab42}}},
-{{{0xab549448fac8f53e, 0x81f6e89a7ba63741, 0x74fd6c7d6c2b5e01, 0x392e3acaa8c86e42}},
- {{0x4f3e57043e7b0194, 0xa81d3eee08daaf7f, 0xc839c6ab99dcdef1, 0x6c535d13ff7761d5}},
- {{0x4cbd34e93e8a35af, 0x2e0781445887e816, 0x19319c76f29ab0ab, 0x25e17fe4d50ac13b}}},
-{{{0x0a289bd71e04f676, 0x208e1c52d6420f95, 0x5186d8b034691fab, 0x255751442a9fb351}},
- {{0x915f7ff576f121a7, 0xc34a32272fcd87e3, 0xccba2fde4d1be526, 0x6bba828f8969899b}},
- {{0xe2d1bc6690fe3901, 0x4cb54a18a0997ad5, 0x971d6914af8460d4, 0x559d504f7f6b7be4}}},
-{{{0xa7738378b3eb54d5, 0x1d69d366a5553c7c, 0x0a26cf62f92800ba, 0x01ab12d5807e3217}},
- {{0x9c4891e7f6d266fd, 0x0744a19b0307781b, 0x88388f1d6061e23b, 0x123ea6a3354bd50e}},
- {{0x118d189041e32d96, 0xb9ede3c2d8315848, 0x1eab4271d83245d9, 0x4a3961e2c918a154}}},
-{{{0x71dc3be0f8e6bba0, 0xd6cef8347effe30a, 0xa992425fe13a476a, 0x2cd6bce3fb1db763}},
- {{0x0327d644f3233f1e, 0x499a260e34fcf016, 0x83b5a716f2dab979, 0x68aceead9bd4111f}},
- {{0x38b4c90ef3d7c210, 0x308e6e24b7ad040c, 0x3860d9f1b7e73e23, 0x595760d5b508f597}}},
-{{{0x6129bfe104aa6397, 0x8f960008a4a7fccb, 0x3f8bc0897d909458, 0x709fa43edcb291a9}},
- {{0x882acbebfd022790, 0x89af3305c4115760, 0x65f492e37d3473f4, 0x2cb2c5df54515a2b}},
- {{0xeb0a5d8c63fd2aca, 0xd22bc1662e694eff, 0x2723f36ef8cbb03a, 0x70f029ecf0c8131f}}},
-{{{0x461307b32eed3e33, 0xae042f33a45581e7, 0xc94449d3195f0366, 0x0b7d5d8a6c314858}},
- {{0x2a6aafaa5e10b0b9, 0x78f0a370ef041aa9, 0x773efb77aa3ad61f, 0x44eca5a2a74bd9e1}},
- {{0x25d448327b95d543, 0x70d38300a3340f1d, 0xde1c531c60e1c52b, 0x272224512c7de9e4}}},
-{{{0x1abc92af49c5342e, 0xffeed811b2e6fad0, 0xefa28c8dfcc84e29, 0x11b5df18a44cc543}},
- {{0xbf7bbb8a42a975fc, 0x8c5c397796ada358, 0xe27fc76fcdedaa48, 0x19735fd7f6bc20a6}},
- {{0xe3ab90d042c84266, 0xeb848e0f7f19547e, 0x2503a1d065a497b9, 0x0fef911191df895f}}},
-{{{0xb1507ca1ab1c6eb9, 0xbd448f3e16b687b3, 0x3455fb7f2c7a91ab, 0x7579229e2f2adec1}},
- {{0x6ab5dcb85b1c16b7, 0x94c0fce83c7b27a5, 0xa4b11c1a735517be, 0x499238d0ba0eafaa}},
- {{0xecf46e527aba8b57, 0x15a08c478bd1647b, 0x7af1c6a65f706fef, 0x6345fa78f03a30d5}}},
-{{{0xdf02f95f1015e7a1, 0x790ec41da9b40263, 0x4d3a0ea133ea1107, 0x54f70be7e33af8c9}},
- {{0x93d3cbe9bdd8f0a4, 0xdb152c1bfd177302, 0x7dbddc6d7f17a875, 0x3e1a71cc8f426efe}},
- {{0xc83ca3e390babd62, 0x80ede3670291c833, 0xc88038ccd37900c4, 0x2c5fc0231ec31fa1}}},
-{{{0xfeba911717038b4f, 0xe5123721c9deef81, 0x1c97e4e75d0d8834, 0x68afae7a23dc3bc6}},
- {{0xc422e4d102456e65, 0x87414ac1cad47b91, 0x1592e2bba2b6ffdd, 0x75d9d2bff5c2100f}},
- {{0x5bd9b4763626e81c, 0x89966936bca02edd, 0x0a41193d61f077b3, 0x3097a24200ce5471}}},
-{{{0x57427734c7f8b84c, 0xf141a13e01b270e9, 0x02d1adfeb4e564a6, 0x4bb23d92ce83bd48}},
- {{0xa162e7246695c486, 0x131d633435a89607, 0x30521561a0d12a37, 0x56704bada6afb363}},
- {{0xaf6c4aa752f912b9, 0x5e665f6cd86770c8, 0x4c35ac83a3c8cd58, 0x2b7a29c010a58a7e}}},
-{{{0xc4007f77d0c1cec3, 0x8d1020b6bac492f8, 0x32ec29d57e69daaf, 0x599408759d95fce0}},
- {{0x33810a23bf00086e, 0xafce925ee736ff7c, 0x3d60e670e24922d4, 0x11ce9e714f96061b}},
- {{0x219ef713d815bac1, 0xf141465d485be25c, 0x6d5447cc4e513c51, 0x174926be5ef44393}}},
-{{{0xb5deb2f9fc5bd5bb, 0x92daa72ae1d810e1, 0xafc4cfdcb72a1c59, 0x497d78813fc22a24}},
- {{0x3ef5d41593ea022e, 0x5cbcc1a20ed0eed6, 0x8fd24ecf07382c8c, 0x6fa42ead06d8e1ad}},
- {{0xe276824a1f73371f, 0x7f7cf01c4f5b6736, 0x7e201fe304fa46e7, 0x785a36a357808c96}}},
-{{{0x825fbdfd63014d2b, 0xc852369c6ca7578b, 0x5b2fcd285c0b5df0, 0x12ab214c58048c8f}},
- {{0x070442985d517bc3, 0x6acd56c7ae653678, 0x00a27983985a7763, 0x5167effae512662b}},
- {{0xbd4ea9e10f53c4b6, 0x1673dc5f8ac91a14, 0xa8f81a4e2acc1aba, 0x33a92a7924332a25}}},
-{{{0x9dd1f49927996c02, 0x0cb3b058e04d1752, 0x1f7e88967fd02c3e, 0x2f964268cb8b3eb1}},
- {{0x7ba95ba0218f2ada, 0xcff42287330fb9ca, 0xdada496d56c6d907, 0x5380c296f4beee54}},
- {{0x9d4f270466898d0a, 0x3d0987990aff3f7a, 0xd09ef36267daba45, 0x7761455e7b1c669c}}}
\ No newline at end of file
diff --git a/ext/ed25519-amd64-asm/ge25519_base_niels_smalltables.data b/ext/ed25519-amd64-asm/ge25519_base_niels_smalltables.data
deleted file mode 100644
index a31f6f2f0..000000000
--- a/ext/ed25519-amd64-asm/ge25519_base_niels_smalltables.data
+++ /dev/null
@@ -1,768 +0,0 @@
-{{{0x9d103905d740913e, 0xfd399f05d140beb3, 0xa5c18434688f8a09, 0x44fd2f9298f81267}},
- {{0x2fbc93c6f58c3b85, 0xcf932dc6fb8c0e19, 0x270b4898643d42c2, 0x07cf9d3a33d4ba65}},
- {{0xdbbd15674b6fbb59, 0x41e13f00eea2a5ea, 0xcdd49d1cc957c6fa, 0x4f0ebe1faf16ecca}}},
-{{{0x8a99a56042b4d5a8, 0x8f2b810c4e60acf6, 0xe09e236bb16e37aa, 0x6bb595a669c92555}},
- {{0x9224e7fc933c71d7, 0x9f469d967a0ff5b5, 0x5aa69a65e1d60702, 0x590c063fa87d2e2e}},
- {{0x6e347eaadad36802, 0xbaf3599383ee4805, 0x3bcabe10e6076826, 0x49314f0a165ed1b8}}},
-{{{0x56611fe8a4fcd265, 0x3bd353fde5c1ba7d, 0x8131f31a214bd6bd, 0x2ab91587555bda62}},
- {{0xaf25b0a84cee9730, 0x025a8430e8864b8a, 0xc11b50029f016732, 0x7a164e1b9a80f8f4}},
- {{0x9bf211f4f1674834, 0xb84e6b17f62df895, 0xd7de6f075b722a4e, 0x549a04b963bb2a21}}},
-{{{0x95fe050a056818bf, 0x327e89715660faa9, 0xc3e8e3cd06a05073, 0x27933f4c7445a49a}},
- {{0x287351b98efc099f, 0x6765c6f47dfd2538, 0xca348d3dfb0a9265, 0x680e910321e58727}},
- {{0xbf1e45ece51426b0, 0xe32bc63d6dba0f94, 0xe42974d58cf852c0, 0x44f079b1b0e64c18}}},
-{{{0x7f9182c3a447d6ba, 0xd50014d14b2729b7, 0xe33cf11cb864a087, 0x154a7e73eb1b55f3}},
- {{0xa212bc4408a5bb33, 0x8d5048c3c75eed02, 0xdd1beb0c5abfec44, 0x2945ccf146e206eb}},
- {{0xc832a179e7d003b3, 0x5f729d0a00124d7e, 0x62c1d4a10e6d8ff3, 0x68b8ac5938b27a98}}},
-{{{0x499806b67b7d8ca4, 0x575be28427d22739, 0xbb085ce7204553b9, 0x38b64c41ae417884}},
- {{0x3a0ceeeb77157131, 0x9b27158900c8af88, 0x8065b668da59a736, 0x51e57bb6a2cc38bd}},
- {{0x8f9dad91689de3a4, 0x175f2428f8fb9137, 0x050ab5329fcfb988, 0x7865dfa21354c09f}}},
-{{{0xba6f2c9aaa3221b1, 0x6ca021533bba23a7, 0x9dea764f92192c3a, 0x1d6edd5d2e5317e0}},
- {{0x6b1a5cd0944ea3bf, 0x7470353ab39dc0d2, 0x71b2528228542e49, 0x461bea69283c927e}},
- {{0x217a8aacab0fda36, 0xa528c6543d3549c8, 0x37d05b8b13ab7568, 0x233cef623a2cbc37}}},
-{{{0xe2a75dedf39234d9, 0x963d7680e1b558f9, 0x2c2741ac6e3c23fb, 0x3a9024a1320e01c3}},
- {{0x59b7596604dd3e8f, 0x6cb30377e288702c, 0xb1339c665ed9c323, 0x0915e76061bce52f}},
- {{0xdf7de835a834a37e, 0x8be19cda689857ea, 0x2c1185367167b326, 0x589eb3d9dbefd5c2}}},
-{{{0xed5b635449aa515e, 0xa865c49f0bc6823a, 0x850c1fe95b42d1c4, 0x30d76d6f03d315b9}},
- {{0x2eccdd0e632f9c1d, 0x51d0b69676893115, 0x52dfb76ba8637a58, 0x6dd37d49a00eef39}},
- {{0x6c4444172106e4c7, 0xfb53d680928d7f69, 0xb4739ea4694d3f26, 0x10c697112e864bb0}}},
-{{{0x6493c4277dbe5fde, 0x265d4fad19ad7ea2, 0x0e00dfc846304590, 0x25e61cabed66fe09}},
- {{0x0ca62aa08358c805, 0x6a3d4ae37a204247, 0x7464d3a63b11eddc, 0x03bf9baf550806ef}},
- {{0x3f13e128cc586604, 0x6f5873ecb459747e, 0xa0b63dedcc1268f5, 0x566d78634586e22c}}},
-{{{0x1637a49f9cc10834, 0xbc8e56d5a89bc451, 0x1cb5ec0f7f7fd2db, 0x33975bca5ecc35d9}},
- {{0xa1054285c65a2fd0, 0x6c64112af31667c3, 0x680ae240731aee58, 0x14fba5f34793b22a}},
- {{0x3cd746166985f7d4, 0x593e5e84c9c80057, 0x2fc3f2b67b61131e, 0x14829cea83fc526c}}},
-{{{0xff437b8497dd95c2, 0x6c744e30aa4eb5a7, 0x9e0c5d613c85e88b, 0x2fd9c71e5f758173}},
- {{0x21e70b2f4e71ecb8, 0xe656ddb940a477e3, 0xbf6556cece1d4f80, 0x05fc3bc4535d7b7e}},
- {{0x24b8b3ae52afdedd, 0x3495638ced3b30cf, 0x33a4bc83a9be8195, 0x373767475c651f04}}},
-{{{0x2fba99fd40d1add9, 0xb307166f96f4d027, 0x4363f05215f03bae, 0x1fbea56c3b18f999}},
- {{0x634095cb14246590, 0xef12144016c15535, 0x9e38140c8910bc60, 0x6bf5905730907c8c}},
- {{0x0fa778f1e1415b8a, 0x06409ff7bac3a77e, 0x6f52d7b89aa29a50, 0x02521cf67a635a56}}},
-{{{0x513fee0b0a9d5294, 0x8f98e75c0fdf5a66, 0xd4618688bfe107ce, 0x3fa00a7e71382ced}},
- {{0xb1146720772f5ee4, 0xe8f894b196079ace, 0x4af8224d00ac824a, 0x001753d9f7cd6cc4}},
- {{0x3c69232d963ddb34, 0x1dde87dab4973858, 0xaad7d1f9a091f285, 0x12b5fe2fa048edb6}}},
-{{{0x71f0fbc496fce34d, 0x73b9826badf35bed, 0xd2047261ff28c561, 0x749b76f96fb1206f}},
- {{0xdf2b7c26ad6f1e92, 0x4b66d323504b8913, 0x8c409dc0751c8bc3, 0x6f7e93c20796c7b8}},
- {{0x1f5af604aea6ae05, 0xc12351f1bee49c99, 0x61a808b5eeff6b66, 0x0fcec10f01e02151}}},
-{{{0x644d58a649fe1e44, 0x21fcaea231ad777e, 0x02441c5a887fd0d2, 0x4901aa7183c511f3}},
- {{0x3df2d29dc4244e45, 0x2b020e7493d8de0a, 0x6cc8067e820c214d, 0x413779166feab90a}},
- {{0x08b1b7548c1af8f0, 0xce0f7a7c246299b4, 0xf760b0f91e06d939, 0x41bb887b726d1213}}},
-{{{0x40e87d44744346be, 0x1d48dad415b52b25, 0x7c3a8a18a13b603e, 0x4eb728c12fcdbdf7}},
- {{0x7e234c597c6691ae, 0x64889d3d0a85b4c8, 0xdae2c90c354afae7, 0x0a871e070c6a9e1d}},
- {{0x3301b5994bbc8989, 0x736bae3a5bdd4260, 0x0d61ade219d59e3c, 0x3ee7300f2685d464}}},
-{{{0xf5d255e49e7dd6b7, 0x8016115c610b1eac, 0x3c99975d92e187ca, 0x13815762979125c2}},
- {{0x43fa7947841e7518, 0xe5c6fa59639c46d7, 0xa1065e1de3052b74, 0x7d47c6a2cfb89030}},
- {{0x3fdad0148ef0d6e0, 0x9d3e749a91546f3c, 0x71ec621026bb8157, 0x148cf58d34c9ec80}}},
-{{{0x46a492f67934f027, 0x469984bef6840aa9, 0x5ca1bc2a89611854, 0x3ff2fa1ebd5dbbd4}},
- {{0xe2572f7d9ae4756d, 0x56c345bb88f3487f, 0x9fd10b6d6960a88d, 0x278febad4eaea1b9}},
- {{0xb1aa681f8c933966, 0x8c21949c20290c98, 0x39115291219d3c52, 0x4104dd02fe9c677b}}},
-{{{0x72b2bf5e1124422a, 0xa1fa0c3398a33ab5, 0x94cb6101fa52b666, 0x2c863b00afaf53d5}},
- {{0x81214e06db096ab8, 0x21a8b6c90ce44f35, 0x6524c12a409e2af5, 0x0165b5a48efca481}},
- {{0xf190a474a0846a76, 0x12eff984cd2f7cc0, 0x695e290658aa2b8f, 0x591b67d9bffec8b8}}},
-{{{0x312f0d1c80b49bfa, 0x5979515eabf3ec8a, 0x727033c09ef01c88, 0x3de02ec7ca8f7bcb}},
- {{0x99b9b3719f18b55d, 0xe465e5faa18c641e, 0x61081136c29f05ed, 0x489b4f867030128b}},
- {{0xd232102d3aeb92ef, 0xe16253b46116a861, 0x3d7eabe7190baa24, 0x49f5fbba496cbebf}}},
-{{{0x30949a108a5bcfd4, 0xdc40dd70bc6473eb, 0x92c294c1307c0d1c, 0x5604a86dcbfa6e74}},
- {{0x155d628c1e9c572e, 0x8a4d86acc5884741, 0x91a352f6515763eb, 0x06a1a6c28867515b}},
- {{0x7288d1d47c1764b6, 0x72541140e0418b51, 0x9f031a6018acf6d1, 0x20989e89fe2742c6}}},
-{{{0x499777fd3a2dcc7f, 0x32857c2ca54fd892, 0xa279d864d207e3a0, 0x0403ed1d0ca67e29}},
- {{0x1674278b85eaec2e, 0x5621dc077acb2bdf, 0x640a4c1661cbf45a, 0x730b9950f70595d3}},
- {{0xc94b2d35874ec552, 0xc5e6c8cf98246f8d, 0xf7cb46fa16c035ce, 0x5bd7454308303dcc}}},
-{{{0x7f9ad19528b24cc2, 0x7f6b54656335c181, 0x66b8b66e4fc07236, 0x133a78007380ad83}},
- {{0x85c4932115e7792a, 0xc64c89a2bdcdddc9, 0x9d1e3da8ada3d762, 0x5bb7db123067f82c}},
- {{0x0961f467c6ca62be, 0x04ec21d6211952ee, 0x182360779bd54770, 0x740dca6d58f0e0d2}}},
-{{{0xdf48ee0752cfce4e, 0xc3fffaf306ec08b7, 0x05710b2ab95459c4, 0x161d25fa963ea38d}},
- {{0x231a8c570478433c, 0xb7b5270ec281439d, 0xdbaa99eae3d9079f, 0x2c03f5256c2b03d9}},
- {{0x790f18757b53a47d, 0x307b0130cf0c5879, 0x31903d77257ef7f9, 0x699468bdbd96bbaf}}},
-{{{0xbd1f2f46f4dafecf, 0x7cef0114a47fd6f7, 0xd31ffdda4a47b37f, 0x525219a473905785}},
- {{0xd8dd3de66aa91948, 0x485064c22fc0d2cc, 0x9b48246634fdea2f, 0x293e1c4e6c4a2e3a}},
- {{0x376e134b925112e1, 0x703778b5dca15da0, 0xb04589af461c3111, 0x5b605c447f032823}}},
-{{{0xb965805920c47c89, 0xe7f0100c923b8fcc, 0x0001256502e2ef77, 0x24a76dcea8aeb3ee}},
- {{0x3be9fec6f0e7f04c, 0x866a579e75e34962, 0x5542ef161e1de61a, 0x2f12fef4cc5abdd5}},
- {{0x0a4522b2dfc0c740, 0x10d06e7f40c9a407, 0xc6cf144178cff668, 0x5e607b2518a43790}}},
-{{{0x58b31d8f6cdf1818, 0x35cfa74fc36258a2, 0xe1b3ff4f66e61d6e, 0x5067acab6ccdd5f7}},
- {{0xa02c431ca596cf14, 0xe3c42d40aed3e400, 0xd24526802e0f26db, 0x201f33139e457068}},
- {{0xfd527f6b08039d51, 0x18b14964017c0006, 0xd5220eb02e25a4a8, 0x397cba8862460375}}},
-{{{0x30c13093f05959b2, 0xe23aa18de9a97976, 0x222fd491721d5e26, 0x2339d320766e6c3a}},
- {{0x7815c3fbc81379e7, 0xa6619420dde12af1, 0xffa9c0f885a8fdd5, 0x771b4022c1e1c252}},
- {{0xd87dd986513a2fa7, 0xf5ac9b71f9d4cf08, 0xd06bc31b1ea283b3, 0x331a189219971a76}}},
-{{{0xf5166f45fb4f80c6, 0x9c36c7de61c775cf, 0xe3d4e81b9041d91c, 0x31167c6b83bdfe21}},
- {{0x26512f3a9d7572af, 0x5bcbe28868074a9e, 0x84edc1c11180f7c4, 0x1ac9619ff649a67b}},
- {{0xf22b3842524b1068, 0x5068343bee9ce987, 0xfc9d71844a6250c8, 0x612436341f08b111}}},
-{{{0xd99d41db874e898d, 0x09fea5f16c07dc20, 0x793d2c67d00f9bbc, 0x46ebe2309e5eff40}},
- {{0x8b6349e31a2d2638, 0x9ddfb7009bd3fd35, 0x7f8bf1b8a3a06ba4, 0x1522aa3178d90445}},
- {{0x2c382f5369614938, 0xdafe409ab72d6d10, 0xe8c83391b646f227, 0x45fe70f50524306c}}},
-{{{0xda4875a6960c0b8c, 0x5b68d076ef0e2f20, 0x07fb51cf3d0b8fd4, 0x428d1623a0e392d4}},
- {{0x62f24920c8951491, 0x05f007c83f630ca2, 0x6fbb45d2f5c9d4b8, 0x16619f6db57a2245}},
- {{0x084f4a4401a308fd, 0xa82219c376a5caac, 0xdeb8de4643d1bc7d, 0x1d81592d60bd38c6}}},
-{{{0x61368756a60dac5f, 0x17e02f6aebabdc57, 0x7f193f2d4cce0f7d, 0x20234a7789ecdcf0}},
- {{0x8765b69f7b85c5e8, 0x6ff0678bd168bab2, 0x3a70e77c1d330f9b, 0x3a5f6d51b0af8e7c}},
- {{0x76d20db67178b252, 0x071c34f9d51ed160, 0xf62a4a20b3e41170, 0x7cd682353cffe366}}},
-{{{0x0be1a45bd887fab6, 0x2a846a32ba403b6e, 0xd9921012e96e6000, 0x2838c8863bdc0943}},
- {{0xa665cd6068acf4f3, 0x42d92d183cd7e3d3, 0x5759389d336025d9, 0x3ef0253b2b2cd8ff}},
- {{0xd16bb0cf4a465030, 0xfa496b4115c577ab, 0x82cfae8af4ab419d, 0x21dcb8a606a82812}}},
-{{{0x5c6004468c9d9fc8, 0x2540096ed42aa3cb, 0x125b4d4c12ee2f9c, 0x0bc3d08194a31dab}},
- {{0x9a8d00fabe7731ba, 0x8203607e629e1889, 0xb2cc023743f3d97f, 0x5d840dbf6c6f678b}},
- {{0x706e380d309fe18b, 0x6eb02da6b9e165c7, 0x57bbba997dae20ab, 0x3a4276232ac196dd}}},
-{{{0x4b42432c8a7084fa, 0x898a19e3dfb9e545, 0xbe9f00219c58e45d, 0x1ff177cea16debd1}},
- {{0x3bf8c172db447ecb, 0x5fcfc41fc6282dbd, 0x80acffc075aa15fe, 0x0770c9e824e1a9f9}},
- {{0xcf61d99a45b5b5fd, 0x860984e91b3a7924, 0xe7300919303e3e89, 0x39f264fd41500b1e}}},
-{{{0xa7ad3417dbe7e29c, 0xbd94376a2b9c139c, 0xa0e91b8e93597ba9, 0x1712d73468889840}},
- {{0xd19b4aabfe097be1, 0xa46dfce1dfe01929, 0xc3c908942ca6f1ff, 0x65c621272c35f14e}},
- {{0xe72b89f8ce3193dd, 0x4d103356a125c0bb, 0x0419a93d2e1cfe83, 0x22f9800ab19ce272}}},
-{{{0x605a368a3e9ef8cb, 0xe3e9c022a5504715, 0x553d48b05f24248f, 0x13f416cd647626e5}},
- {{0x42029fdd9a6efdac, 0xb912cebe34a54941, 0x640f64b987bdf37b, 0x4171a4d38598cab4}},
- {{0xfa2758aa99c94c8c, 0x23006f6fb000b807, 0xfbd291ddadda5392, 0x508214fa574bd1ab}}},
-{{{0xc20269153ed6fe4b, 0xa65a6739511d77c4, 0xcbde26462c14af94, 0x22f960ec6faba74b}},
- {{0x461a15bb53d003d6, 0xb2102888bcf3c965, 0x27c576756c683a5a, 0x3a7758a4c86cb447}},
- {{0x548111f693ae5076, 0x1dae21df1dfd54a6, 0x12248c90f3115e65, 0x5d9fd15f8de7f494}}},
-{{{0x031408d36d63727f, 0x6a379aefd7c7b533, 0xa9e18fc5ccaee24b, 0x332f35914f8fbed3}},
- {{0x3f244d2aeed7521e, 0x8e3a9028432e9615, 0xe164ba772e9c16d4, 0x3bc187fa47eb98d8}},
- {{0x6d470115ea86c20c, 0x998ab7cb6c46d125, 0xd77832b53a660188, 0x450d81ce906fba03}}},
-{{{0x6e7bb6a1a6205275, 0xaa4f21d7413c8e83, 0x6f56d155e88f5cb2, 0x2de25d4ba6345be1}},
- {{0xd074d8961cae743f, 0xf86d18f5ee1c63ed, 0x97bdc55be7f4ed29, 0x4cbad279663ab108}},
- {{0x80d19024a0d71fcd, 0xc525c20afb288af8, 0xb1a3974b5f3a6419, 0x7d7fbcefe2007233}}},
-{{{0xfaef1e6a266b2801, 0x866c68c4d5739f16, 0xf68a2fbc1b03762c, 0x5975435e87b75a8d}},
- {{0xcd7c5dc5f3c29094, 0xc781a29a2a9105ab, 0x80c61d36421c3058, 0x4f9cd196dcd8d4d7}},
- {{0x199297d86a7b3768, 0xd0d058241ad17a63, 0xba029cad5c1c0c17, 0x7ccdd084387a0307}}},
-{{{0xdca6422c6d260417, 0xae153d50948240bd, 0xa9c0c1b4fb68c677, 0x428bd0ed61d0cf53}},
- {{0x9b0c84186760cc93, 0xcdae007a1ab32a99, 0xa88dec86620bda18, 0x3593ca848190ca44}},
- {{0x9213189a5e849aa7, 0xd4d8c33565d8facd, 0x8c52545b53fdbbd1, 0x27398308da2d63e6}}},
-{{{0x42c38d28435ed413, 0xbd50f3603278ccc9, 0xbb07ab1a79da03ef, 0x269597aebe8c3355}},
- {{0xb9a10e4c0a702453, 0x0fa25866d57d1bde, 0xffb9d9b5cd27daf7, 0x572c2945492c33fd}},
- {{0xc77fc745d6cd30be, 0xe4dfe8d3e3baaefb, 0xa22c8830aa5dda0c, 0x7f985498c05bca80}}},
-{{{0x3849ce889f0be117, 0x8005ad1b7b54a288, 0x3da3c39f23fc921c, 0x76c2ec470a31f304}},
- {{0xd35615520fbf6363, 0x08045a45cf4dfba6, 0xeec24fbc873fa0c2, 0x30f2653cd69b12e7}},
- {{0x8a08c938aac10c85, 0x46179b60db276bcb, 0xa920c01e0e6fac70, 0x2f1273f1596473da}}},
-{{{0x4739fc7c8ae01e11, 0xfd5274904a6aab9f, 0x41d98a8287728f2e, 0x5d9e572ad85b69f2}},
- {{0x30488bd755a70bc0, 0x06d6b5a4f1d442e7, 0xead1a69ebc596162, 0x38ac1997edc5f784}},
- {{0x0666b517a751b13b, 0x747d06867e9b858c, 0xacacc011454dde49, 0x22dfcd9cbfe9e69c}}},
-{{{0x8ddbd2e0c30d0cd9, 0xad8e665facbb4333, 0x8f6b258c322a961f, 0x6b2916c05448c1c7}},
- {{0x56ec59b4103be0a1, 0x2ee3baecd259f969, 0x797cb29413f5cd32, 0x0fe9877824cde472}},
- {{0x7edb34d10aba913b, 0x4ea3cd822e6dac0e, 0x66083dff6578f815, 0x4c303f307ff00a17}}},
-{{{0xd30a3bd617b28c85, 0xc5d377b739773bea, 0xc6c6e78c1e6a5cbf, 0x0d61b8f78b2ab7c4}},
- {{0x29fc03580dd94500, 0xecd27aa46fbbec93, 0x130a155fc2e2a7f8, 0x416b151ab706a1d5}},
- {{0x56a8d7efe9c136b0, 0xbd07e5cd58e44b20, 0xafe62fda1b57e0ab, 0x191a2af74277e8d2}}},
-{{{0xce16f74bc53c1431, 0x2b9725ce2072edde, 0xb8b9c36fb5b23ee7, 0x7e2e0e450b5cc908}},
- {{0x9fe62b434f460efb, 0xded303d4a63607d6, 0xf052210eb7a0da24, 0x237e7dbe00545b93}},
- {{0x013575ed6701b430, 0x231094e69f0bfd10, 0x75320f1583e47f22, 0x71afa699b11155e3}}},
-{{{0x65ce6f9b3953b61d, 0xc65839eaafa141e6, 0x0f435ffda9f759fe, 0x021142e9c2b1c28e}},
- {{0xea423c1c473b50d6, 0x51e87a1f3b38ef10, 0x9b84bf5fb2c9be95, 0x00731fbc78f89a1c}},
- {{0xe430c71848f81880, 0xbf960c225ecec119, 0xb6dae0836bba15e3, 0x4c4d6f3347e15808}}},
-{{{0x18f7eccfc17d1fc9, 0x6c75f5a651403c14, 0xdbde712bf7ee0cdf, 0x193fddaaa7e47a22}},
- {{0x2f0cddfc988f1970, 0x6b916227b0b9f51b, 0x6ec7b6c4779176be, 0x38bf9500a88f9fa8}},
- {{0x1fd2c93c37e8876f, 0xa2f61e5a18d1462c, 0x5080f58239241276, 0x6a6fb99ebf0d4969}}},
-{{{0x6a46c1bb560855eb, 0x2416bb38f893f09d, 0xd71d11378f71acc1, 0x75f76914a31896ea}},
- {{0xeeb122b5b6e423c6, 0x939d7010f286ff8e, 0x90a92a831dcf5d8c, 0x136fda9f42c5eb10}},
- {{0xf94cdfb1a305bdd1, 0x0f364b9d9ff82c08, 0x2a87d8a5c3bb588a, 0x022183510be8dcba}}},
-{{{0x4af766385ead2d14, 0xa08ed880ca7c5830, 0x0d13a6e610211e3d, 0x6a071ce17b806c03}},
- {{0x9d5a710143307a7f, 0xb063de9ec47da45f, 0x22bbfe52be927ad3, 0x1387c441fd40426c}},
- {{0xb5d3c3d187978af8, 0x722b5a3d7f0e4413, 0x0d7b4848bb477ca0, 0x3171b26aaf1edc92}}},
-{{{0xa92f319097564ca8, 0xff7bb84c2275e119, 0x4f55fe37a4875150, 0x221fd4873cf0835a}},
- {{0xa60db7d8b28a47d1, 0xa6bf14d61770a4f1, 0xd4a1f89353ddbd58, 0x6c514a63344243e9}},
- {{0x2322204f3a156341, 0xfb73e0e9ba0a032d, 0xfce0dd4c410f030e, 0x48daa596fb924aaa}}},
-{{{0x6eca8e665ca59cc7, 0xa847254b2e38aca0, 0x31afc708d21e17ce, 0x676dd6fccad84af7}},
- {{0x14f61d5dc84c9793, 0x9941f9e3ef418206, 0xcdf5b88f346277ac, 0x58c837fa0e8a79a9}},
- {{0x0cf9688596fc9058, 0x1ddcbbf37b56a01b, 0xdcc2e77d4935d66a, 0x1c4f73f2c6a57f0a}}},
-{{{0x0e7a4fbd305fa0bb, 0x829d4ce054c663ad, 0xf421c3832fe33848, 0x795ac80d1bf64c42}},
- {{0xb36e706efc7c3484, 0x73dfc9b4c3c1cf61, 0xeb1d79c9781cc7e5, 0x70459adb7daf675c}},
- {{0x1b91db4991b42bb3, 0x572696234b02dcca, 0x9fdf9ee51f8c78dc, 0x5fe162848ce21fd3}}},
-{{{0x4e59214fe194961a, 0x49be7dc70d71cd4f, 0x9300cfd23b50f22d, 0x4789d446fc917232}},
- {{0x2879852d5d7cb208, 0xb8dedd70687df2e7, 0xdc0bffab21687891, 0x2b44c043677daa35}},
- {{0x1a1c87ab074eb78e, 0xfac6d18e99daf467, 0x3eacbbcd484f9067, 0x60c52eef2bb9a4e4}}},
-{{{0x0b5d89bc3bfd8bf1, 0xb06b9237c9f3551a, 0x0e4c16b0d53028f5, 0x10bc9c312ccfcaab}},
- {{0x702bc5c27cae6d11, 0x44c7699b54a48cab, 0xefbc4056ba492eb2, 0x70d77248d9b6676d}},
- {{0xaa8ae84b3ec2a05b, 0x98699ef4ed1781e0, 0x794513e4708e85d1, 0x63755bd3a976f413}}},
-{{{0xb55fa03e2ad10853, 0x356f75909ee63569, 0x9ff9f1fdbe69b890, 0x0d8cc1c48bc16f84}},
- {{0x3dc7101897f1acb7, 0x5dda7d5ec165bbd8, 0x508e5b9c0fa1020f, 0x2763751737c52a56}},
- {{0x029402d36eb419a9, 0xf0b44e7e77b460a5, 0xcfa86230d43c4956, 0x70c2dd8a7ad166e7}}},
-{{{0x656194509f6fec0e, 0xee2e7ea946c6518d, 0x9733c1f367e09b5c, 0x2e0fac6363948495}},
- {{0x91d4967db8ed7e13, 0x74252f0ad776817a, 0xe40982e00d852564, 0x32b8613816a53ce5}},
- {{0x79e7f7bee448cd64, 0x6ac83a67087886d0, 0xf89fd4d9a0e4db2e, 0x4179215c735a4f41}}},
-{{{0x8c7094e7d7dced2a, 0x97fb8ac347d39c70, 0xe13be033a906d902, 0x700344a30cd99d76}},
- {{0xe4ae33b9286bcd34, 0xb7ef7eb6559dd6dc, 0x278b141fb3d38e1f, 0x31fa85662241c286}},
- {{0xaf826c422e3622f4, 0xc12029879833502d, 0x9bc1b7e12b389123, 0x24bb2312a9952489}}},
-{{{0xb1a8ed1732de67c3, 0x3cb49418461b4948, 0x8ebd434376cfbcd2, 0x0fee3e871e188008}},
- {{0x41f80c2af5f85c6b, 0x687284c304fa6794, 0x8945df99a3ba1bad, 0x0d1d2af9ffeb5d16}},
- {{0xa9da8aa132621edf, 0x30b822a159226579, 0x4004197ba79ac193, 0x16acd79718531d76}}},
-{{{0x72df72af2d9b1d3d, 0x63462a36a432245a, 0x3ecea07916b39637, 0x123e0ef6b9302309}},
- {{0xc959c6c57887b6ad, 0x94e19ead5f90feba, 0x16e24e62a342f504, 0x164ed34b18161700}},
- {{0x487ed94c192fe69a, 0x61ae2cea3a911513, 0x877bf6d3b9a4de27, 0x78da0fc61073f3eb}}},
-{{{0x5bf15d28e52bc66a, 0x2c47e31870f01a8e, 0x2419afbc06c28bdd, 0x2d25deeb256b173a}},
- {{0xa29f80f1680c3a94, 0x71f77e151ae9e7e6, 0x1100f15848017973, 0x054aa4b316b38ddd}},
- {{0xdfc8468d19267cb8, 0x0b28789c66e54daf, 0x2aeb1d2a666eec17, 0x134610a6ab7da760}}},
-{{{0x51138ec78df6b0fe, 0x5397da89e575f51b, 0x09207a1d717af1b9, 0x2102fdba2b20d650}},
- {{0xcd2a65e777d1f515, 0x548991878faa60f1, 0xb1b73bbcdabc06e5, 0x654878cba97cc9fb}},
- {{0x969ee405055ce6a1, 0x36bca7681251ad29, 0x3a1af517aa7da415, 0x0ad725db29ecb2ba}}},
-{{{0xdc4267b1834e2457, 0xb67544b570ce1bc5, 0x1af07a0bf7d15ed7, 0x4aefcffb71a03650}},
- {{0xfec7bc0c9b056f85, 0x537d5268e7f5ffd7, 0x77afc6624312aefa, 0x4f675f5302399fd9}},
- {{0xc32d36360415171e, 0xcd2bef118998483b, 0x870a6eadd0945110, 0x0bccbb72a2a86561}}},
-{{{0x185e962feab1a9c8, 0x86e7e63565147dcd, 0xb092e031bb5b6df2, 0x4024f0ab59d6b73e}},
- {{0x186d5e4c50fe1296, 0xe0397b82fee89f7e, 0x3bc7f6c5507031b0, 0x6678fd69108f37c2}},
- {{0x1586fa31636863c2, 0x07f68c48572d33f2, 0x4f73cc9f789eaefc, 0x2d42e2108ead4701}}},
-{{{0x97f5131594dfd29b, 0x6155985d313f4c6a, 0xeba13f0708455010, 0x676b2608b8d2d322}},
- {{0x21717b0d0f537593, 0x914e690b131e064c, 0x1bb687ae752ae09f, 0x420bf3a79b423c6e}},
- {{0x8138ba651c5b2b47, 0x8671b6ec311b1b80, 0x7bff0cb1bc3135b0, 0x745d2ffa9c0cf1e0}}},
-{{{0xbf525a1e2bc9c8bd, 0xea5b260826479d81, 0xd511c70edf0155db, 0x1ae23ceb960cf5d0}},
- {{0x6036df5721d34e6a, 0xb1db8827997bb3d0, 0xd3c209c3c8756afa, 0x06e15be54c1dc839}},
- {{0x5b725d871932994a, 0x32351cb5ceb1dab0, 0x7dc41549dab7ca05, 0x58ded861278ec1f7}}},
-{{{0xd8173793f266c55c, 0xc8c976c5cc454e49, 0x5ce382f8bc26c3a8, 0x2ff39de85485f6f9}},
- {{0x2dfb5ba8b6c2c9a8, 0x48eeef8ef52c598c, 0x33809107f12d1573, 0x08ba696b531d5bd8}},
- {{0x77ed3eeec3efc57a, 0x04e05517d4ff4811, 0xea3d7a3ff1a671cb, 0x120633b4947cfe54}}},
-{{{0x0b94987891610042, 0x4ee7b13cecebfae8, 0x70be739594f0a4c0, 0x35d30a99b4d59185}},
- {{0x82bd31474912100a, 0xde237b6d7e6fbe06, 0xe11e761911ea79c6, 0x07433be3cb393bde}},
- {{0xff7944c05ce997f4, 0x575d3de4b05c51a3, 0x583381fd5a76847c, 0x2d873ede7af6da9f}}},
-{{{0x157a316443373409, 0xfab8b7eef4aa81d9, 0xb093fee6f5a64806, 0x2e773654707fa7b6}},
- {{0xaa6202e14e5df981, 0xa20d59175015e1f5, 0x18a275d3bae21d6c, 0x0543618a01600253}},
- {{0x0deabdf4974c23c1, 0xaa6f0a259dce4693, 0x04202cb8a29aba2c, 0x4b1443362d07960d}}},
-{{{0xccc4b7c7b66e1f7a, 0x44157e25f50c2f7e, 0x3ef06dfc713eaf1c, 0x582f446752da63f7}},
- {{0x967c54e91c529ccb, 0x30f6269264c635fb, 0x2747aff478121965, 0x17038418eaf66f5c}},
- {{0xc6317bd320324ce4, 0xa81042e8a4488bc4, 0xb21ef18b4e5a1364, 0x0c2a1c4bcda28dc9}}},
-{{{0xd24dc7d06f1f0447, 0xb2269e3edb87c059, 0xd15b0272fbb2d28f, 0x7c558bd1c6f64877}},
- {{0xedc4814869bd6945, 0x0d6d907dbe1c8d22, 0xc63bd212d55cc5ab, 0x5a6a9b30a314dc83}},
- {{0xd0ec1524d396463d, 0x12bb628ac35a24f0, 0xa50c3a791cbc5fa4, 0x0404a5ca0afbafc3}}},
-{{{0x8c1f40070aa743d6, 0xccbad0cb5b265ee8, 0x574b046b668fd2de, 0x46395bfdcadd9633}},
- {{0x62bc9e1b2a416fd1, 0xb5c6f728e350598b, 0x04343fd83d5d6967, 0x39527516e7f8ee98}},
- {{0x117fdb2d1a5d9a9c, 0x9c7745bcd1005c2a, 0xefd4bef154d56fea, 0x76579a29e822d016}}},
-{{{0x45b68e7e49c02a17, 0x23cd51a2bca9a37f, 0x3ed65f11ec224c1b, 0x43a384dc9e05bdb1}},
- {{0x333cb51352b434f2, 0xd832284993de80e1, 0xb5512887750d35ce, 0x02c514bb2a2777c1}},
- {{0x684bd5da8bf1b645, 0xfb8bd37ef6b54b53, 0x313916d7a9b0d253, 0x1160920961548059}}},
-{{{0xb44d166929dacfaa, 0xda529f4c8413598f, 0xe9ef63ca453d5559, 0x351e125bc5698e0b}},
- {{0x7a385616369b4dcd, 0x75c02ca7655c3563, 0x7dc21bf9d4f18021, 0x2f637d7491e6e042}},
- {{0xd4b49b461af67bbe, 0xd603037ac8ab8961, 0x71dee19ff9a699fb, 0x7f182d06e7ce2a9a}}},
-{{{0x7a7c8e64ab0168ec, 0xcb5a4a5515edc543, 0x095519d347cd0eda, 0x67d4ac8c343e93b0}},
- {{0x09454b728e217522, 0xaa58e8f4d484b8d8, 0xd358254d7f46903c, 0x44acc043241c5217}},
- {{0x1c7d6bbb4f7a5777, 0x8b35fed4918313e1, 0x4adca1c6c96b4684, 0x556d1c8312ad71bd}}},
-{{{0x17ef40e30c8d3982, 0x31f7073e15a3fa34, 0x4f21f3cb0773646e, 0x746c6c6d1d824eff}},
- {{0x81f06756b11be821, 0x0faff82310a3f3dd, 0xf8b2d0556a99465d, 0x097abe38cc8c7f05}},
- {{0x0c49c9877ea52da4, 0x4c4369559bdc1d43, 0x022c3809f7ccebd2, 0x577e14a34bee84bd}}},
-{{{0xf0e268ac61a73b0a, 0xf2fafa103791a5f5, 0xc1e13e826b6d00e9, 0x60fa7ee96fd78f42}},
- {{0x94fecebebd4dd72b, 0xf46a4fda060f2211, 0x124a5977c0c8d1ff, 0x705304b8fb009295}},
- {{0xb63d1d354d296ec6, 0xf3c3053e5fad31d8, 0x670b958cb4bd42ec, 0x21398e0ca16353fd}}},
-{{{0x89f5058a382b33f3, 0x5ae2ba0bad48c0b4, 0x8f93b503a53db36e, 0x5aa3ed9d95a232e6}},
- {{0x2798aaf9b4b75601, 0x5eac72135c8dad72, 0xd2ceaa6161b7a023, 0x1bbfb284e98f7d4e}},
- {{0x656777e9c7d96561, 0xcb2b125472c78036, 0x65053299d9506eee, 0x4a07e14e5e8957cc}}},
-{{{0x4ee412cb980df999, 0xa315d76f3c6ec771, 0xbba5edde925c77fd, 0x3f0bac391d313402}},
- {{0x240b58cdc477a49b, 0xfd38dade6447f017, 0x19928d32a7c86aad, 0x50af7aed84afa081}},
- {{0x6e4fde0115f65be5, 0x29982621216109b2, 0x780205810badd6d9, 0x1921a316baebd006}}},
-{{{0x89422f7edfb870fc, 0x2c296beb4f76b3bd, 0x0738f1d436c24df7, 0x6458df41e273aeb0}},
- {{0xd75aad9ad9f3c18b, 0x566a0eef60b1c19c, 0x3e9a0bac255c0ed9, 0x7b049deca062c7f5}},
- {{0xdccbe37a35444483, 0x758879330fedbe93, 0x786004c312c5dd87, 0x6093dccbc2950e64}}},
-{{{0x1ff39a8585e0706d, 0x36d0a5d8b3e73933, 0x43b9f2e1718f453b, 0x57d1ea084827a97c}},
- {{0x6bdeeebe6084034b, 0x3199c2b6780fb854, 0x973376abb62d0695, 0x6e3180c98b647d90}},
- {{0xee7ab6e7a128b071, 0xa4c1596d93a88baa, 0xf7b4de82b2216130, 0x363e999ddd97bd18}}},
-{{{0x96a843c135ee1fc4, 0x976eb35508e4c8cf, 0xb42f6801b58cd330, 0x48ee9b78693a052b}},
- {{0x2f1848dce24baec6, 0x769b7255babcaf60, 0x90cb3c6e3cefe931, 0x231f979bc6f9b355}},
- {{0x5c31de4bcc2af3c6, 0xb04bb030fe208d1f, 0xb78d7009c14fb466, 0x079bfa9b08792413}}},
-{{{0xe3903a51da300df4, 0x843964233da95ab0, 0xed3cf12d0b356480, 0x038c77f684817194}},
- {{0xf3c9ed80a2d54245, 0x0aa08b7877f63952, 0xd76dac63d1085475, 0x1ef4fb159470636b}},
- {{0x854e5ee65b167bec, 0x59590a4296d0cdc2, 0x72b2df3498102199, 0x575ee92a4a0bff56}}},
-{{{0xd4c080908a182fcf, 0x30e170c299489dbd, 0x05babd5752f733de, 0x43d4e7112cd3fd00}},
- {{0x5d46bc450aa4d801, 0xc3af1227a533b9d8, 0x389e3b262b8906c2, 0x200a1e7e382f581b}},
- {{0x518db967eaf93ac5, 0x71bc989b056652c0, 0xfe2b85d9567197f5, 0x050eca52651e4e38}}},
-{{{0xc3431ade453f0c9c, 0xe9f5045eff703b9b, 0xfcd97ac9ed847b3d, 0x4b0ee6c21c58f4c6}},
- {{0x97ac397660e668ea, 0x9b19bbfe153ab497, 0x4cb179b534eca79f, 0x6151c09fa131ae57}},
- {{0x3af55c0dfdf05d96, 0xdd262ee02ab4ee7a, 0x11b2bb8712171709, 0x1fef24fa800f030b}}},
-{{{0x37d653fb1aa73196, 0x0f9495303fd76418, 0xad200b09fb3a17b2, 0x544d49292fc8613e}},
- {{0x22d2aff530976b86, 0x8d90b806c2d24604, 0xdca1896c4de5bae5, 0x28005fe6c8340c17}},
- {{0x6aefba9f34528688, 0x5c1bff9425107da1, 0xf75bbbcd66d94b36, 0x72e472930f316dfa}}},
-{{{0x2695208c9781084f, 0xb1502a0b23450ee1, 0xfd9daea603efde02, 0x5a9d2e8c2733a34c}},
- {{0x07f3f635d32a7627, 0x7aaa4d865f6566f0, 0x3c85e79728d04450, 0x1fee7f000fe06438}},
- {{0x765305da03dbf7e5, 0xa4daf2491434cdbd, 0x7b4ad5cdd24a88ec, 0x00f94051ee040543}}},
-{{{0x8d356b23c3d330b2, 0xf21c8b9bb0471b06, 0xb36c316c6e42b83c, 0x07d79c7e8beab10d}},
- {{0xd7ef93bb07af9753, 0x583ed0cf3db766a7, 0xce6998bf6e0b1ec5, 0x47b7ffd25dd40452}},
- {{0x87fbfb9cbc08dd12, 0x8a066b3ae1eec29b, 0x0d57242bdb1fc1bf, 0x1c3520a35ea64bb6}}},
-{{{0x80d253a6bccba34a, 0x3e61c3a13838219b, 0x90c3b6019882e396, 0x1c3d05775d0ee66f}},
- {{0xcda86f40216bc059, 0x1fbb231d12bcd87e, 0xb4956a9e17c70990, 0x38750c3b66d12e55}},
- {{0x692ef1409422e51a, 0xcbc0c73c2b5df671, 0x21014fe7744ce029, 0x0621e2c7d330487c}}},
-{{{0xaf9860cc8259838d, 0x90ea48c1c69f9adc, 0x6526483765581e30, 0x0007d6097bd3a5bc}},
- {{0xb7ae1796b0dbf0f3, 0x54dfafb9e17ce196, 0x25923071e9aaa3b4, 0x5d8e589ca1002e9d}},
- {{0xc0bf1d950842a94b, 0xb2d3c363588f2e3e, 0x0a961438bb51e2ef, 0x1583d7783c1cbf86}}},
-{{{0xeceea2ef5da27ae1, 0x597c3a1455670174, 0xc9a62a126609167a, 0x252a5f2e81ed8f70}},
- {{0x90034704cc9d28c7, 0x1d1b679ef72cc58f, 0x16e12b5fbe5b8726, 0x4958064e83c5580a}},
- {{0x0d2894265066e80d, 0xfcc3f785307c8c6b, 0x1b53da780c1112fd, 0x079c170bd843b388}}},
-{{{0x0506ece464fa6fff, 0xbee3431e6205e523, 0x3579422451b8ea42, 0x6dec05e34ac9fb00}},
- {{0xcdd6cd50c0d5d056, 0x9af7686dbb03573b, 0x3ca6723ff3c3ef48, 0x6768c0d7317b8acc}},
- {{0x94b625e5f155c1b3, 0x417bf3a7997b7b91, 0xc22cbddc6d6b2600, 0x51445e14ddcd52f4}}},
-{{{0x57502b4b3b144951, 0x8e67ff6b444bbcb3, 0xb8bd6927166385db, 0x13186f31e39295c8}},
- {{0x893147ab2bbea455, 0x8c53a24f92079129, 0x4b49f948be30f7a7, 0x12e990086e4fd43d}},
- {{0xf10c96b37fdfbb2e, 0x9f9a935e121ceaf9, 0xdf1136c43a5b983f, 0x77b2e3f05d3e99af}}},
-{{{0x296fa9c59c2ec4de, 0xbc8b61bf4f84f3cb, 0x1c7706d917a8f908, 0x63b795fc7ad3255d}},
- {{0xd598639c12ddb0a4, 0xa5d19f30c024866b, 0xd17c2f0358fce460, 0x07a195152e095e8a}},
- {{0xa8368f02389e5fc8, 0x90433b02cf8de43b, 0xafa1fd5dc5412643, 0x3e8fe83d032f0137}}},
-{{{0x2f8b15b90570a294, 0x94f2427067084549, 0xde1c5ae161bbfd84, 0x75ba3b797fac4007}},
- {{0x08704c8de8efd13c, 0xdfc51a8e33e03731, 0xa59d5da51260cde3, 0x22d60899a6258c86}},
- {{0x6239dbc070cdd196, 0x60fe8a8b6c7d8a9a, 0xb38847bceb401260, 0x0904d07b87779e5e}}},
-{{{0xb4ce1fd4ddba919c, 0xcf31db3ec74c8daa, 0x2c63cc63ad86cc51, 0x43e2143fbc1dde07}},
- {{0xf4322d6648f940b9, 0x06952f0cbd2d0c39, 0x167697ada081f931, 0x6240aacebaf72a6c}},
- {{0xf834749c5ba295a0, 0xd6947c5bca37d25a, 0x66f13ba7e7c9316a, 0x56bdaf238db40cac}}},
-{{{0x362ab9e3f53533eb, 0x338568d56eb93d40, 0x9e0e14521d5a5572, 0x1d24a86d83741318}},
- {{0x1310d36cc19d3bb2, 0x062a6bb7622386b9, 0x7c9b8591d7a14f5c, 0x03aa31507e1e5754}},
- {{0xf4ec7648ffd4ce1f, 0xe045eaf054ac8c1c, 0x88d225821d09357c, 0x43b261dc9aeb4859}}},
-{{{0xe55b1e1988bb79bb, 0xa09ed07dc17a359d, 0xb02c2ee2603dea33, 0x326055cf5b276bc2}},
- {{0x19513d8b6c951364, 0x94fe7126000bf47b, 0x028d10ddd54f9567, 0x02b4d5e242940964}},
- {{0xb4a155cb28d18df2, 0xeacc4646186ce508, 0xc49cf4936c824389, 0x27a6c809ae5d3410}}},
-{{{0x8ba6ebcd1f0db188, 0x37d3d73a675a5be8, 0xf22edfa315f5585a, 0x2cb67174ff60a17e}},
- {{0xcd2c270ac43d6954, 0xdd4a3e576a66cab2, 0x79fa592469d7036c, 0x221503603d8c2599}},
- {{0x59eecdf9390be1d0, 0xa9422044728ce3f1, 0x82891c667a94f0f4, 0x7b1df4b73890f436}}},
-{{{0xe492f2e0b3b2a224, 0x7c6c9e062b551160, 0x15eb8fe20d7f7b0e, 0x61fcef2658fc5992}},
- {{0x5f2e221807f8f58c, 0xe3555c9fd49409d4, 0xb2aaa88d1fb6a630, 0x68698245d352e03d}},
- {{0xdbb15d852a18187a, 0xf3e4aad386ddacd7, 0x44bae2810ff6c482, 0x46cf4c473daf01cf}}},
-{{{0x426525ed9ec4e5f9, 0x0e5eda0116903303, 0x72b1a7f2cbe5cadc, 0x29387bcd14eb5f40}},
- {{0x213c6ea7f1498140, 0x7c1e7ef8392b4854, 0x2488c38c5629ceba, 0x1065aae50d8cc5bb}},
- {{0x1c2c4525df200d57, 0x5c3b2dd6bfca674a, 0x0a07e7b1e1834030, 0x69a198e64f1ce716}}},
-{{{0x9062b2e0d91a78bc, 0x47c9889cc8509667, 0x9df54a66405070b8, 0x7369e6a92493a1bf}},
- {{0xe1014434dcc5caed, 0x47ed5d963c84fb33, 0x70019576ed86a0e7, 0x25b2697bd267f9e4}},
- {{0x9d673ffb13986864, 0x3ca5fbd9415dc7b8, 0xe04ecc3bdf273b5e, 0x1420683db54e4cd2}}},
-{{{0xb478bd1e249dd197, 0x620c35005e58c102, 0xfb02d32fccbaac5c, 0x60b63bebf508a72d}},
- {{0x34eebb6fc1cc5ad0, 0x6a1b0ce99646ac8b, 0xd3b0da49a66bde53, 0x31e83b4161d081c1}},
- {{0x97e8c7129e062b4f, 0x49e48f4f29320ad8, 0x5bece14b6f18683f, 0x55cf1eb62d550317}}},
-{{{0x5879101065c23d58, 0x8b9d086d5094819c, 0xe2402fa912c55fa7, 0x669a6564570891d4}},
- {{0x3076b5e37df58c52, 0xd73ab9dde799cc36, 0xbd831ce34913ee20, 0x1a56fbaa62ba0133}},
- {{0x943e6b505c9dc9ec, 0x302557bba77c371a, 0x9873ae5641347651, 0x13c4836799c58a5c}}},
-{{{0x423a5d465ab3e1b9, 0xfc13c187c7f13f61, 0x19f83664ecb5b9b6, 0x66f80c93a637b607}},
- {{0xc4dcfb6a5d8bd080, 0xdeebc4ec571a4842, 0xd4b2e883b8e55365, 0x50bdc87dc8e5b827}},
- {{0x606d37836edfe111, 0x32353e15f011abd9, 0x64b03ac325b73b96, 0x1dd56444725fd5ae}}},
-{{{0x8fa47ff83362127d, 0xbc9f6ac471cd7c15, 0x6e71454349220c8b, 0x0e645912219f732e}},
- {{0xc297e60008bac89a, 0x7d4cea11eae1c3e0, 0xf3e38be19fe7977c, 0x3a3a450f63a305cd}},
- {{0x078f2f31d8394627, 0x389d3183de94a510, 0xd1e36c6d17996f80, 0x318c8d9393a9a87b}}},
-{{{0xf2745d032afffe19, 0x0c9f3c497f24db66, 0xbc98d3e3ba8598ef, 0x224c7c679a1d5314}},
- {{0x5d669e29ab1dd398, 0xfc921658342d9e3b, 0x55851dfdf35973cd, 0x509a41c325950af6}},
- {{0xbdc06edca6f925e9, 0x793ef3f4641b1f33, 0x82ec12809d833e89, 0x05bff02328a11389}}},
-{{{0x3632137023cae00b, 0x544acf0ad1accf59, 0x96741049d21a1c88, 0x780b8cc3fa2a44a7}},
- {{0x6881a0dd0dc512e4, 0x4fe70dc844a5fafe, 0x1f748e6b8f4a5240, 0x576277cdee01a3ea}},
- {{0x1ef38abc234f305f, 0x9a577fbd1405de08, 0x5e82a51434e62a0d, 0x5ff418726271b7a1}}},
-{{{0x398e080c1789db9d, 0xa7602025f3e778f5, 0xfa98894c06bd035d, 0x106a03dc25a966be}},
- {{0xe5db47e813b69540, 0xf35d2a3b432610e1, 0xac1f26e938781276, 0x29d4db8ca0a0cb69}},
- {{0xd9ad0aaf333353d0, 0x38669da5acd309e5, 0x3c57658ac888f7f0, 0x4ab38a51052cbefa}}},
-{{{0xda7c2b256768d593, 0x98c1c0574422ca13, 0xf1a80bd5ca0ace1d, 0x29cdd1adc088a690}},
- {{0xd6cfd1ef5fddc09c, 0xe82b3efdf7575dce, 0x25d56b5d201634c2, 0x3041c6bb04ed2b9b}},
- {{0x0ff2f2f9d956e148, 0xade797759f356b2e, 0x1a4698bb5f6c025c, 0x104bbd6814049a7b}}},
-{{{0x51f0fd3168f1ed67, 0x2c811dcdd86f3bc2, 0x44dc5c4304d2f2de, 0x5be8cc57092a7149}},
- {{0xa95d9a5fd67ff163, 0xe92be69d4cc75681, 0xb7f8024cde20f257, 0x204f2a20fb072df5}},
- {{0xc8143b3d30ebb079, 0x7589155abd652e30, 0x653c3c318f6d5c31, 0x2570fb17c279161f}}},
-{{{0x3efa367f2cb61575, 0xf5f96f761cd6026c, 0xe8c7142a65b52562, 0x3dcb65ea53030acd}},
- {{0x192ea9550bb8245a, 0xc8e6fba88f9050d1, 0x7986ea2d88a4c935, 0x241c5f91de018668}},
- {{0x28d8172940de6caa, 0x8fbf2cf022d9733a, 0x16d7fcdd235b01d1, 0x08420edd5fcdf0e5}}},
-{{{0xcdff20ab8362fa4a, 0x57e118d4e21a3e6e, 0xe3179617fc39e62b, 0x0d9a53efbc1769fd}},
- {{0x0358c34e04f410ce, 0xb6135b5a276e0685, 0x5d9670c7ebb91521, 0x04d654f321db889c}},
- {{0x5e7dc116ddbdb5d5, 0x2954deb68da5dd2d, 0x1cb608173334a292, 0x4a7a4f2618991ad7}}},
-{{{0xf4a718025fb15f95, 0x3df65f346b5c1b8f, 0xcdfcf08500e01112, 0x11b50c4cddd31848}},
- {{0x24c3b291af372a4b, 0x93da8270718147f2, 0xdd84856486899ef2, 0x4a96314223e0ee33}},
- {{0xa6e8274408a4ffd6, 0x738e177e9c1576d9, 0x773348b63d02b3f2, 0x4f4bce4dce6bcc51}}},
-{{{0xa71fce5ae2242584, 0x26ea725692f58a9e, 0xd21a09d71cea3cf4, 0x73fcdd14b71c01e6}},
- {{0x30e2616ec49d0b6f, 0xe456718fcaec2317, 0x48eb409bf26b4fa6, 0x3042cee561595f37}},
- {{0x427e7079449bac41, 0x855ae36dbce2310a, 0x4cae76215f841a7c, 0x389e740c9a9ce1d6}}},
-{{{0x64fcb3ae34dcb9ce, 0x97500323e348d0ad, 0x45b3f07d62c6381b, 0x61545379465a6788}},
- {{0xc9bd78f6570eac28, 0xe55b0b3227919ce1, 0x65fc3eaba19b91ed, 0x25c425e5d6263690}},
- {{0x3f3e06a6f1d7de6e, 0x3ef976278e062308, 0x8c14f6264e8a6c77, 0x6539a08915484759}}},
-{{{0xe9d21f74c3d2f773, 0xc150544125c46845, 0x624e5ce8f9b99e33, 0x11c5e4aac5cd186c}},
- {{0xddc4dbd414bb4a19, 0x19b2bc3c98424f8e, 0x48a89fd736ca7169, 0x0f65320ef019bd90}},
- {{0xd486d1b1cafde0c6, 0x4f3fe6e3163b5181, 0x59a8af0dfaf2939a, 0x4cabc7bdec33072a}}},
-{{{0x239e9624089c0a2e, 0xc748c4c03afe4738, 0x17dbed2a764fa12a, 0x639b93f0321c8582}},
- {{0xc08f788f3f78d289, 0xfe30a72ca1404d9f, 0xf2778bfccf65cc9d, 0x7ee498165acb2021}},
- {{0x7bd508e39111a1c3, 0x2b2b90d480907489, 0xe7d2aec2ae72fd19, 0x0edf493c85b602a6}}},
-{{{0xaecc8158599b5a68, 0xea574f0febade20e, 0x4fe41d7422b67f07, 0x403b92e3019d4fb4}},
- {{0x6767c4d284764113, 0xa090403ff7f5f835, 0x1c8fcffacae6bede, 0x04c00c54d1dfa369}},
- {{0x4dc22f818b465cf8, 0x71a0f35a1480eff8, 0xaee8bfad04c7d657, 0x355bb12ab26176f4}}},
-{{{0xa71e64cc7493bbf4, 0xe5bd84d9eca3b0c3, 0x0a6bc50cfa05e785, 0x0f9b8132182ec312}},
- {{0xa301dac75a8c7318, 0xed90039db3ceaa11, 0x6f077cbf3bae3f2d, 0x7518eaf8e052ad8e}},
- {{0xa48859c41b7f6c32, 0x0f2d60bcf4383298, 0x1815a929c9b1d1d9, 0x47c3871bbb1755c4}}},
-{{{0x5144539771ec4f48, 0xf805b17dc98c5d6e, 0xf762c11a47c3c66b, 0x00b89b85764699dc}},
- {{0xfbe65d50c85066b0, 0x62ecc4b0b3a299b0, 0xe53754ea441ae8e0, 0x08fea02ce8d48d5f}},
- {{0x824ddd7668deead0, 0xc86445204b685d23, 0xb514cfcd5d89d665, 0x473829a74f75d537}}},
-{{{0x82d2da754679c418, 0xe63bd7d8b2618df0, 0x355eef24ac47eb0a, 0x2078684c4833c6b4}},
- {{0x23d9533aad3902c9, 0x64c2ddceef03588f, 0x15257390cfe12fb4, 0x6c668b4d44e4d390}},
- {{0x3b48cf217a78820c, 0xf76a0ab281273e97, 0xa96c65a78c8eed7b, 0x7411a6054f8a433f}}},
-{{{0x4d659d32b99dc86d, 0x044cdc75603af115, 0xb34c712cdcc2e488, 0x7c136574fb8134ff}},
- {{0x579ae53d18b175b4, 0x68713159f392a102, 0x8455ecba1eef35f5, 0x1ec9a872458c398f}},
- {{0xb8e6a4d400a2509b, 0x9b81d7020bc882b4, 0x57e7cc9bf1957561, 0x3add88a5c7cd6460}}},
-{{{0xab895770b635dcf2, 0x02dfef6cf66c1fbc, 0x85530268beb6d187, 0x249929fccc879e74}},
- {{0x85c298d459393046, 0x8f7e35985ff659ec, 0x1d2ca22af2f66e3a, 0x61ba1131a406a720}},
- {{0xa3d0a0f116959029, 0x023b6b6cba7ebd89, 0x7bf15a3e26783307, 0x5620310cbbd8ece7}}},
-{{{0x528993434934d643, 0xb9dbf806a51222f5, 0x8f6d878fc3f41c22, 0x37676a2a4d9d9730}},
- {{0x6646b5f477e285d6, 0x40e8ff676c8f6193, 0xa6ec7311abb594dd, 0x7ec846f3658cec4d}},
- {{0x9b5e8f3f1da22ec7, 0x130f1d776c01cd13, 0x214c8fcfa2989fb8, 0x6daaf723399b9dd5}}},
-{{{0x5f3a7562eb3dbe47, 0xf7ea38548ebda0b8, 0x00c3e53145747299, 0x1304e9e71627d551}},
- {{0x583b04bfacad8ea2, 0x29b743e8148be884, 0x2b1e583b0810c5db, 0x2b5449e58eb3bbaa}},
- {{0x789814d26adc9cfe, 0x3c1bab3f8b48dd0b, 0xda0fe1fff979c60a, 0x4468de2d7c2dd693}}},
-{{{0x51bb355e9419469e, 0x33e6dc4c23ddc754, 0x93a5b6d6447f9962, 0x6cce7c6ffb44bd63}},
- {{0x4b9ad8c6f86307ce, 0x21113531435d0c28, 0xd4a866c5657a772c, 0x5da6427e63247352}},
- {{0x1a94c688deac22ca, 0xb9066ef7bbae1ff8, 0x88ad8c388d59580f, 0x58f29abfe79f2ca8}}},
-{{{0xe90ecfab8de73e68, 0x54036f9f377e76a5, 0xf0495b0bbe015982, 0x577629c4a7f41e36}},
- {{0x4b5a64bf710ecdf6, 0xb14ce538462c293c, 0x3643d056d50b3ab9, 0x6af93724185b4870}},
- {{0x3220024509c6a888, 0xd2e036134b558973, 0x83e236233c33289f, 0x701f25bb0caec18f}}},
-{{{0xc3a8b0f8e4616ced, 0xf700660e9e25a87d, 0x61e3061ff4bca59c, 0x2e0c92bfbdc40be9}},
- {{0x9d18f6d97cbec113, 0x844a06e674bfdbe4, 0x20f5b522ac4e60d6, 0x720a5bc050955e51}},
- {{0x0c3f09439b805a35, 0xe84e8b376242abfc, 0x691417f35c229346, 0x0e9b9cbb144ef0ec}}},
-{{{0xfbbad48ffb5720ad, 0xee81916bdbf90d0e, 0xd4813152635543bf, 0x221104eb3f337bd8}},
- {{0x8dee9bd55db1beee, 0xc9c3ab370a723fb9, 0x44a8f1bf1c68d791, 0x366d44191cfd3cde}},
- {{0x9e3c1743f2bc8c14, 0x2eda26fcb5856c3b, 0xccb82f0e68a7fb97, 0x4167a4e6bc593244}}},
-{{{0x643b9d2876f62700, 0x5d1d9d400e7668eb, 0x1b4b430321fc0684, 0x7938bb7e2255246a}},
- {{0xc2be2665f8ce8fee, 0xe967ff14e880d62c, 0xf12e6e7e2f364eee, 0x34b33370cb7ed2f6}},
- {{0xcdc591ee8681d6cc, 0xce02109ced85a753, 0xed7485c158808883, 0x1176fc6e2dfe65e4}}},
-{{{0xb4af6cd05b9c619b, 0x2ddfc9f4b2a58480, 0x3d4fa502ebe94dc4, 0x08fc3a4c677d5f34}},
- {{0xdb90e28949770eb8, 0x98fbcc2aacf440a3, 0x21354ffeded7879b, 0x1f6a3e54f26906b6}},
- {{0x60a4c199d30734ea, 0x40c085b631165cd6, 0xe2333e23f7598295, 0x4f2fad0116b900d1}}},
-{{{0x44beb24194ae4e54, 0x5f541c511857ef6c, 0xa61e6b2d368d0498, 0x445484a4972ef7ab}},
- {{0x962cd91db73bb638, 0xe60577aafc129c08, 0x6f619b39f3b61689, 0x3451995f2944ee81}},
- {{0x9152fcd09fea7d7c, 0x4a816c94b0935cf6, 0x258e9aaa47285c40, 0x10b89ca6042893b7}}},
-{{{0x3d5947499718289c, 0x12ebf8c524533f26, 0x0262bfcb14c3ef15, 0x20b878d577b7518e}},
- {{0x753941be5a45f06e, 0xd07caeed6d9c5f65, 0x11776b9c72ff51b6, 0x17d2d1d9ef0d4da9}},
- {{0x27f2af18073f3e6a, 0xfd3fe519d7521069, 0x22e3b72c3ca60022, 0x72214f63cc65c6a7}}},
-{{{0xb4e37f405307a693, 0xaba714d72f336795, 0xd6fbd0a773761099, 0x5fdf48c58171cbc9}},
- {{0x1d9db7b9f43b29c9, 0xd605824a4f518f75, 0xf2c072bd312f9dc4, 0x1f24ac855a1545b0}},
- {{0x24d608328e9505aa, 0x4748c1d10c1420ee, 0xc7ffe45c06fb25a2, 0x00ba739e2ae395e6}}},
-{{{0x592e98de5c8790d6, 0xe5bfb7d345c2a2df, 0x115a3b60f9b49922, 0x03283a3e67ad78f3}},
- {{0xae4426f5ea88bb26, 0x360679d984973bfb, 0x5c9f030c26694e50, 0x72297de7d518d226}},
- {{0x48241dc7be0cb939, 0x32f19b4d8b633080, 0xd3dfc90d02289308, 0x05e1296846271945}}},
-{{{0xba82eeb32d9c495a, 0xceefc8fcf12bb97c, 0xb02dabae93b5d1e0, 0x39c00c9c13698d9b}},
- {{0xadbfbbc8242c4550, 0xbcc80cecd03081d9, 0x843566a6f5c8df92, 0x78cf25d38258ce4c}},
- {{0x15ae6b8e31489d68, 0xaa851cab9c2bf087, 0xc9a75a97f04efa05, 0x006b52076b3ff832}}},
-{{{0x29e0cfe19d95781c, 0xb681df18966310e2, 0x57df39d370516b39, 0x4d57e3443bc76122}},
- {{0xf5cb7e16b9ce082d, 0x3407f14c417abc29, 0xd4b36bce2bf4a7ab, 0x7de2e9561a9f75ce}},
- {{0xde70d4f4b6a55ecb, 0x4801527f5d85db99, 0xdbc9c440d3ee9a81, 0x6b2a90af1a6029ed}}},
-{{{0x6923f4fc9ae61e97, 0x5735281de03f5fd1, 0xa764ae43e6edd12d, 0x5fd8f4e9d12d3e4a}},
- {{0x77ebf3245bb2d80a, 0xd8301b472fb9079b, 0xc647e6f24cee7333, 0x465812c8276c2109}},
- {{0x4d43beb22a1062d9, 0x7065fb753831dc16, 0x180d4a7bde2968d7, 0x05b32c2b1cb16790}}},
-{{{0xc8c05eccd24da8fd, 0xa1cf1aac05dfef83, 0xdbbeeff27df9cd61, 0x3b5556a37b471e99}},
- {{0xf7fca42c7ad58195, 0x3214286e4333f3cc, 0xb6c29d0d340b979d, 0x31771a48567307e1}},
- {{0x32b0c524e14dd482, 0xedb351541a2ba4b6, 0xa3d16048282b5af3, 0x4fc079d27a7336eb}}},
-{{{0x51c938b089bf2f7f, 0x2497bd6502dfe9a7, 0xffffc09c7880e453, 0x124567cecaf98e92}},
- {{0xdc348b440c86c50d, 0x1337cbc9cc94e651, 0x6422f74d643e3cb9, 0x241170c2bae3cd08}},
- {{0x3ff9ab860ac473b4, 0xf0911dee0113e435, 0x4ae75060ebc6c4af, 0x3f8612966c87000d}}},
-{{{0x559a0cc9782a0dde, 0x551dcdb2ea718385, 0x7f62865b31ef238c, 0x504aa7767973613d}},
- {{0x9c18fcfa36048d13, 0x29159db373899ddd, 0xdc9f350b9f92d0aa, 0x26f57eee878a19d4}},
- {{0x0cab2cd55687efb1, 0x5180d162247af17b, 0x85c15a344f5a2467, 0x4041943d9dba3069}}},
-{{{0xc3c0eeba43ebcc96, 0x8d749c9c26ea9caf, 0xd9fa95ee1c77ccc6, 0x1420a1d97684340f}},
- {{0x4b217743a26caadd, 0x47a6b424648ab7ce, 0xcb1d4f7a03fbc9e3, 0x12d931429800d019}},
- {{0x00c67799d337594f, 0x5e3c5140b23aa47b, 0x44182854e35ff395, 0x1b4f92314359a012}}},
-{{{0x3e5c109d89150951, 0x39cefa912de9696a, 0x20eae43f975f3020, 0x239b572a7f132dae}},
- {{0x33cf3030a49866b1, 0x251f73d2215f4859, 0xab82aa4051def4f6, 0x5ff191d56f9a23f6}},
- {{0x819ed433ac2d9068, 0x2883ab795fc98523, 0xef4572805593eb3d, 0x020c526a758f36cb}}},
-{{{0x779834f89ed8dbbc, 0xc8f2aaf9dc7ca46c, 0xa9524cdca3e1b074, 0x02aacc4615313877}},
- {{0xe931ef59f042cc89, 0x2c589c9d8e124bb6, 0xadc8e18aaec75997, 0x452cfe0a5602c50c}},
- {{0x86a0f7a0647877df, 0xbbc464270e607c9f, 0xab17ea25f1fb11c9, 0x4cfb7d7b304b877b}}},
-{{{0x72b43d6cb89b75fe, 0x54c694d99c6adc80, 0xb8c3aa373ee34c9f, 0x14b4622b39075364}},
- {{0xe28699c29789ef12, 0x2b6ecd71df57190d, 0xc343c857ecc970d0, 0x5b1d4cbc434d3ac5}},
- {{0xb6fb2615cc0a9f26, 0x3a4f0e2bb88dcce5, 0x1301498b3369a705, 0x2f98f71258592dd1}}},
-{{{0x0c94a74cb50f9e56, 0x5b1ff4a98e8e1320, 0x9a2acc2182300f67, 0x3a6ae249d806aaf9}},
- {{0x2e12ae444f54a701, 0xfcfe3ef0a9cbd7de, 0xcebf890d75835de0, 0x1d8062e9e7614554}},
- {{0x657ada85a9907c5a, 0x1a0ea8b591b90f62, 0x8d0e1dfbdf34b4e9, 0x298b8ce8aef25ff3}}},
-{{{0x2a927953eff70cb2, 0x4b89c92a79157076, 0x9418457a30a7cf6a, 0x34b8a8404d5ce485}},
- {{0x837a72ea0a2165de, 0x3fab07b40bcf79f6, 0x521636c77738ae70, 0x6ba6271803a7d7dc}},
- {{0xc26eecb583693335, 0xd5a813df63b5fefd, 0xa293aa9aa4b22573, 0x71d62bdd465e1c6a}}},
-{{{0x6533cc28d378df80, 0xf6db43790a0fa4b4, 0xe3645ff9f701da5a, 0x74d5f317f3172ba4}},
- {{0xcd2db5dab1f75ef5, 0xd77f95cf16b065f5, 0x14571fea3f49f085, 0x1c333621262b2b3d}},
- {{0xa86fe55467d9ca81, 0x398b7c752b298c37, 0xda6d0892e3ac623b, 0x4aebcc4547e9d98c}}},
-{{{0x12f0071b276d01c9, 0xe7b8bac586c48c70, 0x5308129b71d6fba9, 0x5d88fbf95a3db792}},
- {{0x0b408d9e7354b610, 0x806b32535ba85b6e, 0xdbe63a034a58a207, 0x173bd9ddc9a1df2c}},
- {{0x2b500f1efe5872df, 0x58d6582ed43918c1, 0xe6ed278ec9673ae0, 0x06e1cd13b19ea319}}},
-{{{0x40d0ad516f166f23, 0x118e32931fab6abe, 0x3fe35e14a04d088e, 0x3080603526e16266}},
- {{0x472baf629e5b0353, 0x3baa0b90278d0447, 0x0c785f469643bf27, 0x7f3a6a1a8d837b13}},
- {{0xf7e644395d3d800b, 0x95a8d555c901edf6, 0x68cd7830592c6339, 0x30d0fded2e51307e}}},
-{{{0xe0594d1af21233b3, 0x1bdbe78ef0cc4d9c, 0x6965187f8f499a77, 0x0a9214202c099868}},
- {{0x9cb4971e68b84750, 0xa09572296664bbcf, 0x5c8de72672fa412b, 0x4615084351c589d9}},
- {{0xbc9019c0aeb9a02e, 0x55c7110d16034cae, 0x0e6df501659932ec, 0x3bca0d2895ca5dfe}}},
-{{{0x40f031bc3c5d62a4, 0x19fc8b3ecff07a60, 0x98183da2130fb545, 0x5631deddae8f13cd}},
- {{0x9c688eb69ecc01bf, 0xf0bc83ada644896f, 0xca2d955f5f7a9fe2, 0x4ea8b4038df28241}},
- {{0x2aed460af1cad202, 0x46305305a48cee83, 0x9121774549f11a5f, 0x24ce0930542ca463}}},
-{{{0x1fe890f5fd06c106, 0xb5c468355d8810f2, 0x827808fe6e8caf3e, 0x41d4e3c28a06d74b}},
- {{0x3fcfa155fdf30b85, 0xd2f7168e36372ea4, 0xb2e064de6492f844, 0x549928a7324f4280}},
- {{0xf26e32a763ee1a2e, 0xae91e4b7d25ffdea, 0xbc3bd33bd17f4d69, 0x491b66dec0dcff6a}}},
-{{{0x98f5b13dc7ea32a7, 0xe3d5f8cc7e16db98, 0xac0abf52cbf8d947, 0x08f338d0c85ee4ac}},
- {{0x75f04a8ed0da64a1, 0xed222caf67e2284b, 0x8234a3791f7b7ba4, 0x4cf6b8b0b7018b67}},
- {{0xc383a821991a73bd, 0xab27bc01df320c7a, 0xc13d331b84777063, 0x530d4a82eb078a99}}},
-{{{0x004c3630e1f94825, 0x7e2d78268cab535a, 0xc7482323cc84ff8b, 0x65ea753f101770b9}},
- {{0x6d6973456c9abf9e, 0x257fb2fc4900a880, 0x2bacf412c8cfb850, 0x0db3e7e00cbfbd5b}},
- {{0x3d66fc3ee2096363, 0x81d62c7f61b5cb6b, 0x0fbe044213443b1a, 0x02a4ec1921e1a1db}}},
-{{{0x5ce6259a3b24b8a2, 0xb8577acc45afa0b8, 0xcccbe6e88ba07037, 0x3d143c51127809bf}},
- {{0xf5c86162f1cf795f, 0x118c861926ee57f2, 0x172124851c063578, 0x36d12b5dec067fcf}},
- {{0x126d279179154557, 0xd5e48f5cfc783a0a, 0x36bdb6e8df179bac, 0x2ef517885ba82859}}},
-{{{0x4637974e8c58aedc, 0xb9ef22fbabf041a4, 0xe185d956e980718a, 0x2f1b78fab143a8a6}},
- {{0x96eebffb305b2f51, 0xd3f938ad889596b8, 0xf0f52dc746d5dd25, 0x57968290bb3a0095}},
- {{0xf71ab8430a20e101, 0xf393658d24f0ec47, 0xcf7509a86ee2eed1, 0x7dc43e35dc2aa3e1}}},
-{{{0x85966665887dd9c3, 0xc90f9b314bb05355, 0xc6e08df8ef2079b1, 0x7ef72016758cc12f}},
- {{0x5a782a5c273e9718, 0x3576c6995e4efd94, 0x0f2ed8051f237d3e, 0x044fb81d82d50a99}},
- {{0xc1df18c5a907e3d9, 0x57b3371dce4c6359, 0xca704534b201bb49, 0x7f79823f9c30dd2e}}},
-{{{0x8334d239a3b513e8, 0xc13670d4b91fa8d8, 0x12b54136f590bd33, 0x0a4e0373d784d9b4}},
- {{0x6a9c1ff068f587ba, 0x0827894e0050c8de, 0x3cbf99557ded5be7, 0x64a9b0431c06d6f0}},
- {{0x2eb3d6a15b7d2919, 0xb0b4f6a0d53a8235, 0x7156ce4389a45d47, 0x071a7d0ace18346c}}},
-{{{0xd3072daac887ba0b, 0x01262905bfa562ee, 0xcf543002c0ef768b, 0x2c3bcc7146ea7e9c}},
- {{0xcc0c355220e14431, 0x0d65950709b15141, 0x9af5621b209d5f36, 0x7c69bcf7617755d3}},
- {{0x07f0d7eb04e8295f, 0x10db18252f50f37d, 0xe951a9a3171798d7, 0x6f5a9a7322aca51d}}},
-{{{0x8ba1000c2f41c6c5, 0xc49f79c10cfefb9b, 0x4efa47703cc51c9f, 0x494e21a2e147afca}},
- {{0xe729d4eba3d944be, 0x8d9e09408078af9e, 0x4525567a47869c03, 0x02ab9680ee8d3b24}},
- {{0xefa48a85dde50d9a, 0x219a224e0fb9a249, 0xfa091f1dd91ef6d9, 0x6b5d76cbea46bb34}}},
-{{{0x8857556cec0cd994, 0x6472dc6f5cd01dba, 0xaf0169148f42b477, 0x0ae333f685277354}},
- {{0xe0f941171e782522, 0xf1e6ae74036936d3, 0x408b3ea2d0fcc746, 0x16fb869c03dd313e}},
- {{0x288e199733b60962, 0x24fc72b4d8abe133, 0x4811f7ed0991d03e, 0x3f81e38b8f70d075}}},
-{{{0x7f910fcc7ed9affe, 0x545cb8a12465874b, 0xa8397ed24b0c4704, 0x50510fc104f50993}},
- {{0x0adb7f355f17c824, 0x74b923c3d74299a4, 0xd57c3e8bcbf8eaf7, 0x0ad3e2d34cdedc3d}},
- {{0x6f0c0fc5336e249d, 0x745ede19c331cfd9, 0xf2d6fd0009eefe1c, 0x127c158bf0fa1ebe}}},
-{{{0xf6197c422e9879a2, 0xa44addd452ca3647, 0x9b413fc14b4eaccb, 0x354ef87d07ef4f68}},
- {{0xdea28fc4ae51b974, 0x1d9973d3744dfe96, 0x6240680b873848a8, 0x4ed82479d167df95}},
- {{0xfee3b52260c5d975, 0x50352efceb41b0b8, 0x8808ac30a9f6653c, 0x302d92d20539236d}}},
-{{{0x7813c1a2bca4283d, 0xed62f091a1863dd9, 0xaec7bcb8c268fa86, 0x10e5d3b76f1cae4c}},
- {{0x2dbc6fb6e4e0f177, 0x04e1bf29a4bd6a93, 0x5e1966d4787af6e8, 0x0edc5f5eb426d060}},
- {{0x5453bfd653da8e67, 0xe9dc1eec24a9f641, 0xbf87263b03578a23, 0x45b46c51361cba72}}},
-{{{0xa9402abf314f7fa1, 0xe257f1dc8e8cf450, 0x1dbbd54b23a8be84, 0x2177bfa36dcb713b}},
- {{0xce9d4ddd8a7fe3e4, 0xab13645676620e30, 0x4b594f7bb30e9958, 0x5c1c0aef321229df}},
- {{0x37081bbcfa79db8f, 0x6048811ec25f59b3, 0x087a76659c832487, 0x4ae619387d8ab5bb}}},
-{{{0x8ddbf6aa5344a32e, 0x7d88eab4b41b4078, 0x5eb0eb974a130d60, 0x1a00d91b17bf3e03}},
- {{0x61117e44985bfb83, 0xfce0462a71963136, 0x83ac3448d425904b, 0x75685abe5ba43d64}},
- {{0x6e960933eb61f2b2, 0x543d0fa8c9ff4952, 0xdf7275107af66569, 0x135529b623b0e6aa}}},
-{{{0x18f0dbd7add1d518, 0x979f7888cfc11f11, 0x8732e1f07114759b, 0x79b5b81a65ca3a01}},
- {{0xf5c716bce22e83fe, 0xb42beb19e80985c1, 0xec9da63714254aae, 0x5972ea051590a613}},
- {{0x0fd4ac20dc8f7811, 0x9a9ad294ac4d4fa8, 0xc01b2d64b3360434, 0x4f7e9c95905f3bdb}}},
-{{{0x62674bbc5781302e, 0xd8520f3989addc0f, 0x8c2999ae53fbd9c6, 0x31993ad92e638e4c}},
- {{0x71c8443d355299fe, 0x8bcd3b1cdbebead7, 0x8092499ef1a49466, 0x1942eec4a144adc8}},
- {{0x7dac5319ae234992, 0x2c1b3d910cea3e92, 0x553ce494253c1122, 0x2a0a65314ef9ca75}}},
-{{{0x2db7937ff7f927c2, 0xdb741f0617d0a635, 0x5982f3a21155af76, 0x4cf6e218647c2ded}},
- {{0xcf361acd3c1c793a, 0x2f9ebcac5a35bc3b, 0x60e860e9a8cda6ab, 0x055dc39b6dea1a13}},
- {{0xb119227cc28d5bb6, 0x07e24ebc774dffab, 0xa83c78cee4a32c89, 0x121a307710aa24b6}}},
-{{{0xe4db5d5e9f034a97, 0xe153fc093034bc2d, 0x460546919551d3b1, 0x333fc76c7a40e52d}},
- {{0xd659713ec77483c9, 0x88bfe077b82b96af, 0x289e28231097bcd3, 0x527bb94a6ced3a9b}},
- {{0x563d992a995b482e, 0x3405d07c6e383801, 0x485035de2f64d8e5, 0x6b89069b20a7a9f7}}},
-{{{0x812aa0416270220d, 0x995a89faf9245b4e, 0xffadc4ce5072ef05, 0x23bc2103aa73eb73}},
- {{0x4082fa8cb5c7db77, 0x068686f8c734c155, 0x29e6c8d9f6e7a57e, 0x0473d308a7639bcf}},
- {{0xcaee792603589e05, 0x2b4b421246dcc492, 0x02a1ef74e601a94f, 0x102f73bfde04341a}}},
-{{{0xeb18b9ab7f5745c6, 0x023a8aee5787c690, 0xb72712da2df7afa9, 0x36597d25ea5c013d}},
- {{0xa2b4dae0b5511c9a, 0x7ac860292bffff06, 0x981f375df5504234, 0x3f6bd725da4ea12d}},
- {{0x734d8d7b106058ac, 0xd940579e6fc6905f, 0x6466f8f99202932d, 0x7b7ecc19da60d6d0}}},
-{{{0x78c2373c695c690d, 0xdd252e660642906e, 0x951d44444ae12bd2, 0x4235ad7601743956}},
- {{0x6dae4a51a77cfa9b, 0x82263654e7a38650, 0x09bbffcd8f2d82db, 0x03bedc661bf5caba}},
- {{0x6258cb0d078975f5, 0x492942549189f298, 0xa0cab423e2e36ee4, 0x0e7ce2b0cdf066a1}}},
-{{{0xc494643ac48c85a3, 0xfd361df43c6139ad, 0x09db17dd3ae94d48, 0x666e0a5d8fb4674a}},
- {{0xfea6fedfd94b70f9, 0xf130c051c1fcba2d, 0x4882d47e7f2fab89, 0x615256138aeceeb5}},
- {{0x2abbf64e4870cb0d, 0xcd65bcf0aa458b6b, 0x9abe4eba75e8985d, 0x7f0bc810d514dee4}}},
-{{{0xb9006ba426f4136f, 0x8d67369e57e03035, 0xcbc8dfd94f463c28, 0x0d1f8dbcf8eedbf5}},
- {{0x83ac9dad737213a0, 0x9ff6f8ba2ef72e98, 0x311e2edd43ec6957, 0x1d3a907ddec5ab75}},
- {{0xba1693313ed081dc, 0x29329fad851b3480, 0x0128013c030321cb, 0x00011b44a31bfde3}}},
-{{{0x3fdfa06c3fc66c0c, 0x5d40e38e4dd60dd2, 0x7ae38b38268e4d71, 0x3ac48d916e8357e1}},
- {{0x16561f696a0aa75c, 0xc1bf725c5852bd6a, 0x11a8dd7f9a7966ad, 0x63d988a2d2851026}},
- {{0x00120753afbd232e, 0xe92bceb8fdd8f683, 0xf81669b384e72b91, 0x33fad52b2368a066}}},
-{{{0x540649c6c5e41e16, 0x0af86430333f7735, 0xb2acfcd2f305e746, 0x16c0f429a256dca7}},
- {{0x8d2cc8d0c422cfe8, 0x072b4f7b05a13acb, 0xa3feb6e6ecf6a56f, 0x3cc355ccb90a71e2}},
- {{0xe9b69443903e9131, 0xb8a494cb7a5637ce, 0xc87cd1a4baba9244, 0x631eaf426bae7568}}},
-{{{0xb3e90410da66fe9f, 0x85dd4b526c16e5a6, 0xbc3d97611ef9bf83, 0x5599648b1ea919b5}},
- {{0x47d975b9a3700de8, 0x7280c5fbe2f80552, 0x53658f2732e45de1, 0x431f2c7f665f80b5}},
- {{0xd6026344858f7b19, 0x14ab352fa1ea514a, 0x8900441a2090a9d7, 0x7b04715f91253b26}}},
-{{{0x83edbd28acf6ae43, 0x86357c8b7d5c7ab4, 0xc0404769b7eb2c44, 0x59b37bf5c2f6583f}},
- {{0xb376c280c4e6bac6, 0x970ed3dd6d1d9b0b, 0xb09a9558450bf944, 0x48d0acfa57cde223}},
- {{0xb60f26e47dabe671, 0xf1d1a197622f3a37, 0x4208ce7ee9960394, 0x16234191336d3bdb}}},
-{{{0xb9e499def6267ff6, 0x7772ca7b742c0843, 0x23a0153fe9a4f2b1, 0x2cdfdfecd5d05006}},
- {{0xdd499cd61ff38640, 0x29cd9bc3063625a0, 0x51e2d8023dd73dc3, 0x4a25707a203b9231}},
- {{0x2ab7668a53f6ed6a, 0x304242581dd170a1, 0x4000144c3ae20161, 0x5721896d248e49fc}}},
-{{{0x0b6e5517fd181bae, 0x9022629f2bb963b4, 0x5509bce932064625, 0x578edd74f63c13da}},
- {{0x285d5091a1d0da4e, 0x4baa6fa7b5fe3e08, 0x63e5177ce19393b3, 0x03c935afc4b030fd}},
- {{0x997276c6492b0c3d, 0x47ccc2c4dfe205fc, 0xdcd29b84dd623a3c, 0x3ec2ab590288c7a2}}},
-{{{0xa1a0d27be4d87bb9, 0xa98b4deb61391aed, 0x99a0ddd073cb9b83, 0x2dd5c25a200fcace}},
- {{0xa7213a09ae32d1cb, 0x0f2b87df40f5c2d5, 0x0baea4c6e81eab29, 0x0e1bf66c6adbac5e}},
- {{0xe2abd5e9792c887e, 0x1a020018cb926d5d, 0xbfba69cdbaae5f1e, 0x730548b35ae88f5f}}},
-{{{0xc43551a3cba8b8ee, 0x65a26f1db2115f16, 0x760f4f52ab8c3850, 0x3043443b411db8ca}},
- {{0x805b094ba1d6e334, 0xbf3ef17709353f19, 0x423f06cb0622702b, 0x585a2277d87845dd}},
- {{0xa18a5f8233d48962, 0x6698c4b5ec78257f, 0xa78e6fa5373e41ff, 0x7656278950ef981f}}},
-{{{0x38c3cf59d51fc8c0, 0x9bedd2fd0506b6f2, 0x26bf109fab570e8f, 0x3f4160a8c1b846a6}},
- {{0xe17073a3ea86cf9d, 0x3a8cfbb707155fdc, 0x4853e7fc31838a8e, 0x28bbf484b613f616}},
- {{0xf2612f5c6f136c7c, 0xafead107f6dd11be, 0x527e9ad213de6f33, 0x1e79cb358188f75d}}},
-{{{0x013436c3eef7e3f1, 0x828b6a7ffe9e10f8, 0x7ff908e5bcf9defc, 0x65d7951b3a3b3831}},
- {{0x77e953d8f5e08181, 0x84a50c44299dded9, 0xdc6c2d0c864525e5, 0x478ab52d39d1f2f4}},
- {{0x66a6a4d39252d159, 0xe5dde1bc871ac807, 0xb82c6b40a6c1c96f, 0x16d87a411a212214}}},
-{{{0xb3bd7e5a42066215, 0x879be3cd0c5a24c1, 0x57c05db1d6f994b7, 0x28f87c8165f38ca6}},
- {{0xfba4d5e2d54e0583, 0xe21fafd72ebd99fa, 0x497ac2736ee9778f, 0x1f990b577a5a6dde}},
- {{0xa3344ead1be8f7d6, 0x7d1e50ebacea798f, 0x77c6569e520de052, 0x45882fe1534d6d3e}}},
-{{{0x6669345d757983d6, 0x62b6ed1117aa11a6, 0x7ddd1857985e128f, 0x688fe5b8f626f6dd}},
- {{0xd8ac9929943c6fe4, 0xb5f9f161a38392a2, 0x2699db13bec89af3, 0x7dcf843ce405f074}},
- {{0x6c90d6484a4732c0, 0xd52143fdca563299, 0xb3be28c3915dc6e1, 0x6739687e7327191b}}},
-{{{0xef782014385675a6, 0xa2649f30aafda9e8, 0x4cd1eb505cdfa8cb, 0x46115aba1d4dc0b3}},
- {{0xa66dcc9dc80c1ac0, 0x97a05cf41b38a436, 0xa7ebf3be95dbd7c6, 0x7da0b8f68d7e7dab}},
- {{0xd40f1953c3b5da76, 0x1dac6f7321119e9b, 0x03cc6021feb25960, 0x5a5f887e83674b4b}}},
-{{{0x8f6301cf70a13d11, 0xcfceb815350dd0c4, 0xf70297d4a4bca47e, 0x3669b656e44d1434}},
- {{0x9e9628d3a0a643b9, 0xb5c3cb00e6c32064, 0x9b5302897c2dec32, 0x43e37ae2d5d1c70c}},
- {{0x387e3f06eda6e133, 0x67301d5199a13ac0, 0xbd5ad8f836263811, 0x6a21e6cd4fd5e9be}}},
-{{{0xf1c6170a3046e65f, 0x58712a2a00d23524, 0x69dbbd3c8c82b755, 0x586bf9f1a195ff57}},
- {{0xef4129126699b2e3, 0x71d30847708d1301, 0x325432d01182b0bd, 0x45371b07001e8b36}},
- {{0xa6db088d5ef8790b, 0x5278f0dc610937e5, 0xac0349d261a16eb8, 0x0eafb03790e52179}}},
-{{{0x960555c13748042f, 0x219a41e6820baa11, 0x1c81f73873486d0c, 0x309acc675a02c661}},
- {{0x5140805e0f75ae1d, 0xec02fbe32662cc30, 0x2cebdf1eea92396d, 0x44ae3344c5435bb3}},
- {{0x9cf289b9bba543ee, 0xf3760e9d5ac97142, 0x1d82e5c64f9360aa, 0x62d5221b7f94678f}}},
-{{{0x524c299c18d0936d, 0xc86bb56c8a0c1a0c, 0xa375052edb4a8631, 0x5c0efde4bc754562}},
- {{0x7585d4263af77a3c, 0xdfae7b11fee9144d, 0xa506708059f7193d, 0x14f29a5383922037}},
- {{0xdf717edc25b2d7f5, 0x21f970db99b53040, 0xda9234b7c3ed4c62, 0x5e72365c7bee093e}}},
-{{{0x575bfc074571217f, 0x3779675d0694d95b, 0x9a0a37bbf4191e33, 0x77f1104c47b4eabc}},
- {{0x7d9339062f08b33e, 0x5b9659e5df9f32be, 0xacff3dad1f9ebdfd, 0x70b20555cb7349b7}},
- {{0xbe5113c555112c4c, 0x6688423a9a881fcd, 0x446677855e503b47, 0x0e34398f4a06404a}}},
-{{{0xb67d22d93ecebde8, 0x09b3e84127822f07, 0x743fa61fb05b6d8d, 0x5e5405368a362372}},
- {{0x18930b093e4b1928, 0x7de3e10e73f3f640, 0xf43217da73395d6f, 0x6f8aded6ca379c3e}},
- {{0xe340123dfdb7b29a, 0x487b97e1a21ab291, 0xf9967d02fde6949e, 0x780de72ec8d3de97}}},
-{{{0x0ae28545089ae7bc, 0x388ddecf1c7f4d06, 0x38ac15510a4811b8, 0x0eb28bf671928ce4}},
- {{0x671feaf300f42772, 0x8f72eb2a2a8c41aa, 0x29a17fd797373292, 0x1defc6ad32b587a6}},
- {{0xaf5bbe1aef5195a7, 0x148c1277917b15ed, 0x2991f7fb7ae5da2e, 0x467d201bf8dd2867}}},
-{{{0x95fe919a74ef4fad, 0x3a827becf6a308a2, 0x964e01d309a47b01, 0x71c43c4f5ba3c797}},
- {{0xbc1ef4bd567ae7a9, 0x3f624cb2d64498bd, 0xe41064d22c1f4ec8, 0x2ef9c5a5ba384001}},
- {{0xb6fd6df6fa9e74cd, 0xf18278bce4af267a, 0x8255b3d0f1ef990e, 0x5a758ca390c5f293}}},
-{{{0xa2b72710d9462495, 0x3aa8c6d2d57d5003, 0xe3d400bfa0b487ca, 0x2dbae244b3eb72ec}},
- {{0x8ce0918b1d61dc94, 0x8ded36469a813066, 0xd4e6a829afe8aad3, 0x0a738027f639d43f}},
- {{0x980f4a2f57ffe1cc, 0x00670d0de1839843, 0x105c3f4a49fb15fd, 0x2698ca635126a69c}}},
-{{{0xe765318832b0ba78, 0x381831f7925cff8b, 0x08a81b91a0291fcc, 0x1fb43dcc49caeb07}},
- {{0x2e3d702f5e3dd90e, 0x9e3f0918e4d25386, 0x5e773ef6024da96a, 0x3c004b0c4afa3332}},
- {{0x9aa946ac06f4b82b, 0x1ca284a5a806c4f3, 0x3ed3265fc6cd4787, 0x6b43fd01cd1fd217}}},
-{{{0xc7a75d4b4697c544, 0x15fdf848df0fffbf, 0x2868b9ebaa46785a, 0x5a68d7105b52f714}},
- {{0xb5c742583e760ef3, 0x75dc52b9ee0ab990, 0xbf1427c2072b923f, 0x73420b2d6ff0d9f0}},
- {{0xaf2cf6cb9e851e06, 0x8f593913c62238c4, 0xda8ab89699fbf373, 0x3db5632fea34bc9e}}},
-{{{0xf46eee2bf75dd9d8, 0x0d17b1f6396759a5, 0x1bf2d131499e7273, 0x04321adf49d75f13}},
- {{0x2e4990b1829825d5, 0xedeaeb873e9a8991, 0xeef03d394c704af8, 0x59197ea495df2b0e}},
- {{0x04e16019e4e55aae, 0xe77b437a7e2f92e9, 0xc7ce2dc16f159aa4, 0x45eafdc1f4d70cc0}}},
-{{{0x698401858045d72b, 0x4c22faa2cf2f0651, 0x941a36656b222dc6, 0x5a5eebc80362dade}},
- {{0xb60e4624cfccb1ed, 0x59dbc292bd5c0395, 0x31a09d1ddc0481c9, 0x3f73ceea5d56d940}},
- {{0xb7a7bfd10a4e8dc6, 0xbe57007e44c9b339, 0x60c1207f1557aefa, 0x26058891266218db}}},
-{{{0x59f704a68360ff04, 0xc3d93fde7661e6f4, 0x831b2a7312873551, 0x54ad0c2e4e615d57}},
- {{0x4c818e3cc676e542, 0x5e422c9303ceccad, 0xec07cccab4129f08, 0x0dedfa10b24443b8}},
- {{0xee3b67d5b82b522a, 0x36f163469fa5c1eb, 0xa5b4d2f26ec19fd3, 0x62ecb2baa77a9408}}},
-{{{0xe5ed795261152b3d, 0x4962357d0eddd7d1, 0x7482c8d0b96b4c71, 0x2e59f919a966d8be}},
- {{0x92072836afb62874, 0x5fcd5e8579e104a5, 0x5aad01adc630a14a, 0x61913d5075663f98}},
- {{0x0dc62d361a3231da, 0xfa47583294200270, 0x02d801513f9594ce, 0x3ddbc2a131c05d5c}}},
-{{{0x9adc0ff9ce5ec54b, 0x039c2a6b8c2f130d, 0x028007c7f0f89515, 0x78968314ac04b36b}},
- {{0xf3aa57a22796bb14, 0x883abab79b07da21, 0xe54be21831a0391c, 0x5ee7fb38d83205f9}},
- {{0x538dfdcb41446a8e, 0xa5acfda9434937f9, 0x46af908d263c8c78, 0x61d0633c9bca0d09}}},
-{{{0x63744935ffdb2566, 0xc5bd6b89780b68bb, 0x6f1b3280553eec03, 0x6e965fd847aed7f5}},
- {{0xada328bcf8fc73df, 0xee84695da6f037fc, 0x637fb4db38c2a909, 0x5b23ac2df8067bdc}},
- {{0x9ad2b953ee80527b, 0xe88f19aafade6d8d, 0x0e711704150e82cf, 0x79b9bbb9dd95dedc}}},
-{{{0xebb355406a3126c2, 0xd26383a868c8c393, 0x6c0c6429e5b97a82, 0x5065f158c9fd2147}},
- {{0xd1997dae8e9f7374, 0xa032a2f8cfbb0816, 0xcd6cba126d445f0a, 0x1ba811460accb834}},
- {{0x708169fb0c429954, 0xe14600acd76ecf67, 0x2eaab98a70e645ba, 0x3981f39e58a4faf2}}},
-{{{0x18fb8a7559230a93, 0x1d168f6960e6f45d, 0x3a85a94514a93cb5, 0x38dc083705acd0fd}},
- {{0xc845dfa56de66fde, 0xe152a5002c40483a, 0xe9d2e163c7b4f632, 0x30f4452edcbc1b65}},
- {{0x856d2782c5759740, 0xfa134569f99cbecc, 0x8844fc73c0ea4e71, 0x632d9a1a593f2469}}},
-{{{0xf6bb6b15b807cba6, 0x1823c7dfbc54f0d7, 0xbb1d97036e29670b, 0x0b24f48847ed4a57}},
- {{0xbf09fd11ed0c84a7, 0x63f071810d9f693a, 0x21908c2d57cf8779, 0x3a5a7df28af64ba2}},
- {{0xdcdad4be511beac7, 0xa4538075ed26ccf2, 0xe19cff9f005f9a65, 0x34fcf74475481f63}}},
-{{{0xc197e04c789767ca, 0xb8714dcb38d9467d, 0x55de888283f95fa8, 0x3d3bdc164dfa63f7}},
- {{0xa5bb1dab78cfaa98, 0x5ceda267190b72f2, 0x9309c9110a92608e, 0x0119a3042fb374b0}},
- {{0x67a2d89ce8c2177d, 0x669da5f66895d0c1, 0xf56598e5b282a2b0, 0x56c088f1ede20a73}}},
-{{{0x336d3d1110a86e17, 0xd7f388320b75b2fa, 0xf915337625072988, 0x09674c6b99108b87}},
- {{0x581b5fac24f38f02, 0xa90be9febae30cbd, 0x9a2169028acf92f0, 0x038b7ea48359038f}},
- {{0x9f4ef82199316ff8, 0x2f49d282eaa78d4f, 0x0971a5ab5aef3174, 0x6e5e31025969eb65}}},
-{{{0xb16c62f587e593fb, 0x4999eddeca5d3e71, 0xb491c1e014cc3e6d, 0x08f5114789a8dba8}},
- {{0x3304fb0e63066222, 0xfb35068987acba3f, 0xbd1924778c1061a3, 0x3058ad43d1838620}},
- {{0x323c0ffde57663d0, 0x05c3df38a22ea610, 0xbdc78abdac994f9a, 0x26549fa4efe3dc99}}},
-{{{0x741d5a461e6bf9d6, 0x2305b3fc7777a581, 0xd45574a26474d3d9, 0x1926e1dc6401e0ff}},
- {{0xdb468549af3f666e, 0xd77fcf04f14a0ea5, 0x3df23ff7a4ba0c47, 0x3a10dfe132ce3c85}},
- {{0xe07f4e8aea17cea0, 0x2fd515463a1fc1fd, 0x175322fd31f2c0f1, 0x1fa1d01d861e5d15}}},
-{{{0xcc8055947d599832, 0x1e4656da37f15520, 0x99f6f7744e059320, 0x773563bc6a75cf33}},
- {{0x38dcac00d1df94ab, 0x2e712bddd1080de9, 0x7f13e93efdd5e262, 0x73fced18ee9a01e5}},
- {{0x06b1e90863139cb3, 0xa493da67c5a03ecd, 0x8d77cec8ad638932, 0x1f426b701b864f44}}},
-{{{0xefc9264c41911c01, 0xf1a3b7b817a22c25, 0x5875da6bf30f1447, 0x4e1af5271d31b090}},
- {{0xf17e35c891a12552, 0xb76b8153575e9c76, 0xfa83406f0d9b723e, 0x0b76bb1b3fa7e438}},
- {{0x08b8c1f97f92939b, 0xbe6771cbd444ab6e, 0x22e5646399bb8017, 0x7b6dd61eb772a955}}},
-{{{0xb7adc1e850f33d92, 0x7998fa4f608cd5cf, 0xad962dbd8dfc5bdb, 0x703e9bceaf1d2f4f}},
- {{0x5730abf9ab01d2c7, 0x16fb76dc40143b18, 0x866cbe65a0cbb281, 0x53fa9b659bff6afe}},
- {{0x6c14c8e994885455, 0x843a5d6665aed4e5, 0x181bb73ebcd65af1, 0x398d93e5c4c61f50}}},
-{{{0x1c4bd16733e248f3, 0xbd9e128715bf0a5f, 0xd43f8cf0a10b0376, 0x53b09b5ddf191b13}},
- {{0xc3877c60d2e7e3f2, 0x3b34aaa030828bb1, 0x283e26e7739ef138, 0x699c9c9002c30577}},
- {{0xf306a7235946f1cc, 0x921718b5cce5d97d, 0x28cdd24781b4e975, 0x51caf30c6fcdd907}}},
-{{{0xa60ba7427674e00a, 0x630e8570a17a7bf3, 0x3758563dcf3324cc, 0x5504aa292383fdaa}},
- {{0x737af99a18ac54c7, 0x903378dcc51cb30f, 0x2b89bc334ce10cc7, 0x12ae29c189f8e99a}},
- {{0xa99ec0cb1f0d01cf, 0x0dd1efcc3a34f7ae, 0x55ca7521d09c4e22, 0x5fd14fe958eba5ea}}},
-{{{0xb5dc2ddf2845ab2c, 0x069491b10a7fe993, 0x4daaf3d64002e346, 0x093ff26e586474d1}},
- {{0x3c42fe5ebf93cb8e, 0xbedfa85136d4565f, 0xe0f0859e884220e8, 0x7dd73f960725d128}},
- {{0xb10d24fe68059829, 0x75730672dbaf23e5, 0x1367253ab457ac29, 0x2f59bcbc86b470a4}}},
-{{{0x83847d429917135f, 0xad1b911f567d03d7, 0x7e7748d9be77aad1, 0x5458b42e2e51af4a}},
- {{0x7041d560b691c301, 0x85201b3fadd7e71e, 0x16c2e16311335585, 0x2aa55e3d010828b1}},
- {{0xed5192e60c07444f, 0x42c54e2d74421d10, 0x352b4c82fdb5c864, 0x13e9004a8a768664}}},
-{{{0x739d8845832fcedb, 0xfa38d6c9ae6bf863, 0x32bc0dcab74ffef7, 0x73937e8814bce45e}},
- {{0xbb2e00c9193b877f, 0xece3a890e0dc506b, 0xecf3b7c036de649f, 0x5f46040898de9e1a}},
- {{0xb9037116297bf48d, 0xa9d13b22d4f06834, 0xe19715574696bdc6, 0x2cf8a4e891d5e835}}},
-{{{0x6d93fd8707110f67, 0xdd4c09d37c38b549, 0x7cb16a4cc2736a86, 0x2049bd6e58252a09}},
- {{0x2cb5487e17d06ba2, 0x24d2381c3950196b, 0xd7659c8185978a30, 0x7a6f7f2891d6a4f6}},
- {{0x7d09fd8d6a9aef49, 0xf0ee60be5b3db90b, 0x4c21b52c519ebfd4, 0x6011aadfc545941d}}},
-{{{0x5f67926dcf95f83c, 0x7c7e856171289071, 0xd6a1e7f3998f7a5b, 0x6fc5cc1b0b62f9e0}},
- {{0x63ded0c802cbf890, 0xfbd098ca0dff6aaa, 0x624d0afdb9b6ed99, 0x69ce18b779340b1e}},
- {{0xd1ef5528b29879cb, 0xdd1aae3cd47e9092, 0x127e0442189f2352, 0x15596b3ae57101f1}}},
-{{{0x462739d23f9179a2, 0xff83123197d6ddcf, 0x1307deb553f2148a, 0x0d2237687b5f4dda}},
- {{0x09ff31167e5124ca, 0x0be4158bd9c745df, 0x292b7d227ef556e5, 0x3aa4e241afb6d138}},
- {{0x2cc138bf2a3305f5, 0x48583f8fa2e926c3, 0x083ab1a25549d2eb, 0x32fcaa6e4687a36c}}},
-{{{0x7bc56e8dc57d9af5, 0x3e0bd2ed9df0bdf2, 0xaac014de22efe4a3, 0x4627e9cefebd6a5c}},
- {{0x3207a4732787ccdf, 0x17e31908f213e3f8, 0xd5b2ecd7f60d964e, 0x746f6336c2600be9}},
- {{0x3f4af345ab6c971c, 0xe288eb729943731f, 0x33596a8a0344186d, 0x7b4917007ed66293}}},
-{{{0x2d85fb5cab84b064, 0x497810d289f3bc14, 0x476adc447b15ce0c, 0x122ba376f844fd7b}},
- {{0x54341b28dd53a2dd, 0xaa17905bdf42fc3f, 0x0ff592d94dd2f8f4, 0x1d03620fe08cd37d}},
- {{0xc20232cda2b4e554, 0x9ed0fd42115d187f, 0x2eabb4be7dd479d9, 0x02c70bf52b68ec4c}}},
-{{{0xa287ec4b5d0b2fbb, 0x415c5790074882ca, 0xe044a61ec1d0815c, 0x26334f0a409ef5e0}},
- {{0xace532bf458d72e1, 0x5be768e07cb73cb5, 0x56cf7d94ee8bbde7, 0x6b0697e3feb43a03}},
- {{0xb6c8f04adf62a3c0, 0x3ef000ef076da45d, 0x9c9cb95849f0d2a9, 0x1cc37f43441b2fae}}},
-{{{0x508f565a5cc7324f, 0xd061c4c0e506a922, 0xfb18abdb5c45ac19, 0x6c6809c10380314a}},
- {{0xd76656f1c9ceaeb9, 0x1c5b15f818e5656a, 0x26e72832844c2334, 0x3a346f772f196838}},
- {{0xd2d55112e2da6ac8, 0xe9bd0331b1e851ed, 0x960746dd8ec67262, 0x05911b9f6ef7c5d0}}},
-{{{0xc1339983f5df0ebb, 0xc0f3758f512c4cac, 0x2cf1130a0bb398e1, 0x6b3cecf9aa270c62}},
- {{0x5349acf3512eeaef, 0x20c141d31cc1cb49, 0x24180c07a99a688d, 0x555ef9d1c64b2d17}},
- {{0x36a770ba3b73bd08, 0x624aef08a3afbf0c, 0x5737ff98b40946f2, 0x675f4de13381749d}}},
-{{{0x0e2c52036b1782fc, 0x64816c816cad83b4, 0xd0dcbdd96964073e, 0x13d99df70164c520}},
- {{0xa12ff6d93bdab31d, 0x0725d80f9d652dfe, 0x019c4ff39abe9487, 0x60f450b882cd3c43}},
- {{0x014b5ec321e5c0ca, 0x4fcb69c9d719bfa2, 0x4e5f1c18750023a0, 0x1c06de9e55edac80}}},
-{{{0x990f7ad6a33ec4e2, 0x6608f938be2ee08e, 0x9ca143c563284515, 0x4cf38a1fec2db60d}},
- {{0xffd52b40ff6d69aa, 0x34530b18dc4049bb, 0x5e4a5c2fa34d9897, 0x78096f8e7d32ba2d}},
- {{0xa0aaaa650dfa5ce7, 0xf9c49e2a48b5478c, 0x4f09cc7d7003725b, 0x373cad3a26091abe}}},
-{{{0xb294634d82c9f57c, 0x1fcbfde124934536, 0x9e9c4db3418cdb5a, 0x0040f3d9454419fc}},
- {{0xf1bea8fb89ddbbad, 0x3bcb2cbc61aeaecb, 0x8f58a7bb1f9b8d9d, 0x21547eda5112a686}},
- {{0xdefde939fd5986d3, 0xf4272c89510a380c, 0xb72ba407bb3119b9, 0x63550a334a254df4}}},
-{{{0x6507d6edb569cf37, 0x178429b00ca52ee1, 0xea7c0090eb6bd65d, 0x3eea62c7daf78f51}},
- {{0x9bba584572547b49, 0xf305c6fae2c408e0, 0x60e8fa69c734f18d, 0x39a92bafaa7d767a}},
- {{0x9d24c713e693274e, 0x5f63857768dbd375, 0x70525560eb8ab39a, 0x68436a0665c9c4cd}}},
-{{{0xbc0235e8202f3f27, 0xc75c00e264f975b0, 0x91a4e9d5a38c2416, 0x17b6e7f68ab789f9}},
- {{0x1e56d317e820107c, 0xc5266844840ae965, 0xc1e0a1c6320ffc7a, 0x5373669c91611472}},
- {{0x5d2814ab9a0e5257, 0x908f2084c9cab3fc, 0xafcaf5885b2d1eca, 0x1cb4b5a678f87d11}}},
-{{{0xb664c06b394afc6c, 0x0c88de2498da5fb1, 0x4f8d03164bcad834, 0x330bca78de7434a2}},
- {{0x6b74aa62a2a007e7, 0xf311e0b0f071c7b1, 0x5707e438000be223, 0x2dc0fd2d82ef6eac}},
- {{0x982eff841119744e, 0xf9695e962b074724, 0xc58ac14fbfc953fb, 0x3c31be1b369f1cf5}}},
-{{{0xb0f4864d08948aee, 0x07dc19ee91ba1c6f, 0x7975cdaea6aca158, 0x330b61134262d4bb}},
- {{0xc168bc93f9cb4272, 0xaeb8711fc7cedb98, 0x7f0e52aa34ac8d7a, 0x41cec1097e7d55bb}},
- {{0xf79619d7a26d808a, 0xbb1fd49e1d9e156d, 0x73d7c36cdba1df27, 0x26b44cd91f28777d}}},
-{{{0x51f048478f387475, 0xb25dbcf49cbecb3c, 0x9aab1244d99f2055, 0x2c709e6c1c10a5d6}},
- {{0xe1b7f29362730383, 0x4b5279ffebca8a2c, 0xdafc778abfd41314, 0x7deb10149c72610f}},
- {{0xcb62af6a8766ee7a, 0x66cbec045553cd0e, 0x588001380f0be4b5, 0x08e68e9ff62ce2ea}}},
-{{{0x34ad500a4bc130ad, 0x8d38db493d0bd49c, 0xa25c3d98500a89be, 0x2f1f3f87eeba3b09}},
- {{0x2f2d09d50ab8f2f9, 0xacb9218dc55923df, 0x4a8f342673766cb9, 0x4cb13bd738f719f5}},
- {{0xf7848c75e515b64a, 0xa59501badb4a9038, 0xc20d313f3f751b50, 0x19a1e353c0ae2ee8}}},
-{{{0x7d1c7560bafa05c3, 0xb3e1a0a0c6e55e61, 0xe3529718c0d66473, 0x41546b11c20c3486}},
- {{0xb42172cdd596bdbd, 0x93e0454398eefc40, 0x9fb15347b44109b5, 0x736bd3990266ae34}},
- {{0x85532d509334b3b4, 0x46fd114b60816573, 0xcc5f5f30425c8375, 0x412295a2b87fab5c}}},
-{{{0x19c99b88f57ed6e9, 0x5393cb266df8c825, 0x5cee3213b30ad273, 0x14e153ebb52d2e34}},
- {{0x2e655261e293eac6, 0x845a92032133acdb, 0x460975cb7900996b, 0x0760bb8d195add80}},
- {{0x413e1a17cde6818a, 0x57156da9ed69a084, 0x2cbf268f46caccb1, 0x6b34be9bc33ac5f2}}},
-{{{0xf3df2f643a78c0b2, 0x4c3e971ef22e027c, 0xec7d1c5e49c1b5a3, 0x2012c18f0922dd2d}},
- {{0x11fc69656571f2d3, 0xc6c9e845530e737a, 0xe33ae7a2d4fe5035, 0x01b9c7b62e6dd30b}},
- {{0x880b55e55ac89d29, 0x1483241f45a0a763, 0x3d36efdfc2e76c1f, 0x08af5b784e4bade8}}},
-{{{0x283499dc881f2533, 0x9d0525da779323b6, 0x897addfb673441f4, 0x32b79d71163a168d}},
- {{0xe27314d289cc2c4b, 0x4be4bd11a287178d, 0x18d528d6fa3364ce, 0x6423c1d5afd9826e}},
- {{0xcc85f8d9edfcb36a, 0x22bcc28f3746e5f9, 0xe49de338f9e5d3cd, 0x480a5efbc13e2dcc}}},
-{{{0x0b51e70b01622071, 0x06b505cf8b1dafc5, 0x2c6bb061ef5aabcd, 0x47aa27600cb7bf31}},
- {{0xb6614ce442ce221f, 0x6e199dcc4c053928, 0x663fb4a4dc1cbe03, 0x24b31d47691c8e06}},
- {{0x2a541eedc015f8c3, 0x11a4fe7e7c693f7c, 0xf0af66134ea278d6, 0x545b585d14dda094}}},
-{{{0x67bf275ea0d43a0f, 0xade68e34089beebe, 0x4289134cd479e72e, 0x0f62f9c332ba5454}},
- {{0x6204e4d0e3b321e1, 0x3baa637a28ff1e95, 0x0b0ccffd5b99bd9e, 0x4d22dc3e64c8d071}},
- {{0xfcb46589d63b5f39, 0x5cae6a3f57cbcf61, 0xfebac2d2953afa05, 0x1c0fa01a36371436}}},
-{{{0xd2c604b622943dff, 0xbc8cbece44cfb3a0, 0x5d254ff397808678, 0x0fa3614f3b1ca6bf}},
- {{0x69082b0e8c936a50, 0xf9c9a035c1dac5b6, 0x6fb73e54c4dfb634, 0x4005419b1d2bc140}},
- {{0xa003febdb9be82f0, 0x2089c1af3a44ac90, 0xf8499f911954fa8e, 0x1fba218aef40ab42}}},
-{{{0xab549448fac8f53e, 0x81f6e89a7ba63741, 0x74fd6c7d6c2b5e01, 0x392e3acaa8c86e42}},
- {{0x4f3e57043e7b0194, 0xa81d3eee08daaf7f, 0xc839c6ab99dcdef1, 0x6c535d13ff7761d5}},
- {{0x4cbd34e93e8a35af, 0x2e0781445887e816, 0x19319c76f29ab0ab, 0x25e17fe4d50ac13b}}},
-{{{0x0a289bd71e04f676, 0x208e1c52d6420f95, 0x5186d8b034691fab, 0x255751442a9fb351}},
- {{0x915f7ff576f121a7, 0xc34a32272fcd87e3, 0xccba2fde4d1be526, 0x6bba828f8969899b}},
- {{0xe2d1bc6690fe3901, 0x4cb54a18a0997ad5, 0x971d6914af8460d4, 0x559d504f7f6b7be4}}},
-{{{0xa7738378b3eb54d5, 0x1d69d366a5553c7c, 0x0a26cf62f92800ba, 0x01ab12d5807e3217}},
- {{0x9c4891e7f6d266fd, 0x0744a19b0307781b, 0x88388f1d6061e23b, 0x123ea6a3354bd50e}},
- {{0x118d189041e32d96, 0xb9ede3c2d8315848, 0x1eab4271d83245d9, 0x4a3961e2c918a154}}},
-{{{0x71dc3be0f8e6bba0, 0xd6cef8347effe30a, 0xa992425fe13a476a, 0x2cd6bce3fb1db763}},
- {{0x0327d644f3233f1e, 0x499a260e34fcf016, 0x83b5a716f2dab979, 0x68aceead9bd4111f}},
- {{0x38b4c90ef3d7c210, 0x308e6e24b7ad040c, 0x3860d9f1b7e73e23, 0x595760d5b508f597}}},
-{{{0x6129bfe104aa6397, 0x8f960008a4a7fccb, 0x3f8bc0897d909458, 0x709fa43edcb291a9}},
- {{0x882acbebfd022790, 0x89af3305c4115760, 0x65f492e37d3473f4, 0x2cb2c5df54515a2b}},
- {{0xeb0a5d8c63fd2aca, 0xd22bc1662e694eff, 0x2723f36ef8cbb03a, 0x70f029ecf0c8131f}}},
-{{{0x461307b32eed3e33, 0xae042f33a45581e7, 0xc94449d3195f0366, 0x0b7d5d8a6c314858}},
- {{0x2a6aafaa5e10b0b9, 0x78f0a370ef041aa9, 0x773efb77aa3ad61f, 0x44eca5a2a74bd9e1}},
- {{0x25d448327b95d543, 0x70d38300a3340f1d, 0xde1c531c60e1c52b, 0x272224512c7de9e4}}},
-{{{0x1abc92af49c5342e, 0xffeed811b2e6fad0, 0xefa28c8dfcc84e29, 0x11b5df18a44cc543}},
- {{0xbf7bbb8a42a975fc, 0x8c5c397796ada358, 0xe27fc76fcdedaa48, 0x19735fd7f6bc20a6}},
- {{0xe3ab90d042c84266, 0xeb848e0f7f19547e, 0x2503a1d065a497b9, 0x0fef911191df895f}}}
\ No newline at end of file
diff --git a/ext/ed25519-amd64-asm/ge25519_base_slide_multiples.data b/ext/ed25519-amd64-asm/ge25519_base_slide_multiples.data
deleted file mode 100644
index 32a5d4747..000000000
--- a/ext/ed25519-amd64-asm/ge25519_base_slide_multiples.data
+++ /dev/null
@@ -1,96 +0,0 @@
-{{{0x9d103905d740913e, 0xfd399f05d140beb3, 0xa5c18434688f8a09, 0x44fd2f9298f81267}},
- {{0x2fbc93c6f58c3b85, 0xcf932dc6fb8c0e19, 0x270b4898643d42c2, 0x07cf9d3a33d4ba65}},
- {{0xabc91205877aaa68, 0x26d9e823ccaac49e, 0x5a1b7dcbdd43598c, 0x6f117b689f0c65a8}}},
-{{{0x56611fe8a4fcd265, 0x3bd353fde5c1ba7d, 0x8131f31a214bd6bd, 0x2ab91587555bda62}},
- {{0xaf25b0a84cee9730, 0x025a8430e8864b8a, 0xc11b50029f016732, 0x7a164e1b9a80f8f4}},
- {{0x14ae933f0dd0d889, 0x589423221c35da62, 0xd170e5458cf2db4c, 0x5a2826af12b9b4c6}}},
-{{{0x7f9182c3a447d6ba, 0xd50014d14b2729b7, 0xe33cf11cb864a087, 0x154a7e73eb1b55f3}},
- {{0xa212bc4408a5bb33, 0x8d5048c3c75eed02, 0xdd1beb0c5abfec44, 0x2945ccf146e206eb}},
- {{0xbcbbdbf1812a8285, 0x270e0807d0bdd1fc, 0xb41b670b1bbda72d, 0x43aabe696b3bb69a}}},
-{{{0xba6f2c9aaa3221b1, 0x6ca021533bba23a7, 0x9dea764f92192c3a, 0x1d6edd5d2e5317e0}},
- {{0x6b1a5cd0944ea3bf, 0x7470353ab39dc0d2, 0x71b2528228542e49, 0x461bea69283c927e}},
- {{0xf1836dc801b8b3a2, 0xb3035f47053ea49a, 0x529c41ba5877adf3, 0x7a9fbb1c6a0f90a7}}},
-{{{0xf36e217e039d8064, 0x98a081b6f520419b, 0x96cbc608e75eb044, 0x49c05a51fadc9c8f}},
- {{0x9b2e678aa6a8632f, 0xa6509e6f51bc46c5, 0xceb233c9c686f5b5, 0x34b9ed338add7f59}},
- {{0x06b4e8bf9045af1b, 0xe2ff83e8a719d22f, 0xaaf6fc2993d4cf16, 0x73c172021b008b06}}},
-{{{0x315f5b0249864348, 0x3ed6b36977088381, 0xa3a075556a8deb95, 0x18ab598029d5c77f}},
- {{0x2fbf00848a802ade, 0xe5d9fecf02302e27, 0x113e847117703406, 0x4275aae2546d8faf}},
- {{0xd82b2cc5fd6089e9, 0x031eb4a13282e4a4, 0x44311199b51a8622, 0x3dc65522b53df948}}},
-{{{0x506f013b327fbf93, 0xaefcebc99b776f6b, 0x9d12b232aaad5968, 0x0267882d176024a7}},
- {{0xbf70c222a2007f6d, 0xbf84b39ab5bcdedb, 0x537a0e12fb07ba07, 0x234fd7eec346f241}},
- {{0x5360a119732ea378, 0x2437e6b1df8dd471, 0xa2ef37f891a7e533, 0x497ba6fdaa097863}}},
-{{{0x040bcd86468ccf0b, 0xd3829ba42a9910d6, 0x7508300807b25192, 0x43b5cd4218d05ebf}},
- {{0x24cecc0313cfeaa0, 0x8648c28d189c246d, 0x2dbdbdfac1f2d4d0, 0x61e22917f12de72b}},
- {{0x5d9a762f9bd0b516, 0xeb38af4e373fdeee, 0x032e5a7d93d64270, 0x511d61210ae4d842}}},
-{{{0x081386484420de87, 0x8a1cf016b592edb4, 0x39fa4e2729942d25, 0x71a7fe6fe2482810}},
- {{0x92c676ef950e9d81, 0xa54620cdc0d7044f, 0xaa9b36646f8f1248, 0x6d325924ddb855e3}},
- {{0x6c7182b8a5c8c854, 0x33fd1479fe5f2a03, 0x72cf591883778d0c, 0x4746c4b6559eeaa9}}},
-{{{0x348546c864741147, 0x7d35aedd0efcc849, 0xff939a760672a332, 0x219663497db5e6d6}},
- {{0xd3777b3c6dc69a2b, 0xdefab2276f89f617, 0x45651cf7b53a16b5, 0x5c9a51de34fe9fb7}},
- {{0xf510f1cf79f10e67, 0xffdddaa1e658515b, 0x09c3a71710142277, 0x4804503c608223bb}}},
-{{{0x3b6821d23a36d175, 0xbbb40aa7e99b9e32, 0x5d9e5ce420838a47, 0x771e098858de4c5e}},
- {{0xc4249ed02ca37fc7, 0xa059a0e3a615acab, 0x88a96ed7c96e0e23, 0x553398a51650696d}},
- {{0x9a12f5d278451edf, 0x3ada5d7985899ccb, 0x477f4a2d9fa59508, 0x5a5ed1d68ff5a611}}},
-{{{0xbae5e0c558527359, 0x392e5c19cadb9d7e, 0x28653c1eda1cabe9, 0x019b60135fefdc44}},
- {{0x1195122afe150e83, 0xcf209a257e4b35d8, 0x7387f8291e711e20, 0x44acb897d8bf92f0}},
- {{0x1e6068145e134b83, 0xc4f5e64f24304c16, 0x506e88a8fc1a3ed7, 0x150c49fde6ad2f92}}},
-{{{0xb849863c9cdca868, 0xc83f44dbb8714ad0, 0xfe3ee3560c36168d, 0x78a6d7791e05fbc1}},
- {{0x8e7bf29509471138, 0x5d6fef394f75a651, 0x10af79c425a708ad, 0x6b2b5a075bb99922}},
- {{0x58bf704b47a0b976, 0xa601b355741748d5, 0xaa2b1fb1d542f590, 0x725c7ffc4ad55d00}}},
-{{{0x91802bf71cd098c0, 0xfe416ca4ed5e6366, 0xdf585d714902994c, 0x4cd54625f855fae7}},
- {{0xe4426715d1cf99b2, 0x7352d51102a20d34, 0x23d1157b8b12109f, 0x794cc9277cb1f3a3}},
- {{0x4af6c426c2ac5053, 0xbc9aedad32f67258, 0x2ad032f10a311021, 0x7008357b6fcc8e85}}},
-{{{0xd01b9fbb82584a34, 0x47ab6463d2b4792b, 0xb631639c48536202, 0x13a92a3669d6d428}},
- {{0x0b88672738773f01, 0xb8ccc8fa95fbccfb, 0x8d2dd5a3b9ad29b6, 0x06ef7e9851ad0f6a}},
- {{0xca93771cc0577de5, 0x7540e41e5035dc5c, 0x24680f01d802e071, 0x3c296ddf8a2af86a}}},
-{{{0xfceb4d2ebb1f2541, 0xb89510c740adb91f, 0xfc71a37dd0a1ad05, 0x0a892c700747717b}},
- {{0xaead15f9d914a713, 0xa92f7bf98c8ff912, 0xaff823179f53d730, 0x7a99d393490c77ba}},
- {{0x8f52ed2436bda3e8, 0x77a8c84157e80794, 0xa5a96563262f9ce0, 0x286762d28302f7d2}}},
-{{{0x7c558e2bce2ef5bd, 0xe4986cb46747bc63, 0x154a179f3bbb89b8, 0x7686f2a3d6f1767a}},
- {{0x4e7836093ce35b25, 0x82e1181db26baa97, 0x0cc192d3cbc7b83f, 0x32f1da046a9d9d3a}},
- {{0xaa8d12a66d597c6a, 0x8f11930304d3852b, 0x3f91dc73c209b022, 0x561305f8a9ad28a6}}},
-{{{0x6722cc28e7b0c0d5, 0x709de9bbdb075c53, 0xcaf68da7d7010a61, 0x030a1aef2c57cc6c}},
- {{0x100c978dec92aed1, 0xca43d5434d6d73e5, 0x83131b22d847ba48, 0x00aaec53e35d4d2c}},
- {{0x7bb1f773003ad2aa, 0x0b3f29802b216608, 0x7821dc86520ed23e, 0x20be9c1c24065480}}},
-{{{0x20e0e44ae2025e60, 0xb03b3b2fcbdcb938, 0x105d639cf95a0d1c, 0x69764c545067e311}},
- {{0xe15387d8249673a6, 0x5943bc2df546e493, 0x1c7f9a81c36f63b5, 0x750ab3361f0ac1de}},
- {{0x1e8a3283a2f81037, 0x6f2eda23bd7fcbf1, 0xb72fd15bac2e2563, 0x54f96b3fb7075040}}},
-{{{0x177dafc616b11ecd, 0x89764b9cfa576479, 0xb7a8a110e6ece785, 0x78e6839fbe85dbf0}},
- {{0x0fadf20429669279, 0x3adda2047d7d724a, 0x6f3d94828c5760f1, 0x3d7fe9c52bb7539e}},
- {{0x70332df737b8856b, 0x75d05d43041a178a, 0x320ff74aa0e59e22, 0x70f268f350088242}}},
-{{{0x2324112070dcf355, 0x380cc97ee7fce117, 0xb31ddeed3552b698, 0x404e56c039b8c4b9}},
- {{0x66864583b1805f47, 0xf535c5d160dd7c19, 0xe9874eb71e4cb006, 0x7c0d345cfad889d9}},
- {{0x591f1f4b8c78338a, 0xa0366ab167e0b5e1, 0x5cbc4152b45f3d44, 0x20d754762aaec777}}},
-{{{0x9d74feb135b9f543, 0x84b37df1de8c956c, 0xe9322b0757138ba9, 0x38b8ada8790b4ce1}},
- {{0x5e8fc36fc73bb758, 0xace543a5363cbb9a, 0xa9934a7d903bc922, 0x2b8f1e46f3ceec62}},
- {{0xb5c04a9cdf51f95d, 0x2b3952aecb1fdeac, 0x1d106d8b328b66da, 0x049aeb32ceba1953}}},
-{{{0xd7767d3c63dcfe7e, 0x209c594897856e40, 0xb6676861e14f7c13, 0x51c665e0c8d625fc}},
- {{0xaa507d0b75fc7931, 0x0fef924b7a6725d3, 0x1d82542b396b3930, 0x795ee17530f674fc}},
- {{0x254a5b0a52ecbd81, 0x5d411f6ee034afe7, 0xe6a24d0dcaee4a31, 0x6cd19bf49dc54477}}},
-{{{0x7e87619052179ca3, 0x571d0a060b2c9f85, 0x80a2baa88499711e, 0x7520f3db40b2e638}},
- {{0x1ffe612165afc386, 0x082a2a88b8d51b10, 0x76f6627e20990baa, 0x5e01b3a7429e43e7}},
- {{0x3db50be3d39357a1, 0x967b6cdd599e94a5, 0x1a309a64df311e6e, 0x71092c9ccef3c986}}},
-{{{0x53d8523f0364918c, 0xa2b404f43fab6b1c, 0x080b4a9e6681e5a4, 0x0ea15b03d0257ba7}},
- {{0x856bd8ac74051dcf, 0x03f6a40855b7aa1e, 0x3a4ae7cbc9743ceb, 0x4173a5bb7137abde}},
- {{0x17c56e31f0f9218a, 0x5a696e2b1afc4708, 0xf7931668f4b2f176, 0x5fc565614a4e3a67}}},
-{{{0x136e570dc46d7ae5, 0x0fd0aacc54f8dc8f, 0x59549f03310dad86, 0x62711c414c454aa1}},
- {{0x4892e1e67790988e, 0x01d5950f1c5cd722, 0xe3b0819ae5923eed, 0x3214c7409d46651b}},
- {{0x1329827406651770, 0x3ba4a0668a279436, 0xd9b6b8ec185d223c, 0x5bea94073ecb833c}}},
-{{{0x641dbf0912c89be4, 0xacf38b317d6e579c, 0xabfe9e02f697b065, 0x3aacd5c148f61eec}},
- {{0xb470ce63f343d2f8, 0x0067ba8f0543e8f1, 0x35da51a1a2117b6f, 0x4ad0785944f1bd2f}},
- {{0x858e3b34c3318301, 0xdc99c04707316826, 0x34085b2ed39da88c, 0x3aff0cb1d902853d}}},
-{{{0x87c5c7eb3a20405e, 0x8ee311efedad56c9, 0x29252e48ad29d5f9, 0x110e7e86f4cd251d}},
- {{0x9226430bf4c53505, 0x68e49c13261f2283, 0x09ef33788fd327c6, 0x2ccf9f732bd99e7f}},
- {{0x57c0d89ed603f5e4, 0x12888628f0b0200c, 0x53172709a02e3bb7, 0x05c557e0b9693a37}}},
-{{{0xd8f9ce311fc97e6f, 0x7a3f263011f9fdae, 0xe15b7ea08bed25dd, 0x6e154c178fe9875a}},
- {{0xf776bbb089c20eb0, 0x61f85bf6fa0fd85c, 0xb6b93f4e634421fb, 0x289fef0841861205}},
- {{0xcf616336fed69abf, 0x9b16e4e78335c94f, 0x13789765753a7fe7, 0x6afbf642a95ca319}}},
-{{{0x7da8de0c62f5d2c1, 0x98fc3da4b00e7b9a, 0x7deb6ada0dad70e0, 0x0db4b851b95038c4}},
- {{0x5de55070f913a8cc, 0x7d1d167b2b0cf561, 0xda2956b690ead489, 0x12c093cedb801ed9}},
- {{0xfc147f9308b8190f, 0x06969da0a11ae310, 0xcee75572dac7d7fd, 0x33aa8799c6635ce6}}},
-{{{0xaf0ff51ebd085cf2, 0x78f51a8967d33f1f, 0x6ec2bfe15060033c, 0x233c6f29e8e21a86}},
- {{0x8348f588fc156cb1, 0x6da2ba9b1a0a6d27, 0xe2262d5c87ca5ab6, 0x212cd0c1c8d589a6}},
- {{0xd2f4d5107f18c781, 0x122ecdf2527e9d28, 0xa70a862a3d3d3341, 0x1db7778911914ce3}}},
-{{{0xddf352397c6bc26f, 0x7a97e2cc53d50113, 0x7c74f43abf79a330, 0x31ad97ad26e2adfc}},
- {{0xb3394769dd701ab6, 0xe2b8ded419cf8da5, 0x15df4161fd2ac852, 0x7ae2ca8a017d24be}},
- {{0xb7e817ed0920b962, 0x1e8518cc3f19da9d, 0xe491c14f25560a64, 0x1ed1fc53a6622c83}}}
\ No newline at end of file
diff --git a/ext/ed25519-amd64-asm/ge25519_dbl_p1p1.s b/ext/ed25519-amd64-asm/ge25519_dbl_p1p1.s
deleted file mode 100644
index 265daf091..000000000
--- a/ext/ed25519-amd64-asm/ge25519_dbl_p1p1.s
+++ /dev/null
@@ -1,2975 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 pp
-
-# qhasm: input rp
-
-# qhasm: input pp
-
-# qhasm: int64 a0
-
-# qhasm: int64 a1
-
-# qhasm: int64 a2
-
-# qhasm: int64 a3
-
-# qhasm: stack64 a0_stack
-
-# qhasm: stack64 a1_stack
-
-# qhasm: stack64 a2_stack
-
-# qhasm: stack64 a3_stack
-
-# qhasm: int64 b0
-
-# qhasm: int64 b1
-
-# qhasm: int64 b2
-
-# qhasm: int64 b3
-
-# qhasm: stack64 b0_stack
-
-# qhasm: stack64 b1_stack
-
-# qhasm: stack64 b2_stack
-
-# qhasm: stack64 b3_stack
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: stack64 c0_stack
-
-# qhasm: stack64 c1_stack
-
-# qhasm: stack64 c2_stack
-
-# qhasm: stack64 c3_stack
-
-# qhasm: int64 d0
-
-# qhasm: int64 d1
-
-# qhasm: int64 d2
-
-# qhasm: int64 d3
-
-# qhasm: stack64 d0_stack
-
-# qhasm: stack64 d1_stack
-
-# qhasm: stack64 d2_stack
-
-# qhasm: stack64 d3_stack
-
-# qhasm: int64 e0
-
-# qhasm: int64 e1
-
-# qhasm: int64 e2
-
-# qhasm: int64 e3
-
-# qhasm: stack64 e0_stack
-
-# qhasm: stack64 e1_stack
-
-# qhasm: stack64 e2_stack
-
-# qhasm: stack64 e3_stack
-
-# qhasm: int64 rx0
-
-# qhasm: int64 rx1
-
-# qhasm: int64 rx2
-
-# qhasm: int64 rx3
-
-# qhasm: stack64 rx0_stack
-
-# qhasm: stack64 rx1_stack
-
-# qhasm: stack64 rx2_stack
-
-# qhasm: stack64 rx3_stack
-
-# qhasm: int64 ry0
-
-# qhasm: int64 ry1
-
-# qhasm: int64 ry2
-
-# qhasm: int64 ry3
-
-# qhasm: int64 ry4
-
-# qhasm: int64 rz0
-
-# qhasm: int64 rz1
-
-# qhasm: int64 rz2
-
-# qhasm: int64 rz3
-
-# qhasm: int64 rt0
-
-# qhasm: int64 rt1
-
-# qhasm: int64 rt2
-
-# qhasm: int64 rt3
-
-# qhasm: int64 mulr4
-
-# qhasm: int64 mulr5
-
-# qhasm: int64 mulr6
-
-# qhasm: int64 mulr7
-
-# qhasm: int64 mulr8
-
-# qhasm: int64 mulrax
-
-# qhasm: int64 mulrdx
-
-# qhasm: int64 mulx0
-
-# qhasm: int64 mulx1
-
-# qhasm: int64 mulx2
-
-# qhasm: int64 mulx3
-
-# qhasm: int64 mulc
-
-# qhasm: int64 mulzero
-
-# qhasm: int64 muli38
-
-# qhasm: int64 squarer4
-
-# qhasm: int64 squarer5
-
-# qhasm: int64 squarer6
-
-# qhasm: int64 squarer7
-
-# qhasm: int64 squarer8
-
-# qhasm: int64 squarerax
-
-# qhasm: int64 squarerdx
-
-# qhasm: int64 squaret1
-
-# qhasm: int64 squaret2
-
-# qhasm: int64 squaret3
-
-# qhasm: int64 squarec
-
-# qhasm: int64 squarezero
-
-# qhasm: int64 squarei38
-
-# qhasm: int64 addt0
-
-# qhasm: int64 addt1
-
-# qhasm: int64 subt0
-
-# qhasm: int64 subt1
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1
-.globl crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1
-_crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1:
-crypto_sign_ed25519_amd64_64_ge25519_dbl_p1p1:
-mov %rsp,%r11
-and $31,%r11
-add $192,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#4
-# asm 2: mov  $0,>squarer7=%rcx
-mov  $0,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 8)
-# asm 1: movq   8(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   8(<pp=%rsi),>squarerax=%rax
-movq   8(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 0)
-# asm 1: mulq  0(<pp=int64#2)
-# asm 2: mulq  0(<pp=%rsi)
-mulq  0(%rsi)
-
-# qhasm:   a1 = squarerax
-# asm 1: mov  <squarerax=int64#7,>a1=int64#5
-# asm 2: mov  <squarerax=%rax,>a1=%r8
-mov  %rax,%r8
-
-# qhasm:   a2 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>a2=int64#6
-# asm 2: mov  <squarerdx=%rdx,>a2=%r9
-mov  %rdx,%r9
-
-# qhasm:   squarerax = *(uint64 *)(pp + 16)
-# asm 1: movq   16(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   16(<pp=%rsi),>squarerax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 8)
-# asm 1: mulq  8(<pp=int64#2)
-# asm 2: mulq  8(<pp=%rsi)
-mulq  8(%rsi)
-
-# qhasm:   a3 = squarerax 
-# asm 1: mov  <squarerax=int64#7,>a3=int64#8
-# asm 2: mov  <squarerax=%rax,>a3=%r10
-mov  %rax,%r10
-
-# qhasm:   squarer4 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer4=int64#9
-# asm 2: mov  <squarerdx=%rdx,>squarer4=%r11
-mov  %rdx,%r11
-
-# qhasm:   squarerax = *(uint64 *)(pp + 24)
-# asm 1: movq   24(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   24(<pp=%rsi),>squarerax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 16)
-# asm 1: mulq  16(<pp=int64#2)
-# asm 2: mulq  16(<pp=%rsi)
-mulq  16(%rsi)
-
-# qhasm:   squarer5 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer5=int64#10
-# asm 2: mov  <squarerax=%rax,>squarer5=%r12
-mov  %rax,%r12
-
-# qhasm:   squarer6 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer6=int64#11
-# asm 2: mov  <squarerdx=%rdx,>squarer6=%r13
-mov  %rdx,%r13
-
-# qhasm:   squarerax = *(uint64 *)(pp + 16)
-# asm 1: movq   16(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   16(<pp=%rsi),>squarerax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 0)
-# asm 1: mulq  0(<pp=int64#2)
-# asm 2: mulq  0(<pp=%rsi)
-mulq  0(%rsi)
-
-# qhasm:   carry? a2 += squarerax
-# asm 1: add  <squarerax=int64#7,<a2=int64#6
-# asm 2: add  <squarerax=%rax,<a2=%r9
-add  %rax,%r9
-
-# qhasm:   carry? a3 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<a3=int64#8
-# asm 2: adc <squarerdx=%rdx,<a3=%r10
-adc %rdx,%r10
-
-# qhasm:   squarer4 += 0 + carry
-# asm 1: adc $0,<squarer4=int64#9
-# asm 2: adc $0,<squarer4=%r11
-adc $0,%r11
-
-# qhasm:   squarerax = *(uint64 *)(pp + 24)
-# asm 1: movq   24(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   24(<pp=%rsi),>squarerax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 8)
-# asm 1: mulq  8(<pp=int64#2)
-# asm 2: mulq  8(<pp=%rsi)
-mulq  8(%rsi)
-
-# qhasm:   carry? squarer4 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer4=int64#9
-# asm 2: add  <squarerax=%rax,<squarer4=%r11
-add  %rax,%r11
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r12
-adc %rdx,%r12
-
-# qhasm:   squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarerax = *(uint64 *)(pp + 24)
-# asm 1: movq   24(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   24(<pp=%rsi),>squarerax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 0)
-# asm 1: mulq  0(<pp=int64#2)
-# asm 2: mulq  0(<pp=%rsi)
-mulq  0(%rsi)
-
-# qhasm:   carry? a3 += squarerax
-# asm 1: add  <squarerax=int64#7,<a3=int64#8
-# asm 2: add  <squarerax=%rax,<a3=%r10
-add  %rax,%r10
-
-# qhasm:   carry? squarer4 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer4=int64#9
-# asm 2: adc <squarerdx=%rdx,<squarer4=%r11
-adc %rdx,%r11
-
-# qhasm:   carry? squarer5 += 0 + carry
-# asm 1: adc $0,<squarer5=int64#10
-# asm 2: adc $0,<squarer5=%r12
-adc $0,%r12
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarer7 += 0 + carry
-# asm 1: adc $0,<squarer7=int64#4
-# asm 2: adc $0,<squarer7=%rcx
-adc $0,%rcx
-
-# qhasm:   carry? a1 += a1
-# asm 1: add  <a1=int64#5,<a1=int64#5
-# asm 2: add  <a1=%r8,<a1=%r8
-add  %r8,%r8
-
-# qhasm:   carry? a2 += a2 + carry
-# asm 1: adc <a2=int64#6,<a2=int64#6
-# asm 2: adc <a2=%r9,<a2=%r9
-adc %r9,%r9
-
-# qhasm:   carry? a3 += a3 + carry
-# asm 1: adc <a3=int64#8,<a3=int64#8
-# asm 2: adc <a3=%r10,<a3=%r10
-adc %r10,%r10
-
-# qhasm:   carry? squarer4 += squarer4 + carry
-# asm 1: adc <squarer4=int64#9,<squarer4=int64#9
-# asm 2: adc <squarer4=%r11,<squarer4=%r11
-adc %r11,%r11
-
-# qhasm:   carry? squarer5 += squarer5 + carry
-# asm 1: adc <squarer5=int64#10,<squarer5=int64#10
-# asm 2: adc <squarer5=%r12,<squarer5=%r12
-adc %r12,%r12
-
-# qhasm:   carry? squarer6 += squarer6 + carry
-# asm 1: adc <squarer6=int64#11,<squarer6=int64#11
-# asm 2: adc <squarer6=%r13,<squarer6=%r13
-adc %r13,%r13
-
-# qhasm:   squarer7 += squarer7 + carry
-# asm 1: adc <squarer7=int64#4,<squarer7=int64#4
-# asm 2: adc <squarer7=%rcx,<squarer7=%rcx
-adc %rcx,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 0)
-# asm 1: movq   0(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   0(<pp=%rsi),>squarerax=%rax
-movq   0(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 0)
-# asm 1: mulq  0(<pp=int64#2)
-# asm 2: mulq  0(<pp=%rsi)
-mulq  0(%rsi)
-
-# qhasm:   a0 = squarerax
-# asm 1: mov  <squarerax=int64#7,>a0=int64#12
-# asm 2: mov  <squarerax=%rax,>a0=%r14
-mov  %rax,%r14
-
-# qhasm:   squaret1 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret1=int64#13
-# asm 2: mov  <squarerdx=%rdx,>squaret1=%r15
-mov  %rdx,%r15
-
-# qhasm:   squarerax = *(uint64 *)(pp + 8)
-# asm 1: movq   8(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   8(<pp=%rsi),>squarerax=%rax
-movq   8(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 8)
-# asm 1: mulq  8(<pp=int64#2)
-# asm 2: mulq  8(<pp=%rsi)
-mulq  8(%rsi)
-
-# qhasm:   squaret2 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squaret2=int64#14
-# asm 2: mov  <squarerax=%rax,>squaret2=%rbx
-mov  %rax,%rbx
-
-# qhasm:   squaret3 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret3=int64#15
-# asm 2: mov  <squarerdx=%rdx,>squaret3=%rbp
-mov  %rdx,%rbp
-
-# qhasm:   squarerax = *(uint64 *)(pp + 16)
-# asm 1: movq   16(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   16(<pp=%rsi),>squarerax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 16)
-# asm 1: mulq  16(<pp=int64#2)
-# asm 2: mulq  16(<pp=%rsi)
-mulq  16(%rsi)
-
-# qhasm:   carry? a1 += squaret1
-# asm 1: add  <squaret1=int64#13,<a1=int64#5
-# asm 2: add  <squaret1=%r15,<a1=%r8
-add  %r15,%r8
-
-# qhasm:   carry? a2 += squaret2 + carry
-# asm 1: adc <squaret2=int64#14,<a2=int64#6
-# asm 2: adc <squaret2=%rbx,<a2=%r9
-adc %rbx,%r9
-
-# qhasm:   carry? a3 += squaret3 + carry
-# asm 1: adc <squaret3=int64#15,<a3=int64#8
-# asm 2: adc <squaret3=%rbp,<a3=%r10
-adc %rbp,%r10
-
-# qhasm:   carry? squarer4 += squarerax + carry
-# asm 1: adc <squarerax=int64#7,<squarer4=int64#9
-# asm 2: adc <squarerax=%rax,<squarer4=%r11
-adc %rax,%r11
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r12
-adc %rdx,%r12
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarer7 += 0 + carry 
-# asm 1: adc $0,<squarer7=int64#4
-# asm 2: adc $0,<squarer7=%rcx
-adc $0,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 24)
-# asm 1: movq   24(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   24(<pp=%rsi),>squarerax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 24)
-# asm 1: mulq  24(<pp=int64#2)
-# asm 2: mulq  24(<pp=%rsi)
-mulq  24(%rsi)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#11
-# asm 2: add  <squarerax=%rax,<squarer6=%r13
-add  %rax,%r13
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#4
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
-adc %rdx,%rcx
-
-# qhasm:   squarerax = squarer4
-# asm 1: mov  <squarer4=int64#9,>squarerax=int64#7
-# asm 2: mov  <squarer4=%r11,>squarerax=%rax
-mov  %r11,%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   squarer4 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer4=int64#9
-# asm 2: mov  <squarerax=%rax,>squarer4=%r11
-mov  %rax,%r11
-
-# qhasm:   squarerax = squarer5
-# asm 1: mov  <squarer5=int64#10,>squarerax=int64#7
-# asm 2: mov  <squarer5=%r12,>squarerax=%rax
-mov  %r12,%rax
-
-# qhasm:   squarer5 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer5=int64#10
-# asm 2: mov  <squarerdx=%rdx,>squarer5=%r12
-mov  %rdx,%r12
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer5 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer5=int64#10
-# asm 2: add  <squarerax=%rax,<squarer5=%r12
-add  %rax,%r12
-
-# qhasm:   squarerax = squarer6
-# asm 1: mov  <squarer6=int64#11,>squarerax=int64#7
-# asm 2: mov  <squarer6=%r13,>squarerax=%rax
-mov  %r13,%rax
-
-# qhasm:   squarer6 = 0
-# asm 1: mov  $0,>squarer6=int64#11
-# asm 2: mov  $0,>squarer6=%r13
-mov  $0,%r13
-
-# qhasm:   squarer6 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer6=int64#11
-# asm 2: adc <squarerdx=%rdx,<squarer6=%r13
-adc %rdx,%r13
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#11
-# asm 2: add  <squarerax=%rax,<squarer6=%r13
-add  %rax,%r13
-
-# qhasm:   squarerax = squarer7
-# asm 1: mov  <squarer7=int64#4,>squarerax=int64#7
-# asm 2: mov  <squarer7=%rcx,>squarerax=%rax
-mov  %rcx,%rax
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#4
-# asm 2: mov  $0,>squarer7=%rcx
-mov  $0,%rcx
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#4
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
-adc %rdx,%rcx
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer7 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer7=int64#4
-# asm 2: add  <squarerax=%rax,<squarer7=%rcx
-add  %rax,%rcx
-
-# qhasm:   squarer8 = 0
-# asm 1: mov  $0,>squarer8=int64#7
-# asm 2: mov  $0,>squarer8=%rax
-mov  $0,%rax
-
-# qhasm:   squarer8 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer8=int64#7
-# asm 2: adc <squarerdx=%rdx,<squarer8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? a0 += squarer4
-# asm 1: add  <squarer4=int64#9,<a0=int64#12
-# asm 2: add  <squarer4=%r11,<a0=%r14
-add  %r11,%r14
-
-# qhasm:   carry? a1 += squarer5 + carry
-# asm 1: adc <squarer5=int64#10,<a1=int64#5
-# asm 2: adc <squarer5=%r12,<a1=%r8
-adc %r12,%r8
-
-# qhasm:   carry? a2 += squarer6 + carry
-# asm 1: adc <squarer6=int64#11,<a2=int64#6
-# asm 2: adc <squarer6=%r13,<a2=%r9
-adc %r13,%r9
-
-# qhasm:   carry? a3 += squarer7 + carry
-# asm 1: adc <squarer7=int64#4,<a3=int64#8
-# asm 2: adc <squarer7=%rcx,<a3=%r10
-adc %rcx,%r10
-
-# qhasm:   squarezero = 0
-# asm 1: mov  $0,>squarezero=int64#3
-# asm 2: mov  $0,>squarezero=%rdx
-mov  $0,%rdx
-
-# qhasm:   squarer8 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<squarer8=int64#7
-# asm 2: adc <squarezero=%rdx,<squarer8=%rax
-adc %rdx,%rax
-
-# qhasm:   squarer8 *= 38
-# asm 1: imulq  $38,<squarer8=int64#7,>squarer8=int64#4
-# asm 2: imulq  $38,<squarer8=%rax,>squarer8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? a0 += squarer8
-# asm 1: add  <squarer8=int64#4,<a0=int64#12
-# asm 2: add  <squarer8=%rcx,<a0=%r14
-add  %rcx,%r14
-
-# qhasm:   carry? a1 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<a1=int64#5
-# asm 2: adc <squarezero=%rdx,<a1=%r8
-adc %rdx,%r8
-
-# qhasm:   carry? a2 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<a2=int64#6
-# asm 2: adc <squarezero=%rdx,<a2=%r9
-adc %rdx,%r9
-
-# qhasm:   carry? a3 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<a3=int64#8
-# asm 2: adc <squarezero=%rdx,<a3=%r10
-adc %rdx,%r10
-
-# qhasm:   squarezero += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<squarezero=int64#3
-# asm 2: adc <squarezero=%rdx,<squarezero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   squarezero *= 38
-# asm 1: imulq  $38,<squarezero=int64#3,>squarezero=int64#3
-# asm 2: imulq  $38,<squarezero=%rdx,>squarezero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   a0 += squarezero
-# asm 1: add  <squarezero=int64#3,<a0=int64#12
-# asm 2: add  <squarezero=%rdx,<a0=%r14
-add  %rdx,%r14
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#12,>a0_stack=stack64#8
-# asm 2: movq <a0=%r14,>a0_stack=56(%rsp)
-movq %r14,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#5,>a1_stack=stack64#9
-# asm 2: movq <a1=%r8,>a1_stack=64(%rsp)
-movq %r8,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#6,>a2_stack=stack64#10
-# asm 2: movq <a2=%r9,>a2_stack=72(%rsp)
-movq %r9,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#8,>a3_stack=stack64#11
-# asm 2: movq <a3=%r10,>a3_stack=80(%rsp)
-movq %r10,80(%rsp)
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#4
-# asm 2: mov  $0,>squarer7=%rcx
-mov  $0,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   40(<pp=%rsi),>squarerax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 32)
-# asm 1: mulq  32(<pp=int64#2)
-# asm 2: mulq  32(<pp=%rsi)
-mulq  32(%rsi)
-
-# qhasm:   b1 = squarerax
-# asm 1: mov  <squarerax=int64#7,>b1=int64#5
-# asm 2: mov  <squarerax=%rax,>b1=%r8
-mov  %rax,%r8
-
-# qhasm:   b2 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>b2=int64#6
-# asm 2: mov  <squarerdx=%rdx,>b2=%r9
-mov  %rdx,%r9
-
-# qhasm:   squarerax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   48(<pp=%rsi),>squarerax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 40)
-# asm 1: mulq  40(<pp=int64#2)
-# asm 2: mulq  40(<pp=%rsi)
-mulq  40(%rsi)
-
-# qhasm:   b3 = squarerax 
-# asm 1: mov  <squarerax=int64#7,>b3=int64#8
-# asm 2: mov  <squarerax=%rax,>b3=%r10
-mov  %rax,%r10
-
-# qhasm:   squarer4 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer4=int64#9
-# asm 2: mov  <squarerdx=%rdx,>squarer4=%r11
-mov  %rdx,%r11
-
-# qhasm:   squarerax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   56(<pp=%rsi),>squarerax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 48)
-# asm 1: mulq  48(<pp=int64#2)
-# asm 2: mulq  48(<pp=%rsi)
-mulq  48(%rsi)
-
-# qhasm:   squarer5 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer5=int64#10
-# asm 2: mov  <squarerax=%rax,>squarer5=%r12
-mov  %rax,%r12
-
-# qhasm:   squarer6 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer6=int64#11
-# asm 2: mov  <squarerdx=%rdx,>squarer6=%r13
-mov  %rdx,%r13
-
-# qhasm:   squarerax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   48(<pp=%rsi),>squarerax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 32)
-# asm 1: mulq  32(<pp=int64#2)
-# asm 2: mulq  32(<pp=%rsi)
-mulq  32(%rsi)
-
-# qhasm:   carry? b2 += squarerax
-# asm 1: add  <squarerax=int64#7,<b2=int64#6
-# asm 2: add  <squarerax=%rax,<b2=%r9
-add  %rax,%r9
-
-# qhasm:   carry? b3 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<b3=int64#8
-# asm 2: adc <squarerdx=%rdx,<b3=%r10
-adc %rdx,%r10
-
-# qhasm:   squarer4 += 0 + carry
-# asm 1: adc $0,<squarer4=int64#9
-# asm 2: adc $0,<squarer4=%r11
-adc $0,%r11
-
-# qhasm:   squarerax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   56(<pp=%rsi),>squarerax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 40)
-# asm 1: mulq  40(<pp=int64#2)
-# asm 2: mulq  40(<pp=%rsi)
-mulq  40(%rsi)
-
-# qhasm:   carry? squarer4 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer4=int64#9
-# asm 2: add  <squarerax=%rax,<squarer4=%r11
-add  %rax,%r11
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r12
-adc %rdx,%r12
-
-# qhasm:   squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarerax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   56(<pp=%rsi),>squarerax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 32)
-# asm 1: mulq  32(<pp=int64#2)
-# asm 2: mulq  32(<pp=%rsi)
-mulq  32(%rsi)
-
-# qhasm:   carry? b3 += squarerax
-# asm 1: add  <squarerax=int64#7,<b3=int64#8
-# asm 2: add  <squarerax=%rax,<b3=%r10
-add  %rax,%r10
-
-# qhasm:   carry? squarer4 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer4=int64#9
-# asm 2: adc <squarerdx=%rdx,<squarer4=%r11
-adc %rdx,%r11
-
-# qhasm:   carry? squarer5 += 0 + carry
-# asm 1: adc $0,<squarer5=int64#10
-# asm 2: adc $0,<squarer5=%r12
-adc $0,%r12
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarer7 += 0 + carry
-# asm 1: adc $0,<squarer7=int64#4
-# asm 2: adc $0,<squarer7=%rcx
-adc $0,%rcx
-
-# qhasm:   carry? b1 += b1
-# asm 1: add  <b1=int64#5,<b1=int64#5
-# asm 2: add  <b1=%r8,<b1=%r8
-add  %r8,%r8
-
-# qhasm:   carry? b2 += b2 + carry
-# asm 1: adc <b2=int64#6,<b2=int64#6
-# asm 2: adc <b2=%r9,<b2=%r9
-adc %r9,%r9
-
-# qhasm:   carry? b3 += b3 + carry
-# asm 1: adc <b3=int64#8,<b3=int64#8
-# asm 2: adc <b3=%r10,<b3=%r10
-adc %r10,%r10
-
-# qhasm:   carry? squarer4 += squarer4 + carry
-# asm 1: adc <squarer4=int64#9,<squarer4=int64#9
-# asm 2: adc <squarer4=%r11,<squarer4=%r11
-adc %r11,%r11
-
-# qhasm:   carry? squarer5 += squarer5 + carry
-# asm 1: adc <squarer5=int64#10,<squarer5=int64#10
-# asm 2: adc <squarer5=%r12,<squarer5=%r12
-adc %r12,%r12
-
-# qhasm:   carry? squarer6 += squarer6 + carry
-# asm 1: adc <squarer6=int64#11,<squarer6=int64#11
-# asm 2: adc <squarer6=%r13,<squarer6=%r13
-adc %r13,%r13
-
-# qhasm:   squarer7 += squarer7 + carry
-# asm 1: adc <squarer7=int64#4,<squarer7=int64#4
-# asm 2: adc <squarer7=%rcx,<squarer7=%rcx
-adc %rcx,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   32(<pp=%rsi),>squarerax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 32)
-# asm 1: mulq  32(<pp=int64#2)
-# asm 2: mulq  32(<pp=%rsi)
-mulq  32(%rsi)
-
-# qhasm:   b0 = squarerax
-# asm 1: mov  <squarerax=int64#7,>b0=int64#12
-# asm 2: mov  <squarerax=%rax,>b0=%r14
-mov  %rax,%r14
-
-# qhasm:   squaret1 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret1=int64#13
-# asm 2: mov  <squarerdx=%rdx,>squaret1=%r15
-mov  %rdx,%r15
-
-# qhasm:   squarerax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   40(<pp=%rsi),>squarerax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 40)
-# asm 1: mulq  40(<pp=int64#2)
-# asm 2: mulq  40(<pp=%rsi)
-mulq  40(%rsi)
-
-# qhasm:   squaret2 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squaret2=int64#14
-# asm 2: mov  <squarerax=%rax,>squaret2=%rbx
-mov  %rax,%rbx
-
-# qhasm:   squaret3 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret3=int64#15
-# asm 2: mov  <squarerdx=%rdx,>squaret3=%rbp
-mov  %rdx,%rbp
-
-# qhasm:   squarerax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   48(<pp=%rsi),>squarerax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 48)
-# asm 1: mulq  48(<pp=int64#2)
-# asm 2: mulq  48(<pp=%rsi)
-mulq  48(%rsi)
-
-# qhasm:   carry? b1 += squaret1
-# asm 1: add  <squaret1=int64#13,<b1=int64#5
-# asm 2: add  <squaret1=%r15,<b1=%r8
-add  %r15,%r8
-
-# qhasm:   carry? b2 += squaret2 + carry
-# asm 1: adc <squaret2=int64#14,<b2=int64#6
-# asm 2: adc <squaret2=%rbx,<b2=%r9
-adc %rbx,%r9
-
-# qhasm:   carry? b3 += squaret3 + carry
-# asm 1: adc <squaret3=int64#15,<b3=int64#8
-# asm 2: adc <squaret3=%rbp,<b3=%r10
-adc %rbp,%r10
-
-# qhasm:   carry? squarer4 += squarerax + carry
-# asm 1: adc <squarerax=int64#7,<squarer4=int64#9
-# asm 2: adc <squarerax=%rax,<squarer4=%r11
-adc %rax,%r11
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r12
-adc %rdx,%r12
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarer7 += 0 + carry 
-# asm 1: adc $0,<squarer7=int64#4
-# asm 2: adc $0,<squarer7=%rcx
-adc $0,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   56(<pp=%rsi),>squarerax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 56)
-# asm 1: mulq  56(<pp=int64#2)
-# asm 2: mulq  56(<pp=%rsi)
-mulq  56(%rsi)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#11
-# asm 2: add  <squarerax=%rax,<squarer6=%r13
-add  %rax,%r13
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#4
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
-adc %rdx,%rcx
-
-# qhasm:   squarerax = squarer4
-# asm 1: mov  <squarer4=int64#9,>squarerax=int64#7
-# asm 2: mov  <squarer4=%r11,>squarerax=%rax
-mov  %r11,%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   squarer4 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer4=int64#9
-# asm 2: mov  <squarerax=%rax,>squarer4=%r11
-mov  %rax,%r11
-
-# qhasm:   squarerax = squarer5
-# asm 1: mov  <squarer5=int64#10,>squarerax=int64#7
-# asm 2: mov  <squarer5=%r12,>squarerax=%rax
-mov  %r12,%rax
-
-# qhasm:   squarer5 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer5=int64#10
-# asm 2: mov  <squarerdx=%rdx,>squarer5=%r12
-mov  %rdx,%r12
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer5 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer5=int64#10
-# asm 2: add  <squarerax=%rax,<squarer5=%r12
-add  %rax,%r12
-
-# qhasm:   squarerax = squarer6
-# asm 1: mov  <squarer6=int64#11,>squarerax=int64#7
-# asm 2: mov  <squarer6=%r13,>squarerax=%rax
-mov  %r13,%rax
-
-# qhasm:   squarer6 = 0
-# asm 1: mov  $0,>squarer6=int64#11
-# asm 2: mov  $0,>squarer6=%r13
-mov  $0,%r13
-
-# qhasm:   squarer6 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer6=int64#11
-# asm 2: adc <squarerdx=%rdx,<squarer6=%r13
-adc %rdx,%r13
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#11
-# asm 2: add  <squarerax=%rax,<squarer6=%r13
-add  %rax,%r13
-
-# qhasm:   squarerax = squarer7
-# asm 1: mov  <squarer7=int64#4,>squarerax=int64#7
-# asm 2: mov  <squarer7=%rcx,>squarerax=%rax
-mov  %rcx,%rax
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#4
-# asm 2: mov  $0,>squarer7=%rcx
-mov  $0,%rcx
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#4
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
-adc %rdx,%rcx
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer7 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer7=int64#4
-# asm 2: add  <squarerax=%rax,<squarer7=%rcx
-add  %rax,%rcx
-
-# qhasm:   squarer8 = 0
-# asm 1: mov  $0,>squarer8=int64#7
-# asm 2: mov  $0,>squarer8=%rax
-mov  $0,%rax
-
-# qhasm:   squarer8 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer8=int64#7
-# asm 2: adc <squarerdx=%rdx,<squarer8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? b0 += squarer4
-# asm 1: add  <squarer4=int64#9,<b0=int64#12
-# asm 2: add  <squarer4=%r11,<b0=%r14
-add  %r11,%r14
-
-# qhasm:   carry? b1 += squarer5 + carry
-# asm 1: adc <squarer5=int64#10,<b1=int64#5
-# asm 2: adc <squarer5=%r12,<b1=%r8
-adc %r12,%r8
-
-# qhasm:   carry? b2 += squarer6 + carry
-# asm 1: adc <squarer6=int64#11,<b2=int64#6
-# asm 2: adc <squarer6=%r13,<b2=%r9
-adc %r13,%r9
-
-# qhasm:   carry? b3 += squarer7 + carry
-# asm 1: adc <squarer7=int64#4,<b3=int64#8
-# asm 2: adc <squarer7=%rcx,<b3=%r10
-adc %rcx,%r10
-
-# qhasm:   squarezero = 0
-# asm 1: mov  $0,>squarezero=int64#3
-# asm 2: mov  $0,>squarezero=%rdx
-mov  $0,%rdx
-
-# qhasm:   squarer8 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<squarer8=int64#7
-# asm 2: adc <squarezero=%rdx,<squarer8=%rax
-adc %rdx,%rax
-
-# qhasm:   squarer8 *= 38
-# asm 1: imulq  $38,<squarer8=int64#7,>squarer8=int64#4
-# asm 2: imulq  $38,<squarer8=%rax,>squarer8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? b0 += squarer8
-# asm 1: add  <squarer8=int64#4,<b0=int64#12
-# asm 2: add  <squarer8=%rcx,<b0=%r14
-add  %rcx,%r14
-
-# qhasm:   carry? b1 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<b1=int64#5
-# asm 2: adc <squarezero=%rdx,<b1=%r8
-adc %rdx,%r8
-
-# qhasm:   carry? b2 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<b2=int64#6
-# asm 2: adc <squarezero=%rdx,<b2=%r9
-adc %rdx,%r9
-
-# qhasm:   carry? b3 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<b3=int64#8
-# asm 2: adc <squarezero=%rdx,<b3=%r10
-adc %rdx,%r10
-
-# qhasm:   squarezero += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<squarezero=int64#3
-# asm 2: adc <squarezero=%rdx,<squarezero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   squarezero *= 38
-# asm 1: imulq  $38,<squarezero=int64#3,>squarezero=int64#3
-# asm 2: imulq  $38,<squarezero=%rdx,>squarezero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   b0 += squarezero
-# asm 1: add  <squarezero=int64#3,<b0=int64#12
-# asm 2: add  <squarezero=%rdx,<b0=%r14
-add  %rdx,%r14
-
-# qhasm: b0_stack = b0
-# asm 1: movq <b0=int64#12,>b0_stack=stack64#12
-# asm 2: movq <b0=%r14,>b0_stack=88(%rsp)
-movq %r14,88(%rsp)
-
-# qhasm: b1_stack = b1
-# asm 1: movq <b1=int64#5,>b1_stack=stack64#13
-# asm 2: movq <b1=%r8,>b1_stack=96(%rsp)
-movq %r8,96(%rsp)
-
-# qhasm: b2_stack = b2
-# asm 1: movq <b2=int64#6,>b2_stack=stack64#14
-# asm 2: movq <b2=%r9,>b2_stack=104(%rsp)
-movq %r9,104(%rsp)
-
-# qhasm: b3_stack = b3
-# asm 1: movq <b3=int64#8,>b3_stack=stack64#15
-# asm 2: movq <b3=%r10,>b3_stack=112(%rsp)
-movq %r10,112(%rsp)
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#4
-# asm 2: mov  $0,>squarer7=%rcx
-mov  $0,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   72(<pp=%rsi),>squarerax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 64)
-# asm 1: mulq  64(<pp=int64#2)
-# asm 2: mulq  64(<pp=%rsi)
-mulq  64(%rsi)
-
-# qhasm:   c1 = squarerax
-# asm 1: mov  <squarerax=int64#7,>c1=int64#5
-# asm 2: mov  <squarerax=%rax,>c1=%r8
-mov  %rax,%r8
-
-# qhasm:   c2 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>c2=int64#6
-# asm 2: mov  <squarerdx=%rdx,>c2=%r9
-mov  %rdx,%r9
-
-# qhasm:   squarerax = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   80(<pp=%rsi),>squarerax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 72)
-# asm 1: mulq  72(<pp=int64#2)
-# asm 2: mulq  72(<pp=%rsi)
-mulq  72(%rsi)
-
-# qhasm:   c3 = squarerax 
-# asm 1: mov  <squarerax=int64#7,>c3=int64#8
-# asm 2: mov  <squarerax=%rax,>c3=%r10
-mov  %rax,%r10
-
-# qhasm:   squarer4 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer4=int64#9
-# asm 2: mov  <squarerdx=%rdx,>squarer4=%r11
-mov  %rdx,%r11
-
-# qhasm:   squarerax = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   88(<pp=%rsi),>squarerax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 80)
-# asm 1: mulq  80(<pp=int64#2)
-# asm 2: mulq  80(<pp=%rsi)
-mulq  80(%rsi)
-
-# qhasm:   squarer5 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer5=int64#10
-# asm 2: mov  <squarerax=%rax,>squarer5=%r12
-mov  %rax,%r12
-
-# qhasm:   squarer6 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer6=int64#11
-# asm 2: mov  <squarerdx=%rdx,>squarer6=%r13
-mov  %rdx,%r13
-
-# qhasm:   squarerax = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   80(<pp=%rsi),>squarerax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 64)
-# asm 1: mulq  64(<pp=int64#2)
-# asm 2: mulq  64(<pp=%rsi)
-mulq  64(%rsi)
-
-# qhasm:   carry? c2 += squarerax
-# asm 1: add  <squarerax=int64#7,<c2=int64#6
-# asm 2: add  <squarerax=%rax,<c2=%r9
-add  %rax,%r9
-
-# qhasm:   carry? c3 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<c3=int64#8
-# asm 2: adc <squarerdx=%rdx,<c3=%r10
-adc %rdx,%r10
-
-# qhasm:   squarer4 += 0 + carry
-# asm 1: adc $0,<squarer4=int64#9
-# asm 2: adc $0,<squarer4=%r11
-adc $0,%r11
-
-# qhasm:   squarerax = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   88(<pp=%rsi),>squarerax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 72)
-# asm 1: mulq  72(<pp=int64#2)
-# asm 2: mulq  72(<pp=%rsi)
-mulq  72(%rsi)
-
-# qhasm:   carry? squarer4 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer4=int64#9
-# asm 2: add  <squarerax=%rax,<squarer4=%r11
-add  %rax,%r11
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r12
-adc %rdx,%r12
-
-# qhasm:   squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarerax = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   88(<pp=%rsi),>squarerax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 64)
-# asm 1: mulq  64(<pp=int64#2)
-# asm 2: mulq  64(<pp=%rsi)
-mulq  64(%rsi)
-
-# qhasm:   carry? c3 += squarerax
-# asm 1: add  <squarerax=int64#7,<c3=int64#8
-# asm 2: add  <squarerax=%rax,<c3=%r10
-add  %rax,%r10
-
-# qhasm:   carry? squarer4 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer4=int64#9
-# asm 2: adc <squarerdx=%rdx,<squarer4=%r11
-adc %rdx,%r11
-
-# qhasm:   carry? squarer5 += 0 + carry
-# asm 1: adc $0,<squarer5=int64#10
-# asm 2: adc $0,<squarer5=%r12
-adc $0,%r12
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarer7 += 0 + carry
-# asm 1: adc $0,<squarer7=int64#4
-# asm 2: adc $0,<squarer7=%rcx
-adc $0,%rcx
-
-# qhasm:   carry? c1 += c1
-# asm 1: add  <c1=int64#5,<c1=int64#5
-# asm 2: add  <c1=%r8,<c1=%r8
-add  %r8,%r8
-
-# qhasm:   carry? c2 += c2 + carry
-# asm 1: adc <c2=int64#6,<c2=int64#6
-# asm 2: adc <c2=%r9,<c2=%r9
-adc %r9,%r9
-
-# qhasm:   carry? c3 += c3 + carry
-# asm 1: adc <c3=int64#8,<c3=int64#8
-# asm 2: adc <c3=%r10,<c3=%r10
-adc %r10,%r10
-
-# qhasm:   carry? squarer4 += squarer4 + carry
-# asm 1: adc <squarer4=int64#9,<squarer4=int64#9
-# asm 2: adc <squarer4=%r11,<squarer4=%r11
-adc %r11,%r11
-
-# qhasm:   carry? squarer5 += squarer5 + carry
-# asm 1: adc <squarer5=int64#10,<squarer5=int64#10
-# asm 2: adc <squarer5=%r12,<squarer5=%r12
-adc %r12,%r12
-
-# qhasm:   carry? squarer6 += squarer6 + carry
-# asm 1: adc <squarer6=int64#11,<squarer6=int64#11
-# asm 2: adc <squarer6=%r13,<squarer6=%r13
-adc %r13,%r13
-
-# qhasm:   squarer7 += squarer7 + carry
-# asm 1: adc <squarer7=int64#4,<squarer7=int64#4
-# asm 2: adc <squarer7=%rcx,<squarer7=%rcx
-adc %rcx,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   64(<pp=%rsi),>squarerax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 64)
-# asm 1: mulq  64(<pp=int64#2)
-# asm 2: mulq  64(<pp=%rsi)
-mulq  64(%rsi)
-
-# qhasm:   c0 = squarerax
-# asm 1: mov  <squarerax=int64#7,>c0=int64#12
-# asm 2: mov  <squarerax=%rax,>c0=%r14
-mov  %rax,%r14
-
-# qhasm:   squaret1 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret1=int64#13
-# asm 2: mov  <squarerdx=%rdx,>squaret1=%r15
-mov  %rdx,%r15
-
-# qhasm:   squarerax = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   72(<pp=%rsi),>squarerax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 72)
-# asm 1: mulq  72(<pp=int64#2)
-# asm 2: mulq  72(<pp=%rsi)
-mulq  72(%rsi)
-
-# qhasm:   squaret2 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squaret2=int64#14
-# asm 2: mov  <squarerax=%rax,>squaret2=%rbx
-mov  %rax,%rbx
-
-# qhasm:   squaret3 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret3=int64#15
-# asm 2: mov  <squarerdx=%rdx,>squaret3=%rbp
-mov  %rdx,%rbp
-
-# qhasm:   squarerax = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   80(<pp=%rsi),>squarerax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 80)
-# asm 1: mulq  80(<pp=int64#2)
-# asm 2: mulq  80(<pp=%rsi)
-mulq  80(%rsi)
-
-# qhasm:   carry? c1 += squaret1
-# asm 1: add  <squaret1=int64#13,<c1=int64#5
-# asm 2: add  <squaret1=%r15,<c1=%r8
-add  %r15,%r8
-
-# qhasm:   carry? c2 += squaret2 + carry
-# asm 1: adc <squaret2=int64#14,<c2=int64#6
-# asm 2: adc <squaret2=%rbx,<c2=%r9
-adc %rbx,%r9
-
-# qhasm:   carry? c3 += squaret3 + carry
-# asm 1: adc <squaret3=int64#15,<c3=int64#8
-# asm 2: adc <squaret3=%rbp,<c3=%r10
-adc %rbp,%r10
-
-# qhasm:   carry? squarer4 += squarerax + carry
-# asm 1: adc <squarerax=int64#7,<squarer4=int64#9
-# asm 2: adc <squarerax=%rax,<squarer4=%r11
-adc %rax,%r11
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r12
-adc %rdx,%r12
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#11
-# asm 2: adc $0,<squarer6=%r13
-adc $0,%r13
-
-# qhasm:   squarer7 += 0 + carry 
-# asm 1: adc $0,<squarer7=int64#4
-# asm 2: adc $0,<squarer7=%rcx
-adc $0,%rcx
-
-# qhasm:   squarerax = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>squarerax=int64#7
-# asm 2: movq   88(<pp=%rsi),>squarerax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)(pp + 88)
-# asm 1: mulq  88(<pp=int64#2)
-# asm 2: mulq  88(<pp=%rsi)
-mulq  88(%rsi)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#11
-# asm 2: add  <squarerax=%rax,<squarer6=%r13
-add  %rax,%r13
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#4
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
-adc %rdx,%rcx
-
-# qhasm:   squarerax = squarer4
-# asm 1: mov  <squarer4=int64#9,>squarerax=int64#7
-# asm 2: mov  <squarer4=%r11,>squarerax=%rax
-mov  %r11,%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   squarer4 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer4=int64#9
-# asm 2: mov  <squarerax=%rax,>squarer4=%r11
-mov  %rax,%r11
-
-# qhasm:   squarerax = squarer5
-# asm 1: mov  <squarer5=int64#10,>squarerax=int64#7
-# asm 2: mov  <squarer5=%r12,>squarerax=%rax
-mov  %r12,%rax
-
-# qhasm:   squarer5 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer5=int64#10
-# asm 2: mov  <squarerdx=%rdx,>squarer5=%r12
-mov  %rdx,%r12
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer5 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer5=int64#10
-# asm 2: add  <squarerax=%rax,<squarer5=%r12
-add  %rax,%r12
-
-# qhasm:   squarerax = squarer6
-# asm 1: mov  <squarer6=int64#11,>squarerax=int64#7
-# asm 2: mov  <squarer6=%r13,>squarerax=%rax
-mov  %r13,%rax
-
-# qhasm:   squarer6 = 0
-# asm 1: mov  $0,>squarer6=int64#11
-# asm 2: mov  $0,>squarer6=%r13
-mov  $0,%r13
-
-# qhasm:   squarer6 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer6=int64#11
-# asm 2: adc <squarerdx=%rdx,<squarer6=%r13
-adc %rdx,%r13
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#11
-# asm 2: add  <squarerax=%rax,<squarer6=%r13
-add  %rax,%r13
-
-# qhasm:   squarerax = squarer7
-# asm 1: mov  <squarer7=int64#4,>squarerax=int64#7
-# asm 2: mov  <squarer7=%rcx,>squarerax=%rax
-mov  %rcx,%rax
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#4
-# asm 2: mov  $0,>squarer7=%rcx
-mov  $0,%rcx
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#4
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rcx
-adc %rdx,%rcx
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer7 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer7=int64#4
-# asm 2: add  <squarerax=%rax,<squarer7=%rcx
-add  %rax,%rcx
-
-# qhasm:   squarer8 = 0
-# asm 1: mov  $0,>squarer8=int64#7
-# asm 2: mov  $0,>squarer8=%rax
-mov  $0,%rax
-
-# qhasm:   squarer8 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer8=int64#7
-# asm 2: adc <squarerdx=%rdx,<squarer8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? c0 += squarer4
-# asm 1: add  <squarer4=int64#9,<c0=int64#12
-# asm 2: add  <squarer4=%r11,<c0=%r14
-add  %r11,%r14
-
-# qhasm:   carry? c1 += squarer5 + carry
-# asm 1: adc <squarer5=int64#10,<c1=int64#5
-# asm 2: adc <squarer5=%r12,<c1=%r8
-adc %r12,%r8
-
-# qhasm:   carry? c2 += squarer6 + carry
-# asm 1: adc <squarer6=int64#11,<c2=int64#6
-# asm 2: adc <squarer6=%r13,<c2=%r9
-adc %r13,%r9
-
-# qhasm:   carry? c3 += squarer7 + carry
-# asm 1: adc <squarer7=int64#4,<c3=int64#8
-# asm 2: adc <squarer7=%rcx,<c3=%r10
-adc %rcx,%r10
-
-# qhasm:   squarezero = 0
-# asm 1: mov  $0,>squarezero=int64#3
-# asm 2: mov  $0,>squarezero=%rdx
-mov  $0,%rdx
-
-# qhasm:   squarer8 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<squarer8=int64#7
-# asm 2: adc <squarezero=%rdx,<squarer8=%rax
-adc %rdx,%rax
-
-# qhasm:   squarer8 *= 38
-# asm 1: imulq  $38,<squarer8=int64#7,>squarer8=int64#4
-# asm 2: imulq  $38,<squarer8=%rax,>squarer8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? c0 += squarer8
-# asm 1: add  <squarer8=int64#4,<c0=int64#12
-# asm 2: add  <squarer8=%rcx,<c0=%r14
-add  %rcx,%r14
-
-# qhasm:   carry? c1 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<c1=int64#5
-# asm 2: adc <squarezero=%rdx,<c1=%r8
-adc %rdx,%r8
-
-# qhasm:   carry? c2 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<c2=int64#6
-# asm 2: adc <squarezero=%rdx,<c2=%r9
-adc %rdx,%r9
-
-# qhasm:   carry? c3 += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<c3=int64#8
-# asm 2: adc <squarezero=%rdx,<c3=%r10
-adc %rdx,%r10
-
-# qhasm:   squarezero += squarezero + carry
-# asm 1: adc <squarezero=int64#3,<squarezero=int64#3
-# asm 2: adc <squarezero=%rdx,<squarezero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   squarezero *= 38
-# asm 1: imulq  $38,<squarezero=int64#3,>squarezero=int64#3
-# asm 2: imulq  $38,<squarezero=%rdx,>squarezero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   c0 += squarezero
-# asm 1: add  <squarezero=int64#3,<c0=int64#12
-# asm 2: add  <squarezero=%rdx,<c0=%r14
-add  %rdx,%r14
-
-# qhasm:   carry? c0 += c0 
-# asm 1: add  <c0=int64#12,<c0=int64#12
-# asm 2: add  <c0=%r14,<c0=%r14
-add  %r14,%r14
-
-# qhasm:   carry? c1 += c1 + carry
-# asm 1: adc <c1=int64#5,<c1=int64#5
-# asm 2: adc <c1=%r8,<c1=%r8
-adc %r8,%r8
-
-# qhasm:   carry? c2 += c2 + carry
-# asm 1: adc <c2=int64#6,<c2=int64#6
-# asm 2: adc <c2=%r9,<c2=%r9
-adc %r9,%r9
-
-# qhasm:   carry? c3 += c3 + carry
-# asm 1: adc <c3=int64#8,<c3=int64#8
-# asm 2: adc <c3=%r10,<c3=%r10
-adc %r10,%r10
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#3
-# asm 2: mov  $0,>addt0=%rdx
-mov  $0,%rdx
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#4
-# asm 2: mov  $38,>addt1=%rcx
-mov  $38,%rcx
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#3,<addt1=int64#4
-# asm 2: cmovae <addt0=%rdx,<addt1=%rcx
-cmovae %rdx,%rcx
-
-# qhasm:   carry? c0 += addt1
-# asm 1: add  <addt1=int64#4,<c0=int64#12
-# asm 2: add  <addt1=%rcx,<c0=%r14
-add  %rcx,%r14
-
-# qhasm:   carry? c1 += addt0 + carry
-# asm 1: adc <addt0=int64#3,<c1=int64#5
-# asm 2: adc <addt0=%rdx,<c1=%r8
-adc %rdx,%r8
-
-# qhasm:   carry? c2 += addt0 + carry
-# asm 1: adc <addt0=int64#3,<c2=int64#6
-# asm 2: adc <addt0=%rdx,<c2=%r9
-adc %rdx,%r9
-
-# qhasm:   carry? c3 += addt0 + carry
-# asm 1: adc <addt0=int64#3,<c3=int64#8
-# asm 2: adc <addt0=%rdx,<c3=%r10
-adc %rdx,%r10
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#4,<addt0=int64#3
-# asm 2: cmovc <addt1=%rcx,<addt0=%rdx
-cmovc %rcx,%rdx
-
-# qhasm:   c0 += addt0
-# asm 1: add  <addt0=int64#3,<c0=int64#12
-# asm 2: add  <addt0=%rdx,<c0=%r14
-add  %rdx,%r14
-
-# qhasm: c0_stack = c0
-# asm 1: movq <c0=int64#12,>c0_stack=stack64#16
-# asm 2: movq <c0=%r14,>c0_stack=120(%rsp)
-movq %r14,120(%rsp)
-
-# qhasm: c1_stack = c1
-# asm 1: movq <c1=int64#5,>c1_stack=stack64#17
-# asm 2: movq <c1=%r8,>c1_stack=128(%rsp)
-movq %r8,128(%rsp)
-
-# qhasm: c2_stack = c2
-# asm 1: movq <c2=int64#6,>c2_stack=stack64#18
-# asm 2: movq <c2=%r9,>c2_stack=136(%rsp)
-movq %r9,136(%rsp)
-
-# qhasm: c3_stack = c3
-# asm 1: movq <c3=int64#8,>c3_stack=stack64#19
-# asm 2: movq <c3=%r10,>c3_stack=144(%rsp)
-movq %r10,144(%rsp)
-
-# qhasm: d0 = 0
-# asm 1: mov  $0,>d0=int64#3
-# asm 2: mov  $0,>d0=%rdx
-mov  $0,%rdx
-
-# qhasm: d1 = 0
-# asm 1: mov  $0,>d1=int64#4
-# asm 2: mov  $0,>d1=%rcx
-mov  $0,%rcx
-
-# qhasm: d2 = 0
-# asm 1: mov  $0,>d2=int64#5
-# asm 2: mov  $0,>d2=%r8
-mov  $0,%r8
-
-# qhasm: d3 = 0
-# asm 1: mov  $0,>d3=int64#6
-# asm 2: mov  $0,>d3=%r9
-mov  $0,%r9
-
-# qhasm:   carry? d0 -= a0_stack 
-# asm 1: subq <a0_stack=stack64#8,<d0=int64#3
-# asm 2: subq <a0_stack=56(%rsp),<d0=%rdx
-subq 56(%rsp),%rdx
-
-# qhasm:   carry? d1 -= a1_stack - carry
-# asm 1: sbbq <a1_stack=stack64#9,<d1=int64#4
-# asm 2: sbbq <a1_stack=64(%rsp),<d1=%rcx
-sbbq 64(%rsp),%rcx
-
-# qhasm:   carry? d2 -= a2_stack - carry
-# asm 1: sbbq <a2_stack=stack64#10,<d2=int64#5
-# asm 2: sbbq <a2_stack=72(%rsp),<d2=%r8
-sbbq 72(%rsp),%r8
-
-# qhasm:   carry? d3 -= a3_stack - carry
-# asm 1: sbbq <a3_stack=stack64#11,<d3=int64#6
-# asm 2: sbbq <a3_stack=80(%rsp),<d3=%r9
-sbbq 80(%rsp),%r9
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#7
-# asm 2: mov  $0,>subt0=%rax
-mov  $0,%rax
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#8
-# asm 2: mov  $38,>subt1=%r10
-mov  $38,%r10
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#7,<subt1=int64#8
-# asm 2: cmovae <subt0=%rax,<subt1=%r10
-cmovae %rax,%r10
-
-# qhasm:   carry? d0 -= subt1
-# asm 1: sub  <subt1=int64#8,<d0=int64#3
-# asm 2: sub  <subt1=%r10,<d0=%rdx
-sub  %r10,%rdx
-
-# qhasm:   carry? d1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#7,<d1=int64#4
-# asm 2: sbb  <subt0=%rax,<d1=%rcx
-sbb  %rax,%rcx
-
-# qhasm:   carry? d2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#7,<d2=int64#5
-# asm 2: sbb  <subt0=%rax,<d2=%r8
-sbb  %rax,%r8
-
-# qhasm:   carry? d3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#7,<d3=int64#6
-# asm 2: sbb  <subt0=%rax,<d3=%r9
-sbb  %rax,%r9
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#8,<subt0=int64#7
-# asm 2: cmovc <subt1=%r10,<subt0=%rax
-cmovc %r10,%rax
-
-# qhasm:   d0 -= subt0
-# asm 1: sub  <subt0=int64#7,<d0=int64#3
-# asm 2: sub  <subt0=%rax,<d0=%rdx
-sub  %rax,%rdx
-
-# qhasm: d0_stack = d0
-# asm 1: movq <d0=int64#3,>d0_stack=stack64#8
-# asm 2: movq <d0=%rdx,>d0_stack=56(%rsp)
-movq %rdx,56(%rsp)
-
-# qhasm: d1_stack = d1
-# asm 1: movq <d1=int64#4,>d1_stack=stack64#9
-# asm 2: movq <d1=%rcx,>d1_stack=64(%rsp)
-movq %rcx,64(%rsp)
-
-# qhasm: d2_stack = d2
-# asm 1: movq <d2=int64#5,>d2_stack=stack64#10
-# asm 2: movq <d2=%r8,>d2_stack=72(%rsp)
-movq %r8,72(%rsp)
-
-# qhasm: d3_stack = d3
-# asm 1: movq <d3=int64#6,>d3_stack=stack64#11
-# asm 2: movq <d3=%r9,>d3_stack=80(%rsp)
-movq %r9,80(%rsp)
-
-# qhasm: e0 = 0
-# asm 1: mov  $0,>e0=int64#7
-# asm 2: mov  $0,>e0=%rax
-mov  $0,%rax
-
-# qhasm: e1 = 0
-# asm 1: mov  $0,>e1=int64#8
-# asm 2: mov  $0,>e1=%r10
-mov  $0,%r10
-
-# qhasm: e2 = 0
-# asm 1: mov  $0,>e2=int64#9
-# asm 2: mov  $0,>e2=%r11
-mov  $0,%r11
-
-# qhasm: e3 = 0
-# asm 1: mov  $0,>e3=int64#10
-# asm 2: mov  $0,>e3=%r12
-mov  $0,%r12
-
-# qhasm:   carry? e0 -= b0_stack 
-# asm 1: subq <b0_stack=stack64#12,<e0=int64#7
-# asm 2: subq <b0_stack=88(%rsp),<e0=%rax
-subq 88(%rsp),%rax
-
-# qhasm:   carry? e1 -= b1_stack - carry
-# asm 1: sbbq <b1_stack=stack64#13,<e1=int64#8
-# asm 2: sbbq <b1_stack=96(%rsp),<e1=%r10
-sbbq 96(%rsp),%r10
-
-# qhasm:   carry? e2 -= b2_stack - carry
-# asm 1: sbbq <b2_stack=stack64#14,<e2=int64#9
-# asm 2: sbbq <b2_stack=104(%rsp),<e2=%r11
-sbbq 104(%rsp),%r11
-
-# qhasm:   carry? e3 -= b3_stack - carry
-# asm 1: sbbq <b3_stack=stack64#15,<e3=int64#10
-# asm 2: sbbq <b3_stack=112(%rsp),<e3=%r12
-sbbq 112(%rsp),%r12
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#11
-# asm 2: mov  $0,>subt0=%r13
-mov  $0,%r13
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#12
-# asm 2: mov  $38,>subt1=%r14
-mov  $38,%r14
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#11,<subt1=int64#12
-# asm 2: cmovae <subt0=%r13,<subt1=%r14
-cmovae %r13,%r14
-
-# qhasm:   carry? e0 -= subt1
-# asm 1: sub  <subt1=int64#12,<e0=int64#7
-# asm 2: sub  <subt1=%r14,<e0=%rax
-sub  %r14,%rax
-
-# qhasm:   carry? e1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<e1=int64#8
-# asm 2: sbb  <subt0=%r13,<e1=%r10
-sbb  %r13,%r10
-
-# qhasm:   carry? e2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<e2=int64#9
-# asm 2: sbb  <subt0=%r13,<e2=%r11
-sbb  %r13,%r11
-
-# qhasm:   carry? e3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<e3=int64#10
-# asm 2: sbb  <subt0=%r13,<e3=%r12
-sbb  %r13,%r12
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#12,<subt0=int64#11
-# asm 2: cmovc <subt1=%r14,<subt0=%r13
-cmovc %r14,%r13
-
-# qhasm:   e0 -= subt0
-# asm 1: sub  <subt0=int64#11,<e0=int64#7
-# asm 2: sub  <subt0=%r13,<e0=%rax
-sub  %r13,%rax
-
-# qhasm: e0_stack = e0
-# asm 1: movq <e0=int64#7,>e0_stack=stack64#20
-# asm 2: movq <e0=%rax,>e0_stack=152(%rsp)
-movq %rax,152(%rsp)
-
-# qhasm: e1_stack = e1
-# asm 1: movq <e1=int64#8,>e1_stack=stack64#21
-# asm 2: movq <e1=%r10,>e1_stack=160(%rsp)
-movq %r10,160(%rsp)
-
-# qhasm: e2_stack = e2
-# asm 1: movq <e2=int64#9,>e2_stack=stack64#22
-# asm 2: movq <e2=%r11,>e2_stack=168(%rsp)
-movq %r11,168(%rsp)
-
-# qhasm: e3_stack = e3
-# asm 1: movq <e3=int64#10,>e3_stack=stack64#23
-# asm 2: movq <e3=%r12,>e3_stack=176(%rsp)
-movq %r12,176(%rsp)
-
-# qhasm: rz0 = d0
-# asm 1: mov  <d0=int64#3,>rz0=int64#7
-# asm 2: mov  <d0=%rdx,>rz0=%rax
-mov  %rdx,%rax
-
-# qhasm: rz1 = d1
-# asm 1: mov  <d1=int64#4,>rz1=int64#8
-# asm 2: mov  <d1=%rcx,>rz1=%r10
-mov  %rcx,%r10
-
-# qhasm: rz2 = d2
-# asm 1: mov  <d2=int64#5,>rz2=int64#9
-# asm 2: mov  <d2=%r8,>rz2=%r11
-mov  %r8,%r11
-
-# qhasm: rz3 = d3
-# asm 1: mov  <d3=int64#6,>rz3=int64#10
-# asm 2: mov  <d3=%r9,>rz3=%r12
-mov  %r9,%r12
-
-# qhasm:   carry? rz0 += b0_stack 
-# asm 1: addq <b0_stack=stack64#12,<rz0=int64#7
-# asm 2: addq <b0_stack=88(%rsp),<rz0=%rax
-addq 88(%rsp),%rax
-
-# qhasm:   carry? rz1 += b1_stack + carry
-# asm 1: adcq <b1_stack=stack64#13,<rz1=int64#8
-# asm 2: adcq <b1_stack=96(%rsp),<rz1=%r10
-adcq 96(%rsp),%r10
-
-# qhasm:   carry? rz2 += b2_stack + carry
-# asm 1: adcq <b2_stack=stack64#14,<rz2=int64#9
-# asm 2: adcq <b2_stack=104(%rsp),<rz2=%r11
-adcq 104(%rsp),%r11
-
-# qhasm:   carry? rz3 += b3_stack + carry
-# asm 1: adcq <b3_stack=stack64#15,<rz3=int64#10
-# asm 2: adcq <b3_stack=112(%rsp),<rz3=%r12
-adcq 112(%rsp),%r12
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#11
-# asm 2: mov  $0,>addt0=%r13
-mov  $0,%r13
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#12
-# asm 2: mov  $38,>addt1=%r14
-mov  $38,%r14
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#11,<addt1=int64#12
-# asm 2: cmovae <addt0=%r13,<addt1=%r14
-cmovae %r13,%r14
-
-# qhasm:   carry? rz0 += addt1
-# asm 1: add  <addt1=int64#12,<rz0=int64#7
-# asm 2: add  <addt1=%r14,<rz0=%rax
-add  %r14,%rax
-
-# qhasm:   carry? rz1 += addt0 + carry
-# asm 1: adc <addt0=int64#11,<rz1=int64#8
-# asm 2: adc <addt0=%r13,<rz1=%r10
-adc %r13,%r10
-
-# qhasm:   carry? rz2 += addt0 + carry
-# asm 1: adc <addt0=int64#11,<rz2=int64#9
-# asm 2: adc <addt0=%r13,<rz2=%r11
-adc %r13,%r11
-
-# qhasm:   carry? rz3 += addt0 + carry
-# asm 1: adc <addt0=int64#11,<rz3=int64#10
-# asm 2: adc <addt0=%r13,<rz3=%r12
-adc %r13,%r12
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#12,<addt0=int64#11
-# asm 2: cmovc <addt1=%r14,<addt0=%r13
-cmovc %r14,%r13
-
-# qhasm:   rz0 += addt0
-# asm 1: add  <addt0=int64#11,<rz0=int64#7
-# asm 2: add  <addt0=%r13,<rz0=%rax
-add  %r13,%rax
-
-# qhasm: *(uint64 *) (rp + 32) = rz0
-# asm 1: movq   <rz0=int64#7,32(<rp=int64#1)
-# asm 2: movq   <rz0=%rax,32(<rp=%rdi)
-movq   %rax,32(%rdi)
-
-# qhasm: *(uint64 *) (rp + 40) = rz1
-# asm 1: movq   <rz1=int64#8,40(<rp=int64#1)
-# asm 2: movq   <rz1=%r10,40(<rp=%rdi)
-movq   %r10,40(%rdi)
-
-# qhasm: *(uint64 *) (rp + 48) = rz2
-# asm 1: movq   <rz2=int64#9,48(<rp=int64#1)
-# asm 2: movq   <rz2=%r11,48(<rp=%rdi)
-movq   %r11,48(%rdi)
-
-# qhasm: *(uint64 *) (rp + 56) = rz3
-# asm 1: movq   <rz3=int64#10,56(<rp=int64#1)
-# asm 2: movq   <rz3=%r12,56(<rp=%rdi)
-movq   %r12,56(%rdi)
-
-# qhasm:   carry? d0 -= b0_stack 
-# asm 1: subq <b0_stack=stack64#12,<d0=int64#3
-# asm 2: subq <b0_stack=88(%rsp),<d0=%rdx
-subq 88(%rsp),%rdx
-
-# qhasm:   carry? d1 -= b1_stack - carry
-# asm 1: sbbq <b1_stack=stack64#13,<d1=int64#4
-# asm 2: sbbq <b1_stack=96(%rsp),<d1=%rcx
-sbbq 96(%rsp),%rcx
-
-# qhasm:   carry? d2 -= b2_stack - carry
-# asm 1: sbbq <b2_stack=stack64#14,<d2=int64#5
-# asm 2: sbbq <b2_stack=104(%rsp),<d2=%r8
-sbbq 104(%rsp),%r8
-
-# qhasm:   carry? d3 -= b3_stack - carry
-# asm 1: sbbq <b3_stack=stack64#15,<d3=int64#6
-# asm 2: sbbq <b3_stack=112(%rsp),<d3=%r9
-sbbq 112(%rsp),%r9
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#11
-# asm 2: mov  $0,>subt0=%r13
-mov  $0,%r13
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#12
-# asm 2: mov  $38,>subt1=%r14
-mov  $38,%r14
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#11,<subt1=int64#12
-# asm 2: cmovae <subt0=%r13,<subt1=%r14
-cmovae %r13,%r14
-
-# qhasm:   carry? d0 -= subt1
-# asm 1: sub  <subt1=int64#12,<d0=int64#3
-# asm 2: sub  <subt1=%r14,<d0=%rdx
-sub  %r14,%rdx
-
-# qhasm:   carry? d1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<d1=int64#4
-# asm 2: sbb  <subt0=%r13,<d1=%rcx
-sbb  %r13,%rcx
-
-# qhasm:   carry? d2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<d2=int64#5
-# asm 2: sbb  <subt0=%r13,<d2=%r8
-sbb  %r13,%r8
-
-# qhasm:   carry? d3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<d3=int64#6
-# asm 2: sbb  <subt0=%r13,<d3=%r9
-sbb  %r13,%r9
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#12,<subt0=int64#11
-# asm 2: cmovc <subt1=%r14,<subt0=%r13
-cmovc %r14,%r13
-
-# qhasm:   d0 -= subt0
-# asm 1: sub  <subt0=int64#11,<d0=int64#3
-# asm 2: sub  <subt0=%r13,<d0=%rdx
-sub  %r13,%rdx
-
-# qhasm: *(uint64 *)(rp + 64) = d0
-# asm 1: movq   <d0=int64#3,64(<rp=int64#1)
-# asm 2: movq   <d0=%rdx,64(<rp=%rdi)
-movq   %rdx,64(%rdi)
-
-# qhasm: *(uint64 *)(rp + 72) = d1
-# asm 1: movq   <d1=int64#4,72(<rp=int64#1)
-# asm 2: movq   <d1=%rcx,72(<rp=%rdi)
-movq   %rcx,72(%rdi)
-
-# qhasm: *(uint64 *)(rp + 80) = d2
-# asm 1: movq   <d2=int64#5,80(<rp=int64#1)
-# asm 2: movq   <d2=%r8,80(<rp=%rdi)
-movq   %r8,80(%rdi)
-
-# qhasm: *(uint64 *)(rp + 88) = d3
-# asm 1: movq   <d3=int64#6,88(<rp=int64#1)
-# asm 2: movq   <d3=%r9,88(<rp=%rdi)
-movq   %r9,88(%rdi)
-
-# qhasm:   carry? rz0 -= c0_stack 
-# asm 1: subq <c0_stack=stack64#16,<rz0=int64#7
-# asm 2: subq <c0_stack=120(%rsp),<rz0=%rax
-subq 120(%rsp),%rax
-
-# qhasm:   carry? rz1 -= c1_stack - carry
-# asm 1: sbbq <c1_stack=stack64#17,<rz1=int64#8
-# asm 2: sbbq <c1_stack=128(%rsp),<rz1=%r10
-sbbq 128(%rsp),%r10
-
-# qhasm:   carry? rz2 -= c2_stack - carry
-# asm 1: sbbq <c2_stack=stack64#18,<rz2=int64#9
-# asm 2: sbbq <c2_stack=136(%rsp),<rz2=%r11
-sbbq 136(%rsp),%r11
-
-# qhasm:   carry? rz3 -= c3_stack - carry
-# asm 1: sbbq <c3_stack=stack64#19,<rz3=int64#10
-# asm 2: sbbq <c3_stack=144(%rsp),<rz3=%r12
-sbbq 144(%rsp),%r12
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#3
-# asm 2: mov  $0,>subt0=%rdx
-mov  $0,%rdx
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#4
-# asm 2: mov  $38,>subt1=%rcx
-mov  $38,%rcx
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#3,<subt1=int64#4
-# asm 2: cmovae <subt0=%rdx,<subt1=%rcx
-cmovae %rdx,%rcx
-
-# qhasm:   carry? rz0 -= subt1
-# asm 1: sub  <subt1=int64#4,<rz0=int64#7
-# asm 2: sub  <subt1=%rcx,<rz0=%rax
-sub  %rcx,%rax
-
-# qhasm:   carry? rz1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#3,<rz1=int64#8
-# asm 2: sbb  <subt0=%rdx,<rz1=%r10
-sbb  %rdx,%r10
-
-# qhasm:   carry? rz2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#3,<rz2=int64#9
-# asm 2: sbb  <subt0=%rdx,<rz2=%r11
-sbb  %rdx,%r11
-
-# qhasm:   carry? rz3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#3,<rz3=int64#10
-# asm 2: sbb  <subt0=%rdx,<rz3=%r12
-sbb  %rdx,%r12
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#4,<subt0=int64#3
-# asm 2: cmovc <subt1=%rcx,<subt0=%rdx
-cmovc %rcx,%rdx
-
-# qhasm:   rz0 -= subt0
-# asm 1: sub  <subt0=int64#3,<rz0=int64#7
-# asm 2: sub  <subt0=%rdx,<rz0=%rax
-sub  %rdx,%rax
-
-# qhasm: *(uint64 *) (rp + 96) = rz0
-# asm 1: movq   <rz0=int64#7,96(<rp=int64#1)
-# asm 2: movq   <rz0=%rax,96(<rp=%rdi)
-movq   %rax,96(%rdi)
-
-# qhasm: *(uint64 *) (rp + 104) = rz1
-# asm 1: movq   <rz1=int64#8,104(<rp=int64#1)
-# asm 2: movq   <rz1=%r10,104(<rp=%rdi)
-movq   %r10,104(%rdi)
-
-# qhasm: *(uint64 *) (rp + 112) = rz2
-# asm 1: movq   <rz2=int64#9,112(<rp=int64#1)
-# asm 2: movq   <rz2=%r11,112(<rp=%rdi)
-movq   %r11,112(%rdi)
-
-# qhasm: *(uint64 *) (rp + 120) = rz3
-# asm 1: movq   <rz3=int64#10,120(<rp=int64#1)
-# asm 2: movq   <rz3=%r12,120(<rp=%rdi)
-movq   %r12,120(%rdi)
-
-# qhasm: rx0 = *(uint64 *)(pp + 0)
-# asm 1: movq   0(<pp=int64#2),>rx0=int64#3
-# asm 2: movq   0(<pp=%rsi),>rx0=%rdx
-movq   0(%rsi),%rdx
-
-# qhasm: rx1 = *(uint64 *)(pp + 8)
-# asm 1: movq   8(<pp=int64#2),>rx1=int64#4
-# asm 2: movq   8(<pp=%rsi),>rx1=%rcx
-movq   8(%rsi),%rcx
-
-# qhasm: rx2 = *(uint64 *)(pp + 16)
-# asm 1: movq   16(<pp=int64#2),>rx2=int64#5
-# asm 2: movq   16(<pp=%rsi),>rx2=%r8
-movq   16(%rsi),%r8
-
-# qhasm: rx3 = *(uint64 *)(pp + 24)
-# asm 1: movq   24(<pp=int64#2),>rx3=int64#6
-# asm 2: movq   24(<pp=%rsi),>rx3=%r9
-movq   24(%rsi),%r9
-
-# qhasm:   carry? rx0 += *(uint64 *)(pp + 32) 
-# asm 1: addq 32(<pp=int64#2),<rx0=int64#3
-# asm 2: addq 32(<pp=%rsi),<rx0=%rdx
-addq 32(%rsi),%rdx
-
-# qhasm:   carry? rx1 += *(uint64 *)(pp + 40) + carry
-# asm 1: adcq 40(<pp=int64#2),<rx1=int64#4
-# asm 2: adcq 40(<pp=%rsi),<rx1=%rcx
-adcq 40(%rsi),%rcx
-
-# qhasm:   carry? rx2 += *(uint64 *)(pp + 48) + carry
-# asm 1: adcq 48(<pp=int64#2),<rx2=int64#5
-# asm 2: adcq 48(<pp=%rsi),<rx2=%r8
-adcq 48(%rsi),%r8
-
-# qhasm:   carry? rx3 += *(uint64 *)(pp + 56) + carry
-# asm 1: adcq 56(<pp=int64#2),<rx3=int64#6
-# asm 2: adcq 56(<pp=%rsi),<rx3=%r9
-adcq 56(%rsi),%r9
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#2
-# asm 2: mov  $0,>addt0=%rsi
-mov  $0,%rsi
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#7
-# asm 2: mov  $38,>addt1=%rax
-mov  $38,%rax
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#2,<addt1=int64#7
-# asm 2: cmovae <addt0=%rsi,<addt1=%rax
-cmovae %rsi,%rax
-
-# qhasm:   carry? rx0 += addt1
-# asm 1: add  <addt1=int64#7,<rx0=int64#3
-# asm 2: add  <addt1=%rax,<rx0=%rdx
-add  %rax,%rdx
-
-# qhasm:   carry? rx1 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx1=int64#4
-# asm 2: adc <addt0=%rsi,<rx1=%rcx
-adc %rsi,%rcx
-
-# qhasm:   carry? rx2 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx2=int64#5
-# asm 2: adc <addt0=%rsi,<rx2=%r8
-adc %rsi,%r8
-
-# qhasm:   carry? rx3 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx3=int64#6
-# asm 2: adc <addt0=%rsi,<rx3=%r9
-adc %rsi,%r9
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#7,<addt0=int64#2
-# asm 2: cmovc <addt1=%rax,<addt0=%rsi
-cmovc %rax,%rsi
-
-# qhasm:   rx0 += addt0
-# asm 1: add  <addt0=int64#2,<rx0=int64#3
-# asm 2: add  <addt0=%rsi,<rx0=%rdx
-add  %rsi,%rdx
-
-# qhasm: rx0_stack = rx0
-# asm 1: movq <rx0=int64#3,>rx0_stack=stack64#12
-# asm 2: movq <rx0=%rdx,>rx0_stack=88(%rsp)
-movq %rdx,88(%rsp)
-
-# qhasm: rx1_stack = rx1
-# asm 1: movq <rx1=int64#4,>rx1_stack=stack64#13
-# asm 2: movq <rx1=%rcx,>rx1_stack=96(%rsp)
-movq %rcx,96(%rsp)
-
-# qhasm: rx2_stack = rx2
-# asm 1: movq <rx2=int64#5,>rx2_stack=stack64#14
-# asm 2: movq <rx2=%r8,>rx2_stack=104(%rsp)
-movq %r8,104(%rsp)
-
-# qhasm: rx3_stack = rx3
-# asm 1: movq <rx3=int64#6,>rx3_stack=stack64#15
-# asm 2: movq <rx3=%r9,>rx3_stack=112(%rsp)
-movq %r9,112(%rsp)
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#2
-# asm 2: mov  $0,>squarer7=%rsi
-mov  $0,%rsi
-
-# qhasm:   squarerax = rx1_stack
-# asm 1: movq <rx1_stack=stack64#13,>squarerax=int64#7
-# asm 2: movq <rx1_stack=96(%rsp),>squarerax=%rax
-movq 96(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx0_stack
-# asm 1: mulq  <rx0_stack=stack64#12
-# asm 2: mulq  <rx0_stack=88(%rsp)
-mulq  88(%rsp)
-
-# qhasm:   rx1 = squarerax
-# asm 1: mov  <squarerax=int64#7,>rx1=int64#4
-# asm 2: mov  <squarerax=%rax,>rx1=%rcx
-mov  %rax,%rcx
-
-# qhasm:   rx2 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>rx2=int64#5
-# asm 2: mov  <squarerdx=%rdx,>rx2=%r8
-mov  %rdx,%r8
-
-# qhasm:   squarerax = rx2_stack
-# asm 1: movq <rx2_stack=stack64#14,>squarerax=int64#7
-# asm 2: movq <rx2_stack=104(%rsp),>squarerax=%rax
-movq 104(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx1_stack
-# asm 1: mulq  <rx1_stack=stack64#13
-# asm 2: mulq  <rx1_stack=96(%rsp)
-mulq  96(%rsp)
-
-# qhasm:   rx3 = squarerax 
-# asm 1: mov  <squarerax=int64#7,>rx3=int64#6
-# asm 2: mov  <squarerax=%rax,>rx3=%r9
-mov  %rax,%r9
-
-# qhasm:   squarer4 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer4=int64#8
-# asm 2: mov  <squarerdx=%rdx,>squarer4=%r10
-mov  %rdx,%r10
-
-# qhasm:   squarerax = rx3_stack
-# asm 1: movq <rx3_stack=stack64#15,>squarerax=int64#7
-# asm 2: movq <rx3_stack=112(%rsp),>squarerax=%rax
-movq 112(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx2_stack
-# asm 1: mulq  <rx2_stack=stack64#14
-# asm 2: mulq  <rx2_stack=104(%rsp)
-mulq  104(%rsp)
-
-# qhasm:   squarer5 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer5=int64#9
-# asm 2: mov  <squarerax=%rax,>squarer5=%r11
-mov  %rax,%r11
-
-# qhasm:   squarer6 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer6=int64#10
-# asm 2: mov  <squarerdx=%rdx,>squarer6=%r12
-mov  %rdx,%r12
-
-# qhasm:   squarerax = rx2_stack
-# asm 1: movq <rx2_stack=stack64#14,>squarerax=int64#7
-# asm 2: movq <rx2_stack=104(%rsp),>squarerax=%rax
-movq 104(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx0_stack
-# asm 1: mulq  <rx0_stack=stack64#12
-# asm 2: mulq  <rx0_stack=88(%rsp)
-mulq  88(%rsp)
-
-# qhasm:   carry? rx2 += squarerax
-# asm 1: add  <squarerax=int64#7,<rx2=int64#5
-# asm 2: add  <squarerax=%rax,<rx2=%r8
-add  %rax,%r8
-
-# qhasm:   carry? rx3 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<rx3=int64#6
-# asm 2: adc <squarerdx=%rdx,<rx3=%r9
-adc %rdx,%r9
-
-# qhasm:   squarer4 += 0 + carry
-# asm 1: adc $0,<squarer4=int64#8
-# asm 2: adc $0,<squarer4=%r10
-adc $0,%r10
-
-# qhasm:   squarerax = rx3_stack
-# asm 1: movq <rx3_stack=stack64#15,>squarerax=int64#7
-# asm 2: movq <rx3_stack=112(%rsp),>squarerax=%rax
-movq 112(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx1_stack
-# asm 1: mulq  <rx1_stack=stack64#13
-# asm 2: mulq  <rx1_stack=96(%rsp)
-mulq  96(%rsp)
-
-# qhasm:   carry? squarer4 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer4=int64#8
-# asm 2: add  <squarerax=%rax,<squarer4=%r10
-add  %rax,%r10
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#9
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r11
-adc %rdx,%r11
-
-# qhasm:   squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#10
-# asm 2: adc $0,<squarer6=%r12
-adc $0,%r12
-
-# qhasm:   squarerax = rx3_stack
-# asm 1: movq <rx3_stack=stack64#15,>squarerax=int64#7
-# asm 2: movq <rx3_stack=112(%rsp),>squarerax=%rax
-movq 112(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx0_stack
-# asm 1: mulq  <rx0_stack=stack64#12
-# asm 2: mulq  <rx0_stack=88(%rsp)
-mulq  88(%rsp)
-
-# qhasm:   carry? rx3 += squarerax
-# asm 1: add  <squarerax=int64#7,<rx3=int64#6
-# asm 2: add  <squarerax=%rax,<rx3=%r9
-add  %rax,%r9
-
-# qhasm:   carry? squarer4 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer4=int64#8
-# asm 2: adc <squarerdx=%rdx,<squarer4=%r10
-adc %rdx,%r10
-
-# qhasm:   carry? squarer5 += 0 + carry
-# asm 1: adc $0,<squarer5=int64#9
-# asm 2: adc $0,<squarer5=%r11
-adc $0,%r11
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#10
-# asm 2: adc $0,<squarer6=%r12
-adc $0,%r12
-
-# qhasm:   squarer7 += 0 + carry
-# asm 1: adc $0,<squarer7=int64#2
-# asm 2: adc $0,<squarer7=%rsi
-adc $0,%rsi
-
-# qhasm:   carry? rx1 += rx1
-# asm 1: add  <rx1=int64#4,<rx1=int64#4
-# asm 2: add  <rx1=%rcx,<rx1=%rcx
-add  %rcx,%rcx
-
-# qhasm:   carry? rx2 += rx2 + carry
-# asm 1: adc <rx2=int64#5,<rx2=int64#5
-# asm 2: adc <rx2=%r8,<rx2=%r8
-adc %r8,%r8
-
-# qhasm:   carry? rx3 += rx3 + carry
-# asm 1: adc <rx3=int64#6,<rx3=int64#6
-# asm 2: adc <rx3=%r9,<rx3=%r9
-adc %r9,%r9
-
-# qhasm:   carry? squarer4 += squarer4 + carry
-# asm 1: adc <squarer4=int64#8,<squarer4=int64#8
-# asm 2: adc <squarer4=%r10,<squarer4=%r10
-adc %r10,%r10
-
-# qhasm:   carry? squarer5 += squarer5 + carry
-# asm 1: adc <squarer5=int64#9,<squarer5=int64#9
-# asm 2: adc <squarer5=%r11,<squarer5=%r11
-adc %r11,%r11
-
-# qhasm:   carry? squarer6 += squarer6 + carry
-# asm 1: adc <squarer6=int64#10,<squarer6=int64#10
-# asm 2: adc <squarer6=%r12,<squarer6=%r12
-adc %r12,%r12
-
-# qhasm:   squarer7 += squarer7 + carry
-# asm 1: adc <squarer7=int64#2,<squarer7=int64#2
-# asm 2: adc <squarer7=%rsi,<squarer7=%rsi
-adc %rsi,%rsi
-
-# qhasm:   squarerax = rx0_stack
-# asm 1: movq <rx0_stack=stack64#12,>squarerax=int64#7
-# asm 2: movq <rx0_stack=88(%rsp),>squarerax=%rax
-movq 88(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx0_stack
-# asm 1: mulq  <rx0_stack=stack64#12
-# asm 2: mulq  <rx0_stack=88(%rsp)
-mulq  88(%rsp)
-
-# qhasm:   rx0 = squarerax
-# asm 1: mov  <squarerax=int64#7,>rx0=int64#11
-# asm 2: mov  <squarerax=%rax,>rx0=%r13
-mov  %rax,%r13
-
-# qhasm:   squaret1 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret1=int64#12
-# asm 2: mov  <squarerdx=%rdx,>squaret1=%r14
-mov  %rdx,%r14
-
-# qhasm:   squarerax = rx1_stack
-# asm 1: movq <rx1_stack=stack64#13,>squarerax=int64#7
-# asm 2: movq <rx1_stack=96(%rsp),>squarerax=%rax
-movq 96(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx1_stack
-# asm 1: mulq  <rx1_stack=stack64#13
-# asm 2: mulq  <rx1_stack=96(%rsp)
-mulq  96(%rsp)
-
-# qhasm:   squaret2 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squaret2=int64#13
-# asm 2: mov  <squarerax=%rax,>squaret2=%r15
-mov  %rax,%r15
-
-# qhasm:   squaret3 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squaret3=int64#14
-# asm 2: mov  <squarerdx=%rdx,>squaret3=%rbx
-mov  %rdx,%rbx
-
-# qhasm:   squarerax = rx2_stack
-# asm 1: movq <rx2_stack=stack64#14,>squarerax=int64#7
-# asm 2: movq <rx2_stack=104(%rsp),>squarerax=%rax
-movq 104(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx2_stack
-# asm 1: mulq  <rx2_stack=stack64#14
-# asm 2: mulq  <rx2_stack=104(%rsp)
-mulq  104(%rsp)
-
-# qhasm:   carry? rx1 += squaret1
-# asm 1: add  <squaret1=int64#12,<rx1=int64#4
-# asm 2: add  <squaret1=%r14,<rx1=%rcx
-add  %r14,%rcx
-
-# qhasm:   carry? rx2 += squaret2 + carry
-# asm 1: adc <squaret2=int64#13,<rx2=int64#5
-# asm 2: adc <squaret2=%r15,<rx2=%r8
-adc %r15,%r8
-
-# qhasm:   carry? rx3 += squaret3 + carry
-# asm 1: adc <squaret3=int64#14,<rx3=int64#6
-# asm 2: adc <squaret3=%rbx,<rx3=%r9
-adc %rbx,%r9
-
-# qhasm:   carry? squarer4 += squarerax + carry
-# asm 1: adc <squarerax=int64#7,<squarer4=int64#8
-# asm 2: adc <squarerax=%rax,<squarer4=%r10
-adc %rax,%r10
-
-# qhasm:   carry? squarer5 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer5=int64#9
-# asm 2: adc <squarerdx=%rdx,<squarer5=%r11
-adc %rdx,%r11
-
-# qhasm:   carry? squarer6 += 0 + carry
-# asm 1: adc $0,<squarer6=int64#10
-# asm 2: adc $0,<squarer6=%r12
-adc $0,%r12
-
-# qhasm:   squarer7 += 0 + carry 
-# asm 1: adc $0,<squarer7=int64#2
-# asm 2: adc $0,<squarer7=%rsi
-adc $0,%rsi
-
-# qhasm:   squarerax = rx3_stack
-# asm 1: movq <rx3_stack=stack64#15,>squarerax=int64#7
-# asm 2: movq <rx3_stack=112(%rsp),>squarerax=%rax
-movq 112(%rsp),%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * rx3_stack
-# asm 1: mulq  <rx3_stack=stack64#15
-# asm 2: mulq  <rx3_stack=112(%rsp)
-mulq  112(%rsp)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#10
-# asm 2: add  <squarerax=%rax,<squarer6=%r12
-add  %rax,%r12
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#2
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rsi
-adc %rdx,%rsi
-
-# qhasm:   squarerax = squarer4
-# asm 1: mov  <squarer4=int64#8,>squarerax=int64#7
-# asm 2: mov  <squarer4=%r10,>squarerax=%rax
-mov  %r10,%rax
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   squarer4 = squarerax
-# asm 1: mov  <squarerax=int64#7,>squarer4=int64#8
-# asm 2: mov  <squarerax=%rax,>squarer4=%r10
-mov  %rax,%r10
-
-# qhasm:   squarerax = squarer5
-# asm 1: mov  <squarer5=int64#9,>squarerax=int64#7
-# asm 2: mov  <squarer5=%r11,>squarerax=%rax
-mov  %r11,%rax
-
-# qhasm:   squarer5 = squarerdx
-# asm 1: mov  <squarerdx=int64#3,>squarer5=int64#9
-# asm 2: mov  <squarerdx=%rdx,>squarer5=%r11
-mov  %rdx,%r11
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer5 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer5=int64#9
-# asm 2: add  <squarerax=%rax,<squarer5=%r11
-add  %rax,%r11
-
-# qhasm:   squarerax = squarer6
-# asm 1: mov  <squarer6=int64#10,>squarerax=int64#7
-# asm 2: mov  <squarer6=%r12,>squarerax=%rax
-mov  %r12,%rax
-
-# qhasm:   squarer6 = 0
-# asm 1: mov  $0,>squarer6=int64#10
-# asm 2: mov  $0,>squarer6=%r12
-mov  $0,%r12
-
-# qhasm:   squarer6 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer6=int64#10
-# asm 2: adc <squarerdx=%rdx,<squarer6=%r12
-adc %rdx,%r12
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer6 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer6=int64#10
-# asm 2: add  <squarerax=%rax,<squarer6=%r12
-add  %rax,%r12
-
-# qhasm:   squarerax = squarer7
-# asm 1: mov  <squarer7=int64#2,>squarerax=int64#7
-# asm 2: mov  <squarer7=%rsi,>squarerax=%rax
-mov  %rsi,%rax
-
-# qhasm:   squarer7 = 0
-# asm 1: mov  $0,>squarer7=int64#2
-# asm 2: mov  $0,>squarer7=%rsi
-mov  $0,%rsi
-
-# qhasm:   squarer7 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer7=int64#2
-# asm 2: adc <squarerdx=%rdx,<squarer7=%rsi
-adc %rdx,%rsi
-
-# qhasm:   (uint128) squarerdx squarerax = squarerax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? squarer7 += squarerax
-# asm 1: add  <squarerax=int64#7,<squarer7=int64#2
-# asm 2: add  <squarerax=%rax,<squarer7=%rsi
-add  %rax,%rsi
-
-# qhasm:   squarer8 = 0
-# asm 1: mov  $0,>squarer8=int64#7
-# asm 2: mov  $0,>squarer8=%rax
-mov  $0,%rax
-
-# qhasm:   squarer8 += squarerdx + carry
-# asm 1: adc <squarerdx=int64#3,<squarer8=int64#7
-# asm 2: adc <squarerdx=%rdx,<squarer8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rx0 += squarer4
-# asm 1: add  <squarer4=int64#8,<rx0=int64#11
-# asm 2: add  <squarer4=%r10,<rx0=%r13
-add  %r10,%r13
-
-# qhasm:   carry? rx1 += squarer5 + carry
-# asm 1: adc <squarer5=int64#9,<rx1=int64#4
-# asm 2: adc <squarer5=%r11,<rx1=%rcx
-adc %r11,%rcx
-
-# qhasm:   carry? rx2 += squarer6 + carry
-# asm 1: adc <squarer6=int64#10,<rx2=int64#5
-# asm 2: adc <squarer6=%r12,<rx2=%r8
-adc %r12,%r8
-
-# qhasm:   carry? rx3 += squarer7 + carry
-# asm 1: adc <squarer7=int64#2,<rx3=int64#6
-# asm 2: adc <squarer7=%rsi,<rx3=%r9
-adc %rsi,%r9
-
-# qhasm:   squarezero = 0
-# asm 1: mov  $0,>squarezero=int64#2
-# asm 2: mov  $0,>squarezero=%rsi
-mov  $0,%rsi
-
-# qhasm:   squarer8 += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<squarer8=int64#7
-# asm 2: adc <squarezero=%rsi,<squarer8=%rax
-adc %rsi,%rax
-
-# qhasm:   squarer8 *= 38
-# asm 1: imulq  $38,<squarer8=int64#7,>squarer8=int64#3
-# asm 2: imulq  $38,<squarer8=%rax,>squarer8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? rx0 += squarer8
-# asm 1: add  <squarer8=int64#3,<rx0=int64#11
-# asm 2: add  <squarer8=%rdx,<rx0=%r13
-add  %rdx,%r13
-
-# qhasm:   carry? rx1 += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<rx1=int64#4
-# asm 2: adc <squarezero=%rsi,<rx1=%rcx
-adc %rsi,%rcx
-
-# qhasm:   carry? rx2 += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<rx2=int64#5
-# asm 2: adc <squarezero=%rsi,<rx2=%r8
-adc %rsi,%r8
-
-# qhasm:   carry? rx3 += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<rx3=int64#6
-# asm 2: adc <squarezero=%rsi,<rx3=%r9
-adc %rsi,%r9
-
-# qhasm:   squarezero += squarezero + carry
-# asm 1: adc <squarezero=int64#2,<squarezero=int64#2
-# asm 2: adc <squarezero=%rsi,<squarezero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   squarezero *= 38
-# asm 1: imulq  $38,<squarezero=int64#2,>squarezero=int64#2
-# asm 2: imulq  $38,<squarezero=%rsi,>squarezero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   rx0 += squarezero
-# asm 1: add  <squarezero=int64#2,<rx0=int64#11
-# asm 2: add  <squarezero=%rsi,<rx0=%r13
-add  %rsi,%r13
-
-# qhasm:   carry? rx0 += d0_stack 
-# asm 1: addq <d0_stack=stack64#8,<rx0=int64#11
-# asm 2: addq <d0_stack=56(%rsp),<rx0=%r13
-addq 56(%rsp),%r13
-
-# qhasm:   carry? rx1 += d1_stack + carry
-# asm 1: adcq <d1_stack=stack64#9,<rx1=int64#4
-# asm 2: adcq <d1_stack=64(%rsp),<rx1=%rcx
-adcq 64(%rsp),%rcx
-
-# qhasm:   carry? rx2 += d2_stack + carry
-# asm 1: adcq <d2_stack=stack64#10,<rx2=int64#5
-# asm 2: adcq <d2_stack=72(%rsp),<rx2=%r8
-adcq 72(%rsp),%r8
-
-# qhasm:   carry? rx3 += d3_stack + carry
-# asm 1: adcq <d3_stack=stack64#11,<rx3=int64#6
-# asm 2: adcq <d3_stack=80(%rsp),<rx3=%r9
-adcq 80(%rsp),%r9
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#2
-# asm 2: mov  $0,>addt0=%rsi
-mov  $0,%rsi
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#3
-# asm 2: mov  $38,>addt1=%rdx
-mov  $38,%rdx
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#2,<addt1=int64#3
-# asm 2: cmovae <addt0=%rsi,<addt1=%rdx
-cmovae %rsi,%rdx
-
-# qhasm:   carry? rx0 += addt1
-# asm 1: add  <addt1=int64#3,<rx0=int64#11
-# asm 2: add  <addt1=%rdx,<rx0=%r13
-add  %rdx,%r13
-
-# qhasm:   carry? rx1 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx1=int64#4
-# asm 2: adc <addt0=%rsi,<rx1=%rcx
-adc %rsi,%rcx
-
-# qhasm:   carry? rx2 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx2=int64#5
-# asm 2: adc <addt0=%rsi,<rx2=%r8
-adc %rsi,%r8
-
-# qhasm:   carry? rx3 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx3=int64#6
-# asm 2: adc <addt0=%rsi,<rx3=%r9
-adc %rsi,%r9
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#3,<addt0=int64#2
-# asm 2: cmovc <addt1=%rdx,<addt0=%rsi
-cmovc %rdx,%rsi
-
-# qhasm:   rx0 += addt0
-# asm 1: add  <addt0=int64#2,<rx0=int64#11
-# asm 2: add  <addt0=%rsi,<rx0=%r13
-add  %rsi,%r13
-
-# qhasm:   carry? rx0 += e0_stack 
-# asm 1: addq <e0_stack=stack64#20,<rx0=int64#11
-# asm 2: addq <e0_stack=152(%rsp),<rx0=%r13
-addq 152(%rsp),%r13
-
-# qhasm:   carry? rx1 += e1_stack + carry
-# asm 1: adcq <e1_stack=stack64#21,<rx1=int64#4
-# asm 2: adcq <e1_stack=160(%rsp),<rx1=%rcx
-adcq 160(%rsp),%rcx
-
-# qhasm:   carry? rx2 += e2_stack + carry
-# asm 1: adcq <e2_stack=stack64#22,<rx2=int64#5
-# asm 2: adcq <e2_stack=168(%rsp),<rx2=%r8
-adcq 168(%rsp),%r8
-
-# qhasm:   carry? rx3 += e3_stack + carry
-# asm 1: adcq <e3_stack=stack64#23,<rx3=int64#6
-# asm 2: adcq <e3_stack=176(%rsp),<rx3=%r9
-adcq 176(%rsp),%r9
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#2
-# asm 2: mov  $0,>addt0=%rsi
-mov  $0,%rsi
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#3
-# asm 2: mov  $38,>addt1=%rdx
-mov  $38,%rdx
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#2,<addt1=int64#3
-# asm 2: cmovae <addt0=%rsi,<addt1=%rdx
-cmovae %rsi,%rdx
-
-# qhasm:   carry? rx0 += addt1
-# asm 1: add  <addt1=int64#3,<rx0=int64#11
-# asm 2: add  <addt1=%rdx,<rx0=%r13
-add  %rdx,%r13
-
-# qhasm:   carry? rx1 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx1=int64#4
-# asm 2: adc <addt0=%rsi,<rx1=%rcx
-adc %rsi,%rcx
-
-# qhasm:   carry? rx2 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx2=int64#5
-# asm 2: adc <addt0=%rsi,<rx2=%r8
-adc %rsi,%r8
-
-# qhasm:   carry? rx3 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rx3=int64#6
-# asm 2: adc <addt0=%rsi,<rx3=%r9
-adc %rsi,%r9
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#3,<addt0=int64#2
-# asm 2: cmovc <addt1=%rdx,<addt0=%rsi
-cmovc %rdx,%rsi
-
-# qhasm:   rx0 += addt0
-# asm 1: add  <addt0=int64#2,<rx0=int64#11
-# asm 2: add  <addt0=%rsi,<rx0=%r13
-add  %rsi,%r13
-
-# qhasm: *(uint64 *)(rp + 0) = rx0
-# asm 1: movq   <rx0=int64#11,0(<rp=int64#1)
-# asm 2: movq   <rx0=%r13,0(<rp=%rdi)
-movq   %r13,0(%rdi)
-
-# qhasm: *(uint64 *)(rp + 8) = rx1
-# asm 1: movq   <rx1=int64#4,8(<rp=int64#1)
-# asm 2: movq   <rx1=%rcx,8(<rp=%rdi)
-movq   %rcx,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = rx2
-# asm 1: movq   <rx2=int64#5,16(<rp=int64#1)
-# asm 2: movq   <rx2=%r8,16(<rp=%rdi)
-movq   %r8,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = rx3
-# asm 1: movq   <rx3=int64#6,24(<rp=int64#1)
-# asm 2: movq   <rx3=%r9,24(<rp=%rdi)
-movq   %r9,24(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/ge25519_double.c b/ext/ed25519-amd64-asm/ge25519_double.c
deleted file mode 100644
index d55e2b4f8..000000000
--- a/ext/ed25519-amd64-asm/ge25519_double.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "ge25519.h"
-
-void ge25519_double(ge25519_p3 *r, const ge25519_p3 *p)
-{
-  ge25519_p1p1 grp1p1;
-  ge25519_dbl_p1p1(&grp1p1, (ge25519_p2 *)p);
-  ge25519_p1p1_to_p3(r, &grp1p1);
-}
diff --git a/ext/ed25519-amd64-asm/ge25519_double_scalarmult.c b/ext/ed25519-amd64-asm/ge25519_double_scalarmult.c
deleted file mode 100644
index 30c922af5..000000000
--- a/ext/ed25519-amd64-asm/ge25519_double_scalarmult.c
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "fe25519.h"
-#include "sc25519.h"
-#include "ge25519.h"
-
-#define S1_SWINDOWSIZE 5
-#define PRE1_SIZE (1<<(S1_SWINDOWSIZE-2))
-#define S2_SWINDOWSIZE 7
-#define PRE2_SIZE (1<<(S2_SWINDOWSIZE-2))
-
-ge25519_niels pre2[PRE2_SIZE] = {
-#include "ge25519_base_slide_multiples.data"
-};
-
-static const fe25519 ec2d = {{0xEBD69B9426B2F146, 0x00E0149A8283B156, 0x198E80F2EEF3D130, 0xA406D9DC56DFFCE7}};
-
-static void setneutral(ge25519 *r)
-{
-  fe25519_setint(&r->x,0);
-  fe25519_setint(&r->y,1);
-  fe25519_setint(&r->z,1);
-  fe25519_setint(&r->t,0);
-}
-
-/* computes [s1]p1 + [s2]p2 */
-void ge25519_double_scalarmult_vartime(ge25519_p3 *r, const ge25519_p3 *p1, const sc25519 *s1, const sc25519 *s2)
-{
-  signed char slide1[256], slide2[256];
-  ge25519_pniels pre1[PRE1_SIZE], neg;
-  ge25519_p3 d1;
-  ge25519_p1p1 t;
-  ge25519_niels nneg;
-  fe25519 d;
-  int i;
-  
-  sc25519_slide(slide1, s1, S1_SWINDOWSIZE);
-  sc25519_slide(slide2, s2, S2_SWINDOWSIZE);
-
-  /* precomputation */
-  pre1[0] = *(ge25519_pniels *)p1;                                                                         
-  ge25519_dbl_p1p1(&t,(ge25519_p2 *)pre1);      ge25519_p1p1_to_p3(&d1, &t);
-  /* Convert pre[0] to projective Niels representation */
-  d = pre1[0].ysubx;
-  fe25519_sub(&pre1[0].ysubx, &pre1[0].xaddy, &pre1[0].ysubx);
-  fe25519_add(&pre1[0].xaddy, &pre1[0].xaddy, &d);
-  fe25519_mul(&pre1[0].t2d, &pre1[0].t2d, &ec2d);
-
-  for(i=0;i<PRE1_SIZE-1;i++)
-  {
-    ge25519_pnielsadd_p1p1(&t, &d1, &pre1[i]);  ge25519_p1p1_to_p3((ge25519_p3 *)&pre1[i+1], &t);
-    /* Convert pre1[i+1] to projective Niels representation */
-    d = pre1[i+1].ysubx;
-    fe25519_sub(&pre1[i+1].ysubx, &pre1[i+1].xaddy, &pre1[i+1].ysubx);
-    fe25519_add(&pre1[i+1].xaddy, &pre1[i+1].xaddy, &d);
-    fe25519_mul(&pre1[i+1].t2d, &pre1[i+1].t2d, &ec2d);
-  }
-
-  setneutral(r);
-  for (i = 255;i >= 0;--i) {
-    if (slide1[i] || slide2[i]) goto firstbit;
-  }
-
-  for(;i>=0;i--)
-  {
-    firstbit:
-
-    ge25519_dbl_p1p1(&t, (ge25519_p2 *)r);
-
-    if(slide1[i]>0)
-    {
-      ge25519_p1p1_to_p3(r, &t);
-      ge25519_pnielsadd_p1p1(&t, r, &pre1[slide1[i]/2]);
-    }
-    else if(slide1[i]<0)
-    {
-      ge25519_p1p1_to_p3(r, &t);
-      neg = pre1[-slide1[i]/2];
-      d = neg.ysubx;
-      neg.ysubx = neg.xaddy;
-      neg.xaddy = d;
-      fe25519_neg(&neg.t2d, &neg.t2d);
-      ge25519_pnielsadd_p1p1(&t, r, &neg);
-    }
-
-    if(slide2[i]>0)
-    {
-      ge25519_p1p1_to_p3(r, &t);
-      ge25519_nielsadd_p1p1(&t, r, &pre2[slide2[i]/2]);
-    }
-    else if(slide2[i]<0)
-    {
-      ge25519_p1p1_to_p3(r, &t);
-      nneg = pre2[-slide2[i]/2];
-      d = nneg.ysubx;
-      nneg.ysubx = nneg.xaddy;
-      nneg.xaddy = d;
-      fe25519_neg(&nneg.t2d, &nneg.t2d);
-      ge25519_nielsadd_p1p1(&t, r, &nneg);
-    }
-
-    ge25519_p1p1_to_p2((ge25519_p2 *)r, &t);
-  }
-}
diff --git a/ext/ed25519-amd64-asm/ge25519_isneutral.c b/ext/ed25519-amd64-asm/ge25519_isneutral.c
deleted file mode 100644
index cf566dbae..000000000
--- a/ext/ed25519-amd64-asm/ge25519_isneutral.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "fe25519.h"
-#include "ge25519.h"
-
-int ge25519_isneutral_vartime(const ge25519_p3 *p)
-{
-  if(!fe25519_iszero_vartime(&p->x)) return 0;
-  if(!fe25519_iseq_vartime(&p->y, &p->z)) return 0;
-  return 1;
-}
diff --git a/ext/ed25519-amd64-asm/ge25519_multi_scalarmult.c b/ext/ed25519-amd64-asm/ge25519_multi_scalarmult.c
deleted file mode 100644
index afc6aeae5..000000000
--- a/ext/ed25519-amd64-asm/ge25519_multi_scalarmult.c
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "fe25519.h"
-#include "sc25519.h"
-#include "ge25519.h"
-#include "index_heap.h"
-
-static void setneutral(ge25519 *r)
-{
-  fe25519_setint(&r->x,0);
-  fe25519_setint(&r->y,1);
-  fe25519_setint(&r->z,1);
-  fe25519_setint(&r->t,0);
-}
-
-static void ge25519_scalarmult_vartime_2limbs(ge25519 *r, ge25519 *p, sc25519 *s)
-{
-  if (s->v[1] == 0 && s->v[0] == 1) /* This will happen most of the time after Bos-Coster */
-    *r = *p; 
-  else if (s->v[1] == 0 && s->v[0] == 0) /* This won't ever happen, except for all scalars == 0 in Bos-Coster */
-    setneutral(r);
-  else
-  {
-    ge25519 d;
-    unsigned long long mask = (1ULL << 63);
-    int i = 1;
-    while(!(mask & s->v[1]) && mask != 0)
-      mask >>= 1;
-    if(mask == 0)
-    {
-      mask = (1ULL << 63);
-      i = 0;
-      while(!(mask & s->v[0]) && mask != 0)
-        mask >>= 1;
-    }
-    d = *p;
-    mask >>= 1;
-    for(;mask != 0;mask >>= 1)
-    {
-      ge25519_double(&d,&d);
-      if(s->v[i] & mask)
-        ge25519_add(&d,&d,p);
-    }
-    if(i==1)
-    {
-      mask = (1ULL << 63);
-      for(;mask != 0;mask >>= 1)
-      {
-        ge25519_double(&d,&d);
-        if(s->v[0] & mask)
-          ge25519_add(&d,&d,p);
-      }
-    }
-    *r = d;
-  }
-}
-
-/* caller's responsibility to ensure npoints >= 5 */
-void ge25519_multi_scalarmult_vartime(ge25519_p3 *r, ge25519_p3 *p, sc25519 *s, const unsigned long long npoints)
-{
-  unsigned long long pos[npoints];
-  unsigned long long hlen=((npoints+1)/2)|1;
-  unsigned long long max1, max2,i;
-
-  heap_init(pos, hlen, s);
-  
-  for(i=0;;i++)
-  {
-    heap_get2max(pos, &max1, &max2, s);
-    if((s[max1].v[3] == 0) || (sc25519_iszero_vartime(&s[max2]))) break;
-    sc25519_sub_nored(&s[max1],&s[max1],&s[max2]);
-    ge25519_add(&p[max2],&p[max2],&p[max1]);
-    heap_rootreplaced(pos, hlen, s);
-  }
-  for(;;i++)
-  {
-    heap_get2max(pos, &max1, &max2, s);
-    if((s[max1].v[2] == 0) || (sc25519_iszero_vartime(&s[max2]))) break;
-    sc25519_sub_nored(&s[max1],&s[max1],&s[max2]);
-    ge25519_add(&p[max2],&p[max2],&p[max1]);
-    heap_rootreplaced_3limbs(pos, hlen, s);
-  }
-  /* We know that (npoints-1)/2 scalars are only 128-bit scalars */
-  heap_extend(pos, hlen, npoints, s);
-  hlen = npoints;
-  for(;;i++)
-  {
-    heap_get2max(pos, &max1, &max2, s);
-    if((s[max1].v[1] == 0) || (sc25519_iszero_vartime(&s[max2]))) break;
-    sc25519_sub_nored(&s[max1],&s[max1],&s[max2]);
-    ge25519_add(&p[max2],&p[max2],&p[max1]);
-    heap_rootreplaced_2limbs(pos, hlen, s);
-  }
-  for(;;i++)
-  {
-    heap_get2max(pos, &max1, &max2, s);
-    if(sc25519_iszero_vartime(&s[max2])) break;
-    sc25519_sub_nored(&s[max1],&s[max1],&s[max2]);
-    ge25519_add(&p[max2],&p[max2],&p[max1]);
-    heap_rootreplaced_1limb(pos, hlen, s);
-  }
-
-  ge25519_scalarmult_vartime_2limbs(r, &p[max1], &s[max1]);
-}
diff --git a/ext/ed25519-amd64-asm/ge25519_nielsadd2.s b/ext/ed25519-amd64-asm/ge25519_nielsadd2.s
deleted file mode 100644
index 19d71f11a..000000000
--- a/ext/ed25519-amd64-asm/ge25519_nielsadd2.s
+++ /dev/null
@@ -1,5791 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 qp
-
-# qhasm: input rp
-
-# qhasm: input qp
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 a0
-
-# qhasm: int64 a1
-
-# qhasm: int64 a2
-
-# qhasm: int64 a3
-
-# qhasm: stack64 a0_stack
-
-# qhasm: stack64 a1_stack
-
-# qhasm: stack64 a2_stack
-
-# qhasm: stack64 a3_stack
-
-# qhasm: int64 b0
-
-# qhasm: int64 b1
-
-# qhasm: int64 b2
-
-# qhasm: int64 b3
-
-# qhasm: stack64 b0_stack
-
-# qhasm: stack64 b1_stack
-
-# qhasm: stack64 b2_stack
-
-# qhasm: stack64 b3_stack
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: stack64 c0_stack
-
-# qhasm: stack64 c1_stack
-
-# qhasm: stack64 c2_stack
-
-# qhasm: stack64 c3_stack
-
-# qhasm: int64 d0
-
-# qhasm: int64 d1
-
-# qhasm: int64 d2
-
-# qhasm: int64 d3
-
-# qhasm: stack64 d0_stack
-
-# qhasm: stack64 d1_stack
-
-# qhasm: stack64 d2_stack
-
-# qhasm: stack64 d3_stack
-
-# qhasm: int64 e0
-
-# qhasm: int64 e1
-
-# qhasm: int64 e2
-
-# qhasm: int64 e3
-
-# qhasm: stack64 e0_stack
-
-# qhasm: stack64 e1_stack
-
-# qhasm: stack64 e2_stack
-
-# qhasm: stack64 e3_stack
-
-# qhasm: int64 f0
-
-# qhasm: int64 f1
-
-# qhasm: int64 f2
-
-# qhasm: int64 f3
-
-# qhasm: stack64 f0_stack
-
-# qhasm: stack64 f1_stack
-
-# qhasm: stack64 f2_stack
-
-# qhasm: stack64 f3_stack
-
-# qhasm: int64 g0
-
-# qhasm: int64 g1
-
-# qhasm: int64 g2
-
-# qhasm: int64 g3
-
-# qhasm: stack64 g0_stack
-
-# qhasm: stack64 g1_stack
-
-# qhasm: stack64 g2_stack
-
-# qhasm: stack64 g3_stack
-
-# qhasm: int64 h0
-
-# qhasm: int64 h1
-
-# qhasm: int64 h2
-
-# qhasm: int64 h3
-
-# qhasm: stack64 h0_stack
-
-# qhasm: stack64 h1_stack
-
-# qhasm: stack64 h2_stack
-
-# qhasm: stack64 h3_stack
-
-# qhasm: int64 qt0
-
-# qhasm: int64 qt1
-
-# qhasm: int64 qt2
-
-# qhasm: int64 qt3
-
-# qhasm: stack64 qt0_stack
-
-# qhasm: stack64 qt1_stack
-
-# qhasm: stack64 qt2_stack
-
-# qhasm: stack64 qt3_stack
-
-# qhasm: int64 t10
-
-# qhasm: int64 t11
-
-# qhasm: int64 t12
-
-# qhasm: int64 t13
-
-# qhasm: stack64 t10_stack
-
-# qhasm: stack64 t11_stack
-
-# qhasm: stack64 t12_stack
-
-# qhasm: stack64 t13_stack
-
-# qhasm: int64 t20
-
-# qhasm: int64 t21
-
-# qhasm: int64 t22
-
-# qhasm: int64 t23
-
-# qhasm: stack64 t20_stack
-
-# qhasm: stack64 t21_stack
-
-# qhasm: stack64 t22_stack
-
-# qhasm: stack64 t23_stack
-
-# qhasm: int64 rx0
-
-# qhasm: int64 rx1
-
-# qhasm: int64 rx2
-
-# qhasm: int64 rx3
-
-# qhasm: int64 ry0
-
-# qhasm: int64 ry1
-
-# qhasm: int64 ry2
-
-# qhasm: int64 ry3
-
-# qhasm: int64 rz0
-
-# qhasm: int64 rz1
-
-# qhasm: int64 rz2
-
-# qhasm: int64 rz3
-
-# qhasm: int64 rt0
-
-# qhasm: int64 rt1
-
-# qhasm: int64 rt2
-
-# qhasm: int64 rt3
-
-# qhasm: int64 mulr4
-
-# qhasm: int64 mulr5
-
-# qhasm: int64 mulr6
-
-# qhasm: int64 mulr7
-
-# qhasm: int64 mulr8
-
-# qhasm: int64 mulrax
-
-# qhasm: int64 mulrdx
-
-# qhasm: int64 mulx0
-
-# qhasm: int64 mulx1
-
-# qhasm: int64 mulx2
-
-# qhasm: int64 mulx3
-
-# qhasm: int64 mulc
-
-# qhasm: int64 mulzero
-
-# qhasm: int64 muli38
-
-# qhasm: int64 addt0
-
-# qhasm: int64 addt1
-
-# qhasm: int64 subt0
-
-# qhasm: int64 subt1
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_nielsadd2
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_nielsadd2
-.globl crypto_sign_ed25519_amd64_64_ge25519_nielsadd2
-_crypto_sign_ed25519_amd64_64_ge25519_nielsadd2:
-crypto_sign_ed25519_amd64_64_ge25519_nielsadd2:
-mov %rsp,%r11
-and $31,%r11
-add $192,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: a0 = *(uint64 *)(rp + 32)
-# asm 1: movq   32(<rp=int64#1),>a0=int64#3
-# asm 2: movq   32(<rp=%rdi),>a0=%rdx
-movq   32(%rdi),%rdx
-
-# qhasm: a1 = *(uint64 *)(rp + 40)
-# asm 1: movq   40(<rp=int64#1),>a1=int64#4
-# asm 2: movq   40(<rp=%rdi),>a1=%rcx
-movq   40(%rdi),%rcx
-
-# qhasm: a2 = *(uint64 *)(rp + 48)
-# asm 1: movq   48(<rp=int64#1),>a2=int64#5
-# asm 2: movq   48(<rp=%rdi),>a2=%r8
-movq   48(%rdi),%r8
-
-# qhasm: a3 = *(uint64 *)(rp + 56)
-# asm 1: movq   56(<rp=int64#1),>a3=int64#6
-# asm 2: movq   56(<rp=%rdi),>a3=%r9
-movq   56(%rdi),%r9
-
-# qhasm: b0 = a0
-# asm 1: mov  <a0=int64#3,>b0=int64#7
-# asm 2: mov  <a0=%rdx,>b0=%rax
-mov  %rdx,%rax
-
-# qhasm: b1 = a1
-# asm 1: mov  <a1=int64#4,>b1=int64#8
-# asm 2: mov  <a1=%rcx,>b1=%r10
-mov  %rcx,%r10
-
-# qhasm: b2 = a2
-# asm 1: mov  <a2=int64#5,>b2=int64#9
-# asm 2: mov  <a2=%r8,>b2=%r11
-mov  %r8,%r11
-
-# qhasm: b3 = a3
-# asm 1: mov  <a3=int64#6,>b3=int64#10
-# asm 2: mov  <a3=%r9,>b3=%r12
-mov  %r9,%r12
-
-# qhasm:   carry? a0 -= *(uint64 *) (rp + 0) 
-# asm 1: subq 0(<rp=int64#1),<a0=int64#3
-# asm 2: subq 0(<rp=%rdi),<a0=%rdx
-subq 0(%rdi),%rdx
-
-# qhasm:   carry? a1 -= *(uint64 *) (rp + 8) - carry
-# asm 1: sbbq 8(<rp=int64#1),<a1=int64#4
-# asm 2: sbbq 8(<rp=%rdi),<a1=%rcx
-sbbq 8(%rdi),%rcx
-
-# qhasm:   carry? a2 -= *(uint64 *) (rp + 16) - carry
-# asm 1: sbbq 16(<rp=int64#1),<a2=int64#5
-# asm 2: sbbq 16(<rp=%rdi),<a2=%r8
-sbbq 16(%rdi),%r8
-
-# qhasm:   carry? a3 -= *(uint64 *) (rp + 24) - carry
-# asm 1: sbbq 24(<rp=int64#1),<a3=int64#6
-# asm 2: sbbq 24(<rp=%rdi),<a3=%r9
-sbbq 24(%rdi),%r9
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#11
-# asm 2: mov  $0,>subt0=%r13
-mov  $0,%r13
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#12
-# asm 2: mov  $38,>subt1=%r14
-mov  $38,%r14
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#11,<subt1=int64#12
-# asm 2: cmovae <subt0=%r13,<subt1=%r14
-cmovae %r13,%r14
-
-# qhasm:   carry? a0 -= subt1
-# asm 1: sub  <subt1=int64#12,<a0=int64#3
-# asm 2: sub  <subt1=%r14,<a0=%rdx
-sub  %r14,%rdx
-
-# qhasm:   carry? a1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<a1=int64#4
-# asm 2: sbb  <subt0=%r13,<a1=%rcx
-sbb  %r13,%rcx
-
-# qhasm:   carry? a2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<a2=int64#5
-# asm 2: sbb  <subt0=%r13,<a2=%r8
-sbb  %r13,%r8
-
-# qhasm:   carry? a3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#11,<a3=int64#6
-# asm 2: sbb  <subt0=%r13,<a3=%r9
-sbb  %r13,%r9
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#12,<subt0=int64#11
-# asm 2: cmovc <subt1=%r14,<subt0=%r13
-cmovc %r14,%r13
-
-# qhasm:   a0 -= subt0
-# asm 1: sub  <subt0=int64#11,<a0=int64#3
-# asm 2: sub  <subt0=%r13,<a0=%rdx
-sub  %r13,%rdx
-
-# qhasm:   carry? b0 += *(uint64 *) (rp + 0) 
-# asm 1: addq 0(<rp=int64#1),<b0=int64#7
-# asm 2: addq 0(<rp=%rdi),<b0=%rax
-addq 0(%rdi),%rax
-
-# qhasm:   carry? b1 += *(uint64 *) (rp + 8) + carry
-# asm 1: adcq 8(<rp=int64#1),<b1=int64#8
-# asm 2: adcq 8(<rp=%rdi),<b1=%r10
-adcq 8(%rdi),%r10
-
-# qhasm:   carry? b2 += *(uint64 *) (rp + 16) + carry
-# asm 1: adcq 16(<rp=int64#1),<b2=int64#9
-# asm 2: adcq 16(<rp=%rdi),<b2=%r11
-adcq 16(%rdi),%r11
-
-# qhasm:   carry? b3 += *(uint64 *) (rp + 24) + carry
-# asm 1: adcq 24(<rp=int64#1),<b3=int64#10
-# asm 2: adcq 24(<rp=%rdi),<b3=%r12
-adcq 24(%rdi),%r12
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#11
-# asm 2: mov  $0,>addt0=%r13
-mov  $0,%r13
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#12
-# asm 2: mov  $38,>addt1=%r14
-mov  $38,%r14
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#11,<addt1=int64#12
-# asm 2: cmovae <addt0=%r13,<addt1=%r14
-cmovae %r13,%r14
-
-# qhasm:   carry? b0 += addt1
-# asm 1: add  <addt1=int64#12,<b0=int64#7
-# asm 2: add  <addt1=%r14,<b0=%rax
-add  %r14,%rax
-
-# qhasm:   carry? b1 += addt0 + carry
-# asm 1: adc <addt0=int64#11,<b1=int64#8
-# asm 2: adc <addt0=%r13,<b1=%r10
-adc %r13,%r10
-
-# qhasm:   carry? b2 += addt0 + carry
-# asm 1: adc <addt0=int64#11,<b2=int64#9
-# asm 2: adc <addt0=%r13,<b2=%r11
-adc %r13,%r11
-
-# qhasm:   carry? b3 += addt0 + carry
-# asm 1: adc <addt0=int64#11,<b3=int64#10
-# asm 2: adc <addt0=%r13,<b3=%r12
-adc %r13,%r12
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#12,<addt0=int64#11
-# asm 2: cmovc <addt1=%r14,<addt0=%r13
-cmovc %r14,%r13
-
-# qhasm:   b0 += addt0
-# asm 1: add  <addt0=int64#11,<b0=int64#7
-# asm 2: add  <addt0=%r13,<b0=%rax
-add  %r13,%rax
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#3,>a0_stack=stack64#8
-# asm 2: movq <a0=%rdx,>a0_stack=56(%rsp)
-movq %rdx,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#4,>a1_stack=stack64#9
-# asm 2: movq <a1=%rcx,>a1_stack=64(%rsp)
-movq %rcx,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#5,>a2_stack=stack64#10
-# asm 2: movq <a2=%r8,>a2_stack=72(%rsp)
-movq %r8,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#6,>a3_stack=stack64#11
-# asm 2: movq <a3=%r9,>a3_stack=80(%rsp)
-movq %r9,80(%rsp)
-
-# qhasm: b0_stack = b0
-# asm 1: movq <b0=int64#7,>b0_stack=stack64#12
-# asm 2: movq <b0=%rax,>b0_stack=88(%rsp)
-movq %rax,88(%rsp)
-
-# qhasm: b1_stack = b1
-# asm 1: movq <b1=int64#8,>b1_stack=stack64#13
-# asm 2: movq <b1=%r10,>b1_stack=96(%rsp)
-movq %r10,96(%rsp)
-
-# qhasm: b2_stack = b2
-# asm 1: movq <b2=int64#9,>b2_stack=stack64#14
-# asm 2: movq <b2=%r11,>b2_stack=104(%rsp)
-movq %r11,104(%rsp)
-
-# qhasm: b3_stack = b3
-# asm 1: movq <b3=int64#10,>b3_stack=stack64#15
-# asm 2: movq <b3=%r12,>b3_stack=112(%rsp)
-movq %r12,112(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = a0_stack
-# asm 1: movq <a0_stack=stack64#8,>mulx0=int64#9
-# asm 2: movq <a0_stack=56(%rsp),>mulx0=%r11
-movq 56(%rsp),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rsi),>mulrax=%rax
-movq   0(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   a0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>a0=int64#10
-# asm 2: mov  <mulrax=%rax,>a0=%r12
-mov  %rax,%r12
-
-# qhasm:   a1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>a1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>a1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rsi),>mulrax=%rax
-movq   8(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? a1 += mulrax
-# asm 1: add  <mulrax=int64#7,<a1=int64#11
-# asm 2: add  <mulrax=%rax,<a1=%r13
-add  %rax,%r13
-
-# qhasm:   a2 = 0
-# asm 1: mov  $0,>a2=int64#12
-# asm 2: mov  $0,>a2=%r14
-mov  $0,%r14
-
-# qhasm:   a2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<a2=int64#12
-# asm 2: adc <mulrdx=%rdx,<a2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rsi),>mulrax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#12
-# asm 2: add  <mulrax=%rax,<a2=%r14
-add  %rax,%r14
-
-# qhasm:   a3 = 0
-# asm 1: mov  $0,>a3=int64#13
-# asm 2: mov  $0,>a3=%r15
-mov  $0,%r15
-
-# qhasm:   a3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<a3=int64#13
-# asm 2: adc <mulrdx=%rdx,<a3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rsi),>mulrax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#13
-# asm 2: add  <mulrax=%rax,<a3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = a1_stack
-# asm 1: movq <a1_stack=stack64#9,>mulx1=int64#9
-# asm 2: movq <a1_stack=64(%rsp),>mulx1=%r11
-movq 64(%rsp),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rsi),>mulrax=%rax
-movq   0(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? a1 += mulrax
-# asm 1: add  <mulrax=int64#7,<a1=int64#11
-# asm 2: add  <mulrax=%rax,<a1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rsi),>mulrax=%rax
-movq   8(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#12
-# asm 2: add  <mulrax=%rax,<a2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a2 += mulc
-# asm 1: add  <mulc=int64#14,<a2=int64#12
-# asm 2: add  <mulc=%rbx,<a2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rsi),>mulrax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? a3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<a3=int64#13
-# asm 2: add  <mulrax=%rax,<a3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a3 += mulc
-# asm 1: add  <mulc=int64#14,<a3=int64#13
-# asm 2: add  <mulc=%rbx,<a3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rsi),>mulrax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = a2_stack
-# asm 1: movq <a2_stack=stack64#10,>mulx2=int64#9
-# asm 2: movq <a2_stack=72(%rsp),>mulx2=%r11
-movq 72(%rsp),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rsi),>mulrax=%rax
-movq   0(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#12
-# asm 2: add  <mulrax=%rax,<a2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rsi),>mulrax=%rax
-movq   8(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#13
-# asm 2: add  <mulrax=%rax,<a3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a3 += mulc
-# asm 1: add  <mulc=int64#14,<a3=int64#13
-# asm 2: add  <mulc=%rbx,<a3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rsi),>mulrax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rsi),>mulrax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = a3_stack
-# asm 1: movq <a3_stack=stack64#11,>mulx3=int64#9
-# asm 2: movq <a3_stack=80(%rsp),>mulx3=%r11
-movq 80(%rsp),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rsi),>mulrax=%rax
-movq   0(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#13
-# asm 2: add  <mulrax=%rax,<a3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rsi),>mulrax=%rax
-movq   8(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rsi),>mulrax=%rax
-movq   16(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rsi),>mulrax=%rax
-movq   24(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
-# asm 2: mov  <mulrax=%rax,>mulr4=%rcx
-mov  %rax,%rcx
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#5
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
-mov  %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#8
-# asm 2: add  <mulrax=%rax,<mulr7=%r10
-add  %rax,%r10
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? a0 += mulr4
-# asm 1: add  <mulr4=int64#4,<a0=int64#10
-# asm 2: add  <mulr4=%rcx,<a0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? a1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#5,<a1=int64#11
-# asm 2: adc <mulr5=%r8,<a1=%r13
-adc %r8,%r13
-
-# qhasm:   carry? a2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#6,<a2=int64#12
-# asm 2: adc <mulr6=%r9,<a2=%r14
-adc %r9,%r14
-
-# qhasm:   carry? a3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#8,<a3=int64#13
-# asm 2: adc <mulr7=%r10,<a3=%r15
-adc %r10,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#4
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? a0 += mulr8
-# asm 1: add  <mulr8=int64#4,<a0=int64#10
-# asm 2: add  <mulr8=%rcx,<a0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? a1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a1=int64#11
-# asm 2: adc <mulzero=%rdx,<a1=%r13
-adc %rdx,%r13
-
-# qhasm:   carry? a2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a2=int64#12
-# asm 2: adc <mulzero=%rdx,<a2=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? a3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a3=int64#13
-# asm 2: adc <mulzero=%rdx,<a3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   a0 += mulzero
-# asm 1: add  <mulzero=int64#3,<a0=int64#10
-# asm 2: add  <mulzero=%rdx,<a0=%r12
-add  %rdx,%r12
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#10,>a0_stack=stack64#8
-# asm 2: movq <a0=%r12,>a0_stack=56(%rsp)
-movq %r12,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#11,>a1_stack=stack64#9
-# asm 2: movq <a1=%r13,>a1_stack=64(%rsp)
-movq %r13,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#12,>a2_stack=stack64#10
-# asm 2: movq <a2=%r14,>a2_stack=72(%rsp)
-movq %r14,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#13,>a3_stack=stack64#11
-# asm 2: movq <a3=%r15,>a3_stack=80(%rsp)
-movq %r15,80(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = b0_stack
-# asm 1: movq <b0_stack=stack64#12,>mulx0=int64#9
-# asm 2: movq <b0_stack=88(%rsp),>mulx0=%r11
-movq 88(%rsp),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   e0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>e0=int64#10
-# asm 2: mov  <mulrax=%rax,>e0=%r12
-mov  %rax,%r12
-
-# qhasm:   e1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>e1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>e1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? e1 += mulrax
-# asm 1: add  <mulrax=int64#7,<e1=int64#11
-# asm 2: add  <mulrax=%rax,<e1=%r13
-add  %rax,%r13
-
-# qhasm:   e2 = 0
-# asm 1: mov  $0,>e2=int64#12
-# asm 2: mov  $0,>e2=%r14
-mov  $0,%r14
-
-# qhasm:   e2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<e2=int64#12
-# asm 2: adc <mulrdx=%rdx,<e2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? e2 += mulrax
-# asm 1: add  <mulrax=int64#7,<e2=int64#12
-# asm 2: add  <mulrax=%rax,<e2=%r14
-add  %rax,%r14
-
-# qhasm:   e3 = 0
-# asm 1: mov  $0,>e3=int64#13
-# asm 2: mov  $0,>e3=%r15
-mov  $0,%r15
-
-# qhasm:   e3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<e3=int64#13
-# asm 2: adc <mulrdx=%rdx,<e3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? e3 += mulrax
-# asm 1: add  <mulrax=int64#7,<e3=int64#13
-# asm 2: add  <mulrax=%rax,<e3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = b1_stack
-# asm 1: movq <b1_stack=stack64#13,>mulx1=int64#9
-# asm 2: movq <b1_stack=96(%rsp),>mulx1=%r11
-movq 96(%rsp),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? e1 += mulrax
-# asm 1: add  <mulrax=int64#7,<e1=int64#11
-# asm 2: add  <mulrax=%rax,<e1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? e2 += mulrax
-# asm 1: add  <mulrax=int64#7,<e2=int64#12
-# asm 2: add  <mulrax=%rax,<e2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? e2 += mulc
-# asm 1: add  <mulc=int64#14,<e2=int64#12
-# asm 2: add  <mulc=%rbx,<e2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? e3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<e3=int64#13
-# asm 2: add  <mulrax=%rax,<e3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? e3 += mulc
-# asm 1: add  <mulc=int64#14,<e3=int64#13
-# asm 2: add  <mulc=%rbx,<e3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = b2_stack
-# asm 1: movq <b2_stack=stack64#14,>mulx2=int64#9
-# asm 2: movq <b2_stack=104(%rsp),>mulx2=%r11
-movq 104(%rsp),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? e2 += mulrax
-# asm 1: add  <mulrax=int64#7,<e2=int64#12
-# asm 2: add  <mulrax=%rax,<e2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? e3 += mulrax
-# asm 1: add  <mulrax=int64#7,<e3=int64#13
-# asm 2: add  <mulrax=%rax,<e3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? e3 += mulc
-# asm 1: add  <mulc=int64#14,<e3=int64#13
-# asm 2: add  <mulc=%rbx,<e3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = b3_stack
-# asm 1: movq <b3_stack=stack64#15,>mulx3=int64#9
-# asm 2: movq <b3_stack=112(%rsp),>mulx3=%r11
-movq 112(%rsp),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? e3 += mulrax
-# asm 1: add  <mulrax=int64#7,<e3=int64#13
-# asm 2: add  <mulrax=%rax,<e3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
-# asm 2: mov  <mulrax=%rax,>mulr4=%rcx
-mov  %rax,%rcx
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#5
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
-mov  %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#8
-# asm 2: add  <mulrax=%rax,<mulr7=%r10
-add  %rax,%r10
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? e0 += mulr4
-# asm 1: add  <mulr4=int64#4,<e0=int64#10
-# asm 2: add  <mulr4=%rcx,<e0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? e1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#5,<e1=int64#11
-# asm 2: adc <mulr5=%r8,<e1=%r13
-adc %r8,%r13
-
-# qhasm:   carry? e2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#6,<e2=int64#12
-# asm 2: adc <mulr6=%r9,<e2=%r14
-adc %r9,%r14
-
-# qhasm:   carry? e3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#8,<e3=int64#13
-# asm 2: adc <mulr7=%r10,<e3=%r15
-adc %r10,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#4
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? e0 += mulr8
-# asm 1: add  <mulr8=int64#4,<e0=int64#10
-# asm 2: add  <mulr8=%rcx,<e0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? e1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<e1=int64#11
-# asm 2: adc <mulzero=%rdx,<e1=%r13
-adc %rdx,%r13
-
-# qhasm:   carry? e2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<e2=int64#12
-# asm 2: adc <mulzero=%rdx,<e2=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? e3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<e3=int64#13
-# asm 2: adc <mulzero=%rdx,<e3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   e0 += mulzero
-# asm 1: add  <mulzero=int64#3,<e0=int64#10
-# asm 2: add  <mulzero=%rdx,<e0=%r12
-add  %rdx,%r12
-
-# qhasm: h0 = e0
-# asm 1: mov  <e0=int64#10,>h0=int64#3
-# asm 2: mov  <e0=%r12,>h0=%rdx
-mov  %r12,%rdx
-
-# qhasm: h1 = e1
-# asm 1: mov  <e1=int64#11,>h1=int64#4
-# asm 2: mov  <e1=%r13,>h1=%rcx
-mov  %r13,%rcx
-
-# qhasm: h2 = e2
-# asm 1: mov  <e2=int64#12,>h2=int64#5
-# asm 2: mov  <e2=%r14,>h2=%r8
-mov  %r14,%r8
-
-# qhasm: h3 = e3
-# asm 1: mov  <e3=int64#13,>h3=int64#6
-# asm 2: mov  <e3=%r15,>h3=%r9
-mov  %r15,%r9
-
-# qhasm:   carry? e0 -= a0_stack 
-# asm 1: subq <a0_stack=stack64#8,<e0=int64#10
-# asm 2: subq <a0_stack=56(%rsp),<e0=%r12
-subq 56(%rsp),%r12
-
-# qhasm:   carry? e1 -= a1_stack - carry
-# asm 1: sbbq <a1_stack=stack64#9,<e1=int64#11
-# asm 2: sbbq <a1_stack=64(%rsp),<e1=%r13
-sbbq 64(%rsp),%r13
-
-# qhasm:   carry? e2 -= a2_stack - carry
-# asm 1: sbbq <a2_stack=stack64#10,<e2=int64#12
-# asm 2: sbbq <a2_stack=72(%rsp),<e2=%r14
-sbbq 72(%rsp),%r14
-
-# qhasm:   carry? e3 -= a3_stack - carry
-# asm 1: sbbq <a3_stack=stack64#11,<e3=int64#13
-# asm 2: sbbq <a3_stack=80(%rsp),<e3=%r15
-sbbq 80(%rsp),%r15
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#7
-# asm 2: mov  $0,>subt0=%rax
-mov  $0,%rax
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#8
-# asm 2: mov  $38,>subt1=%r10
-mov  $38,%r10
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#7,<subt1=int64#8
-# asm 2: cmovae <subt0=%rax,<subt1=%r10
-cmovae %rax,%r10
-
-# qhasm:   carry? e0 -= subt1
-# asm 1: sub  <subt1=int64#8,<e0=int64#10
-# asm 2: sub  <subt1=%r10,<e0=%r12
-sub  %r10,%r12
-
-# qhasm:   carry? e1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#7,<e1=int64#11
-# asm 2: sbb  <subt0=%rax,<e1=%r13
-sbb  %rax,%r13
-
-# qhasm:   carry? e2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#7,<e2=int64#12
-# asm 2: sbb  <subt0=%rax,<e2=%r14
-sbb  %rax,%r14
-
-# qhasm:   carry? e3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#7,<e3=int64#13
-# asm 2: sbb  <subt0=%rax,<e3=%r15
-sbb  %rax,%r15
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#8,<subt0=int64#7
-# asm 2: cmovc <subt1=%r10,<subt0=%rax
-cmovc %r10,%rax
-
-# qhasm:   e0 -= subt0
-# asm 1: sub  <subt0=int64#7,<e0=int64#10
-# asm 2: sub  <subt0=%rax,<e0=%r12
-sub  %rax,%r12
-
-# qhasm:   carry? h0 += a0_stack 
-# asm 1: addq <a0_stack=stack64#8,<h0=int64#3
-# asm 2: addq <a0_stack=56(%rsp),<h0=%rdx
-addq 56(%rsp),%rdx
-
-# qhasm:   carry? h1 += a1_stack + carry
-# asm 1: adcq <a1_stack=stack64#9,<h1=int64#4
-# asm 2: adcq <a1_stack=64(%rsp),<h1=%rcx
-adcq 64(%rsp),%rcx
-
-# qhasm:   carry? h2 += a2_stack + carry
-# asm 1: adcq <a2_stack=stack64#10,<h2=int64#5
-# asm 2: adcq <a2_stack=72(%rsp),<h2=%r8
-adcq 72(%rsp),%r8
-
-# qhasm:   carry? h3 += a3_stack + carry
-# asm 1: adcq <a3_stack=stack64#11,<h3=int64#6
-# asm 2: adcq <a3_stack=80(%rsp),<h3=%r9
-adcq 80(%rsp),%r9
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#7
-# asm 2: mov  $0,>addt0=%rax
-mov  $0,%rax
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#8
-# asm 2: mov  $38,>addt1=%r10
-mov  $38,%r10
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#7,<addt1=int64#8
-# asm 2: cmovae <addt0=%rax,<addt1=%r10
-cmovae %rax,%r10
-
-# qhasm:   carry? h0 += addt1
-# asm 1: add  <addt1=int64#8,<h0=int64#3
-# asm 2: add  <addt1=%r10,<h0=%rdx
-add  %r10,%rdx
-
-# qhasm:   carry? h1 += addt0 + carry
-# asm 1: adc <addt0=int64#7,<h1=int64#4
-# asm 2: adc <addt0=%rax,<h1=%rcx
-adc %rax,%rcx
-
-# qhasm:   carry? h2 += addt0 + carry
-# asm 1: adc <addt0=int64#7,<h2=int64#5
-# asm 2: adc <addt0=%rax,<h2=%r8
-adc %rax,%r8
-
-# qhasm:   carry? h3 += addt0 + carry
-# asm 1: adc <addt0=int64#7,<h3=int64#6
-# asm 2: adc <addt0=%rax,<h3=%r9
-adc %rax,%r9
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#8,<addt0=int64#7
-# asm 2: cmovc <addt1=%r10,<addt0=%rax
-cmovc %r10,%rax
-
-# qhasm:   h0 += addt0
-# asm 1: add  <addt0=int64#7,<h0=int64#3
-# asm 2: add  <addt0=%rax,<h0=%rdx
-add  %rax,%rdx
-
-# qhasm: h0_stack = h0
-# asm 1: movq <h0=int64#3,>h0_stack=stack64#8
-# asm 2: movq <h0=%rdx,>h0_stack=56(%rsp)
-movq %rdx,56(%rsp)
-
-# qhasm: h1_stack = h1
-# asm 1: movq <h1=int64#4,>h1_stack=stack64#9
-# asm 2: movq <h1=%rcx,>h1_stack=64(%rsp)
-movq %rcx,64(%rsp)
-
-# qhasm: h2_stack = h2
-# asm 1: movq <h2=int64#5,>h2_stack=stack64#10
-# asm 2: movq <h2=%r8,>h2_stack=72(%rsp)
-movq %r8,72(%rsp)
-
-# qhasm: h3_stack = h3
-# asm 1: movq <h3=int64#6,>h3_stack=stack64#11
-# asm 2: movq <h3=%r9,>h3_stack=80(%rsp)
-movq %r9,80(%rsp)
-
-# qhasm: e0_stack = e0
-# asm 1: movq <e0=int64#10,>e0_stack=stack64#12
-# asm 2: movq <e0=%r12,>e0_stack=88(%rsp)
-movq %r12,88(%rsp)
-
-# qhasm: e1_stack = e1
-# asm 1: movq <e1=int64#11,>e1_stack=stack64#13
-# asm 2: movq <e1=%r13,>e1_stack=96(%rsp)
-movq %r13,96(%rsp)
-
-# qhasm: e2_stack = e2
-# asm 1: movq <e2=int64#12,>e2_stack=stack64#14
-# asm 2: movq <e2=%r14,>e2_stack=104(%rsp)
-movq %r14,104(%rsp)
-
-# qhasm: e3_stack = e3
-# asm 1: movq <e3=int64#13,>e3_stack=stack64#15
-# asm 2: movq <e3=%r15,>e3_stack=112(%rsp)
-movq %r15,112(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = *(uint64 *)(rp + 96)
-# asm 1: movq   96(<rp=int64#1),>mulx0=int64#9
-# asm 2: movq   96(<rp=%rdi),>mulx0=%r11
-movq   96(%rdi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rsi),>mulrax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   c0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>c0=int64#10
-# asm 2: mov  <mulrax=%rax,>c0=%r12
-mov  %rax,%r12
-
-# qhasm:   c1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>c1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>c1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rsi),>mulrax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#11
-# asm 2: add  <mulrax=%rax,<c1=%r13
-add  %rax,%r13
-
-# qhasm:   c2 = 0
-# asm 1: mov  $0,>c2=int64#12
-# asm 2: mov  $0,>c2=%r14
-mov  $0,%r14
-
-# qhasm:   c2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c2=int64#12
-# asm 2: adc <mulrdx=%rdx,<c2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rsi),>mulrax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#12
-# asm 2: add  <mulrax=%rax,<c2=%r14
-add  %rax,%r14
-
-# qhasm:   c3 = 0
-# asm 1: mov  $0,>c3=int64#13
-# asm 2: mov  $0,>c3=%r15
-mov  $0,%r15
-
-# qhasm:   c3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c3=int64#13
-# asm 2: adc <mulrdx=%rdx,<c3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rsi),>mulrax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#13
-# asm 2: add  <mulrax=%rax,<c3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = *(uint64 *)(rp + 104)
-# asm 1: movq   104(<rp=int64#1),>mulx1=int64#9
-# asm 2: movq   104(<rp=%rdi),>mulx1=%r11
-movq   104(%rdi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rsi),>mulrax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#11
-# asm 2: add  <mulrax=%rax,<c1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rsi),>mulrax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#12
-# asm 2: add  <mulrax=%rax,<c2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c2 += mulc
-# asm 1: add  <mulc=int64#14,<c2=int64#12
-# asm 2: add  <mulc=%rbx,<c2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rsi),>mulrax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? c3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<c3=int64#13
-# asm 2: add  <mulrax=%rax,<c3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#14,<c3=int64#13
-# asm 2: add  <mulc=%rbx,<c3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rsi),>mulrax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = *(uint64 *)(rp + 112)
-# asm 1: movq   112(<rp=int64#1),>mulx2=int64#9
-# asm 2: movq   112(<rp=%rdi),>mulx2=%r11
-movq   112(%rdi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rsi),>mulrax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#12
-# asm 2: add  <mulrax=%rax,<c2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rsi),>mulrax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#13
-# asm 2: add  <mulrax=%rax,<c3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#14,<c3=int64#13
-# asm 2: add  <mulc=%rbx,<c3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rsi),>mulrax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rsi),>mulrax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = *(uint64 *)(rp + 120)
-# asm 1: movq   120(<rp=int64#1),>mulx3=int64#9
-# asm 2: movq   120(<rp=%rdi),>mulx3=%r11
-movq   120(%rdi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rsi),>mulrax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#13
-# asm 2: add  <mulrax=%rax,<c3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rsi),>mulrax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rsi),>mulrax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#2),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rsi),>mulrax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? c0 += mulr4
-# asm 1: add  <mulr4=int64#2,<c0=int64#10
-# asm 2: add  <mulr4=%rsi,<c0=%r12
-add  %rsi,%r12
-
-# qhasm:   carry? c1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<c1=int64#11
-# asm 2: adc <mulr5=%rcx,<c1=%r13
-adc %rcx,%r13
-
-# qhasm:   carry? c2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<c2=int64#12
-# asm 2: adc <mulr6=%r8,<c2=%r14
-adc %r8,%r14
-
-# qhasm:   carry? c3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<c3=int64#13
-# asm 2: adc <mulr7=%r9,<c3=%r15
-adc %r9,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? c0 += mulr8
-# asm 1: add  <mulr8=int64#3,<c0=int64#10
-# asm 2: add  <mulr8=%rdx,<c0=%r12
-add  %rdx,%r12
-
-# qhasm:   carry? c1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<c1=int64#11
-# asm 2: adc <mulzero=%rsi,<c1=%r13
-adc %rsi,%r13
-
-# qhasm:   carry? c2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<c2=int64#12
-# asm 2: adc <mulzero=%rsi,<c2=%r14
-adc %rsi,%r14
-
-# qhasm:   carry? c3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<c3=int64#13
-# asm 2: adc <mulzero=%rsi,<c3=%r15
-adc %rsi,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   c0 += mulzero
-# asm 1: add  <mulzero=int64#2,<c0=int64#10
-# asm 2: add  <mulzero=%rsi,<c0=%r12
-add  %rsi,%r12
-
-# qhasm: f0 = *(uint64 *)(rp + 64)
-# asm 1: movq   64(<rp=int64#1),>f0=int64#2
-# asm 2: movq   64(<rp=%rdi),>f0=%rsi
-movq   64(%rdi),%rsi
-
-# qhasm: f1 = *(uint64 *)(rp + 72)
-# asm 1: movq   72(<rp=int64#1),>f1=int64#3
-# asm 2: movq   72(<rp=%rdi),>f1=%rdx
-movq   72(%rdi),%rdx
-
-# qhasm: f2 = *(uint64 *)(rp + 80)
-# asm 1: movq   80(<rp=int64#1),>f2=int64#4
-# asm 2: movq   80(<rp=%rdi),>f2=%rcx
-movq   80(%rdi),%rcx
-
-# qhasm: f3 = *(uint64 *)(rp + 88)
-# asm 1: movq   88(<rp=int64#1),>f3=int64#5
-# asm 2: movq   88(<rp=%rdi),>f3=%r8
-movq   88(%rdi),%r8
-
-# qhasm:   carry? f0 += f0 
-# asm 1: add  <f0=int64#2,<f0=int64#2
-# asm 2: add  <f0=%rsi,<f0=%rsi
-add  %rsi,%rsi
-
-# qhasm:   carry? f1 += f1 + carry
-# asm 1: adc <f1=int64#3,<f1=int64#3
-# asm 2: adc <f1=%rdx,<f1=%rdx
-adc %rdx,%rdx
-
-# qhasm:   carry? f2 += f2 + carry
-# asm 1: adc <f2=int64#4,<f2=int64#4
-# asm 2: adc <f2=%rcx,<f2=%rcx
-adc %rcx,%rcx
-
-# qhasm:   carry? f3 += f3 + carry
-# asm 1: adc <f3=int64#5,<f3=int64#5
-# asm 2: adc <f3=%r8,<f3=%r8
-adc %r8,%r8
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#6
-# asm 2: mov  $0,>addt0=%r9
-mov  $0,%r9
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#7
-# asm 2: mov  $38,>addt1=%rax
-mov  $38,%rax
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#6,<addt1=int64#7
-# asm 2: cmovae <addt0=%r9,<addt1=%rax
-cmovae %r9,%rax
-
-# qhasm:   carry? f0 += addt1
-# asm 1: add  <addt1=int64#7,<f0=int64#2
-# asm 2: add  <addt1=%rax,<f0=%rsi
-add  %rax,%rsi
-
-# qhasm:   carry? f1 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<f1=int64#3
-# asm 2: adc <addt0=%r9,<f1=%rdx
-adc %r9,%rdx
-
-# qhasm:   carry? f2 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<f2=int64#4
-# asm 2: adc <addt0=%r9,<f2=%rcx
-adc %r9,%rcx
-
-# qhasm:   carry? f3 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<f3=int64#5
-# asm 2: adc <addt0=%r9,<f3=%r8
-adc %r9,%r8
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#7,<addt0=int64#6
-# asm 2: cmovc <addt1=%rax,<addt0=%r9
-cmovc %rax,%r9
-
-# qhasm:   f0 += addt0
-# asm 1: add  <addt0=int64#6,<f0=int64#2
-# asm 2: add  <addt0=%r9,<f0=%rsi
-add  %r9,%rsi
-
-# qhasm: g0 = f0
-# asm 1: mov  <f0=int64#2,>g0=int64#6
-# asm 2: mov  <f0=%rsi,>g0=%r9
-mov  %rsi,%r9
-
-# qhasm: g1 = f1
-# asm 1: mov  <f1=int64#3,>g1=int64#7
-# asm 2: mov  <f1=%rdx,>g1=%rax
-mov  %rdx,%rax
-
-# qhasm: g2 = f2
-# asm 1: mov  <f2=int64#4,>g2=int64#8
-# asm 2: mov  <f2=%rcx,>g2=%r10
-mov  %rcx,%r10
-
-# qhasm: g3 = f3
-# asm 1: mov  <f3=int64#5,>g3=int64#9
-# asm 2: mov  <f3=%r8,>g3=%r11
-mov  %r8,%r11
-
-# qhasm:   carry? f0 -= c0 
-# asm 1: sub  <c0=int64#10,<f0=int64#2
-# asm 2: sub  <c0=%r12,<f0=%rsi
-sub  %r12,%rsi
-
-# qhasm:   carry? f1 -= c1 - carry
-# asm 1: sbb  <c1=int64#11,<f1=int64#3
-# asm 2: sbb  <c1=%r13,<f1=%rdx
-sbb  %r13,%rdx
-
-# qhasm:   carry? f2 -= c2 - carry
-# asm 1: sbb  <c2=int64#12,<f2=int64#4
-# asm 2: sbb  <c2=%r14,<f2=%rcx
-sbb  %r14,%rcx
-
-# qhasm:   carry? f3 -= c3 - carry
-# asm 1: sbb  <c3=int64#13,<f3=int64#5
-# asm 2: sbb  <c3=%r15,<f3=%r8
-sbb  %r15,%r8
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#14
-# asm 2: mov  $0,>subt0=%rbx
-mov  $0,%rbx
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#15
-# asm 2: mov  $38,>subt1=%rbp
-mov  $38,%rbp
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#14,<subt1=int64#15
-# asm 2: cmovae <subt0=%rbx,<subt1=%rbp
-cmovae %rbx,%rbp
-
-# qhasm:   carry? f0 -= subt1
-# asm 1: sub  <subt1=int64#15,<f0=int64#2
-# asm 2: sub  <subt1=%rbp,<f0=%rsi
-sub  %rbp,%rsi
-
-# qhasm:   carry? f1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#14,<f1=int64#3
-# asm 2: sbb  <subt0=%rbx,<f1=%rdx
-sbb  %rbx,%rdx
-
-# qhasm:   carry? f2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#14,<f2=int64#4
-# asm 2: sbb  <subt0=%rbx,<f2=%rcx
-sbb  %rbx,%rcx
-
-# qhasm:   carry? f3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#14,<f3=int64#5
-# asm 2: sbb  <subt0=%rbx,<f3=%r8
-sbb  %rbx,%r8
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#15,<subt0=int64#14
-# asm 2: cmovc <subt1=%rbp,<subt0=%rbx
-cmovc %rbp,%rbx
-
-# qhasm:   f0 -= subt0
-# asm 1: sub  <subt0=int64#14,<f0=int64#2
-# asm 2: sub  <subt0=%rbx,<f0=%rsi
-sub  %rbx,%rsi
-
-# qhasm:   carry? g0 += c0 
-# asm 1: add  <c0=int64#10,<g0=int64#6
-# asm 2: add  <c0=%r12,<g0=%r9
-add  %r12,%r9
-
-# qhasm:   carry? g1 += c1 + carry
-# asm 1: adc <c1=int64#11,<g1=int64#7
-# asm 2: adc <c1=%r13,<g1=%rax
-adc %r13,%rax
-
-# qhasm:   carry? g2 += c2 + carry
-# asm 1: adc <c2=int64#12,<g2=int64#8
-# asm 2: adc <c2=%r14,<g2=%r10
-adc %r14,%r10
-
-# qhasm:   carry? g3 += c3 + carry
-# asm 1: adc <c3=int64#13,<g3=int64#9
-# asm 2: adc <c3=%r15,<g3=%r11
-adc %r15,%r11
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#10
-# asm 2: mov  $0,>addt0=%r12
-mov  $0,%r12
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#11
-# asm 2: mov  $38,>addt1=%r13
-mov  $38,%r13
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#10,<addt1=int64#11
-# asm 2: cmovae <addt0=%r12,<addt1=%r13
-cmovae %r12,%r13
-
-# qhasm:   carry? g0 += addt1
-# asm 1: add  <addt1=int64#11,<g0=int64#6
-# asm 2: add  <addt1=%r13,<g0=%r9
-add  %r13,%r9
-
-# qhasm:   carry? g1 += addt0 + carry
-# asm 1: adc <addt0=int64#10,<g1=int64#7
-# asm 2: adc <addt0=%r12,<g1=%rax
-adc %r12,%rax
-
-# qhasm:   carry? g2 += addt0 + carry
-# asm 1: adc <addt0=int64#10,<g2=int64#8
-# asm 2: adc <addt0=%r12,<g2=%r10
-adc %r12,%r10
-
-# qhasm:   carry? g3 += addt0 + carry
-# asm 1: adc <addt0=int64#10,<g3=int64#9
-# asm 2: adc <addt0=%r12,<g3=%r11
-adc %r12,%r11
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#11,<addt0=int64#10
-# asm 2: cmovc <addt1=%r13,<addt0=%r12
-cmovc %r13,%r12
-
-# qhasm:   g0 += addt0
-# asm 1: add  <addt0=int64#10,<g0=int64#6
-# asm 2: add  <addt0=%r12,<g0=%r9
-add  %r12,%r9
-
-# qhasm: g0_stack = g0
-# asm 1: movq <g0=int64#6,>g0_stack=stack64#16
-# asm 2: movq <g0=%r9,>g0_stack=120(%rsp)
-movq %r9,120(%rsp)
-
-# qhasm: g1_stack = g1
-# asm 1: movq <g1=int64#7,>g1_stack=stack64#17
-# asm 2: movq <g1=%rax,>g1_stack=128(%rsp)
-movq %rax,128(%rsp)
-
-# qhasm: g2_stack = g2
-# asm 1: movq <g2=int64#8,>g2_stack=stack64#18
-# asm 2: movq <g2=%r10,>g2_stack=136(%rsp)
-movq %r10,136(%rsp)
-
-# qhasm: g3_stack = g3
-# asm 1: movq <g3=int64#9,>g3_stack=stack64#19
-# asm 2: movq <g3=%r11,>g3_stack=144(%rsp)
-movq %r11,144(%rsp)
-
-# qhasm: f0_stack = f0
-# asm 1: movq <f0=int64#2,>f0_stack=stack64#20
-# asm 2: movq <f0=%rsi,>f0_stack=152(%rsp)
-movq %rsi,152(%rsp)
-
-# qhasm: f1_stack = f1
-# asm 1: movq <f1=int64#3,>f1_stack=stack64#21
-# asm 2: movq <f1=%rdx,>f1_stack=160(%rsp)
-movq %rdx,160(%rsp)
-
-# qhasm: f2_stack = f2
-# asm 1: movq <f2=int64#4,>f2_stack=stack64#22
-# asm 2: movq <f2=%rcx,>f2_stack=168(%rsp)
-movq %rcx,168(%rsp)
-
-# qhasm: f3_stack = f3
-# asm 1: movq <f3=int64#5,>f3_stack=stack64#23
-# asm 2: movq <f3=%r8,>f3_stack=176(%rsp)
-movq %r8,176(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#2
-# asm 2: mov  $0,>mulr4=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#4
-# asm 2: mov  $0,>mulr5=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulx0 = e0_stack
-# asm 1: movq <e0_stack=stack64#12,>mulx0=int64#8
-# asm 2: movq <e0_stack=88(%rsp),>mulx0=%r10
-movq 88(%rsp),%r10
-
-# qhasm:   mulrax = f0_stack
-# asm 1: movq <f0_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <f0_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   rx0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rx0=int64#9
-# asm 2: mov  <mulrax=%rax,>rx0=%r11
-mov  %rax,%r11
-
-# qhasm:   rx1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rx1=int64#10
-# asm 2: mov  <mulrdx=%rdx,>rx1=%r12
-mov  %rdx,%r12
-
-# qhasm:   mulrax = f1_stack
-# asm 1: movq <f1_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <f1_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#10
-# asm 2: add  <mulrax=%rax,<rx1=%r12
-add  %rax,%r12
-
-# qhasm:   rx2 = 0
-# asm 1: mov  $0,>rx2=int64#11
-# asm 2: mov  $0,>rx2=%r13
-mov  $0,%r13
-
-# qhasm:   rx2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx2=int64#11
-# asm 2: adc <mulrdx=%rdx,<rx2=%r13
-adc %rdx,%r13
-
-# qhasm:   mulrax = f2_stack
-# asm 1: movq <f2_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <f2_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#11
-# asm 2: add  <mulrax=%rax,<rx2=%r13
-add  %rax,%r13
-
-# qhasm:   rx3 = 0
-# asm 1: mov  $0,>rx3=int64#12
-# asm 2: mov  $0,>rx3=%r14
-mov  $0,%r14
-
-# qhasm:   rx3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx3=int64#12
-# asm 2: adc <mulrdx=%rdx,<rx3=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = f3_stack
-# asm 1: movq <f3_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <f3_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#12
-# asm 2: add  <mulrax=%rax,<rx3=%r14
-add  %rax,%r14
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#2
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rsi
-adc %rdx,%rsi
-
-# qhasm:   mulx1 = e1_stack
-# asm 1: movq <e1_stack=stack64#13,>mulx1=int64#8
-# asm 2: movq <e1_stack=96(%rsp),>mulx1=%r10
-movq 96(%rsp),%r10
-
-# qhasm:   mulrax = f0_stack
-# asm 1: movq <f0_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <f0_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#10
-# asm 2: add  <mulrax=%rax,<rx1=%r12
-add  %rax,%r12
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f1_stack
-# asm 1: movq <f1_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <f1_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#11
-# asm 2: add  <mulrax=%rax,<rx2=%r13
-add  %rax,%r13
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx2 += mulc
-# asm 1: add  <mulc=int64#13,<rx2=int64#11
-# asm 2: add  <mulc=%r15,<rx2=%r13
-add  %r15,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f2_stack
-# asm 1: movq <f2_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <f2_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rx3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rx3=int64#12
-# asm 2: add  <mulrax=%rax,<rx3=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#13,<rx3=int64#12
-# asm 2: add  <mulc=%r15,<rx3=%r14
-add  %r15,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f3_stack
-# asm 1: movq <f3_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <f3_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr5=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx2 = e2_stack
-# asm 1: movq <e2_stack=stack64#14,>mulx2=int64#8
-# asm 2: movq <e2_stack=104(%rsp),>mulx2=%r10
-movq 104(%rsp),%r10
-
-# qhasm:   mulrax = f0_stack
-# asm 1: movq <f0_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <f0_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#11
-# asm 2: add  <mulrax=%rax,<rx2=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f1_stack
-# asm 1: movq <f1_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <f1_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#12
-# asm 2: add  <mulrax=%rax,<rx3=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#13,<rx3=int64#12
-# asm 2: add  <mulc=%r15,<rx3=%r14
-add  %r15,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f2_stack
-# asm 1: movq <f2_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <f2_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f3_stack
-# asm 1: movq <f3_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <f3_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#13,<mulr5=int64#4
-# asm 2: add  <mulc=%r15,<mulr5=%rcx
-add  %r15,%rcx
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx3 = e3_stack
-# asm 1: movq <e3_stack=stack64#15,>mulx3=int64#8
-# asm 2: movq <e3_stack=112(%rsp),>mulx3=%r10
-movq 112(%rsp),%r10
-
-# qhasm:   mulrax = f0_stack
-# asm 1: movq <f0_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <f0_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#12
-# asm 2: add  <mulrax=%rax,<rx3=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f1_stack
-# asm 1: movq <f1_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <f1_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f2_stack
-# asm 1: movq <f2_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <f2_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#13,<mulr5=int64#4
-# asm 2: add  <mulc=%r15,<mulr5=%rcx
-add  %r15,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f3_stack
-# asm 1: movq <f3_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <f3_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#13,<mulr6=int64#5
-# asm 2: add  <mulc=%r15,<mulr6=%r8
-add  %r15,%r8
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#2,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rsi,>mulrax=%rax
-mov  %rsi,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr5=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rx0 += mulr4
-# asm 1: add  <mulr4=int64#2,<rx0=int64#9
-# asm 2: add  <mulr4=%rsi,<rx0=%r11
-add  %rsi,%r11
-
-# qhasm:   carry? rx1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<rx1=int64#10
-# asm 2: adc <mulr5=%rcx,<rx1=%r12
-adc %rcx,%r12
-
-# qhasm:   carry? rx2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<rx2=int64#11
-# asm 2: adc <mulr6=%r8,<rx2=%r13
-adc %r8,%r13
-
-# qhasm:   carry? rx3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<rx3=int64#12
-# asm 2: adc <mulr7=%r9,<rx3=%r14
-adc %r9,%r14
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? rx0 += mulr8
-# asm 1: add  <mulr8=int64#3,<rx0=int64#9
-# asm 2: add  <mulr8=%rdx,<rx0=%r11
-add  %rdx,%r11
-
-# qhasm:   carry? rx1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rx1=int64#10
-# asm 2: adc <mulzero=%rsi,<rx1=%r12
-adc %rsi,%r12
-
-# qhasm:   carry? rx2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rx2=int64#11
-# asm 2: adc <mulzero=%rsi,<rx2=%r13
-adc %rsi,%r13
-
-# qhasm:   carry? rx3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rx3=int64#12
-# asm 2: adc <mulzero=%rsi,<rx3=%r14
-adc %rsi,%r14
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   rx0 += mulzero
-# asm 1: add  <mulzero=int64#2,<rx0=int64#9
-# asm 2: add  <mulzero=%rsi,<rx0=%r11
-add  %rsi,%r11
-
-# qhasm: *(uint64 *)(rp + 0) = rx0
-# asm 1: movq   <rx0=int64#9,0(<rp=int64#1)
-# asm 2: movq   <rx0=%r11,0(<rp=%rdi)
-movq   %r11,0(%rdi)
-
-# qhasm: *(uint64 *)(rp + 8) = rx1
-# asm 1: movq   <rx1=int64#10,8(<rp=int64#1)
-# asm 2: movq   <rx1=%r12,8(<rp=%rdi)
-movq   %r12,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = rx2
-# asm 1: movq   <rx2=int64#11,16(<rp=int64#1)
-# asm 2: movq   <rx2=%r13,16(<rp=%rdi)
-movq   %r13,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = rx3
-# asm 1: movq   <rx3=int64#12,24(<rp=int64#1)
-# asm 2: movq   <rx3=%r14,24(<rp=%rdi)
-movq   %r14,24(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#2
-# asm 2: mov  $0,>mulr4=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#4
-# asm 2: mov  $0,>mulr5=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulx0 = h0_stack
-# asm 1: movq <h0_stack=stack64#8,>mulx0=int64#8
-# asm 2: movq <h0_stack=56(%rsp),>mulx0=%r10
-movq 56(%rsp),%r10
-
-# qhasm:   mulrax = g0_stack
-# asm 1: movq <g0_stack=stack64#16,>mulrax=int64#7
-# asm 2: movq <g0_stack=120(%rsp),>mulrax=%rax
-movq 120(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   ry0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>ry0=int64#9
-# asm 2: mov  <mulrax=%rax,>ry0=%r11
-mov  %rax,%r11
-
-# qhasm:   ry1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>ry1=int64#10
-# asm 2: mov  <mulrdx=%rdx,>ry1=%r12
-mov  %rdx,%r12
-
-# qhasm:   mulrax = g1_stack
-# asm 1: movq <g1_stack=stack64#17,>mulrax=int64#7
-# asm 2: movq <g1_stack=128(%rsp),>mulrax=%rax
-movq 128(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? ry1 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry1=int64#10
-# asm 2: add  <mulrax=%rax,<ry1=%r12
-add  %rax,%r12
-
-# qhasm:   ry2 = 0
-# asm 1: mov  $0,>ry2=int64#11
-# asm 2: mov  $0,>ry2=%r13
-mov  $0,%r13
-
-# qhasm:   ry2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<ry2=int64#11
-# asm 2: adc <mulrdx=%rdx,<ry2=%r13
-adc %rdx,%r13
-
-# qhasm:   mulrax = g2_stack
-# asm 1: movq <g2_stack=stack64#18,>mulrax=int64#7
-# asm 2: movq <g2_stack=136(%rsp),>mulrax=%rax
-movq 136(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#11
-# asm 2: add  <mulrax=%rax,<ry2=%r13
-add  %rax,%r13
-
-# qhasm:   ry3 = 0
-# asm 1: mov  $0,>ry3=int64#12
-# asm 2: mov  $0,>ry3=%r14
-mov  $0,%r14
-
-# qhasm:   ry3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<ry3=int64#12
-# asm 2: adc <mulrdx=%rdx,<ry3=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = g3_stack
-# asm 1: movq <g3_stack=stack64#19,>mulrax=int64#7
-# asm 2: movq <g3_stack=144(%rsp),>mulrax=%rax
-movq 144(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#12
-# asm 2: add  <mulrax=%rax,<ry3=%r14
-add  %rax,%r14
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#2
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rsi
-adc %rdx,%rsi
-
-# qhasm:   mulx1 = h1_stack
-# asm 1: movq <h1_stack=stack64#9,>mulx1=int64#8
-# asm 2: movq <h1_stack=64(%rsp),>mulx1=%r10
-movq 64(%rsp),%r10
-
-# qhasm:   mulrax = g0_stack
-# asm 1: movq <g0_stack=stack64#16,>mulrax=int64#7
-# asm 2: movq <g0_stack=120(%rsp),>mulrax=%rax
-movq 120(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? ry1 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry1=int64#10
-# asm 2: add  <mulrax=%rax,<ry1=%r12
-add  %rax,%r12
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g1_stack
-# asm 1: movq <g1_stack=stack64#17,>mulrax=int64#7
-# asm 2: movq <g1_stack=128(%rsp),>mulrax=%rax
-movq 128(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#11
-# asm 2: add  <mulrax=%rax,<ry2=%r13
-add  %rax,%r13
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry2 += mulc
-# asm 1: add  <mulc=int64#13,<ry2=int64#11
-# asm 2: add  <mulc=%r15,<ry2=%r13
-add  %r15,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g2_stack
-# asm 1: movq <g2_stack=stack64#18,>mulrax=int64#7
-# asm 2: movq <g2_stack=136(%rsp),>mulrax=%rax
-movq 136(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? ry3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<ry3=int64#12
-# asm 2: add  <mulrax=%rax,<ry3=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry3 += mulc
-# asm 1: add  <mulc=int64#13,<ry3=int64#12
-# asm 2: add  <mulc=%r15,<ry3=%r14
-add  %r15,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g3_stack
-# asm 1: movq <g3_stack=stack64#19,>mulrax=int64#7
-# asm 2: movq <g3_stack=144(%rsp),>mulrax=%rax
-movq 144(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr5=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx2 = h2_stack
-# asm 1: movq <h2_stack=stack64#10,>mulx2=int64#8
-# asm 2: movq <h2_stack=72(%rsp),>mulx2=%r10
-movq 72(%rsp),%r10
-
-# qhasm:   mulrax = g0_stack
-# asm 1: movq <g0_stack=stack64#16,>mulrax=int64#7
-# asm 2: movq <g0_stack=120(%rsp),>mulrax=%rax
-movq 120(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#11
-# asm 2: add  <mulrax=%rax,<ry2=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g1_stack
-# asm 1: movq <g1_stack=stack64#17,>mulrax=int64#7
-# asm 2: movq <g1_stack=128(%rsp),>mulrax=%rax
-movq 128(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#12
-# asm 2: add  <mulrax=%rax,<ry3=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry3 += mulc
-# asm 1: add  <mulc=int64#13,<ry3=int64#12
-# asm 2: add  <mulc=%r15,<ry3=%r14
-add  %r15,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g2_stack
-# asm 1: movq <g2_stack=stack64#18,>mulrax=int64#7
-# asm 2: movq <g2_stack=136(%rsp),>mulrax=%rax
-movq 136(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g3_stack
-# asm 1: movq <g3_stack=stack64#19,>mulrax=int64#7
-# asm 2: movq <g3_stack=144(%rsp),>mulrax=%rax
-movq 144(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#13,<mulr5=int64#4
-# asm 2: add  <mulc=%r15,<mulr5=%rcx
-add  %r15,%rcx
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx3 = h3_stack
-# asm 1: movq <h3_stack=stack64#11,>mulx3=int64#8
-# asm 2: movq <h3_stack=80(%rsp),>mulx3=%r10
-movq 80(%rsp),%r10
-
-# qhasm:   mulrax = g0_stack
-# asm 1: movq <g0_stack=stack64#16,>mulrax=int64#7
-# asm 2: movq <g0_stack=120(%rsp),>mulrax=%rax
-movq 120(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#12
-# asm 2: add  <mulrax=%rax,<ry3=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g1_stack
-# asm 1: movq <g1_stack=stack64#17,>mulrax=int64#7
-# asm 2: movq <g1_stack=128(%rsp),>mulrax=%rax
-movq 128(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g2_stack
-# asm 1: movq <g2_stack=stack64#18,>mulrax=int64#7
-# asm 2: movq <g2_stack=136(%rsp),>mulrax=%rax
-movq 136(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#13,<mulr5=int64#4
-# asm 2: add  <mulc=%r15,<mulr5=%rcx
-add  %r15,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = g3_stack
-# asm 1: movq <g3_stack=stack64#19,>mulrax=int64#7
-# asm 2: movq <g3_stack=144(%rsp),>mulrax=%rax
-movq 144(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#13,<mulr6=int64#5
-# asm 2: add  <mulc=%r15,<mulr6=%r8
-add  %r15,%r8
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#2,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rsi,>mulrax=%rax
-mov  %rsi,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr5=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? ry0 += mulr4
-# asm 1: add  <mulr4=int64#2,<ry0=int64#9
-# asm 2: add  <mulr4=%rsi,<ry0=%r11
-add  %rsi,%r11
-
-# qhasm:   carry? ry1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<ry1=int64#10
-# asm 2: adc <mulr5=%rcx,<ry1=%r12
-adc %rcx,%r12
-
-# qhasm:   carry? ry2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<ry2=int64#11
-# asm 2: adc <mulr6=%r8,<ry2=%r13
-adc %r8,%r13
-
-# qhasm:   carry? ry3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<ry3=int64#12
-# asm 2: adc <mulr7=%r9,<ry3=%r14
-adc %r9,%r14
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? ry0 += mulr8
-# asm 1: add  <mulr8=int64#3,<ry0=int64#9
-# asm 2: add  <mulr8=%rdx,<ry0=%r11
-add  %rdx,%r11
-
-# qhasm:   carry? ry1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<ry1=int64#10
-# asm 2: adc <mulzero=%rsi,<ry1=%r12
-adc %rsi,%r12
-
-# qhasm:   carry? ry2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<ry2=int64#11
-# asm 2: adc <mulzero=%rsi,<ry2=%r13
-adc %rsi,%r13
-
-# qhasm:   carry? ry3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<ry3=int64#12
-# asm 2: adc <mulzero=%rsi,<ry3=%r14
-adc %rsi,%r14
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   ry0 += mulzero
-# asm 1: add  <mulzero=int64#2,<ry0=int64#9
-# asm 2: add  <mulzero=%rsi,<ry0=%r11
-add  %rsi,%r11
-
-# qhasm: *(uint64 *)(rp + 32) = ry0
-# asm 1: movq   <ry0=int64#9,32(<rp=int64#1)
-# asm 2: movq   <ry0=%r11,32(<rp=%rdi)
-movq   %r11,32(%rdi)
-
-# qhasm: *(uint64 *)(rp + 40) = ry1
-# asm 1: movq   <ry1=int64#10,40(<rp=int64#1)
-# asm 2: movq   <ry1=%r12,40(<rp=%rdi)
-movq   %r12,40(%rdi)
-
-# qhasm: *(uint64 *)(rp + 48) = ry2
-# asm 1: movq   <ry2=int64#11,48(<rp=int64#1)
-# asm 2: movq   <ry2=%r13,48(<rp=%rdi)
-movq   %r13,48(%rdi)
-
-# qhasm: *(uint64 *)(rp + 56) = ry3
-# asm 1: movq   <ry3=int64#12,56(<rp=int64#1)
-# asm 2: movq   <ry3=%r14,56(<rp=%rdi)
-movq   %r14,56(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#2
-# asm 2: mov  $0,>mulr4=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#4
-# asm 2: mov  $0,>mulr5=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulx0 = g0_stack
-# asm 1: movq <g0_stack=stack64#16,>mulx0=int64#8
-# asm 2: movq <g0_stack=120(%rsp),>mulx0=%r10
-movq 120(%rsp),%r10
-
-# qhasm:   mulrax = f0_stack
-# asm 1: movq <f0_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <f0_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   rz0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rz0=int64#9
-# asm 2: mov  <mulrax=%rax,>rz0=%r11
-mov  %rax,%r11
-
-# qhasm:   rz1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rz1=int64#10
-# asm 2: mov  <mulrdx=%rdx,>rz1=%r12
-mov  %rdx,%r12
-
-# qhasm:   mulrax = f1_stack
-# asm 1: movq <f1_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <f1_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rz1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz1=int64#10
-# asm 2: add  <mulrax=%rax,<rz1=%r12
-add  %rax,%r12
-
-# qhasm:   rz2 = 0
-# asm 1: mov  $0,>rz2=int64#11
-# asm 2: mov  $0,>rz2=%r13
-mov  $0,%r13
-
-# qhasm:   rz2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rz2=int64#11
-# asm 2: adc <mulrdx=%rdx,<rz2=%r13
-adc %rdx,%r13
-
-# qhasm:   mulrax = f2_stack
-# asm 1: movq <f2_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <f2_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#11
-# asm 2: add  <mulrax=%rax,<rz2=%r13
-add  %rax,%r13
-
-# qhasm:   rz3 = 0
-# asm 1: mov  $0,>rz3=int64#12
-# asm 2: mov  $0,>rz3=%r14
-mov  $0,%r14
-
-# qhasm:   rz3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rz3=int64#12
-# asm 2: adc <mulrdx=%rdx,<rz3=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = f3_stack
-# asm 1: movq <f3_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <f3_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#12
-# asm 2: add  <mulrax=%rax,<rz3=%r14
-add  %rax,%r14
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#2
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rsi
-adc %rdx,%rsi
-
-# qhasm:   mulx1 = g1_stack
-# asm 1: movq <g1_stack=stack64#17,>mulx1=int64#8
-# asm 2: movq <g1_stack=128(%rsp),>mulx1=%r10
-movq 128(%rsp),%r10
-
-# qhasm:   mulrax = f0_stack
-# asm 1: movq <f0_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <f0_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rz1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz1=int64#10
-# asm 2: add  <mulrax=%rax,<rz1=%r12
-add  %rax,%r12
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f1_stack
-# asm 1: movq <f1_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <f1_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#11
-# asm 2: add  <mulrax=%rax,<rz2=%r13
-add  %rax,%r13
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz2 += mulc
-# asm 1: add  <mulc=int64#13,<rz2=int64#11
-# asm 2: add  <mulc=%r15,<rz2=%r13
-add  %r15,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f2_stack
-# asm 1: movq <f2_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <f2_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rz3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rz3=int64#12
-# asm 2: add  <mulrax=%rax,<rz3=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz3 += mulc
-# asm 1: add  <mulc=int64#13,<rz3=int64#12
-# asm 2: add  <mulc=%r15,<rz3=%r14
-add  %r15,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f3_stack
-# asm 1: movq <f3_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <f3_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr5=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx2 = g2_stack
-# asm 1: movq <g2_stack=stack64#18,>mulx2=int64#8
-# asm 2: movq <g2_stack=136(%rsp),>mulx2=%r10
-movq 136(%rsp),%r10
-
-# qhasm:   mulrax = f0_stack
-# asm 1: movq <f0_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <f0_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#11
-# asm 2: add  <mulrax=%rax,<rz2=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f1_stack
-# asm 1: movq <f1_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <f1_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#12
-# asm 2: add  <mulrax=%rax,<rz3=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz3 += mulc
-# asm 1: add  <mulc=int64#13,<rz3=int64#12
-# asm 2: add  <mulc=%r15,<rz3=%r14
-add  %r15,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f2_stack
-# asm 1: movq <f2_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <f2_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f3_stack
-# asm 1: movq <f3_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <f3_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#13,<mulr5=int64#4
-# asm 2: add  <mulc=%r15,<mulr5=%rcx
-add  %r15,%rcx
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx3 = g3_stack
-# asm 1: movq <g3_stack=stack64#19,>mulx3=int64#8
-# asm 2: movq <g3_stack=144(%rsp),>mulx3=%r10
-movq 144(%rsp),%r10
-
-# qhasm:   mulrax = f0_stack
-# asm 1: movq <f0_stack=stack64#20,>mulrax=int64#7
-# asm 2: movq <f0_stack=152(%rsp),>mulrax=%rax
-movq 152(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#12
-# asm 2: add  <mulrax=%rax,<rz3=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f1_stack
-# asm 1: movq <f1_stack=stack64#21,>mulrax=int64#7
-# asm 2: movq <f1_stack=160(%rsp),>mulrax=%rax
-movq 160(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f2_stack
-# asm 1: movq <f2_stack=stack64#22,>mulrax=int64#7
-# asm 2: movq <f2_stack=168(%rsp),>mulrax=%rax
-movq 168(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#13,<mulr5=int64#4
-# asm 2: add  <mulc=%r15,<mulr5=%rcx
-add  %r15,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = f3_stack
-# asm 1: movq <f3_stack=stack64#23,>mulrax=int64#7
-# asm 2: movq <f3_stack=176(%rsp),>mulrax=%rax
-movq 176(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#13,<mulr6=int64#5
-# asm 2: add  <mulc=%r15,<mulr6=%r8
-add  %r15,%r8
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#2,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rsi,>mulrax=%rax
-mov  %rsi,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr5=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rz0 += mulr4
-# asm 1: add  <mulr4=int64#2,<rz0=int64#9
-# asm 2: add  <mulr4=%rsi,<rz0=%r11
-add  %rsi,%r11
-
-# qhasm:   carry? rz1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<rz1=int64#10
-# asm 2: adc <mulr5=%rcx,<rz1=%r12
-adc %rcx,%r12
-
-# qhasm:   carry? rz2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<rz2=int64#11
-# asm 2: adc <mulr6=%r8,<rz2=%r13
-adc %r8,%r13
-
-# qhasm:   carry? rz3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<rz3=int64#12
-# asm 2: adc <mulr7=%r9,<rz3=%r14
-adc %r9,%r14
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? rz0 += mulr8
-# asm 1: add  <mulr8=int64#3,<rz0=int64#9
-# asm 2: add  <mulr8=%rdx,<rz0=%r11
-add  %rdx,%r11
-
-# qhasm:   carry? rz1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rz1=int64#10
-# asm 2: adc <mulzero=%rsi,<rz1=%r12
-adc %rsi,%r12
-
-# qhasm:   carry? rz2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rz2=int64#11
-# asm 2: adc <mulzero=%rsi,<rz2=%r13
-adc %rsi,%r13
-
-# qhasm:   carry? rz3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rz3=int64#12
-# asm 2: adc <mulzero=%rsi,<rz3=%r14
-adc %rsi,%r14
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   rz0 += mulzero
-# asm 1: add  <mulzero=int64#2,<rz0=int64#9
-# asm 2: add  <mulzero=%rsi,<rz0=%r11
-add  %rsi,%r11
-
-# qhasm: *(uint64 *)(rp + 64) = rz0
-# asm 1: movq   <rz0=int64#9,64(<rp=int64#1)
-# asm 2: movq   <rz0=%r11,64(<rp=%rdi)
-movq   %r11,64(%rdi)
-
-# qhasm: *(uint64 *)(rp + 72) = rz1
-# asm 1: movq   <rz1=int64#10,72(<rp=int64#1)
-# asm 2: movq   <rz1=%r12,72(<rp=%rdi)
-movq   %r12,72(%rdi)
-
-# qhasm: *(uint64 *)(rp + 80) = rz2
-# asm 1: movq   <rz2=int64#11,80(<rp=int64#1)
-# asm 2: movq   <rz2=%r13,80(<rp=%rdi)
-movq   %r13,80(%rdi)
-
-# qhasm: *(uint64 *)(rp + 88) = rz3
-# asm 1: movq   <rz3=int64#12,88(<rp=int64#1)
-# asm 2: movq   <rz3=%r14,88(<rp=%rdi)
-movq   %r14,88(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#2
-# asm 2: mov  $0,>mulr4=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#4
-# asm 2: mov  $0,>mulr5=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulx0 = e0_stack
-# asm 1: movq <e0_stack=stack64#12,>mulx0=int64#8
-# asm 2: movq <e0_stack=88(%rsp),>mulx0=%r10
-movq 88(%rsp),%r10
-
-# qhasm:   mulrax = h0_stack
-# asm 1: movq <h0_stack=stack64#8,>mulrax=int64#7
-# asm 2: movq <h0_stack=56(%rsp),>mulrax=%rax
-movq 56(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   rt0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rt0=int64#9
-# asm 2: mov  <mulrax=%rax,>rt0=%r11
-mov  %rax,%r11
-
-# qhasm:   rt1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rt1=int64#10
-# asm 2: mov  <mulrdx=%rdx,>rt1=%r12
-mov  %rdx,%r12
-
-# qhasm:   mulrax = h1_stack
-# asm 1: movq <h1_stack=stack64#9,>mulrax=int64#7
-# asm 2: movq <h1_stack=64(%rsp),>mulrax=%rax
-movq 64(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rt1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt1=int64#10
-# asm 2: add  <mulrax=%rax,<rt1=%r12
-add  %rax,%r12
-
-# qhasm:   rt2 = 0
-# asm 1: mov  $0,>rt2=int64#11
-# asm 2: mov  $0,>rt2=%r13
-mov  $0,%r13
-
-# qhasm:   rt2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rt2=int64#11
-# asm 2: adc <mulrdx=%rdx,<rt2=%r13
-adc %rdx,%r13
-
-# qhasm:   mulrax = h2_stack
-# asm 1: movq <h2_stack=stack64#10,>mulrax=int64#7
-# asm 2: movq <h2_stack=72(%rsp),>mulrax=%rax
-movq 72(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#11
-# asm 2: add  <mulrax=%rax,<rt2=%r13
-add  %rax,%r13
-
-# qhasm:   rt3 = 0
-# asm 1: mov  $0,>rt3=int64#12
-# asm 2: mov  $0,>rt3=%r14
-mov  $0,%r14
-
-# qhasm:   rt3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rt3=int64#12
-# asm 2: adc <mulrdx=%rdx,<rt3=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = h3_stack
-# asm 1: movq <h3_stack=stack64#11,>mulrax=int64#7
-# asm 2: movq <h3_stack=80(%rsp),>mulrax=%rax
-movq 80(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#8
-# asm 2: mul  <mulx0=%r10
-mul  %r10
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#12
-# asm 2: add  <mulrax=%rax,<rt3=%r14
-add  %rax,%r14
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#2
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rsi
-adc %rdx,%rsi
-
-# qhasm:   mulx1 = e1_stack
-# asm 1: movq <e1_stack=stack64#13,>mulx1=int64#8
-# asm 2: movq <e1_stack=96(%rsp),>mulx1=%r10
-movq 96(%rsp),%r10
-
-# qhasm:   mulrax = h0_stack
-# asm 1: movq <h0_stack=stack64#8,>mulrax=int64#7
-# asm 2: movq <h0_stack=56(%rsp),>mulrax=%rax
-movq 56(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rt1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt1=int64#10
-# asm 2: add  <mulrax=%rax,<rt1=%r12
-add  %rax,%r12
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h1_stack
-# asm 1: movq <h1_stack=stack64#9,>mulrax=int64#7
-# asm 2: movq <h1_stack=64(%rsp),>mulrax=%rax
-movq 64(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#11
-# asm 2: add  <mulrax=%rax,<rt2=%r13
-add  %rax,%r13
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt2 += mulc
-# asm 1: add  <mulc=int64#13,<rt2=int64#11
-# asm 2: add  <mulc=%r15,<rt2=%r13
-add  %r15,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h2_stack
-# asm 1: movq <h2_stack=stack64#10,>mulrax=int64#7
-# asm 2: movq <h2_stack=72(%rsp),>mulrax=%rax
-movq 72(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? rt3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rt3=int64#12
-# asm 2: add  <mulrax=%rax,<rt3=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt3 += mulc
-# asm 1: add  <mulc=int64#13,<rt3=int64#12
-# asm 2: add  <mulc=%r15,<rt3=%r14
-add  %r15,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h3_stack
-# asm 1: movq <h3_stack=stack64#11,>mulrax=int64#7
-# asm 2: movq <h3_stack=80(%rsp),>mulrax=%rax
-movq 80(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#8
-# asm 2: mul  <mulx1=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr5=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx2 = e2_stack
-# asm 1: movq <e2_stack=stack64#14,>mulx2=int64#8
-# asm 2: movq <e2_stack=104(%rsp),>mulx2=%r10
-movq 104(%rsp),%r10
-
-# qhasm:   mulrax = h0_stack
-# asm 1: movq <h0_stack=stack64#8,>mulrax=int64#7
-# asm 2: movq <h0_stack=56(%rsp),>mulrax=%rax
-movq 56(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#11
-# asm 2: add  <mulrax=%rax,<rt2=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h1_stack
-# asm 1: movq <h1_stack=stack64#9,>mulrax=int64#7
-# asm 2: movq <h1_stack=64(%rsp),>mulrax=%rax
-movq 64(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#12
-# asm 2: add  <mulrax=%rax,<rt3=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt3 += mulc
-# asm 1: add  <mulc=int64#13,<rt3=int64#12
-# asm 2: add  <mulc=%r15,<rt3=%r14
-add  %r15,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h2_stack
-# asm 1: movq <h2_stack=stack64#10,>mulrax=int64#7
-# asm 2: movq <h2_stack=72(%rsp),>mulrax=%rax
-movq 72(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h3_stack
-# asm 1: movq <h3_stack=stack64#11,>mulrax=int64#7
-# asm 2: movq <h3_stack=80(%rsp),>mulrax=%rax
-movq 80(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#8
-# asm 2: mul  <mulx2=%r10
-mul  %r10
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#13,<mulr5=int64#4
-# asm 2: add  <mulc=%r15,<mulr5=%rcx
-add  %r15,%rcx
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx3 = e3_stack
-# asm 1: movq <e3_stack=stack64#15,>mulx3=int64#8
-# asm 2: movq <e3_stack=112(%rsp),>mulx3=%r10
-movq 112(%rsp),%r10
-
-# qhasm:   mulrax = h0_stack
-# asm 1: movq <h0_stack=stack64#8,>mulrax=int64#7
-# asm 2: movq <h0_stack=56(%rsp),>mulrax=%rax
-movq 56(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#12
-# asm 2: add  <mulrax=%rax,<rt3=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h1_stack
-# asm 1: movq <h1_stack=stack64#9,>mulrax=int64#7
-# asm 2: movq <h1_stack=64(%rsp),>mulrax=%rax
-movq 64(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#2
-# asm 2: add  <mulrax=%rax,<mulr4=%rsi
-add  %rax,%rsi
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#13,<mulr4=int64#2
-# asm 2: add  <mulc=%r15,<mulr4=%rsi
-add  %r15,%rsi
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h2_stack
-# asm 1: movq <h2_stack=stack64#10,>mulrax=int64#7
-# asm 2: movq <h2_stack=72(%rsp),>mulrax=%rax
-movq 72(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#13,<mulr5=int64#4
-# asm 2: add  <mulc=%r15,<mulr5=%rcx
-add  %r15,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#13
-# asm 2: mov  $0,>mulc=%r15
-mov  $0,%r15
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#13
-# asm 2: adc <mulrdx=%rdx,<mulc=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = h3_stack
-# asm 1: movq <h3_stack=stack64#11,>mulrax=int64#7
-# asm 2: movq <h3_stack=80(%rsp),>mulrax=%rax
-movq 80(%rsp),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#8
-# asm 2: mul  <mulx3=%r10
-mul  %r10
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#13,<mulr6=int64#5
-# asm 2: add  <mulc=%r15,<mulr6=%r8
-add  %r15,%r8
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#2,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rsi,>mulrax=%rax
-mov  %rsi,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr5=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rt0 += mulr4
-# asm 1: add  <mulr4=int64#2,<rt0=int64#9
-# asm 2: add  <mulr4=%rsi,<rt0=%r11
-add  %rsi,%r11
-
-# qhasm:   carry? rt1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<rt1=int64#10
-# asm 2: adc <mulr5=%rcx,<rt1=%r12
-adc %rcx,%r12
-
-# qhasm:   carry? rt2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<rt2=int64#11
-# asm 2: adc <mulr6=%r8,<rt2=%r13
-adc %r8,%r13
-
-# qhasm:   carry? rt3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<rt3=int64#12
-# asm 2: adc <mulr7=%r9,<rt3=%r14
-adc %r9,%r14
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? rt0 += mulr8
-# asm 1: add  <mulr8=int64#3,<rt0=int64#9
-# asm 2: add  <mulr8=%rdx,<rt0=%r11
-add  %rdx,%r11
-
-# qhasm:   carry? rt1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt1=int64#10
-# asm 2: adc <mulzero=%rsi,<rt1=%r12
-adc %rsi,%r12
-
-# qhasm:   carry? rt2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt2=int64#11
-# asm 2: adc <mulzero=%rsi,<rt2=%r13
-adc %rsi,%r13
-
-# qhasm:   carry? rt3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt3=int64#12
-# asm 2: adc <mulzero=%rsi,<rt3=%r14
-adc %rsi,%r14
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   rt0 += mulzero
-# asm 1: add  <mulzero=int64#2,<rt0=int64#9
-# asm 2: add  <mulzero=%rsi,<rt0=%r11
-add  %rsi,%r11
-
-# qhasm: *(uint64 *)(rp + 96) = rt0
-# asm 1: movq   <rt0=int64#9,96(<rp=int64#1)
-# asm 2: movq   <rt0=%r11,96(<rp=%rdi)
-movq   %r11,96(%rdi)
-
-# qhasm: *(uint64 *)(rp + 104) = rt1
-# asm 1: movq   <rt1=int64#10,104(<rp=int64#1)
-# asm 2: movq   <rt1=%r12,104(<rp=%rdi)
-movq   %r12,104(%rdi)
-
-# qhasm: *(uint64 *)(rp + 112) = rt2
-# asm 1: movq   <rt2=int64#11,112(<rp=int64#1)
-# asm 2: movq   <rt2=%r13,112(<rp=%rdi)
-movq   %r13,112(%rdi)
-
-# qhasm: *(uint64 *)(rp + 120) = rt3
-# asm 1: movq   <rt3=int64#12,120(<rp=int64#1)
-# asm 2: movq   <rt3=%r14,120(<rp=%rdi)
-movq   %r14,120(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/ge25519_nielsadd_p1p1.s b/ext/ed25519-amd64-asm/ge25519_nielsadd_p1p1.s
deleted file mode 100644
index b5629462a..000000000
--- a/ext/ed25519-amd64-asm/ge25519_nielsadd_p1p1.s
+++ /dev/null
@@ -1,3072 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 pp
-
-# qhasm: int64 qp
-
-# qhasm: input rp
-
-# qhasm: input pp
-
-# qhasm: input qp
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 a0
-
-# qhasm: int64 a1
-
-# qhasm: int64 a2
-
-# qhasm: int64 a3
-
-# qhasm: stack64 a0_stack
-
-# qhasm: stack64 a1_stack
-
-# qhasm: stack64 a2_stack
-
-# qhasm: stack64 a3_stack
-
-# qhasm: int64 b0
-
-# qhasm: int64 b1
-
-# qhasm: int64 b2
-
-# qhasm: int64 b3
-
-# qhasm: stack64 b0_stack
-
-# qhasm: stack64 b1_stack
-
-# qhasm: stack64 b2_stack
-
-# qhasm: stack64 b3_stack
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: stack64 c0_stack
-
-# qhasm: stack64 c1_stack
-
-# qhasm: stack64 c2_stack
-
-# qhasm: stack64 c3_stack
-
-# qhasm: int64 d0
-
-# qhasm: int64 d1
-
-# qhasm: int64 d2
-
-# qhasm: int64 d3
-
-# qhasm: stack64 d0_stack
-
-# qhasm: stack64 d1_stack
-
-# qhasm: stack64 d2_stack
-
-# qhasm: stack64 d3_stack
-
-# qhasm: int64 e0
-
-# qhasm: int64 e1
-
-# qhasm: int64 e2
-
-# qhasm: int64 e3
-
-# qhasm: stack64 e0_stack
-
-# qhasm: stack64 e1_stack
-
-# qhasm: stack64 e2_stack
-
-# qhasm: stack64 e3_stack
-
-# qhasm: int64 f0
-
-# qhasm: int64 f1
-
-# qhasm: int64 f2
-
-# qhasm: int64 f3
-
-# qhasm: stack64 f0_stack
-
-# qhasm: stack64 f1_stack
-
-# qhasm: stack64 f2_stack
-
-# qhasm: stack64 f3_stack
-
-# qhasm: int64 g0
-
-# qhasm: int64 g1
-
-# qhasm: int64 g2
-
-# qhasm: int64 g3
-
-# qhasm: stack64 g0_stack
-
-# qhasm: stack64 g1_stack
-
-# qhasm: stack64 g2_stack
-
-# qhasm: stack64 g3_stack
-
-# qhasm: int64 h0
-
-# qhasm: int64 h1
-
-# qhasm: int64 h2
-
-# qhasm: int64 h3
-
-# qhasm: stack64 h0_stack
-
-# qhasm: stack64 h1_stack
-
-# qhasm: stack64 h2_stack
-
-# qhasm: stack64 h3_stack
-
-# qhasm: int64 qt0
-
-# qhasm: int64 qt1
-
-# qhasm: int64 qt2
-
-# qhasm: int64 qt3
-
-# qhasm: stack64 qt0_stack
-
-# qhasm: stack64 qt1_stack
-
-# qhasm: stack64 qt2_stack
-
-# qhasm: stack64 qt3_stack
-
-# qhasm: int64 t10
-
-# qhasm: int64 t11
-
-# qhasm: int64 t12
-
-# qhasm: int64 t13
-
-# qhasm: stack64 t10_stack
-
-# qhasm: stack64 t11_stack
-
-# qhasm: stack64 t12_stack
-
-# qhasm: stack64 t13_stack
-
-# qhasm: int64 t20
-
-# qhasm: int64 t21
-
-# qhasm: int64 t22
-
-# qhasm: int64 t23
-
-# qhasm: stack64 t20_stack
-
-# qhasm: stack64 t21_stack
-
-# qhasm: stack64 t22_stack
-
-# qhasm: stack64 t23_stack
-
-# qhasm: int64 rx0
-
-# qhasm: int64 rx1
-
-# qhasm: int64 rx2
-
-# qhasm: int64 rx3
-
-# qhasm: int64 ry0
-
-# qhasm: int64 ry1
-
-# qhasm: int64 ry2
-
-# qhasm: int64 ry3
-
-# qhasm: int64 rz0
-
-# qhasm: int64 rz1
-
-# qhasm: int64 rz2
-
-# qhasm: int64 rz3
-
-# qhasm: int64 rt0
-
-# qhasm: int64 rt1
-
-# qhasm: int64 rt2
-
-# qhasm: int64 rt3
-
-# qhasm: int64 mulr4
-
-# qhasm: int64 mulr5
-
-# qhasm: int64 mulr6
-
-# qhasm: int64 mulr7
-
-# qhasm: int64 mulr8
-
-# qhasm: int64 mulrax
-
-# qhasm: int64 mulrdx
-
-# qhasm: int64 mulx0
-
-# qhasm: int64 mulx1
-
-# qhasm: int64 mulx2
-
-# qhasm: int64 mulx3
-
-# qhasm: int64 mulc
-
-# qhasm: int64 mulzero
-
-# qhasm: int64 muli38
-
-# qhasm: int64 addt0
-
-# qhasm: int64 addt1
-
-# qhasm: int64 subt0
-
-# qhasm: int64 subt1
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1
-.globl crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1
-_crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1:
-crypto_sign_ed25519_amd64_64_ge25519_nielsadd_p1p1:
-mov %rsp,%r11
-and $31,%r11
-add $128,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: qp = qp
-# asm 1: mov  <qp=int64#3,>qp=int64#4
-# asm 2: mov  <qp=%rdx,>qp=%rcx
-mov  %rdx,%rcx
-
-# qhasm: a0 = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>a0=int64#3
-# asm 2: movq   32(<pp=%rsi),>a0=%rdx
-movq   32(%rsi),%rdx
-
-# qhasm: a1 = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>a1=int64#5
-# asm 2: movq   40(<pp=%rsi),>a1=%r8
-movq   40(%rsi),%r8
-
-# qhasm: a2 = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>a2=int64#6
-# asm 2: movq   48(<pp=%rsi),>a2=%r9
-movq   48(%rsi),%r9
-
-# qhasm: a3 = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>a3=int64#7
-# asm 2: movq   56(<pp=%rsi),>a3=%rax
-movq   56(%rsi),%rax
-
-# qhasm: b0 = a0
-# asm 1: mov  <a0=int64#3,>b0=int64#8
-# asm 2: mov  <a0=%rdx,>b0=%r10
-mov  %rdx,%r10
-
-# qhasm: b1 = a1
-# asm 1: mov  <a1=int64#5,>b1=int64#9
-# asm 2: mov  <a1=%r8,>b1=%r11
-mov  %r8,%r11
-
-# qhasm: b2 = a2
-# asm 1: mov  <a2=int64#6,>b2=int64#10
-# asm 2: mov  <a2=%r9,>b2=%r12
-mov  %r9,%r12
-
-# qhasm: b3 = a3
-# asm 1: mov  <a3=int64#7,>b3=int64#11
-# asm 2: mov  <a3=%rax,>b3=%r13
-mov  %rax,%r13
-
-# qhasm:   carry? a0 -= *(uint64 *) (pp + 0) 
-# asm 1: subq 0(<pp=int64#2),<a0=int64#3
-# asm 2: subq 0(<pp=%rsi),<a0=%rdx
-subq 0(%rsi),%rdx
-
-# qhasm:   carry? a1 -= *(uint64 *) (pp + 8) - carry
-# asm 1: sbbq 8(<pp=int64#2),<a1=int64#5
-# asm 2: sbbq 8(<pp=%rsi),<a1=%r8
-sbbq 8(%rsi),%r8
-
-# qhasm:   carry? a2 -= *(uint64 *) (pp + 16) - carry
-# asm 1: sbbq 16(<pp=int64#2),<a2=int64#6
-# asm 2: sbbq 16(<pp=%rsi),<a2=%r9
-sbbq 16(%rsi),%r9
-
-# qhasm:   carry? a3 -= *(uint64 *) (pp + 24) - carry
-# asm 1: sbbq 24(<pp=int64#2),<a3=int64#7
-# asm 2: sbbq 24(<pp=%rsi),<a3=%rax
-sbbq 24(%rsi),%rax
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#12
-# asm 2: mov  $0,>subt0=%r14
-mov  $0,%r14
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#13
-# asm 2: mov  $38,>subt1=%r15
-mov  $38,%r15
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#12,<subt1=int64#13
-# asm 2: cmovae <subt0=%r14,<subt1=%r15
-cmovae %r14,%r15
-
-# qhasm:   carry? a0 -= subt1
-# asm 1: sub  <subt1=int64#13,<a0=int64#3
-# asm 2: sub  <subt1=%r15,<a0=%rdx
-sub  %r15,%rdx
-
-# qhasm:   carry? a1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a1=int64#5
-# asm 2: sbb  <subt0=%r14,<a1=%r8
-sbb  %r14,%r8
-
-# qhasm:   carry? a2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a2=int64#6
-# asm 2: sbb  <subt0=%r14,<a2=%r9
-sbb  %r14,%r9
-
-# qhasm:   carry? a3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a3=int64#7
-# asm 2: sbb  <subt0=%r14,<a3=%rax
-sbb  %r14,%rax
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#13,<subt0=int64#12
-# asm 2: cmovc <subt1=%r15,<subt0=%r14
-cmovc %r15,%r14
-
-# qhasm:   a0 -= subt0
-# asm 1: sub  <subt0=int64#12,<a0=int64#3
-# asm 2: sub  <subt0=%r14,<a0=%rdx
-sub  %r14,%rdx
-
-# qhasm:   carry? b0 += *(uint64 *) (pp + 0) 
-# asm 1: addq 0(<pp=int64#2),<b0=int64#8
-# asm 2: addq 0(<pp=%rsi),<b0=%r10
-addq 0(%rsi),%r10
-
-# qhasm:   carry? b1 += *(uint64 *) (pp + 8) + carry
-# asm 1: adcq 8(<pp=int64#2),<b1=int64#9
-# asm 2: adcq 8(<pp=%rsi),<b1=%r11
-adcq 8(%rsi),%r11
-
-# qhasm:   carry? b2 += *(uint64 *) (pp + 16) + carry
-# asm 1: adcq 16(<pp=int64#2),<b2=int64#10
-# asm 2: adcq 16(<pp=%rsi),<b2=%r12
-adcq 16(%rsi),%r12
-
-# qhasm:   carry? b3 += *(uint64 *) (pp + 24) + carry
-# asm 1: adcq 24(<pp=int64#2),<b3=int64#11
-# asm 2: adcq 24(<pp=%rsi),<b3=%r13
-adcq 24(%rsi),%r13
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#12
-# asm 2: mov  $0,>addt0=%r14
-mov  $0,%r14
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#13
-# asm 2: mov  $38,>addt1=%r15
-mov  $38,%r15
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#12,<addt1=int64#13
-# asm 2: cmovae <addt0=%r14,<addt1=%r15
-cmovae %r14,%r15
-
-# qhasm:   carry? b0 += addt1
-# asm 1: add  <addt1=int64#13,<b0=int64#8
-# asm 2: add  <addt1=%r15,<b0=%r10
-add  %r15,%r10
-
-# qhasm:   carry? b1 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b1=int64#9
-# asm 2: adc <addt0=%r14,<b1=%r11
-adc %r14,%r11
-
-# qhasm:   carry? b2 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b2=int64#10
-# asm 2: adc <addt0=%r14,<b2=%r12
-adc %r14,%r12
-
-# qhasm:   carry? b3 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b3=int64#11
-# asm 2: adc <addt0=%r14,<b3=%r13
-adc %r14,%r13
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#13,<addt0=int64#12
-# asm 2: cmovc <addt1=%r15,<addt0=%r14
-cmovc %r15,%r14
-
-# qhasm:   b0 += addt0
-# asm 1: add  <addt0=int64#12,<b0=int64#8
-# asm 2: add  <addt0=%r14,<b0=%r10
-add  %r14,%r10
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#3,>a0_stack=stack64#8
-# asm 2: movq <a0=%rdx,>a0_stack=56(%rsp)
-movq %rdx,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#5,>a1_stack=stack64#9
-# asm 2: movq <a1=%r8,>a1_stack=64(%rsp)
-movq %r8,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#6,>a2_stack=stack64#10
-# asm 2: movq <a2=%r9,>a2_stack=72(%rsp)
-movq %r9,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#7,>a3_stack=stack64#11
-# asm 2: movq <a3=%rax,>a3_stack=80(%rsp)
-movq %rax,80(%rsp)
-
-# qhasm: b0_stack = b0
-# asm 1: movq <b0=int64#8,>b0_stack=stack64#12
-# asm 2: movq <b0=%r10,>b0_stack=88(%rsp)
-movq %r10,88(%rsp)
-
-# qhasm: b1_stack = b1
-# asm 1: movq <b1=int64#9,>b1_stack=stack64#13
-# asm 2: movq <b1=%r11,>b1_stack=96(%rsp)
-movq %r11,96(%rsp)
-
-# qhasm: b2_stack = b2
-# asm 1: movq <b2=int64#10,>b2_stack=stack64#14
-# asm 2: movq <b2=%r12,>b2_stack=104(%rsp)
-movq %r12,104(%rsp)
-
-# qhasm: b3_stack = b3
-# asm 1: movq <b3=int64#11,>b3_stack=stack64#15
-# asm 2: movq <b3=%r13,>b3_stack=112(%rsp)
-movq %r13,112(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = a0_stack
-# asm 1: movq <a0_stack=stack64#8,>mulx0=int64#10
-# asm 2: movq <a0_stack=56(%rsp),>mulx0=%r12
-movq 56(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   a0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>a0=int64#11
-# asm 2: mov  <mulrax=%rax,>a0=%r13
-mov  %rax,%r13
-
-# qhasm:   a1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>a1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>a1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a1 += mulrax
-# asm 1: add  <mulrax=int64#7,<a1=int64#12
-# asm 2: add  <mulrax=%rax,<a1=%r14
-add  %rax,%r14
-
-# qhasm:   a2 = 0
-# asm 1: mov  $0,>a2=int64#13
-# asm 2: mov  $0,>a2=%r15
-mov  $0,%r15
-
-# qhasm:   a2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<a2=int64#13
-# asm 2: adc <mulrdx=%rdx,<a2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   a3 = 0
-# asm 1: mov  $0,>a3=int64#14
-# asm 2: mov  $0,>a3=%rbx
-mov  $0,%rbx
-
-# qhasm:   a3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<a3=int64#14
-# asm 2: adc <mulrdx=%rdx,<a3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = a1_stack
-# asm 1: movq <a1_stack=stack64#9,>mulx1=int64#10
-# asm 2: movq <a1_stack=64(%rsp),>mulx1=%r12
-movq 64(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a1 += mulrax
-# asm 1: add  <mulrax=int64#7,<a1=int64#12
-# asm 2: add  <mulrax=%rax,<a1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a2 += mulc
-# asm 1: add  <mulc=int64#15,<a2=int64#13
-# asm 2: add  <mulc=%rbp,<a2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a3 += mulc
-# asm 1: add  <mulc=int64#15,<a3=int64#14
-# asm 2: add  <mulc=%rbp,<a3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = a2_stack
-# asm 1: movq <a2_stack=stack64#10,>mulx2=int64#10
-# asm 2: movq <a2_stack=72(%rsp),>mulx2=%r12
-movq 72(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a3 += mulc
-# asm 1: add  <mulc=int64#15,<a3=int64#14
-# asm 2: add  <mulc=%rbp,<a3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = a3_stack
-# asm 1: movq <a3_stack=stack64#11,>mulx3=int64#10
-# asm 2: movq <a3_stack=80(%rsp),>mulx3=%r12
-movq 80(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? a0 += mulr4
-# asm 1: add  <mulr4=int64#5,<a0=int64#11
-# asm 2: add  <mulr4=%r8,<a0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? a1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<a1=int64#12
-# asm 2: adc <mulr5=%r9,<a1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? a2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<a2=int64#13
-# asm 2: adc <mulr6=%r10,<a2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? a3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<a3=int64#14
-# asm 2: adc <mulr7=%r11,<a3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? a0 += mulr8
-# asm 1: add  <mulr8=int64#5,<a0=int64#11
-# asm 2: add  <mulr8=%r8,<a0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? a1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a1=int64#12
-# asm 2: adc <mulzero=%rdx,<a1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? a2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a2=int64#13
-# asm 2: adc <mulzero=%rdx,<a2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? a3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a3=int64#14
-# asm 2: adc <mulzero=%rdx,<a3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   a0 += mulzero
-# asm 1: add  <mulzero=int64#3,<a0=int64#11
-# asm 2: add  <mulzero=%rdx,<a0=%r13
-add  %rdx,%r13
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#11,>a0_stack=stack64#8
-# asm 2: movq <a0=%r13,>a0_stack=56(%rsp)
-movq %r13,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#12,>a1_stack=stack64#9
-# asm 2: movq <a1=%r14,>a1_stack=64(%rsp)
-movq %r14,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#13,>a2_stack=stack64#10
-# asm 2: movq <a2=%r15,>a2_stack=72(%rsp)
-movq %r15,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#14,>a3_stack=stack64#11
-# asm 2: movq <a3=%rbx,>a3_stack=80(%rsp)
-movq %rbx,80(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = b0_stack
-# asm 1: movq <b0_stack=stack64#12,>mulx0=int64#10
-# asm 2: movq <b0_stack=88(%rsp),>mulx0=%r12
-movq 88(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rcx),>mulrax=%rax
-movq   32(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   e0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>e0=int64#11
-# asm 2: mov  <mulrax=%rax,>e0=%r13
-mov  %rax,%r13
-
-# qhasm:   e1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>e1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>e1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rcx),>mulrax=%rax
-movq   40(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? e1 += mulrax
-# asm 1: add  <mulrax=int64#7,<e1=int64#12
-# asm 2: add  <mulrax=%rax,<e1=%r14
-add  %rax,%r14
-
-# qhasm:   e2 = 0
-# asm 1: mov  $0,>e2=int64#13
-# asm 2: mov  $0,>e2=%r15
-mov  $0,%r15
-
-# qhasm:   e2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<e2=int64#13
-# asm 2: adc <mulrdx=%rdx,<e2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rcx),>mulrax=%rax
-movq   48(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? e2 += mulrax
-# asm 1: add  <mulrax=int64#7,<e2=int64#13
-# asm 2: add  <mulrax=%rax,<e2=%r15
-add  %rax,%r15
-
-# qhasm:   e3 = 0
-# asm 1: mov  $0,>e3=int64#14
-# asm 2: mov  $0,>e3=%rbx
-mov  $0,%rbx
-
-# qhasm:   e3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<e3=int64#14
-# asm 2: adc <mulrdx=%rdx,<e3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rcx),>mulrax=%rax
-movq   56(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? e3 += mulrax
-# asm 1: add  <mulrax=int64#7,<e3=int64#14
-# asm 2: add  <mulrax=%rax,<e3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = b1_stack
-# asm 1: movq <b1_stack=stack64#13,>mulx1=int64#10
-# asm 2: movq <b1_stack=96(%rsp),>mulx1=%r12
-movq 96(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rcx),>mulrax=%rax
-movq   32(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? e1 += mulrax
-# asm 1: add  <mulrax=int64#7,<e1=int64#12
-# asm 2: add  <mulrax=%rax,<e1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rcx),>mulrax=%rax
-movq   40(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? e2 += mulrax
-# asm 1: add  <mulrax=int64#7,<e2=int64#13
-# asm 2: add  <mulrax=%rax,<e2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? e2 += mulc
-# asm 1: add  <mulc=int64#15,<e2=int64#13
-# asm 2: add  <mulc=%rbp,<e2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rcx),>mulrax=%rax
-movq   48(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? e3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<e3=int64#14
-# asm 2: add  <mulrax=%rax,<e3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? e3 += mulc
-# asm 1: add  <mulc=int64#15,<e3=int64#14
-# asm 2: add  <mulc=%rbp,<e3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rcx),>mulrax=%rax
-movq   56(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = b2_stack
-# asm 1: movq <b2_stack=stack64#14,>mulx2=int64#10
-# asm 2: movq <b2_stack=104(%rsp),>mulx2=%r12
-movq 104(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rcx),>mulrax=%rax
-movq   32(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? e2 += mulrax
-# asm 1: add  <mulrax=int64#7,<e2=int64#13
-# asm 2: add  <mulrax=%rax,<e2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rcx),>mulrax=%rax
-movq   40(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? e3 += mulrax
-# asm 1: add  <mulrax=int64#7,<e3=int64#14
-# asm 2: add  <mulrax=%rax,<e3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? e3 += mulc
-# asm 1: add  <mulc=int64#15,<e3=int64#14
-# asm 2: add  <mulc=%rbp,<e3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rcx),>mulrax=%rax
-movq   48(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rcx),>mulrax=%rax
-movq   56(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = b3_stack
-# asm 1: movq <b3_stack=stack64#15,>mulx3=int64#10
-# asm 2: movq <b3_stack=112(%rsp),>mulx3=%r12
-movq 112(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rcx),>mulrax=%rax
-movq   32(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? e3 += mulrax
-# asm 1: add  <mulrax=int64#7,<e3=int64#14
-# asm 2: add  <mulrax=%rax,<e3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rcx),>mulrax=%rax
-movq   40(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rcx),>mulrax=%rax
-movq   48(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rcx),>mulrax=%rax
-movq   56(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? e0 += mulr4
-# asm 1: add  <mulr4=int64#5,<e0=int64#11
-# asm 2: add  <mulr4=%r8,<e0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? e1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<e1=int64#12
-# asm 2: adc <mulr5=%r9,<e1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? e2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<e2=int64#13
-# asm 2: adc <mulr6=%r10,<e2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? e3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<e3=int64#14
-# asm 2: adc <mulr7=%r11,<e3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? e0 += mulr8
-# asm 1: add  <mulr8=int64#5,<e0=int64#11
-# asm 2: add  <mulr8=%r8,<e0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? e1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<e1=int64#12
-# asm 2: adc <mulzero=%rdx,<e1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? e2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<e2=int64#13
-# asm 2: adc <mulzero=%rdx,<e2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? e3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<e3=int64#14
-# asm 2: adc <mulzero=%rdx,<e3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   e0 += mulzero
-# asm 1: add  <mulzero=int64#3,<e0=int64#11
-# asm 2: add  <mulzero=%rdx,<e0=%r13
-add  %rdx,%r13
-
-# qhasm: h0 = e0
-# asm 1: mov  <e0=int64#11,>h0=int64#3
-# asm 2: mov  <e0=%r13,>h0=%rdx
-mov  %r13,%rdx
-
-# qhasm: h1 = e1
-# asm 1: mov  <e1=int64#12,>h1=int64#5
-# asm 2: mov  <e1=%r14,>h1=%r8
-mov  %r14,%r8
-
-# qhasm: h2 = e2
-# asm 1: mov  <e2=int64#13,>h2=int64#6
-# asm 2: mov  <e2=%r15,>h2=%r9
-mov  %r15,%r9
-
-# qhasm: h3 = e3
-# asm 1: mov  <e3=int64#14,>h3=int64#7
-# asm 2: mov  <e3=%rbx,>h3=%rax
-mov  %rbx,%rax
-
-# qhasm:   carry? e0 -= a0_stack 
-# asm 1: subq <a0_stack=stack64#8,<e0=int64#11
-# asm 2: subq <a0_stack=56(%rsp),<e0=%r13
-subq 56(%rsp),%r13
-
-# qhasm:   carry? e1 -= a1_stack - carry
-# asm 1: sbbq <a1_stack=stack64#9,<e1=int64#12
-# asm 2: sbbq <a1_stack=64(%rsp),<e1=%r14
-sbbq 64(%rsp),%r14
-
-# qhasm:   carry? e2 -= a2_stack - carry
-# asm 1: sbbq <a2_stack=stack64#10,<e2=int64#13
-# asm 2: sbbq <a2_stack=72(%rsp),<e2=%r15
-sbbq 72(%rsp),%r15
-
-# qhasm:   carry? e3 -= a3_stack - carry
-# asm 1: sbbq <a3_stack=stack64#11,<e3=int64#14
-# asm 2: sbbq <a3_stack=80(%rsp),<e3=%rbx
-sbbq 80(%rsp),%rbx
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#8
-# asm 2: mov  $0,>subt0=%r10
-mov  $0,%r10
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#9
-# asm 2: mov  $38,>subt1=%r11
-mov  $38,%r11
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#8,<subt1=int64#9
-# asm 2: cmovae <subt0=%r10,<subt1=%r11
-cmovae %r10,%r11
-
-# qhasm:   carry? e0 -= subt1
-# asm 1: sub  <subt1=int64#9,<e0=int64#11
-# asm 2: sub  <subt1=%r11,<e0=%r13
-sub  %r11,%r13
-
-# qhasm:   carry? e1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<e1=int64#12
-# asm 2: sbb  <subt0=%r10,<e1=%r14
-sbb  %r10,%r14
-
-# qhasm:   carry? e2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<e2=int64#13
-# asm 2: sbb  <subt0=%r10,<e2=%r15
-sbb  %r10,%r15
-
-# qhasm:   carry? e3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<e3=int64#14
-# asm 2: sbb  <subt0=%r10,<e3=%rbx
-sbb  %r10,%rbx
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#9,<subt0=int64#8
-# asm 2: cmovc <subt1=%r11,<subt0=%r10
-cmovc %r11,%r10
-
-# qhasm:   e0 -= subt0
-# asm 1: sub  <subt0=int64#8,<e0=int64#11
-# asm 2: sub  <subt0=%r10,<e0=%r13
-sub  %r10,%r13
-
-# qhasm:   carry? h0 += a0_stack 
-# asm 1: addq <a0_stack=stack64#8,<h0=int64#3
-# asm 2: addq <a0_stack=56(%rsp),<h0=%rdx
-addq 56(%rsp),%rdx
-
-# qhasm:   carry? h1 += a1_stack + carry
-# asm 1: adcq <a1_stack=stack64#9,<h1=int64#5
-# asm 2: adcq <a1_stack=64(%rsp),<h1=%r8
-adcq 64(%rsp),%r8
-
-# qhasm:   carry? h2 += a2_stack + carry
-# asm 1: adcq <a2_stack=stack64#10,<h2=int64#6
-# asm 2: adcq <a2_stack=72(%rsp),<h2=%r9
-adcq 72(%rsp),%r9
-
-# qhasm:   carry? h3 += a3_stack + carry
-# asm 1: adcq <a3_stack=stack64#11,<h3=int64#7
-# asm 2: adcq <a3_stack=80(%rsp),<h3=%rax
-adcq 80(%rsp),%rax
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#8
-# asm 2: mov  $0,>addt0=%r10
-mov  $0,%r10
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#9
-# asm 2: mov  $38,>addt1=%r11
-mov  $38,%r11
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#8,<addt1=int64#9
-# asm 2: cmovae <addt0=%r10,<addt1=%r11
-cmovae %r10,%r11
-
-# qhasm:   carry? h0 += addt1
-# asm 1: add  <addt1=int64#9,<h0=int64#3
-# asm 2: add  <addt1=%r11,<h0=%rdx
-add  %r11,%rdx
-
-# qhasm:   carry? h1 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<h1=int64#5
-# asm 2: adc <addt0=%r10,<h1=%r8
-adc %r10,%r8
-
-# qhasm:   carry? h2 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<h2=int64#6
-# asm 2: adc <addt0=%r10,<h2=%r9
-adc %r10,%r9
-
-# qhasm:   carry? h3 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<h3=int64#7
-# asm 2: adc <addt0=%r10,<h3=%rax
-adc %r10,%rax
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#9,<addt0=int64#8
-# asm 2: cmovc <addt1=%r11,<addt0=%r10
-cmovc %r11,%r10
-
-# qhasm:   h0 += addt0
-# asm 1: add  <addt0=int64#8,<h0=int64#3
-# asm 2: add  <addt0=%r10,<h0=%rdx
-add  %r10,%rdx
-
-# qhasm: *(uint64 *)(rp + 64) = h0
-# asm 1: movq   <h0=int64#3,64(<rp=int64#1)
-# asm 2: movq   <h0=%rdx,64(<rp=%rdi)
-movq   %rdx,64(%rdi)
-
-# qhasm: *(uint64 *)(rp + 72) = h1
-# asm 1: movq   <h1=int64#5,72(<rp=int64#1)
-# asm 2: movq   <h1=%r8,72(<rp=%rdi)
-movq   %r8,72(%rdi)
-
-# qhasm: *(uint64 *)(rp + 80) = h2
-# asm 1: movq   <h2=int64#6,80(<rp=int64#1)
-# asm 2: movq   <h2=%r9,80(<rp=%rdi)
-movq   %r9,80(%rdi)
-
-# qhasm: *(uint64 *)(rp + 88) = h3
-# asm 1: movq   <h3=int64#7,88(<rp=int64#1)
-# asm 2: movq   <h3=%rax,88(<rp=%rdi)
-movq   %rax,88(%rdi)
-
-# qhasm: *(uint64 *)(rp + 0) = e0
-# asm 1: movq   <e0=int64#11,0(<rp=int64#1)
-# asm 2: movq   <e0=%r13,0(<rp=%rdi)
-movq   %r13,0(%rdi)
-
-# qhasm: *(uint64 *)(rp + 8) = e1
-# asm 1: movq   <e1=int64#12,8(<rp=int64#1)
-# asm 2: movq   <e1=%r14,8(<rp=%rdi)
-movq   %r14,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = e2
-# asm 1: movq   <e2=int64#13,16(<rp=int64#1)
-# asm 2: movq   <e2=%r15,16(<rp=%rdi)
-movq   %r15,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = e3
-# asm 1: movq   <e3=int64#14,24(<rp=int64#1)
-# asm 2: movq   <e3=%rbx,24(<rp=%rdi)
-movq   %rbx,24(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulx0=int64#10
-# asm 2: movq   96(<pp=%rsi),>mulx0=%r12
-movq   96(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   c0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>c0=int64#11
-# asm 2: mov  <mulrax=%rax,>c0=%r13
-mov  %rax,%r13
-
-# qhasm:   c1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>c1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>c1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#12
-# asm 2: add  <mulrax=%rax,<c1=%r14
-add  %rax,%r14
-
-# qhasm:   c2 = 0
-# asm 1: mov  $0,>c2=int64#13
-# asm 2: mov  $0,>c2=%r15
-mov  $0,%r15
-
-# qhasm:   c2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c2=int64#13
-# asm 2: adc <mulrdx=%rdx,<c2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   c3 = 0
-# asm 1: mov  $0,>c3=int64#14
-# asm 2: mov  $0,>c3=%rbx
-mov  $0,%rbx
-
-# qhasm:   c3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c3=int64#14
-# asm 2: adc <mulrdx=%rdx,<c3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulx1=int64#10
-# asm 2: movq   104(<pp=%rsi),>mulx1=%r12
-movq   104(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#12
-# asm 2: add  <mulrax=%rax,<c1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c2 += mulc
-# asm 1: add  <mulc=int64#15,<c2=int64#13
-# asm 2: add  <mulc=%rbp,<c2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#15,<c3=int64#14
-# asm 2: add  <mulc=%rbp,<c3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulx2=int64#10
-# asm 2: movq   112(<pp=%rsi),>mulx2=%r12
-movq   112(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#15,<c3=int64#14
-# asm 2: add  <mulc=%rbp,<c3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulx3=int64#10
-# asm 2: movq   120(<pp=%rsi),>mulx3=%r12
-movq   120(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
-# asm 2: mov  <mulrax=%rax,>mulr4=%rcx
-mov  %rax,%rcx
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#5
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
-mov  %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#8
-# asm 2: add  <mulrax=%rax,<mulr7=%r10
-add  %rax,%r10
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? c0 += mulr4
-# asm 1: add  <mulr4=int64#4,<c0=int64#11
-# asm 2: add  <mulr4=%rcx,<c0=%r13
-add  %rcx,%r13
-
-# qhasm:   carry? c1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#5,<c1=int64#12
-# asm 2: adc <mulr5=%r8,<c1=%r14
-adc %r8,%r14
-
-# qhasm:   carry? c2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#6,<c2=int64#13
-# asm 2: adc <mulr6=%r9,<c2=%r15
-adc %r9,%r15
-
-# qhasm:   carry? c3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#8,<c3=int64#14
-# asm 2: adc <mulr7=%r10,<c3=%rbx
-adc %r10,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#4
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? c0 += mulr8
-# asm 1: add  <mulr8=int64#4,<c0=int64#11
-# asm 2: add  <mulr8=%rcx,<c0=%r13
-add  %rcx,%r13
-
-# qhasm:   carry? c1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c1=int64#12
-# asm 2: adc <mulzero=%rdx,<c1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? c2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c2=int64#13
-# asm 2: adc <mulzero=%rdx,<c2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? c3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c3=int64#14
-# asm 2: adc <mulzero=%rdx,<c3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   c0 += mulzero
-# asm 1: add  <mulzero=int64#3,<c0=int64#11
-# asm 2: add  <mulzero=%rdx,<c0=%r13
-add  %rdx,%r13
-
-# qhasm: f0 = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>f0=int64#3
-# asm 2: movq   64(<pp=%rsi),>f0=%rdx
-movq   64(%rsi),%rdx
-
-# qhasm: f1 = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>f1=int64#4
-# asm 2: movq   72(<pp=%rsi),>f1=%rcx
-movq   72(%rsi),%rcx
-
-# qhasm: f2 = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>f2=int64#5
-# asm 2: movq   80(<pp=%rsi),>f2=%r8
-movq   80(%rsi),%r8
-
-# qhasm: f3 = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>f3=int64#2
-# asm 2: movq   88(<pp=%rsi),>f3=%rsi
-movq   88(%rsi),%rsi
-
-# qhasm:   carry? f0 += f0 
-# asm 1: add  <f0=int64#3,<f0=int64#3
-# asm 2: add  <f0=%rdx,<f0=%rdx
-add  %rdx,%rdx
-
-# qhasm:   carry? f1 += f1 + carry
-# asm 1: adc <f1=int64#4,<f1=int64#4
-# asm 2: adc <f1=%rcx,<f1=%rcx
-adc %rcx,%rcx
-
-# qhasm:   carry? f2 += f2 + carry
-# asm 1: adc <f2=int64#5,<f2=int64#5
-# asm 2: adc <f2=%r8,<f2=%r8
-adc %r8,%r8
-
-# qhasm:   carry? f3 += f3 + carry
-# asm 1: adc <f3=int64#2,<f3=int64#2
-# asm 2: adc <f3=%rsi,<f3=%rsi
-adc %rsi,%rsi
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#6
-# asm 2: mov  $0,>addt0=%r9
-mov  $0,%r9
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#7
-# asm 2: mov  $38,>addt1=%rax
-mov  $38,%rax
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#6,<addt1=int64#7
-# asm 2: cmovae <addt0=%r9,<addt1=%rax
-cmovae %r9,%rax
-
-# qhasm:   carry? f0 += addt1
-# asm 1: add  <addt1=int64#7,<f0=int64#3
-# asm 2: add  <addt1=%rax,<f0=%rdx
-add  %rax,%rdx
-
-# qhasm:   carry? f1 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<f1=int64#4
-# asm 2: adc <addt0=%r9,<f1=%rcx
-adc %r9,%rcx
-
-# qhasm:   carry? f2 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<f2=int64#5
-# asm 2: adc <addt0=%r9,<f2=%r8
-adc %r9,%r8
-
-# qhasm:   carry? f3 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<f3=int64#2
-# asm 2: adc <addt0=%r9,<f3=%rsi
-adc %r9,%rsi
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#7,<addt0=int64#6
-# asm 2: cmovc <addt1=%rax,<addt0=%r9
-cmovc %rax,%r9
-
-# qhasm:   f0 += addt0
-# asm 1: add  <addt0=int64#6,<f0=int64#3
-# asm 2: add  <addt0=%r9,<f0=%rdx
-add  %r9,%rdx
-
-# qhasm: g0 = f0
-# asm 1: mov  <f0=int64#3,>g0=int64#6
-# asm 2: mov  <f0=%rdx,>g0=%r9
-mov  %rdx,%r9
-
-# qhasm: g1 = f1
-# asm 1: mov  <f1=int64#4,>g1=int64#7
-# asm 2: mov  <f1=%rcx,>g1=%rax
-mov  %rcx,%rax
-
-# qhasm: g2 = f2
-# asm 1: mov  <f2=int64#5,>g2=int64#8
-# asm 2: mov  <f2=%r8,>g2=%r10
-mov  %r8,%r10
-
-# qhasm: g3 = f3
-# asm 1: mov  <f3=int64#2,>g3=int64#9
-# asm 2: mov  <f3=%rsi,>g3=%r11
-mov  %rsi,%r11
-
-# qhasm:   carry? f0 -= c0 
-# asm 1: sub  <c0=int64#11,<f0=int64#3
-# asm 2: sub  <c0=%r13,<f0=%rdx
-sub  %r13,%rdx
-
-# qhasm:   carry? f1 -= c1 - carry
-# asm 1: sbb  <c1=int64#12,<f1=int64#4
-# asm 2: sbb  <c1=%r14,<f1=%rcx
-sbb  %r14,%rcx
-
-# qhasm:   carry? f2 -= c2 - carry
-# asm 1: sbb  <c2=int64#13,<f2=int64#5
-# asm 2: sbb  <c2=%r15,<f2=%r8
-sbb  %r15,%r8
-
-# qhasm:   carry? f3 -= c3 - carry
-# asm 1: sbb  <c3=int64#14,<f3=int64#2
-# asm 2: sbb  <c3=%rbx,<f3=%rsi
-sbb  %rbx,%rsi
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#10
-# asm 2: mov  $0,>subt0=%r12
-mov  $0,%r12
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#15
-# asm 2: mov  $38,>subt1=%rbp
-mov  $38,%rbp
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#10,<subt1=int64#15
-# asm 2: cmovae <subt0=%r12,<subt1=%rbp
-cmovae %r12,%rbp
-
-# qhasm:   carry? f0 -= subt1
-# asm 1: sub  <subt1=int64#15,<f0=int64#3
-# asm 2: sub  <subt1=%rbp,<f0=%rdx
-sub  %rbp,%rdx
-
-# qhasm:   carry? f1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#10,<f1=int64#4
-# asm 2: sbb  <subt0=%r12,<f1=%rcx
-sbb  %r12,%rcx
-
-# qhasm:   carry? f2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#10,<f2=int64#5
-# asm 2: sbb  <subt0=%r12,<f2=%r8
-sbb  %r12,%r8
-
-# qhasm:   carry? f3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#10,<f3=int64#2
-# asm 2: sbb  <subt0=%r12,<f3=%rsi
-sbb  %r12,%rsi
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#15,<subt0=int64#10
-# asm 2: cmovc <subt1=%rbp,<subt0=%r12
-cmovc %rbp,%r12
-
-# qhasm:   f0 -= subt0
-# asm 1: sub  <subt0=int64#10,<f0=int64#3
-# asm 2: sub  <subt0=%r12,<f0=%rdx
-sub  %r12,%rdx
-
-# qhasm:   carry? g0 += c0 
-# asm 1: add  <c0=int64#11,<g0=int64#6
-# asm 2: add  <c0=%r13,<g0=%r9
-add  %r13,%r9
-
-# qhasm:   carry? g1 += c1 + carry
-# asm 1: adc <c1=int64#12,<g1=int64#7
-# asm 2: adc <c1=%r14,<g1=%rax
-adc %r14,%rax
-
-# qhasm:   carry? g2 += c2 + carry
-# asm 1: adc <c2=int64#13,<g2=int64#8
-# asm 2: adc <c2=%r15,<g2=%r10
-adc %r15,%r10
-
-# qhasm:   carry? g3 += c3 + carry
-# asm 1: adc <c3=int64#14,<g3=int64#9
-# asm 2: adc <c3=%rbx,<g3=%r11
-adc %rbx,%r11
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#10
-# asm 2: mov  $0,>addt0=%r12
-mov  $0,%r12
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#11
-# asm 2: mov  $38,>addt1=%r13
-mov  $38,%r13
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#10,<addt1=int64#11
-# asm 2: cmovae <addt0=%r12,<addt1=%r13
-cmovae %r12,%r13
-
-# qhasm:   carry? g0 += addt1
-# asm 1: add  <addt1=int64#11,<g0=int64#6
-# asm 2: add  <addt1=%r13,<g0=%r9
-add  %r13,%r9
-
-# qhasm:   carry? g1 += addt0 + carry
-# asm 1: adc <addt0=int64#10,<g1=int64#7
-# asm 2: adc <addt0=%r12,<g1=%rax
-adc %r12,%rax
-
-# qhasm:   carry? g2 += addt0 + carry
-# asm 1: adc <addt0=int64#10,<g2=int64#8
-# asm 2: adc <addt0=%r12,<g2=%r10
-adc %r12,%r10
-
-# qhasm:   carry? g3 += addt0 + carry
-# asm 1: adc <addt0=int64#10,<g3=int64#9
-# asm 2: adc <addt0=%r12,<g3=%r11
-adc %r12,%r11
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#11,<addt0=int64#10
-# asm 2: cmovc <addt1=%r13,<addt0=%r12
-cmovc %r13,%r12
-
-# qhasm:   g0 += addt0
-# asm 1: add  <addt0=int64#10,<g0=int64#6
-# asm 2: add  <addt0=%r12,<g0=%r9
-add  %r12,%r9
-
-# qhasm: *(uint64 *)(rp + 32) = g0
-# asm 1: movq   <g0=int64#6,32(<rp=int64#1)
-# asm 2: movq   <g0=%r9,32(<rp=%rdi)
-movq   %r9,32(%rdi)
-
-# qhasm: *(uint64 *)(rp + 40) = g1
-# asm 1: movq   <g1=int64#7,40(<rp=int64#1)
-# asm 2: movq   <g1=%rax,40(<rp=%rdi)
-movq   %rax,40(%rdi)
-
-# qhasm: *(uint64 *)(rp + 48) = g2
-# asm 1: movq   <g2=int64#8,48(<rp=int64#1)
-# asm 2: movq   <g2=%r10,48(<rp=%rdi)
-movq   %r10,48(%rdi)
-
-# qhasm: *(uint64 *)(rp + 56) = g3
-# asm 1: movq   <g3=int64#9,56(<rp=int64#1)
-# asm 2: movq   <g3=%r11,56(<rp=%rdi)
-movq   %r11,56(%rdi)
-
-# qhasm: *(uint64 *)(rp + 96) = f0
-# asm 1: movq   <f0=int64#3,96(<rp=int64#1)
-# asm 2: movq   <f0=%rdx,96(<rp=%rdi)
-movq   %rdx,96(%rdi)
-
-# qhasm: *(uint64 *)(rp + 104) = f1
-# asm 1: movq   <f1=int64#4,104(<rp=int64#1)
-# asm 2: movq   <f1=%rcx,104(<rp=%rdi)
-movq   %rcx,104(%rdi)
-
-# qhasm: *(uint64 *)(rp + 112) = f2
-# asm 1: movq   <f2=int64#5,112(<rp=int64#1)
-# asm 2: movq   <f2=%r8,112(<rp=%rdi)
-movq   %r8,112(%rdi)
-
-# qhasm: *(uint64 *)(rp + 120) = f3
-# asm 1: movq   <f3=int64#2,120(<rp=int64#1)
-# asm 2: movq   <f3=%rsi,120(<rp=%rdi)
-movq   %rsi,120(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/ge25519_p1p1_to_p2.s b/ext/ed25519-amd64-asm/ge25519_p1p1_to_p2.s
deleted file mode 100644
index beddbc791..000000000
--- a/ext/ed25519-amd64-asm/ge25519_p1p1_to_p2.s
+++ /dev/null
@@ -1,2236 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 pp
-
-# qhasm: input rp
-
-# qhasm: input pp
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 rx0
-
-# qhasm: int64 rx1
-
-# qhasm: int64 rx2
-
-# qhasm: int64 rx3
-
-# qhasm: int64 ry0
-
-# qhasm: int64 ry1
-
-# qhasm: int64 ry2
-
-# qhasm: int64 ry3
-
-# qhasm: int64 rz0
-
-# qhasm: int64 rz1
-
-# qhasm: int64 rz2
-
-# qhasm: int64 rz3
-
-# qhasm: int64 mulr4
-
-# qhasm: int64 mulr5
-
-# qhasm: int64 mulr6
-
-# qhasm: int64 mulr7
-
-# qhasm: int64 mulr8
-
-# qhasm: int64 mulrax
-
-# qhasm: int64 mulrdx
-
-# qhasm: int64 mulx0
-
-# qhasm: int64 mulx1
-
-# qhasm: int64 mulx2
-
-# qhasm: int64 mulx3
-
-# qhasm: int64 mulc
-
-# qhasm: int64 mulzero
-
-# qhasm: int64 muli38
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2
-.globl crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2
-_crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2:
-crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p2:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 0)
-# asm 1: movq   0(<pp=int64#2),>mulx0=int64#9
-# asm 2: movq   0(<pp=%rsi),>mulx0=%r11
-movq   0(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   rx0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rx0=int64#10
-# asm 2: mov  <mulrax=%rax,>rx0=%r12
-mov  %rax,%r12
-
-# qhasm:   rx1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rx1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>rx1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#11
-# asm 2: add  <mulrax=%rax,<rx1=%r13
-add  %rax,%r13
-
-# qhasm:   rx2 = 0
-# asm 1: mov  $0,>rx2=int64#12
-# asm 2: mov  $0,>rx2=%r14
-mov  $0,%r14
-
-# qhasm:   rx2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx2=int64#12
-# asm 2: adc <mulrdx=%rdx,<rx2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#12
-# asm 2: add  <mulrax=%rax,<rx2=%r14
-add  %rax,%r14
-
-# qhasm:   rx3 = 0
-# asm 1: mov  $0,>rx3=int64#13
-# asm 2: mov  $0,>rx3=%r15
-mov  $0,%r15
-
-# qhasm:   rx3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx3=int64#13
-# asm 2: adc <mulrdx=%rdx,<rx3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#13
-# asm 2: add  <mulrax=%rax,<rx3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 8)
-# asm 1: movq   8(<pp=int64#2),>mulx1=int64#9
-# asm 2: movq   8(<pp=%rsi),>mulx1=%r11
-movq   8(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#11
-# asm 2: add  <mulrax=%rax,<rx1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#12
-# asm 2: add  <mulrax=%rax,<rx2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx2 += mulc
-# asm 1: add  <mulc=int64#14,<rx2=int64#12
-# asm 2: add  <mulc=%rbx,<rx2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rx3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rx3=int64#13
-# asm 2: add  <mulrax=%rax,<rx3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#14,<rx3=int64#13
-# asm 2: add  <mulc=%rbx,<rx3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 16)
-# asm 1: movq   16(<pp=int64#2),>mulx2=int64#9
-# asm 2: movq   16(<pp=%rsi),>mulx2=%r11
-movq   16(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#12
-# asm 2: add  <mulrax=%rax,<rx2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#13
-# asm 2: add  <mulrax=%rax,<rx3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#14,<rx3=int64#13
-# asm 2: add  <mulc=%rbx,<rx3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 24)
-# asm 1: movq   24(<pp=int64#2),>mulx3=int64#9
-# asm 2: movq   24(<pp=%rsi),>mulx3=%r11
-movq   24(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#13
-# asm 2: add  <mulrax=%rax,<rx3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
-# asm 2: mov  <mulrax=%rax,>mulr4=%rcx
-mov  %rax,%rcx
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#5
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
-mov  %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#8
-# asm 2: add  <mulrax=%rax,<mulr7=%r10
-add  %rax,%r10
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rx0 += mulr4
-# asm 1: add  <mulr4=int64#4,<rx0=int64#10
-# asm 2: add  <mulr4=%rcx,<rx0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? rx1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#5,<rx1=int64#11
-# asm 2: adc <mulr5=%r8,<rx1=%r13
-adc %r8,%r13
-
-# qhasm:   carry? rx2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#6,<rx2=int64#12
-# asm 2: adc <mulr6=%r9,<rx2=%r14
-adc %r9,%r14
-
-# qhasm:   carry? rx3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#8,<rx3=int64#13
-# asm 2: adc <mulr7=%r10,<rx3=%r15
-adc %r10,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#4
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? rx0 += mulr8
-# asm 1: add  <mulr8=int64#4,<rx0=int64#10
-# asm 2: add  <mulr8=%rcx,<rx0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? rx1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx1=int64#11
-# asm 2: adc <mulzero=%rdx,<rx1=%r13
-adc %rdx,%r13
-
-# qhasm:   carry? rx2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx2=int64#12
-# asm 2: adc <mulzero=%rdx,<rx2=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? rx3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx3=int64#13
-# asm 2: adc <mulzero=%rdx,<rx3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   rx0 += mulzero
-# asm 1: add  <mulzero=int64#3,<rx0=int64#10
-# asm 2: add  <mulzero=%rdx,<rx0=%r12
-add  %rdx,%r12
-
-# qhasm: *(uint64 *)(rp + 0) = rx0
-# asm 1: movq   <rx0=int64#10,0(<rp=int64#1)
-# asm 2: movq   <rx0=%r12,0(<rp=%rdi)
-movq   %r12,0(%rdi)
-
-# qhasm: *(uint64 *)(rp + 8) = rx1
-# asm 1: movq   <rx1=int64#11,8(<rp=int64#1)
-# asm 2: movq   <rx1=%r13,8(<rp=%rdi)
-movq   %r13,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = rx2
-# asm 1: movq   <rx2=int64#12,16(<rp=int64#1)
-# asm 2: movq   <rx2=%r14,16(<rp=%rdi)
-movq   %r14,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = rx3
-# asm 1: movq   <rx3=int64#13,24(<rp=int64#1)
-# asm 2: movq   <rx3=%r15,24(<rp=%rdi)
-movq   %r15,24(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>mulx0=int64#9
-# asm 2: movq   64(<pp=%rsi),>mulx0=%r11
-movq   64(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<pp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   ry0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>ry0=int64#10
-# asm 2: mov  <mulrax=%rax,>ry0=%r12
-mov  %rax,%r12
-
-# qhasm:   ry1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>ry1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>ry1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<pp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? ry1 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry1=int64#11
-# asm 2: add  <mulrax=%rax,<ry1=%r13
-add  %rax,%r13
-
-# qhasm:   ry2 = 0
-# asm 1: mov  $0,>ry2=int64#12
-# asm 2: mov  $0,>ry2=%r14
-mov  $0,%r14
-
-# qhasm:   ry2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<ry2=int64#12
-# asm 2: adc <mulrdx=%rdx,<ry2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<pp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#12
-# asm 2: add  <mulrax=%rax,<ry2=%r14
-add  %rax,%r14
-
-# qhasm:   ry3 = 0
-# asm 1: mov  $0,>ry3=int64#13
-# asm 2: mov  $0,>ry3=%r15
-mov  $0,%r15
-
-# qhasm:   ry3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<ry3=int64#13
-# asm 2: adc <mulrdx=%rdx,<ry3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<pp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#13
-# asm 2: add  <mulrax=%rax,<ry3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>mulx1=int64#9
-# asm 2: movq   72(<pp=%rsi),>mulx1=%r11
-movq   72(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<pp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? ry1 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry1=int64#11
-# asm 2: add  <mulrax=%rax,<ry1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<pp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#12
-# asm 2: add  <mulrax=%rax,<ry2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry2 += mulc
-# asm 1: add  <mulc=int64#14,<ry2=int64#12
-# asm 2: add  <mulc=%rbx,<ry2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<pp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? ry3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<ry3=int64#13
-# asm 2: add  <mulrax=%rax,<ry3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry3 += mulc
-# asm 1: add  <mulc=int64#14,<ry3=int64#13
-# asm 2: add  <mulc=%rbx,<ry3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<pp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>mulx2=int64#9
-# asm 2: movq   80(<pp=%rsi),>mulx2=%r11
-movq   80(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<pp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#12
-# asm 2: add  <mulrax=%rax,<ry2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<pp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#13
-# asm 2: add  <mulrax=%rax,<ry3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry3 += mulc
-# asm 1: add  <mulc=int64#14,<ry3=int64#13
-# asm 2: add  <mulc=%rbx,<ry3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<pp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<pp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>mulx3=int64#9
-# asm 2: movq   88(<pp=%rsi),>mulx3=%r11
-movq   88(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<pp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#13
-# asm 2: add  <mulrax=%rax,<ry3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<pp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<pp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<pp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
-# asm 2: mov  <mulrax=%rax,>mulr4=%rcx
-mov  %rax,%rcx
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#5
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
-mov  %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#8
-# asm 2: add  <mulrax=%rax,<mulr7=%r10
-add  %rax,%r10
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? ry0 += mulr4
-# asm 1: add  <mulr4=int64#4,<ry0=int64#10
-# asm 2: add  <mulr4=%rcx,<ry0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? ry1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#5,<ry1=int64#11
-# asm 2: adc <mulr5=%r8,<ry1=%r13
-adc %r8,%r13
-
-# qhasm:   carry? ry2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#6,<ry2=int64#12
-# asm 2: adc <mulr6=%r9,<ry2=%r14
-adc %r9,%r14
-
-# qhasm:   carry? ry3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#8,<ry3=int64#13
-# asm 2: adc <mulr7=%r10,<ry3=%r15
-adc %r10,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#4
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? ry0 += mulr8
-# asm 1: add  <mulr8=int64#4,<ry0=int64#10
-# asm 2: add  <mulr8=%rcx,<ry0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? ry1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<ry1=int64#11
-# asm 2: adc <mulzero=%rdx,<ry1=%r13
-adc %rdx,%r13
-
-# qhasm:   carry? ry2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<ry2=int64#12
-# asm 2: adc <mulzero=%rdx,<ry2=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? ry3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<ry3=int64#13
-# asm 2: adc <mulzero=%rdx,<ry3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   ry0 += mulzero
-# asm 1: add  <mulzero=int64#3,<ry0=int64#10
-# asm 2: add  <mulzero=%rdx,<ry0=%r12
-add  %rdx,%r12
-
-# qhasm: *(uint64 *)(rp + 32) = ry0
-# asm 1: movq   <ry0=int64#10,32(<rp=int64#1)
-# asm 2: movq   <ry0=%r12,32(<rp=%rdi)
-movq   %r12,32(%rdi)
-
-# qhasm: *(uint64 *)(rp + 40) = ry1
-# asm 1: movq   <ry1=int64#11,40(<rp=int64#1)
-# asm 2: movq   <ry1=%r13,40(<rp=%rdi)
-movq   %r13,40(%rdi)
-
-# qhasm: *(uint64 *)(rp + 48) = ry2
-# asm 1: movq   <ry2=int64#12,48(<rp=int64#1)
-# asm 2: movq   <ry2=%r14,48(<rp=%rdi)
-movq   %r14,48(%rdi)
-
-# qhasm: *(uint64 *)(rp + 56) = ry3
-# asm 1: movq   <ry3=int64#13,56(<rp=int64#1)
-# asm 2: movq   <ry3=%r15,56(<rp=%rdi)
-movq   %r15,56(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulx0=int64#9
-# asm 2: movq   32(<pp=%rsi),>mulx0=%r11
-movq   32(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   rz0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rz0=int64#10
-# asm 2: mov  <mulrax=%rax,>rz0=%r12
-mov  %rax,%r12
-
-# qhasm:   rz1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rz1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>rz1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rz1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz1=int64#11
-# asm 2: add  <mulrax=%rax,<rz1=%r13
-add  %rax,%r13
-
-# qhasm:   rz2 = 0
-# asm 1: mov  $0,>rz2=int64#12
-# asm 2: mov  $0,>rz2=%r14
-mov  $0,%r14
-
-# qhasm:   rz2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rz2=int64#12
-# asm 2: adc <mulrdx=%rdx,<rz2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#12
-# asm 2: add  <mulrax=%rax,<rz2=%r14
-add  %rax,%r14
-
-# qhasm:   rz3 = 0
-# asm 1: mov  $0,>rz3=int64#13
-# asm 2: mov  $0,>rz3=%r15
-mov  $0,%r15
-
-# qhasm:   rz3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rz3=int64#13
-# asm 2: adc <mulrdx=%rdx,<rz3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#13
-# asm 2: add  <mulrax=%rax,<rz3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulx1=int64#9
-# asm 2: movq   40(<pp=%rsi),>mulx1=%r11
-movq   40(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rz1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz1=int64#11
-# asm 2: add  <mulrax=%rax,<rz1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#12
-# asm 2: add  <mulrax=%rax,<rz2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz2 += mulc
-# asm 1: add  <mulc=int64#14,<rz2=int64#12
-# asm 2: add  <mulc=%rbx,<rz2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rz3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rz3=int64#13
-# asm 2: add  <mulrax=%rax,<rz3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz3 += mulc
-# asm 1: add  <mulc=int64#14,<rz3=int64#13
-# asm 2: add  <mulc=%rbx,<rz3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulx2=int64#9
-# asm 2: movq   48(<pp=%rsi),>mulx2=%r11
-movq   48(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#12
-# asm 2: add  <mulrax=%rax,<rz2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#13
-# asm 2: add  <mulrax=%rax,<rz3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz3 += mulc
-# asm 1: add  <mulc=int64#14,<rz3=int64#13
-# asm 2: add  <mulc=%rbx,<rz3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulx3=int64#9
-# asm 2: movq   56(<pp=%rsi),>mulx3=%r11
-movq   56(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#13
-# asm 2: add  <mulrax=%rax,<rz3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rz0 += mulr4
-# asm 1: add  <mulr4=int64#2,<rz0=int64#10
-# asm 2: add  <mulr4=%rsi,<rz0=%r12
-add  %rsi,%r12
-
-# qhasm:   carry? rz1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<rz1=int64#11
-# asm 2: adc <mulr5=%rcx,<rz1=%r13
-adc %rcx,%r13
-
-# qhasm:   carry? rz2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<rz2=int64#12
-# asm 2: adc <mulr6=%r8,<rz2=%r14
-adc %r8,%r14
-
-# qhasm:   carry? rz3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<rz3=int64#13
-# asm 2: adc <mulr7=%r9,<rz3=%r15
-adc %r9,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? rz0 += mulr8
-# asm 1: add  <mulr8=int64#3,<rz0=int64#10
-# asm 2: add  <mulr8=%rdx,<rz0=%r12
-add  %rdx,%r12
-
-# qhasm:   carry? rz1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rz1=int64#11
-# asm 2: adc <mulzero=%rsi,<rz1=%r13
-adc %rsi,%r13
-
-# qhasm:   carry? rz2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rz2=int64#12
-# asm 2: adc <mulzero=%rsi,<rz2=%r14
-adc %rsi,%r14
-
-# qhasm:   carry? rz3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rz3=int64#13
-# asm 2: adc <mulzero=%rsi,<rz3=%r15
-adc %rsi,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   rz0 += mulzero
-# asm 1: add  <mulzero=int64#2,<rz0=int64#10
-# asm 2: add  <mulzero=%rsi,<rz0=%r12
-add  %rsi,%r12
-
-# qhasm: *(uint64 *)(rp + 64) = rz0
-# asm 1: movq   <rz0=int64#10,64(<rp=int64#1)
-# asm 2: movq   <rz0=%r12,64(<rp=%rdi)
-movq   %r12,64(%rdi)
-
-# qhasm: *(uint64 *)(rp + 72) = rz1
-# asm 1: movq   <rz1=int64#11,72(<rp=int64#1)
-# asm 2: movq   <rz1=%r13,72(<rp=%rdi)
-movq   %r13,72(%rdi)
-
-# qhasm: *(uint64 *)(rp + 80) = rz2
-# asm 1: movq   <rz2=int64#12,80(<rp=int64#1)
-# asm 2: movq   <rz2=%r14,80(<rp=%rdi)
-movq   %r14,80(%rdi)
-
-# qhasm: *(uint64 *)(rp + 88) = rz3
-# asm 1: movq   <rz3=int64#13,88(<rp=int64#1)
-# asm 2: movq   <rz3=%r15,88(<rp=%rdi)
-movq   %r15,88(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/ge25519_p1p1_to_p3.s b/ext/ed25519-amd64-asm/ge25519_p1p1_to_p3.s
deleted file mode 100644
index 82433fba5..000000000
--- a/ext/ed25519-amd64-asm/ge25519_p1p1_to_p3.s
+++ /dev/null
@@ -1,2926 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 pp
-
-# qhasm: input rp
-
-# qhasm: input pp
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 rx0
-
-# qhasm: int64 rx1
-
-# qhasm: int64 rx2
-
-# qhasm: int64 rx3
-
-# qhasm: int64 ry0
-
-# qhasm: int64 ry1
-
-# qhasm: int64 ry2
-
-# qhasm: int64 ry3
-
-# qhasm: int64 rz0
-
-# qhasm: int64 rz1
-
-# qhasm: int64 rz2
-
-# qhasm: int64 rz3
-
-# qhasm: int64 rt0
-
-# qhasm: int64 rt1
-
-# qhasm: int64 rt2
-
-# qhasm: int64 rt3
-
-# qhasm: int64 mulr4
-
-# qhasm: int64 mulr5
-
-# qhasm: int64 mulr6
-
-# qhasm: int64 mulr7
-
-# qhasm: int64 mulr8
-
-# qhasm: int64 mulrax
-
-# qhasm: int64 mulrdx
-
-# qhasm: int64 mulx0
-
-# qhasm: int64 mulx1
-
-# qhasm: int64 mulx2
-
-# qhasm: int64 mulx3
-
-# qhasm: int64 mulc
-
-# qhasm: int64 mulzero
-
-# qhasm: int64 muli38
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3
-.globl crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3
-_crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3:
-crypto_sign_ed25519_amd64_64_ge25519_p1p1_to_p3:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 0)
-# asm 1: movq   0(<pp=int64#2),>mulx0=int64#9
-# asm 2: movq   0(<pp=%rsi),>mulx0=%r11
-movq   0(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   rx0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rx0=int64#10
-# asm 2: mov  <mulrax=%rax,>rx0=%r12
-mov  %rax,%r12
-
-# qhasm:   rx1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rx1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>rx1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#11
-# asm 2: add  <mulrax=%rax,<rx1=%r13
-add  %rax,%r13
-
-# qhasm:   rx2 = 0
-# asm 1: mov  $0,>rx2=int64#12
-# asm 2: mov  $0,>rx2=%r14
-mov  $0,%r14
-
-# qhasm:   rx2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx2=int64#12
-# asm 2: adc <mulrdx=%rdx,<rx2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#12
-# asm 2: add  <mulrax=%rax,<rx2=%r14
-add  %rax,%r14
-
-# qhasm:   rx3 = 0
-# asm 1: mov  $0,>rx3=int64#13
-# asm 2: mov  $0,>rx3=%r15
-mov  $0,%r15
-
-# qhasm:   rx3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx3=int64#13
-# asm 2: adc <mulrdx=%rdx,<rx3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#13
-# asm 2: add  <mulrax=%rax,<rx3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 8)
-# asm 1: movq   8(<pp=int64#2),>mulx1=int64#9
-# asm 2: movq   8(<pp=%rsi),>mulx1=%r11
-movq   8(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#11
-# asm 2: add  <mulrax=%rax,<rx1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#12
-# asm 2: add  <mulrax=%rax,<rx2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx2 += mulc
-# asm 1: add  <mulc=int64#14,<rx2=int64#12
-# asm 2: add  <mulc=%rbx,<rx2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rx3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rx3=int64#13
-# asm 2: add  <mulrax=%rax,<rx3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#14,<rx3=int64#13
-# asm 2: add  <mulc=%rbx,<rx3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 16)
-# asm 1: movq   16(<pp=int64#2),>mulx2=int64#9
-# asm 2: movq   16(<pp=%rsi),>mulx2=%r11
-movq   16(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#12
-# asm 2: add  <mulrax=%rax,<rx2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#13
-# asm 2: add  <mulrax=%rax,<rx3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#14,<rx3=int64#13
-# asm 2: add  <mulc=%rbx,<rx3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 24)
-# asm 1: movq   24(<pp=int64#2),>mulx3=int64#9
-# asm 2: movq   24(<pp=%rsi),>mulx3=%r11
-movq   24(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#13
-# asm 2: add  <mulrax=%rax,<rx3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
-# asm 2: mov  <mulrax=%rax,>mulr4=%rcx
-mov  %rax,%rcx
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#5
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
-mov  %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#8
-# asm 2: add  <mulrax=%rax,<mulr7=%r10
-add  %rax,%r10
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rx0 += mulr4
-# asm 1: add  <mulr4=int64#4,<rx0=int64#10
-# asm 2: add  <mulr4=%rcx,<rx0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? rx1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#5,<rx1=int64#11
-# asm 2: adc <mulr5=%r8,<rx1=%r13
-adc %r8,%r13
-
-# qhasm:   carry? rx2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#6,<rx2=int64#12
-# asm 2: adc <mulr6=%r9,<rx2=%r14
-adc %r9,%r14
-
-# qhasm:   carry? rx3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#8,<rx3=int64#13
-# asm 2: adc <mulr7=%r10,<rx3=%r15
-adc %r10,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#4
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? rx0 += mulr8
-# asm 1: add  <mulr8=int64#4,<rx0=int64#10
-# asm 2: add  <mulr8=%rcx,<rx0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? rx1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx1=int64#11
-# asm 2: adc <mulzero=%rdx,<rx1=%r13
-adc %rdx,%r13
-
-# qhasm:   carry? rx2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx2=int64#12
-# asm 2: adc <mulzero=%rdx,<rx2=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? rx3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx3=int64#13
-# asm 2: adc <mulzero=%rdx,<rx3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   rx0 += mulzero
-# asm 1: add  <mulzero=int64#3,<rx0=int64#10
-# asm 2: add  <mulzero=%rdx,<rx0=%r12
-add  %rdx,%r12
-
-# qhasm: *(uint64 *)(rp + 0) = rx0
-# asm 1: movq   <rx0=int64#10,0(<rp=int64#1)
-# asm 2: movq   <rx0=%r12,0(<rp=%rdi)
-movq   %r12,0(%rdi)
-
-# qhasm: *(uint64 *)(rp + 8) = rx1
-# asm 1: movq   <rx1=int64#11,8(<rp=int64#1)
-# asm 2: movq   <rx1=%r13,8(<rp=%rdi)
-movq   %r13,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = rx2
-# asm 1: movq   <rx2=int64#12,16(<rp=int64#1)
-# asm 2: movq   <rx2=%r14,16(<rp=%rdi)
-movq   %r14,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = rx3
-# asm 1: movq   <rx3=int64#13,24(<rp=int64#1)
-# asm 2: movq   <rx3=%r15,24(<rp=%rdi)
-movq   %r15,24(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>mulx0=int64#9
-# asm 2: movq   64(<pp=%rsi),>mulx0=%r11
-movq   64(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<pp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   ry0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>ry0=int64#10
-# asm 2: mov  <mulrax=%rax,>ry0=%r12
-mov  %rax,%r12
-
-# qhasm:   ry1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>ry1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>ry1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<pp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? ry1 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry1=int64#11
-# asm 2: add  <mulrax=%rax,<ry1=%r13
-add  %rax,%r13
-
-# qhasm:   ry2 = 0
-# asm 1: mov  $0,>ry2=int64#12
-# asm 2: mov  $0,>ry2=%r14
-mov  $0,%r14
-
-# qhasm:   ry2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<ry2=int64#12
-# asm 2: adc <mulrdx=%rdx,<ry2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<pp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#12
-# asm 2: add  <mulrax=%rax,<ry2=%r14
-add  %rax,%r14
-
-# qhasm:   ry3 = 0
-# asm 1: mov  $0,>ry3=int64#13
-# asm 2: mov  $0,>ry3=%r15
-mov  $0,%r15
-
-# qhasm:   ry3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<ry3=int64#13
-# asm 2: adc <mulrdx=%rdx,<ry3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<pp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#13
-# asm 2: add  <mulrax=%rax,<ry3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>mulx1=int64#9
-# asm 2: movq   72(<pp=%rsi),>mulx1=%r11
-movq   72(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<pp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? ry1 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry1=int64#11
-# asm 2: add  <mulrax=%rax,<ry1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<pp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#12
-# asm 2: add  <mulrax=%rax,<ry2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry2 += mulc
-# asm 1: add  <mulc=int64#14,<ry2=int64#12
-# asm 2: add  <mulc=%rbx,<ry2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<pp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? ry3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<ry3=int64#13
-# asm 2: add  <mulrax=%rax,<ry3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry3 += mulc
-# asm 1: add  <mulc=int64#14,<ry3=int64#13
-# asm 2: add  <mulc=%rbx,<ry3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<pp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>mulx2=int64#9
-# asm 2: movq   80(<pp=%rsi),>mulx2=%r11
-movq   80(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<pp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? ry2 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry2=int64#12
-# asm 2: add  <mulrax=%rax,<ry2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<pp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#13
-# asm 2: add  <mulrax=%rax,<ry3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? ry3 += mulc
-# asm 1: add  <mulc=int64#14,<ry3=int64#13
-# asm 2: add  <mulc=%rbx,<ry3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<pp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<pp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>mulx3=int64#9
-# asm 2: movq   88(<pp=%rsi),>mulx3=%r11
-movq   88(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   32(<pp=%rsi),>mulrax=%rax
-movq   32(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? ry3 += mulrax
-# asm 1: add  <mulrax=int64#7,<ry3=int64#13
-# asm 2: add  <mulrax=%rax,<ry3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   40(<pp=%rsi),>mulrax=%rax
-movq   40(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   48(<pp=%rsi),>mulrax=%rax
-movq   48(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   56(<pp=%rsi),>mulrax=%rax
-movq   56(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
-# asm 2: mov  <mulrax=%rax,>mulr4=%rcx
-mov  %rax,%rcx
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#5
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
-mov  %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#8
-# asm 2: add  <mulrax=%rax,<mulr7=%r10
-add  %rax,%r10
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? ry0 += mulr4
-# asm 1: add  <mulr4=int64#4,<ry0=int64#10
-# asm 2: add  <mulr4=%rcx,<ry0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? ry1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#5,<ry1=int64#11
-# asm 2: adc <mulr5=%r8,<ry1=%r13
-adc %r8,%r13
-
-# qhasm:   carry? ry2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#6,<ry2=int64#12
-# asm 2: adc <mulr6=%r9,<ry2=%r14
-adc %r9,%r14
-
-# qhasm:   carry? ry3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#8,<ry3=int64#13
-# asm 2: adc <mulr7=%r10,<ry3=%r15
-adc %r10,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#4
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? ry0 += mulr8
-# asm 1: add  <mulr8=int64#4,<ry0=int64#10
-# asm 2: add  <mulr8=%rcx,<ry0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? ry1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<ry1=int64#11
-# asm 2: adc <mulzero=%rdx,<ry1=%r13
-adc %rdx,%r13
-
-# qhasm:   carry? ry2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<ry2=int64#12
-# asm 2: adc <mulzero=%rdx,<ry2=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? ry3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<ry3=int64#13
-# asm 2: adc <mulzero=%rdx,<ry3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   ry0 += mulzero
-# asm 1: add  <mulzero=int64#3,<ry0=int64#10
-# asm 2: add  <mulzero=%rdx,<ry0=%r12
-add  %rdx,%r12
-
-# qhasm: *(uint64 *)(rp + 32) = ry0
-# asm 1: movq   <ry0=int64#10,32(<rp=int64#1)
-# asm 2: movq   <ry0=%r12,32(<rp=%rdi)
-movq   %r12,32(%rdi)
-
-# qhasm: *(uint64 *)(rp + 40) = ry1
-# asm 1: movq   <ry1=int64#11,40(<rp=int64#1)
-# asm 2: movq   <ry1=%r13,40(<rp=%rdi)
-movq   %r13,40(%rdi)
-
-# qhasm: *(uint64 *)(rp + 48) = ry2
-# asm 1: movq   <ry2=int64#12,48(<rp=int64#1)
-# asm 2: movq   <ry2=%r14,48(<rp=%rdi)
-movq   %r14,48(%rdi)
-
-# qhasm: *(uint64 *)(rp + 56) = ry3
-# asm 1: movq   <ry3=int64#13,56(<rp=int64#1)
-# asm 2: movq   <ry3=%r15,56(<rp=%rdi)
-movq   %r15,56(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>mulx0=int64#9
-# asm 2: movq   32(<pp=%rsi),>mulx0=%r11
-movq   32(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   rz0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rz0=int64#10
-# asm 2: mov  <mulrax=%rax,>rz0=%r12
-mov  %rax,%r12
-
-# qhasm:   rz1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rz1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>rz1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rz1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz1=int64#11
-# asm 2: add  <mulrax=%rax,<rz1=%r13
-add  %rax,%r13
-
-# qhasm:   rz2 = 0
-# asm 1: mov  $0,>rz2=int64#12
-# asm 2: mov  $0,>rz2=%r14
-mov  $0,%r14
-
-# qhasm:   rz2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rz2=int64#12
-# asm 2: adc <mulrdx=%rdx,<rz2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#12
-# asm 2: add  <mulrax=%rax,<rz2=%r14
-add  %rax,%r14
-
-# qhasm:   rz3 = 0
-# asm 1: mov  $0,>rz3=int64#13
-# asm 2: mov  $0,>rz3=%r15
-mov  $0,%r15
-
-# qhasm:   rz3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rz3=int64#13
-# asm 2: adc <mulrdx=%rdx,<rz3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#13
-# asm 2: add  <mulrax=%rax,<rz3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>mulx1=int64#9
-# asm 2: movq   40(<pp=%rsi),>mulx1=%r11
-movq   40(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rz1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz1=int64#11
-# asm 2: add  <mulrax=%rax,<rz1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#12
-# asm 2: add  <mulrax=%rax,<rz2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz2 += mulc
-# asm 1: add  <mulc=int64#14,<rz2=int64#12
-# asm 2: add  <mulc=%rbx,<rz2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rz3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rz3=int64#13
-# asm 2: add  <mulrax=%rax,<rz3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz3 += mulc
-# asm 1: add  <mulc=int64#14,<rz3=int64#13
-# asm 2: add  <mulc=%rbx,<rz3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>mulx2=int64#9
-# asm 2: movq   48(<pp=%rsi),>mulx2=%r11
-movq   48(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rz2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz2=int64#12
-# asm 2: add  <mulrax=%rax,<rz2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#13
-# asm 2: add  <mulrax=%rax,<rz3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rz3 += mulc
-# asm 1: add  <mulc=int64#14,<rz3=int64#13
-# asm 2: add  <mulc=%rbx,<rz3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>mulx3=int64#9
-# asm 2: movq   56(<pp=%rsi),>mulx3=%r11
-movq   56(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   96(<pp=%rsi),>mulrax=%rax
-movq   96(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? rz3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rz3=int64#13
-# asm 2: add  <mulrax=%rax,<rz3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   104(<pp=%rsi),>mulrax=%rax
-movq   104(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   112(<pp=%rsi),>mulrax=%rax
-movq   112(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   120(<pp=%rsi),>mulrax=%rax
-movq   120(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#4
-# asm 2: mov  <mulrax=%rax,>mulr4=%rcx
-mov  %rax,%rcx
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#5
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r8
-mov  %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#8
-# asm 2: add  <mulrax=%rax,<mulr7=%r10
-add  %rax,%r10
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rz0 += mulr4
-# asm 1: add  <mulr4=int64#4,<rz0=int64#10
-# asm 2: add  <mulr4=%rcx,<rz0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? rz1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#5,<rz1=int64#11
-# asm 2: adc <mulr5=%r8,<rz1=%r13
-adc %r8,%r13
-
-# qhasm:   carry? rz2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#6,<rz2=int64#12
-# asm 2: adc <mulr6=%r9,<rz2=%r14
-adc %r9,%r14
-
-# qhasm:   carry? rz3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#8,<rz3=int64#13
-# asm 2: adc <mulr7=%r10,<rz3=%r15
-adc %r10,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#4
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rcx
-imulq  $38,%rax,%rcx
-
-# qhasm:   carry? rz0 += mulr8
-# asm 1: add  <mulr8=int64#4,<rz0=int64#10
-# asm 2: add  <mulr8=%rcx,<rz0=%r12
-add  %rcx,%r12
-
-# qhasm:   carry? rz1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rz1=int64#11
-# asm 2: adc <mulzero=%rdx,<rz1=%r13
-adc %rdx,%r13
-
-# qhasm:   carry? rz2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rz2=int64#12
-# asm 2: adc <mulzero=%rdx,<rz2=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? rz3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rz3=int64#13
-# asm 2: adc <mulzero=%rdx,<rz3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   rz0 += mulzero
-# asm 1: add  <mulzero=int64#3,<rz0=int64#10
-# asm 2: add  <mulzero=%rdx,<rz0=%r12
-add  %rdx,%r12
-
-# qhasm: *(uint64 *)(rp + 64) = rz0
-# asm 1: movq   <rz0=int64#10,64(<rp=int64#1)
-# asm 2: movq   <rz0=%r12,64(<rp=%rdi)
-movq   %r12,64(%rdi)
-
-# qhasm: *(uint64 *)(rp + 72) = rz1
-# asm 1: movq   <rz1=int64#11,72(<rp=int64#1)
-# asm 2: movq   <rz1=%r13,72(<rp=%rdi)
-movq   %r13,72(%rdi)
-
-# qhasm: *(uint64 *)(rp + 80) = rz2
-# asm 1: movq   <rz2=int64#12,80(<rp=int64#1)
-# asm 2: movq   <rz2=%r14,80(<rp=%rdi)
-movq   %r14,80(%rdi)
-
-# qhasm: *(uint64 *)(rp + 88) = rz3
-# asm 1: movq   <rz3=int64#13,88(<rp=int64#1)
-# asm 2: movq   <rz3=%r15,88(<rp=%rdi)
-movq   %r15,88(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#4
-# asm 2: mov  $0,>mulr4=%rcx
-mov  $0,%rcx
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#5
-# asm 2: mov  $0,>mulr5=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#6
-# asm 2: mov  $0,>mulr6=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#8
-# asm 2: mov  $0,>mulr7=%r10
-mov  $0,%r10
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 0)
-# asm 1: movq   0(<pp=int64#2),>mulx0=int64#9
-# asm 2: movq   0(<pp=%rsi),>mulx0=%r11
-movq   0(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   64(<pp=%rsi),>mulrax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   rt0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rt0=int64#10
-# asm 2: mov  <mulrax=%rax,>rt0=%r12
-mov  %rax,%r12
-
-# qhasm:   rt1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rt1=int64#11
-# asm 2: mov  <mulrdx=%rdx,>rt1=%r13
-mov  %rdx,%r13
-
-# qhasm:   mulrax = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   72(<pp=%rsi),>mulrax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rt1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt1=int64#11
-# asm 2: add  <mulrax=%rax,<rt1=%r13
-add  %rax,%r13
-
-# qhasm:   rt2 = 0
-# asm 1: mov  $0,>rt2=int64#12
-# asm 2: mov  $0,>rt2=%r14
-mov  $0,%r14
-
-# qhasm:   rt2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rt2=int64#12
-# asm 2: adc <mulrdx=%rdx,<rt2=%r14
-adc %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   80(<pp=%rsi),>mulrax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#12
-# asm 2: add  <mulrax=%rax,<rt2=%r14
-add  %rax,%r14
-
-# qhasm:   rt3 = 0
-# asm 1: mov  $0,>rt3=int64#13
-# asm 2: mov  $0,>rt3=%r15
-mov  $0,%r15
-
-# qhasm:   rt3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rt3=int64#13
-# asm 2: adc <mulrdx=%rdx,<rt3=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   88(<pp=%rsi),>mulrax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#9
-# asm 2: mul  <mulx0=%r11
-mul  %r11
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#13
-# asm 2: add  <mulrax=%rax,<rt3=%r15
-add  %rax,%r15
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#4
-# asm 2: adc <mulrdx=%rdx,<mulr4=%rcx
-adc %rdx,%rcx
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 8)
-# asm 1: movq   8(<pp=int64#2),>mulx1=int64#9
-# asm 2: movq   8(<pp=%rsi),>mulx1=%r11
-movq   8(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   64(<pp=%rsi),>mulrax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rt1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt1=int64#11
-# asm 2: add  <mulrax=%rax,<rt1=%r13
-add  %rax,%r13
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   72(<pp=%rsi),>mulrax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#12
-# asm 2: add  <mulrax=%rax,<rt2=%r14
-add  %rax,%r14
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt2 += mulc
-# asm 1: add  <mulc=int64#14,<rt2=int64#12
-# asm 2: add  <mulc=%rbx,<rt2=%r14
-add  %rbx,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   80(<pp=%rsi),>mulrax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? rt3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rt3=int64#13
-# asm 2: add  <mulrax=%rax,<rt3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt3 += mulc
-# asm 1: add  <mulc=int64#14,<rt3=int64#13
-# asm 2: add  <mulc=%rbx,<rt3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   88(<pp=%rsi),>mulrax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#9
-# asm 2: mul  <mulx1=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 16)
-# asm 1: movq   16(<pp=int64#2),>mulx2=int64#9
-# asm 2: movq   16(<pp=%rsi),>mulx2=%r11
-movq   16(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   64(<pp=%rsi),>mulrax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#12
-# asm 2: add  <mulrax=%rax,<rt2=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   72(<pp=%rsi),>mulrax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#13
-# asm 2: add  <mulrax=%rax,<rt3=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt3 += mulc
-# asm 1: add  <mulc=int64#14,<rt3=int64#13
-# asm 2: add  <mulc=%rbx,<rt3=%r15
-add  %rbx,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   80(<pp=%rsi),>mulrax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   88(<pp=%rsi),>mulrax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#9
-# asm 2: mul  <mulx2=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 24)
-# asm 1: movq   24(<pp=int64#2),>mulx3=int64#9
-# asm 2: movq   24(<pp=%rsi),>mulx3=%r11
-movq   24(%rsi),%r11
-
-# qhasm:   mulrax = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   64(<pp=%rsi),>mulrax=%rax
-movq   64(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#13
-# asm 2: add  <mulrax=%rax,<rt3=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   72(<pp=%rsi),>mulrax=%rax
-movq   72(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#4
-# asm 2: add  <mulrax=%rax,<mulr4=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#14,<mulr4=int64#4
-# asm 2: add  <mulc=%rbx,<mulr4=%rcx
-add  %rbx,%rcx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   80(<pp=%rsi),>mulrax=%rax
-movq   80(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#5
-# asm 2: add  <mulrax=%rax,<mulr5=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#14,<mulr5=int64#5
-# asm 2: add  <mulc=%rbx,<mulr5=%r8
-add  %rbx,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#14
-# asm 2: mov  $0,>mulc=%rbx
-mov  $0,%rbx
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#14
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>mulrax=int64#7
-# asm 2: movq   88(<pp=%rsi),>mulrax=%rax
-movq   88(%rsi),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#9
-# asm 2: mul  <mulx3=%r11
-mul  %r11
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#6
-# asm 2: add  <mulrax=%rax,<mulr6=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#14,<mulr6=int64#6
-# asm 2: add  <mulc=%rbx,<mulr6=%r9
-add  %rbx,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r10
-adc %rdx,%r10
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#4,>mulrax=int64#7
-# asm 2: mov  <mulr4=%rcx,>mulrax=%rax
-mov  %rcx,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rt0 += mulr4
-# asm 1: add  <mulr4=int64#2,<rt0=int64#10
-# asm 2: add  <mulr4=%rsi,<rt0=%r12
-add  %rsi,%r12
-
-# qhasm:   carry? rt1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<rt1=int64#11
-# asm 2: adc <mulr5=%rcx,<rt1=%r13
-adc %rcx,%r13
-
-# qhasm:   carry? rt2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<rt2=int64#12
-# asm 2: adc <mulr6=%r8,<rt2=%r14
-adc %r8,%r14
-
-# qhasm:   carry? rt3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<rt3=int64#13
-# asm 2: adc <mulr7=%r9,<rt3=%r15
-adc %r9,%r15
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? rt0 += mulr8
-# asm 1: add  <mulr8=int64#3,<rt0=int64#10
-# asm 2: add  <mulr8=%rdx,<rt0=%r12
-add  %rdx,%r12
-
-# qhasm:   carry? rt1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt1=int64#11
-# asm 2: adc <mulzero=%rsi,<rt1=%r13
-adc %rsi,%r13
-
-# qhasm:   carry? rt2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt2=int64#12
-# asm 2: adc <mulzero=%rsi,<rt2=%r14
-adc %rsi,%r14
-
-# qhasm:   carry? rt3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt3=int64#13
-# asm 2: adc <mulzero=%rsi,<rt3=%r15
-adc %rsi,%r15
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   rt0 += mulzero
-# asm 1: add  <mulzero=int64#2,<rt0=int64#10
-# asm 2: add  <mulzero=%rsi,<rt0=%r12
-add  %rsi,%r12
-
-# qhasm: *(uint64 *)(rp + 96) = rt0
-# asm 1: movq   <rt0=int64#10,96(<rp=int64#1)
-# asm 2: movq   <rt0=%r12,96(<rp=%rdi)
-movq   %r12,96(%rdi)
-
-# qhasm: *(uint64 *)(rp + 104) = rt1
-# asm 1: movq   <rt1=int64#11,104(<rp=int64#1)
-# asm 2: movq   <rt1=%r13,104(<rp=%rdi)
-movq   %r13,104(%rdi)
-
-# qhasm: *(uint64 *)(rp + 112) = rt2
-# asm 1: movq   <rt2=int64#12,112(<rp=int64#1)
-# asm 2: movq   <rt2=%r14,112(<rp=%rdi)
-movq   %r14,112(%rdi)
-
-# qhasm: *(uint64 *)(rp + 120) = rt3
-# asm 1: movq   <rt3=int64#13,120(<rp=int64#1)
-# asm 2: movq   <rt3=%r15,120(<rp=%rdi)
-movq   %r15,120(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/ge25519_pack.c b/ext/ed25519-amd64-asm/ge25519_pack.c
deleted file mode 100644
index f289fe570..000000000
--- a/ext/ed25519-amd64-asm/ge25519_pack.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "fe25519.h"
-#include "sc25519.h"
-#include "ge25519.h"
-
-void ge25519_pack(unsigned char r[32], const ge25519_p3 *p)
-{
-  fe25519 tx, ty, zi;
-  fe25519_invert(&zi, &p->z); 
-  fe25519_mul(&tx, &p->x, &zi);
-  fe25519_mul(&ty, &p->y, &zi);
-  fe25519_pack(r, &ty);
-  r[31] ^= fe25519_getparity(&tx) << 7;
-}
diff --git a/ext/ed25519-amd64-asm/ge25519_pnielsadd_p1p1.s b/ext/ed25519-amd64-asm/ge25519_pnielsadd_p1p1.s
deleted file mode 100644
index aff2e75d2..000000000
--- a/ext/ed25519-amd64-asm/ge25519_pnielsadd_p1p1.s
+++ /dev/null
@@ -1,3662 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 pp
-
-# qhasm: int64 qp
-
-# qhasm: input rp
-
-# qhasm: input pp
-
-# qhasm: input qp
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 a0
-
-# qhasm: int64 a1
-
-# qhasm: int64 a2
-
-# qhasm: int64 a3
-
-# qhasm: stack64 a0_stack
-
-# qhasm: stack64 a1_stack
-
-# qhasm: stack64 a2_stack
-
-# qhasm: stack64 a3_stack
-
-# qhasm: int64 b0
-
-# qhasm: int64 b1
-
-# qhasm: int64 b2
-
-# qhasm: int64 b3
-
-# qhasm: stack64 b0_stack
-
-# qhasm: stack64 b1_stack
-
-# qhasm: stack64 b2_stack
-
-# qhasm: stack64 b3_stack
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: stack64 c0_stack
-
-# qhasm: stack64 c1_stack
-
-# qhasm: stack64 c2_stack
-
-# qhasm: stack64 c3_stack
-
-# qhasm: int64 d0
-
-# qhasm: int64 d1
-
-# qhasm: int64 d2
-
-# qhasm: int64 d3
-
-# qhasm: stack64 d0_stack
-
-# qhasm: stack64 d1_stack
-
-# qhasm: stack64 d2_stack
-
-# qhasm: stack64 d3_stack
-
-# qhasm: int64 t10
-
-# qhasm: int64 t11
-
-# qhasm: int64 t12
-
-# qhasm: int64 t13
-
-# qhasm: stack64 t10_stack
-
-# qhasm: stack64 t11_stack
-
-# qhasm: stack64 t12_stack
-
-# qhasm: stack64 t13_stack
-
-# qhasm: int64 t20
-
-# qhasm: int64 t21
-
-# qhasm: int64 t22
-
-# qhasm: int64 t23
-
-# qhasm: stack64 t20_stack
-
-# qhasm: stack64 t21_stack
-
-# qhasm: stack64 t22_stack
-
-# qhasm: stack64 t23_stack
-
-# qhasm: int64 rx0
-
-# qhasm: int64 rx1
-
-# qhasm: int64 rx2
-
-# qhasm: int64 rx3
-
-# qhasm: int64 ry0
-
-# qhasm: int64 ry1
-
-# qhasm: int64 ry2
-
-# qhasm: int64 ry3
-
-# qhasm: int64 rz0
-
-# qhasm: int64 rz1
-
-# qhasm: int64 rz2
-
-# qhasm: int64 rz3
-
-# qhasm: int64 rt0
-
-# qhasm: int64 rt1
-
-# qhasm: int64 rt2
-
-# qhasm: int64 rt3
-
-# qhasm: int64 x0
-
-# qhasm: int64 x1
-
-# qhasm: int64 x2
-
-# qhasm: int64 x3
-
-# qhasm: int64 mulr4
-
-# qhasm: int64 mulr5
-
-# qhasm: int64 mulr6
-
-# qhasm: int64 mulr7
-
-# qhasm: int64 mulr8
-
-# qhasm: int64 mulrax
-
-# qhasm: int64 mulrdx
-
-# qhasm: int64 mulx0
-
-# qhasm: int64 mulx1
-
-# qhasm: int64 mulx2
-
-# qhasm: int64 mulx3
-
-# qhasm: int64 mulc
-
-# qhasm: int64 mulzero
-
-# qhasm: int64 muli38
-
-# qhasm: int64 addt0
-
-# qhasm: int64 addt1
-
-# qhasm: int64 subt0
-
-# qhasm: int64 subt1
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1
-.globl crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1
-_crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1:
-crypto_sign_ed25519_amd64_64_ge25519_pnielsadd_p1p1:
-mov %rsp,%r11
-and $31,%r11
-add $128,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: qp = qp
-# asm 1: mov  <qp=int64#3,>qp=int64#4
-# asm 2: mov  <qp=%rdx,>qp=%rcx
-mov  %rdx,%rcx
-
-# qhasm: a0 = *(uint64 *)(pp + 32)
-# asm 1: movq   32(<pp=int64#2),>a0=int64#3
-# asm 2: movq   32(<pp=%rsi),>a0=%rdx
-movq   32(%rsi),%rdx
-
-# qhasm: a1 = *(uint64 *)(pp + 40)
-# asm 1: movq   40(<pp=int64#2),>a1=int64#5
-# asm 2: movq   40(<pp=%rsi),>a1=%r8
-movq   40(%rsi),%r8
-
-# qhasm: a2 = *(uint64 *)(pp + 48)
-# asm 1: movq   48(<pp=int64#2),>a2=int64#6
-# asm 2: movq   48(<pp=%rsi),>a2=%r9
-movq   48(%rsi),%r9
-
-# qhasm: a3 = *(uint64 *)(pp + 56)
-# asm 1: movq   56(<pp=int64#2),>a3=int64#7
-# asm 2: movq   56(<pp=%rsi),>a3=%rax
-movq   56(%rsi),%rax
-
-# qhasm: b0 = a0
-# asm 1: mov  <a0=int64#3,>b0=int64#8
-# asm 2: mov  <a0=%rdx,>b0=%r10
-mov  %rdx,%r10
-
-# qhasm: b1 = a1
-# asm 1: mov  <a1=int64#5,>b1=int64#9
-# asm 2: mov  <a1=%r8,>b1=%r11
-mov  %r8,%r11
-
-# qhasm: b2 = a2
-# asm 1: mov  <a2=int64#6,>b2=int64#10
-# asm 2: mov  <a2=%r9,>b2=%r12
-mov  %r9,%r12
-
-# qhasm: b3 = a3
-# asm 1: mov  <a3=int64#7,>b3=int64#11
-# asm 2: mov  <a3=%rax,>b3=%r13
-mov  %rax,%r13
-
-# qhasm:   carry? a0 -= *(uint64 *)(pp + 0) 
-# asm 1: subq 0(<pp=int64#2),<a0=int64#3
-# asm 2: subq 0(<pp=%rsi),<a0=%rdx
-subq 0(%rsi),%rdx
-
-# qhasm:   carry? a1 -= *(uint64 *)(pp + 8) - carry
-# asm 1: sbbq 8(<pp=int64#2),<a1=int64#5
-# asm 2: sbbq 8(<pp=%rsi),<a1=%r8
-sbbq 8(%rsi),%r8
-
-# qhasm:   carry? a2 -= *(uint64 *)(pp + 16) - carry
-# asm 1: sbbq 16(<pp=int64#2),<a2=int64#6
-# asm 2: sbbq 16(<pp=%rsi),<a2=%r9
-sbbq 16(%rsi),%r9
-
-# qhasm:   carry? a3 -= *(uint64 *)(pp + 24) - carry
-# asm 1: sbbq 24(<pp=int64#2),<a3=int64#7
-# asm 2: sbbq 24(<pp=%rsi),<a3=%rax
-sbbq 24(%rsi),%rax
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#12
-# asm 2: mov  $0,>subt0=%r14
-mov  $0,%r14
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#13
-# asm 2: mov  $38,>subt1=%r15
-mov  $38,%r15
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#12,<subt1=int64#13
-# asm 2: cmovae <subt0=%r14,<subt1=%r15
-cmovae %r14,%r15
-
-# qhasm:   carry? a0 -= subt1
-# asm 1: sub  <subt1=int64#13,<a0=int64#3
-# asm 2: sub  <subt1=%r15,<a0=%rdx
-sub  %r15,%rdx
-
-# qhasm:   carry? a1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a1=int64#5
-# asm 2: sbb  <subt0=%r14,<a1=%r8
-sbb  %r14,%r8
-
-# qhasm:   carry? a2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a2=int64#6
-# asm 2: sbb  <subt0=%r14,<a2=%r9
-sbb  %r14,%r9
-
-# qhasm:   carry? a3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#12,<a3=int64#7
-# asm 2: sbb  <subt0=%r14,<a3=%rax
-sbb  %r14,%rax
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#13,<subt0=int64#12
-# asm 2: cmovc <subt1=%r15,<subt0=%r14
-cmovc %r15,%r14
-
-# qhasm:   a0 -= subt0
-# asm 1: sub  <subt0=int64#12,<a0=int64#3
-# asm 2: sub  <subt0=%r14,<a0=%rdx
-sub  %r14,%rdx
-
-# qhasm:   carry? b0 += *(uint64 *)(pp + 0) 
-# asm 1: addq 0(<pp=int64#2),<b0=int64#8
-# asm 2: addq 0(<pp=%rsi),<b0=%r10
-addq 0(%rsi),%r10
-
-# qhasm:   carry? b1 += *(uint64 *)(pp + 8) + carry
-# asm 1: adcq 8(<pp=int64#2),<b1=int64#9
-# asm 2: adcq 8(<pp=%rsi),<b1=%r11
-adcq 8(%rsi),%r11
-
-# qhasm:   carry? b2 += *(uint64 *)(pp + 16) + carry
-# asm 1: adcq 16(<pp=int64#2),<b2=int64#10
-# asm 2: adcq 16(<pp=%rsi),<b2=%r12
-adcq 16(%rsi),%r12
-
-# qhasm:   carry? b3 += *(uint64 *)(pp + 24) + carry
-# asm 1: adcq 24(<pp=int64#2),<b3=int64#11
-# asm 2: adcq 24(<pp=%rsi),<b3=%r13
-adcq 24(%rsi),%r13
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#12
-# asm 2: mov  $0,>addt0=%r14
-mov  $0,%r14
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#13
-# asm 2: mov  $38,>addt1=%r15
-mov  $38,%r15
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#12,<addt1=int64#13
-# asm 2: cmovae <addt0=%r14,<addt1=%r15
-cmovae %r14,%r15
-
-# qhasm:   carry? b0 += addt1
-# asm 1: add  <addt1=int64#13,<b0=int64#8
-# asm 2: add  <addt1=%r15,<b0=%r10
-add  %r15,%r10
-
-# qhasm:   carry? b1 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b1=int64#9
-# asm 2: adc <addt0=%r14,<b1=%r11
-adc %r14,%r11
-
-# qhasm:   carry? b2 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b2=int64#10
-# asm 2: adc <addt0=%r14,<b2=%r12
-adc %r14,%r12
-
-# qhasm:   carry? b3 += addt0 + carry
-# asm 1: adc <addt0=int64#12,<b3=int64#11
-# asm 2: adc <addt0=%r14,<b3=%r13
-adc %r14,%r13
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#13,<addt0=int64#12
-# asm 2: cmovc <addt1=%r15,<addt0=%r14
-cmovc %r15,%r14
-
-# qhasm:   b0 += addt0
-# asm 1: add  <addt0=int64#12,<b0=int64#8
-# asm 2: add  <addt0=%r14,<b0=%r10
-add  %r14,%r10
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#3,>a0_stack=stack64#8
-# asm 2: movq <a0=%rdx,>a0_stack=56(%rsp)
-movq %rdx,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#5,>a1_stack=stack64#9
-# asm 2: movq <a1=%r8,>a1_stack=64(%rsp)
-movq %r8,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#6,>a2_stack=stack64#10
-# asm 2: movq <a2=%r9,>a2_stack=72(%rsp)
-movq %r9,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#7,>a3_stack=stack64#11
-# asm 2: movq <a3=%rax,>a3_stack=80(%rsp)
-movq %rax,80(%rsp)
-
-# qhasm: b0_stack = b0
-# asm 1: movq <b0=int64#8,>b0_stack=stack64#12
-# asm 2: movq <b0=%r10,>b0_stack=88(%rsp)
-movq %r10,88(%rsp)
-
-# qhasm: b1_stack = b1
-# asm 1: movq <b1=int64#9,>b1_stack=stack64#13
-# asm 2: movq <b1=%r11,>b1_stack=96(%rsp)
-movq %r11,96(%rsp)
-
-# qhasm: b2_stack = b2
-# asm 1: movq <b2=int64#10,>b2_stack=stack64#14
-# asm 2: movq <b2=%r12,>b2_stack=104(%rsp)
-movq %r12,104(%rsp)
-
-# qhasm: b3_stack = b3
-# asm 1: movq <b3=int64#11,>b3_stack=stack64#15
-# asm 2: movq <b3=%r13,>b3_stack=112(%rsp)
-movq %r13,112(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = a0_stack
-# asm 1: movq <a0_stack=stack64#8,>mulx0=int64#10
-# asm 2: movq <a0_stack=56(%rsp),>mulx0=%r12
-movq 56(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   a0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>a0=int64#11
-# asm 2: mov  <mulrax=%rax,>a0=%r13
-mov  %rax,%r13
-
-# qhasm:   a1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>a1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>a1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a1 += mulrax
-# asm 1: add  <mulrax=int64#7,<a1=int64#12
-# asm 2: add  <mulrax=%rax,<a1=%r14
-add  %rax,%r14
-
-# qhasm:   a2 = 0
-# asm 1: mov  $0,>a2=int64#13
-# asm 2: mov  $0,>a2=%r15
-mov  $0,%r15
-
-# qhasm:   a2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<a2=int64#13
-# asm 2: adc <mulrdx=%rdx,<a2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   a3 = 0
-# asm 1: mov  $0,>a3=int64#14
-# asm 2: mov  $0,>a3=%rbx
-mov  $0,%rbx
-
-# qhasm:   a3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<a3=int64#14
-# asm 2: adc <mulrdx=%rdx,<a3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = a1_stack
-# asm 1: movq <a1_stack=stack64#9,>mulx1=int64#10
-# asm 2: movq <a1_stack=64(%rsp),>mulx1=%r12
-movq 64(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a1 += mulrax
-# asm 1: add  <mulrax=int64#7,<a1=int64#12
-# asm 2: add  <mulrax=%rax,<a1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a2 += mulc
-# asm 1: add  <mulc=int64#15,<a2=int64#13
-# asm 2: add  <mulc=%rbp,<a2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a3 += mulc
-# asm 1: add  <mulc=int64#15,<a3=int64#14
-# asm 2: add  <mulc=%rbp,<a3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = a2_stack
-# asm 1: movq <a2_stack=stack64#10,>mulx2=int64#10
-# asm 2: movq <a2_stack=72(%rsp),>mulx2=%r12
-movq 72(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? a2 += mulrax
-# asm 1: add  <mulrax=int64#7,<a2=int64#13
-# asm 2: add  <mulrax=%rax,<a2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? a3 += mulc
-# asm 1: add  <mulc=int64#15,<a3=int64#14
-# asm 2: add  <mulc=%rbp,<a3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = a3_stack
-# asm 1: movq <a3_stack=stack64#11,>mulx3=int64#10
-# asm 2: movq <a3_stack=80(%rsp),>mulx3=%r12
-movq 80(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 0)
-# asm 1: movq   0(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   0(<qp=%rcx),>mulrax=%rax
-movq   0(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? a3 += mulrax
-# asm 1: add  <mulrax=int64#7,<a3=int64#14
-# asm 2: add  <mulrax=%rax,<a3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 8)
-# asm 1: movq   8(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   8(<qp=%rcx),>mulrax=%rax
-movq   8(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 16)
-# asm 1: movq   16(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   16(<qp=%rcx),>mulrax=%rax
-movq   16(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 24)
-# asm 1: movq   24(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   24(<qp=%rcx),>mulrax=%rax
-movq   24(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? a0 += mulr4
-# asm 1: add  <mulr4=int64#5,<a0=int64#11
-# asm 2: add  <mulr4=%r8,<a0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? a1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<a1=int64#12
-# asm 2: adc <mulr5=%r9,<a1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? a2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<a2=int64#13
-# asm 2: adc <mulr6=%r10,<a2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? a3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<a3=int64#14
-# asm 2: adc <mulr7=%r11,<a3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? a0 += mulr8
-# asm 1: add  <mulr8=int64#5,<a0=int64#11
-# asm 2: add  <mulr8=%r8,<a0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? a1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a1=int64#12
-# asm 2: adc <mulzero=%rdx,<a1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? a2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a2=int64#13
-# asm 2: adc <mulzero=%rdx,<a2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? a3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<a3=int64#14
-# asm 2: adc <mulzero=%rdx,<a3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   a0 += mulzero
-# asm 1: add  <mulzero=int64#3,<a0=int64#11
-# asm 2: add  <mulzero=%rdx,<a0=%r13
-add  %rdx,%r13
-
-# qhasm: a0_stack = a0
-# asm 1: movq <a0=int64#11,>a0_stack=stack64#8
-# asm 2: movq <a0=%r13,>a0_stack=56(%rsp)
-movq %r13,56(%rsp)
-
-# qhasm: a1_stack = a1
-# asm 1: movq <a1=int64#12,>a1_stack=stack64#9
-# asm 2: movq <a1=%r14,>a1_stack=64(%rsp)
-movq %r14,64(%rsp)
-
-# qhasm: a2_stack = a2
-# asm 1: movq <a2=int64#13,>a2_stack=stack64#10
-# asm 2: movq <a2=%r15,>a2_stack=72(%rsp)
-movq %r15,72(%rsp)
-
-# qhasm: a3_stack = a3
-# asm 1: movq <a3=int64#14,>a3_stack=stack64#11
-# asm 2: movq <a3=%rbx,>a3_stack=80(%rsp)
-movq %rbx,80(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = b0_stack
-# asm 1: movq <b0_stack=stack64#12,>mulx0=int64#10
-# asm 2: movq <b0_stack=88(%rsp),>mulx0=%r12
-movq 88(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rcx),>mulrax=%rax
-movq   32(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   rx0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rx0=int64#11
-# asm 2: mov  <mulrax=%rax,>rx0=%r13
-mov  %rax,%r13
-
-# qhasm:   rx1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rx1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>rx1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rcx),>mulrax=%rax
-movq   40(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#12
-# asm 2: add  <mulrax=%rax,<rx1=%r14
-add  %rax,%r14
-
-# qhasm:   rx2 = 0
-# asm 1: mov  $0,>rx2=int64#13
-# asm 2: mov  $0,>rx2=%r15
-mov  $0,%r15
-
-# qhasm:   rx2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx2=int64#13
-# asm 2: adc <mulrdx=%rdx,<rx2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rcx),>mulrax=%rax
-movq   48(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#13
-# asm 2: add  <mulrax=%rax,<rx2=%r15
-add  %rax,%r15
-
-# qhasm:   rx3 = 0
-# asm 1: mov  $0,>rx3=int64#14
-# asm 2: mov  $0,>rx3=%rbx
-mov  $0,%rbx
-
-# qhasm:   rx3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rx3=int64#14
-# asm 2: adc <mulrdx=%rdx,<rx3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rcx),>mulrax=%rax
-movq   56(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#14
-# asm 2: add  <mulrax=%rax,<rx3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = b1_stack
-# asm 1: movq <b1_stack=stack64#13,>mulx1=int64#10
-# asm 2: movq <b1_stack=96(%rsp),>mulx1=%r12
-movq 96(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rcx),>mulrax=%rax
-movq   32(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rx1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx1=int64#12
-# asm 2: add  <mulrax=%rax,<rx1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rcx),>mulrax=%rax
-movq   40(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#13
-# asm 2: add  <mulrax=%rax,<rx2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx2 += mulc
-# asm 1: add  <mulc=int64#15,<rx2=int64#13
-# asm 2: add  <mulc=%rbp,<rx2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rcx),>mulrax=%rax
-movq   48(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rx3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rx3=int64#14
-# asm 2: add  <mulrax=%rax,<rx3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#15,<rx3=int64#14
-# asm 2: add  <mulc=%rbp,<rx3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rcx),>mulrax=%rax
-movq   56(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = b2_stack
-# asm 1: movq <b2_stack=stack64#14,>mulx2=int64#10
-# asm 2: movq <b2_stack=104(%rsp),>mulx2=%r12
-movq 104(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rcx),>mulrax=%rax
-movq   32(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? rx2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx2=int64#13
-# asm 2: add  <mulrax=%rax,<rx2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rcx),>mulrax=%rax
-movq   40(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#14
-# asm 2: add  <mulrax=%rax,<rx3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rx3 += mulc
-# asm 1: add  <mulc=int64#15,<rx3=int64#14
-# asm 2: add  <mulc=%rbp,<rx3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rcx),>mulrax=%rax
-movq   48(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rcx),>mulrax=%rax
-movq   56(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = b3_stack
-# asm 1: movq <b3_stack=stack64#15,>mulx3=int64#10
-# asm 2: movq <b3_stack=112(%rsp),>mulx3=%r12
-movq 112(%rsp),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 32)
-# asm 1: movq   32(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   32(<qp=%rcx),>mulrax=%rax
-movq   32(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? rx3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rx3=int64#14
-# asm 2: add  <mulrax=%rax,<rx3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 40)
-# asm 1: movq   40(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   40(<qp=%rcx),>mulrax=%rax
-movq   40(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 48)
-# asm 1: movq   48(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   48(<qp=%rcx),>mulrax=%rax
-movq   48(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 56)
-# asm 1: movq   56(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   56(<qp=%rcx),>mulrax=%rax
-movq   56(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rx0 += mulr4
-# asm 1: add  <mulr4=int64#5,<rx0=int64#11
-# asm 2: add  <mulr4=%r8,<rx0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? rx1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<rx1=int64#12
-# asm 2: adc <mulr5=%r9,<rx1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? rx2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<rx2=int64#13
-# asm 2: adc <mulr6=%r10,<rx2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? rx3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<rx3=int64#14
-# asm 2: adc <mulr7=%r11,<rx3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? rx0 += mulr8
-# asm 1: add  <mulr8=int64#5,<rx0=int64#11
-# asm 2: add  <mulr8=%r8,<rx0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? rx1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx1=int64#12
-# asm 2: adc <mulzero=%rdx,<rx1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? rx2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx2=int64#13
-# asm 2: adc <mulzero=%rdx,<rx2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? rx3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<rx3=int64#14
-# asm 2: adc <mulzero=%rdx,<rx3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   rx0 += mulzero
-# asm 1: add  <mulzero=int64#3,<rx0=int64#11
-# asm 2: add  <mulzero=%rdx,<rx0=%r13
-add  %rdx,%r13
-
-# qhasm: ry0 = rx0
-# asm 1: mov  <rx0=int64#11,>ry0=int64#3
-# asm 2: mov  <rx0=%r13,>ry0=%rdx
-mov  %r13,%rdx
-
-# qhasm: ry1 = rx1
-# asm 1: mov  <rx1=int64#12,>ry1=int64#5
-# asm 2: mov  <rx1=%r14,>ry1=%r8
-mov  %r14,%r8
-
-# qhasm: ry2 = rx2
-# asm 1: mov  <rx2=int64#13,>ry2=int64#6
-# asm 2: mov  <rx2=%r15,>ry2=%r9
-mov  %r15,%r9
-
-# qhasm: ry3 = rx3
-# asm 1: mov  <rx3=int64#14,>ry3=int64#7
-# asm 2: mov  <rx3=%rbx,>ry3=%rax
-mov  %rbx,%rax
-
-# qhasm:   carry? ry0 += a0_stack 
-# asm 1: addq <a0_stack=stack64#8,<ry0=int64#3
-# asm 2: addq <a0_stack=56(%rsp),<ry0=%rdx
-addq 56(%rsp),%rdx
-
-# qhasm:   carry? ry1 += a1_stack + carry
-# asm 1: adcq <a1_stack=stack64#9,<ry1=int64#5
-# asm 2: adcq <a1_stack=64(%rsp),<ry1=%r8
-adcq 64(%rsp),%r8
-
-# qhasm:   carry? ry2 += a2_stack + carry
-# asm 1: adcq <a2_stack=stack64#10,<ry2=int64#6
-# asm 2: adcq <a2_stack=72(%rsp),<ry2=%r9
-adcq 72(%rsp),%r9
-
-# qhasm:   carry? ry3 += a3_stack + carry
-# asm 1: adcq <a3_stack=stack64#11,<ry3=int64#7
-# asm 2: adcq <a3_stack=80(%rsp),<ry3=%rax
-adcq 80(%rsp),%rax
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#8
-# asm 2: mov  $0,>addt0=%r10
-mov  $0,%r10
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#9
-# asm 2: mov  $38,>addt1=%r11
-mov  $38,%r11
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#8,<addt1=int64#9
-# asm 2: cmovae <addt0=%r10,<addt1=%r11
-cmovae %r10,%r11
-
-# qhasm:   carry? ry0 += addt1
-# asm 1: add  <addt1=int64#9,<ry0=int64#3
-# asm 2: add  <addt1=%r11,<ry0=%rdx
-add  %r11,%rdx
-
-# qhasm:   carry? ry1 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<ry1=int64#5
-# asm 2: adc <addt0=%r10,<ry1=%r8
-adc %r10,%r8
-
-# qhasm:   carry? ry2 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<ry2=int64#6
-# asm 2: adc <addt0=%r10,<ry2=%r9
-adc %r10,%r9
-
-# qhasm:   carry? ry3 += addt0 + carry
-# asm 1: adc <addt0=int64#8,<ry3=int64#7
-# asm 2: adc <addt0=%r10,<ry3=%rax
-adc %r10,%rax
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#9,<addt0=int64#8
-# asm 2: cmovc <addt1=%r11,<addt0=%r10
-cmovc %r11,%r10
-
-# qhasm:   ry0 += addt0
-# asm 1: add  <addt0=int64#8,<ry0=int64#3
-# asm 2: add  <addt0=%r10,<ry0=%rdx
-add  %r10,%rdx
-
-# qhasm:   carry? rx0 -= a0_stack 
-# asm 1: subq <a0_stack=stack64#8,<rx0=int64#11
-# asm 2: subq <a0_stack=56(%rsp),<rx0=%r13
-subq 56(%rsp),%r13
-
-# qhasm:   carry? rx1 -= a1_stack - carry
-# asm 1: sbbq <a1_stack=stack64#9,<rx1=int64#12
-# asm 2: sbbq <a1_stack=64(%rsp),<rx1=%r14
-sbbq 64(%rsp),%r14
-
-# qhasm:   carry? rx2 -= a2_stack - carry
-# asm 1: sbbq <a2_stack=stack64#10,<rx2=int64#13
-# asm 2: sbbq <a2_stack=72(%rsp),<rx2=%r15
-sbbq 72(%rsp),%r15
-
-# qhasm:   carry? rx3 -= a3_stack - carry
-# asm 1: sbbq <a3_stack=stack64#11,<rx3=int64#14
-# asm 2: sbbq <a3_stack=80(%rsp),<rx3=%rbx
-sbbq 80(%rsp),%rbx
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#8
-# asm 2: mov  $0,>subt0=%r10
-mov  $0,%r10
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#9
-# asm 2: mov  $38,>subt1=%r11
-mov  $38,%r11
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#8,<subt1=int64#9
-# asm 2: cmovae <subt0=%r10,<subt1=%r11
-cmovae %r10,%r11
-
-# qhasm:   carry? rx0 -= subt1
-# asm 1: sub  <subt1=int64#9,<rx0=int64#11
-# asm 2: sub  <subt1=%r11,<rx0=%r13
-sub  %r11,%r13
-
-# qhasm:   carry? rx1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<rx1=int64#12
-# asm 2: sbb  <subt0=%r10,<rx1=%r14
-sbb  %r10,%r14
-
-# qhasm:   carry? rx2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<rx2=int64#13
-# asm 2: sbb  <subt0=%r10,<rx2=%r15
-sbb  %r10,%r15
-
-# qhasm:   carry? rx3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#8,<rx3=int64#14
-# asm 2: sbb  <subt0=%r10,<rx3=%rbx
-sbb  %r10,%rbx
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#9,<subt0=int64#8
-# asm 2: cmovc <subt1=%r11,<subt0=%r10
-cmovc %r11,%r10
-
-# qhasm:   rx0 -= subt0
-# asm 1: sub  <subt0=int64#8,<rx0=int64#11
-# asm 2: sub  <subt0=%r10,<rx0=%r13
-sub  %r10,%r13
-
-# qhasm: *(uint64 *) (rp + 0) = rx0
-# asm 1: movq   <rx0=int64#11,0(<rp=int64#1)
-# asm 2: movq   <rx0=%r13,0(<rp=%rdi)
-movq   %r13,0(%rdi)
-
-# qhasm: *(uint64 *) (rp + 8) = rx1
-# asm 1: movq   <rx1=int64#12,8(<rp=int64#1)
-# asm 2: movq   <rx1=%r14,8(<rp=%rdi)
-movq   %r14,8(%rdi)
-
-# qhasm: *(uint64 *) (rp + 16) = rx2
-# asm 1: movq   <rx2=int64#13,16(<rp=int64#1)
-# asm 2: movq   <rx2=%r15,16(<rp=%rdi)
-movq   %r15,16(%rdi)
-
-# qhasm: *(uint64 *) (rp + 24) = rx3
-# asm 1: movq   <rx3=int64#14,24(<rp=int64#1)
-# asm 2: movq   <rx3=%rbx,24(<rp=%rdi)
-movq   %rbx,24(%rdi)
-
-# qhasm: *(uint64 *) (rp + 64) = ry0
-# asm 1: movq   <ry0=int64#3,64(<rp=int64#1)
-# asm 2: movq   <ry0=%rdx,64(<rp=%rdi)
-movq   %rdx,64(%rdi)
-
-# qhasm: *(uint64 *) (rp + 72) = ry1
-# asm 1: movq   <ry1=int64#5,72(<rp=int64#1)
-# asm 2: movq   <ry1=%r8,72(<rp=%rdi)
-movq   %r8,72(%rdi)
-
-# qhasm: *(uint64 *) (rp + 80) = ry2
-# asm 1: movq   <ry2=int64#6,80(<rp=int64#1)
-# asm 2: movq   <ry2=%r9,80(<rp=%rdi)
-movq   %r9,80(%rdi)
-
-# qhasm: *(uint64 *) (rp + 88) = ry3
-# asm 1: movq   <ry3=int64#7,88(<rp=int64#1)
-# asm 2: movq   <ry3=%rax,88(<rp=%rdi)
-movq   %rax,88(%rdi)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 96)
-# asm 1: movq   96(<pp=int64#2),>mulx0=int64#10
-# asm 2: movq   96(<pp=%rsi),>mulx0=%r12
-movq   96(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 96)
-# asm 1: movq   96(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   96(<qp=%rcx),>mulrax=%rax
-movq   96(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   c0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>c0=int64#11
-# asm 2: mov  <mulrax=%rax,>c0=%r13
-mov  %rax,%r13
-
-# qhasm:   c1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>c1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>c1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 104)
-# asm 1: movq   104(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   104(<qp=%rcx),>mulrax=%rax
-movq   104(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#12
-# asm 2: add  <mulrax=%rax,<c1=%r14
-add  %rax,%r14
-
-# qhasm:   c2 = 0
-# asm 1: mov  $0,>c2=int64#13
-# asm 2: mov  $0,>c2=%r15
-mov  $0,%r15
-
-# qhasm:   c2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c2=int64#13
-# asm 2: adc <mulrdx=%rdx,<c2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 112)
-# asm 1: movq   112(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   112(<qp=%rcx),>mulrax=%rax
-movq   112(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   c3 = 0
-# asm 1: mov  $0,>c3=int64#14
-# asm 2: mov  $0,>c3=%rbx
-mov  $0,%rbx
-
-# qhasm:   c3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<c3=int64#14
-# asm 2: adc <mulrdx=%rdx,<c3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 120)
-# asm 1: movq   120(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   120(<qp=%rcx),>mulrax=%rax
-movq   120(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 104)
-# asm 1: movq   104(<pp=int64#2),>mulx1=int64#10
-# asm 2: movq   104(<pp=%rsi),>mulx1=%r12
-movq   104(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 96)
-# asm 1: movq   96(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   96(<qp=%rcx),>mulrax=%rax
-movq   96(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c1 += mulrax
-# asm 1: add  <mulrax=int64#7,<c1=int64#12
-# asm 2: add  <mulrax=%rax,<c1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 104)
-# asm 1: movq   104(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   104(<qp=%rcx),>mulrax=%rax
-movq   104(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c2 += mulc
-# asm 1: add  <mulc=int64#15,<c2=int64#13
-# asm 2: add  <mulc=%rbp,<c2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 112)
-# asm 1: movq   112(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   112(<qp=%rcx),>mulrax=%rax
-movq   112(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#15,<c3=int64#14
-# asm 2: add  <mulc=%rbp,<c3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 120)
-# asm 1: movq   120(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   120(<qp=%rcx),>mulrax=%rax
-movq   120(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 112)
-# asm 1: movq   112(<pp=int64#2),>mulx2=int64#10
-# asm 2: movq   112(<pp=%rsi),>mulx2=%r12
-movq   112(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 96)
-# asm 1: movq   96(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   96(<qp=%rcx),>mulrax=%rax
-movq   96(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? c2 += mulrax
-# asm 1: add  <mulrax=int64#7,<c2=int64#13
-# asm 2: add  <mulrax=%rax,<c2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 104)
-# asm 1: movq   104(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   104(<qp=%rcx),>mulrax=%rax
-movq   104(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? c3 += mulc
-# asm 1: add  <mulc=int64#15,<c3=int64#14
-# asm 2: add  <mulc=%rbp,<c3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 112)
-# asm 1: movq   112(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   112(<qp=%rcx),>mulrax=%rax
-movq   112(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 120)
-# asm 1: movq   120(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   120(<qp=%rcx),>mulrax=%rax
-movq   120(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 120)
-# asm 1: movq   120(<pp=int64#2),>mulx3=int64#10
-# asm 2: movq   120(<pp=%rsi),>mulx3=%r12
-movq   120(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 96)
-# asm 1: movq   96(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   96(<qp=%rcx),>mulrax=%rax
-movq   96(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? c3 += mulrax
-# asm 1: add  <mulrax=int64#7,<c3=int64#14
-# asm 2: add  <mulrax=%rax,<c3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 104)
-# asm 1: movq   104(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   104(<qp=%rcx),>mulrax=%rax
-movq   104(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 112)
-# asm 1: movq   112(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   112(<qp=%rcx),>mulrax=%rax
-movq   112(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 120)
-# asm 1: movq   120(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   120(<qp=%rcx),>mulrax=%rax
-movq   120(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#10
-# asm 2: mul  <mulx3=%r12
-mul  %r12
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#15,<mulr6=int64#8
-# asm 2: add  <mulc=%rbp,<mulr6=%r10
-add  %rbp,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#5
-# asm 2: mov  <mulrax=%rax,>mulr4=%r8
-mov  %rax,%r8
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#6
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%r9
-mov  %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#9
-# asm 2: add  <mulrax=%rax,<mulr7=%r11
-add  %rax,%r11
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? c0 += mulr4
-# asm 1: add  <mulr4=int64#5,<c0=int64#11
-# asm 2: add  <mulr4=%r8,<c0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? c1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#6,<c1=int64#12
-# asm 2: adc <mulr5=%r9,<c1=%r14
-adc %r9,%r14
-
-# qhasm:   carry? c2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#8,<c2=int64#13
-# asm 2: adc <mulr6=%r10,<c2=%r15
-adc %r10,%r15
-
-# qhasm:   carry? c3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#9,<c3=int64#14
-# asm 2: adc <mulr7=%r11,<c3=%rbx
-adc %r11,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#3
-# asm 2: mov  $0,>mulzero=%rdx
-mov  $0,%rdx
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulr8=int64#7
-# asm 2: adc <mulzero=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#5
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%r8
-imulq  $38,%rax,%r8
-
-# qhasm:   carry? c0 += mulr8
-# asm 1: add  <mulr8=int64#5,<c0=int64#11
-# asm 2: add  <mulr8=%r8,<c0=%r13
-add  %r8,%r13
-
-# qhasm:   carry? c1 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c1=int64#12
-# asm 2: adc <mulzero=%rdx,<c1=%r14
-adc %rdx,%r14
-
-# qhasm:   carry? c2 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c2=int64#13
-# asm 2: adc <mulzero=%rdx,<c2=%r15
-adc %rdx,%r15
-
-# qhasm:   carry? c3 += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<c3=int64#14
-# asm 2: adc <mulzero=%rdx,<c3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#3,<mulzero=int64#3
-# asm 2: adc <mulzero=%rdx,<mulzero=%rdx
-adc %rdx,%rdx
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#3,>mulzero=int64#3
-# asm 2: imulq  $38,<mulzero=%rdx,>mulzero=%rdx
-imulq  $38,%rdx,%rdx
-
-# qhasm:   c0 += mulzero
-# asm 1: add  <mulzero=int64#3,<c0=int64#11
-# asm 2: add  <mulzero=%rdx,<c0=%r13
-add  %rdx,%r13
-
-# qhasm: c0_stack = c0
-# asm 1: movq <c0=int64#11,>c0_stack=stack64#8
-# asm 2: movq <c0=%r13,>c0_stack=56(%rsp)
-movq %r13,56(%rsp)
-
-# qhasm: c1_stack = c1
-# asm 1: movq <c1=int64#12,>c1_stack=stack64#9
-# asm 2: movq <c1=%r14,>c1_stack=64(%rsp)
-movq %r14,64(%rsp)
-
-# qhasm: c2_stack = c2
-# asm 1: movq <c2=int64#13,>c2_stack=stack64#10
-# asm 2: movq <c2=%r15,>c2_stack=72(%rsp)
-movq %r15,72(%rsp)
-
-# qhasm: c3_stack = c3
-# asm 1: movq <c3=int64#14,>c3_stack=stack64#11
-# asm 2: movq <c3=%rbx,>c3_stack=80(%rsp)
-movq %rbx,80(%rsp)
-
-# qhasm:   mulr4 = 0
-# asm 1: mov  $0,>mulr4=int64#5
-# asm 2: mov  $0,>mulr4=%r8
-mov  $0,%r8
-
-# qhasm:   mulr5 = 0
-# asm 1: mov  $0,>mulr5=int64#6
-# asm 2: mov  $0,>mulr5=%r9
-mov  $0,%r9
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#8
-# asm 2: mov  $0,>mulr6=%r10
-mov  $0,%r10
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#9
-# asm 2: mov  $0,>mulr7=%r11
-mov  $0,%r11
-
-# qhasm:   mulx0 = *(uint64 *)(pp + 64)
-# asm 1: movq   64(<pp=int64#2),>mulx0=int64#10
-# asm 2: movq   64(<pp=%rsi),>mulx0=%r12
-movq   64(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   rt0 = mulrax
-# asm 1: mov  <mulrax=int64#7,>rt0=int64#11
-# asm 2: mov  <mulrax=%rax,>rt0=%r13
-mov  %rax,%r13
-
-# qhasm:   rt1 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>rt1=int64#12
-# asm 2: mov  <mulrdx=%rdx,>rt1=%r14
-mov  %rdx,%r14
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rt1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt1=int64#12
-# asm 2: add  <mulrax=%rax,<rt1=%r14
-add  %rax,%r14
-
-# qhasm:   rt2 = 0
-# asm 1: mov  $0,>rt2=int64#13
-# asm 2: mov  $0,>rt2=%r15
-mov  $0,%r15
-
-# qhasm:   rt2 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rt2=int64#13
-# asm 2: adc <mulrdx=%rdx,<rt2=%r15
-adc %rdx,%r15
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#13
-# asm 2: add  <mulrax=%rax,<rt2=%r15
-add  %rax,%r15
-
-# qhasm:   rt3 = 0
-# asm 1: mov  $0,>rt3=int64#14
-# asm 2: mov  $0,>rt3=%rbx
-mov  $0,%rbx
-
-# qhasm:   rt3 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<rt3=int64#14
-# asm 2: adc <mulrdx=%rdx,<rt3=%rbx
-adc %rdx,%rbx
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx0
-# asm 1: mul  <mulx0=int64#10
-# asm 2: mul  <mulx0=%r12
-mul  %r12
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#14
-# asm 2: add  <mulrax=%rax,<rt3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulr4 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr4=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr4=%r8
-adc %rdx,%r8
-
-# qhasm:   mulx1 = *(uint64 *)(pp + 72)
-# asm 1: movq   72(<pp=int64#2),>mulx1=int64#10
-# asm 2: movq   72(<pp=%rsi),>mulx1=%r12
-movq   72(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rt1 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt1=int64#12
-# asm 2: add  <mulrax=%rax,<rt1=%r14
-add  %rax,%r14
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#13
-# asm 2: add  <mulrax=%rax,<rt2=%r15
-add  %rax,%r15
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt2 += mulc
-# asm 1: add  <mulc=int64#15,<rt2=int64#13
-# asm 2: add  <mulc=%rbp,<rt2=%r15
-add  %rbp,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? rt3 += mulrax 
-# asm 1: add  <mulrax=int64#7,<rt3=int64#14
-# asm 2: add  <mulrax=%rax,<rt3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt3 += mulc
-# asm 1: add  <mulc=int64#15,<rt3=int64#14
-# asm 2: add  <mulc=%rbp,<rt3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx1
-# asm 1: mul  <mulx1=int64#10
-# asm 2: mul  <mulx1=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulr5 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr5=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr5=%r9
-adc %rdx,%r9
-
-# qhasm:   mulx2 = *(uint64 *)(pp + 80)
-# asm 1: movq   80(<pp=int64#2),>mulx2=int64#10
-# asm 2: movq   80(<pp=%rsi),>mulx2=%r12
-movq   80(%rsi),%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? rt2 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt2=int64#13
-# asm 2: add  <mulrax=%rax,<rt2=%r15
-add  %rax,%r15
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#14
-# asm 2: add  <mulrax=%rax,<rt3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? rt3 += mulc
-# asm 1: add  <mulc=int64#15,<rt3=int64#14
-# asm 2: add  <mulc=%rbp,<rt3=%rbx
-add  %rbp,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#15,<mulr4=int64#5
-# asm 2: add  <mulc=%rbp,<mulr4=%r8
-add  %rbp,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#15
-# asm 2: mov  $0,>mulc=%rbp
-mov  $0,%rbp
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#15
-# asm 2: adc <mulrdx=%rdx,<mulc=%rbp
-adc %rdx,%rbp
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx2
-# asm 1: mul  <mulx2=int64#10
-# asm 2: mul  <mulx2=%r12
-mul  %r12
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#15,<mulr5=int64#6
-# asm 2: add  <mulc=%rbp,<mulr5=%r9
-add  %rbp,%r9
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#8
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r10
-adc %rdx,%r10
-
-# qhasm:   mulx3 = *(uint64 *)(pp + 88)
-# asm 1: movq   88(<pp=int64#2),>mulx3=int64#2
-# asm 2: movq   88(<pp=%rsi),>mulx3=%rsi
-movq   88(%rsi),%rsi
-
-# qhasm:   mulrax = *(uint64 *)(qp + 64)
-# asm 1: movq   64(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   64(<qp=%rcx),>mulrax=%rax
-movq   64(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? rt3 += mulrax
-# asm 1: add  <mulrax=int64#7,<rt3=int64#14
-# asm 2: add  <mulrax=%rax,<rt3=%rbx
-add  %rax,%rbx
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 72)
-# asm 1: movq   72(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   72(<qp=%rcx),>mulrax=%rax
-movq   72(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr4 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr4=int64#5
-# asm 2: add  <mulrax=%rax,<mulr4=%r8
-add  %rax,%r8
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr4 += mulc
-# asm 1: add  <mulc=int64#10,<mulr4=int64#5
-# asm 2: add  <mulc=%r12,<mulr4=%r8
-add  %r12,%r8
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 80)
-# asm 1: movq   80(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   80(<qp=%rcx),>mulrax=%rax
-movq   80(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#6
-# asm 2: add  <mulrax=%rax,<mulr5=%r9
-add  %rax,%r9
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr5 += mulc
-# asm 1: add  <mulc=int64#10,<mulr5=int64#6
-# asm 2: add  <mulc=%r12,<mulr5=%r9
-add  %r12,%r9
-
-# qhasm:   mulc = 0
-# asm 1: mov  $0,>mulc=int64#10
-# asm 2: mov  $0,>mulc=%r12
-mov  $0,%r12
-
-# qhasm:   mulc += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulc=int64#10
-# asm 2: adc <mulrdx=%rdx,<mulc=%r12
-adc %rdx,%r12
-
-# qhasm:   mulrax = *(uint64 *)(qp + 88)
-# asm 1: movq   88(<qp=int64#4),>mulrax=int64#7
-# asm 2: movq   88(<qp=%rcx),>mulrax=%rax
-movq   88(%rcx),%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * mulx3
-# asm 1: mul  <mulx3=int64#2
-# asm 2: mul  <mulx3=%rsi
-mul  %rsi
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#8
-# asm 2: add  <mulrax=%rax,<mulr6=%r10
-add  %rax,%r10
-
-# qhasm:   mulrdx += 0 + carry
-# asm 1: adc $0,<mulrdx=int64#3
-# asm 2: adc $0,<mulrdx=%rdx
-adc $0,%rdx
-
-# qhasm:   carry? mulr6 += mulc
-# asm 1: add  <mulc=int64#10,<mulr6=int64#8
-# asm 2: add  <mulc=%r12,<mulr6=%r10
-add  %r12,%r10
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#9
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r11
-adc %rdx,%r11
-
-# qhasm:   mulrax = mulr4
-# asm 1: mov  <mulr4=int64#5,>mulrax=int64#7
-# asm 2: mov  <mulr4=%r8,>mulrax=%rax
-mov  %r8,%rax
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   mulr4 = mulrax
-# asm 1: mov  <mulrax=int64#7,>mulr4=int64#2
-# asm 2: mov  <mulrax=%rax,>mulr4=%rsi
-mov  %rax,%rsi
-
-# qhasm:   mulrax = mulr5
-# asm 1: mov  <mulr5=int64#6,>mulrax=int64#7
-# asm 2: mov  <mulr5=%r9,>mulrax=%rax
-mov  %r9,%rax
-
-# qhasm:   mulr5 = mulrdx
-# asm 1: mov  <mulrdx=int64#3,>mulr5=int64#4
-# asm 2: mov  <mulrdx=%rdx,>mulr5=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr5 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr5=int64#4
-# asm 2: add  <mulrax=%rax,<mulr5=%rcx
-add  %rax,%rcx
-
-# qhasm:   mulrax = mulr6
-# asm 1: mov  <mulr6=int64#8,>mulrax=int64#7
-# asm 2: mov  <mulr6=%r10,>mulrax=%rax
-mov  %r10,%rax
-
-# qhasm:   mulr6 = 0
-# asm 1: mov  $0,>mulr6=int64#5
-# asm 2: mov  $0,>mulr6=%r8
-mov  $0,%r8
-
-# qhasm:   mulr6 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr6=int64#5
-# asm 2: adc <mulrdx=%rdx,<mulr6=%r8
-adc %rdx,%r8
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr6 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr6=int64#5
-# asm 2: add  <mulrax=%rax,<mulr6=%r8
-add  %rax,%r8
-
-# qhasm:   mulrax = mulr7
-# asm 1: mov  <mulr7=int64#9,>mulrax=int64#7
-# asm 2: mov  <mulr7=%r11,>mulrax=%rax
-mov  %r11,%rax
-
-# qhasm:   mulr7 = 0
-# asm 1: mov  $0,>mulr7=int64#6
-# asm 2: mov  $0,>mulr7=%r9
-mov  $0,%r9
-
-# qhasm:   mulr7 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr7=int64#6
-# asm 2: adc <mulrdx=%rdx,<mulr7=%r9
-adc %rdx,%r9
-
-# qhasm:   (uint128) mulrdx mulrax = mulrax * *(uint64 *)&crypto_sign_ed25519_amd64_64_38
-mulq  crypto_sign_ed25519_amd64_64_38(%rip)
-
-# qhasm:   carry? mulr7 += mulrax
-# asm 1: add  <mulrax=int64#7,<mulr7=int64#6
-# asm 2: add  <mulrax=%rax,<mulr7=%r9
-add  %rax,%r9
-
-# qhasm:   mulr8 = 0
-# asm 1: mov  $0,>mulr8=int64#7
-# asm 2: mov  $0,>mulr8=%rax
-mov  $0,%rax
-
-# qhasm:   mulr8 += mulrdx + carry
-# asm 1: adc <mulrdx=int64#3,<mulr8=int64#7
-# asm 2: adc <mulrdx=%rdx,<mulr8=%rax
-adc %rdx,%rax
-
-# qhasm:   carry? rt0 += mulr4
-# asm 1: add  <mulr4=int64#2,<rt0=int64#11
-# asm 2: add  <mulr4=%rsi,<rt0=%r13
-add  %rsi,%r13
-
-# qhasm:   carry? rt1 += mulr5 + carry
-# asm 1: adc <mulr5=int64#4,<rt1=int64#12
-# asm 2: adc <mulr5=%rcx,<rt1=%r14
-adc %rcx,%r14
-
-# qhasm:   carry? rt2 += mulr6 + carry
-# asm 1: adc <mulr6=int64#5,<rt2=int64#13
-# asm 2: adc <mulr6=%r8,<rt2=%r15
-adc %r8,%r15
-
-# qhasm:   carry? rt3 += mulr7 + carry
-# asm 1: adc <mulr7=int64#6,<rt3=int64#14
-# asm 2: adc <mulr7=%r9,<rt3=%rbx
-adc %r9,%rbx
-
-# qhasm:   mulzero = 0
-# asm 1: mov  $0,>mulzero=int64#2
-# asm 2: mov  $0,>mulzero=%rsi
-mov  $0,%rsi
-
-# qhasm:   mulr8 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulr8=int64#7
-# asm 2: adc <mulzero=%rsi,<mulr8=%rax
-adc %rsi,%rax
-
-# qhasm:   mulr8 *= 38
-# asm 1: imulq  $38,<mulr8=int64#7,>mulr8=int64#3
-# asm 2: imulq  $38,<mulr8=%rax,>mulr8=%rdx
-imulq  $38,%rax,%rdx
-
-# qhasm:   carry? rt0 += mulr8
-# asm 1: add  <mulr8=int64#3,<rt0=int64#11
-# asm 2: add  <mulr8=%rdx,<rt0=%r13
-add  %rdx,%r13
-
-# qhasm:   carry? rt1 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt1=int64#12
-# asm 2: adc <mulzero=%rsi,<rt1=%r14
-adc %rsi,%r14
-
-# qhasm:   carry? rt2 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt2=int64#13
-# asm 2: adc <mulzero=%rsi,<rt2=%r15
-adc %rsi,%r15
-
-# qhasm:   carry? rt3 += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<rt3=int64#14
-# asm 2: adc <mulzero=%rsi,<rt3=%rbx
-adc %rsi,%rbx
-
-# qhasm:   mulzero += mulzero + carry
-# asm 1: adc <mulzero=int64#2,<mulzero=int64#2
-# asm 2: adc <mulzero=%rsi,<mulzero=%rsi
-adc %rsi,%rsi
-
-# qhasm:   mulzero *= 38
-# asm 1: imulq  $38,<mulzero=int64#2,>mulzero=int64#2
-# asm 2: imulq  $38,<mulzero=%rsi,>mulzero=%rsi
-imulq  $38,%rsi,%rsi
-
-# qhasm:   rt0 += mulzero
-# asm 1: add  <mulzero=int64#2,<rt0=int64#11
-# asm 2: add  <mulzero=%rsi,<rt0=%r13
-add  %rsi,%r13
-
-# qhasm:   carry? rt0 += rt0 
-# asm 1: add  <rt0=int64#11,<rt0=int64#11
-# asm 2: add  <rt0=%r13,<rt0=%r13
-add  %r13,%r13
-
-# qhasm:   carry? rt1 += rt1 + carry
-# asm 1: adc <rt1=int64#12,<rt1=int64#12
-# asm 2: adc <rt1=%r14,<rt1=%r14
-adc %r14,%r14
-
-# qhasm:   carry? rt2 += rt2 + carry
-# asm 1: adc <rt2=int64#13,<rt2=int64#13
-# asm 2: adc <rt2=%r15,<rt2=%r15
-adc %r15,%r15
-
-# qhasm:   carry? rt3 += rt3 + carry
-# asm 1: adc <rt3=int64#14,<rt3=int64#14
-# asm 2: adc <rt3=%rbx,<rt3=%rbx
-adc %rbx,%rbx
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#2
-# asm 2: mov  $0,>addt0=%rsi
-mov  $0,%rsi
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#3
-# asm 2: mov  $38,>addt1=%rdx
-mov  $38,%rdx
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#2,<addt1=int64#3
-# asm 2: cmovae <addt0=%rsi,<addt1=%rdx
-cmovae %rsi,%rdx
-
-# qhasm:   carry? rt0 += addt1
-# asm 1: add  <addt1=int64#3,<rt0=int64#11
-# asm 2: add  <addt1=%rdx,<rt0=%r13
-add  %rdx,%r13
-
-# qhasm:   carry? rt1 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rt1=int64#12
-# asm 2: adc <addt0=%rsi,<rt1=%r14
-adc %rsi,%r14
-
-# qhasm:   carry? rt2 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rt2=int64#13
-# asm 2: adc <addt0=%rsi,<rt2=%r15
-adc %rsi,%r15
-
-# qhasm:   carry? rt3 += addt0 + carry
-# asm 1: adc <addt0=int64#2,<rt3=int64#14
-# asm 2: adc <addt0=%rsi,<rt3=%rbx
-adc %rsi,%rbx
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#3,<addt0=int64#2
-# asm 2: cmovc <addt1=%rdx,<addt0=%rsi
-cmovc %rdx,%rsi
-
-# qhasm:   rt0 += addt0
-# asm 1: add  <addt0=int64#2,<rt0=int64#11
-# asm 2: add  <addt0=%rsi,<rt0=%r13
-add  %rsi,%r13
-
-# qhasm: rz0 = rt0
-# asm 1: mov  <rt0=int64#11,>rz0=int64#2
-# asm 2: mov  <rt0=%r13,>rz0=%rsi
-mov  %r13,%rsi
-
-# qhasm: rz1 = rt1
-# asm 1: mov  <rt1=int64#12,>rz1=int64#3
-# asm 2: mov  <rt1=%r14,>rz1=%rdx
-mov  %r14,%rdx
-
-# qhasm: rz2 = rt2
-# asm 1: mov  <rt2=int64#13,>rz2=int64#4
-# asm 2: mov  <rt2=%r15,>rz2=%rcx
-mov  %r15,%rcx
-
-# qhasm: rz3 = rt3
-# asm 1: mov  <rt3=int64#14,>rz3=int64#5
-# asm 2: mov  <rt3=%rbx,>rz3=%r8
-mov  %rbx,%r8
-
-# qhasm:   carry? rz0 += c0_stack 
-# asm 1: addq <c0_stack=stack64#8,<rz0=int64#2
-# asm 2: addq <c0_stack=56(%rsp),<rz0=%rsi
-addq 56(%rsp),%rsi
-
-# qhasm:   carry? rz1 += c1_stack + carry
-# asm 1: adcq <c1_stack=stack64#9,<rz1=int64#3
-# asm 2: adcq <c1_stack=64(%rsp),<rz1=%rdx
-adcq 64(%rsp),%rdx
-
-# qhasm:   carry? rz2 += c2_stack + carry
-# asm 1: adcq <c2_stack=stack64#10,<rz2=int64#4
-# asm 2: adcq <c2_stack=72(%rsp),<rz2=%rcx
-adcq 72(%rsp),%rcx
-
-# qhasm:   carry? rz3 += c3_stack + carry
-# asm 1: adcq <c3_stack=stack64#11,<rz3=int64#5
-# asm 2: adcq <c3_stack=80(%rsp),<rz3=%r8
-adcq 80(%rsp),%r8
-
-# qhasm:   addt0 = 0
-# asm 1: mov  $0,>addt0=int64#6
-# asm 2: mov  $0,>addt0=%r9
-mov  $0,%r9
-
-# qhasm:   addt1 = 38
-# asm 1: mov  $38,>addt1=int64#7
-# asm 2: mov  $38,>addt1=%rax
-mov  $38,%rax
-
-# qhasm:   addt1 = addt0 if !carry
-# asm 1: cmovae <addt0=int64#6,<addt1=int64#7
-# asm 2: cmovae <addt0=%r9,<addt1=%rax
-cmovae %r9,%rax
-
-# qhasm:   carry? rz0 += addt1
-# asm 1: add  <addt1=int64#7,<rz0=int64#2
-# asm 2: add  <addt1=%rax,<rz0=%rsi
-add  %rax,%rsi
-
-# qhasm:   carry? rz1 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<rz1=int64#3
-# asm 2: adc <addt0=%r9,<rz1=%rdx
-adc %r9,%rdx
-
-# qhasm:   carry? rz2 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<rz2=int64#4
-# asm 2: adc <addt0=%r9,<rz2=%rcx
-adc %r9,%rcx
-
-# qhasm:   carry? rz3 += addt0 + carry
-# asm 1: adc <addt0=int64#6,<rz3=int64#5
-# asm 2: adc <addt0=%r9,<rz3=%r8
-adc %r9,%r8
-
-# qhasm:   addt0 = addt1 if carry
-# asm 1: cmovc <addt1=int64#7,<addt0=int64#6
-# asm 2: cmovc <addt1=%rax,<addt0=%r9
-cmovc %rax,%r9
-
-# qhasm:   rz0 += addt0
-# asm 1: add  <addt0=int64#6,<rz0=int64#2
-# asm 2: add  <addt0=%r9,<rz0=%rsi
-add  %r9,%rsi
-
-# qhasm:   carry? rt0 -= c0_stack 
-# asm 1: subq <c0_stack=stack64#8,<rt0=int64#11
-# asm 2: subq <c0_stack=56(%rsp),<rt0=%r13
-subq 56(%rsp),%r13
-
-# qhasm:   carry? rt1 -= c1_stack - carry
-# asm 1: sbbq <c1_stack=stack64#9,<rt1=int64#12
-# asm 2: sbbq <c1_stack=64(%rsp),<rt1=%r14
-sbbq 64(%rsp),%r14
-
-# qhasm:   carry? rt2 -= c2_stack - carry
-# asm 1: sbbq <c2_stack=stack64#10,<rt2=int64#13
-# asm 2: sbbq <c2_stack=72(%rsp),<rt2=%r15
-sbbq 72(%rsp),%r15
-
-# qhasm:   carry? rt3 -= c3_stack - carry
-# asm 1: sbbq <c3_stack=stack64#11,<rt3=int64#14
-# asm 2: sbbq <c3_stack=80(%rsp),<rt3=%rbx
-sbbq 80(%rsp),%rbx
-
-# qhasm:   subt0 = 0
-# asm 1: mov  $0,>subt0=int64#6
-# asm 2: mov  $0,>subt0=%r9
-mov  $0,%r9
-
-# qhasm:   subt1 = 38
-# asm 1: mov  $38,>subt1=int64#7
-# asm 2: mov  $38,>subt1=%rax
-mov  $38,%rax
-
-# qhasm:   subt1 = subt0 if !carry
-# asm 1: cmovae <subt0=int64#6,<subt1=int64#7
-# asm 2: cmovae <subt0=%r9,<subt1=%rax
-cmovae %r9,%rax
-
-# qhasm:   carry? rt0 -= subt1
-# asm 1: sub  <subt1=int64#7,<rt0=int64#11
-# asm 2: sub  <subt1=%rax,<rt0=%r13
-sub  %rax,%r13
-
-# qhasm:   carry? rt1 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#6,<rt1=int64#12
-# asm 2: sbb  <subt0=%r9,<rt1=%r14
-sbb  %r9,%r14
-
-# qhasm:   carry? rt2 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#6,<rt2=int64#13
-# asm 2: sbb  <subt0=%r9,<rt2=%r15
-sbb  %r9,%r15
-
-# qhasm:   carry? rt3 -= subt0 - carry
-# asm 1: sbb  <subt0=int64#6,<rt3=int64#14
-# asm 2: sbb  <subt0=%r9,<rt3=%rbx
-sbb  %r9,%rbx
-
-# qhasm:   subt0 = subt1 if carry
-# asm 1: cmovc <subt1=int64#7,<subt0=int64#6
-# asm 2: cmovc <subt1=%rax,<subt0=%r9
-cmovc %rax,%r9
-
-# qhasm:   rt0 -= subt0
-# asm 1: sub  <subt0=int64#6,<rt0=int64#11
-# asm 2: sub  <subt0=%r9,<rt0=%r13
-sub  %r9,%r13
-
-# qhasm: *(uint64 *)(rp + 32) = rz0
-# asm 1: movq   <rz0=int64#2,32(<rp=int64#1)
-# asm 2: movq   <rz0=%rsi,32(<rp=%rdi)
-movq   %rsi,32(%rdi)
-
-# qhasm: *(uint64 *)(rp + 40) = rz1
-# asm 1: movq   <rz1=int64#3,40(<rp=int64#1)
-# asm 2: movq   <rz1=%rdx,40(<rp=%rdi)
-movq   %rdx,40(%rdi)
-
-# qhasm: *(uint64 *)(rp + 48) = rz2
-# asm 1: movq   <rz2=int64#4,48(<rp=int64#1)
-# asm 2: movq   <rz2=%rcx,48(<rp=%rdi)
-movq   %rcx,48(%rdi)
-
-# qhasm: *(uint64 *)(rp + 56) = rz3
-# asm 1: movq   <rz3=int64#5,56(<rp=int64#1)
-# asm 2: movq   <rz3=%r8,56(<rp=%rdi)
-movq   %r8,56(%rdi)
-
-# qhasm: *(uint64 *)(rp + 96) = rt0
-# asm 1: movq   <rt0=int64#11,96(<rp=int64#1)
-# asm 2: movq   <rt0=%r13,96(<rp=%rdi)
-movq   %r13,96(%rdi)
-
-# qhasm: *(uint64 *)(rp + 104) = rt1
-# asm 1: movq   <rt1=int64#12,104(<rp=int64#1)
-# asm 2: movq   <rt1=%r14,104(<rp=%rdi)
-movq   %r14,104(%rdi)
-
-# qhasm: *(uint64 *)(rp + 112) = rt2
-# asm 1: movq   <rt2=int64#13,112(<rp=int64#1)
-# asm 2: movq   <rt2=%r15,112(<rp=%rdi)
-movq   %r15,112(%rdi)
-
-# qhasm: *(uint64 *)(rp + 120) = rt3
-# asm 1: movq   <rt3=int64#14,120(<rp=int64#1)
-# asm 2: movq   <rt3=%rbx,120(<rp=%rdi)
-movq   %rbx,120(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c b/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c
deleted file mode 100644
index ffa6e2fa9..000000000
--- a/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "fe25519.h"
-#include "sc25519.h"
-#include "ge25519.h"
-
-/* Multiples of the base point in Niels' representation */
-static const ge25519_niels ge25519_base_multiples_niels[] = {
-#ifdef SMALLTABLES
-#include "ge25519_base_niels_smalltables.data"
-#else
-#include "ge25519_base_niels.data"
-#endif
-};
-
-/* d */
-/*static const fe25519 ecd = {{0x75EB4DCA135978A3, 0x00700A4D4141D8AB, 0x8CC740797779E898, 0x52036CEE2B6FFE73}};*/
-
-void ge25519_scalarmult_base(ge25519_p3 *r, const sc25519 *s)
-{
-  signed char b[64];
-  int i;
-  ge25519_niels t;
-  fe25519 d;
-
-  sc25519_window4(b,s);
-
-#ifdef SMALLTABLES
-  ge25519_p1p1 tp1p1;
-  choose_t((ge25519_niels *)r, 0, (signed long long) b[1], ge25519_base_multiples_niels);
-  fe25519_sub(&d, &r->y, &r->x);
-  fe25519_add(&r->y, &r->y, &r->x);
-  r->x = d;
-  r->t = r->z;
-  fe25519_setint(&r->z,2);
-  for(i=3;i<64;i+=2)
-  {
-    choose_t(&t, (unsigned long long) i/2, (signed long long) b[i], ge25519_base_multiples_niels);
-    ge25519_nielsadd2(r, &t);
-  }
-  ge25519_dbl_p1p1(&tp1p1,(ge25519_p2 *)r);
-  ge25519_p1p1_to_p2((ge25519_p2 *)r, &tp1p1);
-  ge25519_dbl_p1p1(&tp1p1,(ge25519_p2 *)r);
-  ge25519_p1p1_to_p2((ge25519_p2 *)r, &tp1p1);
-  ge25519_dbl_p1p1(&tp1p1,(ge25519_p2 *)r);
-  ge25519_p1p1_to_p2((ge25519_p2 *)r, &tp1p1);
-  ge25519_dbl_p1p1(&tp1p1,(ge25519_p2 *)r);
-  ge25519_p1p1_to_p3(r, &tp1p1);
-  choose_t(&t, (unsigned long long) 0, (signed long long) b[0], ge25519_base_multiples_niels);
-  fe25519_mul(&t.t2d, &t.t2d, &ecd);
-  ge25519_nielsadd2(r, &t);
-  for(i=2;i<64;i+=2)
-  {
-    choose_t(&t, (unsigned long long) i/2, (signed long long) b[i], ge25519_base_multiples_niels);
-    ge25519_nielsadd2(r, &t);
-  }
-#else 
-  choose_t((ge25519_niels *)r, 0, (signed long long) b[0], ge25519_base_multiples_niels);
-  fe25519_sub(&d, &r->y, &r->x);
-  fe25519_add(&r->y, &r->y, &r->x);
-  r->x = d;
-  r->t = r->z;
-  fe25519_setint(&r->z,2);
-  for(i=1;i<64;i++)
-  {
-    choose_t(&t, (unsigned long long) i, (signed long long) b[i], ge25519_base_multiples_niels);
-    ge25519_nielsadd2(r, &t);
-  }
-#endif 
-}
diff --git a/ext/ed25519-amd64-asm/ge25519_unpackneg.c b/ext/ed25519-amd64-asm/ge25519_unpackneg.c
deleted file mode 100644
index ff16fd200..000000000
--- a/ext/ed25519-amd64-asm/ge25519_unpackneg.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "fe25519.h"
-#include "ge25519.h"
-
-/* d */
-static const fe25519 ecd = {{0x75EB4DCA135978A3, 0x00700A4D4141D8AB, 0x8CC740797779E898, 0x52036CEE2B6FFE73}};
-/* sqrt(-1) */
-static const fe25519 sqrtm1 = {{0xC4EE1B274A0EA0B0, 0x2F431806AD2FE478, 0x2B4D00993DFBD7A7, 0x2B8324804FC1DF0B}};
-
-/* return 0 on success, -1 otherwise */
-int ge25519_unpackneg_vartime(ge25519_p3 *r, const unsigned char p[32])
-{
-  fe25519 t, chk, num, den, den2, den4, den6;
-  unsigned char par = p[31] >> 7;
-
-  fe25519_setint(&r->z,1);
-  fe25519_unpack(&r->y, p); 
-  fe25519_square(&num, &r->y); /* x = y^2 */
-  fe25519_mul(&den, &num, &ecd); /* den = dy^2 */
-  fe25519_sub(&num, &num, &r->z); /* x = y^2-1 */
-  fe25519_add(&den, &r->z, &den); /* den = dy^2+1 */
-
-  /* Computation of sqrt(num/den)
-     1.: computation of num^((p-5)/8)*den^((7p-35)/8) = (num*den^7)^((p-5)/8)
-  */
-  fe25519_square(&den2, &den);
-  fe25519_square(&den4, &den2);
-  fe25519_mul(&den6, &den4, &den2);
-  fe25519_mul(&t, &den6, &num);
-  fe25519_mul(&t, &t, &den);
-
-  fe25519_pow2523(&t, &t);
-  /* 2. computation of r->x = t * num * den^3
-  */
-  fe25519_mul(&t, &t, &num);
-  fe25519_mul(&t, &t, &den);
-  fe25519_mul(&t, &t, &den);
-  fe25519_mul(&r->x, &t, &den);
-
-  /* 3. Check whether sqrt computation gave correct result, multiply by sqrt(-1) if not:
-  */
-  fe25519_square(&chk, &r->x);
-  fe25519_mul(&chk, &chk, &den);
-  if (!fe25519_iseq_vartime(&chk, &num))
-    fe25519_mul(&r->x, &r->x, &sqrtm1);
-
-  /* 4. Now we have one of the two square roots, except if input was not a square
-  */
-  fe25519_square(&chk, &r->x);
-  fe25519_mul(&chk, &chk, &den);
-  if (!fe25519_iseq_vartime(&chk, &num))
-    return -1;
-
-  /* 5. Choose the desired square root according to parity:
-  */
-  if(fe25519_getparity(&r->x) != (1-par))
-    fe25519_neg(&r->x, &r->x);
-
-  fe25519_mul(&r->t, &r->x, &r->y);
-  return 0;
-}
diff --git a/ext/ed25519-amd64-asm/heap_rootreplaced.s b/ext/ed25519-amd64-asm/heap_rootreplaced.s
deleted file mode 100644
index 8fe385b47..000000000
--- a/ext/ed25519-amd64-asm/heap_rootreplaced.s
+++ /dev/null
@@ -1,476 +0,0 @@
-
-# qhasm: int64 hp
-
-# qhasm: int64 hlen
-
-# qhasm: int64 sp
-
-# qhasm: int64 pp
-
-# qhasm: input hp
-
-# qhasm: input hlen
-
-# qhasm: input sp
-
-# qhasm: int64 prc
-
-# qhasm: int64 plc
-
-# qhasm: int64 pc
-
-# qhasm: int64 d
-
-# qhasm: int64 spp
-
-# qhasm: int64 sprc
-
-# qhasm: int64 spc
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm: int64 p0
-
-# qhasm: int64 p1
-
-# qhasm: int64 p2
-
-# qhasm: int64 p3
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_heap_rootreplaced
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_heap_rootreplaced
-.globl crypto_sign_ed25519_amd64_64_heap_rootreplaced
-_crypto_sign_ed25519_amd64_64_heap_rootreplaced:
-crypto_sign_ed25519_amd64_64_heap_rootreplaced:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm: caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm: caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm: caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm: caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm: caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm: caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm: caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: pp = 0
-# asm 1: mov  $0,>pp=int64#4
-# asm 2: mov  $0,>pp=%rcx
-mov  $0,%rcx
-
-# qhasm: siftdownloop:
-._siftdownloop:
-
-# qhasm: prc = pp
-# asm 1: mov  <pp=int64#4,>prc=int64#5
-# asm 2: mov  <pp=%rcx,>prc=%r8
-mov  %rcx,%r8
-
-# qhasm: prc *= 2
-# asm 1: imulq  $2,<prc=int64#5,>prc=int64#5
-# asm 2: imulq  $2,<prc=%r8,>prc=%r8
-imulq  $2,%r8,%r8
-
-# qhasm: pc = prc
-# asm 1: mov  <prc=int64#5,>pc=int64#6
-# asm 2: mov  <prc=%r8,>pc=%r9
-mov  %r8,%r9
-
-# qhasm: prc += 2
-# asm 1: add  $2,<prc=int64#5
-# asm 2: add  $2,<prc=%r8
-add  $2,%r8
-
-# qhasm: pc += 1
-# asm 1: add  $1,<pc=int64#6
-# asm 2: add  $1,<pc=%r9
-add  $1,%r9
-
-# qhasm: unsigned>? hlen - prc
-# asm 1: cmp  <prc=int64#5,<hlen=int64#2
-# asm 2: cmp  <prc=%r8,<hlen=%rsi
-cmp  %r8,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftuploop if !unsigned>
-jbe ._siftuploop
-
-# qhasm: sprc = *(uint64 *)(hp + prc * 8)
-# asm 1: movq   (<hp=int64#1,<prc=int64#5,8),>sprc=int64#7
-# asm 2: movq   (<hp=%rdi,<prc=%r8,8),>sprc=%rax
-movq   (%rdi,%r8,8),%rax
-
-# qhasm: sprc <<= 5
-# asm 1: shl  $5,<sprc=int64#7
-# asm 2: shl  $5,<sprc=%rax
-shl  $5,%rax
-
-# qhasm: sprc += sp
-# asm 1: add  <sp=int64#3,<sprc=int64#7
-# asm 2: add  <sp=%rdx,<sprc=%rax
-add  %rdx,%rax
-
-# qhasm: spc = *(uint64 *)(hp + pc * 8)
-# asm 1: movq   (<hp=int64#1,<pc=int64#6,8),>spc=int64#8
-# asm 2: movq   (<hp=%rdi,<pc=%r9,8),>spc=%r10
-movq   (%rdi,%r9,8),%r10
-
-# qhasm: spc <<= 5
-# asm 1: shl  $5,<spc=int64#8
-# asm 2: shl  $5,<spc=%r10
-shl  $5,%r10
-
-# qhasm: spc += sp
-# asm 1: add  <sp=int64#3,<spc=int64#8
-# asm 2: add  <sp=%rdx,<spc=%r10
-add  %rdx,%r10
-
-# qhasm: c0 = *(uint64 *)(spc +  0)
-# asm 1: movq   0(<spc=int64#8),>c0=int64#9
-# asm 2: movq   0(<spc=%r10),>c0=%r11
-movq   0(%r10),%r11
-
-# qhasm: c1 = *(uint64 *)(spc +  8)
-# asm 1: movq   8(<spc=int64#8),>c1=int64#10
-# asm 2: movq   8(<spc=%r10),>c1=%r12
-movq   8(%r10),%r12
-
-# qhasm: c2 = *(uint64 *)(spc + 16)
-# asm 1: movq   16(<spc=int64#8),>c2=int64#11
-# asm 2: movq   16(<spc=%r10),>c2=%r13
-movq   16(%r10),%r13
-
-# qhasm: c3 = *(uint64 *)(spc + 24)
-# asm 1: movq   24(<spc=int64#8),>c3=int64#12
-# asm 2: movq   24(<spc=%r10),>c3=%r14
-movq   24(%r10),%r14
-
-# qhasm: carry? c0 -= *(uint64 *)(sprc +  0)
-# asm 1: subq 0(<sprc=int64#7),<c0=int64#9
-# asm 2: subq 0(<sprc=%rax),<c0=%r11
-subq 0(%rax),%r11
-
-# qhasm: carry? c1 -= *(uint64 *)(sprc +  8) - carry
-# asm 1: sbbq 8(<sprc=int64#7),<c1=int64#10
-# asm 2: sbbq 8(<sprc=%rax),<c1=%r12
-sbbq 8(%rax),%r12
-
-# qhasm: carry? c2 -= *(uint64 *)(sprc + 16) - carry
-# asm 1: sbbq 16(<sprc=int64#7),<c2=int64#11
-# asm 2: sbbq 16(<sprc=%rax),<c2=%r13
-sbbq 16(%rax),%r13
-
-# qhasm: carry? c3 -= *(uint64 *)(sprc + 24) - carry
-# asm 1: sbbq 24(<sprc=int64#7),<c3=int64#12
-# asm 2: sbbq 24(<sprc=%rax),<c3=%r14
-sbbq 24(%rax),%r14
-
-# qhasm: pc = prc if carry
-# asm 1: cmovc <prc=int64#5,<pc=int64#6
-# asm 2: cmovc <prc=%r8,<pc=%r9
-cmovc %r8,%r9
-
-# qhasm: spc = sprc if carry
-# asm 1: cmovc <sprc=int64#7,<spc=int64#8
-# asm 2: cmovc <sprc=%rax,<spc=%r10
-cmovc %rax,%r10
-
-# qhasm: spc -= sp
-# asm 1: sub  <sp=int64#3,<spc=int64#8
-# asm 2: sub  <sp=%rdx,<spc=%r10
-sub  %rdx,%r10
-
-# qhasm: (uint64) spc >>= 5
-# asm 1: shr  $5,<spc=int64#8
-# asm 2: shr  $5,<spc=%r10
-shr  $5,%r10
-
-# qhasm: spp = *(uint64 *)(hp + pp * 8)
-# asm 1: movq   (<hp=int64#1,<pp=int64#4,8),>spp=int64#5
-# asm 2: movq   (<hp=%rdi,<pp=%rcx,8),>spp=%r8
-movq   (%rdi,%rcx,8),%r8
-
-# qhasm: *(uint64 *)(hp + pp * 8) = spc
-# asm 1: movq  <spc=int64#8,(<hp=int64#1,<pp=int64#4,8)
-# asm 2: movq  <spc=%r10,(<hp=%rdi,<pp=%rcx,8)
-movq  %r10,(%rdi,%rcx,8)
-
-# qhasm: *(uint64 *)(hp + pc * 8) = spp
-# asm 1: movq  <spp=int64#5,(<hp=int64#1,<pc=int64#6,8)
-# asm 2: movq  <spp=%r8,(<hp=%rdi,<pc=%r9,8)
-movq  %r8,(%rdi,%r9,8)
-
-# qhasm: pp = pc
-# asm 1: mov  <pc=int64#6,>pp=int64#4
-# asm 2: mov  <pc=%r9,>pp=%rcx
-mov  %r9,%rcx
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftdownloop
-jmp ._siftdownloop
-
-# qhasm: siftuploop:
-._siftuploop:
-
-# qhasm: pc = pp
-# asm 1: mov  <pp=int64#4,>pc=int64#2
-# asm 2: mov  <pp=%rcx,>pc=%rsi
-mov  %rcx,%rsi
-
-# qhasm: pp -= 1
-# asm 1: sub  $1,<pp=int64#4
-# asm 2: sub  $1,<pp=%rcx
-sub  $1,%rcx
-
-# qhasm: (uint64) pp >>= 1
-# asm 1: shr  $1,<pp=int64#4
-# asm 2: shr  $1,<pp=%rcx
-shr  $1,%rcx
-
-# qhasm: unsigned>? pc - 0 
-# asm 1: cmp  $0,<pc=int64#2
-# asm 2: cmp  $0,<pc=%rsi
-cmp  $0,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto end if !unsigned>
-jbe ._end
-
-# qhasm: spp = *(uint64 *)(hp + pp * 8)
-# asm 1: movq   (<hp=int64#1,<pp=int64#4,8),>spp=int64#5
-# asm 2: movq   (<hp=%rdi,<pp=%rcx,8),>spp=%r8
-movq   (%rdi,%rcx,8),%r8
-
-# qhasm: spc = *(uint64 *)(hp + pc * 8)
-# asm 1: movq   (<hp=int64#1,<pc=int64#2,8),>spc=int64#6
-# asm 2: movq   (<hp=%rdi,<pc=%rsi,8),>spc=%r9
-movq   (%rdi,%rsi,8),%r9
-
-# qhasm: spp <<= 5
-# asm 1: shl  $5,<spp=int64#5
-# asm 2: shl  $5,<spp=%r8
-shl  $5,%r8
-
-# qhasm: spc <<= 5
-# asm 1: shl  $5,<spc=int64#6
-# asm 2: shl  $5,<spc=%r9
-shl  $5,%r9
-
-# qhasm: spc += sp
-# asm 1: add  <sp=int64#3,<spc=int64#6
-# asm 2: add  <sp=%rdx,<spc=%r9
-add  %rdx,%r9
-
-# qhasm: spp += sp
-# asm 1: add  <sp=int64#3,<spp=int64#5
-# asm 2: add  <sp=%rdx,<spp=%r8
-add  %rdx,%r8
-
-# qhasm: c0 = *(uint64 *)(spc +  0)
-# asm 1: movq   0(<spc=int64#6),>c0=int64#7
-# asm 2: movq   0(<spc=%r9),>c0=%rax
-movq   0(%r9),%rax
-
-# qhasm: c1 = *(uint64 *)(spc +  8)
-# asm 1: movq   8(<spc=int64#6),>c1=int64#8
-# asm 2: movq   8(<spc=%r9),>c1=%r10
-movq   8(%r9),%r10
-
-# qhasm: c2 = *(uint64 *)(spc + 16)
-# asm 1: movq   16(<spc=int64#6),>c2=int64#9
-# asm 2: movq   16(<spc=%r9),>c2=%r11
-movq   16(%r9),%r11
-
-# qhasm: c3 = *(uint64 *)(spc + 24)
-# asm 1: movq   24(<spc=int64#6),>c3=int64#10
-# asm 2: movq   24(<spc=%r9),>c3=%r12
-movq   24(%r9),%r12
-
-# qhasm: carry? c0 -= *(uint64 *)(spp +  0)
-# asm 1: subq 0(<spp=int64#5),<c0=int64#7
-# asm 2: subq 0(<spp=%r8),<c0=%rax
-subq 0(%r8),%rax
-
-# qhasm: carry? c1 -= *(uint64 *)(spp +  8) - carry
-# asm 1: sbbq 8(<spp=int64#5),<c1=int64#8
-# asm 2: sbbq 8(<spp=%r8),<c1=%r10
-sbbq 8(%r8),%r10
-
-# qhasm: carry? c2 -= *(uint64 *)(spp + 16) - carry
-# asm 1: sbbq 16(<spp=int64#5),<c2=int64#9
-# asm 2: sbbq 16(<spp=%r8),<c2=%r11
-sbbq 16(%r8),%r11
-
-# qhasm: carry? c3 -= *(uint64 *)(spp + 24) - carry
-# asm 1: sbbq 24(<spp=int64#5),<c3=int64#10
-# asm 2: sbbq 24(<spp=%r8),<c3=%r12
-sbbq 24(%r8),%r12
-# comment:fp stack unchanged by jump
-
-# qhasm: goto end if carry
-jc ._end
-
-# qhasm: spc -= sp
-# asm 1: sub  <sp=int64#3,<spc=int64#6
-# asm 2: sub  <sp=%rdx,<spc=%r9
-sub  %rdx,%r9
-
-# qhasm: (uint64) spc >>= 5
-# asm 1: shr  $5,<spc=int64#6
-# asm 2: shr  $5,<spc=%r9
-shr  $5,%r9
-
-# qhasm: spp -= sp
-# asm 1: sub  <sp=int64#3,<spp=int64#5
-# asm 2: sub  <sp=%rdx,<spp=%r8
-sub  %rdx,%r8
-
-# qhasm: (uint64) spp >>= 5
-# asm 1: shr  $5,<spp=int64#5
-# asm 2: shr  $5,<spp=%r8
-shr  $5,%r8
-
-# qhasm: *(uint64 *)(hp + pp * 8) = spc
-# asm 1: movq  <spc=int64#6,(<hp=int64#1,<pp=int64#4,8)
-# asm 2: movq  <spc=%r9,(<hp=%rdi,<pp=%rcx,8)
-movq  %r9,(%rdi,%rcx,8)
-
-# qhasm: *(uint64 *)(hp + pc * 8) = spp
-# asm 1: movq  <spp=int64#5,(<hp=int64#1,<pc=int64#2,8)
-# asm 2: movq  <spp=%r8,(<hp=%rdi,<pc=%rsi,8)
-movq  %r8,(%rdi,%rsi,8)
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftuploop
-jmp ._siftuploop
-
-# qhasm: end:
-._end:
-
-# qhasm: caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm: caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm: caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm: caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm: caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm: caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm: caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/heap_rootreplaced_1limb.s b/ext/ed25519-amd64-asm/heap_rootreplaced_1limb.s
deleted file mode 100644
index 488e9c52d..000000000
--- a/ext/ed25519-amd64-asm/heap_rootreplaced_1limb.s
+++ /dev/null
@@ -1,416 +0,0 @@
-
-# qhasm: int64 hp
-
-# qhasm: int64 hlen
-
-# qhasm: int64 sp
-
-# qhasm: int64 pp
-
-# qhasm: input hp
-
-# qhasm: input hlen
-
-# qhasm: input sp
-
-# qhasm: int64 prc
-
-# qhasm: int64 plc
-
-# qhasm: int64 pc
-
-# qhasm: int64 d
-
-# qhasm: int64 spp
-
-# qhasm: int64 sprc
-
-# qhasm: int64 spc
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm: int64 p0
-
-# qhasm: int64 p1
-
-# qhasm: int64 p2
-
-# qhasm: int64 p3
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb
-.globl crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb
-_crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb:
-crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm: caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm: caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm: caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm: caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm: caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm: caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm: caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: pp = 0
-# asm 1: mov  $0,>pp=int64#4
-# asm 2: mov  $0,>pp=%rcx
-mov  $0,%rcx
-
-# qhasm: siftdownloop:
-._siftdownloop:
-
-# qhasm: prc = pp
-# asm 1: mov  <pp=int64#4,>prc=int64#5
-# asm 2: mov  <pp=%rcx,>prc=%r8
-mov  %rcx,%r8
-
-# qhasm: prc *= 2
-# asm 1: imulq  $2,<prc=int64#5,>prc=int64#5
-# asm 2: imulq  $2,<prc=%r8,>prc=%r8
-imulq  $2,%r8,%r8
-
-# qhasm: pc = prc
-# asm 1: mov  <prc=int64#5,>pc=int64#6
-# asm 2: mov  <prc=%r8,>pc=%r9
-mov  %r8,%r9
-
-# qhasm: prc += 2
-# asm 1: add  $2,<prc=int64#5
-# asm 2: add  $2,<prc=%r8
-add  $2,%r8
-
-# qhasm: pc += 1
-# asm 1: add  $1,<pc=int64#6
-# asm 2: add  $1,<pc=%r9
-add  $1,%r9
-
-# qhasm: unsigned>? hlen - prc
-# asm 1: cmp  <prc=int64#5,<hlen=int64#2
-# asm 2: cmp  <prc=%r8,<hlen=%rsi
-cmp  %r8,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftuploop if !unsigned>
-jbe ._siftuploop
-
-# qhasm: sprc = *(uint64 *)(hp + prc * 8)
-# asm 1: movq   (<hp=int64#1,<prc=int64#5,8),>sprc=int64#7
-# asm 2: movq   (<hp=%rdi,<prc=%r8,8),>sprc=%rax
-movq   (%rdi,%r8,8),%rax
-
-# qhasm: sprc <<= 5
-# asm 1: shl  $5,<sprc=int64#7
-# asm 2: shl  $5,<sprc=%rax
-shl  $5,%rax
-
-# qhasm: sprc += sp
-# asm 1: add  <sp=int64#3,<sprc=int64#7
-# asm 2: add  <sp=%rdx,<sprc=%rax
-add  %rdx,%rax
-
-# qhasm: spc = *(uint64 *)(hp + pc * 8)
-# asm 1: movq   (<hp=int64#1,<pc=int64#6,8),>spc=int64#8
-# asm 2: movq   (<hp=%rdi,<pc=%r9,8),>spc=%r10
-movq   (%rdi,%r9,8),%r10
-
-# qhasm: spc <<= 5
-# asm 1: shl  $5,<spc=int64#8
-# asm 2: shl  $5,<spc=%r10
-shl  $5,%r10
-
-# qhasm: spc += sp
-# asm 1: add  <sp=int64#3,<spc=int64#8
-# asm 2: add  <sp=%rdx,<spc=%r10
-add  %rdx,%r10
-
-# qhasm: c0 = *(uint64 *)(spc +  0)
-# asm 1: movq   0(<spc=int64#8),>c0=int64#9
-# asm 2: movq   0(<spc=%r10),>c0=%r11
-movq   0(%r10),%r11
-
-# qhasm: carry? c0 -= *(uint64 *)(sprc +  0)
-# asm 1: subq 0(<sprc=int64#7),<c0=int64#9
-# asm 2: subq 0(<sprc=%rax),<c0=%r11
-subq 0(%rax),%r11
-
-# qhasm: pc = prc if carry
-# asm 1: cmovc <prc=int64#5,<pc=int64#6
-# asm 2: cmovc <prc=%r8,<pc=%r9
-cmovc %r8,%r9
-
-# qhasm: spc = sprc if carry
-# asm 1: cmovc <sprc=int64#7,<spc=int64#8
-# asm 2: cmovc <sprc=%rax,<spc=%r10
-cmovc %rax,%r10
-
-# qhasm: spc -= sp
-# asm 1: sub  <sp=int64#3,<spc=int64#8
-# asm 2: sub  <sp=%rdx,<spc=%r10
-sub  %rdx,%r10
-
-# qhasm: (uint64) spc >>= 5
-# asm 1: shr  $5,<spc=int64#8
-# asm 2: shr  $5,<spc=%r10
-shr  $5,%r10
-
-# qhasm: spp = *(uint64 *)(hp + pp * 8)
-# asm 1: movq   (<hp=int64#1,<pp=int64#4,8),>spp=int64#5
-# asm 2: movq   (<hp=%rdi,<pp=%rcx,8),>spp=%r8
-movq   (%rdi,%rcx,8),%r8
-
-# qhasm: *(uint64 *)(hp + pp * 8) = spc
-# asm 1: movq  <spc=int64#8,(<hp=int64#1,<pp=int64#4,8)
-# asm 2: movq  <spc=%r10,(<hp=%rdi,<pp=%rcx,8)
-movq  %r10,(%rdi,%rcx,8)
-
-# qhasm: *(uint64 *)(hp + pc * 8) = spp
-# asm 1: movq  <spp=int64#5,(<hp=int64#1,<pc=int64#6,8)
-# asm 2: movq  <spp=%r8,(<hp=%rdi,<pc=%r9,8)
-movq  %r8,(%rdi,%r9,8)
-
-# qhasm: pp = pc
-# asm 1: mov  <pc=int64#6,>pp=int64#4
-# asm 2: mov  <pc=%r9,>pp=%rcx
-mov  %r9,%rcx
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftdownloop
-jmp ._siftdownloop
-
-# qhasm: siftuploop:
-._siftuploop:
-
-# qhasm: pc = pp
-# asm 1: mov  <pp=int64#4,>pc=int64#2
-# asm 2: mov  <pp=%rcx,>pc=%rsi
-mov  %rcx,%rsi
-
-# qhasm: pp -= 1
-# asm 1: sub  $1,<pp=int64#4
-# asm 2: sub  $1,<pp=%rcx
-sub  $1,%rcx
-
-# qhasm: (uint64) pp >>= 1
-# asm 1: shr  $1,<pp=int64#4
-# asm 2: shr  $1,<pp=%rcx
-shr  $1,%rcx
-
-# qhasm: unsigned>? pc - 0 
-# asm 1: cmp  $0,<pc=int64#2
-# asm 2: cmp  $0,<pc=%rsi
-cmp  $0,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto end if !unsigned>
-jbe ._end
-
-# qhasm: spp = *(uint64 *)(hp + pp * 8)
-# asm 1: movq   (<hp=int64#1,<pp=int64#4,8),>spp=int64#5
-# asm 2: movq   (<hp=%rdi,<pp=%rcx,8),>spp=%r8
-movq   (%rdi,%rcx,8),%r8
-
-# qhasm: spc = *(uint64 *)(hp + pc * 8)
-# asm 1: movq   (<hp=int64#1,<pc=int64#2,8),>spc=int64#6
-# asm 2: movq   (<hp=%rdi,<pc=%rsi,8),>spc=%r9
-movq   (%rdi,%rsi,8),%r9
-
-# qhasm: spp <<= 5
-# asm 1: shl  $5,<spp=int64#5
-# asm 2: shl  $5,<spp=%r8
-shl  $5,%r8
-
-# qhasm: spc <<= 5
-# asm 1: shl  $5,<spc=int64#6
-# asm 2: shl  $5,<spc=%r9
-shl  $5,%r9
-
-# qhasm: spc += sp
-# asm 1: add  <sp=int64#3,<spc=int64#6
-# asm 2: add  <sp=%rdx,<spc=%r9
-add  %rdx,%r9
-
-# qhasm: spp += sp
-# asm 1: add  <sp=int64#3,<spp=int64#5
-# asm 2: add  <sp=%rdx,<spp=%r8
-add  %rdx,%r8
-
-# qhasm: c0 = *(uint64 *)(spc +  0)
-# asm 1: movq   0(<spc=int64#6),>c0=int64#7
-# asm 2: movq   0(<spc=%r9),>c0=%rax
-movq   0(%r9),%rax
-
-# qhasm: carry? c0 -= *(uint64 *)(spp +  0)
-# asm 1: subq 0(<spp=int64#5),<c0=int64#7
-# asm 2: subq 0(<spp=%r8),<c0=%rax
-subq 0(%r8),%rax
-# comment:fp stack unchanged by jump
-
-# qhasm: goto end if carry
-jc ._end
-
-# qhasm: spc -= sp
-# asm 1: sub  <sp=int64#3,<spc=int64#6
-# asm 2: sub  <sp=%rdx,<spc=%r9
-sub  %rdx,%r9
-
-# qhasm: (uint64) spc >>= 5
-# asm 1: shr  $5,<spc=int64#6
-# asm 2: shr  $5,<spc=%r9
-shr  $5,%r9
-
-# qhasm: spp -= sp
-# asm 1: sub  <sp=int64#3,<spp=int64#5
-# asm 2: sub  <sp=%rdx,<spp=%r8
-sub  %rdx,%r8
-
-# qhasm: (uint64) spp >>= 5
-# asm 1: shr  $5,<spp=int64#5
-# asm 2: shr  $5,<spp=%r8
-shr  $5,%r8
-
-# qhasm: *(uint64 *)(hp + pp * 8) = spc
-# asm 1: movq  <spc=int64#6,(<hp=int64#1,<pp=int64#4,8)
-# asm 2: movq  <spc=%r9,(<hp=%rdi,<pp=%rcx,8)
-movq  %r9,(%rdi,%rcx,8)
-
-# qhasm: *(uint64 *)(hp + pc * 8) = spp
-# asm 1: movq  <spp=int64#5,(<hp=int64#1,<pc=int64#2,8)
-# asm 2: movq  <spp=%r8,(<hp=%rdi,<pc=%rsi,8)
-movq  %r8,(%rdi,%rsi,8)
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftuploop
-jmp ._siftuploop
-
-# qhasm: end:
-._end:
-
-# qhasm: caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm: caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm: caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm: caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm: caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm: caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm: caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/heap_rootreplaced_2limbs.s b/ext/ed25519-amd64-asm/heap_rootreplaced_2limbs.s
deleted file mode 100644
index f9259184c..000000000
--- a/ext/ed25519-amd64-asm/heap_rootreplaced_2limbs.s
+++ /dev/null
@@ -1,436 +0,0 @@
-
-# qhasm: int64 hp
-
-# qhasm: int64 hlen
-
-# qhasm: int64 sp
-
-# qhasm: int64 pp
-
-# qhasm: input hp
-
-# qhasm: input hlen
-
-# qhasm: input sp
-
-# qhasm: int64 prc
-
-# qhasm: int64 plc
-
-# qhasm: int64 pc
-
-# qhasm: int64 d
-
-# qhasm: int64 spp
-
-# qhasm: int64 sprc
-
-# qhasm: int64 spc
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm: int64 p0
-
-# qhasm: int64 p1
-
-# qhasm: int64 p2
-
-# qhasm: int64 p3
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs
-.globl crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs
-_crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs:
-crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm: caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm: caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm: caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm: caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm: caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm: caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm: caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: pp = 0
-# asm 1: mov  $0,>pp=int64#4
-# asm 2: mov  $0,>pp=%rcx
-mov  $0,%rcx
-
-# qhasm: siftdownloop:
-._siftdownloop:
-
-# qhasm: prc = pp
-# asm 1: mov  <pp=int64#4,>prc=int64#5
-# asm 2: mov  <pp=%rcx,>prc=%r8
-mov  %rcx,%r8
-
-# qhasm: prc *= 2
-# asm 1: imulq  $2,<prc=int64#5,>prc=int64#5
-# asm 2: imulq  $2,<prc=%r8,>prc=%r8
-imulq  $2,%r8,%r8
-
-# qhasm: pc = prc
-# asm 1: mov  <prc=int64#5,>pc=int64#6
-# asm 2: mov  <prc=%r8,>pc=%r9
-mov  %r8,%r9
-
-# qhasm: prc += 2
-# asm 1: add  $2,<prc=int64#5
-# asm 2: add  $2,<prc=%r8
-add  $2,%r8
-
-# qhasm: pc += 1
-# asm 1: add  $1,<pc=int64#6
-# asm 2: add  $1,<pc=%r9
-add  $1,%r9
-
-# qhasm: unsigned>? hlen - prc
-# asm 1: cmp  <prc=int64#5,<hlen=int64#2
-# asm 2: cmp  <prc=%r8,<hlen=%rsi
-cmp  %r8,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftuploop if !unsigned>
-jbe ._siftuploop
-
-# qhasm: sprc = *(uint64 *)(hp + prc * 8)
-# asm 1: movq   (<hp=int64#1,<prc=int64#5,8),>sprc=int64#7
-# asm 2: movq   (<hp=%rdi,<prc=%r8,8),>sprc=%rax
-movq   (%rdi,%r8,8),%rax
-
-# qhasm: sprc <<= 5
-# asm 1: shl  $5,<sprc=int64#7
-# asm 2: shl  $5,<sprc=%rax
-shl  $5,%rax
-
-# qhasm: sprc += sp
-# asm 1: add  <sp=int64#3,<sprc=int64#7
-# asm 2: add  <sp=%rdx,<sprc=%rax
-add  %rdx,%rax
-
-# qhasm: spc = *(uint64 *)(hp + pc * 8)
-# asm 1: movq   (<hp=int64#1,<pc=int64#6,8),>spc=int64#8
-# asm 2: movq   (<hp=%rdi,<pc=%r9,8),>spc=%r10
-movq   (%rdi,%r9,8),%r10
-
-# qhasm: spc <<= 5
-# asm 1: shl  $5,<spc=int64#8
-# asm 2: shl  $5,<spc=%r10
-shl  $5,%r10
-
-# qhasm: spc += sp
-# asm 1: add  <sp=int64#3,<spc=int64#8
-# asm 2: add  <sp=%rdx,<spc=%r10
-add  %rdx,%r10
-
-# qhasm: c0 = *(uint64 *)(spc +  0)
-# asm 1: movq   0(<spc=int64#8),>c0=int64#9
-# asm 2: movq   0(<spc=%r10),>c0=%r11
-movq   0(%r10),%r11
-
-# qhasm: c1 = *(uint64 *)(spc +  8)
-# asm 1: movq   8(<spc=int64#8),>c1=int64#10
-# asm 2: movq   8(<spc=%r10),>c1=%r12
-movq   8(%r10),%r12
-
-# qhasm: carry? c0 -= *(uint64 *)(sprc +  0)
-# asm 1: subq 0(<sprc=int64#7),<c0=int64#9
-# asm 2: subq 0(<sprc=%rax),<c0=%r11
-subq 0(%rax),%r11
-
-# qhasm: carry? c1 -= *(uint64 *)(sprc +  8) - carry
-# asm 1: sbbq 8(<sprc=int64#7),<c1=int64#10
-# asm 2: sbbq 8(<sprc=%rax),<c1=%r12
-sbbq 8(%rax),%r12
-
-# qhasm: pc = prc if carry
-# asm 1: cmovc <prc=int64#5,<pc=int64#6
-# asm 2: cmovc <prc=%r8,<pc=%r9
-cmovc %r8,%r9
-
-# qhasm: spc = sprc if carry
-# asm 1: cmovc <sprc=int64#7,<spc=int64#8
-# asm 2: cmovc <sprc=%rax,<spc=%r10
-cmovc %rax,%r10
-
-# qhasm: spc -= sp
-# asm 1: sub  <sp=int64#3,<spc=int64#8
-# asm 2: sub  <sp=%rdx,<spc=%r10
-sub  %rdx,%r10
-
-# qhasm: (uint64) spc >>= 5
-# asm 1: shr  $5,<spc=int64#8
-# asm 2: shr  $5,<spc=%r10
-shr  $5,%r10
-
-# qhasm: spp = *(uint64 *)(hp + pp * 8)
-# asm 1: movq   (<hp=int64#1,<pp=int64#4,8),>spp=int64#5
-# asm 2: movq   (<hp=%rdi,<pp=%rcx,8),>spp=%r8
-movq   (%rdi,%rcx,8),%r8
-
-# qhasm: *(uint64 *)(hp + pp * 8) = spc
-# asm 1: movq  <spc=int64#8,(<hp=int64#1,<pp=int64#4,8)
-# asm 2: movq  <spc=%r10,(<hp=%rdi,<pp=%rcx,8)
-movq  %r10,(%rdi,%rcx,8)
-
-# qhasm: *(uint64 *)(hp + pc * 8) = spp
-# asm 1: movq  <spp=int64#5,(<hp=int64#1,<pc=int64#6,8)
-# asm 2: movq  <spp=%r8,(<hp=%rdi,<pc=%r9,8)
-movq  %r8,(%rdi,%r9,8)
-
-# qhasm: pp = pc
-# asm 1: mov  <pc=int64#6,>pp=int64#4
-# asm 2: mov  <pc=%r9,>pp=%rcx
-mov  %r9,%rcx
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftdownloop
-jmp ._siftdownloop
-
-# qhasm: siftuploop:
-._siftuploop:
-
-# qhasm: pc = pp
-# asm 1: mov  <pp=int64#4,>pc=int64#2
-# asm 2: mov  <pp=%rcx,>pc=%rsi
-mov  %rcx,%rsi
-
-# qhasm: pp -= 1
-# asm 1: sub  $1,<pp=int64#4
-# asm 2: sub  $1,<pp=%rcx
-sub  $1,%rcx
-
-# qhasm: (uint64) pp >>= 1
-# asm 1: shr  $1,<pp=int64#4
-# asm 2: shr  $1,<pp=%rcx
-shr  $1,%rcx
-
-# qhasm: unsigned>? pc - 0 
-# asm 1: cmp  $0,<pc=int64#2
-# asm 2: cmp  $0,<pc=%rsi
-cmp  $0,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto end if !unsigned>
-jbe ._end
-
-# qhasm: spp = *(uint64 *)(hp + pp * 8)
-# asm 1: movq   (<hp=int64#1,<pp=int64#4,8),>spp=int64#5
-# asm 2: movq   (<hp=%rdi,<pp=%rcx,8),>spp=%r8
-movq   (%rdi,%rcx,8),%r8
-
-# qhasm: spc = *(uint64 *)(hp + pc * 8)
-# asm 1: movq   (<hp=int64#1,<pc=int64#2,8),>spc=int64#6
-# asm 2: movq   (<hp=%rdi,<pc=%rsi,8),>spc=%r9
-movq   (%rdi,%rsi,8),%r9
-
-# qhasm: spp <<= 5
-# asm 1: shl  $5,<spp=int64#5
-# asm 2: shl  $5,<spp=%r8
-shl  $5,%r8
-
-# qhasm: spc <<= 5
-# asm 1: shl  $5,<spc=int64#6
-# asm 2: shl  $5,<spc=%r9
-shl  $5,%r9
-
-# qhasm: spc += sp
-# asm 1: add  <sp=int64#3,<spc=int64#6
-# asm 2: add  <sp=%rdx,<spc=%r9
-add  %rdx,%r9
-
-# qhasm: spp += sp
-# asm 1: add  <sp=int64#3,<spp=int64#5
-# asm 2: add  <sp=%rdx,<spp=%r8
-add  %rdx,%r8
-
-# qhasm: c0 = *(uint64 *)(spc +  0)
-# asm 1: movq   0(<spc=int64#6),>c0=int64#7
-# asm 2: movq   0(<spc=%r9),>c0=%rax
-movq   0(%r9),%rax
-
-# qhasm: c1 = *(uint64 *)(spc +  8)
-# asm 1: movq   8(<spc=int64#6),>c1=int64#8
-# asm 2: movq   8(<spc=%r9),>c1=%r10
-movq   8(%r9),%r10
-
-# qhasm: carry? c0 -= *(uint64 *)(spp +  0)
-# asm 1: subq 0(<spp=int64#5),<c0=int64#7
-# asm 2: subq 0(<spp=%r8),<c0=%rax
-subq 0(%r8),%rax
-
-# qhasm: carry? c1 -= *(uint64 *)(spp +  8) - carry
-# asm 1: sbbq 8(<spp=int64#5),<c1=int64#8
-# asm 2: sbbq 8(<spp=%r8),<c1=%r10
-sbbq 8(%r8),%r10
-# comment:fp stack unchanged by jump
-
-# qhasm: goto end if carry
-jc ._end
-
-# qhasm: spc -= sp
-# asm 1: sub  <sp=int64#3,<spc=int64#6
-# asm 2: sub  <sp=%rdx,<spc=%r9
-sub  %rdx,%r9
-
-# qhasm: (uint64) spc >>= 5
-# asm 1: shr  $5,<spc=int64#6
-# asm 2: shr  $5,<spc=%r9
-shr  $5,%r9
-
-# qhasm: spp -= sp
-# asm 1: sub  <sp=int64#3,<spp=int64#5
-# asm 2: sub  <sp=%rdx,<spp=%r8
-sub  %rdx,%r8
-
-# qhasm: (uint64) spp >>= 5
-# asm 1: shr  $5,<spp=int64#5
-# asm 2: shr  $5,<spp=%r8
-shr  $5,%r8
-
-# qhasm: *(uint64 *)(hp + pp * 8) = spc
-# asm 1: movq  <spc=int64#6,(<hp=int64#1,<pp=int64#4,8)
-# asm 2: movq  <spc=%r9,(<hp=%rdi,<pp=%rcx,8)
-movq  %r9,(%rdi,%rcx,8)
-
-# qhasm: *(uint64 *)(hp + pc * 8) = spp
-# asm 1: movq  <spp=int64#5,(<hp=int64#1,<pc=int64#2,8)
-# asm 2: movq  <spp=%r8,(<hp=%rdi,<pc=%rsi,8)
-movq  %r8,(%rdi,%rsi,8)
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftuploop
-jmp ._siftuploop
-
-# qhasm: end:
-._end:
-
-# qhasm: caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm: caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm: caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm: caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm: caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm: caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm: caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/heap_rootreplaced_3limbs.s b/ext/ed25519-amd64-asm/heap_rootreplaced_3limbs.s
deleted file mode 100644
index dcf890ea6..000000000
--- a/ext/ed25519-amd64-asm/heap_rootreplaced_3limbs.s
+++ /dev/null
@@ -1,456 +0,0 @@
-
-# qhasm: int64 hp
-
-# qhasm: int64 hlen
-
-# qhasm: int64 sp
-
-# qhasm: int64 pp
-
-# qhasm: input hp
-
-# qhasm: input hlen
-
-# qhasm: input sp
-
-# qhasm: int64 prc
-
-# qhasm: int64 plc
-
-# qhasm: int64 pc
-
-# qhasm: int64 d
-
-# qhasm: int64 spp
-
-# qhasm: int64 sprc
-
-# qhasm: int64 spc
-
-# qhasm: int64 c0
-
-# qhasm: int64 c1
-
-# qhasm: int64 c2
-
-# qhasm: int64 c3
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm: int64 p0
-
-# qhasm: int64 p1
-
-# qhasm: int64 p2
-
-# qhasm: int64 p3
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs
-.globl crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs
-_crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs:
-crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm: caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm: caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm: caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm: caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm: caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm: caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm: caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: pp = 0
-# asm 1: mov  $0,>pp=int64#4
-# asm 2: mov  $0,>pp=%rcx
-mov  $0,%rcx
-
-# qhasm: siftdownloop:
-._siftdownloop:
-
-# qhasm: prc = pp
-# asm 1: mov  <pp=int64#4,>prc=int64#5
-# asm 2: mov  <pp=%rcx,>prc=%r8
-mov  %rcx,%r8
-
-# qhasm: prc *= 2
-# asm 1: imulq  $2,<prc=int64#5,>prc=int64#5
-# asm 2: imulq  $2,<prc=%r8,>prc=%r8
-imulq  $2,%r8,%r8
-
-# qhasm: pc = prc
-# asm 1: mov  <prc=int64#5,>pc=int64#6
-# asm 2: mov  <prc=%r8,>pc=%r9
-mov  %r8,%r9
-
-# qhasm: prc += 2
-# asm 1: add  $2,<prc=int64#5
-# asm 2: add  $2,<prc=%r8
-add  $2,%r8
-
-# qhasm: pc += 1
-# asm 1: add  $1,<pc=int64#6
-# asm 2: add  $1,<pc=%r9
-add  $1,%r9
-
-# qhasm: unsigned>? hlen - prc
-# asm 1: cmp  <prc=int64#5,<hlen=int64#2
-# asm 2: cmp  <prc=%r8,<hlen=%rsi
-cmp  %r8,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftuploop if !unsigned>
-jbe ._siftuploop
-
-# qhasm: sprc = *(uint64 *)(hp + prc * 8)
-# asm 1: movq   (<hp=int64#1,<prc=int64#5,8),>sprc=int64#7
-# asm 2: movq   (<hp=%rdi,<prc=%r8,8),>sprc=%rax
-movq   (%rdi,%r8,8),%rax
-
-# qhasm: sprc <<= 5
-# asm 1: shl  $5,<sprc=int64#7
-# asm 2: shl  $5,<sprc=%rax
-shl  $5,%rax
-
-# qhasm: sprc += sp
-# asm 1: add  <sp=int64#3,<sprc=int64#7
-# asm 2: add  <sp=%rdx,<sprc=%rax
-add  %rdx,%rax
-
-# qhasm: spc = *(uint64 *)(hp + pc * 8)
-# asm 1: movq   (<hp=int64#1,<pc=int64#6,8),>spc=int64#8
-# asm 2: movq   (<hp=%rdi,<pc=%r9,8),>spc=%r10
-movq   (%rdi,%r9,8),%r10
-
-# qhasm: spc <<= 5
-# asm 1: shl  $5,<spc=int64#8
-# asm 2: shl  $5,<spc=%r10
-shl  $5,%r10
-
-# qhasm: spc += sp
-# asm 1: add  <sp=int64#3,<spc=int64#8
-# asm 2: add  <sp=%rdx,<spc=%r10
-add  %rdx,%r10
-
-# qhasm: c0 = *(uint64 *)(spc +  0)
-# asm 1: movq   0(<spc=int64#8),>c0=int64#9
-# asm 2: movq   0(<spc=%r10),>c0=%r11
-movq   0(%r10),%r11
-
-# qhasm: c1 = *(uint64 *)(spc +  8)
-# asm 1: movq   8(<spc=int64#8),>c1=int64#10
-# asm 2: movq   8(<spc=%r10),>c1=%r12
-movq   8(%r10),%r12
-
-# qhasm: c2 = *(uint64 *)(spc + 16)
-# asm 1: movq   16(<spc=int64#8),>c2=int64#11
-# asm 2: movq   16(<spc=%r10),>c2=%r13
-movq   16(%r10),%r13
-
-# qhasm: carry? c0 -= *(uint64 *)(sprc +  0)
-# asm 1: subq 0(<sprc=int64#7),<c0=int64#9
-# asm 2: subq 0(<sprc=%rax),<c0=%r11
-subq 0(%rax),%r11
-
-# qhasm: carry? c1 -= *(uint64 *)(sprc +  8) - carry
-# asm 1: sbbq 8(<sprc=int64#7),<c1=int64#10
-# asm 2: sbbq 8(<sprc=%rax),<c1=%r12
-sbbq 8(%rax),%r12
-
-# qhasm: carry? c2 -= *(uint64 *)(sprc + 16) - carry
-# asm 1: sbbq 16(<sprc=int64#7),<c2=int64#11
-# asm 2: sbbq 16(<sprc=%rax),<c2=%r13
-sbbq 16(%rax),%r13
-
-# qhasm: pc = prc if carry
-# asm 1: cmovc <prc=int64#5,<pc=int64#6
-# asm 2: cmovc <prc=%r8,<pc=%r9
-cmovc %r8,%r9
-
-# qhasm: spc = sprc if carry
-# asm 1: cmovc <sprc=int64#7,<spc=int64#8
-# asm 2: cmovc <sprc=%rax,<spc=%r10
-cmovc %rax,%r10
-
-# qhasm: spc -= sp
-# asm 1: sub  <sp=int64#3,<spc=int64#8
-# asm 2: sub  <sp=%rdx,<spc=%r10
-sub  %rdx,%r10
-
-# qhasm: (uint64) spc >>= 5
-# asm 1: shr  $5,<spc=int64#8
-# asm 2: shr  $5,<spc=%r10
-shr  $5,%r10
-
-# qhasm: spp = *(uint64 *)(hp + pp * 8)
-# asm 1: movq   (<hp=int64#1,<pp=int64#4,8),>spp=int64#5
-# asm 2: movq   (<hp=%rdi,<pp=%rcx,8),>spp=%r8
-movq   (%rdi,%rcx,8),%r8
-
-# qhasm: *(uint64 *)(hp + pp * 8) = spc
-# asm 1: movq  <spc=int64#8,(<hp=int64#1,<pp=int64#4,8)
-# asm 2: movq  <spc=%r10,(<hp=%rdi,<pp=%rcx,8)
-movq  %r10,(%rdi,%rcx,8)
-
-# qhasm: *(uint64 *)(hp + pc * 8) = spp
-# asm 1: movq  <spp=int64#5,(<hp=int64#1,<pc=int64#6,8)
-# asm 2: movq  <spp=%r8,(<hp=%rdi,<pc=%r9,8)
-movq  %r8,(%rdi,%r9,8)
-
-# qhasm: pp = pc
-# asm 1: mov  <pc=int64#6,>pp=int64#4
-# asm 2: mov  <pc=%r9,>pp=%rcx
-mov  %r9,%rcx
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftdownloop
-jmp ._siftdownloop
-
-# qhasm: siftuploop:
-._siftuploop:
-
-# qhasm: pc = pp
-# asm 1: mov  <pp=int64#4,>pc=int64#2
-# asm 2: mov  <pp=%rcx,>pc=%rsi
-mov  %rcx,%rsi
-
-# qhasm: pp -= 1
-# asm 1: sub  $1,<pp=int64#4
-# asm 2: sub  $1,<pp=%rcx
-sub  $1,%rcx
-
-# qhasm: (uint64) pp >>= 1
-# asm 1: shr  $1,<pp=int64#4
-# asm 2: shr  $1,<pp=%rcx
-shr  $1,%rcx
-
-# qhasm: unsigned>? pc - 0 
-# asm 1: cmp  $0,<pc=int64#2
-# asm 2: cmp  $0,<pc=%rsi
-cmp  $0,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto end if !unsigned>
-jbe ._end
-
-# qhasm: spp = *(uint64 *)(hp + pp * 8)
-# asm 1: movq   (<hp=int64#1,<pp=int64#4,8),>spp=int64#5
-# asm 2: movq   (<hp=%rdi,<pp=%rcx,8),>spp=%r8
-movq   (%rdi,%rcx,8),%r8
-
-# qhasm: spc = *(uint64 *)(hp + pc * 8)
-# asm 1: movq   (<hp=int64#1,<pc=int64#2,8),>spc=int64#6
-# asm 2: movq   (<hp=%rdi,<pc=%rsi,8),>spc=%r9
-movq   (%rdi,%rsi,8),%r9
-
-# qhasm: spp <<= 5
-# asm 1: shl  $5,<spp=int64#5
-# asm 2: shl  $5,<spp=%r8
-shl  $5,%r8
-
-# qhasm: spc <<= 5
-# asm 1: shl  $5,<spc=int64#6
-# asm 2: shl  $5,<spc=%r9
-shl  $5,%r9
-
-# qhasm: spc += sp
-# asm 1: add  <sp=int64#3,<spc=int64#6
-# asm 2: add  <sp=%rdx,<spc=%r9
-add  %rdx,%r9
-
-# qhasm: spp += sp
-# asm 1: add  <sp=int64#3,<spp=int64#5
-# asm 2: add  <sp=%rdx,<spp=%r8
-add  %rdx,%r8
-
-# qhasm: c0 = *(uint64 *)(spc +  0)
-# asm 1: movq   0(<spc=int64#6),>c0=int64#7
-# asm 2: movq   0(<spc=%r9),>c0=%rax
-movq   0(%r9),%rax
-
-# qhasm: c1 = *(uint64 *)(spc +  8)
-# asm 1: movq   8(<spc=int64#6),>c1=int64#8
-# asm 2: movq   8(<spc=%r9),>c1=%r10
-movq   8(%r9),%r10
-
-# qhasm: c2 = *(uint64 *)(spc + 16)
-# asm 1: movq   16(<spc=int64#6),>c2=int64#9
-# asm 2: movq   16(<spc=%r9),>c2=%r11
-movq   16(%r9),%r11
-
-# qhasm: carry? c0 -= *(uint64 *)(spp +  0)
-# asm 1: subq 0(<spp=int64#5),<c0=int64#7
-# asm 2: subq 0(<spp=%r8),<c0=%rax
-subq 0(%r8),%rax
-
-# qhasm: carry? c1 -= *(uint64 *)(spp +  8) - carry
-# asm 1: sbbq 8(<spp=int64#5),<c1=int64#8
-# asm 2: sbbq 8(<spp=%r8),<c1=%r10
-sbbq 8(%r8),%r10
-
-# qhasm: carry? c2 -= *(uint64 *)(spp + 16) - carry
-# asm 1: sbbq 16(<spp=int64#5),<c2=int64#9
-# asm 2: sbbq 16(<spp=%r8),<c2=%r11
-sbbq 16(%r8),%r11
-# comment:fp stack unchanged by jump
-
-# qhasm: goto end if carry
-jc ._end
-
-# qhasm: spc -= sp
-# asm 1: sub  <sp=int64#3,<spc=int64#6
-# asm 2: sub  <sp=%rdx,<spc=%r9
-sub  %rdx,%r9
-
-# qhasm: (uint64) spc >>= 5
-# asm 1: shr  $5,<spc=int64#6
-# asm 2: shr  $5,<spc=%r9
-shr  $5,%r9
-
-# qhasm: spp -= sp
-# asm 1: sub  <sp=int64#3,<spp=int64#5
-# asm 2: sub  <sp=%rdx,<spp=%r8
-sub  %rdx,%r8
-
-# qhasm: (uint64) spp >>= 5
-# asm 1: shr  $5,<spp=int64#5
-# asm 2: shr  $5,<spp=%r8
-shr  $5,%r8
-
-# qhasm: *(uint64 *)(hp + pp * 8) = spc
-# asm 1: movq  <spc=int64#6,(<hp=int64#1,<pp=int64#4,8)
-# asm 2: movq  <spc=%r9,(<hp=%rdi,<pp=%rcx,8)
-movq  %r9,(%rdi,%rcx,8)
-
-# qhasm: *(uint64 *)(hp + pc * 8) = spp
-# asm 1: movq  <spp=int64#5,(<hp=int64#1,<pc=int64#2,8)
-# asm 2: movq  <spp=%r8,(<hp=%rdi,<pc=%rsi,8)
-movq  %r8,(%rdi,%rsi,8)
-# comment:fp stack unchanged by jump
-
-# qhasm: goto siftuploop
-jmp ._siftuploop
-
-# qhasm: end:
-._end:
-
-# qhasm: caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm: caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm: caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm: caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm: caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm: caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm: caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/hram.c b/ext/ed25519-amd64-asm/hram.c
deleted file mode 100644
index 6f99fc62c..000000000
--- a/ext/ed25519-amd64-asm/hram.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*#include "crypto_hash_sha512.h"*/
-#include "hram.h"
-
-extern void ZT_sha512internal(void *digest,const void *data,unsigned int len);
-
-void get_hram(unsigned char *hram, const unsigned char *sm, const unsigned char *pk, unsigned char *playground, unsigned long long smlen)
-{
-  unsigned long long i;
-
-  for (i =  0;i < 32;++i)    playground[i] = sm[i];
-  for (i = 32;i < 64;++i)    playground[i] = pk[i-32];
-  for (i = 64;i < smlen;++i) playground[i] = sm[i];
-
-  /*crypto_hash_sha512(hram,playground,smlen);*/
-  ZT_sha512internal(hram,playground,smlen);
-}
diff --git a/ext/ed25519-amd64-asm/hram.h b/ext/ed25519-amd64-asm/hram.h
deleted file mode 100644
index 1740c78a4..000000000
--- a/ext/ed25519-amd64-asm/hram.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HRAM_H
-#define HRAM_H
-
-#define get_hram crypto_sign_ed25519_amd64_64_get_hram
-
-extern void get_hram(unsigned char *hram, const unsigned char *sm, const unsigned char *pk, unsigned char *playground, unsigned long long smlen);
-
-#endif
diff --git a/ext/ed25519-amd64-asm/implementors b/ext/ed25519-amd64-asm/implementors
deleted file mode 100644
index 9b5399a38..000000000
--- a/ext/ed25519-amd64-asm/implementors
+++ /dev/null
@@ -1,5 +0,0 @@
-Daniel J. Bernstein
-Niels Duif
-Tanja Lange
-lead: Peter Schwabe
-Bo-Yin Yang
diff --git a/ext/ed25519-amd64-asm/index_heap.c b/ext/ed25519-amd64-asm/index_heap.c
deleted file mode 100644
index f29f7a289..000000000
--- a/ext/ed25519-amd64-asm/index_heap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "sc25519.h"
-#include "index_heap.h"
-
-/* caller's responsibility to ensure hlen>=3 */
-void heap_init(unsigned long long *h, unsigned long long hlen, sc25519 *scalars)
-{
-  h[0] = 0;
-  unsigned long long i=1;
-  while(i<hlen)
-    heap_push(h, &i, i, scalars);
-}
-
-void heap_extend(unsigned long long *h, unsigned long long oldlen, unsigned long long newlen, sc25519 *scalars)
-{
-  unsigned long long i=oldlen;
-  while(i<newlen)
-    heap_push(h, &i, i, scalars);
-}
-
-
-void heap_push(unsigned long long *h, unsigned long long *hlen, unsigned long long elem, sc25519 *scalars)
-{
-  /* Move up towards the root */
-  /* XXX: Check size of hlen, whether cast to signed value is ok */
-  signed long long pos = *hlen;
-  signed long long ppos = (pos-1)/2;
-  unsigned long long t;
-  h[*hlen] = elem;
-  while(pos > 0)
-  {
-    /* if(sc25519_lt_vartime(&scalars[h[ppos]], &scalars[h[pos]])) */
-    if(sc25519_lt(&scalars[h[ppos]], &scalars[h[pos]]))
-    {
-      t = h[ppos];
-      h[ppos] = h[pos];
-      h[pos] = t;
-      pos = ppos;
-      ppos = (pos-1)/2;
-    }
-    else break;
-  } 
-  (*hlen)++;
-}
-
-/* Put the largest value in the heap in max1, the second largest in max2 */
-void heap_get2max(unsigned long long *h, unsigned long long *max1, unsigned long long *max2, sc25519 *scalars)
-{
-  *max1 = h[0];
-  *max2 = h[1];
-  if(sc25519_lt(&scalars[h[1]],&scalars[h[2]]))
-    *max2 = h[2];
-}
-
-/* After the root has been replaced, restore heap property */
-/* extern void heap_rootreplaced(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
-*/
-/* extern void heap_rootreplaced_shortscalars(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
-*/
diff --git a/ext/ed25519-amd64-asm/index_heap.h b/ext/ed25519-amd64-asm/index_heap.h
deleted file mode 100644
index 7dee91613..000000000
--- a/ext/ed25519-amd64-asm/index_heap.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef INDEX_HEAP_H
-#define INDEX_HEAP_H
-
-#include "sc25519.h"
-
-#define heap_init                crypto_sign_ed25519_amd64_64_heap_init
-#define heap_extend              crypto_sign_ed25519_amd64_64_heap_extend
-#define heap_pop                 crypto_sign_ed25519_amd64_64_heap_pop
-#define heap_push                crypto_sign_ed25519_amd64_64_heap_push
-#define heap_get2max             crypto_sign_ed25519_amd64_64_heap_get2max
-#define heap_rootreplaced        crypto_sign_ed25519_amd64_64_heap_rootreplaced
-#define heap_rootreplaced_3limbs crypto_sign_ed25519_amd64_64_heap_rootreplaced_3limbs
-#define heap_rootreplaced_2limbs crypto_sign_ed25519_amd64_64_heap_rootreplaced_2limbs
-#define heap_rootreplaced_1limb  crypto_sign_ed25519_amd64_64_heap_rootreplaced_1limb
-
-void heap_init(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
-
-void heap_extend(unsigned long long *h, unsigned long long oldlen, unsigned long long newlen, sc25519 *scalars);
-
-unsigned long long heap_pop(unsigned long long *h, unsigned long long *hlen, sc25519 *scalars);
-
-void heap_push(unsigned long long *h, unsigned long long *hlen, unsigned long long elem, sc25519 *scalars);
-
-void heap_get2max(unsigned long long *h, unsigned long long *max1, unsigned long long *max2, sc25519 *scalars);
-
-void heap_rootreplaced(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
-void heap_rootreplaced_3limbs(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
-void heap_rootreplaced_2limbs(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
-void heap_rootreplaced_1limb(unsigned long long *h, unsigned long long hlen, sc25519 *scalars);
-
-#endif
diff --git a/ext/ed25519-amd64-asm/keypair.c b/ext/ed25519-amd64-asm/keypair.c
deleted file mode 100644
index 7e0947104..000000000
--- a/ext/ed25519-amd64-asm/keypair.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <string.h>
-#include "crypto_sign.h"
-#include "crypto_hash_sha512.h"
-#include "randombytes.h"
-#include "ge25519.h"
-
-int crypto_sign_keypair(unsigned char *pk,unsigned char *sk)
-{
-  unsigned char az[64];
-  sc25519 scsk;
-  ge25519 gepk;
-
-  randombytes(sk,32);
-  crypto_hash_sha512(az,sk,32);
-  az[0] &= 248;
-  az[31] &= 127;
-  az[31] |= 64;
-
-  sc25519_from32bytes(&scsk,az);
-  
-  ge25519_scalarmult_base(&gepk, &scsk);
-  ge25519_pack(pk, &gepk);
-  memmove(sk + 32,pk,32);
-  return 0;
-}
diff --git a/ext/ed25519-amd64-asm/open.c b/ext/ed25519-amd64-asm/open.c
deleted file mode 100644
index 104d48dc8..000000000
--- a/ext/ed25519-amd64-asm/open.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <string.h>
-#include "crypto_sign.h"
-#include "crypto_verify_32.h"
-#include "crypto_hash_sha512.h"
-#include "ge25519.h"
-
-int crypto_sign_open(
-    unsigned char *m,unsigned long long *mlen,
-    const unsigned char *sm,unsigned long long smlen,
-    const unsigned char *pk
-    )
-{
-  unsigned char pkcopy[32];
-  unsigned char rcopy[32];
-  unsigned char hram[64];
-  unsigned char rcheck[32];
-  ge25519 get1, get2;
-  sc25519 schram, scs;
-
-  if (smlen < 64) goto badsig;
-  if (sm[63] & 224) goto badsig;
-  if (ge25519_unpackneg_vartime(&get1,pk)) goto badsig;
-
-  memmove(pkcopy,pk,32);
-  memmove(rcopy,sm,32);
-
-  sc25519_from32bytes(&scs, sm+32);
-
-  memmove(m,sm,smlen);
-  memmove(m + 32,pkcopy,32);
-  crypto_hash_sha512(hram,m,smlen);
-
-  sc25519_from64bytes(&schram, hram);
-
-  ge25519_double_scalarmult_vartime(&get2, &get1, &schram, &scs);
-  ge25519_pack(rcheck, &get2);
-
-  if (crypto_verify_32(rcopy,rcheck) == 0) {
-    memmove(m,m + 64,smlen - 64);
-    memset(m + smlen - 64,0,64);
-    *mlen = smlen - 64;
-    return 0;
-  }
-
-badsig:
-  *mlen = (unsigned long long) -1;
-  memset(m,0,smlen);
-  return -1;
-}
diff --git a/ext/ed25519-amd64-asm/sc25519.h b/ext/ed25519-amd64-asm/sc25519.h
deleted file mode 100644
index 8ff1b1cad..000000000
--- a/ext/ed25519-amd64-asm/sc25519.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef SC25519_H
-#define SC25519_H
-
-#define sc25519                  crypto_sign_ed25519_amd64_64_sc25519
-#define shortsc25519             crypto_sign_ed25519_amd64_64_shortsc25519
-#define sc25519_from32bytes      crypto_sign_ed25519_amd64_64_sc25519_from32bytes
-#define shortsc25519_from16bytes crypto_sign_ed25519_amd64_64_shortsc25519_from16bytes
-#define sc25519_from64bytes      crypto_sign_ed25519_amd64_64_sc25519_from64bytes
-#define sc25519_from_shortsc     crypto_sign_ed25519_amd64_64_sc25519_from_shortsc
-#define sc25519_to32bytes        crypto_sign_ed25519_amd64_64_sc25519_to32bytes
-#define sc25519_iszero_vartime   crypto_sign_ed25519_amd64_64_sc25519_iszero_vartime
-#define sc25519_isshort_vartime  crypto_sign_ed25519_amd64_64_sc25519_isshort_vartime
-#define sc25519_lt               crypto_sign_ed25519_amd64_64_sc25519_lt
-#define sc25519_add              crypto_sign_ed25519_amd64_64_sc25519_add
-#define sc25519_sub_nored        crypto_sign_ed25519_amd64_64_sc25519_sub_nored
-#define sc25519_mul              crypto_sign_ed25519_amd64_64_sc25519_mul
-#define sc25519_mul_shortsc      crypto_sign_ed25519_amd64_64_sc25519_mul_shortsc
-#define sc25519_window4          crypto_sign_ed25519_amd64_64_sc25519_window4
-#define sc25519_slide          crypto_sign_ed25519_amd64_64_sc25519_slide
-#define sc25519_2interleave2     crypto_sign_ed25519_amd64_64_sc25519_2interleave2
-#define sc25519_barrett crypto_sign_ed25519_amd64_64_sc25519_barrett
-
-typedef struct 
-{
-  unsigned long long v[4]; 
-}
-sc25519;
-
-typedef struct 
-{
-  unsigned long long v[2]; 
-}
-shortsc25519;
-
-void sc25519_from32bytes(sc25519 *r, const unsigned char x[32]);
-
-void sc25519_from64bytes(sc25519 *r, const unsigned char x[64]);
-
-void sc25519_from_shortsc(sc25519 *r, const shortsc25519 *x);
-
-void sc25519_to32bytes(unsigned char r[32], const sc25519 *x);
-
-int sc25519_iszero_vartime(const sc25519 *x);
-
-int sc25519_lt(const sc25519 *x, const sc25519 *y);
-
-void sc25519_add(sc25519 *r, const sc25519 *x, const sc25519 *y);
-
-void sc25519_sub_nored(sc25519 *r, const sc25519 *x, const sc25519 *y);
-
-void sc25519_mul(sc25519 *r, const sc25519 *x, const sc25519 *y);
-
-void sc25519_mul_shortsc(sc25519 *r, const sc25519 *x, const shortsc25519 *y);
-
-/* Convert s into a representation of the form \sum_{i=0}^{63}r[i]2^(4*i)
- * with r[i] in {-8,...,7}
- */
-void sc25519_window4(signed char r[85], const sc25519 *s);
-
-void sc25519_slide(signed char r[256], const sc25519 *s, int swindowsize);
-
-void sc25519_2interleave2(unsigned char r[127], const sc25519 *s1, const sc25519 *s2);
-
-void sc25519_barrett(sc25519 *r, unsigned long long x[8]);
-
-#endif
diff --git a/ext/ed25519-amd64-asm/sc25519_add.s b/ext/ed25519-amd64-asm/sc25519_add.s
deleted file mode 100644
index d5b941cd6..000000000
--- a/ext/ed25519-amd64-asm/sc25519_add.s
+++ /dev/null
@@ -1,232 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 xp
-
-# qhasm: int64 yp
-
-# qhasm: input rp
-
-# qhasm: input xp
-
-# qhasm: input yp
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_sc25519_add
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_sc25519_add
-.globl crypto_sign_ed25519_amd64_64_sc25519_add
-_crypto_sign_ed25519_amd64_64_sc25519_add:
-crypto_sign_ed25519_amd64_64_sc25519_add:
-mov %rsp,%r11
-and $31,%r11
-add $32,%r11
-sub %r11,%rsp
-
-# qhasm: caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#1
-# asm 2: movq <caller4=%r14,>caller4_stack=0(%rsp)
-movq %r14,0(%rsp)
-
-# qhasm: caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#2
-# asm 2: movq <caller5=%r15,>caller5_stack=8(%rsp)
-movq %r15,8(%rsp)
-
-# qhasm: caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#3
-# asm 2: movq <caller6=%rbx,>caller6_stack=16(%rsp)
-movq %rbx,16(%rsp)
-
-# qhasm: r0 = *(uint64 *)(xp +  0)
-# asm 1: movq   0(<xp=int64#2),>r0=int64#4
-# asm 2: movq   0(<xp=%rsi),>r0=%rcx
-movq   0(%rsi),%rcx
-
-# qhasm: r1 = *(uint64 *)(xp +  8)
-# asm 1: movq   8(<xp=int64#2),>r1=int64#5
-# asm 2: movq   8(<xp=%rsi),>r1=%r8
-movq   8(%rsi),%r8
-
-# qhasm: r2 = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>r2=int64#6
-# asm 2: movq   16(<xp=%rsi),>r2=%r9
-movq   16(%rsi),%r9
-
-# qhasm: r3 = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>r3=int64#2
-# asm 2: movq   24(<xp=%rsi),>r3=%rsi
-movq   24(%rsi),%rsi
-
-# qhasm: carry? r0 += *(uint64 *)(yp +  0)
-# asm 1: addq 0(<yp=int64#3),<r0=int64#4
-# asm 2: addq 0(<yp=%rdx),<r0=%rcx
-addq 0(%rdx),%rcx
-
-# qhasm: carry? r1 += *(uint64 *)(yp +  8) + carry
-# asm 1: adcq 8(<yp=int64#3),<r1=int64#5
-# asm 2: adcq 8(<yp=%rdx),<r1=%r8
-adcq 8(%rdx),%r8
-
-# qhasm: carry? r2 += *(uint64 *)(yp + 16) + carry
-# asm 1: adcq 16(<yp=int64#3),<r2=int64#6
-# asm 2: adcq 16(<yp=%rdx),<r2=%r9
-adcq 16(%rdx),%r9
-
-# qhasm: r3 += *(uint64 *)(yp + 24) + carry
-# asm 1: adcq 24(<yp=int64#3),<r3=int64#2
-# asm 2: adcq 24(<yp=%rdx),<r3=%rsi
-adcq 24(%rdx),%rsi
-
-# qhasm: t0 = r0
-# asm 1: mov  <r0=int64#4,>t0=int64#3
-# asm 2: mov  <r0=%rcx,>t0=%rdx
-mov  %rcx,%rdx
-
-# qhasm: t1 = r1
-# asm 1: mov  <r1=int64#5,>t1=int64#7
-# asm 2: mov  <r1=%r8,>t1=%rax
-mov  %r8,%rax
-
-# qhasm: t2 = r2
-# asm 1: mov  <r2=int64#6,>t2=int64#8
-# asm 2: mov  <r2=%r9,>t2=%r10
-mov  %r9,%r10
-
-# qhasm: t3 = r3
-# asm 1: mov  <r3=int64#2,>t3=int64#12
-# asm 2: mov  <r3=%rsi,>t3=%r14
-mov  %rsi,%r14
-
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=int64#3
-# asm 2: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=%rdx
-sub  crypto_sign_ed25519_amd64_64_ORDER0(%rip),%rdx
-
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=int64#7
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=%rax
-sbb  crypto_sign_ed25519_amd64_64_ORDER1(%rip),%rax
-
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_64_ORDER2(%rip),%r10
-
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=int64#12
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=%r14
-sbb  crypto_sign_ed25519_amd64_64_ORDER3(%rip),%r14
-
-# qhasm: r0 = t0 if !unsigned<
-# asm 1: cmovae <t0=int64#3,<r0=int64#4
-# asm 2: cmovae <t0=%rdx,<r0=%rcx
-cmovae %rdx,%rcx
-
-# qhasm: r1 = t1 if !unsigned<
-# asm 1: cmovae <t1=int64#7,<r1=int64#5
-# asm 2: cmovae <t1=%rax,<r1=%r8
-cmovae %rax,%r8
-
-# qhasm: r2 = t2 if !unsigned<
-# asm 1: cmovae <t2=int64#8,<r2=int64#6
-# asm 2: cmovae <t2=%r10,<r2=%r9
-cmovae %r10,%r9
-
-# qhasm: r3 = t3 if !unsigned<
-# asm 1: cmovae <t3=int64#12,<r3=int64#2
-# asm 2: cmovae <t3=%r14,<r3=%rsi
-cmovae %r14,%rsi
-
-# qhasm: *(uint64 *)(rp +  0) = r0
-# asm 1: movq   <r0=int64#4,0(<rp=int64#1)
-# asm 2: movq   <r0=%rcx,0(<rp=%rdi)
-movq   %rcx,0(%rdi)
-
-# qhasm: *(uint64 *)(rp +  8) = r1
-# asm 1: movq   <r1=int64#5,8(<rp=int64#1)
-# asm 2: movq   <r1=%r8,8(<rp=%rdi)
-movq   %r8,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#6,16(<rp=int64#1)
-# asm 2: movq   <r2=%r9,16(<rp=%rdi)
-movq   %r9,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#2,24(<rp=int64#1)
-# asm 2: movq   <r3=%rsi,24(<rp=%rdi)
-movq   %rsi,24(%rdi)
-
-# qhasm: caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#1,>caller4=int64#12
-# asm 2: movq <caller4_stack=0(%rsp),>caller4=%r14
-movq 0(%rsp),%r14
-
-# qhasm: caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#2,>caller5=int64#13
-# asm 2: movq <caller5_stack=8(%rsp),>caller5=%r15
-movq 8(%rsp),%r15
-
-# qhasm: caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#3,>caller6=int64#14
-# asm 2: movq <caller6_stack=16(%rsp),>caller6=%rbx
-movq 16(%rsp),%rbx
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/sc25519_barrett.s b/ext/ed25519-amd64-asm/sc25519_barrett.s
deleted file mode 100644
index 7eb56fadc..000000000
--- a/ext/ed25519-amd64-asm/sc25519_barrett.s
+++ /dev/null
@@ -1,1188 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 xp
-
-# qhasm: input rp
-
-# qhasm: input xp
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: int64 q23
-
-# qhasm: int64 q24
-
-# qhasm: int64 q30
-
-# qhasm: int64 q31
-
-# qhasm: int64 q32
-
-# qhasm: int64 q33
-
-# qhasm: int64 r20
-
-# qhasm: int64 r21
-
-# qhasm: int64 r22
-
-# qhasm: int64 r23
-
-# qhasm: int64 r24
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm: int64 rax
-
-# qhasm: int64 rdx
-
-# qhasm: int64 c
-
-# qhasm: int64 zero
-
-# qhasm: int64 mask
-
-# qhasm: int64 nmask
-
-# qhasm: stack64 q30_stack
-
-# qhasm: stack64 q31_stack
-
-# qhasm: stack64 q32_stack
-
-# qhasm: stack64 q33_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_sc25519_barrett
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_sc25519_barrett
-.globl crypto_sign_ed25519_amd64_64_sc25519_barrett
-_crypto_sign_ed25519_amd64_64_sc25519_barrett:
-crypto_sign_ed25519_amd64_64_sc25519_barrett:
-mov %rsp,%r11
-and $31,%r11
-add $96,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: zero ^= zero
-# asm 1: xor  <zero=int64#4,<zero=int64#4
-# asm 2: xor  <zero=%rcx,<zero=%rcx
-xor  %rcx,%rcx
-
-# qhasm: q30 ^= q30
-# asm 1: xor  <q30=int64#5,<q30=int64#5
-# asm 2: xor  <q30=%r8,<q30=%r8
-xor  %r8,%r8
-
-# qhasm: q31 ^= q31
-# asm 1: xor  <q31=int64#6,<q31=int64#6
-# asm 2: xor  <q31=%r9,<q31=%r9
-xor  %r9,%r9
-
-# qhasm: q32 ^= q32
-# asm 1: xor  <q32=int64#8,<q32=int64#8
-# asm 2: xor  <q32=%r10,<q32=%r10
-xor  %r10,%r10
-
-# qhasm: q33 ^= q33
-# asm 1: xor  <q33=int64#9,<q33=int64#9
-# asm 2: xor  <q33=%r11,<q33=%r11
-xor  %r11,%r11
-
-# qhasm: rax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>rax=int64#7
-# asm 2: movq   24(<xp=%rsi),>rax=%rax
-movq   24(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3(%rip)
-
-# qhasm: q23 = rax
-# asm 1: mov  <rax=int64#7,>q23=int64#10
-# asm 2: mov  <rax=%rax,>q23=%r12
-mov  %rax,%r12
-
-# qhasm: c = rdx
-# asm 1: mov  <rdx=int64#3,>c=int64#11
-# asm 2: mov  <rdx=%rdx,>c=%r13
-mov  %rdx,%r13
-
-# qhasm: rax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>rax=int64#7
-# asm 2: movq   24(<xp=%rsi),>rax=%rax
-movq   24(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4(%rip)
-
-# qhasm: q24 = rax
-# asm 1: mov  <rax=int64#7,>q24=int64#12
-# asm 2: mov  <rax=%rax,>q24=%r14
-mov  %rax,%r14
-
-# qhasm: carry? q24 += c
-# asm 1: add  <c=int64#11,<q24=int64#12
-# asm 2: add  <c=%r13,<q24=%r14
-add  %r13,%r14
-
-# qhasm: q30 += rdx + carry
-# asm 1: adc <rdx=int64#3,<q30=int64#5
-# asm 2: adc <rdx=%rdx,<q30=%r8
-adc %rdx,%r8
-
-# qhasm: rax = *(uint64 *)(xp + 32)
-# asm 1: movq   32(<xp=int64#2),>rax=int64#7
-# asm 2: movq   32(<xp=%rsi),>rax=%rax
-movq   32(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU2
-mulq  crypto_sign_ed25519_amd64_64_MU2(%rip)
-
-# qhasm: carry? q23 += rax
-# asm 1: add  <rax=int64#7,<q23=int64#10
-# asm 2: add  <rax=%rax,<q23=%r12
-add  %rax,%r12
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#11
-# asm 2: mov  $0,>c=%r13
-mov  $0,%r13
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#11
-# asm 2: adc <rdx=%rdx,<c=%r13
-adc %rdx,%r13
-
-# qhasm: rax = *(uint64 *)(xp + 32)
-# asm 1: movq   32(<xp=int64#2),>rax=int64#7
-# asm 2: movq   32(<xp=%rsi),>rax=%rax
-movq   32(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3(%rip)
-
-# qhasm: carry? q24 += rax
-# asm 1: add  <rax=int64#7,<q24=int64#12
-# asm 2: add  <rax=%rax,<q24=%r14
-add  %rax,%r14
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q24 += c
-# asm 1: add  <c=int64#11,<q24=int64#12
-# asm 2: add  <c=%r13,<q24=%r14
-add  %r13,%r14
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#11
-# asm 2: mov  $0,>c=%r13
-mov  $0,%r13
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#11
-# asm 2: adc <rdx=%rdx,<c=%r13
-adc %rdx,%r13
-
-# qhasm: rax = *(uint64 *)(xp + 32)
-# asm 1: movq   32(<xp=int64#2),>rax=int64#7
-# asm 2: movq   32(<xp=%rsi),>rax=%rax
-movq   32(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4(%rip)
-
-# qhasm: carry? q30 += rax 
-# asm 1: add  <rax=int64#7,<q30=int64#5
-# asm 2: add  <rax=%rax,<q30=%r8
-add  %rax,%r8
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q30 += c
-# asm 1: add  <c=int64#11,<q30=int64#5
-# asm 2: add  <c=%r13,<q30=%r8
-add  %r13,%r8
-
-# qhasm: q31 += rdx + carry
-# asm 1: adc <rdx=int64#3,<q31=int64#6
-# asm 2: adc <rdx=%rdx,<q31=%r9
-adc %rdx,%r9
-
-# qhasm: rax = *(uint64 *)(xp + 40)
-# asm 1: movq   40(<xp=int64#2),>rax=int64#7
-# asm 2: movq   40(<xp=%rsi),>rax=%rax
-movq   40(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU1
-mulq  crypto_sign_ed25519_amd64_64_MU1(%rip)
-
-# qhasm: carry? q23 += rax
-# asm 1: add  <rax=int64#7,<q23=int64#10
-# asm 2: add  <rax=%rax,<q23=%r12
-add  %rax,%r12
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#11
-# asm 2: mov  $0,>c=%r13
-mov  $0,%r13
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#11
-# asm 2: adc <rdx=%rdx,<c=%r13
-adc %rdx,%r13
-
-# qhasm: rax = *(uint64 *)(xp + 40)
-# asm 1: movq   40(<xp=int64#2),>rax=int64#7
-# asm 2: movq   40(<xp=%rsi),>rax=%rax
-movq   40(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU2
-mulq  crypto_sign_ed25519_amd64_64_MU2(%rip)
-
-# qhasm: carry? q24 += rax
-# asm 1: add  <rax=int64#7,<q24=int64#12
-# asm 2: add  <rax=%rax,<q24=%r14
-add  %rax,%r14
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q24 += c
-# asm 1: add  <c=int64#11,<q24=int64#12
-# asm 2: add  <c=%r13,<q24=%r14
-add  %r13,%r14
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#11
-# asm 2: mov  $0,>c=%r13
-mov  $0,%r13
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#11
-# asm 2: adc <rdx=%rdx,<c=%r13
-adc %rdx,%r13
-
-# qhasm: rax = *(uint64 *)(xp + 40)
-# asm 1: movq   40(<xp=int64#2),>rax=int64#7
-# asm 2: movq   40(<xp=%rsi),>rax=%rax
-movq   40(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3(%rip)
-
-# qhasm: carry? q30 += rax
-# asm 1: add  <rax=int64#7,<q30=int64#5
-# asm 2: add  <rax=%rax,<q30=%r8
-add  %rax,%r8
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q30 += c
-# asm 1: add  <c=int64#11,<q30=int64#5
-# asm 2: add  <c=%r13,<q30=%r8
-add  %r13,%r8
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#11
-# asm 2: mov  $0,>c=%r13
-mov  $0,%r13
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#11
-# asm 2: adc <rdx=%rdx,<c=%r13
-adc %rdx,%r13
-
-# qhasm: rax = *(uint64 *)(xp + 40)
-# asm 1: movq   40(<xp=int64#2),>rax=int64#7
-# asm 2: movq   40(<xp=%rsi),>rax=%rax
-movq   40(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4(%rip)
-
-# qhasm: carry? q31 += rax 
-# asm 1: add  <rax=int64#7,<q31=int64#6
-# asm 2: add  <rax=%rax,<q31=%r9
-add  %rax,%r9
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q31 += c
-# asm 1: add  <c=int64#11,<q31=int64#6
-# asm 2: add  <c=%r13,<q31=%r9
-add  %r13,%r9
-
-# qhasm: q32 += rdx + carry
-# asm 1: adc <rdx=int64#3,<q32=int64#8
-# asm 2: adc <rdx=%rdx,<q32=%r10
-adc %rdx,%r10
-
-# qhasm: rax = *(uint64 *)(xp + 48)
-# asm 1: movq   48(<xp=int64#2),>rax=int64#7
-# asm 2: movq   48(<xp=%rsi),>rax=%rax
-movq   48(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU0
-mulq  crypto_sign_ed25519_amd64_64_MU0(%rip)
-
-# qhasm: carry? q23 += rax
-# asm 1: add  <rax=int64#7,<q23=int64#10
-# asm 2: add  <rax=%rax,<q23=%r12
-add  %rax,%r12
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#10
-# asm 2: mov  $0,>c=%r12
-mov  $0,%r12
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#10
-# asm 2: adc <rdx=%rdx,<c=%r12
-adc %rdx,%r12
-
-# qhasm: rax = *(uint64 *)(xp + 48)
-# asm 1: movq   48(<xp=int64#2),>rax=int64#7
-# asm 2: movq   48(<xp=%rsi),>rax=%rax
-movq   48(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU1
-mulq  crypto_sign_ed25519_amd64_64_MU1(%rip)
-
-# qhasm: carry? q24 += rax
-# asm 1: add  <rax=int64#7,<q24=int64#12
-# asm 2: add  <rax=%rax,<q24=%r14
-add  %rax,%r14
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q24 += c
-# asm 1: add  <c=int64#10,<q24=int64#12
-# asm 2: add  <c=%r12,<q24=%r14
-add  %r12,%r14
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#10
-# asm 2: mov  $0,>c=%r12
-mov  $0,%r12
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#10
-# asm 2: adc <rdx=%rdx,<c=%r12
-adc %rdx,%r12
-
-# qhasm: rax = *(uint64 *)(xp + 48)
-# asm 1: movq   48(<xp=int64#2),>rax=int64#7
-# asm 2: movq   48(<xp=%rsi),>rax=%rax
-movq   48(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU2
-mulq  crypto_sign_ed25519_amd64_64_MU2(%rip)
-
-# qhasm: carry? q30 += rax
-# asm 1: add  <rax=int64#7,<q30=int64#5
-# asm 2: add  <rax=%rax,<q30=%r8
-add  %rax,%r8
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q30 += c
-# asm 1: add  <c=int64#10,<q30=int64#5
-# asm 2: add  <c=%r12,<q30=%r8
-add  %r12,%r8
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#10
-# asm 2: mov  $0,>c=%r12
-mov  $0,%r12
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#10
-# asm 2: adc <rdx=%rdx,<c=%r12
-adc %rdx,%r12
-
-# qhasm: rax = *(uint64 *)(xp + 48)
-# asm 1: movq   48(<xp=int64#2),>rax=int64#7
-# asm 2: movq   48(<xp=%rsi),>rax=%rax
-movq   48(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3(%rip)
-
-# qhasm: carry? q31 += rax
-# asm 1: add  <rax=int64#7,<q31=int64#6
-# asm 2: add  <rax=%rax,<q31=%r9
-add  %rax,%r9
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q31 += c
-# asm 1: add  <c=int64#10,<q31=int64#6
-# asm 2: add  <c=%r12,<q31=%r9
-add  %r12,%r9
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#10
-# asm 2: mov  $0,>c=%r12
-mov  $0,%r12
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#10
-# asm 2: adc <rdx=%rdx,<c=%r12
-adc %rdx,%r12
-
-# qhasm: rax = *(uint64 *)(xp + 48)
-# asm 1: movq   48(<xp=int64#2),>rax=int64#7
-# asm 2: movq   48(<xp=%rsi),>rax=%rax
-movq   48(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4(%rip)
-
-# qhasm: carry? q32 += rax 
-# asm 1: add  <rax=int64#7,<q32=int64#8
-# asm 2: add  <rax=%rax,<q32=%r10
-add  %rax,%r10
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q32 += c
-# asm 1: add  <c=int64#10,<q32=int64#8
-# asm 2: add  <c=%r12,<q32=%r10
-add  %r12,%r10
-
-# qhasm: q33 += rdx + carry
-# asm 1: adc <rdx=int64#3,<q33=int64#9
-# asm 2: adc <rdx=%rdx,<q33=%r11
-adc %rdx,%r11
-
-# qhasm: rax = *(uint64 *)(xp + 56)
-# asm 1: movq   56(<xp=int64#2),>rax=int64#7
-# asm 2: movq   56(<xp=%rsi),>rax=%rax
-movq   56(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU0
-mulq  crypto_sign_ed25519_amd64_64_MU0(%rip)
-
-# qhasm: carry? q24 += rax
-# asm 1: add  <rax=int64#7,<q24=int64#12
-# asm 2: add  <rax=%rax,<q24=%r14
-add  %rax,%r14
-
-# qhasm: free q24
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#10
-# asm 2: mov  $0,>c=%r12
-mov  $0,%r12
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#10
-# asm 2: adc <rdx=%rdx,<c=%r12
-adc %rdx,%r12
-
-# qhasm: rax = *(uint64 *)(xp + 56)
-# asm 1: movq   56(<xp=int64#2),>rax=int64#7
-# asm 2: movq   56(<xp=%rsi),>rax=%rax
-movq   56(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU1
-mulq  crypto_sign_ed25519_amd64_64_MU1(%rip)
-
-# qhasm: carry? q30 += rax
-# asm 1: add  <rax=int64#7,<q30=int64#5
-# asm 2: add  <rax=%rax,<q30=%r8
-add  %rax,%r8
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q30 += c
-# asm 1: add  <c=int64#10,<q30=int64#5
-# asm 2: add  <c=%r12,<q30=%r8
-add  %r12,%r8
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#10
-# asm 2: mov  $0,>c=%r12
-mov  $0,%r12
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#10
-# asm 2: adc <rdx=%rdx,<c=%r12
-adc %rdx,%r12
-
-# qhasm: q30_stack = q30
-# asm 1: movq <q30=int64#5,>q30_stack=stack64#8
-# asm 2: movq <q30=%r8,>q30_stack=56(%rsp)
-movq %r8,56(%rsp)
-
-# qhasm: rax = *(uint64 *)(xp + 56)
-# asm 1: movq   56(<xp=int64#2),>rax=int64#7
-# asm 2: movq   56(<xp=%rsi),>rax=%rax
-movq   56(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU2
-mulq  crypto_sign_ed25519_amd64_64_MU2(%rip)
-
-# qhasm: carry? q31 += rax
-# asm 1: add  <rax=int64#7,<q31=int64#6
-# asm 2: add  <rax=%rax,<q31=%r9
-add  %rax,%r9
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q31 += c
-# asm 1: add  <c=int64#10,<q31=int64#6
-# asm 2: add  <c=%r12,<q31=%r9
-add  %r12,%r9
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#5
-# asm 2: mov  $0,>c=%r8
-mov  $0,%r8
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#5
-# asm 2: adc <rdx=%rdx,<c=%r8
-adc %rdx,%r8
-
-# qhasm: q31_stack = q31
-# asm 1: movq <q31=int64#6,>q31_stack=stack64#9
-# asm 2: movq <q31=%r9,>q31_stack=64(%rsp)
-movq %r9,64(%rsp)
-
-# qhasm: rax = *(uint64 *)(xp + 56)
-# asm 1: movq   56(<xp=int64#2),>rax=int64#7
-# asm 2: movq   56(<xp=%rsi),>rax=%rax
-movq   56(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU3
-mulq  crypto_sign_ed25519_amd64_64_MU3(%rip)
-
-# qhasm: carry? q32 += rax
-# asm 1: add  <rax=int64#7,<q32=int64#8
-# asm 2: add  <rax=%rax,<q32=%r10
-add  %rax,%r10
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? q32 += c
-# asm 1: add  <c=int64#5,<q32=int64#8
-# asm 2: add  <c=%r8,<q32=%r10
-add  %r8,%r10
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#5
-# asm 2: mov  $0,>c=%r8
-mov  $0,%r8
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#5
-# asm 2: adc <rdx=%rdx,<c=%r8
-adc %rdx,%r8
-
-# qhasm: q32_stack = q32
-# asm 1: movq <q32=int64#8,>q32_stack=stack64#10
-# asm 2: movq <q32=%r10,>q32_stack=72(%rsp)
-movq %r10,72(%rsp)
-
-# qhasm: rax = *(uint64 *)(xp + 56)
-# asm 1: movq   56(<xp=int64#2),>rax=int64#7
-# asm 2: movq   56(<xp=%rsi),>rax=%rax
-movq   56(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_MU4
-mulq  crypto_sign_ed25519_amd64_64_MU4(%rip)
-
-# qhasm: carry? q33 += rax 
-# asm 1: add  <rax=int64#7,<q33=int64#9
-# asm 2: add  <rax=%rax,<q33=%r11
-add  %rax,%r11
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: q33 += c
-# asm 1: add  <c=int64#5,<q33=int64#9
-# asm 2: add  <c=%r8,<q33=%r11
-add  %r8,%r11
-
-# qhasm: q33_stack = q33
-# asm 1: movq <q33=int64#9,>q33_stack=stack64#11
-# asm 2: movq <q33=%r11,>q33_stack=80(%rsp)
-movq %r11,80(%rsp)
-
-# qhasm: rax = q30_stack
-# asm 1: movq <q30_stack=stack64#8,>rax=int64#7
-# asm 2: movq <q30_stack=56(%rsp),>rax=%rax
-movq 56(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-mulq  crypto_sign_ed25519_amd64_64_ORDER0(%rip)
-
-# qhasm: r20 = rax
-# asm 1: mov  <rax=int64#7,>r20=int64#5
-# asm 2: mov  <rax=%rax,>r20=%r8
-mov  %rax,%r8
-
-# qhasm: c = rdx
-# asm 1: mov  <rdx=int64#3,>c=int64#6
-# asm 2: mov  <rdx=%rdx,>c=%r9
-mov  %rdx,%r9
-
-# qhasm: rax = q30_stack
-# asm 1: movq <q30_stack=stack64#8,>rax=int64#7
-# asm 2: movq <q30_stack=56(%rsp),>rax=%rax
-movq 56(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1
-mulq  crypto_sign_ed25519_amd64_64_ORDER1(%rip)
-
-# qhasm: r21 = rax
-# asm 1: mov  <rax=int64#7,>r21=int64#8
-# asm 2: mov  <rax=%rax,>r21=%r10
-mov  %rax,%r10
-
-# qhasm: carry? r21 += c
-# asm 1: add  <c=int64#6,<r21=int64#8
-# asm 2: add  <c=%r9,<r21=%r10
-add  %r9,%r10
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#6
-# asm 2: mov  $0,>c=%r9
-mov  $0,%r9
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#6
-# asm 2: adc <rdx=%rdx,<c=%r9
-adc %rdx,%r9
-
-# qhasm: rax = q30_stack
-# asm 1: movq <q30_stack=stack64#8,>rax=int64#7
-# asm 2: movq <q30_stack=56(%rsp),>rax=%rax
-movq 56(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2
-mulq  crypto_sign_ed25519_amd64_64_ORDER2(%rip)
-
-# qhasm: r22 = rax
-# asm 1: mov  <rax=int64#7,>r22=int64#9
-# asm 2: mov  <rax=%rax,>r22=%r11
-mov  %rax,%r11
-
-# qhasm: carry? r22 += c
-# asm 1: add  <c=int64#6,<r22=int64#9
-# asm 2: add  <c=%r9,<r22=%r11
-add  %r9,%r11
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#6
-# asm 2: mov  $0,>c=%r9
-mov  $0,%r9
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#6
-# asm 2: adc <rdx=%rdx,<c=%r9
-adc %rdx,%r9
-
-# qhasm: rax = q30_stack
-# asm 1: movq <q30_stack=stack64#8,>rax=int64#7
-# asm 2: movq <q30_stack=56(%rsp),>rax=%rax
-movq 56(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER3
-mulq  crypto_sign_ed25519_amd64_64_ORDER3(%rip)
-
-# qhasm: free rdx
-
-# qhasm: r23 = rax
-# asm 1: mov  <rax=int64#7,>r23=int64#10
-# asm 2: mov  <rax=%rax,>r23=%r12
-mov  %rax,%r12
-
-# qhasm: r23 += c
-# asm 1: add  <c=int64#6,<r23=int64#10
-# asm 2: add  <c=%r9,<r23=%r12
-add  %r9,%r12
-
-# qhasm: rax = q31_stack
-# asm 1: movq <q31_stack=stack64#9,>rax=int64#7
-# asm 2: movq <q31_stack=64(%rsp),>rax=%rax
-movq 64(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-mulq  crypto_sign_ed25519_amd64_64_ORDER0(%rip)
-
-# qhasm: carry? r21 += rax
-# asm 1: add  <rax=int64#7,<r21=int64#8
-# asm 2: add  <rax=%rax,<r21=%r10
-add  %rax,%r10
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#6
-# asm 2: mov  $0,>c=%r9
-mov  $0,%r9
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#6
-# asm 2: adc <rdx=%rdx,<c=%r9
-adc %rdx,%r9
-
-# qhasm: rax = q31_stack
-# asm 1: movq <q31_stack=stack64#9,>rax=int64#7
-# asm 2: movq <q31_stack=64(%rsp),>rax=%rax
-movq 64(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1
-mulq  crypto_sign_ed25519_amd64_64_ORDER1(%rip)
-
-# qhasm: carry? r22 += rax
-# asm 1: add  <rax=int64#7,<r22=int64#9
-# asm 2: add  <rax=%rax,<r22=%r11
-add  %rax,%r11
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#4,<rdx=int64#3
-# asm 2: adc <zero=%rcx,<rdx=%rdx
-adc %rcx,%rdx
-
-# qhasm: carry? r22 += c
-# asm 1: add  <c=int64#6,<r22=int64#9
-# asm 2: add  <c=%r9,<r22=%r11
-add  %r9,%r11
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#4
-# asm 2: mov  $0,>c=%rcx
-mov  $0,%rcx
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#4
-# asm 2: adc <rdx=%rdx,<c=%rcx
-adc %rdx,%rcx
-
-# qhasm: rax = q31_stack
-# asm 1: movq <q31_stack=stack64#9,>rax=int64#7
-# asm 2: movq <q31_stack=64(%rsp),>rax=%rax
-movq 64(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2
-mulq  crypto_sign_ed25519_amd64_64_ORDER2(%rip)
-
-# qhasm: free rdx
-
-# qhasm: r23 += rax 
-# asm 1: add  <rax=int64#7,<r23=int64#10
-# asm 2: add  <rax=%rax,<r23=%r12
-add  %rax,%r12
-
-# qhasm: r23 += c
-# asm 1: add  <c=int64#4,<r23=int64#10
-# asm 2: add  <c=%rcx,<r23=%r12
-add  %rcx,%r12
-
-# qhasm: rax = q32_stack
-# asm 1: movq <q32_stack=stack64#10,>rax=int64#7
-# asm 2: movq <q32_stack=72(%rsp),>rax=%rax
-movq 72(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-mulq  crypto_sign_ed25519_amd64_64_ORDER0(%rip)
-
-# qhasm: carry? r22 += rax
-# asm 1: add  <rax=int64#7,<r22=int64#9
-# asm 2: add  <rax=%rax,<r22=%r11
-add  %rax,%r11
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#4
-# asm 2: mov  $0,>c=%rcx
-mov  $0,%rcx
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#4
-# asm 2: adc <rdx=%rdx,<c=%rcx
-adc %rdx,%rcx
-
-# qhasm: rax = q32_stack
-# asm 1: movq <q32_stack=stack64#10,>rax=int64#7
-# asm 2: movq <q32_stack=72(%rsp),>rax=%rax
-movq 72(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1
-mulq  crypto_sign_ed25519_amd64_64_ORDER1(%rip)
-
-# qhasm: free rdx
-
-# qhasm: r23 += rax
-# asm 1: add  <rax=int64#7,<r23=int64#10
-# asm 2: add  <rax=%rax,<r23=%r12
-add  %rax,%r12
-
-# qhasm: r23 += c
-# asm 1: add  <c=int64#4,<r23=int64#10
-# asm 2: add  <c=%rcx,<r23=%r12
-add  %rcx,%r12
-
-# qhasm: rax = q33_stack
-# asm 1: movq <q33_stack=stack64#11,>rax=int64#7
-# asm 2: movq <q33_stack=80(%rsp),>rax=%rax
-movq 80(%rsp),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-mulq  crypto_sign_ed25519_amd64_64_ORDER0(%rip)
-
-# qhasm: free rdx
-
-# qhasm: r23 += rax
-# asm 1: add  <rax=int64#7,<r23=int64#10
-# asm 2: add  <rax=%rax,<r23=%r12
-add  %rax,%r12
-
-# qhasm: r0 = *(uint64 *)(xp +  0)
-# asm 1: movq   0(<xp=int64#2),>r0=int64#3
-# asm 2: movq   0(<xp=%rsi),>r0=%rdx
-movq   0(%rsi),%rdx
-
-# qhasm: carry? r0 -= r20
-# asm 1: sub  <r20=int64#5,<r0=int64#3
-# asm 2: sub  <r20=%r8,<r0=%rdx
-sub  %r8,%rdx
-
-# qhasm: t0 = r0
-# asm 1: mov  <r0=int64#3,>t0=int64#4
-# asm 2: mov  <r0=%rdx,>t0=%rcx
-mov  %rdx,%rcx
-
-# qhasm: r1 = *(uint64 *)(xp +  8)
-# asm 1: movq   8(<xp=int64#2),>r1=int64#5
-# asm 2: movq   8(<xp=%rsi),>r1=%r8
-movq   8(%rsi),%r8
-
-# qhasm: carry? r1 -= r21 - carry
-# asm 1: sbb  <r21=int64#8,<r1=int64#5
-# asm 2: sbb  <r21=%r10,<r1=%r8
-sbb  %r10,%r8
-
-# qhasm: t1 = r1
-# asm 1: mov  <r1=int64#5,>t1=int64#6
-# asm 2: mov  <r1=%r8,>t1=%r9
-mov  %r8,%r9
-
-# qhasm: r2 = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>r2=int64#7
-# asm 2: movq   16(<xp=%rsi),>r2=%rax
-movq   16(%rsi),%rax
-
-# qhasm: carry? r2 -= r22 - carry
-# asm 1: sbb  <r22=int64#9,<r2=int64#7
-# asm 2: sbb  <r22=%r11,<r2=%rax
-sbb  %r11,%rax
-
-# qhasm: t2 = r2
-# asm 1: mov  <r2=int64#7,>t2=int64#8
-# asm 2: mov  <r2=%rax,>t2=%r10
-mov  %rax,%r10
-
-# qhasm: r3 = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>r3=int64#2
-# asm 2: movq   24(<xp=%rsi),>r3=%rsi
-movq   24(%rsi),%rsi
-
-# qhasm: r3 -= r23 - carry
-# asm 1: sbb  <r23=int64#10,<r3=int64#2
-# asm 2: sbb  <r23=%r12,<r3=%rsi
-sbb  %r12,%rsi
-
-# qhasm: t3 = r3
-# asm 1: mov  <r3=int64#2,>t3=int64#9
-# asm 2: mov  <r3=%rsi,>t3=%r11
-mov  %rsi,%r11
-
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=int64#4
-# asm 2: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=%rcx
-sub  crypto_sign_ed25519_amd64_64_ORDER0(%rip),%rcx
-
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=int64#6
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=%r9
-sbb  crypto_sign_ed25519_amd64_64_ORDER1(%rip),%r9
-
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_64_ORDER2(%rip),%r10
-
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=int64#9
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=%r11
-sbb  crypto_sign_ed25519_amd64_64_ORDER3(%rip),%r11
-
-# qhasm: r0 = t0 if !unsigned<
-# asm 1: cmovae <t0=int64#4,<r0=int64#3
-# asm 2: cmovae <t0=%rcx,<r0=%rdx
-cmovae %rcx,%rdx
-
-# qhasm: t0 = r0
-# asm 1: mov  <r0=int64#3,>t0=int64#4
-# asm 2: mov  <r0=%rdx,>t0=%rcx
-mov  %rdx,%rcx
-
-# qhasm: r1 = t1 if !unsigned<
-# asm 1: cmovae <t1=int64#6,<r1=int64#5
-# asm 2: cmovae <t1=%r9,<r1=%r8
-cmovae %r9,%r8
-
-# qhasm: t1 = r1
-# asm 1: mov  <r1=int64#5,>t1=int64#6
-# asm 2: mov  <r1=%r8,>t1=%r9
-mov  %r8,%r9
-
-# qhasm: r2 = t2 if !unsigned<
-# asm 1: cmovae <t2=int64#8,<r2=int64#7
-# asm 2: cmovae <t2=%r10,<r2=%rax
-cmovae %r10,%rax
-
-# qhasm: t2 = r2
-# asm 1: mov  <r2=int64#7,>t2=int64#8
-# asm 2: mov  <r2=%rax,>t2=%r10
-mov  %rax,%r10
-
-# qhasm: r3 = t3 if !unsigned<
-# asm 1: cmovae <t3=int64#9,<r3=int64#2
-# asm 2: cmovae <t3=%r11,<r3=%rsi
-cmovae %r11,%rsi
-
-# qhasm: t3 = r3
-# asm 1: mov  <r3=int64#2,>t3=int64#9
-# asm 2: mov  <r3=%rsi,>t3=%r11
-mov  %rsi,%r11
-
-# qhasm: carry? t0 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER0
-# asm 1: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=int64#4
-# asm 2: sub  crypto_sign_ed25519_amd64_64_ORDER0,<t0=%rcx
-sub  crypto_sign_ed25519_amd64_64_ORDER0(%rip),%rcx
-
-# qhasm: carry? t1 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER1 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=int64#6
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER1,<t1=%r9
-sbb  crypto_sign_ed25519_amd64_64_ORDER1(%rip),%r9
-
-# qhasm: carry? t2 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER2 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=int64#8
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER2,<t2=%r10
-sbb  crypto_sign_ed25519_amd64_64_ORDER2(%rip),%r10
-
-# qhasm: unsigned<? t3 -= *(uint64 *) &crypto_sign_ed25519_amd64_64_ORDER3 - carry
-# asm 1: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=int64#9
-# asm 2: sbb  crypto_sign_ed25519_amd64_64_ORDER3,<t3=%r11
-sbb  crypto_sign_ed25519_amd64_64_ORDER3(%rip),%r11
-
-# qhasm: r0 = t0 if !unsigned<
-# asm 1: cmovae <t0=int64#4,<r0=int64#3
-# asm 2: cmovae <t0=%rcx,<r0=%rdx
-cmovae %rcx,%rdx
-
-# qhasm: r1 = t1 if !unsigned<
-# asm 1: cmovae <t1=int64#6,<r1=int64#5
-# asm 2: cmovae <t1=%r9,<r1=%r8
-cmovae %r9,%r8
-
-# qhasm: r2 = t2 if !unsigned<
-# asm 1: cmovae <t2=int64#8,<r2=int64#7
-# asm 2: cmovae <t2=%r10,<r2=%rax
-cmovae %r10,%rax
-
-# qhasm: r3 = t3 if !unsigned<
-# asm 1: cmovae <t3=int64#9,<r3=int64#2
-# asm 2: cmovae <t3=%r11,<r3=%rsi
-cmovae %r11,%rsi
-
-# qhasm: *(uint64 *)(rp +  0) = r0
-# asm 1: movq   <r0=int64#3,0(<rp=int64#1)
-# asm 2: movq   <r0=%rdx,0(<rp=%rdi)
-movq   %rdx,0(%rdi)
-
-# qhasm: *(uint64 *)(rp +  8) = r1
-# asm 1: movq   <r1=int64#5,8(<rp=int64#1)
-# asm 2: movq   <r1=%r8,8(<rp=%rdi)
-movq   %r8,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#7,16(<rp=int64#1)
-# asm 2: movq   <r2=%rax,16(<rp=%rdi)
-movq   %rax,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#2,24(<rp=int64#1)
-# asm 2: movq   <r3=%rsi,24(<rp=%rdi)
-movq   %rsi,24(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/sc25519_from32bytes.c b/ext/ed25519-amd64-asm/sc25519_from32bytes.c
deleted file mode 100644
index 7f21e6868..000000000
--- a/ext/ed25519-amd64-asm/sc25519_from32bytes.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "sc25519.h"
-
-/*Arithmetic modulo the group order n = 2^252 + 27742317777372353535851937790883648493 
- *                                    = 7237005577332262213973186563042994240857116359379907606001950938285454250989
- */
-
-/* Contains order, 2*order, 4*order, 8*order, each represented in 4 consecutive unsigned long long */
-static const unsigned long long order[16] = {0x5812631A5CF5D3EDULL, 0x14DEF9DEA2F79CD6ULL, 
-                                             0x0000000000000000ULL, 0x1000000000000000ULL,
-                                             0xB024C634B9EBA7DAULL, 0x29BDF3BD45EF39ACULL,
-                                             0x0000000000000000ULL, 0x2000000000000000ULL,
-                                             0x60498C6973D74FB4ULL, 0x537BE77A8BDE7359ULL,
-                                             0x0000000000000000ULL, 0x4000000000000000ULL,
-                                             0xC09318D2E7AE9F68ULL, 0xA6F7CEF517BCE6B2ULL,
-                                             0x0000000000000000ULL, 0x8000000000000000ULL};
-
-static unsigned long long smaller(unsigned long long a,unsigned long long b)
-{
-  unsigned long long atop = a >> 32;
-  unsigned long long abot = a & 4294967295;
-  unsigned long long btop = b >> 32;
-  unsigned long long bbot = b & 4294967295;
-  unsigned long long atopbelowbtop = (atop - btop) >> 63;
-  unsigned long long atopeqbtop = ((atop ^ btop) - 1) >> 63;
-  unsigned long long abotbelowbbot = (abot - bbot) >> 63;
-  return atopbelowbtop | (atopeqbtop & abotbelowbbot);
-}
-
-void sc25519_from32bytes(sc25519 *r, const unsigned char x[32])
-{
-  unsigned long long t[4];
-  unsigned long long b;
-  unsigned long long mask;
-  int i, j;
-
-  /* assuming little-endian */
-  r->v[0] = *(unsigned long long *)x;
-  r->v[1] = *(((unsigned long long *)x)+1);
-  r->v[2] = *(((unsigned long long *)x)+2);
-  r->v[3] = *(((unsigned long long *)x)+3);
-  
-  for(j=3;j>=0;j--)
-  {
-    b=0;
-    for(i=0;i<4;i++) 
-    {
-      b += order[4*j+i]; /* no overflow for this particular order */
-      t[i] = r->v[i] - b;
-      b = smaller(r->v[i],b);
-    }
-    mask = b - 1;
-    for(i=0;i<4;i++) 
-      r->v[i] ^= mask & (r->v[i] ^ t[i]);
-  }
-}
diff --git a/ext/ed25519-amd64-asm/sc25519_from64bytes.c b/ext/ed25519-amd64-asm/sc25519_from64bytes.c
deleted file mode 100644
index 8e76a1b36..000000000
--- a/ext/ed25519-amd64-asm/sc25519_from64bytes.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "sc25519.h"
-
-void sc25519_from64bytes(sc25519 *r, const unsigned char x[64])
-{
-  /* assuming little-endian representation of unsigned long long */
-  sc25519_barrett(r, (unsigned long long *)x); 
-}
diff --git a/ext/ed25519-amd64-asm/sc25519_from_shortsc.c b/ext/ed25519-amd64-asm/sc25519_from_shortsc.c
deleted file mode 100644
index 3b8ff2fbd..000000000
--- a/ext/ed25519-amd64-asm/sc25519_from_shortsc.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "sc25519.h"
-
-void sc25519_from_shortsc(sc25519 *r, const shortsc25519 *x)
-{
-  r->v[0] = x->v[0];
-  r->v[1] = x->v[1];
-  r->v[2] = 0;
-  r->v[3] = 0;
-}
diff --git a/ext/ed25519-amd64-asm/sc25519_iszero.c b/ext/ed25519-amd64-asm/sc25519_iszero.c
deleted file mode 100644
index 21f593d77..000000000
--- a/ext/ed25519-amd64-asm/sc25519_iszero.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "sc25519.h"
-
-int sc25519_iszero_vartime(const sc25519 *x)
-{
-  if(x->v[0] != 0) return 0;
-  if(x->v[1] != 0) return 0;
-  if(x->v[2] != 0) return 0;
-  if(x->v[3] != 0) return 0;
-  return 1;
-}
diff --git a/ext/ed25519-amd64-asm/sc25519_lt.s b/ext/ed25519-amd64-asm/sc25519_lt.s
deleted file mode 100644
index 3ba431782..000000000
--- a/ext/ed25519-amd64-asm/sc25519_lt.s
+++ /dev/null
@@ -1,131 +0,0 @@
-
-# qhasm: int64 xp
-
-# qhasm: int64 yp
-
-# qhasm: int64 ret
-
-# qhasm: input xp
-
-# qhasm: input yp
-
-# qhasm: output ret
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm: int64 doof
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_sc25519_lt
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_sc25519_lt
-.globl crypto_sign_ed25519_amd64_64_sc25519_lt
-_crypto_sign_ed25519_amd64_64_sc25519_lt:
-crypto_sign_ed25519_amd64_64_sc25519_lt:
-mov %rsp,%r11
-and $31,%r11
-add $0,%r11
-sub %r11,%rsp
-
-# qhasm: t0 = *(uint64 *)(xp +  0)
-# asm 1: movq   0(<xp=int64#1),>t0=int64#3
-# asm 2: movq   0(<xp=%rdi),>t0=%rdx
-movq   0(%rdi),%rdx
-
-# qhasm: t1 = *(uint64 *)(xp +  8)
-# asm 1: movq   8(<xp=int64#1),>t1=int64#4
-# asm 2: movq   8(<xp=%rdi),>t1=%rcx
-movq   8(%rdi),%rcx
-
-# qhasm: t2 = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#1),>t2=int64#5
-# asm 2: movq   16(<xp=%rdi),>t2=%r8
-movq   16(%rdi),%r8
-
-# qhasm: t3 = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#1),>t3=int64#1
-# asm 2: movq   24(<xp=%rdi),>t3=%rdi
-movq   24(%rdi),%rdi
-
-# qhasm: carry? t0 -= *(uint64 *)(yp +  0)
-# asm 1: subq 0(<yp=int64#2),<t0=int64#3
-# asm 2: subq 0(<yp=%rsi),<t0=%rdx
-subq 0(%rsi),%rdx
-
-# qhasm: carry? t1 -= *(uint64 *)(yp +  8) - carry
-# asm 1: sbbq 8(<yp=int64#2),<t1=int64#4
-# asm 2: sbbq 8(<yp=%rsi),<t1=%rcx
-sbbq 8(%rsi),%rcx
-
-# qhasm: carry? t2 -= *(uint64 *)(yp + 16) - carry
-# asm 1: sbbq 16(<yp=int64#2),<t2=int64#5
-# asm 2: sbbq 16(<yp=%rsi),<t2=%r8
-sbbq 16(%rsi),%r8
-
-# qhasm: carry? t3 -= *(uint64 *)(yp + 24) - carry
-# asm 1: sbbq 24(<yp=int64#2),<t3=int64#1
-# asm 2: sbbq 24(<yp=%rsi),<t3=%rdi
-sbbq 24(%rsi),%rdi
-
-# qhasm: ret = 0
-# asm 1: mov  $0,>ret=int64#1
-# asm 2: mov  $0,>ret=%rdi
-mov  $0,%rdi
-
-# qhasm: doof = 1
-# asm 1: mov  $1,>doof=int64#2
-# asm 2: mov  $1,>doof=%rsi
-mov  $1,%rsi
-
-# qhasm: ret = doof if carry
-# asm 1: cmovc <doof=int64#2,<ret=int64#1
-# asm 2: cmovc <doof=%rsi,<ret=%rdi
-cmovc %rsi,%rdi
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/sc25519_mul.c b/ext/ed25519-amd64-asm/sc25519_mul.c
deleted file mode 100644
index ca4d5baa8..000000000
--- a/ext/ed25519-amd64-asm/sc25519_mul.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "sc25519.h"
-
-#define ull4_mul        crypto_sign_ed25519_amd64_64_ull4_mul
-
-extern void ull4_mul(unsigned long long r[8], const unsigned long long x[4], const unsigned long long y[4]);
-
-void sc25519_mul(sc25519 *r, const sc25519 *x, const sc25519 *y)
-{
-  unsigned long long t[8];
-  ull4_mul(t, x->v, y->v);
-  sc25519_barrett(r, t);
-}
diff --git a/ext/ed25519-amd64-asm/sc25519_mul_shortsc.c b/ext/ed25519-amd64-asm/sc25519_mul_shortsc.c
deleted file mode 100644
index 0c67250d7..000000000
--- a/ext/ed25519-amd64-asm/sc25519_mul_shortsc.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "sc25519.h"
-
-void sc25519_mul_shortsc(sc25519 *r, const sc25519 *x, const shortsc25519 *y)
-{
-  /* XXX: This wants to be faster */
-  sc25519 t;
-  sc25519_from_shortsc(&t, y);
-  sc25519_mul(r, x, &t);
-}
diff --git a/ext/ed25519-amd64-asm/sc25519_slide.c b/ext/ed25519-amd64-asm/sc25519_slide.c
deleted file mode 100644
index 4e52010d5..000000000
--- a/ext/ed25519-amd64-asm/sc25519_slide.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "sc25519.h"
-
-void sc25519_slide(signed char r[256], const sc25519 *s, int swindowsize)
-{
-  int i,j,k,b,m=(1<<(swindowsize-1))-1, soplen=256;
-  unsigned long long sv0 = s->v[0];
-  unsigned long long sv1 = s->v[1];
-  unsigned long long sv2 = s->v[2];
-  unsigned long long sv3 = s->v[3];
-
-  /* first put the binary expansion into r  */
-  for(i=0;i<64;i++) {
-    r[i] = sv0 & 1;
-    r[i+64] = sv1 & 1;
-    r[i+128] = sv2 & 1;
-    r[i+192] = sv3 & 1;
-    sv0 >>= 1;
-    sv1 >>= 1;
-    sv2 >>= 1;
-    sv3 >>= 1;
-  }
-
-  /* Making it sliding window */
-  for (j = 0;j < soplen;++j) 
-  {
-    if (r[j]) {
-      for (b = 1;b < soplen - j && b <= 6;++b) {
-        if (r[j] + (r[j + b] << b) <= m) 
-        {
-          r[j] += r[j + b] << b; r[j + b] = 0;
-        } 
-        else if (r[j] - (r[j + b] << b) >= -m) 
-        {
-          r[j] -= r[j + b] << b;
-          for (k = j + b;k < soplen;++k) 
-          {
-            if (!r[k]) {
-              r[k] = 1;
-              break;
-            }
-            r[k] = 0;
-          }
-        } 
-        else if (r[j + b])
-          break;
-      }
-    }
-  }
-}
diff --git a/ext/ed25519-amd64-asm/sc25519_sub_nored.s b/ext/ed25519-amd64-asm/sc25519_sub_nored.s
deleted file mode 100644
index a347e7d44..000000000
--- a/ext/ed25519-amd64-asm/sc25519_sub_nored.s
+++ /dev/null
@@ -1,142 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 xp
-
-# qhasm: int64 yp
-
-# qhasm: input rp
-
-# qhasm: input xp
-
-# qhasm: input yp
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm: int64 t0
-
-# qhasm: int64 t1
-
-# qhasm: int64 t2
-
-# qhasm: int64 t3
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_sc25519_sub_nored
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_sc25519_sub_nored
-.globl crypto_sign_ed25519_amd64_64_sc25519_sub_nored
-_crypto_sign_ed25519_amd64_64_sc25519_sub_nored:
-crypto_sign_ed25519_amd64_64_sc25519_sub_nored:
-mov %rsp,%r11
-and $31,%r11
-add $0,%r11
-sub %r11,%rsp
-
-# qhasm: r0 = *(uint64 *)(xp +  0)
-# asm 1: movq   0(<xp=int64#2),>r0=int64#4
-# asm 2: movq   0(<xp=%rsi),>r0=%rcx
-movq   0(%rsi),%rcx
-
-# qhasm: r1 = *(uint64 *)(xp +  8)
-# asm 1: movq   8(<xp=int64#2),>r1=int64#5
-# asm 2: movq   8(<xp=%rsi),>r1=%r8
-movq   8(%rsi),%r8
-
-# qhasm: r2 = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>r2=int64#6
-# asm 2: movq   16(<xp=%rsi),>r2=%r9
-movq   16(%rsi),%r9
-
-# qhasm: r3 = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>r3=int64#2
-# asm 2: movq   24(<xp=%rsi),>r3=%rsi
-movq   24(%rsi),%rsi
-
-# qhasm: carry? r0 -= *(uint64 *)(yp +  0)
-# asm 1: subq 0(<yp=int64#3),<r0=int64#4
-# asm 2: subq 0(<yp=%rdx),<r0=%rcx
-subq 0(%rdx),%rcx
-
-# qhasm: carry? r1 -= *(uint64 *)(yp +  8) - carry
-# asm 1: sbbq 8(<yp=int64#3),<r1=int64#5
-# asm 2: sbbq 8(<yp=%rdx),<r1=%r8
-sbbq 8(%rdx),%r8
-
-# qhasm: carry? r2 -= *(uint64 *)(yp + 16) - carry
-# asm 1: sbbq 16(<yp=int64#3),<r2=int64#6
-# asm 2: sbbq 16(<yp=%rdx),<r2=%r9
-sbbq 16(%rdx),%r9
-
-# qhasm: r3 -= *(uint64 *)(yp + 24) - carry
-# asm 1: sbbq 24(<yp=int64#3),<r3=int64#2
-# asm 2: sbbq 24(<yp=%rdx),<r3=%rsi
-sbbq 24(%rdx),%rsi
-
-# qhasm: *(uint64 *)(rp +  0) = r0
-# asm 1: movq   <r0=int64#4,0(<rp=int64#1)
-# asm 2: movq   <r0=%rcx,0(<rp=%rdi)
-movq   %rcx,0(%rdi)
-
-# qhasm: *(uint64 *)(rp +  8) = r1
-# asm 1: movq   <r1=int64#5,8(<rp=int64#1)
-# asm 2: movq   <r1=%r8,8(<rp=%rdi)
-movq   %r8,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#6,16(<rp=int64#1)
-# asm 2: movq   <r2=%r9,16(<rp=%rdi)
-movq   %r9,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#2,24(<rp=int64#1)
-# asm 2: movq   <r3=%rsi,24(<rp=%rdi)
-movq   %rsi,24(%rdi)
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/ed25519-amd64-asm/sc25519_to32bytes.c b/ext/ed25519-amd64-asm/sc25519_to32bytes.c
deleted file mode 100644
index eddb235d3..000000000
--- a/ext/ed25519-amd64-asm/sc25519_to32bytes.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "sc25519.h"
-
-void sc25519_to32bytes(unsigned char r[32], const sc25519 *x)
-{
-  /* assuming little-endian */
-  int i;
-  for(i=0;i<32;i++) r[i] = i[(unsigned char *)x->v]; 
-}
diff --git a/ext/ed25519-amd64-asm/sc25519_window4.c b/ext/ed25519-amd64-asm/sc25519_window4.c
deleted file mode 100644
index 683a1d4b8..000000000
--- a/ext/ed25519-amd64-asm/sc25519_window4.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "sc25519.h"
-
-void sc25519_window4(signed char r[64], const sc25519 *s)
-{
-  char carry;
-  int i;
-  for(i=0;i<16;i++)
-    r[i] = (s->v[0] >> (4*i)) & 15;
-  for(i=0;i<16;i++)
-    r[i+16] = (s->v[1] >> (4*i)) & 15;
-  for(i=0;i<16;i++)
-    r[i+32] = (s->v[2] >> (4*i)) & 15;
-  for(i=0;i<16;i++)
-    r[i+48] = (s->v[3] >> (4*i)) & 15;
-
-  /* Making it signed */
-  carry = 0;
-  for(i=0;i<63;i++)
-  {
-    r[i] += carry;
-    r[i+1] += r[i] >> 4;
-    r[i] &= 15;
-    carry = r[i] >> 3;
-    r[i] -= carry << 4;
-  }
-  r[63] += carry;
-}
diff --git a/ext/ed25519-amd64-asm/sign.c b/ext/ed25519-amd64-asm/sign.c
deleted file mode 100644
index 715feb5b7..000000000
--- a/ext/ed25519-amd64-asm/sign.c
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-/*#include "crypto_sign.h"
-#include "crypto_hash_sha512.h"*/
-#include "ge25519.h"
-
-/* Original */
-#if 0
-int crypto_sign(
-    unsigned char *sm,unsigned long long *smlen,
-    const unsigned char *m,unsigned long long mlen,
-    const unsigned char *sk
-    )
-{
-  unsigned char pk[32];
-  unsigned char az[64];
-  unsigned char nonce[64];
-  unsigned char hram[64];
-  sc25519 sck, scs, scsk;
-  ge25519 ger;
-
-  memmove(pk,sk + 32,32);
-  /* pk: 32-byte public key A */
-
-  crypto_hash_sha512(az,sk,32);
-  az[0] &= 248;
-  az[31] &= 127;
-  az[31] |= 64;
-  /* az: 32-byte scalar a, 32-byte randomizer z */
-
-  *smlen = mlen + 64;
-  memmove(sm + 64,m,mlen);
-  memmove(sm + 32,az + 32,32);
-  /* sm: 32-byte uninit, 32-byte z, mlen-byte m */
-
-  crypto_hash_sha512(nonce, sm+32, mlen+32);
-  /* nonce: 64-byte H(z,m) */
-
-  sc25519_from64bytes(&sck, nonce);
-  ge25519_scalarmult_base(&ger, &sck);
-  ge25519_pack(sm, &ger);
-  /* sm: 32-byte R, 32-byte z, mlen-byte m */
-
-  memmove(sm + 32,pk,32);
-  /* sm: 32-byte R, 32-byte A, mlen-byte m */
-
-  crypto_hash_sha512(hram,sm,mlen + 64);
-  /* hram: 64-byte H(R,A,m) */
-
-  sc25519_from64bytes(&scs, hram);
-  sc25519_from32bytes(&scsk, az);
-  sc25519_mul(&scs, &scs, &scsk);
-  sc25519_add(&scs, &scs, &sck);
-  /* scs: S = nonce + H(R,A,m)a */
-
-  sc25519_to32bytes(sm + 32,&scs);
-  /* sm: 32-byte R, 32-byte S, mlen-byte m */
-
-  return 0;
-}
-#endif
-
-#if 0
-void ECC::sign(const ECC::Private &myPrivate,const ECC::Public &myPublic,const void *msg,unsigned int len,void *signature)
-{
-  sc25519 sck, scs, scsk;
-  ge25519 ger;
-  unsigned char r[32];
-  unsigned char s[32];
-  unsigned char extsk[64];
-  unsigned char hmg[crypto_hash_sha512_BYTES];
-  unsigned char hram[crypto_hash_sha512_BYTES];
-  unsigned char *sig = (unsigned char *)signature;
-  unsigned char digest[64]; // we sign the first 32 bytes of SHA-512(msg)
-
-  SHA512::hash(digest,msg,len);
-
-  SHA512::hash(extsk,myPrivate.data + 32,32);
-  extsk[0] &= 248;
-  extsk[31] &= 127;
-  extsk[31] |= 64;
-
-  for(unsigned int i=0;i<32;i++)
-    sig[32 + i] = extsk[32 + i];
-  for(unsigned int i=0;i<32;i++)
-    sig[64 + i] = digest[i];
-
-  SHA512::hash(hmg,sig + 32,64);
-
-  /* Computation of R */
-  sc25519_from64bytes(&sck, hmg);
-  ge25519_scalarmult_base(&ger, &sck);
-  ge25519_pack(r, &ger);
-
-  /* Computation of s */
-  for(unsigned int i=0;i<32;i++)
-    sig[i] = r[i];
-
-  get_hram(hram,sig,myPublic.data + 32,sig,96);
-
-  sc25519_from64bytes(&scs, hram);
-  sc25519_from32bytes(&scsk, extsk);
-  sc25519_mul(&scs, &scs, &scsk);
-
-  sc25519_add(&scs, &scs, &sck);
-
-  sc25519_to32bytes(s,&scs); /* cat s */
-  for(unsigned int i=0;i<32;i++)
-    sig[32 + i] = s[i];
-}
-
-void get_hram(unsigned char *hram, const unsigned char *sm, const unsigned char *pk, unsigned char *playground, unsigned long long smlen)
-{
-  unsigned long long i;
-
-  for (i =  0;i < 32;++i)    playground[i] = sm[i];
-  for (i = 32;i < 64;++i)    playground[i] = pk[i-32];
-  for (i = 64;i < smlen;++i) playground[i] = sm[i];
-
-  //crypto_hash_sha512(hram,playground,smlen);
-  ZeroTier::SHA512::hash(hram,playground,(unsigned int)smlen);
-}
-#endif
-
-extern void ZT_sha512internal(void *digest,const void *data,unsigned int len);
-
-extern void ed25519_amd64_asm_sign(const unsigned char *sk,const unsigned char *pk,const unsigned char *digest,unsigned char *sig)
-{
-  unsigned char az[64];
-  unsigned char nonce[64];
-  unsigned char hram[64];
-  sc25519 sck, scs, scsk;
-  ge25519 ger;
-  unsigned int i;
-
-  ZT_sha512internal(az,sk,32);
-  az[0] &= 248;
-  az[31] &= 127;
-  az[31] |= 64;
-
-  for(i=0;i<32;i++)
-    sig[32 + i] = az[32 + i];
-  for(i=0;i<32;i++)
-    sig[64 + i] = digest[i];
-
-  ZT_sha512internal(nonce,sig + 32,64);
-
-  sc25519_from64bytes(&sck, nonce);
-  ge25519_scalarmult_base(&ger, &sck);
-  ge25519_pack(sig, &ger);
-
-  memmove(sig + 32,pk,32);
-
-  ZT_sha512internal(hram,sig,96);
-
-  sc25519_from64bytes(&scs, hram);
-  sc25519_from32bytes(&scsk, az);
-  sc25519_mul(&scs, &scs, &scsk);
-  sc25519_add(&scs, &scs, &sck);
-
-  sc25519_to32bytes(sig + 32,&scs);
-}
diff --git a/ext/ed25519-amd64-asm/ull4_mul.s b/ext/ed25519-amd64-asm/ull4_mul.s
deleted file mode 100644
index 9f7b4fa26..000000000
--- a/ext/ed25519-amd64-asm/ull4_mul.s
+++ /dev/null
@@ -1,716 +0,0 @@
-
-# qhasm: int64 rp
-
-# qhasm: int64 xp
-
-# qhasm: int64 yp
-
-# qhasm: input rp
-
-# qhasm: input xp
-
-# qhasm: input yp
-
-# qhasm: int64 r0
-
-# qhasm: int64 r1
-
-# qhasm: int64 r2
-
-# qhasm: int64 r3
-
-# qhasm: int64 r4
-
-# qhasm: int64 r5
-
-# qhasm: int64 r6
-
-# qhasm: int64 r7
-
-# qhasm: int64 c
-
-# qhasm: int64 zero
-
-# qhasm: int64 rax
-
-# qhasm: int64 rdx
-
-# qhasm:   int64 caller1
-
-# qhasm:   int64 caller2
-
-# qhasm:   int64 caller3
-
-# qhasm:   int64 caller4
-
-# qhasm:   int64 caller5
-
-# qhasm:   int64 caller6
-
-# qhasm:   int64 caller7
-
-# qhasm:   caller caller1
-
-# qhasm:   caller caller2
-
-# qhasm:   caller caller3
-
-# qhasm:   caller caller4
-
-# qhasm:   caller caller5
-
-# qhasm:   caller caller6
-
-# qhasm:   caller caller7
-
-# qhasm:   stack64 caller1_stack
-
-# qhasm:   stack64 caller2_stack
-
-# qhasm:   stack64 caller3_stack
-
-# qhasm:   stack64 caller4_stack
-
-# qhasm:   stack64 caller5_stack
-
-# qhasm:   stack64 caller6_stack
-
-# qhasm:   stack64 caller7_stack
-
-# qhasm: enter crypto_sign_ed25519_amd64_64_ull4_mul 
-.text
-.p2align 5
-.globl _crypto_sign_ed25519_amd64_64_ull4_mul
-.globl crypto_sign_ed25519_amd64_64_ull4_mul
-_crypto_sign_ed25519_amd64_64_ull4_mul:
-crypto_sign_ed25519_amd64_64_ull4_mul:
-mov %rsp,%r11
-and $31,%r11
-add $64,%r11
-sub %r11,%rsp
-
-# qhasm:   caller1_stack = caller1
-# asm 1: movq <caller1=int64#9,>caller1_stack=stack64#1
-# asm 2: movq <caller1=%r11,>caller1_stack=0(%rsp)
-movq %r11,0(%rsp)
-
-# qhasm:   caller2_stack = caller2
-# asm 1: movq <caller2=int64#10,>caller2_stack=stack64#2
-# asm 2: movq <caller2=%r12,>caller2_stack=8(%rsp)
-movq %r12,8(%rsp)
-
-# qhasm:   caller3_stack = caller3
-# asm 1: movq <caller3=int64#11,>caller3_stack=stack64#3
-# asm 2: movq <caller3=%r13,>caller3_stack=16(%rsp)
-movq %r13,16(%rsp)
-
-# qhasm:   caller4_stack = caller4
-# asm 1: movq <caller4=int64#12,>caller4_stack=stack64#4
-# asm 2: movq <caller4=%r14,>caller4_stack=24(%rsp)
-movq %r14,24(%rsp)
-
-# qhasm:   caller5_stack = caller5
-# asm 1: movq <caller5=int64#13,>caller5_stack=stack64#5
-# asm 2: movq <caller5=%r15,>caller5_stack=32(%rsp)
-movq %r15,32(%rsp)
-
-# qhasm:   caller6_stack = caller6
-# asm 1: movq <caller6=int64#14,>caller6_stack=stack64#6
-# asm 2: movq <caller6=%rbx,>caller6_stack=40(%rsp)
-movq %rbx,40(%rsp)
-
-# qhasm:   caller7_stack = caller7
-# asm 1: movq <caller7=int64#15,>caller7_stack=stack64#7
-# asm 2: movq <caller7=%rbp,>caller7_stack=48(%rsp)
-movq %rbp,48(%rsp)
-
-# qhasm: yp = yp
-# asm 1: mov  <yp=int64#3,>yp=int64#4
-# asm 2: mov  <yp=%rdx,>yp=%rcx
-mov  %rdx,%rcx
-
-# qhasm: r4 = 0
-# asm 1: mov  $0,>r4=int64#5
-# asm 2: mov  $0,>r4=%r8
-mov  $0,%r8
-
-# qhasm: r5 = 0
-# asm 1: mov  $0,>r5=int64#6
-# asm 2: mov  $0,>r5=%r9
-mov  $0,%r9
-
-# qhasm: r6 = 0
-# asm 1: mov  $0,>r6=int64#8
-# asm 2: mov  $0,>r6=%r10
-mov  $0,%r10
-
-# qhasm: r7 = 0
-# asm 1: mov  $0,>r7=int64#9
-# asm 2: mov  $0,>r7=%r11
-mov  $0,%r11
-
-# qhasm: zero = 0
-# asm 1: mov  $0,>zero=int64#10
-# asm 2: mov  $0,>zero=%r12
-mov  $0,%r12
-
-# qhasm: rax = *(uint64 *)(xp + 0)
-# asm 1: movq   0(<xp=int64#2),>rax=int64#7
-# asm 2: movq   0(<xp=%rsi),>rax=%rax
-movq   0(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp +  0)
-# asm 1: mulq  0(<yp=int64#4)
-# asm 2: mulq  0(<yp=%rcx)
-mulq  0(%rcx)
-
-# qhasm: r0 = rax
-# asm 1: mov  <rax=int64#7,>r0=int64#11
-# asm 2: mov  <rax=%rax,>r0=%r13
-mov  %rax,%r13
-
-# qhasm: c = rdx
-# asm 1: mov  <rdx=int64#3,>c=int64#12
-# asm 2: mov  <rdx=%rdx,>c=%r14
-mov  %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 0)
-# asm 1: movq   0(<xp=int64#2),>rax=int64#7
-# asm 2: movq   0(<xp=%rsi),>rax=%rax
-movq   0(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp +  8)
-# asm 1: mulq  8(<yp=int64#4)
-# asm 2: mulq  8(<yp=%rcx)
-mulq  8(%rcx)
-
-# qhasm: r1 = rax
-# asm 1: mov  <rax=int64#7,>r1=int64#13
-# asm 2: mov  <rax=%rax,>r1=%r15
-mov  %rax,%r15
-
-# qhasm: carry? r1 += c
-# asm 1: add  <c=int64#12,<r1=int64#13
-# asm 2: add  <c=%r14,<r1=%r15
-add  %r14,%r15
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 0)
-# asm 1: movq   0(<xp=int64#2),>rax=int64#7
-# asm 2: movq   0(<xp=%rsi),>rax=%rax
-movq   0(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp + 16)
-# asm 1: mulq  16(<yp=int64#4)
-# asm 2: mulq  16(<yp=%rcx)
-mulq  16(%rcx)
-
-# qhasm: r2 = rax
-# asm 1: mov  <rax=int64#7,>r2=int64#14
-# asm 2: mov  <rax=%rax,>r2=%rbx
-mov  %rax,%rbx
-
-# qhasm: carry? r2 += c
-# asm 1: add  <c=int64#12,<r2=int64#14
-# asm 2: add  <c=%r14,<r2=%rbx
-add  %r14,%rbx
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 0)
-# asm 1: movq   0(<xp=int64#2),>rax=int64#7
-# asm 2: movq   0(<xp=%rsi),>rax=%rax
-movq   0(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp + 24)
-# asm 1: mulq  24(<yp=int64#4)
-# asm 2: mulq  24(<yp=%rcx)
-mulq  24(%rcx)
-
-# qhasm: r3 = rax
-# asm 1: mov  <rax=int64#7,>r3=int64#15
-# asm 2: mov  <rax=%rax,>r3=%rbp
-mov  %rax,%rbp
-
-# qhasm: carry? r3 += c
-# asm 1: add  <c=int64#12,<r3=int64#15
-# asm 2: add  <c=%r14,<r3=%rbp
-add  %r14,%rbp
-
-# qhasm: r4 += rdx + carry
-# asm 1: adc <rdx=int64#3,<r4=int64#5
-# asm 2: adc <rdx=%rdx,<r4=%r8
-adc %rdx,%r8
-
-# qhasm: rax = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>rax=int64#7
-# asm 2: movq   8(<xp=%rsi),>rax=%rax
-movq   8(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp +  0)
-# asm 1: mulq  0(<yp=int64#4)
-# asm 2: mulq  0(<yp=%rcx)
-mulq  0(%rcx)
-
-# qhasm: carry? r1 += rax
-# asm 1: add  <rax=int64#7,<r1=int64#13
-# asm 2: add  <rax=%rax,<r1=%r15
-add  %rax,%r15
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>rax=int64#7
-# asm 2: movq   8(<xp=%rsi),>rax=%rax
-movq   8(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp +  8)
-# asm 1: mulq  8(<yp=int64#4)
-# asm 2: mulq  8(<yp=%rcx)
-mulq  8(%rcx)
-
-# qhasm: carry? r2 += rax
-# asm 1: add  <rax=int64#7,<r2=int64#14
-# asm 2: add  <rax=%rax,<r2=%rbx
-add  %rax,%rbx
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r2 += c
-# asm 1: add  <c=int64#12,<r2=int64#14
-# asm 2: add  <c=%r14,<r2=%rbx
-add  %r14,%rbx
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>rax=int64#7
-# asm 2: movq   8(<xp=%rsi),>rax=%rax
-movq   8(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp + 16)
-# asm 1: mulq  16(<yp=int64#4)
-# asm 2: mulq  16(<yp=%rcx)
-mulq  16(%rcx)
-
-# qhasm: carry? r3 += rax 
-# asm 1: add  <rax=int64#7,<r3=int64#15
-# asm 2: add  <rax=%rax,<r3=%rbp
-add  %rax,%rbp
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r3 += c
-# asm 1: add  <c=int64#12,<r3=int64#15
-# asm 2: add  <c=%r14,<r3=%rbp
-add  %r14,%rbp
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 8)
-# asm 1: movq   8(<xp=int64#2),>rax=int64#7
-# asm 2: movq   8(<xp=%rsi),>rax=%rax
-movq   8(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp + 24)
-# asm 1: mulq  24(<yp=int64#4)
-# asm 2: mulq  24(<yp=%rcx)
-mulq  24(%rcx)
-
-# qhasm: carry? r4 += rax
-# asm 1: add  <rax=int64#7,<r4=int64#5
-# asm 2: add  <rax=%rax,<r4=%r8
-add  %rax,%r8
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r4 += c
-# asm 1: add  <c=int64#12,<r4=int64#5
-# asm 2: add  <c=%r14,<r4=%r8
-add  %r14,%r8
-
-# qhasm: r5 += rdx + carry
-# asm 1: adc <rdx=int64#3,<r5=int64#6
-# asm 2: adc <rdx=%rdx,<r5=%r9
-adc %rdx,%r9
-
-# qhasm: rax = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>rax=int64#7
-# asm 2: movq   16(<xp=%rsi),>rax=%rax
-movq   16(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp +  0)
-# asm 1: mulq  0(<yp=int64#4)
-# asm 2: mulq  0(<yp=%rcx)
-mulq  0(%rcx)
-
-# qhasm: carry? r2 += rax
-# asm 1: add  <rax=int64#7,<r2=int64#14
-# asm 2: add  <rax=%rax,<r2=%rbx
-add  %rax,%rbx
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>rax=int64#7
-# asm 2: movq   16(<xp=%rsi),>rax=%rax
-movq   16(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp +  8)
-# asm 1: mulq  8(<yp=int64#4)
-# asm 2: mulq  8(<yp=%rcx)
-mulq  8(%rcx)
-
-# qhasm: carry? r3 += rax
-# asm 1: add  <rax=int64#7,<r3=int64#15
-# asm 2: add  <rax=%rax,<r3=%rbp
-add  %rax,%rbp
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r3 += c
-# asm 1: add  <c=int64#12,<r3=int64#15
-# asm 2: add  <c=%r14,<r3=%rbp
-add  %r14,%rbp
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>rax=int64#7
-# asm 2: movq   16(<xp=%rsi),>rax=%rax
-movq   16(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp + 16)
-# asm 1: mulq  16(<yp=int64#4)
-# asm 2: mulq  16(<yp=%rcx)
-mulq  16(%rcx)
-
-# qhasm: carry? r4 += rax
-# asm 1: add  <rax=int64#7,<r4=int64#5
-# asm 2: add  <rax=%rax,<r4=%r8
-add  %rax,%r8
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r4 += c
-# asm 1: add  <c=int64#12,<r4=int64#5
-# asm 2: add  <c=%r14,<r4=%r8
-add  %r14,%r8
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 16)
-# asm 1: movq   16(<xp=int64#2),>rax=int64#7
-# asm 2: movq   16(<xp=%rsi),>rax=%rax
-movq   16(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp + 24)
-# asm 1: mulq  24(<yp=int64#4)
-# asm 2: mulq  24(<yp=%rcx)
-mulq  24(%rcx)
-
-# qhasm: carry? r5 += rax
-# asm 1: add  <rax=int64#7,<r5=int64#6
-# asm 2: add  <rax=%rax,<r5=%r9
-add  %rax,%r9
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r5 += c
-# asm 1: add  <c=int64#12,<r5=int64#6
-# asm 2: add  <c=%r14,<r5=%r9
-add  %r14,%r9
-
-# qhasm: r6 += rdx + carry
-# asm 1: adc <rdx=int64#3,<r6=int64#8
-# asm 2: adc <rdx=%rdx,<r6=%r10
-adc %rdx,%r10
-
-# qhasm: rax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>rax=int64#7
-# asm 2: movq   24(<xp=%rsi),>rax=%rax
-movq   24(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp +  0)
-# asm 1: mulq  0(<yp=int64#4)
-# asm 2: mulq  0(<yp=%rcx)
-mulq  0(%rcx)
-
-# qhasm: carry? r3 += rax
-# asm 1: add  <rax=int64#7,<r3=int64#15
-# asm 2: add  <rax=%rax,<r3=%rbp
-add  %rax,%rbp
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>rax=int64#7
-# asm 2: movq   24(<xp=%rsi),>rax=%rax
-movq   24(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp +  8)
-# asm 1: mulq  8(<yp=int64#4)
-# asm 2: mulq  8(<yp=%rcx)
-mulq  8(%rcx)
-
-# qhasm: carry? r4 += rax
-# asm 1: add  <rax=int64#7,<r4=int64#5
-# asm 2: add  <rax=%rax,<r4=%r8
-add  %rax,%r8
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r4 += c
-# asm 1: add  <c=int64#12,<r4=int64#5
-# asm 2: add  <c=%r14,<r4=%r8
-add  %r14,%r8
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>rax=int64#7
-# asm 2: movq   24(<xp=%rsi),>rax=%rax
-movq   24(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp + 16)
-# asm 1: mulq  16(<yp=int64#4)
-# asm 2: mulq  16(<yp=%rcx)
-mulq  16(%rcx)
-
-# qhasm: carry? r5 += rax
-# asm 1: add  <rax=int64#7,<r5=int64#6
-# asm 2: add  <rax=%rax,<r5=%r9
-add  %rax,%r9
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r5 += c
-# asm 1: add  <c=int64#12,<r5=int64#6
-# asm 2: add  <c=%r14,<r5=%r9
-add  %r14,%r9
-
-# qhasm: c = 0
-# asm 1: mov  $0,>c=int64#12
-# asm 2: mov  $0,>c=%r14
-mov  $0,%r14
-
-# qhasm: c += rdx + carry
-# asm 1: adc <rdx=int64#3,<c=int64#12
-# asm 2: adc <rdx=%rdx,<c=%r14
-adc %rdx,%r14
-
-# qhasm: rax = *(uint64 *)(xp + 24)
-# asm 1: movq   24(<xp=int64#2),>rax=int64#7
-# asm 2: movq   24(<xp=%rsi),>rax=%rax
-movq   24(%rsi),%rax
-
-# qhasm: (uint128) rdx rax = rax * *(uint64 *)(yp + 24)
-# asm 1: mulq  24(<yp=int64#4)
-# asm 2: mulq  24(<yp=%rcx)
-mulq  24(%rcx)
-
-# qhasm: carry? r6 += rax
-# asm 1: add  <rax=int64#7,<r6=int64#8
-# asm 2: add  <rax=%rax,<r6=%r10
-add  %rax,%r10
-
-# qhasm: rdx += zero + carry
-# asm 1: adc <zero=int64#10,<rdx=int64#3
-# asm 2: adc <zero=%r12,<rdx=%rdx
-adc %r12,%rdx
-
-# qhasm: carry? r6 += c
-# asm 1: add  <c=int64#12,<r6=int64#8
-# asm 2: add  <c=%r14,<r6=%r10
-add  %r14,%r10
-
-# qhasm: r7 += rdx + carry
-# asm 1: adc <rdx=int64#3,<r7=int64#9
-# asm 2: adc <rdx=%rdx,<r7=%r11
-adc %rdx,%r11
-
-# qhasm: *(uint64 *)(rp +  0) = r0
-# asm 1: movq   <r0=int64#11,0(<rp=int64#1)
-# asm 2: movq   <r0=%r13,0(<rp=%rdi)
-movq   %r13,0(%rdi)
-
-# qhasm: *(uint64 *)(rp +  8) = r1
-# asm 1: movq   <r1=int64#13,8(<rp=int64#1)
-# asm 2: movq   <r1=%r15,8(<rp=%rdi)
-movq   %r15,8(%rdi)
-
-# qhasm: *(uint64 *)(rp + 16) = r2
-# asm 1: movq   <r2=int64#14,16(<rp=int64#1)
-# asm 2: movq   <r2=%rbx,16(<rp=%rdi)
-movq   %rbx,16(%rdi)
-
-# qhasm: *(uint64 *)(rp + 24) = r3
-# asm 1: movq   <r3=int64#15,24(<rp=int64#1)
-# asm 2: movq   <r3=%rbp,24(<rp=%rdi)
-movq   %rbp,24(%rdi)
-
-# qhasm: *(uint64 *)(rp + 32) = r4
-# asm 1: movq   <r4=int64#5,32(<rp=int64#1)
-# asm 2: movq   <r4=%r8,32(<rp=%rdi)
-movq   %r8,32(%rdi)
-
-# qhasm: *(uint64 *)(rp + 40) = r5
-# asm 1: movq   <r5=int64#6,40(<rp=int64#1)
-# asm 2: movq   <r5=%r9,40(<rp=%rdi)
-movq   %r9,40(%rdi)
-
-# qhasm: *(uint64 *)(rp + 48) = r6
-# asm 1: movq   <r6=int64#8,48(<rp=int64#1)
-# asm 2: movq   <r6=%r10,48(<rp=%rdi)
-movq   %r10,48(%rdi)
-
-# qhasm: *(uint64 *)(rp + 56) = r7
-# asm 1: movq   <r7=int64#9,56(<rp=int64#1)
-# asm 2: movq   <r7=%r11,56(<rp=%rdi)
-movq   %r11,56(%rdi)
-
-# qhasm:   caller1 = caller1_stack
-# asm 1: movq <caller1_stack=stack64#1,>caller1=int64#9
-# asm 2: movq <caller1_stack=0(%rsp),>caller1=%r11
-movq 0(%rsp),%r11
-
-# qhasm:   caller2 = caller2_stack
-# asm 1: movq <caller2_stack=stack64#2,>caller2=int64#10
-# asm 2: movq <caller2_stack=8(%rsp),>caller2=%r12
-movq 8(%rsp),%r12
-
-# qhasm:   caller3 = caller3_stack
-# asm 1: movq <caller3_stack=stack64#3,>caller3=int64#11
-# asm 2: movq <caller3_stack=16(%rsp),>caller3=%r13
-movq 16(%rsp),%r13
-
-# qhasm:   caller4 = caller4_stack
-# asm 1: movq <caller4_stack=stack64#4,>caller4=int64#12
-# asm 2: movq <caller4_stack=24(%rsp),>caller4=%r14
-movq 24(%rsp),%r14
-
-# qhasm:   caller5 = caller5_stack
-# asm 1: movq <caller5_stack=stack64#5,>caller5=int64#13
-# asm 2: movq <caller5_stack=32(%rsp),>caller5=%r15
-movq 32(%rsp),%r15
-
-# qhasm:   caller6 = caller6_stack
-# asm 1: movq <caller6_stack=stack64#6,>caller6=int64#14
-# asm 2: movq <caller6_stack=40(%rsp),>caller6=%rbx
-movq 40(%rsp),%rbx
-
-# qhasm:   caller7 = caller7_stack
-# asm 1: movq <caller7_stack=stack64#7,>caller7=int64#15
-# asm 2: movq <caller7_stack=48(%rsp),>caller7=%rbp
-movq 48(%rsp),%rbp
-
-# qhasm: leave
-add %r11,%rsp
-mov %rdi,%rax
-mov %rsi,%rdx
-ret
diff --git a/ext/hiredis-0.14.1/.gitignore b/ext/hiredis-0.14.1/.gitignore
deleted file mode 100644
index db2ad032a..000000000
--- a/ext/hiredis-0.14.1/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/hiredis-test
-/examples/hiredis-example*
-/*.o
-/*.so
-/*.dylib
-/*.pc
diff --git a/ext/hiredis-0.14.1/.travis.yml b/ext/hiredis-0.14.1/.travis.yml
deleted file mode 100644
index faf2ce684..000000000
--- a/ext/hiredis-0.14.1/.travis.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-language: c
-sudo: false
-compiler:
-  - gcc
-  - clang
-
-os:
-  - linux
-  - osx
-
-branches:
-  only:
-    - staging
-    - trying
-    - master
-
-before_script:
-    - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update; brew install redis; fi
-
-addons:
-  apt:
-    packages:
-    - libc6-dbg
-    - libc6-dev
-    - libc6:i386
-    - libc6-dev-i386
-    - libc6-dbg:i386
-    - gcc-multilib
-    - valgrind
-
-env:
-    - CFLAGS="-Werror"
-    - PRE="valgrind --track-origins=yes --leak-check=full"
-    - TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
-    - TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
-
-matrix:
-  exclude:
-    - os: osx
-      env: PRE="valgrind --track-origins=yes --leak-check=full"
-
-    - os: osx
-      env: TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
-
-script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example
diff --git a/ext/hiredis-0.14.1/CHANGELOG.md b/ext/hiredis-0.14.1/CHANGELOG.md
deleted file mode 100644
index f8e577369..000000000
--- a/ext/hiredis-0.14.1/CHANGELOG.md
+++ /dev/null
@@ -1,190 +0,0 @@
-**NOTE: BREAKING CHANGES upgrading from 0.13.x to 0.14.x **:
-
-* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
-  protocol errors. This is consistent with the RESP specification. On 32-bit
-  platforms, the upper bound is lowered to `SIZE_MAX`.
-
-* Change `redisReply.len` to `size_t`, as it denotes the the size of a string
-
-  User code should compare this to `size_t` values as well.  If it was used to
-  compare to other values, casting might be necessary or can be removed, if
-  casting was applied before.
-
-### 0.14.1 (2020-03-13)
-
-* Adds safe allocation wrappers (CVE-2020-7105, #747, #752) (Michael Grunder)
-
-### 0.14.0 (2018-09-25)
-
-* Make string2ll static to fix conflict with Redis (Tom Lee [c3188b])
-* Use -dynamiclib instead of -shared for OSX (Ryan Schmidt [a65537])
-* Use string2ll from Redis w/added tests (Michael Grunder [7bef04, 60f622])
-* Makefile - OSX compilation fixes (Ryan Schmidt [881fcb, 0e9af8])
-* Remove redundant NULL checks (Justin Brewer [54acc8, 58e6b8])
-* Fix bulk and multi-bulk length truncation (Justin Brewer [109197])
-* Fix SIGSEGV in OpenBSD by checking for NULL before calling freeaddrinfo (Justin Brewer [546d94])
-* Several POSIX compatibility fixes (Justin Brewer [bbeab8, 49bbaa, d1c1b6])
-* Makefile - Compatibility fixes (Dimitri Vorobiev [3238cf, 12a9d1])
-* Makefile - Fix make install on FreeBSD (Zach Shipko [a2ef2b])
-* Makefile - don't assume $(INSTALL) is cp (Igor Gnatenko [725a96])
-* Separate side-effect causing function from assert and small cleanup (amallia [b46413, 3c3234])
-* Don't send negative values to `__redisAsyncCommand` (Frederik Deweerdt [706129])
-* Fix leak if setsockopt fails (Frederik Deweerdt [e21c9c])
-* Fix libevent leak (zfz [515228])
-* Clean up GCC warning (Ichito Nagata [2ec774])
-* Keep track of errno in `__redisSetErrorFromErrno()` as snprintf may use it (Jin Qing [25cd88])
-* Solaris compilation fix (Donald Whyte [41b07d])
-* Reorder linker arguments when building examples (Tustfarm-heart [06eedd])
-* Keep track of subscriptions in case of rapid subscribe/unsubscribe (Hyungjin Kim [073dc8, be76c5, d46999])
-* libuv use after free fix (Paul Scott [cbb956])
-* Properly close socket fd on reconnect attempt (WSL [64d1ec])
-* Skip valgrind in OSX tests (Jan-Erik Rediger [9deb78])
-* Various updates for Travis testing OSX (Ted Nyman [fa3774, 16a459, bc0ea5])
-* Update libevent (Chris Xin [386802])
-* Change sds.h for building in C++ projects (Ali Volkan ATLI [f5b32e])
-* Use proper format specifier in redisFormatSdsCommandArgv (Paulino Huerta, Jan-Erik Rediger [360a06, 8655a6])
-* Better handling of NULL reply in example code (Jan-Erik Rediger [1b8ed3])
-* Prevent overflow when formatting an error (Jan-Erik Rediger [0335cb])
-* Compatibility fix for strerror_r (Tom Lee [bb1747])
-* Properly detect integer parse/overflow errors (Justin Brewer [93421f])
-* Adds CI for Windows and cygwin fixes (owent, [6c53d6, 6c3e40])
-* Catch a buffer overflow when formatting the error message
-* Import latest upstream sds. This breaks applications that are linked against the old hiredis v0.13
-* Fix warnings, when compiled with -Wshadow
-* Make hiredis compile in Cygwin on Windows, now CI-tested
-
-**BREAKING CHANGES**:
-
-* Remove backwards compatibility macro's
-
-This removes the following old function aliases, use the new name now:
-
-| Old                         | New                    |
-| --------------------------- | ---------------------- |
-| redisReplyReaderCreate      | redisReaderCreate      |
-| redisReplyReaderCreate      | redisReaderCreate      |
-| redisReplyReaderFree        | redisReaderFree        |
-| redisReplyReaderFeed        | redisReaderFeed        |
-| redisReplyReaderGetReply    | redisReaderGetReply    |
-| redisReplyReaderSetPrivdata | redisReaderSetPrivdata |
-| redisReplyReaderGetObject   | redisReaderGetObject   |
-| redisReplyReaderGetError    | redisReaderGetError    |
-
-* The `DEBUG` variable in the Makefile was renamed to `DEBUG_FLAGS`
-
-Previously it broke some builds for people that had `DEBUG` set to some arbitrary value,
-due to debugging other software.
-By renaming we avoid unintentional name clashes.
-
-Simply rename `DEBUG` to `DEBUG_FLAGS` in your environment to make it working again.
-
-### 0.13.3 (2015-09-16)
-
-* Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
-* Make tests pass on FreeBSD (Thanks, Giacomo Olgeni)
-
-
-If the `REDIS_CONNECTED` flag is cleared,
-the async onDisconnect callback function will never be called.
-This causes problems as the disconnect is never reported back to the user.
-
-### 0.13.2 (2015-08-25)
-
-* Prevent crash on pending replies in async code (Thanks, @switch-st)
-* Clear `REDIS_CONNECTED` flag when connection is closed (Thanks, Jerry Jacobs)
-* Add MacOS X addapter (Thanks, @dizzus)
-* Add Qt adapter (Thanks, Pietro Cerutti)
-* Add Ivykis adapter (Thanks, Gergely Nagy)
-
-All adapters are provided as is and are only tested where possible.
-
-### 0.13.1 (2015-05-03)
-
-This is a bug fix release.
-The new `reconnect` method introduced new struct members, which clashed with pre-defined names in pre-C99 code.
-Another commit forced C99 compilation just to make it work, but of course this is not desirable for outside projects.
-Other non-C99 code can now use hiredis as usual again.
-Sorry for the inconvenience.
-
-* Fix memory leak in async reply handling (Salvatore Sanfilippo)
-* Rename struct member to avoid name clash with pre-c99 code (Alex Balashov, ncopa)
-
-### 0.13.0 (2015-04-16)
-
-This release adds a minimal Windows compatibility layer.
-The parser, standalone since v0.12.0, can now be compiled on Windows
-(and thus used in other client libraries as well)
-
-* Windows compatibility layer for parser code (tzickel)
-* Properly escape data printed to PKGCONF file (Dan Skorupski)
-* Fix tests when assert() undefined (Keith Bennett, Matt Stancliff)
-* Implement a reconnect method for the client context, this changes the structure of `redisContext` (Aaron Bedra)
-
-### 0.12.1 (2015-01-26)
-
-* Fix `make install`: DESTDIR support, install all required files, install PKGCONF in proper location
-* Fix `make test` as 32 bit build on 64 bit platform
-
-### 0.12.0 (2015-01-22)
-
-* Add optional KeepAlive support
-
-* Try again on EINTR errors
-
-* Add libuv adapter
-
-* Add IPv6 support
-
-* Remove possibility of multiple close on same fd
-
-* Add ability to bind source address on connect
-
-* Add redisConnectFd() and redisFreeKeepFd()
-
-* Fix getaddrinfo() memory leak
-
-* Free string if it is unused (fixes memory leak)
-
-* Improve redisAppendCommandArgv performance 2.5x
-
-* Add support for SO_REUSEADDR
-
-* Fix redisvFormatCommand format parsing
-
-* Add GLib 2.0 adapter
-
-* Refactor reading code into read.c
-
-* Fix errno error buffers to not clobber errors
-
-* Generate pkgconf during build
-
-* Silence _BSD_SOURCE warnings
-
-* Improve digit counting for multibulk creation
-
-
-### 0.11.0
-
-* Increase the maximum multi-bulk reply depth to 7.
-
-* Increase the read buffer size from 2k to 16k.
-
-* Use poll(2) instead of select(2) to support large fds (>= 1024).
-
-### 0.10.1
-
-* Makefile overhaul. Important to check out if you override one or more
-  variables using environment variables or via arguments to the "make" tool.
-
-* Issue #45: Fix potential memory leak for a multi bulk reply with 0 elements
-  being created by the default reply object functions.
-
-* Issue #43: Don't crash in an asynchronous context when Redis returns an error
-  reply after the connection has been made (this happens when the maximum
-  number of connections is reached).
-
-### 0.10.0
-
-* See commit log.
-
diff --git a/ext/hiredis-0.14.1/COPYING b/ext/hiredis-0.14.1/COPYING
deleted file mode 100644
index a5fc97395..000000000
--- a/ext/hiredis-0.14.1/COPYING
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
-Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of Redis nor the names of its contributors may be used
-  to endorse or promote products derived from this software without specific
-  prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ext/hiredis-0.14.1/Makefile b/ext/hiredis-0.14.1/Makefile
deleted file mode 100644
index d1f005af4..000000000
--- a/ext/hiredis-0.14.1/Makefile
+++ /dev/null
@@ -1,214 +0,0 @@
-# Hiredis Makefile
-# Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com>
-# Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
-# This file is released under the BSD license, see the COPYING file
-
-OBJ=net.o hiredis.o sds.o async.o read.o alloc.o
-EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib
-TESTS=hiredis-test
-LIBNAME=libhiredis
-PKGCONFNAME=hiredis.pc
-
-HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
-HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
-HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | awk '{print $$3}')
-HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
-
-# Installation related variables and target
-PREFIX?=/usr/local
-INCLUDE_PATH?=include/hiredis
-LIBRARY_PATH?=lib
-PKGCONF_PATH?=pkgconfig
-INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
-INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
-INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
-
-# redis-server configuration used for testing
-REDIS_PORT=56379
-REDIS_SERVER=redis-server
-define REDIS_TEST_CONFIG
-	daemonize yes
-	pidfile /tmp/hiredis-test-redis.pid
-	port $(REDIS_PORT)
-	bind 127.0.0.1
-	unixsocket /tmp/hiredis-test-redis.sock
-endef
-export REDIS_TEST_CONFIG
-
-# Fallback to gcc when $CC is not in $PATH.
-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
-OPTIMIZATION?=-O3
-WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-DEBUG_FLAGS?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
-REAL_LDFLAGS=$(LDFLAGS)
-
-DYLIBSUFFIX=so
-STLIBSUFFIX=a
-DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
-DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
-DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
-DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
-STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
-
-# Platform-specific overrides
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-ifeq ($(uname_S),SunOS)
-  REAL_LDFLAGS+= -ldl -lnsl -lsocket
-  DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-endif
-ifeq ($(uname_S),Darwin)
-  DYLIBSUFFIX=dylib
-  DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
-  DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-endif
-
-all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
-
-# Deps (use make dep to generate this)
-alloc.o: alloc.c fmacros.h alloc.h
-async.o: async.c fmacros.h alloc.h async.h hiredis.h read.h sds.h net.h dict.c dict.h
-dict.o: dict.c fmacros.h alloc.h dict.h
-hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h alloc.h net.h
-net.o: net.c fmacros.h net.h hiredis.h read.h sds.h alloc.h
-read.o: read.c fmacros.h read.h sds.h
-sds.o: sds.c sds.h sdsalloc.h
-test.o: test.c fmacros.h hiredis.h read.h sds.h alloc.h net.h
-
-$(DYLIBNAME): $(OBJ)
-	$(DYLIB_MAKE_CMD) $(OBJ)
-
-$(STLIBNAME): $(OBJ)
-	$(STLIB_MAKE_CMD) $(OBJ)
-
-dynamic: $(DYLIBNAME)
-static: $(STLIBNAME)
-
-# Binaries:
-hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -levent $(STLIBNAME)
-
-hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -lev $(STLIBNAME)
-
-hiredis-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< $(shell pkg-config --cflags --libs glib-2.0) $(STLIBNAME)
-
-hiredis-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -livykis $(STLIBNAME)
-
-hiredis-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME)
-
-ifndef AE_DIR
-hiredis-example-ae:
-	@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
-	@false
-else
-hiredis-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME)
-endif
-
-ifndef LIBUV_DIR
-hiredis-example-libuv:
-	@echo "Please specify LIBUV_DIR (e.g. ../libuv/)"
-	@false
-else
-hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME)
-endif
-
-ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),)
-hiredis-example-qt:
-	@echo "Please specify QT_MOC, QT_INCLUDE_DIR AND QT_LIBRARY_DIR"
-	@false
-else
-hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
-	$(QT_MOC) adapters/qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
-	    $(CXX) -x c++ -o qt-adapter-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
-	$(QT_MOC) examples/example-qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
-	    $(CXX) -x c++ -o qt-example-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
-	$(CXX) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore -L$(QT_LIBRARY_DIR) qt-adapter-moc.o qt-example-moc.o $< -pthread $(STLIBNAME) -lQtCore
-endif
-
-hiredis-example: examples/example.c $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< $(STLIBNAME)
-
-examples: $(EXAMPLES)
-
-hiredis-test: test.o $(STLIBNAME)
-
-hiredis-%: %.o $(STLIBNAME)
-	$(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
-
-test: hiredis-test
-	./hiredis-test
-
-check: hiredis-test
-	@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
-	$(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
-			( kill `cat /tmp/hiredis-test-redis.pid` && false )
-	kill `cat /tmp/hiredis-test-redis.pid`
-
-.c.o:
-	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
-
-clean:
-	rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-
-dep:
-	$(CC) -MM *.c
-
-INSTALL?= cp -pPR
-
-$(PKGCONFNAME): hiredis.h
-	@echo "Generating $@ for pkgconfig..."
-	@echo prefix=$(PREFIX) > $@
-	@echo exec_prefix=\$${prefix} >> $@
-	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
-	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
-	@echo >> $@
-	@echo Name: hiredis >> $@
-	@echo Description: Minimalistic C client library for Redis. >> $@
-	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
-	@echo Libs: -L\$${libdir} -lhiredis >> $@
-	@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
-
-install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
-	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH)
-	$(INSTALL) hiredis.h async.h read.h sds.h alloc.h $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters
-	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
-	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-	mkdir -p $(INSTALL_PKGCONF_PATH)
-	$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
-
-32bit:
-	@echo ""
-	@echo "WARNING: if this fails under Linux you probably need to install libc6-dev-i386"
-	@echo ""
-	$(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
-
-32bit-vars:
-	$(eval CFLAGS=-m32)
-	$(eval LDFLAGS=-m32)
-
-gprof:
-	$(MAKE) CFLAGS="-pg" LDFLAGS="-pg"
-
-gcov:
-	$(MAKE) CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
-
-coverage: gcov
-	make check
-	mkdir -p tmp/lcov
-	lcov -d . -c -o tmp/lcov/hiredis.info
-	genhtml --legend -o tmp/lcov/report tmp/lcov/hiredis.info
-
-noopt:
-	$(MAKE) OPTIMIZATION=""
-
-.PHONY: all test check clean dep install 32bit 32bit-vars gprof gcov noopt
diff --git a/ext/hiredis-0.14.1/README.md b/ext/hiredis-0.14.1/README.md
deleted file mode 100644
index 50e2e6be6..000000000
--- a/ext/hiredis-0.14.1/README.md
+++ /dev/null
@@ -1,410 +0,0 @@
-[![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis)
-
-**This Readme reflects the latest changed in the master branch. See [v0.14.1](https://github.com/redis/hiredis/tree/v0.14.1) for the Readme and documentation for the latest release.**
-
-# HIREDIS
-
-Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database.
-
-It is minimalistic because it just adds minimal support for the protocol, but
-at the same time it uses a high level printf-alike API in order to make it
-much higher level than otherwise suggested by its minimal code base and the
-lack of explicit bindings for every Redis command.
-
-Apart from supporting sending commands and receiving replies, it comes with
-a reply parser that is decoupled from the I/O layer. It
-is a stream parser designed for easy reusability, which can for instance be used
-in higher level language bindings for efficient reply parsing.
-
-Hiredis only supports the binary-safe Redis protocol, so you can use it with any
-Redis version >= 1.2.0.
-
-The library comes with multiple APIs. There is the
-*synchronous API*, the *asynchronous API* and the *reply parsing API*.
-
-## IMPORTANT: Breaking changes when upgrading from 0.13.x -> 0.14.x
-
-Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
-protocol errors. This is consistent with the RESP specification. On 32-bit
-platforms, the upper bound is lowered to `SIZE_MAX`.
-
-Change `redisReply.len` to `size_t`, as it denotes the the size of a string
-
-User code should compare this to `size_t` values as well.  If it was used to
-compare to other values, casting might be necessary or can be removed, if
-casting was applied before.
-
-For a detailed list of changes please view our [Changelog](CHANGELOG.md).
-
-## Synchronous API
-
-To consume the synchronous API, there are only a few function calls that need to be introduced:
-
-```c
-redisContext *redisConnect(const char *ip, int port);
-void *redisCommand(redisContext *c, const char *format, ...);
-void freeReplyObject(void *reply);
-```
-
-### Connecting
-
-The function `redisConnect` is used to create a so-called `redisContext`. The
-context is where Hiredis holds state for a connection. The `redisContext`
-struct has an integer `err` field that is non-zero when the connection is in
-an error state. The field `errstr` will contain a string with a description of
-the error. More information on errors can be found in the **Errors** section.
-After trying to connect to Redis using `redisConnect` you should
-check the `err` field to see if establishing the connection was successful:
-```c
-redisContext *c = redisConnect("127.0.0.1", 6379);
-if (c == NULL || c->err) {
-    if (c) {
-        printf("Error: %s\n", c->errstr);
-        // handle error
-    } else {
-        printf("Can't allocate redis context\n");
-    }
-}
-```
-
-*Note: A `redisContext` is not thread-safe.*
-
-### Sending commands
-
-There are several ways to issue commands to Redis. The first that will be introduced is
-`redisCommand`. This function takes a format similar to printf. In the simplest form,
-it is used like this:
-```c
-reply = redisCommand(context, "SET foo bar");
-```
-
-The specifier `%s` interpolates a string in the command, and uses `strlen` to
-determine the length of the string:
-```c
-reply = redisCommand(context, "SET foo %s", value);
-```
-When you need to pass binary safe strings in a command, the `%b` specifier can be
-used. Together with a pointer to the string, it requires a `size_t` length argument
-of the string:
-```c
-reply = redisCommand(context, "SET foo %b", value, (size_t) valuelen);
-```
-Internally, Hiredis splits the command in different arguments and will
-convert it to the protocol used to communicate with Redis.
-One or more spaces separates arguments, so you can use the specifiers
-anywhere in an argument:
-```c
-reply = redisCommand(context, "SET key:%s %s", myid, value);
-```
-
-### Using replies
-
-The return value of `redisCommand` holds a reply when the command was
-successfully executed. When an error occurs, the return value is `NULL` and
-the `err` field in the context will be set (see section on **Errors**).
-Once an error is returned the context cannot be reused and you should set up
-a new connection.
-
-The standard replies that `redisCommand` are of the type `redisReply`. The
-`type` field in the `redisReply` should be used to test what kind of reply
-was received:
-
-* **`REDIS_REPLY_STATUS`**:
-    * The command replied with a status reply. The status string can be accessed using `reply->str`.
-      The length of this string can be accessed using `reply->len`.
-
-* **`REDIS_REPLY_ERROR`**:
-    *  The command replied with an error. The error string can be accessed identical to `REDIS_REPLY_STATUS`.
-
-* **`REDIS_REPLY_INTEGER`**:
-    * The command replied with an integer. The integer value can be accessed using the
-      `reply->integer` field of type `long long`.
-
-* **`REDIS_REPLY_NIL`**:
-    * The command replied with a **nil** object. There is no data to access.
-
-* **`REDIS_REPLY_STRING`**:
-    * A bulk (string) reply. The value of the reply can be accessed using `reply->str`.
-      The length of this string can be accessed using `reply->len`.
-
-* **`REDIS_REPLY_ARRAY`**:
-    * A multi bulk reply. The number of elements in the multi bulk reply is stored in
-      `reply->elements`. Every element in the multi bulk reply is a `redisReply` object as well
-      and can be accessed via `reply->element[..index..]`.
-      Redis may reply with nested arrays but this is fully supported.
-
-Replies should be freed using the `freeReplyObject()` function.
-Note that this function will take care of freeing sub-reply objects
-contained in arrays and nested arrays, so there is no need for the user to
-free the sub replies (it is actually harmful and will corrupt the memory).
-
-**Important:** the current version of hiredis (0.10.0) frees replies when the
-asynchronous API is used. This means you should not call `freeReplyObject` when
-you use this API. The reply is cleaned up by hiredis _after_ the callback
-returns. This behavior will probably change in future releases, so make sure to
-keep an eye on the changelog when upgrading (see issue #39).
-
-### Cleaning up
-
-To disconnect and free the context the following function can be used:
-```c
-void redisFree(redisContext *c);
-```
-This function immediately closes the socket and then frees the allocations done in
-creating the context.
-
-### Sending commands (cont'd)
-
-Together with `redisCommand`, the function `redisCommandArgv` can be used to issue commands.
-It has the following prototype:
-```c
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-```
-It takes the number of arguments `argc`, an array of strings `argv` and the lengths of the
-arguments `argvlen`. For convenience, `argvlen` may be set to `NULL` and the function will
-use `strlen(3)` on every argument to determine its length. Obviously, when any of the arguments
-need to be binary safe, the entire array of lengths `argvlen` should be provided.
-
-The return value has the same semantic as `redisCommand`.
-
-### Pipelining
-
-To explain how Hiredis supports pipelining in a blocking connection, there needs to be
-understanding of the internal execution flow.
-
-When any of the functions in the `redisCommand` family is called, Hiredis first formats the
-command according to the Redis protocol. The formatted command is then put in the output buffer
-of the context. This output buffer is dynamic, so it can hold any number of commands.
-After the command is put in the output buffer, `redisGetReply` is called. This function has the
-following two execution paths:
-
-1. The input buffer is non-empty:
-    * Try to parse a single reply from the input buffer and return it
-    * If no reply could be parsed, continue at *2*
-2. The input buffer is empty:
-    * Write the **entire** output buffer to the socket
-    * Read from the socket until a single reply could be parsed
-
-The function `redisGetReply` is exported as part of the Hiredis API and can be used when a reply
-is expected on the socket. To pipeline commands, the only things that needs to be done is
-filling up the output buffer. For this cause, two commands can be used that are identical
-to the `redisCommand` family, apart from not returning a reply:
-```c
-void redisAppendCommand(redisContext *c, const char *format, ...);
-void redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-```
-After calling either function one or more times, `redisGetReply` can be used to receive the
-subsequent replies. The return value for this function is either `REDIS_OK` or `REDIS_ERR`, where
-the latter means an error occurred while reading a reply. Just as with the other commands,
-the `err` field in the context can be used to find out what the cause of this error is.
-
-The following examples shows a simple pipeline (resulting in only a single call to `write(2)` and
-a single call to `read(2)`):
-```c
-redisReply *reply;
-redisAppendCommand(context,"SET foo bar");
-redisAppendCommand(context,"GET foo");
-redisGetReply(context,&reply); // reply for SET
-freeReplyObject(reply);
-redisGetReply(context,&reply); // reply for GET
-freeReplyObject(reply);
-```
-This API can also be used to implement a blocking subscriber:
-```c
-reply = redisCommand(context,"SUBSCRIBE foo");
-freeReplyObject(reply);
-while(redisGetReply(context,&reply) == REDIS_OK) {
-    // consume message
-    freeReplyObject(reply);
-}
-```
-### Errors
-
-When a function call is not successful, depending on the function either `NULL` or `REDIS_ERR` is
-returned. The `err` field inside the context will be non-zero and set to one of the
-following constants:
-
-* **`REDIS_ERR_IO`**:
-    There was an I/O error while creating the connection, trying to write
-    to the socket or read from the socket. If you included `errno.h` in your
-    application, you can use the global `errno` variable to find out what is
-    wrong.
-
-* **`REDIS_ERR_EOF`**:
-    The server closed the connection which resulted in an empty read.
-
-* **`REDIS_ERR_PROTOCOL`**:
-    There was an error while parsing the protocol.
-
-* **`REDIS_ERR_OTHER`**:
-    Any other error. Currently, it is only used when a specified hostname to connect
-    to cannot be resolved.
-
-In every case, the `errstr` field in the context will be set to hold a string representation
-of the error.
-
-## Asynchronous API
-
-Hiredis comes with an asynchronous API that works easily with any event library.
-Examples are bundled that show using Hiredis with [libev](http://software.schmorp.de/pkg/libev.html)
-and [libevent](http://monkey.org/~provos/libevent/).
-
-### Connecting
-
-The function `redisAsyncConnect` can be used to establish a non-blocking connection to
-Redis. It returns a pointer to the newly created `redisAsyncContext` struct. The `err` field
-should be checked after creation to see if there were errors creating the connection.
-Because the connection that will be created is non-blocking, the kernel is not able to
-instantly return if the specified host and port is able to accept a connection.
-
-*Note: A `redisAsyncContext` is not thread-safe.*
-
-```c
-redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-if (c->err) {
-    printf("Error: %s\n", c->errstr);
-    // handle error
-}
-```
-
-The asynchronous context can hold a disconnect callback function that is called when the
-connection is disconnected (either because of an error or per user request). This function should
-have the following prototype:
-```c
-void(const redisAsyncContext *c, int status);
-```
-On a disconnect, the `status` argument is set to `REDIS_OK` when disconnection was initiated by the
-user, or `REDIS_ERR` when the disconnection was caused by an error. When it is `REDIS_ERR`, the `err`
-field in the context can be accessed to find out the cause of the error.
-
-The context object is always freed after the disconnect callback fired. When a reconnect is needed,
-the disconnect callback is a good point to do so.
-
-Setting the disconnect callback can only be done once per context. For subsequent calls it will
-return `REDIS_ERR`. The function to set the disconnect callback has the following prototype:
-```c
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-```
-### Sending commands and their callbacks
-
-In an asynchronous context, commands are automatically pipelined due to the nature of an event loop.
-Therefore, unlike the synchronous API, there is only a single way to send commands.
-Because commands are sent to Redis asynchronously, issuing a command requires a callback function
-that is called when the reply is received. Reply callbacks should have the following prototype:
-```c
-void(redisAsyncContext *c, void *reply, void *privdata);
-```
-The `privdata` argument can be used to curry arbitrary data to the callback from the point where
-the command is initially queued for execution.
-
-The functions that can be used to issue commands in an asynchronous context are:
-```c
-int redisAsyncCommand(
-  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
-  const char *format, ...);
-int redisAsyncCommandArgv(
-  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
-  int argc, const char **argv, const size_t *argvlen);
-```
-Both functions work like their blocking counterparts. The return value is `REDIS_OK` when the command
-was successfully added to the output buffer and `REDIS_ERR` otherwise. Example: when the connection
-is being disconnected per user-request, no new commands may be added to the output buffer and `REDIS_ERR` is
-returned on calls to the `redisAsyncCommand` family.
-
-If the reply for a command with a `NULL` callback is read, it is immediately freed. When the callback
-for a command is non-`NULL`, the memory is freed immediately following the callback: the reply is only
-valid for the duration of the callback.
-
-All pending callbacks are called with a `NULL` reply when the context encountered an error.
-
-### Disconnecting
-
-An asynchronous connection can be terminated using:
-```c
-void redisAsyncDisconnect(redisAsyncContext *ac);
-```
-When this function is called, the connection is **not** immediately terminated. Instead, new
-commands are no longer accepted and the connection is only terminated when all pending commands
-have been written to the socket, their respective replies have been read and their respective
-callbacks have been executed. After this, the disconnection callback is executed with the
-`REDIS_OK` status and the context object is freed.
-
-### Hooking it up to event library *X*
-
-There are a few hooks that need to be set on the context object after it is created.
-See the `adapters/` directory for bindings to *libev* and *libevent*.
-
-## Reply parsing API
-
-Hiredis comes with a reply parsing API that makes it easy for writing higher
-level language bindings.
-
-The reply parsing API consists of the following functions:
-```c
-redisReader *redisReaderCreate(void);
-void redisReaderFree(redisReader *reader);
-int redisReaderFeed(redisReader *reader, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *reader, void **reply);
-```
-The same set of functions are used internally by hiredis when creating a
-normal Redis context, the above API just exposes it to the user for a direct
-usage.
-
-### Usage
-
-The function `redisReaderCreate` creates a `redisReader` structure that holds a
-buffer with unparsed data and state for the protocol parser.
-
-Incoming data -- most likely from a socket -- can be placed in the internal
-buffer of the `redisReader` using `redisReaderFeed`. This function will make a
-copy of the buffer pointed to by `buf` for `len` bytes. This data is parsed
-when `redisReaderGetReply` is called. This function returns an integer status
-and a reply object (as described above) via `void **reply`. The returned status
-can be either `REDIS_OK` or `REDIS_ERR`, where the latter means something went
-wrong (either a protocol error, or an out of memory error).
-
-The parser limits the level of nesting for multi bulk payloads to 7. If the
-multi bulk nesting level is higher than this, the parser returns an error.
-
-### Customizing replies
-
-The function `redisReaderGetReply` creates `redisReply` and makes the function
-argument `reply` point to the created `redisReply` variable. For instance, if
-the response of type `REDIS_REPLY_STATUS` then the `str` field of `redisReply`
-will hold the status as a vanilla C string. However, the functions that are
-responsible for creating instances of the `redisReply` can be customized by
-setting the `fn` field on the `redisReader` struct. This should be done
-immediately after creating the `redisReader`.
-
-For example, [hiredis-rb](https://github.com/pietern/hiredis-rb/blob/master/ext/hiredis_ext/reader.c)
-uses customized reply object functions to create Ruby objects.
-
-### Reader max buffer
-
-Both when using the Reader API directly or when using it indirectly via a
-normal Redis context, the redisReader structure uses a buffer in order to
-accumulate data from the server.
-Usually this buffer is destroyed when it is empty and is larger than 16
-KiB in order to avoid wasting memory in unused buffers
-
-However when working with very big payloads destroying the buffer may slow
-down performances considerably, so it is possible to modify the max size of
-an idle buffer changing the value of the `maxbuf` field of the reader structure
-to the desired value. The special value of 0 means that there is no maximum
-value for an idle buffer, so the buffer will never get freed.
-
-For instance if you have a normal Redis context you can set the maximum idle
-buffer to zero (unlimited) just with:
-```c
-context->reader->maxbuf = 0;
-```
-This should be done only in order to maximize performances when working with
-large payloads. The context should be set back to `REDIS_READER_MAX_BUF` again
-as soon as possible in order to prevent allocation of useless memory.
-
-## AUTHORS
-
-Hiredis was written by Salvatore Sanfilippo (antirez at gmail) and
-Pieter Noordhuis (pcnoordhuis at gmail) and is released under the BSD license.  
-Hiredis is currently maintained by Matt Stancliff (matt at genges dot com) and
-Jan-Erik Rediger (janerik at fnordig dot com)
diff --git a/ext/hiredis-0.14.1/adapters/ae.h b/ext/hiredis-0.14.1/adapters/ae.h
deleted file mode 100644
index 03939928d..000000000
--- a/ext/hiredis-0.14.1/adapters/ae.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_AE_H__
-#define __HIREDIS_AE_H__
-#include <sys/types.h>
-#include <ae.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisAeEvents {
-    redisAsyncContext *context;
-    aeEventLoop *loop;
-    int fd;
-    int reading, writing;
-} redisAeEvents;
-
-static void redisAeReadEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
-    ((void)el); ((void)fd); ((void)mask);
-
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisAeWriteEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
-    ((void)el); ((void)fd); ((void)mask);
-
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisAeAddRead(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (!e->reading) {
-        e->reading = 1;
-        aeCreateFileEvent(loop,e->fd,AE_READABLE,redisAeReadEvent,e);
-    }
-}
-
-static void redisAeDelRead(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (e->reading) {
-        e->reading = 0;
-        aeDeleteFileEvent(loop,e->fd,AE_READABLE);
-    }
-}
-
-static void redisAeAddWrite(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (!e->writing) {
-        e->writing = 1;
-        aeCreateFileEvent(loop,e->fd,AE_WRITABLE,redisAeWriteEvent,e);
-    }
-}
-
-static void redisAeDelWrite(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (e->writing) {
-        e->writing = 0;
-        aeDeleteFileEvent(loop,e->fd,AE_WRITABLE);
-    }
-}
-
-static void redisAeCleanup(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAeDelRead(privdata);
-    redisAeDelWrite(privdata);
-    free(e);
-}
-
-static int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisAeEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisAeEvents*)hi_malloc(sizeof(*e));
-    e->context = ac;
-    e->loop = loop;
-    e->fd = c->fd;
-    e->reading = e->writing = 0;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisAeAddRead;
-    ac->ev.delRead = redisAeDelRead;
-    ac->ev.addWrite = redisAeAddWrite;
-    ac->ev.delWrite = redisAeDelWrite;
-    ac->ev.cleanup = redisAeCleanup;
-    ac->ev.data = e;
-
-    return REDIS_OK;
-}
-#endif
diff --git a/ext/hiredis-0.14.1/adapters/glib.h b/ext/hiredis-0.14.1/adapters/glib.h
deleted file mode 100644
index e0a6411d3..000000000
--- a/ext/hiredis-0.14.1/adapters/glib.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef __HIREDIS_GLIB_H__
-#define __HIREDIS_GLIB_H__
-
-#include <glib.h>
-
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct
-{
-    GSource source;
-    redisAsyncContext *ac;
-    GPollFD poll_fd;
-} RedisSource;
-
-static void
-redis_source_add_read (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-    g_return_if_fail(source);
-    source->poll_fd.events |= G_IO_IN;
-    g_main_context_wakeup(g_source_get_context((GSource *)data));
-}
-
-static void
-redis_source_del_read (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-    g_return_if_fail(source);
-    source->poll_fd.events &= ~G_IO_IN;
-    g_main_context_wakeup(g_source_get_context((GSource *)data));
-}
-
-static void
-redis_source_add_write (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-    g_return_if_fail(source);
-    source->poll_fd.events |= G_IO_OUT;
-    g_main_context_wakeup(g_source_get_context((GSource *)data));
-}
-
-static void
-redis_source_del_write (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-    g_return_if_fail(source);
-    source->poll_fd.events &= ~G_IO_OUT;
-    g_main_context_wakeup(g_source_get_context((GSource *)data));
-}
-
-static void
-redis_source_cleanup (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-
-    g_return_if_fail(source);
-
-    redis_source_del_read(source);
-    redis_source_del_write(source);
-    /*
-     * It is not our responsibility to remove ourself from the
-     * current main loop. However, we will remove the GPollFD.
-     */
-    if (source->poll_fd.fd >= 0) {
-        g_source_remove_poll((GSource *)data, &source->poll_fd);
-        source->poll_fd.fd = -1;
-    }
-}
-
-static gboolean
-redis_source_prepare (GSource *source,
-                      gint    *timeout_)
-{
-    RedisSource *redis = (RedisSource *)source;
-    *timeout_ = -1;
-    return !!(redis->poll_fd.events & redis->poll_fd.revents);
-}
-
-static gboolean
-redis_source_check (GSource *source)
-{
-    RedisSource *redis = (RedisSource *)source;
-    return !!(redis->poll_fd.events & redis->poll_fd.revents);
-}
-
-static gboolean
-redis_source_dispatch (GSource      *source,
-                       GSourceFunc   callback,
-                       gpointer      user_data)
-{
-    RedisSource *redis = (RedisSource *)source;
-
-    if ((redis->poll_fd.revents & G_IO_OUT)) {
-        redisAsyncHandleWrite(redis->ac);
-        redis->poll_fd.revents &= ~G_IO_OUT;
-    }
-
-    if ((redis->poll_fd.revents & G_IO_IN)) {
-        redisAsyncHandleRead(redis->ac);
-        redis->poll_fd.revents &= ~G_IO_IN;
-    }
-
-    if (callback) {
-        return callback(user_data);
-    }
-
-    return TRUE;
-}
-
-static void
-redis_source_finalize (GSource *source)
-{
-    RedisSource *redis = (RedisSource *)source;
-
-    if (redis->poll_fd.fd >= 0) {
-        g_source_remove_poll(source, &redis->poll_fd);
-        redis->poll_fd.fd = -1;
-    }
-}
-
-static GSource *
-redis_source_new (redisAsyncContext *ac)
-{
-    static GSourceFuncs source_funcs = {
-        .prepare  = redis_source_prepare,
-        .check     = redis_source_check,
-        .dispatch = redis_source_dispatch,
-        .finalize = redis_source_finalize,
-    };
-    redisContext *c = &ac->c;
-    RedisSource *source;
-
-    g_return_val_if_fail(ac != NULL, NULL);
-
-    source = (RedisSource *)g_source_new(&source_funcs, sizeof *source);
-    source->ac = ac;
-    source->poll_fd.fd = c->fd;
-    source->poll_fd.events = 0;
-    source->poll_fd.revents = 0;
-    g_source_add_poll((GSource *)source, &source->poll_fd);
-
-    ac->ev.addRead = redis_source_add_read;
-    ac->ev.delRead = redis_source_del_read;
-    ac->ev.addWrite = redis_source_add_write;
-    ac->ev.delWrite = redis_source_del_write;
-    ac->ev.cleanup = redis_source_cleanup;
-    ac->ev.data = source;
-
-    return (GSource *)source;
-}
-
-#endif /* __HIREDIS_GLIB_H__ */
diff --git a/ext/hiredis-0.14.1/adapters/ivykis.h b/ext/hiredis-0.14.1/adapters/ivykis.h
deleted file mode 100644
index 75616ee24..000000000
--- a/ext/hiredis-0.14.1/adapters/ivykis.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef __HIREDIS_IVYKIS_H__
-#define __HIREDIS_IVYKIS_H__
-#include <iv.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisIvykisEvents {
-    redisAsyncContext *context;
-    struct iv_fd fd;
-} redisIvykisEvents;
-
-static void redisIvykisReadEvent(void *arg) {
-    redisAsyncContext *context = (redisAsyncContext *)arg;
-    redisAsyncHandleRead(context);
-}
-
-static void redisIvykisWriteEvent(void *arg) {
-    redisAsyncContext *context = (redisAsyncContext *)arg;
-    redisAsyncHandleWrite(context);
-}
-
-static void redisIvykisAddRead(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-    iv_fd_set_handler_in(&e->fd, redisIvykisReadEvent);
-}
-
-static void redisIvykisDelRead(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-    iv_fd_set_handler_in(&e->fd, NULL);
-}
-
-static void redisIvykisAddWrite(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-    iv_fd_set_handler_out(&e->fd, redisIvykisWriteEvent);
-}
-
-static void redisIvykisDelWrite(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-    iv_fd_set_handler_out(&e->fd, NULL);
-}
-
-static void redisIvykisCleanup(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-
-    iv_fd_unregister(&e->fd);
-    free(e);
-}
-
-static int redisIvykisAttach(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisIvykisEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisIvykisEvents*)hi_malloc(sizeof(*e));
-    e->context = ac;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisIvykisAddRead;
-    ac->ev.delRead = redisIvykisDelRead;
-    ac->ev.addWrite = redisIvykisAddWrite;
-    ac->ev.delWrite = redisIvykisDelWrite;
-    ac->ev.cleanup = redisIvykisCleanup;
-    ac->ev.data = e;
-
-    /* Initialize and install read/write events */
-    IV_FD_INIT(&e->fd);
-    e->fd.fd = c->fd;
-    e->fd.handler_in = redisIvykisReadEvent;
-    e->fd.handler_out = redisIvykisWriteEvent;
-    e->fd.handler_err = NULL;
-    e->fd.cookie = e->context;
-
-    iv_fd_register(&e->fd);
-
-    return REDIS_OK;
-}
-#endif
diff --git a/ext/hiredis-0.14.1/adapters/libev.h b/ext/hiredis-0.14.1/adapters/libev.h
deleted file mode 100644
index abad43634..000000000
--- a/ext/hiredis-0.14.1/adapters/libev.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_LIBEV_H__
-#define __HIREDIS_LIBEV_H__
-#include <stdlib.h>
-#include <sys/types.h>
-#include <ev.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisLibevEvents {
-    redisAsyncContext *context;
-    struct ev_loop *loop;
-    int reading, writing;
-    ev_io rev, wev;
-} redisLibevEvents;
-
-static void redisLibevReadEvent(EV_P_ ev_io *watcher, int revents) {
-#if EV_MULTIPLICITY
-    ((void)loop);
-#endif
-    ((void)revents);
-
-    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisLibevWriteEvent(EV_P_ ev_io *watcher, int revents) {
-#if EV_MULTIPLICITY
-    ((void)loop);
-#endif
-    ((void)revents);
-
-    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisLibevAddRead(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (!e->reading) {
-        e->reading = 1;
-        ev_io_start(EV_A_ &e->rev);
-    }
-}
-
-static void redisLibevDelRead(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (e->reading) {
-        e->reading = 0;
-        ev_io_stop(EV_A_ &e->rev);
-    }
-}
-
-static void redisLibevAddWrite(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (!e->writing) {
-        e->writing = 1;
-        ev_io_start(EV_A_ &e->wev);
-    }
-}
-
-static void redisLibevDelWrite(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (e->writing) {
-        e->writing = 0;
-        ev_io_stop(EV_A_ &e->wev);
-    }
-}
-
-static void redisLibevCleanup(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    redisLibevDelRead(privdata);
-    redisLibevDelWrite(privdata);
-    free(e);
-}
-
-static int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisLibevEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisLibevEvents*)hi_malloc(sizeof(*e));
-    e->context = ac;
-#if EV_MULTIPLICITY
-    e->loop = loop;
-#else
-    e->loop = NULL;
-#endif
-    e->reading = e->writing = 0;
-    e->rev.data = e;
-    e->wev.data = e;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibevAddRead;
-    ac->ev.delRead = redisLibevDelRead;
-    ac->ev.addWrite = redisLibevAddWrite;
-    ac->ev.delWrite = redisLibevDelWrite;
-    ac->ev.cleanup = redisLibevCleanup;
-    ac->ev.data = e;
-
-    /* Initialize read/write events */
-    ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
-    ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
-    return REDIS_OK;
-}
-
-#endif
diff --git a/ext/hiredis-0.14.1/adapters/libevent.h b/ext/hiredis-0.14.1/adapters/libevent.h
deleted file mode 100644
index f2330d6f0..000000000
--- a/ext/hiredis-0.14.1/adapters/libevent.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_LIBEVENT_H__
-#define __HIREDIS_LIBEVENT_H__
-#include <event2/event.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisLibeventEvents {
-    redisAsyncContext *context;
-    struct event *rev, *wev;
-} redisLibeventEvents;
-
-static void redisLibeventReadEvent(int fd, short event, void *arg) {
-    ((void)fd); ((void)event);
-    redisLibeventEvents *e = (redisLibeventEvents*)arg;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisLibeventWriteEvent(int fd, short event, void *arg) {
-    ((void)fd); ((void)event);
-    redisLibeventEvents *e = (redisLibeventEvents*)arg;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisLibeventAddRead(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_add(e->rev,NULL);
-}
-
-static void redisLibeventDelRead(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_del(e->rev);
-}
-
-static void redisLibeventAddWrite(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_add(e->wev,NULL);
-}
-
-static void redisLibeventDelWrite(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_del(e->wev);
-}
-
-static void redisLibeventCleanup(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    event_free(e->rev);
-    event_free(e->wev);
-    free(e);
-}
-
-static int redisLibeventAttach(redisAsyncContext *ac, struct event_base *base) {
-    redisContext *c = &(ac->c);
-    redisLibeventEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisLibeventEvents*)hi_calloc(1, sizeof(*e));
-    e->context = ac;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibeventAddRead;
-    ac->ev.delRead = redisLibeventDelRead;
-    ac->ev.addWrite = redisLibeventAddWrite;
-    ac->ev.delWrite = redisLibeventDelWrite;
-    ac->ev.cleanup = redisLibeventCleanup;
-    ac->ev.data = e;
-
-    /* Initialize and install read/write events */
-    e->rev = event_new(base, c->fd, EV_READ, redisLibeventReadEvent, e);
-    e->wev = event_new(base, c->fd, EV_WRITE, redisLibeventWriteEvent, e);
-    event_add(e->rev, NULL);
-    event_add(e->wev, NULL);
-    return REDIS_OK;
-}
-#endif
diff --git a/ext/hiredis-0.14.1/adapters/libuv.h b/ext/hiredis-0.14.1/adapters/libuv.h
deleted file mode 100644
index ff08c25e1..000000000
--- a/ext/hiredis-0.14.1/adapters/libuv.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#ifndef __HIREDIS_LIBUV_H__
-#define __HIREDIS_LIBUV_H__
-#include <stdlib.h>
-#include <uv.h>
-#include "../hiredis.h"
-#include "../async.h"
-#include <string.h>
-
-typedef struct redisLibuvEvents {
-  redisAsyncContext* context;
-  uv_poll_t          handle;
-  int                events;
-} redisLibuvEvents;
-
-
-static void redisLibuvPoll(uv_poll_t* handle, int status, int events) {
-  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
-
-  if (status != 0) {
-    return;
-  }
-
-  if (p->context != NULL && (events & UV_READABLE)) {
-    redisAsyncHandleRead(p->context);
-  }
-  if (p->context != NULL && (events & UV_WRITABLE)) {
-    redisAsyncHandleWrite(p->context);
-  }
-}
-
-
-static void redisLibuvAddRead(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events |= UV_READABLE;
-
-  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-}
-
-
-static void redisLibuvDelRead(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events &= ~UV_READABLE;
-
-  if (p->events) {
-    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-  } else {
-    uv_poll_stop(&p->handle);
-  }
-}
-
-
-static void redisLibuvAddWrite(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events |= UV_WRITABLE;
-
-  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-}
-
-
-static void redisLibuvDelWrite(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events &= ~UV_WRITABLE;
-
-  if (p->events) {
-    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-  } else {
-    uv_poll_stop(&p->handle);
-  }
-}
-
-
-static void on_close(uv_handle_t* handle) {
-  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
-
-  free(p);
-}
-
-
-static void redisLibuvCleanup(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->context = NULL; // indicate that context might no longer exist
-  uv_close((uv_handle_t*)&p->handle, on_close);
-}
-
-
-static int redisLibuvAttach(redisAsyncContext* ac, uv_loop_t* loop) {
-  redisContext *c = &(ac->c);
-
-  if (ac->ev.data != NULL) {
-    return REDIS_ERR;
-  }
-
-  ac->ev.addRead  = redisLibuvAddRead;
-  ac->ev.delRead  = redisLibuvDelRead;
-  ac->ev.addWrite = redisLibuvAddWrite;
-  ac->ev.delWrite = redisLibuvDelWrite;
-  ac->ev.cleanup  = redisLibuvCleanup;
-
-  redisLibuvEvents* p = (redisLibuvEvents*)malloc(sizeof(*p));
-
-  if (!p) {
-    return REDIS_ERR;
-  }
-
-  memset(p, 0, sizeof(*p));
-
-  if (uv_poll_init(loop, &p->handle, c->fd) != 0) {
-    return REDIS_ERR;
-  }
-
-  ac->ev.data    = p;
-  p->handle.data = p;
-  p->context     = ac;
-
-  return REDIS_OK;
-}
-#endif
diff --git a/ext/hiredis-0.14.1/adapters/macosx.h b/ext/hiredis-0.14.1/adapters/macosx.h
deleted file mode 100644
index 72121f606..000000000
--- a/ext/hiredis-0.14.1/adapters/macosx.h
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-//  Created by Дмитрий Бахвалов on 13.07.15.
-//  Copyright (c) 2015 Dmitry Bakhvalov. All rights reserved.
-//
-
-#ifndef __HIREDIS_MACOSX_H__
-#define __HIREDIS_MACOSX_H__
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct {
-    redisAsyncContext *context;
-    CFSocketRef socketRef;
-    CFRunLoopSourceRef sourceRef;
-} RedisRunLoop;
-
-static int freeRedisRunLoop(RedisRunLoop* redisRunLoop) {
-    if( redisRunLoop != NULL ) {
-        if( redisRunLoop->sourceRef != NULL ) {
-            CFRunLoopSourceInvalidate(redisRunLoop->sourceRef);
-            CFRelease(redisRunLoop->sourceRef);
-        }
-        if( redisRunLoop->socketRef != NULL ) {
-            CFSocketInvalidate(redisRunLoop->socketRef);
-            CFRelease(redisRunLoop->socketRef);
-        }
-        free(redisRunLoop);
-    }
-    return REDIS_ERR;
-}
-
-static void redisMacOSAddRead(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    CFSocketEnableCallBacks(redisRunLoop->socketRef, kCFSocketReadCallBack);
-}
-
-static void redisMacOSDelRead(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    CFSocketDisableCallBacks(redisRunLoop->socketRef, kCFSocketReadCallBack);
-}
-
-static void redisMacOSAddWrite(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    CFSocketEnableCallBacks(redisRunLoop->socketRef, kCFSocketWriteCallBack);
-}
-
-static void redisMacOSDelWrite(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    CFSocketDisableCallBacks(redisRunLoop->socketRef, kCFSocketWriteCallBack);
-}
-
-static void redisMacOSCleanup(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    freeRedisRunLoop(redisRunLoop);
-}
-
-static void redisMacOSAsyncCallback(CFSocketRef __unused s, CFSocketCallBackType callbackType, CFDataRef __unused address, const void __unused *data, void *info) {
-    redisAsyncContext* context = (redisAsyncContext*) info;
-
-    switch (callbackType) {
-        case kCFSocketReadCallBack:
-            redisAsyncHandleRead(context);
-            break;
-
-        case kCFSocketWriteCallBack:
-            redisAsyncHandleWrite(context);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static int redisMacOSAttach(redisAsyncContext *redisAsyncCtx, CFRunLoopRef runLoop) {
-    redisContext *redisCtx = &(redisAsyncCtx->c);
-
-    /* Nothing should be attached when something is already attached */
-    if( redisAsyncCtx->ev.data != NULL ) return REDIS_ERR;
-
-    RedisRunLoop* redisRunLoop = (RedisRunLoop*) calloc(1, sizeof(RedisRunLoop));
-    if( !redisRunLoop ) return REDIS_ERR;
-
-    /* Setup redis stuff */
-    redisRunLoop->context = redisAsyncCtx;
-
-    redisAsyncCtx->ev.addRead  = redisMacOSAddRead;
-    redisAsyncCtx->ev.delRead  = redisMacOSDelRead;
-    redisAsyncCtx->ev.addWrite = redisMacOSAddWrite;
-    redisAsyncCtx->ev.delWrite = redisMacOSDelWrite;
-    redisAsyncCtx->ev.cleanup  = redisMacOSCleanup;
-    redisAsyncCtx->ev.data     = redisRunLoop;
-
-    /* Initialize and install read/write events */
-    CFSocketContext socketCtx = { 0, redisAsyncCtx, NULL, NULL, NULL };
-
-    redisRunLoop->socketRef = CFSocketCreateWithNative(NULL, redisCtx->fd,
-                                                       kCFSocketReadCallBack | kCFSocketWriteCallBack,
-                                                       redisMacOSAsyncCallback,
-                                                       &socketCtx);
-    if( !redisRunLoop->socketRef ) return freeRedisRunLoop(redisRunLoop);
-
-    redisRunLoop->sourceRef = CFSocketCreateRunLoopSource(NULL, redisRunLoop->socketRef, 0);
-    if( !redisRunLoop->sourceRef ) return freeRedisRunLoop(redisRunLoop);
-
-    CFRunLoopAddSource(runLoop, redisRunLoop->sourceRef, kCFRunLoopDefaultMode);
-
-    return REDIS_OK;
-}
-
-#endif
-
diff --git a/ext/hiredis-0.14.1/adapters/qt.h b/ext/hiredis-0.14.1/adapters/qt.h
deleted file mode 100644
index 5cc02e6ce..000000000
--- a/ext/hiredis-0.14.1/adapters/qt.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (C) 2014 Pietro Cerutti <gahr@gahr.ch>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_QT_H__
-#define __HIREDIS_QT_H__
-#include <QSocketNotifier>
-#include "../async.h"
-
-static void RedisQtAddRead(void *);
-static void RedisQtDelRead(void *);
-static void RedisQtAddWrite(void *);
-static void RedisQtDelWrite(void *);
-static void RedisQtCleanup(void *);
-
-class RedisQtAdapter : public QObject {
-
-    Q_OBJECT
-
-    friend
-    void RedisQtAddRead(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->addRead();
-    }
-
-    friend
-    void RedisQtDelRead(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->delRead();
-    }
-
-    friend
-    void RedisQtAddWrite(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->addWrite();
-    }
-
-    friend
-    void RedisQtDelWrite(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->delWrite();
-    }
-
-    friend
-    void RedisQtCleanup(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->cleanup();
-    }
-
-    public:
-        RedisQtAdapter(QObject * parent = 0)
-            : QObject(parent), m_ctx(0), m_read(0), m_write(0) { }
-
-        ~RedisQtAdapter() {
-            if (m_ctx != 0) {
-                m_ctx->ev.data = NULL;
-            }
-        }
-
-        int setContext(redisAsyncContext * ac) {
-            if (ac->ev.data != NULL) {
-                return REDIS_ERR;
-            }
-            m_ctx = ac;
-            m_ctx->ev.data = this;
-            m_ctx->ev.addRead = RedisQtAddRead;
-            m_ctx->ev.delRead = RedisQtDelRead;
-            m_ctx->ev.addWrite = RedisQtAddWrite;
-            m_ctx->ev.delWrite = RedisQtDelWrite;
-            m_ctx->ev.cleanup = RedisQtCleanup;
-            return REDIS_OK;
-        }
-
-    private:
-        void addRead() {
-            if (m_read) return;
-            m_read = new QSocketNotifier(m_ctx->c.fd, QSocketNotifier::Read, 0);
-            connect(m_read, SIGNAL(activated(int)), this, SLOT(read()));
-        }
-
-        void delRead() {
-            if (!m_read) return;
-            delete m_read;
-            m_read = 0;
-        }
-
-        void addWrite() {
-            if (m_write) return;
-            m_write = new QSocketNotifier(m_ctx->c.fd, QSocketNotifier::Write, 0);
-            connect(m_write, SIGNAL(activated(int)), this, SLOT(write()));
-        }
-
-        void delWrite() {
-            if (!m_write) return;
-            delete m_write;
-            m_write = 0;
-        }
-
-        void cleanup() {
-            delRead();
-            delWrite();
-        }
-
-    private slots:
-        void read() { redisAsyncHandleRead(m_ctx); }
-        void write() { redisAsyncHandleWrite(m_ctx); }
-
-    private:
-        redisAsyncContext * m_ctx;
-        QSocketNotifier * m_read;
-        QSocketNotifier * m_write;
-};
-
-#endif /* !__HIREDIS_QT_H__ */
diff --git a/ext/hiredis-0.14.1/alloc.c b/ext/hiredis-0.14.1/alloc.c
deleted file mode 100644
index 55c3020e7..000000000
--- a/ext/hiredis-0.14.1/alloc.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <string.h>
-
-void *hi_malloc(size_t size) {
-    void *ptr = malloc(size);
-    if (ptr == NULL)
-        HIREDIS_OOM_HANDLER;
-
-    return ptr;
-}
-
-void *hi_calloc(size_t nmemb, size_t size) {
-    void *ptr = calloc(nmemb, size);
-    if (ptr == NULL)
-        HIREDIS_OOM_HANDLER;
-
-    return ptr;
-}
-
-void *hi_realloc(void *ptr, size_t size) {
-    void *newptr = realloc(ptr, size);
-    if (newptr == NULL)
-        HIREDIS_OOM_HANDLER;
-
-    return newptr;
-}
-
-char *hi_strdup(const char *str) {
-    char *newstr = strdup(str);
-    if (newstr == NULL)
-        HIREDIS_OOM_HANDLER;
-
-    return newstr;
-}
diff --git a/ext/hiredis-0.14.1/alloc.h b/ext/hiredis-0.14.1/alloc.h
deleted file mode 100644
index 2c9b04e35..000000000
--- a/ext/hiredis-0.14.1/alloc.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef HIREDIS_ALLOC_H
-#define HIREDIS_ALLOC_H
-
-#include <stdlib.h> /* for size_t */
-
-#ifndef HIREDIS_OOM_HANDLER
-#define HIREDIS_OOM_HANDLER abort()
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *hi_malloc(size_t size);
-void *hi_calloc(size_t nmemb, size_t size);
-void *hi_realloc(void *ptr, size_t size);
-char *hi_strdup(const char *str);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* HIREDIS_ALLOC_H */
diff --git a/ext/hiredis-0.14.1/appveyor.yml b/ext/hiredis-0.14.1/appveyor.yml
deleted file mode 100644
index 819efbd58..000000000
--- a/ext/hiredis-0.14.1/appveyor.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Appveyor configuration file for CI build of hiredis on Windows (under Cygwin)
-environment:
-    matrix:
-        - CYG_BASH: C:\cygwin64\bin\bash
-          CC: gcc
-        - CYG_BASH: C:\cygwin\bin\bash
-          CC: gcc
-          TARGET: 32bit
-          TARGET_VARS: 32bit-vars
-
-clone_depth: 1
-
-# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
-init:
-    - git config --global core.autocrlf input
-
-# Install needed build dependencies
-install:
-    - '%CYG_BASH% -lc "cygcheck -dc cygwin"'
-
-build_script:
-    - 'echo building...'
-    - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make LDFLAGS=$LDFLAGS CC=$CC $TARGET CFLAGS=$CFLAGS && make LDFLAGS=$LDFLAGS CC=$CC $TARGET_VARS hiredis-example"'
diff --git a/ext/hiredis-0.14.1/async.c b/ext/hiredis-0.14.1/async.c
deleted file mode 100644
index 0018e3743..000000000
--- a/ext/hiredis-0.14.1/async.c
+++ /dev/null
@@ -1,717 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include "async.h"
-#include "net.h"
-#include "dict.c"
-#include "sds.h"
-
-#define _EL_ADD_READ(ctx) do { \
-        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_DEL_READ(ctx) do { \
-        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_ADD_WRITE(ctx) do { \
-        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_DEL_WRITE(ctx) do { \
-        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_CLEANUP(ctx) do { \
-        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
-    } while(0);
-
-/* Forward declaration of function in hiredis.c */
-int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
-
-/* Functions managing dictionary of callbacks for pub/sub. */
-static unsigned int callbackHash(const void *key) {
-    return dictGenHashFunction((const unsigned char *)key,
-                               sdslen((const sds)key));
-}
-
-static void *callbackValDup(void *privdata, const void *src) {
-    ((void) privdata);
-    redisCallback *dup = hi_malloc(sizeof(*dup));
-    memcpy(dup,src,sizeof(*dup));
-    return dup;
-}
-
-static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
-    int l1, l2;
-    ((void) privdata);
-
-    l1 = sdslen((const sds)key1);
-    l2 = sdslen((const sds)key2);
-    if (l1 != l2) return 0;
-    return memcmp(key1,key2,l1) == 0;
-}
-
-static void callbackKeyDestructor(void *privdata, void *key) {
-    ((void) privdata);
-    sdsfree((sds)key);
-}
-
-static void callbackValDestructor(void *privdata, void *val) {
-    ((void) privdata);
-    free(val);
-}
-
-static dictType callbackDict = {
-    callbackHash,
-    NULL,
-    callbackValDup,
-    callbackKeyCompare,
-    callbackKeyDestructor,
-    callbackValDestructor
-};
-
-static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
-    redisAsyncContext *ac;
-
-    ac = realloc(c,sizeof(redisAsyncContext));
-    if (ac == NULL)
-        return NULL;
-
-    c = &(ac->c);
-
-    /* The regular connect functions will always set the flag REDIS_CONNECTED.
-     * For the async API, we want to wait until the first write event is
-     * received up before setting this flag, so reset it here. */
-    c->flags &= ~REDIS_CONNECTED;
-
-    ac->err = 0;
-    ac->errstr = NULL;
-    ac->data = NULL;
-
-    ac->ev.data = NULL;
-    ac->ev.addRead = NULL;
-    ac->ev.delRead = NULL;
-    ac->ev.addWrite = NULL;
-    ac->ev.delWrite = NULL;
-    ac->ev.cleanup = NULL;
-
-    ac->onConnect = NULL;
-    ac->onDisconnect = NULL;
-
-    ac->replies.head = NULL;
-    ac->replies.tail = NULL;
-    ac->sub.invalid.head = NULL;
-    ac->sub.invalid.tail = NULL;
-    ac->sub.channels = dictCreate(&callbackDict,NULL);
-    ac->sub.patterns = dictCreate(&callbackDict,NULL);
-    return ac;
-}
-
-/* We want the error field to be accessible directly instead of requiring
- * an indirection to the redisContext struct. */
-static void __redisAsyncCopyError(redisAsyncContext *ac) {
-    if (!ac)
-        return;
-
-    redisContext *c = &(ac->c);
-    ac->err = c->err;
-    ac->errstr = c->errstr;
-}
-
-redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
-    redisContext *c;
-    redisAsyncContext *ac;
-
-    c = redisConnectNonBlock(ip,port);
-    if (c == NULL)
-        return NULL;
-
-    ac = redisAsyncInitialize(c);
-    if (ac == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
-                                         const char *source_addr) {
-    redisContext *c = redisConnectBindNonBlock(ip,port,source_addr);
-    redisAsyncContext *ac = redisAsyncInitialize(c);
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr) {
-    redisContext *c = redisConnectBindNonBlockWithReuse(ip,port,source_addr);
-    redisAsyncContext *ac = redisAsyncInitialize(c);
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-redisAsyncContext *redisAsyncConnectUnix(const char *path) {
-    redisContext *c;
-    redisAsyncContext *ac;
-
-    c = redisConnectUnixNonBlock(path);
-    if (c == NULL)
-        return NULL;
-
-    ac = redisAsyncInitialize(c);
-    if (ac == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
-    if (ac->onConnect == NULL) {
-        ac->onConnect = fn;
-
-        /* The common way to detect an established connection is to wait for
-         * the first write event to be fired. This assumes the related event
-         * library functions are already set. */
-        _EL_ADD_WRITE(ac);
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn) {
-    if (ac->onDisconnect == NULL) {
-        ac->onDisconnect = fn;
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-/* Helper functions to push/shift callbacks */
-static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
-    redisCallback *cb;
-
-    /* Copy callback from stack to heap */
-    cb = malloc(sizeof(*cb));
-    if (cb == NULL)
-        return REDIS_ERR_OOM;
-
-    if (source != NULL) {
-        memcpy(cb,source,sizeof(*cb));
-        cb->next = NULL;
-    }
-
-    /* Store callback in list */
-    if (list->head == NULL)
-        list->head = cb;
-    if (list->tail != NULL)
-        list->tail->next = cb;
-    list->tail = cb;
-    return REDIS_OK;
-}
-
-static int __redisShiftCallback(redisCallbackList *list, redisCallback *target) {
-    redisCallback *cb = list->head;
-    if (cb != NULL) {
-        list->head = cb->next;
-        if (cb == list->tail)
-            list->tail = NULL;
-
-        /* Copy callback from heap to stack */
-        if (target != NULL)
-            memcpy(target,cb,sizeof(*cb));
-        free(cb);
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
-    redisContext *c = &(ac->c);
-    if (cb->fn != NULL) {
-        c->flags |= REDIS_IN_CALLBACK;
-        cb->fn(ac,reply,cb->privdata);
-        c->flags &= ~REDIS_IN_CALLBACK;
-    }
-}
-
-/* Helper function to free the context. */
-static void __redisAsyncFree(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-    dictIterator *it;
-    dictEntry *de;
-
-    /* Execute pending callbacks with NULL reply. */
-    while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
-        __redisRunCallback(ac,&cb,NULL);
-
-    /* Execute callbacks for invalid commands */
-    while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
-        __redisRunCallback(ac,&cb,NULL);
-
-    /* Run subscription callbacks callbacks with NULL reply */
-    it = dictGetIterator(ac->sub.channels);
-    while ((de = dictNext(it)) != NULL)
-        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-    dictReleaseIterator(it);
-    dictRelease(ac->sub.channels);
-
-    it = dictGetIterator(ac->sub.patterns);
-    while ((de = dictNext(it)) != NULL)
-        __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-    dictReleaseIterator(it);
-    dictRelease(ac->sub.patterns);
-
-    /* Signal event lib to clean up */
-    _EL_CLEANUP(ac);
-
-    /* Execute disconnect callback. When redisAsyncFree() initiated destroying
-     * this context, the status will always be REDIS_OK. */
-    if (ac->onDisconnect && (c->flags & REDIS_CONNECTED)) {
-        if (c->flags & REDIS_FREEING) {
-            ac->onDisconnect(ac,REDIS_OK);
-        } else {
-            ac->onDisconnect(ac,(ac->err == 0) ? REDIS_OK : REDIS_ERR);
-        }
-    }
-
-    /* Cleanup self */
-    redisFree(c);
-}
-
-/* Free the async context. When this function is called from a callback,
- * control needs to be returned to redisProcessCallbacks() before actual
- * free'ing. To do so, a flag is set on the context which is picked up by
- * redisProcessCallbacks(). Otherwise, the context is immediately free'd. */
-void redisAsyncFree(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    c->flags |= REDIS_FREEING;
-    if (!(c->flags & REDIS_IN_CALLBACK))
-        __redisAsyncFree(ac);
-}
-
-/* Helper function to make the disconnect happen and clean up. */
-static void __redisAsyncDisconnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    /* Make sure error is accessible if there is any */
-    __redisAsyncCopyError(ac);
-
-    if (ac->err == 0) {
-        /* For clean disconnects, there should be no pending callbacks. */
-        int ret = __redisShiftCallback(&ac->replies,NULL);
-        assert(ret == REDIS_ERR);
-    } else {
-        /* Disconnection is caused by an error, make sure that pending
-         * callbacks cannot call new commands. */
-        c->flags |= REDIS_DISCONNECTING;
-    }
-
-    /* For non-clean disconnects, __redisAsyncFree() will execute pending
-     * callbacks with a NULL-reply. */
-    __redisAsyncFree(ac);
-}
-
-/* Tries to do a clean disconnect from Redis, meaning it stops new commands
- * from being issued, but tries to flush the output buffer and execute
- * callbacks for all remaining replies. When this function is called from a
- * callback, there might be more replies and we can safely defer disconnecting
- * to redisProcessCallbacks(). Otherwise, we can only disconnect immediately
- * when there are no pending callbacks. */
-void redisAsyncDisconnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    c->flags |= REDIS_DISCONNECTING;
-    if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
-        __redisAsyncDisconnect(ac);
-}
-
-static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
-    redisContext *c = &(ac->c);
-    dict *callbacks;
-    redisCallback *cb;
-    dictEntry *de;
-    int pvariant;
-    char *stype;
-    sds sname;
-
-    /* Custom reply functions are not supported for pub/sub. This will fail
-     * very hard when they are used... */
-    if (reply->type == REDIS_REPLY_ARRAY) {
-        assert(reply->elements >= 2);
-        assert(reply->element[0]->type == REDIS_REPLY_STRING);
-        stype = reply->element[0]->str;
-        pvariant = (tolower(stype[0]) == 'p') ? 1 : 0;
-
-        if (pvariant)
-            callbacks = ac->sub.patterns;
-        else
-            callbacks = ac->sub.channels;
-
-        /* Locate the right callback */
-        assert(reply->element[1]->type == REDIS_REPLY_STRING);
-        sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len);
-        de = dictFind(callbacks,sname);
-        if (de != NULL) {
-            cb = dictGetEntryVal(de);
-
-            /* If this is an subscribe reply decrease pending counter. */
-            if (strcasecmp(stype+pvariant,"subscribe") == 0) {
-                cb->pending_subs -= 1;
-            }
-
-            memcpy(dstcb,cb,sizeof(*dstcb));
-
-            /* If this is an unsubscribe message, remove it. */
-            if (strcasecmp(stype+pvariant,"unsubscribe") == 0) {
-                if (cb->pending_subs == 0)
-                    dictDelete(callbacks,sname);
-
-                /* If this was the last unsubscribe message, revert to
-                 * non-subscribe mode. */
-                assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
-
-                /* Unset subscribed flag only when no pipelined pending subscribe. */
-                if (reply->element[2]->integer == 0 
-                    && dictSize(ac->sub.channels) == 0
-                    && dictSize(ac->sub.patterns) == 0)
-                    c->flags &= ~REDIS_SUBSCRIBED;
-            }
-        }
-        sdsfree(sname);
-    } else {
-        /* Shift callback for invalid commands. */
-        __redisShiftCallback(&ac->sub.invalid,dstcb);
-    }
-    return REDIS_OK;
-}
-
-void redisProcessCallbacks(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb = {NULL, NULL, 0, NULL};
-    void *reply = NULL;
-    int status;
-
-    while((status = redisGetReply(c,&reply)) == REDIS_OK) {
-        if (reply == NULL) {
-            /* When the connection is being disconnected and there are
-             * no more replies, this is the cue to really disconnect. */
-            if (c->flags & REDIS_DISCONNECTING && sdslen(c->obuf) == 0
-                && ac->replies.head == NULL) {
-                __redisAsyncDisconnect(ac);
-                return;
-            }
-
-            /* If monitor mode, repush callback */
-            if(c->flags & REDIS_MONITORING) {
-                __redisPushCallback(&ac->replies,&cb);
-            }
-
-            /* When the connection is not being disconnected, simply stop
-             * trying to get replies and wait for the next loop tick. */
-            break;
-        }
-
-        /* Even if the context is subscribed, pending regular callbacks will
-         * get a reply before pub/sub messages arrive. */
-        if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
-            /*
-             * A spontaneous reply in a not-subscribed context can be the error
-             * reply that is sent when a new connection exceeds the maximum
-             * number of allowed connections on the server side.
-             *
-             * This is seen as an error instead of a regular reply because the
-             * server closes the connection after sending it.
-             *
-             * To prevent the error from being overwritten by an EOF error the
-             * connection is closed here. See issue #43.
-             *
-             * Another possibility is that the server is loading its dataset.
-             * In this case we also want to close the connection, and have the
-             * user wait until the server is ready to take our request.
-             */
-            if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
-                c->err = REDIS_ERR_OTHER;
-                snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
-                c->reader->fn->freeObject(reply);
-                __redisAsyncDisconnect(ac);
-                return;
-            }
-            /* No more regular callbacks and no errors, the context *must* be subscribed or monitoring. */
-            assert((c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING));
-            if(c->flags & REDIS_SUBSCRIBED)
-                __redisGetSubscribeCallback(ac,reply,&cb);
-        }
-
-        if (cb.fn != NULL) {
-            __redisRunCallback(ac,&cb,reply);
-            c->reader->fn->freeObject(reply);
-
-            /* Proceed with free'ing when redisAsyncFree() was called. */
-            if (c->flags & REDIS_FREEING) {
-                __redisAsyncFree(ac);
-                return;
-            }
-        } else {
-            /* No callback for this reply. This can either be a NULL callback,
-             * or there were no callbacks to begin with. Either way, don't
-             * abort with an error, but simply ignore it because the client
-             * doesn't know what the server will spit out over the wire. */
-            c->reader->fn->freeObject(reply);
-        }
-    }
-
-    /* Disconnect when there was an error reading the reply */
-    if (status != REDIS_OK)
-        __redisAsyncDisconnect(ac);
-}
-
-/* Internal helper function to detect socket status the first time a read or
- * write event fires. When connecting was not successful, the connect callback
- * is called with a REDIS_ERR status and the context is free'd. */
-static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (redisCheckSocketError(c) == REDIS_ERR) {
-        /* Try again later when connect(2) is still in progress. */
-        if (errno == EINPROGRESS)
-            return REDIS_OK;
-
-        if (ac->onConnect) ac->onConnect(ac,REDIS_ERR);
-        __redisAsyncDisconnect(ac);
-        return REDIS_ERR;
-    }
-
-    /* Mark context as connected. */
-    c->flags |= REDIS_CONNECTED;
-    if (ac->onConnect) ac->onConnect(ac,REDIS_OK);
-    return REDIS_OK;
-}
-
-/* This function should be called when the socket is readable.
- * It processes all replies that can be read and executes their callbacks.
- */
-void redisAsyncHandleRead(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
-    if (redisBufferRead(c) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Always re-schedule reads */
-        _EL_ADD_READ(ac);
-        redisProcessCallbacks(ac);
-    }
-}
-
-void redisAsyncHandleWrite(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    int done = 0;
-
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
-    if (redisBufferWrite(c,&done) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Continue writing when not done, stop writing otherwise */
-        if (!done)
-            _EL_ADD_WRITE(ac);
-        else
-            _EL_DEL_WRITE(ac);
-
-        /* Always schedule reads after writes */
-        _EL_ADD_READ(ac);
-    }
-}
-
-/* Sets a pointer to the first argument and its length starting at p. Returns
- * the number of bytes to skip to get to the following argument. */
-static const char *nextArgument(const char *start, const char **str, size_t *len) {
-    const char *p = start;
-    if (p[0] != '$') {
-        p = strchr(p,'$');
-        if (p == NULL) return NULL;
-    }
-
-    *len = (int)strtol(p+1,NULL,10);
-    p = strchr(p,'\r');
-    assert(p);
-    *str = p+2;
-    return p+2+(*len)+2;
-}
-
-/* Helper function for the redisAsyncCommand* family of functions. Writes a
- * formatted command to the output buffer and registers the provided callback
- * function with the context. */
-static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-    struct dict *cbdict;
-    dictEntry *de;
-    redisCallback *existcb;
-    int pvariant, hasnext;
-    const char *cstr, *astr;
-    size_t clen, alen;
-    const char *p;
-    sds sname;
-    int ret;
-
-    /* Don't accept new commands when the connection is about to be closed. */
-    if (c->flags & (REDIS_DISCONNECTING | REDIS_FREEING)) return REDIS_ERR;
-
-    /* Setup callback */
-    cb.fn = fn;
-    cb.privdata = privdata;
-    cb.pending_subs = 1;
-
-    /* Find out which command will be appended. */
-    p = nextArgument(cmd,&cstr,&clen);
-    assert(p != NULL);
-    hasnext = (p[0] == '$');
-    pvariant = (tolower(cstr[0]) == 'p') ? 1 : 0;
-    cstr += pvariant;
-    clen -= pvariant;
-
-    if (hasnext && strncasecmp(cstr,"subscribe\r\n",11) == 0) {
-        c->flags |= REDIS_SUBSCRIBED;
-
-        /* Add every channel/pattern to the list of subscription callbacks. */
-        while ((p = nextArgument(p,&astr,&alen)) != NULL) {
-            sname = sdsnewlen(astr,alen);
-            if (pvariant)
-                cbdict = ac->sub.patterns;
-            else
-                cbdict = ac->sub.channels;
-
-            de = dictFind(cbdict,sname);
-
-            if (de != NULL) {
-                existcb = dictGetEntryVal(de);
-                cb.pending_subs = existcb->pending_subs + 1;
-            }
-
-            ret = dictReplace(cbdict,sname,&cb);
-
-            if (ret == 0) sdsfree(sname);
-        }
-    } else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
-        /* It is only useful to call (P)UNSUBSCRIBE when the context is
-         * subscribed to one or more channels or patterns. */
-        if (!(c->flags & REDIS_SUBSCRIBED)) return REDIS_ERR;
-
-        /* (P)UNSUBSCRIBE does not have its own response: every channel or
-         * pattern that is unsubscribed will receive a message. This means we
-         * should not append a callback function for this command. */
-     } else if(strncasecmp(cstr,"monitor\r\n",9) == 0) {
-         /* Set monitor flag and push callback */
-         c->flags |= REDIS_MONITORING;
-         __redisPushCallback(&ac->replies,&cb);
-    } else {
-        if (c->flags & REDIS_SUBSCRIBED)
-            /* This will likely result in an error reply, but it needs to be
-             * received and passed to the callback. */
-            __redisPushCallback(&ac->sub.invalid,&cb);
-        else
-            __redisPushCallback(&ac->replies,&cb);
-    }
-
-    __redisAppendCommand(c,cmd,len);
-
-    /* Always schedule a write when the write buffer is non-empty */
-    _EL_ADD_WRITE(ac);
-
-    return REDIS_OK;
-}
-
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
-    char *cmd;
-    int len;
-    int status;
-    len = redisvFormatCommand(&cmd,format,ap);
-
-    /* We don't want to pass -1 or -2 to future functions as a length. */
-    if (len < 0)
-        return REDIS_ERR;
-
-    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    free(cmd);
-    return status;
-}
-
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...) {
-    va_list ap;
-    int status;
-    va_start(ap,format);
-    status = redisvAsyncCommand(ac,fn,privdata,format,ap);
-    va_end(ap);
-    return status;
-}
-
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
-    sds cmd;
-    int len;
-    int status;
-    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
-    if (len < 0)
-        return REDIS_ERR;
-    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    sdsfree(cmd);
-    return status;
-}
-
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
-    int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    return status;
-}
diff --git a/ext/hiredis-0.14.1/async.h b/ext/hiredis-0.14.1/async.h
deleted file mode 100644
index e69d84090..000000000
--- a/ext/hiredis-0.14.1/async.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_H
-#define __HIREDIS_ASYNC_H
-#include "hiredis.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
-struct dict; /* dictionary header is included in async.c */
-
-/* Reply callback prototype and container */
-typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
-typedef struct redisCallback {
-    struct redisCallback *next; /* simple singly linked list */
-    redisCallbackFn *fn;
-    int pending_subs;
-    void *privdata;
-} redisCallback;
-
-/* List of callbacks for either regular replies or pub/sub */
-typedef struct redisCallbackList {
-    redisCallback *head, *tail;
-} redisCallbackList;
-
-/* Connection callback prototypes */
-typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
-typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
-
-/* Context for an async connection to Redis */
-typedef struct redisAsyncContext {
-    /* Hold the regular context, so it can be realloc'ed. */
-    redisContext c;
-
-    /* Setup error flags so they can be used directly. */
-    int err;
-    char *errstr;
-
-    /* Not used by hiredis */
-    void *data;
-
-    /* Event library data and hooks */
-    struct {
-        void *data;
-
-        /* Hooks that are called when the library expects to start
-         * reading/writing. These functions should be idempotent. */
-        void (*addRead)(void *privdata);
-        void (*delRead)(void *privdata);
-        void (*addWrite)(void *privdata);
-        void (*delWrite)(void *privdata);
-        void (*cleanup)(void *privdata);
-    } ev;
-
-    /* Called when either the connection is terminated due to an error or per
-     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
-    redisDisconnectCallback *onDisconnect;
-
-    /* Called when the first write event was received. */
-    redisConnectCallback *onConnect;
-
-    /* Regular command callbacks */
-    redisCallbackList replies;
-
-    /* Subscription callbacks */
-    struct {
-        redisCallbackList invalid;
-        struct dict *channels;
-        struct dict *patterns;
-    } sub;
-} redisAsyncContext;
-
-/* Functions that proxy to hiredis */
-redisAsyncContext *redisAsyncConnect(const char *ip, int port);
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr);
-redisAsyncContext *redisAsyncConnectUnix(const char *path);
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-void redisAsyncDisconnect(redisAsyncContext *ac);
-void redisAsyncFree(redisAsyncContext *ac);
-
-/* Handle read/write events */
-void redisAsyncHandleRead(redisAsyncContext *ac);
-void redisAsyncHandleWrite(redisAsyncContext *ac);
-
-/* Command functions for an async context. Write the command to the
- * output buffer and register the provided callback. */
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/dict.c b/ext/hiredis-0.14.1/dict.c
deleted file mode 100644
index 29cdc190f..000000000
--- a/ext/hiredis-0.14.1/dict.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <limits.h>
-#include "dict.h"
-
-/* -------------------------- private prototypes ---------------------------- */
-
-static int _dictExpandIfNeeded(dict *ht);
-static unsigned long _dictNextPower(unsigned long size);
-static int _dictKeyIndex(dict *ht, const void *key);
-static int _dictInit(dict *ht, dictType *type, void *privDataPtr);
-
-/* -------------------------- hash functions -------------------------------- */
-
-/* Generic hash function (a popular one from Bernstein).
- * I tested a few and this was the best. */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len) {
-    unsigned int hash = 5381;
-
-    while (len--)
-        hash = ((hash << 5) + hash) + (*buf++); /* hash * 33 + c */
-    return hash;
-}
-
-/* ----------------------------- API implementation ------------------------- */
-
-/* Reset an hashtable already initialized with ht_init().
- * NOTE: This function should only called by ht_destroy(). */
-static void _dictReset(dict *ht) {
-    ht->table = NULL;
-    ht->size = 0;
-    ht->sizemask = 0;
-    ht->used = 0;
-}
-
-/* Create a new hash table */
-static dict *dictCreate(dictType *type, void *privDataPtr) {
-    dict *ht = hi_malloc(sizeof(*ht));
-    _dictInit(ht,type,privDataPtr);
-    return ht;
-}
-
-/* Initialize the hash table */
-static int _dictInit(dict *ht, dictType *type, void *privDataPtr) {
-    _dictReset(ht);
-    ht->type = type;
-    ht->privdata = privDataPtr;
-    return DICT_OK;
-}
-
-/* Expand or create the hashtable */
-static int dictExpand(dict *ht, unsigned long size) {
-    dict n; /* the new hashtable */
-    unsigned long realsize = _dictNextPower(size), i;
-
-    /* the size is invalid if it is smaller than the number of
-     * elements already inside the hashtable */
-    if (ht->used > size)
-        return DICT_ERR;
-
-    _dictInit(&n, ht->type, ht->privdata);
-    n.size = realsize;
-    n.sizemask = realsize-1;
-    n.table = calloc(realsize,sizeof(dictEntry*));
-
-    /* Copy all the elements from the old to the new table:
-     * note that if the old hash table is empty ht->size is zero,
-     * so dictExpand just creates an hash table. */
-    n.used = ht->used;
-    for (i = 0; i < ht->size && ht->used > 0; i++) {
-        dictEntry *he, *nextHe;
-
-        if (ht->table[i] == NULL) continue;
-
-        /* For each hash entry on this slot... */
-        he = ht->table[i];
-        while(he) {
-            unsigned int h;
-
-            nextHe = he->next;
-            /* Get the new element index */
-            h = dictHashKey(ht, he->key) & n.sizemask;
-            he->next = n.table[h];
-            n.table[h] = he;
-            ht->used--;
-            /* Pass to the next element */
-            he = nextHe;
-        }
-    }
-    assert(ht->used == 0);
-    free(ht->table);
-
-    /* Remap the new hashtable in the old */
-    *ht = n;
-    return DICT_OK;
-}
-
-/* Add an element to the target hash table */
-static int dictAdd(dict *ht, void *key, void *val) {
-    int index;
-    dictEntry *entry;
-
-    /* Get the index of the new element, or -1 if
-     * the element already exists. */
-    if ((index = _dictKeyIndex(ht, key)) == -1)
-        return DICT_ERR;
-
-    /* Allocates the memory and stores key */
-    entry = hi_malloc(sizeof(*entry));
-    entry->next = ht->table[index];
-    ht->table[index] = entry;
-
-    /* Set the hash entry fields. */
-    dictSetHashKey(ht, entry, key);
-    dictSetHashVal(ht, entry, val);
-    ht->used++;
-    return DICT_OK;
-}
-
-/* Add an element, discarding the old if the key already exists.
- * Return 1 if the key was added from scratch, 0 if there was already an
- * element with such key and dictReplace() just performed a value update
- * operation. */
-static int dictReplace(dict *ht, void *key, void *val) {
-    dictEntry *entry, auxentry;
-
-    /* Try to add the element. If the key
-     * does not exists dictAdd will succeed. */
-    if (dictAdd(ht, key, val) == DICT_OK)
-        return 1;
-    /* It already exists, get the entry */
-    entry = dictFind(ht, key);
-    /* Free the old value and set the new one */
-    /* Set the new value and free the old one. Note that it is important
-     * to do that in this order, as the value may just be exactly the same
-     * as the previous one. In this context, think to reference counting,
-     * you want to increment (set), and then decrement (free), and not the
-     * reverse. */
-    auxentry = *entry;
-    dictSetHashVal(ht, entry, val);
-    dictFreeEntryVal(ht, &auxentry);
-    return 0;
-}
-
-/* Search and remove an element */
-static int dictDelete(dict *ht, const void *key) {
-    unsigned int h;
-    dictEntry *de, *prevde;
-
-    if (ht->size == 0)
-        return DICT_ERR;
-    h = dictHashKey(ht, key) & ht->sizemask;
-    de = ht->table[h];
-
-    prevde = NULL;
-    while(de) {
-        if (dictCompareHashKeys(ht,key,de->key)) {
-            /* Unlink the element from the list */
-            if (prevde)
-                prevde->next = de->next;
-            else
-                ht->table[h] = de->next;
-
-            dictFreeEntryKey(ht,de);
-            dictFreeEntryVal(ht,de);
-            free(de);
-            ht->used--;
-            return DICT_OK;
-        }
-        prevde = de;
-        de = de->next;
-    }
-    return DICT_ERR; /* not found */
-}
-
-/* Destroy an entire hash table */
-static int _dictClear(dict *ht) {
-    unsigned long i;
-
-    /* Free all the elements */
-    for (i = 0; i < ht->size && ht->used > 0; i++) {
-        dictEntry *he, *nextHe;
-
-        if ((he = ht->table[i]) == NULL) continue;
-        while(he) {
-            nextHe = he->next;
-            dictFreeEntryKey(ht, he);
-            dictFreeEntryVal(ht, he);
-            free(he);
-            ht->used--;
-            he = nextHe;
-        }
-    }
-    /* Free the table and the allocated cache structure */
-    free(ht->table);
-    /* Re-initialize the table */
-    _dictReset(ht);
-    return DICT_OK; /* never fails */
-}
-
-/* Clear & Release the hash table */
-static void dictRelease(dict *ht) {
-    _dictClear(ht);
-    free(ht);
-}
-
-static dictEntry *dictFind(dict *ht, const void *key) {
-    dictEntry *he;
-    unsigned int h;
-
-    if (ht->size == 0) return NULL;
-    h = dictHashKey(ht, key) & ht->sizemask;
-    he = ht->table[h];
-    while(he) {
-        if (dictCompareHashKeys(ht, key, he->key))
-            return he;
-        he = he->next;
-    }
-    return NULL;
-}
-
-static dictIterator *dictGetIterator(dict *ht) {
-    dictIterator *iter = hi_malloc(sizeof(*iter));
-
-    iter->ht = ht;
-    iter->index = -1;
-    iter->entry = NULL;
-    iter->nextEntry = NULL;
-    return iter;
-}
-
-static dictEntry *dictNext(dictIterator *iter) {
-    while (1) {
-        if (iter->entry == NULL) {
-            iter->index++;
-            if (iter->index >=
-                    (signed)iter->ht->size) break;
-            iter->entry = iter->ht->table[iter->index];
-        } else {
-            iter->entry = iter->nextEntry;
-        }
-        if (iter->entry) {
-            /* We need to save the 'next' here, the iterator user
-             * may delete the entry we are returning. */
-            iter->nextEntry = iter->entry->next;
-            return iter->entry;
-        }
-    }
-    return NULL;
-}
-
-static void dictReleaseIterator(dictIterator *iter) {
-    free(iter);
-}
-
-/* ------------------------- private functions ------------------------------ */
-
-/* Expand the hash table if needed */
-static int _dictExpandIfNeeded(dict *ht) {
-    /* If the hash table is empty expand it to the initial size,
-     * if the table is "full" dobule its size. */
-    if (ht->size == 0)
-        return dictExpand(ht, DICT_HT_INITIAL_SIZE);
-    if (ht->used == ht->size)
-        return dictExpand(ht, ht->size*2);
-    return DICT_OK;
-}
-
-/* Our hash table capability is a power of two */
-static unsigned long _dictNextPower(unsigned long size) {
-    unsigned long i = DICT_HT_INITIAL_SIZE;
-
-    if (size >= LONG_MAX) return LONG_MAX;
-    while(1) {
-        if (i >= size)
-            return i;
-        i *= 2;
-    }
-}
-
-/* Returns the index of a free slot that can be populated with
- * an hash entry for the given 'key'.
- * If the key already exists, -1 is returned. */
-static int _dictKeyIndex(dict *ht, const void *key) {
-    unsigned int h;
-    dictEntry *he;
-
-    /* Expand the hashtable if needed */
-    if (_dictExpandIfNeeded(ht) == DICT_ERR)
-        return -1;
-    /* Compute the key hash value */
-    h = dictHashKey(ht, key) & ht->sizemask;
-    /* Search if this slot does not already contain the given key */
-    he = ht->table[h];
-    while(he) {
-        if (dictCompareHashKeys(ht, key, he->key))
-            return -1;
-        he = he->next;
-    }
-    return h;
-}
-
diff --git a/ext/hiredis-0.14.1/dict.h b/ext/hiredis-0.14.1/dict.h
deleted file mode 100644
index 95fcd280e..000000000
--- a/ext/hiredis-0.14.1/dict.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __DICT_H
-#define __DICT_H
-
-#define DICT_OK 0
-#define DICT_ERR 1
-
-/* Unused arguments generate annoying warnings... */
-#define DICT_NOTUSED(V) ((void) V)
-
-typedef struct dictEntry {
-    void *key;
-    void *val;
-    struct dictEntry *next;
-} dictEntry;
-
-typedef struct dictType {
-    unsigned int (*hashFunction)(const void *key);
-    void *(*keyDup)(void *privdata, const void *key);
-    void *(*valDup)(void *privdata, const void *obj);
-    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
-    void (*keyDestructor)(void *privdata, void *key);
-    void (*valDestructor)(void *privdata, void *obj);
-} dictType;
-
-typedef struct dict {
-    dictEntry **table;
-    dictType *type;
-    unsigned long size;
-    unsigned long sizemask;
-    unsigned long used;
-    void *privdata;
-} dict;
-
-typedef struct dictIterator {
-    dict *ht;
-    int index;
-    dictEntry *entry, *nextEntry;
-} dictIterator;
-
-/* This is the initial size of every hash table */
-#define DICT_HT_INITIAL_SIZE     4
-
-/* ------------------------------- Macros ------------------------------------*/
-#define dictFreeEntryVal(ht, entry) \
-    if ((ht)->type->valDestructor) \
-        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
-
-#define dictSetHashVal(ht, entry, _val_) do { \
-    if ((ht)->type->valDup) \
-        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
-    else \
-        entry->val = (_val_); \
-} while(0)
-
-#define dictFreeEntryKey(ht, entry) \
-    if ((ht)->type->keyDestructor) \
-        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
-
-#define dictSetHashKey(ht, entry, _key_) do { \
-    if ((ht)->type->keyDup) \
-        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
-    else \
-        entry->key = (_key_); \
-} while(0)
-
-#define dictCompareHashKeys(ht, key1, key2) \
-    (((ht)->type->keyCompare) ? \
-        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
-        (key1) == (key2))
-
-#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
-
-#define dictGetEntryKey(he) ((he)->key)
-#define dictGetEntryVal(he) ((he)->val)
-#define dictSlots(ht) ((ht)->size)
-#define dictSize(ht) ((ht)->used)
-
-/* API */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
-static dict *dictCreate(dictType *type, void *privDataPtr);
-static int dictExpand(dict *ht, unsigned long size);
-static int dictAdd(dict *ht, void *key, void *val);
-static int dictReplace(dict *ht, void *key, void *val);
-static int dictDelete(dict *ht, const void *key);
-static void dictRelease(dict *ht);
-static dictEntry * dictFind(dict *ht, const void *key);
-static dictIterator *dictGetIterator(dict *ht);
-static dictEntry *dictNext(dictIterator *iter);
-static void dictReleaseIterator(dictIterator *iter);
-
-#endif /* __DICT_H */
diff --git a/ext/hiredis-0.14.1/examples/example-ae.c b/ext/hiredis-0.14.1/examples/example-ae.c
deleted file mode 100644
index 8efa7306a..000000000
--- a/ext/hiredis-0.14.1/examples/example-ae.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/ae.h>
-
-/* Put event loop in the global scope, so it can be explicitly stopped */
-static aeEventLoop *loop;
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        aeStop(loop);
-        return;
-    }
-
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        aeStop(loop);
-        return;
-    }
-
-    printf("Disconnected...\n");
-    aeStop(loop);
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    loop = aeCreateEventLoop(64);
-    redisAeAttach(loop, c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    aeMain(loop);
-    return 0;
-}
-
diff --git a/ext/hiredis-0.14.1/examples/example-glib.c b/ext/hiredis-0.14.1/examples/example-glib.c
deleted file mode 100644
index d6e10f8e8..000000000
--- a/ext/hiredis-0.14.1/examples/example-glib.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include <stdlib.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/glib.h>
-
-static GMainLoop *mainloop;
-
-static void
-connect_cb (const redisAsyncContext *ac G_GNUC_UNUSED,
-            int status)
-{
-    if (status != REDIS_OK) {
-        g_printerr("Failed to connect: %s\n", ac->errstr);
-        g_main_loop_quit(mainloop);
-    } else {
-        g_printerr("Connected...\n");
-    }
-}
-
-static void
-disconnect_cb (const redisAsyncContext *ac G_GNUC_UNUSED,
-               int status)
-{
-    if (status != REDIS_OK) {
-        g_error("Failed to disconnect: %s", ac->errstr);
-    } else {
-        g_printerr("Disconnected...\n");
-        g_main_loop_quit(mainloop);
-    }
-}
-
-static void
-command_cb(redisAsyncContext *ac,
-           gpointer r,
-           gpointer user_data G_GNUC_UNUSED)
-{
-    redisReply *reply = r;
-
-    if (reply) {
-        g_print("REPLY: %s\n", reply->str);
-    }
-
-    redisAsyncDisconnect(ac);
-}
-
-gint
-main (gint argc     G_GNUC_UNUSED,
-      gchar *argv[] G_GNUC_UNUSED)
-{
-    redisAsyncContext *ac;
-    GMainContext *context = NULL;
-    GSource *source;
-
-    ac = redisAsyncConnect("127.0.0.1", 6379);
-    if (ac->err) {
-        g_printerr("%s\n", ac->errstr);
-        exit(EXIT_FAILURE);
-    }
-
-    source = redis_source_new(ac);
-    mainloop = g_main_loop_new(context, FALSE);
-    g_source_attach(source, context);
-
-    redisAsyncSetConnectCallback(ac, connect_cb);
-    redisAsyncSetDisconnectCallback(ac, disconnect_cb);
-    redisAsyncCommand(ac, command_cb, NULL, "SET key 1234");
-    redisAsyncCommand(ac, command_cb, NULL, "GET key");
-
-    g_main_loop_run(mainloop);
-
-    return EXIT_SUCCESS;
-}
diff --git a/ext/hiredis-0.14.1/examples/example-ivykis.c b/ext/hiredis-0.14.1/examples/example-ivykis.c
deleted file mode 100644
index 67affcef3..000000000
--- a/ext/hiredis-0.14.1/examples/example-ivykis.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/ivykis.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    iv_init();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisIvykisAttach(c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-
-    iv_main();
-
-    iv_deinit();
-
-    return 0;
-}
diff --git a/ext/hiredis-0.14.1/examples/example-libev.c b/ext/hiredis-0.14.1/examples/example-libev.c
deleted file mode 100644
index cc8b166ec..000000000
--- a/ext/hiredis-0.14.1/examples/example-libev.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libev.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibevAttach(EV_DEFAULT_ c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    ev_loop(EV_DEFAULT_ 0);
-    return 0;
-}
diff --git a/ext/hiredis-0.14.1/examples/example-libevent.c b/ext/hiredis-0.14.1/examples/example-libevent.c
deleted file mode 100644
index d333c22b7..000000000
--- a/ext/hiredis-0.14.1/examples/example-libevent.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libevent.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-    struct event_base *base = event_base_new();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibeventAttach(c,base);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    event_base_dispatch(base);
-    return 0;
-}
diff --git a/ext/hiredis-0.14.1/examples/example-libuv.c b/ext/hiredis-0.14.1/examples/example-libuv.c
deleted file mode 100644
index a5462d410..000000000
--- a/ext/hiredis-0.14.1/examples/example-libuv.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libuv.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-    uv_loop_t* loop = uv_default_loop();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibuvAttach(c,loop);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    uv_run(loop, UV_RUN_DEFAULT);
-    return 0;
-}
diff --git a/ext/hiredis-0.14.1/examples/example-macosx.c b/ext/hiredis-0.14.1/examples/example-macosx.c
deleted file mode 100644
index bc84ed5ba..000000000
--- a/ext/hiredis-0.14.1/examples/example-macosx.c
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//  Created by Дмитрий Бахвалов on 13.07.15.
-//  Copyright (c) 2015 Dmitry Bakhvalov. All rights reserved.
-//
-
-#include <stdio.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/macosx.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    CFRunLoopStop(CFRunLoopGetCurrent());
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    CFRunLoopRef loop = CFRunLoopGetCurrent();
-    if( !loop ) {
-        printf("Error: Cannot get current run loop\n");
-        return 1;
-    }
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisMacOSAttach(c, loop);
-
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-
-    CFRunLoopRun();
-
-    return 0;
-}
-
diff --git a/ext/hiredis-0.14.1/examples/example-qt.cpp b/ext/hiredis-0.14.1/examples/example-qt.cpp
deleted file mode 100644
index f524c3f3d..000000000
--- a/ext/hiredis-0.14.1/examples/example-qt.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <iostream>
-using namespace std;
-
-#include <QCoreApplication>
-#include <QTimer>
-
-#include "example-qt.h"
-
-void getCallback(redisAsyncContext *, void * r, void * privdata) {
-
-    redisReply * reply = static_cast<redisReply *>(r);
-    ExampleQt * ex = static_cast<ExampleQt *>(privdata);
-    if (reply == nullptr || ex == nullptr) return;
-
-    cout << "key: " << reply->str << endl;
-
-    ex->finish();
-}
-
-void ExampleQt::run() {
-
-    m_ctx = redisAsyncConnect("localhost", 6379);
-
-    if (m_ctx->err) {
-        cerr << "Error: " << m_ctx->errstr << endl;
-        redisAsyncFree(m_ctx);
-        emit finished();
-    }
-
-    m_adapter.setContext(m_ctx);
-
-    redisAsyncCommand(m_ctx, NULL, NULL, "SET key %s", m_value);
-    redisAsyncCommand(m_ctx, getCallback, this, "GET key");
-}
-
-int main (int argc, char **argv) {
-
-    QCoreApplication app(argc, argv);
-
-    ExampleQt example(argv[argc-1]);
-
-    QObject::connect(&example, SIGNAL(finished()), &app, SLOT(quit()));
-    QTimer::singleShot(0, &example, SLOT(run()));
-
-    return app.exec();
-}
diff --git a/ext/hiredis-0.14.1/examples/example-qt.h b/ext/hiredis-0.14.1/examples/example-qt.h
deleted file mode 100644
index 374f47666..000000000
--- a/ext/hiredis-0.14.1/examples/example-qt.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __HIREDIS_EXAMPLE_QT_H
-#define __HIREDIS_EXAMPLE_QT_H
-
-#include <adapters/qt.h>
-
-class ExampleQt : public QObject {
-
-    Q_OBJECT
-
-    public:
-        ExampleQt(const char * value, QObject * parent = 0)
-            : QObject(parent), m_value(value) {}
-
-    signals:
-        void finished();
-
-    public slots:
-        void run();
-
-    private:
-        void finish() { emit finished(); }
-
-    private:
-        const char * m_value;
-        redisAsyncContext * m_ctx;
-        RedisQtAdapter m_adapter;
-
-    friend
-    void getCallback(redisAsyncContext *, void *, void *);
-};
-
-#endif /* !__HIREDIS_EXAMPLE_QT_H */
diff --git a/ext/hiredis-0.14.1/examples/example.c b/ext/hiredis-0.14.1/examples/example.c
deleted file mode 100644
index 4d494c55a..000000000
--- a/ext/hiredis-0.14.1/examples/example.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <hiredis.h>
-
-int main(int argc, char **argv) {
-    unsigned int j;
-    redisContext *c;
-    redisReply *reply;
-    const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
-    int port = (argc > 2) ? atoi(argv[2]) : 6379;
-
-    struct timeval timeout = { 1, 500000 }; // 1.5 seconds
-    c = redisConnectWithTimeout(hostname, port, timeout);
-    if (c == NULL || c->err) {
-        if (c) {
-            printf("Connection error: %s\n", c->errstr);
-            redisFree(c);
-        } else {
-            printf("Connection error: can't allocate redis context\n");
-        }
-        exit(1);
-    }
-
-    /* PING server */
-    reply = redisCommand(c,"PING");
-    printf("PING: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key */
-    reply = redisCommand(c,"SET %s %s", "foo", "hello world");
-    printf("SET: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key using binary safe API */
-    reply = redisCommand(c,"SET %b %b", "bar", (size_t) 3, "hello", (size_t) 5);
-    printf("SET (binary API): %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Try a GET and two INCR */
-    reply = redisCommand(c,"GET foo");
-    printf("GET foo: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-    /* again ... */
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-
-    /* Create a list of numbers, from 0 to 9 */
-    reply = redisCommand(c,"DEL mylist");
-    freeReplyObject(reply);
-    for (j = 0; j < 10; j++) {
-        char buf[64];
-
-        snprintf(buf,64,"%u",j);
-        reply = redisCommand(c,"LPUSH mylist element-%s", buf);
-        freeReplyObject(reply);
-    }
-
-    /* Let's check what we have inside the list */
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    if (reply->type == REDIS_REPLY_ARRAY) {
-        for (j = 0; j < reply->elements; j++) {
-            printf("%u) %s\n", j, reply->element[j]->str);
-        }
-    }
-    freeReplyObject(reply);
-
-    /* Disconnects and frees the context */
-    redisFree(c);
-
-    return 0;
-}
diff --git a/ext/hiredis-0.14.1/fmacros.h b/ext/hiredis-0.14.1/fmacros.h
deleted file mode 100644
index 3227faafd..000000000
--- a/ext/hiredis-0.14.1/fmacros.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __HIREDIS_FMACRO_H
-#define __HIREDIS_FMACRO_H
-
-#define _XOPEN_SOURCE 600
-#define _POSIX_C_SOURCE 200112L
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* Enable TCP_KEEPALIVE */
-#define _DARWIN_C_SOURCE
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/hiredis.c b/ext/hiredis-0.14.1/hiredis.c
deleted file mode 100644
index 98f43c993..000000000
--- a/ext/hiredis-0.14.1/hiredis.c
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include "hiredis.h"
-#include "net.h"
-#include "sds.h"
-
-static redisReply *createReplyObject(int type);
-static void *createStringObject(const redisReadTask *task, char *str, size_t len);
-static void *createArrayObject(const redisReadTask *task, int elements);
-static void *createIntegerObject(const redisReadTask *task, long long value);
-static void *createNilObject(const redisReadTask *task);
-
-/* Default set of functions to build the reply. Keep in mind that such a
- * function returning NULL is interpreted as OOM. */
-static redisReplyObjectFunctions defaultFunctions = {
-    createStringObject,
-    createArrayObject,
-    createIntegerObject,
-    createNilObject,
-    freeReplyObject
-};
-
-/* Create a reply object */
-static redisReply *createReplyObject(int type) {
-    redisReply *r = calloc(1,sizeof(*r));
-
-    if (r == NULL)
-        return NULL;
-
-    r->type = type;
-    return r;
-}
-
-/* Free a reply object */
-void freeReplyObject(void *reply) {
-    redisReply *r = reply;
-    size_t j;
-
-    if (r == NULL)
-        return;
-
-    switch(r->type) {
-    case REDIS_REPLY_INTEGER:
-        break; /* Nothing to free */
-    case REDIS_REPLY_ARRAY:
-        if (r->element != NULL) {
-            for (j = 0; j < r->elements; j++)
-                freeReplyObject(r->element[j]);
-            free(r->element);
-        }
-        break;
-    case REDIS_REPLY_ERROR:
-    case REDIS_REPLY_STATUS:
-    case REDIS_REPLY_STRING:
-        free(r->str);
-        break;
-    }
-    free(r);
-}
-
-static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
-    redisReply *r, *parent;
-    char *buf;
-
-    r = createReplyObject(task->type);
-    if (r == NULL)
-        return NULL;
-
-    buf = malloc(len+1);
-    if (buf == NULL) {
-        freeReplyObject(r);
-        return NULL;
-    }
-
-    assert(task->type == REDIS_REPLY_ERROR  ||
-           task->type == REDIS_REPLY_STATUS ||
-           task->type == REDIS_REPLY_STRING);
-
-    /* Copy string value */
-    memcpy(buf,str,len);
-    buf[len] = '\0';
-    r->str = buf;
-    r->len = len;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createArrayObject(const redisReadTask *task, int elements) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_ARRAY);
-    if (r == NULL)
-        return NULL;
-
-    if (elements > 0) {
-        r->element = calloc(elements,sizeof(redisReply*));
-        if (r->element == NULL) {
-            freeReplyObject(r);
-            return NULL;
-        }
-    }
-
-    r->elements = elements;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createIntegerObject(const redisReadTask *task, long long value) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_INTEGER);
-    if (r == NULL)
-        return NULL;
-
-    r->integer = value;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createNilObject(const redisReadTask *task) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_NIL);
-    if (r == NULL)
-        return NULL;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-/* Return the number of digits of 'v' when converted to string in radix 10.
- * Implementation borrowed from link in redis/src/util.c:string2ll(). */
-static uint32_t countDigits(uint64_t v) {
-  uint32_t result = 1;
-  for (;;) {
-    if (v < 10) return result;
-    if (v < 100) return result + 1;
-    if (v < 1000) return result + 2;
-    if (v < 10000) return result + 3;
-    v /= 10000U;
-    result += 4;
-  }
-}
-
-/* Helper that calculates the bulk length given a certain string length. */
-static size_t bulklen(size_t len) {
-    return 1+countDigits(len)+2+len+2;
-}
-
-int redisvFormatCommand(char **target, const char *format, va_list ap) {
-    const char *c = format;
-    char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
-    sds curarg, newarg; /* current argument */
-    int touched = 0; /* was the current argument touched? */
-    char **curargv = NULL, **newargv = NULL;
-    int argc = 0;
-    int totlen = 0;
-    int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
-    int j;
-
-    /* Abort if there is not target to set */
-    if (target == NULL)
-        return -1;
-
-    /* Build the command string accordingly to protocol */
-    curarg = sdsempty();
-    if (curarg == NULL)
-        return -1;
-
-    while(*c != '\0') {
-        if (*c != '%' || c[1] == '\0') {
-            if (*c == ' ') {
-                if (touched) {
-                    newargv = realloc(curargv,sizeof(char*)*(argc+1));
-                    if (newargv == NULL) goto memory_err;
-                    curargv = newargv;
-                    curargv[argc++] = curarg;
-                    totlen += bulklen(sdslen(curarg));
-
-                    /* curarg is put in argv so it can be overwritten. */
-                    curarg = sdsempty();
-                    if (curarg == NULL) goto memory_err;
-                    touched = 0;
-                }
-            } else {
-                newarg = sdscatlen(curarg,c,1);
-                if (newarg == NULL) goto memory_err;
-                curarg = newarg;
-                touched = 1;
-            }
-        } else {
-            char *arg;
-            size_t size;
-
-            /* Set newarg so it can be checked even if it is not touched. */
-            newarg = curarg;
-
-            switch(c[1]) {
-            case 's':
-                arg = va_arg(ap,char*);
-                size = strlen(arg);
-                if (size > 0)
-                    newarg = sdscatlen(curarg,arg,size);
-                break;
-            case 'b':
-                arg = va_arg(ap,char*);
-                size = va_arg(ap,size_t);
-                if (size > 0)
-                    newarg = sdscatlen(curarg,arg,size);
-                break;
-            case '%':
-                newarg = sdscat(curarg,"%");
-                break;
-            default:
-                /* Try to detect printf format */
-                {
-                    static const char intfmts[] = "diouxX";
-                    static const char flags[] = "#0-+ ";
-                    char _format[16];
-                    const char *_p = c+1;
-                    size_t _l = 0;
-                    va_list _cpy;
-
-                    /* Flags */
-                    while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
-
-                    /* Field width */
-                    while (*_p != '\0' && isdigit(*_p)) _p++;
-
-                    /* Precision */
-                    if (*_p == '.') {
-                        _p++;
-                        while (*_p != '\0' && isdigit(*_p)) _p++;
-                    }
-
-                    /* Copy va_list before consuming with va_arg */
-                    va_copy(_cpy,ap);
-
-                    /* Integer conversion (without modifiers) */
-                    if (strchr(intfmts,*_p) != NULL) {
-                        va_arg(ap,int);
-                        goto fmt_valid;
-                    }
-
-                    /* Double conversion (without modifiers) */
-                    if (strchr("eEfFgGaA",*_p) != NULL) {
-                        va_arg(ap,double);
-                        goto fmt_valid;
-                    }
-
-                    /* Size: char */
-                    if (_p[0] == 'h' && _p[1] == 'h') {
-                        _p += 2;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,int); /* char gets promoted to int */
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: short */
-                    if (_p[0] == 'h') {
-                        _p += 1;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,int); /* short gets promoted to int */
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: long long */
-                    if (_p[0] == 'l' && _p[1] == 'l') {
-                        _p += 2;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,long long);
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: long */
-                    if (_p[0] == 'l') {
-                        _p += 1;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,long);
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                fmt_invalid:
-                    va_end(_cpy);
-                    goto format_err;
-
-                fmt_valid:
-                    _l = (_p+1)-c;
-                    if (_l < sizeof(_format)-2) {
-                        memcpy(_format,c,_l);
-                        _format[_l] = '\0';
-                        newarg = sdscatvprintf(curarg,_format,_cpy);
-
-                        /* Update current position (note: outer blocks
-                         * increment c twice so compensate here) */
-                        c = _p-1;
-                    }
-
-                    va_end(_cpy);
-                    break;
-                }
-            }
-
-            if (newarg == NULL) goto memory_err;
-            curarg = newarg;
-
-            touched = 1;
-            c++;
-        }
-        c++;
-    }
-
-    /* Add the last argument if needed */
-    if (touched) {
-        newargv = realloc(curargv,sizeof(char*)*(argc+1));
-        if (newargv == NULL) goto memory_err;
-        curargv = newargv;
-        curargv[argc++] = curarg;
-        totlen += bulklen(sdslen(curarg));
-    } else {
-        sdsfree(curarg);
-    }
-
-    /* Clear curarg because it was put in curargv or was free'd. */
-    curarg = NULL;
-
-    /* Add bytes needed to hold multi bulk count */
-    totlen += 1+countDigits(argc)+2;
-
-    /* Build the command at protocol level */
-    cmd = malloc(totlen+1);
-    if (cmd == NULL) goto memory_err;
-
-    pos = sprintf(cmd,"*%d\r\n",argc);
-    for (j = 0; j < argc; j++) {
-        pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j]));
-        memcpy(cmd+pos,curargv[j],sdslen(curargv[j]));
-        pos += sdslen(curargv[j]);
-        sdsfree(curargv[j]);
-        cmd[pos++] = '\r';
-        cmd[pos++] = '\n';
-    }
-    assert(pos == totlen);
-    cmd[pos] = '\0';
-
-    free(curargv);
-    *target = cmd;
-    return totlen;
-
-format_err:
-    error_type = -2;
-    goto cleanup;
-
-memory_err:
-    error_type = -1;
-    goto cleanup;
-
-cleanup:
-    if (curargv) {
-        while(argc--)
-            sdsfree(curargv[argc]);
-        free(curargv);
-    }
-
-    sdsfree(curarg);
-    free(cmd);
-
-    return error_type;
-}
-
-/* Format a command according to the Redis protocol. This function
- * takes a format similar to printf:
- *
- * %s represents a C null terminated string you want to interpolate
- * %b represents a binary safe string
- *
- * When using %b you need to provide both the pointer to the string
- * and the length in bytes as a size_t. Examples:
- *
- * len = redisFormatCommand(target, "GET %s", mykey);
- * len = redisFormatCommand(target, "SET %s %b", mykey, myval, myvallen);
- */
-int redisFormatCommand(char **target, const char *format, ...) {
-    va_list ap;
-    int len;
-    va_start(ap,format);
-    len = redisvFormatCommand(target,format,ap);
-    va_end(ap);
-
-    /* The API says "-1" means bad result, but we now also return "-2" in some
-     * cases.  Force the return value to always be -1. */
-    if (len < 0)
-        len = -1;
-
-    return len;
-}
-
-/* Format a command according to the Redis protocol using an sds string and
- * sdscatfmt for the processing of arguments. This function takes the
- * number of arguments, an array with arguments and an array with their
- * lengths. If the latter is set to NULL, strlen will be used to compute the
- * argument lengths.
- */
-int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
-                              const size_t *argvlen)
-{
-    sds cmd;
-    unsigned long long totlen;
-    int j;
-    size_t len;
-
-    /* Abort on a NULL target */
-    if (target == NULL)
-        return -1;
-
-    /* Calculate our total size */
-    totlen = 1+countDigits(argc)+2;
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        totlen += bulklen(len);
-    }
-
-    /* Use an SDS string for command construction */
-    cmd = sdsempty();
-    if (cmd == NULL)
-        return -1;
-
-    /* We already know how much storage we need */
-    cmd = sdsMakeRoomFor(cmd, totlen);
-    if (cmd == NULL)
-        return -1;
-
-    /* Construct command */
-    cmd = sdscatfmt(cmd, "*%i\r\n", argc);
-    for (j=0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        cmd = sdscatfmt(cmd, "$%u\r\n", len);
-        cmd = sdscatlen(cmd, argv[j], len);
-        cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
-    }
-
-    assert(sdslen(cmd)==totlen);
-
-    *target = cmd;
-    return totlen;
-}
-
-void redisFreeSdsCommand(sds cmd) {
-    sdsfree(cmd);
-}
-
-/* Format a command according to the Redis protocol. This function takes the
- * number of arguments, an array with arguments and an array with their
- * lengths. If the latter is set to NULL, strlen will be used to compute the
- * argument lengths.
- */
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
-    char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
-    size_t len;
-    int totlen, j;
-
-    /* Abort on a NULL target */
-    if (target == NULL)
-        return -1;
-
-    /* Calculate number of bytes needed for the command */
-    totlen = 1+countDigits(argc)+2;
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        totlen += bulklen(len);
-    }
-
-    /* Build the command at protocol level */
-    cmd = malloc(totlen+1);
-    if (cmd == NULL)
-        return -1;
-
-    pos = sprintf(cmd,"*%d\r\n",argc);
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        pos += sprintf(cmd+pos,"$%zu\r\n",len);
-        memcpy(cmd+pos,argv[j],len);
-        pos += len;
-        cmd[pos++] = '\r';
-        cmd[pos++] = '\n';
-    }
-    assert(pos == totlen);
-    cmd[pos] = '\0';
-
-    *target = cmd;
-    return totlen;
-}
-
-void redisFreeCommand(char *cmd) {
-    free(cmd);
-}
-
-void __redisSetError(redisContext *c, int type, const char *str) {
-    size_t len;
-
-    c->err = type;
-    if (str != NULL) {
-        len = strlen(str);
-        len = len < (sizeof(c->errstr)-1) ? len : (sizeof(c->errstr)-1);
-        memcpy(c->errstr,str,len);
-        c->errstr[len] = '\0';
-    } else {
-        /* Only REDIS_ERR_IO may lack a description! */
-        assert(type == REDIS_ERR_IO);
-        strerror_r(errno, c->errstr, sizeof(c->errstr));
-    }
-}
-
-redisReader *redisReaderCreate(void) {
-    return redisReaderCreateWithFunctions(&defaultFunctions);
-}
-
-static redisContext *redisContextInit(void) {
-    redisContext *c;
-
-    c = calloc(1,sizeof(redisContext));
-    if (c == NULL)
-        return NULL;
-
-    c->obuf = sdsempty();
-    c->reader = redisReaderCreate();
-
-    if (c->obuf == NULL || c->reader == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    return c;
-}
-
-void redisFree(redisContext *c) {
-    if (c == NULL)
-        return;
-    if (c->fd > 0)
-        close(c->fd);
-    sdsfree(c->obuf);
-    redisReaderFree(c->reader);
-    free(c->tcp.host);
-    free(c->tcp.source_addr);
-    free(c->unix_sock.path);
-    free(c->timeout);
-    free(c);
-}
-
-int redisFreeKeepFd(redisContext *c) {
-    int fd = c->fd;
-    c->fd = -1;
-    redisFree(c);
-    return fd;
-}
-
-int redisReconnect(redisContext *c) {
-    c->err = 0;
-    memset(c->errstr, '\0', strlen(c->errstr));
-
-    if (c->fd > 0) {
-        close(c->fd);
-    }
-
-    sdsfree(c->obuf);
-    redisReaderFree(c->reader);
-
-    c->obuf = sdsempty();
-    c->reader = redisReaderCreate();
-
-    if (c->connection_type == REDIS_CONN_TCP) {
-        return redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
-                c->timeout, c->tcp.source_addr);
-    } else if (c->connection_type == REDIS_CONN_UNIX) {
-        return redisContextConnectUnix(c, c->unix_sock.path, c->timeout);
-    } else {
-        /* Something bad happened here and shouldn't have. There isn't
-           enough information in the context to reconnect. */
-        __redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
-    }
-
-    return REDIS_ERR;
-}
-
-/* Connect to a Redis instance. On error the field error in the returned
- * context will be set to the return value of the error function.
- * When no set of reply functions is given, the default set will be used. */
-redisContext *redisConnect(const char *ip, int port) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,NULL);
-    return c;
-}
-
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,&tv);
-    return c;
-}
-
-redisContext *redisConnectNonBlock(const char *ip, int port) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectTcp(c,ip,port,NULL);
-    return c;
-}
-
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr) {
-    redisContext *c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
-    return c;
-}
-
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr) {
-    redisContext *c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-    c->flags &= ~REDIS_BLOCK;
-    c->flags |= REDIS_REUSEADDR;
-    redisContextConnectBindTcp(c,ip,port,NULL,source_addr);
-    return c;
-}
-
-redisContext *redisConnectUnix(const char *path) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectUnix(c,path,NULL);
-    return c;
-}
-
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags |= REDIS_BLOCK;
-    redisContextConnectUnix(c,path,&tv);
-    return c;
-}
-
-redisContext *redisConnectUnixNonBlock(const char *path) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->flags &= ~REDIS_BLOCK;
-    redisContextConnectUnix(c,path,NULL);
-    return c;
-}
-
-redisContext *redisConnectFd(int fd) {
-    redisContext *c;
-
-    c = redisContextInit();
-    if (c == NULL)
-        return NULL;
-
-    c->fd = fd;
-    c->flags |= REDIS_BLOCK | REDIS_CONNECTED;
-    return c;
-}
-
-/* Set read/write timeout on a blocking socket. */
-int redisSetTimeout(redisContext *c, const struct timeval tv) {
-    if (c->flags & REDIS_BLOCK)
-        return redisContextSetTimeout(c,tv);
-    return REDIS_ERR;
-}
-
-/* Enable connection KeepAlive. */
-int redisEnableKeepAlive(redisContext *c) {
-    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
-        return REDIS_ERR;
-    return REDIS_OK;
-}
-
-/* Use this function to handle a read event on the descriptor. It will try
- * and read some bytes from the socket and feed them to the reply parser.
- *
- * After this function is called, you may use redisContextReadReply to
- * see if there is a reply available. */
-int redisBufferRead(redisContext *c) {
-    char buf[1024*16];
-    int nread;
-
-    /* Return early when the context has seen an error. */
-    if (c->err)
-        return REDIS_ERR;
-
-    nread = read(c->fd,buf,sizeof(buf));
-    if (nread == -1) {
-        if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-            /* Try again later */
-        } else {
-            __redisSetError(c,REDIS_ERR_IO,NULL);
-            return REDIS_ERR;
-        }
-    } else if (nread == 0) {
-        __redisSetError(c,REDIS_ERR_EOF,"Server closed the connection");
-        return REDIS_ERR;
-    } else {
-        if (redisReaderFeed(c->reader,buf,nread) != REDIS_OK) {
-            __redisSetError(c,c->reader->err,c->reader->errstr);
-            return REDIS_ERR;
-        }
-    }
-    return REDIS_OK;
-}
-
-/* Write the output buffer to the socket.
- *
- * Returns REDIS_OK when the buffer is empty, or (a part of) the buffer was
- * successfully written to the socket. When the buffer is empty after the
- * write operation, "done" is set to 1 (if given).
- *
- * Returns REDIS_ERR if an error occurred trying to write and sets
- * c->errstr to hold the appropriate error string.
- */
-int redisBufferWrite(redisContext *c, int *done) {
-    int nwritten;
-
-    /* Return early when the context has seen an error. */
-    if (c->err)
-        return REDIS_ERR;
-
-    if (sdslen(c->obuf) > 0) {
-        nwritten = write(c->fd,c->obuf,sdslen(c->obuf));
-        if (nwritten == -1) {
-            if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-                /* Try again later */
-            } else {
-                __redisSetError(c,REDIS_ERR_IO,NULL);
-                return REDIS_ERR;
-            }
-        } else if (nwritten > 0) {
-            if (nwritten == (signed)sdslen(c->obuf)) {
-                sdsfree(c->obuf);
-                c->obuf = sdsempty();
-            } else {
-                sdsrange(c->obuf,nwritten,-1);
-            }
-        }
-    }
-    if (done != NULL) *done = (sdslen(c->obuf) == 0);
-    return REDIS_OK;
-}
-
-/* Internal helper function to try and get a reply from the reader,
- * or set an error in the context otherwise. */
-int redisGetReplyFromReader(redisContext *c, void **reply) {
-    if (redisReaderGetReply(c->reader,reply) == REDIS_ERR) {
-        __redisSetError(c,c->reader->err,c->reader->errstr);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-int redisGetReply(redisContext *c, void **reply) {
-    int wdone = 0;
-    void *aux = NULL;
-
-    /* Try to read pending replies */
-    if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-        return REDIS_ERR;
-
-    /* For the blocking context, flush output buffer and read reply */
-    if (aux == NULL && c->flags & REDIS_BLOCK) {
-        /* Write until done */
-        do {
-            if (redisBufferWrite(c,&wdone) == REDIS_ERR)
-                return REDIS_ERR;
-        } while (!wdone);
-
-        /* Read until there is a reply */
-        do {
-            if (redisBufferRead(c) == REDIS_ERR)
-                return REDIS_ERR;
-            if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-                return REDIS_ERR;
-        } while (aux == NULL);
-    }
-
-    /* Set reply object */
-    if (reply != NULL) *reply = aux;
-    return REDIS_OK;
-}
-
-
-/* Helper function for the redisAppendCommand* family of functions.
- *
- * Write a formatted command to the output buffer. When this family
- * is used, you need to call redisGetReply yourself to retrieve
- * the reply (or replies in pub/sub).
- */
-int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
-    sds newbuf;
-
-    newbuf = sdscatlen(c->obuf,cmd,len);
-    if (newbuf == NULL) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    }
-
-    c->obuf = newbuf;
-    return REDIS_OK;
-}
-
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len) {
-
-    if (__redisAppendCommand(c, cmd, len) != REDIS_OK) {
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
-    char *cmd;
-    int len;
-
-    len = redisvFormatCommand(&cmd,format,ap);
-    if (len == -1) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    } else if (len == -2) {
-        __redisSetError(c,REDIS_ERR_OTHER,"Invalid format string");
-        return REDIS_ERR;
-    }
-
-    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        free(cmd);
-        return REDIS_ERR;
-    }
-
-    free(cmd);
-    return REDIS_OK;
-}
-
-int redisAppendCommand(redisContext *c, const char *format, ...) {
-    va_list ap;
-    int ret;
-
-    va_start(ap,format);
-    ret = redisvAppendCommand(c,format,ap);
-    va_end(ap);
-    return ret;
-}
-
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
-    sds cmd;
-    int len;
-
-    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
-    if (len == -1) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    }
-
-    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        sdsfree(cmd);
-        return REDIS_ERR;
-    }
-
-    sdsfree(cmd);
-    return REDIS_OK;
-}
-
-/* Helper function for the redisCommand* family of functions.
- *
- * Write a formatted command to the output buffer. If the given context is
- * blocking, immediately read the reply into the "reply" pointer. When the
- * context is non-blocking, the "reply" pointer will not be used and the
- * command is simply appended to the write buffer.
- *
- * Returns the reply when a reply was successfully retrieved. Returns NULL
- * otherwise. When NULL is returned in a blocking context, the error field
- * in the context will be set.
- */
-static void *__redisBlockForReply(redisContext *c) {
-    void *reply;
-
-    if (c->flags & REDIS_BLOCK) {
-        if (redisGetReply(c,&reply) != REDIS_OK)
-            return NULL;
-        return reply;
-    }
-    return NULL;
-}
-
-void *redisvCommand(redisContext *c, const char *format, va_list ap) {
-    if (redisvAppendCommand(c,format,ap) != REDIS_OK)
-        return NULL;
-    return __redisBlockForReply(c);
-}
-
-void *redisCommand(redisContext *c, const char *format, ...) {
-    va_list ap;
-    va_start(ap,format);
-    void *reply = redisvCommand(c,format,ap);
-    va_end(ap);
-    return reply;
-}
-
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
-    if (redisAppendCommandArgv(c,argc,argv,argvlen) != REDIS_OK)
-        return NULL;
-    return __redisBlockForReply(c);
-}
diff --git a/ext/hiredis-0.14.1/hiredis.h b/ext/hiredis-0.14.1/hiredis.h
deleted file mode 100644
index d945bf204..000000000
--- a/ext/hiredis-0.14.1/hiredis.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_H
-#define __HIREDIS_H
-#include "read.h"
-#include <stdarg.h> /* for va_list */
-#include <sys/time.h> /* for struct timeval */
-#include <stdint.h> /* uintXX_t, etc */
-#include "sds.h" /* for sds */
-#include "alloc.h" /* for allocation wrappers */
-
-#define HIREDIS_MAJOR 0
-#define HIREDIS_MINOR 14
-#define HIREDIS_PATCH 1
-#define HIREDIS_SONAME 0.14
-
-/* Connection type can be blocking or non-blocking and is set in the
- * least significant bit of the flags field in redisContext. */
-#define REDIS_BLOCK 0x1
-
-/* Connection may be disconnected before being free'd. The second bit
- * in the flags field is set when the context is connected. */
-#define REDIS_CONNECTED 0x2
-
-/* The async API might try to disconnect cleanly and flush the output
- * buffer and read all subsequent replies before disconnecting.
- * This flag means no new commands can come in and the connection
- * should be terminated once all replies have been read. */
-#define REDIS_DISCONNECTING 0x4
-
-/* Flag specific to the async API which means that the context should be clean
- * up as soon as possible. */
-#define REDIS_FREEING 0x8
-
-/* Flag that is set when an async callback is executed. */
-#define REDIS_IN_CALLBACK 0x10
-
-/* Flag that is set when the async context has one or more subscriptions. */
-#define REDIS_SUBSCRIBED 0x20
-
-/* Flag that is set when monitor mode is active */
-#define REDIS_MONITORING 0x40
-
-/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
-#define REDIS_REUSEADDR 0x80
-
-#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
-
-/* number of times we retry to connect in the case of EADDRNOTAVAIL and
- * SO_REUSEADDR is being used. */
-#define REDIS_CONNECT_RETRIES  10
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the reply object returned by redisCommand() */
-typedef struct redisReply {
-    int type; /* REDIS_REPLY_* */
-    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
-    size_t len; /* Length of string */
-    char *str; /* Used for both REDIS_REPLY_ERROR and REDIS_REPLY_STRING */
-    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
-    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
-} redisReply;
-
-redisReader *redisReaderCreate(void);
-
-/* Function to free the reply objects hiredis returns by default. */
-void freeReplyObject(void *reply);
-
-/* Functions to format a command according to the protocol. */
-int redisvFormatCommand(char **target, const char *format, va_list ap);
-int redisFormatCommand(char **target, const char *format, ...);
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
-int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
-void redisFreeCommand(char *cmd);
-void redisFreeSdsCommand(sds cmd);
-
-enum redisConnectionType {
-    REDIS_CONN_TCP,
-    REDIS_CONN_UNIX
-};
-
-/* Context for a connection to Redis */
-typedef struct redisContext {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-    int fd;
-    int flags;
-    char *obuf; /* Write buffer */
-    redisReader *reader; /* Protocol reader */
-
-    enum redisConnectionType connection_type;
-    struct timeval *timeout;
-
-    struct {
-        char *host;
-        char *source_addr;
-        int port;
-    } tcp;
-
-    struct {
-        char *path;
-    } unix_sock;
-
-} redisContext;
-
-redisContext *redisConnect(const char *ip, int port);
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
-redisContext *redisConnectNonBlock(const char *ip, int port);
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr);
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr);
-redisContext *redisConnectUnix(const char *path);
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
-redisContext *redisConnectUnixNonBlock(const char *path);
-redisContext *redisConnectFd(int fd);
-
-/**
- * Reconnect the given context using the saved information.
- *
- * This re-uses the exact same connect options as in the initial connection.
- * host, ip (or path), timeout and bind address are reused,
- * flags are used unmodified from the existing context.
- *
- * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
- */
-int redisReconnect(redisContext *c);
-
-int redisSetTimeout(redisContext *c, const struct timeval tv);
-int redisEnableKeepAlive(redisContext *c);
-void redisFree(redisContext *c);
-int redisFreeKeepFd(redisContext *c);
-int redisBufferRead(redisContext *c);
-int redisBufferWrite(redisContext *c, int *done);
-
-/* In a blocking context, this function first checks if there are unconsumed
- * replies to return and returns one if so. Otherwise, it flushes the output
- * buffer to the socket and reads until it has a reply. In a non-blocking
- * context, it will return unconsumed replies until there are no more. */
-int redisGetReply(redisContext *c, void **reply);
-int redisGetReplyFromReader(redisContext *c, void **reply);
-
-/* Write a formatted command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
-
-/* Write a command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
-int redisAppendCommand(redisContext *c, const char *format, ...);
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-/* Issue a command to Redis. In a blocking context, it is identical to calling
- * redisAppendCommand, followed by redisGetReply. The function will return
- * NULL if there was an error in performing the request, otherwise it will
- * return the reply. In a non-blocking context, it is identical to calling
- * only redisAppendCommand and will always return NULL. */
-void *redisvCommand(redisContext *c, const char *format, va_list ap);
-void *redisCommand(redisContext *c, const char *format, ...);
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/include/hiredis/alloc.h b/ext/hiredis-0.14.1/include/hiredis/alloc.h
deleted file mode 100644
index 2c9b04e35..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/alloc.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef HIREDIS_ALLOC_H
-#define HIREDIS_ALLOC_H
-
-#include <stdlib.h> /* for size_t */
-
-#ifndef HIREDIS_OOM_HANDLER
-#define HIREDIS_OOM_HANDLER abort()
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *hi_malloc(size_t size);
-void *hi_calloc(size_t nmemb, size_t size);
-void *hi_realloc(void *ptr, size_t size);
-char *hi_strdup(const char *str);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* HIREDIS_ALLOC_H */
diff --git a/ext/hiredis-0.14.1/include/hiredis/async.h b/ext/hiredis-0.14.1/include/hiredis/async.h
deleted file mode 100644
index e69d84090..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/async.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_H
-#define __HIREDIS_ASYNC_H
-#include "hiredis.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
-struct dict; /* dictionary header is included in async.c */
-
-/* Reply callback prototype and container */
-typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
-typedef struct redisCallback {
-    struct redisCallback *next; /* simple singly linked list */
-    redisCallbackFn *fn;
-    int pending_subs;
-    void *privdata;
-} redisCallback;
-
-/* List of callbacks for either regular replies or pub/sub */
-typedef struct redisCallbackList {
-    redisCallback *head, *tail;
-} redisCallbackList;
-
-/* Connection callback prototypes */
-typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
-typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
-
-/* Context for an async connection to Redis */
-typedef struct redisAsyncContext {
-    /* Hold the regular context, so it can be realloc'ed. */
-    redisContext c;
-
-    /* Setup error flags so they can be used directly. */
-    int err;
-    char *errstr;
-
-    /* Not used by hiredis */
-    void *data;
-
-    /* Event library data and hooks */
-    struct {
-        void *data;
-
-        /* Hooks that are called when the library expects to start
-         * reading/writing. These functions should be idempotent. */
-        void (*addRead)(void *privdata);
-        void (*delRead)(void *privdata);
-        void (*addWrite)(void *privdata);
-        void (*delWrite)(void *privdata);
-        void (*cleanup)(void *privdata);
-    } ev;
-
-    /* Called when either the connection is terminated due to an error or per
-     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
-    redisDisconnectCallback *onDisconnect;
-
-    /* Called when the first write event was received. */
-    redisConnectCallback *onConnect;
-
-    /* Regular command callbacks */
-    redisCallbackList replies;
-
-    /* Subscription callbacks */
-    struct {
-        redisCallbackList invalid;
-        struct dict *channels;
-        struct dict *patterns;
-    } sub;
-} redisAsyncContext;
-
-/* Functions that proxy to hiredis */
-redisAsyncContext *redisAsyncConnect(const char *ip, int port);
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr);
-redisAsyncContext *redisAsyncConnectUnix(const char *path);
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-void redisAsyncDisconnect(redisAsyncContext *ac);
-void redisAsyncFree(redisAsyncContext *ac);
-
-/* Handle read/write events */
-void redisAsyncHandleRead(redisAsyncContext *ac);
-void redisAsyncHandleWrite(redisAsyncContext *ac);
-
-/* Command functions for an async context. Write the command to the
- * output buffer and register the provided callback. */
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/include/hiredis/dict.h b/ext/hiredis-0.14.1/include/hiredis/dict.h
deleted file mode 100644
index 95fcd280e..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/dict.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __DICT_H
-#define __DICT_H
-
-#define DICT_OK 0
-#define DICT_ERR 1
-
-/* Unused arguments generate annoying warnings... */
-#define DICT_NOTUSED(V) ((void) V)
-
-typedef struct dictEntry {
-    void *key;
-    void *val;
-    struct dictEntry *next;
-} dictEntry;
-
-typedef struct dictType {
-    unsigned int (*hashFunction)(const void *key);
-    void *(*keyDup)(void *privdata, const void *key);
-    void *(*valDup)(void *privdata, const void *obj);
-    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
-    void (*keyDestructor)(void *privdata, void *key);
-    void (*valDestructor)(void *privdata, void *obj);
-} dictType;
-
-typedef struct dict {
-    dictEntry **table;
-    dictType *type;
-    unsigned long size;
-    unsigned long sizemask;
-    unsigned long used;
-    void *privdata;
-} dict;
-
-typedef struct dictIterator {
-    dict *ht;
-    int index;
-    dictEntry *entry, *nextEntry;
-} dictIterator;
-
-/* This is the initial size of every hash table */
-#define DICT_HT_INITIAL_SIZE     4
-
-/* ------------------------------- Macros ------------------------------------*/
-#define dictFreeEntryVal(ht, entry) \
-    if ((ht)->type->valDestructor) \
-        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
-
-#define dictSetHashVal(ht, entry, _val_) do { \
-    if ((ht)->type->valDup) \
-        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
-    else \
-        entry->val = (_val_); \
-} while(0)
-
-#define dictFreeEntryKey(ht, entry) \
-    if ((ht)->type->keyDestructor) \
-        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
-
-#define dictSetHashKey(ht, entry, _key_) do { \
-    if ((ht)->type->keyDup) \
-        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
-    else \
-        entry->key = (_key_); \
-} while(0)
-
-#define dictCompareHashKeys(ht, key1, key2) \
-    (((ht)->type->keyCompare) ? \
-        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
-        (key1) == (key2))
-
-#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
-
-#define dictGetEntryKey(he) ((he)->key)
-#define dictGetEntryVal(he) ((he)->val)
-#define dictSlots(ht) ((ht)->size)
-#define dictSize(ht) ((ht)->used)
-
-/* API */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
-static dict *dictCreate(dictType *type, void *privDataPtr);
-static int dictExpand(dict *ht, unsigned long size);
-static int dictAdd(dict *ht, void *key, void *val);
-static int dictReplace(dict *ht, void *key, void *val);
-static int dictDelete(dict *ht, const void *key);
-static void dictRelease(dict *ht);
-static dictEntry * dictFind(dict *ht, const void *key);
-static dictIterator *dictGetIterator(dict *ht);
-static dictEntry *dictNext(dictIterator *iter);
-static void dictReleaseIterator(dictIterator *iter);
-
-#endif /* __DICT_H */
diff --git a/ext/hiredis-0.14.1/include/hiredis/fmacros.h b/ext/hiredis-0.14.1/include/hiredis/fmacros.h
deleted file mode 100644
index 3227faafd..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/fmacros.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __HIREDIS_FMACRO_H
-#define __HIREDIS_FMACRO_H
-
-#define _XOPEN_SOURCE 600
-#define _POSIX_C_SOURCE 200112L
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* Enable TCP_KEEPALIVE */
-#define _DARWIN_C_SOURCE
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/include/hiredis/hiredis.h b/ext/hiredis-0.14.1/include/hiredis/hiredis.h
deleted file mode 100644
index d945bf204..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/hiredis.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_H
-#define __HIREDIS_H
-#include "read.h"
-#include <stdarg.h> /* for va_list */
-#include <sys/time.h> /* for struct timeval */
-#include <stdint.h> /* uintXX_t, etc */
-#include "sds.h" /* for sds */
-#include "alloc.h" /* for allocation wrappers */
-
-#define HIREDIS_MAJOR 0
-#define HIREDIS_MINOR 14
-#define HIREDIS_PATCH 1
-#define HIREDIS_SONAME 0.14
-
-/* Connection type can be blocking or non-blocking and is set in the
- * least significant bit of the flags field in redisContext. */
-#define REDIS_BLOCK 0x1
-
-/* Connection may be disconnected before being free'd. The second bit
- * in the flags field is set when the context is connected. */
-#define REDIS_CONNECTED 0x2
-
-/* The async API might try to disconnect cleanly and flush the output
- * buffer and read all subsequent replies before disconnecting.
- * This flag means no new commands can come in and the connection
- * should be terminated once all replies have been read. */
-#define REDIS_DISCONNECTING 0x4
-
-/* Flag specific to the async API which means that the context should be clean
- * up as soon as possible. */
-#define REDIS_FREEING 0x8
-
-/* Flag that is set when an async callback is executed. */
-#define REDIS_IN_CALLBACK 0x10
-
-/* Flag that is set when the async context has one or more subscriptions. */
-#define REDIS_SUBSCRIBED 0x20
-
-/* Flag that is set when monitor mode is active */
-#define REDIS_MONITORING 0x40
-
-/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
-#define REDIS_REUSEADDR 0x80
-
-#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
-
-/* number of times we retry to connect in the case of EADDRNOTAVAIL and
- * SO_REUSEADDR is being used. */
-#define REDIS_CONNECT_RETRIES  10
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the reply object returned by redisCommand() */
-typedef struct redisReply {
-    int type; /* REDIS_REPLY_* */
-    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
-    size_t len; /* Length of string */
-    char *str; /* Used for both REDIS_REPLY_ERROR and REDIS_REPLY_STRING */
-    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
-    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
-} redisReply;
-
-redisReader *redisReaderCreate(void);
-
-/* Function to free the reply objects hiredis returns by default. */
-void freeReplyObject(void *reply);
-
-/* Functions to format a command according to the protocol. */
-int redisvFormatCommand(char **target, const char *format, va_list ap);
-int redisFormatCommand(char **target, const char *format, ...);
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
-int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
-void redisFreeCommand(char *cmd);
-void redisFreeSdsCommand(sds cmd);
-
-enum redisConnectionType {
-    REDIS_CONN_TCP,
-    REDIS_CONN_UNIX
-};
-
-/* Context for a connection to Redis */
-typedef struct redisContext {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-    int fd;
-    int flags;
-    char *obuf; /* Write buffer */
-    redisReader *reader; /* Protocol reader */
-
-    enum redisConnectionType connection_type;
-    struct timeval *timeout;
-
-    struct {
-        char *host;
-        char *source_addr;
-        int port;
-    } tcp;
-
-    struct {
-        char *path;
-    } unix_sock;
-
-} redisContext;
-
-redisContext *redisConnect(const char *ip, int port);
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
-redisContext *redisConnectNonBlock(const char *ip, int port);
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr);
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr);
-redisContext *redisConnectUnix(const char *path);
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
-redisContext *redisConnectUnixNonBlock(const char *path);
-redisContext *redisConnectFd(int fd);
-
-/**
- * Reconnect the given context using the saved information.
- *
- * This re-uses the exact same connect options as in the initial connection.
- * host, ip (or path), timeout and bind address are reused,
- * flags are used unmodified from the existing context.
- *
- * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
- */
-int redisReconnect(redisContext *c);
-
-int redisSetTimeout(redisContext *c, const struct timeval tv);
-int redisEnableKeepAlive(redisContext *c);
-void redisFree(redisContext *c);
-int redisFreeKeepFd(redisContext *c);
-int redisBufferRead(redisContext *c);
-int redisBufferWrite(redisContext *c, int *done);
-
-/* In a blocking context, this function first checks if there are unconsumed
- * replies to return and returns one if so. Otherwise, it flushes the output
- * buffer to the socket and reads until it has a reply. In a non-blocking
- * context, it will return unconsumed replies until there are no more. */
-int redisGetReply(redisContext *c, void **reply);
-int redisGetReplyFromReader(redisContext *c, void **reply);
-
-/* Write a formatted command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
-
-/* Write a command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
-int redisAppendCommand(redisContext *c, const char *format, ...);
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-/* Issue a command to Redis. In a blocking context, it is identical to calling
- * redisAppendCommand, followed by redisGetReply. The function will return
- * NULL if there was an error in performing the request, otherwise it will
- * return the reply. In a non-blocking context, it is identical to calling
- * only redisAppendCommand and will always return NULL. */
-void *redisvCommand(redisContext *c, const char *format, va_list ap);
-void *redisCommand(redisContext *c, const char *format, ...);
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/include/hiredis/net.h b/ext/hiredis-0.14.1/include/hiredis/net.h
deleted file mode 100644
index d9dc36257..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/net.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __NET_H
-#define __NET_H
-
-#include "hiredis.h"
-
-int redisCheckSocketError(redisContext *c);
-int redisContextSetTimeout(redisContext *c, const struct timeval tv);
-int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr);
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
-int redisKeepAlive(redisContext *c, int interval);
-
-#endif
diff --git a/ext/hiredis-0.14.1/include/hiredis/read.h b/ext/hiredis-0.14.1/include/hiredis/read.h
deleted file mode 100644
index 2988aa453..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/read.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef __HIREDIS_READ_H
-#define __HIREDIS_READ_H
-#include <stdio.h> /* for size_t */
-
-#define REDIS_ERR -1
-#define REDIS_OK 0
-
-/* When an error occurs, the err flag in a context is set to hold the type of
- * error that occurred. REDIS_ERR_IO means there was an I/O error and you
- * should use the "errno" variable to find out what is wrong.
- * For other values, the "errstr" field will hold a description. */
-#define REDIS_ERR_IO 1 /* Error in read or write */
-#define REDIS_ERR_EOF 3 /* End of file */
-#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
-#define REDIS_ERR_OOM 5 /* Out of memory */
-#define REDIS_ERR_OTHER 2 /* Everything else... */
-
-#define REDIS_REPLY_STRING 1
-#define REDIS_REPLY_ARRAY 2
-#define REDIS_REPLY_INTEGER 3
-#define REDIS_REPLY_NIL 4
-#define REDIS_REPLY_STATUS 5
-#define REDIS_REPLY_ERROR 6
-
-#define REDIS_READER_MAX_BUF (1024*16)  /* Default max unused reader buffer. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct redisReadTask {
-    int type;
-    int elements; /* number of elements in multibulk container */
-    int idx; /* index in parent (array) object */
-    void *obj; /* holds user-generated value for a read task */
-    struct redisReadTask *parent; /* parent task */
-    void *privdata; /* user-settable arbitrary field */
-} redisReadTask;
-
-typedef struct redisReplyObjectFunctions {
-    void *(*createString)(const redisReadTask*, char*, size_t);
-    void *(*createArray)(const redisReadTask*, int);
-    void *(*createInteger)(const redisReadTask*, long long);
-    void *(*createNil)(const redisReadTask*);
-    void (*freeObject)(void*);
-} redisReplyObjectFunctions;
-
-typedef struct redisReader {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-
-    char *buf; /* Read buffer */
-    size_t pos; /* Buffer cursor */
-    size_t len; /* Buffer length */
-    size_t maxbuf; /* Max length of unused buffer */
-
-    redisReadTask rstack[9];
-    int ridx; /* Index of current read task */
-    void *reply; /* Temporary reply pointer */
-
-    redisReplyObjectFunctions *fn;
-    void *privdata;
-} redisReader;
-
-/* Public API for the protocol parser. */
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
-void redisReaderFree(redisReader *r);
-int redisReaderFeed(redisReader *r, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *r, void **reply);
-
-#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
-#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply)
-#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/include/hiredis/sds.h b/ext/hiredis-0.14.1/include/hiredis/sds.h
deleted file mode 100644
index 13be75a9f..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/sds.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SDS_H
-#define __SDS_H
-
-#define SDS_MAX_PREALLOC (1024*1024)
-
-#include <sys/types.h>
-#include <stdarg.h>
-#include <stdint.h>
-
-typedef char *sds;
-
-/* Note: sdshdr5 is never used, we just access the flags byte directly.
- * However is here to document the layout of type 5 SDS strings. */
-struct __attribute__ ((__packed__)) sdshdr5 {
-    unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr8 {
-    uint8_t len; /* used */
-    uint8_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr16 {
-    uint16_t len; /* used */
-    uint16_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr32 {
-    uint32_t len; /* used */
-    uint32_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr64 {
-    uint64_t len; /* used */
-    uint64_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-
-#define SDS_TYPE_5  0
-#define SDS_TYPE_8  1
-#define SDS_TYPE_16 2
-#define SDS_TYPE_32 3
-#define SDS_TYPE_64 4
-#define SDS_TYPE_MASK 7
-#define SDS_TYPE_BITS 3
-#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
-#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
-#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
-
-static inline size_t sdslen(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->len;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->len;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->len;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->len;
-    }
-    return 0;
-}
-
-static inline size_t sdsavail(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
-            return 0;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            return sh->alloc - sh->len;
-        }
-    }
-    return 0;
-}
-
-static inline void sdssetlen(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len = newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len = newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len = newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len = newlen;
-            break;
-    }
-}
-
-static inline void sdsinclen(sds s, size_t inc) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                unsigned char newlen = SDS_TYPE_5_LEN(flags)+inc;
-                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len += inc;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len += inc;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len += inc;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len += inc;
-            break;
-    }
-}
-
-/* sdsalloc() = sdsavail() + sdslen() */
-static inline size_t sdsalloc(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->alloc;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->alloc;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->alloc;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->alloc;
-    }
-    return 0;
-}
-
-static inline void sdssetalloc(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            /* Nothing to do, this type has no total allocation info. */
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->alloc = newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->alloc = newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->alloc = newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->alloc = newlen;
-            break;
-    }
-}
-
-sds sdsnewlen(const void *init, size_t initlen);
-sds sdsnew(const char *init);
-sds sdsempty(void);
-sds sdsdup(const sds s);
-void sdsfree(sds s);
-sds sdsgrowzero(sds s, size_t len);
-sds sdscatlen(sds s, const void *t, size_t len);
-sds sdscat(sds s, const char *t);
-sds sdscatsds(sds s, const sds t);
-sds sdscpylen(sds s, const char *t, size_t len);
-sds sdscpy(sds s, const char *t);
-
-sds sdscatvprintf(sds s, const char *fmt, va_list ap);
-#ifdef __GNUC__
-sds sdscatprintf(sds s, const char *fmt, ...)
-    __attribute__((format(printf, 2, 3)));
-#else
-sds sdscatprintf(sds s, const char *fmt, ...);
-#endif
-
-sds sdscatfmt(sds s, char const *fmt, ...);
-sds sdstrim(sds s, const char *cset);
-void sdsrange(sds s, int start, int end);
-void sdsupdatelen(sds s);
-void sdsclear(sds s);
-int sdscmp(const sds s1, const sds s2);
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
-void sdsfreesplitres(sds *tokens, int count);
-void sdstolower(sds s);
-void sdstoupper(sds s);
-sds sdsfromlonglong(long long value);
-sds sdscatrepr(sds s, const char *p, size_t len);
-sds *sdssplitargs(const char *line, int *argc);
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
-sds sdsjoin(char **argv, int argc, char *sep);
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
-
-/* Low level functions exposed to the user API */
-sds sdsMakeRoomFor(sds s, size_t addlen);
-void sdsIncrLen(sds s, int incr);
-sds sdsRemoveFreeSpace(sds s);
-size_t sdsAllocSize(sds s);
-void *sdsAllocPtr(sds s);
-
-/* Export the allocator used by SDS to the program using SDS.
- * Sometimes the program SDS is linked to, may use a different set of
- * allocators, but may want to allocate or free things that SDS will
- * respectively free or allocate. */
-void *sds_malloc(size_t size);
-void *sds_realloc(void *ptr, size_t size);
-void sds_free(void *ptr);
-
-#ifdef REDIS_TEST
-int sdsTest(int argc, char *argv[]);
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/include/hiredis/sdsalloc.h b/ext/hiredis-0.14.1/include/hiredis/sdsalloc.h
deleted file mode 100644
index f43023c48..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/sdsalloc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* SDS allocator selection.
- *
- * This file is used in order to change the SDS allocator at compile time.
- * Just define the following defines to what you want to use. Also add
- * the include of your alternate allocator if needed (not needed in order
- * to use the default libc allocator). */
-
-#define s_malloc malloc
-#define s_realloc realloc
-#define s_free free
diff --git a/ext/hiredis-0.14.1/include/hiredis/win32.h b/ext/hiredis-0.14.1/include/hiredis/win32.h
deleted file mode 100644
index 1a27c18f2..000000000
--- a/ext/hiredis-0.14.1/include/hiredis/win32.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _WIN32_HELPER_INCLUDE
-#define _WIN32_HELPER_INCLUDE
-#ifdef _MSC_VER
-
-#ifndef inline
-#define inline __inline
-#endif
-
-#ifndef va_copy
-#define va_copy(d,s) ((d) = (s))
-#endif
-
-#ifndef snprintf
-#define snprintf c99_snprintf
-
-__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
-{
-    int count = -1;
-
-    if (size != 0)
-        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
-    if (count == -1)
-        count = _vscprintf(format, ap);
-
-    return count;
-}
-
-__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
-{
-    int count;
-    va_list ap;
-
-    va_start(ap, format);
-    count = c99_vsnprintf(str, size, format, ap);
-    va_end(ap);
-
-    return count;
-}
-#endif
-
-#endif
-#endif
\ No newline at end of file
diff --git a/ext/hiredis-0.14.1/lib/centos8/libhiredis.a b/ext/hiredis-0.14.1/lib/centos8/libhiredis.a
deleted file mode 100644
index 0b9638798..000000000
Binary files a/ext/hiredis-0.14.1/lib/centos8/libhiredis.a and /dev/null differ
diff --git a/ext/hiredis-0.14.1/lib/macos/libhiredis.a b/ext/hiredis-0.14.1/lib/macos/libhiredis.a
deleted file mode 100644
index 02bdb8808..000000000
Binary files a/ext/hiredis-0.14.1/lib/macos/libhiredis.a and /dev/null differ
diff --git a/ext/hiredis-0.14.1/net.c b/ext/hiredis-0.14.1/net.c
deleted file mode 100644
index d71bbcd57..000000000
--- a/ext/hiredis-0.14.1/net.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <poll.h>
-#include <limits.h>
-#include <stdlib.h>
-
-#include "net.h"
-#include "sds.h"
-
-/* Defined in hiredis.c */
-void __redisSetError(redisContext *c, int type, const char *str);
-
-static void redisContextCloseFd(redisContext *c) {
-    if (c && c->fd >= 0) {
-        close(c->fd);
-        c->fd = -1;
-    }
-}
-
-static void __redisSetErrorFromErrno(redisContext *c, int type, const char *prefix) {
-    int errorno = errno;  /* snprintf() may change errno */
-    char buf[128] = { 0 };
-    size_t len = 0;
-
-    if (prefix != NULL)
-        len = snprintf(buf,sizeof(buf),"%s: ",prefix);
-    strerror_r(errorno, (char *)(buf + len), sizeof(buf) - len);
-    __redisSetError(c,type,buf);
-}
-
-static int redisSetReuseAddr(redisContext *c) {
-    int on = 1;
-    if (setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        redisContextCloseFd(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-static int redisCreateSocket(redisContext *c, int type) {
-    int s;
-    if ((s = socket(type, SOCK_STREAM, 0)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        return REDIS_ERR;
-    }
-    c->fd = s;
-    if (type == AF_INET) {
-        if (redisSetReuseAddr(c) == REDIS_ERR) {
-            return REDIS_ERR;
-        }
-    }
-    return REDIS_OK;
-}
-
-static int redisSetBlocking(redisContext *c, int blocking) {
-    int flags;
-
-    /* Set the socket nonblocking.
-     * Note that fcntl(2) for F_GETFL and F_SETFL can't be
-     * interrupted by a signal. */
-    if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
-        redisContextCloseFd(c);
-        return REDIS_ERR;
-    }
-
-    if (blocking)
-        flags &= ~O_NONBLOCK;
-    else
-        flags |= O_NONBLOCK;
-
-    if (fcntl(c->fd, F_SETFL, flags) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
-        redisContextCloseFd(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-int redisKeepAlive(redisContext *c, int interval) {
-    int val = 1;
-    int fd = c->fd;
-
-    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == -1){
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = interval;
-
-#if defined(__APPLE__) && defined(__MACH__)
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-#else
-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = interval/3;
-    if (val == 0) val = 1;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = 3;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-#endif
-#endif
-
-    return REDIS_OK;
-}
-
-static int redisSetTcpNoDelay(redisContext *c) {
-    int yes = 1;
-    if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(TCP_NODELAY)");
-        redisContextCloseFd(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-#define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
-
-static int redisContextTimeoutMsec(redisContext *c, long *result)
-{
-    const struct timeval *timeout = c->timeout;
-    long msec = -1;
-
-    /* Only use timeout when not NULL. */
-    if (timeout != NULL) {
-        if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
-            *result = msec;
-            return REDIS_ERR;
-        }
-
-        msec = (timeout->tv_sec * 1000) + ((timeout->tv_usec + 999) / 1000);
-
-        if (msec < 0 || msec > INT_MAX) {
-            msec = INT_MAX;
-        }
-    }
-
-    *result = msec;
-    return REDIS_OK;
-}
-
-static int redisContextWaitReady(redisContext *c, long msec) {
-    struct pollfd   wfd[1];
-
-    wfd[0].fd     = c->fd;
-    wfd[0].events = POLLOUT;
-
-    if (errno == EINPROGRESS) {
-        int res;
-
-        if ((res = poll(wfd, 1, msec)) == -1) {
-            __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
-            redisContextCloseFd(c);
-            return REDIS_ERR;
-        } else if (res == 0) {
-            errno = ETIMEDOUT;
-            __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-            redisContextCloseFd(c);
-            return REDIS_ERR;
-        }
-
-        if (redisCheckSocketError(c) != REDIS_OK)
-            return REDIS_ERR;
-
-        return REDIS_OK;
-    }
-
-    __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-    redisContextCloseFd(c);
-    return REDIS_ERR;
-}
-
-int redisCheckSocketError(redisContext *c) {
-    int err = 0;
-    socklen_t errlen = sizeof(err);
-
-    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"getsockopt(SO_ERROR)");
-        return REDIS_ERR;
-    }
-
-    if (err) {
-        errno = err;
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
-    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,&tv,sizeof(tv)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
-        return REDIS_ERR;
-    }
-    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,&tv,sizeof(tv)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_SNDTIMEO)");
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
-                                   const struct timeval *timeout,
-                                   const char *source_addr) {
-    int s, rv, n;
-    char _port[6];  /* strlen("65535"); */
-    struct addrinfo hints, *servinfo, *bservinfo, *p, *b;
-    int blocking = (c->flags & REDIS_BLOCK);
-    int reuseaddr = (c->flags & REDIS_REUSEADDR);
-    int reuses = 0;
-    long timeout_msec = -1;
-
-    servinfo = NULL;
-    c->connection_type = REDIS_CONN_TCP;
-    c->tcp.port = port;
-
-    /* We need to take possession of the passed parameters
-     * to make them reusable for a reconnect.
-     * We also carefully check we don't free data we already own,
-     * as in the case of the reconnect method.
-     *
-     * This is a bit ugly, but atleast it works and doesn't leak memory.
-     **/
-    if (c->tcp.host != addr) {
-        free(c->tcp.host);
-
-        c->tcp.host = hi_strdup(addr);
-    }
-
-    if (timeout) {
-        if (c->timeout != timeout) {
-            if (c->timeout == NULL)
-                c->timeout = hi_malloc(sizeof(struct timeval));
-
-            memcpy(c->timeout, timeout, sizeof(struct timeval));
-        }
-    } else {
-        free(c->timeout);
-        c->timeout = NULL;
-    }
-
-    if (redisContextTimeoutMsec(c, &timeout_msec) != REDIS_OK) {
-        __redisSetError(c, REDIS_ERR_IO, "Invalid timeout specified");
-        goto error;
-    }
-
-    if (source_addr == NULL) {
-        free(c->tcp.source_addr);
-        c->tcp.source_addr = NULL;
-    } else if (c->tcp.source_addr != source_addr) {
-        free(c->tcp.source_addr);
-        c->tcp.source_addr = hi_strdup(source_addr);
-    }
-
-    snprintf(_port, 6, "%d", port);
-    memset(&hints,0,sizeof(hints));
-    hints.ai_family = AF_INET;
-    hints.ai_socktype = SOCK_STREAM;
-
-    /* Try with IPv6 if no IPv4 address was found. We do it in this order since
-     * in a Redis client you can't afford to test if you have IPv6 connectivity
-     * as this would add latency to every connect. Otherwise a more sensible
-     * route could be: Use IPv6 if both addresses are available and there is IPv6
-     * connectivity. */
-    if ((rv = getaddrinfo(c->tcp.host,_port,&hints,&servinfo)) != 0) {
-         hints.ai_family = AF_INET6;
-         if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) {
-            __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv));
-            return REDIS_ERR;
-        }
-    }
-    for (p = servinfo; p != NULL; p = p->ai_next) {
-addrretry:
-        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == -1)
-            continue;
-
-        c->fd = s;
-        if (redisSetBlocking(c,0) != REDIS_OK)
-            goto error;
-        if (c->tcp.source_addr) {
-            int bound = 0;
-            /* Using getaddrinfo saves us from self-determining IPv4 vs IPv6 */
-            if ((rv = getaddrinfo(c->tcp.source_addr, NULL, &hints, &bservinfo)) != 0) {
-                char buf[128];
-                snprintf(buf,sizeof(buf),"Can't get addr: %s",gai_strerror(rv));
-                __redisSetError(c,REDIS_ERR_OTHER,buf);
-                goto error;
-            }
-
-            if (reuseaddr) {
-                n = 1;
-                if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*) &n,
-                               sizeof(n)) < 0) {
-                    freeaddrinfo(bservinfo);
-                    goto error;
-                }
-            }
-
-            for (b = bservinfo; b != NULL; b = b->ai_next) {
-                if (bind(s,b->ai_addr,b->ai_addrlen) != -1) {
-                    bound = 1;
-                    break;
-                }
-            }
-            freeaddrinfo(bservinfo);
-            if (!bound) {
-                char buf[128];
-                snprintf(buf,sizeof(buf),"Can't bind socket: %s",strerror(errno));
-                __redisSetError(c,REDIS_ERR_OTHER,buf);
-                goto error;
-            }
-        }
-        if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
-            if (errno == EHOSTUNREACH) {
-                redisContextCloseFd(c);
-                continue;
-            } else if (errno == EINPROGRESS && !blocking) {
-                /* This is ok. */
-            } else if (errno == EADDRNOTAVAIL && reuseaddr) {
-                if (++reuses >= REDIS_CONNECT_RETRIES) {
-                    goto error;
-                } else {
-                    redisContextCloseFd(c);
-                    goto addrretry;
-                }
-            } else {
-                if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
-                    goto error;
-            }
-        }
-        if (blocking && redisSetBlocking(c,1) != REDIS_OK)
-            goto error;
-        if (redisSetTcpNoDelay(c) != REDIS_OK)
-            goto error;
-
-        c->flags |= REDIS_CONNECTED;
-        rv = REDIS_OK;
-        goto end;
-    }
-    if (p == NULL) {
-        char buf[128];
-        snprintf(buf,sizeof(buf),"Can't create socket: %s",strerror(errno));
-        __redisSetError(c,REDIS_ERR_OTHER,buf);
-        goto error;
-    }
-
-error:
-    rv = REDIS_ERR;
-end:
-    if(servinfo) {
-        freeaddrinfo(servinfo);
-    }
-
-    return rv;  // Need to return REDIS_OK if alright
-}
-
-int redisContextConnectTcp(redisContext *c, const char *addr, int port,
-                           const struct timeval *timeout) {
-    return _redisContextConnectTcp(c, addr, port, timeout, NULL);
-}
-
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr) {
-    return _redisContextConnectTcp(c, addr, port, timeout, source_addr);
-}
-
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout) {
-    int blocking = (c->flags & REDIS_BLOCK);
-    struct sockaddr_un sa;
-    long timeout_msec = -1;
-
-    if (redisCreateSocket(c,AF_UNIX) < 0)
-        return REDIS_ERR;
-    if (redisSetBlocking(c,0) != REDIS_OK)
-        return REDIS_ERR;
-
-    c->connection_type = REDIS_CONN_UNIX;
-    if (c->unix_sock.path != path)
-        c->unix_sock.path = hi_strdup(path);
-
-    if (timeout) {
-        if (c->timeout != timeout) {
-            if (c->timeout == NULL)
-                c->timeout = hi_malloc(sizeof(struct timeval));
-
-            memcpy(c->timeout, timeout, sizeof(struct timeval));
-        }
-    } else {
-        free(c->timeout);
-        c->timeout = NULL;
-    }
-
-    if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
-        return REDIS_ERR;
-
-    sa.sun_family = AF_UNIX;
-    strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
-    if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
-        if (errno == EINPROGRESS && !blocking) {
-            /* This is ok. */
-        } else {
-            if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
-                return REDIS_ERR;
-        }
-    }
-
-    /* Reset socket to be blocking after connect(2). */
-    if (blocking && redisSetBlocking(c,1) != REDIS_OK)
-        return REDIS_ERR;
-
-    c->flags |= REDIS_CONNECTED;
-    return REDIS_OK;
-}
diff --git a/ext/hiredis-0.14.1/net.h b/ext/hiredis-0.14.1/net.h
deleted file mode 100644
index d9dc36257..000000000
--- a/ext/hiredis-0.14.1/net.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __NET_H
-#define __NET_H
-
-#include "hiredis.h"
-
-int redisCheckSocketError(redisContext *c);
-int redisContextSetTimeout(redisContext *c, const struct timeval tv);
-int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr);
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
-int redisKeepAlive(redisContext *c, int interval);
-
-#endif
diff --git a/ext/hiredis-0.14.1/read.c b/ext/hiredis-0.14.1/read.c
deleted file mode 100644
index cc2126778..000000000
--- a/ext/hiredis-0.14.1/read.c
+++ /dev/null
@@ -1,598 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "fmacros.h"
-#include <string.h>
-#include <stdlib.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-#include <assert.h>
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-
-#include "read.h"
-#include "sds.h"
-
-static void __redisReaderSetError(redisReader *r, int type, const char *str) {
-    size_t len;
-
-    if (r->reply != NULL && r->fn && r->fn->freeObject) {
-        r->fn->freeObject(r->reply);
-        r->reply = NULL;
-    }
-
-    /* Clear input buffer on errors. */
-    sdsfree(r->buf);
-    r->buf = NULL;
-    r->pos = r->len = 0;
-
-    /* Reset task stack. */
-    r->ridx = -1;
-
-    /* Set error. */
-    r->err = type;
-    len = strlen(str);
-    len = len < (sizeof(r->errstr)-1) ? len : (sizeof(r->errstr)-1);
-    memcpy(r->errstr,str,len);
-    r->errstr[len] = '\0';
-}
-
-static size_t chrtos(char *buf, size_t size, char byte) {
-    size_t len = 0;
-
-    switch(byte) {
-    case '\\':
-    case '"':
-        len = snprintf(buf,size,"\"\\%c\"",byte);
-        break;
-    case '\n': len = snprintf(buf,size,"\"\\n\""); break;
-    case '\r': len = snprintf(buf,size,"\"\\r\""); break;
-    case '\t': len = snprintf(buf,size,"\"\\t\""); break;
-    case '\a': len = snprintf(buf,size,"\"\\a\""); break;
-    case '\b': len = snprintf(buf,size,"\"\\b\""); break;
-    default:
-        if (isprint(byte))
-            len = snprintf(buf,size,"\"%c\"",byte);
-        else
-            len = snprintf(buf,size,"\"\\x%02x\"",(unsigned char)byte);
-        break;
-    }
-
-    return len;
-}
-
-static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
-    char cbuf[8], sbuf[128];
-
-    chrtos(cbuf,sizeof(cbuf),byte);
-    snprintf(sbuf,sizeof(sbuf),
-        "Protocol error, got %s as reply type byte", cbuf);
-    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
-}
-
-static void __redisReaderSetErrorOOM(redisReader *r) {
-    __redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
-}
-
-static char *readBytes(redisReader *r, unsigned int bytes) {
-    char *p;
-    if (r->len-r->pos >= bytes) {
-        p = r->buf+r->pos;
-        r->pos += bytes;
-        return p;
-    }
-    return NULL;
-}
-
-/* Find pointer to \r\n. */
-static char *seekNewline(char *s, size_t len) {
-    int pos = 0;
-    int _len = len-1;
-
-    /* Position should be < len-1 because the character at "pos" should be
-     * followed by a \n. Note that strchr cannot be used because it doesn't
-     * allow to search a limited length and the buffer that is being searched
-     * might not have a trailing NULL character. */
-    while (pos < _len) {
-        while(pos < _len && s[pos] != '\r') pos++;
-        if (pos==_len) {
-            /* Not found. */
-            return NULL;
-        } else {
-            if (s[pos+1] == '\n') {
-                /* Found. */
-                return s+pos;
-            } else {
-                /* Continue searching. */
-                pos++;
-            }
-        }
-    }
-    return NULL;
-}
-
-/* Convert a string into a long long. Returns REDIS_OK if the string could be
- * parsed into a (non-overflowing) long long, REDIS_ERR otherwise. The value
- * will be set to the parsed value when appropriate.
- *
- * Note that this function demands that the string strictly represents
- * a long long: no spaces or other characters before or after the string
- * representing the number are accepted, nor zeroes at the start if not
- * for the string "0" representing the zero number.
- *
- * Because of its strictness, it is safe to use this function to check if
- * you can convert a string into a long long, and obtain back the string
- * from the number without any loss in the string representation. */
-static int string2ll(const char *s, size_t slen, long long *value) {
-    const char *p = s;
-    size_t plen = 0;
-    int negative = 0;
-    unsigned long long v;
-
-    if (plen == slen)
-        return REDIS_ERR;
-
-    /* Special case: first and only digit is 0. */
-    if (slen == 1 && p[0] == '0') {
-        if (value != NULL) *value = 0;
-        return REDIS_OK;
-    }
-
-    if (p[0] == '-') {
-        negative = 1;
-        p++; plen++;
-
-        /* Abort on only a negative sign. */
-        if (plen == slen)
-            return REDIS_ERR;
-    }
-
-    /* First digit should be 1-9, otherwise the string should just be 0. */
-    if (p[0] >= '1' && p[0] <= '9') {
-        v = p[0]-'0';
-        p++; plen++;
-    } else if (p[0] == '0' && slen == 1) {
-        *value = 0;
-        return REDIS_OK;
-    } else {
-        return REDIS_ERR;
-    }
-
-    while (plen < slen && p[0] >= '0' && p[0] <= '9') {
-        if (v > (ULLONG_MAX / 10)) /* Overflow. */
-            return REDIS_ERR;
-        v *= 10;
-
-        if (v > (ULLONG_MAX - (p[0]-'0'))) /* Overflow. */
-            return REDIS_ERR;
-        v += p[0]-'0';
-
-        p++; plen++;
-    }
-
-    /* Return if not all bytes were used. */
-    if (plen < slen)
-        return REDIS_ERR;
-
-    if (negative) {
-        if (v > ((unsigned long long)(-(LLONG_MIN+1))+1)) /* Overflow. */
-            return REDIS_ERR;
-        if (value != NULL) *value = -v;
-    } else {
-        if (v > LLONG_MAX) /* Overflow. */
-            return REDIS_ERR;
-        if (value != NULL) *value = v;
-    }
-    return REDIS_OK;
-}
-
-static char *readLine(redisReader *r, int *_len) {
-    char *p, *s;
-    int len;
-
-    p = r->buf+r->pos;
-    s = seekNewline(p,(r->len-r->pos));
-    if (s != NULL) {
-        len = s-(r->buf+r->pos);
-        r->pos += len+2; /* skip \r\n */
-        if (_len) *_len = len;
-        return p;
-    }
-    return NULL;
-}
-
-static void moveToNextTask(redisReader *r) {
-    redisReadTask *cur, *prv;
-    while (r->ridx >= 0) {
-        /* Return a.s.a.p. when the stack is now empty. */
-        if (r->ridx == 0) {
-            r->ridx--;
-            return;
-        }
-
-        cur = &(r->rstack[r->ridx]);
-        prv = &(r->rstack[r->ridx-1]);
-        assert(prv->type == REDIS_REPLY_ARRAY);
-        if (cur->idx == prv->elements-1) {
-            r->ridx--;
-        } else {
-            /* Reset the type because the next item can be anything */
-            assert(cur->idx < prv->elements);
-            cur->type = -1;
-            cur->elements = -1;
-            cur->idx++;
-            return;
-        }
-    }
-}
-
-static int processLineItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    void *obj;
-    char *p;
-    int len;
-
-    if ((p = readLine(r,&len)) != NULL) {
-        if (cur->type == REDIS_REPLY_INTEGER) {
-            if (r->fn && r->fn->createInteger) {
-                long long v;
-                if (string2ll(p, len, &v) == REDIS_ERR) {
-                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                            "Bad integer value");
-                    return REDIS_ERR;
-                }
-                obj = r->fn->createInteger(cur,v);
-            } else {
-                obj = (void*)REDIS_REPLY_INTEGER;
-            }
-        } else {
-            /* Type will be error or status. */
-            if (r->fn && r->fn->createString)
-                obj = r->fn->createString(cur,p,len);
-            else
-                obj = (void*)(size_t)(cur->type);
-        }
-
-        if (obj == NULL) {
-            __redisReaderSetErrorOOM(r);
-            return REDIS_ERR;
-        }
-
-        /* Set reply if this is the root object. */
-        if (r->ridx == 0) r->reply = obj;
-        moveToNextTask(r);
-        return REDIS_OK;
-    }
-
-    return REDIS_ERR;
-}
-
-static int processBulkItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    void *obj = NULL;
-    char *p, *s;
-    long long len;
-    unsigned long bytelen;
-    int success = 0;
-
-    p = r->buf+r->pos;
-    s = seekNewline(p,r->len-r->pos);
-    if (s != NULL) {
-        p = r->buf+r->pos;
-        bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
-
-        if (string2ll(p, bytelen - 2, &len) == REDIS_ERR) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bad bulk string length");
-            return REDIS_ERR;
-        }
-
-        if (len < -1 || (LLONG_MAX > SIZE_MAX && len > (long long)SIZE_MAX)) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bulk string length out of range");
-            return REDIS_ERR;
-        }
-
-        if (len == -1) {
-            /* The nil object can always be created. */
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-            success = 1;
-        } else {
-            /* Only continue when the buffer contains the entire bulk item. */
-            bytelen += len+2; /* include \r\n */
-            if (r->pos+bytelen <= r->len) {
-                if (r->fn && r->fn->createString)
-                    obj = r->fn->createString(cur,s+2,len);
-                else
-                    obj = (void*)REDIS_REPLY_STRING;
-                success = 1;
-            }
-        }
-
-        /* Proceed when obj was created. */
-        if (success) {
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            r->pos += bytelen;
-
-            /* Set reply if this is the root object. */
-            if (r->ridx == 0) r->reply = obj;
-            moveToNextTask(r);
-            return REDIS_OK;
-        }
-    }
-
-    return REDIS_ERR;
-}
-
-static int processMultiBulkItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    void *obj;
-    char *p;
-    long long elements;
-    int root = 0, len;
-
-    /* Set error for nested multi bulks with depth > 7 */
-    if (r->ridx == 8) {
-        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-            "No support for nested multi bulk replies with depth > 7");
-        return REDIS_ERR;
-    }
-
-    if ((p = readLine(r,&len)) != NULL) {
-        if (string2ll(p, len, &elements) == REDIS_ERR) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bad multi-bulk length");
-            return REDIS_ERR;
-        }
-
-        root = (r->ridx == 0);
-
-        if (elements < -1 || elements > INT_MAX) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Multi-bulk length out of range");
-            return REDIS_ERR;
-        }
-
-        if (elements == -1) {
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            moveToNextTask(r);
-        } else {
-            if (r->fn && r->fn->createArray)
-                obj = r->fn->createArray(cur,elements);
-            else
-                obj = (void*)REDIS_REPLY_ARRAY;
-
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            /* Modify task stack when there are more than 0 elements. */
-            if (elements > 0) {
-                cur->elements = elements;
-                cur->obj = obj;
-                r->ridx++;
-                r->rstack[r->ridx].type = -1;
-                r->rstack[r->ridx].elements = -1;
-                r->rstack[r->ridx].idx = 0;
-                r->rstack[r->ridx].obj = NULL;
-                r->rstack[r->ridx].parent = cur;
-                r->rstack[r->ridx].privdata = r->privdata;
-            } else {
-                moveToNextTask(r);
-            }
-        }
-
-        /* Set reply if this is the root object. */
-        if (root) r->reply = obj;
-        return REDIS_OK;
-    }
-
-    return REDIS_ERR;
-}
-
-static int processItem(redisReader *r) {
-    redisReadTask *cur = &(r->rstack[r->ridx]);
-    char *p;
-
-    /* check if we need to read type */
-    if (cur->type < 0) {
-        if ((p = readBytes(r,1)) != NULL) {
-            switch (p[0]) {
-            case '-':
-                cur->type = REDIS_REPLY_ERROR;
-                break;
-            case '+':
-                cur->type = REDIS_REPLY_STATUS;
-                break;
-            case ':':
-                cur->type = REDIS_REPLY_INTEGER;
-                break;
-            case '$':
-                cur->type = REDIS_REPLY_STRING;
-                break;
-            case '*':
-                cur->type = REDIS_REPLY_ARRAY;
-                break;
-            default:
-                __redisReaderSetErrorProtocolByte(r,*p);
-                return REDIS_ERR;
-            }
-        } else {
-            /* could not consume 1 byte */
-            return REDIS_ERR;
-        }
-    }
-
-    /* process typed item */
-    switch(cur->type) {
-    case REDIS_REPLY_ERROR:
-    case REDIS_REPLY_STATUS:
-    case REDIS_REPLY_INTEGER:
-        return processLineItem(r);
-    case REDIS_REPLY_STRING:
-        return processBulkItem(r);
-    case REDIS_REPLY_ARRAY:
-        return processMultiBulkItem(r);
-    default:
-        assert(NULL);
-        return REDIS_ERR; /* Avoid warning. */
-    }
-}
-
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
-    redisReader *r;
-
-    r = calloc(1,sizeof(redisReader));
-    if (r == NULL)
-        return NULL;
-
-    r->fn = fn;
-    r->buf = sdsempty();
-    r->maxbuf = REDIS_READER_MAX_BUF;
-    if (r->buf == NULL) {
-        free(r);
-        return NULL;
-    }
-
-    r->ridx = -1;
-    return r;
-}
-
-void redisReaderFree(redisReader *r) {
-    if (r == NULL)
-        return;
-    if (r->reply != NULL && r->fn && r->fn->freeObject)
-        r->fn->freeObject(r->reply);
-    sdsfree(r->buf);
-    free(r);
-}
-
-int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
-    sds newbuf;
-
-    /* Return early when this reader is in an erroneous state. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* Copy the provided buffer. */
-    if (buf != NULL && len >= 1) {
-        /* Destroy internal buffer when it is empty and is quite large. */
-        if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
-            sdsfree(r->buf);
-            r->buf = sdsempty();
-            r->pos = 0;
-
-            /* r->buf should not be NULL since we just free'd a larger one. */
-            assert(r->buf != NULL);
-        }
-
-        newbuf = sdscatlen(r->buf,buf,len);
-        if (newbuf == NULL) {
-            __redisReaderSetErrorOOM(r);
-            return REDIS_ERR;
-        }
-
-        r->buf = newbuf;
-        r->len = sdslen(r->buf);
-    }
-
-    return REDIS_OK;
-}
-
-int redisReaderGetReply(redisReader *r, void **reply) {
-    /* Default target pointer to NULL. */
-    if (reply != NULL)
-        *reply = NULL;
-
-    /* Return early when this reader is in an erroneous state. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* When the buffer is empty, there will never be a reply. */
-    if (r->len == 0)
-        return REDIS_OK;
-
-    /* Set first item to process when the stack is empty. */
-    if (r->ridx == -1) {
-        r->rstack[0].type = -1;
-        r->rstack[0].elements = -1;
-        r->rstack[0].idx = -1;
-        r->rstack[0].obj = NULL;
-        r->rstack[0].parent = NULL;
-        r->rstack[0].privdata = r->privdata;
-        r->ridx = 0;
-    }
-
-    /* Process items in reply. */
-    while (r->ridx >= 0)
-        if (processItem(r) != REDIS_OK)
-            break;
-
-    /* Return ASAP when an error occurred. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* Discard part of the buffer when we've consumed at least 1k, to avoid
-     * doing unnecessary calls to memmove() in sds.c. */
-    if (r->pos >= 1024) {
-        sdsrange(r->buf,r->pos,-1);
-        r->pos = 0;
-        r->len = sdslen(r->buf);
-    }
-
-    /* Emit a reply when there is one. */
-    if (r->ridx == -1) {
-        if (reply != NULL)
-            *reply = r->reply;
-        r->reply = NULL;
-    }
-    return REDIS_OK;
-}
diff --git a/ext/hiredis-0.14.1/read.h b/ext/hiredis-0.14.1/read.h
deleted file mode 100644
index 2988aa453..000000000
--- a/ext/hiredis-0.14.1/read.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef __HIREDIS_READ_H
-#define __HIREDIS_READ_H
-#include <stdio.h> /* for size_t */
-
-#define REDIS_ERR -1
-#define REDIS_OK 0
-
-/* When an error occurs, the err flag in a context is set to hold the type of
- * error that occurred. REDIS_ERR_IO means there was an I/O error and you
- * should use the "errno" variable to find out what is wrong.
- * For other values, the "errstr" field will hold a description. */
-#define REDIS_ERR_IO 1 /* Error in read or write */
-#define REDIS_ERR_EOF 3 /* End of file */
-#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
-#define REDIS_ERR_OOM 5 /* Out of memory */
-#define REDIS_ERR_OTHER 2 /* Everything else... */
-
-#define REDIS_REPLY_STRING 1
-#define REDIS_REPLY_ARRAY 2
-#define REDIS_REPLY_INTEGER 3
-#define REDIS_REPLY_NIL 4
-#define REDIS_REPLY_STATUS 5
-#define REDIS_REPLY_ERROR 6
-
-#define REDIS_READER_MAX_BUF (1024*16)  /* Default max unused reader buffer. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct redisReadTask {
-    int type;
-    int elements; /* number of elements in multibulk container */
-    int idx; /* index in parent (array) object */
-    void *obj; /* holds user-generated value for a read task */
-    struct redisReadTask *parent; /* parent task */
-    void *privdata; /* user-settable arbitrary field */
-} redisReadTask;
-
-typedef struct redisReplyObjectFunctions {
-    void *(*createString)(const redisReadTask*, char*, size_t);
-    void *(*createArray)(const redisReadTask*, int);
-    void *(*createInteger)(const redisReadTask*, long long);
-    void *(*createNil)(const redisReadTask*);
-    void (*freeObject)(void*);
-} redisReplyObjectFunctions;
-
-typedef struct redisReader {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-
-    char *buf; /* Read buffer */
-    size_t pos; /* Buffer cursor */
-    size_t len; /* Buffer length */
-    size_t maxbuf; /* Max length of unused buffer */
-
-    redisReadTask rstack[9];
-    int ridx; /* Index of current read task */
-    void *reply; /* Temporary reply pointer */
-
-    redisReplyObjectFunctions *fn;
-    void *privdata;
-} redisReader;
-
-/* Public API for the protocol parser. */
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
-void redisReaderFree(redisReader *r);
-int redisReaderFeed(redisReader *r, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *r, void **reply);
-
-#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
-#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply)
-#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/sds.c b/ext/hiredis-0.14.1/sds.c
deleted file mode 100644
index 923ffd82f..000000000
--- a/ext/hiredis-0.14.1/sds.c
+++ /dev/null
@@ -1,1272 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include "sds.h"
-#include "sdsalloc.h"
-
-static inline int sdsHdrSize(char type) {
-    switch(type&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return sizeof(struct sdshdr5);
-        case SDS_TYPE_8:
-            return sizeof(struct sdshdr8);
-        case SDS_TYPE_16:
-            return sizeof(struct sdshdr16);
-        case SDS_TYPE_32:
-            return sizeof(struct sdshdr32);
-        case SDS_TYPE_64:
-            return sizeof(struct sdshdr64);
-    }
-    return 0;
-}
-
-static inline char sdsReqType(size_t string_size) {
-    if (string_size < 32)
-        return SDS_TYPE_5;
-    if (string_size < 0xff)
-        return SDS_TYPE_8;
-    if (string_size < 0xffff)
-        return SDS_TYPE_16;
-    if (string_size < 0xffffffff)
-        return SDS_TYPE_32;
-    return SDS_TYPE_64;
-}
-
-/* Create a new sds string with the content specified by the 'init' pointer
- * and 'initlen'.
- * If NULL is used for 'init' the string is initialized with zero bytes.
- *
- * The string is always null-termined (all the sds strings are, always) so
- * even if you create an sds string with:
- *
- * mystring = sdsnewlen("abc",3);
- *
- * You can print the string with printf() as there is an implicit \0 at the
- * end of the string. However the string is binary safe and can contain
- * \0 characters in the middle, as the length is stored in the sds header. */
-sds sdsnewlen(const void *init, size_t initlen) {
-    void *sh;
-    sds s;
-    char type = sdsReqType(initlen);
-    /* Empty strings are usually created in order to append. Use type 8
-     * since type 5 is not good at this. */
-    if (type == SDS_TYPE_5 && initlen == 0) type = SDS_TYPE_8;
-    int hdrlen = sdsHdrSize(type);
-    unsigned char *fp; /* flags pointer. */
-
-    sh = s_malloc(hdrlen+initlen+1);
-    if (sh == NULL) return NULL;
-    if (!init)
-        memset(sh, 0, hdrlen+initlen+1);
-    s = (char*)sh+hdrlen;
-    fp = ((unsigned char*)s)-1;
-    switch(type) {
-        case SDS_TYPE_5: {
-            *fp = type | (initlen << SDS_TYPE_BITS);
-            break;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-    }
-    if (initlen && init)
-        memcpy(s, init, initlen);
-    s[initlen] = '\0';
-    return s;
-}
-
-/* Create an empty (zero length) sds string. Even in this case the string
- * always has an implicit null term. */
-sds sdsempty(void) {
-    return sdsnewlen("",0);
-}
-
-/* Create a new sds string starting from a null terminated C string. */
-sds sdsnew(const char *init) {
-    size_t initlen = (init == NULL) ? 0 : strlen(init);
-    return sdsnewlen(init, initlen);
-}
-
-/* Duplicate an sds string. */
-sds sdsdup(const sds s) {
-    return sdsnewlen(s, sdslen(s));
-}
-
-/* Free an sds string. No operation is performed if 's' is NULL. */
-void sdsfree(sds s) {
-    if (s == NULL) return;
-    s_free((char*)s-sdsHdrSize(s[-1]));
-}
-
-/* Set the sds string length to the length as obtained with strlen(), so
- * considering as content only up to the first null term character.
- *
- * This function is useful when the sds string is hacked manually in some
- * way, like in the following example:
- *
- * s = sdsnew("foobar");
- * s[2] = '\0';
- * sdsupdatelen(s);
- * printf("%d\n", sdslen(s));
- *
- * The output will be "2", but if we comment out the call to sdsupdatelen()
- * the output will be "6" as the string was modified but the logical length
- * remains 6 bytes. */
-void sdsupdatelen(sds s) {
-    int reallen = strlen(s);
-    sdssetlen(s, reallen);
-}
-
-/* Modify an sds string in-place to make it empty (zero length).
- * However all the existing buffer is not discarded but set as free space
- * so that next append operations will not require allocations up to the
- * number of bytes previously available. */
-void sdsclear(sds s) {
-    sdssetlen(s, 0);
-    s[0] = '\0';
-}
-
-/* Enlarge the free space at the end of the sds string so that the caller
- * is sure that after calling this function can overwrite up to addlen
- * bytes after the end of the string, plus one more byte for nul term.
- *
- * Note: this does not change the *length* of the sds string as returned
- * by sdslen(), but only the free buffer space we have. */
-sds sdsMakeRoomFor(sds s, size_t addlen) {
-    void *sh, *newsh;
-    size_t avail = sdsavail(s);
-    size_t len, newlen;
-    char type, oldtype = s[-1] & SDS_TYPE_MASK;
-    int hdrlen;
-
-    /* Return ASAP if there is enough space left. */
-    if (avail >= addlen) return s;
-
-    len = sdslen(s);
-    sh = (char*)s-sdsHdrSize(oldtype);
-    newlen = (len+addlen);
-    if (newlen < SDS_MAX_PREALLOC)
-        newlen *= 2;
-    else
-        newlen += SDS_MAX_PREALLOC;
-
-    type = sdsReqType(newlen);
-
-    /* Don't use type 5: the user is appending to the string and type 5 is
-     * not able to remember empty space, so sdsMakeRoomFor() must be called
-     * at every appending operation. */
-    if (type == SDS_TYPE_5) type = SDS_TYPE_8;
-
-    hdrlen = sdsHdrSize(type);
-    if (oldtype==type) {
-        newsh = s_realloc(sh, hdrlen+newlen+1);
-        if (newsh == NULL) return NULL;
-        s = (char*)newsh+hdrlen;
-    } else {
-        /* Since the header size changes, need to move the string forward,
-         * and can't use realloc */
-        newsh = s_malloc(hdrlen+newlen+1);
-        if (newsh == NULL) return NULL;
-        memcpy((char*)newsh+hdrlen, s, len+1);
-        s_free(sh);
-        s = (char*)newsh+hdrlen;
-        s[-1] = type;
-        sdssetlen(s, len);
-    }
-    sdssetalloc(s, newlen);
-    return s;
-}
-
-/* Reallocate the sds string so that it has no free space at the end. The
- * contained string remains not altered, but next concatenation operations
- * will require a reallocation.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdsRemoveFreeSpace(sds s) {
-    void *sh, *newsh;
-    char type, oldtype = s[-1] & SDS_TYPE_MASK;
-    int hdrlen;
-    size_t len = sdslen(s);
-    sh = (char*)s-sdsHdrSize(oldtype);
-
-    type = sdsReqType(len);
-    hdrlen = sdsHdrSize(type);
-    if (oldtype==type) {
-        newsh = s_realloc(sh, hdrlen+len+1);
-        if (newsh == NULL) return NULL;
-        s = (char*)newsh+hdrlen;
-    } else {
-        newsh = s_malloc(hdrlen+len+1);
-        if (newsh == NULL) return NULL;
-        memcpy((char*)newsh+hdrlen, s, len+1);
-        s_free(sh);
-        s = (char*)newsh+hdrlen;
-        s[-1] = type;
-        sdssetlen(s, len);
-    }
-    sdssetalloc(s, len);
-    return s;
-}
-
-/* Return the total size of the allocation of the specifed sds string,
- * including:
- * 1) The sds header before the pointer.
- * 2) The string.
- * 3) The free buffer at the end if any.
- * 4) The implicit null term.
- */
-size_t sdsAllocSize(sds s) {
-    size_t alloc = sdsalloc(s);
-    return sdsHdrSize(s[-1])+alloc+1;
-}
-
-/* Return the pointer of the actual SDS allocation (normally SDS strings
- * are referenced by the start of the string buffer). */
-void *sdsAllocPtr(sds s) {
-    return (void*) (s-sdsHdrSize(s[-1]));
-}
-
-/* Increment the sds length and decrements the left free space at the
- * end of the string according to 'incr'. Also set the null term
- * in the new end of the string.
- *
- * This function is used in order to fix the string length after the
- * user calls sdsMakeRoomFor(), writes something after the end of
- * the current string, and finally needs to set the new length.
- *
- * Note: it is possible to use a negative increment in order to
- * right-trim the string.
- *
- * Usage example:
- *
- * Using sdsIncrLen() and sdsMakeRoomFor() it is possible to mount the
- * following schema, to cat bytes coming from the kernel to the end of an
- * sds string without copying into an intermediate buffer:
- *
- * oldlen = sdslen(s);
- * s = sdsMakeRoomFor(s, BUFFER_SIZE);
- * nread = read(fd, s+oldlen, BUFFER_SIZE);
- * ... check for nread <= 0 and handle it ...
- * sdsIncrLen(s, nread);
- */
-void sdsIncrLen(sds s, int incr) {
-    unsigned char flags = s[-1];
-    size_t len;
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
-            unsigned char *fp = ((unsigned char*)s)-1;
-            unsigned char oldlen = SDS_TYPE_5_LEN(flags);
-            assert((incr > 0 && oldlen+incr < 32) || (incr < 0 && oldlen >= (unsigned int)(-incr)));
-            *fp = SDS_TYPE_5 | ((oldlen+incr) << SDS_TYPE_BITS);
-            len = oldlen+incr;
-            break;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= (unsigned int)incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= (uint64_t)incr) || (incr < 0 && sh->len >= (uint64_t)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        default: len = 0; /* Just to avoid compilation warnings. */
-    }
-    s[len] = '\0';
-}
-
-/* Grow the sds to have the specified length. Bytes that were not part of
- * the original length of the sds will be set to zero.
- *
- * if the specified length is smaller than the current length, no operation
- * is performed. */
-sds sdsgrowzero(sds s, size_t len) {
-    size_t curlen = sdslen(s);
-
-    if (len <= curlen) return s;
-    s = sdsMakeRoomFor(s,len-curlen);
-    if (s == NULL) return NULL;
-
-    /* Make sure added region doesn't contain garbage */
-    memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
-    sdssetlen(s, len);
-    return s;
-}
-
-/* Append the specified binary-safe string pointed by 't' of 'len' bytes to the
- * end of the specified sds string 's'.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatlen(sds s, const void *t, size_t len) {
-    size_t curlen = sdslen(s);
-
-    s = sdsMakeRoomFor(s,len);
-    if (s == NULL) return NULL;
-    memcpy(s+curlen, t, len);
-    sdssetlen(s, curlen+len);
-    s[curlen+len] = '\0';
-    return s;
-}
-
-/* Append the specified null termianted C string to the sds string 's'.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscat(sds s, const char *t) {
-    return sdscatlen(s, t, strlen(t));
-}
-
-/* Append the specified sds 't' to the existing sds 's'.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatsds(sds s, const sds t) {
-    return sdscatlen(s, t, sdslen(t));
-}
-
-/* Destructively modify the sds string 's' to hold the specified binary
- * safe string pointed by 't' of length 'len' bytes. */
-sds sdscpylen(sds s, const char *t, size_t len) {
-    if (sdsalloc(s) < len) {
-        s = sdsMakeRoomFor(s,len-sdslen(s));
-        if (s == NULL) return NULL;
-    }
-    memcpy(s, t, len);
-    s[len] = '\0';
-    sdssetlen(s, len);
-    return s;
-}
-
-/* Like sdscpylen() but 't' must be a null-termined string so that the length
- * of the string is obtained with strlen(). */
-sds sdscpy(sds s, const char *t) {
-    return sdscpylen(s, t, strlen(t));
-}
-
-/* Helper for sdscatlonglong() doing the actual number -> string
- * conversion. 's' must point to a string with room for at least
- * SDS_LLSTR_SIZE bytes.
- *
- * The function returns the length of the null-terminated string
- * representation stored at 's'. */
-#define SDS_LLSTR_SIZE 21
-int sdsll2str(char *s, long long value) {
-    char *p, aux;
-    unsigned long long v;
-    size_t l;
-
-    /* Generate the string representation, this method produces
-     * an reversed string. */
-    v = (value < 0) ? -value : value;
-    p = s;
-    do {
-        *p++ = '0'+(v%10);
-        v /= 10;
-    } while(v);
-    if (value < 0) *p++ = '-';
-
-    /* Compute length and add null term. */
-    l = p-s;
-    *p = '\0';
-
-    /* Reverse the string. */
-    p--;
-    while(s < p) {
-        aux = *s;
-        *s = *p;
-        *p = aux;
-        s++;
-        p--;
-    }
-    return l;
-}
-
-/* Identical sdsll2str(), but for unsigned long long type. */
-int sdsull2str(char *s, unsigned long long v) {
-    char *p, aux;
-    size_t l;
-
-    /* Generate the string representation, this method produces
-     * an reversed string. */
-    p = s;
-    do {
-        *p++ = '0'+(v%10);
-        v /= 10;
-    } while(v);
-
-    /* Compute length and add null term. */
-    l = p-s;
-    *p = '\0';
-
-    /* Reverse the string. */
-    p--;
-    while(s < p) {
-        aux = *s;
-        *s = *p;
-        *p = aux;
-        s++;
-        p--;
-    }
-    return l;
-}
-
-/* Create an sds string from a long long value. It is much faster than:
- *
- * sdscatprintf(sdsempty(),"%lld\n", value);
- */
-sds sdsfromlonglong(long long value) {
-    char buf[SDS_LLSTR_SIZE];
-    int len = sdsll2str(buf,value);
-
-    return sdsnewlen(buf,len);
-}
-
-/* Like sdscatprintf() but gets va_list instead of being variadic. */
-sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
-    va_list cpy;
-    char staticbuf[1024], *buf = staticbuf, *t;
-    size_t buflen = strlen(fmt)*2;
-
-    /* We try to start using a static buffer for speed.
-     * If not possible we revert to heap allocation. */
-    if (buflen > sizeof(staticbuf)) {
-        buf = s_malloc(buflen);
-        if (buf == NULL) return NULL;
-    } else {
-        buflen = sizeof(staticbuf);
-    }
-
-    /* Try with buffers two times bigger every time we fail to
-     * fit the string in the current buffer size. */
-    while(1) {
-        buf[buflen-2] = '\0';
-        va_copy(cpy,ap);
-        vsnprintf(buf, buflen, fmt, cpy);
-        va_end(cpy);
-        if (buf[buflen-2] != '\0') {
-            if (buf != staticbuf) s_free(buf);
-            buflen *= 2;
-            buf = s_malloc(buflen);
-            if (buf == NULL) return NULL;
-            continue;
-        }
-        break;
-    }
-
-    /* Finally concat the obtained string to the SDS string and return it. */
-    t = sdscat(s, buf);
-    if (buf != staticbuf) s_free(buf);
-    return t;
-}
-
-/* Append to the sds string 's' a string obtained using printf-alike format
- * specifier.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call.
- *
- * Example:
- *
- * s = sdsnew("Sum is: ");
- * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b).
- *
- * Often you need to create a string from scratch with the printf-alike
- * format. When this is the need, just use sdsempty() as the target string:
- *
- * s = sdscatprintf(sdsempty(), "... your format ...", args);
- */
-sds sdscatprintf(sds s, const char *fmt, ...) {
-    va_list ap;
-    char *t;
-    va_start(ap, fmt);
-    t = sdscatvprintf(s,fmt,ap);
-    va_end(ap);
-    return t;
-}
-
-/* This function is similar to sdscatprintf, but much faster as it does
- * not rely on sprintf() family functions implemented by the libc that
- * are often very slow. Moreover directly handling the sds string as
- * new data is concatenated provides a performance improvement.
- *
- * However this function only handles an incompatible subset of printf-alike
- * format specifiers:
- *
- * %s - C String
- * %S - SDS string
- * %i - signed int
- * %I - 64 bit signed integer (long long, int64_t)
- * %u - unsigned int
- * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
- * %% - Verbatim "%" character.
- */
-sds sdscatfmt(sds s, char const *fmt, ...) {
-    const char *f = fmt;
-    int i;
-    va_list ap;
-
-    va_start(ap,fmt);
-    i = sdslen(s); /* Position of the next byte to write to dest str. */
-    while(*f) {
-        char next, *str;
-        size_t l;
-        long long num;
-        unsigned long long unum;
-
-        /* Make sure there is always space for at least 1 char. */
-        if (sdsavail(s)==0) {
-            s = sdsMakeRoomFor(s,1);
-        }
-
-        switch(*f) {
-        case '%':
-            next = *(f+1);
-            f++;
-            switch(next) {
-            case 's':
-            case 'S':
-                str = va_arg(ap,char*);
-                l = (next == 's') ? strlen(str) : sdslen(str);
-                if (sdsavail(s) < l) {
-                    s = sdsMakeRoomFor(s,l);
-                }
-                memcpy(s+i,str,l);
-                sdsinclen(s,l);
-                i += l;
-                break;
-            case 'i':
-            case 'I':
-                if (next == 'i')
-                    num = va_arg(ap,int);
-                else
-                    num = va_arg(ap,long long);
-                {
-                    char buf[SDS_LLSTR_SIZE];
-                    l = sdsll2str(buf,num);
-                    if (sdsavail(s) < l) {
-                        s = sdsMakeRoomFor(s,l);
-                    }
-                    memcpy(s+i,buf,l);
-                    sdsinclen(s,l);
-                    i += l;
-                }
-                break;
-            case 'u':
-            case 'U':
-                if (next == 'u')
-                    unum = va_arg(ap,unsigned int);
-                else
-                    unum = va_arg(ap,unsigned long long);
-                {
-                    char buf[SDS_LLSTR_SIZE];
-                    l = sdsull2str(buf,unum);
-                    if (sdsavail(s) < l) {
-                        s = sdsMakeRoomFor(s,l);
-                    }
-                    memcpy(s+i,buf,l);
-                    sdsinclen(s,l);
-                    i += l;
-                }
-                break;
-            default: /* Handle %% and generally %<unknown>. */
-                s[i++] = next;
-                sdsinclen(s,1);
-                break;
-            }
-            break;
-        default:
-            s[i++] = *f;
-            sdsinclen(s,1);
-            break;
-        }
-        f++;
-    }
-    va_end(ap);
-
-    /* Add null-term */
-    s[i] = '\0';
-    return s;
-}
-
-/* Remove the part of the string from left and from right composed just of
- * contiguous characters found in 'cset', that is a null terminted C string.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call.
- *
- * Example:
- *
- * s = sdsnew("AA...AA.a.aa.aHelloWorld     :::");
- * s = sdstrim(s,"Aa. :");
- * printf("%s\n", s);
- *
- * Output will be just "Hello World".
- */
-sds sdstrim(sds s, const char *cset) {
-    char *start, *end, *sp, *ep;
-    size_t len;
-
-    sp = start = s;
-    ep = end = s+sdslen(s)-1;
-    while(sp <= end && strchr(cset, *sp)) sp++;
-    while(ep > sp && strchr(cset, *ep)) ep--;
-    len = (sp > ep) ? 0 : ((ep-sp)+1);
-    if (s != sp) memmove(s, sp, len);
-    s[len] = '\0';
-    sdssetlen(s,len);
-    return s;
-}
-
-/* Turn the string into a smaller (or equal) string containing only the
- * substring specified by the 'start' and 'end' indexes.
- *
- * start and end can be negative, where -1 means the last character of the
- * string, -2 the penultimate character, and so forth.
- *
- * The interval is inclusive, so the start and end characters will be part
- * of the resulting string.
- *
- * The string is modified in-place.
- *
- * Example:
- *
- * s = sdsnew("Hello World");
- * sdsrange(s,1,-1); => "ello World"
- */
-void sdsrange(sds s, int start, int end) {
-    size_t newlen, len = sdslen(s);
-
-    if (len == 0) return;
-    if (start < 0) {
-        start = len+start;
-        if (start < 0) start = 0;
-    }
-    if (end < 0) {
-        end = len+end;
-        if (end < 0) end = 0;
-    }
-    newlen = (start > end) ? 0 : (end-start)+1;
-    if (newlen != 0) {
-        if (start >= (signed)len) {
-            newlen = 0;
-        } else if (end >= (signed)len) {
-            end = len-1;
-            newlen = (start > end) ? 0 : (end-start)+1;
-        }
-    } else {
-        start = 0;
-    }
-    if (start && newlen) memmove(s, s+start, newlen);
-    s[newlen] = 0;
-    sdssetlen(s,newlen);
-}
-
-/* Apply tolower() to every character of the sds string 's'. */
-void sdstolower(sds s) {
-    int len = sdslen(s), j;
-
-    for (j = 0; j < len; j++) s[j] = tolower(s[j]);
-}
-
-/* Apply toupper() to every character of the sds string 's'. */
-void sdstoupper(sds s) {
-    int len = sdslen(s), j;
-
-    for (j = 0; j < len; j++) s[j] = toupper(s[j]);
-}
-
-/* Compare two sds strings s1 and s2 with memcmp().
- *
- * Return value:
- *
- *     positive if s1 > s2.
- *     negative if s1 < s2.
- *     0 if s1 and s2 are exactly the same binary string.
- *
- * If two strings share exactly the same prefix, but one of the two has
- * additional characters, the longer string is considered to be greater than
- * the smaller one. */
-int sdscmp(const sds s1, const sds s2) {
-    size_t l1, l2, minlen;
-    int cmp;
-
-    l1 = sdslen(s1);
-    l2 = sdslen(s2);
-    minlen = (l1 < l2) ? l1 : l2;
-    cmp = memcmp(s1,s2,minlen);
-    if (cmp == 0) return l1-l2;
-    return cmp;
-}
-
-/* Split 's' with separator in 'sep'. An array
- * of sds strings is returned. *count will be set
- * by reference to the number of tokens returned.
- *
- * On out of memory, zero length string, zero length
- * separator, NULL is returned.
- *
- * Note that 'sep' is able to split a string using
- * a multi-character separator. For example
- * sdssplit("foo_-_bar","_-_"); will return two
- * elements "foo" and "bar".
- *
- * This version of the function is binary-safe but
- * requires length arguments. sdssplit() is just the
- * same function but for zero-terminated strings.
- */
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) {
-    int elements = 0, slots = 5, start = 0, j;
-    sds *tokens;
-
-    if (seplen < 1 || len < 0) return NULL;
-
-    tokens = s_malloc(sizeof(sds)*slots);
-    if (tokens == NULL) return NULL;
-
-    if (len == 0) {
-        *count = 0;
-        return tokens;
-    }
-    for (j = 0; j < (len-(seplen-1)); j++) {
-        /* make sure there is room for the next element and the final one */
-        if (slots < elements+2) {
-            sds *newtokens;
-
-            slots *= 2;
-            newtokens = s_realloc(tokens,sizeof(sds)*slots);
-            if (newtokens == NULL) goto cleanup;
-            tokens = newtokens;
-        }
-        /* search the separator */
-        if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
-            tokens[elements] = sdsnewlen(s+start,j-start);
-            if (tokens[elements] == NULL) goto cleanup;
-            elements++;
-            start = j+seplen;
-            j = j+seplen-1; /* skip the separator */
-        }
-    }
-    /* Add the final element. We are sure there is room in the tokens array. */
-    tokens[elements] = sdsnewlen(s+start,len-start);
-    if (tokens[elements] == NULL) goto cleanup;
-    elements++;
-    *count = elements;
-    return tokens;
-
-cleanup:
-    {
-        int i;
-        for (i = 0; i < elements; i++) sdsfree(tokens[i]);
-        s_free(tokens);
-        *count = 0;
-        return NULL;
-    }
-}
-
-/* Free the result returned by sdssplitlen(), or do nothing if 'tokens' is NULL. */
-void sdsfreesplitres(sds *tokens, int count) {
-    if (!tokens) return;
-    while(count--)
-        sdsfree(tokens[count]);
-    s_free(tokens);
-}
-
-/* Append to the sds string "s" an escaped string representation where
- * all the non-printable characters (tested with isprint()) are turned into
- * escapes in the form "\n\r\a...." or "\x<hex-number>".
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatrepr(sds s, const char *p, size_t len) {
-    s = sdscatlen(s,"\"",1);
-    while(len--) {
-        switch(*p) {
-        case '\\':
-        case '"':
-            s = sdscatprintf(s,"\\%c",*p);
-            break;
-        case '\n': s = sdscatlen(s,"\\n",2); break;
-        case '\r': s = sdscatlen(s,"\\r",2); break;
-        case '\t': s = sdscatlen(s,"\\t",2); break;
-        case '\a': s = sdscatlen(s,"\\a",2); break;
-        case '\b': s = sdscatlen(s,"\\b",2); break;
-        default:
-            if (isprint(*p))
-                s = sdscatprintf(s,"%c",*p);
-            else
-                s = sdscatprintf(s,"\\x%02x",(unsigned char)*p);
-            break;
-        }
-        p++;
-    }
-    return sdscatlen(s,"\"",1);
-}
-
-/* Helper function for sdssplitargs() that returns non zero if 'c'
- * is a valid hex digit. */
-int is_hex_digit(char c) {
-    return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') ||
-           (c >= 'A' && c <= 'F');
-}
-
-/* Helper function for sdssplitargs() that converts a hex digit into an
- * integer from 0 to 15 */
-int hex_digit_to_int(char c) {
-    switch(c) {
-    case '0': return 0;
-    case '1': return 1;
-    case '2': return 2;
-    case '3': return 3;
-    case '4': return 4;
-    case '5': return 5;
-    case '6': return 6;
-    case '7': return 7;
-    case '8': return 8;
-    case '9': return 9;
-    case 'a': case 'A': return 10;
-    case 'b': case 'B': return 11;
-    case 'c': case 'C': return 12;
-    case 'd': case 'D': return 13;
-    case 'e': case 'E': return 14;
-    case 'f': case 'F': return 15;
-    default: return 0;
-    }
-}
-
-/* Split a line into arguments, where every argument can be in the
- * following programming-language REPL-alike form:
- *
- * foo bar "newline are supported\n" and "\xff\x00otherstuff"
- *
- * The number of arguments is stored into *argc, and an array
- * of sds is returned.
- *
- * The caller should free the resulting array of sds strings with
- * sdsfreesplitres().
- *
- * Note that sdscatrepr() is able to convert back a string into
- * a quoted string in the same format sdssplitargs() is able to parse.
- *
- * The function returns the allocated tokens on success, even when the
- * input string is empty, or NULL if the input contains unbalanced
- * quotes or closed quotes followed by non space characters
- * as in: "foo"bar or "foo'
- */
-sds *sdssplitargs(const char *line, int *argc) {
-    const char *p = line;
-    char *current = NULL;
-    char **vector = NULL;
-
-    *argc = 0;
-    while(1) {
-        /* skip blanks */
-        while(*p && isspace(*p)) p++;
-        if (*p) {
-            /* get a token */
-            int inq=0;  /* set to 1 if we are in "quotes" */
-            int insq=0; /* set to 1 if we are in 'single quotes' */
-            int done=0;
-
-            if (current == NULL) current = sdsempty();
-            while(!done) {
-                if (inq) {
-                    if (*p == '\\' && *(p+1) == 'x' &&
-                                             is_hex_digit(*(p+2)) &&
-                                             is_hex_digit(*(p+3)))
-                    {
-                        unsigned char byte;
-
-                        byte = (hex_digit_to_int(*(p+2))*16)+
-                                hex_digit_to_int(*(p+3));
-                        current = sdscatlen(current,(char*)&byte,1);
-                        p += 3;
-                    } else if (*p == '\\' && *(p+1)) {
-                        char c;
-
-                        p++;
-                        switch(*p) {
-                        case 'n': c = '\n'; break;
-                        case 'r': c = '\r'; break;
-                        case 't': c = '\t'; break;
-                        case 'b': c = '\b'; break;
-                        case 'a': c = '\a'; break;
-                        default: c = *p; break;
-                        }
-                        current = sdscatlen(current,&c,1);
-                    } else if (*p == '"') {
-                        /* closing quote must be followed by a space or
-                         * nothing at all. */
-                        if (*(p+1) && !isspace(*(p+1))) goto err;
-                        done=1;
-                    } else if (!*p) {
-                        /* unterminated quotes */
-                        goto err;
-                    } else {
-                        current = sdscatlen(current,p,1);
-                    }
-                } else if (insq) {
-                    if (*p == '\\' && *(p+1) == '\'') {
-                        p++;
-                        current = sdscatlen(current,"'",1);
-                    } else if (*p == '\'') {
-                        /* closing quote must be followed by a space or
-                         * nothing at all. */
-                        if (*(p+1) && !isspace(*(p+1))) goto err;
-                        done=1;
-                    } else if (!*p) {
-                        /* unterminated quotes */
-                        goto err;
-                    } else {
-                        current = sdscatlen(current,p,1);
-                    }
-                } else {
-                    switch(*p) {
-                    case ' ':
-                    case '\n':
-                    case '\r':
-                    case '\t':
-                    case '\0':
-                        done=1;
-                        break;
-                    case '"':
-                        inq=1;
-                        break;
-                    case '\'':
-                        insq=1;
-                        break;
-                    default:
-                        current = sdscatlen(current,p,1);
-                        break;
-                    }
-                }
-                if (*p) p++;
-            }
-            /* add the token to the vector */
-            vector = s_realloc(vector,((*argc)+1)*sizeof(char*));
-            vector[*argc] = current;
-            (*argc)++;
-            current = NULL;
-        } else {
-            /* Even on empty input string return something not NULL. */
-            if (vector == NULL) vector = s_malloc(sizeof(void*));
-            return vector;
-        }
-    }
-
-err:
-    while((*argc)--)
-        sdsfree(vector[*argc]);
-    s_free(vector);
-    if (current) sdsfree(current);
-    *argc = 0;
-    return NULL;
-}
-
-/* Modify the string substituting all the occurrences of the set of
- * characters specified in the 'from' string to the corresponding character
- * in the 'to' array.
- *
- * For instance: sdsmapchars(mystring, "ho", "01", 2)
- * will have the effect of turning the string "hello" into "0ell1".
- *
- * The function returns the sds string pointer, that is always the same
- * as the input pointer since no resize is needed. */
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
-    size_t j, i, l = sdslen(s);
-
-    for (j = 0; j < l; j++) {
-        for (i = 0; i < setlen; i++) {
-            if (s[j] == from[i]) {
-                s[j] = to[i];
-                break;
-            }
-        }
-    }
-    return s;
-}
-
-/* Join an array of C strings using the specified separator (also a C string).
- * Returns the result as an sds string. */
-sds sdsjoin(char **argv, int argc, char *sep) {
-    sds join = sdsempty();
-    int j;
-
-    for (j = 0; j < argc; j++) {
-        join = sdscat(join, argv[j]);
-        if (j != argc-1) join = sdscat(join,sep);
-    }
-    return join;
-}
-
-/* Like sdsjoin, but joins an array of SDS strings. */
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
-    sds join = sdsempty();
-    int j;
-
-    for (j = 0; j < argc; j++) {
-        join = sdscatsds(join, argv[j]);
-        if (j != argc-1) join = sdscatlen(join,sep,seplen);
-    }
-    return join;
-}
-
-/* Wrappers to the allocators used by SDS. Note that SDS will actually
- * just use the macros defined into sdsalloc.h in order to avoid to pay
- * the overhead of function calls. Here we define these wrappers only for
- * the programs SDS is linked to, if they want to touch the SDS internals
- * even if they use a different allocator. */
-void *sds_malloc(size_t size) { return s_malloc(size); }
-void *sds_realloc(void *ptr, size_t size) { return s_realloc(ptr,size); }
-void sds_free(void *ptr) { s_free(ptr); }
-
-#if defined(SDS_TEST_MAIN)
-#include <stdio.h>
-#include "testhelp.h"
-#include "limits.h"
-
-#define UNUSED(x) (void)(x)
-int sdsTest(void) {
-    {
-        sds x = sdsnew("foo"), y;
-
-        test_cond("Create a string and obtain the length",
-            sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0)
-
-        sdsfree(x);
-        x = sdsnewlen("foo",2);
-        test_cond("Create a string with specified length",
-            sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0)
-
-        x = sdscat(x,"bar");
-        test_cond("Strings concatenation",
-            sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0);
-
-        x = sdscpy(x,"a");
-        test_cond("sdscpy() against an originally longer string",
-            sdslen(x) == 1 && memcmp(x,"a\0",2) == 0)
-
-        x = sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk");
-        test_cond("sdscpy() against an originally shorter string",
-            sdslen(x) == 33 &&
-            memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0)
-
-        sdsfree(x);
-        x = sdscatprintf(sdsempty(),"%d",123);
-        test_cond("sdscatprintf() seems working in the base case",
-            sdslen(x) == 3 && memcmp(x,"123\0",4) == 0)
-
-        sdsfree(x);
-        x = sdsnew("--");
-        x = sdscatfmt(x, "Hello %s World %I,%I--", "Hi!", LLONG_MIN,LLONG_MAX);
-        test_cond("sdscatfmt() seems working in the base case",
-            sdslen(x) == 60 &&
-            memcmp(x,"--Hello Hi! World -9223372036854775808,"
-                     "9223372036854775807--",60) == 0)
-        printf("[%s]\n",x);
-
-        sdsfree(x);
-        x = sdsnew("--");
-        x = sdscatfmt(x, "%u,%U--", UINT_MAX, ULLONG_MAX);
-        test_cond("sdscatfmt() seems working with unsigned numbers",
-            sdslen(x) == 35 &&
-            memcmp(x,"--4294967295,18446744073709551615--",35) == 0)
-
-        sdsfree(x);
-        x = sdsnew(" x ");
-        sdstrim(x," x");
-        test_cond("sdstrim() works when all chars match",
-            sdslen(x) == 0)
-
-        sdsfree(x);
-        x = sdsnew(" x ");
-        sdstrim(x," ");
-        test_cond("sdstrim() works when a single char remains",
-            sdslen(x) == 1 && x[0] == 'x')
-
-        sdsfree(x);
-        x = sdsnew("xxciaoyyy");
-        sdstrim(x,"xy");
-        test_cond("sdstrim() correctly trims characters",
-            sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0)
-
-        y = sdsdup(x);
-        sdsrange(y,1,1);
-        test_cond("sdsrange(...,1,1)",
-            sdslen(y) == 1 && memcmp(y,"i\0",2) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,1,-1);
-        test_cond("sdsrange(...,1,-1)",
-            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,-2,-1);
-        test_cond("sdsrange(...,-2,-1)",
-            sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,2,1);
-        test_cond("sdsrange(...,2,1)",
-            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,1,100);
-        test_cond("sdsrange(...,1,100)",
-            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,100,100);
-        test_cond("sdsrange(...,100,100)",
-            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("foo");
-        y = sdsnew("foa");
-        test_cond("sdscmp(foo,foa)", sdscmp(x,y) > 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("bar");
-        y = sdsnew("bar");
-        test_cond("sdscmp(bar,bar)", sdscmp(x,y) == 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("aar");
-        y = sdsnew("bar");
-        test_cond("sdscmp(bar,bar)", sdscmp(x,y) < 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnewlen("\a\n\0foo\r",7);
-        y = sdscatrepr(sdsempty(),x,sdslen(x));
-        test_cond("sdscatrepr(...data...)",
-            memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
-
-        {
-            unsigned int oldfree;
-            char *p;
-            int step = 10, j, i;
-
-            sdsfree(x);
-            sdsfree(y);
-            x = sdsnew("0");
-            test_cond("sdsnew() free/len buffers", sdslen(x) == 1 && sdsavail(x) == 0);
-
-            /* Run the test a few times in order to hit the first two
-             * SDS header types. */
-            for (i = 0; i < 10; i++) {
-                int oldlen = sdslen(x);
-                x = sdsMakeRoomFor(x,step);
-                int type = x[-1]&SDS_TYPE_MASK;
-
-                test_cond("sdsMakeRoomFor() len", sdslen(x) == oldlen);
-                if (type != SDS_TYPE_5) {
-                    test_cond("sdsMakeRoomFor() free", sdsavail(x) >= step);
-                    oldfree = sdsavail(x);
-                }
-                p = x+oldlen;
-                for (j = 0; j < step; j++) {
-                    p[j] = 'A'+j;
-                }
-                sdsIncrLen(x,step);
-            }
-            test_cond("sdsMakeRoomFor() content",
-                memcmp("0ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ",x,101) == 0);
-            test_cond("sdsMakeRoomFor() final length",sdslen(x)==101);
-
-            sdsfree(x);
-        }
-    }
-    test_report()
-    return 0;
-}
-#endif
-
-#ifdef SDS_TEST_MAIN
-int main(void) {
-    return sdsTest();
-}
-#endif
diff --git a/ext/hiredis-0.14.1/sds.h b/ext/hiredis-0.14.1/sds.h
deleted file mode 100644
index 13be75a9f..000000000
--- a/ext/hiredis-0.14.1/sds.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SDS_H
-#define __SDS_H
-
-#define SDS_MAX_PREALLOC (1024*1024)
-
-#include <sys/types.h>
-#include <stdarg.h>
-#include <stdint.h>
-
-typedef char *sds;
-
-/* Note: sdshdr5 is never used, we just access the flags byte directly.
- * However is here to document the layout of type 5 SDS strings. */
-struct __attribute__ ((__packed__)) sdshdr5 {
-    unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr8 {
-    uint8_t len; /* used */
-    uint8_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr16 {
-    uint16_t len; /* used */
-    uint16_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr32 {
-    uint32_t len; /* used */
-    uint32_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr64 {
-    uint64_t len; /* used */
-    uint64_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-
-#define SDS_TYPE_5  0
-#define SDS_TYPE_8  1
-#define SDS_TYPE_16 2
-#define SDS_TYPE_32 3
-#define SDS_TYPE_64 4
-#define SDS_TYPE_MASK 7
-#define SDS_TYPE_BITS 3
-#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
-#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
-#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
-
-static inline size_t sdslen(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->len;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->len;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->len;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->len;
-    }
-    return 0;
-}
-
-static inline size_t sdsavail(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
-            return 0;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            return sh->alloc - sh->len;
-        }
-    }
-    return 0;
-}
-
-static inline void sdssetlen(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len = newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len = newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len = newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len = newlen;
-            break;
-    }
-}
-
-static inline void sdsinclen(sds s, size_t inc) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                unsigned char newlen = SDS_TYPE_5_LEN(flags)+inc;
-                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len += inc;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len += inc;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len += inc;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len += inc;
-            break;
-    }
-}
-
-/* sdsalloc() = sdsavail() + sdslen() */
-static inline size_t sdsalloc(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->alloc;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->alloc;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->alloc;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->alloc;
-    }
-    return 0;
-}
-
-static inline void sdssetalloc(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            /* Nothing to do, this type has no total allocation info. */
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->alloc = newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->alloc = newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->alloc = newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->alloc = newlen;
-            break;
-    }
-}
-
-sds sdsnewlen(const void *init, size_t initlen);
-sds sdsnew(const char *init);
-sds sdsempty(void);
-sds sdsdup(const sds s);
-void sdsfree(sds s);
-sds sdsgrowzero(sds s, size_t len);
-sds sdscatlen(sds s, const void *t, size_t len);
-sds sdscat(sds s, const char *t);
-sds sdscatsds(sds s, const sds t);
-sds sdscpylen(sds s, const char *t, size_t len);
-sds sdscpy(sds s, const char *t);
-
-sds sdscatvprintf(sds s, const char *fmt, va_list ap);
-#ifdef __GNUC__
-sds sdscatprintf(sds s, const char *fmt, ...)
-    __attribute__((format(printf, 2, 3)));
-#else
-sds sdscatprintf(sds s, const char *fmt, ...);
-#endif
-
-sds sdscatfmt(sds s, char const *fmt, ...);
-sds sdstrim(sds s, const char *cset);
-void sdsrange(sds s, int start, int end);
-void sdsupdatelen(sds s);
-void sdsclear(sds s);
-int sdscmp(const sds s1, const sds s2);
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
-void sdsfreesplitres(sds *tokens, int count);
-void sdstolower(sds s);
-void sdstoupper(sds s);
-sds sdsfromlonglong(long long value);
-sds sdscatrepr(sds s, const char *p, size_t len);
-sds *sdssplitargs(const char *line, int *argc);
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
-sds sdsjoin(char **argv, int argc, char *sep);
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
-
-/* Low level functions exposed to the user API */
-sds sdsMakeRoomFor(sds s, size_t addlen);
-void sdsIncrLen(sds s, int incr);
-sds sdsRemoveFreeSpace(sds s);
-size_t sdsAllocSize(sds s);
-void *sdsAllocPtr(sds s);
-
-/* Export the allocator used by SDS to the program using SDS.
- * Sometimes the program SDS is linked to, may use a different set of
- * allocators, but may want to allocate or free things that SDS will
- * respectively free or allocate. */
-void *sds_malloc(size_t size);
-void *sds_realloc(void *ptr, size_t size);
-void sds_free(void *ptr);
-
-#ifdef REDIS_TEST
-int sdsTest(int argc, char *argv[]);
-#endif
-
-#endif
diff --git a/ext/hiredis-0.14.1/sdsalloc.h b/ext/hiredis-0.14.1/sdsalloc.h
deleted file mode 100644
index f43023c48..000000000
--- a/ext/hiredis-0.14.1/sdsalloc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* SDS allocator selection.
- *
- * This file is used in order to change the SDS allocator at compile time.
- * Just define the following defines to what you want to use. Also add
- * the include of your alternate allocator if needed (not needed in order
- * to use the default libc allocator). */
-
-#define s_malloc malloc
-#define s_realloc realloc
-#define s_free free
diff --git a/ext/hiredis-0.14.1/test.c b/ext/hiredis-0.14.1/test.c
deleted file mode 100644
index 0f5bfe572..000000000
--- a/ext/hiredis-0.14.1/test.c
+++ /dev/null
@@ -1,923 +0,0 @@
-#include "fmacros.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/time.h>
-#include <assert.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <limits.h>
-
-#include "hiredis.h"
-#include "net.h"
-
-enum connection_type {
-    CONN_TCP,
-    CONN_UNIX,
-    CONN_FD
-};
-
-struct config {
-    enum connection_type type;
-
-    struct {
-        const char *host;
-        int port;
-        struct timeval timeout;
-    } tcp;
-
-    struct {
-        const char *path;
-    } unix_sock;
-};
-
-/* The following lines make up our testing "framework" :) */
-static int tests = 0, fails = 0;
-#define test(_s) { printf("#%02d ", ++tests); printf(_s); }
-#define test_cond(_c) if(_c) printf("\033[0;32mPASSED\033[0;0m\n"); else {printf("\033[0;31mFAILED\033[0;0m\n"); fails++;}
-
-static long long usec(void) {
-    struct timeval tv;
-    gettimeofday(&tv,NULL);
-    return (((long long)tv.tv_sec)*1000000)+tv.tv_usec;
-}
-
-/* The assert() calls below have side effects, so we need assert()
- * even if we are compiling without asserts (-DNDEBUG). */
-#ifdef NDEBUG
-#undef assert
-#define assert(e) (void)(e)
-#endif
-
-static redisContext *select_database(redisContext *c) {
-    redisReply *reply;
-
-    /* Switch to DB 9 for testing, now that we know we can chat. */
-    reply = redisCommand(c,"SELECT 9");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    /* Make sure the DB is emtpy */
-    reply = redisCommand(c,"DBSIZE");
-    assert(reply != NULL);
-    if (reply->type == REDIS_REPLY_INTEGER && reply->integer == 0) {
-        /* Awesome, DB 9 is empty and we can continue. */
-        freeReplyObject(reply);
-    } else {
-        printf("Database #9 is not empty, test can not continue\n");
-        exit(1);
-    }
-
-    return c;
-}
-
-static int disconnect(redisContext *c, int keep_fd) {
-    redisReply *reply;
-
-    /* Make sure we're on DB 9. */
-    reply = redisCommand(c,"SELECT 9");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-    reply = redisCommand(c,"FLUSHDB");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    /* Free the context as well, but keep the fd if requested. */
-    if (keep_fd)
-        return redisFreeKeepFd(c);
-    redisFree(c);
-    return -1;
-}
-
-static redisContext *connect(struct config config) {
-    redisContext *c = NULL;
-
-    if (config.type == CONN_TCP) {
-        c = redisConnect(config.tcp.host, config.tcp.port);
-    } else if (config.type == CONN_UNIX) {
-        c = redisConnectUnix(config.unix_sock.path);
-    } else if (config.type == CONN_FD) {
-        /* Create a dummy connection just to get an fd to inherit */
-        redisContext *dummy_ctx = redisConnectUnix(config.unix_sock.path);
-        if (dummy_ctx) {
-            int fd = disconnect(dummy_ctx, 1);
-            printf("Connecting to inherited fd %d\n", fd);
-            c = redisConnectFd(fd);
-        }
-    } else {
-        assert(NULL);
-    }
-
-    if (c == NULL) {
-        printf("Connection error: can't allocate redis context\n");
-        exit(1);
-    } else if (c->err) {
-        printf("Connection error: %s\n", c->errstr);
-        redisFree(c);
-        exit(1);
-    }
-
-    return select_database(c);
-}
-
-static void test_format_commands(void) {
-    char *cmd;
-    int len;
-
-    test("Format command without interpolation: ");
-    len = redisFormatCommand(&cmd,"SET foo bar");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command with %%s string interpolation: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","foo","bar");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command with %%s and an empty string: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","foo","");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    free(cmd);
-
-    test("Format command with an empty string in between proper interpolations: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","","foo");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$0\r\n\r\n$3\r\nfoo\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(0+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command with %%b string interpolation: ");
-    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"b\0r",(size_t)3);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nb\0r\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command with %%b and an empty string: ");
-    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"",(size_t)0);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    free(cmd);
-
-    test("Format command with literal %%: ");
-    len = redisFormatCommand(&cmd,"SET %% %%");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$1\r\n%\r\n$1\r\n%\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(1+2)+4+(1+2));
-    free(cmd);
-
-    /* Vararg width depends on the type. These tests make sure that the
-     * width is correctly determined using the format and subsequent varargs
-     * can correctly be interpolated. */
-#define INTEGER_WIDTH_TEST(fmt, type) do {                                                \
-    type value = 123;                                                                     \
-    test("Format command with printf-delegation (" #type "): ");                          \
-    len = redisFormatCommand(&cmd,"key:%08" fmt " str:%s", value, "hello");               \
-    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",len) == 0 && \
-        len == 4+5+(12+2)+4+(9+2));                                                       \
-    free(cmd);                                                                            \
-} while(0)
-
-#define FLOAT_WIDTH_TEST(type) do {                                                       \
-    type value = 123.0;                                                                   \
-    test("Format command with printf-delegation (" #type "): ");                          \
-    len = redisFormatCommand(&cmd,"key:%08.3f str:%s", value, "hello");                   \
-    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",len) == 0 && \
-        len == 4+5+(12+2)+4+(9+2));                                                       \
-    free(cmd);                                                                            \
-} while(0)
-
-    INTEGER_WIDTH_TEST("d", int);
-    INTEGER_WIDTH_TEST("hhd", char);
-    INTEGER_WIDTH_TEST("hd", short);
-    INTEGER_WIDTH_TEST("ld", long);
-    INTEGER_WIDTH_TEST("lld", long long);
-    INTEGER_WIDTH_TEST("u", unsigned int);
-    INTEGER_WIDTH_TEST("hhu", unsigned char);
-    INTEGER_WIDTH_TEST("hu", unsigned short);
-    INTEGER_WIDTH_TEST("lu", unsigned long);
-    INTEGER_WIDTH_TEST("llu", unsigned long long);
-    FLOAT_WIDTH_TEST(float);
-    FLOAT_WIDTH_TEST(double);
-
-    test("Format command with invalid printf format: ");
-    len = redisFormatCommand(&cmd,"key:%08p %b",(void*)1234,"foo",(size_t)3);
-    test_cond(len == -1);
-
-    const char *argv[3];
-    argv[0] = "SET";
-    argv[1] = "foo\0xxx";
-    argv[2] = "bar";
-    size_t lens[3] = { 3, 7, 3 };
-    int argc = 3;
-
-    test("Format command by passing argc/argv without lengths: ");
-    len = redisFormatCommandArgv(&cmd,argc,argv,NULL);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    free(cmd);
-
-    test("Format command by passing argc/argv with lengths: ");
-    len = redisFormatCommandArgv(&cmd,argc,argv,lens);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
-    free(cmd);
-
-    sds sds_cmd;
-
-    sds_cmd = sdsempty();
-    test("Format command into sds by passing argc/argv without lengths: ");
-    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,NULL);
-    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    sdsfree(sds_cmd);
-
-    sds_cmd = sdsempty();
-    test("Format command into sds by passing argc/argv with lengths: ");
-    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,lens);
-    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
-    sdsfree(sds_cmd);
-}
-
-static void test_append_formatted_commands(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    char *cmd;
-    int len;
-
-    c = connect(config);
-
-    test("Append format command: ");
-
-    len = redisFormatCommand(&cmd, "SET foo bar");
-
-    test_cond(redisAppendFormattedCommand(c, cmd, len) == REDIS_OK);
-
-    assert(redisGetReply(c, (void*)&reply) == REDIS_OK);
-
-    free(cmd);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_reply_reader(void) {
-    redisReader *reader;
-    void *reply;
-    int ret;
-    int i;
-
-    test("Error handling in reply parser: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"@foo\r\n",6);
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
-    redisReaderFree(reader);
-
-    /* when the reply already contains multiple items, they must be free'd
-     * on an error. valgrind will bark when this doesn't happen. */
-    test("Memory cleanup in reply parser: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*2\r\n",4);
-    redisReaderFeed(reader,(char*)"$5\r\nhello\r\n",11);
-    redisReaderFeed(reader,(char*)"@foo\r\n",6);
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
-    redisReaderFree(reader);
-
-    test("Set error on nested multi bulks with depth > 7: ");
-    reader = redisReaderCreate();
-
-    for (i = 0; i < 9; i++) {
-        redisReaderFeed(reader,(char*)"*1\r\n",4);
-    }
-
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strncasecmp(reader->errstr,"No support for",14) == 0);
-    redisReaderFree(reader);
-
-    test("Correctly parses LLONG_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":9223372036854775807\r\n",22);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
-            ((redisReply*)reply)->integer == LLONG_MAX);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when > LLONG_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":9223372036854775808\r\n",22);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bad integer value") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Correctly parses LLONG_MIN: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":-9223372036854775808\r\n",23);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
-            ((redisReply*)reply)->integer == LLONG_MIN);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when < LLONG_MIN: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":-9223372036854775809\r\n",23);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bad integer value") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when array < -1: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "*-2\r\n+asdf\r\n",12);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when bulk < -1: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "$-2\r\nasdf\r\n",11);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when array > INT_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "*9223372036854775807\r\n+asdf\r\n",29);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-            strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-#if LLONG_MAX > SIZE_MAX
-    test("Set error when bulk > SIZE_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "$9223372036854775807\r\nasdf\r\n",28);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-            strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-#endif
-
-    test("Works with NULL functions for reply: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"+OK\r\n",5);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
-    redisReaderFree(reader);
-
-    test("Works when a single newline (\\r\\n) covers two calls to feed: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"+OK\r",4);
-    ret = redisReaderGetReply(reader,&reply);
-    assert(ret == REDIS_OK && reply == NULL);
-    redisReaderFeed(reader,(char*)"\n",1);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
-    redisReaderFree(reader);
-
-    test("Don't reset state after protocol error: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"x",1);
-    ret = redisReaderGetReply(reader,&reply);
-    assert(ret == REDIS_ERR);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR && reply == NULL);
-    redisReaderFree(reader);
-
-    /* Regression test for issue #45 on GitHub. */
-    test("Don't do empty allocation for empty multi bulk: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*0\r\n",4);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
-        ((redisReply*)reply)->elements == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-}
-
-static void test_free_null(void) {
-    void *redisCtx = NULL;
-    void *reply = NULL;
-
-    test("Don't fail when redisFree is passed a NULL value: ");
-    redisFree(redisCtx);
-    test_cond(redisCtx == NULL);
-
-    test("Don't fail when freeReplyObject is passed a NULL value: ");
-    freeReplyObject(reply);
-    test_cond(reply == NULL);
-}
-
-static void test_blocking_connection_errors(void) {
-    redisContext *c;
-
-    test("Returns error when host cannot be resolved: ");
-    c = redisConnect((char*)"idontexist.test", 6379);
-    test_cond(c->err == REDIS_ERR_OTHER &&
-        (strcmp(c->errstr,"Name or service not known") == 0 ||
-         strcmp(c->errstr,"Can't resolve: idontexist.test") == 0 ||
-         strcmp(c->errstr,"nodename nor servname provided, or not known") == 0 ||
-         strcmp(c->errstr,"No address associated with hostname") == 0 ||
-         strcmp(c->errstr,"Temporary failure in name resolution") == 0 ||
-         strcmp(c->errstr,"hostname nor servname provided, or not known") == 0 ||
-         strcmp(c->errstr,"no address associated with name") == 0));
-    redisFree(c);
-
-    test("Returns error when the port is not open: ");
-    c = redisConnect((char*)"localhost", 1);
-    test_cond(c->err == REDIS_ERR_IO &&
-        strcmp(c->errstr,"Connection refused") == 0);
-    redisFree(c);
-
-    test("Returns error when the unix_sock socket path doesn't accept connections: ");
-    c = redisConnectUnix((char*)"/tmp/idontexist.sock");
-    test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
-    redisFree(c);
-}
-
-static void test_blocking_connection(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-
-    c = connect(config);
-
-    test("Is able to deliver commands: ");
-    reply = redisCommand(c,"PING");
-    test_cond(reply->type == REDIS_REPLY_STATUS &&
-        strcasecmp(reply->str,"pong") == 0)
-    freeReplyObject(reply);
-
-    test("Is a able to send commands verbatim: ");
-    reply = redisCommand(c,"SET foo bar");
-    test_cond (reply->type == REDIS_REPLY_STATUS &&
-        strcasecmp(reply->str,"ok") == 0)
-    freeReplyObject(reply);
-
-    test("%%s String interpolation works: ");
-    reply = redisCommand(c,"SET %s %s","foo","hello world");
-    freeReplyObject(reply);
-    reply = redisCommand(c,"GET foo");
-    test_cond(reply->type == REDIS_REPLY_STRING &&
-        strcmp(reply->str,"hello world") == 0);
-    freeReplyObject(reply);
-
-    test("%%b String interpolation works: ");
-    reply = redisCommand(c,"SET %b %b","foo",(size_t)3,"hello\x00world",(size_t)11);
-    freeReplyObject(reply);
-    reply = redisCommand(c,"GET foo");
-    test_cond(reply->type == REDIS_REPLY_STRING &&
-        memcmp(reply->str,"hello\x00world",11) == 0)
-
-    test("Binary reply length is correct: ");
-    test_cond(reply->len == 11)
-    freeReplyObject(reply);
-
-    test("Can parse nil replies: ");
-    reply = redisCommand(c,"GET nokey");
-    test_cond(reply->type == REDIS_REPLY_NIL)
-    freeReplyObject(reply);
-
-    /* test 7 */
-    test("Can parse integer replies: ");
-    reply = redisCommand(c,"INCR mycounter");
-    test_cond(reply->type == REDIS_REPLY_INTEGER && reply->integer == 1)
-    freeReplyObject(reply);
-
-    test("Can parse multi bulk replies: ");
-    freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
-    freeReplyObject(redisCommand(c,"LPUSH mylist bar"));
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    test_cond(reply->type == REDIS_REPLY_ARRAY &&
-              reply->elements == 2 &&
-              !memcmp(reply->element[0]->str,"bar",3) &&
-              !memcmp(reply->element[1]->str,"foo",3))
-    freeReplyObject(reply);
-
-    /* m/e with multi bulk reply *before* other reply.
-     * specifically test ordering of reply items to parse. */
-    test("Can handle nested multi bulk replies: ");
-    freeReplyObject(redisCommand(c,"MULTI"));
-    freeReplyObject(redisCommand(c,"LRANGE mylist 0 -1"));
-    freeReplyObject(redisCommand(c,"PING"));
-    reply = (redisCommand(c,"EXEC"));
-    test_cond(reply->type == REDIS_REPLY_ARRAY &&
-              reply->elements == 2 &&
-              reply->element[0]->type == REDIS_REPLY_ARRAY &&
-              reply->element[0]->elements == 2 &&
-              !memcmp(reply->element[0]->element[0]->str,"bar",3) &&
-              !memcmp(reply->element[0]->element[1]->str,"foo",3) &&
-              reply->element[1]->type == REDIS_REPLY_STATUS &&
-              strcasecmp(reply->element[1]->str,"pong") == 0);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_blocking_connection_timeouts(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    ssize_t s;
-    const char *cmd = "DEBUG SLEEP 3\r\n";
-    struct timeval tv;
-
-    c = connect(config);
-    test("Successfully completes a command when the timeout is not exceeded: ");
-    reply = redisCommand(c,"SET foo fast");
-    freeReplyObject(reply);
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;
-    redisSetTimeout(c, tv);
-    reply = redisCommand(c, "GET foo");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STRING && memcmp(reply->str, "fast", 4) == 0);
-    freeReplyObject(reply);
-    disconnect(c, 0);
-
-    c = connect(config);
-    test("Does not return a reply when the command times out: ");
-    s = write(c->fd, cmd, strlen(cmd));
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;
-    redisSetTimeout(c, tv);
-    reply = redisCommand(c, "GET foo");
-    test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Resource temporarily unavailable") == 0);
-    freeReplyObject(reply);
-
-    test("Reconnect properly reconnects after a timeout: ");
-    redisReconnect(c);
-    reply = redisCommand(c, "PING");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
-    freeReplyObject(reply);
-
-    test("Reconnect properly uses owned parameters: ");
-    config.tcp.host = "foo";
-    config.unix_sock.path = "foo";
-    redisReconnect(c);
-    reply = redisCommand(c, "PING");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_blocking_io_errors(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    void *_reply;
-    int major, minor;
-
-    /* Connect to target given by config. */
-    c = connect(config);
-    {
-        /* Find out Redis version to determine the path for the next test */
-        const char *field = "redis_version:";
-        char *p, *eptr;
-
-        reply = redisCommand(c,"INFO");
-        p = strstr(reply->str,field);
-        major = strtol(p+strlen(field),&eptr,10);
-        p = eptr+1; /* char next to the first "." */
-        minor = strtol(p,&eptr,10);
-        freeReplyObject(reply);
-    }
-
-    test("Returns I/O error when the connection is lost: ");
-    reply = redisCommand(c,"QUIT");
-    if (major > 2 || (major == 2 && minor > 0)) {
-        /* > 2.0 returns OK on QUIT and read() should be issued once more
-         * to know the descriptor is at EOF. */
-        test_cond(strcasecmp(reply->str,"OK") == 0 &&
-            redisGetReply(c,&_reply) == REDIS_ERR);
-        freeReplyObject(reply);
-    } else {
-        test_cond(reply == NULL);
-    }
-
-    /* On 2.0, QUIT will cause the connection to be closed immediately and
-     * the read(2) for the reply on QUIT will set the error to EOF.
-     * On >2.0, QUIT will return with OK and another read(2) needed to be
-     * issued to find out the socket was closed by the server. In both
-     * conditions, the error will be set to EOF. */
-    assert(c->err == REDIS_ERR_EOF &&
-        strcmp(c->errstr,"Server closed the connection") == 0);
-    redisFree(c);
-
-    c = connect(config);
-    test("Returns I/O error on socket timeout: ");
-    struct timeval tv = { 0, 1000 };
-    assert(redisSetTimeout(c,tv) == REDIS_OK);
-    test_cond(redisGetReply(c,&_reply) == REDIS_ERR &&
-        c->err == REDIS_ERR_IO && errno == EAGAIN);
-    redisFree(c);
-}
-
-static void test_invalid_timeout_errors(struct config config) {
-    redisContext *c;
-
-    test("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
-
-    config.tcp.timeout.tv_sec = 0;
-    config.tcp.timeout.tv_usec = 10000001;
-
-    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
-
-    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
-    redisFree(c);
-
-    test("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
-
-    config.tcp.timeout.tv_sec = (((LONG_MAX) - 999) / 1000) + 1;
-    config.tcp.timeout.tv_usec = 0;
-
-    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
-
-    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
-    redisFree(c);
-}
-
-static void test_throughput(struct config config) {
-    redisContext *c = connect(config);
-    redisReply **replies;
-    int i, num;
-    long long t1, t2;
-
-    test("Throughput:\n");
-    for (i = 0; i < 500; i++)
-        freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
-
-    num = 1000;
-    replies = malloc(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c,"PING");
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx PING: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = malloc(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c,"LRANGE mylist 0 499");
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
-        assert(replies[i] != NULL && replies[i]->elements == 500);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx LRANGE with 500 elements: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = malloc(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c, "INCRBY incrkey %d", 1000000);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx INCRBY: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    num = 10000;
-    replies = malloc(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"PING");
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx PING (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = malloc(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"LRANGE mylist 0 499");
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
-        assert(replies[i] != NULL && replies[i]->elements == 500);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = malloc(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"INCRBY incrkey %d", 1000000);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    free(replies);
-    printf("\t(%dx INCRBY (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    disconnect(c, 0);
-}
-
-// static long __test_callback_flags = 0;
-// static void __test_callback(redisContext *c, void *privdata) {
-//     ((void)c);
-//     /* Shift to detect execution order */
-//     __test_callback_flags <<= 8;
-//     __test_callback_flags |= (long)privdata;
-// }
-//
-// static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
-//     ((void)c);
-//     /* Shift to detect execution order */
-//     __test_callback_flags <<= 8;
-//     __test_callback_flags |= (long)privdata;
-//     if (reply) freeReplyObject(reply);
-// }
-//
-// static redisContext *__connect_nonblock() {
-//     /* Reset callback flags */
-//     __test_callback_flags = 0;
-//     return redisConnectNonBlock("127.0.0.1", port, NULL);
-// }
-//
-// static void test_nonblocking_connection() {
-//     redisContext *c;
-//     int wdone = 0;
-//
-//     test("Calls command callback when command is issued: ");
-//     c = __connect_nonblock();
-//     redisSetCommandCallback(c,__test_callback,(void*)1);
-//     redisCommand(c,"PING");
-//     test_cond(__test_callback_flags == 1);
-//     redisFree(c);
-//
-//     test("Calls disconnect callback on redisDisconnect: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
-//     redisDisconnect(c);
-//     test_cond(__test_callback_flags == 2);
-//     redisFree(c);
-//
-//     test("Calls disconnect callback and free callback on redisFree: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
-//     redisSetFreeCallback(c,__test_callback,(void*)4);
-//     redisFree(c);
-//     test_cond(__test_callback_flags == ((2 << 8) | 4));
-//
-//     test("redisBufferWrite against empty write buffer: ");
-//     c = __connect_nonblock();
-//     test_cond(redisBufferWrite(c,&wdone) == REDIS_OK && wdone == 1);
-//     redisFree(c);
-//
-//     test("redisBufferWrite against not yet connected fd: ");
-//     c = __connect_nonblock();
-//     redisCommand(c,"PING");
-//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
-//               strncmp(c->error,"write:",6) == 0);
-//     redisFree(c);
-//
-//     test("redisBufferWrite against closed fd: ");
-//     c = __connect_nonblock();
-//     redisCommand(c,"PING");
-//     redisDisconnect(c);
-//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
-//               strncmp(c->error,"write:",6) == 0);
-//     redisFree(c);
-//
-//     test("Process callbacks in the right sequence: ");
-//     c = __connect_nonblock();
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)1,"PING");
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)3,"PING");
-//
-//     /* Write output buffer */
-//     wdone = 0;
-//     while(!wdone) {
-//         usleep(500);
-//         redisBufferWrite(c,&wdone);
-//     }
-//
-//     /* Read until at least one callback is executed (the 3 replies will
-//      * arrive in a single packet, causing all callbacks to be executed in
-//      * a single pass). */
-//     while(__test_callback_flags == 0) {
-//         assert(redisBufferRead(c) == REDIS_OK);
-//         redisProcessCallbacks(c);
-//     }
-//     test_cond(__test_callback_flags == 0x010203);
-//     redisFree(c);
-//
-//     test("redisDisconnect executes pending callbacks with NULL reply: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)1);
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
-//     redisDisconnect(c);
-//     test_cond(__test_callback_flags == 0x0201);
-//     redisFree(c);
-// }
-
-int main(int argc, char **argv) {
-    struct config cfg = {
-        .tcp = {
-            .host = "127.0.0.1",
-            .port = 6379
-        },
-        .unix_sock = {
-            .path = "/tmp/redis.sock"
-        }
-    };
-    int throughput = 1;
-    int test_inherit_fd = 1;
-
-    /* Ignore broken pipe signal (for I/O error tests). */
-    signal(SIGPIPE, SIG_IGN);
-
-    /* Parse command line options. */
-    argv++; argc--;
-    while (argc) {
-        if (argc >= 2 && !strcmp(argv[0],"-h")) {
-            argv++; argc--;
-            cfg.tcp.host = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"-p")) {
-            argv++; argc--;
-            cfg.tcp.port = atoi(argv[0]);
-        } else if (argc >= 2 && !strcmp(argv[0],"-s")) {
-            argv++; argc--;
-            cfg.unix_sock.path = argv[0];
-        } else if (argc >= 1 && !strcmp(argv[0],"--skip-throughput")) {
-            throughput = 0;
-        } else if (argc >= 1 && !strcmp(argv[0],"--skip-inherit-fd")) {
-            test_inherit_fd = 0;
-        } else {
-            fprintf(stderr, "Invalid argument: %s\n", argv[0]);
-            exit(1);
-        }
-        argv++; argc--;
-    }
-
-    test_format_commands();
-    test_reply_reader();
-    test_blocking_connection_errors();
-    test_free_null();
-
-    printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
-    cfg.type = CONN_TCP;
-    test_blocking_connection(cfg);
-    test_blocking_connection_timeouts(cfg);
-    test_blocking_io_errors(cfg);
-    test_invalid_timeout_errors(cfg);
-    test_append_formatted_commands(cfg);
-    if (throughput) test_throughput(cfg);
-
-    printf("\nTesting against Unix socket connection (%s):\n", cfg.unix_sock.path);
-    cfg.type = CONN_UNIX;
-    test_blocking_connection(cfg);
-    test_blocking_connection_timeouts(cfg);
-    test_blocking_io_errors(cfg);
-    if (throughput) test_throughput(cfg);
-
-    if (test_inherit_fd) {
-        printf("\nTesting against inherited fd (%s):\n", cfg.unix_sock.path);
-        cfg.type = CONN_FD;
-        test_blocking_connection(cfg);
-    }
-
-
-    if (fails) {
-        printf("*** %d TESTS FAILED ***\n", fails);
-        return 1;
-    }
-
-    printf("ALL TESTS PASSED\n");
-    return 0;
-}
diff --git a/ext/hiredis-0.14.1/win32.h b/ext/hiredis-0.14.1/win32.h
deleted file mode 100644
index 1a27c18f2..000000000
--- a/ext/hiredis-0.14.1/win32.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _WIN32_HELPER_INCLUDE
-#define _WIN32_HELPER_INCLUDE
-#ifdef _MSC_VER
-
-#ifndef inline
-#define inline __inline
-#endif
-
-#ifndef va_copy
-#define va_copy(d,s) ((d) = (s))
-#endif
-
-#ifndef snprintf
-#define snprintf c99_snprintf
-
-__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
-{
-    int count = -1;
-
-    if (size != 0)
-        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
-    if (count == -1)
-        count = _vscprintf(format, ap);
-
-    return count;
-}
-
-__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
-{
-    int count;
-    va_list ap;
-
-    va_start(ap, format);
-    count = c99_vsnprintf(str, size, format, ap);
-    va_end(ap);
-
-    return count;
-}
-#endif
-
-#endif
-#endif
\ No newline at end of file
diff --git a/ext/hiredis-1.0.2/.gitignore b/ext/hiredis-1.0.2/.gitignore
deleted file mode 100644
index 056959ffe..000000000
--- a/ext/hiredis-1.0.2/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/hiredis-test
-/examples/hiredis-example*
-/*.o
-/*.so
-/*.dylib
-/*.a
-/*.pc
-*.dSYM
-tags
diff --git a/ext/hiredis-1.0.2/.travis.yml b/ext/hiredis-1.0.2/.travis.yml
deleted file mode 100644
index f9a9460ff..000000000
--- a/ext/hiredis-1.0.2/.travis.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-language: c
-compiler:
-  - gcc
-  - clang
-
-os:
-  - linux
-  - osx
-
-dist: bionic
-
-branches:
-  only:
-    - staging
-    - trying
-    - master
-    - /^release\/.*$/
-
-install:
-    - if [ "$BITS" == "64" ]; then
-        wget https://github.com/redis/redis/archive/6.0.6.tar.gz;
-        tar -xzvf 6.0.6.tar.gz;
-        pushd redis-6.0.6 && BUILD_TLS=yes make && export PATH=$PWD/src:$PATH && popd;
-      fi
-
-before_script:
-    - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-        curl -O https://distfiles.macports.org/MacPorts/MacPorts-2.6.2-10.13-HighSierra.pkg;
-        sudo installer -pkg MacPorts-2.6.2-10.13-HighSierra.pkg -target /;
-        export PATH=$PATH:/opt/local/bin && sudo port -v selfupdate;
-        sudo port -N install openssl redis;
-      fi;
-
-addons:
-  apt:
-    sources:
-    - sourceline: 'ppa:chris-lea/redis-server'
-    packages:
-    - libc6-dbg
-    - libc6-dev
-    - libc6:i386
-    - libc6-dev-i386
-    - libc6-dbg:i386
-    - gcc-multilib
-    - g++-multilib
-    - libssl-dev
-    - libssl-dev:i386
-    - valgrind
-    - redis
-
-env:
-  - BITS="32"
-  - BITS="64"
-
-script:
-  - EXTRA_CMAKE_OPTS="-DENABLE_EXAMPLES:BOOL=ON -DENABLE_SSL:BOOL=ON";
-    if [ "$BITS" == "64" ]; then
-      EXTRA_CMAKE_OPTS="$EXTRA_CMAKE_OPTS -DENABLE_SSL_TESTS:BOOL=ON";
-    fi;
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-      if [ "$BITS" == "32" ]; then
-        CFLAGS="-m32 -Werror";
-        CXXFLAGS="-m32 -Werror";
-        LDFLAGS="-m32";
-        EXTRA_CMAKE_OPTS=;
-      else
-        CFLAGS="-Werror";
-        CXXFLAGS="-Werror";
-      fi;
-    else
-      TEST_PREFIX="valgrind --track-origins=yes --leak-check=full";
-      if [ "$BITS" == "32" ]; then
-        CFLAGS="-m32 -Werror";
-        CXXFLAGS="-m32 -Werror";
-        LDFLAGS="-m32";
-        EXTRA_CMAKE_OPTS=;
-      else
-        CFLAGS="-Werror";
-        CXXFLAGS="-Werror";
-      fi;
-    fi;
-    export CFLAGS CXXFLAGS LDFLAGS TEST_PREFIX EXTRA_CMAKE_OPTS
-  - make && make clean;
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-      if [ "$BITS" == "64" ]; then
-        OPENSSL_PREFIX="$(ls -d /usr/local/Cellar/openssl@1.1/*)" USE_SSL=1 make;
-      fi;
-    else
-      USE_SSL=1 make;
-    fi;
-  - mkdir build/ && cd build/
-  - cmake .. ${EXTRA_CMAKE_OPTS}
-  - make VERBOSE=1
-  - if [ "$BITS" == "64" ]; then
-      TEST_SSL=1 SKIPS_AS_FAILS=1 ctest -V;
-    else
-      SKIPS_AS_FAILS=1 ctest -V;
-    fi;
-
-jobs:
-  include:
-    # Windows MinGW cross compile on Linux
-    - os: linux
-      dist: xenial
-      compiler: mingw
-      addons:
-        apt:
-          packages:
-            - ninja-build
-            - gcc-mingw-w64-x86-64
-            - g++-mingw-w64-x86-64
-      script:
-        - mkdir build && cd build
-        - CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_WITH_INSTALL_RPATH=on
-        - ninja -v
-
-    # Windows MSVC 2017
-    - os: windows
-      compiler: msvc
-      env:
-        - MATRIX_EVAL="CC=cl.exe && CXX=cl.exe"
-      before_install:
-        - eval "${MATRIX_EVAL}"
-      install:
-        - choco install ninja
-        - choco install -y memurai-developer
-      script:
-        - mkdir build && cd build
-        - cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' amd64 '&&'
-          cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_EXAMPLES=ON '&&' ninja -v
-        - ./hiredis-test.exe
diff --git a/ext/hiredis-1.0.2/CHANGELOG.md b/ext/hiredis-1.0.2/CHANGELOG.md
deleted file mode 100644
index 2a2bc314a..000000000
--- a/ext/hiredis-1.0.2/CHANGELOG.md
+++ /dev/null
@@ -1,364 +0,0 @@
-## [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2) - (2021-10-07)
-
-Announcing Hiredis v1.0.2, which fixes CVE-2021-32765 but returns the SONAME to the correct value of `1.0.0`.
-
-- [Revert SONAME bump](https://github.com/redis/hiredis/commit/d4e6f109a064690cde64765c654e679fea1d3548)
-  ([Michael Grunder](https://github.com/michael-grunder))
-
-## [1.0.1](https://github.com/redis/hiredis/tree/v1.0.1) - (2021-10-04)
-
-<span style="color:red">This release erroneously bumped the SONAME, please use [1.0.2](https://github.com/redis/hiredis/tree/v1.0.2)</span>
-
-Announcing Hiredis v1.0.1, a security release fixing CVE-2021-32765
-
-- Fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2)
-  [commit](https://github.com/redis/hiredis/commit/76a7b10005c70babee357a7d0f2becf28ec7ed1e)
-  ([Yossi Gottlieb](https://github.com/yossigo))
-
-_Thanks to [Yossi Gottlieb](https://github.com/yossigo) for the security fix and to [Microsoft Security Vulnerability Research](https://www.microsoft.com/en-us/msrc/msvr) for finding the bug._ :sparkling_heart:
-
-## [1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) - (2020-08-03)
-
-Announcing Hiredis v1.0.0, which adds support for RESP3, SSL connections, allocator injection, and better Windows support! :tada:
-
-_A big thanks to everyone who helped with this release.  The following list includes everyone who contributed at least five lines, sorted by lines contributed._ :sparkling_heart:
-
-[Michael Grunder](https://github.com/michael-grunder), [Yossi Gottlieb](https://github.com/yossigo),
-[Mark Nunberg](https://github.com/mnunberg), [Marcus Geelnard](https://github.com/mbitsnbites),
-[Justin Brewer](https://github.com/justinbrewer), [Valentino Geron](https://github.com/valentinogeron),
-[Minun Dragonation](https://github.com/dragonation), [Omri Steiner](https://github.com/OmriSteiner),
-[Sangmoon Yi](https://github.com/jman-krafton), [Jinjiazh](https://github.com/jinjiazhang),
-[Odin Hultgren Van Der Horst](https://github.com/Miniwoffer), [Muhammad Zahalqa](https://github.com/tryfinally),
-[Nick Rivera](https://github.com/heronr), [Qi Yang](https://github.com/movebean),
-[kevin1018](https://github.com/kevin1018)
-
-[Full Changelog](https://github.com/redis/hiredis/compare/v0.14.1...v1.0.0)
-
-**BREAKING CHANGES**:
-
-* `redisOptions` now has two timeout fields.  One for connecting, and one for commands.  If you're presently using `options->timeout` you will need to change it to use `options->connect_timeout`. (See [example](https://github.com/redis/hiredis/commit/38b5ae543f5c99eb4ccabbe277770fc6bc81226f#diff-86ba39d37aa829c8c82624cce4f049fbL36))
-
-* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now protocol errors. This is consistent
-  with the RESP specification. On 32-bit platforms, the upper bound is lowered to `SIZE_MAX`.
-
-* `redisReplyObjectFunctions.createArray` now takes `size_t` for its length parameter.
-
-**New features:**
-- Support for RESP3
-  [\#697](https://github.com/redis/hiredis/pull/697),
-  [\#805](https://github.com/redis/hiredis/pull/805),
-  [\#819](https://github.com/redis/hiredis/pull/819),
-  [\#841](https://github.com/redis/hiredis/pull/841)
-  ([Yossi Gottlieb](https://github.com/yossigo), [Michael Grunder](https://github.com/michael-grunder))
-- Support for SSL connections
-  [\#645](https://github.com/redis/hiredis/pull/645),
-  [\#699](https://github.com/redis/hiredis/pull/699),
-  [\#702](https://github.com/redis/hiredis/pull/702),
-  [\#708](https://github.com/redis/hiredis/pull/708),
-  [\#711](https://github.com/redis/hiredis/pull/711),
-  [\#821](https://github.com/redis/hiredis/pull/821),
-  [more](https://github.com/redis/hiredis/pulls?q=is%3Apr+is%3Amerged+SSL)
-  ([Mark Nunberg](https://github.com/mnunberg), [Yossi Gottlieb](https://github.com/yossigo))
-- Run-time allocator injection
-  [\#800](https://github.com/redis/hiredis/pull/800)
-  ([Michael Grunder](https://github.com/michael-grunder))
-- Improved Windows support (including MinGW and Windows CI)
-  [\#652](https://github.com/redis/hiredis/pull/652),
-  [\#663](https://github.com/redis/hiredis/pull/663)
-  ([Marcus Geelnard](https://www.bitsnbites.eu/author/m/))
-- Adds support for distinct connect and command timeouts
-  [\#839](https://github.com/redis/hiredis/pull/839),
-  [\#829](https://github.com/redis/hiredis/pull/829)
-  ([Valentino Geron](https://github.com/valentinogeron))
-- Add generic pointer and destructor to `redisContext` that users can use for context.
-  [\#855](https://github.com/redis/hiredis/pull/855)
-  ([Michael Grunder](https://github.com/michael-grunder))
-
-**Closed issues (that involved code changes):**
-
-- Makefile does not install TLS libraries  [\#809](https://github.com/redis/hiredis/issues/809)
-- redisConnectWithOptions should not set command timeout [\#722](https://github.com/redis/hiredis/issues/722), [\#829](https://github.com/redis/hiredis/pull/829) ([valentinogeron](https://github.com/valentinogeron))
-- Fix integer overflow in `sdsrange` [\#827](https://github.com/redis/hiredis/issues/827)
-- INFO & CLUSTER commands failed when using RESP3 [\#802](https://github.com/redis/hiredis/issues/802)
-- Windows compatibility patches [\#687](https://github.com/redis/hiredis/issues/687), [\#838](https://github.com/redis/hiredis/issues/838), [\#842](https://github.com/redis/hiredis/issues/842)
-- RESP3 PUSH messages incorrectly use pending callback [\#825](https://github.com/redis/hiredis/issues/825)
-- Asynchronous PSUBSCRIBE command fails when using RESP3 [\#815](https://github.com/redis/hiredis/issues/815)
-- New SSL API [\#804](https://github.com/redis/hiredis/issues/804), [\#813](https://github.com/redis/hiredis/issues/813)
-- Hard-coded limit of nested reply depth [\#794](https://github.com/redis/hiredis/issues/794)
-- Fix TCP_NODELAY in Windows/OSX [\#679](https://github.com/redis/hiredis/issues/679), [\#690](https://github.com/redis/hiredis/issues/690), [\#779](https://github.com/redis/hiredis/issues/779), [\#785](https://github.com/redis/hiredis/issues/785),
-- Added timers to libev adapter.  [\#778](https://github.com/redis/hiredis/issues/778), [\#795](https://github.com/redis/hiredis/pull/795)
-- Initialization discards const qualifier [\#777](https://github.com/redis/hiredis/issues/777)
-- \[BUG\]\[MinGW64\] Error setting socket timeout  [\#775](https://github.com/redis/hiredis/issues/775)
-- undefined reference to hi_malloc [\#769](https://github.com/redis/hiredis/issues/769)
-- hiredis pkg-config file incorrectly ignores multiarch libdir spec'n [\#767](https://github.com/redis/hiredis/issues/767)
-- Don't use -G to build shared object on Solaris [\#757](https://github.com/redis/hiredis/issues/757)
-- error when make USE\_SSL=1 [\#748](https://github.com/redis/hiredis/issues/748)
-- Allow to change SSL Mode [\#646](https://github.com/redis/hiredis/issues/646)
-- hiredis/adapters/libevent.h memleak [\#618](https://github.com/redis/hiredis/issues/618)
-- redisLibuvPoll crash when server closes the connetion [\#545](https://github.com/redis/hiredis/issues/545)
-- about redisAsyncDisconnect question [\#518](https://github.com/redis/hiredis/issues/518)
-- hiredis adapters libuv error for help [\#508](https://github.com/redis/hiredis/issues/508)
-- API/ABI changes analysis [\#506](https://github.com/redis/hiredis/issues/506)
-- Memory leak patch in Redis [\#502](https://github.com/redis/hiredis/issues/502)
-- Remove the depth limitation [\#421](https://github.com/redis/hiredis/issues/421)
-
-**Merged pull requests:**
-
-- Move SSL management to a distinct private pointer [\#855](https://github.com/redis/hiredis/pull/855) ([michael-grunder](https://github.com/michael-grunder))
-- Move include to sockcompat.h to maintain style [\#850](https://github.com/redis/hiredis/pull/850) ([michael-grunder](https://github.com/michael-grunder))
-- Remove erroneous tag and add license to push example [\#849](https://github.com/redis/hiredis/pull/849) ([michael-grunder](https://github.com/michael-grunder))
-- fix windows compiling with mingw [\#848](https://github.com/redis/hiredis/pull/848) ([rmalizia44](https://github.com/rmalizia44))
-- Some Windows quality of life improvements. [\#846](https://github.com/redis/hiredis/pull/846) ([michael-grunder](https://github.com/michael-grunder))
-- Use \_WIN32 define instead of WIN32 [\#845](https://github.com/redis/hiredis/pull/845) ([michael-grunder](https://github.com/michael-grunder))
-- Non Linux CI fixes [\#844](https://github.com/redis/hiredis/pull/844) ([michael-grunder](https://github.com/michael-grunder))
-- Resp3 oob push support [\#841](https://github.com/redis/hiredis/pull/841) ([michael-grunder](https://github.com/michael-grunder))
-- fix \#785: defer TCP\_NODELAY in async tcp connections [\#836](https://github.com/redis/hiredis/pull/836) ([OmriSteiner](https://github.com/OmriSteiner))
-- sdsrange overflow fix [\#830](https://github.com/redis/hiredis/pull/830) ([michael-grunder](https://github.com/michael-grunder))
-- Use explicit pointer casting for c++ compatibility [\#826](https://github.com/redis/hiredis/pull/826) ([aureus1](https://github.com/aureus1))
-- Document allocator injection and completeness fix in test.c [\#824](https://github.com/redis/hiredis/pull/824) ([michael-grunder](https://github.com/michael-grunder))
-- Use unique names for allocator struct members [\#823](https://github.com/redis/hiredis/pull/823) ([michael-grunder](https://github.com/michael-grunder))
-- New SSL API to replace redisSecureConnection\(\). [\#821](https://github.com/redis/hiredis/pull/821) ([yossigo](https://github.com/yossigo))
-- Add logic to handle RESP3 push messages [\#819](https://github.com/redis/hiredis/pull/819) ([michael-grunder](https://github.com/michael-grunder))
-- Use standrad isxdigit instead of custom helper function. [\#814](https://github.com/redis/hiredis/pull/814) ([tryfinally](https://github.com/tryfinally))
-- Fix missing SSL build/install options. [\#812](https://github.com/redis/hiredis/pull/812) ([yossigo](https://github.com/yossigo))
-- Add link to ABI tracker [\#808](https://github.com/redis/hiredis/pull/808) ([michael-grunder](https://github.com/michael-grunder))
-- Resp3 verbatim string support [\#805](https://github.com/redis/hiredis/pull/805) ([michael-grunder](https://github.com/michael-grunder))
-- Allow users to replace allocator and handle OOM everywhere. [\#800](https://github.com/redis/hiredis/pull/800) ([michael-grunder](https://github.com/michael-grunder))
-- Remove nested depth limitation. [\#797](https://github.com/redis/hiredis/pull/797) ([michael-grunder](https://github.com/michael-grunder))
-- Attempt to fix compilation on Solaris [\#796](https://github.com/redis/hiredis/pull/796) ([michael-grunder](https://github.com/michael-grunder))
-- Support timeouts in libev adapater [\#795](https://github.com/redis/hiredis/pull/795) ([michael-grunder](https://github.com/michael-grunder))
-- Fix pkgconfig when installing to a custom lib dir [\#793](https://github.com/redis/hiredis/pull/793) ([michael-grunder](https://github.com/michael-grunder))
-- Fix USE\_SSL=1 make/cmake on OSX and CMake tests [\#789](https://github.com/redis/hiredis/pull/789) ([michael-grunder](https://github.com/michael-grunder))
-- Use correct libuv call on Windows [\#784](https://github.com/redis/hiredis/pull/784) ([michael-grunder](https://github.com/michael-grunder))
-- Added CMake package config and fixed hiredis\_ssl on Windows [\#783](https://github.com/redis/hiredis/pull/783) ([michael-grunder](https://github.com/michael-grunder))
-- CMake: Set hiredis\_ssl shared object version. [\#780](https://github.com/redis/hiredis/pull/780) ([yossigo](https://github.com/yossigo))
-- Win32 tests and timeout fix [\#776](https://github.com/redis/hiredis/pull/776) ([michael-grunder](https://github.com/michael-grunder))
-- Provides an optional cleanup callback for async data. [\#768](https://github.com/redis/hiredis/pull/768) ([heronr](https://github.com/heronr))
-- Housekeeping fixes [\#764](https://github.com/redis/hiredis/pull/764) ([michael-grunder](https://github.com/michael-grunder))
-- install alloc.h [\#756](https://github.com/redis/hiredis/pull/756) ([ch1aki](https://github.com/ch1aki))
-- fix spelling mistakes [\#746](https://github.com/redis/hiredis/pull/746) ([ShooterIT](https://github.com/ShooterIT))
-- Free the reply in redisGetReply when passed NULL [\#741](https://github.com/redis/hiredis/pull/741) ([michael-grunder](https://github.com/michael-grunder))
-- Fix dead code in sslLogCallback relating to should\_log variable. [\#737](https://github.com/redis/hiredis/pull/737) ([natoscott](https://github.com/natoscott))
-- Fix typo in dict.c. [\#731](https://github.com/redis/hiredis/pull/731) ([Kevin-Xi](https://github.com/Kevin-Xi))
-- Adding an option to DISABLE\_TESTS [\#727](https://github.com/redis/hiredis/pull/727) ([pbotros](https://github.com/pbotros))
-- Update README with SSL support. [\#720](https://github.com/redis/hiredis/pull/720) ([yossigo](https://github.com/yossigo))
-- Fixes leaks in unit tests [\#715](https://github.com/redis/hiredis/pull/715) ([michael-grunder](https://github.com/michael-grunder))
-- SSL Tests [\#711](https://github.com/redis/hiredis/pull/711) ([yossigo](https://github.com/yossigo))
-- SSL Reorganization [\#708](https://github.com/redis/hiredis/pull/708) ([yossigo](https://github.com/yossigo))
-- Fix MSVC build. [\#706](https://github.com/redis/hiredis/pull/706) ([yossigo](https://github.com/yossigo))
-- SSL: Properly report SSL\_connect\(\) errors. [\#702](https://github.com/redis/hiredis/pull/702) ([yossigo](https://github.com/yossigo))
-- Silent SSL trace to stdout by default. [\#699](https://github.com/redis/hiredis/pull/699) ([yossigo](https://github.com/yossigo))
-- Port RESP3 support from Redis. [\#697](https://github.com/redis/hiredis/pull/697) ([yossigo](https://github.com/yossigo))
-- Removed whitespace before newline [\#691](https://github.com/redis/hiredis/pull/691) ([Miniwoffer](https://github.com/Miniwoffer))
-- Add install adapters header files [\#688](https://github.com/redis/hiredis/pull/688) ([kevin1018](https://github.com/kevin1018))
-- Remove unnecessary null check before free [\#684](https://github.com/redis/hiredis/pull/684) ([qlyoung](https://github.com/qlyoung))
-- redisReaderGetReply leak memory [\#671](https://github.com/redis/hiredis/pull/671) ([movebean](https://github.com/movebean))
-- fix timeout code in windows [\#670](https://github.com/redis/hiredis/pull/670) ([jman-krafton](https://github.com/jman-krafton))
-- test: fix errstr matching for musl libc [\#665](https://github.com/redis/hiredis/pull/665) ([ghost](https://github.com/ghost))
-- Windows: MinGW fixes and Windows Travis builders [\#663](https://github.com/redis/hiredis/pull/663) ([mbitsnbites](https://github.com/mbitsnbites))
-- The setsockopt and getsockopt API diffs from BSD socket and WSA one [\#662](https://github.com/redis/hiredis/pull/662) ([dragonation](https://github.com/dragonation))
-- Fix Compile Error On Windows \(Visual Studio\) [\#658](https://github.com/redis/hiredis/pull/658) ([jinjiazhang](https://github.com/jinjiazhang))
-- Fix NXDOMAIN test case [\#653](https://github.com/redis/hiredis/pull/653) ([michael-grunder](https://github.com/michael-grunder))
-- Add MinGW support [\#652](https://github.com/redis/hiredis/pull/652) ([mbitsnbites](https://github.com/mbitsnbites))
-- SSL Support [\#645](https://github.com/redis/hiredis/pull/645) ([mnunberg](https://github.com/mnunberg))
-- Fix Invalid argument after redisAsyncConnectUnix [\#644](https://github.com/redis/hiredis/pull/644) ([codehz](https://github.com/codehz))
-- Makefile: use predefined AR [\#632](https://github.com/redis/hiredis/pull/632) ([Mic92](https://github.com/Mic92))
-- FreeBSD  build fix [\#628](https://github.com/redis/hiredis/pull/628) ([devnexen](https://github.com/devnexen))
-- Fix errors not propagating properly with libuv.h. [\#624](https://github.com/redis/hiredis/pull/624) ([yossigo](https://github.com/yossigo))
-- Update README.md [\#621](https://github.com/redis/hiredis/pull/621) ([Crunsher](https://github.com/Crunsher))
-- Fix redisBufferRead documentation [\#620](https://github.com/redis/hiredis/pull/620) ([hacst](https://github.com/hacst))
-- Add CPPFLAGS to REAL\_CFLAGS [\#614](https://github.com/redis/hiredis/pull/614) ([thomaslee](https://github.com/thomaslee))
-- Update createArray to take size\_t [\#597](https://github.com/redis/hiredis/pull/597) ([justinbrewer](https://github.com/justinbrewer))
-- fix common realloc mistake and add null check more [\#580](https://github.com/redis/hiredis/pull/580) ([charsyam](https://github.com/charsyam))
-- Proper error reporting for connect failures [\#578](https://github.com/redis/hiredis/pull/578) ([mnunberg](https://github.com/mnunberg))
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
-
-## [1.0.0-rc1](https://github.com/redis/hiredis/tree/v1.0.0-rc1) - (2020-07-29)
-
-_Note:  There were no changes to code between v1.0.0-rc1 and v1.0.0 so see v1.0.0 for changelog_
-
-### 0.14.1 (2020-03-13)
-
-* Adds safe allocation wrappers (CVE-2020-7105, #747, #752) (Michael Grunder)
-
-### 0.14.0 (2018-09-25)
-**BREAKING CHANGES**:
-
-* Change `redisReply.len` to `size_t`, as it denotes the the size of a string
-
-  User code should compare this to `size_t` values as well.
-  If it was used to compare to other values, casting might be necessary or can be removed, if casting was applied before.
-
-* Make string2ll static to fix conflict with Redis (Tom Lee [c3188b])
-* Use -dynamiclib instead of -shared for OSX (Ryan Schmidt [a65537])
-* Use string2ll from Redis w/added tests (Michael Grunder [7bef04, 60f622])
-* Makefile - OSX compilation fixes (Ryan Schmidt [881fcb, 0e9af8])
-* Remove redundant NULL checks (Justin Brewer [54acc8, 58e6b8])
-* Fix bulk and multi-bulk length truncation (Justin Brewer [109197])
-* Fix SIGSEGV in OpenBSD by checking for NULL before calling freeaddrinfo (Justin Brewer [546d94])
-* Several POSIX compatibility fixes (Justin Brewer [bbeab8, 49bbaa, d1c1b6])
-* Makefile - Compatibility fixes (Dimitri Vorobiev [3238cf, 12a9d1])
-* Makefile - Fix make install on FreeBSD (Zach Shipko [a2ef2b])
-* Makefile - don't assume $(INSTALL) is cp (Igor Gnatenko [725a96])
-* Separate side-effect causing function from assert and small cleanup (amallia [b46413, 3c3234])
-* Don't send negative values to `__redisAsyncCommand` (Frederik Deweerdt [706129])
-* Fix leak if setsockopt fails (Frederik Deweerdt [e21c9c])
-* Fix libevent leak (zfz [515228])
-* Clean up GCC warning (Ichito Nagata [2ec774])
-* Keep track of errno in `__redisSetErrorFromErrno()` as snprintf may use it (Jin Qing [25cd88])
-* Solaris compilation fix (Donald Whyte [41b07d])
-* Reorder linker arguments when building examples (Tustfarm-heart [06eedd])
-* Keep track of subscriptions in case of rapid subscribe/unsubscribe (Hyungjin Kim [073dc8, be76c5, d46999])
-* libuv use after free fix (Paul Scott [cbb956])
-* Properly close socket fd on reconnect attempt (WSL [64d1ec])
-* Skip valgrind in OSX tests (Jan-Erik Rediger [9deb78])
-* Various updates for Travis testing OSX (Ted Nyman [fa3774, 16a459, bc0ea5])
-* Update libevent (Chris Xin [386802])
-* Change sds.h for building in C++ projects (Ali Volkan ATLI [f5b32e])
-* Use proper format specifier in redisFormatSdsCommandArgv (Paulino Huerta, Jan-Erik Rediger [360a06, 8655a6])
-* Better handling of NULL reply in example code (Jan-Erik Rediger [1b8ed3])
-* Prevent overflow when formatting an error (Jan-Erik Rediger [0335cb])
-* Compatibility fix for strerror_r (Tom Lee [bb1747])
-* Properly detect integer parse/overflow errors (Justin Brewer [93421f])
-* Adds CI for Windows and cygwin fixes (owent, [6c53d6, 6c3e40])
-* Catch a buffer overflow when formatting the error message
-* Import latest upstream sds. This breaks applications that are linked against the old hiredis v0.13
-* Fix warnings, when compiled with -Wshadow
-* Make hiredis compile in Cygwin on Windows, now CI-tested
-* Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
-  protocol errors. This is consistent with the RESP specification. On 32-bit
-  platforms, the upper bound is lowered to `SIZE_MAX`.
-
-* Remove backwards compatibility macro's
-
-This removes the following old function aliases, use the new name now:
-
-| Old                         | New                    |
-| --------------------------- | ---------------------- |
-| redisReplyReaderCreate      | redisReaderCreate      |
-| redisReplyReaderCreate      | redisReaderCreate      |
-| redisReplyReaderFree        | redisReaderFree        |
-| redisReplyReaderFeed        | redisReaderFeed        |
-| redisReplyReaderGetReply    | redisReaderGetReply    |
-| redisReplyReaderSetPrivdata | redisReaderSetPrivdata |
-| redisReplyReaderGetObject   | redisReaderGetObject   |
-| redisReplyReaderGetError    | redisReaderGetError    |
-
-* The `DEBUG` variable in the Makefile was renamed to `DEBUG_FLAGS`
-
-Previously it broke some builds for people that had `DEBUG` set to some arbitrary value,
-due to debugging other software.
-By renaming we avoid unintentional name clashes.
-
-Simply rename `DEBUG` to `DEBUG_FLAGS` in your environment to make it working again.
-
-### 0.13.3 (2015-09-16)
-
-* Revert "Clear `REDIS_CONNECTED` flag when connection is closed".
-* Make tests pass on FreeBSD (Thanks, Giacomo Olgeni)
-
-
-If the `REDIS_CONNECTED` flag is cleared,
-the async onDisconnect callback function will never be called.
-This causes problems as the disconnect is never reported back to the user.
-
-### 0.13.2 (2015-08-25)
-
-* Prevent crash on pending replies in async code (Thanks, @switch-st)
-* Clear `REDIS_CONNECTED` flag when connection is closed (Thanks, Jerry Jacobs)
-* Add MacOS X addapter (Thanks, @dizzus)
-* Add Qt adapter (Thanks, Pietro Cerutti)
-* Add Ivykis adapter (Thanks, Gergely Nagy)
-
-All adapters are provided as is and are only tested where possible.
-
-### 0.13.1 (2015-05-03)
-
-This is a bug fix release.
-The new `reconnect` method introduced new struct members, which clashed with pre-defined names in pre-C99 code.
-Another commit forced C99 compilation just to make it work, but of course this is not desirable for outside projects.
-Other non-C99 code can now use hiredis as usual again.
-Sorry for the inconvenience.
-
-* Fix memory leak in async reply handling (Salvatore Sanfilippo)
-* Rename struct member to avoid name clash with pre-c99 code (Alex Balashov, ncopa)
-
-### 0.13.0 (2015-04-16)
-
-This release adds a minimal Windows compatibility layer.
-The parser, standalone since v0.12.0, can now be compiled on Windows
-(and thus used in other client libraries as well)
-
-* Windows compatibility layer for parser code (tzickel)
-* Properly escape data printed to PKGCONF file (Dan Skorupski)
-* Fix tests when assert() undefined (Keith Bennett, Matt Stancliff)
-* Implement a reconnect method for the client context, this changes the structure of `redisContext` (Aaron Bedra)
-
-### 0.12.1 (2015-01-26)
-
-* Fix `make install`: DESTDIR support, install all required files, install PKGCONF in proper location
-* Fix `make test` as 32 bit build on 64 bit platform
-
-### 0.12.0 (2015-01-22)
-
-* Add optional KeepAlive support
-
-* Try again on EINTR errors
-
-* Add libuv adapter
-
-* Add IPv6 support
-
-* Remove possibility of multiple close on same fd
-
-* Add ability to bind source address on connect
-
-* Add redisConnectFd() and redisFreeKeepFd()
-
-* Fix getaddrinfo() memory leak
-
-* Free string if it is unused (fixes memory leak)
-
-* Improve redisAppendCommandArgv performance 2.5x
-
-* Add support for SO_REUSEADDR
-
-* Fix redisvFormatCommand format parsing
-
-* Add GLib 2.0 adapter
-
-* Refactor reading code into read.c
-
-* Fix errno error buffers to not clobber errors
-
-* Generate pkgconf during build
-
-* Silence _BSD_SOURCE warnings
-
-* Improve digit counting for multibulk creation
-
-
-### 0.11.0
-
-* Increase the maximum multi-bulk reply depth to 7.
-
-* Increase the read buffer size from 2k to 16k.
-
-* Use poll(2) instead of select(2) to support large fds (>= 1024).
-
-### 0.10.1
-
-* Makefile overhaul. Important to check out if you override one or more
-  variables using environment variables or via arguments to the "make" tool.
-
-* Issue #45: Fix potential memory leak for a multi bulk reply with 0 elements
-  being created by the default reply object functions.
-
-* Issue #43: Don't crash in an asynchronous context when Redis returns an error
-  reply after the connection has been made (this happens when the maximum
-  number of connections is reached).
-
-### 0.10.0
-
-* See commit log.
diff --git a/ext/hiredis-1.0.2/CMakeLists.txt b/ext/hiredis-1.0.2/CMakeLists.txt
deleted file mode 100644
index f86c9b70b..000000000
--- a/ext/hiredis-1.0.2/CMakeLists.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0)
-INCLUDE(GNUInstallDirs)
-PROJECT(hiredis)
-
-OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF)
-OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF)
-OPTION(ENABLE_SSL_TESTS, "Should we test SSL connections" OFF)
-
-MACRO(getVersionBit name)
-  SET(VERSION_REGEX "^#define ${name} (.+)$")
-  FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/hiredis.h"
-    VERSION_BIT REGEX ${VERSION_REGEX})
-  STRING(REGEX REPLACE ${VERSION_REGEX} "\\1" ${name} "${VERSION_BIT}")
-ENDMACRO(getVersionBit)
-
-getVersionBit(HIREDIS_MAJOR)
-getVersionBit(HIREDIS_MINOR)
-getVersionBit(HIREDIS_PATCH)
-getVersionBit(HIREDIS_SONAME)
-SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}")
-MESSAGE("Detected version: ${VERSION}")
-
-PROJECT(hiredis VERSION "${VERSION}")
-
-SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples")
-
-SET(hiredis_sources
-    alloc.c
-    async.c
-    dict.c
-    hiredis.c
-    net.c
-    read.c
-    sds.c
-    sockcompat.c)
-
-SET(hiredis_sources ${hiredis_sources})
-
-IF(WIN32)
-    ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN)
-ENDIF()
-
-ADD_LIBRARY(hiredis SHARED ${hiredis_sources})
-
-SET_TARGET_PROPERTIES(hiredis
-    PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE
-    VERSION "${HIREDIS_SONAME}")
-IF(WIN32 OR MINGW)
-    TARGET_LINK_LIBRARIES(hiredis PRIVATE ws2_32)
-ENDIF()
-
-TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $<INSTALL_INTERFACE:.> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
-
-CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY)
-
-INSTALL(TARGETS hiredis
-    EXPORT hiredis-targets
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-INSTALL(FILES hiredis.h read.h sds.h async.h alloc.h
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis)
-    
-INSTALL(DIRECTORY adapters
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis)
-    
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
-export(EXPORT hiredis-targets
-    FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredis-targets.cmake"
-    NAMESPACE hiredis::)
-
-SET(CMAKE_CONF_INSTALL_DIR share/hiredis)
-SET(INCLUDE_INSTALL_DIR include)
-include(CMakePackageConfigHelpers)
-configure_package_config_file(hiredis-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis-config.cmake
-                              INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR}
-                              PATH_VARS INCLUDE_INSTALL_DIR)
-
-INSTALL(EXPORT hiredis-targets
-        FILE hiredis-targets.cmake
-        NAMESPACE hiredis::
-        DESTINATION ${CMAKE_CONF_INSTALL_DIR})
-
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis-config.cmake
-        DESTINATION ${CMAKE_CONF_INSTALL_DIR})
-
-
-IF(ENABLE_SSL)
-    IF (NOT OPENSSL_ROOT_DIR)
-        IF (APPLE)
-            SET(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
-        ENDIF()
-    ENDIF()
-    FIND_PACKAGE(OpenSSL REQUIRED)
-    SET(hiredis_ssl_sources 
-        ssl.c)
-    ADD_LIBRARY(hiredis_ssl SHARED
-            ${hiredis_ssl_sources})
-
-    IF (APPLE)
-        SET_PROPERTY(TARGET hiredis_ssl PROPERTY LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup")
-    ENDIF()
-
-    SET_TARGET_PROPERTIES(hiredis_ssl
-        PROPERTIES
-        WINDOWS_EXPORT_ALL_SYMBOLS TRUE
-        VERSION "${HIREDIS_SONAME}")
-
-    TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}")
-    TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES})
-    IF (WIN32 OR MINGW)
-        TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE hiredis)
-    ENDIF()
-    CONFIGURE_FILE(hiredis_ssl.pc.in hiredis_ssl.pc @ONLY)
-
-    INSTALL(TARGETS hiredis_ssl
-        EXPORT hiredis_ssl-targets
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-    INSTALL(FILES hiredis_ssl.h
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis)
-    
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl.pc
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
-    export(EXPORT hiredis_ssl-targets
-           FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-targets.cmake"
-           NAMESPACE hiredis::)
-
-    SET(CMAKE_CONF_INSTALL_DIR share/hiredis_ssl)
-    configure_package_config_file(hiredis_ssl-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-config.cmake
-                                  INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR}
-                                  PATH_VARS INCLUDE_INSTALL_DIR)
-
-    INSTALL(EXPORT hiredis_ssl-targets
-        FILE hiredis_ssl-targets.cmake
-        NAMESPACE hiredis::
-        DESTINATION ${CMAKE_CONF_INSTALL_DIR})
-
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-config.cmake
-        DESTINATION ${CMAKE_CONF_INSTALL_DIR})
-ENDIF()
-
-IF(NOT DISABLE_TESTS)
-    ENABLE_TESTING()
-    ADD_EXECUTABLE(hiredis-test test.c)
-    IF(ENABLE_SSL_TESTS)
-        ADD_DEFINITIONS(-DHIREDIS_TEST_SSL=1)
-        TARGET_LINK_LIBRARIES(hiredis-test hiredis hiredis_ssl)
-    ELSE()
-        TARGET_LINK_LIBRARIES(hiredis-test hiredis)
-    ENDIF()
-    ADD_TEST(NAME hiredis-test
-        COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test.sh)
-ENDIF()
-
-# Add examples
-IF(ENABLE_EXAMPLES)
-  ADD_SUBDIRECTORY(examples)
-ENDIF(ENABLE_EXAMPLES)
diff --git a/ext/hiredis-1.0.2/COPYING b/ext/hiredis-1.0.2/COPYING
deleted file mode 100644
index a5fc97395..000000000
--- a/ext/hiredis-1.0.2/COPYING
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
-Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of Redis nor the names of its contributors may be used
-  to endorse or promote products derived from this software without specific
-  prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ext/hiredis-1.0.2/Makefile b/ext/hiredis-1.0.2/Makefile
deleted file mode 100644
index a8d37a2eb..000000000
--- a/ext/hiredis-1.0.2/Makefile
+++ /dev/null
@@ -1,308 +0,0 @@
-# Hiredis Makefile
-# Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com>
-# Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
-# This file is released under the BSD license, see the COPYING file
-
-OBJ=alloc.o net.o hiredis.o sds.o async.o read.o sockcompat.o
-SSL_OBJ=ssl.o
-EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis-example-glib hiredis-example-push
-ifeq ($(USE_SSL),1)
-EXAMPLES+=hiredis-example-ssl hiredis-example-libevent-ssl
-endif
-TESTS=hiredis-test
-LIBNAME=libhiredis
-PKGCONFNAME=hiredis.pc
-SSL_LIBNAME=libhiredis_ssl
-SSL_PKGCONFNAME=hiredis_ssl.pc
-
-HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}')
-HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}')
-HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | awk '{print $$3}')
-HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
-
-# Installation related variables and target
-PREFIX?=/usr/local
-INCLUDE_PATH?=include/hiredis
-LIBRARY_PATH?=lib
-PKGCONF_PATH?=pkgconfig
-INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
-INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
-INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
-
-# redis-server configuration used for testing
-REDIS_PORT=56379
-REDIS_SERVER=redis-server
-define REDIS_TEST_CONFIG
-	daemonize yes
-	pidfile /tmp/hiredis-test-redis.pid
-	port $(REDIS_PORT)
-	bind 127.0.0.1
-	unixsocket /tmp/hiredis-test-redis.sock
-endef
-export REDIS_TEST_CONFIG
-
-# Fallback to gcc when $CC is not in $PATH.
-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
-OPTIMIZATION?=-O3
-WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
-DEBUG_FLAGS?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
-REAL_LDFLAGS=$(LDFLAGS)
-
-DYLIBSUFFIX=so
-STLIBSUFFIX=a
-DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
-DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
-DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
-
-DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME)
-STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
-STLIB_MAKE_CMD=$(AR) rcs
-
-SSL_DYLIB_MINOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
-SSL_DYLIB_MAJOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
-SSL_DYLIBNAME=$(SSL_LIBNAME).$(DYLIBSUFFIX)
-SSL_STLIBNAME=$(SSL_LIBNAME).$(STLIBSUFFIX)
-SSL_DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(SSL_DYLIB_MINOR_NAME)
-
-# Platform-specific overrides
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-
-USE_SSL?=0
-
-# This is required for test.c only
-ifeq ($(USE_SSL),1)
-  CFLAGS+=-DHIREDIS_TEST_SSL
-endif
-
-ifeq ($(uname_S),Linux)
-  SSL_LDFLAGS=-lssl -lcrypto
-else
-  OPENSSL_PREFIX?=/usr/local/opt/openssl
-  CFLAGS+=-I$(OPENSSL_PREFIX)/include
-  SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
-endif
-
-ifeq ($(uname_S),SunOS)
-  IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
-  ifeq ($(IS_SUN_CC),1)
-    SUN_SHARED_FLAG=-G
-  else
-    SUN_SHARED_FLAG=-shared
-  endif
-  REAL_LDFLAGS+= -ldl -lnsl -lsocket
-  DYLIB_MAKE_CMD=$(CC) $(SUN_SHARED_FLAG) -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-  SSL_DYLIB_MAKE_CMD=$(CC) $(SUN_SHARED_FLAG) -o $(SSL_DYLIBNAME) -h $(SSL_DYLIB_MINOR_NAME) $(LDFLAGS) $(SSL_LDFLAGS)
-endif
-ifeq ($(uname_S),Darwin)
-  DYLIBSUFFIX=dylib
-  DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
-  DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-  SSL_DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME) -o $(SSL_DYLIBNAME) $(LDFLAGS) $(SSL_LDFLAGS)
-  DYLIB_PLUGIN=-Wl,-undefined -Wl,dynamic_lookup
-endif
-
-all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
-ifeq ($(USE_SSL),1)
-all: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME)
-endif
-
-# Deps (use make dep to generate this)
-alloc.o: alloc.c fmacros.h alloc.h
-async.o: async.c fmacros.h alloc.h async.h hiredis.h read.h sds.h net.h dict.c dict.h win32.h async_private.h
-dict.o: dict.c fmacros.h alloc.h dict.h
-hiredis.o: hiredis.c fmacros.h hiredis.h read.h sds.h alloc.h net.h async.h win32.h
-net.o: net.c fmacros.h net.h hiredis.h read.h sds.h alloc.h sockcompat.h win32.h
-read.o: read.c fmacros.h alloc.h read.h sds.h win32.h
-sds.o: sds.c sds.h sdsalloc.h alloc.h
-sockcompat.o: sockcompat.c sockcompat.h
-ssl.o: ssl.c hiredis.h read.h sds.h alloc.h async.h win32.h async_private.h
-test.o: test.c fmacros.h hiredis.h read.h sds.h alloc.h net.h sockcompat.h win32.h
-
-$(DYLIBNAME): $(OBJ)
-	$(DYLIB_MAKE_CMD) -o $(DYLIBNAME) $(OBJ) $(REAL_LDFLAGS)
-
-$(STLIBNAME): $(OBJ)
-	$(STLIB_MAKE_CMD) $(STLIBNAME) $(OBJ)
-
-$(SSL_DYLIBNAME): $(SSL_OBJ)
-	$(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS)
-
-$(SSL_STLIBNAME): $(SSL_OBJ)
-	$(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
-
-dynamic: $(DYLIBNAME)
-static: $(STLIBNAME)
-ifeq ($(USE_SSL),1)
-dynamic: $(SSL_DYLIBNAME)
-static: $(SSL_STLIBNAME)
-endif
-
-# Binaries:
-hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-libevent-ssl: examples/example-libevent-ssl.c adapters/libevent.h $(STLIBNAME) $(SSL_STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -levent $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS)
-
-hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -lev $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-glib: examples/example-glib.c adapters/glib.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(shell pkg-config --cflags --libs glib-2.0) $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-ivykis: examples/example-ivykis.c adapters/ivykis.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -livykis $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-macosx: examples/example-macosx.c adapters/macosx.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< -framework CoreFoundation $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-ssl: examples/example-ssl.c $(STLIBNAME) $(SSL_STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(SSL_STLIBNAME) $(REAL_LDFLAGS) $(SSL_LDFLAGS)
-
-
-ifndef AE_DIR
-hiredis-example-ae:
-	@echo "Please specify AE_DIR (e.g. <redis repository>/src)"
-	@false
-else
-hiredis-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME)
-endif
-
-ifndef LIBUV_DIR
-hiredis-example-libuv:
-	@echo "Please specify LIBUV_DIR (e.g. ../libuv/)"
-	@false
-else
-hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread -lrt $(STLIBNAME) $(REAL_LDFLAGS)
-endif
-
-ifeq ($(and $(QT_MOC),$(QT_INCLUDE_DIR),$(QT_LIBRARY_DIR)),)
-hiredis-example-qt:
-	@echo "Please specify QT_MOC, QT_INCLUDE_DIR AND QT_LIBRARY_DIR"
-	@false
-else
-hiredis-example-qt: examples/example-qt.cpp adapters/qt.h $(STLIBNAME)
-	$(QT_MOC) adapters/qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
-	    $(CXX) -x c++ -o qt-adapter-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
-	$(QT_MOC) examples/example-qt.h -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore | \
-	    $(CXX) -x c++ -o qt-example-moc.o -c - $(REAL_CFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore
-	$(CXX) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(QT_INCLUDE_DIR) -I$(QT_INCLUDE_DIR)/QtCore -L$(QT_LIBRARY_DIR) qt-adapter-moc.o qt-example-moc.o $< -pthread $(STLIBNAME) -lQtCore
-endif
-
-hiredis-example: examples/example.c $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)
-
-hiredis-example-push: examples/example-push.c $(STLIBNAME)
-	$(CC) -o examples/$@ $(REAL_CFLAGS) -I. $< $(STLIBNAME) $(REAL_LDFLAGS)
-
-examples: $(EXAMPLES)
-
-TEST_LIBS = $(STLIBNAME)
-ifeq ($(USE_SSL),1)
-    TEST_LIBS += $(SSL_STLIBNAME)
-    TEST_LDFLAGS = $(SSL_LDFLAGS) -lssl -lcrypto -lpthread
-endif
-
-hiredis-test: test.o $(TEST_LIBS)
-	$(CC) -o $@ $(REAL_CFLAGS) -I. $^ $(REAL_LDFLAGS) $(TEST_LDFLAGS)
-
-hiredis-%: %.o $(STLIBNAME)
-	$(CC) $(REAL_CFLAGS) -o $@ $< $(TEST_LIBS) $(REAL_LDFLAGS)
-
-test: hiredis-test
-	./hiredis-test
-
-check: hiredis-test
-	TEST_SSL=$(USE_SSL) ./test.sh
-
-.c.o:
-	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
-
-clean:
-	rm -rf $(DYLIBNAME) $(STLIBNAME) $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-
-dep:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -MM *.c
-
-INSTALL?= cp -pPR
-
-$(PKGCONFNAME): hiredis.h
-	@echo "Generating $@ for pkgconfig..."
-	@echo prefix=$(PREFIX) > $@
-	@echo exec_prefix=\$${prefix} >> $@
-	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
-	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
-	@echo >> $@
-	@echo Name: hiredis >> $@
-	@echo Description: Minimalistic C client library for Redis. >> $@
-	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
-	@echo Libs: -L\$${libdir} -lhiredis >> $@
-	@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
-
-$(SSL_PKGCONFNAME): hiredis_ssl.h
-	@echo "Generating $@ for pkgconfig..."
-	@echo prefix=$(PREFIX) > $@
-	@echo exec_prefix=\$${prefix} >> $@
-	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
-	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
-	@echo >> $@
-	@echo Name: hiredis_ssl >> $@
-	@echo Description: SSL Support for hiredis. >> $@
-	@echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@
-	@echo Requires: hiredis >> $@
-	@echo Libs: -L\$${libdir} -lhiredis_ssl >> $@
-	@echo Libs.private: -lssl -lcrypto >> $@
-
-install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
-	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH)
-	$(INSTALL) hiredis.h async.h read.h sds.h alloc.h $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters
-	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
-	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-	mkdir -p $(INSTALL_PKGCONF_PATH)
-	$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
-
-ifeq ($(USE_SSL),1)
-install: install-ssl
-
-install-ssl: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME)
-	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-	$(INSTALL) hiredis_ssl.h $(INSTALL_INCLUDE_PATH)
-	$(INSTALL) $(SSL_DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME)
-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(SSL_DYLIB_MINOR_NAME) $(SSL_DYLIBNAME)
-	$(INSTALL) $(SSL_STLIBNAME) $(INSTALL_LIBRARY_PATH)
-	mkdir -p $(INSTALL_PKGCONF_PATH)
-	$(INSTALL) $(SSL_PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
-endif
-
-32bit:
-	@echo ""
-	@echo "WARNING: if this fails under Linux you probably need to install libc6-dev-i386"
-	@echo ""
-	$(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
-
-32bit-vars:
-	$(eval CFLAGS=-m32)
-	$(eval LDFLAGS=-m32)
-
-gprof:
-	$(MAKE) CFLAGS="-pg" LDFLAGS="-pg"
-
-gcov:
-	$(MAKE) CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
-
-coverage: gcov
-	make check
-	mkdir -p tmp/lcov
-	lcov -d . -c -o tmp/lcov/hiredis.info
-	genhtml --legend -o tmp/lcov/report tmp/lcov/hiredis.info
-
-noopt:
-	$(MAKE) OPTIMIZATION=""
-
-.PHONY: all test check clean dep install 32bit 32bit-vars gprof gcov noopt
diff --git a/ext/hiredis-1.0.2/README.md b/ext/hiredis-1.0.2/README.md
deleted file mode 100644
index c544d5718..000000000
--- a/ext/hiredis-1.0.2/README.md
+++ /dev/null
@@ -1,664 +0,0 @@
-[![Build Status](https://travis-ci.org/redis/hiredis.png)](https://travis-ci.org/redis/hiredis)
-
-**This Readme reflects the latest changed in the master branch. See [v1.0.0](https://github.com/redis/hiredis/tree/v1.0.0) for the Readme and documentation for the latest release ([API/ABI history](https://abi-laboratory.pro/?view=timeline&l=hiredis)).**
-
-# HIREDIS
-
-Hiredis is a minimalistic C client library for the [Redis](http://redis.io/) database.
-
-It is minimalistic because it just adds minimal support for the protocol, but
-at the same time it uses a high level printf-alike API in order to make it
-much higher level than otherwise suggested by its minimal code base and the
-lack of explicit bindings for every Redis command.
-
-Apart from supporting sending commands and receiving replies, it comes with
-a reply parser that is decoupled from the I/O layer. It
-is a stream parser designed for easy reusability, which can for instance be used
-in higher level language bindings for efficient reply parsing.
-
-Hiredis only supports the binary-safe Redis protocol, so you can use it with any
-Redis version >= 1.2.0.
-
-The library comes with multiple APIs. There is the
-*synchronous API*, the *asynchronous API* and the *reply parsing API*.
-
-## Upgrading to `1.0.2`
-
-<span style="color:red">NOTE:  v1.0.1 erroneously bumped SONAME, which is why it is skipped here.</span>
-
-Version 1.0.2 is simply 1.0.0 with a fix for [CVE-2021-32765](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2).  They are otherwise identical.
-
-## Upgrading to `1.0.0`
-
-Version 1.0.0 marks the first stable release of Hiredis.
-It includes some minor breaking changes, mostly to make the exposed API more uniform and self-explanatory.
-It also bundles the updated `sds` library, to sync up with upstream and Redis.
-For code changes see the [Changelog](CHANGELOG.md).
-
-_Note:  As described below, a few member names have been changed but most applications should be able to upgrade with minor code changes and recompiling._
-
-## IMPORTANT:  Breaking changes from `0.14.1` -> `1.0.0`
-
-* `redisContext` has two additional members (`free_privdata`, and `privctx`).
-* `redisOptions.timeout` has been renamed to `redisOptions.connect_timeout`, and we've added `redisOptions.command_timeout`.
-* `redisReplyObjectFunctions.createArray` now takes `size_t` instead of `int` for its length parameter.
-
-## IMPORTANT:  Breaking changes when upgrading from 0.13.x -> 0.14.x
-
-Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now
-protocol errors. This is consistent with the RESP specification. On 32-bit
-platforms, the upper bound is lowered to `SIZE_MAX`.
-
-Change `redisReply.len` to `size_t`, as it denotes the the size of a string
-
-User code should compare this to `size_t` values as well.  If it was used to
-compare to other values, casting might be necessary or can be removed, if
-casting was applied before.
-
-## Upgrading from `<0.9.0`
-
-Version 0.9.0 is a major overhaul of hiredis in every aspect. However, upgrading existing
-code using hiredis should not be a big pain. The key thing to keep in mind when
-upgrading is that hiredis >= 0.9.0 uses a `redisContext*` to keep state, in contrast to
-the stateless 0.0.1 that only has a file descriptor to work with.
-
-## Synchronous API
-
-To consume the synchronous API, there are only a few function calls that need to be introduced:
-
-```c
-redisContext *redisConnect(const char *ip, int port);
-void *redisCommand(redisContext *c, const char *format, ...);
-void freeReplyObject(void *reply);
-```
-
-### Connecting
-
-The function `redisConnect` is used to create a so-called `redisContext`. The
-context is where Hiredis holds state for a connection. The `redisContext`
-struct has an integer `err` field that is non-zero when the connection is in
-an error state. The field `errstr` will contain a string with a description of
-the error. More information on errors can be found in the **Errors** section.
-After trying to connect to Redis using `redisConnect` you should
-check the `err` field to see if establishing the connection was successful:
-```c
-redisContext *c = redisConnect("127.0.0.1", 6379);
-if (c == NULL || c->err) {
-    if (c) {
-        printf("Error: %s\n", c->errstr);
-        // handle error
-    } else {
-        printf("Can't allocate redis context\n");
-    }
-}
-```
-
-*Note: A `redisContext` is not thread-safe.*
-
-### Sending commands
-
-There are several ways to issue commands to Redis. The first that will be introduced is
-`redisCommand`. This function takes a format similar to printf. In the simplest form,
-it is used like this:
-```c
-reply = redisCommand(context, "SET foo bar");
-```
-
-The specifier `%s` interpolates a string in the command, and uses `strlen` to
-determine the length of the string:
-```c
-reply = redisCommand(context, "SET foo %s", value);
-```
-When you need to pass binary safe strings in a command, the `%b` specifier can be
-used. Together with a pointer to the string, it requires a `size_t` length argument
-of the string:
-```c
-reply = redisCommand(context, "SET foo %b", value, (size_t) valuelen);
-```
-Internally, Hiredis splits the command in different arguments and will
-convert it to the protocol used to communicate with Redis.
-One or more spaces separates arguments, so you can use the specifiers
-anywhere in an argument:
-```c
-reply = redisCommand(context, "SET key:%s %s", myid, value);
-```
-
-### Using replies
-
-The return value of `redisCommand` holds a reply when the command was
-successfully executed. When an error occurs, the return value is `NULL` and
-the `err` field in the context will be set (see section on **Errors**).
-Once an error is returned the context cannot be reused and you should set up
-a new connection.
-
-The standard replies that `redisCommand` are of the type `redisReply`. The
-`type` field in the `redisReply` should be used to test what kind of reply
-was received:
-
-### RESP2
-
-* **`REDIS_REPLY_STATUS`**:
-    * The command replied with a status reply. The status string can be accessed using `reply->str`.
-      The length of this string can be accessed using `reply->len`.
-
-* **`REDIS_REPLY_ERROR`**:
-    *  The command replied with an error. The error string can be accessed identical to `REDIS_REPLY_STATUS`.
-
-* **`REDIS_REPLY_INTEGER`**:
-    * The command replied with an integer. The integer value can be accessed using the
-      `reply->integer` field of type `long long`.
-
-* **`REDIS_REPLY_NIL`**:
-    * The command replied with a **nil** object. There is no data to access.
-
-* **`REDIS_REPLY_STRING`**:
-    * A bulk (string) reply. The value of the reply can be accessed using `reply->str`.
-      The length of this string can be accessed using `reply->len`.
-
-* **`REDIS_REPLY_ARRAY`**:
-    * A multi bulk reply. The number of elements in the multi bulk reply is stored in
-      `reply->elements`. Every element in the multi bulk reply is a `redisReply` object as well
-      and can be accessed via `reply->element[..index..]`.
-      Redis may reply with nested arrays but this is fully supported.
-
-### RESP3
-
-Hiredis also supports every new `RESP3` data type which are as follows.  For more information about the protocol see the `RESP3` [specification.](https://github.com/antirez/RESP3/blob/master/spec.md)
-
-* **`REDIS_REPLY_DOUBLE`**:
-    * The command replied with a double-precision floating point number.
-      The value is stored as a string in the `str` member, and can be converted with `strtod` or similar.
-
-* **`REDIS_REPLY_BOOL`**:
-    * A boolean true/false reply.
-      The value is stored in the `integer` member and will be either `0` or `1`.
-
-* **`REDIS_REPLY_MAP`**:
-    * An array with the added invariant that there will always be an even number of elements.
-      The MAP is functionally equivelant to `REDIS_REPLY_ARRAY` except for the previously mentioned invariant.
-
-* **`REDIS_REPLY_SET`**:
-    * An array response where each entry is unique.
-      Like the MAP type, the data is identical to an array response except there are no duplicate values.
-
-* **`REDIS_REPLY_PUSH`**:
-    * An array that can be generated spontaneously by Redis.
-      This array response will always contain at least two subelements.  The first contains the type of `PUSH` message (e.g. `message`, or `invalidate`), and the second being a sub-array with the `PUSH` payload itself.
-
-* **`REDIS_REPLY_ATTR`**:
-    * An array structurally identical to a `MAP` but intended as meta-data about a reply.
-      _As of Redis 6.0.6 this reply type is not used in Redis_
-
-* **`REDIS_REPLY_BIGNUM`**:
-    * A string representing an arbitrarily large signed or unsigned integer value.
-      The number will be encoded as a string in the `str` member of `redisReply`.
-
-* **`REDIS_REPLY_VERB`**:
-    * A verbatim string, intended to be presented to the user without modification.
-      The string payload is stored in the `str` memeber, and type data is stored in the `vtype` member (e.g. `txt` for raw text or `md` for markdown).
-
-Replies should be freed using the `freeReplyObject()` function.
-Note that this function will take care of freeing sub-reply objects
-contained in arrays and nested arrays, so there is no need for the user to
-free the sub replies (it is actually harmful and will corrupt the memory).
-
-**Important:** the current version of hiredis (1.0.0) frees replies when the
-asynchronous API is used. This means you should not call `freeReplyObject` when
-you use this API. The reply is cleaned up by hiredis _after_ the callback
-returns.  We may introduce a flag to make this configurable in future versions of the library.
-
-### Cleaning up
-
-To disconnect and free the context the following function can be used:
-```c
-void redisFree(redisContext *c);
-```
-This function immediately closes the socket and then frees the allocations done in
-creating the context.
-
-### Sending commands (cont'd)
-
-Together with `redisCommand`, the function `redisCommandArgv` can be used to issue commands.
-It has the following prototype:
-```c
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-```
-It takes the number of arguments `argc`, an array of strings `argv` and the lengths of the
-arguments `argvlen`. For convenience, `argvlen` may be set to `NULL` and the function will
-use `strlen(3)` on every argument to determine its length. Obviously, when any of the arguments
-need to be binary safe, the entire array of lengths `argvlen` should be provided.
-
-The return value has the same semantic as `redisCommand`.
-
-### Pipelining
-
-To explain how Hiredis supports pipelining in a blocking connection, there needs to be
-understanding of the internal execution flow.
-
-When any of the functions in the `redisCommand` family is called, Hiredis first formats the
-command according to the Redis protocol. The formatted command is then put in the output buffer
-of the context. This output buffer is dynamic, so it can hold any number of commands.
-After the command is put in the output buffer, `redisGetReply` is called. This function has the
-following two execution paths:
-
-1. The input buffer is non-empty:
-    * Try to parse a single reply from the input buffer and return it
-    * If no reply could be parsed, continue at *2*
-2. The input buffer is empty:
-    * Write the **entire** output buffer to the socket
-    * Read from the socket until a single reply could be parsed
-
-The function `redisGetReply` is exported as part of the Hiredis API and can be used when a reply
-is expected on the socket. To pipeline commands, the only things that needs to be done is
-filling up the output buffer. For this cause, two commands can be used that are identical
-to the `redisCommand` family, apart from not returning a reply:
-```c
-void redisAppendCommand(redisContext *c, const char *format, ...);
-void redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-```
-After calling either function one or more times, `redisGetReply` can be used to receive the
-subsequent replies. The return value for this function is either `REDIS_OK` or `REDIS_ERR`, where
-the latter means an error occurred while reading a reply. Just as with the other commands,
-the `err` field in the context can be used to find out what the cause of this error is.
-
-The following examples shows a simple pipeline (resulting in only a single call to `write(2)` and
-a single call to `read(2)`):
-```c
-redisReply *reply;
-redisAppendCommand(context,"SET foo bar");
-redisAppendCommand(context,"GET foo");
-redisGetReply(context,(void *)&reply); // reply for SET
-freeReplyObject(reply);
-redisGetReply(context,(void *)&reply); // reply for GET
-freeReplyObject(reply);
-```
-This API can also be used to implement a blocking subscriber:
-```c
-reply = redisCommand(context,"SUBSCRIBE foo");
-freeReplyObject(reply);
-while(redisGetReply(context,(void *)&reply) == REDIS_OK) {
-    // consume message
-    freeReplyObject(reply);
-}
-```
-### Errors
-
-When a function call is not successful, depending on the function either `NULL` or `REDIS_ERR` is
-returned. The `err` field inside the context will be non-zero and set to one of the
-following constants:
-
-* **`REDIS_ERR_IO`**:
-    There was an I/O error while creating the connection, trying to write
-    to the socket or read from the socket. If you included `errno.h` in your
-    application, you can use the global `errno` variable to find out what is
-    wrong.
-
-* **`REDIS_ERR_EOF`**:
-    The server closed the connection which resulted in an empty read.
-
-* **`REDIS_ERR_PROTOCOL`**:
-    There was an error while parsing the protocol.
-
-* **`REDIS_ERR_OTHER`**:
-    Any other error. Currently, it is only used when a specified hostname to connect
-    to cannot be resolved.
-
-In every case, the `errstr` field in the context will be set to hold a string representation
-of the error.
-
-## Asynchronous API
-
-Hiredis comes with an asynchronous API that works easily with any event library.
-Examples are bundled that show using Hiredis with [libev](http://software.schmorp.de/pkg/libev.html)
-and [libevent](http://monkey.org/~provos/libevent/).
-
-### Connecting
-
-The function `redisAsyncConnect` can be used to establish a non-blocking connection to
-Redis. It returns a pointer to the newly created `redisAsyncContext` struct. The `err` field
-should be checked after creation to see if there were errors creating the connection.
-Because the connection that will be created is non-blocking, the kernel is not able to
-instantly return if the specified host and port is able to accept a connection.
-
-*Note: A `redisAsyncContext` is not thread-safe.*
-
-```c
-redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-if (c->err) {
-    printf("Error: %s\n", c->errstr);
-    // handle error
-}
-```
-
-The asynchronous context can hold a disconnect callback function that is called when the
-connection is disconnected (either because of an error or per user request). This function should
-have the following prototype:
-```c
-void(const redisAsyncContext *c, int status);
-```
-On a disconnect, the `status` argument is set to `REDIS_OK` when disconnection was initiated by the
-user, or `REDIS_ERR` when the disconnection was caused by an error. When it is `REDIS_ERR`, the `err`
-field in the context can be accessed to find out the cause of the error.
-
-The context object is always freed after the disconnect callback fired. When a reconnect is needed,
-the disconnect callback is a good point to do so.
-
-Setting the disconnect callback can only be done once per context. For subsequent calls it will
-return `REDIS_ERR`. The function to set the disconnect callback has the following prototype:
-```c
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-```
-`ac->data` may be used to pass user data to this callback, the same can be done for redisConnectCallback.
-### Sending commands and their callbacks
-
-In an asynchronous context, commands are automatically pipelined due to the nature of an event loop.
-Therefore, unlike the synchronous API, there is only a single way to send commands.
-Because commands are sent to Redis asynchronously, issuing a command requires a callback function
-that is called when the reply is received. Reply callbacks should have the following prototype:
-```c
-void(redisAsyncContext *c, void *reply, void *privdata);
-```
-The `privdata` argument can be used to curry arbitrary data to the callback from the point where
-the command is initially queued for execution.
-
-The functions that can be used to issue commands in an asynchronous context are:
-```c
-int redisAsyncCommand(
-  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
-  const char *format, ...);
-int redisAsyncCommandArgv(
-  redisAsyncContext *ac, redisCallbackFn *fn, void *privdata,
-  int argc, const char **argv, const size_t *argvlen);
-```
-Both functions work like their blocking counterparts. The return value is `REDIS_OK` when the command
-was successfully added to the output buffer and `REDIS_ERR` otherwise. Example: when the connection
-is being disconnected per user-request, no new commands may be added to the output buffer and `REDIS_ERR` is
-returned on calls to the `redisAsyncCommand` family.
-
-If the reply for a command with a `NULL` callback is read, it is immediately freed. When the callback
-for a command is non-`NULL`, the memory is freed immediately following the callback: the reply is only
-valid for the duration of the callback.
-
-All pending callbacks are called with a `NULL` reply when the context encountered an error.
-
-### Disconnecting
-
-An asynchronous connection can be terminated using:
-```c
-void redisAsyncDisconnect(redisAsyncContext *ac);
-```
-When this function is called, the connection is **not** immediately terminated. Instead, new
-commands are no longer accepted and the connection is only terminated when all pending commands
-have been written to the socket, their respective replies have been read and their respective
-callbacks have been executed. After this, the disconnection callback is executed with the
-`REDIS_OK` status and the context object is freed.
-
-### Hooking it up to event library *X*
-
-There are a few hooks that need to be set on the context object after it is created.
-See the `adapters/` directory for bindings to *libev* and *libevent*.
-
-## Reply parsing API
-
-Hiredis comes with a reply parsing API that makes it easy for writing higher
-level language bindings.
-
-The reply parsing API consists of the following functions:
-```c
-redisReader *redisReaderCreate(void);
-void redisReaderFree(redisReader *reader);
-int redisReaderFeed(redisReader *reader, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *reader, void **reply);
-```
-The same set of functions are used internally by hiredis when creating a
-normal Redis context, the above API just exposes it to the user for a direct
-usage.
-
-### Usage
-
-The function `redisReaderCreate` creates a `redisReader` structure that holds a
-buffer with unparsed data and state for the protocol parser.
-
-Incoming data -- most likely from a socket -- can be placed in the internal
-buffer of the `redisReader` using `redisReaderFeed`. This function will make a
-copy of the buffer pointed to by `buf` for `len` bytes. This data is parsed
-when `redisReaderGetReply` is called. This function returns an integer status
-and a reply object (as described above) via `void **reply`. The returned status
-can be either `REDIS_OK` or `REDIS_ERR`, where the latter means something went
-wrong (either a protocol error, or an out of memory error).
-
-The parser limits the level of nesting for multi bulk payloads to 7. If the
-multi bulk nesting level is higher than this, the parser returns an error.
-
-### Customizing replies
-
-The function `redisReaderGetReply` creates `redisReply` and makes the function
-argument `reply` point to the created `redisReply` variable. For instance, if
-the response of type `REDIS_REPLY_STATUS` then the `str` field of `redisReply`
-will hold the status as a vanilla C string. However, the functions that are
-responsible for creating instances of the `redisReply` can be customized by
-setting the `fn` field on the `redisReader` struct. This should be done
-immediately after creating the `redisReader`.
-
-For example, [hiredis-rb](https://github.com/pietern/hiredis-rb/blob/master/ext/hiredis_ext/reader.c)
-uses customized reply object functions to create Ruby objects.
-
-### Reader max buffer
-
-Both when using the Reader API directly or when using it indirectly via a
-normal Redis context, the redisReader structure uses a buffer in order to
-accumulate data from the server.
-Usually this buffer is destroyed when it is empty and is larger than 16
-KiB in order to avoid wasting memory in unused buffers
-
-However when working with very big payloads destroying the buffer may slow
-down performances considerably, so it is possible to modify the max size of
-an idle buffer changing the value of the `maxbuf` field of the reader structure
-to the desired value. The special value of 0 means that there is no maximum
-value for an idle buffer, so the buffer will never get freed.
-
-For instance if you have a normal Redis context you can set the maximum idle
-buffer to zero (unlimited) just with:
-```c
-context->reader->maxbuf = 0;
-```
-This should be done only in order to maximize performances when working with
-large payloads. The context should be set back to `REDIS_READER_MAX_BUF` again
-as soon as possible in order to prevent allocation of useless memory.
-
-### Reader max array elements
-
-By default the hiredis reply parser sets the maximum number of multi-bulk elements
-to 2^32 - 1 or 4,294,967,295 entries.  If you need to process multi-bulk replies
-with more than this many elements you can set the value higher or to zero, meaning
-unlimited with:
-```c
-context->reader->maxelements = 0;
-```
-
-## SSL/TLS Support
-
-### Building
-
-SSL/TLS support is not built by default and requires an explicit flag:
-
-    make USE_SSL=1
-
-This requires OpenSSL development package (e.g. including header files to be
-available.
-
-When enabled, SSL/TLS support is built into extra `libhiredis_ssl.a` and
-`libhiredis_ssl.so` static/dynamic libraries. This leaves the original libraries
-unaffected so no additional dependencies are introduced.
-
-### Using it
-
-First, you'll need to make sure you include the SSL header file:
-
-```c
-#include "hiredis.h"
-#include "hiredis_ssl.h"
-```
-
-You will also need to link against `libhiredis_ssl`, **in addition** to
-`libhiredis` and add `-lssl -lcrypto` to satisfy its dependencies.
-
-Hiredis implements SSL/TLS on top of its normal `redisContext` or
-`redisAsyncContext`, so you will need to establish a connection first and then
-initiate an SSL/TLS handshake.
-
-#### Hiredis OpenSSL Wrappers
-
-Before Hiredis can negotiate an SSL/TLS connection, it is necessary to
-initialize OpenSSL and create a context. You can do that in two ways:
-
-1. Work directly with the OpenSSL API to initialize the library's global context
-   and create `SSL_CTX *` and `SSL *` contexts. With an `SSL *` object you can
-   call `redisInitiateSSL()`.
-2. Work with a set of Hiredis-provided wrappers around OpenSSL, create a
-   `redisSSLContext` object to hold configuration and use
-   `redisInitiateSSLWithContext()` to initiate the SSL/TLS handshake.
-
-```c
-/* An Hiredis SSL context. It holds SSL configuration and can be reused across
- * many contexts.
- */
-redisSSLContext *ssl;
-
-/* An error variable to indicate what went wrong, if the context fails to
- * initialize.
- */
-redisSSLContextError ssl_error;
-
-/* Initialize global OpenSSL state.
- *
- * You should call this only once when your app initializes, and only if
- * you don't explicitly or implicitly initialize OpenSSL it elsewhere.
- */
-redisInitOpenSSL();
-
-/* Create SSL context */
-ssl = redisCreateSSLContext(
-    "cacertbundle.crt",     /* File name of trusted CA/ca bundle file, optional */
-    "/path/to/certs",       /* Path of trusted certificates, optional */
-    "client_cert.pem",      /* File name of client certificate file, optional */
-    "client_key.pem",       /* File name of client private key, optional */
-    "redis.mydomain.com",   /* Server name to request (SNI), optional */
-    &ssl_error
-    ) != REDIS_OK) {
-        printf("SSL error: %s\n", redisSSLContextGetError(ssl_error);
-        /* Abort... */
-    }
-
-/* Create Redis context and establish connection */
-c = redisConnect("localhost", 6443);
-if (c == NULL || c->err) {
-    /* Handle error and abort... */
-}
-
-/* Negotiate SSL/TLS */
-if (redisInitiateSSLWithContext(c, ssl) != REDIS_OK) {
-    /* Handle error, in c->err / c->errstr */
-}
-```
-
-## RESP3 PUSH replies
-Redis 6.0 introduced PUSH replies with the reply-type `>`.  These messages are generated spontaneously and can arrive at any time, so must be handled using callbacks.
-
-### Default behavior
-Hiredis installs handlers on `redisContext` and `redisAsyncContext` by default, which will intercept and free any PUSH replies detected.  This means existing code will work as-is after upgrading to Redis 6 and switching to `RESP3`.
-
-### Custom PUSH handler prototypes
-The callback prototypes differ between `redisContext` and `redisAsyncContext`.
-
-#### redisContext
-```c
-void my_push_handler(void *privdata, void *reply) {
-    /* Handle the reply */
-
-    /* Note: We need to free the reply in our custom handler for
-             blocking contexts.  This lets us keep the reply if
-             we want. */
-    freeReplyObject(reply);
-}
-```
-
-#### redisAsyncContext
-```c
-void my_async_push_handler(redisAsyncContext *ac, void *reply) {
-    /* Handle the reply */
-
-    /* Note:  Because async hiredis always frees replies, you should
-              not call freeReplyObject in an async push callback. */
-}
-```
-
-### Installing a custom handler
-There are two ways to set your own PUSH handlers.
-
-1. Set `push_cb` or `async_push_cb` in the `redisOptions` struct and connect with `redisConnectWithOptions` or `redisAsyncConnectWithOptions`.
-    ```c
-    redisOptions = {0};
-    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
-    options->push_cb = my_push_handler;
-    redisContext *context = redisConnectWithOptions(&options);
-    ```
-2.  Call `redisSetPushCallback` or `redisAsyncSetPushCallback` on a connected context.
-    ```c
-    redisContext *context = redisConnect("127.0.0.1", 6379);
-    redisSetPushCallback(context, my_push_handler);
-    ```
-
-    _Note `redisSetPushCallback` and `redisAsyncSetPushCallback` both return any currently configured handler,  making it easy to override and then return to the old value._
-
-### Specifying no handler
-If you have a unique use-case where you don't want hiredis to automatically intercept and free PUSH replies, you will want to configure no handler at all.  This can be done in two ways.
-1.  Set the `REDIS_OPT_NO_PUSH_AUTOFREE` flag in `redisOptions` and leave the callback function pointer `NULL`.
-    ```c
-    redisOptions = {0};
-    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
-    options->options |= REDIS_OPT_NO_PUSH_AUTOFREE;
-    redisContext *context = redisConnectWithOptions(&options);
-    ```
-3.  Call `redisSetPushCallback` with `NULL` once connected.
-    ```c
-    redisContext *context = redisConnect("127.0.0.1", 6379);
-    redisSetPushCallback(context, NULL);
-    ```
-
-    _Note:  With no handler configured, calls to `redisCommand` may generate more than one reply, so this strategy is only applicable when there's some kind of blocking`redisGetReply()` loop (e.g. `MONITOR` or `SUBSCRIBE` workloads)._
-
-## Allocator injection
-
-Hiredis uses a pass-thru structure of function pointers defined in [alloc.h](https://github.com/redis/hiredis/blob/f5d25850/alloc.h#L41) that contain the currently configured allocation and deallocation functions.  By default they just point to libc (`malloc`, `calloc`, `realloc`, etc).
-
-### Overriding
-
-One can override the allocators like so:
-
-```c
-hiredisAllocFuncs myfuncs = {
-    .mallocFn = my_malloc,
-    .callocFn = my_calloc,
-    .reallocFn = my_realloc,
-    .strdupFn = my_strdup,
-    .freeFn = my_free,
-};
-
-// Override allocators (function returns current allocators if needed)
-hiredisAllocFuncs orig = hiredisSetAllocators(&myfuncs);
-```
-
-To reset the allocators to their default libc function simply call:
-
-```c
-hiredisResetAllocators();
-```
-
-## AUTHORS
-
-Salvatore Sanfilippo (antirez at gmail),\
-Pieter Noordhuis (pcnoordhuis at gmail)\
-Michael Grunder (michael dot grunder at gmail)
-
-_Hiredis is released under the BSD license._
diff --git a/ext/hiredis-1.0.2/adapters/ae.h b/ext/hiredis-1.0.2/adapters/ae.h
deleted file mode 100644
index 660d82eb0..000000000
--- a/ext/hiredis-1.0.2/adapters/ae.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_AE_H__
-#define __HIREDIS_AE_H__
-#include <sys/types.h>
-#include <ae.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisAeEvents {
-    redisAsyncContext *context;
-    aeEventLoop *loop;
-    int fd;
-    int reading, writing;
-} redisAeEvents;
-
-static void redisAeReadEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
-    ((void)el); ((void)fd); ((void)mask);
-
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisAeWriteEvent(aeEventLoop *el, int fd, void *privdata, int mask) {
-    ((void)el); ((void)fd); ((void)mask);
-
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisAeAddRead(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (!e->reading) {
-        e->reading = 1;
-        aeCreateFileEvent(loop,e->fd,AE_READABLE,redisAeReadEvent,e);
-    }
-}
-
-static void redisAeDelRead(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (e->reading) {
-        e->reading = 0;
-        aeDeleteFileEvent(loop,e->fd,AE_READABLE);
-    }
-}
-
-static void redisAeAddWrite(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (!e->writing) {
-        e->writing = 1;
-        aeCreateFileEvent(loop,e->fd,AE_WRITABLE,redisAeWriteEvent,e);
-    }
-}
-
-static void redisAeDelWrite(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    aeEventLoop *loop = e->loop;
-    if (e->writing) {
-        e->writing = 0;
-        aeDeleteFileEvent(loop,e->fd,AE_WRITABLE);
-    }
-}
-
-static void redisAeCleanup(void *privdata) {
-    redisAeEvents *e = (redisAeEvents*)privdata;
-    redisAeDelRead(privdata);
-    redisAeDelWrite(privdata);
-    hi_free(e);
-}
-
-static int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisAeEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisAeEvents*)hi_malloc(sizeof(*e));
-    if (e == NULL)
-        return REDIS_ERR;
-
-    e->context = ac;
-    e->loop = loop;
-    e->fd = c->fd;
-    e->reading = e->writing = 0;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisAeAddRead;
-    ac->ev.delRead = redisAeDelRead;
-    ac->ev.addWrite = redisAeAddWrite;
-    ac->ev.delWrite = redisAeDelWrite;
-    ac->ev.cleanup = redisAeCleanup;
-    ac->ev.data = e;
-
-    return REDIS_OK;
-}
-#endif
diff --git a/ext/hiredis-1.0.2/adapters/glib.h b/ext/hiredis-1.0.2/adapters/glib.h
deleted file mode 100644
index ad59dd142..000000000
--- a/ext/hiredis-1.0.2/adapters/glib.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#ifndef __HIREDIS_GLIB_H__
-#define __HIREDIS_GLIB_H__
-
-#include <glib.h>
-
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct
-{
-    GSource source;
-    redisAsyncContext *ac;
-    GPollFD poll_fd;
-} RedisSource;
-
-static void
-redis_source_add_read (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-    g_return_if_fail(source);
-    source->poll_fd.events |= G_IO_IN;
-    g_main_context_wakeup(g_source_get_context((GSource *)data));
-}
-
-static void
-redis_source_del_read (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-    g_return_if_fail(source);
-    source->poll_fd.events &= ~G_IO_IN;
-    g_main_context_wakeup(g_source_get_context((GSource *)data));
-}
-
-static void
-redis_source_add_write (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-    g_return_if_fail(source);
-    source->poll_fd.events |= G_IO_OUT;
-    g_main_context_wakeup(g_source_get_context((GSource *)data));
-}
-
-static void
-redis_source_del_write (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-    g_return_if_fail(source);
-    source->poll_fd.events &= ~G_IO_OUT;
-    g_main_context_wakeup(g_source_get_context((GSource *)data));
-}
-
-static void
-redis_source_cleanup (gpointer data)
-{
-    RedisSource *source = (RedisSource *)data;
-
-    g_return_if_fail(source);
-
-    redis_source_del_read(source);
-    redis_source_del_write(source);
-    /*
-     * It is not our responsibility to remove ourself from the
-     * current main loop. However, we will remove the GPollFD.
-     */
-    if (source->poll_fd.fd >= 0) {
-        g_source_remove_poll((GSource *)data, &source->poll_fd);
-        source->poll_fd.fd = -1;
-    }
-}
-
-static gboolean
-redis_source_prepare (GSource *source,
-                      gint    *timeout_)
-{
-    RedisSource *redis = (RedisSource *)source;
-    *timeout_ = -1;
-    return !!(redis->poll_fd.events & redis->poll_fd.revents);
-}
-
-static gboolean
-redis_source_check (GSource *source)
-{
-    RedisSource *redis = (RedisSource *)source;
-    return !!(redis->poll_fd.events & redis->poll_fd.revents);
-}
-
-static gboolean
-redis_source_dispatch (GSource      *source,
-                       GSourceFunc   callback,
-                       gpointer      user_data)
-{
-    RedisSource *redis = (RedisSource *)source;
-
-    if ((redis->poll_fd.revents & G_IO_OUT)) {
-        redisAsyncHandleWrite(redis->ac);
-        redis->poll_fd.revents &= ~G_IO_OUT;
-    }
-
-    if ((redis->poll_fd.revents & G_IO_IN)) {
-        redisAsyncHandleRead(redis->ac);
-        redis->poll_fd.revents &= ~G_IO_IN;
-    }
-
-    if (callback) {
-        return callback(user_data);
-    }
-
-    return TRUE;
-}
-
-static void
-redis_source_finalize (GSource *source)
-{
-    RedisSource *redis = (RedisSource *)source;
-
-    if (redis->poll_fd.fd >= 0) {
-        g_source_remove_poll(source, &redis->poll_fd);
-        redis->poll_fd.fd = -1;
-    }
-}
-
-static GSource *
-redis_source_new (redisAsyncContext *ac)
-{
-    static GSourceFuncs source_funcs = {
-        .prepare  = redis_source_prepare,
-        .check     = redis_source_check,
-        .dispatch = redis_source_dispatch,
-        .finalize = redis_source_finalize,
-    };
-    redisContext *c = &ac->c;
-    RedisSource *source;
-
-    g_return_val_if_fail(ac != NULL, NULL);
-
-    source = (RedisSource *)g_source_new(&source_funcs, sizeof *source);
-    if (source == NULL)
-        return NULL;
-
-    source->ac = ac;
-    source->poll_fd.fd = c->fd;
-    source->poll_fd.events = 0;
-    source->poll_fd.revents = 0;
-    g_source_add_poll((GSource *)source, &source->poll_fd);
-
-    ac->ev.addRead = redis_source_add_read;
-    ac->ev.delRead = redis_source_del_read;
-    ac->ev.addWrite = redis_source_add_write;
-    ac->ev.delWrite = redis_source_del_write;
-    ac->ev.cleanup = redis_source_cleanup;
-    ac->ev.data = source;
-
-    return (GSource *)source;
-}
-
-#endif /* __HIREDIS_GLIB_H__ */
diff --git a/ext/hiredis-1.0.2/adapters/ivykis.h b/ext/hiredis-1.0.2/adapters/ivykis.h
deleted file mode 100644
index 179f6ab52..000000000
--- a/ext/hiredis-1.0.2/adapters/ivykis.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef __HIREDIS_IVYKIS_H__
-#define __HIREDIS_IVYKIS_H__
-#include <iv.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisIvykisEvents {
-    redisAsyncContext *context;
-    struct iv_fd fd;
-} redisIvykisEvents;
-
-static void redisIvykisReadEvent(void *arg) {
-    redisAsyncContext *context = (redisAsyncContext *)arg;
-    redisAsyncHandleRead(context);
-}
-
-static void redisIvykisWriteEvent(void *arg) {
-    redisAsyncContext *context = (redisAsyncContext *)arg;
-    redisAsyncHandleWrite(context);
-}
-
-static void redisIvykisAddRead(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-    iv_fd_set_handler_in(&e->fd, redisIvykisReadEvent);
-}
-
-static void redisIvykisDelRead(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-    iv_fd_set_handler_in(&e->fd, NULL);
-}
-
-static void redisIvykisAddWrite(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-    iv_fd_set_handler_out(&e->fd, redisIvykisWriteEvent);
-}
-
-static void redisIvykisDelWrite(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-    iv_fd_set_handler_out(&e->fd, NULL);
-}
-
-static void redisIvykisCleanup(void *privdata) {
-    redisIvykisEvents *e = (redisIvykisEvents*)privdata;
-
-    iv_fd_unregister(&e->fd);
-    hi_free(e);
-}
-
-static int redisIvykisAttach(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisIvykisEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisIvykisEvents*)hi_malloc(sizeof(*e));
-    if (e == NULL)
-        return REDIS_ERR;
-
-    e->context = ac;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisIvykisAddRead;
-    ac->ev.delRead = redisIvykisDelRead;
-    ac->ev.addWrite = redisIvykisAddWrite;
-    ac->ev.delWrite = redisIvykisDelWrite;
-    ac->ev.cleanup = redisIvykisCleanup;
-    ac->ev.data = e;
-
-    /* Initialize and install read/write events */
-    IV_FD_INIT(&e->fd);
-    e->fd.fd = c->fd;
-    e->fd.handler_in = redisIvykisReadEvent;
-    e->fd.handler_out = redisIvykisWriteEvent;
-    e->fd.handler_err = NULL;
-    e->fd.cookie = e->context;
-
-    iv_fd_register(&e->fd);
-
-    return REDIS_OK;
-}
-#endif
diff --git a/ext/hiredis-1.0.2/adapters/libev.h b/ext/hiredis-1.0.2/adapters/libev.h
deleted file mode 100644
index e1e7bbd99..000000000
--- a/ext/hiredis-1.0.2/adapters/libev.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_LIBEV_H__
-#define __HIREDIS_LIBEV_H__
-#include <stdlib.h>
-#include <sys/types.h>
-#include <ev.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct redisLibevEvents {
-    redisAsyncContext *context;
-    struct ev_loop *loop;
-    int reading, writing;
-    ev_io rev, wev;
-    ev_timer timer;
-} redisLibevEvents;
-
-static void redisLibevReadEvent(EV_P_ ev_io *watcher, int revents) {
-#if EV_MULTIPLICITY
-    ((void)loop);
-#endif
-    ((void)revents);
-
-    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
-    redisAsyncHandleRead(e->context);
-}
-
-static void redisLibevWriteEvent(EV_P_ ev_io *watcher, int revents) {
-#if EV_MULTIPLICITY
-    ((void)loop);
-#endif
-    ((void)revents);
-
-    redisLibevEvents *e = (redisLibevEvents*)watcher->data;
-    redisAsyncHandleWrite(e->context);
-}
-
-static void redisLibevAddRead(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (!e->reading) {
-        e->reading = 1;
-        ev_io_start(EV_A_ &e->rev);
-    }
-}
-
-static void redisLibevDelRead(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (e->reading) {
-        e->reading = 0;
-        ev_io_stop(EV_A_ &e->rev);
-    }
-}
-
-static void redisLibevAddWrite(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (!e->writing) {
-        e->writing = 1;
-        ev_io_start(EV_A_ &e->wev);
-    }
-}
-
-static void redisLibevDelWrite(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    if (e->writing) {
-        e->writing = 0;
-        ev_io_stop(EV_A_ &e->wev);
-    }
-}
-
-static void redisLibevStopTimer(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-    ev_timer_stop(EV_A_ &e->timer);
-}
-
-static void redisLibevCleanup(void *privdata) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    redisLibevDelRead(privdata);
-    redisLibevDelWrite(privdata);
-    redisLibevStopTimer(privdata);
-    hi_free(e);
-}
-
-static void redisLibevTimeout(EV_P_ ev_timer *timer, int revents) {
-    ((void)revents);
-    redisLibevEvents *e = (redisLibevEvents*)timer->data;
-    redisAsyncHandleTimeout(e->context);
-}
-
-static void redisLibevSetTimeout(void *privdata, struct timeval tv) {
-    redisLibevEvents *e = (redisLibevEvents*)privdata;
-    struct ev_loop *loop = e->loop;
-    ((void)loop);
-
-    if (!ev_is_active(&e->timer)) {
-        ev_init(&e->timer, redisLibevTimeout);
-        e->timer.data = e;
-    }
-
-    e->timer.repeat = tv.tv_sec + tv.tv_usec / 1000000.00;
-    ev_timer_again(EV_A_ &e->timer);
-}
-
-static int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisLibevEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisLibevEvents*)hi_calloc(1, sizeof(*e));
-    if (e == NULL)
-        return REDIS_ERR;
-
-    e->context = ac;
-#if EV_MULTIPLICITY
-    e->loop = loop;
-#else
-    e->loop = NULL;
-#endif
-    e->rev.data = e;
-    e->wev.data = e;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibevAddRead;
-    ac->ev.delRead = redisLibevDelRead;
-    ac->ev.addWrite = redisLibevAddWrite;
-    ac->ev.delWrite = redisLibevDelWrite;
-    ac->ev.cleanup = redisLibevCleanup;
-    ac->ev.scheduleTimer = redisLibevSetTimeout;
-    ac->ev.data = e;
-
-    /* Initialize read/write events */
-    ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
-    ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
-    return REDIS_OK;
-}
-
-#endif
diff --git a/ext/hiredis-1.0.2/adapters/libevent.h b/ext/hiredis-1.0.2/adapters/libevent.h
deleted file mode 100644
index 9150979bc..000000000
--- a/ext/hiredis-1.0.2/adapters/libevent.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_LIBEVENT_H__
-#define __HIREDIS_LIBEVENT_H__
-#include <event2/event.h>
-#include "../hiredis.h"
-#include "../async.h"
-
-#define REDIS_LIBEVENT_DELETED 0x01
-#define REDIS_LIBEVENT_ENTERED 0x02
-
-typedef struct redisLibeventEvents {
-    redisAsyncContext *context;
-    struct event *ev;
-    struct event_base *base;
-    struct timeval tv;
-    short flags;
-    short state;
-} redisLibeventEvents;
-
-static void redisLibeventDestroy(redisLibeventEvents *e) {
-    hi_free(e);
-}
-
-static void redisLibeventHandler(int fd, short event, void *arg) {
-    ((void)fd);
-    redisLibeventEvents *e = (redisLibeventEvents*)arg;
-    e->state |= REDIS_LIBEVENT_ENTERED;
-
-    #define CHECK_DELETED() if (e->state & REDIS_LIBEVENT_DELETED) {\
-        redisLibeventDestroy(e);\
-        return; \
-    }
-
-    if ((event & EV_TIMEOUT) && (e->state & REDIS_LIBEVENT_DELETED) == 0) {
-        redisAsyncHandleTimeout(e->context);
-        CHECK_DELETED();
-    }
-
-    if ((event & EV_READ) && e->context && (e->state & REDIS_LIBEVENT_DELETED) == 0) {
-        redisAsyncHandleRead(e->context);
-        CHECK_DELETED();
-    }
-
-    if ((event & EV_WRITE) && e->context && (e->state & REDIS_LIBEVENT_DELETED) == 0) {
-        redisAsyncHandleWrite(e->context);
-        CHECK_DELETED();
-    }
-
-    e->state &= ~REDIS_LIBEVENT_ENTERED;
-    #undef CHECK_DELETED
-}
-
-static void redisLibeventUpdate(void *privdata, short flag, int isRemove) {
-    redisLibeventEvents *e = (redisLibeventEvents *)privdata;
-    const struct timeval *tv = e->tv.tv_sec || e->tv.tv_usec ? &e->tv : NULL;
-
-    if (isRemove) {
-        if ((e->flags & flag) == 0) {
-            return;
-        } else {
-            e->flags &= ~flag;
-        }
-    } else {
-        if (e->flags & flag) {
-            return;
-        } else {
-            e->flags |= flag;
-        }
-    }
-
-    event_del(e->ev);
-    event_assign(e->ev, e->base, e->context->c.fd, e->flags | EV_PERSIST,
-                 redisLibeventHandler, privdata);
-    event_add(e->ev, tv);
-}
-
-static void redisLibeventAddRead(void *privdata) {
-    redisLibeventUpdate(privdata, EV_READ, 0);
-}
-
-static void redisLibeventDelRead(void *privdata) {
-    redisLibeventUpdate(privdata, EV_READ, 1);
-}
-
-static void redisLibeventAddWrite(void *privdata) {
-    redisLibeventUpdate(privdata, EV_WRITE, 0);
-}
-
-static void redisLibeventDelWrite(void *privdata) {
-    redisLibeventUpdate(privdata, EV_WRITE, 1);
-}
-
-static void redisLibeventCleanup(void *privdata) {
-    redisLibeventEvents *e = (redisLibeventEvents*)privdata;
-    if (!e) {
-        return;
-    }
-    event_del(e->ev);
-    event_free(e->ev);
-    e->ev = NULL;
-
-    if (e->state & REDIS_LIBEVENT_ENTERED) {
-        e->state |= REDIS_LIBEVENT_DELETED;
-    } else {
-        redisLibeventDestroy(e);
-    }
-}
-
-static void redisLibeventSetTimeout(void *privdata, struct timeval tv) {
-    redisLibeventEvents *e = (redisLibeventEvents *)privdata;
-    short flags = e->flags;
-    e->flags = 0;
-    e->tv = tv;
-    redisLibeventUpdate(e, flags, 0);
-}
-
-static int redisLibeventAttach(redisAsyncContext *ac, struct event_base *base) {
-    redisContext *c = &(ac->c);
-    redisLibeventEvents *e;
-
-    /* Nothing should be attached when something is already attached */
-    if (ac->ev.data != NULL)
-        return REDIS_ERR;
-
-    /* Create container for context and r/w events */
-    e = (redisLibeventEvents*)hi_calloc(1, sizeof(*e));
-    if (e == NULL)
-        return REDIS_ERR;
-
-    e->context = ac;
-
-    /* Register functions to start/stop listening for events */
-    ac->ev.addRead = redisLibeventAddRead;
-    ac->ev.delRead = redisLibeventDelRead;
-    ac->ev.addWrite = redisLibeventAddWrite;
-    ac->ev.delWrite = redisLibeventDelWrite;
-    ac->ev.cleanup = redisLibeventCleanup;
-    ac->ev.scheduleTimer = redisLibeventSetTimeout;
-    ac->ev.data = e;
-
-    /* Initialize and install read/write events */
-    e->ev = event_new(base, c->fd, EV_READ | EV_WRITE, redisLibeventHandler, e);
-    e->base = base;
-    return REDIS_OK;
-}
-#endif
diff --git a/ext/hiredis-1.0.2/adapters/libuv.h b/ext/hiredis-1.0.2/adapters/libuv.h
deleted file mode 100644
index c120b1b39..000000000
--- a/ext/hiredis-1.0.2/adapters/libuv.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef __HIREDIS_LIBUV_H__
-#define __HIREDIS_LIBUV_H__
-#include <stdlib.h>
-#include <uv.h>
-#include "../hiredis.h"
-#include "../async.h"
-#include <string.h>
-
-typedef struct redisLibuvEvents {
-  redisAsyncContext* context;
-  uv_poll_t          handle;
-  int                events;
-} redisLibuvEvents;
-
-
-static void redisLibuvPoll(uv_poll_t* handle, int status, int events) {
-  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
-  int ev = (status ? p->events : events);
-
-  if (p->context != NULL && (ev & UV_READABLE)) {
-    redisAsyncHandleRead(p->context);
-  }
-  if (p->context != NULL && (ev & UV_WRITABLE)) {
-    redisAsyncHandleWrite(p->context);
-  }
-}
-
-
-static void redisLibuvAddRead(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events |= UV_READABLE;
-
-  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-}
-
-
-static void redisLibuvDelRead(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events &= ~UV_READABLE;
-
-  if (p->events) {
-    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-  } else {
-    uv_poll_stop(&p->handle);
-  }
-}
-
-
-static void redisLibuvAddWrite(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events |= UV_WRITABLE;
-
-  uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-}
-
-
-static void redisLibuvDelWrite(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->events &= ~UV_WRITABLE;
-
-  if (p->events) {
-    uv_poll_start(&p->handle, p->events, redisLibuvPoll);
-  } else {
-    uv_poll_stop(&p->handle);
-  }
-}
-
-
-static void on_close(uv_handle_t* handle) {
-  redisLibuvEvents* p = (redisLibuvEvents*)handle->data;
-
-  hi_free(p);
-}
-
-
-static void redisLibuvCleanup(void *privdata) {
-  redisLibuvEvents* p = (redisLibuvEvents*)privdata;
-
-  p->context = NULL; // indicate that context might no longer exist
-  uv_close((uv_handle_t*)&p->handle, on_close);
-}
-
-
-static int redisLibuvAttach(redisAsyncContext* ac, uv_loop_t* loop) {
-  redisContext *c = &(ac->c);
-
-  if (ac->ev.data != NULL) {
-    return REDIS_ERR;
-  }
-
-  ac->ev.addRead  = redisLibuvAddRead;
-  ac->ev.delRead  = redisLibuvDelRead;
-  ac->ev.addWrite = redisLibuvAddWrite;
-  ac->ev.delWrite = redisLibuvDelWrite;
-  ac->ev.cleanup  = redisLibuvCleanup;
-
-  redisLibuvEvents* p = (redisLibuvEvents*)hi_malloc(sizeof(*p));
-  if (p == NULL)
-      return REDIS_ERR;
-
-  memset(p, 0, sizeof(*p));
-
-  if (uv_poll_init_socket(loop, &p->handle, c->fd) != 0) {
-    return REDIS_ERR;
-  }
-
-  ac->ev.data    = p;
-  p->handle.data = p;
-  p->context     = ac;
-
-  return REDIS_OK;
-}
-#endif
diff --git a/ext/hiredis-1.0.2/adapters/macosx.h b/ext/hiredis-1.0.2/adapters/macosx.h
deleted file mode 100644
index 3c87f1b2f..000000000
--- a/ext/hiredis-1.0.2/adapters/macosx.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-//  Created by Дмитрий Бахвалов on 13.07.15.
-//  Copyright (c) 2015 Dmitry Bakhvalov. All rights reserved.
-//
-
-#ifndef __HIREDIS_MACOSX_H__
-#define __HIREDIS_MACOSX_H__
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include "../hiredis.h"
-#include "../async.h"
-
-typedef struct {
-    redisAsyncContext *context;
-    CFSocketRef socketRef;
-    CFRunLoopSourceRef sourceRef;
-} RedisRunLoop;
-
-static int freeRedisRunLoop(RedisRunLoop* redisRunLoop) {
-    if( redisRunLoop != NULL ) {
-        if( redisRunLoop->sourceRef != NULL ) {
-            CFRunLoopSourceInvalidate(redisRunLoop->sourceRef);
-            CFRelease(redisRunLoop->sourceRef);
-        }
-        if( redisRunLoop->socketRef != NULL ) {
-            CFSocketInvalidate(redisRunLoop->socketRef);
-            CFRelease(redisRunLoop->socketRef);
-        }
-        hi_free(redisRunLoop);
-    }
-    return REDIS_ERR;
-}
-
-static void redisMacOSAddRead(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    CFSocketEnableCallBacks(redisRunLoop->socketRef, kCFSocketReadCallBack);
-}
-
-static void redisMacOSDelRead(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    CFSocketDisableCallBacks(redisRunLoop->socketRef, kCFSocketReadCallBack);
-}
-
-static void redisMacOSAddWrite(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    CFSocketEnableCallBacks(redisRunLoop->socketRef, kCFSocketWriteCallBack);
-}
-
-static void redisMacOSDelWrite(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    CFSocketDisableCallBacks(redisRunLoop->socketRef, kCFSocketWriteCallBack);
-}
-
-static void redisMacOSCleanup(void *privdata) {
-    RedisRunLoop *redisRunLoop = (RedisRunLoop*)privdata;
-    freeRedisRunLoop(redisRunLoop);
-}
-
-static void redisMacOSAsyncCallback(CFSocketRef __unused s, CFSocketCallBackType callbackType, CFDataRef __unused address, const void __unused *data, void *info) {
-    redisAsyncContext* context = (redisAsyncContext*) info;
-
-    switch (callbackType) {
-        case kCFSocketReadCallBack:
-            redisAsyncHandleRead(context);
-            break;
-
-        case kCFSocketWriteCallBack:
-            redisAsyncHandleWrite(context);
-            break;
-
-        default:
-            break;
-    }
-}
-
-static int redisMacOSAttach(redisAsyncContext *redisAsyncCtx, CFRunLoopRef runLoop) {
-    redisContext *redisCtx = &(redisAsyncCtx->c);
-
-    /* Nothing should be attached when something is already attached */
-    if( redisAsyncCtx->ev.data != NULL ) return REDIS_ERR;
-
-    RedisRunLoop* redisRunLoop = (RedisRunLoop*) hi_calloc(1, sizeof(RedisRunLoop));
-    if (redisRunLoop == NULL)
-        return REDIS_ERR;
-
-    /* Setup redis stuff */
-    redisRunLoop->context = redisAsyncCtx;
-
-    redisAsyncCtx->ev.addRead  = redisMacOSAddRead;
-    redisAsyncCtx->ev.delRead  = redisMacOSDelRead;
-    redisAsyncCtx->ev.addWrite = redisMacOSAddWrite;
-    redisAsyncCtx->ev.delWrite = redisMacOSDelWrite;
-    redisAsyncCtx->ev.cleanup  = redisMacOSCleanup;
-    redisAsyncCtx->ev.data     = redisRunLoop;
-
-    /* Initialize and install read/write events */
-    CFSocketContext socketCtx = { 0, redisAsyncCtx, NULL, NULL, NULL };
-
-    redisRunLoop->socketRef = CFSocketCreateWithNative(NULL, redisCtx->fd,
-                                                       kCFSocketReadCallBack | kCFSocketWriteCallBack,
-                                                       redisMacOSAsyncCallback,
-                                                       &socketCtx);
-    if( !redisRunLoop->socketRef ) return freeRedisRunLoop(redisRunLoop);
-
-    redisRunLoop->sourceRef = CFSocketCreateRunLoopSource(NULL, redisRunLoop->socketRef, 0);
-    if( !redisRunLoop->sourceRef ) return freeRedisRunLoop(redisRunLoop);
-
-    CFRunLoopAddSource(runLoop, redisRunLoop->sourceRef, kCFRunLoopDefaultMode);
-
-    return REDIS_OK;
-}
-
-#endif
-
diff --git a/ext/hiredis-1.0.2/adapters/qt.h b/ext/hiredis-1.0.2/adapters/qt.h
deleted file mode 100644
index 5cc02e6ce..000000000
--- a/ext/hiredis-1.0.2/adapters/qt.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (C) 2014 Pietro Cerutti <gahr@gahr.ch>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_QT_H__
-#define __HIREDIS_QT_H__
-#include <QSocketNotifier>
-#include "../async.h"
-
-static void RedisQtAddRead(void *);
-static void RedisQtDelRead(void *);
-static void RedisQtAddWrite(void *);
-static void RedisQtDelWrite(void *);
-static void RedisQtCleanup(void *);
-
-class RedisQtAdapter : public QObject {
-
-    Q_OBJECT
-
-    friend
-    void RedisQtAddRead(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->addRead();
-    }
-
-    friend
-    void RedisQtDelRead(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->delRead();
-    }
-
-    friend
-    void RedisQtAddWrite(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->addWrite();
-    }
-
-    friend
-    void RedisQtDelWrite(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->delWrite();
-    }
-
-    friend
-    void RedisQtCleanup(void * adapter) {
-        RedisQtAdapter * a = static_cast<RedisQtAdapter *>(adapter);
-        a->cleanup();
-    }
-
-    public:
-        RedisQtAdapter(QObject * parent = 0)
-            : QObject(parent), m_ctx(0), m_read(0), m_write(0) { }
-
-        ~RedisQtAdapter() {
-            if (m_ctx != 0) {
-                m_ctx->ev.data = NULL;
-            }
-        }
-
-        int setContext(redisAsyncContext * ac) {
-            if (ac->ev.data != NULL) {
-                return REDIS_ERR;
-            }
-            m_ctx = ac;
-            m_ctx->ev.data = this;
-            m_ctx->ev.addRead = RedisQtAddRead;
-            m_ctx->ev.delRead = RedisQtDelRead;
-            m_ctx->ev.addWrite = RedisQtAddWrite;
-            m_ctx->ev.delWrite = RedisQtDelWrite;
-            m_ctx->ev.cleanup = RedisQtCleanup;
-            return REDIS_OK;
-        }
-
-    private:
-        void addRead() {
-            if (m_read) return;
-            m_read = new QSocketNotifier(m_ctx->c.fd, QSocketNotifier::Read, 0);
-            connect(m_read, SIGNAL(activated(int)), this, SLOT(read()));
-        }
-
-        void delRead() {
-            if (!m_read) return;
-            delete m_read;
-            m_read = 0;
-        }
-
-        void addWrite() {
-            if (m_write) return;
-            m_write = new QSocketNotifier(m_ctx->c.fd, QSocketNotifier::Write, 0);
-            connect(m_write, SIGNAL(activated(int)), this, SLOT(write()));
-        }
-
-        void delWrite() {
-            if (!m_write) return;
-            delete m_write;
-            m_write = 0;
-        }
-
-        void cleanup() {
-            delRead();
-            delWrite();
-        }
-
-    private slots:
-        void read() { redisAsyncHandleRead(m_ctx); }
-        void write() { redisAsyncHandleWrite(m_ctx); }
-
-    private:
-        redisAsyncContext * m_ctx;
-        QSocketNotifier * m_read;
-        QSocketNotifier * m_write;
-};
-
-#endif /* !__HIREDIS_QT_H__ */
diff --git a/ext/hiredis-1.0.2/alloc.c b/ext/hiredis-1.0.2/alloc.c
deleted file mode 100644
index 7fb6b35e7..000000000
--- a/ext/hiredis-1.0.2/alloc.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <string.h>
-#include <stdlib.h>
-
-hiredisAllocFuncs hiredisAllocFns = {
-    .mallocFn = malloc,
-    .callocFn = calloc,
-    .reallocFn = realloc,
-    .strdupFn = strdup,
-    .freeFn = free,
-};
-
-/* Override hiredis' allocators with ones supplied by the user */
-hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *override) {
-    hiredisAllocFuncs orig = hiredisAllocFns;
-
-    hiredisAllocFns = *override;
-
-    return orig;
-}
-
-/* Reset allocators to use libc defaults */
-void hiredisResetAllocators(void) {
-    hiredisAllocFns = (hiredisAllocFuncs) {
-        .mallocFn = malloc,
-        .callocFn = calloc,
-        .reallocFn = realloc,
-        .strdupFn = strdup,
-        .freeFn = free,
-    };
-}
-
-#ifdef _WIN32
-
-void *hi_malloc(size_t size) {
-    return hiredisAllocFns.mallocFn(size);
-}
-
-void *hi_calloc(size_t nmemb, size_t size) {
-    return hiredisAllocFns.callocFn(nmemb, size);
-}
-
-void *hi_realloc(void *ptr, size_t size) {
-    return hiredisAllocFns.reallocFn(ptr, size);
-}
-
-char *hi_strdup(const char *str) {
-    return hiredisAllocFns.strdupFn(str);
-}
-
-void hi_free(void *ptr) {
-    hiredisAllocFns.freeFn(ptr);
-}
-
-#endif
diff --git a/ext/hiredis-1.0.2/alloc.h b/ext/hiredis-1.0.2/alloc.h
deleted file mode 100644
index 34a05f49f..000000000
--- a/ext/hiredis-1.0.2/alloc.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef HIREDIS_ALLOC_H
-#define HIREDIS_ALLOC_H
-
-#include <stddef.h> /* for size_t */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Structure pointing to our actually configured allocators */
-typedef struct hiredisAllocFuncs {
-    void *(*mallocFn)(size_t);
-    void *(*callocFn)(size_t,size_t);
-    void *(*reallocFn)(void*,size_t);
-    char *(*strdupFn)(const char*);
-    void (*freeFn)(void*);
-} hiredisAllocFuncs;
-
-hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *ha);
-void hiredisResetAllocators(void);
-
-#ifndef _WIN32
-
-/* Hiredis' configured allocator function pointer struct */
-extern hiredisAllocFuncs hiredisAllocFns;
-
-static inline void *hi_malloc(size_t size) {
-    return hiredisAllocFns.mallocFn(size);
-}
-
-static inline void *hi_calloc(size_t nmemb, size_t size) {
-    return hiredisAllocFns.callocFn(nmemb, size);
-}
-
-static inline void *hi_realloc(void *ptr, size_t size) {
-    return hiredisAllocFns.reallocFn(ptr, size);
-}
-
-static inline char *hi_strdup(const char *str) {
-    return hiredisAllocFns.strdupFn(str);
-}
-
-static inline void hi_free(void *ptr) {
-    hiredisAllocFns.freeFn(ptr);
-}
-
-#else
-
-void *hi_malloc(size_t size);
-void *hi_calloc(size_t nmemb, size_t size);
-void *hi_realloc(void *ptr, size_t size);
-char *hi_strdup(const char *str);
-void hi_free(void *ptr);
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HIREDIS_ALLOC_H */
diff --git a/ext/hiredis-1.0.2/appveyor.yml b/ext/hiredis-1.0.2/appveyor.yml
deleted file mode 100644
index 5b43fdbeb..000000000
--- a/ext/hiredis-1.0.2/appveyor.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Appveyor configuration file for CI build of hiredis on Windows (under Cygwin)
-environment:
-    matrix:
-        - CYG_BASH: C:\cygwin64\bin\bash
-          CC: gcc
-        - CYG_BASH: C:\cygwin\bin\bash
-          CC: gcc
-          CFLAGS: -m32
-          CXXFLAGS: -m32
-          LDFLAGS: -m32
-
-clone_depth: 1
-
-# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
-init:
-    - git config --global core.autocrlf input
-
-# Install needed build dependencies
-install:
-    - '%CYG_BASH% -lc "cygcheck -dc cygwin"'
-
-build_script:
-    - 'echo building...'
-    - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; mkdir build && cd build && cmake .. -G \"Unix Makefiles\" && make VERBOSE=1"'
diff --git a/ext/hiredis-1.0.2/async.c b/ext/hiredis-1.0.2/async.c
deleted file mode 100644
index 020cb09b9..000000000
--- a/ext/hiredis-1.0.2/async.c
+++ /dev/null
@@ -1,887 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <stdlib.h>
-#include <string.h>
-#ifndef _MSC_VER
-#include <strings.h>
-#endif
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include "async.h"
-#include "net.h"
-#include "dict.c"
-#include "sds.h"
-#include "win32.h"
-
-#include "async_private.h"
-
-/* Forward declarations of hiredis.c functions */
-int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
-void __redisSetError(redisContext *c, int type, const char *str);
-
-/* Functions managing dictionary of callbacks for pub/sub. */
-static unsigned int callbackHash(const void *key) {
-    return dictGenHashFunction((const unsigned char *)key,
-                               sdslen((const sds)key));
-}
-
-static void *callbackValDup(void *privdata, const void *src) {
-    ((void) privdata);
-    redisCallback *dup;
-
-    dup = hi_malloc(sizeof(*dup));
-    if (dup == NULL)
-        return NULL;
-
-    memcpy(dup,src,sizeof(*dup));
-    return dup;
-}
-
-static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
-    int l1, l2;
-    ((void) privdata);
-
-    l1 = sdslen((const sds)key1);
-    l2 = sdslen((const sds)key2);
-    if (l1 != l2) return 0;
-    return memcmp(key1,key2,l1) == 0;
-}
-
-static void callbackKeyDestructor(void *privdata, void *key) {
-    ((void) privdata);
-    sdsfree((sds)key);
-}
-
-static void callbackValDestructor(void *privdata, void *val) {
-    ((void) privdata);
-    hi_free(val);
-}
-
-static dictType callbackDict = {
-    callbackHash,
-    NULL,
-    callbackValDup,
-    callbackKeyCompare,
-    callbackKeyDestructor,
-    callbackValDestructor
-};
-
-static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
-    redisAsyncContext *ac;
-    dict *channels = NULL, *patterns = NULL;
-
-    channels = dictCreate(&callbackDict,NULL);
-    if (channels == NULL)
-        goto oom;
-
-    patterns = dictCreate(&callbackDict,NULL);
-    if (patterns == NULL)
-        goto oom;
-
-    ac = hi_realloc(c,sizeof(redisAsyncContext));
-    if (ac == NULL)
-        goto oom;
-
-    c = &(ac->c);
-
-    /* The regular connect functions will always set the flag REDIS_CONNECTED.
-     * For the async API, we want to wait until the first write event is
-     * received up before setting this flag, so reset it here. */
-    c->flags &= ~REDIS_CONNECTED;
-
-    ac->err = 0;
-    ac->errstr = NULL;
-    ac->data = NULL;
-    ac->dataCleanup = NULL;
-
-    ac->ev.data = NULL;
-    ac->ev.addRead = NULL;
-    ac->ev.delRead = NULL;
-    ac->ev.addWrite = NULL;
-    ac->ev.delWrite = NULL;
-    ac->ev.cleanup = NULL;
-    ac->ev.scheduleTimer = NULL;
-
-    ac->onConnect = NULL;
-    ac->onDisconnect = NULL;
-
-    ac->replies.head = NULL;
-    ac->replies.tail = NULL;
-    ac->sub.invalid.head = NULL;
-    ac->sub.invalid.tail = NULL;
-    ac->sub.channels = channels;
-    ac->sub.patterns = patterns;
-
-    return ac;
-oom:
-    if (channels) dictRelease(channels);
-    if (patterns) dictRelease(patterns);
-    return NULL;
-}
-
-/* We want the error field to be accessible directly instead of requiring
- * an indirection to the redisContext struct. */
-static void __redisAsyncCopyError(redisAsyncContext *ac) {
-    if (!ac)
-        return;
-
-    redisContext *c = &(ac->c);
-    ac->err = c->err;
-    ac->errstr = c->errstr;
-}
-
-redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options) {
-    redisOptions myOptions = *options;
-    redisContext *c;
-    redisAsyncContext *ac;
-
-    /* Clear any erroneously set sync callback and flag that we don't want to
-     * use freeReplyObject by default. */
-    myOptions.push_cb = NULL;
-    myOptions.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
-
-    myOptions.options |= REDIS_OPT_NONBLOCK;
-    c = redisConnectWithOptions(&myOptions);
-    if (c == NULL) {
-        return NULL;
-    }
-
-    ac = redisAsyncInitialize(c);
-    if (ac == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    /* Set any configured async push handler */
-    redisAsyncSetPushCallback(ac, myOptions.async_push_cb);
-
-    __redisAsyncCopyError(ac);
-    return ac;
-}
-
-redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    return redisAsyncConnectWithOptions(&options);
-}
-
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
-                                         const char *source_addr) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.endpoint.tcp.source_addr = source_addr;
-    return redisAsyncConnectWithOptions(&options);
-}
-
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.options |= REDIS_OPT_REUSEADDR;
-    options.endpoint.tcp.source_addr = source_addr;
-    return redisAsyncConnectWithOptions(&options);
-}
-
-redisAsyncContext *redisAsyncConnectUnix(const char *path) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_UNIX(&options, path);
-    return redisAsyncConnectWithOptions(&options);
-}
-
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
-    if (ac->onConnect == NULL) {
-        ac->onConnect = fn;
-
-        /* The common way to detect an established connection is to wait for
-         * the first write event to be fired. This assumes the related event
-         * library functions are already set. */
-        _EL_ADD_WRITE(ac);
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn) {
-    if (ac->onDisconnect == NULL) {
-        ac->onDisconnect = fn;
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-/* Helper functions to push/shift callbacks */
-static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
-    redisCallback *cb;
-
-    /* Copy callback from stack to heap */
-    cb = hi_malloc(sizeof(*cb));
-    if (cb == NULL)
-        return REDIS_ERR_OOM;
-
-    if (source != NULL) {
-        memcpy(cb,source,sizeof(*cb));
-        cb->next = NULL;
-    }
-
-    /* Store callback in list */
-    if (list->head == NULL)
-        list->head = cb;
-    if (list->tail != NULL)
-        list->tail->next = cb;
-    list->tail = cb;
-    return REDIS_OK;
-}
-
-static int __redisShiftCallback(redisCallbackList *list, redisCallback *target) {
-    redisCallback *cb = list->head;
-    if (cb != NULL) {
-        list->head = cb->next;
-        if (cb == list->tail)
-            list->tail = NULL;
-
-        /* Copy callback from heap to stack */
-        if (target != NULL)
-            memcpy(target,cb,sizeof(*cb));
-        hi_free(cb);
-        return REDIS_OK;
-    }
-    return REDIS_ERR;
-}
-
-static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
-    redisContext *c = &(ac->c);
-    if (cb->fn != NULL) {
-        c->flags |= REDIS_IN_CALLBACK;
-        cb->fn(ac,reply,cb->privdata);
-        c->flags &= ~REDIS_IN_CALLBACK;
-    }
-}
-
-static void __redisRunPushCallback(redisAsyncContext *ac, redisReply *reply) {
-    if (ac->push_cb != NULL) {
-        ac->c.flags |= REDIS_IN_CALLBACK;
-        ac->push_cb(ac, reply);
-        ac->c.flags &= ~REDIS_IN_CALLBACK;
-    }
-}
-
-/* Helper function to free the context. */
-static void __redisAsyncFree(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-    dictIterator *it;
-    dictEntry *de;
-
-    /* Execute pending callbacks with NULL reply. */
-    while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
-        __redisRunCallback(ac,&cb,NULL);
-
-    /* Execute callbacks for invalid commands */
-    while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
-        __redisRunCallback(ac,&cb,NULL);
-
-    /* Run subscription callbacks with NULL reply */
-    if (ac->sub.channels) {
-        it = dictGetIterator(ac->sub.channels);
-        if (it != NULL) {
-            while ((de = dictNext(it)) != NULL)
-                __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-            dictReleaseIterator(it);
-        }
-
-        dictRelease(ac->sub.channels);
-    }
-
-    if (ac->sub.patterns) {
-        it = dictGetIterator(ac->sub.patterns);
-        if (it != NULL) {
-            while ((de = dictNext(it)) != NULL)
-                __redisRunCallback(ac,dictGetEntryVal(de),NULL);
-            dictReleaseIterator(it);
-        }
-
-        dictRelease(ac->sub.patterns);
-    }
-
-    /* Signal event lib to clean up */
-    _EL_CLEANUP(ac);
-
-    /* Execute disconnect callback. When redisAsyncFree() initiated destroying
-     * this context, the status will always be REDIS_OK. */
-    if (ac->onDisconnect && (c->flags & REDIS_CONNECTED)) {
-        if (c->flags & REDIS_FREEING) {
-            ac->onDisconnect(ac,REDIS_OK);
-        } else {
-            ac->onDisconnect(ac,(ac->err == 0) ? REDIS_OK : REDIS_ERR);
-        }
-    }
-
-    if (ac->dataCleanup) {
-        ac->dataCleanup(ac->data);
-    }
-
-    /* Cleanup self */
-    redisFree(c);
-}
-
-/* Free the async context. When this function is called from a callback,
- * control needs to be returned to redisProcessCallbacks() before actual
- * free'ing. To do so, a flag is set on the context which is picked up by
- * redisProcessCallbacks(). Otherwise, the context is immediately free'd. */
-void redisAsyncFree(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    c->flags |= REDIS_FREEING;
-    if (!(c->flags & REDIS_IN_CALLBACK))
-        __redisAsyncFree(ac);
-}
-
-/* Helper function to make the disconnect happen and clean up. */
-void __redisAsyncDisconnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    /* Make sure error is accessible if there is any */
-    __redisAsyncCopyError(ac);
-
-    if (ac->err == 0) {
-        /* For clean disconnects, there should be no pending callbacks. */
-        int ret = __redisShiftCallback(&ac->replies,NULL);
-        assert(ret == REDIS_ERR);
-    } else {
-        /* Disconnection is caused by an error, make sure that pending
-         * callbacks cannot call new commands. */
-        c->flags |= REDIS_DISCONNECTING;
-    }
-
-    /* cleanup event library on disconnect.
-     * this is safe to call multiple times */
-    _EL_CLEANUP(ac);
-
-    /* For non-clean disconnects, __redisAsyncFree() will execute pending
-     * callbacks with a NULL-reply. */
-    if (!(c->flags & REDIS_NO_AUTO_FREE)) {
-      __redisAsyncFree(ac);
-    }
-}
-
-/* Tries to do a clean disconnect from Redis, meaning it stops new commands
- * from being issued, but tries to flush the output buffer and execute
- * callbacks for all remaining replies. When this function is called from a
- * callback, there might be more replies and we can safely defer disconnecting
- * to redisProcessCallbacks(). Otherwise, we can only disconnect immediately
- * when there are no pending callbacks. */
-void redisAsyncDisconnect(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    c->flags |= REDIS_DISCONNECTING;
-
-    /** unset the auto-free flag here, because disconnect undoes this */
-    c->flags &= ~REDIS_NO_AUTO_FREE;
-    if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
-        __redisAsyncDisconnect(ac);
-}
-
-static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
-    redisContext *c = &(ac->c);
-    dict *callbacks;
-    redisCallback *cb;
-    dictEntry *de;
-    int pvariant;
-    char *stype;
-    sds sname;
-
-    /* Custom reply functions are not supported for pub/sub. This will fail
-     * very hard when they are used... */
-    if (reply->type == REDIS_REPLY_ARRAY || reply->type == REDIS_REPLY_PUSH) {
-        assert(reply->elements >= 2);
-        assert(reply->element[0]->type == REDIS_REPLY_STRING);
-        stype = reply->element[0]->str;
-        pvariant = (tolower(stype[0]) == 'p') ? 1 : 0;
-
-        if (pvariant)
-            callbacks = ac->sub.patterns;
-        else
-            callbacks = ac->sub.channels;
-
-        /* Locate the right callback */
-        assert(reply->element[1]->type == REDIS_REPLY_STRING);
-        sname = sdsnewlen(reply->element[1]->str,reply->element[1]->len);
-        if (sname == NULL)
-            goto oom;
-
-        de = dictFind(callbacks,sname);
-        if (de != NULL) {
-            cb = dictGetEntryVal(de);
-
-            /* If this is an subscribe reply decrease pending counter. */
-            if (strcasecmp(stype+pvariant,"subscribe") == 0) {
-                cb->pending_subs -= 1;
-            }
-
-            memcpy(dstcb,cb,sizeof(*dstcb));
-
-            /* If this is an unsubscribe message, remove it. */
-            if (strcasecmp(stype+pvariant,"unsubscribe") == 0) {
-                if (cb->pending_subs == 0)
-                    dictDelete(callbacks,sname);
-
-                /* If this was the last unsubscribe message, revert to
-                 * non-subscribe mode. */
-                assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
-
-                /* Unset subscribed flag only when no pipelined pending subscribe. */
-                if (reply->element[2]->integer == 0
-                    && dictSize(ac->sub.channels) == 0
-                    && dictSize(ac->sub.patterns) == 0)
-                    c->flags &= ~REDIS_SUBSCRIBED;
-            }
-        }
-        sdsfree(sname);
-    } else {
-        /* Shift callback for invalid commands. */
-        __redisShiftCallback(&ac->sub.invalid,dstcb);
-    }
-    return REDIS_OK;
-oom:
-    __redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
-}
-
-#define redisIsSpontaneousPushReply(r) \
-    (redisIsPushReply(r) && !redisIsSubscribeReply(r))
-
-static int redisIsSubscribeReply(redisReply *reply) {
-    char *str;
-    size_t len, off;
-
-    /* We will always have at least one string with the subscribe/message type */
-    if (reply->elements < 1 || reply->element[0]->type != REDIS_REPLY_STRING ||
-        reply->element[0]->len < sizeof("message") - 1)
-    {
-        return 0;
-    }
-
-    /* Get the string/len moving past 'p' if needed */
-    off = tolower(reply->element[0]->str[0]) == 'p';
-    str = reply->element[0]->str + off;
-    len = reply->element[0]->len - off;
-
-    return !strncasecmp(str, "subscribe", len) ||
-           !strncasecmp(str, "message", len);
-
-}
-
-void redisProcessCallbacks(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb = {NULL, NULL, 0, NULL};
-    void *reply = NULL;
-    int status;
-
-    while((status = redisGetReply(c,&reply)) == REDIS_OK) {
-        if (reply == NULL) {
-            /* When the connection is being disconnected and there are
-             * no more replies, this is the cue to really disconnect. */
-            if (c->flags & REDIS_DISCONNECTING && sdslen(c->obuf) == 0
-                && ac->replies.head == NULL) {
-                __redisAsyncDisconnect(ac);
-                return;
-            }
-
-            /* If monitor mode, repush callback */
-            if(c->flags & REDIS_MONITORING) {
-                __redisPushCallback(&ac->replies,&cb);
-            }
-
-            /* When the connection is not being disconnected, simply stop
-             * trying to get replies and wait for the next loop tick. */
-            break;
-        }
-
-        /* Send any non-subscribe related PUSH messages to our PUSH handler
-         * while allowing subscribe related PUSH messages to pass through.
-         * This allows existing code to be backward compatible and work in
-         * either RESP2 or RESP3 mode. */
-        if (redisIsSpontaneousPushReply(reply)) {
-            __redisRunPushCallback(ac, reply);
-            c->reader->fn->freeObject(reply);
-            continue;
-        }
-
-        /* Even if the context is subscribed, pending regular
-         * callbacks will get a reply before pub/sub messages arrive. */
-        if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
-            /*
-             * A spontaneous reply in a not-subscribed context can be the error
-             * reply that is sent when a new connection exceeds the maximum
-             * number of allowed connections on the server side.
-             *
-             * This is seen as an error instead of a regular reply because the
-             * server closes the connection after sending it.
-             *
-             * To prevent the error from being overwritten by an EOF error the
-             * connection is closed here. See issue #43.
-             *
-             * Another possibility is that the server is loading its dataset.
-             * In this case we also want to close the connection, and have the
-             * user wait until the server is ready to take our request.
-             */
-            if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
-                c->err = REDIS_ERR_OTHER;
-                snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
-                c->reader->fn->freeObject(reply);
-                __redisAsyncDisconnect(ac);
-                return;
-            }
-            /* No more regular callbacks and no errors, the context *must* be subscribed or monitoring. */
-            assert((c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING));
-            if(c->flags & REDIS_SUBSCRIBED)
-                __redisGetSubscribeCallback(ac,reply,&cb);
-        }
-
-        if (cb.fn != NULL) {
-            __redisRunCallback(ac,&cb,reply);
-            c->reader->fn->freeObject(reply);
-
-            /* Proceed with free'ing when redisAsyncFree() was called. */
-            if (c->flags & REDIS_FREEING) {
-                __redisAsyncFree(ac);
-                return;
-            }
-        } else {
-            /* No callback for this reply. This can either be a NULL callback,
-             * or there were no callbacks to begin with. Either way, don't
-             * abort with an error, but simply ignore it because the client
-             * doesn't know what the server will spit out over the wire. */
-            c->reader->fn->freeObject(reply);
-        }
-    }
-
-    /* Disconnect when there was an error reading the reply */
-    if (status != REDIS_OK)
-        __redisAsyncDisconnect(ac);
-}
-
-static void __redisAsyncHandleConnectFailure(redisAsyncContext *ac) {
-    if (ac->onConnect) ac->onConnect(ac, REDIS_ERR);
-    __redisAsyncDisconnect(ac);
-}
-
-/* Internal helper function to detect socket status the first time a read or
- * write event fires. When connecting was not successful, the connect callback
- * is called with a REDIS_ERR status and the context is free'd. */
-static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
-    int completed = 0;
-    redisContext *c = &(ac->c);
-
-    if (redisCheckConnectDone(c, &completed) == REDIS_ERR) {
-        /* Error! */
-        redisCheckSocketError(c);
-        __redisAsyncHandleConnectFailure(ac);
-        return REDIS_ERR;
-    } else if (completed == 1) {
-        /* connected! */
-        if (c->connection_type == REDIS_CONN_TCP &&
-            redisSetTcpNoDelay(c) == REDIS_ERR) {
-            __redisAsyncHandleConnectFailure(ac);
-            return REDIS_ERR;
-        }
-
-        if (ac->onConnect) ac->onConnect(ac, REDIS_OK);
-        c->flags |= REDIS_CONNECTED;
-        return REDIS_OK;
-    } else {
-        return REDIS_OK;
-    }
-}
-
-void redisAsyncRead(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (redisBufferRead(c) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Always re-schedule reads */
-        _EL_ADD_READ(ac);
-        redisProcessCallbacks(ac);
-    }
-}
-
-/* This function should be called when the socket is readable.
- * It processes all replies that can be read and executes their callbacks.
- */
-void redisAsyncHandleRead(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
-    c->funcs->async_read(ac);
-}
-
-void redisAsyncWrite(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    int done = 0;
-
-    if (redisBufferWrite(c,&done) == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        /* Continue writing when not done, stop writing otherwise */
-        if (!done)
-            _EL_ADD_WRITE(ac);
-        else
-            _EL_DEL_WRITE(ac);
-
-        /* Always schedule reads after writes */
-        _EL_ADD_READ(ac);
-    }
-}
-
-void redisAsyncHandleWrite(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-
-    if (!(c->flags & REDIS_CONNECTED)) {
-        /* Abort connect was not successful. */
-        if (__redisAsyncHandleConnect(ac) != REDIS_OK)
-            return;
-        /* Try again later when the context is still not connected. */
-        if (!(c->flags & REDIS_CONNECTED))
-            return;
-    }
-
-    c->funcs->async_write(ac);
-}
-
-void redisAsyncHandleTimeout(redisAsyncContext *ac) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-
-    if ((c->flags & REDIS_CONNECTED) && ac->replies.head == NULL) {
-        /* Nothing to do - just an idle timeout */
-        return;
-    }
-
-    if (!c->err) {
-        __redisSetError(c, REDIS_ERR_TIMEOUT, "Timeout");
-    }
-
-    if (!(c->flags & REDIS_CONNECTED) && ac->onConnect) {
-        ac->onConnect(ac, REDIS_ERR);
-    }
-
-    while (__redisShiftCallback(&ac->replies, &cb) == REDIS_OK) {
-        __redisRunCallback(ac, &cb, NULL);
-    }
-
-    /**
-     * TODO: Don't automatically sever the connection,
-     * rather, allow to ignore <x> responses before the queue is clear
-     */
-    __redisAsyncDisconnect(ac);
-}
-
-/* Sets a pointer to the first argument and its length starting at p. Returns
- * the number of bytes to skip to get to the following argument. */
-static const char *nextArgument(const char *start, const char **str, size_t *len) {
-    const char *p = start;
-    if (p[0] != '$') {
-        p = strchr(p,'$');
-        if (p == NULL) return NULL;
-    }
-
-    *len = (int)strtol(p+1,NULL,10);
-    p = strchr(p,'\r');
-    assert(p);
-    *str = p+2;
-    return p+2+(*len)+2;
-}
-
-/* Helper function for the redisAsyncCommand* family of functions. Writes a
- * formatted command to the output buffer and registers the provided callback
- * function with the context. */
-static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
-    redisContext *c = &(ac->c);
-    redisCallback cb;
-    struct dict *cbdict;
-    dictEntry *de;
-    redisCallback *existcb;
-    int pvariant, hasnext;
-    const char *cstr, *astr;
-    size_t clen, alen;
-    const char *p;
-    sds sname;
-    int ret;
-
-    /* Don't accept new commands when the connection is about to be closed. */
-    if (c->flags & (REDIS_DISCONNECTING | REDIS_FREEING)) return REDIS_ERR;
-
-    /* Setup callback */
-    cb.fn = fn;
-    cb.privdata = privdata;
-    cb.pending_subs = 1;
-
-    /* Find out which command will be appended. */
-    p = nextArgument(cmd,&cstr,&clen);
-    assert(p != NULL);
-    hasnext = (p[0] == '$');
-    pvariant = (tolower(cstr[0]) == 'p') ? 1 : 0;
-    cstr += pvariant;
-    clen -= pvariant;
-
-    if (hasnext && strncasecmp(cstr,"subscribe\r\n",11) == 0) {
-        c->flags |= REDIS_SUBSCRIBED;
-
-        /* Add every channel/pattern to the list of subscription callbacks. */
-        while ((p = nextArgument(p,&astr,&alen)) != NULL) {
-            sname = sdsnewlen(astr,alen);
-            if (sname == NULL)
-                goto oom;
-
-            if (pvariant)
-                cbdict = ac->sub.patterns;
-            else
-                cbdict = ac->sub.channels;
-
-            de = dictFind(cbdict,sname);
-
-            if (de != NULL) {
-                existcb = dictGetEntryVal(de);
-                cb.pending_subs = existcb->pending_subs + 1;
-            }
-
-            ret = dictReplace(cbdict,sname,&cb);
-
-            if (ret == 0) sdsfree(sname);
-        }
-    } else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
-        /* It is only useful to call (P)UNSUBSCRIBE when the context is
-         * subscribed to one or more channels or patterns. */
-        if (!(c->flags & REDIS_SUBSCRIBED)) return REDIS_ERR;
-
-        /* (P)UNSUBSCRIBE does not have its own response: every channel or
-         * pattern that is unsubscribed will receive a message. This means we
-         * should not append a callback function for this command. */
-     } else if(strncasecmp(cstr,"monitor\r\n",9) == 0) {
-         /* Set monitor flag and push callback */
-         c->flags |= REDIS_MONITORING;
-         __redisPushCallback(&ac->replies,&cb);
-    } else {
-        if (c->flags & REDIS_SUBSCRIBED)
-            /* This will likely result in an error reply, but it needs to be
-             * received and passed to the callback. */
-            __redisPushCallback(&ac->sub.invalid,&cb);
-        else
-            __redisPushCallback(&ac->replies,&cb);
-    }
-
-    __redisAppendCommand(c,cmd,len);
-
-    /* Always schedule a write when the write buffer is non-empty */
-    _EL_ADD_WRITE(ac);
-
-    return REDIS_OK;
-oom:
-    __redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
-}
-
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
-    char *cmd;
-    int len;
-    int status;
-    len = redisvFormatCommand(&cmd,format,ap);
-
-    /* We don't want to pass -1 or -2 to future functions as a length. */
-    if (len < 0)
-        return REDIS_ERR;
-
-    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    hi_free(cmd);
-    return status;
-}
-
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...) {
-    va_list ap;
-    int status;
-    va_start(ap,format);
-    status = redisvAsyncCommand(ac,fn,privdata,format,ap);
-    va_end(ap);
-    return status;
-}
-
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
-    sds cmd;
-    int len;
-    int status;
-    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
-    if (len < 0)
-        return REDIS_ERR;
-    status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    sdsfree(cmd);
-    return status;
-}
-
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
-    int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
-    return status;
-}
-
-redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn) {
-    redisAsyncPushFn *old = ac->push_cb;
-    ac->push_cb = fn;
-    return old;
-}
-
-int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv) {
-    if (!ac->c.command_timeout) {
-        ac->c.command_timeout = hi_calloc(1, sizeof(tv));
-        if (ac->c.command_timeout == NULL) {
-            __redisSetError(&ac->c, REDIS_ERR_OOM, "Out of memory");
-            __redisAsyncCopyError(ac);
-            return REDIS_ERR;
-        }
-    }
-
-    if (tv.tv_sec != ac->c.command_timeout->tv_sec ||
-        tv.tv_usec != ac->c.command_timeout->tv_usec)
-    {
-        *ac->c.command_timeout = tv;
-    }
-
-    return REDIS_OK;
-}
diff --git a/ext/hiredis-1.0.2/async.h b/ext/hiredis-1.0.2/async.h
deleted file mode 100644
index b1d2cb263..000000000
--- a/ext/hiredis-1.0.2/async.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_H
-#define __HIREDIS_ASYNC_H
-#include "hiredis.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
-struct dict; /* dictionary header is included in async.c */
-
-/* Reply callback prototype and container */
-typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
-typedef struct redisCallback {
-    struct redisCallback *next; /* simple singly linked list */
-    redisCallbackFn *fn;
-    int pending_subs;
-    void *privdata;
-} redisCallback;
-
-/* List of callbacks for either regular replies or pub/sub */
-typedef struct redisCallbackList {
-    redisCallback *head, *tail;
-} redisCallbackList;
-
-/* Connection callback prototypes */
-typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
-typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
-typedef void(redisTimerCallback)(void *timer, void *privdata);
-
-/* Context for an async connection to Redis */
-typedef struct redisAsyncContext {
-    /* Hold the regular context, so it can be realloc'ed. */
-    redisContext c;
-
-    /* Setup error flags so they can be used directly. */
-    int err;
-    char *errstr;
-
-    /* Not used by hiredis */
-    void *data;
-    void (*dataCleanup)(void *privdata);
-
-    /* Event library data and hooks */
-    struct {
-        void *data;
-
-        /* Hooks that are called when the library expects to start
-         * reading/writing. These functions should be idempotent. */
-        void (*addRead)(void *privdata);
-        void (*delRead)(void *privdata);
-        void (*addWrite)(void *privdata);
-        void (*delWrite)(void *privdata);
-        void (*cleanup)(void *privdata);
-        void (*scheduleTimer)(void *privdata, struct timeval tv);
-    } ev;
-
-    /* Called when either the connection is terminated due to an error or per
-     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
-    redisDisconnectCallback *onDisconnect;
-
-    /* Called when the first write event was received. */
-    redisConnectCallback *onConnect;
-
-    /* Regular command callbacks */
-    redisCallbackList replies;
-
-    /* Address used for connect() */
-    struct sockaddr *saddr;
-    size_t addrlen;
-
-    /* Subscription callbacks */
-    struct {
-        redisCallbackList invalid;
-        struct dict *channels;
-        struct dict *patterns;
-    } sub;
-
-    /* Any configured RESP3 PUSH handler */
-    redisAsyncPushFn *push_cb;
-} redisAsyncContext;
-
-/* Functions that proxy to hiredis */
-redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options);
-redisAsyncContext *redisAsyncConnect(const char *ip, int port);
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr);
-redisAsyncContext *redisAsyncConnectUnix(const char *path);
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-
-redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn);
-int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv);
-void redisAsyncDisconnect(redisAsyncContext *ac);
-void redisAsyncFree(redisAsyncContext *ac);
-
-/* Handle read/write events */
-void redisAsyncHandleRead(redisAsyncContext *ac);
-void redisAsyncHandleWrite(redisAsyncContext *ac);
-void redisAsyncHandleTimeout(redisAsyncContext *ac);
-void redisAsyncRead(redisAsyncContext *ac);
-void redisAsyncWrite(redisAsyncContext *ac);
-
-/* Command functions for an async context. Write the command to the
- * output buffer and register the provided callback. */
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/async_private.h b/ext/hiredis-1.0.2/async_private.h
deleted file mode 100644
index b9d23fffd..000000000
--- a/ext/hiredis-1.0.2/async_private.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_PRIVATE_H
-#define __HIREDIS_ASYNC_PRIVATE_H
-
-#define _EL_ADD_READ(ctx)                                         \
-    do {                                                          \
-        refreshTimeout(ctx);                                      \
-        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
-    } while (0)
-#define _EL_DEL_READ(ctx) do { \
-        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_ADD_WRITE(ctx)                                          \
-    do {                                                            \
-        refreshTimeout(ctx);                                        \
-        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
-    } while (0)
-#define _EL_DEL_WRITE(ctx) do { \
-        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_CLEANUP(ctx) do { \
-        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
-        ctx->ev.cleanup = NULL; \
-    } while(0);
-
-static inline void refreshTimeout(redisAsyncContext *ctx) {
-    #define REDIS_TIMER_ISSET(tvp) \
-        (tvp && ((tvp)->tv_sec || (tvp)->tv_usec))
-
-    #define REDIS_EL_TIMER(ac, tvp) \
-        if ((ac)->ev.scheduleTimer && REDIS_TIMER_ISSET(tvp)) { \
-            (ac)->ev.scheduleTimer((ac)->ev.data, *(tvp)); \
-        }
-
-    if (ctx->c.flags & REDIS_CONNECTED) {
-        REDIS_EL_TIMER(ctx, ctx->c.command_timeout);
-    } else {
-        REDIS_EL_TIMER(ctx, ctx->c.connect_timeout);
-    }
-}
-
-void __redisAsyncDisconnect(redisAsyncContext *ac);
-void redisProcessCallbacks(redisAsyncContext *ac);
-
-#endif  /* __HIREDIS_ASYNC_PRIVATE_H */
diff --git a/ext/hiredis-1.0.2/dict.c b/ext/hiredis-1.0.2/dict.c
deleted file mode 100644
index 34a33ead9..000000000
--- a/ext/hiredis-1.0.2/dict.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include "alloc.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <limits.h>
-#include "dict.h"
-
-/* -------------------------- private prototypes ---------------------------- */
-
-static int _dictExpandIfNeeded(dict *ht);
-static unsigned long _dictNextPower(unsigned long size);
-static int _dictKeyIndex(dict *ht, const void *key);
-static int _dictInit(dict *ht, dictType *type, void *privDataPtr);
-
-/* -------------------------- hash functions -------------------------------- */
-
-/* Generic hash function (a popular one from Bernstein).
- * I tested a few and this was the best. */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len) {
-    unsigned int hash = 5381;
-
-    while (len--)
-        hash = ((hash << 5) + hash) + (*buf++); /* hash * 33 + c */
-    return hash;
-}
-
-/* ----------------------------- API implementation ------------------------- */
-
-/* Reset an hashtable already initialized with ht_init().
- * NOTE: This function should only called by ht_destroy(). */
-static void _dictReset(dict *ht) {
-    ht->table = NULL;
-    ht->size = 0;
-    ht->sizemask = 0;
-    ht->used = 0;
-}
-
-/* Create a new hash table */
-static dict *dictCreate(dictType *type, void *privDataPtr) {
-    dict *ht = hi_malloc(sizeof(*ht));
-    if (ht == NULL)
-        return NULL;
-
-    _dictInit(ht,type,privDataPtr);
-    return ht;
-}
-
-/* Initialize the hash table */
-static int _dictInit(dict *ht, dictType *type, void *privDataPtr) {
-    _dictReset(ht);
-    ht->type = type;
-    ht->privdata = privDataPtr;
-    return DICT_OK;
-}
-
-/* Expand or create the hashtable */
-static int dictExpand(dict *ht, unsigned long size) {
-    dict n; /* the new hashtable */
-    unsigned long realsize = _dictNextPower(size), i;
-
-    /* the size is invalid if it is smaller than the number of
-     * elements already inside the hashtable */
-    if (ht->used > size)
-        return DICT_ERR;
-
-    _dictInit(&n, ht->type, ht->privdata);
-    n.size = realsize;
-    n.sizemask = realsize-1;
-    n.table = hi_calloc(realsize,sizeof(dictEntry*));
-    if (n.table == NULL)
-        return DICT_ERR;
-
-    /* Copy all the elements from the old to the new table:
-     * note that if the old hash table is empty ht->size is zero,
-     * so dictExpand just creates an hash table. */
-    n.used = ht->used;
-    for (i = 0; i < ht->size && ht->used > 0; i++) {
-        dictEntry *he, *nextHe;
-
-        if (ht->table[i] == NULL) continue;
-
-        /* For each hash entry on this slot... */
-        he = ht->table[i];
-        while(he) {
-            unsigned int h;
-
-            nextHe = he->next;
-            /* Get the new element index */
-            h = dictHashKey(ht, he->key) & n.sizemask;
-            he->next = n.table[h];
-            n.table[h] = he;
-            ht->used--;
-            /* Pass to the next element */
-            he = nextHe;
-        }
-    }
-    assert(ht->used == 0);
-    hi_free(ht->table);
-
-    /* Remap the new hashtable in the old */
-    *ht = n;
-    return DICT_OK;
-}
-
-/* Add an element to the target hash table */
-static int dictAdd(dict *ht, void *key, void *val) {
-    int index;
-    dictEntry *entry;
-
-    /* Get the index of the new element, or -1 if
-     * the element already exists. */
-    if ((index = _dictKeyIndex(ht, key)) == -1)
-        return DICT_ERR;
-
-    /* Allocates the memory and stores key */
-    entry = hi_malloc(sizeof(*entry));
-    if (entry == NULL)
-        return DICT_ERR;
-
-    entry->next = ht->table[index];
-    ht->table[index] = entry;
-
-    /* Set the hash entry fields. */
-    dictSetHashKey(ht, entry, key);
-    dictSetHashVal(ht, entry, val);
-    ht->used++;
-    return DICT_OK;
-}
-
-/* Add an element, discarding the old if the key already exists.
- * Return 1 if the key was added from scratch, 0 if there was already an
- * element with such key and dictReplace() just performed a value update
- * operation. */
-static int dictReplace(dict *ht, void *key, void *val) {
-    dictEntry *entry, auxentry;
-
-    /* Try to add the element. If the key
-     * does not exists dictAdd will succeed. */
-    if (dictAdd(ht, key, val) == DICT_OK)
-        return 1;
-    /* It already exists, get the entry */
-    entry = dictFind(ht, key);
-    if (entry == NULL)
-        return 0;
-
-    /* Free the old value and set the new one */
-    /* Set the new value and free the old one. Note that it is important
-     * to do that in this order, as the value may just be exactly the same
-     * as the previous one. In this context, think to reference counting,
-     * you want to increment (set), and then decrement (free), and not the
-     * reverse. */
-    auxentry = *entry;
-    dictSetHashVal(ht, entry, val);
-    dictFreeEntryVal(ht, &auxentry);
-    return 0;
-}
-
-/* Search and remove an element */
-static int dictDelete(dict *ht, const void *key) {
-    unsigned int h;
-    dictEntry *de, *prevde;
-
-    if (ht->size == 0)
-        return DICT_ERR;
-    h = dictHashKey(ht, key) & ht->sizemask;
-    de = ht->table[h];
-
-    prevde = NULL;
-    while(de) {
-        if (dictCompareHashKeys(ht,key,de->key)) {
-            /* Unlink the element from the list */
-            if (prevde)
-                prevde->next = de->next;
-            else
-                ht->table[h] = de->next;
-
-            dictFreeEntryKey(ht,de);
-            dictFreeEntryVal(ht,de);
-            hi_free(de);
-            ht->used--;
-            return DICT_OK;
-        }
-        prevde = de;
-        de = de->next;
-    }
-    return DICT_ERR; /* not found */
-}
-
-/* Destroy an entire hash table */
-static int _dictClear(dict *ht) {
-    unsigned long i;
-
-    /* Free all the elements */
-    for (i = 0; i < ht->size && ht->used > 0; i++) {
-        dictEntry *he, *nextHe;
-
-        if ((he = ht->table[i]) == NULL) continue;
-        while(he) {
-            nextHe = he->next;
-            dictFreeEntryKey(ht, he);
-            dictFreeEntryVal(ht, he);
-            hi_free(he);
-            ht->used--;
-            he = nextHe;
-        }
-    }
-    /* Free the table and the allocated cache structure */
-    hi_free(ht->table);
-    /* Re-initialize the table */
-    _dictReset(ht);
-    return DICT_OK; /* never fails */
-}
-
-/* Clear & Release the hash table */
-static void dictRelease(dict *ht) {
-    _dictClear(ht);
-    hi_free(ht);
-}
-
-static dictEntry *dictFind(dict *ht, const void *key) {
-    dictEntry *he;
-    unsigned int h;
-
-    if (ht->size == 0) return NULL;
-    h = dictHashKey(ht, key) & ht->sizemask;
-    he = ht->table[h];
-    while(he) {
-        if (dictCompareHashKeys(ht, key, he->key))
-            return he;
-        he = he->next;
-    }
-    return NULL;
-}
-
-static dictIterator *dictGetIterator(dict *ht) {
-    dictIterator *iter = hi_malloc(sizeof(*iter));
-    if (iter == NULL)
-        return NULL;
-
-    iter->ht = ht;
-    iter->index = -1;
-    iter->entry = NULL;
-    iter->nextEntry = NULL;
-    return iter;
-}
-
-static dictEntry *dictNext(dictIterator *iter) {
-    while (1) {
-        if (iter->entry == NULL) {
-            iter->index++;
-            if (iter->index >=
-                    (signed)iter->ht->size) break;
-            iter->entry = iter->ht->table[iter->index];
-        } else {
-            iter->entry = iter->nextEntry;
-        }
-        if (iter->entry) {
-            /* We need to save the 'next' here, the iterator user
-             * may delete the entry we are returning. */
-            iter->nextEntry = iter->entry->next;
-            return iter->entry;
-        }
-    }
-    return NULL;
-}
-
-static void dictReleaseIterator(dictIterator *iter) {
-    hi_free(iter);
-}
-
-/* ------------------------- private functions ------------------------------ */
-
-/* Expand the hash table if needed */
-static int _dictExpandIfNeeded(dict *ht) {
-    /* If the hash table is empty expand it to the initial size,
-     * if the table is "full" double its size. */
-    if (ht->size == 0)
-        return dictExpand(ht, DICT_HT_INITIAL_SIZE);
-    if (ht->used == ht->size)
-        return dictExpand(ht, ht->size*2);
-    return DICT_OK;
-}
-
-/* Our hash table capability is a power of two */
-static unsigned long _dictNextPower(unsigned long size) {
-    unsigned long i = DICT_HT_INITIAL_SIZE;
-
-    if (size >= LONG_MAX) return LONG_MAX;
-    while(1) {
-        if (i >= size)
-            return i;
-        i *= 2;
-    }
-}
-
-/* Returns the index of a free slot that can be populated with
- * an hash entry for the given 'key'.
- * If the key already exists, -1 is returned. */
-static int _dictKeyIndex(dict *ht, const void *key) {
-    unsigned int h;
-    dictEntry *he;
-
-    /* Expand the hashtable if needed */
-    if (_dictExpandIfNeeded(ht) == DICT_ERR)
-        return -1;
-    /* Compute the key hash value */
-    h = dictHashKey(ht, key) & ht->sizemask;
-    /* Search if this slot does not already contain the given key */
-    he = ht->table[h];
-    while(he) {
-        if (dictCompareHashKeys(ht, key, he->key))
-            return -1;
-        he = he->next;
-    }
-    return h;
-}
-
diff --git a/ext/hiredis-1.0.2/dict.h b/ext/hiredis-1.0.2/dict.h
deleted file mode 100644
index 95fcd280e..000000000
--- a/ext/hiredis-1.0.2/dict.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __DICT_H
-#define __DICT_H
-
-#define DICT_OK 0
-#define DICT_ERR 1
-
-/* Unused arguments generate annoying warnings... */
-#define DICT_NOTUSED(V) ((void) V)
-
-typedef struct dictEntry {
-    void *key;
-    void *val;
-    struct dictEntry *next;
-} dictEntry;
-
-typedef struct dictType {
-    unsigned int (*hashFunction)(const void *key);
-    void *(*keyDup)(void *privdata, const void *key);
-    void *(*valDup)(void *privdata, const void *obj);
-    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
-    void (*keyDestructor)(void *privdata, void *key);
-    void (*valDestructor)(void *privdata, void *obj);
-} dictType;
-
-typedef struct dict {
-    dictEntry **table;
-    dictType *type;
-    unsigned long size;
-    unsigned long sizemask;
-    unsigned long used;
-    void *privdata;
-} dict;
-
-typedef struct dictIterator {
-    dict *ht;
-    int index;
-    dictEntry *entry, *nextEntry;
-} dictIterator;
-
-/* This is the initial size of every hash table */
-#define DICT_HT_INITIAL_SIZE     4
-
-/* ------------------------------- Macros ------------------------------------*/
-#define dictFreeEntryVal(ht, entry) \
-    if ((ht)->type->valDestructor) \
-        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
-
-#define dictSetHashVal(ht, entry, _val_) do { \
-    if ((ht)->type->valDup) \
-        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
-    else \
-        entry->val = (_val_); \
-} while(0)
-
-#define dictFreeEntryKey(ht, entry) \
-    if ((ht)->type->keyDestructor) \
-        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
-
-#define dictSetHashKey(ht, entry, _key_) do { \
-    if ((ht)->type->keyDup) \
-        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
-    else \
-        entry->key = (_key_); \
-} while(0)
-
-#define dictCompareHashKeys(ht, key1, key2) \
-    (((ht)->type->keyCompare) ? \
-        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
-        (key1) == (key2))
-
-#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
-
-#define dictGetEntryKey(he) ((he)->key)
-#define dictGetEntryVal(he) ((he)->val)
-#define dictSlots(ht) ((ht)->size)
-#define dictSize(ht) ((ht)->used)
-
-/* API */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
-static dict *dictCreate(dictType *type, void *privDataPtr);
-static int dictExpand(dict *ht, unsigned long size);
-static int dictAdd(dict *ht, void *key, void *val);
-static int dictReplace(dict *ht, void *key, void *val);
-static int dictDelete(dict *ht, const void *key);
-static void dictRelease(dict *ht);
-static dictEntry * dictFind(dict *ht, const void *key);
-static dictIterator *dictGetIterator(dict *ht);
-static dictEntry *dictNext(dictIterator *iter);
-static void dictReleaseIterator(dictIterator *iter);
-
-#endif /* __DICT_H */
diff --git a/ext/hiredis-1.0.2/examples/CMakeLists.txt b/ext/hiredis-1.0.2/examples/CMakeLists.txt
deleted file mode 100644
index 1d5bc56e0..000000000
--- a/ext/hiredis-1.0.2/examples/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-INCLUDE(FindPkgConfig)
-# Check for GLib
-
-PKG_CHECK_MODULES(GLIB2 glib-2.0)
-if (GLIB2_FOUND)
-    INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
-    LINK_DIRECTORIES(${GLIB2_LIBRARY_DIRS})
-    ADD_EXECUTABLE(example-glib example-glib.c)
-    TARGET_LINK_LIBRARIES(example-glib hiredis ${GLIB2_LIBRARIES})
-ENDIF(GLIB2_FOUND)
-
-FIND_PATH(LIBEV ev.h
-    HINTS /usr/local /usr/opt/local
-    ENV LIBEV_INCLUDE_DIR)
-
-if (LIBEV)
-    # Just compile and link with libev
-    ADD_EXECUTABLE(example-libev example-libev.c)
-    TARGET_LINK_LIBRARIES(example-libev hiredis ev)
-ENDIF()
-
-FIND_PATH(LIBEVENT event.h)
-if (LIBEVENT)
-    ADD_EXECUTABLE(example-libevent example-libevent)
-    TARGET_LINK_LIBRARIES(example-libevent hiredis event)
-ENDIF()
-
-FIND_PATH(LIBUV uv.h)
-IF (LIBUV)
-    ADD_EXECUTABLE(example-libuv example-libuv.c)
-    TARGET_LINK_LIBRARIES(example-libuv hiredis uv)
-ENDIF()
-
-IF (APPLE)
-    FIND_LIBRARY(CF CoreFoundation)
-    ADD_EXECUTABLE(example-macosx example-macosx.c)
-    TARGET_LINK_LIBRARIES(example-macosx hiredis ${CF})
-ENDIF()
-
-IF (ENABLE_SSL)
-    ADD_EXECUTABLE(example-ssl example-ssl.c)
-    TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl)
-ENDIF()
-
-ADD_EXECUTABLE(example example.c)
-TARGET_LINK_LIBRARIES(example hiredis)
-
-ADD_EXECUTABLE(example-push example-push.c)
-TARGET_LINK_LIBRARIES(example-push hiredis)
diff --git a/ext/hiredis-1.0.2/examples/example-ae.c b/ext/hiredis-1.0.2/examples/example-ae.c
deleted file mode 100644
index 8efa7306a..000000000
--- a/ext/hiredis-1.0.2/examples/example-ae.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/ae.h>
-
-/* Put event loop in the global scope, so it can be explicitly stopped */
-static aeEventLoop *loop;
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        aeStop(loop);
-        return;
-    }
-
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        aeStop(loop);
-        return;
-    }
-
-    printf("Disconnected...\n");
-    aeStop(loop);
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    loop = aeCreateEventLoop(64);
-    redisAeAttach(loop, c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    aeMain(loop);
-    return 0;
-}
-
diff --git a/ext/hiredis-1.0.2/examples/example-glib.c b/ext/hiredis-1.0.2/examples/example-glib.c
deleted file mode 100644
index d6e10f8e8..000000000
--- a/ext/hiredis-1.0.2/examples/example-glib.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include <stdlib.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/glib.h>
-
-static GMainLoop *mainloop;
-
-static void
-connect_cb (const redisAsyncContext *ac G_GNUC_UNUSED,
-            int status)
-{
-    if (status != REDIS_OK) {
-        g_printerr("Failed to connect: %s\n", ac->errstr);
-        g_main_loop_quit(mainloop);
-    } else {
-        g_printerr("Connected...\n");
-    }
-}
-
-static void
-disconnect_cb (const redisAsyncContext *ac G_GNUC_UNUSED,
-               int status)
-{
-    if (status != REDIS_OK) {
-        g_error("Failed to disconnect: %s", ac->errstr);
-    } else {
-        g_printerr("Disconnected...\n");
-        g_main_loop_quit(mainloop);
-    }
-}
-
-static void
-command_cb(redisAsyncContext *ac,
-           gpointer r,
-           gpointer user_data G_GNUC_UNUSED)
-{
-    redisReply *reply = r;
-
-    if (reply) {
-        g_print("REPLY: %s\n", reply->str);
-    }
-
-    redisAsyncDisconnect(ac);
-}
-
-gint
-main (gint argc     G_GNUC_UNUSED,
-      gchar *argv[] G_GNUC_UNUSED)
-{
-    redisAsyncContext *ac;
-    GMainContext *context = NULL;
-    GSource *source;
-
-    ac = redisAsyncConnect("127.0.0.1", 6379);
-    if (ac->err) {
-        g_printerr("%s\n", ac->errstr);
-        exit(EXIT_FAILURE);
-    }
-
-    source = redis_source_new(ac);
-    mainloop = g_main_loop_new(context, FALSE);
-    g_source_attach(source, context);
-
-    redisAsyncSetConnectCallback(ac, connect_cb);
-    redisAsyncSetDisconnectCallback(ac, disconnect_cb);
-    redisAsyncCommand(ac, command_cb, NULL, "SET key 1234");
-    redisAsyncCommand(ac, command_cb, NULL, "GET key");
-
-    g_main_loop_run(mainloop);
-
-    return EXIT_SUCCESS;
-}
diff --git a/ext/hiredis-1.0.2/examples/example-ivykis.c b/ext/hiredis-1.0.2/examples/example-ivykis.c
deleted file mode 100644
index f57dc3887..000000000
--- a/ext/hiredis-1.0.2/examples/example-ivykis.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/ivykis.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-#ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
-#endif
-
-    iv_init();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisIvykisAttach(c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-
-    iv_main();
-
-    iv_deinit();
-
-    return 0;
-}
diff --git a/ext/hiredis-1.0.2/examples/example-libev.c b/ext/hiredis-1.0.2/examples/example-libev.c
deleted file mode 100644
index ec474306b..000000000
--- a/ext/hiredis-1.0.2/examples/example-libev.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libev.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-#ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
-#endif
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibevAttach(EV_DEFAULT_ c);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    ev_loop(EV_DEFAULT_ 0);
-    return 0;
-}
diff --git a/ext/hiredis-1.0.2/examples/example-libevent-ssl.c b/ext/hiredis-1.0.2/examples/example-libevent-ssl.c
deleted file mode 100644
index 7d99af1ba..000000000
--- a/ext/hiredis-1.0.2/examples/example-libevent-ssl.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <hiredis_ssl.h>
-#include <async.h>
-#include <adapters/libevent.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-#ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
-#endif
-
-    struct event_base *base = event_base_new();
-    if (argc < 5) {
-        fprintf(stderr,
-                "Usage: %s <key> <host> <port> <cert> <certKey> [ca]\n", argv[0]);
-        exit(1);
-    }
-
-    const char *value = argv[1];
-    size_t nvalue = strlen(value);
-
-    const char *hostname = argv[2];
-    int port = atoi(argv[3]);
-
-    const char *cert = argv[4];
-    const char *certKey = argv[5];
-    const char *caCert = argc > 5 ? argv[6] : NULL;
-
-    redisSSLContext *ssl;
-    redisSSLContextError ssl_error;
-
-    redisInitOpenSSL();
-
-    ssl = redisCreateSSLContext(caCert, NULL,
-            cert, certKey, NULL, &ssl_error);
-    if (!ssl) {
-        printf("Error: %s\n", redisSSLContextGetError(ssl_error));
-        return 1;
-    }
-
-    redisAsyncContext *c = redisAsyncConnect(hostname, port);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-    if (redisInitiateSSLWithContext(&c->c, ssl) != REDIS_OK) {
-        printf("SSL Error!\n");
-        exit(1);
-    }
-
-    redisLibeventAttach(c,base);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", value, nvalue);
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    event_base_dispatch(base);
-
-    redisFreeSSLContext(ssl);
-    return 0;
-}
diff --git a/ext/hiredis-1.0.2/examples/example-libevent.c b/ext/hiredis-1.0.2/examples/example-libevent.c
deleted file mode 100644
index 49bddd0c2..000000000
--- a/ext/hiredis-1.0.2/examples/example-libevent.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libevent.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) {
-        if (c->errstr) {
-            printf("errstr: %s\n", c->errstr);
-        }
-        return;
-    }
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-#ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
-#endif
-
-    struct event_base *base = event_base_new();
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, "127.0.0.1", 6379);
-    struct timeval tv = {0};
-    tv.tv_sec = 1;
-    options.connect_timeout = &tv;
-
-
-    redisAsyncContext *c = redisAsyncConnectWithOptions(&options);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibeventAttach(c,base);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    event_base_dispatch(base);
-    return 0;
-}
diff --git a/ext/hiredis-1.0.2/examples/example-libuv.c b/ext/hiredis-1.0.2/examples/example-libuv.c
deleted file mode 100644
index cbde452b9..000000000
--- a/ext/hiredis-1.0.2/examples/example-libuv.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/libuv.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-#ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
-#endif
-
-    uv_loop_t* loop = uv_default_loop();
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisLibuvAttach(c,loop);
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-    uv_run(loop, UV_RUN_DEFAULT);
-    return 0;
-}
diff --git a/ext/hiredis-1.0.2/examples/example-macosx.c b/ext/hiredis-1.0.2/examples/example-macosx.c
deleted file mode 100644
index bc84ed5ba..000000000
--- a/ext/hiredis-1.0.2/examples/example-macosx.c
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//  Created by Дмитрий Бахвалов on 13.07.15.
-//  Copyright (c) 2015 Dmitry Bakhvalov. All rights reserved.
-//
-
-#include <stdio.h>
-
-#include <hiredis.h>
-#include <async.h>
-#include <adapters/macosx.h>
-
-void getCallback(redisAsyncContext *c, void *r, void *privdata) {
-    redisReply *reply = r;
-    if (reply == NULL) return;
-    printf("argv[%s]: %s\n", (char*)privdata, reply->str);
-
-    /* Disconnect after receiving the reply to GET */
-    redisAsyncDisconnect(c);
-}
-
-void connectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    printf("Connected...\n");
-}
-
-void disconnectCallback(const redisAsyncContext *c, int status) {
-    if (status != REDIS_OK) {
-        printf("Error: %s\n", c->errstr);
-        return;
-    }
-    CFRunLoopStop(CFRunLoopGetCurrent());
-    printf("Disconnected...\n");
-}
-
-int main (int argc, char **argv) {
-    signal(SIGPIPE, SIG_IGN);
-
-    CFRunLoopRef loop = CFRunLoopGetCurrent();
-    if( !loop ) {
-        printf("Error: Cannot get current run loop\n");
-        return 1;
-    }
-
-    redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
-    if (c->err) {
-        /* Let *c leak for now... */
-        printf("Error: %s\n", c->errstr);
-        return 1;
-    }
-
-    redisMacOSAttach(c, loop);
-
-    redisAsyncSetConnectCallback(c,connectCallback);
-    redisAsyncSetDisconnectCallback(c,disconnectCallback);
-
-    redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
-    redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
-
-    CFRunLoopRun();
-
-    return 0;
-}
-
diff --git a/ext/hiredis-1.0.2/examples/example-push.c b/ext/hiredis-1.0.2/examples/example-push.c
deleted file mode 100644
index 2d4ab4dc0..000000000
--- a/ext/hiredis-1.0.2/examples/example-push.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <hiredis.h>
-#include <win32.h>
-
-#define KEY_COUNT 5
-
-#define panicAbort(fmt, ...) \
-    do { \
-        fprintf(stderr, "%s:%d:%s(): " fmt, __FILE__, __LINE__, __func__, __VA_ARGS__); \
-        exit(-1); \
-    } while (0)
-
-static void assertReplyAndFree(redisContext *context, redisReply *reply, int type) {
-    if (reply == NULL)
-        panicAbort("NULL reply from server (error: %s)", context->errstr);
-
-    if (reply->type != type) {
-        if (reply->type == REDIS_REPLY_ERROR)
-            fprintf(stderr, "Redis Error: %s\n", reply->str);
-
-        panicAbort("Expected reply type %d but got type %d", type, reply->type);
-    }
-
-    freeReplyObject(reply);
-}
-
-/* Switch to the RESP3 protocol and enable client tracking */
-static void enableClientTracking(redisContext *c) {
-    redisReply *reply = redisCommand(c, "HELLO 3");
-    if (reply == NULL || c->err) {
-        panicAbort("NULL reply or server error (error: %s)", c->errstr);
-    }
-
-    if (reply->type != REDIS_REPLY_MAP) {
-        fprintf(stderr, "Error: Can't send HELLO 3 command.  Are you sure you're ");
-        fprintf(stderr, "connected to redis-server >= 6.0.0?\nRedis error: %s\n",
-                        reply->type == REDIS_REPLY_ERROR ? reply->str : "(unknown)");
-        exit(-1);
-    }
-
-    freeReplyObject(reply);
-
-    /* Enable client tracking */
-    reply = redisCommand(c, "CLIENT TRACKING ON");
-    assertReplyAndFree(c, reply, REDIS_REPLY_STATUS);
-}
-
-void pushReplyHandler(void *privdata, void *r) {
-    redisReply *reply = r;
-    int *invalidations = privdata;
-
-    /* Sanity check on the invalidation reply */
-    if (reply->type != REDIS_REPLY_PUSH || reply->elements != 2 ||
-        reply->element[1]->type != REDIS_REPLY_ARRAY ||
-        reply->element[1]->element[0]->type != REDIS_REPLY_STRING)
-    {
-        panicAbort("%s", "Can't parse PUSH message!");
-    }
-
-    /* Increment our invalidation count */
-    *invalidations += 1;
-
-    printf("pushReplyHandler(): INVALIDATE '%s' (invalidation count: %d)\n",
-           reply->element[1]->element[0]->str, *invalidations);
-
-    freeReplyObject(reply);
-}
-
-/* We aren't actually freeing anything here, but it is included to show that we can
- * have hiredis call our data destructor when freeing the context */
-void privdata_dtor(void *privdata) {
-    unsigned int *icount = privdata;
-    printf("privdata_dtor():  In context privdata dtor (invalidations: %u)\n", *icount);
-}
-
-int main(int argc, char **argv) {
-    unsigned int j, invalidations = 0;
-    redisContext *c;
-    redisReply *reply;
-
-    const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
-    int port = (argc > 2) ? atoi(argv[2]) : 6379;
-
-    redisOptions o = {0};
-    REDIS_OPTIONS_SET_TCP(&o, hostname, port);
-
-    /* Set our context privdata to the address of our invalidation counter.  Each
-     * time our PUSH handler is called, hiredis will pass the privdata for context.
-     *
-     * This could also be done after we create the context like so:
-     *
-     *    c->privdata = &invalidations;
-     *    c->free_privdata = privdata_dtor;
-     */
-    REDIS_OPTIONS_SET_PRIVDATA(&o, &invalidations, privdata_dtor);
-
-    /* Set our custom PUSH message handler */
-    o.push_cb = pushReplyHandler;
-
-    c = redisConnectWithOptions(&o);
-    if (c == NULL || c->err)
-        panicAbort("Connection error:  %s", c ? c->errstr : "OOM");
-
-    /* Enable RESP3 and turn on client tracking */
-    enableClientTracking(c);
-
-    /* Set some keys and then read them back.  Once we do that, Redis will deliver
-     * invalidation push messages whenever the key is modified */
-    for (j = 0; j < KEY_COUNT; j++) {
-        reply = redisCommand(c, "SET key:%d initial:%d", j, j);
-        assertReplyAndFree(c, reply, REDIS_REPLY_STATUS);
-
-        reply = redisCommand(c, "GET key:%d", j);
-        assertReplyAndFree(c, reply, REDIS_REPLY_STRING);
-    }
-
-    /* Trigger invalidation messages by updating keys we just read */
-    for (j = 0; j < KEY_COUNT; j++) {
-        printf("            main(): SET key:%d update:%d\n", j, j);
-        reply = redisCommand(c, "SET key:%d update:%d", j, j);
-        assertReplyAndFree(c, reply, REDIS_REPLY_STATUS);
-        printf("            main(): SET REPLY OK\n");
-    }
-
-    printf("\nTotal detected invalidations: %d, expected: %d\n", invalidations, KEY_COUNT);
-
-    /* PING server */
-    redisFree(c);
-}
diff --git a/ext/hiredis-1.0.2/examples/example-qt.cpp b/ext/hiredis-1.0.2/examples/example-qt.cpp
deleted file mode 100644
index f524c3f3d..000000000
--- a/ext/hiredis-1.0.2/examples/example-qt.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <iostream>
-using namespace std;
-
-#include <QCoreApplication>
-#include <QTimer>
-
-#include "example-qt.h"
-
-void getCallback(redisAsyncContext *, void * r, void * privdata) {
-
-    redisReply * reply = static_cast<redisReply *>(r);
-    ExampleQt * ex = static_cast<ExampleQt *>(privdata);
-    if (reply == nullptr || ex == nullptr) return;
-
-    cout << "key: " << reply->str << endl;
-
-    ex->finish();
-}
-
-void ExampleQt::run() {
-
-    m_ctx = redisAsyncConnect("localhost", 6379);
-
-    if (m_ctx->err) {
-        cerr << "Error: " << m_ctx->errstr << endl;
-        redisAsyncFree(m_ctx);
-        emit finished();
-    }
-
-    m_adapter.setContext(m_ctx);
-
-    redisAsyncCommand(m_ctx, NULL, NULL, "SET key %s", m_value);
-    redisAsyncCommand(m_ctx, getCallback, this, "GET key");
-}
-
-int main (int argc, char **argv) {
-
-    QCoreApplication app(argc, argv);
-
-    ExampleQt example(argv[argc-1]);
-
-    QObject::connect(&example, SIGNAL(finished()), &app, SLOT(quit()));
-    QTimer::singleShot(0, &example, SLOT(run()));
-
-    return app.exec();
-}
diff --git a/ext/hiredis-1.0.2/examples/example-qt.h b/ext/hiredis-1.0.2/examples/example-qt.h
deleted file mode 100644
index 374f47666..000000000
--- a/ext/hiredis-1.0.2/examples/example-qt.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __HIREDIS_EXAMPLE_QT_H
-#define __HIREDIS_EXAMPLE_QT_H
-
-#include <adapters/qt.h>
-
-class ExampleQt : public QObject {
-
-    Q_OBJECT
-
-    public:
-        ExampleQt(const char * value, QObject * parent = 0)
-            : QObject(parent), m_value(value) {}
-
-    signals:
-        void finished();
-
-    public slots:
-        void run();
-
-    private:
-        void finish() { emit finished(); }
-
-    private:
-        const char * m_value;
-        redisAsyncContext * m_ctx;
-        RedisQtAdapter m_adapter;
-
-    friend
-    void getCallback(redisAsyncContext *, void *, void *);
-};
-
-#endif /* !__HIREDIS_EXAMPLE_QT_H */
diff --git a/ext/hiredis-1.0.2/examples/example-ssl.c b/ext/hiredis-1.0.2/examples/example-ssl.c
deleted file mode 100644
index c754177cf..000000000
--- a/ext/hiredis-1.0.2/examples/example-ssl.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <hiredis.h>
-#include <hiredis_ssl.h>
-#include <win32.h>
-
-int main(int argc, char **argv) {
-    unsigned int j;
-    redisSSLContext *ssl;
-    redisSSLContextError ssl_error;
-    redisContext *c;
-    redisReply *reply;
-    if (argc < 4) {
-        printf("Usage: %s <host> <port> <cert> <key> [ca]\n", argv[0]);
-        exit(1);
-    }
-    const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
-    int port = atoi(argv[2]);
-    const char *cert = argv[3];
-    const char *key = argv[4];
-    const char *ca = argc > 4 ? argv[5] : NULL;
-
-    redisInitOpenSSL();
-    ssl = redisCreateSSLContext(ca, NULL, cert, key, NULL, &ssl_error);
-    if (!ssl) {
-        printf("SSL Context error: %s\n",
-                redisSSLContextGetError(ssl_error));
-        exit(1);
-    }
-
-    struct timeval tv = { 1, 500000 }; // 1.5 seconds
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, hostname, port);
-    options.connect_timeout = &tv;
-    c = redisConnectWithOptions(&options);
-
-    if (c == NULL || c->err) {
-        if (c) {
-            printf("Connection error: %s\n", c->errstr);
-            redisFree(c);
-        } else {
-            printf("Connection error: can't allocate redis context\n");
-        }
-        exit(1);
-    }
-
-    if (redisInitiateSSLWithContext(c, ssl) != REDIS_OK) {
-        printf("Couldn't initialize SSL!\n");
-        printf("Error: %s\n", c->errstr);
-        redisFree(c);
-        exit(1);
-    }
-
-    /* PING server */
-    reply = redisCommand(c,"PING");
-    printf("PING: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key */
-    reply = redisCommand(c,"SET %s %s", "foo", "hello world");
-    printf("SET: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key using binary safe API */
-    reply = redisCommand(c,"SET %b %b", "bar", (size_t) 3, "hello", (size_t) 5);
-    printf("SET (binary API): %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Try a GET and two INCR */
-    reply = redisCommand(c,"GET foo");
-    printf("GET foo: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-    /* again ... */
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-
-    /* Create a list of numbers, from 0 to 9 */
-    reply = redisCommand(c,"DEL mylist");
-    freeReplyObject(reply);
-    for (j = 0; j < 10; j++) {
-        char buf[64];
-
-        snprintf(buf,64,"%u",j);
-        reply = redisCommand(c,"LPUSH mylist element-%s", buf);
-        freeReplyObject(reply);
-    }
-
-    /* Let's check what we have inside the list */
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    if (reply->type == REDIS_REPLY_ARRAY) {
-        for (j = 0; j < reply->elements; j++) {
-            printf("%u) %s\n", j, reply->element[j]->str);
-        }
-    }
-    freeReplyObject(reply);
-
-    /* Disconnects and frees the context */
-    redisFree(c);
-
-    redisFreeSSLContext(ssl);
-
-    return 0;
-}
diff --git a/ext/hiredis-1.0.2/examples/example.c b/ext/hiredis-1.0.2/examples/example.c
deleted file mode 100644
index 15dacbd18..000000000
--- a/ext/hiredis-1.0.2/examples/example.c
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <hiredis.h>
-#include <win32.h>
-
-int main(int argc, char **argv) {
-    unsigned int j, isunix = 0;
-    redisContext *c;
-    redisReply *reply;
-    const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1";
-
-    if (argc > 2) {
-        if (*argv[2] == 'u' || *argv[2] == 'U') {
-            isunix = 1;
-            /* in this case, host is the path to the unix socket */
-            printf("Will connect to unix socket @%s\n", hostname);
-        }
-    }
-
-    int port = (argc > 2) ? atoi(argv[2]) : 6379;
-
-    struct timeval timeout = { 1, 500000 }; // 1.5 seconds
-    if (isunix) {
-        c = redisConnectUnixWithTimeout(hostname, timeout);
-    } else {
-        c = redisConnectWithTimeout(hostname, port, timeout);
-    }
-    if (c == NULL || c->err) {
-        if (c) {
-            printf("Connection error: %s\n", c->errstr);
-            redisFree(c);
-        } else {
-            printf("Connection error: can't allocate redis context\n");
-        }
-        exit(1);
-    }
-
-    /* PING server */
-    reply = redisCommand(c,"PING");
-    printf("PING: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key */
-    reply = redisCommand(c,"SET %s %s", "foo", "hello world");
-    printf("SET: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Set a key using binary safe API */
-    reply = redisCommand(c,"SET %b %b", "bar", (size_t) 3, "hello", (size_t) 5);
-    printf("SET (binary API): %s\n", reply->str);
-    freeReplyObject(reply);
-
-    /* Try a GET and two INCR */
-    reply = redisCommand(c,"GET foo");
-    printf("GET foo: %s\n", reply->str);
-    freeReplyObject(reply);
-
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-    /* again ... */
-    reply = redisCommand(c,"INCR counter");
-    printf("INCR counter: %lld\n", reply->integer);
-    freeReplyObject(reply);
-
-    /* Create a list of numbers, from 0 to 9 */
-    reply = redisCommand(c,"DEL mylist");
-    freeReplyObject(reply);
-    for (j = 0; j < 10; j++) {
-        char buf[64];
-
-        snprintf(buf,64,"%u",j);
-        reply = redisCommand(c,"LPUSH mylist element-%s", buf);
-        freeReplyObject(reply);
-    }
-
-    /* Let's check what we have inside the list */
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    if (reply->type == REDIS_REPLY_ARRAY) {
-        for (j = 0; j < reply->elements; j++) {
-            printf("%u) %s\n", j, reply->element[j]->str);
-        }
-    }
-    freeReplyObject(reply);
-
-    /* Disconnects and frees the context */
-    redisFree(c);
-
-    return 0;
-}
diff --git a/ext/hiredis-1.0.2/fmacros.h b/ext/hiredis-1.0.2/fmacros.h
deleted file mode 100644
index 3227faafd..000000000
--- a/ext/hiredis-1.0.2/fmacros.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __HIREDIS_FMACRO_H
-#define __HIREDIS_FMACRO_H
-
-#define _XOPEN_SOURCE 600
-#define _POSIX_C_SOURCE 200112L
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* Enable TCP_KEEPALIVE */
-#define _DARWIN_C_SOURCE
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/hiredis-config.cmake.in b/ext/hiredis-1.0.2/hiredis-config.cmake.in
deleted file mode 100644
index 98851dcee..000000000
--- a/ext/hiredis-1.0.2/hiredis-config.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-@PACKAGE_INIT@
-
-set_and_check(hiredis_INCLUDEDIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-
-IF (NOT TARGET hiredis::hiredis)
-	INCLUDE(${CMAKE_CURRENT_LIST_DIR}/hiredis-targets.cmake)
-ENDIF()
-
-SET(hiredis_LIBRARIES hiredis::hiredis)
-SET(hiredis_INCLUDE_DIRS ${hiredis_INCLUDEDIR})
-
-check_required_components(hiredis)
-
diff --git a/ext/hiredis-1.0.2/hiredis.c b/ext/hiredis-1.0.2/hiredis.c
deleted file mode 100644
index ab0e39822..000000000
--- a/ext/hiredis-1.0.2/hiredis.c
+++ /dev/null
@@ -1,1174 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include "hiredis.h"
-#include "net.h"
-#include "sds.h"
-#include "async.h"
-#include "win32.h"
-
-extern int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout);
-extern int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout);
-
-static redisContextFuncs redisContextDefaultFuncs = {
-    .free_privctx = NULL,
-    .async_read = redisAsyncRead,
-    .async_write = redisAsyncWrite,
-    .read = redisNetRead,
-    .write = redisNetWrite
-};
-
-static redisReply *createReplyObject(int type);
-static void *createStringObject(const redisReadTask *task, char *str, size_t len);
-static void *createArrayObject(const redisReadTask *task, size_t elements);
-static void *createIntegerObject(const redisReadTask *task, long long value);
-static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len);
-static void *createNilObject(const redisReadTask *task);
-static void *createBoolObject(const redisReadTask *task, int bval);
-
-/* Default set of functions to build the reply. Keep in mind that such a
- * function returning NULL is interpreted as OOM. */
-static redisReplyObjectFunctions defaultFunctions = {
-    createStringObject,
-    createArrayObject,
-    createIntegerObject,
-    createDoubleObject,
-    createNilObject,
-    createBoolObject,
-    freeReplyObject
-};
-
-/* Create a reply object */
-static redisReply *createReplyObject(int type) {
-    redisReply *r = hi_calloc(1,sizeof(*r));
-
-    if (r == NULL)
-        return NULL;
-
-    r->type = type;
-    return r;
-}
-
-/* Free a reply object */
-void freeReplyObject(void *reply) {
-    redisReply *r = reply;
-    size_t j;
-
-    if (r == NULL)
-        return;
-
-    switch(r->type) {
-    case REDIS_REPLY_INTEGER:
-        break; /* Nothing to free */
-    case REDIS_REPLY_ARRAY:
-    case REDIS_REPLY_MAP:
-    case REDIS_REPLY_SET:
-    case REDIS_REPLY_PUSH:
-        if (r->element != NULL) {
-            for (j = 0; j < r->elements; j++)
-                freeReplyObject(r->element[j]);
-            hi_free(r->element);
-        }
-        break;
-    case REDIS_REPLY_ERROR:
-    case REDIS_REPLY_STATUS:
-    case REDIS_REPLY_STRING:
-    case REDIS_REPLY_DOUBLE:
-    case REDIS_REPLY_VERB:
-        hi_free(r->str);
-        break;
-    }
-    hi_free(r);
-}
-
-static void *createStringObject(const redisReadTask *task, char *str, size_t len) {
-    redisReply *r, *parent;
-    char *buf;
-
-    r = createReplyObject(task->type);
-    if (r == NULL)
-        return NULL;
-
-    assert(task->type == REDIS_REPLY_ERROR  ||
-           task->type == REDIS_REPLY_STATUS ||
-           task->type == REDIS_REPLY_STRING ||
-           task->type == REDIS_REPLY_VERB);
-
-    /* Copy string value */
-    if (task->type == REDIS_REPLY_VERB) {
-        buf = hi_malloc(len-4+1); /* Skip 4 bytes of verbatim type header. */
-        if (buf == NULL) goto oom;
-
-        memcpy(r->vtype,str,3);
-        r->vtype[3] = '\0';
-        memcpy(buf,str+4,len-4);
-        buf[len-4] = '\0';
-        r->len = len - 4;
-    } else {
-        buf = hi_malloc(len+1);
-        if (buf == NULL) goto oom;
-
-        memcpy(buf,str,len);
-        buf[len] = '\0';
-        r->len = len;
-    }
-    r->str = buf;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET ||
-               parent->type == REDIS_REPLY_PUSH);
-        parent->element[task->idx] = r;
-    }
-    return r;
-
-oom:
-    freeReplyObject(r);
-    return NULL;
-}
-
-static void *createArrayObject(const redisReadTask *task, size_t elements) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(task->type);
-    if (r == NULL)
-        return NULL;
-
-    if (elements > 0) {
-        if (SIZE_MAX / sizeof(redisReply*) < elements) return NULL;  /* Don't overflow */
-        r->element = hi_calloc(elements,sizeof(redisReply*));
-        if (r->element == NULL) {
-            freeReplyObject(r);
-            return NULL;
-        }
-    }
-
-    r->elements = elements;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET ||
-               parent->type == REDIS_REPLY_PUSH);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createIntegerObject(const redisReadTask *task, long long value) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_INTEGER);
-    if (r == NULL)
-        return NULL;
-
-    r->integer = value;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET ||
-               parent->type == REDIS_REPLY_PUSH);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createDoubleObject(const redisReadTask *task, double value, char *str, size_t len) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_DOUBLE);
-    if (r == NULL)
-        return NULL;
-
-    r->dval = value;
-    r->str = hi_malloc(len+1);
-    if (r->str == NULL) {
-        freeReplyObject(r);
-        return NULL;
-    }
-
-    /* The double reply also has the original protocol string representing a
-     * double as a null terminated string. This way the caller does not need
-     * to format back for string conversion, especially since Redis does efforts
-     * to make the string more human readable avoiding the calssical double
-     * decimal string conversion artifacts. */
-    memcpy(r->str, str, len);
-    r->str[len] = '\0';
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createNilObject(const redisReadTask *task) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_NIL);
-    if (r == NULL)
-        return NULL;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-static void *createBoolObject(const redisReadTask *task, int bval) {
-    redisReply *r, *parent;
-
-    r = createReplyObject(REDIS_REPLY_BOOL);
-    if (r == NULL)
-        return NULL;
-
-    r->integer = bval != 0;
-
-    if (task->parent) {
-        parent = task->parent->obj;
-        assert(parent->type == REDIS_REPLY_ARRAY ||
-               parent->type == REDIS_REPLY_MAP ||
-               parent->type == REDIS_REPLY_SET);
-        parent->element[task->idx] = r;
-    }
-    return r;
-}
-
-/* Return the number of digits of 'v' when converted to string in radix 10.
- * Implementation borrowed from link in redis/src/util.c:string2ll(). */
-static uint32_t countDigits(uint64_t v) {
-  uint32_t result = 1;
-  for (;;) {
-    if (v < 10) return result;
-    if (v < 100) return result + 1;
-    if (v < 1000) return result + 2;
-    if (v < 10000) return result + 3;
-    v /= 10000U;
-    result += 4;
-  }
-}
-
-/* Helper that calculates the bulk length given a certain string length. */
-static size_t bulklen(size_t len) {
-    return 1+countDigits(len)+2+len+2;
-}
-
-int redisvFormatCommand(char **target, const char *format, va_list ap) {
-    const char *c = format;
-    char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
-    sds curarg, newarg; /* current argument */
-    int touched = 0; /* was the current argument touched? */
-    char **curargv = NULL, **newargv = NULL;
-    int argc = 0;
-    int totlen = 0;
-    int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
-    int j;
-
-    /* Abort if there is not target to set */
-    if (target == NULL)
-        return -1;
-
-    /* Build the command string accordingly to protocol */
-    curarg = sdsempty();
-    if (curarg == NULL)
-        return -1;
-
-    while(*c != '\0') {
-        if (*c != '%' || c[1] == '\0') {
-            if (*c == ' ') {
-                if (touched) {
-                    newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
-                    if (newargv == NULL) goto memory_err;
-                    curargv = newargv;
-                    curargv[argc++] = curarg;
-                    totlen += bulklen(sdslen(curarg));
-
-                    /* curarg is put in argv so it can be overwritten. */
-                    curarg = sdsempty();
-                    if (curarg == NULL) goto memory_err;
-                    touched = 0;
-                }
-            } else {
-                newarg = sdscatlen(curarg,c,1);
-                if (newarg == NULL) goto memory_err;
-                curarg = newarg;
-                touched = 1;
-            }
-        } else {
-            char *arg;
-            size_t size;
-
-            /* Set newarg so it can be checked even if it is not touched. */
-            newarg = curarg;
-
-            switch(c[1]) {
-            case 's':
-                arg = va_arg(ap,char*);
-                size = strlen(arg);
-                if (size > 0)
-                    newarg = sdscatlen(curarg,arg,size);
-                break;
-            case 'b':
-                arg = va_arg(ap,char*);
-                size = va_arg(ap,size_t);
-                if (size > 0)
-                    newarg = sdscatlen(curarg,arg,size);
-                break;
-            case '%':
-                newarg = sdscat(curarg,"%");
-                break;
-            default:
-                /* Try to detect printf format */
-                {
-                    static const char intfmts[] = "diouxX";
-                    static const char flags[] = "#0-+ ";
-                    char _format[16];
-                    const char *_p = c+1;
-                    size_t _l = 0;
-                    va_list _cpy;
-
-                    /* Flags */
-                    while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
-
-                    /* Field width */
-                    while (*_p != '\0' && isdigit(*_p)) _p++;
-
-                    /* Precision */
-                    if (*_p == '.') {
-                        _p++;
-                        while (*_p != '\0' && isdigit(*_p)) _p++;
-                    }
-
-                    /* Copy va_list before consuming with va_arg */
-                    va_copy(_cpy,ap);
-
-                    /* Integer conversion (without modifiers) */
-                    if (strchr(intfmts,*_p) != NULL) {
-                        va_arg(ap,int);
-                        goto fmt_valid;
-                    }
-
-                    /* Double conversion (without modifiers) */
-                    if (strchr("eEfFgGaA",*_p) != NULL) {
-                        va_arg(ap,double);
-                        goto fmt_valid;
-                    }
-
-                    /* Size: char */
-                    if (_p[0] == 'h' && _p[1] == 'h') {
-                        _p += 2;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,int); /* char gets promoted to int */
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: short */
-                    if (_p[0] == 'h') {
-                        _p += 1;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,int); /* short gets promoted to int */
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: long long */
-                    if (_p[0] == 'l' && _p[1] == 'l') {
-                        _p += 2;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,long long);
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                    /* Size: long */
-                    if (_p[0] == 'l') {
-                        _p += 1;
-                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
-                            va_arg(ap,long);
-                            goto fmt_valid;
-                        }
-                        goto fmt_invalid;
-                    }
-
-                fmt_invalid:
-                    va_end(_cpy);
-                    goto format_err;
-
-                fmt_valid:
-                    _l = (_p+1)-c;
-                    if (_l < sizeof(_format)-2) {
-                        memcpy(_format,c,_l);
-                        _format[_l] = '\0';
-                        newarg = sdscatvprintf(curarg,_format,_cpy);
-
-                        /* Update current position (note: outer blocks
-                         * increment c twice so compensate here) */
-                        c = _p-1;
-                    }
-
-                    va_end(_cpy);
-                    break;
-                }
-            }
-
-            if (newarg == NULL) goto memory_err;
-            curarg = newarg;
-
-            touched = 1;
-            c++;
-        }
-        c++;
-    }
-
-    /* Add the last argument if needed */
-    if (touched) {
-        newargv = hi_realloc(curargv,sizeof(char*)*(argc+1));
-        if (newargv == NULL) goto memory_err;
-        curargv = newargv;
-        curargv[argc++] = curarg;
-        totlen += bulklen(sdslen(curarg));
-    } else {
-        sdsfree(curarg);
-    }
-
-    /* Clear curarg because it was put in curargv or was free'd. */
-    curarg = NULL;
-
-    /* Add bytes needed to hold multi bulk count */
-    totlen += 1+countDigits(argc)+2;
-
-    /* Build the command at protocol level */
-    cmd = hi_malloc(totlen+1);
-    if (cmd == NULL) goto memory_err;
-
-    pos = sprintf(cmd,"*%d\r\n",argc);
-    for (j = 0; j < argc; j++) {
-        pos += sprintf(cmd+pos,"$%zu\r\n",sdslen(curargv[j]));
-        memcpy(cmd+pos,curargv[j],sdslen(curargv[j]));
-        pos += sdslen(curargv[j]);
-        sdsfree(curargv[j]);
-        cmd[pos++] = '\r';
-        cmd[pos++] = '\n';
-    }
-    assert(pos == totlen);
-    cmd[pos] = '\0';
-
-    hi_free(curargv);
-    *target = cmd;
-    return totlen;
-
-format_err:
-    error_type = -2;
-    goto cleanup;
-
-memory_err:
-    error_type = -1;
-    goto cleanup;
-
-cleanup:
-    if (curargv) {
-        while(argc--)
-            sdsfree(curargv[argc]);
-        hi_free(curargv);
-    }
-
-    sdsfree(curarg);
-    hi_free(cmd);
-
-    return error_type;
-}
-
-/* Format a command according to the Redis protocol. This function
- * takes a format similar to printf:
- *
- * %s represents a C null terminated string you want to interpolate
- * %b represents a binary safe string
- *
- * When using %b you need to provide both the pointer to the string
- * and the length in bytes as a size_t. Examples:
- *
- * len = redisFormatCommand(target, "GET %s", mykey);
- * len = redisFormatCommand(target, "SET %s %b", mykey, myval, myvallen);
- */
-int redisFormatCommand(char **target, const char *format, ...) {
-    va_list ap;
-    int len;
-    va_start(ap,format);
-    len = redisvFormatCommand(target,format,ap);
-    va_end(ap);
-
-    /* The API says "-1" means bad result, but we now also return "-2" in some
-     * cases.  Force the return value to always be -1. */
-    if (len < 0)
-        len = -1;
-
-    return len;
-}
-
-/* Format a command according to the Redis protocol using an sds string and
- * sdscatfmt for the processing of arguments. This function takes the
- * number of arguments, an array with arguments and an array with their
- * lengths. If the latter is set to NULL, strlen will be used to compute the
- * argument lengths.
- */
-int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
-                              const size_t *argvlen)
-{
-    sds cmd, aux;
-    unsigned long long totlen;
-    int j;
-    size_t len;
-
-    /* Abort on a NULL target */
-    if (target == NULL)
-        return -1;
-
-    /* Calculate our total size */
-    totlen = 1+countDigits(argc)+2;
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        totlen += bulklen(len);
-    }
-
-    /* Use an SDS string for command construction */
-    cmd = sdsempty();
-    if (cmd == NULL)
-        return -1;
-
-    /* We already know how much storage we need */
-    aux = sdsMakeRoomFor(cmd, totlen);
-    if (aux == NULL) {
-        sdsfree(cmd);
-        return -1;
-    }
-
-    cmd = aux;
-
-    /* Construct command */
-    cmd = sdscatfmt(cmd, "*%i\r\n", argc);
-    for (j=0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        cmd = sdscatfmt(cmd, "$%u\r\n", len);
-        cmd = sdscatlen(cmd, argv[j], len);
-        cmd = sdscatlen(cmd, "\r\n", sizeof("\r\n")-1);
-    }
-
-    assert(sdslen(cmd)==totlen);
-
-    *target = cmd;
-    return totlen;
-}
-
-void redisFreeSdsCommand(sds cmd) {
-    sdsfree(cmd);
-}
-
-/* Format a command according to the Redis protocol. This function takes the
- * number of arguments, an array with arguments and an array with their
- * lengths. If the latter is set to NULL, strlen will be used to compute the
- * argument lengths.
- */
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
-    char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
-    size_t len;
-    int totlen, j;
-
-    /* Abort on a NULL target */
-    if (target == NULL)
-        return -1;
-
-    /* Calculate number of bytes needed for the command */
-    totlen = 1+countDigits(argc)+2;
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        totlen += bulklen(len);
-    }
-
-    /* Build the command at protocol level */
-    cmd = hi_malloc(totlen+1);
-    if (cmd == NULL)
-        return -1;
-
-    pos = sprintf(cmd,"*%d\r\n",argc);
-    for (j = 0; j < argc; j++) {
-        len = argvlen ? argvlen[j] : strlen(argv[j]);
-        pos += sprintf(cmd+pos,"$%zu\r\n",len);
-        memcpy(cmd+pos,argv[j],len);
-        pos += len;
-        cmd[pos++] = '\r';
-        cmd[pos++] = '\n';
-    }
-    assert(pos == totlen);
-    cmd[pos] = '\0';
-
-    *target = cmd;
-    return totlen;
-}
-
-void redisFreeCommand(char *cmd) {
-    hi_free(cmd);
-}
-
-void __redisSetError(redisContext *c, int type, const char *str) {
-    size_t len;
-
-    c->err = type;
-    if (str != NULL) {
-        len = strlen(str);
-        len = len < (sizeof(c->errstr)-1) ? len : (sizeof(c->errstr)-1);
-        memcpy(c->errstr,str,len);
-        c->errstr[len] = '\0';
-    } else {
-        /* Only REDIS_ERR_IO may lack a description! */
-        assert(type == REDIS_ERR_IO);
-        strerror_r(errno, c->errstr, sizeof(c->errstr));
-    }
-}
-
-redisReader *redisReaderCreate(void) {
-    return redisReaderCreateWithFunctions(&defaultFunctions);
-}
-
-static void redisPushAutoFree(void *privdata, void *reply) {
-    (void)privdata;
-    freeReplyObject(reply);
-}
-
-static redisContext *redisContextInit(void) {
-    redisContext *c;
-
-    c = hi_calloc(1, sizeof(*c));
-    if (c == NULL)
-        return NULL;
-
-    c->funcs = &redisContextDefaultFuncs;
-
-    c->obuf = sdsempty();
-    c->reader = redisReaderCreate();
-    c->fd = REDIS_INVALID_FD;
-
-    if (c->obuf == NULL || c->reader == NULL) {
-        redisFree(c);
-        return NULL;
-    }
-
-    return c;
-}
-
-void redisFree(redisContext *c) {
-    if (c == NULL)
-        return;
-    redisNetClose(c);
-
-    sdsfree(c->obuf);
-    redisReaderFree(c->reader);
-    hi_free(c->tcp.host);
-    hi_free(c->tcp.source_addr);
-    hi_free(c->unix_sock.path);
-    hi_free(c->connect_timeout);
-    hi_free(c->command_timeout);
-    hi_free(c->saddr);
-
-    if (c->privdata && c->free_privdata)
-        c->free_privdata(c->privdata);
-
-    if (c->funcs->free_privctx)
-        c->funcs->free_privctx(c->privctx);
-
-    memset(c, 0xff, sizeof(*c));
-    hi_free(c);
-}
-
-redisFD redisFreeKeepFd(redisContext *c) {
-    redisFD fd = c->fd;
-    c->fd = REDIS_INVALID_FD;
-    redisFree(c);
-    return fd;
-}
-
-int redisReconnect(redisContext *c) {
-    c->err = 0;
-    memset(c->errstr, '\0', strlen(c->errstr));
-
-    if (c->privctx && c->funcs->free_privctx) {
-        c->funcs->free_privctx(c->privctx);
-        c->privctx = NULL;
-    }
-
-    redisNetClose(c);
-
-    sdsfree(c->obuf);
-    redisReaderFree(c->reader);
-
-    c->obuf = sdsempty();
-    c->reader = redisReaderCreate();
-
-    if (c->obuf == NULL || c->reader == NULL) {
-        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-        return REDIS_ERR;
-    }
-
-    int ret = REDIS_ERR;
-    if (c->connection_type == REDIS_CONN_TCP) {
-        ret = redisContextConnectBindTcp(c, c->tcp.host, c->tcp.port,
-               c->connect_timeout, c->tcp.source_addr);
-    } else if (c->connection_type == REDIS_CONN_UNIX) {
-        ret = redisContextConnectUnix(c, c->unix_sock.path, c->connect_timeout);
-    } else {
-        /* Something bad happened here and shouldn't have. There isn't
-           enough information in the context to reconnect. */
-        __redisSetError(c,REDIS_ERR_OTHER,"Not enough information to reconnect");
-        ret = REDIS_ERR;
-    }
-
-    if (c->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
-        redisContextSetTimeout(c, *c->command_timeout);
-    }
-
-    return ret;
-}
-
-redisContext *redisConnectWithOptions(const redisOptions *options) {
-    redisContext *c = redisContextInit();
-    if (c == NULL) {
-        return NULL;
-    }
-    if (!(options->options & REDIS_OPT_NONBLOCK)) {
-        c->flags |= REDIS_BLOCK;
-    }
-    if (options->options & REDIS_OPT_REUSEADDR) {
-        c->flags |= REDIS_REUSEADDR;
-    }
-    if (options->options & REDIS_OPT_NOAUTOFREE) {
-        c->flags |= REDIS_NO_AUTO_FREE;
-    }
-
-    /* Set any user supplied RESP3 PUSH handler or use freeReplyObject
-     * as a default unless specifically flagged that we don't want one. */
-    if (options->push_cb != NULL)
-        redisSetPushCallback(c, options->push_cb);
-    else if (!(options->options & REDIS_OPT_NO_PUSH_AUTOFREE))
-        redisSetPushCallback(c, redisPushAutoFree);
-
-    c->privdata = options->privdata;
-    c->free_privdata = options->free_privdata;
-
-    if (redisContextUpdateConnectTimeout(c, options->connect_timeout) != REDIS_OK ||
-        redisContextUpdateCommandTimeout(c, options->command_timeout) != REDIS_OK) {
-        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-        return c;
-    }
-
-    if (options->type == REDIS_CONN_TCP) {
-        redisContextConnectBindTcp(c, options->endpoint.tcp.ip,
-                                   options->endpoint.tcp.port, options->connect_timeout,
-                                   options->endpoint.tcp.source_addr);
-    } else if (options->type == REDIS_CONN_UNIX) {
-        redisContextConnectUnix(c, options->endpoint.unix_socket,
-                                options->connect_timeout);
-    } else if (options->type == REDIS_CONN_USERFD) {
-        c->fd = options->endpoint.fd;
-        c->flags |= REDIS_CONNECTED;
-    } else {
-        // Unknown type - FIXME - FREE
-        return NULL;
-    }
-
-    if (options->command_timeout != NULL && (c->flags & REDIS_BLOCK) && c->fd != REDIS_INVALID_FD) {
-        redisContextSetTimeout(c, *options->command_timeout);
-    }
-
-    return c;
-}
-
-/* Connect to a Redis instance. On error the field error in the returned
- * context will be set to the return value of the error function.
- * When no set of reply functions is given, the default set will be used. */
-redisContext *redisConnect(const char *ip, int port) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.connect_timeout = &tv;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectNonBlock(const char *ip, int port) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.options |= REDIS_OPT_NONBLOCK;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.endpoint.tcp.source_addr = source_addr;
-    options.options |= REDIS_OPT_NONBLOCK;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, ip, port);
-    options.endpoint.tcp.source_addr = source_addr;
-    options.options |= REDIS_OPT_NONBLOCK|REDIS_OPT_REUSEADDR;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectUnix(const char *path) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_UNIX(&options, path);
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_UNIX(&options, path);
-    options.connect_timeout = &tv;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectUnixNonBlock(const char *path) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_UNIX(&options, path);
-    options.options |= REDIS_OPT_NONBLOCK;
-    return redisConnectWithOptions(&options);
-}
-
-redisContext *redisConnectFd(redisFD fd) {
-    redisOptions options = {0};
-    options.type = REDIS_CONN_USERFD;
-    options.endpoint.fd = fd;
-    return redisConnectWithOptions(&options);
-}
-
-/* Set read/write timeout on a blocking socket. */
-int redisSetTimeout(redisContext *c, const struct timeval tv) {
-    if (c->flags & REDIS_BLOCK)
-        return redisContextSetTimeout(c,tv);
-    return REDIS_ERR;
-}
-
-/* Enable connection KeepAlive. */
-int redisEnableKeepAlive(redisContext *c) {
-    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
-        return REDIS_ERR;
-    return REDIS_OK;
-}
-
-/* Set a user provided RESP3 PUSH handler and return any old one set. */
-redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn) {
-    redisPushFn *old = c->push_cb;
-    c->push_cb = fn;
-    return old;
-}
-
-/* Use this function to handle a read event on the descriptor. It will try
- * and read some bytes from the socket and feed them to the reply parser.
- *
- * After this function is called, you may use redisGetReplyFromReader to
- * see if there is a reply available. */
-int redisBufferRead(redisContext *c) {
-    char buf[1024*16];
-    int nread;
-
-    /* Return early when the context has seen an error. */
-    if (c->err)
-        return REDIS_ERR;
-
-    nread = c->funcs->read(c, buf, sizeof(buf));
-    if (nread > 0) {
-        if (redisReaderFeed(c->reader, buf, nread) != REDIS_OK) {
-            __redisSetError(c, c->reader->err, c->reader->errstr);
-            return REDIS_ERR;
-        } else {
-        }
-    } else if (nread < 0) {
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-/* Write the output buffer to the socket.
- *
- * Returns REDIS_OK when the buffer is empty, or (a part of) the buffer was
- * successfully written to the socket. When the buffer is empty after the
- * write operation, "done" is set to 1 (if given).
- *
- * Returns REDIS_ERR if an error occurred trying to write and sets
- * c->errstr to hold the appropriate error string.
- */
-int redisBufferWrite(redisContext *c, int *done) {
-
-    /* Return early when the context has seen an error. */
-    if (c->err)
-        return REDIS_ERR;
-
-    if (sdslen(c->obuf) > 0) {
-        ssize_t nwritten = c->funcs->write(c);
-        if (nwritten < 0) {
-            return REDIS_ERR;
-        } else if (nwritten > 0) {
-            if (nwritten == (ssize_t)sdslen(c->obuf)) {
-                sdsfree(c->obuf);
-                c->obuf = sdsempty();
-                if (c->obuf == NULL)
-                    goto oom;
-            } else {
-                if (sdsrange(c->obuf,nwritten,-1) < 0) goto oom;
-            }
-        }
-    }
-    if (done != NULL) *done = (sdslen(c->obuf) == 0);
-    return REDIS_OK;
-
-oom:
-    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
-}
-
-/* Internal helper function to try and get a reply from the reader,
- * or set an error in the context otherwise. */
-int redisGetReplyFromReader(redisContext *c, void **reply) {
-    if (redisReaderGetReply(c->reader,reply) == REDIS_ERR) {
-        __redisSetError(c,c->reader->err,c->reader->errstr);
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-/* Internal helper that returns 1 if the reply was a RESP3 PUSH
- * message and we handled it with a user-provided callback. */
-static int redisHandledPushReply(redisContext *c, void *reply) {
-    if (reply && c->push_cb && redisIsPushReply(reply)) {
-        c->push_cb(c->privdata, reply);
-        return 1;
-    }
-
-    return 0;
-}
-
-int redisGetReply(redisContext *c, void **reply) {
-    int wdone = 0;
-    void *aux = NULL;
-
-    /* Try to read pending replies */
-    if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-        return REDIS_ERR;
-
-    /* For the blocking context, flush output buffer and read reply */
-    if (aux == NULL && c->flags & REDIS_BLOCK) {
-        /* Write until done */
-        do {
-            if (redisBufferWrite(c,&wdone) == REDIS_ERR)
-                return REDIS_ERR;
-        } while (!wdone);
-
-        /* Read until there is a reply */
-        do {
-            if (redisBufferRead(c) == REDIS_ERR)
-                return REDIS_ERR;
-
-            /* We loop here in case the user has specified a RESP3
-             * PUSH handler (e.g. for client tracking). */
-            do {
-                if (redisGetReplyFromReader(c,&aux) == REDIS_ERR)
-                    return REDIS_ERR;
-            } while (redisHandledPushReply(c, aux));
-        } while (aux == NULL);
-    }
-
-    /* Set reply or free it if we were passed NULL */
-    if (reply != NULL) {
-        *reply = aux;
-    } else {
-        freeReplyObject(aux);
-    }
-
-    return REDIS_OK;
-}
-
-
-/* Helper function for the redisAppendCommand* family of functions.
- *
- * Write a formatted command to the output buffer. When this family
- * is used, you need to call redisGetReply yourself to retrieve
- * the reply (or replies in pub/sub).
- */
-int __redisAppendCommand(redisContext *c, const char *cmd, size_t len) {
-    sds newbuf;
-
-    newbuf = sdscatlen(c->obuf,cmd,len);
-    if (newbuf == NULL) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    }
-
-    c->obuf = newbuf;
-    return REDIS_OK;
-}
-
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len) {
-
-    if (__redisAppendCommand(c, cmd, len) != REDIS_OK) {
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap) {
-    char *cmd;
-    int len;
-
-    len = redisvFormatCommand(&cmd,format,ap);
-    if (len == -1) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    } else if (len == -2) {
-        __redisSetError(c,REDIS_ERR_OTHER,"Invalid format string");
-        return REDIS_ERR;
-    }
-
-    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        hi_free(cmd);
-        return REDIS_ERR;
-    }
-
-    hi_free(cmd);
-    return REDIS_OK;
-}
-
-int redisAppendCommand(redisContext *c, const char *format, ...) {
-    va_list ap;
-    int ret;
-
-    va_start(ap,format);
-    ret = redisvAppendCommand(c,format,ap);
-    va_end(ap);
-    return ret;
-}
-
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
-    sds cmd;
-    int len;
-
-    len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
-    if (len == -1) {
-        __redisSetError(c,REDIS_ERR_OOM,"Out of memory");
-        return REDIS_ERR;
-    }
-
-    if (__redisAppendCommand(c,cmd,len) != REDIS_OK) {
-        sdsfree(cmd);
-        return REDIS_ERR;
-    }
-
-    sdsfree(cmd);
-    return REDIS_OK;
-}
-
-/* Helper function for the redisCommand* family of functions.
- *
- * Write a formatted command to the output buffer. If the given context is
- * blocking, immediately read the reply into the "reply" pointer. When the
- * context is non-blocking, the "reply" pointer will not be used and the
- * command is simply appended to the write buffer.
- *
- * Returns the reply when a reply was successfully retrieved. Returns NULL
- * otherwise. When NULL is returned in a blocking context, the error field
- * in the context will be set.
- */
-static void *__redisBlockForReply(redisContext *c) {
-    void *reply;
-
-    if (c->flags & REDIS_BLOCK) {
-        if (redisGetReply(c,&reply) != REDIS_OK)
-            return NULL;
-        return reply;
-    }
-    return NULL;
-}
-
-void *redisvCommand(redisContext *c, const char *format, va_list ap) {
-    if (redisvAppendCommand(c,format,ap) != REDIS_OK)
-        return NULL;
-    return __redisBlockForReply(c);
-}
-
-void *redisCommand(redisContext *c, const char *format, ...) {
-    va_list ap;
-    va_start(ap,format);
-    void *reply = redisvCommand(c,format,ap);
-    va_end(ap);
-    return reply;
-}
-
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen) {
-    if (redisAppendCommandArgv(c,argc,argv,argvlen) != REDIS_OK)
-        return NULL;
-    return __redisBlockForReply(c);
-}
diff --git a/ext/hiredis-1.0.2/hiredis.h b/ext/hiredis-1.0.2/hiredis.h
deleted file mode 100644
index 3bc46d992..000000000
--- a/ext/hiredis-1.0.2/hiredis.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_H
-#define __HIREDIS_H
-#include "read.h"
-#include <stdarg.h> /* for va_list */
-#ifndef _MSC_VER
-#include <sys/time.h> /* for struct timeval */
-#else
-struct timeval; /* forward declaration */
-typedef long long ssize_t;
-#endif
-#include <stdint.h> /* uintXX_t, etc */
-#include "sds.h" /* for sds */
-#include "alloc.h" /* for allocation wrappers */
-
-#define HIREDIS_MAJOR 1
-#define HIREDIS_MINOR 0
-#define HIREDIS_PATCH 2
-#define HIREDIS_SONAME 1.0.0
-
-/* Connection type can be blocking or non-blocking and is set in the
- * least significant bit of the flags field in redisContext. */
-#define REDIS_BLOCK 0x1
-
-/* Connection may be disconnected before being free'd. The second bit
- * in the flags field is set when the context is connected. */
-#define REDIS_CONNECTED 0x2
-
-/* The async API might try to disconnect cleanly and flush the output
- * buffer and read all subsequent replies before disconnecting.
- * This flag means no new commands can come in and the connection
- * should be terminated once all replies have been read. */
-#define REDIS_DISCONNECTING 0x4
-
-/* Flag specific to the async API which means that the context should be clean
- * up as soon as possible. */
-#define REDIS_FREEING 0x8
-
-/* Flag that is set when an async callback is executed. */
-#define REDIS_IN_CALLBACK 0x10
-
-/* Flag that is set when the async context has one or more subscriptions. */
-#define REDIS_SUBSCRIBED 0x20
-
-/* Flag that is set when monitor mode is active */
-#define REDIS_MONITORING 0x40
-
-/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
-#define REDIS_REUSEADDR 0x80
-
-/**
- * Flag that indicates the user does not want the context to
- * be automatically freed upon error
- */
-#define REDIS_NO_AUTO_FREE 0x200
-
-#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
-
-/* number of times we retry to connect in the case of EADDRNOTAVAIL and
- * SO_REUSEADDR is being used. */
-#define REDIS_CONNECT_RETRIES  10
-
-/* Forward declarations for structs defined elsewhere */
-struct redisAsyncContext;
-struct redisContext;
-
-/* RESP3 push helpers and callback prototypes */
-#define redisIsPushReply(r) (((redisReply*)(r))->type == REDIS_REPLY_PUSH)
-typedef void (redisPushFn)(void *, void *);
-typedef void (redisAsyncPushFn)(struct redisAsyncContext *, void *);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the reply object returned by redisCommand() */
-typedef struct redisReply {
-    int type; /* REDIS_REPLY_* */
-    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
-    double dval; /* The double when type is REDIS_REPLY_DOUBLE */
-    size_t len; /* Length of string */
-    char *str; /* Used for REDIS_REPLY_ERROR, REDIS_REPLY_STRING
-                  REDIS_REPLY_VERB, and REDIS_REPLY_DOUBLE (in additional to dval). */
-    char vtype[4]; /* Used for REDIS_REPLY_VERB, contains the null
-                      terminated 3 character content type, such as "txt". */
-    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
-    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
-} redisReply;
-
-redisReader *redisReaderCreate(void);
-
-/* Function to free the reply objects hiredis returns by default. */
-void freeReplyObject(void *reply);
-
-/* Functions to format a command according to the protocol. */
-int redisvFormatCommand(char **target, const char *format, va_list ap);
-int redisFormatCommand(char **target, const char *format, ...);
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
-int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
-void redisFreeCommand(char *cmd);
-void redisFreeSdsCommand(sds cmd);
-
-enum redisConnectionType {
-    REDIS_CONN_TCP,
-    REDIS_CONN_UNIX,
-    REDIS_CONN_USERFD
-};
-
-struct redisSsl;
-
-#define REDIS_OPT_NONBLOCK 0x01
-#define REDIS_OPT_REUSEADDR 0x02
-
-/**
- * Don't automatically free the async object on a connection failure,
- * or other implicit conditions. Only free on an explicit call to disconnect() or free()
- */
-#define REDIS_OPT_NOAUTOFREE 0x04
-
-/* Don't automatically intercept and free RESP3 PUSH replies. */
-#define REDIS_OPT_NO_PUSH_AUTOFREE 0x08
-
-/* In Unix systems a file descriptor is a regular signed int, with -1
- * representing an invalid descriptor. In Windows it is a SOCKET
- * (32- or 64-bit unsigned integer depending on the architecture), where
- * all bits set (~0) is INVALID_SOCKET.  */
-#ifndef _WIN32
-typedef int redisFD;
-#define REDIS_INVALID_FD -1
-#else
-#ifdef _WIN64
-typedef unsigned long long redisFD; /* SOCKET = 64-bit UINT_PTR */
-#else
-typedef unsigned long redisFD;      /* SOCKET = 32-bit UINT_PTR */
-#endif
-#define REDIS_INVALID_FD ((redisFD)(~0)) /* INVALID_SOCKET */
-#endif
-
-typedef struct {
-    /*
-     * the type of connection to use. This also indicates which
-     * `endpoint` member field to use
-     */
-    int type;
-    /* bit field of REDIS_OPT_xxx */
-    int options;
-    /* timeout value for connect operation. If NULL, no timeout is used */
-    const struct timeval *connect_timeout;
-    /* timeout value for commands. If NULL, no timeout is used.  This can be
-     * updated at runtime with redisSetTimeout/redisAsyncSetTimeout. */
-    const struct timeval *command_timeout;
-    union {
-        /** use this field for tcp/ip connections */
-        struct {
-            const char *source_addr;
-            const char *ip;
-            int port;
-        } tcp;
-        /** use this field for unix domain sockets */
-        const char *unix_socket;
-        /**
-         * use this field to have hiredis operate an already-open
-         * file descriptor */
-        redisFD fd;
-    } endpoint;
-
-    /* Optional user defined data/destructor */
-    void *privdata;
-    void (*free_privdata)(void *);
-
-    /* A user defined PUSH message callback */
-    redisPushFn *push_cb;
-    redisAsyncPushFn *async_push_cb;
-} redisOptions;
-
-/**
- * Helper macros to initialize options to their specified fields.
- */
-#define REDIS_OPTIONS_SET_TCP(opts, ip_, port_) \
-    (opts)->type = REDIS_CONN_TCP; \
-    (opts)->endpoint.tcp.ip = ip_; \
-    (opts)->endpoint.tcp.port = port_;
-
-#define REDIS_OPTIONS_SET_UNIX(opts, path) \
-    (opts)->type = REDIS_CONN_UNIX;        \
-    (opts)->endpoint.unix_socket = path;
-
-#define REDIS_OPTIONS_SET_PRIVDATA(opts, data, dtor) \
-    (opts)->privdata = data;                         \
-    (opts)->free_privdata = dtor;                    \
-
-typedef struct redisContextFuncs {
-    void (*free_privctx)(void *);
-    void (*async_read)(struct redisAsyncContext *);
-    void (*async_write)(struct redisAsyncContext *);
-    ssize_t (*read)(struct redisContext *, char *, size_t);
-    ssize_t (*write)(struct redisContext *);
-} redisContextFuncs;
-
-/* Context for a connection to Redis */
-typedef struct redisContext {
-    const redisContextFuncs *funcs;   /* Function table */
-
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-    redisFD fd;
-    int flags;
-    char *obuf; /* Write buffer */
-    redisReader *reader; /* Protocol reader */
-
-    enum redisConnectionType connection_type;
-    struct timeval *connect_timeout;
-    struct timeval *command_timeout;
-
-    struct {
-        char *host;
-        char *source_addr;
-        int port;
-    } tcp;
-
-    struct {
-        char *path;
-    } unix_sock;
-
-    /* For non-blocking connect */
-    struct sockadr *saddr;
-    size_t addrlen;
-
-    /* Optional data and corresponding destructor users can use to provide
-     * context to a given redisContext.  Not used by hiredis. */
-    void *privdata;
-    void (*free_privdata)(void *);
-
-    /* Internal context pointer presently used by hiredis to manage
-     * SSL connections. */
-    void *privctx;
-
-    /* An optional RESP3 PUSH handler */
-    redisPushFn *push_cb;
-} redisContext;
-
-redisContext *redisConnectWithOptions(const redisOptions *options);
-redisContext *redisConnect(const char *ip, int port);
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
-redisContext *redisConnectNonBlock(const char *ip, int port);
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr);
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr);
-redisContext *redisConnectUnix(const char *path);
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
-redisContext *redisConnectUnixNonBlock(const char *path);
-redisContext *redisConnectFd(redisFD fd);
-
-/**
- * Reconnect the given context using the saved information.
- *
- * This re-uses the exact same connect options as in the initial connection.
- * host, ip (or path), timeout and bind address are reused,
- * flags are used unmodified from the existing context.
- *
- * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
- */
-int redisReconnect(redisContext *c);
-
-redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn);
-int redisSetTimeout(redisContext *c, const struct timeval tv);
-int redisEnableKeepAlive(redisContext *c);
-void redisFree(redisContext *c);
-redisFD redisFreeKeepFd(redisContext *c);
-int redisBufferRead(redisContext *c);
-int redisBufferWrite(redisContext *c, int *done);
-
-/* In a blocking context, this function first checks if there are unconsumed
- * replies to return and returns one if so. Otherwise, it flushes the output
- * buffer to the socket and reads until it has a reply. In a non-blocking
- * context, it will return unconsumed replies until there are no more. */
-int redisGetReply(redisContext *c, void **reply);
-int redisGetReplyFromReader(redisContext *c, void **reply);
-
-/* Write a formatted command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
-
-/* Write a command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
-int redisAppendCommand(redisContext *c, const char *format, ...);
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-/* Issue a command to Redis. In a blocking context, it is identical to calling
- * redisAppendCommand, followed by redisGetReply. The function will return
- * NULL if there was an error in performing the request, otherwise it will
- * return the reply. In a non-blocking context, it is identical to calling
- * only redisAppendCommand and will always return NULL. */
-void *redisvCommand(redisContext *c, const char *format, va_list ap);
-void *redisCommand(redisContext *c, const char *format, ...);
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/hiredis.pc.in b/ext/hiredis-1.0.2/hiredis.pc.in
deleted file mode 100644
index 91b773183..000000000
--- a/ext/hiredis-1.0.2/hiredis.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-install_libdir=@CMAKE_INSTALL_LIBDIR@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/${install_libdir}
-includedir=${prefix}/include
-pkgincludedir=${includedir}/hiredis
-
-Name: hiredis
-Description: Minimalistic C client library for Redis.
-Version: @PROJECT_VERSION@
-Libs: -L${libdir} -lhiredis
-Cflags: -I${pkgincludedir} -D_FILE_OFFSET_BITS=64
diff --git a/ext/hiredis-1.0.2/hiredis_ssl-config.cmake.in b/ext/hiredis-1.0.2/hiredis_ssl-config.cmake.in
deleted file mode 100644
index 9a283dfc2..000000000
--- a/ext/hiredis-1.0.2/hiredis_ssl-config.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-@PACKAGE_INIT@
-
-set_and_check(hiredis_ssl_INCLUDEDIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-
-IF (NOT TARGET hiredis::hiredis_ssl)
-	INCLUDE(${CMAKE_CURRENT_LIST_DIR}/hiredis_ssl-targets.cmake)
-ENDIF()
-
-SET(hiredis_ssl_LIBRARIES hiredis::hiredis_ssl)
-SET(hiredis_ssl_INCLUDE_DIRS ${hiredis_ssl_INCLUDEDIR})
-
-check_required_components(hiredis_ssl)
-
diff --git a/ext/hiredis-1.0.2/hiredis_ssl.h b/ext/hiredis-1.0.2/hiredis_ssl.h
deleted file mode 100644
index 604efe0c1..000000000
--- a/ext/hiredis-1.0.2/hiredis_ssl.h
+++ /dev/null
@@ -1,127 +0,0 @@
-
-/*
- * Copyright (c) 2019, Redis Labs
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_SSL_H
-#define __HIREDIS_SSL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the underlying struct for SSL in ssl.h, which is not included to
- * keep build dependencies short here.
- */
-struct ssl_st;
-
-/* A wrapper around OpenSSL SSL_CTX to allow easy SSL use without directly
- * calling OpenSSL.
- */
-typedef struct redisSSLContext redisSSLContext;
-
-/**
- * Initialization errors that redisCreateSSLContext() may return.
- */
-
-typedef enum {
-    REDIS_SSL_CTX_NONE = 0,                     /* No Error */
-    REDIS_SSL_CTX_CREATE_FAILED,                /* Failed to create OpenSSL SSL_CTX */
-    REDIS_SSL_CTX_CERT_KEY_REQUIRED,            /* Client cert and key must both be specified or skipped */
-    REDIS_SSL_CTX_CA_CERT_LOAD_FAILED,          /* Failed to load CA Certificate or CA Path */
-    REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED,      /* Failed to load client certificate */
-    REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED       /* Failed to load private key */
-} redisSSLContextError;
-
-/**
- * Return the error message corresponding with the specified error code.
- */
-
-const char *redisSSLContextGetError(redisSSLContextError error);
-
-/**
- * Helper function to initialize the OpenSSL library.
- *
- * OpenSSL requires one-time initialization before it can be used. Callers should
- * call this function only once, and only if OpenSSL is not directly initialized
- * elsewhere.
- */
-int redisInitOpenSSL(void);
-
-/**
- * Helper function to initialize an OpenSSL context that can be used
- * to initiate SSL connections.
- *
- * cacert_filename is an optional name of a CA certificate/bundle file to load
- * and use for validation.
- *
- * capath is an optional directory path where trusted CA certificate files are
- * stored in an OpenSSL-compatible structure.
- *
- * cert_filename and private_key_filename are optional names of a client side
- * certificate and private key files to use for authentication. They need to
- * be both specified or omitted.
- *
- * server_name is an optional and will be used as a server name indication
- * (SNI) TLS extension.
- *
- * If error is non-null, it will be populated in case the context creation fails
- * (returning a NULL).
- */
-
-redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
-        const char *cert_filename, const char *private_key_filename,
-        const char *server_name, redisSSLContextError *error);
-
-/**
- * Free a previously created OpenSSL context.
- */
-void redisFreeSSLContext(redisSSLContext *redis_ssl_ctx);
-
-/**
- * Initiate SSL on an existing redisContext.
- *
- * This is similar to redisInitiateSSL() but does not require the caller
- * to directly interact with OpenSSL, and instead uses a redisSSLContext
- * previously created using redisCreateSSLContext().
- */
-
-int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx);
-
-/**
- * Initiate SSL/TLS negotiation on a provided OpenSSL SSL object.
- */
-
-int redisInitiateSSL(redisContext *c, struct ssl_st *ssl);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __HIREDIS_SSL_H */
diff --git a/ext/hiredis-1.0.2/hiredis_ssl.pc.in b/ext/hiredis-1.0.2/hiredis_ssl.pc.in
deleted file mode 100644
index 588a978a5..000000000
--- a/ext/hiredis-1.0.2/hiredis_ssl.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-pkgincludedir=${includedir}/hiredis
-
-Name: hiredis_ssl
-Description: SSL Support for hiredis.
-Version: @PROJECT_VERSION@
-Requires: hiredis
-Libs: -L${libdir} -lhiredis_ssl
-Libs.private: -lssl -lcrypto
diff --git a/ext/hiredis-1.0.2/include/hiredis/alloc.h b/ext/hiredis-1.0.2/include/hiredis/alloc.h
deleted file mode 100644
index 34a05f49f..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/alloc.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef HIREDIS_ALLOC_H
-#define HIREDIS_ALLOC_H
-
-#include <stddef.h> /* for size_t */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Structure pointing to our actually configured allocators */
-typedef struct hiredisAllocFuncs {
-    void *(*mallocFn)(size_t);
-    void *(*callocFn)(size_t,size_t);
-    void *(*reallocFn)(void*,size_t);
-    char *(*strdupFn)(const char*);
-    void (*freeFn)(void*);
-} hiredisAllocFuncs;
-
-hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *ha);
-void hiredisResetAllocators(void);
-
-#ifndef _WIN32
-
-/* Hiredis' configured allocator function pointer struct */
-extern hiredisAllocFuncs hiredisAllocFns;
-
-static inline void *hi_malloc(size_t size) {
-    return hiredisAllocFns.mallocFn(size);
-}
-
-static inline void *hi_calloc(size_t nmemb, size_t size) {
-    return hiredisAllocFns.callocFn(nmemb, size);
-}
-
-static inline void *hi_realloc(void *ptr, size_t size) {
-    return hiredisAllocFns.reallocFn(ptr, size);
-}
-
-static inline char *hi_strdup(const char *str) {
-    return hiredisAllocFns.strdupFn(str);
-}
-
-static inline void hi_free(void *ptr) {
-    hiredisAllocFns.freeFn(ptr);
-}
-
-#else
-
-void *hi_malloc(size_t size);
-void *hi_calloc(size_t nmemb, size_t size);
-void *hi_realloc(void *ptr, size_t size);
-char *hi_strdup(const char *str);
-void hi_free(void *ptr);
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HIREDIS_ALLOC_H */
diff --git a/ext/hiredis-1.0.2/include/hiredis/async.h b/ext/hiredis-1.0.2/include/hiredis/async.h
deleted file mode 100644
index b1d2cb263..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/async.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_H
-#define __HIREDIS_ASYNC_H
-#include "hiredis.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
-struct dict; /* dictionary header is included in async.c */
-
-/* Reply callback prototype and container */
-typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
-typedef struct redisCallback {
-    struct redisCallback *next; /* simple singly linked list */
-    redisCallbackFn *fn;
-    int pending_subs;
-    void *privdata;
-} redisCallback;
-
-/* List of callbacks for either regular replies or pub/sub */
-typedef struct redisCallbackList {
-    redisCallback *head, *tail;
-} redisCallbackList;
-
-/* Connection callback prototypes */
-typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
-typedef void (redisConnectCallback)(const struct redisAsyncContext*, int status);
-typedef void(redisTimerCallback)(void *timer, void *privdata);
-
-/* Context for an async connection to Redis */
-typedef struct redisAsyncContext {
-    /* Hold the regular context, so it can be realloc'ed. */
-    redisContext c;
-
-    /* Setup error flags so they can be used directly. */
-    int err;
-    char *errstr;
-
-    /* Not used by hiredis */
-    void *data;
-    void (*dataCleanup)(void *privdata);
-
-    /* Event library data and hooks */
-    struct {
-        void *data;
-
-        /* Hooks that are called when the library expects to start
-         * reading/writing. These functions should be idempotent. */
-        void (*addRead)(void *privdata);
-        void (*delRead)(void *privdata);
-        void (*addWrite)(void *privdata);
-        void (*delWrite)(void *privdata);
-        void (*cleanup)(void *privdata);
-        void (*scheduleTimer)(void *privdata, struct timeval tv);
-    } ev;
-
-    /* Called when either the connection is terminated due to an error or per
-     * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
-    redisDisconnectCallback *onDisconnect;
-
-    /* Called when the first write event was received. */
-    redisConnectCallback *onConnect;
-
-    /* Regular command callbacks */
-    redisCallbackList replies;
-
-    /* Address used for connect() */
-    struct sockaddr *saddr;
-    size_t addrlen;
-
-    /* Subscription callbacks */
-    struct {
-        redisCallbackList invalid;
-        struct dict *channels;
-        struct dict *patterns;
-    } sub;
-
-    /* Any configured RESP3 PUSH handler */
-    redisAsyncPushFn *push_cb;
-} redisAsyncContext;
-
-/* Functions that proxy to hiredis */
-redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options);
-redisAsyncContext *redisAsyncConnect(const char *ip, int port);
-redisAsyncContext *redisAsyncConnectBind(const char *ip, int port, const char *source_addr);
-redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
-                                                  const char *source_addr);
-redisAsyncContext *redisAsyncConnectUnix(const char *path);
-int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);
-int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
-
-redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn);
-int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv);
-void redisAsyncDisconnect(redisAsyncContext *ac);
-void redisAsyncFree(redisAsyncContext *ac);
-
-/* Handle read/write events */
-void redisAsyncHandleRead(redisAsyncContext *ac);
-void redisAsyncHandleWrite(redisAsyncContext *ac);
-void redisAsyncHandleTimeout(redisAsyncContext *ac);
-void redisAsyncRead(redisAsyncContext *ac);
-void redisAsyncWrite(redisAsyncContext *ac);
-
-/* Command functions for an async context. Write the command to the
- * output buffer and register the provided callback. */
-int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
-int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
-int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
-int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/include/hiredis/async_private.h b/ext/hiredis-1.0.2/include/hiredis/async_private.h
deleted file mode 100644
index b9d23fffd..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/async_private.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_ASYNC_PRIVATE_H
-#define __HIREDIS_ASYNC_PRIVATE_H
-
-#define _EL_ADD_READ(ctx)                                         \
-    do {                                                          \
-        refreshTimeout(ctx);                                      \
-        if ((ctx)->ev.addRead) (ctx)->ev.addRead((ctx)->ev.data); \
-    } while (0)
-#define _EL_DEL_READ(ctx) do { \
-        if ((ctx)->ev.delRead) (ctx)->ev.delRead((ctx)->ev.data); \
-    } while(0)
-#define _EL_ADD_WRITE(ctx)                                          \
-    do {                                                            \
-        refreshTimeout(ctx);                                        \
-        if ((ctx)->ev.addWrite) (ctx)->ev.addWrite((ctx)->ev.data); \
-    } while (0)
-#define _EL_DEL_WRITE(ctx) do { \
-        if ((ctx)->ev.delWrite) (ctx)->ev.delWrite((ctx)->ev.data); \
-    } while(0)
-#define _EL_CLEANUP(ctx) do { \
-        if ((ctx)->ev.cleanup) (ctx)->ev.cleanup((ctx)->ev.data); \
-        ctx->ev.cleanup = NULL; \
-    } while(0);
-
-static inline void refreshTimeout(redisAsyncContext *ctx) {
-    #define REDIS_TIMER_ISSET(tvp) \
-        (tvp && ((tvp)->tv_sec || (tvp)->tv_usec))
-
-    #define REDIS_EL_TIMER(ac, tvp) \
-        if ((ac)->ev.scheduleTimer && REDIS_TIMER_ISSET(tvp)) { \
-            (ac)->ev.scheduleTimer((ac)->ev.data, *(tvp)); \
-        }
-
-    if (ctx->c.flags & REDIS_CONNECTED) {
-        REDIS_EL_TIMER(ctx, ctx->c.command_timeout);
-    } else {
-        REDIS_EL_TIMER(ctx, ctx->c.connect_timeout);
-    }
-}
-
-void __redisAsyncDisconnect(redisAsyncContext *ac);
-void redisProcessCallbacks(redisAsyncContext *ac);
-
-#endif  /* __HIREDIS_ASYNC_PRIVATE_H */
diff --git a/ext/hiredis-1.0.2/include/hiredis/dict.h b/ext/hiredis-1.0.2/include/hiredis/dict.h
deleted file mode 100644
index 95fcd280e..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/dict.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Hash table implementation.
- *
- * This file implements in memory hash tables with insert/del/replace/find/
- * get-random-element operations. Hash tables will auto resize if needed
- * tables of power of two in size are used, collisions are handled by
- * chaining. See the source code for more information... :)
- *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __DICT_H
-#define __DICT_H
-
-#define DICT_OK 0
-#define DICT_ERR 1
-
-/* Unused arguments generate annoying warnings... */
-#define DICT_NOTUSED(V) ((void) V)
-
-typedef struct dictEntry {
-    void *key;
-    void *val;
-    struct dictEntry *next;
-} dictEntry;
-
-typedef struct dictType {
-    unsigned int (*hashFunction)(const void *key);
-    void *(*keyDup)(void *privdata, const void *key);
-    void *(*valDup)(void *privdata, const void *obj);
-    int (*keyCompare)(void *privdata, const void *key1, const void *key2);
-    void (*keyDestructor)(void *privdata, void *key);
-    void (*valDestructor)(void *privdata, void *obj);
-} dictType;
-
-typedef struct dict {
-    dictEntry **table;
-    dictType *type;
-    unsigned long size;
-    unsigned long sizemask;
-    unsigned long used;
-    void *privdata;
-} dict;
-
-typedef struct dictIterator {
-    dict *ht;
-    int index;
-    dictEntry *entry, *nextEntry;
-} dictIterator;
-
-/* This is the initial size of every hash table */
-#define DICT_HT_INITIAL_SIZE     4
-
-/* ------------------------------- Macros ------------------------------------*/
-#define dictFreeEntryVal(ht, entry) \
-    if ((ht)->type->valDestructor) \
-        (ht)->type->valDestructor((ht)->privdata, (entry)->val)
-
-#define dictSetHashVal(ht, entry, _val_) do { \
-    if ((ht)->type->valDup) \
-        entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
-    else \
-        entry->val = (_val_); \
-} while(0)
-
-#define dictFreeEntryKey(ht, entry) \
-    if ((ht)->type->keyDestructor) \
-        (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
-
-#define dictSetHashKey(ht, entry, _key_) do { \
-    if ((ht)->type->keyDup) \
-        entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
-    else \
-        entry->key = (_key_); \
-} while(0)
-
-#define dictCompareHashKeys(ht, key1, key2) \
-    (((ht)->type->keyCompare) ? \
-        (ht)->type->keyCompare((ht)->privdata, key1, key2) : \
-        (key1) == (key2))
-
-#define dictHashKey(ht, key) (ht)->type->hashFunction(key)
-
-#define dictGetEntryKey(he) ((he)->key)
-#define dictGetEntryVal(he) ((he)->val)
-#define dictSlots(ht) ((ht)->size)
-#define dictSize(ht) ((ht)->used)
-
-/* API */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
-static dict *dictCreate(dictType *type, void *privDataPtr);
-static int dictExpand(dict *ht, unsigned long size);
-static int dictAdd(dict *ht, void *key, void *val);
-static int dictReplace(dict *ht, void *key, void *val);
-static int dictDelete(dict *ht, const void *key);
-static void dictRelease(dict *ht);
-static dictEntry * dictFind(dict *ht, const void *key);
-static dictIterator *dictGetIterator(dict *ht);
-static dictEntry *dictNext(dictIterator *iter);
-static void dictReleaseIterator(dictIterator *iter);
-
-#endif /* __DICT_H */
diff --git a/ext/hiredis-1.0.2/include/hiredis/fmacros.h b/ext/hiredis-1.0.2/include/hiredis/fmacros.h
deleted file mode 100644
index 3227faafd..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/fmacros.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __HIREDIS_FMACRO_H
-#define __HIREDIS_FMACRO_H
-
-#define _XOPEN_SOURCE 600
-#define _POSIX_C_SOURCE 200112L
-
-#if defined(__APPLE__) && defined(__MACH__)
-/* Enable TCP_KEEPALIVE */
-#define _DARWIN_C_SOURCE
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/include/hiredis/hiredis.h b/ext/hiredis-1.0.2/include/hiredis/hiredis.h
deleted file mode 100644
index 3bc46d992..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/hiredis.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_H
-#define __HIREDIS_H
-#include "read.h"
-#include <stdarg.h> /* for va_list */
-#ifndef _MSC_VER
-#include <sys/time.h> /* for struct timeval */
-#else
-struct timeval; /* forward declaration */
-typedef long long ssize_t;
-#endif
-#include <stdint.h> /* uintXX_t, etc */
-#include "sds.h" /* for sds */
-#include "alloc.h" /* for allocation wrappers */
-
-#define HIREDIS_MAJOR 1
-#define HIREDIS_MINOR 0
-#define HIREDIS_PATCH 2
-#define HIREDIS_SONAME 1.0.0
-
-/* Connection type can be blocking or non-blocking and is set in the
- * least significant bit of the flags field in redisContext. */
-#define REDIS_BLOCK 0x1
-
-/* Connection may be disconnected before being free'd. The second bit
- * in the flags field is set when the context is connected. */
-#define REDIS_CONNECTED 0x2
-
-/* The async API might try to disconnect cleanly and flush the output
- * buffer and read all subsequent replies before disconnecting.
- * This flag means no new commands can come in and the connection
- * should be terminated once all replies have been read. */
-#define REDIS_DISCONNECTING 0x4
-
-/* Flag specific to the async API which means that the context should be clean
- * up as soon as possible. */
-#define REDIS_FREEING 0x8
-
-/* Flag that is set when an async callback is executed. */
-#define REDIS_IN_CALLBACK 0x10
-
-/* Flag that is set when the async context has one or more subscriptions. */
-#define REDIS_SUBSCRIBED 0x20
-
-/* Flag that is set when monitor mode is active */
-#define REDIS_MONITORING 0x40
-
-/* Flag that is set when we should set SO_REUSEADDR before calling bind() */
-#define REDIS_REUSEADDR 0x80
-
-/**
- * Flag that indicates the user does not want the context to
- * be automatically freed upon error
- */
-#define REDIS_NO_AUTO_FREE 0x200
-
-#define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
-
-/* number of times we retry to connect in the case of EADDRNOTAVAIL and
- * SO_REUSEADDR is being used. */
-#define REDIS_CONNECT_RETRIES  10
-
-/* Forward declarations for structs defined elsewhere */
-struct redisAsyncContext;
-struct redisContext;
-
-/* RESP3 push helpers and callback prototypes */
-#define redisIsPushReply(r) (((redisReply*)(r))->type == REDIS_REPLY_PUSH)
-typedef void (redisPushFn)(void *, void *);
-typedef void (redisAsyncPushFn)(struct redisAsyncContext *, void *);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the reply object returned by redisCommand() */
-typedef struct redisReply {
-    int type; /* REDIS_REPLY_* */
-    long long integer; /* The integer when type is REDIS_REPLY_INTEGER */
-    double dval; /* The double when type is REDIS_REPLY_DOUBLE */
-    size_t len; /* Length of string */
-    char *str; /* Used for REDIS_REPLY_ERROR, REDIS_REPLY_STRING
-                  REDIS_REPLY_VERB, and REDIS_REPLY_DOUBLE (in additional to dval). */
-    char vtype[4]; /* Used for REDIS_REPLY_VERB, contains the null
-                      terminated 3 character content type, such as "txt". */
-    size_t elements; /* number of elements, for REDIS_REPLY_ARRAY */
-    struct redisReply **element; /* elements vector for REDIS_REPLY_ARRAY */
-} redisReply;
-
-redisReader *redisReaderCreate(void);
-
-/* Function to free the reply objects hiredis returns by default. */
-void freeReplyObject(void *reply);
-
-/* Functions to format a command according to the protocol. */
-int redisvFormatCommand(char **target, const char *format, va_list ap);
-int redisFormatCommand(char **target, const char *format, ...);
-int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
-int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
-void redisFreeCommand(char *cmd);
-void redisFreeSdsCommand(sds cmd);
-
-enum redisConnectionType {
-    REDIS_CONN_TCP,
-    REDIS_CONN_UNIX,
-    REDIS_CONN_USERFD
-};
-
-struct redisSsl;
-
-#define REDIS_OPT_NONBLOCK 0x01
-#define REDIS_OPT_REUSEADDR 0x02
-
-/**
- * Don't automatically free the async object on a connection failure,
- * or other implicit conditions. Only free on an explicit call to disconnect() or free()
- */
-#define REDIS_OPT_NOAUTOFREE 0x04
-
-/* Don't automatically intercept and free RESP3 PUSH replies. */
-#define REDIS_OPT_NO_PUSH_AUTOFREE 0x08
-
-/* In Unix systems a file descriptor is a regular signed int, with -1
- * representing an invalid descriptor. In Windows it is a SOCKET
- * (32- or 64-bit unsigned integer depending on the architecture), where
- * all bits set (~0) is INVALID_SOCKET.  */
-#ifndef _WIN32
-typedef int redisFD;
-#define REDIS_INVALID_FD -1
-#else
-#ifdef _WIN64
-typedef unsigned long long redisFD; /* SOCKET = 64-bit UINT_PTR */
-#else
-typedef unsigned long redisFD;      /* SOCKET = 32-bit UINT_PTR */
-#endif
-#define REDIS_INVALID_FD ((redisFD)(~0)) /* INVALID_SOCKET */
-#endif
-
-typedef struct {
-    /*
-     * the type of connection to use. This also indicates which
-     * `endpoint` member field to use
-     */
-    int type;
-    /* bit field of REDIS_OPT_xxx */
-    int options;
-    /* timeout value for connect operation. If NULL, no timeout is used */
-    const struct timeval *connect_timeout;
-    /* timeout value for commands. If NULL, no timeout is used.  This can be
-     * updated at runtime with redisSetTimeout/redisAsyncSetTimeout. */
-    const struct timeval *command_timeout;
-    union {
-        /** use this field for tcp/ip connections */
-        struct {
-            const char *source_addr;
-            const char *ip;
-            int port;
-        } tcp;
-        /** use this field for unix domain sockets */
-        const char *unix_socket;
-        /**
-         * use this field to have hiredis operate an already-open
-         * file descriptor */
-        redisFD fd;
-    } endpoint;
-
-    /* Optional user defined data/destructor */
-    void *privdata;
-    void (*free_privdata)(void *);
-
-    /* A user defined PUSH message callback */
-    redisPushFn *push_cb;
-    redisAsyncPushFn *async_push_cb;
-} redisOptions;
-
-/**
- * Helper macros to initialize options to their specified fields.
- */
-#define REDIS_OPTIONS_SET_TCP(opts, ip_, port_) \
-    (opts)->type = REDIS_CONN_TCP; \
-    (opts)->endpoint.tcp.ip = ip_; \
-    (opts)->endpoint.tcp.port = port_;
-
-#define REDIS_OPTIONS_SET_UNIX(opts, path) \
-    (opts)->type = REDIS_CONN_UNIX;        \
-    (opts)->endpoint.unix_socket = path;
-
-#define REDIS_OPTIONS_SET_PRIVDATA(opts, data, dtor) \
-    (opts)->privdata = data;                         \
-    (opts)->free_privdata = dtor;                    \
-
-typedef struct redisContextFuncs {
-    void (*free_privctx)(void *);
-    void (*async_read)(struct redisAsyncContext *);
-    void (*async_write)(struct redisAsyncContext *);
-    ssize_t (*read)(struct redisContext *, char *, size_t);
-    ssize_t (*write)(struct redisContext *);
-} redisContextFuncs;
-
-/* Context for a connection to Redis */
-typedef struct redisContext {
-    const redisContextFuncs *funcs;   /* Function table */
-
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-    redisFD fd;
-    int flags;
-    char *obuf; /* Write buffer */
-    redisReader *reader; /* Protocol reader */
-
-    enum redisConnectionType connection_type;
-    struct timeval *connect_timeout;
-    struct timeval *command_timeout;
-
-    struct {
-        char *host;
-        char *source_addr;
-        int port;
-    } tcp;
-
-    struct {
-        char *path;
-    } unix_sock;
-
-    /* For non-blocking connect */
-    struct sockadr *saddr;
-    size_t addrlen;
-
-    /* Optional data and corresponding destructor users can use to provide
-     * context to a given redisContext.  Not used by hiredis. */
-    void *privdata;
-    void (*free_privdata)(void *);
-
-    /* Internal context pointer presently used by hiredis to manage
-     * SSL connections. */
-    void *privctx;
-
-    /* An optional RESP3 PUSH handler */
-    redisPushFn *push_cb;
-} redisContext;
-
-redisContext *redisConnectWithOptions(const redisOptions *options);
-redisContext *redisConnect(const char *ip, int port);
-redisContext *redisConnectWithTimeout(const char *ip, int port, const struct timeval tv);
-redisContext *redisConnectNonBlock(const char *ip, int port);
-redisContext *redisConnectBindNonBlock(const char *ip, int port,
-                                       const char *source_addr);
-redisContext *redisConnectBindNonBlockWithReuse(const char *ip, int port,
-                                                const char *source_addr);
-redisContext *redisConnectUnix(const char *path);
-redisContext *redisConnectUnixWithTimeout(const char *path, const struct timeval tv);
-redisContext *redisConnectUnixNonBlock(const char *path);
-redisContext *redisConnectFd(redisFD fd);
-
-/**
- * Reconnect the given context using the saved information.
- *
- * This re-uses the exact same connect options as in the initial connection.
- * host, ip (or path), timeout and bind address are reused,
- * flags are used unmodified from the existing context.
- *
- * Returns REDIS_OK on successful connect or REDIS_ERR otherwise.
- */
-int redisReconnect(redisContext *c);
-
-redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn);
-int redisSetTimeout(redisContext *c, const struct timeval tv);
-int redisEnableKeepAlive(redisContext *c);
-void redisFree(redisContext *c);
-redisFD redisFreeKeepFd(redisContext *c);
-int redisBufferRead(redisContext *c);
-int redisBufferWrite(redisContext *c, int *done);
-
-/* In a blocking context, this function first checks if there are unconsumed
- * replies to return and returns one if so. Otherwise, it flushes the output
- * buffer to the socket and reads until it has a reply. In a non-blocking
- * context, it will return unconsumed replies until there are no more. */
-int redisGetReply(redisContext *c, void **reply);
-int redisGetReplyFromReader(redisContext *c, void **reply);
-
-/* Write a formatted command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
-
-/* Write a command to the output buffer. Use these functions in blocking mode
- * to get a pipeline of commands. */
-int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
-int redisAppendCommand(redisContext *c, const char *format, ...);
-int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-/* Issue a command to Redis. In a blocking context, it is identical to calling
- * redisAppendCommand, followed by redisGetReply. The function will return
- * NULL if there was an error in performing the request, otherwise it will
- * return the reply. In a non-blocking context, it is identical to calling
- * only redisAppendCommand and will always return NULL. */
-void *redisvCommand(redisContext *c, const char *format, va_list ap);
-void *redisCommand(redisContext *c, const char *format, ...);
-void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/include/hiredis/hiredis_ssl.h b/ext/hiredis-1.0.2/include/hiredis/hiredis_ssl.h
deleted file mode 100644
index 604efe0c1..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/hiredis_ssl.h
+++ /dev/null
@@ -1,127 +0,0 @@
-
-/*
- * Copyright (c) 2019, Redis Labs
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __HIREDIS_SSL_H
-#define __HIREDIS_SSL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is the underlying struct for SSL in ssl.h, which is not included to
- * keep build dependencies short here.
- */
-struct ssl_st;
-
-/* A wrapper around OpenSSL SSL_CTX to allow easy SSL use without directly
- * calling OpenSSL.
- */
-typedef struct redisSSLContext redisSSLContext;
-
-/**
- * Initialization errors that redisCreateSSLContext() may return.
- */
-
-typedef enum {
-    REDIS_SSL_CTX_NONE = 0,                     /* No Error */
-    REDIS_SSL_CTX_CREATE_FAILED,                /* Failed to create OpenSSL SSL_CTX */
-    REDIS_SSL_CTX_CERT_KEY_REQUIRED,            /* Client cert and key must both be specified or skipped */
-    REDIS_SSL_CTX_CA_CERT_LOAD_FAILED,          /* Failed to load CA Certificate or CA Path */
-    REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED,      /* Failed to load client certificate */
-    REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED       /* Failed to load private key */
-} redisSSLContextError;
-
-/**
- * Return the error message corresponding with the specified error code.
- */
-
-const char *redisSSLContextGetError(redisSSLContextError error);
-
-/**
- * Helper function to initialize the OpenSSL library.
- *
- * OpenSSL requires one-time initialization before it can be used. Callers should
- * call this function only once, and only if OpenSSL is not directly initialized
- * elsewhere.
- */
-int redisInitOpenSSL(void);
-
-/**
- * Helper function to initialize an OpenSSL context that can be used
- * to initiate SSL connections.
- *
- * cacert_filename is an optional name of a CA certificate/bundle file to load
- * and use for validation.
- *
- * capath is an optional directory path where trusted CA certificate files are
- * stored in an OpenSSL-compatible structure.
- *
- * cert_filename and private_key_filename are optional names of a client side
- * certificate and private key files to use for authentication. They need to
- * be both specified or omitted.
- *
- * server_name is an optional and will be used as a server name indication
- * (SNI) TLS extension.
- *
- * If error is non-null, it will be populated in case the context creation fails
- * (returning a NULL).
- */
-
-redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
-        const char *cert_filename, const char *private_key_filename,
-        const char *server_name, redisSSLContextError *error);
-
-/**
- * Free a previously created OpenSSL context.
- */
-void redisFreeSSLContext(redisSSLContext *redis_ssl_ctx);
-
-/**
- * Initiate SSL on an existing redisContext.
- *
- * This is similar to redisInitiateSSL() but does not require the caller
- * to directly interact with OpenSSL, and instead uses a redisSSLContext
- * previously created using redisCreateSSLContext().
- */
-
-int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx);
-
-/**
- * Initiate SSL/TLS negotiation on a provided OpenSSL SSL object.
- */
-
-int redisInitiateSSL(redisContext *c, struct ssl_st *ssl);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __HIREDIS_SSL_H */
diff --git a/ext/hiredis-1.0.2/include/hiredis/net.h b/ext/hiredis-1.0.2/include/hiredis/net.h
deleted file mode 100644
index 9f43283a5..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/net.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __NET_H
-#define __NET_H
-
-#include "hiredis.h"
-
-void redisNetClose(redisContext *c);
-ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap);
-ssize_t redisNetWrite(redisContext *c);
-
-int redisCheckSocketError(redisContext *c);
-int redisContextSetTimeout(redisContext *c, const struct timeval tv);
-int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr);
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
-int redisKeepAlive(redisContext *c, int interval);
-int redisCheckConnectDone(redisContext *c, int *completed);
-
-int redisSetTcpNoDelay(redisContext *c);
-
-#endif
diff --git a/ext/hiredis-1.0.2/include/hiredis/read.h b/ext/hiredis-1.0.2/include/hiredis/read.h
deleted file mode 100644
index 2d74d77a5..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/read.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef __HIREDIS_READ_H
-#define __HIREDIS_READ_H
-#include <stdio.h> /* for size_t */
-
-#define REDIS_ERR -1
-#define REDIS_OK 0
-
-/* When an error occurs, the err flag in a context is set to hold the type of
- * error that occurred. REDIS_ERR_IO means there was an I/O error and you
- * should use the "errno" variable to find out what is wrong.
- * For other values, the "errstr" field will hold a description. */
-#define REDIS_ERR_IO 1 /* Error in read or write */
-#define REDIS_ERR_EOF 3 /* End of file */
-#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
-#define REDIS_ERR_OOM 5 /* Out of memory */
-#define REDIS_ERR_TIMEOUT 6 /* Timed out */
-#define REDIS_ERR_OTHER 2 /* Everything else... */
-
-#define REDIS_REPLY_STRING 1
-#define REDIS_REPLY_ARRAY 2
-#define REDIS_REPLY_INTEGER 3
-#define REDIS_REPLY_NIL 4
-#define REDIS_REPLY_STATUS 5
-#define REDIS_REPLY_ERROR 6
-#define REDIS_REPLY_DOUBLE 7
-#define REDIS_REPLY_BOOL 8
-#define REDIS_REPLY_MAP 9
-#define REDIS_REPLY_SET 10
-#define REDIS_REPLY_ATTR 11
-#define REDIS_REPLY_PUSH 12
-#define REDIS_REPLY_BIGNUM 13
-#define REDIS_REPLY_VERB 14
-
-/* Default max unused reader buffer. */
-#define REDIS_READER_MAX_BUF (1024*16)
-
-/* Default multi-bulk element limit */
-#define REDIS_READER_MAX_ARRAY_ELEMENTS ((1LL<<32) - 1)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct redisReadTask {
-    int type;
-    long long elements; /* number of elements in multibulk container */
-    int idx; /* index in parent (array) object */
-    void *obj; /* holds user-generated value for a read task */
-    struct redisReadTask *parent; /* parent task */
-    void *privdata; /* user-settable arbitrary field */
-} redisReadTask;
-
-typedef struct redisReplyObjectFunctions {
-    void *(*createString)(const redisReadTask*, char*, size_t);
-    void *(*createArray)(const redisReadTask*, size_t);
-    void *(*createInteger)(const redisReadTask*, long long);
-    void *(*createDouble)(const redisReadTask*, double, char*, size_t);
-    void *(*createNil)(const redisReadTask*);
-    void *(*createBool)(const redisReadTask*, int);
-    void (*freeObject)(void*);
-} redisReplyObjectFunctions;
-
-typedef struct redisReader {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-
-    char *buf; /* Read buffer */
-    size_t pos; /* Buffer cursor */
-    size_t len; /* Buffer length */
-    size_t maxbuf; /* Max length of unused buffer */
-    long long maxelements; /* Max multi-bulk elements */
-
-    redisReadTask **task;
-    int tasks;
-
-    int ridx; /* Index of current read task */
-    void *reply; /* Temporary reply pointer */
-
-    redisReplyObjectFunctions *fn;
-    void *privdata;
-} redisReader;
-
-/* Public API for the protocol parser. */
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
-void redisReaderFree(redisReader *r);
-int redisReaderFeed(redisReader *r, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *r, void **reply);
-
-#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
-#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply)
-#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/include/hiredis/sds.h b/ext/hiredis-1.0.2/include/hiredis/sds.h
deleted file mode 100644
index eda8833b5..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/sds.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SDS_H
-#define __SDS_H
-
-#define SDS_MAX_PREALLOC (1024*1024)
-#ifdef _MSC_VER
-#define __attribute__(x)
-typedef long long ssize_t;
-#define SSIZE_MAX (LLONG_MAX >> 1)
-#endif
-
-#include <sys/types.h>
-#include <stdarg.h>
-#include <stdint.h>
-
-typedef char *sds;
-
-/* Note: sdshdr5 is never used, we just access the flags byte directly.
- * However is here to document the layout of type 5 SDS strings. */
-struct __attribute__ ((__packed__)) sdshdr5 {
-    unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr8 {
-    uint8_t len; /* used */
-    uint8_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr16 {
-    uint16_t len; /* used */
-    uint16_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr32 {
-    uint32_t len; /* used */
-    uint32_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr64 {
-    uint64_t len; /* used */
-    uint64_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-
-#define SDS_TYPE_5  0
-#define SDS_TYPE_8  1
-#define SDS_TYPE_16 2
-#define SDS_TYPE_32 3
-#define SDS_TYPE_64 4
-#define SDS_TYPE_MASK 7
-#define SDS_TYPE_BITS 3
-#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
-#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
-#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
-
-static inline size_t sdslen(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->len;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->len;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->len;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->len;
-    }
-    return 0;
-}
-
-static inline size_t sdsavail(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
-            return 0;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            return sh->alloc - sh->len;
-        }
-    }
-    return 0;
-}
-
-static inline void sdssetlen(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                *fp = (unsigned char)(SDS_TYPE_5 | (newlen << SDS_TYPE_BITS));
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len = (uint8_t)newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len = (uint16_t)newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len = (uint32_t)newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len = (uint64_t)newlen;
-            break;
-    }
-}
-
-static inline void sdsinclen(sds s, size_t inc) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                unsigned char newlen = SDS_TYPE_5_LEN(flags)+(unsigned char)inc;
-                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len += (uint8_t)inc;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len += (uint16_t)inc;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len += (uint32_t)inc;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len += (uint64_t)inc;
-            break;
-    }
-}
-
-/* sdsalloc() = sdsavail() + sdslen() */
-static inline size_t sdsalloc(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->alloc;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->alloc;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->alloc;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->alloc;
-    }
-    return 0;
-}
-
-static inline void sdssetalloc(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            /* Nothing to do, this type has no total allocation info. */
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->alloc = (uint8_t)newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->alloc = (uint16_t)newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->alloc = (uint32_t)newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->alloc = (uint64_t)newlen;
-            break;
-    }
-}
-
-sds sdsnewlen(const void *init, size_t initlen);
-sds sdsnew(const char *init);
-sds sdsempty(void);
-sds sdsdup(const sds s);
-void sdsfree(sds s);
-sds sdsgrowzero(sds s, size_t len);
-sds sdscatlen(sds s, const void *t, size_t len);
-sds sdscat(sds s, const char *t);
-sds sdscatsds(sds s, const sds t);
-sds sdscpylen(sds s, const char *t, size_t len);
-sds sdscpy(sds s, const char *t);
-
-sds sdscatvprintf(sds s, const char *fmt, va_list ap);
-#ifdef __GNUC__
-sds sdscatprintf(sds s, const char *fmt, ...)
-    __attribute__((format(printf, 2, 3)));
-#else
-sds sdscatprintf(sds s, const char *fmt, ...);
-#endif
-
-sds sdscatfmt(sds s, char const *fmt, ...);
-sds sdstrim(sds s, const char *cset);
-int sdsrange(sds s, ssize_t start, ssize_t end);
-void sdsupdatelen(sds s);
-void sdsclear(sds s);
-int sdscmp(const sds s1, const sds s2);
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
-void sdsfreesplitres(sds *tokens, int count);
-void sdstolower(sds s);
-void sdstoupper(sds s);
-sds sdsfromlonglong(long long value);
-sds sdscatrepr(sds s, const char *p, size_t len);
-sds *sdssplitargs(const char *line, int *argc);
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
-sds sdsjoin(char **argv, int argc, char *sep);
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
-
-/* Low level functions exposed to the user API */
-sds sdsMakeRoomFor(sds s, size_t addlen);
-void sdsIncrLen(sds s, int incr);
-sds sdsRemoveFreeSpace(sds s);
-size_t sdsAllocSize(sds s);
-void *sdsAllocPtr(sds s);
-
-/* Export the allocator used by SDS to the program using SDS.
- * Sometimes the program SDS is linked to, may use a different set of
- * allocators, but may want to allocate or free things that SDS will
- * respectively free or allocate. */
-void *sds_malloc(size_t size);
-void *sds_realloc(void *ptr, size_t size);
-void sds_free(void *ptr);
-
-#ifdef REDIS_TEST
-int sdsTest(int argc, char *argv[]);
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/include/hiredis/sdsalloc.h b/ext/hiredis-1.0.2/include/hiredis/sdsalloc.h
deleted file mode 100644
index 5538dd94c..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/sdsalloc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* SDS allocator selection.
- *
- * This file is used in order to change the SDS allocator at compile time.
- * Just define the following defines to what you want to use. Also add
- * the include of your alternate allocator if needed (not needed in order
- * to use the default libc allocator). */
-
-#include "alloc.h"
-
-#define s_malloc hi_malloc
-#define s_realloc hi_realloc
-#define s_free hi_free
diff --git a/ext/hiredis-1.0.2/include/hiredis/sockcompat.h b/ext/hiredis-1.0.2/include/hiredis/sockcompat.h
deleted file mode 100644
index 85810e848..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/sockcompat.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SOCKCOMPAT_H
-#define __SOCKCOMPAT_H
-
-#ifndef _WIN32
-/* For POSIX systems we use the standard BSD socket API. */
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <poll.h>
-#else
-/* For Windows we use winsock. */
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600 /* To get WSAPoll etc. */
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stddef.h>
-#include <errno.h>
-
-#ifdef _MSC_VER
-typedef long long ssize_t;
-#endif
-
-/* Emulate the parts of the BSD socket API that we need (override the winsock signatures). */
-int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
-const char *win32_gai_strerror(int errcode);
-void win32_freeaddrinfo(struct addrinfo *res);
-SOCKET win32_socket(int domain, int type, int protocol);
-int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp);
-int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
-int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
-int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen);
-int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen);
-int win32_close(SOCKET fd);
-ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags);
-ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags);
-typedef ULONG nfds_t;
-int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout);
-
-#ifndef REDIS_SOCKCOMPAT_IMPLEMENTATION
-#define getaddrinfo(node, service, hints, res) win32_getaddrinfo(node, service, hints, res)
-#undef gai_strerror
-#define gai_strerror(errcode) win32_gai_strerror(errcode)
-#define freeaddrinfo(res) win32_freeaddrinfo(res)
-#define socket(domain, type, protocol) win32_socket(domain, type, protocol)
-#define ioctl(fd, request, argp) win32_ioctl(fd, request, argp)
-#define bind(sockfd, addr, addrlen) win32_bind(sockfd, addr, addrlen)
-#define connect(sockfd, addr, addrlen) win32_connect(sockfd, addr, addrlen)
-#define getsockopt(sockfd, level, optname, optval, optlen) win32_getsockopt(sockfd, level, optname, optval, optlen)
-#define setsockopt(sockfd, level, optname, optval, optlen) win32_setsockopt(sockfd, level, optname, optval, optlen)
-#define close(fd) win32_close(fd)
-#define recv(sockfd, buf, len, flags) win32_recv(sockfd, buf, len, flags)
-#define send(sockfd, buf, len, flags) win32_send(sockfd, buf, len, flags)
-#define poll(fds, nfds, timeout) win32_poll(fds, nfds, timeout)
-#endif /* REDIS_SOCKCOMPAT_IMPLEMENTATION */
-#endif /* _WIN32 */
-
-#endif /* __SOCKCOMPAT_H */
diff --git a/ext/hiredis-1.0.2/include/hiredis/win32.h b/ext/hiredis-1.0.2/include/hiredis/win32.h
deleted file mode 100644
index 04289c696..000000000
--- a/ext/hiredis-1.0.2/include/hiredis/win32.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _WIN32_HELPER_INCLUDE
-#define _WIN32_HELPER_INCLUDE
-#ifdef _MSC_VER
-
-#include <winsock2.h> /* for struct timeval */
-
-#ifndef inline
-#define inline __inline
-#endif
-
-#ifndef strcasecmp
-#define strcasecmp stricmp
-#endif
-
-#ifndef strncasecmp
-#define strncasecmp strnicmp
-#endif
-
-#ifndef va_copy
-#define va_copy(d,s) ((d) = (s))
-#endif
-
-#ifndef snprintf
-#define snprintf c99_snprintf
-
-__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
-{
-    int count = -1;
-
-    if (size != 0)
-        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
-    if (count == -1)
-        count = _vscprintf(format, ap);
-
-    return count;
-}
-
-__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
-{
-    int count;
-    va_list ap;
-
-    va_start(ap, format);
-    count = c99_vsnprintf(str, size, format, ap);
-    va_end(ap);
-
-    return count;
-}
-#endif
-#endif /* _MSC_VER */
-
-#ifdef _WIN32
-#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
-#endif /* _WIN32 */
-
-#endif /* _WIN32_HELPER_INCLUDE */
diff --git a/ext/hiredis-1.0.2/lib/ubuntu22.04/amd64/libhiredis.a b/ext/hiredis-1.0.2/lib/ubuntu22.04/amd64/libhiredis.a
deleted file mode 100644
index af1314f01..000000000
Binary files a/ext/hiredis-1.0.2/lib/ubuntu22.04/amd64/libhiredis.a and /dev/null differ
diff --git a/ext/hiredis-1.0.2/lib/ubuntu22.04/arm64/libhiredis.a b/ext/hiredis-1.0.2/lib/ubuntu22.04/arm64/libhiredis.a
deleted file mode 100644
index 081c92705..000000000
Binary files a/ext/hiredis-1.0.2/lib/ubuntu22.04/arm64/libhiredis.a and /dev/null differ
diff --git a/ext/hiredis-1.0.2/net.c b/ext/hiredis-1.0.2/net.c
deleted file mode 100644
index c6b0e5d8e..000000000
--- a/ext/hiredis-1.0.2/net.c
+++ /dev/null
@@ -1,612 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <sys/types.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <limits.h>
-#include <stdlib.h>
-
-#include "net.h"
-#include "sds.h"
-#include "sockcompat.h"
-#include "win32.h"
-
-/* Defined in hiredis.c */
-void __redisSetError(redisContext *c, int type, const char *str);
-
-void redisNetClose(redisContext *c) {
-    if (c && c->fd != REDIS_INVALID_FD) {
-        close(c->fd);
-        c->fd = REDIS_INVALID_FD;
-    }
-}
-
-ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap) {
-    ssize_t nread = recv(c->fd, buf, bufcap, 0);
-    if (nread == -1) {
-        if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-            /* Try again later */
-            return 0;
-        } else if(errno == ETIMEDOUT && (c->flags & REDIS_BLOCK)) {
-            /* especially in windows */
-            __redisSetError(c, REDIS_ERR_TIMEOUT, "recv timeout");
-            return -1;
-        } else {
-            __redisSetError(c, REDIS_ERR_IO, NULL);
-            return -1;
-        }
-    } else if (nread == 0) {
-        __redisSetError(c, REDIS_ERR_EOF, "Server closed the connection");
-        return -1;
-    } else {
-        return nread;
-    }
-}
-
-ssize_t redisNetWrite(redisContext *c) {
-    ssize_t nwritten = send(c->fd, c->obuf, sdslen(c->obuf), 0);
-    if (nwritten < 0) {
-        if ((errno == EWOULDBLOCK && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
-            /* Try again later */
-        } else {
-            __redisSetError(c, REDIS_ERR_IO, NULL);
-            return -1;
-        }
-    }
-    return nwritten;
-}
-
-static void __redisSetErrorFromErrno(redisContext *c, int type, const char *prefix) {
-    int errorno = errno;  /* snprintf() may change errno */
-    char buf[128] = { 0 };
-    size_t len = 0;
-
-    if (prefix != NULL)
-        len = snprintf(buf,sizeof(buf),"%s: ",prefix);
-    strerror_r(errorno, (char *)(buf + len), sizeof(buf) - len);
-    __redisSetError(c,type,buf);
-}
-
-static int redisSetReuseAddr(redisContext *c) {
-    int on = 1;
-    if (setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-static int redisCreateSocket(redisContext *c, int type) {
-    redisFD s;
-    if ((s = socket(type, SOCK_STREAM, 0)) == REDIS_INVALID_FD) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        return REDIS_ERR;
-    }
-    c->fd = s;
-    if (type == AF_INET) {
-        if (redisSetReuseAddr(c) == REDIS_ERR) {
-            return REDIS_ERR;
-        }
-    }
-    return REDIS_OK;
-}
-
-static int redisSetBlocking(redisContext *c, int blocking) {
-#ifndef _WIN32
-    int flags;
-
-    /* Set the socket nonblocking.
-     * Note that fcntl(2) for F_GETFL and F_SETFL can't be
-     * interrupted by a signal. */
-    if ((flags = fcntl(c->fd, F_GETFL)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_GETFL)");
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-
-    if (blocking)
-        flags &= ~O_NONBLOCK;
-    else
-        flags |= O_NONBLOCK;
-
-    if (fcntl(c->fd, F_SETFL, flags) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(F_SETFL)");
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-#else
-    u_long mode = blocking ? 0 : 1;
-    if (ioctl(c->fd, FIONBIO, &mode) == -1) {
-        __redisSetErrorFromErrno(c, REDIS_ERR_IO, "ioctl(FIONBIO)");
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-#endif /* _WIN32 */
-    return REDIS_OK;
-}
-
-int redisKeepAlive(redisContext *c, int interval) {
-    int val = 1;
-    redisFD fd = c->fd;
-
-    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)) == -1){
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = interval;
-
-#if defined(__APPLE__) && defined(__MACH__)
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-#else
-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = interval/3;
-    if (val == 0) val = 1;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-
-    val = 3;
-    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
-        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-        return REDIS_ERR;
-    }
-#endif
-#endif
-
-    return REDIS_OK;
-}
-
-int redisSetTcpNoDelay(redisContext *c) {
-    int yes = 1;
-    if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes)) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(TCP_NODELAY)");
-        redisNetClose(c);
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-#define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
-
-static int redisContextTimeoutMsec(redisContext *c, long *result)
-{
-    const struct timeval *timeout = c->connect_timeout;
-    long msec = -1;
-
-    /* Only use timeout when not NULL. */
-    if (timeout != NULL) {
-        if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
-            *result = msec;
-            return REDIS_ERR;
-        }
-
-        msec = (timeout->tv_sec * 1000) + ((timeout->tv_usec + 999) / 1000);
-
-        if (msec < 0 || msec > INT_MAX) {
-            msec = INT_MAX;
-        }
-    }
-
-    *result = msec;
-    return REDIS_OK;
-}
-
-static int redisContextWaitReady(redisContext *c, long msec) {
-    struct pollfd   wfd[1];
-
-    wfd[0].fd     = c->fd;
-    wfd[0].events = POLLOUT;
-
-    if (errno == EINPROGRESS) {
-        int res;
-
-        if ((res = poll(wfd, 1, msec)) == -1) {
-            __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
-            redisNetClose(c);
-            return REDIS_ERR;
-        } else if (res == 0) {
-            errno = ETIMEDOUT;
-            __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-            redisNetClose(c);
-            return REDIS_ERR;
-        }
-
-        if (redisCheckConnectDone(c, &res) != REDIS_OK || res == 0) {
-            redisCheckSocketError(c);
-            return REDIS_ERR;
-        }
-
-        return REDIS_OK;
-    }
-
-    __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-    redisNetClose(c);
-    return REDIS_ERR;
-}
-
-int redisCheckConnectDone(redisContext *c, int *completed) {
-    int rc = connect(c->fd, (const struct sockaddr *)c->saddr, c->addrlen);
-    if (rc == 0) {
-        *completed = 1;
-        return REDIS_OK;
-    }
-    switch (errno) {
-    case EISCONN:
-        *completed = 1;
-        return REDIS_OK;
-    case EALREADY:
-    case EINPROGRESS:
-    case EWOULDBLOCK:
-        *completed = 0;
-        return REDIS_OK;
-    default:
-        return REDIS_ERR;
-    }
-}
-
-int redisCheckSocketError(redisContext *c) {
-    int err = 0, errno_saved = errno;
-    socklen_t errlen = sizeof(err);
-
-    if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &err, &errlen) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"getsockopt(SO_ERROR)");
-        return REDIS_ERR;
-    }
-
-    if (err == 0) {
-        err = errno_saved;
-    }
-
-    if (err) {
-        errno = err;
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
-        return REDIS_ERR;
-    }
-
-    return REDIS_OK;
-}
-
-int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
-    const void *to_ptr = &tv;
-    size_t to_sz = sizeof(tv);
-
-    if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,to_ptr,to_sz) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
-        return REDIS_ERR;
-    }
-    if (setsockopt(c->fd,SOL_SOCKET,SO_SNDTIMEO,to_ptr,to_sz) == -1) {
-        __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_SNDTIMEO)");
-        return REDIS_ERR;
-    }
-    return REDIS_OK;
-}
-
-int redisContextUpdateConnectTimeout(redisContext *c, const struct timeval *timeout) {
-    /* Same timeval struct, short circuit */
-    if (c->connect_timeout == timeout)
-        return REDIS_OK;
-
-    /* Allocate context timeval if we need to */
-    if (c->connect_timeout == NULL) {
-        c->connect_timeout = hi_malloc(sizeof(*c->connect_timeout));
-        if (c->connect_timeout == NULL)
-            return REDIS_ERR;
-    }
-
-    memcpy(c->connect_timeout, timeout, sizeof(*c->connect_timeout));
-    return REDIS_OK;
-}
-
-int redisContextUpdateCommandTimeout(redisContext *c, const struct timeval *timeout) {
-    /* Same timeval struct, short circuit */
-    if (c->command_timeout == timeout)
-        return REDIS_OK;
-
-    /* Allocate context timeval if we need to */
-    if (c->command_timeout == NULL) {
-        c->command_timeout = hi_malloc(sizeof(*c->command_timeout));
-        if (c->command_timeout == NULL)
-            return REDIS_ERR;
-    }
-
-    memcpy(c->command_timeout, timeout, sizeof(*c->command_timeout));
-    return REDIS_OK;
-}
-
-static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
-                                   const struct timeval *timeout,
-                                   const char *source_addr) {
-    redisFD s;
-    int rv, n;
-    char _port[6];  /* strlen("65535"); */
-    struct addrinfo hints, *servinfo, *bservinfo, *p, *b;
-    int blocking = (c->flags & REDIS_BLOCK);
-    int reuseaddr = (c->flags & REDIS_REUSEADDR);
-    int reuses = 0;
-    long timeout_msec = -1;
-
-    servinfo = NULL;
-    c->connection_type = REDIS_CONN_TCP;
-    c->tcp.port = port;
-
-    /* We need to take possession of the passed parameters
-     * to make them reusable for a reconnect.
-     * We also carefully check we don't free data we already own,
-     * as in the case of the reconnect method.
-     *
-     * This is a bit ugly, but atleast it works and doesn't leak memory.
-     **/
-    if (c->tcp.host != addr) {
-        hi_free(c->tcp.host);
-
-        c->tcp.host = hi_strdup(addr);
-        if (c->tcp.host == NULL)
-            goto oom;
-    }
-
-    if (timeout) {
-        if (redisContextUpdateConnectTimeout(c, timeout) == REDIS_ERR)
-            goto oom;
-    } else {
-        hi_free(c->connect_timeout);
-        c->connect_timeout = NULL;
-    }
-
-    if (redisContextTimeoutMsec(c, &timeout_msec) != REDIS_OK) {
-        __redisSetError(c, REDIS_ERR_IO, "Invalid timeout specified");
-        goto error;
-    }
-
-    if (source_addr == NULL) {
-        hi_free(c->tcp.source_addr);
-        c->tcp.source_addr = NULL;
-    } else if (c->tcp.source_addr != source_addr) {
-        hi_free(c->tcp.source_addr);
-        c->tcp.source_addr = hi_strdup(source_addr);
-    }
-
-    snprintf(_port, 6, "%d", port);
-    memset(&hints,0,sizeof(hints));
-    hints.ai_family = AF_INET;
-    hints.ai_socktype = SOCK_STREAM;
-
-    /* Try with IPv6 if no IPv4 address was found. We do it in this order since
-     * in a Redis client you can't afford to test if you have IPv6 connectivity
-     * as this would add latency to every connect. Otherwise a more sensible
-     * route could be: Use IPv6 if both addresses are available and there is IPv6
-     * connectivity. */
-    if ((rv = getaddrinfo(c->tcp.host,_port,&hints,&servinfo)) != 0) {
-         hints.ai_family = AF_INET6;
-         if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) {
-            __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv));
-            return REDIS_ERR;
-        }
-    }
-    for (p = servinfo; p != NULL; p = p->ai_next) {
-addrretry:
-        if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == REDIS_INVALID_FD)
-            continue;
-
-        c->fd = s;
-        if (redisSetBlocking(c,0) != REDIS_OK)
-            goto error;
-        if (c->tcp.source_addr) {
-            int bound = 0;
-            /* Using getaddrinfo saves us from self-determining IPv4 vs IPv6 */
-            if ((rv = getaddrinfo(c->tcp.source_addr, NULL, &hints, &bservinfo)) != 0) {
-                char buf[128];
-                snprintf(buf,sizeof(buf),"Can't get addr: %s",gai_strerror(rv));
-                __redisSetError(c,REDIS_ERR_OTHER,buf);
-                goto error;
-            }
-
-            if (reuseaddr) {
-                n = 1;
-                if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*) &n,
-                               sizeof(n)) < 0) {
-                    freeaddrinfo(bservinfo);
-                    goto error;
-                }
-            }
-
-            for (b = bservinfo; b != NULL; b = b->ai_next) {
-                if (bind(s,b->ai_addr,b->ai_addrlen) != -1) {
-                    bound = 1;
-                    break;
-                }
-            }
-            freeaddrinfo(bservinfo);
-            if (!bound) {
-                char buf[128];
-                snprintf(buf,sizeof(buf),"Can't bind socket: %s",strerror(errno));
-                __redisSetError(c,REDIS_ERR_OTHER,buf);
-                goto error;
-            }
-        }
-
-        /* For repeat connection */
-        hi_free(c->saddr);
-        c->saddr = hi_malloc(p->ai_addrlen);
-        if (c->saddr == NULL)
-            goto oom;
-
-        memcpy(c->saddr, p->ai_addr, p->ai_addrlen);
-        c->addrlen = p->ai_addrlen;
-
-        if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
-            if (errno == EHOSTUNREACH) {
-                redisNetClose(c);
-                continue;
-            } else if (errno == EINPROGRESS) {
-                if (blocking) {
-                    goto wait_for_ready;
-                }
-                /* This is ok.
-                 * Note that even when it's in blocking mode, we unset blocking
-                 * for `connect()`
-                 */
-            } else if (errno == EADDRNOTAVAIL && reuseaddr) {
-                if (++reuses >= REDIS_CONNECT_RETRIES) {
-                    goto error;
-                } else {
-                    redisNetClose(c);
-                    goto addrretry;
-                }
-            } else {
-                wait_for_ready:
-                if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
-                    goto error;
-                if (redisSetTcpNoDelay(c) != REDIS_OK)
-                    goto error;
-            }
-        }
-        if (blocking && redisSetBlocking(c,1) != REDIS_OK)
-            goto error;
-
-        c->flags |= REDIS_CONNECTED;
-        rv = REDIS_OK;
-        goto end;
-    }
-    if (p == NULL) {
-        char buf[128];
-        snprintf(buf,sizeof(buf),"Can't create socket: %s",strerror(errno));
-        __redisSetError(c,REDIS_ERR_OTHER,buf);
-        goto error;
-    }
-
-oom:
-    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-error:
-    rv = REDIS_ERR;
-end:
-    if(servinfo) {
-        freeaddrinfo(servinfo);
-    }
-
-    return rv;  // Need to return REDIS_OK if alright
-}
-
-int redisContextConnectTcp(redisContext *c, const char *addr, int port,
-                           const struct timeval *timeout) {
-    return _redisContextConnectTcp(c, addr, port, timeout, NULL);
-}
-
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr) {
-    return _redisContextConnectTcp(c, addr, port, timeout, source_addr);
-}
-
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout) {
-#ifndef _WIN32
-    int blocking = (c->flags & REDIS_BLOCK);
-    struct sockaddr_un *sa;
-    long timeout_msec = -1;
-
-    if (redisCreateSocket(c,AF_UNIX) < 0)
-        return REDIS_ERR;
-    if (redisSetBlocking(c,0) != REDIS_OK)
-        return REDIS_ERR;
-
-    c->connection_type = REDIS_CONN_UNIX;
-    if (c->unix_sock.path != path) {
-        hi_free(c->unix_sock.path);
-
-        c->unix_sock.path = hi_strdup(path);
-        if (c->unix_sock.path == NULL)
-            goto oom;
-    }
-
-    if (timeout) {
-        if (redisContextUpdateConnectTimeout(c, timeout) == REDIS_ERR)
-            goto oom;
-    } else {
-        hi_free(c->connect_timeout);
-        c->connect_timeout = NULL;
-    }
-
-    if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
-        return REDIS_ERR;
-
-    /* Don't leak sockaddr if we're reconnecting */
-    if (c->saddr) hi_free(c->saddr);
-
-    sa = (struct sockaddr_un*)(c->saddr = hi_malloc(sizeof(struct sockaddr_un)));
-    if (sa == NULL)
-        goto oom;
-
-    c->addrlen = sizeof(struct sockaddr_un);
-    sa->sun_family = AF_UNIX;
-    strncpy(sa->sun_path, path, sizeof(sa->sun_path) - 1);
-    if (connect(c->fd, (struct sockaddr*)sa, sizeof(*sa)) == -1) {
-        if (errno == EINPROGRESS && !blocking) {
-            /* This is ok. */
-        } else {
-            if (redisContextWaitReady(c,timeout_msec) != REDIS_OK)
-                return REDIS_ERR;
-        }
-    }
-
-    /* Reset socket to be blocking after connect(2). */
-    if (blocking && redisSetBlocking(c,1) != REDIS_OK)
-        return REDIS_ERR;
-
-    c->flags |= REDIS_CONNECTED;
-    return REDIS_OK;
-#else
-    /* We currently do not support Unix sockets for Windows. */
-    /* TODO(m): https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ */
-    errno = EPROTONOSUPPORT;
-    return REDIS_ERR;
-#endif /* _WIN32 */
-oom:
-    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
-}
diff --git a/ext/hiredis-1.0.2/net.h b/ext/hiredis-1.0.2/net.h
deleted file mode 100644
index 9f43283a5..000000000
--- a/ext/hiredis-1.0.2/net.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Extracted from anet.c to work properly with Hiredis error reporting.
- *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
- *                     Jan-Erik Rediger <janerik at fnordig dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __NET_H
-#define __NET_H
-
-#include "hiredis.h"
-
-void redisNetClose(redisContext *c);
-ssize_t redisNetRead(redisContext *c, char *buf, size_t bufcap);
-ssize_t redisNetWrite(redisContext *c);
-
-int redisCheckSocketError(redisContext *c);
-int redisContextSetTimeout(redisContext *c, const struct timeval tv);
-int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
-int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
-                               const struct timeval *timeout,
-                               const char *source_addr);
-int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
-int redisKeepAlive(redisContext *c, int interval);
-int redisCheckConnectDone(redisContext *c, int *completed);
-
-int redisSetTcpNoDelay(redisContext *c);
-
-#endif
diff --git a/ext/hiredis-1.0.2/read.c b/ext/hiredis-1.0.2/read.c
deleted file mode 100644
index 09524692b..000000000
--- a/ext/hiredis-1.0.2/read.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <string.h>
-#include <stdlib.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#include <strings.h>
-#endif
-#include <assert.h>
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-#include <math.h>
-
-#include "alloc.h"
-#include "read.h"
-#include "sds.h"
-#include "win32.h"
-
-/* Initial size of our nested reply stack and how much we grow it when needd */
-#define REDIS_READER_STACK_SIZE 9
-
-static void __redisReaderSetError(redisReader *r, int type, const char *str) {
-    size_t len;
-
-    if (r->reply != NULL && r->fn && r->fn->freeObject) {
-        r->fn->freeObject(r->reply);
-        r->reply = NULL;
-    }
-
-    /* Clear input buffer on errors. */
-    sdsfree(r->buf);
-    r->buf = NULL;
-    r->pos = r->len = 0;
-
-    /* Reset task stack. */
-    r->ridx = -1;
-
-    /* Set error. */
-    r->err = type;
-    len = strlen(str);
-    len = len < (sizeof(r->errstr)-1) ? len : (sizeof(r->errstr)-1);
-    memcpy(r->errstr,str,len);
-    r->errstr[len] = '\0';
-}
-
-static size_t chrtos(char *buf, size_t size, char byte) {
-    size_t len = 0;
-
-    switch(byte) {
-    case '\\':
-    case '"':
-        len = snprintf(buf,size,"\"\\%c\"",byte);
-        break;
-    case '\n': len = snprintf(buf,size,"\"\\n\""); break;
-    case '\r': len = snprintf(buf,size,"\"\\r\""); break;
-    case '\t': len = snprintf(buf,size,"\"\\t\""); break;
-    case '\a': len = snprintf(buf,size,"\"\\a\""); break;
-    case '\b': len = snprintf(buf,size,"\"\\b\""); break;
-    default:
-        if (isprint(byte))
-            len = snprintf(buf,size,"\"%c\"",byte);
-        else
-            len = snprintf(buf,size,"\"\\x%02x\"",(unsigned char)byte);
-        break;
-    }
-
-    return len;
-}
-
-static void __redisReaderSetErrorProtocolByte(redisReader *r, char byte) {
-    char cbuf[8], sbuf[128];
-
-    chrtos(cbuf,sizeof(cbuf),byte);
-    snprintf(sbuf,sizeof(sbuf),
-        "Protocol error, got %s as reply type byte", cbuf);
-    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,sbuf);
-}
-
-static void __redisReaderSetErrorOOM(redisReader *r) {
-    __redisReaderSetError(r,REDIS_ERR_OOM,"Out of memory");
-}
-
-static char *readBytes(redisReader *r, unsigned int bytes) {
-    char *p;
-    if (r->len-r->pos >= bytes) {
-        p = r->buf+r->pos;
-        r->pos += bytes;
-        return p;
-    }
-    return NULL;
-}
-
-/* Find pointer to \r\n. */
-static char *seekNewline(char *s, size_t len) {
-    int pos = 0;
-    int _len = len-1;
-
-    /* Position should be < len-1 because the character at "pos" should be
-     * followed by a \n. Note that strchr cannot be used because it doesn't
-     * allow to search a limited length and the buffer that is being searched
-     * might not have a trailing NULL character. */
-    while (pos < _len) {
-        while(pos < _len && s[pos] != '\r') pos++;
-        if (pos==_len) {
-            /* Not found. */
-            return NULL;
-        } else {
-            if (s[pos+1] == '\n') {
-                /* Found. */
-                return s+pos;
-            } else {
-                /* Continue searching. */
-                pos++;
-            }
-        }
-    }
-    return NULL;
-}
-
-/* Convert a string into a long long. Returns REDIS_OK if the string could be
- * parsed into a (non-overflowing) long long, REDIS_ERR otherwise. The value
- * will be set to the parsed value when appropriate.
- *
- * Note that this function demands that the string strictly represents
- * a long long: no spaces or other characters before or after the string
- * representing the number are accepted, nor zeroes at the start if not
- * for the string "0" representing the zero number.
- *
- * Because of its strictness, it is safe to use this function to check if
- * you can convert a string into a long long, and obtain back the string
- * from the number without any loss in the string representation. */
-static int string2ll(const char *s, size_t slen, long long *value) {
-    const char *p = s;
-    size_t plen = 0;
-    int negative = 0;
-    unsigned long long v;
-
-    if (plen == slen)
-        return REDIS_ERR;
-
-    /* Special case: first and only digit is 0. */
-    if (slen == 1 && p[0] == '0') {
-        if (value != NULL) *value = 0;
-        return REDIS_OK;
-    }
-
-    if (p[0] == '-') {
-        negative = 1;
-        p++; plen++;
-
-        /* Abort on only a negative sign. */
-        if (plen == slen)
-            return REDIS_ERR;
-    }
-
-    /* First digit should be 1-9, otherwise the string should just be 0. */
-    if (p[0] >= '1' && p[0] <= '9') {
-        v = p[0]-'0';
-        p++; plen++;
-    } else if (p[0] == '0' && slen == 1) {
-        *value = 0;
-        return REDIS_OK;
-    } else {
-        return REDIS_ERR;
-    }
-
-    while (plen < slen && p[0] >= '0' && p[0] <= '9') {
-        if (v > (ULLONG_MAX / 10)) /* Overflow. */
-            return REDIS_ERR;
-        v *= 10;
-
-        if (v > (ULLONG_MAX - (p[0]-'0'))) /* Overflow. */
-            return REDIS_ERR;
-        v += p[0]-'0';
-
-        p++; plen++;
-    }
-
-    /* Return if not all bytes were used. */
-    if (plen < slen)
-        return REDIS_ERR;
-
-    if (negative) {
-        if (v > ((unsigned long long)(-(LLONG_MIN+1))+1)) /* Overflow. */
-            return REDIS_ERR;
-        if (value != NULL) *value = -v;
-    } else {
-        if (v > LLONG_MAX) /* Overflow. */
-            return REDIS_ERR;
-        if (value != NULL) *value = v;
-    }
-    return REDIS_OK;
-}
-
-static char *readLine(redisReader *r, int *_len) {
-    char *p, *s;
-    int len;
-
-    p = r->buf+r->pos;
-    s = seekNewline(p,(r->len-r->pos));
-    if (s != NULL) {
-        len = s-(r->buf+r->pos);
-        r->pos += len+2; /* skip \r\n */
-        if (_len) *_len = len;
-        return p;
-    }
-    return NULL;
-}
-
-static void moveToNextTask(redisReader *r) {
-    redisReadTask *cur, *prv;
-    while (r->ridx >= 0) {
-        /* Return a.s.a.p. when the stack is now empty. */
-        if (r->ridx == 0) {
-            r->ridx--;
-            return;
-        }
-
-        cur = r->task[r->ridx];
-        prv = r->task[r->ridx-1];
-        assert(prv->type == REDIS_REPLY_ARRAY ||
-               prv->type == REDIS_REPLY_MAP ||
-               prv->type == REDIS_REPLY_SET ||
-               prv->type == REDIS_REPLY_PUSH);
-        if (cur->idx == prv->elements-1) {
-            r->ridx--;
-        } else {
-            /* Reset the type because the next item can be anything */
-            assert(cur->idx < prv->elements);
-            cur->type = -1;
-            cur->elements = -1;
-            cur->idx++;
-            return;
-        }
-    }
-}
-
-static int processLineItem(redisReader *r) {
-    redisReadTask *cur = r->task[r->ridx];
-    void *obj;
-    char *p;
-    int len;
-
-    if ((p = readLine(r,&len)) != NULL) {
-        if (cur->type == REDIS_REPLY_INTEGER) {
-            if (r->fn && r->fn->createInteger) {
-                long long v;
-                if (string2ll(p, len, &v) == REDIS_ERR) {
-                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                            "Bad integer value");
-                    return REDIS_ERR;
-                }
-                obj = r->fn->createInteger(cur,v);
-            } else {
-                obj = (void*)REDIS_REPLY_INTEGER;
-            }
-        } else if (cur->type == REDIS_REPLY_DOUBLE) {
-            if (r->fn && r->fn->createDouble) {
-                char buf[326], *eptr;
-                double d;
-
-                if ((size_t)len >= sizeof(buf)) {
-                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                            "Double value is too large");
-                    return REDIS_ERR;
-                }
-
-                memcpy(buf,p,len);
-                buf[len] = '\0';
-
-                if (strcasecmp(buf,",inf") == 0) {
-                    d = INFINITY; /* Positive infinite. */
-                } else if (strcasecmp(buf,",-inf") == 0) {
-                    d = -INFINITY; /* Negative infinite. */
-                } else {
-                    d = strtod((char*)buf,&eptr);
-                    if (buf[0] == '\0' || eptr[0] != '\0' || isnan(d)) {
-                        __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                                "Bad double value");
-                        return REDIS_ERR;
-                    }
-                }
-                obj = r->fn->createDouble(cur,d,buf,len);
-            } else {
-                obj = (void*)REDIS_REPLY_DOUBLE;
-            }
-        } else if (cur->type == REDIS_REPLY_NIL) {
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-        } else if (cur->type == REDIS_REPLY_BOOL) {
-            int bval = p[0] == 't' || p[0] == 'T';
-            if (r->fn && r->fn->createBool)
-                obj = r->fn->createBool(cur,bval);
-            else
-                obj = (void*)REDIS_REPLY_BOOL;
-        } else {
-            /* Type will be error or status. */
-            if (r->fn && r->fn->createString)
-                obj = r->fn->createString(cur,p,len);
-            else
-                obj = (void*)(size_t)(cur->type);
-        }
-
-        if (obj == NULL) {
-            __redisReaderSetErrorOOM(r);
-            return REDIS_ERR;
-        }
-
-        /* Set reply if this is the root object. */
-        if (r->ridx == 0) r->reply = obj;
-        moveToNextTask(r);
-        return REDIS_OK;
-    }
-
-    return REDIS_ERR;
-}
-
-static int processBulkItem(redisReader *r) {
-    redisReadTask *cur = r->task[r->ridx];
-    void *obj = NULL;
-    char *p, *s;
-    long long len;
-    unsigned long bytelen;
-    int success = 0;
-
-    p = r->buf+r->pos;
-    s = seekNewline(p,r->len-r->pos);
-    if (s != NULL) {
-        p = r->buf+r->pos;
-        bytelen = s-(r->buf+r->pos)+2; /* include \r\n */
-
-        if (string2ll(p, bytelen - 2, &len) == REDIS_ERR) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bad bulk string length");
-            return REDIS_ERR;
-        }
-
-        if (len < -1 || (LLONG_MAX > SIZE_MAX && len > (long long)SIZE_MAX)) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bulk string length out of range");
-            return REDIS_ERR;
-        }
-
-        if (len == -1) {
-            /* The nil object can always be created. */
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-            success = 1;
-        } else {
-            /* Only continue when the buffer contains the entire bulk item. */
-            bytelen += len+2; /* include \r\n */
-            if (r->pos+bytelen <= r->len) {
-                if ((cur->type == REDIS_REPLY_VERB && len < 4) ||
-                    (cur->type == REDIS_REPLY_VERB && s[5] != ':'))
-                {
-                    __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                            "Verbatim string 4 bytes of content type are "
-                            "missing or incorrectly encoded.");
-                    return REDIS_ERR;
-                }
-                if (r->fn && r->fn->createString)
-                    obj = r->fn->createString(cur,s+2,len);
-                else
-                    obj = (void*)(long)cur->type;
-                success = 1;
-            }
-        }
-
-        /* Proceed when obj was created. */
-        if (success) {
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            r->pos += bytelen;
-
-            /* Set reply if this is the root object. */
-            if (r->ridx == 0) r->reply = obj;
-            moveToNextTask(r);
-            return REDIS_OK;
-        }
-    }
-
-    return REDIS_ERR;
-}
-
-static int redisReaderGrow(redisReader *r) {
-    redisReadTask **aux;
-    int newlen;
-
-    /* Grow our stack size */
-    newlen = r->tasks + REDIS_READER_STACK_SIZE;
-    aux = hi_realloc(r->task, sizeof(*r->task) * newlen);
-    if (aux == NULL)
-        goto oom;
-
-    r->task = aux;
-
-    /* Allocate new tasks */
-    for (; r->tasks < newlen; r->tasks++) {
-        r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
-        if (r->task[r->tasks] == NULL)
-            goto oom;
-    }
-
-    return REDIS_OK;
-oom:
-    __redisReaderSetErrorOOM(r);
-    return REDIS_ERR;
-}
-
-/* Process the array, map and set types. */
-static int processAggregateItem(redisReader *r) {
-    redisReadTask *cur = r->task[r->ridx];
-    void *obj;
-    char *p;
-    long long elements;
-    int root = 0, len;
-
-    /* Set error for nested multi bulks with depth > 7 */
-    if (r->ridx == r->tasks - 1) {
-        if (redisReaderGrow(r) == REDIS_ERR)
-            return REDIS_ERR;
-    }
-
-    if ((p = readLine(r,&len)) != NULL) {
-        if (string2ll(p, len, &elements) == REDIS_ERR) {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Bad multi-bulk length");
-            return REDIS_ERR;
-        }
-
-        root = (r->ridx == 0);
-
-        if (elements < -1 || (LLONG_MAX > SIZE_MAX && elements > SIZE_MAX) ||
-            (r->maxelements > 0 && elements > r->maxelements))
-        {
-            __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-                    "Multi-bulk length out of range");
-            return REDIS_ERR;
-        }
-
-        if (elements == -1) {
-            if (r->fn && r->fn->createNil)
-                obj = r->fn->createNil(cur);
-            else
-                obj = (void*)REDIS_REPLY_NIL;
-
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            moveToNextTask(r);
-        } else {
-            if (cur->type == REDIS_REPLY_MAP) elements *= 2;
-
-            if (r->fn && r->fn->createArray)
-                obj = r->fn->createArray(cur,elements);
-            else
-                obj = (void*)(long)cur->type;
-
-            if (obj == NULL) {
-                __redisReaderSetErrorOOM(r);
-                return REDIS_ERR;
-            }
-
-            /* Modify task stack when there are more than 0 elements. */
-            if (elements > 0) {
-                cur->elements = elements;
-                cur->obj = obj;
-                r->ridx++;
-                r->task[r->ridx]->type = -1;
-                r->task[r->ridx]->elements = -1;
-                r->task[r->ridx]->idx = 0;
-                r->task[r->ridx]->obj = NULL;
-                r->task[r->ridx]->parent = cur;
-                r->task[r->ridx]->privdata = r->privdata;
-            } else {
-                moveToNextTask(r);
-            }
-        }
-
-        /* Set reply if this is the root object. */
-        if (root) r->reply = obj;
-        return REDIS_OK;
-    }
-
-    return REDIS_ERR;
-}
-
-static int processItem(redisReader *r) {
-    redisReadTask *cur = r->task[r->ridx];
-    char *p;
-
-    /* check if we need to read type */
-    if (cur->type < 0) {
-        if ((p = readBytes(r,1)) != NULL) {
-            switch (p[0]) {
-            case '-':
-                cur->type = REDIS_REPLY_ERROR;
-                break;
-            case '+':
-                cur->type = REDIS_REPLY_STATUS;
-                break;
-            case ':':
-                cur->type = REDIS_REPLY_INTEGER;
-                break;
-            case ',':
-                cur->type = REDIS_REPLY_DOUBLE;
-                break;
-            case '_':
-                cur->type = REDIS_REPLY_NIL;
-                break;
-            case '$':
-                cur->type = REDIS_REPLY_STRING;
-                break;
-            case '*':
-                cur->type = REDIS_REPLY_ARRAY;
-                break;
-            case '%':
-                cur->type = REDIS_REPLY_MAP;
-                break;
-            case '~':
-                cur->type = REDIS_REPLY_SET;
-                break;
-            case '#':
-                cur->type = REDIS_REPLY_BOOL;
-                break;
-            case '=':
-                cur->type = REDIS_REPLY_VERB;
-                break;
-            case '>':
-                cur->type = REDIS_REPLY_PUSH;
-                break;
-            default:
-                __redisReaderSetErrorProtocolByte(r,*p);
-                return REDIS_ERR;
-            }
-        } else {
-            /* could not consume 1 byte */
-            return REDIS_ERR;
-        }
-    }
-
-    /* process typed item */
-    switch(cur->type) {
-    case REDIS_REPLY_ERROR:
-    case REDIS_REPLY_STATUS:
-    case REDIS_REPLY_INTEGER:
-    case REDIS_REPLY_DOUBLE:
-    case REDIS_REPLY_NIL:
-    case REDIS_REPLY_BOOL:
-        return processLineItem(r);
-    case REDIS_REPLY_STRING:
-    case REDIS_REPLY_VERB:
-        return processBulkItem(r);
-    case REDIS_REPLY_ARRAY:
-    case REDIS_REPLY_MAP:
-    case REDIS_REPLY_SET:
-    case REDIS_REPLY_PUSH:
-        return processAggregateItem(r);
-    default:
-        assert(NULL);
-        return REDIS_ERR; /* Avoid warning. */
-    }
-}
-
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn) {
-    redisReader *r;
-
-    r = hi_calloc(1,sizeof(redisReader));
-    if (r == NULL)
-        return NULL;
-
-    r->buf = sdsempty();
-    if (r->buf == NULL)
-        goto oom;
-
-    r->task = hi_calloc(REDIS_READER_STACK_SIZE, sizeof(*r->task));
-    if (r->task == NULL)
-        goto oom;
-
-    for (; r->tasks < REDIS_READER_STACK_SIZE; r->tasks++) {
-        r->task[r->tasks] = hi_calloc(1, sizeof(**r->task));
-        if (r->task[r->tasks] == NULL)
-            goto oom;
-    }
-
-    r->fn = fn;
-    r->maxbuf = REDIS_READER_MAX_BUF;
-    r->maxelements = REDIS_READER_MAX_ARRAY_ELEMENTS;
-    r->ridx = -1;
-
-    return r;
-oom:
-    redisReaderFree(r);
-    return NULL;
-}
-
-void redisReaderFree(redisReader *r) {
-    if (r == NULL)
-        return;
-
-    if (r->reply != NULL && r->fn && r->fn->freeObject)
-        r->fn->freeObject(r->reply);
-
-    if (r->task) {
-        /* We know r->task[i] is allocated if i < r->tasks */
-        for (int i = 0; i < r->tasks; i++) {
-            hi_free(r->task[i]);
-        }
-
-        hi_free(r->task);
-    }
-
-    sdsfree(r->buf);
-    hi_free(r);
-}
-
-int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
-    sds newbuf;
-
-    /* Return early when this reader is in an erroneous state. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* Copy the provided buffer. */
-    if (buf != NULL && len >= 1) {
-        /* Destroy internal buffer when it is empty and is quite large. */
-        if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
-            sdsfree(r->buf);
-            r->buf = sdsempty();
-            if (r->buf == 0) goto oom;
-
-            r->pos = 0;
-        }
-
-        newbuf = sdscatlen(r->buf,buf,len);
-        if (newbuf == NULL) goto oom;
-
-        r->buf = newbuf;
-        r->len = sdslen(r->buf);
-    }
-
-    return REDIS_OK;
-oom:
-    __redisReaderSetErrorOOM(r);
-    return REDIS_ERR;
-}
-
-int redisReaderGetReply(redisReader *r, void **reply) {
-    /* Default target pointer to NULL. */
-    if (reply != NULL)
-        *reply = NULL;
-
-    /* Return early when this reader is in an erroneous state. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* When the buffer is empty, there will never be a reply. */
-    if (r->len == 0)
-        return REDIS_OK;
-
-    /* Set first item to process when the stack is empty. */
-    if (r->ridx == -1) {
-        r->task[0]->type = -1;
-        r->task[0]->elements = -1;
-        r->task[0]->idx = -1;
-        r->task[0]->obj = NULL;
-        r->task[0]->parent = NULL;
-        r->task[0]->privdata = r->privdata;
-        r->ridx = 0;
-    }
-
-    /* Process items in reply. */
-    while (r->ridx >= 0)
-        if (processItem(r) != REDIS_OK)
-            break;
-
-    /* Return ASAP when an error occurred. */
-    if (r->err)
-        return REDIS_ERR;
-
-    /* Discard part of the buffer when we've consumed at least 1k, to avoid
-     * doing unnecessary calls to memmove() in sds.c. */
-    if (r->pos >= 1024) {
-        if (sdsrange(r->buf,r->pos,-1) < 0) return REDIS_ERR;
-        r->pos = 0;
-        r->len = sdslen(r->buf);
-    }
-
-    /* Emit a reply when there is one. */
-    if (r->ridx == -1) {
-        if (reply != NULL) {
-            *reply = r->reply;
-        } else if (r->reply != NULL && r->fn && r->fn->freeObject) {
-            r->fn->freeObject(r->reply);
-        }
-        r->reply = NULL;
-    }
-    return REDIS_OK;
-}
diff --git a/ext/hiredis-1.0.2/read.h b/ext/hiredis-1.0.2/read.h
deleted file mode 100644
index 2d74d77a5..000000000
--- a/ext/hiredis-1.0.2/read.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef __HIREDIS_READ_H
-#define __HIREDIS_READ_H
-#include <stdio.h> /* for size_t */
-
-#define REDIS_ERR -1
-#define REDIS_OK 0
-
-/* When an error occurs, the err flag in a context is set to hold the type of
- * error that occurred. REDIS_ERR_IO means there was an I/O error and you
- * should use the "errno" variable to find out what is wrong.
- * For other values, the "errstr" field will hold a description. */
-#define REDIS_ERR_IO 1 /* Error in read or write */
-#define REDIS_ERR_EOF 3 /* End of file */
-#define REDIS_ERR_PROTOCOL 4 /* Protocol error */
-#define REDIS_ERR_OOM 5 /* Out of memory */
-#define REDIS_ERR_TIMEOUT 6 /* Timed out */
-#define REDIS_ERR_OTHER 2 /* Everything else... */
-
-#define REDIS_REPLY_STRING 1
-#define REDIS_REPLY_ARRAY 2
-#define REDIS_REPLY_INTEGER 3
-#define REDIS_REPLY_NIL 4
-#define REDIS_REPLY_STATUS 5
-#define REDIS_REPLY_ERROR 6
-#define REDIS_REPLY_DOUBLE 7
-#define REDIS_REPLY_BOOL 8
-#define REDIS_REPLY_MAP 9
-#define REDIS_REPLY_SET 10
-#define REDIS_REPLY_ATTR 11
-#define REDIS_REPLY_PUSH 12
-#define REDIS_REPLY_BIGNUM 13
-#define REDIS_REPLY_VERB 14
-
-/* Default max unused reader buffer. */
-#define REDIS_READER_MAX_BUF (1024*16)
-
-/* Default multi-bulk element limit */
-#define REDIS_READER_MAX_ARRAY_ELEMENTS ((1LL<<32) - 1)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct redisReadTask {
-    int type;
-    long long elements; /* number of elements in multibulk container */
-    int idx; /* index in parent (array) object */
-    void *obj; /* holds user-generated value for a read task */
-    struct redisReadTask *parent; /* parent task */
-    void *privdata; /* user-settable arbitrary field */
-} redisReadTask;
-
-typedef struct redisReplyObjectFunctions {
-    void *(*createString)(const redisReadTask*, char*, size_t);
-    void *(*createArray)(const redisReadTask*, size_t);
-    void *(*createInteger)(const redisReadTask*, long long);
-    void *(*createDouble)(const redisReadTask*, double, char*, size_t);
-    void *(*createNil)(const redisReadTask*);
-    void *(*createBool)(const redisReadTask*, int);
-    void (*freeObject)(void*);
-} redisReplyObjectFunctions;
-
-typedef struct redisReader {
-    int err; /* Error flags, 0 when there is no error */
-    char errstr[128]; /* String representation of error when applicable */
-
-    char *buf; /* Read buffer */
-    size_t pos; /* Buffer cursor */
-    size_t len; /* Buffer length */
-    size_t maxbuf; /* Max length of unused buffer */
-    long long maxelements; /* Max multi-bulk elements */
-
-    redisReadTask **task;
-    int tasks;
-
-    int ridx; /* Index of current read task */
-    void *reply; /* Temporary reply pointer */
-
-    redisReplyObjectFunctions *fn;
-    void *privdata;
-} redisReader;
-
-/* Public API for the protocol parser. */
-redisReader *redisReaderCreateWithFunctions(redisReplyObjectFunctions *fn);
-void redisReaderFree(redisReader *r);
-int redisReaderFeed(redisReader *r, const char *buf, size_t len);
-int redisReaderGetReply(redisReader *r, void **reply);
-
-#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
-#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply)
-#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/sds.c b/ext/hiredis-1.0.2/sds.c
deleted file mode 100644
index 49d2096b7..000000000
--- a/ext/hiredis-1.0.2/sds.c
+++ /dev/null
@@ -1,1289 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fmacros.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <limits.h>
-#include "sds.h"
-#include "sdsalloc.h"
-
-static inline int sdsHdrSize(char type) {
-    switch(type&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return sizeof(struct sdshdr5);
-        case SDS_TYPE_8:
-            return sizeof(struct sdshdr8);
-        case SDS_TYPE_16:
-            return sizeof(struct sdshdr16);
-        case SDS_TYPE_32:
-            return sizeof(struct sdshdr32);
-        case SDS_TYPE_64:
-            return sizeof(struct sdshdr64);
-    }
-    return 0;
-}
-
-static inline char sdsReqType(size_t string_size) {
-    if (string_size < 32)
-        return SDS_TYPE_5;
-    if (string_size < 0xff)
-        return SDS_TYPE_8;
-    if (string_size < 0xffff)
-        return SDS_TYPE_16;
-    if (string_size < 0xffffffff)
-        return SDS_TYPE_32;
-    return SDS_TYPE_64;
-}
-
-/* Create a new sds string with the content specified by the 'init' pointer
- * and 'initlen'.
- * If NULL is used for 'init' the string is initialized with zero bytes.
- *
- * The string is always null-termined (all the sds strings are, always) so
- * even if you create an sds string with:
- *
- * mystring = sdsnewlen("abc",3);
- *
- * You can print the string with printf() as there is an implicit \0 at the
- * end of the string. However the string is binary safe and can contain
- * \0 characters in the middle, as the length is stored in the sds header. */
-sds sdsnewlen(const void *init, size_t initlen) {
-    void *sh;
-    sds s;
-    char type = sdsReqType(initlen);
-    /* Empty strings are usually created in order to append. Use type 8
-     * since type 5 is not good at this. */
-    if (type == SDS_TYPE_5 && initlen == 0) type = SDS_TYPE_8;
-    int hdrlen = sdsHdrSize(type);
-    unsigned char *fp; /* flags pointer. */
-
-    sh = s_malloc(hdrlen+initlen+1);
-    if (sh == NULL) return NULL;
-    if (!init)
-        memset(sh, 0, hdrlen+initlen+1);
-    s = (char*)sh+hdrlen;
-    fp = ((unsigned char*)s)-1;
-    switch(type) {
-        case SDS_TYPE_5: {
-            *fp = type | (initlen << SDS_TYPE_BITS);
-            break;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
-            *fp = type;
-            break;
-        }
-    }
-    if (initlen && init)
-        memcpy(s, init, initlen);
-    s[initlen] = '\0';
-    return s;
-}
-
-/* Create an empty (zero length) sds string. Even in this case the string
- * always has an implicit null term. */
-sds sdsempty(void) {
-    return sdsnewlen("",0);
-}
-
-/* Create a new sds string starting from a null terminated C string. */
-sds sdsnew(const char *init) {
-    size_t initlen = (init == NULL) ? 0 : strlen(init);
-    return sdsnewlen(init, initlen);
-}
-
-/* Duplicate an sds string. */
-sds sdsdup(const sds s) {
-    return sdsnewlen(s, sdslen(s));
-}
-
-/* Free an sds string. No operation is performed if 's' is NULL. */
-void sdsfree(sds s) {
-    if (s == NULL) return;
-    s_free((char*)s-sdsHdrSize(s[-1]));
-}
-
-/* Set the sds string length to the length as obtained with strlen(), so
- * considering as content only up to the first null term character.
- *
- * This function is useful when the sds string is hacked manually in some
- * way, like in the following example:
- *
- * s = sdsnew("foobar");
- * s[2] = '\0';
- * sdsupdatelen(s);
- * printf("%d\n", sdslen(s));
- *
- * The output will be "2", but if we comment out the call to sdsupdatelen()
- * the output will be "6" as the string was modified but the logical length
- * remains 6 bytes. */
-void sdsupdatelen(sds s) {
-    int reallen = strlen(s);
-    sdssetlen(s, reallen);
-}
-
-/* Modify an sds string in-place to make it empty (zero length).
- * However all the existing buffer is not discarded but set as free space
- * so that next append operations will not require allocations up to the
- * number of bytes previously available. */
-void sdsclear(sds s) {
-    sdssetlen(s, 0);
-    s[0] = '\0';
-}
-
-/* Enlarge the free space at the end of the sds string so that the caller
- * is sure that after calling this function can overwrite up to addlen
- * bytes after the end of the string, plus one more byte for nul term.
- *
- * Note: this does not change the *length* of the sds string as returned
- * by sdslen(), but only the free buffer space we have. */
-sds sdsMakeRoomFor(sds s, size_t addlen) {
-    void *sh, *newsh;
-    size_t avail = sdsavail(s);
-    size_t len, newlen;
-    char type, oldtype = s[-1] & SDS_TYPE_MASK;
-    int hdrlen;
-
-    /* Return ASAP if there is enough space left. */
-    if (avail >= addlen) return s;
-
-    len = sdslen(s);
-    sh = (char*)s-sdsHdrSize(oldtype);
-    newlen = (len+addlen);
-    if (newlen < SDS_MAX_PREALLOC)
-        newlen *= 2;
-    else
-        newlen += SDS_MAX_PREALLOC;
-
-    type = sdsReqType(newlen);
-
-    /* Don't use type 5: the user is appending to the string and type 5 is
-     * not able to remember empty space, so sdsMakeRoomFor() must be called
-     * at every appending operation. */
-    if (type == SDS_TYPE_5) type = SDS_TYPE_8;
-
-    hdrlen = sdsHdrSize(type);
-    if (oldtype==type) {
-        newsh = s_realloc(sh, hdrlen+newlen+1);
-        if (newsh == NULL) return NULL;
-        s = (char*)newsh+hdrlen;
-    } else {
-        /* Since the header size changes, need to move the string forward,
-         * and can't use realloc */
-        newsh = s_malloc(hdrlen+newlen+1);
-        if (newsh == NULL) return NULL;
-        memcpy((char*)newsh+hdrlen, s, len+1);
-        s_free(sh);
-        s = (char*)newsh+hdrlen;
-        s[-1] = type;
-        sdssetlen(s, len);
-    }
-    sdssetalloc(s, newlen);
-    return s;
-}
-
-/* Reallocate the sds string so that it has no free space at the end. The
- * contained string remains not altered, but next concatenation operations
- * will require a reallocation.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdsRemoveFreeSpace(sds s) {
-    void *sh, *newsh;
-    char type, oldtype = s[-1] & SDS_TYPE_MASK;
-    int hdrlen;
-    size_t len = sdslen(s);
-    sh = (char*)s-sdsHdrSize(oldtype);
-
-    type = sdsReqType(len);
-    hdrlen = sdsHdrSize(type);
-    if (oldtype==type) {
-        newsh = s_realloc(sh, hdrlen+len+1);
-        if (newsh == NULL) return NULL;
-        s = (char*)newsh+hdrlen;
-    } else {
-        newsh = s_malloc(hdrlen+len+1);
-        if (newsh == NULL) return NULL;
-        memcpy((char*)newsh+hdrlen, s, len+1);
-        s_free(sh);
-        s = (char*)newsh+hdrlen;
-        s[-1] = type;
-        sdssetlen(s, len);
-    }
-    sdssetalloc(s, len);
-    return s;
-}
-
-/* Return the total size of the allocation of the specifed sds string,
- * including:
- * 1) The sds header before the pointer.
- * 2) The string.
- * 3) The free buffer at the end if any.
- * 4) The implicit null term.
- */
-size_t sdsAllocSize(sds s) {
-    size_t alloc = sdsalloc(s);
-    return sdsHdrSize(s[-1])+alloc+1;
-}
-
-/* Return the pointer of the actual SDS allocation (normally SDS strings
- * are referenced by the start of the string buffer). */
-void *sdsAllocPtr(sds s) {
-    return (void*) (s-sdsHdrSize(s[-1]));
-}
-
-/* Increment the sds length and decrements the left free space at the
- * end of the string according to 'incr'. Also set the null term
- * in the new end of the string.
- *
- * This function is used in order to fix the string length after the
- * user calls sdsMakeRoomFor(), writes something after the end of
- * the current string, and finally needs to set the new length.
- *
- * Note: it is possible to use a negative increment in order to
- * right-trim the string.
- *
- * Usage example:
- *
- * Using sdsIncrLen() and sdsMakeRoomFor() it is possible to mount the
- * following schema, to cat bytes coming from the kernel to the end of an
- * sds string without copying into an intermediate buffer:
- *
- * oldlen = sdslen(s);
- * s = sdsMakeRoomFor(s, BUFFER_SIZE);
- * nread = read(fd, s+oldlen, BUFFER_SIZE);
- * ... check for nread <= 0 and handle it ...
- * sdsIncrLen(s, nread);
- */
-void sdsIncrLen(sds s, int incr) {
-    unsigned char flags = s[-1];
-    size_t len;
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
-            unsigned char *fp = ((unsigned char*)s)-1;
-            unsigned char oldlen = SDS_TYPE_5_LEN(flags);
-            assert((incr > 0 && oldlen+incr < 32) || (incr < 0 && oldlen >= (unsigned int)(-incr)));
-            *fp = SDS_TYPE_5 | ((oldlen+incr) << SDS_TYPE_BITS);
-            len = oldlen+incr;
-            break;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= (unsigned int)incr) || (incr < 0 && sh->len >= (unsigned int)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            assert((incr >= 0 && sh->alloc-sh->len >= (uint64_t)incr) || (incr < 0 && sh->len >= (uint64_t)(-incr)));
-            len = (sh->len += incr);
-            break;
-        }
-        default: len = 0; /* Just to avoid compilation warnings. */
-    }
-    s[len] = '\0';
-}
-
-/* Grow the sds to have the specified length. Bytes that were not part of
- * the original length of the sds will be set to zero.
- *
- * if the specified length is smaller than the current length, no operation
- * is performed. */
-sds sdsgrowzero(sds s, size_t len) {
-    size_t curlen = sdslen(s);
-
-    if (len <= curlen) return s;
-    s = sdsMakeRoomFor(s,len-curlen);
-    if (s == NULL) return NULL;
-
-    /* Make sure added region doesn't contain garbage */
-    memset(s+curlen,0,(len-curlen+1)); /* also set trailing \0 byte */
-    sdssetlen(s, len);
-    return s;
-}
-
-/* Append the specified binary-safe string pointed by 't' of 'len' bytes to the
- * end of the specified sds string 's'.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatlen(sds s, const void *t, size_t len) {
-    size_t curlen = sdslen(s);
-
-    s = sdsMakeRoomFor(s,len);
-    if (s == NULL) return NULL;
-    memcpy(s+curlen, t, len);
-    sdssetlen(s, curlen+len);
-    s[curlen+len] = '\0';
-    return s;
-}
-
-/* Append the specified null termianted C string to the sds string 's'.
- *
- * After the call, the passed sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscat(sds s, const char *t) {
-    return sdscatlen(s, t, strlen(t));
-}
-
-/* Append the specified sds 't' to the existing sds 's'.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatsds(sds s, const sds t) {
-    return sdscatlen(s, t, sdslen(t));
-}
-
-/* Destructively modify the sds string 's' to hold the specified binary
- * safe string pointed by 't' of length 'len' bytes. */
-sds sdscpylen(sds s, const char *t, size_t len) {
-    if (sdsalloc(s) < len) {
-        s = sdsMakeRoomFor(s,len-sdslen(s));
-        if (s == NULL) return NULL;
-    }
-    memcpy(s, t, len);
-    s[len] = '\0';
-    sdssetlen(s, len);
-    return s;
-}
-
-/* Like sdscpylen() but 't' must be a null-termined string so that the length
- * of the string is obtained with strlen(). */
-sds sdscpy(sds s, const char *t) {
-    return sdscpylen(s, t, strlen(t));
-}
-
-/* Helper for sdscatlonglong() doing the actual number -> string
- * conversion. 's' must point to a string with room for at least
- * SDS_LLSTR_SIZE bytes.
- *
- * The function returns the length of the null-terminated string
- * representation stored at 's'. */
-#define SDS_LLSTR_SIZE 21
-int sdsll2str(char *s, long long value) {
-    char *p, aux;
-    unsigned long long v;
-    size_t l;
-
-    /* Generate the string representation, this method produces
-     * an reversed string. */
-    v = (value < 0) ? -value : value;
-    p = s;
-    do {
-        *p++ = '0'+(v%10);
-        v /= 10;
-    } while(v);
-    if (value < 0) *p++ = '-';
-
-    /* Compute length and add null term. */
-    l = p-s;
-    *p = '\0';
-
-    /* Reverse the string. */
-    p--;
-    while(s < p) {
-        aux = *s;
-        *s = *p;
-        *p = aux;
-        s++;
-        p--;
-    }
-    return l;
-}
-
-/* Identical sdsll2str(), but for unsigned long long type. */
-int sdsull2str(char *s, unsigned long long v) {
-    char *p, aux;
-    size_t l;
-
-    /* Generate the string representation, this method produces
-     * an reversed string. */
-    p = s;
-    do {
-        *p++ = '0'+(v%10);
-        v /= 10;
-    } while(v);
-
-    /* Compute length and add null term. */
-    l = p-s;
-    *p = '\0';
-
-    /* Reverse the string. */
-    p--;
-    while(s < p) {
-        aux = *s;
-        *s = *p;
-        *p = aux;
-        s++;
-        p--;
-    }
-    return l;
-}
-
-/* Create an sds string from a long long value. It is much faster than:
- *
- * sdscatprintf(sdsempty(),"%lld\n", value);
- */
-sds sdsfromlonglong(long long value) {
-    char buf[SDS_LLSTR_SIZE];
-    int len = sdsll2str(buf,value);
-
-    return sdsnewlen(buf,len);
-}
-
-/* Like sdscatprintf() but gets va_list instead of being variadic. */
-sds sdscatvprintf(sds s, const char *fmt, va_list ap) {
-    va_list cpy;
-    char staticbuf[1024], *buf = staticbuf, *t;
-    size_t buflen = strlen(fmt)*2;
-
-    /* We try to start using a static buffer for speed.
-     * If not possible we revert to heap allocation. */
-    if (buflen > sizeof(staticbuf)) {
-        buf = s_malloc(buflen);
-        if (buf == NULL) return NULL;
-    } else {
-        buflen = sizeof(staticbuf);
-    }
-
-    /* Try with buffers two times bigger every time we fail to
-     * fit the string in the current buffer size. */
-    while(1) {
-        buf[buflen-2] = '\0';
-        va_copy(cpy,ap);
-        vsnprintf(buf, buflen, fmt, cpy);
-        va_end(cpy);
-        if (buf[buflen-2] != '\0') {
-            if (buf != staticbuf) s_free(buf);
-            buflen *= 2;
-            buf = s_malloc(buflen);
-            if (buf == NULL) return NULL;
-            continue;
-        }
-        break;
-    }
-
-    /* Finally concat the obtained string to the SDS string and return it. */
-    t = sdscat(s, buf);
-    if (buf != staticbuf) s_free(buf);
-    return t;
-}
-
-/* Append to the sds string 's' a string obtained using printf-alike format
- * specifier.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call.
- *
- * Example:
- *
- * s = sdsnew("Sum is: ");
- * s = sdscatprintf(s,"%d+%d = %d",a,b,a+b).
- *
- * Often you need to create a string from scratch with the printf-alike
- * format. When this is the need, just use sdsempty() as the target string:
- *
- * s = sdscatprintf(sdsempty(), "... your format ...", args);
- */
-sds sdscatprintf(sds s, const char *fmt, ...) {
-    va_list ap;
-    char *t;
-    va_start(ap, fmt);
-    t = sdscatvprintf(s,fmt,ap);
-    va_end(ap);
-    return t;
-}
-
-/* This function is similar to sdscatprintf, but much faster as it does
- * not rely on sprintf() family functions implemented by the libc that
- * are often very slow. Moreover directly handling the sds string as
- * new data is concatenated provides a performance improvement.
- *
- * However this function only handles an incompatible subset of printf-alike
- * format specifiers:
- *
- * %s - C String
- * %S - SDS string
- * %i - signed int
- * %I - 64 bit signed integer (long long, int64_t)
- * %u - unsigned int
- * %U - 64 bit unsigned integer (unsigned long long, uint64_t)
- * %% - Verbatim "%" character.
- */
-sds sdscatfmt(sds s, char const *fmt, ...) {
-    const char *f = fmt;
-    int i;
-    va_list ap;
-
-    va_start(ap,fmt);
-    i = sdslen(s); /* Position of the next byte to write to dest str. */
-    while(*f) {
-        char next, *str;
-        size_t l;
-        long long num;
-        unsigned long long unum;
-
-        /* Make sure there is always space for at least 1 char. */
-        if (sdsavail(s)==0) {
-            s = sdsMakeRoomFor(s,1);
-            if (s == NULL) goto fmt_error;
-        }
-
-        switch(*f) {
-        case '%':
-            next = *(f+1);
-            f++;
-            switch(next) {
-            case 's':
-            case 'S':
-                str = va_arg(ap,char*);
-                l = (next == 's') ? strlen(str) : sdslen(str);
-                if (sdsavail(s) < l) {
-                    s = sdsMakeRoomFor(s,l);
-                    if (s == NULL) goto fmt_error;
-                }
-                memcpy(s+i,str,l);
-                sdsinclen(s,l);
-                i += l;
-                break;
-            case 'i':
-            case 'I':
-                if (next == 'i')
-                    num = va_arg(ap,int);
-                else
-                    num = va_arg(ap,long long);
-                {
-                    char buf[SDS_LLSTR_SIZE];
-                    l = sdsll2str(buf,num);
-                    if (sdsavail(s) < l) {
-                        s = sdsMakeRoomFor(s,l);
-                        if (s == NULL) goto fmt_error;
-                    }
-                    memcpy(s+i,buf,l);
-                    sdsinclen(s,l);
-                    i += l;
-                }
-                break;
-            case 'u':
-            case 'U':
-                if (next == 'u')
-                    unum = va_arg(ap,unsigned int);
-                else
-                    unum = va_arg(ap,unsigned long long);
-                {
-                    char buf[SDS_LLSTR_SIZE];
-                    l = sdsull2str(buf,unum);
-                    if (sdsavail(s) < l) {
-                        s = sdsMakeRoomFor(s,l);
-                        if (s == NULL) goto fmt_error;
-                    }
-                    memcpy(s+i,buf,l);
-                    sdsinclen(s,l);
-                    i += l;
-                }
-                break;
-            default: /* Handle %% and generally %<unknown>. */
-                s[i++] = next;
-                sdsinclen(s,1);
-                break;
-            }
-            break;
-        default:
-            s[i++] = *f;
-            sdsinclen(s,1);
-            break;
-        }
-        f++;
-    }
-    va_end(ap);
-
-    /* Add null-term */
-    s[i] = '\0';
-    return s;
-
-fmt_error:
-    va_end(ap);
-    return NULL;
-}
-
-/* Remove the part of the string from left and from right composed just of
- * contiguous characters found in 'cset', that is a null terminted C string.
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call.
- *
- * Example:
- *
- * s = sdsnew("AA...AA.a.aa.aHelloWorld     :::");
- * s = sdstrim(s,"Aa. :");
- * printf("%s\n", s);
- *
- * Output will be just "Hello World".
- */
-sds sdstrim(sds s, const char *cset) {
-    char *start, *end, *sp, *ep;
-    size_t len;
-
-    sp = start = s;
-    ep = end = s+sdslen(s)-1;
-    while(sp <= end && strchr(cset, *sp)) sp++;
-    while(ep > sp && strchr(cset, *ep)) ep--;
-    len = (sp > ep) ? 0 : ((ep-sp)+1);
-    if (s != sp) memmove(s, sp, len);
-    s[len] = '\0';
-    sdssetlen(s,len);
-    return s;
-}
-
-/* Turn the string into a smaller (or equal) string containing only the
- * substring specified by the 'start' and 'end' indexes.
- *
- * start and end can be negative, where -1 means the last character of the
- * string, -2 the penultimate character, and so forth.
- *
- * The interval is inclusive, so the start and end characters will be part
- * of the resulting string.
- *
- * The string is modified in-place.
- *
- * Return value:
- * -1 (error) if sdslen(s) is larger than maximum positive ssize_t value.
- *  0 on success.
- *
- * Example:
- *
- * s = sdsnew("Hello World");
- * sdsrange(s,1,-1); => "ello World"
- */
-int sdsrange(sds s, ssize_t start, ssize_t end) {
-    size_t newlen, len = sdslen(s);
-    if (len > SSIZE_MAX) return -1;
-
-    if (len == 0) return 0;
-    if (start < 0) {
-        start = len+start;
-        if (start < 0) start = 0;
-    }
-    if (end < 0) {
-        end = len+end;
-        if (end < 0) end = 0;
-    }
-    newlen = (start > end) ? 0 : (end-start)+1;
-    if (newlen != 0) {
-        if (start >= (ssize_t)len) {
-            newlen = 0;
-        } else if (end >= (ssize_t)len) {
-            end = len-1;
-            newlen = (start > end) ? 0 : (end-start)+1;
-        }
-    } else {
-        start = 0;
-    }
-    if (start && newlen) memmove(s, s+start, newlen);
-    s[newlen] = 0;
-    sdssetlen(s,newlen);
-    return 0;
-}
-
-/* Apply tolower() to every character of the sds string 's'. */
-void sdstolower(sds s) {
-    int len = sdslen(s), j;
-
-    for (j = 0; j < len; j++) s[j] = tolower(s[j]);
-}
-
-/* Apply toupper() to every character of the sds string 's'. */
-void sdstoupper(sds s) {
-    int len = sdslen(s), j;
-
-    for (j = 0; j < len; j++) s[j] = toupper(s[j]);
-}
-
-/* Compare two sds strings s1 and s2 with memcmp().
- *
- * Return value:
- *
- *     positive if s1 > s2.
- *     negative if s1 < s2.
- *     0 if s1 and s2 are exactly the same binary string.
- *
- * If two strings share exactly the same prefix, but one of the two has
- * additional characters, the longer string is considered to be greater than
- * the smaller one. */
-int sdscmp(const sds s1, const sds s2) {
-    size_t l1, l2, minlen;
-    int cmp;
-
-    l1 = sdslen(s1);
-    l2 = sdslen(s2);
-    minlen = (l1 < l2) ? l1 : l2;
-    cmp = memcmp(s1,s2,minlen);
-    if (cmp == 0) return l1-l2;
-    return cmp;
-}
-
-/* Split 's' with separator in 'sep'. An array
- * of sds strings is returned. *count will be set
- * by reference to the number of tokens returned.
- *
- * On out of memory, zero length string, zero length
- * separator, NULL is returned.
- *
- * Note that 'sep' is able to split a string using
- * a multi-character separator. For example
- * sdssplit("foo_-_bar","_-_"); will return two
- * elements "foo" and "bar".
- *
- * This version of the function is binary-safe but
- * requires length arguments. sdssplit() is just the
- * same function but for zero-terminated strings.
- */
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count) {
-    int elements = 0, slots = 5, start = 0, j;
-    sds *tokens;
-
-    if (seplen < 1 || len < 0) return NULL;
-
-    tokens = s_malloc(sizeof(sds)*slots);
-    if (tokens == NULL) return NULL;
-
-    if (len == 0) {
-        *count = 0;
-        return tokens;
-    }
-    for (j = 0; j < (len-(seplen-1)); j++) {
-        /* make sure there is room for the next element and the final one */
-        if (slots < elements+2) {
-            sds *newtokens;
-
-            slots *= 2;
-            newtokens = s_realloc(tokens,sizeof(sds)*slots);
-            if (newtokens == NULL) goto cleanup;
-            tokens = newtokens;
-        }
-        /* search the separator */
-        if ((seplen == 1 && *(s+j) == sep[0]) || (memcmp(s+j,sep,seplen) == 0)) {
-            tokens[elements] = sdsnewlen(s+start,j-start);
-            if (tokens[elements] == NULL) goto cleanup;
-            elements++;
-            start = j+seplen;
-            j = j+seplen-1; /* skip the separator */
-        }
-    }
-    /* Add the final element. We are sure there is room in the tokens array. */
-    tokens[elements] = sdsnewlen(s+start,len-start);
-    if (tokens[elements] == NULL) goto cleanup;
-    elements++;
-    *count = elements;
-    return tokens;
-
-cleanup:
-    {
-        int i;
-        for (i = 0; i < elements; i++) sdsfree(tokens[i]);
-        s_free(tokens);
-        *count = 0;
-        return NULL;
-    }
-}
-
-/* Free the result returned by sdssplitlen(), or do nothing if 'tokens' is NULL. */
-void sdsfreesplitres(sds *tokens, int count) {
-    if (!tokens) return;
-    while(count--)
-        sdsfree(tokens[count]);
-    s_free(tokens);
-}
-
-/* Append to the sds string "s" an escaped string representation where
- * all the non-printable characters (tested with isprint()) are turned into
- * escapes in the form "\n\r\a...." or "\x<hex-number>".
- *
- * After the call, the modified sds string is no longer valid and all the
- * references must be substituted with the new pointer returned by the call. */
-sds sdscatrepr(sds s, const char *p, size_t len) {
-    s = sdscatlen(s,"\"",1);
-    while(len--) {
-        switch(*p) {
-        case '\\':
-        case '"':
-            s = sdscatprintf(s,"\\%c",*p);
-            break;
-        case '\n': s = sdscatlen(s,"\\n",2); break;
-        case '\r': s = sdscatlen(s,"\\r",2); break;
-        case '\t': s = sdscatlen(s,"\\t",2); break;
-        case '\a': s = sdscatlen(s,"\\a",2); break;
-        case '\b': s = sdscatlen(s,"\\b",2); break;
-        default:
-            if (isprint(*p))
-                s = sdscatprintf(s,"%c",*p);
-            else
-                s = sdscatprintf(s,"\\x%02x",(unsigned char)*p);
-            break;
-        }
-        p++;
-    }
-    return sdscatlen(s,"\"",1);
-}
-
-/* Helper function for sdssplitargs() that converts a hex digit into an
- * integer from 0 to 15 */
-int hex_digit_to_int(char c) {
-    switch(c) {
-    case '0': return 0;
-    case '1': return 1;
-    case '2': return 2;
-    case '3': return 3;
-    case '4': return 4;
-    case '5': return 5;
-    case '6': return 6;
-    case '7': return 7;
-    case '8': return 8;
-    case '9': return 9;
-    case 'a': case 'A': return 10;
-    case 'b': case 'B': return 11;
-    case 'c': case 'C': return 12;
-    case 'd': case 'D': return 13;
-    case 'e': case 'E': return 14;
-    case 'f': case 'F': return 15;
-    default: return 0;
-    }
-}
-
-/* Split a line into arguments, where every argument can be in the
- * following programming-language REPL-alike form:
- *
- * foo bar "newline are supported\n" and "\xff\x00otherstuff"
- *
- * The number of arguments is stored into *argc, and an array
- * of sds is returned.
- *
- * The caller should free the resulting array of sds strings with
- * sdsfreesplitres().
- *
- * Note that sdscatrepr() is able to convert back a string into
- * a quoted string in the same format sdssplitargs() is able to parse.
- *
- * The function returns the allocated tokens on success, even when the
- * input string is empty, or NULL if the input contains unbalanced
- * quotes or closed quotes followed by non space characters
- * as in: "foo"bar or "foo'
- */
-sds *sdssplitargs(const char *line, int *argc) {
-    const char *p = line;
-    char *current = NULL;
-    char **vector = NULL;
-
-    *argc = 0;
-    while(1) {
-        /* skip blanks */
-        while(*p && isspace(*p)) p++;
-        if (*p) {
-            /* get a token */
-            int inq=0;  /* set to 1 if we are in "quotes" */
-            int insq=0; /* set to 1 if we are in 'single quotes' */
-            int done=0;
-
-            if (current == NULL) current = sdsempty();
-            while(!done) {
-                if (inq) {
-                    if (*p == '\\' && *(p+1) == 'x' &&
-                                             isxdigit(*(p+2)) &&
-                                             isxdigit(*(p+3)))
-                    {
-                        unsigned char byte;
-
-                        byte = (hex_digit_to_int(*(p+2))*16)+
-                                hex_digit_to_int(*(p+3));
-                        current = sdscatlen(current,(char*)&byte,1);
-                        p += 3;
-                    } else if (*p == '\\' && *(p+1)) {
-                        char c;
-
-                        p++;
-                        switch(*p) {
-                        case 'n': c = '\n'; break;
-                        case 'r': c = '\r'; break;
-                        case 't': c = '\t'; break;
-                        case 'b': c = '\b'; break;
-                        case 'a': c = '\a'; break;
-                        default: c = *p; break;
-                        }
-                        current = sdscatlen(current,&c,1);
-                    } else if (*p == '"') {
-                        /* closing quote must be followed by a space or
-                         * nothing at all. */
-                        if (*(p+1) && !isspace(*(p+1))) goto err;
-                        done=1;
-                    } else if (!*p) {
-                        /* unterminated quotes */
-                        goto err;
-                    } else {
-                        current = sdscatlen(current,p,1);
-                    }
-                } else if (insq) {
-                    if (*p == '\\' && *(p+1) == '\'') {
-                        p++;
-                        current = sdscatlen(current,"'",1);
-                    } else if (*p == '\'') {
-                        /* closing quote must be followed by a space or
-                         * nothing at all. */
-                        if (*(p+1) && !isspace(*(p+1))) goto err;
-                        done=1;
-                    } else if (!*p) {
-                        /* unterminated quotes */
-                        goto err;
-                    } else {
-                        current = sdscatlen(current,p,1);
-                    }
-                } else {
-                    switch(*p) {
-                    case ' ':
-                    case '\n':
-                    case '\r':
-                    case '\t':
-                    case '\0':
-                        done=1;
-                        break;
-                    case '"':
-                        inq=1;
-                        break;
-                    case '\'':
-                        insq=1;
-                        break;
-                    default:
-                        current = sdscatlen(current,p,1);
-                        break;
-                    }
-                }
-                if (*p) p++;
-            }
-            /* add the token to the vector */
-            {
-                char **new_vector = s_realloc(vector,((*argc)+1)*sizeof(char*));
-                if (new_vector == NULL) {
-                    s_free(vector);
-                    return NULL;
-                }
-
-                vector = new_vector;
-                vector[*argc] = current;
-                (*argc)++;
-                current = NULL;
-            }
-        } else {
-            /* Even on empty input string return something not NULL. */
-            if (vector == NULL) vector = s_malloc(sizeof(void*));
-            return vector;
-        }
-    }
-
-err:
-    while((*argc)--)
-        sdsfree(vector[*argc]);
-    s_free(vector);
-    if (current) sdsfree(current);
-    *argc = 0;
-    return NULL;
-}
-
-/* Modify the string substituting all the occurrences of the set of
- * characters specified in the 'from' string to the corresponding character
- * in the 'to' array.
- *
- * For instance: sdsmapchars(mystring, "ho", "01", 2)
- * will have the effect of turning the string "hello" into "0ell1".
- *
- * The function returns the sds string pointer, that is always the same
- * as the input pointer since no resize is needed. */
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen) {
-    size_t j, i, l = sdslen(s);
-
-    for (j = 0; j < l; j++) {
-        for (i = 0; i < setlen; i++) {
-            if (s[j] == from[i]) {
-                s[j] = to[i];
-                break;
-            }
-        }
-    }
-    return s;
-}
-
-/* Join an array of C strings using the specified separator (also a C string).
- * Returns the result as an sds string. */
-sds sdsjoin(char **argv, int argc, char *sep) {
-    sds join = sdsempty();
-    int j;
-
-    for (j = 0; j < argc; j++) {
-        join = sdscat(join, argv[j]);
-        if (j != argc-1) join = sdscat(join,sep);
-    }
-    return join;
-}
-
-/* Like sdsjoin, but joins an array of SDS strings. */
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen) {
-    sds join = sdsempty();
-    int j;
-
-    for (j = 0; j < argc; j++) {
-        join = sdscatsds(join, argv[j]);
-        if (j != argc-1) join = sdscatlen(join,sep,seplen);
-    }
-    return join;
-}
-
-/* Wrappers to the allocators used by SDS. Note that SDS will actually
- * just use the macros defined into sdsalloc.h in order to avoid to pay
- * the overhead of function calls. Here we define these wrappers only for
- * the programs SDS is linked to, if they want to touch the SDS internals
- * even if they use a different allocator. */
-void *sds_malloc(size_t size) { return s_malloc(size); }
-void *sds_realloc(void *ptr, size_t size) { return s_realloc(ptr,size); }
-void sds_free(void *ptr) { s_free(ptr); }
-
-#if defined(SDS_TEST_MAIN)
-#include <stdio.h>
-#include "testhelp.h"
-#include "limits.h"
-
-#define UNUSED(x) (void)(x)
-int sdsTest(void) {
-    {
-        sds x = sdsnew("foo"), y;
-
-        test_cond("Create a string and obtain the length",
-            sdslen(x) == 3 && memcmp(x,"foo\0",4) == 0)
-
-        sdsfree(x);
-        x = sdsnewlen("foo",2);
-        test_cond("Create a string with specified length",
-            sdslen(x) == 2 && memcmp(x,"fo\0",3) == 0)
-
-        x = sdscat(x,"bar");
-        test_cond("Strings concatenation",
-            sdslen(x) == 5 && memcmp(x,"fobar\0",6) == 0);
-
-        x = sdscpy(x,"a");
-        test_cond("sdscpy() against an originally longer string",
-            sdslen(x) == 1 && memcmp(x,"a\0",2) == 0)
-
-        x = sdscpy(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk");
-        test_cond("sdscpy() against an originally shorter string",
-            sdslen(x) == 33 &&
-            memcmp(x,"xyzxxxxxxxxxxyyyyyyyyyykkkkkkkkkk\0",33) == 0)
-
-        sdsfree(x);
-        x = sdscatprintf(sdsempty(),"%d",123);
-        test_cond("sdscatprintf() seems working in the base case",
-            sdslen(x) == 3 && memcmp(x,"123\0",4) == 0)
-
-        sdsfree(x);
-        x = sdsnew("--");
-        x = sdscatfmt(x, "Hello %s World %I,%I--", "Hi!", LLONG_MIN,LLONG_MAX);
-        test_cond("sdscatfmt() seems working in the base case",
-            sdslen(x) == 60 &&
-            memcmp(x,"--Hello Hi! World -9223372036854775808,"
-                     "9223372036854775807--",60) == 0)
-        printf("[%s]\n",x);
-
-        sdsfree(x);
-        x = sdsnew("--");
-        x = sdscatfmt(x, "%u,%U--", UINT_MAX, ULLONG_MAX);
-        test_cond("sdscatfmt() seems working with unsigned numbers",
-            sdslen(x) == 35 &&
-            memcmp(x,"--4294967295,18446744073709551615--",35) == 0)
-
-        sdsfree(x);
-        x = sdsnew(" x ");
-        sdstrim(x," x");
-        test_cond("sdstrim() works when all chars match",
-            sdslen(x) == 0)
-
-        sdsfree(x);
-        x = sdsnew(" x ");
-        sdstrim(x," ");
-        test_cond("sdstrim() works when a single char remains",
-            sdslen(x) == 1 && x[0] == 'x')
-
-        sdsfree(x);
-        x = sdsnew("xxciaoyyy");
-        sdstrim(x,"xy");
-        test_cond("sdstrim() correctly trims characters",
-            sdslen(x) == 4 && memcmp(x,"ciao\0",5) == 0)
-
-        y = sdsdup(x);
-        sdsrange(y,1,1);
-        test_cond("sdsrange(...,1,1)",
-            sdslen(y) == 1 && memcmp(y,"i\0",2) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,1,-1);
-        test_cond("sdsrange(...,1,-1)",
-            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,-2,-1);
-        test_cond("sdsrange(...,-2,-1)",
-            sdslen(y) == 2 && memcmp(y,"ao\0",3) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,2,1);
-        test_cond("sdsrange(...,2,1)",
-            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,1,100);
-        test_cond("sdsrange(...,1,100)",
-            sdslen(y) == 3 && memcmp(y,"iao\0",4) == 0)
-
-        sdsfree(y);
-        y = sdsdup(x);
-        sdsrange(y,100,100);
-        test_cond("sdsrange(...,100,100)",
-            sdslen(y) == 0 && memcmp(y,"\0",1) == 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("foo");
-        y = sdsnew("foa");
-        test_cond("sdscmp(foo,foa)", sdscmp(x,y) > 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("bar");
-        y = sdsnew("bar");
-        test_cond("sdscmp(bar,bar)", sdscmp(x,y) == 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnew("aar");
-        y = sdsnew("bar");
-        test_cond("sdscmp(bar,bar)", sdscmp(x,y) < 0)
-
-        sdsfree(y);
-        sdsfree(x);
-        x = sdsnewlen("\a\n\0foo\r",7);
-        y = sdscatrepr(sdsempty(),x,sdslen(x));
-        test_cond("sdscatrepr(...data...)",
-            memcmp(y,"\"\\a\\n\\x00foo\\r\"",15) == 0)
-
-        {
-            unsigned int oldfree;
-            char *p;
-            int step = 10, j, i;
-
-            sdsfree(x);
-            sdsfree(y);
-            x = sdsnew("0");
-            test_cond("sdsnew() free/len buffers", sdslen(x) == 1 && sdsavail(x) == 0);
-
-            /* Run the test a few times in order to hit the first two
-             * SDS header types. */
-            for (i = 0; i < 10; i++) {
-                int oldlen = sdslen(x);
-                x = sdsMakeRoomFor(x,step);
-                int type = x[-1]&SDS_TYPE_MASK;
-
-                test_cond("sdsMakeRoomFor() len", sdslen(x) == oldlen);
-                if (type != SDS_TYPE_5) {
-                    test_cond("sdsMakeRoomFor() free", sdsavail(x) >= step);
-                    oldfree = sdsavail(x);
-                }
-                p = x+oldlen;
-                for (j = 0; j < step; j++) {
-                    p[j] = 'A'+j;
-                }
-                sdsIncrLen(x,step);
-            }
-            test_cond("sdsMakeRoomFor() content",
-                memcmp("0ABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJABCDEFGHIJ",x,101) == 0);
-            test_cond("sdsMakeRoomFor() final length",sdslen(x)==101);
-
-            sdsfree(x);
-        }
-    }
-    test_report()
-    return 0;
-}
-#endif
-
-#ifdef SDS_TEST_MAIN
-int main(void) {
-    return sdsTest();
-}
-#endif
diff --git a/ext/hiredis-1.0.2/sds.h b/ext/hiredis-1.0.2/sds.h
deleted file mode 100644
index eda8833b5..000000000
--- a/ext/hiredis-1.0.2/sds.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SDS_H
-#define __SDS_H
-
-#define SDS_MAX_PREALLOC (1024*1024)
-#ifdef _MSC_VER
-#define __attribute__(x)
-typedef long long ssize_t;
-#define SSIZE_MAX (LLONG_MAX >> 1)
-#endif
-
-#include <sys/types.h>
-#include <stdarg.h>
-#include <stdint.h>
-
-typedef char *sds;
-
-/* Note: sdshdr5 is never used, we just access the flags byte directly.
- * However is here to document the layout of type 5 SDS strings. */
-struct __attribute__ ((__packed__)) sdshdr5 {
-    unsigned char flags; /* 3 lsb of type, and 5 msb of string length */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr8 {
-    uint8_t len; /* used */
-    uint8_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr16 {
-    uint16_t len; /* used */
-    uint16_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr32 {
-    uint32_t len; /* used */
-    uint32_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-struct __attribute__ ((__packed__)) sdshdr64 {
-    uint64_t len; /* used */
-    uint64_t alloc; /* excluding the header and null terminator */
-    unsigned char flags; /* 3 lsb of type, 5 unused bits */
-    char buf[];
-};
-
-#define SDS_TYPE_5  0
-#define SDS_TYPE_8  1
-#define SDS_TYPE_16 2
-#define SDS_TYPE_32 3
-#define SDS_TYPE_64 4
-#define SDS_TYPE_MASK 7
-#define SDS_TYPE_BITS 3
-#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
-#define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
-#define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)
-
-static inline size_t sdslen(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->len;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->len;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->len;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->len;
-    }
-    return 0;
-}
-
-static inline size_t sdsavail(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5: {
-            return 0;
-        }
-        case SDS_TYPE_8: {
-            SDS_HDR_VAR(8,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_16: {
-            SDS_HDR_VAR(16,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_32: {
-            SDS_HDR_VAR(32,s);
-            return sh->alloc - sh->len;
-        }
-        case SDS_TYPE_64: {
-            SDS_HDR_VAR(64,s);
-            return sh->alloc - sh->len;
-        }
-    }
-    return 0;
-}
-
-static inline void sdssetlen(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                *fp = (unsigned char)(SDS_TYPE_5 | (newlen << SDS_TYPE_BITS));
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len = (uint8_t)newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len = (uint16_t)newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len = (uint32_t)newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len = (uint64_t)newlen;
-            break;
-    }
-}
-
-static inline void sdsinclen(sds s, size_t inc) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            {
-                unsigned char *fp = ((unsigned char*)s)-1;
-                unsigned char newlen = SDS_TYPE_5_LEN(flags)+(unsigned char)inc;
-                *fp = SDS_TYPE_5 | (newlen << SDS_TYPE_BITS);
-            }
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->len += (uint8_t)inc;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->len += (uint16_t)inc;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->len += (uint32_t)inc;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->len += (uint64_t)inc;
-            break;
-    }
-}
-
-/* sdsalloc() = sdsavail() + sdslen() */
-static inline size_t sdsalloc(const sds s) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            return SDS_TYPE_5_LEN(flags);
-        case SDS_TYPE_8:
-            return SDS_HDR(8,s)->alloc;
-        case SDS_TYPE_16:
-            return SDS_HDR(16,s)->alloc;
-        case SDS_TYPE_32:
-            return SDS_HDR(32,s)->alloc;
-        case SDS_TYPE_64:
-            return SDS_HDR(64,s)->alloc;
-    }
-    return 0;
-}
-
-static inline void sdssetalloc(sds s, size_t newlen) {
-    unsigned char flags = s[-1];
-    switch(flags&SDS_TYPE_MASK) {
-        case SDS_TYPE_5:
-            /* Nothing to do, this type has no total allocation info. */
-            break;
-        case SDS_TYPE_8:
-            SDS_HDR(8,s)->alloc = (uint8_t)newlen;
-            break;
-        case SDS_TYPE_16:
-            SDS_HDR(16,s)->alloc = (uint16_t)newlen;
-            break;
-        case SDS_TYPE_32:
-            SDS_HDR(32,s)->alloc = (uint32_t)newlen;
-            break;
-        case SDS_TYPE_64:
-            SDS_HDR(64,s)->alloc = (uint64_t)newlen;
-            break;
-    }
-}
-
-sds sdsnewlen(const void *init, size_t initlen);
-sds sdsnew(const char *init);
-sds sdsempty(void);
-sds sdsdup(const sds s);
-void sdsfree(sds s);
-sds sdsgrowzero(sds s, size_t len);
-sds sdscatlen(sds s, const void *t, size_t len);
-sds sdscat(sds s, const char *t);
-sds sdscatsds(sds s, const sds t);
-sds sdscpylen(sds s, const char *t, size_t len);
-sds sdscpy(sds s, const char *t);
-
-sds sdscatvprintf(sds s, const char *fmt, va_list ap);
-#ifdef __GNUC__
-sds sdscatprintf(sds s, const char *fmt, ...)
-    __attribute__((format(printf, 2, 3)));
-#else
-sds sdscatprintf(sds s, const char *fmt, ...);
-#endif
-
-sds sdscatfmt(sds s, char const *fmt, ...);
-sds sdstrim(sds s, const char *cset);
-int sdsrange(sds s, ssize_t start, ssize_t end);
-void sdsupdatelen(sds s);
-void sdsclear(sds s);
-int sdscmp(const sds s1, const sds s2);
-sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
-void sdsfreesplitres(sds *tokens, int count);
-void sdstolower(sds s);
-void sdstoupper(sds s);
-sds sdsfromlonglong(long long value);
-sds sdscatrepr(sds s, const char *p, size_t len);
-sds *sdssplitargs(const char *line, int *argc);
-sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
-sds sdsjoin(char **argv, int argc, char *sep);
-sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
-
-/* Low level functions exposed to the user API */
-sds sdsMakeRoomFor(sds s, size_t addlen);
-void sdsIncrLen(sds s, int incr);
-sds sdsRemoveFreeSpace(sds s);
-size_t sdsAllocSize(sds s);
-void *sdsAllocPtr(sds s);
-
-/* Export the allocator used by SDS to the program using SDS.
- * Sometimes the program SDS is linked to, may use a different set of
- * allocators, but may want to allocate or free things that SDS will
- * respectively free or allocate. */
-void *sds_malloc(size_t size);
-void *sds_realloc(void *ptr, size_t size);
-void sds_free(void *ptr);
-
-#ifdef REDIS_TEST
-int sdsTest(int argc, char *argv[]);
-#endif
-
-#endif
diff --git a/ext/hiredis-1.0.2/sdsalloc.h b/ext/hiredis-1.0.2/sdsalloc.h
deleted file mode 100644
index 5538dd94c..000000000
--- a/ext/hiredis-1.0.2/sdsalloc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* SDSLib 2.0 -- A C dynamic strings library
- *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* SDS allocator selection.
- *
- * This file is used in order to change the SDS allocator at compile time.
- * Just define the following defines to what you want to use. Also add
- * the include of your alternate allocator if needed (not needed in order
- * to use the default libc allocator). */
-
-#include "alloc.h"
-
-#define s_malloc hi_malloc
-#define s_realloc hi_realloc
-#define s_free hi_free
diff --git a/ext/hiredis-1.0.2/sockcompat.c b/ext/hiredis-1.0.2/sockcompat.c
deleted file mode 100644
index f99d14b05..000000000
--- a/ext/hiredis-1.0.2/sockcompat.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define REDIS_SOCKCOMPAT_IMPLEMENTATION
-#include "sockcompat.h"
-
-#ifdef _WIN32
-static int _wsaErrorToErrno(int err) {
-    switch (err) {
-        case WSAEWOULDBLOCK:
-            return EWOULDBLOCK;
-        case WSAEINPROGRESS:
-            return EINPROGRESS;
-        case WSAEALREADY:
-            return EALREADY;
-        case WSAENOTSOCK:
-            return ENOTSOCK;
-        case WSAEDESTADDRREQ:
-            return EDESTADDRREQ;
-        case WSAEMSGSIZE:
-            return EMSGSIZE;
-        case WSAEPROTOTYPE:
-            return EPROTOTYPE;
-        case WSAENOPROTOOPT:
-            return ENOPROTOOPT;
-        case WSAEPROTONOSUPPORT:
-            return EPROTONOSUPPORT;
-        case WSAEOPNOTSUPP:
-            return EOPNOTSUPP;
-        case WSAEAFNOSUPPORT:
-            return EAFNOSUPPORT;
-        case WSAEADDRINUSE:
-            return EADDRINUSE;
-        case WSAEADDRNOTAVAIL:
-            return EADDRNOTAVAIL;
-        case WSAENETDOWN:
-            return ENETDOWN;
-        case WSAENETUNREACH:
-            return ENETUNREACH;
-        case WSAENETRESET:
-            return ENETRESET;
-        case WSAECONNABORTED:
-            return ECONNABORTED;
-        case WSAECONNRESET:
-            return ECONNRESET;
-        case WSAENOBUFS:
-            return ENOBUFS;
-        case WSAEISCONN:
-            return EISCONN;
-        case WSAENOTCONN:
-            return ENOTCONN;
-        case WSAETIMEDOUT:
-            return ETIMEDOUT;
-        case WSAECONNREFUSED:
-            return ECONNREFUSED;
-        case WSAELOOP:
-            return ELOOP;
-        case WSAENAMETOOLONG:
-            return ENAMETOOLONG;
-        case WSAEHOSTUNREACH:
-            return EHOSTUNREACH;
-        case WSAENOTEMPTY:
-            return ENOTEMPTY;
-        default:
-            /* We just return a generic I/O error if we could not find a relevant error. */
-            return EIO;
-    }
-}
-
-static void _updateErrno(int success) {
-    errno = success ? 0 : _wsaErrorToErrno(WSAGetLastError());
-}
-
-static int _initWinsock() {
-    static int s_initialized = 0;
-    if (!s_initialized) {
-        static WSADATA wsadata;
-        int err = WSAStartup(MAKEWORD(2,2), &wsadata);
-        if (err != 0) {
-            errno = _wsaErrorToErrno(err);
-            return 0;
-        }
-        s_initialized = 1;
-    }
-    return 1;
-}
-
-int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {
-    /* Note: This function is likely to be called before other functions, so run init here. */
-    if (!_initWinsock()) {
-        return EAI_FAIL;
-    }
-
-    switch (getaddrinfo(node, service, hints, res)) {
-        case 0:                     return 0;
-        case WSATRY_AGAIN:          return EAI_AGAIN;
-        case WSAEINVAL:             return EAI_BADFLAGS;
-        case WSAEAFNOSUPPORT:       return EAI_FAMILY;
-        case WSA_NOT_ENOUGH_MEMORY: return EAI_MEMORY;
-        case WSAHOST_NOT_FOUND:     return EAI_NONAME;
-        case WSATYPE_NOT_FOUND:     return EAI_SERVICE;
-        case WSAESOCKTNOSUPPORT:    return EAI_SOCKTYPE;
-        default:                    return EAI_FAIL;     /* Including WSANO_RECOVERY */
-    }
-}
-
-const char *win32_gai_strerror(int errcode) {
-    switch (errcode) {
-        case 0:            errcode = 0;                     break;
-        case EAI_AGAIN:    errcode = WSATRY_AGAIN;          break;
-        case EAI_BADFLAGS: errcode = WSAEINVAL;             break;
-        case EAI_FAMILY:   errcode = WSAEAFNOSUPPORT;       break;
-        case EAI_MEMORY:   errcode = WSA_NOT_ENOUGH_MEMORY; break;
-        case EAI_NONAME:   errcode = WSAHOST_NOT_FOUND;     break;
-        case EAI_SERVICE:  errcode = WSATYPE_NOT_FOUND;     break;
-        case EAI_SOCKTYPE: errcode = WSAESOCKTNOSUPPORT;    break;
-        default:           errcode = WSANO_RECOVERY;        break; /* Including EAI_FAIL */
-    }
-    return gai_strerror(errcode);
-}
-
-void win32_freeaddrinfo(struct addrinfo *res) {
-    freeaddrinfo(res);
-}
-
-SOCKET win32_socket(int domain, int type, int protocol) {
-    SOCKET s;
-
-    /* Note: This function is likely to be called before other functions, so run init here. */
-    if (!_initWinsock()) {
-        return INVALID_SOCKET;
-    }
-
-    _updateErrno((s = socket(domain, type, protocol)) != INVALID_SOCKET);
-    return s;
-}
-
-int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp) {
-    int ret = ioctlsocket(fd, (long)request, argp);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen) {
-    int ret = bind(sockfd, addr, addrlen);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen) {
-    int ret = connect(sockfd, addr, addrlen);
-    _updateErrno(ret != SOCKET_ERROR);
-
-    /* For Winsock connect(), the WSAEWOULDBLOCK error means the same thing as
-     * EINPROGRESS for POSIX connect(), so we do that translation to keep POSIX
-     * logic consistent. */
-    if (errno == EWOULDBLOCK) {
-        errno = EINPROGRESS;
-    }
-
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen) {
-    int ret = 0;
-    if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
-        if (*optlen >= sizeof (struct timeval)) {
-            struct timeval *tv = optval;
-            DWORD timeout = 0;
-            socklen_t dwlen = 0;
-            ret = getsockopt(sockfd, level, optname, (char *)&timeout, &dwlen);
-            tv->tv_sec = timeout / 1000;
-            tv->tv_usec = (timeout * 1000) % 1000000;
-        } else {
-            ret = WSAEFAULT;
-        }
-        *optlen = sizeof (struct timeval);
-    } else {
-        ret = getsockopt(sockfd, level, optname, (char*)optval, optlen);
-    }
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen) {
-    int ret = 0;
-    if ((level == SOL_SOCKET) && ((optname == SO_RCVTIMEO) || (optname == SO_SNDTIMEO))) {
-        const struct timeval *tv = optval;
-        DWORD timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
-        ret = setsockopt(sockfd, level, optname, (const char*)&timeout, sizeof(DWORD));
-    } else {
-        ret = setsockopt(sockfd, level, optname, (const char*)optval, optlen);
-    }
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_close(SOCKET fd) {
-    int ret = closesocket(fd);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags) {
-    int ret = recv(sockfd, (char*)buf, (int)len, flags);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags) {
-    int ret = send(sockfd, (const char*)buf, (int)len, flags);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-
-int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout) {
-    int ret = WSAPoll(fds, nfds, timeout);
-    _updateErrno(ret != SOCKET_ERROR);
-    return ret != SOCKET_ERROR ? ret : -1;
-}
-#endif /* _WIN32 */
diff --git a/ext/hiredis-1.0.2/sockcompat.h b/ext/hiredis-1.0.2/sockcompat.h
deleted file mode 100644
index 85810e848..000000000
--- a/ext/hiredis-1.0.2/sockcompat.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2019, Marcus Geelnard <m at bitsnbites dot eu>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __SOCKCOMPAT_H
-#define __SOCKCOMPAT_H
-
-#ifndef _WIN32
-/* For POSIX systems we use the standard BSD socket API. */
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <poll.h>
-#else
-/* For Windows we use winsock. */
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600 /* To get WSAPoll etc. */
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stddef.h>
-#include <errno.h>
-
-#ifdef _MSC_VER
-typedef long long ssize_t;
-#endif
-
-/* Emulate the parts of the BSD socket API that we need (override the winsock signatures). */
-int win32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);
-const char *win32_gai_strerror(int errcode);
-void win32_freeaddrinfo(struct addrinfo *res);
-SOCKET win32_socket(int domain, int type, int protocol);
-int win32_ioctl(SOCKET fd, unsigned long request, unsigned long *argp);
-int win32_bind(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
-int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);
-int win32_getsockopt(SOCKET sockfd, int level, int optname, void *optval, socklen_t *optlen);
-int win32_setsockopt(SOCKET sockfd, int level, int optname, const void *optval, socklen_t optlen);
-int win32_close(SOCKET fd);
-ssize_t win32_recv(SOCKET sockfd, void *buf, size_t len, int flags);
-ssize_t win32_send(SOCKET sockfd, const void *buf, size_t len, int flags);
-typedef ULONG nfds_t;
-int win32_poll(struct pollfd *fds, nfds_t nfds, int timeout);
-
-#ifndef REDIS_SOCKCOMPAT_IMPLEMENTATION
-#define getaddrinfo(node, service, hints, res) win32_getaddrinfo(node, service, hints, res)
-#undef gai_strerror
-#define gai_strerror(errcode) win32_gai_strerror(errcode)
-#define freeaddrinfo(res) win32_freeaddrinfo(res)
-#define socket(domain, type, protocol) win32_socket(domain, type, protocol)
-#define ioctl(fd, request, argp) win32_ioctl(fd, request, argp)
-#define bind(sockfd, addr, addrlen) win32_bind(sockfd, addr, addrlen)
-#define connect(sockfd, addr, addrlen) win32_connect(sockfd, addr, addrlen)
-#define getsockopt(sockfd, level, optname, optval, optlen) win32_getsockopt(sockfd, level, optname, optval, optlen)
-#define setsockopt(sockfd, level, optname, optval, optlen) win32_setsockopt(sockfd, level, optname, optval, optlen)
-#define close(fd) win32_close(fd)
-#define recv(sockfd, buf, len, flags) win32_recv(sockfd, buf, len, flags)
-#define send(sockfd, buf, len, flags) win32_send(sockfd, buf, len, flags)
-#define poll(fds, nfds, timeout) win32_poll(fds, nfds, timeout)
-#endif /* REDIS_SOCKCOMPAT_IMPLEMENTATION */
-#endif /* _WIN32 */
-
-#endif /* __SOCKCOMPAT_H */
diff --git a/ext/hiredis-1.0.2/ssl.c b/ext/hiredis-1.0.2/ssl.c
deleted file mode 100644
index 7df58fbde..000000000
--- a/ext/hiredis-1.0.2/ssl.c
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2019, Redis Labs
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *   * Neither the name of Redis nor the names of its contributors may be used
- *     to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "hiredis.h"
-#include "async.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <pthread.h>
-#endif
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#include "win32.h"
-#include "async_private.h"
-#include "hiredis_ssl.h"
-
-void __redisSetError(redisContext *c, int type, const char *str);
-
-struct redisSSLContext {
-    /* Associated OpenSSL SSL_CTX as created by redisCreateSSLContext() */
-    SSL_CTX *ssl_ctx;
-
-    /* Requested SNI, or NULL */
-    char *server_name;
-};
-
-/* The SSL connection context is attached to SSL/TLS connections as a privdata. */
-typedef struct redisSSL {
-    /**
-     * OpenSSL SSL object.
-     */
-    SSL *ssl;
-
-    /**
-     * SSL_write() requires to be called again with the same arguments it was
-     * previously called with in the event of an SSL_read/SSL_write situation
-     */
-    size_t lastLen;
-
-    /** Whether the SSL layer requires read (possibly before a write) */
-    int wantRead;
-
-    /**
-     * Whether a write was requested prior to a read. If set, the write()
-     * should resume whenever a read takes place, if possible
-     */
-    int pendingWrite;
-} redisSSL;
-
-/* Forward declaration */
-redisContextFuncs redisContextSSLFuncs;
-
-/**
- * OpenSSL global initialization and locking handling callbacks.
- * Note that this is only required for OpenSSL < 1.1.0.
- */
-
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-#define HIREDIS_USE_CRYPTO_LOCKS
-#endif
-
-#ifdef HIREDIS_USE_CRYPTO_LOCKS
-#ifdef _WIN32
-typedef CRITICAL_SECTION sslLockType;
-static void sslLockInit(sslLockType* l) {
-    InitializeCriticalSection(l);
-}
-static void sslLockAcquire(sslLockType* l) {
-    EnterCriticalSection(l);
-}
-static void sslLockRelease(sslLockType* l) {
-    LeaveCriticalSection(l);
-}
-#else
-typedef pthread_mutex_t sslLockType;
-static void sslLockInit(sslLockType *l) {
-    pthread_mutex_init(l, NULL);
-}
-static void sslLockAcquire(sslLockType *l) {
-    pthread_mutex_lock(l);
-}
-static void sslLockRelease(sslLockType *l) {
-    pthread_mutex_unlock(l);
-}
-#endif
-
-static sslLockType* ossl_locks;
-
-static void opensslDoLock(int mode, int lkid, const char *f, int line) {
-    sslLockType *l = ossl_locks + lkid;
-
-    if (mode & CRYPTO_LOCK) {
-        sslLockAcquire(l);
-    } else {
-        sslLockRelease(l);
-    }
-
-    (void)f;
-    (void)line;
-}
-
-static int initOpensslLocks(void) {
-    unsigned ii, nlocks;
-    if (CRYPTO_get_locking_callback() != NULL) {
-        /* Someone already set the callback before us. Don't destroy it! */
-        return REDIS_OK;
-    }
-    nlocks = CRYPTO_num_locks();
-    ossl_locks = hi_malloc(sizeof(*ossl_locks) * nlocks);
-    if (ossl_locks == NULL)
-        return REDIS_ERR;
-
-    for (ii = 0; ii < nlocks; ii++) {
-        sslLockInit(ossl_locks + ii);
-    }
-    CRYPTO_set_locking_callback(opensslDoLock);
-    return REDIS_OK;
-}
-#endif /* HIREDIS_USE_CRYPTO_LOCKS */
-
-int redisInitOpenSSL(void)
-{
-    SSL_library_init();
-#ifdef HIREDIS_USE_CRYPTO_LOCKS
-    initOpensslLocks();
-#endif
-
-    return REDIS_OK;
-}
-
-/**
- * redisSSLContext helper context destruction.
- */
-
-const char *redisSSLContextGetError(redisSSLContextError error)
-{
-    switch (error) {
-        case REDIS_SSL_CTX_NONE:
-            return "No Error";
-        case REDIS_SSL_CTX_CREATE_FAILED:
-            return "Failed to create OpenSSL SSL_CTX";
-        case REDIS_SSL_CTX_CERT_KEY_REQUIRED:
-            return "Client cert and key must both be specified or skipped";
-        case REDIS_SSL_CTX_CA_CERT_LOAD_FAILED:
-            return "Failed to load CA Certificate or CA Path";
-        case REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED:
-            return "Failed to load client certificate";
-        case REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED:
-            return "Failed to load private key";
-        default:
-            return "Unknown error code";
-    }
-}
-
-void redisFreeSSLContext(redisSSLContext *ctx)
-{
-    if (!ctx)
-        return;
-
-    if (ctx->server_name) {
-        hi_free(ctx->server_name);
-        ctx->server_name = NULL;
-    }
-
-    if (ctx->ssl_ctx) {
-        SSL_CTX_free(ctx->ssl_ctx);
-        ctx->ssl_ctx = NULL;
-    }
-
-    hi_free(ctx);
-}
-
-
-/**
- * redisSSLContext helper context initialization.
- */
-
-redisSSLContext *redisCreateSSLContext(const char *cacert_filename, const char *capath,
-        const char *cert_filename, const char *private_key_filename,
-        const char *server_name, redisSSLContextError *error)
-{
-    redisSSLContext *ctx = hi_calloc(1, sizeof(redisSSLContext));
-    if (ctx == NULL)
-        goto error;
-
-    ctx->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-    if (!ctx->ssl_ctx) {
-        if (error) *error = REDIS_SSL_CTX_CREATE_FAILED;
-        goto error;
-    }
-
-    SSL_CTX_set_options(ctx->ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-    SSL_CTX_set_verify(ctx->ssl_ctx, SSL_VERIFY_PEER, NULL);
-
-    if ((cert_filename != NULL && private_key_filename == NULL) ||
-            (private_key_filename != NULL && cert_filename == NULL)) {
-        if (error) *error = REDIS_SSL_CTX_CERT_KEY_REQUIRED;
-        goto error;
-    }
-
-    if (capath || cacert_filename) {
-        if (!SSL_CTX_load_verify_locations(ctx->ssl_ctx, cacert_filename, capath)) {
-            if (error) *error = REDIS_SSL_CTX_CA_CERT_LOAD_FAILED;
-            goto error;
-        }
-    }
-
-    if (cert_filename) {
-        if (!SSL_CTX_use_certificate_chain_file(ctx->ssl_ctx, cert_filename)) {
-            if (error) *error = REDIS_SSL_CTX_CLIENT_CERT_LOAD_FAILED;
-            goto error;
-        }
-        if (!SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, private_key_filename, SSL_FILETYPE_PEM)) {
-            if (error) *error = REDIS_SSL_CTX_PRIVATE_KEY_LOAD_FAILED;
-            goto error;
-        }
-    }
-
-    if (server_name)
-        ctx->server_name = hi_strdup(server_name);
-
-    return ctx;
-
-error:
-    redisFreeSSLContext(ctx);
-    return NULL;
-}
-
-/**
- * SSL Connection initialization.
- */
-
-
-static int redisSSLConnect(redisContext *c, SSL *ssl) {
-    if (c->privctx) {
-        __redisSetError(c, REDIS_ERR_OTHER, "redisContext was already associated");
-        return REDIS_ERR;
-    }
-
-    redisSSL *rssl = hi_calloc(1, sizeof(redisSSL));
-    if (rssl == NULL) {
-        __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-        return REDIS_ERR;
-    }
-
-    c->funcs = &redisContextSSLFuncs;
-    rssl->ssl = ssl;
-
-    SSL_set_mode(rssl->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
-    SSL_set_fd(rssl->ssl, c->fd);
-    SSL_set_connect_state(rssl->ssl);
-
-    ERR_clear_error();
-    int rv = SSL_connect(rssl->ssl);
-    if (rv == 1) {
-        c->privctx = rssl;
-        return REDIS_OK;
-    }
-
-    rv = SSL_get_error(rssl->ssl, rv);
-    if (((c->flags & REDIS_BLOCK) == 0) &&
-        (rv == SSL_ERROR_WANT_READ || rv == SSL_ERROR_WANT_WRITE)) {
-        c->privctx = rssl;
-        return REDIS_OK;
-    }
-
-    if (c->err == 0) {
-        char err[512];
-        if (rv == SSL_ERROR_SYSCALL)
-            snprintf(err,sizeof(err)-1,"SSL_connect failed: %s",strerror(errno));
-        else {
-            unsigned long e = ERR_peek_last_error();
-            snprintf(err,sizeof(err)-1,"SSL_connect failed: %s",
-                    ERR_reason_error_string(e));
-        }
-        __redisSetError(c, REDIS_ERR_IO, err);
-    }
-
-    hi_free(rssl);
-    return REDIS_ERR;
-}
-
-/**
- * A wrapper around redisSSLConnect() for users who manage their own context and
- * create their own SSL object.
- */
-
-int redisInitiateSSL(redisContext *c, SSL *ssl) {
-    return redisSSLConnect(c, ssl);
-}
-
-/**
- * A wrapper around redisSSLConnect() for users who use redisSSLContext and don't
- * manage their own SSL objects.
- */
-
-int redisInitiateSSLWithContext(redisContext *c, redisSSLContext *redis_ssl_ctx)
-{
-    if (!c || !redis_ssl_ctx)
-        return REDIS_ERR;
-
-    /* We want to verify that redisSSLConnect() won't fail on this, as it will
-     * not own the SSL object in that case and we'll end up leaking.
-     */
-    if (c->privctx)
-        return REDIS_ERR;
-
-    SSL *ssl = SSL_new(redis_ssl_ctx->ssl_ctx);
-    if (!ssl) {
-        __redisSetError(c, REDIS_ERR_OTHER, "Couldn't create new SSL instance");
-        goto error;
-    }
-
-    if (redis_ssl_ctx->server_name) {
-        if (!SSL_set_tlsext_host_name(ssl, redis_ssl_ctx->server_name)) {
-            __redisSetError(c, REDIS_ERR_OTHER, "Failed to set server_name/SNI");
-            goto error;
-        }
-    }
-
-    return redisSSLConnect(c, ssl);
-
-error:
-    if (ssl)
-        SSL_free(ssl);
-    return REDIS_ERR;
-}
-
-static int maybeCheckWant(redisSSL *rssl, int rv) {
-    /**
-     * If the error is WANT_READ or WANT_WRITE, the appropriate flags are set
-     * and true is returned. False is returned otherwise
-     */
-    if (rv == SSL_ERROR_WANT_READ) {
-        rssl->wantRead = 1;
-        return 1;
-    } else if (rv == SSL_ERROR_WANT_WRITE) {
-        rssl->pendingWrite = 1;
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-/**
- * Implementation of redisContextFuncs for SSL connections.
- */
-
-static void redisSSLFree(void *privctx){
-    redisSSL *rsc = privctx;
-
-    if (!rsc) return;
-    if (rsc->ssl) {
-        SSL_free(rsc->ssl);
-        rsc->ssl = NULL;
-    }
-    hi_free(rsc);
-}
-
-static ssize_t redisSSLRead(redisContext *c, char *buf, size_t bufcap) {
-    redisSSL *rssl = c->privctx;
-
-    int nread = SSL_read(rssl->ssl, buf, bufcap);
-    if (nread > 0) {
-        return nread;
-    } else if (nread == 0) {
-        __redisSetError(c, REDIS_ERR_EOF, "Server closed the connection");
-        return -1;
-    } else {
-        int err = SSL_get_error(rssl->ssl, nread);
-        if (c->flags & REDIS_BLOCK) {
-            /**
-             * In blocking mode, we should never end up in a situation where
-             * we get an error without it being an actual error, except
-             * in the case of EINTR, which can be spuriously received from
-             * debuggers or whatever.
-             */
-            if (errno == EINTR) {
-                return 0;
-            } else {
-                const char *msg = NULL;
-                if (errno == EAGAIN) {
-                    msg = "Resource temporarily unavailable";
-                }
-                __redisSetError(c, REDIS_ERR_IO, msg);
-                return -1;
-            }
-        }
-
-        /**
-         * We can very well get an EWOULDBLOCK/EAGAIN, however
-         */
-        if (maybeCheckWant(rssl, err)) {
-            return 0;
-        } else {
-            __redisSetError(c, REDIS_ERR_IO, NULL);
-            return -1;
-        }
-    }
-}
-
-static ssize_t redisSSLWrite(redisContext *c) {
-    redisSSL *rssl = c->privctx;
-
-    size_t len = rssl->lastLen ? rssl->lastLen : sdslen(c->obuf);
-    int rv = SSL_write(rssl->ssl, c->obuf, len);
-
-    if (rv > 0) {
-        rssl->lastLen = 0;
-    } else if (rv < 0) {
-        rssl->lastLen = len;
-
-        int err = SSL_get_error(rssl->ssl, rv);
-        if ((c->flags & REDIS_BLOCK) == 0 && maybeCheckWant(rssl, err)) {
-            return 0;
-        } else {
-            __redisSetError(c, REDIS_ERR_IO, NULL);
-            return -1;
-        }
-    }
-    return rv;
-}
-
-static void redisSSLAsyncRead(redisAsyncContext *ac) {
-    int rv;
-    redisSSL *rssl = ac->c.privctx;
-    redisContext *c = &ac->c;
-
-    rssl->wantRead = 0;
-
-    if (rssl->pendingWrite) {
-        int done;
-
-        /* This is probably just a write event */
-        rssl->pendingWrite = 0;
-        rv = redisBufferWrite(c, &done);
-        if (rv == REDIS_ERR) {
-            __redisAsyncDisconnect(ac);
-            return;
-        } else if (!done) {
-            _EL_ADD_WRITE(ac);
-        }
-    }
-
-    rv = redisBufferRead(c);
-    if (rv == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-    } else {
-        _EL_ADD_READ(ac);
-        redisProcessCallbacks(ac);
-    }
-}
-
-static void redisSSLAsyncWrite(redisAsyncContext *ac) {
-    int rv, done = 0;
-    redisSSL *rssl = ac->c.privctx;
-    redisContext *c = &ac->c;
-
-    rssl->pendingWrite = 0;
-    rv = redisBufferWrite(c, &done);
-    if (rv == REDIS_ERR) {
-        __redisAsyncDisconnect(ac);
-        return;
-    }
-
-    if (!done) {
-        if (rssl->wantRead) {
-            /* Need to read-before-write */
-            rssl->pendingWrite = 1;
-            _EL_DEL_WRITE(ac);
-        } else {
-            /* No extra reads needed, just need to write more */
-            _EL_ADD_WRITE(ac);
-        }
-    } else {
-        /* Already done! */
-        _EL_DEL_WRITE(ac);
-    }
-
-    /* Always reschedule a read */
-    _EL_ADD_READ(ac);
-}
-
-redisContextFuncs redisContextSSLFuncs = {
-    .free_privctx = redisSSLFree,
-    .async_read = redisSSLAsyncRead,
-    .async_write = redisSSLAsyncWrite,
-    .read = redisSSLRead,
-    .write = redisSSLWrite
-};
-
diff --git a/ext/hiredis-1.0.2/test.c b/ext/hiredis-1.0.2/test.c
deleted file mode 100644
index 397f5640e..000000000
--- a/ext/hiredis-1.0.2/test.c
+++ /dev/null
@@ -1,1401 +0,0 @@
-#include "fmacros.h"
-#include "sockcompat.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef _WIN32
-#include <strings.h>
-#include <sys/time.h>
-#endif
-#include <assert.h>
-#include <signal.h>
-#include <errno.h>
-#include <limits.h>
-
-#include "hiredis.h"
-#include "async.h"
-#ifdef HIREDIS_TEST_SSL
-#include "hiredis_ssl.h"
-#endif
-#include "net.h"
-#include "win32.h"
-
-enum connection_type {
-    CONN_TCP,
-    CONN_UNIX,
-    CONN_FD,
-    CONN_SSL
-};
-
-struct config {
-    enum connection_type type;
-
-    struct {
-        const char *host;
-        int port;
-        struct timeval timeout;
-    } tcp;
-
-    struct {
-        const char *path;
-    } unix_sock;
-
-    struct {
-        const char *host;
-        int port;
-        const char *ca_cert;
-        const char *cert;
-        const char *key;
-    } ssl;
-};
-
-struct privdata {
-    int dtor_counter;
-};
-
-#ifdef HIREDIS_TEST_SSL
-redisSSLContext *_ssl_ctx = NULL;
-#endif
-
-/* The following lines make up our testing "framework" :) */
-static int tests = 0, fails = 0, skips = 0;
-#define test(_s) { printf("#%02d ", ++tests); printf(_s); }
-#define test_cond(_c) if(_c) printf("\033[0;32mPASSED\033[0;0m\n"); else {printf("\033[0;31mFAILED\033[0;0m\n"); fails++;}
-#define test_skipped() { printf("\033[01;33mSKIPPED\033[0;0m\n"); skips++; }
-
-static long long usec(void) {
-#ifndef _MSC_VER
-    struct timeval tv;
-    gettimeofday(&tv,NULL);
-    return (((long long)tv.tv_sec)*1000000)+tv.tv_usec;
-#else
-    FILETIME ft;
-    GetSystemTimeAsFileTime(&ft);
-    return (((long long)ft.dwHighDateTime << 32) | ft.dwLowDateTime) / 10;
-#endif
-}
-
-/* The assert() calls below have side effects, so we need assert()
- * even if we are compiling without asserts (-DNDEBUG). */
-#ifdef NDEBUG
-#undef assert
-#define assert(e) (void)(e)
-#endif
-
-/* Helper to extract Redis version information.  Aborts on any failure. */
-#define REDIS_VERSION_FIELD "redis_version:"
-void get_redis_version(redisContext *c, int *majorptr, int *minorptr) {
-    redisReply *reply;
-    char *eptr, *s, *e;
-    int major, minor;
-
-    reply = redisCommand(c, "INFO");
-    if (reply == NULL || c->err || reply->type != REDIS_REPLY_STRING)
-        goto abort;
-    if ((s = strstr(reply->str, REDIS_VERSION_FIELD)) == NULL)
-        goto abort;
-
-    s += strlen(REDIS_VERSION_FIELD);
-
-    /* We need a field terminator and at least 'x.y.z' (5) bytes of data */
-    if ((e = strstr(s, "\r\n")) == NULL || (e - s) < 5)
-        goto abort;
-
-    /* Extract version info */
-    major = strtol(s, &eptr, 10);
-    if (*eptr != '.') goto abort;
-    minor = strtol(eptr+1, NULL, 10);
-
-    /* Push info the caller wants */
-    if (majorptr) *majorptr = major;
-    if (minorptr) *minorptr = minor;
-
-    freeReplyObject(reply);
-    return;
-
-abort:
-    freeReplyObject(reply);
-    fprintf(stderr, "Error:  Cannot determine Redis version, aborting\n");
-    exit(1);
-}
-
-static redisContext *select_database(redisContext *c) {
-    redisReply *reply;
-
-    /* Switch to DB 9 for testing, now that we know we can chat. */
-    reply = redisCommand(c,"SELECT 9");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    /* Make sure the DB is emtpy */
-    reply = redisCommand(c,"DBSIZE");
-    assert(reply != NULL);
-    if (reply->type == REDIS_REPLY_INTEGER && reply->integer == 0) {
-        /* Awesome, DB 9 is empty and we can continue. */
-        freeReplyObject(reply);
-    } else {
-        printf("Database #9 is not empty, test can not continue\n");
-        exit(1);
-    }
-
-    return c;
-}
-
-/* Switch protocol */
-static void send_hello(redisContext *c, int version) {
-    redisReply *reply;
-    int expected;
-
-    reply = redisCommand(c, "HELLO %d", version);
-    expected = version == 3 ? REDIS_REPLY_MAP : REDIS_REPLY_ARRAY;
-    assert(reply != NULL && reply->type == expected);
-    freeReplyObject(reply);
-}
-
-/* Togggle client tracking */
-static void send_client_tracking(redisContext *c, const char *str) {
-    redisReply *reply;
-
-    reply = redisCommand(c, "CLIENT TRACKING %s", str);
-    assert(reply != NULL && reply->type == REDIS_REPLY_STATUS);
-    freeReplyObject(reply);
-}
-
-static int disconnect(redisContext *c, int keep_fd) {
-    redisReply *reply;
-
-    /* Make sure we're on DB 9. */
-    reply = redisCommand(c,"SELECT 9");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-    reply = redisCommand(c,"FLUSHDB");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    /* Free the context as well, but keep the fd if requested. */
-    if (keep_fd)
-        return redisFreeKeepFd(c);
-    redisFree(c);
-    return -1;
-}
-
-static void do_ssl_handshake(redisContext *c) {
-#ifdef HIREDIS_TEST_SSL
-    redisInitiateSSLWithContext(c, _ssl_ctx);
-    if (c->err) {
-        printf("SSL error: %s\n", c->errstr);
-        redisFree(c);
-        exit(1);
-    }
-#else
-    (void) c;
-#endif
-}
-
-static redisContext *do_connect(struct config config) {
-    redisContext *c = NULL;
-
-    if (config.type == CONN_TCP) {
-        c = redisConnect(config.tcp.host, config.tcp.port);
-    } else if (config.type == CONN_SSL) {
-        c = redisConnect(config.ssl.host, config.ssl.port);
-    } else if (config.type == CONN_UNIX) {
-        c = redisConnectUnix(config.unix_sock.path);
-    } else if (config.type == CONN_FD) {
-        /* Create a dummy connection just to get an fd to inherit */
-        redisContext *dummy_ctx = redisConnectUnix(config.unix_sock.path);
-        if (dummy_ctx) {
-            int fd = disconnect(dummy_ctx, 1);
-            printf("Connecting to inherited fd %d\n", fd);
-            c = redisConnectFd(fd);
-        }
-    } else {
-        assert(NULL);
-    }
-
-    if (c == NULL) {
-        printf("Connection error: can't allocate redis context\n");
-        exit(1);
-    } else if (c->err) {
-        printf("Connection error: %s\n", c->errstr);
-        redisFree(c);
-        exit(1);
-    }
-
-    if (config.type == CONN_SSL) {
-        do_ssl_handshake(c);
-    }
-
-    return select_database(c);
-}
-
-static void do_reconnect(redisContext *c, struct config config) {
-    redisReconnect(c);
-
-    if (config.type == CONN_SSL) {
-        do_ssl_handshake(c);
-    }
-}
-
-static void test_format_commands(void) {
-    char *cmd;
-    int len;
-
-    test("Format command without interpolation: ");
-    len = redisFormatCommand(&cmd,"SET foo bar");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command with %%s string interpolation: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","foo","bar");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command with %%s and an empty string: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","foo","");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    hi_free(cmd);
-
-    test("Format command with an empty string in between proper interpolations: ");
-    len = redisFormatCommand(&cmd,"SET %s %s","","foo");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$0\r\n\r\n$3\r\nfoo\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(0+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command with %%b string interpolation: ");
-    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"b\0r",(size_t)3);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nb\0r\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command with %%b and an empty string: ");
-    len = redisFormatCommand(&cmd,"SET %b %b","foo",(size_t)3,"",(size_t)0);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$0\r\n\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(0+2));
-    hi_free(cmd);
-
-    test("Format command with literal %%: ");
-    len = redisFormatCommand(&cmd,"SET %% %%");
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$1\r\n%\r\n$1\r\n%\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(1+2)+4+(1+2));
-    hi_free(cmd);
-
-    /* Vararg width depends on the type. These tests make sure that the
-     * width is correctly determined using the format and subsequent varargs
-     * can correctly be interpolated. */
-#define INTEGER_WIDTH_TEST(fmt, type) do {                                                \
-    type value = 123;                                                                     \
-    test("Format command with printf-delegation (" #type "): ");                          \
-    len = redisFormatCommand(&cmd,"key:%08" fmt " str:%s", value, "hello");               \
-    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:00000123\r\n$9\r\nstr:hello\r\n",len) == 0 && \
-        len == 4+5+(12+2)+4+(9+2));                                                       \
-    hi_free(cmd);                                                                         \
-} while(0)
-
-#define FLOAT_WIDTH_TEST(type) do {                                                       \
-    type value = 123.0;                                                                   \
-    test("Format command with printf-delegation (" #type "): ");                          \
-    len = redisFormatCommand(&cmd,"key:%08.3f str:%s", value, "hello");                   \
-    test_cond(strncmp(cmd,"*2\r\n$12\r\nkey:0123.000\r\n$9\r\nstr:hello\r\n",len) == 0 && \
-        len == 4+5+(12+2)+4+(9+2));                                                       \
-    hi_free(cmd);                                                                         \
-} while(0)
-
-    INTEGER_WIDTH_TEST("d", int);
-    INTEGER_WIDTH_TEST("hhd", char);
-    INTEGER_WIDTH_TEST("hd", short);
-    INTEGER_WIDTH_TEST("ld", long);
-    INTEGER_WIDTH_TEST("lld", long long);
-    INTEGER_WIDTH_TEST("u", unsigned int);
-    INTEGER_WIDTH_TEST("hhu", unsigned char);
-    INTEGER_WIDTH_TEST("hu", unsigned short);
-    INTEGER_WIDTH_TEST("lu", unsigned long);
-    INTEGER_WIDTH_TEST("llu", unsigned long long);
-    FLOAT_WIDTH_TEST(float);
-    FLOAT_WIDTH_TEST(double);
-
-    test("Format command with invalid printf format: ");
-    len = redisFormatCommand(&cmd,"key:%08p %b",(void*)1234,"foo",(size_t)3);
-    test_cond(len == -1);
-
-    const char *argv[3];
-    argv[0] = "SET";
-    argv[1] = "foo\0xxx";
-    argv[2] = "bar";
-    size_t lens[3] = { 3, 7, 3 };
-    int argc = 3;
-
-    test("Format command by passing argc/argv without lengths: ");
-    len = redisFormatCommandArgv(&cmd,argc,argv,NULL);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    hi_free(cmd);
-
-    test("Format command by passing argc/argv with lengths: ");
-    len = redisFormatCommandArgv(&cmd,argc,argv,lens);
-    test_cond(strncmp(cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
-    hi_free(cmd);
-
-    sds sds_cmd;
-
-    sds_cmd = NULL;
-    test("Format command into sds by passing argc/argv without lengths: ");
-    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,NULL);
-    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$3\r\nfoo\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(3+2)+4+(3+2));
-    sdsfree(sds_cmd);
-
-    sds_cmd = NULL;
-    test("Format command into sds by passing argc/argv with lengths: ");
-    len = redisFormatSdsCommandArgv(&sds_cmd,argc,argv,lens);
-    test_cond(strncmp(sds_cmd,"*3\r\n$3\r\nSET\r\n$7\r\nfoo\0xxx\r\n$3\r\nbar\r\n",len) == 0 &&
-        len == 4+4+(3+2)+4+(7+2)+4+(3+2));
-    sdsfree(sds_cmd);
-}
-
-static void test_append_formatted_commands(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    char *cmd;
-    int len;
-
-    c = do_connect(config);
-
-    test("Append format command: ");
-
-    len = redisFormatCommand(&cmd, "SET foo bar");
-
-    test_cond(redisAppendFormattedCommand(c, cmd, len) == REDIS_OK);
-
-    assert(redisGetReply(c, (void*)&reply) == REDIS_OK);
-
-    hi_free(cmd);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_reply_reader(void) {
-    redisReader *reader;
-    void *reply, *root;
-    int ret;
-    int i;
-
-    test("Error handling in reply parser: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"@foo\r\n",6);
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
-    redisReaderFree(reader);
-
-    /* when the reply already contains multiple items, they must be free'd
-     * on an error. valgrind will bark when this doesn't happen. */
-    test("Memory cleanup in reply parser: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*2\r\n",4);
-    redisReaderFeed(reader,(char*)"$5\r\nhello\r\n",11);
-    redisReaderFeed(reader,(char*)"@foo\r\n",6);
-    ret = redisReaderGetReply(reader,NULL);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
-    redisReaderFree(reader);
-
-    reader = redisReaderCreate();
-    test("Can handle arbitrarily nested multi-bulks: ");
-    for (i = 0; i < 128; i++) {
-        redisReaderFeed(reader,(char*)"*1\r\n", 4);
-    }
-    redisReaderFeed(reader,(char*)"$6\r\nLOLWUT\r\n",12);
-    ret = redisReaderGetReply(reader,&reply);
-    root = reply; /* Keep track of the root reply */
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
-        ((redisReply*)reply)->elements == 1);
-
-    test("Can parse arbitrarily nested multi-bulks correctly: ");
-    while(i--) {
-        assert(reply != NULL && ((redisReply*)reply)->type == REDIS_REPLY_ARRAY);
-        reply = ((redisReply*)reply)->element[0];
-    }
-    test_cond(((redisReply*)reply)->type == REDIS_REPLY_STRING &&
-        !memcmp(((redisReply*)reply)->str, "LOLWUT", 6));
-    freeReplyObject(root);
-    redisReaderFree(reader);
-
-    test("Correctly parses LLONG_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":9223372036854775807\r\n",22);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
-            ((redisReply*)reply)->integer == LLONG_MAX);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when > LLONG_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":9223372036854775808\r\n",22);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bad integer value") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Correctly parses LLONG_MIN: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":-9223372036854775808\r\n",23);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-            ((redisReply*)reply)->type == REDIS_REPLY_INTEGER &&
-            ((redisReply*)reply)->integer == LLONG_MIN);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when < LLONG_MIN: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, ":-9223372036854775809\r\n",23);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bad integer value") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when array < -1: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "*-2\r\n+asdf\r\n",12);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when bulk < -1: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "$-2\r\nasdf\r\n",11);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Can configure maximum multi-bulk elements: ");
-    reader = redisReaderCreate();
-    reader->maxelements = 1024;
-    redisReaderFeed(reader, "*1025\r\n", 7);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-              strcasecmp(reader->errstr, "Multi-bulk length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Multi-bulk never overflows regardless of maxelements: ");
-    size_t bad_mbulk_len = (SIZE_MAX / sizeof(void *)) + 3;
-    char bad_mbulk_reply[100];
-    snprintf(bad_mbulk_reply, sizeof(bad_mbulk_reply), "*%llu\r\n+asdf\r\n",
-        (unsigned long long) bad_mbulk_len);
-
-    reader = redisReaderCreate();
-    reader->maxelements = 0;    /* Don't rely on default limit */
-    redisReaderFeed(reader, bad_mbulk_reply, strlen(bad_mbulk_reply));
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR && strcasecmp(reader->errstr, "Out of memory") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-#if LLONG_MAX > SIZE_MAX
-    test("Set error when array > SIZE_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "*9223372036854775807\r\n+asdf\r\n",29);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-            strcasecmp(reader->errstr,"Multi-bulk length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    test("Set error when bulk > SIZE_MAX: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader, "$9223372036854775807\r\nasdf\r\n",28);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR &&
-            strcasecmp(reader->errstr,"Bulk string length out of range") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-#endif
-
-    test("Works with NULL functions for reply: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"+OK\r\n",5);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
-    redisReaderFree(reader);
-
-    test("Works when a single newline (\\r\\n) covers two calls to feed: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"+OK\r",4);
-    ret = redisReaderGetReply(reader,&reply);
-    assert(ret == REDIS_OK && reply == NULL);
-    redisReaderFeed(reader,(char*)"\n",1);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
-    redisReaderFree(reader);
-
-    test("Don't reset state after protocol error: ");
-    reader = redisReaderCreate();
-    reader->fn = NULL;
-    redisReaderFeed(reader,(char*)"x",1);
-    ret = redisReaderGetReply(reader,&reply);
-    assert(ret == REDIS_ERR);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR && reply == NULL);
-    redisReaderFree(reader);
-
-    /* Regression test for issue #45 on GitHub. */
-    test("Don't do empty allocation for empty multi bulk: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*0\r\n",4);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_ARRAY &&
-        ((redisReply*)reply)->elements == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    /* RESP3 verbatim strings (GitHub issue #802) */
-    test("Can parse RESP3 verbatim strings: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"=10\r\ntxt:LOLWUT\r\n",17);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_VERB &&
-         !memcmp(((redisReply*)reply)->str,"LOLWUT", 6));
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
-    /* RESP3 push messages (Github issue #815) */
-    test("Can parse RESP3 push messages: ");
-    reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)">2\r\n$6\r\nLOLWUT\r\n:42\r\n",21);
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_OK &&
-        ((redisReply*)reply)->type == REDIS_REPLY_PUSH &&
-        ((redisReply*)reply)->elements == 2 &&
-        ((redisReply*)reply)->element[0]->type == REDIS_REPLY_STRING &&
-        !memcmp(((redisReply*)reply)->element[0]->str,"LOLWUT",6) &&
-        ((redisReply*)reply)->element[1]->type == REDIS_REPLY_INTEGER &&
-        ((redisReply*)reply)->element[1]->integer == 42);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-}
-
-static void test_free_null(void) {
-    void *redisCtx = NULL;
-    void *reply = NULL;
-
-    test("Don't fail when redisFree is passed a NULL value: ");
-    redisFree(redisCtx);
-    test_cond(redisCtx == NULL);
-
-    test("Don't fail when freeReplyObject is passed a NULL value: ");
-    freeReplyObject(reply);
-    test_cond(reply == NULL);
-}
-
-static void *hi_malloc_fail(size_t size) {
-    (void)size;
-    return NULL;
-}
-
-static void *hi_calloc_fail(size_t nmemb, size_t size) {
-    (void)nmemb;
-    (void)size;
-    return NULL;
-}
-
-static void *hi_realloc_fail(void *ptr, size_t size) {
-    (void)ptr;
-    (void)size;
-    return NULL;
-}
-
-static void test_allocator_injection(void) {
-    hiredisAllocFuncs ha = {
-        .mallocFn = hi_malloc_fail,
-        .callocFn = hi_calloc_fail,
-        .reallocFn = hi_realloc_fail,
-        .strdupFn = strdup,
-        .freeFn = free,
-    };
-
-    // Override hiredis allocators
-    hiredisSetAllocators(&ha);
-
-    test("redisContext uses injected allocators: ");
-    redisContext *c = redisConnect("localhost", 6379);
-    test_cond(c == NULL);
-
-    test("redisReader uses injected allocators: ");
-    redisReader *reader = redisReaderCreate();
-    test_cond(reader == NULL);
-
-    // Return allocators to default
-    hiredisResetAllocators();
-}
-
-#define HIREDIS_BAD_DOMAIN "idontexist-noreally.com"
-static void test_blocking_connection_errors(void) {
-    redisContext *c;
-    struct addrinfo hints = {.ai_family = AF_INET};
-    struct addrinfo *ai_tmp = NULL;
-
-    int rv = getaddrinfo(HIREDIS_BAD_DOMAIN, "6379", &hints, &ai_tmp);
-    if (rv != 0) {
-        // Address does *not* exist
-        test("Returns error when host cannot be resolved: ");
-        // First see if this domain name *actually* resolves to NXDOMAIN
-        c = redisConnect(HIREDIS_BAD_DOMAIN, 6379);
-        test_cond(
-            c->err == REDIS_ERR_OTHER &&
-            (strcmp(c->errstr, "Name or service not known") == 0 ||
-             strcmp(c->errstr, "Can't resolve: " HIREDIS_BAD_DOMAIN) == 0 ||
-             strcmp(c->errstr, "Name does not resolve") == 0 ||
-             strcmp(c->errstr, "nodename nor servname provided, or not known") == 0 ||
-             strcmp(c->errstr, "No address associated with hostname") == 0 ||
-             strcmp(c->errstr, "Temporary failure in name resolution") == 0 ||
-             strcmp(c->errstr, "hostname nor servname provided, or not known") == 0 ||
-             strcmp(c->errstr, "no address associated with name") == 0 ||
-             strcmp(c->errstr, "No such host is known. ") == 0));
-        redisFree(c);
-    } else {
-        printf("Skipping NXDOMAIN test. Found evil ISP!\n");
-        freeaddrinfo(ai_tmp);
-    }
-
-#ifndef _WIN32
-    test("Returns error when the port is not open: ");
-    c = redisConnect((char*)"localhost", 1);
-    test_cond(c->err == REDIS_ERR_IO &&
-        strcmp(c->errstr,"Connection refused") == 0);
-    redisFree(c);
-
-    test("Returns error when the unix_sock socket path doesn't accept connections: ");
-    c = redisConnectUnix((char*)"/tmp/idontexist.sock");
-    test_cond(c->err == REDIS_ERR_IO); /* Don't care about the message... */
-    redisFree(c);
-#endif
-}
-
-/* Dummy push handler */
-void push_handler(void *privdata, void *reply) {
-    int *counter = privdata;
-    freeReplyObject(reply);
-    *counter += 1;
-}
-
-/* Dummy function just to test setting a callback with redisOptions */
-void push_handler_async(redisAsyncContext *ac, void *reply) {
-    (void)ac;
-    (void)reply;
-}
-
-static void test_resp3_push_handler(redisContext *c) {
-    redisPushFn *old = NULL;
-    redisReply *reply;
-    void *privdata;
-    int n = 0;
-
-    /* Switch to RESP3 and turn on client tracking */
-    send_hello(c, 3);
-    send_client_tracking(c, "ON");
-    privdata = c->privdata;
-    c->privdata = &n;
-
-    reply = redisCommand(c, "GET key:0");
-    assert(reply != NULL);
-    freeReplyObject(reply);
-
-    test("RESP3 PUSH messages are handled out of band by default: ");
-    reply = redisCommand(c, "SET key:0 val:0");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS);
-    freeReplyObject(reply);
-
-    assert((reply = redisCommand(c, "GET key:0")) != NULL);
-    freeReplyObject(reply);
-
-    old = redisSetPushCallback(c, push_handler);
-    test("We can set a custom RESP3 PUSH handler: ");
-    reply = redisCommand(c, "SET key:0 val:0");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && n == 1);
-    freeReplyObject(reply);
-
-    /* Unset the push callback and generate an invalidate message making
-     * sure it is not handled out of band. */
-    test("With no handler, PUSH replies come in-band: ");
-    redisSetPushCallback(c, NULL);
-    assert((reply = redisCommand(c, "GET key:0")) != NULL);
-    freeReplyObject(reply);
-    assert((reply = redisCommand(c, "SET key:0 invalid")) != NULL);
-    test_cond(reply->type == REDIS_REPLY_PUSH);
-    freeReplyObject(reply);
-
-    test("With no PUSH handler, no replies are lost: ");
-    assert(redisGetReply(c, (void**)&reply) == REDIS_OK);
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS);
-    freeReplyObject(reply);
-
-    /* Return to the originally set PUSH handler */
-    assert(old != NULL);
-    redisSetPushCallback(c, old);
-
-    /* Switch back to RESP2 and disable tracking */
-    c->privdata = privdata;
-    send_client_tracking(c, "OFF");
-    send_hello(c, 2);
-}
-
-redisOptions get_redis_tcp_options(struct config config) {
-    redisOptions options = {0};
-    REDIS_OPTIONS_SET_TCP(&options, config.tcp.host, config.tcp.port);
-    return options;
-}
-
-static void test_resp3_push_options(struct config config) {
-    redisAsyncContext *ac;
-    redisContext *c;
-    redisOptions options;
-
-    test("We set a default RESP3 handler for redisContext: ");
-    options = get_redis_tcp_options(config);
-    assert((c = redisConnectWithOptions(&options)) != NULL);
-    test_cond(c->push_cb != NULL);
-    redisFree(c);
-
-    test("We don't set a default RESP3 push handler for redisAsyncContext: ");
-    options = get_redis_tcp_options(config);
-    assert((ac = redisAsyncConnectWithOptions(&options)) != NULL);
-    test_cond(ac->c.push_cb == NULL);
-    redisAsyncFree(ac);
-
-    test("Our REDIS_OPT_NO_PUSH_AUTOFREE flag works: ");
-    options = get_redis_tcp_options(config);
-    options.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
-    assert((c = redisConnectWithOptions(&options)) != NULL);
-    test_cond(c->push_cb == NULL);
-    redisFree(c);
-
-    test("We can use redisOptions to set a custom PUSH handler for redisContext: ");
-    options = get_redis_tcp_options(config);
-    options.push_cb = push_handler;
-    assert((c = redisConnectWithOptions(&options)) != NULL);
-    test_cond(c->push_cb == push_handler);
-    redisFree(c);
-
-    test("We can use redisOptions to set a custom PUSH handler for redisAsyncContext: ");
-    options = get_redis_tcp_options(config);
-    options.async_push_cb = push_handler_async;
-    assert((ac = redisAsyncConnectWithOptions(&options)) != NULL);
-    test_cond(ac->push_cb == push_handler_async);
-    redisAsyncFree(ac);
-}
-
-void free_privdata(void *privdata) {
-    struct privdata *data = privdata;
-    data->dtor_counter++;
-}
-
-static void test_privdata_hooks(struct config config) {
-    struct privdata data = {0};
-    redisOptions options;
-    redisContext *c;
-
-    test("We can use redisOptions to set privdata: ");
-    options = get_redis_tcp_options(config);
-    REDIS_OPTIONS_SET_PRIVDATA(&options, &data, free_privdata);
-    assert((c = redisConnectWithOptions(&options)) != NULL);
-    test_cond(c->privdata == &data);
-
-    test("Our privdata destructor fires when we free the context: ");
-    redisFree(c);
-    test_cond(data.dtor_counter == 1);
-}
-
-static void test_blocking_connection(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    int major;
-
-    c = do_connect(config);
-
-    test("Is able to deliver commands: ");
-    reply = redisCommand(c,"PING");
-    test_cond(reply->type == REDIS_REPLY_STATUS &&
-        strcasecmp(reply->str,"pong") == 0)
-    freeReplyObject(reply);
-
-    test("Is a able to send commands verbatim: ");
-    reply = redisCommand(c,"SET foo bar");
-    test_cond (reply->type == REDIS_REPLY_STATUS &&
-        strcasecmp(reply->str,"ok") == 0)
-    freeReplyObject(reply);
-
-    test("%%s String interpolation works: ");
-    reply = redisCommand(c,"SET %s %s","foo","hello world");
-    freeReplyObject(reply);
-    reply = redisCommand(c,"GET foo");
-    test_cond(reply->type == REDIS_REPLY_STRING &&
-        strcmp(reply->str,"hello world") == 0);
-    freeReplyObject(reply);
-
-    test("%%b String interpolation works: ");
-    reply = redisCommand(c,"SET %b %b","foo",(size_t)3,"hello\x00world",(size_t)11);
-    freeReplyObject(reply);
-    reply = redisCommand(c,"GET foo");
-    test_cond(reply->type == REDIS_REPLY_STRING &&
-        memcmp(reply->str,"hello\x00world",11) == 0)
-
-    test("Binary reply length is correct: ");
-    test_cond(reply->len == 11)
-    freeReplyObject(reply);
-
-    test("Can parse nil replies: ");
-    reply = redisCommand(c,"GET nokey");
-    test_cond(reply->type == REDIS_REPLY_NIL)
-    freeReplyObject(reply);
-
-    /* test 7 */
-    test("Can parse integer replies: ");
-    reply = redisCommand(c,"INCR mycounter");
-    test_cond(reply->type == REDIS_REPLY_INTEGER && reply->integer == 1)
-    freeReplyObject(reply);
-
-    test("Can parse multi bulk replies: ");
-    freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
-    freeReplyObject(redisCommand(c,"LPUSH mylist bar"));
-    reply = redisCommand(c,"LRANGE mylist 0 -1");
-    test_cond(reply->type == REDIS_REPLY_ARRAY &&
-              reply->elements == 2 &&
-              !memcmp(reply->element[0]->str,"bar",3) &&
-              !memcmp(reply->element[1]->str,"foo",3))
-    freeReplyObject(reply);
-
-    /* m/e with multi bulk reply *before* other reply.
-     * specifically test ordering of reply items to parse. */
-    test("Can handle nested multi bulk replies: ");
-    freeReplyObject(redisCommand(c,"MULTI"));
-    freeReplyObject(redisCommand(c,"LRANGE mylist 0 -1"));
-    freeReplyObject(redisCommand(c,"PING"));
-    reply = (redisCommand(c,"EXEC"));
-    test_cond(reply->type == REDIS_REPLY_ARRAY &&
-              reply->elements == 2 &&
-              reply->element[0]->type == REDIS_REPLY_ARRAY &&
-              reply->element[0]->elements == 2 &&
-              !memcmp(reply->element[0]->element[0]->str,"bar",3) &&
-              !memcmp(reply->element[0]->element[1]->str,"foo",3) &&
-              reply->element[1]->type == REDIS_REPLY_STATUS &&
-              strcasecmp(reply->element[1]->str,"pong") == 0);
-    freeReplyObject(reply);
-
-    /* Make sure passing NULL to redisGetReply is safe */
-    test("Can pass NULL to redisGetReply: ");
-    assert(redisAppendCommand(c, "PING") == REDIS_OK);
-    test_cond(redisGetReply(c, NULL) == REDIS_OK);
-
-    get_redis_version(c, &major, NULL);
-    if (major >= 6) test_resp3_push_handler(c);
-    test_resp3_push_options(config);
-
-    test_privdata_hooks(config);
-
-    disconnect(c, 0);
-}
-
-/* Send DEBUG SLEEP 0 to detect if we have this command */
-static int detect_debug_sleep(redisContext *c) {
-    int detected;
-    redisReply *reply = redisCommand(c, "DEBUG SLEEP 0\r\n");
-
-    if (reply == NULL || c->err) {
-        const char *cause = c->err ? c->errstr : "(none)";
-        fprintf(stderr, "Error testing for DEBUG SLEEP (Redis error: %s), exiting\n", cause);
-        exit(-1);
-    }
-
-    detected = reply->type == REDIS_REPLY_STATUS;
-    freeReplyObject(reply);
-
-    return detected;
-}
-
-static void test_blocking_connection_timeouts(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    ssize_t s;
-    const char *sleep_cmd = "DEBUG SLEEP 3\r\n";
-    struct timeval tv;
-
-    c = do_connect(config);
-    test("Successfully completes a command when the timeout is not exceeded: ");
-    reply = redisCommand(c,"SET foo fast");
-    freeReplyObject(reply);
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;
-    redisSetTimeout(c, tv);
-    reply = redisCommand(c, "GET foo");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STRING && memcmp(reply->str, "fast", 4) == 0);
-    freeReplyObject(reply);
-    disconnect(c, 0);
-
-    c = do_connect(config);
-    test("Does not return a reply when the command times out: ");
-    if (detect_debug_sleep(c)) {
-        redisAppendFormattedCommand(c, sleep_cmd, strlen(sleep_cmd));
-        s = c->funcs->write(c);
-        tv.tv_sec = 0;
-        tv.tv_usec = 10000;
-        redisSetTimeout(c, tv);
-        reply = redisCommand(c, "GET foo");
-#ifndef _WIN32
-        test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_IO &&
-                  strcmp(c->errstr, "Resource temporarily unavailable") == 0);
-#else
-        test_cond(s > 0 && reply == NULL && c->err == REDIS_ERR_TIMEOUT &&
-                  strcmp(c->errstr, "recv timeout") == 0);
-#endif
-        freeReplyObject(reply);
-    } else {
-        test_skipped();
-    }
-
-    test("Reconnect properly reconnects after a timeout: ");
-    do_reconnect(c, config);
-    reply = redisCommand(c, "PING");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
-    freeReplyObject(reply);
-
-    test("Reconnect properly uses owned parameters: ");
-    config.tcp.host = "foo";
-    config.unix_sock.path = "foo";
-    do_reconnect(c, config);
-    reply = redisCommand(c, "PING");
-    test_cond(reply != NULL && reply->type == REDIS_REPLY_STATUS && strcmp(reply->str, "PONG") == 0);
-    freeReplyObject(reply);
-
-    disconnect(c, 0);
-}
-
-static void test_blocking_io_errors(struct config config) {
-    redisContext *c;
-    redisReply *reply;
-    void *_reply;
-    int major, minor;
-
-    /* Connect to target given by config. */
-    c = do_connect(config);
-    get_redis_version(c, &major, &minor);
-
-    test("Returns I/O error when the connection is lost: ");
-    reply = redisCommand(c,"QUIT");
-    if (major > 2 || (major == 2 && minor > 0)) {
-        /* > 2.0 returns OK on QUIT and read() should be issued once more
-         * to know the descriptor is at EOF. */
-        test_cond(strcasecmp(reply->str,"OK") == 0 &&
-            redisGetReply(c,&_reply) == REDIS_ERR);
-        freeReplyObject(reply);
-    } else {
-        test_cond(reply == NULL);
-    }
-
-#ifndef _WIN32
-    /* On 2.0, QUIT will cause the connection to be closed immediately and
-     * the read(2) for the reply on QUIT will set the error to EOF.
-     * On >2.0, QUIT will return with OK and another read(2) needed to be
-     * issued to find out the socket was closed by the server. In both
-     * conditions, the error will be set to EOF. */
-    assert(c->err == REDIS_ERR_EOF &&
-        strcmp(c->errstr,"Server closed the connection") == 0);
-#endif
-    redisFree(c);
-
-    c = do_connect(config);
-    test("Returns I/O error on socket timeout: ");
-    struct timeval tv = { 0, 1000 };
-    assert(redisSetTimeout(c,tv) == REDIS_OK);
-    int respcode = redisGetReply(c,&_reply);
-#ifndef _WIN32
-    test_cond(respcode == REDIS_ERR && c->err == REDIS_ERR_IO && errno == EAGAIN);
-#else
-    test_cond(respcode == REDIS_ERR && c->err == REDIS_ERR_TIMEOUT);
-#endif
-    redisFree(c);
-}
-
-static void test_invalid_timeout_errors(struct config config) {
-    redisContext *c;
-
-    test("Set error when an invalid timeout usec value is given to redisConnectWithTimeout: ");
-
-    config.tcp.timeout.tv_sec = 0;
-    config.tcp.timeout.tv_usec = 10000001;
-
-    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
-
-    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
-    redisFree(c);
-
-    test("Set error when an invalid timeout sec value is given to redisConnectWithTimeout: ");
-
-    config.tcp.timeout.tv_sec = (((LONG_MAX) - 999) / 1000) + 1;
-    config.tcp.timeout.tv_usec = 0;
-
-    c = redisConnectWithTimeout(config.tcp.host, config.tcp.port, config.tcp.timeout);
-
-    test_cond(c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
-    redisFree(c);
-}
-
-/* Wrap malloc to abort on failure so OOM checks don't make the test logic
- * harder to follow. */
-void *hi_malloc_safe(size_t size) {
-    void *ptr = hi_malloc(size);
-    if (ptr == NULL) {
-        fprintf(stderr, "Error:  Out of memory\n");
-        exit(-1);
-    }
-
-    return ptr;
-}
-
-static void test_throughput(struct config config) {
-    redisContext *c = do_connect(config);
-    redisReply **replies;
-    int i, num;
-    long long t1, t2;
-
-    test("Throughput:\n");
-    for (i = 0; i < 500; i++)
-        freeReplyObject(redisCommand(c,"LPUSH mylist foo"));
-
-    num = 1000;
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c,"PING");
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx PING: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c,"LRANGE mylist 0 499");
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
-        assert(replies[i] != NULL && replies[i]->elements == 500);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx LRANGE with 500 elements: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        replies[i] = redisCommand(c, "INCRBY incrkey %d", 1000000);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx INCRBY: %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    num = 10000;
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"PING");
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_STATUS);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx PING (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"LRANGE mylist 0 499");
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_ARRAY);
-        assert(replies[i] != NULL && replies[i]->elements == 500);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx LRANGE with 500 elements (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    replies = hi_malloc_safe(sizeof(redisReply*)*num);
-    for (i = 0; i < num; i++)
-        redisAppendCommand(c,"INCRBY incrkey %d", 1000000);
-    t1 = usec();
-    for (i = 0; i < num; i++) {
-        assert(redisGetReply(c, (void*)&replies[i]) == REDIS_OK);
-        assert(replies[i] != NULL && replies[i]->type == REDIS_REPLY_INTEGER);
-    }
-    t2 = usec();
-    for (i = 0; i < num; i++) freeReplyObject(replies[i]);
-    hi_free(replies);
-    printf("\t(%dx INCRBY (pipelined): %.3fs)\n", num, (t2-t1)/1000000.0);
-
-    disconnect(c, 0);
-}
-
-// static long __test_callback_flags = 0;
-// static void __test_callback(redisContext *c, void *privdata) {
-//     ((void)c);
-//     /* Shift to detect execution order */
-//     __test_callback_flags <<= 8;
-//     __test_callback_flags |= (long)privdata;
-// }
-//
-// static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
-//     ((void)c);
-//     /* Shift to detect execution order */
-//     __test_callback_flags <<= 8;
-//     __test_callback_flags |= (long)privdata;
-//     if (reply) freeReplyObject(reply);
-// }
-//
-// static redisContext *__connect_nonblock() {
-//     /* Reset callback flags */
-//     __test_callback_flags = 0;
-//     return redisConnectNonBlock("127.0.0.1", port, NULL);
-// }
-//
-// static void test_nonblocking_connection() {
-//     redisContext *c;
-//     int wdone = 0;
-//
-//     test("Calls command callback when command is issued: ");
-//     c = __connect_nonblock();
-//     redisSetCommandCallback(c,__test_callback,(void*)1);
-//     redisCommand(c,"PING");
-//     test_cond(__test_callback_flags == 1);
-//     redisFree(c);
-//
-//     test("Calls disconnect callback on redisDisconnect: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
-//     redisDisconnect(c);
-//     test_cond(__test_callback_flags == 2);
-//     redisFree(c);
-//
-//     test("Calls disconnect callback and free callback on redisFree: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)2);
-//     redisSetFreeCallback(c,__test_callback,(void*)4);
-//     redisFree(c);
-//     test_cond(__test_callback_flags == ((2 << 8) | 4));
-//
-//     test("redisBufferWrite against empty write buffer: ");
-//     c = __connect_nonblock();
-//     test_cond(redisBufferWrite(c,&wdone) == REDIS_OK && wdone == 1);
-//     redisFree(c);
-//
-//     test("redisBufferWrite against not yet connected fd: ");
-//     c = __connect_nonblock();
-//     redisCommand(c,"PING");
-//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
-//               strncmp(c->error,"write:",6) == 0);
-//     redisFree(c);
-//
-//     test("redisBufferWrite against closed fd: ");
-//     c = __connect_nonblock();
-//     redisCommand(c,"PING");
-//     redisDisconnect(c);
-//     test_cond(redisBufferWrite(c,NULL) == REDIS_ERR &&
-//               strncmp(c->error,"write:",6) == 0);
-//     redisFree(c);
-//
-//     test("Process callbacks in the right sequence: ");
-//     c = __connect_nonblock();
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)1,"PING");
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)3,"PING");
-//
-//     /* Write output buffer */
-//     wdone = 0;
-//     while(!wdone) {
-//         usleep(500);
-//         redisBufferWrite(c,&wdone);
-//     }
-//
-//     /* Read until at least one callback is executed (the 3 replies will
-//      * arrive in a single packet, causing all callbacks to be executed in
-//      * a single pass). */
-//     while(__test_callback_flags == 0) {
-//         assert(redisBufferRead(c) == REDIS_OK);
-//         redisProcessCallbacks(c);
-//     }
-//     test_cond(__test_callback_flags == 0x010203);
-//     redisFree(c);
-//
-//     test("redisDisconnect executes pending callbacks with NULL reply: ");
-//     c = __connect_nonblock();
-//     redisSetDisconnectCallback(c,__test_callback,(void*)1);
-//     redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
-//     redisDisconnect(c);
-//     test_cond(__test_callback_flags == 0x0201);
-//     redisFree(c);
-// }
-
-int main(int argc, char **argv) {
-    struct config cfg = {
-        .tcp = {
-            .host = "127.0.0.1",
-            .port = 6379
-        },
-        .unix_sock = {
-            .path = "/tmp/redis.sock"
-        }
-    };
-    int throughput = 1;
-    int test_inherit_fd = 1;
-    int skips_as_fails = 0;
-    int test_unix_socket;
-
-    /* Parse command line options. */
-    argv++; argc--;
-    while (argc) {
-        if (argc >= 2 && !strcmp(argv[0],"-h")) {
-            argv++; argc--;
-            cfg.tcp.host = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"-p")) {
-            argv++; argc--;
-            cfg.tcp.port = atoi(argv[0]);
-        } else if (argc >= 2 && !strcmp(argv[0],"-s")) {
-            argv++; argc--;
-            cfg.unix_sock.path = argv[0];
-        } else if (argc >= 1 && !strcmp(argv[0],"--skip-throughput")) {
-            throughput = 0;
-        } else if (argc >= 1 && !strcmp(argv[0],"--skip-inherit-fd")) {
-            test_inherit_fd = 0;
-        } else if (argc >= 1 && !strcmp(argv[0],"--skips-as-fails")) {
-            skips_as_fails = 1;
-#ifdef HIREDIS_TEST_SSL
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-port")) {
-            argv++; argc--;
-            cfg.ssl.port = atoi(argv[0]);
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-host")) {
-            argv++; argc--;
-            cfg.ssl.host = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-ca-cert")) {
-            argv++; argc--;
-            cfg.ssl.ca_cert  = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-cert")) {
-            argv++; argc--;
-            cfg.ssl.cert = argv[0];
-        } else if (argc >= 2 && !strcmp(argv[0],"--ssl-key")) {
-            argv++; argc--;
-            cfg.ssl.key = argv[0];
-#endif
-        } else {
-            fprintf(stderr, "Invalid argument: %s\n", argv[0]);
-            exit(1);
-        }
-        argv++; argc--;
-    }
-
-#ifndef _WIN32
-    /* Ignore broken pipe signal (for I/O error tests). */
-    signal(SIGPIPE, SIG_IGN);
-
-    test_unix_socket = access(cfg.unix_sock.path, F_OK) == 0;
-
-#else
-    /* Unix sockets don't exist in Windows */
-    test_unix_socket = 0;
-#endif
-
-    test_allocator_injection();
-
-    test_format_commands();
-    test_reply_reader();
-    test_blocking_connection_errors();
-    test_free_null();
-
-    printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
-    cfg.type = CONN_TCP;
-    test_blocking_connection(cfg);
-    test_blocking_connection_timeouts(cfg);
-    test_blocking_io_errors(cfg);
-    test_invalid_timeout_errors(cfg);
-    test_append_formatted_commands(cfg);
-    if (throughput) test_throughput(cfg);
-
-    printf("\nTesting against Unix socket connection (%s): ", cfg.unix_sock.path);
-    if (test_unix_socket) {
-        printf("\n");
-        cfg.type = CONN_UNIX;
-        test_blocking_connection(cfg);
-        test_blocking_connection_timeouts(cfg);
-        test_blocking_io_errors(cfg);
-        if (throughput) test_throughput(cfg);
-    } else {
-        test_skipped();
-    }
-
-#ifdef HIREDIS_TEST_SSL
-    if (cfg.ssl.port && cfg.ssl.host) {
-
-        redisInitOpenSSL();
-        _ssl_ctx = redisCreateSSLContext(cfg.ssl.ca_cert, NULL, cfg.ssl.cert, cfg.ssl.key, NULL, NULL);
-        assert(_ssl_ctx != NULL);
-
-        printf("\nTesting against SSL connection (%s:%d):\n", cfg.ssl.host, cfg.ssl.port);
-        cfg.type = CONN_SSL;
-
-        test_blocking_connection(cfg);
-        test_blocking_connection_timeouts(cfg);
-        test_blocking_io_errors(cfg);
-        test_invalid_timeout_errors(cfg);
-        test_append_formatted_commands(cfg);
-        if (throughput) test_throughput(cfg);
-
-        redisFreeSSLContext(_ssl_ctx);
-        _ssl_ctx = NULL;
-    }
-#endif
-
-    if (test_inherit_fd) {
-        printf("\nTesting against inherited fd (%s): ", cfg.unix_sock.path);
-        if (test_unix_socket) {
-            printf("\n");
-            cfg.type = CONN_FD;
-            test_blocking_connection(cfg);
-        } else {
-            test_skipped();
-        }
-    }
-
-    if (fails || (skips_as_fails && skips)) {
-        printf("*** %d TESTS FAILED ***\n", fails);
-        if (skips) {
-            printf("*** %d TESTS SKIPPED ***\n", skips);
-        }
-        return 1;
-    }
-
-    printf("ALL TESTS PASSED (%d skipped)\n", skips);
-    return 0;
-}
diff --git a/ext/hiredis-1.0.2/test.sh b/ext/hiredis-1.0.2/test.sh
deleted file mode 100755
index c72bcb0dc..000000000
--- a/ext/hiredis-1.0.2/test.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh -ue
-
-REDIS_SERVER=${REDIS_SERVER:-redis-server}
-REDIS_PORT=${REDIS_PORT:-56379}
-REDIS_SSL_PORT=${REDIS_SSL_PORT:-56443}
-TEST_SSL=${TEST_SSL:-0}
-SKIPS_AS_FAILS=${SKIPS_AS_FAILS-:0}
-SSL_TEST_ARGS=
-SKIPS_ARG=
-
-tmpdir=$(mktemp -d)
-PID_FILE=${tmpdir}/hiredis-test-redis.pid
-SOCK_FILE=${tmpdir}/hiredis-test-redis.sock
-
-if [ "$TEST_SSL" = "1" ]; then
-    SSL_CA_CERT=${tmpdir}/ca.crt
-    SSL_CA_KEY=${tmpdir}/ca.key
-    SSL_CERT=${tmpdir}/redis.crt
-    SSL_KEY=${tmpdir}/redis.key
-
-    openssl genrsa -out ${tmpdir}/ca.key 4096
-    openssl req \
-        -x509 -new -nodes -sha256 \
-        -key ${SSL_CA_KEY} \
-        -days 3650 \
-        -subj '/CN=Hiredis Test CA' \
-        -out ${SSL_CA_CERT}
-    openssl genrsa -out ${SSL_KEY} 2048
-    openssl req \
-        -new -sha256 \
-        -key ${SSL_KEY} \
-        -subj '/CN=Hiredis Test Cert' | \
-        openssl x509 \
-            -req -sha256 \
-            -CA ${SSL_CA_CERT} \
-            -CAkey ${SSL_CA_KEY} \
-            -CAserial ${tmpdir}/ca.txt \
-            -CAcreateserial \
-            -days 365 \
-            -out ${SSL_CERT}
-
-    SSL_TEST_ARGS="--ssl-host 127.0.0.1 --ssl-port ${REDIS_SSL_PORT} --ssl-ca-cert ${SSL_CA_CERT} --ssl-cert ${SSL_CERT} --ssl-key ${SSL_KEY}"
-fi
-
-cleanup() {
-  set +e
-  kill $(cat ${PID_FILE})
-  rm -rf ${tmpdir}
-}
-trap cleanup INT TERM EXIT
-
-cat > ${tmpdir}/redis.conf <<EOF
-daemonize yes
-pidfile ${PID_FILE}
-port ${REDIS_PORT}
-bind 127.0.0.1
-unixsocket ${SOCK_FILE}
-EOF
-
-if [ "$TEST_SSL" = "1" ]; then
-    cat >> ${tmpdir}/redis.conf <<EOF
-tls-port ${REDIS_SSL_PORT}
-tls-ca-cert-file ${SSL_CA_CERT}
-tls-cert-file ${SSL_CERT}
-tls-key-file ${SSL_KEY}
-EOF
-fi
-
-cat ${tmpdir}/redis.conf
-${REDIS_SERVER} ${tmpdir}/redis.conf
-
-# Wait until we detect the unix socket
-while [ ! -S "${SOCK_FILE}" ]; do sleep 1; done
-
-# Treat skips as failures if directed
-[ "$SKIPS_AS_FAILS" = 1 ] && SKIPS_ARG="--skips-as-fails"
-
-${TEST_PREFIX:-} ./hiredis-test -h 127.0.0.1 -p ${REDIS_PORT} -s ${SOCK_FILE} ${SSL_TEST_ARGS} ${SKIPS_ARG}
diff --git a/ext/hiredis-1.0.2/win32.h b/ext/hiredis-1.0.2/win32.h
deleted file mode 100644
index 04289c696..000000000
--- a/ext/hiredis-1.0.2/win32.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _WIN32_HELPER_INCLUDE
-#define _WIN32_HELPER_INCLUDE
-#ifdef _MSC_VER
-
-#include <winsock2.h> /* for struct timeval */
-
-#ifndef inline
-#define inline __inline
-#endif
-
-#ifndef strcasecmp
-#define strcasecmp stricmp
-#endif
-
-#ifndef strncasecmp
-#define strncasecmp strnicmp
-#endif
-
-#ifndef va_copy
-#define va_copy(d,s) ((d) = (s))
-#endif
-
-#ifndef snprintf
-#define snprintf c99_snprintf
-
-__inline int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap)
-{
-    int count = -1;
-
-    if (size != 0)
-        count = _vsnprintf_s(str, size, _TRUNCATE, format, ap);
-    if (count == -1)
-        count = _vscprintf(format, ap);
-
-    return count;
-}
-
-__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
-{
-    int count;
-    va_list ap;
-
-    va_start(ap, format);
-    count = c99_vsnprintf(str, size, format, ap);
-    va_end(ap);
-
-    return count;
-}
-#endif
-#endif /* _MSC_VER */
-
-#ifdef _WIN32
-#define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
-#endif /* _WIN32 */
-
-#endif /* _WIN32_HELPER_INCLUDE */
diff --git a/ext/http-parser/AUTHORS b/ext/http-parser/AUTHORS
index 5323b685c..29cdbb16d 100644
--- a/ext/http-parser/AUTHORS
+++ b/ext/http-parser/AUTHORS
@@ -61,8 +61,3 @@ Marc O'Morain <github.com@marcomorain.com>
 Jeff Pinner <jpinner@twitter.com>
 Timothy J Fontaine <tjfontaine@gmail.com>
 Akagi201 <akagi201@gmail.com>
-Romain Giraud <giraud.romain@gmail.com>
-Jay Satiro <raysatiro@yahoo.com>
-Arne Steen <Arne.Steen@gmx.de>
-Kjell Schubert <kjell.schubert@gmail.com>
-Olivier Mengué <dolmen@cpan.org>
diff --git a/ext/http-parser/README.md b/ext/http-parser/README.md
deleted file mode 100644
index 439b30998..000000000
--- a/ext/http-parser/README.md
+++ /dev/null
@@ -1,246 +0,0 @@
-HTTP Parser
-===========
-
-[![Build Status](https://api.travis-ci.org/nodejs/http-parser.svg?branch=master)](https://travis-ci.org/nodejs/http-parser)
-
-This is a parser for HTTP messages written in C. It parses both requests and
-responses. The parser is designed to be used in performance HTTP
-applications. It does not make any syscalls nor allocations, it does not
-buffer data, it can be interrupted at anytime. Depending on your
-architecture, it only requires about 40 bytes of data per message
-stream (in a web server that is per connection).
-
-Features:
-
-  * No dependencies
-  * Handles persistent streams (keep-alive).
-  * Decodes chunked encoding.
-  * Upgrade support
-  * Defends against buffer overflow attacks.
-
-The parser extracts the following information from HTTP messages:
-
-  * Header fields and values
-  * Content-Length
-  * Request method
-  * Response status code
-  * Transfer-Encoding
-  * HTTP version
-  * Request URL
-  * Message body
-
-
-Usage
------
-
-One `http_parser` object is used per TCP connection. Initialize the struct
-using `http_parser_init()` and set the callbacks. That might look something
-like this for a request parser:
-```c
-http_parser_settings settings;
-settings.on_url = my_url_callback;
-settings.on_header_field = my_header_field_callback;
-/* ... */
-
-http_parser *parser = malloc(sizeof(http_parser));
-http_parser_init(parser, HTTP_REQUEST);
-parser->data = my_socket;
-```
-
-When data is received on the socket execute the parser and check for errors.
-
-```c
-size_t len = 80*1024, nparsed;
-char buf[len];
-ssize_t recved;
-
-recved = recv(fd, buf, len, 0);
-
-if (recved < 0) {
-  /* Handle error. */
-}
-
-/* Start up / continue the parser.
- * Note we pass recved==0 to signal that EOF has been received.
- */
-nparsed = http_parser_execute(parser, &settings, buf, recved);
-
-if (parser->upgrade) {
-  /* handle new protocol */
-} else if (nparsed != recved) {
-  /* Handle error. Usually just close the connection. */
-}
-```
-
-HTTP needs to know where the end of the stream is. For example, sometimes
-servers send responses without Content-Length and expect the client to
-consume input (for the body) until EOF. To tell http_parser about EOF, give
-`0` as the fourth parameter to `http_parser_execute()`. Callbacks and errors
-can still be encountered during an EOF, so one must still be prepared
-to receive them.
-
-Scalar valued message information such as `status_code`, `method`, and the
-HTTP version are stored in the parser structure. This data is only
-temporally stored in `http_parser` and gets reset on each new message. If
-this information is needed later, copy it out of the structure during the
-`headers_complete` callback.
-
-The parser decodes the transfer-encoding for both requests and responses
-transparently. That is, a chunked encoding is decoded before being sent to
-the on_body callback.
-
-
-The Special Problem of Upgrade
-------------------------------
-
-HTTP supports upgrading the connection to a different protocol. An
-increasingly common example of this is the WebSocket protocol which sends
-a request like
-
-        GET /demo HTTP/1.1
-        Upgrade: WebSocket
-        Connection: Upgrade
-        Host: example.com
-        Origin: http://example.com
-        WebSocket-Protocol: sample
-
-followed by non-HTTP data.
-
-(See [RFC6455](https://tools.ietf.org/html/rfc6455) for more information the
-WebSocket protocol.)
-
-To support this, the parser will treat this as a normal HTTP message without a
-body, issuing both on_headers_complete and on_message_complete callbacks. However
-http_parser_execute() will stop parsing at the end of the headers and return.
-
-The user is expected to check if `parser->upgrade` has been set to 1 after
-`http_parser_execute()` returns. Non-HTTP data begins at the buffer supplied
-offset by the return value of `http_parser_execute()`.
-
-
-Callbacks
----------
-
-During the `http_parser_execute()` call, the callbacks set in
-`http_parser_settings` will be executed. The parser maintains state and
-never looks behind, so buffering the data is not necessary. If you need to
-save certain data for later usage, you can do that from the callbacks.
-
-There are two types of callbacks:
-
-* notification `typedef int (*http_cb) (http_parser*);`
-    Callbacks: on_message_begin, on_headers_complete, on_message_complete.
-* data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
-    Callbacks: (requests only) on_url,
-               (common) on_header_field, on_header_value, on_body;
-
-Callbacks must return 0 on success. Returning a non-zero value indicates
-error to the parser, making it exit immediately.
-
-For cases where it is necessary to pass local information to/from a callback,
-the `http_parser` object's `data` field can be used.
-An example of such a case is when using threads to handle a socket connection,
-parse a request, and then give a response over that socket. By instantiation
-of a thread-local struct containing relevant data (e.g. accepted socket,
-allocated memory for callbacks to write into, etc), a parser's callbacks are
-able to communicate data between the scope of the thread and the scope of the
-callback in a threadsafe manner. This allows http-parser to be used in
-multi-threaded contexts.
-
-Example:
-```c
- typedef struct {
-  socket_t sock;
-  void* buffer;
-  int buf_len;
- } custom_data_t;
-
-
-int my_url_callback(http_parser* parser, const char *at, size_t length) {
-  /* access to thread local custom_data_t struct.
-  Use this access save parsed data for later use into thread local
-  buffer, or communicate over socket
-  */
-  parser->data;
-  ...
-  return 0;
-}
-
-...
-
-void http_parser_thread(socket_t sock) {
- int nparsed = 0;
- /* allocate memory for user data */
- custom_data_t *my_data = malloc(sizeof(custom_data_t));
-
- /* some information for use by callbacks.
- * achieves thread -> callback information flow */
- my_data->sock = sock;
-
- /* instantiate a thread-local parser */
- http_parser *parser = malloc(sizeof(http_parser));
- http_parser_init(parser, HTTP_REQUEST); /* initialise parser */
- /* this custom data reference is accessible through the reference to the
- parser supplied to callback functions */
- parser->data = my_data;
-
- http_parser_settings settings; /* set up callbacks */
- settings.on_url = my_url_callback;
-
- /* execute parser */
- nparsed = http_parser_execute(parser, &settings, buf, recved);
-
- ...
- /* parsed information copied from callback.
- can now perform action on data copied into thread-local memory from callbacks.
- achieves callback -> thread information flow */
- my_data->buffer;
- ...
-}
-
-```
-
-In case you parse HTTP message in chunks (i.e. `read()` request line
-from socket, parse, read half headers, parse, etc) your data callbacks
-may be called more than once. Http-parser guarantees that data pointer is only
-valid for the lifetime of callback. You can also `read()` into a heap allocated
-buffer to avoid copying memory around if this fits your application.
-
-Reading headers may be a tricky task if you read/parse headers partially.
-Basically, you need to remember whether last header callback was field or value
-and apply the following logic:
-
-    (on_header_field and on_header_value shortened to on_h_*)
-     ------------------------ ------------ --------------------------------------------
-    | State (prev. callback) | Callback   | Description/action                         |
-     ------------------------ ------------ --------------------------------------------
-    | nothing (first call)   | on_h_field | Allocate new buffer and copy callback data |
-    |                        |            | into it                                    |
-     ------------------------ ------------ --------------------------------------------
-    | value                  | on_h_field | New header started.                        |
-    |                        |            | Copy current name,value buffers to headers |
-    |                        |            | list and allocate new buffer for new name  |
-     ------------------------ ------------ --------------------------------------------
-    | field                  | on_h_field | Previous name continues. Reallocate name   |
-    |                        |            | buffer and append callback data to it      |
-     ------------------------ ------------ --------------------------------------------
-    | field                  | on_h_value | Value for current header started. Allocate |
-    |                        |            | new buffer and copy callback data to it    |
-     ------------------------ ------------ --------------------------------------------
-    | value                  | on_h_value | Value continues. Reallocate value buffer   |
-    |                        |            | and append callback data to it             |
-     ------------------------ ------------ --------------------------------------------
-
-
-Parsing URLs
-------------
-
-A simplistic zero-copy URL parser is provided as `http_parser_parse_url()`.
-Users of this library may wish to use it to parse URLs constructed from
-consecutive `on_url` callbacks.
-
-See examples of reading in headers:
-
-* [partial example](http://gist.github.com/155877) in C
-* [from http-parser tests](http://github.com/joyent/http-parser/blob/37a0ff8/test.c#L403) in C
-* [from Node library](http://github.com/joyent/node/blob/842eaf4/src/http.js#L284) in Javascript
diff --git a/ext/http-parser/http_parser.c b/ext/http-parser/http_parser.c
index 895bf0c73..a113c7f5e 100644
--- a/ext/http-parser/http_parser.c
+++ b/ext/http-parser/http_parser.c
@@ -123,7 +123,7 @@ do {                                                                 \
     FOR##_mark = NULL;                                               \
   }                                                                  \
 } while (0)
-
+  
 /* Run the data callback FOR and consume the current byte */
 #define CALLBACK_DATA(FOR)                                           \
     CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1)
@@ -440,7 +440,7 @@ enum http_host_state
  * character or %x80-FF
  **/
 #define IS_HEADER_CHAR(ch)                                                     \
-  (ch == CR || ch == LF || ch == 9 || ((unsigned char)ch > 31 && ch != 127))
+  (ch == CR || ch == LF || ch == 9 || (ch > 31 && ch != 127))
 
 #define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res)
 
@@ -1007,40 +1007,89 @@ reexecute:
           UPDATE_STATE(s_req_spaces_before_url);
         } else if (ch == matcher[parser->index]) {
           ; /* nada */
-        } else if (IS_ALPHA(ch)) {
-
-          switch (parser->method << 16 | parser->index << 8 | ch) {
-#define XX(meth, pos, ch, new_meth) \
-            case (HTTP_##meth << 16 | pos << 8 | ch): \
-              parser->method = HTTP_##new_meth; break;
-
-            XX(POST,      1, 'U', PUT)
-            XX(POST,      1, 'A', PATCH)
-            XX(CONNECT,   1, 'H', CHECKOUT)
-            XX(CONNECT,   2, 'P', COPY)
-            XX(MKCOL,     1, 'O', MOVE)
-            XX(MKCOL,     1, 'E', MERGE)
-            XX(MKCOL,     2, 'A', MKACTIVITY)
-            XX(MKCOL,     3, 'A', MKCALENDAR)
-            XX(SUBSCRIBE, 1, 'E', SEARCH)
-            XX(REPORT,    2, 'B', REBIND)
-            XX(POST,      1, 'R', PROPFIND)
-            XX(PROPFIND,  4, 'P', PROPPATCH)
-            XX(PUT,       2, 'R', PURGE)
-            XX(LOCK,      1, 'I', LINK)
-            XX(UNLOCK,    2, 'S', UNSUBSCRIBE)
-            XX(UNLOCK,    2, 'B', UNBIND)
-            XX(UNLOCK,    3, 'I', UNLINK)
-#undef XX
-
-            default:
+        } else if (parser->method == HTTP_CONNECT) {
+          if (parser->index == 1 && ch == 'H') {
+            parser->method = HTTP_CHECKOUT;
+          } else if (parser->index == 2  && ch == 'P') {
+            parser->method = HTTP_COPY;
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->method == HTTP_MKCOL) {
+          if (parser->index == 1 && ch == 'O') {
+            parser->method = HTTP_MOVE;
+          } else if (parser->index == 1 && ch == 'E') {
+            parser->method = HTTP_MERGE;
+          } else if (parser->index == 1 && ch == '-') {
+            parser->method = HTTP_MSEARCH;
+          } else if (parser->index == 2 && ch == 'A') {
+            parser->method = HTTP_MKACTIVITY;
+          } else if (parser->index == 3 && ch == 'A') {
+            parser->method = HTTP_MKCALENDAR;
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->method == HTTP_SUBSCRIBE) {
+          if (parser->index == 1 && ch == 'E') {
+            parser->method = HTTP_SEARCH;
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->method == HTTP_REPORT) {
+            if (parser->index == 2 && ch == 'B') {
+              parser->method = HTTP_REBIND;
+            } else {
               SET_ERRNO(HPE_INVALID_METHOD);
               goto error;
+            }
+        } else if (parser->index == 1) {
+          if (parser->method == HTTP_POST) {
+            if (ch == 'R') {
+              parser->method = HTTP_PROPFIND; /* or HTTP_PROPPATCH */
+            } else if (ch == 'U') {
+              parser->method = HTTP_PUT; /* or HTTP_PURGE */
+            } else if (ch == 'A') {
+              parser->method = HTTP_PATCH;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
+          } else if (parser->method == HTTP_LOCK) {
+            if (ch == 'I') {
+              parser->method = HTTP_LINK;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
           }
-        } else if (ch == '-' &&
-                   parser->index == 1 &&
-                   parser->method == HTTP_MKCOL) {
-          parser->method = HTTP_MSEARCH;
+        } else if (parser->index == 2) {
+          if (parser->method == HTTP_PUT) {
+            if (ch == 'R') {
+              parser->method = HTTP_PURGE;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
+          } else if (parser->method == HTTP_UNLOCK) {
+            if (ch == 'S') {
+              parser->method = HTTP_UNSUBSCRIBE;
+            } else if(ch == 'B') {
+              parser->method = HTTP_UNBIND;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->index == 4 && parser->method == HTTP_PROPFIND && ch == 'P') {
+          parser->method = HTTP_PROPPATCH;
+        } else if (parser->index == 3 && parser->method == HTTP_UNLOCK && ch == 'I') {
+          parser->method = HTTP_UNLINK;
         } else {
           SET_ERRNO(HPE_INVALID_METHOD);
           goto error;
@@ -1366,7 +1415,12 @@ reexecute:
                   || c != CONTENT_LENGTH[parser->index]) {
                 parser->header_state = h_general;
               } else if (parser->index == sizeof(CONTENT_LENGTH)-2) {
+                if (parser->flags & F_CONTENTLENGTH) {
+                  SET_ERRNO(HPE_UNEXPECTED_CONTENT_LENGTH);
+                  goto error;
+                }
                 parser->header_state = h_content_length;
+                parser->flags |= F_CONTENTLENGTH;
               }
               break;
 
@@ -1469,12 +1523,6 @@ reexecute:
               goto error;
             }
 
-            if (parser->flags & F_CONTENTLENGTH) {
-              SET_ERRNO(HPE_UNEXPECTED_CONTENT_LENGTH);
-              goto error;
-            }
-
-            parser->flags |= F_CONTENTLENGTH;
             parser->content_length = ch - '0';
             break;
 
@@ -1813,9 +1861,6 @@ reexecute:
             case 0:
               break;
 
-            case 2:
-              parser->upgrade = 1;
-
             case 1:
               parser->flags |= F_SKIPBODY;
               break;
@@ -2254,13 +2299,12 @@ http_parse_host_char(enum http_host_state s, const char ch) {
 
 static int
 http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
+  //assert(u->field_set & (1 << UF_HOST));
   enum http_host_state s;
 
   const char *p;
   size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len;
 
-  assert(u->field_set & (1 << UF_HOST));
-
   u->field_data[UF_HOST].len = 0;
 
   s = found_at ? s_http_userinfo_start : s_http_host_start;
diff --git a/ext/http-parser/http_parser.h b/ext/http-parser/http_parser.h
index 45c72a078..e33c0620a 100644
--- a/ext/http-parser/http_parser.h
+++ b/ext/http-parser/http_parser.h
@@ -26,7 +26,7 @@ extern "C" {
 
 /* Also update SONAME in the Makefile whenever you change these. */
 #define HTTP_PARSER_VERSION_MAJOR 2
-#define HTTP_PARSER_VERSION_MINOR 7
+#define HTTP_PARSER_VERSION_MINOR 6
 #define HTTP_PARSER_VERSION_PATCH 1
 
 #include <sys/types.h>
@@ -77,11 +77,6 @@ typedef struct http_parser_settings http_parser_settings;
  * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
  * chunked' headers that indicate the presence of a body.
  *
- * Returning `2` from on_headers_complete will tell parser that it should not
- * expect neither a body nor any futher responses on this connection. This is
- * useful for handling responses to a CONNECT request which may not contain
- * `Upgrade` or `Connection: upgrade` headers.
- *
  * http_data_cb does not return data chunks. It will be called arbitrarily
  * many times for each string. E.G. you might get 10 callbacks for "on_url"
  * each providing just a few characters more data.
@@ -90,76 +85,6 @@ typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
 typedef int (*http_cb) (http_parser*);
 
 
-/* Status Codes */
-#define HTTP_STATUS_MAP(XX)                                                 \
-  XX(100, CONTINUE,                        Continue)                        \
-  XX(101, SWITCHING_PROTOCOLS,             Switching Protocols)             \
-  XX(102, PROCESSING,                      Processing)                      \
-  XX(200, OK,                              OK)                              \
-  XX(201, CREATED,                         Created)                         \
-  XX(202, ACCEPTED,                        Accepted)                        \
-  XX(203, NON_AUTHORITATIVE_INFORMATION,   Non-Authoritative Information)   \
-  XX(204, NO_CONTENT,                      No Content)                      \
-  XX(205, RESET_CONTENT,                   Reset Content)                   \
-  XX(206, PARTIAL_CONTENT,                 Partial Content)                 \
-  XX(207, MULTI_STATUS,                    Multi-Status)                    \
-  XX(208, ALREADY_REPORTED,                Already Reported)                \
-  XX(226, IM_USED,                         IM Used)                         \
-  XX(300, MULTIPLE_CHOICES,                Multiple Choices)                \
-  XX(301, MOVED_PERMANENTLY,               Moved Permanently)               \
-  XX(302, FOUND,                           Found)                           \
-  XX(303, SEE_OTHER,                       See Other)                       \
-  XX(304, NOT_MODIFIED,                    Not Modified)                    \
-  XX(305, USE_PROXY,                       Use Proxy)                       \
-  XX(307, TEMPORARY_REDIRECT,              Temporary Redirect)              \
-  XX(308, PERMANENT_REDIRECT,              Permanent Redirect)              \
-  XX(400, BAD_REQUEST,                     Bad Request)                     \
-  XX(401, UNAUTHORIZED,                    Unauthorized)                    \
-  XX(402, PAYMENT_REQUIRED,                Payment Required)                \
-  XX(403, FORBIDDEN,                       Forbidden)                       \
-  XX(404, NOT_FOUND,                       Not Found)                       \
-  XX(405, METHOD_NOT_ALLOWED,              Method Not Allowed)              \
-  XX(406, NOT_ACCEPTABLE,                  Not Acceptable)                  \
-  XX(407, PROXY_AUTHENTICATION_REQUIRED,   Proxy Authentication Required)   \
-  XX(408, REQUEST_TIMEOUT,                 Request Timeout)                 \
-  XX(409, CONFLICT,                        Conflict)                        \
-  XX(410, GONE,                            Gone)                            \
-  XX(411, LENGTH_REQUIRED,                 Length Required)                 \
-  XX(412, PRECONDITION_FAILED,             Precondition Failed)             \
-  XX(413, PAYLOAD_TOO_LARGE,               Payload Too Large)               \
-  XX(414, URI_TOO_LONG,                    URI Too Long)                    \
-  XX(415, UNSUPPORTED_MEDIA_TYPE,          Unsupported Media Type)          \
-  XX(416, RANGE_NOT_SATISFIABLE,           Range Not Satisfiable)           \
-  XX(417, EXPECTATION_FAILED,              Expectation Failed)              \
-  XX(421, MISDIRECTED_REQUEST,             Misdirected Request)             \
-  XX(422, UNPROCESSABLE_ENTITY,            Unprocessable Entity)            \
-  XX(423, LOCKED,                          Locked)                          \
-  XX(424, FAILED_DEPENDENCY,               Failed Dependency)               \
-  XX(426, UPGRADE_REQUIRED,                Upgrade Required)                \
-  XX(428, PRECONDITION_REQUIRED,           Precondition Required)           \
-  XX(429, TOO_MANY_REQUESTS,               Too Many Requests)               \
-  XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, Request Header Fields Too Large) \
-  XX(451, UNAVAILABLE_FOR_LEGAL_REASONS,   Unavailable For Legal Reasons)   \
-  XX(500, INTERNAL_SERVER_ERROR,           Internal Server Error)           \
-  XX(501, NOT_IMPLEMENTED,                 Not Implemented)                 \
-  XX(502, BAD_GATEWAY,                     Bad Gateway)                     \
-  XX(503, SERVICE_UNAVAILABLE,             Service Unavailable)             \
-  XX(504, GATEWAY_TIMEOUT,                 Gateway Timeout)                 \
-  XX(505, HTTP_VERSION_NOT_SUPPORTED,      HTTP Version Not Supported)      \
-  XX(506, VARIANT_ALSO_NEGOTIATES,         Variant Also Negotiates)         \
-  XX(507, INSUFFICIENT_STORAGE,            Insufficient Storage)            \
-  XX(508, LOOP_DETECTED,                   Loop Detected)                   \
-  XX(510, NOT_EXTENDED,                    Not Extended)                    \
-  XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
-
-enum http_status
-  {
-#define XX(num, name, string) HTTP_STATUS_##name = num,
-  HTTP_STATUS_MAP(XX)
-#undef XX
-  };
-
-
 /* Request Methods */
 #define HTTP_METHOD_MAP(XX)         \
   XX(0,  DELETE,      DELETE)       \
diff --git a/ext/inja/LICENSE b/ext/inja/LICENSE
deleted file mode 100644
index 9e06bea07..000000000
--- a/ext/inja/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018-2021 Berscheid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/ext/inja/README.md b/ext/inja/README.md
deleted file mode 100644
index 9d66a2c28..000000000
--- a/ext/inja/README.md
+++ /dev/null
@@ -1,391 +0,0 @@
-[<div align="center"><img width="500" src="https://raw.githubusercontent.com/pantor/inja/master/doc/logo.svg?sanitize=true"></div>](https://github.com/pantor/inja/releases)
-
-<p align="center">
-  <a href="https://github.com/pantor/inja/actions">
-    <img src="https://github.com/pantor/inja/workflows/CI/badge.svg" alt="CI Status">
-  </a>
-
-  <a href="https://github.com/pantor/inja/actions">
-    <img src="https://github.com/pantor/inja/workflows/Documentation/badge.svg" alt="Documentation Status">
-  </a>
-
-  <a href="https://www.codacy.com/manual/pantor/inja?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=pantor/inja&amp;utm_campaign=Badge_Grade">
-    <img src="https://app.codacy.com/project/badge/Grade/211718f7a36541819d1244c0e2ee6f08"/>
-  </a>
-
-  <a href="https://github.com/pantor/inja/releases">
-    <img src="https://img.shields.io/github/release/pantor/inja.svg" alt="Github Releases">
-  </a>
-
-  <a href="http://github.com/pantor/inja/issues">
-    <img src="https://img.shields.io/github/issues/pantor/inja.svg" alt="Github Issues">
-  </a>
-
-  <a href="https://raw.githubusercontent.com/pantor/inja/master/LICENSE">
-    <img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="GitHub License">
-  </a>
-</p>
-
-Inja is a template engine for modern C++, loosely inspired by [jinja](http://jinja.pocoo.org) for python. It has an easy and yet powerful template syntax with all variables, loops, conditions, includes, callbacks, and comments you need, nested and combined as you like. Inja uses the wonderful [json](https://github.com/nlohmann/json) library by nlohmann for data input. Most importantly, inja needs only two header files, which is (nearly) as trivial as integration in C++ can get. Of course, everything is tested on all relevant compilers. Here is what it looks like:
-
-```.cpp
-json data;
-data["name"] = "world";
-
-inja::render("Hello {{ name }}!", data); // Returns "Hello world!"
-```
-
-## Integration
-
-Inja is a headers only library, which can be downloaded from the [releases](https://github.com/pantor/inja/releases) or directly from the `include/` or `single_include/` folder. Inja uses `nlohmann/json.hpp` (>= v3.8.0) as its single dependency, so make sure it can be included from `inja.hpp`. json can be downloaded [here](https://github.com/nlohmann/json/releases). Then integration is as easy as:
-
-```.cpp
-#include <inja.hpp>
-
-// Just for convenience
-using namespace inja;
-```
-
-If you are using the [Meson Build System](http://mesonbuild.com), then you can wrap this repository as a subproject.
-
-If you are using [Conan](https://conan.io) to manage your dependencies, have a look at [this repository](https://github.com/DEGoodmanWilson/conan-inja). Please file issues [here](https://github.com/DEGoodmanWilson/conan-inja/issues) if you experience problems with the packages.
-
-You can also integrate inja in your project using [Hunter](https://github.com/cpp-pm/hunter), a package manager for C++.
-
-If you are using [vcpkg](https://github.com/Microsoft/vcpkg) on your project for external dependencies, then you can use the [inja package](https://github.com/Microsoft/vcpkg/tree/master/ports/inja). Please see the vcpkg project for any issues regarding the packaging.
-
-If you are using [cget](https://cget.readthedocs.io/en/latest/), you can install the latest development version with `cget install pantor/inja`. A specific version can be installed with `cget install pantor/inja@v2.1.0`.
-
-On macOS, you can install inja via [Homebrew](https://formulae.brew.sh/formula/inja#default) and `brew install inja`.
-
-If you are using [conda](https://docs.conda.io/en/latest/), you can install the latest version from [conda-forge](https://anaconda.org/conda-forge/inja) with `conda install -c conda-forge inja`.
-
-## Tutorial
-
-This tutorial will give you an idea how to use inja. It will explain the most important concepts and give practical advices using examples and executable code. Beside this tutorial, you may check out the [documentation](https://pantor.github.io/inja).
-
-### Template Rendering
-
-The basic template rendering takes a template as a `std::string` and a `json` object for all data. It returns the rendered template as an `std::string`.
-
-```.cpp
-json data;
-data["name"] = "world";
-
-render("Hello {{ name }}!", data); // Returns std::string "Hello world!"
-render_to(std::cout, "Hello {{ name }}!", data); // Writes "Hello world!" to stream
-```
-
-For more advanced usage, an environment is recommended.
-```.cpp
-Environment env;
-
-// Render a string with json data
-std::string result = env.render("Hello {{ name }}!", data); // "Hello world!"
-
-// Or directly read a template file
-Template temp = env.parse_template("./templates/greeting.txt");
-std::string result = env.render(temp, data); // "Hello world!"
-
-data["name"] = "Inja";
-std::string result = env.render(temp, data); // "Hello Inja!"
-
-// Or read the template file (and/or the json file) directly from the environment
-result = env.render_file("./templates/greeting.txt", data);
-result = env.render_file_with_json_file("./templates/greeting.txt", "./data.json");
-
-// Or write a rendered template file
-env.write(temp, data, "./result.txt");
-env.write_with_json_file("./templates/greeting.txt", "./data.json", "./result.txt");
-```
-
-The environment class can be configured to your needs.
-```.cpp
-// With default settings
-Environment env_default;
-
-// With global path to template files and where files will be saved
-Environment env_1 {"../path/templates/"};
-
-// With separate input and output path
-Environment env_2 {"../path/templates/", "../path/results/"};
-
-// With other opening and closing strings (here the defaults)
-env.set_expression("{{", "}}"); // Expressions
-env.set_comment("{#", "#}"); // Comments
-env.set_statement("{%", "%}"); // Statements {% %} for many things, see below
-env.set_line_statement("##"); // Line statements ## (just an opener)
-```
-
-### Variables
-
-Variables are rendered within the `{{ ... }}` expressions.
-```.cpp
-json data;
-data["neighbour"] = "Peter";
-data["guests"] = {"Jeff", "Tom", "Patrick"};
-data["time"]["start"] = 16;
-data["time"]["end"] = 22;
-
-// Indexing in array
-render("{{ guests.1 }}", data); // "Tom"
-
-// Objects
-render("{{ time.start }} to {{ time.end + 1 }}pm", data); // "16 to 23pm"
-```
-If no variable is found, valid JSON is printed directly, otherwise an `inja::RenderError` is thrown.
-
-### Statements
-
-Statements can be written either with the `{% ... %}` syntax or the `##` syntax for entire lines. Note that `##` needs to start the line without indentation. The most important statements are loops, conditions and file includes. All statements can be nested.
-
-#### Loops
-
-```.cpp
-// Combining loops and line statements
-render(R"(Guest List:
-## for guest in guests
-	{{ loop.index1 }}: {{ guest }}
-## endfor )", data)
-
-/* Guest List:
-	1: Jeff
-	2: Tom
-	3: Patrick */
-```
-In a loop, the special variables `loop.index (number)`, `loop.index1 (number)`, `loop.is_first (boolean)` and `loop.is_last (boolean)` are defined. In nested loops, the parent loop variables are available e.g. via `loop.parent.index`. You can also iterate over objects like `{% for key, value in time %}`.
-
-#### Conditions
-
-Conditions support the typical if, else if and else statements. Following conditions are for example possible:
-```.cpp
-// Standard comparisons with a variable
-render("{% if time.hour >= 20 %}Serve{% else if time.hour >= 18 %}Make{% endif %} dinner.", data); // Serve dinner.
-
-// Variable in list
-render("{% if neighbour in guests %}Turn up the music!{% endif %}", data); // Turn up the music!
-
-// Logical operations
-render("{% if guest_count < (3+2) and all_tired %}Sleepy...{% else %}Keep going...{% endif %}", data); // Sleepy...
-
-// Negations
-render("{% if not guest_count %}The End{% endif %}", data); // The End
-```
-
-#### Includes
-
-You can either include other in-memory templates or from the file system.
-```.cpp
-// To include in-memory templates, add them to the environment first
-inja::Template content_template = env.parse("Hello {{ neighbour }}!");
-env.include_template("content", content_template);
-env.render("Content: {% include \"content\" %}", data); // "Content: Hello Peter!"
-
-// Other template files are included relative from the current file location
-render("{% include \"footer.html\" %}", data);
-```
-If a corresponding template could not be found in the file system, the *include callback* is called:
-```.cpp
-// The callback takes the current path and the wanted include name and returns a template
-env.set_include_callback([&env](const std::string& path, const std::string& template_name) {
-  return env.parse("Hello {{ neighbour }} from " + template_name);
-});
-
-// You can disable to search for templates in the file system via
-env.set_search_included_templates_in_files(false);
-```
-
-Inja will throw an `inja::RenderError` if an included file is not found and no callback is specified. To disable this error, you can call `env.set_throw_at_missing_includes(false)`.
-
-#### Assignments
-
-Variables can also be defined within the template using the set statment.
-```.cpp
-render("{% set new_hour=23 %}{{ new_hour }}pm", data); // "23pm"
-render("{% set time.start=18 %}{{ time.start }}pm", data); // using json pointers
-```
-
-Assignments only set the value within the rendering context; they do not modify the json object passed into the `render` call.
-
-### Functions
-
-A few functions are implemented within the inja template syntax. They can be called with
-```.cpp
-// Upper and lower function, for string cases
-render("Hello {{ upper(neighbour) }}!", data); // "Hello PETER!"
-render("Hello {{ lower(neighbour) }}!", data); // "Hello peter!"
-
-// Range function, useful for loops
-render("{% for i in range(4) %}{{ loop.index1 }}{% endfor %}", data); // "1234"
-render("{% for i in range(3) %}{{ at(guests, i) }} {% endfor %}", data); // "Jeff Tom Patrick "
-
-// Length function (please don't combine with range, use list directly...)
-render("I count {{ length(guests) }} guests.", data); // "I count 3 guests."
-
-// Get first and last element in a list
-render("{{ first(guests) }} was first.", data); // "Jeff was first."
-render("{{ last(guests) }} was last.", data); // "Patir was last."
-
-// Sort a list
-render("{{ sort([3,2,1]) }}", data); // "[1,2,3]"
-render("{{ sort(guests) }}", data); // "[\"Jeff\", \"Patrick\", \"Tom\"]"
-
-// Join a list with a separator
-render("{{ join([1,2,3], \" + \") }}", data); // "1 + 2 + 3"
-render("{{ join(guests, \", \") }}", data); // "Jeff, Patrick, Tom"
-
-// Round numbers to a given precision
-render("{{ round(3.1415, 0) }}", data); // 3
-render("{{ round(3.1415, 3) }}", data); // 3.142
-
-// Check if a value is odd, even or divisible by a number
-render("{{ odd(42) }}", data); // false
-render("{{ even(42) }}", data); // true
-render("{{ divisibleBy(42, 7) }}", data); // true
-
-// Maximum and minimum values from a list
-render("{{ max([1, 2, 3]) }}", data); // 3
-render("{{ min([-2.4, -1.2, 4.5]) }}", data); // -2.4
-
-// Convert strings to numbers
-render("{{ int(\"2\") == 2 }}", data); // true
-render("{{ float(\"1.8\") > 2 }}", data); // false
-
-// Set default values if variables are not defined
-render("Hello {{ default(neighbour, \"my friend\") }}!", data); // "Hello Peter!"
-render("Hello {{ default(colleague, \"my friend\") }}!", data); // "Hello my friend!"
-
-// Access an objects value dynamically
-render("{{ at(time, \"start\") }} to {{ time.end }}", data); // "16 to 22"
-
-// Check if a key exists in an object
-render("{{ exists(\"guests\") }}", data); // "true"
-render("{{ exists(\"city\") }}", data); // "false"
-render("{{ existsIn(time, \"start\") }}", data); // "true"
-render("{{ existsIn(time, neighbour) }}", data); // "false"
-
-// Check if a key is a specific type
-render("{{ isString(neighbour) }}", data); // "true"
-render("{{ isArray(guests) }}", data); // "true"
-// Implemented type checks: isArray, isBoolean, isFloat, isInteger, isNumber, isObject, isString,
-```
-
-### Callbacks
-
-You can create your own and more complex functions with callbacks. These are implemented with `std::function`, so you can for example use C++ lambdas. Inja `Arguments` are a vector of json pointers.
-```.cpp
-Environment env;
-
-/*
- * Callbacks are defined by its:
- * - name,
- * - (optional) number of arguments,
- * - callback function.
- */
-env.add_callback("double", 1, [](Arguments& args) {
-	int number = args.at(0)->get<int>(); // Adapt the index and type of the argument
-	return 2 * number;
-});
-
-// You can then use a callback like a regular function
-env.render("{{ double(16) }}", data); // "32"
-
-// Inja falls back to variadic callbacks if the number of expected arguments is omitted.
-env.add_callback("argmax", [](Arguments& args) {
-  auto result = std::max_element(args.begin(), args.end(), [](const json* a, const json* b) { return *a < *b;});
-  return std::distance(args.begin(), result);
-});
-env.render("{{ argmax(4, 2, 6) }}", data); // "2"
-env.render("{{ argmax(0, 2, 6, 8, 3) }}", data); // "3"
-
-// A callback without argument can be used like a dynamic variable:
-std::string greet = "Hello";
-env.add_callback("double-greetings", 0, [greet](Arguments args) {
-	return greet + " " + greet + "!";
-});
-env.render("{{ double-greetings }}", data); // "Hello Hello!"
-```
-You can also add a void callback without return variable, e.g. for debugging:
-```.cpp
-env.add_void_callback("log", 1, [greet](Arguments args) {
-	std::cout << "logging: " << args[0] << std::endl;
-});
-env.render("{{ log(neighbour) }}", data); // Prints nothing to result, only to cout...
-```
-
-### Template Inheritance
-
-Template inheritance allows you to build a base *skeleton* template that contains all the common elements and defines blocks that child templates can override. Lets show an example: The base template
-```.html
-<!DOCTYPE html>
-<html>
-<head>
-  {% block head %}
-  <link rel="stylesheet" href="style.css" />
-  <title>{% block title %}{% endblock %} - My Webpage</title>
-  {% endblock %}
-</head>
-<body>
-  <div id="content">{% block content %}{% endblock %}</div>
-</body>
-</html>
-```
-contains three `blocks` that child templates can fill in. The child template
-```.html
-{% extends "base.html" %}
-{% block title %}Index{% endblock %}
-{% block head %}
-  {{ super() }}
-  <style type="text/css">
-    .important { color: #336699; }
-  </style>
-{% endblock %}
-{% block content %}
-  <h1>Index</h1>
-  <p class="important">
-    Welcome to my blog!
-  </p>
-{% endblock %}
-```
-calls a parent template with the `extends` keyword; it should be the first element in the template. It is possible to render the contents of the parent block by calling `super()`. In the case of multiple levels of `{% extends %}`, super references may be called with an argument (e.g. `super(2)`) to skip levels in the inheritance tree.
-
-### Whitespace Control
-
-In the default configuration, no whitespace is removed while rendering the file. To support a more readable template style, you can configure the environment to control whitespaces before and after a statement automatically. While enabling `set_trim_blocks` removes the first newline after a statement, `set_lstrip_blocks` strips tabs and spaces from the beginning of a line to the start of a block.
-
-```.cpp
-Environment env;
-env.set_trim_blocks(true);
-env.set_lstrip_blocks(true);
-```
-
-With both `trim_blocks` and `lstrip_blocks` enabled, you can put statements on their own lines. Furthermore, you can also strip whitespaces for both statements and expressions by hand. If you add a minus sign (`-`) to the start or end, the whitespaces before or after that block will be removed:
-
-```.cpp
-render("Hello       {{- name -}}     !", data); // "Hello Inja!"
-render("{% if neighbour in guests -%}   I was there{% endif -%}   !", data); // Renders without any whitespaces
-```
-
-Stripping behind a statement or expression also removes any newlines.
-
-### Comments
-
-Comments can be written with the `{# ... #}` syntax.
-```.cpp
-render("Hello{# Todo #}!", data); // "Hello!"
-```
-
-### Exceptions
-
-Inja uses exceptions to handle ill-formed template input. However, exceptions can be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol `INJA_NOEXCEPTION`. In this case, exceptions are replaced by `abort()` calls.
-
-
-## Supported compilers
-
-Inja uses the `string_view` feature of the C++17 STL. Currently, the following compilers are tested:
-
-- GCC 7 - 11 (and possibly later)
-- Clang 5 - 12 (and possibly later)
-- Microsoft Visual C++ 2017 15.0 - 2022 (and possibly later)
-
-A list of supported compiler / os versions can be found in the [CI definition](https://github.com/pantor/inja/blob/master/.github/workflows/ci.yml).
diff --git a/ext/inja/inja.hpp b/ext/inja/inja.hpp
deleted file mode 100644
index 5b469745f..000000000
--- a/ext/inja/inja.hpp
+++ /dev/null
@@ -1,2949 +0,0 @@
-/*
-  ___        _          Version 3.3
- |_ _|_ __  (_) __ _    https://github.com/pantor/inja
-  | || '_ \ | |/ _` |   Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-  | || | | || | (_| |
- |___|_| |_|/ |\__,_|   Copyright (c) 2018-2021 Lars Berscheid
-          |__/
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#ifndef INCLUDE_INJA_INJA_HPP_
-#define INCLUDE_INJA_INJA_HPP_
-
-#include <nlohmann/json.hpp>
-
-namespace inja {
-#ifndef INJA_DATA_TYPE
-using json = nlohmann::json;
-#else
-using json = INJA_DATA_TYPE;
-#endif
-} // namespace inja
-
-#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(INJA_NOEXCEPTION)
-#ifndef INJA_THROW
-#define INJA_THROW(exception) throw exception
-#endif
-#else
-#include <cstdlib>
-#ifndef INJA_THROW
-#define INJA_THROW(exception)                                                                                                                                  \
-  std::abort();                                                                                                                                                \
-  std::ignore = exception
-#endif
-#ifndef INJA_NOEXCEPTION
-#define INJA_NOEXCEPTION
-#endif
-#endif
-
-// #include "environment.hpp"
-#ifndef INCLUDE_INJA_ENVIRONMENT_HPP_
-#define INCLUDE_INJA_ENVIRONMENT_HPP_
-
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <string_view>
-
-// #include "config.hpp"
-#ifndef INCLUDE_INJA_CONFIG_HPP_
-#define INCLUDE_INJA_CONFIG_HPP_
-
-#include <functional>
-#include <string>
-
-// #include "template.hpp"
-#ifndef INCLUDE_INJA_TEMPLATE_HPP_
-#define INCLUDE_INJA_TEMPLATE_HPP_
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-// #include "node.hpp"
-#ifndef INCLUDE_INJA_NODE_HPP_
-#define INCLUDE_INJA_NODE_HPP_
-
-#include <string>
-#include <string_view>
-#include <utility>
-
-// #include "function_storage.hpp"
-#ifndef INCLUDE_INJA_FUNCTION_STORAGE_HPP_
-#define INCLUDE_INJA_FUNCTION_STORAGE_HPP_
-
-#include <string_view>
-#include <vector>
-
-namespace inja {
-
-using Arguments = std::vector<const json*>;
-using CallbackFunction = std::function<json(Arguments& args)>;
-using VoidCallbackFunction = std::function<void(Arguments& args)>;
-
-/*!
- * \brief Class for builtin functions and user-defined callbacks.
- */
-class FunctionStorage {
-public:
-  enum class Operation {
-    Not,
-    And,
-    Or,
-    In,
-    Equal,
-    NotEqual,
-    Greater,
-    GreaterEqual,
-    Less,
-    LessEqual,
-    Add,
-    Subtract,
-    Multiplication,
-    Division,
-    Power,
-    Modulo,
-    AtId,
-    At,
-    Default,
-    DivisibleBy,
-    Even,
-    Exists,
-    ExistsInObject,
-    First,
-    Float,
-    Int,
-    IsArray,
-    IsBoolean,
-    IsFloat,
-    IsInteger,
-    IsNumber,
-    IsObject,
-    IsString,
-    Last,
-    Length,
-    Lower,
-    Max,
-    Min,
-    Odd,
-    Range,
-    Round,
-    Sort,
-    Upper,
-    Super,
-    Join,
-    Callback,
-    ParenLeft,
-    ParenRight,
-    None,
-  };
-
-  struct FunctionData {
-    explicit FunctionData(const Operation& op, const CallbackFunction& cb = CallbackFunction {}): operation(op), callback(cb) {}
-    const Operation operation;
-    const CallbackFunction callback;
-  };
-
-private:
-  const int VARIADIC {-1};
-
-  std::map<std::pair<std::string, int>, FunctionData> function_storage = {
-      {std::make_pair("at", 2), FunctionData {Operation::At}},
-      {std::make_pair("default", 2), FunctionData {Operation::Default}},
-      {std::make_pair("divisibleBy", 2), FunctionData {Operation::DivisibleBy}},
-      {std::make_pair("even", 1), FunctionData {Operation::Even}},
-      {std::make_pair("exists", 1), FunctionData {Operation::Exists}},
-      {std::make_pair("existsIn", 2), FunctionData {Operation::ExistsInObject}},
-      {std::make_pair("first", 1), FunctionData {Operation::First}},
-      {std::make_pair("float", 1), FunctionData {Operation::Float}},
-      {std::make_pair("int", 1), FunctionData {Operation::Int}},
-      {std::make_pair("isArray", 1), FunctionData {Operation::IsArray}},
-      {std::make_pair("isBoolean", 1), FunctionData {Operation::IsBoolean}},
-      {std::make_pair("isFloat", 1), FunctionData {Operation::IsFloat}},
-      {std::make_pair("isInteger", 1), FunctionData {Operation::IsInteger}},
-      {std::make_pair("isNumber", 1), FunctionData {Operation::IsNumber}},
-      {std::make_pair("isObject", 1), FunctionData {Operation::IsObject}},
-      {std::make_pair("isString", 1), FunctionData {Operation::IsString}},
-      {std::make_pair("last", 1), FunctionData {Operation::Last}},
-      {std::make_pair("length", 1), FunctionData {Operation::Length}},
-      {std::make_pair("lower", 1), FunctionData {Operation::Lower}},
-      {std::make_pair("max", 1), FunctionData {Operation::Max}},
-      {std::make_pair("min", 1), FunctionData {Operation::Min}},
-      {std::make_pair("odd", 1), FunctionData {Operation::Odd}},
-      {std::make_pair("range", 1), FunctionData {Operation::Range}},
-      {std::make_pair("round", 2), FunctionData {Operation::Round}},
-      {std::make_pair("sort", 1), FunctionData {Operation::Sort}},
-      {std::make_pair("upper", 1), FunctionData {Operation::Upper}},
-      {std::make_pair("super", 0), FunctionData {Operation::Super}},
-      {std::make_pair("super", 1), FunctionData {Operation::Super}},
-      {std::make_pair("join", 2), FunctionData {Operation::Join}},
-  };
-
-public:
-  void add_builtin(std::string_view name, int num_args, Operation op) {
-    function_storage.emplace(std::make_pair(static_cast<std::string>(name), num_args), FunctionData {op});
-  }
-
-  void add_callback(std::string_view name, int num_args, const CallbackFunction& callback) {
-    function_storage.emplace(std::make_pair(static_cast<std::string>(name), num_args), FunctionData {Operation::Callback, callback});
-  }
-
-  FunctionData find_function(std::string_view name, int num_args) const {
-    auto it = function_storage.find(std::make_pair(static_cast<std::string>(name), num_args));
-    if (it != function_storage.end()) {
-      return it->second;
-
-      // Find variadic function
-    } else if (num_args > 0) {
-      it = function_storage.find(std::make_pair(static_cast<std::string>(name), VARIADIC));
-      if (it != function_storage.end()) {
-        return it->second;
-      }
-    }
-
-    return FunctionData {Operation::None};
-  }
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_FUNCTION_STORAGE_HPP_
-
-// #include "utils.hpp"
-#ifndef INCLUDE_INJA_UTILS_HPP_
-#define INCLUDE_INJA_UTILS_HPP_
-
-#include <algorithm>
-#include <fstream>
-#include <string>
-#include <string_view>
-#include <utility>
-
-// #include "exceptions.hpp"
-#ifndef INCLUDE_INJA_EXCEPTIONS_HPP_
-#define INCLUDE_INJA_EXCEPTIONS_HPP_
-
-#include <stdexcept>
-#include <string>
-
-namespace inja {
-
-struct SourceLocation {
-  size_t line;
-  size_t column;
-};
-
-struct InjaError : public std::runtime_error {
-  const std::string type;
-  const std::string message;
-
-  const SourceLocation location;
-
-  explicit InjaError(const std::string& type, const std::string& message)
-      : std::runtime_error("[inja.exception." + type + "] " + message), type(type), message(message), location({0, 0}) {}
-
-  explicit InjaError(const std::string& type, const std::string& message, SourceLocation location)
-      : std::runtime_error("[inja.exception." + type + "] (at " + std::to_string(location.line) + ":" + std::to_string(location.column) + ") " + message),
-        type(type), message(message), location(location) {}
-};
-
-struct ParserError : public InjaError {
-  explicit ParserError(const std::string& message, SourceLocation location): InjaError("parser_error", message, location) {}
-};
-
-struct RenderError : public InjaError {
-  explicit RenderError(const std::string& message, SourceLocation location): InjaError("render_error", message, location) {}
-};
-
-struct FileError : public InjaError {
-  explicit FileError(const std::string& message): InjaError("file_error", message) {}
-  explicit FileError(const std::string& message, SourceLocation location): InjaError("file_error", message, location) {}
-};
-
-struct DataError : public InjaError {
-  explicit DataError(const std::string& message, SourceLocation location): InjaError("data_error", message, location) {}
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_EXCEPTIONS_HPP_
-
-
-namespace inja {
-
-namespace string_view {
-inline std::string_view slice(std::string_view view, size_t start, size_t end) {
-  start = std::min(start, view.size());
-  end = std::min(std::max(start, end), view.size());
-  return view.substr(start, end - start);
-}
-
-inline std::pair<std::string_view, std::string_view> split(std::string_view view, char Separator) {
-  size_t idx = view.find(Separator);
-  if (idx == std::string_view::npos) {
-    return std::make_pair(view, std::string_view());
-  }
-  return std::make_pair(slice(view, 0, idx), slice(view, idx + 1, std::string_view::npos));
-}
-
-inline bool starts_with(std::string_view view, std::string_view prefix) {
-  return (view.size() >= prefix.size() && view.compare(0, prefix.size(), prefix) == 0);
-}
-} // namespace string_view
-
-inline SourceLocation get_source_location(std::string_view content, size_t pos) {
-  // Get line and offset position (starts at 1:1)
-  auto sliced = string_view::slice(content, 0, pos);
-  std::size_t last_newline = sliced.rfind("\n");
-
-  if (last_newline == std::string_view::npos) {
-    return {1, sliced.length() + 1};
-  }
-
-  // Count newlines
-  size_t count_lines = 0;
-  size_t search_start = 0;
-  while (search_start <= sliced.size()) {
-    search_start = sliced.find("\n", search_start) + 1;
-    if (search_start == 0) {
-      break;
-    }
-    count_lines += 1;
-  }
-
-  return {count_lines + 1, sliced.length() - last_newline};
-}
-
-inline void replace_substring(std::string& s, const std::string& f, const std::string& t) {
-  if (f.empty()) {
-    return;
-  }
-  for (auto pos = s.find(f);            // find first occurrence of f
-       pos != std::string::npos;        // make sure f was found
-       s.replace(pos, f.size(), t),     // replace with t, and
-       pos = s.find(f, pos + t.size())) // find next occurrence of f
-  {}
-}
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_UTILS_HPP_
-
-
-namespace inja {
-
-class NodeVisitor;
-class BlockNode;
-class TextNode;
-class ExpressionNode;
-class LiteralNode;
-class DataNode;
-class FunctionNode;
-class ExpressionListNode;
-class StatementNode;
-class ForStatementNode;
-class ForArrayStatementNode;
-class ForObjectStatementNode;
-class IfStatementNode;
-class IncludeStatementNode;
-class ExtendsStatementNode;
-class BlockStatementNode;
-class SetStatementNode;
-
-class NodeVisitor {
-public:
-  virtual ~NodeVisitor() = default;
-
-  virtual void visit(const BlockNode& node) = 0;
-  virtual void visit(const TextNode& node) = 0;
-  virtual void visit(const ExpressionNode& node) = 0;
-  virtual void visit(const LiteralNode& node) = 0;
-  virtual void visit(const DataNode& node) = 0;
-  virtual void visit(const FunctionNode& node) = 0;
-  virtual void visit(const ExpressionListNode& node) = 0;
-  virtual void visit(const StatementNode& node) = 0;
-  virtual void visit(const ForStatementNode& node) = 0;
-  virtual void visit(const ForArrayStatementNode& node) = 0;
-  virtual void visit(const ForObjectStatementNode& node) = 0;
-  virtual void visit(const IfStatementNode& node) = 0;
-  virtual void visit(const IncludeStatementNode& node) = 0;
-  virtual void visit(const ExtendsStatementNode& node) = 0;
-  virtual void visit(const BlockStatementNode& node) = 0;
-  virtual void visit(const SetStatementNode& node) = 0;
-};
-
-/*!
- * \brief Base node class for the abstract syntax tree (AST).
- */
-class AstNode {
-public:
-  virtual void accept(NodeVisitor& v) const = 0;
-
-  size_t pos;
-
-  AstNode(size_t pos): pos(pos) {}
-  virtual ~AstNode() {}
-};
-
-class BlockNode : public AstNode {
-public:
-  std::vector<std::shared_ptr<AstNode>> nodes;
-
-  explicit BlockNode(): AstNode(0) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class TextNode : public AstNode {
-public:
-  const size_t length;
-
-  explicit TextNode(size_t pos, size_t length): AstNode(pos), length(length) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class ExpressionNode : public AstNode {
-public:
-  explicit ExpressionNode(size_t pos): AstNode(pos) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class LiteralNode : public ExpressionNode {
-public:
-  const json value;
-
-  explicit LiteralNode(std::string_view data_text, size_t pos): ExpressionNode(pos), value(json::parse(data_text)) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class DataNode : public ExpressionNode {
-public:
-  const std::string name;
-  const json::json_pointer ptr;
-
-  static std::string convert_dot_to_ptr(std::string_view ptr_name) {
-    std::string result;
-    do {
-      std::string_view part;
-      std::tie(part, ptr_name) = string_view::split(ptr_name, '.');
-      result.push_back('/');
-      result.append(part.begin(), part.end());
-    } while (!ptr_name.empty());
-    return result;
-  }
-
-  explicit DataNode(std::string_view ptr_name, size_t pos): ExpressionNode(pos), name(ptr_name), ptr(json::json_pointer(convert_dot_to_ptr(ptr_name))) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class FunctionNode : public ExpressionNode {
-  using Op = FunctionStorage::Operation;
-
-public:
-  enum class Associativity {
-    Left,
-    Right,
-  };
-
-  unsigned int precedence;
-  Associativity associativity;
-
-  Op operation;
-
-  std::string name;
-  int number_args; // Should also be negative -> -1 for unknown number
-  std::vector<std::shared_ptr<ExpressionNode>> arguments;
-  CallbackFunction callback;
-
-  explicit FunctionNode(std::string_view name, size_t pos)
-      : ExpressionNode(pos), precedence(8), associativity(Associativity::Left), operation(Op::Callback), name(name), number_args(1) {}
-  explicit FunctionNode(Op operation, size_t pos): ExpressionNode(pos), operation(operation), number_args(1) {
-    switch (operation) {
-    case Op::Not: {
-      number_args = 1;
-      precedence = 4;
-      associativity = Associativity::Left;
-    } break;
-    case Op::And: {
-      number_args = 2;
-      precedence = 1;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Or: {
-      number_args = 2;
-      precedence = 1;
-      associativity = Associativity::Left;
-    } break;
-    case Op::In: {
-      number_args = 2;
-      precedence = 2;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Equal: {
-      number_args = 2;
-      precedence = 2;
-      associativity = Associativity::Left;
-    } break;
-    case Op::NotEqual: {
-      number_args = 2;
-      precedence = 2;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Greater: {
-      number_args = 2;
-      precedence = 2;
-      associativity = Associativity::Left;
-    } break;
-    case Op::GreaterEqual: {
-      number_args = 2;
-      precedence = 2;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Less: {
-      number_args = 2;
-      precedence = 2;
-      associativity = Associativity::Left;
-    } break;
-    case Op::LessEqual: {
-      number_args = 2;
-      precedence = 2;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Add: {
-      number_args = 2;
-      precedence = 3;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Subtract: {
-      number_args = 2;
-      precedence = 3;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Multiplication: {
-      number_args = 2;
-      precedence = 4;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Division: {
-      number_args = 2;
-      precedence = 4;
-      associativity = Associativity::Left;
-    } break;
-    case Op::Power: {
-      number_args = 2;
-      precedence = 5;
-      associativity = Associativity::Right;
-    } break;
-    case Op::Modulo: {
-      number_args = 2;
-      precedence = 4;
-      associativity = Associativity::Left;
-    } break;
-    case Op::AtId: {
-      number_args = 2;
-      precedence = 8;
-      associativity = Associativity::Left;
-    } break;
-    default: {
-      precedence = 1;
-      associativity = Associativity::Left;
-    }
-    }
-  }
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class ExpressionListNode : public AstNode {
-public:
-  std::shared_ptr<ExpressionNode> root;
-
-  explicit ExpressionListNode(): AstNode(0) {}
-  explicit ExpressionListNode(size_t pos): AstNode(pos) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class StatementNode : public AstNode {
-public:
-  StatementNode(size_t pos): AstNode(pos) {}
-
-  virtual void accept(NodeVisitor& v) const = 0;
-};
-
-class ForStatementNode : public StatementNode {
-public:
-  ExpressionListNode condition;
-  BlockNode body;
-  BlockNode* const parent;
-
-  ForStatementNode(BlockNode* const parent, size_t pos): StatementNode(pos), parent(parent) {}
-
-  virtual void accept(NodeVisitor& v) const = 0;
-};
-
-class ForArrayStatementNode : public ForStatementNode {
-public:
-  const std::string value;
-
-  explicit ForArrayStatementNode(const std::string& value, BlockNode* const parent, size_t pos): ForStatementNode(parent, pos), value(value) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class ForObjectStatementNode : public ForStatementNode {
-public:
-  const std::string key;
-  const std::string value;
-
-  explicit ForObjectStatementNode(const std::string& key, const std::string& value, BlockNode* const parent, size_t pos)
-      : ForStatementNode(parent, pos), key(key), value(value) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class IfStatementNode : public StatementNode {
-public:
-  ExpressionListNode condition;
-  BlockNode true_statement;
-  BlockNode false_statement;
-  BlockNode* const parent;
-
-  const bool is_nested;
-  bool has_false_statement {false};
-
-  explicit IfStatementNode(BlockNode* const parent, size_t pos): StatementNode(pos), parent(parent), is_nested(false) {}
-  explicit IfStatementNode(bool is_nested, BlockNode* const parent, size_t pos): StatementNode(pos), parent(parent), is_nested(is_nested) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class IncludeStatementNode : public StatementNode {
-public:
-  const std::string file;
-
-  explicit IncludeStatementNode(const std::string& file, size_t pos): StatementNode(pos), file(file) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-class ExtendsStatementNode : public StatementNode {
-public:
-  const std::string file;
-
-  explicit ExtendsStatementNode(const std::string& file, size_t pos): StatementNode(pos), file(file) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  };
-};
-
-class BlockStatementNode : public StatementNode {
-public:
-  const std::string name;
-  BlockNode block;
-  BlockNode* const parent;
-
-  explicit BlockStatementNode(BlockNode* const parent, const std::string& name, size_t pos): StatementNode(pos), name(name), parent(parent) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  };
-};
-
-class SetStatementNode : public StatementNode {
-public:
-  const std::string key;
-  ExpressionListNode expression;
-
-  explicit SetStatementNode(const std::string& key, size_t pos): StatementNode(pos), key(key) {}
-
-  void accept(NodeVisitor& v) const {
-    v.visit(*this);
-  }
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_NODE_HPP_
-
-// #include "statistics.hpp"
-#ifndef INCLUDE_INJA_STATISTICS_HPP_
-#define INCLUDE_INJA_STATISTICS_HPP_
-
-// #include "node.hpp"
-
-
-namespace inja {
-
-/*!
- * \brief A class for counting statistics on a Template.
- */
-class StatisticsVisitor : public NodeVisitor {
-  void visit(const BlockNode& node) {
-    for (auto& n : node.nodes) {
-      n->accept(*this);
-    }
-  }
-
-  void visit(const TextNode&) {}
-  void visit(const ExpressionNode&) {}
-  void visit(const LiteralNode&) {}
-
-  void visit(const DataNode&) {
-    variable_counter += 1;
-  }
-
-  void visit(const FunctionNode& node) {
-    for (auto& n : node.arguments) {
-      n->accept(*this);
-    }
-  }
-
-  void visit(const ExpressionListNode& node) {
-    node.root->accept(*this);
-  }
-
-  void visit(const StatementNode&) {}
-  void visit(const ForStatementNode&) {}
-
-  void visit(const ForArrayStatementNode& node) {
-    node.condition.accept(*this);
-    node.body.accept(*this);
-  }
-
-  void visit(const ForObjectStatementNode& node) {
-    node.condition.accept(*this);
-    node.body.accept(*this);
-  }
-
-  void visit(const IfStatementNode& node) {
-    node.condition.accept(*this);
-    node.true_statement.accept(*this);
-    node.false_statement.accept(*this);
-  }
-
-  void visit(const IncludeStatementNode&) {}
-
-  void visit(const ExtendsStatementNode&) {}
-
-  void visit(const BlockStatementNode& node) {
-    node.block.accept(*this);
-  }
-
-  void visit(const SetStatementNode&) {}
-
-public:
-  unsigned int variable_counter;
-
-  explicit StatisticsVisitor(): variable_counter(0) {}
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_STATISTICS_HPP_
-
-
-namespace inja {
-
-/*!
- * \brief The main inja Template.
- */
-struct Template {
-  BlockNode root;
-  std::string content;
-  std::map<std::string, std::shared_ptr<BlockStatementNode>> block_storage;
-
-  explicit Template() {}
-  explicit Template(const std::string& content): content(content) {}
-
-  /// Return number of variables (total number, not distinct ones) in the template
-  int count_variables() {
-    auto statistic_visitor = StatisticsVisitor();
-    root.accept(statistic_visitor);
-    return statistic_visitor.variable_counter;
-  }
-};
-
-using TemplateStorage = std::map<std::string, Template>;
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_TEMPLATE_HPP_
-
-
-namespace inja {
-
-/*!
- * \brief Class for lexer configuration.
- */
-struct LexerConfig {
-  std::string statement_open {"{%"};
-  std::string statement_open_no_lstrip {"{%+"};
-  std::string statement_open_force_lstrip {"{%-"};
-  std::string statement_close {"%}"};
-  std::string statement_close_force_rstrip {"-%}"};
-  std::string line_statement {"##"};
-  std::string expression_open {"{{"};
-  std::string expression_open_force_lstrip {"{{-"};
-  std::string expression_close {"}}"};
-  std::string expression_close_force_rstrip {"-}}"};
-  std::string comment_open {"{#"};
-  std::string comment_open_force_lstrip {"{#-"};
-  std::string comment_close {"#}"};
-  std::string comment_close_force_rstrip {"-#}"};
-  std::string open_chars {"#{"};
-
-  bool trim_blocks {false};
-  bool lstrip_blocks {false};
-
-  void update_open_chars() {
-    open_chars = "";
-    if (open_chars.find(line_statement[0]) == std::string::npos) {
-      open_chars += line_statement[0];
-    }
-    if (open_chars.find(statement_open[0]) == std::string::npos) {
-      open_chars += statement_open[0];
-    }
-    if (open_chars.find(statement_open_no_lstrip[0]) == std::string::npos) {
-      open_chars += statement_open_no_lstrip[0];
-    }
-    if (open_chars.find(statement_open_force_lstrip[0]) == std::string::npos) {
-      open_chars += statement_open_force_lstrip[0];
-    }
-    if (open_chars.find(expression_open[0]) == std::string::npos) {
-      open_chars += expression_open[0];
-    }
-    if (open_chars.find(expression_open_force_lstrip[0]) == std::string::npos) {
-      open_chars += expression_open_force_lstrip[0];
-    }
-    if (open_chars.find(comment_open[0]) == std::string::npos) {
-      open_chars += comment_open[0];
-    }
-    if (open_chars.find(comment_open_force_lstrip[0]) == std::string::npos) {
-      open_chars += comment_open_force_lstrip[0];
-    }
-  }
-};
-
-/*!
- * \brief Class for parser configuration.
- */
-struct ParserConfig {
-  bool search_included_templates_in_files {true};
-
-  std::function<Template(const std::string&, const std::string&)> include_callback;
-};
-
-/*!
- * \brief Class for render configuration.
- */
-struct RenderConfig {
-  bool throw_at_missing_includes {true};
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_CONFIG_HPP_
-
-// #include "function_storage.hpp"
-
-// #include "parser.hpp"
-#ifndef INCLUDE_INJA_PARSER_HPP_
-#define INCLUDE_INJA_PARSER_HPP_
-
-#include <limits>
-#include <stack>
-#include <string>
-#include <utility>
-#include <vector>
-
-// #include "config.hpp"
-
-// #include "exceptions.hpp"
-
-// #include "function_storage.hpp"
-
-// #include "lexer.hpp"
-#ifndef INCLUDE_INJA_LEXER_HPP_
-#define INCLUDE_INJA_LEXER_HPP_
-
-#include <cctype>
-#include <locale>
-
-// #include "config.hpp"
-
-// #include "token.hpp"
-#ifndef INCLUDE_INJA_TOKEN_HPP_
-#define INCLUDE_INJA_TOKEN_HPP_
-
-#include <string>
-#include <string_view>
-
-namespace inja {
-
-/*!
- * \brief Helper-class for the inja Lexer.
- */
-struct Token {
-  enum class Kind {
-    Text,
-    ExpressionOpen,     // {{
-    ExpressionClose,    // }}
-    LineStatementOpen,  // ##
-    LineStatementClose, // \n
-    StatementOpen,      // {%
-    StatementClose,     // %}
-    CommentOpen,        // {#
-    CommentClose,       // #}
-    Id,                 // this, this.foo
-    Number,             // 1, 2, -1, 5.2, -5.3
-    String,             // "this"
-    Plus,               // +
-    Minus,              // -
-    Times,              // *
-    Slash,              // /
-    Percent,            // %
-    Power,              // ^
-    Comma,              // ,
-    Dot,                // .
-    Colon,              // :
-    LeftParen,          // (
-    RightParen,         // )
-    LeftBracket,        // [
-    RightBracket,       // ]
-    LeftBrace,          // {
-    RightBrace,         // }
-    Equal,              // ==
-    NotEqual,           // !=
-    GreaterThan,        // >
-    GreaterEqual,       // >=
-    LessThan,           // <
-    LessEqual,          // <=
-    Unknown,
-    Eof,
-  };
-
-  Kind kind {Kind::Unknown};
-  std::string_view text;
-
-  explicit constexpr Token() = default;
-  explicit constexpr Token(Kind kind, std::string_view text): kind(kind), text(text) {}
-
-  std::string describe() const {
-    switch (kind) {
-    case Kind::Text:
-      return "<text>";
-    case Kind::LineStatementClose:
-      return "<eol>";
-    case Kind::Eof:
-      return "<eof>";
-    default:
-      return static_cast<std::string>(text);
-    }
-  }
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_TOKEN_HPP_
-
-// #include "utils.hpp"
-
-
-namespace inja {
-
-/*!
- * \brief Class for lexing an inja Template.
- */
-class Lexer {
-  enum class State {
-    Text,
-    ExpressionStart,
-    ExpressionStartForceLstrip,
-    ExpressionBody,
-    LineStart,
-    LineBody,
-    StatementStart,
-    StatementStartNoLstrip,
-    StatementStartForceLstrip,
-    StatementBody,
-    CommentStart,
-    CommentStartForceLstrip,
-    CommentBody,
-  };
-
-  enum class MinusState {
-    Operator,
-    Number,
-  };
-
-  const LexerConfig& config;
-
-  State state;
-  MinusState minus_state;
-  std::string_view m_in;
-  size_t tok_start;
-  size_t pos;
-
-  Token scan_body(std::string_view close, Token::Kind closeKind, std::string_view close_trim = std::string_view(), bool trim = false) {
-  again:
-    // skip whitespace (except for \n as it might be a close)
-    if (tok_start >= m_in.size()) {
-      return make_token(Token::Kind::Eof);
-    }
-    const char ch = m_in[tok_start];
-    if (ch == ' ' || ch == '\t' || ch == '\r') {
-      tok_start += 1;
-      goto again;
-    }
-
-    // check for close
-    if (!close_trim.empty() && inja::string_view::starts_with(m_in.substr(tok_start), close_trim)) {
-      state = State::Text;
-      pos = tok_start + close_trim.size();
-      const Token tok = make_token(closeKind);
-      skip_whitespaces_and_newlines();
-      return tok;
-    }
-
-    if (inja::string_view::starts_with(m_in.substr(tok_start), close)) {
-      state = State::Text;
-      pos = tok_start + close.size();
-      const Token tok = make_token(closeKind);
-      if (trim) {
-        skip_whitespaces_and_first_newline();
-      }
-      return tok;
-    }
-
-    // skip \n
-    if (ch == '\n') {
-      tok_start += 1;
-      goto again;
-    }
-
-    pos = tok_start + 1;
-    if (std::isalpha(ch)) {
-      minus_state = MinusState::Operator;
-      return scan_id();
-    }
-
-    const MinusState current_minus_state = minus_state;
-    if (minus_state == MinusState::Operator) {
-      minus_state = MinusState::Number;
-    }
-
-    switch (ch) {
-    case '+':
-      return make_token(Token::Kind::Plus);
-    case '-':
-      if (current_minus_state == MinusState::Operator) {
-        return make_token(Token::Kind::Minus);
-      }
-      return scan_number();
-    case '*':
-      return make_token(Token::Kind::Times);
-    case '/':
-      return make_token(Token::Kind::Slash);
-    case '^':
-      return make_token(Token::Kind::Power);
-    case '%':
-      return make_token(Token::Kind::Percent);
-    case '.':
-      return make_token(Token::Kind::Dot);
-    case ',':
-      return make_token(Token::Kind::Comma);
-    case ':':
-      return make_token(Token::Kind::Colon);
-    case '(':
-      return make_token(Token::Kind::LeftParen);
-    case ')':
-      minus_state = MinusState::Operator;
-      return make_token(Token::Kind::RightParen);
-    case '[':
-      return make_token(Token::Kind::LeftBracket);
-    case ']':
-      minus_state = MinusState::Operator;
-      return make_token(Token::Kind::RightBracket);
-    case '{':
-      return make_token(Token::Kind::LeftBrace);
-    case '}':
-      minus_state = MinusState::Operator;
-      return make_token(Token::Kind::RightBrace);
-    case '>':
-      if (pos < m_in.size() && m_in[pos] == '=') {
-        pos += 1;
-        return make_token(Token::Kind::GreaterEqual);
-      }
-      return make_token(Token::Kind::GreaterThan);
-    case '<':
-      if (pos < m_in.size() && m_in[pos] == '=') {
-        pos += 1;
-        return make_token(Token::Kind::LessEqual);
-      }
-      return make_token(Token::Kind::LessThan);
-    case '=':
-      if (pos < m_in.size() && m_in[pos] == '=') {
-        pos += 1;
-        return make_token(Token::Kind::Equal);
-      }
-      return make_token(Token::Kind::Unknown);
-    case '!':
-      if (pos < m_in.size() && m_in[pos] == '=') {
-        pos += 1;
-        return make_token(Token::Kind::NotEqual);
-      }
-      return make_token(Token::Kind::Unknown);
-    case '\"':
-      return scan_string();
-    case '0':
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9':
-      minus_state = MinusState::Operator;
-      return scan_number();
-    case '_':
-    case '@':
-    case '$':
-      minus_state = MinusState::Operator;
-      return scan_id();
-    default:
-      return make_token(Token::Kind::Unknown);
-    }
-  }
-
-  Token scan_id() {
-    for (;;) {
-      if (pos >= m_in.size()) {
-        break;
-      }
-      const char ch = m_in[pos];
-      if (!std::isalnum(ch) && ch != '.' && ch != '/' && ch != '_' && ch != '-') {
-        break;
-      }
-      pos += 1;
-    }
-    return make_token(Token::Kind::Id);
-  }
-
-  Token scan_number() {
-    for (;;) {
-      if (pos >= m_in.size()) {
-        break;
-      }
-      const char ch = m_in[pos];
-      // be very permissive in lexer (we'll catch errors when conversion happens)
-      if (!(std::isdigit(ch) || ch == '.' || ch == 'e' || ch == 'E' || (ch == '+' && (pos == 0 || m_in[pos-1] == 'e' || m_in[pos-1] == 'E')) || (ch == '-' && (pos == 0 || m_in[pos-1] == 'e' || m_in[pos-1] == 'E')))) {
-        break;
-      }
-      pos += 1;
-    }
-    return make_token(Token::Kind::Number);
-  }
-
-  Token scan_string() {
-    bool escape {false};
-    for (;;) {
-      if (pos >= m_in.size()) {
-        break;
-      }
-      const char ch = m_in[pos++];
-      if (ch == '\\') {
-        escape = true;
-      } else if (!escape && ch == m_in[tok_start]) {
-        break;
-      } else {
-        escape = false;
-      }
-    }
-    return make_token(Token::Kind::String);
-  }
-
-  Token make_token(Token::Kind kind) const {
-    return Token(kind, string_view::slice(m_in, tok_start, pos));
-  }
-
-  void skip_whitespaces_and_newlines() {
-    if (pos < m_in.size()) {
-      while (pos < m_in.size() && (m_in[pos] == ' ' || m_in[pos] == '\t' || m_in[pos] == '\n' || m_in[pos] == '\r')) {
-        pos += 1;
-      }
-    }
-  }
-
-  void skip_whitespaces_and_first_newline() {
-    if (pos < m_in.size()) {
-      while (pos < m_in.size() && (m_in[pos] == ' ' || m_in[pos] == '\t')) {
-        pos += 1;
-      }
-    }
-
-    if (pos < m_in.size()) {
-      const char ch = m_in[pos];
-      if (ch == '\n') {
-        pos += 1;
-      } else if (ch == '\r') {
-        pos += 1;
-        if (pos < m_in.size() && m_in[pos] == '\n') {
-          pos += 1;
-        }
-      }
-    }
-  }
-
-  static std::string_view clear_final_line_if_whitespace(std::string_view text) {
-    std::string_view result = text;
-    while (!result.empty()) {
-      const char ch = result.back();
-      if (ch == ' ' || ch == '\t') {
-        result.remove_suffix(1);
-      } else if (ch == '\n' || ch == '\r') {
-        break;
-      } else {
-        return text;
-      }
-    }
-    return result;
-  }
-
-public:
-  explicit Lexer(const LexerConfig& config): config(config), state(State::Text), minus_state(MinusState::Number) {}
-
-  SourceLocation current_position() const {
-    return get_source_location(m_in, tok_start);
-  }
-
-  void start(std::string_view input) {
-    m_in = input;
-    tok_start = 0;
-    pos = 0;
-    state = State::Text;
-    minus_state = MinusState::Number;
-
-    // Consume byte order mark (BOM) for UTF-8
-    if (inja::string_view::starts_with(m_in, "\xEF\xBB\xBF")) {
-      m_in = m_in.substr(3);
-    }
-  }
-
-  Token scan() {
-    tok_start = pos;
-
-  again:
-    if (tok_start >= m_in.size()) {
-      return make_token(Token::Kind::Eof);
-    }
-
-    switch (state) {
-    default:
-    case State::Text: {
-      // fast-scan to first open character
-      const size_t open_start = m_in.substr(pos).find_first_of(config.open_chars);
-      if (open_start == std::string_view::npos) {
-        // didn't find open, return remaining text as text token
-        pos = m_in.size();
-        return make_token(Token::Kind::Text);
-      }
-      pos += open_start;
-
-      // try to match one of the opening sequences, and get the close
-      std::string_view open_str = m_in.substr(pos);
-      bool must_lstrip = false;
-      if (inja::string_view::starts_with(open_str, config.expression_open)) {
-        if (inja::string_view::starts_with(open_str, config.expression_open_force_lstrip)) {
-          state = State::ExpressionStartForceLstrip;
-          must_lstrip = true;
-        } else {
-          state = State::ExpressionStart;
-        }
-      } else if (inja::string_view::starts_with(open_str, config.statement_open)) {
-        if (inja::string_view::starts_with(open_str, config.statement_open_no_lstrip)) {
-          state = State::StatementStartNoLstrip;
-        } else if (inja::string_view::starts_with(open_str, config.statement_open_force_lstrip)) {
-          state = State::StatementStartForceLstrip;
-          must_lstrip = true;
-        } else {
-          state = State::StatementStart;
-          must_lstrip = config.lstrip_blocks;
-        }
-      } else if (inja::string_view::starts_with(open_str, config.comment_open)) {
-        if (inja::string_view::starts_with(open_str, config.comment_open_force_lstrip)) {
-          state = State::CommentStartForceLstrip;
-          must_lstrip = true;
-        } else {
-          state = State::CommentStart;
-          must_lstrip = config.lstrip_blocks;
-        }
-      } else if ((pos == 0 || m_in[pos - 1] == '\n') && inja::string_view::starts_with(open_str, config.line_statement)) {
-        state = State::LineStart;
-      } else {
-        pos += 1; // wasn't actually an opening sequence
-        goto again;
-      }
-
-      std::string_view text = string_view::slice(m_in, tok_start, pos);
-      if (must_lstrip) {
-        text = clear_final_line_if_whitespace(text);
-      }
-
-      if (text.empty()) {
-        goto again; // don't generate empty token
-      }
-      return Token(Token::Kind::Text, text);
-    }
-    case State::ExpressionStart: {
-      state = State::ExpressionBody;
-      pos += config.expression_open.size();
-      return make_token(Token::Kind::ExpressionOpen);
-    }
-    case State::ExpressionStartForceLstrip: {
-      state = State::ExpressionBody;
-      pos += config.expression_open_force_lstrip.size();
-      return make_token(Token::Kind::ExpressionOpen);
-    }
-    case State::LineStart: {
-      state = State::LineBody;
-      pos += config.line_statement.size();
-      return make_token(Token::Kind::LineStatementOpen);
-    }
-    case State::StatementStart: {
-      state = State::StatementBody;
-      pos += config.statement_open.size();
-      return make_token(Token::Kind::StatementOpen);
-    }
-    case State::StatementStartNoLstrip: {
-      state = State::StatementBody;
-      pos += config.statement_open_no_lstrip.size();
-      return make_token(Token::Kind::StatementOpen);
-    }
-    case State::StatementStartForceLstrip: {
-      state = State::StatementBody;
-      pos += config.statement_open_force_lstrip.size();
-      return make_token(Token::Kind::StatementOpen);
-    }
-    case State::CommentStart: {
-      state = State::CommentBody;
-      pos += config.comment_open.size();
-      return make_token(Token::Kind::CommentOpen);
-    }
-    case State::CommentStartForceLstrip: {
-      state = State::CommentBody;
-      pos += config.comment_open_force_lstrip.size();
-      return make_token(Token::Kind::CommentOpen);
-    }
-    case State::ExpressionBody:
-      return scan_body(config.expression_close, Token::Kind::ExpressionClose, config.expression_close_force_rstrip);
-    case State::LineBody:
-      return scan_body("\n", Token::Kind::LineStatementClose);
-    case State::StatementBody:
-      return scan_body(config.statement_close, Token::Kind::StatementClose, config.statement_close_force_rstrip, config.trim_blocks);
-    case State::CommentBody: {
-      // fast-scan to comment close
-      const size_t end = m_in.substr(pos).find(config.comment_close);
-      if (end == std::string_view::npos) {
-        pos = m_in.size();
-        return make_token(Token::Kind::Eof);
-      }
-
-      // Check for trim pattern
-      const bool must_rstrip = inja::string_view::starts_with(m_in.substr(pos + end - 1), config.comment_close_force_rstrip);
-
-      // return the entire comment in the close token
-      state = State::Text;
-      pos += end + config.comment_close.size();
-      Token tok = make_token(Token::Kind::CommentClose);
-
-      if (must_rstrip || config.trim_blocks) {
-        skip_whitespaces_and_first_newline();
-      }
-      return tok;
-    }
-    }
-  }
-
-  const LexerConfig& get_config() const {
-    return config;
-  }
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_LEXER_HPP_
-
-// #include "node.hpp"
-
-// #include "template.hpp"
-
-// #include "token.hpp"
-
-// #include "utils.hpp"
-
-
-namespace inja {
-
-/*!
- * \brief Class for parsing an inja Template.
- */
-class Parser {
-  const ParserConfig& config;
-
-  Lexer lexer;
-  TemplateStorage& template_storage;
-  const FunctionStorage& function_storage;
-
-  Token tok, peek_tok;
-  bool have_peek_tok {false};
-
-  size_t current_paren_level {0};
-  size_t current_bracket_level {0};
-  size_t current_brace_level {0};
-
-  std::string_view literal_start;
-
-  BlockNode* current_block {nullptr};
-  ExpressionListNode* current_expression_list {nullptr};
-  std::stack<std::pair<FunctionNode*, size_t>> function_stack;
-  std::vector<std::shared_ptr<ExpressionNode>> arguments;
-
-  std::stack<std::shared_ptr<FunctionNode>> operator_stack;
-  std::stack<IfStatementNode*> if_statement_stack;
-  std::stack<ForStatementNode*> for_statement_stack;
-  std::stack<BlockStatementNode*> block_statement_stack;
-
-  inline void throw_parser_error(const std::string& message) const {
-    INJA_THROW(ParserError(message, lexer.current_position()));
-  }
-
-  inline void get_next_token() {
-    if (have_peek_tok) {
-      tok = peek_tok;
-      have_peek_tok = false;
-    } else {
-      tok = lexer.scan();
-    }
-  }
-
-  inline void get_peek_token() {
-    if (!have_peek_tok) {
-      peek_tok = lexer.scan();
-      have_peek_tok = true;
-    }
-  }
-
-  inline void add_literal(const char* content_ptr) {
-    std::string_view data_text(literal_start.data(), tok.text.data() - literal_start.data() + tok.text.size());
-    arguments.emplace_back(std::make_shared<LiteralNode>(data_text, data_text.data() - content_ptr));
-  }
-
-  inline void add_operator() {
-    auto function = operator_stack.top();
-    operator_stack.pop();
-
-    for (int i = 0; i < function->number_args; ++i) {
-      function->arguments.insert(function->arguments.begin(), arguments.back());
-      arguments.pop_back();
-    }
-    arguments.emplace_back(function);
-  }
-
-  void add_to_template_storage(std::string_view path, std::string& template_name) {
-    if (template_storage.find(template_name) != template_storage.end()) {
-      return;
-    }
-
-    std::string original_path = static_cast<std::string>(path);
-    std::string original_name = template_name;
-
-    if (config.search_included_templates_in_files) {
-      // Build the relative path
-      template_name = original_path + original_name;
-      if (template_name.compare(0, 2, "./") == 0) {
-        template_name.erase(0, 2);
-      }
-
-      if (template_storage.find(template_name) == template_storage.end()) {
-        // Load file
-        std::ifstream file;
-        file.open(template_name);
-        if (!file.fail()) {
-          std::string text((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
-
-          auto include_template = Template(text);
-          template_storage.emplace(template_name, include_template);
-          parse_into_template(template_storage[template_name], template_name);
-          return;
-        } else if (!config.include_callback) {
-          INJA_THROW(FileError("failed accessing file at '" + template_name + "'"));
-        }
-      }
-    }
-
-    // Try include callback
-    if (config.include_callback) {
-      auto include_template = config.include_callback(original_path, original_name);
-      template_storage.emplace(template_name, include_template);
-    }
-  }
-
-  std::string parse_filename(const Token& tok) const {
-    if (tok.kind != Token::Kind::String) {
-      throw_parser_error("expected string, got '" + tok.describe() + "'");
-    }
-
-    if (tok.text.length() < 2) {
-      throw_parser_error("expected filename, got '" + static_cast<std::string>(tok.text) + "'");
-    }
-
-    // Remove first and last character ""
-    return std::string {tok.text.substr(1, tok.text.length() - 2)};
-  }
-
-  bool parse_expression(Template& tmpl, Token::Kind closing) {
-    while (tok.kind != closing && tok.kind != Token::Kind::Eof) {
-      // Literals
-      switch (tok.kind) {
-      case Token::Kind::String: {
-        if (current_brace_level == 0 && current_bracket_level == 0) {
-          literal_start = tok.text;
-          add_literal(tmpl.content.c_str());
-        }
-      } break;
-      case Token::Kind::Number: {
-        if (current_brace_level == 0 && current_bracket_level == 0) {
-          literal_start = tok.text;
-          add_literal(tmpl.content.c_str());
-        }
-      } break;
-      case Token::Kind::LeftBracket: {
-        if (current_brace_level == 0 && current_bracket_level == 0) {
-          literal_start = tok.text;
-        }
-        current_bracket_level += 1;
-      } break;
-      case Token::Kind::LeftBrace: {
-        if (current_brace_level == 0 && current_bracket_level == 0) {
-          literal_start = tok.text;
-        }
-        current_brace_level += 1;
-      } break;
-      case Token::Kind::RightBracket: {
-        if (current_bracket_level == 0) {
-          throw_parser_error("unexpected ']'");
-        }
-
-        current_bracket_level -= 1;
-        if (current_brace_level == 0 && current_bracket_level == 0) {
-          add_literal(tmpl.content.c_str());
-        }
-      } break;
-      case Token::Kind::RightBrace: {
-        if (current_brace_level == 0) {
-          throw_parser_error("unexpected '}'");
-        }
-
-        current_brace_level -= 1;
-        if (current_brace_level == 0 && current_bracket_level == 0) {
-          add_literal(tmpl.content.c_str());
-        }
-      } break;
-      case Token::Kind::Id: {
-        get_peek_token();
-
-        // Data Literal
-        if (tok.text == static_cast<decltype(tok.text)>("true") || tok.text == static_cast<decltype(tok.text)>("false") ||
-            tok.text == static_cast<decltype(tok.text)>("null")) {
-          if (current_brace_level == 0 && current_bracket_level == 0) {
-            literal_start = tok.text;
-            add_literal(tmpl.content.c_str());
-          }
-
-          // Operator
-        } else if (tok.text == "and" || tok.text == "or" || tok.text == "in" || tok.text == "not") {
-          goto parse_operator;
-
-          // Functions
-        } else if (peek_tok.kind == Token::Kind::LeftParen) {
-          operator_stack.emplace(std::make_shared<FunctionNode>(static_cast<std::string>(tok.text), tok.text.data() - tmpl.content.c_str()));
-          function_stack.emplace(operator_stack.top().get(), current_paren_level);
-
-          // Variables
-        } else {
-          arguments.emplace_back(std::make_shared<DataNode>(static_cast<std::string>(tok.text), tok.text.data() - tmpl.content.c_str()));
-        }
-
-        // Operators
-      } break;
-      case Token::Kind::Equal:
-      case Token::Kind::NotEqual:
-      case Token::Kind::GreaterThan:
-      case Token::Kind::GreaterEqual:
-      case Token::Kind::LessThan:
-      case Token::Kind::LessEqual:
-      case Token::Kind::Plus:
-      case Token::Kind::Minus:
-      case Token::Kind::Times:
-      case Token::Kind::Slash:
-      case Token::Kind::Power:
-      case Token::Kind::Percent:
-      case Token::Kind::Dot: {
-
-      parse_operator:
-        FunctionStorage::Operation operation;
-        switch (tok.kind) {
-        case Token::Kind::Id: {
-          if (tok.text == "and") {
-            operation = FunctionStorage::Operation::And;
-          } else if (tok.text == "or") {
-            operation = FunctionStorage::Operation::Or;
-          } else if (tok.text == "in") {
-            operation = FunctionStorage::Operation::In;
-          } else if (tok.text == "not") {
-            operation = FunctionStorage::Operation::Not;
-          } else {
-            throw_parser_error("unknown operator in parser.");
-          }
-        } break;
-        case Token::Kind::Equal: {
-          operation = FunctionStorage::Operation::Equal;
-        } break;
-        case Token::Kind::NotEqual: {
-          operation = FunctionStorage::Operation::NotEqual;
-        } break;
-        case Token::Kind::GreaterThan: {
-          operation = FunctionStorage::Operation::Greater;
-        } break;
-        case Token::Kind::GreaterEqual: {
-          operation = FunctionStorage::Operation::GreaterEqual;
-        } break;
-        case Token::Kind::LessThan: {
-          operation = FunctionStorage::Operation::Less;
-        } break;
-        case Token::Kind::LessEqual: {
-          operation = FunctionStorage::Operation::LessEqual;
-        } break;
-        case Token::Kind::Plus: {
-          operation = FunctionStorage::Operation::Add;
-        } break;
-        case Token::Kind::Minus: {
-          operation = FunctionStorage::Operation::Subtract;
-        } break;
-        case Token::Kind::Times: {
-          operation = FunctionStorage::Operation::Multiplication;
-        } break;
-        case Token::Kind::Slash: {
-          operation = FunctionStorage::Operation::Division;
-        } break;
-        case Token::Kind::Power: {
-          operation = FunctionStorage::Operation::Power;
-        } break;
-        case Token::Kind::Percent: {
-          operation = FunctionStorage::Operation::Modulo;
-        } break;
-        case Token::Kind::Dot: {
-          operation = FunctionStorage::Operation::AtId;
-        } break;
-        default: {
-          throw_parser_error("unknown operator in parser.");
-        }
-        }
-        auto function_node = std::make_shared<FunctionNode>(operation, tok.text.data() - tmpl.content.c_str());
-
-        while (!operator_stack.empty() &&
-               ((operator_stack.top()->precedence > function_node->precedence) ||
-                (operator_stack.top()->precedence == function_node->precedence && function_node->associativity == FunctionNode::Associativity::Left)) &&
-               (operator_stack.top()->operation != FunctionStorage::Operation::ParenLeft)) {
-          add_operator();
-        }
-
-        operator_stack.emplace(function_node);
-      } break;
-      case Token::Kind::Comma: {
-        if (current_brace_level == 0 && current_bracket_level == 0) {
-          if (function_stack.empty()) {
-            throw_parser_error("unexpected ','");
-          }
-
-          function_stack.top().first->number_args += 1;
-        }
-      } break;
-      case Token::Kind::Colon: {
-        if (current_brace_level == 0 && current_bracket_level == 0) {
-          throw_parser_error("unexpected ':'");
-        }
-      } break;
-      case Token::Kind::LeftParen: {
-        current_paren_level += 1;
-        operator_stack.emplace(std::make_shared<FunctionNode>(FunctionStorage::Operation::ParenLeft, tok.text.data() - tmpl.content.c_str()));
-
-        get_peek_token();
-        if (peek_tok.kind == Token::Kind::RightParen) {
-          if (!function_stack.empty() && function_stack.top().second == current_paren_level - 1) {
-            function_stack.top().first->number_args = 0;
-          }
-        }
-      } break;
-      case Token::Kind::RightParen: {
-        current_paren_level -= 1;
-        while (!operator_stack.empty() && operator_stack.top()->operation != FunctionStorage::Operation::ParenLeft) {
-          add_operator();
-        }
-
-        if (!operator_stack.empty() && operator_stack.top()->operation == FunctionStorage::Operation::ParenLeft) {
-          operator_stack.pop();
-        }
-
-        if (!function_stack.empty() && function_stack.top().second == current_paren_level) {
-          auto func = function_stack.top().first;
-          auto function_data = function_storage.find_function(func->name, func->number_args);
-          if (function_data.operation == FunctionStorage::Operation::None) {
-            throw_parser_error("unknown function " + func->name);
-          }
-          func->operation = function_data.operation;
-          if (function_data.operation == FunctionStorage::Operation::Callback) {
-            func->callback = function_data.callback;
-          }
-
-          if (operator_stack.empty()) {
-            throw_parser_error("internal error at function " + func->name);
-          }
-
-          add_operator();
-          function_stack.pop();
-        }
-      }
-      default:
-        break;
-      }
-
-      get_next_token();
-    }
-
-    while (!operator_stack.empty()) {
-      add_operator();
-    }
-
-    if (arguments.size() == 1) {
-      current_expression_list->root = arguments[0];
-      arguments = {};
-    } else if (arguments.size() > 1) {
-      throw_parser_error("malformed expression");
-    }
-
-    return true;
-  }
-
-  bool parse_statement(Template& tmpl, Token::Kind closing, std::string_view path) {
-    if (tok.kind != Token::Kind::Id) {
-      return false;
-    }
-
-    if (tok.text == static_cast<decltype(tok.text)>("if")) {
-      get_next_token();
-
-      auto if_statement_node = std::make_shared<IfStatementNode>(current_block, tok.text.data() - tmpl.content.c_str());
-      current_block->nodes.emplace_back(if_statement_node);
-      if_statement_stack.emplace(if_statement_node.get());
-      current_block = &if_statement_node->true_statement;
-      current_expression_list = &if_statement_node->condition;
-
-      if (!parse_expression(tmpl, closing)) {
-        return false;
-      }
-    } else if (tok.text == static_cast<decltype(tok.text)>("else")) {
-      if (if_statement_stack.empty()) {
-        throw_parser_error("else without matching if");
-      }
-      auto& if_statement_data = if_statement_stack.top();
-      get_next_token();
-
-      if_statement_data->has_false_statement = true;
-      current_block = &if_statement_data->false_statement;
-
-      // Chained else if
-      if (tok.kind == Token::Kind::Id && tok.text == static_cast<decltype(tok.text)>("if")) {
-        get_next_token();
-
-        auto if_statement_node = std::make_shared<IfStatementNode>(true, current_block, tok.text.data() - tmpl.content.c_str());
-        current_block->nodes.emplace_back(if_statement_node);
-        if_statement_stack.emplace(if_statement_node.get());
-        current_block = &if_statement_node->true_statement;
-        current_expression_list = &if_statement_node->condition;
-
-        if (!parse_expression(tmpl, closing)) {
-          return false;
-        }
-      }
-    } else if (tok.text == static_cast<decltype(tok.text)>("endif")) {
-      if (if_statement_stack.empty()) {
-        throw_parser_error("endif without matching if");
-      }
-
-      // Nested if statements
-      while (if_statement_stack.top()->is_nested) {
-        if_statement_stack.pop();
-      }
-
-      auto& if_statement_data = if_statement_stack.top();
-      get_next_token();
-
-      current_block = if_statement_data->parent;
-      if_statement_stack.pop();
-    } else if (tok.text == static_cast<decltype(tok.text)>("block")) {
-      get_next_token();
-
-      if (tok.kind != Token::Kind::Id) {
-        throw_parser_error("expected block name, got '" + tok.describe() + "'");
-      }
-
-      const std::string block_name = static_cast<std::string>(tok.text);
-
-      auto block_statement_node = std::make_shared<BlockStatementNode>(current_block, block_name, tok.text.data() - tmpl.content.c_str());
-      current_block->nodes.emplace_back(block_statement_node);
-      block_statement_stack.emplace(block_statement_node.get());
-      current_block = &block_statement_node->block;
-      auto success = tmpl.block_storage.emplace(block_name, block_statement_node);
-      if (!success.second) {
-        throw_parser_error("block with the name '" + block_name + "' does already exist");
-      }
-
-      get_next_token();
-    } else if (tok.text == static_cast<decltype(tok.text)>("endblock")) {
-      if (block_statement_stack.empty()) {
-        throw_parser_error("endblock without matching block");
-      }
-
-      auto& block_statement_data = block_statement_stack.top();
-      get_next_token();
-
-      current_block = block_statement_data->parent;
-      block_statement_stack.pop();
-    } else if (tok.text == static_cast<decltype(tok.text)>("for")) {
-      get_next_token();
-
-      // options: for a in arr; for a, b in obj
-      if (tok.kind != Token::Kind::Id) {
-        throw_parser_error("expected id, got '" + tok.describe() + "'");
-      }
-
-      Token value_token = tok;
-      get_next_token();
-
-      // Object type
-      std::shared_ptr<ForStatementNode> for_statement_node;
-      if (tok.kind == Token::Kind::Comma) {
-        get_next_token();
-        if (tok.kind != Token::Kind::Id) {
-          throw_parser_error("expected id, got '" + tok.describe() + "'");
-        }
-
-        Token key_token = std::move(value_token);
-        value_token = tok;
-        get_next_token();
-
-        for_statement_node = std::make_shared<ForObjectStatementNode>(static_cast<std::string>(key_token.text), static_cast<std::string>(value_token.text),
-                                                                      current_block, tok.text.data() - tmpl.content.c_str());
-
-        // Array type
-      } else {
-        for_statement_node =
-            std::make_shared<ForArrayStatementNode>(static_cast<std::string>(value_token.text), current_block, tok.text.data() - tmpl.content.c_str());
-      }
-
-      current_block->nodes.emplace_back(for_statement_node);
-      for_statement_stack.emplace(for_statement_node.get());
-      current_block = &for_statement_node->body;
-      current_expression_list = &for_statement_node->condition;
-
-      if (tok.kind != Token::Kind::Id || tok.text != static_cast<decltype(tok.text)>("in")) {
-        throw_parser_error("expected 'in', got '" + tok.describe() + "'");
-      }
-      get_next_token();
-
-      if (!parse_expression(tmpl, closing)) {
-        return false;
-      }
-    } else if (tok.text == static_cast<decltype(tok.text)>("endfor")) {
-      if (for_statement_stack.empty()) {
-        throw_parser_error("endfor without matching for");
-      }
-
-      auto& for_statement_data = for_statement_stack.top();
-      get_next_token();
-
-      current_block = for_statement_data->parent;
-      for_statement_stack.pop();
-    } else if (tok.text == static_cast<decltype(tok.text)>("include")) {
-      get_next_token();
-
-      std::string template_name = parse_filename(tok);
-      add_to_template_storage(path, template_name);
-
-      current_block->nodes.emplace_back(std::make_shared<IncludeStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
-
-      get_next_token();
-    } else if (tok.text == static_cast<decltype(tok.text)>("extends")) {
-      get_next_token();
-
-      std::string template_name = parse_filename(tok);
-      add_to_template_storage(path, template_name);
-
-      current_block->nodes.emplace_back(std::make_shared<ExtendsStatementNode>(template_name, tok.text.data() - tmpl.content.c_str()));
-
-      get_next_token();
-    } else if (tok.text == static_cast<decltype(tok.text)>("set")) {
-      get_next_token();
-
-      if (tok.kind != Token::Kind::Id) {
-        throw_parser_error("expected variable name, got '" + tok.describe() + "'");
-      }
-
-      std::string key = static_cast<std::string>(tok.text);
-      get_next_token();
-
-      auto set_statement_node = std::make_shared<SetStatementNode>(key, tok.text.data() - tmpl.content.c_str());
-      current_block->nodes.emplace_back(set_statement_node);
-      current_expression_list = &set_statement_node->expression;
-
-      if (tok.text != static_cast<decltype(tok.text)>("=")) {
-        throw_parser_error("expected '=', got '" + tok.describe() + "'");
-      }
-      get_next_token();
-
-      if (!parse_expression(tmpl, closing)) {
-        return false;
-      }
-    } else {
-      return false;
-    }
-    return true;
-  }
-
-  void parse_into(Template& tmpl, std::string_view path) {
-    lexer.start(tmpl.content);
-    current_block = &tmpl.root;
-
-    for (;;) {
-      get_next_token();
-      switch (tok.kind) {
-      case Token::Kind::Eof: {
-        if (!if_statement_stack.empty()) {
-          throw_parser_error("unmatched if");
-        }
-        if (!for_statement_stack.empty()) {
-          throw_parser_error("unmatched for");
-        }
-      }
-        return;
-      case Token::Kind::Text: {
-        current_block->nodes.emplace_back(std::make_shared<TextNode>(tok.text.data() - tmpl.content.c_str(), tok.text.size()));
-      } break;
-      case Token::Kind::StatementOpen: {
-        get_next_token();
-        if (!parse_statement(tmpl, Token::Kind::StatementClose, path)) {
-          throw_parser_error("expected statement, got '" + tok.describe() + "'");
-        }
-        if (tok.kind != Token::Kind::StatementClose) {
-          throw_parser_error("expected statement close, got '" + tok.describe() + "'");
-        }
-      } break;
-      case Token::Kind::LineStatementOpen: {
-        get_next_token();
-        if (!parse_statement(tmpl, Token::Kind::LineStatementClose, path)) {
-          throw_parser_error("expected statement, got '" + tok.describe() + "'");
-        }
-        if (tok.kind != Token::Kind::LineStatementClose && tok.kind != Token::Kind::Eof) {
-          throw_parser_error("expected line statement close, got '" + tok.describe() + "'");
-        }
-      } break;
-      case Token::Kind::ExpressionOpen: {
-        get_next_token();
-
-        auto expression_list_node = std::make_shared<ExpressionListNode>(tok.text.data() - tmpl.content.c_str());
-        current_block->nodes.emplace_back(expression_list_node);
-        current_expression_list = expression_list_node.get();
-
-        if (!parse_expression(tmpl, Token::Kind::ExpressionClose)) {
-          throw_parser_error("expected expression, got '" + tok.describe() + "'");
-        }
-
-        if (tok.kind != Token::Kind::ExpressionClose) {
-          throw_parser_error("expected expression close, got '" + tok.describe() + "'");
-        }
-      } break;
-      case Token::Kind::CommentOpen: {
-        get_next_token();
-        if (tok.kind != Token::Kind::CommentClose) {
-          throw_parser_error("expected comment close, got '" + tok.describe() + "'");
-        }
-      } break;
-      default: {
-        throw_parser_error("unexpected token '" + tok.describe() + "'");
-      } break;
-      }
-    }
-  }
-
-public:
-  explicit Parser(const ParserConfig& parser_config, const LexerConfig& lexer_config, TemplateStorage& template_storage,
-                  const FunctionStorage& function_storage)
-      : config(parser_config), lexer(lexer_config), template_storage(template_storage), function_storage(function_storage) {}
-
-  Template parse(std::string_view input, std::string_view path) {
-    auto result = Template(static_cast<std::string>(input));
-    parse_into(result, path);
-    return result;
-  }
-
-  Template parse(std::string_view input) {
-    return parse(input, "./");
-  }
-
-  void parse_into_template(Template& tmpl, std::string_view filename) {
-    std::string_view path = filename.substr(0, filename.find_last_of("/\\") + 1);
-
-    // StringRef path = sys::path::parent_path(filename);
-    auto sub_parser = Parser(config, lexer.get_config(), template_storage, function_storage);
-    sub_parser.parse_into(tmpl, path);
-  }
-
-  std::string load_file(const std::string& filename) {
-    std::ifstream file;
-    file.open(filename);
-    if (file.fail()) {
-      INJA_THROW(FileError("failed accessing file at '" + filename + "'"));
-    }
-    std::string text((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
-    return text;
-  }
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_PARSER_HPP_
-
-// #include "renderer.hpp"
-#ifndef INCLUDE_INJA_RENDERER_HPP_
-#define INCLUDE_INJA_RENDERER_HPP_
-
-#include <algorithm>
-#include <numeric>
-#include <string>
-#include <utility>
-#include <vector>
-
-// #include "config.hpp"
-
-// #include "exceptions.hpp"
-
-// #include "node.hpp"
-
-// #include "template.hpp"
-
-// #include "utils.hpp"
-
-
-namespace inja {
-
-/*!
- * \brief Class for rendering a Template with data.
- */
-class Renderer : public NodeVisitor {
-  using Op = FunctionStorage::Operation;
-
-  const RenderConfig config;
-  const TemplateStorage& template_storage;
-  const FunctionStorage& function_storage;
-
-  const Template* current_template;
-  size_t current_level {0};
-  std::vector<const Template*> template_stack;
-  std::vector<const BlockStatementNode*> block_statement_stack;
-
-  const json* data_input;
-  std::ostream* output_stream;
-
-  json additional_data;
-  json* current_loop_data = &additional_data["loop"];
-
-  std::vector<std::shared_ptr<json>> data_tmp_stack;
-  std::stack<const json*> data_eval_stack;
-  std::stack<const DataNode*> not_found_stack;
-
-  bool break_rendering {false};
-
-  static bool truthy(const json* data) {
-    if (data->is_boolean()) {
-      return data->get<bool>();
-    } else if (data->is_number()) {
-      return (*data != 0);
-    } else if (data->is_null()) {
-      return false;
-    }
-    return !data->empty();
-  }
-
-  void print_data(const std::shared_ptr<json> value) {
-    if (value->is_string()) {
-      *output_stream << value->get_ref<const json::string_t&>();
-    } else if (value->is_number_integer()) {
-      *output_stream << value->get<const json::number_integer_t>();
-    } else if (value->is_null()) {
-    } else {
-      *output_stream << value->dump();
-    }
-  }
-
-  const std::shared_ptr<json> eval_expression_list(const ExpressionListNode& expression_list) {
-    if (!expression_list.root) {
-      throw_renderer_error("empty expression", expression_list);
-    }
-
-    expression_list.root->accept(*this);
-
-    if (data_eval_stack.empty()) {
-      throw_renderer_error("empty expression", expression_list);
-    } else if (data_eval_stack.size() != 1) {
-      throw_renderer_error("malformed expression", expression_list);
-    }
-
-    const auto result = data_eval_stack.top();
-    data_eval_stack.pop();
-
-    if (!result) {
-      if (not_found_stack.empty()) {
-        throw_renderer_error("expression could not be evaluated", expression_list);
-      }
-
-      auto node = not_found_stack.top();
-      not_found_stack.pop();
-
-      throw_renderer_error("variable '" + static_cast<std::string>(node->name) + "' not found", *node);
-    }
-    return std::make_shared<json>(*result);
-  }
-
-  void throw_renderer_error(const std::string& message, const AstNode& node) {
-    SourceLocation loc = get_source_location(current_template->content, node.pos);
-    INJA_THROW(RenderError(message, loc));
-  }
-
-  void make_result(const json&& result) {
-    auto result_ptr = std::make_shared<json>(result);
-    data_tmp_stack.push_back(result_ptr);
-    data_eval_stack.push(result_ptr.get());
-  }
-
-  template <size_t N, size_t N_start = 0, bool throw_not_found = true> std::array<const json*, N> get_arguments(const FunctionNode& node) {
-    if (node.arguments.size() < N_start + N) {
-      throw_renderer_error("function needs " + std::to_string(N_start + N) + " variables, but has only found " + std::to_string(node.arguments.size()), node);
-    }
-
-    for (size_t i = N_start; i < N_start + N; i += 1) {
-      node.arguments[i]->accept(*this);
-    }
-
-    if (data_eval_stack.size() < N) {
-      throw_renderer_error("function needs " + std::to_string(N) + " variables, but has only found " + std::to_string(data_eval_stack.size()), node);
-    }
-
-    std::array<const json*, N> result;
-    for (size_t i = 0; i < N; i += 1) {
-      result[N - i - 1] = data_eval_stack.top();
-      data_eval_stack.pop();
-
-      if (!result[N - i - 1]) {
-        const auto data_node = not_found_stack.top();
-        not_found_stack.pop();
-
-        if (throw_not_found) {
-          throw_renderer_error("variable '" + static_cast<std::string>(data_node->name) + "' not found", *data_node);
-        }
-      }
-    }
-    return result;
-  }
-
-  template <bool throw_not_found = true> Arguments get_argument_vector(const FunctionNode& node) {
-    const size_t N = node.arguments.size();
-    for (auto a : node.arguments) {
-      a->accept(*this);
-    }
-
-    if (data_eval_stack.size() < N) {
-      throw_renderer_error("function needs " + std::to_string(N) + " variables, but has only found " + std::to_string(data_eval_stack.size()), node);
-    }
-
-    Arguments result {N};
-    for (size_t i = 0; i < N; i += 1) {
-      result[N - i - 1] = data_eval_stack.top();
-      data_eval_stack.pop();
-
-      if (!result[N - i - 1]) {
-        const auto data_node = not_found_stack.top();
-        not_found_stack.pop();
-
-        if (throw_not_found) {
-          throw_renderer_error("variable '" + static_cast<std::string>(data_node->name) + "' not found", *data_node);
-        }
-      }
-    }
-    return result;
-  }
-
-  void visit(const BlockNode& node) {
-    for (auto& n : node.nodes) {
-      n->accept(*this);
-
-      if (break_rendering) {
-        break;
-      }
-    }
-  }
-
-  void visit(const TextNode& node) {
-    output_stream->write(current_template->content.c_str() + node.pos, node.length);
-  }
-
-  void visit(const ExpressionNode&) {}
-
-  void visit(const LiteralNode& node) {
-    data_eval_stack.push(&node.value);
-  }
-
-  void visit(const DataNode& node) {
-    if (additional_data.contains(node.ptr)) {
-      data_eval_stack.push(&(additional_data[node.ptr]));
-    } else if (data_input->contains(node.ptr)) {
-      data_eval_stack.push(&(*data_input)[node.ptr]);
-    } else {
-      // Try to evaluate as a no-argument callback
-      const auto function_data = function_storage.find_function(node.name, 0);
-      if (function_data.operation == FunctionStorage::Operation::Callback) {
-        Arguments empty_args {};
-        const auto value = std::make_shared<json>(function_data.callback(empty_args));
-        data_tmp_stack.push_back(value);
-        data_eval_stack.push(value.get());
-      } else {
-        data_eval_stack.push(nullptr);
-        not_found_stack.emplace(&node);
-      }
-    }
-  }
-
-  void visit(const FunctionNode& node) {
-    switch (node.operation) {
-    case Op::Not: {
-      const auto args = get_arguments<1>(node);
-      make_result(!truthy(args[0]));
-    } break;
-    case Op::And: {
-      make_result(truthy(get_arguments<1, 0>(node)[0]) && truthy(get_arguments<1, 1>(node)[0]));
-    } break;
-    case Op::Or: {
-      make_result(truthy(get_arguments<1, 0>(node)[0]) || truthy(get_arguments<1, 1>(node)[0]));
-    } break;
-    case Op::In: {
-      const auto args = get_arguments<2>(node);
-      make_result(std::find(args[1]->begin(), args[1]->end(), *args[0]) != args[1]->end());
-    } break;
-    case Op::Equal: {
-      const auto args = get_arguments<2>(node);
-      make_result(*args[0] == *args[1]);
-    } break;
-    case Op::NotEqual: {
-      const auto args = get_arguments<2>(node);
-      make_result(*args[0] != *args[1]);
-    } break;
-    case Op::Greater: {
-      const auto args = get_arguments<2>(node);
-      make_result(*args[0] > *args[1]);
-    } break;
-    case Op::GreaterEqual: {
-      const auto args = get_arguments<2>(node);
-      make_result(*args[0] >= *args[1]);
-    } break;
-    case Op::Less: {
-      const auto args = get_arguments<2>(node);
-      make_result(*args[0] < *args[1]);
-    } break;
-    case Op::LessEqual: {
-      const auto args = get_arguments<2>(node);
-      make_result(*args[0] <= *args[1]);
-    } break;
-    case Op::Add: {
-      const auto args = get_arguments<2>(node);
-      if (args[0]->is_string() && args[1]->is_string()) {
-        make_result(args[0]->get_ref<const std::string&>() + args[1]->get_ref<const std::string&>());
-      } else if (args[0]->is_number_integer() && args[1]->is_number_integer()) {
-        make_result(args[0]->get<int>() + args[1]->get<int>());
-      } else {
-        make_result(args[0]->get<double>() + args[1]->get<double>());
-      }
-    } break;
-    case Op::Subtract: {
-      const auto args = get_arguments<2>(node);
-      if (args[0]->is_number_integer() && args[1]->is_number_integer()) {
-        make_result(args[0]->get<int>() - args[1]->get<int>());
-      } else {
-        make_result(args[0]->get<double>() - args[1]->get<double>());
-      }
-    } break;
-    case Op::Multiplication: {
-      const auto args = get_arguments<2>(node);
-      if (args[0]->is_number_integer() && args[1]->is_number_integer()) {
-        make_result(args[0]->get<int>() * args[1]->get<int>());
-      } else {
-        make_result(args[0]->get<double>() * args[1]->get<double>());
-      }
-    } break;
-    case Op::Division: {
-      const auto args = get_arguments<2>(node);
-      if (args[1]->get<double>() == 0) {
-        throw_renderer_error("division by zero", node);
-      }
-      make_result(args[0]->get<double>() / args[1]->get<double>());
-    } break;
-    case Op::Power: {
-      const auto args = get_arguments<2>(node);
-      if (args[0]->is_number_integer() && args[1]->get<int>() >= 0) {
-        int result = static_cast<int>(std::pow(args[0]->get<int>(), args[1]->get<int>()));
-        make_result(result);
-      } else {
-        double result = std::pow(args[0]->get<double>(), args[1]->get<int>());
-        make_result(result);
-      }
-    } break;
-    case Op::Modulo: {
-      const auto args = get_arguments<2>(node);
-      make_result(args[0]->get<int>() % args[1]->get<int>());
-    } break;
-    case Op::AtId: {
-      const auto container = get_arguments<1, 0, false>(node)[0];
-      node.arguments[1]->accept(*this);
-      if (not_found_stack.empty()) {
-        throw_renderer_error("could not find element with given name", node);
-      }
-      const auto id_node = not_found_stack.top();
-      not_found_stack.pop();
-      data_eval_stack.pop();
-      data_eval_stack.push(&container->at(id_node->name));
-    } break;
-    case Op::At: {
-      const auto args = get_arguments<2>(node);
-      if (args[0]->is_object()) {
-        data_eval_stack.push(&args[0]->at(args[1]->get<std::string>()));
-      } else {
-        data_eval_stack.push(&args[0]->at(args[1]->get<int>()));
-      }
-    } break;
-    case Op::Default: {
-      const auto test_arg = get_arguments<1, 0, false>(node)[0];
-      data_eval_stack.push(test_arg ? test_arg : get_arguments<1, 1>(node)[0]);
-    } break;
-    case Op::DivisibleBy: {
-      const auto args = get_arguments<2>(node);
-      const int divisor = args[1]->get<int>();
-      make_result((divisor != 0) && (args[0]->get<int>() % divisor == 0));
-    } break;
-    case Op::Even: {
-      make_result(get_arguments<1>(node)[0]->get<int>() % 2 == 0);
-    } break;
-    case Op::Exists: {
-      auto&& name = get_arguments<1>(node)[0]->get_ref<const std::string&>();
-      make_result(data_input->contains(json::json_pointer(DataNode::convert_dot_to_ptr(name))));
-    } break;
-    case Op::ExistsInObject: {
-      const auto args = get_arguments<2>(node);
-      auto&& name = args[1]->get_ref<const std::string&>();
-      make_result(args[0]->find(name) != args[0]->end());
-    } break;
-    case Op::First: {
-      const auto result = &get_arguments<1>(node)[0]->front();
-      data_eval_stack.push(result);
-    } break;
-    case Op::Float: {
-      make_result(std::stod(get_arguments<1>(node)[0]->get_ref<const std::string&>()));
-    } break;
-    case Op::Int: {
-      make_result(std::stoi(get_arguments<1>(node)[0]->get_ref<const std::string&>()));
-    } break;
-    case Op::Last: {
-      const auto result = &get_arguments<1>(node)[0]->back();
-      data_eval_stack.push(result);
-    } break;
-    case Op::Length: {
-      const auto val = get_arguments<1>(node)[0];
-      if (val->is_string()) {
-        make_result(val->get_ref<const std::string&>().length());
-      } else {
-        make_result(val->size());
-      }
-    } break;
-    case Op::Lower: {
-      std::string result = get_arguments<1>(node)[0]->get<std::string>();
-      std::transform(result.begin(), result.end(), result.begin(), ::tolower);
-      make_result(std::move(result));
-    } break;
-    case Op::Max: {
-      const auto args = get_arguments<1>(node);
-      const auto result = std::max_element(args[0]->begin(), args[0]->end());
-      data_eval_stack.push(&(*result));
-    } break;
-    case Op::Min: {
-      const auto args = get_arguments<1>(node);
-      const auto result = std::min_element(args[0]->begin(), args[0]->end());
-      data_eval_stack.push(&(*result));
-    } break;
-    case Op::Odd: {
-      make_result(get_arguments<1>(node)[0]->get<int>() % 2 != 0);
-    } break;
-    case Op::Range: {
-      std::vector<int> result(get_arguments<1>(node)[0]->get<int>());
-      std::iota(result.begin(), result.end(), 0);
-      make_result(std::move(result));
-    } break;
-    case Op::Round: {
-      const auto args = get_arguments<2>(node);
-      const int precision = args[1]->get<int>();
-      const double result = std::round(args[0]->get<double>() * std::pow(10.0, precision)) / std::pow(10.0, precision);
-      if (precision == 0) {
-        make_result(int(result));
-      } else {
-        make_result(result);
-      }
-    } break;
-    case Op::Sort: {
-      auto result_ptr = std::make_shared<json>(get_arguments<1>(node)[0]->get<std::vector<json>>());
-      std::sort(result_ptr->begin(), result_ptr->end());
-      data_tmp_stack.push_back(result_ptr);
-      data_eval_stack.push(result_ptr.get());
-    } break;
-    case Op::Upper: {
-      std::string result = get_arguments<1>(node)[0]->get<std::string>();
-      std::transform(result.begin(), result.end(), result.begin(), ::toupper);
-      make_result(std::move(result));
-    } break;
-    case Op::IsBoolean: {
-      make_result(get_arguments<1>(node)[0]->is_boolean());
-    } break;
-    case Op::IsNumber: {
-      make_result(get_arguments<1>(node)[0]->is_number());
-    } break;
-    case Op::IsInteger: {
-      make_result(get_arguments<1>(node)[0]->is_number_integer());
-    } break;
-    case Op::IsFloat: {
-      make_result(get_arguments<1>(node)[0]->is_number_float());
-    } break;
-    case Op::IsObject: {
-      make_result(get_arguments<1>(node)[0]->is_object());
-    } break;
-    case Op::IsArray: {
-      make_result(get_arguments<1>(node)[0]->is_array());
-    } break;
-    case Op::IsString: {
-      make_result(get_arguments<1>(node)[0]->is_string());
-    } break;
-    case Op::Callback: {
-      auto args = get_argument_vector(node);
-      make_result(node.callback(args));
-    } break;
-    case Op::Super: {
-      const auto args = get_argument_vector(node);
-      const size_t old_level = current_level;
-      const size_t level_diff = (args.size() == 1) ? args[0]->get<int>() : 1;
-      const size_t level = current_level + level_diff;
-
-      if (block_statement_stack.empty()) {
-        throw_renderer_error("super() call is not within a block", node);
-      }
-
-      if (level < 1 || level > template_stack.size() - 1) {
-        throw_renderer_error("level of super() call does not match parent templates (between 1 and " + std::to_string(template_stack.size() - 1) + ")", node);
-      }
-
-      const auto current_block_statement = block_statement_stack.back();
-      const Template* new_template = template_stack.at(level);
-      const Template* old_template = current_template;
-      const auto block_it = new_template->block_storage.find(current_block_statement->name);
-      if (block_it != new_template->block_storage.end()) {
-        current_template = new_template;
-        current_level = level;
-        block_it->second->block.accept(*this);
-        current_level = old_level;
-        current_template = old_template;
-      } else {
-        throw_renderer_error("could not find block with name '" + current_block_statement->name + "'", node);
-      }
-      make_result(nullptr);
-    } break;
-    case Op::Join: {
-      const auto args = get_arguments<2>(node);
-      const auto separator = args[1]->get<std::string>();
-      std::ostringstream os;
-      std::string sep;
-      for (const auto& value : *args[0]) {
-        os << sep;
-        if (value.is_string()) {
-          os << value.get<std::string>(); // otherwise the value is surrounded with ""
-        } else {
-          os << value.dump();
-        }
-        sep = separator;
-      }
-      make_result(os.str());
-    } break;
-    case Op::ParenLeft:
-    case Op::ParenRight:
-    case Op::None:
-      break;
-    }
-  }
-
-  void visit(const ExpressionListNode& node) {
-    print_data(eval_expression_list(node));
-  }
-
-  void visit(const StatementNode&) {}
-
-  void visit(const ForStatementNode&) {}
-
-  void visit(const ForArrayStatementNode& node) {
-    const auto result = eval_expression_list(node.condition);
-    if (!result->is_array()) {
-      throw_renderer_error("object must be an array", node);
-    }
-
-    if (!current_loop_data->empty()) {
-      auto tmp = *current_loop_data; // Because of clang-3
-      (*current_loop_data)["parent"] = std::move(tmp);
-    }
-
-    size_t index = 0;
-    (*current_loop_data)["is_first"] = true;
-    (*current_loop_data)["is_last"] = (result->size() <= 1);
-    for (auto it = result->begin(); it != result->end(); ++it) {
-      additional_data[static_cast<std::string>(node.value)] = *it;
-
-      (*current_loop_data)["index"] = index;
-      (*current_loop_data)["index1"] = index + 1;
-      if (index == 1) {
-        (*current_loop_data)["is_first"] = false;
-      }
-      if (index == result->size() - 1) {
-        (*current_loop_data)["is_last"] = true;
-      }
-
-      node.body.accept(*this);
-      ++index;
-    }
-
-    additional_data[static_cast<std::string>(node.value)].clear();
-    if (!(*current_loop_data)["parent"].empty()) {
-      const auto tmp = (*current_loop_data)["parent"];
-      *current_loop_data = std::move(tmp);
-    } else {
-      current_loop_data = &additional_data["loop"];
-    }
-  }
-
-  void visit(const ForObjectStatementNode& node) {
-    const auto result = eval_expression_list(node.condition);
-    if (!result->is_object()) {
-      throw_renderer_error("object must be an object", node);
-    }
-
-    if (!current_loop_data->empty()) {
-      (*current_loop_data)["parent"] = std::move(*current_loop_data);
-    }
-
-    size_t index = 0;
-    (*current_loop_data)["is_first"] = true;
-    (*current_loop_data)["is_last"] = (result->size() <= 1);
-    for (auto it = result->begin(); it != result->end(); ++it) {
-      additional_data[static_cast<std::string>(node.key)] = it.key();
-      additional_data[static_cast<std::string>(node.value)] = it.value();
-
-      (*current_loop_data)["index"] = index;
-      (*current_loop_data)["index1"] = index + 1;
-      if (index == 1) {
-        (*current_loop_data)["is_first"] = false;
-      }
-      if (index == result->size() - 1) {
-        (*current_loop_data)["is_last"] = true;
-      }
-
-      node.body.accept(*this);
-      ++index;
-    }
-
-    additional_data[static_cast<std::string>(node.key)].clear();
-    additional_data[static_cast<std::string>(node.value)].clear();
-    if (!(*current_loop_data)["parent"].empty()) {
-      *current_loop_data = std::move((*current_loop_data)["parent"]);
-    } else {
-      current_loop_data = &additional_data["loop"];
-    }
-  }
-
-  void visit(const IfStatementNode& node) {
-    const auto result = eval_expression_list(node.condition);
-    if (truthy(result.get())) {
-      node.true_statement.accept(*this);
-    } else if (node.has_false_statement) {
-      node.false_statement.accept(*this);
-    }
-  }
-
-  void visit(const IncludeStatementNode& node) {
-    auto sub_renderer = Renderer(config, template_storage, function_storage);
-    const auto included_template_it = template_storage.find(node.file);
-    if (included_template_it != template_storage.end()) {
-      sub_renderer.render_to(*output_stream, included_template_it->second, *data_input, &additional_data);
-    } else if (config.throw_at_missing_includes) {
-      throw_renderer_error("include '" + node.file + "' not found", node);
-    }
-  }
-
-  void visit(const ExtendsStatementNode& node) {
-    const auto included_template_it = template_storage.find(node.file);
-    if (included_template_it != template_storage.end()) {
-      const Template* parent_template = &included_template_it->second;
-      render_to(*output_stream, *parent_template, *data_input, &additional_data);
-      break_rendering = true;
-    } else if (config.throw_at_missing_includes) {
-      throw_renderer_error("extends '" + node.file + "' not found", node);
-    }
-  }
-
-  void visit(const BlockStatementNode& node) {
-    const size_t old_level = current_level;
-    current_level = 0;
-    current_template = template_stack.front();
-    const auto block_it = current_template->block_storage.find(node.name);
-    if (block_it != current_template->block_storage.end()) {
-      block_statement_stack.emplace_back(&node);
-      block_it->second->block.accept(*this);
-      block_statement_stack.pop_back();
-    }
-    current_level = old_level;
-    current_template = template_stack.back();
-  }
-
-  void visit(const SetStatementNode& node) {
-    std::string ptr = node.key;
-    replace_substring(ptr, ".", "/");
-    ptr = "/" + ptr;
-    additional_data[json::json_pointer(ptr)] = *eval_expression_list(node.expression);
-  }
-
-public:
-  Renderer(const RenderConfig& config, const TemplateStorage& template_storage, const FunctionStorage& function_storage)
-      : config(config), template_storage(template_storage), function_storage(function_storage) {}
-
-  void render_to(std::ostream& os, const Template& tmpl, const json& data, json* loop_data = nullptr) {
-    output_stream = &os;
-    current_template = &tmpl;
-    data_input = &data;
-    if (loop_data) {
-      additional_data = *loop_data;
-      current_loop_data = &additional_data["loop"];
-    }
-
-    template_stack.emplace_back(current_template);
-    current_template->root.accept(*this);
-
-    data_tmp_stack.clear();
-  }
-};
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_RENDERER_HPP_
-
-// #include "template.hpp"
-
-// #include "utils.hpp"
-
-
-namespace inja {
-
-/*!
- * \brief Class for changing the configuration.
- */
-class Environment {
-  std::string input_path;
-  std::string output_path;
-
-  LexerConfig lexer_config;
-  ParserConfig parser_config;
-  RenderConfig render_config;
-
-  FunctionStorage function_storage;
-  TemplateStorage template_storage;
-
-public:
-  Environment(): Environment("") {}
-
-  explicit Environment(const std::string& global_path): input_path(global_path), output_path(global_path) {}
-
-  Environment(const std::string& input_path, const std::string& output_path): input_path(input_path), output_path(output_path) {}
-
-  /// Sets the opener and closer for template statements
-  void set_statement(const std::string& open, const std::string& close) {
-    lexer_config.statement_open = open;
-    lexer_config.statement_open_no_lstrip = open + "+";
-    lexer_config.statement_open_force_lstrip = open + "-";
-    lexer_config.statement_close = close;
-    lexer_config.statement_close_force_rstrip = "-" + close;
-    lexer_config.update_open_chars();
-  }
-
-  /// Sets the opener for template line statements
-  void set_line_statement(const std::string& open) {
-    lexer_config.line_statement = open;
-    lexer_config.update_open_chars();
-  }
-
-  /// Sets the opener and closer for template expressions
-  void set_expression(const std::string& open, const std::string& close) {
-    lexer_config.expression_open = open;
-    lexer_config.expression_open_force_lstrip = open + "-";
-    lexer_config.expression_close = close;
-    lexer_config.expression_close_force_rstrip = "-" + close;
-    lexer_config.update_open_chars();
-  }
-
-  /// Sets the opener and closer for template comments
-  void set_comment(const std::string& open, const std::string& close) {
-    lexer_config.comment_open = open;
-    lexer_config.comment_open_force_lstrip = open + "-";
-    lexer_config.comment_close = close;
-    lexer_config.comment_close_force_rstrip = "-" + close;
-    lexer_config.update_open_chars();
-  }
-
-  /// Sets whether to remove the first newline after a block
-  void set_trim_blocks(bool trim_blocks) {
-    lexer_config.trim_blocks = trim_blocks;
-  }
-
-  /// Sets whether to strip the spaces and tabs from the start of a line to a block
-  void set_lstrip_blocks(bool lstrip_blocks) {
-    lexer_config.lstrip_blocks = lstrip_blocks;
-  }
-
-  /// Sets the element notation syntax
-  void set_search_included_templates_in_files(bool search_in_files) {
-    parser_config.search_included_templates_in_files = search_in_files;
-  }
-
-  /// Sets whether a missing include will throw an error
-  void set_throw_at_missing_includes(bool will_throw) {
-    render_config.throw_at_missing_includes = will_throw;
-  }
-
-  Template parse(std::string_view input) {
-    Parser parser(parser_config, lexer_config, template_storage, function_storage);
-    return parser.parse(input);
-  }
-
-  Template parse_template(const std::string& filename) {
-    Parser parser(parser_config, lexer_config, template_storage, function_storage);
-    auto result = Template(parser.load_file(input_path + static_cast<std::string>(filename)));
-    parser.parse_into_template(result, input_path + static_cast<std::string>(filename));
-    return result;
-  }
-
-  Template parse_file(const std::string& filename) {
-    return parse_template(filename);
-  }
-
-  std::string render(std::string_view input, const json& data) {
-    return render(parse(input), data);
-  }
-
-  std::string render(const Template& tmpl, const json& data) {
-    std::stringstream os;
-    render_to(os, tmpl, data);
-    return os.str();
-  }
-
-  std::string render_file(const std::string& filename, const json& data) {
-    return render(parse_template(filename), data);
-  }
-
-  std::string render_file_with_json_file(const std::string& filename, const std::string& filename_data) {
-    const json data = load_json(filename_data);
-    return render_file(filename, data);
-  }
-
-  void write(const std::string& filename, const json& data, const std::string& filename_out) {
-    std::ofstream file(output_path + filename_out);
-    file << render_file(filename, data);
-    file.close();
-  }
-
-  void write(const Template& temp, const json& data, const std::string& filename_out) {
-    std::ofstream file(output_path + filename_out);
-    file << render(temp, data);
-    file.close();
-  }
-
-  void write_with_json_file(const std::string& filename, const std::string& filename_data, const std::string& filename_out) {
-    const json data = load_json(filename_data);
-    write(filename, data, filename_out);
-  }
-
-  void write_with_json_file(const Template& temp, const std::string& filename_data, const std::string& filename_out) {
-    const json data = load_json(filename_data);
-    write(temp, data, filename_out);
-  }
-
-  std::ostream& render_to(std::ostream& os, const Template& tmpl, const json& data) {
-    Renderer(render_config, template_storage, function_storage).render_to(os, tmpl, data);
-    return os;
-  }
-
-  std::string load_file(const std::string& filename) {
-    Parser parser(parser_config, lexer_config, template_storage, function_storage);
-    return parser.load_file(input_path + filename);
-  }
-
-  json load_json(const std::string& filename) {
-    std::ifstream file;
-    file.open(input_path + filename);
-    if (file.fail()) {
-      INJA_THROW(FileError("failed accessing file at '" + input_path + filename + "'"));
-    }
-
-    return json::parse(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>());
-  }
-
-  /*!
-  @brief Adds a variadic callback
-  */
-  void add_callback(const std::string& name, const CallbackFunction& callback) {
-    add_callback(name, -1, callback);
-  }
-
-  /*!
-  @brief Adds a variadic void callback
-  */
-  void add_void_callback(const std::string& name, const VoidCallbackFunction& callback) {
-    add_void_callback(name, -1, callback);
-  }
-
-  /*!
-  @brief Adds a callback with given number or arguments
-  */
-  void add_callback(const std::string& name, int num_args, const CallbackFunction& callback) {
-    function_storage.add_callback(name, num_args, callback);
-  }
-
-  /*!
-  @brief Adds a void callback with given number or arguments
-  */
-  void add_void_callback(const std::string& name, int num_args, const VoidCallbackFunction& callback) {
-    function_storage.add_callback(name, num_args, [callback](Arguments& args) {
-      callback(args);
-      return json();
-    });
-  }
-
-  /** Includes a template with a given name into the environment.
-   * Then, a template can be rendered in another template using the
-   * include "<name>" syntax.
-   */
-  void include_template(const std::string& name, const Template& tmpl) {
-    template_storage[name] = tmpl;
-  }
-
-  /*!
-  @brief Sets a function that is called when an included file is not found
-  */
-  void set_include_callback(const std::function<Template(const std::string&, const std::string&)>& callback) {
-    parser_config.include_callback = callback;
-  }
-};
-
-/*!
-@brief render with default settings to a string
-*/
-inline std::string render(std::string_view input, const json& data) {
-  return Environment().render(input, data);
-}
-
-/*!
-@brief render with default settings to the given output stream
-*/
-inline void render_to(std::ostream& os, std::string_view input, const json& data) {
-  Environment env;
-  env.render_to(os, env.parse(input), data);
-}
-
-} // namespace inja
-
-#endif // INCLUDE_INJA_ENVIRONMENT_HPP_
-
-// #include "exceptions.hpp"
-
-// #include "parser.hpp"
-
-// #include "renderer.hpp"
-
-// #include "template.hpp"
-
-
-#endif // INCLUDE_INJA_INJA_HPP_
diff --git a/pkg/asustor/zerotier/CONTROL/pre-install.sh b/ext/installfiles/linux/DEBIAN/conffiles
old mode 100755
new mode 100644
similarity index 100%
rename from pkg/asustor/zerotier/CONTROL/pre-install.sh
rename to ext/installfiles/linux/DEBIAN/conffiles
diff --git a/ext/installfiles/linux/DEBIAN/control.in b/ext/installfiles/linux/DEBIAN/control.in
new file mode 100644
index 000000000..d1b5a8c16
--- /dev/null
+++ b/ext/installfiles/linux/DEBIAN/control.in
@@ -0,0 +1,12 @@
+Package: zerotier-one
+Architecture: __ARCH__
+Maintainer: ZeroTier, Inc. <contact@zerotier.com>
+Priority: optional
+Version: __VERSION__
+Installed-Size: 1024
+Homepage: https://github.com/zerotier/ZeroTierOne
+Description: ZeroTier One network virtualization service
+ ZeroTier One is a fast, secure, and easy to use peer to peer network
+ virtualization engine that provides global-scale software defined
+ networking to any device or application. Visit https://www.zerotier.com/
+ for more information.
diff --git a/ext/installfiles/linux/RPM/README.md b/ext/installfiles/linux/RPM/README.md
new file mode 100644
index 000000000..21ad0a1b9
--- /dev/null
+++ b/ext/installfiles/linux/RPM/README.md
@@ -0,0 +1,24 @@
+This folder contains two spec files which enable building of various RPM packages for ZeroTier.
+
+#zerotier-one.spec.in
+This file contains the information to build an RPM from the bash based binary installer of ZeroTier. The resulting RPM cannot be recompiled to different architectures.
+
+#zerotier.spec
+This spec file is a “standard” RPM spec file. It fits to the common rpmbuild process, SRPM and differnt architectures are supported too. The spec file can be used to build two packages: the standard zerotier and the zerotier-controller. It supports some of the build options exposed in the original Linux makefile:
+
+> `rpmbuild -ba zerotier.spec` #builds the standard zerotier package, this is what you need in most of the cases
+
+> `rpmbuild -ba zerotier.spec --with controller` #builds the zerotier-controller package
+
+> `rpmbuild -ba zerotier.spec --with debug` #builds the zerotier package with debug enable<>d
+
+> `rpmbuild -ba zerotier.spec --with miniupnpc` #builds the zerotier package with miniupnpc enabled
+
+> `rpmbuild -ba zerotier.spec --with cluster` #builds the zerotier package with cluster enabled
+
+
+####Build environment preparation
+As zerotier is not distributed in tar.gz format at the moment, the %prep section of the spec file takes care about the prepartion of an rpmbuild compatible tar.gz.
+
+
+
diff --git a/ext/installfiles/linux/RPM/zerotier-one.spec.in b/ext/installfiles/linux/RPM/zerotier-one.spec.in
new file mode 100644
index 000000000..1ec3d42a3
--- /dev/null
+++ b/ext/installfiles/linux/RPM/zerotier-one.spec.in
@@ -0,0 +1,34 @@
+Name: zerotier-one
+Summary: ZeroTier One network virtualization service
+Version: __VERSION__
+Release: 1%{?dist}
+License: GPLv3
+URL: https://www.zerotier.com/
+
+%description
+ZeroTier One creates virtual Ethernet networks that work anywhere and everywhere.
+Visit https://www.zerotier.com/ for more information.
+
+%prep
+mkdir -p $RPM_BUILD_ROOT/var/lib/zerotier-one/updates.d
+cp -f $OLDPWD/__INSTALLER__ $RPM_BUILD_ROOT/var/lib/zerotier-one/updates.d
+
+%pre
+mkdir -p /var/lib/zerotier-one/updates.d
+
+%files
+/var/lib/zerotier-one/updates.d/__INSTALLER__
+
+%post
+chmod 0755 /var/lib/zerotier-one/updates.d/__INSTALLER__
+/var/lib/zerotier-one/updates.d/__INSTALLER__ >>/dev/null 2>&1
+
+%preun
+if [ "$1" -lt 1 ]; then
+ /var/lib/zerotier-one/uninstall.sh >>/dev/null 2>&1
+fi
+
+%clean
+cp -f %{_rpmdir}/%{_arch}/%{name}-%{version}-%{release}.%{_arch}.rpm $OLDPWD
+rm -f %{_rpmdir}/%{_arch}/%{name}-%{version}-%{release}.%{_arch}.rpm
+rm -rf $RPM_BUILD_ROOT
diff --git a/ext/installfiles/linux/RPM/zerotier.spec b/ext/installfiles/linux/RPM/zerotier.spec
new file mode 100755
index 000000000..41230f0e3
--- /dev/null
+++ b/ext/installfiles/linux/RPM/zerotier.spec
@@ -0,0 +1,194 @@
+# add --with controller option to build controller (builds zerotier-controller package)
+%bcond_with controller
+# add --with miniupnpc option to enable the miniupnpc option during build 
+%bcond_with miniupnpc
+# add --with cluster option to enable the cluster option during build 
+%bcond_with cluster
+# add --with debug option to enable the debug option during build 
+%bcond_with debug
+%if %{with controller}
+Name:zerotier-controller
+Conflicts:zerotier
+%else
+Name:zerotier
+Conflicts:zerotier-controller
+%endif
+Version: 1.1.4
+Release: 1
+Summary:  Network Virtualization Everywhere https://www.zerotier.com/ 
+Group: network
+License: GPLv3
+BuildRoot: %{_tmppath}/%{name}-root
+Provides: zerotier-one
+Source0:  http:///download/%{name}-%{version}.tar.gz
+BuildRequires: gcc-c++
+BuildRequires: make
+BuildRequires: gcc
+%if %{with server}
+BuildRequires: sqlite-devel
+BuildRequires: wget
+BuildRequires: unzip
+Requires: sqlite
+%endif
+%description
+ZeroTier One creates virtual Ethernet networks that work anywhere and everywhere.
+Visit https://www.zerotier.com/ for more information.
+
+%prep
+cd `mktemp -d`
+wget -O master.zip https://github.com/zerotier/ZeroTierOne/archive/master.zip
+unzip master.zip
+mv ZeroTierOne-master zerotier-1.1.4
+ln -s zerotier-1.1.4 zerotier-controller-1.1.4
+tar zcvf zerotier-1.1.4.tar.gz zerotier-1.1.4 zerotier-controller-1.1.4
+ln -s zerotier-1.1.4.tar.gz zerotier-controller-1.1.4.tar.gz
+mv zero*.tar.gz ~/rpmbuild/SOURCES
+cd -
+%setup -q
+
+%build
+%if %{with miniupnpc}
+ZT_USE_MINIUPNPC=1; export ZT_USE_MINIUPNPC;
+%endif
+
+%if %{with controller}
+ZT_ENABLE_NETWORK_CONTROLLER=1; export ZT_ENABLE_NETWORK_CONTROLLER;
+%endif
+
+%if %{with cluster}
+export ZT_ENABLE_CLUSTER=1
+%endif
+
+%if %{with debug}
+export ZT_DEBUG=1
+%endif
+
+make
+
+%install
+
+
+rm -rf $RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_prefix}/bin/zerotier-idtool $RPM_BUILD_ROOT%{_prefix}/bin/zerotier-idtool
+echo 'Install...'
+mkdir -p $RPM_BUILD_ROOT%{_vardir}/lib/zerotier-one/initfiles/{init.d,systemd}
+install -m 0755 -D zerotier-one -t $RPM_BUILD_ROOT%{_vardir}/lib/zerotier-one/
+install -m 0755 -D ext/installfiles/linux/init.d/* -t $RPM_BUILD_ROOT%{_vardir}/lib/zerotier-one/initfiles/init.d/
+install -m 0755 -D ext/installfiles/linux/systemd/* -t $RPM_BUILD_ROOT%{_vardir}/lib/zerotier-one/initfiles/systemd/
+
+
+
+%posttrans
+echo -n 'Getting version of new install... '
+newVersion=`/var/lib/zerotier-one/zerotier-one -v`
+echo $newVersion
+
+echo 'Creating symlinks...'
+
+rm -f /usr/bin/zerotier-cli /usr/bin/zerotier-idtool
+ln -sf /var/lib/zerotier-one/zerotier-one /usr/bin/zerotier-cli
+ln -sf /var/lib/zerotier-one/zerotier-one /usr/bin/zerotier-idtool
+echo 'Installing zerotier-one service...'
+
+SYSTEMDUNITDIR=
+if [ -e /bin/systemctl -o -e /usr/bin/systemctl -o -e /usr/local/bin/systemctl -o -e /sbin/systemctl -o -e /usr/sbin/systemctl ]; then
+        # Second check: test if systemd appears to actually be running. Apparently Ubuntu
+        # thought it was a good idea to ship with systemd installed but not used. Issue #133
+        if [ -d /var/run/systemd/system -o -d /run/systemd/system ]; then
+                if [ -e /usr/bin/pkg-config ]; then
+                        SYSTEMDUNITDIR=`/usr/bin/pkg-config systemd --variable=systemdsystemunitdir`
+                fi
+                if [ -z "$SYSTEMDUNITDIR" -o ! -d "$SYSTEMDUNITDIR" ]; then
+                        if [ -d /usr/lib/systemd/system ]; then
+                                SYSTEMDUNITDIR=/usr/lib/systemd/system
+                        fi
+                        if [ -d /etc/systemd/system ]; then
+                                SYSTEMDUNITDIR=/etc/systemd/system
+                        fi
+                fi
+        fi
+fi
+
+if [ -n "$SYSTEMDUNITDIR" -a -d "$SYSTEMDUNITDIR" ]; then
+        # SYSTEMD
+
+        # If this was updated or upgraded from an init.d based system, clean up the old
+        # init.d stuff before installing directly via systemd.
+        if [ -f /etc/init.d/zerotier-one ]; then
+                if [ -e /sbin/chkconfig -o -e /usr/sbin/chkconfig -o -e /bin/chkconfig -o -e /usr/bin/chkconfig ]; then
+                        chkconfig zerotier-one off
+                fi
+                rm -f /etc/init.d/zerotier-one
+        fi
+
+        cp -f /var/lib/zerotier-one/initfiles/systemd/zerotier-one.service "$SYSTEMDUNITDIR/zerotier-one.service"
+        chown 0 "$SYSTEMDUNITDIR/zerotier-one.service"
+        chgrp 0 "$SYSTEMDUNITDIR/zerotier-one.service"
+        chmod 0755 "$SYSTEMDUNITDIR/zerotier-one.service"
+
+        systemctl enable zerotier-one.service
+
+        echo
+        echo 'Done! Installed and service configured to start at system boot.'
+        echo
+       echo "To start now or restart the service if it's already running:"
+        echo '  sudo systemctl restart zerotier-one.service'
+else
+        # SYSV INIT -- also covers upstart which supports SysVinit backward compatibility
+
+        cp -f /var/lib/zerotier-one/initfiles/init.d/zerotier-one /etc/init.d/zerotier-one
+        chmod 0755 /etc/init.d/zerotier-one
+        
+        if [ -f /sbin/chkconfig -o -f /usr/sbin/chkconfig -o -f /usr/bin/chkconfig -o -f /bin/chkconfig ]; then
+                chkconfig zerotier-one on
+        else
+                # Yes Virginia, some systems lack chkconfig.
+                if [ -d /etc/rc0.d ]; then
+                        rm -f /etc/rc0.d/???zerotier-one
+                        ln -sf /etc/init.d/zerotier-one /etc/rc0.d/K89zerotier-one
+                fi
+                if [ -d /etc/rc1.d ]; then
+                        rm -f /etc/rc1.d/???zerotier-one
+                        ln -sf /etc/init.d/zerotier-one /etc/rc1.d/K89zerotier-one
+                fi
+                if [ -d /etc/rc2.d ]; then
+                        rm -f /etc/rc2.d/???zerotier-one
+                        ln -sf /etc/init.d/zerotier-one /etc/rc2.d/S11zerotier-one
+                fi
+                if [ -d /etc/rc3.d ]; then
+                        rm -f /etc/rc3.d/???zerotier-one
+                        ln -sf /etc/init.d/zerotier-one /etc/rc3.d/S11zerotier-one
+                fi
+                if [ -d /etc/rc4.d ]; then
+                        rm -f /etc/rc4.d/???zerotier-one
+                        ln -sf /etc/init.d/zerotier-one /etc/rc4.d/S11zerotier-one
+                fi
+                if [ -d /etc/rc5.d ]; then
+                        rm -f /etc/rc5.d/???zerotier-one
+                        ln -sf /etc/init.d/zerotier-one /etc/rc5.d/S11zerotier-one
+                fi
+                if [ -d /etc/rc6.d ]; then
+                        rm -f /etc/rc6.d/???zerotier-one
+                        ln -sf /etc/init.d/zerotier-one /etc/rc6.d/K89zerotier-one
+                fi
+        fi
+        echo
+        echo 'Done! Installed and service configured to start at system boot.'
+        echo
+        echo "To start now or restart the service if it's already running:"
+        echo '  sudo service zerotier-one restart'
+fi
+%preun
+/sbin/chkconfig --del zerotier-one
+rm -f /usr/bin/zerotier-cli /usr/bin/zerotier-idtool
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+%files
+%{_vardir}/lib/zerotier-one/zerotier-one
+%{_vardir}/lib/zerotier-one/initfiles/systemd/zerotier-one.service
+%{_vardir}/lib/zerotier-one/initfiles/init.d/zerotier-one
+
+%changelog
+* Fri Feb 26 2016 Kristof Imre Szabo <kristof.szabo@lxsystems.de> 1.1.4-1
+- initial package
diff --git a/ext/installfiles/linux/buildinstaller.sh b/ext/installfiles/linux/buildinstaller.sh
new file mode 100755
index 000000000..21f2f73ed
--- /dev/null
+++ b/ext/installfiles/linux/buildinstaller.sh
@@ -0,0 +1,134 @@
+#!/bin/bash
+
+# This script builds the installer for *nix systems. Windows must do everything
+# completely differently, as usual.
+
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+if [ ! -f zerotier-one ]; then
+	echo "Could not find 'zerotier-one' binary, please build before running this script."
+	exit 2
+fi
+
+machine=`uname -m`
+system=`uname -s`
+
+vmajor=`cat version.h | grep -F ZEROTIER_ONE_VERSION_MAJOR | cut -d ' ' -f 3`
+vminor=`cat version.h | grep -F ZEROTIER_ONE_VERSION_MINOR | cut -d ' ' -f 3`
+revision=`cat version.h | grep -F ZEROTIER_ONE_VERSION_REVISION | cut -d ' ' -f 3`
+
+if [ -z "$vmajor" -o -z "$vminor" -o -z "$revision" ]; then
+	echo "Unable to extract version info from version.h, aborting installer build."
+	exit 2
+fi
+
+rm -rf build-installer
+mkdir build-installer
+
+case "$system" in
+
+	Linux)
+		# Canonicalize $machine for some architectures... we use x86
+		# and x64 for Intel stuff. ARM and others should be fine if
+		# we ever ship officially for those.
+		debian_arch=$machine
+		case "$machine" in
+			i386|i486|i586|i686)
+				machine="x86"
+				debian_arch="i386"
+				;;
+			x86_64|amd64|x64)
+				machine="x64"
+				debian_arch="amd64"
+				;;
+			armv6l|arm|armhf|arm7l|armv7l)
+				machine="armv6l"
+				debian_arch="armhf"
+				;;
+		esac
+
+		echo "Assembling Linux installer for $machine and version $vmajor.$vminor.$revision"
+
+		mkdir -p 'build-installer/var/lib/zerotier-one/ui'
+		cp -fp 'ext/installfiles/linux/uninstall.sh' 'build-installer/var/lib/zerotier-one'
+		cp -fp 'zerotier-one' 'build-installer/var/lib/zerotier-one'
+		for f in ui/*.html ui/*.js ui/*.css ui/*.jsx ; do
+			cp -fp "$f" 'build-installer/var/lib/zerotier-one/ui'
+		done
+		mkdir -p 'build-installer/tmp'
+		cp -fp 'ext/installfiles/linux/init.d/zerotier-one' 'build-installer/tmp/init.d_zerotier-one'
+		cp -fp 'ext/installfiles/linux/systemd/zerotier-one.service' 'build-installer/tmp/systemd_zerotier-one.service'
+
+		targ="ZeroTierOneInstaller-linux-${machine}-${vmajor}_${vminor}_${revision}"
+		# Use gzip in Linux since some minimal Linux systems do not have bunzip2
+		rm -f build-installer-tmp.tar.gz
+		cd build-installer
+		tar -cf - * | gzip -9 >../build-installer-tmp.tar.gz
+		cd ..
+		rm -f $targ
+		cat ext/installfiles/linux/install.tmpl.sh build-installer-tmp.tar.gz >$targ
+		chmod 0755 $targ
+		rm -f build-installer-tmp.tar.gz
+		ls -l $targ
+
+		if [ -f /usr/bin/dpkg-deb -a "$UID" -eq 0 ]; then
+			echo
+			echo Found dpkg-deb and you are root, trying to build Debian package.
+
+			rm -rf build-installer-deb
+
+			debbase="build-installer-deb/zerotier-one_${vmajor}.${vminor}.${revision}_$debian_arch"
+			debfolder="${debbase}/DEBIAN"
+			mkdir -p $debfolder
+
+			cat 'ext/installfiles/linux/DEBIAN/control.in' | sed "s/__VERSION__/${vmajor}.${vminor}.${revision}/" | sed "s/__ARCH__/${debian_arch}/" >$debfolder/control
+			cat $debfolder/control
+			cp -f 'ext/installfiles/linux/DEBIAN/conffiles' "${debfolder}/conffiles"
+
+			mkdir -p "${debbase}/var/lib/zerotier-one/updates.d"
+			cp -f $targ "${debbase}/var/lib/zerotier-one/updates.d"
+
+			rm -f "${debfolder}/postinst" "${debfolder}/prerm"
+
+			echo '#!/bin/bash' >${debfolder}/postinst
+			echo "/var/lib/zerotier-one/updates.d/${targ} >>/dev/null 2>&1" >>${debfolder}/postinst
+			echo "/bin/rm -f /var/lib/zerotier-one/updates.d/*" >>${debfolder}/postinst
+			chmod a+x ${debfolder}/postinst
+
+			echo '#!/bin/bash' >${debfolder}/prerm
+			echo 'export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin' >>${debfolder}/prerm
+			echo 'if [ "$1" != "upgrade" ]; then' >>${debfolder}/prerm
+			echo '	/var/lib/zerotier-one/uninstall.sh >>/dev/null 2>&1' >>${debfolder}/prerm
+			echo 'fi' >>${debfolder}/prerm
+			chmod a+x ${debfolder}/prerm
+
+			dpkg-deb --build $debbase
+
+			mv -f build-installer-deb/*.deb .
+			rm -rf build-installer-deb
+		fi
+
+		if [ -f /usr/bin/rpmbuild ]; then
+			echo
+			echo Found rpmbuild, trying to build RedHat/CentOS package.
+
+			rm -f /tmp/zerotier-one.spec
+			curr_dir=`pwd`
+			cat ext/installfiles/linux/RPM/zerotier-one.spec.in | sed "s/__VERSION__/${vmajor}.${vminor}.${revision}/g" | sed "s/__INSTALLER__/${targ}/g" >/tmp/zerotier-one.spec
+
+			rpmbuild -ba /tmp/zerotier-one.spec
+
+			rm -f /tmp/zerotier-one.spec
+		fi
+
+		;;
+
+	*)
+		echo "Unsupported platform: $system"
+		exit 2
+
+esac
+
+rm -rf build-installer
+
+exit 0
diff --git a/ext/installfiles/linux/init.d/zerotier-one b/ext/installfiles/linux/init.d/zerotier-one
new file mode 100755
index 000000000..b0a8aa418
--- /dev/null
+++ b/ext/installfiles/linux/init.d/zerotier-one
@@ -0,0 +1,113 @@
+#!/bin/sh
+#
+# zerotier-one   Virtual distributed Ethernet service
+#
+# chkconfig: 2345 11 89
+# description: ZeroTier One provides public and private distributed ethernet \
+#              networks. See https://www.zerotier.com/ for more information.
+
+### BEGIN INIT INFO
+# Provides:          zerotier-one
+# Required-Start:    $local_fs $network
+# Required-Stop:     $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start ZeroTier One
+# Description:       ZeroTier One provides public and private distributed ethernet \
+#                    networks. See https://www.zerotier.com/ for more information.
+### END INIT INFO
+
+#
+# This script is written to avoid distro-specific dependencies, so it does not
+# use the rc bash script libraries found on some systems. It should work on
+# just about anything.
+#
+
+zthome=/var/lib/zerotier-one
+
+# Add $zthome to path so we can invoke zerotier-one naked, makes it look
+# better in a ps listing.
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin:$zthome
+
+if [ "`id -u`" -ne 0 ]; then
+	echo "Init script must be called as root."
+	exit 4
+fi
+
+if [ ! -f "$zthome/zerotier-one" ]; then
+	echo "ZeroTier One is not installed in $zthome."
+	exit 5
+fi
+
+pid=0
+if [ -f "$zthome/zerotier-one.pid" ]; then
+	pid=`cat $zthome/zerotier-one.pid`
+fi
+
+running=0
+if [ "$pid" -gt 0 ]; then
+	exepath=`readlink /proc/$pid/exe 2>/dev/null | grep zerotier-one`
+	if [ -n "$exepath" ]; then
+		running=1
+	fi
+fi
+
+case "$1" in
+	start)
+		if [ $running -gt 0 ]; then
+			echo "ZeroTier One already running."
+			exit 0
+		fi
+		echo "Starting ZeroTier One..."
+		zerotier-one -d
+		;;
+	stop)
+		if [ $running -gt 0 ]; then
+			echo "Stopping ZeroTier One..."
+			kill -TERM $pid
+			sleep 0.25
+			if [ -f "$zthome/zerotier-one.pid" ]; then
+				sleep 0.5
+			fi
+			if [ -f "$zthome/zerotier-one.pid" ]; then
+				sleep 1
+			fi
+			if [ -f "$zthome/zerotier-one.pid" ]; then
+				kill -KILL $pid >>/dev/null 2>&1
+				rm -f "$zthome/zerotier-one.pid"
+			fi
+		else
+			echo "ZeroTier One is not running."
+		fi
+		;;
+	restart|reload|force-reload|condrestart|try-restart)
+		echo "Restarting ZeroTier One..."
+		if [ $running -gt 0 ]; then
+			kill -TERM $pid >>/dev/null 2>&1
+		fi
+		sleep 0.25
+		if [ -f "$zthome/zerotier-one.pid" ]; then
+			sleep 0.5
+		fi
+		if [ -f "$zthome/zerotier-one.pid" ]; then
+			sleep 1
+		fi
+		if [ -f "$zthome/zerotier-one.pid" ]; then
+			kill -KILL $pid >>/dev/null 2>&1
+			rm -f "$zthome/zerotier-one.pid"
+		fi
+		zerotier-one -d
+		;;
+	status)
+		if [ $running -gt 0 ]; then
+			exit 0
+		else
+			exit 3
+		fi
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+		exit 2
+esac
+
+exit 0
diff --git a/ext/installfiles/linux/install.tmpl.sh b/ext/installfiles/linux/install.tmpl.sh
new file mode 100644
index 000000000..2d18d24ce
--- /dev/null
+++ b/ext/installfiles/linux/install.tmpl.sh
@@ -0,0 +1,182 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+shopt -s expand_aliases
+
+dryRun=0
+
+echo "*** ZeroTier One install/update ***"
+echo
+
+if [ "$UID" -ne 0 ]; then
+	echo "Not running as root so doing dry run (no modifications to system)..."
+	dryRun=1
+fi
+
+if [ $dryRun -gt 0 ]; then
+	alias ln="echo '>> ln'"
+	alias rm="echo '>> rm'"
+	alias mv="echo '>> mv'"
+	alias cp="echo '>> cp'"
+	alias chown="echo '>> chown'"
+	alias chgrp="echo '>> chgrp'"
+	alias chmod="echo '>> chmod'"
+	alias chkconfig="echo '>> chkconfig'"
+	alias zerotier-cli="echo '>> zerotier-cli'"
+	alias service="echo '>> service'"
+	alias systemctl="echo '>> systemctl'"
+fi
+
+scriptPath="`dirname "$0"`/`basename "$0"`"
+if [ ! -r "$scriptPath" ]; then
+	scriptPath="$0"
+	if [ ! -r "$scriptPath" ]; then
+		echo "Installer cannot determine its own path; $scriptPath is not readable."
+		exit 2
+	fi
+fi
+
+# Check for systemd vs. old school SysV init
+SYSTEMDUNITDIR=
+if [ -e /bin/systemctl -o -e /usr/bin/systemctl -o -e /usr/local/bin/systemctl -o -e /sbin/systemctl -o -e /usr/sbin/systemctl ]; then
+	# Second check: test if systemd appears to actually be running. Apparently Ubuntu
+	# thought it was a good idea to ship with systemd installed but not used. Issue #133
+	if [ -d /var/run/systemd/system -o -d /run/systemd/system ]; then
+		if [ -e /usr/bin/pkg-config ]; then
+			SYSTEMDUNITDIR=`/usr/bin/pkg-config systemd --variable=systemdsystemunitdir`
+		fi
+		if [ -z "$SYSTEMDUNITDIR" -o ! -d "$SYSTEMDUNITDIR" ]; then
+			if [ -d /usr/lib/systemd/system ]; then
+				SYSTEMDUNITDIR=/usr/lib/systemd/system
+			fi
+			if [ -d /etc/systemd/system ]; then
+				SYSTEMDUNITDIR=/etc/systemd/system
+			fi
+		fi
+	fi
+fi
+
+# Find the end of this script, which is where we have appended binary data.
+endMarkerIndex=`grep -a -b -E '^################' "$scriptPath" | head -c 16 | cut -d : -f 1`
+if [ "$endMarkerIndex" -le 100 ]; then
+	echo 'Internal error: unable to find end of script / start of binary data marker.'
+	exit 2
+fi
+blobStart=`expr $endMarkerIndex + 17`
+if [ "$blobStart" -le "$endMarkerIndex" ]; then
+	echo 'Internal error: unable to find end of script / start of binary data marker.'
+	exit 2
+fi
+
+echo -n 'Getting version of existing install... '
+origVersion=NONE
+if [ -x /var/lib/zerotier-one/zerotier-one ]; then
+	origVersion=`/var/lib/zerotier-one/zerotier-one -v`
+fi
+echo $origVersion
+
+echo 'Extracting files...'
+if [ $dryRun -gt 0 ]; then
+	echo ">> tail -c +$blobStart \"$scriptPath\" | gunzip -c | tar -xvop -C / -f -"
+	tail -c +$blobStart "$scriptPath" | gunzip -c | tar -t -f - | sed 's/^/>>   /'
+else
+	tail -c +$blobStart "$scriptPath" | gunzip -c | tar -xvop --no-overwrite-dir -C / -f -
+fi
+
+if [ $dryRun -eq 0 -a ! -x "/var/lib/zerotier-one/zerotier-one" ]; then
+	echo 'Archive extraction failed, cannot find zerotier-one binary in "/var/lib/zerotier-one".'
+	exit 2
+fi
+
+echo -n 'Getting version of new install... '
+newVersion=`/var/lib/zerotier-one/zerotier-one -v`
+echo $newVersion
+
+echo 'Creating symlinks...'
+
+rm -f /usr/bin/zerotier-cli /usr/bin/zerotier-idtool
+ln -sf /var/lib/zerotier-one/zerotier-one /usr/bin/zerotier-cli
+ln -sf /var/lib/zerotier-one/zerotier-one /usr/bin/zerotier-idtool
+
+echo 'Installing zerotier-one service...'
+
+if [ -n "$SYSTEMDUNITDIR" -a -d "$SYSTEMDUNITDIR" ]; then
+	# SYSTEMD
+
+	# If this was updated or upgraded from an init.d based system, clean up the old
+	# init.d stuff before installing directly via systemd.
+	if [ -f /etc/init.d/zerotier-one ]; then
+		if [ -e /sbin/chkconfig -o -e /usr/sbin/chkconfig -o -e /bin/chkconfig -o -e /usr/bin/chkconfig ]; then
+			chkconfig zerotier-one off
+		fi
+		rm -f /etc/init.d/zerotier-one
+	fi
+
+	cp -f /tmp/systemd_zerotier-one.service "$SYSTEMDUNITDIR/zerotier-one.service"
+	chown 0 "$SYSTEMDUNITDIR/zerotier-one.service"
+	chgrp 0 "$SYSTEMDUNITDIR/zerotier-one.service"
+	chmod 0644 "$SYSTEMDUNITDIR/zerotier-one.service"
+	rm -f /tmp/systemd_zerotier-one.service /tmp/init.d_zerotier-one
+
+	systemctl enable zerotier-one.service
+
+	echo
+	echo 'Done! Installed and service configured to start at system boot.'
+	echo
+	echo "To start now or restart the service if it's already running:"
+	echo '  sudo systemctl restart zerotier-one.service'
+else
+	# SYSV INIT -- also covers upstart which supports SysVinit backward compatibility
+
+	cp -f /tmp/init.d_zerotier-one /etc/init.d/zerotier-one
+	chmod 0755 /etc/init.d/zerotier-one
+	rm -f /tmp/systemd_zerotier-one.service /tmp/init.d_zerotier-one
+
+	if [ -f /sbin/chkconfig -o -f /usr/sbin/chkconfig -o -f /usr/bin/chkconfig -o -f /bin/chkconfig ]; then
+		chkconfig zerotier-one on
+	else
+		# Yes Virginia, some systems lack chkconfig.
+		if [ -d /etc/rc0.d ]; then
+			rm -f /etc/rc0.d/???zerotier-one
+			ln -sf /etc/init.d/zerotier-one /etc/rc0.d/K89zerotier-one
+		fi
+		if [ -d /etc/rc1.d ]; then
+			rm -f /etc/rc1.d/???zerotier-one
+			ln -sf /etc/init.d/zerotier-one /etc/rc1.d/K89zerotier-one
+		fi
+		if [ -d /etc/rc2.d ]; then
+			rm -f /etc/rc2.d/???zerotier-one
+			ln -sf /etc/init.d/zerotier-one /etc/rc2.d/S11zerotier-one
+		fi
+		if [ -d /etc/rc3.d ]; then
+			rm -f /etc/rc3.d/???zerotier-one
+			ln -sf /etc/init.d/zerotier-one /etc/rc3.d/S11zerotier-one
+		fi
+		if [ -d /etc/rc4.d ]; then
+			rm -f /etc/rc4.d/???zerotier-one
+			ln -sf /etc/init.d/zerotier-one /etc/rc4.d/S11zerotier-one
+		fi
+		if [ -d /etc/rc5.d ]; then
+			rm -f /etc/rc5.d/???zerotier-one
+			ln -sf /etc/init.d/zerotier-one /etc/rc5.d/S11zerotier-one
+		fi
+		if [ -d /etc/rc6.d ]; then
+			rm -f /etc/rc6.d/???zerotier-one
+			ln -sf /etc/init.d/zerotier-one /etc/rc6.d/K89zerotier-one
+		fi
+	fi
+
+	echo
+	echo 'Done! Installed and service configured to start at system boot.'
+	echo
+	echo "To start now or restart the service if it's already running:"
+	echo '  sudo service zerotier-one restart'
+fi
+
+exit 0
+
+# Do not remove the last line or add a carriage return to it! The installer
+# looks for an unterminated line beginning with 16 #'s in itself to find
+# the binary blob data, which is appended after it.
+
+################
\ No newline at end of file
diff --git a/ext/installfiles/linux/systemd/zerotier-one.service b/ext/installfiles/linux/systemd/zerotier-one.service
new file mode 100644
index 000000000..c4a1c4d29
--- /dev/null
+++ b/ext/installfiles/linux/systemd/zerotier-one.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=ZeroTier One
+After=network.target
+
+[Service]
+ExecStart=/var/lib/zerotier-one/zerotier-one
+Restart=always
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ext/installfiles/linux/uninstall.sh b/ext/installfiles/linux/uninstall.sh
new file mode 100755
index 000000000..d9495a18f
--- /dev/null
+++ b/ext/installfiles/linux/uninstall.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+
+if [ "$UID" -ne 0 ]; then
+	echo "Must be run as root; try: sudo $0"
+	exit 1
+fi
+
+# Detect systemd vs. regular init
+SYSTEMDUNITDIR=
+if [ -e /bin/systemctl -o -e /usr/bin/systemctl -o -e /usr/local/bin/systemctl -o -e /sbin/systemctl -o -e /usr/sbin/systemctl ]; then
+	if [ -e /usr/bin/pkg-config ]; then
+		SYSTEMDUNITDIR=`/usr/bin/pkg-config systemd --variable=systemdsystemunitdir`
+	fi
+	if [ -z "$SYSTEMDUNITDIR" -o ! -d "$SYSTEMDUNITDIR" ]; then
+		if [ -d /usr/lib/systemd/system ]; then
+			SYSTEMDUNITDIR=/usr/lib/systemd/system
+		fi
+		if [ -d /etc/systemd/system ]; then
+			SYSTEMDUNITDIR=/etc/systemd/system
+		fi
+	fi
+fi
+
+echo "Killing any running zerotier-one service..."
+if [ -n "$SYSTEMDUNITDIR" -a -d "$SYSTEMDUNITDIR" ]; then
+	systemctl stop zerotier-one.service
+	systemctl disable zerotier-one.service
+else
+	if [ -f /sbin/service -o -f /usr/sbin/service -o -f /bin/service -o -f /usr/bin/service ]; then
+		service zerotier-one stop
+	fi
+fi
+
+sleep 1
+if [ -f /var/lib/zerotier-one/zerotier-one.pid ]; then
+	kill -TERM `cat /var/lib/zerotier-one/zerotier-one.pid`
+	sleep 1
+fi
+if [ -f /var/lib/zerotier-one/zerotier-one.pid ]; then
+	kill -KILL `cat /var/lib/zerotier-one/zerotier-one.pid`
+fi
+
+if [ -f /etc/init.d/zerotier-one ]; then
+	echo "Removing SysV init items..."
+	if [ -f /sbin/chkconfig -o -f /usr/sbin/chkconfig -o -f /bin/chkconfig -o -f /usr/bin/chkconfig ]; then
+		chkconfig zerotier-one off
+	fi
+	rm -f /etc/init.d/zerotier-one
+	find /etc/rc*.d -type f -name '???zerotier-one' -print0 | xargs -0 rm -f
+fi
+
+if [ -n "$SYSTEMDUNITDIR" -a -d "$SYSTEMDUNITDIR" -a -f "$SYSTEMDUNITDIR/zerotier-one.service" ]; then
+	echo "Removing systemd service..."
+	rm -f "$SYSTEMDUNITDIR/zerotier-one.service"
+fi
+
+echo "Erasing binary and support files..."
+if [ -d /var/lib/zerotier-one ]; then
+	cd /var/lib/zerotier-one
+	rm -rf zerotier-one *.persist identity.public *.log *.pid *.sh updates.d networks.d iddb.d root-topology ui
+fi
+
+echo "Erasing anything installed into system bin directories..."
+rm -f /usr/local/bin/zerotier-cli /usr/bin/zerotier-cli /usr/local/bin/zerotier-idtool /usr/bin/zerotier-idtool
+
+echo "Done."
+echo
+echo "Your ZeroTier One identity is still preserved in /var/lib/zerotier-one"
+echo "as identity.secret and can be manually deleted if you wish. Save it if"
+echo "you wish to re-use the address of this node, as it cannot be regenerated."
+
+echo
+
+exit 0
diff --git a/ext/installfiles/linux/zerotier-containerized/Dockerfile b/ext/installfiles/linux/zerotier-containerized/Dockerfile
deleted file mode 100644
index 7758faf3a..000000000
--- a/ext/installfiles/linux/zerotier-containerized/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-## NOTE: to retain configuration; mount a Docker volume, or use a bind-mount, on /var/lib/zerotier-one
-
-FROM debian:buster-slim as builder
-
-## Supports x86_64, x86, arm, and arm64
-
-RUN apt-get update && apt-get install -y curl gnupg
-RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 0x1657198823e52a61  && \
-    echo "deb http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list
-RUN apt-get update && apt-get install -y zerotier-one=1.8.6
-COPY ext/installfiles/linux/zerotier-containerized/main.sh /var/lib/zerotier-one/main.sh
-
-FROM debian:buster-slim
-LABEL version="1.8.6"
-LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts."
-
-# ZeroTier relies on UDP port 9993
-EXPOSE 9993/udp
-
-RUN mkdir -p /var/lib/zerotier-one
-COPY --from=builder /usr/sbin/zerotier-cli /usr/sbin/zerotier-cli
-COPY --from=builder /usr/sbin/zerotier-idtool /usr/sbin/zerotier-idtool
-COPY --from=builder /usr/sbin/zerotier-one /usr/sbin/zerotier-one
-COPY --from=builder /var/lib/zerotier-one/main.sh /main.sh
-
-RUN chmod 0755 /main.sh
-ENTRYPOINT ["/main.sh"]
-CMD ["zerotier-one"]
diff --git a/ext/installfiles/linux/zerotier-containerized/main.sh b/ext/installfiles/linux/zerotier-containerized/main.sh
deleted file mode 100755
index a33890392..000000000
--- a/ext/installfiles/linux/zerotier-containerized/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
-
-if [ ! -e /dev/net/tun ]; then
-	echo 'FATAL: cannot start ZeroTier One in container: /dev/net/tun not present.'
-	exit 1
-fi
-
-exec "$@"
diff --git a/ext/installfiles/linux/zerotier-one.init.rhel6 b/ext/installfiles/linux/zerotier-one.init.rhel6
deleted file mode 100755
index 3ff2f18e3..000000000
--- a/ext/installfiles/linux/zerotier-one.init.rhel6
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-#
-# zerotier-one		Start the ZeroTier One network virtualization service
-#
-# chkconfig: 2345 55 25
-# description: ZeroTier One allows systems to join and participate in \
-#              ZeroTier virtual networks. See https://www.zerotier.com/
-#
-# processname: zerotier-one
-# config: /var/lib/zerotier-one/identity.public
-# config: /var/lib/zerotier-one/identity.secret
-# config: /var/lib/zerotier-one/local.conf
-# config: /var/lib/zerotier-one/authtoken.secret
-# pidfile: /var/lib/zerotier-one/zerotier-one.pid
-
-### BEGIN INIT INFO
-# Provides: zerotier-one
-# Required-Start: $local_fs $network $syslog
-# Required-Stop: $local_fs $syslog
-# Should-Start: $syslog
-# Should-Stop: $network $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start the ZeroTier One network virtualization service
-# Description:       ZeroTier One allows systems to join and participate in
-#		     ZeroTier virtual networks. See https://www.zerotier.com/
-### END INIT INFO
-
-# source function library
-. /etc/rc.d/init.d/functions
-
-# pull in sysconfig settings
-[ -f /etc/sysconfig/zerotier-one ] && . /etc/sysconfig/zerotier-one
-
-RETVAL=0
-prog="zerotier-one"
-lockfile=/var/lock/subsys/$prog
-ZT="/usr/sbin/zerotier-one"
-PID_FILE=/var/lib/zerotier-one/zerotier-one.pid
-
-runlevel=$(set -- $(runlevel); eval "echo \$$#" )
-
-start()
-{
-	[ -x $ZT ] || exit 5
-	echo -n $"Starting $prog: "
-	$ZT $ZT_OPTIONS -d && success || failure
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch $lockfile
-	echo
-	return $RETVAL
-}
-
-stop()
-{
-	echo -n $"Stopping $prog: "
-	killproc -p $PID_FILE $ZT
-	RETVAL=$?
-	if [ "x$runlevel" = x0 -o "x$runlevel" = x6 ] ; then
-	    trap '' TERM
-	    killall $prog 2>/dev/null
-	    trap TERM
-	fi
-	[ $RETVAL -eq 0 ] && rm -f $lockfile
-	echo
-}
-
-reload()
-{
-	stop
-	start
-}
-
-restart() {
-	stop
-	start
-}
-
-force_reload() {
-	restart
-}
-
-rh_status() {
-	status -p $PID_FILE zerotier-one
-}
-
-rh_status_q() {
-	rh_status >/dev/null 2>&1
-}
-
-case "$1" in
-	start)
-		rh_status_q && exit 0
-		start
-		;;
-	stop)
-		if ! rh_status_q; then
-			rm -f $lockfile
-			exit 0
-		fi
-		stop
-		;;
-	restart)
-		restart
-		;;
-	reload)
-		rh_status_q || exit 7
-		reload
-		;;
-	force-reload)
-		force_reload
-		;;
-	condrestart|try-restart)
-		rh_status_q || exit 0
-		if [ -f $lockfile ] ; then
-			do_restart_sanity_check
-			if [ $RETVAL -eq 0 ] ; then
-				stop
-				# avoid race
-				sleep 3
-				start
-			else
-				RETVAL=6
-			fi
-		fi
-		;;
-	status)
-		rh_status
-		RETVAL=$?
-		if [ $RETVAL -eq 3 -a -f $lockfile ] ; then
-			RETVAL=2
-		fi
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}"
-		RETVAL=2
-esac
-exit $RETVAL
diff --git a/ext/installfiles/linux/zerotier-one.te b/ext/installfiles/linux/zerotier-one.te
deleted file mode 100644
index 978df0b10..000000000
--- a/ext/installfiles/linux/zerotier-one.te
+++ /dev/null
@@ -1,14 +0,0 @@
-
-module zerotier-one 1.0;
-
-require {
-	type unconfined_t;
-	type initrc_t;
-	class memprotect mmap_zero;
-}
-
-#============= initrc_t ==============
-allow initrc_t self:memprotect mmap_zero;
-
-#============= unconfined_t ==============
-allow unconfined_t self:memprotect mmap_zero;
diff --git a/ext/installfiles/mac-update/updater.tmpl.sh b/ext/installfiles/mac-update/updater.tmpl.sh
deleted file mode 100644
index 0b07f6d90..000000000
--- a/ext/installfiles/mac-update/updater.tmpl.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/sbin:/usr/sbin
-shopt -s expand_aliases
-
-if [ "$UID" -ne 0 ]; then
-	echo '*** Auto-updater must be run as root.'
-	exit 1
-fi
-
-scriptPath="`dirname "$0"`/`basename "$0"`"
-if [ ! -s "$scriptPath" ]; then
-	scriptPath="$0"
-	if [ ! -s "$scriptPath" ]; then
-		echo "*** Auto-updater cannot determine its own path; $scriptPath is not readable."
-		exit 2
-	fi
-fi
-
-endMarkerIndex=`grep -a -b -E '^################' "$scriptPath" | head -c 16 | cut -d : -f 1`
-if [ "$endMarkerIndex" -le 100 ]; then
-	echo 'Internal error: unable to find end of script / start of binary data marker.'
-	exit 2
-fi
-blobStart=`expr $endMarkerIndex + 17`
-if [ "$blobStart" -le "$endMarkerIndex" ]; then
-	echo 'Internal error: unable to find end of script / start of binary data marker.'
-	exit 2
-fi
-
-rm -f /tmp/ZeroTierOne-update.pkg
-tail -c +$blobStart "$scriptPath" >/tmp/ZeroTierOne-update.pkg
-chmod 0600 /tmp/ZeroTierOne-update.pkg
-
-if [ -s /tmp/ZeroTierOne-update.pkg ]; then
-	rm -f '/Library/Application Support/ZeroTier/One/latest-update.exe' '/Library/Application Support/ZeroTier/One/latest-update.json' /tmp/ZeroTierOne-update.log
-	installer -verbose -pkg /tmp/ZeroTierOne-update.pkg -target / >/tmp/ZeroTierOne-update.log 2>&1
-	rm -f /tmp/ZeroTierOne-update.pkg
-	exit 0
-else
-	echo '*** Error self-unpacking update!'
-	exit 3
-fi
-
-# Do not remove the last line or add a carriage return to it! The installer
-# looks for an unterminated line beginning with 16 #'s in itself to find
-# the binary blob data, which is appended after it.
-
-################
\ No newline at end of file
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index 70cedf9f9..c917d8243 100755
--- a/ext/installfiles/mac/ZeroTier One.pkgproj	
+++ b/ext/installfiles/mac/ZeroTier One.pkgproj	
@@ -2,715 +2,765 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>PACKAGES</key>
-	<array>
-		<dict>
-			<key>MUST-CLOSE-APPLICATION-ITEMS</key>
-			<array/>
-			<key>MUST-CLOSE-APPLICATIONS</key>
-			<false/>
-			<key>PACKAGE_FILES</key>
-			<dict>
-				<key>DEFAULT_INSTALL_LOCATION</key>
-				<string>/</string>
-				<key>HIERARCHY</key>
-				<dict>
-					<key>CHILDREN</key>
-					<array>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>Utilities</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>BUNDLE_CAN_DOWNGRADE</key>
-									<false/>
-									<key>BUNDLE_POSTINSTALL_PATH</key>
-									<dict>
-										<key>PATH_TYPE</key>
-										<integer>0</integer>
-									</dict>
-									<key>BUNDLE_PREINSTALL_PATH</key>
-									<dict>
-										<key>PATH_TYPE</key>
-										<integer>0</integer>
-									</dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>../../../../DesktopUI/ZeroTier.app</string>
-									<key>PATH_TYPE</key>
-									<integer>1</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>3</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>80</integer>
-							<key>PATH</key>
-							<string>Applications</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>509</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array>
-										<dict>
-											<key>CHILDREN</key>
-											<array>
-												<dict>
-													<key>CHILDREN</key>
-													<array>
-														<dict>
-															<key>CHILDREN</key>
-															<array/>
-															<key>GID</key>
-															<integer>0</integer>
-															<key>PATH</key>
-															<string>get-proxy-settings.sh</string>
-															<key>PATH_TYPE</key>
-															<integer>1</integer>
-															<key>PERMISSIONS</key>
-															<integer>493</integer>
-															<key>TYPE</key>
-															<integer>3</integer>
-															<key>UID</key>
-															<integer>0</integer>
-														</dict>
-														<dict>
-															<key>CHILDREN</key>
-															<array/>
-															<key>GID</key>
-															<integer>0</integer>
-															<key>PATH</key>
-															<string>launch.sh</string>
-															<key>PATH_TYPE</key>
-															<integer>1</integer>
-															<key>PERMISSIONS</key>
-															<integer>493</integer>
-															<key>TYPE</key>
-															<integer>3</integer>
-															<key>UID</key>
-															<integer>0</integer>
-														</dict>
-														<dict>
-															<key>CHILDREN</key>
-															<array/>
-															<key>GID</key>
-															<integer>80</integer>
-															<key>PATH</key>
-															<string>../../../MacEthernetTapAgent</string>
-															<key>PATH_TYPE</key>
-															<integer>1</integer>
-															<key>PERMISSIONS</key>
-															<integer>493</integer>
-															<key>TYPE</key>
-															<integer>3</integer>
-															<key>UID</key>
-															<integer>0</integer>
-														</dict>
-														<dict>
-															<key>CHILDREN</key>
-															<array/>
-															<key>GID</key>
-															<integer>0</integer>
-															<key>PATH</key>
-															<string>uninstall.sh</string>
-															<key>PATH_TYPE</key>
-															<integer>1</integer>
-															<key>PERMISSIONS</key>
-															<integer>493</integer>
-															<key>TYPE</key>
-															<integer>3</integer>
-															<key>UID</key>
-															<integer>0</integer>
-														</dict>
-														<dict>
-															<key>CHILDREN</key>
-															<array/>
-															<key>GID</key>
-															<integer>0</integer>
-															<key>PATH</key>
-															<string>../../../zerotier-one</string>
-															<key>PATH_TYPE</key>
-															<integer>1</integer>
-															<key>PERMISSIONS</key>
-															<integer>493</integer>
-															<key>TYPE</key>
-															<integer>3</integer>
-															<key>UID</key>
-															<integer>0</integer>
-														</dict>
-													</array>
-													<key>GID</key>
-													<integer>80</integer>
-													<key>PATH</key>
-													<string>One</string>
-													<key>PATH_TYPE</key>
-													<integer>0</integer>
-													<key>PERMISSIONS</key>
-													<integer>493</integer>
-													<key>TYPE</key>
-													<integer>2</integer>
-													<key>UID</key>
-													<integer>0</integer>
-												</dict>
-											</array>
-											<key>GID</key>
-											<integer>80</integer>
-											<key>PATH</key>
-											<string>ZeroTier</string>
-											<key>PATH_TYPE</key>
-											<integer>0</integer>
-											<key>PERMISSIONS</key>
-											<integer>493</integer>
-											<key>TYPE</key>
-											<integer>2</integer>
-											<key>UID</key>
-											<integer>0</integer>
-										</dict>
-									</array>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>Application Support</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Automator</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Documentation</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Filesystems</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Frameworks</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Input Methods</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Internet Plug-Ins</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>LaunchAgents</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array>
-										<dict>
-											<key>CHILDREN</key>
-											<array/>
-											<key>GID</key>
-											<integer>0</integer>
-											<key>PATH</key>
-											<string>com.zerotier.one.plist</string>
-											<key>PATH_TYPE</key>
-											<integer>1</integer>
-											<key>PERMISSIONS</key>
-											<integer>420</integer>
-											<key>TYPE</key>
-											<integer>3</integer>
-											<key>UID</key>
-											<integer>0</integer>
-										</dict>
-									</array>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>LaunchDaemons</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>PreferencePanes</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Preferences</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>80</integer>
-									<key>PATH</key>
-									<string>Printers</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>PrivilegedHelperTools</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>1005</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>QuickLook</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>QuickTime</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Screen Savers</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Scripts</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Services</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Widgets</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Extensions</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>0</integer>
-							<key>PATH</key>
-							<string>Library</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>493</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array>
-										<dict>
-											<key>CHILDREN</key>
-											<array/>
-											<key>GID</key>
-											<integer>0</integer>
-											<key>PATH</key>
-											<string>Extensions</string>
-											<key>PATH_TYPE</key>
-											<integer>0</integer>
-											<key>PERMISSIONS</key>
-											<integer>493</integer>
-											<key>TYPE</key>
-											<integer>1</integer>
-											<key>UID</key>
-											<integer>0</integer>
-										</dict>
-									</array>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Library</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>493</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>0</integer>
-							<key>PATH</key>
-							<string>System</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>493</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-						<dict>
-							<key>CHILDREN</key>
-							<array>
-								<dict>
-									<key>CHILDREN</key>
-									<array/>
-									<key>GID</key>
-									<integer>0</integer>
-									<key>PATH</key>
-									<string>Shared</string>
-									<key>PATH_TYPE</key>
-									<integer>0</integer>
-									<key>PERMISSIONS</key>
-									<integer>1023</integer>
-									<key>TYPE</key>
-									<integer>1</integer>
-									<key>UID</key>
-									<integer>0</integer>
-								</dict>
-							</array>
-							<key>GID</key>
-							<integer>80</integer>
-							<key>PATH</key>
-							<string>Users</string>
-							<key>PATH_TYPE</key>
-							<integer>0</integer>
-							<key>PERMISSIONS</key>
-							<integer>493</integer>
-							<key>TYPE</key>
-							<integer>1</integer>
-							<key>UID</key>
-							<integer>0</integer>
-						</dict>
-					</array>
-					<key>GID</key>
-					<integer>0</integer>
-					<key>PATH</key>
-					<string>/</string>
-					<key>PATH_TYPE</key>
-					<integer>0</integer>
-					<key>PERMISSIONS</key>
-					<integer>493</integer>
-					<key>TYPE</key>
-					<integer>1</integer>
-					<key>UID</key>
-					<integer>0</integer>
-				</dict>
-				<key>PAYLOAD_TYPE</key>
-				<integer>0</integer>
-				<key>PRESERVE_EXTENDED_ATTRIBUTES</key>
-				<false/>
-				<key>SHOW_INVISIBLE</key>
-				<false/>
-				<key>SPLIT_FORKS</key>
-				<true/>
-				<key>TREAT_MISSING_FILES_AS_WARNING</key>
-				<false/>
-				<key>VERSION</key>
-				<integer>5</integer>
-			</dict>
-			<key>PACKAGE_SCRIPTS</key>
-			<dict>
-				<key>POSTINSTALL_PATH</key>
-				<dict>
-					<key>PATH</key>
-					<string>postinst.sh</string>
-					<key>PATH_TYPE</key>
-					<integer>1</integer>
-				</dict>
-				<key>PREINSTALL_PATH</key>
-				<dict>
-					<key>PATH</key>
-					<string>preinst.sh</string>
-					<key>PATH_TYPE</key>
-					<integer>1</integer>
-				</dict>
-				<key>RESOURCES</key>
-				<array/>
-			</dict>
-			<key>PACKAGE_SETTINGS</key>
-			<dict>
-				<key>AUTHENTICATION</key>
-				<integer>1</integer>
-				<key>CONCLUSION_ACTION</key>
-				<integer>0</integer>
-				<key>FOLLOW_SYMBOLIC_LINKS</key>
-				<false/>
-				<key>IDENTIFIER</key>
-				<string>com.zerotier.pkg.ZeroTierOne</string>
-				<key>LOCATION</key>
-				<integer>0</integer>
-				<key>NAME</key>
-				<string>ZeroTier One</string>
-				<key>OVERWRITE_PERMISSIONS</key>
-				<false/>
-				<key>PAYLOAD_SIZE</key>
-				<integer>-1</integer>
-				<key>REFERENCE_PATH</key>
-				<string></string>
-				<key>RELOCATABLE</key>
-				<false/>
-				<key>USE_HFS+_COMPRESSION</key>
-				<false/>
-				<key>VERSION</key>
-				<string>1.14.2</string>
-			</dict>
-			<key>TYPE</key>
-			<integer>0</integer>
-			<key>UUID</key>
-			<string>1B6AFC3A-9EA5-4401-83D4-37F06CD13CD6</string>
-		</dict>
-	</array>
 	<key>PROJECT</key>
 	<dict>
+		<key>PACKAGE_FILES</key>
+		<dict>
+			<key>DEFAULT_INSTALL_LOCATION</key>
+			<string>/</string>
+			<key>HIERARCHY</key>
+			<dict>
+				<key>CHILDREN</key>
+				<array>
+					<dict>
+						<key>CHILDREN</key>
+						<array>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>80</integer>
+								<key>PATH</key>
+								<string>Utilities</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>80</integer>
+								<key>PATH</key>
+								<string>../../mac-ui-macgap1-wrapper/bin/ZeroTier One.app</string>
+								<key>PATH_TYPE</key>
+								<integer>1</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>3</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+						</array>
+						<key>GID</key>
+						<integer>80</integer>
+						<key>PATH</key>
+						<string>Applications</string>
+						<key>PATH_TYPE</key>
+						<integer>0</integer>
+						<key>PERMISSIONS</key>
+						<integer>509</integer>
+						<key>TYPE</key>
+						<integer>1</integer>
+						<key>UID</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>CHILDREN</key>
+						<array>
+							<dict>
+								<key>CHILDREN</key>
+								<array>
+									<dict>
+										<key>CHILDREN</key>
+										<array>
+											<dict>
+												<key>CHILDREN</key>
+												<array>
+													<dict>
+														<key>CHILDREN</key>
+														<array/>
+														<key>GID</key>
+														<integer>0</integer>
+														<key>PATH</key>
+														<string>get-proxy-settings.sh</string>
+														<key>PATH_TYPE</key>
+														<integer>1</integer>
+														<key>PERMISSIONS</key>
+														<integer>493</integer>
+														<key>TYPE</key>
+														<integer>3</integer>
+														<key>UID</key>
+														<integer>0</integer>
+													</dict>
+													<dict>
+														<key>CHILDREN</key>
+														<array/>
+														<key>GID</key>
+														<integer>0</integer>
+														<key>PATH</key>
+														<string>launch.sh</string>
+														<key>PATH_TYPE</key>
+														<integer>1</integer>
+														<key>PERMISSIONS</key>
+														<integer>493</integer>
+														<key>TYPE</key>
+														<integer>3</integer>
+														<key>UID</key>
+														<integer>0</integer>
+													</dict>
+													<dict>
+														<key>CHILDREN</key>
+														<array/>
+														<key>GID</key>
+														<integer>0</integer>
+														<key>PATH</key>
+														<string>../../bin/tap-mac/tap.kext</string>
+														<key>PATH_TYPE</key>
+														<integer>1</integer>
+														<key>PERMISSIONS</key>
+														<integer>493</integer>
+														<key>TYPE</key>
+														<integer>3</integer>
+														<key>UID</key>
+														<integer>0</integer>
+													</dict>
+													<dict>
+														<key>CHILDREN</key>
+														<array>
+															<dict>
+																<key>CHILDREN</key>
+																<array/>
+																<key>GID</key>
+																<integer>0</integer>
+																<key>PATH</key>
+																<string>../../../ui/index.html</string>
+																<key>PATH_TYPE</key>
+																<integer>1</integer>
+																<key>PERMISSIONS</key>
+																<integer>420</integer>
+																<key>TYPE</key>
+																<integer>3</integer>
+																<key>UID</key>
+																<integer>0</integer>
+															</dict>
+															<dict>
+																<key>CHILDREN</key>
+																<array/>
+																<key>GID</key>
+																<integer>0</integer>
+																<key>PATH</key>
+																<string>../../../ui/main.js</string>
+																<key>PATH_TYPE</key>
+																<integer>1</integer>
+																<key>PERMISSIONS</key>
+																<integer>420</integer>
+																<key>TYPE</key>
+																<integer>3</integer>
+																<key>UID</key>
+																<integer>0</integer>
+															</dict>
+															<dict>
+																<key>CHILDREN</key>
+																<array/>
+																<key>GID</key>
+																<integer>0</integer>
+																<key>PATH</key>
+																<string>../../../ui/react.min.js</string>
+																<key>PATH_TYPE</key>
+																<integer>1</integer>
+																<key>PERMISSIONS</key>
+																<integer>420</integer>
+																<key>TYPE</key>
+																<integer>3</integer>
+																<key>UID</key>
+																<integer>0</integer>
+															</dict>
+															<dict>
+																<key>CHILDREN</key>
+																<array/>
+																<key>GID</key>
+																<integer>0</integer>
+																<key>PATH</key>
+																<string>../../../ui/simpleajax.min.js</string>
+																<key>PATH_TYPE</key>
+																<integer>1</integer>
+																<key>PERMISSIONS</key>
+																<integer>420</integer>
+																<key>TYPE</key>
+																<integer>3</integer>
+																<key>UID</key>
+																<integer>0</integer>
+															</dict>
+															<dict>
+																<key>CHILDREN</key>
+																<array/>
+																<key>GID</key>
+																<integer>0</integer>
+																<key>PATH</key>
+																<string>../../../ui/zerotier.css</string>
+																<key>PATH_TYPE</key>
+																<integer>1</integer>
+																<key>PERMISSIONS</key>
+																<integer>420</integer>
+																<key>TYPE</key>
+																<integer>3</integer>
+																<key>UID</key>
+																<integer>0</integer>
+															</dict>
+															<dict>
+																<key>CHILDREN</key>
+																<array/>
+																<key>GID</key>
+																<integer>0</integer>
+																<key>PATH</key>
+																<string>../../../ui/ztui.min.js</string>
+																<key>PATH_TYPE</key>
+																<integer>1</integer>
+																<key>PERMISSIONS</key>
+																<integer>420</integer>
+																<key>TYPE</key>
+																<integer>3</integer>
+																<key>UID</key>
+																<integer>0</integer>
+															</dict>
+														</array>
+														<key>GID</key>
+														<integer>0</integer>
+														<key>PATH</key>
+														<string>ui</string>
+														<key>PATH_TYPE</key>
+														<integer>0</integer>
+														<key>PERMISSIONS</key>
+														<integer>493</integer>
+														<key>TYPE</key>
+														<integer>2</integer>
+														<key>UID</key>
+														<integer>0</integer>
+													</dict>
+													<dict>
+														<key>CHILDREN</key>
+														<array/>
+														<key>GID</key>
+														<integer>0</integer>
+														<key>PATH</key>
+														<string>uninstall.sh</string>
+														<key>PATH_TYPE</key>
+														<integer>1</integer>
+														<key>PERMISSIONS</key>
+														<integer>493</integer>
+														<key>TYPE</key>
+														<integer>3</integer>
+														<key>UID</key>
+														<integer>0</integer>
+													</dict>
+													<dict>
+														<key>CHILDREN</key>
+														<array/>
+														<key>GID</key>
+														<integer>0</integer>
+														<key>PATH</key>
+														<string>../../../zerotier-one</string>
+														<key>PATH_TYPE</key>
+														<integer>1</integer>
+														<key>PERMISSIONS</key>
+														<integer>493</integer>
+														<key>TYPE</key>
+														<integer>3</integer>
+														<key>UID</key>
+														<integer>0</integer>
+													</dict>
+												</array>
+												<key>GID</key>
+												<integer>80</integer>
+												<key>PATH</key>
+												<string>One</string>
+												<key>PATH_TYPE</key>
+												<integer>0</integer>
+												<key>PERMISSIONS</key>
+												<integer>493</integer>
+												<key>TYPE</key>
+												<integer>2</integer>
+												<key>UID</key>
+												<integer>0</integer>
+											</dict>
+										</array>
+										<key>GID</key>
+										<integer>80</integer>
+										<key>PATH</key>
+										<string>ZeroTier</string>
+										<key>PATH_TYPE</key>
+										<integer>0</integer>
+										<key>PERMISSIONS</key>
+										<integer>493</integer>
+										<key>TYPE</key>
+										<integer>2</integer>
+										<key>UID</key>
+										<integer>0</integer>
+									</dict>
+								</array>
+								<key>GID</key>
+								<integer>80</integer>
+								<key>PATH</key>
+								<string>Application Support</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Automator</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Documentation</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Filesystems</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Frameworks</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Input Methods</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Internet Plug-Ins</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>LaunchAgents</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array>
+									<dict>
+										<key>CHILDREN</key>
+										<array/>
+										<key>GID</key>
+										<integer>0</integer>
+										<key>PATH</key>
+										<string>com.zerotier.one.plist</string>
+										<key>PATH_TYPE</key>
+										<integer>1</integer>
+										<key>PERMISSIONS</key>
+										<integer>420</integer>
+										<key>TYPE</key>
+										<integer>3</integer>
+										<key>UID</key>
+										<integer>0</integer>
+									</dict>
+								</array>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>LaunchDaemons</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>PreferencePanes</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Preferences</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>80</integer>
+								<key>PATH</key>
+								<string>Printers</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>PrivilegedHelperTools</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>QuickLook</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>QuickTime</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Screen Savers</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Scripts</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Services</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Widgets</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+						</array>
+						<key>GID</key>
+						<integer>0</integer>
+						<key>PATH</key>
+						<string>Library</string>
+						<key>PATH_TYPE</key>
+						<integer>0</integer>
+						<key>PERMISSIONS</key>
+						<integer>493</integer>
+						<key>TYPE</key>
+						<integer>1</integer>
+						<key>UID</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>CHILDREN</key>
+						<array>
+							<dict>
+								<key>CHILDREN</key>
+								<array>
+									<dict>
+										<key>CHILDREN</key>
+										<array/>
+										<key>GID</key>
+										<integer>0</integer>
+										<key>PATH</key>
+										<string>Extensions</string>
+										<key>PATH_TYPE</key>
+										<integer>0</integer>
+										<key>PERMISSIONS</key>
+										<integer>493</integer>
+										<key>TYPE</key>
+										<integer>1</integer>
+										<key>UID</key>
+										<integer>0</integer>
+									</dict>
+								</array>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Library</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>493</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+						</array>
+						<key>GID</key>
+						<integer>0</integer>
+						<key>PATH</key>
+						<string>System</string>
+						<key>PATH_TYPE</key>
+						<integer>0</integer>
+						<key>PERMISSIONS</key>
+						<integer>493</integer>
+						<key>TYPE</key>
+						<integer>1</integer>
+						<key>UID</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>CHILDREN</key>
+						<array>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>GID</key>
+								<integer>0</integer>
+								<key>PATH</key>
+								<string>Shared</string>
+								<key>PATH_TYPE</key>
+								<integer>0</integer>
+								<key>PERMISSIONS</key>
+								<integer>1023</integer>
+								<key>TYPE</key>
+								<integer>1</integer>
+								<key>UID</key>
+								<integer>0</integer>
+							</dict>
+						</array>
+						<key>GID</key>
+						<integer>80</integer>
+						<key>PATH</key>
+						<string>Users</string>
+						<key>PATH_TYPE</key>
+						<integer>0</integer>
+						<key>PERMISSIONS</key>
+						<integer>493</integer>
+						<key>TYPE</key>
+						<integer>1</integer>
+						<key>UID</key>
+						<integer>0</integer>
+					</dict>
+				</array>
+				<key>GID</key>
+				<integer>0</integer>
+				<key>PATH</key>
+				<string>/</string>
+				<key>PATH_TYPE</key>
+				<integer>0</integer>
+				<key>PERMISSIONS</key>
+				<integer>493</integer>
+				<key>TYPE</key>
+				<integer>1</integer>
+				<key>UID</key>
+				<integer>0</integer>
+			</dict>
+			<key>PAYLOAD_TYPE</key>
+			<integer>0</integer>
+			<key>VERSION</key>
+			<integer>3</integer>
+		</dict>
+		<key>PACKAGE_SCRIPTS</key>
+		<dict>
+			<key>POSTINSTALL_PATH</key>
+			<dict>
+				<key>PATH</key>
+				<string>postinst.sh</string>
+				<key>PATH_TYPE</key>
+				<integer>1</integer>
+			</dict>
+			<key>PREINSTALL_PATH</key>
+			<dict>
+				<key>PATH</key>
+				<string>preinst.sh</string>
+				<key>PATH_TYPE</key>
+				<integer>1</integer>
+			</dict>
+			<key>RESOURCES</key>
+			<array/>
+		</dict>
+		<key>PACKAGE_SETTINGS</key>
+		<dict>
+			<key>AUTHENTICATION</key>
+			<integer>1</integer>
+			<key>CONCLUSION_ACTION</key>
+			<integer>0</integer>
+			<key>IDENTIFIER</key>
+			<string>com.zerotier.pkg.ZeroTierOne</string>
+			<key>OVERWRITE_PERMISSIONS</key>
+			<false/>
+			<key>VERSION</key>
+			<string>1.0.3</string>
+		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>
 			<key>NOTES</key>
@@ -723,206 +773,30 @@
 			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
 			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
 			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
-			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE1MDQuNzYiPgo8c3R5bGUg
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjEzNDcuNTciPgo8c3R5bGUg
 			dHlwZT0idGV4dC9jc3MiPgpwLnAxIHttYXJnaW46IDAuMHB4IDAu
-			MHB4IDAuMHB4IDAuMHB4OyBsaW5lLWhlaWdodDogMTQuMHB4OyBm
-			b250OiAxMi4wcHggSGVsdmV0aWNhOyBjb2xvcjogIzAwMDAwMDsg
-			LXdlYmtpdC10ZXh0LXN0cm9rZTogIzAwMDAwMH0Kc3Bhbi5zMSB7
-			Zm9udC1rZXJuaW5nOiBub25lfQo8L3N0eWxlPgo8L2hlYWQ+Cjxi
-			b2R5Pgo8cCBjbGFzcz0icDEiPjxzcGFuIGNsYXNzPSJzMSI+WmVy
-			b1RpZXIgT25lIC0gTmV0d29yayBWaXJ0dWFsaXphdGlvbiBFdmVy
-			eXdoZXJlPC9zcGFuPjwvcD4KPHAgY2xhc3M9InAxIj48c3BhbiBj
-			bGFzcz0iczEiPihjKTIwMTEtMjAxNyBaZXJvVGllciwgSW5jLjwv
-			c3Bhbj48L3A+CjxwIGNsYXNzPSJwMSI+PHNwYW4gY2xhc3M9InMx
-			Ij5jb250YWN0QHplcm90aWVyLmNvbTwvc3Bhbj48L3A+CjxwIGNs
-			YXNzPSJwMSI+PHNwYW4gY2xhc3M9InMxIj48YnI+Cjwvc3Bhbj48
-			L3A+CjxwIGNsYXNzPSJwMSI+PHNwYW4gY2xhc3M9InMxIj5UbyB1
-			bmluc3RhbGwgbWFudWFsbHksIHR5cGUgdGhlIGZvbGxvd2luZyBp
-			biBhIHRlcm1pbmFsIHdpbmRvdzo8L3NwYW4+PC9wPgo8cCBjbGFz
-			cz0icDEiPjxzcGFuIGNsYXNzPSJzMSI+PGJyPgo8L3NwYW4+PC9w
-			Pgo8cCBjbGFzcz0icDEiPjxzcGFuIGNsYXNzPSJzMSI+c3VkbyAi
-			L0xpYnJhcnkvQXBwbGljYXRpb24gU3VwcG9ydC9aZXJvVGllci9P
-			bmUvdW5pbnN0YWxsLnNoIjwvc3Bhbj48L3A+CjwvYm9keT4KPC9o
-			dG1sPgo=
+			MHB4IDAuMHB4IDAuMHB4OyBmb250OiAxMi4wcHggSGVsdmV0aWNh
+			OyBjb2xvcjogIzAwMDAwMDsgLXdlYmtpdC10ZXh0LXN0cm9rZTog
+			IzAwMDAwMH0Kc3Bhbi5zMSB7Zm9udC1rZXJuaW5nOiBub25lfQo8
+			L3N0eWxlPgo8L2hlYWQ+Cjxib2R5Pgo8cCBjbGFzcz0icDEiPjxz
+			cGFuIGNsYXNzPSJzMSI+WmVyb1RpZXIgT25lIC0gTmV0d29yayBW
+			aXJ0dWFsaXphdGlvbiBFdmVyeXdoZXJlPC9zcGFuPjwvcD4KPHAg
+			Y2xhc3M9InAxIj48c3BhbiBjbGFzcz0iczEiPihjKTIwMTEtMjAx
+			NSBaZXJvVGllciwgSW5jLjwvc3Bhbj48L3A+CjxwIGNsYXNzPSJw
+			MSI+PHNwYW4gY2xhc3M9InMxIj5jb250YWN0QHplcm90aWVyLmNv
+			bTwvc3Bhbj48L3A+CjxwIGNsYXNzPSJwMSI+PHNwYW4gY2xhc3M9
+			InMxIj48YnI+Cjwvc3Bhbj48L3A+CjxwIGNsYXNzPSJwMSI+PHNw
+			YW4gY2xhc3M9InMxIj5UbyB1bmluc3RhbGwgbWFudWFsbHksIHR5
+			cGUgdGhlIGZvbGxvd2luZyBpbiBhIHRlcm1pbmFsIHdpbmRvdzo8
+			L3NwYW4+PC9wPgo8cCBjbGFzcz0icDEiPjxzcGFuIGNsYXNzPSJz
+			MSI+PGJyPgo8L3NwYW4+PC9wPgo8cCBjbGFzcz0icDEiPjxzcGFu
+			IGNsYXNzPSJzMSI+c3VkbyAiL0xpYnJhcnkvQXBwbGljYXRpb24g
+			U3VwcG9ydC9aZXJvVGllci9PbmUvdW5pbnN0YWxsLnNoIjwvc3Bh
+			bj48L3A+CjwvYm9keT4KPC9odG1sPgo=
 			</data>
 		</dict>
-		<key>PROJECT_PRESENTATION</key>
-		<dict>
-			<key>BACKGROUND</key>
-			<dict>
-				<key>APPAREANCES</key>
-				<dict>
-					<key>DARK_AQUA</key>
-					<dict/>
-					<key>LIGHT_AQUA</key>
-					<dict/>
-				</dict>
-				<key>SHARED_SETTINGS_FOR_ALL_APPAREANCES</key>
-				<true/>
-			</dict>
-			<key>INSTALLATION TYPE</key>
-			<dict>
-				<key>HIERARCHIES</key>
-				<dict>
-					<key>INSTALLER</key>
-					<dict>
-						<key>LIST</key>
-						<array>
-							<dict>
-								<key>CHILDREN</key>
-								<array/>
-								<key>DESCRIPTION</key>
-								<array/>
-								<key>OPTIONS</key>
-								<dict>
-									<key>HIDDEN</key>
-									<false/>
-									<key>STATE</key>
-									<integer>1</integer>
-								</dict>
-								<key>PACKAGE_UUID</key>
-								<string>1B6AFC3A-9EA5-4401-83D4-37F06CD13CD6</string>
-								<key>TITLE</key>
-								<array/>
-								<key>TYPE</key>
-								<integer>0</integer>
-								<key>UUID</key>
-								<string>0FC7D07B-9BA9-4711-BB08-A05099C9E2B9</string>
-							</dict>
-						</array>
-						<key>REMOVED</key>
-						<dict/>
-					</dict>
-				</dict>
-				<key>MODE</key>
-				<integer>0</integer>
-			</dict>
-			<key>INSTALLATION_STEPS</key>
-			<array>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewIntroductionController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Introduction</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewReadMeController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>ReadMe</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewLicenseController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>License</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewDestinationSelectController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>TargetSelect</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewInstallationTypeController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>PackageSelection</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewInstallationController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Install</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-				<dict>
-					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
-					<string>ICPresentationViewSummaryController</string>
-					<key>INSTALLER_PLUGIN</key>
-					<string>Summary</string>
-					<key>LIST_TITLE_KEY</key>
-					<string>InstallerSectionTitle</string>
-				</dict>
-			</array>
-			<key>INTRODUCTION</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-			</dict>
-			<key>LICENSE</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-				<key>MODE</key>
-				<integer>0</integer>
-			</dict>
-			<key>README</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-			</dict>
-			<key>TITLE</key>
-			<dict>
-				<key>LOCALIZATIONS</key>
-				<array/>
-			</dict>
-		</dict>
-		<key>PROJECT_REQUIREMENTS</key>
-		<dict>
-			<key>LIST</key>
-			<array>
-				<dict>
-					<key>BEHAVIOR</key>
-					<integer>3</integer>
-					<key>DICTIONARY</key>
-					<dict>
-						<key>IC_REQUIREMENT_OS_DISK_TYPE</key>
-						<integer>0</integer>
-						<key>IC_REQUIREMENT_OS_DISTRIBUTION_TYPE</key>
-						<integer>0</integer>
-						<key>IC_REQUIREMENT_OS_MINIMUM_VERSION</key>
-						<integer>101300</integer>
-					</dict>
-					<key>IC_REQUIREMENT_CHECK_TYPE</key>
-					<integer>1</integer>
-					<key>IDENTIFIER</key>
-					<string>fr.whitebox.Packages.requirement.os</string>
-					<key>MESSAGE</key>
-					<array/>
-					<key>NAME</key>
-					<string>Operating System</string>
-					<key>STATE</key>
-					<true/>
-				</dict>
-			</array>
-			<key>RESOURCES</key>
-			<array/>
-			<key>ROOT_VOLUME_ONLY</key>
-			<false/>
-		</dict>
 		<key>PROJECT_SETTINGS</key>
 		<dict>
-			<key>ADVANCED_OPTIONS</key>
-			<dict>
-				<key>installer-script.options:hostArchitectures</key>
-				<array>
-					<string>x86_64,arm64</string>
-				</array>
-			</dict>
-			<key>BUILD_FORMAT</key>
-			<integer>0</integer>
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
@@ -1100,19 +974,10 @@
 			</array>
 			<key>NAME</key>
 			<string>ZeroTier One</string>
-			<key>PAYLOAD_ONLY</key>
-			<false/>
-			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
-			<false/>
 		</dict>
 	</dict>
-	<key>SHARED_GLOBAL_DATA</key>
-	<dict>
-		<key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
-		<string></string>
-	</dict>
 	<key>TYPE</key>
-	<integer>0</integer>
+	<integer>1</integer>
 	<key>VERSION</key>
 	<integer>2</integer>
 </dict>
diff --git a/ext/installfiles/mac/launch.sh b/ext/installfiles/mac/launch.sh
index ab274cbfb..41c4b9c8c 100755
--- a/ext/installfiles/mac/launch.sh
+++ b/ext/installfiles/mac/launch.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
-export PATH="/Library/Application Support/ZeroTier/One:/bin:/usr/bin:/sbin:/usr/sbin"
-/usr/bin/killall MacEthernetTapAgent >>/dev/null 2>&1
+
+zthome="/Library/Application Support/ZeroTier/One"
+export PATH="$zthome:/bin:/usr/bin:/sbin:/usr/sbin"
+
+# Launch ZeroTier One (not as daemon... launchd monitors it)
 exec zerotier-one
diff --git a/ext/installfiles/mac/postinst.sh b/ext/installfiles/mac/postinst.sh
index 707b46701..da15f9c84 100755
--- a/ext/installfiles/mac/postinst.sh
+++ b/ext/installfiles/mac/postinst.sh
@@ -2,50 +2,45 @@
 
 export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
 
+OSX_RELEASE=`sw_vers -productVersion | cut -d . -f 1,2`
+
+launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1
+sleep 1
+
 cd "/Library/Application Support/ZeroTier/One"
 
+if [ "$OSX_RELEASE" = "10.7" ]; then
+	# OSX 10.7 cannot use the new tap driver since the new way of kext signing
+	# is not backward compatible. Pull the old one for 10.7 users and replace.
+	# We use https to fetch and check hash as an extra added measure.
+	rm -f tap.kext.10_7.tar.gz
+	curl -s https://download.zerotier.com/tap.kext.10_7.tar.gz >tap.kext.10_7.tar.gz
+	if [ -s tap.kext.10_7.tar.gz -a "`shasum -a 256 tap.kext.10_7.tar.gz | cut -d ' ' -f 1`" = "e133d4832cef571621d3618f417381b44f51a76ed625089fb4e545e65d3ef2a9" ]; then
+		rm -rf tap.kext
+		tar -xzf tap.kext.10_7.tar.gz
+	fi
+	rm -f tap.kext.10_7.tar.gz
+fi
+
+rm -rf node.log node.log.old root-topology shutdownIfUnreadable autoupdate.log updates.d
+chown -R 0 tap.kext
+chgrp -R 0 tap.kext
 if [ ! -f authtoken.secret ]; then
-	head -c 1024 /dev/urandom | md5 | head -c 24 >authtoken.secret
+	head -c 4096 /dev/urandom | md5 | head -c 24 >authtoken.secret
 	chown 0 authtoken.secret
 	chgrp 0 authtoken.secret
 	chmod 0600 authtoken.secret
 fi
-
-if [ -f zerotier-one.pid ]; then
-	kill `cat zerotier-one.pid`
-	sleep 1
-	killall MacEthernetTapAgent
-	sleep 1
-	killall -9 MacEthernetTapAgent
-	sleep 1
-	if [ -f zerotier-one.pid ]; then
-		kill -9 `cat zerotier-one.pid`
-		rm -f zerotier-one.pid
-	fi
-fi
-launchctl load /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1
-sleep 1
-
 rm -f zerotier-cli zerotier-idtool
 ln -sf zerotier-one zerotier-cli
 ln -sf zerotier-one zerotier-idtool
-if [ ! -d /usr/local/bin ]; then
-	mkdir -p /usr/local/bin
-fi
+
+mkdir -p /usr/local/bin
 cd /usr/local/bin
 rm -f zerotier-cli zerotier-idtool
 ln -sf "/Library/Application Support/ZeroTier/One/zerotier-one" zerotier-cli
 ln -sf "/Library/Application Support/ZeroTier/One/zerotier-one" zerotier-idtool
 
-if [ -f /tmp/zt1-gui-restart.tmp ]; then
-	for u in `cat /tmp/zt1-gui-restart.tmp`; do
-		if [ -f '/Applications/ZeroTier One.app/Contents/MacOS/ZeroTier One' ]; then
-			su $u -c '/usr/bin/open /Applications/ZeroTier\ One.app &' >>/dev/null 2>&1 &
-		else
-			su $u -c '/usr/bin/open /Applications/ZeroTier.app &' >>/dev/null 2>&1 &
-		fi
-	done
-fi
-rm -f /tmp/zt1-gui-restart.tmp
+launchctl load /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1
 
 exit 0
diff --git a/ext/installfiles/mac/preinst.sh b/ext/installfiles/mac/preinst.sh
index d2df6a3a8..c2cb494b1 100755
--- a/ext/installfiles/mac/preinst.sh
+++ b/ext/installfiles/mac/preinst.sh
@@ -2,38 +2,25 @@
 
 export PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
-rm -f /tmp/zt1-gui-restart.tmp
-for i in `ps axuwww | tr -s ' ' ',' | grep -F '/Applications/ZeroTier,One.app' | grep -F -v grep | cut -d , -f 1,2 | xargs`; do
-	u=`echo $i | cut -d , -f 1`
-	p=`echo $i | cut -d , -f 2`
-	if [ ! -z "$u" -a "0$p" -gt 0 ]; then
-		kill $p >>/dev/null 2>&1
-		sleep 0.5
-		kill -9 $p >>/dev/null 2>&1
-		echo "$u" >>/tmp/zt1-gui-restart.tmp
+if [ -f /Library/LaunchDaemons/com.zerotier.one.plist ]; then
+	launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1
+fi
+
+sleep 1
+
+if [ -d "/Library/Application Support/ZeroTier/One" ]; then
+	cd "/Library/Application Support/ZeroTier/One"
+	if [ -f "zerotier-one.pid" ]; then
+		ztpid=`cat zerotier-one.pid`
+		if [ "$ztpid" -gt "0" ]; then
+			kill `cat zerotier-one.pid`
+		fi
 	fi
-done
-for i in `ps axuwww | tr -s ' ' ',' | grep -F '/Applications/ZeroTier.app' | grep -F -v grep | cut -d , -f 1,2 | xargs`; do
-	u=`echo $i | cut -d , -f 1`
-	p=`echo $i | cut -d , -f 2`
-	if [ ! -z "$u" -a "0$p" -gt 0 ]; then
-		kill $p >>/dev/null 2>&1
-		sleep 0.5
-		kill -9 $p >>/dev/null 2>&1
-		echo "$u" >>/tmp/zt1-gui-restart.tmp
-	fi
-done
-chmod 0600 /tmp/zt1-gui-restart.tmp
+fi
+
+sleep 1
 
 cd "/Applications"
 rm -rf "ZeroTier One.app"
-rm -rf "ZeroTier.app"
-
-if [ -d '/Library/Application Support/ZeroTier/One' ]; then
-	cd '/Library/Application Support/ZeroTier/One'
-	# ensure that file locking doesn't cause issues with replacing the binary
-	rm -f zerotier-one
-	rm -f MacEthernetTapAgent
-fi
 
 exit 0
diff --git a/ext/installfiles/mac/uninstall.sh b/ext/installfiles/mac/uninstall.sh
index 4b6abe13a..d1effb933 100755
--- a/ext/installfiles/mac/uninstall.sh
+++ b/ext/installfiles/mac/uninstall.sh
@@ -21,16 +21,20 @@ killall -TERM zerotier-one >>/dev/null 2>&1
 sleep 1
 killall -KILL zerotier-one >>/dev/null 2>&1
 
+echo "Making sure kext is unloaded..."
+kextunload '/Library/Application Support/ZeroTier/One/tap.kext' >>/dev/null 2>&1
+
 echo "Removing ZeroTier One files..."
 
 rm -rf '/Applications/ZeroTier One.app'
-rm -rf '/Applications/ZeroTier.app'
-rm -f '/usr/local/bin/zerotier-one' '/usr/local/bin/zerotier-idtool' '/usr/local/bin/zerotier-cli' '/Library/LaunchDaemons/com.zerotier.one.plist'
-
-cd '/Library/Application Support/ZeroTier/One'
-if [ "`pwd`" = '/Library/Application Support/ZeroTier/One' ]; then
-	rm -rf *.d *.sh *.log *.old *.kext *.conf *.pkg *.dmg *.pid *.port *.save *.bin planet zerotier-* devicemap
-fi
+rm -f '/usr/bin/zerotier-one' '/usr/bin/zerotier-idtool' '/usr/bin/zerotier-cli' '/Library/LaunchDaemons/com.zerotier.one.plist'
+mkdir -p /tmp/ZeroTierOne_uninstall_tmp
+cp "/Library/Application Support/ZeroTier/One/*.secret" /tmp/ZeroTierOne_uninstall_tmp
+rm -rf '/Library/Application Support/ZeroTier/One'
+mkdir -p '/Library/Application Support/ZeroTier/One'
+cp "/tmp/ZeroTierOne_uninstall_tmp/*.secret" '/Library/Application Support/ZeroTier/One'
+chmod 0600 "/Library/Application Support/ZeroTier/One/*.secret"
+rm -rf /tmp/ZeroTierOne_uninstall_tmp
 
 echo 'Uninstall complete.'
 echo
diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip
index 3c3d6a417..a10cb1e55 100644
--- a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip	
+++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip	
@@ -1,187 +1,156 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="12.0" version="17.6" Modules="enterprise" RootPath="." Language="en" Id="{4070644B-EC9F-4962-B14A-770B9E309DC3}">
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
-    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
-    <ROW Property="ALLUSERS" Value="1"/>
-    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
-    <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
-    <ROW Property="ARPNOREPAIR" Value="1"/>
-    <ROW Property="ARPPRODUCTICON" Value="ZeroTierIcon.exe" Type="8"/>
-    <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
-    <ROW Property="ARPURLINFOABOUT" Value="https://www.zerotier.com/"/>
-    <ROW Property="LIMITUI" MultiBuildValue="DefaultBuild:1"/>
-    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
-    <ROW Property="Manufacturer" Value="ZeroTier"/>
-    <ROW Property="ProductCode" Value="1033:{272B1192-65BE-4BDE-894B-6D3AD8BF7FD2} " Type="16"/>
-    <ROW Property="ProductLanguage" Value="1033"/>
-    <ROW Property="ProductName" Value="ZeroTier One Virtual Network Port"/>
-    <ROW Property="ProductVersion" Value="1.0.1" Type="32"/>
-    <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
-    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
-    <ROW Property="UpgradeCode" Value="{88AA80DE-14CA-4443-B024-6EC13F3EDDAD}"/>
-    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT50" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT50Display" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT5X" MultiBuildValue="DefaultBuild:Windows XP/2003" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT5XDisplay" MultiBuildValue="DefaultBuild:Windows XP/2003" ValueLocId="-"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
-    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
-    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
-    <ROW Directory="TempFolder" Directory_Parent="TARGETDIR" DefaultDir="TEMPFO~1|TempFolder" IsPseudoRoot="1" DirectoryOptions="3"/>
-    <ROW Directory="zttap300_Dir" Directory_Parent="APPDIR" DefaultDir="zttap300"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
-    <ROW Component="APPDIR" ComponentId="{49E24790-69C7-44A5-A881-788C34464D73}" Directory_="APPDIR" Attributes="0"/>
-    <ROW Component="ProductInformation" ComponentId="{FFBF63D7-E03E-4ACA-966A-824C3DF6DEED}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
-    <ROW Component="certutil.exe" ComponentId="{675B9939-A983-4E36-A852-54FB122599B1}" Directory_="zttap300_Dir" Attributes="256" KeyPath="certutil.exe"/>
-    <ROW Component="zttap300.cer" ComponentId="{D72CCDC6-1947-4FE1-9DBA-ECE0A024C1A3}" Directory_="zttap300_Dir" Attributes="0" KeyPath="zttap300.cer" Type="0"/>
-    <ROW Component="zttap300.cer_1" ComponentId="{939B64E0-7725-434B-93FE-B1C30940929E}" Directory_="TempFolder" Attributes="0" KeyPath="zttap300.cer_1" Type="0"/>
-    <ROW Component="zttap300.inf_2" ComponentId="{CB0C4519-617F-4DB5-9BF5-C6CFC6573F9C}" Directory_="zttap300_Dir" Attributes="256" Condition="VersionNT64" KeyPath="zttap300.inf"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ROW Feature="zttap300" Feature_Parent="MainFeature" Title="zttap300" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
-    <ROW File="zttap300.inf" Component_="zttap300.inf_2" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.inf" SelfReg="false"/>
-    <ROW File="zttap300.sys" Component_="zttap300.inf_2" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.sys" SelfReg="false"/>
-    <ROW File="zttap300.cat" Component_="zttap300.inf_2" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.cat" SelfReg="false"/>
-    <ROW File="zttap300.cer" Component_="zttap300.cer" FileName="zttap300.cer" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\zttap300.cer" SelfReg="false"/>
-    <ROW File="certutil.exe" Component_="certutil.exe" FileName="certutil.exe" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\certutil.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zttap300.cer_1" Component_="zttap300.cer_1" FileName="zttap300.cer" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\zttap300.cer" SelfReg="false"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.custcomp.AiInstallExecuteSequenceAliasComponent">
-    <ROW AliasRowId="certutil.exe" AliasRowOperation="2" Sequence="4001"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
-    <ROW BootstrOptKey="GlobalOptions" GeneralOptions="q" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="1" PackageFolder="..\..\.." PackageFileName="ZeroTierOne_NDIS6_x64" Languages="en" InstallationType="4" UseLargeSchema="true" MsiPackageType="x64"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
-    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
-    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="5" UseSha256="1" KVTenantId="5300bf3b-0eff-4a5f-a63f-821e22ed1730" KVAppId="5f94d77e-b795-41fd-afe7-ec913b03c1d3" KVName="ZeroTier-CS" KVCertName="ZT-EV-CS" KVCertVersion="442c2d6f77874ff99eed4b36f5cb401c"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
-    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
-    <ROW Fragment="FolderDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\FolderDlg.aip"/>
-    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
-    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
-    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
-    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
-    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
-    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
-    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
-    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
-    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
-    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
-    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiConditionComponent">
-    <ROW Feature_="zttap300" Level="0" Condition="((VersionNT &lt; 500) OR (NOT VersionNT))"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
-    <ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="201"/>
-    <ROW Dialog_="FolderDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="197"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="201"/>
-    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
-    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
-    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
-    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
-    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
-    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
-    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
-    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
-    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
-    <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
-    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
-    <ROW Action="AI_EnableDebugLog" Type="321" Source="aicustact.dll" Target="EnableDebugLog"/>
-    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
-    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH" Target="[AI_SETUPEXEPATH_ORIGINAL]"/>
-    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
-    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
-    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
-    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
-    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFiles64Folder][Manufacturer]\[ProductName]"/>
-    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
-    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
-    <ROW Action="certutil.exe" Type="3154" Source="certutil.exe" Target="-addstore -f TrustedPublisher [#zttap300.cer_1]"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiDriverPackagesComponent">
-    <ROW InfFileName="zttap300.inf" Flags="15"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatCompsComponent">
-    <ROW Feature_="MainFeature" Component_="ProductInformation"/>
-    <ROW Feature_="MainFeature" Component_="certutil.exe"/>
-    <ROW Feature_="MainFeature" Component_="zttap300.cer"/>
-    <ROW Feature_="MainFeature" Component_="zttap300.cer_1"/>
-    <ROW Feature_="zttap300" Component_="zttap300.inf_2"/>
-    <ROW Feature_="MainFeature" Component_="APPDIR"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
-    <ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
-    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
-    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/>
-    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="54"/>
-    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
-    <ROW Action="certutil.exe" Condition="( NOT Installed )" Sequence="6401"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
-    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
-    <ROW Action="AI_DpiContentScale" Sequence="52"/>
-    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
-    <ROW Condition="((VersionNT &lt;&gt; 501) AND (VersionNT &lt;&gt; 502))" Description="[ProductName] cannot be installed on [WindowsTypeNT5XDisplay]." DescriptionLocId="AI.LaunchCondition.NoNT5X" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT40Display]" DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 500)" Description="[ProductName] cannot be installed on [WindowsTypeNT50Display]." DescriptionLocId="AI.LaunchCondition.NoNT50" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="Privileged" Description="[ProductName] requires administrative privileges to install." DescriptionLocId="AI.LaunchCondition.Privileged" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
-    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
-    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
-    <ATTRIBUTE name="UsedTheme" value="classic"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
-    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
-    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
-  </COMPONENT>
-</DOCUMENT>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DOCUMENT Type="Advanced Installer" CreateVersion="12.0" version="12.3.1" Modules="enterprise" RootPath="." Language="en" Id="{4070644B-EC9F-4962-B14A-770B9E309DC3}">
+  <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
+    <ROW Name="HiddenItems" Value="UpdaterComponent;SerValComponent;AutorunComponent;MultipleInstancesComponent;MsiJavaComponent;MsiRegsComponent;MsiExtComponent;MsiAssemblyComponent;MsiServInstComponent;AnalyticsComponent;ActSyncAppComponent;MsiMergeModsComponent;MsiThemeComponent;BackgroundImagesComponent;DictionaryComponent;MsiEnvComponent;ScheduledTasksComponent;CPLAppletComponent;GameUxComponent;FirewallExceptionComponent;UserAccountsComponent;MsiClassComponent;WebApplicationsComponent;MsiOdbcDataSrcComponent;SqlConnectionComponent;SharePointSlnComponent;SilverlightSlnComponent;MsiAppSearchComponent"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
+    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
+    <ROW Property="ALLUSERS" Value="1"/>
+    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
+    <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
+    <ROW Property="ARPNOREPAIR" Value="1"/>
+    <ROW Property="ARPPRODUCTICON" Value="ZeroTierIcon.exe" Type="8"/>
+    <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
+    <ROW Property="ARPURLINFOABOUT" Value="https://www.zerotier.com/"/>
+    <ROW Property="LIMITUI" MultiBuildValue="DefaultBuild:1"/>
+    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
+    <ROW Property="Manufacturer" Value="ZeroTier"/>
+    <ROW Property="ProductCode" Value="1033:{D7093B7A-71BA-484B-A27C-59ACDAD2206F} " Type="16"/>
+    <ROW Property="ProductLanguage" Value="1033"/>
+    <ROW Property="ProductName" Value="ZeroTier One Virtual Network Port"/>
+    <ROW Property="ProductVersion" Value="1.0.0" Type="32"/>
+    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
+    <ROW Property="UpgradeCode" Value="{88AA80DE-14CA-4443-B024-6EC13F3EDDAD}"/>
+    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT" MultiBuildValue="DefaultBuild:Windows 2000, Windows 2000 Service Pack 1, Windows 2000 Service Pack 2, Windows 2000 Service Pack 3, Windows 2000 Service Pack 4, Windows XP x86, Windows XP x86 Service Pack 1, Windows XP x86 Service Pack 2, Windows XP x86 Service Pack 3, Windows Server 2003 x86, Windows Server 2003 x86 Service Pack 1, Windows Server 2003 x86 Service Pack 2" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT64" MultiBuildValue="DefaultBuild:Windows XP x64, Windows XP x64 Service Pack 1, Windows XP x64 Service Pack 2, Windows Server 2003 x64, Windows Server 2003 x64 Service Pack 1, Windows Server 2003 x64 Service Pack 2" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT64Display" MultiBuildValue="DefaultBuild:Windows XP x64, Windows Server 2003 x64" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNTDisplay" MultiBuildValue="DefaultBuild:Windows 2000, Windows XP x86, Windows Server 2003 x86" ValueLocId="-"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
+    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
+    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
+    <ROW Directory="zttap300_Dir" Directory_Parent="APPDIR" DefaultDir="zttap300"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
+    <ROW Component="ProductInformation" ComponentId="{FFBF63D7-E03E-4ACA-966A-824C3DF6DEED}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
+    <ROW Component="zttap300.inf_2" ComponentId="{CB0C4519-617F-4DB5-9BF5-C6CFC6573F9C}" Directory_="zttap300_Dir" Attributes="256" Condition="VersionNT64" KeyPath="zttap300.inf"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="ProductInformation"/>
+    <ROW Feature="zttap300" Feature_Parent="MainFeature" Title="zttap300" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="zttap300.inf_2"/>
+    <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
+    <ROW File="zttap300.cat" Component_="zttap300.inf_2" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.cat" SelfReg="false"/>
+    <ROW File="zttap300.inf" Component_="zttap300.inf_2" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.inf" SelfReg="false" NextFile="zttap300.sys"/>
+    <ROW File="zttap300.sys" Component_="zttap300.inf_2" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.sys" SelfReg="false" NextFile="zttap300.cat"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="1" PackageFolder="..\..\.." PackageFileName="ZeroTierOne_NDIS6_x64" Languages="en" InstallationType="4" UseLargeSchema="true" MsiPackageType="x64"/>
+    <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
+    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
+    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
+    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="2ad023dc7aa92bf4265b33852a2ed2406d2bee86 Subject: ZeroTier Networks LLC&#10;Issuer: DigiCert High Assurance Code Signing CA-1&#10;Valid from 04/24/2015 to 04/01/2016"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
+    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
+    <ROW Fragment="FolderDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\FolderDlg.aip"/>
+    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
+    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
+    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
+    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
+    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
+    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
+    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
+    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
+    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
+    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
+    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiConditionComponent">
+    <ROW Feature_="zttap300" Level="0" Condition="((VersionNT &lt; 500) OR (NOT VersionNT))"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="201"/>
+    <ROW Dialog_="FolderDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="197"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="201"/>
+    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
+    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
+    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
+    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
+    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
+    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
+    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
+    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
+    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
+    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
+    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFiles64Folder][Manufacturer]\[ProductName]"/>
+    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
+    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiDriverPackagesComponent">
+    <ROW InfFileName="zttap300.inf" Flags="6"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
+    <ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
+    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
+    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="51"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="52"/>
+    <ROW Action="AI_DpiContentScale" Sequence="51"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
+    <ROW Condition="( Version9X OR ( NOT VersionNT64 ) OR ( VersionNT64 AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &gt;= 1)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &lt;&gt; 1)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &lt;&gt; 2)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &gt;= 1)))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &lt;&gt; 1)))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &lt;&gt; 2)))) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT64Display]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT64" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="( Version9X OR VersionNT64 OR ( VersionNT AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &gt;= 1))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 1))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 2))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 3))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 4))) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &gt;= 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 2))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 3))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &gt;= 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &lt;&gt; 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &lt;&gt; 2))) OR VersionNT64) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNTDisplay]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT40Display]" DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="Privileged" Description="[ProductName] requires administrative privileges to install." DescriptionLocId="AI.LaunchCondition.Privileged" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
+    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
+    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
+    <ATTRIBUTE name="UsedTheme" value="classic"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
+  </COMPONENT>
+</DOCUMENT>
diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip
index 50d5f5575..831516d93 100644
--- a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip	
+++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x86).aip	
@@ -1,188 +1,157 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="12.0" version="17.6" Modules="enterprise" RootPath="." Language="en" Id="{4070644B-EC9F-4962-B14A-770B9E309DC3}">
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
-    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
-    <ROW Property="ALLUSERS" Value="1"/>
-    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
-    <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
-    <ROW Property="ARPNOREPAIR" Value="1"/>
-    <ROW Property="ARPPRODUCTICON" Value="ZeroTierIcon.exe" Type="8"/>
-    <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
-    <ROW Property="ARPURLINFOABOUT" Value="https://www.zerotier.com/"/>
-    <ROW Property="AiFeatIcozttap300" Value="ZeroTierIcon.exe" Type="8"/>
-    <ROW Property="LIMITUI" MultiBuildValue="DefaultBuild:1"/>
-    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
-    <ROW Property="Manufacturer" Value="ZeroTier"/>
-    <ROW Property="ProductCode" Value="1033:{AB7A3645-54C9-4A73-80DE-EC33669EA0C9} " Type="16"/>
-    <ROW Property="ProductLanguage" Value="1033"/>
-    <ROW Property="ProductName" Value="ZeroTier Virtual Network Port"/>
-    <ROW Property="ProductVersion" Value="1.0.1" Type="32"/>
-    <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
-    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
-    <ROW Property="UpgradeCode" Value="{88AA80DE-14CA-4443-B024-6EC13F3EDDAD}"/>
-    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT50" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT50Display" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT5X" MultiBuildValue="DefaultBuild:Windows XP/2003" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT5XDisplay" MultiBuildValue="DefaultBuild:Windows XP/2003" ValueLocId="-"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
-    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
-    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
-    <ROW Directory="TempFolder" Directory_Parent="TARGETDIR" DefaultDir="TEMPFO~1|TempFolder" IsPseudoRoot="1" DirectoryOptions="3"/>
-    <ROW Directory="zttap300_Dir" Directory_Parent="APPDIR" DefaultDir="zttap300"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
-    <ROW Component="APPDIR" ComponentId="{91213EC2-D3A0-405C-867E-D89DDAA34D26}" Directory_="APPDIR" Attributes="0"/>
-    <ROW Component="ProductInformation" ComponentId="{FFBF63D7-E03E-4ACA-966A-824C3DF6DEED}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
-    <ROW Component="certutil.exe" ComponentId="{716192EC-038F-4CB7-9E85-689904DFA5A7}" Directory_="zttap300_Dir" Attributes="256" KeyPath="certutil.exe"/>
-    <ROW Component="zttap300.cer" ComponentId="{38822503-75B2-4D81-8F48-76F776CA921D}" Directory_="zttap300_Dir" Attributes="0" KeyPath="zttap300.cer" Type="0"/>
-    <ROW Component="zttap300.cer_1" ComponentId="{E26B4B86-5B0F-45B7-9B07-4AE5D6FF4F13}" Directory_="TempFolder" Attributes="0" KeyPath="zttap300.cer_1" Type="0"/>
-    <ROW Component="zttap300.inf_1" ComponentId="{07119034-A51F-4871-B503-09D1340FF248}" Directory_="zttap300_Dir" Attributes="0" Condition="(VersionNT &gt;= 500) AND NOT VersionNT64" KeyPath="zttap300.inf"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ROW Feature="zttap300" Feature_Parent="MainFeature" Title="zttap300" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
-    <ROW File="zttap300.inf" Component_="zttap300.inf_1" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.inf" SelfReg="false"/>
-    <ROW File="zttap300.sys" Component_="zttap300.inf_1" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.sys" SelfReg="false"/>
-    <ROW File="zttap300.cat" Component_="zttap300.inf_1" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.cat" SelfReg="false"/>
-    <ROW File="certutil.exe" Component_="certutil.exe" FileName="certutil.exe" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\certutil.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zttap300.cer" Component_="zttap300.cer" FileName="zttap300.cer" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\zttap300.cer" SelfReg="false"/>
-    <ROW File="zttap300.cer_1" Component_="zttap300.cer_1" FileName="zttap300.cer" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\zttap300.cer" SelfReg="false"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.custcomp.AiInstallExecuteSequenceAliasComponent">
-    <ROW AliasRowId="certutil.exe" AliasRowOperation="2" Sequence="4001"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
-    <ROW BootstrOptKey="GlobalOptions" GeneralOptions="q" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="1" PackageFolder="..\..\.." PackageFileName="ZeroTierOne_NDIS6_x86" Languages="en" InstallationType="4" UseLargeSchema="true"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
-    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
-    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="5" UseSha256="1" KVTenantId="5300bf3b-0eff-4a5f-a63f-821e22ed1730" KVAppId="5f94d77e-b795-41fd-afe7-ec913b03c1d3" KVName="ZeroTier-CS" KVCertName="ZT-EV-CS" KVCertVersion="442c2d6f77874ff99eed4b36f5cb401c"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
-    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
-    <ROW Fragment="FolderDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\FolderDlg.aip"/>
-    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
-    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
-    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
-    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
-    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
-    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
-    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
-    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
-    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
-    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
-    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiConditionComponent">
-    <ROW Feature_="zttap300" Level="0" Condition="((VersionNT &lt; 500) OR (NOT VersionNT))"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
-    <ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="201"/>
-    <ROW Dialog_="FolderDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="197"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="201"/>
-    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
-    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
-    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
-    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
-    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
-    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
-    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
-    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
-    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
-    <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
-    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
-    <ROW Action="AI_EnableDebugLog" Type="321" Source="aicustact.dll" Target="EnableDebugLog"/>
-    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
-    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH" Target="[AI_SETUPEXEPATH_ORIGINAL]"/>
-    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
-    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
-    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
-    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
-    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]"/>
-    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
-    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
-    <ROW Action="certutil.exe" Type="3154" Source="certutil.exe" Target="-addstore -f TrustedPublisher [#zttap300.cer_1]"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiDriverPackagesComponent">
-    <ROW InfFileName="zttap300.inf" Flags="15"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatCompsComponent">
-    <ROW Feature_="MainFeature" Component_="ProductInformation"/>
-    <ROW Feature_="MainFeature" Component_="certutil.exe"/>
-    <ROW Feature_="MainFeature" Component_="zttap300.cer"/>
-    <ROW Feature_="MainFeature" Component_="zttap300.cer_1"/>
-    <ROW Feature_="zttap300" Component_="zttap300.inf_1"/>
-    <ROW Feature_="MainFeature" Component_="APPDIR"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
-    <ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
-    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
-    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/>
-    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="54"/>
-    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
-    <ROW Action="certutil.exe" Condition="( NOT Installed )" Sequence="6401"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
-    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
-    <ROW Action="AI_DpiContentScale" Sequence="52"/>
-    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
-    <ROW Condition="((VersionNT &lt;&gt; 501) AND (VersionNT &lt;&gt; 502))" Description="[ProductName] cannot be installed on [WindowsTypeNT5XDisplay]." DescriptionLocId="AI.LaunchCondition.NoNT5X" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT40Display]" DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 500)" Description="[ProductName] cannot be installed on [WindowsTypeNT50Display]." DescriptionLocId="AI.LaunchCondition.NoNT50" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="Privileged" Description="[ProductName] requires administrative privileges to install." DescriptionLocId="AI.LaunchCondition.Privileged" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
-    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
-    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
-    <ATTRIBUTE name="UsedTheme" value="classic"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
-    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
-    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
-  </COMPONENT>
-</DOCUMENT>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DOCUMENT Type="Advanced Installer" CreateVersion="12.0" version="12.3.1" Modules="enterprise" RootPath="." Language="en" Id="{4070644B-EC9F-4962-B14A-770B9E309DC3}">
+  <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
+    <ROW Name="HiddenItems" Value="UpdaterComponent;SerValComponent;AutorunComponent;MultipleInstancesComponent;MsiJavaComponent;MsiRegsComponent;MsiExtComponent;MsiAssemblyComponent;MsiServInstComponent;AnalyticsComponent;ActSyncAppComponent;MsiMergeModsComponent;MsiThemeComponent;BackgroundImagesComponent;DictionaryComponent;MsiEnvComponent;ScheduledTasksComponent;CPLAppletComponent;GameUxComponent;FirewallExceptionComponent;UserAccountsComponent;MsiClassComponent;WebApplicationsComponent;MsiOdbcDataSrcComponent;SqlConnectionComponent;SharePointSlnComponent;SilverlightSlnComponent;MsiAppSearchComponent"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
+    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
+    <ROW Property="ALLUSERS" Value="1"/>
+    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
+    <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
+    <ROW Property="ARPNOREPAIR" Value="1"/>
+    <ROW Property="ARPPRODUCTICON" Value="ZeroTierIcon.exe" Type="8"/>
+    <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
+    <ROW Property="ARPURLINFOABOUT" Value="https://www.zerotier.com/"/>
+    <ROW Property="AiFeatIcozttap300" Value="ZeroTierIcon.exe" Type="8"/>
+    <ROW Property="LIMITUI" MultiBuildValue="DefaultBuild:1"/>
+    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
+    <ROW Property="Manufacturer" Value="ZeroTier"/>
+    <ROW Property="ProductCode" Value="1033:{6223AB10-D6CD-4580-B357-91CCD7F355D2} " Type="16"/>
+    <ROW Property="ProductLanguage" Value="1033"/>
+    <ROW Property="ProductName" Value="ZeroTier One Virtual Network Port"/>
+    <ROW Property="ProductVersion" Value="1.0.0" Type="32"/>
+    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
+    <ROW Property="UpgradeCode" Value="{88AA80DE-14CA-4443-B024-6EC13F3EDDAD}"/>
+    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT" MultiBuildValue="DefaultBuild:Windows 2000, Windows 2000 Service Pack 1, Windows 2000 Service Pack 2, Windows 2000 Service Pack 3, Windows 2000 Service Pack 4, Windows XP x86, Windows XP x86 Service Pack 1, Windows XP x86 Service Pack 2, Windows XP x86 Service Pack 3, Windows Server 2003 x86, Windows Server 2003 x86 Service Pack 1, Windows Server 2003 x86 Service Pack 2" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT64" MultiBuildValue="DefaultBuild:Windows XP x64, Windows XP x64 Service Pack 1, Windows XP x64 Service Pack 2, Windows Server 2003 x64, Windows Server 2003 x64 Service Pack 1, Windows Server 2003 x64 Service Pack 2" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT64Display" MultiBuildValue="DefaultBuild:Windows XP x64, Windows Server 2003 x64" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNTDisplay" MultiBuildValue="DefaultBuild:Windows 2000, Windows XP x86, Windows Server 2003 x86" ValueLocId="-"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
+    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
+    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
+    <ROW Directory="zttap300_Dir" Directory_Parent="APPDIR" DefaultDir="zttap300"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
+    <ROW Component="ProductInformation" ComponentId="{FFBF63D7-E03E-4ACA-966A-824C3DF6DEED}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
+    <ROW Component="zttap300.inf_1" ComponentId="{07119034-A51F-4871-B503-09D1340FF248}" Directory_="zttap300_Dir" Attributes="0" Condition="(VersionNT &gt;= 500) AND NOT VersionNT64" KeyPath="zttap300.inf"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="ProductInformation"/>
+    <ROW Feature="zttap300" Feature_Parent="MainFeature" Title="zttap300" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="zttap300.inf_1"/>
+    <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
+    <ROW File="zttap300.cat" Component_="zttap300.inf_1" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.cat" SelfReg="false"/>
+    <ROW File="zttap300.inf" Component_="zttap300.inf_1" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.inf" SelfReg="false" NextFile="zttap300.sys"/>
+    <ROW File="zttap300.sys" Component_="zttap300.inf_1" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.sys" SelfReg="false" NextFile="zttap300.cat"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="1" PackageFolder="..\..\.." PackageFileName="ZeroTierOne_NDIS6_x86" Languages="en" InstallationType="4" UseLargeSchema="true"/>
+    <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
+    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
+    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
+    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="2ad023dc7aa92bf4265b33852a2ed2406d2bee86 Subject: ZeroTier Networks LLC&#10;Issuer: DigiCert High Assurance Code Signing CA-1&#10;Valid from 04/24/2015 to 04/01/2016"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
+    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
+    <ROW Fragment="FolderDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\FolderDlg.aip"/>
+    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
+    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
+    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
+    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
+    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
+    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
+    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
+    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
+    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
+    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
+    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiConditionComponent">
+    <ROW Feature_="zttap300" Level="0" Condition="((VersionNT &lt; 500) OR (NOT VersionNT))"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="201"/>
+    <ROW Dialog_="FolderDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="197"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="201"/>
+    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
+    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
+    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
+    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
+    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
+    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
+    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
+    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
+    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
+    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
+    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]"/>
+    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
+    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiDriverPackagesComponent">
+    <ROW InfFileName="zttap300.inf" Flags="6"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
+    <ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
+    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
+    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="51"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="52"/>
+    <ROW Action="AI_DpiContentScale" Sequence="51"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
+    <ROW Condition="( Version9X OR ( NOT VersionNT64 ) OR ( VersionNT64 AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &gt;= 1)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &lt;&gt; 1)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &lt;&gt; 2)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &gt;= 1)))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &lt;&gt; 1)))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &lt;&gt; 2)))) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT64Display]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT64" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="( Version9X OR VersionNT64 OR ( VersionNT AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &gt;= 1))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 1))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 2))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 3))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 4))) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &gt;= 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 2))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 3))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &gt;= 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &lt;&gt; 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &lt;&gt; 2))) OR VersionNT64) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNTDisplay]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT40Display]" DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="Privileged" Description="[ProductName] requires administrative privileges to install." DescriptionLocId="AI.LaunchCondition.Privileged" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
+    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
+    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
+    <ATTRIBUTE name="UsedTheme" value="classic"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
+  </COMPONENT>
+</DOCUMENT>
diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip
index 3066eb788..d8a99c3db 100644
--- a/ext/installfiles/windows/ZeroTier One.aip	
+++ b/ext/installfiles/windows/ZeroTier One.aip	
@@ -1,545 +1,368 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="22.8" Modules="enterprise" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}">
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
-    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
-    <ROW Property="AI_EXTERNALUIUNINSTALLERNAME" MultiBuildValue="DefaultBuild:aiui"/>
-    <ROW Property="AI_FINDEXE_TITLE" Value="Select the installation package for [|ProductName]" ValueLocId="AI.Property.FindExeTitle"/>
-    <ROW Property="AI_PREREQ_REPAIR_ENABLED" MultiBuildValue="ExeBuild:1"/>
-    <ROW Property="AI_PRODUCTNAME_ARP" Value="ZeroTier One"/>
-    <ROW Property="AI_ThemeStyle" Value="aero" MsiKey="AI_ThemeStyle"/>
-    <ROW Property="AI_UNINSTALLER" Value="msiexec.exe"/>
-    <ROW Property="ALLUSERS" Value="1"/>
-    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]."/>
-    <ROW Property="ARPCONTACT" Value="contact@zerotier.com"/>
-    <ROW Property="ARPHELPLINK" Value="https://www.zerotier.com/"/>
-    <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
-    <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="ExeBuild:1"/>
-    <ROW Property="ARPPRODUCTICON" Value="ZeroTierIcon.exe" Type="8"/>
-    <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
-    <ROW Property="ARPURLINFOABOUT" Value="https://www.zerotier.com/"/>
-    <ROW Property="ARPURLUPDATEINFO" Value="https://www.zerotier.com/"/>
-    <ROW Property="AiFeatIcoZeroTierOne" Value="ZeroTierIcon.exe" Type="8"/>
-    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
-    <ROW Property="Manufacturer" Value="ZeroTier, Inc."/>
-    <ROW Property="ProductCode" Value="1033:{0143A36C-46C6-458D-AB9B-C8843E089323} " Type="16"/>
-    <ROW Property="ProductLanguage" Value="1033"/>
-    <ROW Property="ProductName" Value="ZeroTier One"/>
-    <ROW Property="ProductVersion" Value="1.14.2" Options="32"/>
-    <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
-    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
-    <ROW Property="UpgradeCode" Value="{B0E2A5F3-88B6-4E77-B922-CB4739B4C4C8}"/>
-    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME#ExeBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME#ExeBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT" MultiBuildValue="DefaultBuild:Windows 7 x86, Windows 8 x86, Windows 8.1 x86" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0#ExeBuild:Windows NT 4.0" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0#ExeBuild:Windows NT 4.0" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT50" MultiBuildValue="DefaultBuild:Windows 2000#ExeBuild:Windows 2000" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT50Display" MultiBuildValue="DefaultBuild:Windows 2000#ExeBuild:Windows 2000" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT5X" MultiBuildValue="DefaultBuild:Windows XP/2003#ExeBuild:Windows XP/2003" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT5XDisplay" MultiBuildValue="DefaultBuild:Windows XP/2003#ExeBuild:Windows XP/2003" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT60" MultiBuildValue="DefaultBuild:Windows Vista/Server 2008#ExeBuild:Windows Vista/Server 2008" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT60Display" MultiBuildValue="DefaultBuild:Windows Vista/Server 2008#ExeBuild:Windows Vista/Server 2008" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT64" MultiBuildValue="DefaultBuild:Windows 7 x64, Windows Server 2008 R2 x64, Windows 8 x64, Windows Server 2012 x64, Windows 8.1 x64, Windows Server 2012 R2 x64" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT64Display" MultiBuildValue="DefaultBuild:Windows 7 x64, Windows Server 2008 R2 x64, Windows 8 x64, Windows Server 2012 x64, Windows 8.1 x64, Windows Server 2012 R2 x64" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNTDisplay" MultiBuildValue="DefaultBuild:Windows 7 x86, Windows 8 x86, Windows 8.1 x86" ValueLocId="-"/>
-    <ROW Property="ZTHEADLESS" Value="No"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
-    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1" DirectoryOptions="15"/>
-    <ROW Directory="CommonAppDataFolder" Directory_Parent="TARGETDIR" DefaultDir="COMMON~1|CommonAppDataFolder" IsPseudoRoot="1"/>
-    <ROW Directory="One_Dir" Directory_Parent="ZeroTier_Dir" DefaultDir="One" DirectoryOptions="12"/>
-    <ROW Directory="ProgramFilesFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~1|ProgramFilesFolder" IsPseudoRoot="1"/>
-    <ROW Directory="ProgramMenuFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~2|ProgramMenuFolder" IsPseudoRoot="1"/>
-    <ROW Directory="StartupFolder" Directory_Parent="TARGETDIR" DefaultDir="STARTU~1|StartupFolder" IsPseudoRoot="1"/>
-    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
-    <ROW Directory="ZeroTier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="ZeroTier" DirectoryOptions="12"/>
-    <ROW Directory="driverarm64_Dir" Directory_Parent="One_Dir" DefaultDir=".:DRIVER~1|driver-arm64" DirectoryOptions="12"/>
-    <ROW Directory="driverx64_Dir" Directory_Parent="One_Dir" DefaultDir=".:DRIVER~2|driver-x64" DirectoryOptions="15"/>
-    <ROW Directory="driverx86_Dir" Directory_Parent="One_Dir" DefaultDir=".:DRIVER~3|driver-x86" DirectoryOptions="15"/>
-    <ROW Directory="i686_1_Dir" Directory_Parent="ProgramMenuFolder" DefaultDir=".:i686"/>
-    <ROW Directory="i686_Dir" Directory_Parent="APPDIR" DefaultDir=".:i686" DirectoryOptions="15"/>
-    <ROW Directory="networks.d_Dir" Directory_Parent="One_Dir" DefaultDir="networks.d" DirectoryOptions="12"/>
-    <ROW Directory="regid.201001.com.zerotier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="REGID2~1.ZER|regid.2010-01.com.zerotier" DirectoryOptions="12"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
-    <ROW Component="AI_CustomARPName" ComponentId="{DFE7A60C-C2B9-41F6-9171-8955BA30E556}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
-    <ROW Component="AI_DisableModify" ComponentId="{46FFA8C5-A0CB-4E05-9AD3-911D543DE8CA}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
-    <ROW Component="AI_ExePath" ComponentId="{8E02B36C-7A19-429B-A93E-77A9261AC918}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
-    <ROW Component="APPDIR" ComponentId="{4DD7907D-D7FE-4CD6-B1A0-B5C1625F5133}" Directory_="APPDIR" Attributes="0"/>
-    <ROW Component="One" ComponentId="{41AB11E7-066E-414A-96F8-F051D3D3B353}" Directory_="One_Dir" Attributes="0"/>
-    <ROW Component="ProductInformation" ComponentId="{DB078D04-EA8E-4A7C-9001-89BAD932F9D9}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
-    <ROW Component="ZeroTier" ComponentId="{8864F744-9BDF-4891-88A1-6D23D76BCCB1}" Directory_="ZeroTier_Dir" Attributes="0"/>
-    <ROW Component="driverarm64" ComponentId="{EF9A1336-B00D-409A-BD93-EBA3A266F06D}" Directory_="driverarm64_Dir" Attributes="0" Condition="(VersionNT &gt;= 500) AND AiArm64"/>
-    <ROW Component="driverx64" ComponentId="{29698845-0BA3-46C9-957C-E034B5BE5123}" Directory_="driverx64_Dir" Attributes="0" Condition="VersionNT64 AND NOT AiArm64"/>
-    <ROW Component="driverx86" ComponentId="{60D9AE83-35CD-4E0C-B799-A228D0288D04}" Directory_="driverx86_Dir" Attributes="0" Condition="(VersionNT &gt;= 500) AND NOT VersionNT64 AND NOT AiArm64"/>
-    <ROW Component="i686" ComponentId="{6EC46014-3BFD-4017-ACBC-C4417D1D6361}" Directory_="i686_1_Dir" Attributes="0"/>
-    <ROW Component="i686_1" ComponentId="{60156BDC-31D7-47EE-A307-B62129607DD5}" Directory_="i686_Dir" Attributes="0"/>
-    <ROW Component="networks.d" ComponentId="{EF54D0DF-889F-41DC-AF5C-4E7F96AB1C8B}" Directory_="networks.d_Dir" Attributes="0"/>
-    <ROW Component="regid.201001.com.zerotier" ComponentId="{A39C80FC-6A8F-454F-9052-10DAC3C3B139}" Directory_="regid.201001.com.zerotier_Dir" Attributes="0"/>
-    <ROW Component="zerotier_desktop_ui.exe" ComponentId="{61A7F53C-C6C3-418D-A652-2E4D9F8173AA}" Directory_="APPDIR" Attributes="256" Condition="ZTHEADLESS = &quot;No&quot; AND VersionNT64" KeyPath="zerotier_desktop_ui.exe"/>
-    <ROW Component="zerotier_desktop_ui.exe_1" ComponentId="{5CFEA823-6D17-4EAA-BBAA-810E1C89555D}" Directory_="i686_Dir" Attributes="0" Condition="ZTHEADLESS = &quot;No&quot; AND NOT VersionNT64 AND NOT AiArm64" KeyPath="zerotier_desktop_ui.exe_1"/>
-    <ROW Component="zerotierone_x64.exe" ComponentId="{DFCFB72D-B055-4E60-B6D8-81FF585C2183}" Directory_="One_Dir" Attributes="256" Condition="VersionNT64" KeyPath="zerotierone_x64.exe"/>
-    <ROW Component="zerotierone_x86.exe" ComponentId="{5D2F3366-4FE1-40A4-A81A-66C49FA11F1C}" Directory_="One_Dir" Attributes="0" Condition="NOT VersionNT64 AND NOT AiArm64" KeyPath="zerotierone_x86.exe"/>
-    <ROW Component="zttap300.inf" ComponentId="{2591DB80-835D-445D-86FB-DF0717D2D904}" Directory_="driverx64_Dir" Attributes="256" Condition="VersionNT64 AND NOT AiArm64" KeyPath="zttap300.inf"/>
-    <ROW Component="zttap300.inf_1" ComponentId="{DE7DABB5-7393-4FCD-B2D6-4DD6CAC0E742}" Directory_="driverx86_Dir" Attributes="0" Condition="(VersionNT &gt;= 500) AND NOT VersionNT64 AND NOT AiArm64" KeyPath="zttap300.inf_1"/>
-    <ROW Component="zttap300.inf_2" ComponentId="{8CD16F5C-D1A7-4991-9B77-C0D1ABEA21F6}" Directory_="driverarm64_Dir" Attributes="256" Condition="(VersionNT &gt;= 500) AND AiArm64" KeyPath="zttap300.inf_2"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="ZeroTierOne" Title="MainFeature" Description="ZeroTier One" Display="0" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ROW Feature="zttap300" Feature_Parent="ZeroTierOne" Title="zttap300" Description="Description" Display="7" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ROW Feature="zttap300_1" Feature_Parent="ZeroTierOne" Title="zttap300" Description="Description" Display="3" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ROW Feature="zttap300_2" Feature_Parent="ZeroTierOne" Title="zttap300" Description="Description" Display="5" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ATTRIBUTE name="CurrentFeature" value="ZeroTierOne"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
-    <ROW File="zerotierone_x86.exe" Component_="zerotierone_x86.exe" FileName="ZEROTI~1.EXE|zerotier-one_x86.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\windows\Build\Win32\Release\zerotier-one_x86.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zerotierone_x64.exe" Component_="zerotierone_x64.exe" FileName="ZEROTI~2.EXE|zerotier-one_x64.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\windows\Build\x64\Release\zerotier-one_x64.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zerotier_desktop_ui.exe" Component_="zerotier_desktop_ui.exe" FileName="ZEROTI~2.EXE|zerotier_desktop_ui.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\..\DesktopUI\target\x86_64-pc-windows-msvc\release\zerotier_desktop_ui.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zerotier_desktop_ui.exe_1" Component_="zerotier_desktop_ui.exe_1" FileName="ZEROTI~1.EXE|zerotier_desktop_ui.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\..\DesktopUI\target\i686-pc-windows-msvc\release\zerotier_desktop_ui.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zttap300.inf" Component_="zttap300.inf" FileName="zttap300.inf" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.inf" SelfReg="false"/>
-    <ROW File="zttap300.sys" Component_="zttap300.inf" FileName="zttap300.sys" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.sys" SelfReg="false"/>
-    <ROW File="zttap300.cat" Component_="zttap300.inf" FileName="zttap300.cat" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.cat" SelfReg="false"/>
-    <ROW File="zttap300.cat_1" Component_="zttap300.inf_1" FileName="zttap300.cat" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.cat" SelfReg="false"/>
-    <ROW File="zttap300.inf_1" Component_="zttap300.inf_1" FileName="zttap300.inf" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.inf" SelfReg="false"/>
-    <ROW File="zttap300.sys_1" Component_="zttap300.inf_1" FileName="zttap300.sys" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.sys" SelfReg="false"/>
-    <ROW File="zttap300.cat_2" Component_="zttap300.inf_2" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\arm64\zttap300.cat" SelfReg="false"/>
-    <ROW File="zttap300.inf_2" Component_="zttap300.inf_2" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\arm64\zttap300.inf" SelfReg="false"/>
-    <ROW File="zttap300.sys_2" Component_="zttap300.inf_2" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\arm64\zttap300.sys" SelfReg="false"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.custcomp.AiComponentAliasComponent">
-    <ROW AliasRowId="AI_CustomARPName" AliasRowOperation="2" Condition="#DefaultBuild:ZTHEADLESS=&quot;No&quot;"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
-    <ROW BootstrOptKey="GlobalOptions" GeneralOptions="qh" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BootstrapperUISequenceComponent">
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="249"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="251"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="MSI" BuildOrder="1" BuildType="0" PackageFolder="..\..\.." PackageFileName="ZeroTier One" Languages="en" InstallationType="4" ExtUI="true" UseLargeSchema="true"/>
-    <ROW BuildKey="ExeBuild" BuildName="update" BuildOrder="2" BuildType="0" PackageFolder="..\..\.." PackageFileName="ZeroTier One" Languages="en" InstallationType="2" CabsLocation="1" CompressCabs="false" UseLzma="true" LzmaMethod="2" LzmaCompressionLevel="4" PackageType="1" FilesInsideExe="true" ExeIconPath="..\..\..\artwork\ZeroTierIcon.ico" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" MsiCmdLine="/qn" ExtUI="true" UseLargeSchema="true" ExeName="zt1_update_2_1,2_[|ProductVersion]_0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.CacheComponent">
-    <ATTRIBUTE name="Enable" value="false"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
-    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
-    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="ZeroTier One" DescriptionUrl="https://www.zerotier.com/" SignOptions="7" SignTool="5" UseSha256="1" KVTenantId="5300bf3b-0eff-4a5f-a63f-821e22ed1730" KVAppId="5f94d77e-b795-41fd-afe7-ec913b03c1d3" KVName="ZeroTier-CS" KVCertName="ZT-EV-CS-2024" KVCertVersion="64807be24d57468e895e2e577f430de2"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.FirewallExceptionComponent">
-    <ROW FirewallException="ZeroTierOneUDP9993" Direction="1" Action="1" DisplayName="ZeroTier UDP/9993 In" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="1" Profiles="7" Port="9993" Protocol="UDP"/>
-    <ROW FirewallException="ZeroTierOnex64Binary" Direction="1" Action="1" DisplayName="ZeroTier x64 Binary In" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="((?zerotierone_x64.exe=2) AND ($zerotierone_x64.exe=3))" Profiles="7" AppPath="[#zerotierone_x64.exe]" Port="*" Protocol="ANY"/>
-    <ROW FirewallException="ZeroTierOnex86Binary" Direction="1" Action="1" DisplayName="ZeroTier x86 Binary In" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="((?zerotierone_x86.exe=2) AND ($zerotierone_x86.exe=3))" Profiles="7" AppPath="[#zerotierone_x86.exe]" Port="*" Protocol="ANY"/>
-    <ROW FirewallException="ZeroTierUDP9993Out" Direction="2" Action="1" DisplayName="ZeroTier UDP/9993 Out" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="1" Profiles="7" Port="9993" Protocol="UDP"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
-    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
-    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
-    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
-    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
-    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
-    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
-    <ROW Fragment="Themes.aip" Path="&lt;AI_FRAGS&gt;Themes.aip"/>
-    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
-    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
-    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
-    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
-    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiActionTextComponent">
-    <ROW Action="AI_ConfigFailActions" Description="Configure service failure actions" DescriptionLocId="ActionText.Description.AI_ConfigFailActions" Template="Service: [1]" TemplateLocId="ActionText.Template.AI_ConfigFailActions"/>
-    <ROW Action="AI_DeleteLzma" Description="Deleting files extracted from archive" DescriptionLocId="ActionText.Description.AI_DeleteLzma" TemplateLocId="-"/>
-    <ROW Action="AI_DeleteRLzma" Description="Deleting files extracted from archive" DescriptionLocId="ActionText.Description.AI_DeleteLzma" TemplateLocId="-"/>
-    <ROW Action="AI_ExtractFiles" Description="Extracting files from archive" DescriptionLocId="ActionText.Description.AI_ExtractLzma" TemplateLocId="-"/>
-    <ROW Action="AI_ExtractLzma" Description="Extracting files from archive" DescriptionLocId="ActionText.Description.AI_ExtractLzma" TemplateLocId="-"/>
-    <ROW Action="AI_FwConfig" Description="Executing Windows Firewall configurations" DescriptionLocId="ActionText.Description.AI_FwConfig" Template="Configuring Windows Firewall rule: &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_FwConfig"/>
-    <ROW Action="AI_FwInstall" Description="Generating actions to configure Windows Firewall" DescriptionLocId="ActionText.Description.AI_FwInstall"/>
-    <ROW Action="AI_FwRemove" Description="Executing Windows Firewall configurations" DescriptionLocId="ActionText.Description.AI_FwRemove" Template="Configuring Windows Firewall rule:  &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_FwRemove"/>
-    <ROW Action="AI_FwRollback" Description="Rolling back Windows Firewall configurations." DescriptionLocId="ActionText.Description.AI_FwRollback" Template="Rolling back Windows Firewall configurations." TemplateLocId="ActionText.Template.AI_FwRollback"/>
-    <ROW Action="AI_FwUninstall" Description="Generating actions to configure Windows Firewall" DescriptionLocId="ActionText.Description.AI_FwUninstall"/>
-    <ROW Action="AI_ProcessFailActions" Description="Generating actions to configure service failure actions" DescriptionLocId="ActionText.Description.AI_ProcessFailActions" Template="Service: [1]" TemplateLocId="ActionText.Template.AI_ProcessFailActions"/>
-    <ROW Action="AI_TxtUpdaterCommit" Description="Commit text file changes. " DescriptionLocId="ActionText.Description.AI_TxtUpdaterCommit" Template="Commit text file changes." TemplateLocId="ActionText.Template.AI_TxtUpdaterCommit"/>
-    <ROW Action="AI_TxtUpdaterConfig" Description="Executing text file updates" DescriptionLocId="ActionText.Description.AI_TxtUpdaterConfig" Template="Updating text file: &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_TxtUpdaterConfig"/>
-    <ROW Action="AI_TxtUpdaterInstall" Description="Generating actions to configure text files updates" DescriptionLocId="ActionText.Description.AI_TxtUpdaterInstall"/>
-    <ROW Action="AI_TxtUpdaterRollback" Description="Rolling back text file changes. " DescriptionLocId="ActionText.Description.AI_TxtUpdaterRollback" Template="Rolling back text file changes." TemplateLocId="ActionText.Template.AI_TxtUpdaterRollback"/>
-    <ROW Action="AI_XmlCommit" Description="Committing XML file configurations." DescriptionLocId="ActionText.Description.AI_XmlCommit" Template="Committing XML file configurations." TemplateLocId="ActionText.Template.AI_XmlCommit"/>
-    <ROW Action="AI_XmlConfig" Description="Executing XML file configurations" DescriptionLocId="ActionText.Description.AI_XmlConfig" Template="Configuring XML file: &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_XmlConfig"/>
-    <ROW Action="AI_XmlInstall" Description="Generating actions to configure XML files" DescriptionLocId="ActionText.Description.AI_XmlInstall"/>
-    <ROW Action="AI_XmlRemove" Description="Executing XML file configurations" DescriptionLocId="ActionText.Description.AI_XmlRemove" Template="Configuring XML file: &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_XmlRemove"/>
-    <ROW Action="AI_XmlRollback" Description="Rolling back XML file configurations." DescriptionLocId="ActionText.Description.AI_XmlRollback" Template="Rolling back XML file configurations." TemplateLocId="ActionText.Template.AI_XmlRollback"/>
-    <ROW Action="AI_XmlUninstall" Description="Generating actions to configure XML files" DescriptionLocId="ActionText.Description.AI_XmlUninstall"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiAppSearchComponent">
-    <ROW Property="AI_SETUPEXEPATH" Signature_="AI_EXE_PATH_CU" Builds="ExeBuild"/>
-    <ROW Property="AI_SETUPEXEPATH" Signature_="AI_EXE_PATH_LM" Builds="ExeBuild"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
-    <ROW Name="ExternalUICleaner.dll" SourcePath="&lt;AI_CUSTACTS&gt;ExternalUICleaner.dll"/>
-    <ROW Name="NetFirewall.dll" SourcePath="&lt;AI_CUSTACTS&gt;NetFirewall.dll"/>
-    <ROW Name="Prereq.dll" SourcePath="&lt;AI_CUSTACTS&gt;Prereq.dll"/>
-    <ROW Name="TxtUpdater.dll" SourcePath="&lt;AI_CUSTACTS&gt;TxtUpdater.dll"/>
-    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
-    <ROW Name="lzmaextractor.dll" SourcePath="&lt;AI_CUSTACTS&gt;lzmaextractor.dll"/>
-    <ROW Name="viewer.exe" SourcePath="&lt;AI_CUSTACTS&gt;viewer.exe" DigSign="true"/>
-    <ROW Name="xmlCfg.dll" SourcePath="&lt;AI_CUSTACTS&gt;xmlCfg.dll"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiConditionComponent">
-    <ROW Feature_="zttap300" Level="0" Condition="((VersionNT &lt; 500) OR (NOT VersionNT))"/>
-    <ROW Feature_="zttap300_1" Level="0" Condition="((VersionNT &lt; 500) OR (NOT VersionNT))"/>
-    <ROW Feature_="zttap300_2" Level="0" Condition="((VersionNT &lt; 500) OR (NOT VersionNT))"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent">
-    <ROW Dialog_="ExitDialog" Control="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Attributes="0" Text="[ButtonText_Cancel]" Order="200" TextLocId="-" MsiKey="ExitDialog#Cancel" Options="1"/>
-    <ROW Dialog_="ExitDialog" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="0" Text="[ButtonText_Back]" Order="400" TextLocId="-" MsiKey="ExitDialog#Back" Options="1"/>
-    <ROW Dialog_="ExitDialog" Control="ViewReadmeCheckBox" Type="CheckBox" X="135" Y="140" Width="10" Height="10" Attributes="2" Property="VIEWREADME" Order="500" MsiKey="ExitDialog#ViewReadmeCheckBox" Options="1"/>
-    <ROW Dialog_="ExitDialog" Control="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Attributes="196611" Text="Completing the [ProductName] [Wizard]" TextStyle="VerdanaBold13" Order="600" TextLocId="Control.Text.ExitDialog#Title" MsiKey="ExitDialog#Title"/>
-    <ROW Dialog_="ExitDialog" Control="LaunchProdCheckBox" Type="CheckBox" X="135" Y="170" Width="10" Height="10" Attributes="2" Property="RUNAPPLICATION" Order="700" MsiKey="ExitDialog#LaunchProdCheckBox" Options="1"/>
-    <ROW Dialog_="ExitDialog" Control="Description" Type="Text" X="135" Y="86" Width="220" Height="20" Attributes="196611" Text="Click the &quot;Finish&quot; button to exit the [Wizard]." Order="800" TextLocId="Control.Text.ExitDialog#Description" MsiKey="ExitDialog#Description"/>
-    <ROW Dialog_="ExitDialog" Control="BottomLine" Type="Line" X="0" Y="234" Width="372" Height="0" Attributes="1" Order="900" MsiKey="ExitDialog#BottomLine"/>
-    <ROW Dialog_="ExitDialog" Control="Hyperlink" Type="Hyperlink" X="135" Y="140" Width="220" Height="20" Attributes="65539" Property="AiReadmeLink" Text="&lt;a href=&quot;[AiReadmeLink]&quot;&gt;View readme&lt;/a&gt;" Order="1000" TextLocId="Control.Text.ExitDialog#ViewReadmeHyperlink" MsiKey="ExitDialog#Hyperlink"/>
-    <ROW Dialog_="WelcomeDlg" Control="WelcomeDlgDialogInitializer" Type="DialogInitializer" X="0" Y="0" Width="0" Height="0" Attributes="0" Order="-1" TextLocId="-" HelpLocId="-" ExtDataLocId="-"/>
-    <ROW Dialog_="Windows7Warning" Control="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Next]" Order="100" Options="1"/>
-    <ROW Dialog_="Windows7Warning" Control="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Cancel]" Order="200" Options="1"/>
-    <ROW Dialog_="Windows7Warning" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" Options="1"/>
-    <ROW Dialog_="Windows7Warning" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="[BannerBitmap]" Order="400"/>
-    <ROW Dialog_="Windows7Warning" Control="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" Attributes="1" Order="500"/>
-    <ROW Dialog_="Windows7Warning" Control="BottomLine" Type="Line" X="5" Y="234" Width="368" Height="0" Attributes="1" Order="600"/>
-    <ROW Dialog_="Windows7Warning" Control="Logo" Type="Text" X="4" Y="228" Width="70" Height="12" Attributes="1" Text="Advanced Installer" Order="700"/>
-    <ROW Dialog_="Windows7Warning" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="Warning: Unsupported Windows Version" TextStyle="[DlgTitleFont]" Order="800"/>
-    <ROW Dialog_="Windows7Warning" Control="Text_1" Type="Text" X="15" Y="59" Width="344" Height="159" Attributes="65539" Property="TEXT_1_PROP" Text="ZeroTier does not officially support versions of Windows prior to Windows 10, and the ZeroTier graphical tray and control panel application does not run on EOL versions of Windows. You may still install ZeroTier and attempt to use it by opening an administrator-mode command prompt and controlling the service from the command line with &quot;zerotier-cli&quot;." TextStyle="VerdanaBold13" Order="900"/>
-    <ATTRIBUTE name="DeletedRows" value="ExitDialog#LaunchProdText@ExitDialog#ViewReadmeText"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlConditionComponent">
-    <ATTRIBUTE name="DeletedRows" value="ExitDialog#LaunchProdText#Hide#((NOT AI_INSTALL) AND (NOT AI_PATCH)) OR ((CTRLS &lt;&gt; 2) AND (CTRLS &lt;&gt; 3))@ExitDialog#ViewReadmeText#Hide#(((NOT AI_INSTALL) AND (NOT AI_PATCH)) OR ((CTRLS &lt;&gt; 1) AND (CTRLS &lt;&gt; 3))) OR AiReadmeLink"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="3"/>
-    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
-    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
-    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
-    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
-    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
-    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
-    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
-    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
-    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
-    <ROW Dialog_="Windows7Warning" Control_="Cancel" Event="SpawnDialog" Argument="CancelDlg" Condition="1" Ordering="100"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfRbDiskDlg" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" Ordering="5" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="EnableRollback" Argument="False" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" Ordering="6" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfDiskDlg" Condition="AI_INSTALL AND ( (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;) )" Ordering="7" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[AI_ButtonText_Next_Orig]" Argument="[ButtonText_Next]" Condition="AI_INSTALL" Ordering="0" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[ButtonText_Next]" Argument="[[AI_CommitButton]]" Condition="AI_INSTALL" Ordering="1" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[AI_Text_Next_Orig]" Argument="[Text_Next]" Condition="AI_INSTALL" Ordering="2" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[Text_Next]" Argument="[Text_Install]" Condition="AI_INSTALL" Ordering="3" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Back" Event="[ButtonText_Next]" Argument="[AI_ButtonText_Next_Orig]" Condition="AI_INSTALL" Ordering="0" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Back" Event="[Text_Next]" Argument="[AI_Text_Next_Orig]" Condition="AI_INSTALL" Ordering="1" Options="2"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
-    <ROW Directory_="networks.d_Dir" Component_="networks.d" ManualDelete="false"/>
-    <ROW Directory_="regid.201001.com.zerotier_Dir" Component_="regid.201001.com.zerotier" ManualDelete="false"/>
-    <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
-    <ROW Directory_="i686_1_Dir" Component_="i686" ManualDelete="false"/>
-    <ROW Directory_="ZeroTier_Dir" Component_="ZeroTier" ManualDelete="true"/>
-    <ROW Directory_="One_Dir" Component_="One" ManualDelete="false"/>
-    <ROW Directory_="driverx64_Dir" Component_="driverx64" ManualDelete="false"/>
-    <ROW Directory_="driverx86_Dir" Component_="driverx86" ManualDelete="false"/>
-    <ROW Directory_="i686_Dir" Component_="i686_1" ManualDelete="false"/>
-    <ROW Directory_="driverarm64_Dir" Component_="driverarm64" ManualDelete="false"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_ConfigFailActions" Type="11265" Source="aicustact.dll" Target="ConfigureServFailActions" WithoutSeq="true"/>
-    <ROW Action="AI_DATA_SETTER" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DATA_SETTER_1" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DATA_SETTER_2" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DATA_SETTER_3" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DATA_SETTER_4" Type="51" Source="CustomActionData" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DATA_SETTER_5" Type="51" Source="CustomActionData" Target="zerotier_desktop_ui.exe"/>
-    <ROW Action="AI_DATA_SETTER_6" Type="51" Source="CustomActionData" Target="ZeroTier One.exe"/>
-    <ROW Action="AI_DATA_SETTER_7" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
-    <ROW Action="AI_DeleteCadLzma" Type="51" Source="AI_DeleteLzma" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DeleteLzma" Type="1025" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
-    <ROW Action="AI_DeleteRCadLzma" Type="51" Source="AI_DeleteRLzma" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DeleteRLzma" Type="1281" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
-    <ROW Action="AI_DoRemoveExternalUIStub" Type="3585" Source="ExternalUICleaner.dll" Target="DoRemoveExternalUIStub" WithoutSeq="true"/>
-    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
-    <ROW Action="AI_EnableDebugLog" Type="321" Source="aicustact.dll" Target="EnableDebugLog"/>
-    <ROW Action="AI_ExtractCadLzma" Type="51" Source="AI_ExtractLzma" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_ExtractFiles" Type="1" Source="Prereq.dll" Target="ExtractSourceFiles" AdditionalSeq="AI_DATA_SETTER_4"/>
-    <ROW Action="AI_ExtractLzma" Type="1025" Source="lzmaextractor.dll" Target="ExtractLZMAFiles"/>
-    <ROW Action="AI_FindExeLzma" Type="1" Source="lzmaextractor.dll" Target="FindEXE"/>
-    <ROW Action="AI_FwConfig" Type="11265" Source="NetFirewall.dll" Target="OnFwConfig" WithoutSeq="true"/>
-    <ROW Action="AI_FwInstall" Type="1" Source="NetFirewall.dll" Target="OnFwInstall" AdditionalSeq="AI_DATA_SETTER_2"/>
-    <ROW Action="AI_FwRemove" Type="11265" Source="NetFirewall.dll" Target="OnFwRemove" WithoutSeq="true"/>
-    <ROW Action="AI_FwRollback" Type="11521" Source="NetFirewall.dll" Target="OnFwRollback" WithoutSeq="true"/>
-    <ROW Action="AI_FwUninstall" Type="1" Source="NetFirewall.dll" Target="OnFwUninstall" AdditionalSeq="AI_DATA_SETTER_3"/>
-    <ROW Action="AI_GetArpIconPath" Type="1" Source="aicustact.dll" Target="GetArpIconPath"/>
-    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
-    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
-    <ROW Action="AI_PRESERVE_INSTALL_TYPE" Type="65" Source="aicustact.dll" Target="PreserveInstallType"/>
-    <ROW Action="AI_ProcessFailActions" Type="1" Source="aicustact.dll" Target="ProcessFailActions" AdditionalSeq="AI_DATA_SETTER_7"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH" Target="[AI_SETUPEXEPATH_ORIGINAL]"/>
-    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
-    <ROW Action="AI_RemoveExternalUIStub" Type="1" Source="ExternalUICleaner.dll" Target="RemoveExternalUIStub"/>
-    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Type="1" Source="aicustact.dll" Target="GetLocalizedCredentials"/>
-    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
-    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
-    <ROW Action="AI_TxtUpdaterCommit" Type="11777" Source="TxtUpdater.dll" Target="OnTxtUpdaterCommit" WithoutSeq="true"/>
-    <ROW Action="AI_TxtUpdaterConfig" Type="11265" Source="TxtUpdater.dll" Target="OnTxtUpdaterConfig" WithoutSeq="true"/>
-    <ROW Action="AI_TxtUpdaterInstall" Type="1" Source="TxtUpdater.dll" Target="OnTxtUpdaterInstall"/>
-    <ROW Action="AI_TxtUpdaterRollback" Type="11521" Source="TxtUpdater.dll" Target="OnTxtUpdaterRollback" WithoutSeq="true"/>
-    <ROW Action="AI_XmlCommit" Type="11777" Source="xmlCfg.dll" Target="OnXmlCommit" WithoutSeq="true"/>
-    <ROW Action="AI_XmlConfig" Type="11265" Source="xmlCfg.dll" Target="OnXmlConfig" WithoutSeq="true"/>
-    <ROW Action="AI_XmlInstall" Type="1" Source="xmlCfg.dll" Target="OnXmlInstall" AdditionalSeq="AI_DATA_SETTER"/>
-    <ROW Action="AI_XmlRemove" Type="11265" Source="xmlCfg.dll" Target="OnXmlRemove" WithoutSeq="true"/>
-    <ROW Action="AI_XmlRollback" Type="11521" Source="xmlCfg.dll" Target="OnXmlRollback" WithoutSeq="true"/>
-    <ROW Action="AI_XmlUninstall" Type="1" Source="xmlCfg.dll" Target="OnXmlUninstall" AdditionalSeq="AI_DATA_SETTER_1"/>
-    <ROW Action="LaunchUI" Type="194" Source="viewer.exe" Target="/DontWait &quot;[APPDIR]zerotier_desktop_ui.exe&quot;" Options="1"/>
-    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFilesFolder]ZeroTier\One"/>
-    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
-    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
-    <ROW Action="TapDeviceRemove32" Type="3154" Source="zerotierone_x86.exe" Target="-D"/>
-    <ROW Action="TapDeviceRemove64" Type="3154" Source="zerotierone_x64.exe" Target="-D"/>
-    <ROW Action="TerminateUINew" Type="65" Source="aicustact.dll" Target="StopProcess" Options="1" AdditionalSeq="AI_DATA_SETTER_5"/>
-    <ROW Action="TerminateUIOld" Type="65" Source="aicustact.dll" Target="StopProcess" Options="1" AdditionalSeq="AI_DATA_SETTER_6"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiDialogComponent">
-    <ROW Dialog="Windows7Warning" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiEnvComponent">
-    <ROW Environment="Path" Name="=-*Path" Value="[~];[APPDIR]" Component_="regid.201001.com.zerotier"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatCompsComponent">
-    <ROW Feature_="ZeroTierOne" Component_="ProductInformation"/>
-    <ROW Feature_="ZeroTierOne" Component_="networks.d"/>
-    <ROW Feature_="ZeroTierOne" Component_="regid.201001.com.zerotier"/>
-    <ROW Feature_="ZeroTierOne" Component_="zerotierone_x64.exe"/>
-    <ROW Feature_="ZeroTierOne" Component_="zerotierone_x86.exe"/>
-    <ROW Feature_="ZeroTierOne" Component_="AI_CustomARPName"/>
-    <ROW Feature_="ZeroTierOne" Component_="AI_DisableModify"/>
-    <ROW Feature_="ZeroTierOne" Component_="zerotier_desktop_ui.exe"/>
-    <ROW Feature_="ZeroTierOne" Component_="zerotier_desktop_ui.exe_1"/>
-    <ROW Feature_="ZeroTierOne" Component_="i686"/>
-    <ROW Feature_="ZeroTierOne" Component_="ZeroTier"/>
-    <ROW Feature_="ZeroTierOne" Component_="One"/>
-    <ROW Feature_="ZeroTierOne" Component_="driverx64"/>
-    <ROW Feature_="ZeroTierOne" Component_="i686_1"/>
-    <ROW Feature_="zttap300" Component_="zttap300.inf"/>
-    <ROW Feature_="ZeroTierOne" Component_="driverx86"/>
-    <ROW Feature_="zttap300_1" Component_="zttap300.inf_1"/>
-    <ROW Feature_="ZeroTierOne" Component_="driverarm64"/>
-    <ROW Feature_="zttap300_2" Component_="zttap300.inf_2"/>
-    <ROW Feature_="ZeroTierOne" Component_="APPDIR"/>
-    <ROW Feature_="ZeroTierOne" Component_="AI_ExePath"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
-    <ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
-    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
-    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
-    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1397"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
-    <ROW Action="AI_XmlInstall" Condition="(REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5103"/>
-    <ROW Action="AI_DATA_SETTER" Condition="(REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5102"/>
-    <ROW Action="AI_XmlUninstall" Condition="(REMOVE)" Sequence="3102"/>
-    <ROW Action="AI_DATA_SETTER_1" Condition="(REMOVE)" Sequence="3101"/>
-    <ROW Action="InstallFinalize" Sequence="6605" SeqType="0" MsiKey="InstallFinalize"/>
-    <ROW Action="AI_RemoveExternalUIStub" Condition="(REMOVE=&quot;ALL&quot;) AND ((VersionNT &gt; 500) OR((VersionNT = 500) AND (ServicePackLevel &gt;= 4)))" Sequence="1501"/>
-    <ROW Action="TapDeviceRemove32" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) AND NOT UPGRADINGPRODUCTCODE ) AND ( NOT VersionNT64 )" Sequence="1601"/>
-    <ROW Action="TapDeviceRemove64" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) AND NOT UPGRADINGPRODUCTCODE ) AND ( VersionNT64 )" Sequence="1602"/>
-    <ROW Action="AI_FwInstall" Condition="(VersionNT &gt;= 501) AND (REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5802"/>
-    <ROW Action="AI_DATA_SETTER_2" Condition="(VersionNT &gt;= 501) AND (REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5801"/>
-    <ROW Action="AI_FwUninstall" Condition="(VersionNT &gt;= 501) AND (REMOVE=&quot;ALL&quot;)" Sequence="1702"/>
-    <ROW Action="AI_DATA_SETTER_3" Condition="(VersionNT &gt;= 501) AND (REMOVE=&quot;ALL&quot;)" Sequence="1701"/>
-    <ROW Action="AI_TxtUpdaterInstall" Sequence="5101"/>
-    <ROW Action="AI_EnableDebugLog" Sequence="52"/>
-    <ROW Action="AI_ExtractFiles" Sequence="1399" Builds="ExeBuild"/>
-    <ROW Action="AI_DATA_SETTER_4" Sequence="1398"/>
-    <ROW Action="AI_GetArpIconPath" Sequence="1401"/>
-    <ROW Action="LaunchUI" Condition="( NOT Installed ) AND ( ZTHEADLESS = &quot;No&quot; )" Sequence="6606"/>
-    <ROW Action="AI_DETECT_MODERNWIN" Condition="(VersionNT &gt;= 603)" Sequence="55" MsiKey="AI_DETECT_MODERNWIN"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
-    <ROW Action="TerminateUIOld" Sequence="202"/>
-    <ROW Action="AI_DATA_SETTER_6" Sequence="201"/>
-    <ROW Action="TerminateUINew" Sequence="204"/>
-    <ROW Action="AI_DATA_SETTER_5" Sequence="203"/>
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_DeleteCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="199" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_DeleteRCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="198" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_ExtractCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="197" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_FindExeLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="196" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_ExtractLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="1549" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_DeleteRLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="1548" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_DeleteLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="6604" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Action="AI_ProcessFailActions" Sequence="5848"/>
-    <ROW Action="AI_DATA_SETTER_7" Sequence="5847"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
-    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="54"/>
-    <ROW Action="AI_DpiContentScale" Sequence="53"/>
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101"/>
-    <ROW Action="ExecuteAction" Sequence="1299" SeqType="0" MsiKey="ExecuteAction"/>
-    <ROW Action="AI_EnableDebugLog" Sequence="52"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
-    <ROW Action="AI_PRESERVE_INSTALL_TYPE" Sequence="199"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
-    <ROW Condition="( Version9X OR ( NOT VersionNT64 ) OR ( VersionNT64 AND ((VersionNT64 &lt;&gt; 601) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 601) OR (MsiNTProductType = 1)) AND ((VersionNT64 &lt;&gt; 602) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 602) OR (MsiNTProductType = 1)) AND ((VersionNT64 &lt;&gt; 603) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 603) OR (MsiNTProductType = 1)) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT64Display]." DescriptionLocId="AI.LaunchCondition.NoSpecificNT64" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="( Version9X OR VersionNT64 OR ( VersionNT AND (VersionNT &lt;&gt; 601) AND (VersionNT &lt;&gt; 602) AND (VersionNT &lt;&gt; 603) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNTDisplay]." DescriptionLocId="AI.LaunchCondition.NoSpecificNT" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="((VersionNT &lt;&gt; 501) AND (VersionNT &lt;&gt; 502))" Description="[ProductName] cannot be installed on [WindowsTypeNT5XDisplay]." DescriptionLocId="AI.LaunchCondition.NoNT5X" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on [WindowsTypeNT40Display]." DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 500)" Description="[ProductName] cannot be installed on [WindowsTypeNT50Display]." DescriptionLocId="AI.LaunchCondition.NoNT50" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 600)" Description="[ProductName] cannot be installed on [WindowsTypeNT60Display]." DescriptionLocId="AI.LaunchCondition.NoNT60" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Condition="Privileged" Description="[ProductName] requires administrative privileges to install." DescriptionLocId="AI.LaunchCondition.Privileged" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="SETUPEXEDIR OR (REMOVE=&quot;ALL&quot;)" Description="This package can only be run from a bootstrapper." DescriptionLocId="AI.LaunchCondition.RequireBootstrapper" IsPredefined="true" Builds="ExeBuild"/>
-    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiLockPermComponent">
-    <ROW LockObject="ZeroTier_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="ZeroTier_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="One_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="One_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="networks.d_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="networks.d_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="driverx64_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="driverx86_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="driverarm64_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="regid.201001.com.zerotier_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="APPDIR" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="i686_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="driverarm64_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegLocatorComponent">
-    <ROW Signature_="AI_EXE_PATH_CU" Root="1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>
-    <ROW Signature_="AI_EXE_PATH_LM" Root="2" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
-    <ROW Registry="AI_ExePath" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Value="[AI_SETUPEXEPATH]" Component_="AI_ExePath"/>
-    <ROW Registry="AdvancedInstaller" Root="-1" Key="Software\Caphyon\Advanced Installer" Name="\"/>
-    <ROW Registry="Caphyon" Root="-1" Key="Software\Caphyon" Name="\"/>
-    <ROW Registry="Comments" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Comments" Value="[ARPCOMMENTS]" Component_="AI_CustomARPName"/>
-    <ROW Registry="Contact" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Contact" Value="[ARPCONTACT]" Component_="AI_CustomARPName"/>
-    <ROW Registry="CurrentVersion" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion" Name="\"/>
-    <ROW Registry="DisplayIcon" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayIcon" Value="[ARP_ICON_PATH]" Component_="AI_CustomARPName"/>
-    <ROW Registry="DisplayName" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayName" Value="[AI_PRODUCTNAME_ARP]" Component_="AI_CustomARPName"/>
-    <ROW Registry="DisplayVersion" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayVersion" Value="[ProductVersion]" Component_="AI_CustomARPName"/>
-    <ROW Registry="EstimatedSize" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="EstimatedSize" Value="#[AI_ARP_SIZE]" Component_="AI_CustomARPName" VirtualValue="#"/>
-    <ROW Registry="HelpLink" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="HelpLink" Value="[ARPHELPLINK]" Component_="AI_CustomARPName"/>
-    <ROW Registry="HelpTelephone" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="HelpTelephone" Value="[ARPHELPTELEPHONE]" Component_="AI_CustomARPName"/>
-    <ROW Registry="InstallLocation" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="InstallLocation" Value="[APPDIR]" Component_="AI_CustomARPName"/>
-    <ROW Registry="LZMA" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA" Name="\"/>
-    <ROW Registry="Manufacturer" Root="-1" Key="Software\[Manufacturer]" Name="\"/>
-    <ROW Registry="Microsoft" Root="-1" Key="Software\Microsoft" Name="\"/>
-    <ROW Registry="ModifyPath" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="ModifyPath" Value="[AI_UNINSTALLER] /i [ProductCode] AI_UNINSTALLER_CTP=1" Component_="AI_CustomARPName"/>
-    <ROW Registry="NoModify" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="NoModify" Value="#1" Component_="AI_DisableModify" VirtualValue="#"/>
-    <ROW Registry="NoRepair" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="NoRepair" Value="#1" Component_="AI_CustomARPName" VirtualValue="#"/>
-    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
-    <ROW Registry="ProductCode_1" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]" Name="\"/>
-    <ROW Registry="ProductName" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="\"/>
-    <ROW Registry="ProductNameProductVersion" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="\"/>
-    <ROW Registry="ProductVersion_1" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="\"/>
-    <ROW Registry="Publisher" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Publisher" Value="[Manufacturer]" Component_="AI_CustomARPName"/>
-    <ROW Registry="Readme" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Readme" Value="[ARPREADME]" Component_="AI_CustomARPName"/>
-    <ROW Registry="Software" Root="-1" Key="Software" Name="\"/>
-    <ROW Registry="URLInfoAbout" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="URLInfoAbout" Value="[ARPURLINFOABOUT]" Component_="AI_CustomARPName"/>
-    <ROW Registry="URLUpdateInfo" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="URLUpdateInfo" Value="[ARPURLUPDATEINFO]" Component_="AI_CustomARPName"/>
-    <ROW Registry="Uninstall" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall" Name="\"/>
-    <ROW Registry="UninstallPath" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="UninstallPath" Value="[AI_UNINSTALLER] /x [ProductCode] AI_UNINSTALLER_CTP=1" Component_="AI_CustomARPName"/>
-    <ROW Registry="UninstallString" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="UninstallString" Value="[AI_UNINSTALLER] /x [ProductCode] AI_UNINSTALLER_CTP=1" Component_="AI_CustomARPName"/>
-    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
-    <ROW Registry="VersionMajor" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="VersionMajor" Value="#1" Component_="AI_CustomARPName" VirtualValue="#"/>
-    <ROW Registry="VersionMinor" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="VersionMinor" Value="#6" Component_="AI_CustomARPName" VirtualValue="#"/>
-    <ROW Registry="Windows" Root="-1" Key="Software\Microsoft\Windows" Name="\"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiServConfigFailureActionsComponent">
-    <ROW MsiServiceConfigFailureActions="ServiceName" Name="ZeroTierOneService" Event="1" ResetPeriod="1" Actions="1[~]1" DelayActions="1[~]5" Component_="zerotierone_x64.exe"/>
-    <ROW MsiServiceConfigFailureActions="ServiceName_1" Name="ZeroTierOneService" Event="1" ResetPeriod="1" Actions="1[~]1" DelayActions="1[~]5" Component_="zerotierone_x86.exe"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiServCtrlComponent">
-    <ROW ServiceControl="zerotierone_x64.exe" Name="ZeroTierOneService" Event="163" Wait="1" Component_="zerotierone_x64.exe"/>
-    <ROW ServiceControl="zerotierone_x86.exe" Name="ZeroTierOneService" Event="163" Wait="1" Component_="zerotierone_x86.exe"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiServInstComponent">
-    <ROW ServiceInstall="zerotierone_x64.exe" Name="ZeroTierOneService" DisplayName="ZeroTier One" ServiceType="16" StartType="2" ErrorControl="32769" Component_="zerotierone_x64.exe" Description="Ethernet Virtualization Service"/>
-    <ROW ServiceInstall="zerotierone_x86.exe" Name="ZeroTierOneService" DisplayName="ZeroTier One" ServiceType="16" StartType="2" ErrorControl="32769" Component_="zerotierone_x86.exe" Description="Ethernet Virtualization Service"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
-    <ROW Shortcut="ZeroTier" Directory_="ProgramMenuFolder" Name="ZeroTier" Component_="zerotier_desktop_ui.exe" Target="[#zerotier_desktop_ui.exe]" Hotkey="0" Icon_="ZeroTierIcon.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
-    <ROW Shortcut="ZeroTierOne" Directory_="StartupFolder" Name="ZEROTI~1|ZeroTierOne" Component_="zerotier_desktop_ui.exe_1" Target="[#zerotier_desktop_ui.exe_1]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="i686_Dir"/>
-    <ROW Shortcut="ZeroTier_1" Directory_="i686_1_Dir" Name="ZeroTier" Component_="zerotier_desktop_ui.exe_1" Target="[#zerotier_desktop_ui.exe_1]" Hotkey="0" Icon_="ZeroTierIcon.exe" IconIndex="0" ShowCmd="1" WkDir="i686_Dir"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
-    <ATTRIBUTE name="UsedTheme" value="classic"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
-    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
-    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.SoftwareIdentificationComponent">
-    <ATTRIBUTE name="LocalFile" value="regid.199509.com.example_ProductName.swidtag"/>
-    <ATTRIBUTE name="SystemFile" value="regid.199509.com.example_ProductName.swidtag_1"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.TxtUpdateComponent">
-    <ROW Name="Append/Create" TxtUpdateSet="zerotiercli.bat" FindPattern="@ECHO OFF&#13;&#10;if [\[][#zerotierone_x64.exe][\]] == [\[][\]] (&#13;&#10;&#9;[#zerotierone_x86.exe] -q %*&#13;&#10;) else (&#13;&#10;&#9;[#zerotierone_x64.exe] -q %*&#13;&#10;)&#13;&#10;" Options="160" Order="0" FileEncoding="0"/>
-    <ROW Name="Replace" TxtUpdateSet="zerotiercli.bat" FindPattern="YourFindText" ReplacePattern="YourReplaceText" Options="2" Order="1" FileEncoding="-1"/>
-    <ROW Name="Append/Create" TxtUpdateSet="zerotiercli1.bat" FindPattern="@ECHO OFF&#13;&#10;if [\[][#zerotierone_x64.exe][\]] == [\[][\]] (&#13;&#10;&#9;[#zerotierone_x86.exe] -i %*&#13;&#10;) else (&#13;&#10;&#9;[#zerotierone_x64.exe] -i %*&#13;&#10;)&#13;&#10;" Options="160" Order="0" FileEncoding="0"/>
-    <ROW Name="Replace" TxtUpdateSet="zerotiercli1.bat" FindPattern="YourFindText" ReplacePattern="YourReplaceText" Options="2" Order="1" FileEncoding="-1"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.TxtUpdateSetComponent">
-    <ROW Key="zerotiercli.bat" Component="regid.201001.com.zerotier" FileName="zerotier-cli.bat" Directory="APPDIR" Options="17"/>
-    <ROW Key="zerotiercli1.bat" Component="regid.201001.com.zerotier" FileName="zerotier-idtool.bat" Directory="APPDIR" Options="17"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.XmlAttributeComponent">
-    <ROW XmlAttribute="xmlnsds" XmlElement="swidsoftware_identification_tag" Name="xmlns:ds" Flags="14" Order="0" Value="http://www.w3.org/2000/09/xmldsig#"/>
-    <ROW XmlAttribute="xmlnsswid" XmlElement="swidsoftware_identification_tag" Name="xmlns:swid" Flags="14" Order="1" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd"/>
-    <ROW XmlAttribute="xmlnsxsi" XmlElement="swidsoftware_identification_tag" Name="xmlns:xsi" Flags="14" Order="2" Value="http://www.w3.org/2001/XMLSchema-instance"/>
-    <ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent">
-    <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="2" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Condition="1" Order="0" Flags="14" Text="false" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Condition="1" Order="0" Flags="14" Text="1" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidname" ParentElement="swidproduct_version" Name="swid:name" Condition="1" Order="0" Flags="14" Text="[ProductVersion]" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidname_1" ParentElement="swidsoftware_creator" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc." UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidname_2" ParentElement="swidsoftware_licensor" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc." UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidname_3" ParentElement="swidtag_creator" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc." UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidnumeric" ParentElement="swidproduct_version" Name="swid:numeric" Condition="1" Order="1" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidproduct_title" ParentElement="swidsoftware_identification_tag" Name="swid:product_title" Condition="1" Order="1" Flags="14" Text="[ProductName]" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidproduct_version" ParentElement="swidsoftware_identification_tag" Name="swid:product_version" Condition="1" Order="2" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidregid" ParentElement="swidsoftware_creator" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidregid_1" ParentElement="swidsoftware_licensor" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidregid_2" ParentElement="swidtag_creator" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidreview" ParentElement="swidnumeric" Name="swid:review" Condition="1" Order="3" Flags="14" Text="0" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidsoftware_creator" ParentElement="swidsoftware_identification_tag" Name="swid:software_creator" Condition="1" Order="3" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidsoftware_id" ParentElement="swidsoftware_identification_tag" Name="swid:software_id" Condition="1" Order="5" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidsoftware_identification_tag" Name="swid:software_identification_tag" Condition="1" Order="0" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidsoftware_licensor" ParentElement="swidsoftware_identification_tag" Name="swid:software_licensor" Condition="1" Order="4" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidtag_creator" ParentElement="swidsoftware_identification_tag" Name="swid:tag_creator" Condition="1" Order="6" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidtag_creator_regid" ParentElement="swidsoftware_id" Name="swid:tag_creator_regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidunique_id" ParentElement="swidsoftware_id" Name="swid:unique_id" Condition="1" Order="0" Flags="14" Text="ZeroTierOne" UpdateIndexInParent="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.XmlFileComponent">
-    <ROW XmlFile="regid.199509.com.example_ProductName.swidtag" FileName="REGID2~1.SWI|regid.2010-01.com.zerotier_ZeroTierOne.swidtag" DirProperty="APPDIR" Component="ProductInformation" RootElement="swidsoftware_identification_tag" Flags="25" Version="1.0" Encoding="UTF-8" IndentUnits="2"/>
-    <ROW XmlFile="regid.199509.com.example_ProductName.swidtag_1" FileName="REGID2~1.SWI|regid.2010-01.com.zerotier_ZeroTierOne.swidtag" DirProperty="regid.201001.com.zerotier_Dir" Component="ProductInformation" RootElement="swidsoftware_identification_tag" Flags="25" Version="1.0" Encoding="UTF-8" IndentUnits="2"/>
-  </COMPONENT>
-</DOCUMENT>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="12.5.1" Modules="enterprise" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}">
+  <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
+    <ROW Name="HiddenItems" Value="UpdaterComponent;SerValComponent;AutorunComponent;MultipleInstancesComponent;MsiJavaComponent;MsiRegsComponent;MsiExtComponent;MsiAssemblyComponent;MsiDriverPackagesComponent;AnalyticsComponent;ActSyncAppComponent;MsiMergeModsComponent;MsiThemeComponent;BackgroundImagesComponent;DictionaryComponent;MsiEnvComponent;ScheduledTasksComponent;CPLAppletComponent;GameUxComponent;UserAccountsComponent;MsiClassComponent;WebApplicationsComponent;MsiOdbcDataSrcComponent;SqlConnectionComponent;SharePointSlnComponent;SilverlightSlnComponent;MsiAppSearchComponent"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
+    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
+    <ROW Property="AI_EMBD_MSI_EXTR_PATH" Value="[TempFolder]" ValueLocId="-"/>
+    <ROW Property="AI_EXTERNALUIUNINSTALLERNAME" MultiBuildValue="DefaultBuild:aiui"/>
+    <ROW Property="AI_PREDEF_LCONDS_PROPS" Value="AI_DETECTED_DOTNET_VERSION"/>
+    <ROW Property="AI_PRODUCTNAME_ARP" Value="ZeroTier One"/>
+    <ROW Property="AI_REQUIRED_DOTNET_DISPLAY" MultiBuildValue="DefaultBuild:4.5" ValueLocId="-"/>
+    <ROW Property="AI_REQUIRED_DOTNET_VERSION" MultiBuildValue="DefaultBuild:4.5" ValueLocId="-"/>
+    <ROW Property="AI_UNINSTALLER" Value="msiexec.exe"/>
+    <ROW Property="ALLUSERS" Value="1"/>
+    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]."/>
+    <ROW Property="ARPCONTACT" Value="contact@zerotier.com"/>
+    <ROW Property="ARPHELPLINK" Value="https://www.zerotier.com/"/>
+    <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
+    <ROW Property="ARPNOREPAIR" Value="1"/>
+    <ROW Property="ARPPRODUCTICON" Value="ZeroTierIcon.exe" Type="8"/>
+    <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
+    <ROW Property="ARPURLINFOABOUT" Value="https://www.zerotier.com/"/>
+    <ROW Property="ARPURLUPDATEINFO" Value="https://www.zerotier.com/"/>
+    <ROW Property="AiFeatIcoZeroTierOne" Value="ZeroTierIcon.exe" Type="8"/>
+    <ROW Property="CTRLS" Value="2"/>
+    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
+    <ROW Property="Manufacturer" Value="ZeroTier, Inc."/>
+    <ROW Property="ProductCode" Value="1033:{A6D97FB1-02FA-4042-A0EE-A080D53CDBBF} " Type="16"/>
+    <ROW Property="ProductLanguage" Value="1033"/>
+    <ROW Property="ProductName" Value="ZeroTier One"/>
+    <ROW Property="ProductVersion" Value="1.1.5" Type="32"/>
+    <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
+    <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
+    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
+    <ROW Property="UpgradeCode" Value="{B0E2A5F3-88B6-4E77-B922-CB4739B4C4C8}"/>
+    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT" MultiBuildValue="DefaultBuild:Windows 2000, Windows 2000 Service Pack 1, Windows 2000 Service Pack 2, Windows 2000 Service Pack 3, Windows 2000 Service Pack 4, Windows XP x86, Windows XP x86 Service Pack 1, Windows XP x86 Service Pack 2, Windows XP x86 Service Pack 3, Windows Server 2003 x86, Windows Server 2003 x86 Service Pack 1, Windows Server 2003 x86 Service Pack 2" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT64" MultiBuildValue="DefaultBuild:Windows XP x64, Windows XP x64 Service Pack 1, Windows XP x64 Service Pack 2, Windows Server 2003 x64, Windows Server 2003 x64 Service Pack 1, Windows Server 2003 x64 Service Pack 2" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT64Display" MultiBuildValue="DefaultBuild:Windows XP x64, Windows Server 2003 x64" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNTDisplay" MultiBuildValue="DefaultBuild:Windows 2000, Windows XP x86, Windows Server 2003 x86" ValueLocId="-"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
+    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1" DirectoryOptions="2"/>
+    <ROW Directory="CommonAppDataFolder" Directory_Parent="TARGETDIR" DefaultDir="COMMON~1|CommonAppDataFolder" IsPseudoRoot="1"/>
+    <ROW Directory="One_Dir" Directory_Parent="ZeroTier_Dir" DefaultDir="One"/>
+    <ROW Directory="ProgramFilesFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~1|ProgramFilesFolder" IsPseudoRoot="1"/>
+    <ROW Directory="ProgramMenuFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~2|ProgramMenuFolder" IsPseudoRoot="1"/>
+    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
+    <ROW Directory="ZeroTier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="ZeroTier"/>
+    <ROW Directory="networks.d_Dir" Directory_Parent="One_Dir" DefaultDir="networks.d"/>
+    <ROW Directory="regid.201001.com.zerotier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="REGID2~1.ZER|regid.2010-01.com.zerotier"/>
+    <ROW Directory="tapwindows_Dir" Directory_Parent="One_Dir" DefaultDir="TAP-WI~1|tap-windows"/>
+    <ROW Directory="ui_Dir" Directory_Parent="One_Dir" DefaultDir="ui" DirectoryOptions="3"/>
+    <ROW Directory="x64_Dir" Directory_Parent="tapwindows_Dir" DefaultDir="x64"/>
+    <ROW Directory="x86_Dir" Directory_Parent="tapwindows_Dir" DefaultDir="x86"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
+    <ROW Component="AI_CustomARPName" ComponentId="{738BDE1C-E12F-4DFB-B279-9038EECEFF45}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
+    <ROW Component="AI_DisableModify" ComponentId="{020DCABD-5D56-49B9-AF48-F07F0B55E590}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
+    <ROW Component="Newtonsoft.Json.dll" ComponentId="{0B2F229D-5425-42FB-9E28-F6D25AB2B4B5}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/>
+    <ROW Component="ProductInformation" ComponentId="{DB078D04-EA8E-4A7C-9001-89BAD932F9D9}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
+    <ROW Component="ZeroTierOne.exe" ComponentId="{18B51525-77BF-4FD9-9C18-A10D4CFC25BA}" Directory_="APPDIR" Attributes="0" KeyPath="ZeroTierOne.exe"/>
+    <ROW Component="index.html" ComponentId="{24AB46DC-56EA-4F3C-A8B7-95957509CDD1}" Directory_="ui_Dir" Attributes="0" KeyPath="index.html" Type="0"/>
+    <ROW Component="networks.d" ComponentId="{EF54D0DF-889F-41DC-AF5C-4E7F96AB1C8B}" Directory_="networks.d_Dir" Attributes="0"/>
+    <ROW Component="regid.201001.com.zerotier" ComponentId="{A39C80FC-6A8F-454F-9052-10DAC3C3B139}" Directory_="regid.201001.com.zerotier_Dir" Attributes="0"/>
+    <ROW Component="zerotierone_x64.exe" ComponentId="{DFCFB72D-B055-4E60-B6D8-81FF585C2183}" Directory_="One_Dir" Attributes="256" Condition="VersionNT64" KeyPath="zerotierone_x64.exe"/>
+    <ROW Component="zerotierone_x86.exe" ComponentId="{5D2F3366-4FE1-40A4-A81A-66C49FA11F1C}" Directory_="One_Dir" Attributes="0" Condition="NOT VersionNT64" KeyPath="zerotierone_x86.exe"/>
+    <ROW Component="zttap300.cat" ComponentId="{123CD683-FD99-4F0F-8F9B-0222DF409B09}" Directory_="x64_Dir" Attributes="256" Condition="VersionNT64" KeyPath="zttap300.cat_2" Type="0"/>
+    <ROW Component="zttap300.cat_1" ComponentId="{9F913E48-095B-4EA3-98DA-EDAB1593F3E3}" Directory_="x86_Dir" Attributes="0" Condition="NOT VersionNT64" KeyPath="zttap300.cat_3" Type="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
+    <ROW Feature="ZeroTierOne" Title="MainFeature" Description="ZeroTier One" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify Newtonsoft.Json.dll ProductInformation ZeroTierOne.exe index.html networks.d regid.201001.com.zerotier zerotierone_x64.exe zerotierone_x86.exe zttap300.cat zttap300.cat_1"/>
+    <ATTRIBUTE name="CurrentFeature" value="ZeroTierOne"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
+    <ROW File="Newtonsoft.Json.dll" Component_="Newtonsoft.Json.dll" FileName="NEWTON~1.DLL|Newtonsoft.Json.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\windows\WinUI\bin\Release\Newtonsoft.Json.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="ZeroTierOne.exe" Component_="ZeroTierOne.exe" FileName="ZEROTI~1.EXE|ZeroTier One.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\windows\WinUI\bin\Release\ZeroTier One.exe" SelfReg="false" NextFile="zttap300.cat_2" DigSign="true"/>
+    <ROW File="index.html" Component_="index.html" FileName="INDEX~1.HTM|index.html" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\ui\index.html" SelfReg="false" NextFile="main.js"/>
+    <ROW File="main.js" Component_="index.html" FileName="main.js" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\ui\main.js" SelfReg="false" NextFile="react.min.js"/>
+    <ROW File="react.min.js" Component_="index.html" FileName="REACTM~1.JS|react.min.js" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\ui\react.min.js" SelfReg="false" NextFile="simpleajax.min.js"/>
+    <ROW File="simpleajax.min.js" Component_="index.html" FileName="SIMPLE~1.JS|simpleajax.min.js" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\ui\simpleajax.min.js" SelfReg="false" NextFile="zerotier.css"/>
+    <ROW File="zerotier.css" Component_="index.html" FileName="zerotier.css" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\ui\zerotier.css" SelfReg="false" NextFile="ztui.min.js"/>
+    <ROW File="zerotierone_x64.exe" Component_="zerotierone_x64.exe" FileName="ZEROTI~2.EXE|zerotier-one_x64.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\windows\Build\x64\Release\zerotier-one_x64.exe" SelfReg="false" NextFile="ZeroTierOne.exe" DigSign="true"/>
+    <ROW File="zerotierone_x86.exe" Component_="zerotierone_x86.exe" FileName="ZEROTI~1.EXE|zerotier-one_x86.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\windows\Build\Win32\Release\zerotier-one_x86.exe" SelfReg="false" NextFile="zerotierone_x64.exe" DigSign="true"/>
+    <ROW File="zttap300.cat_2" Component_="zttap300.cat" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.cat" SelfReg="false" NextFile="zttap300.sys_2"/>
+    <ROW File="zttap300.cat_3" Component_="zttap300.cat_1" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.cat" SelfReg="false" NextFile="zttap300.sys_3"/>
+    <ROW File="zttap300.inf" Component_="zttap300.cat" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.inf" SelfReg="false" NextFile="zttap300.cat_3"/>
+    <ROW File="zttap300.inf_1" Component_="zttap300.cat_1" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.inf" SelfReg="false" NextFile="index.html"/>
+    <ROW File="zttap300.sys_2" Component_="zttap300.cat" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.sys" SelfReg="false" NextFile="zttap300.inf"/>
+    <ROW File="zttap300.sys_3" Component_="zttap300.cat_1" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.sys" SelfReg="false" NextFile="zttap300.inf_1"/>
+    <ROW File="ztui.min.js" Component_="index.html" FileName="ZTUIMI~1.JS|ztui.min.js" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\ui\ztui.min.js" SelfReg="false" NextFile="Newtonsoft.Json.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
+    <ROW BuildKey="DefaultBuild" BuildName="MSI" BuildOrder="1" BuildType="1" PackageFolder="..\..\.." PackageFileName="ZeroTier One" Languages="en" InstallationType="4" ExtUI="true" UseLargeSchema="true"/>
+    <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.CacheComponent">
+    <ATTRIBUTE name="Enable" value="false"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.ChainedPackageComponent">
+    <ROW ChainedPackage="ZeroTierOne_NDIS6_x64.msi" Order="1" Options="108" InstallCondition="(VersionNT64)" RemoveCondition="((REMOVE=&quot;ALL&quot;) AND (NOT UPGRADINGPRODUCTCODE) AND (VersionNT64))"/>
+    <ROW ChainedPackage="ZeroTierOne_NDIS6_x86.msi" Order="2" Options="108" InstallCondition="(NOT VersionNT64)" RemoveCondition="((REMOVE=&quot;ALL&quot;) AND (NOT UPGRADINGPRODUCTCODE) AND (NOT VersionNT64))"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.ChainedPackageFileComponent">
+    <ROW FileId="ZeroTierOne_NDIS6_x64.msi" ChainedPackage="ZeroTierOne_NDIS6_x64.msi" Options="1" TargetPath="ZeroTierOne_NDIS6_x64.msi" Content="..\..\bin\tap-windows-ndis6\x64\ZeroTierOne_NDIS6_x64.msi"/>
+    <ROW FileId="ZeroTierOne_NDIS6_x86.msi" ChainedPackage="ZeroTierOne_NDIS6_x86.msi" Options="1" TargetPath="ZeroTierOne_NDIS6_x86.msi" Content="..\..\bin\tap-windows-ndis6\x86\ZeroTierOne_NDIS6_x86.msi"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
+    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
+    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
+    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="ZeroTier One" DescriptionUrl="https://www.zerotier.com/" SignOptions="7" SignTool="0" Thumbprint="2ad023dc7aa92bf4265b33852a2ed2406d2bee86 Subject: ZeroTier Networks LLC&#10;Issuer: DigiCert High Assurance Code Signing CA-1&#10;Valid from 04/24/2015 to 04/01/2016"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.FirewallExceptionComponent">
+    <ROW FirewallException="ZeroTierOneUDP9993" DisplayName="ZeroTier One UDP/9993" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="1" Profiles="7" Port="9993" Protocol="UDP"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
+    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
+    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
+    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
+    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
+    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
+    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
+    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
+    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
+    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
+    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
+    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiActionTextComponent">
+    <ROW Action="AI_FwConfig" Description="Executing Windows Firewall configurations" Template="Configuring Windows Firewall rule: &quot;[1]&quot;" DescriptionLocId="ActionText.Description.AI_FwConfig" TemplateLocId="ActionText.Template.AI_FwConfig"/>
+    <ROW Action="AI_FwInstall" Description="Generating actions to configure Windows Firewall" DescriptionLocId="ActionText.Description.AI_FwInstall"/>
+    <ROW Action="AI_FwRemove" Description="Executing Windows Firewall configurations" Template="Configuring Windows Firewall rule:  &quot;[1]&quot;" DescriptionLocId="ActionText.Description.AI_FwRemove" TemplateLocId="ActionText.Template.AI_FwRemove"/>
+    <ROW Action="AI_FwRollback" Description="Rolling back Windows Firewall configurations." Template="Rolling back Windows Firewall configurations." DescriptionLocId="ActionText.Description.AI_FwRollback" TemplateLocId="ActionText.Template.AI_FwRollback"/>
+    <ROW Action="AI_FwUninstall" Description="Generating actions to configure Windows Firewall" DescriptionLocId="ActionText.Description.AI_FwUninstall"/>
+    <ROW Action="AI_XmlCommit" Description="Committing XML file configurations." Template="Committing XML file configurations." DescriptionLocId="ActionText.Description.AI_XmlCommit" TemplateLocId="ActionText.Template.AI_XmlCommit"/>
+    <ROW Action="AI_XmlConfig" Description="Executing XML file configurations" Template="Configuring XML file: &quot;[1]&quot;" DescriptionLocId="ActionText.Description.AI_XmlConfig" TemplateLocId="ActionText.Template.AI_XmlConfig"/>
+    <ROW Action="AI_XmlInstall" Description="Generating actions to configure XML files" DescriptionLocId="ActionText.Description.AI_XmlInstall"/>
+    <ROW Action="AI_XmlRemove" Description="Executing XML file configurations" Template="Configuring XML file: &quot;[1]&quot;" DescriptionLocId="ActionText.Description.AI_XmlRemove" TemplateLocId="ActionText.Template.AI_XmlRemove"/>
+    <ROW Action="AI_XmlRollback" Description="Rolling back XML file configurations." Template="Rolling back XML file configurations." DescriptionLocId="ActionText.Description.AI_XmlRollback" TemplateLocId="ActionText.Template.AI_XmlRollback"/>
+    <ROW Action="AI_XmlUninstall" Description="Generating actions to configure XML files" DescriptionLocId="ActionText.Description.AI_XmlUninstall"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
+    <ROW Name="ExternalUICleaner.dll" SourcePath="&lt;AI_CUSTACTS&gt;ExternalUICleaner.dll"/>
+    <ROW Name="NetFirewall.dll" SourcePath="&lt;AI_CUSTACTS&gt;NetFirewall.dll"/>
+    <ROW Name="ShortcutFlags.dll" SourcePath="&lt;AI_CUSTACTS&gt;ShortcutFlags.dll"/>
+    <ROW Name="SoftwareDetector.dll" SourcePath="&lt;AI_CUSTACTS&gt;SoftwareDetector.dll"/>
+    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
+    <ROW Name="chainersupport.dll" SourcePath="&lt;AI_CUSTACTS&gt;chainersupport.dll"/>
+    <ROW Name="msichainer.exe" SourcePath="&lt;AI_CUSTACTS&gt;msichainer.exe"/>
+    <ROW Name="xmlCfg.dll" SourcePath="&lt;AI_CUSTACTS&gt;xmlCfg.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent">
+    <ROW Dialog_="WelcomeDlg" Control="WelcomeDlgDialogInitializer" Type="DialogInitializer" X="0" Y="0" Width="0" Height="0" Attributes="0" Order="-1" TextLocId="-" HelpLocId="-" ExtDataLocId="-"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
+    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
+    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfRbDiskDlg" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" Ordering="2" Options="2"/>
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="EnableRollback" Argument="False" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" Ordering="3" Options="2"/>
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfDiskDlg" Condition="AI_INSTALL AND ( (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;) )" Ordering="4" Options="2"/>
+    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[AI_ButtonText_Next_Orig]" Argument="[ButtonText_Next]" Condition="AI_INSTALL" Ordering="0" Options="2"/>
+    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[ButtonText_Next]" Argument="[[AI_CommitButton]]" Condition="AI_INSTALL" Ordering="1" Options="2"/>
+    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[AI_Text_Next_Orig]" Argument="[Text_Next]" Condition="AI_INSTALL" Ordering="2" Options="2"/>
+    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[Text_Next]" Argument="[Text_Install]" Condition="AI_INSTALL" Ordering="3" Options="2"/>
+    <ROW Dialog_="WelcomeDlg" Control_="Back" Event="[ButtonText_Next]" Argument="[AI_ButtonText_Next_Orig]" Condition="AI_INSTALL" Ordering="0" Options="2"/>
+    <ROW Dialog_="WelcomeDlg" Control_="Back" Event="[Text_Next]" Argument="[AI_Text_Next_Orig]" Condition="AI_INSTALL" Ordering="1" Options="2"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
+    <ROW Directory_="networks.d_Dir" Component_="networks.d" ManualDelete="false"/>
+    <ROW Directory_="regid.201001.com.zerotier_Dir" Component_="regid.201001.com.zerotier" ManualDelete="false"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
+    <ROW Action="AI_ApplyShortcutFlags" Type="3073" Source="ShortcutFlags.dll" Target="UpdateShortcutFlags" WithoutSeq="true"/>
+    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
+    <ROW Action="AI_CommitChainers" Type="11841" Source="chainersupport.dll" Target="CommitChainedPackages" WithoutSeq="true"/>
+    <ROW Action="AI_DATA_SETTER" Type="51" Source="CustomActionData" Target="[~]"/>
+    <ROW Action="AI_DATA_SETTER_1" Type="51" Source="CustomActionData" Target="[~]"/>
+    <ROW Action="AI_DATA_SETTER_2" Type="51" Source="CustomActionData" Target="[~]"/>
+    <ROW Action="AI_DATA_SETTER_3" Type="51" Source="CustomActionData" Target="[~]"/>
+    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
+    <ROW Action="AI_DetectSoftware" Type="257" Source="SoftwareDetector.dll" Target="OnDetectSoftware"/>
+    <ROW Action="AI_DoRemoveExternalUIStub" Type="3585" Source="ExternalUICleaner.dll" Target="DoRemoveExternalUIStub" WithoutSeq="true"/>
+    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
+    <ROW Action="AI_FwConfig" Type="11265" Source="NetFirewall.dll" Target="OnFwConfig" WithoutSeq="true"/>
+    <ROW Action="AI_FwInstall" Type="1" Source="NetFirewall.dll" Target="OnFwInstall" AdditionalSeq="AI_DATA_SETTER_2"/>
+    <ROW Action="AI_FwRemove" Type="11265" Source="NetFirewall.dll" Target="OnFwRemove" WithoutSeq="true"/>
+    <ROW Action="AI_FwRollback" Type="11521" Source="NetFirewall.dll" Target="OnFwRollback" WithoutSeq="true"/>
+    <ROW Action="AI_FwUninstall" Type="1" Source="NetFirewall.dll" Target="OnFwUninstall" AdditionalSeq="AI_DATA_SETTER_3"/>
+    <ROW Action="AI_GetArpIconPath" Type="1" Source="aicustact.dll" Target="GetArpIconPath"/>
+    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
+    <ROW Action="AI_LaunchApp" Type="1" Source="aicustact.dll" Target="[#ZeroTierOne.exe]"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
+    <ROW Action="AI_PrepareChainers" Type="1" Source="chainersupport.dll" Target="PrepareChainedPackages"/>
+    <ROW Action="AI_PrepareShortcutFlags" Type="1" Source="ShortcutFlags.dll" Target="PrepareActionData"/>
+    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH" Target="[AI_SETUPEXEPATH_ORIGINAL]"/>
+    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
+    <ROW Action="AI_RemoveExternalUIStub" Type="1" Source="ExternalUICleaner.dll" Target="RemoveExternalUIStub"/>
+    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
+    <ROW Action="AI_RollbackChainers" Type="11585" Source="chainersupport.dll" Target="RollbackChainedPackages" WithoutSeq="true"/>
+    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
+    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
+    <ROW Action="AI_XmlCommit" Type="11777" Source="xmlCfg.dll" Target="OnXmlCommit" WithoutSeq="true"/>
+    <ROW Action="AI_XmlConfig" Type="11265" Source="xmlCfg.dll" Target="OnXmlConfig" WithoutSeq="true"/>
+    <ROW Action="AI_XmlInstall" Type="1" Source="xmlCfg.dll" Target="OnXmlInstall" AdditionalSeq="AI_DATA_SETTER"/>
+    <ROW Action="AI_XmlRemove" Type="11265" Source="xmlCfg.dll" Target="OnXmlRemove" WithoutSeq="true"/>
+    <ROW Action="AI_XmlRollback" Type="11521" Source="xmlCfg.dll" Target="OnXmlRollback" WithoutSeq="true"/>
+    <ROW Action="AI_XmlUninstall" Type="1" Source="xmlCfg.dll" Target="OnXmlUninstall" AdditionalSeq="AI_DATA_SETTER_1"/>
+    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFilesFolder]ZeroTier\One"/>
+    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]" MultiBuildTarget="DefaultBuild:[ProgramMenuFolder]"/>
+    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
+    <ROW Action="TapDeviceRemove32" Type="3154" Source="zerotierone_x86.exe" Target="-D"/>
+    <ROW Action="TapDeviceRemove64" Type="3154" Source="zerotierone_x64.exe" Target="-D"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiEmbeddedChainerComponent">
+    <ROW MsiEmbeddedChainer="msichainer.exe" Condition="VersionMsi &gt;= &quot;4.05&quot;" CommandLine="[AI_CHAINER_CMD_LINE]" Source="msichainer.exe" Type="2"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
+    <ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
+    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
+    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1399"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="51"/>
+    <ROW Action="AI_PrepareShortcutFlags" Condition="(VersionNT &gt; 501) AND ((NOT Installed) OR (Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;)))" Sequence="4501"/>
+    <ROW Action="AI_XmlInstall" Condition="(REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5102"/>
+    <ROW Action="AI_DATA_SETTER" Condition="(REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5101"/>
+    <ROW Action="AI_XmlUninstall" Condition="(REMOVE)" Sequence="3102"/>
+    <ROW Action="AI_DATA_SETTER_1" Condition="(REMOVE)" Sequence="3101"/>
+    <ROW Action="InstallFinalize" Sequence="6597" SeqType="0" MsiKey="InstallFinalize"/>
+    <ROW Action="AI_RemoveExternalUIStub" Condition="(REMOVE=&quot;ALL&quot;) AND ((VersionNT &gt; 500) OR((VersionNT = 500) AND (ServicePackLevel &gt;= 4)))" Sequence="1501"/>
+    <ROW Action="AI_GetArpIconPath" Sequence="1401"/>
+    <ROW Action="TapDeviceRemove32" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) AND NOT UPGRADINGPRODUCTCODE ) AND ( NOT VersionNT64 )" Sequence="1601"/>
+    <ROW Action="TapDeviceRemove64" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) AND NOT UPGRADINGPRODUCTCODE ) AND ( VersionNT64 )" Sequence="1602"/>
+    <ROW Action="AI_PrepareChainers" Condition="VersionMsi &gt;= &quot;4.05&quot;" Sequence="5851"/>
+    <ROW Action="AI_FwInstall" Condition="(VersionNT &gt;= 501) AND (REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5802"/>
+    <ROW Action="AI_DATA_SETTER_2" Condition="(VersionNT &gt;= 501) AND (REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5801"/>
+    <ROW Action="AI_FwUninstall" Condition="(VersionNT &gt;= 501) AND (REMOVE=&quot;ALL&quot;)" Sequence="1702"/>
+    <ROW Action="AI_DATA_SETTER_3" Condition="(VersionNT &gt;= 501) AND (REMOVE=&quot;ALL&quot;)" Sequence="1701"/>
+    <ROW Action="AI_DetectSoftware" Sequence="101"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="52"/>
+    <ROW Action="AI_DpiContentScale" Sequence="51"/>
+    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
+    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="102"/>
+    <ROW Action="ExecuteAction" Sequence="1299" SeqType="0" MsiKey="ExecuteAction"/>
+    <ROW Action="AI_DetectSoftware" Sequence="101"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
+    <ROW Condition="( Version9X OR ( NOT VersionNT64 ) OR ( VersionNT64 AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &gt;= 1)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &lt;&gt; 1)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR (((VersionNT64 = 502) AND (ServicePackLevel &lt;&gt; 2)) OR (MsiNTProductType &lt;&gt; 1))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &gt;= 1)))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &lt;&gt; 1)))) AND ((VersionNT64 &lt;&gt; 502) OR ((VersionNT64 = 502) AND ((MsiNTProductType = 1) OR (ServicePackLevel &lt;&gt; 2)))) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT64Display]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT64" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="( Version9X OR VersionNT64 OR ( VersionNT AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &gt;= 1))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 1))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 2))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 3))) AND ((VersionNT &lt;&gt; 500) OR ((VersionNT = 500) AND (ServicePackLevel &lt;&gt; 4))) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &gt;= 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 2))) OR VersionNT64) AND (((VersionNT &lt;&gt; 501) OR ((VersionNT = 501) AND (ServicePackLevel &lt;&gt; 3))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &gt;= 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &lt;&gt; 1))) OR VersionNT64) AND (((VersionNT &lt;&gt; 502) OR ((VersionNT = 502) AND (ServicePackLevel &lt;&gt; 2))) OR VersionNT64) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNTDisplay]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT40Display]" DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="AI_DETECTED_DOTNET_VERSION &gt;= AI_REQUIRED_DOTNET_VERSION" Description="[ProductName] cannot be installed on systems with .NET Framework version lower than [AI_REQUIRED_DOTNET_DISPLAY]." DescriptionLocId="AI.LaunchCondition.DotNET" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="Privileged" Description="[ProductName] requires administrative privileges to install." DescriptionLocId="AI.LaunchCondition.Privileged" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
+    <ROW Registry="Comments" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Comments" Value="[ARPCOMMENTS]" Component_="AI_CustomARPName"/>
+    <ROW Registry="Contact" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Contact" Value="[ARPCONTACT]" Component_="AI_CustomARPName"/>
+    <ROW Registry="DisplayIcon" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayIcon" Value="[ARP_ICON_PATH]" Component_="AI_CustomARPName"/>
+    <ROW Registry="DisplayName" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayName" Value="[AI_PRODUCTNAME_ARP]" Component_="AI_CustomARPName"/>
+    <ROW Registry="DisplayVersion" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayVersion" Value="[ProductVersion]" Component_="AI_CustomARPName"/>
+    <ROW Registry="HelpLink" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="HelpLink" Value="[ARPHELPLINK]" Component_="AI_CustomARPName"/>
+    <ROW Registry="HelpTelephone" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="HelpTelephone" Value="[ARPHELPTELEPHONE]" Component_="AI_CustomARPName"/>
+    <ROW Registry="InstallLocation" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="InstallLocation" Value="[APPDIR]" Component_="AI_CustomARPName"/>
+    <ROW Registry="ModifyPath" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="ModifyPath" Value="[AI_UNINSTALLER] /I [ProductCode]" Component_="AI_CustomARPName"/>
+    <ROW Registry="NoModify" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="NoModify" Value="#1" Component_="AI_DisableModify"/>
+    <ROW Registry="NoRepair" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="NoRepair" Value="#1" Component_="AI_CustomARPName"/>
+    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
+    <ROW Registry="Publisher" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Publisher" Value="[Manufacturer]" Component_="AI_CustomARPName"/>
+    <ROW Registry="URLInfoAbout" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="URLInfoAbout" Value="[ARPURLINFOABOUT]" Component_="AI_CustomARPName"/>
+    <ROW Registry="URLUpdateInfo" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="URLUpdateInfo" Value="[ARPURLUPDATEINFO]" Component_="AI_CustomARPName"/>
+    <ROW Registry="UninstallPath" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="UninstallPath" Value="[AI_UNINSTALLER] /x [ProductCode]" Component_="AI_CustomARPName"/>
+    <ROW Registry="UninstallString" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="UninstallString" Value="[AI_UNINSTALLER] /x [ProductCode]" Component_="AI_CustomARPName"/>
+    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
+    <ROW Registry="VersionMajor" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="VersionMajor" Value="#0" Component_="AI_CustomARPName"/>
+    <ROW Registry="VersionMinor" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="VersionMinor" Value="#7" Component_="AI_CustomARPName"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiRemoveFileComponent">
+    <ROW FileKey="devcon.log" Component_="ProductInformation" FileName="devcon.log" DirProperty="One_Dir" InstallMode="3"/>
+    <ROW FileKey="devcon_x64.exe" Component_="ProductInformation" FileName="devcon_x64.exe" DirProperty="One_Dir" InstallMode="3"/>
+    <ROW FileKey="devcon_x86.exe" Component_="ProductInformation" FileName="devcon_x86.exe" DirProperty="One_Dir" InstallMode="3"/>
+    <ROW FileKey="node.log" Component_="ProductInformation" FileName="node.log" DirProperty="One_Dir" InstallMode="3"/>
+    <ROW FileKey="node.log.old" Component_="ProductInformation" FileName="node.log.old" DirProperty="One_Dir" InstallMode="3"/>
+    <ROW FileKey="roottopology" Component_="ProductInformation" FileName="root-topology" DirProperty="One_Dir" InstallMode="3"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiServCtrlComponent">
+    <ROW ServiceControl="zerotierone_x64.exe" Name="ZeroTierOneService" Event="163" Wait="1" Component_="zerotierone_x64.exe"/>
+    <ROW ServiceControl="zerotierone_x86.exe" Name="ZeroTierOneService" Event="163" Wait="1" Component_="zerotierone_x86.exe"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiServInstComponent">
+    <ROW ServiceInstall="zerotierone_x64.exe" Name="ZeroTierOneService" DisplayName="ZeroTier One" ServiceType="16" StartType="2" ErrorControl="32769" Component_="zerotierone_x64.exe" Description="Ethernet Virtualization Service"/>
+    <ROW ServiceInstall="zerotierone_x86.exe" Name="ZeroTierOneService" DisplayName="ZeroTier One" ServiceType="16" StartType="2" ErrorControl="32769" Component_="zerotierone_x86.exe" Description="Ethernet Virtualization Service"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
+    <ROW Shortcut="ZeroTierOne" Directory_="ProgramMenuFolder" Name="ZEROTI~1|ZeroTier One" Component_="ZeroTierOne.exe" Target="[#ZeroTierOne.exe]" Description="Ethernet Virtualization Control Panel" Hotkey="0" Icon_="ZeroTierIcon.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR" CustomFlags="1"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
+    <ATTRIBUTE name="UsedTheme" value="classic"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.SoftwareIdentificationComponent">
+    <ATTRIBUTE name="LocalFile" value="regid.199509.com.example_ProductName.swidtag"/>
+    <ATTRIBUTE name="SystemFile" value="regid.199509.com.example_ProductName.swidtag_1"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.XmlAttributeComponent">
+    <ROW XmlAttribute="xmlnsds" XmlElement="swidsoftware_identification_tag" Name="xmlns:ds" Flags="14" Order="0" Value="http://www.w3.org/2000/09/xmldsig#"/>
+    <ROW XmlAttribute="xmlnsswid" XmlElement="swidsoftware_identification_tag" Name="xmlns:swid" Flags="14" Order="1" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd"/>
+    <ROW XmlAttribute="xmlnsxsi" XmlElement="swidsoftware_identification_tag" Name="xmlns:xsi" Flags="14" Order="2" Value="http://www.w3.org/2001/XMLSchema-instance"/>
+    <ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent">
+    <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="5"/>
+    <ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Condition="1" Order="0" Flags="14" Text="false"/>
+    <ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Condition="1" Order="0" Flags="14" Text="1"/>
+    <ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="1"/>
+    <ROW XmlElement="swidname" ParentElement="swidproduct_version" Name="swid:name" Condition="1" Order="0" Flags="14" Text="[ProductVersion]"/>
+    <ROW XmlElement="swidname_1" ParentElement="swidsoftware_creator" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc."/>
+    <ROW XmlElement="swidname_2" ParentElement="swidsoftware_licensor" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc."/>
+    <ROW XmlElement="swidname_3" ParentElement="swidtag_creator" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc."/>
+    <ROW XmlElement="swidnumeric" ParentElement="swidproduct_version" Name="swid:numeric" Condition="1" Order="1" Flags="14"/>
+    <ROW XmlElement="swidproduct_title" ParentElement="swidsoftware_identification_tag" Name="swid:product_title" Condition="1" Order="1" Flags="14" Text="[ProductName]"/>
+    <ROW XmlElement="swidproduct_version" ParentElement="swidsoftware_identification_tag" Name="swid:product_version" Condition="1" Order="2" Flags="14"/>
+    <ROW XmlElement="swidregid" ParentElement="swidsoftware_creator" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier"/>
+    <ROW XmlElement="swidregid_1" ParentElement="swidsoftware_licensor" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier"/>
+    <ROW XmlElement="swidregid_2" ParentElement="swidtag_creator" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier"/>
+    <ROW XmlElement="swidreview" ParentElement="swidnumeric" Name="swid:review" Condition="1" Order="3" Flags="14" Text="0"/>
+    <ROW XmlElement="swidsoftware_creator" ParentElement="swidsoftware_identification_tag" Name="swid:software_creator" Condition="1" Order="3" Flags="14"/>
+    <ROW XmlElement="swidsoftware_id" ParentElement="swidsoftware_identification_tag" Name="swid:software_id" Condition="1" Order="5" Flags="14"/>
+    <ROW XmlElement="swidsoftware_identification_tag" Name="swid:software_identification_tag" Condition="1" Order="0" Flags="14"/>
+    <ROW XmlElement="swidsoftware_licensor" ParentElement="swidsoftware_identification_tag" Name="swid:software_licensor" Condition="1" Order="4" Flags="14"/>
+    <ROW XmlElement="swidtag_creator" ParentElement="swidsoftware_identification_tag" Name="swid:tag_creator" Condition="1" Order="6" Flags="14"/>
+    <ROW XmlElement="swidtag_creator_regid" ParentElement="swidsoftware_id" Name="swid:tag_creator_regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier"/>
+    <ROW XmlElement="swidunique_id" ParentElement="swidsoftware_id" Name="swid:unique_id" Condition="1" Order="0" Flags="14" Text="ZeroTierOne"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.XmlFileComponent">
+    <ROW XmlFile="regid.199509.com.example_ProductName.swidtag" FileName="REGID2~1.SWI|regid.2010-01.com.zerotier_ZeroTierOne.swidtag" DirProperty="APPDIR" Component="ProductInformation" RootElement="swidsoftware_identification_tag" Flags="25" Version="1.0" Encoding="UTF-8" IndentUnits="2"/>
+    <ROW XmlFile="regid.199509.com.example_ProductName.swidtag_1" FileName="REGID2~1.SWI|regid.2010-01.com.zerotier_ZeroTierOne.swidtag" DirProperty="regid.201001.com.zerotier_Dir" Component="ProductInformation" RootElement="swidsoftware_identification_tag" Flags="25" Version="1.0" Encoding="UTF-8" IndentUnits="2"/>
+  </COMPONENT>
+</DOCUMENT>
diff --git a/ext/installfiles/windows/ZeroTier One.back.aip b/ext/installfiles/windows/ZeroTier One.back.aip
deleted file mode 100644
index 9ad818277..000000000
--- a/ext/installfiles/windows/ZeroTier One.back.aip	
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="20.4.1" Modules="enterprise" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}">
-  <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
-    <ROW Name="HiddenItems" Value="ActSyncAppComponent;CPLAppletComponent;AutorunComponent;GameUxComponent;SilverlightSlnComponent;SharePointSlnComponent;AppXAppDetailsComponent;FixupComponent;AppXCapabilitiesComponent;AppXDependenciesComponent;AppXProductDetailsComponent;AppXVisualAssetsComponent;AppXAppDeclarationsComponent;AppXUriRulesComponent;MsiXDiffComponent;MsixManifestEditorComponent"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
-    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
-    <ROW Property="AI_EMBD_MSI_EXTR_PATH" Value="[TempFolder]" ValueLocId="-"/>
-    <ROW Property="AI_EXTERNALUIUNINSTALLERNAME" MultiBuildValue="DefaultBuild:aiui"/>
-    <ROW Property="AI_FINDEXE_TITLE" Value="Select the installation package for [|ProductName]" ValueLocId="AI.Property.FindExeTitle"/>
-    <ROW Property="AI_PREDEF_LCONDS_PROPS" Value="AI_DETECTED_DOTNET_VERSION"/>
-    <ROW Property="AI_PREREQ_REPAIR_ENABLED" MultiBuildValue="ExeBuild:1"/>
-    <ROW Property="AI_PRODUCTNAME_ARP" Value="ZeroTier One"/>
-    <ROW Property="AI_REQUIRED_DOTNET_DISPLAY" MultiBuildValue="DefaultBuild:4.5" ValueLocId="-"/>
-    <ROW Property="AI_REQUIRED_DOTNET_VERSION" MultiBuildValue="DefaultBuild:4.5" ValueLocId="-"/>
-    <ROW Property="AI_ThemeStyle" Value="aero" MsiKey="AI_ThemeStyle"/>
-    <ROW Property="AI_UNINSTALLER" Value="msiexec.exe"/>
-    <ROW Property="ALLUSERS" Value="1"/>
-    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]."/>
-    <ROW Property="ARPCONTACT" Value="contact@zerotier.com"/>
-    <ROW Property="ARPHELPLINK" Value="https://www.zerotier.com/"/>
-    <ROW Property="ARPHELPTELEPHONE" Value="949-505-9993"/>
-    <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
-    <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="ExeBuild:1"/>
-    <ROW Property="ARPPRODUCTICON" Value="ZeroTierIcon.exe" Type="8"/>
-    <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
-    <ROW Property="ARPURLINFOABOUT" Value="https://www.zerotier.com/"/>
-    <ROW Property="ARPURLUPDATEINFO" Value="https://www.zerotier.com/"/>
-    <ROW Property="AiFeatIcoZeroTierOne" Value="ZeroTierIcon.exe" Type="8"/>
-    <ROW Property="LIMITUI" MultiBuildValue="DefaultBuild:1"/>
-    <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
-    <ROW Property="Manufacturer" Value="ZeroTier, Inc."/>
-    <ROW Property="ProductCode" Value="1033:{8D8ECA43-43FF-4358-84E9-4629D8855C03} " Type="16"/>
-    <ROW Property="ProductLanguage" Value="1033"/>
-    <ROW Property="ProductName" Value="ZeroTier One"/>
-    <ROW Property="ProductVersion" Value="1.10.6"/>
-    <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
-    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
-    <ROW Property="UpgradeCode" Value="{B0E2A5F3-88B6-4E77-B922-CB4739B4C4C8}"/>
-    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME#ExeBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME#ExeBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT" MultiBuildValue="DefaultBuild:Windows Vista x86, Windows Server 2008 x86, Windows 7 x86" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0#ExeBuild:Windows NT 4.0" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0#ExeBuild:Windows NT 4.0" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT50" MultiBuildValue="DefaultBuild:Windows 2000#ExeBuild:Windows 2000" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT50Display" MultiBuildValue="DefaultBuild:Windows 2000#ExeBuild:Windows 2000" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT5X" MultiBuildValue="DefaultBuild:Windows XP/2003#ExeBuild:Windows XP/2003" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT5XDisplay" MultiBuildValue="DefaultBuild:Windows XP/2003#ExeBuild:Windows XP/2003" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT64" MultiBuildValue="DefaultBuild:Windows Vista x64, Windows Server 2008 x64, Windows 7 x64, Windows Server 2008 R2 x64" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT64Display" MultiBuildValue="DefaultBuild:Windows Vista x64, Windows Server 2008 x64, Windows 7 x64, Windows Server 2008 R2 x64" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNTDisplay" MultiBuildValue="DefaultBuild:Windows Vista x86, Windows Server 2008 x86, Windows 7 x86" ValueLocId="-"/>
-    <ROW Property="ZTHEADLESS" Value="No"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
-    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1" DirectoryOptions="15"/>
-    <ROW Directory="CommonAppDataFolder" Directory_Parent="TARGETDIR" DefaultDir="COMMON~1|CommonAppDataFolder" IsPseudoRoot="1"/>
-    <ROW Directory="One_Dir" Directory_Parent="ZeroTier_Dir" DefaultDir="One" DirectoryOptions="12"/>
-    <ROW Directory="ProgramFilesFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~1|ProgramFilesFolder" IsPseudoRoot="1"/>
-    <ROW Directory="ProgramMenuFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~2|ProgramMenuFolder" IsPseudoRoot="1"/>
-    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
-    <ROW Directory="ZeroTier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="ZeroTier" DirectoryOptions="12"/>
-    <ROW Directory="i686_1_Dir" Directory_Parent="ProgramMenuFolder" DefaultDir=".:i686"/>
-    <ROW Directory="i686_Dir" Directory_Parent="APPDIR" DefaultDir=".:i686" DirectoryOptions="15"/>
-    <ROW Directory="networks.d_Dir" Directory_Parent="One_Dir" DefaultDir="networks.d" DirectoryOptions="12"/>
-    <ROW Directory="regid.201001.com.zerotier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="REGID2~1.ZER|regid.2010-01.com.zerotier" DirectoryOptions="12"/>
-    <ROW Directory="tapwindows_Dir" Directory_Parent="One_Dir" DefaultDir="TAP-WI~1|tap-windows" DirectoryOptions="12"/>
-    <ROW Directory="x64_Dir" Directory_Parent="tapwindows_Dir" DefaultDir="x64" DirectoryOptions="12"/>
-    <ROW Directory="x86_Dir" Directory_Parent="tapwindows_Dir" DefaultDir="x86" DirectoryOptions="12"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
-    <ROW Component="AI_CustomARPName" ComponentId="{D8521222-B184-44D4-84AE-8B6549555BD8}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
-    <ROW Component="AI_DisableModify" ComponentId="{46FFA8C5-A0CB-4E05-9AD3-911D543DE8CA}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
-    <ROW Component="AI_ExePath" ComponentId="{8E02B36C-7A19-429B-A93E-77A9261AC918}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
-    <ROW Component="APPDIR" ComponentId="{4DD7907D-D7FE-4CD6-B1A0-B5C1625F5133}" Directory_="APPDIR" Attributes="0"/>
-    <ROW Component="One" ComponentId="{41AB11E7-066E-414A-96F8-F051D3D3B353}" Directory_="One_Dir" Attributes="0"/>
-    <ROW Component="ProductInformation" ComponentId="{DB078D04-EA8E-4A7C-9001-89BAD932F9D9}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
-    <ROW Component="ZeroTier" ComponentId="{8864F744-9BDF-4891-88A1-6D23D76BCCB1}" Directory_="ZeroTier_Dir" Attributes="0"/>
-    <ROW Component="i686" ComponentId="{6EC46014-3BFD-4017-ACBC-C4417D1D6361}" Directory_="i686_1_Dir" Attributes="0"/>
-    <ROW Component="i686_1" ComponentId="{60156BDC-31D7-47EE-A307-B62129607DD5}" Directory_="i686_Dir" Attributes="0"/>
-    <ROW Component="networks.d" ComponentId="{EF54D0DF-889F-41DC-AF5C-4E7F96AB1C8B}" Directory_="networks.d_Dir" Attributes="0"/>
-    <ROW Component="regid.201001.com.zerotier" ComponentId="{A39C80FC-6A8F-454F-9052-10DAC3C3B139}" Directory_="regid.201001.com.zerotier_Dir" Attributes="0"/>
-    <ROW Component="tapwindows" ComponentId="{3E9CBCCE-EC9D-4802-B8FD-DADB4CC532A2}" Directory_="tapwindows_Dir" Attributes="0"/>
-    <ROW Component="x64" ComponentId="{4DD1F90B-53F1-4390-BDF1-E6D9B39B8D80}" Directory_="x64_Dir" Attributes="0"/>
-    <ROW Component="x86" ComponentId="{8E83C577-3C22-49B7-82A8-369BE1F19224}" Directory_="x86_Dir" Attributes="0"/>
-    <ROW Component="zerotier_desktop_ui.exe" ComponentId="{61A7F53C-C6C3-418D-A652-2E4D9F8173AA}" Directory_="APPDIR" Attributes="256" Condition="ZTHEADLESS = &quot;No&quot; AND VersionNT64" KeyPath="zerotier_desktop_ui.exe"/>
-    <ROW Component="zerotier_desktop_ui.exe_1" ComponentId="{5CFEA823-6D17-4EAA-BBAA-810E1C89555D}" Directory_="i686_Dir" Attributes="0" Condition="ZTHEADLESS = &quot;No&quot; AND NOT VersionNT64" KeyPath="zerotier_desktop_ui.exe_1"/>
-    <ROW Component="zerotierone_x64.exe" ComponentId="{DFCFB72D-B055-4E60-B6D8-81FF585C2183}" Directory_="One_Dir" Attributes="256" Condition="VersionNT64" KeyPath="zerotierone_x64.exe"/>
-    <ROW Component="zerotierone_x86.exe" ComponentId="{5D2F3366-4FE1-40A4-A81A-66C49FA11F1C}" Directory_="One_Dir" Attributes="0" Condition="NOT VersionNT64" KeyPath="zerotierone_x86.exe"/>
-    <ROW Component="zttap300_x64_win10" ComponentId="{D4839F5E-FB94-41CB-9B1B-177A97ADC904}" Directory_="x64_Dir" Attributes="256" Condition="VersionNT64" KeyPath="zttap300.inf"/>
-    <ROW Component="zttap300_x86_win10" ComponentId="{9F913E48-095B-4EA3-98DA-EDAB1593F3E3}" Directory_="x86_Dir" Attributes="0" Condition="NOT VersionNT64" KeyPath="zttap300.cat_3" Type="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ROW Feature="ZeroTierOne" Title="MainFeature" Description="ZeroTier One" Display="0" Level="1" Directory_="APPDIR" Attributes="0"/>
-    <ATTRIBUTE name="CurrentFeature" value="ZeroTierOne"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
-    <ROW File="zerotierone_x86.exe" Component_="zerotierone_x86.exe" FileName="ZEROTI~1.EXE|zerotier-one_x86.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\windows\Build\Win32\Release\zerotier-one_x86.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zerotierone_x64.exe" Component_="zerotierone_x64.exe" FileName="ZEROTI~2.EXE|zerotier-one_x64.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\windows\Build\x64\Release\zerotier-one_x64.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zttap300.cat_2" Component_="zttap300_x64_win10" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.cat" SelfReg="false"/>
-    <ROW File="zttap300.sys_2" Component_="zttap300_x64_win10" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.sys" SelfReg="false"/>
-    <ROW File="zttap300.inf" Component_="zttap300_x64_win10" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\zttap300.inf" SelfReg="false"/>
-    <ROW File="zttap300.cat_3" Component_="zttap300_x86_win10" FileName="zttap300.cat" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.cat" SelfReg="false"/>
-    <ROW File="zttap300.sys_3" Component_="zttap300_x86_win10" FileName="zttap300.sys" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.sys" SelfReg="false"/>
-    <ROW File="zttap300.inf_1" Component_="zttap300_x86_win10" FileName="zttap300.inf" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\zttap300.inf" SelfReg="false"/>
-    <ROW File="zerotier_desktop_ui.exe" Component_="zerotier_desktop_ui.exe" FileName="ZEROTI~2.EXE|zerotier_desktop_ui.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\..\DesktopUI\target\x86_64-pc-windows-msvc\release\zerotier_desktop_ui.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="zerotier_desktop_ui.exe_1" Component_="zerotier_desktop_ui.exe_1" FileName="ZEROTI~1.EXE|zerotier_desktop_ui.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\..\..\..\DesktopUI\target\i686-pc-windows-msvc\release\zerotier_desktop_ui.exe" SelfReg="false" DigSign="true"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.custcomp.AiComponentAliasComponent">
-    <ROW AliasRowId="AI_CustomARPName" AliasRowOperation="2" Condition="#DefaultBuild:ZTHEADLESS=&quot;No&quot;"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
-    <ROW BootstrOptKey="GlobalOptions" GeneralOptions="qh" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BootstrapperUISequenceComponent">
-    <ROW Action="AI_DetectSoftware" Sequence="101"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="MSI" BuildOrder="1" BuildType="0" PackageFolder="..\..\.." PackageFileName="ZeroTier One" Languages="en" InstallationType="4" ExtUI="true" UseLargeSchema="true"/>
-    <ROW BuildKey="ExeBuild" BuildName="update" BuildOrder="2" BuildType="0" PackageFolder="..\..\.." PackageFileName="ZeroTier One" Languages="en" InstallationType="2" CabsLocation="1" CompressCabs="false" UseLzma="true" LzmaMethod="2" LzmaCompressionLevel="4" PackageType="1" FilesInsideExe="true" ExeIconPath="..\..\..\artwork\ZeroTierIcon.ico" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" MsiCmdLine="/qn" ExtUI="true" UseLargeSchema="true" ExeName="zt1_update_2_1,2_[|ProductVersion]_0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.CacheComponent">
-    <ATTRIBUTE name="Enable" value="false"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.ChainedPackageComponent">
-    <ROW ChainedPackage="ZeroTierOne_NDIS6_x64.msi" Order="1" Options="110" InstallCondition="VersionNT64 AND VersionNT &gt;= 1000" MaintenanceCondition="FALSE" RemoveCondition="REMOVE=&quot;ALL&quot; AND VersionNT64"/>
-    <ROW ChainedPackage="ZeroTierOne_NDIS6_x86.msi" Order="2" Options="110" InstallCondition="(NOT VersionNT64) And VersionNT &gt;= 1000" MaintenanceCondition="FALSE" RemoveCondition="REMOVE=&quot;ALL&quot; AND (NOT VersionNT64)"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.ChainedPackageFileComponent">
-    <ROW FileId="ZeroTierOne_NDIS6_x64.msi" ChainedPackage="ZeroTierOne_NDIS6_x64.msi" Options="1" TargetPath="ZeroTierOne_NDIS6_x64.msi" Content="..\..\bin\tap-windows-ndis6\x64\ZeroTierOne_NDIS6_x64.msi"/>
-    <ROW FileId="ZeroTierOne_NDIS6_x86.msi" ChainedPackage="ZeroTierOne_NDIS6_x86.msi" Options="1" TargetPath="ZeroTierOne_NDIS6_x86.msi" Content="..\..\bin\tap-windows-ndis6\x86\ZeroTierOne_NDIS6_x86.msi"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
-    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
-    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="ZeroTier One" DescriptionUrl="https://www.zerotier.com/" SignOptions="7" SignTool="5" UseSha256="1" KVTenantId="5300bf3b-0eff-4a5f-a63f-821e22ed1730" KVAppId="5f94d77e-b795-41fd-afe7-ec913b03c1d3" KVName="ZeroTier-CS" KVCertName="ZT-EV-CS" KVCertVersion="442c2d6f77874ff99eed4b36f5cb401c"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.FirewallExceptionComponent">
-    <ROW FirewallException="ZeroTierOneUDP9993" Direction="1" Action="1" DisplayName="ZeroTier UDP/9993 In" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="1" Profiles="7" Port="9993" Protocol="UDP"/>
-    <ROW FirewallException="ZeroTierOnex64Binary" Direction="1" Action="1" DisplayName="ZeroTier x64 Binary In" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="((?zerotierone_x64.exe=2) AND ($zerotierone_x64.exe=3))" Profiles="7" AppPath="[#zerotierone_x64.exe]" Port="*" Protocol="ANY"/>
-    <ROW FirewallException="ZeroTierOnex86Binary" Direction="1" Action="1" DisplayName="ZeroTier x86 Binary In" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="((?zerotierone_x86.exe=2) AND ($zerotierone_x86.exe=3))" Profiles="7" AppPath="[#zerotierone_x86.exe]" Port="*" Protocol="ANY"/>
-    <ROW FirewallException="ZeroTierUDP9993Out" Direction="2" Action="1" DisplayName="ZeroTier UDP/9993 Out" GroupName="ZeroTierOne" Enabled="1" Scope="*" Condition="1" Profiles="7" Port="9993" Protocol="UDP"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
-    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
-    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
-    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
-    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
-    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
-    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
-    <ROW Fragment="Themes.aip" Path="&lt;AI_FRAGS&gt;Themes.aip"/>
-    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
-    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
-    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
-    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
-    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiActionTextComponent">
-    <ROW Action="AI_DeleteLzma" Description="Deleting files extracted from archive" DescriptionLocId="ActionText.Description.AI_DeleteLzma" TemplateLocId="-"/>
-    <ROW Action="AI_DeleteRLzma" Description="Deleting files extracted from archive" DescriptionLocId="ActionText.Description.AI_DeleteLzma" TemplateLocId="-"/>
-    <ROW Action="AI_ExtractFiles" Description="Extracting files from archive" DescriptionLocId="ActionText.Description.AI_ExtractLzma" TemplateLocId="-"/>
-    <ROW Action="AI_ExtractLzma" Description="Extracting files from archive" DescriptionLocId="ActionText.Description.AI_ExtractLzma" TemplateLocId="-"/>
-    <ROW Action="AI_FwConfig" Description="Executing Windows Firewall configurations" DescriptionLocId="ActionText.Description.AI_FwConfig" Template="Configuring Windows Firewall rule: &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_FwConfig"/>
-    <ROW Action="AI_FwInstall" Description="Generating actions to configure Windows Firewall" DescriptionLocId="ActionText.Description.AI_FwInstall"/>
-    <ROW Action="AI_FwRemove" Description="Executing Windows Firewall configurations" DescriptionLocId="ActionText.Description.AI_FwRemove" Template="Configuring Windows Firewall rule:  &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_FwRemove"/>
-    <ROW Action="AI_FwRollback" Description="Rolling back Windows Firewall configurations." DescriptionLocId="ActionText.Description.AI_FwRollback" Template="Rolling back Windows Firewall configurations." TemplateLocId="ActionText.Template.AI_FwRollback"/>
-    <ROW Action="AI_FwUninstall" Description="Generating actions to configure Windows Firewall" DescriptionLocId="ActionText.Description.AI_FwUninstall"/>
-    <ROW Action="AI_TxtUpdaterCommit" Description="Commit text file changes. " DescriptionLocId="ActionText.Description.AI_TxtUpdaterCommit" Template="Commit text file changes." TemplateLocId="ActionText.Template.AI_TxtUpdaterCommit"/>
-    <ROW Action="AI_TxtUpdaterConfig" Description="Executing text file updates" DescriptionLocId="ActionText.Description.AI_TxtUpdaterConfig" Template="Updating text file: &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_TxtUpdaterConfig"/>
-    <ROW Action="AI_TxtUpdaterInstall" Description="Generating actions to configure text files updates" DescriptionLocId="ActionText.Description.AI_TxtUpdaterInstall"/>
-    <ROW Action="AI_TxtUpdaterRollback" Description="Rolling back text file changes. " DescriptionLocId="ActionText.Description.AI_TxtUpdaterRollback" Template="Rolling back text file changes." TemplateLocId="ActionText.Template.AI_TxtUpdaterRollback"/>
-    <ROW Action="AI_XmlCommit" Description="Committing XML file configurations." DescriptionLocId="ActionText.Description.AI_XmlCommit" Template="Committing XML file configurations." TemplateLocId="ActionText.Template.AI_XmlCommit"/>
-    <ROW Action="AI_XmlConfig" Description="Executing XML file configurations" DescriptionLocId="ActionText.Description.AI_XmlConfig" Template="Configuring XML file: &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_XmlConfig"/>
-    <ROW Action="AI_XmlInstall" Description="Generating actions to configure XML files" DescriptionLocId="ActionText.Description.AI_XmlInstall"/>
-    <ROW Action="AI_XmlRemove" Description="Executing XML file configurations" DescriptionLocId="ActionText.Description.AI_XmlRemove" Template="Configuring XML file: &quot;[1]&quot;" TemplateLocId="ActionText.Template.AI_XmlRemove"/>
-    <ROW Action="AI_XmlRollback" Description="Rolling back XML file configurations." DescriptionLocId="ActionText.Description.AI_XmlRollback" Template="Rolling back XML file configurations." TemplateLocId="ActionText.Template.AI_XmlRollback"/>
-    <ROW Action="AI_XmlUninstall" Description="Generating actions to configure XML files" DescriptionLocId="ActionText.Description.AI_XmlUninstall"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiAppSearchComponent">
-    <ROW Property="AI_SETUPEXEPATH" Signature_="AI_EXE_PATH_CU" Builds="ExeBuild"/>
-    <ROW Property="AI_SETUPEXEPATH" Signature_="AI_EXE_PATH_LM" Builds="ExeBuild"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
-    <ROW Name="ExternalUICleaner.dll" SourcePath="&lt;AI_CUSTACTS&gt;ExternalUICleaner.dll"/>
-    <ROW Name="NetFirewall.dll" SourcePath="&lt;AI_CUSTACTS&gt;NetFirewall.dll"/>
-    <ROW Name="Prereq.dll" SourcePath="&lt;AI_CUSTACTS&gt;Prereq.dll"/>
-    <ROW Name="SoftwareDetector.dll" SourcePath="&lt;AI_CUSTACTS&gt;SoftwareDetector.dll"/>
-    <ROW Name="TxtUpdater.dll" SourcePath="&lt;AI_CUSTACTS&gt;TxtUpdater.dll"/>
-    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
-    <ROW Name="chainersupport.dll" SourcePath="&lt;AI_CUSTACTS&gt;chainersupport.dll"/>
-    <ROW Name="lzmaextractor.dll" SourcePath="&lt;AI_CUSTACTS&gt;lzmaextractor.dll"/>
-    <ROW Name="msichainer.exe" SourcePath="&lt;AI_CUSTACTS&gt;msichainer.exe"/>
-    <ROW Name="viewer.exe" SourcePath="&lt;AI_CUSTACTS&gt;viewer.exe" DigSign="true"/>
-    <ROW Name="xmlCfg.dll" SourcePath="&lt;AI_CUSTACTS&gt;xmlCfg.dll"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent">
-    <ROW Dialog_="ExitDialog" Control="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Attributes="0" Text="[ButtonText_Cancel]" Order="200" TextLocId="-" MsiKey="ExitDialog#Cancel" Options="1"/>
-    <ROW Dialog_="ExitDialog" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="0" Text="[ButtonText_Back]" Order="400" TextLocId="-" MsiKey="ExitDialog#Back" Options="1"/>
-    <ROW Dialog_="ExitDialog" Control="ViewReadmeCheckBox" Type="CheckBox" X="135" Y="140" Width="10" Height="10" Attributes="2" Property="VIEWREADME" Order="500" MsiKey="ExitDialog#ViewReadmeCheckBox" Options="1"/>
-    <ROW Dialog_="ExitDialog" Control="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Attributes="196611" Text="Completing the [ProductName] [Wizard]" TextStyle="VerdanaBold13" Order="600" TextLocId="Control.Text.ExitDialog#Title" MsiKey="ExitDialog#Title"/>
-    <ROW Dialog_="ExitDialog" Control="LaunchProdCheckBox" Type="CheckBox" X="135" Y="170" Width="10" Height="10" Attributes="2" Property="RUNAPPLICATION" Order="700" MsiKey="ExitDialog#LaunchProdCheckBox" Options="1"/>
-    <ROW Dialog_="ExitDialog" Control="Description" Type="Text" X="135" Y="86" Width="220" Height="20" Attributes="196611" Text="Click the &quot;Finish&quot; button to exit the [Wizard]." Order="800" TextLocId="Control.Text.ExitDialog#Description" MsiKey="ExitDialog#Description"/>
-    <ROW Dialog_="ExitDialog" Control="BottomLine" Type="Line" X="0" Y="234" Width="372" Height="0" Attributes="1" Order="900" MsiKey="ExitDialog#BottomLine"/>
-    <ROW Dialog_="WelcomeDlg" Control="WelcomeDlgDialogInitializer" Type="DialogInitializer" X="0" Y="0" Width="0" Height="0" Attributes="0" Order="-1" TextLocId="-" HelpLocId="-" ExtDataLocId="-"/>
-    <ROW Dialog_="Windows7Warning" Control="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Next]" Order="100" Options="1"/>
-    <ROW Dialog_="Windows7Warning" Control="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Cancel]" Order="200" Options="1"/>
-    <ROW Dialog_="Windows7Warning" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" Options="1"/>
-    <ROW Dialog_="Windows7Warning" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="[BannerBitmap]" Order="400"/>
-    <ROW Dialog_="Windows7Warning" Control="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" Attributes="1" Order="500"/>
-    <ROW Dialog_="Windows7Warning" Control="BottomLine" Type="Line" X="5" Y="234" Width="368" Height="0" Attributes="1" Order="600"/>
-    <ROW Dialog_="Windows7Warning" Control="Logo" Type="Text" X="4" Y="228" Width="70" Height="12" Attributes="1" Text="Advanced Installer" Order="700"/>
-    <ROW Dialog_="Windows7Warning" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="Warning: Unsupported Windows Version" TextStyle="[DlgTitleFont]" Order="800"/>
-    <ROW Dialog_="Windows7Warning" Control="Text_1" Type="Text" X="15" Y="59" Width="344" Height="159" Attributes="65539" Property="TEXT_1_PROP" Text="ZeroTier does not officially support versions of Windows prior to Windows 10, and the ZeroTier graphical tray and control panel application does not run on EOL versions of Windows. You may still install ZeroTier and attempt to use it by opening an administrator-mode command prompt and controlling the service from the command line with &quot;zerotier-cli&quot;." TextStyle="VerdanaBold13" Order="900"/>
-    <ATTRIBUTE name="DeletedRows" value="ExitDialog#LaunchProdText@ExitDialog#ViewReadmeText"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlConditionComponent">
-    <ATTRIBUTE name="DeletedRows" value="ExitDialog#LaunchProdText#Hide#((NOT AI_INSTALL) AND (NOT AI_PATCH)) OR ((CTRLS &lt;&gt; 2) AND (CTRLS &lt;&gt; 3))@ExitDialog#ViewReadmeText#Hide#((NOT AI_INSTALL) AND (NOT AI_PATCH)) OR ((CTRLS &lt;&gt; 1) AND (CTRLS &lt;&gt; 3))"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="3"/>
-    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
-    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
-    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
-    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
-    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
-    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
-    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
-    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
-    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
-    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
-    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
-    <ROW Dialog_="Windows7Warning" Control_="Cancel" Event="SpawnDialog" Argument="CancelDlg" Condition="1" Ordering="100"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfRbDiskDlg" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" Ordering="5" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="EnableRollback" Argument="False" Condition="AI_INSTALL AND OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" Ordering="6" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="SpawnDialog" Argument="OutOfDiskDlg" Condition="AI_INSTALL AND ( (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;) )" Ordering="7" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[AI_ButtonText_Next_Orig]" Argument="[ButtonText_Next]" Condition="AI_INSTALL" Ordering="0" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[ButtonText_Next]" Argument="[[AI_CommitButton]]" Condition="AI_INSTALL" Ordering="1" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[AI_Text_Next_Orig]" Argument="[Text_Next]" Condition="AI_INSTALL" Ordering="2" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="WelcomeDlgDialogInitializer" Event="[Text_Next]" Argument="[Text_Install]" Condition="AI_INSTALL" Ordering="3" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Back" Event="[ButtonText_Next]" Argument="[AI_ButtonText_Next_Orig]" Condition="AI_INSTALL" Ordering="0" Options="2"/>
-    <ROW Dialog_="WelcomeDlg" Control_="Back" Event="[Text_Next]" Argument="[AI_Text_Next_Orig]" Condition="AI_INSTALL" Ordering="1" Options="2"/>
-    <ROW Dialog_="ExitDialog" Control_="Finish" Event="DoAction" Argument="AI_ChainerScheduleReboot" Condition="Not AIEXTERNALUI" Ordering="302"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
-    <ROW Directory_="networks.d_Dir" Component_="networks.d" ManualDelete="false"/>
-    <ROW Directory_="regid.201001.com.zerotier_Dir" Component_="regid.201001.com.zerotier" ManualDelete="false"/>
-    <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
-    <ROW Directory_="i686_1_Dir" Component_="i686" ManualDelete="false"/>
-    <ROW Directory_="ZeroTier_Dir" Component_="ZeroTier" ManualDelete="true"/>
-    <ROW Directory_="One_Dir" Component_="One" ManualDelete="false"/>
-    <ROW Directory_="tapwindows_Dir" Component_="tapwindows" ManualDelete="false"/>
-    <ROW Directory_="x64_Dir" Component_="x64" ManualDelete="false"/>
-    <ROW Directory_="x86_Dir" Component_="x86" ManualDelete="false"/>
-    <ROW Directory_="i686_Dir" Component_="i686_1" ManualDelete="false"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
-    <ROW Action="AI_AppSearchEx" Type="1" Source="Prereq.dll" Target="DoAppSearchEx"/>
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_ChainerScheduleReboot" Type="1" Source="chainersupport.dll" Target="ScheduleReboot" WithoutSeq="true"/>
-    <ROW Action="AI_CommitChainers" Type="11841" Source="chainersupport.dll" Target="CommitChainedPackages" WithoutSeq="true"/>
-    <ROW Action="AI_DATA_SETTER" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DATA_SETTER_1" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DATA_SETTER_2" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DATA_SETTER_3" Type="51" Source="CustomActionData" Target="[~]"/>
-    <ROW Action="AI_DATA_SETTER_4" Type="51" Source="CustomActionData" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DATA_SETTER_5" Type="51" Source="CustomActionData" Target="zerotier_desktop_ui.exe"/>
-    <ROW Action="AI_DATA_SETTER_6" Type="51" Source="CustomActionData" Target="ZeroTier One.exe"/>
-    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
-    <ROW Action="AI_DeleteCadLzma" Type="51" Source="AI_DeleteLzma" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DeleteLzma" Type="1025" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
-    <ROW Action="AI_DeleteRCadLzma" Type="51" Source="AI_DeleteRLzma" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DeleteRLzma" Type="1281" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
-    <ROW Action="AI_DetectSoftware" Type="257" Source="SoftwareDetector.dll" Target="OnDetectSoftware"/>
-    <ROW Action="AI_DoRemoveExternalUIStub" Type="3585" Source="ExternalUICleaner.dll" Target="DoRemoveExternalUIStub" WithoutSeq="true"/>
-    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
-    <ROW Action="AI_EnableDebugLog" Type="321" Source="aicustact.dll" Target="EnableDebugLog"/>
-    <ROW Action="AI_ExtractCadLzma" Type="51" Source="AI_ExtractLzma" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_ExtractFiles" Type="1" Source="Prereq.dll" Target="ExtractSourceFiles" AdditionalSeq="AI_DATA_SETTER_4"/>
-    <ROW Action="AI_ExtractLzma" Type="1025" Source="lzmaextractor.dll" Target="ExtractLZMAFiles"/>
-    <ROW Action="AI_FindExeLzma" Type="1" Source="lzmaextractor.dll" Target="FindEXE"/>
-    <ROW Action="AI_FwConfig" Type="11265" Source="NetFirewall.dll" Target="OnFwConfig" WithoutSeq="true"/>
-    <ROW Action="AI_FwInstall" Type="1" Source="NetFirewall.dll" Target="OnFwInstall" AdditionalSeq="AI_DATA_SETTER_2"/>
-    <ROW Action="AI_FwRemove" Type="11265" Source="NetFirewall.dll" Target="OnFwRemove" WithoutSeq="true"/>
-    <ROW Action="AI_FwRollback" Type="11521" Source="NetFirewall.dll" Target="OnFwRollback" WithoutSeq="true"/>
-    <ROW Action="AI_FwUninstall" Type="1" Source="NetFirewall.dll" Target="OnFwUninstall" AdditionalSeq="AI_DATA_SETTER_3"/>
-    <ROW Action="AI_GetArpIconPath" Type="1" Source="aicustact.dll" Target="GetArpIconPath"/>
-    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
-    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
-    <ROW Action="AI_PRESERVE_INSTALL_TYPE" Type="65" Source="aicustact.dll" Target="PreserveInstallType"/>
-    <ROW Action="AI_PrepareChainers" Type="1" Source="chainersupport.dll" Target="PrepareChainedPackages"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH" Target="[AI_SETUPEXEPATH_ORIGINAL]"/>
-    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
-    <ROW Action="AI_RemoveExternalUIStub" Type="1" Source="ExternalUICleaner.dll" Target="RemoveExternalUIStub"/>
-    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Type="1" Source="aicustact.dll" Target="GetLocalizedCredentials"/>
-    <ROW Action="AI_RollbackChainers" Type="11585" Source="chainersupport.dll" Target="RollbackChainedPackages" WithoutSeq="true"/>
-    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
-    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
-    <ROW Action="AI_TxtUpdaterCommit" Type="11777" Source="TxtUpdater.dll" Target="OnTxtUpdaterCommit" WithoutSeq="true"/>
-    <ROW Action="AI_TxtUpdaterConfig" Type="11265" Source="TxtUpdater.dll" Target="OnTxtUpdaterConfig" WithoutSeq="true"/>
-    <ROW Action="AI_TxtUpdaterInstall" Type="1" Source="TxtUpdater.dll" Target="OnTxtUpdaterInstall"/>
-    <ROW Action="AI_TxtUpdaterRollback" Type="11521" Source="TxtUpdater.dll" Target="OnTxtUpdaterRollback" WithoutSeq="true"/>
-    <ROW Action="AI_XmlCommit" Type="11777" Source="xmlCfg.dll" Target="OnXmlCommit" WithoutSeq="true"/>
-    <ROW Action="AI_XmlConfig" Type="11265" Source="xmlCfg.dll" Target="OnXmlConfig" WithoutSeq="true"/>
-    <ROW Action="AI_XmlInstall" Type="1" Source="xmlCfg.dll" Target="OnXmlInstall" AdditionalSeq="AI_DATA_SETTER"/>
-    <ROW Action="AI_XmlRemove" Type="11265" Source="xmlCfg.dll" Target="OnXmlRemove" WithoutSeq="true"/>
-    <ROW Action="AI_XmlRollback" Type="11521" Source="xmlCfg.dll" Target="OnXmlRollback" WithoutSeq="true"/>
-    <ROW Action="AI_XmlUninstall" Type="1" Source="xmlCfg.dll" Target="OnXmlUninstall" AdditionalSeq="AI_DATA_SETTER_1"/>
-    <ROW Action="LaunchUI" Type="194" Source="viewer.exe" Target="/DontWait &quot;[APPDIR]zerotier_desktop_ui.exe&quot;" Options="1"/>
-    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFilesFolder]ZeroTier\One"/>
-    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
-    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
-    <ROW Action="TapDeviceRemove32" Type="3154" Source="zerotierone_x86.exe" Target="-D"/>
-    <ROW Action="TapDeviceRemove64" Type="3154" Source="zerotierone_x64.exe" Target="-D"/>
-    <ROW Action="TerminateUINew" Type="65" Source="aicustact.dll" Target="StopProcess" Options="1" AdditionalSeq="AI_DATA_SETTER_5"/>
-    <ROW Action="TerminateUIOld" Type="65" Source="aicustact.dll" Target="StopProcess" Options="1" AdditionalSeq="AI_DATA_SETTER_6"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiDialogComponent">
-    <ROW Dialog="Windows7Warning" HCentering="50" VCentering="50" Width="370" Height="270" Attributes="3" Title="[ProductName] [Setup]" Control_Default="Next" Control_Cancel="Cancel"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiEmbeddedChainerComponent">
-    <ROW MsiEmbeddedChainer="msichainer.exe" Condition="VersionMsi &gt;= &quot;4.05&quot;" CommandLine="[AI_CHAINER_CMD_LINE]" Source="msichainer.exe" Type="2"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiEnvComponent">
-    <ROW Environment="Path" Name="=-*Path" Value="[~];[APPDIR]" Component_="regid.201001.com.zerotier"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatCompsComponent">
-    <ROW Feature_="ZeroTierOne" Component_="ProductInformation"/>
-    <ROW Feature_="ZeroTierOne" Component_="networks.d"/>
-    <ROW Feature_="ZeroTierOne" Component_="regid.201001.com.zerotier"/>
-    <ROW Feature_="ZeroTierOne" Component_="zerotierone_x64.exe"/>
-    <ROW Feature_="ZeroTierOne" Component_="zerotierone_x86.exe"/>
-    <ROW Feature_="ZeroTierOne" Component_="zttap300_x86_win10"/>
-    <ROW Feature_="MainFeature" Component_="APPDIR"/>
-    <ROW Feature_="ZeroTierOne" Component_="zttap300_x64_win10"/>
-    <ROW Feature_="ZeroTierOne" Component_="AI_CustomARPName"/>
-    <ROW Feature_="ZeroTierOne" Component_="AI_DisableModify"/>
-    <ROW Feature_="ZeroTierOne" Component_="zerotier_desktop_ui.exe"/>
-    <ROW Feature_="ZeroTierOne" Component_="zerotier_desktop_ui.exe_1"/>
-    <ROW Feature_="ZeroTierOne" Component_="AI_ExePath"/>
-    <ROW Feature_="ZeroTierOne" Component_="i686"/>
-    <ROW Feature_="ZeroTierOne" Component_="ZeroTier"/>
-    <ROW Feature_="ZeroTierOne" Component_="One"/>
-    <ROW Feature_="ZeroTierOne" Component_="tapwindows"/>
-    <ROW Feature_="ZeroTierOne" Component_="x64"/>
-    <ROW Feature_="ZeroTierOne" Component_="x86"/>
-    <ROW Feature_="ZeroTierOne" Component_="i686_1"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
-    <ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
-    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
-    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
-    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1397"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
-    <ROW Action="AI_XmlInstall" Condition="(REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5103"/>
-    <ROW Action="AI_DATA_SETTER" Condition="(REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5102"/>
-    <ROW Action="AI_XmlUninstall" Condition="(REMOVE)" Sequence="3102"/>
-    <ROW Action="AI_DATA_SETTER_1" Condition="(REMOVE)" Sequence="3101"/>
-    <ROW Action="InstallFinalize" Sequence="6605" SeqType="0" MsiKey="InstallFinalize"/>
-    <ROW Action="AI_RemoveExternalUIStub" Condition="(REMOVE=&quot;ALL&quot;) AND ((VersionNT &gt; 500) OR((VersionNT = 500) AND (ServicePackLevel &gt;= 4)))" Sequence="1501"/>
-    <ROW Action="TapDeviceRemove32" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) AND NOT UPGRADINGPRODUCTCODE ) AND ( NOT VersionNT64 )" Sequence="1605"/>
-    <ROW Action="TapDeviceRemove64" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) AND NOT UPGRADINGPRODUCTCODE ) AND ( VersionNT64 )" Sequence="1606"/>
-    <ROW Action="AI_FwInstall" Condition="(VersionNT &gt;= 501) AND (REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5802"/>
-    <ROW Action="AI_DATA_SETTER_2" Condition="(VersionNT &gt;= 501) AND (REMOVE &lt;&gt; &quot;ALL&quot;)" Sequence="5801"/>
-    <ROW Action="AI_FwUninstall" Condition="(VersionNT &gt;= 501) AND (REMOVE=&quot;ALL&quot;)" Sequence="1702"/>
-    <ROW Action="AI_DATA_SETTER_3" Condition="(VersionNT &gt;= 501) AND (REMOVE=&quot;ALL&quot;)" Sequence="1701"/>
-    <ROW Action="AI_DetectSoftware" Sequence="103"/>
-    <ROW Action="AI_TxtUpdaterInstall" Sequence="5101"/>
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99" Builds="ExeBuild"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="102" Builds="ExeBuild"/>
-    <ROW Action="AI_DeleteCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="199" Builds="ExeBuild"/>
-    <ROW Action="AI_DeleteRCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="198" Builds="ExeBuild"/>
-    <ROW Action="AI_ExtractCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="197" Builds="ExeBuild"/>
-    <ROW Action="AI_FindExeLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="196" Builds="ExeBuild"/>
-    <ROW Action="AI_ExtractLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="1549" Builds="ExeBuild"/>
-    <ROW Action="AI_DeleteRLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="1548" Builds="ExeBuild"/>
-    <ROW Action="AI_DeleteLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (AI_INSTALL_MODE&lt;&gt;&quot;Remove&quot;) AND (NOT PATCH)" Sequence="6594" Builds="ExeBuild"/>
-    <ROW Action="TerminateUIOld" Sequence="1602"/>
-    <ROW Action="AI_DATA_SETTER_6" Sequence="1601"/>
-    <ROW Action="AI_EnableDebugLog" Sequence="52"/>
-    <ROW Action="AI_AppSearchEx" Sequence="101"/>
-    <ROW Action="AI_PrepareChainers" Condition="VersionMsi &gt;= &quot;4.05&quot;" Sequence="5851"/>
-    <ROW Action="AI_ExtractFiles" Sequence="1399" Builds="ExeBuild"/>
-    <ROW Action="AI_DATA_SETTER_4" Sequence="1398"/>
-    <ROW Action="AI_GetArpIconPath" Sequence="1401"/>
-    <ROW Action="TerminateUINew" Sequence="1604"/>
-    <ROW Action="AI_DATA_SETTER_5" Sequence="1603"/>
-    <ROW Action="LaunchUI" Condition="( NOT Installed ) AND ( ZTHEADLESS = &quot;No&quot; )" Sequence="6606"/>
-    <ROW Action="AI_DETECT_MODERNWIN" Condition="(VersionNT &gt;= 603)" Sequence="55" MsiKey="AI_DETECT_MODERNWIN"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
-    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="54"/>
-    <ROW Action="AI_DpiContentScale" Sequence="53"/>
-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="103"/>
-    <ROW Action="ExecuteAction" Sequence="1299" SeqType="0" MsiKey="ExecuteAction"/>
-    <ROW Action="AI_DetectSoftware" Sequence="102"/>
-    <ROW Action="AI_EnableDebugLog" Sequence="52"/>
-    <ROW Action="AI_AppSearchEx" Sequence="101"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
-    <ROW Action="AI_PRESERVE_INSTALL_TYPE" Sequence="199"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
-    <ROW Condition="( Version9X OR ( NOT VersionNT64 ) OR ( VersionNT64 AND ((VersionNT64 &lt;&gt; 600) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 600) OR (MsiNTProductType = 1)) AND ((VersionNT64 &lt;&gt; 601) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 601) OR (MsiNTProductType = 1)) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT64Display]." DescriptionLocId="AI.LaunchCondition.NoSpecificNT64" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="( Version9X OR VersionNT64 OR ( VersionNT AND ((VersionNT &lt;&gt; 600) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT &lt;&gt; 600) OR (MsiNTProductType = 1)) AND (VersionNT &lt;&gt; 601) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNTDisplay]." DescriptionLocId="AI.LaunchCondition.NoSpecificNT" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="((VersionNT &lt;&gt; 501) AND (VersionNT &lt;&gt; 502))" Description="[ProductName] cannot be installed on [WindowsTypeNT5XDisplay]." DescriptionLocId="AI.LaunchCondition.NoNT5X" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on [WindowsTypeNT40Display]." DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Condition="(VersionNT &lt;&gt; 500)" Description="[ProductName] cannot be installed on [WindowsTypeNT50Display]." DescriptionLocId="AI.LaunchCondition.NoNT50" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-    <ROW Condition="AI_DETECTED_DOTNET_VERSION &gt;= AI_REQUIRED_DOTNET_VERSION" Description="[ProductName] cannot be installed on systems with .NET Framework version lower than [AI_REQUIRED_DOTNET_DISPLAY]." DescriptionLocId="AI.LaunchCondition.DotNET" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="NOT AiArm64" Description="[ProductName] cannot be installed on systems running on ARM64 processors. Check for a ARM64 version of [ProductName]" DescriptionLocId="AI.LaunchCondition.ARM64" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="Privileged" Description="[ProductName] requires administrative privileges to install." DescriptionLocId="AI.LaunchCondition.Privileged" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="SETUPEXEDIR OR (REMOVE=&quot;ALL&quot;)" Description="This package can only be run from a bootstrapper." DescriptionLocId="AI.LaunchCondition.RequireBootstrapper" IsPredefined="true" Builds="ExeBuild"/>
-    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild;ExeBuild"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiLockPermComponent">
-    <ROW LockObject="ZeroTier_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="ZeroTier_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="One_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="One_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="networks.d_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="networks.d_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="tapwindows_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="tapwindows_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="x64_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="x64_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="x86_Dir" Table="CreateFolder" User="[GRP_ADMINISTRATORS]" Permission="1245631" Flags="0"/>
-    <ROW LockObject="x86_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="regid.201001.com.zerotier_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="APPDIR" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-    <ROW LockObject="i686_Dir" Table="CreateFolder" User="[GRP_EVERYONE]" Permission="1179817" Flags="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegLocatorComponent">
-    <ROW Signature_="AI_EXE_PATH_CU" Root="1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>
-    <ROW Signature_="AI_EXE_PATH_LM" Root="2" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
-    <ROW Registry="AI_ExePath" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Value="[AI_SETUPEXEPATH]" Component_="AI_ExePath"/>
-    <ROW Registry="AdvancedInstaller" Root="-1" Key="Software\Caphyon\Advanced Installer" Name="\"/>
-    <ROW Registry="Caphyon" Root="-1" Key="Software\Caphyon" Name="\"/>
-    <ROW Registry="Comments" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Comments" Value="[ARPCOMMENTS]" Component_="AI_CustomARPName"/>
-    <ROW Registry="Contact" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Contact" Value="[ARPCONTACT]" Component_="AI_CustomARPName"/>
-    <ROW Registry="CurrentVersion" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion" Name="\"/>
-    <ROW Registry="DisplayIcon" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayIcon" Value="[ARP_ICON_PATH]" Component_="AI_CustomARPName"/>
-    <ROW Registry="DisplayName" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayName" Value="[AI_PRODUCTNAME_ARP]" Component_="AI_CustomARPName"/>
-    <ROW Registry="DisplayVersion" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="DisplayVersion" Value="[ProductVersion]" Component_="AI_CustomARPName"/>
-    <ROW Registry="EstimatedSize" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="EstimatedSize" Value="#[AI_ARP_SIZE]" Component_="AI_CustomARPName" VirtualValue="#"/>
-    <ROW Registry="HelpLink" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="HelpLink" Value="[ARPHELPLINK]" Component_="AI_CustomARPName"/>
-    <ROW Registry="HelpTelephone" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="HelpTelephone" Value="[ARPHELPTELEPHONE]" Component_="AI_CustomARPName"/>
-    <ROW Registry="InstallLocation" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="InstallLocation" Value="[APPDIR]" Component_="AI_CustomARPName"/>
-    <ROW Registry="LZMA" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA" Name="\"/>
-    <ROW Registry="Manufacturer" Root="-1" Key="Software\[Manufacturer]" Name="\"/>
-    <ROW Registry="Microsoft" Root="-1" Key="Software\Microsoft" Name="\"/>
-    <ROW Registry="ModifyPath" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="ModifyPath" Value="[AI_UNINSTALLER] /i [ProductCode] AI_UNINSTALLER_CTP=1" Component_="AI_CustomARPName"/>
-    <ROW Registry="NoModify" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="NoModify" Value="#1" Component_="AI_DisableModify" VirtualValue="#"/>
-    <ROW Registry="NoRepair" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="NoRepair" Value="#1" Component_="AI_CustomARPName" VirtualValue="#"/>
-    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
-    <ROW Registry="ProductCode_1" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]" Name="\"/>
-    <ROW Registry="ProductName" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="\"/>
-    <ROW Registry="ProductNameProductVersion" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="\"/>
-    <ROW Registry="ProductVersion_1" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="\"/>
-    <ROW Registry="Publisher" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Publisher" Value="[Manufacturer]" Component_="AI_CustomARPName"/>
-    <ROW Registry="Readme" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Readme" Value="[ARPREADME]" Component_="AI_CustomARPName"/>
-    <ROW Registry="Software" Root="-1" Key="Software" Name="\"/>
-    <ROW Registry="URLInfoAbout" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="URLInfoAbout" Value="[ARPURLINFOABOUT]" Component_="AI_CustomARPName"/>
-    <ROW Registry="URLUpdateInfo" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="URLUpdateInfo" Value="[ARPURLUPDATEINFO]" Component_="AI_CustomARPName"/>
-    <ROW Registry="Uninstall" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall" Name="\"/>
-    <ROW Registry="UninstallPath" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="UninstallPath" Value="[AI_UNINSTALLER] /x [ProductCode] AI_UNINSTALLER_CTP=1" Component_="AI_CustomARPName"/>
-    <ROW Registry="UninstallString" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="UninstallString" Value="[AI_UNINSTALLER] /x [ProductCode] AI_UNINSTALLER_CTP=1" Component_="AI_CustomARPName"/>
-    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
-    <ROW Registry="VersionMajor" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="VersionMajor" Value="#1" Component_="AI_CustomARPName" VirtualValue="#"/>
-    <ROW Registry="VersionMinor" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="VersionMinor" Value="#6" Component_="AI_CustomARPName" VirtualValue="#"/>
-    <ROW Registry="Windows" Root="-1" Key="Software\Microsoft\Windows" Name="\"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiServCtrlComponent">
-    <ROW ServiceControl="zerotierone_x64.exe" Name="ZeroTierOneService" Event="163" Wait="1" Component_="zerotierone_x64.exe"/>
-    <ROW ServiceControl="zerotierone_x86.exe" Name="ZeroTierOneService" Event="163" Wait="1" Component_="zerotierone_x86.exe"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiServInstComponent">
-    <ROW ServiceInstall="zerotierone_x64.exe" Name="ZeroTierOneService" DisplayName="ZeroTier One" ServiceType="16" StartType="2" ErrorControl="32769" Component_="zerotierone_x64.exe" Description="Ethernet Virtualization Service"/>
-    <ROW ServiceInstall="zerotierone_x86.exe" Name="ZeroTierOneService" DisplayName="ZeroTier One" ServiceType="16" StartType="2" ErrorControl="32769" Component_="zerotierone_x86.exe" Description="Ethernet Virtualization Service"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
-    <ROW Shortcut="ZeroTier" Directory_="ProgramMenuFolder" Name="ZeroTier" Component_="zerotier_desktop_ui.exe" Target="[#zerotier_desktop_ui.exe]" Hotkey="0" Icon_="ZeroTierIcon.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
-    <ROW Shortcut="ZeroTier_1" Directory_="i686_1_Dir" Name="ZeroTier" Component_="zerotier_desktop_ui.exe_1" Target="[#zerotier_desktop_ui.exe_1]" Hotkey="0" Icon_="ZeroTierIcon.exe" IconIndex="0" ShowCmd="1" WkDir="i686_Dir"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
-    <ATTRIBUTE name="UsedTheme" value="classic"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
-    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
-    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
-    <ROW SearchKey="UpgradeCode" SearchType="4" SearchString="{88AA80DE-14CA-4443-B024-6EC13F3EDDAD}" Order="2" Property="ZTTAP300_X86_INSTALLED"/>
-    <ROW SearchKey="_" SearchType="4" SearchString="{88AA80DE-14CA-4443-B024-6EC13F3EDDAD}" Order="1" Property="ZTTAP300_X64_INSTALLED"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.SoftwareIdentificationComponent">
-    <ATTRIBUTE name="LocalFile" value="regid.199509.com.example_ProductName.swidtag"/>
-    <ATTRIBUTE name="SystemFile" value="regid.199509.com.example_ProductName.swidtag_1"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.TxtUpdateComponent">
-    <ROW Name="Append/Create" TxtUpdateSet="zerotiercli.bat" FindPattern="@ECHO OFF&#13;&#10;if [\[][#zerotierone_x64.exe][\]] == [\[][\]] (&#13;&#10;&#9;[#zerotierone_x86.exe] -q %*&#13;&#10;) else (&#13;&#10;&#9;[#zerotierone_x64.exe] -q %*&#13;&#10;)&#13;&#10;" Options="160" Order="0" FileEncoding="0"/>
-    <ROW Name="Replace" TxtUpdateSet="zerotiercli.bat" FindPattern="YourFindText" ReplacePattern="YourReplaceText" Options="2" Order="1" FileEncoding="-1"/>
-    <ROW Name="Append/Create" TxtUpdateSet="zerotiercli1.bat" FindPattern="@ECHO OFF&#13;&#10;if [\[][#zerotierone_x64.exe][\]] == [\[][\]] (&#13;&#10;&#9;[#zerotierone_x86.exe] -i %*&#13;&#10;) else (&#13;&#10;&#9;[#zerotierone_x64.exe] -i %*&#13;&#10;)&#13;&#10;" Options="160" Order="0" FileEncoding="0"/>
-    <ROW Name="Replace" TxtUpdateSet="zerotiercli1.bat" FindPattern="YourFindText" ReplacePattern="YourReplaceText" Options="2" Order="1" FileEncoding="-1"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.TxtUpdateSetComponent">
-    <ROW Key="zerotiercli.bat" Component="regid.201001.com.zerotier" FileName="zerotier-cli.bat" Directory="APPDIR" Options="17"/>
-    <ROW Key="zerotiercli1.bat" Component="regid.201001.com.zerotier" FileName="zerotier-idtool.bat" Directory="APPDIR" Options="17"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.XmlAttributeComponent">
-    <ROW XmlAttribute="xmlnsds" XmlElement="swidsoftware_identification_tag" Name="xmlns:ds" Flags="14" Order="0" Value="http://www.w3.org/2000/09/xmldsig#"/>
-    <ROW XmlAttribute="xmlnsswid" XmlElement="swidsoftware_identification_tag" Name="xmlns:swid" Flags="14" Order="1" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd"/>
-    <ROW XmlAttribute="xmlnsxsi" XmlElement="swidsoftware_identification_tag" Name="xmlns:xsi" Flags="14" Order="2" Value="http://www.w3.org/2001/XMLSchema-instance"/>
-    <ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent">
-    <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="6" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Condition="1" Order="0" Flags="14" Text="false" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Condition="1" Order="0" Flags="14" Text="1" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="10" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidname" ParentElement="swidproduct_version" Name="swid:name" Condition="1" Order="0" Flags="14" Text="[ProductVersion]" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidname_1" ParentElement="swidsoftware_creator" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc." UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidname_2" ParentElement="swidsoftware_licensor" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc." UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidname_3" ParentElement="swidtag_creator" Name="swid:name" Condition="1" Order="0" Flags="14" Text="ZeroTier, Inc." UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidnumeric" ParentElement="swidproduct_version" Name="swid:numeric" Condition="1" Order="1" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidproduct_title" ParentElement="swidsoftware_identification_tag" Name="swid:product_title" Condition="1" Order="1" Flags="14" Text="[ProductName]" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidproduct_version" ParentElement="swidsoftware_identification_tag" Name="swid:product_version" Condition="1" Order="2" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidregid" ParentElement="swidsoftware_creator" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidregid_1" ParentElement="swidsoftware_licensor" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidregid_2" ParentElement="swidtag_creator" Name="swid:regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidreview" ParentElement="swidnumeric" Name="swid:review" Condition="1" Order="3" Flags="14" Text="0" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidsoftware_creator" ParentElement="swidsoftware_identification_tag" Name="swid:software_creator" Condition="1" Order="3" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidsoftware_id" ParentElement="swidsoftware_identification_tag" Name="swid:software_id" Condition="1" Order="5" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidsoftware_identification_tag" Name="swid:software_identification_tag" Condition="1" Order="0" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidsoftware_licensor" ParentElement="swidsoftware_identification_tag" Name="swid:software_licensor" Condition="1" Order="4" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidtag_creator" ParentElement="swidsoftware_identification_tag" Name="swid:tag_creator" Condition="1" Order="6" Flags="14" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidtag_creator_regid" ParentElement="swidsoftware_id" Name="swid:tag_creator_regid" Condition="1" Order="1" Flags="14" Text="regid.2010-01.com.zerotier" UpdateIndexInParent="0"/>
-    <ROW XmlElement="swidunique_id" ParentElement="swidsoftware_id" Name="swid:unique_id" Condition="1" Order="0" Flags="14" Text="ZeroTierOne" UpdateIndexInParent="0"/>
-  </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.XmlFileComponent">
-    <ROW XmlFile="regid.199509.com.example_ProductName.swidtag" FileName="REGID2~1.SWI|regid.2010-01.com.zerotier_ZeroTierOne.swidtag" DirProperty="APPDIR" Component="ProductInformation" RootElement="swidsoftware_identification_tag" Flags="25" Version="1.0" Encoding="UTF-8" IndentUnits="2"/>
-    <ROW XmlFile="regid.199509.com.example_ProductName.swidtag_1" FileName="REGID2~1.SWI|regid.2010-01.com.zerotier_ZeroTierOne.swidtag" DirProperty="regid.201001.com.zerotier_Dir" Component="ProductInformation" RootElement="swidsoftware_identification_tag" Flags="25" Version="1.0" Encoding="UTF-8" IndentUnits="2"/>
-  </COMPONENT>
-</DOCUMENT>
diff --git a/ext/json-parser/LICENSE b/ext/json-parser/LICENSE
new file mode 100644
index 000000000..1aee375e0
--- /dev/null
+++ b/ext/json-parser/LICENSE
@@ -0,0 +1,26 @@
+
+  Copyright (C) 2012, 2013 James McLaughlin et al.  All rights reserved.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+ 
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ 
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+
diff --git a/ext/json-parser/json.c b/ext/json-parser/json.c
new file mode 100644
index 000000000..166cdcb60
--- /dev/null
+++ b/ext/json-parser/json.c
@@ -0,0 +1,1012 @@
+/* vim: set et ts=3 sw=3 sts=3 ft=c:
+ *
+ * Copyright (C) 2012, 2013, 2014 James McLaughlin et al.  All rights reserved.
+ * https://github.com/udp/json-parser
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "json.h"
+
+#ifdef _MSC_VER
+   #ifndef _CRT_SECURE_NO_WARNINGS
+      #define _CRT_SECURE_NO_WARNINGS
+   #endif
+   #pragma warning(disable:4996)
+#endif
+
+const struct _json_value json_value_none;
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <math.h>
+
+typedef unsigned int json_uchar;
+
+static unsigned char hex_value (json_char c)
+{
+   if (isdigit(c))
+      return c - '0';
+
+   switch (c) {
+      case 'a': case 'A': return 0x0A;
+      case 'b': case 'B': return 0x0B;
+      case 'c': case 'C': return 0x0C;
+      case 'd': case 'D': return 0x0D;
+      case 'e': case 'E': return 0x0E;
+      case 'f': case 'F': return 0x0F;
+      default: return 0xFF;
+   }
+}
+
+typedef struct
+{
+   unsigned long used_memory;
+
+   unsigned int uint_max;
+   unsigned long ulong_max;
+
+   json_settings settings;
+   int first_pass;
+
+   const json_char * ptr;
+   unsigned int cur_line, cur_col;
+
+} json_state;
+
+static void * default_alloc (size_t size, int zero, void * user_data)
+{
+   return zero ? calloc (1, size) : malloc (size);
+}
+
+static void default_free (void * ptr, void * user_data)
+{
+   free (ptr);
+}
+
+static void * json_alloc (json_state * state, unsigned long size, int zero)
+{
+   if ((state->ulong_max - state->used_memory) < size)
+      return 0;
+
+   if (state->settings.max_memory
+         && (state->used_memory += size) > state->settings.max_memory)
+   {
+      return 0;
+   }
+
+   return state->settings.mem_alloc (size, zero, state->settings.user_data);
+}
+
+static int new_value (json_state * state,
+                      json_value ** top, json_value ** root, json_value ** alloc,
+                      json_type type)
+{
+   json_value * value;
+   int values_size;
+
+   if (!state->first_pass)
+   {
+      value = *top = *alloc;
+      *alloc = (*alloc)->_reserved.next_alloc;
+
+      if (!*root)
+         *root = value;
+
+      switch (value->type)
+      {
+         case json_array:
+
+            if (value->u.array.length == 0)
+               break;
+
+            if (! (value->u.array.values = (json_value **) json_alloc
+               (state, value->u.array.length * sizeof (json_value *), 0)) )
+            {
+               return 0;
+            }
+
+            value->u.array.length = 0;
+            break;
+
+         case json_object:
+
+            if (value->u.object.length == 0)
+               break;
+
+            values_size = sizeof (*value->u.object.values) * value->u.object.length;
+
+            if (! (value->u.object.values = (json_object_entry *) json_alloc
+                  (state, values_size + ((unsigned long) value->u.object.values), 0)) )
+            {
+               return 0;
+            }
+
+            value->_reserved.object_mem = (*(char **) &value->u.object.values) + values_size;
+
+            value->u.object.length = 0;
+            break;
+
+         case json_string:
+
+            if (! (value->u.string.ptr = (json_char *) json_alloc
+               (state, (value->u.string.length + 1) * sizeof (json_char), 0)) )
+            {
+               return 0;
+            }
+
+            value->u.string.length = 0;
+            break;
+
+         default:
+            break;
+      };
+
+      return 1;
+   }
+
+   if (! (value = (json_value *) json_alloc
+         (state, sizeof (json_value) + state->settings.value_extra, 1)))
+   {
+      return 0;
+   }
+
+   if (!*root)
+      *root = value;
+
+   value->type = type;
+   value->parent = *top;
+
+   #ifdef JSON_TRACK_SOURCE
+      value->line = state->cur_line;
+      value->col = state->cur_col;
+   #endif
+
+   if (*alloc)
+      (*alloc)->_reserved.next_alloc = value;
+
+   *alloc = *top = value;
+
+   return 1;
+}
+
+#define whitespace \
+   case '\n': ++ state.cur_line;  state.cur_col = 0; \
+   case ' ': case '\t': case '\r'
+
+#define string_add(b)  \
+   do { if (!state.first_pass) string [string_length] = b;  ++ string_length; } while (0);
+
+#define line_and_col \
+   state.cur_line, state.cur_col
+
+static const long
+   flag_next             = 1 << 0,
+   flag_reproc           = 1 << 1,
+   flag_need_comma       = 1 << 2,
+   flag_seek_value       = 1 << 3, 
+   flag_escaped          = 1 << 4,
+   flag_string           = 1 << 5,
+   flag_need_colon       = 1 << 6,
+   flag_done             = 1 << 7,
+   flag_num_negative     = 1 << 8,
+   flag_num_zero         = 1 << 9,
+   flag_num_e            = 1 << 10,
+   flag_num_e_got_sign   = 1 << 11,
+   flag_num_e_negative   = 1 << 12,
+   flag_line_comment     = 1 << 13,
+   flag_block_comment    = 1 << 14;
+
+json_value * json_parse_ex (json_settings * settings,
+                            const json_char * json,
+                            size_t length,
+                            char * error_buf)
+{
+   json_char error [json_error_max];
+   const json_char * end;
+   json_value * top, * root, * alloc = 0;
+   json_state state = { 0 };
+   long flags;
+   long num_digits = 0, num_e = 0;
+   json_int_t num_fraction = 0;
+
+   /* Skip UTF-8 BOM
+    */
+   if (length >= 3 && ((unsigned char) json [0]) == 0xEF
+                   && ((unsigned char) json [1]) == 0xBB
+                   && ((unsigned char) json [2]) == 0xBF)
+   {
+      json += 3;
+      length -= 3;
+   }
+
+   error[0] = '\0';
+   end = (json + length);
+
+   memcpy (&state.settings, settings, sizeof (json_settings));
+
+   if (!state.settings.mem_alloc)
+      state.settings.mem_alloc = default_alloc;
+
+   if (!state.settings.mem_free)
+      state.settings.mem_free = default_free;
+
+   memset (&state.uint_max, 0xFF, sizeof (state.uint_max));
+   memset (&state.ulong_max, 0xFF, sizeof (state.ulong_max));
+
+   state.uint_max -= 8; /* limit of how much can be added before next check */
+   state.ulong_max -= 8;
+
+   for (state.first_pass = 1; state.first_pass >= 0; -- state.first_pass)
+   {
+      json_uchar uchar;
+      unsigned char uc_b1, uc_b2, uc_b3, uc_b4;
+      json_char * string = 0;
+      unsigned int string_length = 0;
+
+      top = root = 0;
+      flags = flag_seek_value;
+
+      state.cur_line = 1;
+
+      for (state.ptr = json ;; ++ state.ptr)
+      {
+         json_char b = (state.ptr == end ? 0 : *state.ptr);
+         
+         if (flags & flag_string)
+         {
+            if (!b)
+            {  sprintf (error, "Unexpected EOF in string (at %d:%d)", line_and_col);
+               goto e_failed;
+            }
+
+            if (string_length > state.uint_max)
+               goto e_overflow;
+
+            if (flags & flag_escaped)
+            {
+               flags &= ~ flag_escaped;
+
+               switch (b)
+               {
+                  case 'b':  string_add ('\b');  break;
+                  case 'f':  string_add ('\f');  break;
+                  case 'n':  string_add ('\n');  break;
+                  case 'r':  string_add ('\r');  break;
+                  case 't':  string_add ('\t');  break;
+                  case 'u':
+
+                    if (end - state.ptr < 4 || 
+                        (uc_b1 = hex_value (*++ state.ptr)) == 0xFF ||
+                        (uc_b2 = hex_value (*++ state.ptr)) == 0xFF ||
+                        (uc_b3 = hex_value (*++ state.ptr)) == 0xFF ||
+                        (uc_b4 = hex_value (*++ state.ptr)) == 0xFF)
+                    {
+                        sprintf (error, "Invalid character value `%c` (at %d:%d)", b, line_and_col);
+                        goto e_failed;
+                    }
+
+                    uc_b1 = (uc_b1 << 4) | uc_b2;
+                    uc_b2 = (uc_b3 << 4) | uc_b4;
+                    uchar = (uc_b1 << 8) | uc_b2;
+
+                    if ((uchar & 0xF800) == 0xD800) {
+                        json_uchar uchar2;
+                        
+                        if (end - state.ptr < 6 || (*++ state.ptr) != '\\' || (*++ state.ptr) != 'u' ||
+                            (uc_b1 = hex_value (*++ state.ptr)) == 0xFF ||
+                            (uc_b2 = hex_value (*++ state.ptr)) == 0xFF ||
+                            (uc_b3 = hex_value (*++ state.ptr)) == 0xFF ||
+                            (uc_b4 = hex_value (*++ state.ptr)) == 0xFF)
+                        {
+                            sprintf (error, "Invalid character value `%c` (at %d:%d)", b, line_and_col);
+                            goto e_failed;
+                        }
+
+                        uc_b1 = (uc_b1 << 4) | uc_b2;
+                        uc_b2 = (uc_b3 << 4) | uc_b4;
+                        uchar2 = (uc_b1 << 8) | uc_b2;
+                        
+                        uchar = 0x010000 | ((uchar & 0x3FF) << 10) | (uchar2 & 0x3FF);
+                    }
+
+                    if (sizeof (json_char) >= sizeof (json_uchar) || (uchar <= 0x7F))
+                    {
+                       string_add ((json_char) uchar);
+                       break;
+                    }
+
+                    if (uchar <= 0x7FF)
+                    {
+                        if (state.first_pass)
+                           string_length += 2;
+                        else
+                        {  string [string_length ++] = 0xC0 | (uchar >> 6);
+                           string [string_length ++] = 0x80 | (uchar & 0x3F);
+                        }
+
+                        break;
+                    }
+
+                    if (uchar <= 0xFFFF) {
+                        if (state.first_pass)
+                           string_length += 3;
+                        else
+                        {  string [string_length ++] = 0xE0 | (uchar >> 12);
+                           string [string_length ++] = 0x80 | ((uchar >> 6) & 0x3F);
+                           string [string_length ++] = 0x80 | (uchar & 0x3F);
+                        }
+                        
+                        break;
+                    }
+
+                    if (state.first_pass)
+                       string_length += 4;
+                    else
+                    {  string [string_length ++] = 0xF0 | (uchar >> 18);
+                       string [string_length ++] = 0x80 | ((uchar >> 12) & 0x3F);
+                       string [string_length ++] = 0x80 | ((uchar >> 6) & 0x3F);
+                       string [string_length ++] = 0x80 | (uchar & 0x3F);
+                    }
+
+                    break;
+
+                  default:
+                     string_add (b);
+               };
+
+               continue;
+            }
+
+            if (b == '\\')
+            {
+               flags |= flag_escaped;
+               continue;
+            }
+
+            if (b == '"')
+            {
+               if (!state.first_pass)
+                  string [string_length] = 0;
+
+               flags &= ~ flag_string;
+               string = 0;
+
+               switch (top->type)
+               {
+                  case json_string:
+
+                     top->u.string.length = string_length;
+                     flags |= flag_next;
+
+                     break;
+
+                  case json_object:
+
+                     if (state.first_pass)
+                        (*(json_char **) &top->u.object.values) += string_length + 1;
+                     else
+                     {  
+                        top->u.object.values [top->u.object.length].name
+                           = (json_char *) top->_reserved.object_mem;
+
+                        top->u.object.values [top->u.object.length].name_length
+                           = string_length;
+
+                        (*(json_char **) &top->_reserved.object_mem) += string_length + 1;
+                     }
+
+                     flags |= flag_seek_value | flag_need_colon;
+                     continue;
+
+                  default:
+                     break;
+               };
+            }
+            else
+            {
+               string_add (b);
+               continue;
+            }
+         }
+
+         if (state.settings.settings & json_enable_comments)
+         {
+            if (flags & (flag_line_comment | flag_block_comment))
+            {
+               if (flags & flag_line_comment)
+               {
+                  if (b == '\r' || b == '\n' || !b)
+                  {
+                     flags &= ~ flag_line_comment;
+                     -- state.ptr;  /* so null can be reproc'd */
+                  }
+
+                  continue;
+               }
+
+               if (flags & flag_block_comment)
+               {
+                  if (!b)
+                  {  sprintf (error, "%d:%d: Unexpected EOF in block comment", line_and_col);
+                     goto e_failed;
+                  }
+
+                  if (b == '*' && state.ptr < (end - 1) && state.ptr [1] == '/')
+                  {
+                     flags &= ~ flag_block_comment;
+                     ++ state.ptr;  /* skip closing sequence */
+                  }
+
+                  continue;
+               }
+            }
+            else if (b == '/')
+            {
+               if (! (flags & (flag_seek_value | flag_done)) && top->type != json_object)
+               {  sprintf (error, "%d:%d: Comment not allowed here", line_and_col);
+                  goto e_failed;
+               }
+
+               if (++ state.ptr == end)
+               {  sprintf (error, "%d:%d: EOF unexpected", line_and_col);
+                  goto e_failed;
+               }
+
+               switch (b = *state.ptr)
+               {
+                  case '/':
+                     flags |= flag_line_comment;
+                     continue;
+
+                  case '*':
+                     flags |= flag_block_comment;
+                     continue;
+
+                  default:
+                     sprintf (error, "%d:%d: Unexpected `%c` in comment opening sequence", line_and_col, b);
+                     goto e_failed;
+               };
+            }
+         }
+
+         if (flags & flag_done)
+         {
+            if (!b)
+               break;
+
+            switch (b)
+            {
+               whitespace:
+                  continue;
+
+               default:
+
+                  sprintf (error, "%d:%d: Trailing garbage: `%c`",
+                           state.cur_line, state.cur_col, b);
+
+                  goto e_failed;
+            };
+         }
+
+         if (flags & flag_seek_value)
+         {
+            switch (b)
+            {
+               whitespace:
+                  continue;
+
+               case ']':
+
+                  if (top && top->type == json_array)
+                     flags = (flags & ~ (flag_need_comma | flag_seek_value)) | flag_next;
+                  else
+                  {  sprintf (error, "%d:%d: Unexpected ]", line_and_col);
+                     goto e_failed;
+                  }
+
+                  break;
+
+               default:
+
+                  if (flags & flag_need_comma)
+                  {
+                     if (b == ',')
+                     {  flags &= ~ flag_need_comma;
+                        continue;
+                     }
+                     else
+                     {
+                        sprintf (error, "%d:%d: Expected , before %c",
+                                 state.cur_line, state.cur_col, b);
+
+                        goto e_failed;
+                     }
+                  }
+
+                  if (flags & flag_need_colon)
+                  {
+                     if (b == ':')
+                     {  flags &= ~ flag_need_colon;
+                        continue;
+                     }
+                     else
+                     { 
+                        sprintf (error, "%d:%d: Expected : before %c",
+                                 state.cur_line, state.cur_col, b);
+
+                        goto e_failed;
+                     }
+                  }
+
+                  flags &= ~ flag_seek_value;
+
+                  switch (b)
+                  {
+                     case '{':
+
+                        if (!new_value (&state, &top, &root, &alloc, json_object))
+                           goto e_alloc_failure;
+
+                        continue;
+
+                     case '[':
+
+                        if (!new_value (&state, &top, &root, &alloc, json_array))
+                           goto e_alloc_failure;
+
+                        flags |= flag_seek_value;
+                        continue;
+
+                     case '"':
+
+                        if (!new_value (&state, &top, &root, &alloc, json_string))
+                           goto e_alloc_failure;
+
+                        flags |= flag_string;
+
+                        string = top->u.string.ptr;
+                        string_length = 0;
+
+                        continue;
+
+                     case 't':
+
+                        if ((end - state.ptr) < 3 || *(++ state.ptr) != 'r' ||
+                            *(++ state.ptr) != 'u' || *(++ state.ptr) != 'e')
+                        {
+                           goto e_unknown_value;
+                        }
+
+                        if (!new_value (&state, &top, &root, &alloc, json_boolean))
+                           goto e_alloc_failure;
+
+                        top->u.boolean = 1;
+
+                        flags |= flag_next;
+                        break;
+
+                     case 'f':
+
+                        if ((end - state.ptr) < 4 || *(++ state.ptr) != 'a' ||
+                            *(++ state.ptr) != 'l' || *(++ state.ptr) != 's' ||
+                            *(++ state.ptr) != 'e')
+                        {
+                           goto e_unknown_value;
+                        }
+
+                        if (!new_value (&state, &top, &root, &alloc, json_boolean))
+                           goto e_alloc_failure;
+
+                        flags |= flag_next;
+                        break;
+
+                     case 'n':
+
+                        if ((end - state.ptr) < 3 || *(++ state.ptr) != 'u' ||
+                            *(++ state.ptr) != 'l' || *(++ state.ptr) != 'l')
+                        {
+                           goto e_unknown_value;
+                        }
+
+                        if (!new_value (&state, &top, &root, &alloc, json_null))
+                           goto e_alloc_failure;
+
+                        flags |= flag_next;
+                        break;
+
+                     default:
+
+                        if (isdigit (b) || b == '-')
+                        {
+                           if (!new_value (&state, &top, &root, &alloc, json_integer))
+                              goto e_alloc_failure;
+
+                           if (!state.first_pass)
+                           {
+                              while (isdigit (b) || b == '+' || b == '-'
+                                        || b == 'e' || b == 'E' || b == '.')
+                              {
+                                 if ( (++ state.ptr) == end)
+                                 {
+                                    b = 0;
+                                    break;
+                                 }
+
+                                 b = *state.ptr;
+                              }
+
+                              flags |= flag_next | flag_reproc;
+                              break;
+                           }
+
+                           flags &= ~ (flag_num_negative | flag_num_e |
+                                        flag_num_e_got_sign | flag_num_e_negative |
+                                           flag_num_zero);
+
+                           num_digits = 0;
+                           num_fraction = 0;
+                           num_e = 0;
+
+                           if (b != '-')
+                           {
+                              flags |= flag_reproc;
+                              break;
+                           }
+
+                           flags |= flag_num_negative;
+                           continue;
+                        }
+                        else
+                        {  sprintf (error, "%d:%d: Unexpected %c when seeking value", line_and_col, b);
+                           goto e_failed;
+                        }
+                  };
+            };
+         }
+         else
+         {
+            switch (top->type)
+            {
+            case json_object:
+               
+               switch (b)
+               {
+                  whitespace:
+                     continue;
+
+                  case '"':
+
+                     if (flags & flag_need_comma)
+                     {  sprintf (error, "%d:%d: Expected , before \"", line_and_col);
+                        goto e_failed;
+                     }
+
+                     flags |= flag_string;
+
+                     string = (json_char *) top->_reserved.object_mem;
+                     string_length = 0;
+
+                     break;
+                  
+                  case '}':
+
+                     flags = (flags & ~ flag_need_comma) | flag_next;
+                     break;
+
+                  case ',':
+
+                     if (flags & flag_need_comma)
+                     {
+                        flags &= ~ flag_need_comma;
+                        break;
+                     }
+
+                  default:
+                     sprintf (error, "%d:%d: Unexpected `%c` in object", line_and_col, b);
+                     goto e_failed;
+               };
+
+               break;
+
+            case json_integer:
+            case json_double:
+
+               if (isdigit (b))
+               {
+                  ++ num_digits;
+
+                  if (top->type == json_integer || flags & flag_num_e)
+                  {
+                     if (! (flags & flag_num_e))
+                     {
+                        if (flags & flag_num_zero)
+                        {  sprintf (error, "%d:%d: Unexpected `0` before `%c`", line_and_col, b);
+                           goto e_failed;
+                        }
+
+                        if (num_digits == 1 && b == '0')
+                           flags |= flag_num_zero;
+                     }
+                     else
+                     {
+                        flags |= flag_num_e_got_sign;
+                        num_e = (num_e * 10) + (b - '0');
+                        continue;
+                     }
+
+                     top->u.integer = (top->u.integer * 10) + (b - '0');
+                     continue;
+                  }
+
+                  num_fraction = (num_fraction * 10) + (b - '0');
+                  continue;
+               }
+
+               if (b == '+' || b == '-')
+               {
+                  if ( (flags & flag_num_e) && !(flags & flag_num_e_got_sign))
+                  {
+                     flags |= flag_num_e_got_sign;
+
+                     if (b == '-')
+                        flags |= flag_num_e_negative;
+
+                     continue;
+                  }
+               }
+               else if (b == '.' && top->type == json_integer)
+               {
+                  if (!num_digits)
+                  {  sprintf (error, "%d:%d: Expected digit before `.`", line_and_col);
+                     goto e_failed;
+                  }
+
+                  top->type = json_double;
+                  top->u.dbl = (double) top->u.integer;
+
+                  num_digits = 0;
+                  continue;
+               }
+
+               if (! (flags & flag_num_e))
+               {
+                  if (top->type == json_double)
+                  {
+                     if (!num_digits)
+                     {  sprintf (error, "%d:%d: Expected digit after `.`", line_and_col);
+                        goto e_failed;
+                     }
+
+                     top->u.dbl += ((double) num_fraction) / (pow (10.0, (double) num_digits));
+                  }
+
+                  if (b == 'e' || b == 'E')
+                  {
+                     flags |= flag_num_e;
+
+                     if (top->type == json_integer)
+                     {
+                        top->type = json_double;
+                        top->u.dbl = (double) top->u.integer;
+                     }
+
+                     num_digits = 0;
+                     flags &= ~ flag_num_zero;
+
+                     continue;
+                  }
+               }
+               else
+               {
+                  if (!num_digits)
+                  {  sprintf (error, "%d:%d: Expected digit after `e`", line_and_col);
+                     goto e_failed;
+                  }
+
+                  top->u.dbl *= pow (10.0, (double)
+                      (flags & flag_num_e_negative ? - num_e : num_e));
+               }
+
+               if (flags & flag_num_negative)
+               {
+                  if (top->type == json_integer)
+                     top->u.integer = - top->u.integer;
+                  else
+                     top->u.dbl = - top->u.dbl;
+               }
+
+               flags |= flag_next | flag_reproc;
+               break;
+
+            default:
+               break;
+            };
+         }
+
+         if (flags & flag_reproc)
+         {
+            flags &= ~ flag_reproc;
+            -- state.ptr;
+         }
+
+         if (flags & flag_next)
+         {
+            flags = (flags & ~ flag_next) | flag_need_comma;
+
+            if (!top->parent)
+            {
+               /* root value done */
+
+               flags |= flag_done;
+               continue;
+            }
+
+            if (top->parent->type == json_array)
+               flags |= flag_seek_value;
+               
+            if (!state.first_pass)
+            {
+               json_value * parent = top->parent;
+
+               switch (parent->type)
+               {
+                  case json_object:
+
+                     parent->u.object.values
+                        [parent->u.object.length].value = top;
+
+                     break;
+
+                  case json_array:
+
+                     parent->u.array.values
+                           [parent->u.array.length] = top;
+
+                     break;
+
+                  default:
+                     break;
+               };
+            }
+
+            if ( (++ top->parent->u.array.length) > state.uint_max)
+               goto e_overflow;
+
+            top = top->parent;
+
+            continue;
+         }
+      }
+
+      alloc = root;
+   }
+
+   return root;
+
+e_unknown_value:
+
+   sprintf (error, "%d:%d: Unknown value", line_and_col);
+   goto e_failed;
+
+e_alloc_failure:
+
+   strcpy (error, "Memory allocation failure");
+   goto e_failed;
+
+e_overflow:
+
+   sprintf (error, "%d:%d: Too long (caught overflow)", line_and_col);
+   goto e_failed;
+
+e_failed:
+
+   if (error_buf)
+   {
+      if (*error)
+         strcpy (error_buf, error);
+      else
+         strcpy (error_buf, "Unknown error");
+   }
+
+   if (state.first_pass)
+      alloc = root;
+
+   while (alloc)
+   {
+      top = alloc->_reserved.next_alloc;
+      state.settings.mem_free (alloc, state.settings.user_data);
+      alloc = top;
+   }
+
+   if (!state.first_pass)
+      json_value_free_ex (&state.settings, root);
+
+   return 0;
+}
+
+json_value * json_parse (const json_char * json, size_t length)
+{
+   json_settings settings = { 0 };
+   return json_parse_ex (&settings, json, length, 0);
+}
+
+void json_value_free_ex (json_settings * settings, json_value * value)
+{
+   json_value * cur_value;
+
+   if (!value)
+      return;
+
+   value->parent = 0;
+
+   while (value)
+   {
+      switch (value->type)
+      {
+         case json_array:
+
+            if (!value->u.array.length)
+            {
+               settings->mem_free (value->u.array.values, settings->user_data);
+               break;
+            }
+
+            value = value->u.array.values [-- value->u.array.length];
+            continue;
+
+         case json_object:
+
+            if (!value->u.object.length)
+            {
+               settings->mem_free (value->u.object.values, settings->user_data);
+               break;
+            }
+
+            value = value->u.object.values [-- value->u.object.length].value;
+            continue;
+
+         case json_string:
+
+            settings->mem_free (value->u.string.ptr, settings->user_data);
+            break;
+
+         default:
+            break;
+      };
+
+      cur_value = value;
+      value = value->parent;
+      settings->mem_free (cur_value, settings->user_data);
+   }
+}
+
+void json_value_free (json_value * value)
+{
+   json_settings settings = { 0 };
+   settings.mem_free = default_free;
+   json_value_free_ex (&settings, value);
+}
+
diff --git a/ext/json-parser/json.h b/ext/json-parser/json.h
new file mode 100644
index 000000000..f6549ec4e
--- /dev/null
+++ b/ext/json-parser/json.h
@@ -0,0 +1,283 @@
+
+/* vim: set et ts=3 sw=3 sts=3 ft=c:
+ *
+ * Copyright (C) 2012, 2013, 2014 James McLaughlin et al.  All rights reserved.
+ * https://github.com/udp/json-parser
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _JSON_H
+#define _JSON_H
+
+#ifndef json_char
+   #define json_char char
+#endif
+
+#ifndef json_int_t
+   #ifndef _MSC_VER
+      #include <inttypes.h>
+      #define json_int_t int64_t
+   #else
+      #define json_int_t __int64
+   #endif
+#endif
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+
+   #include <string.h>
+
+   extern "C"
+   {
+
+#endif
+
+typedef struct
+{
+   unsigned long max_memory;
+   int settings;
+
+   /* Custom allocator support (leave null to use malloc/free)
+    */
+
+   void * (* mem_alloc) (size_t, int zero, void * user_data);
+   void (* mem_free) (void *, void * user_data);
+
+   void * user_data;  /* will be passed to mem_alloc and mem_free */
+
+   size_t value_extra;  /* how much extra space to allocate for values? */
+
+} json_settings;
+
+#define json_enable_comments  0x01
+
+typedef enum
+{
+   json_none,
+   json_object,
+   json_array,
+   json_integer,
+   json_double,
+   json_string,
+   json_boolean,
+   json_null
+
+} json_type;
+
+extern const struct _json_value json_value_none;
+       
+typedef struct _json_object_entry
+{
+    json_char * name;
+    unsigned int name_length;
+    
+    struct _json_value * value;
+    
+} json_object_entry;
+
+typedef struct _json_value
+{
+   struct _json_value * parent;
+
+   json_type type;
+
+   union
+   {
+      int boolean;
+      json_int_t integer;
+      double dbl;
+
+      struct
+      {
+         unsigned int length;
+         json_char * ptr; /* null terminated */
+
+      } string;
+
+      struct
+      {
+         unsigned int length;
+
+         json_object_entry * values;
+
+         #if defined(__cplusplus) && __cplusplus >= 201103L
+         decltype(values) begin () const
+         {  return values;
+         }
+         decltype(values) end () const
+         {  return values + length;
+         }
+         #endif
+
+      } object;
+
+      struct
+      {
+         unsigned int length;
+         struct _json_value ** values;
+
+         #if defined(__cplusplus) && __cplusplus >= 201103L
+         decltype(values) begin () const
+         {  return values;
+         }
+         decltype(values) end () const
+         {  return values + length;
+         }
+         #endif
+
+      } array;
+
+   } u;
+
+   union
+   {
+      struct _json_value * next_alloc;
+      void * object_mem;
+
+   } _reserved;
+
+   #ifdef JSON_TRACK_SOURCE
+
+      /* Location of the value in the source JSON
+       */
+      unsigned int line, col;
+
+   #endif
+
+
+   /* Some C++ operator sugar */
+
+   #ifdef __cplusplus
+
+      public:
+
+         inline _json_value ()
+         {  memset (this, 0, sizeof (_json_value));
+         }
+
+         inline const struct _json_value &operator [] (int index) const
+         {
+            if (type != json_array || index < 0
+                     || ((unsigned int) index) >= u.array.length)
+            {
+               return json_value_none;
+            }
+
+            return *u.array.values [index];
+         }
+
+         inline const struct _json_value &operator [] (const char * index) const
+         { 
+            if (type != json_object)
+               return json_value_none;
+
+            for (unsigned int i = 0; i < u.object.length; ++ i)
+               if (!strcmp (u.object.values [i].name, index))
+                  return *u.object.values [i].value;
+
+            return json_value_none;
+         }
+
+         inline operator const char * () const
+         {  
+            switch (type)
+            {
+               case json_string:
+                  return u.string.ptr;
+
+               default:
+                  return "";
+            };
+         }
+
+         inline operator json_int_t () const
+         {  
+            switch (type)
+            {
+               case json_integer:
+                  return u.integer;
+
+               case json_double:
+                  return (json_int_t) u.dbl;
+
+               default:
+                  return 0;
+            };
+         }
+
+         inline operator bool () const
+         {  
+            if (type != json_boolean)
+               return false;
+
+            return u.boolean != 0;
+         }
+
+         inline operator double () const
+         {  
+            switch (type)
+            {
+               case json_integer:
+                  return (double) u.integer;
+
+               case json_double:
+                  return u.dbl;
+
+               default:
+                  return 0;
+            };
+         }
+
+   #endif
+
+} json_value;
+       
+json_value * json_parse (const json_char * json,
+                         size_t length);
+
+#define json_error_max 128
+json_value * json_parse_ex (json_settings * settings,
+                            const json_char * json,
+                            size_t length,
+                            char * error);
+
+void json_value_free (json_value *);
+
+
+/* Not usually necessary, unless you used a custom mem_alloc and now want to
+ * use a custom mem_free.
+ */
+void json_value_free_ex (json_settings * settings,
+                         json_value *);
+
+
+#ifdef __cplusplus
+   } /* extern "C" */
+#endif
+
+#endif
+
+
diff --git a/ext/libnatpmp/getgateway.c b/ext/libnatpmp/getgateway.c
index 0f06e1dc2..dfb9f3e21 100644
--- a/ext/libnatpmp/getgateway.c
+++ b/ext/libnatpmp/getgateway.c
@@ -53,7 +53,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #undef USE_PROC_NET_ROUTE
 #define USE_SOCKET_ROUTE
 #undef USE_SYSCTL_NET_ROUTE
-#include <sys/sysctl.h>
 #endif
 
 #ifdef __APPLE__
@@ -97,6 +96,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef USE_SYSCTL_NET_ROUTE
 #include <stdlib.h>
+#include <sys/sysctl.h>
 #include <sys/socket.h>
 #include <net/route.h>
 #endif
@@ -271,9 +271,7 @@ int getdefaultgateway(in_addr_t *addr)
   rtm.rtm_addrs = rtm_addrs;
 
   so_dst.sa_family = AF_INET;
-  so_dst.sa_len = sizeof(struct sockaddr);
   so_mask.sa_family = AF_INET;
-  so_mask.sa_len = sizeof(struct sockaddr);
 
   NEXTADDR(RTA_DST, so_dst);
   NEXTADDR(RTA_NETMASK, so_mask);
diff --git a/ext/libpqxx-7.7.3/.circleci/config.yml b/ext/libpqxx-7.7.3/.circleci/config.yml
deleted file mode 100644
index 038d7adb0..000000000
--- a/ext/libpqxx-7.7.3/.circleci/config.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# CircleCI config for automated test builds triggered from Github.
-version: 2
-jobs:
-  build:
-    docker:
-      - image: debian:testing
-#      - image: postgres:latest
-    environment:
-      - PGHOST: "/tmp"
-    steps:
-      - checkout
-      - run:
-          name: Configure apt archives
-          command: apt update
-      - run:
-          name: Install
-          command: apt install -y lsb-release python3 cmake postgresql libpq-dev postgresql-server-dev-all build-essential autoconf dh-autoreconf autoconf-archive automake cppcheck
-      - run:
-          name: Identify
-          command: lsb_release -a && c++ --version
-      - run:
-          name: Prepare postgres
-          command: |
-              mkdir /tmp/db &&
-              chown postgres /tmp/db &&
-              su postgres -c '/usr/lib/postgresql/*/bin/initdb --pgdata /tmp/db --auth trust --nosync'
-      - run:
-          name: Run postgres
-          command: (su postgres -c '/usr/lib/postgresql/*/bin/postgres -D /tmp/db -k /tmp' &) && sleep 5
-      - run:
-          name: Create postgres user
-          command: su postgres -c "createuser -w -d root"
-      - run:
-          name: Set up database
-          command: createdb root
-      - run:
-          name: Autogen
-          command: NOCONFIGURE=1 ./autogen.sh
-      - run:
-          name: Configure
-          command: |
-              ./configure \
-                  --disable-documentation \
-                  --enable-maintainer-mode \
-                  --enable-audit \
-                  --enable-shared --disable-static \
-                  CXXFLAGS=-O3
-      - store_artifacts:
-          path: config.log
-      - run:
-          name: Make
-          command: make -j$(nproc)
-      - run:
-          name: Test
-          command: PGDATA=db/data make check
-      - run:
-          name: Analyse
-          command: ./tools/lint --full >lint.log
-      - store_artifacts:
-          path: lint.log
diff --git a/ext/libpqxx-7.7.3/.clang-format b/ext/libpqxx-7.7.3/.clang-format
deleted file mode 100644
index 97823d8ff..000000000
--- a/ext/libpqxx-7.7.3/.clang-format
+++ /dev/null
@@ -1,71 +0,0 @@
-Language: Cpp
-
-AlignAfterOpenBracket: AlwaysBreak
-# AllowAllArgumentsOnNextLine: true
-# AllowAllConstructorInitializersOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: Inline
-# AllowShortIfStatementsOnASingleLine: WithoutElse
-# AllowShortLambdasOnASingleLine: All
-AllowShortLoopsOnASingleLine: true
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
-# AlwaysBreakTemplateDeclarations: No
-BinPackArguments: true
-BinPackParameters: true
-BreakBeforeBraces: Custom
-BraceWrapping:
-  # AfterCaseLabel: true
-  AfterClass: true
-  AfterControlStatement: true
-  AfterEnum: true
-  AfterExternBlock: true
-  AfterFunction: true
-  AfterNamespace: true
-  AfterStruct: true
-  BeforeCatch: true
-  BeforeElse: true
-  IndentBraces: false
-  SplitEmptyFunction: false
-  SplitEmptyNamespace: false
-  SplitEmptyRecord: false
-BreakBeforeBinaryOperators: None
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializers: AfterColon
-# BreakInheritanceList: AfterColon
-BreakStringLiterals: true
-ColumnLimit: 79
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 8
-ContinuationIndentWidth: 2
-Cpp11BracedListStyle: true
-FixNamespaceComments: true
-IncludeBlocks: Preserve
-IndentCaseLabels: false
-IndentPPDirectives: AfterHash
-IndentWidth: 2
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: false
-MaxEmptyLinesToKeep: 2
-# NamespaceIndentation: All
-SortIncludes: true
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: false
-SpaceBeforeAssignmentOperators: true
-# SpaceBeforeCpp11BracedList: false
-# SpaceBeforeCtorInitializerColon: true
-# SpaceBeforeInheritanceColon: true
-# SpaceBeforeParents: ControlStatements
-# SpaceBeforeRangedBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesInAngles: false
-SpacesInCStyleCastParentheses: false
-SpacesInContainerLiterals: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp11
-UseTab: Never
----
diff --git a/ext/libpqxx-7.7.3/.cmake-format b/ext/libpqxx-7.7.3/.cmake-format
deleted file mode 100644
index af00ef936..000000000
--- a/ext/libpqxx-7.7.3/.cmake-format
+++ /dev/null
@@ -1,184 +0,0 @@
-format:
-  _help_max_prefix_chars:
-  - !!python/unicode 'If the statement spelling length (including space and'
-  - !!python/unicode 'parenthesis) is larger than the tab width by more than this'
-  - !!python/unicode 'amount, then force reject un-nested layouts.'
-  max_prefix_chars: 10
-  _help_dangle_align:
-  - !!python/unicode 'If the trailing parenthesis must be ''dangled'' on its own'
-  - !!python/unicode 'line, then align it to this reference: `prefix`: the start'
-  - !!python/unicode 'of the statement,  `prefix-indent`: the start of the'
-  - !!python/unicode 'statement, plus one indentation  level, `child`: align to'
-  - !!python/unicode 'the column of the arguments'
-  dangle_align: !!python/unicode 'prefix'
-  _help_max_subgroups_hwrap:
-  - !!python/unicode 'If an argument group contains more than this many sub-groups'
-  - !!python/unicode '(parg or kwarg groups) then force it to a vertical layout.'
-  max_subgroups_hwrap: 2
-  _help_min_prefix_chars:
-  - !!python/unicode 'If the statement spelling length (including space and'
-  - !!python/unicode 'parenthesis) is smaller than this amount, then force reject'
-  - !!python/unicode 'nested layouts.'
-  min_prefix_chars: 4
-  _help_max_pargs_hwrap:
-  - !!python/unicode 'If a positional argument group contains more than this many'
-  - !!python/unicode 'arguments, then force it to a vertical layout.'
-  max_pargs_hwrap: 6
-  _help_max_lines_hwrap:
-  - !!python/unicode 'If a candidate layout is wrapped horizontally but it exceeds'
-  - !!python/unicode 'this many lines, then reject the layout.'
-  max_lines_hwrap: 2
-  _help_autosort:
-  - !!python/unicode 'If true, the parsers may infer whether or not an argument'
-  - !!python/unicode 'list is sortable (without annotation).'
-  autosort: false
-  _help_line_ending:
-  - !!python/unicode 'What style line endings to use in the output.'
-  line_ending: !!python/unicode 'unix'
-  _help_line_width:
-  - !!python/unicode 'How wide to allow formatted cmake files'
-  line_width: 80
-  _help_dangle_parens:
-  - !!python/unicode 'If a statement is wrapped to more than one line, then dangle'
-  - !!python/unicode 'the closing parenthesis on its own line.'
-  dangle_parens: true
-  _help_tab_size:
-  - !!python/unicode 'How many spaces to tab for indent'
-  tab_size: 4
-  _help_always_wrap:
-  - !!python/unicode 'A list of command names which should always be wrapped'
-  always_wrap: []
-  _help_require_valid_layout:
-  - !!python/unicode 'By default, if cmake-format cannot successfully fit'
-  - !!python/unicode 'everything into the desired linewidth it will apply the'
-  - !!python/unicode 'last, most agressive attempt that it made. If this flag is'
-  - !!python/unicode 'True, however, cmake-format will print error, exit with non-'
-  - !!python/unicode 'zero status code, and write-out nothing'
-  require_valid_layout: true
-  _help_keyword_case:
-  - !!python/unicode 'Format keywords consistently as ''lower'' or ''upper'' case'
-  keyword_case: !!python/unicode 'unchanged'
-  _help_layout_passes:
-  - !!python/unicode 'A dictionary mapping layout nodes to a list of wrap'
-  - !!python/unicode 'decisions. See the documentation for more information.'
-  layout_passes: {}
-  _help_enable_sort:
-  - !!python/unicode 'If true, the argument lists which are known to be sortable'
-  - !!python/unicode 'will be sorted lexicographically'
-  enable_sort: true
-_help_markup: !!python/unicode 'Options affecting comment reflow and formatting.'
-markup:
-  _help_literal_comment_pattern:
-  - !!python/unicode 'If comment markup is enabled, don''t reflow any comment block'
-  - !!python/unicode 'which matches this (regex) pattern. Default is `None`'
-  - !!python/unicode '(disabled).'
-  literal_comment_pattern: null
-  _help_hashruler_min_length:
-  - !!python/unicode 'If a comment line starts with at least this many consecutive'
-  - !!python/unicode 'hash characters, then don''t lstrip() them off. This allows'
-  - !!python/unicode 'for lazy hash rulers where the first hash char is not'
-  - !!python/unicode 'separated by space'
-  hashruler_min_length: 10
-  _help_fence_pattern:
-  - !!python/unicode 'Regular expression to match preformat fences in comments'
-  - !!python/unicode 'default=r''^\s*([`~]{3}[`~]*)(.*)$'''
-  fence_pattern: !!python/unicode '^\s*([`~]{3}[`~]*)(.*)$'
-  _help_canonicalize_hashrulers:
-  - !!python/unicode 'If true, then insert a space between the first hash char and'
-  - !!python/unicode 'remaining hash chars in a hash ruler, and normalize its'
-  - !!python/unicode 'length to fill the column'
-  canonicalize_hashrulers: true
-  _help_explicit_trailing_pattern:
-  - !!python/unicode 'If a comment line matches starts with this pattern then it'
-  - !!python/unicode 'is explicitly a trailing comment for the preceeding'
-  - !!python/unicode 'argument. Default is ''#<'''
-  explicit_trailing_pattern: !!python/unicode '#<'
-  _help_first_comment_is_literal:
-  - !!python/unicode 'If comment markup is enabled, don''t reflow the first comment'
-  - !!python/unicode 'block in each listfile. Use this to preserve formatting of'
-  - !!python/unicode 'your copyright/license statements.'
-  first_comment_is_literal: false
-  _help_enable_markup:
-  - !!python/unicode 'enable comment markup parsing and reflow'
-  enable_markup: true
-  _help_ruler_pattern:
-  - !!python/unicode 'Regular expression to match rulers in comments'
-  - !!python/unicode 'default=r''^\s*[^\w\s]{3}.*[^\w\s]{3}$'''
-  ruler_pattern: !!python/unicode '^\s*[^\w\s]{3}.*[^\w\s]{3}$'
-  _help_enum_char:
-  - !!python/unicode 'What character to use as punctuation after numerals in an'
-  - !!python/unicode 'enumerated list'
-  enum_char: .
-  _help_bullet_char:
-  - !!python/unicode 'What character to use for bulleted lists'
-  bullet_char: '*'
-_help_lint: !!python/unicode 'Options affecting the linter'
-lint:
-  _help_function_pattern:
-  - !!python/unicode 'regular expression pattern describing valid function names'
-  function_pattern: !!python/unicode '[0-9a-z_]+'
-  _help_disabled_codes:
-  - !!python/unicode 'a list of lint codes to disable'
-  disabled_codes: []
-  _help_min_statement_spacing:
-  - !!python/unicode 'Require at least this many newlines between statements'
-  min_statement_spacing: 1
-  _help_macro_pattern:
-  - !!python/unicode 'regular expression pattern describing valid macro names'
-  macro_pattern: !!python/unicode '[0-9A-Z_]+'
-  _help_public_var_pattern:
-  - !!python/unicode 'regular expression pattern describing valid names for'
-  - !!python/unicode 'publicdirectory variables'
-  public_var_pattern: !!python/unicode '[0-9A-Z][0-9A-Z_]+'
-  max_statements: 50
-  _help_max_conditionals_custom_parser:
-  - !!python/unicode 'In the heuristic for C0201, how many conditionals to match'
-  - !!python/unicode 'within a loop in before considering the loop a parser.'
-  max_conditionals_custom_parser: 2
-  _help_global_var_pattern:
-  - !!python/unicode 'regular expression pattern describing valid names for'
-  - !!python/unicode 'variables with global scope'
-  global_var_pattern: !!python/unicode '[0-9A-Z][0-9A-Z_]+'
-  _help_keyword_pattern:
-  - !!python/unicode 'regular expression pattern describing valid names for'
-  - !!python/unicode 'keywords used in functions or macros'
-  keyword_pattern: !!python/unicode '[0-9A-Z_]+'
-  max_arguments: 5
-  _help_private_var_pattern:
-  - !!python/unicode 'regular expression pattern describing valid names for'
-  - !!python/unicode 'privatedirectory variables'
-  private_var_pattern: !!python/unicode '_[0-9a-z_]+'
-  max_localvars: 15
-  max_branches: 12
-  _help_local_var_pattern:
-  - !!python/unicode 'regular expression pattern describing valid names for'
-  - !!python/unicode 'variables with local scope'
-  local_var_pattern: !!python/unicode '[0-9a-z_]+'
-  _help_max_statement_spacing:
-  - !!python/unicode 'Require no more than this many newlines between statements'
-  max_statement_spacing: 1
-  _help_internal_var_pattern:
-  - !!python/unicode 'regular expression pattern describing valid names for'
-  - !!python/unicode 'variables with global scope (but internal semantic)'
-  internal_var_pattern: !!python/unicode '_[0-9A-Z][0-9A-Z_]+'
-  max_returns: 6
-_help_misc: !!python/unicode 'Miscellaneous configurations options.'
-misc:
-  _help_per_command:
-  - !!python/unicode 'A dictionary containing any per-command configuration'
-  - !!python/unicode 'overrides. Currently only `command_case` is supported.'
-  per_command: {}
-_help_parse: !!python/unicode 'Options affecting listfile parsing'
-parse:
-  _help_additional_commands:
-  - !!python/unicode 'Specify structure for custom cmake functions'
-  additional_commands:
-    !!python/unicode 'foo':
-      !!python/unicode 'flags':
-      - !!python/unicode 'BAR'
-      - !!python/unicode 'BAZ'
-      !!python/unicode 'kwargs':
-        !!python/unicode 'HEADERS': !!python/unicode '*'
-        !!python/unicode 'DEPENDS': !!python/unicode '*'
-        !!python/unicode 'SOURCES': !!python/unicode '*'
-_help_encode: !!python/unicode 'Options effecting file encoding'
diff --git a/ext/libpqxx-7.7.3/.github/workflows/stale.yml b/ext/libpqxx-7.7.3/.github/workflows/stale.yml
deleted file mode 100644
index 0983a3e54..000000000
--- a/ext/libpqxx-7.7.3/.github/workflows/stale.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'There has been no activity on this ticket.  Consider closing it.'
-        stale-pr-message: 'There has been no activity on this pull request.  Complete it or drop it.'
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'
diff --git a/ext/libpqxx-7.7.3/.gitignore b/ext/libpqxx-7.7.3/.gitignore
deleted file mode 100644
index d798c9dca..000000000
--- a/ext/libpqxx-7.7.3/.gitignore
+++ /dev/null
@@ -1,49 +0,0 @@
-autom4te.cache
-build-*.out
-ChangeLog
-CMakeFiles/CMakeTmp
-confdefs.h
-config.log
-config.status
-conftest
-conftest.cpp
-conftest.err
-doc/_build
-doc/Doxyfile
-doc/html/Reference/*.css
-doc/html/Reference/*.html
-doc/html/Reference/*.js
-doc/html/Reference/*.png
-doc/html/Reference/*.map
-doc/html/Reference/*.md5
-doc/reference-stamp
-include/pqxx/config-*-*.h
-include/pqxx/config.h
-include/pqxx/stamp-h1
-libpqxx.pc
-libpqxx-*.tar.gz
-libtool
-pqxx-config
-pqxxlo.txt
-test/pqxxlo.txt
-tools/pqxxthreadsafety
-tools/rmlo
-README
-win32/common
-**/Makefile
-**/*.la
-**/*.lo
-**/*.o
-**/*.out
-**/.*.swp
-**/.swp
-**/*.tmp
-**/.deps
-**/.libs
-**/*~
-**/lint.log
-**/lint.trs
-**/runner
-**/runner.log
-**/runner.trs
-**/test-suite.log
diff --git a/ext/libpqxx-7.7.3/.lgtm.yml b/ext/libpqxx-7.7.3/.lgtm.yml
deleted file mode 100644
index d53664eb4..000000000
--- a/ext/libpqxx-7.7.3/.lgtm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for lgtm.com static analysis.
-
-path_classifiers:
-  test:
-    - test
-  generated:
-    - aclocal.m4
-    - configure
-    - ltmain.sh
diff --git a/ext/libpqxx-7.7.3/.lift/ignoreFiles b/ext/libpqxx-7.7.3/.lift/ignoreFiles
deleted file mode 100644
index 8c6c7a103..000000000
--- a/ext/libpqxx-7.7.3/.lift/ignoreFiles
+++ /dev/null
@@ -1,3 +0,0 @@
-# Make Sonatype Lift ignore these generated files.
-configure
-config/*
diff --git a/ext/libpqxx-7.7.3/AUTHORS b/ext/libpqxx-7.7.3/AUTHORS
deleted file mode 100644
index 6a922e950..000000000
--- a/ext/libpqxx-7.7.3/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Jeroen T. Vermeulen.  Wrote the code.
-Ray Dassen.  Did most of the autoconf etc. stuff.
-
-Lots of others helped with various other contributions.
diff --git a/ext/libpqxx-7.7.3/BUILDING-cmake.md b/ext/libpqxx-7.7.3/BUILDING-cmake.md
deleted file mode 100644
index 48b1e7930..000000000
--- a/ext/libpqxx-7.7.3/BUILDING-cmake.md
+++ /dev/null
@@ -1,272 +0,0 @@
-Building using CMake
-====================
-
-The build requires the full PostgreSQL development package.  That package must
-be installed before you can build libpqxx.
-
-The instructions will assume that you're working from a command-line shell.
-If you prefer to work from an IDE, you'll have to know how your IDE likes to
-do things, and you'll want to follow the shell instructions as a guide.
-
-I'm not too familiar with CMake, and this build relies heavily on contributions
-from users.  If you see something wrong here, please file a bug and explain, in
-simple words, what needs changing and why.
-
-
-Quick start
------------
-
-If you just want to get it built and installed quickly, run `cmake` from the
-root of the libpqxx source tree.  This configures your build.
-
-Then compile libpqxx by running:
-
-```shell
-    cmake --build .
-```
-
-To install in the default location:
-
-```shell
-    cmake --install .
-```
-
-
-Stages
-------
-
-I'll explain the main build steps in more detail below, but here's a quick
-rundown:
-1. Configure
-2. Compile
-3. Test
-4. Install
-5. Use
-
-The Test step is optional.
-
-
-Configure
----------
-
-Run `cmake` to configure your build.  It figures out various parameters, such
-as where libpq and its headers are, which C++ features your compiler supports,
-and which options your compiler needs.  CMake generates configuration for your
-build tool: `Makefile`s for `make`, or a Solution (".sln") file for MSVC's
-`msbuild`, and so on.
-
-At this stage you can also override those options yourself. e.g. to instruct
-the compiler to look for libpq in a non-standard place, or to use a different
-compiler, or pass different compiler flags.  Don't try to specify those while
-doing the actual compile; set them once when running `cmake`.
-
-Let's say `$BUILD` is the directory where you want to build libpqxx, and
-`$SRC` is where its source code is.  So for example, the readme file will be at
-`$SRC/README.md`.
-
-In the simplest case, you just do:
-
-```shell
-    cd $BUILD
-    cmake $SRC
-```
-
-Add CMake options as needed.  There's more about the options below.  I'll also
-explain the two directories.
-
-
-### Cheat sheet
-
-Here are some popular `cmake` options for libpqxx:
-* `-DSKIP_BUILD_TEST=on` skips compiling libpqxx's tests.
-* `-DBUILD_SHARED_LIBS=on` to build a shared library.
-* `-DBUILD_SHARED_LIBS=off` to build a static library.
-* `-DBUILD_DOC=on` to build documentation.
-* `-DINSTALL_TEST=on` to install test executor binary.
-
-On Windows, I recommend building libpqxx as a shared library and bundling it
-with your application.  On other platforms I would prefer a static library.
-
-Building the documentation requires some tools to be installed.  It takes at
-least Doxygen, but there's no list of requirements.  The way to get this set up
-is to just try it and see what it's missing.
-
-
-### Generators
-
-You can also choose your own build tool by telling CMake to use a particular
-"generator."  For example, here's how to force use of `make`:
-
-```shell
-    cmake -G 'Unix Makefiles'
-```
-
-Or if you prefer to build using `ninja` instead:
-
-```shell
-    cmake -G Ninja
-```
-
-There are many more options.  You may prefer yet a different build tool.
-
-
-### Finding libpq
-
-The CMake step tries to figure out where libpq is, using Cmake's `find_package`
-function.  If that doesn't work, or if you want a libpq in a different location
-from the one it finds, there are two ways to override it.
-
-The first is to set the individual include and link paths.
-
-To make the build look for the libpq headers in some directory `$DIR`, add
-these options:
-* `-DPostgreSQL_TYPE_INCLUDE_DIR=$DIR`
-* `-DPostgreSQL_INCLUDE_DIR=$DIR`
-
-To make the build look for the libpq library binary in a directory `$DIR`, add
-this option:
-* `-DPostgreSQL_LIBRARY_DIR=$DIR`
-
-The second, easier way requires CMake 3.12 or better.  Here, you specify a path
-to a full PostgreSQL build tree.  You do this (again for some directory `$DIR`)
-by simply passing this cmake option: `-DPostgreSQL_ROOT=$DIR`
-
-
-### Source and Build trees
-
-Where should you run `cmake`?
-
-Two directories matter when building libpqxx: the _source tree_ (where the
-libpqxx source code is) and the _build tree_ (where you want your build
-artefacts).  Here I will call them `$SRC` and `$BUILD`, but you can call them
-anything you like.
-
-They can be one and the same, if you like.  It's convenient, but less clean, as
-source code and build artefacts will exist in the same directory tree.  If
-you're going to delete the source tree after installing, of course it's fine to
-make a mess in there.
-
-
-Compile
--------
-
-To compile, run:
-
-```shell
-    cmake --build $BUILD
-```
-
-(Where `$BUILD` is again the directory where you wish to do the build.)
-
-This command will invoke your build tool.  Other ways to do the same thing
-would be...
-* With Unix Makefiles: `make`
-* With Ninja: `ninja`
-* With Visual Studio: `msbuild libpqxx.sln`
-* etc.
-
-Depending on your build tool, you may want to speed this up by adding an option
-like `-j 16`, where `16` is an example of how many processes you might want to
-run in parallel.  The optimal number depends on your available CPUs and memory.
-If you have enough memory, usually the number of CPUs will be a good starting
-point for the right number.  Don't use this option with Ninja though.  It
-figures things out for itself.
-
-
-Test
-----
-
-Of course libpqxx comes with a test suite, to check that the library is
-functioning correctly.
-
-You can run it, but there's one caveat: you need to give it a database where it
-can log in, without a password or any other parameters, and try out various
-things.
-
-And when I say you need to "give" it a database, I really mean "give."  The
-test suite will create and drop tables.  Those will all have names prefixed
-with "pqxx", so it's probably safe to use a database you already had, but if
-any of the items in your database happen to have names starting with `pqxx`,
-tough luck.  They're fair game.
-
-Enter this in your shell to build and run the tests:
-
-```shell
-    test/runner
-```
-
-
-### Configuring the test database
-
-But what if you do need a password to log into your test database?  Or, what if
-it's running on a different system so you need to pass that machine's address?
-What if it's not running on the default port?
-
-You can set these parameters for the test suite, or for any other libpq-based
-application, using the following environment variables.  (They only set default
-values, so they won't override parameters that the application sets in some
-other way.)
-* `PGHOST` — the IP address where we can contact the database's socket.  Or
-  for a Unix domain socket, its absolute path on the filesystem.
-* `PGPORT` — TCP port number on which we can connect to the database.
-* `PGDATABASE` — the name of the database to which you wish to connect.
-* `PGUSER` — user name under which you wish to log in on the database.
-* `PGPASSWORD` — user name's password for accessing the database.
-
-See the full list at https://www.postgresql.org/docs/current/libpq-envars.html
-
-**Be careful with passwords,** by the way.  Depending on your operating system
-and configuration, an attacker with access to your machine could try to read
-your password if you set it on the command line:
-* Your shell may keep a log of the commands you have entered.
-* Environment variables may be visible to other users on the system.
-
-If at all possible, rely on postgres "peer authentication."  Once set up, it is
-both more secure and more convenient than passwords.
-
-
-Install
--------
-
-Once you've built libpqxx, CMake can also help you install the library and
-headers on your system.  The default installation location will vary from one
-operating system to another, but you can set it explicitly.
-
-Let's say you've got your finished build in `$BUILD`, and you want to install
-it to your system's default install location.  The command for this is:
-
-```shell
-    cmake --install $BUILD
-```
-
-But you may want to install to some other location.  Let's call it `$DEST`.
-`$DEST` might be something like `/usr/local` on a Unix-like system, or
-something like `D:\Software` on a Windows system.
-
-To install to `$DEST`, run:
-
-```shell
-    cmake --install $BUILD --prefix $DEST
-```
-
-
-Use
----
-
-Other projects can include libpqxx in their CMake builds.
-
-`@abrownsword` uses this configuration:
-
-```cmake
-    set(libpqxxdir "libpqxx-${LIBVERSION}")     # LIBVERSION set above
-    set(SKIP_BUILD_TEST on)
-    set(BUILD_SHARED_LIBS OFF)
-
-    # Used this instead of FindLibrary.
-    # Setting PostgresSQL_INCLUDE_DIRS externally.
-    set(PostgreSQL_FOUND true)
-    set(PostgresSQL_INCLUDE_DIR ${PostgresSQL_INCLUDE_DIRS})
-    set(PostgresSQL_TYPE_INCLUDE_DIR ${PostgresSQL_INCLUDE_DIRS})
-
-    add_subdirectory(${libpqxxdir})
-```
diff --git a/ext/libpqxx-7.7.3/BUILDING-configure.md b/ext/libpqxx-7.7.3/BUILDING-configure.md
deleted file mode 100644
index 7c63f5b4c..000000000
--- a/ext/libpqxx-7.7.3/BUILDING-configure.md
+++ /dev/null
@@ -1,275 +0,0 @@
-Building using `configure`
-==========================
-
-The build requires `libpq`, the C client library for PostgreSQL.  This library
-must be installed before you can build libpqxx.  You'll need the headers as
-well as the library binary.
-
-The instructions will assume that you're working from a command-line shell.
-If you prefer to work from an IDE, you'll have to know how your IDE likes to
-do things, and you'll want to follow the shell instructions as a guide.
-
-
-Quick start
------------
-
-If you just want to get it built and installed quickly, try:
-
-```shell
-    ./configure
-    make
-    sudo make install
-```
-
-Want more detail?  Read on.
-
-
-Stages
-------
-
-I'll explain the main build steps in more detail below, but here's a quick
-overview:
-1. Configure
-2. Compile
-3. Test
-4. Install
-
-The Test step is optional.
-
-
-Configure
----------
-
-The `configure` script configures your build.  It figures out various
-parameters, such as where libpq and its headers are, which C++ features your
-compiler supports, and which options your compiler needs.  It generates
-Makefiles, which in turn tell the `make` utility how to perform tasks such as
-compiling libpqxx, running tests, cleaning up after itself, and installing
-libpqxx.
-
-The `configure` step is also where you can set these options, e.g. to instruct
-the compiler to look for libpq in a non-standard place, or to use a different
-compiler, or pass different compiler flags.  Don't try to specify those while
-doing the actual compile; set them once when running `configure`.
-
-Let's say `$BUILD` is the directory where you want to build libpqxx, and
-`$SRC` is where its source code is.  So for example, the readme file will be at
-`$SRC/README.md`.
-
-In the simplest case, you just do:
-
-```shell
-    cd $BUILD
-    $SRC/configure
-```
-
-Add `configure` options as needed.  There's more about the options below, or in
-the output of `configure --help`.  I'll also explain the two directories.
-
-
-### Cheat sheet
-
-Here are some popular `configure` options:
-* `--disable-documentation` skips building of the documentation.
-* `CXXFLAGS=-O0` disables optimisation.  Slower code, but faster build.
-* `CXXFLAGS=-O3` asks for _more_ optimisation.  Faster code, slower build.
-* `CXX=clang++` compiles with `clang++` as the compiler.
-* `--enable-maintainer-mode` makes the compiler more pedantic about the code.
-* `--enable-audit` enables expensive run-time checks for debugging.
-* `--with-postgres-lib=$DIR` looks for libpq in `$DIR`.
-* `--with-postgres-include=$DIR` looks for the libpq headers in `$DIR`.
-* `--prefix=$PATH` prepares to install libpqxx in `$PATH`.
-* `--enable-shared` enables compilation of libpqxx as a shared library.
-* `--disable-shared` disbles compilation of libpqxx as a shared library.
-* `--enable-static` enables compilation of libpqxx as a static library.
-* `--disable-static` disables compilation of libpqxx as a static library.
-* `--help` shows you a lot more of the options.
-
-So for example, to get a very quick build but produce very inefficient code:
-
-```shell
-    ./configure --disable-documentation CXXFLAGS=-O0
-```
-
-
-Or if you want to pull out all the stops to find problems in the code:
-
-```shell
-    ./configure --enable-maintainer-mode --enable-audit CXXFLAGS=-O3
-```
-
-(Requesting `-O3` optimisation will make some compilers perform extra analysis
-which may, as a side effect, cause them to notice and warn about certain kinds
-of mistakes in the code, such as occasionally-unused variables.)
-
-
-### Finding libpq
-
-One of `configure`'s most important jobs in the libpqxx build is to find the
-headers and library for libpq.  It has three ways of finding those:
-1. Asking a popular tool called `pkg-config`, if installed.
-2. Asking postgres' deprecated `pg_config` tool, if installed.
-3. Through explicit command-line options to `configure`.
-
-The explicit command-line options are `--with-postgres-lib` (for the libpq
-library binary) and `--with-postgres-include` (for the libpq headers).
-
-If you want to use a version of libpq that's not installed in a standard
-location, e.g. if you're cross-compiling to produce a binary for a different
-CPU architecture than your native system's, use the explicit options.
-
-
-### Where does the `configure` script come from?
-
-I didn't write the `configure` script.  It was generated by GNU `autoconf` and
-related GNU tools.  There's a script to re-generate it, called `autogen.sh`.
-
-The contents of `configure` are based on a higher-level script called
-`configure.ac`.  This is where I script checks for specific features in libpq
-or the compiler.  The `configure` script adds a lot of built-in items that I
-don't need to worry about, such as figuring out exactly how your build tools
-work.
-
-Don't try to debug `configure` yourself if you can help it.  It's very hard to
-read, partly because it's automatically generated, but also because it is
-engineered to work with an extremely broad range of shells, compilers, tools,
-and operating systems.  If you're going to do a "deep dive," try looking at
-`configure.ac` instead.
-
-
-### Source and Build trees
-
-Where should you run `configure`?
-
-Two directories matter when building libpqxx: the _source tree_ (where the
-libpqxx source code is) and the _build tree_ (where you want your build
-artefacts).  Here I will call them `$SRC` and `$BUILD`, but you can call them
-anything you like.
-
-They can be one and the same, if you like.  It's convenient, but less clean, as
-source code and build artefacts will exist in the same directory tree.  If
-you're going to delete the source tree after installing, of course it's fine to
-make a mess in there.
-
-
-Compile
--------
-
-To start the compile, run the `make` tool.  It will go through all the steps to
-produce a libpqxx library binary.
-
-Beware though, it only runs _one_ compiler process at a time.  That could take
-a while.  Use the `-j` option to make it run concurrent processes, e.g.:
-
-```shell
-    make -j8
-```
-
-Very roughly speaking, it's probably fastest if you run one process per CPU
-core in your system.  If you have the `nproc` utility installed:
-
-```shell
-    make -j$(nproc)
-```
-
-If you want a very fast build and don't mind missing out on efficient code or
-documentation, tweak the Configure step above by adding `configure` options
-like `CXXFLAGS=-O0` and `--disable-documentation`.
-
-
-Test
-----
-
-Of course libpqxx comes with a test suite, to check that the library is
-functioning correctly.
-
-You can run it, but there's one caveat: you need to give it a database where it
-can log in, without a password or any other parameters, and try out various
-things.
-
-And when I say you need to "give" it a database, I really mean "give."  The
-test suite will create and drop tables.  Those will all have names prefixed
-with "pqxx", so it's probably safe to use a database you already had, but if
-any of the items in your database happen to have names starting with `pqxx`,
-tough luck.  They're fair game.
-
-Enter this in your  shell to build and run the tests:
-
-```shell
-    make check
-```
-
-As with compiling, use the `-j` option to make better use of your CPUs.  For
-example:
-
-```shell
-    make check -j$(nproc)
-```
-
-
-### Configuring the test database
-
-But what if you do need a password to log into your test database?  Or, what if
-it's running on a different system so you need to pass that machine's address?
-What if it's not running on the default port?
-
-You can set these parameters for the test suite, or for any other libpq-based
-application, using the following environment variables.  (They only set default
-values, so they won't override parameters that the application sets in some
-other way.)
-* `PGHOST` — the IP address where we can contact the database's socket.  Or
-  for a Unix domain socket, its absolute path on the filesystem.
-* `PGPORT` —
-* `PGDATABASE` — the name of the database to which you wish to connect.
-* `PGUSER` — user name under which you wish to log in on the database.
-* `PGPASSWORD` — user name's password for accessing the database.
-
-See the full list at https://www.postgresql.org/docs/current/libpq-envars.html
-
-**Be careful with passwords,** by the way.  Depending on your operating system
-and configuration, an attacker with access to your machine could try to read
-your password if you set it on the command line:
-* Your shell may keep a log of the commands you have entered.
-* Environment variables may be visible to other users on the system.
-
-If at all possible, rely on postgres "peer authentication."  Once set up, it is
-both more secure and more convenient than passwords.
-
-
-Install
--------
-
-Installing libpqxx will install the library and headers in a location chosen at
-the time you can the `configure` script.  On some systems it defaults to the
-`/usr/local/` tree, but it may be different in your environment.  Or, use the
-`configure` script's `--prefix` option to set an install location.
-
-(If you want to see exactly what happens, you can run any `make` command line
-with the `-n` option, which means: don't actually do this, but print all the
-commands you would execute if you did.  It's a lot of output though.)
-
-To install, ensure that you have sufficient privileges to write the files to
-their install locations, and run:
-
-```shell
-    make install
-```
-
-Save your build tree somewhere, so that you will be able to undo installation
-in the future:
-
-```shell
-    make uninstall
-```
-
-When using the library, make sure the libpqxx headers are in your compiler's
-include path.  (You will no longer need the libpq headers at that time.)
-
-Also, building an application which uses libpqxx, make sure the libpqxx library
-binary is in your compiler's library search path.  And if the library binary is
-a shared library, you'll also need it in your loader's search path when running
-your application.
-
-This last part goes for libpq as well: when using libpq, make sure you have
-the libpq library binary in your compiler's library search path, and if it's a
-shared library, also have it in your loader's search path when running.
diff --git a/ext/libpqxx-7.7.3/CMakeLists.txt b/ext/libpqxx-7.7.3/CMakeLists.txt
deleted file mode 100644
index 55b3c4d44..000000000
--- a/ext/libpqxx-7.7.3/CMakeLists.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-
-file(READ VERSION VER_FILE_CONTENT)
-string(STRIP ${VER_FILE_CONTENT} VER_FILE_CONTENT)
-
-project(
-    libpqxx
-    VERSION ${VER_FILE_CONTENT}
-    LANGUAGES CXX
-)
-
-if(NOT "${CMAKE_CXX_STANDARD}")
-    set(CMAKE_CXX_STANDARD 17)
-endif()
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-
-option(BUILD_DOC "Build documentation" OFF)
-
-if(NOT SKIP_BUILD_TEST)
-    option(BUILD_TEST "Build all test cases" ON)
-endif()
-
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-include(config)
-
-add_subdirectory(src)
-add_subdirectory(include)
-if(BUILD_DOC)
-    add_subdirectory(doc)
-endif()
-if(BUILD_TEST)
-    add_subdirectory(test)
-endif()
-
-# installation
-write_basic_package_version_file(
-    "${CMAKE_CURRENT_BINARY_DIR}/libpqxx-config-version.cmake"
-    VERSION ${PROJECT_VERSION}
-    COMPATIBILITY SameMajorVersion
-)
-install(FILES cmake/libpqxx-config.cmake
-              "${CMAKE_CURRENT_BINARY_DIR}/libpqxx-config-version.cmake"
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libpqxx
-)
-install(
-    EXPORT libpqxx-targets
-    NAMESPACE libpqxx::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libpqxx
-)
-# Build tree export
-export(
-    EXPORT libpqxx-targets
-    NAMESPACE libpqxx::
-    FILE ${CMAKE_CURRENT_BINARY_DIR}/libpqxx-targets.cmake
-)
-configure_file(
-    cmake/libpqxx-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/libpqxx-config.cmake
-    COPYONLY
-)
-# Package generation
-set(CPACK_GENERATOR TGZ)
-set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-include(CPack)
diff --git a/ext/libpqxx-7.7.3/COPYING b/ext/libpqxx-7.7.3/COPYING
deleted file mode 100644
index 8a566aabe..000000000
--- a/ext/libpqxx-7.7.3/COPYING
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2000-2022 Jeroen T. Vermeulen.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of the author, nor the names of other contributors may be
-  used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/ext/libpqxx-7.7.3/Makefile.am b/ext/libpqxx-7.7.3/Makefile.am
deleted file mode 100644
index cd93a57ef..000000000
--- a/ext/libpqxx-7.7.3/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-SUBDIRS = include src test tools config doc
-EXTRA_DIST = autogen.sh configitems README.md VERSION requirements.json
-
-MAINTAINERCLEANFILES = \
-    Makefile.in aclocal.m4 config.h.in config.log configure stamp-h.in
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpqxx.pc
-
-TESTS = tools/lint
-
-
-# Generate ChangeLog from git history.  It goes all the way back through
-# the project's git, bzr, svn, and cvs days.
-dist-hook: ChangeLog
-
-ChangeLog: configure.ac
-	git log --stat --name-only --date=short --abbrev-commit >$@
-
-
-# We use README.md, but automake expects plain README.
-README: README.md
-	ln -s $< $@
diff --git a/ext/libpqxx-7.7.3/Makefile.in b/ext/libpqxx-7.7.3/Makefile.in
deleted file mode 100644
index f6798aa75..000000000
--- a/ext/libpqxx-7.7.3/Makefile.in
+++ /dev/null
@@ -1,1253 +0,0 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4/libtool.m4 \
-	$(top_srcdir)/config/m4/ltoptions.m4 \
-	$(top_srcdir)/config/m4/ltsugar.m4 \
-	$(top_srcdir)/config/m4/ltversion.m4 \
-	$(top_srcdir)/config/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(am__DIST_COMMON)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/pqxx/config.h
-CONFIG_CLEAN_FILES = libpqxx.pc compile_flags
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-DATA = $(pkgconfig_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope check recheck distdir distdir-am dist dist-all \
-	distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
-}
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
-RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/compile_flags.in \
-	$(srcdir)/libpqxx.pc.in $(top_srcdir)/config/compile \
-	$(top_srcdir)/config/config.guess \
-	$(top_srcdir)/config/config.sub \
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
-	$(top_srcdir)/config/missing \
-	$(top_srcdir)/config/mkinstalldirs \
-	$(top_srcdir)/config/test-driver AUTHORS COPYING ChangeLog \
-	INSTALL NEWS README README.md
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
-# Exists only to be overridden by the user if desired.
-AM_DISTCHECK_DVI_TARGET = dvi
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-PKG_CONFIG = @PKG_CONFIG@
-POSTGRES_INCLUDE = @POSTGRES_INCLUDE@
-PQXXVERSION = @PQXXVERSION@
-PQXX_ABI = @PQXX_ABI@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_postgres_lib = @with_postgres_lib@
-SUBDIRS = include src test tools config doc
-EXTRA_DIST = autogen.sh configitems README.md VERSION requirements.json
-MAINTAINERCLEANFILES = \
-    Makefile.in aclocal.m4 config.h.in config.log configure stamp-h.in
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpqxx.pc
-TESTS = tools/lint
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .log .test .test$(EXEEXT) .trs
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-libpqxx.pc: $(top_builddir)/config.status $(srcdir)/libpqxx.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-compile_flags: $(top_builddir)/config.status $(srcdir)/compile_flags.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	elif test -n "$$redo_logs"; then \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-
-check-TESTS: 
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-	exit $$?;
-recheck: all 
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-tools/lint.log: tools/lint
-	@p='tools/lint'; \
-	b='tools/lint'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.test.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-zstd: distdir
-	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
-	$(am__post_remove_distdir)
-
-dist-tarZ: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
-
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	*.tar.zst*) \
-	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
-	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build/sub \
-	  && ../../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=../.. --prefix="$$dc_install_base" \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__post_remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-pkgconfigDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-pkgconfigDATA
-
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-TESTS check-am clean clean-cscope \
-	clean-generic clean-libtool cscope cscopelist-am ctags \
-	ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-lzip dist-shar dist-tarZ dist-xz dist-zip dist-zstd \
-	distcheck distclean distclean-generic distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am recheck tags tags-am uninstall uninstall-am \
-	uninstall-pkgconfigDATA
-
-.PRECIOUS: Makefile
-
-
-# Generate ChangeLog from git history.  It goes all the way back through
-# the project's git, bzr, svn, and cvs days.
-dist-hook: ChangeLog
-
-ChangeLog: configure.ac
-	git log --stat --name-only --date=short --abbrev-commit >$@
-
-# We use README.md, but automake expects plain README.
-README: README.md
-	ln -s $< $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpqxx-7.7.3/NEWS b/ext/libpqxx-7.7.3/NEWS
deleted file mode 100644
index 102716c2e..000000000
--- a/ext/libpqxx-7.7.3/NEWS
+++ /dev/null
@@ -1,1040 +0,0 @@
-7.7.3
- - Fix up more damage done by auto-formatting.
- - New `result::for_each()`: simple iteration and conversion of rows.  (#528)
- - Add some missing headers in `<pqxx/pqxx>`.  (#551)
- - More strictness in `header-pre.hxx`/`header-post.hxx` checking.
- - Disallow nesting of `ignore-deprecated` blocks.
- - Deprecate `exec` functions' `desc` parameter.
- - Fix `placeholders` documentation.  (#557)
- - Strip `const` and references from `value_type`. (#558)
- - Get tests running on appveyor. (#560)
- - Fix broken nonblocking connection on Windows. (#560)
-7.7.2
- - Fix up damage done by auto-formatting.
-7.7.1
- - When you build libpqxx, configure the compiler's C++ version yourself!
- - Finally fix a long-standing silly warning in autogen.
- - Fix `digit_to_number` not being found on some comilers.  (#518, #519)
- - In audit mode, define `_FORTIFY_SOURCE` to enable some extra checks.
- - Make more functions `constexpr`.  Nothing particularly useful though.
- - Make more functions `noexcept`.
- - Move constructor & assignment for `result`.
- - Support LGTM.com and Facebook "infer" static analysis.
- - Deprecated `set_variable`/`get_variable` on `transaction_base`.
- - (Design unearthed warts in SQL variables, which were then fixed.)
- - Set/get session variables on `connection`: `set_session_var`/`get_var`.
- - Set/get local variables: execute SQL statements.
- - When using `select()`, include `<winsock2.h>` if available.
-7.7.0
- - Fix `stream_to` for differing table/client encodings.  (#473)
- - Use `[[likely]]` & `[[unlikely]]` only in C++20, to silence warnings.
- - Fix clang "not a const expression" error in Windows.  (#472)
- - Fix warnings about `[[likely]]` in `if constexpr`.  (#475)
- - Clearer error for ambiguous string conversion of `char` type.  (#481)
- - Pseudo-statement in `prepare()` error was for the wrong statement.  (#488)
- - New class, `connecting` for nonblocking connection to the database.  (#487)
- - New class, `range` for SQL range types.  (#490)
- - Replace `std::isdigit` with a safer alternative.
- - Support string conversions for `std::chrono::year_month_day`. (#492)
- - Helper for implementing string traits: `generic_to_buf`.
- - Support `result::at(row_num, col_num)`.
- - Support `result[row_num, col_num]` if the compiler allows it.
- - Work around broken `std::filesystem::path` in MinGW.  (#498)
- - Fix leak when getting client encoding fails.  (#500)
- - Use `std::cmp_greater` etc. when available.  Saves some ugly casts.
- - Move `result_iterator.hxx` into `pqxx/include/internal/`.
- - Move `compiler-public.hxx` into `pqxx/include/internal/`.
- - Add script for updating copyright strings.
- - Make `tools/lint` figure out source directory by itself.
- - Pass the actual C++ version to `tools/lint`, not the baseline one.
- - Re-enable pyflakes testing in `tools/lint`.
- - Make more functions `[[nodiscard]]`.
- - Qualified some member functions as lvalue or rvalue.
- - Don't run clang-tidy by default.  Compatibility issues with gcc options.
- - Describe version requirements in a JSON file, `requirements.json`.
- - Doxygen documentation now uses the (Doxygen-extended) Markdown format.
- - Build docs in `doc/html/`, no longer in `doc/html/Reference/`.
- - Disable some `std::filesystem` features on Windows.
- - Shut up stupid Visual Studio warnings.
- - On gcc, mark rarely-used functions as "cold," to be optimised for size.
- - Glyph scanning for GB18030 encoding was utterly broken. (#517)
-7.6.0
- - Removed bad string conversion to `std::basic_string_view<std::byte>`. (#463)
- - Add C++20 concepts: `binary`, `char_string`, `char_strings`.
- - Generalise binary strings to any contiguous range of `std::byte`.
- - Mark `zview` as a view and as a borrowed range.
- - Save a copy step on string fields in `stream_to`.
- - New helper: `pqxx::value_type<CONTAINER>`.
- - New helper: `pqxx::binary_cast`. (#450)
- - Some escaping functions now have "into my buffer" variants.
- - More generic escaping functions, supporting more types of binary.
- - In C++20, accept generic columns list for `stream_to`.  (#447)
- - Renamed `<pqxx/prepared_statement>` to `<pqxx/params>`.
- - Deprecated `dynamic_params` in favour of `params`.
- - `pqxx::params::append_multi()` now calls `reserve()` if possible.
- - `pqxx::params::size()` is now `noexcept` (but sadly, `ssize()` is not).
- - Helper for generating parameter placeholders `$1`, `$2`, etc.  (#443)
- - Now requires support for C++14 `[[deprecated]]` attribute.
- - Deprecated `unesc_raw()` with `unesc_bin()` variants.
- - Once `unesc_raw()` is gone, we'll support only the hex escape format.
- - Work around broken `thread_local` in MinGW gcc < 11.1.
- - `pqxx::blob` now supports `std::filesystem::path`.
- - Fixed check against header/lib version mismatch: `check_pqxx_version_7_6`
- - Deprecated result slicing.  Expect `row::slice()` to disappear.
- - More complete documentation, of cursors in particular.
-7.5.2
- - **Actual serious bug.**  `blob::read(std::vector<...>)` was broken.
-7.5.1
- - Fixed some Visual Studio warnings.
- - Missed a bit in working around MinGW's broken `<thread>`.
- - Deprecated more obsolete representations of binary data.  Use `std::byte`.
- - New script `tools/deprecations` lists files that use deprecated code.
- - Added automake-generated `config/compile` to revision control.
-7.5.0
- - Now requires `std::variant` support!  No longer works with gcc7.
- - When implementing a string conversion, consider specialising `param_format`.
- - Stop "aborting" nontransaction on closing.  (#419)
- - Silence an overzealous Visual C++ warning.  (#418)
- - Starting support for C++20 `std::span`.
- - New `blob::read()` using `std::span`.  (#429)
- - New `params` class lets you build parameter lists incrementally.  (#387)
- - Pass `std::vector<std::byte>` params in binary format.
- - Dropped legacy tests 31 and 49 to work around clang C++20 bug.
- - Fixed `stream_to` test failure in non-English locales.  (#440)
- - Clarify `transaction_base::stream` documentation.  (#423)
- - Avoid `<thread>` on MinGW; it's broken there.  (#336, #398, #424, #441)
-7.4.1
- - Missing includes; broke macOS clang build.  (#416)
-7.4.0
- - Work around Visual Studio 2017 bug with `[[deprecated]]`.  (#405, #406)
- - Work around eternal Windows bug with `max` macro yet again.  (#101)
- - Prepare for C++20 `std::ssize()`.
- - Dropped test12, which didn't add much and tried to read null strings.
- - Support string conversion for `std::monostate`.  (#409)
- - Consistent "named constructors" for `stream_to` and `stream_from`.
- - New `table_path` type.
- - New `connection` methods `quote_table` and `quote_columns`.
- - Lots of deprecated stream constructors.
- - `pqxx::row::swap()` now finally has the `deprecated` attribute.
- - Finally deprecated a bunch of `field`, `row`, and `result` constructors.
- - Exposed `transaction_focus` marker class.
-7.3.1
- - New, simpler API for large objects: `blob` ("binary large object").
- - `largeobject` and friends are now deprecated.
- - Fix visibility issue on gcc/clang, especially on macOS.  (#395)
- - Use "pure" & "visibility" attributes if they work, regardless of compiler.
- - More deprecated items now have the `[[deprecated]]` attribute.
- - Document the concept of transaction focus.
- - Error messages more often report query description, if given.
- - Suppress spurious deprecation messages on Visual Studio. (#402)
- - Correct error when prepared/param statement clashes with tx focus. (#401)
- - `from_stream` with `from_query` now has a convenient factory function.
- - Removed some obsolete scripts from the `tools/` directory.
-7.3.0
- - `stream_to` now quotes and escapes its table name.
- - Removed `transaction_base::classname()`.  Did anyone ever use it?
- - Internal reorg of the `transaction` and `transactionfocus` hierarchies.
- - Removed the only case of virtual inheritance, related to `namedclass`.
- - Internal `concat()` for faster, simpler string concatentation.
- - Fix compile omission in string conversions for `nullptr_t`.
- - `pqxx::size_buffer()` can now size multiple values at once.
- - `multi_to_string()` to convert multiple values into one `std::string`.
- - Implicit `zview` constructor from `char const *`. (#389)
- - Many `std::string&` parameters are now `zview` or `std::string_view`.
- - Now checking statement parameter lengths for overflow.
- - `#include <array>` in connection.cxx.  (#394)
-7.2.1
- - Fix infinite loop in converting `char *` to string. (#377)
- - Deprecated `namedclass`.
- - Convert an entire row using `row::as<type...>()`.
- - Internal rework of `field::to()` and `field::as()` functions.
- - Some more warning options in maintainer mode.
- - Removed the old, DocBook-based tutorial.
- - Fixed wrong `query` and SQLSTATE params to some exceptions. (#378)
-7.2.0
- - You can now implicitly convert a `const std::string &` to `zview`.
- - Replaced some overloads for C strings and C++ strings with `zview`.
- - Deprecating `binarystring`.  Use `std::basic_string<std::byte>` instead!
- - Array parser did not recognise escaping in unquoted values.
- - gcc10 test build fix: a result iterator is not the same thing as a `row`.
- - Doc fix: field size does _not_ include terminating zero.  (#356)
- - Fix error message in `demangle_type_name`: printed result, not raw name.
- - Fix compile warning in `demangle_type_name` on GNU systems.
- - Document that string conversions assume non-null values.
- - Start playing with C++20 _concepts._
- - Sketch out concepts-based `PQconnectdbParams` support.  (#343)
- - Add missing link to "datatypes" documentation.  (#346)
- - Supports `to_string`, `stream_to`, etc. for `binarystring`.  (#312)
- - Fixed infinite recursion when using `std::optional` in `stream_to`.  (#364)
- - Home-rolled hex-escaping.  Saves an allocation.
- - Catch floating-point negative overflow in `check_cast`, not underflow.
- - Bit more work on CMake build doc. (#318)
- - Typo in `datatypes.md`: `nullness`, not `nullness_traits`. (#353)
- - Fixed test names map in `tests/runner.cxx`. (#354)
- - Integral `from_string` now accept leading whitespace, as in composite types.
- - Experimental support basics for composite types.  (#355)
- - Use `stream_from` without knowing the number of fields.  (#357)
- - Global `size_buffer` function.
- - `quote()` now works for always-null types without conversions defined.
- - `std::nullopt` now converts to an SQL null.
- - Skip quoting and escaping array/composite fields of "safe" types.
- - New type trait: `is_unquoted_safe`.
- - Forbid invalid specialisations of `query_value`.
- - Fixed `mktemp` invocation that broke on FreeBSD.
- - Avoid unneeded encode/decode step on more binary data.
- - If `__cxa_demangle` fails, fall back on raw type name.  (#361)
-7.1.2
- - Document build in `BUILDING-configure.md` / `BUILDING-cmake.md`.
- - Work around silly clang warning in `test_errorhandler.cxx`.
- - Fix install error with some internal headers. (#322)
- - Fix "No object selected" error message in large objects.  (#324)
- - If error has no SQLSTATE, throw `broken_connection`. (#280)
- - Fix argument order in `encrypt_password`. (#333, #334)
- - Fix underestimate of buffer size for `to_string` for floats. (#328)
-7.1.1
- - Compile fix for Visual Studio.
- - Warning fix for clang.
- - Also install `transaction_focus.hxx`. (#320)
-7.1.0
- - Query tuples straight into `std::tuple` using `transaction::stream()`!
- - And, `stream_from` now supports more or less arbitrary queries.
- - Instead of a tuple of fields, you can pass `stream_to` a container as well.
- - `string_traits::size_buffer()` must now be `noexcept`.
- - New `nullness` member: `always_null`.
- - There is now `to_buf` support for string literals.
- - Streaming data is now more efficient.
- - The table name in `stream_from` is now escaped.
- - You can now "convert" strings to `std::string_view`.  Mind your lifetimes!
- - A `std::variant` will now convert to string, if its member types do.
- - If a `stream_from` row fails to convert, you can no longer retry it.
- - `from_string(field const &)` now handles null values properly.
- - Obsolete Windows build docs are gone.
- - Added `row::to(std::tuple<...>)`.
- - Unified the test suites.  We no longer need `test/unit/unit_runner`.
- - New helper: `strip_t<...>` to remove a type's constness and reference.
- - Replace custom templating with CMake glob in `src/CMakeLists.txt`.
- - Replace custom templating with CMake glob in `doc/CMakeLists.txt`.
- - Replace custom templating with CMake glob in `test/unit/CMakeLists.txt`.
-7.0.8
- - Inline `type_name` in `PQXX_DECLARE_ENUM_CONVERSION`.
-7.0.7
- - Fix broken `--with-postgres-lib` option in `configure` script (#311)
- - Should now build even if neither `pkg-config` nor `pg_config` is available.
- - CMake accepts `PostgreSQL_ROOT`, if it's a sufficiently recent version.
-7.0.6
- - Prefer `pg_config` over `pkg-config` for include path (#291).
- - Try to plod on if we don't know the PostgreSQL include path.
- - Fix error message when starting overlapping transactions and such (#303).
- - Fix potential crashes when converting invalid strings to floats (#307, #308).
-7.0.5
- - Compile fix for g++ 10: include `<limits>` (#292).
- - Cleaned up error-checking of PG results.  (#280).
- - The `esc()` methods now also take `std::string_view` (#295).
-7.0.4
- - Fix possible crash in `connection::connection_string` (#290).
- - Fix filtering of default values in `connection::connection_string` (#288).
- - Deprecate `row::swap` and public inheritance of iterators from `row`.
- - More copy/move/default constructors/assignments on result iterators.
- - More copy/move/default constructors/assignments on row iterators.
-7.0.3
- - Fixed misreporting of broken connection as `sql_error` (#280).
- - Replaced non-ASCII test texts with escape codes (#282, #283).
- - `ilostream` could truncate at `0xff` byte at buffer boundary (#284, #286).
-7.0.2
- - New query function: `query_value`, queries and converts a single value.
- - A `stream_from` stream can now be iterated.
- - More callable types qualify as transactors, thanks to `std::invoke`.
-7.0.1
- - Windows build fixes.
- - Documentation for writing your own string conversions.
- - `transaction_rollback` and children are now `sql_error`, not just `failure`.
-7.0.0
- - Bumped minimum required C++ version to C++17.
- - Everything has changed.  If you're porting from older versions, be careful!
- - There is now only one connection class: `connection`.
- - Removed tablereader/tablewriter, replaced by stream_from/stream_to.
- - Removed obsolete transactor framework, replaced by post-C++11 one.
- - Removed old ways of invoking parameterised and prepared statements.
- - Session variables are no longer cached.
- - If you do weird stuff with setting/getting variables, it may break.
- - Reading a variable written from raw SQL, procedures, etc, will now work.
- - Prepared statements are now registered immediately.
- - If you do weird stuff with preparing/unpreparing statements, it may break.
- - Changed exceptions and errors for many error situations.
- - Mishandling prepared statements will now break the connection.
- - Many string references and const char pointers are now `std::string_view`.
- - New `zview` class wraps `string_view` for string with terminating zero.
- - The `stream_base` abstract base class is gone.
- - Transactions no longer have an `isolation_tag` nested type.
- - The `isolation_traits` type is gone.
- - There's no more `pqxx_exception`.  Complicated things too much.
- - `pqxx::string_traits<>::name()` has been replaced with `pqxx::type_name`.
- - `to_string()` can now handle `std::vector` (to produce an SQL array).
- - All `from_string()` that took a C string now take a `std::string_view`.
- - There are now separate `string_traits` and `null_traits` templates.
- - Enums outside classes are now scoped enums.
- - `error_verbosity` is no longer nested in connection.
- - `connection::get_verbosity` is gone.
- - Some enums have changed names: `accesspolicy` to `access_policy`, and so on.
- - `dynamic_params` now accepts an accessor.
- - Fixed "const" support in arguments to parameterised/prepared statements.
- - Connection objects can now be moved.
- - `connections::options()` has been replaced by `connection_string()`.
- - Replaced pqxx-fulltest with `test_all.py`.
- - Some `size_type` have changed to different types, to match current libpq.
- - Internal overflows are more consistently caught and reported.
- - Deprecated items have been removed.
- - Large objects now require backend version 9.3 or better.
- - Seeking inside large objects now supports 64-bit sizes.
- - Visual Studio project files and sample headers are gone.  Use CMake.
- - MinGW Makefiles are gone.  Use `configure` or CMake.
- - Need PostgreSQL 10 to use robusttransaction.
- - `robusttransaction` no longer uses a log table.  Feel free to drop it.
-6.4.4
- - Use pkg-config if pg-config is not available.
- - In CMake build, prefer CMake's config headers over any found in source tree.
-6.4.3
- - Updated copyright strings.
- - Added missing "stream" headers to autotools-based install.
- - Added stream headers to pqxx/pqxx header.
-6.4.2
- - Fix mistake for Windows in 6.4.1: use PQfreemem, not std::free.
- - Easily enable runtime checks in configure: "--enable-audit".
- - Enable optimisation in CircleCI build.
-6.4.1
- - Fixed more memory leaks.
-6.4.0
- - Half fix, half work around nasty notice processor life time bug.
- - Fix selective running of tests: "test/unit/runner test_infinities".
- - Added some missing `std::` qualifications.
-6.3.3
- - Throw more appropriate error when unable to read client encoding.
- - CMake build fixes.
-6.3.2
- - Conversion errors no longer throw pqxx::failure; always conversion_error!
- - Use C++17's built-in numeric string conversions, if available.
- - Query numeric precision in a more sensible, standard way.
- - Avoid "dead code" warning.
- - Replace obsolete autoconf macros.
- - Remove all "using namespace std".
- - CMake build fixes.
-6.3.1
- - Windows compile fix (CALLBACK is a macro there).
- - Work around Visual Studio 2017 not supporting ISO 646.
-6.3.0
- - New "table stream" classes by Joseph Durel: stream_from/stream_to.
- - Support weird characters in more identifiers: cursors, notifcations, etc.
- - Connection policies are deprecated.  It'll all be one class in 7.0!
- - Connection deactivation/reactivation is deprecated.
- - Some items that were documented as deprecated are now also declared as such.
- - Fix Windows bug where WSAPoll was never used.  Thanks dpolunin.
- - Fix Windows CMake build to link to socket libraries.  Thanks dpolunin.
- - Various other changes to the CMake build.
- - Fix failure when doing multiple string conversions with Visual C++.
- - Fix nested project builds in CMake.  Thanks Andrew Brownsword.
- - In Visual Studio, build for host architecture, not "x64".
- - Fix string conversion link error in Visual Studio.  Thanks Ivan Poiakov.
- - Fix string conversion to bool for "1".  Thanks Amaracs.
- - Fix in escaping of strings in arrays.  Thanks smirql.
- - Faster copying of results of large queries.  Thanks Vsevolod Strukchinsky.
- - Starting to handle encodings properly!  Thanks to Joseph Durel.
- - No longer using std::iterator (deprecated in C++17).
-6.2.5
- - Removed deprecated pqxx-config.
- - Build fix on Visual C++ when not defining NOMINMAX.
- - Reduce setup code for string conversions, hopefully improving speed.
- - Allow nul bytes in tablereader.
- - Support defining string conversions for enum types.
- - Fixed const/pure attributes warning in gcc 8.
- - Updated build documentation to mention CMake option.
- - Fixed a floating-point string conversion failure with Visual Studio 2017.
-6.2.4
- - Fix builds in paths containing non-ASCII characters.
- - New macro: PQXX_HIDE_EXP_OPTIONAL (to work around a client build error).
-6.2.3
- - Build fixes.
-6.2.2
- - Variable number of arguments to prepared or parameterised statement (#75).
- - Windows build fix (#76).
-6.2.1
- - Compile fixes.
-6.2.0
- - At last!  A check against version mismatch between library and headers.
- - Small compile fixes.
-6.1.1
- - Small compile fixes.
- - A particular error string would always come out empty.
-6.1.0
- - Dependencies among headers have changed.  You may need extra includes.
- - Library headers now include "*.hxx" directly, not the user-level headers.
- - Supports parsing of SQL arrays, when using "ASCII-like" encodings.
-6.0.0
- - C++11 is now required.  Your compiler must have shared_ptr, noexcept, etc.
- - Removed configure.ac.in; we now use configure.ac directly.
- - Removed pqxx::items.  Use the new C++11 initialiser syntax.
- - Removed maketemporary.  We weren't using it.
- - Can now be built outside the source tree.
- - New, simpler, lambda-friendly transactor framework.
- - New, simpler, prepared statements and parameterised statements.
- - Result rows can be passed around independently.
- - New exec0(): perform query, expect zero rows of data.
- - New exec1(): perform query, expect (and return) a single row of data.
- - New exec_n(): perform query, expect exactly n rows of data.
- - No longer defines Visual Studio's NOMINMAX in headers.
- - Much faster configure script.
- - Most configuration items are gone.
- - Retired all existing capability flags.
- - Uses WSAPoll() on Windows.
- - Documentation on readthedocs.org, thanks Tim Sheerman-Chase.
-5.1.0
- - Releases after this will require C++11!
- - Internal simplification to pqxx::result.
- - A row object now keeps its result object alive.
- - New exec() variants: "expect & return 1 row," "expect no rows," "expect n."
- - ChangeLog is gone.  It was a drag on maintenance.
-5.0.1
- - Exposed sqlstate in sql_error exception class.
-5.0
- - The PGSTD namespace alias is gone.  Use the std namespace directly.
- - pqxx::tuple is now pqxx::row, to avoid clashes with std::tuple.
- - Deprecated escape_binary functions dropped.
- - Deprecated notify_listener class dropped.
- - Support for many old compilers dropped.
- - Support for "long long" and "long double" types is always enabled.
- - No longer uses obsolete std::tr1 namespace; use plain std instead.
- - Now requires libpq 9.1 or better.
- - Requires server version 9.1 or better.
- - Support for REPEATABLE READ isolation level added.
- - Makefile fixes for Visual Studio 2013.
- - Supports C++11 and C++14.
- - No longer has obsolete debian & RPM packaging built in.
- - Fixed failure to abort uncommitted subtransactions on destruction.
- - Fixed failure to detect some integer overflows during conversion.
- - Build tooling uses /usr/bin/env python instead of /usr/bin/python.
- - New configure options: --with-postgres-include and --with-postgres-lib.
- - In g++ or compatible compilers, non-exported items are no longer accessible.
- - Many build fixes for various platforms and compilers.
-4.0
- - API change: noticers are gone!  Use errorhandlers to capture error output.
- - API change: tablereaders and tablewriters are gone; they weren't safe.
- - API change: prepared statements are now weakly-typed, and much simpler.
- - API change: fields and tuples are now stand-alone classes in ::pqxx.
- - API change: thread-safety field have_strerror_r is now have_safe_strerror.
- - API change: notify_listener has been replaced with notification_receiver.
- - notification_receiver takes a payload parameter.
- - Easier Visual C++ setup.
- - Absolutely requires a libpq version with PQescapeStringConn.
- - Absolutely requires libpq 8.0 or better.
- - Changes for C++0x.
- - Supports clang++.
- - Visual C++ makefiles now support new-style unit tests.
- - Sample headers for more recent Visual Studio versions.
- - Fixes binary-data escaping problems with postgres 9.0.
- - Fixes problems with binary-string handling and escaping.
- - Fixes compatibility problems between 9.x libpq and 7.x backend.
- - quote_name to escape SQL identifiers for use in queries.
- - syntax_error reports error's approximate location in the query.
- - On Windows, now uses ws2_32 instead of wsock32.
- - Various Windows build fixes.
- - Updated for gcc 4.6.0.
- - configure script supports --enable-documentation/--disable-documentation.
- - Streamlined test/release toolchain.
-3.1
- - Shared libraries are now versioned by ABI: 3.1 instead of 3.1.0 etc.
- - Threading behaviour is now documented, and can be queried.
- - Version information available at compile time.
- - Supports parameterized statements.
- - Result tuples now support slicing.
- - Configure with --with-tr1=boost to use BOOST shared_ptr.
- - String conversion now has its own header file.
- - Supports read-only transactions.
- - Fixed breakage with Solaris "make".
- - Uses shared_ptr if available.
- - binarystring::str() is no longer cached; no longer returns reference.
- - Fixed problems in Visual C++ Makefile for test suite.
- - Fixed problems with RPM packaging.
- - Fixed build problem on RedHat/CentOS 5.
- - Lets you check whether a prepared statement has been defined.
- - "Varargs" prepared statements.
- - Unnamed prepared statements now supported.
- - Results have iterator as well as const_iterator.
- - Rewrite of robusttransaction logic; may actually do its job now.
- - Connections support async query cancel from signal handler or thread.
- - More documentation for performance features.
-3.0
- - Website is now at http://pqxx.org/ (no redirects)
- - Completely replaced cursor classes
- - More helpful error messages on failed connections
- - More detailed hierarchy of constraint-violation exception classes
- - trigger is now called notify_listener, trigger header is now notify-listen
- - New mixin base class pqxx_exception distinguishes libpqxx exception types
- - Quoting is back!  transaction_base::quote() & connection_base::quote()
- - Several build & documentation problems with Visual C++ fixed
- - Compile fixes for gcc 4.2, 4.3
- - Compile fixes for Sun Studio Express 5.9
- - Uses strlcpy() where available, instead of strncpy()
- - Keeps better track of applicable text encodings
- - Fixed bug with prepared statement parameters in separate C++ statements
- - robusttransaction now works for multiple users
- - Pipeline lets you cancel ongoing queries, e.g. because they run for too long
- - Fixed broken escaping of binary values in tablewriter
- - Floating-point types now represented with full precision
- - Proper unit tests for new functionality
- - New traits-based system for adding data types
- - Floating-point infinities now supported
- - Flushing/completing a pipeline now frees up the transaction for other use
- - Completely reworked test suite, builds and runs much faster
- - tablewriter supports writing of raw lines
-2.6.9
- - Removed old 1.x API (that means all identifiers with capital letters!)
- - Tested with all current libpq versions and oldest/newest supported backends
- - No longer have old OnCommit()/OnAbort()/OnDoubt() callbacks in transactor!
- - Fixes failure when closing cursors with upper-case letters in their names
- - Fixes bug when adding triggers to connections that aren't open yet
- - Fixes bug when removing triggers
- - Fixes small memory leak when preparing statements
- - Fixes many problems with older backends
- - Fixes bug in result::swap(): protocol versions were not swapped
- - Some errors went undetected when using certain libpq versions
- - Fixes prepared statements on new libpq versions talking to old backends
- - Can estimate server version if libpq does not know how to obtain it
- - Greatly reduced memory usage while escaping strings
- - With Visual C++, creates lib/ directory if not already present
- - Useful error messages when preparing statements
- - Allows prepared statements to be registered explicitly
- - Support for "long long" types; enable with PQXX_ALLOW_LONG_LONG macro
- - Compilation errors for older libpq versions fixed
- - Some new small utility classes for disabling notice processing etc.
- - Result sets remember the queries that yielded them
- - New test script, pqxx-fulltest, tests against all current postgres versions
- - Connections can simulate failure
- - Adds password encryption function
-2.6.8
- - Fixes bug: binary parameters to prepared statements truncated at nul bytes
- - New, more specific exception types to distinguish errors from server
- - Resolved serious problems with generated reference documentation
- - Automatically detect Windows socket library with MinGW
- - Windows "make" fixed to run from main directory, not win32
- - Fixes "mktemp" problems on some BSD-based platforms
- - pqxx-config is deprecated; use pkg-config instead
- - On GNU/Linux, uses poll() instead of select() to avoid file descriptor limit
- - Will provide server and protocol version information where available
- - New cursor class, absolute_cursor
-2.6.7
- - New escape functions for binary data: transaction_base::esc_raw()
- - Improved detection of socket libraries, especially for MinGW
- - Works around bug in some versions of GNU grep 2.5.1
- - Fixes problem with configuration headers
- - Fixes PQprepare() detection
- - Fixes incomplete Visual C++ Makefile
- - Fixes compile error in workaround for older libpq versions
- - Removes "rpath" link option
-2.6.6
- - New, encoding-safe string-escaping functions
- - Upper-case letters now allowed in prepared-statement names
- - Fixes crash in test005
- - More Visual C++ improvements
- - Removed collaboration diagrams from reference docs
- - New templating system for generating Windows Makefiles etc.
-2.6.5
- - Visual C++ users: copy win32/common-sample to win32/common before editing it
- - Should fix problems finding socket library on MinGW
- - Even more work on Visual C++ problems
- - Updated documentation for Visual C++ users
- - Fixed bug in prepared statements (mostly visible on Visual C++)
- - Nested transactions work harder to detect backend support
-2.6.4
- - Massively improved compatibility with Windows and Visual C++
- - Fixed late initialization of "direct" connection state
- - Fixed problem with initialization of connection capabilities
- - Fixed configuration bug for libpq in nonstandard locations
- - Sample configuration header for libpq found in PostgreSQL 8.1
-2.6.3
- - Radical rework of prepared statements; INCOMPATIBLE INTERFACE CHANGE!
- - Dropped support for g++ 2.95
- - Emulate prepared statements support on old libpq or old backend
- - Bug fix: missing tutorial (release script now tests for this)
- - Automatically links in socket library on Windows or Solaris, if needed
- - Bug fix: check for std namespace didn't work
- - Fixes for Cygwin/MSYS/MinGW
-2.6.2
- - Bug fix: connection state was not set up properly in some common cases
- - Bug fix: headers were installed in "include" instead of "include/pqxx"
- - Bug fix: sqlesc(string) broke with multibyte or multiple encodings
- - namedclass is now used as a virtual base; affects all subclass constructors
- - Initial implementation of subtransactions
- - Detect more connection capabilities
- - Standard library namespace can be set from configure script's command line
- - Completely reworked connection hierarchy, with separate policy objects
- - Clients can now define their own connection policies
- - Paved the way for client-defined thread synchronization
- - Now lives at http://thaiopensource.org/development/libpqxx/
-2.6.1
- - Hugely improved recognition of different strerror_r() versions
- - Resolved link problems with gcc 4.0 and shared library
-2.6.0
- - New macro PQXX_SHARED defines whether to use/build libpqxx as shared library
- - Robusttransaction compatible with PostgreSQL 8.1
- - Infrastructure for querying connection/backend capabilities at runtime
- - Greatly improved cursor support
- - Connection reactivation can be inhibited explicitly
- - Tries even harder to make sense of conflicting strerror_r() definitions
- - Detects connection failures that libpq glosses over
- - Reference documentation grouped into more coherent sections
- - Assumes strerror() is threadsafe on systems that have no strerror_r()
- - Now allows connection's socket number to be queried
- - New internal_error class for libpqxx-internal errors
- - With Visual C++, doesn't redefine NOMINMAX if it is defined already
- - Several compatibility improvements for Visual C++
- - Fixes and workarounds for HP-UX and HP aCC compiler
- - Phased old cursor interface out of test suite; tests ported to new interface
- - Added documentation on thread safety
- - New thread safety model
- - Large objects have functions to tell current position
- - Minor updates to tutorial (somebody pay me and I'll do more :)
- - No longer needs libpq-fs.h header
- - Meaningful error messages for ambiguous string conversions fixed
-2.5.6
- - Support null parameters to prepared statements (use C-style char pointers)
-2.5.5
- - Diagnoses connection failure during result transfer
- - Fixes invalid -R link option in pqxx-config
-2.5.4
- - Fix workaround code for older libpq versions without PQunescapeBytea()
- - Work around grep bug in Fedora Core 4 that broke configure in UTF-8 locales
- - In Visual C++, assume libpqxx is a DLL when linking to std library as DLL
- - Missing documentation in distribution archive is back again
- - Export fewer symbols from library binary with gcc 4.0
- - Releases now automatically tested against gcc 4.0
- - Meaningful link errors for additional ambiguous string conversions
- - DLL symbol exports now automatically tested before each release
-2.5.3
- - Greatly improved builds on MinGW with MSYS
- - All known problems with MinGW fixed
- - Fix bugs in stream classes that caused failures and crashes with STLport
- - Detects and uses STLport automatically
-2.5.2
- - Fix memory leaks
- - Fix problems with NaN (not-a-number values) on some compilers
-2.5.1
- - Fix configure script; broke when very recent libpqxx was already installed
- - Fix cursor breakage when "long" is more than 32 bits
- - Fix cases where new-style abort/doubt handlers are used
- - Fix for division-by-zero error in Visual C++ (changed sample headers)
- - Improved checking for strerror_r in configure script
- - Fix for problem MinGW has with configure script
- - Fix spurious failure of Oid check in configure script
-2.5.0
- - Fix race condition in removing triggers
- - Fix binary string conversion with older libpq
- - Fix some error strings that may previously have come out wrong
- - No longer includes any libpq headers while compiling client code
- - Improved thread safety: avoid strerror() where possible
- - Prepared statements
- - Translate more error conditions to std::bad_alloc exception
- - Clearer and more specific explanations for configuration failures
- - Improved documentation
- - Looks for standard library in global namespace as well as std
- - Accepts standard C library in std namespace
- - Release script automatically tests with a range of compilers, not just one
- - Compatible with g++ 2.95 again; this time it's tested automatically
-2.4.4
- - Fix problems building shared library in Visual C++
- - Fix autobuild in Debian, which was broken by mistake in BSD grep workaround
- - Fix conversion of string to floating-point type NaN
- - Remove stray CVS directories from distribution archive
- - Workaround for Visual C++ problem when issuing messages from destructors
- - Yet more workarounds for Visual C++ bugs
- - Fix situation where connection state might not be restored after failure
- - Fix configuration problem on SunOS
- - Network speedup in connection setup with pending variables and/or triggers
-2.4.3
- - Yet more workarounds for bugs in Visual C++ .NET 2003
- - Fixes for SunC++ 5.5
- - On Visual C++, now defines NOMINMAX, fixing large object support
- - Workaround for BSD grep
- - Improvements for builds from CVS
- - Sample config headers for Sun ONE Studio 8
-2.4.2
- - Fix minor problems with Apple's version of g++ 3.3
- - Fix problem with MingW on Windows
- - Workarounds and fixes for Visual C++.NET 2003
- - Renewed compatibility with g++ 2.95
- - More sample configuration headers
- - Updated reference documentation
- - Removed assert code
-2.4.1
- - Several bugs in icursor_iterator fixed; incompatible interface changes
- - Tightens throw specifications on begin(), end(), size(), capacity()
- - Containers define reference and pointer types
- - Implements swap() in all container types
- - Implements == and != in all container types
- - Stabilizes new (but still limited) cursor interface
- - icursor_iterator thinks purely in stride granularity
- - Introduces </<=/>/>= comparisons for icursor_iterators
- - Allows "adopted SQL cursors" in new cursor interface
- - Reference-counting in binarystrings, so they can be copied (and efficiently)
- - Fixes reference-to-temporary problem with std::reverse_iterator in results
- - Result/tuple reverse_iterators no longer require std::reverse_iterator
- - Includes some sample config headers (in config/sample-headers)
- - Replaces iffy autoconf checks (avoid failures with maintainer mode's -Werror)
- - Fixes incompatibility with some implementations of Unix "cut" program (again)
-2.4.0
- - Fixes incompatibility with some implementations of Unix "cut" program
- - Fixes "ptrdiff_t redefinition" problem in some environments
- - More container-like tuples, so fields can be iterated
- - All size_type types are now unsigned
- - More conservative robusttransaction--thanks Tom Lane
- - Stream-like extraction operator for result field conversion
- - Warnings about deprecated headers now suppressed while compiling library
- - Iterator constructors and copy assignments now have empty throw specs
-2.3.0
- - Generates MinGW Makefile automatically
- - Documents MinGW build
- - Workaround for missing prepared-statement support
- - Potential bug fixed in closing of connections
- - Fixed incompatibility between new cursor streams and older backends
- - Removed pqxxbench
-2.2.9
- - Bugfix in removing trigger
- - Added "failed connection" to regression test
- - Some changes to throw specifications
- - Putting libpq in its own namespace is optional
-2.2.8
- - Moved libpq into pqxx::internal::pq namespace
- - New config system separates compiler-related items from libpq-related ones
- - Auto-generates Visual C++ Makefile, should always remain up-to-date now
-2.2.7
- - Bugfix: from_string() didn't handle LONG_MIN--thanks Yannick Boivin
-2.2.6
- - Complete "pipeline" rewrite, for better exception safety
- - New garbage collection scheme for "result;" constructors now exception-free
-2.2.5
- - First new cursor classes!
- - Fixed strange failure in tablewriter during large insertions
- - Updated tutorial
-2.2.4
- - New utility class template, items<> for easy container initialization
- - New utility function template, separated_list()
- - Error handling bugfix in tablewriter
- - Fixed tablereader handling of lines ending in empty fields
- - tablereader lines no longer end in newline with old libpq versions
-2.2.3
- - Trigger names no longer need to be proper identifiers
- - Compile fixes for g++ 3.4.0 and other modern compilers
- - Tablestreams may specify column lists
- - Deprecated Quote() in favour of sqlesc(); improved quoting
- - Fixed generation of libpqxx.spec
-2.2.2
- - Bugfix in fieldstream w.r.t. reading strings on some systems
- - Renamed config.h to internalconfig.h to avoid confusion
- - New connection functions allow client to sleep until notification arrives
- - Notification functions return number of notifications received
- - Even fewer client-visible macros exported by libconfig.h
-2.2.1
- - New, 2.x-style string conversions without locale problem
- - Documentation improvements
- - Implemented result::swap()
-2.2.0
- - Installs to /usr/local by default, NOT to /usr/local/pqxx like before!
- - Uses Postgres-provided script to find Postgres (thanks Peter Eisentraut)
- - Which means no more configure arguments required on Irix (thanks Arjen Baart)
- - Fixes long-standing bug in result class!
- - New pipeline class for throughput optimization
- - New field stream class: read result field as C++ stream
- - Separate namespace pqxx::internal for definitions not relevant to the user
- - More Windows compilation fixes
- - SUN Workshop 6 compile fixes and workarounds (thanks Jon Meinecke)
- - Implemented reverse_iterator for result class
- - Checks for functional std::reverse_iterator template
- - Preliminary Makefile for MinGW compiler (thanks Pasquale Fersini)
- - Changed the way unique<> works
- - Checks for functional std::count_if()
- - Bugs fixed & test programs added
-2.1.3
- - Makefile fixes for Visual C++, thanks Paresh Patel
- - Library ABI versioning implemented, thanks Roger Leigh
- - Uses old SQL isolation level syntax for compatibility, thanks koun@sina.com
- - tablestreams can explicitly complete() before destructor
- - Bugfix in robusttransaction: forgot to set isolation level
- - Fixed off-by-ones in tablewriter escape code
- - tablestreams now use \n-style escape sequences
- - tablestreams support octal numbers
- - Freely definable "null" strings in tablestreams, as originally intended
- - Improved Debian packaging, thanks Roger Leigh
- - tablestreams use libpq's new-style COPY functions, if available
- - Extended automation of build/release procedure
- - tablewriter writes in nonblocking mode to help hide communication latency
- - Can get backend variables as well as set them
- - More configuration macro cleanups
- - Workaround for missing clear() in standard string
- - Merry Christmas!
-2.1.2
- - Compile fix for gcc libstdc++ 2.9, thanks Jaroslaw Staniek
- - Moved deprecated functions below current ones
- - Cleanups for Debian packaging (thanks Roger Leigh, new Debian maintainer!)
- - Updated authors listings
- - Bumped ABI version number for the first time (now 2:0:1)
-2.1.1
- - More workarounds for gcc 2.95
- - Automated tools keep test makefiles up to date
-2.1.0
- - Asynchronous connections
- - Fixed configure --includedir option (thanks Ray Dassen!)
- - Compile fixes for SUN Workshop 6, and one for gcc on FreeBSD 4.8
-2.0.0
- - New stable release!
- - Includes all changes since 1.5 release.
- - Workarounds for Microsoft Visual C++ 7 problems.  Thanks Costin Musteata!
- - No longer need to define PQXX_NO_PARTIAL_CLASS_TEMPLATE_SPECIALISATION
- - Integrated Windows configuration into regular configuration
- - Only uses #warning if preprocessor supports it
- - Works on libpq versions without PQ[un]escapeBytea()
-1.9.9
- - Minor documentation changes
-1.9.8
- - Workaround for compile problem with postgres 7.3
- - Convenience typedef for transaction<>: "work"
-1.9.7
- - binarystring rewritten and moved to its own file
- - binarystring::size() does not include terminating null byte!
- - Implemented escaping of binary strings
- - Fix in workaround for missing numeric_limits on some compilers
- - String conversion supported for unsigned char *
- - More helpful link errors for unsupported string conversions
- - Complete test coverage
-1.9.6
- - Fixes in "field table" support
- - Improved coexistence with client program's config.h, if any
- - Prefixed autoconf macros used in headers with "PQXX_"
-1.9.5
- - Header file contents moved to .hxx files for editor filetype recognition
- - Fixes wrong timestamp for include/pqxx/result in 1.9.4 distribution
-1.9.4
- - Fixes Visual C++ build problem when compiling as library
-1.9.3
- - Quick release for various minor changes
-1.9.2
- - Renamed most public member functions to all-lower-case names
- - <pqxx/all> (previously <pqxx/all.h> is now called <pqxx/pqxx>
-1.9.1
- - tablestream destructor crashed if table didn't exist (thanks Sean [Rogers?])
- - Renamed all header files to remove ".h" suffix
- - Tables created by regression test now prefixed with "pqxx" for safety
- - Large objects now considered stable
- - Migrated tutorial from SGML to DocBook XML (thanks Wichert Akkerman)
- - Added tests 57-59
- - Fixed compile error in largeobject
- - Updated Windows makefiles
-1.9.0
- - EVERYTHING HAS CHANGED.  Read the list or run into trouble!
- - CURSOR HAS INCOMPATIBLE CHANGES AND MAY BE REPLACED COMPLETELY
- - CACHEDRESULT HAS INCOMPATIBLE CHANGES (won't compile without changes)
- - REVISE YOUR TRANSACTORS; now templatized on transaction type
- - Finally got license file in order
- - Incompatible change in setting transactor quality of service
- - Cursors require serializable isolation level (checked at link time)
- - Renamed Connection_base to connection_base, Connection to connection,
-   LazyConnection to lazyconnection
- - Renamed LargeObject to largeobject, LargeObjectAccess to largeobjectaccess
- - Renamed Noticer to noticer
- - Renamed Trigger to trigger
- - Renamed Result to result, Tuple to tuple, Field to field
- - Renamed Unique<> to unique<>
- - Renamed CachedResult to cachedresult
- - Transformed Transaction Taxonomy (TTT):
- - Renamed Transaction_base to transaction_base
- - Renamed Transaction to transaction
- - Renamed Transactor to transactor<> (now a template)
- - Implemented transaction isolation levels as compile-time static properties
- - transaction and robusttransaction now templatized on their isolation levels
- - cachedresult requires serializable isolation level (checked at link time)
- - Now need to include pqxx/transactor.h yourself if you need transactors
- - Large objects require real backend transaction at compile time
- - New type oid and constant oid_none for row identifiers resp. null oid
- - Added some forgotten PQXX_LIBEXPORTs
- - Tweaked documentation in many places
-1.8.1
- - By popular request: more convenient way to read field values
- - Documented locale sensitivity of ToString(), FromString(), Field::to()
-1.8.0
- - Compiles on gcc 2.95 again (heavy streambuf workarounds in largeobject.h)
- - ConnectionItf renamed to Connection_base, TransactionItf to Transaction_base
- - connectionitf.h is now connection_base.h, transactionitf.h connection_base.h
-1.7.8
- - BinaryString class for unescaping bytea strings
- - PQAlloc template keeps track of libpq-allocated objects
- - Removed some consts in Unique<>, ConnectionItf, sorry!
- - Can now set session variables on connections, transactions
-1.7.7
- - ./configure also looks for postgres in /usr/local/pgsql
- - test007 now uses SQL_ASCII as its test encoding
- - integrated Greg Hookey's Debian packaging
-1.7.6
- - added postgres library (libpq) to dynamic link path
-1.7.5
- - added test052 - test055
- - added Result::Tuple::ColumnNumber()
- - also test setting of client encodings
- - removed superfluous versions of to_file() from large object classes
-1.7.4
- - new exception class, sql_error, remembers query text
- - moved exception classes to new file include/pqxx/except.h
- - test cases report texts of any failed queries
- - added tools/rmlo.cxx
-1.7.3
- - default constructors for connection classes
- - revamped seeking operations on large objects
- - better error messages in large objects
- - added test050, test051
-1.7.2
- - more workarounds for Sun CC 5.1, thanks Jeroen van Erp!
- - preliminary support for "named" queries
- - can now Quote() string constants
- - included Doxyfile in distribution archive
- - helps avoid Windows memory allocation problem in DLLs
- - allows setting of client character set encoding
-1.7.1
- - regenerated documentation
-1.7.0
- - removed all deprecated features
- - connection string documentation in README
- - separate Connection, LazyConnection classes
- - made test001 more concise
- - added test049
-1.6.4
- - configure script now respects different std namespace
-1.6.3
- - olostream, lostream now flush themselves before closing
- - fixed compilation problems when using ToString<>() on a plain char *
- - compilation fixes for Sun compiler (thanks Jeroen van Erp!)
- - added .pc file for pkgconfig (thanks Ray Dassen!)
-1.6.2
- - Debian packaging added to distribution archive
- - new ilostream, olostream, lostream classes
-1.6.1
- - large object's cunlink() replaced by remove()
- - default constructor for LargeObject
-1.6.0
- - new large objects interface
- - added test048
-1.5.0
- - allow result fields to be written to streams
- - removed confusing CachedResult::clear()
- - minor documentation updates
- - added test046, test047
- - added <pqxx/all.h> convenience header
-1.4.5
- - fixed crash CachedResult that was less shallow than I thought
- - fixed quoting problem with adopted SQL cursors
-1.4.4
- - (forgot to save cursor.cxx with new constructor in 1.4.4, sorry)
-1.4.3
- - all tests now have three-digit numbers
- - Cursor can adopt SQL cursor returned by a function
-1.4.2
- - bugfix in CachedResult when accessing empty Results
- - minor documentation improvements
-1.4.1
- - documents new homepage: http://pqxx.tk/
- - Connection constructor accepts null connect string
- - Exec() now also takes queries as C++ strings
-1.4.0
- - Connection::IsOpen() renamed to is_open()
- - NoticeProcessor replaced by Noticer (with C++ linkage)
-1.3.7:
- - detects nasty rare problem case with Cursors in unknown positions
-1.3.6:
- - fixed detection of missing PQescapeString().  Thanks David Wright!
-v1.3.5:
- - documented Windows build procedure
- - fixed problem with upper-case letters in cursor names.  Thanks key88!
-2003-01-19 16:00, v1.3.4:
- - support long double type
- - clarified some error messages
-2003-01-08 18:45, v1.3.3:
- - fix missing include in test13
-2003-01-07 02:30, v1.3.2:
- - configure looks for postgres includes/library in more places, thanks Ray!
-2003-01-02 23:00, v1.3.1:
- - bugfix in Cursor positioning
-2003-01-02 20:30, v1.3.0:
- - absolute positioning for Cursor
- - better documentation on cursors
- - reduced, but improved test suite output
-2002-12-23 17:30, v1.2.8:
- - Cursor::Move() returns number of rows skipped
- - new typedef Cursor::size_type
-2002-12-14 23:30, v1.2.7:
- - test suite now distinguishes expected errors from unexpected ones
-2002-12-09 20:00, v1.2.6:
- - fixed some Cursor test cases for change in postgres 7.3
- - added important warning to Cursor
-2002-12-09 02:00, v1.2.5:
- - added important warning to CachedResult
-2002-12-08 14:14, v1.2.4:
- - fixed compile error on some systems in include/pqxx/util.h
-2002-12-04 12:00, v1.2.3:
- - workaround for broken <sys/select.h> on some systems
- - fixed Quote() bug
-2002-12-03 01:30, v1.2.2:
- - fixed serious CachedResult bug
- - added test41
-2002-12-02 17:00, v1.2.1:
- - hopefully fixed cursor bug with PostgreSQL 7.3
-2002-12-01 22:00, v1.2.0:
- - new CachedResult class
-2002-11-07 13:15, v1.1.4:
- - workaround for missing InvalidOid definition
-2002-10-23 16:00, v1.1.3:
- - Cursor & TableStream hierarchy now work on any transaction type
- - get no. of affected rows & oid of inserted row from Result
- - increased test coverage
-2002-10-21 01:30, v1.1.2:
- - updated build procedure
- - Debian packaging improvements
-2002-09-25 03:00, v1.1.1:
- - supports activating/deactivating of connections
- - various Connection getters now activate deferred connection first
-2002-09-23 01:00, v1.1.0:
- - supports lazy connections (added 19 test cases just for these)
- - greatly reduced performance overhead for RobustTransaction
- - removed id field from RobustTransaction's transaction log tables
-2002-09-14 20:00, v1.0.1:
- - now lives on GBorg
- - various packaging updates
-2002-06-12 17:30, v0.5.1:
- - no longer have to destroy one transaction before creating the next
-2002-06-07 17:15, v0.5.0:
- - "make install" now finally installs headers!
- - distribution now includes SGML (DocBook) version of tutorial
-2002-06-04 15:00, v0.4.4:
- - may now have multiple triggers with same name on single connection
-2002-06-02 23:00, v0.4.3:
- - fixed TableReader problem with \t and \n
-2002-06-01 21:00, v0.4.2:
- - hopefully fixes compile problem with broken std::iterator
- - configure no longer requires --with-postgres-include=/usr/include/postgresql
-2002-05-29 22:00, v0.4.1:
- - can now also handle bool, unsigned char, short field types
-2002-05-27 22:30, v0.4.0:
- - RENAMED Transactor::TRANSACTIONTYPE to argument_type for STL conformance
- - RENAMED Result::Field::name() to Name()
- - documentation improvements
- - minor optimizations
-2002-05-18 00:00, v0.3.1:
- - removed broken postgres_fe.h dependency (hopefully permanent fix)
-2002-05-12 22:45, v0.3.0:
- - also looks for postgres_fe.h in postgres' internal/ directory (tmp fix)
-2002-05-05 01:30, v0.2.3:
- - extensive build instructions in README
- - make check now controlled through PG environment variables
-2002-05-04 19:30, v0.2.2:
- - more STL conformance
- - fixed regression test
- - test6 now copies "orgevents" to "events" by default
-2002-04-28 23:45 Version bumped to 0.2
-2002-04-28 23:45 Self-generated distribution archive
-2002-04-27 14:20 Replaced automake symlinks with actual files
-2002-04-07 02:30 Released with configure script
-2002-03-29 01:15 Not yet released.  Still integrating autogen stuff...
diff --git a/ext/libpqxx-7.7.3/README.md b/ext/libpqxx-7.7.3/README.md
deleted file mode 100644
index 3a1c17ded..000000000
--- a/ext/libpqxx-7.7.3/README.md
+++ /dev/null
@@ -1,199 +0,0 @@
-libpqxx
-=======
-
-Welcome to libpqxx, the C++ API to the PostgreSQL database management system.
-
-Home page: http://pqxx.org/development/libpqxx/
-
-Find libpqxx on Github: https://github.com/jtv/libpqxx
-
-Documentation on Read The Docs: https://libpqxx.readthedocs.io
-
-Compiling this package requires PostgreSQL to be installed -- or at least the C
-headers and library for client development.  The library builds on top of
-PostgreSQL's standard C API, libpq, though your code won't notice.
-
-If you're getting the code straight from the Git repo, the head of the `master`
-branch represents the current _development version._  Releases are tags on
-commits in `master`.  For example, to get version 7.1.1:
-
-    git checkout 7.1.1
-
-
-Upgrade notes
--------------
-
-**The 7.x versions require at least C++17.**  Make sure your compiler is up to
-date.  For libpqxx 8.x you will need at least C++20.
-
-Also, **7.0 makes some breaking changes in rarely used APIs:**
-* There is just a single `connection` class.  It connects immediately.
-* Custom `connection` classes are no longer supported.
-* It's no longer possible to reactivate a connection once it's been closed.
-* The API for defining string conversions has changed.
-
-If you're defining your own type conversions, **7.1 requires one additional
-field in your `nullness` traits.**
-
-
-Building libpqxx
-----------------
-
-There are two different ways of building libpqxx from the command line:
-1. Using CMake, on any system which supports it.
-2. On Unix-like systems, using a `configure` script.
-
-"Unix-like" systems include GNU/Linux, Apple macOS and the BSD family, AIX,
-HP-UX, Irix, Solaris, etc.  Even on Microsoft Windows, a Unix-like environment
-such as WSL, Cygwin, or MinGW should work.
-
-You'll find detailed build and install instructions in `BUILDING-configure.md`
-and `BUILDING-cmake.md`, respectively.
-
-And if you're working with Microsoft Visual Studio, have a look at Gordon
-Elliott's
-[
-  Easy-PQXX Build for Windows Visual Studio
-](https://github.com/GordonLElliott/Easy-PQXX-Build-for-Windows-Visual-Studio)
-project.
-
-
-Documentation
--------------
-
-Building the library, if you have the right tools installed, generates HTML
-documentation in the `doc/` directory.  It is based on the headers in
-`include/pqxx/` and text in `include/pqxx/doc/`.  This documentation is also
-available online at [readthedocs](https://libpqxx.readthedocs.io).
-
-
-Programming with libpqxx
-------------------------
-
-Your first program will involve the libpqxx classes `connection` (see the
-`pqxx/connection.hxx` header), and `work` (a convenience alias for
-`transaction<>` which conforms to the interface defined in
-`pqxx/transaction_base.hxx`).
-
-These `*.hxx` headers are not the ones you include in your program.  Instead,
-include the versions without filename suffix (e.g. `pqxx/connection`).  Those
-will include the actual .hxx files for you.  This was done so that includes are
-in standard C++ style (as in `<iostream>` etc.), but an editor will still
-recognize them as files containing C++ code.
-
-Continuing the list of classes, you will most likely also need the result class
-(`pqxx/result.hxx`).  In a nutshell, you create a `connection` based on a
-Postgres connection string (see below), create a `work` in the context of that
-connection, and run one or more queries on the work which return `result`
-objects.  The results are containers of rows of data, each of which you can
-treat as an array of strings: one for each field in the row.  It's that simple.
-
-Here is a simple example program to get you going, with full error handling:
-
-```c++
-    #include <iostream>
-    #include <pqxx/pqxx>
-
-    int main()
-    {
-        try
-        {
-            // Connect to the database.
-            pqxx::connection C;
-            std::cout << "Connected to " << C.dbname() << '\n';
-
-            // Start a transaction.
-            pqxx::work W{C};
-
-            // Perform a query and retrieve all results.
-            pqxx::result R{W.exec("SELECT name FROM employee")};
-
-            // Iterate over results.
-            std::cout << "Found " << R.size() << "employees:\n";
-            for (auto row: R)
-                std::cout << row[0].c_str() << '\n';
-
-            // Perform a query and check that it returns no result.
-            std::cout << "Doubling all employees' salaries...\n";
-            W.exec0("UPDATE employee SET salary = salary*2");
-
-            // Commit the transaction.
-            std::cout << "Making changes definite: ";
-            W.commit();
-            std::cout << "OK.\n";
-        }
-        catch (std::exception const &e)
-        {
-            std::cerr << e.what() << '\n';
-            return 1;
-        }
-        return 0;
-    }
-```
-
-
-Connection strings
-------------------
-
-Postgres connection strings state which database server you wish to connect to,
-under which username, using which password, and so on.  Their format is defined
-in the documentation for libpq, the C client interface for PostgreSQL.
-Alternatively, these values may be defined by setting certain environment
-variables as documented in e.g. the manual for psql, the command line interface
-to PostgreSQL.  Again the definitions are the same for libpqxx-based programs.
-
-The connection strings and variables are not fully and definitively documented
-here; this document will tell you just enough to get going.  Check the
-PostgreSQL documentation for authoritative information.
-
-The connection string consists of attribute=value pairs separated by spaces,
-e.g. "user=john password=1x2y3z4".  The valid attributes include:
-* `host` —
-  Name of server to connect to, or the full file path (beginning with a
-  slash) to a Unix-domain socket on the local machine.  Defaults to
-  "/tmp".  Equivalent to (but overrides) environment variable PGHOST.
-* `hostaddr` —
-  IP address of a server to connect to; mutually exclusive with "host".
-* `port` —
-  Port number at the server host to connect to, or socket file name
-  extension for Unix-domain connections.  Equivalent to (but overrides)
-  environment variable PGPORT.
-* `dbname` —
-  Name of the database to connect to.  A single server may host multiple
-  databases.  Defaults to the same name as the current user's name.
-  Equivalent to (but overrides) environment variable PGDATABASE.
-* `user` —
-  User name to connect under.  This defaults to the name of the current
-  user, although PostgreSQL users are not necessarily the same thing as
-  system users.
-* `requiressl` —
-  If set to 1, demands an encrypted SSL connection (and fails if no SSL
-  connection can be created).
-
-Settings in the connection strings override the environment variables, which in
-turn override the default, on a variable-by-variable basis.  You only need to
-define those variables that require non-default values.
-
-
-Linking with libpqxx
---------------------
-
-To link your final program, make sure you link to both the C-level libpq library
-and the actual C++ library, libpqxx.  With most Unix-style compilers, you'd do
-this using the options
-
-    -lpqxx -lpq
-
-while linking.  Both libraries must be in your link path, so the linker knows
-where to find them.  Any dynamic libraries you use must also be in a place
-where the loader can find them when loading your program at runtime.
-
-Some users have reported problems using the above syntax, however, particularly
-when multiple versions of libpqxx are partially or incorrectly installed on the
-system.  If you get massive link errors, try removing the "-lpqxx" argument from
-the command line and replacing it with the name of the libpqxx library binary
-instead.  That's typically libpqxx.a, but you'll have to add the path to its
-location as well, e.g. /usr/local/pqxx/lib/libpqxx.a.  This will ensure that the
-linker will use that exact version of the library rather than one found
-elsewhere on the system, and eliminate worries about the exact right version of
-the library being installed with your program..
diff --git a/ext/libpqxx-7.7.3/VERSION b/ext/libpqxx-7.7.3/VERSION
deleted file mode 100644
index d92ba80de..000000000
--- a/ext/libpqxx-7.7.3/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-7.7.3
diff --git a/ext/libpqxx-7.7.3/aclocal.m4 b/ext/libpqxx-7.7.3/aclocal.m4
deleted file mode 100644
index 2c938cff6..000000000
--- a/ext/libpqxx-7.7.3/aclocal.m4
+++ /dev/null
@@ -1,1187 +0,0 @@
-# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.4], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.4])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
-  # requiring Autoconf 2.70 or later.
-  AS_CASE([$CONFIG_FILES],
-          [*\'*], [eval set x "$CONFIG_FILES"],
-          [*], [set x $CONFIG_FILES])
-  shift
-  # Used to flag and report bootstrapping failures.
-  am_rc=0
-  for am_mf
-  do
-    # Strip MF so we end up with the name of the file.
-    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
-    # dependency-tracking related rules and includes.
-    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      || continue
-    am_dirpart=`AS_DIRNAME(["$am_mf"])`
-    am_filepart=`AS_BASENAME(["$am_mf"])`
-    AM_RUN_LOG([cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles]) || am_rc=$?
-  done
-  if test $am_rc -ne 0; then
-    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  If GNU make was not used, consider
-    re-running the configure script with MAKE="gmake" (or whatever is
-    necessary).  You can also try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).])
-  fi
-  AS_UNSET([am_dirpart])
-  AS_UNSET([am_filepart])
-  AS_UNSET([am_mf])
-  AS_UNSET([am_rc])
-  rm -f conftest-deps.mk
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking is enabled.
-# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
-# order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-# Variables for tags utilities; see am/tags.am
-if test -z "$CTAGS"; then
-  CTAGS=ctags
-fi
-AC_SUBST([CTAGS])
-if test -z "$ETAGS"; then
-  ETAGS=etags
-fi
-AC_SUBST([ETAGS])
-if test -z "$CSCOPE"; then
-  CSCOPE=cscope
-fi
-AC_SUBST([CSCOPE])
-
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi
-dnl The trailing newline in this macro's definition is deliberate, for
-dnl backward compatibility and to allow trailing 'dnl'-style comments
-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
-])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless 'enable' is passed literally.
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
-      am_maintainer_other[ make rules and dependencies not useful
-      (and sometimes confusing) to the casual installer])],
-    [USE_MAINTAINER_MODE=$enableval],
-    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check whether make has an 'include' directive that can support all
-# the idioms we need for our automatic dependency tracking code.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
-  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
-  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
-      ['0:this is the am__doit target'],
-      [AS_CASE([$s],
-          [BSD], [am__include='.include' am__quote='"'],
-          [am__include='include' am__quote=''])])
-  if test "$am__include" != "#"; then
-    _am_result="yes ($s style)"
-    break
-  fi
-done
-rm -f confinc.* confmf.*
-AC_MSG_RESULT([${_am_result}])
-AC_SUBST([am__include])])
-AC_SUBST([am__quote])])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  MISSING="\${SHELL} '$am_aux_dir/missing'"
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-#
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
-m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
-  rm -rf conftest.dir
-
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([config/m4/libtool.m4])
-m4_include([config/m4/ltoptions.m4])
-m4_include([config/m4/ltsugar.m4])
-m4_include([config/m4/ltversion.m4])
-m4_include([config/m4/lt~obsolete.m4])
diff --git a/ext/libpqxx-7.7.3/appveyor.yml b/ext/libpqxx-7.7.3/appveyor.yml
deleted file mode 100644
index 110bd75ad..000000000
--- a/ext/libpqxx-7.7.3/appveyor.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Configuration for test runs in Appveyor.
-version: 1.0.{build}
-image: Visual Studio 2022
-services: postgresql13
-# Run CMake to build libpqxx.sln.
-before_build:
-- cmd: >-
-    call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
-
-    cmake -DBUILD_SHARED_LIBS=1 -DCMAKE_CXX_STANDARD=23
-configuration: Release
-build:
-  parallel: true
-  project: libpqxx.sln
-test_script:
-- ps: >-
-    $env:Path += ";.\src\Release;C:\Program Files\PostgreSQL\13\bin"
-
-    $env:PGUSER = "postgres"
-
-    $env:PGPASSWORD = "Password12!"
-
-    .\test\Release\runner.exe
-notifications:
-- provider: Email
-  subject: 'libpqxx: AppVeyor build failure'
-  message: The libpqxx AppVeyor build has failed.
-  on_build_success: false
-  on_build_failure: true
-  on_build_status_changed: false
diff --git a/ext/libpqxx-7.7.3/autogen.sh b/ext/libpqxx-7.7.3/autogen.sh
deleted file mode 100755
index a09cb5ae7..000000000
--- a/ext/libpqxx-7.7.3/autogen.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Run this to generate the configure script etc.
-
-set -eu
-
-PQXXVERSION=$(./tools/extract_version)
-PQXX_ABI=$(./tools/extract_version --abi)
-PQXX_MAJOR=$(./tools/extract_version --major)
-PQXX_MINOR=$(./tools/extract_version --minor)
-echo "libpqxx version $PQXXVERSION"
-echo "libpqxx ABI version $PQXX_ABI"
-
-substitute() {
-	sed -e "s/@PQXXVERSION@/$PQXXVERSION/g" \
-		-e "s/@PQXX_MAJOR@/$PQXX_MAJOR/g" \
-		-e "s/@PQXX_MINOR@/$PQXX_MINOR/g" \
-		-e "s/@PQXX_ABI@/$PQXX_ABI/g" \
-		"$1"
-}
-
-
-# Use templating system to generate various Makefiles.
-expand_templates() {
-	for template in "$@"
-	do
-		./tools/template2mak.py "$template" "${template%.template}"
-	done
-}
-
-
-# We have two kinds of templates.  One uses our custom templating tool.  And
-# a few others simply have some substitutions done.
-expand_templates $(find -name \*.template)
-substitute include/pqxx/version.hxx.template >include/pqxx/version.hxx
-substitute include/pqxx/doc/mainpage.md.template >include/pqxx/doc/mainpage.md
-
-
-autoheader
-libtoolize --force --automake --copy
-aclocal -I . -I config/m4
-automake --add-missing --copy
-autoconf
-
-echo "Done."
diff --git a/ext/libpqxx-7.7.3/cmake/config.cmake b/ext/libpqxx-7.7.3/cmake/config.cmake
deleted file mode 100644
index 816ee4474..000000000
--- a/ext/libpqxx-7.7.3/cmake/config.cmake
+++ /dev/null
@@ -1,157 +0,0 @@
-function(detect_code_compiled code macro msg)
-    message(STATUS "Detecting ${msg}")
-    check_cxx_source_compiles("${code}" "${macro}" FAIL_REGEX "warning")
-    if(${macro})
-        message(STATUS "Detecting ${msg} - supported")
-    else()
-        message(STATUS "Detecting ${msg} - not supported")
-    endif()
-endfunction(detect_code_compiled)
-
-include(CheckIncludeFileCXX)
-include(CheckFunctionExists)
-include(CheckSymbolExists)
-include(CMakeDetermineCompileFeatures)
-include(CheckCXXSourceCompiles)
-include(CMakeFindDependencyMacro)
-
-if(NOT PostgreSQL_FOUND)
-    if(POLICY CMP0074)
-        cmake_policy(PUSH)
-        # CMP0074 is `OLD` by `cmake_minimum_required(VERSION 3.7)`,
-        # sets `NEW` to enable support CMake variable `PostgreSQL_ROOT`.
-        cmake_policy(SET CMP0074 NEW)
-    endif()
-
-    find_package(PostgreSQL REQUIRED)
-
-    if(POLICY CMP0074)
-        cmake_policy(POP)
-    endif()
-endif()
-
-check_function_exists("poll" PQXX_HAVE_POLL)
-
-set(CMAKE_REQUIRED_LIBRARIES pq)
-check_symbol_exists(
-	PQencryptPasswordConn
-	"${PostgreSQL_INCLUDE_DIR}/libpq-fe.h"
-	PQXX_HAVE_PQENCRYPTPASSWORDCONN)
-check_symbol_exists(
-	PQenterPipelineMode
-	"${PostgreSQL_INCLUDE_DIR}/libpq-fe.h"
-	PQXX_HAVE_PQ_PIPELINE)
-
-cmake_determine_compile_features(CXX)
-cmake_policy(SET CMP0057 NEW)
-
-# check_cxx_source_compiles requires CMAKE_REQUIRED_DEFINITIONS to specify
-# compiling arguments.
-# Wordaround: Push CMAKE_REQUIRED_DEFINITIONS
-if(CMAKE_REQUIRED_DEFINITIONS)
-    set(def "${CMAKE_REQUIRED_DEFINITIONS}")
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION})
-set(CMAKE_REQUIRED_QUIET ON)
-
-try_compile(
-	PQXX_HAVE_GCC_PURE
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/gcc_pure.cxx)
-try_compile(
-	PQXX_HAVE_GCC_VISIBILITY
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/gcc_visibility.cxx)
-try_compile(
-	PQXX_HAVE_LIKELY
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/likely.cxx)
-try_compile(
-	PQXX_HAVE_CXA_DEMANGLE
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/cxa_demangle.cxx)
-try_compile(
-	PQXX_HAVE_CONCEPTS
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/concepts.cxx)
-try_compile(
-	PQXX_HAVE_SPAN
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/span.cxx)
-try_compile(
-	PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/multidim-subscript.cxx)
-try_compile(
-	PQXX_HAVE_CHARCONV_FLOAT
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/charconv_float.cxx)
-try_compile(
-	PQXX_HAVE_CHARCONV_INT
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/charconv_int.cxx)
-try_compile(
-	PQXX_HAVE_PATH
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/fs.cxx)
-try_compile(
-	PQXX_HAVE_THREAD_LOCAL
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/thread_local.cxx)
-try_compile(
-	PQXX_HAVE_SLEEP_FOR
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/sleep_for.cxx)
-try_compile(
-	PQXX_HAVE_STRERROR_R
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/strerror_r.cxx)
-try_compile(
-	PQXX_HAVE_STRERROR_S
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/strerror_s.cxx)
-try_compile(
-	PQXX_HAVE_YEAR_MONTH_DAY
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/year_month_day.cxx)
-try_compile(
-	PQXX_HAVE_CMP
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/cmp.cxx)
-
-try_compile(
-	need_fslib
-	${PROJECT_BINARY_DIR}
-	SOURCES ${PROJECT_SOURCE_DIR}/config-tests/need_fslib.cxx)
-if(!need_fslib)
-    # TODO: This may work for gcc 8, but some clang versions may need -lc++fs.
-    link_libraries(stdc++fs)
-endif()
-
-# check_cxx_source_compiles requires CMAKE_REQUIRED_DEFINITIONS to specify
-# compiling arguments.
-# Workaround: Pop CMAKE_REQUIRED_DEFINITIONS
-if(def)
-    set(CMAKE_REQUIRED_DEFINITIONS ${def})
-    unset(def CACHE)
-else()
-    unset(CMAKE_REQUIRED_DEFINITIONS CACHE)
-endif()
-set(CMAKE_REQUIRED_QUIET OFF)
-
-set(AC_CONFIG_H_IN "${PROJECT_SOURCE_DIR}/include/pqxx/config.h.in")
-set(CM_CONFIG_H_IN "${PROJECT_BINARY_DIR}/include/pqxx/config_cmake.h.in")
-set(CM_CONFIG_PUB "${PROJECT_BINARY_DIR}/include/pqxx/config-public-compiler.h")
-set(CM_CONFIG_INT "${PROJECT_BINARY_DIR}/include/pqxx/config-internal-compiler.h")
-set(CM_CONFIG_PQ "${PROJECT_BINARY_DIR}/include/pqxx/config-internal-libpq.h")
-message(STATUS "Generating config.h")
-file(WRITE "${CM_CONFIG_H_IN}" "")
-file(STRINGS "${AC_CONFIG_H_IN}" lines)
-foreach(line ${lines})
-    string(REGEX REPLACE "^#undef" "#cmakedefine" l "${line}")
-    file(APPEND "${CM_CONFIG_H_IN}" "${l}\n")
-endforeach()
-configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_INT}" @ONLY)
-configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_PUB}" @ONLY)
-configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_PQ}" @ONLY)
-message(STATUS "Generating config.h - done")
diff --git a/ext/libpqxx-7.7.3/cmake/libpqxx-config.cmake b/ext/libpqxx-7.7.3/cmake/libpqxx-config.cmake
deleted file mode 100644
index cb25a05f2..000000000
--- a/ext/libpqxx-7.7.3/cmake/libpqxx-config.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-include(CMakeFindDependencyMacro)
-find_dependency(PostgreSQL)
-
-include("${CMAKE_CURRENT_LIST_DIR}/libpqxx-targets.cmake")
diff --git a/ext/libpqxx-7.7.3/compile_flags.in b/ext/libpqxx-7.7.3/compile_flags.in
deleted file mode 100644
index 1304e8aa8..000000000
--- a/ext/libpqxx-7.7.3/compile_flags.in
+++ /dev/null
@@ -1 +0,0 @@
-@CPPFLAGS@ @CXXFLAGS@
diff --git a/ext/libpqxx-7.7.3/config-tests/README.md b/ext/libpqxx-7.7.3/config-tests/README.md
deleted file mode 100644
index b3865d0f0..000000000
--- a/ext/libpqxx-7.7.3/config-tests/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Configuration tests
-===================
-
-Libpqxx comes with support for different build systems: the GNU autotools,
-CMake, Visual Studio's "nmake", and raw GNU "make" on Windows.
-
-For several of these build systems, we need to test things like "does this
-compiler environment support `std::to_chars` for floating-point types?"
-
-We test these things by trying to compile a particular snippet of code, and
-seeing whether that succeeds.
-
-To avoid duplicating those snippets for multiple build systems, we put them
-here.  Both the autotools configuration and the CMake configuration can refer to
-them that way.
-
-It took a bit of nasty magic to read a C++ source file into m4 and treat it as
-a string literal, without macro expansion.  There is every chance that I missed
-something, so be prepared for tests failing for unexpected reasons!  Some C++
-syntax may end up having an unforeseen meaning in m4, and screw up the handling
-of the code snippet.  Re-configure, and read your logs carefully after editing
-these snippets.
diff --git a/ext/libpqxx-7.7.3/config-tests/charconv_float.cxx b/ext/libpqxx-7.7.3/config-tests/charconv_float.cxx
deleted file mode 100644
index bc5d973e3..000000000
--- a/ext/libpqxx-7.7.3/config-tests/charconv_float.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-// Test for std::to_string/std::from_string for floating-point types.
-#include <charconv>
-#include <iterator>
-
-int main()
-{
-  char z[100];
-  auto rt = std::to_chars(std::begin(z), std::end(z), 3.14159L);
-  if (rt.ec != std::errc{})
-    return 1;
-  long double n;
-  auto rf = std::from_chars(std::cbegin(z), std::cend(z), n);
-  if (rf.ec != std::errc{})
-    return 2;
-  return (n > 3 and n < 4) ? 0 : 1;
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/charconv_int.cxx b/ext/libpqxx-7.7.3/config-tests/charconv_int.cxx
deleted file mode 100644
index 076ee0de3..000000000
--- a/ext/libpqxx-7.7.3/config-tests/charconv_int.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-// Test for std::to_string/std::from_string for integral types.
-#include <charconv>
-#include <iterator>
-
-int main()
-{
-  char z[100];
-  auto rt = std::to_chars(std::begin(z), std::end(z), 9ULL);
-  if (rt.ec != std::errc{})
-    return 1;
-  unsigned long long n;
-  auto rf = std::from_chars(std::cbegin(z), std::cend(z), n);
-  if (rf.ec != std::errc{})
-    return 2;
-  return (n == 9ULL) ? 0 : 1;
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/cmp.cxx b/ext/libpqxx-7.7.3/config-tests/cmp.cxx
deleted file mode 100644
index 7f5abaa5d..000000000
--- a/ext/libpqxx-7.7.3/config-tests/cmp.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-// Test for C++20 std::cmp_greater etc. support.
-#include <utility>
-
-
-int main()
-{
-  return std::cmp_greater(-1, 2u) && std::cmp_less_equal(3, 0);
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/concepts.cxx b/ext/libpqxx-7.7.3/config-tests/concepts.cxx
deleted file mode 100644
index 5589b4e58..000000000
--- a/ext/libpqxx-7.7.3/config-tests/concepts.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-// Test for concepts support.  Not just the language feature; also headers.
-#include <iostream>
-#include <ranges>
-#include <vector>
-
-
-template<typename T>
-concept Foo = std::ranges::input_range<T>;
-
-
-template<Foo F> auto foo(F const &r)
-{
-  return std::distance(std::begin(r), std::end(r));
-}
-
-
-int main()
-{
-  std::vector<int> const v{1, 2, 3};
-  std::cout << foo(v) << '\n';
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/cxa_demangle.cxx b/ext/libpqxx-7.7.3/config-tests/cxa_demangle.cxx
deleted file mode 100644
index 4d4ee7e6b..000000000
--- a/ext/libpqxx-7.7.3/config-tests/cxa_demangle.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-// Test for cross-vendor C++ ABI's __cxa_demangle function.
-#include <cstdlib>
-#include <cstring>
-#include <stdexcept>
-#include <typeinfo>
-
-#include <cxxabi.h>
-
-int main()
-{
-  int status = 0;
-  char *name =
-    abi::__cxa_demangle(typeid(10).name(), nullptr, nullptr, &status);
-  if (status != 0)
-    throw std::runtime_error("Demangle failed!");
-  int result = std::strcmp(name, "int");
-  std::free(name);
-  return result;
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/fs.cxx b/ext/libpqxx-7.7.3/config-tests/fs.cxx
deleted file mode 100644
index d93d37f5d..000000000
--- a/ext/libpqxx-7.7.3/config-tests/fs.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-// Check for working std::filesystem support.
-#include <filesystem>
-
-
-int main()
-{
-  // Apparently some versions of MinGW lack this comparison operator.
-  return std::filesystem::path{} != std::filesystem::path{};
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/gcc_pure.cxx b/ext/libpqxx-7.7.3/config-tests/gcc_pure.cxx
deleted file mode 100644
index 4edd267c6..000000000
--- a/ext/libpqxx-7.7.3/config-tests/gcc_pure.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-// Test for gcc-style "pure" attribute.
-int __attribute__((pure)) f()
-{
-  return 0;
-}
-
-int main()
-{
-  return f();
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/gcc_visibility.cxx b/ext/libpqxx-7.7.3/config-tests/gcc_visibility.cxx
deleted file mode 100644
index 23d0111d7..000000000
--- a/ext/libpqxx-7.7.3/config-tests/gcc_visibility.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-// Test for gcc-style "visibility" attribute.
-struct __attribute__((visibility("hidden"))) D
-{
-  D() {}
-  int f() { return 0; }
-};
-
-int main()
-{
-  D d;
-  return d.f();
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/likely.cxx b/ext/libpqxx-7.7.3/config-tests/likely.cxx
deleted file mode 100644
index 9d0eca8d3..000000000
--- a/ext/libpqxx-7.7.3/config-tests/likely.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-// Test for C++20 [[likely]] and [[unlikely]] attributes.
-
-int main(int argc, char **)
-{
-#if __cplusplus < 202002L
-  deliberately_fail(because, older, C++, standard);
-#endif
-
-  int x = 0;
-  if (argc == 1) [[likely]]
-    x = 0;
-  else
-    x = 1;
-  return x;
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/multidim-subscript.cxx b/ext/libpqxx-7.7.3/config-tests/multidim-subscript.cxx
deleted file mode 100644
index f75d1aa7a..000000000
--- a/ext/libpqxx-7.7.3/config-tests/multidim-subscript.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-// Test for multidimensional subscript operator support.
-// Proposed for C++23: P2128R6.
-struct table
-{
-  int width = 100;
-
-  int operator[](int x, int y) const { return x + width * y; }
-};
-
-
-int main()
-{
-  return table{}[0, 0];
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/need_fslib.cxx b/ext/libpqxx-7.7.3/config-tests/need_fslib.cxx
deleted file mode 100644
index 041c46b43..000000000
--- a/ext/libpqxx-7.7.3/config-tests/need_fslib.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-// Check whether we need to link to the stdc++fs library.
-//
-// We assume that the presence of the <filesystem> header means that we have
-// support for the basics of std::filesystem.  This check will succeed if
-// either there is no <filesystem> header, or there is one and it works without
-// any special options.  If the link fails, we assume that -lstdc++fs will fix
-// it for us.
-
-#include <iostream>
-
-#if __has_include(<filesystem>)
-#  include <filesystem>
-#endif
-
-
-int main()
-{
-#if __has_include(<filesystem>)
-  std::cout << std::filesystem::path{"foo.bar"}.c_str() << '\n';
-#endif
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/poll.cxx b/ext/libpqxx-7.7.3/config-tests/poll.cxx
deleted file mode 100644
index d67cef55d..000000000
--- a/ext/libpqxx-7.7.3/config-tests/poll.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-// Test for poll().
-#include <poll.h>
-
-int main()
-{
-  return poll(nullptr, 0, 0);
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/sleep_for.cxx b/ext/libpqxx-7.7.3/config-tests/sleep_for.cxx
deleted file mode 100644
index f081fe0e5..000000000
--- a/ext/libpqxx-7.7.3/config-tests/sleep_for.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-// Test for std::this_thread::sleep_for().
-/* For some reason MinGW's <thread> header seems to be broken.
- *
- * But it gets worse.  It looks as if we can include <thread> without problems
- * in this configuration test.  Why does it break when MinGW users try to build
- * the library, but succeed when we try it here?
- *
- * To try and get close to the situation in the library code itself, we try
- * including some standard headers that we don't strictly need here.
- */
-
-#if __has_include(<ciso646>)
-#  include <ciso646>
-#endif
-
-#include <cerrno>
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
-#include <new>
-
-#include <chrono>
-#include <thread>
-
-int main()
-{
-  std::this_thread::sleep_for(std::chrono::microseconds{10u});
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/span.cxx b/ext/libpqxx-7.7.3/config-tests/span.cxx
deleted file mode 100644
index 8c13b97c9..000000000
--- a/ext/libpqxx-7.7.3/config-tests/span.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-// Test for std::span.
-#include <span>
-
-int main(int argc, char **argv)
-{
-  std::span<char *> args{argv, static_cast<std::size_t>(argc)};
-  return static_cast<int>(std::size(args) - 1u);
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/strerror_r.cxx b/ext/libpqxx-7.7.3/config-tests/strerror_r.cxx
deleted file mode 100644
index 604d3b899..000000000
--- a/ext/libpqxx-7.7.3/config-tests/strerror_r.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-// Check for strerror_r.
-// It can be either the POSIX version (which returns int) or the GNU version
-// (which returns char *).
-
-#include <cstring>
-#include <type_traits>
-
-int main()
-{
-  char buffer[200];
-  auto res{strerror_r(1, buffer, 200)};
-  // Sidestep type differences.  We don't really care what the value is.
-  return not not res;
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/strerror_s.cxx b/ext/libpqxx-7.7.3/config-tests/strerror_s.cxx
deleted file mode 100644
index f6f99a7a5..000000000
--- a/ext/libpqxx-7.7.3/config-tests/strerror_s.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-// Test for strerror_s, as defined in Windows and C11.
-// Presumably this'll be part of the C++ standard some day.
-
-#include <cstring>
-
-int main()
-{
-  using namespace std;
-  char buf[200];
-  return strerror_s(buf, 200, 1);
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/thread_local.cxx b/ext/libpqxx-7.7.3/config-tests/thread_local.cxx
deleted file mode 100644
index b5a98b7b8..000000000
--- a/ext/libpqxx-7.7.3/config-tests/thread_local.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-// Test for std::to_string/std::from_string for floating-point types.
-#include <iostream>
-#include <sstream>
-
-int main(int argc, char **)
-{
-#if defined(__MINGW32__) && defined(__GNUC__)
-#  if __GNUC__ < 11 || ((__GNUC__ == 11) && (__GNU_MINOR__ == 0))
-#    error "On MinGW before gcc 11.1, thread_local breaks at run time."
-#  endif
-#endif
-  thread_local std::stringstream s;
-  s << argc;
-  std::cout << s.str();
-}
diff --git a/ext/libpqxx-7.7.3/config-tests/year_month_day.cxx b/ext/libpqxx-7.7.3/config-tests/year_month_day.cxx
deleted file mode 100644
index dbe543b55..000000000
--- a/ext/libpqxx-7.7.3/config-tests/year_month_day.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-// Test for std::chrono::year_month_day etc.
-#include <chrono>
-
-int main()
-{
-  return int(std::chrono::year{1});
-}
diff --git a/ext/libpqxx-7.7.3/config/Makefile.am b/ext/libpqxx-7.7.3/config/Makefile.am
deleted file mode 100644
index f34b3107d..000000000
--- a/ext/libpqxx-7.7.3/config/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTRA_DIST=m4/Makefile.am sample-headers
-MAINTAINERCLEANFILES=Makefile.in config.guess config.sub install-sh \
-	ltmain.sh missing mkinstalldirs
-
-dist-hook:
-	find "${distdir}" -type d -name CVS -print0 | xargs -0 rm -rf
-	find "${distdir}" -type d -name .svn -print0 | xargs -0 rm -rf
-
diff --git a/ext/libpqxx-7.7.3/config/Makefile.in b/ext/libpqxx-7.7.3/config/Makefile.in
deleted file mode 100644
index bf7aa004a..000000000
--- a/ext/libpqxx-7.7.3/config/Makefile.in
+++ /dev/null
@@ -1,470 +0,0 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = config
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4/libtool.m4 \
-	$(top_srcdir)/config/m4/ltoptions.m4 \
-	$(top_srcdir)/config/m4/ltsugar.m4 \
-	$(top_srcdir)/config/m4/ltversion.m4 \
-	$(top_srcdir)/config/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/pqxx/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \
-	config.sub install-sh ltmain.sh missing mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-PKG_CONFIG = @PKG_CONFIG@
-POSTGRES_INCLUDE = @POSTGRES_INCLUDE@
-PQXXVERSION = @PQXXVERSION@
-PQXX_ABI = @PQXX_ABI@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_postgres_lib = @with_postgres_lib@
-EXTRA_DIST = m4/Makefile.am sample-headers
-MAINTAINERCLEANFILES = Makefile.in config.guess config.sub install-sh \
-	ltmain.sh missing mkinstalldirs
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu config/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am dist-hook distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-dist-hook:
-	find "${distdir}" -type d -name CVS -print0 | xargs -0 rm -rf
-	find "${distdir}" -type d -name .svn -print0 | xargs -0 rm -rf
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpqxx-7.7.3/config/compile b/ext/libpqxx-7.7.3/config/compile
deleted file mode 100755
index df363c8fb..000000000
--- a/ext/libpqxx-7.7.3/config/compile
+++ /dev/null
@@ -1,348 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN* | MSYS*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/* | msys/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/ext/libpqxx-7.7.3/config/config.guess b/ext/libpqxx-7.7.3/config/config.guess
deleted file mode 100755
index 2e9ad7fe8..000000000
--- a/ext/libpqxx-7.7.3/config/config.guess
+++ /dev/null
@@ -1,1462 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
-
-timestamp='2016-10-02'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-#
-# Please send patches to <config-patches@gnu.org>.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || \
-	    echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine=${arch}${endian}-unknown
-		;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		os=netbsdelf
-		;;
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH=hppa2.0n ;;
-			  64) HP_ARCH=hppa2.0w ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = hppa2.0w ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH=hppa2.0w
-	    else
-		HP_ARCH=hppa64
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    k1om:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
-    mips64el:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = 386; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-    amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
-esac
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-If $0 has already been updated, send the following data and any
-information you think might be pertinent to config-patches@gnu.org to
-provide the necessary information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/ext/libpqxx-7.7.3/config/config.sub b/ext/libpqxx-7.7.3/config/config.sub
deleted file mode 100755
index dd2ca93c6..000000000
--- a/ext/libpqxx-7.7.3/config/config.sub
+++ /dev/null
@@ -1,1825 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
-
-timestamp='2016-11-04'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2016 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-ios)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/ext/libpqxx-7.7.3/config/depcomp b/ext/libpqxx-7.7.3/config/depcomp
deleted file mode 100755
index 715e34311..000000000
--- a/ext/libpqxx-7.7.3/config/depcomp
+++ /dev/null
@@ -1,791 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
-    ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
-  object      Object file output by 'PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'.  Note that this directory component will
-# be either empty or ending with a '/' character.  This is deliberate.
-set_dir_from ()
-{
-  case $1 in
-    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-      *) dir=;;
-  esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
-  echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
-  # If the compiler actually managed to produce a dependency file,
-  # post-process it.
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependency.h'.
-    # Do two passes, one to just change these to
-    #   $object: dependency.h
-    # and one to simply output
-    #   dependency.h:
-    # which is needed to avoid the deleted-header problem.
-    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-    } > "$depfile"
-    rm -f "$tmpdepfile"
-  else
-    make_dummy_depfile
-  fi
-}
-
-# A tabulation character.
-tab='	'
-# A newline character.
-nl='
-'
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
-  depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-  # This is just like msvisualcpp but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-  # This is just like msvc7 but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-  gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
-##   supported by the other compilers which use the 'gcc' depmode.
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
-  # letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-## Some versions of gcc put a space before the ':'.  On the theory
-## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like '#:fec' to the end of the
-    # dependency line.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-      | tr "$nl" ' ' >> "$depfile"
-    echo >> "$depfile"
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-      >> "$depfile"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-xlc)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts '$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  set_dir_from "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  aix_post_process_depfile
-  ;;
-
-tcc)
-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-  # FIXME: That version still under development at the moment of writing.
-  #        Make that this statement remains true also for stable, released
-  #        versions.
-  # It will wrap lines (doesn't matter whether long or short) with a
-  # trailing '\', as in:
-  #
-  #   foo.o : \
-  #    foo.c \
-  #    foo.h \
-  #
-  # It will put a trailing '\' even on the last line, and will use leading
-  # spaces rather than leading tabs (at least since its commit 0394caf7
-  # "Emit spaces for -MD").
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-  # We have to change lines of the first kind to '$object: \'.
-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-  # And for each line of the second kind, we have to emit a 'dep.h:'
-  # dummy dependency, to avoid the deleted-header problem.
-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file.  A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
-  # Portland's C compiler understands '-MD'.
-  # Will always output deps to 'file.d' where file is the root name of the
-  # source file under compilation, even if file resides in a subdirectory.
-  # The object file name does not affect the name of the '.d' file.
-  # pgcc 10.2 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\' :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-  set_dir_from "$object"
-  # Use the source, not the object, to determine the base name, since
-  # that's sadly what pgcc will do too.
-  set_base_from "$source"
-  tmpdepfile=$base.d
-
-  # For projects that build the same source file twice into different object
-  # files, the pgcc approach of using the *source* file root name can cause
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
-  # the same $tmpdepfile.
-  lockdir=$base.d-lock
-  trap "
-    echo '$0: caught signal, cleaning up...' >&2
-    rmdir '$lockdir'
-    exit 1
-  " 1 2 13 15
-  numtries=100
-  i=$numtries
-  while test $i -gt 0; do
-    # mkdir is a portable test-and-set.
-    if mkdir "$lockdir" 2>/dev/null; then
-      # This process acquired the lock.
-      "$@" -MD
-      stat=$?
-      # Release the lock.
-      rmdir "$lockdir"
-      break
-    else
-      # If the lock is being held by a different process, wait
-      # until the winning process is done or we timeout.
-      while test -d "$lockdir" && test $i -gt 0; do
-        sleep 1
-        i=`expr $i - 1`
-      done
-    fi
-    i=`expr $i - 1`
-  done
-  trap - 1 2 13 15
-  if test $i -le 0; then
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
-    echo "$0: check lockdir '$lockdir'" >&2
-    exit 1
-  fi
-
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  set_dir_from  "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add 'dependent.h:' lines.
-    sed -ne '2,${
-               s/^ *//
-               s/ \\*$//
-               s/$/:/
-               p
-             }' "$tmpdepfile" >> "$depfile"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-  # dependencies in 'foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
-  set_dir_from  "$object"
-  set_base_from "$object"
-
-  if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
-    # two compilations output dependencies in $dir.libs/$base.o.d and
-    # in $dir$base.o.d.  We have to check for both files, because
-    # one of the two compilations can be disabled.  We should prefer
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-    # automatically cleaned when .libs/ is deleted, while ignoring
-    # the former would cause a distcleancheck panic.
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
-    "$@" -Wc,-MD
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    tmpdepfile3=$dir$base.d
-    "$@" -MD
-  fi
-
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  # Same post-processing that is required for AIX mode.
-  aix_post_process_depfile
-  ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/'"$tab"'/
-  G
-  p
-}' >> "$depfile"
-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for ':'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
-  "$@" $dashmflag |
-    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed '1,2d' "$tmpdepfile" \
-    | tr ' ' "$nl" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E \
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-    | sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
-        shift
-        shift
-        ;;
-    *)
-        set fnord "$@" "$arg"
-        shift
-        shift
-        ;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/ext/libpqxx-7.7.3/config/install-sh b/ext/libpqxx-7.7.3/config/install-sh
deleted file mode 100755
index 6781b987b..000000000
--- a/ext/libpqxx-7.7.3/config/install-sh
+++ /dev/null
@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/ext/libpqxx-7.7.3/config/ltmain.sh b/ext/libpqxx-7.7.3/config/ltmain.sh
deleted file mode 100755
index 21e5e0784..000000000
--- a/ext/libpqxx-7.7.3/config/ltmain.sh
+++ /dev/null
@@ -1,11251 +0,0 @@
-#! /bin/sh
-## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-##               by inline-source v2014-01-03.01
-
-# libtool (GNU libtool) 2.4.6
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-15"
-package_revision=2.4.6
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# Run './libtool --help' for help with using this script from the
-# command line.
-
-
-## ------------------------------- ##
-## User overridable command paths. ##
-## ------------------------------- ##
-
-# After configure completes, it has a better idea of some of the
-# shell tools we need than the defaults used by the functions shared
-# with bootstrap, so set those here where they can still be over-
-# ridden by the user, but otherwise take precedence.
-
-: ${AUTOCONF="autoconf"}
-: ${AUTOMAKE="automake"}
-
-
-## -------------------------- ##
-## Source external libraries. ##
-## -------------------------- ##
-
-# Much of our low-level functionality needs to be sourced from external
-# libraries, which are installed to $pkgauxdir.
-
-# Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
-
-# General shell script boiler plate, and helper functions.
-# Written by Gary V. Vaughan, 2004
-
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-
-# As a special exception to the GNU General Public License, if you distribute
-# this file as part of a program or library that is built using GNU Libtool,
-# you may include this file under the same distribution terms that you use
-# for the rest of that program.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Please report bugs or propose patches to gary@gnu.org.
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# Evaluate this file near the top of your script to gain access to
-# the functions and variables defined here:
-#
-#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
-#
-# If you need to override any of the default environment variable
-# settings, do that before evaluating this file.
-
-
-## -------------------- ##
-## Shell normalisation. ##
-## -------------------- ##
-
-# Some shells need a little help to be as Bourne compatible as possible.
-# Before doing anything else, make sure all that help has been provided!
-
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
-fi
-
-# NLS nuisances: We save the old values in case they are required later.
-_G_user_locale=
-_G_safe_locale=
-for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test set = \"\${$_G_var+set}\"; then
-          save_$_G_var=\$$_G_var
-          $_G_var=C
-	  export $_G_var
-	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
-	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
-	fi"
-done
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Make sure IFS has a sensible default
-sp=' '
-nl='
-'
-IFS="$sp	$nl"
-
-# There are apparently some retarded systems that use ';' as a PATH separator!
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-
-## ------------------------- ##
-## Locate command utilities. ##
-## ------------------------- ##
-
-
-# func_executable_p FILE
-# ----------------------
-# Check that FILE is an executable regular file.
-func_executable_p ()
-{
-    test -f "$1" && test -x "$1"
-}
-
-
-# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
-# --------------------------------------------
-# Search for either a program that responds to --version with output
-# containing "GNU", or else returned by CHECK_FUNC otherwise, by
-# trying all the directories in PATH with each of the elements of
-# PROGS_LIST.
-#
-# CHECK_FUNC should accept the path to a candidate program, and
-# set $func_check_prog_result if it truncates its output less than
-# $_G_path_prog_max characters.
-func_path_progs ()
-{
-    _G_progs_list=$1
-    _G_check_func=$2
-    _G_PATH=${3-"$PATH"}
-
-    _G_path_prog_max=0
-    _G_path_prog_found=false
-    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
-    for _G_dir in $_G_PATH; do
-      IFS=$_G_save_IFS
-      test -z "$_G_dir" && _G_dir=.
-      for _G_prog_name in $_G_progs_list; do
-        for _exeext in '' .EXE; do
-          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
-          func_executable_p "$_G_path_prog" || continue
-          case `"$_G_path_prog" --version 2>&1` in
-            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
-            *)     $_G_check_func $_G_path_prog
-		   func_path_progs_result=$func_check_prog_result
-		   ;;
-          esac
-          $_G_path_prog_found && break 3
-        done
-      done
-    done
-    IFS=$_G_save_IFS
-    test -z "$func_path_progs_result" && {
-      echo "no acceptable sed could be found in \$PATH" >&2
-      exit 1
-    }
-}
-
-
-# We want to be able to use the functions in this file before configure
-# has figured out where the best binaries are kept, which means we have
-# to search for them ourselves - except when the results are already set
-# where we skip the searches.
-
-# Unless the user overrides by setting SED, search the path for either GNU
-# sed, or the sed that truncates its output the least.
-test -z "$SED" && {
-  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-  for _G_i in 1 2 3 4 5 6 7; do
-    _G_sed_script=$_G_sed_script$nl$_G_sed_script
-  done
-  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
-  _G_sed_script=
-
-  func_check_prog_sed ()
-  {
-    _G_path_prog=$1
-
-    _G_count=0
-    printf 0123456789 >conftest.in
-    while :
-    do
-      cat conftest.in conftest.in >conftest.tmp
-      mv conftest.tmp conftest.in
-      cp conftest.in conftest.nl
-      echo '' >> conftest.nl
-      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
-      diff conftest.out conftest.nl >/dev/null 2>&1 || break
-      _G_count=`expr $_G_count + 1`
-      if test "$_G_count" -gt "$_G_path_prog_max"; then
-        # Best one so far, save it but keep looking for a better one
-        func_check_prog_result=$_G_path_prog
-        _G_path_prog_max=$_G_count
-      fi
-      # 10*(2^10) chars as input seems more than enough
-      test 10 -lt "$_G_count" && break
-    done
-    rm -f conftest.in conftest.tmp conftest.nl conftest.out
-  }
-
-  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
-  rm -f conftest.sed
-  SED=$func_path_progs_result
-}
-
-
-# Unless the user overrides by setting GREP, search the path for either GNU
-# grep, or the grep that truncates its output the least.
-test -z "$GREP" && {
-  func_check_prog_grep ()
-  {
-    _G_path_prog=$1
-
-    _G_count=0
-    _G_path_prog_max=0
-    printf 0123456789 >conftest.in
-    while :
-    do
-      cat conftest.in conftest.in >conftest.tmp
-      mv conftest.tmp conftest.in
-      cp conftest.in conftest.nl
-      echo 'GREP' >> conftest.nl
-      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
-      diff conftest.out conftest.nl >/dev/null 2>&1 || break
-      _G_count=`expr $_G_count + 1`
-      if test "$_G_count" -gt "$_G_path_prog_max"; then
-        # Best one so far, save it but keep looking for a better one
-        func_check_prog_result=$_G_path_prog
-        _G_path_prog_max=$_G_count
-      fi
-      # 10*(2^10) chars as input seems more than enough
-      test 10 -lt "$_G_count" && break
-    done
-    rm -f conftest.in conftest.tmp conftest.nl conftest.out
-  }
-
-  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
-  GREP=$func_path_progs_result
-}
-
-
-## ------------------------------- ##
-## User overridable command paths. ##
-## ------------------------------- ##
-
-# All uppercase variable names are used for environment variables.  These
-# variables can be overridden by the user before calling a script that
-# uses them if a suitable command of that name is not already available
-# in the command search PATH.
-
-: ${CP="cp -f"}
-: ${ECHO="printf %s\n"}
-: ${EGREP="$GREP -E"}
-: ${FGREP="$GREP -F"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-
-
-## -------------------- ##
-## Useful sed snippets. ##
-## -------------------- ##
-
-sed_dirname='s|/[^/]*$||'
-sed_basename='s|^.*/||'
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
-
-# Same as above, but do not quote variable references.
-sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
-
-# Sed substitution that converts a w32 file name or path
-# that contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-'\' parameter expansions in output of sed_double_quote_subst that
-# were '\'-ed in input to the same.  If an odd number of '\' preceded a
-# '$' in input to sed_double_quote_subst, that '$' was protected from
-# expansion.  Since each input '\' is now two '\'s, look for any number
-# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
-_G_bs='\\'
-_G_bs2='\\\\'
-_G_bs4='\\\\\\\\'
-_G_dollar='\$'
-sed_double_backslash="\
-  s/$_G_bs4/&\\
-/g
-  s/^$_G_bs2$_G_dollar/$_G_bs&/
-  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
-  s/\n//g"
-
-
-## ----------------- ##
-## Global variables. ##
-## ----------------- ##
-
-# Except for the global variables explicitly listed below, the following
-# functions in the '^func_' namespace, and the '^require_' namespace
-# variables initialised in the 'Resource management' section, sourcing
-# this file will not pollute your global namespace with anything
-# else. There's no portable way to scope variables in Bourne shell
-# though, so actually running these functions will sometimes place
-# results into a variable named after the function, and often use
-# temporary variables in the '^_G_' namespace. If you are careful to
-# avoid using those namespaces casually in your sourcing script, things
-# should continue to work as you expect. And, of course, you can freely
-# overwrite any of the functions or variables defined here before
-# calling anything to customize them.
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-# Allow overriding, eg assuming that you follow the convention of
-# putting '$debug_cmd' at the start of all your functions, you can get
-# bash to show function call trace with:
-#
-#    debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
-debug_cmd=${debug_cmd-":"}
-exit_cmd=:
-
-# By convention, finish your script with:
-#
-#    exit $exit_status
-#
-# so that you can set exit_status to non-zero if you want to indicate
-# something went wrong during execution without actually bailing out at
-# the point of failure.
-exit_status=$EXIT_SUCCESS
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath=$0
-
-# The name of this program.
-progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-
-# Make sure we have an absolute progpath for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
-     progdir=`cd "$progdir" && pwd`
-     progpath=$progdir/$progname
-     ;;
-  *)
-     _G_IFS=$IFS
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS=$_G_IFS
-       test -x "$progdir/$progname" && break
-     done
-     IFS=$_G_IFS
-     test -n "$progdir" || progdir=`pwd`
-     progpath=$progdir/$progname
-     ;;
-esac
-
-
-## ----------------- ##
-## Standard options. ##
-## ----------------- ##
-
-# The following options affect the operation of the functions defined
-# below, and should be set appropriately depending on run-time para-
-# meters passed on the command line.
-
-opt_dry_run=false
-opt_quiet=false
-opt_verbose=false
-
-# Categories 'all' and 'none' are always available.  Append any others
-# you will pass as the first argument to func_warning from your own
-# code.
-warning_categories=
-
-# By default, display warnings according to 'opt_warning_types'.  Set
-# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
-# treat the next displayed warning as a fatal error.
-warning_func=func_warn_and_continue
-
-# Set to 'all' to display all warnings, 'none' to suppress all
-# warnings, or a space delimited list of some subset of
-# 'warning_categories' to display only the listed warnings.
-opt_warning_types=all
-
-
-## -------------------- ##
-## Resource management. ##
-## -------------------- ##
-
-# This section contains definitions for functions that each ensure a
-# particular resource (a file, or a non-empty configuration variable for
-# example) is available, and if appropriate to extract default values
-# from pertinent package files. Call them using their associated
-# 'require_*' variable to ensure that they are executed, at most, once.
-#
-# It's entirely deliberate that calling these functions can set
-# variables that don't obey the namespace limitations obeyed by the rest
-# of this file, in order that that they be as useful as possible to
-# callers.
-
-
-# require_term_colors
-# -------------------
-# Allow display of bold text on terminals that support it.
-require_term_colors=func_require_term_colors
-func_require_term_colors ()
-{
-    $debug_cmd
-
-    test -t 1 && {
-      # COLORTERM and USE_ANSI_COLORS environment variables take
-      # precedence, because most terminfo databases neglect to describe
-      # whether color sequences are supported.
-      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
-
-      if test 1 = "$USE_ANSI_COLORS"; then
-        # Standard ANSI escape sequences
-        tc_reset=''
-        tc_bold='';   tc_standout=''
-        tc_red='';   tc_green=''
-        tc_blue='';  tc_cyan=''
-      else
-        # Otherwise trust the terminfo database after all.
-        test -n "`tput sgr0 2>/dev/null`" && {
-          tc_reset=`tput sgr0`
-          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
-          tc_standout=$tc_bold
-          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
-          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
-          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
-          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
-          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
-        }
-      fi
-    }
-
-    require_term_colors=:
-}
-
-
-## ----------------- ##
-## Function library. ##
-## ----------------- ##
-
-# This section contains a variety of useful functions to call in your
-# scripts. Take note of the portable wrappers for features provided by
-# some modern shells, which will fall back to slower equivalents on
-# less featureful shells.
-
-
-# func_append VAR VALUE
-# ---------------------
-# Append VALUE onto the existing contents of VAR.
-
-  # We should try to minimise forks, especially on Windows where they are
-  # unreasonably slow, so skip the feature probes when bash or zsh are
-  # being used:
-  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
-    : ${_G_HAVE_ARITH_OP="yes"}
-    : ${_G_HAVE_XSI_OPS="yes"}
-    # The += operator was introduced in bash 3.1
-    case $BASH_VERSION in
-      [12].* | 3.0 | 3.0*) ;;
-      *)
-        : ${_G_HAVE_PLUSEQ_OP="yes"}
-        ;;
-    esac
-  fi
-
-  # _G_HAVE_PLUSEQ_OP
-  # Can be empty, in which case the shell is probed, "yes" if += is
-  # useable or anything else if it does not work.
-  test -z "$_G_HAVE_PLUSEQ_OP" \
-    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
-    && _G_HAVE_PLUSEQ_OP=yes
-
-if test yes = "$_G_HAVE_PLUSEQ_OP"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_append ()
-  {
-    $debug_cmd
-
-    eval "$1+=\$2"
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_append ()
-  {
-    $debug_cmd
-
-    eval "$1=\$$1\$2"
-  }
-fi
-
-
-# func_append_quoted VAR VALUE
-# ----------------------------
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-if test yes = "$_G_HAVE_PLUSEQ_OP"; then
-  eval 'func_append_quoted ()
-  {
-    $debug_cmd
-
-    func_quote_for_eval "$2"
-    eval "$1+=\\ \$func_quote_for_eval_result"
-  }'
-else
-  func_append_quoted ()
-  {
-    $debug_cmd
-
-    func_quote_for_eval "$2"
-    eval "$1=\$$1\\ \$func_quote_for_eval_result"
-  }
-fi
-
-
-# func_append_uniq VAR VALUE
-# --------------------------
-# Append unique VALUE onto the existing contents of VAR, assuming
-# entries are delimited by the first character of VALUE.  For example:
-#
-#   func_append_uniq options " --another-option option-argument"
-#
-# will only append to $options if " --another-option option-argument "
-# is not already present somewhere in $options already (note spaces at
-# each end implied by leading space in second argument).
-func_append_uniq ()
-{
-    $debug_cmd
-
-    eval _G_current_value='`$ECHO $'$1'`'
-    _G_delim=`expr "$2" : '\(.\)'`
-
-    case $_G_delim$_G_current_value$_G_delim in
-      *"$2$_G_delim"*) ;;
-      *) func_append "$@" ;;
-    esac
-}
-
-
-# func_arith TERM...
-# ------------------
-# Set func_arith_result to the result of evaluating TERMs.
-  test -z "$_G_HAVE_ARITH_OP" \
-    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
-    && _G_HAVE_ARITH_OP=yes
-
-if test yes = "$_G_HAVE_ARITH_OP"; then
-  eval 'func_arith ()
-  {
-    $debug_cmd
-
-    func_arith_result=$(( $* ))
-  }'
-else
-  func_arith ()
-  {
-    $debug_cmd
-
-    func_arith_result=`expr "$@"`
-  }
-fi
-
-
-# func_basename FILE
-# ------------------
-# Set func_basename_result to FILE with everything up to and including
-# the last / stripped.
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  # If this shell supports suffix pattern removal, then use it to avoid
-  # forking. Hide the definitions single quotes in case the shell chokes
-  # on unsupported syntax...
-  _b='func_basename_result=${1##*/}'
-  _d='case $1 in
-        */*) func_dirname_result=${1%/*}$2 ;;
-        *  ) func_dirname_result=$3        ;;
-      esac'
-
-else
-  # ...otherwise fall back to using sed.
-  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
-  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
-      if test "X$func_dirname_result" = "X$1"; then
-        func_dirname_result=$3
-      else
-        func_append func_dirname_result "$2"
-      fi'
-fi
-
-eval 'func_basename ()
-{
-    $debug_cmd
-
-    '"$_b"'
-}'
-
-
-# func_dirname FILE APPEND NONDIR_REPLACEMENT
-# -------------------------------------------
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-eval 'func_dirname ()
-{
-    $debug_cmd
-
-    '"$_d"'
-}'
-
-
-# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
-# --------------------------------------------------------
-# Perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# For efficiency, we do not delegate to the functions above but instead
-# duplicate the functionality here.
-eval 'func_dirname_and_basename ()
-{
-    $debug_cmd
-
-    '"$_b"'
-    '"$_d"'
-}'
-
-
-# func_echo ARG...
-# ----------------
-# Echo program name prefixed message.
-func_echo ()
-{
-    $debug_cmd
-
-    _G_message=$*
-
-    func_echo_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_IFS
-      $ECHO "$progname: $_G_line"
-    done
-    IFS=$func_echo_IFS
-}
-
-
-# func_echo_all ARG...
-# --------------------
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-
-# func_echo_infix_1 INFIX ARG...
-# ------------------------------
-# Echo program name, followed by INFIX on the first line, with any
-# additional lines not showing INFIX.
-func_echo_infix_1 ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    _G_infix=$1; shift
-    _G_indent=$_G_infix
-    _G_prefix="$progname: $_G_infix: "
-    _G_message=$*
-
-    # Strip color escape sequences before counting printable length
-    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
-    do
-      test -n "$_G_tc" && {
-        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
-        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
-      }
-    done
-    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
-
-    func_echo_infix_1_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_infix_1_IFS
-      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
-      _G_prefix=$_G_indent
-    done
-    IFS=$func_echo_infix_1_IFS
-}
-
-
-# func_error ARG...
-# -----------------
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
-}
-
-
-# func_fatal_error ARG...
-# -----------------------
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    $debug_cmd
-
-    func_error "$*"
-    exit $EXIT_FAILURE
-}
-
-
-# func_grep EXPRESSION FILENAME
-# -----------------------------
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $debug_cmd
-
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_len STRING
-# ---------------
-# Set func_len_result to the length of STRING. STRING may not
-# start with a hyphen.
-  test -z "$_G_HAVE_XSI_OPS" \
-    && (eval 'x=a/b/c;
-      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
-    && _G_HAVE_XSI_OPS=yes
-
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_len ()
-  {
-    $debug_cmd
-
-    func_len_result=${#1}
-  }'
-else
-  func_len ()
-  {
-    $debug_cmd
-
-    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-  }
-fi
-
-
-# func_mkdir_p DIRECTORY-PATH
-# ---------------------------
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    $debug_cmd
-
-    _G_directory_path=$1
-    _G_dir_list=
-
-    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
-
-      # Protect directory names starting with '-'
-      case $_G_directory_path in
-        -*) _G_directory_path=./$_G_directory_path ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$_G_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        _G_dir_list=$_G_directory_path:$_G_dir_list
-
-        # If the last portion added has no slash in it, the list is done
-        case $_G_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
-      done
-      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
-
-      func_mkdir_p_IFS=$IFS; IFS=:
-      for _G_dir in $_G_dir_list; do
-	IFS=$func_mkdir_p_IFS
-        # mkdir can fail with a 'File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$_G_dir" 2>/dev/null || :
-      done
-      IFS=$func_mkdir_p_IFS
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$_G_directory_path" || \
-        func_fatal_error "Failed to create '$1'"
-    fi
-}
-
-
-# func_mktempdir [BASENAME]
-# -------------------------
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, BASENAME is the basename for that directory.
-func_mktempdir ()
-{
-    $debug_cmd
-
-    _G_template=${TMPDIR-/tmp}/${1-$progname}
-
-    if test : = "$opt_dry_run"; then
-      # Return a directory name, but don't create it in dry-run mode
-      _G_tmpdir=$_G_template-$$
-    else
-
-      # If mktemp works, use that first and foremost
-      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$_G_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        _G_tmpdir=$_G_template-${RANDOM-0}$$
-
-        func_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$_G_tmpdir"
-        umask $func_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$_G_tmpdir" || \
-        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
-    fi
-
-    $ECHO "$_G_tmpdir"
-}
-
-
-# func_normal_abspath PATH
-# ------------------------
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-func_normal_abspath ()
-{
-    $debug_cmd
-
-    # These SED scripts presuppose an absolute path with a trailing slash.
-    _G_pathcar='s|^/\([^/]*\).*$|\1|'
-    _G_pathcdr='s|^/[^/]*||'
-    _G_removedotparts=':dotsl
-		s|/\./|/|g
-		t dotsl
-		s|/\.$|/|'
-    _G_collapseslashes='s|/\{1,\}|/|g'
-    _G_finalslash='s|/*$|/|'
-
-    # Start from root dir and reassemble the path.
-    func_normal_abspath_result=
-    func_normal_abspath_tpath=$1
-    func_normal_abspath_altnamespace=
-    case $func_normal_abspath_tpath in
-      "")
-        # Empty path, that just means $cwd.
-        func_stripname '' '/' "`pwd`"
-        func_normal_abspath_result=$func_stripname_result
-        return
-        ;;
-      # The next three entries are used to spot a run of precisely
-      # two leading slashes without using negated character classes;
-      # we take advantage of case's first-match behaviour.
-      ///*)
-        # Unusual form of absolute path, do nothing.
-        ;;
-      //*)
-        # Not necessarily an ordinary path; POSIX reserves leading '//'
-        # and for example Cygwin uses it to access remote file shares
-        # over CIFS/SMB, so we conserve a leading double slash if found.
-        func_normal_abspath_altnamespace=/
-        ;;
-      /*)
-        # Absolute path, do nothing.
-        ;;
-      *)
-        # Relative path, prepend $cwd.
-        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-        ;;
-    esac
-
-    # Cancel out all the simple stuff to save iterations.  We also want
-    # the path to end with a slash for ease of parsing, so make sure
-    # there is one (and only one) here.
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
-    while :; do
-      # Processed it all yet?
-      if test / = "$func_normal_abspath_tpath"; then
-        # If we ascended to the root using ".." the result may be empty now.
-        if test -z "$func_normal_abspath_result"; then
-          func_normal_abspath_result=/
-        fi
-        break
-      fi
-      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_pathcar"`
-      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_pathcdr"`
-      # Figure out what to do with it
-      case $func_normal_abspath_tcomponent in
-        "")
-          # Trailing empty path component, ignore it.
-          ;;
-        ..)
-          # Parent dir; strip last assembled component from result.
-          func_dirname "$func_normal_abspath_result"
-          func_normal_abspath_result=$func_dirname_result
-          ;;
-        *)
-          # Actual path component, append it.
-          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
-          ;;
-      esac
-    done
-    # Restore leading double-slash if one was found on entry.
-    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-
-# func_notquiet ARG...
-# --------------------
-# Echo program name prefixed message only when not in quiet mode.
-func_notquiet ()
-{
-    $debug_cmd
-
-    $opt_quiet || func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-
-# func_relative_path SRCDIR DSTDIR
-# --------------------------------
-# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
-func_relative_path ()
-{
-    $debug_cmd
-
-    func_relative_path_result=
-    func_normal_abspath "$1"
-    func_relative_path_tlibdir=$func_normal_abspath_result
-    func_normal_abspath "$2"
-    func_relative_path_tbindir=$func_normal_abspath_result
-
-    # Ascend the tree starting from libdir
-    while :; do
-      # check if we have found a prefix of bindir
-      case $func_relative_path_tbindir in
-        $func_relative_path_tlibdir)
-          # found an exact match
-          func_relative_path_tcancelled=
-          break
-          ;;
-        $func_relative_path_tlibdir*)
-          # found a matching prefix
-          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-          func_relative_path_tcancelled=$func_stripname_result
-          if test -z "$func_relative_path_result"; then
-            func_relative_path_result=.
-          fi
-          break
-          ;;
-        *)
-          func_dirname $func_relative_path_tlibdir
-          func_relative_path_tlibdir=$func_dirname_result
-          if test -z "$func_relative_path_tlibdir"; then
-            # Have to descend all the way to the root!
-            func_relative_path_result=../$func_relative_path_result
-            func_relative_path_tcancelled=$func_relative_path_tbindir
-            break
-          fi
-          func_relative_path_result=../$func_relative_path_result
-          ;;
-      esac
-    done
-
-    # Now calculate path; take care to avoid doubling-up slashes.
-    func_stripname '' '/' "$func_relative_path_result"
-    func_relative_path_result=$func_stripname_result
-    func_stripname '/' '/' "$func_relative_path_tcancelled"
-    if test -n "$func_stripname_result"; then
-      func_append func_relative_path_result "/$func_stripname_result"
-    fi
-
-    # Normalisation. If bindir is libdir, return '.' else relative path.
-    if test -n "$func_relative_path_result"; then
-      func_stripname './' '' "$func_relative_path_result"
-      func_relative_path_result=$func_stripname_result
-    fi
-
-    test -n "$func_relative_path_result" || func_relative_path_result=.
-
-    :
-}
-
-
-# func_quote_for_eval ARG...
-# --------------------------
-# Aesthetically quote ARGs to be evaled later.
-# This function returns two values:
-#   i) func_quote_for_eval_result
-#      double-quoted, suitable for a subsequent eval
-#  ii) func_quote_for_eval_unquoted_result
-#      has all characters that are still active within double
-#      quotes backslashified.
-func_quote_for_eval ()
-{
-    $debug_cmd
-
-    func_quote_for_eval_unquoted_result=
-    func_quote_for_eval_result=
-    while test 0 -lt $#; do
-      case $1 in
-        *[\\\`\"\$]*)
-	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
-        *)
-          _G_unquoted_arg=$1 ;;
-      esac
-      if test -n "$func_quote_for_eval_unquoted_result"; then
-	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
-      else
-        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
-      fi
-
-      case $_G_unquoted_arg in
-        # Double-quote args containing shell metacharacters to delay
-        # word splitting, command substitution and variable expansion
-        # for a subsequent eval.
-        # Many Bourne shells cannot handle close brackets correctly
-        # in scan sets, so we specify it separately.
-        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-          _G_quoted_arg=\"$_G_unquoted_arg\"
-          ;;
-        *)
-          _G_quoted_arg=$_G_unquoted_arg
-	  ;;
-      esac
-
-      if test -n "$func_quote_for_eval_result"; then
-	func_append func_quote_for_eval_result " $_G_quoted_arg"
-      else
-        func_append func_quote_for_eval_result "$_G_quoted_arg"
-      fi
-      shift
-    done
-}
-
-
-# func_quote_for_expand ARG
-# -------------------------
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    $debug_cmd
-
-    case $1 in
-      *[\\\`\"]*)
-	_G_arg=`$ECHO "$1" | $SED \
-	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        _G_arg=$1 ;;
-    esac
-
-    case $_G_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        _G_arg=\"$_G_arg\"
-        ;;
-    esac
-
-    func_quote_for_expand_result=$_G_arg
-}
-
-
-# func_stripname PREFIX SUFFIX NAME
-# ---------------------------------
-# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_stripname ()
-  {
-    $debug_cmd
-
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary variable first.
-    func_stripname_result=$3
-    func_stripname_result=${func_stripname_result#"$1"}
-    func_stripname_result=${func_stripname_result%"$2"}
-  }'
-else
-  func_stripname ()
-  {
-    $debug_cmd
-
-    case $2 in
-      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
-      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
-    esac
-  }
-fi
-
-
-# func_show_eval CMD [FAIL_EXP]
-# -----------------------------
-# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    $debug_cmd
-
-    _G_cmd=$1
-    _G_fail_exp=${2-':'}
-
-    func_quote_for_expand "$_G_cmd"
-    eval "func_notquiet $func_quote_for_expand_result"
-
-    $opt_dry_run || {
-      eval "$_G_cmd"
-      _G_status=$?
-      if test 0 -ne "$_G_status"; then
-	eval "(exit $_G_status); $_G_fail_exp"
-      fi
-    }
-}
-
-
-# func_show_eval_locale CMD [FAIL_EXP]
-# ------------------------------------
-# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    $debug_cmd
-
-    _G_cmd=$1
-    _G_fail_exp=${2-':'}
-
-    $opt_quiet || {
-      func_quote_for_expand "$_G_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    $opt_dry_run || {
-      eval "$_G_user_locale
-	    $_G_cmd"
-      _G_status=$?
-      eval "$_G_safe_locale"
-      if test 0 -ne "$_G_status"; then
-	eval "(exit $_G_status); $_G_fail_exp"
-      fi
-    }
-}
-
-
-# func_tr_sh
-# ----------
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-    $debug_cmd
-
-    case $1 in
-    [0-9]* | *[!a-zA-Z0-9_]*)
-      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
-      ;;
-    * )
-      func_tr_sh_result=$1
-      ;;
-    esac
-}
-
-
-# func_verbose ARG...
-# -------------------
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $debug_cmd
-
-    $opt_verbose && func_echo "$*"
-
-    :
-}
-
-
-# func_warn_and_continue ARG...
-# -----------------------------
-# Echo program name prefixed warning message to standard error.
-func_warn_and_continue ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
-}
-
-
-# func_warning CATEGORY ARG...
-# ----------------------------
-# Echo program name prefixed warning message to standard error. Warning
-# messages can be filtered according to CATEGORY, where this function
-# elides messages where CATEGORY is not listed in the global variable
-# 'opt_warning_types'.
-func_warning ()
-{
-    $debug_cmd
-
-    # CATEGORY must be in the warning_categories list!
-    case " $warning_categories " in
-      *" $1 "*) ;;
-      *) func_internal_error "invalid warning category '$1'" ;;
-    esac
-
-    _G_category=$1
-    shift
-
-    case " $opt_warning_types " in
-      *" $_G_category "*) $warning_func ${1+"$@"} ;;
-    esac
-}
-
-
-# func_sort_ver VER1 VER2
-# -----------------------
-# 'sort -V' is not generally available.
-# Note this deviates from the version comparison in automake
-# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
-# but this should suffice as we won't be specifying old
-# version formats or redundant trailing .0 in bootstrap.conf.
-# If we did want full compatibility then we should probably
-# use m4_version_compare from autoconf.
-func_sort_ver ()
-{
-    $debug_cmd
-
-    printf '%s\n%s\n' "$1" "$2" \
-      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
-}
-
-# func_lt_ver PREV CURR
-# ---------------------
-# Return true if PREV and CURR are in the correct order according to
-# func_sort_ver, otherwise false.  Use it like this:
-#
-#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
-func_lt_ver ()
-{
-    $debug_cmd
-
-    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
-}
-
-
-# Local variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
-# time-stamp-time-zone: "UTC"
-# End:
-#! /bin/sh
-
-# Set a version string for this script.
-scriptversion=2015-10-07.11; # UTC
-
-# A portable, pluggable option parser for Bourne shell.
-# Written by Gary V. Vaughan, 2010
-
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Please report bugs or propose patches to gary@gnu.org.
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# This file is a library for parsing options in your shell scripts along
-# with assorted other useful supporting features that you can make use
-# of too.
-#
-# For the simplest scripts you might need only:
-#
-#   #!/bin/sh
-#   . relative/path/to/funclib.sh
-#   . relative/path/to/options-parser
-#   scriptversion=1.0
-#   func_options ${1+"$@"}
-#   eval set dummy "$func_options_result"; shift
-#   ...rest of your script...
-#
-# In order for the '--version' option to work, you will need to have a
-# suitably formatted comment like the one at the top of this file
-# starting with '# Written by ' and ending with '# warranty; '.
-#
-# For '-h' and '--help' to work, you will also need a one line
-# description of your script's purpose in a comment directly above the
-# '# Written by ' line, like the one at the top of this file.
-#
-# The default options also support '--debug', which will turn on shell
-# execution tracing (see the comment above debug_cmd below for another
-# use), and '--verbose' and the func_verbose function to allow your script
-# to display verbose messages only when your user has specified
-# '--verbose'.
-#
-# After sourcing this file, you can plug processing for additional
-# options by amending the variables from the 'Configuration' section
-# below, and following the instructions in the 'Option parsing'
-# section further down.
-
-## -------------- ##
-## Configuration. ##
-## -------------- ##
-
-# You should override these variables in your script after sourcing this
-# file so that they reflect the customisations you have added to the
-# option parser.
-
-# The usage line for option parsing errors and the start of '-h' and
-# '--help' output messages. You can embed shell variables for delayed
-# expansion at the time the message is displayed, but you will need to
-# quote other shell meta-characters carefully to prevent them being
-# expanded when the contents are evaled.
-usage='$progpath [OPTION]...'
-
-# Short help message in response to '-h' and '--help'.  Add to this or
-# override it after sourcing this library to reflect the full set of
-# options your script accepts.
-usage_message="\
-       --debug        enable verbose shell tracing
-   -W, --warnings=CATEGORY
-                      report the warnings falling in CATEGORY [all]
-   -v, --verbose      verbosely report processing
-       --version      print version information and exit
-   -h, --help         print short or long help message and exit
-"
-
-# Additional text appended to 'usage_message' in response to '--help'.
-long_help_message="
-Warning categories include:
-       'all'          show all warnings
-       'none'         turn off all the warnings
-       'error'        warnings are treated as fatal errors"
-
-# Help message printed before fatal option parsing errors.
-fatal_help="Try '\$progname --help' for more information."
-
-
-
-## ------------------------- ##
-## Hook function management. ##
-## ------------------------- ##
-
-# This section contains functions for adding, removing, and running hooks
-# to the main code.  A hook is just a named list of of function, that can
-# be run in order later on.
-
-# func_hookable FUNC_NAME
-# -----------------------
-# Declare that FUNC_NAME will run hooks added with
-# 'func_add_hook FUNC_NAME ...'.
-func_hookable ()
-{
-    $debug_cmd
-
-    func_append hookable_fns " $1"
-}
-
-
-# func_add_hook FUNC_NAME HOOK_FUNC
-# ---------------------------------
-# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
-# first have been declared "hookable" by a call to 'func_hookable'.
-func_add_hook ()
-{
-    $debug_cmd
-
-    case " $hookable_fns " in
-      *" $1 "*) ;;
-      *) func_fatal_error "'$1' does not accept hook functions." ;;
-    esac
-
-    eval func_append ${1}_hooks '" $2"'
-}
-
-
-# func_remove_hook FUNC_NAME HOOK_FUNC
-# ------------------------------------
-# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
-func_remove_hook ()
-{
-    $debug_cmd
-
-    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
-}
-
-
-# func_run_hooks FUNC_NAME [ARG]...
-# ---------------------------------
-# Run all hook functions registered to FUNC_NAME.
-# It is assumed that the list of hook functions contains nothing more
-# than a whitespace-delimited list of legal shell function names, and
-# no effort is wasted trying to catch shell meta-characters or preserve
-# whitespace.
-func_run_hooks ()
-{
-    $debug_cmd
-
-    _G_rc_run_hooks=false
-
-    case " $hookable_fns " in
-      *" $1 "*) ;;
-      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
-    esac
-
-    eval _G_hook_fns=\$$1_hooks; shift
-
-    for _G_hook in $_G_hook_fns; do
-      if eval $_G_hook '"$@"'; then
-        # store returned options list back into positional
-        # parameters for next 'cmd' execution.
-        eval _G_hook_result=\$${_G_hook}_result
-        eval set dummy "$_G_hook_result"; shift
-        _G_rc_run_hooks=:
-      fi
-    done
-
-    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
-}
-
-
-
-## --------------- ##
-## Option parsing. ##
-## --------------- ##
-
-# In order to add your own option parsing hooks, you must accept the
-# full positional parameter list in your hook function, you may remove/edit
-# any options that you action, and then pass back the remaining unprocessed
-# options in '<hooked_function_name>_result', escaped suitably for
-# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the
-# hook's caller know that it should pay attention to
-# '<hooked_function_name>_result'.  Returning $EXIT_FAILURE signalizes that
-# arguments are left untouched by the hook and therefore caller will ignore the
-# result variable.
-#
-# Like this:
-#
-#    my_options_prep ()
-#    {
-#        $debug_cmd
-#
-#        # Extend the existing usage message.
-#        usage_message=$usage_message'
-#      -s, --silent       don'\''t print informational messages
-#    '
-#        # No change in '$@' (ignored completely by this hook).  There is
-#        # no need to do the equivalent (but slower) action:
-#        # func_quote_for_eval ${1+"$@"}
-#        # my_options_prep_result=$func_quote_for_eval_result
-#        false
-#    }
-#    func_add_hook func_options_prep my_options_prep
-#
-#
-#    my_silent_option ()
-#    {
-#        $debug_cmd
-#
-#        args_changed=false
-#
-#        # Note that for efficiency, we parse as many options as we can
-#        # recognise in a loop before passing the remainder back to the
-#        # caller on the first unrecognised argument we encounter.
-#        while test $# -gt 0; do
-#          opt=$1; shift
-#          case $opt in
-#            --silent|-s) opt_silent=:
-#                         args_changed=:
-#                         ;;
-#            # Separate non-argument short options:
-#            -s*)         func_split_short_opt "$_G_opt"
-#                         set dummy "$func_split_short_opt_name" \
-#                             "-$func_split_short_opt_arg" ${1+"$@"}
-#                         shift
-#                         args_changed=:
-#                         ;;
-#            *)           # Make sure the first unrecognised option "$_G_opt"
-#                         # is added back to "$@", we could need that later
-#                         # if $args_changed is true.
-#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
-#          esac
-#        done
-#
-#        if $args_changed; then
-#          func_quote_for_eval ${1+"$@"}
-#          my_silent_option_result=$func_quote_for_eval_result
-#        fi
-#
-#        $args_changed
-#    }
-#    func_add_hook func_parse_options my_silent_option
-#
-#
-#    my_option_validation ()
-#    {
-#        $debug_cmd
-#
-#        $opt_silent && $opt_verbose && func_fatal_help "\
-#    '--silent' and '--verbose' options are mutually exclusive."
-#
-#        false
-#    }
-#    func_add_hook func_validate_options my_option_validation
-#
-# You'll also need to manually amend $usage_message to reflect the extra
-# options you parse.  It's preferable to append if you can, so that
-# multiple option parsing hooks can be added safely.
-
-
-# func_options_finish [ARG]...
-# ----------------------------
-# Finishing the option parse loop (call 'func_options' hooks ATM).
-func_options_finish ()
-{
-    $debug_cmd
-
-    _G_func_options_finish_exit=false
-    if func_run_hooks func_options ${1+"$@"}; then
-      func_options_finish_result=$func_run_hooks_result
-      _G_func_options_finish_exit=:
-    fi
-
-    $_G_func_options_finish_exit
-}
-
-
-# func_options [ARG]...
-# ---------------------
-# All the functions called inside func_options are hookable. See the
-# individual implementations for details.
-func_hookable func_options
-func_options ()
-{
-    $debug_cmd
-
-    _G_rc_options=false
-
-    for my_func in options_prep parse_options validate_options options_finish
-    do
-      if eval func_$my_func '${1+"$@"}'; then
-        eval _G_res_var='$'"func_${my_func}_result"
-        eval set dummy "$_G_res_var" ; shift
-        _G_rc_options=:
-      fi
-    done
-
-    # Save modified positional parameters for caller.  As a top-level
-    # options-parser function we always need to set the 'func_options_result'
-    # variable (regardless the $_G_rc_options value).
-    if $_G_rc_options; then
-      func_options_result=$_G_res_var
-    else
-      func_quote_for_eval ${1+"$@"}
-      func_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_options
-}
-
-
-# func_options_prep [ARG]...
-# --------------------------
-# All initialisations required before starting the option parse loop.
-# Note that when calling hook functions, we pass through the list of
-# positional parameters.  If a hook function modifies that list, and
-# needs to propagate that back to rest of this script, then the complete
-# modified list must be put in 'func_run_hooks_result' before
-# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
-func_hookable func_options_prep
-func_options_prep ()
-{
-    $debug_cmd
-
-    # Option defaults:
-    opt_verbose=false
-    opt_warning_types=
-
-    _G_rc_options_prep=false
-    if func_run_hooks func_options_prep ${1+"$@"}; then
-      _G_rc_options_prep=:
-      # save modified positional parameters for caller
-      func_options_prep_result=$func_run_hooks_result
-    fi
-
-    $_G_rc_options_prep
-}
-
-
-# func_parse_options [ARG]...
-# ---------------------------
-# The main option parsing loop.
-func_hookable func_parse_options
-func_parse_options ()
-{
-    $debug_cmd
-
-    func_parse_options_result=
-
-    _G_rc_parse_options=false
-    # this just eases exit handling
-    while test $# -gt 0; do
-      # Defer to hook functions for initial option parsing, so they
-      # get priority in the event of reusing an option name.
-      if func_run_hooks func_parse_options ${1+"$@"}; then
-        eval set dummy "$func_run_hooks_result"; shift
-        _G_rc_parse_options=:
-      fi
-
-      # Break out of the loop if we already parsed every option.
-      test $# -gt 0 || break
-
-      _G_match_parse_options=:
-      _G_opt=$1
-      shift
-      case $_G_opt in
-        --debug|-x)   debug_cmd='set -x'
-                      func_echo "enabling shell trace mode"
-                      $debug_cmd
-                      ;;
-
-        --no-warnings|--no-warning|--no-warn)
-                      set dummy --warnings none ${1+"$@"}
-                      shift
-		      ;;
-
-        --warnings|--warning|-W)
-                      if test $# = 0 && func_missing_arg $_G_opt; then
-                        _G_rc_parse_options=:
-                        break
-                      fi
-                      case " $warning_categories $1" in
-                        *" $1 "*)
-                          # trailing space prevents matching last $1 above
-                          func_append_uniq opt_warning_types " $1"
-                          ;;
-                        *all)
-                          opt_warning_types=$warning_categories
-                          ;;
-                        *none)
-                          opt_warning_types=none
-                          warning_func=:
-                          ;;
-                        *error)
-                          opt_warning_types=$warning_categories
-                          warning_func=func_fatal_error
-                          ;;
-                        *)
-                          func_fatal_error \
-                             "unsupported warning category: '$1'"
-                          ;;
-                      esac
-                      shift
-                      ;;
-
-        --verbose|-v) opt_verbose=: ;;
-        --version)    func_version ;;
-        -\?|-h)       func_usage ;;
-        --help)       func_help ;;
-
-	# Separate optargs to long options (plugins may need this):
-	--*=*)        func_split_equals "$_G_opt"
-	              set dummy "$func_split_equals_lhs" \
-                          "$func_split_equals_rhs" ${1+"$@"}
-                      shift
-                      ;;
-
-       # Separate optargs to short options:
-        -W*)
-                      func_split_short_opt "$_G_opt"
-                      set dummy "$func_split_short_opt_name" \
-                          "$func_split_short_opt_arg" ${1+"$@"}
-                      shift
-                      ;;
-
-        # Separate non-argument short options:
-        -\?*|-h*|-v*|-x*)
-                      func_split_short_opt "$_G_opt"
-                      set dummy "$func_split_short_opt_name" \
-                          "-$func_split_short_opt_arg" ${1+"$@"}
-                      shift
-                      ;;
-
-        --)           _G_rc_parse_options=: ; break ;;
-        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
-        *)            set dummy "$_G_opt" ${1+"$@"}; shift
-                      _G_match_parse_options=false
-                      break
-                      ;;
-      esac
-
-      $_G_match_parse_options && _G_rc_parse_options=:
-    done
-
-
-    if $_G_rc_parse_options; then
-      # save modified positional parameters for caller
-      func_quote_for_eval ${1+"$@"}
-      func_parse_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_parse_options
-}
-
-
-# func_validate_options [ARG]...
-# ------------------------------
-# Perform any sanity checks on option settings and/or unconsumed
-# arguments.
-func_hookable func_validate_options
-func_validate_options ()
-{
-    $debug_cmd
-
-    _G_rc_validate_options=false
-
-    # Display all warnings if -W was not given.
-    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
-
-    if func_run_hooks func_validate_options ${1+"$@"}; then
-      # save modified positional parameters for caller
-      func_validate_options_result=$func_run_hooks_result
-      _G_rc_validate_options=:
-    fi
-
-    # Bail if the options were screwed!
-    $exit_cmd $EXIT_FAILURE
-
-    $_G_rc_validate_options
-}
-
-
-
-## ----------------- ##
-## Helper functions. ##
-## ----------------- ##
-
-# This section contains the helper functions used by the rest of the
-# hookable option parser framework in ascii-betical order.
-
-
-# func_fatal_help ARG...
-# ----------------------
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    $debug_cmd
-
-    eval \$ECHO \""Usage: $usage"\"
-    eval \$ECHO \""$fatal_help"\"
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-
-# func_help
-# ---------
-# Echo long help message to standard output and exit.
-func_help ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "$long_help_message"
-    exit 0
-}
-
-
-# func_missing_arg ARGNAME
-# ------------------------
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $debug_cmd
-
-    func_error "Missing argument for '$1'."
-    exit_cmd=exit
-}
-
-
-# func_split_equals STRING
-# ------------------------
-# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
-# splitting STRING at the '=' sign.
-test -z "$_G_HAVE_XSI_OPS" \
-    && (eval 'x=a/b/c;
-      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
-    && _G_HAVE_XSI_OPS=yes
-
-if test yes = "$_G_HAVE_XSI_OPS"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_split_equals ()
-  {
-      $debug_cmd
-
-      func_split_equals_lhs=${1%%=*}
-      func_split_equals_rhs=${1#*=}
-      test "x$func_split_equals_lhs" = "x$1" \
-        && func_split_equals_rhs=
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_split_equals ()
-  {
-      $debug_cmd
-
-      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
-      func_split_equals_rhs=
-      test "x$func_split_equals_lhs" = "x$1" \
-        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
-  }
-fi #func_split_equals
-
-
-# func_split_short_opt SHORTOPT
-# -----------------------------
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-if test yes = "$_G_HAVE_XSI_OPS"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_split_short_opt ()
-  {
-      $debug_cmd
-
-      func_split_short_opt_arg=${1#??}
-      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_split_short_opt ()
-  {
-      $debug_cmd
-
-      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
-      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
-  }
-fi #func_split_short_opt
-
-
-# func_usage
-# ----------
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
-    exit 0
-}
-
-
-# func_usage_message
-# ------------------
-# Echo short help message to standard output.
-func_usage_message ()
-{
-    $debug_cmd
-
-    eval \$ECHO \""Usage: $usage"\"
-    echo
-    $SED -n 's|^# ||
-        /^Written by/{
-          x;p;x
-        }
-	h
-	/^Written by/q' < "$progpath"
-    echo
-    eval \$ECHO \""$usage_message"\"
-}
-
-
-# func_version
-# ------------
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $debug_cmd
-
-    printf '%s\n' "$progname $scriptversion"
-    $SED -n '
-        /(C)/!b go
-        :more
-        /\./!{
-          N
-          s|\n# | |
-          b more
-        }
-        :go
-        /^# Written by /,/# warranty; / {
-          s|^# ||
-          s|^# *$||
-          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
-          p
-        }
-        /^# Written by / {
-          s|^# ||
-          p
-        }
-        /^warranty; /q' < "$progpath"
-
-    exit $?
-}
-
-
-# Local variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
-# time-stamp-time-zone: "UTC"
-# End:
-
-# Set a version string.
-scriptversion='(GNU libtool) 2.4.6'
-
-
-# func_echo ARG...
-# ----------------
-# Libtool also displays the current mode in messages, so override
-# funclib.sh func_echo with this custom definition.
-func_echo ()
-{
-    $debug_cmd
-
-    _G_message=$*
-
-    func_echo_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_IFS
-      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
-    done
-    IFS=$func_echo_IFS
-}
-
-
-# func_warning ARG...
-# -------------------
-# Libtool warnings are not categorized, so override funclib.sh
-# func_warning with this simpler definition.
-func_warning ()
-{
-    $debug_cmd
-
-    $warning_func ${1+"$@"}
-}
-
-
-## ---------------- ##
-## Options parsing. ##
-## ---------------- ##
-
-# Hook in the functions to make sure our own options are parsed during
-# the option parsing loop.
-
-usage='$progpath [OPTION]... [MODE-ARG]...'
-
-# Short help message in response to '-h'.
-usage_message="Options:
-       --config             show all configuration variables
-       --debug              enable verbose shell tracing
-   -n, --dry-run            display commands without modifying any files
-       --features           display basic configuration information and exit
-       --mode=MODE          use operation mode MODE
-       --no-warnings        equivalent to '-Wnone'
-       --preserve-dup-deps  don't remove duplicate dependency libraries
-       --quiet, --silent    don't print informational messages
-       --tag=TAG            use configuration variables from tag TAG
-   -v, --verbose            print more informational messages than default
-       --version            print version information
-   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
-   -h, --help, --help-all   print short, long, or detailed help message
-"
-
-# Additional text appended to 'usage_message' in response to '--help'.
-func_help ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "$long_help_message
-
-MODE must be one of the following:
-
-       clean           remove files from the build directory
-       compile         compile a source file into a libtool object
-       execute         automatically set library path, then run a program
-       finish          complete the installation of libtool libraries
-       install         install libraries or executables
-       link            create a library or an executable
-       uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  When passed as first option,
-'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
-Try '$progname --help --mode=MODE' for a more detailed description of MODE.
-
-When reporting a bug, please describe a test case to reproduce it and
-include the following information:
-
-       host-triplet:   $host
-       shell:          $SHELL
-       compiler:       $LTCC
-       compiler flags: $LTCFLAGS
-       linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-15
-       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
-       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
-
-Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <http://www.gnu.org/s/libtool/>.
-General help using GNU software: <http://www.gnu.org/gethelp/>."
-    exit 0
-}
-
-
-# func_lo2o OBJECT-NAME
-# ---------------------
-# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
-# object suffix.
-
-lo2o=s/\\.lo\$/.$objext/
-o2lo=s/\\.$objext\$/.lo/
-
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_lo2o ()
-  {
-    case $1 in
-      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
-      *   ) func_lo2o_result=$1               ;;
-    esac
-  }'
-
-  # func_xform LIBOBJ-OR-SOURCE
-  # ---------------------------
-  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
-  # suffix to a '.lo' libtool-object suffix.
-  eval 'func_xform ()
-  {
-    func_xform_result=${1%.*}.lo
-  }'
-else
-  # ...otherwise fall back to using sed.
-  func_lo2o ()
-  {
-    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
-  }
-
-  func_xform ()
-  {
-    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
-  }
-fi
-
-
-# func_fatal_configuration ARG...
-# -------------------------------
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func__fatal_error ${1+"$@"} \
-      "See the $PACKAGE documentation for more information." \
-      "Fatal configuration error."
-}
-
-
-# func_config
-# -----------
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-
-# func_features
-# -------------
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test yes = "$build_libtool_libs"; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test yes = "$build_old_libs"; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-
-# func_enable_tag TAGNAME
-# -----------------------
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-    # Global variable:
-    tagname=$1
-
-    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-    sed_extractcf=/$re_begincf/,/$re_endcf/p
-
-    # Validate tagname.
-    case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-        func_fatal_error "invalid tag name: $tagname"
-        ;;
-    esac
-
-    # Don't test for the "default" C tag, as we know it's
-    # there but not specially marked.
-    case $tagname in
-        CC) ;;
-    *)
-        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	  taglist="$taglist $tagname"
-
-	  # Evaluate the configuration.  Be careful to quote the path
-	  # and the sed script, to avoid splitting on whitespace, but
-	  # also don't use non-portable quotes within backquotes within
-	  # quotes we have to do it in 2 steps:
-	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	  eval "$extractedcf"
-        else
-	  func_error "ignoring unknown tag $tagname"
-        fi
-        ;;
-    esac
-}
-
-
-# func_check_version_match
-# ------------------------
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-    if test "$package_revision" != "$macro_revision"; then
-      if test "$VERSION" != "$macro_version"; then
-        if test -z "$macro_version"; then
-          cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-        else
-          cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-        fi
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-      fi
-
-      exit $EXIT_MISMATCH
-    fi
-}
-
-
-# libtool_options_prep [ARG]...
-# -----------------------------
-# Preparation for options parsed by libtool.
-libtool_options_prep ()
-{
-    $debug_mode
-
-    # Option defaults:
-    opt_config=false
-    opt_dlopen=
-    opt_dry_run=false
-    opt_help=false
-    opt_mode=
-    opt_preserve_dup_deps=false
-    opt_quiet=false
-
-    nonopt=
-    preserve_args=
-
-    _G_rc_lt_options_prep=:
-
-    # Shorthand for --mode=foo, only valid as the first argument
-    case $1 in
-    clean|clea|cle|cl)
-      shift; set dummy --mode clean ${1+"$@"}; shift
-      ;;
-    compile|compil|compi|comp|com|co|c)
-      shift; set dummy --mode compile ${1+"$@"}; shift
-      ;;
-    execute|execut|execu|exec|exe|ex|e)
-      shift; set dummy --mode execute ${1+"$@"}; shift
-      ;;
-    finish|finis|fini|fin|fi|f)
-      shift; set dummy --mode finish ${1+"$@"}; shift
-      ;;
-    install|instal|insta|inst|ins|in|i)
-      shift; set dummy --mode install ${1+"$@"}; shift
-      ;;
-    link|lin|li|l)
-      shift; set dummy --mode link ${1+"$@"}; shift
-      ;;
-    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-      shift; set dummy --mode uninstall ${1+"$@"}; shift
-      ;;
-    *)
-      _G_rc_lt_options_prep=false
-      ;;
-    esac
-
-    if $_G_rc_lt_options_prep; then
-      # Pass back the list of options.
-      func_quote_for_eval ${1+"$@"}
-      libtool_options_prep_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_lt_options_prep
-}
-func_add_hook func_options_prep libtool_options_prep
-
-
-# libtool_parse_options [ARG]...
-# ---------------------------------
-# Provide handling for libtool specific options.
-libtool_parse_options ()
-{
-    $debug_cmd
-
-    _G_rc_lt_parse_options=false
-
-    # Perform our own loop to consume as many options as possible in
-    # each iteration.
-    while test $# -gt 0; do
-      _G_match_lt_parse_options=:
-      _G_opt=$1
-      shift
-      case $_G_opt in
-        --dry-run|--dryrun|-n)
-                        opt_dry_run=:
-                        ;;
-
-        --config)       func_config ;;
-
-        --dlopen|-dlopen)
-                        opt_dlopen="${opt_dlopen+$opt_dlopen
-}$1"
-                        shift
-                        ;;
-
-        --preserve-dup-deps)
-                        opt_preserve_dup_deps=: ;;
-
-        --features)     func_features ;;
-
-        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
-
-        --help)         opt_help=: ;;
-
-        --help-all)     opt_help=': help-all' ;;
-
-        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
-                        opt_mode=$1
-                        case $1 in
-                          # Valid mode arguments:
-                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-                          # Catch anything else as an error
-                          *) func_error "invalid argument for $_G_opt"
-                             exit_cmd=exit
-                             break
-                             ;;
-                        esac
-                        shift
-                        ;;
-
-        --no-silent|--no-quiet)
-                        opt_quiet=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --no-warnings|--no-warning|--no-warn)
-                        opt_warning=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --no-verbose)
-                        opt_verbose=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --silent|--quiet)
-                        opt_quiet=:
-                        opt_verbose=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
-                        opt_tag=$1
-                        func_append preserve_args " $_G_opt $1"
-                        func_enable_tag "$1"
-                        shift
-                        ;;
-
-        --verbose|-v)   opt_quiet=false
-                        opt_verbose=:
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        # An option not handled by this hook function:
-        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
-                        _G_match_lt_parse_options=false
-                        break
-                        ;;
-      esac
-      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
-    done
-
-    if $_G_rc_lt_parse_options; then
-      # save modified positional parameters for caller
-      func_quote_for_eval ${1+"$@"}
-      libtool_parse_options_result=$func_quote_for_eval_result
-    fi
-
-    $_G_rc_lt_parse_options
-}
-func_add_hook func_parse_options libtool_parse_options
-
-
-
-# libtool_validate_options [ARG]...
-# ---------------------------------
-# Perform any sanity checks on option settings and/or unconsumed
-# arguments.
-libtool_validate_options ()
-{
-    # save first non-option argument
-    if test 0 -lt $#; then
-      nonopt=$1
-      shift
-    fi
-
-    # preserve --debug
-    test : = "$debug_cmd" || func_append preserve_args " --debug"
-
-    case $host in
-      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
-      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
-      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
-        # don't eliminate duplications in $postdeps and $predeps
-        opt_duplicate_compiler_generated_deps=:
-        ;;
-      *)
-        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-        ;;
-    esac
-
-    $opt_help || {
-      # Sanity checks first:
-      func_check_version_match
-
-      test yes != "$build_libtool_libs" \
-        && test yes != "$build_old_libs" \
-        && func_fatal_configuration "not configured to build any kind of library"
-
-      # Darwin sucks
-      eval std_shrext=\"$shrext_cmds\"
-
-      # Only execute mode is allowed to have -dlopen flags.
-      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
-        func_error "unrecognized option '-dlopen'"
-        $ECHO "$help" 1>&2
-        exit $EXIT_FAILURE
-      fi
-
-      # Change the help message to a mode-specific one.
-      generic_help=$help
-      help="Try '$progname --help --mode=$opt_mode' for more information."
-    }
-
-    # Pass back the unparsed argument list
-    func_quote_for_eval ${1+"$@"}
-    libtool_validate_options_result=$func_quote_for_eval_result
-}
-func_add_hook func_validate_options libtool_validate_options
-
-
-# Process options as early as possible so that --help and --version
-# can return quickly.
-func_options ${1+"$@"}
-eval set dummy "$func_options_result"; shift
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-magic='%%%MAGIC variable%%%'
-magic_exe='%%%MAGIC EXE variable%%%'
-
-# Global variables.
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# func_generated_by_libtool
-# True iff stdin has been generated by Libtool. This function is only
-# a basic sanity check; it will hardly flush out determined imposters.
-func_generated_by_libtool_p ()
-{
-  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_p file
-# True iff FILE is a libtool '.la' library or '.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool '.la' library or '.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if 'file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case $lalib_p_line in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test yes = "$lalib_p"
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    test -f "$1" &&
-      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $debug_cmd
-
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$sp$nl
-      eval cmd=\"$cmd\"
-      IFS=$save_ifs
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# 'FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $debug_cmd
-
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case $lt_sysroot:$1 in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result='='$func_stripname_result
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $debug_cmd
-
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with '--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=$1
-    if test yes = "$build_libtool_libs"; then
-      write_lobj=\'$2\'
-    else
-      write_lobj=none
-    fi
-
-    if test yes = "$build_old_libs"; then
-      write_oldobj=\'$3\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "$write_libobj"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
-  $debug_cmd
-
-  func_convert_core_file_wine_to_w32_result=$1
-  if test -n "$1"; then
-    # Unfortunately, winepath does not exit with a non-zero error code, so we
-    # are forced to check the contents of stdout. On the other hand, if the
-    # command is not found, the shell will set an exit code of 127 and print
-    # *an error message* to stdout. So we must check for both error code of
-    # zero AND non-empty stdout, which explains the odd construction:
-    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $debug_cmd
-
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result"; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $debug_cmd
-
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $debug_cmd
-
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $debug_cmd
-
-  if test -z "$2" && test -n "$1"; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  '$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result=$1
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $debug_cmd
-
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  '$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result=$3
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $debug_cmd
-
-  case $4 in
-  $1 ) func_to_host_path_result=$3$func_to_host_path_result
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via '$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $debug_cmd
-
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $debug_cmd
-
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result=$1
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result=$func_convert_core_msys_to_w32_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result=$func_cygpath_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result=$func_cygpath_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via '$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $debug_cmd
-
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd=func_convert_path_$func_stripname_result
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $debug_cmd
-
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result=$1
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result=$func_convert_core_msys_to_w32_result
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result=$func_cygpath_result
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result=$func_cygpath_result
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_dll_def_p FILE
-# True iff FILE is a Windows DLL '.def' file.
-# Keep in sync with _LT_DLL_DEF_P in libtool.m4
-func_dll_def_p ()
-{
-  $debug_cmd
-
-  func_dll_def_p_tmp=`$SED -n \
-    -e 's/^[	 ]*//' \
-    -e '/^\(;.*\)*$/d' \
-    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
-    -e q \
-    "$1"`
-  test DEF = "$func_dll_def_p_tmp"
-}
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $debug_cmd
-
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg=$arg
-	arg_mode=normal
-	;;
-
-      target )
-	libobj=$arg
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify '-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs=$IFS; IFS=,
-	  for arg in $args; do
-	    IFS=$save_ifs
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS=$save_ifs
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg=$srcfile
-	  srcfile=$arg
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with '-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj=$func_basename_result
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from '$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test yes = "$build_libtool_libs" \
-	  || func_fatal_configuration "cannot build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name '$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname=$func_basename_result
-    xdir=$func_dirname_result
-    lobj=$xdir$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test yes = "$build_old_libs"; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test no = "$compiler_c_o"; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
-      lockfile=$output_obj.lock
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test yes = "$need_locks"; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test warn = "$need_locks"; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test yes = "$build_libtool_libs"; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test no != "$pic_mode"; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test warn = "$need_locks" &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test yes = "$suppress_opt"; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test yes = "$build_old_libs"; then
-      if test yes != "$pic_mode"; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test yes = "$compiler_c_o"; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test warn = "$need_locks" &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test no != "$need_locks"; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a '.o' file suitable for static linking
-  -static           only build a '.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a 'standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix '.c' with the
-library object suffix, '.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to '-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the '--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the 'install' or 'cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  use a list of object files found in FILE to specify objects
-  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with '-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in '.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in '.la', then a libtool library is created,
-only library objects ('.lo' files) may be specified, and '-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
-using 'ar' and 'ranlib', or on Windows using 'lib'.
-
-If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode '$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try '$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test : = "$opt_help"; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    $SED '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $debug_cmd
-
-    # The first argument is the command name.
-    cmd=$nonopt
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-	|| func_fatal_help "'$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "'$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "'$file' was not linked with '-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir=$func_dirname_result
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  func_append dir "/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir=$func_dirname_result
-	;;
-
-      *)
-	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir=$absdir
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic=$magic
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file=$progdir/$program
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file=$progdir/$program
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if $opt_dry_run; then
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    else
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd=\$cmd$args
-    fi
-}
-
-test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $debug_cmd
-
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "'$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument '$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_quiet && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the '$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the '$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $debug_cmd
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac
-    then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=false
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	func_append files " $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=: ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the '$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=:
-    if $isdir; then
-      destdir=$dest
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir=$func_dirname_result
-      destname=$func_basename_result
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "'$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "'$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic=$magic
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	func_append staticlibs " $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "'$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir=$func_dirname_result
-	func_append dir "$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking '$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname=$1
-	  shift
-
-	  srcname=$realname
-	  test -n "$relink_command" && srcname=${realname}T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme=$stripme
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=
-	      ;;
-	    esac
-	    ;;
-	  os2*)
-	    case $realname in
-	    *_dll.a)
-	      tstripme=
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try 'ln -sf' first, because the 'ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib=$destdir/$realname
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name=$func_basename_result
-	instname=$dir/${name}i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile=$destdir/$destname
-	else
-	  func_basename "$file"
-	  destfile=$func_basename_result
-	  destfile=$destdir/$destfile
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest=$destfile
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to '$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test yes = "$build_old_libs"; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile=$destdir/$destname
-	else
-	  func_basename "$file"
-	  destfile=$func_basename_result
-	  destfile=$destdir/$destfile
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=.exe
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
-
-	  finalize=:
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "'$lib' has not been installed in '$libdir'"
-	      finalize=false
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test no = "$fast_install" && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if $finalize; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file=$func_basename_result
-	        outputname=$tmpdir/$file
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_quiet || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink '$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file=$outputname
-	      else
-	        func_warning "cannot relink '$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name=$func_basename_result
-
-      # Set up the ranlib parameters.
-      oldlib=$destdir/$name
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run '$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test install = "$opt_mode" && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $debug_cmd
-
-    my_outputname=$1
-    my_originator=$2
-    my_pic_p=${3-false}
-    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms=${my_outputname}S.c
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist=$output_objdir/$my_outputname.nm
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test yes = "$dlself"; then
-	  func_verbose "generating symbol list for '$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols=$output_objdir/$outputname.exp
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from '$dlprefile'"
-	  func_basename "$dlprefile"
-	  name=$func_basename_result
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname"; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename=$func_basename_result
-	          else
-	            # no lafile. user explicitly requested -dlpreopen <import library>.
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename"; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  func_show_eval '$RM "${nlist}I"'
-	  if test -n "$global_symbol_to_import"; then
-	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];\
-"
-
-	  if test -s "$nlist"I; then
-	    echo >> "$output_objdir/$my_dlsyms" "\
-static void lt_syminit(void)
-{
-  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
-  for (; symbol->name; ++symbol)
-    {"
-	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
-	    echo >> "$output_objdir/$my_dlsyms" "\
-    }
-}"
-	  fi
-	  echo >> "$output_objdir/$my_dlsyms" "\
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{ {\"$my_originator\", (void *) 0},"
-
-	  if test -s "$nlist"I; then
-	    echo >> "$output_objdir/$my_dlsyms" "\
-  {\"@INIT@\", (void *) &lt_syminit},"
-	  fi
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj=$output_objdir/${my_outputname}S.$objext
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for '$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $debug_cmd
-
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $debug_cmd
-
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $debug_cmd
-
-  win32_libid_type=unknown
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      case $nm_interface in
-      "MS dumpbin")
-	if func_cygming_ms_implib_p "$1" ||
-	   func_cygming_gnu_implib_p "$1"
-	then
-	  win32_nmres=import
-	else
-	  win32_nmres=
-	fi
-	;;
-      *)
-	func_to_tool_file "$1" func_convert_file_msys_to_w32
-	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	  $SED -n -e '
-	    1,100{
-		/ I /{
-		    s|.*|import|
-		    p
-		    q
-		}
-	    }'`
-	;;
-      esac
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $debug_cmd
-
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $debug_cmd
-
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive that possess that section. Heuristic: eliminate
-    # all those that have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $debug_cmd
-
-  if func_cygming_gnu_implib_p "$1"; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1"; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $debug_cmd
-
-    f_ex_an_ar_dir=$1; shift
-    f_ex_an_ar_oldlib=$1
-    if test yes = "$lock_old_archive_extraction"; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test yes = "$lock_old_archive_extraction"; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $debug_cmd
-
-    my_gentop=$1; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=
-    my_xlib=
-    my_xabs=
-    my_xdir=
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib=$func_basename_result
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir=$my_gentop/$my_xlib_u
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  func_basename "$darwin_archive"
-	  darwin_base_archive=$func_basename_result
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches; do
-	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
-	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
-	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result=$my_oldobjs
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory where it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ that is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options that match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test yes = "$fast_install"; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	\$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-*/
-EOF
-	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
-
-/* declarations of non-ANSI functions */
-#if defined __MINGW32__
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined __CYGWIN__
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined other_platform || defined ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined _MSC_VER
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-#elif defined __MINGW32__
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined __CYGWIN__
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined other platforms ... */
-#endif
-
-#if defined PATH_MAX
-# define LT_PATHMAX PATH_MAX
-#elif defined MAXPATHLEN
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
-  defined __OS2__
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free (stale); stale = 0; } \
-} while (0)
-
-#if defined LT_DEBUGWRAPPER
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <<EOF
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
-# define externally_visible volatile
-#else
-# define externally_visible __attribute__((externally_visible)) volatile
-#endif
-externally_visible const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_path "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test yes = "$fast_install"; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  int rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, (size_t) argc + 1);
-
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (STREQ (argv[i], dumpscript_opt))
-	{
-EOF
-	    case $host in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  lt_dump_script (stdout);
-	  return 0;
-	}
-      if (STREQ (argv[i], debug_opt))
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (STREQ (argv[i], ltwrapper_option_prefix))
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-EOF
-	    cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
-  for (i = 0; i < newargc; i++)
-    {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-		      i, nonnull (newargz[i]));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  newargz = prepare_spawn (newargz);
-  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  size_t tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = (size_t) (q - p);
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (STREQ (str, pat))
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    size_t len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      size_t orig_value_len = strlen (orig_value);
-      size_t add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      size_t len = strlen (new_value);
-      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[--len] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $debug_cmd
-
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_suncc_cstd_abi
-# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
-# Several compiler flags select an ABI that is incompatible with the
-# Cstd library. Avoid specifying it if any are in CXXFLAGS.
-func_suncc_cstd_abi ()
-{
-    $debug_cmd
-
-    case " $compile_command " in
-    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
-      suncc_use_cstd_abi=no
-      ;;
-    *)
-      suncc_use_cstd_abi=yes
-      ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $debug_cmd
-
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # what system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll that has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    os2dllname=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=false
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module=$wl-single_module
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test yes != "$build_libtool_libs" \
-	  && func_fatal_configuration "cannot build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg=$1
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir=$arg
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  $preload || {
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=:
-	  }
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test no = "$dlself"; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test dlprefiles = "$prev"; then
-	      dlself=yes
-	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test dlfiles = "$prev"; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols=$arg
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file '$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex=$arg
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir=$arg
-	  prev=
-	  continue
-	  ;;
-	mllvm)
-	  # Clang does not use LLVM to link, so we can simply discard any
-	  # '-mllvm $arg' options when doing the link step.
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      func_append moreargs " $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test none = "$pic_object" &&
-		   test none = "$non_pic_object"; then
-		  func_fatal_error "cannot find name of object for '$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir=$func_dirname_result
-
-		if test none != "$pic_object"; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object=$xdir$pic_object
-
-		  if test dlfiles = "$prev"; then
-		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
-		      func_append dlfiles " $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test dlprefiles = "$prev"; then
-		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg=$pic_object
-		fi
-
-		# Non-PIC object.
-		if test none != "$non_pic_object"; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object=$xdir$non_pic_object
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test none = "$pic_object"; then
-		    arg=$non_pic_object
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object=$pic_object
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir=$func_dirname_result
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "'$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file '$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	os2dllname)
-	  os2dllname=$arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex=$arg
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release=-$arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test rpath = "$prev"; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds=$arg
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  func_append weak_libs " $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg=$arg
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "'-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test X-export-symbols = "X$arg"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between '-L' and '$1'"
-	  else
-	    func_fatal_error "need path for '-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of '$dir'"
-	  dir=$absdir
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  esac
-	elif test X-lc_r = "X$arg"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -mllvm)
-	prev=mllvm
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module=$wl-multi_module
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "'-no-install' is ignored for $host"
-	  func_warning "assuming '-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -os2dllname)
-	prev=os2dllname
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs=$IFS; IFS=,
-	for flag in $args; do
-	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
-	done
-	IFS=$save_ifs
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs=$IFS; IFS=,
-	for flag in $args; do
-	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
-	done
-	IFS=$save_ifs
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # -fstack-protector*   stack protector flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      # -specs=*             GCC specs files
-      # -stdlib=*            select c++ std lib with clang
-      # -fsanitize=*         Clang/GCC memory and address sanitizer
-      # -fuse-ld=*           Linker select flags for GCC
-      # -static-*            direct GCC to link specific libraries statically
-      # -fcilkplus           Cilk Plus language extension features for C/C++
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-      -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      -Z*)
-        if test os2 = "`expr $host : '.*\(os2\)'`"; then
-          # OS/2 uses -Zxxx to specify OS/2-specific options
-	  compiler_flags="$compiler_flags $arg"
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  case $arg in
-	  -Zlinker | -Zstack)
-	    prev=xcompiler
-	    ;;
-	  esac
-	  continue
-        else
-	  # Otherwise treat like 'Some other compiler flag' below
-	  func_quote_for_eval "$arg"
-	  arg=$func_quote_for_eval_result
-        fi
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
-	;;
-
-      *.$objext)
-	# A standard object.
-	func_append objs " $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test none = "$pic_object" &&
-	     test none = "$non_pic_object"; then
-	    func_fatal_error "cannot find name of object for '$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir=$func_dirname_result
-
-	  test none = "$pic_object" || {
-	    # Prepend the subdirectory the object is found in.
-	    pic_object=$xdir$pic_object
-
-	    if test dlfiles = "$prev"; then
-	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
-		func_append dlfiles " $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test dlprefiles = "$prev"; then
-	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg=$pic_object
-	  }
-
-	  # Non-PIC object.
-	  if test none != "$non_pic_object"; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object=$xdir$non_pic_object
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test none = "$pic_object"; then
-	      arg=$non_pic_object
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object=$pic_object
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir=$func_dirname_result
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "'$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test dlfiles = "$prev"; then
-	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test dlprefiles = "$prev"; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the '$prevarg' option requires an argument"
-
-    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname=$func_basename_result
-    libobjs_save=$libobjs
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    # Definition is injected by LT_CONFIG during libtool generation.
-    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
-
-    func_dirname "$output" "/" ""
-    output_objdir=$func_dirname_result$objdir
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps; then
-	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test lib = "$linkmode"; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-	  esac
-	  func_append pre_post_deps " $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=false
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test lib,link = "$linkmode,$pass"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs=$tmp_deplibs
-      fi
-
-      if test lib,link = "$linkmode,$pass" ||
-	 test prog,scan = "$linkmode,$pass"; then
-	libs=$deplibs
-	deplibs=
-      fi
-      if test prog = "$linkmode"; then
-	case $pass in
-	dlopen) libs=$dlfiles ;;
-	dlpreopen) libs=$dlprefiles ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test lib,dlpreopen = "$linkmode,$pass"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
-	    esac
-	  done
-	done
-	libs=$dlprefiles
-      fi
-      if test dlopen = "$pass"; then
-	# Collect dlpreopened libraries
-	save_deplibs=$deplibs
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=false
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    func_append compiler_flags " $deplib"
-	    if test lib = "$linkmode"; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test lib != "$linkmode" && test prog != "$linkmode"; then
-	    func_warning "'-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test lib = "$linkmode"; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib=$searchdir/lib$name$search_ext
-	      if test -f "$lib"; then
-		if test .la = "$search_ext"; then
-		  found=:
-		else
-		  found=false
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if $found; then
-	    # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll=$l
-		  done
-		  if test "X$ll" = "X$old_library"; then # only static version available
-		    found=false
-		    func_dirname "$lib" "" "."
-		    ladir=$func_dirname_result
-		    lib=$ladir/$old_library
-		    if test prog,link = "$linkmode,$pass"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  else
-	    # deplib doesn't seem to be a libtool library
-	    if test prog,link = "$linkmode,$pass"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test lib = "$linkmode"; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test conv = "$pass" && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  prog)
-	    if test conv = "$pass"; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test scan = "$pass"; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "'-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test link = "$pass"; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test conv = "$pass"; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=false
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=:
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=:
-		;;
-	      esac
-	      if $valid_a_lib; then
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      else
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test link != "$pass"; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test conv = "$pass"; then
-	    deplibs="$deplib $deplibs"
-	  elif test prog = "$linkmode"; then
-	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      func_append newdlfiles " $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=:
-	  continue
-	  ;;
-	esac # case $deplib
-
-	$found || test -f "$lib" \
-	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "'$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir=$func_dirname_result
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test lib,link = "$linkmode,$pass" ||
-	   test prog,scan = "$linkmode,$pass" ||
-	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-	fi
-
-	if test conv = "$pass"; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for '$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps; then
-		case "$tmp_libs " in
-		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-		esac
-	      fi
-	      func_append tmp_libs " $deplib"
-	    done
-	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
-	    func_fatal_error "'$lib' is not a convenience library"
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	if test -n "$old_library" &&
-	   { test yes = "$prefer_static_libs" ||
-	     test built,no = "$prefer_static_libs,$installed"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib=$l
-	  done
-	fi
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for '$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test dlopen = "$pass"; then
-	  test -z "$libdir" \
-	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
-	  if test -z "$dlname" ||
-	     test yes != "$dlopen_support" ||
-	     test no = "$build_libtool_libs"
-	  then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
-	  else
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of '$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir=$ladir
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname=$func_basename_result
-
-	# Find the relevant object directory and library name.
-	if test yes = "$installed"; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library '$lib' was moved."
-	    dir=$ladir
-	    absdir=$abs_ladir
-	    libdir=$abs_ladir
-	  else
-	    dir=$lt_sysroot$libdir
-	    absdir=$lt_sysroot$libdir
-	  fi
-	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir=$ladir
-	    absdir=$abs_ladir
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  else
-	    dir=$ladir/$objdir
-	    absdir=$abs_ladir/$objdir
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test dlpreopen = "$pass"; then
-	  if test -z "$libdir" && test prog = "$linkmode"; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
-	  fi
-	  case $host in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test lib = "$linkmode"; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test prog = "$linkmode" && test link != "$pass"; then
-	  func_append newlib_search_path " $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=false
-	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
-	     test no = "$build_libtool_libs"; then
-	    linkalldeplibs=:
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if $linkalldeplibs; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test prog,link = "$linkmode,$pass"; then
-	  if test -n "$library_names" &&
-	     { { test no = "$prefer_static_libs" ||
-	         test built,yes = "$prefer_static_libs,$installed"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
-	      # Make sure the rpath contains only unique directories.
-	      case $temp_rpath: in
-	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if $alldeplibs &&
-	     { test pass_all = "$deplibs_check_method" ||
-	       { test yes = "$build_libtool_libs" &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test built = "$use_static_libs" && test yes = "$installed"; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* | *os2*)
-	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test no = "$installed"; then
-	      func_append notinst_deplibs " $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule=$dlpremoduletest
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
-	    echo
-	    if test prog = "$linkmode"; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test lib = "$linkmode" &&
-	     test yes = "$hardcode_into_libs"; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname=$1
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname=$dlname
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc* | *os2*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix=-$major
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname=$realname
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot=$soname
-	    func_basename "$soroot"
-	    soname=$func_basename_result
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from '$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for '$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test no = "$hardcode_direct"; then
-		add=$dir/$linklib
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
-		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir=-L$dir ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we cannot
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library"; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add=$dir/$old_library
-			fi
-		      elif test -n "$old_library"; then
-			add=$dir/$old_library
-		      fi
-		    fi
-		esac
-	      elif test no = "$hardcode_minus_L"; then
-		case $host in
-		*-*-sunos*) add_shlibpath=$dir ;;
-		esac
-		add_dir=-L$dir
-		add=-l$name
-	      elif test no = "$hardcode_shlibpath_var"; then
-		add_shlibpath=$dir
-		add=-l$name
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test yes = "$hardcode_direct" &&
-	         test no = "$hardcode_direct_absolute"; then
-		add=$dir/$linklib
-	      elif test yes = "$hardcode_minus_L"; then
-		add_dir=-L$absdir
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add=-l$name
-	      elif test yes = "$hardcode_shlibpath_var"; then
-		add_shlibpath=$dir
-		add=-l$name
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test yes != "$lib_linked"; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test prog = "$linkmode"; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test yes != "$hardcode_direct" &&
-		 test yes != "$hardcode_minus_L" &&
-		 test yes = "$hardcode_shlibpath_var"; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test yes = "$hardcode_direct" &&
-	       test no = "$hardcode_direct_absolute"; then
-	      add=$libdir/$linklib
-	    elif test yes = "$hardcode_minus_L"; then
-	      add_dir=-L$libdir
-	      add=-l$name
-	    elif test yes = "$hardcode_shlibpath_var"; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
-	      esac
-	      add=-l$name
-	    elif test yes = "$hardcode_automatic"; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib"; then
-		add=$inst_prefix_dir$libdir/$linklib
-	      else
-		add=$libdir/$linklib
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir=-L$libdir
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add=-l$name
-	    fi
-
-	    if test prog = "$linkmode"; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test prog = "$linkmode"; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test unsupported != "$hardcode_direct"; then
-	    test -n "$old_library" && linklib=$old_library
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test yes = "$build_libtool_libs"; then
-	  # Not a shared library
-	  if test pass_all != "$deplibs_check_method"; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    echo
-	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test yes = "$module"; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** 'nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test no = "$build_old_libs"; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test lib = "$linkmode"; then
-	  if test -n "$dependency_libs" &&
-	     { test yes != "$hardcode_into_libs" ||
-	       test yes = "$build_old_libs" ||
-	       test yes = "$link_static"; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    dependency_libs=$temp_deplibs
-	  fi
-
-	  func_append newlib_search_path " $absdir"
-	  # Link against this library
-	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
-	  done
-
-	  if test no != "$link_all_deplibs"; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path=$deplib ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of '$dir'"
-		    absdir=$dir
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names"; then
-		    for tmp in $deplibrary_names; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl"; then
-		      depdepl=$absdir/$objdir/$depdepl
-		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
-		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path=-L$absdir/$objdir
-		  ;;
-		esac
-		else
-		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "'$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "'$deplib' seems to be moved"
-
-		  path=-L$absdir
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test link = "$pass"; then
-	if test prog = "$linkmode"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs=$newdependency_libs
-      if test dlpreopen = "$pass"; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test dlopen != "$pass"; then
-	test conv = "$pass" || {
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	}
-
-	if test prog,link = "$linkmode,$pass"; then
-	  vars="compile_deplibs finalize_deplibs"
-	else
-	  vars=deplibs
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-
-      # Add Sun CC postdeps if required:
-      test CXX = "$tagname" && {
-        case $host_os in
-        linux*)
-          case `$CC -V 2>&1 | sed 5q` in
-          *Sun\ C*) # Sun C++ 5.9
-            func_suncc_cstd_abi
-
-            if test no != "$suncc_use_cstd_abi"; then
-              func_append postdeps ' -library=Cstd -library=Crun'
-            fi
-            ;;
-          esac
-          ;;
-
-        solaris*)
-          func_cc_basename "$CC"
-          case $func_cc_basename_result in
-          CC* | sunCC*)
-            func_suncc_cstd_abi
-
-            if test no != "$suncc_use_cstd_abi"; then
-              func_append postdeps ' -library=Cstd -library=Crun'
-            fi
-            ;;
-          esac
-          ;;
-        esac
-      }
-
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=
-	  ;;
-	esac
-	if test -n "$i"; then
-	  func_append tmp_libs " $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test prog = "$linkmode"; then
-      dlfiles=$newdlfiles
-    fi
-    if test prog = "$linkmode" || test lib = "$linkmode"; then
-      dlprefiles=$newdlprefiles
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-	func_warning "'-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "'-l' and '-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "'-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "'-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "'-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "'-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs=$output
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form 'libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test no = "$module" \
-	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
-
-	if test no != "$need_lib_prefix"; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test pass_all != "$deplibs_check_method"; then
-	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test no = "$dlself" \
-	|| func_warning "'-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test 1 -lt "$#" \
-	&& func_warning "ignoring multiple '-rpath's for a libtool library"
-
-      install_libdir=$1
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test yes = "$build_libtool_libs"; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a '.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "'-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs=$IFS; IFS=:
-	set dummy $vinfo 0 0 0
-	shift
-	IFS=$save_ifs
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to '-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major=$1
-	  number_minor=$2
-	  number_revision=$3
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # that has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
-	  darwin|freebsd-elf|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age=$number_minor
-	    revision=$number_revision
-	    ;;
-	  freebsd-aout|qnx|sunos)
-	    current=$number_major
-	    revision=$number_minor
-	    age=0
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age=$number_minor
-	    revision=$number_minor
-	    lt_irix_increment=no
-	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current=$1
-	  revision=$2
-	  age=$3
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT '$current' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION '$revision' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE '$age' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE '$age' is greater than the current interface number '$current'"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-          # On Darwin other compilers
-          case $CC in
-              nagfor*)
-                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
-                  ;;
-              *)
-                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-                  ;;
-          esac
-	  ;;
-
-	freebsd-aout)
-	  major=.$current
-	  versuffix=.$current.$revision
-	  ;;
-
-	freebsd-elf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  ;;
-
-	irix | nonstopux)
-	  if test no = "$lt_irix_increment"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring=$verstring_prefix$major.$revision
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test 0 -ne "$loop"; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring=$verstring_prefix$major.$iface:$verstring
-	  done
-
-	  # Before this point, $major must not contain '.'.
-	  major=.$major
-	  versuffix=$major.$revision
-	  ;;
-
-	linux) # correct to gnu/linux during the next big refactor
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=.$current.$age.$revision
-	  verstring=$current.$age.$revision
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test 0 -ne "$loop"; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring=$verstring:$iface.0
-	  done
-
-	  # Make executables depend on our current version.
-	  func_append verstring ":$current.0"
-	  ;;
-
-	qnx)
-	  major=.$current
-	  versuffix=.$current
-	  ;;
-
-	sco)
-	  major=.$current
-	  versuffix=.$current
-	  ;;
-
-	sunos)
-	  major=.$current
-	  versuffix=.$current.$revision
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 file systems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix=-$major
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type '$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring=0.0
-	    ;;
-	  esac
-	  if test no = "$need_version"; then
-	    versuffix=
-	  else
-	    versuffix=.0.0
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test yes,no = "$avoid_version,$need_version"; then
-	  major=
-	  versuffix=
-	  verstring=
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test yes = "$allow_undefined"; then
-	  if test unsupported = "$allow_undefined_flag"; then
-	    if test yes = "$build_old_libs"; then
-	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
-	      build_libtool_libs=no
-	    else
-	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
-	    fi
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag=$no_undefined_flag
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" :
-      func_append libobjs " $symfileobj"
-      test " " = "$libobjs" && libobjs=
-
-      if test relink != "$opt_mode"; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
-	       if test -n "$precious_files_regex"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       func_append removelist " $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles=$dlfiles
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles=$dlprefiles
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
-	esac
-      done
-
-      if test yes = "$build_libtool_libs"; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test yes = "$build_libtool_need_lc"; then
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=
-	versuffix=
-	major=
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    func_append newdeplibs " $i"
-		    i=
-		    ;;
-		  esac
-		fi
-		if test -n "$i"; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
-		    func_append newdeplibs " $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      func_append newdeplibs " $i"
-		      i=
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i"; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
-		      func_append newdeplibs " $i"
-		    else
-		      droppeddeps=yes
-		      echo
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib"; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		if test -n "$file_magic_glob"; then
-		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-		else
-		  libnameglob=$libname
-		fi
-		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test yes = "$want_nocaseglob"; then
-		    shopt -s nocaseglob
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib=$potent_lib
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
-			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			func_append newdeplibs " $a_deplib"
-			a_deplib=
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib"; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib"; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib"; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib=$potent_lib # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
-		      a_deplib=
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib"; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib"; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-	    for i in $predeps $postdeps; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
-	    if test none = "$deplibs_check_method"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test yes = "$droppeddeps"; then
-	  if test yes = "$module"; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test no = "$build_old_libs"; then
-	      oldlibs=$output_objdir/$libname.$libext
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test no = "$allow_undefined"; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test no = "$build_old_libs"; then
-		oldlibs=$output_objdir/$libname.$libext
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      deplibs=$new_libs
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test yes = "$build_libtool_libs"; then
-	# Remove $wl instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
-	if test yes = "$hardcode_into_libs"; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath=$finalize_rpath
-	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs=$libdir
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir=$hardcode_libdirs
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath=$finalize_shlibpath
-	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname=$1
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname=$realname
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib=$output_objdir/$realname
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols=$output_objdir/$libname.uexp
-	  func_append delfiles " $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    func_dll_def_p "$export_symbols" || {
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols=$export_symbols
-	      export_symbols=
-	      always_export_symbols=yes
-	    }
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for '$libname.la'"
-	    export_symbols=$output_objdir/$libname.exp
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs=$IFS; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS=$save_ifs
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test yes = "$try_normal_branch" \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=$output_objdir/$output_la.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		func_append delfiles " $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS=$save_ifs
-	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols=$export_symbols
-	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands, which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    func_append tmp_deplibs " $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs=$tmp_deplibs
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test yes = "$compiler_needs_object" &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop=$output_objdir/${outputname}x
-	    func_append generated " $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  func_append linker_flags " $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test relink = "$opt_mode"; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test yes = "$module" && test -n "$module_cmds"; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test : != "$skipped_export" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
-	    output=$output_objdir/$output_la.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
-	    output=$output_objdir/$output_la.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test yes = "$compiler_needs_object"; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-$k.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test -z "$objlist" ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test 1 -eq "$k"; then
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-$k.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-$k.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	      func_append delfiles " $output"
-
-	    else
-	      output=
-	    fi
-
-	    ${skipped_export-false} && {
-	      func_verbose "generating symbol list for '$libname.la'"
-	      export_symbols=$output_objdir/$libname.exp
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    }
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs=$IFS; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS=$save_ifs
-	      $opt_quiet || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test relink = "$opt_mode"; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS=$save_ifs
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          ${skipped_export-false} && {
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols=$export_symbols
-	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands, which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  }
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test yes = "$module" && test -n "$module_cmds"; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs=$IFS; IFS='~'
-	for cmd in $cmds; do
-	  IFS=$sp$nl
-	  eval cmd=\"$cmd\"
-	  IFS=$save_ifs
-	  $opt_quiet || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test relink = "$opt_mode"; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS=$save_ifs
-
-	# Restore the uninstalled library and exit
-	if test relink = "$opt_mode"; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test yes = "$module" || test yes = "$export_dynamic"; then
-	  # On all known operating systems, these are identical.
-	  dlname=$soname
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-	func_warning "'-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "'-l' and '-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "'-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "'-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "'-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj=$output
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # if reload_cmds runs $LD directly, get rid of -Wl from
-      # whole_archive_flag_spec and hope we can get by with turning comma
-      # into space.
-      case $reload_cmds in
-        *\$LD[\ \$]*) wl= ;;
-      esac
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
-	else
-	  gentop=$output_objdir/${obj}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
-
-      # Create the old-style object.
-      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
-
-      output=$obj
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      test yes = "$build_libtool_libs" || {
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      }
-
-      if test -n "$pic_flag" || test default != "$pic_mode"; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output=$libobj
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "'-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for programs"
-
-      $preload \
-	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
-	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test CXX = "$tagname"; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      func_append compile_command " $wl-bind_at_load"
-	      func_append finalize_command " $wl-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      compile_deplibs=$new_libs
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs=$libdir
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir=$hardcode_libdirs
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath=$rpath
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs=$libdir
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir=$hardcode_libdirs
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath=$rpath
-
-      if test -n "$libobjs" && test yes = "$build_old_libs"; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" false
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=:
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=false
-        ;;
-      *cygwin* | *mingw* )
-        test yes = "$build_libtool_libs" || wrappers_required=false
-        ;;
-      *)
-        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
-          wrappers_required=false
-        fi
-        ;;
-      esac
-      $wrappers_required || {
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command=$compile_command$compile_rpath
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.$objext"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
-	fi
-
-	exit $exit_status
-      }
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test yes = "$no_install"; then
-	# We don't need to create a wrapper script.
-	link_command=$compile_var$compile_command$compile_rpath
-	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      case $hardcode_action,$fast_install in
-        relink,*)
-	  # Fast installation is not supported
-	  link_command=$compile_var$compile_command$compile_rpath
-	  relink_command=$finalize_var$finalize_command$finalize_rpath
-
-	  func_warning "this platform does not like uninstalled shared libraries"
-	  func_warning "'$output' will be relinked during installation"
-	  ;;
-        *,yes)
-	  link_command=$finalize_var$compile_command$finalize_rpath
-	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-          ;;
-	*,no)
-	  link_command=$compile_var$compile_command$compile_rpath
-	  relink_command=$finalize_var$finalize_command$finalize_rpath
-          ;;
-	*,needless)
-	  link_command=$finalize_var$compile_command$finalize_rpath
-	  relink_command=
-          ;;
-      esac
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource=$output_path/$objdir/lt-$output_name.c
-	    cwrapper=$output_path/$output_name.exe
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host"; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      case $build_libtool_libs in
-        convenience)
-	  oldobjs="$libobjs_save $symfileobj"
-	  addlibs=$convenience
-	  build_libtool_libs=no
-	  ;;
-	module)
-	  oldobjs=$libobjs_save
-	  addlibs=$old_convenience
-	  build_libtool_libs=no
-          ;;
-	*)
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  $preload && test -f "$symfileobj" \
-	    && func_append oldobjs " $symfileobj"
-	  addlibs=$old_convenience
-	  ;;
-      esac
-
-      if test -n "$addlibs"; then
-	gentop=$output_objdir/${outputname}x
-	func_append generated " $gentop"
-
-	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase=$func_basename_result
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
-	      ;;
-	    *) func_append oldobjs " $obj" ;;
-	    esac
-	  done
-	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj"; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test -z "$oldobjs"; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test yes = "$build_old_libs" && old_library=$libname.$libext
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test yes = "$hardcode_automatic"; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test yes = "$installed"; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output=$output_objdir/${outputname}i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name=$func_basename_result
-		func_resolve_sysroot "$deplib"
-		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-		test -z "$libdir" && \
-		  func_fatal_error "'$deplib' is not a valid libtool archive"
-		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
-	      esac
-	    done
-	    dependency_libs=$newdependency_libs
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name=$func_basename_result
-		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "'$lib' is not a valid libtool archive"
-		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      *) func_append newdlfiles " $lib" ;;
-	      esac
-	    done
-	    dlfiles=$newdlfiles
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name=$func_basename_result
-		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "'$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles=$newdlprefiles
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlfiles " $abs"
-	    done
-	    dlfiles=$newdlfiles
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlprefiles " $abs"
-	    done
-	    dlprefiles=$newdlprefiles
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test -n "$bindir"; then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result/$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that cannot go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test no,yes = "$installed,$need_relink"; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-if test link = "$opt_mode" || test relink = "$opt_mode"; then
-  func_mode_link ${1+"$@"}
-fi
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $debug_cmd
-
-    RM=$nonopt
-    files=
-    rmforce=false
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic=$magic
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=: ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir=$func_dirname_result
-      if test . = "$dir"; then
-	odir=$objdir
-      else
-	odir=$dir/$objdir
-      fi
-      func_basename "$file"
-      name=$func_basename_result
-      test uninstall = "$opt_mode" && odir=$dir
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test clean = "$opt_mode"; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif $rmforce; then
-	continue
-      fi
-
-      rmfiles=$file
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  case $opt_mode in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" && test none != "$pic_object"; then
-	    func_append rmfiles " $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
-	    func_append rmfiles " $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test clean = "$opt_mode"; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    func_append rmfiles " $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
-	    if test yes = "$fast_install" && test -n "$relink_command"; then
-	      func_append rmfiles " $odir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name"; then
-	      func_append rmfiles " $odir/lt-$noexename.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the $objdir's in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
-  func_mode_uninstall ${1+"$@"}
-fi
-
-test -z "$opt_mode" && {
-  help=$generic_help
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode '$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# where we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/ext/libpqxx-7.7.3/config/m4/Makefile.am b/ext/libpqxx-7.7.3/config/m4/Makefile.am
deleted file mode 100644
index c5dd1572f..000000000
--- a/ext/libpqxx-7.7.3/config/m4/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES=Makefile.in config.guess config.sub install-sh \
-	ltmain.sh missing mkinstalldirs
-
diff --git a/ext/libpqxx-7.7.3/config/m4/libtool.m4 b/ext/libpqxx-7.7.3/config/m4/libtool.m4
deleted file mode 100644
index c4c02946d..000000000
--- a/ext/libpqxx-7.7.3/config/m4/libtool.m4
+++ /dev/null
@@ -1,8394 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 2014 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program or library that is built
-# using GNU Libtool, you may include this file under the  same
-# distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-])
-
-# serial 58 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_PREPARE_CC_BASENAME
-# -----------------------
-m4_defun([_LT_PREPARE_CC_BASENAME], [
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in @S|@*""; do
-      case $cc_temp in
-        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-])# _LT_PREPARE_CC_BASENAME
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
-# but that macro is also expanded into generated libtool script, which
-# arranges for $SED and $ECHO to be set by different means.
-m4_defun([_LT_CC_BASENAME],
-[m4_require([_LT_PREPARE_CC_BASENAME])dnl
-AC_REQUIRE([_LT_DECL_SED])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-func_cc_basename $1
-cc_basename=$func_cc_basename_result
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-m4_require([_LT_CMD_TRUNCATE])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options that allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test set != "${COLLECT_NAMES+set}"; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-old_CC=$CC
-old_CFLAGS=$CFLAGS
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from 'configure', and 'config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# 'config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain=$ac_aux_dir/ltmain.sh
-])# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the 'libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to 'config.status' so that its
-# declaration there will have the same value as in 'configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags='_LT_TAGS'dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into 'config.status', and then the shell code to quote escape them in
-# for loops in 'config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# '#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test 0 = "$lt_write_fail" && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-'$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test 0 != $[#]
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try '$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try '$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test yes = "$silent" &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options that allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}"; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile=${ofile}T
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-# Generated automatically by $as_me ($PACKAGE) $VERSION
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-    cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_PREPARE_MUNGE_PATH_LIST
-_LT_PREPARE_CC_BASENAME
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test set != "${COLLECT_NAMES+set}"; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS=$save_LDFLAGS
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[912]]*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]][[,.]]*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*|11.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test yes = "$lt_cv_apple_cc_single_mod"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test yes = "$lt_cv_ld_exported_symbols_list"; then
-      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
-    fi
-    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-    m4_if([$1], [CXX],
-[   if test yes != "$lt_cv_apple_cc_single_mod"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script that will find a shell with a builtin
-# printf (that we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-case $ECHO in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
-  [Search for dependent libraries within DIR (or the compiler's sysroot
-   if not specified).])],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([$with_sysroot])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and where our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE=32
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE=64
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test yes != "$lt_cv_cc_needs_belf"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
-  fi
-  ;;
-*-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks=$enable_libtool_lock
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cr}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test 0 -eq "$ac_status"; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test 0 -ne "$ac_status"; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test no = "$lt_cv_ar_at_file"; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  bitrig* | openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test yes = "[$]$2"; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-])
-
-if test yes = "[$]$2"; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test yes = "$cross_compiling"; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen=shl_load],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen=dlopen],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links=nottested
-if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test no = "$hard_links"; then
-    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
-  [Define to the sub-directory where libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
-     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
-   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_PREPARE_MUNGE_PATH_LIST
-# ---------------------------
-# Make sure func_munge_path_list() is defined correctly.
-m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
-[[# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x@S|@2 in
-    x)
-        ;;
-    *:)
-        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
-        ;;
-    x:*)
-        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
-        ;;
-    *)
-        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-]])# _LT_PREPARE_PATH_LIST
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test yes = "$GCC"; then
-  case $host_os in
-    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
-    *) lt_awk_arg='/^libraries:/' ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
-    *) lt_sed_strip_eq='s|=/|/|g' ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary...
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  # ...but if some path component already ends with the multilib dir we assume
-  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
-  case "$lt_multi_os_dir; $lt_search_path_spec " in
-  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
-    lt_multi_os_dir=
-    ;;
-  esac
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
-    elif test -n "$lt_multi_os_dir"; then
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS = " "; FS = "/|\n";} {
-  lt_foo = "";
-  lt_count = 0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo = "/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
-[User-defined run-time library search path.])
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
-    [Detected run-time system search path for libraries])
-_LT_DECL([], [configure_time_lt_sys_library_path], [2],
-    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program that can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$1"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac])
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program that can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test no = "$withval" || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi])
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_PATH_DD
-# -----------
-# find a working dd
-m4_defun([_LT_PATH_DD],
-[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
-[printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
-[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi])
-rm -f conftest.i conftest2.i conftest.out])
-])# _LT_PATH_DD
-
-
-# _LT_CMD_TRUNCATE
-# ----------------
-# find command to truncate a binary pipe
-m4_defun([_LT_CMD_TRUNCATE],
-[m4_require([_LT_PATH_DD])
-AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
-[printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
-_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
-  [Command to truncate a binary pipe])
-])# _LT_CMD_TRUNCATE
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-os2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test yes != "$lt_cv_path_mainfest_tool"; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# _LT_DLL_DEF_P([FILE])
-# ---------------------
-# True iff FILE is a Windows DLL '.def' file.
-# Keep in sync with func_dll_def_p in the libtool script
-AC_DEFUN([_LT_DLL_DEF_P],
-[dnl
-  test DEF = "`$SED -n dnl
-    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
-    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
-    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
-    -e q dnl                          Only consider the first "real" line
-    $1`" dnl
-])# _LT_DLL_DEF_P
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM=-lm)
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test yes = "$GCC"; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test ia64 = "$host_cpu"; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
-$lt_c_name_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
-"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
-    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
-    [Transform the output of nm into a list of symbols to manually relocate])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
-    [The name lister interface])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test yes = "$GXX"; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test ia64 = "$host_cpu"; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-	    if test ia64 != "$host_cpu"; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64, which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test yes = "$GCC"; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      case $cc_basename in
-      nagfor*)
-        # NAG Fortran compiler
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      esac
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # flang / f18. f95 an alias for gfortran or flang on Debian
-      flang* | f18* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
-    # Without the "-l" option, or with the "-B" option, AIX nm treats
-    # weak defined symbols like other global defined symbols, whereas
-    # GNU nm marks them as "W".
-    # While the 'weak' keyword is ignored in the Export File, we need
-    # it in the Import File for the 'aix-soname' feature, so we have
-    # to replace the "-B" option with "-P" for AIX nm.
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ' (' and ')$', so one must not match beginning or
-  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
-  # as well as any symbol that contains 'd'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test yes != "$GCC"; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd* | bitrig*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test yes = "$with_gnu_ld"; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test yes = "$lt_use_gnu_ld_interface"; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='$wl'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test ia64 != "$host_cpu"; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file, use it as
-	# is; otherwise, prepend EXPORTS...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
-          cp $export_symbols $output_objdir/$soname.def;
-        else
-          echo EXPORTS > $output_objdir/$soname.def;
-          cat $export_symbols >> $output_objdir/$soname.def;
-        fi~
-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test linux-dietlibc = "$host_os"; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test no = "$tmp_diet"
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-        nagfor*)                        # NAGFOR 5.3
-          tmp_sharedflag='-Wl,-shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-
-        if test yes = "$supports_anon_versioning"; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-            echo "local: *; };" >> $output_objdir/$libname.ver~
-            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	tcc*)
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
-	  ;;
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test yes = "$supports_anon_versioning"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
-              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test ia64 = "$host_cpu"; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
-	# Without the "-l" option, or with the "-B" option, AIX nm treats
-	# weak defined symbols like other global defined symbols, whereas
-	# GNU nm marks them as "W".
-	# While the 'weak' keyword is ignored in the Export File, we need
-	# it in the Import File for the 'aix-soname' feature, so we have
-	# to replace the "-B" option with "-P" for AIX nm.
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# have runtime linking enabled, and use it for executables.
-	# For shared libraries, we enable/disable runtime linking
-	# depending on the kind of the shared library created -
-	# when "with_aix_soname,aix_use_runtimelinking" is:
-	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "aix,yes"  lib.so          shared, rtl:yes, for executables
-	#            lib.a           static archive
-	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
-	#            lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a(lib.so.V) shared, rtl:no
-	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a           static archive
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	    # so we don't have lib.a shared libs to link our executables.
-	    # We have to force runtime linking in this case.
-	    aix_use_runtimelinking=yes
-	    LDFLAGS="$LDFLAGS -Wl,-brtl"
-	  fi
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
-      case $with_aix_soname,$aix_use_runtimelinking in
-      aix,*) ;; # traditional, no import file
-      svr4,* | *,yes) # use import file
-	# The Import File defines what to hardcode.
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-	;;
-      esac
-
-      if test yes = "$GCC"; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test yes = "$aix_use_runtimelinking"; then
-	  shared_flag="$shared_flag "'$wl-G'
-	fi
-	# Need to ensure runtime linking is disabled for the traditional
-	# shared library, or the linker may eventually find shared libraries
-	# /with/ Import File - we do not want to mix them.
-	shared_flag_aix='-shared'
-	shared_flag_svr4='-shared $wl-G'
-      else
-	# not using gcc
-	if test ia64 = "$host_cpu"; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag='$wl-G'
-	  else
-	    shared_flag='$wl-bM:SRE'
-	  fi
-	  shared_flag_aix='$wl-bM:SRE'
-	  shared_flag_svr4='$wl-G'
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-      else
-	if test ia64 = "$host_cpu"; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
-	  if test yes = "$with_gnu_ld"; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	  # -brtl affects multiple linker settings, -berok does not and is overridden later
-	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
-	  if test svr4 != "$with_aix_soname"; then
-	    # This is similar to how AIX traditionally builds its shared libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	  fi
-	  if test aix != "$with_aix_soname"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	  else
-	    # used by -dlpreopen to get the symbols
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	  fi
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
-            cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-          else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-          fi~
-          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-          linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-          lt_tool_outputfile="@TOOL_OUTPUT@"~
-          case $lt_outputfile in
-            *.exe|*.EXE) ;;
-            *)
-              lt_outputfile=$lt_outputfile.exe
-              lt_tool_outputfile=$lt_tool_outputfile.exe
-              ;;
-          esac~
-          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-            $RM "$lt_outputfile.manifest";
-          fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-      ;;
-
-    hpux10*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test no = "$with_gnu_ld"; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test no = "$with_gnu_ld"; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS=$LDFLAGS
-	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS=$save_LDFLAGS])
-	if test yes = "$lt_cv_irix_exported_symbol"; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    linux*)
-      case $cc_basename in
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      esac
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd* | bitrig*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	else
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    osf3*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test yes = "$GCC"; then
-	wlarc='$wl'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='$wl'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands '-z linker_flag'.  GCC discards it without '$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test yes = "$GCC"; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test sequent = "$host_vendor"; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We CANNOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test sni = "$host_vendor"; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting $shlibpath_var if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC=$CC
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report what library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test no = "$can_build_shared" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test yes = "$enable_shared" && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test ia64 != "$host_cpu"; then
-      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-      yes,aix,yes) ;;			# shared object as lib.so file only
-      yes,svr4,*) ;;			# shared object as lib.so archive member only
-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-      esac
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test yes = "$enable_shared" || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC=$lt_save_CC
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test no != "$CXX" &&
-    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
-    (test g++ != "$CXX"))); then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_caught_CXX_error"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test yes = "$GXX"; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test yes = "$GXX"; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test yes = "$with_gnu_ld"; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='$wl'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test ia64 = "$host_cpu"; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # have runtime linking enabled, and use it for executables.
-          # For shared libraries, we enable/disable runtime linking
-          # depending on the kind of the shared library created -
-          # when "with_aix_soname,aix_use_runtimelinking" is:
-          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "aix,yes"  lib.so          shared, rtl:yes, for executables
-          #            lib.a           static archive
-          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
-          #            lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a(lib.so.V) shared, rtl:no
-          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a           static archive
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	      # so we don't have lib.a shared libs to link our executables.
-	      # We have to force runtime linking in this case.
-	      aix_use_runtimelinking=yes
-	      LDFLAGS="$LDFLAGS -Wl,-brtl"
-	    fi
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
-        case $with_aix_soname,$aix_use_runtimelinking in
-        aix,*) ;;	# no import file
-        svr4,* | *,yes) # use import file
-          # The Import File defines what to hardcode.
-          _LT_TAGVAR(hardcode_direct, $1)=no
-          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-          ;;
-        esac
-
-        if test yes = "$GXX"; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag=$shared_flag' $wl-G'
-	  fi
-	  # Need to ensure runtime linking is disabled for the traditional
-	  # shared library, or the linker may eventually find shared libraries
-	  # /with/ Import File - we do not want to mix them.
-	  shared_flag_aix='-shared'
-	  shared_flag_svr4='-shared $wl-G'
-        else
-          # not using gcc
-          if test ia64 = "$host_cpu"; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test yes = "$aix_use_runtimelinking"; then
-	      shared_flag='$wl-G'
-	    else
-	      shared_flag='$wl-bM:SRE'
-	    fi
-	    shared_flag_aix='$wl-bM:SRE'
-	    shared_flag_svr4='$wl-G'
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          # The "-G" linker flag allows undefined symbols.
-          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-        else
-          if test ia64 = "$host_cpu"; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
-	    if test yes = "$with_gnu_ld"; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	    # -brtl affects multiple linker settings, -berok does not and is overridden later
-	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
-	    if test svr4 != "$with_aix_soname"; then
-	      # This is similar to how AIX traditionally builds its shared
-	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	    fi
-	    if test aix != "$with_aix_soname"; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	    else
-	      # used by -dlpreopen to get the symbols
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	    fi
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=.dll
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
-              cp "$export_symbols" "$output_objdir/$soname.def";
-              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-            else
-              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-            fi~
-            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-            linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-            lt_tool_outputfile="@TOOL_OUTPUT@"~
-            case $lt_outputfile in
-              *.exe|*.EXE) ;;
-              *)
-                lt_outputfile=$lt_outputfile.exe
-                lt_tool_outputfile=$lt_tool_outputfile.exe
-                ;;
-            esac~
-            func_to_tool_file "$lt_outputfile"~
-            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-              $RM "$lt_outputfile.manifest";
-            fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file, use it as
-	    # is; otherwise, prepend EXPORTS...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
-              cp $export_symbols $output_objdir/$soname.def;
-            else
-              echo EXPORTS > $output_objdir/$soname.def;
-              cat $export_symbols >> $output_objdir/$soname.def;
-            fi~
-            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      os2*)
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	shrext_cmds=.dll
-	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  prefix_cmds="$SED"~
-	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	    prefix_cmds="$prefix_cmds -e 1d";
-	  fi~
-	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test yes = "$GXX"; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test no = "$with_gnu_ld"; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-                $RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    if test yes = "$supports_anon_versioning"; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-                echo "local: *; };" >> $output_objdir/$libname.ver~
-                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd* | bitrig*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-                  echo "-hidden">> $lib.exp~
-                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
-                  $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands '-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-	      else
-	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We CANNOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-              '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-              '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)=$GXX
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test yes != "$_lt_caught_CXX_error"
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case @S|@2 in
-  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
-  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $prev$p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test x-L = "$p" ||
-          test x-R = "$p"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test no = "$pre_test_object_deps_done"; then
-	 case $prev in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)=$prev$p
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test no = "$pre_test_object_deps_done"; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)=$p
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)=$p
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test no = "$F77"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_disable_F77"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test no = "$can_build_shared" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test yes = "$enable_shared" && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test ia64 != "$host_cpu"; then
-	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-	  yes,aix,yes) ;;		# shared object as lib.so file only
-	  yes,svr4,*) ;;		# shared object as lib.so archive member only
-	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-	  esac
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test yes = "$enable_shared" || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)=$G77
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test yes != "$_lt_disable_F77"
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test no = "$FC"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_disable_FC"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test no = "$can_build_shared" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test yes = "$enable_shared" && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test ia64 != "$host_cpu"; then
-	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-	  yes,aix,yes) ;;		# shared object as lib.so file only
-	  yes,svr4,*) ;;		# shared object as lib.so archive member only
-	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-	  esac
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test yes = "$enable_shared" || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test yes != "$_lt_disable_FC"
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)=$LD
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)=$LD
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code=$lt_simple_compile_test_code
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f "$lt_ac_sed" && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test 10 -lt "$lt_ac_count" && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test "$lt_ac_count" -gt "$lt_ac_max"; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine what file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/ext/libpqxx-7.7.3/config/m4/ltoptions.m4 b/ext/libpqxx-7.7.3/config/m4/ltoptions.m4
deleted file mode 100644
index 94b082976..000000000
--- a/ext/libpqxx-7.7.3/config/m4/ltoptions.m4
+++ /dev/null
@@ -1,437 +0,0 @@
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
-#   Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 8 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option '$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-		   [_LT_ENABLE_FAST_INSTALL])
-  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
-		   [_LT_WITH_AIX_SONAME([aix])])
-  ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the 'shared' and
-# 'disable-shared' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the 'static' and
-# 'disable-static' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the 'fast-install'
-# and 'disable-fast-install' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_AIX_SONAME([DEFAULT])
-# ----------------------------------
-# implement the --with-aix-soname flag, and support the `aix-soname=aix'
-# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
-# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
-m4_define([_LT_WITH_AIX_SONAME],
-[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
-shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix[[5-9]]*,yes)
-  AC_MSG_CHECKING([which variant of shared library versioning to provide])
-  AC_ARG_WITH([aix-soname],
-    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
-      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
-    [case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname],
-    [AC_CACHE_VAL([lt_cv_with_aix_soname],
-      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
-    with_aix_soname=$lt_cv_with_aix_soname])
-  AC_MSG_RESULT([$with_aix_soname])
-  if test aix != "$with_aix_soname"; then
-    # For the AIX way of multilib, we name the shared archive member
-    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-    # the AIX toolchain works better with OBJECT_MODE set (default 32).
-    if test 64 = "${OBJECT_MODE-32}"; then
-      shared_archive_member_spec=shr_64
-    else
-      shared_archive_member_spec=shr
-    fi
-  fi
-  ;;
-*)
-  with_aix_soname=aix
-  ;;
-esac
-
-_LT_DECL([], [shared_archive_member_spec], [0],
-    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
-])# _LT_WITH_AIX_SONAME
-
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
-# LT_INIT options.
-# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac],
-    [pic_mode=m4_default([$1], [default])])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/ext/libpqxx-7.7.3/config/m4/ltsugar.m4 b/ext/libpqxx-7.7.3/config/m4/ltsugar.m4
deleted file mode 100644
index 48bc9344a..000000000
--- a/ext/libpqxx-7.7.3/config/m4/ltsugar.m4
+++ /dev/null
@@ -1,124 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
-# Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59, which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff --git a/ext/libpqxx-7.7.3/config/m4/ltversion.m4 b/ext/libpqxx-7.7.3/config/m4/ltversion.m4
deleted file mode 100644
index fa04b52a3..000000000
--- a/ext/libpqxx-7.7.3/config/m4/ltversion.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 4179 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.6])
-m4_define([LT_PACKAGE_REVISION], [2.4.6])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6'
-macro_revision='2.4.6'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff --git a/ext/libpqxx-7.7.3/config/m4/lt~obsolete.m4 b/ext/libpqxx-7.7.3/config/m4/lt~obsolete.m4
deleted file mode 100644
index c6b26f88f..000000000
--- a/ext/libpqxx-7.7.3/config/m4/lt~obsolete.m4
+++ /dev/null
@@ -1,99 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
-#   Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/ext/libpqxx-7.7.3/config/missing b/ext/libpqxx-7.7.3/config/missing
deleted file mode 100755
index 1fe1611f1..000000000
--- a/ext/libpqxx-7.7.3/config/missing
+++ /dev/null
@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
-
-perl_URL=https://www.perl.org/
-flex_URL=https://github.com/westes/flex
-gnu_software_URL=https://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/ext/libpqxx-7.7.3/config/mkinstalldirs b/ext/libpqxx-7.7.3/config/mkinstalldirs
deleted file mode 100755
index 6b3b5fc5d..000000000
--- a/ext/libpqxx-7.7.3/config/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/ext/libpqxx-7.7.3/config/test-driver b/ext/libpqxx-7.7.3/config/test-driver
deleted file mode 100755
index 8e575b017..000000000
--- a/ext/libpqxx-7.7.3/config/test-driver
+++ /dev/null
@@ -1,148 +0,0 @@
-#! /bin/sh
-# test-driver - basic testsuite driver script.
-
-scriptversion=2013-07-13.22; # UTC
-
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-# Make unconditional expansion of undefined variables an error.  This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-usage_error ()
-{
-  echo "$0: $*" >&2
-  print_usage >&2
-  exit 2
-}
-
-print_usage ()
-{
-  cat <<END
-Usage:
-  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-              [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--]
-              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
-The '--test-name', '--log-file' and '--trs-file' options are mandatory.
-END
-}
-
-test_name= # Used for reporting.
-log_file=  # Where to save the output of the test script.
-trs_file=  # Where to save the metadata of the test run.
-expect_failure=no
-color_tests=no
-enable_hard_errors=yes
-while test $# -gt 0; do
-  case $1 in
-  --help) print_usage; exit $?;;
-  --version) echo "test-driver $scriptversion"; exit $?;;
-  --test-name) test_name=$2; shift;;
-  --log-file) log_file=$2; shift;;
-  --trs-file) trs_file=$2; shift;;
-  --color-tests) color_tests=$2; shift;;
-  --expect-failure) expect_failure=$2; shift;;
-  --enable-hard-errors) enable_hard_errors=$2; shift;;
-  --) shift; break;;
-  -*) usage_error "invalid option: '$1'";;
-   *) break;;
-  esac
-  shift
-done
-
-missing_opts=
-test x"$test_name" = x && missing_opts="$missing_opts --test-name"
-test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
-test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
-if test x"$missing_opts" != x; then
-  usage_error "the following mandatory options are missing:$missing_opts"
-fi
-
-if test $# -eq 0; then
-  usage_error "missing argument"
-fi
-
-if test $color_tests = yes; then
-  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
-  red='' # Red.
-  grn='' # Green.
-  lgn='' # Light green.
-  blu='' # Blue.
-  mgn='' # Magenta.
-  std=''     # No color.
-else
-  red= grn= lgn= blu= mgn= std=
-fi
-
-do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
-trap "st=129; $do_exit" 1
-trap "st=130; $do_exit" 2
-trap "st=141; $do_exit" 13
-trap "st=143; $do_exit" 15
-
-# Test script is run here.
-"$@" >$log_file 2>&1
-estatus=$?
-
-if test $enable_hard_errors = no && test $estatus -eq 99; then
-  tweaked_estatus=1
-else
-  tweaked_estatus=$estatus
-fi
-
-case $tweaked_estatus:$expect_failure in
-  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
-  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
-  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
-  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
-  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
-  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
-esac
-
-# Report the test outcome and exit status in the logs, so that one can
-# know whether the test passed or failed simply by looking at the '.log'
-# file, without the need of also peaking into the corresponding '.trs'
-# file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
-
-# Report outcome to console.
-echo "${col}${res}${std}: $test_name"
-
-# Register the test result, and other relevant metadata.
-echo ":test-result: $res" > $trs_file
-echo ":global-test-result: $res" >> $trs_file
-echo ":recheck: $recheck" >> $trs_file
-echo ":copy-in-global-log: $gcopy" >> $trs_file
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/ext/libpqxx-7.7.3/configitems b/ext/libpqxx-7.7.3/configitems
deleted file mode 100644
index e6f3925ef..000000000
--- a/ext/libpqxx-7.7.3/configitems
+++ /dev/null
@@ -1,26 +0,0 @@
-PACKAGE	internal	autotools
-PACKAGE_BUGREPORT	internal	autotools
-PACKAGE_NAME	internal	autotools
-PACKAGE_STRING	internal	autotools
-PACKAGE_TARNAME	internal	autotools
-PACKAGE_VERSION	internal	autotools
-PQXX_HAVE_CHARCONV_INT	internal	compiler
-PQXX_HAVE_CHARCONV_FLOAT	internal	compiler
-PQXX_HAVE_CMP	public	compiler
-PQXX_HAVE_CONCEPTS	public	compiler
-PQXX_HAVE_CXA_DEMANGLE	internal	compiler
-PQXX_HAVE_GCC_PURE	public	compiler
-PQXX_HAVE_GCC_VISIBILITY	public	compiler
-PQXX_HAVE_LIKELY	public	compiler
-PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT	public	compiler
-PQXX_HAVE_PATH	public	compiler
-PQXX_HAVE_POLL       internal        compiler
-PQXX_HAVE_PQENCRYPTPASSWORDCONN	internal	libpq
-PQXX_HAVE_PQ_PIPELINE	internal	libpq
-PQXX_HAVE_SLEEP_FOR	internal	compiler
-PQXX_HAVE_SPAN	public	compiler
-PQXX_HAVE_STRERROR_R	internal	compiler
-PQXX_HAVE_STRERROR_S	internal	compiler
-PQXX_HAVE_THREAD_LOCAL       internal        compiler
-PQXX_HAVE_YEAR_MONTH_DAY	public	compiler
-VERSION	internal	autotools
diff --git a/ext/libpqxx-7.7.3/configure b/ext/libpqxx-7.7.3/configure
deleted file mode 100755
index 4c58f19c2..000000000
--- a/ext/libpqxx-7.7.3/configure
+++ /dev/null
@@ -1,20443 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpqxx 7.7.3.
-#
-# Report bugs to <Jeroen T. Vermeulen>.
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and Jeroen T.
-$0: Vermeulen about your system, including any error
-$0: possibly output before this message. Then install a
-$0: modern shell, or manually run the script under such a
-$0: shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='libpqxx'
-PACKAGE_TARNAME='libpqxx'
-PACKAGE_VERSION='7.7.3'
-PACKAGE_STRING='libpqxx 7.7.3'
-PACKAGE_BUGREPORT='Jeroen T. Vermeulen'
-PACKAGE_URL=''
-
-ac_unique_file="src/connection.cxx"
-ac_default_prefix=/usr/local
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-with_postgres_lib
-POSTGRES_INCLUDE
-PG_CONFIG
-PKG_CONFIG
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-BUILD_REFERENCE_FALSE
-BUILD_REFERENCE_TRUE
-HAVE_DOT
-DOXYGEN
-MKDIR
-CXXCPP
-CPP
-LT_SYS_LIBRARY_PATH
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-DLLTOOL
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-ac_ct_CC
-CFLAGS
-CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CXX
-CPPFLAGS
-LDFLAGS
-CXXFLAGS
-CXX
-PQXX_ABI
-PQXXVERSION
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
-CSCOPE
-ETAGS
-CTAGS
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-runstatedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL
-am__quote'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_silent_rules
-enable_dependency_tracking
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_aix_soname
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-enable_documentation
-enable_maintainer_mode
-enable_audit
-enable_suggest
-with_postgres_include
-with_postgres_lib
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CXX
-CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CCC
-CC
-CFLAGS
-LT_SYS_LIBRARY_PATH
-CPP
-CXXCPP
-DOXYGEN
-HAVE_DOT'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures libpqxx 7.7.3 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/libpqxx]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of libpqxx 7.7.3:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
-  --enable-shared[=PKGS]  build shared libraries [default=no]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-documentation  Generate documentation
-  --enable-maintainer-mode
-                          enable make rules and dependencies not useful (and
-                          sometimes confusing) to the casual installer
-
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-aix-soname=aix|svr4|both
-                          shared library versioning (aka "SONAME") variant to
-                          provide on AIX, [default=aix].
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
-                          compiler's sysroot if not specified).
-  --with-postgres-include=DIR
-                          Use PostgreSQL includes from DIR. Defaults to
-                          querying pg_config or pkg-config, whichever is
-                          available.
-  --with-postgres-lib=DIR Use PostgreSQL libraries from DIR. Defaults to
-                          querying pg_config.
-
-Some influential environment variables:
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LT_SYS_LIBRARY_PATH
-              User-defined run-time library search path.
-  CPP         C preprocessor
-  CXXCPP      C++ preprocessor
-  DOXYGEN     Path to doxygen needed to build reference documentation
-  HAVE_DOT    Variable used by doxygen to declare availibility of dot
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <Jeroen T. Vermeulen>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-libpqxx configure 7.7.3
-generated by GNU Autoconf 2.69
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_cxx_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------- ##
-## Report this to Jeroen T. Vermeulen ##
-## ---------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_header_mongrel
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by libpqxx $as_me 7.7.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-ac_aux_dir=
-for ac_dir in config "$srcdir"/config; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-
-am__api_version='1.16'
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  MISSING="\${SHELL} '$am_aux_dir/missing'"
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='libpqxx'
- VERSION='7.7.3'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-# Variables for tags utilities; see am/tags.am
-if test -z "$CTAGS"; then
-  CTAGS=ctags
-fi
-
-if test -z "$ETAGS"; then
-  ETAGS=etags
-fi
-
-if test -z "$CSCOPE"; then
-  CSCOPE=cscope
-fi
-
-
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
-
-
-PQXX_ABI=7.7
-PQXXVERSION=$PACKAGE_VERSION
-
-
-
-ac_config_headers="$ac_config_headers include/pqxx/config.h"
-
-
-# Default prefix for installs.
-
-
-
-# Read test programme from config-test.
-
-
-
-# Checks for programs.
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
-$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
-  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
-   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-  case $?:`cat confinc.out 2>/dev/null` in #(
-  '0:this is the am__doit target') :
-    case $s in #(
-  BSD) :
-    am__include='.include' am__quote='"' ;; #(
-  *) :
-    am__include='include' am__quote='' ;;
-esac ;; #(
-  *) :
-     ;;
-esac
-  if test "$am__include" != "#"; then
-    _am_result="yes ($s style)"
-    break
-  fi
-done
-rm -f confinc.* confmf.*
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-$as_echo "${_am_result}" >&6; }
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_shared=no
-fi
-
-
-
-
-
-
-
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.6'
-macro_revision='2.4.6'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case $ECHO in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
-fi
-
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-os2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cr}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test 0 -eq "$ac_status"; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test 0 -ne "$ac_status"; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test no = "$lt_cv_ar_at_file"; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  bitrig* | openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test ia64 = "$host_cpu"; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
-$lt_c_name_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
-"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
-    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "$with_sysroot" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
-$as_echo_n "checking for a working dd... " >&6; }
-if ${ac_cv_path_lt_DD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-if test -z "$lt_DD"; then
-  ac_path_lt_DD_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in dd; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_lt_DD" || continue
-if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi
-      $ac_path_lt_DD_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_lt_DD"; then
-    :
-  fi
-else
-  ac_cv_path_lt_DD=$lt_DD
-fi
-
-rm -f conftest.i conftest2.i conftest.out
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-$as_echo "$ac_cv_path_lt_DD" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
-$as_echo_n "checking how to truncate binary pipes... " >&6; }
-if ${lt_cv_truncate_bin+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-$as_echo "$lt_cv_truncate_bin" >&6; }
-
-
-
-
-
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE=32
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE=64
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test yes != "$lt_cv_cc_needs_belf"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
-  fi
-  ;;
-*-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks=$enable_libtool_lock
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test yes != "$lt_cv_path_mainfest_tool"; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cr libconftest.a conftest.o" >&5
-      $AR cr libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[912]*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[012][,.]*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*|11.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test yes = "$lt_cv_apple_cc_single_mod"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test yes = "$lt_cv_ld_exported_symbols_list"; then
-      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
-    fi
-    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-func_stripname_cnf ()
-{
-  case $2 in
-  .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
-  *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
-  esac
-} # func_stripname_cnf
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  pic_mode=default
-fi
-
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-  shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix[5-9]*,yes)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
-$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
-
-# Check whether --with-aix-soname was given.
-if test "${with_aix_soname+set}" = set; then :
-  withval=$with_aix_soname; case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname
-else
-  if ${lt_cv_with_aix_soname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_with_aix_soname=aix
-fi
-
-    with_aix_soname=$lt_cv_with_aix_soname
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-$as_echo "$with_aix_soname" >&6; }
-  if test aix != "$with_aix_soname"; then
-    # For the AIX way of multilib, we name the shared archive member
-    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-    # the AIX toolchain works better with OBJECT_MODE set (default 32).
-    if test 64 = "${OBJECT_MODE-32}"; then
-      shared_archive_member_spec=shr_64
-    else
-      shared_archive_member_spec=shr
-    fi
-  fi
-  ;;
-*)
-  with_aix_soname=aix
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test set != "${COLLECT_NAMES+set}"; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-old_CC=$CC
-old_CFLAGS=$CFLAGS
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-func_cc_basename $compiler
-cc_basename=$func_cc_basename_result
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/${ac_tool_prefix}file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC=$CC
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test yes = "$GCC"; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test yes = "$GCC"; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      case $cc_basename in
-      nagfor*)
-        # NAG Fortran compiler
-        lt_prog_compiler_wl='-Wl,-Wl,,'
-        lt_prog_compiler_pic='-PIC'
-        lt_prog_compiler_static='-Bstatic'
-        ;;
-      esac
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='$wl-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # flang / f18. f95 an alias for gfortran or flang on Debian
-      flang* | f18* | f95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_pic_works"; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_static_works"; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links=nottested
-if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ' (' and ')$', so one must not match beginning or
-  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
-  # as well as any symbol that contains 'd'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test yes != "$GCC"; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd* | bitrig*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test yes = "$with_gnu_ld"; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test yes = "$lt_use_gnu_ld_interface"; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='$wl'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-    export_dynamic_flag_spec='$wl--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test ia64 != "$host_cpu"; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='$wl--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file, use it as
-	# is; otherwise, prepend EXPORTS...
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-          cp $export_symbols $output_objdir/$soname.def;
-        else
-          echo EXPORTS > $output_objdir/$soname.def;
-          cat $export_symbols >> $output_objdir/$soname.def;
-        fi~
-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-      export_dynamic_flag_spec='$wl-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test linux-dietlibc = "$host_os"; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test no = "$tmp_diet"
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-        nagfor*)                        # NAGFOR 5.3
-          tmp_sharedflag='-Wl,-shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-
-        if test yes = "$supports_anon_versioning"; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-            echo "local: *; };" >> $output_objdir/$libname.ver~
-            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	tcc*)
-	  export_dynamic_flag_spec='-rdynamic'
-	  ;;
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test yes = "$supports_anon_versioning"; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
-              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test no = "$ld_shlibs"; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test ia64 = "$host_cpu"; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
-	# Without the "-l" option, or with the "-B" option, AIX nm treats
-	# weak defined symbols like other global defined symbols, whereas
-	# GNU nm marks them as "W".
-	# While the 'weak' keyword is ignored in the Export File, we need
-	# it in the Import File for the 'aix-soname' feature, so we have
-	# to replace the "-B" option with "-P" for AIX nm.
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# have runtime linking enabled, and use it for executables.
-	# For shared libraries, we enable/disable runtime linking
-	# depending on the kind of the shared library created -
-	# when "with_aix_soname,aix_use_runtimelinking" is:
-	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "aix,yes"  lib.so          shared, rtl:yes, for executables
-	#            lib.a           static archive
-	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
-	#            lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a(lib.so.V) shared, rtl:no
-	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a           static archive
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	    # so we don't have lib.a shared libs to link our executables.
-	    # We have to force runtime linking in this case.
-	    aix_use_runtimelinking=yes
-	    LDFLAGS="$LDFLAGS -Wl,-brtl"
-	  fi
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='$wl-f,'
-      case $with_aix_soname,$aix_use_runtimelinking in
-      aix,*) ;; # traditional, no import file
-      svr4,* | *,yes) # use import file
-	# The Import File defines what to hardcode.
-	hardcode_direct=no
-	hardcode_direct_absolute=no
-	;;
-      esac
-
-      if test yes = "$GCC"; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test yes = "$aix_use_runtimelinking"; then
-	  shared_flag="$shared_flag "'$wl-G'
-	fi
-	# Need to ensure runtime linking is disabled for the traditional
-	# shared library, or the linker may eventually find shared libraries
-	# /with/ Import File - we do not want to mix them.
-	shared_flag_aix='-shared'
-	shared_flag_svr4='-shared $wl-G'
-      else
-	# not using gcc
-	if test ia64 = "$host_cpu"; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag='$wl-G'
-	  else
-	    shared_flag='$wl-bM:SRE'
-	  fi
-	  shared_flag_aix='$wl-bM:SRE'
-	  shared_flag_svr4='$wl-G'
-	fi
-      fi
-
-      export_dynamic_flag_spec='$wl-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-      else
-	if test ia64 = "$host_cpu"; then
-	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' $wl-bernotok'
-	  allow_undefined_flag=' $wl-berok'
-	  if test yes = "$with_gnu_ld"; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	  # -brtl affects multiple linker settings, -berok does not and is overridden later
-	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
-	  if test svr4 != "$with_aix_soname"; then
-	    # This is similar to how AIX traditionally builds its shared libraries.
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	  fi
-	  if test aix != "$with_aix_soname"; then
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	  else
-	    # used by -dlpreopen to get the symbols
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	  fi
-	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-            cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-          else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-          fi~
-          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-          linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-          lt_tool_outputfile="@TOOL_OUTPUT@"~
-          case $lt_outputfile in
-            *.exe|*.EXE) ;;
-            *)
-              lt_outputfile=$lt_outputfile.exe
-              lt_tool_outputfile=$lt_tool_outputfile.exe
-              ;;
-          esac~
-          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-            $RM "$lt_outputfile.manifest";
-          fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test yes = "$GCC"; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='$wl-E'
-      ;;
-
-    hpux10*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='$wl-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test yes = "$lt_cv_prog_compiler__b"; then
-    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='$wl-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS=$LDFLAGS
-	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS=$save_LDFLAGS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test yes = "$lt_cv_irix_exported_symbol"; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
-	fi
-	link_all_deplibs=no
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    linux*)
-      case $cc_basename in
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	ld_shlibs=yes
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      esac
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd* | bitrig*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	  export_dynamic_flag_spec='$wl-E'
-	else
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    osf3*)
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test yes = "$GCC"; then
-	wlarc='$wl'
-	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='$wl'
-	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands '-z linker_flag'.  GCC discards it without '$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test yes = "$GCC"; then
-	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test sequent = "$host_vendor"; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='$wl-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We CANNOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='$wl-z,text'
-      allow_undefined_flag='$wl-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='$wl-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test sni = "$host_vendor"; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='$wl-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test no = "$ld_shlibs" && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test yes = "$GCC"; then
-  case $host_os in
-    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
-    *) lt_awk_arg='/^libraries:/' ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
-    *) lt_sed_strip_eq='s|=/|/|g' ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary...
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  # ...but if some path component already ends with the multilib dir we assume
-  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
-  case "$lt_multi_os_dir; $lt_search_path_spec " in
-  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
-    lt_multi_os_dir=
-    ;;
-  esac
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
-    elif test -n "$lt_multi_os_dir"; then
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS = " "; FS = "/|\n";} {
-  lt_foo = "";
-  lt_count = 0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo = "/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a(lib.so.V)'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  hardcode_libdir_flag_spec='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test yes = "$hardcode_automatic"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$hardcode_direct" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
-     test no != "$hardcode_minus_L"; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test relink = "$hardcode_action" ||
-   test yes = "$inherit_rpath"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen=shl_load
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report what library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test no = "$can_build_shared" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test yes = "$enable_shared" && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test ia64 != "$host_cpu"; then
-      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-      yes,aix,yes) ;;			# shared object as lib.so file only
-      yes,svr4,*) ;;			# shared object as lib.so archive member only
-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-      esac
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test yes = "$enable_shared" || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-CC=$lt_save_CC
-
-      if test -n "$CXX" && ( test no != "$CXX" &&
-    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
-    (test g++ != "$CXX"))); then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-else
-  _lt_caught_CXX_error=yes
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-compiler_needs_object_CXX=no
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_direct_absolute_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-inherit_rpath_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-reload_flag_CXX=$reload_flag
-reload_cmds_CXX=$reload_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_caught_CXX_error"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-  # save warnings/boilerplate of simple test code
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  compiler_CXX=$CC
-  func_cc_basename $compiler
-cc_basename=$func_cc_basename_result
-
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test yes = "$GXX"; then
-      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-    else
-      lt_prog_compiler_no_builtin_flag_CXX=
-    fi
-
-    if test yes = "$GXX"; then
-      # Set up default GNU C++ configuration
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
-fi
-
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test yes = "$with_gnu_ld"; then
-        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-
-        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-        export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='$wl'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-        else
-          whole_archive_flag_spec_CXX=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-    ld_shlibs_CXX=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-      aix[4-9]*)
-        if test ia64 = "$host_cpu"; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # have runtime linking enabled, and use it for executables.
-          # For shared libraries, we enable/disable runtime linking
-          # depending on the kind of the shared library created -
-          # when "with_aix_soname,aix_use_runtimelinking" is:
-          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "aix,yes"  lib.so          shared, rtl:yes, for executables
-          #            lib.a           static archive
-          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
-          #            lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a(lib.so.V) shared, rtl:no
-          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a           static archive
-          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	      # so we don't have lib.a shared libs to link our executables.
-	      # We have to force runtime linking in this case.
-	      aix_use_runtimelinking=yes
-	      LDFLAGS="$LDFLAGS -Wl,-brtl"
-	    fi
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        archive_cmds_CXX=''
-        hardcode_direct_CXX=yes
-        hardcode_direct_absolute_CXX=yes
-        hardcode_libdir_separator_CXX=':'
-        link_all_deplibs_CXX=yes
-        file_list_spec_CXX='$wl-f,'
-        case $with_aix_soname,$aix_use_runtimelinking in
-        aix,*) ;;	# no import file
-        svr4,* | *,yes) # use import file
-          # The Import File defines what to hardcode.
-          hardcode_direct_CXX=no
-          hardcode_direct_absolute_CXX=no
-          ;;
-        esac
-
-        if test yes = "$GXX"; then
-          case $host_os in aix4.[012]|aix4.[012].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    hardcode_direct_CXX=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    hardcode_minus_L_CXX=yes
-	    hardcode_libdir_flag_spec_CXX='-L$libdir'
-	    hardcode_libdir_separator_CXX=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag=$shared_flag' $wl-G'
-	  fi
-	  # Need to ensure runtime linking is disabled for the traditional
-	  # shared library, or the linker may eventually find shared libraries
-	  # /with/ Import File - we do not want to mix them.
-	  shared_flag_aix='-shared'
-	  shared_flag_svr4='-shared $wl-G'
-        else
-          # not using gcc
-          if test ia64 = "$host_cpu"; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test yes = "$aix_use_runtimelinking"; then
-	      shared_flag='$wl-G'
-	    else
-	      shared_flag='$wl-bM:SRE'
-	    fi
-	    shared_flag_aix='$wl-bM:SRE'
-	    shared_flag_svr4='$wl-G'
-          fi
-        fi
-
-        export_dynamic_flag_spec_CXX='$wl-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        always_export_symbols_CXX=yes
-	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          # The "-G" linker flag allows undefined symbols.
-          no_undefined_flag_CXX='-bernotok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
-
-          hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
-
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-        else
-          if test ia64 = "$host_cpu"; then
-	    hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
-	    allow_undefined_flag_CXX="-z nodefs"
-	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
-
-	    hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    no_undefined_flag_CXX=' $wl-bernotok'
-	    allow_undefined_flag_CXX=' $wl-berok'
-	    if test yes = "$with_gnu_ld"; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      whole_archive_flag_spec_CXX='$convenience'
-	    fi
-	    archive_cmds_need_lc_CXX=yes
-	    archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	    # -brtl affects multiple linker settings, -berok does not and is overridden later
-	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
-	    if test svr4 != "$with_aix_soname"; then
-	      # This is similar to how AIX traditionally builds its shared
-	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
-	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	    fi
-	    if test aix != "$with_aix_soname"; then
-	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	    else
-	      # used by -dlpreopen to get the symbols
-	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	    fi
-	    archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  allow_undefined_flag_CXX=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX=' '
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=yes
-	  file_list_spec_CXX='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=.dll
-	  # FIXME: Setting linknames here is a bad hack.
-	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	  archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-              cp "$export_symbols" "$output_objdir/$soname.def";
-              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-            else
-              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-            fi~
-            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-            linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
-	  enable_shared_with_static_runtimes_CXX=yes
-	  # Don't use ranlib
-	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
-	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-            lt_tool_outputfile="@TOOL_OUTPUT@"~
-            case $lt_outputfile in
-              *.exe|*.EXE) ;;
-              *)
-                lt_outputfile=$lt_outputfile.exe
-                lt_tool_outputfile=$lt_tool_outputfile.exe
-                ;;
-            esac~
-            func_to_tool_file "$lt_outputfile"~
-            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-              $RM "$lt_outputfile.manifest";
-            fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=no
-	  enable_shared_with_static_runtimes_CXX=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file, use it as
-	    # is; otherwise, prepend EXPORTS...
-	    archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-              cp $export_symbols $output_objdir/$soname.def;
-            else
-              echo EXPORTS > $output_objdir/$soname.def;
-              cat $export_symbols >> $output_objdir/$soname.def;
-            fi~
-            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    ld_shlibs_CXX=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc_CXX=no
-  hardcode_direct_CXX=no
-  hardcode_automatic_CXX=yes
-  hardcode_shlibpath_var_CXX=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec_CXX=''
-  fi
-  link_all_deplibs_CXX=yes
-  allow_undefined_flag_CXX=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-       if test yes != "$lt_cv_apple_cc_single_mod"; then
-      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
-    fi
-
-  else
-  ld_shlibs_CXX=no
-  fi
-
-	;;
-
-      os2*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
-	hardcode_minus_L_CXX=yes
-	allow_undefined_flag_CXX=unsupported
-	shrext_cmds=.dll
-	archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  prefix_cmds="$SED"~
-	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	    prefix_cmds="$prefix_cmds -e 1d";
-	  fi~
-	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-	enable_shared_with_static_runtimes_CXX=yes
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        ld_shlibs_CXX=no
-        ;;
-
-      freebsd-elf*)
-        archive_cmds_need_lc_CXX=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        ld_shlibs_CXX=yes
-        ;;
-
-      haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-        link_all_deplibs_CXX=yes
-        ;;
-
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='$wl-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test yes = "$GXX"; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test no = "$with_gnu_ld"; then
-	  hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      export_dynamic_flag_spec_CXX='$wl-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct_CXX=no
-            hardcode_shlibpath_var_CXX=no
-            ;;
-          *)
-            hardcode_direct_CXX=yes
-            hardcode_direct_absolute_CXX=yes
-            hardcode_minus_L_CXX=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        case $host_cpu in
-	          hppa*64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[3-9]*)
-	hardcode_direct_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='$wl-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	      else
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
-	      fi
-	    fi
-	    link_all_deplibs_CXX=yes
-	    ;;
-        esac
-        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-        hardcode_libdir_separator_CXX=:
-        inherit_rpath_CXX=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    archive_cmds_need_lc_CXX=no
-	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-	    whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
-	      prelink_cmds_CXX='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      old_archive_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-                $RANLIB $oldlib'
-	      archive_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      archive_expsym_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
-	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-	    whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    if test yes = "$supports_anon_versioning"; then
-	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-                echo "local: *; };" >> $output_objdir/$libname.ver~
-                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      no_undefined_flag_CXX=' -zdefs'
-	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
-	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	      compiler_needs_object_CXX=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        ld_shlibs_CXX=yes
-	;;
-
-      openbsd* | bitrig*)
-	if test -f /usr/libexec/ld.so; then
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	  hardcode_direct_absolute_CXX=yes
-	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
-	    export_dynamic_flag_spec_CXX='$wl-E'
-	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
-	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-		;;
-	      *)
-	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-                  echo "-hidden">> $lib.exp~
-                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
-                  $RM $lib.exp'
-	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-		;;
-	    esac
-
-	    hardcode_libdir_separator_CXX=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
-	      case $host in
-	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	        *)
-	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-	      hardcode_libdir_separator_CXX=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            archive_cmds_need_lc_CXX=yes
-	    no_undefined_flag_CXX=' -zdefs'
-	    archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    hardcode_libdir_flag_spec_CXX='-R$libdir'
-	    hardcode_shlibpath_var_CXX=no
-	    case $host_os in
-	      solaris2.[0-5] | solaris2.[0-5].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands '-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    link_all_deplibs_CXX=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      no_undefined_flag_CXX=' $wl-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-	      else
-	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
-	        # platform.
-	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-	      fi
-
-	      hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
-	      case $host_os in
-		solaris2.[0-5] | solaris2.[0-5].*) ;;
-		*)
-		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_CXX='$wl-z,text'
-      archive_cmds_need_lc_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We CANNOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	no_undefined_flag_CXX='$wl-z,text'
-	allow_undefined_flag_CXX='$wl-z,nodefs'
-	archive_cmds_need_lc_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
-	hardcode_libdir_separator_CXX=':'
-	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='$wl-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-              '"$old_archive_cmds_CXX"
-	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-              '"$reload_cmds_CXX"
-	    ;;
-	  *)
-	    archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-    esac
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-    test no = "$ld_shlibs_CXX" && can_build_shared=no
-
-    GCC_CXX=$GXX
-    LD_CXX=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    # Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $prev$p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test x-L = "$p" ||
-          test x-R = "$p"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test no = "$pre_test_object_deps_done"; then
-	 case $prev in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX=$prev$p
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX=$prev$p
-	 else
-	   postdeps_CXX="${postdeps_CXX} $prev$p"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test no = "$pre_test_object_deps_done"; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX=$p
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX=$p
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-case $host_os in
-interix[3-9]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-esac
-
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
- compiler_lib_search_dirs_CXX=
-if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test yes = "$GXX"; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic_CXX='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static_CXX='$wl-static'
-	;;
-      esac
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
-      ;;
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_CXX='-fPIC -shared'
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[4-9]*)
-	# All AIX code is PIC.
-	if test ia64 = "$host_cpu"; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
-	    if test ia64 != "$host_cpu"; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64, which still supported -KPIC.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-qpic'
-	    lt_prog_compiler_static_CXX='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      lt_prog_compiler_pic_CXX='-KPIC'
-	      lt_prog_compiler_static_CXX='-Bstatic'
-	      lt_prog_compiler_wl_CXX='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        lt_prog_compiler_pic_CXX='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-
-hard_links=nottested
-if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  case $host_os in
-  aix[4-9]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
-    # Without the "-l" option, or with the "-B" option, AIX nm treats
-    # weak defined symbols like other global defined symbols, whereas
-    # GNU nm marks them as "W".
-    # While the 'weak' keyword is ignored in the Export File, we need
-    # it in the Import File for the 'aix-soname' feature, so we have
-    # to replace the "-B" option with "-P" for AIX nm.
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX=$ltdll_cmds
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-      ;;
-    esac
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs_CXX=no
-    ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test no = "$ld_shlibs_CXX" && can_build_shared=no
-
-with_gnu_ld_CXX=$with_gnu_ld
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_CXX
-	  pic_flag=$lt_prog_compiler_pic_CXX
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-	  allow_undefined_flag_CXX=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_CXX=no
-	  else
-	    lt_cv_archive_cmds_need_lc_CXX=yes
-	  fi
-	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a(lib.so.V)'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  hardcode_libdir_flag_spec_CXX='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" ||
-   test -n "$runpath_var_CXX" ||
-   test yes = "$hardcode_automatic_CXX"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$hardcode_direct_CXX" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
-     test no != "$hardcode_minus_L_CXX"; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
-
-if test relink = "$hardcode_action_CXX" ||
-   test yes = "$inherit_rpath_CXX"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test yes != "$_lt_caught_CXX_error"
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-# Extract the first word of "mkdir", so it can be a program name with args.
-set dummy mkdir; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MKDIR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MKDIR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MKDIR=$ac_cv_path_MKDIR
-if test -n "$MKDIR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
-$as_echo "$MKDIR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-# Documentation.
-# Check whether --enable-documentation was given.
-if test "${enable_documentation+set}" = set; then :
-  enableval=$enable_documentation;
-else
-  enable_documentation=auto
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}doxygen", so it can be a program name with args.
-set dummy ${ac_tool_prefix}doxygen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DOXYGEN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DOXYGEN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-DOXYGEN=$ac_cv_path_DOXYGEN
-if test -n "$DOXYGEN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
-$as_echo "$DOXYGEN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_DOXYGEN"; then
-  ac_pt_DOXYGEN=$DOXYGEN
-  # Extract the first word of "doxygen", so it can be a program name with args.
-set dummy doxygen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_DOXYGEN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_DOXYGEN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_DOXYGEN="$ac_pt_DOXYGEN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_DOXYGEN=$ac_cv_path_ac_pt_DOXYGEN
-if test -n "$ac_pt_DOXYGEN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DOXYGEN" >&5
-$as_echo "$ac_pt_DOXYGEN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_DOXYGEN" = x; then
-    DOXYGEN="nodoxygen"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DOXYGEN=$ac_pt_DOXYGEN
-  fi
-else
-  DOXYGEN="$ac_cv_path_DOXYGEN"
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dot", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dot; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_DOT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$HAVE_DOT"; then
-  ac_cv_prog_HAVE_DOT="$HAVE_DOT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in NO
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_HAVE_DOT="${ac_tool_prefix}dot"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-HAVE_DOT=$ac_cv_prog_HAVE_DOT
-if test -n "$HAVE_DOT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOT" >&5
-$as_echo "$HAVE_DOT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_HAVE_DOT"; then
-  ac_ct_HAVE_DOT=$HAVE_DOT
-  # Extract the first word of "dot", so it can be a program name with args.
-set dummy dot; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_HAVE_DOT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_HAVE_DOT"; then
-  ac_cv_prog_ac_ct_HAVE_DOT="$ac_ct_HAVE_DOT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in NO
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_HAVE_DOT="dot"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_HAVE_DOT=$ac_cv_prog_ac_ct_HAVE_DOT
-if test -n "$ac_ct_HAVE_DOT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_HAVE_DOT" >&5
-$as_echo "$ac_ct_HAVE_DOT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_HAVE_DOT" = x; then
-    HAVE_DOT="YES"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    HAVE_DOT=$ac_ct_HAVE_DOT
-  fi
-else
-  HAVE_DOT="$ac_cv_prog_HAVE_DOT"
-fi
-
-if test "$enable_documentation" = "yes" && test "$DOXYGEN" = "nodoxygen"; then :
-  as_fn_error $? "could not find tools necessary to build documentation" "$LINENO" 5
-fi
- if test "$enable_documentation" != "no" -a "$DOXYGEN" != "nodoxygen"; then
-  BUILD_REFERENCE_TRUE=
-  BUILD_REFERENCE_FALSE='#'
-else
-  BUILD_REFERENCE_TRUE='#'
-  BUILD_REFERENCE_FALSE=
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-# See if we want stricter compiler warnings.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking maintainer mode" >&5
-$as_echo_n "checking maintainer mode... " >&6; }
-# Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode;
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_maintainer_mode}" >&5
-$as_echo "${enable_maintainer_mode}" >&6; }
-
-# See if we want runtime debug checking.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking audit" >&5
-$as_echo_n "checking audit... " >&6; }
-# Check whether --enable-audit was given.
-if test "${enable_audit+set}" = set; then :
-  enableval=$enable_audit;
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_audit}" >&5
-$as_echo "${enable_audit}" >&6; }
-
-# See if we want "suggestions," such as "this class could be final."
-# (The suggestions are often useful, but can also easily be wrong.)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking suggest" >&5
-$as_echo_n "checking suggest... " >&6; }
-# Check whether --enable-suggest was given.
-if test "${enable_suggest+set}" = set; then :
-  enableval=$enable_suggest;
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_suggest}" >&5
-$as_echo "${enable_suggest}" >&6; }
-
-
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared;
-fi
-
-if test "${shared}" = "yes" ; then :
-  CPPFLAGS="$CPPFLAGS -DPQXX_SHARED"
-fi
-
-
-# Add options to compiler command line, if compiler accepts them.
-add_compiler_opts_if_ok() {
-	for option in $*
-	do
-		ACO_SAVE_CXXFLAGS="$CXXFLAGS"
-		CXXFLAGS="$CXXFLAGS $option"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $option" >&5
-$as_echo_n "checking whether $CXX accepts $option... " >&6; }
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  has_option=yes
-else
-  has_option=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
-$as_echo "$has_option" >&6; }
-		if test "$has_option" = "no" ; then :
-  CXXFLAGS="$ACO_SAVE_CXXFLAGS"
-fi
-	done
-}
-
-
-# Add options to compiler command line, unconditionally.
-add_compiler_opts() {
-	CXXFLAGS="$CXXFLAGS $*"
-}
-
-
-# It's tempting to use Autoconf Archive's AX_CXX_COMPILE_STDCXX_17 for this,
-# but it's 2022 and the C++20 equivalent isn't quite ready for use.
-# Seems simpler and more reliable for the user to arrange for the desired
-# language versions by setting the appropriate option for their compiler.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sufficient C++ language/library level" >&5
-$as_echo_n "checking for sufficient C++ language/library level... " >&6; }
-sufficient_cxx=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	#if __cplusplus < 201611L
-	#error "Need C++17 or better."
-	#endif
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  sufficient_cxx=yes
-else
-  sufficient_cxx=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sufficient_cxx" >&5
-$as_echo "$sufficient_cxx" >&6; }
-if test "$sufficient_cxx" != "yes"
-then
-	as_fn_error $? "This libpqxx version needs at least C++17." "$LINENO" 5
-fi
-
-
-# Let's try to get the compiler to be helpful.
-#
-# (Omit options -Weffc++ and -Wabi because they currently yield too many
-# warnings in gcc's standard headers; omit -Wunreachable-code because it isn't
-# always right)
-if test "$GCC" = "yes"
-then
-	# In maintainer mode, enable all the warning options we can.
-	if test "$enable_maintainer_mode" = "yes"
-	then
-		# "Eternal" (FLW) g++ options.  These have been around for
-		# ages, and both g++ and clang++ support them.  Don't bother
-		# checking for support; just add them to the compiler options.
-		add_compiler_opts \
-			-fstrict-enums \
-			-Werror \
-			-Wall \
-			-pedantic \
-			-Wcast-align  \
-			-Wcast-qual  \
-			-Wconversion \
-			-Wctor-dtor-privacy \
-			-Wendif-labels \
-			-Wextra \
-			-Wfloat-equal \
-			-Wformat=2 \
-			-Wformat-security \
-			-Wmissing-include-dirs \
-			-Wno-div-by-zero \
-			-Wnon-virtual-dtor \
-			-Wold-style-cast \
-			-Woverlength-strings \
-			-Woverloaded-virtual \
-			-Wpointer-arith  \
-			-Wredundant-decls \
-			-Wshadow \
-			-Wsign-promo \
-			-Wundef \
-			-Wunused \
-			-Wwrite-strings
-
-		# "Iffy" g++ options.  Some reasonably current g++-like
-		# compilers may not support these.
-		add_compiler_opts_if_ok \
-			-fnothrow-opt \
-			-Wattribute-alias=2 \
-			-Wextra-semi \
-			-Wlogical-op \
-			-Wmismatched-tags \
-			-Wnoexcept \
-			-Wredundant-tags \
-			-Wrestrict \
-			-Wstringop-overflow \
-			-Wzero-as-null-pointer-constant \
-			-Warray-bounds=2 \
-			-Wduplicated-branches \
-			-Wduplicated-cond \
-			-Wsuggest-attribute=noreturn \
-			-Wsuggest-override \
-			-Wtrampolines
-	fi
-
-	# In "audit," enable all runtime checks we can.
-	if test "$enable_audit" = "yes"
-	then
-		add_compiler_opts_if_ok \
-			-D_FORTIFY_SOURCE=2 \
-			-fsanitize=address \
-			-fsanitize-address-use-after-scope \
-			-fsanitize=alignment \
-			-fsanitize=bool \
-			-fsanitize=bounds \
-			-fsanitize=bounds-strict \
-			-fsanitize=builtin \
-			-fsanitize=enum \
-			-fsanitize=float-cast-overflow \
-			-fsanitize=float-divide-by-zero \
-			-fsanitize=integer-divide-by-zero \
-			-fsanitize=leak \
-			-fsanitize=nonnull-attribute \
-			-fsanitize=null \
-			-fsanitize=object-size \
-			-fsanitize=pointer-compare \
-			-fsanitize=pointer-overflow \
-			-fsanitize=pointer-subtract \
-			-fsanitize=return \
-			-fsanitize=returns-nonnull-attribute \
-			-fsanitize=shift \
-			-fsanitize=shift-base \
-			-fsanitize=shift-exponent \
-			-fsanitize=signed-integer-overflow \
-			-fsanitize=undefined \
-			-fsanitize=unreachable \
-			-fsanitize=vla-bound \
-			-fsanitize=vptr \
-			-fstack-protector-all
-	fi
-
-	# In "suggest" mode, enable a bunch of code suggestions.
-	if test "$enable_suggest" = "yes"
-	then
-		add_compiler_opts_if_ok \
-			-Wsuggest-attribute=cold \
-			-Wsuggest-attribute=const \
-			-Wsuggest-attribute=malloc \
-			-Wsuggest-attribute=pure \
-			-Wsuggest-final-types \
-			-Wsuggest-final-methods
-	fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking g++ visibility attribute" >&5
-$as_echo_n "checking g++ visibility attribute... " >&6; }
-gcc_visibility=yes
-SAVE_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS -Werror"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for gcc-style "visibility" attribute.
-
-struct __attribute__((visibility("hidden"))) D
-
-{
-
-  D() {}
-
-  int f() { return 0; }
-
-};
-
-
-
-int main()
-
-{
-
-  D d;
-
-  return d.f();
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_GCC_VISIBILITY 1" >>confdefs.h
-
-else
-  gcc_visibility=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_visibility" >&5
-$as_echo "$gcc_visibility" >&6; }
-CXXFLAGS="$SAVE_CXXFLAGS"
-if test "$gcc_visibility" = "yes"
-then
-    # Make internal definitions accessible only to the library itself.
-    # Only definitions marked PQXX_LIBEXPORT will be accessible.
-    add_compiler_opts -fvisibility=hidden
-    add_compiler_opts -fvisibility-inlines-hidden
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking g++ pure attribute" >&5
-$as_echo_n "checking g++ pure attribute... " >&6; }
-gcc_pure=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for gcc-style "pure" attribute.
-
-int __attribute__((pure)) f()
-
-{
-
-  return 0;
-
-}
-
-
-
-int main()
-
-{
-
-  return f();
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_GCC_PURE 1" >>confdefs.h
-
-else
-  gcc_pure=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_pure" >&5
-$as_echo "$gcc_pure" >&6; }
-
-fi # End of gcc-specific part.
-
-
-# Check for __cxa_demangle.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __cxa_demangle" >&5
-$as_echo_n "checking __cxa_demangle... " >&6; }
-cxa_demangle=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for cross-vendor C++ ABI's __cxa_demangle function.
-
-#include <cstdlib>
-
-#include <cstring>
-
-#include <stdexcept>
-
-#include <typeinfo>
-
-
-
-#include <cxxabi.h>
-
-
-
-int main()
-
-{
-
-  int status = 0;
-
-  char *name =
-
-    abi::__cxa_demangle(typeid(10).name(), nullptr, nullptr, &status);
-
-  if (status != 0)
-
-    throw std::runtime_error("Demangle failed!");
-
-  int result = std::strcmp(name, "int");
-
-  std::free(name);
-
-  return result;
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_CXA_DEMANGLE 1" >>confdefs.h
-
-else
-  cxa_demangle=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cxa_demangle" >&5
-$as_echo "$cxa_demangle" >&6; }
-
-
-# Check for sufficient Concepts support, introduced with C++20.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking concepts" >&5
-$as_echo_n "checking concepts... " >&6; }
-concepts=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for concepts support.  Not just the language feature; also headers.
-
-#include <iostream>
-
-#include <ranges>
-
-#include <vector>
-
-
-
-
-
-template<typename T>
-
-concept Foo = std::ranges::input_range<T>;
-
-
-
-
-
-template<Foo F> auto foo(F const &r)
-
-{
-
-  return std::distance(std::begin(r), std::end(r));
-
-}
-
-
-
-
-
-int main()
-
-{
-
-  std::vector<int> const v{1, 2, 3};
-
-  std::cout << foo(v) << '\n';
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_CONCEPTS 1" >>confdefs.h
-
-else
-  concepts=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $concepts" >&5
-$as_echo "$concepts" >&6; }
-
-
-# Check for C++20 std::span.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking std::span" >&5
-$as_echo_n "checking std::span... " >&6; }
-span=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for std::span.
-
-#include <span>
-
-
-
-int main(int argc, char **argv)
-
-{
-
-  std::span<char *> args{argv, static_cast<std::size_t>(argc)};
-
-  return static_cast<int>(std::size(args) - 1u);
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_SPAN 1" >>confdefs.h
-
-else
-  span=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $span" >&5
-$as_echo "$span" >&6; }
-
-
-# Check for multidimensional subscript operator support.  Proposed for C++23.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multidimensional subscript operator support" >&5
-$as_echo_n "checking for multidimensional subscript operator support... " >&6; }
-multidim_subscript=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for multidimensional subscript operator support.
-
-// Proposed for C++23: P2128R6.
-
-struct table
-
-{
-
-  int width = 100;
-
-
-
-  int operator[](int x, int y) const { return x + width * y; }
-
-};
-
-
-
-
-
-int main()
-
-{
-
-  return table{}[0, 0];
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT 1" >>confdefs.h
-
-else
-  multidim_subscript=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $multidim_subscript" >&5
-$as_echo "$multidim_subscript" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror_r()" >&5
-$as_echo_n "checking for strerror_r()... " >&6; }
-strerror_r=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Check for strerror_r.
-
-// It can be either the POSIX version (which returns int) or the GNU version
-
-// (which returns char *).
-
-
-
-#include <cstring>
-
-#include <type_traits>
-
-
-
-int main()
-
-{
-
-  char buffer[200];
-
-  auto res{strerror_r(1, buffer, 200)};
-
-  // Sidestep type differences.  We don't really care what the value is.
-
-  return not not res;
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_STRERROR_R 1" >>confdefs.h
-
-else
-  strerror_r=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $strerror_r" >&5
-$as_echo "$strerror_r" >&6; }
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror_s()" >&5
-$as_echo_n "checking for strerror_s()... " >&6; }
-strerror_s=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for strerror_s, as defined in Windows and C11.
-
-// Presumably this'll be part of the C++ standard some day.
-
-
-
-#include <cstring>
-
-
-
-int main()
-
-{
-
-  using namespace std;
-
-  char buf[200];
-
-  return strerror_s(buf, 200, 1);
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_STRERROR_S 1" >>confdefs.h
-
-else
-  strerror_s=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $strerror_s" >&5
-$as_echo "$strerror_s" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::chrono::year_month_day etc" >&5
-$as_echo_n "checking for std::chrono::year_month_day etc... " >&6; }
-year_month_day=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for std::chrono::year_month_day etc.
-
-#include <chrono>
-
-
-
-int main()
-
-{
-
-  return int(std::chrono::year{1});
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_YEAR_MONTH_DAY 1" >>confdefs.h
-
-else
-  year_month_day=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $year_month_day" >&5
-$as_echo "$year_month_day" >&6; }
-
-
-# Check for [[likely]] and [[unlikely]] attributes.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking attributes \"likely\" and \"unlikely\"." >&5
-$as_echo_n "checking attributes \"likely\" and \"unlikely\".... " >&6; }
-likely=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for C++20 [[likely]] and [[unlikely]] attributes.
-
-
-
-int main(int argc, char **)
-
-{
-
-#if __cplusplus < 202002L
-
-  deliberately_fail(because, older, C++, standard);
-
-#endif
-
-
-
-  int x = 0;
-
-  if (argc == 1) [[likely]]
-
-    x = 0;
-
-  else
-
-    x = 1;
-
-  return x;
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_LIKELY 1" >>confdefs.h
-
-else
-  likely=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $likely" >&5
-$as_echo "$likely" >&6; }
-
-
-# It's mid-2019, and gcc's charconv supports integers but not yet floats.
-# So for now, we test for int and float conversion... separately.
-#
-# It's worse for older clang versions, which compile the integer conversions
-# but then fail at link time because of a missing symbol "__muloti4" with the
-# "long long" version.  I couldn't resolve that symbol by adding -lm either.
-# So don't just compile these tests; link them as well.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++17 charconv integer conversion" >&5
-$as_echo_n "checking for C++17 charconv integer conversion... " >&6; }
-have_charconv_int=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for std::to_string/std::from_string for integral types.
-
-#include <charconv>
-
-#include <iterator>
-
-
-
-int main()
-
-{
-
-  char z[100];
-
-  auto rt = std::to_chars(std::begin(z), std::end(z), 9ULL);
-
-  if (rt.ec != std::errc{})
-
-    return 1;
-
-  unsigned long long n;
-
-  auto rf = std::from_chars(std::cbegin(z), std::cend(z), n);
-
-  if (rf.ec != std::errc{})
-
-    return 2;
-
-  return (n == 9ULL) ? 0 : 1;
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_CHARCONV_INT 1" >>confdefs.h
-
-else
-  have_charconv_int=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_charconv_int" >&5
-$as_echo "$have_charconv_int" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++17 charconv floating-point conversion" >&5
-$as_echo_n "checking for C++17 charconv floating-point conversion... " >&6; }
-have_charconv_float=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for std::to_string/std::from_string for floating-point types.
-
-#include <charconv>
-
-#include <iterator>
-
-
-
-int main()
-
-{
-
-  char z[100];
-
-  auto rt = std::to_chars(std::begin(z), std::end(z), 3.14159L);
-
-  if (rt.ec != std::errc{})
-
-    return 1;
-
-  long double n;
-
-  auto rf = std::from_chars(std::cbegin(z), std::cend(z), n);
-
-  if (rf.ec != std::errc{})
-
-    return 2;
-
-  return (n > 3 and n < 4) ? 0 : 1;
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_CHARCONV_FLOAT 1" >>confdefs.h
-
-else
-  have_charconv_float=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_charconv_float" >&5
-$as_echo "$have_charconv_float" >&6; }
-
-# As per #262, clang with libcxxrt does not support thread_local on non-POD
-# objects.  Luckily we can live without those, it's just less efficient.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for full thread_local support" >&5
-$as_echo_n "checking for full thread_local support... " >&6; }
-have_thread_local=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for std::to_string/std::from_string for floating-point types.
-
-#include <iostream>
-
-#include <sstream>
-
-
-
-int main(int argc, char **)
-
-{
-
-#if defined(__MINGW32__) && defined(__GNUC__)
-
-#  if __GNUC__ < 11 || ((__GNUC__ == 11) && (__GNU_MINOR__ == 0))
-
-#    error "On MinGW before gcc 11.1, thread_local breaks at run time."
-
-#  endif
-
-#endif
-
-  thread_local std::stringstream s;
-
-  s << argc;
-
-  std::cout << s.str();
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_THREAD_LOCAL 1" >>confdefs.h
-
-else
-  have_thread_local=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_thread_local" >&5
-$as_echo "$have_thread_local" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::this_thread::sleep_for" >&5
-$as_echo_n "checking for std::this_thread::sleep_for... " >&6; }
-have_sleep_for=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for std::this_thread::sleep_for().
-
-/* For some reason MinGW's <thread> header seems to be broken.
-
- *
-
- * But it gets worse.  It looks as if we can include <thread> without problems
-
- * in this configuration test.  Why does it break when MinGW users try to build
-
- * the library, but succeed when we try it here?
-
- *
-
- * To try and get close to the situation in the library code itself, we try
-
- * including some standard headers that we don't strictly need here.
-
- */
-
-
-
-#if __has_include(<ciso646>)
-
-#  include <ciso646>
-
-#endif
-
-
-
-#include <cerrno>
-
-#include <cmath>
-
-#include <cstdlib>
-
-#include <cstring>
-
-#include <new>
-
-
-
-#include <chrono>
-
-#include <thread>
-
-
-
-int main()
-
-{
-
-  std::this_thread::sleep_for(std::chrono::microseconds{10u});
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_SLEEP_FOR 1" >>confdefs.h
-
-else
-  have_sleep_for=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sleep_for" >&5
-$as_echo "$have_sleep_for" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::cmp_greater, std::cmp_less_equal, etc" >&5
-$as_echo_n "checking for std::cmp_greater, std::cmp_less_equal, etc... " >&6; }
-have_cmp=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for C++20 std::cmp_greater etc. support.
-
-#include <utility>
-
-
-
-
-
-int main()
-
-{
-
-  return std::cmp_greater(-1, 2u) && std::cmp_less_equal(3, 0);
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_CMP 1" >>confdefs.h
-
-else
-  have_cmp=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_cmp" >&5
-$as_echo "$have_cmp" >&6; }
-
-
-# Doing my own check for poll().  There's one built into autoconf-archive, but
-# it produces warnings in C++ (about unnecessarily using "struct", and using 0
-# as a null pointer constant).  In maintainer mode, those warnings turn into
-# errors.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poll()" >&5
-$as_echo_n "checking for poll()... " >&6; }
-ax_cv_have_poll=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Test for poll().
-
-#include <poll.h>
-
-
-
-int main()
-
-{
-
-  return poll(nullptr, 0, 0);
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_POLL 1" >>confdefs.h
-
-else
-  ax_cv_have_poll=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_poll" >&5
-$as_echo "$ax_cv_have_poll" >&6; }
-
-if test "$ax_cv_have_poll" != "yes"
-then
-# No poll(); we'll fall back to select().
-
-# Some systems keep select() in a separate library which is not linked by
-# default.  See if we need one of those.
-socklibok=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing select" >&5
-$as_echo_n "checking for library containing select... " >&6; }
-if ${ac_cv_search_select+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char select ();
-int
-main ()
-{
-return select ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' socket nsl ws2_32 wsock32 winsock; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_search_select=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_select+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_select+:} false; then :
-
-else
-  ac_cv_search_select=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_select" >&5
-$as_echo "$ac_cv_search_select" >&6; }
-ac_res=$ac_cv_search_select
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  socklibok=yes
-fi
-
-
-# Microsoft proprietary libraries do not work with code that is generated with
-# autoconf's SEARCH_LIBS macro, so we need to check manually and just use the
-# first socket library available.
-# We only do this if select() is not available by other means, to avoid picking
-# up an unnecessary Windows compatibility library on a non-Windows system.
-for l in ws2_32 wsock32 winsock
-do
-	if test "${socklibok}" != "yes"
-	then
-		as_ac_Lib=`$as_echo "ac_cv_lib_$l''_main" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$l" >&5
-$as_echo_n "checking for main in -l$l... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$l  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  LIBS="$LIBS -l$l";socklibok=yes
-fi
-
-	fi
-done
-
-if test "${socklibok}" != "yes"
-then
-	as_fn_error $? "
-Could not figure out how to link a simple sockets-based program.  Please read
-the config.log file for more clues as to why this failed.
-" "$LINENO" 5
-fi
-
-fi # No poll()
-
-
-# Find PostgreSQL includes and libraries
-# Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-for ac_prog in pg_config
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PG_CONFIG=$ac_cv_path_PG_CONFIG
-if test -n "$PG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-$as_echo "$PG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$PG_CONFIG" && break
-done
-
-
-
-# Check whether --with-postgres-include was given.
-if test "${with_postgres_include+set}" = set; then :
-  withval=$with_postgres_include; if test "x$with_postgres_include" = "xyes"; then :
-  with_postgres_include=""
-fi
-fi
-
-
-if test -n "$with_postgres_include"
-then
-    POSTGRES_INCLUDE="-I$with_postgres_include"
-else
-    if test -x "$PKG_CONFIG" || test -x "$PG_CONFIG"
-    then
-        # We should prefer pkg-config over pg_config, but there seems to be a
-        # problem in pkg-config 1.6.3.  Until that's been resolved (#291), go
-        # with pg_config if we can.
-        if test -x "$PG_CONFIG"
-        then
-            # From pg_config we can either get the C compiler options used to
-            # compile postgres, which isn't quite what we want; or we can get
-            # the headers directory, without the full option.  That's something
-            # we can work with.  The compiler must support the "-I" option for
-            # that, but both scripts assume that anyway.
-            POSTGRES_INCLUDE="-I$($PG_CONFIG --includedir)"
-        else
-            # From pkg-config we can get the compiler options to extend the
-            # include path.  We use that.
-            POSTGRES_INCLUDE=$($PKG_CONFIG libpq --cflags-only-I)
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: finding PostgreSQL headers using $POSTGRES_INCLUDE" >&5
-$as_echo "$as_me: finding PostgreSQL headers using $POSTGRES_INCLUDE" >&6;}
-    else
-        POSTGRES_INCLUDE=""
-
-        # We have nothing to tell us where the libpq headers are.  That's fine
-        # if the compiler can find it, but if not, fail here.
-
-ac_fn_cxx_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpq_fe_h" = xyes; then :
-
-else
-  as_fn_error $? "
-Can't find the main PostgreSQL client header, libpq-fe.h.  Make sure that it
-is installed, and either use the --with-postgres-include option or install
-pkg-config.
-" "$LINENO" 5
-fi
-
-
-    fi
-fi
-
-
-# Add the compiler option so we can compile configure tests which rely on the
-# libpq headers.
-CPPFLAGS="$CPPFLAGS $POSTGRES_INCLUDE"
-
-
-
-# Check whether --with-postgres-lib was given.
-if test "${with_postgres_lib+set}" = set; then :
-  withval=$with_postgres_lib; if test "x$with_postgres_lib" = "xyes"; then :
-  with_postgres_lib=""
-fi
-fi
-
-
-# If no --with-postgres-lib was given, and we have pkg-config, use that.
-if test -z "$with_postgres_lib" -a -x "$PKG_CONFIG"; then :
-  with_postgres_lib=$($PKG_CONFIG libpq --libs-only-L | sed 's/^-L//')
-fi
-
-# pg_config is deprecated, but for some users it may still provide the only
-# right answer.  For instance, `pkg-config` may not know where `libpq` is
-# installed.
-if test -z "$with_postgres_lib" -a -x "$PG_CONFIG"; then :
-  with_postgres_lib=$($PG_CONFIG --libdir)
-fi
-
-if test -n "$with_postgres_lib"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: using PostgreSQL libraries at $with_postgres_lib" >&5
-$as_echo "$as_me: using PostgreSQL libraries at $with_postgres_lib" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: using PostgreSQL libraries in default location" >&5
-$as_echo "$as_me: using PostgreSQL libraries in default location" >&6;}
-fi
-
-
-
-
-ac_fn_cxx_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpq_fe_h" = xyes; then :
-
-else
-  as_fn_error $? "
-Can't find the main PostgreSQL client header, libpq-fe.h.  Are you sure the
-libpq headers are installed correctly, and that we've got the right path?
-" "$LINENO" 5
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ability to compile source files using libpq" >&5
-$as_echo_n "checking for ability to compile source files using libpq... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include<libpq-fe.h>
-int
-main ()
-{
-PQexec(nullptr,"")
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  as_fn_error $? "
-Could not compile a call to a basic libpq function.  There must be something
-seriously wrong with the headers that \"pg_config --includedir\" or \"pkg-config
-libpq --cflags\" pointed to; the contents of config.log may give you a clue
-about the nature of the failure.
-Source including the libpq header libpq-fe.h can be compiled, but a call to the
-most basic libpq function PQexec() failed to compile successfully.  This is the
-litmus test for a working libpq.
-" "$LINENO" 5
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
-if test "x${with_postgres_lib}" = "x"; then
-    with_postgres_libpath=""
-else
-    with_postgres_libpath="-L${with_postgres_lib}"
-fi
-LDFLAGS="$LDFLAGS ${with_postgres_libpath}"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexec in -lpq" >&5
-$as_echo_n "checking for PQexec in -lpq... " >&6; }
-if ${ac_cv_lib_pq_PQexec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpq ${with_postgres_libpath} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char PQexec ();
-int
-main ()
-{
-return PQexec ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_pq_PQexec=yes
-else
-  ac_cv_lib_pq_PQexec=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQexec" >&5
-$as_echo "$ac_cv_lib_pq_PQexec" >&6; }
-if test "x$ac_cv_lib_pq_PQexec" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPQ 1
-_ACEOF
-
-  LIBS="-lpq $LIBS"
-
-else
-  as_fn_error $? "
-Did not find the PQexec() function in libpq.  This is the litmus test for a
-working libpq installation.
-
-A source file using the PQexec() function did compile without problems, and the
-libpq library is available for linking, but for some reason a call to PQexec()
-failed to link properly to the libpq library.  This may be because the libpq
-library file is damaged, or in some incorrect format, or if your libpq is much
-more recent than libpqxx version $PQXX_ABI, perhaps libpq has undergone a
-radical ABI change.
-
-The last parts of config.log may give you a clue as to what really went wrong,
-but be warned that this is no easy reading.  Look for the last error message
-occurring in the file.
-" "$LINENO" 5
-fi
-
-
-
-# PQencryptPasswordConn was added in postgres 10.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQencryptPasswordConn" >&5
-$as_echo_n "checking for PQencryptPasswordConn... " >&6; }
-have_pqencryptpasswordconn=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include<libpq-fe.h>
-int
-main ()
-{
-
-			extern PGconn *conn;
-			PQencryptPasswordConn(
-				conn, "pwd", "user", "scram-sha-256")
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_PQENCRYPTPASSWORDCONN 1" >>confdefs.h
-
-else
-  have_pqencryptpasswordconn=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pqencryptpasswordconn" >&5
-$as_echo "$have_pqencryptpasswordconn" >&6; }
-
-
-# "Pipeline mode" was introduced in libpq 14.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq pipeline mode" >&5
-$as_echo_n "checking for libpq pipeline mode... " >&6; }
-have_pq_pipeline=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include<libpq-fe.h>
-int
-main ()
-{
-
-			extern PGconn *conn;
-			PQenterPipelineMode(conn)
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_PQ_PIPELINE 1" >>confdefs.h
-
-else
-  have_pq_pipeline=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pq_pipeline" >&5
-$as_echo "$have_pq_pipeline" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable std::filesystem::path" >&5
-$as_echo_n "checking for usable std::filesystem::path... " >&6; }
-have_path=yes
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Check for working std::filesystem support.
-
-#include <filesystem>
-
-
-
-
-
-int main()
-
-{
-
-  // Apparently some versions of MinGW lack this comparison operator.
-
-  return std::filesystem::path{} != std::filesystem::path{};
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-$as_echo "#define PQXX_HAVE_PATH 1" >>confdefs.h
-
-else
-  have_path=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_path" >&5
-$as_echo "$have_path" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need a link option for <filesystem> support" >&5
-$as_echo_n "checking whether we need a link option for <filesystem> support... " >&6; }
-LIBS_SAVE="$LIBS"
-found_fslib=no
-for l in '' '-lstdc++fs' '-lc++fs'
-do
-	if test "$found_fslib" != "yes"
-	then
-		LIBS="$LIBS $l"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-// Check whether we need to link to the stdc++fs library.
-
-//
-
-// We assume that the presence of the <filesystem> header means that we have
-
-// support for the basics of std::filesystem.  This check will succeed if
-
-// either there is no <filesystem> header, or there is one and it works without
-
-// any special options.  If the link fails, we assume that -lstdc++fs will fix
-
-// it for us.
-
-
-
-#include <iostream>
-
-
-
-#if __has_include(<filesystem>)
-
-#  include <filesystem>
-
-#endif
-
-
-
-
-
-int main()
-
-{
-
-#if __has_include(<filesystem>)
-
-  std::cout << std::filesystem::path{"foo.bar"}.c_str() << '\n';
-
-#endif
-
-}
-
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  found_fslib=yes
-else
-  LIBS="$LIBS_SAVE"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-		if test "$found_fslib" = "yes"
-		then
-			result_msg="$l"
-			# (And keep our current value of $LIBS.)
-		fi
-	fi
-done
-
-if test "$found_fslib" != "yes"
-then
-	as_fn_error $? "
-There seems to be <filesystem> support, but I could not figure out now to make
-it work.  You'll have to add set your own build options for this.
-	" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result_msg" >&5
-$as_echo "$result_msg" >&6; }
-
-
-# Remove redundant occurrances of -lpq
-LIBS=$(echo "$LIBS" | sed -e 's/-lpq * -lpq\>/-lpq/g')
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that type of libpq's Oid is as expected" >&5
-$as_echo_n "checking that type of libpq's Oid is as expected... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#include<libpq-fe.h>
-			#include"${srcdir}/include/pqxx/internal/libpq-forward.hxx"
-			extern void f(pqxx::oid&);
-
-int
-main ()
-{
-Oid o;f(o)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  as_fn_error $? "
-The Oid typedef in libpq has changed.  Please notify the libpqxx authors of the
-change!
-" "$LINENO" 5
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile doc/Doxyfile src/Makefile test/Makefile tools/Makefile include/Makefile include/pqxx/Makefile libpqxx.pc"
-
-
-
-ac_config_commands="$ac_config_commands configitems"
-
-
-ac_config_files="$ac_config_files compile_flags"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_REFERENCE_TRUE}" && test -z "${BUILD_REFERENCE_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_REFERENCE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by libpqxx $as_me 7.7.3, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <Jeroen T. Vermeulen>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-libpqxx config.status 7.7.3
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
-configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_import \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-lt_cv_nm_interface \
-nm_file_list_spec \
-lt_cv_truncate_bin \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib \
-compiler_lib_search_dirs \
-predep_objects \
-postdep_objects \
-predeps \
-postdeps \
-compiler_lib_search_path \
-LD_CXX \
-reload_flag_CXX \
-compiler_CXX \
-lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_pic_CXX \
-lt_prog_compiler_wl_CXX \
-lt_prog_compiler_static_CXX \
-lt_cv_prog_compiler_c_o_CXX \
-export_dynamic_flag_spec_CXX \
-whole_archive_flag_spec_CXX \
-compiler_needs_object_CXX \
-with_gnu_ld_CXX \
-allow_undefined_flag_CXX \
-no_undefined_flag_CXX \
-hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_separator_CXX \
-exclude_expsyms_CXX \
-include_expsyms_CXX \
-file_list_spec_CXX \
-compiler_lib_search_dirs_CXX \
-predep_objects_CXX \
-postdep_objects_CXX \
-predeps_CXX \
-postdeps_CXX \
-compiler_lib_search_path_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-configure_time_dlsearch_path \
-configure_time_lt_sys_library_path \
-reload_cmds_CXX \
-old_archive_cmds_CXX \
-old_archive_from_new_cmds_CXX \
-old_archive_from_expsyms_cmds_CXX \
-archive_cmds_CXX \
-archive_expsym_cmds_CXX \
-module_cmds_CXX \
-module_expsym_cmds_CXX \
-export_symbols_cmds_CXX \
-prelink_cmds_CXX \
-postlink_cmds_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-
-# See if we are running on zsh, and set the options that allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "include/pqxx/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/pqxx/config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
-    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "include/pqxx/Makefile") CONFIG_FILES="$CONFIG_FILES include/pqxx/Makefile" ;;
-    "libpqxx.pc") CONFIG_FILES="$CONFIG_FILES libpqxx.pc" ;;
-    "configitems") CONFIG_COMMANDS="$CONFIG_COMMANDS configitems" ;;
-    "compile_flags") CONFIG_FILES="$CONFIG_FILES compile_flags" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
-  # requiring Autoconf 2.70 or later.
-  case $CONFIG_FILES in #(
-  *\'*) :
-    eval set x "$CONFIG_FILES" ;; #(
-  *) :
-    set x $CONFIG_FILES ;; #(
-  *) :
-     ;;
-esac
-  shift
-  # Used to flag and report bootstrapping failures.
-  am_rc=0
-  for am_mf
-  do
-    # Strip MF so we end up with the name of the file.
-    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
-    # dependency-tracking related rules and includes.
-    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      || continue
-    am_dirpart=`$as_dirname -- "$am_mf" ||
-$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$am_mf" : 'X\(//\)[^/]' \| \
-	 X"$am_mf" : 'X\(//\)$' \| \
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$am_mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    am_filepart=`$as_basename -- "$am_mf" ||
-$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$am_mf" : 'X\(//\)$' \| \
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$am_mf" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { echo "$as_me:$LINENO: cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles" >&5
-   (cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } || am_rc=$?
-  done
-  if test $am_rc -ne 0; then
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  If GNU make was not used, consider
-    re-running the configure script with MAKE=\"gmake\" (or whatever is
-    necessary).  You can also try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-  { am_dirpart=; unset am_dirpart;}
-  { am_filepart=; unset am_filepart;}
-  { am_mf=; unset am_mf;}
-  { am_rc=; unset am_rc;}
-  rm -f conftest-deps.mk
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options that allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}"; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile=${ofile}T
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-# Generated automatically by $as_me ($PACKAGE) $VERSION
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-# Copyright (C) 2014 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program or library that is built
-# using GNU Libtool, you may include this file under the  same
-# distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags='CXX '
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shared archive member basename,for filename based shared library versioning on AIX.
-shared_archive_member_spec=$shared_archive_member_spec
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm into a list of symbols to manually relocate.
-global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name lister interface.
-nm_interface=$lt_lt_cv_nm_interface
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and where our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# Command to truncate a binary pipe.
-lt_truncate_bin=$lt_lt_cv_truncate_bin
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
-
-# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
-configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects
-postdep_objects=$lt_postdep_objects
-predeps=$lt_predeps
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-    cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test set != "${COLLECT_NAMES+set}"; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_CXX
-
-# A language specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_CXX
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_CXX
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute_CXX
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_CXX
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_CXX
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_CXX
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_CXX
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_CXX
-postdep_objects=$lt_postdep_objects_CXX
-predeps=$lt_predeps_CXX
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# ### END LIBTOOL TAG CONFIG: CXX
-_LT_EOF
-
- ;;
-    "configitems":C) "${srcdir}/tools/splitconfig" "${srcdir}" ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff --git a/ext/libpqxx-7.7.3/configure.ac b/ext/libpqxx-7.7.3/configure.ac
deleted file mode 100644
index d6351faf2..000000000
--- a/ext/libpqxx-7.7.3/configure.ac
+++ /dev/null
@@ -1,738 +0,0 @@
-# Generate configure script for libpqxx.  This needs the autoconf archive
-# package installed.  (The configure script itself does not require it though.)
-
-AC_PREREQ(2.69)
-AC_INIT(
-	libpqxx,
-	[m4_esyscmd_s([./tools/extract_version])],
-	[Jeroen T. Vermeulen])
-AC_LANG(C++)
-
-AC_CONFIG_SRCDIR([src/connection.cxx])
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR([config/m4])
-AM_INIT_AUTOMAKE([subdir-objects])
-
-PQXX_ABI=m4_esyscmd_s([./tools/extract_version --abi])
-AC_SUBST(PQXXVERSION, $PACKAGE_VERSION)
-AC_SUBST(PQXX_ABI)
-
-AC_CONFIG_HEADER([include/pqxx/config.h])
-
-# Default prefix for installs.
-AC_PREFIX_DEFAULT(/usr/local)
-
-
-# Read test programme from config-test.
-AC_DEFUN([read_test], [AC_LANG_SOURCE(
-	esyscmd(tools/m4esc.py --input=config-tests/$1))])
-
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-AC_PATH_PROG([MKDIR], [mkdir])
-
-# Documentation.
-AC_ARG_ENABLE(
-	documentation,
-	[AS_HELP_STRING([--enable-documentation], [Generate documentation])],
-	[],
-	[enable_documentation=auto])
-AC_ARG_VAR([DOXYGEN],
-	[Path to doxygen needed to build reference documentation])
-AC_PATH_TOOL([DOXYGEN], [doxygen], [nodoxygen])
-AC_ARG_VAR([HAVE_DOT],
-	[Variable used by doxygen to declare availibility of dot])
-AC_CHECK_TOOL([HAVE_DOT], [dot], [YES], [NO])
-AS_IF([test "$enable_documentation" = "yes" && test "$DOXYGEN" = "nodoxygen"],
-      [AC_MSG_ERROR([could not find tools necessary to build documentation])])
-AM_CONDITIONAL([BUILD_REFERENCE],
-	[test "$enable_documentation" != "no" -a "$DOXYGEN" != "nodoxygen"])
-
-AM_MAINTAINER_MODE
-
-# See if we want stricter compiler warnings.
-AC_MSG_CHECKING([maintainer mode])
-AC_ARG_ENABLE(maintainer-mode)
-AC_MSG_RESULT(${enable_maintainer_mode})
-
-# See if we want runtime debug checking.
-AC_MSG_CHECKING([audit])
-AC_ARG_ENABLE(audit)
-AC_MSG_RESULT(${enable_audit})
-
-# See if we want "suggestions," such as "this class could be final."
-# (The suggestions are often useful, but can also easily be wrong.)
-AC_MSG_CHECKING([suggest])
-AC_ARG_ENABLE(suggest)
-AC_MSG_RESULT(${enable_suggest})
-
-
-AC_ARG_ENABLE(shared)
-AS_IF(
-    [test "${shared}" = "yes" ],
-    [CPPFLAGS="$CPPFLAGS -DPQXX_SHARED"])
-
-
-# Add options to compiler command line, if compiler accepts them.
-add_compiler_opts_if_ok() {
-	for option in $*
-	do
-		ACO_SAVE_CXXFLAGS="$CXXFLAGS"
-		CXXFLAGS="$CXXFLAGS $option"
-		AC_MSG_CHECKING([whether $CXX accepts $option])
-		AC_COMPILE_IFELSE(
-			[AC_LANG_PROGRAM([], [])],
-			has_option=yes,
-			has_option=no)
-		AC_MSG_RESULT($has_option)
-		AS_IF(
-		    [test "$has_option" = "no" ],
-		    [CXXFLAGS="$ACO_SAVE_CXXFLAGS"])
-	done
-}
-
-
-# Add options to compiler command line, unconditionally.
-add_compiler_opts() {
-	CXXFLAGS="$CXXFLAGS $*"
-}
-
-
-# It's tempting to use Autoconf Archive's AX_CXX_COMPILE_STDCXX_17 for this,
-# but it's 2022 and the C++20 equivalent isn't quite ready for use.
-# Seems simpler and more reliable for the user to arrange for the desired
-# language versions by setting the appropriate option for their compiler.
-AC_MSG_CHECKING([for sufficient C++ language/library level])
-sufficient_cxx=yes
-AC_COMPILE_IFELSE(
-	[AC_LANG_SOURCE([
-	#if __cplusplus < 201611L
-	#error "Need C++17 or better."
-	#endif
-	])],
-	sufficient_cxx=yes,
-	sufficient_cxx=no)
-AC_MSG_RESULT($sufficient_cxx)
-if test "$sufficient_cxx" != "yes"
-then
-	AC_MSG_ERROR([This libpqxx version needs at least C++17.])
-fi
-
-
-# Let's try to get the compiler to be helpful.
-#
-# (Omit options -Weffc++ and -Wabi because they currently yield too many
-# warnings in gcc's standard headers; omit -Wunreachable-code because it isn't
-# always right)
-if test "$GCC" = "yes"
-then
-	# In maintainer mode, enable all the warning options we can.
-	if test "$enable_maintainer_mode" = "yes"
-	then
-		# "Eternal" (FLW) g++ options.  These have been around for
-		# ages, and both g++ and clang++ support them.  Don't bother
-		# checking for support; just add them to the compiler options.
-		add_compiler_opts \
-			-fstrict-enums \
-			-Werror \
-			-Wall \
-			-pedantic \
-			-Wcast-align  \
-			-Wcast-qual  \
-			-Wconversion \
-			-Wctor-dtor-privacy \
-			-Wendif-labels \
-			-Wextra \
-			-Wfloat-equal \
-			-Wformat=2 \
-			-Wformat-security \
-			-Wmissing-include-dirs \
-			-Wno-div-by-zero \
-			-Wnon-virtual-dtor \
-			-Wold-style-cast \
-			-Woverlength-strings \
-			-Woverloaded-virtual \
-			-Wpointer-arith  \
-			-Wredundant-decls \
-			-Wshadow \
-			-Wsign-promo \
-			-Wundef \
-			-Wunused \
-			-Wwrite-strings
-
-		# "Iffy" g++ options.  Some reasonably current g++-like
-		# compilers may not support these.
-		add_compiler_opts_if_ok \
-			-fnothrow-opt \
-			-Wattribute-alias=2 \
-			-Wextra-semi \
-			-Wlogical-op \
-			-Wmismatched-tags \
-			-Wnoexcept \
-			-Wredundant-tags \
-			-Wrestrict \
-			-Wstringop-overflow \
-			-Wzero-as-null-pointer-constant \
-			-Warray-bounds=2 \
-			-Wduplicated-branches \
-			-Wduplicated-cond \
-			-Wsuggest-attribute=noreturn \
-			-Wsuggest-override \
-			-Wtrampolines
-	fi
-
-	# In "audit," enable all runtime checks we can.
-	if test "$enable_audit" = "yes"
-	then
-		add_compiler_opts_if_ok \
-			-D_FORTIFY_SOURCE=2 \
-			-fsanitize=address \
-			-fsanitize-address-use-after-scope \
-			-fsanitize=alignment \
-			-fsanitize=bool \
-			-fsanitize=bounds \
-			-fsanitize=bounds-strict \
-			-fsanitize=builtin \
-			-fsanitize=enum \
-			-fsanitize=float-cast-overflow \
-			-fsanitize=float-divide-by-zero \
-			-fsanitize=integer-divide-by-zero \
-			-fsanitize=leak \
-			-fsanitize=nonnull-attribute \
-			-fsanitize=null \
-			-fsanitize=object-size \
-			-fsanitize=pointer-compare \
-			-fsanitize=pointer-overflow \
-			-fsanitize=pointer-subtract \
-			-fsanitize=return \
-			-fsanitize=returns-nonnull-attribute \
-			-fsanitize=shift \
-			-fsanitize=shift-base \
-			-fsanitize=shift-exponent \
-			-fsanitize=signed-integer-overflow \
-			-fsanitize=undefined \
-			-fsanitize=unreachable \
-			-fsanitize=vla-bound \
-			-fsanitize=vptr \
-			-fstack-protector-all
-	fi
-
-	# In "suggest" mode, enable a bunch of code suggestions.
-	if test "$enable_suggest" = "yes"
-	then
-		add_compiler_opts_if_ok \
-			-Wsuggest-attribute=cold \
-			-Wsuggest-attribute=const \
-			-Wsuggest-attribute=malloc \
-			-Wsuggest-attribute=pure \
-			-Wsuggest-final-types \
-			-Wsuggest-final-methods
-	fi
-
-AC_MSG_CHECKING([g++ visibility attribute])
-gcc_visibility=yes
-SAVE_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS -Werror"
-AC_COMPILE_IFELSE(
-	[read_test(gcc_visibility.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_GCC_VISIBILITY],
-		1,
-		[Define if g++ supports visibility attribute.]),
-	gcc_visibility=no)
-AC_MSG_RESULT($gcc_visibility)
-CXXFLAGS="$SAVE_CXXFLAGS"
-if test "$gcc_visibility" = "yes"
-then
-    # Make internal definitions accessible only to the library itself.
-    # Only definitions marked PQXX_LIBEXPORT will be accessible.
-    add_compiler_opts -fvisibility=hidden
-    add_compiler_opts -fvisibility-inlines-hidden
-fi
-
-AC_MSG_CHECKING([g++ pure attribute])
-gcc_pure=yes
-AC_COMPILE_IFELSE(
-	[read_test(gcc_pure.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_GCC_PURE],
-		1,
-		[Define if g++ supports pure attribute]),
-	gcc_pure=no)
-AC_MSG_RESULT($gcc_pure)
-
-fi # End of gcc-specific part.
-
-
-# Check for __cxa_demangle.
-AC_MSG_CHECKING([__cxa_demangle])
-cxa_demangle=yes
-AC_COMPILE_IFELSE(
-	[read_test(cxa_demangle.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_CXA_DEMANGLE],
-		1,
-		[Define if compiler supports __cxa_demangle]),
-	cxa_demangle=no)
-AC_MSG_RESULT($cxa_demangle)
-
-
-# Check for sufficient Concepts support, introduced with C++20.
-AC_MSG_CHECKING([concepts])
-concepts=yes
-AC_COMPILE_IFELSE(
-	[read_test(concepts.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_CONCEPTS],
-		1,
-		[Define if compiler supports Concepts and <ranges> header.]),
-	concepts=no)
-AC_MSG_RESULT($concepts)
-
-
-# Check for C++20 std::span.
-AC_MSG_CHECKING([std::span])
-span=yes
-AC_COMPILE_IFELSE(
-	[read_test(span.cxx)],
-	AC_DEFINE([PQXX_HAVE_SPAN], 1, [Define if compiler has std::span.]),
-	span=no)
-AC_MSG_RESULT($span)
-
-
-# Check for multidimensional subscript operator support.  Proposed for C++23.
-AC_MSG_CHECKING([for multidimensional subscript operator support])
-multidim_subscript=yes
-AC_COMPILE_IFELSE(
-	[read_test(multidim-subscript.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT], 1,
-		[Define if operator[] can take multiple arguments.]),
-	multidim_subscript=no)
-AC_MSG_RESULT($multidim_subscript)
-
-
-AC_MSG_CHECKING([for strerror_r()])
-strerror_r=yes
-AC_LINK_IFELSE(
-	[read_test(strerror_r.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_STRERROR_R],
-		1,
-		[Define if strerror_r() is available.]),
-	strerror_r=no)
-AC_MSG_RESULT($strerror_r)
-
-
-
-AC_MSG_CHECKING([for strerror_s()])
-strerror_s=yes
-AC_LINK_IFELSE(
-	[read_test(strerror_s.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_STRERROR_S],
-		1,
-		[Define if strerror_s() is available.]),
-	strerror_s=no)
-AC_MSG_RESULT($strerror_s)
-
-
-AC_MSG_CHECKING([for std::chrono::year_month_day etc])
-year_month_day=yes
-AC_LINK_IFELSE(
-	[read_test(year_month_day.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_YEAR_MONTH_DAY],
-		1,
-		[Define if std::chrono has year_month_day etc.]),
-	year_month_day=no)
-AC_MSG_RESULT($year_month_day)
-
-
-# Check for [[likely]] and [[unlikely]] attributes.
-AC_MSG_CHECKING([attributes "likely" and "unlikely".])
-likely=yes
-AC_COMPILE_IFELSE(
-	[read_test(likely.cxx)],
-	AC_DEFINE([PQXX_HAVE_LIKELY], 1, [Define if likely & unlikely work.]),
-	likely=no)
-AC_MSG_RESULT($likely)
-
-
-# It's mid-2019, and gcc's charconv supports integers but not yet floats.
-# So for now, we test for int and float conversion... separately.
-#
-# It's worse for older clang versions, which compile the integer conversions
-# but then fail at link time because of a missing symbol "__muloti4" with the
-# "long long" version.  I couldn't resolve that symbol by adding -lm either.
-# So don't just compile these tests; link them as well.
-AC_MSG_CHECKING([for C++17 charconv integer conversion])
-have_charconv_int=yes
-AC_LINK_IFELSE(
-	[read_test(charconv_int.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_CHARCONV_INT],
-		1,
-		[Define if <charconv> supports integer conversion.]),
-	have_charconv_int=no)
-AC_MSG_RESULT($have_charconv_int)
-
-AC_MSG_CHECKING([for C++17 charconv floating-point conversion])
-have_charconv_float=yes
-AC_LINK_IFELSE(
-	[read_test(charconv_float.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_CHARCONV_FLOAT],
-		1,
-		[Define if <charconv> supports floating-point conversion.]),
-	have_charconv_float=no)
-AC_MSG_RESULT($have_charconv_float)
-
-# As per #262, clang with libcxxrt does not support thread_local on non-POD
-# objects.  Luckily we can live without those, it's just less efficient.
-AC_MSG_CHECKING([for full thread_local support])
-have_thread_local=yes
-AC_LINK_IFELSE(
-	[read_test(thread_local.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_THREAD_LOCAL],
-		1,
-		[Define if thread_local is fully supported.]),
-	have_thread_local=no)
-AC_MSG_RESULT($have_thread_local)
-
-AC_MSG_CHECKING([for std::this_thread::sleep_for])
-have_sleep_for=yes
-AC_LINK_IFELSE(
-	[read_test(sleep_for.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_SLEEP_FOR],
-		1,
-		[Define if std::this_thread::sleep_for works.]),
-	have_sleep_for=no)
-AC_MSG_RESULT($have_sleep_for)
-
-
-AC_MSG_CHECKING([for std::cmp_greater, std::cmp_less_equal, etc])
-have_cmp=yes
-AC_COMPILE_IFELSE(
-	[read_test(cmp.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_CMP],
-		1,
-		[Define if compiler has C++20 std::cmp_greater etc.]),
-	have_cmp=no)
-AC_MSG_RESULT($have_cmp)
-
-
-# Doing my own check for poll().  There's one built into autoconf-archive, but
-# it produces warnings in C++ (about unnecessarily using "struct", and using 0
-# as a null pointer constant).  In maintainer mode, those warnings turn into
-# errors.
-AC_MSG_CHECKING([for poll()])
-ax_cv_have_poll=yes
-AC_LINK_IFELSE(
-	[read_test(poll.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_POLL],
-		1,
-		[Define if poll() is available.]),
-	ax_cv_have_poll=no)
-AC_MSG_RESULT($ax_cv_have_poll)
-
-if test "$ax_cv_have_poll" != "yes"
-then
-# No poll(); we'll fall back to select().
-
-# Some systems keep select() in a separate library which is not linked by
-# default.  See if we need one of those.
-socklibok=no
-AC_SEARCH_LIBS(select, socket nsl ws2_32 wsock32 winsock, [socklibok=yes])
-
-# Microsoft proprietary libraries do not work with code that is generated with
-# autoconf's SEARCH_LIBS macro, so we need to check manually and just use the
-# first socket library available.
-# We only do this if select() is not available by other means, to avoid picking
-# up an unnecessary Windows compatibility library on a non-Windows system.
-for l in ws2_32 wsock32 winsock
-do
-	if test "${socklibok}" != "yes"
-	then
-		AC_CHECK_LIB($l,main,LIBS="$LIBS -l$l";[socklibok=yes])
-	fi
-done
-
-if test "${socklibok}" != "yes"
-then
-	AC_MSG_ERROR([
-Could not figure out how to link a simple sockets-based program.  Please read
-the config.log file for more clues as to why this failed.
-])
-fi
-
-fi # No poll()
-
-
-# Find PostgreSQL includes and libraries
-AC_PATH_PROG([PKG_CONFIG], [pkg-config])
-AC_PATH_PROGS(PG_CONFIG, pg_config)
-
-AC_ARG_WITH(
-    [postgres-include],
-    [AS_HELP_STRING(
-        [--with-postgres-include=DIR],
-        [Use PostgreSQL includes from DIR.  Defaults to querying pg_config or pkg-config, whichever is available.])],
-    AS_IF(
-        [test "x$with_postgres_include" = "xyes"],
-        [with_postgres_include=""]))
-
-if test -n "$with_postgres_include"
-then
-    POSTGRES_INCLUDE="-I$with_postgres_include"
-else
-    if test -x "$PKG_CONFIG" || test -x "$PG_CONFIG"
-    then
-        # We should prefer pkg-config over pg_config, but there seems to be a
-        # problem in pkg-config 1.6.3.  Until that's been resolved (#291), go
-        # with pg_config if we can.
-        if test -x "$PG_CONFIG"
-        then
-            # From pg_config we can either get the C compiler options used to
-            # compile postgres, which isn't quite what we want; or we can get
-            # the headers directory, without the full option.  That's something
-            # we can work with.  The compiler must support the "-I" option for
-            # that, but both scripts assume that anyway.
-            POSTGRES_INCLUDE="-I$($PG_CONFIG --includedir)"
-        else
-            # From pkg-config we can get the compiler options to extend the
-            # include path.  We use that.
-            POSTGRES_INCLUDE=$($PKG_CONFIG libpq --cflags-only-I)
-        fi
-        AC_MSG_NOTICE([finding PostgreSQL headers using $POSTGRES_INCLUDE])
-    else
-        POSTGRES_INCLUDE=""
-
-        # We have nothing to tell us where the libpq headers are.  That's fine
-        # if the compiler can find it, but if not, fail here.
-        AC_CHECK_HEADER(
-	        [libpq-fe.h],
-	        [],
-	[AC_MSG_ERROR([
-Can't find the main PostgreSQL client header, libpq-fe.h.  Make sure that it
-is installed, and either use the --with-postgres-include option or install
-pkg-config.
-])])
-    fi
-fi
-AC_SUBST(POSTGRES_INCLUDE)
-
-# Add the compiler option so we can compile configure tests which rely on the
-# libpq headers.
-CPPFLAGS="$CPPFLAGS $POSTGRES_INCLUDE"
-
-
-AC_ARG_WITH(
-    [postgres-lib],
-    [AS_HELP_STRING(
-        [--with-postgres-lib=DIR],
-        [Use PostgreSQL libraries from DIR.  Defaults to querying pg_config.])],
-    AS_IF(
-        [test "x$with_postgres_lib" = "xyes"],
-        [with_postgres_lib=""]))
-
-# If no --with-postgres-lib was given, and we have pkg-config, use that.
-AS_IF(
-    [test -z "$with_postgres_lib" -a -x "$PKG_CONFIG"],
-    [with_postgres_lib=$($PKG_CONFIG libpq --libs-only-L | sed 's/^-L//')])
-
-# pg_config is deprecated, but for some users it may still provide the only
-# right answer.  For instance, `pkg-config` may not know where `libpq` is
-# installed.
-AS_IF(
-    [test -z "$with_postgres_lib" -a -x "$PG_CONFIG"],
-    [with_postgres_lib=$($PG_CONFIG --libdir)])
-
-AS_IF(
-    [test -n "$with_postgres_lib"],
-    [AC_MSG_NOTICE([using PostgreSQL libraries at $with_postgres_lib])],
-    [AC_MSG_NOTICE([using PostgreSQL libraries in default location])])
-
-AC_SUBST(with_postgres_lib)
-
-
-AC_CHECK_HEADER(
-	[libpq-fe.h],
-	[],
-	[AC_MSG_ERROR([
-Can't find the main PostgreSQL client header, libpq-fe.h.  Are you sure the
-libpq headers are installed correctly, and that we've got the right path?
-])])
-
-
-AC_MSG_CHECKING([for ability to compile source files using libpq])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include<libpq-fe.h>]],
-		[[PQexec(nullptr,"")]]
-	)],
-	[],
-	[AC_MSG_ERROR([
-Could not compile a call to a basic libpq function.  There must be something
-seriously wrong with the headers that "pg_config --includedir" or "pkg-config
-libpq --cflags" pointed to; the contents of config.log may give you a clue
-about the nature of the failure.
-Source including the libpq header libpq-fe.h can be compiled, but a call to the
-most basic libpq function PQexec() failed to compile successfully.  This is the
-litmus test for a working libpq.
-])])
-AC_MSG_RESULT(yes)
-
-
-if test "x${with_postgres_lib}" = "x"; then
-    with_postgres_libpath=""
-else
-    with_postgres_libpath="-L${with_postgres_lib}"
-fi
-LDFLAGS="$LDFLAGS ${with_postgres_libpath}"
-
-AC_CHECK_LIB(
-	[pq],
-	[PQexec],
-	[],
-	[AC_MSG_ERROR([
-Did not find the PQexec() function in libpq.  This is the litmus test for a
-working libpq installation.
-
-A source file using the PQexec() function did compile without problems, and the
-libpq library is available for linking, but for some reason a call to PQexec()
-failed to link properly to the libpq library.  This may be because the libpq
-library file is damaged, or in some incorrect format, or if your libpq is much
-more recent than libpqxx version $PQXX_ABI, perhaps libpq has undergone a
-radical ABI change.
-
-The last parts of config.log may give you a clue as to what really went wrong,
-but be warned that this is no easy reading.  Look for the last error message
-occurring in the file.
-])],
-	${with_postgres_libpath})
-
-
-# PQencryptPasswordConn was added in postgres 10.
-AC_MSG_CHECKING([for PQencryptPasswordConn])
-have_pqencryptpasswordconn=yes
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[#include<libpq-fe.h>],
-		[
-			extern PGconn *conn;
-			PQencryptPasswordConn(
-				conn, "pwd", "user", "scram-sha-256")
-		]
-	)],
-	AC_DEFINE(
-		[PQXX_HAVE_PQENCRYPTPASSWORDCONN],
-		1,
-		[Define if libpq has PQencryptPasswordConn (since pg 10).]),
-	[have_pqencryptpasswordconn=no])
-AC_MSG_RESULT($have_pqencryptpasswordconn)
-
-
-# "Pipeline mode" was introduced in libpq 14.
-AC_MSG_CHECKING([for libpq pipeline mode])
-have_pq_pipeline=yes
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[#include<libpq-fe.h>],
-		[
-			extern PGconn *conn;
-			PQenterPipelineMode(conn)
-		]
-	)],
-	AC_DEFINE(
-		[PQXX_HAVE_PQ_PIPELINE],
-		1,
-		[Define if libpq has pipeline mode (since pg 14).]),
-	[have_pq_pipeline=no])
-AC_MSG_RESULT($have_pq_pipeline)
-
-
-AC_MSG_CHECKING([for usable std::filesystem::path])
-have_path=yes
-AC_COMPILE_IFELSE(
-	[read_test(fs.cxx)],
-	AC_DEFINE(
-		[PQXX_HAVE_PATH],
-		1,
-		[Define if compiler has usable std::filesystem::path.]),
-	have_path=no)
-AC_MSG_RESULT($have_path)
-
-
-AC_MSG_CHECKING([whether we need a link option for <filesystem> support])
-LIBS_SAVE="$LIBS"
-found_fslib=no
-for l in '' '-lstdc++fs' '-lc++fs'
-do
-	if test "$found_fslib" != "yes"
-	then
-		LIBS="$LIBS $l"
-		AC_LINK_IFELSE(
-			[read_test(need_fslib.cxx)],
-			[found_fslib=yes],
-			[LIBS="$LIBS_SAVE"])
-		if test "$found_fslib" = "yes"
-		then
-			result_msg="$l"
-			# (And keep our current value of $LIBS.)
-		fi
-	fi
-done
-
-if test "$found_fslib" != "yes"
-then
-	AC_MSG_ERROR([
-There seems to be <filesystem> support, but I could not figure out now to make
-it work.  You'll have to add set your own build options for this.
-	])
-fi
-AC_MSG_RESULT($result_msg)
-
-
-# Remove redundant occurrances of -lpq
-LIBS=[$(echo "$LIBS" | sed -e 's/-lpq * -lpq\>/-lpq/g')]
-
-
-AC_MSG_CHECKING([that type of libpq's Oid is as expected])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[
-			#include<libpq-fe.h>
-			#include"${srcdir}/include/pqxx/internal/libpq-forward.hxx"
-			extern void f(pqxx::oid&);
-		],
-		[Oid o;f(o)],
-	)],
-	[],
-	[AC_MSG_ERROR([
-The Oid typedef in libpq has changed.  Please notify the libpqxx authors of the
-change!
-])])
-AC_MSG_RESULT(yes)
-
-
-AC_PROG_MAKE_SET
-
-AC_CONFIG_FILES([
-	Makefile config/Makefile doc/Makefile doc/Doxyfile src/Makefile
-	test/Makefile tools/Makefile include/Makefile include/pqxx/Makefile
-	libpqxx.pc])
-
-
-AC_CONFIG_COMMANDS([configitems], ["${srcdir}/tools/splitconfig" "${srcdir}"])
-
-AC_OUTPUT(compile_flags)
diff --git a/ext/libpqxx-7.7.3/doc/CMakeLists.txt b/ext/libpqxx-7.7.3/doc/CMakeLists.txt
deleted file mode 100644
index d48d2a6f0..000000000
--- a/ext/libpqxx-7.7.3/doc/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-find_program(HAVE_DOXYGEN doxygen)
-
-if(NOT HAVE_DOXYGEN)
-    message(FATAL_ERROR "*****************************************************
-Doxygen not found.
-Install it, or configure with -DBUILD_DOC=OFF
-*****************************************************"
-    )
-endif()
-
-set(PQXXVERSION "${CMAKE_PROJECT_VERSION}")
-set(top_srcdir "${PROJECT_SOURCE_DIR}")
-set(PQXX_ABI "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
-set(PQXX_MAJOR "${PROJECT_VERSION_MAJOR}")
-set(PQXX_MINOR "${PROJECT_VERSION_MINOR}")
-
-find_program(HAVE_DOT dot)
-if(HAVE_DOT)
-    set(HAVE_DOT YES)
-else()
-    set(HAVE_DOT NO)
-endif()
-
-configure_file(Doxyfile.in Doxyfile)
-
-if(HAVE_DOXYGEN)
-    file(
-        GLOB DOXYGEN_SOURCES
-        "${PROJECT_SOURCE_DIR}/include/pqxx/*.hxx"
-        "${PROJECT_SOURCE_DIR}/include/pqxx/doc/*.md"
-        "${PROJECT_SOURCE_DIR}/*.cxx"
-    )
-    set(DOXYGEN_STAMP_FILE "${CMAKE_CURRENT_BINARY_DIR}/doxygen.stamp")
-    add_custom_command(OUTPUT ${DOXYGEN_STAMP_FILE}
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/html
-        COMMAND doxygen Doxyfile
-        COMMAND ${CMAKE_COMMAND} -E touch ${DOXYGEN_STAMP_FILE}
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ${DOXYGEN_SOURCES}
-        COMMENT "Generate API documentation"
-        VERBATIM
-    )
-    add_custom_target(doxygen ALL
-        DEPENDS ${DOXYGEN_STAMP_FILE}
-        SOURCES ${DOXYGEN_SOURCES}
-    )
-    install(
-        DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-    )
-endif()
diff --git a/ext/libpqxx-7.7.3/doc/Doxyfile.in b/ext/libpqxx-7.7.3/doc/Doxyfile.in
deleted file mode 100644
index f349fe80c..000000000
--- a/ext/libpqxx-7.7.3/doc/Doxyfile.in
+++ /dev/null
@@ -1,1280 +0,0 @@
-# Doxyfile 1.5.5
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = libpqxx
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         = @PQXXVERSION@
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = html
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
-# and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH        = ../
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = YES
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = NO
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = NO
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = NO
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = YES
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = NO
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  = @top_srcdir@/include/pqxx \
-                         @top_srcdir@/include/pqxx/doc \
-                         @top_srcdir@/src
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS          = *.cxx \
-                         *.hxx \
-                         *.h \
-                         *.md
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = *.o \
-                         *.lo \
-                         *.a \
-                         .cvsignore
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.  Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.  The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.  Otherwise they will link to the documentstion.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = YES
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = .
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        =
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = YES
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             =
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = YES
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.  This is useful
-# if you want to understand what is going on.  On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           = "../include" "@top_srcdir@/include"
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  = *.h *.hxx
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED             = PQXX_ABI="@PQXX_ABI@" \
-                         PQXX_LIBEXPORT= \
-                         PQXX_NOVTABLE= \
-                         PQXX_PRIVATE= \
-                         PQXX_TYPENAME=typename \
-                         PQXX_VERSION="@PQXXVERSION@" \
-                         PQXX_MAJOR=@PQXX_MAJOR@ \
-                         PQXX_MINOR=@PQXX_MINOR@
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#   TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#   TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = @HAVE_DOT@
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = NO
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is enabled by default, which results in a transparent
-# background. Warning: Depending on the platform used, enabling this option
-# may lead to badly anti-aliased labels on the edges of a graph (i.e. they
-# become hard to read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/ext/libpqxx-7.7.3/doc/Makefile.am b/ext/libpqxx-7.7.3/doc/Makefile.am
deleted file mode 100644
index 38caa9181..000000000
--- a/ext/libpqxx-7.7.3/doc/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-maintainer-clean-local:
-	$(RM) -rf html
-	$(RM) reference-stamp
-	$(MKDIR) html
-
-EXTRA_DIST= Doxyfile.in libpqxx.xml reference-stamp
-
-all-local: docs
-
-if BUILD_REFERENCE
-DOCS = reference
-else
-DOCS =
-endif
-
-if MAINTAINER_MODE
-REFERENCE_STAMP_DEP = ../src/libpqxx.la
-else
-REFERENCE_STAMP_DEP =
-endif
-
-docs: $(DOCS)
-
-reference: reference-stamp
-reference-stamp: Doxyfile.in $(REFERENCE_STAMP_DEP)
-	if [ -x "$(DOXYGEN)" ]; then \
-	  $(MKDIR_P) html; \
-	  $(DOXYGEN) Doxyfile; \
-	  touch $@; \
-	else \
-	  echo >&2; \
-	  echo >&2 "*****************************************************"; \
-	  echo >&2; \
-	  echo >&2 "Doxygen not found."; \
-	  echo >&2 "Install it, or configure with --disable-documentation"; \
-	  echo >&2; \
-	  echo >&2 "*****************************************************"; \
-	  exit 1; \
-	fi
-
-../src/libpqxx.la:
-	cd ../src; \
-	$(MAKE) libpqxx.la
-
-
-dist-hook: reference
-	if [ -d $(srcdir)/html ]; then \
-	  cp -pR html $(distdir)/ ; \
-	fi
diff --git a/ext/libpqxx-7.7.3/doc/Makefile.in b/ext/libpqxx-7.7.3/doc/Makefile.in
deleted file mode 100644
index 835845bf7..000000000
--- a/ext/libpqxx-7.7.3/doc/Makefile.in
+++ /dev/null
@@ -1,507 +0,0 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4/libtool.m4 \
-	$(top_srcdir)/config/m4/ltoptions.m4 \
-	$(top_srcdir)/config/m4/ltsugar.m4 \
-	$(top_srcdir)/config/m4/ltversion.m4 \
-	$(top_srcdir)/config/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/pqxx/config.h
-CONFIG_CLEAN_FILES = Doxyfile
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in \
-	$(top_srcdir)/config/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-PKG_CONFIG = @PKG_CONFIG@
-POSTGRES_INCLUDE = @POSTGRES_INCLUDE@
-PQXXVERSION = @PQXXVERSION@
-PQXX_ABI = @PQXX_ABI@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_postgres_lib = @with_postgres_lib@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = Doxyfile.in libpqxx.xml reference-stamp
-@BUILD_REFERENCE_FALSE@DOCS = 
-@BUILD_REFERENCE_TRUE@DOCS = reference
-@MAINTAINER_MODE_FALSE@REFERENCE_STAMP_DEP = 
-@MAINTAINER_MODE_TRUE@REFERENCE_STAMP_DEP = ../src/libpqxx.la
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags-am dist-hook distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-clean-local mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-maintainer-clean-local:
-	$(RM) -rf html
-	$(RM) reference-stamp
-	$(MKDIR) html
-
-all-local: docs
-
-docs: $(DOCS)
-
-reference: reference-stamp
-reference-stamp: Doxyfile.in $(REFERENCE_STAMP_DEP)
-	if [ -x "$(DOXYGEN)" ]; then \
-	  $(MKDIR_P) html; \
-	  $(DOXYGEN) Doxyfile; \
-	  touch $@; \
-	else \
-	  echo >&2; \
-	  echo >&2 "*****************************************************"; \
-	  echo >&2; \
-	  echo >&2 "Doxygen not found."; \
-	  echo >&2 "Install it, or configure with --disable-documentation"; \
-	  echo >&2; \
-	  echo >&2 "*****************************************************"; \
-	  exit 1; \
-	fi
-
-../src/libpqxx.la:
-	cd ../src; \
-	$(MAKE) libpqxx.la
-
-dist-hook: reference
-	if [ -d $(srcdir)/html ]; then \
-	  cp -pR html $(distdir)/ ; \
-	fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpqxx-7.7.3/doc/conf.py b/ext/libpqxx-7.7.3/doc/conf.py
deleted file mode 100644
index 1cac1c2ca..000000000
--- a/ext/libpqxx-7.7.3/doc/conf.py
+++ /dev/null
@@ -1,199 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-libpqxx documentation build configuration file, created by
-sphinx-quickstart on Sun Dec  3 00:43:33 2017.
-
-This file is execfile()d with the current directory set to its containing dir.
-
-All configuration values have a default; values that are commented out serve
-to show the default.
-"""
-
-import codecs
-import os
-from subprocess import check_call
-
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import sys
-# sys.path.insert(0, os.path.abspath(os.path.curdir))
-
-
-read_the_docs_build = os.environ.get('READTHEDOCS') == 'True'
-
-if read_the_docs_build:
-    check_call(
-        [os.path.join(os.path.curdir, 'configure'), 'CXXFLAGS=-std=c++17 -O0'],
-	cwd=os.path.pardir)
-    check_call('doxygen', cwd=os.path.join(os.path.pardir, 'doc'))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    ]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'libpqxx'
-copyright = u'2000-2022, Jeroen T. Vermeulen'
-author = u'Jeroen T. Vermeulen'
-
-
-def read_version():
-    """Return version number as specified in the VERSION file."""
-    version_file = os.path.join(
-        os.path.dirname(__file__), os.path.pardir, 'VERSION')
-    with codecs.open(version_file, encoding='ascii') as stream:
-        return stream.read().strip()
-
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The full version, including alpha/beta/rc tags.
-release = read_version()
-
-# The short X.Y version.
-version = '.'.join(release.split('.')[:2])
-
-html_title = "libpqxx %s" % release
-html_short_title = "libpqxx"
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'alabaster'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# This is required for the alabaster theme
-# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
-html_sidebars = {
-    '**': [
-        'relations.html',  # needs 'show_related': True theme option to display
-        'searchbox.html',
-    ]
-}
-
-# Looks like the setup is that our build generates the HTML itself, and then
-# has readthedocs copy the full generated HTML tree to the output directory.
-#
-# Problem is, that doesn't seem to be working now.  This needs debugging.
-html_extra_path = ["html"]
-
-# -- Options for HTMLHelp output ------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'libpqxxdoc'
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    #
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    #
-    # 'preamble': '',
-
-    # Latex figure (float) alignment
-    #
-    # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    (
-        master_doc,
-        'libpqxx.tex',
-        u'libpqxx Documentation',
-        u'Jeroen T. Vermeulen',
-        'manual',
-    ),
-]
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'libpqxx', u'libpqxx Documentation', [author], 1)
-]
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, 'libpqxx', u'libpqxx Documentation',
-     author, 'libpqxx', "C++ client API for PostgreSQL.",
-     'Miscellaneous'),
-]
diff --git a/ext/libpqxx-7.7.3/doc/index.rst b/ext/libpqxx-7.7.3/doc/index.rst
deleted file mode 100644
index 30f2cfdc1..000000000
--- a/ext/libpqxx-7.7.3/doc/index.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. x documentation master file, created by
-   sphinx-quickstart on Sun Dec  3 01:30:12 2017.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-libpqxx
-=======
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
-
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/ext/libpqxx-7.7.3/include/CMakeLists.txt b/ext/libpqxx-7.7.3/include/CMakeLists.txt
deleted file mode 100644
index 263dd2e9e..000000000
--- a/ext/libpqxx-7.7.3/include/CMakeLists.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-# ##############################################################################
-# AUTOMATICALLY GENERATED FILE -- DO NOT EDIT.
-#
-# This file is generated automatically by libpqxx's template2mak.py script, and
-# will be rewritten from time to time.
-#
-# If you modify this file, chances are your modifications will be lost.
-#
-# The template2mak.py script should be available in the tools directory of the
-# libpqxx source archive.
-#
-# Generated from template './include/CMakeLists.txt.template'.
-# ##############################################################################
-install(
-    DIRECTORY pqxx "${PROJECT_BINARY_DIR}/include/pqxx"
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    FILES_MATCHING
-    # For each X.hxx, install both X.hxx itself and plain X.
-    PATTERN *.hxx
-    # TODO: Is there any way to do this with CMake's globbing?
-    PATTERN array
-    PATTERN binarystring
-    PATTERN blob
-    PATTERN composite
-    PATTERN connection
-    PATTERN cursor
-    PATTERN dbtransaction
-    PATTERN errorhandler
-    PATTERN except
-    PATTERN field
-    PATTERN isolation
-    PATTERN largeobject
-    PATTERN nontransaction
-    PATTERN notification
-    PATTERN params
-    PATTERN pipeline
-    PATTERN prepared_statement
-    PATTERN range
-    PATTERN result
-    PATTERN robusttransaction
-    PATTERN row
-    PATTERN separated_list
-    PATTERN strconv
-    PATTERN stream_from
-    PATTERN stream_to
-    PATTERN subtransaction
-    PATTERN time
-    PATTERN transaction
-    PATTERN transaction_base
-    PATTERN transaction_focus
-    PATTERN transactor
-    PATTERN types
-    PATTERN util
-    PATTERN version
-    PATTERN zview
-    PATTERN internal/*.hxx
-    PATTERN internal/gates/*.hxx
-    PATTERN config-public-compiler.h
-    PATTERN pqxx
-    PATTERN doc EXCLUDE
-)
-
-install(
-    DIRECTORY pqxx/doc/
-    DESTINATION ${CMAKE_INSTALL_DOCDIR}
-    FILES_MATCHING
-    PATTERN *.md
-)
diff --git a/ext/libpqxx-7.7.3/include/CMakeLists.txt.template b/ext/libpqxx-7.7.3/include/CMakeLists.txt.template
deleted file mode 100644
index 5ebc6664e..000000000
--- a/ext/libpqxx-7.7.3/include/CMakeLists.txt.template
+++ /dev/null
@@ -1,23 +0,0 @@
-install(
-    DIRECTORY pqxx "${PROJECT_BINARY_DIR}/include/pqxx"
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    FILES_MATCHING
-    # For each X.hxx, install both X.hxx itself and plain X.
-    PATTERN *.hxx
-    # TODO: Is there any way to do this with CMake's globbing?
-###MAKTEMPLATE:FOREACH include/pqxx/*.hxx
-    PATTERN ###BASENAME###
-###MAKTEMPLATE:ENDFOREACH
-    PATTERN internal/*.hxx
-    PATTERN internal/gates/*.hxx
-    PATTERN config-public-compiler.h
-    PATTERN pqxx
-    PATTERN doc EXCLUDE
-)
-
-install(
-    DIRECTORY pqxx/doc/
-    DESTINATION ${CMAKE_INSTALL_DOCDIR}
-    FILES_MATCHING
-    PATTERN *.md
-)
diff --git a/ext/libpqxx-7.7.3/include/Makefile.am b/ext/libpqxx-7.7.3/include/Makefile.am
deleted file mode 100644
index 83d2b1970..000000000
--- a/ext/libpqxx-7.7.3/include/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-SUBDIRS = pqxx
-
-nobase_include_HEADERS= pqxx/pqxx \
-	pqxx/array pqxx/array.hxx \
-	pqxx/binarystring pqxx/binarystring.hxx \
-	pqxx/blob pqxx/blob.hxx \
-	pqxx/composite pqxx/composite.hxx \
-	pqxx/connection pqxx/connection.hxx \
-	pqxx/cursor pqxx/cursor.hxx \
-	pqxx/dbtransaction pqxx/dbtransaction.hxx \
-	pqxx/errorhandler pqxx/errorhandler.hxx \
-	pqxx/except pqxx/except.hxx \
-	pqxx/field pqxx/field.hxx \
-	pqxx/isolation pqxx/isolation.hxx \
-	pqxx/largeobject pqxx/largeobject.hxx \
-	pqxx/nontransaction pqxx/nontransaction.hxx \
-	pqxx/notification pqxx/notification.hxx \
-	pqxx/params pqxx/params.hxx \
-	pqxx/pipeline pqxx/pipeline.hxx \
-	pqxx/prepared_statement pqxx/prepared_statement.hxx \
-	pqxx/range pqxx/range.hxx \
-	pqxx/result pqxx/result.hxx \
-	pqxx/robusttransaction pqxx/robusttransaction.hxx \
-	pqxx/separated_list pqxx/separated_list.hxx \
-	pqxx/strconv pqxx/strconv.hxx \
-	pqxx/stream_from pqxx/stream_from.hxx \
-	pqxx/stream_to pqxx/stream_to.hxx \
-	pqxx/subtransaction pqxx/subtransaction.hxx \
-	pqxx/time pqxx/time.hxx \
-	pqxx/transaction pqxx/transaction.hxx \
-	pqxx/transaction_base pqxx/transaction_base.hxx \
-	pqxx/transaction_focus pqxx/transaction_focus.hxx \
-	pqxx/transactor pqxx/transactor.hxx \
-	pqxx/row pqxx/row.hxx \
-	pqxx/util pqxx/util.hxx \
-	pqxx/types pqxx/types.hxx \
-	pqxx/zview pqxx/zview.hxx \
-	pqxx/version pqxx/version.hxx \
-	pqxx/internal/array-composite.hxx \
-	pqxx/internal/callgate.hxx \
-	pqxx/internal/concat.hxx \
-	pqxx/internal/conversions.hxx \
-	pqxx/internal/encoding_group.hxx \
-	pqxx/internal/encodings.hxx \
-	pqxx/internal/header-pre.hxx \
-	pqxx/internal/header-post.hxx \
-	pqxx/internal/ignore-deprecated-post.hxx \
-	pqxx/internal/ignore-deprecated-pre.hxx \
-	pqxx/internal/libpq-forward.hxx \
-	pqxx/internal/result_iter.hxx \
-	pqxx/internal/result_iterator.hxx \
-	pqxx/internal/sql_cursor.hxx \
-	pqxx/internal/statement_parameters.hxx \
-	pqxx/internal/stream_iterator.hxx \
-	pqxx/internal/wait.hxx \
-	pqxx/internal/gates/connection-errorhandler.hxx \
-	pqxx/internal/gates/connection-largeobject.hxx \
-	pqxx/internal/gates/connection-notification_receiver.hxx \
-	pqxx/internal/gates/connection-pipeline.hxx \
-	pqxx/internal/gates/connection-sql_cursor.hxx \
-	pqxx/internal/gates/connection-transaction.hxx \
-	pqxx/internal/gates/errorhandler-connection.hxx \
-	pqxx/internal/gates/icursorstream-icursor_iterator.hxx \
-	pqxx/internal/gates/icursor_iterator-icursorstream.hxx \
-	pqxx/internal/gates/result-connection.hxx \
-	pqxx/internal/gates/result-creation.hxx \
-	pqxx/internal/gates/result-pipeline.hxx \
-	pqxx/internal/gates/result-sql_cursor.hxx \
-	pqxx/internal/gates/transaction-sql_cursor.hxx \
-	pqxx/internal/gates/transaction-transaction_focus.hxx
-
-
-nobase_nodist_include_HEADERS = \
-	pqxx/config-public-compiler.h
-
-EXTRA_DIST = \
-	pqxx/doc/*.md \
-	pqxx/doc/mainpage.md.template \
-	pqxx/version.hxx.template
diff --git a/ext/libpqxx-7.7.3/include/Makefile.in b/ext/libpqxx-7.7.3/include/Makefile.in
deleted file mode 100644
index 6b9eac914..000000000
--- a/ext/libpqxx-7.7.3/include/Makefile.in
+++ /dev/null
@@ -1,802 +0,0 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = include
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4/libtool.m4 \
-	$(top_srcdir)/config/m4/ltoptions.m4 \
-	$(top_srcdir)/config/m4/ltsugar.m4 \
-	$(top_srcdir)/config/m4/ltversion.m4 \
-	$(top_srcdir)/config/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(nobase_include_HEADERS) \
-	$(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/pqxx/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
-HEADERS = $(nobase_include_HEADERS) $(nobase_nodist_include_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/config/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-PKG_CONFIG = @PKG_CONFIG@
-POSTGRES_INCLUDE = @POSTGRES_INCLUDE@
-PQXXVERSION = @PQXXVERSION@
-PQXX_ABI = @PQXX_ABI@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_postgres_lib = @with_postgres_lib@
-SUBDIRS = pqxx
-nobase_include_HEADERS = pqxx/pqxx \
-	pqxx/array pqxx/array.hxx \
-	pqxx/binarystring pqxx/binarystring.hxx \
-	pqxx/blob pqxx/blob.hxx \
-	pqxx/composite pqxx/composite.hxx \
-	pqxx/connection pqxx/connection.hxx \
-	pqxx/cursor pqxx/cursor.hxx \
-	pqxx/dbtransaction pqxx/dbtransaction.hxx \
-	pqxx/errorhandler pqxx/errorhandler.hxx \
-	pqxx/except pqxx/except.hxx \
-	pqxx/field pqxx/field.hxx \
-	pqxx/isolation pqxx/isolation.hxx \
-	pqxx/largeobject pqxx/largeobject.hxx \
-	pqxx/nontransaction pqxx/nontransaction.hxx \
-	pqxx/notification pqxx/notification.hxx \
-	pqxx/params pqxx/params.hxx \
-	pqxx/pipeline pqxx/pipeline.hxx \
-	pqxx/prepared_statement pqxx/prepared_statement.hxx \
-	pqxx/range pqxx/range.hxx \
-	pqxx/result pqxx/result.hxx \
-	pqxx/robusttransaction pqxx/robusttransaction.hxx \
-	pqxx/separated_list pqxx/separated_list.hxx \
-	pqxx/strconv pqxx/strconv.hxx \
-	pqxx/stream_from pqxx/stream_from.hxx \
-	pqxx/stream_to pqxx/stream_to.hxx \
-	pqxx/subtransaction pqxx/subtransaction.hxx \
-	pqxx/time pqxx/time.hxx \
-	pqxx/transaction pqxx/transaction.hxx \
-	pqxx/transaction_base pqxx/transaction_base.hxx \
-	pqxx/transaction_focus pqxx/transaction_focus.hxx \
-	pqxx/transactor pqxx/transactor.hxx \
-	pqxx/row pqxx/row.hxx \
-	pqxx/util pqxx/util.hxx \
-	pqxx/types pqxx/types.hxx \
-	pqxx/zview pqxx/zview.hxx \
-	pqxx/version pqxx/version.hxx \
-	pqxx/internal/array-composite.hxx \
-	pqxx/internal/callgate.hxx \
-	pqxx/internal/concat.hxx \
-	pqxx/internal/conversions.hxx \
-	pqxx/internal/encoding_group.hxx \
-	pqxx/internal/encodings.hxx \
-	pqxx/internal/header-pre.hxx \
-	pqxx/internal/header-post.hxx \
-	pqxx/internal/ignore-deprecated-post.hxx \
-	pqxx/internal/ignore-deprecated-pre.hxx \
-	pqxx/internal/libpq-forward.hxx \
-	pqxx/internal/result_iter.hxx \
-	pqxx/internal/result_iterator.hxx \
-	pqxx/internal/sql_cursor.hxx \
-	pqxx/internal/statement_parameters.hxx \
-	pqxx/internal/stream_iterator.hxx \
-	pqxx/internal/wait.hxx \
-	pqxx/internal/gates/connection-errorhandler.hxx \
-	pqxx/internal/gates/connection-largeobject.hxx \
-	pqxx/internal/gates/connection-notification_receiver.hxx \
-	pqxx/internal/gates/connection-pipeline.hxx \
-	pqxx/internal/gates/connection-sql_cursor.hxx \
-	pqxx/internal/gates/connection-transaction.hxx \
-	pqxx/internal/gates/errorhandler-connection.hxx \
-	pqxx/internal/gates/icursorstream-icursor_iterator.hxx \
-	pqxx/internal/gates/icursor_iterator-icursorstream.hxx \
-	pqxx/internal/gates/result-connection.hxx \
-	pqxx/internal/gates/result-creation.hxx \
-	pqxx/internal/gates/result-pipeline.hxx \
-	pqxx/internal/gates/result-sql_cursor.hxx \
-	pqxx/internal/gates/transaction-sql_cursor.hxx \
-	pqxx/internal/gates/transaction-transaction_focus.hxx
-
-nobase_nodist_include_HEADERS = \
-	pqxx/config-public-compiler.h
-
-EXTRA_DIST = \
-	pqxx/doc/*.md \
-	pqxx/doc/mainpage.md.template \
-	pqxx/version.hxx.template
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
-	$(am__nobase_list) | while read dir files; do \
-	  xfiles=; for file in $$files; do \
-	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-	  test -z "$$xfiles" || { \
-	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
-	      $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
-	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
-	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
-	done
-
-uninstall-nobase_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-install-nobase_nodist_includeHEADERS: $(nobase_nodist_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
-	$(am__nobase_list) | while read dir files; do \
-	  xfiles=; for file in $$files; do \
-	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-	  test -z "$$xfiles" || { \
-	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
-	      $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
-	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
-	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
-	done
-
-uninstall-nobase_nodist_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(HEADERS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-nobase_includeHEADERS \
-	install-nobase_nodist_includeHEADERS
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-nobase_includeHEADERS \
-	uninstall-nobase_nodist_includeHEADERS
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-nobase_includeHEADERS \
-	install-nobase_nodist_includeHEADERS install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am \
-	uninstall-nobase_includeHEADERS \
-	uninstall-nobase_nodist_includeHEADERS
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpqxx-7.7.3/include/pqxx/Makefile.am b/ext/libpqxx-7.7.3/include/pqxx/Makefile.am
deleted file mode 100644
index c7f68813d..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-MAINTAINERCLEANFILES=Makefile.in stamp-h.in
-
-noinst_HEADERS = \
-	config-internal-autotools.h
-
-nodist_noinst_HEADERS = \
-	config.h \
-	config-internal-compiler.h
-
-DISTCLEANFILES = \
-	config-internal-autotools.h \
-	config-internal-compiler.h \
-	config-public-compiler.h
diff --git a/ext/libpqxx-7.7.3/include/pqxx/Makefile.in b/ext/libpqxx-7.7.3/include/pqxx/Makefile.in
deleted file mode 100644
index 4b02fb771..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/Makefile.in
+++ /dev/null
@@ -1,556 +0,0 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = include/pqxx
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4/libtool.m4 \
-	$(top_srcdir)/config/m4/ltoptions.m4 \
-	$(top_srcdir)/config/m4/ltsugar.m4 \
-	$(top_srcdir)/config/m4/ltversion.m4 \
-	$(top_srcdir)/config/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
-	$(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-HEADERS = $(nodist_noinst_HEADERS) $(noinst_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
-	config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/config/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-PKG_CONFIG = @PKG_CONFIG@
-POSTGRES_INCLUDE = @POSTGRES_INCLUDE@
-PQXXVERSION = @PQXXVERSION@
-PQXX_ABI = @PQXX_ABI@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_postgres_lib = @with_postgres_lib@
-MAINTAINERCLEANFILES = Makefile.in stamp-h.in
-noinst_HEADERS = \
-	config-internal-autotools.h
-
-nodist_noinst_HEADERS = \
-	config.h \
-	config-internal-compiler.h
-
-DISTCLEANFILES = \
-	config-internal-autotools.h \
-	config-internal-compiler.h \
-	config-public-compiler.h
-
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/pqxx/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/pqxx/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status include/pqxx/config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(HEADERS) config.h
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: all install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpqxx-7.7.3/include/pqxx/array b/ext/libpqxx-7.7.3/include/pqxx/array
deleted file mode 100644
index 689f5b27b..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/array
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Handling of SQL arrays.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/array.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/array.hxx b/ext/libpqxx-7.7.3/include/pqxx/array.hxx
deleted file mode 100644
index 8440a244f..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/array.hxx
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Handling of SQL arrays.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/field instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ARRAY
-#define PQXX_H_ARRAY
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <stdexcept>
-#include <string>
-#include <utility>
-
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/internal/encodings.hxx"
-
-
-namespace pqxx
-{
-/// Low-level array parser.
-/** Use this to read an array field retrieved from the database.
- *
- * This parser will only work reliably if your client encoding is UTF-8, ASCII,
- * or a single-byte encoding which is a superset of ASCII (such as Latin-1).
- *
- * Also, the parser only supports array element types which use either a comma
- * or a semicolon ("," or ";") as the separator between array elements.  All
- * built-in types use comma, except for one which uses semicolon, but some
- * custom types may not work.
- *
- * The input is a C-style string containing the textual representation of an
- * array, as returned by the database.  The parser reads this representation
- * on the fly.  The string must remain in memory until parsing is done.
- *
- * Parse the array by making calls to @ref get_next until it returns a
- * @ref juncture of "done".  The @ref juncture tells you what the parser found
- * in that step: did the array "nest" to a deeper level, or "un-nest" back up?
- */
-class PQXX_LIBEXPORT array_parser
-{
-public:
-  /// What's the latest thing found in the array?
-  enum class juncture
-  {
-    /// Starting a new row.
-    row_start,
-    /// Ending the current row.
-    row_end,
-    /// Found a NULL value.
-    null_value,
-    /// Found a string value.
-    string_value,
-    /// Parsing has completed.
-    done,
-  };
-
-  // TODO: constexpr noexcept.  Breaks ABI.
-  /// Constructor.  You don't need this; use @ref field::as_array instead.
-  /** The parser only remains valid while the data underlying the @ref result
-   * remains valid.  Once all `result` objects referring to that data have been
-   * destroyed, the parser will no longer refer to valid memory.
-   */
-  explicit array_parser(
-    std::string_view input,
-    internal::encoding_group = internal::encoding_group::MONOBYTE);
-
-  /// Parse the next step in the array.
-  /** Returns what it found.  If the juncture is @ref juncture::string_value,
-   * the string will contain the value.  Otherwise, it will be empty.
-   *
-   * Call this until the @ref array_parser::juncture it returns is
-   * @ref juncture::done.
-   */
-  std::pair<juncture, std::string> get_next();
-
-private:
-  std::string_view m_input;
-  internal::glyph_scanner_func *const m_scan;
-
-  /// Current parsing position in the input.
-  std::string::size_type m_pos = 0u;
-
-  std::string::size_type scan_single_quoted_string() const;
-  std::string parse_single_quoted_string(std::string::size_type end) const;
-  std::string::size_type scan_double_quoted_string() const;
-  std::string parse_double_quoted_string(std::string::size_type end) const;
-  std::string::size_type scan_unquoted_string() const;
-  std::string parse_unquoted_string(std::string::size_type end) const;
-
-  std::string::size_type scan_glyph(std::string::size_type pos) const;
-  std::string::size_type
-  scan_glyph(std::string::size_type pos, std::string::size_type end) const;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/binarystring b/ext/libpqxx-7.7.3/include/pqxx/binarystring
deleted file mode 100644
index 77551d9f7..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/binarystring
+++ /dev/null
@@ -1,6 +0,0 @@
-/** BYTEA (binary string) conversions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/binarystring.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/binarystring.hxx b/ext/libpqxx-7.7.3/include/pqxx/binarystring.hxx
deleted file mode 100644
index 47c82a035..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/binarystring.hxx
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Deprecated representation for raw, binary data.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/binarystring instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_BINARYSTRING
-#define PQXX_H_BINARYSTRING
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <memory>
-#include <string>
-#include <string_view>
-
-#include "pqxx/result.hxx"
-#include "pqxx/strconv.hxx"
-
-namespace pqxx
-{
-class binarystring;
-template<> struct string_traits<binarystring>;
-
-
-/// Binary data corresponding to PostgreSQL's "BYTEA" binary-string type.
-/** @ingroup escaping-functions
- * @deprecated Use @c std::basic_string<std::byte> and
- * @c std::basic_string_view<std::byte> for binary data.  In C++20 or better,
- * any @c contiguous_range of @c std::byte will do.
- *
- * This class represents a binary string as stored in a field of type @c bytea.
- *
- * Internally a binarystring is zero-terminated, but it may also contain null
- * bytes, they're just like any other byte value.  So don't assume that it's
- * safe to treat the contents as a C-style string.
- *
- * The binarystring retains its value even if the result it was obtained from
- * is destroyed, but it cannot be copied or assigned.
- *
- * \relatesalso transaction_base::quote_raw
- *
- * To include a @c binarystring value in an SQL query, escape and quote it
- * using the transaction's @c quote_raw function.
- *
- * @warning This class is implemented as a reference-counting smart pointer.
- * Copying, swapping, and destroying binarystring objects that refer to the
- * same underlying data block is <em>not thread-safe</em>.  If you wish to pass
- * binarystrings around between threads, make sure that each of these
- * operations is protected against concurrency with similar operations on the
- * same object, or other objects pointing to the same data block.
- */
-class PQXX_LIBEXPORT binarystring
-{
-public:
-  using char_type = unsigned char;
-  using value_type = std::char_traits<char_type>::char_type;
-  using size_type = std::size_t;
-  using difference_type = long;
-  using const_reference = value_type const &;
-  using const_pointer = value_type const *;
-  using const_iterator = const_pointer;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    binarystring const &) = default;
-
-  /// Read and unescape bytea field.
-  /** The field will be zero-terminated, even if the original bytea field
-   * isn't.
-   * @param F the field to read; must be a bytea field
-   */
-  [[deprecated("Use std::byte for binary data.")]] explicit binarystring(
-    field const &);
-
-  /// Copy binary data from std::string_view on binary data.
-  /** This is inefficient in that it copies the data to a buffer allocated on
-   * the heap.
-   */
-  [[deprecated("Use std::byte for binary data.")]] explicit binarystring(
-    std::string_view);
-
-  /// Copy binary data of given length straight out of memory.
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    void const *, std::size_t);
-
-  /// Efficiently wrap a buffer of binary data in a @c binarystring.
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    std::shared_ptr<value_type> ptr, size_type size) :
-          m_buf{std::move(ptr)}, m_size{size}
-  {}
-
-  /// Size of converted string in bytes.
-  [[nodiscard]] size_type size() const noexcept { return m_size; }
-  /// Size of converted string in bytes.
-  [[nodiscard]] size_type length() const noexcept { return size(); }
-  [[nodiscard]] bool empty() const noexcept { return size() == 0; }
-
-  [[nodiscard]] const_iterator begin() const noexcept { return data(); }
-  [[nodiscard]] const_iterator cbegin() const noexcept { return begin(); }
-  [[nodiscard]] const_iterator end() const noexcept { return data() + m_size; }
-  [[nodiscard]] const_iterator cend() const noexcept { return end(); }
-
-  [[nodiscard]] const_reference front() const noexcept { return *begin(); }
-  [[nodiscard]] const_reference back() const noexcept
-  {
-    return *(data() + m_size - 1);
-  }
-
-  [[nodiscard]] const_reverse_iterator rbegin() const
-  {
-    return const_reverse_iterator{end()};
-  }
-  [[nodiscard]] const_reverse_iterator crbegin() const { return rbegin(); }
-  [[nodiscard]] const_reverse_iterator rend() const
-  {
-    return const_reverse_iterator{begin()};
-  }
-  [[nodiscard]] const_reverse_iterator crend() const { return rend(); }
-
-  /// Unescaped field contents.
-  [[nodiscard]] value_type const *data() const noexcept { return m_buf.get(); }
-
-  [[nodiscard]] const_reference operator[](size_type i) const noexcept
-  {
-    return data()[i];
-  }
-
-  [[nodiscard]] PQXX_PURE bool operator==(binarystring const &) const noexcept;
-  [[nodiscard]] bool operator!=(binarystring const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-
-  binarystring &operator=(binarystring const &);
-
-  /// Index contained string, checking for valid index.
-  const_reference at(size_type) const;
-
-  /// Swap contents with other binarystring.
-  void swap(binarystring &);
-
-  /// Raw character buffer (no terminating zero is added).
-  /** @warning No terminating zero is added!  If the binary data did not end in
-   * a null character, you will not find one here.
-   */
-  [[nodiscard]] char const *get() const noexcept
-  {
-    return reinterpret_cast<char const *>(m_buf.get());
-  }
-
-  /// Read contents as a std::string_view.
-  [[nodiscard]] std::string_view view() const noexcept
-  {
-    return std::string_view(get(), size());
-  }
-
-  /// Read as regular C++ string (may include null characters).
-  /** This creates and returns a new string object.  Don't call this
-   * repeatedly; retrieve your string once and keep it in a local variable.
-   * Also, do not expect to be able to compare the string's address to that of
-   * an earlier invocation.
-   */
-  [[nodiscard]] std::string str() const;
-
-  /// Access data as a pointer to @c std::byte.
-  [[nodiscard]] std::byte const *bytes() const
-  {
-    return reinterpret_cast<std::byte const *>(get());
-  }
-
-  /// Read data as a @c std::basic_string_view<std::byte>.
-  [[nodiscard]] std::basic_string_view<std::byte> bytes_view() const
-  {
-    return std::basic_string_view<std::byte>{bytes(), size()};
-  }
-
-private:
-  std::shared_ptr<value_type> m_buf;
-  size_type m_size{0};
-};
-
-
-template<> struct nullness<binarystring> : no_null<binarystring>
-{};
-
-
-/// String conversion traits for @c binarystring.
-/** Defines the conversions between a @c binarystring and its PostgreSQL
- * textual format, for communication with the database.
- *
- * These conversions rely on the "hex" format which was introduced in
- * PostgreSQL 9.0.  Both your libpq and the server must be recent enough to
- * speak this format.
- */
-template<> struct string_traits<binarystring>
-{
-  static std::size_t size_buffer(binarystring const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(char *begin, char *end, binarystring const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, binarystring const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    std::string_view text{value.view()};
-    internal::esc_bin(binary_cast(text), begin);
-    return begin + budget;
-  }
-
-  static binarystring from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::shared_ptr<unsigned char> buf{
-      new unsigned char[size], [](unsigned char const *x) { delete[] x; }};
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.get()));
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return binarystring{std::move(buf), size};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/blob b/ext/libpqxx-7.7.3/include/pqxx/blob
deleted file mode 100644
index 3fd0afac9..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/blob
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Binary Large Objects interface.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/blob.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/blob.hxx b/ext/libpqxx-7.7.3/include/pqxx/blob.hxx
deleted file mode 100644
index 6d77be724..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/blob.hxx
+++ /dev/null
@@ -1,351 +0,0 @@
-/* Binary Large Objects interface.
- *
- * Read or write large objects, stored in their own storage on the server.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/largeobject instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_BLOB
-#define PQXX_H_BLOB
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstdint>
-
-#if defined(PQXX_HAVE_PATH)
-#  include <filesystem>
-#endif
-
-#if defined(PQXX_HAVE_RANGES) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#if defined(PQXX_HAVE_SPAN) && __has_include(<span>)
-#  include <span>
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-
-namespace pqxx
-{
-/** Binary large object.
- *
- * This is how you store data that may be too large for the `BYTEA` type.
- * Access operations are similar to those for a file: you can read, write,
- * query or set the current reading/writing position, and so on.
- *
- * These large objects live in their own storage on the server, indexed by an
- * integer object identifier ("oid").
- *
- * Two `blob` objects may refer to the same actual large object in the
- * database at the same time.  Each will have its own reading/writing position,
- * but writes to the one will of course affect what the other sees.
- */
-class PQXX_LIBEXPORT blob
-{
-public:
-  /// Create a new, empty large object.
-  /** You may optionally specify an oid for the new blob.  If you do, then
-   * the new object will have that oid -- or creation will fail if there
-   * already is an object with that oid.
-   */
-  [[nodiscard]] static oid create(dbtransaction &, oid = 0);
-
-  /// Delete a large object, or fail if it does not exist.
-  static void remove(dbtransaction &, oid);
-
-  /// Open blob for reading.  Any attempt to write to it will fail.
-  [[nodiscard]] static blob open_r(dbtransaction &, oid);
-  // Open blob for writing.  Any attempt to read from it will fail.
-  [[nodiscard]] static blob open_w(dbtransaction &, oid);
-  // Open blob for reading and/or writing.
-  [[nodiscard]] static blob open_rw(dbtransaction &, oid);
-
-  /// You can default-construct a blob, but it won't do anything useful.
-  /** Most operations on a default-constructed blob will throw @ref
-   * usage_error.
-   */
-  blob() = default;
-
-  /// You can move a blob, but not copy it.  The original becomes unusable.
-  blob(blob &&);
-  /// You can move a blob, but not copy it.  The original becomes unusable.
-  blob &operator=(blob &&);
-
-  blob(blob const &) = delete;
-  blob &operator=(blob const &) = delete;
-  ~blob();
-
-  /// Maximum number of bytes that can be read or written at a time.
-  /** The underlying protocol only supports reads and writes up to 2 GB
-   * exclusive.
-   *
-   * If you need to read or write more data to or from a binary large object,
-   * you'll have to break it up into chunks.
-   */
-  static constexpr std::size_t chunk_limit = 0x7fffffff;
-
-  /// Read up to `size` bytes of the object into `buf`.
-  /** Uses a buffer that you provide, resizing it as needed.  If it suits you,
-   * this lets you allocate the buffer once and then re-use it multiple times.
-   *
-   * Resizes `buf` as needed.
-   *
-   * @warning The underlying protocol only supports reads up to 2GB at a time.
-   * If you need to read more, try making repeated calls to @ref append_to_buf.
-   */
-  std::size_t read(std::basic_string<std::byte> &buf, std::size_t size);
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** Retrieves bytes from the blob, at the current position, until `buf` is
-   * full or there are no more bytes to read, whichever comes first.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<std::size_t extent = std::dynamic_extent>
-  std::span<std::byte> read(std::span<std::byte, extent> buf)
-  {
-    return buf.subspan(0, raw_read(std::data(buf), std::size(buf)));
-  }
-#endif // PQXX_HAVE_SPAN
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** Retrieves bytes from the blob, at the current position, until `buf` is
-   * full or there are no more bytes to read, whichever comes first.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<binary DATA> std::span<std::byte> read(DATA &buf)
-  {
-    return {std::data(buf), raw_read(std::data(buf), std::size(buf))};
-  }
-#else  // PQXX_HAVE_CONCEPTS && PQXX_HAVE_SPAN
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** @deprecated As libpqxx moves to C++20 as its baseline language version,
-   * this will take and return `std::span<std::byte>`.
-   *
-   * Retrieves bytes from the blob, at the current position, until `buf` is
-   * full (i.e. its current size is reached), or there are no more bytes to
-   * read, whichever comes first.
-   *
-   * This function will not change either the size or the capacity of `buf`,
-   * only its contents.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<typename ALLOC>
-  std::basic_string_view<std::byte> read(std::vector<std::byte, ALLOC> &buf)
-  {
-    return {std::data(buf), raw_read(std::data(buf), std::size(buf))};
-  }
-#endif // PQXX_HAVE_CONCEPTS && PQXX_HAVE_SPAN
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Write `data` to large object, at the current position.
-  /** If the writing position is at the end of the object, this will append
-   * `data` to the object's contents and move the writing position so that
-   * it's still at the end.
-   *
-   * If the writing position was not at the end, writing will overwrite the
-   * prior data, but it will not remove data that follows the part where you
-   * wrote your new data.
-   *
-   * @warning This is a big difference from writing to a file.  You can
-   * overwrite some data in a large object, but this does not truncate the
-   * data that was already there.  For example, if the object contained binary
-   * data "abc", and you write "12" at the starting position, the object will
-   * contain "12c".
-   *
-   * @warning The underlying protocol only supports writes up to 2 GB at a
-   * time.  If you need to write more, try making repeated calls to
-   * @ref append_from_buf.
-   */
-  template<binary DATA> void write(DATA const &data)
-  {
-    raw_write(std::data(data), std::size(data));
-  }
-#else
-  /// Write `data` large object, at the current position.
-  /** If the writing position is at the end of the object, this will append
-   * `data` to the object's contents and move the writing position so that
-   * it's still at the end.
-   *
-   * If the writing position was not at the end, writing will overwrite the
-   * prior data, but it will not remove data that follows the part where you
-   * wrote your new data.
-   *
-   * @warning This is a big difference from writing to a file.  You can
-   * overwrite some data in a large object, but this does not truncate the
-   * data that was already there.  For example, if the object contained binary
-   * data "abc", and you write "12" at the starting position, the object will
-   * contain "12c".
-   *
-   * @warning The underlying protocol only supports writes up to 2 GB at a
-   * time.  If you need to write more, try making repeated calls to
-   * @ref append_from_buf.
-   */
-  template<typename DATA> void write(DATA const &data)
-  {
-    raw_write(std::data(data), std::size(data));
-  }
-#endif
-
-  /// Resize large object to `size` bytes.
-  /** If the blob is more than `size` bytes long, this removes the end so as
-   * to make the blob the desired length.
-   *
-   * If the blob is less than `size` bytes long, it adds enough zero bytes to
-   * make it the desired length.
-   */
-  void resize(std::int64_t size);
-
-  /// Return the current reading/writing position in the large object.
-  [[nodiscard]] std::int64_t tell() const;
-
-  /// Set the current reading/writing position to an absolute offset.
-  /** Returns the new file offset. */
-  std::int64_t seek_abs(std::int64_t offset = 0);
-  /// Move the current reading/writing position forwards by an offset.
-  /** To move backwards, pass a negative offset.
-   *
-   * Returns the new file offset.
-   */
-  std::int64_t seek_rel(std::int64_t offset = 0);
-  /// Set the current position to an offset relative to the end of the blob.
-  /** You'll probably want an offset of zero or less.
-   *
-   * Returns the new file offset.
-   */
-  std::int64_t seek_end(std::int64_t offset = 0);
-
-  /// Create a binary large object containing given `data`.
-  /** You may optionally specify an oid for the new object.  If you do, and an
-   * object with that oid already exists, creation will fail.
-   */
-  static oid from_buf(
-    dbtransaction &tx, std::basic_string_view<std::byte> data, oid id = 0);
-
-  /// Append `data` to binary large object.
-  /** The underlying protocol only supports appending blocks up to 2 GB.
-   */
-  static void append_from_buf(
-    dbtransaction &tx, std::basic_string_view<std::byte> data, oid id);
-
-  /// Read client-side file and store it server-side as a binary large object.
-  [[nodiscard]] static oid from_file(dbtransaction &, char const path[]);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Read client-side file and store it server-side as a binary large object.
-  /** This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  [[nodiscard]] static oid
-  from_file(dbtransaction &tx, std::filesystem::path const &path)
-  {
-    return from_file(tx, path.c_str());
-  }
-#endif
-
-  /// Read client-side file and store it server-side as a binary large object.
-  /** In this version, you specify the binary large object's oid.  If that oid
-   * is already in use, the operation will fail.
-   */
-  static oid from_file(dbtransaction &, char const path[], oid);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Read client-side file and store it server-side as a binary large object.
-  /** In this version, you specify the binary large object's oid.  If that oid
-   * is already in use, the operation will fail.
-   *
-   * This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  static oid
-  from_file(dbtransaction &tx, std::filesystem::path const &path, oid id)
-  {
-    return from_file(tx, path.c_str(), id);
-  }
-#endif
-
-  /// Convenience function: Read up to `max_size` bytes from blob with `id`.
-  /** You could easily do this yourself using the @ref open_r and @ref read
-   * functions, but it can save you a bit of code to do it this way.
-   */
-  static void to_buf(
-    dbtransaction &, oid, std::basic_string<std::byte> &,
-    std::size_t max_size);
-
-  /// Read part of the binary large object with `id`, and append it to `buf`.
-  /** Use this to break up a large read from one binary large object into one
-   * massive buffer.  Just keep calling this function until it returns zero.
-   *
-   * The `offset` is how far into the large object your desired chunk is, and
-   * `append_max` says how much to try and read in one go.
-   */
-  static std::size_t append_to_buf(
-    dbtransaction &tx, oid id, std::int64_t offset,
-    std::basic_string<std::byte> &buf, std::size_t append_max);
-
-  /// Write a binary large object's contents to a client-side file.
-  static void to_file(dbtransaction &, oid, char const path[]);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Write a binary large object's contents to a client-side file.
-  /** This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  static void
-  to_file(dbtransaction &tx, oid id, std::filesystem::path const &path)
-  {
-    to_file(tx, id, path.c_str());
-  }
-#endif
-
-  /// Close this blob.
-  /** This does not delete the blob from the database; it only terminates your
-   * local object for accessing the blob.
-   *
-   * Resets the blob to a useless state similar to one that was
-   * default-constructed.
-   *
-   * The destructor will do this for you automatically.  Still, there is a
-   * reason to `close()` objects explicitly where possible: if an error should
-   * occur while closing, `close()` can throw an exception.  A destructor
-   * cannot.
-   */
-  void close();
-
-private:
-  PQXX_PRIVATE blob(connection &conn, int fd) noexcept :
-          m_conn{&conn}, m_fd{fd}
-  {}
-  static PQXX_PRIVATE blob open_internal(dbtransaction &, oid, int);
-  static PQXX_PRIVATE pqxx::internal::pq::PGconn *
-  raw_conn(pqxx::connection *) noexcept;
-  static PQXX_PRIVATE pqxx::internal::pq::PGconn *
-  raw_conn(pqxx::dbtransaction const &) noexcept;
-  static PQXX_PRIVATE std::string errmsg(connection const *);
-  static PQXX_PRIVATE std::string errmsg(dbtransaction const &tx)
-  {
-    return errmsg(&tx.conn());
-  }
-  PQXX_PRIVATE std::string errmsg() const { return errmsg(m_conn); }
-  PQXX_PRIVATE std::int64_t seek(std::int64_t offset, int whence);
-  std::size_t raw_read(std::byte buf[], std::size_t size);
-  void raw_write(std::byte const buf[], std::size_t size);
-
-  connection *m_conn = nullptr;
-  int m_fd = -1;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/composite b/ext/libpqxx-7.7.3/include/pqxx/composite
deleted file mode 100644
index 2bfa7ade9..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/composite
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Handling of SQL "composite types."
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/composite.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/composite.hxx b/ext/libpqxx-7.7.3/include/pqxx/composite.hxx
deleted file mode 100644
index 439b133a8..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/composite.hxx
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef PQXX_H_COMPOSITE
-#define PQXX_H_COMPOSITE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/internal/array-composite.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Parse a string representation of a value of a composite type.
-/** @warning This code is still experimental.  Use with care.
- *
- * You may use this as a helper while implementing your own @ref string_traits
- * for a composite type.
- *
- * This function interprets `text` as the string representation of a value of
- * some composite type, and sets each of `fields` to the respective values of
- * its fields.  The field types must be copy-assignable.
- *
- * The number of fields must match the number of fields in the composite type,
- * and there must not be any other text in the input.  The function is meant to
- * handle any value string that the backend can produce, but not necessarily
- * every valid alternative spelling.
- *
- * Fields in composite types can be null.  When this happens, the C++ type of
- * the corresponding field reference must be of a type that can handle nulls.
- * If you are working with a type that does not have an inherent null value,
- * such as e.g. `int`, consider using `std::optional`.
- */
-template<typename... T>
-inline void parse_composite(
-  pqxx::internal::encoding_group enc, std::string_view text, T &...fields)
-{
-  static_assert(sizeof...(fields) > 0);
-
-  auto const scan{pqxx::internal::get_glyph_scanner(enc)};
-  auto const data{std::data(text)};
-  auto const size{std::size(text)};
-  if (size == 0)
-    throw conversion_error{"Cannot parse composite value from empty string."};
-
-  std::size_t here{0}, next{scan(data, size, here)};
-  if (next != 1 or data[here] != '(')
-    throw conversion_error{
-      internal::concat("Invalid composite value string: ", text)};
-
-  here = next;
-
-  constexpr auto num_fields{sizeof...(fields)};
-  std::size_t index{0};
-  (pqxx::internal::parse_composite_field(
-     index, text, here, fields, scan, num_fields - 1),
-   ...);
-  if (here != std::size(text))
-    throw conversion_error{internal::concat(
-      "Composite value did not end at the closing parenthesis: '", text,
-      "'.")};
-  if (text[here - 1] != ')')
-    throw conversion_error{internal::concat(
-      "Composive value did not end in parenthesis: '", text, "'")};
-}
-
-
-/// Parse a string representation of a value of a composite type.
-/** @warning This version only works for UTF-8 and single-byte encodings.
- *
- * For proper encoding support, use the composite-type support in the
- * `field` class.
- */
-template<typename... T>
-inline void parse_composite(std::string_view text, T &...fields)
-{
-  parse_composite(pqxx::internal::encoding_group::MONOBYTE, text, fields...);
-}
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-constexpr char empty_composite_str[]{"()"};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// Estimate the buffer size needed to represent a value of a composite type.
-/** Returns a conservative estimate.
- */
-template<typename... T>
-[[nodiscard]] inline std::size_t
-composite_size_buffer(T const &...fields) noexcept
-{
-  constexpr auto num{sizeof...(fields)};
-
-  // Size for a multi-field composite includes room for...
-  //  + opening parenthesis
-  //  + field budgets
-  //  + separating comma per field
-  //  - comma after final field
-  //  + closing parenthesis
-  //  + terminating zero
-
-  if constexpr (num == 0)
-    return std::size(pqxx::internal::empty_composite_str);
-  else
-    return 1 + (pqxx::internal::size_composite_field_buffer(fields) + ...) +
-           num + 1;
-}
-
-
-/// Render a series of values as a single composite SQL value.
-/** @warning This code is still experimental.  Use with care.
- *
- * You may use this as a helper while implementing your own `string_traits`
- * for a composite type.
- */
-template<typename... T>
-inline char *composite_into_buf(char *begin, char *end, T const &...fields)
-{
-  if (std::size_t(end - begin) < composite_size_buffer(fields...))
-    throw conversion_error{
-      "Buffer space may not be enough to represent composite value."};
-
-  constexpr auto num_fields{sizeof...(fields)};
-  if constexpr (num_fields == 0)
-  {
-    constexpr char empty[]{"()"};
-    std::memcpy(begin, empty, std::size(empty));
-    return begin + std::size(empty);
-  }
-
-  char *pos{begin};
-  *pos++ = '(';
-
-  (pqxx::internal::write_composite_field<T>(pos, end, fields), ...);
-
-  // If we've got multiple fields, "backspace" that last comma.
-  if constexpr (num_fields > 1)
-    --pos;
-  *pos++ = ')';
-  *pos++ = '\0';
-  return pos;
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/config.h.in b/ext/libpqxx-7.7.3/include/pqxx/config.h.in
deleted file mode 100644
index 743579967..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/config.h.in
+++ /dev/null
@@ -1,121 +0,0 @@
-/* include/pqxx/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `pq' library (-lpq). */
-#undef HAVE_LIBPQ
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define if <charconv> supports floating-point conversion. */
-#undef PQXX_HAVE_CHARCONV_FLOAT
-
-/* Define if <charconv> supports integer conversion. */
-#undef PQXX_HAVE_CHARCONV_INT
-
-/* Define if compiler has C++20 std::cmp_greater etc. */
-#undef PQXX_HAVE_CMP
-
-/* Define if compiler supports Concepts and <ranges> header. */
-#undef PQXX_HAVE_CONCEPTS
-
-/* Define if compiler supports __cxa_demangle */
-#undef PQXX_HAVE_CXA_DEMANGLE
-
-/* Define if g++ supports pure attribute */
-#undef PQXX_HAVE_GCC_PURE
-
-/* Define if g++ supports visibility attribute. */
-#undef PQXX_HAVE_GCC_VISIBILITY
-
-/* Define if likely & unlikely work. */
-#undef PQXX_HAVE_LIKELY
-
-/* Define if operator[] can take multiple arguments. */
-#undef PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT
-
-/* Define if compiler has usable std::filesystem::path. */
-#undef PQXX_HAVE_PATH
-
-/* Define if poll() is available. */
-#undef PQXX_HAVE_POLL
-
-/* Define if libpq has PQencryptPasswordConn (since pg 10). */
-#undef PQXX_HAVE_PQENCRYPTPASSWORDCONN
-
-/* Define if libpq has pipeline mode (since pg 14). */
-#undef PQXX_HAVE_PQ_PIPELINE
-
-/* Define if std::this_thread::sleep_for works. */
-#undef PQXX_HAVE_SLEEP_FOR
-
-/* Define if compiler has std::span. */
-#undef PQXX_HAVE_SPAN
-
-/* Define if strerror_r() is available. */
-#undef PQXX_HAVE_STRERROR_R
-
-/* Define if strerror_s() is available. */
-#undef PQXX_HAVE_STRERROR_S
-
-/* Define if thread_local is fully supported. */
-#undef PQXX_HAVE_THREAD_LOCAL
-
-/* Define if std::chrono has year_month_day etc. */
-#undef PQXX_HAVE_YEAR_MONTH_DAY
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/ext/libpqxx-7.7.3/include/pqxx/connection b/ext/libpqxx-7.7.3/include/pqxx/connection
deleted file mode 100644
index 82ff43aa5..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/connection
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::connection class.
- *
- * pqxx::connection encapsulates a connection to a database.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/connection.hxx b/ext/libpqxx-7.7.3/include/pqxx/connection.hxx
deleted file mode 100644
index 92454bb47..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/connection.hxx
+++ /dev/null
@@ -1,1261 +0,0 @@
-/* Definition of the connection class.
- *
- * pqxx::connection encapsulates a connection to a database.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/connection instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_CONNECTION
-#define PQXX_H_CONNECTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstddef>
-#include <ctime>
-#include <functional>
-#include <initializer_list>
-#include <list>
-#include <map>
-#include <memory>
-#include <string_view>
-#include <tuple>
-#include <utility>
-
-// Double-check in order to suppress an overzealous Visual C++ warning (#418).
-#if defined(PQXX_HAVE_CONCEPTS) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-
-/**
- * @addtogroup connections
- *
- * Use of the libpqxx library starts here.
- *
- * Everything that can be done with a database through libpqxx must go through
- * a @ref pqxx::connection object.  It connects to a database when you create
- * it, and it terminates that communication during destruction.
- *
- * Many things come together in this class.  Handling of error and warning
- * messages, for example, is defined by @ref pqxx::errorhandler objects in the
- * context of a connection.  Prepared statements are also defined here.
- *
- * When you connect to a database, you pass a connection string containing any
- * parameters and options, such as the server address and the database name.
- *
- * These are identical to the ones in libpq, the C language binding upon which
- * libpqxx itself is built:
- *
- * https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
- *
- * There are also environment variables you can set to provide defaults, again
- * as defined by libpq:
- *
- * https://www.postgresql.org/docs/current/libpq-envars.html
- *
- * You can also create a database connection _asynchronously_ using an
- * intermediate @ref pqxx::connecting object.
- */
-
-namespace pqxx::internal
-{
-class sql_cursor;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: T is a range of pairs of zero-terminated strings.
-template<typename T>
-concept ZKey_ZValues = std::ranges::input_range<T> and requires(T t)
-{
-  {std::cbegin(t)};
-  {
-    std::get<0>(*std::cbegin(t))
-    } -> ZString;
-  {
-    std::get<1>(*std::cbegin(t))
-    } -> ZString;
-} and std::tuple_size_v<typename std::ranges::iterator_t<T>::value_type>
-== 2;
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx::internal
-
-
-namespace pqxx::internal::gate
-{
-class connection_dbtransaction;
-class connection_errorhandler;
-class connection_largeobject;
-class connection_notification_receiver;
-class connection_pipeline;
-class connection_sql_cursor;
-class connection_stream_from;
-class connection_stream_to;
-class connection_transaction;
-class const_connection_largeobject;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Representation of a PostgreSQL table path.
-/** A "table path" consists of a table name, optionally prefixed by a schema
- * name, which in turn is optionally prefixed by a database name.
- *
- * A minimal example of a table path would be `{mytable}`.  But a table path
- * may also take the forms `{myschema,mytable}` or
- * `{mydb,myschema,mytable}`.
- */
-using table_path = std::initializer_list<std::string_view>;
-
-
-/// Encrypt a password.  @deprecated Use connection::encrypt_password instead.
-[[nodiscard,
-  deprecated("Use connection::encrypt_password instead.")]] std::string
-  PQXX_LIBEXPORT
-  encrypt_password(char const user[], char const password[]);
-
-/// Encrypt password.  @deprecated Use connection::encrypt_password instead.
-[[nodiscard,
-  deprecated("Use connection::encrypt_password instead.")]] inline std::string
-encrypt_password(zview user, zview password)
-{
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return encrypt_password(user.c_str(), password.c_str());
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-/// Error verbosity levels.
-enum class error_verbosity : int
-{
-  // These values must match those in libpq's PGVerbosity enum.
-  terse = 0,
-  normal = 1,
-  verbose = 2
-};
-
-
-/// Connection to a database.
-/** This is the first class to look at when you wish to work with a database
- * through libpqxx.  The connection opens during construction, and closes upon
- * destruction.
- *
- * When creating a connection, you can pass a connection URI or a postgres
- * connection string, to specify the database server's address, a login
- * username, and so on.  If you don't, the connection will try to obtain them
- * from certain environment variables.  If those are not set either, the
- * default is to try and connect to the local system's port 5432.
- *
- * Find more about connection strings here:
- *
- * https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
- *
- * The variables are documented here:
- *
- * https://www.postgresql.org/docs/current/libpq-envars.html
- *
- * To query or manipulate the database once connected, use one of the
- * transaction classes (see pqxx/transaction_base.hxx) and perhaps also the
- * transactor framework (see pqxx/transactor.hxx).
- *
- * When a connection breaks, you will typically get a @ref broken_connection
- * exception.  This can happen at almost any point.
- *
- * @warning On Unix-like systems, including GNU and BSD systems, your program
- * may receive the SIGPIPE signal when the connection to the backend breaks. By
- * default this signal will abort your program.  Use "signal(SIGPIPE, SIG_IGN)"
- * if you want your program to continue running after a connection fails.
- */
-class PQXX_LIBEXPORT connection
-{
-public:
-  connection() : connection{""} {}
-
-  /// Connect to a database, using `options` string.
-  explicit connection(char const options[])
-  {
-    check_version();
-    init(options);
-  }
-
-  /// Connect to a database, using `options` string.
-  explicit connection(zview options) : connection{options.c_str()}
-  {
-    // (Delegates to other constructor which calls check_version for us.)
-  }
-
-  /// Move constructor.
-  /** Moving a connection is not allowed if it has an open transaction, or has
-   * error handlers or notification receivers registered on it.  In those
-   * situations, other objects may hold references to the old object which
-   * would become invalid and might produce hard-to-diagnose bugs.
-   */
-  connection(connection &&rhs);
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Connect to a database, passing options as a range of key/value pairs.
-  /** @warning Experimental.  Requires C++20 "concepts" support.  Define
-   * `PQXX_HAVE_CONCEPTS` to enable it.
-   *
-   * There's no need to escape the parameter values.
-   *
-   * See the PostgreSQL libpq documentation for the full list of possible
-   * options:
-   *
-   * https://postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS
-   *
-   * The options can be anything that can be iterated as a series of pairs of
-   * zero-terminated strings: `std::pair<std::string, std::string>`, or
-   * `std::tuple<pqxx::zview, char const *>`, or
-   * `std::map<std::string, pqxx::zview>`, and so on.
-   */
-  template<internal::ZKey_ZValues MAPPING>
-  inline connection(MAPPING const &params);
-#endif // PQXX_HAVE_CONCEPTS
-
-  ~connection()
-  {
-    try
-    {
-      close();
-    }
-    catch (std::exception const &)
-    {}
-  }
-
-  /// Move assignment.
-  /** Neither connection can have an open transaction, registered error
-   * handlers, or registered notification receivers.
-   */
-  connection &operator=(connection &&rhs);
-
-  connection(connection const &) = delete;
-  connection &operator=(connection const &) = delete;
-
-  /// Is this connection open at the moment?
-  /** @warning This function is **not** needed in most code.  Resist the
-   * temptation to check it after opening a connection.  The `connection`
-   * constructor will throw a @ref broken_connection exception if can't connect
-   * to the database.
-   */
-  [[nodiscard]] bool PQXX_PURE is_open() const noexcept;
-
-  /// Invoke notice processor function.  The message should end in newline.
-  void process_notice(char const[]) noexcept;
-  /// Invoke notice processor function.  Newline at end is recommended.
-  /** The zview variant, with a message ending in newline, is the most
-   * efficient way to call process_notice.
-   */
-  void process_notice(zview) noexcept;
-
-  /// Enable tracing to a given output stream, or nullptr to disable.
-  void trace(std::FILE *) noexcept;
-
-  /**
-   * @name Connection properties
-   *
-   * These are probably not of great interest, since most are derived from
-   * information supplied by the client program itself, but they are included
-   * for completeness.
-   *
-   * The connection needs to be currently active for these to work.
-   */
-  //@{
-  /// Name of database we're connected to, if any.
-  [[nodiscard]] char const *dbname() const;
-
-  /// Database user ID we're connected under, if any.
-  [[nodiscard]] char const *username() const;
-
-  /// Address of server, or nullptr if none specified (i.e. default or local)
-  [[nodiscard]] char const *hostname() const;
-
-  /// Server port number we're connected to.
-  [[nodiscard]] char const *port() const;
-
-  /// Process ID for backend process, or 0 if inactive.
-  [[nodiscard]] int PQXX_PURE backendpid() const &noexcept;
-
-  /// Socket currently used for connection, or -1 for none.  Use with care!
-  /** Query the current socket number.  This is intended for event loops based
-   * on functions such as select() or poll(), where you're waiting for any of
-   * multiple file descriptors to become ready for communication.
-   *
-   * Please try to stay away from this function.  It is really only meant for
-   * event loops that need to wait on more than one file descriptor.  If all
-   * you need is to block until a notification arrives, for instance, use
-   * await_notification().  If you want to issue queries and retrieve results
-   * in nonblocking fashion, check out the pipeline class.
-   */
-  [[nodiscard]] int PQXX_PURE sock() const &noexcept;
-
-  /// What version of the PostgreSQL protocol is this connection using?
-  /** The answer can be 0 (when there is no connection); 3 for protocol 3.0; or
-   * possibly higher values as newer protocol versions come into use.
-   */
-  [[nodiscard]] int PQXX_PURE protocol_version() const noexcept;
-
-  /// What version of the PostgreSQL server are we connected to?
-  /** The result is a bit complicated: each of the major, medium, and minor
-   * release numbers is written as a two-digit decimal number, and the three
-   * are then concatenated.  Thus server version 9.4.2 will be returned as the
-   * decimal number 90402.  If there is no connection to the server, this
-   * returns zero.
-   *
-   * @warning When writing version numbers in your code, don't add zero at the
-   * beginning!  Numbers beginning with zero are interpreted as octal (base-8)
-   * in C++.  Thus, 070402 is not the same as 70402, and 080000 is not a number
-   * at all because there is no digit "8" in octal notation.  Use strictly
-   * decimal notation when it comes to these version numbers.
-   */
-  [[nodiscard]] int PQXX_PURE server_version() const noexcept;
-  //@}
-
-  /// @name Text encoding
-  /**
-   * Each connection is governed by a "client encoding," which dictates how
-   * strings and other text is represented in bytes.  The database server will
-   * send text data to you in this encoding, and you should use it for the
-   * queries and data which you send to the server.
-   *
-   * Search the PostgreSQL documentation for "character set encodings" to find
-   * out more about the available encodings, how to extend them, and how to use
-   * them.  Not all server-side encodings are compatible with all client-side
-   * encodings or vice versa.
-   *
-   * Encoding names are case-insensitive, so e.g. "UTF8" is equivalent to
-   * "utf8".
-   *
-   * You can change the client encoding, but this may not work when the
-   * connection is in a special state, such as when streaming a table.  It's
-   * not clear what happens if you change the encoding during a transaction,
-   * and then abort the transaction.
-   */
-  //@{
-  /// Get client-side character encoding, by name.
-  [[nodiscard]] std::string get_client_encoding() const;
-
-  /// Set client-side character encoding, by name.
-  /**
-   * @param encoding Name of the character set encoding to use.
-   */
-  void set_client_encoding(zview encoding) &
-  {
-    set_client_encoding(encoding.c_str());
-  }
-
-  /// Set client-side character encoding, by name.
-  /**
-   * @param encoding Name of the character set encoding to use.
-   */
-  void set_client_encoding(char const encoding[]) &;
-
-  /// Get the connection's encoding, as a PostgreSQL-defined code.
-  [[nodiscard]] int PQXX_PRIVATE encoding_id() const;
-
-  //@}
-
-  /// Set session variable, using SQL's `SET` command.
-  /** @deprecated To set a session variable, use @ref set_session_var.  To set
-   * a transaction-local variable, execute an SQL `SET` command.
-   *
-   * @warning When setting a string value, you must escape and quote it first.
-   * Use the @ref quote() function to do that.
-   *
-   * @warning This executes an SQL query, so do not get or set variables while
-   * a table stream or pipeline is active on the same connection.
-   *
-   * @param var Variable to set.
-   * @param value New value for Var.  This can be any SQL expression.  If it's
-   * a string, be sure that it's properly escaped and quoted.
-   */
-  [[deprecated("To set session variables, use set_session_var.")]] void
-  set_variable(std::string_view var, std::string_view value) &;
-
-  /// Set one of the session variables to a new value.
-  /** This executes SQL, so do not do it while a pipeline or stream is active
-   * on the connection.
-   *
-   * The value you set here will last for the rest of the connection's
-   * duration, or until you set a new value.
-   *
-   * If you set the value while in a @ref dbtransaction (i.e. any transaction
-   * that is not a @ref nontransaction), then rolling back the transaction will
-   * undo the change.
-   *
-   * All applies to setting _session_ variables.  You can also set the same
-   * variables as _local_ variables, in which case they will always revert to
-   * their previous value when the transaction ends (or when you overwrite them
-   * of course).  To set a local variable, simply execute an SQL statement
-   * along the lines of "`SET LOCAL var = 'value'`" inside your transaction.
-   *
-   * @param var The variable to set.
-   * @param value The new value for the variable.
-   * @throw @ref variable_set_to_null if the value is null; this is not
-   * allowed.
-   */
-  template<typename TYPE>
-  void set_session_var(std::string_view var, TYPE const &value) &
-  {
-    if constexpr (nullness<TYPE>::has_null)
-    {
-      if (nullness<TYPE>::is_null(value))
-        throw variable_set_to_null{
-          internal::concat("Attempted to set variable ", var, " to null.")};
-    }
-    exec(internal::concat("SET ", quote_name(var), "=", quote(value)));
-  }
-
-  /// Read session variable, using SQL's `SHOW` command.
-  /** @warning This executes an SQL query, so do not get or set variables while
-   * a table stream or pipeline is active on the same connection.
-   */
-  [[deprecated("Use get_var instead.")]] std::string
-    get_variable(std::string_view);
-
-  /// Read currently applicable value of a variable.
-  /** This function executes an SQL statement, so it won't work while a
-   * @ref pipeline or query stream is active on the connection.
-   *
-   * @return a blank `std::optional` if the variable's value is null, or its
-   * string value otherwise.
-   */
-  std::string get_var(std::string_view var);
-
-  /// Read currently applicable value of a variable.
-  /** This function executes an SQL statement, so it won't work while a
-   * @ref pipeline or query stream is active on the connection.
-   *
-   * If there is any possibility that the variable is null, ensure that `TYPE`
-   * can represent null values.
-   */
-  template<typename TYPE> TYPE get_var_as(std::string_view var)
-  {
-    return from_string<TYPE>(get_var(var));
-  }
-
-  /**
-   * @name Notifications and Receivers
-   */
-  //@{
-  /// Check for pending notifications and take appropriate action.
-  /** This does not block.  To wait for incoming notifications, either call
-   * await_notification() (it calls this function); or wait for incoming data
-   * on the connection's socket (i.e. wait to read), and then call this
-   * function repeatedly until it returns zero.  After that, there are no more
-   * pending notifications so you may want to wait again.
-   *
-   * If any notifications are pending when you call this function, it
-   * processes them by finding any receivers that match the notification string
-   * and invoking those.  If no receivers match, there is nothing to invoke but
-   * we do consider the notification processed.
-   *
-   * If any of the client-registered receivers throws an exception, the
-   * function will report it using the connection's errorhandlers.  It does not
-   * re-throw the exceptions.
-   *
-   * @return Number of notifications processed.
-   */
-  int get_notifs();
-
-  /// Wait for a notification to come in.
-  /** There are other events that will also terminate the wait, such as the
-   * backend failing.  It will also wake up periodically.
-   *
-   * If a notification comes in, the call will process it, along with any other
-   * notifications that may have been pending.
-   *
-   * To wait for notifications into your own event loop instead, wait until
-   * there is incoming data on the connection's socket to be read, then call
-   * @ref get_notifs() repeatedly until it returns zero.
-   *
-   * @return Number of notifications processed.
-   */
-  int await_notification();
-
-  /// Wait for a notification to come in, or for given timeout to pass.
-  /** There are other events that will also terminate the wait, such as the
-   * backend failing, or timeout expiring.
-   *
-   * If a notification comes in, the call will process it, along with any other
-   * notifications that may have been pending.
-   *
-   * To wait for notifications into your own event loop instead, wait until
-   * there is incoming data on the connection's socket to be read, then call
-   * @ref get_notifs repeatedly until it returns zero.
-   *
-   * @return Number of notifications processed
-   */
-  int await_notification(std::time_t seconds, long microseconds);
-  //@}
-
-  /**
-   * @name Password encryption
-   *
-   * Use this when setting a new password for the user if password encryption
-   * is enabled.  Inputs are the SQL name for the user for whom you with to
-   * encrypt a password; the plaintext password; and the hash algorithm.
-   *
-   * The algorithm must be one of "md5", "scram-sha-256" (introduced in
-   * PostgreSQL 10), or `nullptr`.  If the pointer is null, this will query
-   * the `password_encryption setting` from the server, and use the default
-   * algorithm as defined there.
-   *
-   * @return encrypted version of the password, suitable for encrypted
-   * PostgreSQL authentication.
-   *
-   * Thus you can change a user's password with:
-   * ```cxx
-   * void setpw(transaction_base &t, string const &user, string const &pw)
-   * {
-   *   t.exec0("ALTER USER " + user + " "
-   *   	"PASSWORD '" + t.conn().encrypt_password(user,pw) + "'");
-   * }
-   * ```
-   *
-   * When building this against a libpq older than version 10, this will use
-   * an older function which only supports md5.  In that case, requesting a
-   * different algorithm than md5 will result in a @ref feature_not_supported
-   * exception.
-   */
-  //@{
-  /// Encrypt a password for a given user.
-  [[nodiscard]] std::string
-  encrypt_password(zview user, zview password, zview algorithm)
-  {
-    return encrypt_password(user.c_str(), password.c_str(), algorithm.c_str());
-  }
-  /// Encrypt a password for a given user.
-  [[nodiscard]] std::string encrypt_password(
-    char const user[], char const password[], char const *algorithm = nullptr);
-  //@}
-
-  /**
-   * @name Prepared statements
-   *
-   * PostgreSQL supports prepared SQL statements, i.e. statements that you can
-   * register under a name you choose, optimized once by the backend, and
-   * executed any number of times under the given name.
-   *
-   * Prepared statement definitions are not sensitive to transaction
-   * boundaries. A statement defined inside a transaction will remain defined
-   * outside that transaction, even if the transaction itself is subsequently
-   * aborted.  Once a statement has been prepared, it will only go away if you
-   * close the connection or explicitly "unprepare" the statement.
-   *
-   * Use the `pqxx::transaction_base::exec_prepared` functions to execute a
-   * prepared statement.  See @ref prepared for a full discussion.
-   *
-   * @warning Using prepared statements can save time, but if your statement
-   * takes parameters, it may also make your application significantly slower!
-   * The reason is that the server works out a plan for executing the query
-   * when you prepare it.  At that time, of course it does not know the values
-   * for the parameters that you will pass.  If you execute a query without
-   * preparing it, then the server works out the plan on the spot, with full
-   * knowledge of the parameter values.
-   *
-   * A statement's definition can refer to its parameters as `$1`, `$2`, etc.
-   * The first parameter you pass to the call provides a value for `$1`, and
-   * so on.
-   *
-   * Here's an example of how to use prepared statements.
-   *
-   * ```cxx
-   * using namespace pqxx;
-   * void foo(connection &c)
-   * {
-   *   c.prepare("findtable", "select * from pg_tables where name=$1");
-   *   work tx{c};
-   *   result r = tx.exec_prepared("findtable", "mytable");
-   *   if (std::empty(r)) throw runtime_error{"mytable not found!"};
-   * }
-   * ```
-   */
-  //@{
-
-  /// Define a prepared statement.
-  /**
-   * @param name unique name for the new prepared statement.
-   * @param definition SQL statement to prepare.
-   */
-  void prepare(zview name, zview definition) &
-  {
-    prepare(name.c_str(), definition.c_str());
-  }
-
-  /**
-   * @param name unique name for the new prepared statement.
-   * @param definition SQL statement to prepare.
-   */
-  void prepare(char const name[], char const definition[]) &;
-
-  /// Define a nameless prepared statement.
-  /**
-   * This can be useful if you merely want to pass large binary parameters to a
-   * statement without otherwise wishing to prepare it.  If you use this
-   * feature, always keep the definition and the use close together to avoid
-   * the nameless statement being redefined unexpectedly by code somewhere
-   * else.
-   */
-  void prepare(char const definition[]) &;
-  void prepare(zview definition) & { return prepare(definition.c_str()); }
-
-  /// Drop prepared statement.
-  void unprepare(std::string_view name);
-
-  //@}
-
-  // C++20: constexpr.  Breaks ABI.
-  /// Suffix unique number to name to make it unique within session context.
-  /** Used internally to generate identifiers for SQL objects (such as cursors
-   * and nested transactions) based on a given human-readable base name.
-   */
-  [[nodiscard]] std::string adorn_name(std::string_view);
-
-  /**
-   * @defgroup escaping-functions String-escaping functions
-   */
-  //@{
-
-  /// Escape string for use as SQL string literal on this connection.
-  /** @warning This accepts a length, and it does not require a terminating
-   * zero byte.  But if there is a zero byte, escaping stops there even if
-   * it's not at the end of the string!
-   */
-  [[deprecated("Use std::string_view or pqxx:zview.")]] std::string
-  esc(char const text[], std::size_t maxlen) const
-  {
-    return esc(std::string_view{text, maxlen});
-  }
-
-  /// Escape string for use as SQL string literal on this connection.
-  [[nodiscard]] std::string esc(char const text[]) const
-  {
-    return esc(std::string_view{text});
-  }
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Escape string for use as SQL string literal, into `buffer`.
-  /** Use this variant when you want to re-use the same buffer across multiple
-   * calls.  If that's not the case, or convenience and simplicity are more
-   * important, use the single-argument variant.
-   *
-   * For every byte in `text`, there must be at least 2 bytes of space in
-   * `buffer`; plus there must be one byte of space for a trailing zero.
-   * Throws @ref range_error if this space is not available.
-   *
-   * Returns a reference to the escaped string, which is actually stored in
-   * `buffer`.
-   */
-  [[nodiscard]] std::string_view
-  esc(std::string_view text, std::span<char> buffer)
-  {
-    auto const size{std::size(text)}, space{std::size(buffer)};
-    auto const needed{2 * size + 1};
-    if (space < needed)
-      throw range_error{internal::concat(
-        "Not enough room to escape string of ", size, " byte(s): need ",
-        needed, " bytes of buffer space, but buffer size is ", space, ".")};
-    auto const data{buffer.data()};
-    return {data, esc_to_buf(text, data)};
-  }
-#endif
-
-  /// Escape string for use as SQL string literal on this connection.
-  /** @warning This is meant for text strings only.  It cannot contain bytes
-   * whose value is zero ("nul bytes").
-   */
-  [[nodiscard]] std::string esc(std::string_view text) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** This is identical to `esc_raw(data)`. */
-  template<binary DATA> [[nodiscard]] std::string esc(DATA const &data) const
-  {
-    return esc_raw(data);
-  }
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  /** Use this variant when you want to re-use the same buffer across multiple
-   * calls.  If that's not the case, or convenience and simplicity are more
-   * important, use the single-argument variant.
-   *
-   * For every byte in `data`, there must be at least two bytes of space in
-   * `buffer`; plus there must be two bytes of space for a header and one for
-   * a trailing zero.  Throws @ref range_error if this space is not available.
-   *
-   * Returns a reference to the escaped string, which is actually stored in
-   * `buffer`.
-   */
-  template<binary DATA>
-  [[nodiscard]] zview esc(DATA const &data, std::span<char> buffer) const
-  {
-    auto const size{std::size(data)}, space{std::size(buffer)};
-    auto const needed{internal::size_esc_bin(std::size(data))};
-    if (space < needed)
-      throw range_error{internal::concat(
-        "Not enough room to escape binary string of ", size, " byte(s): need ",
-        needed, " bytes of buffer space, but buffer size is ", space, ".")};
-
-    std::basic_string_view<std::byte> view{std::data(data), std::size(data)};
-    auto const out{std::data(buffer)};
-    // Actually, in the modern format, we know beforehand exactly how many
-    // bytes we're going to fill.  Just leave out the trailing zero.
-    internal::esc_bin(view, out);
-    return zview{out, needed - 1};
-  }
-#endif
-
-  /// Escape binary string for use as SQL string literal on this connection.
-  [[deprecated("Use std::byte for binary data.")]] std::string
-  esc_raw(unsigned char const bin[], std::size_t len) const;
-
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** You can also just use @ref esc with a binary string. */
-  [[nodiscard]] std::string esc_raw(std::basic_string_view<std::byte>) const;
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  /** You can also just use @ref esc with a binary string. */
-  [[nodiscard]] std::string
-  esc_raw(std::basic_string_view<std::byte>, std::span<char> buffer) const;
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** You can also just use @ref esc with a binary string. */
-  template<binary DATA>
-  [[nodiscard]] std::string esc_raw(DATA const &data) const
-  {
-    return esc_raw(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  template<binary DATA>
-  [[nodiscard]] zview esc_raw(DATA const &data, std::span<char> buffer) const
-  {
-    return this->esc(binary_cast(data), buffer);
-  }
-#endif
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(zview text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return unesc_raw(text.c_str());
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(char const text[]) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   *
-   * (The data must be encoded in PostgreSQL's "hex" format.  The legacy
-   * "bytea" escape format, used prior to PostgreSQL 9.0, is no longer
-   * supported.)
-   */
-  [[nodiscard]] std::basic_string<std::byte>
-  unesc_bin(std::string_view text) const
-  {
-    std::basic_string<std::byte> buf;
-    buf.resize(pqxx::internal::size_unesc_bin(std::size(text)));
-    pqxx::internal::unesc_bin(text, buf.data());
-    return buf;
-  }
-
-  /// Escape and quote a string of binary data.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(unsigned char const bin[], std::size_t len) const;
-
-  /// Escape and quote a string of binary data.
-  std::string quote_raw(std::basic_string_view<std::byte>) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape and quote a string of binary data.
-  /** You can also just use @ref quote with binary data. */
-  template<binary DATA>
-  [[nodiscard]] std::string quote_raw(DATA const &data) const
-  {
-    return quote_raw(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote an SQL identifier for use in a query.
-  [[nodiscard]] std::string quote_name(std::string_view identifier) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote a table name.
-  /** When passing just a table name, this is just another name for
-   * @ref quote_name.
-   */
-  [[nodiscard]] std::string quote_table(std::string_view name) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote a table path.
-  /** A table path consists of a table name, optionally prefixed by a schema
-   * name; and if both are given, they are in turn optionally prefixed by a
-   * database name.
-   *
-   * Each portion of the path (database name, schema name, table name) will be
-   * quoted separately, and they will be joined together by dots.  So for
-   * example, `myschema.mytable` will become `"myschema"."mytable"`.
-   */
-  [[nodiscard]] std::string quote_table(table_path) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Quote and comma-separate a series of column names.
-  /** Use this to save a bit of work in cases where you repeatedly need to pass
-   * the same list of column names, e.g. with @ref stream_to and @ref
-   * stream_from. Some functions that need to quote the columns list
-   * internally, will have a "raw" alternative which let you do the quoting
-   * yourself.  It's a bit of extra work, but it can in rare cases let you
-   * eliminate some duplicate work in quoting them repeatedly.
-   */
-  template<PQXX_CHAR_STRINGS_ARG STRINGS>
-  inline std::string quote_columns(STRINGS const &columns) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Represent object as SQL string, including quoting & escaping.
-  /**
-   * Recognises nulls and represents them as SQL nulls.  They get no quotes.
-   */
-  template<typename T>
-  [[nodiscard]] inline std::string quote(T const &t) const;
-
-  [[deprecated("Use std::byte for binary data.")]] std::string
-  quote(binarystring const &) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote binary data for use as a BYTEA value in SQL statement.
-  [[nodiscard]] std::string
-  quote(std::basic_string_view<std::byte> bytes) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape string for literal LIKE match.
-  /** Use this when part of an SQL "LIKE" pattern should match only as a
-   * literal string, not as a pattern, even if it contains "%" or "_"
-   * characters that would normally act as wildcards.
-   *
-   * The string does not get string-escaped or quoted.  You do that later.
-   *
-   * For instance, let's say you have a string `name` entered by the user,
-   * and you're searching a `file` column for items that match `name`
-   * followed by a dot and three letters.  Even if `name` contains wildcard
-   * characters "%" or "_", you only want those to match literally, so "_"
-   * only matches "_" and "%" only matches a single "%".
-   *
-   * You do that by "like-escaping" `name`, appending the wildcard pattern
-   * `".___"`, and finally, escaping and quoting the result for inclusion in
-   * your query:
-   *
-   * ```cxx
-   *    tx.exec(
-   *        "SELECT file FROM item WHERE file LIKE " +
-   *        tx.quote(tx.esc_like(name) + ".___"));
-   * ```
-   *
-   * The SQL "LIKE" operator also lets you choose your own escape character.
-   * This is supported, but must be a single-byte character.
-   */
-  [[nodiscard]] std::string
-  esc_like(std::string_view text, char escape_char = '\\') const;
-  //@}
-
-  /// Attempt to cancel the ongoing query, if any.
-  /** You can use this from another thread, and/or while a query is executing
-   * in a pipeline, but it's up to you to ensure that you're not canceling the
-   * wrong query.  This may involve locking.
-   */
-  void cancel_query();
-
-#if defined(_WIN32) || __has_include(<fcntl.h>)
-  /// Set socket to blocking (true) or nonblocking (false).
-  /** @warning Do not use this unless you _really_ know what you're doing.
-   * @warning This function is available on most systems, but not necessarily
-   * all.
-   */
-  void set_blocking(bool block) &;
-#endif // defined(_WIN32) || __has_include(<fcntl.h>)
-
-  /// Set session verbosity.
-  /** Set the verbosity of error messages to "terse", "normal" (the default),
-   * or "verbose."
-   *
-   *  If "terse", returned messages include severity, primary text, and
-   * position only; this will normally fit on a single line. "normal" produces
-   * messages that include the above plus any detail, hint, or context fields
-   * (these might span multiple lines).  "verbose" includes all available
-   * fields.
-   */
-  void set_verbosity(error_verbosity verbosity) &noexcept;
-
-  /// Return pointers to the active errorhandlers.
-  /** The entries are ordered from oldest to newest handler.
-   *
-   * You may use this to find errorhandlers that your application wants to
-   * delete when destroying the connection.  Be aware, however, that libpqxx
-   * may also add errorhandlers of its own, and those will be included in the
-   * list.  If this is a problem for you, derive your errorhandlers from a
-   * custom base class derived from pqxx::errorhandler.  Then use dynamic_cast
-   * to find which of the error handlers are yours.
-   *
-   * The pointers point to the real errorhandlers.  The container it returns
-   * however is a copy of the one internal to the connection, not a reference.
-   */
-  [[nodiscard]] std::vector<errorhandler *> get_errorhandlers() const;
-
-  /// Return a connection string encapsulating this connection's options.
-  /** The connection must be currently open for this to work.
-   *
-   * Returns a reconstruction of this connection's connection string.  It may
-   * not exactly match the connection string you passed in when creating this
-   * connection.
-   */
-  [[nodiscard]] std::string connection_string() const;
-
-  /// Explicitly close the connection.
-  /** The destructor will do this for you automatically.  Still, there is a
-   * reason to `close()` objects explicitly where possible: if an error should
-   * occur while closing, `close()` can throw an exception.  A destructor
-   * cannot.
-   *
-   * Closing a connection is idempotent.  Closing a connection that's already
-   * closed does nothing.
-   */
-  void close();
-
-  /// Seize control of a raw libpq connection.
-  /** @warning Do not do this.  Please.  It's for very rare, very specific
-   * use-cases.  The mechanism may change (or break) in unexpected ways in
-   * future versions.
-   *
-   * @param raw_conn a raw libpq `PQconn` pointer.
-   */
-  static connection seize_raw_connection(internal::pq::PGconn *raw_conn)
-  {
-    return connection{raw_conn};
-  }
-
-  /// Release the raw connection without closing it.
-  /** @warning Do not do this.  It's for very rare, very specific use-cases.
-   * The mechanism may change (or break) in unexpected ways in future versions.
-   *
-   * The `connection` object becomes unusable after this.
-   */
-  internal::pq::PGconn *release_raw_connection() &&
-  {
-    return std::exchange(m_conn, nullptr);
-  }
-
-private:
-  friend class connecting;
-  enum connect_mode
-  {
-    connect_nonblocking
-  };
-  connection(connect_mode, zview connection_string);
-
-  /// For use by @ref seize_raw_connection.
-  explicit connection(internal::pq::PGconn *raw_conn) : m_conn{raw_conn} {}
-
-  /// Poll for ongoing connection, try to progress towards completion.
-  /** Returns a pair of "now please wait to read data from socket" and "now
-   * please wait to write data to socket."  Both will be false when done.
-   *
-   * Throws an exception if polling indicates that the connection has failed.
-   */
-  std::pair<bool, bool> poll_connect();
-
-  // Initialise based on connection string.
-  void init(char const options[]);
-  // Initialise based on parameter names and values.
-  void init(char const *params[], char const *values[]);
-  void complete_init();
-
-  result make_result(
-    internal::pq::PGresult *pgr, std::shared_ptr<std::string> const &query,
-    std::string_view desc = ""sv);
-
-  void PQXX_PRIVATE set_up_state();
-
-  int PQXX_PRIVATE PQXX_PURE status() const noexcept;
-
-  /// Escape a string, into a buffer allocated by the caller.
-  /** The buffer must have room for at least `2*std::size(text) + 1` bytes.
-   *
-   * Returns the number of bytes written, including the trailing zero.
-   */
-  std::size_t esc_to_buf(std::string_view text, char *buf) const;
-
-  friend class internal::gate::const_connection_largeobject;
-  char const *PQXX_PURE err_msg() const noexcept;
-
-  void PQXX_PRIVATE process_notice_raw(char const msg[]) noexcept;
-
-  result exec_prepared(std::string_view statement, internal::c_params const &);
-
-  /// Throw @ref usage_error if this connection is not in a movable state.
-  void check_movable() const;
-  /// Throw @ref usage_error if not in a state where it can be move-assigned.
-  void check_overwritable() const;
-
-  friend class internal::gate::connection_errorhandler;
-  void PQXX_PRIVATE register_errorhandler(errorhandler *);
-  void PQXX_PRIVATE unregister_errorhandler(errorhandler *) noexcept;
-
-  friend class internal::gate::connection_transaction;
-  result exec(std::string_view, std::string_view = ""sv);
-  result
-    PQXX_PRIVATE exec(std::shared_ptr<std::string>, std::string_view = ""sv);
-  void PQXX_PRIVATE register_transaction(transaction_base *);
-  void PQXX_PRIVATE unregister_transaction(transaction_base *) noexcept;
-
-  friend class internal::gate::connection_stream_from;
-  std::pair<std::unique_ptr<char, std::function<void(char *)>>, std::size_t>
-    PQXX_PRIVATE read_copy_line();
-
-  friend class internal::gate::connection_stream_to;
-  void PQXX_PRIVATE write_copy_line(std::string_view);
-  void PQXX_PRIVATE end_copy_write();
-
-  friend class internal::gate::connection_largeobject;
-  internal::pq::PGconn *raw_connection() const { return m_conn; }
-
-  friend class internal::gate::connection_notification_receiver;
-  void add_receiver(notification_receiver *);
-  void remove_receiver(notification_receiver *) noexcept;
-
-  friend class internal::gate::connection_pipeline;
-  void PQXX_PRIVATE start_exec(char const query[]);
-  bool PQXX_PRIVATE consume_input() noexcept;
-  bool PQXX_PRIVATE is_busy() const noexcept;
-  internal::pq::PGresult *get_result();
-
-  friend class internal::gate::connection_dbtransaction;
-  friend class internal::gate::connection_sql_cursor;
-
-  result exec_params(std::string_view query, internal::c_params const &args);
-
-  /// Connection handle.
-  internal::pq::PGconn *m_conn = nullptr;
-
-  /// Active transaction on connection, if any.
-  /** We don't use this for anything, except to check for open transactions
-   * when we close the connection or start a new transaction.
-   *
-   * We also don't allow move construction or move assignment while there's a
-   * transaction, since moving the connection in that case would leave one or
-   * more pointers back from the transaction to the connection dangling.
-   */
-  transaction_base const *m_trans = nullptr;
-
-  std::list<errorhandler *> m_errorhandlers;
-
-  using receiver_list =
-    std::multimap<std::string, pqxx::notification_receiver *>;
-  /// Notification receivers.
-  receiver_list m_receivers;
-
-  /// Unique number to use as suffix for identifiers (see adorn_name()).
-  int m_unique_id = 0;
-};
-
-
-/// @deprecated Old base class for connection.  They are now the same class.
-using connection_base = connection;
-
-
-/// An ongoing, non-blocking stepping stone to a connection.
-/** Use this when you want to create a connection to the database, but without
- * blocking your whole thread.   It is only available on systems that have
- * the `<fcntl.h>` header, and Windows.
- *
- * Connecting in this way is probably not "faster" (it's more complicated and
- * has some extra overhead), but in some situations you can use it to make your
- * application as a whole faster.  It all depends on having other useful work
- * to do in the same thread, and being able to wait on a socket.  If you have
- * other I/O going on at the same time, your event loop can wait for both the
- * libpqxx socket and your own sockets, and wake up whenever any of them is
- * ready to do work.
- *
- * Connecting in this way is not properly "asynchronous;" it's merely
- * "nonblocking."  This means it's not a super-high-performance mechanism like
- * you might get with e.g. `io_uring`.  In particular, if we need to look up
- * the database hostname in DNS, that will happen synchronously.
- *
- * To use this, create the `connecting` object, passing a connection string.
- * Then loop: If @ref wait_to_read returns true, wait for the socket to have
- * incoming data on it.  If @ref wait_to_write returns true, wait for the
- * socket to be ready for writing.  Then call @ref process to process any
- * incoming or outgoing data.  Do all of this until @ref done returns true (or
- * there is an exception).  Finally, call @ref produce to get the completed
- * connection.
- *
- * For example:
- *
- * ```cxx
- *     pqxx::connecting cg{};
- *
- *     // Loop until we're done connecting.
- *     while (!cg.done())
- *     {
- *         wait_for_fd(cg.sock(), cg.wait_to_read(), cg.wait_to_write());
- *         cg.process();
- *     }
- *
- *     pqxx::connection conn = std::move(cg).produce();
- *
- *     // At this point, conn is a working connection.  You can no longer use
- *     // cg at all.
- * ```
- */
-class PQXX_LIBEXPORT connecting
-{
-public:
-  /// Start connecting.
-  connecting(zview connection_string = ""_zv);
-
-  connecting(connecting const &) = delete;
-  connecting(connecting &&) = default;
-  connecting &operator=(connecting const &) = delete;
-  connecting &operator=(connecting &&) = default;
-
-  /// Get the socket.  The socket may change during the connection process.
-  [[nodiscard]] int sock() const &noexcept { return m_conn.sock(); }
-
-  /// Should we currently wait to be able to _read_ from the socket?
-  [[nodiscard]] constexpr bool wait_to_read() const &noexcept
-  {
-    return m_reading;
-  }
-
-  /// Should we currently wait to be able to _write_ to the socket?
-  [[nodiscard]] constexpr bool wait_to_write() const &noexcept
-  {
-    return m_writing;
-  }
-
-  /// Progress towards completion (but don't block).
-  void process() &;
-
-  /// Is our connection finished?
-  [[nodiscard]] constexpr bool done() const &noexcept
-  {
-    return not m_reading and not m_writing;
-  }
-
-  /// Produce the completed connection object.
-  /** Use this only once, after @ref done returned `true`.  Once you have
-   * called this, the `connecting` instance has no more use or meaning.  You
-   * can't call any of its member functions afterwards.
-   *
-   * This member function is rvalue-qualified, meaning that you can only call
-   * it on an rvalue instance of the class.  If what you have is not an rvalue,
-   * turn it into one by wrapping it in `std::move()`.
-   */
-  [[nodiscard]] connection produce() &&;
-
-private:
-  connection m_conn;
-  bool m_reading{false};
-  bool m_writing{true};
-};
-
-
-template<typename T> inline std::string connection::quote(T const &t) const
-{
-  if constexpr (nullness<T>::always_null)
-  {
-    return "NULL";
-  }
-  else
-  {
-    if (is_null(t))
-      return "NULL";
-    auto const text{to_string(t)};
-
-    // Okay, there's an easy way to do this and there's a hard way.  The easy
-    // way was "quote, esc(to_string(t)), quote".  I'm going with the hard way
-    // because it's going to save some string manipulation that will probably
-    // incur some unnecessary memory allocations and deallocations.
-    std::string buf{'\''};
-    buf.resize(2 + 2 * std::size(text) + 1);
-    auto const content_bytes{esc_to_buf(text, buf.data() + 1)};
-    auto const closing_quote{1 + content_bytes};
-    buf[closing_quote] = '\'';
-    auto const end{closing_quote + 1};
-    buf.resize(end);
-    return buf;
-  }
-}
-
-
-template<PQXX_CHAR_STRINGS_ARG STRINGS>
-inline std::string connection::quote_columns(STRINGS const &columns) const
-{
-  return separated_list(
-    ","sv, std::cbegin(columns), std::cend(columns),
-    [this](auto col) { return this->quote_name(*col); });
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<internal::ZKey_ZValues MAPPING>
-inline connection::connection(MAPPING const &params)
-{
-  check_version();
-
-  std::vector<char const *> keys, values;
-  if constexpr (std::ranges::sized_range<MAPPING>)
-  {
-    auto const size{std::ranges::size(params) + 1};
-    keys.reserve(size);
-    values.reserve(size);
-  }
-  for (auto const &[key, value] : params)
-  {
-    keys.push_back(internal::as_c_string(key));
-    values.push_back(internal::as_c_string(value));
-  }
-  keys.push_back(nullptr);
-  values.push_back(nullptr);
-  init(std::data(keys), std::data(values));
-}
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/cursor b/ext/libpqxx-7.7.3/include/pqxx/cursor
deleted file mode 100644
index e20b3a4fa..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/cursor
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Definition of the iterator/container-style cursor classes.
- *
- * C++-style wrappers for SQL cursors
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/cursor.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/cursor.hxx b/ext/libpqxx-7.7.3/include/pqxx/cursor.hxx
deleted file mode 100644
index b392e2407..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/cursor.hxx
+++ /dev/null
@@ -1,483 +0,0 @@
-/* Definition of the iterator/container-style cursor classes.
- *
- * C++-style wrappers for SQL cursors.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/cursor instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_CURSOR
-#define PQXX_H_CURSOR
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <limits>
-#include <stdexcept>
-
-#include "pqxx/result.hxx"
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-/// Common definitions for cursor types
-/** In C++ terms, fetches are always done in pre-increment or pre-decrement
- * fashion--i.e. the result does not include the row the cursor is on at the
- * beginning of the fetch, and the cursor ends up being positioned on the last
- * row in the result.
- *
- * There are singular positions akin to `end()` at both the beginning and the
- * end of the cursor's range of movement, although these fit in so naturally
- * with the semantics that one rarely notices them.  The cursor begins at the
- * first of these, but any fetch in the forward direction will move the cursor
- * off this position and onto the first row before returning anything.
- */
-class PQXX_LIBEXPORT cursor_base
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-  /// Cursor access-pattern policy
-  /** Allowing a cursor to move forward only can result in better performance,
-   * so use this access policy whenever possible.
-   */
-  enum access_policy
-  {
-    /// Cursor can move forward only
-    forward_only,
-    /// Cursor can move back and forth
-    random_access
-  };
-
-  /// Cursor update policy
-  /**
-   * @warning Not all PostgreSQL versions support updatable cursors.
-   */
-  enum update_policy
-  {
-    /// Cursor can be used to read data but not to write
-    read_only,
-    /// Cursor can be used to update data as well as read it
-    update
-  };
-
-  /// Cursor destruction policy
-  /** The normal thing to do is to make a cursor object the owner of the SQL
-   * cursor it represents.  There may be cases, however, where a cursor needs
-   * to persist beyond the end of the current transaction (and thus also beyond
-   * the lifetime of the cursor object that created it!), where it can be
-   * "adopted" into a new cursor object.  See the basic_cursor documentation
-   * for an explanation of cursor adoption.
-   *
-   * If a cursor is created with "loose" ownership policy, the object
-   * representing the underlying SQL cursor will not take the latter with it
-   * when its own lifetime ends, nor will its originating transaction.
-   *
-   * @warning Use this feature with care and moderation.  Only one cursor
-   * object should be responsible for any one underlying SQL cursor at any
-   * given time.
-   */
-  enum ownership_policy
-  {
-    /// Destroy SQL cursor when cursor object is closed at end of transaction
-    owned,
-    /// Leave SQL cursor in existence after close of object and transaction
-    loose
-  };
-
-  cursor_base() = delete;
-  cursor_base(cursor_base const &) = delete;
-  cursor_base &operator=(cursor_base const &) = delete;
-
-  /**
-   * @name Special movement distances.
-   */
-  //@{
-
-  // TODO: Make constexpr inline (but breaks ABI).
-  /// Special value: read until end.
-  /** @return Maximum value for result::difference_type, so the cursor will
-   * attempt to read the largest possible result set.
-   */
-  [[nodiscard]] static difference_type all() noexcept;
-
-  /// Special value: read one row only.
-  /** @return Unsurprisingly, 1.
-   */
-  [[nodiscard]] static constexpr difference_type next() noexcept { return 1; }
-
-  /// Special value: read backwards, one row only.
-  /** @return Unsurprisingly, -1.
-   */
-  [[nodiscard]] static constexpr difference_type prior() noexcept
-  {
-    return -1;
-  }
-
-  // TODO: Make constexpr inline (but breaks ABI).
-  /// Special value: read backwards from current position back to origin.
-  /** @return Minimum value for result::difference_type.
-   */
-  [[nodiscard]] static difference_type backward_all() noexcept;
-
-  //@}
-
-  /// Name of underlying SQL cursor
-  /**
-   * @returns Name of SQL cursor, which may differ from original given name.
-   * @warning Don't use this to access the SQL cursor directly without going
-   * through the provided wrapper classes!
-   */
-  [[nodiscard]] constexpr std::string const &name() const noexcept
-  {
-    return m_name;
-  }
-
-protected:
-  cursor_base(connection &, std::string_view Name, bool embellish_name = true);
-
-  std::string const m_name;
-};
-} // namespace pqxx
-
-
-#include <pqxx/internal/sql_cursor.hxx>
-
-
-namespace pqxx
-{
-/// "Stateless cursor" class: easy API for retrieving parts of result sets
-/** This is a front-end for SQL cursors, but with a more C++-like API.
- *
- * Actually, stateless_cursor feels entirely different from SQL cursors.  You
- * don't keep track of positions, fetches, and moves; you just say which rows
- * you want.  See the retrieve() member function.
- */
-template<cursor_base::update_policy up, cursor_base::ownership_policy op>
-class stateless_cursor
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-  /// Create cursor.
-  /**
-   * @param tx The transaction within which you want to create the cursor.
-   * @param query The SQL query whose results the cursor should traverse.
-   * @param cname A hint for the cursor's name.  The actual SQL cursor's name
-   *     will be based on this (though not necessarily identical).
-   * @param hold Create a `WITH HOLD` cursor?  Such cursors stay alive after
-   *     the transaction has ended, so you can continue to use it.
-   */
-  stateless_cursor(
-    transaction_base &tx, std::string_view query, std::string_view cname,
-    bool hold) :
-          m_cur{tx, query, cname, cursor_base::random_access, up, op, hold}
-  {}
-
-  /// Adopt an existing scrolling SQL cursor.
-  /** This lets you define a cursor yourself, and then wrap it in a
-   * libpqxx-managed `stateless_cursor` object.
-   *
-   * @param tx The transaction within which you want to manage the cursor.
-   * @param adopted_cursor Your cursor's SQL name.
-   */
-  stateless_cursor(transaction_base &tx, std::string_view adopted_cursor) :
-          m_cur{tx, adopted_cursor, op}
-  {
-    // Put cursor in known position
-    m_cur.move(cursor_base::backward_all());
-  }
-
-  /// Close this cursor.
-  /** The destructor will do this for you automatically.
-   *
-   * Closing a cursor is idempotent.  Closing a cursor that's already closed
-   * does nothing.
-   */
-  void close() noexcept { m_cur.close(); }
-
-  /// Number of rows in cursor's result set
-  /** @note This function is not const; it may need to scroll to find the size
-   * of the result set.
-   */
-  [[nodiscard]] size_type size()
-  {
-    return internal::obtain_stateless_cursor_size(m_cur);
-  }
-
-  /// Retrieve rows from begin_pos (inclusive) to end_pos (exclusive)
-  /** Rows are numbered starting from 0 to size()-1.
-   *
-   * @param begin_pos First row to retrieve.  May be one row beyond the end of
-   * the result set, to avoid errors for empty result sets.  Otherwise, must be
-   * a valid row number in the result set.
-   * @param end_pos Row up to which to fetch.  Rows are returned ordered from
-   * begin_pos to end_pos, i.e. in ascending order if begin_pos < end_pos but
-   * in descending order if begin_pos > end_pos.  The end_pos may be
-   * arbitrarily inside or outside the result set; only existing rows are
-   * included in the result.
-   */
-  result retrieve(difference_type begin_pos, difference_type end_pos)
-  {
-    return internal::stateless_cursor_retrieve(
-      m_cur, result::difference_type(size()), begin_pos, end_pos);
-  }
-
-  /// Return this cursor's name.
-  [[nodiscard]] constexpr std::string const &name() const noexcept
-  {
-    return m_cur.name();
-  }
-
-private:
-  internal::sql_cursor m_cur;
-};
-
-
-class icursor_iterator;
-} // namespace pqxx
-
-
-namespace pqxx::internal::gate
-{
-class icursor_iterator_icursorstream;
-class icursorstream_icursor_iterator;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Simple read-only cursor represented as a stream of results
-/** SQL cursors can be tricky, especially in C++ since the two languages seem
- * to have been designed on different planets.  An SQL cursor has two singular
- * positions akin to `end()` on either side of the underlying result set.
- *
- * These cultural differences are hidden from view somewhat by libpqxx, which
- * tries to make SQL cursors behave more like familiar C++ entities such as
- * iterators, sequences, streams, and containers.
- *
- * Data is fetched from the cursor as a sequence of result objects.  Each of
- * these will contain the number of rows defined as the stream's stride, except
- * of course the last block of data which may contain fewer rows.
- *
- * This class can create or adopt cursors that live outside any backend
- * transaction, which your backend version may not support.
- */
-class PQXX_LIBEXPORT icursorstream
-{
-public:
-  using size_type = cursor_base::size_type;
-  using difference_type = cursor_base::difference_type;
-
-  /// Set up a read-only, forward-only cursor.
-  /** Roughly equivalent to a C++ Standard Library istream, this cursor type
-   * supports only two operations: reading a block of rows while moving
-   * forward, and moving forward without reading any data.
-   *
-   * @param context Transaction context in which this cursor will be active.
-   * @param query SQL query whose results this cursor shall iterate.
-   * @param basename Suggested name for the SQL cursor; the library will append
-   * a unique code to ensure its uniqueness.
-   * @param sstride Number of rows to fetch per read operation; must be a
-   * positive number.
-   */
-  icursorstream(
-    transaction_base &context, std::string_view query,
-    std::string_view basename, difference_type sstride = 1);
-
-  /// Adopt existing SQL cursor.  Use with care.
-  /** Forms a cursor stream around an existing SQL cursor, as returned by e.g.
-   * a server-side function.  The SQL cursor will be cleaned up by the stream's
-   * destructor as if it had been created by the stream; cleaning it up by hand
-   * or adopting the same cursor twice is an error.
-   *
-   * Passing the name of the cursor as a string is not allowed, both to avoid
-   * confusion with the other constructor and to discourage unnecessary use of
-   * adopted cursors.
-   *
-   * @warning It is technically possible to adopt a "WITH HOLD" cursor, i.e. a
-   * cursor that stays alive outside its creating transaction.  However, any
-   * cursor stream (including the underlying SQL cursor, naturally) must be
-   * destroyed before its transaction context object is destroyed.  Therefore
-   * the only way to use SQL's WITH HOLD feature is to adopt the cursor, but
-   * defer doing so until after entering the transaction context that will
-   * eventually destroy it.
-   *
-   * @param context Transaction context in which this cursor will be active.
-   * @param cname Result field containing the name of the SQL cursor to adopt.
-   * @param sstride Number of rows to fetch per read operation; must be a
-   * positive number.
-   * @param op Ownership policy.  Determines whether the cursor underlying this
-   * stream will be destroyed when the stream is closed.
-   */
-  icursorstream(
-    transaction_base &context, field const &cname, difference_type sstride = 1,
-    cursor_base::ownership_policy op = cursor_base::owned);
-
-  /// Return `true` if this stream may still return more data.
-  constexpr operator bool() const &noexcept { return not m_done; }
-
-  /// Read new value into given result object; same as operator `>>`.
-  /** The result set may continue any number of rows from zero to the chosen
-   * stride, inclusive.  An empty result will only be returned if there are no
-   * more rows to retrieve.
-   *
-   * @param res Write the retrieved data into this result object.
-   * @return Reference to this very stream, to facilitate "chained" invocations
-   * ("C.get(r1).get(r2);")
-   */
-  icursorstream &get(result &res)
-  {
-    res = fetchblock();
-    return *this;
-  }
-  /// Read new value into given result object; same as `get(result&)`.
-  /** The result set may continue any number of rows from zero to the chosen
-   * stride, inclusive.  An empty result will only be returned if there are no
-   * more rows to retrieve.
-   *
-   * @param res Write the retrieved data into this result object.
-   * @return Reference to this very stream, to facilitate "chained" invocations
-   * ("C >> r1 >> r2;")
-   */
-  icursorstream &operator>>(result &res) { return get(res); }
-
-  /// Move given number of rows forward without reading data.
-  /** Ignores any stride that you may have set.  It moves by a given number of
-   * rows, not a number of strides.
-   *
-   * @return Reference to this stream itself, to facilitate "chained"
-   * invocations.
-   */
-  icursorstream &ignore(std::streamsize n = 1) &;
-
-  /// Change stride, i.e. the number of rows to fetch per read operation.
-  /**
-   * @param stride Must be a positive number.
-   */
-  void set_stride(difference_type stride) &;
-  [[nodiscard]] constexpr difference_type stride() const noexcept
-  {
-    return m_stride;
-  }
-
-private:
-  result fetchblock();
-
-  friend class internal::gate::icursorstream_icursor_iterator;
-  size_type forward(size_type n = 1);
-  void insert_iterator(icursor_iterator *) noexcept;
-  void remove_iterator(icursor_iterator *) const noexcept;
-
-  void service_iterators(difference_type);
-
-  internal::sql_cursor m_cur;
-
-  difference_type m_stride;
-  difference_type m_realpos, m_reqpos;
-
-  mutable icursor_iterator *m_iterators;
-
-  bool m_done;
-};
-
-
-/// Approximate istream_iterator for icursorstream.
-/** Intended as an implementation of an input_iterator (as defined by the C++
- * Standard Library), this class supports only two basic operations: reading
- * the current element, and moving forward.  In addition to the minimal
- * guarantees for istream_iterators, this class supports multiple successive
- * reads of the same position (the current result set is cached in the
- * iterator) even after copying and even after new data have been read from the
- * stream.  This appears to be a requirement for input_iterators.  Comparisons
- * are also supported in the general case.
- *
- * The iterator does not care about its own position, however.  Moving an
- * iterator forward moves the underlying stream forward and reads the data from
- * the new stream position, regardless of the iterator's old position in the
- * stream.
- *
- * The stream's stride defines the granularity for all iterator movement or
- * access operations, i.e. "ici += 1" advances the stream by one stride's worth
- * of rows, and "*ici++" reads one stride's worth of rows from the stream.
- *
- * @warning Do not read from the underlying stream or its cursor, move its read
- * position, or change its stride, between the time the first icursor_iterator
- * on it is created and the time its last icursor_iterator is destroyed.
- *
- * @warning Manipulating these iterators within the context of a single cursor
- * stream is <em>not thread-safe</em>.  Creating a new iterator, copying one,
- * or destroying one affects the stream as a whole.
- */
-class PQXX_LIBEXPORT icursor_iterator
-{
-public:
-  using iterator_category = std::input_iterator_tag;
-  using value_type = result;
-  using pointer = result const *;
-  using reference = result const &;
-  using istream_type = icursorstream;
-  using size_type = istream_type::size_type;
-  using difference_type = istream_type::difference_type;
-
-  icursor_iterator() noexcept;
-  explicit icursor_iterator(istream_type &) noexcept;
-  icursor_iterator(icursor_iterator const &) noexcept;
-  ~icursor_iterator() noexcept;
-
-  result const &operator*() const
-  {
-    refresh();
-    return m_here;
-  }
-  result const *operator->() const
-  {
-    refresh();
-    return &m_here;
-  }
-  icursor_iterator &operator++();
-  icursor_iterator operator++(int);
-  icursor_iterator &operator+=(difference_type);
-  icursor_iterator &operator=(icursor_iterator const &) noexcept;
-
-  [[nodiscard]] bool operator==(icursor_iterator const &rhs) const;
-  [[nodiscard]] bool operator!=(icursor_iterator const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  [[nodiscard]] bool operator<(icursor_iterator const &rhs) const;
-  [[nodiscard]] bool operator>(icursor_iterator const &rhs) const
-  {
-    return rhs < *this;
-  }
-  [[nodiscard]] bool operator<=(icursor_iterator const &rhs) const
-  {
-    return not(*this > rhs);
-  }
-  [[nodiscard]] bool operator>=(icursor_iterator const &rhs) const
-  {
-    return not(*this < rhs);
-  }
-
-private:
-  void refresh() const;
-
-  friend class internal::gate::icursor_iterator_icursorstream;
-  difference_type pos() const noexcept { return m_pos; }
-  void fill(result const &);
-
-  icursorstream *m_stream{nullptr};
-  result m_here;
-  difference_type m_pos;
-  icursor_iterator *m_prev{nullptr}, *m_next{nullptr};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/dbtransaction b/ext/libpqxx-7.7.3/include/pqxx/dbtransaction
deleted file mode 100644
index fa8d26476..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/dbtransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::dbtransaction abstract base class.
- *
- * pqxx::dbransaction defines a real transaction on the database.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/dbtransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/dbtransaction.hxx b/ext/libpqxx-7.7.3/include/pqxx/dbtransaction.hxx
deleted file mode 100644
index d85cb170f..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/dbtransaction.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Definition of the pqxx::dbtransaction abstract base class.
- *
- * pqxx::dbransaction defines a real transaction on the database.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/dbtransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_DBTRANSACTION
-#define PQXX_H_DBTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/transaction_base.hxx"
-
-namespace pqxx
-{
-/// Abstract transaction base class: bracket transactions on the database.
-/**
- * @ingroup transactions
- *
- * Use a dbtransaction-derived object such as "work" (transaction<>) to enclose
- * operations on a database in a single "unit of work."  This ensures that the
- * whole series of operations either succeeds as a whole or fails completely.
- * In no case will it leave half-finished work behind in the database.
- *
- * Once processing on a transaction has succeeded and any changes should be
- * allowed to become permanent in the database, call commit().  If something
- * has gone wrong and the changes should be forgotten, call abort() instead.
- * If you do neither, an implicit abort() is executed at destruction time.
- *
- * It is an error to abort a transaction that has already been committed, or to
- * commit a transaction that has already been aborted.  Aborting an already
- * aborted transaction or committing an already committed one is allowed, to
- * make error handling easier.  Repeated aborts or commits have no effect after
- * the first one.
- *
- * Database transactions are not suitable for guarding long-running processes.
- * If your transaction code becomes too long or too complex, consider ways to
- * break it up into smaller ones.  Unfortunately there is no universal recipe
- * for this.
- *
- * The actual operations for committing/aborting the backend transaction are
- * implemented by a derived class.  The implementing concrete class must also
- * call @ref close from its destructor.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE dbtransaction : public transaction_base
-{
-protected:
-  /// Begin transaction.
-  explicit dbtransaction(connection &c) : transaction_base{c} {}
-  /// Begin transaction.
-  dbtransaction(connection &c, std::string_view tname) :
-          transaction_base{c, tname}
-  {}
-  /// Begin transaction.
-  dbtransaction(
-    connection &c, std::string_view tname,
-    std::shared_ptr<std::string> rollback_cmd) :
-          transaction_base{c, tname, rollback_cmd}
-  {}
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/accessing-results.md b/ext/libpqxx-7.7.3/include/pqxx/doc/accessing-results.md
deleted file mode 100644
index 920fb6f3b..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/accessing-results.md
+++ /dev/null
@@ -1,157 +0,0 @@
-Accessing results and result rows                   {#accessing-results}
----------------------------------
-
-When you execute a query using one of the transaction `exec` functions, you
-normally get a `result` object back.  A `result` is a container of `row`s.
-
-(There are exceptions.  The `exec1` functions expect exactly one row of data,
-so they return just a `row`, not a full `result`.)
-
-Result objects are an all-or-nothing affair.  The `exec` function waits until
-it's received all the result data, and then gives it to you in the form of the
-`result`.  _(There is a faster, easier way of executing simple queries, so see
-"streaming rows" below as well.)_
-
-For example, your code might do:
-
-```cxx
-    pqxx::result r = tx.exec("SELECT * FROM mytable");
-```
-
-Now, how do you access the data inside `r`?
-
-Result sets act as standard C++ containers of rows.  Rows act as standard
-C++ containers of fields.  So the easiest way to go through them is:
-
-```cxx
-    for (auto const &row: r)
-    {
-       for (auto const &field: row) std::cout << field.c_str() << '\t';
-       std::cout << '\n';
-    }
-```
-
-But results and rows also support other kinds of access.  Array-style
-indexing, for instance, such as `r[rownum]`:
-
-```cxx
-    std::size_t const num_rows = std::size(r);
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-      pqxx::row const row = r[rownum];
-      std::size_t const num_cols = std::size(row);
-      for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-      {
-        pqxx::field const field = row[colnum];
-        std::cout << field.c_str() << '\t';
-      }
-
-      std::cout << '\n';
-    }
-```
-
-Every row in the result has the same number of columns, so you don't need to
-look up the number of fields again for each one:
-
-```cxx
-    std::size_t const num_rows = std::size(r);
-    std::size_t const num_cols = r.columns();
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-      pqxx::row const row = r[rownum];
-      for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-      {
-        pqxx::field const field = row[colnum];
-        std::cout << field.c_str() << '\t';
-      }
-
-      std::cout << '\n';
-    }
-```
-
-You can even address a field by indexing the `row` using the field's _name:_
-
-```cxx
-    std::cout << row["salary"] << '\n';
-```
-
-But try not to do that if speed matters, because looking up the column by name
-takes time.  At least you'd want to look up the column index before your loop
-and then use numerical indexes inside the loop.
-
-For C++23 or better, there's also a two-dimensional array access operator:
-
-```cxx
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-        for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-	    std::cout result[rownum, colnum].c_str() << '\t';
-	std::cout << '\n';
-    }
-```
-
-And of course you can use classic "begin/end" loops:
-
-```cxx
-    for (auto row = std::begin(r); row != std::end(r); row++)
-    {
-      for (auto field = std::begin(row); field != std::end(row); field++)
-        std::cout << field->c_str() << '\t';
-      std::cout << '\n';
-    }
-```
-
-Result sets are immutable, so all iterators on results and rows are actually
-`const_iterator`s.  There are also `const_reverse_iterator` types, which
-iterate backwards from `rbegin()` to `rend()` exclusive.
-
-All these iterator types provide one extra bit of convenience that you won't
-normally find in C++ iterators: referential transparency.  You don't need to
-dereference them to get to the row or field they refer to.  That is, instead
-of `row->end()` you can also choose to say `row.end()`.  Similarly, you
-may prefer `field.c_str()` over `field->c_str()`.
-
-This becomes really helpful with the array-indexing operator.  With regular
-C++ iterators you would need ugly expressions like `(*row)[0]` or
-`row->operator[](0)`.  With the iterator types defined by the result and
-row classes you can simply say `row[0]`.
-
-
-Streaming rows
---------------
-
-There's another way to go through the rows coming out of a query.  It's
-usually easier and faster, but there are drawbacks.
-
-**One,** you start getting rows before all the data has come in from the
-database.  That speeds things up, but what happens if you lose your network
-connection while transferring the data?  Your application may already have
-processed some of the data before finding out that the rest isn't coming.  If
-that is a problem for your application, streaming may not be the right choice.
-
-**Two,** streaming only works for some types of query.  The `stream()` function
-wraps your query in a PostgreSQL `COPY` command, and `COPY` only supports a few
-commands: `SELECT`, `VALUES`, `or an `INSERT`, `UPDATE`, or `DELETE` with a
-`RETURNING` clause.  See the `COPY` documentation here:
-https://www.postgresql.org/docs/current/sql-copy.html
-
-**Three,** when you convert a field to a "view" type (such as
-`std::string_view` or `std::basic_string_view<std::byte>`), the view points to
-underlying data which only stays valid until you iterate to the next row or
-exit the loop.  So if you want to use that data for longer than a single
-iteration of the streaming loop, you'll have to store it somewhere yourself.
-
-Now for the good news.  Streaming does make it very easy to query data and loop
-over it:
-
-```cxx
-    for (auto [id, name, x, y] :
-        tx.stream<int, std::string_view, float, float>(
-            "SELECT id, name, x, y FROM point"))
-      process(id + 1, "point-" + name, x * 10.0, y * 10.0);
-```
-
-The conversion to C++ types (here `int`, `std::string_view`, and two `float`s)
-is built into the function.  You never even see `row` objects, `field` objects,
-iterators, or conversion methods.  You just put in your query and you receive
-your data.
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/binary-data.md b/ext/libpqxx-7.7.3/include/pqxx/doc/binary-data.md
deleted file mode 100644
index 20da8dc0c..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/binary-data.md
+++ /dev/null
@@ -1,56 +0,0 @@
-Binary data                                                        {#binary}
-===========
-
-The database has two ways of storing binary data: `BYTEA` is like a string, but
-containing bytes rather than text characters.  And _large objects_ are more
-like a separate table containing binary objects.
-
-Generally you'll want to use `BYTEA` for reasonably-sized values, and large
-objects for very large values.
-
-That's the database side.  On the C++ side, in libpqxx, all binary data must be
-either `std::basic_string<std::byte>` or `std::basic_string_view<std::byte>`;
-or if you're building in C++20 or better, anything that's a block of
-contiguous `std::byte` in memory.
-
-So for example, if you want to write a large object, you'd create a
-`pqxx::blob` object.  And you might use that to write data in the form of
-`std::basic_string_view<std::byte>`.
-
-Your particular binary data may look different though.  You may have it in a
-`std::string`, or a `std::vector<unsigned char>`, or a pointer to `char`
-accompanied by a size (which could be signed or unsigned, and of any of a few
-different widths).  Sometimes that's your choice, or sometimes some other
-library will dictate what form it takes.
-
-So long as it's _basically_ still a block of bytes though, you can use
-`pqxx::binary_cast` to construct a `std::basic_string_view<std::byte>` from it.
-
-There are two forms of `binary_cast`.  One takes a single argument that must
-support `std::data()` and `std::size()`:
-
-    std::string hi{"Hello binary world"};
-    my_blob.write(pqxx::binary_cast(hi);
-
-The other takes a pointer and a size:
-
-    char const greeting[] = "Hello binary world";
-    char const *hi = greeting;
-    my_blob.write(pqxx::binary_cast(hi, sizeof(greeting)));
-
-
-Caveats
--------
-
-There are some restrictions on `binary_cast` that you must be aware of.
-
-First, your data must of a type that gives us _bytes._  So: `char`,
-`unsigned char`, `signed char`, `int8_t`, `uint8_t`, or of course `std::byte`.
-You can't feed in a vector of `double`, or anything like that.
-
-Second, the data must be laid out as a contiguous block in memory.  If there's
-no `std::data()` implementation for your type, it's not suitable.
-
-Third, `binary_cast` only constructs something like a `std::string_view`.  It
-does not make a copy of your actual data.  So, make sure that your data remains
-alive and in the same place while you're using it.
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/datatypes.md b/ext/libpqxx-7.7.3/include/pqxx/doc/datatypes.md
deleted file mode 100644
index bc14c8b90..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/datatypes.md
+++ /dev/null
@@ -1,373 +0,0 @@
-Supporting additional data types                              {#datatypes}
-================================
-
-Communication with the database mostly happens in a text format.  When you
-include an integer value in a query, you use `to_string` to convert it to that
-text format.  When you get a query result field "as a float," it converts from
-the text format to a floating-point type.  These conversions are everywhere in
-libpqxx.
-
-The conversion sydstem supports many built-in types, but it is also extensible.
-You can "teach" libpqxx (in the scope of your own application) to convert
-additional types of values to and from PostgreSQL's string format.
-
-This is massively useful, but it's not for the faint of heart.  You'll need to
-specialise some templates.  And, **the API for doing this can change with any
-major libpqxx release.**
-
-
-Converting types
-----------------
-
-In your application, a conversion is driven entirely by a C++ type you specify.
-The value's SQL type has nothing to do with it, nor is there anything in the
-string that would identify its type.
-
-So, if you've SELECTed a 64-bit integer from the database, and you try to
-convert it to a C++ "short," one of two things will happen: either the number
-is small enough to fit in your `short` (and it just works), or else it throws a
-conversion exception.
-
-Or, your database table might have a text column, but a given field may contain
-a string that _looks_ just like a number.  You can convert that value to an
-integer type just fine.  Or to a floating-point type.  All that matters to the
-conversion is the actual value, and the type.
-
-In some cases the templates for these conversions can tell the type from the
-arguments you pass them:
-
-    auto x = to_string(99);
-
-In other cases you may need to instantiate template explicitly:
-
-    auto y = from_string<int>("99");
-
-
-Supporting a new type
----------------------
-
-Let's say you have some other SQL type which you want to be able to store in,
-or retrieve from, the database.  What would it take to support that?
-
-Sometimes you do not need _complete_ support.  You might need a conversion _to_
-a string but not _from_ a string, for example.  The conversion is defined at
-compile time, so don't be too afraid to be incomplete.  If you leave out one of
-these steps, it's not going to crash at run time or mess up your data.  The
-worst that can happen is that your code won't build.
-
-So what do you need for a complete conversion?
-
-First off, of course, you need a C++ type.  It may be your own, but it
-doesn't have to be.  It could be a type from a third-party library, or even one
-from the standard library that libpqxx does not yet support.
-
-You also specialise the `pqxx::type_name` variable to specify the type's name.
-This is important for all code which mentions your type in human-readable text,
-such as error messages.
-
-Then, does your type have a built-in null value?  You specialise the
-`pqxx::nullness` template to specify the details.
-
-Finally, you specialise the `pqxx::string_traits` template.  This is where you
-define the actual conversions.
-
-Let's go through these steps one by one.
-
-
-Your type
----------
-
-You'll need a type for which the conversions are not yet defined, because the
-C++ type is what determines the right conversion.  One type, one set of
-conversions.
-
-The type doesn't have to be one that you create.  The conversion logic was
-designed such that you can build it around any type.  So you can just as
-easily build a conversion for a type that's defined somewhere else.  There's
-no need to include any special methods or other members inside it.  That's also
-how libpqxx can support converting built-in types like `int`.
-
-By the way, if the type is an enum, you don't need to do any of this.  Just
-invoke the preprocessor macro `PQXX_DECLARE_ENUM_CONVERSION`, from the global
-namespace near the top of your translation unit, and pass the type as an
-argument.
-
-The library also provides specialisations for `std::optional<T>`,
-`std::shared_ptr<T>`, and `std::unique_ptr<T>`.  If you have conversions for
-`T`, you'll also have conversions for those.
-
-
-Specialise `type_name`
-----------------------
-
-When errors happen during conversion, libpqxx will compose error messages for
-the user.  Sometimes these will include the name of the type that's being
-converted.
-
-To tell libpqxx the name of each type, there's a template variable called
-`pqxx::type_name`.  For any given type `T`, it should have a specialisation
-that provides that `T`'s human-readable name:
-
-    namespace pqxx
-    {
-    template<> std::string const type_name<T>{"T"};
-    }
-
-(Yes, this means that you need to define something inside the pqxx namespace.
-Future versions of libpqxx may move this into a separate namespace.)
-
-Define this early on in your translation unit, before any code that might cause
-libpqxx to need the name.  That way, the libpqxx code which needs to know the
-type's name can see your definition.
-
-
-Specialise `nullness`
----------------------
-
-A struct template `pqxx::nullness` defines whether your type has a natural
-"null value" built in.  If so, it also provides member functions for producing
-and recognising null values.
-
-The simplest scenario is also the most common: most types don't have a null
-value built in.  In that case, derive your nullness traits from
-`pqxx::no_null`:
-
-    namespace pqxx
-    {
-    template<> struct nullness<T> : pqxx::no_null<T> {};
-    }
-
-(Here again you're defining this in the pqxx namespace.)
-
-If your type does have a natural null value, the definition gets a little more
-complex:
-
-    namespace pqxx
-    {
-    template<> struct nullness<T>
-    {
-      static constexpr bool has_null{true};
-      static constexpr bool always_null{false};
-
-      static bool is_null(T const &value)
-      {
-        // Return whether "value" is null.
-        return ...;
-      }
-
-      [[nodiscard]] static T null()
-      {
-        // Return a null value.
-        return ...;
-      }
-    };
-    }
-
-You may be wondering why there's a function to produce a null value, but also a
-function to check whether a value is null.  Why not just compare the value to
-the result of `null()`?  Because two null values may not be equal.  `T` may
-have several different null values.  Or it may override the comparison
-operator, similar to SQL where NULL is not equal to NULL.
-
-As a third case, your type may be one that _always_ represents a null value.
-This is the case for `std::nullptr_t` and `std::nullopt_t`.  In that case, you
-set `nullness<TYPE>::always_null` to `true` (as well as `has_null` of course),
-and you won't need to define any actual conversions.
-
-
-Specialise `string_traits`
--------------------------
-
-This part is more work.  (You can skip it for types that are _always_ null,
-but those will be rare.)  Specialise the `pqxx::string_traits` template:
-
-    namespace pqxx
-    {
-    template<> struct string_traits<T>
-    {
-      static T from_string(std::string_view text);
-      static zview to_buf(char *begin, char *end, T const &value);
-      static char *into_buf(char *begin, char *end, T const &value);
-      static std::size_t size_buffer(T const &value) noexcept;
-    };
-    }
-
-You'll also need to write those member functions, or as many of them as needed
-to get your code to build.
-
-
-### `from_string`
-
-We start off simple: `from_string` parses a string as a value of `T`, and
-returns that value.
-
-The string may not be zero-terminated; it's just the `string_view` from
-beginning to end (exclusive).  In your tests, cover cases where the string
-does not end in a zero byte.
-
-It's perfectly possible that the string isn't actually a `T` value.  Mistakes
-happen.  In that case, throw a `pqxx::conversion_error`.
-
-(Of course it's also possible that you run into some other error, so it's fine
-to throw different exceptions as well.  But when it's definitely "this is not
-the right format for a `T`," throw `conversion_error`.)
-
-
-### `to_buf`
-
-In this function, you convert a value of `T` into a string that the postgres
-server will understand.
-
-The caller will provide you with a buffer where you can write the string, if
-you need it: from `begin` to `end` exclusive.  It's a half-open interval, so
-don't access `*end`.
-
-If the buffer is insufficient for you to do the conversion, throw a
-`pqxx::conversion_overrun`.  It doesn't have to be exact: you can be a little
-pessimistic and demand a bit more space than you need.  Just be sure to throw
-the exception if there's any risk of overrunning the buffer.
-
-You don't _have_ to use the buffer for this function though.  For example,
-`pqxx::string_traits<bool>::to_buf` returns a compile-time constant string and
-ignores the buffer.
-
-Even if you do use the buffer, your string does not _have_ to start at the
-beginning of the buffer.  For example, the integer conversions start by writing
-the _least_ significant digit to the _end_ of the buffer, and then writes the
-more significant digits before it.  It was just more convenient.
-
-Return a `pqxx::zview`.  This is basically a `std::string_view`, but with one
-difference: a `zview` guarantees that there will be a valid zero byte right
-after the `string_view`.  The zero byte is not counted as part of its size, but
-it will be there.
-
-Expressed in code, this rule must hold:
-
-    void invariant(zview z)
-    {
-      assert(z[std::size(z)] == 0);
-    }
-
-Make sure you write your trailing zero _before_ the `end`.  If the trailing
-zero doesn't fit in the buffer, then there's just not enough room to perform
-the conversion.
-
-Beware of locales when converting.  If you use standard library features like
-`sprintf`, they may obey whatever locale is currently set on the system.   That
-means that a simple integer like 1000000 may come out as "1000000" on your
-system, but as "1,000,000" on mine, or as "1.000.000" for somebody else, and on
-an Indian system it may be "1,00,000".  Values coming from or going to the
-database should be in non-localised formats.  You can use libpqxx functions for
-those conversions: `pqxx::from_string`, `pqxx::to_string`, `pqxx::to_buf`.
-
-
-### `into_buf`
-
-This is a stricter version of `to_buf`.  All the same requirements apply, but
-in addition you must write your string into the buffer provided, starting
-_exactly_ at `begin`.
-
-That's why this function returns just a simple pointer: the address right
-behind the trailing zero.  If the caller wants to use the string, they can
-find it at `begin`.  If they want to write a different value into the rest of
-the buffer, they can start at the location you returned.
-
-
-### `size_buffer`
-
-Here you estimate how much buffer space you need for converting a `T` to a
-string.  Be precise if you can, but pessimistic if you must.  It's usually
-better to waste a few unnecessary bytes than to spend a lot of time computing
-the exact buffer space you need.  And failing the conversion because you
-under-budgeted the buffer is worst of all.
-
-Include the trailing zero in the buffer size.  If your `to_buf` takes more
-space than just what's needed to store the result, include that too.
-
-Make `size_buffer` a `constexpr` function if you can.  It can allow the caller
-to allocate the buffer on the stack, with a size known at compile time.
-
-
-Optional: Specialise `is_unquoted_safe`
----------------------------------------
-
-When converting arrays or composite values to strings, libpqxx may need to
-quote values and escape any special characters.  This takes time.
-
-Some types though, such as integral or floating-point types, can never have
-any special characters such as quotes, commas, or backslashes in their string
-representations.  In such cases, there's no need to quote or escape such values
-in arrays or composite types.
-
-If your type is like that, you can tell libpqxx about this by defining:
-
-    namespace pqxx
-    {
-    template<> inline constexpr bool is_unquoted_safe<MY_TYPE>{true};
-    }
-
-The code that converts this type of field to strings in an array or a composite
-type can then use a simpler, more efficient variant of the code.  It's always
-safe to leave this out; it's _just_ an optimisation for when you're completely
-sure that it's safe.
-
-Do not do this if a string representation of your type may contain a comma;
-semicolon; parenthesis; brace; quote; backslash; newline; or any other
-character that might need escaping.
-
-
-Optional: Specialise `param_format`
------------------------------------
-
-This one you don't generally need to worry about.  Read on if you're writing a
-type which represents raw binary data, or if you're writing a template where
-_some specialisations_ may contain raw binary data.
-
-When you call parameterised statements, or prepared statements with parameters,
-libpqxx needs to your parameters on to libpq, the underlying C-level PostgreSQL
-client library.
-
-There are two formats for doing that: _text_ and _binary._  In the first, we
-represent all values as strings, and the server then converts them into its own
-internal binary representation.  That's what the string conversions are all
-about, and it's what we do for almost all types of parameters.
-
-But we do it differently when the parameter is a contiguous series of raw bytes
-and the corresponding SQL type is `BYTEA`.  There is a text format for those,
-but we bypass it for efficiency.  The server can use the binary data in the
-exact same form, without any conversion or extra processing.  The binary data
-is also twice as compact during transport.
-
-(People sometimes ask why we can't just treat all types as binary.  However the
-general case isn't so clear-cut.  The binary formats are not documented, there
-are no guarantees that they will be platform-independent or that they will
-remain stable, and there's no really solid way to detect when we might get the
-format wrong.  But also, the conversions aren't necessarily as straightforward
-and efficient as they sound.  So, for the general case, libpqxx sticks with the
-text formats.  Raw binary data alone stands out as a clear win.)
-
-Long story short, the machinery for passing parameters needs to know: is this
-parameter a binary string, or not?  In the normal case it can assume "no," and
-that's what it does.  The text format is always a safe choice; we just try to
-use the binary format where it's faster.
-
-The `param_format` function template is what makes the decision.  We specialise
-it for types which may be binary strings, and use the default for all other
-types.
-
-"Types which _may_ be binary"?  You might think we know whether a type is a
-binary type or not.  But there are some complications with generic types.
-
-Templates like `std::shared_ptr`, `std::optional`, and so on act like
-"wrappers" for another type.  A `std::optional<T>` is binary if `T` is binary.
-Otherwise, it's not.  If you're building support for a template of this nature,
-you'll probably want to implement `param_format` for it.
-
-The decision to use binary format is made based on a given object, not
-necessarily based on the type in general.  Look at `std::variant`.  If you have
-a `std::variant` type which can hold an `int` or a binary string, is that a
-binary parameter?  We can't decide without knowing the individual object.
-
-Containers are another hard case.  Should we pass `std::vector<T>` in binary?
-Even when `T` is a binary type, we don't currently have any way to pass an
-array in binary format, so we always pass it as text.
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/escaping.md b/ext/libpqxx-7.7.3/include/pqxx/doc/escaping.md
deleted file mode 100644
index 2ad9fe3db..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/escaping.md
+++ /dev/null
@@ -1,74 +0,0 @@
-String escaping                      {#escaping}
-===============
-
-Writing queries as strings is easy.  But sometimes you need a variable in
-there: `"SELECT id FROM user WHERE name = '" + name + "'"`.
-
-This is dangerous.  See the bug?  If `name` can contain quotes, you may have
-an SQL injection vulnerability there, where users can enter nasty stuff like
-"`.'; DROP TABLE user`".  Or if you're lucky, it's just a nasty bug that you
-discover when `name` happens to be "d'Arcy".
-
-So, you'll need to _escape_ the `name` before you insert it.  This is where
-quotes and other problematic characters are marked as "this is just a character
-in the string, not the end of the string."  There are
-[several functions](@ref escaping-functions) in libpqxx to do this for you.
-
-
-SQL injection
--------------
-
-To understand what SQL injection vulnerabilities are and why they should be
-prevented, imagine you use the following SQL statement somewhere in your
-program:
-
-    TX.exec(
-    	"SELECT number,amount "
-    	"FROM accounts "
-    	"WHERE allowed_to_see('" + userid + "','" + password + "')");
-
-This shows a logged-in user important information on all accounts he is
-authorized to view.  The userid and password strings are variables entered
-by the user himself.
-
-Now, if the user is actually an attacker who knows (or can guess) the
-general shape of this SQL statement, imagine he enters the following
-password:
-
-    x') OR ('x' = 'x
-
-Does that make sense to you?  Probably not.  But if this is inserted into
-the SQL string by the C++ code above, the query becomes:
-
-    SELECT number,amount
-    FROM accounts
-    WHERE allowed_to_see('user','x') OR ('x' = 'x')
-
-Is this what you wanted to happen?  Probably not!  The neat `allowed_to_see()`
-clause is completely circumvented by the "`OR ('x' = 'x')`" clause, which is
-always `true`.  Therefore, the attacker will get to see all accounts in the
-database!
-
-
-Using the esc functions
------------------------
-
-Here's how you can fix the problem in the example above:
-
-    TX.exec(
-    	"SELECT number,amount "
-    	"FROM accounts "
-    	"WHERE allowed_to_see('" + TX.esc(userid) + "', "
-    		"'" + TX.esc(password) + "')");
-
-Now, the quotes embedded in the attacker's string will be neatly escaped so
-they can't "break out" of the quoted SQL string they were meant to go into:
-
-    SELECT number,amount
-    FROM accounts
-    WHERE allowed_to_see('user', 'x'') OR (''x'' = ''x')
-
-If you look carefully, you'll see that thanks to the added escape characters
-(a single-quote is escaped in SQL by doubling it) all we get is a very
-strange-looking password string--but not a change in the SQL statement.
-
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/getting-started.md b/ext/libpqxx-7.7.3/include/pqxx/doc/getting-started.md
deleted file mode 100644
index 1b87b881f..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/getting-started.md
+++ /dev/null
@@ -1,142 +0,0 @@
-Getting started                              {#getting-started}
-===============
-
-The most basic three types in libpqxx are the _connection_, the _transaction_,
-and the _result_.
-
-They fit together as follows:
-* You connect to the database by creating a `pqxx::connection` object (see
-  @ref connections).
-
-* You create a transaction object (see @ref transactions) operating on that
-  connection.  You'll usually want the `pqxx::work` variety.
-
-  Once you're done you call the transaction's `commit` function to make its
-  work final.  If you don't call this, the work will be rolled back when the
-  transaction object is destroyed.
-
-* Until then, use the transaction's `exec`, `query_value`, and `stream`
-  functions (and variants) to execute SQL statements.  You pass the statements
-  themselves in as simple strings.  (See @ref streams for more about data
-  streaming).
-
-* Most of the `exec` functions return a `pqxx::result` object, which acts
-  as a standard container of rows: `pqxx::row`.
-
-  Each row in a result, in turn, acts as a container of fields: `pqxx::field`.
-  See @ref accessing-results for more about results, rows, and fields.
-
-* Each field's data is stored internally as a text string, in a format defined
-  by PostgreSQL.  You can convert field or row values using their `as()` and
-  `to()` member functions.
-
-* After you've closed the transaction, the connection is free to run a next
-  transaction.
-
-Here's a very basic example.  It connects to the default database (you'll
-need to have one set up), queries it for a very simple result, converts it to
-an `int`, and prints it out.  It also contains some basic error handling.
-
-    #include <iostream>
-    #include <pqxx/pqxx>
-
-    int main()
-    {
-      try
-      {
-        // Connect to the database.  In practice we may have to pass some
-        // arguments to say where the database server is, and so on.
-        // The constructor parses options exactly like libpq's
-        // PQconnectdb/PQconnect, see:
-        // https://www.postgresql.org/docs/10/static/libpq-connect.html
-        pqxx::connection c;
-
-        // Start a transaction.  In libpqxx, you always work in one.
-        pqxx::work w(c);
-
-        // work::exec1() executes a query returning a single row of data.
-        // We'll just ask the database to return the number 1 to us.
-        pqxx::row r = w.exec1("SELECT 1");
-
-        // Commit your transaction.  If an exception occurred before this
-        // point, execution will have left the block, and the transaction will
-        // have been destroyed along the way.  In that case, the failed
-        // transaction would implicitly abort instead of getting to this point.
-        w.commit();
-
-        // Look at the first and only field in the row, parse it as an integer,
-        // and print it.
-        //
-        // "r[0]" returns the first field, which has an "as<...>()" member
-        // function template to convert its contents from their string format
-        // to a type of your choice.
-        std::cout << r[0].as<int>() << std::endl;
-      }
-      catch (std::exception const &e)
-      {
-        std::cerr << e.what() << std::endl;
-        return 1;
-      }
-    }
-
-This prints the number 1.  Notice that you can keep the result object around
-after you've closed the transaction or even the connection.  There are
-situations where you can't do it, but generally it's fine.  If you're
-interested: you can install your own callbacks for receiving error messages
-from the database, and in that case you'll have to keep the connection object
-alive.  But otherwise, it's nice to be able to "fire and forget" your
-connection and deal with the data.
-
-You can also convert an entire row to a series of C++-side types in one go,
-using the @c as member function on the row:
-
-    pqxx::connection c;
-    pqxx::work w(c);
-    pqxx::row r = w.exec1("SELECT 1, 2, 'Hello'");
-    auto [one, two, hello] = r.as<int, int, std::string>();
-    std::cout << (one + two) << ' ' << std::strlen(hello) << std::endl;
-
-Here's a slightly more complicated example.  It takes an argument from the
-command line and retrieves a string with that value.  The interesting part is
-that it uses the escaping-and-quoting function `quote` to embed this
-string value in SQL safely.  It also reads the result field's value as a
-plain C-style string using its `c_str` function.
-
-    #include <iostream>
-    #include <stdexcept>
-    #include <pqxx/pqxx>
-
-    int main(int argc, char *argv[])
-    {
-      try
-      {
-        if (!argv[1]) throw std::runtime_error("Give me a string!");
-
-        pqxx::connection c;
-        pqxx::work w(c);
-
-        // work::exec() returns a full result set, which can consist of any
-        // number of rows.
-        pqxx::result r = w.exec("SELECT " + w.quote(argv[1]));
-
-        // End our transaction here.  We can still use the result afterwards.
-        w.commit();
-
-        // Print the first field of the first row.  Read it as a C string,
-        // just like std::string::c_str() does.
-        std::cout << r[0][0].c_str() << std::endl;
-      }
-      catch (std::exception const &e)
-      {
-        std::cerr << e.what() << std::endl;
-        return 1;
-      }
-    }
-
-You can find more about converting field values to native types, or
-converting values to strings for use with libpqxx, under
-@ref stringconversion.  More about getting to the rows and fields of a
-result is under @ref accessing-results.
-
-If you want to handle exceptions thrown by libpqxx in more detail, for
-example to print the SQL contents of a query that failed, see @ref exception.
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/mainpage.md b/ext/libpqxx-7.7.3/include/pqxx/doc/mainpage.md
deleted file mode 100644
index 5d4b8f9b2..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/mainpage.md
+++ /dev/null
@@ -1,28 +0,0 @@
-libpqxx                                      {#mainpage}
-=======
-
-@version 7.7.3
-@author Jeroen T. Vermeulen
-@see http://pqxx.org
-@see https://github.com/jtv/libpqxx
-
-Welcome to libpqxx, the C++ API to the PostgreSQL database management system.
-
-Compiling this package requires PostgreSQL to be installed -- including the
-C headers for client development.  The library builds on top of PostgreSQL's
-standard C API, libpq.  The libpq headers are not needed to compile client
-programs, however.
-
-For a quick introduction to installing and using libpqxx, see the README.md
-file.  The latest information can be found at http://pqxx.org/
-
-
-Some links that should help you find your bearings:
-* @ref getting-started
-* @ref thread-safety
-* @ref connections
-* @ref transactions
-* @ref escaping
-* @ref performance
-* @ref transactor
-* @ref datatypes
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/mainpage.md.template b/ext/libpqxx-7.7.3/include/pqxx/doc/mainpage.md.template
deleted file mode 100644
index d5afb2427..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/mainpage.md.template
+++ /dev/null
@@ -1,28 +0,0 @@
-libpqxx                                      {#mainpage}
-=======
-
-@version @PQXXVERSION@
-@author Jeroen T. Vermeulen
-@see http://pqxx.org
-@see https://github.com/jtv/libpqxx
-
-Welcome to libpqxx, the C++ API to the PostgreSQL database management system.
-
-Compiling this package requires PostgreSQL to be installed -- including the
-C headers for client development.  The library builds on top of PostgreSQL's
-standard C API, libpq.  The libpq headers are not needed to compile client
-programs, however.
-
-For a quick introduction to installing and using libpqxx, see the README.md
-file.  The latest information can be found at http://pqxx.org/
-
-
-Some links that should help you find your bearings:
-* @ref getting-started
-* @ref thread-safety
-* @ref connections
-* @ref transactions
-* @ref escaping
-* @ref performance
-* @ref transactor
-* @ref datatypes
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/parameters.md b/ext/libpqxx-7.7.3/include/pqxx/doc/parameters.md
deleted file mode 100644
index 7ac792025..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/parameters.md
+++ /dev/null
@@ -1,90 +0,0 @@
-Statement parameters                                        {#parameters}
-====================
-
-When you execute a prepared statement (see @ref prepared), or a parameterised
-statement (using functions like `pqxx::connection::exec_params`), you may write
-special _placeholders_ in the query text.  They look like `$1`, `$2`, and so
-on.
-
-If you execute the query and pass parameter values, the call will respectively
-substitute the first where it finds `$1`, the second where it finds `$2`, et
-cetera.
-
-Doing this saves you work.  If you don't use statement parameters, you'll need
-to quote and escape your values (see `connection::quote()` and friends) as you
-insert them into your query as literal values.
-
-Or if you forget to do that, you leave yourself open to horrible
-[SQL injection attacks](https://xkcd.com/327/).  Trust me, I was born in a town
-whose name started with an apostrophe!
-
-Statement parameters save you this work.  With these parameters you can pass
-your values as-is, and they will go across the wire to the database in a safe
-format.
-
-In some cases it may even be faster!  When a parameter represents binary data
-(as in the SQL `BYTEA` type), libpqxx will send it directly as binary, which is
-a bit more efficient.  If you insert the binary data directly in your query
-text, your CPU will have some extra work to do, converting the data into a text
-format, escaping it, and adding quotes.
-
-
-Dynamic parameter lists
------------------------
-
-In rare cases you may just not know how many parameters you'll pass into your
-statement when you call it.
-
-For these situations, have a look at `params`.  It lets you compose your
-parameters list on the fly, even add whole ranges of parameters at a time.
-
-You can pass a `params` into your statement as a normal parameter.  It will
-fill in all the parameter values it contains into that position of the
-statement's overall parameter list.
-
-So if you call your statement passing a regular parameter `a`, a
-`params` containing just a parameter `b`, and another regular parameter `c`,
-then your call will pass parameters `a`, `b`, and `c`.  Or if the params object
-is empty, it will pass just `a` and `c`.  If the params object contains `x` and
-`y`, your call will pass `a, x, y, c`.
-
-You can mix static and dynamic parameters freely.  Don't go overboard though:
-complexity is where bugs happen!
-
-
-Generating placeholders
------------------------
-
-If your code gets particularly complex, it may sometimes happen that it becomes
-hard to track which parameter value belongs with which placeholder.  Did you
-intend to pass this numeric value as `$7`, or as `$8`?  The answer may depend
-on an `if` that happened earlier in a different function.
-
-(Generally if things get that complex, it's a good idea to look for simpler
-solutions.  But especially when performance matters, sometimes you can't avoid
-complexity like that.)
-
-There's a little helper class called `placeholders`.  You can use it as a
-counter which produces those placeholder strings, `$1`, `$2`, `$3`, et cetera.
-When you start generating a complex statement, you can create both a `params`
-and a `placeholders`:
-
-    pqxx::params values;
-    pqxx::placeholders name;
-
-Let's say you've got some complex code to generate the conditions for an SQL
-"WHERE" clause.  You'll generally want to do these things close together in
-your, so that you don't accidentally update one part and forget another:
-
-    if (extra_clause)
-    {
-      // Extend the query text, using the current placeholder.
-      query += " AND x = " + name.get();
-      // Add the parameter value.
-      values.append(my_x);
-      // Move on to the next placeholder value.
-      name.next();
-    }
-
-Depending on the starting value of `name`, this might add to `query` a fragment
-like "` AND x = $3`" or "` AND x = $5`".
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/performance.md b/ext/libpqxx-7.7.3/include/pqxx/doc/performance.md
deleted file mode 100644
index 6c403684f..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/performance.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Performance features                       {#performance}
-====================
-
-If your program's database interaction is not as efficient as it needs to be,
-the first place to look is usually the SQL you're executing.  But libpqxx
-has a few specialized features to help you squeeze more performance out
-of how you issue commands and retrieve data:
-
-* @ref streams.  Use these as a faster way to transfer data between your
-    code and the database.
-* `std::string_view` and `pqxx::zview`.  In places where traditional C++ worked
-    with `std::string`, see whether `std::string_view` or `pqxx::zview` will
-    do.  Of course that means that you'll have to look at the data's lifetime
-    more carefully, but it'll save the computer a lot of copying.
-* @ref prepared.  These can be executed many times without the server
-    parsing and planning them anew each time.  They also save you having to
-    escape string parameters.
-* `pqxx::pipeline` lets you send queries to the database in batches, and
-    continue other processing while they are executing.
-* `pqxx::connecting` lets you start setting up a database connection, but
-    without blocking the thread.
-
-As always of course, don't risk the quality of your code for optimizations
-that you don't need!
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/prepared-statement.md b/ext/libpqxx-7.7.3/include/pqxx/doc/prepared-statement.md
deleted file mode 100644
index 5193866a6..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/prepared-statement.md
+++ /dev/null
@@ -1,125 +0,0 @@
-Prepared statements                    {#prepared}
-===================
-
-Prepared statements are SQL queries that you define once and then invoke
-as many times as you like, typically with varying parameters.  It's basically
-a function that you can define ad hoc.
-
-If you have an SQL statement that you're going to execute many times in
-quick succession, it may be more efficient to prepare it once and reuse it.
-This saves the database backend the effort of parsing complex SQL and
-figuring out an efficient execution plan.  Another nice side effect is that
-you don't need to worry about escaping parameters.  Some corporate coding
-standards require all SQL parameters to be passed in this way, to reduce the
-risk of programmer mistakes leaving room for SQL injections.
-
-
-Preparing a statement
----------------------
-
-You create a prepared statement by preparing it on the connection (using the
-`pqxx::connection::prepare` functions), passing an identifier and its SQL text.
-
-The identifier is the name by which the prepared statement will be known; it
-should consist of ASCII letters, digits, and underscores only, and start with
-an ASCII letter.  The name is case-sensitive.
-
-```cxx
-    void prepare_my_statement(pqxx::connection &c)
-    {
-      c.prepare(
-          "my_statement",
-          "SELECT * FROM Employee WHERE name = 'Xavier'");
-    }
-```
-
-Once you've done this, you'll be able to call `my_statement` from any
-transaction you execute on the same connection.  For this, use the
-`pqxx::transaction_base::exec_prepared` functions.
-
-```cxx
-    pqxx::result execute_my_statement(pqxx::transaction_base &t)
-    {
-      return t.exec_prepared("my_statement");
-    }
-```
-
-
-Parameters
-----------
-
-Did I mention that prepared statements can have parameters?  The query text
-can contain `$1`, `$2` etc. as placeholders for parameter values that you
-will provide when you invoke the prepared satement.
-
-See @ref parameters for more about this.  And here's a simple example of
-preparing a statement and invoking it with parameters:
-
-```cxx
-    void prepare_find(pqxx::connection &c)
-    {
-      // Prepare a statement called "find" that looks for employees with a
-      // given name (parameter 1) whose salary exceeds a given number
-      // (parameter 2).
-      c.prepare(
-  	    "find",
-  	    "SELECT * FROM Employee WHERE name = $1 AND salary > $2");
-    }
-```
-
-This example looks up the prepared statement "find," passes `name` and
-`min_salary` as parameters, and invokes the statement with those values:
-
-```cxx
-    pqxx::result execute_find(
-      pqxx::transaction_base &t, std::string name, int min_salary)
-    {
-      return t.exec_prepared("find", name, min_salary);
-    }
-```
-
-
-A special prepared statement
-----------------------------
-
-There is one special case: the _nameless_ prepared statement.  You may prepare
-a statement without a name, i.e. whose name is an empty string.  The unnamed
-statement can be redefined at any time, without un-preparing it first.
-
-
-Performance note
-----------------
-
-Don't assume that using prepared statements will speed up your application.
-There are cases where prepared statements are actually slower than plain SQL.
-
-The reason is that the backend can often produce a better execution plan when
-it knows the statement's actual parameter values.
-
-For example, say you've got a web application and you're querying for users
-with status "inactive" who have email addresses in a given domain name X.  If
-X is a very popular provider, the best way for the database engine to plan the
-query may be to list the inactive users first and then filter for the email
-addresses you're looking for.  But in other cases, it may be much faster to
-find matching email addresses first and then see which of their owners are
-"inactive."  A prepared statement must be planned to fit either case, but a
-direct query will be optimised based on table statistics, partial indexes, etc.
-
-
-Zero bytes
-----------
-
-@warning Beware of "nul" bytes!
-
-Any string you pass as a parameter will end at the _first char with value
-zero._  If you pass a string that contains a zero byte, the last byte in the
-value will be the one just before the zero.
-
-So, if you need a zero byte in a string, consider that it's really a _binary
-string,_ which is not the same thing as a text string.  SQL represents binary
-data as the `BYTEA` type, or in binary large objects ("blobs").
-
-In libpqxx, you represent binary data as a range of `std::byte`.  They must be
-contiguous in memory, so that libpqxx can pass pointers to the underlying C
-library.  So you might use `std::basic_string<std::byte>`, or
-`std::basic_string_view<std::byte>`, or `std::vector<std::byte>`.
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/streams.md b/ext/libpqxx-7.7.3/include/pqxx/doc/streams.md
deleted file mode 100644
index 3df4d6126..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/streams.md
+++ /dev/null
@@ -1,107 +0,0 @@
-Streams						{#streams}
-=======
-
-Most of the time it's fine to retrieve data from the database using `SELECT`
-queries, and store data using `INSERT`.  But for those cases where efficiency
-matters, there are two classes to help you do this better: `stream_from` and
-`stream_to`.  They're less flexible than SQL queries, and there's the risk of
-losing your connection while you're in mid-stream, but you get some speed and
-memory efficiencies in return.
-
-Both stream classes do data conversion for you: `stream_from` receives values
-from the database in PostgreSQL's text format, and converts them to the C++
-types you specify.  Likewise, `stream_to` converts C++ values you provide to
-PostgreSQL's text format for transfer.  (On its end, the database of course
-converts values to and from their SQL types.)
-
-
-Null values
------------
-
-So how do you deal with nulls?  It depends on the C++ type you're using.  Some
-types may have a built-in null value.  For instance, if you have a
-`char const *` value and you convert it to an SQL string, then converting a
-`nullptr` will produce a NULL SQL value.
-
-But what do you do about C++ types which don't have a built-in null value, such
-as `int`?  The trick is to wrap it in `std::optional`.  The difference between
-`int` and `std::optional<int>` is that the former always has an `int` value,
-and the latter doesn't have to.
-
-Actually it's not just `std::optional`.  You can do the same thing with
-`std::unique_ptr` or `std::shared_ptr`.  A smart pointer is less efficient than
-`std::optional` in most situations because they allocate their value on the
-heap, but sometimes that's what you want in order to save moving or copying
-large values around.
-
-This part is not generic though.  It won't work with just any smart-pointer
-type, just the ones which are explicitly supported: `shared_ptr` and
-`unique_ptr`.  If you really need to, you can build support for additional
-wrappers and smart pointers by copying the implementation patterns from the
-existing smart-pointer support.
-
-
-stream\_from
-------------
-
-Use `stream_from` to read data directly from the database.  It's faster than
-the transaction's `exec` functions if the result contains enough rows.  But
-also, you won't need to keep your full result set in memory.  That can really
-matter with larger data sets.
-
-And, you can start processing your data right after the first row of data comes
-in from the server.  With `exec()` you need to wait to receive all data, and
-then you begin processing.  With `stream_from` you can be processing data on
-the client side while the server is still sending you the rest.
-
-You don't actually need to create a `stream_from` object yourself, though you
-can.  Two shorthand functions, @ref pqxx::transaction_base::stream
-and @ref pqxx::transaction_base::for_each, can create the streams for you with
-a minimum of overhead.
-
-Not all kinds of queries will work in a stream.  Internally the streams make
-use of PostgreSQL's `COPY` command, so see the PostgreSQL documentation for
-`COPY` for the exact limitations.  Basic `SELECT` and `UPDATE ... RETURNING`
-queries should just work.
-
-As you read a row, the stream converts its fields to a tuple type containing
-the value types you ask for:
-
-    auto stream pqxx::stream_from::query(
-        tx, "SELECT name, points FROM score");
-    std::tuple<std::string, int> row;
-    while (stream >> row)
-      process(row);
-    stream.complete();
-
-As the stream reads each row, it converts that row's data into your tuple,
-goes through your loop body, and then promptly forgets that row's data.  This
-means you can easily process more data than will fit in memory.
-
-
-stream\_to
-----------
-
-Use `stream_to` to write data directly to a database table.  This saves you
-having to perform an `INSERT` for every row, and so it can be significantly
-faster if you want to insert more than just one or two rows at a time.
-
-As with `stream_from`, you can specify the table and the columns, and not much
-else.  You insert tuple-like objects of your choice:
-
-    pqxx::stream_to stream{
-        tx,
-        "score",
-        std::vector<std::string>{"name", "points"}};
-    for (auto const &entry: scores)
-        stream << entry;
-    stream.complete();
-
-Each row is processed as you provide it, and not retained in memory after that.
-
-The call to `complete()` is more important here than it is for `stream_from`.
-It's a lot like a "commit" or "abort" at the end of a transaction.  If you omit
-it, it will be done automatically during the stream's destructor.  But since
-destructors can't throw exceptions, any failures at that stage won't be visible
-in your code.  So, always call `complete()` on a `stream_to` to close it off
-properly!
diff --git a/ext/libpqxx-7.7.3/include/pqxx/doc/thread-safety.md b/ext/libpqxx-7.7.3/include/pqxx/doc/thread-safety.md
deleted file mode 100644
index 07c7f9984..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/doc/thread-safety.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Thread safety                    {#thread-safety}
-=============
-
-This library does not contain any locking code to protect objects against
-simultaneous modification in multi-threaded programs.  Therefore it is up
-to you, the user of the library, to ensure that your threaded client
-programs perform no conflicting operations concurrently.
-
-Most of the time this isn't hard.  Result sets are immutable, so you can
-share them between threads without problem.  The main rule is:
-
-@li Treat a connection, together with any and all objects related to it, as
-a "world" of its own.  You should generally make sure that the same "world"
-is never accessed by another thread while you're doing anything non-const
-in there.
-
-That means: don't issue a query on a transaction while you're also opening
-a subtransaction, don't access a cursor while you may also be committing,
-and so on.
-
-In particular, cursors are tricky.  It's easy to perform a non-const
-operation without noticing.  So, if you're going to share cursors or
-cursor-related objects between threads, lock very conservatively!
-
-Use `pqxx::describe_thread_safety` to find out at runtime what level of
-thread safety is implemented in your build and version of libpqxx.  It
-returns a `pqxx::thread_safety_model` describing what you can and cannot rely
-on.  A command-line utility `tools/pqxxthreadsafety` prints out the same
-information.
diff --git a/ext/libpqxx-7.7.3/include/pqxx/errorhandler b/ext/libpqxx-7.7.3/include/pqxx/errorhandler
deleted file mode 100644
index ea572ee79..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/errorhandler
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::errorhandler class.
- *
- * Callbacks for handling errors and warnings.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/errorhandler.hxx b/ext/libpqxx-7.7.3/include/pqxx/errorhandler.hxx
deleted file mode 100644
index 2ffb5703c..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/errorhandler.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Definition of the pqxx::errorhandler class.
- *
- * pqxx::errorhandler handlers errors and warnings in a database session.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/errorhandler instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ERRORHANDLER
-#define PQXX_H_ERRORHANDLER
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx::internal::gate
-{
-class errorhandler_connection;
-}
-
-
-namespace pqxx
-{
-/**
- * @addtogroup errorhandler
- */
-//@{
-
-/// Base class for error-handler callbacks.
-/** To receive errors and warnings from a connection, subclass this with your
- * own error-handler functor, and instantiate it for the connection. Destroying
- * the handler un-registers it.
- *
- * A connection can have multiple error handlers at the same time.  When the
- * database connection emits an error or warning message, it passes the message
- * to each error handler, starting with the most recently registered one and
- * progressing towards the oldest one.  However an error handler may also
- * instruct the connection not to pass the message to further handlers by
- * returning "false."
- *
- * @warning Strange things happen when a result object outlives its parent
- * connection.  If you register an error handler on a connection, then you must
- * not access the result after destroying the connection.  This applies even if
- * you destroy the error handler first!
- */
-class PQXX_LIBEXPORT errorhandler
-{
-public:
-  explicit errorhandler(connection &);
-  virtual ~errorhandler();
-
-  /// Define in subclass: receive an error or warning message from the
-  /// database.
-  /**
-   * @return Whether the same error message should also be passed to the
-   * remaining, older errorhandlers.
-   */
-  virtual bool operator()(char const msg[]) noexcept = 0;
-
-  errorhandler() = delete;
-  errorhandler(errorhandler const &) = delete;
-  errorhandler &operator=(errorhandler const &) = delete;
-
-private:
-  connection *m_home;
-
-  friend class internal::gate::errorhandler_connection;
-  void unregister() noexcept;
-};
-
-
-/// An error handler that suppresses any previously registered error handlers.
-class quiet_errorhandler : public errorhandler
-{
-public:
-  /// Suppress error notices.
-  quiet_errorhandler(connection &conn) : errorhandler{conn} {}
-
-  /// Revert to previous handling of error notices.
-  virtual bool operator()(char const[]) noexcept override { return false; }
-};
-
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/except b/ext/libpqxx-7.7.3/include/pqxx/except
deleted file mode 100644
index e5dd508bf..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/except
+++ /dev/null
@@ -1,8 +0,0 @@
-/** libpqxx exception classes.
- *
- * pqxx::sql_error, pqxx::broken_connection, pqxx::in_doubt_error, ...
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/except.hxx b/ext/libpqxx-7.7.3/include/pqxx/except.hxx
deleted file mode 100644
index 24f959437..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/except.hxx
+++ /dev/null
@@ -1,447 +0,0 @@
-/* Definition of libpqxx exception classes.
- *
- * pqxx::sql_error, pqxx::broken_connection, pqxx::in_doubt_error, ...
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/except instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_EXCEPT
-#define PQXX_H_EXCEPT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <stdexcept>
-#include <string>
-
-
-namespace pqxx
-{
-/**
- * @addtogroup exception Exception classes
- *
- * These exception classes follow, roughly, the two-level hierarchy defined by
- * the PostgreSQL SQLSTATE error codes (see Appendix A of the PostgreSQL
- * documentation corresponding to your server version).  This is not a complete
- * mapping though.  There are other differences as well, e.g. the error code
- * for `statement_completion_unknown` has a separate status in libpqxx as
- * @ref in_doubt_error, and `too_many_connections` is classified as a
- * `broken_connection` rather than a subtype of `insufficient_resources`.
- *
- * @see http://www.postgresql.org/docs/9.4/interactive/errcodes-appendix.html
- *
- * @{
- */
-
-/// Run-time failure encountered by libpqxx, similar to std::runtime_error.
-struct PQXX_LIBEXPORT failure : std::runtime_error
-{
-  explicit failure(std::string const &);
-};
-
-
-/// Exception class for lost or failed backend connection.
-/**
- * @warning When this happens on Unix-like systems, you may also get a SIGPIPE
- * signal.  That signal aborts the program by default, so if you wish to be
- * able to continue after a connection breaks, be sure to disarm this signal.
- *
- * If you're working on a Unix-like system, see the manual page for
- * `signal` (2) on how to deal with SIGPIPE.  The easiest way to make this
- * signal harmless is to make your program ignore it:
- *
- * ```cxx
- * #include <signal.h>
- *
- * int main()
- * {
- *   signal(SIGPIPE, SIG_IGN);
- *   // ...
- * ```
- */
-struct PQXX_LIBEXPORT broken_connection : failure
-{
-  broken_connection();
-  explicit broken_connection(std::string const &);
-};
-
-
-/// The caller attempted to set a variable to null, which is not allowed.
-struct PQXX_LIBEXPORT variable_set_to_null : failure
-{
-  variable_set_to_null();
-  explicit variable_set_to_null(std::string const &);
-};
-
-
-/// Exception class for failed queries.
-/** Carries, in addition to a regular error message, a copy of the failed query
- * and (if available) the SQLSTATE value accompanying the error.
- */
-class PQXX_LIBEXPORT sql_error : public failure
-{
-  /// Query string.  Empty if unknown.
-  std::string const m_query;
-  /// SQLSTATE string describing the error type, if known; or empty string.
-  std::string const m_sqlstate;
-
-public:
-  explicit sql_error(
-    std::string const &whatarg = "", std::string const &Q = "",
-    char const sqlstate[] = nullptr);
-  virtual ~sql_error() noexcept override;
-
-  /// The query whose execution triggered the exception
-  [[nodiscard]] PQXX_PURE std::string const &query() const noexcept;
-
-  /// SQLSTATE error code if known, or empty string otherwise.
-  [[nodiscard]] PQXX_PURE std::string const &sqlstate() const noexcept;
-};
-
-
-/// "Help, I don't know whether transaction was committed successfully!"
-/** Exception that might be thrown in rare cases where the connection to the
- * database is lost while finishing a database transaction, and there's no way
- * of telling whether it was actually executed by the backend.  In this case
- * the database is left in an indeterminate (but consistent) state, and only
- * manual inspection will tell which is the case.
- */
-struct PQXX_LIBEXPORT in_doubt_error : failure
-{
-  explicit in_doubt_error(std::string const &);
-};
-
-
-/// The backend saw itself forced to roll back the ongoing transaction.
-struct PQXX_LIBEXPORT transaction_rollback : sql_error
-{
-  explicit transaction_rollback(
-    std::string const &whatarg, std::string const &q = "",
-    char const sqlstate[] = nullptr);
-};
-
-
-/// Transaction failed to serialize.  Please retry it.
-/** Can only happen at transaction isolation levels REPEATABLE READ and
- * SERIALIZABLE.
- *
- * The current transaction cannot be committed without violating the guarantees
- * made by its isolation level.  This is the effect of a conflict with another
- * ongoing transaction.  The transaction may still succeed if you try to
- * perform it again.
- */
-struct PQXX_LIBEXPORT serialization_failure : transaction_rollback
-{
-  explicit serialization_failure(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// We can't tell whether our last statement succeeded.
-struct PQXX_LIBEXPORT statement_completion_unknown : transaction_rollback
-{
-  explicit statement_completion_unknown(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// The ongoing transaction has deadlocked.  Retrying it may help.
-struct PQXX_LIBEXPORT deadlock_detected : transaction_rollback
-{
-  explicit deadlock_detected(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// Internal error in libpqxx library
-struct PQXX_LIBEXPORT internal_error : std::logic_error
-{
-  explicit internal_error(std::string const &);
-};
-
-
-/// Error in usage of libpqxx library, similar to std::logic_error
-struct PQXX_LIBEXPORT usage_error : std::logic_error
-{
-  explicit usage_error(std::string const &);
-};
-
-
-/// Invalid argument passed to libpqxx, similar to std::invalid_argument
-struct PQXX_LIBEXPORT argument_error : std::invalid_argument
-{
-  explicit argument_error(std::string const &);
-};
-
-
-/// Value conversion failed, e.g. when converting "Hello" to int.
-struct PQXX_LIBEXPORT conversion_error : std::domain_error
-{
-  explicit conversion_error(std::string const &);
-};
-
-
-/// Could not convert value to string: not enough buffer space.
-struct PQXX_LIBEXPORT conversion_overrun : conversion_error
-{
-  explicit conversion_overrun(std::string const &);
-};
-
-
-/// Something is out of range, similar to std::out_of_range
-struct PQXX_LIBEXPORT range_error : std::out_of_range
-{
-  explicit range_error(std::string const &);
-};
-
-
-/// Query returned an unexpected number of rows.
-struct PQXX_LIBEXPORT unexpected_rows : public range_error
-{
-  explicit unexpected_rows(std::string const &msg) : range_error{msg} {}
-};
-
-
-/// Database feature not supported in current setup.
-struct PQXX_LIBEXPORT feature_not_supported : sql_error
-{
-  explicit feature_not_supported(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Error in data provided to SQL statement.
-struct PQXX_LIBEXPORT data_exception : sql_error
-{
-  explicit data_exception(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT integrity_constraint_violation : sql_error
-{
-  explicit integrity_constraint_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT restrict_violation : integrity_constraint_violation
-{
-  explicit restrict_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT not_null_violation : integrity_constraint_violation
-{
-  explicit not_null_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT foreign_key_violation : integrity_constraint_violation
-{
-  explicit foreign_key_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT unique_violation : integrity_constraint_violation
-{
-  explicit unique_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT check_violation : integrity_constraint_violation
-{
-  explicit check_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_cursor_state : sql_error
-{
-  explicit invalid_cursor_state(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_sql_statement_name : sql_error
-{
-  explicit invalid_sql_statement_name(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_cursor_name : sql_error
-{
-  explicit invalid_cursor_name(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT syntax_error : sql_error
-{
-  /// Approximate position in string where error occurred, or -1 if unknown.
-  int const error_position;
-
-  explicit syntax_error(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr, int pos = -1) :
-          sql_error{err, Q, sqlstate}, error_position{pos}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_column : syntax_error
-{
-  explicit undefined_column(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_function : syntax_error
-{
-  explicit undefined_function(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_table : syntax_error
-{
-  explicit undefined_table(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT insufficient_privilege : sql_error
-{
-  explicit insufficient_privilege(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Resource shortage on the server
-struct PQXX_LIBEXPORT insufficient_resources : sql_error
-{
-  explicit insufficient_resources(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT disk_full : insufficient_resources
-{
-  explicit disk_full(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          insufficient_resources{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT out_of_memory : insufficient_resources
-{
-  explicit out_of_memory(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          insufficient_resources{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT too_many_connections : broken_connection
-{
-  explicit too_many_connections(std::string const &err) :
-          broken_connection{err}
-  {}
-};
-
-/// PL/pgSQL error
-/** Exceptions derived from this class are errors from PL/pgSQL procedures.
- */
-struct PQXX_LIBEXPORT plpgsql_error : sql_error
-{
-  explicit plpgsql_error(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Exception raised in PL/pgSQL procedure
-struct PQXX_LIBEXPORT plpgsql_raise : plpgsql_error
-{
-  explicit plpgsql_raise(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT plpgsql_no_data_found : plpgsql_error
-{
-  explicit plpgsql_no_data_found(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT plpgsql_too_many_rows : plpgsql_error
-{
-  explicit plpgsql_too_many_rows(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT blob_already_exists : failure
-{
-  explicit blob_already_exists(std::string const &);
-};
-
-/**
- * @}
- */
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/field b/ext/libpqxx-7.7.3/include/pqxx/field
deleted file mode 100644
index 37cb69e84..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/field
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::field class.
- *
- * pqxx::field refers to a field in a query result.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/field.hxx b/ext/libpqxx-7.7.3/include/pqxx/field.hxx
deleted file mode 100644
index b8b869fe4..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/field.hxx
+++ /dev/null
@@ -1,542 +0,0 @@
-/* Definitions for the pqxx::field class.
- *
- * pqxx::field refers to a field in a query result.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/field instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_FIELD
-#define PQXX_H_FIELD
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <optional>
-
-#include "pqxx/array.hxx"
-#include "pqxx/composite.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/types.hxx"
-
-namespace pqxx
-{
-/// Reference to a field in a result set.
-/** A field represents one entry in a row.  It represents an actual value
- * in the result set, and can be converted to various types.
- */
-class PQXX_LIBEXPORT field
-{
-public:
-  using size_type = field_size_type;
-
-  /// Constructor.  Do not call this yourself; libpqxx will do it for you.
-  /** Create field as reference to a field in a result set.
-   * @param r Row that this field is part of.
-   * @param c Column number of this field.
-   */
-  [[deprecated(
-    "Do not construct fields yourself.  Get them from the row.")]] field(row const &r, row_size_type c) noexcept;
-
-  /// Constructor.  Do not call this yourself; libpqxx will do it for you.
-  [[deprecated(
-    "Do not construct fields yourself.  Get them from the "
-    "row.")]] field() noexcept = default;
-
-  /**
-   * @name Comparison
-   */
-  //@{
-  // TODO: noexcept.  Breaks ABI.
-  /// Byte-by-byte comparison of two fields (all nulls are considered equal)
-  /** @warning null handling is still open to discussion and change!
-   *
-   * Handling of null values differs from that in SQL where a comparison
-   * involving a null value yields null, so nulls are never considered equal
-   * to one another or even to themselves.
-   *
-   * Null handling also probably differs from the closest equivalent in C++,
-   * which is the NaN (Not-a-Number) value, a singularity comparable to
-   * SQL's null.  This is because the builtin == operator demands that a == a.
-   *
-   * The usefulness of this operator is questionable.  No interpretation
-   * whatsoever is imposed on the data; 0 and 0.0 are considered different,
-   * as are null vs. the empty string, or even different (but possibly
-   * equivalent and equally valid) encodings of the same Unicode character
-   * etc.
-   */
-  [[nodiscard]] PQXX_PURE bool operator==(field const &) const;
-
-  /// Byte-by-byte comparison (all nulls are considered equal)
-  /** @warning See operator==() for important information about this operator
-   */
-  [[nodiscard]] PQXX_PURE bool operator!=(field const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Column name.
-  [[nodiscard]] PQXX_PURE char const *name() const &;
-
-  /// Column type.
-  [[nodiscard]] oid PQXX_PURE type() const;
-
-  /// What table did this column come from?
-  [[nodiscard]] PQXX_PURE oid table() const;
-
-  /// Return row number.  The first row is row 0, the second is row 1, etc.
-  PQXX_PURE constexpr row_size_type num() const noexcept { return col(); }
-
-  /// What column number in its originating table did this column come from?
-  [[nodiscard]] PQXX_PURE row_size_type table_column() const;
-  //@}
-
-  /**
-   * @name Content access
-   */
-  //@{
-  /// Read as `string_view`, or an empty one if null.
-  /** The result only remains usable while the data for the underlying
-   * @ref result exists.  Once all `result` objects referring to that data have
-   * been destroyed, the `string_view` will no longer point to valid memory.
-   */
-  [[nodiscard]] PQXX_PURE std::string_view view() const &
-  {
-    return std::string_view(c_str(), size());
-  }
-
-  /// Read as plain C string.
-  /** Since the field's data is stored internally in the form of a
-   * zero-terminated C string, this is the fastest way to read it.  Use the
-   * to() or as() functions to convert the string to other types such as
-   * `int`, or to C++ strings.
-   *
-   * Do not use this for BYTEA values, or other binary values.  To read those,
-   * convert the value to your desired type using `to()` or `as()`.  For
-   * example: `f.as<std::basic_string<std::byte>>()`.
-   */
-  [[nodiscard]] PQXX_PURE char const *c_str() const &;
-
-  /// Is this field's value null?
-  [[nodiscard]] PQXX_PURE bool is_null() const noexcept;
-
-  /// Return number of bytes taken up by the field's value.
-  [[nodiscard]] PQXX_PURE size_type size() const noexcept;
-
-  /// Read value into obj; or if null, leave obj untouched and return `false`.
-  /** This can be used with optional types (except pointers other than C-style
-   * strings).
-   */
-  template<typename T>
-  auto to(T &obj) const -> typename std::enable_if_t<
-    (not std::is_pointer<T>::value or std::is_same<T, char const *>::value),
-    bool>
-  {
-    if (is_null())
-    {
-      return false;
-    }
-    else
-    {
-      auto const bytes{c_str()};
-      from_string(bytes, obj);
-      return true;
-    }
-  }
-
-  /// Read field as a composite value, write its components into `fields`.
-  /** @warning This is still experimental.  It may change or be replaced.
-   *
-   * Returns whether the field was null.  If it was, it will not touch the
-   * values in `fields`.
-   */
-  template<typename... T> bool composite_to(T &...fields) const
-  {
-    if (is_null())
-    {
-      return false;
-    }
-    else
-    {
-      parse_composite(m_home.m_encoding, view(), fields...);
-      return true;
-    }
-  }
-
-  /// Read value into obj; or leave obj untouched and return `false` if null.
-  template<typename T> bool operator>>(T &obj) const { return to(obj); }
-
-  /// Read value into obj; or if null, use default value and return `false`.
-  /** This can be used with `std::optional`, as well as with standard smart
-   * pointer types, but not with raw pointers.  If the conversion from a
-   * PostgreSQL string representation allocates a pointer (e.g. using `new`),
-   * then the object's later deallocation should be baked in as well, right
-   * from the point where the object is created.  So if you want a pointer, use
-   * a smart pointer, not a raw pointer.
-   *
-   * There is one exception, of course: C-style strings.  Those are just
-   * pointers to the field's internal text data.
-   */
-  template<typename T>
-  auto to(T &obj, T const &default_value) const -> typename std::enable_if_t<
-    (not std::is_pointer<T>::value or std::is_same<T, char const *>::value),
-    bool>
-  {
-    bool const null{is_null()};
-    if (null)
-      obj = default_value;
-    else
-      obj = from_string<T>(this->view());
-    return not null;
-  }
-
-  /// Return value as object of given type, or default value if null.
-  /** Note that unless the function is instantiated with an explicit template
-   * argument, the Default value's type also determines the result type.
-   */
-  template<typename T> T as(T const &default_value) const
-  {
-    if (is_null())
-      return default_value;
-    else
-      return from_string<T>(this->view());
-  }
-
-  /// Return value as object of given type, or throw exception if null.
-  /** Use as `as<std::optional<int>>()` or `as<my_untemplated_optional_t>()` as
-   * an alternative to `get<int>()`; this is disabled for use with raw pointers
-   * (other than C-strings) because storage for the value can't safely be
-   * allocated here
-   */
-  template<typename T> T as() const
-  {
-    if (is_null())
-    {
-      if constexpr (not nullness<T>::has_null)
-        internal::throw_null_conversion(type_name<T>);
-      else
-        return nullness<T>::null();
-    }
-    else
-    {
-      return from_string<T>(this->view());
-    }
-  }
-
-  /// Return value wrapped in some optional type (empty for nulls).
-  /** Use as `get<int>()` as before to obtain previous behavior, or specify
-   * container type with `get<int, std::optional>()`
-   */
-  template<typename T, template<typename> class O = std::optional>
-  constexpr O<T> get() const
-  {
-    return as<O<T>>();
-  }
-
-  // TODO: constexpr noexcept, once array_parser constructor gets those.
-  /// Parse the field as an SQL array.
-  /** Call the parser to retrieve values (and structure) from the array.
-   *
-   * Make sure the @ref result object stays alive until parsing is finished. If
-   * you keep the @ref row of `field` object alive, it will keep the @ref
-   * result object alive as well.
-   */
-  array_parser as_array() const &
-  {
-    return array_parser{c_str(), m_home.m_encoding};
-  }
-  //@}
-
-
-protected:
-  constexpr result const &home() const noexcept { return m_home; }
-  constexpr result::size_type idx() const noexcept { return m_row; }
-  constexpr row_size_type col() const noexcept { return m_col; }
-
-  // TODO: Create gates.
-  friend class pqxx::result;
-  friend class pqxx::row;
-  field(
-    result const &r, result_size_type row_num, row_size_type col_num) noexcept
-          :
-          m_col{col_num}, m_home{r}, m_row{row_num}
-  {}
-
-  /**
-   * You'd expect this to be unsigned, but due to the way reverse iterators
-   * are related to regular iterators, it must be allowed to underflow to -1.
-   */
-  row_size_type m_col;
-
-private:
-  result m_home;
-  result::size_type m_row;
-};
-
-
-template<> inline bool field::to<std::string>(std::string &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = std::string{view()};
-  return not null;
-}
-
-
-template<>
-inline bool field::to<std::string>(
-  std::string &obj, std::string const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = std::string{view()};
-  return not null;
-}
-
-
-/// Specialization: `to(char const *&)`.
-/** The buffer has the same lifetime as the data in this result (i.e. of this
- * result object, or the last remaining one copied from it etc.), so take care
- * not to use it after the last result object referring to this query result is
- * destroyed.
- */
-template<> inline bool field::to<char const *>(char const *&obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = c_str();
-  return not null;
-}
-
-
-template<> inline bool field::to<std::string_view>(std::string_view &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = view();
-  return not null;
-}
-
-
-template<>
-inline bool field::to<std::string_view>(
-  std::string_view &obj, std::string_view const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = view();
-  return not null;
-}
-
-
-template<> inline std::string_view field::as<std::string_view>() const
-{
-  if (is_null())
-    PQXX_UNLIKELY
-  internal::throw_null_conversion(type_name<std::string_view>);
-  return view();
-}
-
-
-template<>
-inline std::string_view
-field::as<std::string_view>(std::string_view const &default_value) const
-{
-  return is_null() ? default_value : view();
-}
-
-
-template<> inline bool field::to<zview>(zview &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = zview{c_str(), size()};
-  return not null;
-}
-
-
-template<>
-inline bool field::to<zview>(zview &obj, zview const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = zview{c_str(), size()};
-  return not null;
-}
-
-
-template<> inline zview field::as<zview>() const
-{
-  if (is_null())
-    PQXX_UNLIKELY
-  internal::throw_null_conversion(type_name<zview>);
-  return zview{c_str(), size()};
-}
-
-
-template<> inline zview field::as<zview>(zview const &default_value) const
-{
-  return is_null() ? default_value : zview{c_str(), size()};
-}
-
-
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class field_streambuf : public std::basic_streambuf<CHAR, TRAITS>
-{
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-  using openmode = std::ios::openmode;
-  using seekdir = std::ios::seekdir;
-
-  explicit field_streambuf(field const &f) : m_field{f} { initialize(); }
-
-protected:
-  virtual int sync() override { return traits_type::eof(); }
-
-  virtual pos_type seekoff(off_type, seekdir, openmode) override
-  {
-    return traits_type::eof();
-  }
-  virtual pos_type seekpos(pos_type, openmode) override
-  {
-    return traits_type::eof();
-  }
-  virtual int_type overflow(int_type) override { return traits_type::eof(); }
-  virtual int_type underflow() override { return traits_type::eof(); }
-
-private:
-  field const &m_field;
-
-  int_type initialize()
-  {
-    auto g{static_cast<char_type *>(const_cast<char *>(m_field.c_str()))};
-    this->setg(g, g, g + std::size(m_field));
-    return int_type(std::size(m_field));
-  }
-};
-
-
-/// Input stream that gets its data from a result field
-/** Use this class exactly as you would any other istream to read data from a
- * field.  All formatting and streaming operations of `std::istream` are
- * supported.  What you'll typically want to use, however, is the fieldstream
- * alias (which defines a @ref basic_fieldstream for `char`).  This is similar
- * to how e.g. `std::ifstream` relates to `std::basic_ifstream`.
- *
- * This class has only been tested for the char type (and its default traits).
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_fieldstream : public std::basic_istream<CHAR, TRAITS>
-{
-  using super = std::basic_istream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-  basic_fieldstream(field const &f) : super{nullptr}, m_buf{f}
-  {
-    super::init(&m_buf);
-  }
-
-private:
-  field_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using fieldstream = basic_fieldstream<char>;
-
-/// Write a result field to any type of stream
-/** This can be convenient when writing a field to an output stream.  More
- * importantly, it lets you write a field to e.g. a `stringstream` which you
- * can then use to read, format and convert the field in ways that to() does
- * not support.
- *
- * Example: parse a field into a variable of the nonstandard
- * "<tt>long long</tt>" type.
- *
- * ```cxx
- * extern result R;
- * long long L;
- * stringstream S;
- *
- * // Write field's string into S
- * S << R[0][0];
- *
- * // Parse contents of S into L
- * S >> L;
- * ```
- */
-template<typename CHAR>
-inline std::basic_ostream<CHAR> &
-operator<<(std::basic_ostream<CHAR> &s, field const &value)
-{
-  s.write(value.c_str(), std::streamsize(std::size(value)));
-  return s;
-}
-
-
-/// Convert a field's value to type `T`.
-/** Unlike the "regular" `from_string`, this knows how to deal with null
- * values.
- */
-template<typename T> inline T from_string(field const &value)
-{
-  if (value.is_null())
-  {
-    if constexpr (nullness<T>::has_null)
-      return nullness<T>::null();
-    else
-      internal::throw_null_conversion(type_name<T>);
-  }
-  else
-  {
-    return from_string<T>(value.view());
-  }
-}
-
-
-/// Convert a field's value to `nullptr_t`.
-/** Yes, you read that right.  This conversion does nothing useful.  It always
- * returns `nullptr`.
- *
- * Except... what if the field is not null?  In that case, this throws
- * @ref conversion_error.
- */
-template<>
-inline std::nullptr_t from_string<std::nullptr_t>(field const &value)
-{
-  if (not value.is_null())
-    throw conversion_error{
-      "Extracting non-null field into nullptr_t variable."};
-  return nullptr;
-}
-
-
-/// Convert a field to a string.
-template<> PQXX_LIBEXPORT std::string to_string(field const &value);
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/array-composite.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/array-composite.hxx
deleted file mode 100644
index d2b6603e5..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/array-composite.hxx
+++ /dev/null
@@ -1,305 +0,0 @@
-#if !defined(PQXX_ARRAY_COMPOSITE_HXX)
-#  define PQXX_ARRAY_COMPOSITE_HXX
-
-#  include <cassert>
-
-#  include "pqxx/strconv.hxx"
-
-namespace pqxx::internal
-{
-// Find the end of a double-quoted string.
-/** `input[pos]` must be the opening double quote.
- *
- * Returns the offset of the first position after the closing quote.
- */
-inline std::size_t scan_double_quoted_string(
-  char const input[], std::size_t size, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  // XXX: find_char<'"', '\\'>().
-  auto next{scan(input, size, pos)};
-  bool at_quote{false};
-  for (pos = next, next = scan(input, size, pos); pos < size;
-       pos = next, next = scan(input, size, pos))
-  {
-    if (at_quote)
-    {
-      if (next - pos == 1 and input[pos] == '"')
-      {
-        // We just read a pair of double quotes.  Carry on.
-        at_quote = false;
-      }
-      else
-      {
-        // We just read one double quote, and now we're at a character that's
-        // not a second double quote.  Ergo, that last character was the
-        // closing double quote and this is the position right after it.
-        return pos;
-      }
-    }
-    else if (next - pos == 1)
-    {
-      switch (input[pos])
-      {
-      case '\\':
-        // Backslash escape.  Skip ahead by one more character.
-        pos = next;
-        next = scan(input, size, pos);
-        break;
-
-      case '"':
-        // This is either the closing double quote, or the first of a pair of
-        // double quotes.
-        at_quote = true;
-        break;
-      }
-    }
-    else
-    {
-      // Multibyte character.  Carry on.
-    }
-  }
-  if (not at_quote)
-    throw argument_error{
-      "Missing closing double-quote: " + std::string{input}};
-  return pos;
-}
-
-
-/// Un-quote and un-escape a double-quoted SQL string.
-inline std::string parse_double_quoted_string(
-  char const input[], std::size_t end, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  std::string output;
-  // Maximum output size is same as the input size, minus the opening and
-  // closing quotes.  Or in the extreme opposite case, the real number could be
-  // half that.  Usually it'll be a pretty close estimate.
-  output.reserve(std::size_t(end - pos - 2));
-
-  for (auto here{scan(input, end, pos)}, next{scan(input, end, here)};
-       here < end - 1; here = next, next = scan(input, end, here))
-  {
-    // A backslash here is always an escape.  So is a double-quote, since we're
-    // inside the double-quoted string.  In either case, we can just ignore the
-    // escape character and use the next character.  This is the one redeeming
-    // feature of SQL's escaping system.
-    if ((next - here == 1) and (input[here] == '\\' or input[here] == '"'))
-    {
-      // Skip escape.
-      here = next;
-      next = scan(input, end, here);
-    }
-    output.append(input + here, input + next);
-  }
-  return output;
-}
-
-
-/// Find the end of an unquoted string in an array or composite-type value.
-/** Stops when it gets to the end of the input; or when it sees any of the
- * characters in STOP which has not been escaped.
- *
- * For array values, STOP is a comma, a semicolon, or a closing brace.  For
- * a value of a composite type, STOP is a comma or a closing parenthesis.
- */
-template<char... STOP>
-inline std::size_t scan_unquoted_string(
-  char const input[], std::size_t size, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  bool at_backslash{false};
-  auto next{scan(input, size, pos)};
-  while ((pos < size) and
-         ((next - pos) > 1 or at_backslash or ((input[pos] != STOP) and ...)))
-  {
-    pos = next;
-    next = scan(input, size, pos);
-    at_backslash =
-      ((not at_backslash) and ((next - pos) == 1) and (input[pos] == '\\'));
-  }
-  return pos;
-}
-
-
-/// Parse an unquoted array entry or cfield of a composite-type field.
-inline std::string parse_unquoted_string(
-  char const input[], std::size_t end, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  std::string output;
-  bool at_backslash{false};
-  output.reserve(end - pos);
-  for (auto next{scan(input, end, pos)}; pos < end;
-       pos = next, next = scan(input, end, pos))
-  {
-    at_backslash =
-      ((not at_backslash) and ((next - pos) == 1) and (input[pos] == '\\'));
-    if (not at_backslash)
-      output.append(input + pos, next - pos);
-  }
-  return output;
-}
-
-
-/// Parse a field of a composite-type value.
-/** `T` is the C++ type of the field we're parsing, and `index` is its
- * zero-based number.
- *
- * Strip off the leading parenthesis or bracket yourself before parsing.
- * However, this function will parse the lcosing parenthesis or bracket.
- *
- * After a successful parse, `pos` will point at `std::end(text)`.
- *
- * For the purposes of parsing, ranges and arrays count as compositve values,
- * so this function supports parsing those.  If you specifically need a closing
- * parenthesis, check afterwards that `text` did not end in a bracket instead.
- *
- * @param index Index of the current field, zero-based.  It will increment for
- *     the next field.
- * @param input Full input text for the entire composite-type value.
- * @param pos Starting position (in `input`) of the field that we're parsing.
- *     After parsing, this will point at the beginning of the next field if
- *     there is one, or one position past the last character otherwise.
- * @param field Destination for the parsed value.
- * @param scan Glyph scanning function for the relevant encoding type.
- * @param last_field Number of the last field in the value (zero-based).  When
- *     parsing the last field, this will equal `index`.
- */
-template<typename T>
-inline void parse_composite_field(
-  std::size_t &index, std::string_view input, std::size_t &pos, T &field,
-  glyph_scanner_func *scan, std::size_t last_field)
-{
-  assert(index <= last_field);
-  auto next{scan(std::data(input), std::size(input), pos)};
-  if ((next - pos) != 1)
-    throw conversion_error{"Non-ASCII character in composite-type syntax."};
-
-  // Expect a field.
-  switch (input[pos])
-  {
-  case ',':
-  case ')':
-  case ']':
-    // The field is empty, i.e, null.
-    if constexpr (nullness<T>::has_null)
-      field = nullness<T>::null();
-    else
-      throw conversion_error{
-        "Can't read composite field " + to_string(index) + ": C++ type " +
-        type_name<T> + " does not support nulls."};
-    break;
-
-  case '"': {
-    auto const stop{scan_double_quoted_string(
-      std::data(input), std::size(input), pos, scan)};
-    auto const text{
-      parse_double_quoted_string(std::data(input), stop, pos, scan)};
-    field = from_string<T>(text);
-    pos = stop;
-  }
-  break;
-
-  default: {
-    auto const stop{scan_unquoted_string<',', ')', ']'>(
-      std::data(input), std::size(input), pos, scan)};
-    auto const text{parse_unquoted_string(std::data(input), stop, pos, scan)};
-    field = from_string<T>(text);
-    pos = stop;
-  }
-  break;
-  }
-
-  // Expect a comma or a closing parenthesis.
-  next = scan(std::data(input), std::size(input), pos);
-
-  if ((next - pos) != 1)
-    throw conversion_error{
-      "Unexpected non-ASCII character after composite field: " +
-      std::string{input}};
-
-  if (index < last_field)
-  {
-    if (input[pos] != ',')
-      throw conversion_error{
-        "Found '" + std::string{input[pos]} +
-        "' in composite value where comma was expected: " + std::data(input)};
-  }
-  else
-  {
-    if (input[pos] == ',')
-      throw conversion_error{
-        "Composite value contained more fields than the expected " +
-        to_string(last_field) + ": " + std::data(input)};
-    if (input[pos] != ')' and input[pos] != ']')
-      throw conversion_error{
-        "Composite value has unexpected characters where closing parenthesis "
-        "was expected: " +
-        std::string{input}};
-    if (next != std::size(input))
-      throw conversion_error{
-        "Composite value has unexpected text after closing parenthesis: " +
-        std::string{input}};
-  }
-
-  pos = next;
-  ++index;
-}
-
-
-/// Conservatively estimate buffer size needed for a composite field.
-template<typename T>
-inline std::size_t size_composite_field_buffer(T const &field)
-{
-  if constexpr (is_unquoted_safe<T>)
-  {
-    // Safe to copy, without quotes or escaping.  Drop the terminating zero.
-    return size_buffer(field) - 1;
-  }
-  else
-  {
-    // + Opening quote.
-    // + Field budget.
-    // - Terminating zero.
-    // + Escaping for each byte in the field's string representation.
-    // - Escaping for terminating zero.
-    // + Closing quote.
-    return 1 + 2 * (size_buffer(field) - 1) + 1;
-  }
-}
-
-
-template<typename T>
-inline void write_composite_field(char *&pos, char *end, T const &field)
-{
-  if constexpr (is_unquoted_safe<T>)
-  {
-    // No need for quoting or escaping.  Convert it straight into its final
-    // place in the buffer, and "backspace" the trailing zero.
-    pos = string_traits<T>::into_buf(pos, end, field) - 1;
-  }
-  else
-  {
-    // The field may need escaping, which means we need an intermediate buffer.
-    // To avoid allocating that at run time, we use the end of the buffer that
-    // we have.
-    auto const budget{size_buffer(field)};
-    *pos++ = '"';
-
-    // Now escape buf into its final position.
-    for (char const c : string_traits<T>::to_buf(end - budget, end, field))
-    {
-      if ((c == '"') or (c == '\\'))
-        *pos++ = '\\';
-
-      *pos++ = c;
-    }
-
-    *pos++ = '"';
-  }
-
-  *pos++ = ',';
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/callgate.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/callgate.hxx
deleted file mode 100644
index 42f7703e3..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/callgate.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef PQXX_H_CALLGATE
-#define PQXX_H_CALLGATE
-
-/*
-Here's what a typical gate class definition looks like:
-
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE @gateclass@ : callgate<@host@>
-{
-  friend class @client@;
-
-  @gateclass@(reference x) : super(x) {}
-
-  // Methods here.  Use home() to access the host-class object.
-};
-} // namespace pqxx::internal::gate
-*/
-
-namespace pqxx::internal
-{
-/// Base class for call gates.
-/**
- * A call gate defines a limited, private interface on the host class that
- * specified client classes can access.
- *
- * The metaphor works as follows: the gate stands in front of a "home," which
- * is really a class, and only lets specific friends in.
- *
- * To implement a call gate that gives client C access to host H,
- * * derive a gate class from callgate<H>;
- * * make the gate class a friend of H;
- * * make C a friend of the gate class; and
- * * implement "stuff C can do with H" as private members in the gate class.
- *
- * This special kind of "gated" friendship gives C private access to H, but
- * only through an expressly limited interface.  The gate class can access its
- * host object as home().
- *
- * Keep gate classes entirely stateless.  They should be ultra-lightweight
- * wrappers for their host classes, and be optimized away as much as possible
- * by the compiler.  Once you start adding state, you're on a slippery slope
- * away from the pure, clean, limited interface pattern that gate classes are
- * meant to implement.
- *
- * Ideally, all member functions of the gate class should be one-liners passing
- * calls straight on to the host class.  It can be useful however to break this
- * rule temporarily during inter-class refactoring.
- */
-template<typename HOME> class PQXX_PRIVATE callgate
-{
-protected:
-  /// This class, to keep constructors easy.
-  using super = callgate<HOME>;
-  /// A reference to the host class.  Helps keep constructors easy.
-  using reference = HOME &;
-
-  callgate(reference x) : m_home(x) {}
-
-  /// The home object.  The gate class has full "private" access.
-  reference home() const noexcept { return m_home; }
-
-private:
-  reference m_home;
-};
-} // namespace pqxx::internal
-
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/concat.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/concat.hxx
deleted file mode 100644
index cd28bde7c..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/concat.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#if !defined(PQXX_CONCAT_HXX)
-#  define PQXX_CONCAT_HXX
-
-#  include <string>
-#  include <string_view>
-
-#  include "pqxx/strconv.hxx"
-
-namespace pqxx::internal
-{
-/// Convert item to a string, write it into [here, end).
-template<typename TYPE>
-void render_item(TYPE const &item, char *&here, char *end)
-{
-  here = string_traits<TYPE>::into_buf(here, end, item) - 1;
-}
-
-
-// C++20: Support non-random_access_range ranges.
-/// Efficiently combine a bunch of items into one big string.
-/** Use this as an optimised version of string concatentation.  It takes just
- * about any type; it will represent each item as a string according to its
- * @ref string_traits.
- *
- * This is a simpler, more specialised version of @ref separated_list for a
- * statically known series of items, possibly of different types.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::string concat(TYPE... item)
-{
-  std::string buf;
-  // Size to accommodate string representations of all inputs, minus their
-  // terminating zero bytes.
-  buf.resize(size_buffer(item...));
-
-  char *const data{buf.data()};
-  char *here = data;
-  char *end = data + std::size(buf);
-  (render_item(item, here, end), ...);
-
-  buf.resize(static_cast<std::size_t>(here - data));
-  return buf;
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/conversions.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/conversions.hxx
deleted file mode 100644
index 1df4fdead..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/conversions.hxx
+++ /dev/null
@@ -1,1188 +0,0 @@
-#include <array>
-#include <cstring>
-#include <map>
-#include <memory>
-#include <numeric>
-#include <optional>
-
-#if defined(PQXX_HAVE_SPAN) && __has_include(<span>)
-#  include <span>
-#endif
-
-#include <type_traits>
-#include <variant>
-#include <vector>
-
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-
-
-/* Internal helpers for string conversion, and conversion implementations.
- *
- * Do not include this header directly.  The libpqxx headers do it for you.
- */
-namespace pqxx::internal
-{
-/// Convert a number in [0, 9] to its ASCII digit.
-inline constexpr char number_to_digit(int i) noexcept
-{
-  return static_cast<char>(i + '0');
-}
-
-
-/// Compute numeric value of given textual digit (assuming that it is a digit).
-constexpr int digit_to_number(char c) noexcept
-{
-  return c - '0';
-}
-
-
-/// Summarize buffer overrun.
-/** Don't worry about the exact parameter types: the sizes will be reasonably
- * small, and nonnegative.
- */
-std::string PQXX_LIBEXPORT
-state_buffer_overrun(int have_bytes, int need_bytes);
-
-
-template<typename HAVE, typename NEED>
-inline std::string state_buffer_overrun(HAVE have_bytes, NEED need_bytes)
-{
-  return state_buffer_overrun(
-    static_cast<int>(have_bytes), static_cast<int>(need_bytes));
-}
-
-
-/// Throw exception for attempt to convert null to given type.
-[[noreturn]] PQXX_LIBEXPORT void
-throw_null_conversion(std::string const &type);
-
-
-/// Deliberately nonfunctional conversion traits for `char` types.
-/** There are no string conversions for `char` and its signed and unsigned
- * variants.  Such a conversion would be dangerously ambiguous: should we treat
- * it as text, or as a small integer?  It'd be an open invitation for bugs.
- *
- * But the error message when you get this wrong is very cryptic.  So, we
- * derive dummy @ref string_traits implementations from this dummy type, and
- * ensure that the compiler disallows their use.  The compiler error message
- * will at least contain a hint of the root of the problem.
- */
-template<typename CHAR_TYPE> struct disallowed_ambiguous_char_conversion
-{
-  static char *into_buf(char *, char *, CHAR_TYPE) = delete;
-  static constexpr zview
-  to_buf(char *, char *, CHAR_TYPE const &) noexcept = delete;
-
-  static constexpr std::size_t
-  size_buffer(CHAR_TYPE const &) noexcept = delete;
-  static CHAR_TYPE from_string(std::string_view) = delete;
-};
-
-
-template<typename T> PQXX_LIBEXPORT extern std::string to_string_float(T);
-
-
-/// Generic implementation for into_buf, on top of to_buf.
-template<typename T>
-inline char *generic_into_buf(char *begin, char *end, T const &value)
-{
-  zview const text{string_traits<T>::to_buf(begin, end, value)};
-  auto const space{end - begin};
-  // Include the trailing zero.
-  auto const len = std::size(text) + 1;
-  if (internal::cmp_greater(len, space))
-    throw conversion_overrun{
-      "Not enough buffer space to insert " + type_name<T> + ".  " +
-      state_buffer_overrun(space, len)};
-  std::memmove(begin, text.data(), len);
-  return begin + len;
-}
-
-
-/// String traits for builtin integral types (though not bool).
-template<typename T> struct integral_traits
-{
-  static PQXX_LIBEXPORT T from_string(std::string_view text);
-  static PQXX_LIBEXPORT zview to_buf(char *begin, char *end, T const &value);
-  static PQXX_LIBEXPORT char *into_buf(char *begin, char *end, T const &value);
-
-  static constexpr std::size_t size_buffer(T const &) noexcept
-  {
-    /** Includes a sign if needed; the number of base-10 digits which the type
-     * can reliably represent; the one extra base-10 digit which the type can
-     * only partially represent; and the terminating zero.
-     */
-    return std::is_signed_v<T> + std::numeric_limits<T>::digits10 + 1 + 1;
-  }
-};
-
-
-/// String traits for builtin floating-point types.
-template<typename T> struct float_traits
-{
-  static PQXX_LIBEXPORT T from_string(std::string_view text);
-  static PQXX_LIBEXPORT zview to_buf(char *begin, char *end, T const &value);
-  static PQXX_LIBEXPORT char *into_buf(char *begin, char *end, T const &value);
-
-  // Return a nonnegative integral value's number of decimal digits.
-  static constexpr std::size_t digits10(std::size_t value) noexcept
-  {
-    if (value < 10)
-      return 1;
-    else
-      return 1 + digits10(value / 10);
-  }
-
-  static constexpr std::size_t size_buffer(T const &) noexcept
-  {
-    using lims = std::numeric_limits<T>;
-    // See #328 for a detailed discussion on the maximum number of digits.
-    //
-    // In a nutshell: for the big cases, the scientific notation is always
-    // the shortest one, and therefore the one that to_chars will pick.
-    //
-    // So... How long can the scientific notation get?  1 (for sign) + 1 (for
-    // decimal point) + 1 (for 'e') + 1 (for exponent sign) + max_digits10 +
-    // max number of digits in the exponent + 1 (terminating zero).
-    //
-    // What's the max number of digits in the exponent?  It's the max number of
-    // digits out of the most negative exponent and the most positive one.
-    //
-    // The longest positive exponent is easy: 1 + ceil(log10(max_exponent10)).
-    // (The extra 1 is because 10^n takes up 1 + n digits, not n.)
-    //
-    // The longest negative exponent is a bit harder: min_exponent10 gives us
-    // the smallest power of 10 which a normalised version of T can represent.
-    // But the smallest denormalised power of 10 that T can represent is
-    // another max_digits10 powers of 10 below that.
-    // needs a minus sign.
-    //
-    // All this stuff messes with my head a bit because it's on the order of
-    // log10(log10(n)).  It's easy to get the number of logs wrong.
-    auto const max_pos_exp{digits10(lims::max_exponent10)};
-    // Really want std::abs(lims::min_exponent10), but MSVC 2017 apparently has
-    // problems with std::abs.  So we use -lims::min_exponent10 instead.
-    auto const max_neg_exp{
-      digits10(lims::max_digits10 - lims::min_exponent10)};
-    return 1 +                                    // Sign.
-           1 +                                    // Decimal point.
-           std::numeric_limits<T>::max_digits10 + // Mantissa digits.
-           1 +                                    // Exponent "e".
-           1 +                                    // Exponent sign.
-           // Spell this weirdly to stop Windows compilers from reading this as
-           // a call to their "max" macro when NOMINMAX is not defined.
-           (std::max)(max_pos_exp, max_neg_exp) + // Exponent digits.
-           1;                                     // Terminating zero.
-  }
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// The built-in arithmetic types do not have inherent null values.
-template<typename T>
-struct nullness<T, std::enable_if_t<std::is_arithmetic_v<T>>> : no_null<T>
-{};
-
-
-template<> struct string_traits<short> : internal::integral_traits<short>
-{};
-template<> inline constexpr bool is_unquoted_safe<short>{true};
-template<>
-struct string_traits<unsigned short>
-        : internal::integral_traits<unsigned short>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned short>{true};
-template<> struct string_traits<int> : internal::integral_traits<int>
-{};
-template<> inline constexpr bool is_unquoted_safe<int>{true};
-template<> struct string_traits<unsigned> : internal::integral_traits<unsigned>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned>{true};
-template<> struct string_traits<long> : internal::integral_traits<long>
-{};
-template<> inline constexpr bool is_unquoted_safe<long>{true};
-template<>
-struct string_traits<unsigned long> : internal::integral_traits<unsigned long>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned long>{true};
-template<>
-struct string_traits<long long> : internal::integral_traits<long long>
-{};
-template<> inline constexpr bool is_unquoted_safe<long long>{true};
-template<>
-struct string_traits<unsigned long long>
-        : internal::integral_traits<unsigned long long>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned long long>{true};
-template<> struct string_traits<float> : internal::float_traits<float>
-{};
-template<> inline constexpr bool is_unquoted_safe<float>{true};
-template<> struct string_traits<double> : internal::float_traits<double>
-{};
-template<> inline constexpr bool is_unquoted_safe<double>{true};
-template<>
-struct string_traits<long double> : internal::float_traits<long double>
-{};
-template<> inline constexpr bool is_unquoted_safe<long double>{true};
-
-
-template<> struct string_traits<bool>
-{
-  static PQXX_LIBEXPORT bool from_string(std::string_view text);
-
-  static constexpr zview to_buf(char *, char *, bool const &value) noexcept
-  {
-    return value ? "true"_zv : "false"_zv;
-  }
-
-  static char *into_buf(char *begin, char *end, bool const &value)
-  {
-    return pqxx::internal::generic_into_buf(begin, end, value);
-  }
-
-  static constexpr std::size_t size_buffer(bool const &) noexcept { return 6; }
-};
-
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<char>
-        : internal::disallowed_ambiguous_char_conversion<char>
-{};
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<signed char>
-        : internal::disallowed_ambiguous_char_conversion<signed char>
-{};
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<unsigned char>
-        : internal::disallowed_ambiguous_char_conversion<unsigned char>
-{};
-
-
-template<> inline constexpr bool is_unquoted_safe<bool>{true};
-
-
-template<typename T> struct nullness<std::optional<T>>
-{
-  static constexpr bool has_null = true;
-  /// Technically, you could have an optional of an always-null type.
-  static constexpr bool always_null = nullness<T>::always_null;
-  static constexpr bool is_null(std::optional<T> const &v) noexcept
-  {
-    return ((not v.has_value()) or pqxx::is_null(*v));
-  }
-  static constexpr std::optional<T> null() { return {}; }
-};
-
-
-template<typename T>
-inline constexpr format param_format(std::optional<T> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T> struct string_traits<std::optional<T>>
-{
-  static char *into_buf(char *begin, char *end, std::optional<T> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-
-  static zview to_buf(char *begin, char *end, std::optional<T> const &value)
-  {
-    if (value.has_value())
-      return string_traits<T>::to_buf(begin, end, *value);
-    else
-      return {};
-  }
-
-  static std::optional<T> from_string(std::string_view text)
-  {
-    return std::optional<T>{
-      std::in_place, string_traits<T>::from_string(text)};
-  }
-
-  static std::size_t size_buffer(std::optional<T> const &value) noexcept
-  {
-    return pqxx::size_buffer(value.value());
-  }
-};
-
-
-template<typename T>
-inline constexpr bool is_unquoted_safe<std::optional<T>>{is_unquoted_safe<T>};
-
-
-template<typename... T> struct nullness<std::variant<T...>>
-{
-  static constexpr bool has_null = (nullness<T>::has_null or ...);
-  static constexpr bool always_null = (nullness<T>::always_null and ...);
-  static constexpr bool is_null(std::variant<T...> const &value) noexcept
-  {
-    return std::visit(
-      [](auto const &i) noexcept {
-        return nullness<strip_t<decltype(i)>>::is_null(i);
-      },
-      value);
-  }
-
-  // We don't support `null()` for `std::variant`.
-  /** It would be technically possible to have a `null` in the case where just
-   * one of the types has a null, but it gets complicated and arbitrary.
-   */
-  static constexpr std::variant<T...> null() = delete;
-};
-
-
-template<typename... T> struct string_traits<std::variant<T...>>
-{
-  static char *
-  into_buf(char *begin, char *end, std::variant<T...> const &value)
-  {
-    return std::visit(
-      [begin, end](auto const &i) {
-        return string_traits<strip_t<decltype(i)>>::into_buf(begin, end, i);
-      },
-      value);
-  }
-  static zview to_buf(char *begin, char *end, std::variant<T...> const &value)
-  {
-    return std::visit(
-      [begin, end](auto const &i) {
-        return string_traits<strip_t<decltype(i)>>::to_buf(begin, end, i);
-      },
-      value);
-  }
-  static std::size_t size_buffer(std::variant<T...> const &value) noexcept
-  {
-    return std::visit(
-      [](auto const &i) noexcept { return pqxx::size_buffer(i); }, value);
-  }
-
-  /** There's no from_string for std::variant.  We could have one with a rule
-   * like "pick the first type which fits the value," but we'd have to look
-   * into how natural that API feels to users.
-   */
-  static std::variant<T...> from_string(std::string_view) = delete;
-};
-
-
-template<typename... Args>
-inline constexpr format param_format(std::variant<Args...> const &value)
-{
-  return std::visit([](auto &v) { return param_format(v); }, value);
-}
-
-
-template<typename... T>
-inline constexpr bool is_unquoted_safe<std::variant<T...>>{
-  (is_unquoted_safe<T> and ...)};
-
-
-template<typename T> inline T from_string(std::stringstream const &text)
-{
-  return from_string<T>(text.str());
-}
-
-
-template<> struct string_traits<std::nullptr_t>
-{
-  static char *into_buf(char *, char *, std::nullptr_t) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::nullptr_t const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::nullptr_t = nullptr) noexcept
-  {
-    return 0;
-  }
-  static std::nullptr_t from_string(std::string_view) = delete;
-};
-
-
-template<> struct string_traits<std::nullopt_t>
-{
-  static char *into_buf(char *, char *, std::nullopt_t) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::nullopt_t const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::nullopt_t) noexcept
-  {
-    return 0;
-  }
-  static std::nullopt_t from_string(std::string_view) = delete;
-};
-
-
-template<> struct string_traits<std::monostate>
-{
-  static char *into_buf(char *, char *, std::monostate) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::monostate const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::monostate) noexcept
-  {
-    return 0;
-  }
-  static std::monostate from_string(std::string_view) = delete;
-};
-
-
-template<> inline constexpr bool is_unquoted_safe<std::nullptr_t>{true};
-
-
-template<> struct nullness<char const *>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(char const *t) noexcept
-  {
-    return t == nullptr;
-  }
-  static constexpr char const *null() noexcept { return nullptr; }
-};
-
-
-/// String traits for C-style string ("pointer to char const").
-template<> struct string_traits<char const *>
-{
-  static char const *from_string(std::string_view text) { return text.data(); }
-
-  static zview to_buf(char *begin, char *end, char const *const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, char const *const &value)
-  {
-    auto const space{end - begin};
-    // Count the trailing zero, even though std::strlen() and friends don't.
-    auto const len{std::strlen(value) + 1};
-    if (space < ptrdiff_t(len))
-      throw conversion_overrun{
-        "Could not copy string: buffer too small.  " +
-        pqxx::internal::state_buffer_overrun(space, len)};
-    std::memmove(begin, value, len);
-    return begin + len;
-  }
-
-  static std::size_t size_buffer(char const *const &value) noexcept
-  {
-    return std::strlen(value) + 1;
-  }
-};
-
-
-template<> struct nullness<char *>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(char const *t) noexcept
-  {
-    return t == nullptr;
-  }
-  static constexpr char const *null() { return nullptr; }
-};
-
-
-/// String traits for non-const C-style string ("pointer to char").
-template<> struct string_traits<char *>
-{
-  static char *into_buf(char *begin, char *end, char *const &value)
-  {
-    return string_traits<char const *>::into_buf(begin, end, value);
-  }
-  static zview to_buf(char *begin, char *end, char *const &value)
-  {
-    return string_traits<char const *>::to_buf(begin, end, value);
-  }
-  static std::size_t size_buffer(char *const &value) noexcept
-  {
-    return string_traits<char const *>::size_buffer(value);
-  }
-
-  /// Don't allow conversion to this type since it breaks const-safety.
-  static char *from_string(std::string_view) = delete;
-};
-
-
-template<std::size_t N> struct nullness<char[N]> : no_null<char[N]>
-{};
-
-
-/// String traits for C-style string constant ("array of char").
-/** @warning This assumes that every array-of-char is a C-style string literal.
- * So, it must include a trailing zero. and it must have static duration.
- */
-template<std::size_t N> struct string_traits<char[N]>
-{
-  static constexpr zview
-  to_buf(char *, char *, char const (&value)[N]) noexcept
-  {
-    return zview{value, N - 1};
-  }
-
-  static char *into_buf(char *begin, char *end, char const (&value)[N])
-  {
-    if (internal::cmp_less(end - begin, size_buffer(value)))
-      throw conversion_overrun{
-        "Could not convert char[] to string: too long for buffer."};
-    std::memcpy(begin, value, N);
-    return begin + N;
-  }
-  static constexpr std::size_t size_buffer(char const (&)[N]) noexcept
-  {
-    return N;
-  }
-
-  /// Don't allow conversion to this type.
-  static void from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<std::string> : no_null<std::string>
-{};
-
-
-template<> struct string_traits<std::string>
-{
-  static std::string from_string(std::string_view text)
-  {
-    return std::string{text};
-  }
-
-  static char *into_buf(char *begin, char *end, std::string const &value)
-  {
-    if (internal::cmp_greater_equal(std::size(value), end - begin))
-      throw conversion_overrun{
-        "Could not convert string to string: too long for buffer."};
-    // Include the trailing zero.
-    value.copy(begin, std::size(value));
-    begin[std::size(value)] = '\0';
-    return begin + std::size(value) + 1;
-  }
-
-  static zview to_buf(char *begin, char *end, std::string const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static std::size_t size_buffer(std::string const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-};
-
-
-/// There's no real null for `std::string_view`.
-/** I'm not sure how clear-cut this is: a `string_view` may have a null
- * data pointer, which is analogous to a null `char` pointer.
- */
-template<> struct nullness<std::string_view> : no_null<std::string_view>
-{};
-
-
-/// String traits for `string_view`.
-template<> struct string_traits<std::string_view>
-{
-  static constexpr std::size_t
-  size_buffer(std::string_view const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-
-  static char *into_buf(char *begin, char *end, std::string_view const &value)
-  {
-    if (internal::cmp_greater_equal(std::size(value), end - begin))
-      throw conversion_overrun{
-        "Could not store string_view: too long for buffer."};
-    value.copy(begin, std::size(value));
-    begin[std::size(value)] = '\0';
-    return begin + std::size(value) + 1;
-  }
-
-  /// Don't convert to this type; it has nowhere to store its contents.
-  static std::string_view from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<zview> : no_null<zview>
-{};
-
-
-/// String traits for `zview`.
-template<> struct string_traits<zview>
-{
-  static constexpr std::size_t
-  size_buffer(std::string_view const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-
-  static char *into_buf(char *begin, char *end, zview const &value)
-  {
-    auto const size{std::size(value)};
-    if (internal::cmp_less_equal(end - begin, std::size(value)))
-      throw conversion_overrun{"Not enough buffer space to store this zview."};
-    value.copy(begin, size);
-    begin[size] = '\0';
-    return begin + size + 1;
-  }
-
-  static std::string_view to_buf(char *begin, char *end, zview const &value)
-  {
-    return {into_buf(begin, end, value), std::size(value)};
-  }
-
-  /// Don't convert to this type; it has nowhere to store its contents.
-  static zview from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<std::stringstream> : no_null<std::stringstream>
-{};
-
-
-template<> struct string_traits<std::stringstream>
-{
-  static std::size_t size_buffer(std::stringstream const &) = delete;
-
-  static std::stringstream from_string(std::string_view text)
-  {
-    std::stringstream stream;
-    stream.write(text.data(), std::streamsize(std::size(text)));
-    return stream;
-  }
-
-  static char *into_buf(char *, char *, std::stringstream const &) = delete;
-  static std::string_view
-  to_buf(char *, char *, std::stringstream const &) = delete;
-};
-
-
-template<> struct nullness<std::nullptr_t>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::nullptr_t const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::nullptr_t null() noexcept { return nullptr; }
-};
-
-
-template<> struct nullness<std::nullopt_t>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::nullopt_t const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::nullopt_t null() noexcept { return std::nullopt; }
-};
-
-
-template<> struct nullness<std::monostate>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::monostate const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::monostate null() noexcept { return {}; }
-};
-
-
-template<typename T> struct nullness<std::unique_ptr<T>>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(std::unique_ptr<T> const &t) noexcept
-  {
-    return not t or pqxx::is_null(*t);
-  }
-  static constexpr std::unique_ptr<T> null() { return {}; }
-};
-
-
-template<typename T, typename... Args>
-struct string_traits<std::unique_ptr<T, Args...>>
-{
-  static std::unique_ptr<T> from_string(std::string_view text)
-  {
-    return std::make_unique<T>(string_traits<T>::from_string(text));
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::unique_ptr<T, Args...> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-
-  static zview
-  to_buf(char *begin, char *end, std::unique_ptr<T, Args...> const &value)
-  {
-    if (value)
-      return string_traits<T>::to_buf(begin, end, *value);
-    else
-      return {};
-  }
-
-  static std::size_t
-  size_buffer(std::unique_ptr<T, Args...> const &value) noexcept
-  {
-    return pqxx::size_buffer(*value.get());
-  }
-};
-
-
-template<typename T, typename... Args>
-inline format param_format(std::unique_ptr<T, Args...> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T, typename... Args>
-inline constexpr bool is_unquoted_safe<std::unique_ptr<T, Args...>>{
-  is_unquoted_safe<T>};
-
-
-template<typename T> struct nullness<std::shared_ptr<T>>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(std::shared_ptr<T> const &t) noexcept
-  {
-    return not t or pqxx::is_null(*t);
-  }
-  static constexpr std::shared_ptr<T> null() { return {}; }
-};
-
-
-template<typename T> struct string_traits<std::shared_ptr<T>>
-{
-  static std::shared_ptr<T> from_string(std::string_view text)
-  {
-    return std::make_shared<T>(string_traits<T>::from_string(text));
-  }
-
-  static zview to_buf(char *begin, char *end, std::shared_ptr<T> const &value)
-  {
-    return string_traits<T>::to_buf(begin, end, *value);
-  }
-  static char *
-  into_buf(char *begin, char *end, std::shared_ptr<T> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-  static std::size_t size_buffer(std::shared_ptr<T> const &value) noexcept
-  {
-    return pqxx::size_buffer(*value);
-  }
-};
-
-
-template<typename T> format param_format(std::shared_ptr<T> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T>
-inline constexpr bool is_unquoted_safe<std::shared_ptr<T>>{
-  is_unquoted_safe<T>};
-
-
-template<>
-struct nullness<std::basic_string<std::byte>>
-        : no_null<std::basic_string<std::byte>>
-{};
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<binary DATA> struct nullness<DATA> : no_null<DATA>
-{};
-
-
-template<binary DATA> inline constexpr format param_format(DATA const &)
-{
-  return format::binary;
-}
-
-
-template<binary DATA> struct string_traits<DATA>
-{
-  static std::size_t size_buffer(DATA const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(char *begin, char *end, DATA const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, DATA const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  static DATA from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::basic_string<std::byte> buf;
-    buf.resize(size);
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.data()));
-    return buf;
-  }
-};
-#endif // PQXX_HAVE_CONCEPTS
-
-
-template<> struct string_traits<std::basic_string<std::byte>>
-{
-  static std::size_t
-  size_buffer(std::basic_string<std::byte> const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview
-  to_buf(char *begin, char *end, std::basic_string<std::byte> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::basic_string<std::byte> const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  static std::basic_string<std::byte> from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::basic_string<std::byte> buf;
-    buf.resize(size);
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.data()));
-    return buf;
-  }
-};
-
-
-template<>
-inline constexpr format param_format(std::basic_string<std::byte> const &)
-{
-  return format::binary;
-}
-
-
-template<>
-struct nullness<std::basic_string_view<std::byte>>
-        : no_null<std::basic_string_view<std::byte>>
-{};
-
-
-template<> struct string_traits<std::basic_string_view<std::byte>>
-{
-  static std::size_t
-  size_buffer(std::basic_string_view<std::byte> const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(
-    char *begin, char *end, std::basic_string_view<std::byte> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(
-    char *begin, char *end, std::basic_string_view<std::byte> const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  // There's no from_string, because there's nobody to hold the data.
-};
-
-template<>
-inline constexpr format param_format(std::basic_string_view<std::byte> const &)
-{
-  return format::binary;
-}
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// String traits for SQL arrays.
-template<typename Container> struct array_string_traits
-{
-private:
-  using elt_type = strip_t<value_type<Container>>;
-  using elt_traits = string_traits<elt_type>;
-  static constexpr zview s_null{"NULL"};
-
-public:
-  static zview to_buf(char *begin, char *end, Container const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, Container const &value)
-  {
-    std::size_t const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to convert array to string."};
-
-    char *here = begin;
-    *here++ = '{';
-
-    bool nonempty{false};
-    for (auto const &elt : value)
-    {
-      if (is_null(elt))
-      {
-        s_null.copy(here, std::size(s_null));
-        here += std::size(s_null);
-      }
-      else if constexpr (is_sql_array<elt_type>)
-      {
-        // Render nested array in-place.  Then erase the trailing zero.
-        here = elt_traits::into_buf(here, end, elt) - 1;
-      }
-      else if constexpr (is_unquoted_safe<elt_type>)
-      {
-        // No need to quote or escape.  Just convert the value straight into
-        // its place in the array, and "backspace" the trailing zero.
-        here = elt_traits::into_buf(here, end, elt) - 1;
-      }
-      else
-      {
-        *here++ = '"';
-
-        // Use the tail end of the destination buffer as an intermediate
-        // buffer.
-        auto const elt_budget{pqxx::size_buffer(elt)};
-        for (char const c : elt_traits::to_buf(end - elt_budget, end, elt))
-        {
-          if (c == '\\' or c == '"')
-            *here++ = '\\';
-          *here++ = c;
-        }
-        *here++ = '"';
-      }
-      *here++ = array_separator<elt_type>;
-      nonempty = true;
-    }
-
-    // Erase that last comma, if present.
-    if (nonempty)
-      here--;
-
-    *here++ = '}';
-    *here++ = '\0';
-
-    return here;
-  }
-
-  static std::size_t size_buffer(Container const &value) noexcept
-  {
-    if constexpr (is_unquoted_safe<elt_type>)
-      return 3 + std::accumulate(
-                   std::begin(value), std::end(value), std::size_t{},
-                   [](std::size_t acc, elt_type const &elt) {
-                     return acc +
-                            (pqxx::is_null(elt) ?
-                               std::size(s_null) :
-                               elt_traits::size_buffer(elt)) -
-                            1;
-                   });
-    else
-      return 3 + std::accumulate(
-                   std::begin(value), std::end(value), std::size_t{},
-                   [](std::size_t acc, elt_type const &elt) {
-                     // Opening and closing quotes, plus worst-case escaping,
-                     // but don't count the trailing zeroes.
-                     std::size_t const elt_size{
-                       pqxx::is_null(elt) ? std::size(s_null) :
-                                            elt_traits::size_buffer(elt) - 1};
-                     return acc + 2 * elt_size + 2;
-                   });
-  }
-
-  // We don't yet support parsing of array types using from_string.  Doing so
-  // would require a reference to the connection.
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-template<typename T, typename... Args>
-struct nullness<std::vector<T, Args...>> : no_null<std::vector<T>>
-{};
-
-
-template<typename T, typename... Args>
-struct string_traits<std::vector<T, Args...>>
-        : internal::array_string_traits<std::vector<T, Args...>>
-{};
-
-
-/// We don't know how to pass array params in binary format, so pass as text.
-template<typename T, typename... Args>
-inline constexpr format param_format(std::vector<T, Args...> const &)
-{
-  return format::text;
-}
-
-
-/// A `std::vector<std::byte>` is a binary string.  Other vectors are not.
-template<typename... Args>
-inline constexpr format param_format(std::vector<std::byte, Args...> const &)
-{
-  return format::binary;
-}
-
-
-template<typename T> inline constexpr bool is_sql_array<std::vector<T>>{true};
-
-
-template<typename T, std::size_t N>
-struct nullness<std::array<T, N>> : no_null<std::array<T, N>>
-{};
-
-
-template<typename T, std::size_t N>
-struct string_traits<std::array<T, N>>
-        : internal::array_string_traits<std::array<T, N>>
-{};
-
-
-/// We don't know how to pass array params in binary format, so pass as text.
-template<typename T, typename... Args, Args... args>
-inline constexpr format param_format(std::array<T, args...> const &)
-{
-  return format::text;
-}
-
-
-/// An array of `std::byte` is a binary string.
-template<typename... Args, Args... args>
-inline constexpr format param_format(std::array<std::byte, args...> const &)
-{
-  return format::binary;
-}
-
-
-template<typename T, std::size_t N>
-inline constexpr bool is_sql_array<std::array<T, N>>{true};
-} // namespace pqxx
-
-
-namespace pqxx
-{
-template<typename T> inline std::string to_string(T const &value)
-{
-  if (is_null(value))
-    throw conversion_error{
-      "Attempt to convert null " + type_name<T> + " to a string."};
-
-  std::string buf;
-  // We can't just reserve() space; modifying the terminating zero leads to
-  // undefined behaviour.
-  buf.resize(size_buffer(value));
-  auto const data{buf.data()};
-  auto const end{
-    string_traits<T>::into_buf(data, data + std::size(buf), value)};
-  buf.resize(static_cast<std::size_t>(end - data - 1));
-  return buf;
-}
-
-
-template<> inline std::string to_string(float const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(double const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(long double const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(std::stringstream const &value)
-{
-  return value.str();
-}
-
-
-template<typename T> inline void into_string(T const &value, std::string &out)
-{
-  if (is_null(value))
-    throw conversion_error{
-      "Attempt to convert null " + type_name<T> + " to a string."};
-
-  // We can't just reserve() data; modifying the terminating zero leads to
-  // undefined behaviour.
-  out.resize(size_buffer(value) + 1);
-  auto const data{out.data()};
-  auto const end{
-    string_traits<T>::into_buf(data, data + std::size(out), value)};
-  out.resize(static_cast<std::size_t>(end - data - 1));
-}
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/encoding_group.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/encoding_group.hxx
deleted file mode 100644
index e17736e5b..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/encoding_group.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/** Enum type for supporting encodings in libpqxx
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ENCODING_GROUP
-#define PQXX_H_ENCODING_GROUP
-
-#include <cstddef>
-
-namespace pqxx::internal
-{
-// Types of encodings supported by PostgreSQL, see
-// https://www.postgresql.org/docs/current/static/multibyte.html#CHARSET-TABLE
-enum class encoding_group
-{
-  // Handles all single-byte fixed-width encodings
-  MONOBYTE,
-
-  // Multibyte encodings.
-  // Many of these can embed ASCII-like bytes inside multibyte characters,
-  // notably Big5, SJIS, SHIFT_JIS_2004, GP18030, GBK, JOHAB, UHC.
-  BIG5,
-  EUC_CN,
-  // TODO: Merge EUC_JP and EUC_JIS_2004?
-  EUC_JP,
-  EUC_JIS_2004,
-  EUC_KR,
-  EUC_TW,
-  GB18030,
-  GBK,
-  JOHAB,
-  MULE_INTERNAL,
-  // TODO: Merge SJIS and SHIFT_JIS_2004?
-  SJIS,
-  SHIFT_JIS_2004,
-  UHC,
-  UTF8,
-};
-
-
-// TODO:: Can we just use string_view now?
-/// Function type: "find the end of the current glyph."
-/** This type of function takes a text buffer, and a location in that buffer,
- * and returns the location one byte past the end of the current glyph.
- *
- * The start offset marks the beginning of the current glyph.  It must fall
- * within the buffer.
- *
- * There are multiple different glyph scanner implementations, for different
- * kinds of encodings.
- */
-using glyph_scanner_func =
-  std::size_t(char const buffer[], std::size_t buffer_len, std::size_t start);
-} // namespace pqxx::internal
-
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/encodings.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/encodings.hxx
deleted file mode 100644
index ba7fecc70..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/encodings.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/** Internal string encodings support for libpqxx
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ENCODINGS
-#define PQXX_H_ENCODINGS
-
-#include "pqxx/internal/encoding_group.hxx"
-
-#include <string>
-#include <string_view>
-
-
-namespace pqxx::internal
-{
-char const *name_encoding(int encoding_id);
-
-/// Convert libpq encoding enum or encoding name to its libpqxx group.
-encoding_group enc_group(int /* libpq encoding ID */);
-encoding_group enc_group(std::string_view);
-
-
-/// Look up the glyph scanner function for a given encoding group.
-/** To identify the glyph boundaries in a buffer, call this to obtain the
- * scanner function appropriate for the buffer's encoding.  Then, repeatedly
- * call the scanner function to find the glyphs.
- */
-PQXX_LIBEXPORT glyph_scanner_func *get_glyph_scanner(encoding_group);
-
-
-// TODO: For ASCII search, treat UTF8/EUC_*/MULE_INTERNAL as MONOBYTE.
-
-/// Find any of the ASCII characters `NEEDLE` in `haystack`.
-/** Scans through `haystack` until it finds a single-byte character that
- * matches any value in `NEEDLE`.
- *
- * If it finds one, returns its offset.  If not, returns the end of the
- * haystack.
- */
-template<char... NEEDLE>
-inline std::size_t find_char(
-  glyph_scanner_func *scanner, std::string_view haystack,
-  std::size_t here = 0u)
-{
-  auto const sz{std::size(haystack)};
-  auto const data{std::data(haystack)};
-  while (here < sz)
-  {
-    auto next{scanner(data, sz, here)};
-    // (For some reason gcc had a problem with a right-fold here.  But clang
-    // was fine.)
-    if ((... or (data[here] == NEEDLE)))
-    {
-      // Also check against a multibyte character starting with a bytes which
-      // just happens to match one of the ASCII bytes we're looking for.  It'd
-      // be cleaner to check that first, but either works.  So, let's apply the
-      // most selective filter first and skip this check in almost all cases.
-      if (next == here + 1)
-        return here;
-    }
-
-    // Nope, no hit.  Move on.
-    here = next;
-  }
-  return sz;
-}
-
-
-/// Iterate over the glyphs in a buffer.
-/** Scans the glyphs in the buffer, and for each, passes its begin and its
- * one-past-end pointers to `callback`.
- */
-template<typename CALLABLE>
-inline void for_glyphs(
-  encoding_group enc, CALLABLE callback, char const buffer[],
-  std::size_t buffer_len, std::size_t start = 0)
-{
-  auto const scan{get_glyph_scanner(enc)};
-  for (std::size_t here = start, next; here < buffer_len; here = next)
-  {
-    next = scan(buffer, buffer_len, here);
-    callback(buffer + here, buffer + next);
-  }
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-errorhandler.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-errorhandler.hxx
deleted file mode 100644
index ffc12a6cf..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-errorhandler.hxx
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx
-{
-class connection;
-class errorhandler;
-} // namespace pqxx
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_errorhandler : callgate<connection>
-{
-  friend class pqxx::errorhandler;
-
-  connection_errorhandler(reference x) : super(x) {}
-
-  void register_errorhandler(errorhandler *h)
-  {
-    home().register_errorhandler(h);
-  }
-  void unregister_errorhandler(errorhandler *h)
-  {
-    home().unregister_errorhandler(h);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-largeobject.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-largeobject.hxx
deleted file mode 100644
index 49feaf9e6..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-largeobject.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <string>
-
-#include <pqxx/internal/callgate.hxx>
-#include <pqxx/internal/libpq-forward.hxx>
-
-namespace pqxx
-{
-class blob;
-class largeobject;
-} // namespace pqxx
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_largeobject : callgate<connection>
-{
-  friend class pqxx::blob;
-  friend class pqxx::largeobject;
-
-  connection_largeobject(reference x) : super(x) {}
-
-  pq::PGconn *raw_connection() const { return home().raw_connection(); }
-};
-
-
-class PQXX_PRIVATE const_connection_largeobject : callgate<connection const>
-{
-  friend class pqxx::blob;
-  friend class pqxx::largeobject;
-
-  const_connection_largeobject(reference x) : super(x) {}
-
-  std::string error_message() const { return home().err_msg(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-notification_receiver.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-notification_receiver.hxx
deleted file mode 100644
index 0bcb2db17..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-notification_receiver.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/connection.hxx"
-
-
-namespace pqxx
-{
-class notification_receiver;
-}
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_notification_receiver : callgate<connection>
-{
-  friend class pqxx::notification_receiver;
-
-  connection_notification_receiver(reference x) : super(x) {}
-
-  void add_receiver(notification_receiver *receiver)
-  {
-    home().add_receiver(receiver);
-  }
-  void remove_receiver(notification_receiver *receiver) noexcept
-  {
-    home().remove_receiver(receiver);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-pipeline.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-pipeline.hxx
deleted file mode 100644
index c6ae6e17a..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-pipeline.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "pqxx/internal/libpq-forward.hxx"
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/pipeline.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_pipeline : callgate<connection>
-{
-  friend class pqxx::pipeline;
-
-  connection_pipeline(reference x) : super(x) {}
-
-  void start_exec(char const query[]) { home().start_exec(query); }
-  pqxx::internal::pq::PGresult *get_result() { return home().get_result(); }
-  void cancel_query() { home().cancel_query(); }
-
-  bool consume_input() noexcept { return home().consume_input(); }
-  bool is_busy() const noexcept { return home().is_busy(); }
-
-  int encoding_id() { return home().encoding_id(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-sql_cursor.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-sql_cursor.hxx
deleted file mode 100644
index 51a889844..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-sql_cursor.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal
-{
-class sql_cursor;
-}
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_sql_cursor : callgate<connection>
-{
-  friend class pqxx::internal::sql_cursor;
-
-  connection_sql_cursor(reference x) : super(x) {}
-
-  result exec(char const query[]) { return home().exec(query); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-stream_from.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-stream_from.hxx
deleted file mode 100644
index 8961e7146..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-stream_from.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/connection.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_stream_from : callgate<connection>
-{
-  friend class pqxx::stream_from;
-
-  connection_stream_from(reference x) : super{x} {}
-
-  auto read_copy_line() { return home().read_copy_line(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-stream_to.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-stream_to.hxx
deleted file mode 100644
index a6974fb21..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-stream_to.hxx
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/stream_to.hxx"
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_stream_to : callgate<connection>
-{
-  friend class pqxx::stream_to;
-
-  connection_stream_to(reference x) : super(x) {}
-
-  void write_copy_line(std::string_view line) { home().write_copy_line(line); }
-  void end_copy_write() { home().end_copy_write(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-transaction.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-transaction.hxx
deleted file mode 100644
index 74d659253..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/connection-transaction.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx
-{
-class connection;
-}
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_transaction : callgate<connection>
-{
-  friend class pqxx::transaction_base;
-
-  connection_transaction(reference x) : super(x) {}
-
-  template<typename STRING> result exec(STRING query, std::string_view desc)
-  {
-    return home().exec(query, desc);
-  }
-
-  void register_transaction(transaction_base *t)
-  {
-    home().register_transaction(t);
-  }
-  void unregister_transaction(transaction_base *t) noexcept
-  {
-    home().unregister_transaction(t);
-  }
-
-  auto read_copy_line() { return home().read_copy_line(); }
-  void write_copy_line(std::string_view line) { home().write_copy_line(line); }
-  void end_copy_write() { home().end_copy_write(); }
-
-  result exec_prepared(zview statement, internal::c_params const &args)
-  {
-    return home().exec_prepared(statement, args);
-  }
-
-  result exec_params(zview query, internal::c_params const &args)
-  {
-    return home().exec_params(query, args);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/errorhandler-connection.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/errorhandler-connection.hxx
deleted file mode 100644
index 5560cedec..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/errorhandler-connection.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE errorhandler_connection : callgate<errorhandler>
-{
-  friend class pqxx::connection;
-
-  errorhandler_connection(reference x) : super(x) {}
-
-  void unregister() noexcept { home().unregister(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
deleted file mode 100644
index 296d22145..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE icursor_iterator_icursorstream : callgate<icursor_iterator>
-{
-  friend class pqxx::icursorstream;
-
-  icursor_iterator_icursorstream(reference x) : super(x) {}
-
-  icursor_iterator::difference_type pos() const noexcept
-  {
-    return home().pos();
-  }
-
-  icursor_iterator *get_prev() { return home().m_prev; }
-  void set_prev(icursor_iterator *i) { home().m_prev = i; }
-
-  icursor_iterator *get_next() { return home().m_next; }
-  void set_next(icursor_iterator *i) { home().m_next = i; }
-
-  void fill(result const &r) { home().fill(r); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx
deleted file mode 100644
index 56056d5ef..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE icursorstream_icursor_iterator : callgate<icursorstream>
-{
-  friend class pqxx::icursor_iterator;
-
-  icursorstream_icursor_iterator(reference x) : super(x) {}
-
-  void insert_iterator(icursor_iterator *i) noexcept
-  {
-    home().insert_iterator(i);
-  }
-
-  void remove_iterator(icursor_iterator *i) const noexcept
-  {
-    home().remove_iterator(i);
-  }
-
-  icursorstream::size_type forward() { return home().forward(); }
-  icursorstream::size_type forward(icursorstream::size_type n)
-  {
-    return home().forward(n);
-  }
-
-  void service_iterators(icursorstream::difference_type p)
-  {
-    home().service_iterators(p);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-connection.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-connection.hxx
deleted file mode 100644
index daa0808c0..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-connection.hxx
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_connection : callgate<result const>
-{
-  friend class pqxx::connection;
-
-  result_connection(reference x) : super(x) {}
-
-  operator bool() const { return bool(home()); }
-  bool operator!() const { return not home(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-creation.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-creation.hxx
deleted file mode 100644
index 3d9205f2c..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-creation.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_creation : callgate<result const>
-{
-  friend class pqxx::connection;
-  friend class pqxx::pipeline;
-
-  result_creation(reference x) : super(x) {}
-
-  static result create(
-    internal::pq::PGresult *rhs, std::shared_ptr<std::string> const &query,
-    encoding_group enc)
-  {
-    return result(rhs, query, enc);
-  }
-
-  void check_status(std::string_view desc = ""sv) const
-  {
-    return home().check_status(desc);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-pipeline.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-pipeline.hxx
deleted file mode 100644
index 3ebe436d2..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-pipeline.hxx
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_pipeline : callgate<result const>
-{
-  friend class pqxx::pipeline;
-
-  result_pipeline(reference x) : super(x) {}
-
-  std::shared_ptr<std::string const> query_ptr() const
-  {
-    return home().query_ptr();
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-sql_cursor.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-sql_cursor.hxx
deleted file mode 100644
index 78b450739..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/result-sql_cursor.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_sql_cursor : callgate<result const>
-{
-  friend class pqxx::internal::sql_cursor;
-
-  result_sql_cursor(reference x) : super(x) {}
-
-  char const *cmd_status() const noexcept { return home().cmd_status(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/transaction-sql_cursor.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/transaction-sql_cursor.hxx
deleted file mode 100644
index 4ed78dc93..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/transaction-sql_cursor.hxx
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE transaction_sql_cursor : callgate<transaction_base>
-{
-  friend class pqxx::internal::sql_cursor;
-  transaction_sql_cursor(reference x) : super(x) {}
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/transaction-transaction_focus.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/gates/transaction-transaction_focus.hxx
deleted file mode 100644
index ca7939a99..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/gates/transaction-transaction_focus.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/transaction_base.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE transaction_transaction_focus : callgate<transaction_base>
-{
-  friend class pqxx::transaction_focus;
-
-  transaction_transaction_focus(reference x) : super(x) {}
-
-  void register_focus(transaction_focus *focus)
-  {
-    home().register_focus(focus);
-  }
-  void unregister_focus(transaction_focus *focus) noexcept
-  {
-    home().unregister_focus(focus);
-  }
-  void register_pending_error(zview error)
-  {
-    home().register_pending_error(error);
-  }
-  void register_pending_error(std::string &&error)
-  {
-    home().register_pending_error(std::move(error));
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/header-post.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/header-post.hxx
deleted file mode 100644
index ff6bf8986..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/header-post.hxx
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Compiler deficiency workarounds for compiling libpqxx headers.
- *
- * To be included at the end of each libpqxx header, in order to restore the
- * client program's settings.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-// NO GUARDS HERE! This code should be executed every time!
-
-#if defined(_MSC_VER)
-#  pragma warning(pop) // Restore compiler's warning state
-#endif
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include pqxx/internal/header-post.hxx AFTER its 'pre' counterpart."
-#endif
-
-#undef PQXX_HEADER_PRE
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/header-pre.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/header-pre.hxx
deleted file mode 100644
index abc1a398d..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/header-pre.hxx
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Compiler settings for compiling libpqxx headers, and workarounds for all.
- *
- * Include this before including any other libpqxx headers from within libpqxx.
- * And to balance it out, also include header-post.hxx at the end of the batch
- * of headers.
- *
- * The public libpqxx headers (e.g. `<pqxx/connection>`) include this already;
- * there's no need to do this from within an application.
- *
- * Include this file at the highest aggregation level possible to avoid nesting
- * and to keep things simple.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-
-// NO GUARD HERE! This part should be included every time this file is.
-#if defined(_MSC_VER)
-
-// Save compiler's warning state, and set warning level 4 for maximum
-// sensitivity to warnings.
-#  pragma warning(push, 4)
-
-// Visual C++ generates some entirely unreasonable warnings.  Disable them.
-// Copy constructor could not be generated.
-#  pragma warning(disable : 4511)
-// Assignment operator could not be generated.
-#  pragma warning(disable : 4512)
-// Can't expose outside classes without exporting them.  Except the MSVC docs
-// say please ignore the warning if it's a standard library class.
-#  pragma warning(disable : 4251)
-// Can't derive library classes from outside classes without exporting them.
-// Except the MSVC docs say please ignore the warning if the parent class is
-// in the standard library.
-#  pragma warning(disable : 4275)
-// Can't inherit from non-exported class.
-#  pragma warning(disable : 4275)
-
-#endif // _MSC_VER
-
-
-#if defined(PQXX_HEADER_PRE)
-#  error "Avoid nesting #include of pqxx/internal/header-pre.hxx."
-#endif
-
-#define PQXX_HEADER_PRE
-
-
-// Workarounds & definitions that need to be included even in library's headers
-#include "pqxx/config-public-compiler.h"
-
-// Enable ISO-646 alternative operaotr representations: "and" instead of "&&"
-// etc. on older compilers.  C++20 removes this header.
-#if __has_include(<ciso646>)
-#  include <ciso646>
-#endif
-
-
-#if defined(PQXX_HAVE_GCC_PURE)
-/// Declare function "pure": no side effects, only reads globals and its args.
-#  define PQXX_PURE __attribute__((pure))
-#else
-#  define PQXX_PURE /* pure */
-#endif
-
-
-#if defined(__GNUC__)
-/// Tell the compiler to optimise a function for size, not speed.
-#  define PQXX_COLD __attribute__((cold))
-#else
-#  define PQXX_COLD /* cold */
-#endif
-
-
-// Workarounds for Windows
-#ifdef _WIN32
-
-/* For now, export DLL symbols if _DLL is defined.  This is done automatically
- * by the compiler when linking to the dynamic version of the runtime library,
- * according to "gzh"
- */
-#  if defined(PQXX_SHARED) && !defined(PQXX_LIBEXPORT)
-#    define PQXX_LIBEXPORT __declspec(dllimport)
-#  endif // PQXX_SHARED && !PQXX_LIBEXPORT
-
-
-// Workarounds for Microsoft Visual C++
-#  ifdef _MSC_VER
-
-// Suppress vtables on abstract classes.
-#    define PQXX_NOVTABLE __declspec(novtable)
-
-// Automatically link with the appropriate libpq (static or dynamic, debug or
-// release).  The default is to use the release DLL.  Define PQXX_PQ_STATIC to
-// link to a static version of libpq, and _DEBUG to link to a debug version.
-// The two may be combined.
-#    if defined(PQXX_AUTOLINK)
-#      if defined(PQXX_PQ_STATIC)
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqd")
-#        else
-#          pragma comment(lib, "libpq")
-#        endif
-#      else
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqddll")
-#        else
-#          pragma comment(lib, "libpqdll")
-#        endif
-#      endif
-#    endif
-
-// If we're not compiling libpqxx itself, automatically link with the
-// appropriate libpqxx library.  To link with the libpqxx DLL, define
-// PQXX_SHARED; the default is to link with the static library.  A static link
-// is the recommended practice.
-//
-// The preprocessor macro PQXX_INTERNAL is used to detect whether we
-// are compiling the libpqxx library itself.  When you compile the library
-// yourself using your own project file, make sure to include this macro.
-#    if defined(PQXX_AUTOLINK) && !defined(PQXX_INTERNAL)
-#      ifdef PQXX_SHARED
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqxxD")
-#        else
-#          pragma comment(lib, "libpqxx")
-#        endif
-#      else // !PQXX_SHARED
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqxx_staticD")
-#        else
-#          pragma comment(lib, "libpqxx_static")
-#        endif
-#      endif
-#    endif
-
-#  endif // _MSC_VER
-
-#elif defined(PQXX_HAVE_GCC_VISIBILITY) // !_WIN32
-
-#  define PQXX_LIBEXPORT __attribute__((visibility("default")))
-#  define PQXX_PRIVATE __attribute__((visibility("hidden")))
-
-#endif // PQXX_HAVE_GCC_VISIBILITY
-
-
-#ifndef PQXX_LIBEXPORT
-#  define PQXX_LIBEXPORT /* libexport */
-#endif
-
-#ifndef PQXX_PRIVATE
-#  define PQXX_PRIVATE /* private */
-#endif
-
-#ifndef PQXX_NOVTABLE
-#  define PQXX_NOVTABLE /* novtable */
-#endif
-
-// C++20: Assume support.
-#if defined(PQXX_HAVE_LIKELY)
-#  define PQXX_LIKELY [[likely]]
-#  define PQXX_UNLIKELY [[unlikely]]
-#else
-#  define PQXX_LIKELY   /* [[likely]] */
-#  define PQXX_UNLIKELY /* [[unlikely]] */
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/ignore-deprecated-post.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/ignore-deprecated-post.hxx
deleted file mode 100644
index cebcf0594..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/ignore-deprecated-post.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/// End a code block started by "ignore-deprecated-pre.hxx".
-
-#if !defined(PQXX_IGNORING_DEPRECATED)
-#  error "Ended an 'ignore-deprecated' block while none was active."
-#endif
-
-#if defined(__GNUC__)
-#  pragma GCC diagnostic pop
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-
-#undef PQXX_IGNORING_DEPRECATED
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/ignore-deprecated-pre.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/ignore-deprecated-pre.hxx
deleted file mode 100644
index 8ac57afaa..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/ignore-deprecated-pre.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/** Start a block of deprecated code which may call other deprecated code.
- *
- * Most compilers will emit warnings when deprecated code is invoked from
- * non-deprecated code.  But some compilers (notably gcc) will always emit the
- * warning even when the calling code is also deprecated.
- *
- * This header starts a block where those warnings are suppressed.  It can be
- * included inside a code block.
- *
- * Always match the #include with a closing #include of
- * "ignore-deprecated-post.hxx".  To avoid mistakes, keep the enclosed area as
- * small as possible.
- */
-#if defined(PQXX_IGNORING_DEPRECATED)
-#  error "Started an 'ignore-deprecated' block inside another."
-#endif
-
-#define PQXX_IGNORING_DEPRECATED
-
-#if defined(__GNUC__)
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable : 4996)
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/libpq-forward.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/libpq-forward.hxx
deleted file mode 100644
index 9e74f79ec..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/libpq-forward.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/** Minimal forward declarations of libpq types needed in libpqxx headers.
- *
- * DO NOT INCLUDE THIS FILE when building client programs.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-extern "C"
-{
-  struct pg_conn;
-  struct pg_result;
-  struct pgNotify;
-}
-
-/// Forward declarations of libpq types as needed in libpqxx headers.
-namespace pqxx::internal::pq
-{
-using PGconn = pg_conn;
-using PGresult = pg_result;
-using PGnotify = pgNotify;
-using PQnoticeProcessor = void (*)(void *, char const *);
-} // namespace pqxx::internal::pq
-
-namespace pqxx
-{
-/// PostgreSQL database row identifier.
-using oid = unsigned int;
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/result_iter.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/result_iter.hxx
deleted file mode 100644
index 1fa1f7d8a..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/result_iter.hxx
+++ /dev/null
@@ -1,124 +0,0 @@
-/** Result loops.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT_ITER
-#define PQXX_H_RESULT_ITER
-
-#include <memory>
-
-#include "pqxx/strconv.hxx"
-
-namespace pqxx
-{
-class result;
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-// C++20: Replace with generator?
-/// Iterator for looped unpacking of a result.
-template<typename... TYPE> class result_iter
-{
-public:
-  using value_type = std::tuple<TYPE...>;
-
-  /// Construct an "end" iterator.
-  result_iter() = default;
-
-  explicit result_iter(result const &home) :
-          m_home{&home}, m_size{std::size(home)}
-  {
-    if (not std::empty(home))
-      read();
-  }
-  result_iter(result_iter const &) = default;
-
-  result_iter &operator++()
-  {
-    m_index++;
-    if (m_index >= m_size)
-      m_home = nullptr;
-    else
-      read();
-    return *this;
-  }
-
-  /// Comparison only works for comparing to end().
-  bool operator==(result_iter const &rhs) const
-  {
-    return m_home == rhs.m_home;
-  }
-  bool operator!=(result_iter const &rhs) const { return not(*this == rhs); }
-
-  value_type const &operator*() const { return m_value; }
-
-private:
-  void read() { (*m_home)[m_index].convert(m_value); }
-
-  result const *m_home{nullptr};
-  result::size_type m_index{0};
-  result::size_type m_size;
-  value_type m_value;
-};
-
-
-template<typename... TYPE> class result_iteration
-{
-public:
-  using iterator = result_iter<TYPE...>;
-  explicit result_iteration(result const &home) : m_home{home}
-  {
-    constexpr auto tup_size{sizeof...(TYPE)};
-    if (home.columns() != tup_size)
-      throw usage_error{internal::concat(
-        "Tried to extract ", to_string(tup_size),
-        " field(s) from a result with ", to_string(home.columns()),
-        " column(s).")};
-  }
-  iterator begin() const
-  {
-    if (std::size(m_home) == 0)
-      return end();
-    else
-      return iterator{m_home};
-  }
-  iterator end() const { return {}; }
-
-private:
-  pqxx::result const &m_home;
-};
-} // namespace pqxx::internal
-
-
-template<typename... TYPE> inline auto pqxx::result::iter() const
-{
-  return pqxx::internal::result_iteration<TYPE...>{*this};
-}
-
-
-template<typename CALLABLE>
-inline void pqxx::result::for_each(CALLABLE &&func) const
-{
-  using args_tuple = internal::args_t<decltype(func)>;
-  constexpr auto sz{std::tuple_size_v<args_tuple>};
-  static_assert(
-    sz > 0,
-    "Callback for for_each must take parameters, one for each column in the "
-    "result.");
-
-  auto const cols{this->columns()};
-  if (sz != cols)
-    throw usage_error{internal::concat(
-      "Callback to for_each takes ", sz, "parameter", (sz == 1) ? "" : "s",
-      ", but result set has ", cols, "field", (cols == 1) ? "" : "s", ".")};
-
-  using pass_tuple = pqxx::internal::strip_types_t<args_tuple>;
-  for (auto const r : *this) std::apply(func, r.as_tuple<pass_tuple>());
-}
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/result_iterator.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/result_iterator.hxx
deleted file mode 100644
index 3f27a1d3f..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/result_iterator.hxx
+++ /dev/null
@@ -1,389 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT_ITERATOR
-#define PQXX_H_RESULT_ITERATOR
-
-#include "pqxx/row.hxx"
-
-
-/* Result iterator.
- *
- * Don't include this header from your own application; it is included for you
- * by other libpqxx headers.
- */
-
-namespace pqxx
-{
-/// Iterator for rows in a result.  Use as result::const_iterator.
-/** A result, once obtained, cannot be modified.  Therefore there is no
- * plain iterator type for result.  However its const_iterator type can be
- * used to inspect its rows without changing them.
- */
-class PQXX_LIBEXPORT const_result_iterator : public row
-{
-public:
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = row const;
-  using pointer = row const *;
-  using reference = row;
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create an iterator, but in an unusable state.
-  const_result_iterator() noexcept = default;
-  /// Copy an iterator.
-  const_result_iterator(const_result_iterator const &) noexcept = default;
-  /// Move an iterator.
-  const_result_iterator(const_result_iterator &&) noexcept = default;
-
-  /// Begin iterating a @ref row.
-  const_result_iterator(row const &t) noexcept : row{t} {}
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /**
-   * @name Dereferencing operators
-   *
-   * An iterator "points to" its own row, which is also itself.  This makes it
-   * easy to address a @ref result as a two-dimensional container, without
-   * going through the intermediate step of dereferencing the iterator.  It
-   * makes the interface similar to C pointer/array semantics.
-   *
-   * IIRC Alex Stepanov, the inventor of the STL, once remarked that having
-   * this as standard behaviour for pointers would be useful in some
-   * algorithms.  So even if this makes me look foolish, I would seem to be in
-   * distinguished company.
-   */
-  //@{
-  /// Dereference the iterator.
-  [[nodiscard]] pointer operator->() const { return this; }
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Dereference the iterator.
-  [[nodiscard]] reference operator*() const { return *this; }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  //@}
-
-  /**
-   * @name Field access
-   */
-  //@{
-  using row::back;
-  using row::front;
-  using row::operator[];
-  using row::at;
-  using row::rownumber;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_result_iterator &operator=(const_result_iterator const &rhs)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::operator=(rhs);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    return *this;
-  }
-
-  const_result_iterator &operator=(const_result_iterator &&rhs)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::operator=(std::move(rhs));
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    return *this;
-  }
-
-  const_result_iterator operator++(int);
-  const_result_iterator &operator++()
-  {
-    ++m_index;
-    return *this;
-  }
-  const_result_iterator operator--(int);
-  const_result_iterator &operator--()
-  {
-    --m_index;
-    return *this;
-  }
-
-  const_result_iterator &operator+=(difference_type i)
-  {
-    m_index += i;
-    return *this;
-  }
-  const_result_iterator &operator-=(difference_type i)
-  {
-    m_index -= i;
-    return *this;
-  }
-
-  /// Interchange two iterators in an exception-safe manner.
-  void swap(const_result_iterator &other) noexcept
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::swap(other);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool operator==(const_result_iterator const &i) const
-  {
-    return m_index == i.m_index;
-  }
-  [[nodiscard]] bool operator!=(const_result_iterator const &i) const
-  {
-    return m_index != i.m_index;
-  }
-  [[nodiscard]] bool operator<(const_result_iterator const &i) const
-  {
-    return m_index < i.m_index;
-  }
-  [[nodiscard]] bool operator<=(const_result_iterator const &i) const
-  {
-    return m_index <= i.m_index;
-  }
-  [[nodiscard]] bool operator>(const_result_iterator const &i) const
-  {
-    return m_index > i.m_index;
-  }
-  [[nodiscard]] bool operator>=(const_result_iterator const &i) const
-  {
-    return m_index >= i.m_index;
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] inline const_result_iterator operator+(difference_type) const;
-  friend const_result_iterator
-  operator+(difference_type, const_result_iterator const &);
-  [[nodiscard]] inline const_result_iterator operator-(difference_type) const;
-  [[nodiscard]] inline difference_type
-  operator-(const_result_iterator const &) const;
-  //@}
-
-private:
-  friend class pqxx::result;
-  const_result_iterator(pqxx::result const *r, result_size_type i) noexcept :
-          row{*r, i, r->columns()}
-  {}
-};
-
-
-/// Reverse iterator for result.  Use as result::const_reverse_iterator.
-class PQXX_LIBEXPORT const_reverse_result_iterator
-        : private const_result_iterator
-{
-public:
-  using super = const_result_iterator;
-  using iterator_type = const_result_iterator;
-  using iterator_type::difference_type;
-  using iterator_type::iterator_category;
-  using iterator_type::pointer;
-  using value_type = iterator_type::value_type;
-  using reference = iterator_type::reference;
-
-  /// Create an iterator, but in an unusable state.
-  const_reverse_result_iterator() = default;
-  /// Copy an iterator.
-  const_reverse_result_iterator(const_reverse_result_iterator const &rhs) =
-    default;
-  /// Copy a reverse iterator from a regular iterator.
-  explicit const_reverse_result_iterator(const_result_iterator const &rhs) :
-          const_result_iterator{rhs}
-  {
-    super::operator--();
-  }
-
-  /// Move a regular iterator into a reverse iterator.
-  explicit const_reverse_result_iterator(const_result_iterator const &&rhs) :
-          const_result_iterator{std::move(rhs)}
-  {
-    super::operator--();
-  }
-
-  /// Return the underlying "regular" iterator (as per standard library).
-  [[nodiscard]] PQXX_PURE const_result_iterator base() const noexcept;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  /// Dereference iterator.
-  using const_result_iterator::operator->;
-  /// Dereference iterator.
-  using const_result_iterator::operator*;
-  //@}
-
-  /**
-   * @name Field access
-   */
-  //@{
-  using const_result_iterator::back;
-  using const_result_iterator::front;
-  using const_result_iterator::operator[];
-  using const_result_iterator::at;
-  using const_result_iterator::rownumber;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_reverse_result_iterator &
-  operator=(const_reverse_result_iterator const &r)
-  {
-    iterator_type::operator=(r);
-    return *this;
-  }
-  const_reverse_result_iterator &operator=(const_reverse_result_iterator &&r)
-  {
-    iterator_type::operator=(std::move(r));
-    return *this;
-  }
-  const_reverse_result_iterator &operator++()
-  {
-    iterator_type::operator--();
-    return *this;
-  }
-  const_reverse_result_iterator operator++(int);
-  const_reverse_result_iterator &operator--()
-  {
-    iterator_type::operator++();
-    return *this;
-  }
-  const_reverse_result_iterator operator--(int);
-  const_reverse_result_iterator &operator+=(difference_type i)
-  {
-    iterator_type::operator-=(i);
-    return *this;
-  }
-  const_reverse_result_iterator &operator-=(difference_type i)
-  {
-    iterator_type::operator+=(i);
-    return *this;
-  }
-
-  void swap(const_reverse_result_iterator &other) noexcept
-  {
-    const_result_iterator::swap(other);
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] const_reverse_result_iterator
-  operator+(difference_type i) const
-  {
-    return const_reverse_result_iterator(base() - i);
-  }
-  [[nodiscard]] const_reverse_result_iterator operator-(difference_type i)
-  {
-    return const_reverse_result_iterator(base() + i);
-  }
-  [[nodiscard]] difference_type
-  operator-(const_reverse_result_iterator const &rhs) const
-  {
-    return rhs.const_result_iterator::operator-(*this);
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool
-  operator==(const_reverse_result_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator==(rhs);
-  }
-  [[nodiscard]] bool
-  operator!=(const_reverse_result_iterator const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-
-  [[nodiscard]] bool operator<(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator>(rhs);
-  }
-  [[nodiscard]] bool operator<=(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator>=(rhs);
-  }
-  [[nodiscard]] bool operator>(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator<(rhs);
-  }
-  [[nodiscard]] bool operator>=(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator<=(rhs);
-  }
-  //@}
-};
-
-
-inline const_result_iterator
-const_result_iterator::operator+(result::difference_type o) const
-{
-  return {&m_result, size_type(result::difference_type(m_index) + o)};
-}
-
-inline const_result_iterator
-operator+(result::difference_type o, const_result_iterator const &i)
-{
-  return i + o;
-}
-
-inline const_result_iterator
-const_result_iterator::operator-(result::difference_type o) const
-{
-  return {&m_result, result_size_type(result::difference_type(m_index) - o)};
-}
-
-inline result::difference_type
-const_result_iterator::operator-(const const_result_iterator &i) const
-{
-  return result::difference_type(num() - i.num());
-}
-
-inline const_result_iterator result::end() const noexcept
-{
-  return {this, size()};
-}
-
-
-inline const_result_iterator result::cend() const noexcept
-{
-  return end();
-}
-
-
-inline const_reverse_result_iterator
-operator+(result::difference_type n, const_reverse_result_iterator const &i)
-{
-  return const_reverse_result_iterator{i.base() - n};
-}
-
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/sql_cursor.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/sql_cursor.hxx
deleted file mode 100644
index a26d06306..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/sql_cursor.hxx
+++ /dev/null
@@ -1,118 +0,0 @@
-/** Internal wrapper for SQL cursors.  Supports higher-level cursor classes.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY.  Other headers include it for you.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SQL_CURSOR
-#define PQXX_H_SQL_CURSOR
-
-namespace pqxx::internal
-{
-/// Cursor with SQL positioning semantics.
-/** Thin wrapper around an SQL cursor, with SQL's ideas of positioning.
- *
- * SQL cursors have pre-increment/pre-decrement semantics, with on either end
- * of the result set a special position that does not repesent a row.  This
- * class models SQL cursors for the purpose of implementing more C++-like
- * semantics on top.
- *
- * Positions of actual rows are numbered starting at 1.  Position 0 exists but
- * does not refer to a row.  There is a similar non-row position at the end of
- * the result set.
- *
- * Don't use this at home.  You deserve better.  Use the stateles_cursor
- * instead.
- */
-class PQXX_LIBEXPORT sql_cursor : public cursor_base
-{
-public:
-  sql_cursor(
-    transaction_base &t, std::string_view query, std::string_view cname,
-    cursor_base::access_policy ap, cursor_base::update_policy up,
-    cursor_base::ownership_policy op, bool hold);
-
-  sql_cursor(
-    transaction_base &t, std::string_view cname,
-    cursor_base::ownership_policy op);
-
-  ~sql_cursor() noexcept { close(); }
-
-  result fetch(difference_type rows, difference_type &displacement);
-  result fetch(difference_type rows)
-  {
-    difference_type d = 0;
-    return fetch(rows, d);
-  }
-  difference_type move(difference_type rows, difference_type &displacement);
-  difference_type move(difference_type rows)
-  {
-    difference_type d = 0;
-    return move(rows, d);
-  }
-
-  /// Current position, or -1 for unknown
-  /**
-   * The starting position, just before the first row, counts as position zero.
-   *
-   * Position may be unknown if (and only if) this cursor was adopted, and has
-   * never hit its starting position (position zero).
-   */
-  difference_type pos() const noexcept { return m_pos; }
-
-  /// End position, or -1 for unknown
-  /**
-   * Returns the final position, just after the last row in the result set. The
-   * starting position, just before the first row, counts as position zero.
-   *
-   * End position is unknown until it is encountered during use.
-   */
-  difference_type endpos() const noexcept { return m_endpos; }
-
-  /// Return zero-row result for this cursor.
-  result const &empty_result() const noexcept { return m_empty_result; }
-
-  void close() noexcept;
-
-private:
-  difference_type adjust(difference_type hoped, difference_type actual);
-  static std::string stridestring(difference_type);
-  /// Initialize cached empty result.  Call only at beginning or end!
-  void init_empty_result(transaction_base &);
-
-  /// Connection in which this cursor lives.
-  connection &m_home;
-
-  /// Zero-row result from this cursor (or plain empty one if cursor is
-  /// adopted)
-  result m_empty_result;
-
-  result m_cached_current_row;
-
-  /// Is this cursor adopted (as opposed to created by this cursor object)?
-  bool m_adopted;
-
-  /// Will this cursor object destroy its SQL cursor when it dies?
-  cursor_base::ownership_policy m_ownership;
-
-  /// At starting position (-1), somewhere in the middle (0), or past end (1)
-  int m_at_end;
-
-  /// Position, or -1 for unknown
-  difference_type m_pos;
-
-  /// End position, or -1 for unknown
-  difference_type m_endpos = -1;
-};
-
-
-PQXX_LIBEXPORT result_size_type obtain_stateless_cursor_size(sql_cursor &);
-PQXX_LIBEXPORT result stateless_cursor_retrieve(
-  sql_cursor &, result::difference_type size,
-  result::difference_type begin_pos, result::difference_type end_pos);
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/statement_parameters.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/statement_parameters.hxx
deleted file mode 100644
index b078bf6e0..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/statement_parameters.hxx
+++ /dev/null
@@ -1,131 +0,0 @@
-/** Common implementation for statement parameter lists.
- *
- * These are used for both prepared statements and parameterized statements.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY.  Other headers include it for you.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STATEMENT_PARAMETER
-#define PQXX_H_STATEMENT_PARAMETER
-
-#include <cstring>
-#include <functional>
-#include <iterator>
-#include <string>
-#include <vector>
-
-#include "pqxx/binarystring.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/util.hxx"
-
-
-namespace pqxx::internal
-{
-template<typename ITERATOR>
-constexpr inline auto const iterator_identity{
-  [](decltype(*std::declval<ITERATOR>()) x) { return x; }};
-
-
-/// Marker type: pass a dynamically-determined number of statement parameters.
-/** @deprecated Use @ref params instead.
- *
- * Normally when invoking a prepared or parameterised statement, the number
- * of parameters is known at compile time.  For instance,
- * `t.exec_prepared("foo", 1, "x");` executes statement `foo` with two
- * parameters, an `int` and a C string.
- *
- * But sometimes you may want to pass a number of parameters known only at run
- * time.  In those cases, a @ref dynamic_params encodes a dynamically
- * determined number of parameters.  You can mix these with regular, static
- * parameter lists, and you can re-use them for multiple statement invocations.
- *
- * A dynamic_params object does not store copies of its parameters, so make
- * sure they remain accessible until you've executed the statement.
- *
- * The ACCESSOR is an optional callable (such as a lambda).  If you pass an
- * accessor `a`, then each parameter `p` goes into your statement as `a(p)`.
- */
-template<typename IT, typename ACCESSOR = decltype(iterator_identity<IT>)>
-class dynamic_params
-{
-public:
-  /// Wrap a sequence of pointers or iterators.
-  constexpr dynamic_params(IT begin, IT end) :
-          m_begin(begin), m_end(end), m_accessor(iterator_identity<IT>)
-  {}
-
-  /// Wrap a sequence of pointers or iterators.
-  /** This version takes an accessor callable.  If you pass an accessor `acc`,
-   * then any parameter `p` will go into the statement's parameter list as
-   * `acc(p)`.
-   */
-  constexpr dynamic_params(IT begin, IT end, ACCESSOR &acc) :
-          m_begin(begin), m_end(end), m_accessor(acc)
-  {}
-
-  /// Wrap a container.
-  template<typename C>
-  explicit constexpr dynamic_params(C &container) :
-          dynamic_params(std::begin(container), std::end(container))
-  {}
-
-  /// Wrap a container.
-  /** This version takes an accessor callable.  If you pass an accessor `acc`,
-   * then any parameter `p` will go into the statement's parameter list as
-   * `acc(p)`.
-   */
-  template<typename C>
-  explicit constexpr dynamic_params(C &container, ACCESSOR &acc) :
-          dynamic_params(std::begin(container), std::end(container), acc)
-  {}
-
-  constexpr IT begin() const noexcept { return m_begin; }
-  constexpr IT end() const noexcept { return m_end; }
-
-  constexpr auto access(decltype(*std::declval<IT>()) value) const
-    -> decltype(std::declval<ACCESSOR>()(value))
-  {
-    return m_accessor(value);
-  }
-
-private:
-  IT const m_begin, m_end;
-  ACCESSOR m_accessor = iterator_identity<IT>;
-};
-
-
-/// Internal type: encode statement parameters.
-/** Compiles arguments for prepared statements and parameterised queries into
- * a format that can be passed into libpq.
- *
- * Objects of this type are meant to be short-lived: a `c_params` lives and
- * dies entirely within the call to execute.  So, for example, if you pass in a
- * non-null pointer as a parameter, @ref params may simply use that pointer as
- * a parameter value, without arranging longer-term storage for the data to
- * which it points.  All values referenced by parameters must remain "live"
- * until the parameterised or prepared statement has been executed.
- */
-struct PQXX_LIBEXPORT c_params
-{
-  c_params() = default;
-  /// Copying these objects is pointless and expensive.  Don't do it.
-  c_params(c_params const &) = delete;
-  c_params(c_params &&) = default;
-
-  /// Pre-allocate storage for `n` parameters.
-  void reserve(std::size_t n) &;
-
-  /// As used by libpq: pointers to parameter values.
-  std::vector<char const *> values;
-  /// As used by libpq: lengths of non-null arguments, in bytes.
-  std::vector<int> lengths;
-  /// As used by libpq: effectively boolean "is this a binary parameter?"
-  std::vector<format> formats;
-};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/stream_iterator.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/stream_iterator.hxx
deleted file mode 100644
index f240dcfa7..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/stream_iterator.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/** Stream iterators.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_ITERATOR
-#define PQXX_H_STREAM_ITERATOR
-
-#include <memory>
-
-namespace pqxx
-{
-class stream_from;
-}
-
-
-namespace pqxx::internal
-{
-// C++20: Replace with generator?
-/// Input iterator for stream_from.
-/** Just barely enough to support range-based "for" loops.  Don't assume that
- * any of the usual behaviour works beyond that.
- */
-template<typename... TYPE> class stream_input_iterator
-{
-public:
-  using value_type = std::tuple<TYPE...>;
-
-  /// Construct an "end" iterator.
-  stream_input_iterator() = default;
-
-  explicit stream_input_iterator(stream_from &home) : m_home(&home)
-  {
-    advance();
-  }
-  stream_input_iterator(stream_input_iterator const &) = default;
-
-  stream_input_iterator &operator++()
-  {
-    advance();
-    return *this;
-  }
-
-  value_type const &operator*() const { return m_value; }
-
-  /// Comparison only works for comparing to end().
-  bool operator==(stream_input_iterator const &rhs) const
-  {
-    return m_home == rhs.m_home;
-  }
-  /// Comparison only works for comparing to end().
-  bool operator!=(stream_input_iterator const &rhs) const
-  {
-    return not(*this == rhs);
-  }
-
-private:
-  void advance()
-  {
-    if (m_home == nullptr)
-      throw usage_error{"Moving stream_from iterator beyond end()."};
-    if (not((*m_home) >> m_value))
-      m_home = nullptr;
-  }
-
-  stream_from *m_home{nullptr};
-  value_type m_value;
-};
-
-
-// C++20: Replace with generator?
-/// Iteration over a @ref stream_from.
-template<typename... TYPE> class stream_input_iteration
-{
-public:
-  using iterator = stream_input_iterator<TYPE...>;
-  explicit stream_input_iteration(stream_from &home) : m_home{home} {}
-  iterator begin() const { return iterator{m_home}; }
-  iterator end() const { return {}; }
-
-private:
-  stream_from &m_home;
-};
-
-
-// C++20: Replace with generator?
-/// Iteration over a @ref stream_from, deleting it once done.
-template<typename... TYPE> class owning_stream_input_iteration
-{
-public:
-  using iterator = stream_input_iterator<TYPE...>;
-  explicit owning_stream_input_iteration(std::unique_ptr<stream_from> &&home) :
-          m_home{std::move(home)}
-  {}
-  iterator begin() const { return iterator{*m_home.get()}; }
-  iterator end() const { return {}; }
-
-private:
-  std::unique_ptr<stream_from> m_home;
-};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/internal/wait.hxx b/ext/libpqxx-7.7.3/include/pqxx/internal/wait.hxx
deleted file mode 100644
index 7a82e6553..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/internal/wait.hxx
+++ /dev/null
@@ -1,18 +0,0 @@
-#if !defined(PQXX_WAIT_HXX)
-#  define PQXX_WAIT_HXX
-
-namespace pqxx::internal
-{
-/// Wait.
-/** This is normally `std::this_thread::sleep_for()`.  But MinGW's `thread`
- * header doesn't work, so we must be careful about including it.
- */
-void PQXX_LIBEXPORT wait_for(unsigned int microseconds);
-
-
-/// Wait for a socket to be ready for reading/writing, or timeout.
-PQXX_LIBEXPORT void wait_fd(
-  int fd, bool for_read, bool for_write, unsigned seconds = 1,
-  unsigned microseconds = 0);
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/isolation b/ext/libpqxx-7.7.3/include/pqxx/isolation
deleted file mode 100644
index 1b801329b..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/isolation
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Transaction isolation levels.
- *
- * Policies and traits describing SQL transaction isolation levels
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/isolation.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/isolation.hxx b/ext/libpqxx-7.7.3/include/pqxx/isolation.hxx
deleted file mode 100644
index 0698c6ab4..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/isolation.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Definitions for transaction isolation levels, and such.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/isolation instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ISOLATION
-#define PQXX_H_ISOLATION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Should a transaction be read-only, or read-write?
-/** No, this is not an isolation level.  So it really doesn't belong here.
- * But it's not really worth a separate header.
- */
-enum class write_policy
-{
-  read_only,
-  read_write
-};
-
-
-/// Transaction isolation levels.
-/** These are as defined in the SQL standard.  But there are a few notes
- * specific to PostgreSQL.
- *
- * First, postgres does not support "read uncommitted."  The lowest level you
- * can get is "read committed," which is better.  PostgreSQL is built on the
- * MVCC paradigm, which guarantees "read committed" isolation without any
- * additional performance overhead, so there was no point in providing the
- * lower level.
- *
- * Second, "repeatable read" also makes more isolation guarantees than the
- * standard requires.  According to the standard, this level prevents "dirty
- * reads" and "nonrepeatable reads," but not "phantom reads."  In postgres,
- * it actually prevents all three.
- *
- * Third, "serializable" is only properly supported starting at postgres 9.1.
- * If you request "serializable" isolation on an older backend, you will get
- * the same isolation as in "repeatable read."  It's better than the
- * "repeatable read" defined in the SQL standard, but not a complete
- * implementation of the standard's "serializable" isolation level.
- *
- * In general, a lower isolation level will allow more surprising interactions
- * between ongoing transactions, but improve performance.  A higher level
- * gives you more protection from subtle concurrency bugs, but sometimes it
- * may not be possible to complete your transaction without avoiding paradoxes
- * in the data.  In that case a transaction may fail, and the application will
- * have to re-do the whole thing based on the latest state of the database.
- * (If you want to retry your code in that situation, have a look at the
- * transactor framework.)
- *
- * Study the levels and design your application with the right level in mind.
- */
-enum isolation_level
-{
-  // PostgreSQL only has the better isolation levels.
-  // read_uncommitted,
-
-  read_committed,
-  repeatable_read,
-  serializable,
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/largeobject b/ext/libpqxx-7.7.3/include/pqxx/largeobject
deleted file mode 100644
index 1f2f94790..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/largeobject
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Large Objects interface.
- *
- * Supports direct access to large objects, as well as through I/O streams
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/largeobject.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/largeobject.hxx b/ext/libpqxx-7.7.3/include/pqxx/largeobject.hxx
deleted file mode 100644
index ebafc51d8..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/largeobject.hxx
+++ /dev/null
@@ -1,735 +0,0 @@
-/* Large Objects interface.  Deprecated; use blob instead.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/largeobject instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_LARGEOBJECT
-#define PQXX_H_LARGEOBJECT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <streambuf>
-
-#include "pqxx/dbtransaction.hxx"
-
-
-namespace pqxx
-{
-/// Identity of a large object.
-/** @deprecated Use the @ref blob class instead.
- *
- * Encapsulates the identity of a large object.
- *
- * A largeobject must be accessed only from within a backend transaction, but
- * the object's identity remains valid as long as the object exists.
- */
-class PQXX_LIBEXPORT largeobject
-{
-public:
-  using size_type = large_object_size_type;
-
-  /// Refer to a nonexistent large object (similar to what a null pointer
-  /// does).
-  [[deprecated("Use blob instead.")]] largeobject() noexcept = default;
-
-  /// Create new large object.
-  /** @param t Backend transaction in which the object is to be created.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobject(dbtransaction &t);
-
-  /// Wrap object with given oid.
-  /** Convert combination of a transaction and object identifier into a
-   * large object identity.  Does not affect the database.
-   * @param o Object identifier for the given object.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobject(oid o) noexcept :
-          m_id{o}
-  {}
-
-  /// Import large object from a local file.
-  /** Creates a large object containing the data found in the given file.
-   * @param t Backend transaction in which the large object is to be created.
-   * @param file A filename on the client program's filesystem.
-   */
-  [[deprecated("Use blob instead.")]] largeobject(
-    dbtransaction &t, std::string_view file);
-
-  /// Take identity of an opened large object.
-  /** Copy identity of already opened large object.  Note that this may be done
-   * as an implicit conversion.
-   * @param o Already opened large object to copy identity from.
-   */
-  [[deprecated("Use blob instead.")]] largeobject(
-    largeobjectaccess const &o) noexcept;
-
-  /// Object identifier.
-  /** The number returned by this function identifies the large object in the
-   * database we're connected to (or oid_none is returned if we refer to the
-   * null object).
-   */
-  [[nodiscard]] oid id() const noexcept { return m_id; }
-
-  /**
-   * @name Identity comparisons
-   *
-   * These operators compare the object identifiers of large objects.  This has
-   * nothing to do with the objects' actual contents; use them only for keeping
-   * track of containers of references to large objects and such.
-   */
-  //@{
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator==(largeobject const &other) const
-  {
-    return m_id == other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator!=(largeobject const &other) const
-  {
-    return m_id != other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator<=(largeobject const &other) const
-  {
-    return m_id <= other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator>=(largeobject const &other) const
-  {
-    return m_id >= other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator<(largeobject const &other) const
-  {
-    return m_id < other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator>(largeobject const &other) const
-  {
-    return m_id > other.m_id;
-  }
-  //@}
-
-  /// Export large object's contents to a local file
-  /** Writes the data stored in the large object to the given file.
-   * @param t Transaction in which the object is to be accessed
-   * @param file A filename on the client's filesystem
-   */
-  void to_file(dbtransaction &t, std::string_view file) const;
-
-  /// Delete large object from database
-  /** Unlike its low-level equivalent cunlink, this will throw an exception if
-   * deletion fails.
-   * @param t Transaction in which the object is to be deleted
-   */
-  void remove(dbtransaction &t) const;
-
-protected:
-  PQXX_PURE static internal::pq::PGconn *
-  raw_connection(dbtransaction const &T);
-
-  PQXX_PRIVATE std::string reason(connection const &, int err) const;
-
-private:
-  oid m_id = oid_none;
-};
-
-
-/// Accessor for large object's contents.
-/** @deprecated Use the `blob` class instead.
- */
-class PQXX_LIBEXPORT largeobjectaccess : private largeobject
-{
-public:
-  using largeobject::size_type;
-  using off_type = size_type;
-  using pos_type = size_type;
-
-  /// Open mode: `in`, `out` (can be combined using "bitwise or").
-  /** According to the C++ standard, these should be in `std::ios_base`.  We
-   * take them from derived class `std::ios` instead, which is easier on the
-   * eyes.
-   *
-   * Historical note: taking it from std::ios was originally a workaround for a
-   * problem with gcc 2.95.
-   */
-  using openmode = std::ios::openmode;
-
-  /// Default open mode: in, out, binary.
-  static constexpr auto default_mode{
-    std::ios::in | std::ios::out | std::ios::binary};
-
-  /// Seek direction: `beg`, `cur`, `end`.
-  using seekdir = std::ios::seekdir;
-
-  /// Create new large object and open it.
-  /**
-   * @param t Backend transaction in which the object is to be created.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobjectaccess(
-    dbtransaction &t, openmode mode = default_mode);
-
-  /// Open large object with given oid.
-  /** Convert combination of a transaction and object identifier into a
-   * large object identity.  Does not affect the database.
-   * @param t Transaction in which the object is to be accessed.
-   * @param o Object identifier for the given object.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, oid o, openmode mode = default_mode);
-
-  /// Open given large object.
-  /** Open a large object with the given identity for reading and/or writing.
-   * @param t Transaction in which the object is to be accessed.
-   * @param o Identity for the large object to be accessed.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, largeobject o, openmode mode = default_mode);
-
-  /// Import large object from a local file and open it.
-  /** Creates a large object containing the data found in the given file.
-   * @param t Backend transaction in which the large object is to be created.
-   * @param file A filename on the client program's filesystem.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, std::string_view file, openmode mode = default_mode);
-
-  ~largeobjectaccess() noexcept { close(); }
-
-  /// Object identifier.
-  /** The number returned by this function uniquely identifies the large object
-   * in the context of the database we're connected to.
-   */
-  using largeobject::id;
-
-  /// Export large object's contents to a local file.
-  /** Writes the data stored in the large object to the given file.
-   * @param file A filename on the client's filesystem.
-   */
-  void to_file(std::string_view file) const
-  {
-    largeobject::to_file(m_trans, file);
-  }
-
-  using largeobject::to_file;
-
-  /**
-   * @name High-level access to object contents.
-   */
-  //@{
-  /// Write data to large object.
-  /** @warning The size of a write is currently limited to 2GB.
-   *
-   * @param buf Data to write.
-   * @param len Number of bytes from Buf to write.
-   */
-  void write(char const buf[], std::size_t len);
-
-  /// Write string to large object.
-  /** If not all bytes could be written, an exception is thrown.
-   * @param buf Data to write; no terminating zero is written.
-   */
-  void write(std::string_view buf) { write(std::data(buf), std::size(buf)); }
-
-  /// Read data from large object.
-  /** Throws an exception if an error occurs while reading.
-   * @param buf Location to store the read data in.
-   * @param len Number of bytes to try and read.
-   * @return Number of bytes read, which may be less than the number requested
-   * if the end of the large object is reached.
-   */
-  size_type read(char buf[], std::size_t len);
-
-  /// Seek in large object's data stream.
-  /** Throws an exception if an error occurs.
-   * @return The new position in the large object
-   */
-  size_type seek(size_type dest, seekdir dir);
-
-  /// Report current position in large object's data stream.
-  /** Throws an exception if an error occurs.
-   * @return The current position in the large object.
-   */
-  [[nodiscard]] size_type tell() const;
-  //@}
-
-  /**
-   * @name Low-level access to object contents.
-   *
-   * These functions provide a more "C-like" access interface, returning
-   * special values instead of throwing exceptions on error.  These functions
-   * are generally best avoided in favour of the high-level access functions,
-   * which behave more like C++ functions should.
-   *
-   * Due to libpq's underlying API, some operations are limited to "int"
-   * sizes, typically 2 GB, even though a large object can grow much larger.
-   */
-  //@{
-  /// Seek in large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param dest Offset to go to.
-   * @param dir Origin to which dest is relative: ios_base::beg (from beginning
-   *        of the object), ios_base::cur (from current access position), or
-   *        ios_base;:end (from end of object).
-   * @return New position in large object, or -1 if an error occurred.
-   */
-  pos_type cseek(off_type dest, seekdir dir) noexcept;
-
-  /// Write to large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param buf Data to write.
-   * @param len Number of bytes to write.
-   * @return Number of bytes actually written, or -1 if an error occurred.
-   */
-  off_type cwrite(char const buf[], std::size_t len) noexcept;
-
-  /// Read from large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param buf Area where incoming bytes should be stored.
-   * @param len Number of bytes to read.
-   * @return Number of bytes actually read, or -1 if an error occurred..
-   */
-  off_type cread(char buf[], std::size_t len) noexcept;
-
-  /// Report current position in large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @return Current position in large object, of -1 if an error occurred.
-   */
-  [[nodiscard]] pos_type ctell() const noexcept;
-  //@}
-
-  /**
-   * @name Error/warning output
-   */
-  //@{
-  /// Issue message to transaction's notice processor.
-  void process_notice(zview) noexcept;
-  //@}
-
-  using largeobject::remove;
-
-  using largeobject::operator==;
-  using largeobject::operator!=;
-  using largeobject::operator<;
-  using largeobject::operator<=;
-  using largeobject::operator>;
-  using largeobject::operator>=;
-
-  largeobjectaccess() = delete;
-  largeobjectaccess(largeobjectaccess const &) = delete;
-  largeobjectaccess operator=(largeobjectaccess const &) = delete;
-
-private:
-  PQXX_PRIVATE std::string reason(int err) const;
-  internal::pq::PGconn *raw_connection() const
-  {
-    return largeobject::raw_connection(m_trans);
-  }
-
-  PQXX_PRIVATE void open(openmode mode);
-  void close() noexcept;
-
-  dbtransaction &m_trans;
-  int m_fd = -1;
-};
-
-
-/// Streambuf to use large objects in standard I/O streams.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * The standard streambuf classes provide uniform access to data storage such
- * as files or string buffers, so they can be accessed using standard input or
- * output streams.  This streambuf implementation provided similar access to
- * large objects, so they could be read and written using the same stream
- * classes.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class largeobject_streambuf : public std::basic_streambuf<CHAR, TRAITS>
-{
-  using size_type = largeobject::size_type;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-  using openmode = largeobjectaccess::openmode;
-  using seekdir = largeobjectaccess::seekdir;
-
-  /// Default open mode: in, out, binary.
-  static constexpr auto default_mode{
-    std::ios::in | std::ios::out | std::ios::binary};
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  [[deprecated("Use blob instead.")]] largeobject_streambuf(
-    dbtransaction &t, largeobject o, openmode mode = default_mode,
-    size_type buf_size = 512) :
-          m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr}
-  {
-    initialize(mode);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  [[deprecated("Use blob instead.")]] largeobject_streambuf(
-    dbtransaction &t, oid o, openmode mode = default_mode,
-    size_type buf_size = 512) :
-          m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr}
-  {
-    initialize(mode);
-  }
-
-  virtual ~largeobject_streambuf() noexcept
-  {
-    delete[] m_p;
-    delete[] m_g;
-  }
-
-  /// For use by large object stream classes.
-  void process_notice(zview const &s) { m_obj.process_notice(s); }
-
-protected:
-  virtual int sync() override
-  {
-    // setg() sets eback, gptr, egptr.
-    this->setg(this->eback(), this->eback(), this->egptr());
-    return overflow(eof());
-  }
-
-  virtual pos_type seekoff(off_type offset, seekdir dir, openmode) override
-  {
-    return adjust_eof(m_obj.cseek(largeobjectaccess::off_type(offset), dir));
-  }
-
-  virtual pos_type seekpos(pos_type pos, openmode) override
-  {
-    largeobjectaccess::pos_type const newpos{
-      m_obj.cseek(largeobjectaccess::off_type(pos), std::ios::beg)};
-    return adjust_eof(newpos);
-  }
-
-  virtual int_type overflow(int_type ch) override
-  {
-    auto *const pp{this->pptr()};
-    if (pp == nullptr)
-      return eof();
-    auto *const pb{this->pbase()};
-    int_type res{0};
-
-    if (pp > pb)
-    {
-      auto const write_sz{pp - pb};
-      auto const written_sz{
-        m_obj.cwrite(pb, static_cast<std::size_t>(pp - pb))};
-      if (internal::cmp_less_equal(written_sz, 0))
-        throw internal_error{
-          "pqxx::largeobject: write failed "
-          "(is transaction still valid on write or flush?), "
-          "libpq reports error"};
-      else if (write_sz != written_sz)
-        throw internal_error{
-          "pqxx::largeobject: write failed "
-          "(is transaction still valid on write or flush?), " +
-          std::to_string(written_sz) + "/" + std::to_string(write_sz) +
-          " bytes written"};
-      auto const out{adjust_eof(written_sz)};
-
-      if constexpr (std::is_arithmetic_v<decltype(out)>)
-        res = check_cast<int_type>(out, "largeobject position"sv);
-      else
-        res = int_type(out);
-    }
-    this->setp(m_p, m_p + m_bufsize);
-
-    // Write that one more character, if it's there.
-    if (ch != eof())
-    {
-      *this->pptr() = static_cast<char_type>(ch);
-      this->pbump(1);
-    }
-    return res;
-  }
-
-  virtual int_type overflow() { return overflow(eof()); }
-
-  virtual int_type underflow() override
-  {
-    if (this->gptr() == nullptr)
-      return eof();
-    auto *const eb{this->eback()};
-    auto const res{adjust_eof(
-      m_obj.cread(this->eback(), static_cast<std::size_t>(m_bufsize)))};
-    this->setg(
-      eb, eb, eb + (res == eof() ? 0 : static_cast<std::size_t>(res)));
-    return (res == eof() or res == 0) ? eof() : traits_type::to_int_type(*eb);
-  }
-
-private:
-  /// Shortcut for traits_type::eof().
-  static int_type eof() { return traits_type::eof(); }
-
-  /// Helper: change error position of -1 to EOF (probably a no-op).
-  template<typename INTYPE> static std::streampos adjust_eof(INTYPE pos)
-  {
-    bool const at_eof{pos == -1};
-    if constexpr (std::is_arithmetic_v<std::streampos>)
-    {
-      return check_cast<std::streampos>(
-        (at_eof ? eof() : pos), "large object seek"sv);
-    }
-    else
-    {
-      return std::streampos(at_eof ? eof() : pos);
-    }
-  }
-
-  void initialize(openmode mode)
-  {
-    if ((mode & std::ios::in) != 0)
-    {
-      m_g = new char_type[unsigned(m_bufsize)];
-      this->setg(m_g, m_g, m_g);
-    }
-    if ((mode & std::ios::out) != 0)
-    {
-      m_p = new char_type[unsigned(m_bufsize)];
-      this->setp(m_p, m_p + m_bufsize);
-    }
-  }
-
-  size_type const m_bufsize;
-  largeobjectaccess m_obj;
-
-  /// Get & put buffers.
-  char_type *m_g, *m_p;
-};
-
-
-/// Input stream that gets its data from a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This class worked like any other istream, but to read data from a large
- * object.  It supported all formatting and streaming operations of
- * `std::istream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_ilostream : public std::basic_istream<CHAR, TRAITS>
-{
-  using super = std::basic_istream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create a basic_ilostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_ilostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::in | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// Create a basic_ilostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Identifier of a large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_ilostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::in | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using ilostream = basic_ilostream<char>;
-
-
-/// Output stream that writes data back to a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This worked like any other ostream, but to write data to a large object.
- * It supported all formatting and streaming operations of `std::ostream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_olostream : public std::basic_ostream<CHAR, TRAITS>
-{
-  using super = std::basic_ostream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create a basic_olostream.
-  /**
-   * @param t transaction in which this stream is to exist.
-   * @param o a large object to access.
-   * @param buf_size size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_olostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// Create a basic_olostream.
-  /**
-   * @param t transaction in which this stream is to exist.
-   * @param o a large object to access.
-   * @param buf_size size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_olostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  ~basic_olostream()
-  {
-    try
-    {
-      m_buf.pubsync();
-      m_buf.pubsync();
-    }
-    catch (std::exception const &e)
-    {
-      m_buf.process_notice(e.what());
-    }
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using olostream = basic_olostream<char>;
-
-
-/// Stream that reads and writes a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This worked like a std::iostream, but to read data from, or write data to, a
- * large object.  It supported all formatting and streaming operations of
- * `std::iostream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_lostream : public std::basic_iostream<CHAR, TRAITS>
-{
-  using super = std::basic_iostream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-  /// Create a basic_lostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_lostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{
-            t, o, std::ios::in | std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  /// Create a basic_lostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_lostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{
-            t, o, std::ios::in | std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  ~basic_lostream()
-  {
-    try
-    {
-      m_buf.pubsync();
-      m_buf.pubsync();
-    }
-    catch (std::exception const &e)
-    {
-      m_buf.process_notice(e.what());
-    }
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using lostream = basic_lostream<char>;
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/nontransaction b/ext/libpqxx-7.7.3/include/pqxx/nontransaction
deleted file mode 100644
index bb5b79724..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/nontransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::nontransaction class.
- *
- * pqxx::nontransaction provides nontransactional database access.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/nontransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/nontransaction.hxx b/ext/libpqxx-7.7.3/include/pqxx/nontransaction.hxx
deleted file mode 100644
index c50715594..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/nontransaction.hxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Definition of the pqxx::nontransaction class.
- *
- * pqxx::nontransaction provides nontransactional database access
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/nontransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_NONTRANSACTION
-#define PQXX_H_NONTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/connection.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/transaction.hxx"
-
-namespace pqxx
-{
-using namespace std::literals;
-
-/// Simple "transaction" class offering no transactional integrity.
-/**
- * @ingroup transactions
- *
- * nontransaction, like transaction or any other transaction_base-derived
- * class, provides access to a database through a connection.  Unlike its
- * siblings, however, nontransaction does not maintain any kind of
- * transactional integrity.  This may be useful eg. for read-only access to the
- * database that does not require a consistent, atomic view on its data; or for
- * operations that are not allowed within a backend transaction, such as
- * creating tables.
- *
- * For queries that update the database, however, a real transaction is likely
- * to be faster unless the transaction consists of only a single record update.
- *
- * Also, you can keep a nontransaction open for as long as you like.  Actual
- * back-end transactions are limited in lifespan, and will sometimes fail just
- * because they took too long to execute or were left idle for too long.  This
- * will not happen with a nontransaction (although the connection may still
- * time out, e.g. when the network is unavailable for a very long time).
- *
- * Any query executed in a nontransaction is committed immediately, and neither
- * commit() nor abort() has any effect.
- *
- * Database features that require a backend transaction, such as cursors or
- * large objects, will not work in a nontransaction.
- */
-class PQXX_LIBEXPORT nontransaction final : public transaction_base
-{
-public:
-  /// Constructor.
-  /** Create a "dummy" transaction.
-   * @param c Connection in which this "transaction" will operate.
-   * @param tname Optional tname for the transaction, beginning with a letter
-   * and containing only letters and digits.
-   */
-  nontransaction(connection &c, std::string_view tname = ""sv) :
-          transaction_base{c, tname, std::shared_ptr<std::string>{}}
-  {
-    register_transaction();
-  }
-
-  virtual ~nontransaction() override { close(); }
-
-private:
-  virtual void do_commit() override {}
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/notification b/ext/libpqxx-7.7.3/include/pqxx/notification
deleted file mode 100644
index a0bd1c73e..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/notification
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::notification_receiver functor interface.
- *
- * pqxx::notification_receiver handles incoming notifications.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/notification.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/notification.hxx b/ext/libpqxx-7.7.3/include/pqxx/notification.hxx
deleted file mode 100644
index b59b8567a..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/notification.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Definition of the pqxx::notification_receiver functor interface.
- *
- * pqxx::notification_receiver handles incoming notifications.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/notification instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_NOTIFICATION
-#define PQXX_H_NOTIFICATION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <string>
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx
-{
-/// "Observer" base class for notifications.
-/** @addtogroup notification Notifications and Receivers
- *
- * To listen on a notification issued using the NOTIFY command, derive your own
- * class from notification_receiver and define its function-call operator to
- * perform whatever action you wish to take when the given notification
- * arrives. Then create an object of that class and pass it to your connection.
- * DO NOT use raw SQL to listen for notifications, or your attempts to listen
- * won't be resumed when a connection fails--and you'll have no way to notice.
- *
- * Notifications never arrive inside a transaction, not even in a
- * nontransaction.  Therefore, you are free to open a transaction of your own
- * inside your receiver's function invocation operator.
- *
- * Notifications you are listening for may arrive anywhere within libpqxx code,
- * but be aware that **PostgreSQL defers notifications occurring inside
- * transactions.**  (This was done for excellent reasons; just think about what
- * happens if the transaction where you happen to handle an incoming
- * notification is later rolled back for other reasons).  So if you're keeping
- * a transaction open, don't expect any of your receivers on the same
- * connection to be notified.
- *
- * (For very similar reasons, outgoing notifications are also not sent until
- * the transaction that sends them commits.)
- *
- * Multiple receivers on the same connection may listen on a notification of
- * the same name.  An incoming notification is processed by invoking all
- * receivers (zero or more) of the same name.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE notification_receiver
-{
-public:
-  /// Register the receiver with a connection.
-  /**
-   * @param c Connnection to operate on.
-   * @param channel Name of the notification to listen for.
-   */
-  notification_receiver(connection &c, std::string_view channel);
-  /// Register the receiver with a connection.
-  notification_receiver(notification_receiver const &) = delete;
-  /// Register the receiver with a connection.
-  notification_receiver &operator=(notification_receiver const &) = delete;
-  /// Deregister the receiver.
-  virtual ~notification_receiver();
-
-  /// The channel that this receiver listens on.
-  [[nodiscard]] std::string const &channel() const & { return m_channel; }
-
-  // TODO: Change API to take payload as zview instead of string ref.
-  /// Overridable: action to invoke when notification arrives.
-  /**
-   * @param payload An optional string that may have been passed to the NOTIFY
-   * command.
-   * @param backend_pid Process ID of the database backend process that served
-   * our connection when the notification arrived.  The actual process ID
-   * behind the connection may have changed by the time this method is called.
-   */
-  virtual void operator()(std::string const &payload, int backend_pid) = 0;
-
-protected:
-  connection &conn() const noexcept { return m_conn; }
-
-private:
-  connection &m_conn;
-  std::string m_channel;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/params b/ext/libpqxx-7.7.3/include/pqxx/params
deleted file mode 100644
index 4098782aa..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/params
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Helper classes for passing statement parameters.
- *
- * Use these for prepared statements and parameterised statements.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/params.hxx b/ext/libpqxx-7.7.3/include/pqxx/params.hxx
deleted file mode 100644
index 2d29cdfed..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/params.hxx
+++ /dev/null
@@ -1,383 +0,0 @@
-/* Helpers for prepared statements and parameterised statements.
- *
- * See the connection class for more about such statements.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_PARAMS
-#define PQXX_H_PARAMS
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <array>
-
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/statement_parameters.hxx"
-#include "pqxx/types.hxx"
-
-
-/// @deprecated The new @ref params class replaces all of this.
-namespace pqxx::prepare
-{
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * sequence ranging from `begin` to `end` exclusively.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic sequences.
- *
- * @param begin A pointer or iterator for iterating parameters.
- * @param end A pointer or iterator for iterating parameters.
- * @return An object representing the parameters.
- */
-template<typename IT>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(IT begin, IT end)
-{
-  return pqxx::internal::dynamic_params(begin, end);
-}
-
-
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * container of parameter values.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic containers.
- *
- * @param container A container of parameter values.
- * @return An object representing the parameters.
- */
-template<typename C>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(C const &container)
-{
-  using IT = typename C::const_iterator;
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return pqxx::internal::dynamic_params<IT>{container};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * container of parameter values.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic containers.
- *
- * @param container A container of parameter values.
- * @param accessor For each parameter `p`, pass `accessor(p)`.
- * @return An object representing the parameters.
- */
-template<typename C, typename ACCESSOR>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(C &container, ACCESSOR accessor)
-{
-  using IT = decltype(std::begin(container));
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return pqxx::internal::dynamic_params<IT, ACCESSOR>{container, accessor};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-} // namespace pqxx::prepare
-
-
-namespace pqxx
-{
-/// Generate parameter placeholders for use in an SQL statement.
-/** When you want to pass parameters to a prepared statement or a parameterised
- * statement, you insert placeholders into the SQL.  During invocation, the
- * database replaces those with the respective parameter values you passed.
- *
- * The placeholders look like `$1` (for the first parameter value), `$2` (for
- * the second), and so on.  You can just write those directly in your
- * statement.  But for those rare cases where it becomes difficult to track
- * which number a placeholder should have, you can use a `placeholders` object
- * to count and generate them in order.
- */
-template<typename COUNTER = unsigned int> class placeholders
-{
-public:
-  /// Maximum number of parameters we support.
-  static inline constexpr unsigned int max_params{
-    (std::numeric_limits<COUNTER>::max)()};
-
-  placeholders()
-  {
-    static constexpr auto initial{"$1\0"sv};
-    initial.copy(std::data(m_buf), std::size(initial));
-  }
-
-  /// Read an ephemeral version of the current placeholder text.
-  /** @warning Changing the current placeholder number will overwrite this.
-   * Use the view immediately, or lose it.
-   */
-  constexpr zview view() const &noexcept
-  {
-    return zview{std::data(m_buf), m_len};
-  }
-
-  /// Read the current placeholder text, as a `std::string`.
-  /** This will be slightly slower than converting to a `zview`.  With most
-   * C++ implementations however, until you get into ridiculous numbers of
-   * parameters, the string will benefit from the Short String Optimization, or
-   * SSO.
-   */
-  std::string get() const { return std::string(std::data(m_buf), m_len); }
-
-  /// Move on to the next parameter.
-  void next() &
-  {
-    if (m_current >= max_params)
-      throw range_error{pqxx::internal::concat(
-        "Too many parameters in one statement: limit is ", max_params, ".")};
-    ++m_current;
-    if (m_current % 10 == 0)
-    {
-      // Carry the 1.  Don't get too clever for this relatively rare
-      // case, just rewrite the entire number.  Leave the $ in place
-      // though.
-      char *const data{std::data(m_buf)};
-      char *const end{string_traits<COUNTER>::into_buf(
-        data + 1, data + std::size(m_buf), m_current)};
-      // (Subtract because we don't include the trailing zero.)
-      m_len = check_cast<COUNTER>(end - data, "placeholders counter") - 1;
-    }
-    else
-    {
-      PQXX_LIKELY
-      // Shortcut for the common case: just increment that last digit.
-      ++m_buf[m_len - 1];
-    }
-  }
-
-  /// Return the current placeholder number.  The initial placeholder is 1.
-  COUNTER count() const noexcept { return m_current; }
-
-private:
-  /// Current placeholder number.  Starts at 1.
-  COUNTER m_current = 1;
-
-  /// Length of the current placeholder string, not including trailing zero.
-  COUNTER m_len = 2;
-
-  /// Text buffer where we render the placeholders, with a trailing zero.
-  /** We keep reusing this for every subsequent placeholder, just because we
-   * don't like string allocations.
-   *
-   * Maximum length is the maximum base-10 digits that COUNTER can fully
-   * represent, plus 1 more for the extra digit that it can only partially
-   * fill up, plus room for the dollar sign and the trailing zero.
-   */
-  std::array<char, std::numeric_limits<COUNTER>::digits10 + 3> m_buf;
-};
-
-
-/// Build a parameter list for a parameterised or prepared statement.
-/** When calling a parameterised statement or a prepared statement, you can
- * pass parameters into the statement directly in the invocation, as
- * additional arguments to `exec_prepared` or `exec_params`.  But in
- * complex cases, sometimes that's just not convenient.
- *
- * In those situations, you can create a `params` and append your parameters
- * into that, one by one.  Then you pass the `params` to `exec_prepared` or
- * `exec_params`.
- *
- * Combinations also work: if you have a `params` containing a string
- * parameter, and you call `exec_params` with an `int` argument followed by
- * your `params`, you'll be passing the `int` as the first parameter and
- * the string as the second.  You can even insert a `params` in a `params`,
- * or pass two `params` objects to a statement.
- */
-class PQXX_LIBEXPORT params
-{
-public:
-  params() = default;
-
-  /// Pre-populate a `params` with `args`.  Feel free to add more later.
-  template<typename... Args> constexpr params(Args &&...args)
-  {
-    reserve(sizeof...(args));
-    append_pack(std::forward<Args>(args)...);
-  }
-
-  /// Pre-allocate room for at least `n` parameters.
-  /** This is not needed, but it may improve efficiency.
-   *
-   * Reserve space if you're going to add parameters individually, and you've
-   * got some idea of how many there are going to be.  It may save some
-   * memory re-allocations.
-   */
-  void reserve(std::size_t n) &;
-
-  // C++20: constexpr.
-  /// Get the number of parameters currently in this `params`.
-  [[nodiscard]] auto size() const noexcept { return m_params.size(); }
-
-  // C++20: Use the vector's ssize() directly and go noexcept+constexpr.
-  /// Get the number of parameters (signed).
-  /** Unlike `size()`, this is not yet `noexcept`.  That's because C++17's
-   * `std::vector` does not have a `ssize()` member function.  These member
-   * functions are `noexcept`, but `std::size()` and `std::ssize()` are
-   * not.
-   */
-  [[nodiscard]] auto ssize() const { return pqxx::internal::ssize(m_params); }
-
-  /// Append a null value.
-  void append() &;
-
-  /// Append a non-null zview parameter.
-  /** The underlying data must stay valid for as long as the `params`
-   * remains active.
-   */
-  void append(zview) &;
-
-  /// Append a non-null string parameter.
-  /** Copies the underlying data into internal storage.  For best efficiency,
-   * use the @ref zview variant if you can, or `std::move()`
-   */
-  void append(std::string const &) &;
-
-  /// Append a non-null string parameter.
-  void append(std::string &&) &;
-
-  /// Append a non-null binary parameter.
-  /** The underlying data must stay valid for as long as the `params`
-   * remains active.
-   */
-  void append(std::basic_string_view<std::byte>) &;
-
-  /// Append a non-null binary parameter.
-  /** Copies the underlying data into internal storage.  For best efficiency,
-   * use the `std::basic_string_view<std::byte>` variant if you can, or
-   * `std::move()`.
-   */
-  void append(std::basic_string<std::byte> const &) &;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Append a non-null binary parameter.
-  /** The `data` object must stay in place and unchanged, for as long as the
-   * `params` remains active.
-   */
-  template<binary DATA> void append(DATA const &data) &
-  {
-    append(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif // PQXX_HAVE_CONCEPTS
-
-  /// Append a non-null binary parameter.
-  void append(std::basic_string<std::byte> &&) &;
-
-  /// @deprecated Append binarystring parameter.
-  /** The binarystring must stay valid for as long as the `params` remains
-   * active.
-   */
-  void append(binarystring const &value) &;
-
-  /// Append all parameters from value.
-  template<typename IT, typename ACCESSOR>
-  void append(pqxx::internal::dynamic_params<IT, ACCESSOR> const &value) &
-  {
-    for (auto &param : value) append(value.access(param));
-  }
-
-  void append(params const &value) &;
-
-  void append(params &&value) &;
-
-  /// Append a non-null parameter, converting it to its string
-  /// representation.
-  template<typename TYPE> void append(TYPE const &value) &
-  {
-    // TODO: Pool storage for multiple string conversions in one buffer?
-    if constexpr (nullness<strip_t<TYPE>>::always_null)
-    {
-      ignore_unused(value);
-      m_params.emplace_back();
-    }
-    else if (is_null(value))
-    {
-      m_params.emplace_back();
-    }
-    else
-    {
-      m_params.emplace_back(entry{to_string(value)});
-    }
-  }
-
-  /// Append all elements of `range` as parameters.
-  template<PQXX_RANGE_ARG RANGE> void append_multi(RANGE const &range) &
-  {
-#if defined(PQXX_HAVE_CONCEPTS)
-    if constexpr (std::ranges::sized_range<RANGE>)
-      reserve(std::size(*this) + std::size(range));
-#endif
-    for (auto &value : range) append(value);
-  }
-
-  /// For internal use: Generate a `params` object for use in calls.
-  /** The params object encapsulates the pointers which we will need to pass
-   * to libpq when calling a parameterised or prepared statement.
-   *
-   * The pointers in the params will refer to storage owned by either the
-   * params object, or the caller.  This is not a problem because a
-   * `c_params` object is guaranteed to live only while the call is going on.
-   * As soon as we climb back out of that call tree, we're done with that
-   * data.
-   */
-  pqxx::internal::c_params make_c_params() const;
-
-private:
-  /// Recursively append a pack of params.
-  template<typename Arg, typename... More>
-  void append_pack(Arg &&arg, More &&...args)
-  {
-    this->append(std::forward<Arg>(arg));
-    // Recurse for remaining args.
-    append_pack(std::forward<More>(args)...);
-  }
-
-  /// Terminating case: append an empty parameter pack.  It's not hard BTW.
-  constexpr void append_pack() noexcept {}
-
-  // The way we store a parameter depends on whether it's binary or text
-  // (most types are text), and whether we're responsible for storing the
-  // contents.
-  using entry = std::variant<
-    std::nullptr_t, zview, std::string, std::basic_string_view<std::byte>,
-    std::basic_string<std::byte>>;
-  std::vector<entry> m_params;
-
-  static constexpr std::string_view s_overflow{
-    "Statement parameter length overflow."sv};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/pipeline b/ext/libpqxx-7.7.3/include/pqxx/pipeline
deleted file mode 100644
index bf828843a..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/pipeline
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::pipeline class.
- *
- * Throughput-optimized query interface.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/pipeline.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/pipeline.hxx b/ext/libpqxx-7.7.3/include/pqxx/pipeline.hxx
deleted file mode 100644
index 049dcdd58..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/pipeline.hxx
+++ /dev/null
@@ -1,237 +0,0 @@
-/* Definition of the pqxx::pipeline class.
- *
- *   Throughput-optimized mechanism for executing queries.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/pipeline instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_PIPELINE
-#define PQXX_H_PIPELINE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <limits>
-#include <map>
-#include <string>
-
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-// TODO: libpq 14 introduced a similar "pipeline mode."  Can we use that?
-
-/// Processes several queries in FIFO manner, optimized for high throughput.
-/** Use a pipeline if you want to keep doing useful work while your queries are
- * executing.  Result retrieval is decoupled from execution request; queries
- * "go in at the front" and results "come out the back."
- *
- * Actually, you can retrieve the results in any order if you want, but it may
- * lead to surprising "time travel" effects if any of the queries fails.  In
- * particular, syntax errors in the queries can confuse things and show up too
- * early in the stream of results.
- *
- * Generally, if any of the queries fails, it will throw an exception at the
- * point where you request its result.  But it may happen earlier, especially
- * if you request results out of chronological order.
- *
- * @warning While a pipeline is active, you cannot execute queries, open
- * streams, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT pipeline : public transaction_focus
-{
-public:
-  /// Identifying numbers for queries.
-  using query_id = long;
-
-  pipeline(pipeline const &) = delete;
-  pipeline &operator=(pipeline const &) = delete;
-
-  /// Start a pipeline.
-  explicit pipeline(transaction_base &t) : transaction_focus{t, s_classname}
-  {
-    init();
-  }
-  /// Start a pipeline.  Assign it a name, for more helpful error messages.
-  pipeline(transaction_base &t, std::string_view tname) :
-          transaction_focus{t, s_classname, tname}
-  {
-    init();
-  }
-
-  /// Close the pipeline.
-  ~pipeline() noexcept;
-
-  /// Add query to the pipeline.
-  /** Queries accumulate in the pipeline, which sends them to the backend in a
-   * batch separated by semicolons.  The queries you insert must not use this
-   * trick themselves, or the pipeline will get hopelessly confused!
-   *
-   * @return Identifier for this query, unique only within this pipeline.
-   */
-  query_id insert(std::string_view) &;
-
-  /// Wait for all ongoing or pending operations to complete, and detach.
-  /** Detaches from the transaction when done.
-   *
-   * This does not produce the queries' results, so it may not report any
-   * errors which may have occurred in their execution.  To be sure that your
-   * statements succeeded, call @ref retrieve until the pipeline is empty.
-   */
-  void complete();
-
-  /// Forget all ongoing or pending operations and retrieved results.
-  /** Queries already sent to the backend may still be completed, depending
-   * on implementation and timing.
-   *
-   * Any error state (unless caused by an internal error) will also be cleared.
-   * This is mostly useful in a nontransaction, since a backend transaction is
-   * aborted automatically when an error occurs.
-   *
-   * Detaches from the transaction when done.
-   */
-  void flush();
-
-  /// Cancel ongoing query, if any.
-  /** May cancel any or all of the queries that have been inserted at this
-   * point whose results have not yet been retrieved.  If the pipeline lives in
-   * a backend transaction, that transaction may be left in a nonfunctional
-   * state in which it can only be aborted.
-   *
-   * Therefore, either use this function in a nontransaction, or abort the
-   * transaction after calling it.
-   */
-  void cancel();
-
-  /// Is result for given query available?
-  [[nodiscard]] bool is_finished(query_id) const;
-
-  /// Retrieve result for given query.
-  /** If the query failed for whatever reason, this will throw an exception.
-   * The function will block if the query has not finished yet.
-   * @warning If results are retrieved out-of-order, i.e. in a different order
-   * than the one in which their queries were inserted, errors may "propagate"
-   * to subsequent queries.
-   */
-  result retrieve(query_id qid)
-  {
-    return retrieve(m_queries.find(qid)).second;
-  }
-
-  /// Retrieve oldest unretrieved result (possibly wait for one).
-  /** @return The query's identifier and its result set. */
-  std::pair<query_id, result> retrieve();
-
-  [[nodiscard]] bool empty() const noexcept { return std::empty(m_queries); }
-
-  /// Set maximum number of queries to retain before issuing them to the
-  /// backend.
-  /** The pipeline will perform better if multiple queries are issued at once,
-   * but retaining queries until the results are needed (as opposed to issuing
-   * them to the backend immediately) may negate any performance benefits the
-   * pipeline can offer.
-   *
-   * Recommended practice is to set this value no higher than the number of
-   * queries you intend to insert at a time.
-   * @param retain_max A nonnegative "retention capacity;" passing zero will
-   * cause queries to be issued immediately
-   * @return Old retention capacity
-   */
-  int retain(int retain_max = 2) &;
-
-
-  /// Resume retained query emission.  Harmless when not needed.
-  void resume() &;
-
-private:
-  struct PQXX_PRIVATE Query
-  {
-    explicit Query(std::string_view q) :
-            query{std::make_shared<std::string>(q)}
-    {}
-
-    std::shared_ptr<std::string> query;
-    result res;
-  };
-
-  using QueryMap = std::map<query_id, Query>;
-
-  void init();
-  void attach();
-  void detach();
-
-  /// Upper bound to query id's.
-  static constexpr query_id qid_limit() noexcept
-  {
-    // Parenthesise this to work around an eternal Visual C++ problem:
-    // Without the extra parentheses, unless NOMINMAX is defined, the
-    // preprocessor will mistake this "max" for its annoying built-in macro
-    // of the same name.
-    return (std::numeric_limits<query_id>::max)();
-  }
-
-  /// Create new query_id.
-  PQXX_PRIVATE query_id generate_id();
-
-  bool have_pending() const noexcept
-  {
-    return m_issuedrange.second != m_issuedrange.first;
-  }
-
-  PQXX_PRIVATE void issue();
-
-  /// The given query failed; never issue anything beyond that.
-  void set_error_at(query_id qid) noexcept
-  {
-    PQXX_UNLIKELY
-    if (qid < m_error)
-      m_error = qid;
-  }
-
-  /// Throw pqxx::internal_error.
-  [[noreturn]] PQXX_PRIVATE void internal_error(std::string const &err);
-
-  PQXX_PRIVATE bool obtain_result(bool expect_none = false);
-
-  PQXX_PRIVATE void obtain_dummy();
-  PQXX_PRIVATE void get_further_available_results();
-  PQXX_PRIVATE void check_end_results();
-
-  /// Receive any results that happen to be available; it's not urgent.
-  PQXX_PRIVATE void receive_if_available();
-
-  /// Receive results, up to stop if possible.
-  PQXX_PRIVATE void receive(pipeline::QueryMap::const_iterator stop);
-  std::pair<pipeline::query_id, result> retrieve(pipeline::QueryMap::iterator);
-
-  QueryMap m_queries;
-  std::pair<QueryMap::iterator, QueryMap::iterator> m_issuedrange;
-  int m_retain = 0;
-  int m_num_waiting = 0;
-  query_id m_q_id = 0;
-
-  /// Is there a "dummy query" pending?
-  bool m_dummy_pending = false;
-
-  /// Point at which an error occurred; no results beyond it will be available
-  query_id m_error = qid_limit();
-
-  /// Encoding.
-  /** We store this in the object to avoid the risk of exceptions at awkward
-   * moments.
-   */
-  internal::encoding_group m_encoding;
-
-  static constexpr std::string_view s_classname{"pipeline"};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/pqxx b/ext/libpqxx-7.7.3/include/pqxx/pqxx
deleted file mode 100644
index 17a8eaa9c..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/pqxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/// Convenience header: include all libpqxx definitions.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/array.hxx"
-#include "pqxx/binarystring.hxx"
-#include "pqxx/blob.hxx"
-#include "pqxx/connection.hxx"
-#include "pqxx/cursor.hxx"
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/largeobject.hxx"
-#include "pqxx/nontransaction.hxx"
-#include "pqxx/notification.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/pipeline.hxx"
-#include "pqxx/prepared_statement.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/internal/result_iterator.hxx"
-#include "pqxx/internal/result_iter.hxx"
-#include "pqxx/robusttransaction.hxx"
-#include "pqxx/row.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/stream_to.hxx"
-#include "pqxx/subtransaction.hxx"
-#include "pqxx/transaction.hxx"
-#include "pqxx/transactor.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/prepared_statement b/ext/libpqxx-7.7.3/include/pqxx/prepared_statement
deleted file mode 100644
index 674be7090..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/prepared_statement
+++ /dev/null
@@ -1,3 +0,0 @@
-/// @deprecated Include @c <pqxx/params> instead.
-
-#include "params.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/prepared_statement.hxx b/ext/libpqxx-7.7.3/include/pqxx/prepared_statement.hxx
deleted file mode 100644
index 674be7090..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/prepared_statement.hxx
+++ /dev/null
@@ -1,3 +0,0 @@
-/// @deprecated Include @c <pqxx/params> instead.
-
-#include "params.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/range b/ext/libpqxx-7.7.3/include/pqxx/range
deleted file mode 100644
index 11985eca4..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/range
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Client-side support for SQL range types.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/range.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/range.hxx b/ext/libpqxx-7.7.3/include/pqxx/range.hxx
deleted file mode 100644
index dc480e4b7..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/range.hxx
+++ /dev/null
@@ -1,515 +0,0 @@
-#ifndef PQXX_H_RANGE
-#define PQXX_H_RANGE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <variant>
-
-#include "pqxx/internal/array-composite.hxx"
-#include "pqxx/internal/concat.hxx"
-
-namespace pqxx
-{
-/// An _unlimited_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should extend
- * to infinity on that side.
- *
- * An unlimited boundary is always inclusive of "infinity" values, if the
- * range's value type supports them.
- */
-struct no_bound
-{
-  template<typename TYPE> constexpr bool extends_down_to(TYPE const &) const
-  {
-    return true;
-  }
-  template<typename TYPE> constexpr bool extends_up_to(TYPE const &) const
-  {
-    return true;
-  }
-};
-
-
-/// An _inclusive_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should include
- * the value.
- */
-template<typename TYPE> class inclusive_bound
-{
-public:
-  inclusive_bound() = delete;
-  explicit inclusive_bound(TYPE const &value) : m_value{value}
-  {
-    if (is_null(value))
-      throw argument_error{"Got null value as an inclusive range bound."};
-  }
-
-  [[nodiscard]] constexpr TYPE const &get() const &noexcept { return m_value; }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as a lower bound, include value?
-  [[nodiscard]] bool extends_down_to(TYPE const &value) const
-  {
-    return not(value < m_value);
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as an upper bound, include value?
-  [[nodiscard]] bool extends_up_to(TYPE const &value) const
-  {
-    return not(m_value < value);
-  }
-
-private:
-  TYPE m_value;
-};
-
-
-/// An _exclusive_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should _not_
- * include the value.
- */
-template<typename TYPE> class exclusive_bound
-{
-public:
-  exclusive_bound() = delete;
-  explicit exclusive_bound(TYPE const &value) : m_value{value}
-  {
-    if (is_null(value))
-      throw argument_error{"Got null value as an exclusive range bound."};
-  }
-
-  [[nodiscard]] constexpr TYPE const &get() const &noexcept { return m_value; }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as a lower bound, include value?
-  [[nodiscard]] bool extends_down_to(TYPE const &value) const
-  {
-    return m_value < value;
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as an upper bound, include value?
-  [[nodiscard]] bool extends_up_to(TYPE const &value) const
-  {
-    return value < m_value;
-  }
-
-private:
-  TYPE m_value;
-};
-
-
-/// A range boundary value.
-/** A range bound is either no bound at all; or an inclusive bound; or an
- * exclusive bound.  Pass one of the three to the constructor.
- */
-template<typename TYPE> class range_bound
-{
-public:
-  range_bound() = delete;
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(no_bound) : m_bound{} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(inclusive_bound<TYPE> const &bound) : m_bound{bound} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(exclusive_bound<TYPE> const &bound) : m_bound{bound} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(range_bound const &) = default;
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(range_bound &&) = default;
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  bool operator==(range_bound const &rhs) const
-  {
-    if (this->is_limited())
-      return (
-        rhs.is_limited() and (this->is_inclusive() == rhs.is_inclusive()) and
-        (*this->value() == *rhs.value()));
-    else
-      return not rhs.is_limited();
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  bool operator!=(range_bound const &rhs) const { return not(*this == rhs); }
-  range_bound &operator=(range_bound const &) = default;
-  range_bound &operator=(range_bound &&) = default;
-
-  /// Is this a finite bound?
-  constexpr bool is_limited() const noexcept
-  {
-    return not std::holds_alternative<no_bound>(m_bound);
-  }
-
-  /// Is this boundary an inclusive one?
-  constexpr bool is_inclusive() const noexcept
-  {
-    return std::holds_alternative<inclusive_bound<TYPE>>(m_bound);
-  }
-
-  /// Is this boundary an exclusive one?
-  constexpr bool is_exclusive() const noexcept
-  {
-    return std::holds_alternative<exclusive_bound<TYPE>>(m_bound);
-  }
-
-  // TODO: constexpr/noexcept if underlying function supports it.
-  /// Would this bound, as a lower bound, include `value`?
-  bool extends_down_to(TYPE const &value) const
-  {
-    return std::visit(
-      [&value](auto const &bound) { return bound.extends_down_to(value); },
-      m_bound);
-  }
-
-  // TODO: constexpr/noexcept if underlying function supports it.
-  /// Would this bound, as an upper bound, include `value`?
-  bool extends_up_to(TYPE const &value) const
-  {
-    return std::visit(
-      [&value](auto const &bound) { return bound.extends_up_to(value); },
-      m_bound);
-  }
-
-  /// Return bound value, or `nullptr` if it's not limited.
-  [[nodiscard]] constexpr TYPE const *value() const &noexcept
-  {
-    return std::visit(
-      [](auto const &bound) noexcept {
-        using bound_t = std::decay_t<decltype(bound)>;
-        if constexpr (std::is_same_v<bound_t, no_bound>)
-          return static_cast<TYPE const *>(nullptr);
-        else
-          return &bound.get();
-      },
-      m_bound);
-  }
-
-private:
-  std::variant<no_bound, inclusive_bound<TYPE>, exclusive_bound<TYPE>> m_bound;
-};
-
-
-// C++20: Concepts for comparisons, construction, etc.
-/// A C++ equivalent to PostgreSQL's range types.
-/** You can use this as a client-side representation of a "range" in SQL.
- *
- * PostgreSQL defines several range types, differing in the data type over
- * which they range.  You can also define your own range types.
- *
- * Usually you'll want the server to deal with ranges.  But on occasions where
- * you need to work with them client-side, you may want to use @ref
- * pqxx::range. (In cases where all you do is pass them along to the server
- * though, it's not worth the complexity.  In that case you might as well treat
- * ranges as just strings.)
- *
- * For documentation on PostgreSQL's range types, see:
- * https://www.postgresql.org/docs/current/rangetypes.html
- *
- * The value type must be copyable and default-constructible, and support the
- * less-than (`<`) and equals (`==`) comparisons.  Value initialisation must
- * produce a consistent value.
- */
-template<typename TYPE> class range
-{
-public:
-  /// Create a range.
-  /** For each of the two bounds, pass a @ref no_bound, @ref inclusive_bound,
-   * or
-   * @ref exclusive_bound.
-   */
-  range(range_bound<TYPE> lower, range_bound<TYPE> upper) :
-          m_lower{lower}, m_upper{upper}
-  {
-    if (
-      lower.is_limited() and upper.is_limited() and
-      (*upper.value() < *lower.value()))
-      throw range_error{internal::concat(
-        "Range's lower bound (", *lower.value(),
-        ") is greater than its upper bound (", *upper.value(), ").")};
-  }
-
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  /// Create an empty range.
-  /** SQL has a separate literal to denote an empty range, but any range which
-   * encompasses no values is an empty range.
-   */
-  range() :
-          m_lower{exclusive_bound<TYPE>{TYPE{}}},
-          m_upper{exclusive_bound<TYPE>{TYPE{}}}
-  {}
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  bool operator==(range const &rhs) const
-  {
-    return (this->lower_bound() == rhs.lower_bound() and
-            this->upper_bound() == rhs.upper_bound()) or
-           (this->empty() and rhs.empty());
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  bool operator!=(range const &rhs) const { return !(*this == rhs); }
-
-  range(range const &) = default;
-  range(range &&) = default;
-  range &operator=(range const &) = default;
-  range &operator=(range &&) = default;
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Is this range clearly empty?
-  /** An empty range encompasses no values.
-   *
-   * It is possible to "fool" this.  For example, if your range is of an
-   * integer type and has exclusive bounds of 0 and 1, it encompasses no values
-   * but its `empty()` will return false.  The PostgreSQL implementation, by
-   * contrast, will notice that it is empty.  Similar things can happen for
-   * floating-point types, but with more subtleties and edge cases.
-   */
-  bool empty() const
-  {
-    return (m_lower.is_exclusive() or m_upper.is_exclusive()) and
-           m_lower.is_limited() and m_upper.is_limited() and
-           not(*m_lower.value() < *m_upper.value());
-  }
-
-  // TODO: constexpr and/or noexcept if underlying functions support it.
-  /// Does this range encompass `value`?
-  bool contains(TYPE value) const
-  {
-    return m_lower.extends_down_to(value) and m_upper.extends_up_to(value);
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  /// Does this range encompass all of `other`?
-  /** This function is not particularly smart.  It does not know, for example,
-   * that integer ranges `[0,9]` and `[0,10)` contain the same values.
-   */
-  bool contains(range<TYPE> const &other) const
-  {
-    return (*this & other) == other;
-  }
-
-  [[nodiscard]] constexpr range_bound<TYPE> const &
-  lower_bound() const &noexcept
-  {
-    return m_lower;
-  }
-  [[nodiscard]] constexpr range_bound<TYPE> const &
-  upper_bound() const &noexcept
-  {
-    return m_upper;
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  /// Intersection of two ranges.
-  /** Returns a range describing those values which are in both ranges.
-   */
-  range operator&(range const &other) const
-  {
-    range_bound<TYPE> lower{no_bound{}};
-    if (not this->lower_bound().is_limited())
-      lower = other.lower_bound();
-    else if (not other.lower_bound().is_limited())
-      lower = this->lower_bound();
-    else if (*this->lower_bound().value() < *other.lower_bound().value())
-      lower = other.lower_bound();
-    else if (*other.lower_bound().value() < *this->lower_bound().value())
-      lower = this->lower_bound();
-    else if (this->lower_bound().is_exclusive())
-      lower = this->lower_bound();
-    else
-      lower = other.lower_bound();
-
-    range_bound<TYPE> upper{no_bound{}};
-    if (not this->upper_bound().is_limited())
-      upper = other.upper_bound();
-    else if (not other.upper_bound().is_limited())
-      upper = this->upper_bound();
-    else if (*other.upper_bound().value() < *this->upper_bound().value())
-      upper = other.upper_bound();
-    else if (*this->upper_bound().value() < *other.upper_bound().value())
-      upper = this->upper_bound();
-    else if (this->upper_bound().is_exclusive())
-      upper = this->upper_bound();
-    else
-      upper = other.upper_bound();
-
-    if (
-      lower.is_limited() and upper.is_limited() and
-      (*upper.value() < *lower.value()))
-      return {};
-    else
-      return {lower, upper};
-  }
-
-  /// Convert to another base type.
-  template<typename DEST> operator range<DEST>() const
-  {
-    range_bound<DEST> lower{no_bound{}}, upper{no_bound{}};
-    if (lower_bound().is_inclusive())
-      lower = inclusive_bound<DEST>{*lower_bound().value()};
-    else if (lower_bound().is_exclusive())
-      lower = exclusive_bound<DEST>{*lower_bound().value()};
-
-    if (upper_bound().is_inclusive())
-      upper = inclusive_bound<DEST>{*upper_bound().value()};
-    else if (upper_bound().is_exclusive())
-      upper = exclusive_bound<DEST>{*upper_bound().value()};
-
-    return {lower, upper};
-  }
-
-private:
-  range_bound<TYPE> m_lower, m_upper;
-};
-
-
-/// String conversions for a @ref range type.
-/** Conversion assumes that either your client encoding is UTF-8, or the values
- * are pure ASCII.
- */
-template<typename TYPE> struct string_traits<range<TYPE>>
-{
-  [[nodiscard]] static inline zview
-  to_buf(char *begin, char *end, range<TYPE> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static inline char *
-  into_buf(char *begin, char *end, range<TYPE> const &value)
-  {
-    if (value.empty())
-    {
-      if ((end - begin) <= internal::ssize(s_empty))
-        throw conversion_overrun{s_overrun.c_str()};
-      char *here = begin + s_empty.copy(begin, std::size(s_empty));
-      *here++ = '\0';
-      return here;
-    }
-    else
-    {
-      if (end - begin < 4)
-        throw conversion_overrun{s_overrun.c_str()};
-      char *here = begin;
-      *here++ =
-        (static_cast<char>(value.lower_bound().is_inclusive() ? '[' : '('));
-      TYPE const *lower{value.lower_bound().value()};
-      // Convert bound (but go back to overwrite that trailing zero).
-      if (lower != nullptr)
-        here = string_traits<TYPE>::into_buf(here, end, *lower) - 1;
-      *here++ = ',';
-      TYPE const *upper{value.upper_bound().value()};
-      // Convert bound (but go back to overwrite that trailing zero).
-      if (upper != nullptr)
-        here = string_traits<TYPE>::into_buf(here, end, *upper) - 1;
-      if ((end - here) < 2)
-        throw conversion_overrun{s_overrun.c_str()};
-      *here++ =
-        static_cast<char>(value.upper_bound().is_inclusive() ? ']' : ')');
-      *here++ = '\0';
-      return here;
-    }
-  }
-
-  [[nodiscard]] static inline range<TYPE> from_string(std::string_view text)
-  {
-    if (std::size(text) < 3)
-      throw pqxx::conversion_error{err_bad_input(text)};
-    bool left_inc{false};
-    switch (text[0])
-    {
-    case '[': left_inc = true; break;
-
-    case '(': break;
-
-    case 'e':
-    case 'E':
-      if (
-        (std::size(text) != std::size(s_empty)) or
-        (text[1] != 'm' and text[1] != 'M') or
-        (text[2] != 'p' and text[2] != 'P') or
-        (text[3] != 't' and text[3] != 'T') or
-        (text[4] != 'y' and text[4] != 'Y'))
-        throw pqxx::conversion_error{err_bad_input(text)};
-      return {};
-      break;
-
-    default: throw pqxx::conversion_error{err_bad_input(text)};
-    }
-
-    auto scan{internal::get_glyph_scanner(internal::encoding_group::UTF8)};
-    // The field parser uses this to track which field it's parsing, and
-    // when not to expect a field separator.
-    std::size_t index{0};
-    // The last field we expect to see.
-    static constexpr std::size_t last{1};
-    // Current parsing position.  We skip the opening parenthesis or bracket.
-    std::size_t pos{1};
-    // The string may leave out either bound to indicate that it's unlimited.
-    std::optional<TYPE> lower, upper;
-    // We reuse the same field parser we use for composite values and arrays.
-    internal::parse_composite_field(index, text, pos, lower, scan, last);
-    internal::parse_composite_field(index, text, pos, upper, scan, last);
-
-    // We need one more character: the closing parenthesis or bracket.
-    if (pos != std::size(text))
-      throw pqxx::conversion_error{err_bad_input(text)};
-    char const closing{text[pos - 1]};
-    if (closing != ')' and closing != ']')
-      throw pqxx::conversion_error{err_bad_input(text)};
-    bool const right_inc{closing == ']'};
-
-    range_bound<TYPE> lower_bound{no_bound{}}, upper_bound{no_bound{}};
-    if (lower)
-    {
-      if (left_inc)
-        lower_bound = inclusive_bound{*lower};
-      else
-        lower_bound = exclusive_bound{*lower};
-    }
-    if (upper)
-    {
-      if (right_inc)
-        upper_bound = inclusive_bound{*upper};
-      else
-        upper_bound = exclusive_bound{*upper};
-    }
-
-    return {lower_bound, upper_bound};
-  }
-
-  [[nodiscard]] static inline constexpr std::size_t
-  size_buffer(range<TYPE> const &value) noexcept
-  {
-    TYPE const *lower{value.lower_bound().value()},
-      *upper{value.upper_bound().value()};
-    std::size_t const lsz{
-      lower == nullptr ? 0 : string_traits<TYPE>::size_buffer(*lower) - 1},
-      usz{upper == nullptr ? 0 : string_traits<TYPE>::size_buffer(*upper) - 1};
-
-    if (value.empty())
-      return std::size(s_empty) + 1;
-    else
-      return 1 + lsz + 1 + usz + 2;
-  }
-
-private:
-  static constexpr zview s_empty{"empty"_zv};
-  static constexpr auto s_overrun{"Not enough space in buffer for range."_zv};
-
-  /// Compose error message for invalid range input.
-  static std::string err_bad_input(std::string_view text)
-  {
-    return internal::concat("Invalid range input: '", text, "'");
-  }
-};
-
-
-/// A range type does not have an innate null value.
-template<typename TYPE> struct nullness<range<TYPE>> : no_null<range<TYPE>>
-{};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/result b/ext/libpqxx-7.7.3/include/pqxx/result
deleted file mode 100644
index 523394b72..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/result
+++ /dev/null
@@ -1,16 +0,0 @@
-/** pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/result.hxx"
-
-// Now include some types which depend on result, but which the user will
-// expect to see defined after including this header.
-#include "pqxx/internal/result_iterator.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/internal/result_iter.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/result.hxx b/ext/libpqxx-7.7.3/include/pqxx/result.hxx
deleted file mode 100644
index 6c41cc096..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/result.hxx
+++ /dev/null
@@ -1,335 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT
-#define PQXX_H_RESULT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <functional>
-#include <ios>
-#include <memory>
-#include <stdexcept>
-
-#include "pqxx/except.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-#include "pqxx/internal/encodings.hxx"
-
-
-namespace pqxx::internal
-{
-// TODO: Make noexcept (but breaks ABI).
-PQXX_LIBEXPORT void clear_result(pq::PGresult const *);
-} // namespace pqxx::internal
-
-
-namespace pqxx::internal::gate
-{
-class result_connection;
-class result_creation;
-class result_pipeline;
-class result_row;
-class result_sql_cursor;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Result set containing data returned by a query or command.
-/** This behaves as a container (as defined by the C++ standard library) and
- * provides random access const iterators to iterate over its rows.  You can
- * also access a row by indexing a `result R` by the row's zero-based
- * number:
- *
- *
- *	for (result::size_type i=0; i < std::size(R); ++i) Process(R[i]);
- *
- *
- * Result sets in libpqxx are lightweight, reference-counted wrapper objects
- * which are relatively small and cheap to copy.  Think of a result object as
- * a "smart pointer" to an underlying result set.
- *
- * @warning The result set that a result object points to is not thread-safe.
- * If you copy a result object, it still refers to the same underlying result
- * set.  So never copy, destroy, query, or otherwise access a result while
- * another thread may be copying, destroying, querying, or otherwise accessing
- * the same result set--even if it is doing so through a different result
- * object!
- */
-class PQXX_LIBEXPORT result
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-  using reference = row;
-  using const_iterator = const_result_iterator;
-  using pointer = const_iterator;
-  using iterator = const_iterator;
-  using const_reverse_iterator = const_reverse_result_iterator;
-  using reverse_iterator = const_reverse_iterator;
-
-  result() noexcept :
-          m_data{make_data_pointer()},
-          m_query{},
-          m_encoding{internal::encoding_group::MONOBYTE}
-  {}
-
-  result(result const &rhs) noexcept = default;
-  result(result &&rhs) noexcept = default;
-
-  /// Assign one result to another.
-  /** Copying results is cheap: it copies only smart pointers, but the actual
-   * data stays in the same place.
-   */
-  result &operator=(result const &rhs) noexcept = default;
-
-  /// Assign one result to another, invaliding the old one.
-  result &operator=(result &&rhs) noexcept = default;
-
-  /**
-   * @name Comparisons
-   *
-   * You can compare results for equality.  Beware: this is a very strict,
-   * dumb comparison.  The smallest difference between two results (such as a
-   * string "Foo" versus a string "foo") will make them unequal.
-   */
-  //@{
-  /// Compare two results for equality.
-  [[nodiscard]] bool operator==(result const &) const noexcept;
-  /// Compare two results for inequality.
-  [[nodiscard]] bool operator!=(result const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  /// Iterate rows, reading them directly into a tuple of "TYPE...".
-  /** Converts the fields to values of the given respective types.
-   *
-   * Use this only with a ranged "for" loop.  The iteration produces
-   * std::tuple<TYPE...> which you can "unpack" to a series of `auto`
-   * variables.
-   */
-  template<typename... TYPE> auto iter() const;
-
-  [[nodiscard]] const_reverse_iterator rbegin() const;
-  [[nodiscard]] const_reverse_iterator crbegin() const;
-  [[nodiscard]] const_reverse_iterator rend() const;
-  [[nodiscard]] const_reverse_iterator crend() const;
-
-  [[nodiscard]] const_iterator begin() const noexcept;
-  [[nodiscard]] const_iterator cbegin() const noexcept;
-  [[nodiscard]] inline const_iterator end() const noexcept;
-  [[nodiscard]] inline const_iterator cend() const noexcept;
-
-  [[nodiscard]] reference front() const noexcept;
-  [[nodiscard]] reference back() const noexcept;
-
-  [[nodiscard]] PQXX_PURE size_type size() const noexcept;
-  [[nodiscard]] PQXX_PURE bool empty() const noexcept;
-  [[nodiscard]] size_type capacity() const noexcept { return size(); }
-
-  /// Exchange two `result` values in an exception-safe manner.
-  /** If the swap fails, the two values will be exactly as they were before.
-   *
-   * The swap is not necessarily thread-safe.
-   */
-  void swap(result &) noexcept;
-
-  /// Index a row by number.
-  /** This returns a @ref row object.  Generally you should not keep the row
-   * around as a variable, but if you do, make sure that your variable is a
-   * `row`, not a `row&`.
-   */
-  [[nodiscard]] row operator[](size_type i) const noexcept;
-
-#if defined(PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT)
-  // TODO: If C++23 will let us, also accept string for the column.
-  [[nodiscard]] field
-  operator[](size_type row_num, row_size_type col_num) const noexcept;
-#endif
-
-  /// Index a row by number, but check that the row number is valid.
-  row at(size_type) const;
-
-  /// Index a field by row number and column number.
-  field at(size_type, row_size_type) const;
-
-  /// Let go of the result's data.
-  /** Use this if you need to deallocate the result data earlier than you can
-   * destroy the `result` object itself.
-   *
-   * Multiple `result` objects can refer to the same set of underlying data.
-   * The underlying data will be deallocated once all `result` objects that
-   * refer to it are cleared or destroyed.
-   */
-  void clear() noexcept
-  {
-    m_data.reset();
-    m_query = nullptr;
-  }
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Number of columns in result.
-  [[nodiscard]] PQXX_PURE row_size_type columns() const noexcept;
-
-  /// Number of given column (throws exception if it doesn't exist).
-  [[nodiscard]] row_size_type column_number(zview name) const;
-
-  /// Name of column with this number (throws exception if it doesn't exist)
-  [[nodiscard]] char const *column_name(row_size_type number) const &;
-
-  /// Return column's type, as an OID from the system catalogue.
-  [[nodiscard]] oid column_type(row_size_type col_num) const;
-
-  /// Return column's type, as an OID from the system catalogue.
-  [[nodiscard]] oid column_type(zview col_name) const
-  {
-    return column_type(column_number(col_name));
-  }
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(row_size_type col_num) const;
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(zview col_name) const
-  {
-    return column_table(column_number(col_name));
-  }
-
-  /// What column in its table did this column come from?
-  [[nodiscard]] row_size_type table_column(row_size_type col_num) const;
-
-  /// What column in its table did this column come from?
-  [[nodiscard]] row_size_type table_column(zview col_name) const
-  {
-    return table_column(column_number(col_name));
-  }
-  //@}
-
-  /// Query that produced this result, if available (empty string otherwise)
-  [[nodiscard]] PQXX_PURE std::string const &query() const &noexcept;
-
-  /// If command was an `INSERT` of 1 row, return oid of the inserted row.
-  /** @return Identifier of inserted row if exactly one row was inserted, or
-   * @ref oid_none otherwise.
-   */
-  [[nodiscard]] PQXX_PURE oid inserted_oid() const;
-
-  /// If command was `INSERT`, `UPDATE`, or `DELETE`: number of affected rows.
-  /** @return Number of affected rows if last command was `INSERT`, `UPDATE`,
-   * or `DELETE`; zero for all other commands.
-   */
-  [[nodiscard]] PQXX_PURE size_type affected_rows() const;
-
-  // C++20: Concept like std::invocable, but without specifying param types.
-  /// Run `func` on each row, passing the row's fields as parameters.
-  /** Goes through the rows from first to last.  You provide a callable `func`.
-   *
-   * For each row in the `result`, `for_each` will call `func`.  It converts
-   * the row's fields to the types of `func`'s parameters, and pass them to
-   * `func`.
-   *
-   * (Therefore `func` must have a _single_ signature.  It can't be a generic
-   * lambda, or an object of a class with multiple overloaded function call
-   * operators.  Otherwise, `for_each` will have no way to detect a parameter
-   * list without ambiguity.)
-   *
-   * If any of your parameter types is `std::string_view`, it refers to the
-   * underlying storage of this `result`.
-   *
-   * If any of your parameter types is a reference type, its argument will
-   * refer to a temporary value which only lives for the duration of that
-   * single invocation to `func`.  If the reference is an lvalue reference, it
-   * must be `const`.
-   *
-   * For example, this queries employee names and salaries from the database
-   * and prints how much each would like to earn instead:
-   * ```cxx
-   *   tx.exec("SELECT name, salary FROM employee").for_each(
-   *       [](std::string_view name, float salary){
-   *           std::cout << name << " would like " << salary * 2 << ".\n";
-   *       })
-   * ```
-   *
-   * If `func` throws an exception, processing stops at that point and
-   * propagates the exception.
-   *
-   * @throws usage_error if `func`'s number of parameters does not match the
-   * number of columns in this result.
-   */
-  template<typename CALLABLE> inline void for_each(CALLABLE &&func) const;
-
-private:
-  using data_pointer = std::shared_ptr<internal::pq::PGresult const>;
-
-  /// Underlying libpq result set.
-  data_pointer m_data;
-
-  /// Factory for data_pointer.
-  static data_pointer
-  make_data_pointer(internal::pq::PGresult const *res = nullptr) noexcept
-  {
-    return {res, internal::clear_result};
-  }
-
-  friend class pqxx::internal::gate::result_pipeline;
-  PQXX_PURE std::shared_ptr<std::string const> query_ptr() const noexcept
-  {
-    return m_query;
-  }
-
-  /// Query string.
-  std::shared_ptr<std::string const> m_query;
-
-  internal::encoding_group m_encoding;
-
-  static std::string const s_empty_string;
-
-  friend class pqxx::field;
-  // TODO: noexcept.  Breaks ABI.
-  PQXX_PURE char const *get_value(size_type row, row_size_type col) const;
-  // TODO: noexcept.  Breaks ABI.
-  PQXX_PURE bool get_is_null(size_type row, row_size_type col) const;
-  PQXX_PURE
-  field_size_type get_length(size_type, row_size_type) const noexcept;
-
-  friend class pqxx::internal::gate::result_creation;
-  result(
-    internal::pq::PGresult *rhs, std::shared_ptr<std::string> query,
-    internal::encoding_group enc);
-
-  PQXX_PRIVATE void check_status(std::string_view desc = ""sv) const;
-
-  friend class pqxx::internal::gate::result_connection;
-  friend class pqxx::internal::gate::result_row;
-  bool operator!() const noexcept { return m_data.get() == nullptr; }
-  operator bool() const noexcept { return m_data.get() != nullptr; }
-
-  [[noreturn]] PQXX_PRIVATE void
-  throw_sql_error(std::string const &Err, std::string const &Query) const;
-  PQXX_PRIVATE PQXX_PURE int errorposition() const;
-  PQXX_PRIVATE std::string status_error() const;
-
-  friend class pqxx::internal::gate::result_sql_cursor;
-  PQXX_PURE char const *cmd_status() const noexcept;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/robusttransaction b/ext/libpqxx-7.7.3/include/pqxx/robusttransaction
deleted file mode 100644
index 04b71d7cc..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/robusttransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::robusttransaction class.
- *
- * pqxx::robusttransaction is a slower but safer transaction class.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/robusttransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/robusttransaction.hxx b/ext/libpqxx-7.7.3/include/pqxx/robusttransaction.hxx
deleted file mode 100644
index faf6dbf5e..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/robusttransaction.hxx
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Definition of the pqxx::robusttransaction class.
- *
- * pqxx::robusttransaction is a slower but safer transaction class.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/robusttransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ROBUSTTRANSACTION
-#define PQXX_H_ROBUSTTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx::internal
-{
-/// Helper base class for the @ref robusttransaction class template.
-class PQXX_LIBEXPORT PQXX_NOVTABLE basic_robusttransaction
-        : public dbtransaction
-{
-public:
-  virtual ~basic_robusttransaction() override = 0;
-
-protected:
-  basic_robusttransaction(
-    connection &c, zview begin_command, std::string_view tname);
-  basic_robusttransaction(connection &c, zview begin_command);
-
-private:
-  using IDType = unsigned long;
-
-  std::string m_conn_string;
-  std::string m_xid;
-  int m_backendpid = -1;
-
-  void init(zview begin_command);
-
-  // @warning This function will become `final`.
-  virtual void do_commit() override;
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- *
- * @{
- */
-
-/// Slightly slower, better-fortified version of transaction.
-/** Requires PostgreSQL 10 or better.
- *
- * robusttransaction is similar to transaction, but spends more time and effort
- * to deal with the hopefully rare case that the connection to the backend is
- * lost just while it's trying to commit.  In such cases, the client does not
- * know whether the backend (on the other side of the broken connection)
- * managed to commit the transaction.
- *
- * When this happens, robusttransaction tries to reconnect to the database and
- * figure out what happened.
- *
- * This service level was made optional since you may not want to pay the
- * overhead where it is not necessary.  Certainly the use of this class makes
- * no sense for local connections, or for transactions that read the database
- * but never modify it, or for noncritical database manipulations.
- *
- * Besides being slower, it's also more complex.  Which means that in practice
- * a robusttransaction could actually fail more instead of less often than a
- * normal transaction.  What robusttransaction tries to achieve is to give you
- * certainty, not just be more successful per se.
- */
-template<isolation_level ISOLATION = read_committed>
-class robusttransaction final : public internal::basic_robusttransaction
-{
-public:
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   * @param tname optional human-readable name for this transaction.
-   */
-  robusttransaction(connection &c, std::string_view tname) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>,
-            tname}
-  {}
-
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   * @param tname optional human-readable name for this transaction.
-   */
-  robusttransaction(connection &c, std::string &&tname) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>,
-            std::move(tname)}
-  {}
-
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   */
-  explicit robusttransaction(connection &c) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>}
-  {}
-
-  virtual ~robusttransaction() noexcept override { close(); }
-};
-
-/**
- * @}
- */
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/row b/ext/libpqxx-7.7.3/include/pqxx/row
deleted file mode 100644
index 62a950ac8..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/row
+++ /dev/null
@@ -1,11 +0,0 @@
-/** pqxx::row class.
- *
- * pqxx::row refers to a row in a result.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/row.hxx b/ext/libpqxx-7.7.3/include/pqxx/row.hxx
deleted file mode 100644
index 5be5132e3..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/row.hxx
+++ /dev/null
@@ -1,561 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ROW
-#define PQXX_H_ROW
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/result.hxx"
-
-#include "pqxx/internal/concat.hxx"
-
-namespace pqxx::internal
-{
-template<typename... T> class result_iter;
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// Reference to one row in a result.
-/** A row represents one row (also called a row) in a query result set.
- * It also acts as a container mapping column numbers or names to field
- * values (see below):
- *
- * ```cxx
- *	cout << row["date"].c_str() << ": " << row["name"].c_str() << endl;
- * ```
- *
- * The row itself acts like a (non-modifyable) container, complete with its
- * own const_iterator and const_reverse_iterator.
- */
-class PQXX_LIBEXPORT row
-{
-public:
-  using size_type = row_size_type;
-  using difference_type = row_difference_type;
-  using const_iterator = const_row_iterator;
-  using iterator = const_iterator;
-  using reference = field;
-  using pointer = const_row_iterator;
-  using const_reverse_iterator = const_reverse_row_iterator;
-  using reverse_iterator = const_reverse_iterator;
-
-  row() noexcept = default;
-  row(row &&) noexcept = default;
-  row(row const &) noexcept = default;
-  row &operator=(row const &) noexcept = default;
-  row &operator=(row &&) noexcept = default;
-
-  /**
-   * @name Comparison
-   */
-  //@{
-  [[nodiscard]] PQXX_PURE bool operator==(row const &) const noexcept;
-  [[nodiscard]] bool operator!=(row const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  [[nodiscard]] const_iterator begin() const noexcept;
-  [[nodiscard]] const_iterator cbegin() const noexcept;
-  [[nodiscard]] const_iterator end() const noexcept;
-  [[nodiscard]] const_iterator cend() const noexcept;
-
-  /**
-   * @name Field access
-   */
-  //@{
-  [[nodiscard]] reference front() const noexcept;
-  [[nodiscard]] reference back() const noexcept;
-
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator rbegin() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator crbegin() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator rend() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator crend() const;
-
-  [[nodiscard]] reference operator[](size_type) const noexcept;
-  /** Address field by name.
-   * @warning This is much slower than indexing by number, or iterating.
-   */
-  [[nodiscard]] reference operator[](zview col_name) const;
-
-  reference at(size_type) const;
-  /** Address field by name.
-   * @warning This is much slower than indexing by number, or iterating.
-   */
-  reference at(zview col_name) const;
-
-  [[nodiscard]] constexpr size_type size() const noexcept
-  {
-    return m_end - m_begin;
-  }
-
-  [[deprecated("Swap iterators, not rows.")]] void swap(row &) noexcept;
-
-  /// Row number, assuming this is a real row and not end()/rend().
-  [[nodiscard]] constexpr result::size_type rownumber() const noexcept
-  {
-    return m_index;
-  }
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Number of given column (throws exception if it doesn't exist).
-  [[nodiscard]] size_type column_number(zview col_name) const;
-
-  /// Return a column's type.
-  [[nodiscard]] oid column_type(size_type) const;
-
-  /// Return a column's type.
-  [[nodiscard]] oid column_type(zview col_name) const
-  {
-    return column_type(column_number(col_name));
-  }
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(size_type col_num) const;
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(zview col_name) const
-  {
-    return column_table(column_number(col_name));
-  }
-
-  /// What column number in its table did this result column come from?
-  /** A meaningful answer can be given only if the column in question comes
-   * directly from a column in a table.  If the column is computed in any
-   * other way, a logic_error will be thrown.
-   *
-   * @param col_num a zero-based column number in this result set
-   * @return a zero-based column number in originating table
-   */
-  [[nodiscard]] size_type table_column(size_type) const;
-
-  /// What column number in its table did this result column come from?
-  [[nodiscard]] size_type table_column(zview col_name) const
-  {
-    return table_column(column_number(col_name));
-  }
-  //@}
-
-  [[nodiscard]] constexpr result::size_type num() const noexcept
-  {
-    return rownumber();
-  }
-
-  /** Produce a slice of this row, containing the given range of columns.
-   *
-   * @deprecated I haven't heard of anyone caring about row slicing at all in
-   * at least the last 15 years.  Yet it adds complexity, so unless anyone
-   * files a bug explaining why they really need this feature, I'm going to
-   * remove it.  Even if they do, the feature may need an update.
-   *
-   * The slice runs from the range's starting column to the range's end
-   * column, exclusive.  It looks just like a normal result row, except
-   * slices can be empty.
-   */
-  [[deprecated("Row slicing is going away.  File a bug if you need it.")]] row
-  slice(size_type sbegin, size_type send) const;
-
-  /// Is this a row without fields?  Can only happen to a slice.
-  [[nodiscard, deprecated("Row slicing is going away.")]] PQXX_PURE bool
-  empty() const noexcept;
-
-  /// Extract entire row's values into a tuple.
-  /** Converts to the types of the tuple's respective fields.
-   */
-  template<typename Tuple> void to(Tuple &t) const
-  {
-    check_size(std::tuple_size_v<Tuple>);
-    convert(t);
-  }
-
-  template<typename... TYPE> std::tuple<TYPE...> as() const
-  {
-    check_size(sizeof...(TYPE));
-    using seq = std::make_index_sequence<sizeof...(TYPE)>;
-    return get_tuple<std::tuple<TYPE...>>(seq{});
-  }
-
-protected:
-  friend class const_row_iterator;
-  friend class result;
-  row(result const &r, result_size_type index, size_type cols) noexcept;
-
-  /// Throw @ref usage_error if row size is not `expected`.
-  void check_size(size_type expected) const
-  {
-    if (size() != expected)
-      throw usage_error{internal::concat(
-        "Tried to extract ", expected, " field(s) from a row of ", size(),
-        ".")};
-  }
-
-  /// Convert to a given tuple of values, don't check sizes.
-  /** We need this for cases where we have a full tuple of field types, but
-   * not a parameter pack.
-   */
-  template<typename TUPLE> TUPLE as_tuple() const
-  {
-    using seq = std::make_index_sequence<std::tuple_size_v<TUPLE>>;
-    return get_tuple<TUPLE>(seq{});
-  }
-
-  template<typename... T> friend class pqxx::internal::result_iter;
-  /// Convert entire row to tuple fields, without checking row size.
-  template<typename Tuple> void convert(Tuple &t) const
-  {
-    extract_fields(t, std::make_index_sequence<std::tuple_size_v<Tuple>>{});
-  }
-
-  friend class field;
-
-  /// Result set of which this is one row.
-  result m_result;
-
-  /// Row number.
-  /**
-   * You'd expect this to be unsigned, but due to the way reverse iterators
-   * are related to regular iterators, it must be allowed to underflow to -1.
-   */
-  result::size_type m_index = 0;
-
-  // TODO: Remove m_begin and (if possible) m_end when we remove slice().
-  /// First column in slice.  This row ignores lower-numbered columns.
-  size_type m_begin = 0;
-  /// End column in slice.  This row only sees lower-numbered columns.
-  size_type m_end = 0;
-
-private:
-  template<typename Tuple, std::size_t... indexes>
-  void extract_fields(Tuple &t, std::index_sequence<indexes...>) const
-  {
-    (extract_value<Tuple, indexes>(t), ...);
-  }
-
-  template<typename Tuple, std::size_t index>
-  void extract_value(Tuple &t) const;
-
-  /// Convert row's values as a new tuple.
-  template<typename TUPLE, std::size_t... indexes>
-  auto get_tuple(std::index_sequence<indexes...>) const
-  {
-    return std::make_tuple(get_field<TUPLE, indexes>()...);
-  }
-
-  /// Extract and convert a field.
-  template<typename TUPLE, std::size_t index> auto get_field() const
-  {
-    return (*this)[index].as<std::tuple_element_t<index, TUPLE>>();
-  }
-};
-
-
-/// Iterator for fields in a row.  Use as row::const_iterator.
-class PQXX_LIBEXPORT const_row_iterator : public field
-{
-public:
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = field const;
-  using pointer = field const *;
-  using size_type = row_size_type;
-  using difference_type = row_difference_type;
-  using reference = field;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  const_row_iterator() = default;
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  const_row_iterator(row const &t, row_size_type c) noexcept :
-          field{t.m_result, t.m_index, c}
-  {}
-  const_row_iterator(field const &F) noexcept : field{F} {}
-  const_row_iterator(const_row_iterator const &) noexcept = default;
-  const_row_iterator(const_row_iterator &&) noexcept = default;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  [[nodiscard]] constexpr pointer operator->() const noexcept { return this; }
-  [[nodiscard]] reference operator*() const noexcept { return {*this}; }
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_row_iterator &operator=(const_row_iterator const &) noexcept = default;
-  const_row_iterator &operator=(const_row_iterator &&) noexcept = default;
-
-  // TODO: noexcept.  Breaks ABI.
-  const_row_iterator operator++(int);
-  const_row_iterator &operator++() noexcept
-  {
-    ++m_col;
-    return *this;
-  }
-  // TODO: noexcept.  Breaks ABI.
-  const_row_iterator operator--(int);
-  const_row_iterator &operator--() noexcept
-  {
-    --m_col;
-    return *this;
-  }
-
-  const_row_iterator &operator+=(difference_type i) noexcept
-  {
-    m_col = size_type(difference_type(m_col) + i);
-    return *this;
-  }
-  const_row_iterator &operator-=(difference_type i) noexcept
-  {
-    m_col = size_type(difference_type(m_col) - i);
-    return *this;
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] constexpr bool
-  operator==(const_row_iterator const &i) const noexcept
-  {
-    return col() == i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator!=(const_row_iterator const &i) const noexcept
-  {
-    return col() != i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator<(const_row_iterator const &i) const noexcept
-  {
-    return col() < i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator<=(const_row_iterator const &i) const noexcept
-  {
-    return col() <= i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator>(const_row_iterator const &i) const noexcept
-  {
-    return col() > i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator>=(const_row_iterator const &i) const noexcept
-  {
-    return col() >= i.col();
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] inline const_row_iterator
-  operator+(difference_type) const noexcept;
-
-  friend const_row_iterator
-  operator+(difference_type, const_row_iterator const &) noexcept;
-
-  [[nodiscard]] inline const_row_iterator
-  operator-(difference_type) const noexcept;
-  [[nodiscard]] inline difference_type
-  operator-(const_row_iterator const &) const noexcept;
-  //@}
-};
-
-
-/// Reverse iterator for a row.  Use as row::const_reverse_iterator.
-class PQXX_LIBEXPORT const_reverse_row_iterator : private const_row_iterator
-{
-public:
-  using super = const_row_iterator;
-  using iterator_type = const_row_iterator;
-  using iterator_type::difference_type;
-  using iterator_type::iterator_category;
-  using iterator_type::pointer;
-  using value_type = iterator_type::value_type;
-  using reference = iterator_type::reference;
-
-  const_reverse_row_iterator() noexcept = default;
-  const_reverse_row_iterator(const_reverse_row_iterator const &) noexcept =
-    default;
-  const_reverse_row_iterator(const_reverse_row_iterator &&) noexcept = default;
-
-  explicit const_reverse_row_iterator(super const &rhs) noexcept :
-          const_row_iterator{rhs}
-  {
-    super::operator--();
-  }
-
-  [[nodiscard]] PQXX_PURE iterator_type base() const noexcept;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  using iterator_type::operator->;
-  using iterator_type::operator*;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_reverse_row_iterator &
-  operator=(const_reverse_row_iterator const &r) noexcept
-  {
-    iterator_type::operator=(r);
-    return *this;
-  }
-  const_reverse_row_iterator operator++() noexcept
-  {
-    iterator_type::operator--();
-    return *this;
-  }
-  // TODO: noexcept.  Breaks ABI.
-  const_reverse_row_iterator operator++(int);
-  const_reverse_row_iterator &operator--() noexcept
-  {
-    iterator_type::operator++();
-    return *this;
-  }
-  const_reverse_row_iterator operator--(int);
-  // TODO: noexcept.  Breaks ABI.
-  const_reverse_row_iterator &operator+=(difference_type i) noexcept
-  {
-    iterator_type::operator-=(i);
-    return *this;
-  }
-  const_reverse_row_iterator &operator-=(difference_type i) noexcept
-  {
-    iterator_type::operator+=(i);
-    return *this;
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] const_reverse_row_iterator
-  operator+(difference_type i) const noexcept
-  {
-    return const_reverse_row_iterator{base() - i};
-  }
-  [[nodiscard]] const_reverse_row_iterator
-  operator-(difference_type i) noexcept
-  {
-    return const_reverse_row_iterator{base() + i};
-  }
-  [[nodiscard]] difference_type
-  operator-(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return rhs.const_row_iterator::operator-(*this);
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool
-  operator==(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator==(rhs);
-  }
-  [[nodiscard]] bool
-  operator!=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return !operator==(rhs);
-  }
-
-  [[nodiscard]] constexpr bool
-  operator<(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator>(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator<=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator>=(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator>(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator<(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator>=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator<=(rhs);
-  }
-  //@}
-};
-
-
-const_row_iterator
-const_row_iterator::operator+(difference_type o) const noexcept
-{
-  // TODO:: More direct route to home().columns()?
-  return {
-    row{home(), idx(), home().columns()},
-    size_type(difference_type(col()) + o)};
-}
-
-inline const_row_iterator operator+(
-  const_row_iterator::difference_type o, const_row_iterator const &i) noexcept
-{
-  return i + o;
-}
-
-inline const_row_iterator
-const_row_iterator::operator-(difference_type o) const noexcept
-{
-  // TODO:: More direct route to home().columns()?
-  return {
-    row{home(), idx(), home().columns()},
-    size_type(difference_type(col()) - o)};
-}
-
-inline const_row_iterator::difference_type
-const_row_iterator::operator-(const_row_iterator const &i) const noexcept
-{
-  return difference_type(num() - i.num());
-}
-
-
-template<typename Tuple, std::size_t index>
-inline void row::extract_value(Tuple &t) const
-{
-  using field_type = strip_t<decltype(std::get<index>(t))>;
-  field const f{m_result, m_index, index};
-  std::get<index>(t) = from_string<field_type>(f);
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/separated_list b/ext/libpqxx-7.7.3/include/pqxx/separated_list
deleted file mode 100644
index 1bdf51c6a..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/separated_list
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Helper similar to Python's @c str.join().
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/separated_list.hxx b/ext/libpqxx-7.7.3/include/pqxx/separated_list.hxx
deleted file mode 100644
index d4230ea08..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/separated_list.hxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Helper similar to Python's `str.join()`.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/separated_list instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SEPARATED_LIST
-#define PQXX_H_SEPARATED_LIST
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <algorithm>
-#include <numeric>
-
-#include "pqxx/strconv.hxx"
-
-// C++20: Simplify using std::ranges::range.
-// C++20: Optimise buffer allocation using random_access_range/iterator.
-namespace pqxx
-{
-/**
- * @defgroup utility Utility functions
- */
-//@{
-
-/// Represent sequence of values as a string, joined by a given separator.
-/**
- * Use this to turn e.g. the numbers 1, 2, and 3 into a string "1, 2, 3".
- *
- * @param sep separator string (to be placed between items)
- * @param begin beginning of items sequence
- * @param end end of items sequence
- * @param access functor defining how to dereference sequence elements
- */
-template<typename ITER, typename ACCESS>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, ITER begin, ITER end, ACCESS access)
-{
-  if (end == begin)
-    return {};
-  auto next{begin};
-  ++next;
-  if (next == end)
-    return to_string(access(begin));
-
-  // From here on, we've got at least 2 elements -- meaning that we need sep.
-  using elt_type = strip_t<decltype(access(begin))>;
-  using traits = string_traits<elt_type>;
-
-  std::size_t budget{0};
-  for (ITER cnt{begin}; cnt != end; ++cnt)
-    budget += traits::size_buffer(access(cnt));
-  budget +=
-    static_cast<std::size_t>(std::distance(begin, end)) * std::size(sep);
-
-  std::string result;
-  result.resize(budget);
-
-  char *const data{result.data()};
-  char *here{data};
-  char *stop{data + budget};
-  here = traits::into_buf(here, stop, access(begin)) - 1;
-  for (++begin; begin != end; ++begin)
-  {
-    here += sep.copy(here, std::size(sep));
-    here = traits::into_buf(here, stop, access(begin)) - 1;
-  }
-  result.resize(static_cast<std::size_t>(here - data));
-  return result;
-}
-
-
-/// Render sequence as a string, using given separator between items.
-template<typename ITER>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, ITER begin, ITER end)
-{
-  return separated_list(sep, begin, end, [](ITER i) { return *i; });
-}
-
-
-/// Render items in a container as a string, using given separator.
-template<typename CONTAINER>
-[[nodiscard]] inline auto
-separated_list(std::string_view sep, CONTAINER const &c)
-  /*
-  Always std::string; necessary because SFINAE doesn't work with the
-  contents of function bodies, so the check for iterability has to be in
-  the signature.
-  */
-  -> typename std::enable_if<
-    (not std::is_void<decltype(std::begin(c))>::value and
-     not std::is_void<decltype(std::end(c))>::value),
-    std::string>::type
-{
-  return separated_list(sep, std::begin(c), std::end(c));
-}
-
-
-/// Render items in a tuple as a string, using given separator.
-template<
-  typename TUPLE, std::size_t INDEX = 0, typename ACCESS,
-  typename std::enable_if<
-    (INDEX == std::tuple_size<TUPLE>::value - 1), int>::type = 0>
-[[nodiscard]] inline std::string separated_list(
-  std::string_view /* sep */, TUPLE const &t, ACCESS const &access)
-{
-  return to_string(access(&std::get<INDEX>(t)));
-}
-
-template<
-  typename TUPLE, std::size_t INDEX = 0, typename ACCESS,
-  typename std::enable_if<
-    (INDEX < std::tuple_size<TUPLE>::value - 1), int>::type = 0>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, TUPLE const &t, ACCESS const &access)
-{
-  std::string out{to_string(access(&std::get<INDEX>(t)))};
-  out.append(sep);
-  out.append(separated_list<TUPLE, INDEX + 1>(sep, t, access));
-  return out;
-}
-
-template<
-  typename TUPLE, std::size_t INDEX = 0,
-  typename std::enable_if<
-    (INDEX <= std::tuple_size<TUPLE>::value), int>::type = 0>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, TUPLE const &t)
-{
-  // TODO: Optimise allocation.
-  return separated_list(sep, t, [](TUPLE const &tup) { return *tup; });
-}
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/strconv b/ext/libpqxx-7.7.3/include/pqxx/strconv
deleted file mode 100644
index aa2c40ed5..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/strconv
+++ /dev/null
@@ -1,6 +0,0 @@
-/** String conversion definitions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/strconv.hxx b/ext/libpqxx-7.7.3/include/pqxx/strconv.hxx
deleted file mode 100644
index 863711228..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/strconv.hxx
+++ /dev/null
@@ -1,468 +0,0 @@
-/* String conversion definitions.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stringconv instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STRCONV
-#define PQXX_H_STRCONV
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <algorithm>
-#include <cstring>
-#include <limits>
-#include <sstream>
-#include <stdexcept>
-#include <typeinfo>
-
-#if __has_include(<charconv>)
-#  include <charconv>
-#endif
-
-#if defined(PQXX_HAVE_RANGES) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-
-namespace pqxx::internal
-{
-/// Attempt to demangle @c std::type_info::name() to something human-readable.
-PQXX_LIBEXPORT std::string demangle_type_name(char const[]);
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @defgroup stringconversion String conversion
- *
- * The PostgreSQL server accepts and represents data in string form.  It has
- * its own formats for various data types.  The string conversions define how
- * various C++ types translate to and from their respective PostgreSQL text
- * representations.
- *
- * Each conversion is defined by a specialisations of @c string_traits.  It
- * gets complicated if you want top performance, but until you do, all you
- * really need to care about when converting values between C++ in-memory
- * representations such as @c int and the postgres string representations is
- * the @c pqxx::to_string and @c pqxx::from_string functions.
- *
- * If you need to convert a type which is not supported out of the box, you'll
- * need to define your own specialisations for these templates, similar to the
- * ones defined here and in `pqxx/conversions.hxx`.  Any conversion code which
- * "sees" your specialisation will now support your conversion.  In particular,
- * you'll be able to read result fields into a variable of the new type.
- *
- * There is a macro to help you define conversions for individual enumeration
- * types.  The conversion will represent enumeration values as numeric strings.
- */
-//@{
-
-/// A human-readable name for a type, used in error messages and such.
-/** Actually this may not always be very user-friendly.  It uses
- * @c std::type_info::name().  On gcc-like compilers we try to demangle its
- * output.  Visual Studio produces human-friendly names out of the box.
- *
- * This variable is not inline.  Inlining it gives rise to "memory leak"
- * warnings from asan, the address sanitizer, possibly from use of
- * @c std::type_info::name.
- */
-template<typename TYPE>
-std::string const type_name{internal::demangle_type_name(typeid(TYPE).name())};
-
-
-/// Traits describing a type's "null value," if any.
-/** Some C++ types have a special value or state which correspond directly to
- * SQL's NULL.
- *
- * The @c nullness traits describe whether it exists, and whether a particular
- * value is null.
- */
-template<typename TYPE, typename ENABLE = void> struct nullness
-{
-  /// Does this type have a null value?
-  static bool has_null;
-
-  /// Is this type always null?
-  static bool always_null;
-
-  /// Is @c value a null?
-  static bool is_null(TYPE const &value);
-
-  /// Return a null value.
-  /** Don't use this in generic code to compare a value and see whether it is
-   * null.  Some types may have multiple null values which do not compare as
-   * equal, or may define a null value which is not equal to anything including
-   * itself, like in SQL.
-   */
-  [[nodiscard]] static TYPE null();
-};
-
-
-/// Nullness traits describing a type which does not have a null value.
-template<typename TYPE> struct no_null
-{
-  /// Does @c TYPE have a "built-in null value"?
-  /** For example, a pointer can equal @c nullptr, which makes a very natural
-   * representation of an SQL null value.  For such types, the code sometimes
-   * needs to make special allowances.
-   *
-   * for most types, such as @c int or @c std::string, there is no built-in
-   * null.  If you want to represent an SQL null value for such a type, you
-   * would have to wrap it in something that does have a null value.  For
-   * example, you could use @c std::optional<int> for "either an @c int or a
-   * null value."
-   */
-  static constexpr bool has_null = false;
-
-  /// Are all values of this type null?
-  /** There are a few special C++ types which are always null - mainly
-   * @c std::nullptr_t.
-   */
-  static constexpr bool always_null = false;
-
-  /// Does a given value correspond to an SQL null value?
-  /** Most C++ types, such as @c int or @c std::string, have no inherent null
-   * value.  But some types such as C-style string pointers do have a natural
-   * equivalent to an SQL null.
-   */
-  [[nodiscard]] static constexpr bool is_null(TYPE const &) noexcept
-  {
-    return false;
-  }
-};
-
-
-/// Traits class for use in string conversions.
-/** Specialize this template for a type for which you wish to add to_string
- * and from_string support.
- *
- * String conversions are not meant to work for nulls.  Check for null before
- * converting a value of @c TYPE to a string, or vice versa.
- */
-template<typename TYPE> struct string_traits
-{
-  /// Return a @c string_view representing value, plus terminating zero.
-  /** Produces a @c string_view containing the PostgreSQL string representation
-   * for @c value.
-   *
-   * Uses the space from @c begin to @c end as a buffer, if needed.  The
-   * returned string may lie somewhere in that buffer, or it may be a
-   * compile-time constant, or it may be null if value was a null value.  Even
-   * if the string is stored in the buffer, its @c begin() may or may not be
-   * the same as @c begin.
-   *
-   * The @c string_view is guaranteed to be valid as long as the buffer from
-   * @c begin to @c end remains accessible and unmodified.
-   *
-   * @throws pqxx::conversion_overrun if the provided buffer space may not be
-   * enough.  For maximum performance, this is a conservative estimate.  It may
-   * complain about a buffer which is actually large enough for your value, if
-   * an exact check gets too expensive.
-   */
-  [[nodiscard]] static inline zview
-  to_buf(char *begin, char *end, TYPE const &value);
-
-  /// Write value's string representation into buffer at @c begin.
-  /** Assumes that value is non-null.
-   *
-   * Writes value's string representation into the buffer, starting exactly at
-   * @c begin, and ensuring a trailing zero.  Returns the address just beyond
-   * the trailing zero, so the caller could use it as the @c begin for another
-   * call to @c into_buf writing a next value.
-   */
-  static inline char *into_buf(char *begin, char *end, TYPE const &value);
-
-  /// Parse a string representation of a @c TYPE value.
-  /** Throws @c conversion_error if @c value does not meet the expected format
-   * for a value of this type.
-   */
-  [[nodiscard]] static inline TYPE from_string(std::string_view text);
-
-  // C++20: Can we make these all constexpr?
-  /// Estimate how much buffer space is needed to represent value.
-  /** The estimate may be a little pessimistic, if it saves time.
-   *
-   * The estimate includes the terminating zero.
-   */
-  [[nodiscard]] static inline std::size_t
-  size_buffer(TYPE const &value) noexcept;
-};
-
-
-/// Nullness: Enums do not have an inherent null value.
-template<typename ENUM>
-struct nullness<ENUM, std::enable_if_t<std::is_enum_v<ENUM>>> : no_null<ENUM>
-{};
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// Helper class for defining enum conversions.
-/** The conversion will convert enum values to numeric strings, and vice versa.
- *
- * To define a string conversion for an enum type, derive a @c string_traits
- * specialisation for the enum from this struct.
- *
- * There's usually an easier way though: the @c PQXX_DECLARE_ENUM_CONVERSION
- * macro.  Use @c enum_traits manually only if you need to customise your
- * traits type in more detail.
- */
-template<typename ENUM> struct enum_traits
-{
-  using impl_type = std::underlying_type_t<ENUM>;
-  using impl_traits = string_traits<impl_type>;
-
-  [[nodiscard]] static constexpr zview
-  to_buf(char *begin, char *end, ENUM const &value)
-  {
-    return impl_traits::to_buf(begin, end, to_underlying(value));
-  }
-
-  static constexpr char *into_buf(char *begin, char *end, ENUM const &value)
-  {
-    return impl_traits::into_buf(begin, end, to_underlying(value));
-  }
-
-  [[nodiscard]] static ENUM from_string(std::string_view text)
-  {
-    return static_cast<ENUM>(impl_traits::from_string(text));
-  }
-
-  [[nodiscard]] static std::size_t size_buffer(ENUM const &value) noexcept
-  {
-    return impl_traits::size_buffer(to_underlying(value));
-  }
-
-private:
-  // C++23: Replace with std::to_underlying.
-  static constexpr impl_type to_underlying(ENUM const &value) noexcept
-  {
-    return static_cast<impl_type>(value);
-  }
-};
-} // namespace pqxx::internal
-
-
-/// Macro: Define a string conversion for an enum type.
-/** This specialises the @c pqxx::string_traits template, so use it in the
- * @c ::pqxx namespace.
- *
- * For example:
- *
- *      #include <iostream>
- *      #include <pqxx/strconv>
- *      enum X { xa, xb };
- *      namespace pqxx { PQXX_DECLARE_ENUM_CONVERSION(x); }
- *      int main() { std::cout << pqxx::to_string(xa) << std::endl; }
- */
-#define PQXX_DECLARE_ENUM_CONVERSION(ENUM)                                    \
-  template<> struct string_traits<ENUM> : pqxx::internal::enum_traits<ENUM>   \
-  {};                                                                         \
-  template<> inline std::string const type_name<ENUM> { #ENUM }
-
-
-namespace pqxx
-{
-/// Parse a value in postgres' text format as a TYPE.
-/** If the form of the value found in the string does not match the expected
- * type, e.g. if a decimal point is found when converting to an integer type,
- * the conversion fails.  Overflows (e.g. converting "9999999999" to a 16-bit
- * C++ type) are also treated as errors.  If in some cases this behaviour
- * should be inappropriate, convert to something bigger such as @c long @c int
- * first and then truncate the resulting value.
- *
- * Only the simplest possible conversions are supported.  Fancy features like
- * hexadecimal or octal, spurious signs, or exponent notation won't work.
- * Whitespace is not stripped away.  Only the kinds of strings that come out of
- * PostgreSQL and out of to_string() can be converted.
- */
-template<typename TYPE>
-[[nodiscard]] inline TYPE from_string(std::string_view text)
-{
-  return string_traits<TYPE>::from_string(text);
-}
-
-
-/// "Convert" a std::string_view to a std::string_view.
-/** Just returns its input.
- *
- * @warning Of course the result is only valid for as long as the original
- * string remains valid!  Never access the string referenced by the return
- * value after the original has been destroyed.
- */
-template<>
-[[nodiscard]] inline std::string_view from_string(std::string_view text)
-{
-  return text;
-}
-
-
-/// Attempt to convert postgres-generated string to given built-in object.
-/** This is like the single-argument form of the function, except instead of
- * returning the value, it sets @c value.
- *
- * You may find this more convenient in that it infers the type you want from
- * the argument you pass.  But there are disadvantages: it requires an
- * assignment operator, and it may be less efficient.
- */
-template<typename T> inline void from_string(std::string_view text, T &value)
-{
-  value = from_string<T>(text);
-}
-
-
-/// Convert a value to a readable string that PostgreSQL will understand.
-/** The conversion does no special formatting, and ignores any locale settings.
- * The resulting string will be human-readable and in a format suitable for use
- * in SQL queries.  It won't have niceties such as "thousands separators"
- * though.
- */
-template<typename TYPE> inline std::string to_string(TYPE const &value);
-
-
-/// Convert multiple values to strings inside a single buffer.
-/** There must be enough room for all values, or this will throw
- * @c conversion_overrun.  You can obtain a conservative estimate of the buffer
- * space required by calling @c size_buffer() on the values.
- *
- * The @c std::string_view results may point into the buffer, so don't assume
- * that they will remain valid after you destruct or move the buffer.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::vector<std::string_view>
-to_buf(char *here, char const *end, TYPE... value)
-{
-  return {[&here, end](auto v) {
-    auto begin = here;
-    here = string_traits<decltype(v)>::into_buf(begin, end, v);
-    // Exclude the trailing zero out of the string_view.
-    auto len{static_cast<std::size_t>(here - begin) - 1};
-    return std::string_view{begin, len};
-  }(value)...};
-}
-
-/// Convert a value to a readable string that PostgreSQL will understand.
-/** This variant of to_string can sometimes save a bit of time in loops, by
- * re-using a std::string for multiple conversions.
- */
-template<typename TYPE>
-inline void into_string(TYPE const &value, std::string &out);
-
-
-/// Is @c value null?
-template<typename TYPE>
-[[nodiscard]] inline constexpr bool is_null(TYPE const &value) noexcept
-{
-  return nullness<strip_t<TYPE>>::is_null(value);
-}
-
-
-/// Estimate how much buffer space is needed to represent values as a string.
-/** The estimate may be a little pessimistic, if it saves time.  It also
- * includes room for a terminating zero after each value.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::size_t size_buffer(TYPE const &...value) noexcept
-{
-  return (string_traits<strip_t<TYPE>>::size_buffer(value) + ...);
-}
-
-
-/// Does this type translate to an SQL array?
-/** Specialisations may override this to be true for container types.
- *
- * This may not always be a black-and-white choice.  For instance, a
- * @c std::string is a container, but normally it translates to an SQL string,
- * not an SQL array.
- */
-template<typename TYPE> inline constexpr bool is_sql_array{false};
-
-
-/// Can we use this type in arrays and composite types without quoting them?
-/** Define this as @c true only if values of @c TYPE can never contain any
- * special characters that might need escaping or confuse the parsing of array
- * or composite * types, such as commas, quotes, parentheses, braces, newlines,
- * and so on.
- *
- * When converting a value of such a type to a string in an array or a field in
- * a composite type, we do not need to add quotes, nor escape any special
- * characters.
- *
- * This is just an optimisation, so it defaults to @c false to err on the side
- * of slow correctness.
- */
-template<typename TYPE> inline constexpr bool is_unquoted_safe{false};
-
-
-/// Element separator between SQL array elements of this type.
-template<typename T> inline constexpr char array_separator{','};
-
-
-/// What's the preferred format for passing non-null parameters of this type?
-/** This affects how we pass parameters of @c TYPE when calling parameterised
- * statements or prepared statements.
- *
- * Generally we pass parameters in text format, but binary strings are the
- * exception.  We also pass nulls in binary format, so this function need not
- * handle null values.
- */
-template<typename TYPE> inline constexpr format param_format(TYPE const &)
-{
-  return format::text;
-}
-
-
-/// Implement @c string_traits<TYPE>::to_buf by calling @c into_buf.
-/** When you specialise @c string_traits for a new type, most of the time its
- * @c to_buf implementation has no special optimisation tricks and just writes
- * its text into the buffer it receives from the caller, starting at the
- * beginning.
- *
- * In that common situation, you can implement @c to_buf as just a call to
- * @c generic_to_buf.  It will call @c into_buf and return the right result for
- * @c to_buf.
- */
-template<typename TYPE>
-inline zview generic_to_buf(char *begin, char *end, TYPE const &value)
-{
-  using traits = string_traits<TYPE>;
-  // The trailing zero does not count towards the zview's size, so subtract 1
-  // from the result we get from into_buf().
-  if (is_null(value))
-    return {};
-  else
-    return {begin, traits::into_buf(begin, end, value) - begin - 1};
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: Binary string, akin to @c std::string for binary data.
-/** Any type that satisfies this concept can represent an SQL BYTEA value.
- *
- * A @c binary has a @c begin(), @c end(), @c size(), and @data().  Each byte
- * is a @c std::byte, and they must all be laid out contiguously in memory so
- * we can reference them by a pointer.
- */
-template<class TYPE>
-concept binary = std::ranges::contiguous_range<TYPE> and
-  std::is_same_v<strip_t<value_type<TYPE>>, std::byte>;
-#endif
-//@}
-} // namespace pqxx
-
-
-#include "pqxx/internal/conversions.hxx"
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/stream_from b/ext/libpqxx-7.7.3/include/pqxx/stream_from
deleted file mode 100644
index 972762443..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/stream_from
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::stream_from class.
- *
- * pqxx::stream_from enables optimized batch reads from a database table.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/stream_from.hxx b/ext/libpqxx-7.7.3/include/pqxx/stream_from.hxx
deleted file mode 100644
index ff4a93d2e..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/stream_from.hxx
+++ /dev/null
@@ -1,361 +0,0 @@
-/* Definition of the pqxx::stream_from class.
- *
- * pqxx::stream_from enables optimized batch reads from a database table.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stream_from instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_FROM
-#define PQXX_H_STREAM_FROM
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cassert>
-#include <functional>
-#include <variant>
-
-#include "pqxx/connection.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/internal/stream_iterator.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/transaction_focus.hxx"
-
-
-namespace pqxx
-{
-class transaction_base;
-
-
-/// Pass this to a `stream_from` constructor to stream table contents.
-/** @deprecated Use @ref stream_from::table() instead.
- */
-constexpr from_table_t from_table;
-/// Pass this to a `stream_from` constructor to stream query results.
-/** @deprecated Use stream_from::query() instead.
- */
-constexpr from_query_t from_query;
-
-
-/// Stream data from the database.
-/** For larger data sets, retrieving data this way is likely to be faster than
- * executing a query and then iterating and converting the rows fields.  You
- * will also be able to start processing before all of the data has come in.
- *
- * There are also downsides.  Not all kinds of query will work in a stream.
- * But straightforward `SELECT` and `UPDATE ... RETURNING` queries should work.
- * This function makes use of @ref pqxx::stream_from, which in turn uses
- * PostgreSQL's `COPY` command, so see the documentation for those to get the
- * full details.
- *
- * There are other downsides.  If there stream encounters an error, it may
- * leave the entire connection in an unusable state, so you'll have to give the
- * whole thing up.  Finally, opening a stream puts the connection in a special
- * state, so you won't be able to do many other things with the connection or
- * the transaction while the stream is open.
- *
- * There are two ways of starting a stream: you stream either all rows in a
- * table (using one of the factories, `table()` or `raw_table()`), or the
- * results of a query (using the `query()` factory).
- *
- * Usually you'll want the `stream` convenience wrapper in
- * @ref transaction_base, * so you don't need to deal with this class directly.
- *
- * @warning While a stream is active, you cannot execute queries, open a
- * pipeline, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT stream_from : transaction_focus
-{
-public:
-  using raw_line =
-    std::pair<std::unique_ptr<char, std::function<void(char *)>>, std::size_t>;
-
-  /// Factory: Execute query, and stream the results.
-  /** The query can be a SELECT query or a VALUES query; or it can be an
-   * UPDATE, INSERT, or DELETE with a RETURNING clause.
-   *
-   * The query is executed as part of a COPY statement, so there are additional
-   * restrictions on what kind of query you can use here.  See the PostgreSQL
-   * documentation for the COPY command:
-   *
-   *     https://www.postgresql.org/docs/current/sql-copy.html
-   */
-  static stream_from query(transaction_base &tx, std::string_view q)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return {tx, from_query, q};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /**
-   * @name Streaming data from tables
-   *
-   * You can use `stream_from` to read a table's contents.  This is a quick
-   * and easy way to read a table, but it comes with limitations.  It cannot
-   * stream from a view, only from a table.  It does not support conditions.
-   * And there are no guarantees about ordering.  If you need any of those
-   * things, consider streaming from a query instead.
-   */
-  //@{
-
-  /// Factory: Stream data from a pre-quoted table and columns.
-  /** Use this factory if you need to create multiple streams using the same
-   * table path and/or columns list, and you want to save a bit of work on
-   * composing the internal SQL statement for starting the stream.  It lets you
-   * compose the string representations for the table path and the columns
-   * list, so you can compute these once and then re-use them later.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path Name or path for the table upon which the stream will
-   *     operate.  If any part of the table path may contain special
-   *     characters or be case-sensitive, quote the path using
-   *     pqxx::connection::quote_table().
-   * @param columns Columns which the stream will read.  They should be
-   *     comma-separated and, if needed, quoted.  You can produce the string
-   *     using pqxx::connection::quote_columns().  If you omit this argument,
-   *     the stream will read all columns in the table, in schema order.
-   */
-  static stream_from raw_table(
-    transaction_base &tx, std::string_view path,
-    std::string_view columns = ""sv);
-
-  /// Factory: Stream data from a given table.
-  /** This is the convenient way to stream from a table.
-   */
-  static stream_from table(
-    transaction_base &tx, table_path path,
-    std::initializer_list<std::string_view> columns = {});
-  //@}
-
-  /// Execute query, and stream over the results.
-  /** @deprecated Use factory function @ref query instead.
-   */
-  [[deprecated("Use query() factory instead.")]] stream_from(
-    transaction_base &, from_query_t, std::string_view query);
-
-  /// Stream all rows in table, all columns.
-  /** @deprecated Use factories @ref table or @ref raw_table instead.
-   */
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &, from_table_t, std::string_view table);
-
-  /// Stream given columns from all rows in table.
-  /** @deprecated Use factories @ref table or @ref raw_table instead.
-   */
-  template<typename Iter>
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &, from_table_t, std::string_view table,
-    Iter columns_begin, Iter columns_end);
-
-  /// Stream given columns from all rows in table.
-  /** @deprecated Use factory function @ref query instead.
-   */
-  template<typename Columns>
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &tx, from_table_t, std::string_view table,
-    Columns const &columns);
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &tx, std::string_view table) :
-          stream_from{tx, from_table, table}
-  {}
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  template<typename Columns>
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &tx, std::string_view table, Columns const &columns) :
-          stream_from{tx, from_table, table, columns}
-  {}
-
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  template<typename Iter>
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &, std::string_view table, Iter columns_begin,
-    Iter columns_end);
-
-  ~stream_from() noexcept;
-
-  /// May this stream still produce more data?
-  [[nodiscard]] constexpr operator bool() const noexcept
-  {
-    return not m_finished;
-  }
-  /// Has this stream produced all the data it is going to produce?
-  [[nodiscard]] constexpr bool operator!() const noexcept
-  {
-    return m_finished;
-  }
-
-  /// Finish this stream.  Call this before continuing to use the connection.
-  /** Consumes all remaining lines, and closes the stream.
-   *
-   * This may take a while if you're abandoning the stream before it's done, so
-   * skip it in error scenarios where you're not planning to use the connection
-   * again afterwards.
-   */
-  void complete();
-
-  /// Read one row into a tuple.
-  /** Converts the row's fields into the fields making up the tuple.
-   *
-   * For a column which can contain nulls, be sure to give the corresponding
-   * tuple field a type which can be null.  For example, to read a field as
-   * `int` when it may contain nulls, read it as `std::optional<int>`.
-   * Using `std::shared_ptr` or `std::unique_ptr` will also work.
-   */
-  template<typename Tuple> stream_from &operator>>(Tuple &);
-
-  /// Doing this with a `std::variant` is going to be horrifically borked.
-  template<typename... Vs>
-  stream_from &operator>>(std::variant<Vs...> &) = delete;
-
-  /// Iterate over this stream.  Supports range-based "for" loops.
-  /** Produces an input iterator over the stream.
-   *
-   * Do not call this yourself.  Use it like "for (auto data : stream.iter())".
-   */
-  template<typename... TYPE> [[nodiscard]] auto iter() &
-  {
-    return pqxx::internal::stream_input_iteration<TYPE...>{*this};
-  }
-
-  /// Read a row.  Return fields as views, valid until you read the next row.
-  /** Returns `nullptr` when there are no more rows to read.  Do not attempt
-   * to read any further rows after that.
-   *
-   * Do not access the vector, or the storage referenced by the views, after
-   * closing or completing the stream, or after attempting to read a next row.
-   *
-   * A @ref pqxx::zview is like a `std::string_view`, but with the added
-   * guarantee that if its data pointer is non-null, the string is followed by
-   * a terminating zero (which falls just outside the view itself).
-   *
-   * If any of the views' data pointer is null, that means that the
-   * corresponding SQL field is null.
-   *
-   * @warning The return type may change in the future, to support C++20
-   * coroutine-based usage.
-   */
-  std::vector<zview> const *read_row() &;
-
-  /// Read a raw line of text from the COPY command.
-  /** @warning Do not use this unless you really know what you're doing. */
-  raw_line get_raw_line();
-
-private:
-  // TODO: Clean up this signature once we cull the deprecated constructors.
-  /// @deprecated
-  stream_from(
-    transaction_base &tx, std::string_view table, std::string_view columns,
-    from_table_t);
-
-  // TODO: Clean up this signature once we cull the deprecated constructors.
-  /// @deprecated
-  stream_from(
-    transaction_base &, std::string_view unquoted_table,
-    std::string_view columns, from_table_t, int);
-
-  template<typename Tuple, std::size_t... indexes>
-  void extract_fields(Tuple &t, std::index_sequence<indexes...>) const
-  {
-    (extract_value<Tuple, indexes>(t), ...);
-  }
-
-  pqxx::internal::glyph_scanner_func *m_glyph_scanner;
-
-  /// Current row's fields' text, combined into one reusable string.
-  std::string m_row;
-
-  /// The current row's fields.
-  std::vector<zview> m_fields;
-
-  bool m_finished = false;
-
-  void close();
-
-  template<typename Tuple, std::size_t index>
-  void extract_value(Tuple &) const;
-
-  /// Read a line of COPY data, write `m_row` and `m_fields`.
-  void parse_line();
-};
-
-
-template<typename Columns>
-inline stream_from::stream_from(
-  transaction_base &tx, from_table_t, std::string_view table_name,
-  Columns const &columns) :
-        stream_from{
-          tx, from_table, table_name, std::begin(columns), std::end(columns)}
-{}
-
-
-template<typename Iter>
-inline stream_from::stream_from(
-  transaction_base &tx, from_table_t, std::string_view table,
-  Iter columns_begin, Iter columns_end) :
-        stream_from{
-          tx, table, separated_list(",", columns_begin, columns_end),
-          from_table, 1}
-{}
-
-
-template<typename Tuple> inline stream_from &stream_from::operator>>(Tuple &t)
-{
-  if (m_finished)
-    return *this;
-  static constexpr auto tup_size{std::tuple_size_v<Tuple>};
-  m_fields.reserve(tup_size);
-  parse_line();
-  if (m_finished)
-    return *this;
-
-  if (std::size(m_fields) != tup_size)
-    throw usage_error{internal::concat(
-      "Tried to extract ", tup_size, " field(s) from a stream of ",
-      std::size(m_fields), ".")};
-
-  extract_fields(t, std::make_index_sequence<tup_size>{});
-  return *this;
-}
-
-
-template<typename Tuple, std::size_t index>
-inline void stream_from::extract_value(Tuple &t) const
-{
-  using field_type = strip_t<decltype(std::get<index>(t))>;
-  using nullity = nullness<field_type>;
-  assert(index < std::size(m_fields));
-  if constexpr (nullity::always_null)
-  {
-    if (std::data(m_fields[index]) != nullptr)
-      throw conversion_error{"Streaming non-null value into null field."};
-  }
-  else if (std::data(m_fields[index]) == nullptr)
-  {
-    if constexpr (nullity::has_null)
-      std::get<index>(t) = nullity::null();
-    else
-      internal::throw_null_conversion(type_name<field_type>);
-  }
-  else
-  {
-    // Don't ever try to convert a non-null value to nullptr_t!
-    std::get<index>(t) = from_string<field_type>(m_fields[index]);
-  }
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/stream_to b/ext/libpqxx-7.7.3/include/pqxx/stream_to
deleted file mode 100644
index 8760cf1f4..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/stream_to
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::stream_to class.
- *
- * pqxx::stream_to enables optimized batch updates to a database table.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/stream_to.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/stream_to.hxx b/ext/libpqxx-7.7.3/include/pqxx/stream_to.hxx
deleted file mode 100644
index 2a49d8f85..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/stream_to.hxx
+++ /dev/null
@@ -1,455 +0,0 @@
-/* Definition of the pqxx::stream_to class.
- *
- * pqxx::stream_to enables optimized batch updates to a database table.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stream_to.hxx instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_TO
-#define PQXX_H_STREAM_TO
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/separated_list.hxx"
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-/// Efficiently write data directly to a database table.
-/** If you wish to insert rows of data into a table, you can compose INSERT
- * statements and execute them.  But it's slow and tedious, and you need to
- * worry about quoting and escaping the data.
- *
- * If you're just inserting a single row, it probably won't matter much.  You
- * can use prepared or parameterised statements to take care of the escaping
- * for you.  But if you're inserting large numbers of rows you will want
- * something better.
- *
- * Inserting rows one by one using INSERT statements involves a lot of
- * pointless overhead, especially when you are working with a remote database
- * server over the network.  You may end up sending each row over the network
- * as a separate query, and waiting for a reply.  Do it "in bulk" using
- * `stream_to`, and you may find that it goes many times faster.  Sometimes
- * you gain orders of magnitude in speed.
- *
- * Here's how it works: you create a `stream_to` stream to start writing to
- * your table.  You will probably want to specify the columns.  Then, you
- * feed your data into the stream one row at a time.  And finally, you call the
- * stream's @ref complete function to tell it to finalise the operation, wait
- * for completion, and check for errors.
- *
- * (You _must_ complete the stream before committing or aborting the
- * transaction.  The connection is in a special state while the stream is
- * active, where it can't process commands, and can't commit or abort a
- * transaction.)
- *
- * So how do you feed a row of data into the stream?  There's several ways, but
- * the preferred one is to call its @ref write_values.  Pass the field values
- * as arguments.  Doesn't matter what type they are, as long as libpqxx knows
- * how to convert them to PostgreSQL's text format: `int`, `std::string` or
- * `std:string_view`, `float` and `double`, `bool`...  lots of basic types
- * are supported.  If some of the values are null, feel free to use
- * `std::optional`, `std::shared_ptr`, or `std::unique_ptr`.
- *
- * The arguments' types don't even have to match the fields' SQL types.  If you
- * want to insert an `int` into a `DECIMAL` column, that's your choice -- it
- * will produce a `DECIMAL` value which happens to be integral.  Insert a
- * `float` into a `VARCHAR` column?  That's fine, you'll get a string whose
- * contents happen to read like a number.  And so on.  You can even insert
- * different types of value in the same column on different rows.  If you have
- * a code path where a particular field is always null, just insert `nullptr`.
- *
- * There is another way to insert rows: the `<<` ("shift-left") operator.
- * It's not as fast and it doesn't support variable arguments: each row must be
- * either a `std::tuple` or something iterable, such as a `std::vector`, or
- * anything else with a `begin()` and `end()`.
- *
- * @warning While a stream is active, you cannot execute queries, open a
- * pipeline, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT stream_to : transaction_focus
-{
-public:
-  /// Stream data to a pre-quoted table and columns.
-  /** This factory can be useful when it's not convenient to provide the
-   * columns list in the form of a `std::initializer_list`, or when the list
-   * of columns is simply not known at compile time.
-   *
-   * Also use this if you need to create multiple streams using the same table
-   * path and/or columns list, and you want to save a bit of work on composing
-   * the internal SQL statement for starting the stream.  It lets you compose
-   * the string representations for the table path and the columns list, so you
-   * can compute these once and then re-use them later.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path Name or path for the table upon which the stream will
-   *     operate.  If any part of the table path may contain special
-   *     characters or be case-sensitive, quote the path using
-   *     pqxx::connection::quote_table().
-   * @param columns Columns to which the stream will write.  They should be
-   *     comma-separated and, if needed, quoted.  You can produce the string
-   *     using pqxx::connection::quote_columns().  If you omit this argument,
-   *     the stream will write all columns in the table, in schema order.
-   */
-  static stream_to raw_table(
-    transaction_base &tx, std::string_view path, std::string_view columns = "")
-  {
-    return {tx, path, columns};
-  }
-
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this to stream data to a table, where the list of columns is known at
-   * compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns Optionally, the columns to which the stream should write.
-   *     If you do not pass this, the stream will write to all columns in the
-   *     table, in schema order.
-   */
-  static stream_to table(
-    transaction_base &tx, table_path path,
-    std::initializer_list<std::string_view> columns = {})
-  {
-    auto const &conn{tx.conn()};
-    return raw_table(tx, conn.quote_table(path), conn.quote_columns(columns));
-  }
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this version to stream data to a table, when the list of columns is
-   * not known at compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns The columns to which the stream should write.
-   */
-  template<PQXX_CHAR_STRINGS_ARG COLUMNS>
-  static stream_to
-  table(transaction_base &tx, table_path path, COLUMNS const &columns)
-  {
-    auto const &conn{tx.conn()};
-    return stream_to::raw_table(
-      tx, conn.quote_table(path), tx.conn().quote_columns(columns));
-  }
-
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this version to stream data to a table, when the list of columns is
-   * not known at compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns The columns to which the stream should write.
-   */
-  template<PQXX_CHAR_STRINGS_ARG COLUMNS>
-  static stream_to
-  table(transaction_base &tx, std::string_view path, COLUMNS const &columns)
-  {
-    return stream_to::raw_table(tx, path, tx.conn().quote_columns(columns));
-  }
-#endif // PQXX_HAVE_CONCEPTS
-
-  /// Create a stream, without specifying columns.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   *
-   * Fields will be inserted in whatever order the columns have in the
-   * database.
-   *
-   * You'll probably want to specify the columns, so that the mapping between
-   * your data fields and the table is explicit in your code, and not hidden
-   * in an "implicit contract" between your code and your schema.
-   */
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &tx, std::string_view table_name) :
-          stream_to{tx, table_name, ""sv}
-  {}
-
-  /// Create a stream, specifying column names as a container of strings.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   */
-  template<typename Columns>
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &, std::string_view table_name, Columns const &columns);
-
-  /// Create a stream, specifying column names as a sequence of strings.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   */
-  template<typename Iter>
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &, std::string_view table_name, Iter columns_begin,
-    Iter columns_end);
-
-  ~stream_to() noexcept;
-
-  /// Does this stream still need to @ref complete()?
-  [[nodiscard]] constexpr operator bool() const noexcept
-  {
-    return not m_finished;
-  }
-  /// Has this stream been through its concluding @c complete()?
-  [[nodiscard]] constexpr bool operator!() const noexcept
-  {
-    return m_finished;
-  }
-
-  /// Complete the operation, and check for errors.
-  /** Always call this to close the stream in an orderly fashion, even after
-   * an error.  (In the case of an error, abort the transaction afterwards.)
-   *
-   * The only circumstance where it's safe to skip this is after an error, if
-   * you're discarding the entire connection.
-   */
-  void complete();
-
-  /// Insert a row of data.
-  /** Returns a reference to the stream, so you can chain the calls.
-   *
-   * The @c row can be a tuple, or any type that can be iterated.  Each
-   * item becomes a field in the row, in the same order as the columns you
-   * specified when creating the stream.
-   *
-   * If you don't already happen to have your fields in the form of a tuple or
-   * container, prefer @c write_values.  It's faster and more convenient.
-   */
-  template<typename Row> stream_to &operator<<(Row const &row)
-  {
-    write_row(row);
-    return *this;
-  }
-
-  /// Stream a `stream_from` straight into a `stream_to`.
-  /** This can be useful when copying between different databases.  If the
-   * source and the destination are on the same database, you'll get better
-   * performance doing it all in a regular query.
-   */
-  stream_to &operator<<(stream_from &);
-
-  /// Insert a row of data, given in the form of a @c std::tuple or container.
-  /** The @c row can be a tuple, or any type that can be iterated.  Each
-   * item becomes a field in the row, in the same order as the columns you
-   * specified when creating the stream.
-   *
-   * The preferred way to insert a row is @c write_values.
-   */
-  template<typename Row> void write_row(Row const &row)
-  {
-    fill_buffer(row);
-    write_buffer();
-  }
-
-  /// Insert values as a row.
-  /** This is the recommended way of inserting data.  Pass your field values,
-   * of any convertible type.
-   */
-  template<typename... Ts> void write_values(Ts const &...fields)
-  {
-    fill_buffer(fields...);
-    write_buffer();
-  }
-
-private:
-  /// Stream a pre-quoted table name and columns list.
-  stream_to(
-    transaction_base &tx, std::string_view path, std::string_view columns);
-
-  bool m_finished = false;
-
-  /// Reusable buffer for a row.  Saves doing an allocation for each row.
-  std::string m_buffer;
-
-  /// Reusable buffer for converting/escaping a field.
-  std::string m_field_buf;
-
-  /// Glyph scanner, for parsing the client encoding.
-  internal::glyph_scanner_func *m_scanner;
-
-  /// Write a row of raw text-format data into the destination table.
-  void write_raw_line(std::string_view);
-
-  /// Write a row of data from @c m_buffer into the destination table.
-  /** Resets the buffer for the next row.
-   */
-  void write_buffer();
-
-  /// COPY encoding for a null field, plus subsequent separator.
-  static constexpr std::string_view null_field{"\\N\t"};
-
-  /// Estimate buffer space needed for a field which is always null.
-  template<typename T>
-  static std::enable_if_t<nullness<T>::always_null, std::size_t>
-  estimate_buffer(T const &)
-  {
-    return std::size(null_field);
-  }
-
-  /// Estimate buffer space needed for field f.
-  /** The estimate is not very precise.  We don't actually know how much space
-   * we'll need once the escaping comes in.
-   */
-  template<typename T>
-  static std::enable_if_t<not nullness<T>::always_null, std::size_t>
-  estimate_buffer(T const &field)
-  {
-    return is_null(field) ? std::size(null_field) : size_buffer(field);
-  }
-
-  /// Append escaped version of @c data to @c m_buffer, plus a tab.
-  void escape_field_to_buffer(std::string_view data);
-
-  /// Append string representation for @c f to @c m_buffer.
-  /** This is for the general case, where the field may contain a value.
-   *
-   * Also appends a tab.  The tab is meant to be a separator, not a terminator,
-   * so if you write any fields at all, you'll end up with one tab too many
-   * at the end of the buffer.
-   */
-  template<typename Field>
-  std::enable_if_t<not nullness<Field>::always_null>
-  append_to_buffer(Field const &f)
-  {
-    // We append each field, terminated by a tab.  That will leave us with
-    // one tab too many, assuming we write any fields at all; we remove that
-    // at the end.
-    if (is_null(f))
-    {
-      // Easy.  Append null and tab in one go.
-      m_buffer.append(null_field);
-    }
-    else
-    {
-      // Convert f into m_buffer.
-
-      using traits = string_traits<Field>;
-      auto const budget{estimate_buffer(f)};
-      auto const offset{std::size(m_buffer)};
-
-      if constexpr (std::is_arithmetic_v<Field>)
-      {
-        // Specially optimised for "safe" types, which never need any
-        // escaping.  Convert straight into m_buffer.
-
-        // The budget we get from size_buffer() includes room for the trailing
-        // zero, which we must remove.  But we're also inserting tabs between
-        // fields, so we re-purpose the extra byte for that.
-        auto const total{offset + budget};
-        m_buffer.resize(total);
-        auto const data{m_buffer.data()};
-        char *const end{traits::into_buf(data + offset, data + total, f)};
-        *(end - 1) = '\t';
-        // Shrink to fit.  Keep the tab though.
-        m_buffer.resize(static_cast<std::size_t>(end - data));
-      }
-      else if constexpr (
-        std::is_same_v<Field, std::string> or
-        std::is_same_v<Field, std::string_view> or
-        std::is_same_v<Field, zview>)
-      {
-        // This string may need escaping.
-        m_field_buf.resize(budget);
-        escape_field_to_buffer(f);
-      }
-      else
-      {
-        // This field needs to be converted to a string, and after that,
-        // escaped as well.
-        m_field_buf.resize(budget);
-        auto const data{m_field_buf.data()};
-        escape_field_to_buffer(
-          traits::to_buf(data, data + std::size(m_field_buf), f));
-      }
-    }
-  }
-
-  /// Append string representation for a null field to @c m_buffer.
-  /** This special case is for types which are always null.
-   *
-   * Also appends a tab.  The tab is meant to be a separator, not a terminator,
-   * so if you write any fields at all, you'll end up with one tab too many
-   * at the end of the buffer.
-   */
-  template<typename Field>
-  std::enable_if_t<nullness<Field>::always_null>
-  append_to_buffer(Field const &)
-  {
-    m_buffer.append(null_field);
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on a container of fields.
-  template<typename Container>
-  std::enable_if_t<not std::is_same_v<typename Container::value_type, char>>
-  fill_buffer(Container const &c)
-  {
-    // To avoid unnecessary allocations and deallocations, we run through c
-    // twice: once to determine how much buffer space we may need, and once to
-    // actually write it into the buffer.
-    std::size_t budget{0};
-    for (auto const &f : c) budget += estimate_buffer(f);
-    m_buffer.reserve(budget);
-    for (auto const &f : c) append_to_buffer(f);
-  }
-
-  /// Estimate how many buffer bytes we need to write tuple.
-  template<typename Tuple, std::size_t... indexes>
-  static std::size_t
-  budget_tuple(Tuple const &t, std::index_sequence<indexes...>)
-  {
-    return (estimate_buffer(std::get<indexes>(t)) + ...);
-  }
-
-  /// Write tuple of fields to @c m_buffer.
-  template<typename Tuple, std::size_t... indexes>
-  void append_tuple(Tuple const &t, std::index_sequence<indexes...>)
-  {
-    (append_to_buffer(std::get<indexes>(t)), ...);
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on a tuple of fields.
-  template<typename... Elts> void fill_buffer(std::tuple<Elts...> const &t)
-  {
-    using indexes = std::make_index_sequence<sizeof...(Elts)>;
-
-    m_buffer.reserve(budget_tuple(t, indexes{}));
-    append_tuple(t, indexes{});
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on varargs fields.
-  template<typename... Ts> void fill_buffer(const Ts &...fields)
-  {
-    (..., append_to_buffer(fields));
-  }
-
-  constexpr static std::string_view s_classname{"stream_to"};
-};
-
-
-template<typename Columns>
-inline stream_to::stream_to(
-  transaction_base &tx, std::string_view table_name, Columns const &columns) :
-        stream_to{tx, table_name, std::begin(columns), std::end(columns)}
-{}
-
-
-template<typename Iter>
-inline stream_to::stream_to(
-  transaction_base &tx, std::string_view table_name, Iter columns_begin,
-  Iter columns_end) :
-        stream_to{
-          tx,
-          tx.quote_name(
-            table_name,
-            separated_list(",", columns_begin, columns_end, [&tx](auto col) {
-              return tx.quote_name(*col);
-            }))}
-{}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/subtransaction b/ext/libpqxx-7.7.3/include/pqxx/subtransaction
deleted file mode 100644
index e0d154903..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/subtransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::subtransaction class.
- *
- * pqxx::subtransaction is a nested transaction, i.e. one inside a transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/subtransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/subtransaction.hxx b/ext/libpqxx-7.7.3/include/pqxx/subtransaction.hxx
deleted file mode 100644
index e66b7a7a8..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/subtransaction.hxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Definition of the pqxx::subtransaction class.
- *
- * pqxx::subtransaction is a nested transaction, i.e. one within a transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/subtransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SUBTRANSACTION
-#define PQXX_H_SUBTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- */
-/// "Transaction" nested within another transaction
-/** A subtransaction can be executed inside a backend transaction, or inside
- * another subtransaction.  This can be useful when, for example, statements in
- * a transaction may harmlessly fail and you don't want them to abort the
- * entire transaction.  Here's an example of how a temporary table may be
- * dropped before re-creating it, without failing if the table did not exist:
- *
- * ```cxx
- * void do_job(connection &C)
- * {
- *   string const temptable = "fleetingtable";
- *
- *   work W(C, "do_job");
- *   do_firstpart(W);
- *
- *   // Attempt to delete our temporary table if it already existed.
- *   try
- *   {
- *     subtransaction S(W, "droptemp");
- *     S.exec0("DROP TABLE " + temptable);
- *     S.commit();
- *   }
- *   catch (undefined_table const &)
- *   {
- *     // Table did not exist.  Which is what we were hoping to achieve anyway.
- *     // Carry on without regrets.
- *   }
- *
- *   // S may have gone into a failed state and been destroyed, but the
- *   // upper-level transaction W is still fine.  We can continue to use it.
- *   W.exec0("CREATE TEMP TABLE " + temptable + "(bar integer, splat
- * varchar)");
- *
- *   do_lastpart(W);
- * }
- * ```
- *
- * (This is just an example.  If you really wanted to do drop a table without
- * an error if it doesn't exist, you'd use DROP TABLE IF EXISTS.)
- *
- * There are no isolation levels inside a transaction.  They are not needed
- * because all actions within the same backend transaction are always performed
- * sequentially anyway.
- *
- * @warning While the subtransaction is "live," you cannot execute queries or
- * open streams etc. on its parent transaction.  A transaction can have at most
- * one object of a type derived from @ref pqxx::transaction_focus active on it
- * at a time.
- */
-class PQXX_LIBEXPORT subtransaction : public transaction_focus,
-                                      public dbtransaction
-{
-public:
-  /// Nest a subtransaction nested in another transaction.
-  explicit subtransaction(dbtransaction &t, std::string_view tname = ""sv);
-
-  /// Nest a subtransaction in another subtransaction.
-  explicit subtransaction(subtransaction &t, std::string_view name = ""sv);
-
-  virtual ~subtransaction() noexcept override;
-
-private:
-  std::string quoted_name() const
-  {
-    return quote_name(transaction_focus::name());
-  }
-  virtual void do_commit() override;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/time b/ext/libpqxx-7.7.3/include/pqxx/time
deleted file mode 100644
index 85df05744..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/time
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Date/time string conversions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/time.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/time.hxx b/ext/libpqxx-7.7.3/include/pqxx/time.hxx
deleted file mode 100644
index effed05e0..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/time.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/** Support for date/time values.
- *
- * At the moment this supports dates, but not times.
- */
-#ifndef PQXX_H_TIME
-#define PQXX_H_TIME
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <chrono>
-#include <cstdlib>
-
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/strconv.hxx"
-
-
-#if defined(PQXX_HAVE_YEAR_MONTH_DAY)
-
-namespace pqxx
-{
-using namespace std::literals;
-
-template<>
-struct nullness<std::chrono::year_month_day>
-        : no_null<std::chrono::year_month_day>
-{};
-
-
-/// String representation for a Gregorian date in ISO-8601 format.
-/** @warning Experimental.  There may still be design problems, particularly
- * when it comes to BC years.
- *
- * PostgreSQL supports a choice of date formats, but libpqxx does not.  The
- * other formats in turn support a choice of "month before day" versus "day
- * before month," meaning that it's not necessarily known which format a given
- * date is supposed to be.  So I repeat: ISO-8601-style format only!
- *
- * Invalid dates will not convert.  This includes February 29 on non-leap
- * years, which is why it matters that `year_month_day` represents a
- * _Gregorian_ date.
- *
- * The range of years is limited.  At the time of writing, PostgreSQL 14
- * supports years from 4713 BC to 294276 AD inclusive, and C++20 supports
- * a range of 32767 BC to 32767 AD inclusive.  So in practice, years must fall
- * between 4713 BC and 32767 AD, inclusive.
- *
- * @warning Support for BC (or BCE) years is still experimental.  I still need
- * confirmation on this issue: it looks as if C++ years are astronomical years,
- * which means they have a Year Zero.  Regular BC/AD years do not have a year
- * zero, so the year 1 AD follows directly after 1 BC.
- *
- * So, what to our calendars (and to PostgreSQL) is the year "0001 BC" seems to
- * count as year "0" in a `std::chrono::year_month_day`.  The year 0001 AD is
- * still equal to 1 as you'd expect, and all AD years work normally, but all
- * years before then are shifted by one.  For instance, the year 543 BC would
- * be -542 in C++.
- */
-template<> struct PQXX_LIBEXPORT string_traits<std::chrono::year_month_day>
-{
-  [[nodiscard]] static zview
-  to_buf(char *begin, char *end, std::chrono::year_month_day const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::chrono::year_month_day const &value);
-
-  [[nodiscard]] static std::chrono::year_month_day
-  from_string(std::string_view text);
-
-  [[nodiscard]] static std::size_t
-  size_buffer(std::chrono::year_month_day const &) noexcept
-  {
-    static_assert(int{(std::chrono::year::min)()} >= -99999);
-    static_assert(int{(std::chrono::year::max)()} <= 99999);
-    return 5 + 1 + 2 + 1 + 2 + std::size(s_bc) + 1;
-  }
-
-private:
-  /// The "BC" suffix for years before 1 AD.
-  static constexpr std::string_view s_bc{" BC"sv};
-};
-} // namespace pqxx
-#endif // PQXX_HAVE_YEAR_MONTH_DAY
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/transaction b/ext/libpqxx-7.7.3/include/pqxx/transaction
deleted file mode 100644
index a7ae39d43..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/transaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::transaction class.
- *
- * pqxx::transaction represents a standard database transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/transaction.hxx b/ext/libpqxx-7.7.3/include/pqxx/transaction.hxx
deleted file mode 100644
index e90917e38..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/transaction.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Definition of the pqxx::transaction class.
- * pqxx::transaction represents a standard database transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION
-#define PQXX_H_TRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx::internal
-{
-/// Helper base class for the @ref transaction class template.
-class PQXX_LIBEXPORT basic_transaction : public dbtransaction
-{
-protected:
-  basic_transaction(
-    connection &c, zview begin_command, std::string_view tname);
-  basic_transaction(connection &c, zview begin_command, std::string &&tname);
-  basic_transaction(connection &c, zview begin_command);
-
-  virtual ~basic_transaction() noexcept override = 0;
-
-private:
-  virtual void do_commit() override;
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- */
-//@{
-
-/// Standard back-end transaction, templatised on isolation level.
-/** This is the type you'll normally want to use to represent a transaction on
- * the database.
- *
- * Usage example: double all wages.
- *
- * ```cxx
- * extern connection C;
- * work T(C);
- * try
- * {
- *   T.exec0("UPDATE employees SET wage=wage*2");
- *   T.commit();	// NOTE: do this inside try block
- * }
- * catch (exception const &e)
- * {
- *   cerr << e.what() << endl;
- *   T.abort();		// Usually not needed; same happens when T's life ends.
- * }
- * ```
- */
-template<
-  isolation_level ISOLATION = isolation_level::read_committed,
-  write_policy READWRITE = write_policy::read_write>
-class transaction final : public internal::basic_transaction
-{
-public:
-  /// Begin a transaction.
-  /**
-   * @param c Connection for this transaction to operate on.
-   * @param tname Optional name for transaction.  Must begin with a letter and
-   * may contain letters and digits only.
-   */
-  transaction(connection &c, std::string_view tname) :
-          internal::basic_transaction{
-            c, internal::begin_cmd<ISOLATION, READWRITE>, tname}
-  {}
-
-  /// Begin a transaction.
-  /**
-   * @param c Connection for this transaction to operate on.
-   * may contain letters and digits only.
-   */
-  explicit transaction(connection &c) :
-          internal::basic_transaction{
-            c, internal::begin_cmd<ISOLATION, READWRITE>}
-  {}
-
-  virtual ~transaction() noexcept override { close(); }
-};
-
-
-/// The default transaction type.
-using work = transaction<>;
-
-/// Read-only transaction.
-using read_transaction =
-  transaction<isolation_level::read_committed, write_policy::read_only>;
-
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/transaction_base b/ext/libpqxx-7.7.3/include/pqxx/transaction_base
deleted file mode 100644
index c39219aac..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/transaction_base
+++ /dev/null
@@ -1,9 +0,0 @@
-/** Base for the transaction classes.
- *
- * pqxx::transaction_base defines the interface for any abstract class that
- * represents a database transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transaction_base.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/transaction_base.hxx b/ext/libpqxx-7.7.3/include/pqxx/transaction_base.hxx
deleted file mode 100644
index 4363cc56a..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/transaction_base.hxx
+++ /dev/null
@@ -1,810 +0,0 @@
-/* Common code and definitions for the transaction classes.
- *
- * pqxx::transaction_base defines the interface for any abstract class that
- * represents a database transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transaction_base instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION_BASE
-#define PQXX_H_TRANSACTION_BASE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <string_view>
-#include <utility>
-
-/* End-user programs need not include this file, unless they define their own
- * transaction classes.  This is not something the typical program should want
- * to do.
- *
- * However, reading this file is worthwhile because it defines the public
- * interface for the available transaction classes such as transaction and
- * nontransaction.
- */
-
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/isolation.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/util.hxx"
-
-namespace pqxx::internal::gate
-{
-class transaction_subtransaction;
-class transaction_sql_cursor;
-class transaction_stream_to;
-class transaction_transaction_focus;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-using namespace std::literals;
-
-
-class transaction_focus;
-
-
-/**
- * @defgroup transactions Transaction classes
- *
- * All database access goes through instances of these classes.
- * However, not all implementations of this interface need to provide full
- * transactional integrity.
- *
- * Several implementations of this interface are shipped with libpqxx,
- * including the plain transaction class, the entirely unprotected
- * nontransaction, and the more cautious robusttransaction.
- */
-
-/// Interface definition (and common code) for "transaction" classes.
-/**
- * @ingroup transactions
- *
- * Abstract base class for all transaction types.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE transaction_base
-{
-public:
-  transaction_base() = delete;
-  transaction_base(transaction_base const &) = delete;
-  transaction_base(transaction_base &&) = delete;
-  transaction_base &operator=(transaction_base const &) = delete;
-  transaction_base &operator=(transaction_base &&) = delete;
-
-  virtual ~transaction_base() = 0;
-
-  /// Commit the transaction.
-  /** Make the effects of this transaction definite.  If you destroy a
-   * transaction without invoking its @ref commit() first, that will implicitly
-   * abort it.  (For the @ref nontransaction class though, "commit" and "abort"
-   * really don't do anything, hence its name.)
-   *
-   * There is, however, a minute risk that you might lose your connection to
-   * the database at just the wrong moment here.  In that case, libpqxx may be
-   * unable to determine whether the database was able to complete the
-   * transaction, or had to roll it back.  In that scenario, @ref commit() will
-   * throw an in_doubt_error.  There is a different transaction class called
-   * @ref robusttransaction which takes some special precautions to reduce this
-   * risk.
-   */
-  void commit();
-
-  /// Abort the transaction.
-  /** No special effort is required to call this function; it will be called
-   * implicitly when the transaction is destructed.
-   */
-  void abort();
-
-  /**
-   * @ingroup escaping-functions
-   *
-   * Use these when writing SQL queries that incorporate C++ values as SQL
-   * constants.
-   *
-   * The functions you see here are just convenience shortcuts to the same
-   * functions on the connection object.
-   */
-  //@{
-  /// Escape string for use as SQL string literal in this transaction.
-  template<typename... ARGS> [[nodiscard]] auto esc(ARGS &&...args) const
-  {
-    return conn().esc(std::forward<ARGS>(args)...);
-  }
-
-  /// Escape binary data for use as SQL string literal in this transaction.
-  /** Raw, binary data is treated differently from regular strings.  Binary
-   * strings are never interpreted as text, so they may safely include byte
-   * values or byte sequences that don't happen to represent valid characters
-   * in the character encoding being used.
-   *
-   * The binary string does not stop at the first zero byte, as is the case
-   * with textual strings.  Instead, it may contain zero bytes anywhere.  If
-   * it happens to contain bytes that look like quote characters, or other
-   * things that can disrupt their use in SQL queries, they will be replaced
-   * with special escape sequences.
-   */
-  template<typename... ARGS> [[nodiscard]] auto esc_raw(ARGS &&...args) const
-  {
-    return conn().esc_raw(std::forward<ARGS>(args)...);
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(zview text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return conn().unesc_raw(text);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard]] std::basic_string<std::byte> unesc_bin(zview text)
-  {
-    return conn().unesc_bin(text);
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(char const *text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return conn().unesc_raw(text);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard]] std::basic_string<std::byte> unesc_bin(char const text[])
-  {
-    return conn().unesc_bin(text);
-  }
-
-  /// Represent object as SQL string, including quoting & escaping.
-  /** Nulls are recognized and represented as SQL nulls. */
-  template<typename T> [[nodiscard]] std::string quote(T const &t) const
-  {
-    return conn().quote(t);
-  }
-
-  [[deprecated(
-    "Use std::basic_string<std::byte> instead of binarystring.")]] std::string
-  quote(binarystring const &t) const
-  {
-    return conn().quote(t.bytes_view());
-  }
-
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(unsigned char const bin[], std::size_t len) const
-  {
-    return quote(binary_cast(bin, len));
-  }
-
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(zview bin) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  /** For binary data you can also just use @ref quote(data). */
-  template<binary DATA>
-  [[nodiscard]] std::string quote_raw(DATA const &data) const
-  {
-    return conn().quote_raw(data);
-  }
-#endif
-
-  /// Escape an SQL identifier for use in a query.
-  [[nodiscard]] std::string quote_name(std::string_view identifier) const
-  {
-    return conn().quote_name(identifier);
-  }
-
-  /// Escape string for literal LIKE match.
-  [[nodiscard]] std::string
-  esc_like(std::string_view bin, char escape_char = '\\') const
-  {
-    return conn().esc_like(bin, escape_char);
-  }
-  //@}
-
-  /**
-   * @name Command execution
-   *
-   * There are many functions for executing (or "performing") a command (or
-   * "query").  This is the most fundamental thing you can do with the library,
-   * and you always do it from a transaction class.
-   *
-   * Command execution can throw many types of exception, including sql_error,
-   * broken_connection, and many sql_error subtypes such as
-   * feature_not_supported or insufficient_privilege.  But any exception thrown
-   * by the C++ standard library may also occur here.  All exceptions you will
-   * see libpqxx throw are derived from std::exception.
-   *
-   * One unusual feature in libpqxx is that you can give your query a name or
-   * description.  This does not mean anything to the database, but sometimes
-   * it can help libpqxx produce more helpful error messages, making problems
-   * in your code easier to debug.
-   *
-   * Many of the execution functions used to accept a `desc` argument, a
-   * human-readable description of the statement for use in error messages.
-   * This could make failures easier to debug.  Future versions will use
-   * C++20's `std::source_location` to identify the failing statement.
-   */
-  //@{
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @param desc Optional identifier for query, to help pinpoint SQL errors.
-   * @return A result set describing the query's or command's result.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec(std::string_view query, std::string_view desc);
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @return A result set describing the query's or command's result.
-   */
-  result exec(std::string_view query)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec(query, std::string_view{});
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @param desc Optional identifier for query, to help pinpoint SQL errors.
-   * @return A result set describing the query's or command's result.
-   */
-  [[deprecated(
-    "Pass your query as a std::string_view, not stringstream.")]] result
-  exec(std::stringstream const &query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec(query.str(), desc);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command, which should return zero rows of data.
-  /** Works like @ref exec, but fails if the result contains data.  It still
-   * returns a result, however, which may contain useful metadata.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec0(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(0, query, desc);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command, which should return zero rows of data.
-  /** Works like @ref exec, but fails if the result contains data.  It still
-   * returns a result, however, which may contain useful metadata.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  result exec0(zview query) { return exec_n(0, query); }
-
-  /// Execute command returning a single row of data.
-  /** Works like @ref exec, but requires the result to contain exactly one row.
-   * The row can be addressed directly, without the need to find the first row
-   * in a result set.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] row
-  exec1(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(1, query, desc).front();
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command returning a single row of data.
-  /** Works like @ref exec, but requires the result to contain exactly one row.
-   * The row can be addressed directly, without the need to find the first row
-   * in a result set.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  row exec1(zview query) { return exec_n(1, query).front(); }
-
-  /// Execute command, expect given number of rows.
-  /** Works like @ref exec, but checks that the result has exactly the expected
-   * number of rows.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec_n(result::size_type rows, zview query, std::string_view desc);
-
-  /// Execute command, expect given number of rows.
-  /** Works like @ref exec, but checks that the result has exactly the expected
-   * number of rows.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  result exec_n(result::size_type rows, zview query)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(rows, query, std::string_view{});
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Perform query, expecting exactly 1 row with 1 field, and convert it.
-  /** This is convenience shorthand for querying exactly one value from the
-   * database.  It returns that value, converted to the type you specify.
-   */
-  template<typename TYPE>
-  [[deprecated("The desc parameter is going away.")]] TYPE
-  query_value(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row const r{exec1(query, desc)};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    if (std::size(r) != 1)
-      throw usage_error{internal::concat(
-        "Queried single value from result with ", std::size(r), " columns.")};
-    return r[0].as<TYPE>();
-  }
-
-  /// Perform query, expecting exactly 1 row with 1 field, and convert it.
-  /** This is convenience shorthand for querying exactly one value from the
-   * database.  It returns that value, converted to the type you specify.
-   */
-  template<typename TYPE> TYPE query_value(zview query)
-  {
-    row const r{exec1(query)};
-    if (std::size(r) != 1)
-      throw usage_error{internal::concat(
-        "Queried single value from result with ", std::size(r), " columns.")};
-    return r[0].as<TYPE>();
-  }
-
-  /// Execute a query, and loop over the results row by row.
-  /** Converts the rows to `std::tuple`, of the column types you specify.
-   *
-   * Use this with a range-based "for" loop.  It executes the query, and
-   * directly maps the resulting rows onto a `std::tuple` of the types you
-   * specify.  It starts before all the data from the server is in, so if your
-   * network connection to the server breaks while you're iterating, you'll get
-   * an exception partway through.
-   *
-   * The stream lives entirely within the lifetime of the transaction.  Make
-   * sure you destroy the stream before you destroy the transaction.  Either
-   * iterate the stream all the way to the end, or destroy first the stream
-   * and then the transaction without touching either in any other way.  Until
-   * the stream has finished, the transaction is in a special state where it
-   * cannot execute queries.
-   *
-   * As a special case, tuple may contain `std::string_view` fields, but the
-   * strings to which they point will only remain valid until you extract the
-   * next row.  After that, the memory holding the string may be overwritten or
-   * deallocated.
-   *
-   * If any of the columns can be null, and the C++ type to which it translates
-   * does not have a null value, wrap the type in `std::optional` (or if
-   * you prefer, `std::shared_ptr` or `std::unique_ptr)`.  These templates
-   * do recognise null values, and libpqxx will know how to convert to them.
-   *
-   * The connection is in a special state until the iteration finishes.  So if
-   * it does not finish due to a `break` or a `return` or an exception, then
-   * the entire connection becomes effectively unusable.
-   *
-   * Querying in this way is faster than the `exec()` methods for larger
-   * results (but slower for small ones).  You can start processing rows before
-   * the full result is in.  Also, `stream()` scales better in terms of memory
-   * usage.  Where @ref exec() reads the entire result into memory at once,
-   * `stream()` will read and process one row at at a time.
-   *
-   * Your query executes as part of a COPY command, not as a stand-alone query,
-   * so there are limitations to what you can do in the query.  It can be
-   * either a SELECT or VALUES query; or an INSERT, UPDATE, or DELETE with a
-   * RETURNING clause.  See the documentation for PostgreSQL's COPY command for
-   * the details:
-   *
-   *     https://www.postgresql.org/docs/current/sql-copy.html
-   *
-   * Iterating in this way does require each of the field types you pass to be
-   * default-constructible, copy-constructible, and assignable.  These
-   * requirements may be loosened once libpqxx moves on to C++20.
-   */
-  template<typename... TYPE>
-  [[nodiscard]] auto stream(std::string_view query) &
-  {
-    // Tricky: std::make_unique() supports constructors but not RVO functions.
-    return pqxx::internal::owning_stream_input_iteration<TYPE...>{
-      std::unique_ptr<stream_from>{
-        new stream_from{stream_from::query(*this, query)}}};
-  }
-
-  // C++20: Concept like std::invocable, but without specifying param types.
-  /// Perform a streaming query, and for each result row, call `func`.
-  /** Here, `func` can be a function, a `std::function`, a lambda, or an
-   * object that supports the function call operator.  Of course `func` must
-   * have an unambiguous signature; it can't be overloaded or generic.
-   *
-   * The `for_each` function executes `query` in a stream using
-   * @ref pqxx::stream_from.  Every time a row of data comes in from the
-   * server, it converts the row's fields to the types of `func`'s respective
-   * parameters, and calls `func` with those values.
-   *
-   * This will not work for all queries, but straightforward `SELECT` and
-   * `UPDATE ... RETURNING` queries should work.  Consult the documentation for
-   * @ref pqxx::stream_from and PostgreSQL's underlying `COPY` command for the
-   * full details.
-   *
-   * Streaming a query like this is likely to be slower than the @ref exec()
-   * functions for small result sets, but faster for large result sets.  So if
-   * performance matters, you'll want to use `for_each` if you query large
-   * amounts of data, but not if you do lots of queries with small outputs.
-   */
-  template<typename CALLABLE>
-  inline auto for_each(std::string_view query, CALLABLE &&func)
-  {
-    using param_types =
-      pqxx::internal::strip_types_t<pqxx::internal::args_t<CALLABLE>>;
-    param_types const *const sample{nullptr};
-    auto data_stream{stream_like(query, sample)};
-    for (auto const &fields : data_stream) std::apply(func, fields);
-  }
-
-  /**
-   * @name Parameterized statements
-   *
-   * You'll often need parameters in the queries you execute: "select the
-   * car with this licence plate."  If the parameter is a string, you need to
-   * quote it and escape any special characters inside it, or it may become a
-   * target for an SQL injection attack.  If it's an integer (for example),
-   * you need to convert it to a string, but in the database's format, without
-   * locale-specific niceties like "," separators between the thousands.
-   *
-   * Parameterised statements are an easier and safer way to do this.  They're
-   * like prepared statements, but for a single use.  You don't need to name
-   * them, and you don't need to prepare them first.
-   *
-   * Your query will include placeholders like `$1` and `$2` etc. in the places
-   * where you want the arguments to go.  Then, you pass the argument values
-   * and the actual query is constructed for you.
-   *
-   * Pass the exact right number of parameters, and in the right order.  The
-   * parameters in the query don't have to be neatly ordered from `$1` to
-   * `$2` to `$3` - but you must pass the argument for `$1` first, the one
-   * for `$2` second, etc.
-   *
-   * @warning Beware of "nul" bytes.  Any string you pass as a parameter will
-   * end at the first char with value zero.  If you pass a string that contains
-   * a zero byte, the last byte in the value will be the one just before the
-   * zero.
-   */
-  //@{
-  /// Execute an SQL statement with parameters.
-  template<typename... Args> result exec_params(zview query, Args &&...args)
-  {
-    params pp(args...);
-    return internal_exec_params(query, pp.make_c_params());
-  }
-
-  // Execute parameterised statement, expect a single-row result.
-  /** @throw unexpected_rows if the result does not consist of exactly one row.
-   */
-  template<typename... Args> row exec_params1(zview query, Args &&...args)
-  {
-    return exec_params_n(1, query, std::forward<Args>(args)...).front();
-  }
-
-  // Execute parameterised statement, expect a result with zero rows.
-  /** @throw unexpected_rows if the result contains rows.
-   */
-  template<typename... Args> result exec_params0(zview query, Args &&...args)
-  {
-    return exec_params_n(0, query, std::forward<Args>(args)...);
-  }
-
-  // Execute parameterised statement, expect exactly a given number of rows.
-  /** @throw unexpected_rows if the result contains the wrong number of rows.
-   */
-  template<typename... Args>
-  result exec_params_n(std::size_t rows, zview query, Args &&...args)
-  {
-    auto const r{exec_params(query, std::forward<Args>(args)...)};
-    check_rowcount_params(rows, std::size(r));
-    return r;
-  }
-  //@}
-
-  /**
-   * @name Prepared statements
-   *
-   * These are very similar to parameterised statements.  The difference is
-   * that you prepare them in advance, giving them identifying names.  You can
-   * then call them by these names, passing in the argument values appropriate
-   * for that call.
-   *
-   * You prepare a statement on the connection, using
-   * @ref pqxx::connection::prepare().  But you then call the statement in a
-   * transaction, using the functions you see here.
-   *
-   * Never try to prepare, execute, or unprepare a prepared statement manually
-   * using direct SQL queries when you also use the libpqxx equivalents.  For
-   * any given statement, either prepare, manage, and execute it through the
-   * dedicated libpqxx functions; or do it all directly in SQL.  Don't mix the
-   * two, or the code may get confused.
-   *
-   * See \ref prepared for a full discussion.
-   *
-   * @warning Beware of "nul" bytes.  Any string you pass as a parameter will
-   * end at the first char with value zero.  If you pass a string that contains
-   * a zero byte, the last byte in the value will be the one just before the
-   * zero.  If you need a zero byte, you're dealing with binary strings, not
-   * regular strings.  Represent binary strings on the SQL side as `BYTEA`
-   * (or as large objects).  On the C++ side, use types like
-   * `std::basic_string<std::byte>` or `std::basic_string_view<std::byte>`
-   * or (in C++20) `std::vector<std::byte>`.  Also, consider large objects on
-   * the SQL side and @ref blob on the C++ side.
-   */
-  //@{
-
-  /// Execute a prepared statement, with optional arguments.
-  template<typename... Args>
-  result exec_prepared(zview statement, Args &&...args)
-  {
-    params pp(args...);
-    return internal_exec_prepared(statement, pp.make_c_params());
-  }
-
-  /// Execute a prepared statement, and expect a single-row result.
-  /** @throw pqxx::unexpected_rows if the result was not exactly 1 row.
-   */
-  template<typename... Args>
-  row exec_prepared1(zview statement, Args &&...args)
-  {
-    return exec_prepared_n(1, statement, std::forward<Args>(args)...).front();
-  }
-
-  /// Execute a prepared statement, and expect a result with zero rows.
-  /** @throw pqxx::unexpected_rows if the result contained rows.
-   */
-  template<typename... Args>
-  result exec_prepared0(zview statement, Args &&...args)
-  {
-    return exec_prepared_n(0, statement, std::forward<Args>(args)...);
-  }
-
-  /// Execute a prepared statement, expect a result with given number of rows.
-  /** @throw pqxx::unexpected_rows if the result did not contain exactly the
-   *  given number of rows.
-   */
-  template<typename... Args>
-  result
-  exec_prepared_n(result::size_type rows, zview statement, Args &&...args)
-  {
-    auto const r{exec_prepared(statement, std::forward<Args>(args)...)};
-    check_rowcount_prepared(statement, rows, std::size(r));
-    return r;
-  }
-
-  //@}
-
-  /**
-   * @name Error/warning output
-   */
-  //@{
-  /// Have connection process a warning message.
-  void process_notice(char const msg[]) const { m_conn.process_notice(msg); }
-  /// Have connection process a warning message.
-  void process_notice(zview msg) const { m_conn.process_notice(msg); }
-  //@}
-
-  /// The connection in which this transaction lives.
-  [[nodiscard]] constexpr connection &conn() const noexcept { return m_conn; }
-
-  /// Set session variable using SQL "SET" command.
-  /** @deprecated To set a transaction-local variable, execute an SQL `SET`
-   * command.  To set a session variable, use the connection's
-   * @ref set_session_var function.
-   *
-   * @warning When setting a string value, you must make sure that the string
-   * is "safe."  If you call @ref quote() on the string, it will return a
-   * safely escaped and quoted version for use as an SQL literal.
-   *
-   * @warning This function executes SQL.  Do not try to set or get variables
-   * while a pipeline or table stream is active.
-   *
-   * @param var The variable to set.
-   * @param value The new value to store in the variable.  This can be any SQL
-   * expression.
-   */
-  [[deprecated(
-    "Set transaction-local variables using SQL SET statements.")]] void
-  set_variable(std::string_view var, std::string_view value);
-
-  /// Read session variable using SQL "SHOW" command.
-  /** @warning This executes SQL.  Do not try to set or get variables while a
-   * pipeline or table stream is active.
-   */
-  [[deprecated("Read variables using SQL SHOW statements.")]] std::string
-    get_variable(std::string_view);
-
-  // C++20: constexpr.
-  /// Transaction name, if you passed one to the constructor; or empty string.
-  [[nodiscard]] std::string_view name() const &noexcept { return m_name; }
-
-protected:
-  /// Create a transaction (to be called by implementation classes only).
-  /** The name, if nonempty, must begin with a letter and may contain letters
-   * and digits only.
-   */
-  transaction_base(
-    connection &c, std::string_view tname,
-    std::shared_ptr<std::string> rollback_cmd) :
-          m_conn{c}, m_name{tname}, m_rollback_cmd{rollback_cmd}
-  {}
-
-  /// Create a transaction (to be called by implementation classes only).
-  /** Its rollback command will be "ROLLBACK".
-   *
-   * The name, if nonempty, must begin with a letter and may contain letters
-   * and digits only.
-   */
-  transaction_base(connection &c, std::string_view tname);
-
-  /// Create a transaction (to be called by implementation classes only).
-  explicit transaction_base(connection &c);
-
-  /// Register this transaction with the connection.
-  void register_transaction();
-
-  /// End transaction.  To be called by implementing class' destructor.
-  void close() noexcept;
-
-  /// To be implemented by derived implementation class: commit transaction.
-  virtual void do_commit() = 0;
-
-  /// Transaction type-specific way of aborting a transaction.
-  /** @warning This will become "final", since this function can be called
-   * from the implementing class destructor.
-   */
-  virtual void do_abort();
-
-  /// Set the rollback command.
-  void set_rollback_cmd(std::shared_ptr<std::string> cmd)
-  {
-    m_rollback_cmd = cmd;
-  }
-
-  /// Execute query on connection directly.
-  result direct_exec(std::string_view, std::string_view desc = ""sv);
-  result
-  direct_exec(std::shared_ptr<std::string>, std::string_view desc = ""sv);
-
-private:
-  enum class status
-  {
-    active,
-    aborted,
-    committed,
-    in_doubt
-  };
-
-  PQXX_PRIVATE void check_pending_error();
-
-  result
-  internal_exec_prepared(zview statement, internal::c_params const &args);
-
-  result internal_exec_params(zview query, internal::c_params const &args);
-
-  /// Throw unexpected_rows if prepared statement returned wrong no. of rows.
-  void check_rowcount_prepared(
-    zview statement, result::size_type expected_rows,
-    result::size_type actual_rows);
-
-  /// Throw unexpected_rows if wrong row count from parameterised statement.
-  void
-  check_rowcount_params(std::size_t expected_rows, std::size_t actual_rows);
-
-  /// Describe this transaction to humans, e.g. "transaction 'foo'".
-  [[nodiscard]] std::string description() const;
-
-  friend class pqxx::internal::gate::transaction_transaction_focus;
-  PQXX_PRIVATE void register_focus(transaction_focus *);
-  PQXX_PRIVATE void unregister_focus(transaction_focus *) noexcept;
-  PQXX_PRIVATE void register_pending_error(zview) noexcept;
-  PQXX_PRIVATE void register_pending_error(std::string &&) noexcept;
-
-  /// Like @ref stream(), but takes a tuple rather than a parameter pack.
-  template<typename... ARGS>
-  auto stream_like(std::string_view query, std::tuple<ARGS...> const *)
-  {
-    return stream<ARGS...>(query);
-  }
-
-  connection &m_conn;
-
-  /// Current "focus": a pipeline, a nested transaction, a stream...
-  /** This pointer is used for only one purpose: sanity checks against mistakes
-   * such as opening one while another is still active.
-   */
-  transaction_focus const *m_focus = nullptr;
-
-  status m_status = status::active;
-  bool m_registered = false;
-  std::string m_name;
-  std::string m_pending_error;
-
-  /// SQL command for aborting this type of transaction.
-  std::shared_ptr<std::string> m_rollback_cmd;
-
-  static constexpr std::string_view s_type_name{"transaction"sv};
-};
-
-
-// C++20: Can borrowed_range help?
-/// Forbidden specialisation: underlying buffer immediately goes out of scope.
-template<>
-std::string_view transaction_base::query_value<std::string_view>(
-  zview query, std::string_view desc) = delete;
-/// Forbidden specialisation: underlying buffer immediately goes out of scope.
-template<>
-zview transaction_base::query_value<zview>(
-  zview query, std::string_view desc) = delete;
-
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// The SQL command for starting a given type of transaction.
-template<pqxx::isolation_level isolation, pqxx::write_policy rw>
-extern const zview begin_cmd;
-
-// These are not static members, so "constexpr" does not imply "inline".
-template<>
-inline constexpr zview begin_cmd<read_committed, write_policy::read_write>{
-  "BEGIN"_zv};
-template<>
-inline constexpr zview begin_cmd<read_committed, write_policy::read_only>{
-  "BEGIN READ ONLY"_zv};
-template<>
-inline constexpr zview begin_cmd<repeatable_read, write_policy::read_write>{
-  "BEGIN ISOLATION LEVEL REPEATABLE READ"_zv};
-template<>
-inline constexpr zview begin_cmd<repeatable_read, write_policy::read_only>{
-  "BEGIN ISOLATION LEVEL REPEATABLE READ READ ONLY"_zv};
-template<>
-inline constexpr zview begin_cmd<serializable, write_policy::read_write>{
-  "BEGIN ISOLATION LEVEL SERIALIZABLE"_zv};
-template<>
-inline constexpr zview begin_cmd<serializable, write_policy::read_only>{
-  "BEGIN ISOLATION LEVEL SERIALIZABLE READ ONLY"_zv};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/transaction_focus b/ext/libpqxx-7.7.3/include/pqxx/transaction_focus
deleted file mode 100644
index fe78a9bcc..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/transaction_focus
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Transaction focus: types which monopolise a transaction's attention.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/transaction_focus.hxx b/ext/libpqxx-7.7.3/include/pqxx/transaction_focus.hxx
deleted file mode 100644
index 0707e3cc4..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/transaction_focus.hxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/** Transaction focus: types which monopolise a transaction's attention.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION_FOCUS
-#define PQXX_H_TRANSACTION_FOCUS
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Base class for things that monopolise a transaction's attention.
-/** You probably won't need to use this class.  But it can be useful to _know_
- * that a given libpqxx class is derived from it.
- *
- * Pipelines, SQL statements, and data streams are examples of classes derived
- * from `transaction_focus`.  For any given transaction, only one object of
- * such a class can be active at any given time.
- */
-class PQXX_LIBEXPORT transaction_focus
-{
-public:
-  transaction_focus(
-    transaction_base &t, std::string_view cname, std::string_view oname) :
-          m_trans{t}, m_classname{cname}, m_name{oname}
-  {}
-
-  transaction_focus(
-    transaction_base &t, std::string_view cname, std::string &&oname) :
-          m_trans{t}, m_classname{cname}, m_name{std::move(oname)}
-  {}
-
-  transaction_focus(transaction_base &t, std::string_view cname) :
-          m_trans{t}, m_classname{cname}
-  {}
-
-  transaction_focus() = delete;
-  transaction_focus(transaction_focus const &) = delete;
-  transaction_focus &operator=(transaction_focus const &) = delete;
-
-  /// Class name, for human consumption.
-  [[nodiscard]] constexpr std::string_view classname() const noexcept
-  {
-    return m_classname;
-  }
-
-  /// Name for this object, if the caller passed one; empty string otherwise.
-  [[nodiscard]] std::string_view name() const &noexcept { return m_name; }
-
-  [[nodiscard]] std::string description() const
-  {
-    return pqxx::internal::describe_object(m_classname, m_name);
-  }
-
-  /// Can't move a transaction_focus.
-  /** Moving the transaction_focus would break the transaction's reference back
-   * to the object.
-   */
-  transaction_focus(transaction_focus &&) = delete;
-
-  /// Can't move a transaction_focus.
-  /** Moving the transaction_focus would break the transaction's reference back
-   * to the object.
-   */
-  transaction_focus &operator=(transaction_focus &&) = delete;
-
-protected:
-  void register_me();
-  void unregister_me() noexcept;
-  void reg_pending_error(std::string const &) noexcept;
-  bool registered() const noexcept { return m_registered; }
-
-  transaction_base &m_trans;
-
-private:
-  bool m_registered = false;
-  std::string_view m_classname;
-  std::string m_name;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/transactor b/ext/libpqxx-7.7.3/include/pqxx/transactor
deleted file mode 100644
index 29d1b9640..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/transactor
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::transactor class.
- *
- * pqxx::transactor is a framework-style wrapper for safe transactions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transactor.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/transactor.hxx b/ext/libpqxx-7.7.3/include/pqxx/transactor.hxx
deleted file mode 100644
index eefd04ba1..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/transactor.hxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Transactor framework, a wrapper for safely retryable transactions.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transactor instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTOR
-#define PQXX_H_TRANSACTOR
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <functional>
-#include <type_traits>
-
-#include "pqxx/connection.hxx"
-#include "pqxx/transaction.hxx"
-
-namespace pqxx
-{
-/**
- * @defgroup transactor Transactor framework
- *
- * Sometimes a transaction can fail for completely transient reasons, such as a
- * conflict with another transaction in SERIALIZABLE isolation.  The right way
- * to handle those failures is often just to re-run the transaction from
- * scratch.
- *
- * For example, your REST API might be handling each HTTP request in its own
- * database transaction, and if this kind of transient failure happens, you
- * simply want to "replay" the whole request, in a fresh transaction.
- *
- * You won't necessarily want to execute the exact same SQL commands with the
- * exact same data.  Some of your SQL statements may depend on state that can
- * vary between retries.  Data in the database may already have changed, for
- * instance.  So instead of dumbly replaying the SQL, you re-run the same
- * application code that produced those SQL commands, from the start.
- *
- * The transactor framework makes it a little easier for you to do this safely,
- * and avoid typical pitfalls.  You encapsulate the work that you want to do
- * into a callable that you pass to the @ref perform function.
- *
- * Here's how it works.  You write your transaction code as a lambda or
- * function, which creates its own transaction object, does its work, and
- * commits at the end.  You pass that callback to @ref pqxx::perform, which
- * runs it for you.
- *
- * If there's a failure inside your callback, there will be an exception.  Your
- * transaction object goes out of scope and gets destroyed, so that it aborts
- * implicitly.  Seeing this, @ref perform tries running your callback again. It
- * stops doing that when the callback succeeds, or when it has failed too many
- * times, or when there's an error that leaves the database in an unknown
- * state, such as a lost connection just while we're waiting for the database
- * to confirm a commit.  It all depends on the type of exception.
- *
- * The callback takes no arguments.  If you're using lambdas, the easy way to
- * pass arguments is for the lambda to "capture" them from your variables.  Or,
- * if you're using functions, you may want to use `std::bind`.
- *
- * Once your callback succeeds, it can return a result, and @ref perform will
- * return that result back to you.
- */
-//@{
-
-/// Simple way to execute a transaction with automatic retry.
-/**
- * Executes your transaction code as a callback.  Repeats it until it completes
- * normally, or it throws an error other than the few libpqxx-generated
- * exceptions that the framework understands, or after a given number of failed
- * attempts, or if the transaction ends in an "in-doubt" state.
- *
- * (An in-doubt state is one where libpqxx cannot determine whether the server
- * finally committed a transaction or not.  This can happen if the network
- * connection to the server is lost just while we're waiting for its reply to
- * a "commit" statement.  The server may have completed the commit, or not, but
- * it can't tell you because there's no longer a connection.
- *
- * Using this still takes a bit of care.  If your callback makes use of data
- * from the database, you'll probably have to query that data within your
- * callback.  If the attempt to perform your callback fails, and the framework
- * tries again, you'll be in a new transaction and the data in the database may
- * have changed under your feet.
- *
- * Also be careful about changing variables or data structures from within
- * your callback.  The run may still fail, and perhaps get run again.  The
- * ideal way to do it (in most cases) is to return your result from your
- * callback, and change your program's data state only after @ref perform
- * completes successfully.
- *
- * @param callback Transaction code that can be called with no arguments.
- * @param attempts Maximum number of times to attempt performing callback.
- *	Must be greater than zero.
- * @return Whatever your callback returns.
- */
-template<typename TRANSACTION_CALLBACK>
-inline auto perform(TRANSACTION_CALLBACK &&callback, int attempts = 3)
-  -> std::invoke_result_t<TRANSACTION_CALLBACK>
-{
-  if (attempts <= 0)
-    throw std::invalid_argument{
-      "Zero or negative number of attempts passed to pqxx::perform()."};
-
-  for (; attempts > 0; --attempts)
-  {
-    try
-    {
-      return std::invoke(callback);
-    }
-    catch (in_doubt_error const &)
-    {
-      // Not sure whether transaction went through or not.  The last thing in
-      // the world that we should do now is try again!
-      throw;
-    }
-    catch (statement_completion_unknown const &)
-    {
-      // Not sure whether our last statement succeeded.  Don't risk running it
-      // again.
-      throw;
-    }
-    catch (broken_connection const &)
-    {
-      // Connection failed.  May be worth retrying, if the transactor opens its
-      // own connection.
-      if (attempts <= 1)
-        throw;
-      continue;
-    }
-    catch (transaction_rollback const &)
-    {
-      // Some error that may well be transient, such as serialization failure
-      // or deadlock.  Worth retrying.
-      if (attempts <= 1)
-        throw;
-      continue;
-    }
-  }
-  throw pqxx::internal_error{"No outcome reached on perform()."};
-}
-} // namespace pqxx
-//@}
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/types b/ext/libpqxx-7.7.3/include/pqxx/types
deleted file mode 100644
index 23a5caae1..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/types
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Basic typedefs and forward declarations.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/types.hxx b/ext/libpqxx-7.7.3/include/pqxx/types.hxx
deleted file mode 100644
index f95b598f8..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/types.hxx
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Basic type aliases and forward declarations.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TYPES
-#define PQXX_H_TYPES
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstddef>
-#include <cstdint>
-#include <iterator>
-
-#if defined(PQXX_HAVE_CONCEPTS) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-
-namespace pqxx
-{
-/// Number of rows in a result set.
-using result_size_type = int;
-
-/// Difference between result sizes.
-using result_difference_type = int;
-
-/// Number of fields in a row of database data.
-using row_size_type = int;
-
-/// Difference between row sizes.
-using row_difference_type = int;
-
-/// Number of bytes in a field of database data.
-using field_size_type = std::size_t;
-
-/// Number of bytes in a large object.
-using large_object_size_type = int64_t;
-
-
-// Forward declarations, to help break compilation dependencies.
-// These won't necessarily include all classes in libpqxx.
-class binarystring;
-class connection;
-class const_result_iterator;
-class const_reverse_result_iterator;
-class const_reverse_row_iterator;
-class const_row_iterator;
-class dbtransaction;
-class field;
-class largeobjectaccess;
-class notification_receiver;
-struct range_error;
-class result;
-class row;
-class stream_from;
-class transaction_base;
-
-/// Marker for @ref stream_from constructors: "stream from table."
-/** @deprecated Use @ref stream_from::table() instead.
- */
-struct from_table_t
-{};
-
-/// Marker for @ref stream_from constructors: "stream from query."
-/** @deprecated Use @ref stream_from::query() instead.
- */
-struct from_query_t
-{};
-
-
-/// Format code: is data text or binary?
-/** Binary-compatible with libpq's format codes.
- */
-enum class format : int
-{
-  text = 0,
-  binary = 1,
-};
-
-
-/// Remove any constness, volatile, and reference-ness from a type.
-/** @deprecated In C++20 we'll replace this with std::remove_cvref.
- */
-template<typename TYPE>
-using strip_t = std::remove_cv_t<std::remove_reference_t<TYPE>>;
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// The type of a container's elements.
-/** At the time of writing there's a similar thing in `std::experimental`,
- * which we may or may not end up using for this.
- */
-template<std::ranges::range CONTAINER>
-using value_type = strip_t<decltype(*std::begin(std::declval<CONTAINER>()))>;
-#else  // PQXX_HAVE_CONCEPTS
-/// The type of a container's elements.
-/** At the time of writing there's a similar thing in `std::experimental`,
- * which we may or may not end up using for this.
- */
-template<typename CONTAINER>
-using value_type = strip_t<decltype(*std::begin(std::declval<CONTAINER>()))>;
-#endif // PQXX_HAVE_CONCEPTS
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: Any type that we can read as a string of `char`.
-template<typename STRING>
-concept char_string = std::ranges::contiguous_range<STRING> and
-                      std::same_as < strip_t<value_type<STRING>>,
-char > ;
-
-/// Concept: Anything we can iterate to get things we can read as strings.
-template<typename RANGE>
-concept char_strings =
-  std::ranges::range<RANGE> and char_string<strip_t<value_type<RANGE>>>;
-
-/// Concept: Anything we might want to treat as binary data.
-template<typename DATA>
-concept potential_binary = std::ranges::contiguous_range<DATA> and
-  (sizeof(value_type<DATA>) == 1);
-#endif // PQXX_HAVE_CONCEPTS
-
-
-// C++20: Retire these compatibility definitions.
-#if defined(PQXX_HAVE_CONCEPTS)
-
-/// Template argument type for a range.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_RANGE_ARG std::ranges::range
-
-/// Template argument type for @ref char_string.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRING_ARG pqxx::char_string
-
-/// Template argument type for @ref char_strings
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRINGS_ARG pqxx::char_strings
-
-#else // PQXX_HAVE_CONCEPTS
-
-/// Template argument type for a range.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_RANGE_ARG typename
-
-/// Template argument type for @ref char_string.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRING_ARG typename
-
-/// Template argument type for @ref char_strings
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRINGS_ARG typename
-
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/util b/ext/libpqxx-7.7.3/include/pqxx/util
deleted file mode 100644
index 6d85ab611..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/util
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Various utility definitions for libpqxx.
- */
-// Actual definitions in .hxx file so editors and such recognize file type
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/util.hxx b/ext/libpqxx-7.7.3/include/pqxx/util.hxx
deleted file mode 100644
index 4aa5ecf57..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/util.hxx
+++ /dev/null
@@ -1,521 +0,0 @@
-/* Various utility definitions for libpqxx.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/util instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_UTIL
-#define PQXX_H_UTIL
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cctype>
-#include <cstdio>
-#include <functional>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#include <typeinfo>
-#include <utility>
-#include <vector>
-
-#if __has_include(<version>)
-#  include <version>
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/internal/encodings.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/version.hxx"
-
-
-/// The home of all libpqxx classes, functions, templates, etc.
-namespace pqxx
-{}
-
-#include <pqxx/internal/libpq-forward.hxx>
-
-
-/// Internal items for libpqxx' own use.  Do not use these yourself.
-namespace pqxx::internal
-{
-
-// C++20: Retire wrapper.
-/// Same as `std::cmp_less`, or a workaround where that's not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_less(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_less(lhs, rhs);
-#else
-  // We need a variable just because lgtm.com gives off a false positive
-  // warning when we compare the values directly.  It considers that a
-  // "self-comparison."
-  constexpr bool left_signed{std::is_signed_v<LEFT>};
-  if constexpr (left_signed == std::is_signed_v<RIGHT>)
-    return lhs < rhs;
-  else if constexpr (std::is_signed_v<LEFT>)
-    return (lhs <= 0) ? true : (std::make_unsigned_t<LEFT>(lhs) < rhs);
-  else
-    return (rhs <= 0) ? false : (lhs < std::make_unsigned_t<RIGHT>(rhs));
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_greater, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_greater(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_greater(lhs, rhs);
-#else
-  return cmp_less(rhs, lhs);
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_less_equal, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_less_equal(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_less_equal(lhs, rhs);
-#else
-  return not cmp_less(rhs, lhs);
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_greater_equal, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_greater_equal(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_greater_equal(lhs, rhs);
-#else
-  return not cmp_less(lhs, rhs);
-#endif
-}
-
-
-/// Efficiently concatenate two strings.
-/** This is a special case of concatenate(), needed because dependency
- * management does not let us use that function here.
- */
-[[nodiscard]] inline std::string cat2(std::string_view x, std::string_view y)
-{
-  std::string buf;
-  auto const xs{std::size(x)}, ys{std::size(y)};
-  buf.resize(xs + ys);
-  x.copy(std::data(buf), xs);
-  y.copy(std::data(buf) + xs, ys);
-  return buf;
-}
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-using namespace std::literals;
-
-/// Suppress compiler warning about an unused item.
-template<typename... T> inline constexpr void ignore_unused(T &&...) noexcept
-{}
-
-
-/// Cast a numeric value to another type, or throw if it underflows/overflows.
-/** Both types must be arithmetic types, and they must either be both integral
- * or both floating-point types.
- */
-template<typename TO, typename FROM>
-inline TO check_cast(FROM value, std::string_view description)
-{
-  static_assert(std::is_arithmetic_v<FROM>);
-  static_assert(std::is_arithmetic_v<TO>);
-  static_assert(std::is_integral_v<FROM> == std::is_integral_v<TO>);
-
-  // The rest of this code won't quite work for bool, but bool is trivially
-  // convertible to other arithmetic types as far as I can see.
-  if constexpr (std::is_same_v<FROM, bool>)
-    return static_cast<TO>(value);
-
-  // Depending on our "if constexpr" conditions, this parameter may not be
-  // needed.  Some compilers will warn.
-  ignore_unused(description);
-
-  using from_limits = std::numeric_limits<decltype(value)>;
-  using to_limits = std::numeric_limits<TO>;
-  if constexpr (std::is_signed_v<FROM>)
-  {
-    if constexpr (std::is_signed_v<TO>)
-    {
-      if (value < to_limits::lowest())
-        throw range_error{internal::cat2("Cast underflow: "sv, description)};
-    }
-    else
-    {
-      // FROM is signed, but TO is not.  Treat this as a special case, because
-      // there may not be a good broader type in which the compiler can even
-      // perform our check.
-      if (value < 0)
-        throw range_error{internal::cat2(
-          "Casting negative value to unsigned type: "sv, description)};
-    }
-  }
-  else
-  {
-    // No need to check: the value is unsigned so can't fall below the range
-    // of the TO type.
-  }
-
-  if constexpr (std::is_integral_v<FROM>)
-  {
-    using unsigned_from = std::make_unsigned_t<FROM>;
-    using unsigned_to = std::make_unsigned_t<TO>;
-    constexpr auto from_max{static_cast<unsigned_from>((from_limits::max)())};
-    constexpr auto to_max{static_cast<unsigned_to>((to_limits::max)())};
-    if constexpr (from_max > to_max)
-    {
-      if (internal::cmp_greater(value, to_max))
-        throw range_error{internal::cat2("Cast overflow: "sv, description)};
-    }
-  }
-  else if constexpr ((from_limits::max)() > (to_limits::max)())
-  {
-    if (value > (to_limits::max)())
-      throw range_error{internal::cat2("Cast overflow: ", description)};
-  }
-
-  return static_cast<TO>(value);
-}
-
-
-/** Check library version at link time.
- *
- * Ensures a failure when linking an application against a radically
- * different libpqxx version than the one against which it was compiled.
- *
- * Sometimes application builds fail in unclear ways because they compile
- * using headers from libpqxx version X, but then link against libpqxx
- * binary version Y.  A typical scenario would be one where you're building
- * against a libpqxx which you have built yourself, but a different version
- * is installed on the system.
- *
- * The check_library_version template is declared for any library version,
- * but only actually defined for the version of the libpqxx binary against
- * which the code is linked.
- *
- * If the library binary is a different version than the one declared in
- * these headers, then this call will fail to link: there will be no
- * definition for the function with these exact template parameter values.
- * There will be a definition, but the version in the parameter values will
- * be different.
- */
-inline PQXX_PRIVATE void check_version() noexcept
-{
-  // There is no particular reason to do this here in @ref connection, except
-  // to ensure that every meaningful libpqxx client will execute it.  The call
-  // must be in the execution path somewhere or the compiler won't try to link
-  // it.  We can't use it to initialise a global or class-static variable,
-  // because a smart compiler might resolve it at compile time.
-  //
-  // On the other hand, we don't want to make a useless function call too
-  // often for performance reasons.  A local static variable is initialised
-  // only on the definition's first execution.  Compilers will be well
-  // optimised for this behaviour, so there's a minimal one-time cost.
-  static auto const version_ok{internal::PQXX_VERSION_CHECK()};
-  ignore_unused(version_ok);
-}
-
-
-/// Descriptor of library's thread-safety model.
-/** This describes what the library knows about various risks to thread-safety.
- */
-struct PQXX_LIBEXPORT thread_safety_model
-{
-  /// Is the underlying libpq build thread-safe?
-  bool safe_libpq = false;
-
-  /// Is Kerberos thread-safe?
-  /** @warning Is currently always `false`.
-   *
-   * If your application uses Kerberos, all accesses to libpqxx or Kerberos
-   * must be serialized.  Confine their use to a single thread, or protect it
-   * with a global lock.
-   */
-  bool safe_kerberos = false;
-
-  /// A human-readable description of any thread-safety issues.
-  std::string description;
-};
-
-
-/// Describe thread safety available in this build.
-[[nodiscard]] PQXX_LIBEXPORT thread_safety_model describe_thread_safety();
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-#  define PQXX_POTENTIAL_BINARY_ARG pqxx::potential_binary
-#else
-#  define PQXX_POTENTIAL_BINARY_ARG typename
-#endif
-
-
-/// Cast binary data to a type that libpqxx will recognise as binary.
-/** There are many different formats for storing binary data in memory.  You
- * may have yours as a `std::string`, or a `std::vector<uchar_t>`, or one of
- * many other types.
- *
- * But for libpqxx to recognise your data as binary, it needs to be a
- * `std::basic_string<std::byte>`, or a `std::basic_string_view<std::byte>`;
- * or in C++20 or better, any contiguous block of `std::byte`.
- *
- * Use `binary_cast` as a convenience helper to cast your data as a
- * `std::basic_string_view<std::byte>`.
- *
- * @warning There are two things you should be aware of!  First, the data must
- * be contiguous in memory.  In C++20 the compiler will enforce this, but in
- * C++17 it's your own problem.  Second, you must keep the object where you
- * store the actual data alive for as long as you might use this function's
- * return value.
- */
-template<PQXX_POTENTIAL_BINARY_ARG TYPE>
-std::basic_string_view<std::byte> binary_cast(TYPE const &data)
-{
-  static_assert(sizeof(value_type<TYPE>) == 1);
-  return {
-    reinterpret_cast<std::byte const *>(
-      const_cast<strip_t<decltype(*std::data(data))> const *>(
-        std::data(data))),
-    std::size(data)};
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<typename CHAR>
-concept char_sized = (sizeof(CHAR) == 1);
-#  define PQXX_CHAR_SIZED_ARG char_sized
-#else
-#  define PQXX_CHAR_SIZED_ARG typename
-#endif
-
-/// Construct a type that libpqxx will recognise as binary.
-/** Takes a data pointer and a size, without being too strict about their
- * types, and constructs a `std::basic_string_view<std::byte>` pointing to
- * the same data.
- *
- * This makes it a little easier to turn binary data, in whatever form you
- * happen to have it, into binary data as libpqxx understands it.
- */
-template<PQXX_CHAR_SIZED_ARG CHAR, typename SIZE>
-std::basic_string_view<std::byte> binary_cast(CHAR const *data, SIZE size)
-{
-  static_assert(sizeof(CHAR) == 1);
-  return {
-    reinterpret_cast<std::byte const *>(data),
-    check_cast<std::size_t>(size, "binary data size")};
-}
-
-
-/// The "null" oid.
-constexpr oid oid_none{0};
-} // namespace pqxx
-
-
-/// Private namespace for libpqxx's internal use; do not access.
-/** This namespace hides definitions internal to libpqxx.  These are not
- * supposed to be used by client programs, and they may change at any time
- * without notice.
- *
- * Conversely, if you find something in this namespace tremendously useful, by
- * all means do lodge a request for its publication.
- *
- * @warning Here be dragons!
- */
-namespace pqxx::internal
-{
-using namespace std::literals;
-
-
-/// A safer and more generic replacement for `std::isdigit`.
-/** Turns out `std::isdigit` isn't as easy to use as it sounds.  It takes an
- * `int`, but requires it to be nonnegative.  Which means it's an outright
- * liability on systems where `char` is signed.
- */
-template<typename CHAR> inline constexpr bool is_digit(CHAR c) noexcept
-{
-  return (c >= '0') and (c <= '9');
-}
-
-
-/// Describe an object for humans, based on class name and optional name.
-/** Interprets an empty name as "no name given."
- */
-[[nodiscard]] std::string
-describe_object(std::string_view class_name, std::string_view name);
-
-
-/// Check validity of registering a new "guest" in a "host."
-/** The host might be e.g. a connection, and the guest a transaction.  The
- * host can only have one guest at a time, so it is an error to register a new
- * guest while the host already has a guest.
- *
- * If the new registration is an error, this function throws a descriptive
- * exception.
- *
- * Pass the old guest (if any) and the new guest (if any), for both, a type
- * name (at least if the guest is not null), and optionally an object name
- * (but which may be omitted if the caller did not assign one).
- */
-void check_unique_register(
-  void const *old_guest, std::string_view old_class, std::string_view old_name,
-  void const *new_guest, std::string_view new_class,
-  std::string_view new_name);
-
-
-/// Like @ref check_unique_register, but for un-registering a guest.
-/** Pass the guest which was registered, as well as the guest which is being
- * unregistered, so that the function can check that they are the same one.
- */
-void check_unique_unregister(
-  void const *old_guest, std::string_view old_class, std::string_view old_name,
-  void const *new_guest, std::string_view new_class,
-  std::string_view new_name);
-
-
-/// Compute buffer size needed to escape binary data for use as a BYTEA.
-/** This uses the hex-escaping format.  The return value includes room for the
- * "\x" prefix.
- */
-inline constexpr std::size_t size_esc_bin(std::size_t binary_bytes) noexcept
-{
-  return 2 + (2 * binary_bytes) + 1;
-}
-
-
-/// Compute binary size from the size of its escaped version.
-/** Do not include a terminating zero in `escaped_bytes`.
- */
-inline constexpr std::size_t size_unesc_bin(std::size_t escaped_bytes) noexcept
-{
-  return (escaped_bytes - 2) / 2;
-}
-
-
-// TODO: Use actual binary type for "data".
-/// Hex-escape binary data into a buffer.
-/** The buffer must be able to accommodate
- * `size_esc_bin(std::size(binary_data))` bytes, and the function will write
- * exactly that number of bytes into the buffer.  This includes a trailing
- * zero.
- */
-void PQXX_LIBEXPORT
-esc_bin(std::basic_string_view<std::byte> binary_data, char buffer[]) noexcept;
-
-
-/// Hex-escape binary data into a std::string.
-std::string PQXX_LIBEXPORT
-esc_bin(std::basic_string_view<std::byte> binary_data);
-
-
-/// Reconstitute binary data from its escaped version.
-void PQXX_LIBEXPORT
-unesc_bin(std::string_view escaped_data, std::byte buffer[]);
-
-
-/// Reconstitute binary data from its escaped version.
-std::basic_string<std::byte>
-  PQXX_LIBEXPORT unesc_bin(std::string_view escaped_data);
-
-
-/// Transitional: std::ssize(), or custom implementation if not available.
-template<typename T> auto ssize(T const &c)
-{
-#if defined(__cpp_lib_ssize) && __cplusplus >= __cpp_lib_ssize
-  return std::ssize(c);
-#else
-  using signed_t = std::make_signed_t<decltype(std::size(c))>;
-  return static_cast<signed_t>(std::size(c));
-#endif // __cpp_lib_ssize
-}
-
-
-/// Helper for determining a function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename RETURN, typename... ARGS>
-std::tuple<ARGS...> args_f(RETURN (&func)(ARGS...));
-
-
-/// Helper for determining a `std::function`'s parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename RETURN, typename... ARGS>
-std::tuple<ARGS...> args_f(std::function<RETURN(ARGS...)> const &);
-
-
-/// Helper for determining a member function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CLASS, typename RETURN, typename... ARGS>
-std::tuple<ARGS...> member_args_f(RETURN (CLASS::*)(ARGS...));
-
-
-/// Helper for determining a const member function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CLASS, typename RETURN, typename... ARGS>
-std::tuple<ARGS...> member_args_f(RETURN (CLASS::*)(ARGS...) const);
-
-
-/// Helper for determining a callable type's parameter types.
-/** This specialisation should work for lambdas.
- *
- * This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CALLABLE>
-auto args_f(CALLABLE const &f)
-  -> decltype(member_args_f(&CALLABLE::operator()));
-
-
-/// A callable's parameter types, as a tuple.
-template<typename CALLABLE>
-using args_t = decltype(args_f(std::declval<CALLABLE>()));
-
-
-/// Helper: Apply `strip_t` to each of a tuple type's component types.
-/** This function has no definition.  It is not meant to be called, only to be
- * used to deduce the right types.
- */
-template<typename... TYPES>
-std::tuple<strip_t<TYPES>...> strip_types(std::tuple<TYPES...> const &);
-
-
-/// Take a tuple type and apply @ref strip_t to its component types.
-template<typename... TYPES>
-using strip_types_t = decltype(strip_types(std::declval<TYPES...>()));
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/version b/ext/libpqxx-7.7.3/include/pqxx/version
deleted file mode 100644
index 8dd5e48d4..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/version
+++ /dev/null
@@ -1,7 +0,0 @@
-/** libpqxx version info.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/version.hxx"
-#include "pqxx/internal/header-post.hxx"
-
diff --git a/ext/libpqxx-7.7.3/include/pqxx/version.hxx b/ext/libpqxx-7.7.3/include/pqxx/version.hxx
deleted file mode 100644
index a159f1bed..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/version.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Version info for libpqxx.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/version instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_VERSION
-
-#  if !defined(PQXX_HEADER_PRE)
-#    error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#  endif
-
-/// Full libpqxx version string.
-#  define PQXX_VERSION "7.7.3"
-/// Library ABI version.
-#  define PQXX_ABI "7.7"
-
-/// Major version number.
-#  define PQXX_VERSION_MAJOR 7
-/// Minor version number.
-#  define PQXX_VERSION_MINOR 7
-
-#  define PQXX_VERSION_CHECK check_pqxx_version_7_7
-
-namespace pqxx::internal
-{
-/// Library version check stub.
-/** Helps detect version mismatches between libpqxx headers and the libpqxx
- * library binary.
- *
- * Sometimes users run into trouble linking their code against libpqxx because
- * they build their own libpqxx, but the system also has a different version
- * installed.  The declarations in the headers against which they compile their
- * code will differ from the ones used to build the libpqxx version they're
- * using, leading to confusing link errors.  The solution is to generate a link
- * error when the libpqxx binary is not the same version as the libpqxx headers
- * used to compile the code.
- *
- * This function's definition is in the libpqxx binary, so it's based on the
- * version as found in the binary.  The headers contain a call to the function,
- * whose name contains the libpqxx version as found in the headers.  (The
- * library build process will use its own local headers even if another version
- * of the headers is installed on the system.)
- *
- * If the libpqxx binary was compiled for a different version than the user's
- * code, linking will fail with an error: `check_pqxx_version_*_*` will not
- * exist for the given version number.
- */
-PQXX_LIBEXPORT int PQXX_VERSION_CHECK() noexcept;
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/version.hxx.template b/ext/libpqxx-7.7.3/include/pqxx/version.hxx.template
deleted file mode 100644
index 40837f16a..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/version.hxx.template
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Version info for libpqxx.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/version instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_VERSION
-
-#if !defined(PQXX_HEADER_PRE)
-#error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-/// Full libpqxx version string.
-#  define PQXX_VERSION "@PQXXVERSION@"
-/// Library ABI version.
-#  define PQXX_ABI "@PQXX_ABI@"
-
-/// Major version number.
-#  define PQXX_VERSION_MAJOR @PQXX_MAJOR@
-/// Minor version number.
-#  define PQXX_VERSION_MINOR @PQXX_MINOR@
-
-#  define PQXX_VERSION_CHECK check_pqxx_version_@PQXX_MAJOR@_@PQXX_MINOR@
-
-namespace pqxx::internal
-{
-/// Library version check stub.
-/** Helps detect version mismatches between libpqxx headers and the libpqxx
- * library binary.
- *
- * Sometimes users run into trouble linking their code against libpqxx because
- * they build their own libpqxx, but the system also has a different version
- * installed.  The declarations in the headers against which they compile their
- * code will differ from the ones used to build the libpqxx version they're
- * using, leading to confusing link errors.  The solution is to generate a link
- * error when the libpqxx binary is not the same version as the libpqxx headers
- * used to compile the code.
- *
- * This function's definition is in the libpqxx binary, so it's based on the
- * version as found in the binary.  The headers contain a call to the function,
- * whose name contains the libpqxx version as found in the headers.  (The
- * library build process will use its own local headers even if another version
- * of the headers is installed on the system.)
- *
- * If the libpqxx binary was compiled for a different version than the user's
- * code, linking will fail with an error: `check_pqxx_version_*_*` will not
- * exist for the given version number.
- */
-PQXX_LIBEXPORT int PQXX_VERSION_CHECK() noexcept;
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/include/pqxx/zview b/ext/libpqxx-7.7.3/include/pqxx/zview
deleted file mode 100644
index 66ea2a625..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/zview
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Zero-terminated string view class.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/zview.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/include/pqxx/zview.hxx b/ext/libpqxx-7.7.3/include/pqxx/zview.hxx
deleted file mode 100644
index 36a779f51..000000000
--- a/ext/libpqxx-7.7.3/include/pqxx/zview.hxx
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Zero-terminated string view.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/zview instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ZVIEW
-#define PQXX_H_ZVIEW
-
-#include <string>
-#include <string_view>
-#include <type_traits>
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx
-{
-/// Marker-type wrapper: zero-terminated `std::string_view`.
-/** @warning Use this only if the underlying string is zero-terminated.
- *
- * When you construct a zview, you are promising that if the data pointer is
- * non-null, the underlying string is zero-terminated.  It otherwise behaves
- * exactly like a std::string_view.
- *
- * The terminating zero is not "in" the string, so it does not count as part of
- * the view's length.
- *
- * The added guarantee lets the view be used as a C-style string, which often
- * matters since libpqxx builds on top of a C library.  For this reason, zview
- * also adds a @ref c_str method.
- */
-class zview : public std::string_view
-{
-public:
-  constexpr zview() noexcept = default;
-
-  /// Convenience overload: construct using pointer and signed length.
-  constexpr zview(char const text[], std::ptrdiff_t len) :
-          std::string_view{text, static_cast<std::size_t>(len)}
-  {}
-
-  /// Convenience overload: construct using pointer and signed length.
-  constexpr zview(char text[], std::ptrdiff_t len) :
-          std::string_view{text, static_cast<std::size_t>(len)}
-  {}
-
-  /// Explicitly promote a `string_view` to a `zview`.
-  explicit constexpr zview(std::string_view other) noexcept :
-          std::string_view{other}
-  {}
-
-  /// Construct from any initialiser you might use for `std::string_view`.
-  /** @warning Only do this if you are sure that the string is zero-terminated.
-   */
-  template<typename... Args>
-  explicit constexpr zview(Args &&...args) :
-          std::string_view(std::forward<Args>(args)...)
-  {}
-
-  // C++20: constexpr.
-  /// @warning There's an implicit conversion from `std::string`.
-  zview(std::string const &str) noexcept :
-          std::string_view{str.c_str(), str.size()}
-  {}
-
-  /// Construct a `zview` from a C-style string.
-  /** @warning This scans the string to discover its length.  So if you need to
-   * do it many times, it's probably better to create the `zview` once and
-   * re-use it.
-   */
-  constexpr zview(char const str[]) : std::string_view{str} {}
-
-  /// Construct a `zview` from a string literal.
-  /** A C++ string literal ("foo") normally looks a lot like a pointer to
-   * char const, but that's not really true.  It's actually an array of char,
-   * which _devolves_ to a pointer when you pass it.
-   *
-   * For the purpose of creating a `zview` there is one big difference: if we
-   * know the array's size, we don't need to scan through the string in order
-   * to find out its length.
-   */
-  template<size_t size>
-  constexpr zview(char const (&literal)[size]) : zview(literal, size - 1)
-  {}
-
-  /// Either a null pointer, or a zero-terminated text buffer.
-  [[nodiscard]] constexpr char const *c_str() const &noexcept
-  {
-    return data();
-  }
-};
-
-
-/// Support @ref zview literals.
-/** You can "import" this selectively into your namespace, without pulling in
- * all of the @ref pqxx namespace:
- *
- * ```cxx
- * using pqxx::operator"" _zv;
- * ```
- */
-constexpr zview operator"" _zv(char const str[], std::size_t len) noexcept
-{
-  return zview{str, len};
-}
-} // namespace pqxx
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// A zview is a view.
-template<> inline constexpr bool std::ranges::enable_view<pqxx::zview>{true};
-
-
-/// A zview is a borrowed range.
-template<>
-inline constexpr bool std::ranges::enable_borrowed_range<pqxx::zview>{true};
-
-namespace pqxx::internal
-{
-/// Concept: T is a known zero-terminated string type.
-/** There's no unified API for these string types.  It's just a check for some
- * known types.  Any code that makes use of the concept will still have to
- * support each of these individually.
- */
-template<typename T>
-concept ZString = std::is_convertible_v < strip_t<T>,
-char const * > or std::is_convertible_v<strip_t<T>, zview> or
-  std::is_convertible_v<T, std::string const &>;
-} // namespace pqxx::internal
-#endif // PQXX_HAVE_CONCEPTS
-
-
-namespace pqxx::internal
-{
-/// Get a raw C string pointer.
-inline constexpr char const *as_c_string(char const str[]) noexcept
-{
-  return str;
-}
-/// Get a raw C string pointer.
-template<std::size_t N>
-inline constexpr char const *as_c_string(char (&str)[N]) noexcept
-{
-  return str;
-}
-/// Get a raw C string pointer.
-inline constexpr char const *as_c_string(pqxx::zview str) noexcept
-{
-  return str.c_str();
-}
-// C++20: Make this constexpr.
-/// Get a raw C string pointer.
-inline char const *as_c_string(std::string const &str) noexcept
-{
-  return str.c_str();
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/array b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/array
deleted file mode 100644
index 689f5b27b..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/array
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Handling of SQL arrays.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/array.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/array.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/array.hxx
deleted file mode 100644
index 8440a244f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/array.hxx
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Handling of SQL arrays.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/field instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ARRAY
-#define PQXX_H_ARRAY
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <stdexcept>
-#include <string>
-#include <utility>
-
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/internal/encodings.hxx"
-
-
-namespace pqxx
-{
-/// Low-level array parser.
-/** Use this to read an array field retrieved from the database.
- *
- * This parser will only work reliably if your client encoding is UTF-8, ASCII,
- * or a single-byte encoding which is a superset of ASCII (such as Latin-1).
- *
- * Also, the parser only supports array element types which use either a comma
- * or a semicolon ("," or ";") as the separator between array elements.  All
- * built-in types use comma, except for one which uses semicolon, but some
- * custom types may not work.
- *
- * The input is a C-style string containing the textual representation of an
- * array, as returned by the database.  The parser reads this representation
- * on the fly.  The string must remain in memory until parsing is done.
- *
- * Parse the array by making calls to @ref get_next until it returns a
- * @ref juncture of "done".  The @ref juncture tells you what the parser found
- * in that step: did the array "nest" to a deeper level, or "un-nest" back up?
- */
-class PQXX_LIBEXPORT array_parser
-{
-public:
-  /// What's the latest thing found in the array?
-  enum class juncture
-  {
-    /// Starting a new row.
-    row_start,
-    /// Ending the current row.
-    row_end,
-    /// Found a NULL value.
-    null_value,
-    /// Found a string value.
-    string_value,
-    /// Parsing has completed.
-    done,
-  };
-
-  // TODO: constexpr noexcept.  Breaks ABI.
-  /// Constructor.  You don't need this; use @ref field::as_array instead.
-  /** The parser only remains valid while the data underlying the @ref result
-   * remains valid.  Once all `result` objects referring to that data have been
-   * destroyed, the parser will no longer refer to valid memory.
-   */
-  explicit array_parser(
-    std::string_view input,
-    internal::encoding_group = internal::encoding_group::MONOBYTE);
-
-  /// Parse the next step in the array.
-  /** Returns what it found.  If the juncture is @ref juncture::string_value,
-   * the string will contain the value.  Otherwise, it will be empty.
-   *
-   * Call this until the @ref array_parser::juncture it returns is
-   * @ref juncture::done.
-   */
-  std::pair<juncture, std::string> get_next();
-
-private:
-  std::string_view m_input;
-  internal::glyph_scanner_func *const m_scan;
-
-  /// Current parsing position in the input.
-  std::string::size_type m_pos = 0u;
-
-  std::string::size_type scan_single_quoted_string() const;
-  std::string parse_single_quoted_string(std::string::size_type end) const;
-  std::string::size_type scan_double_quoted_string() const;
-  std::string parse_double_quoted_string(std::string::size_type end) const;
-  std::string::size_type scan_unquoted_string() const;
-  std::string parse_unquoted_string(std::string::size_type end) const;
-
-  std::string::size_type scan_glyph(std::string::size_type pos) const;
-  std::string::size_type
-  scan_glyph(std::string::size_type pos, std::string::size_type end) const;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/binarystring b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/binarystring
deleted file mode 100644
index 77551d9f7..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/binarystring
+++ /dev/null
@@ -1,6 +0,0 @@
-/** BYTEA (binary string) conversions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/binarystring.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/binarystring.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/binarystring.hxx
deleted file mode 100644
index 47c82a035..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/binarystring.hxx
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Deprecated representation for raw, binary data.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/binarystring instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_BINARYSTRING
-#define PQXX_H_BINARYSTRING
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <memory>
-#include <string>
-#include <string_view>
-
-#include "pqxx/result.hxx"
-#include "pqxx/strconv.hxx"
-
-namespace pqxx
-{
-class binarystring;
-template<> struct string_traits<binarystring>;
-
-
-/// Binary data corresponding to PostgreSQL's "BYTEA" binary-string type.
-/** @ingroup escaping-functions
- * @deprecated Use @c std::basic_string<std::byte> and
- * @c std::basic_string_view<std::byte> for binary data.  In C++20 or better,
- * any @c contiguous_range of @c std::byte will do.
- *
- * This class represents a binary string as stored in a field of type @c bytea.
- *
- * Internally a binarystring is zero-terminated, but it may also contain null
- * bytes, they're just like any other byte value.  So don't assume that it's
- * safe to treat the contents as a C-style string.
- *
- * The binarystring retains its value even if the result it was obtained from
- * is destroyed, but it cannot be copied or assigned.
- *
- * \relatesalso transaction_base::quote_raw
- *
- * To include a @c binarystring value in an SQL query, escape and quote it
- * using the transaction's @c quote_raw function.
- *
- * @warning This class is implemented as a reference-counting smart pointer.
- * Copying, swapping, and destroying binarystring objects that refer to the
- * same underlying data block is <em>not thread-safe</em>.  If you wish to pass
- * binarystrings around between threads, make sure that each of these
- * operations is protected against concurrency with similar operations on the
- * same object, or other objects pointing to the same data block.
- */
-class PQXX_LIBEXPORT binarystring
-{
-public:
-  using char_type = unsigned char;
-  using value_type = std::char_traits<char_type>::char_type;
-  using size_type = std::size_t;
-  using difference_type = long;
-  using const_reference = value_type const &;
-  using const_pointer = value_type const *;
-  using const_iterator = const_pointer;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    binarystring const &) = default;
-
-  /// Read and unescape bytea field.
-  /** The field will be zero-terminated, even if the original bytea field
-   * isn't.
-   * @param F the field to read; must be a bytea field
-   */
-  [[deprecated("Use std::byte for binary data.")]] explicit binarystring(
-    field const &);
-
-  /// Copy binary data from std::string_view on binary data.
-  /** This is inefficient in that it copies the data to a buffer allocated on
-   * the heap.
-   */
-  [[deprecated("Use std::byte for binary data.")]] explicit binarystring(
-    std::string_view);
-
-  /// Copy binary data of given length straight out of memory.
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    void const *, std::size_t);
-
-  /// Efficiently wrap a buffer of binary data in a @c binarystring.
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    std::shared_ptr<value_type> ptr, size_type size) :
-          m_buf{std::move(ptr)}, m_size{size}
-  {}
-
-  /// Size of converted string in bytes.
-  [[nodiscard]] size_type size() const noexcept { return m_size; }
-  /// Size of converted string in bytes.
-  [[nodiscard]] size_type length() const noexcept { return size(); }
-  [[nodiscard]] bool empty() const noexcept { return size() == 0; }
-
-  [[nodiscard]] const_iterator begin() const noexcept { return data(); }
-  [[nodiscard]] const_iterator cbegin() const noexcept { return begin(); }
-  [[nodiscard]] const_iterator end() const noexcept { return data() + m_size; }
-  [[nodiscard]] const_iterator cend() const noexcept { return end(); }
-
-  [[nodiscard]] const_reference front() const noexcept { return *begin(); }
-  [[nodiscard]] const_reference back() const noexcept
-  {
-    return *(data() + m_size - 1);
-  }
-
-  [[nodiscard]] const_reverse_iterator rbegin() const
-  {
-    return const_reverse_iterator{end()};
-  }
-  [[nodiscard]] const_reverse_iterator crbegin() const { return rbegin(); }
-  [[nodiscard]] const_reverse_iterator rend() const
-  {
-    return const_reverse_iterator{begin()};
-  }
-  [[nodiscard]] const_reverse_iterator crend() const { return rend(); }
-
-  /// Unescaped field contents.
-  [[nodiscard]] value_type const *data() const noexcept { return m_buf.get(); }
-
-  [[nodiscard]] const_reference operator[](size_type i) const noexcept
-  {
-    return data()[i];
-  }
-
-  [[nodiscard]] PQXX_PURE bool operator==(binarystring const &) const noexcept;
-  [[nodiscard]] bool operator!=(binarystring const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-
-  binarystring &operator=(binarystring const &);
-
-  /// Index contained string, checking for valid index.
-  const_reference at(size_type) const;
-
-  /// Swap contents with other binarystring.
-  void swap(binarystring &);
-
-  /// Raw character buffer (no terminating zero is added).
-  /** @warning No terminating zero is added!  If the binary data did not end in
-   * a null character, you will not find one here.
-   */
-  [[nodiscard]] char const *get() const noexcept
-  {
-    return reinterpret_cast<char const *>(m_buf.get());
-  }
-
-  /// Read contents as a std::string_view.
-  [[nodiscard]] std::string_view view() const noexcept
-  {
-    return std::string_view(get(), size());
-  }
-
-  /// Read as regular C++ string (may include null characters).
-  /** This creates and returns a new string object.  Don't call this
-   * repeatedly; retrieve your string once and keep it in a local variable.
-   * Also, do not expect to be able to compare the string's address to that of
-   * an earlier invocation.
-   */
-  [[nodiscard]] std::string str() const;
-
-  /// Access data as a pointer to @c std::byte.
-  [[nodiscard]] std::byte const *bytes() const
-  {
-    return reinterpret_cast<std::byte const *>(get());
-  }
-
-  /// Read data as a @c std::basic_string_view<std::byte>.
-  [[nodiscard]] std::basic_string_view<std::byte> bytes_view() const
-  {
-    return std::basic_string_view<std::byte>{bytes(), size()};
-  }
-
-private:
-  std::shared_ptr<value_type> m_buf;
-  size_type m_size{0};
-};
-
-
-template<> struct nullness<binarystring> : no_null<binarystring>
-{};
-
-
-/// String conversion traits for @c binarystring.
-/** Defines the conversions between a @c binarystring and its PostgreSQL
- * textual format, for communication with the database.
- *
- * These conversions rely on the "hex" format which was introduced in
- * PostgreSQL 9.0.  Both your libpq and the server must be recent enough to
- * speak this format.
- */
-template<> struct string_traits<binarystring>
-{
-  static std::size_t size_buffer(binarystring const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(char *begin, char *end, binarystring const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, binarystring const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    std::string_view text{value.view()};
-    internal::esc_bin(binary_cast(text), begin);
-    return begin + budget;
-  }
-
-  static binarystring from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::shared_ptr<unsigned char> buf{
-      new unsigned char[size], [](unsigned char const *x) { delete[] x; }};
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.get()));
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return binarystring{std::move(buf), size};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/blob b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/blob
deleted file mode 100644
index 3fd0afac9..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/blob
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Binary Large Objects interface.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/blob.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/blob.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/blob.hxx
deleted file mode 100644
index 6d77be724..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/blob.hxx
+++ /dev/null
@@ -1,351 +0,0 @@
-/* Binary Large Objects interface.
- *
- * Read or write large objects, stored in their own storage on the server.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/largeobject instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_BLOB
-#define PQXX_H_BLOB
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstdint>
-
-#if defined(PQXX_HAVE_PATH)
-#  include <filesystem>
-#endif
-
-#if defined(PQXX_HAVE_RANGES) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#if defined(PQXX_HAVE_SPAN) && __has_include(<span>)
-#  include <span>
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-
-namespace pqxx
-{
-/** Binary large object.
- *
- * This is how you store data that may be too large for the `BYTEA` type.
- * Access operations are similar to those for a file: you can read, write,
- * query or set the current reading/writing position, and so on.
- *
- * These large objects live in their own storage on the server, indexed by an
- * integer object identifier ("oid").
- *
- * Two `blob` objects may refer to the same actual large object in the
- * database at the same time.  Each will have its own reading/writing position,
- * but writes to the one will of course affect what the other sees.
- */
-class PQXX_LIBEXPORT blob
-{
-public:
-  /// Create a new, empty large object.
-  /** You may optionally specify an oid for the new blob.  If you do, then
-   * the new object will have that oid -- or creation will fail if there
-   * already is an object with that oid.
-   */
-  [[nodiscard]] static oid create(dbtransaction &, oid = 0);
-
-  /// Delete a large object, or fail if it does not exist.
-  static void remove(dbtransaction &, oid);
-
-  /// Open blob for reading.  Any attempt to write to it will fail.
-  [[nodiscard]] static blob open_r(dbtransaction &, oid);
-  // Open blob for writing.  Any attempt to read from it will fail.
-  [[nodiscard]] static blob open_w(dbtransaction &, oid);
-  // Open blob for reading and/or writing.
-  [[nodiscard]] static blob open_rw(dbtransaction &, oid);
-
-  /// You can default-construct a blob, but it won't do anything useful.
-  /** Most operations on a default-constructed blob will throw @ref
-   * usage_error.
-   */
-  blob() = default;
-
-  /// You can move a blob, but not copy it.  The original becomes unusable.
-  blob(blob &&);
-  /// You can move a blob, but not copy it.  The original becomes unusable.
-  blob &operator=(blob &&);
-
-  blob(blob const &) = delete;
-  blob &operator=(blob const &) = delete;
-  ~blob();
-
-  /// Maximum number of bytes that can be read or written at a time.
-  /** The underlying protocol only supports reads and writes up to 2 GB
-   * exclusive.
-   *
-   * If you need to read or write more data to or from a binary large object,
-   * you'll have to break it up into chunks.
-   */
-  static constexpr std::size_t chunk_limit = 0x7fffffff;
-
-  /// Read up to `size` bytes of the object into `buf`.
-  /** Uses a buffer that you provide, resizing it as needed.  If it suits you,
-   * this lets you allocate the buffer once and then re-use it multiple times.
-   *
-   * Resizes `buf` as needed.
-   *
-   * @warning The underlying protocol only supports reads up to 2GB at a time.
-   * If you need to read more, try making repeated calls to @ref append_to_buf.
-   */
-  std::size_t read(std::basic_string<std::byte> &buf, std::size_t size);
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** Retrieves bytes from the blob, at the current position, until `buf` is
-   * full or there are no more bytes to read, whichever comes first.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<std::size_t extent = std::dynamic_extent>
-  std::span<std::byte> read(std::span<std::byte, extent> buf)
-  {
-    return buf.subspan(0, raw_read(std::data(buf), std::size(buf)));
-  }
-#endif // PQXX_HAVE_SPAN
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** Retrieves bytes from the blob, at the current position, until `buf` is
-   * full or there are no more bytes to read, whichever comes first.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<binary DATA> std::span<std::byte> read(DATA &buf)
-  {
-    return {std::data(buf), raw_read(std::data(buf), std::size(buf))};
-  }
-#else  // PQXX_HAVE_CONCEPTS && PQXX_HAVE_SPAN
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** @deprecated As libpqxx moves to C++20 as its baseline language version,
-   * this will take and return `std::span<std::byte>`.
-   *
-   * Retrieves bytes from the blob, at the current position, until `buf` is
-   * full (i.e. its current size is reached), or there are no more bytes to
-   * read, whichever comes first.
-   *
-   * This function will not change either the size or the capacity of `buf`,
-   * only its contents.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<typename ALLOC>
-  std::basic_string_view<std::byte> read(std::vector<std::byte, ALLOC> &buf)
-  {
-    return {std::data(buf), raw_read(std::data(buf), std::size(buf))};
-  }
-#endif // PQXX_HAVE_CONCEPTS && PQXX_HAVE_SPAN
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Write `data` to large object, at the current position.
-  /** If the writing position is at the end of the object, this will append
-   * `data` to the object's contents and move the writing position so that
-   * it's still at the end.
-   *
-   * If the writing position was not at the end, writing will overwrite the
-   * prior data, but it will not remove data that follows the part where you
-   * wrote your new data.
-   *
-   * @warning This is a big difference from writing to a file.  You can
-   * overwrite some data in a large object, but this does not truncate the
-   * data that was already there.  For example, if the object contained binary
-   * data "abc", and you write "12" at the starting position, the object will
-   * contain "12c".
-   *
-   * @warning The underlying protocol only supports writes up to 2 GB at a
-   * time.  If you need to write more, try making repeated calls to
-   * @ref append_from_buf.
-   */
-  template<binary DATA> void write(DATA const &data)
-  {
-    raw_write(std::data(data), std::size(data));
-  }
-#else
-  /// Write `data` large object, at the current position.
-  /** If the writing position is at the end of the object, this will append
-   * `data` to the object's contents and move the writing position so that
-   * it's still at the end.
-   *
-   * If the writing position was not at the end, writing will overwrite the
-   * prior data, but it will not remove data that follows the part where you
-   * wrote your new data.
-   *
-   * @warning This is a big difference from writing to a file.  You can
-   * overwrite some data in a large object, but this does not truncate the
-   * data that was already there.  For example, if the object contained binary
-   * data "abc", and you write "12" at the starting position, the object will
-   * contain "12c".
-   *
-   * @warning The underlying protocol only supports writes up to 2 GB at a
-   * time.  If you need to write more, try making repeated calls to
-   * @ref append_from_buf.
-   */
-  template<typename DATA> void write(DATA const &data)
-  {
-    raw_write(std::data(data), std::size(data));
-  }
-#endif
-
-  /// Resize large object to `size` bytes.
-  /** If the blob is more than `size` bytes long, this removes the end so as
-   * to make the blob the desired length.
-   *
-   * If the blob is less than `size` bytes long, it adds enough zero bytes to
-   * make it the desired length.
-   */
-  void resize(std::int64_t size);
-
-  /// Return the current reading/writing position in the large object.
-  [[nodiscard]] std::int64_t tell() const;
-
-  /// Set the current reading/writing position to an absolute offset.
-  /** Returns the new file offset. */
-  std::int64_t seek_abs(std::int64_t offset = 0);
-  /// Move the current reading/writing position forwards by an offset.
-  /** To move backwards, pass a negative offset.
-   *
-   * Returns the new file offset.
-   */
-  std::int64_t seek_rel(std::int64_t offset = 0);
-  /// Set the current position to an offset relative to the end of the blob.
-  /** You'll probably want an offset of zero or less.
-   *
-   * Returns the new file offset.
-   */
-  std::int64_t seek_end(std::int64_t offset = 0);
-
-  /// Create a binary large object containing given `data`.
-  /** You may optionally specify an oid for the new object.  If you do, and an
-   * object with that oid already exists, creation will fail.
-   */
-  static oid from_buf(
-    dbtransaction &tx, std::basic_string_view<std::byte> data, oid id = 0);
-
-  /// Append `data` to binary large object.
-  /** The underlying protocol only supports appending blocks up to 2 GB.
-   */
-  static void append_from_buf(
-    dbtransaction &tx, std::basic_string_view<std::byte> data, oid id);
-
-  /// Read client-side file and store it server-side as a binary large object.
-  [[nodiscard]] static oid from_file(dbtransaction &, char const path[]);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Read client-side file and store it server-side as a binary large object.
-  /** This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  [[nodiscard]] static oid
-  from_file(dbtransaction &tx, std::filesystem::path const &path)
-  {
-    return from_file(tx, path.c_str());
-  }
-#endif
-
-  /// Read client-side file and store it server-side as a binary large object.
-  /** In this version, you specify the binary large object's oid.  If that oid
-   * is already in use, the operation will fail.
-   */
-  static oid from_file(dbtransaction &, char const path[], oid);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Read client-side file and store it server-side as a binary large object.
-  /** In this version, you specify the binary large object's oid.  If that oid
-   * is already in use, the operation will fail.
-   *
-   * This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  static oid
-  from_file(dbtransaction &tx, std::filesystem::path const &path, oid id)
-  {
-    return from_file(tx, path.c_str(), id);
-  }
-#endif
-
-  /// Convenience function: Read up to `max_size` bytes from blob with `id`.
-  /** You could easily do this yourself using the @ref open_r and @ref read
-   * functions, but it can save you a bit of code to do it this way.
-   */
-  static void to_buf(
-    dbtransaction &, oid, std::basic_string<std::byte> &,
-    std::size_t max_size);
-
-  /// Read part of the binary large object with `id`, and append it to `buf`.
-  /** Use this to break up a large read from one binary large object into one
-   * massive buffer.  Just keep calling this function until it returns zero.
-   *
-   * The `offset` is how far into the large object your desired chunk is, and
-   * `append_max` says how much to try and read in one go.
-   */
-  static std::size_t append_to_buf(
-    dbtransaction &tx, oid id, std::int64_t offset,
-    std::basic_string<std::byte> &buf, std::size_t append_max);
-
-  /// Write a binary large object's contents to a client-side file.
-  static void to_file(dbtransaction &, oid, char const path[]);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Write a binary large object's contents to a client-side file.
-  /** This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  static void
-  to_file(dbtransaction &tx, oid id, std::filesystem::path const &path)
-  {
-    to_file(tx, id, path.c_str());
-  }
-#endif
-
-  /// Close this blob.
-  /** This does not delete the blob from the database; it only terminates your
-   * local object for accessing the blob.
-   *
-   * Resets the blob to a useless state similar to one that was
-   * default-constructed.
-   *
-   * The destructor will do this for you automatically.  Still, there is a
-   * reason to `close()` objects explicitly where possible: if an error should
-   * occur while closing, `close()` can throw an exception.  A destructor
-   * cannot.
-   */
-  void close();
-
-private:
-  PQXX_PRIVATE blob(connection &conn, int fd) noexcept :
-          m_conn{&conn}, m_fd{fd}
-  {}
-  static PQXX_PRIVATE blob open_internal(dbtransaction &, oid, int);
-  static PQXX_PRIVATE pqxx::internal::pq::PGconn *
-  raw_conn(pqxx::connection *) noexcept;
-  static PQXX_PRIVATE pqxx::internal::pq::PGconn *
-  raw_conn(pqxx::dbtransaction const &) noexcept;
-  static PQXX_PRIVATE std::string errmsg(connection const *);
-  static PQXX_PRIVATE std::string errmsg(dbtransaction const &tx)
-  {
-    return errmsg(&tx.conn());
-  }
-  PQXX_PRIVATE std::string errmsg() const { return errmsg(m_conn); }
-  PQXX_PRIVATE std::int64_t seek(std::int64_t offset, int whence);
-  std::size_t raw_read(std::byte buf[], std::size_t size);
-  void raw_write(std::byte const buf[], std::size_t size);
-
-  connection *m_conn = nullptr;
-  int m_fd = -1;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/composite b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/composite
deleted file mode 100644
index 2bfa7ade9..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/composite
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Handling of SQL "composite types."
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/composite.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/composite.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/composite.hxx
deleted file mode 100644
index 439b133a8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/composite.hxx
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef PQXX_H_COMPOSITE
-#define PQXX_H_COMPOSITE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/internal/array-composite.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Parse a string representation of a value of a composite type.
-/** @warning This code is still experimental.  Use with care.
- *
- * You may use this as a helper while implementing your own @ref string_traits
- * for a composite type.
- *
- * This function interprets `text` as the string representation of a value of
- * some composite type, and sets each of `fields` to the respective values of
- * its fields.  The field types must be copy-assignable.
- *
- * The number of fields must match the number of fields in the composite type,
- * and there must not be any other text in the input.  The function is meant to
- * handle any value string that the backend can produce, but not necessarily
- * every valid alternative spelling.
- *
- * Fields in composite types can be null.  When this happens, the C++ type of
- * the corresponding field reference must be of a type that can handle nulls.
- * If you are working with a type that does not have an inherent null value,
- * such as e.g. `int`, consider using `std::optional`.
- */
-template<typename... T>
-inline void parse_composite(
-  pqxx::internal::encoding_group enc, std::string_view text, T &...fields)
-{
-  static_assert(sizeof...(fields) > 0);
-
-  auto const scan{pqxx::internal::get_glyph_scanner(enc)};
-  auto const data{std::data(text)};
-  auto const size{std::size(text)};
-  if (size == 0)
-    throw conversion_error{"Cannot parse composite value from empty string."};
-
-  std::size_t here{0}, next{scan(data, size, here)};
-  if (next != 1 or data[here] != '(')
-    throw conversion_error{
-      internal::concat("Invalid composite value string: ", text)};
-
-  here = next;
-
-  constexpr auto num_fields{sizeof...(fields)};
-  std::size_t index{0};
-  (pqxx::internal::parse_composite_field(
-     index, text, here, fields, scan, num_fields - 1),
-   ...);
-  if (here != std::size(text))
-    throw conversion_error{internal::concat(
-      "Composite value did not end at the closing parenthesis: '", text,
-      "'.")};
-  if (text[here - 1] != ')')
-    throw conversion_error{internal::concat(
-      "Composive value did not end in parenthesis: '", text, "'")};
-}
-
-
-/// Parse a string representation of a value of a composite type.
-/** @warning This version only works for UTF-8 and single-byte encodings.
- *
- * For proper encoding support, use the composite-type support in the
- * `field` class.
- */
-template<typename... T>
-inline void parse_composite(std::string_view text, T &...fields)
-{
-  parse_composite(pqxx::internal::encoding_group::MONOBYTE, text, fields...);
-}
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-constexpr char empty_composite_str[]{"()"};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// Estimate the buffer size needed to represent a value of a composite type.
-/** Returns a conservative estimate.
- */
-template<typename... T>
-[[nodiscard]] inline std::size_t
-composite_size_buffer(T const &...fields) noexcept
-{
-  constexpr auto num{sizeof...(fields)};
-
-  // Size for a multi-field composite includes room for...
-  //  + opening parenthesis
-  //  + field budgets
-  //  + separating comma per field
-  //  - comma after final field
-  //  + closing parenthesis
-  //  + terminating zero
-
-  if constexpr (num == 0)
-    return std::size(pqxx::internal::empty_composite_str);
-  else
-    return 1 + (pqxx::internal::size_composite_field_buffer(fields) + ...) +
-           num + 1;
-}
-
-
-/// Render a series of values as a single composite SQL value.
-/** @warning This code is still experimental.  Use with care.
- *
- * You may use this as a helper while implementing your own `string_traits`
- * for a composite type.
- */
-template<typename... T>
-inline char *composite_into_buf(char *begin, char *end, T const &...fields)
-{
-  if (std::size_t(end - begin) < composite_size_buffer(fields...))
-    throw conversion_error{
-      "Buffer space may not be enough to represent composite value."};
-
-  constexpr auto num_fields{sizeof...(fields)};
-  if constexpr (num_fields == 0)
-  {
-    constexpr char empty[]{"()"};
-    std::memcpy(begin, empty, std::size(empty));
-    return begin + std::size(empty);
-  }
-
-  char *pos{begin};
-  *pos++ = '(';
-
-  (pqxx::internal::write_composite_field<T>(pos, end, fields), ...);
-
-  // If we've got multiple fields, "backspace" that last comma.
-  if constexpr (num_fields > 1)
-    --pos;
-  *pos++ = ')';
-  *pos++ = '\0';
-  return pos;
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/config-public-compiler.h b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/config-public-compiler.h
deleted file mode 100644
index 3668a10f8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/config-public-compiler.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* include/pqxx/config.h.in.  Generated from configure.ac by autoheader.  */
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-/* Define to 1 if you have the `pq' library (-lpq). */
-/* #undef HAVE_LIBPQ */
-/* Define to 1 if you have the <memory.h> header file. */
-/* #undef HAVE_MEMORY_H */
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
-/* Define to 1 if you have the <stdlib.h> header file. */
-/* #undef HAVE_STDLIB_H */
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-/* Define to 1 if you have the <string.h> header file. */
-/* #undef HAVE_STRING_H */
-/* Define to 1 if you have the <sys/stat.h> header file. */
-/* #undef HAVE_SYS_STAT_H */
-/* Define to 1 if you have the <sys/types.h> header file. */
-/* #undef HAVE_SYS_TYPES_H */
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-/* #undef LT_OBJDIR */
-/* Name of package */
-/* #undef PACKAGE */
-/* Define to the address where bug reports for this package should be sent. */
-/* #undef PACKAGE_BUGREPORT */
-/* Define to the full name of this package. */
-/* #undef PACKAGE_NAME */
-/* Define to the full name and version of this package. */
-/* #undef PACKAGE_STRING */
-/* Define to the one symbol short name of this package. */
-/* #undef PACKAGE_TARNAME */
-/* Define to the home page for this package. */
-/* #undef PACKAGE_URL */
-/* Define to the version of this package. */
-/* #undef PACKAGE_VERSION */
-/* Define if <charconv> supports floating-point conversion. */
-#define PQXX_HAVE_CHARCONV_FLOAT
-/* Define if <charconv> supports integer conversion. */
-#define PQXX_HAVE_CHARCONV_INT
-/* Define if compiler has C++20 std::cmp_greater etc. */
-/* #undef PQXX_HAVE_CMP */
-/* Define if compiler supports Concepts and <ranges> header. */
-/* #undef PQXX_HAVE_CONCEPTS */
-/* Define if compiler supports __cxa_demangle */
-#define PQXX_HAVE_CXA_DEMANGLE
-/* Define if g++ supports pure attribute */
-#define PQXX_HAVE_GCC_PURE
-/* Define if g++ supports visibility attribute. */
-#define PQXX_HAVE_GCC_VISIBILITY
-/* Define if likely & unlikely work. */
-/* #undef PQXX_HAVE_LIKELY */
-/* Define if operator[] can take multiple arguments. */
-/* #undef PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT */
-/* Define if compiler has usable std::filesystem::path. */
-#define PQXX_HAVE_PATH
-/* Define if poll() is available. */
-#define PQXX_HAVE_POLL
-/* Define if libpq has PQencryptPasswordConn (since pg 10). */
-#define PQXX_HAVE_PQENCRYPTPASSWORDCONN
-/* Define if libpq has pipeline mode (since pg 14). */
-#define PQXX_HAVE_PQ_PIPELINE
-/* Define if std::this_thread::sleep_for works. */
-#define PQXX_HAVE_SLEEP_FOR
-/* Define if compiler has std::span. */
-/* #undef PQXX_HAVE_SPAN */
-/* Define if strerror_r() is available. */
-#define PQXX_HAVE_STRERROR_R
-/* Define if strerror_s() is available. */
-/* #undef PQXX_HAVE_STRERROR_S */
-/* Define if thread_local is fully supported. */
-#define PQXX_HAVE_THREAD_LOCAL
-/* Define if std::chrono has year_month_day etc. */
-/* #undef PQXX_HAVE_YEAR_MONTH_DAY */
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-/* Version number of package */
-/* #undef VERSION */
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/connection b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/connection
deleted file mode 100644
index 82ff43aa5..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/connection
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::connection class.
- *
- * pqxx::connection encapsulates a connection to a database.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/connection.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/connection.hxx
deleted file mode 100644
index 92454bb47..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/connection.hxx
+++ /dev/null
@@ -1,1261 +0,0 @@
-/* Definition of the connection class.
- *
- * pqxx::connection encapsulates a connection to a database.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/connection instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_CONNECTION
-#define PQXX_H_CONNECTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstddef>
-#include <ctime>
-#include <functional>
-#include <initializer_list>
-#include <list>
-#include <map>
-#include <memory>
-#include <string_view>
-#include <tuple>
-#include <utility>
-
-// Double-check in order to suppress an overzealous Visual C++ warning (#418).
-#if defined(PQXX_HAVE_CONCEPTS) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-
-/**
- * @addtogroup connections
- *
- * Use of the libpqxx library starts here.
- *
- * Everything that can be done with a database through libpqxx must go through
- * a @ref pqxx::connection object.  It connects to a database when you create
- * it, and it terminates that communication during destruction.
- *
- * Many things come together in this class.  Handling of error and warning
- * messages, for example, is defined by @ref pqxx::errorhandler objects in the
- * context of a connection.  Prepared statements are also defined here.
- *
- * When you connect to a database, you pass a connection string containing any
- * parameters and options, such as the server address and the database name.
- *
- * These are identical to the ones in libpq, the C language binding upon which
- * libpqxx itself is built:
- *
- * https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
- *
- * There are also environment variables you can set to provide defaults, again
- * as defined by libpq:
- *
- * https://www.postgresql.org/docs/current/libpq-envars.html
- *
- * You can also create a database connection _asynchronously_ using an
- * intermediate @ref pqxx::connecting object.
- */
-
-namespace pqxx::internal
-{
-class sql_cursor;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: T is a range of pairs of zero-terminated strings.
-template<typename T>
-concept ZKey_ZValues = std::ranges::input_range<T> and requires(T t)
-{
-  {std::cbegin(t)};
-  {
-    std::get<0>(*std::cbegin(t))
-    } -> ZString;
-  {
-    std::get<1>(*std::cbegin(t))
-    } -> ZString;
-} and std::tuple_size_v<typename std::ranges::iterator_t<T>::value_type>
-== 2;
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx::internal
-
-
-namespace pqxx::internal::gate
-{
-class connection_dbtransaction;
-class connection_errorhandler;
-class connection_largeobject;
-class connection_notification_receiver;
-class connection_pipeline;
-class connection_sql_cursor;
-class connection_stream_from;
-class connection_stream_to;
-class connection_transaction;
-class const_connection_largeobject;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Representation of a PostgreSQL table path.
-/** A "table path" consists of a table name, optionally prefixed by a schema
- * name, which in turn is optionally prefixed by a database name.
- *
- * A minimal example of a table path would be `{mytable}`.  But a table path
- * may also take the forms `{myschema,mytable}` or
- * `{mydb,myschema,mytable}`.
- */
-using table_path = std::initializer_list<std::string_view>;
-
-
-/// Encrypt a password.  @deprecated Use connection::encrypt_password instead.
-[[nodiscard,
-  deprecated("Use connection::encrypt_password instead.")]] std::string
-  PQXX_LIBEXPORT
-  encrypt_password(char const user[], char const password[]);
-
-/// Encrypt password.  @deprecated Use connection::encrypt_password instead.
-[[nodiscard,
-  deprecated("Use connection::encrypt_password instead.")]] inline std::string
-encrypt_password(zview user, zview password)
-{
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return encrypt_password(user.c_str(), password.c_str());
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-/// Error verbosity levels.
-enum class error_verbosity : int
-{
-  // These values must match those in libpq's PGVerbosity enum.
-  terse = 0,
-  normal = 1,
-  verbose = 2
-};
-
-
-/// Connection to a database.
-/** This is the first class to look at when you wish to work with a database
- * through libpqxx.  The connection opens during construction, and closes upon
- * destruction.
- *
- * When creating a connection, you can pass a connection URI or a postgres
- * connection string, to specify the database server's address, a login
- * username, and so on.  If you don't, the connection will try to obtain them
- * from certain environment variables.  If those are not set either, the
- * default is to try and connect to the local system's port 5432.
- *
- * Find more about connection strings here:
- *
- * https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
- *
- * The variables are documented here:
- *
- * https://www.postgresql.org/docs/current/libpq-envars.html
- *
- * To query or manipulate the database once connected, use one of the
- * transaction classes (see pqxx/transaction_base.hxx) and perhaps also the
- * transactor framework (see pqxx/transactor.hxx).
- *
- * When a connection breaks, you will typically get a @ref broken_connection
- * exception.  This can happen at almost any point.
- *
- * @warning On Unix-like systems, including GNU and BSD systems, your program
- * may receive the SIGPIPE signal when the connection to the backend breaks. By
- * default this signal will abort your program.  Use "signal(SIGPIPE, SIG_IGN)"
- * if you want your program to continue running after a connection fails.
- */
-class PQXX_LIBEXPORT connection
-{
-public:
-  connection() : connection{""} {}
-
-  /// Connect to a database, using `options` string.
-  explicit connection(char const options[])
-  {
-    check_version();
-    init(options);
-  }
-
-  /// Connect to a database, using `options` string.
-  explicit connection(zview options) : connection{options.c_str()}
-  {
-    // (Delegates to other constructor which calls check_version for us.)
-  }
-
-  /// Move constructor.
-  /** Moving a connection is not allowed if it has an open transaction, or has
-   * error handlers or notification receivers registered on it.  In those
-   * situations, other objects may hold references to the old object which
-   * would become invalid and might produce hard-to-diagnose bugs.
-   */
-  connection(connection &&rhs);
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Connect to a database, passing options as a range of key/value pairs.
-  /** @warning Experimental.  Requires C++20 "concepts" support.  Define
-   * `PQXX_HAVE_CONCEPTS` to enable it.
-   *
-   * There's no need to escape the parameter values.
-   *
-   * See the PostgreSQL libpq documentation for the full list of possible
-   * options:
-   *
-   * https://postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS
-   *
-   * The options can be anything that can be iterated as a series of pairs of
-   * zero-terminated strings: `std::pair<std::string, std::string>`, or
-   * `std::tuple<pqxx::zview, char const *>`, or
-   * `std::map<std::string, pqxx::zview>`, and so on.
-   */
-  template<internal::ZKey_ZValues MAPPING>
-  inline connection(MAPPING const &params);
-#endif // PQXX_HAVE_CONCEPTS
-
-  ~connection()
-  {
-    try
-    {
-      close();
-    }
-    catch (std::exception const &)
-    {}
-  }
-
-  /// Move assignment.
-  /** Neither connection can have an open transaction, registered error
-   * handlers, or registered notification receivers.
-   */
-  connection &operator=(connection &&rhs);
-
-  connection(connection const &) = delete;
-  connection &operator=(connection const &) = delete;
-
-  /// Is this connection open at the moment?
-  /** @warning This function is **not** needed in most code.  Resist the
-   * temptation to check it after opening a connection.  The `connection`
-   * constructor will throw a @ref broken_connection exception if can't connect
-   * to the database.
-   */
-  [[nodiscard]] bool PQXX_PURE is_open() const noexcept;
-
-  /// Invoke notice processor function.  The message should end in newline.
-  void process_notice(char const[]) noexcept;
-  /// Invoke notice processor function.  Newline at end is recommended.
-  /** The zview variant, with a message ending in newline, is the most
-   * efficient way to call process_notice.
-   */
-  void process_notice(zview) noexcept;
-
-  /// Enable tracing to a given output stream, or nullptr to disable.
-  void trace(std::FILE *) noexcept;
-
-  /**
-   * @name Connection properties
-   *
-   * These are probably not of great interest, since most are derived from
-   * information supplied by the client program itself, but they are included
-   * for completeness.
-   *
-   * The connection needs to be currently active for these to work.
-   */
-  //@{
-  /// Name of database we're connected to, if any.
-  [[nodiscard]] char const *dbname() const;
-
-  /// Database user ID we're connected under, if any.
-  [[nodiscard]] char const *username() const;
-
-  /// Address of server, or nullptr if none specified (i.e. default or local)
-  [[nodiscard]] char const *hostname() const;
-
-  /// Server port number we're connected to.
-  [[nodiscard]] char const *port() const;
-
-  /// Process ID for backend process, or 0 if inactive.
-  [[nodiscard]] int PQXX_PURE backendpid() const &noexcept;
-
-  /// Socket currently used for connection, or -1 for none.  Use with care!
-  /** Query the current socket number.  This is intended for event loops based
-   * on functions such as select() or poll(), where you're waiting for any of
-   * multiple file descriptors to become ready for communication.
-   *
-   * Please try to stay away from this function.  It is really only meant for
-   * event loops that need to wait on more than one file descriptor.  If all
-   * you need is to block until a notification arrives, for instance, use
-   * await_notification().  If you want to issue queries and retrieve results
-   * in nonblocking fashion, check out the pipeline class.
-   */
-  [[nodiscard]] int PQXX_PURE sock() const &noexcept;
-
-  /// What version of the PostgreSQL protocol is this connection using?
-  /** The answer can be 0 (when there is no connection); 3 for protocol 3.0; or
-   * possibly higher values as newer protocol versions come into use.
-   */
-  [[nodiscard]] int PQXX_PURE protocol_version() const noexcept;
-
-  /// What version of the PostgreSQL server are we connected to?
-  /** The result is a bit complicated: each of the major, medium, and minor
-   * release numbers is written as a two-digit decimal number, and the three
-   * are then concatenated.  Thus server version 9.4.2 will be returned as the
-   * decimal number 90402.  If there is no connection to the server, this
-   * returns zero.
-   *
-   * @warning When writing version numbers in your code, don't add zero at the
-   * beginning!  Numbers beginning with zero are interpreted as octal (base-8)
-   * in C++.  Thus, 070402 is not the same as 70402, and 080000 is not a number
-   * at all because there is no digit "8" in octal notation.  Use strictly
-   * decimal notation when it comes to these version numbers.
-   */
-  [[nodiscard]] int PQXX_PURE server_version() const noexcept;
-  //@}
-
-  /// @name Text encoding
-  /**
-   * Each connection is governed by a "client encoding," which dictates how
-   * strings and other text is represented in bytes.  The database server will
-   * send text data to you in this encoding, and you should use it for the
-   * queries and data which you send to the server.
-   *
-   * Search the PostgreSQL documentation for "character set encodings" to find
-   * out more about the available encodings, how to extend them, and how to use
-   * them.  Not all server-side encodings are compatible with all client-side
-   * encodings or vice versa.
-   *
-   * Encoding names are case-insensitive, so e.g. "UTF8" is equivalent to
-   * "utf8".
-   *
-   * You can change the client encoding, but this may not work when the
-   * connection is in a special state, such as when streaming a table.  It's
-   * not clear what happens if you change the encoding during a transaction,
-   * and then abort the transaction.
-   */
-  //@{
-  /// Get client-side character encoding, by name.
-  [[nodiscard]] std::string get_client_encoding() const;
-
-  /// Set client-side character encoding, by name.
-  /**
-   * @param encoding Name of the character set encoding to use.
-   */
-  void set_client_encoding(zview encoding) &
-  {
-    set_client_encoding(encoding.c_str());
-  }
-
-  /// Set client-side character encoding, by name.
-  /**
-   * @param encoding Name of the character set encoding to use.
-   */
-  void set_client_encoding(char const encoding[]) &;
-
-  /// Get the connection's encoding, as a PostgreSQL-defined code.
-  [[nodiscard]] int PQXX_PRIVATE encoding_id() const;
-
-  //@}
-
-  /// Set session variable, using SQL's `SET` command.
-  /** @deprecated To set a session variable, use @ref set_session_var.  To set
-   * a transaction-local variable, execute an SQL `SET` command.
-   *
-   * @warning When setting a string value, you must escape and quote it first.
-   * Use the @ref quote() function to do that.
-   *
-   * @warning This executes an SQL query, so do not get or set variables while
-   * a table stream or pipeline is active on the same connection.
-   *
-   * @param var Variable to set.
-   * @param value New value for Var.  This can be any SQL expression.  If it's
-   * a string, be sure that it's properly escaped and quoted.
-   */
-  [[deprecated("To set session variables, use set_session_var.")]] void
-  set_variable(std::string_view var, std::string_view value) &;
-
-  /// Set one of the session variables to a new value.
-  /** This executes SQL, so do not do it while a pipeline or stream is active
-   * on the connection.
-   *
-   * The value you set here will last for the rest of the connection's
-   * duration, or until you set a new value.
-   *
-   * If you set the value while in a @ref dbtransaction (i.e. any transaction
-   * that is not a @ref nontransaction), then rolling back the transaction will
-   * undo the change.
-   *
-   * All applies to setting _session_ variables.  You can also set the same
-   * variables as _local_ variables, in which case they will always revert to
-   * their previous value when the transaction ends (or when you overwrite them
-   * of course).  To set a local variable, simply execute an SQL statement
-   * along the lines of "`SET LOCAL var = 'value'`" inside your transaction.
-   *
-   * @param var The variable to set.
-   * @param value The new value for the variable.
-   * @throw @ref variable_set_to_null if the value is null; this is not
-   * allowed.
-   */
-  template<typename TYPE>
-  void set_session_var(std::string_view var, TYPE const &value) &
-  {
-    if constexpr (nullness<TYPE>::has_null)
-    {
-      if (nullness<TYPE>::is_null(value))
-        throw variable_set_to_null{
-          internal::concat("Attempted to set variable ", var, " to null.")};
-    }
-    exec(internal::concat("SET ", quote_name(var), "=", quote(value)));
-  }
-
-  /// Read session variable, using SQL's `SHOW` command.
-  /** @warning This executes an SQL query, so do not get or set variables while
-   * a table stream or pipeline is active on the same connection.
-   */
-  [[deprecated("Use get_var instead.")]] std::string
-    get_variable(std::string_view);
-
-  /// Read currently applicable value of a variable.
-  /** This function executes an SQL statement, so it won't work while a
-   * @ref pipeline or query stream is active on the connection.
-   *
-   * @return a blank `std::optional` if the variable's value is null, or its
-   * string value otherwise.
-   */
-  std::string get_var(std::string_view var);
-
-  /// Read currently applicable value of a variable.
-  /** This function executes an SQL statement, so it won't work while a
-   * @ref pipeline or query stream is active on the connection.
-   *
-   * If there is any possibility that the variable is null, ensure that `TYPE`
-   * can represent null values.
-   */
-  template<typename TYPE> TYPE get_var_as(std::string_view var)
-  {
-    return from_string<TYPE>(get_var(var));
-  }
-
-  /**
-   * @name Notifications and Receivers
-   */
-  //@{
-  /// Check for pending notifications and take appropriate action.
-  /** This does not block.  To wait for incoming notifications, either call
-   * await_notification() (it calls this function); or wait for incoming data
-   * on the connection's socket (i.e. wait to read), and then call this
-   * function repeatedly until it returns zero.  After that, there are no more
-   * pending notifications so you may want to wait again.
-   *
-   * If any notifications are pending when you call this function, it
-   * processes them by finding any receivers that match the notification string
-   * and invoking those.  If no receivers match, there is nothing to invoke but
-   * we do consider the notification processed.
-   *
-   * If any of the client-registered receivers throws an exception, the
-   * function will report it using the connection's errorhandlers.  It does not
-   * re-throw the exceptions.
-   *
-   * @return Number of notifications processed.
-   */
-  int get_notifs();
-
-  /// Wait for a notification to come in.
-  /** There are other events that will also terminate the wait, such as the
-   * backend failing.  It will also wake up periodically.
-   *
-   * If a notification comes in, the call will process it, along with any other
-   * notifications that may have been pending.
-   *
-   * To wait for notifications into your own event loop instead, wait until
-   * there is incoming data on the connection's socket to be read, then call
-   * @ref get_notifs() repeatedly until it returns zero.
-   *
-   * @return Number of notifications processed.
-   */
-  int await_notification();
-
-  /// Wait for a notification to come in, or for given timeout to pass.
-  /** There are other events that will also terminate the wait, such as the
-   * backend failing, or timeout expiring.
-   *
-   * If a notification comes in, the call will process it, along with any other
-   * notifications that may have been pending.
-   *
-   * To wait for notifications into your own event loop instead, wait until
-   * there is incoming data on the connection's socket to be read, then call
-   * @ref get_notifs repeatedly until it returns zero.
-   *
-   * @return Number of notifications processed
-   */
-  int await_notification(std::time_t seconds, long microseconds);
-  //@}
-
-  /**
-   * @name Password encryption
-   *
-   * Use this when setting a new password for the user if password encryption
-   * is enabled.  Inputs are the SQL name for the user for whom you with to
-   * encrypt a password; the plaintext password; and the hash algorithm.
-   *
-   * The algorithm must be one of "md5", "scram-sha-256" (introduced in
-   * PostgreSQL 10), or `nullptr`.  If the pointer is null, this will query
-   * the `password_encryption setting` from the server, and use the default
-   * algorithm as defined there.
-   *
-   * @return encrypted version of the password, suitable for encrypted
-   * PostgreSQL authentication.
-   *
-   * Thus you can change a user's password with:
-   * ```cxx
-   * void setpw(transaction_base &t, string const &user, string const &pw)
-   * {
-   *   t.exec0("ALTER USER " + user + " "
-   *   	"PASSWORD '" + t.conn().encrypt_password(user,pw) + "'");
-   * }
-   * ```
-   *
-   * When building this against a libpq older than version 10, this will use
-   * an older function which only supports md5.  In that case, requesting a
-   * different algorithm than md5 will result in a @ref feature_not_supported
-   * exception.
-   */
-  //@{
-  /// Encrypt a password for a given user.
-  [[nodiscard]] std::string
-  encrypt_password(zview user, zview password, zview algorithm)
-  {
-    return encrypt_password(user.c_str(), password.c_str(), algorithm.c_str());
-  }
-  /// Encrypt a password for a given user.
-  [[nodiscard]] std::string encrypt_password(
-    char const user[], char const password[], char const *algorithm = nullptr);
-  //@}
-
-  /**
-   * @name Prepared statements
-   *
-   * PostgreSQL supports prepared SQL statements, i.e. statements that you can
-   * register under a name you choose, optimized once by the backend, and
-   * executed any number of times under the given name.
-   *
-   * Prepared statement definitions are not sensitive to transaction
-   * boundaries. A statement defined inside a transaction will remain defined
-   * outside that transaction, even if the transaction itself is subsequently
-   * aborted.  Once a statement has been prepared, it will only go away if you
-   * close the connection or explicitly "unprepare" the statement.
-   *
-   * Use the `pqxx::transaction_base::exec_prepared` functions to execute a
-   * prepared statement.  See @ref prepared for a full discussion.
-   *
-   * @warning Using prepared statements can save time, but if your statement
-   * takes parameters, it may also make your application significantly slower!
-   * The reason is that the server works out a plan for executing the query
-   * when you prepare it.  At that time, of course it does not know the values
-   * for the parameters that you will pass.  If you execute a query without
-   * preparing it, then the server works out the plan on the spot, with full
-   * knowledge of the parameter values.
-   *
-   * A statement's definition can refer to its parameters as `$1`, `$2`, etc.
-   * The first parameter you pass to the call provides a value for `$1`, and
-   * so on.
-   *
-   * Here's an example of how to use prepared statements.
-   *
-   * ```cxx
-   * using namespace pqxx;
-   * void foo(connection &c)
-   * {
-   *   c.prepare("findtable", "select * from pg_tables where name=$1");
-   *   work tx{c};
-   *   result r = tx.exec_prepared("findtable", "mytable");
-   *   if (std::empty(r)) throw runtime_error{"mytable not found!"};
-   * }
-   * ```
-   */
-  //@{
-
-  /// Define a prepared statement.
-  /**
-   * @param name unique name for the new prepared statement.
-   * @param definition SQL statement to prepare.
-   */
-  void prepare(zview name, zview definition) &
-  {
-    prepare(name.c_str(), definition.c_str());
-  }
-
-  /**
-   * @param name unique name for the new prepared statement.
-   * @param definition SQL statement to prepare.
-   */
-  void prepare(char const name[], char const definition[]) &;
-
-  /// Define a nameless prepared statement.
-  /**
-   * This can be useful if you merely want to pass large binary parameters to a
-   * statement without otherwise wishing to prepare it.  If you use this
-   * feature, always keep the definition and the use close together to avoid
-   * the nameless statement being redefined unexpectedly by code somewhere
-   * else.
-   */
-  void prepare(char const definition[]) &;
-  void prepare(zview definition) & { return prepare(definition.c_str()); }
-
-  /// Drop prepared statement.
-  void unprepare(std::string_view name);
-
-  //@}
-
-  // C++20: constexpr.  Breaks ABI.
-  /// Suffix unique number to name to make it unique within session context.
-  /** Used internally to generate identifiers for SQL objects (such as cursors
-   * and nested transactions) based on a given human-readable base name.
-   */
-  [[nodiscard]] std::string adorn_name(std::string_view);
-
-  /**
-   * @defgroup escaping-functions String-escaping functions
-   */
-  //@{
-
-  /// Escape string for use as SQL string literal on this connection.
-  /** @warning This accepts a length, and it does not require a terminating
-   * zero byte.  But if there is a zero byte, escaping stops there even if
-   * it's not at the end of the string!
-   */
-  [[deprecated("Use std::string_view or pqxx:zview.")]] std::string
-  esc(char const text[], std::size_t maxlen) const
-  {
-    return esc(std::string_view{text, maxlen});
-  }
-
-  /// Escape string for use as SQL string literal on this connection.
-  [[nodiscard]] std::string esc(char const text[]) const
-  {
-    return esc(std::string_view{text});
-  }
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Escape string for use as SQL string literal, into `buffer`.
-  /** Use this variant when you want to re-use the same buffer across multiple
-   * calls.  If that's not the case, or convenience and simplicity are more
-   * important, use the single-argument variant.
-   *
-   * For every byte in `text`, there must be at least 2 bytes of space in
-   * `buffer`; plus there must be one byte of space for a trailing zero.
-   * Throws @ref range_error if this space is not available.
-   *
-   * Returns a reference to the escaped string, which is actually stored in
-   * `buffer`.
-   */
-  [[nodiscard]] std::string_view
-  esc(std::string_view text, std::span<char> buffer)
-  {
-    auto const size{std::size(text)}, space{std::size(buffer)};
-    auto const needed{2 * size + 1};
-    if (space < needed)
-      throw range_error{internal::concat(
-        "Not enough room to escape string of ", size, " byte(s): need ",
-        needed, " bytes of buffer space, but buffer size is ", space, ".")};
-    auto const data{buffer.data()};
-    return {data, esc_to_buf(text, data)};
-  }
-#endif
-
-  /// Escape string for use as SQL string literal on this connection.
-  /** @warning This is meant for text strings only.  It cannot contain bytes
-   * whose value is zero ("nul bytes").
-   */
-  [[nodiscard]] std::string esc(std::string_view text) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** This is identical to `esc_raw(data)`. */
-  template<binary DATA> [[nodiscard]] std::string esc(DATA const &data) const
-  {
-    return esc_raw(data);
-  }
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  /** Use this variant when you want to re-use the same buffer across multiple
-   * calls.  If that's not the case, or convenience and simplicity are more
-   * important, use the single-argument variant.
-   *
-   * For every byte in `data`, there must be at least two bytes of space in
-   * `buffer`; plus there must be two bytes of space for a header and one for
-   * a trailing zero.  Throws @ref range_error if this space is not available.
-   *
-   * Returns a reference to the escaped string, which is actually stored in
-   * `buffer`.
-   */
-  template<binary DATA>
-  [[nodiscard]] zview esc(DATA const &data, std::span<char> buffer) const
-  {
-    auto const size{std::size(data)}, space{std::size(buffer)};
-    auto const needed{internal::size_esc_bin(std::size(data))};
-    if (space < needed)
-      throw range_error{internal::concat(
-        "Not enough room to escape binary string of ", size, " byte(s): need ",
-        needed, " bytes of buffer space, but buffer size is ", space, ".")};
-
-    std::basic_string_view<std::byte> view{std::data(data), std::size(data)};
-    auto const out{std::data(buffer)};
-    // Actually, in the modern format, we know beforehand exactly how many
-    // bytes we're going to fill.  Just leave out the trailing zero.
-    internal::esc_bin(view, out);
-    return zview{out, needed - 1};
-  }
-#endif
-
-  /// Escape binary string for use as SQL string literal on this connection.
-  [[deprecated("Use std::byte for binary data.")]] std::string
-  esc_raw(unsigned char const bin[], std::size_t len) const;
-
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** You can also just use @ref esc with a binary string. */
-  [[nodiscard]] std::string esc_raw(std::basic_string_view<std::byte>) const;
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  /** You can also just use @ref esc with a binary string. */
-  [[nodiscard]] std::string
-  esc_raw(std::basic_string_view<std::byte>, std::span<char> buffer) const;
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** You can also just use @ref esc with a binary string. */
-  template<binary DATA>
-  [[nodiscard]] std::string esc_raw(DATA const &data) const
-  {
-    return esc_raw(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  template<binary DATA>
-  [[nodiscard]] zview esc_raw(DATA const &data, std::span<char> buffer) const
-  {
-    return this->esc(binary_cast(data), buffer);
-  }
-#endif
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(zview text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return unesc_raw(text.c_str());
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(char const text[]) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   *
-   * (The data must be encoded in PostgreSQL's "hex" format.  The legacy
-   * "bytea" escape format, used prior to PostgreSQL 9.0, is no longer
-   * supported.)
-   */
-  [[nodiscard]] std::basic_string<std::byte>
-  unesc_bin(std::string_view text) const
-  {
-    std::basic_string<std::byte> buf;
-    buf.resize(pqxx::internal::size_unesc_bin(std::size(text)));
-    pqxx::internal::unesc_bin(text, buf.data());
-    return buf;
-  }
-
-  /// Escape and quote a string of binary data.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(unsigned char const bin[], std::size_t len) const;
-
-  /// Escape and quote a string of binary data.
-  std::string quote_raw(std::basic_string_view<std::byte>) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape and quote a string of binary data.
-  /** You can also just use @ref quote with binary data. */
-  template<binary DATA>
-  [[nodiscard]] std::string quote_raw(DATA const &data) const
-  {
-    return quote_raw(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote an SQL identifier for use in a query.
-  [[nodiscard]] std::string quote_name(std::string_view identifier) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote a table name.
-  /** When passing just a table name, this is just another name for
-   * @ref quote_name.
-   */
-  [[nodiscard]] std::string quote_table(std::string_view name) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote a table path.
-  /** A table path consists of a table name, optionally prefixed by a schema
-   * name; and if both are given, they are in turn optionally prefixed by a
-   * database name.
-   *
-   * Each portion of the path (database name, schema name, table name) will be
-   * quoted separately, and they will be joined together by dots.  So for
-   * example, `myschema.mytable` will become `"myschema"."mytable"`.
-   */
-  [[nodiscard]] std::string quote_table(table_path) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Quote and comma-separate a series of column names.
-  /** Use this to save a bit of work in cases where you repeatedly need to pass
-   * the same list of column names, e.g. with @ref stream_to and @ref
-   * stream_from. Some functions that need to quote the columns list
-   * internally, will have a "raw" alternative which let you do the quoting
-   * yourself.  It's a bit of extra work, but it can in rare cases let you
-   * eliminate some duplicate work in quoting them repeatedly.
-   */
-  template<PQXX_CHAR_STRINGS_ARG STRINGS>
-  inline std::string quote_columns(STRINGS const &columns) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Represent object as SQL string, including quoting & escaping.
-  /**
-   * Recognises nulls and represents them as SQL nulls.  They get no quotes.
-   */
-  template<typename T>
-  [[nodiscard]] inline std::string quote(T const &t) const;
-
-  [[deprecated("Use std::byte for binary data.")]] std::string
-  quote(binarystring const &) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote binary data for use as a BYTEA value in SQL statement.
-  [[nodiscard]] std::string
-  quote(std::basic_string_view<std::byte> bytes) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape string for literal LIKE match.
-  /** Use this when part of an SQL "LIKE" pattern should match only as a
-   * literal string, not as a pattern, even if it contains "%" or "_"
-   * characters that would normally act as wildcards.
-   *
-   * The string does not get string-escaped or quoted.  You do that later.
-   *
-   * For instance, let's say you have a string `name` entered by the user,
-   * and you're searching a `file` column for items that match `name`
-   * followed by a dot and three letters.  Even if `name` contains wildcard
-   * characters "%" or "_", you only want those to match literally, so "_"
-   * only matches "_" and "%" only matches a single "%".
-   *
-   * You do that by "like-escaping" `name`, appending the wildcard pattern
-   * `".___"`, and finally, escaping and quoting the result for inclusion in
-   * your query:
-   *
-   * ```cxx
-   *    tx.exec(
-   *        "SELECT file FROM item WHERE file LIKE " +
-   *        tx.quote(tx.esc_like(name) + ".___"));
-   * ```
-   *
-   * The SQL "LIKE" operator also lets you choose your own escape character.
-   * This is supported, but must be a single-byte character.
-   */
-  [[nodiscard]] std::string
-  esc_like(std::string_view text, char escape_char = '\\') const;
-  //@}
-
-  /// Attempt to cancel the ongoing query, if any.
-  /** You can use this from another thread, and/or while a query is executing
-   * in a pipeline, but it's up to you to ensure that you're not canceling the
-   * wrong query.  This may involve locking.
-   */
-  void cancel_query();
-
-#if defined(_WIN32) || __has_include(<fcntl.h>)
-  /// Set socket to blocking (true) or nonblocking (false).
-  /** @warning Do not use this unless you _really_ know what you're doing.
-   * @warning This function is available on most systems, but not necessarily
-   * all.
-   */
-  void set_blocking(bool block) &;
-#endif // defined(_WIN32) || __has_include(<fcntl.h>)
-
-  /// Set session verbosity.
-  /** Set the verbosity of error messages to "terse", "normal" (the default),
-   * or "verbose."
-   *
-   *  If "terse", returned messages include severity, primary text, and
-   * position only; this will normally fit on a single line. "normal" produces
-   * messages that include the above plus any detail, hint, or context fields
-   * (these might span multiple lines).  "verbose" includes all available
-   * fields.
-   */
-  void set_verbosity(error_verbosity verbosity) &noexcept;
-
-  /// Return pointers to the active errorhandlers.
-  /** The entries are ordered from oldest to newest handler.
-   *
-   * You may use this to find errorhandlers that your application wants to
-   * delete when destroying the connection.  Be aware, however, that libpqxx
-   * may also add errorhandlers of its own, and those will be included in the
-   * list.  If this is a problem for you, derive your errorhandlers from a
-   * custom base class derived from pqxx::errorhandler.  Then use dynamic_cast
-   * to find which of the error handlers are yours.
-   *
-   * The pointers point to the real errorhandlers.  The container it returns
-   * however is a copy of the one internal to the connection, not a reference.
-   */
-  [[nodiscard]] std::vector<errorhandler *> get_errorhandlers() const;
-
-  /// Return a connection string encapsulating this connection's options.
-  /** The connection must be currently open for this to work.
-   *
-   * Returns a reconstruction of this connection's connection string.  It may
-   * not exactly match the connection string you passed in when creating this
-   * connection.
-   */
-  [[nodiscard]] std::string connection_string() const;
-
-  /// Explicitly close the connection.
-  /** The destructor will do this for you automatically.  Still, there is a
-   * reason to `close()` objects explicitly where possible: if an error should
-   * occur while closing, `close()` can throw an exception.  A destructor
-   * cannot.
-   *
-   * Closing a connection is idempotent.  Closing a connection that's already
-   * closed does nothing.
-   */
-  void close();
-
-  /// Seize control of a raw libpq connection.
-  /** @warning Do not do this.  Please.  It's for very rare, very specific
-   * use-cases.  The mechanism may change (or break) in unexpected ways in
-   * future versions.
-   *
-   * @param raw_conn a raw libpq `PQconn` pointer.
-   */
-  static connection seize_raw_connection(internal::pq::PGconn *raw_conn)
-  {
-    return connection{raw_conn};
-  }
-
-  /// Release the raw connection without closing it.
-  /** @warning Do not do this.  It's for very rare, very specific use-cases.
-   * The mechanism may change (or break) in unexpected ways in future versions.
-   *
-   * The `connection` object becomes unusable after this.
-   */
-  internal::pq::PGconn *release_raw_connection() &&
-  {
-    return std::exchange(m_conn, nullptr);
-  }
-
-private:
-  friend class connecting;
-  enum connect_mode
-  {
-    connect_nonblocking
-  };
-  connection(connect_mode, zview connection_string);
-
-  /// For use by @ref seize_raw_connection.
-  explicit connection(internal::pq::PGconn *raw_conn) : m_conn{raw_conn} {}
-
-  /// Poll for ongoing connection, try to progress towards completion.
-  /** Returns a pair of "now please wait to read data from socket" and "now
-   * please wait to write data to socket."  Both will be false when done.
-   *
-   * Throws an exception if polling indicates that the connection has failed.
-   */
-  std::pair<bool, bool> poll_connect();
-
-  // Initialise based on connection string.
-  void init(char const options[]);
-  // Initialise based on parameter names and values.
-  void init(char const *params[], char const *values[]);
-  void complete_init();
-
-  result make_result(
-    internal::pq::PGresult *pgr, std::shared_ptr<std::string> const &query,
-    std::string_view desc = ""sv);
-
-  void PQXX_PRIVATE set_up_state();
-
-  int PQXX_PRIVATE PQXX_PURE status() const noexcept;
-
-  /// Escape a string, into a buffer allocated by the caller.
-  /** The buffer must have room for at least `2*std::size(text) + 1` bytes.
-   *
-   * Returns the number of bytes written, including the trailing zero.
-   */
-  std::size_t esc_to_buf(std::string_view text, char *buf) const;
-
-  friend class internal::gate::const_connection_largeobject;
-  char const *PQXX_PURE err_msg() const noexcept;
-
-  void PQXX_PRIVATE process_notice_raw(char const msg[]) noexcept;
-
-  result exec_prepared(std::string_view statement, internal::c_params const &);
-
-  /// Throw @ref usage_error if this connection is not in a movable state.
-  void check_movable() const;
-  /// Throw @ref usage_error if not in a state where it can be move-assigned.
-  void check_overwritable() const;
-
-  friend class internal::gate::connection_errorhandler;
-  void PQXX_PRIVATE register_errorhandler(errorhandler *);
-  void PQXX_PRIVATE unregister_errorhandler(errorhandler *) noexcept;
-
-  friend class internal::gate::connection_transaction;
-  result exec(std::string_view, std::string_view = ""sv);
-  result
-    PQXX_PRIVATE exec(std::shared_ptr<std::string>, std::string_view = ""sv);
-  void PQXX_PRIVATE register_transaction(transaction_base *);
-  void PQXX_PRIVATE unregister_transaction(transaction_base *) noexcept;
-
-  friend class internal::gate::connection_stream_from;
-  std::pair<std::unique_ptr<char, std::function<void(char *)>>, std::size_t>
-    PQXX_PRIVATE read_copy_line();
-
-  friend class internal::gate::connection_stream_to;
-  void PQXX_PRIVATE write_copy_line(std::string_view);
-  void PQXX_PRIVATE end_copy_write();
-
-  friend class internal::gate::connection_largeobject;
-  internal::pq::PGconn *raw_connection() const { return m_conn; }
-
-  friend class internal::gate::connection_notification_receiver;
-  void add_receiver(notification_receiver *);
-  void remove_receiver(notification_receiver *) noexcept;
-
-  friend class internal::gate::connection_pipeline;
-  void PQXX_PRIVATE start_exec(char const query[]);
-  bool PQXX_PRIVATE consume_input() noexcept;
-  bool PQXX_PRIVATE is_busy() const noexcept;
-  internal::pq::PGresult *get_result();
-
-  friend class internal::gate::connection_dbtransaction;
-  friend class internal::gate::connection_sql_cursor;
-
-  result exec_params(std::string_view query, internal::c_params const &args);
-
-  /// Connection handle.
-  internal::pq::PGconn *m_conn = nullptr;
-
-  /// Active transaction on connection, if any.
-  /** We don't use this for anything, except to check for open transactions
-   * when we close the connection or start a new transaction.
-   *
-   * We also don't allow move construction or move assignment while there's a
-   * transaction, since moving the connection in that case would leave one or
-   * more pointers back from the transaction to the connection dangling.
-   */
-  transaction_base const *m_trans = nullptr;
-
-  std::list<errorhandler *> m_errorhandlers;
-
-  using receiver_list =
-    std::multimap<std::string, pqxx::notification_receiver *>;
-  /// Notification receivers.
-  receiver_list m_receivers;
-
-  /// Unique number to use as suffix for identifiers (see adorn_name()).
-  int m_unique_id = 0;
-};
-
-
-/// @deprecated Old base class for connection.  They are now the same class.
-using connection_base = connection;
-
-
-/// An ongoing, non-blocking stepping stone to a connection.
-/** Use this when you want to create a connection to the database, but without
- * blocking your whole thread.   It is only available on systems that have
- * the `<fcntl.h>` header, and Windows.
- *
- * Connecting in this way is probably not "faster" (it's more complicated and
- * has some extra overhead), but in some situations you can use it to make your
- * application as a whole faster.  It all depends on having other useful work
- * to do in the same thread, and being able to wait on a socket.  If you have
- * other I/O going on at the same time, your event loop can wait for both the
- * libpqxx socket and your own sockets, and wake up whenever any of them is
- * ready to do work.
- *
- * Connecting in this way is not properly "asynchronous;" it's merely
- * "nonblocking."  This means it's not a super-high-performance mechanism like
- * you might get with e.g. `io_uring`.  In particular, if we need to look up
- * the database hostname in DNS, that will happen synchronously.
- *
- * To use this, create the `connecting` object, passing a connection string.
- * Then loop: If @ref wait_to_read returns true, wait for the socket to have
- * incoming data on it.  If @ref wait_to_write returns true, wait for the
- * socket to be ready for writing.  Then call @ref process to process any
- * incoming or outgoing data.  Do all of this until @ref done returns true (or
- * there is an exception).  Finally, call @ref produce to get the completed
- * connection.
- *
- * For example:
- *
- * ```cxx
- *     pqxx::connecting cg{};
- *
- *     // Loop until we're done connecting.
- *     while (!cg.done())
- *     {
- *         wait_for_fd(cg.sock(), cg.wait_to_read(), cg.wait_to_write());
- *         cg.process();
- *     }
- *
- *     pqxx::connection conn = std::move(cg).produce();
- *
- *     // At this point, conn is a working connection.  You can no longer use
- *     // cg at all.
- * ```
- */
-class PQXX_LIBEXPORT connecting
-{
-public:
-  /// Start connecting.
-  connecting(zview connection_string = ""_zv);
-
-  connecting(connecting const &) = delete;
-  connecting(connecting &&) = default;
-  connecting &operator=(connecting const &) = delete;
-  connecting &operator=(connecting &&) = default;
-
-  /// Get the socket.  The socket may change during the connection process.
-  [[nodiscard]] int sock() const &noexcept { return m_conn.sock(); }
-
-  /// Should we currently wait to be able to _read_ from the socket?
-  [[nodiscard]] constexpr bool wait_to_read() const &noexcept
-  {
-    return m_reading;
-  }
-
-  /// Should we currently wait to be able to _write_ to the socket?
-  [[nodiscard]] constexpr bool wait_to_write() const &noexcept
-  {
-    return m_writing;
-  }
-
-  /// Progress towards completion (but don't block).
-  void process() &;
-
-  /// Is our connection finished?
-  [[nodiscard]] constexpr bool done() const &noexcept
-  {
-    return not m_reading and not m_writing;
-  }
-
-  /// Produce the completed connection object.
-  /** Use this only once, after @ref done returned `true`.  Once you have
-   * called this, the `connecting` instance has no more use or meaning.  You
-   * can't call any of its member functions afterwards.
-   *
-   * This member function is rvalue-qualified, meaning that you can only call
-   * it on an rvalue instance of the class.  If what you have is not an rvalue,
-   * turn it into one by wrapping it in `std::move()`.
-   */
-  [[nodiscard]] connection produce() &&;
-
-private:
-  connection m_conn;
-  bool m_reading{false};
-  bool m_writing{true};
-};
-
-
-template<typename T> inline std::string connection::quote(T const &t) const
-{
-  if constexpr (nullness<T>::always_null)
-  {
-    return "NULL";
-  }
-  else
-  {
-    if (is_null(t))
-      return "NULL";
-    auto const text{to_string(t)};
-
-    // Okay, there's an easy way to do this and there's a hard way.  The easy
-    // way was "quote, esc(to_string(t)), quote".  I'm going with the hard way
-    // because it's going to save some string manipulation that will probably
-    // incur some unnecessary memory allocations and deallocations.
-    std::string buf{'\''};
-    buf.resize(2 + 2 * std::size(text) + 1);
-    auto const content_bytes{esc_to_buf(text, buf.data() + 1)};
-    auto const closing_quote{1 + content_bytes};
-    buf[closing_quote] = '\'';
-    auto const end{closing_quote + 1};
-    buf.resize(end);
-    return buf;
-  }
-}
-
-
-template<PQXX_CHAR_STRINGS_ARG STRINGS>
-inline std::string connection::quote_columns(STRINGS const &columns) const
-{
-  return separated_list(
-    ","sv, std::cbegin(columns), std::cend(columns),
-    [this](auto col) { return this->quote_name(*col); });
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<internal::ZKey_ZValues MAPPING>
-inline connection::connection(MAPPING const &params)
-{
-  check_version();
-
-  std::vector<char const *> keys, values;
-  if constexpr (std::ranges::sized_range<MAPPING>)
-  {
-    auto const size{std::ranges::size(params) + 1};
-    keys.reserve(size);
-    values.reserve(size);
-  }
-  for (auto const &[key, value] : params)
-  {
-    keys.push_back(internal::as_c_string(key));
-    values.push_back(internal::as_c_string(value));
-  }
-  keys.push_back(nullptr);
-  values.push_back(nullptr);
-  init(std::data(keys), std::data(values));
-}
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/cursor b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/cursor
deleted file mode 100644
index e20b3a4fa..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/cursor
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Definition of the iterator/container-style cursor classes.
- *
- * C++-style wrappers for SQL cursors
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/cursor.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/cursor.hxx
deleted file mode 100644
index b392e2407..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/cursor.hxx
+++ /dev/null
@@ -1,483 +0,0 @@
-/* Definition of the iterator/container-style cursor classes.
- *
- * C++-style wrappers for SQL cursors.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/cursor instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_CURSOR
-#define PQXX_H_CURSOR
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <limits>
-#include <stdexcept>
-
-#include "pqxx/result.hxx"
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-/// Common definitions for cursor types
-/** In C++ terms, fetches are always done in pre-increment or pre-decrement
- * fashion--i.e. the result does not include the row the cursor is on at the
- * beginning of the fetch, and the cursor ends up being positioned on the last
- * row in the result.
- *
- * There are singular positions akin to `end()` at both the beginning and the
- * end of the cursor's range of movement, although these fit in so naturally
- * with the semantics that one rarely notices them.  The cursor begins at the
- * first of these, but any fetch in the forward direction will move the cursor
- * off this position and onto the first row before returning anything.
- */
-class PQXX_LIBEXPORT cursor_base
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-  /// Cursor access-pattern policy
-  /** Allowing a cursor to move forward only can result in better performance,
-   * so use this access policy whenever possible.
-   */
-  enum access_policy
-  {
-    /// Cursor can move forward only
-    forward_only,
-    /// Cursor can move back and forth
-    random_access
-  };
-
-  /// Cursor update policy
-  /**
-   * @warning Not all PostgreSQL versions support updatable cursors.
-   */
-  enum update_policy
-  {
-    /// Cursor can be used to read data but not to write
-    read_only,
-    /// Cursor can be used to update data as well as read it
-    update
-  };
-
-  /// Cursor destruction policy
-  /** The normal thing to do is to make a cursor object the owner of the SQL
-   * cursor it represents.  There may be cases, however, where a cursor needs
-   * to persist beyond the end of the current transaction (and thus also beyond
-   * the lifetime of the cursor object that created it!), where it can be
-   * "adopted" into a new cursor object.  See the basic_cursor documentation
-   * for an explanation of cursor adoption.
-   *
-   * If a cursor is created with "loose" ownership policy, the object
-   * representing the underlying SQL cursor will not take the latter with it
-   * when its own lifetime ends, nor will its originating transaction.
-   *
-   * @warning Use this feature with care and moderation.  Only one cursor
-   * object should be responsible for any one underlying SQL cursor at any
-   * given time.
-   */
-  enum ownership_policy
-  {
-    /// Destroy SQL cursor when cursor object is closed at end of transaction
-    owned,
-    /// Leave SQL cursor in existence after close of object and transaction
-    loose
-  };
-
-  cursor_base() = delete;
-  cursor_base(cursor_base const &) = delete;
-  cursor_base &operator=(cursor_base const &) = delete;
-
-  /**
-   * @name Special movement distances.
-   */
-  //@{
-
-  // TODO: Make constexpr inline (but breaks ABI).
-  /// Special value: read until end.
-  /** @return Maximum value for result::difference_type, so the cursor will
-   * attempt to read the largest possible result set.
-   */
-  [[nodiscard]] static difference_type all() noexcept;
-
-  /// Special value: read one row only.
-  /** @return Unsurprisingly, 1.
-   */
-  [[nodiscard]] static constexpr difference_type next() noexcept { return 1; }
-
-  /// Special value: read backwards, one row only.
-  /** @return Unsurprisingly, -1.
-   */
-  [[nodiscard]] static constexpr difference_type prior() noexcept
-  {
-    return -1;
-  }
-
-  // TODO: Make constexpr inline (but breaks ABI).
-  /// Special value: read backwards from current position back to origin.
-  /** @return Minimum value for result::difference_type.
-   */
-  [[nodiscard]] static difference_type backward_all() noexcept;
-
-  //@}
-
-  /// Name of underlying SQL cursor
-  /**
-   * @returns Name of SQL cursor, which may differ from original given name.
-   * @warning Don't use this to access the SQL cursor directly without going
-   * through the provided wrapper classes!
-   */
-  [[nodiscard]] constexpr std::string const &name() const noexcept
-  {
-    return m_name;
-  }
-
-protected:
-  cursor_base(connection &, std::string_view Name, bool embellish_name = true);
-
-  std::string const m_name;
-};
-} // namespace pqxx
-
-
-#include <pqxx/internal/sql_cursor.hxx>
-
-
-namespace pqxx
-{
-/// "Stateless cursor" class: easy API for retrieving parts of result sets
-/** This is a front-end for SQL cursors, but with a more C++-like API.
- *
- * Actually, stateless_cursor feels entirely different from SQL cursors.  You
- * don't keep track of positions, fetches, and moves; you just say which rows
- * you want.  See the retrieve() member function.
- */
-template<cursor_base::update_policy up, cursor_base::ownership_policy op>
-class stateless_cursor
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-  /// Create cursor.
-  /**
-   * @param tx The transaction within which you want to create the cursor.
-   * @param query The SQL query whose results the cursor should traverse.
-   * @param cname A hint for the cursor's name.  The actual SQL cursor's name
-   *     will be based on this (though not necessarily identical).
-   * @param hold Create a `WITH HOLD` cursor?  Such cursors stay alive after
-   *     the transaction has ended, so you can continue to use it.
-   */
-  stateless_cursor(
-    transaction_base &tx, std::string_view query, std::string_view cname,
-    bool hold) :
-          m_cur{tx, query, cname, cursor_base::random_access, up, op, hold}
-  {}
-
-  /// Adopt an existing scrolling SQL cursor.
-  /** This lets you define a cursor yourself, and then wrap it in a
-   * libpqxx-managed `stateless_cursor` object.
-   *
-   * @param tx The transaction within which you want to manage the cursor.
-   * @param adopted_cursor Your cursor's SQL name.
-   */
-  stateless_cursor(transaction_base &tx, std::string_view adopted_cursor) :
-          m_cur{tx, adopted_cursor, op}
-  {
-    // Put cursor in known position
-    m_cur.move(cursor_base::backward_all());
-  }
-
-  /// Close this cursor.
-  /** The destructor will do this for you automatically.
-   *
-   * Closing a cursor is idempotent.  Closing a cursor that's already closed
-   * does nothing.
-   */
-  void close() noexcept { m_cur.close(); }
-
-  /// Number of rows in cursor's result set
-  /** @note This function is not const; it may need to scroll to find the size
-   * of the result set.
-   */
-  [[nodiscard]] size_type size()
-  {
-    return internal::obtain_stateless_cursor_size(m_cur);
-  }
-
-  /// Retrieve rows from begin_pos (inclusive) to end_pos (exclusive)
-  /** Rows are numbered starting from 0 to size()-1.
-   *
-   * @param begin_pos First row to retrieve.  May be one row beyond the end of
-   * the result set, to avoid errors for empty result sets.  Otherwise, must be
-   * a valid row number in the result set.
-   * @param end_pos Row up to which to fetch.  Rows are returned ordered from
-   * begin_pos to end_pos, i.e. in ascending order if begin_pos < end_pos but
-   * in descending order if begin_pos > end_pos.  The end_pos may be
-   * arbitrarily inside or outside the result set; only existing rows are
-   * included in the result.
-   */
-  result retrieve(difference_type begin_pos, difference_type end_pos)
-  {
-    return internal::stateless_cursor_retrieve(
-      m_cur, result::difference_type(size()), begin_pos, end_pos);
-  }
-
-  /// Return this cursor's name.
-  [[nodiscard]] constexpr std::string const &name() const noexcept
-  {
-    return m_cur.name();
-  }
-
-private:
-  internal::sql_cursor m_cur;
-};
-
-
-class icursor_iterator;
-} // namespace pqxx
-
-
-namespace pqxx::internal::gate
-{
-class icursor_iterator_icursorstream;
-class icursorstream_icursor_iterator;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Simple read-only cursor represented as a stream of results
-/** SQL cursors can be tricky, especially in C++ since the two languages seem
- * to have been designed on different planets.  An SQL cursor has two singular
- * positions akin to `end()` on either side of the underlying result set.
- *
- * These cultural differences are hidden from view somewhat by libpqxx, which
- * tries to make SQL cursors behave more like familiar C++ entities such as
- * iterators, sequences, streams, and containers.
- *
- * Data is fetched from the cursor as a sequence of result objects.  Each of
- * these will contain the number of rows defined as the stream's stride, except
- * of course the last block of data which may contain fewer rows.
- *
- * This class can create or adopt cursors that live outside any backend
- * transaction, which your backend version may not support.
- */
-class PQXX_LIBEXPORT icursorstream
-{
-public:
-  using size_type = cursor_base::size_type;
-  using difference_type = cursor_base::difference_type;
-
-  /// Set up a read-only, forward-only cursor.
-  /** Roughly equivalent to a C++ Standard Library istream, this cursor type
-   * supports only two operations: reading a block of rows while moving
-   * forward, and moving forward without reading any data.
-   *
-   * @param context Transaction context in which this cursor will be active.
-   * @param query SQL query whose results this cursor shall iterate.
-   * @param basename Suggested name for the SQL cursor; the library will append
-   * a unique code to ensure its uniqueness.
-   * @param sstride Number of rows to fetch per read operation; must be a
-   * positive number.
-   */
-  icursorstream(
-    transaction_base &context, std::string_view query,
-    std::string_view basename, difference_type sstride = 1);
-
-  /// Adopt existing SQL cursor.  Use with care.
-  /** Forms a cursor stream around an existing SQL cursor, as returned by e.g.
-   * a server-side function.  The SQL cursor will be cleaned up by the stream's
-   * destructor as if it had been created by the stream; cleaning it up by hand
-   * or adopting the same cursor twice is an error.
-   *
-   * Passing the name of the cursor as a string is not allowed, both to avoid
-   * confusion with the other constructor and to discourage unnecessary use of
-   * adopted cursors.
-   *
-   * @warning It is technically possible to adopt a "WITH HOLD" cursor, i.e. a
-   * cursor that stays alive outside its creating transaction.  However, any
-   * cursor stream (including the underlying SQL cursor, naturally) must be
-   * destroyed before its transaction context object is destroyed.  Therefore
-   * the only way to use SQL's WITH HOLD feature is to adopt the cursor, but
-   * defer doing so until after entering the transaction context that will
-   * eventually destroy it.
-   *
-   * @param context Transaction context in which this cursor will be active.
-   * @param cname Result field containing the name of the SQL cursor to adopt.
-   * @param sstride Number of rows to fetch per read operation; must be a
-   * positive number.
-   * @param op Ownership policy.  Determines whether the cursor underlying this
-   * stream will be destroyed when the stream is closed.
-   */
-  icursorstream(
-    transaction_base &context, field const &cname, difference_type sstride = 1,
-    cursor_base::ownership_policy op = cursor_base::owned);
-
-  /// Return `true` if this stream may still return more data.
-  constexpr operator bool() const &noexcept { return not m_done; }
-
-  /// Read new value into given result object; same as operator `>>`.
-  /** The result set may continue any number of rows from zero to the chosen
-   * stride, inclusive.  An empty result will only be returned if there are no
-   * more rows to retrieve.
-   *
-   * @param res Write the retrieved data into this result object.
-   * @return Reference to this very stream, to facilitate "chained" invocations
-   * ("C.get(r1).get(r2);")
-   */
-  icursorstream &get(result &res)
-  {
-    res = fetchblock();
-    return *this;
-  }
-  /// Read new value into given result object; same as `get(result&)`.
-  /** The result set may continue any number of rows from zero to the chosen
-   * stride, inclusive.  An empty result will only be returned if there are no
-   * more rows to retrieve.
-   *
-   * @param res Write the retrieved data into this result object.
-   * @return Reference to this very stream, to facilitate "chained" invocations
-   * ("C >> r1 >> r2;")
-   */
-  icursorstream &operator>>(result &res) { return get(res); }
-
-  /// Move given number of rows forward without reading data.
-  /** Ignores any stride that you may have set.  It moves by a given number of
-   * rows, not a number of strides.
-   *
-   * @return Reference to this stream itself, to facilitate "chained"
-   * invocations.
-   */
-  icursorstream &ignore(std::streamsize n = 1) &;
-
-  /// Change stride, i.e. the number of rows to fetch per read operation.
-  /**
-   * @param stride Must be a positive number.
-   */
-  void set_stride(difference_type stride) &;
-  [[nodiscard]] constexpr difference_type stride() const noexcept
-  {
-    return m_stride;
-  }
-
-private:
-  result fetchblock();
-
-  friend class internal::gate::icursorstream_icursor_iterator;
-  size_type forward(size_type n = 1);
-  void insert_iterator(icursor_iterator *) noexcept;
-  void remove_iterator(icursor_iterator *) const noexcept;
-
-  void service_iterators(difference_type);
-
-  internal::sql_cursor m_cur;
-
-  difference_type m_stride;
-  difference_type m_realpos, m_reqpos;
-
-  mutable icursor_iterator *m_iterators;
-
-  bool m_done;
-};
-
-
-/// Approximate istream_iterator for icursorstream.
-/** Intended as an implementation of an input_iterator (as defined by the C++
- * Standard Library), this class supports only two basic operations: reading
- * the current element, and moving forward.  In addition to the minimal
- * guarantees for istream_iterators, this class supports multiple successive
- * reads of the same position (the current result set is cached in the
- * iterator) even after copying and even after new data have been read from the
- * stream.  This appears to be a requirement for input_iterators.  Comparisons
- * are also supported in the general case.
- *
- * The iterator does not care about its own position, however.  Moving an
- * iterator forward moves the underlying stream forward and reads the data from
- * the new stream position, regardless of the iterator's old position in the
- * stream.
- *
- * The stream's stride defines the granularity for all iterator movement or
- * access operations, i.e. "ici += 1" advances the stream by one stride's worth
- * of rows, and "*ici++" reads one stride's worth of rows from the stream.
- *
- * @warning Do not read from the underlying stream or its cursor, move its read
- * position, or change its stride, between the time the first icursor_iterator
- * on it is created and the time its last icursor_iterator is destroyed.
- *
- * @warning Manipulating these iterators within the context of a single cursor
- * stream is <em>not thread-safe</em>.  Creating a new iterator, copying one,
- * or destroying one affects the stream as a whole.
- */
-class PQXX_LIBEXPORT icursor_iterator
-{
-public:
-  using iterator_category = std::input_iterator_tag;
-  using value_type = result;
-  using pointer = result const *;
-  using reference = result const &;
-  using istream_type = icursorstream;
-  using size_type = istream_type::size_type;
-  using difference_type = istream_type::difference_type;
-
-  icursor_iterator() noexcept;
-  explicit icursor_iterator(istream_type &) noexcept;
-  icursor_iterator(icursor_iterator const &) noexcept;
-  ~icursor_iterator() noexcept;
-
-  result const &operator*() const
-  {
-    refresh();
-    return m_here;
-  }
-  result const *operator->() const
-  {
-    refresh();
-    return &m_here;
-  }
-  icursor_iterator &operator++();
-  icursor_iterator operator++(int);
-  icursor_iterator &operator+=(difference_type);
-  icursor_iterator &operator=(icursor_iterator const &) noexcept;
-
-  [[nodiscard]] bool operator==(icursor_iterator const &rhs) const;
-  [[nodiscard]] bool operator!=(icursor_iterator const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  [[nodiscard]] bool operator<(icursor_iterator const &rhs) const;
-  [[nodiscard]] bool operator>(icursor_iterator const &rhs) const
-  {
-    return rhs < *this;
-  }
-  [[nodiscard]] bool operator<=(icursor_iterator const &rhs) const
-  {
-    return not(*this > rhs);
-  }
-  [[nodiscard]] bool operator>=(icursor_iterator const &rhs) const
-  {
-    return not(*this < rhs);
-  }
-
-private:
-  void refresh() const;
-
-  friend class internal::gate::icursor_iterator_icursorstream;
-  difference_type pos() const noexcept { return m_pos; }
-  void fill(result const &);
-
-  icursorstream *m_stream{nullptr};
-  result m_here;
-  difference_type m_pos;
-  icursor_iterator *m_prev{nullptr}, *m_next{nullptr};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/dbtransaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/dbtransaction
deleted file mode 100644
index fa8d26476..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/dbtransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::dbtransaction abstract base class.
- *
- * pqxx::dbransaction defines a real transaction on the database.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/dbtransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/dbtransaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/dbtransaction.hxx
deleted file mode 100644
index d85cb170f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/dbtransaction.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Definition of the pqxx::dbtransaction abstract base class.
- *
- * pqxx::dbransaction defines a real transaction on the database.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/dbtransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_DBTRANSACTION
-#define PQXX_H_DBTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/transaction_base.hxx"
-
-namespace pqxx
-{
-/// Abstract transaction base class: bracket transactions on the database.
-/**
- * @ingroup transactions
- *
- * Use a dbtransaction-derived object such as "work" (transaction<>) to enclose
- * operations on a database in a single "unit of work."  This ensures that the
- * whole series of operations either succeeds as a whole or fails completely.
- * In no case will it leave half-finished work behind in the database.
- *
- * Once processing on a transaction has succeeded and any changes should be
- * allowed to become permanent in the database, call commit().  If something
- * has gone wrong and the changes should be forgotten, call abort() instead.
- * If you do neither, an implicit abort() is executed at destruction time.
- *
- * It is an error to abort a transaction that has already been committed, or to
- * commit a transaction that has already been aborted.  Aborting an already
- * aborted transaction or committing an already committed one is allowed, to
- * make error handling easier.  Repeated aborts or commits have no effect after
- * the first one.
- *
- * Database transactions are not suitable for guarding long-running processes.
- * If your transaction code becomes too long or too complex, consider ways to
- * break it up into smaller ones.  Unfortunately there is no universal recipe
- * for this.
- *
- * The actual operations for committing/aborting the backend transaction are
- * implemented by a derived class.  The implementing concrete class must also
- * call @ref close from its destructor.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE dbtransaction : public transaction_base
-{
-protected:
-  /// Begin transaction.
-  explicit dbtransaction(connection &c) : transaction_base{c} {}
-  /// Begin transaction.
-  dbtransaction(connection &c, std::string_view tname) :
-          transaction_base{c, tname}
-  {}
-  /// Begin transaction.
-  dbtransaction(
-    connection &c, std::string_view tname,
-    std::shared_ptr<std::string> rollback_cmd) :
-          transaction_base{c, tname, rollback_cmd}
-  {}
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/errorhandler b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/errorhandler
deleted file mode 100644
index ea572ee79..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/errorhandler
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::errorhandler class.
- *
- * Callbacks for handling errors and warnings.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/errorhandler.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/errorhandler.hxx
deleted file mode 100644
index 2ffb5703c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/errorhandler.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Definition of the pqxx::errorhandler class.
- *
- * pqxx::errorhandler handlers errors and warnings in a database session.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/errorhandler instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ERRORHANDLER
-#define PQXX_H_ERRORHANDLER
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx::internal::gate
-{
-class errorhandler_connection;
-}
-
-
-namespace pqxx
-{
-/**
- * @addtogroup errorhandler
- */
-//@{
-
-/// Base class for error-handler callbacks.
-/** To receive errors and warnings from a connection, subclass this with your
- * own error-handler functor, and instantiate it for the connection. Destroying
- * the handler un-registers it.
- *
- * A connection can have multiple error handlers at the same time.  When the
- * database connection emits an error or warning message, it passes the message
- * to each error handler, starting with the most recently registered one and
- * progressing towards the oldest one.  However an error handler may also
- * instruct the connection not to pass the message to further handlers by
- * returning "false."
- *
- * @warning Strange things happen when a result object outlives its parent
- * connection.  If you register an error handler on a connection, then you must
- * not access the result after destroying the connection.  This applies even if
- * you destroy the error handler first!
- */
-class PQXX_LIBEXPORT errorhandler
-{
-public:
-  explicit errorhandler(connection &);
-  virtual ~errorhandler();
-
-  /// Define in subclass: receive an error or warning message from the
-  /// database.
-  /**
-   * @return Whether the same error message should also be passed to the
-   * remaining, older errorhandlers.
-   */
-  virtual bool operator()(char const msg[]) noexcept = 0;
-
-  errorhandler() = delete;
-  errorhandler(errorhandler const &) = delete;
-  errorhandler &operator=(errorhandler const &) = delete;
-
-private:
-  connection *m_home;
-
-  friend class internal::gate::errorhandler_connection;
-  void unregister() noexcept;
-};
-
-
-/// An error handler that suppresses any previously registered error handlers.
-class quiet_errorhandler : public errorhandler
-{
-public:
-  /// Suppress error notices.
-  quiet_errorhandler(connection &conn) : errorhandler{conn} {}
-
-  /// Revert to previous handling of error notices.
-  virtual bool operator()(char const[]) noexcept override { return false; }
-};
-
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/except b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/except
deleted file mode 100644
index e5dd508bf..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/except
+++ /dev/null
@@ -1,8 +0,0 @@
-/** libpqxx exception classes.
- *
- * pqxx::sql_error, pqxx::broken_connection, pqxx::in_doubt_error, ...
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/except.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/except.hxx
deleted file mode 100644
index 24f959437..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/except.hxx
+++ /dev/null
@@ -1,447 +0,0 @@
-/* Definition of libpqxx exception classes.
- *
- * pqxx::sql_error, pqxx::broken_connection, pqxx::in_doubt_error, ...
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/except instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_EXCEPT
-#define PQXX_H_EXCEPT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <stdexcept>
-#include <string>
-
-
-namespace pqxx
-{
-/**
- * @addtogroup exception Exception classes
- *
- * These exception classes follow, roughly, the two-level hierarchy defined by
- * the PostgreSQL SQLSTATE error codes (see Appendix A of the PostgreSQL
- * documentation corresponding to your server version).  This is not a complete
- * mapping though.  There are other differences as well, e.g. the error code
- * for `statement_completion_unknown` has a separate status in libpqxx as
- * @ref in_doubt_error, and `too_many_connections` is classified as a
- * `broken_connection` rather than a subtype of `insufficient_resources`.
- *
- * @see http://www.postgresql.org/docs/9.4/interactive/errcodes-appendix.html
- *
- * @{
- */
-
-/// Run-time failure encountered by libpqxx, similar to std::runtime_error.
-struct PQXX_LIBEXPORT failure : std::runtime_error
-{
-  explicit failure(std::string const &);
-};
-
-
-/// Exception class for lost or failed backend connection.
-/**
- * @warning When this happens on Unix-like systems, you may also get a SIGPIPE
- * signal.  That signal aborts the program by default, so if you wish to be
- * able to continue after a connection breaks, be sure to disarm this signal.
- *
- * If you're working on a Unix-like system, see the manual page for
- * `signal` (2) on how to deal with SIGPIPE.  The easiest way to make this
- * signal harmless is to make your program ignore it:
- *
- * ```cxx
- * #include <signal.h>
- *
- * int main()
- * {
- *   signal(SIGPIPE, SIG_IGN);
- *   // ...
- * ```
- */
-struct PQXX_LIBEXPORT broken_connection : failure
-{
-  broken_connection();
-  explicit broken_connection(std::string const &);
-};
-
-
-/// The caller attempted to set a variable to null, which is not allowed.
-struct PQXX_LIBEXPORT variable_set_to_null : failure
-{
-  variable_set_to_null();
-  explicit variable_set_to_null(std::string const &);
-};
-
-
-/// Exception class for failed queries.
-/** Carries, in addition to a regular error message, a copy of the failed query
- * and (if available) the SQLSTATE value accompanying the error.
- */
-class PQXX_LIBEXPORT sql_error : public failure
-{
-  /// Query string.  Empty if unknown.
-  std::string const m_query;
-  /// SQLSTATE string describing the error type, if known; or empty string.
-  std::string const m_sqlstate;
-
-public:
-  explicit sql_error(
-    std::string const &whatarg = "", std::string const &Q = "",
-    char const sqlstate[] = nullptr);
-  virtual ~sql_error() noexcept override;
-
-  /// The query whose execution triggered the exception
-  [[nodiscard]] PQXX_PURE std::string const &query() const noexcept;
-
-  /// SQLSTATE error code if known, or empty string otherwise.
-  [[nodiscard]] PQXX_PURE std::string const &sqlstate() const noexcept;
-};
-
-
-/// "Help, I don't know whether transaction was committed successfully!"
-/** Exception that might be thrown in rare cases where the connection to the
- * database is lost while finishing a database transaction, and there's no way
- * of telling whether it was actually executed by the backend.  In this case
- * the database is left in an indeterminate (but consistent) state, and only
- * manual inspection will tell which is the case.
- */
-struct PQXX_LIBEXPORT in_doubt_error : failure
-{
-  explicit in_doubt_error(std::string const &);
-};
-
-
-/// The backend saw itself forced to roll back the ongoing transaction.
-struct PQXX_LIBEXPORT transaction_rollback : sql_error
-{
-  explicit transaction_rollback(
-    std::string const &whatarg, std::string const &q = "",
-    char const sqlstate[] = nullptr);
-};
-
-
-/// Transaction failed to serialize.  Please retry it.
-/** Can only happen at transaction isolation levels REPEATABLE READ and
- * SERIALIZABLE.
- *
- * The current transaction cannot be committed without violating the guarantees
- * made by its isolation level.  This is the effect of a conflict with another
- * ongoing transaction.  The transaction may still succeed if you try to
- * perform it again.
- */
-struct PQXX_LIBEXPORT serialization_failure : transaction_rollback
-{
-  explicit serialization_failure(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// We can't tell whether our last statement succeeded.
-struct PQXX_LIBEXPORT statement_completion_unknown : transaction_rollback
-{
-  explicit statement_completion_unknown(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// The ongoing transaction has deadlocked.  Retrying it may help.
-struct PQXX_LIBEXPORT deadlock_detected : transaction_rollback
-{
-  explicit deadlock_detected(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// Internal error in libpqxx library
-struct PQXX_LIBEXPORT internal_error : std::logic_error
-{
-  explicit internal_error(std::string const &);
-};
-
-
-/// Error in usage of libpqxx library, similar to std::logic_error
-struct PQXX_LIBEXPORT usage_error : std::logic_error
-{
-  explicit usage_error(std::string const &);
-};
-
-
-/// Invalid argument passed to libpqxx, similar to std::invalid_argument
-struct PQXX_LIBEXPORT argument_error : std::invalid_argument
-{
-  explicit argument_error(std::string const &);
-};
-
-
-/// Value conversion failed, e.g. when converting "Hello" to int.
-struct PQXX_LIBEXPORT conversion_error : std::domain_error
-{
-  explicit conversion_error(std::string const &);
-};
-
-
-/// Could not convert value to string: not enough buffer space.
-struct PQXX_LIBEXPORT conversion_overrun : conversion_error
-{
-  explicit conversion_overrun(std::string const &);
-};
-
-
-/// Something is out of range, similar to std::out_of_range
-struct PQXX_LIBEXPORT range_error : std::out_of_range
-{
-  explicit range_error(std::string const &);
-};
-
-
-/// Query returned an unexpected number of rows.
-struct PQXX_LIBEXPORT unexpected_rows : public range_error
-{
-  explicit unexpected_rows(std::string const &msg) : range_error{msg} {}
-};
-
-
-/// Database feature not supported in current setup.
-struct PQXX_LIBEXPORT feature_not_supported : sql_error
-{
-  explicit feature_not_supported(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Error in data provided to SQL statement.
-struct PQXX_LIBEXPORT data_exception : sql_error
-{
-  explicit data_exception(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT integrity_constraint_violation : sql_error
-{
-  explicit integrity_constraint_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT restrict_violation : integrity_constraint_violation
-{
-  explicit restrict_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT not_null_violation : integrity_constraint_violation
-{
-  explicit not_null_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT foreign_key_violation : integrity_constraint_violation
-{
-  explicit foreign_key_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT unique_violation : integrity_constraint_violation
-{
-  explicit unique_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT check_violation : integrity_constraint_violation
-{
-  explicit check_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_cursor_state : sql_error
-{
-  explicit invalid_cursor_state(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_sql_statement_name : sql_error
-{
-  explicit invalid_sql_statement_name(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_cursor_name : sql_error
-{
-  explicit invalid_cursor_name(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT syntax_error : sql_error
-{
-  /// Approximate position in string where error occurred, or -1 if unknown.
-  int const error_position;
-
-  explicit syntax_error(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr, int pos = -1) :
-          sql_error{err, Q, sqlstate}, error_position{pos}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_column : syntax_error
-{
-  explicit undefined_column(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_function : syntax_error
-{
-  explicit undefined_function(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_table : syntax_error
-{
-  explicit undefined_table(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT insufficient_privilege : sql_error
-{
-  explicit insufficient_privilege(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Resource shortage on the server
-struct PQXX_LIBEXPORT insufficient_resources : sql_error
-{
-  explicit insufficient_resources(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT disk_full : insufficient_resources
-{
-  explicit disk_full(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          insufficient_resources{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT out_of_memory : insufficient_resources
-{
-  explicit out_of_memory(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          insufficient_resources{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT too_many_connections : broken_connection
-{
-  explicit too_many_connections(std::string const &err) :
-          broken_connection{err}
-  {}
-};
-
-/// PL/pgSQL error
-/** Exceptions derived from this class are errors from PL/pgSQL procedures.
- */
-struct PQXX_LIBEXPORT plpgsql_error : sql_error
-{
-  explicit plpgsql_error(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Exception raised in PL/pgSQL procedure
-struct PQXX_LIBEXPORT plpgsql_raise : plpgsql_error
-{
-  explicit plpgsql_raise(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT plpgsql_no_data_found : plpgsql_error
-{
-  explicit plpgsql_no_data_found(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT plpgsql_too_many_rows : plpgsql_error
-{
-  explicit plpgsql_too_many_rows(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT blob_already_exists : failure
-{
-  explicit blob_already_exists(std::string const &);
-};
-
-/**
- * @}
- */
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/field b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/field
deleted file mode 100644
index 37cb69e84..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/field
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::field class.
- *
- * pqxx::field refers to a field in a query result.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/field.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/field.hxx
deleted file mode 100644
index b8b869fe4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/field.hxx
+++ /dev/null
@@ -1,542 +0,0 @@
-/* Definitions for the pqxx::field class.
- *
- * pqxx::field refers to a field in a query result.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/field instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_FIELD
-#define PQXX_H_FIELD
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <optional>
-
-#include "pqxx/array.hxx"
-#include "pqxx/composite.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/types.hxx"
-
-namespace pqxx
-{
-/// Reference to a field in a result set.
-/** A field represents one entry in a row.  It represents an actual value
- * in the result set, and can be converted to various types.
- */
-class PQXX_LIBEXPORT field
-{
-public:
-  using size_type = field_size_type;
-
-  /// Constructor.  Do not call this yourself; libpqxx will do it for you.
-  /** Create field as reference to a field in a result set.
-   * @param r Row that this field is part of.
-   * @param c Column number of this field.
-   */
-  [[deprecated(
-    "Do not construct fields yourself.  Get them from the row.")]] field(row const &r, row_size_type c) noexcept;
-
-  /// Constructor.  Do not call this yourself; libpqxx will do it for you.
-  [[deprecated(
-    "Do not construct fields yourself.  Get them from the "
-    "row.")]] field() noexcept = default;
-
-  /**
-   * @name Comparison
-   */
-  //@{
-  // TODO: noexcept.  Breaks ABI.
-  /// Byte-by-byte comparison of two fields (all nulls are considered equal)
-  /** @warning null handling is still open to discussion and change!
-   *
-   * Handling of null values differs from that in SQL where a comparison
-   * involving a null value yields null, so nulls are never considered equal
-   * to one another or even to themselves.
-   *
-   * Null handling also probably differs from the closest equivalent in C++,
-   * which is the NaN (Not-a-Number) value, a singularity comparable to
-   * SQL's null.  This is because the builtin == operator demands that a == a.
-   *
-   * The usefulness of this operator is questionable.  No interpretation
-   * whatsoever is imposed on the data; 0 and 0.0 are considered different,
-   * as are null vs. the empty string, or even different (but possibly
-   * equivalent and equally valid) encodings of the same Unicode character
-   * etc.
-   */
-  [[nodiscard]] PQXX_PURE bool operator==(field const &) const;
-
-  /// Byte-by-byte comparison (all nulls are considered equal)
-  /** @warning See operator==() for important information about this operator
-   */
-  [[nodiscard]] PQXX_PURE bool operator!=(field const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Column name.
-  [[nodiscard]] PQXX_PURE char const *name() const &;
-
-  /// Column type.
-  [[nodiscard]] oid PQXX_PURE type() const;
-
-  /// What table did this column come from?
-  [[nodiscard]] PQXX_PURE oid table() const;
-
-  /// Return row number.  The first row is row 0, the second is row 1, etc.
-  PQXX_PURE constexpr row_size_type num() const noexcept { return col(); }
-
-  /// What column number in its originating table did this column come from?
-  [[nodiscard]] PQXX_PURE row_size_type table_column() const;
-  //@}
-
-  /**
-   * @name Content access
-   */
-  //@{
-  /// Read as `string_view`, or an empty one if null.
-  /** The result only remains usable while the data for the underlying
-   * @ref result exists.  Once all `result` objects referring to that data have
-   * been destroyed, the `string_view` will no longer point to valid memory.
-   */
-  [[nodiscard]] PQXX_PURE std::string_view view() const &
-  {
-    return std::string_view(c_str(), size());
-  }
-
-  /// Read as plain C string.
-  /** Since the field's data is stored internally in the form of a
-   * zero-terminated C string, this is the fastest way to read it.  Use the
-   * to() or as() functions to convert the string to other types such as
-   * `int`, or to C++ strings.
-   *
-   * Do not use this for BYTEA values, or other binary values.  To read those,
-   * convert the value to your desired type using `to()` or `as()`.  For
-   * example: `f.as<std::basic_string<std::byte>>()`.
-   */
-  [[nodiscard]] PQXX_PURE char const *c_str() const &;
-
-  /// Is this field's value null?
-  [[nodiscard]] PQXX_PURE bool is_null() const noexcept;
-
-  /// Return number of bytes taken up by the field's value.
-  [[nodiscard]] PQXX_PURE size_type size() const noexcept;
-
-  /// Read value into obj; or if null, leave obj untouched and return `false`.
-  /** This can be used with optional types (except pointers other than C-style
-   * strings).
-   */
-  template<typename T>
-  auto to(T &obj) const -> typename std::enable_if_t<
-    (not std::is_pointer<T>::value or std::is_same<T, char const *>::value),
-    bool>
-  {
-    if (is_null())
-    {
-      return false;
-    }
-    else
-    {
-      auto const bytes{c_str()};
-      from_string(bytes, obj);
-      return true;
-    }
-  }
-
-  /// Read field as a composite value, write its components into `fields`.
-  /** @warning This is still experimental.  It may change or be replaced.
-   *
-   * Returns whether the field was null.  If it was, it will not touch the
-   * values in `fields`.
-   */
-  template<typename... T> bool composite_to(T &...fields) const
-  {
-    if (is_null())
-    {
-      return false;
-    }
-    else
-    {
-      parse_composite(m_home.m_encoding, view(), fields...);
-      return true;
-    }
-  }
-
-  /// Read value into obj; or leave obj untouched and return `false` if null.
-  template<typename T> bool operator>>(T &obj) const { return to(obj); }
-
-  /// Read value into obj; or if null, use default value and return `false`.
-  /** This can be used with `std::optional`, as well as with standard smart
-   * pointer types, but not with raw pointers.  If the conversion from a
-   * PostgreSQL string representation allocates a pointer (e.g. using `new`),
-   * then the object's later deallocation should be baked in as well, right
-   * from the point where the object is created.  So if you want a pointer, use
-   * a smart pointer, not a raw pointer.
-   *
-   * There is one exception, of course: C-style strings.  Those are just
-   * pointers to the field's internal text data.
-   */
-  template<typename T>
-  auto to(T &obj, T const &default_value) const -> typename std::enable_if_t<
-    (not std::is_pointer<T>::value or std::is_same<T, char const *>::value),
-    bool>
-  {
-    bool const null{is_null()};
-    if (null)
-      obj = default_value;
-    else
-      obj = from_string<T>(this->view());
-    return not null;
-  }
-
-  /// Return value as object of given type, or default value if null.
-  /** Note that unless the function is instantiated with an explicit template
-   * argument, the Default value's type also determines the result type.
-   */
-  template<typename T> T as(T const &default_value) const
-  {
-    if (is_null())
-      return default_value;
-    else
-      return from_string<T>(this->view());
-  }
-
-  /// Return value as object of given type, or throw exception if null.
-  /** Use as `as<std::optional<int>>()` or `as<my_untemplated_optional_t>()` as
-   * an alternative to `get<int>()`; this is disabled for use with raw pointers
-   * (other than C-strings) because storage for the value can't safely be
-   * allocated here
-   */
-  template<typename T> T as() const
-  {
-    if (is_null())
-    {
-      if constexpr (not nullness<T>::has_null)
-        internal::throw_null_conversion(type_name<T>);
-      else
-        return nullness<T>::null();
-    }
-    else
-    {
-      return from_string<T>(this->view());
-    }
-  }
-
-  /// Return value wrapped in some optional type (empty for nulls).
-  /** Use as `get<int>()` as before to obtain previous behavior, or specify
-   * container type with `get<int, std::optional>()`
-   */
-  template<typename T, template<typename> class O = std::optional>
-  constexpr O<T> get() const
-  {
-    return as<O<T>>();
-  }
-
-  // TODO: constexpr noexcept, once array_parser constructor gets those.
-  /// Parse the field as an SQL array.
-  /** Call the parser to retrieve values (and structure) from the array.
-   *
-   * Make sure the @ref result object stays alive until parsing is finished. If
-   * you keep the @ref row of `field` object alive, it will keep the @ref
-   * result object alive as well.
-   */
-  array_parser as_array() const &
-  {
-    return array_parser{c_str(), m_home.m_encoding};
-  }
-  //@}
-
-
-protected:
-  constexpr result const &home() const noexcept { return m_home; }
-  constexpr result::size_type idx() const noexcept { return m_row; }
-  constexpr row_size_type col() const noexcept { return m_col; }
-
-  // TODO: Create gates.
-  friend class pqxx::result;
-  friend class pqxx::row;
-  field(
-    result const &r, result_size_type row_num, row_size_type col_num) noexcept
-          :
-          m_col{col_num}, m_home{r}, m_row{row_num}
-  {}
-
-  /**
-   * You'd expect this to be unsigned, but due to the way reverse iterators
-   * are related to regular iterators, it must be allowed to underflow to -1.
-   */
-  row_size_type m_col;
-
-private:
-  result m_home;
-  result::size_type m_row;
-};
-
-
-template<> inline bool field::to<std::string>(std::string &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = std::string{view()};
-  return not null;
-}
-
-
-template<>
-inline bool field::to<std::string>(
-  std::string &obj, std::string const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = std::string{view()};
-  return not null;
-}
-
-
-/// Specialization: `to(char const *&)`.
-/** The buffer has the same lifetime as the data in this result (i.e. of this
- * result object, or the last remaining one copied from it etc.), so take care
- * not to use it after the last result object referring to this query result is
- * destroyed.
- */
-template<> inline bool field::to<char const *>(char const *&obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = c_str();
-  return not null;
-}
-
-
-template<> inline bool field::to<std::string_view>(std::string_view &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = view();
-  return not null;
-}
-
-
-template<>
-inline bool field::to<std::string_view>(
-  std::string_view &obj, std::string_view const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = view();
-  return not null;
-}
-
-
-template<> inline std::string_view field::as<std::string_view>() const
-{
-  if (is_null())
-    PQXX_UNLIKELY
-  internal::throw_null_conversion(type_name<std::string_view>);
-  return view();
-}
-
-
-template<>
-inline std::string_view
-field::as<std::string_view>(std::string_view const &default_value) const
-{
-  return is_null() ? default_value : view();
-}
-
-
-template<> inline bool field::to<zview>(zview &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = zview{c_str(), size()};
-  return not null;
-}
-
-
-template<>
-inline bool field::to<zview>(zview &obj, zview const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = zview{c_str(), size()};
-  return not null;
-}
-
-
-template<> inline zview field::as<zview>() const
-{
-  if (is_null())
-    PQXX_UNLIKELY
-  internal::throw_null_conversion(type_name<zview>);
-  return zview{c_str(), size()};
-}
-
-
-template<> inline zview field::as<zview>(zview const &default_value) const
-{
-  return is_null() ? default_value : zview{c_str(), size()};
-}
-
-
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class field_streambuf : public std::basic_streambuf<CHAR, TRAITS>
-{
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-  using openmode = std::ios::openmode;
-  using seekdir = std::ios::seekdir;
-
-  explicit field_streambuf(field const &f) : m_field{f} { initialize(); }
-
-protected:
-  virtual int sync() override { return traits_type::eof(); }
-
-  virtual pos_type seekoff(off_type, seekdir, openmode) override
-  {
-    return traits_type::eof();
-  }
-  virtual pos_type seekpos(pos_type, openmode) override
-  {
-    return traits_type::eof();
-  }
-  virtual int_type overflow(int_type) override { return traits_type::eof(); }
-  virtual int_type underflow() override { return traits_type::eof(); }
-
-private:
-  field const &m_field;
-
-  int_type initialize()
-  {
-    auto g{static_cast<char_type *>(const_cast<char *>(m_field.c_str()))};
-    this->setg(g, g, g + std::size(m_field));
-    return int_type(std::size(m_field));
-  }
-};
-
-
-/// Input stream that gets its data from a result field
-/** Use this class exactly as you would any other istream to read data from a
- * field.  All formatting and streaming operations of `std::istream` are
- * supported.  What you'll typically want to use, however, is the fieldstream
- * alias (which defines a @ref basic_fieldstream for `char`).  This is similar
- * to how e.g. `std::ifstream` relates to `std::basic_ifstream`.
- *
- * This class has only been tested for the char type (and its default traits).
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_fieldstream : public std::basic_istream<CHAR, TRAITS>
-{
-  using super = std::basic_istream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-  basic_fieldstream(field const &f) : super{nullptr}, m_buf{f}
-  {
-    super::init(&m_buf);
-  }
-
-private:
-  field_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using fieldstream = basic_fieldstream<char>;
-
-/// Write a result field to any type of stream
-/** This can be convenient when writing a field to an output stream.  More
- * importantly, it lets you write a field to e.g. a `stringstream` which you
- * can then use to read, format and convert the field in ways that to() does
- * not support.
- *
- * Example: parse a field into a variable of the nonstandard
- * "<tt>long long</tt>" type.
- *
- * ```cxx
- * extern result R;
- * long long L;
- * stringstream S;
- *
- * // Write field's string into S
- * S << R[0][0];
- *
- * // Parse contents of S into L
- * S >> L;
- * ```
- */
-template<typename CHAR>
-inline std::basic_ostream<CHAR> &
-operator<<(std::basic_ostream<CHAR> &s, field const &value)
-{
-  s.write(value.c_str(), std::streamsize(std::size(value)));
-  return s;
-}
-
-
-/// Convert a field's value to type `T`.
-/** Unlike the "regular" `from_string`, this knows how to deal with null
- * values.
- */
-template<typename T> inline T from_string(field const &value)
-{
-  if (value.is_null())
-  {
-    if constexpr (nullness<T>::has_null)
-      return nullness<T>::null();
-    else
-      internal::throw_null_conversion(type_name<T>);
-  }
-  else
-  {
-    return from_string<T>(value.view());
-  }
-}
-
-
-/// Convert a field's value to `nullptr_t`.
-/** Yes, you read that right.  This conversion does nothing useful.  It always
- * returns `nullptr`.
- *
- * Except... what if the field is not null?  In that case, this throws
- * @ref conversion_error.
- */
-template<>
-inline std::nullptr_t from_string<std::nullptr_t>(field const &value)
-{
-  if (not value.is_null())
-    throw conversion_error{
-      "Extracting non-null field into nullptr_t variable."};
-  return nullptr;
-}
-
-
-/// Convert a field to a string.
-template<> PQXX_LIBEXPORT std::string to_string(field const &value);
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/array-composite.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/array-composite.hxx
deleted file mode 100644
index d2b6603e5..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/array-composite.hxx
+++ /dev/null
@@ -1,305 +0,0 @@
-#if !defined(PQXX_ARRAY_COMPOSITE_HXX)
-#  define PQXX_ARRAY_COMPOSITE_HXX
-
-#  include <cassert>
-
-#  include "pqxx/strconv.hxx"
-
-namespace pqxx::internal
-{
-// Find the end of a double-quoted string.
-/** `input[pos]` must be the opening double quote.
- *
- * Returns the offset of the first position after the closing quote.
- */
-inline std::size_t scan_double_quoted_string(
-  char const input[], std::size_t size, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  // XXX: find_char<'"', '\\'>().
-  auto next{scan(input, size, pos)};
-  bool at_quote{false};
-  for (pos = next, next = scan(input, size, pos); pos < size;
-       pos = next, next = scan(input, size, pos))
-  {
-    if (at_quote)
-    {
-      if (next - pos == 1 and input[pos] == '"')
-      {
-        // We just read a pair of double quotes.  Carry on.
-        at_quote = false;
-      }
-      else
-      {
-        // We just read one double quote, and now we're at a character that's
-        // not a second double quote.  Ergo, that last character was the
-        // closing double quote and this is the position right after it.
-        return pos;
-      }
-    }
-    else if (next - pos == 1)
-    {
-      switch (input[pos])
-      {
-      case '\\':
-        // Backslash escape.  Skip ahead by one more character.
-        pos = next;
-        next = scan(input, size, pos);
-        break;
-
-      case '"':
-        // This is either the closing double quote, or the first of a pair of
-        // double quotes.
-        at_quote = true;
-        break;
-      }
-    }
-    else
-    {
-      // Multibyte character.  Carry on.
-    }
-  }
-  if (not at_quote)
-    throw argument_error{
-      "Missing closing double-quote: " + std::string{input}};
-  return pos;
-}
-
-
-/// Un-quote and un-escape a double-quoted SQL string.
-inline std::string parse_double_quoted_string(
-  char const input[], std::size_t end, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  std::string output;
-  // Maximum output size is same as the input size, minus the opening and
-  // closing quotes.  Or in the extreme opposite case, the real number could be
-  // half that.  Usually it'll be a pretty close estimate.
-  output.reserve(std::size_t(end - pos - 2));
-
-  for (auto here{scan(input, end, pos)}, next{scan(input, end, here)};
-       here < end - 1; here = next, next = scan(input, end, here))
-  {
-    // A backslash here is always an escape.  So is a double-quote, since we're
-    // inside the double-quoted string.  In either case, we can just ignore the
-    // escape character and use the next character.  This is the one redeeming
-    // feature of SQL's escaping system.
-    if ((next - here == 1) and (input[here] == '\\' or input[here] == '"'))
-    {
-      // Skip escape.
-      here = next;
-      next = scan(input, end, here);
-    }
-    output.append(input + here, input + next);
-  }
-  return output;
-}
-
-
-/// Find the end of an unquoted string in an array or composite-type value.
-/** Stops when it gets to the end of the input; or when it sees any of the
- * characters in STOP which has not been escaped.
- *
- * For array values, STOP is a comma, a semicolon, or a closing brace.  For
- * a value of a composite type, STOP is a comma or a closing parenthesis.
- */
-template<char... STOP>
-inline std::size_t scan_unquoted_string(
-  char const input[], std::size_t size, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  bool at_backslash{false};
-  auto next{scan(input, size, pos)};
-  while ((pos < size) and
-         ((next - pos) > 1 or at_backslash or ((input[pos] != STOP) and ...)))
-  {
-    pos = next;
-    next = scan(input, size, pos);
-    at_backslash =
-      ((not at_backslash) and ((next - pos) == 1) and (input[pos] == '\\'));
-  }
-  return pos;
-}
-
-
-/// Parse an unquoted array entry or cfield of a composite-type field.
-inline std::string parse_unquoted_string(
-  char const input[], std::size_t end, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  std::string output;
-  bool at_backslash{false};
-  output.reserve(end - pos);
-  for (auto next{scan(input, end, pos)}; pos < end;
-       pos = next, next = scan(input, end, pos))
-  {
-    at_backslash =
-      ((not at_backslash) and ((next - pos) == 1) and (input[pos] == '\\'));
-    if (not at_backslash)
-      output.append(input + pos, next - pos);
-  }
-  return output;
-}
-
-
-/// Parse a field of a composite-type value.
-/** `T` is the C++ type of the field we're parsing, and `index` is its
- * zero-based number.
- *
- * Strip off the leading parenthesis or bracket yourself before parsing.
- * However, this function will parse the lcosing parenthesis or bracket.
- *
- * After a successful parse, `pos` will point at `std::end(text)`.
- *
- * For the purposes of parsing, ranges and arrays count as compositve values,
- * so this function supports parsing those.  If you specifically need a closing
- * parenthesis, check afterwards that `text` did not end in a bracket instead.
- *
- * @param index Index of the current field, zero-based.  It will increment for
- *     the next field.
- * @param input Full input text for the entire composite-type value.
- * @param pos Starting position (in `input`) of the field that we're parsing.
- *     After parsing, this will point at the beginning of the next field if
- *     there is one, or one position past the last character otherwise.
- * @param field Destination for the parsed value.
- * @param scan Glyph scanning function for the relevant encoding type.
- * @param last_field Number of the last field in the value (zero-based).  When
- *     parsing the last field, this will equal `index`.
- */
-template<typename T>
-inline void parse_composite_field(
-  std::size_t &index, std::string_view input, std::size_t &pos, T &field,
-  glyph_scanner_func *scan, std::size_t last_field)
-{
-  assert(index <= last_field);
-  auto next{scan(std::data(input), std::size(input), pos)};
-  if ((next - pos) != 1)
-    throw conversion_error{"Non-ASCII character in composite-type syntax."};
-
-  // Expect a field.
-  switch (input[pos])
-  {
-  case ',':
-  case ')':
-  case ']':
-    // The field is empty, i.e, null.
-    if constexpr (nullness<T>::has_null)
-      field = nullness<T>::null();
-    else
-      throw conversion_error{
-        "Can't read composite field " + to_string(index) + ": C++ type " +
-        type_name<T> + " does not support nulls."};
-    break;
-
-  case '"': {
-    auto const stop{scan_double_quoted_string(
-      std::data(input), std::size(input), pos, scan)};
-    auto const text{
-      parse_double_quoted_string(std::data(input), stop, pos, scan)};
-    field = from_string<T>(text);
-    pos = stop;
-  }
-  break;
-
-  default: {
-    auto const stop{scan_unquoted_string<',', ')', ']'>(
-      std::data(input), std::size(input), pos, scan)};
-    auto const text{parse_unquoted_string(std::data(input), stop, pos, scan)};
-    field = from_string<T>(text);
-    pos = stop;
-  }
-  break;
-  }
-
-  // Expect a comma or a closing parenthesis.
-  next = scan(std::data(input), std::size(input), pos);
-
-  if ((next - pos) != 1)
-    throw conversion_error{
-      "Unexpected non-ASCII character after composite field: " +
-      std::string{input}};
-
-  if (index < last_field)
-  {
-    if (input[pos] != ',')
-      throw conversion_error{
-        "Found '" + std::string{input[pos]} +
-        "' in composite value where comma was expected: " + std::data(input)};
-  }
-  else
-  {
-    if (input[pos] == ',')
-      throw conversion_error{
-        "Composite value contained more fields than the expected " +
-        to_string(last_field) + ": " + std::data(input)};
-    if (input[pos] != ')' and input[pos] != ']')
-      throw conversion_error{
-        "Composite value has unexpected characters where closing parenthesis "
-        "was expected: " +
-        std::string{input}};
-    if (next != std::size(input))
-      throw conversion_error{
-        "Composite value has unexpected text after closing parenthesis: " +
-        std::string{input}};
-  }
-
-  pos = next;
-  ++index;
-}
-
-
-/// Conservatively estimate buffer size needed for a composite field.
-template<typename T>
-inline std::size_t size_composite_field_buffer(T const &field)
-{
-  if constexpr (is_unquoted_safe<T>)
-  {
-    // Safe to copy, without quotes or escaping.  Drop the terminating zero.
-    return size_buffer(field) - 1;
-  }
-  else
-  {
-    // + Opening quote.
-    // + Field budget.
-    // - Terminating zero.
-    // + Escaping for each byte in the field's string representation.
-    // - Escaping for terminating zero.
-    // + Closing quote.
-    return 1 + 2 * (size_buffer(field) - 1) + 1;
-  }
-}
-
-
-template<typename T>
-inline void write_composite_field(char *&pos, char *end, T const &field)
-{
-  if constexpr (is_unquoted_safe<T>)
-  {
-    // No need for quoting or escaping.  Convert it straight into its final
-    // place in the buffer, and "backspace" the trailing zero.
-    pos = string_traits<T>::into_buf(pos, end, field) - 1;
-  }
-  else
-  {
-    // The field may need escaping, which means we need an intermediate buffer.
-    // To avoid allocating that at run time, we use the end of the buffer that
-    // we have.
-    auto const budget{size_buffer(field)};
-    *pos++ = '"';
-
-    // Now escape buf into its final position.
-    for (char const c : string_traits<T>::to_buf(end - budget, end, field))
-    {
-      if ((c == '"') or (c == '\\'))
-        *pos++ = '\\';
-
-      *pos++ = c;
-    }
-
-    *pos++ = '"';
-  }
-
-  *pos++ = ',';
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/callgate.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/callgate.hxx
deleted file mode 100644
index 42f7703e3..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/callgate.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef PQXX_H_CALLGATE
-#define PQXX_H_CALLGATE
-
-/*
-Here's what a typical gate class definition looks like:
-
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE @gateclass@ : callgate<@host@>
-{
-  friend class @client@;
-
-  @gateclass@(reference x) : super(x) {}
-
-  // Methods here.  Use home() to access the host-class object.
-};
-} // namespace pqxx::internal::gate
-*/
-
-namespace pqxx::internal
-{
-/// Base class for call gates.
-/**
- * A call gate defines a limited, private interface on the host class that
- * specified client classes can access.
- *
- * The metaphor works as follows: the gate stands in front of a "home," which
- * is really a class, and only lets specific friends in.
- *
- * To implement a call gate that gives client C access to host H,
- * * derive a gate class from callgate<H>;
- * * make the gate class a friend of H;
- * * make C a friend of the gate class; and
- * * implement "stuff C can do with H" as private members in the gate class.
- *
- * This special kind of "gated" friendship gives C private access to H, but
- * only through an expressly limited interface.  The gate class can access its
- * host object as home().
- *
- * Keep gate classes entirely stateless.  They should be ultra-lightweight
- * wrappers for their host classes, and be optimized away as much as possible
- * by the compiler.  Once you start adding state, you're on a slippery slope
- * away from the pure, clean, limited interface pattern that gate classes are
- * meant to implement.
- *
- * Ideally, all member functions of the gate class should be one-liners passing
- * calls straight on to the host class.  It can be useful however to break this
- * rule temporarily during inter-class refactoring.
- */
-template<typename HOME> class PQXX_PRIVATE callgate
-{
-protected:
-  /// This class, to keep constructors easy.
-  using super = callgate<HOME>;
-  /// A reference to the host class.  Helps keep constructors easy.
-  using reference = HOME &;
-
-  callgate(reference x) : m_home(x) {}
-
-  /// The home object.  The gate class has full "private" access.
-  reference home() const noexcept { return m_home; }
-
-private:
-  reference m_home;
-};
-} // namespace pqxx::internal
-
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/concat.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/concat.hxx
deleted file mode 100644
index cd28bde7c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/concat.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#if !defined(PQXX_CONCAT_HXX)
-#  define PQXX_CONCAT_HXX
-
-#  include <string>
-#  include <string_view>
-
-#  include "pqxx/strconv.hxx"
-
-namespace pqxx::internal
-{
-/// Convert item to a string, write it into [here, end).
-template<typename TYPE>
-void render_item(TYPE const &item, char *&here, char *end)
-{
-  here = string_traits<TYPE>::into_buf(here, end, item) - 1;
-}
-
-
-// C++20: Support non-random_access_range ranges.
-/// Efficiently combine a bunch of items into one big string.
-/** Use this as an optimised version of string concatentation.  It takes just
- * about any type; it will represent each item as a string according to its
- * @ref string_traits.
- *
- * This is a simpler, more specialised version of @ref separated_list for a
- * statically known series of items, possibly of different types.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::string concat(TYPE... item)
-{
-  std::string buf;
-  // Size to accommodate string representations of all inputs, minus their
-  // terminating zero bytes.
-  buf.resize(size_buffer(item...));
-
-  char *const data{buf.data()};
-  char *here = data;
-  char *end = data + std::size(buf);
-  (render_item(item, here, end), ...);
-
-  buf.resize(static_cast<std::size_t>(here - data));
-  return buf;
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/conversions.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/conversions.hxx
deleted file mode 100644
index 1df4fdead..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/conversions.hxx
+++ /dev/null
@@ -1,1188 +0,0 @@
-#include <array>
-#include <cstring>
-#include <map>
-#include <memory>
-#include <numeric>
-#include <optional>
-
-#if defined(PQXX_HAVE_SPAN) && __has_include(<span>)
-#  include <span>
-#endif
-
-#include <type_traits>
-#include <variant>
-#include <vector>
-
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-
-
-/* Internal helpers for string conversion, and conversion implementations.
- *
- * Do not include this header directly.  The libpqxx headers do it for you.
- */
-namespace pqxx::internal
-{
-/// Convert a number in [0, 9] to its ASCII digit.
-inline constexpr char number_to_digit(int i) noexcept
-{
-  return static_cast<char>(i + '0');
-}
-
-
-/// Compute numeric value of given textual digit (assuming that it is a digit).
-constexpr int digit_to_number(char c) noexcept
-{
-  return c - '0';
-}
-
-
-/// Summarize buffer overrun.
-/** Don't worry about the exact parameter types: the sizes will be reasonably
- * small, and nonnegative.
- */
-std::string PQXX_LIBEXPORT
-state_buffer_overrun(int have_bytes, int need_bytes);
-
-
-template<typename HAVE, typename NEED>
-inline std::string state_buffer_overrun(HAVE have_bytes, NEED need_bytes)
-{
-  return state_buffer_overrun(
-    static_cast<int>(have_bytes), static_cast<int>(need_bytes));
-}
-
-
-/// Throw exception for attempt to convert null to given type.
-[[noreturn]] PQXX_LIBEXPORT void
-throw_null_conversion(std::string const &type);
-
-
-/// Deliberately nonfunctional conversion traits for `char` types.
-/** There are no string conversions for `char` and its signed and unsigned
- * variants.  Such a conversion would be dangerously ambiguous: should we treat
- * it as text, or as a small integer?  It'd be an open invitation for bugs.
- *
- * But the error message when you get this wrong is very cryptic.  So, we
- * derive dummy @ref string_traits implementations from this dummy type, and
- * ensure that the compiler disallows their use.  The compiler error message
- * will at least contain a hint of the root of the problem.
- */
-template<typename CHAR_TYPE> struct disallowed_ambiguous_char_conversion
-{
-  static char *into_buf(char *, char *, CHAR_TYPE) = delete;
-  static constexpr zview
-  to_buf(char *, char *, CHAR_TYPE const &) noexcept = delete;
-
-  static constexpr std::size_t
-  size_buffer(CHAR_TYPE const &) noexcept = delete;
-  static CHAR_TYPE from_string(std::string_view) = delete;
-};
-
-
-template<typename T> PQXX_LIBEXPORT extern std::string to_string_float(T);
-
-
-/// Generic implementation for into_buf, on top of to_buf.
-template<typename T>
-inline char *generic_into_buf(char *begin, char *end, T const &value)
-{
-  zview const text{string_traits<T>::to_buf(begin, end, value)};
-  auto const space{end - begin};
-  // Include the trailing zero.
-  auto const len = std::size(text) + 1;
-  if (internal::cmp_greater(len, space))
-    throw conversion_overrun{
-      "Not enough buffer space to insert " + type_name<T> + ".  " +
-      state_buffer_overrun(space, len)};
-  std::memmove(begin, text.data(), len);
-  return begin + len;
-}
-
-
-/// String traits for builtin integral types (though not bool).
-template<typename T> struct integral_traits
-{
-  static PQXX_LIBEXPORT T from_string(std::string_view text);
-  static PQXX_LIBEXPORT zview to_buf(char *begin, char *end, T const &value);
-  static PQXX_LIBEXPORT char *into_buf(char *begin, char *end, T const &value);
-
-  static constexpr std::size_t size_buffer(T const &) noexcept
-  {
-    /** Includes a sign if needed; the number of base-10 digits which the type
-     * can reliably represent; the one extra base-10 digit which the type can
-     * only partially represent; and the terminating zero.
-     */
-    return std::is_signed_v<T> + std::numeric_limits<T>::digits10 + 1 + 1;
-  }
-};
-
-
-/// String traits for builtin floating-point types.
-template<typename T> struct float_traits
-{
-  static PQXX_LIBEXPORT T from_string(std::string_view text);
-  static PQXX_LIBEXPORT zview to_buf(char *begin, char *end, T const &value);
-  static PQXX_LIBEXPORT char *into_buf(char *begin, char *end, T const &value);
-
-  // Return a nonnegative integral value's number of decimal digits.
-  static constexpr std::size_t digits10(std::size_t value) noexcept
-  {
-    if (value < 10)
-      return 1;
-    else
-      return 1 + digits10(value / 10);
-  }
-
-  static constexpr std::size_t size_buffer(T const &) noexcept
-  {
-    using lims = std::numeric_limits<T>;
-    // See #328 for a detailed discussion on the maximum number of digits.
-    //
-    // In a nutshell: for the big cases, the scientific notation is always
-    // the shortest one, and therefore the one that to_chars will pick.
-    //
-    // So... How long can the scientific notation get?  1 (for sign) + 1 (for
-    // decimal point) + 1 (for 'e') + 1 (for exponent sign) + max_digits10 +
-    // max number of digits in the exponent + 1 (terminating zero).
-    //
-    // What's the max number of digits in the exponent?  It's the max number of
-    // digits out of the most negative exponent and the most positive one.
-    //
-    // The longest positive exponent is easy: 1 + ceil(log10(max_exponent10)).
-    // (The extra 1 is because 10^n takes up 1 + n digits, not n.)
-    //
-    // The longest negative exponent is a bit harder: min_exponent10 gives us
-    // the smallest power of 10 which a normalised version of T can represent.
-    // But the smallest denormalised power of 10 that T can represent is
-    // another max_digits10 powers of 10 below that.
-    // needs a minus sign.
-    //
-    // All this stuff messes with my head a bit because it's on the order of
-    // log10(log10(n)).  It's easy to get the number of logs wrong.
-    auto const max_pos_exp{digits10(lims::max_exponent10)};
-    // Really want std::abs(lims::min_exponent10), but MSVC 2017 apparently has
-    // problems with std::abs.  So we use -lims::min_exponent10 instead.
-    auto const max_neg_exp{
-      digits10(lims::max_digits10 - lims::min_exponent10)};
-    return 1 +                                    // Sign.
-           1 +                                    // Decimal point.
-           std::numeric_limits<T>::max_digits10 + // Mantissa digits.
-           1 +                                    // Exponent "e".
-           1 +                                    // Exponent sign.
-           // Spell this weirdly to stop Windows compilers from reading this as
-           // a call to their "max" macro when NOMINMAX is not defined.
-           (std::max)(max_pos_exp, max_neg_exp) + // Exponent digits.
-           1;                                     // Terminating zero.
-  }
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// The built-in arithmetic types do not have inherent null values.
-template<typename T>
-struct nullness<T, std::enable_if_t<std::is_arithmetic_v<T>>> : no_null<T>
-{};
-
-
-template<> struct string_traits<short> : internal::integral_traits<short>
-{};
-template<> inline constexpr bool is_unquoted_safe<short>{true};
-template<>
-struct string_traits<unsigned short>
-        : internal::integral_traits<unsigned short>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned short>{true};
-template<> struct string_traits<int> : internal::integral_traits<int>
-{};
-template<> inline constexpr bool is_unquoted_safe<int>{true};
-template<> struct string_traits<unsigned> : internal::integral_traits<unsigned>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned>{true};
-template<> struct string_traits<long> : internal::integral_traits<long>
-{};
-template<> inline constexpr bool is_unquoted_safe<long>{true};
-template<>
-struct string_traits<unsigned long> : internal::integral_traits<unsigned long>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned long>{true};
-template<>
-struct string_traits<long long> : internal::integral_traits<long long>
-{};
-template<> inline constexpr bool is_unquoted_safe<long long>{true};
-template<>
-struct string_traits<unsigned long long>
-        : internal::integral_traits<unsigned long long>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned long long>{true};
-template<> struct string_traits<float> : internal::float_traits<float>
-{};
-template<> inline constexpr bool is_unquoted_safe<float>{true};
-template<> struct string_traits<double> : internal::float_traits<double>
-{};
-template<> inline constexpr bool is_unquoted_safe<double>{true};
-template<>
-struct string_traits<long double> : internal::float_traits<long double>
-{};
-template<> inline constexpr bool is_unquoted_safe<long double>{true};
-
-
-template<> struct string_traits<bool>
-{
-  static PQXX_LIBEXPORT bool from_string(std::string_view text);
-
-  static constexpr zview to_buf(char *, char *, bool const &value) noexcept
-  {
-    return value ? "true"_zv : "false"_zv;
-  }
-
-  static char *into_buf(char *begin, char *end, bool const &value)
-  {
-    return pqxx::internal::generic_into_buf(begin, end, value);
-  }
-
-  static constexpr std::size_t size_buffer(bool const &) noexcept { return 6; }
-};
-
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<char>
-        : internal::disallowed_ambiguous_char_conversion<char>
-{};
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<signed char>
-        : internal::disallowed_ambiguous_char_conversion<signed char>
-{};
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<unsigned char>
-        : internal::disallowed_ambiguous_char_conversion<unsigned char>
-{};
-
-
-template<> inline constexpr bool is_unquoted_safe<bool>{true};
-
-
-template<typename T> struct nullness<std::optional<T>>
-{
-  static constexpr bool has_null = true;
-  /// Technically, you could have an optional of an always-null type.
-  static constexpr bool always_null = nullness<T>::always_null;
-  static constexpr bool is_null(std::optional<T> const &v) noexcept
-  {
-    return ((not v.has_value()) or pqxx::is_null(*v));
-  }
-  static constexpr std::optional<T> null() { return {}; }
-};
-
-
-template<typename T>
-inline constexpr format param_format(std::optional<T> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T> struct string_traits<std::optional<T>>
-{
-  static char *into_buf(char *begin, char *end, std::optional<T> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-
-  static zview to_buf(char *begin, char *end, std::optional<T> const &value)
-  {
-    if (value.has_value())
-      return string_traits<T>::to_buf(begin, end, *value);
-    else
-      return {};
-  }
-
-  static std::optional<T> from_string(std::string_view text)
-  {
-    return std::optional<T>{
-      std::in_place, string_traits<T>::from_string(text)};
-  }
-
-  static std::size_t size_buffer(std::optional<T> const &value) noexcept
-  {
-    return pqxx::size_buffer(value.value());
-  }
-};
-
-
-template<typename T>
-inline constexpr bool is_unquoted_safe<std::optional<T>>{is_unquoted_safe<T>};
-
-
-template<typename... T> struct nullness<std::variant<T...>>
-{
-  static constexpr bool has_null = (nullness<T>::has_null or ...);
-  static constexpr bool always_null = (nullness<T>::always_null and ...);
-  static constexpr bool is_null(std::variant<T...> const &value) noexcept
-  {
-    return std::visit(
-      [](auto const &i) noexcept {
-        return nullness<strip_t<decltype(i)>>::is_null(i);
-      },
-      value);
-  }
-
-  // We don't support `null()` for `std::variant`.
-  /** It would be technically possible to have a `null` in the case where just
-   * one of the types has a null, but it gets complicated and arbitrary.
-   */
-  static constexpr std::variant<T...> null() = delete;
-};
-
-
-template<typename... T> struct string_traits<std::variant<T...>>
-{
-  static char *
-  into_buf(char *begin, char *end, std::variant<T...> const &value)
-  {
-    return std::visit(
-      [begin, end](auto const &i) {
-        return string_traits<strip_t<decltype(i)>>::into_buf(begin, end, i);
-      },
-      value);
-  }
-  static zview to_buf(char *begin, char *end, std::variant<T...> const &value)
-  {
-    return std::visit(
-      [begin, end](auto const &i) {
-        return string_traits<strip_t<decltype(i)>>::to_buf(begin, end, i);
-      },
-      value);
-  }
-  static std::size_t size_buffer(std::variant<T...> const &value) noexcept
-  {
-    return std::visit(
-      [](auto const &i) noexcept { return pqxx::size_buffer(i); }, value);
-  }
-
-  /** There's no from_string for std::variant.  We could have one with a rule
-   * like "pick the first type which fits the value," but we'd have to look
-   * into how natural that API feels to users.
-   */
-  static std::variant<T...> from_string(std::string_view) = delete;
-};
-
-
-template<typename... Args>
-inline constexpr format param_format(std::variant<Args...> const &value)
-{
-  return std::visit([](auto &v) { return param_format(v); }, value);
-}
-
-
-template<typename... T>
-inline constexpr bool is_unquoted_safe<std::variant<T...>>{
-  (is_unquoted_safe<T> and ...)};
-
-
-template<typename T> inline T from_string(std::stringstream const &text)
-{
-  return from_string<T>(text.str());
-}
-
-
-template<> struct string_traits<std::nullptr_t>
-{
-  static char *into_buf(char *, char *, std::nullptr_t) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::nullptr_t const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::nullptr_t = nullptr) noexcept
-  {
-    return 0;
-  }
-  static std::nullptr_t from_string(std::string_view) = delete;
-};
-
-
-template<> struct string_traits<std::nullopt_t>
-{
-  static char *into_buf(char *, char *, std::nullopt_t) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::nullopt_t const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::nullopt_t) noexcept
-  {
-    return 0;
-  }
-  static std::nullopt_t from_string(std::string_view) = delete;
-};
-
-
-template<> struct string_traits<std::monostate>
-{
-  static char *into_buf(char *, char *, std::monostate) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::monostate const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::monostate) noexcept
-  {
-    return 0;
-  }
-  static std::monostate from_string(std::string_view) = delete;
-};
-
-
-template<> inline constexpr bool is_unquoted_safe<std::nullptr_t>{true};
-
-
-template<> struct nullness<char const *>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(char const *t) noexcept
-  {
-    return t == nullptr;
-  }
-  static constexpr char const *null() noexcept { return nullptr; }
-};
-
-
-/// String traits for C-style string ("pointer to char const").
-template<> struct string_traits<char const *>
-{
-  static char const *from_string(std::string_view text) { return text.data(); }
-
-  static zview to_buf(char *begin, char *end, char const *const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, char const *const &value)
-  {
-    auto const space{end - begin};
-    // Count the trailing zero, even though std::strlen() and friends don't.
-    auto const len{std::strlen(value) + 1};
-    if (space < ptrdiff_t(len))
-      throw conversion_overrun{
-        "Could not copy string: buffer too small.  " +
-        pqxx::internal::state_buffer_overrun(space, len)};
-    std::memmove(begin, value, len);
-    return begin + len;
-  }
-
-  static std::size_t size_buffer(char const *const &value) noexcept
-  {
-    return std::strlen(value) + 1;
-  }
-};
-
-
-template<> struct nullness<char *>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(char const *t) noexcept
-  {
-    return t == nullptr;
-  }
-  static constexpr char const *null() { return nullptr; }
-};
-
-
-/// String traits for non-const C-style string ("pointer to char").
-template<> struct string_traits<char *>
-{
-  static char *into_buf(char *begin, char *end, char *const &value)
-  {
-    return string_traits<char const *>::into_buf(begin, end, value);
-  }
-  static zview to_buf(char *begin, char *end, char *const &value)
-  {
-    return string_traits<char const *>::to_buf(begin, end, value);
-  }
-  static std::size_t size_buffer(char *const &value) noexcept
-  {
-    return string_traits<char const *>::size_buffer(value);
-  }
-
-  /// Don't allow conversion to this type since it breaks const-safety.
-  static char *from_string(std::string_view) = delete;
-};
-
-
-template<std::size_t N> struct nullness<char[N]> : no_null<char[N]>
-{};
-
-
-/// String traits for C-style string constant ("array of char").
-/** @warning This assumes that every array-of-char is a C-style string literal.
- * So, it must include a trailing zero. and it must have static duration.
- */
-template<std::size_t N> struct string_traits<char[N]>
-{
-  static constexpr zview
-  to_buf(char *, char *, char const (&value)[N]) noexcept
-  {
-    return zview{value, N - 1};
-  }
-
-  static char *into_buf(char *begin, char *end, char const (&value)[N])
-  {
-    if (internal::cmp_less(end - begin, size_buffer(value)))
-      throw conversion_overrun{
-        "Could not convert char[] to string: too long for buffer."};
-    std::memcpy(begin, value, N);
-    return begin + N;
-  }
-  static constexpr std::size_t size_buffer(char const (&)[N]) noexcept
-  {
-    return N;
-  }
-
-  /// Don't allow conversion to this type.
-  static void from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<std::string> : no_null<std::string>
-{};
-
-
-template<> struct string_traits<std::string>
-{
-  static std::string from_string(std::string_view text)
-  {
-    return std::string{text};
-  }
-
-  static char *into_buf(char *begin, char *end, std::string const &value)
-  {
-    if (internal::cmp_greater_equal(std::size(value), end - begin))
-      throw conversion_overrun{
-        "Could not convert string to string: too long for buffer."};
-    // Include the trailing zero.
-    value.copy(begin, std::size(value));
-    begin[std::size(value)] = '\0';
-    return begin + std::size(value) + 1;
-  }
-
-  static zview to_buf(char *begin, char *end, std::string const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static std::size_t size_buffer(std::string const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-};
-
-
-/// There's no real null for `std::string_view`.
-/** I'm not sure how clear-cut this is: a `string_view` may have a null
- * data pointer, which is analogous to a null `char` pointer.
- */
-template<> struct nullness<std::string_view> : no_null<std::string_view>
-{};
-
-
-/// String traits for `string_view`.
-template<> struct string_traits<std::string_view>
-{
-  static constexpr std::size_t
-  size_buffer(std::string_view const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-
-  static char *into_buf(char *begin, char *end, std::string_view const &value)
-  {
-    if (internal::cmp_greater_equal(std::size(value), end - begin))
-      throw conversion_overrun{
-        "Could not store string_view: too long for buffer."};
-    value.copy(begin, std::size(value));
-    begin[std::size(value)] = '\0';
-    return begin + std::size(value) + 1;
-  }
-
-  /// Don't convert to this type; it has nowhere to store its contents.
-  static std::string_view from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<zview> : no_null<zview>
-{};
-
-
-/// String traits for `zview`.
-template<> struct string_traits<zview>
-{
-  static constexpr std::size_t
-  size_buffer(std::string_view const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-
-  static char *into_buf(char *begin, char *end, zview const &value)
-  {
-    auto const size{std::size(value)};
-    if (internal::cmp_less_equal(end - begin, std::size(value)))
-      throw conversion_overrun{"Not enough buffer space to store this zview."};
-    value.copy(begin, size);
-    begin[size] = '\0';
-    return begin + size + 1;
-  }
-
-  static std::string_view to_buf(char *begin, char *end, zview const &value)
-  {
-    return {into_buf(begin, end, value), std::size(value)};
-  }
-
-  /// Don't convert to this type; it has nowhere to store its contents.
-  static zview from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<std::stringstream> : no_null<std::stringstream>
-{};
-
-
-template<> struct string_traits<std::stringstream>
-{
-  static std::size_t size_buffer(std::stringstream const &) = delete;
-
-  static std::stringstream from_string(std::string_view text)
-  {
-    std::stringstream stream;
-    stream.write(text.data(), std::streamsize(std::size(text)));
-    return stream;
-  }
-
-  static char *into_buf(char *, char *, std::stringstream const &) = delete;
-  static std::string_view
-  to_buf(char *, char *, std::stringstream const &) = delete;
-};
-
-
-template<> struct nullness<std::nullptr_t>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::nullptr_t const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::nullptr_t null() noexcept { return nullptr; }
-};
-
-
-template<> struct nullness<std::nullopt_t>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::nullopt_t const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::nullopt_t null() noexcept { return std::nullopt; }
-};
-
-
-template<> struct nullness<std::monostate>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::monostate const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::monostate null() noexcept { return {}; }
-};
-
-
-template<typename T> struct nullness<std::unique_ptr<T>>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(std::unique_ptr<T> const &t) noexcept
-  {
-    return not t or pqxx::is_null(*t);
-  }
-  static constexpr std::unique_ptr<T> null() { return {}; }
-};
-
-
-template<typename T, typename... Args>
-struct string_traits<std::unique_ptr<T, Args...>>
-{
-  static std::unique_ptr<T> from_string(std::string_view text)
-  {
-    return std::make_unique<T>(string_traits<T>::from_string(text));
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::unique_ptr<T, Args...> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-
-  static zview
-  to_buf(char *begin, char *end, std::unique_ptr<T, Args...> const &value)
-  {
-    if (value)
-      return string_traits<T>::to_buf(begin, end, *value);
-    else
-      return {};
-  }
-
-  static std::size_t
-  size_buffer(std::unique_ptr<T, Args...> const &value) noexcept
-  {
-    return pqxx::size_buffer(*value.get());
-  }
-};
-
-
-template<typename T, typename... Args>
-inline format param_format(std::unique_ptr<T, Args...> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T, typename... Args>
-inline constexpr bool is_unquoted_safe<std::unique_ptr<T, Args...>>{
-  is_unquoted_safe<T>};
-
-
-template<typename T> struct nullness<std::shared_ptr<T>>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(std::shared_ptr<T> const &t) noexcept
-  {
-    return not t or pqxx::is_null(*t);
-  }
-  static constexpr std::shared_ptr<T> null() { return {}; }
-};
-
-
-template<typename T> struct string_traits<std::shared_ptr<T>>
-{
-  static std::shared_ptr<T> from_string(std::string_view text)
-  {
-    return std::make_shared<T>(string_traits<T>::from_string(text));
-  }
-
-  static zview to_buf(char *begin, char *end, std::shared_ptr<T> const &value)
-  {
-    return string_traits<T>::to_buf(begin, end, *value);
-  }
-  static char *
-  into_buf(char *begin, char *end, std::shared_ptr<T> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-  static std::size_t size_buffer(std::shared_ptr<T> const &value) noexcept
-  {
-    return pqxx::size_buffer(*value);
-  }
-};
-
-
-template<typename T> format param_format(std::shared_ptr<T> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T>
-inline constexpr bool is_unquoted_safe<std::shared_ptr<T>>{
-  is_unquoted_safe<T>};
-
-
-template<>
-struct nullness<std::basic_string<std::byte>>
-        : no_null<std::basic_string<std::byte>>
-{};
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<binary DATA> struct nullness<DATA> : no_null<DATA>
-{};
-
-
-template<binary DATA> inline constexpr format param_format(DATA const &)
-{
-  return format::binary;
-}
-
-
-template<binary DATA> struct string_traits<DATA>
-{
-  static std::size_t size_buffer(DATA const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(char *begin, char *end, DATA const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, DATA const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  static DATA from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::basic_string<std::byte> buf;
-    buf.resize(size);
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.data()));
-    return buf;
-  }
-};
-#endif // PQXX_HAVE_CONCEPTS
-
-
-template<> struct string_traits<std::basic_string<std::byte>>
-{
-  static std::size_t
-  size_buffer(std::basic_string<std::byte> const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview
-  to_buf(char *begin, char *end, std::basic_string<std::byte> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::basic_string<std::byte> const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  static std::basic_string<std::byte> from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::basic_string<std::byte> buf;
-    buf.resize(size);
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.data()));
-    return buf;
-  }
-};
-
-
-template<>
-inline constexpr format param_format(std::basic_string<std::byte> const &)
-{
-  return format::binary;
-}
-
-
-template<>
-struct nullness<std::basic_string_view<std::byte>>
-        : no_null<std::basic_string_view<std::byte>>
-{};
-
-
-template<> struct string_traits<std::basic_string_view<std::byte>>
-{
-  static std::size_t
-  size_buffer(std::basic_string_view<std::byte> const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(
-    char *begin, char *end, std::basic_string_view<std::byte> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(
-    char *begin, char *end, std::basic_string_view<std::byte> const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  // There's no from_string, because there's nobody to hold the data.
-};
-
-template<>
-inline constexpr format param_format(std::basic_string_view<std::byte> const &)
-{
-  return format::binary;
-}
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// String traits for SQL arrays.
-template<typename Container> struct array_string_traits
-{
-private:
-  using elt_type = strip_t<value_type<Container>>;
-  using elt_traits = string_traits<elt_type>;
-  static constexpr zview s_null{"NULL"};
-
-public:
-  static zview to_buf(char *begin, char *end, Container const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, Container const &value)
-  {
-    std::size_t const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to convert array to string."};
-
-    char *here = begin;
-    *here++ = '{';
-
-    bool nonempty{false};
-    for (auto const &elt : value)
-    {
-      if (is_null(elt))
-      {
-        s_null.copy(here, std::size(s_null));
-        here += std::size(s_null);
-      }
-      else if constexpr (is_sql_array<elt_type>)
-      {
-        // Render nested array in-place.  Then erase the trailing zero.
-        here = elt_traits::into_buf(here, end, elt) - 1;
-      }
-      else if constexpr (is_unquoted_safe<elt_type>)
-      {
-        // No need to quote or escape.  Just convert the value straight into
-        // its place in the array, and "backspace" the trailing zero.
-        here = elt_traits::into_buf(here, end, elt) - 1;
-      }
-      else
-      {
-        *here++ = '"';
-
-        // Use the tail end of the destination buffer as an intermediate
-        // buffer.
-        auto const elt_budget{pqxx::size_buffer(elt)};
-        for (char const c : elt_traits::to_buf(end - elt_budget, end, elt))
-        {
-          if (c == '\\' or c == '"')
-            *here++ = '\\';
-          *here++ = c;
-        }
-        *here++ = '"';
-      }
-      *here++ = array_separator<elt_type>;
-      nonempty = true;
-    }
-
-    // Erase that last comma, if present.
-    if (nonempty)
-      here--;
-
-    *here++ = '}';
-    *here++ = '\0';
-
-    return here;
-  }
-
-  static std::size_t size_buffer(Container const &value) noexcept
-  {
-    if constexpr (is_unquoted_safe<elt_type>)
-      return 3 + std::accumulate(
-                   std::begin(value), std::end(value), std::size_t{},
-                   [](std::size_t acc, elt_type const &elt) {
-                     return acc +
-                            (pqxx::is_null(elt) ?
-                               std::size(s_null) :
-                               elt_traits::size_buffer(elt)) -
-                            1;
-                   });
-    else
-      return 3 + std::accumulate(
-                   std::begin(value), std::end(value), std::size_t{},
-                   [](std::size_t acc, elt_type const &elt) {
-                     // Opening and closing quotes, plus worst-case escaping,
-                     // but don't count the trailing zeroes.
-                     std::size_t const elt_size{
-                       pqxx::is_null(elt) ? std::size(s_null) :
-                                            elt_traits::size_buffer(elt) - 1};
-                     return acc + 2 * elt_size + 2;
-                   });
-  }
-
-  // We don't yet support parsing of array types using from_string.  Doing so
-  // would require a reference to the connection.
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-template<typename T, typename... Args>
-struct nullness<std::vector<T, Args...>> : no_null<std::vector<T>>
-{};
-
-
-template<typename T, typename... Args>
-struct string_traits<std::vector<T, Args...>>
-        : internal::array_string_traits<std::vector<T, Args...>>
-{};
-
-
-/// We don't know how to pass array params in binary format, so pass as text.
-template<typename T, typename... Args>
-inline constexpr format param_format(std::vector<T, Args...> const &)
-{
-  return format::text;
-}
-
-
-/// A `std::vector<std::byte>` is a binary string.  Other vectors are not.
-template<typename... Args>
-inline constexpr format param_format(std::vector<std::byte, Args...> const &)
-{
-  return format::binary;
-}
-
-
-template<typename T> inline constexpr bool is_sql_array<std::vector<T>>{true};
-
-
-template<typename T, std::size_t N>
-struct nullness<std::array<T, N>> : no_null<std::array<T, N>>
-{};
-
-
-template<typename T, std::size_t N>
-struct string_traits<std::array<T, N>>
-        : internal::array_string_traits<std::array<T, N>>
-{};
-
-
-/// We don't know how to pass array params in binary format, so pass as text.
-template<typename T, typename... Args, Args... args>
-inline constexpr format param_format(std::array<T, args...> const &)
-{
-  return format::text;
-}
-
-
-/// An array of `std::byte` is a binary string.
-template<typename... Args, Args... args>
-inline constexpr format param_format(std::array<std::byte, args...> const &)
-{
-  return format::binary;
-}
-
-
-template<typename T, std::size_t N>
-inline constexpr bool is_sql_array<std::array<T, N>>{true};
-} // namespace pqxx
-
-
-namespace pqxx
-{
-template<typename T> inline std::string to_string(T const &value)
-{
-  if (is_null(value))
-    throw conversion_error{
-      "Attempt to convert null " + type_name<T> + " to a string."};
-
-  std::string buf;
-  // We can't just reserve() space; modifying the terminating zero leads to
-  // undefined behaviour.
-  buf.resize(size_buffer(value));
-  auto const data{buf.data()};
-  auto const end{
-    string_traits<T>::into_buf(data, data + std::size(buf), value)};
-  buf.resize(static_cast<std::size_t>(end - data - 1));
-  return buf;
-}
-
-
-template<> inline std::string to_string(float const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(double const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(long double const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(std::stringstream const &value)
-{
-  return value.str();
-}
-
-
-template<typename T> inline void into_string(T const &value, std::string &out)
-{
-  if (is_null(value))
-    throw conversion_error{
-      "Attempt to convert null " + type_name<T> + " to a string."};
-
-  // We can't just reserve() data; modifying the terminating zero leads to
-  // undefined behaviour.
-  out.resize(size_buffer(value) + 1);
-  auto const data{out.data()};
-  auto const end{
-    string_traits<T>::into_buf(data, data + std::size(out), value)};
-  out.resize(static_cast<std::size_t>(end - data - 1));
-}
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/encoding_group.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/encoding_group.hxx
deleted file mode 100644
index e17736e5b..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/encoding_group.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/** Enum type for supporting encodings in libpqxx
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ENCODING_GROUP
-#define PQXX_H_ENCODING_GROUP
-
-#include <cstddef>
-
-namespace pqxx::internal
-{
-// Types of encodings supported by PostgreSQL, see
-// https://www.postgresql.org/docs/current/static/multibyte.html#CHARSET-TABLE
-enum class encoding_group
-{
-  // Handles all single-byte fixed-width encodings
-  MONOBYTE,
-
-  // Multibyte encodings.
-  // Many of these can embed ASCII-like bytes inside multibyte characters,
-  // notably Big5, SJIS, SHIFT_JIS_2004, GP18030, GBK, JOHAB, UHC.
-  BIG5,
-  EUC_CN,
-  // TODO: Merge EUC_JP and EUC_JIS_2004?
-  EUC_JP,
-  EUC_JIS_2004,
-  EUC_KR,
-  EUC_TW,
-  GB18030,
-  GBK,
-  JOHAB,
-  MULE_INTERNAL,
-  // TODO: Merge SJIS and SHIFT_JIS_2004?
-  SJIS,
-  SHIFT_JIS_2004,
-  UHC,
-  UTF8,
-};
-
-
-// TODO:: Can we just use string_view now?
-/// Function type: "find the end of the current glyph."
-/** This type of function takes a text buffer, and a location in that buffer,
- * and returns the location one byte past the end of the current glyph.
- *
- * The start offset marks the beginning of the current glyph.  It must fall
- * within the buffer.
- *
- * There are multiple different glyph scanner implementations, for different
- * kinds of encodings.
- */
-using glyph_scanner_func =
-  std::size_t(char const buffer[], std::size_t buffer_len, std::size_t start);
-} // namespace pqxx::internal
-
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/encodings.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/encodings.hxx
deleted file mode 100644
index ba7fecc70..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/encodings.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/** Internal string encodings support for libpqxx
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ENCODINGS
-#define PQXX_H_ENCODINGS
-
-#include "pqxx/internal/encoding_group.hxx"
-
-#include <string>
-#include <string_view>
-
-
-namespace pqxx::internal
-{
-char const *name_encoding(int encoding_id);
-
-/// Convert libpq encoding enum or encoding name to its libpqxx group.
-encoding_group enc_group(int /* libpq encoding ID */);
-encoding_group enc_group(std::string_view);
-
-
-/// Look up the glyph scanner function for a given encoding group.
-/** To identify the glyph boundaries in a buffer, call this to obtain the
- * scanner function appropriate for the buffer's encoding.  Then, repeatedly
- * call the scanner function to find the glyphs.
- */
-PQXX_LIBEXPORT glyph_scanner_func *get_glyph_scanner(encoding_group);
-
-
-// TODO: For ASCII search, treat UTF8/EUC_*/MULE_INTERNAL as MONOBYTE.
-
-/// Find any of the ASCII characters `NEEDLE` in `haystack`.
-/** Scans through `haystack` until it finds a single-byte character that
- * matches any value in `NEEDLE`.
- *
- * If it finds one, returns its offset.  If not, returns the end of the
- * haystack.
- */
-template<char... NEEDLE>
-inline std::size_t find_char(
-  glyph_scanner_func *scanner, std::string_view haystack,
-  std::size_t here = 0u)
-{
-  auto const sz{std::size(haystack)};
-  auto const data{std::data(haystack)};
-  while (here < sz)
-  {
-    auto next{scanner(data, sz, here)};
-    // (For some reason gcc had a problem with a right-fold here.  But clang
-    // was fine.)
-    if ((... or (data[here] == NEEDLE)))
-    {
-      // Also check against a multibyte character starting with a bytes which
-      // just happens to match one of the ASCII bytes we're looking for.  It'd
-      // be cleaner to check that first, but either works.  So, let's apply the
-      // most selective filter first and skip this check in almost all cases.
-      if (next == here + 1)
-        return here;
-    }
-
-    // Nope, no hit.  Move on.
-    here = next;
-  }
-  return sz;
-}
-
-
-/// Iterate over the glyphs in a buffer.
-/** Scans the glyphs in the buffer, and for each, passes its begin and its
- * one-past-end pointers to `callback`.
- */
-template<typename CALLABLE>
-inline void for_glyphs(
-  encoding_group enc, CALLABLE callback, char const buffer[],
-  std::size_t buffer_len, std::size_t start = 0)
-{
-  auto const scan{get_glyph_scanner(enc)};
-  for (std::size_t here = start, next; here < buffer_len; here = next)
-  {
-    next = scan(buffer, buffer_len, here);
-    callback(buffer + here, buffer + next);
-  }
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-errorhandler.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-errorhandler.hxx
deleted file mode 100644
index ffc12a6cf..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-errorhandler.hxx
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx
-{
-class connection;
-class errorhandler;
-} // namespace pqxx
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_errorhandler : callgate<connection>
-{
-  friend class pqxx::errorhandler;
-
-  connection_errorhandler(reference x) : super(x) {}
-
-  void register_errorhandler(errorhandler *h)
-  {
-    home().register_errorhandler(h);
-  }
-  void unregister_errorhandler(errorhandler *h)
-  {
-    home().unregister_errorhandler(h);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-largeobject.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-largeobject.hxx
deleted file mode 100644
index 49feaf9e6..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-largeobject.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <string>
-
-#include <pqxx/internal/callgate.hxx>
-#include <pqxx/internal/libpq-forward.hxx>
-
-namespace pqxx
-{
-class blob;
-class largeobject;
-} // namespace pqxx
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_largeobject : callgate<connection>
-{
-  friend class pqxx::blob;
-  friend class pqxx::largeobject;
-
-  connection_largeobject(reference x) : super(x) {}
-
-  pq::PGconn *raw_connection() const { return home().raw_connection(); }
-};
-
-
-class PQXX_PRIVATE const_connection_largeobject : callgate<connection const>
-{
-  friend class pqxx::blob;
-  friend class pqxx::largeobject;
-
-  const_connection_largeobject(reference x) : super(x) {}
-
-  std::string error_message() const { return home().err_msg(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-notification_receiver.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-notification_receiver.hxx
deleted file mode 100644
index 0bcb2db17..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-notification_receiver.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/connection.hxx"
-
-
-namespace pqxx
-{
-class notification_receiver;
-}
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_notification_receiver : callgate<connection>
-{
-  friend class pqxx::notification_receiver;
-
-  connection_notification_receiver(reference x) : super(x) {}
-
-  void add_receiver(notification_receiver *receiver)
-  {
-    home().add_receiver(receiver);
-  }
-  void remove_receiver(notification_receiver *receiver) noexcept
-  {
-    home().remove_receiver(receiver);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-pipeline.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-pipeline.hxx
deleted file mode 100644
index c6ae6e17a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-pipeline.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "pqxx/internal/libpq-forward.hxx"
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/pipeline.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_pipeline : callgate<connection>
-{
-  friend class pqxx::pipeline;
-
-  connection_pipeline(reference x) : super(x) {}
-
-  void start_exec(char const query[]) { home().start_exec(query); }
-  pqxx::internal::pq::PGresult *get_result() { return home().get_result(); }
-  void cancel_query() { home().cancel_query(); }
-
-  bool consume_input() noexcept { return home().consume_input(); }
-  bool is_busy() const noexcept { return home().is_busy(); }
-
-  int encoding_id() { return home().encoding_id(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-sql_cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-sql_cursor.hxx
deleted file mode 100644
index 51a889844..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-sql_cursor.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal
-{
-class sql_cursor;
-}
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_sql_cursor : callgate<connection>
-{
-  friend class pqxx::internal::sql_cursor;
-
-  connection_sql_cursor(reference x) : super(x) {}
-
-  result exec(char const query[]) { return home().exec(query); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-stream_from.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-stream_from.hxx
deleted file mode 100644
index 8961e7146..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-stream_from.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/connection.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_stream_from : callgate<connection>
-{
-  friend class pqxx::stream_from;
-
-  connection_stream_from(reference x) : super{x} {}
-
-  auto read_copy_line() { return home().read_copy_line(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-stream_to.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-stream_to.hxx
deleted file mode 100644
index a6974fb21..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-stream_to.hxx
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/stream_to.hxx"
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_stream_to : callgate<connection>
-{
-  friend class pqxx::stream_to;
-
-  connection_stream_to(reference x) : super(x) {}
-
-  void write_copy_line(std::string_view line) { home().write_copy_line(line); }
-  void end_copy_write() { home().end_copy_write(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-transaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-transaction.hxx
deleted file mode 100644
index 74d659253..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/connection-transaction.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx
-{
-class connection;
-}
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_transaction : callgate<connection>
-{
-  friend class pqxx::transaction_base;
-
-  connection_transaction(reference x) : super(x) {}
-
-  template<typename STRING> result exec(STRING query, std::string_view desc)
-  {
-    return home().exec(query, desc);
-  }
-
-  void register_transaction(transaction_base *t)
-  {
-    home().register_transaction(t);
-  }
-  void unregister_transaction(transaction_base *t) noexcept
-  {
-    home().unregister_transaction(t);
-  }
-
-  auto read_copy_line() { return home().read_copy_line(); }
-  void write_copy_line(std::string_view line) { home().write_copy_line(line); }
-  void end_copy_write() { home().end_copy_write(); }
-
-  result exec_prepared(zview statement, internal::c_params const &args)
-  {
-    return home().exec_prepared(statement, args);
-  }
-
-  result exec_params(zview query, internal::c_params const &args)
-  {
-    return home().exec_params(query, args);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/errorhandler-connection.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/errorhandler-connection.hxx
deleted file mode 100644
index 5560cedec..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/errorhandler-connection.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE errorhandler_connection : callgate<errorhandler>
-{
-  friend class pqxx::connection;
-
-  errorhandler_connection(reference x) : super(x) {}
-
-  void unregister() noexcept { home().unregister(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
deleted file mode 100644
index 296d22145..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE icursor_iterator_icursorstream : callgate<icursor_iterator>
-{
-  friend class pqxx::icursorstream;
-
-  icursor_iterator_icursorstream(reference x) : super(x) {}
-
-  icursor_iterator::difference_type pos() const noexcept
-  {
-    return home().pos();
-  }
-
-  icursor_iterator *get_prev() { return home().m_prev; }
-  void set_prev(icursor_iterator *i) { home().m_prev = i; }
-
-  icursor_iterator *get_next() { return home().m_next; }
-  void set_next(icursor_iterator *i) { home().m_next = i; }
-
-  void fill(result const &r) { home().fill(r); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx
deleted file mode 100644
index 56056d5ef..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE icursorstream_icursor_iterator : callgate<icursorstream>
-{
-  friend class pqxx::icursor_iterator;
-
-  icursorstream_icursor_iterator(reference x) : super(x) {}
-
-  void insert_iterator(icursor_iterator *i) noexcept
-  {
-    home().insert_iterator(i);
-  }
-
-  void remove_iterator(icursor_iterator *i) const noexcept
-  {
-    home().remove_iterator(i);
-  }
-
-  icursorstream::size_type forward() { return home().forward(); }
-  icursorstream::size_type forward(icursorstream::size_type n)
-  {
-    return home().forward(n);
-  }
-
-  void service_iterators(icursorstream::difference_type p)
-  {
-    home().service_iterators(p);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-connection.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-connection.hxx
deleted file mode 100644
index daa0808c0..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-connection.hxx
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_connection : callgate<result const>
-{
-  friend class pqxx::connection;
-
-  result_connection(reference x) : super(x) {}
-
-  operator bool() const { return bool(home()); }
-  bool operator!() const { return not home(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-creation.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-creation.hxx
deleted file mode 100644
index 3d9205f2c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-creation.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_creation : callgate<result const>
-{
-  friend class pqxx::connection;
-  friend class pqxx::pipeline;
-
-  result_creation(reference x) : super(x) {}
-
-  static result create(
-    internal::pq::PGresult *rhs, std::shared_ptr<std::string> const &query,
-    encoding_group enc)
-  {
-    return result(rhs, query, enc);
-  }
-
-  void check_status(std::string_view desc = ""sv) const
-  {
-    return home().check_status(desc);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-pipeline.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-pipeline.hxx
deleted file mode 100644
index 3ebe436d2..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-pipeline.hxx
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_pipeline : callgate<result const>
-{
-  friend class pqxx::pipeline;
-
-  result_pipeline(reference x) : super(x) {}
-
-  std::shared_ptr<std::string const> query_ptr() const
-  {
-    return home().query_ptr();
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-sql_cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-sql_cursor.hxx
deleted file mode 100644
index 78b450739..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/result-sql_cursor.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_sql_cursor : callgate<result const>
-{
-  friend class pqxx::internal::sql_cursor;
-
-  result_sql_cursor(reference x) : super(x) {}
-
-  char const *cmd_status() const noexcept { return home().cmd_status(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/transaction-sql_cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/transaction-sql_cursor.hxx
deleted file mode 100644
index 4ed78dc93..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/transaction-sql_cursor.hxx
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE transaction_sql_cursor : callgate<transaction_base>
-{
-  friend class pqxx::internal::sql_cursor;
-  transaction_sql_cursor(reference x) : super(x) {}
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/transaction-transaction_focus.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/transaction-transaction_focus.hxx
deleted file mode 100644
index ca7939a99..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/gates/transaction-transaction_focus.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/transaction_base.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE transaction_transaction_focus : callgate<transaction_base>
-{
-  friend class pqxx::transaction_focus;
-
-  transaction_transaction_focus(reference x) : super(x) {}
-
-  void register_focus(transaction_focus *focus)
-  {
-    home().register_focus(focus);
-  }
-  void unregister_focus(transaction_focus *focus) noexcept
-  {
-    home().unregister_focus(focus);
-  }
-  void register_pending_error(zview error)
-  {
-    home().register_pending_error(error);
-  }
-  void register_pending_error(std::string &&error)
-  {
-    home().register_pending_error(std::move(error));
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/header-post.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/header-post.hxx
deleted file mode 100644
index ff6bf8986..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/header-post.hxx
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Compiler deficiency workarounds for compiling libpqxx headers.
- *
- * To be included at the end of each libpqxx header, in order to restore the
- * client program's settings.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-// NO GUARDS HERE! This code should be executed every time!
-
-#if defined(_MSC_VER)
-#  pragma warning(pop) // Restore compiler's warning state
-#endif
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include pqxx/internal/header-post.hxx AFTER its 'pre' counterpart."
-#endif
-
-#undef PQXX_HEADER_PRE
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/header-pre.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/header-pre.hxx
deleted file mode 100644
index abc1a398d..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/header-pre.hxx
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Compiler settings for compiling libpqxx headers, and workarounds for all.
- *
- * Include this before including any other libpqxx headers from within libpqxx.
- * And to balance it out, also include header-post.hxx at the end of the batch
- * of headers.
- *
- * The public libpqxx headers (e.g. `<pqxx/connection>`) include this already;
- * there's no need to do this from within an application.
- *
- * Include this file at the highest aggregation level possible to avoid nesting
- * and to keep things simple.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-
-// NO GUARD HERE! This part should be included every time this file is.
-#if defined(_MSC_VER)
-
-// Save compiler's warning state, and set warning level 4 for maximum
-// sensitivity to warnings.
-#  pragma warning(push, 4)
-
-// Visual C++ generates some entirely unreasonable warnings.  Disable them.
-// Copy constructor could not be generated.
-#  pragma warning(disable : 4511)
-// Assignment operator could not be generated.
-#  pragma warning(disable : 4512)
-// Can't expose outside classes without exporting them.  Except the MSVC docs
-// say please ignore the warning if it's a standard library class.
-#  pragma warning(disable : 4251)
-// Can't derive library classes from outside classes without exporting them.
-// Except the MSVC docs say please ignore the warning if the parent class is
-// in the standard library.
-#  pragma warning(disable : 4275)
-// Can't inherit from non-exported class.
-#  pragma warning(disable : 4275)
-
-#endif // _MSC_VER
-
-
-#if defined(PQXX_HEADER_PRE)
-#  error "Avoid nesting #include of pqxx/internal/header-pre.hxx."
-#endif
-
-#define PQXX_HEADER_PRE
-
-
-// Workarounds & definitions that need to be included even in library's headers
-#include "pqxx/config-public-compiler.h"
-
-// Enable ISO-646 alternative operaotr representations: "and" instead of "&&"
-// etc. on older compilers.  C++20 removes this header.
-#if __has_include(<ciso646>)
-#  include <ciso646>
-#endif
-
-
-#if defined(PQXX_HAVE_GCC_PURE)
-/// Declare function "pure": no side effects, only reads globals and its args.
-#  define PQXX_PURE __attribute__((pure))
-#else
-#  define PQXX_PURE /* pure */
-#endif
-
-
-#if defined(__GNUC__)
-/// Tell the compiler to optimise a function for size, not speed.
-#  define PQXX_COLD __attribute__((cold))
-#else
-#  define PQXX_COLD /* cold */
-#endif
-
-
-// Workarounds for Windows
-#ifdef _WIN32
-
-/* For now, export DLL symbols if _DLL is defined.  This is done automatically
- * by the compiler when linking to the dynamic version of the runtime library,
- * according to "gzh"
- */
-#  if defined(PQXX_SHARED) && !defined(PQXX_LIBEXPORT)
-#    define PQXX_LIBEXPORT __declspec(dllimport)
-#  endif // PQXX_SHARED && !PQXX_LIBEXPORT
-
-
-// Workarounds for Microsoft Visual C++
-#  ifdef _MSC_VER
-
-// Suppress vtables on abstract classes.
-#    define PQXX_NOVTABLE __declspec(novtable)
-
-// Automatically link with the appropriate libpq (static or dynamic, debug or
-// release).  The default is to use the release DLL.  Define PQXX_PQ_STATIC to
-// link to a static version of libpq, and _DEBUG to link to a debug version.
-// The two may be combined.
-#    if defined(PQXX_AUTOLINK)
-#      if defined(PQXX_PQ_STATIC)
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqd")
-#        else
-#          pragma comment(lib, "libpq")
-#        endif
-#      else
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqddll")
-#        else
-#          pragma comment(lib, "libpqdll")
-#        endif
-#      endif
-#    endif
-
-// If we're not compiling libpqxx itself, automatically link with the
-// appropriate libpqxx library.  To link with the libpqxx DLL, define
-// PQXX_SHARED; the default is to link with the static library.  A static link
-// is the recommended practice.
-//
-// The preprocessor macro PQXX_INTERNAL is used to detect whether we
-// are compiling the libpqxx library itself.  When you compile the library
-// yourself using your own project file, make sure to include this macro.
-#    if defined(PQXX_AUTOLINK) && !defined(PQXX_INTERNAL)
-#      ifdef PQXX_SHARED
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqxxD")
-#        else
-#          pragma comment(lib, "libpqxx")
-#        endif
-#      else // !PQXX_SHARED
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqxx_staticD")
-#        else
-#          pragma comment(lib, "libpqxx_static")
-#        endif
-#      endif
-#    endif
-
-#  endif // _MSC_VER
-
-#elif defined(PQXX_HAVE_GCC_VISIBILITY) // !_WIN32
-
-#  define PQXX_LIBEXPORT __attribute__((visibility("default")))
-#  define PQXX_PRIVATE __attribute__((visibility("hidden")))
-
-#endif // PQXX_HAVE_GCC_VISIBILITY
-
-
-#ifndef PQXX_LIBEXPORT
-#  define PQXX_LIBEXPORT /* libexport */
-#endif
-
-#ifndef PQXX_PRIVATE
-#  define PQXX_PRIVATE /* private */
-#endif
-
-#ifndef PQXX_NOVTABLE
-#  define PQXX_NOVTABLE /* novtable */
-#endif
-
-// C++20: Assume support.
-#if defined(PQXX_HAVE_LIKELY)
-#  define PQXX_LIKELY [[likely]]
-#  define PQXX_UNLIKELY [[unlikely]]
-#else
-#  define PQXX_LIKELY   /* [[likely]] */
-#  define PQXX_UNLIKELY /* [[unlikely]] */
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/ignore-deprecated-post.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/ignore-deprecated-post.hxx
deleted file mode 100644
index cebcf0594..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/ignore-deprecated-post.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/// End a code block started by "ignore-deprecated-pre.hxx".
-
-#if !defined(PQXX_IGNORING_DEPRECATED)
-#  error "Ended an 'ignore-deprecated' block while none was active."
-#endif
-
-#if defined(__GNUC__)
-#  pragma GCC diagnostic pop
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-
-#undef PQXX_IGNORING_DEPRECATED
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/ignore-deprecated-pre.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/ignore-deprecated-pre.hxx
deleted file mode 100644
index 8ac57afaa..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/ignore-deprecated-pre.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/** Start a block of deprecated code which may call other deprecated code.
- *
- * Most compilers will emit warnings when deprecated code is invoked from
- * non-deprecated code.  But some compilers (notably gcc) will always emit the
- * warning even when the calling code is also deprecated.
- *
- * This header starts a block where those warnings are suppressed.  It can be
- * included inside a code block.
- *
- * Always match the #include with a closing #include of
- * "ignore-deprecated-post.hxx".  To avoid mistakes, keep the enclosed area as
- * small as possible.
- */
-#if defined(PQXX_IGNORING_DEPRECATED)
-#  error "Started an 'ignore-deprecated' block inside another."
-#endif
-
-#define PQXX_IGNORING_DEPRECATED
-
-#if defined(__GNUC__)
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable : 4996)
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/libpq-forward.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/libpq-forward.hxx
deleted file mode 100644
index 9e74f79ec..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/libpq-forward.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/** Minimal forward declarations of libpq types needed in libpqxx headers.
- *
- * DO NOT INCLUDE THIS FILE when building client programs.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-extern "C"
-{
-  struct pg_conn;
-  struct pg_result;
-  struct pgNotify;
-}
-
-/// Forward declarations of libpq types as needed in libpqxx headers.
-namespace pqxx::internal::pq
-{
-using PGconn = pg_conn;
-using PGresult = pg_result;
-using PGnotify = pgNotify;
-using PQnoticeProcessor = void (*)(void *, char const *);
-} // namespace pqxx::internal::pq
-
-namespace pqxx
-{
-/// PostgreSQL database row identifier.
-using oid = unsigned int;
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/result_iter.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/result_iter.hxx
deleted file mode 100644
index 1fa1f7d8a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/result_iter.hxx
+++ /dev/null
@@ -1,124 +0,0 @@
-/** Result loops.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT_ITER
-#define PQXX_H_RESULT_ITER
-
-#include <memory>
-
-#include "pqxx/strconv.hxx"
-
-namespace pqxx
-{
-class result;
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-// C++20: Replace with generator?
-/// Iterator for looped unpacking of a result.
-template<typename... TYPE> class result_iter
-{
-public:
-  using value_type = std::tuple<TYPE...>;
-
-  /// Construct an "end" iterator.
-  result_iter() = default;
-
-  explicit result_iter(result const &home) :
-          m_home{&home}, m_size{std::size(home)}
-  {
-    if (not std::empty(home))
-      read();
-  }
-  result_iter(result_iter const &) = default;
-
-  result_iter &operator++()
-  {
-    m_index++;
-    if (m_index >= m_size)
-      m_home = nullptr;
-    else
-      read();
-    return *this;
-  }
-
-  /// Comparison only works for comparing to end().
-  bool operator==(result_iter const &rhs) const
-  {
-    return m_home == rhs.m_home;
-  }
-  bool operator!=(result_iter const &rhs) const { return not(*this == rhs); }
-
-  value_type const &operator*() const { return m_value; }
-
-private:
-  void read() { (*m_home)[m_index].convert(m_value); }
-
-  result const *m_home{nullptr};
-  result::size_type m_index{0};
-  result::size_type m_size;
-  value_type m_value;
-};
-
-
-template<typename... TYPE> class result_iteration
-{
-public:
-  using iterator = result_iter<TYPE...>;
-  explicit result_iteration(result const &home) : m_home{home}
-  {
-    constexpr auto tup_size{sizeof...(TYPE)};
-    if (home.columns() != tup_size)
-      throw usage_error{internal::concat(
-        "Tried to extract ", to_string(tup_size),
-        " field(s) from a result with ", to_string(home.columns()),
-        " column(s).")};
-  }
-  iterator begin() const
-  {
-    if (std::size(m_home) == 0)
-      return end();
-    else
-      return iterator{m_home};
-  }
-  iterator end() const { return {}; }
-
-private:
-  pqxx::result const &m_home;
-};
-} // namespace pqxx::internal
-
-
-template<typename... TYPE> inline auto pqxx::result::iter() const
-{
-  return pqxx::internal::result_iteration<TYPE...>{*this};
-}
-
-
-template<typename CALLABLE>
-inline void pqxx::result::for_each(CALLABLE &&func) const
-{
-  using args_tuple = internal::args_t<decltype(func)>;
-  constexpr auto sz{std::tuple_size_v<args_tuple>};
-  static_assert(
-    sz > 0,
-    "Callback for for_each must take parameters, one for each column in the "
-    "result.");
-
-  auto const cols{this->columns()};
-  if (sz != cols)
-    throw usage_error{internal::concat(
-      "Callback to for_each takes ", sz, "parameter", (sz == 1) ? "" : "s",
-      ", but result set has ", cols, "field", (cols == 1) ? "" : "s", ".")};
-
-  using pass_tuple = pqxx::internal::strip_types_t<args_tuple>;
-  for (auto const r : *this) std::apply(func, r.as_tuple<pass_tuple>());
-}
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/result_iterator.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/result_iterator.hxx
deleted file mode 100644
index 3f27a1d3f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/result_iterator.hxx
+++ /dev/null
@@ -1,389 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT_ITERATOR
-#define PQXX_H_RESULT_ITERATOR
-
-#include "pqxx/row.hxx"
-
-
-/* Result iterator.
- *
- * Don't include this header from your own application; it is included for you
- * by other libpqxx headers.
- */
-
-namespace pqxx
-{
-/// Iterator for rows in a result.  Use as result::const_iterator.
-/** A result, once obtained, cannot be modified.  Therefore there is no
- * plain iterator type for result.  However its const_iterator type can be
- * used to inspect its rows without changing them.
- */
-class PQXX_LIBEXPORT const_result_iterator : public row
-{
-public:
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = row const;
-  using pointer = row const *;
-  using reference = row;
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create an iterator, but in an unusable state.
-  const_result_iterator() noexcept = default;
-  /// Copy an iterator.
-  const_result_iterator(const_result_iterator const &) noexcept = default;
-  /// Move an iterator.
-  const_result_iterator(const_result_iterator &&) noexcept = default;
-
-  /// Begin iterating a @ref row.
-  const_result_iterator(row const &t) noexcept : row{t} {}
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /**
-   * @name Dereferencing operators
-   *
-   * An iterator "points to" its own row, which is also itself.  This makes it
-   * easy to address a @ref result as a two-dimensional container, without
-   * going through the intermediate step of dereferencing the iterator.  It
-   * makes the interface similar to C pointer/array semantics.
-   *
-   * IIRC Alex Stepanov, the inventor of the STL, once remarked that having
-   * this as standard behaviour for pointers would be useful in some
-   * algorithms.  So even if this makes me look foolish, I would seem to be in
-   * distinguished company.
-   */
-  //@{
-  /// Dereference the iterator.
-  [[nodiscard]] pointer operator->() const { return this; }
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Dereference the iterator.
-  [[nodiscard]] reference operator*() const { return *this; }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  //@}
-
-  /**
-   * @name Field access
-   */
-  //@{
-  using row::back;
-  using row::front;
-  using row::operator[];
-  using row::at;
-  using row::rownumber;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_result_iterator &operator=(const_result_iterator const &rhs)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::operator=(rhs);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    return *this;
-  }
-
-  const_result_iterator &operator=(const_result_iterator &&rhs)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::operator=(std::move(rhs));
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    return *this;
-  }
-
-  const_result_iterator operator++(int);
-  const_result_iterator &operator++()
-  {
-    ++m_index;
-    return *this;
-  }
-  const_result_iterator operator--(int);
-  const_result_iterator &operator--()
-  {
-    --m_index;
-    return *this;
-  }
-
-  const_result_iterator &operator+=(difference_type i)
-  {
-    m_index += i;
-    return *this;
-  }
-  const_result_iterator &operator-=(difference_type i)
-  {
-    m_index -= i;
-    return *this;
-  }
-
-  /// Interchange two iterators in an exception-safe manner.
-  void swap(const_result_iterator &other) noexcept
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::swap(other);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool operator==(const_result_iterator const &i) const
-  {
-    return m_index == i.m_index;
-  }
-  [[nodiscard]] bool operator!=(const_result_iterator const &i) const
-  {
-    return m_index != i.m_index;
-  }
-  [[nodiscard]] bool operator<(const_result_iterator const &i) const
-  {
-    return m_index < i.m_index;
-  }
-  [[nodiscard]] bool operator<=(const_result_iterator const &i) const
-  {
-    return m_index <= i.m_index;
-  }
-  [[nodiscard]] bool operator>(const_result_iterator const &i) const
-  {
-    return m_index > i.m_index;
-  }
-  [[nodiscard]] bool operator>=(const_result_iterator const &i) const
-  {
-    return m_index >= i.m_index;
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] inline const_result_iterator operator+(difference_type) const;
-  friend const_result_iterator
-  operator+(difference_type, const_result_iterator const &);
-  [[nodiscard]] inline const_result_iterator operator-(difference_type) const;
-  [[nodiscard]] inline difference_type
-  operator-(const_result_iterator const &) const;
-  //@}
-
-private:
-  friend class pqxx::result;
-  const_result_iterator(pqxx::result const *r, result_size_type i) noexcept :
-          row{*r, i, r->columns()}
-  {}
-};
-
-
-/// Reverse iterator for result.  Use as result::const_reverse_iterator.
-class PQXX_LIBEXPORT const_reverse_result_iterator
-        : private const_result_iterator
-{
-public:
-  using super = const_result_iterator;
-  using iterator_type = const_result_iterator;
-  using iterator_type::difference_type;
-  using iterator_type::iterator_category;
-  using iterator_type::pointer;
-  using value_type = iterator_type::value_type;
-  using reference = iterator_type::reference;
-
-  /// Create an iterator, but in an unusable state.
-  const_reverse_result_iterator() = default;
-  /// Copy an iterator.
-  const_reverse_result_iterator(const_reverse_result_iterator const &rhs) =
-    default;
-  /// Copy a reverse iterator from a regular iterator.
-  explicit const_reverse_result_iterator(const_result_iterator const &rhs) :
-          const_result_iterator{rhs}
-  {
-    super::operator--();
-  }
-
-  /// Move a regular iterator into a reverse iterator.
-  explicit const_reverse_result_iterator(const_result_iterator const &&rhs) :
-          const_result_iterator{std::move(rhs)}
-  {
-    super::operator--();
-  }
-
-  /// Return the underlying "regular" iterator (as per standard library).
-  [[nodiscard]] PQXX_PURE const_result_iterator base() const noexcept;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  /// Dereference iterator.
-  using const_result_iterator::operator->;
-  /// Dereference iterator.
-  using const_result_iterator::operator*;
-  //@}
-
-  /**
-   * @name Field access
-   */
-  //@{
-  using const_result_iterator::back;
-  using const_result_iterator::front;
-  using const_result_iterator::operator[];
-  using const_result_iterator::at;
-  using const_result_iterator::rownumber;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_reverse_result_iterator &
-  operator=(const_reverse_result_iterator const &r)
-  {
-    iterator_type::operator=(r);
-    return *this;
-  }
-  const_reverse_result_iterator &operator=(const_reverse_result_iterator &&r)
-  {
-    iterator_type::operator=(std::move(r));
-    return *this;
-  }
-  const_reverse_result_iterator &operator++()
-  {
-    iterator_type::operator--();
-    return *this;
-  }
-  const_reverse_result_iterator operator++(int);
-  const_reverse_result_iterator &operator--()
-  {
-    iterator_type::operator++();
-    return *this;
-  }
-  const_reverse_result_iterator operator--(int);
-  const_reverse_result_iterator &operator+=(difference_type i)
-  {
-    iterator_type::operator-=(i);
-    return *this;
-  }
-  const_reverse_result_iterator &operator-=(difference_type i)
-  {
-    iterator_type::operator+=(i);
-    return *this;
-  }
-
-  void swap(const_reverse_result_iterator &other) noexcept
-  {
-    const_result_iterator::swap(other);
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] const_reverse_result_iterator
-  operator+(difference_type i) const
-  {
-    return const_reverse_result_iterator(base() - i);
-  }
-  [[nodiscard]] const_reverse_result_iterator operator-(difference_type i)
-  {
-    return const_reverse_result_iterator(base() + i);
-  }
-  [[nodiscard]] difference_type
-  operator-(const_reverse_result_iterator const &rhs) const
-  {
-    return rhs.const_result_iterator::operator-(*this);
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool
-  operator==(const_reverse_result_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator==(rhs);
-  }
-  [[nodiscard]] bool
-  operator!=(const_reverse_result_iterator const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-
-  [[nodiscard]] bool operator<(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator>(rhs);
-  }
-  [[nodiscard]] bool operator<=(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator>=(rhs);
-  }
-  [[nodiscard]] bool operator>(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator<(rhs);
-  }
-  [[nodiscard]] bool operator>=(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator<=(rhs);
-  }
-  //@}
-};
-
-
-inline const_result_iterator
-const_result_iterator::operator+(result::difference_type o) const
-{
-  return {&m_result, size_type(result::difference_type(m_index) + o)};
-}
-
-inline const_result_iterator
-operator+(result::difference_type o, const_result_iterator const &i)
-{
-  return i + o;
-}
-
-inline const_result_iterator
-const_result_iterator::operator-(result::difference_type o) const
-{
-  return {&m_result, result_size_type(result::difference_type(m_index) - o)};
-}
-
-inline result::difference_type
-const_result_iterator::operator-(const const_result_iterator &i) const
-{
-  return result::difference_type(num() - i.num());
-}
-
-inline const_result_iterator result::end() const noexcept
-{
-  return {this, size()};
-}
-
-
-inline const_result_iterator result::cend() const noexcept
-{
-  return end();
-}
-
-
-inline const_reverse_result_iterator
-operator+(result::difference_type n, const_reverse_result_iterator const &i)
-{
-  return const_reverse_result_iterator{i.base() - n};
-}
-
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/sql_cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/sql_cursor.hxx
deleted file mode 100644
index a26d06306..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/sql_cursor.hxx
+++ /dev/null
@@ -1,118 +0,0 @@
-/** Internal wrapper for SQL cursors.  Supports higher-level cursor classes.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY.  Other headers include it for you.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SQL_CURSOR
-#define PQXX_H_SQL_CURSOR
-
-namespace pqxx::internal
-{
-/// Cursor with SQL positioning semantics.
-/** Thin wrapper around an SQL cursor, with SQL's ideas of positioning.
- *
- * SQL cursors have pre-increment/pre-decrement semantics, with on either end
- * of the result set a special position that does not repesent a row.  This
- * class models SQL cursors for the purpose of implementing more C++-like
- * semantics on top.
- *
- * Positions of actual rows are numbered starting at 1.  Position 0 exists but
- * does not refer to a row.  There is a similar non-row position at the end of
- * the result set.
- *
- * Don't use this at home.  You deserve better.  Use the stateles_cursor
- * instead.
- */
-class PQXX_LIBEXPORT sql_cursor : public cursor_base
-{
-public:
-  sql_cursor(
-    transaction_base &t, std::string_view query, std::string_view cname,
-    cursor_base::access_policy ap, cursor_base::update_policy up,
-    cursor_base::ownership_policy op, bool hold);
-
-  sql_cursor(
-    transaction_base &t, std::string_view cname,
-    cursor_base::ownership_policy op);
-
-  ~sql_cursor() noexcept { close(); }
-
-  result fetch(difference_type rows, difference_type &displacement);
-  result fetch(difference_type rows)
-  {
-    difference_type d = 0;
-    return fetch(rows, d);
-  }
-  difference_type move(difference_type rows, difference_type &displacement);
-  difference_type move(difference_type rows)
-  {
-    difference_type d = 0;
-    return move(rows, d);
-  }
-
-  /// Current position, or -1 for unknown
-  /**
-   * The starting position, just before the first row, counts as position zero.
-   *
-   * Position may be unknown if (and only if) this cursor was adopted, and has
-   * never hit its starting position (position zero).
-   */
-  difference_type pos() const noexcept { return m_pos; }
-
-  /// End position, or -1 for unknown
-  /**
-   * Returns the final position, just after the last row in the result set. The
-   * starting position, just before the first row, counts as position zero.
-   *
-   * End position is unknown until it is encountered during use.
-   */
-  difference_type endpos() const noexcept { return m_endpos; }
-
-  /// Return zero-row result for this cursor.
-  result const &empty_result() const noexcept { return m_empty_result; }
-
-  void close() noexcept;
-
-private:
-  difference_type adjust(difference_type hoped, difference_type actual);
-  static std::string stridestring(difference_type);
-  /// Initialize cached empty result.  Call only at beginning or end!
-  void init_empty_result(transaction_base &);
-
-  /// Connection in which this cursor lives.
-  connection &m_home;
-
-  /// Zero-row result from this cursor (or plain empty one if cursor is
-  /// adopted)
-  result m_empty_result;
-
-  result m_cached_current_row;
-
-  /// Is this cursor adopted (as opposed to created by this cursor object)?
-  bool m_adopted;
-
-  /// Will this cursor object destroy its SQL cursor when it dies?
-  cursor_base::ownership_policy m_ownership;
-
-  /// At starting position (-1), somewhere in the middle (0), or past end (1)
-  int m_at_end;
-
-  /// Position, or -1 for unknown
-  difference_type m_pos;
-
-  /// End position, or -1 for unknown
-  difference_type m_endpos = -1;
-};
-
-
-PQXX_LIBEXPORT result_size_type obtain_stateless_cursor_size(sql_cursor &);
-PQXX_LIBEXPORT result stateless_cursor_retrieve(
-  sql_cursor &, result::difference_type size,
-  result::difference_type begin_pos, result::difference_type end_pos);
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/statement_parameters.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/statement_parameters.hxx
deleted file mode 100644
index b078bf6e0..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/statement_parameters.hxx
+++ /dev/null
@@ -1,131 +0,0 @@
-/** Common implementation for statement parameter lists.
- *
- * These are used for both prepared statements and parameterized statements.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY.  Other headers include it for you.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STATEMENT_PARAMETER
-#define PQXX_H_STATEMENT_PARAMETER
-
-#include <cstring>
-#include <functional>
-#include <iterator>
-#include <string>
-#include <vector>
-
-#include "pqxx/binarystring.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/util.hxx"
-
-
-namespace pqxx::internal
-{
-template<typename ITERATOR>
-constexpr inline auto const iterator_identity{
-  [](decltype(*std::declval<ITERATOR>()) x) { return x; }};
-
-
-/// Marker type: pass a dynamically-determined number of statement parameters.
-/** @deprecated Use @ref params instead.
- *
- * Normally when invoking a prepared or parameterised statement, the number
- * of parameters is known at compile time.  For instance,
- * `t.exec_prepared("foo", 1, "x");` executes statement `foo` with two
- * parameters, an `int` and a C string.
- *
- * But sometimes you may want to pass a number of parameters known only at run
- * time.  In those cases, a @ref dynamic_params encodes a dynamically
- * determined number of parameters.  You can mix these with regular, static
- * parameter lists, and you can re-use them for multiple statement invocations.
- *
- * A dynamic_params object does not store copies of its parameters, so make
- * sure they remain accessible until you've executed the statement.
- *
- * The ACCESSOR is an optional callable (such as a lambda).  If you pass an
- * accessor `a`, then each parameter `p` goes into your statement as `a(p)`.
- */
-template<typename IT, typename ACCESSOR = decltype(iterator_identity<IT>)>
-class dynamic_params
-{
-public:
-  /// Wrap a sequence of pointers or iterators.
-  constexpr dynamic_params(IT begin, IT end) :
-          m_begin(begin), m_end(end), m_accessor(iterator_identity<IT>)
-  {}
-
-  /// Wrap a sequence of pointers or iterators.
-  /** This version takes an accessor callable.  If you pass an accessor `acc`,
-   * then any parameter `p` will go into the statement's parameter list as
-   * `acc(p)`.
-   */
-  constexpr dynamic_params(IT begin, IT end, ACCESSOR &acc) :
-          m_begin(begin), m_end(end), m_accessor(acc)
-  {}
-
-  /// Wrap a container.
-  template<typename C>
-  explicit constexpr dynamic_params(C &container) :
-          dynamic_params(std::begin(container), std::end(container))
-  {}
-
-  /// Wrap a container.
-  /** This version takes an accessor callable.  If you pass an accessor `acc`,
-   * then any parameter `p` will go into the statement's parameter list as
-   * `acc(p)`.
-   */
-  template<typename C>
-  explicit constexpr dynamic_params(C &container, ACCESSOR &acc) :
-          dynamic_params(std::begin(container), std::end(container), acc)
-  {}
-
-  constexpr IT begin() const noexcept { return m_begin; }
-  constexpr IT end() const noexcept { return m_end; }
-
-  constexpr auto access(decltype(*std::declval<IT>()) value) const
-    -> decltype(std::declval<ACCESSOR>()(value))
-  {
-    return m_accessor(value);
-  }
-
-private:
-  IT const m_begin, m_end;
-  ACCESSOR m_accessor = iterator_identity<IT>;
-};
-
-
-/// Internal type: encode statement parameters.
-/** Compiles arguments for prepared statements and parameterised queries into
- * a format that can be passed into libpq.
- *
- * Objects of this type are meant to be short-lived: a `c_params` lives and
- * dies entirely within the call to execute.  So, for example, if you pass in a
- * non-null pointer as a parameter, @ref params may simply use that pointer as
- * a parameter value, without arranging longer-term storage for the data to
- * which it points.  All values referenced by parameters must remain "live"
- * until the parameterised or prepared statement has been executed.
- */
-struct PQXX_LIBEXPORT c_params
-{
-  c_params() = default;
-  /// Copying these objects is pointless and expensive.  Don't do it.
-  c_params(c_params const &) = delete;
-  c_params(c_params &&) = default;
-
-  /// Pre-allocate storage for `n` parameters.
-  void reserve(std::size_t n) &;
-
-  /// As used by libpq: pointers to parameter values.
-  std::vector<char const *> values;
-  /// As used by libpq: lengths of non-null arguments, in bytes.
-  std::vector<int> lengths;
-  /// As used by libpq: effectively boolean "is this a binary parameter?"
-  std::vector<format> formats;
-};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/stream_iterator.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/stream_iterator.hxx
deleted file mode 100644
index f240dcfa7..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/stream_iterator.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/** Stream iterators.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_ITERATOR
-#define PQXX_H_STREAM_ITERATOR
-
-#include <memory>
-
-namespace pqxx
-{
-class stream_from;
-}
-
-
-namespace pqxx::internal
-{
-// C++20: Replace with generator?
-/// Input iterator for stream_from.
-/** Just barely enough to support range-based "for" loops.  Don't assume that
- * any of the usual behaviour works beyond that.
- */
-template<typename... TYPE> class stream_input_iterator
-{
-public:
-  using value_type = std::tuple<TYPE...>;
-
-  /// Construct an "end" iterator.
-  stream_input_iterator() = default;
-
-  explicit stream_input_iterator(stream_from &home) : m_home(&home)
-  {
-    advance();
-  }
-  stream_input_iterator(stream_input_iterator const &) = default;
-
-  stream_input_iterator &operator++()
-  {
-    advance();
-    return *this;
-  }
-
-  value_type const &operator*() const { return m_value; }
-
-  /// Comparison only works for comparing to end().
-  bool operator==(stream_input_iterator const &rhs) const
-  {
-    return m_home == rhs.m_home;
-  }
-  /// Comparison only works for comparing to end().
-  bool operator!=(stream_input_iterator const &rhs) const
-  {
-    return not(*this == rhs);
-  }
-
-private:
-  void advance()
-  {
-    if (m_home == nullptr)
-      throw usage_error{"Moving stream_from iterator beyond end()."};
-    if (not((*m_home) >> m_value))
-      m_home = nullptr;
-  }
-
-  stream_from *m_home{nullptr};
-  value_type m_value;
-};
-
-
-// C++20: Replace with generator?
-/// Iteration over a @ref stream_from.
-template<typename... TYPE> class stream_input_iteration
-{
-public:
-  using iterator = stream_input_iterator<TYPE...>;
-  explicit stream_input_iteration(stream_from &home) : m_home{home} {}
-  iterator begin() const { return iterator{m_home}; }
-  iterator end() const { return {}; }
-
-private:
-  stream_from &m_home;
-};
-
-
-// C++20: Replace with generator?
-/// Iteration over a @ref stream_from, deleting it once done.
-template<typename... TYPE> class owning_stream_input_iteration
-{
-public:
-  using iterator = stream_input_iterator<TYPE...>;
-  explicit owning_stream_input_iteration(std::unique_ptr<stream_from> &&home) :
-          m_home{std::move(home)}
-  {}
-  iterator begin() const { return iterator{*m_home.get()}; }
-  iterator end() const { return {}; }
-
-private:
-  std::unique_ptr<stream_from> m_home;
-};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/wait.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/wait.hxx
deleted file mode 100644
index 7a82e6553..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/internal/wait.hxx
+++ /dev/null
@@ -1,18 +0,0 @@
-#if !defined(PQXX_WAIT_HXX)
-#  define PQXX_WAIT_HXX
-
-namespace pqxx::internal
-{
-/// Wait.
-/** This is normally `std::this_thread::sleep_for()`.  But MinGW's `thread`
- * header doesn't work, so we must be careful about including it.
- */
-void PQXX_LIBEXPORT wait_for(unsigned int microseconds);
-
-
-/// Wait for a socket to be ready for reading/writing, or timeout.
-PQXX_LIBEXPORT void wait_fd(
-  int fd, bool for_read, bool for_write, unsigned seconds = 1,
-  unsigned microseconds = 0);
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/isolation b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/isolation
deleted file mode 100644
index 1b801329b..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/isolation
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Transaction isolation levels.
- *
- * Policies and traits describing SQL transaction isolation levels
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/isolation.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/isolation.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/isolation.hxx
deleted file mode 100644
index 0698c6ab4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/isolation.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Definitions for transaction isolation levels, and such.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/isolation instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ISOLATION
-#define PQXX_H_ISOLATION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Should a transaction be read-only, or read-write?
-/** No, this is not an isolation level.  So it really doesn't belong here.
- * But it's not really worth a separate header.
- */
-enum class write_policy
-{
-  read_only,
-  read_write
-};
-
-
-/// Transaction isolation levels.
-/** These are as defined in the SQL standard.  But there are a few notes
- * specific to PostgreSQL.
- *
- * First, postgres does not support "read uncommitted."  The lowest level you
- * can get is "read committed," which is better.  PostgreSQL is built on the
- * MVCC paradigm, which guarantees "read committed" isolation without any
- * additional performance overhead, so there was no point in providing the
- * lower level.
- *
- * Second, "repeatable read" also makes more isolation guarantees than the
- * standard requires.  According to the standard, this level prevents "dirty
- * reads" and "nonrepeatable reads," but not "phantom reads."  In postgres,
- * it actually prevents all three.
- *
- * Third, "serializable" is only properly supported starting at postgres 9.1.
- * If you request "serializable" isolation on an older backend, you will get
- * the same isolation as in "repeatable read."  It's better than the
- * "repeatable read" defined in the SQL standard, but not a complete
- * implementation of the standard's "serializable" isolation level.
- *
- * In general, a lower isolation level will allow more surprising interactions
- * between ongoing transactions, but improve performance.  A higher level
- * gives you more protection from subtle concurrency bugs, but sometimes it
- * may not be possible to complete your transaction without avoiding paradoxes
- * in the data.  In that case a transaction may fail, and the application will
- * have to re-do the whole thing based on the latest state of the database.
- * (If you want to retry your code in that situation, have a look at the
- * transactor framework.)
- *
- * Study the levels and design your application with the right level in mind.
- */
-enum isolation_level
-{
-  // PostgreSQL only has the better isolation levels.
-  // read_uncommitted,
-
-  read_committed,
-  repeatable_read,
-  serializable,
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/largeobject b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/largeobject
deleted file mode 100644
index 1f2f94790..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/largeobject
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Large Objects interface.
- *
- * Supports direct access to large objects, as well as through I/O streams
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/largeobject.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/largeobject.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/largeobject.hxx
deleted file mode 100644
index ebafc51d8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/largeobject.hxx
+++ /dev/null
@@ -1,735 +0,0 @@
-/* Large Objects interface.  Deprecated; use blob instead.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/largeobject instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_LARGEOBJECT
-#define PQXX_H_LARGEOBJECT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <streambuf>
-
-#include "pqxx/dbtransaction.hxx"
-
-
-namespace pqxx
-{
-/// Identity of a large object.
-/** @deprecated Use the @ref blob class instead.
- *
- * Encapsulates the identity of a large object.
- *
- * A largeobject must be accessed only from within a backend transaction, but
- * the object's identity remains valid as long as the object exists.
- */
-class PQXX_LIBEXPORT largeobject
-{
-public:
-  using size_type = large_object_size_type;
-
-  /// Refer to a nonexistent large object (similar to what a null pointer
-  /// does).
-  [[deprecated("Use blob instead.")]] largeobject() noexcept = default;
-
-  /// Create new large object.
-  /** @param t Backend transaction in which the object is to be created.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobject(dbtransaction &t);
-
-  /// Wrap object with given oid.
-  /** Convert combination of a transaction and object identifier into a
-   * large object identity.  Does not affect the database.
-   * @param o Object identifier for the given object.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobject(oid o) noexcept :
-          m_id{o}
-  {}
-
-  /// Import large object from a local file.
-  /** Creates a large object containing the data found in the given file.
-   * @param t Backend transaction in which the large object is to be created.
-   * @param file A filename on the client program's filesystem.
-   */
-  [[deprecated("Use blob instead.")]] largeobject(
-    dbtransaction &t, std::string_view file);
-
-  /// Take identity of an opened large object.
-  /** Copy identity of already opened large object.  Note that this may be done
-   * as an implicit conversion.
-   * @param o Already opened large object to copy identity from.
-   */
-  [[deprecated("Use blob instead.")]] largeobject(
-    largeobjectaccess const &o) noexcept;
-
-  /// Object identifier.
-  /** The number returned by this function identifies the large object in the
-   * database we're connected to (or oid_none is returned if we refer to the
-   * null object).
-   */
-  [[nodiscard]] oid id() const noexcept { return m_id; }
-
-  /**
-   * @name Identity comparisons
-   *
-   * These operators compare the object identifiers of large objects.  This has
-   * nothing to do with the objects' actual contents; use them only for keeping
-   * track of containers of references to large objects and such.
-   */
-  //@{
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator==(largeobject const &other) const
-  {
-    return m_id == other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator!=(largeobject const &other) const
-  {
-    return m_id != other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator<=(largeobject const &other) const
-  {
-    return m_id <= other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator>=(largeobject const &other) const
-  {
-    return m_id >= other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator<(largeobject const &other) const
-  {
-    return m_id < other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator>(largeobject const &other) const
-  {
-    return m_id > other.m_id;
-  }
-  //@}
-
-  /// Export large object's contents to a local file
-  /** Writes the data stored in the large object to the given file.
-   * @param t Transaction in which the object is to be accessed
-   * @param file A filename on the client's filesystem
-   */
-  void to_file(dbtransaction &t, std::string_view file) const;
-
-  /// Delete large object from database
-  /** Unlike its low-level equivalent cunlink, this will throw an exception if
-   * deletion fails.
-   * @param t Transaction in which the object is to be deleted
-   */
-  void remove(dbtransaction &t) const;
-
-protected:
-  PQXX_PURE static internal::pq::PGconn *
-  raw_connection(dbtransaction const &T);
-
-  PQXX_PRIVATE std::string reason(connection const &, int err) const;
-
-private:
-  oid m_id = oid_none;
-};
-
-
-/// Accessor for large object's contents.
-/** @deprecated Use the `blob` class instead.
- */
-class PQXX_LIBEXPORT largeobjectaccess : private largeobject
-{
-public:
-  using largeobject::size_type;
-  using off_type = size_type;
-  using pos_type = size_type;
-
-  /// Open mode: `in`, `out` (can be combined using "bitwise or").
-  /** According to the C++ standard, these should be in `std::ios_base`.  We
-   * take them from derived class `std::ios` instead, which is easier on the
-   * eyes.
-   *
-   * Historical note: taking it from std::ios was originally a workaround for a
-   * problem with gcc 2.95.
-   */
-  using openmode = std::ios::openmode;
-
-  /// Default open mode: in, out, binary.
-  static constexpr auto default_mode{
-    std::ios::in | std::ios::out | std::ios::binary};
-
-  /// Seek direction: `beg`, `cur`, `end`.
-  using seekdir = std::ios::seekdir;
-
-  /// Create new large object and open it.
-  /**
-   * @param t Backend transaction in which the object is to be created.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobjectaccess(
-    dbtransaction &t, openmode mode = default_mode);
-
-  /// Open large object with given oid.
-  /** Convert combination of a transaction and object identifier into a
-   * large object identity.  Does not affect the database.
-   * @param t Transaction in which the object is to be accessed.
-   * @param o Object identifier for the given object.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, oid o, openmode mode = default_mode);
-
-  /// Open given large object.
-  /** Open a large object with the given identity for reading and/or writing.
-   * @param t Transaction in which the object is to be accessed.
-   * @param o Identity for the large object to be accessed.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, largeobject o, openmode mode = default_mode);
-
-  /// Import large object from a local file and open it.
-  /** Creates a large object containing the data found in the given file.
-   * @param t Backend transaction in which the large object is to be created.
-   * @param file A filename on the client program's filesystem.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, std::string_view file, openmode mode = default_mode);
-
-  ~largeobjectaccess() noexcept { close(); }
-
-  /// Object identifier.
-  /** The number returned by this function uniquely identifies the large object
-   * in the context of the database we're connected to.
-   */
-  using largeobject::id;
-
-  /// Export large object's contents to a local file.
-  /** Writes the data stored in the large object to the given file.
-   * @param file A filename on the client's filesystem.
-   */
-  void to_file(std::string_view file) const
-  {
-    largeobject::to_file(m_trans, file);
-  }
-
-  using largeobject::to_file;
-
-  /**
-   * @name High-level access to object contents.
-   */
-  //@{
-  /// Write data to large object.
-  /** @warning The size of a write is currently limited to 2GB.
-   *
-   * @param buf Data to write.
-   * @param len Number of bytes from Buf to write.
-   */
-  void write(char const buf[], std::size_t len);
-
-  /// Write string to large object.
-  /** If not all bytes could be written, an exception is thrown.
-   * @param buf Data to write; no terminating zero is written.
-   */
-  void write(std::string_view buf) { write(std::data(buf), std::size(buf)); }
-
-  /// Read data from large object.
-  /** Throws an exception if an error occurs while reading.
-   * @param buf Location to store the read data in.
-   * @param len Number of bytes to try and read.
-   * @return Number of bytes read, which may be less than the number requested
-   * if the end of the large object is reached.
-   */
-  size_type read(char buf[], std::size_t len);
-
-  /// Seek in large object's data stream.
-  /** Throws an exception if an error occurs.
-   * @return The new position in the large object
-   */
-  size_type seek(size_type dest, seekdir dir);
-
-  /// Report current position in large object's data stream.
-  /** Throws an exception if an error occurs.
-   * @return The current position in the large object.
-   */
-  [[nodiscard]] size_type tell() const;
-  //@}
-
-  /**
-   * @name Low-level access to object contents.
-   *
-   * These functions provide a more "C-like" access interface, returning
-   * special values instead of throwing exceptions on error.  These functions
-   * are generally best avoided in favour of the high-level access functions,
-   * which behave more like C++ functions should.
-   *
-   * Due to libpq's underlying API, some operations are limited to "int"
-   * sizes, typically 2 GB, even though a large object can grow much larger.
-   */
-  //@{
-  /// Seek in large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param dest Offset to go to.
-   * @param dir Origin to which dest is relative: ios_base::beg (from beginning
-   *        of the object), ios_base::cur (from current access position), or
-   *        ios_base;:end (from end of object).
-   * @return New position in large object, or -1 if an error occurred.
-   */
-  pos_type cseek(off_type dest, seekdir dir) noexcept;
-
-  /// Write to large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param buf Data to write.
-   * @param len Number of bytes to write.
-   * @return Number of bytes actually written, or -1 if an error occurred.
-   */
-  off_type cwrite(char const buf[], std::size_t len) noexcept;
-
-  /// Read from large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param buf Area where incoming bytes should be stored.
-   * @param len Number of bytes to read.
-   * @return Number of bytes actually read, or -1 if an error occurred..
-   */
-  off_type cread(char buf[], std::size_t len) noexcept;
-
-  /// Report current position in large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @return Current position in large object, of -1 if an error occurred.
-   */
-  [[nodiscard]] pos_type ctell() const noexcept;
-  //@}
-
-  /**
-   * @name Error/warning output
-   */
-  //@{
-  /// Issue message to transaction's notice processor.
-  void process_notice(zview) noexcept;
-  //@}
-
-  using largeobject::remove;
-
-  using largeobject::operator==;
-  using largeobject::operator!=;
-  using largeobject::operator<;
-  using largeobject::operator<=;
-  using largeobject::operator>;
-  using largeobject::operator>=;
-
-  largeobjectaccess() = delete;
-  largeobjectaccess(largeobjectaccess const &) = delete;
-  largeobjectaccess operator=(largeobjectaccess const &) = delete;
-
-private:
-  PQXX_PRIVATE std::string reason(int err) const;
-  internal::pq::PGconn *raw_connection() const
-  {
-    return largeobject::raw_connection(m_trans);
-  }
-
-  PQXX_PRIVATE void open(openmode mode);
-  void close() noexcept;
-
-  dbtransaction &m_trans;
-  int m_fd = -1;
-};
-
-
-/// Streambuf to use large objects in standard I/O streams.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * The standard streambuf classes provide uniform access to data storage such
- * as files or string buffers, so they can be accessed using standard input or
- * output streams.  This streambuf implementation provided similar access to
- * large objects, so they could be read and written using the same stream
- * classes.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class largeobject_streambuf : public std::basic_streambuf<CHAR, TRAITS>
-{
-  using size_type = largeobject::size_type;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-  using openmode = largeobjectaccess::openmode;
-  using seekdir = largeobjectaccess::seekdir;
-
-  /// Default open mode: in, out, binary.
-  static constexpr auto default_mode{
-    std::ios::in | std::ios::out | std::ios::binary};
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  [[deprecated("Use blob instead.")]] largeobject_streambuf(
-    dbtransaction &t, largeobject o, openmode mode = default_mode,
-    size_type buf_size = 512) :
-          m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr}
-  {
-    initialize(mode);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  [[deprecated("Use blob instead.")]] largeobject_streambuf(
-    dbtransaction &t, oid o, openmode mode = default_mode,
-    size_type buf_size = 512) :
-          m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr}
-  {
-    initialize(mode);
-  }
-
-  virtual ~largeobject_streambuf() noexcept
-  {
-    delete[] m_p;
-    delete[] m_g;
-  }
-
-  /// For use by large object stream classes.
-  void process_notice(zview const &s) { m_obj.process_notice(s); }
-
-protected:
-  virtual int sync() override
-  {
-    // setg() sets eback, gptr, egptr.
-    this->setg(this->eback(), this->eback(), this->egptr());
-    return overflow(eof());
-  }
-
-  virtual pos_type seekoff(off_type offset, seekdir dir, openmode) override
-  {
-    return adjust_eof(m_obj.cseek(largeobjectaccess::off_type(offset), dir));
-  }
-
-  virtual pos_type seekpos(pos_type pos, openmode) override
-  {
-    largeobjectaccess::pos_type const newpos{
-      m_obj.cseek(largeobjectaccess::off_type(pos), std::ios::beg)};
-    return adjust_eof(newpos);
-  }
-
-  virtual int_type overflow(int_type ch) override
-  {
-    auto *const pp{this->pptr()};
-    if (pp == nullptr)
-      return eof();
-    auto *const pb{this->pbase()};
-    int_type res{0};
-
-    if (pp > pb)
-    {
-      auto const write_sz{pp - pb};
-      auto const written_sz{
-        m_obj.cwrite(pb, static_cast<std::size_t>(pp - pb))};
-      if (internal::cmp_less_equal(written_sz, 0))
-        throw internal_error{
-          "pqxx::largeobject: write failed "
-          "(is transaction still valid on write or flush?), "
-          "libpq reports error"};
-      else if (write_sz != written_sz)
-        throw internal_error{
-          "pqxx::largeobject: write failed "
-          "(is transaction still valid on write or flush?), " +
-          std::to_string(written_sz) + "/" + std::to_string(write_sz) +
-          " bytes written"};
-      auto const out{adjust_eof(written_sz)};
-
-      if constexpr (std::is_arithmetic_v<decltype(out)>)
-        res = check_cast<int_type>(out, "largeobject position"sv);
-      else
-        res = int_type(out);
-    }
-    this->setp(m_p, m_p + m_bufsize);
-
-    // Write that one more character, if it's there.
-    if (ch != eof())
-    {
-      *this->pptr() = static_cast<char_type>(ch);
-      this->pbump(1);
-    }
-    return res;
-  }
-
-  virtual int_type overflow() { return overflow(eof()); }
-
-  virtual int_type underflow() override
-  {
-    if (this->gptr() == nullptr)
-      return eof();
-    auto *const eb{this->eback()};
-    auto const res{adjust_eof(
-      m_obj.cread(this->eback(), static_cast<std::size_t>(m_bufsize)))};
-    this->setg(
-      eb, eb, eb + (res == eof() ? 0 : static_cast<std::size_t>(res)));
-    return (res == eof() or res == 0) ? eof() : traits_type::to_int_type(*eb);
-  }
-
-private:
-  /// Shortcut for traits_type::eof().
-  static int_type eof() { return traits_type::eof(); }
-
-  /// Helper: change error position of -1 to EOF (probably a no-op).
-  template<typename INTYPE> static std::streampos adjust_eof(INTYPE pos)
-  {
-    bool const at_eof{pos == -1};
-    if constexpr (std::is_arithmetic_v<std::streampos>)
-    {
-      return check_cast<std::streampos>(
-        (at_eof ? eof() : pos), "large object seek"sv);
-    }
-    else
-    {
-      return std::streampos(at_eof ? eof() : pos);
-    }
-  }
-
-  void initialize(openmode mode)
-  {
-    if ((mode & std::ios::in) != 0)
-    {
-      m_g = new char_type[unsigned(m_bufsize)];
-      this->setg(m_g, m_g, m_g);
-    }
-    if ((mode & std::ios::out) != 0)
-    {
-      m_p = new char_type[unsigned(m_bufsize)];
-      this->setp(m_p, m_p + m_bufsize);
-    }
-  }
-
-  size_type const m_bufsize;
-  largeobjectaccess m_obj;
-
-  /// Get & put buffers.
-  char_type *m_g, *m_p;
-};
-
-
-/// Input stream that gets its data from a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This class worked like any other istream, but to read data from a large
- * object.  It supported all formatting and streaming operations of
- * `std::istream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_ilostream : public std::basic_istream<CHAR, TRAITS>
-{
-  using super = std::basic_istream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create a basic_ilostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_ilostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::in | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// Create a basic_ilostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Identifier of a large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_ilostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::in | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using ilostream = basic_ilostream<char>;
-
-
-/// Output stream that writes data back to a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This worked like any other ostream, but to write data to a large object.
- * It supported all formatting and streaming operations of `std::ostream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_olostream : public std::basic_ostream<CHAR, TRAITS>
-{
-  using super = std::basic_ostream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create a basic_olostream.
-  /**
-   * @param t transaction in which this stream is to exist.
-   * @param o a large object to access.
-   * @param buf_size size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_olostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// Create a basic_olostream.
-  /**
-   * @param t transaction in which this stream is to exist.
-   * @param o a large object to access.
-   * @param buf_size size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_olostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  ~basic_olostream()
-  {
-    try
-    {
-      m_buf.pubsync();
-      m_buf.pubsync();
-    }
-    catch (std::exception const &e)
-    {
-      m_buf.process_notice(e.what());
-    }
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using olostream = basic_olostream<char>;
-
-
-/// Stream that reads and writes a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This worked like a std::iostream, but to read data from, or write data to, a
- * large object.  It supported all formatting and streaming operations of
- * `std::iostream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_lostream : public std::basic_iostream<CHAR, TRAITS>
-{
-  using super = std::basic_iostream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-  /// Create a basic_lostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_lostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{
-            t, o, std::ios::in | std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  /// Create a basic_lostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_lostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{
-            t, o, std::ios::in | std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  ~basic_lostream()
-  {
-    try
-    {
-      m_buf.pubsync();
-      m_buf.pubsync();
-    }
-    catch (std::exception const &e)
-    {
-      m_buf.process_notice(e.what());
-    }
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using lostream = basic_lostream<char>;
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/nontransaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/nontransaction
deleted file mode 100644
index bb5b79724..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/nontransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::nontransaction class.
- *
- * pqxx::nontransaction provides nontransactional database access.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/nontransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/nontransaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/nontransaction.hxx
deleted file mode 100644
index c50715594..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/nontransaction.hxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Definition of the pqxx::nontransaction class.
- *
- * pqxx::nontransaction provides nontransactional database access
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/nontransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_NONTRANSACTION
-#define PQXX_H_NONTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/connection.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/transaction.hxx"
-
-namespace pqxx
-{
-using namespace std::literals;
-
-/// Simple "transaction" class offering no transactional integrity.
-/**
- * @ingroup transactions
- *
- * nontransaction, like transaction or any other transaction_base-derived
- * class, provides access to a database through a connection.  Unlike its
- * siblings, however, nontransaction does not maintain any kind of
- * transactional integrity.  This may be useful eg. for read-only access to the
- * database that does not require a consistent, atomic view on its data; or for
- * operations that are not allowed within a backend transaction, such as
- * creating tables.
- *
- * For queries that update the database, however, a real transaction is likely
- * to be faster unless the transaction consists of only a single record update.
- *
- * Also, you can keep a nontransaction open for as long as you like.  Actual
- * back-end transactions are limited in lifespan, and will sometimes fail just
- * because they took too long to execute or were left idle for too long.  This
- * will not happen with a nontransaction (although the connection may still
- * time out, e.g. when the network is unavailable for a very long time).
- *
- * Any query executed in a nontransaction is committed immediately, and neither
- * commit() nor abort() has any effect.
- *
- * Database features that require a backend transaction, such as cursors or
- * large objects, will not work in a nontransaction.
- */
-class PQXX_LIBEXPORT nontransaction final : public transaction_base
-{
-public:
-  /// Constructor.
-  /** Create a "dummy" transaction.
-   * @param c Connection in which this "transaction" will operate.
-   * @param tname Optional tname for the transaction, beginning with a letter
-   * and containing only letters and digits.
-   */
-  nontransaction(connection &c, std::string_view tname = ""sv) :
-          transaction_base{c, tname, std::shared_ptr<std::string>{}}
-  {
-    register_transaction();
-  }
-
-  virtual ~nontransaction() override { close(); }
-
-private:
-  virtual void do_commit() override {}
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/notification b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/notification
deleted file mode 100644
index a0bd1c73e..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/notification
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::notification_receiver functor interface.
- *
- * pqxx::notification_receiver handles incoming notifications.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/notification.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/notification.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/notification.hxx
deleted file mode 100644
index b59b8567a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/notification.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Definition of the pqxx::notification_receiver functor interface.
- *
- * pqxx::notification_receiver handles incoming notifications.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/notification instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_NOTIFICATION
-#define PQXX_H_NOTIFICATION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <string>
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx
-{
-/// "Observer" base class for notifications.
-/** @addtogroup notification Notifications and Receivers
- *
- * To listen on a notification issued using the NOTIFY command, derive your own
- * class from notification_receiver and define its function-call operator to
- * perform whatever action you wish to take when the given notification
- * arrives. Then create an object of that class and pass it to your connection.
- * DO NOT use raw SQL to listen for notifications, or your attempts to listen
- * won't be resumed when a connection fails--and you'll have no way to notice.
- *
- * Notifications never arrive inside a transaction, not even in a
- * nontransaction.  Therefore, you are free to open a transaction of your own
- * inside your receiver's function invocation operator.
- *
- * Notifications you are listening for may arrive anywhere within libpqxx code,
- * but be aware that **PostgreSQL defers notifications occurring inside
- * transactions.**  (This was done for excellent reasons; just think about what
- * happens if the transaction where you happen to handle an incoming
- * notification is later rolled back for other reasons).  So if you're keeping
- * a transaction open, don't expect any of your receivers on the same
- * connection to be notified.
- *
- * (For very similar reasons, outgoing notifications are also not sent until
- * the transaction that sends them commits.)
- *
- * Multiple receivers on the same connection may listen on a notification of
- * the same name.  An incoming notification is processed by invoking all
- * receivers (zero or more) of the same name.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE notification_receiver
-{
-public:
-  /// Register the receiver with a connection.
-  /**
-   * @param c Connnection to operate on.
-   * @param channel Name of the notification to listen for.
-   */
-  notification_receiver(connection &c, std::string_view channel);
-  /// Register the receiver with a connection.
-  notification_receiver(notification_receiver const &) = delete;
-  /// Register the receiver with a connection.
-  notification_receiver &operator=(notification_receiver const &) = delete;
-  /// Deregister the receiver.
-  virtual ~notification_receiver();
-
-  /// The channel that this receiver listens on.
-  [[nodiscard]] std::string const &channel() const & { return m_channel; }
-
-  // TODO: Change API to take payload as zview instead of string ref.
-  /// Overridable: action to invoke when notification arrives.
-  /**
-   * @param payload An optional string that may have been passed to the NOTIFY
-   * command.
-   * @param backend_pid Process ID of the database backend process that served
-   * our connection when the notification arrived.  The actual process ID
-   * behind the connection may have changed by the time this method is called.
-   */
-  virtual void operator()(std::string const &payload, int backend_pid) = 0;
-
-protected:
-  connection &conn() const noexcept { return m_conn; }
-
-private:
-  connection &m_conn;
-  std::string m_channel;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/params b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/params
deleted file mode 100644
index 4098782aa..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/params
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Helper classes for passing statement parameters.
- *
- * Use these for prepared statements and parameterised statements.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/params.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/params.hxx
deleted file mode 100644
index 2d29cdfed..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/params.hxx
+++ /dev/null
@@ -1,383 +0,0 @@
-/* Helpers for prepared statements and parameterised statements.
- *
- * See the connection class for more about such statements.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_PARAMS
-#define PQXX_H_PARAMS
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <array>
-
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/statement_parameters.hxx"
-#include "pqxx/types.hxx"
-
-
-/// @deprecated The new @ref params class replaces all of this.
-namespace pqxx::prepare
-{
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * sequence ranging from `begin` to `end` exclusively.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic sequences.
- *
- * @param begin A pointer or iterator for iterating parameters.
- * @param end A pointer or iterator for iterating parameters.
- * @return An object representing the parameters.
- */
-template<typename IT>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(IT begin, IT end)
-{
-  return pqxx::internal::dynamic_params(begin, end);
-}
-
-
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * container of parameter values.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic containers.
- *
- * @param container A container of parameter values.
- * @return An object representing the parameters.
- */
-template<typename C>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(C const &container)
-{
-  using IT = typename C::const_iterator;
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return pqxx::internal::dynamic_params<IT>{container};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * container of parameter values.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic containers.
- *
- * @param container A container of parameter values.
- * @param accessor For each parameter `p`, pass `accessor(p)`.
- * @return An object representing the parameters.
- */
-template<typename C, typename ACCESSOR>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(C &container, ACCESSOR accessor)
-{
-  using IT = decltype(std::begin(container));
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return pqxx::internal::dynamic_params<IT, ACCESSOR>{container, accessor};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-} // namespace pqxx::prepare
-
-
-namespace pqxx
-{
-/// Generate parameter placeholders for use in an SQL statement.
-/** When you want to pass parameters to a prepared statement or a parameterised
- * statement, you insert placeholders into the SQL.  During invocation, the
- * database replaces those with the respective parameter values you passed.
- *
- * The placeholders look like `$1` (for the first parameter value), `$2` (for
- * the second), and so on.  You can just write those directly in your
- * statement.  But for those rare cases where it becomes difficult to track
- * which number a placeholder should have, you can use a `placeholders` object
- * to count and generate them in order.
- */
-template<typename COUNTER = unsigned int> class placeholders
-{
-public:
-  /// Maximum number of parameters we support.
-  static inline constexpr unsigned int max_params{
-    (std::numeric_limits<COUNTER>::max)()};
-
-  placeholders()
-  {
-    static constexpr auto initial{"$1\0"sv};
-    initial.copy(std::data(m_buf), std::size(initial));
-  }
-
-  /// Read an ephemeral version of the current placeholder text.
-  /** @warning Changing the current placeholder number will overwrite this.
-   * Use the view immediately, or lose it.
-   */
-  constexpr zview view() const &noexcept
-  {
-    return zview{std::data(m_buf), m_len};
-  }
-
-  /// Read the current placeholder text, as a `std::string`.
-  /** This will be slightly slower than converting to a `zview`.  With most
-   * C++ implementations however, until you get into ridiculous numbers of
-   * parameters, the string will benefit from the Short String Optimization, or
-   * SSO.
-   */
-  std::string get() const { return std::string(std::data(m_buf), m_len); }
-
-  /// Move on to the next parameter.
-  void next() &
-  {
-    if (m_current >= max_params)
-      throw range_error{pqxx::internal::concat(
-        "Too many parameters in one statement: limit is ", max_params, ".")};
-    ++m_current;
-    if (m_current % 10 == 0)
-    {
-      // Carry the 1.  Don't get too clever for this relatively rare
-      // case, just rewrite the entire number.  Leave the $ in place
-      // though.
-      char *const data{std::data(m_buf)};
-      char *const end{string_traits<COUNTER>::into_buf(
-        data + 1, data + std::size(m_buf), m_current)};
-      // (Subtract because we don't include the trailing zero.)
-      m_len = check_cast<COUNTER>(end - data, "placeholders counter") - 1;
-    }
-    else
-    {
-      PQXX_LIKELY
-      // Shortcut for the common case: just increment that last digit.
-      ++m_buf[m_len - 1];
-    }
-  }
-
-  /// Return the current placeholder number.  The initial placeholder is 1.
-  COUNTER count() const noexcept { return m_current; }
-
-private:
-  /// Current placeholder number.  Starts at 1.
-  COUNTER m_current = 1;
-
-  /// Length of the current placeholder string, not including trailing zero.
-  COUNTER m_len = 2;
-
-  /// Text buffer where we render the placeholders, with a trailing zero.
-  /** We keep reusing this for every subsequent placeholder, just because we
-   * don't like string allocations.
-   *
-   * Maximum length is the maximum base-10 digits that COUNTER can fully
-   * represent, plus 1 more for the extra digit that it can only partially
-   * fill up, plus room for the dollar sign and the trailing zero.
-   */
-  std::array<char, std::numeric_limits<COUNTER>::digits10 + 3> m_buf;
-};
-
-
-/// Build a parameter list for a parameterised or prepared statement.
-/** When calling a parameterised statement or a prepared statement, you can
- * pass parameters into the statement directly in the invocation, as
- * additional arguments to `exec_prepared` or `exec_params`.  But in
- * complex cases, sometimes that's just not convenient.
- *
- * In those situations, you can create a `params` and append your parameters
- * into that, one by one.  Then you pass the `params` to `exec_prepared` or
- * `exec_params`.
- *
- * Combinations also work: if you have a `params` containing a string
- * parameter, and you call `exec_params` with an `int` argument followed by
- * your `params`, you'll be passing the `int` as the first parameter and
- * the string as the second.  You can even insert a `params` in a `params`,
- * or pass two `params` objects to a statement.
- */
-class PQXX_LIBEXPORT params
-{
-public:
-  params() = default;
-
-  /// Pre-populate a `params` with `args`.  Feel free to add more later.
-  template<typename... Args> constexpr params(Args &&...args)
-  {
-    reserve(sizeof...(args));
-    append_pack(std::forward<Args>(args)...);
-  }
-
-  /// Pre-allocate room for at least `n` parameters.
-  /** This is not needed, but it may improve efficiency.
-   *
-   * Reserve space if you're going to add parameters individually, and you've
-   * got some idea of how many there are going to be.  It may save some
-   * memory re-allocations.
-   */
-  void reserve(std::size_t n) &;
-
-  // C++20: constexpr.
-  /// Get the number of parameters currently in this `params`.
-  [[nodiscard]] auto size() const noexcept { return m_params.size(); }
-
-  // C++20: Use the vector's ssize() directly and go noexcept+constexpr.
-  /// Get the number of parameters (signed).
-  /** Unlike `size()`, this is not yet `noexcept`.  That's because C++17's
-   * `std::vector` does not have a `ssize()` member function.  These member
-   * functions are `noexcept`, but `std::size()` and `std::ssize()` are
-   * not.
-   */
-  [[nodiscard]] auto ssize() const { return pqxx::internal::ssize(m_params); }
-
-  /// Append a null value.
-  void append() &;
-
-  /// Append a non-null zview parameter.
-  /** The underlying data must stay valid for as long as the `params`
-   * remains active.
-   */
-  void append(zview) &;
-
-  /// Append a non-null string parameter.
-  /** Copies the underlying data into internal storage.  For best efficiency,
-   * use the @ref zview variant if you can, or `std::move()`
-   */
-  void append(std::string const &) &;
-
-  /// Append a non-null string parameter.
-  void append(std::string &&) &;
-
-  /// Append a non-null binary parameter.
-  /** The underlying data must stay valid for as long as the `params`
-   * remains active.
-   */
-  void append(std::basic_string_view<std::byte>) &;
-
-  /// Append a non-null binary parameter.
-  /** Copies the underlying data into internal storage.  For best efficiency,
-   * use the `std::basic_string_view<std::byte>` variant if you can, or
-   * `std::move()`.
-   */
-  void append(std::basic_string<std::byte> const &) &;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Append a non-null binary parameter.
-  /** The `data` object must stay in place and unchanged, for as long as the
-   * `params` remains active.
-   */
-  template<binary DATA> void append(DATA const &data) &
-  {
-    append(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif // PQXX_HAVE_CONCEPTS
-
-  /// Append a non-null binary parameter.
-  void append(std::basic_string<std::byte> &&) &;
-
-  /// @deprecated Append binarystring parameter.
-  /** The binarystring must stay valid for as long as the `params` remains
-   * active.
-   */
-  void append(binarystring const &value) &;
-
-  /// Append all parameters from value.
-  template<typename IT, typename ACCESSOR>
-  void append(pqxx::internal::dynamic_params<IT, ACCESSOR> const &value) &
-  {
-    for (auto &param : value) append(value.access(param));
-  }
-
-  void append(params const &value) &;
-
-  void append(params &&value) &;
-
-  /// Append a non-null parameter, converting it to its string
-  /// representation.
-  template<typename TYPE> void append(TYPE const &value) &
-  {
-    // TODO: Pool storage for multiple string conversions in one buffer?
-    if constexpr (nullness<strip_t<TYPE>>::always_null)
-    {
-      ignore_unused(value);
-      m_params.emplace_back();
-    }
-    else if (is_null(value))
-    {
-      m_params.emplace_back();
-    }
-    else
-    {
-      m_params.emplace_back(entry{to_string(value)});
-    }
-  }
-
-  /// Append all elements of `range` as parameters.
-  template<PQXX_RANGE_ARG RANGE> void append_multi(RANGE const &range) &
-  {
-#if defined(PQXX_HAVE_CONCEPTS)
-    if constexpr (std::ranges::sized_range<RANGE>)
-      reserve(std::size(*this) + std::size(range));
-#endif
-    for (auto &value : range) append(value);
-  }
-
-  /// For internal use: Generate a `params` object for use in calls.
-  /** The params object encapsulates the pointers which we will need to pass
-   * to libpq when calling a parameterised or prepared statement.
-   *
-   * The pointers in the params will refer to storage owned by either the
-   * params object, or the caller.  This is not a problem because a
-   * `c_params` object is guaranteed to live only while the call is going on.
-   * As soon as we climb back out of that call tree, we're done with that
-   * data.
-   */
-  pqxx::internal::c_params make_c_params() const;
-
-private:
-  /// Recursively append a pack of params.
-  template<typename Arg, typename... More>
-  void append_pack(Arg &&arg, More &&...args)
-  {
-    this->append(std::forward<Arg>(arg));
-    // Recurse for remaining args.
-    append_pack(std::forward<More>(args)...);
-  }
-
-  /// Terminating case: append an empty parameter pack.  It's not hard BTW.
-  constexpr void append_pack() noexcept {}
-
-  // The way we store a parameter depends on whether it's binary or text
-  // (most types are text), and whether we're responsible for storing the
-  // contents.
-  using entry = std::variant<
-    std::nullptr_t, zview, std::string, std::basic_string_view<std::byte>,
-    std::basic_string<std::byte>>;
-  std::vector<entry> m_params;
-
-  static constexpr std::string_view s_overflow{
-    "Statement parameter length overflow."sv};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pipeline b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pipeline
deleted file mode 100644
index bf828843a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pipeline
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::pipeline class.
- *
- * Throughput-optimized query interface.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/pipeline.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pipeline.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pipeline.hxx
deleted file mode 100644
index 049dcdd58..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pipeline.hxx
+++ /dev/null
@@ -1,237 +0,0 @@
-/* Definition of the pqxx::pipeline class.
- *
- *   Throughput-optimized mechanism for executing queries.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/pipeline instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_PIPELINE
-#define PQXX_H_PIPELINE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <limits>
-#include <map>
-#include <string>
-
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-// TODO: libpq 14 introduced a similar "pipeline mode."  Can we use that?
-
-/// Processes several queries in FIFO manner, optimized for high throughput.
-/** Use a pipeline if you want to keep doing useful work while your queries are
- * executing.  Result retrieval is decoupled from execution request; queries
- * "go in at the front" and results "come out the back."
- *
- * Actually, you can retrieve the results in any order if you want, but it may
- * lead to surprising "time travel" effects if any of the queries fails.  In
- * particular, syntax errors in the queries can confuse things and show up too
- * early in the stream of results.
- *
- * Generally, if any of the queries fails, it will throw an exception at the
- * point where you request its result.  But it may happen earlier, especially
- * if you request results out of chronological order.
- *
- * @warning While a pipeline is active, you cannot execute queries, open
- * streams, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT pipeline : public transaction_focus
-{
-public:
-  /// Identifying numbers for queries.
-  using query_id = long;
-
-  pipeline(pipeline const &) = delete;
-  pipeline &operator=(pipeline const &) = delete;
-
-  /// Start a pipeline.
-  explicit pipeline(transaction_base &t) : transaction_focus{t, s_classname}
-  {
-    init();
-  }
-  /// Start a pipeline.  Assign it a name, for more helpful error messages.
-  pipeline(transaction_base &t, std::string_view tname) :
-          transaction_focus{t, s_classname, tname}
-  {
-    init();
-  }
-
-  /// Close the pipeline.
-  ~pipeline() noexcept;
-
-  /// Add query to the pipeline.
-  /** Queries accumulate in the pipeline, which sends them to the backend in a
-   * batch separated by semicolons.  The queries you insert must not use this
-   * trick themselves, or the pipeline will get hopelessly confused!
-   *
-   * @return Identifier for this query, unique only within this pipeline.
-   */
-  query_id insert(std::string_view) &;
-
-  /// Wait for all ongoing or pending operations to complete, and detach.
-  /** Detaches from the transaction when done.
-   *
-   * This does not produce the queries' results, so it may not report any
-   * errors which may have occurred in their execution.  To be sure that your
-   * statements succeeded, call @ref retrieve until the pipeline is empty.
-   */
-  void complete();
-
-  /// Forget all ongoing or pending operations and retrieved results.
-  /** Queries already sent to the backend may still be completed, depending
-   * on implementation and timing.
-   *
-   * Any error state (unless caused by an internal error) will also be cleared.
-   * This is mostly useful in a nontransaction, since a backend transaction is
-   * aborted automatically when an error occurs.
-   *
-   * Detaches from the transaction when done.
-   */
-  void flush();
-
-  /// Cancel ongoing query, if any.
-  /** May cancel any or all of the queries that have been inserted at this
-   * point whose results have not yet been retrieved.  If the pipeline lives in
-   * a backend transaction, that transaction may be left in a nonfunctional
-   * state in which it can only be aborted.
-   *
-   * Therefore, either use this function in a nontransaction, or abort the
-   * transaction after calling it.
-   */
-  void cancel();
-
-  /// Is result for given query available?
-  [[nodiscard]] bool is_finished(query_id) const;
-
-  /// Retrieve result for given query.
-  /** If the query failed for whatever reason, this will throw an exception.
-   * The function will block if the query has not finished yet.
-   * @warning If results are retrieved out-of-order, i.e. in a different order
-   * than the one in which their queries were inserted, errors may "propagate"
-   * to subsequent queries.
-   */
-  result retrieve(query_id qid)
-  {
-    return retrieve(m_queries.find(qid)).second;
-  }
-
-  /// Retrieve oldest unretrieved result (possibly wait for one).
-  /** @return The query's identifier and its result set. */
-  std::pair<query_id, result> retrieve();
-
-  [[nodiscard]] bool empty() const noexcept { return std::empty(m_queries); }
-
-  /// Set maximum number of queries to retain before issuing them to the
-  /// backend.
-  /** The pipeline will perform better if multiple queries are issued at once,
-   * but retaining queries until the results are needed (as opposed to issuing
-   * them to the backend immediately) may negate any performance benefits the
-   * pipeline can offer.
-   *
-   * Recommended practice is to set this value no higher than the number of
-   * queries you intend to insert at a time.
-   * @param retain_max A nonnegative "retention capacity;" passing zero will
-   * cause queries to be issued immediately
-   * @return Old retention capacity
-   */
-  int retain(int retain_max = 2) &;
-
-
-  /// Resume retained query emission.  Harmless when not needed.
-  void resume() &;
-
-private:
-  struct PQXX_PRIVATE Query
-  {
-    explicit Query(std::string_view q) :
-            query{std::make_shared<std::string>(q)}
-    {}
-
-    std::shared_ptr<std::string> query;
-    result res;
-  };
-
-  using QueryMap = std::map<query_id, Query>;
-
-  void init();
-  void attach();
-  void detach();
-
-  /// Upper bound to query id's.
-  static constexpr query_id qid_limit() noexcept
-  {
-    // Parenthesise this to work around an eternal Visual C++ problem:
-    // Without the extra parentheses, unless NOMINMAX is defined, the
-    // preprocessor will mistake this "max" for its annoying built-in macro
-    // of the same name.
-    return (std::numeric_limits<query_id>::max)();
-  }
-
-  /// Create new query_id.
-  PQXX_PRIVATE query_id generate_id();
-
-  bool have_pending() const noexcept
-  {
-    return m_issuedrange.second != m_issuedrange.first;
-  }
-
-  PQXX_PRIVATE void issue();
-
-  /// The given query failed; never issue anything beyond that.
-  void set_error_at(query_id qid) noexcept
-  {
-    PQXX_UNLIKELY
-    if (qid < m_error)
-      m_error = qid;
-  }
-
-  /// Throw pqxx::internal_error.
-  [[noreturn]] PQXX_PRIVATE void internal_error(std::string const &err);
-
-  PQXX_PRIVATE bool obtain_result(bool expect_none = false);
-
-  PQXX_PRIVATE void obtain_dummy();
-  PQXX_PRIVATE void get_further_available_results();
-  PQXX_PRIVATE void check_end_results();
-
-  /// Receive any results that happen to be available; it's not urgent.
-  PQXX_PRIVATE void receive_if_available();
-
-  /// Receive results, up to stop if possible.
-  PQXX_PRIVATE void receive(pipeline::QueryMap::const_iterator stop);
-  std::pair<pipeline::query_id, result> retrieve(pipeline::QueryMap::iterator);
-
-  QueryMap m_queries;
-  std::pair<QueryMap::iterator, QueryMap::iterator> m_issuedrange;
-  int m_retain = 0;
-  int m_num_waiting = 0;
-  query_id m_q_id = 0;
-
-  /// Is there a "dummy query" pending?
-  bool m_dummy_pending = false;
-
-  /// Point at which an error occurred; no results beyond it will be available
-  query_id m_error = qid_limit();
-
-  /// Encoding.
-  /** We store this in the object to avoid the risk of exceptions at awkward
-   * moments.
-   */
-  internal::encoding_group m_encoding;
-
-  static constexpr std::string_view s_classname{"pipeline"};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pqxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pqxx
deleted file mode 100644
index 17a8eaa9c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/pqxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/// Convenience header: include all libpqxx definitions.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/array.hxx"
-#include "pqxx/binarystring.hxx"
-#include "pqxx/blob.hxx"
-#include "pqxx/connection.hxx"
-#include "pqxx/cursor.hxx"
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/largeobject.hxx"
-#include "pqxx/nontransaction.hxx"
-#include "pqxx/notification.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/pipeline.hxx"
-#include "pqxx/prepared_statement.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/internal/result_iterator.hxx"
-#include "pqxx/internal/result_iter.hxx"
-#include "pqxx/robusttransaction.hxx"
-#include "pqxx/row.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/stream_to.hxx"
-#include "pqxx/subtransaction.hxx"
-#include "pqxx/transaction.hxx"
-#include "pqxx/transactor.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/prepared_statement b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/prepared_statement
deleted file mode 100644
index 674be7090..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/prepared_statement
+++ /dev/null
@@ -1,3 +0,0 @@
-/// @deprecated Include @c <pqxx/params> instead.
-
-#include "params.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/prepared_statement.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/prepared_statement.hxx
deleted file mode 100644
index 674be7090..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/prepared_statement.hxx
+++ /dev/null
@@ -1,3 +0,0 @@
-/// @deprecated Include @c <pqxx/params> instead.
-
-#include "params.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/range b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/range
deleted file mode 100644
index 11985eca4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/range
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Client-side support for SQL range types.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/range.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/range.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/range.hxx
deleted file mode 100644
index dc480e4b7..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/range.hxx
+++ /dev/null
@@ -1,515 +0,0 @@
-#ifndef PQXX_H_RANGE
-#define PQXX_H_RANGE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <variant>
-
-#include "pqxx/internal/array-composite.hxx"
-#include "pqxx/internal/concat.hxx"
-
-namespace pqxx
-{
-/// An _unlimited_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should extend
- * to infinity on that side.
- *
- * An unlimited boundary is always inclusive of "infinity" values, if the
- * range's value type supports them.
- */
-struct no_bound
-{
-  template<typename TYPE> constexpr bool extends_down_to(TYPE const &) const
-  {
-    return true;
-  }
-  template<typename TYPE> constexpr bool extends_up_to(TYPE const &) const
-  {
-    return true;
-  }
-};
-
-
-/// An _inclusive_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should include
- * the value.
- */
-template<typename TYPE> class inclusive_bound
-{
-public:
-  inclusive_bound() = delete;
-  explicit inclusive_bound(TYPE const &value) : m_value{value}
-  {
-    if (is_null(value))
-      throw argument_error{"Got null value as an inclusive range bound."};
-  }
-
-  [[nodiscard]] constexpr TYPE const &get() const &noexcept { return m_value; }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as a lower bound, include value?
-  [[nodiscard]] bool extends_down_to(TYPE const &value) const
-  {
-    return not(value < m_value);
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as an upper bound, include value?
-  [[nodiscard]] bool extends_up_to(TYPE const &value) const
-  {
-    return not(m_value < value);
-  }
-
-private:
-  TYPE m_value;
-};
-
-
-/// An _exclusive_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should _not_
- * include the value.
- */
-template<typename TYPE> class exclusive_bound
-{
-public:
-  exclusive_bound() = delete;
-  explicit exclusive_bound(TYPE const &value) : m_value{value}
-  {
-    if (is_null(value))
-      throw argument_error{"Got null value as an exclusive range bound."};
-  }
-
-  [[nodiscard]] constexpr TYPE const &get() const &noexcept { return m_value; }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as a lower bound, include value?
-  [[nodiscard]] bool extends_down_to(TYPE const &value) const
-  {
-    return m_value < value;
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as an upper bound, include value?
-  [[nodiscard]] bool extends_up_to(TYPE const &value) const
-  {
-    return value < m_value;
-  }
-
-private:
-  TYPE m_value;
-};
-
-
-/// A range boundary value.
-/** A range bound is either no bound at all; or an inclusive bound; or an
- * exclusive bound.  Pass one of the three to the constructor.
- */
-template<typename TYPE> class range_bound
-{
-public:
-  range_bound() = delete;
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(no_bound) : m_bound{} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(inclusive_bound<TYPE> const &bound) : m_bound{bound} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(exclusive_bound<TYPE> const &bound) : m_bound{bound} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(range_bound const &) = default;
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(range_bound &&) = default;
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  bool operator==(range_bound const &rhs) const
-  {
-    if (this->is_limited())
-      return (
-        rhs.is_limited() and (this->is_inclusive() == rhs.is_inclusive()) and
-        (*this->value() == *rhs.value()));
-    else
-      return not rhs.is_limited();
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  bool operator!=(range_bound const &rhs) const { return not(*this == rhs); }
-  range_bound &operator=(range_bound const &) = default;
-  range_bound &operator=(range_bound &&) = default;
-
-  /// Is this a finite bound?
-  constexpr bool is_limited() const noexcept
-  {
-    return not std::holds_alternative<no_bound>(m_bound);
-  }
-
-  /// Is this boundary an inclusive one?
-  constexpr bool is_inclusive() const noexcept
-  {
-    return std::holds_alternative<inclusive_bound<TYPE>>(m_bound);
-  }
-
-  /// Is this boundary an exclusive one?
-  constexpr bool is_exclusive() const noexcept
-  {
-    return std::holds_alternative<exclusive_bound<TYPE>>(m_bound);
-  }
-
-  // TODO: constexpr/noexcept if underlying function supports it.
-  /// Would this bound, as a lower bound, include `value`?
-  bool extends_down_to(TYPE const &value) const
-  {
-    return std::visit(
-      [&value](auto const &bound) { return bound.extends_down_to(value); },
-      m_bound);
-  }
-
-  // TODO: constexpr/noexcept if underlying function supports it.
-  /// Would this bound, as an upper bound, include `value`?
-  bool extends_up_to(TYPE const &value) const
-  {
-    return std::visit(
-      [&value](auto const &bound) { return bound.extends_up_to(value); },
-      m_bound);
-  }
-
-  /// Return bound value, or `nullptr` if it's not limited.
-  [[nodiscard]] constexpr TYPE const *value() const &noexcept
-  {
-    return std::visit(
-      [](auto const &bound) noexcept {
-        using bound_t = std::decay_t<decltype(bound)>;
-        if constexpr (std::is_same_v<bound_t, no_bound>)
-          return static_cast<TYPE const *>(nullptr);
-        else
-          return &bound.get();
-      },
-      m_bound);
-  }
-
-private:
-  std::variant<no_bound, inclusive_bound<TYPE>, exclusive_bound<TYPE>> m_bound;
-};
-
-
-// C++20: Concepts for comparisons, construction, etc.
-/// A C++ equivalent to PostgreSQL's range types.
-/** You can use this as a client-side representation of a "range" in SQL.
- *
- * PostgreSQL defines several range types, differing in the data type over
- * which they range.  You can also define your own range types.
- *
- * Usually you'll want the server to deal with ranges.  But on occasions where
- * you need to work with them client-side, you may want to use @ref
- * pqxx::range. (In cases where all you do is pass them along to the server
- * though, it's not worth the complexity.  In that case you might as well treat
- * ranges as just strings.)
- *
- * For documentation on PostgreSQL's range types, see:
- * https://www.postgresql.org/docs/current/rangetypes.html
- *
- * The value type must be copyable and default-constructible, and support the
- * less-than (`<`) and equals (`==`) comparisons.  Value initialisation must
- * produce a consistent value.
- */
-template<typename TYPE> class range
-{
-public:
-  /// Create a range.
-  /** For each of the two bounds, pass a @ref no_bound, @ref inclusive_bound,
-   * or
-   * @ref exclusive_bound.
-   */
-  range(range_bound<TYPE> lower, range_bound<TYPE> upper) :
-          m_lower{lower}, m_upper{upper}
-  {
-    if (
-      lower.is_limited() and upper.is_limited() and
-      (*upper.value() < *lower.value()))
-      throw range_error{internal::concat(
-        "Range's lower bound (", *lower.value(),
-        ") is greater than its upper bound (", *upper.value(), ").")};
-  }
-
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  /// Create an empty range.
-  /** SQL has a separate literal to denote an empty range, but any range which
-   * encompasses no values is an empty range.
-   */
-  range() :
-          m_lower{exclusive_bound<TYPE>{TYPE{}}},
-          m_upper{exclusive_bound<TYPE>{TYPE{}}}
-  {}
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  bool operator==(range const &rhs) const
-  {
-    return (this->lower_bound() == rhs.lower_bound() and
-            this->upper_bound() == rhs.upper_bound()) or
-           (this->empty() and rhs.empty());
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  bool operator!=(range const &rhs) const { return !(*this == rhs); }
-
-  range(range const &) = default;
-  range(range &&) = default;
-  range &operator=(range const &) = default;
-  range &operator=(range &&) = default;
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Is this range clearly empty?
-  /** An empty range encompasses no values.
-   *
-   * It is possible to "fool" this.  For example, if your range is of an
-   * integer type and has exclusive bounds of 0 and 1, it encompasses no values
-   * but its `empty()` will return false.  The PostgreSQL implementation, by
-   * contrast, will notice that it is empty.  Similar things can happen for
-   * floating-point types, but with more subtleties and edge cases.
-   */
-  bool empty() const
-  {
-    return (m_lower.is_exclusive() or m_upper.is_exclusive()) and
-           m_lower.is_limited() and m_upper.is_limited() and
-           not(*m_lower.value() < *m_upper.value());
-  }
-
-  // TODO: constexpr and/or noexcept if underlying functions support it.
-  /// Does this range encompass `value`?
-  bool contains(TYPE value) const
-  {
-    return m_lower.extends_down_to(value) and m_upper.extends_up_to(value);
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  /// Does this range encompass all of `other`?
-  /** This function is not particularly smart.  It does not know, for example,
-   * that integer ranges `[0,9]` and `[0,10)` contain the same values.
-   */
-  bool contains(range<TYPE> const &other) const
-  {
-    return (*this & other) == other;
-  }
-
-  [[nodiscard]] constexpr range_bound<TYPE> const &
-  lower_bound() const &noexcept
-  {
-    return m_lower;
-  }
-  [[nodiscard]] constexpr range_bound<TYPE> const &
-  upper_bound() const &noexcept
-  {
-    return m_upper;
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  /// Intersection of two ranges.
-  /** Returns a range describing those values which are in both ranges.
-   */
-  range operator&(range const &other) const
-  {
-    range_bound<TYPE> lower{no_bound{}};
-    if (not this->lower_bound().is_limited())
-      lower = other.lower_bound();
-    else if (not other.lower_bound().is_limited())
-      lower = this->lower_bound();
-    else if (*this->lower_bound().value() < *other.lower_bound().value())
-      lower = other.lower_bound();
-    else if (*other.lower_bound().value() < *this->lower_bound().value())
-      lower = this->lower_bound();
-    else if (this->lower_bound().is_exclusive())
-      lower = this->lower_bound();
-    else
-      lower = other.lower_bound();
-
-    range_bound<TYPE> upper{no_bound{}};
-    if (not this->upper_bound().is_limited())
-      upper = other.upper_bound();
-    else if (not other.upper_bound().is_limited())
-      upper = this->upper_bound();
-    else if (*other.upper_bound().value() < *this->upper_bound().value())
-      upper = other.upper_bound();
-    else if (*this->upper_bound().value() < *other.upper_bound().value())
-      upper = this->upper_bound();
-    else if (this->upper_bound().is_exclusive())
-      upper = this->upper_bound();
-    else
-      upper = other.upper_bound();
-
-    if (
-      lower.is_limited() and upper.is_limited() and
-      (*upper.value() < *lower.value()))
-      return {};
-    else
-      return {lower, upper};
-  }
-
-  /// Convert to another base type.
-  template<typename DEST> operator range<DEST>() const
-  {
-    range_bound<DEST> lower{no_bound{}}, upper{no_bound{}};
-    if (lower_bound().is_inclusive())
-      lower = inclusive_bound<DEST>{*lower_bound().value()};
-    else if (lower_bound().is_exclusive())
-      lower = exclusive_bound<DEST>{*lower_bound().value()};
-
-    if (upper_bound().is_inclusive())
-      upper = inclusive_bound<DEST>{*upper_bound().value()};
-    else if (upper_bound().is_exclusive())
-      upper = exclusive_bound<DEST>{*upper_bound().value()};
-
-    return {lower, upper};
-  }
-
-private:
-  range_bound<TYPE> m_lower, m_upper;
-};
-
-
-/// String conversions for a @ref range type.
-/** Conversion assumes that either your client encoding is UTF-8, or the values
- * are pure ASCII.
- */
-template<typename TYPE> struct string_traits<range<TYPE>>
-{
-  [[nodiscard]] static inline zview
-  to_buf(char *begin, char *end, range<TYPE> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static inline char *
-  into_buf(char *begin, char *end, range<TYPE> const &value)
-  {
-    if (value.empty())
-    {
-      if ((end - begin) <= internal::ssize(s_empty))
-        throw conversion_overrun{s_overrun.c_str()};
-      char *here = begin + s_empty.copy(begin, std::size(s_empty));
-      *here++ = '\0';
-      return here;
-    }
-    else
-    {
-      if (end - begin < 4)
-        throw conversion_overrun{s_overrun.c_str()};
-      char *here = begin;
-      *here++ =
-        (static_cast<char>(value.lower_bound().is_inclusive() ? '[' : '('));
-      TYPE const *lower{value.lower_bound().value()};
-      // Convert bound (but go back to overwrite that trailing zero).
-      if (lower != nullptr)
-        here = string_traits<TYPE>::into_buf(here, end, *lower) - 1;
-      *here++ = ',';
-      TYPE const *upper{value.upper_bound().value()};
-      // Convert bound (but go back to overwrite that trailing zero).
-      if (upper != nullptr)
-        here = string_traits<TYPE>::into_buf(here, end, *upper) - 1;
-      if ((end - here) < 2)
-        throw conversion_overrun{s_overrun.c_str()};
-      *here++ =
-        static_cast<char>(value.upper_bound().is_inclusive() ? ']' : ')');
-      *here++ = '\0';
-      return here;
-    }
-  }
-
-  [[nodiscard]] static inline range<TYPE> from_string(std::string_view text)
-  {
-    if (std::size(text) < 3)
-      throw pqxx::conversion_error{err_bad_input(text)};
-    bool left_inc{false};
-    switch (text[0])
-    {
-    case '[': left_inc = true; break;
-
-    case '(': break;
-
-    case 'e':
-    case 'E':
-      if (
-        (std::size(text) != std::size(s_empty)) or
-        (text[1] != 'm' and text[1] != 'M') or
-        (text[2] != 'p' and text[2] != 'P') or
-        (text[3] != 't' and text[3] != 'T') or
-        (text[4] != 'y' and text[4] != 'Y'))
-        throw pqxx::conversion_error{err_bad_input(text)};
-      return {};
-      break;
-
-    default: throw pqxx::conversion_error{err_bad_input(text)};
-    }
-
-    auto scan{internal::get_glyph_scanner(internal::encoding_group::UTF8)};
-    // The field parser uses this to track which field it's parsing, and
-    // when not to expect a field separator.
-    std::size_t index{0};
-    // The last field we expect to see.
-    static constexpr std::size_t last{1};
-    // Current parsing position.  We skip the opening parenthesis or bracket.
-    std::size_t pos{1};
-    // The string may leave out either bound to indicate that it's unlimited.
-    std::optional<TYPE> lower, upper;
-    // We reuse the same field parser we use for composite values and arrays.
-    internal::parse_composite_field(index, text, pos, lower, scan, last);
-    internal::parse_composite_field(index, text, pos, upper, scan, last);
-
-    // We need one more character: the closing parenthesis or bracket.
-    if (pos != std::size(text))
-      throw pqxx::conversion_error{err_bad_input(text)};
-    char const closing{text[pos - 1]};
-    if (closing != ')' and closing != ']')
-      throw pqxx::conversion_error{err_bad_input(text)};
-    bool const right_inc{closing == ']'};
-
-    range_bound<TYPE> lower_bound{no_bound{}}, upper_bound{no_bound{}};
-    if (lower)
-    {
-      if (left_inc)
-        lower_bound = inclusive_bound{*lower};
-      else
-        lower_bound = exclusive_bound{*lower};
-    }
-    if (upper)
-    {
-      if (right_inc)
-        upper_bound = inclusive_bound{*upper};
-      else
-        upper_bound = exclusive_bound{*upper};
-    }
-
-    return {lower_bound, upper_bound};
-  }
-
-  [[nodiscard]] static inline constexpr std::size_t
-  size_buffer(range<TYPE> const &value) noexcept
-  {
-    TYPE const *lower{value.lower_bound().value()},
-      *upper{value.upper_bound().value()};
-    std::size_t const lsz{
-      lower == nullptr ? 0 : string_traits<TYPE>::size_buffer(*lower) - 1},
-      usz{upper == nullptr ? 0 : string_traits<TYPE>::size_buffer(*upper) - 1};
-
-    if (value.empty())
-      return std::size(s_empty) + 1;
-    else
-      return 1 + lsz + 1 + usz + 2;
-  }
-
-private:
-  static constexpr zview s_empty{"empty"_zv};
-  static constexpr auto s_overrun{"Not enough space in buffer for range."_zv};
-
-  /// Compose error message for invalid range input.
-  static std::string err_bad_input(std::string_view text)
-  {
-    return internal::concat("Invalid range input: '", text, "'");
-  }
-};
-
-
-/// A range type does not have an innate null value.
-template<typename TYPE> struct nullness<range<TYPE>> : no_null<range<TYPE>>
-{};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/result b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/result
deleted file mode 100644
index 523394b72..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/result
+++ /dev/null
@@ -1,16 +0,0 @@
-/** pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/result.hxx"
-
-// Now include some types which depend on result, but which the user will
-// expect to see defined after including this header.
-#include "pqxx/internal/result_iterator.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/internal/result_iter.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/result.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/result.hxx
deleted file mode 100644
index 6c41cc096..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/result.hxx
+++ /dev/null
@@ -1,335 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT
-#define PQXX_H_RESULT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <functional>
-#include <ios>
-#include <memory>
-#include <stdexcept>
-
-#include "pqxx/except.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-#include "pqxx/internal/encodings.hxx"
-
-
-namespace pqxx::internal
-{
-// TODO: Make noexcept (but breaks ABI).
-PQXX_LIBEXPORT void clear_result(pq::PGresult const *);
-} // namespace pqxx::internal
-
-
-namespace pqxx::internal::gate
-{
-class result_connection;
-class result_creation;
-class result_pipeline;
-class result_row;
-class result_sql_cursor;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Result set containing data returned by a query or command.
-/** This behaves as a container (as defined by the C++ standard library) and
- * provides random access const iterators to iterate over its rows.  You can
- * also access a row by indexing a `result R` by the row's zero-based
- * number:
- *
- *
- *	for (result::size_type i=0; i < std::size(R); ++i) Process(R[i]);
- *
- *
- * Result sets in libpqxx are lightweight, reference-counted wrapper objects
- * which are relatively small and cheap to copy.  Think of a result object as
- * a "smart pointer" to an underlying result set.
- *
- * @warning The result set that a result object points to is not thread-safe.
- * If you copy a result object, it still refers to the same underlying result
- * set.  So never copy, destroy, query, or otherwise access a result while
- * another thread may be copying, destroying, querying, or otherwise accessing
- * the same result set--even if it is doing so through a different result
- * object!
- */
-class PQXX_LIBEXPORT result
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-  using reference = row;
-  using const_iterator = const_result_iterator;
-  using pointer = const_iterator;
-  using iterator = const_iterator;
-  using const_reverse_iterator = const_reverse_result_iterator;
-  using reverse_iterator = const_reverse_iterator;
-
-  result() noexcept :
-          m_data{make_data_pointer()},
-          m_query{},
-          m_encoding{internal::encoding_group::MONOBYTE}
-  {}
-
-  result(result const &rhs) noexcept = default;
-  result(result &&rhs) noexcept = default;
-
-  /// Assign one result to another.
-  /** Copying results is cheap: it copies only smart pointers, but the actual
-   * data stays in the same place.
-   */
-  result &operator=(result const &rhs) noexcept = default;
-
-  /// Assign one result to another, invaliding the old one.
-  result &operator=(result &&rhs) noexcept = default;
-
-  /**
-   * @name Comparisons
-   *
-   * You can compare results for equality.  Beware: this is a very strict,
-   * dumb comparison.  The smallest difference between two results (such as a
-   * string "Foo" versus a string "foo") will make them unequal.
-   */
-  //@{
-  /// Compare two results for equality.
-  [[nodiscard]] bool operator==(result const &) const noexcept;
-  /// Compare two results for inequality.
-  [[nodiscard]] bool operator!=(result const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  /// Iterate rows, reading them directly into a tuple of "TYPE...".
-  /** Converts the fields to values of the given respective types.
-   *
-   * Use this only with a ranged "for" loop.  The iteration produces
-   * std::tuple<TYPE...> which you can "unpack" to a series of `auto`
-   * variables.
-   */
-  template<typename... TYPE> auto iter() const;
-
-  [[nodiscard]] const_reverse_iterator rbegin() const;
-  [[nodiscard]] const_reverse_iterator crbegin() const;
-  [[nodiscard]] const_reverse_iterator rend() const;
-  [[nodiscard]] const_reverse_iterator crend() const;
-
-  [[nodiscard]] const_iterator begin() const noexcept;
-  [[nodiscard]] const_iterator cbegin() const noexcept;
-  [[nodiscard]] inline const_iterator end() const noexcept;
-  [[nodiscard]] inline const_iterator cend() const noexcept;
-
-  [[nodiscard]] reference front() const noexcept;
-  [[nodiscard]] reference back() const noexcept;
-
-  [[nodiscard]] PQXX_PURE size_type size() const noexcept;
-  [[nodiscard]] PQXX_PURE bool empty() const noexcept;
-  [[nodiscard]] size_type capacity() const noexcept { return size(); }
-
-  /// Exchange two `result` values in an exception-safe manner.
-  /** If the swap fails, the two values will be exactly as they were before.
-   *
-   * The swap is not necessarily thread-safe.
-   */
-  void swap(result &) noexcept;
-
-  /// Index a row by number.
-  /** This returns a @ref row object.  Generally you should not keep the row
-   * around as a variable, but if you do, make sure that your variable is a
-   * `row`, not a `row&`.
-   */
-  [[nodiscard]] row operator[](size_type i) const noexcept;
-
-#if defined(PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT)
-  // TODO: If C++23 will let us, also accept string for the column.
-  [[nodiscard]] field
-  operator[](size_type row_num, row_size_type col_num) const noexcept;
-#endif
-
-  /// Index a row by number, but check that the row number is valid.
-  row at(size_type) const;
-
-  /// Index a field by row number and column number.
-  field at(size_type, row_size_type) const;
-
-  /// Let go of the result's data.
-  /** Use this if you need to deallocate the result data earlier than you can
-   * destroy the `result` object itself.
-   *
-   * Multiple `result` objects can refer to the same set of underlying data.
-   * The underlying data will be deallocated once all `result` objects that
-   * refer to it are cleared or destroyed.
-   */
-  void clear() noexcept
-  {
-    m_data.reset();
-    m_query = nullptr;
-  }
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Number of columns in result.
-  [[nodiscard]] PQXX_PURE row_size_type columns() const noexcept;
-
-  /// Number of given column (throws exception if it doesn't exist).
-  [[nodiscard]] row_size_type column_number(zview name) const;
-
-  /// Name of column with this number (throws exception if it doesn't exist)
-  [[nodiscard]] char const *column_name(row_size_type number) const &;
-
-  /// Return column's type, as an OID from the system catalogue.
-  [[nodiscard]] oid column_type(row_size_type col_num) const;
-
-  /// Return column's type, as an OID from the system catalogue.
-  [[nodiscard]] oid column_type(zview col_name) const
-  {
-    return column_type(column_number(col_name));
-  }
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(row_size_type col_num) const;
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(zview col_name) const
-  {
-    return column_table(column_number(col_name));
-  }
-
-  /// What column in its table did this column come from?
-  [[nodiscard]] row_size_type table_column(row_size_type col_num) const;
-
-  /// What column in its table did this column come from?
-  [[nodiscard]] row_size_type table_column(zview col_name) const
-  {
-    return table_column(column_number(col_name));
-  }
-  //@}
-
-  /// Query that produced this result, if available (empty string otherwise)
-  [[nodiscard]] PQXX_PURE std::string const &query() const &noexcept;
-
-  /// If command was an `INSERT` of 1 row, return oid of the inserted row.
-  /** @return Identifier of inserted row if exactly one row was inserted, or
-   * @ref oid_none otherwise.
-   */
-  [[nodiscard]] PQXX_PURE oid inserted_oid() const;
-
-  /// If command was `INSERT`, `UPDATE`, or `DELETE`: number of affected rows.
-  /** @return Number of affected rows if last command was `INSERT`, `UPDATE`,
-   * or `DELETE`; zero for all other commands.
-   */
-  [[nodiscard]] PQXX_PURE size_type affected_rows() const;
-
-  // C++20: Concept like std::invocable, but without specifying param types.
-  /// Run `func` on each row, passing the row's fields as parameters.
-  /** Goes through the rows from first to last.  You provide a callable `func`.
-   *
-   * For each row in the `result`, `for_each` will call `func`.  It converts
-   * the row's fields to the types of `func`'s parameters, and pass them to
-   * `func`.
-   *
-   * (Therefore `func` must have a _single_ signature.  It can't be a generic
-   * lambda, or an object of a class with multiple overloaded function call
-   * operators.  Otherwise, `for_each` will have no way to detect a parameter
-   * list without ambiguity.)
-   *
-   * If any of your parameter types is `std::string_view`, it refers to the
-   * underlying storage of this `result`.
-   *
-   * If any of your parameter types is a reference type, its argument will
-   * refer to a temporary value which only lives for the duration of that
-   * single invocation to `func`.  If the reference is an lvalue reference, it
-   * must be `const`.
-   *
-   * For example, this queries employee names and salaries from the database
-   * and prints how much each would like to earn instead:
-   * ```cxx
-   *   tx.exec("SELECT name, salary FROM employee").for_each(
-   *       [](std::string_view name, float salary){
-   *           std::cout << name << " would like " << salary * 2 << ".\n";
-   *       })
-   * ```
-   *
-   * If `func` throws an exception, processing stops at that point and
-   * propagates the exception.
-   *
-   * @throws usage_error if `func`'s number of parameters does not match the
-   * number of columns in this result.
-   */
-  template<typename CALLABLE> inline void for_each(CALLABLE &&func) const;
-
-private:
-  using data_pointer = std::shared_ptr<internal::pq::PGresult const>;
-
-  /// Underlying libpq result set.
-  data_pointer m_data;
-
-  /// Factory for data_pointer.
-  static data_pointer
-  make_data_pointer(internal::pq::PGresult const *res = nullptr) noexcept
-  {
-    return {res, internal::clear_result};
-  }
-
-  friend class pqxx::internal::gate::result_pipeline;
-  PQXX_PURE std::shared_ptr<std::string const> query_ptr() const noexcept
-  {
-    return m_query;
-  }
-
-  /// Query string.
-  std::shared_ptr<std::string const> m_query;
-
-  internal::encoding_group m_encoding;
-
-  static std::string const s_empty_string;
-
-  friend class pqxx::field;
-  // TODO: noexcept.  Breaks ABI.
-  PQXX_PURE char const *get_value(size_type row, row_size_type col) const;
-  // TODO: noexcept.  Breaks ABI.
-  PQXX_PURE bool get_is_null(size_type row, row_size_type col) const;
-  PQXX_PURE
-  field_size_type get_length(size_type, row_size_type) const noexcept;
-
-  friend class pqxx::internal::gate::result_creation;
-  result(
-    internal::pq::PGresult *rhs, std::shared_ptr<std::string> query,
-    internal::encoding_group enc);
-
-  PQXX_PRIVATE void check_status(std::string_view desc = ""sv) const;
-
-  friend class pqxx::internal::gate::result_connection;
-  friend class pqxx::internal::gate::result_row;
-  bool operator!() const noexcept { return m_data.get() == nullptr; }
-  operator bool() const noexcept { return m_data.get() != nullptr; }
-
-  [[noreturn]] PQXX_PRIVATE void
-  throw_sql_error(std::string const &Err, std::string const &Query) const;
-  PQXX_PRIVATE PQXX_PURE int errorposition() const;
-  PQXX_PRIVATE std::string status_error() const;
-
-  friend class pqxx::internal::gate::result_sql_cursor;
-  PQXX_PURE char const *cmd_status() const noexcept;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/robusttransaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/robusttransaction
deleted file mode 100644
index 04b71d7cc..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/robusttransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::robusttransaction class.
- *
- * pqxx::robusttransaction is a slower but safer transaction class.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/robusttransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/robusttransaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/robusttransaction.hxx
deleted file mode 100644
index faf6dbf5e..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/robusttransaction.hxx
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Definition of the pqxx::robusttransaction class.
- *
- * pqxx::robusttransaction is a slower but safer transaction class.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/robusttransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ROBUSTTRANSACTION
-#define PQXX_H_ROBUSTTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx::internal
-{
-/// Helper base class for the @ref robusttransaction class template.
-class PQXX_LIBEXPORT PQXX_NOVTABLE basic_robusttransaction
-        : public dbtransaction
-{
-public:
-  virtual ~basic_robusttransaction() override = 0;
-
-protected:
-  basic_robusttransaction(
-    connection &c, zview begin_command, std::string_view tname);
-  basic_robusttransaction(connection &c, zview begin_command);
-
-private:
-  using IDType = unsigned long;
-
-  std::string m_conn_string;
-  std::string m_xid;
-  int m_backendpid = -1;
-
-  void init(zview begin_command);
-
-  // @warning This function will become `final`.
-  virtual void do_commit() override;
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- *
- * @{
- */
-
-/// Slightly slower, better-fortified version of transaction.
-/** Requires PostgreSQL 10 or better.
- *
- * robusttransaction is similar to transaction, but spends more time and effort
- * to deal with the hopefully rare case that the connection to the backend is
- * lost just while it's trying to commit.  In such cases, the client does not
- * know whether the backend (on the other side of the broken connection)
- * managed to commit the transaction.
- *
- * When this happens, robusttransaction tries to reconnect to the database and
- * figure out what happened.
- *
- * This service level was made optional since you may not want to pay the
- * overhead where it is not necessary.  Certainly the use of this class makes
- * no sense for local connections, or for transactions that read the database
- * but never modify it, or for noncritical database manipulations.
- *
- * Besides being slower, it's also more complex.  Which means that in practice
- * a robusttransaction could actually fail more instead of less often than a
- * normal transaction.  What robusttransaction tries to achieve is to give you
- * certainty, not just be more successful per se.
- */
-template<isolation_level ISOLATION = read_committed>
-class robusttransaction final : public internal::basic_robusttransaction
-{
-public:
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   * @param tname optional human-readable name for this transaction.
-   */
-  robusttransaction(connection &c, std::string_view tname) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>,
-            tname}
-  {}
-
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   * @param tname optional human-readable name for this transaction.
-   */
-  robusttransaction(connection &c, std::string &&tname) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>,
-            std::move(tname)}
-  {}
-
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   */
-  explicit robusttransaction(connection &c) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>}
-  {}
-
-  virtual ~robusttransaction() noexcept override { close(); }
-};
-
-/**
- * @}
- */
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/row b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/row
deleted file mode 100644
index 62a950ac8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/row
+++ /dev/null
@@ -1,11 +0,0 @@
-/** pqxx::row class.
- *
- * pqxx::row refers to a row in a result.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/row.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/row.hxx
deleted file mode 100644
index 5be5132e3..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/row.hxx
+++ /dev/null
@@ -1,561 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ROW
-#define PQXX_H_ROW
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/result.hxx"
-
-#include "pqxx/internal/concat.hxx"
-
-namespace pqxx::internal
-{
-template<typename... T> class result_iter;
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// Reference to one row in a result.
-/** A row represents one row (also called a row) in a query result set.
- * It also acts as a container mapping column numbers or names to field
- * values (see below):
- *
- * ```cxx
- *	cout << row["date"].c_str() << ": " << row["name"].c_str() << endl;
- * ```
- *
- * The row itself acts like a (non-modifyable) container, complete with its
- * own const_iterator and const_reverse_iterator.
- */
-class PQXX_LIBEXPORT row
-{
-public:
-  using size_type = row_size_type;
-  using difference_type = row_difference_type;
-  using const_iterator = const_row_iterator;
-  using iterator = const_iterator;
-  using reference = field;
-  using pointer = const_row_iterator;
-  using const_reverse_iterator = const_reverse_row_iterator;
-  using reverse_iterator = const_reverse_iterator;
-
-  row() noexcept = default;
-  row(row &&) noexcept = default;
-  row(row const &) noexcept = default;
-  row &operator=(row const &) noexcept = default;
-  row &operator=(row &&) noexcept = default;
-
-  /**
-   * @name Comparison
-   */
-  //@{
-  [[nodiscard]] PQXX_PURE bool operator==(row const &) const noexcept;
-  [[nodiscard]] bool operator!=(row const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  [[nodiscard]] const_iterator begin() const noexcept;
-  [[nodiscard]] const_iterator cbegin() const noexcept;
-  [[nodiscard]] const_iterator end() const noexcept;
-  [[nodiscard]] const_iterator cend() const noexcept;
-
-  /**
-   * @name Field access
-   */
-  //@{
-  [[nodiscard]] reference front() const noexcept;
-  [[nodiscard]] reference back() const noexcept;
-
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator rbegin() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator crbegin() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator rend() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator crend() const;
-
-  [[nodiscard]] reference operator[](size_type) const noexcept;
-  /** Address field by name.
-   * @warning This is much slower than indexing by number, or iterating.
-   */
-  [[nodiscard]] reference operator[](zview col_name) const;
-
-  reference at(size_type) const;
-  /** Address field by name.
-   * @warning This is much slower than indexing by number, or iterating.
-   */
-  reference at(zview col_name) const;
-
-  [[nodiscard]] constexpr size_type size() const noexcept
-  {
-    return m_end - m_begin;
-  }
-
-  [[deprecated("Swap iterators, not rows.")]] void swap(row &) noexcept;
-
-  /// Row number, assuming this is a real row and not end()/rend().
-  [[nodiscard]] constexpr result::size_type rownumber() const noexcept
-  {
-    return m_index;
-  }
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Number of given column (throws exception if it doesn't exist).
-  [[nodiscard]] size_type column_number(zview col_name) const;
-
-  /// Return a column's type.
-  [[nodiscard]] oid column_type(size_type) const;
-
-  /// Return a column's type.
-  [[nodiscard]] oid column_type(zview col_name) const
-  {
-    return column_type(column_number(col_name));
-  }
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(size_type col_num) const;
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(zview col_name) const
-  {
-    return column_table(column_number(col_name));
-  }
-
-  /// What column number in its table did this result column come from?
-  /** A meaningful answer can be given only if the column in question comes
-   * directly from a column in a table.  If the column is computed in any
-   * other way, a logic_error will be thrown.
-   *
-   * @param col_num a zero-based column number in this result set
-   * @return a zero-based column number in originating table
-   */
-  [[nodiscard]] size_type table_column(size_type) const;
-
-  /// What column number in its table did this result column come from?
-  [[nodiscard]] size_type table_column(zview col_name) const
-  {
-    return table_column(column_number(col_name));
-  }
-  //@}
-
-  [[nodiscard]] constexpr result::size_type num() const noexcept
-  {
-    return rownumber();
-  }
-
-  /** Produce a slice of this row, containing the given range of columns.
-   *
-   * @deprecated I haven't heard of anyone caring about row slicing at all in
-   * at least the last 15 years.  Yet it adds complexity, so unless anyone
-   * files a bug explaining why they really need this feature, I'm going to
-   * remove it.  Even if they do, the feature may need an update.
-   *
-   * The slice runs from the range's starting column to the range's end
-   * column, exclusive.  It looks just like a normal result row, except
-   * slices can be empty.
-   */
-  [[deprecated("Row slicing is going away.  File a bug if you need it.")]] row
-  slice(size_type sbegin, size_type send) const;
-
-  /// Is this a row without fields?  Can only happen to a slice.
-  [[nodiscard, deprecated("Row slicing is going away.")]] PQXX_PURE bool
-  empty() const noexcept;
-
-  /// Extract entire row's values into a tuple.
-  /** Converts to the types of the tuple's respective fields.
-   */
-  template<typename Tuple> void to(Tuple &t) const
-  {
-    check_size(std::tuple_size_v<Tuple>);
-    convert(t);
-  }
-
-  template<typename... TYPE> std::tuple<TYPE...> as() const
-  {
-    check_size(sizeof...(TYPE));
-    using seq = std::make_index_sequence<sizeof...(TYPE)>;
-    return get_tuple<std::tuple<TYPE...>>(seq{});
-  }
-
-protected:
-  friend class const_row_iterator;
-  friend class result;
-  row(result const &r, result_size_type index, size_type cols) noexcept;
-
-  /// Throw @ref usage_error if row size is not `expected`.
-  void check_size(size_type expected) const
-  {
-    if (size() != expected)
-      throw usage_error{internal::concat(
-        "Tried to extract ", expected, " field(s) from a row of ", size(),
-        ".")};
-  }
-
-  /// Convert to a given tuple of values, don't check sizes.
-  /** We need this for cases where we have a full tuple of field types, but
-   * not a parameter pack.
-   */
-  template<typename TUPLE> TUPLE as_tuple() const
-  {
-    using seq = std::make_index_sequence<std::tuple_size_v<TUPLE>>;
-    return get_tuple<TUPLE>(seq{});
-  }
-
-  template<typename... T> friend class pqxx::internal::result_iter;
-  /// Convert entire row to tuple fields, without checking row size.
-  template<typename Tuple> void convert(Tuple &t) const
-  {
-    extract_fields(t, std::make_index_sequence<std::tuple_size_v<Tuple>>{});
-  }
-
-  friend class field;
-
-  /// Result set of which this is one row.
-  result m_result;
-
-  /// Row number.
-  /**
-   * You'd expect this to be unsigned, but due to the way reverse iterators
-   * are related to regular iterators, it must be allowed to underflow to -1.
-   */
-  result::size_type m_index = 0;
-
-  // TODO: Remove m_begin and (if possible) m_end when we remove slice().
-  /// First column in slice.  This row ignores lower-numbered columns.
-  size_type m_begin = 0;
-  /// End column in slice.  This row only sees lower-numbered columns.
-  size_type m_end = 0;
-
-private:
-  template<typename Tuple, std::size_t... indexes>
-  void extract_fields(Tuple &t, std::index_sequence<indexes...>) const
-  {
-    (extract_value<Tuple, indexes>(t), ...);
-  }
-
-  template<typename Tuple, std::size_t index>
-  void extract_value(Tuple &t) const;
-
-  /// Convert row's values as a new tuple.
-  template<typename TUPLE, std::size_t... indexes>
-  auto get_tuple(std::index_sequence<indexes...>) const
-  {
-    return std::make_tuple(get_field<TUPLE, indexes>()...);
-  }
-
-  /// Extract and convert a field.
-  template<typename TUPLE, std::size_t index> auto get_field() const
-  {
-    return (*this)[index].as<std::tuple_element_t<index, TUPLE>>();
-  }
-};
-
-
-/// Iterator for fields in a row.  Use as row::const_iterator.
-class PQXX_LIBEXPORT const_row_iterator : public field
-{
-public:
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = field const;
-  using pointer = field const *;
-  using size_type = row_size_type;
-  using difference_type = row_difference_type;
-  using reference = field;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  const_row_iterator() = default;
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  const_row_iterator(row const &t, row_size_type c) noexcept :
-          field{t.m_result, t.m_index, c}
-  {}
-  const_row_iterator(field const &F) noexcept : field{F} {}
-  const_row_iterator(const_row_iterator const &) noexcept = default;
-  const_row_iterator(const_row_iterator &&) noexcept = default;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  [[nodiscard]] constexpr pointer operator->() const noexcept { return this; }
-  [[nodiscard]] reference operator*() const noexcept { return {*this}; }
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_row_iterator &operator=(const_row_iterator const &) noexcept = default;
-  const_row_iterator &operator=(const_row_iterator &&) noexcept = default;
-
-  // TODO: noexcept.  Breaks ABI.
-  const_row_iterator operator++(int);
-  const_row_iterator &operator++() noexcept
-  {
-    ++m_col;
-    return *this;
-  }
-  // TODO: noexcept.  Breaks ABI.
-  const_row_iterator operator--(int);
-  const_row_iterator &operator--() noexcept
-  {
-    --m_col;
-    return *this;
-  }
-
-  const_row_iterator &operator+=(difference_type i) noexcept
-  {
-    m_col = size_type(difference_type(m_col) + i);
-    return *this;
-  }
-  const_row_iterator &operator-=(difference_type i) noexcept
-  {
-    m_col = size_type(difference_type(m_col) - i);
-    return *this;
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] constexpr bool
-  operator==(const_row_iterator const &i) const noexcept
-  {
-    return col() == i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator!=(const_row_iterator const &i) const noexcept
-  {
-    return col() != i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator<(const_row_iterator const &i) const noexcept
-  {
-    return col() < i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator<=(const_row_iterator const &i) const noexcept
-  {
-    return col() <= i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator>(const_row_iterator const &i) const noexcept
-  {
-    return col() > i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator>=(const_row_iterator const &i) const noexcept
-  {
-    return col() >= i.col();
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] inline const_row_iterator
-  operator+(difference_type) const noexcept;
-
-  friend const_row_iterator
-  operator+(difference_type, const_row_iterator const &) noexcept;
-
-  [[nodiscard]] inline const_row_iterator
-  operator-(difference_type) const noexcept;
-  [[nodiscard]] inline difference_type
-  operator-(const_row_iterator const &) const noexcept;
-  //@}
-};
-
-
-/// Reverse iterator for a row.  Use as row::const_reverse_iterator.
-class PQXX_LIBEXPORT const_reverse_row_iterator : private const_row_iterator
-{
-public:
-  using super = const_row_iterator;
-  using iterator_type = const_row_iterator;
-  using iterator_type::difference_type;
-  using iterator_type::iterator_category;
-  using iterator_type::pointer;
-  using value_type = iterator_type::value_type;
-  using reference = iterator_type::reference;
-
-  const_reverse_row_iterator() noexcept = default;
-  const_reverse_row_iterator(const_reverse_row_iterator const &) noexcept =
-    default;
-  const_reverse_row_iterator(const_reverse_row_iterator &&) noexcept = default;
-
-  explicit const_reverse_row_iterator(super const &rhs) noexcept :
-          const_row_iterator{rhs}
-  {
-    super::operator--();
-  }
-
-  [[nodiscard]] PQXX_PURE iterator_type base() const noexcept;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  using iterator_type::operator->;
-  using iterator_type::operator*;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_reverse_row_iterator &
-  operator=(const_reverse_row_iterator const &r) noexcept
-  {
-    iterator_type::operator=(r);
-    return *this;
-  }
-  const_reverse_row_iterator operator++() noexcept
-  {
-    iterator_type::operator--();
-    return *this;
-  }
-  // TODO: noexcept.  Breaks ABI.
-  const_reverse_row_iterator operator++(int);
-  const_reverse_row_iterator &operator--() noexcept
-  {
-    iterator_type::operator++();
-    return *this;
-  }
-  const_reverse_row_iterator operator--(int);
-  // TODO: noexcept.  Breaks ABI.
-  const_reverse_row_iterator &operator+=(difference_type i) noexcept
-  {
-    iterator_type::operator-=(i);
-    return *this;
-  }
-  const_reverse_row_iterator &operator-=(difference_type i) noexcept
-  {
-    iterator_type::operator+=(i);
-    return *this;
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] const_reverse_row_iterator
-  operator+(difference_type i) const noexcept
-  {
-    return const_reverse_row_iterator{base() - i};
-  }
-  [[nodiscard]] const_reverse_row_iterator
-  operator-(difference_type i) noexcept
-  {
-    return const_reverse_row_iterator{base() + i};
-  }
-  [[nodiscard]] difference_type
-  operator-(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return rhs.const_row_iterator::operator-(*this);
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool
-  operator==(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator==(rhs);
-  }
-  [[nodiscard]] bool
-  operator!=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return !operator==(rhs);
-  }
-
-  [[nodiscard]] constexpr bool
-  operator<(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator>(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator<=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator>=(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator>(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator<(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator>=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator<=(rhs);
-  }
-  //@}
-};
-
-
-const_row_iterator
-const_row_iterator::operator+(difference_type o) const noexcept
-{
-  // TODO:: More direct route to home().columns()?
-  return {
-    row{home(), idx(), home().columns()},
-    size_type(difference_type(col()) + o)};
-}
-
-inline const_row_iterator operator+(
-  const_row_iterator::difference_type o, const_row_iterator const &i) noexcept
-{
-  return i + o;
-}
-
-inline const_row_iterator
-const_row_iterator::operator-(difference_type o) const noexcept
-{
-  // TODO:: More direct route to home().columns()?
-  return {
-    row{home(), idx(), home().columns()},
-    size_type(difference_type(col()) - o)};
-}
-
-inline const_row_iterator::difference_type
-const_row_iterator::operator-(const_row_iterator const &i) const noexcept
-{
-  return difference_type(num() - i.num());
-}
-
-
-template<typename Tuple, std::size_t index>
-inline void row::extract_value(Tuple &t) const
-{
-  using field_type = strip_t<decltype(std::get<index>(t))>;
-  field const f{m_result, m_index, index};
-  std::get<index>(t) = from_string<field_type>(f);
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/separated_list b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/separated_list
deleted file mode 100644
index 1bdf51c6a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/separated_list
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Helper similar to Python's @c str.join().
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/separated_list.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/separated_list.hxx
deleted file mode 100644
index d4230ea08..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/separated_list.hxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Helper similar to Python's `str.join()`.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/separated_list instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SEPARATED_LIST
-#define PQXX_H_SEPARATED_LIST
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <algorithm>
-#include <numeric>
-
-#include "pqxx/strconv.hxx"
-
-// C++20: Simplify using std::ranges::range.
-// C++20: Optimise buffer allocation using random_access_range/iterator.
-namespace pqxx
-{
-/**
- * @defgroup utility Utility functions
- */
-//@{
-
-/// Represent sequence of values as a string, joined by a given separator.
-/**
- * Use this to turn e.g. the numbers 1, 2, and 3 into a string "1, 2, 3".
- *
- * @param sep separator string (to be placed between items)
- * @param begin beginning of items sequence
- * @param end end of items sequence
- * @param access functor defining how to dereference sequence elements
- */
-template<typename ITER, typename ACCESS>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, ITER begin, ITER end, ACCESS access)
-{
-  if (end == begin)
-    return {};
-  auto next{begin};
-  ++next;
-  if (next == end)
-    return to_string(access(begin));
-
-  // From here on, we've got at least 2 elements -- meaning that we need sep.
-  using elt_type = strip_t<decltype(access(begin))>;
-  using traits = string_traits<elt_type>;
-
-  std::size_t budget{0};
-  for (ITER cnt{begin}; cnt != end; ++cnt)
-    budget += traits::size_buffer(access(cnt));
-  budget +=
-    static_cast<std::size_t>(std::distance(begin, end)) * std::size(sep);
-
-  std::string result;
-  result.resize(budget);
-
-  char *const data{result.data()};
-  char *here{data};
-  char *stop{data + budget};
-  here = traits::into_buf(here, stop, access(begin)) - 1;
-  for (++begin; begin != end; ++begin)
-  {
-    here += sep.copy(here, std::size(sep));
-    here = traits::into_buf(here, stop, access(begin)) - 1;
-  }
-  result.resize(static_cast<std::size_t>(here - data));
-  return result;
-}
-
-
-/// Render sequence as a string, using given separator between items.
-template<typename ITER>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, ITER begin, ITER end)
-{
-  return separated_list(sep, begin, end, [](ITER i) { return *i; });
-}
-
-
-/// Render items in a container as a string, using given separator.
-template<typename CONTAINER>
-[[nodiscard]] inline auto
-separated_list(std::string_view sep, CONTAINER const &c)
-  /*
-  Always std::string; necessary because SFINAE doesn't work with the
-  contents of function bodies, so the check for iterability has to be in
-  the signature.
-  */
-  -> typename std::enable_if<
-    (not std::is_void<decltype(std::begin(c))>::value and
-     not std::is_void<decltype(std::end(c))>::value),
-    std::string>::type
-{
-  return separated_list(sep, std::begin(c), std::end(c));
-}
-
-
-/// Render items in a tuple as a string, using given separator.
-template<
-  typename TUPLE, std::size_t INDEX = 0, typename ACCESS,
-  typename std::enable_if<
-    (INDEX == std::tuple_size<TUPLE>::value - 1), int>::type = 0>
-[[nodiscard]] inline std::string separated_list(
-  std::string_view /* sep */, TUPLE const &t, ACCESS const &access)
-{
-  return to_string(access(&std::get<INDEX>(t)));
-}
-
-template<
-  typename TUPLE, std::size_t INDEX = 0, typename ACCESS,
-  typename std::enable_if<
-    (INDEX < std::tuple_size<TUPLE>::value - 1), int>::type = 0>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, TUPLE const &t, ACCESS const &access)
-{
-  std::string out{to_string(access(&std::get<INDEX>(t)))};
-  out.append(sep);
-  out.append(separated_list<TUPLE, INDEX + 1>(sep, t, access));
-  return out;
-}
-
-template<
-  typename TUPLE, std::size_t INDEX = 0,
-  typename std::enable_if<
-    (INDEX <= std::tuple_size<TUPLE>::value), int>::type = 0>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, TUPLE const &t)
-{
-  // TODO: Optimise allocation.
-  return separated_list(sep, t, [](TUPLE const &tup) { return *tup; });
-}
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/strconv b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/strconv
deleted file mode 100644
index aa2c40ed5..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/strconv
+++ /dev/null
@@ -1,6 +0,0 @@
-/** String conversion definitions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/strconv.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/strconv.hxx
deleted file mode 100644
index 863711228..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/strconv.hxx
+++ /dev/null
@@ -1,468 +0,0 @@
-/* String conversion definitions.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stringconv instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STRCONV
-#define PQXX_H_STRCONV
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <algorithm>
-#include <cstring>
-#include <limits>
-#include <sstream>
-#include <stdexcept>
-#include <typeinfo>
-
-#if __has_include(<charconv>)
-#  include <charconv>
-#endif
-
-#if defined(PQXX_HAVE_RANGES) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-
-namespace pqxx::internal
-{
-/// Attempt to demangle @c std::type_info::name() to something human-readable.
-PQXX_LIBEXPORT std::string demangle_type_name(char const[]);
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @defgroup stringconversion String conversion
- *
- * The PostgreSQL server accepts and represents data in string form.  It has
- * its own formats for various data types.  The string conversions define how
- * various C++ types translate to and from their respective PostgreSQL text
- * representations.
- *
- * Each conversion is defined by a specialisations of @c string_traits.  It
- * gets complicated if you want top performance, but until you do, all you
- * really need to care about when converting values between C++ in-memory
- * representations such as @c int and the postgres string representations is
- * the @c pqxx::to_string and @c pqxx::from_string functions.
- *
- * If you need to convert a type which is not supported out of the box, you'll
- * need to define your own specialisations for these templates, similar to the
- * ones defined here and in `pqxx/conversions.hxx`.  Any conversion code which
- * "sees" your specialisation will now support your conversion.  In particular,
- * you'll be able to read result fields into a variable of the new type.
- *
- * There is a macro to help you define conversions for individual enumeration
- * types.  The conversion will represent enumeration values as numeric strings.
- */
-//@{
-
-/// A human-readable name for a type, used in error messages and such.
-/** Actually this may not always be very user-friendly.  It uses
- * @c std::type_info::name().  On gcc-like compilers we try to demangle its
- * output.  Visual Studio produces human-friendly names out of the box.
- *
- * This variable is not inline.  Inlining it gives rise to "memory leak"
- * warnings from asan, the address sanitizer, possibly from use of
- * @c std::type_info::name.
- */
-template<typename TYPE>
-std::string const type_name{internal::demangle_type_name(typeid(TYPE).name())};
-
-
-/// Traits describing a type's "null value," if any.
-/** Some C++ types have a special value or state which correspond directly to
- * SQL's NULL.
- *
- * The @c nullness traits describe whether it exists, and whether a particular
- * value is null.
- */
-template<typename TYPE, typename ENABLE = void> struct nullness
-{
-  /// Does this type have a null value?
-  static bool has_null;
-
-  /// Is this type always null?
-  static bool always_null;
-
-  /// Is @c value a null?
-  static bool is_null(TYPE const &value);
-
-  /// Return a null value.
-  /** Don't use this in generic code to compare a value and see whether it is
-   * null.  Some types may have multiple null values which do not compare as
-   * equal, or may define a null value which is not equal to anything including
-   * itself, like in SQL.
-   */
-  [[nodiscard]] static TYPE null();
-};
-
-
-/// Nullness traits describing a type which does not have a null value.
-template<typename TYPE> struct no_null
-{
-  /// Does @c TYPE have a "built-in null value"?
-  /** For example, a pointer can equal @c nullptr, which makes a very natural
-   * representation of an SQL null value.  For such types, the code sometimes
-   * needs to make special allowances.
-   *
-   * for most types, such as @c int or @c std::string, there is no built-in
-   * null.  If you want to represent an SQL null value for such a type, you
-   * would have to wrap it in something that does have a null value.  For
-   * example, you could use @c std::optional<int> for "either an @c int or a
-   * null value."
-   */
-  static constexpr bool has_null = false;
-
-  /// Are all values of this type null?
-  /** There are a few special C++ types which are always null - mainly
-   * @c std::nullptr_t.
-   */
-  static constexpr bool always_null = false;
-
-  /// Does a given value correspond to an SQL null value?
-  /** Most C++ types, such as @c int or @c std::string, have no inherent null
-   * value.  But some types such as C-style string pointers do have a natural
-   * equivalent to an SQL null.
-   */
-  [[nodiscard]] static constexpr bool is_null(TYPE const &) noexcept
-  {
-    return false;
-  }
-};
-
-
-/// Traits class for use in string conversions.
-/** Specialize this template for a type for which you wish to add to_string
- * and from_string support.
- *
- * String conversions are not meant to work for nulls.  Check for null before
- * converting a value of @c TYPE to a string, or vice versa.
- */
-template<typename TYPE> struct string_traits
-{
-  /// Return a @c string_view representing value, plus terminating zero.
-  /** Produces a @c string_view containing the PostgreSQL string representation
-   * for @c value.
-   *
-   * Uses the space from @c begin to @c end as a buffer, if needed.  The
-   * returned string may lie somewhere in that buffer, or it may be a
-   * compile-time constant, or it may be null if value was a null value.  Even
-   * if the string is stored in the buffer, its @c begin() may or may not be
-   * the same as @c begin.
-   *
-   * The @c string_view is guaranteed to be valid as long as the buffer from
-   * @c begin to @c end remains accessible and unmodified.
-   *
-   * @throws pqxx::conversion_overrun if the provided buffer space may not be
-   * enough.  For maximum performance, this is a conservative estimate.  It may
-   * complain about a buffer which is actually large enough for your value, if
-   * an exact check gets too expensive.
-   */
-  [[nodiscard]] static inline zview
-  to_buf(char *begin, char *end, TYPE const &value);
-
-  /// Write value's string representation into buffer at @c begin.
-  /** Assumes that value is non-null.
-   *
-   * Writes value's string representation into the buffer, starting exactly at
-   * @c begin, and ensuring a trailing zero.  Returns the address just beyond
-   * the trailing zero, so the caller could use it as the @c begin for another
-   * call to @c into_buf writing a next value.
-   */
-  static inline char *into_buf(char *begin, char *end, TYPE const &value);
-
-  /// Parse a string representation of a @c TYPE value.
-  /** Throws @c conversion_error if @c value does not meet the expected format
-   * for a value of this type.
-   */
-  [[nodiscard]] static inline TYPE from_string(std::string_view text);
-
-  // C++20: Can we make these all constexpr?
-  /// Estimate how much buffer space is needed to represent value.
-  /** The estimate may be a little pessimistic, if it saves time.
-   *
-   * The estimate includes the terminating zero.
-   */
-  [[nodiscard]] static inline std::size_t
-  size_buffer(TYPE const &value) noexcept;
-};
-
-
-/// Nullness: Enums do not have an inherent null value.
-template<typename ENUM>
-struct nullness<ENUM, std::enable_if_t<std::is_enum_v<ENUM>>> : no_null<ENUM>
-{};
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// Helper class for defining enum conversions.
-/** The conversion will convert enum values to numeric strings, and vice versa.
- *
- * To define a string conversion for an enum type, derive a @c string_traits
- * specialisation for the enum from this struct.
- *
- * There's usually an easier way though: the @c PQXX_DECLARE_ENUM_CONVERSION
- * macro.  Use @c enum_traits manually only if you need to customise your
- * traits type in more detail.
- */
-template<typename ENUM> struct enum_traits
-{
-  using impl_type = std::underlying_type_t<ENUM>;
-  using impl_traits = string_traits<impl_type>;
-
-  [[nodiscard]] static constexpr zview
-  to_buf(char *begin, char *end, ENUM const &value)
-  {
-    return impl_traits::to_buf(begin, end, to_underlying(value));
-  }
-
-  static constexpr char *into_buf(char *begin, char *end, ENUM const &value)
-  {
-    return impl_traits::into_buf(begin, end, to_underlying(value));
-  }
-
-  [[nodiscard]] static ENUM from_string(std::string_view text)
-  {
-    return static_cast<ENUM>(impl_traits::from_string(text));
-  }
-
-  [[nodiscard]] static std::size_t size_buffer(ENUM const &value) noexcept
-  {
-    return impl_traits::size_buffer(to_underlying(value));
-  }
-
-private:
-  // C++23: Replace with std::to_underlying.
-  static constexpr impl_type to_underlying(ENUM const &value) noexcept
-  {
-    return static_cast<impl_type>(value);
-  }
-};
-} // namespace pqxx::internal
-
-
-/// Macro: Define a string conversion for an enum type.
-/** This specialises the @c pqxx::string_traits template, so use it in the
- * @c ::pqxx namespace.
- *
- * For example:
- *
- *      #include <iostream>
- *      #include <pqxx/strconv>
- *      enum X { xa, xb };
- *      namespace pqxx { PQXX_DECLARE_ENUM_CONVERSION(x); }
- *      int main() { std::cout << pqxx::to_string(xa) << std::endl; }
- */
-#define PQXX_DECLARE_ENUM_CONVERSION(ENUM)                                    \
-  template<> struct string_traits<ENUM> : pqxx::internal::enum_traits<ENUM>   \
-  {};                                                                         \
-  template<> inline std::string const type_name<ENUM> { #ENUM }
-
-
-namespace pqxx
-{
-/// Parse a value in postgres' text format as a TYPE.
-/** If the form of the value found in the string does not match the expected
- * type, e.g. if a decimal point is found when converting to an integer type,
- * the conversion fails.  Overflows (e.g. converting "9999999999" to a 16-bit
- * C++ type) are also treated as errors.  If in some cases this behaviour
- * should be inappropriate, convert to something bigger such as @c long @c int
- * first and then truncate the resulting value.
- *
- * Only the simplest possible conversions are supported.  Fancy features like
- * hexadecimal or octal, spurious signs, or exponent notation won't work.
- * Whitespace is not stripped away.  Only the kinds of strings that come out of
- * PostgreSQL and out of to_string() can be converted.
- */
-template<typename TYPE>
-[[nodiscard]] inline TYPE from_string(std::string_view text)
-{
-  return string_traits<TYPE>::from_string(text);
-}
-
-
-/// "Convert" a std::string_view to a std::string_view.
-/** Just returns its input.
- *
- * @warning Of course the result is only valid for as long as the original
- * string remains valid!  Never access the string referenced by the return
- * value after the original has been destroyed.
- */
-template<>
-[[nodiscard]] inline std::string_view from_string(std::string_view text)
-{
-  return text;
-}
-
-
-/// Attempt to convert postgres-generated string to given built-in object.
-/** This is like the single-argument form of the function, except instead of
- * returning the value, it sets @c value.
- *
- * You may find this more convenient in that it infers the type you want from
- * the argument you pass.  But there are disadvantages: it requires an
- * assignment operator, and it may be less efficient.
- */
-template<typename T> inline void from_string(std::string_view text, T &value)
-{
-  value = from_string<T>(text);
-}
-
-
-/// Convert a value to a readable string that PostgreSQL will understand.
-/** The conversion does no special formatting, and ignores any locale settings.
- * The resulting string will be human-readable and in a format suitable for use
- * in SQL queries.  It won't have niceties such as "thousands separators"
- * though.
- */
-template<typename TYPE> inline std::string to_string(TYPE const &value);
-
-
-/// Convert multiple values to strings inside a single buffer.
-/** There must be enough room for all values, or this will throw
- * @c conversion_overrun.  You can obtain a conservative estimate of the buffer
- * space required by calling @c size_buffer() on the values.
- *
- * The @c std::string_view results may point into the buffer, so don't assume
- * that they will remain valid after you destruct or move the buffer.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::vector<std::string_view>
-to_buf(char *here, char const *end, TYPE... value)
-{
-  return {[&here, end](auto v) {
-    auto begin = here;
-    here = string_traits<decltype(v)>::into_buf(begin, end, v);
-    // Exclude the trailing zero out of the string_view.
-    auto len{static_cast<std::size_t>(here - begin) - 1};
-    return std::string_view{begin, len};
-  }(value)...};
-}
-
-/// Convert a value to a readable string that PostgreSQL will understand.
-/** This variant of to_string can sometimes save a bit of time in loops, by
- * re-using a std::string for multiple conversions.
- */
-template<typename TYPE>
-inline void into_string(TYPE const &value, std::string &out);
-
-
-/// Is @c value null?
-template<typename TYPE>
-[[nodiscard]] inline constexpr bool is_null(TYPE const &value) noexcept
-{
-  return nullness<strip_t<TYPE>>::is_null(value);
-}
-
-
-/// Estimate how much buffer space is needed to represent values as a string.
-/** The estimate may be a little pessimistic, if it saves time.  It also
- * includes room for a terminating zero after each value.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::size_t size_buffer(TYPE const &...value) noexcept
-{
-  return (string_traits<strip_t<TYPE>>::size_buffer(value) + ...);
-}
-
-
-/// Does this type translate to an SQL array?
-/** Specialisations may override this to be true for container types.
- *
- * This may not always be a black-and-white choice.  For instance, a
- * @c std::string is a container, but normally it translates to an SQL string,
- * not an SQL array.
- */
-template<typename TYPE> inline constexpr bool is_sql_array{false};
-
-
-/// Can we use this type in arrays and composite types without quoting them?
-/** Define this as @c true only if values of @c TYPE can never contain any
- * special characters that might need escaping or confuse the parsing of array
- * or composite * types, such as commas, quotes, parentheses, braces, newlines,
- * and so on.
- *
- * When converting a value of such a type to a string in an array or a field in
- * a composite type, we do not need to add quotes, nor escape any special
- * characters.
- *
- * This is just an optimisation, so it defaults to @c false to err on the side
- * of slow correctness.
- */
-template<typename TYPE> inline constexpr bool is_unquoted_safe{false};
-
-
-/// Element separator between SQL array elements of this type.
-template<typename T> inline constexpr char array_separator{','};
-
-
-/// What's the preferred format for passing non-null parameters of this type?
-/** This affects how we pass parameters of @c TYPE when calling parameterised
- * statements or prepared statements.
- *
- * Generally we pass parameters in text format, but binary strings are the
- * exception.  We also pass nulls in binary format, so this function need not
- * handle null values.
- */
-template<typename TYPE> inline constexpr format param_format(TYPE const &)
-{
-  return format::text;
-}
-
-
-/// Implement @c string_traits<TYPE>::to_buf by calling @c into_buf.
-/** When you specialise @c string_traits for a new type, most of the time its
- * @c to_buf implementation has no special optimisation tricks and just writes
- * its text into the buffer it receives from the caller, starting at the
- * beginning.
- *
- * In that common situation, you can implement @c to_buf as just a call to
- * @c generic_to_buf.  It will call @c into_buf and return the right result for
- * @c to_buf.
- */
-template<typename TYPE>
-inline zview generic_to_buf(char *begin, char *end, TYPE const &value)
-{
-  using traits = string_traits<TYPE>;
-  // The trailing zero does not count towards the zview's size, so subtract 1
-  // from the result we get from into_buf().
-  if (is_null(value))
-    return {};
-  else
-    return {begin, traits::into_buf(begin, end, value) - begin - 1};
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: Binary string, akin to @c std::string for binary data.
-/** Any type that satisfies this concept can represent an SQL BYTEA value.
- *
- * A @c binary has a @c begin(), @c end(), @c size(), and @data().  Each byte
- * is a @c std::byte, and they must all be laid out contiguously in memory so
- * we can reference them by a pointer.
- */
-template<class TYPE>
-concept binary = std::ranges::contiguous_range<TYPE> and
-  std::is_same_v<strip_t<value_type<TYPE>>, std::byte>;
-#endif
-//@}
-} // namespace pqxx
-
-
-#include "pqxx/internal/conversions.hxx"
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_from b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_from
deleted file mode 100644
index 972762443..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_from
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::stream_from class.
- *
- * pqxx::stream_from enables optimized batch reads from a database table.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_from.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_from.hxx
deleted file mode 100644
index ff4a93d2e..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_from.hxx
+++ /dev/null
@@ -1,361 +0,0 @@
-/* Definition of the pqxx::stream_from class.
- *
- * pqxx::stream_from enables optimized batch reads from a database table.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stream_from instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_FROM
-#define PQXX_H_STREAM_FROM
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cassert>
-#include <functional>
-#include <variant>
-
-#include "pqxx/connection.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/internal/stream_iterator.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/transaction_focus.hxx"
-
-
-namespace pqxx
-{
-class transaction_base;
-
-
-/// Pass this to a `stream_from` constructor to stream table contents.
-/** @deprecated Use @ref stream_from::table() instead.
- */
-constexpr from_table_t from_table;
-/// Pass this to a `stream_from` constructor to stream query results.
-/** @deprecated Use stream_from::query() instead.
- */
-constexpr from_query_t from_query;
-
-
-/// Stream data from the database.
-/** For larger data sets, retrieving data this way is likely to be faster than
- * executing a query and then iterating and converting the rows fields.  You
- * will also be able to start processing before all of the data has come in.
- *
- * There are also downsides.  Not all kinds of query will work in a stream.
- * But straightforward `SELECT` and `UPDATE ... RETURNING` queries should work.
- * This function makes use of @ref pqxx::stream_from, which in turn uses
- * PostgreSQL's `COPY` command, so see the documentation for those to get the
- * full details.
- *
- * There are other downsides.  If there stream encounters an error, it may
- * leave the entire connection in an unusable state, so you'll have to give the
- * whole thing up.  Finally, opening a stream puts the connection in a special
- * state, so you won't be able to do many other things with the connection or
- * the transaction while the stream is open.
- *
- * There are two ways of starting a stream: you stream either all rows in a
- * table (using one of the factories, `table()` or `raw_table()`), or the
- * results of a query (using the `query()` factory).
- *
- * Usually you'll want the `stream` convenience wrapper in
- * @ref transaction_base, * so you don't need to deal with this class directly.
- *
- * @warning While a stream is active, you cannot execute queries, open a
- * pipeline, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT stream_from : transaction_focus
-{
-public:
-  using raw_line =
-    std::pair<std::unique_ptr<char, std::function<void(char *)>>, std::size_t>;
-
-  /// Factory: Execute query, and stream the results.
-  /** The query can be a SELECT query or a VALUES query; or it can be an
-   * UPDATE, INSERT, or DELETE with a RETURNING clause.
-   *
-   * The query is executed as part of a COPY statement, so there are additional
-   * restrictions on what kind of query you can use here.  See the PostgreSQL
-   * documentation for the COPY command:
-   *
-   *     https://www.postgresql.org/docs/current/sql-copy.html
-   */
-  static stream_from query(transaction_base &tx, std::string_view q)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return {tx, from_query, q};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /**
-   * @name Streaming data from tables
-   *
-   * You can use `stream_from` to read a table's contents.  This is a quick
-   * and easy way to read a table, but it comes with limitations.  It cannot
-   * stream from a view, only from a table.  It does not support conditions.
-   * And there are no guarantees about ordering.  If you need any of those
-   * things, consider streaming from a query instead.
-   */
-  //@{
-
-  /// Factory: Stream data from a pre-quoted table and columns.
-  /** Use this factory if you need to create multiple streams using the same
-   * table path and/or columns list, and you want to save a bit of work on
-   * composing the internal SQL statement for starting the stream.  It lets you
-   * compose the string representations for the table path and the columns
-   * list, so you can compute these once and then re-use them later.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path Name or path for the table upon which the stream will
-   *     operate.  If any part of the table path may contain special
-   *     characters or be case-sensitive, quote the path using
-   *     pqxx::connection::quote_table().
-   * @param columns Columns which the stream will read.  They should be
-   *     comma-separated and, if needed, quoted.  You can produce the string
-   *     using pqxx::connection::quote_columns().  If you omit this argument,
-   *     the stream will read all columns in the table, in schema order.
-   */
-  static stream_from raw_table(
-    transaction_base &tx, std::string_view path,
-    std::string_view columns = ""sv);
-
-  /// Factory: Stream data from a given table.
-  /** This is the convenient way to stream from a table.
-   */
-  static stream_from table(
-    transaction_base &tx, table_path path,
-    std::initializer_list<std::string_view> columns = {});
-  //@}
-
-  /// Execute query, and stream over the results.
-  /** @deprecated Use factory function @ref query instead.
-   */
-  [[deprecated("Use query() factory instead.")]] stream_from(
-    transaction_base &, from_query_t, std::string_view query);
-
-  /// Stream all rows in table, all columns.
-  /** @deprecated Use factories @ref table or @ref raw_table instead.
-   */
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &, from_table_t, std::string_view table);
-
-  /// Stream given columns from all rows in table.
-  /** @deprecated Use factories @ref table or @ref raw_table instead.
-   */
-  template<typename Iter>
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &, from_table_t, std::string_view table,
-    Iter columns_begin, Iter columns_end);
-
-  /// Stream given columns from all rows in table.
-  /** @deprecated Use factory function @ref query instead.
-   */
-  template<typename Columns>
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &tx, from_table_t, std::string_view table,
-    Columns const &columns);
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &tx, std::string_view table) :
-          stream_from{tx, from_table, table}
-  {}
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  template<typename Columns>
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &tx, std::string_view table, Columns const &columns) :
-          stream_from{tx, from_table, table, columns}
-  {}
-
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  template<typename Iter>
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &, std::string_view table, Iter columns_begin,
-    Iter columns_end);
-
-  ~stream_from() noexcept;
-
-  /// May this stream still produce more data?
-  [[nodiscard]] constexpr operator bool() const noexcept
-  {
-    return not m_finished;
-  }
-  /// Has this stream produced all the data it is going to produce?
-  [[nodiscard]] constexpr bool operator!() const noexcept
-  {
-    return m_finished;
-  }
-
-  /// Finish this stream.  Call this before continuing to use the connection.
-  /** Consumes all remaining lines, and closes the stream.
-   *
-   * This may take a while if you're abandoning the stream before it's done, so
-   * skip it in error scenarios where you're not planning to use the connection
-   * again afterwards.
-   */
-  void complete();
-
-  /// Read one row into a tuple.
-  /** Converts the row's fields into the fields making up the tuple.
-   *
-   * For a column which can contain nulls, be sure to give the corresponding
-   * tuple field a type which can be null.  For example, to read a field as
-   * `int` when it may contain nulls, read it as `std::optional<int>`.
-   * Using `std::shared_ptr` or `std::unique_ptr` will also work.
-   */
-  template<typename Tuple> stream_from &operator>>(Tuple &);
-
-  /// Doing this with a `std::variant` is going to be horrifically borked.
-  template<typename... Vs>
-  stream_from &operator>>(std::variant<Vs...> &) = delete;
-
-  /// Iterate over this stream.  Supports range-based "for" loops.
-  /** Produces an input iterator over the stream.
-   *
-   * Do not call this yourself.  Use it like "for (auto data : stream.iter())".
-   */
-  template<typename... TYPE> [[nodiscard]] auto iter() &
-  {
-    return pqxx::internal::stream_input_iteration<TYPE...>{*this};
-  }
-
-  /// Read a row.  Return fields as views, valid until you read the next row.
-  /** Returns `nullptr` when there are no more rows to read.  Do not attempt
-   * to read any further rows after that.
-   *
-   * Do not access the vector, or the storage referenced by the views, after
-   * closing or completing the stream, or after attempting to read a next row.
-   *
-   * A @ref pqxx::zview is like a `std::string_view`, but with the added
-   * guarantee that if its data pointer is non-null, the string is followed by
-   * a terminating zero (which falls just outside the view itself).
-   *
-   * If any of the views' data pointer is null, that means that the
-   * corresponding SQL field is null.
-   *
-   * @warning The return type may change in the future, to support C++20
-   * coroutine-based usage.
-   */
-  std::vector<zview> const *read_row() &;
-
-  /// Read a raw line of text from the COPY command.
-  /** @warning Do not use this unless you really know what you're doing. */
-  raw_line get_raw_line();
-
-private:
-  // TODO: Clean up this signature once we cull the deprecated constructors.
-  /// @deprecated
-  stream_from(
-    transaction_base &tx, std::string_view table, std::string_view columns,
-    from_table_t);
-
-  // TODO: Clean up this signature once we cull the deprecated constructors.
-  /// @deprecated
-  stream_from(
-    transaction_base &, std::string_view unquoted_table,
-    std::string_view columns, from_table_t, int);
-
-  template<typename Tuple, std::size_t... indexes>
-  void extract_fields(Tuple &t, std::index_sequence<indexes...>) const
-  {
-    (extract_value<Tuple, indexes>(t), ...);
-  }
-
-  pqxx::internal::glyph_scanner_func *m_glyph_scanner;
-
-  /// Current row's fields' text, combined into one reusable string.
-  std::string m_row;
-
-  /// The current row's fields.
-  std::vector<zview> m_fields;
-
-  bool m_finished = false;
-
-  void close();
-
-  template<typename Tuple, std::size_t index>
-  void extract_value(Tuple &) const;
-
-  /// Read a line of COPY data, write `m_row` and `m_fields`.
-  void parse_line();
-};
-
-
-template<typename Columns>
-inline stream_from::stream_from(
-  transaction_base &tx, from_table_t, std::string_view table_name,
-  Columns const &columns) :
-        stream_from{
-          tx, from_table, table_name, std::begin(columns), std::end(columns)}
-{}
-
-
-template<typename Iter>
-inline stream_from::stream_from(
-  transaction_base &tx, from_table_t, std::string_view table,
-  Iter columns_begin, Iter columns_end) :
-        stream_from{
-          tx, table, separated_list(",", columns_begin, columns_end),
-          from_table, 1}
-{}
-
-
-template<typename Tuple> inline stream_from &stream_from::operator>>(Tuple &t)
-{
-  if (m_finished)
-    return *this;
-  static constexpr auto tup_size{std::tuple_size_v<Tuple>};
-  m_fields.reserve(tup_size);
-  parse_line();
-  if (m_finished)
-    return *this;
-
-  if (std::size(m_fields) != tup_size)
-    throw usage_error{internal::concat(
-      "Tried to extract ", tup_size, " field(s) from a stream of ",
-      std::size(m_fields), ".")};
-
-  extract_fields(t, std::make_index_sequence<tup_size>{});
-  return *this;
-}
-
-
-template<typename Tuple, std::size_t index>
-inline void stream_from::extract_value(Tuple &t) const
-{
-  using field_type = strip_t<decltype(std::get<index>(t))>;
-  using nullity = nullness<field_type>;
-  assert(index < std::size(m_fields));
-  if constexpr (nullity::always_null)
-  {
-    if (std::data(m_fields[index]) != nullptr)
-      throw conversion_error{"Streaming non-null value into null field."};
-  }
-  else if (std::data(m_fields[index]) == nullptr)
-  {
-    if constexpr (nullity::has_null)
-      std::get<index>(t) = nullity::null();
-    else
-      internal::throw_null_conversion(type_name<field_type>);
-  }
-  else
-  {
-    // Don't ever try to convert a non-null value to nullptr_t!
-    std::get<index>(t) = from_string<field_type>(m_fields[index]);
-  }
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_to b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_to
deleted file mode 100644
index 8760cf1f4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_to
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::stream_to class.
- *
- * pqxx::stream_to enables optimized batch updates to a database table.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/stream_to.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_to.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_to.hxx
deleted file mode 100644
index 2a49d8f85..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/stream_to.hxx
+++ /dev/null
@@ -1,455 +0,0 @@
-/* Definition of the pqxx::stream_to class.
- *
- * pqxx::stream_to enables optimized batch updates to a database table.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stream_to.hxx instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_TO
-#define PQXX_H_STREAM_TO
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/separated_list.hxx"
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-/// Efficiently write data directly to a database table.
-/** If you wish to insert rows of data into a table, you can compose INSERT
- * statements and execute them.  But it's slow and tedious, and you need to
- * worry about quoting and escaping the data.
- *
- * If you're just inserting a single row, it probably won't matter much.  You
- * can use prepared or parameterised statements to take care of the escaping
- * for you.  But if you're inserting large numbers of rows you will want
- * something better.
- *
- * Inserting rows one by one using INSERT statements involves a lot of
- * pointless overhead, especially when you are working with a remote database
- * server over the network.  You may end up sending each row over the network
- * as a separate query, and waiting for a reply.  Do it "in bulk" using
- * `stream_to`, and you may find that it goes many times faster.  Sometimes
- * you gain orders of magnitude in speed.
- *
- * Here's how it works: you create a `stream_to` stream to start writing to
- * your table.  You will probably want to specify the columns.  Then, you
- * feed your data into the stream one row at a time.  And finally, you call the
- * stream's @ref complete function to tell it to finalise the operation, wait
- * for completion, and check for errors.
- *
- * (You _must_ complete the stream before committing or aborting the
- * transaction.  The connection is in a special state while the stream is
- * active, where it can't process commands, and can't commit or abort a
- * transaction.)
- *
- * So how do you feed a row of data into the stream?  There's several ways, but
- * the preferred one is to call its @ref write_values.  Pass the field values
- * as arguments.  Doesn't matter what type they are, as long as libpqxx knows
- * how to convert them to PostgreSQL's text format: `int`, `std::string` or
- * `std:string_view`, `float` and `double`, `bool`...  lots of basic types
- * are supported.  If some of the values are null, feel free to use
- * `std::optional`, `std::shared_ptr`, or `std::unique_ptr`.
- *
- * The arguments' types don't even have to match the fields' SQL types.  If you
- * want to insert an `int` into a `DECIMAL` column, that's your choice -- it
- * will produce a `DECIMAL` value which happens to be integral.  Insert a
- * `float` into a `VARCHAR` column?  That's fine, you'll get a string whose
- * contents happen to read like a number.  And so on.  You can even insert
- * different types of value in the same column on different rows.  If you have
- * a code path where a particular field is always null, just insert `nullptr`.
- *
- * There is another way to insert rows: the `<<` ("shift-left") operator.
- * It's not as fast and it doesn't support variable arguments: each row must be
- * either a `std::tuple` or something iterable, such as a `std::vector`, or
- * anything else with a `begin()` and `end()`.
- *
- * @warning While a stream is active, you cannot execute queries, open a
- * pipeline, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT stream_to : transaction_focus
-{
-public:
-  /// Stream data to a pre-quoted table and columns.
-  /** This factory can be useful when it's not convenient to provide the
-   * columns list in the form of a `std::initializer_list`, or when the list
-   * of columns is simply not known at compile time.
-   *
-   * Also use this if you need to create multiple streams using the same table
-   * path and/or columns list, and you want to save a bit of work on composing
-   * the internal SQL statement for starting the stream.  It lets you compose
-   * the string representations for the table path and the columns list, so you
-   * can compute these once and then re-use them later.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path Name or path for the table upon which the stream will
-   *     operate.  If any part of the table path may contain special
-   *     characters or be case-sensitive, quote the path using
-   *     pqxx::connection::quote_table().
-   * @param columns Columns to which the stream will write.  They should be
-   *     comma-separated and, if needed, quoted.  You can produce the string
-   *     using pqxx::connection::quote_columns().  If you omit this argument,
-   *     the stream will write all columns in the table, in schema order.
-   */
-  static stream_to raw_table(
-    transaction_base &tx, std::string_view path, std::string_view columns = "")
-  {
-    return {tx, path, columns};
-  }
-
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this to stream data to a table, where the list of columns is known at
-   * compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns Optionally, the columns to which the stream should write.
-   *     If you do not pass this, the stream will write to all columns in the
-   *     table, in schema order.
-   */
-  static stream_to table(
-    transaction_base &tx, table_path path,
-    std::initializer_list<std::string_view> columns = {})
-  {
-    auto const &conn{tx.conn()};
-    return raw_table(tx, conn.quote_table(path), conn.quote_columns(columns));
-  }
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this version to stream data to a table, when the list of columns is
-   * not known at compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns The columns to which the stream should write.
-   */
-  template<PQXX_CHAR_STRINGS_ARG COLUMNS>
-  static stream_to
-  table(transaction_base &tx, table_path path, COLUMNS const &columns)
-  {
-    auto const &conn{tx.conn()};
-    return stream_to::raw_table(
-      tx, conn.quote_table(path), tx.conn().quote_columns(columns));
-  }
-
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this version to stream data to a table, when the list of columns is
-   * not known at compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns The columns to which the stream should write.
-   */
-  template<PQXX_CHAR_STRINGS_ARG COLUMNS>
-  static stream_to
-  table(transaction_base &tx, std::string_view path, COLUMNS const &columns)
-  {
-    return stream_to::raw_table(tx, path, tx.conn().quote_columns(columns));
-  }
-#endif // PQXX_HAVE_CONCEPTS
-
-  /// Create a stream, without specifying columns.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   *
-   * Fields will be inserted in whatever order the columns have in the
-   * database.
-   *
-   * You'll probably want to specify the columns, so that the mapping between
-   * your data fields and the table is explicit in your code, and not hidden
-   * in an "implicit contract" between your code and your schema.
-   */
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &tx, std::string_view table_name) :
-          stream_to{tx, table_name, ""sv}
-  {}
-
-  /// Create a stream, specifying column names as a container of strings.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   */
-  template<typename Columns>
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &, std::string_view table_name, Columns const &columns);
-
-  /// Create a stream, specifying column names as a sequence of strings.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   */
-  template<typename Iter>
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &, std::string_view table_name, Iter columns_begin,
-    Iter columns_end);
-
-  ~stream_to() noexcept;
-
-  /// Does this stream still need to @ref complete()?
-  [[nodiscard]] constexpr operator bool() const noexcept
-  {
-    return not m_finished;
-  }
-  /// Has this stream been through its concluding @c complete()?
-  [[nodiscard]] constexpr bool operator!() const noexcept
-  {
-    return m_finished;
-  }
-
-  /// Complete the operation, and check for errors.
-  /** Always call this to close the stream in an orderly fashion, even after
-   * an error.  (In the case of an error, abort the transaction afterwards.)
-   *
-   * The only circumstance where it's safe to skip this is after an error, if
-   * you're discarding the entire connection.
-   */
-  void complete();
-
-  /// Insert a row of data.
-  /** Returns a reference to the stream, so you can chain the calls.
-   *
-   * The @c row can be a tuple, or any type that can be iterated.  Each
-   * item becomes a field in the row, in the same order as the columns you
-   * specified when creating the stream.
-   *
-   * If you don't already happen to have your fields in the form of a tuple or
-   * container, prefer @c write_values.  It's faster and more convenient.
-   */
-  template<typename Row> stream_to &operator<<(Row const &row)
-  {
-    write_row(row);
-    return *this;
-  }
-
-  /// Stream a `stream_from` straight into a `stream_to`.
-  /** This can be useful when copying between different databases.  If the
-   * source and the destination are on the same database, you'll get better
-   * performance doing it all in a regular query.
-   */
-  stream_to &operator<<(stream_from &);
-
-  /// Insert a row of data, given in the form of a @c std::tuple or container.
-  /** The @c row can be a tuple, or any type that can be iterated.  Each
-   * item becomes a field in the row, in the same order as the columns you
-   * specified when creating the stream.
-   *
-   * The preferred way to insert a row is @c write_values.
-   */
-  template<typename Row> void write_row(Row const &row)
-  {
-    fill_buffer(row);
-    write_buffer();
-  }
-
-  /// Insert values as a row.
-  /** This is the recommended way of inserting data.  Pass your field values,
-   * of any convertible type.
-   */
-  template<typename... Ts> void write_values(Ts const &...fields)
-  {
-    fill_buffer(fields...);
-    write_buffer();
-  }
-
-private:
-  /// Stream a pre-quoted table name and columns list.
-  stream_to(
-    transaction_base &tx, std::string_view path, std::string_view columns);
-
-  bool m_finished = false;
-
-  /// Reusable buffer for a row.  Saves doing an allocation for each row.
-  std::string m_buffer;
-
-  /// Reusable buffer for converting/escaping a field.
-  std::string m_field_buf;
-
-  /// Glyph scanner, for parsing the client encoding.
-  internal::glyph_scanner_func *m_scanner;
-
-  /// Write a row of raw text-format data into the destination table.
-  void write_raw_line(std::string_view);
-
-  /// Write a row of data from @c m_buffer into the destination table.
-  /** Resets the buffer for the next row.
-   */
-  void write_buffer();
-
-  /// COPY encoding for a null field, plus subsequent separator.
-  static constexpr std::string_view null_field{"\\N\t"};
-
-  /// Estimate buffer space needed for a field which is always null.
-  template<typename T>
-  static std::enable_if_t<nullness<T>::always_null, std::size_t>
-  estimate_buffer(T const &)
-  {
-    return std::size(null_field);
-  }
-
-  /// Estimate buffer space needed for field f.
-  /** The estimate is not very precise.  We don't actually know how much space
-   * we'll need once the escaping comes in.
-   */
-  template<typename T>
-  static std::enable_if_t<not nullness<T>::always_null, std::size_t>
-  estimate_buffer(T const &field)
-  {
-    return is_null(field) ? std::size(null_field) : size_buffer(field);
-  }
-
-  /// Append escaped version of @c data to @c m_buffer, plus a tab.
-  void escape_field_to_buffer(std::string_view data);
-
-  /// Append string representation for @c f to @c m_buffer.
-  /** This is for the general case, where the field may contain a value.
-   *
-   * Also appends a tab.  The tab is meant to be a separator, not a terminator,
-   * so if you write any fields at all, you'll end up with one tab too many
-   * at the end of the buffer.
-   */
-  template<typename Field>
-  std::enable_if_t<not nullness<Field>::always_null>
-  append_to_buffer(Field const &f)
-  {
-    // We append each field, terminated by a tab.  That will leave us with
-    // one tab too many, assuming we write any fields at all; we remove that
-    // at the end.
-    if (is_null(f))
-    {
-      // Easy.  Append null and tab in one go.
-      m_buffer.append(null_field);
-    }
-    else
-    {
-      // Convert f into m_buffer.
-
-      using traits = string_traits<Field>;
-      auto const budget{estimate_buffer(f)};
-      auto const offset{std::size(m_buffer)};
-
-      if constexpr (std::is_arithmetic_v<Field>)
-      {
-        // Specially optimised for "safe" types, which never need any
-        // escaping.  Convert straight into m_buffer.
-
-        // The budget we get from size_buffer() includes room for the trailing
-        // zero, which we must remove.  But we're also inserting tabs between
-        // fields, so we re-purpose the extra byte for that.
-        auto const total{offset + budget};
-        m_buffer.resize(total);
-        auto const data{m_buffer.data()};
-        char *const end{traits::into_buf(data + offset, data + total, f)};
-        *(end - 1) = '\t';
-        // Shrink to fit.  Keep the tab though.
-        m_buffer.resize(static_cast<std::size_t>(end - data));
-      }
-      else if constexpr (
-        std::is_same_v<Field, std::string> or
-        std::is_same_v<Field, std::string_view> or
-        std::is_same_v<Field, zview>)
-      {
-        // This string may need escaping.
-        m_field_buf.resize(budget);
-        escape_field_to_buffer(f);
-      }
-      else
-      {
-        // This field needs to be converted to a string, and after that,
-        // escaped as well.
-        m_field_buf.resize(budget);
-        auto const data{m_field_buf.data()};
-        escape_field_to_buffer(
-          traits::to_buf(data, data + std::size(m_field_buf), f));
-      }
-    }
-  }
-
-  /// Append string representation for a null field to @c m_buffer.
-  /** This special case is for types which are always null.
-   *
-   * Also appends a tab.  The tab is meant to be a separator, not a terminator,
-   * so if you write any fields at all, you'll end up with one tab too many
-   * at the end of the buffer.
-   */
-  template<typename Field>
-  std::enable_if_t<nullness<Field>::always_null>
-  append_to_buffer(Field const &)
-  {
-    m_buffer.append(null_field);
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on a container of fields.
-  template<typename Container>
-  std::enable_if_t<not std::is_same_v<typename Container::value_type, char>>
-  fill_buffer(Container const &c)
-  {
-    // To avoid unnecessary allocations and deallocations, we run through c
-    // twice: once to determine how much buffer space we may need, and once to
-    // actually write it into the buffer.
-    std::size_t budget{0};
-    for (auto const &f : c) budget += estimate_buffer(f);
-    m_buffer.reserve(budget);
-    for (auto const &f : c) append_to_buffer(f);
-  }
-
-  /// Estimate how many buffer bytes we need to write tuple.
-  template<typename Tuple, std::size_t... indexes>
-  static std::size_t
-  budget_tuple(Tuple const &t, std::index_sequence<indexes...>)
-  {
-    return (estimate_buffer(std::get<indexes>(t)) + ...);
-  }
-
-  /// Write tuple of fields to @c m_buffer.
-  template<typename Tuple, std::size_t... indexes>
-  void append_tuple(Tuple const &t, std::index_sequence<indexes...>)
-  {
-    (append_to_buffer(std::get<indexes>(t)), ...);
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on a tuple of fields.
-  template<typename... Elts> void fill_buffer(std::tuple<Elts...> const &t)
-  {
-    using indexes = std::make_index_sequence<sizeof...(Elts)>;
-
-    m_buffer.reserve(budget_tuple(t, indexes{}));
-    append_tuple(t, indexes{});
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on varargs fields.
-  template<typename... Ts> void fill_buffer(const Ts &...fields)
-  {
-    (..., append_to_buffer(fields));
-  }
-
-  constexpr static std::string_view s_classname{"stream_to"};
-};
-
-
-template<typename Columns>
-inline stream_to::stream_to(
-  transaction_base &tx, std::string_view table_name, Columns const &columns) :
-        stream_to{tx, table_name, std::begin(columns), std::end(columns)}
-{}
-
-
-template<typename Iter>
-inline stream_to::stream_to(
-  transaction_base &tx, std::string_view table_name, Iter columns_begin,
-  Iter columns_end) :
-        stream_to{
-          tx,
-          tx.quote_name(
-            table_name,
-            separated_list(",", columns_begin, columns_end, [&tx](auto col) {
-              return tx.quote_name(*col);
-            }))}
-{}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/subtransaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/subtransaction
deleted file mode 100644
index e0d154903..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/subtransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::subtransaction class.
- *
- * pqxx::subtransaction is a nested transaction, i.e. one inside a transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/subtransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/subtransaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/subtransaction.hxx
deleted file mode 100644
index e66b7a7a8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/subtransaction.hxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Definition of the pqxx::subtransaction class.
- *
- * pqxx::subtransaction is a nested transaction, i.e. one within a transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/subtransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SUBTRANSACTION
-#define PQXX_H_SUBTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- */
-/// "Transaction" nested within another transaction
-/** A subtransaction can be executed inside a backend transaction, or inside
- * another subtransaction.  This can be useful when, for example, statements in
- * a transaction may harmlessly fail and you don't want them to abort the
- * entire transaction.  Here's an example of how a temporary table may be
- * dropped before re-creating it, without failing if the table did not exist:
- *
- * ```cxx
- * void do_job(connection &C)
- * {
- *   string const temptable = "fleetingtable";
- *
- *   work W(C, "do_job");
- *   do_firstpart(W);
- *
- *   // Attempt to delete our temporary table if it already existed.
- *   try
- *   {
- *     subtransaction S(W, "droptemp");
- *     S.exec0("DROP TABLE " + temptable);
- *     S.commit();
- *   }
- *   catch (undefined_table const &)
- *   {
- *     // Table did not exist.  Which is what we were hoping to achieve anyway.
- *     // Carry on without regrets.
- *   }
- *
- *   // S may have gone into a failed state and been destroyed, but the
- *   // upper-level transaction W is still fine.  We can continue to use it.
- *   W.exec0("CREATE TEMP TABLE " + temptable + "(bar integer, splat
- * varchar)");
- *
- *   do_lastpart(W);
- * }
- * ```
- *
- * (This is just an example.  If you really wanted to do drop a table without
- * an error if it doesn't exist, you'd use DROP TABLE IF EXISTS.)
- *
- * There are no isolation levels inside a transaction.  They are not needed
- * because all actions within the same backend transaction are always performed
- * sequentially anyway.
- *
- * @warning While the subtransaction is "live," you cannot execute queries or
- * open streams etc. on its parent transaction.  A transaction can have at most
- * one object of a type derived from @ref pqxx::transaction_focus active on it
- * at a time.
- */
-class PQXX_LIBEXPORT subtransaction : public transaction_focus,
-                                      public dbtransaction
-{
-public:
-  /// Nest a subtransaction nested in another transaction.
-  explicit subtransaction(dbtransaction &t, std::string_view tname = ""sv);
-
-  /// Nest a subtransaction in another subtransaction.
-  explicit subtransaction(subtransaction &t, std::string_view name = ""sv);
-
-  virtual ~subtransaction() noexcept override;
-
-private:
-  std::string quoted_name() const
-  {
-    return quote_name(transaction_focus::name());
-  }
-  virtual void do_commit() override;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/time b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/time
deleted file mode 100644
index 85df05744..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/time
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Date/time string conversions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/time.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/time.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/time.hxx
deleted file mode 100644
index effed05e0..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/time.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/** Support for date/time values.
- *
- * At the moment this supports dates, but not times.
- */
-#ifndef PQXX_H_TIME
-#define PQXX_H_TIME
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <chrono>
-#include <cstdlib>
-
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/strconv.hxx"
-
-
-#if defined(PQXX_HAVE_YEAR_MONTH_DAY)
-
-namespace pqxx
-{
-using namespace std::literals;
-
-template<>
-struct nullness<std::chrono::year_month_day>
-        : no_null<std::chrono::year_month_day>
-{};
-
-
-/// String representation for a Gregorian date in ISO-8601 format.
-/** @warning Experimental.  There may still be design problems, particularly
- * when it comes to BC years.
- *
- * PostgreSQL supports a choice of date formats, but libpqxx does not.  The
- * other formats in turn support a choice of "month before day" versus "day
- * before month," meaning that it's not necessarily known which format a given
- * date is supposed to be.  So I repeat: ISO-8601-style format only!
- *
- * Invalid dates will not convert.  This includes February 29 on non-leap
- * years, which is why it matters that `year_month_day` represents a
- * _Gregorian_ date.
- *
- * The range of years is limited.  At the time of writing, PostgreSQL 14
- * supports years from 4713 BC to 294276 AD inclusive, and C++20 supports
- * a range of 32767 BC to 32767 AD inclusive.  So in practice, years must fall
- * between 4713 BC and 32767 AD, inclusive.
- *
- * @warning Support for BC (or BCE) years is still experimental.  I still need
- * confirmation on this issue: it looks as if C++ years are astronomical years,
- * which means they have a Year Zero.  Regular BC/AD years do not have a year
- * zero, so the year 1 AD follows directly after 1 BC.
- *
- * So, what to our calendars (and to PostgreSQL) is the year "0001 BC" seems to
- * count as year "0" in a `std::chrono::year_month_day`.  The year 0001 AD is
- * still equal to 1 as you'd expect, and all AD years work normally, but all
- * years before then are shifted by one.  For instance, the year 543 BC would
- * be -542 in C++.
- */
-template<> struct PQXX_LIBEXPORT string_traits<std::chrono::year_month_day>
-{
-  [[nodiscard]] static zview
-  to_buf(char *begin, char *end, std::chrono::year_month_day const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::chrono::year_month_day const &value);
-
-  [[nodiscard]] static std::chrono::year_month_day
-  from_string(std::string_view text);
-
-  [[nodiscard]] static std::size_t
-  size_buffer(std::chrono::year_month_day const &) noexcept
-  {
-    static_assert(int{(std::chrono::year::min)()} >= -99999);
-    static_assert(int{(std::chrono::year::max)()} <= 99999);
-    return 5 + 1 + 2 + 1 + 2 + std::size(s_bc) + 1;
-  }
-
-private:
-  /// The "BC" suffix for years before 1 AD.
-  static constexpr std::string_view s_bc{" BC"sv};
-};
-} // namespace pqxx
-#endif // PQXX_HAVE_YEAR_MONTH_DAY
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction
deleted file mode 100644
index a7ae39d43..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::transaction class.
- *
- * pqxx::transaction represents a standard database transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction.hxx
deleted file mode 100644
index e90917e38..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Definition of the pqxx::transaction class.
- * pqxx::transaction represents a standard database transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION
-#define PQXX_H_TRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx::internal
-{
-/// Helper base class for the @ref transaction class template.
-class PQXX_LIBEXPORT basic_transaction : public dbtransaction
-{
-protected:
-  basic_transaction(
-    connection &c, zview begin_command, std::string_view tname);
-  basic_transaction(connection &c, zview begin_command, std::string &&tname);
-  basic_transaction(connection &c, zview begin_command);
-
-  virtual ~basic_transaction() noexcept override = 0;
-
-private:
-  virtual void do_commit() override;
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- */
-//@{
-
-/// Standard back-end transaction, templatised on isolation level.
-/** This is the type you'll normally want to use to represent a transaction on
- * the database.
- *
- * Usage example: double all wages.
- *
- * ```cxx
- * extern connection C;
- * work T(C);
- * try
- * {
- *   T.exec0("UPDATE employees SET wage=wage*2");
- *   T.commit();	// NOTE: do this inside try block
- * }
- * catch (exception const &e)
- * {
- *   cerr << e.what() << endl;
- *   T.abort();		// Usually not needed; same happens when T's life ends.
- * }
- * ```
- */
-template<
-  isolation_level ISOLATION = isolation_level::read_committed,
-  write_policy READWRITE = write_policy::read_write>
-class transaction final : public internal::basic_transaction
-{
-public:
-  /// Begin a transaction.
-  /**
-   * @param c Connection for this transaction to operate on.
-   * @param tname Optional name for transaction.  Must begin with a letter and
-   * may contain letters and digits only.
-   */
-  transaction(connection &c, std::string_view tname) :
-          internal::basic_transaction{
-            c, internal::begin_cmd<ISOLATION, READWRITE>, tname}
-  {}
-
-  /// Begin a transaction.
-  /**
-   * @param c Connection for this transaction to operate on.
-   * may contain letters and digits only.
-   */
-  explicit transaction(connection &c) :
-          internal::basic_transaction{
-            c, internal::begin_cmd<ISOLATION, READWRITE>}
-  {}
-
-  virtual ~transaction() noexcept override { close(); }
-};
-
-
-/// The default transaction type.
-using work = transaction<>;
-
-/// Read-only transaction.
-using read_transaction =
-  transaction<isolation_level::read_committed, write_policy::read_only>;
-
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_base b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_base
deleted file mode 100644
index c39219aac..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_base
+++ /dev/null
@@ -1,9 +0,0 @@
-/** Base for the transaction classes.
- *
- * pqxx::transaction_base defines the interface for any abstract class that
- * represents a database transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transaction_base.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_base.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_base.hxx
deleted file mode 100644
index 4363cc56a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_base.hxx
+++ /dev/null
@@ -1,810 +0,0 @@
-/* Common code and definitions for the transaction classes.
- *
- * pqxx::transaction_base defines the interface for any abstract class that
- * represents a database transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transaction_base instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION_BASE
-#define PQXX_H_TRANSACTION_BASE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <string_view>
-#include <utility>
-
-/* End-user programs need not include this file, unless they define their own
- * transaction classes.  This is not something the typical program should want
- * to do.
- *
- * However, reading this file is worthwhile because it defines the public
- * interface for the available transaction classes such as transaction and
- * nontransaction.
- */
-
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/isolation.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/util.hxx"
-
-namespace pqxx::internal::gate
-{
-class transaction_subtransaction;
-class transaction_sql_cursor;
-class transaction_stream_to;
-class transaction_transaction_focus;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-using namespace std::literals;
-
-
-class transaction_focus;
-
-
-/**
- * @defgroup transactions Transaction classes
- *
- * All database access goes through instances of these classes.
- * However, not all implementations of this interface need to provide full
- * transactional integrity.
- *
- * Several implementations of this interface are shipped with libpqxx,
- * including the plain transaction class, the entirely unprotected
- * nontransaction, and the more cautious robusttransaction.
- */
-
-/// Interface definition (and common code) for "transaction" classes.
-/**
- * @ingroup transactions
- *
- * Abstract base class for all transaction types.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE transaction_base
-{
-public:
-  transaction_base() = delete;
-  transaction_base(transaction_base const &) = delete;
-  transaction_base(transaction_base &&) = delete;
-  transaction_base &operator=(transaction_base const &) = delete;
-  transaction_base &operator=(transaction_base &&) = delete;
-
-  virtual ~transaction_base() = 0;
-
-  /// Commit the transaction.
-  /** Make the effects of this transaction definite.  If you destroy a
-   * transaction without invoking its @ref commit() first, that will implicitly
-   * abort it.  (For the @ref nontransaction class though, "commit" and "abort"
-   * really don't do anything, hence its name.)
-   *
-   * There is, however, a minute risk that you might lose your connection to
-   * the database at just the wrong moment here.  In that case, libpqxx may be
-   * unable to determine whether the database was able to complete the
-   * transaction, or had to roll it back.  In that scenario, @ref commit() will
-   * throw an in_doubt_error.  There is a different transaction class called
-   * @ref robusttransaction which takes some special precautions to reduce this
-   * risk.
-   */
-  void commit();
-
-  /// Abort the transaction.
-  /** No special effort is required to call this function; it will be called
-   * implicitly when the transaction is destructed.
-   */
-  void abort();
-
-  /**
-   * @ingroup escaping-functions
-   *
-   * Use these when writing SQL queries that incorporate C++ values as SQL
-   * constants.
-   *
-   * The functions you see here are just convenience shortcuts to the same
-   * functions on the connection object.
-   */
-  //@{
-  /// Escape string for use as SQL string literal in this transaction.
-  template<typename... ARGS> [[nodiscard]] auto esc(ARGS &&...args) const
-  {
-    return conn().esc(std::forward<ARGS>(args)...);
-  }
-
-  /// Escape binary data for use as SQL string literal in this transaction.
-  /** Raw, binary data is treated differently from regular strings.  Binary
-   * strings are never interpreted as text, so they may safely include byte
-   * values or byte sequences that don't happen to represent valid characters
-   * in the character encoding being used.
-   *
-   * The binary string does not stop at the first zero byte, as is the case
-   * with textual strings.  Instead, it may contain zero bytes anywhere.  If
-   * it happens to contain bytes that look like quote characters, or other
-   * things that can disrupt their use in SQL queries, they will be replaced
-   * with special escape sequences.
-   */
-  template<typename... ARGS> [[nodiscard]] auto esc_raw(ARGS &&...args) const
-  {
-    return conn().esc_raw(std::forward<ARGS>(args)...);
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(zview text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return conn().unesc_raw(text);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard]] std::basic_string<std::byte> unesc_bin(zview text)
-  {
-    return conn().unesc_bin(text);
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(char const *text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return conn().unesc_raw(text);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard]] std::basic_string<std::byte> unesc_bin(char const text[])
-  {
-    return conn().unesc_bin(text);
-  }
-
-  /// Represent object as SQL string, including quoting & escaping.
-  /** Nulls are recognized and represented as SQL nulls. */
-  template<typename T> [[nodiscard]] std::string quote(T const &t) const
-  {
-    return conn().quote(t);
-  }
-
-  [[deprecated(
-    "Use std::basic_string<std::byte> instead of binarystring.")]] std::string
-  quote(binarystring const &t) const
-  {
-    return conn().quote(t.bytes_view());
-  }
-
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(unsigned char const bin[], std::size_t len) const
-  {
-    return quote(binary_cast(bin, len));
-  }
-
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(zview bin) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  /** For binary data you can also just use @ref quote(data). */
-  template<binary DATA>
-  [[nodiscard]] std::string quote_raw(DATA const &data) const
-  {
-    return conn().quote_raw(data);
-  }
-#endif
-
-  /// Escape an SQL identifier for use in a query.
-  [[nodiscard]] std::string quote_name(std::string_view identifier) const
-  {
-    return conn().quote_name(identifier);
-  }
-
-  /// Escape string for literal LIKE match.
-  [[nodiscard]] std::string
-  esc_like(std::string_view bin, char escape_char = '\\') const
-  {
-    return conn().esc_like(bin, escape_char);
-  }
-  //@}
-
-  /**
-   * @name Command execution
-   *
-   * There are many functions for executing (or "performing") a command (or
-   * "query").  This is the most fundamental thing you can do with the library,
-   * and you always do it from a transaction class.
-   *
-   * Command execution can throw many types of exception, including sql_error,
-   * broken_connection, and many sql_error subtypes such as
-   * feature_not_supported or insufficient_privilege.  But any exception thrown
-   * by the C++ standard library may also occur here.  All exceptions you will
-   * see libpqxx throw are derived from std::exception.
-   *
-   * One unusual feature in libpqxx is that you can give your query a name or
-   * description.  This does not mean anything to the database, but sometimes
-   * it can help libpqxx produce more helpful error messages, making problems
-   * in your code easier to debug.
-   *
-   * Many of the execution functions used to accept a `desc` argument, a
-   * human-readable description of the statement for use in error messages.
-   * This could make failures easier to debug.  Future versions will use
-   * C++20's `std::source_location` to identify the failing statement.
-   */
-  //@{
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @param desc Optional identifier for query, to help pinpoint SQL errors.
-   * @return A result set describing the query's or command's result.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec(std::string_view query, std::string_view desc);
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @return A result set describing the query's or command's result.
-   */
-  result exec(std::string_view query)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec(query, std::string_view{});
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @param desc Optional identifier for query, to help pinpoint SQL errors.
-   * @return A result set describing the query's or command's result.
-   */
-  [[deprecated(
-    "Pass your query as a std::string_view, not stringstream.")]] result
-  exec(std::stringstream const &query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec(query.str(), desc);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command, which should return zero rows of data.
-  /** Works like @ref exec, but fails if the result contains data.  It still
-   * returns a result, however, which may contain useful metadata.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec0(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(0, query, desc);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command, which should return zero rows of data.
-  /** Works like @ref exec, but fails if the result contains data.  It still
-   * returns a result, however, which may contain useful metadata.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  result exec0(zview query) { return exec_n(0, query); }
-
-  /// Execute command returning a single row of data.
-  /** Works like @ref exec, but requires the result to contain exactly one row.
-   * The row can be addressed directly, without the need to find the first row
-   * in a result set.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] row
-  exec1(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(1, query, desc).front();
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command returning a single row of data.
-  /** Works like @ref exec, but requires the result to contain exactly one row.
-   * The row can be addressed directly, without the need to find the first row
-   * in a result set.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  row exec1(zview query) { return exec_n(1, query).front(); }
-
-  /// Execute command, expect given number of rows.
-  /** Works like @ref exec, but checks that the result has exactly the expected
-   * number of rows.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec_n(result::size_type rows, zview query, std::string_view desc);
-
-  /// Execute command, expect given number of rows.
-  /** Works like @ref exec, but checks that the result has exactly the expected
-   * number of rows.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  result exec_n(result::size_type rows, zview query)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(rows, query, std::string_view{});
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Perform query, expecting exactly 1 row with 1 field, and convert it.
-  /** This is convenience shorthand for querying exactly one value from the
-   * database.  It returns that value, converted to the type you specify.
-   */
-  template<typename TYPE>
-  [[deprecated("The desc parameter is going away.")]] TYPE
-  query_value(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row const r{exec1(query, desc)};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    if (std::size(r) != 1)
-      throw usage_error{internal::concat(
-        "Queried single value from result with ", std::size(r), " columns.")};
-    return r[0].as<TYPE>();
-  }
-
-  /// Perform query, expecting exactly 1 row with 1 field, and convert it.
-  /** This is convenience shorthand for querying exactly one value from the
-   * database.  It returns that value, converted to the type you specify.
-   */
-  template<typename TYPE> TYPE query_value(zview query)
-  {
-    row const r{exec1(query)};
-    if (std::size(r) != 1)
-      throw usage_error{internal::concat(
-        "Queried single value from result with ", std::size(r), " columns.")};
-    return r[0].as<TYPE>();
-  }
-
-  /// Execute a query, and loop over the results row by row.
-  /** Converts the rows to `std::tuple`, of the column types you specify.
-   *
-   * Use this with a range-based "for" loop.  It executes the query, and
-   * directly maps the resulting rows onto a `std::tuple` of the types you
-   * specify.  It starts before all the data from the server is in, so if your
-   * network connection to the server breaks while you're iterating, you'll get
-   * an exception partway through.
-   *
-   * The stream lives entirely within the lifetime of the transaction.  Make
-   * sure you destroy the stream before you destroy the transaction.  Either
-   * iterate the stream all the way to the end, or destroy first the stream
-   * and then the transaction without touching either in any other way.  Until
-   * the stream has finished, the transaction is in a special state where it
-   * cannot execute queries.
-   *
-   * As a special case, tuple may contain `std::string_view` fields, but the
-   * strings to which they point will only remain valid until you extract the
-   * next row.  After that, the memory holding the string may be overwritten or
-   * deallocated.
-   *
-   * If any of the columns can be null, and the C++ type to which it translates
-   * does not have a null value, wrap the type in `std::optional` (or if
-   * you prefer, `std::shared_ptr` or `std::unique_ptr)`.  These templates
-   * do recognise null values, and libpqxx will know how to convert to them.
-   *
-   * The connection is in a special state until the iteration finishes.  So if
-   * it does not finish due to a `break` or a `return` or an exception, then
-   * the entire connection becomes effectively unusable.
-   *
-   * Querying in this way is faster than the `exec()` methods for larger
-   * results (but slower for small ones).  You can start processing rows before
-   * the full result is in.  Also, `stream()` scales better in terms of memory
-   * usage.  Where @ref exec() reads the entire result into memory at once,
-   * `stream()` will read and process one row at at a time.
-   *
-   * Your query executes as part of a COPY command, not as a stand-alone query,
-   * so there are limitations to what you can do in the query.  It can be
-   * either a SELECT or VALUES query; or an INSERT, UPDATE, or DELETE with a
-   * RETURNING clause.  See the documentation for PostgreSQL's COPY command for
-   * the details:
-   *
-   *     https://www.postgresql.org/docs/current/sql-copy.html
-   *
-   * Iterating in this way does require each of the field types you pass to be
-   * default-constructible, copy-constructible, and assignable.  These
-   * requirements may be loosened once libpqxx moves on to C++20.
-   */
-  template<typename... TYPE>
-  [[nodiscard]] auto stream(std::string_view query) &
-  {
-    // Tricky: std::make_unique() supports constructors but not RVO functions.
-    return pqxx::internal::owning_stream_input_iteration<TYPE...>{
-      std::unique_ptr<stream_from>{
-        new stream_from{stream_from::query(*this, query)}}};
-  }
-
-  // C++20: Concept like std::invocable, but without specifying param types.
-  /// Perform a streaming query, and for each result row, call `func`.
-  /** Here, `func` can be a function, a `std::function`, a lambda, or an
-   * object that supports the function call operator.  Of course `func` must
-   * have an unambiguous signature; it can't be overloaded or generic.
-   *
-   * The `for_each` function executes `query` in a stream using
-   * @ref pqxx::stream_from.  Every time a row of data comes in from the
-   * server, it converts the row's fields to the types of `func`'s respective
-   * parameters, and calls `func` with those values.
-   *
-   * This will not work for all queries, but straightforward `SELECT` and
-   * `UPDATE ... RETURNING` queries should work.  Consult the documentation for
-   * @ref pqxx::stream_from and PostgreSQL's underlying `COPY` command for the
-   * full details.
-   *
-   * Streaming a query like this is likely to be slower than the @ref exec()
-   * functions for small result sets, but faster for large result sets.  So if
-   * performance matters, you'll want to use `for_each` if you query large
-   * amounts of data, but not if you do lots of queries with small outputs.
-   */
-  template<typename CALLABLE>
-  inline auto for_each(std::string_view query, CALLABLE &&func)
-  {
-    using param_types =
-      pqxx::internal::strip_types_t<pqxx::internal::args_t<CALLABLE>>;
-    param_types const *const sample{nullptr};
-    auto data_stream{stream_like(query, sample)};
-    for (auto const &fields : data_stream) std::apply(func, fields);
-  }
-
-  /**
-   * @name Parameterized statements
-   *
-   * You'll often need parameters in the queries you execute: "select the
-   * car with this licence plate."  If the parameter is a string, you need to
-   * quote it and escape any special characters inside it, or it may become a
-   * target for an SQL injection attack.  If it's an integer (for example),
-   * you need to convert it to a string, but in the database's format, without
-   * locale-specific niceties like "," separators between the thousands.
-   *
-   * Parameterised statements are an easier and safer way to do this.  They're
-   * like prepared statements, but for a single use.  You don't need to name
-   * them, and you don't need to prepare them first.
-   *
-   * Your query will include placeholders like `$1` and `$2` etc. in the places
-   * where you want the arguments to go.  Then, you pass the argument values
-   * and the actual query is constructed for you.
-   *
-   * Pass the exact right number of parameters, and in the right order.  The
-   * parameters in the query don't have to be neatly ordered from `$1` to
-   * `$2` to `$3` - but you must pass the argument for `$1` first, the one
-   * for `$2` second, etc.
-   *
-   * @warning Beware of "nul" bytes.  Any string you pass as a parameter will
-   * end at the first char with value zero.  If you pass a string that contains
-   * a zero byte, the last byte in the value will be the one just before the
-   * zero.
-   */
-  //@{
-  /// Execute an SQL statement with parameters.
-  template<typename... Args> result exec_params(zview query, Args &&...args)
-  {
-    params pp(args...);
-    return internal_exec_params(query, pp.make_c_params());
-  }
-
-  // Execute parameterised statement, expect a single-row result.
-  /** @throw unexpected_rows if the result does not consist of exactly one row.
-   */
-  template<typename... Args> row exec_params1(zview query, Args &&...args)
-  {
-    return exec_params_n(1, query, std::forward<Args>(args)...).front();
-  }
-
-  // Execute parameterised statement, expect a result with zero rows.
-  /** @throw unexpected_rows if the result contains rows.
-   */
-  template<typename... Args> result exec_params0(zview query, Args &&...args)
-  {
-    return exec_params_n(0, query, std::forward<Args>(args)...);
-  }
-
-  // Execute parameterised statement, expect exactly a given number of rows.
-  /** @throw unexpected_rows if the result contains the wrong number of rows.
-   */
-  template<typename... Args>
-  result exec_params_n(std::size_t rows, zview query, Args &&...args)
-  {
-    auto const r{exec_params(query, std::forward<Args>(args)...)};
-    check_rowcount_params(rows, std::size(r));
-    return r;
-  }
-  //@}
-
-  /**
-   * @name Prepared statements
-   *
-   * These are very similar to parameterised statements.  The difference is
-   * that you prepare them in advance, giving them identifying names.  You can
-   * then call them by these names, passing in the argument values appropriate
-   * for that call.
-   *
-   * You prepare a statement on the connection, using
-   * @ref pqxx::connection::prepare().  But you then call the statement in a
-   * transaction, using the functions you see here.
-   *
-   * Never try to prepare, execute, or unprepare a prepared statement manually
-   * using direct SQL queries when you also use the libpqxx equivalents.  For
-   * any given statement, either prepare, manage, and execute it through the
-   * dedicated libpqxx functions; or do it all directly in SQL.  Don't mix the
-   * two, or the code may get confused.
-   *
-   * See \ref prepared for a full discussion.
-   *
-   * @warning Beware of "nul" bytes.  Any string you pass as a parameter will
-   * end at the first char with value zero.  If you pass a string that contains
-   * a zero byte, the last byte in the value will be the one just before the
-   * zero.  If you need a zero byte, you're dealing with binary strings, not
-   * regular strings.  Represent binary strings on the SQL side as `BYTEA`
-   * (or as large objects).  On the C++ side, use types like
-   * `std::basic_string<std::byte>` or `std::basic_string_view<std::byte>`
-   * or (in C++20) `std::vector<std::byte>`.  Also, consider large objects on
-   * the SQL side and @ref blob on the C++ side.
-   */
-  //@{
-
-  /// Execute a prepared statement, with optional arguments.
-  template<typename... Args>
-  result exec_prepared(zview statement, Args &&...args)
-  {
-    params pp(args...);
-    return internal_exec_prepared(statement, pp.make_c_params());
-  }
-
-  /// Execute a prepared statement, and expect a single-row result.
-  /** @throw pqxx::unexpected_rows if the result was not exactly 1 row.
-   */
-  template<typename... Args>
-  row exec_prepared1(zview statement, Args &&...args)
-  {
-    return exec_prepared_n(1, statement, std::forward<Args>(args)...).front();
-  }
-
-  /// Execute a prepared statement, and expect a result with zero rows.
-  /** @throw pqxx::unexpected_rows if the result contained rows.
-   */
-  template<typename... Args>
-  result exec_prepared0(zview statement, Args &&...args)
-  {
-    return exec_prepared_n(0, statement, std::forward<Args>(args)...);
-  }
-
-  /// Execute a prepared statement, expect a result with given number of rows.
-  /** @throw pqxx::unexpected_rows if the result did not contain exactly the
-   *  given number of rows.
-   */
-  template<typename... Args>
-  result
-  exec_prepared_n(result::size_type rows, zview statement, Args &&...args)
-  {
-    auto const r{exec_prepared(statement, std::forward<Args>(args)...)};
-    check_rowcount_prepared(statement, rows, std::size(r));
-    return r;
-  }
-
-  //@}
-
-  /**
-   * @name Error/warning output
-   */
-  //@{
-  /// Have connection process a warning message.
-  void process_notice(char const msg[]) const { m_conn.process_notice(msg); }
-  /// Have connection process a warning message.
-  void process_notice(zview msg) const { m_conn.process_notice(msg); }
-  //@}
-
-  /// The connection in which this transaction lives.
-  [[nodiscard]] constexpr connection &conn() const noexcept { return m_conn; }
-
-  /// Set session variable using SQL "SET" command.
-  /** @deprecated To set a transaction-local variable, execute an SQL `SET`
-   * command.  To set a session variable, use the connection's
-   * @ref set_session_var function.
-   *
-   * @warning When setting a string value, you must make sure that the string
-   * is "safe."  If you call @ref quote() on the string, it will return a
-   * safely escaped and quoted version for use as an SQL literal.
-   *
-   * @warning This function executes SQL.  Do not try to set or get variables
-   * while a pipeline or table stream is active.
-   *
-   * @param var The variable to set.
-   * @param value The new value to store in the variable.  This can be any SQL
-   * expression.
-   */
-  [[deprecated(
-    "Set transaction-local variables using SQL SET statements.")]] void
-  set_variable(std::string_view var, std::string_view value);
-
-  /// Read session variable using SQL "SHOW" command.
-  /** @warning This executes SQL.  Do not try to set or get variables while a
-   * pipeline or table stream is active.
-   */
-  [[deprecated("Read variables using SQL SHOW statements.")]] std::string
-    get_variable(std::string_view);
-
-  // C++20: constexpr.
-  /// Transaction name, if you passed one to the constructor; or empty string.
-  [[nodiscard]] std::string_view name() const &noexcept { return m_name; }
-
-protected:
-  /// Create a transaction (to be called by implementation classes only).
-  /** The name, if nonempty, must begin with a letter and may contain letters
-   * and digits only.
-   */
-  transaction_base(
-    connection &c, std::string_view tname,
-    std::shared_ptr<std::string> rollback_cmd) :
-          m_conn{c}, m_name{tname}, m_rollback_cmd{rollback_cmd}
-  {}
-
-  /// Create a transaction (to be called by implementation classes only).
-  /** Its rollback command will be "ROLLBACK".
-   *
-   * The name, if nonempty, must begin with a letter and may contain letters
-   * and digits only.
-   */
-  transaction_base(connection &c, std::string_view tname);
-
-  /// Create a transaction (to be called by implementation classes only).
-  explicit transaction_base(connection &c);
-
-  /// Register this transaction with the connection.
-  void register_transaction();
-
-  /// End transaction.  To be called by implementing class' destructor.
-  void close() noexcept;
-
-  /// To be implemented by derived implementation class: commit transaction.
-  virtual void do_commit() = 0;
-
-  /// Transaction type-specific way of aborting a transaction.
-  /** @warning This will become "final", since this function can be called
-   * from the implementing class destructor.
-   */
-  virtual void do_abort();
-
-  /// Set the rollback command.
-  void set_rollback_cmd(std::shared_ptr<std::string> cmd)
-  {
-    m_rollback_cmd = cmd;
-  }
-
-  /// Execute query on connection directly.
-  result direct_exec(std::string_view, std::string_view desc = ""sv);
-  result
-  direct_exec(std::shared_ptr<std::string>, std::string_view desc = ""sv);
-
-private:
-  enum class status
-  {
-    active,
-    aborted,
-    committed,
-    in_doubt
-  };
-
-  PQXX_PRIVATE void check_pending_error();
-
-  result
-  internal_exec_prepared(zview statement, internal::c_params const &args);
-
-  result internal_exec_params(zview query, internal::c_params const &args);
-
-  /// Throw unexpected_rows if prepared statement returned wrong no. of rows.
-  void check_rowcount_prepared(
-    zview statement, result::size_type expected_rows,
-    result::size_type actual_rows);
-
-  /// Throw unexpected_rows if wrong row count from parameterised statement.
-  void
-  check_rowcount_params(std::size_t expected_rows, std::size_t actual_rows);
-
-  /// Describe this transaction to humans, e.g. "transaction 'foo'".
-  [[nodiscard]] std::string description() const;
-
-  friend class pqxx::internal::gate::transaction_transaction_focus;
-  PQXX_PRIVATE void register_focus(transaction_focus *);
-  PQXX_PRIVATE void unregister_focus(transaction_focus *) noexcept;
-  PQXX_PRIVATE void register_pending_error(zview) noexcept;
-  PQXX_PRIVATE void register_pending_error(std::string &&) noexcept;
-
-  /// Like @ref stream(), but takes a tuple rather than a parameter pack.
-  template<typename... ARGS>
-  auto stream_like(std::string_view query, std::tuple<ARGS...> const *)
-  {
-    return stream<ARGS...>(query);
-  }
-
-  connection &m_conn;
-
-  /// Current "focus": a pipeline, a nested transaction, a stream...
-  /** This pointer is used for only one purpose: sanity checks against mistakes
-   * such as opening one while another is still active.
-   */
-  transaction_focus const *m_focus = nullptr;
-
-  status m_status = status::active;
-  bool m_registered = false;
-  std::string m_name;
-  std::string m_pending_error;
-
-  /// SQL command for aborting this type of transaction.
-  std::shared_ptr<std::string> m_rollback_cmd;
-
-  static constexpr std::string_view s_type_name{"transaction"sv};
-};
-
-
-// C++20: Can borrowed_range help?
-/// Forbidden specialisation: underlying buffer immediately goes out of scope.
-template<>
-std::string_view transaction_base::query_value<std::string_view>(
-  zview query, std::string_view desc) = delete;
-/// Forbidden specialisation: underlying buffer immediately goes out of scope.
-template<>
-zview transaction_base::query_value<zview>(
-  zview query, std::string_view desc) = delete;
-
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// The SQL command for starting a given type of transaction.
-template<pqxx::isolation_level isolation, pqxx::write_policy rw>
-extern const zview begin_cmd;
-
-// These are not static members, so "constexpr" does not imply "inline".
-template<>
-inline constexpr zview begin_cmd<read_committed, write_policy::read_write>{
-  "BEGIN"_zv};
-template<>
-inline constexpr zview begin_cmd<read_committed, write_policy::read_only>{
-  "BEGIN READ ONLY"_zv};
-template<>
-inline constexpr zview begin_cmd<repeatable_read, write_policy::read_write>{
-  "BEGIN ISOLATION LEVEL REPEATABLE READ"_zv};
-template<>
-inline constexpr zview begin_cmd<repeatable_read, write_policy::read_only>{
-  "BEGIN ISOLATION LEVEL REPEATABLE READ READ ONLY"_zv};
-template<>
-inline constexpr zview begin_cmd<serializable, write_policy::read_write>{
-  "BEGIN ISOLATION LEVEL SERIALIZABLE"_zv};
-template<>
-inline constexpr zview begin_cmd<serializable, write_policy::read_only>{
-  "BEGIN ISOLATION LEVEL SERIALIZABLE READ ONLY"_zv};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_focus b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_focus
deleted file mode 100644
index fe78a9bcc..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_focus
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Transaction focus: types which monopolise a transaction's attention.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_focus.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_focus.hxx
deleted file mode 100644
index 0707e3cc4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transaction_focus.hxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/** Transaction focus: types which monopolise a transaction's attention.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION_FOCUS
-#define PQXX_H_TRANSACTION_FOCUS
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Base class for things that monopolise a transaction's attention.
-/** You probably won't need to use this class.  But it can be useful to _know_
- * that a given libpqxx class is derived from it.
- *
- * Pipelines, SQL statements, and data streams are examples of classes derived
- * from `transaction_focus`.  For any given transaction, only one object of
- * such a class can be active at any given time.
- */
-class PQXX_LIBEXPORT transaction_focus
-{
-public:
-  transaction_focus(
-    transaction_base &t, std::string_view cname, std::string_view oname) :
-          m_trans{t}, m_classname{cname}, m_name{oname}
-  {}
-
-  transaction_focus(
-    transaction_base &t, std::string_view cname, std::string &&oname) :
-          m_trans{t}, m_classname{cname}, m_name{std::move(oname)}
-  {}
-
-  transaction_focus(transaction_base &t, std::string_view cname) :
-          m_trans{t}, m_classname{cname}
-  {}
-
-  transaction_focus() = delete;
-  transaction_focus(transaction_focus const &) = delete;
-  transaction_focus &operator=(transaction_focus const &) = delete;
-
-  /// Class name, for human consumption.
-  [[nodiscard]] constexpr std::string_view classname() const noexcept
-  {
-    return m_classname;
-  }
-
-  /// Name for this object, if the caller passed one; empty string otherwise.
-  [[nodiscard]] std::string_view name() const &noexcept { return m_name; }
-
-  [[nodiscard]] std::string description() const
-  {
-    return pqxx::internal::describe_object(m_classname, m_name);
-  }
-
-  /// Can't move a transaction_focus.
-  /** Moving the transaction_focus would break the transaction's reference back
-   * to the object.
-   */
-  transaction_focus(transaction_focus &&) = delete;
-
-  /// Can't move a transaction_focus.
-  /** Moving the transaction_focus would break the transaction's reference back
-   * to the object.
-   */
-  transaction_focus &operator=(transaction_focus &&) = delete;
-
-protected:
-  void register_me();
-  void unregister_me() noexcept;
-  void reg_pending_error(std::string const &) noexcept;
-  bool registered() const noexcept { return m_registered; }
-
-  transaction_base &m_trans;
-
-private:
-  bool m_registered = false;
-  std::string_view m_classname;
-  std::string m_name;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transactor b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transactor
deleted file mode 100644
index 29d1b9640..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transactor
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::transactor class.
- *
- * pqxx::transactor is a framework-style wrapper for safe transactions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transactor.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transactor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transactor.hxx
deleted file mode 100644
index eefd04ba1..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/transactor.hxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Transactor framework, a wrapper for safely retryable transactions.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transactor instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTOR
-#define PQXX_H_TRANSACTOR
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <functional>
-#include <type_traits>
-
-#include "pqxx/connection.hxx"
-#include "pqxx/transaction.hxx"
-
-namespace pqxx
-{
-/**
- * @defgroup transactor Transactor framework
- *
- * Sometimes a transaction can fail for completely transient reasons, such as a
- * conflict with another transaction in SERIALIZABLE isolation.  The right way
- * to handle those failures is often just to re-run the transaction from
- * scratch.
- *
- * For example, your REST API might be handling each HTTP request in its own
- * database transaction, and if this kind of transient failure happens, you
- * simply want to "replay" the whole request, in a fresh transaction.
- *
- * You won't necessarily want to execute the exact same SQL commands with the
- * exact same data.  Some of your SQL statements may depend on state that can
- * vary between retries.  Data in the database may already have changed, for
- * instance.  So instead of dumbly replaying the SQL, you re-run the same
- * application code that produced those SQL commands, from the start.
- *
- * The transactor framework makes it a little easier for you to do this safely,
- * and avoid typical pitfalls.  You encapsulate the work that you want to do
- * into a callable that you pass to the @ref perform function.
- *
- * Here's how it works.  You write your transaction code as a lambda or
- * function, which creates its own transaction object, does its work, and
- * commits at the end.  You pass that callback to @ref pqxx::perform, which
- * runs it for you.
- *
- * If there's a failure inside your callback, there will be an exception.  Your
- * transaction object goes out of scope and gets destroyed, so that it aborts
- * implicitly.  Seeing this, @ref perform tries running your callback again. It
- * stops doing that when the callback succeeds, or when it has failed too many
- * times, or when there's an error that leaves the database in an unknown
- * state, such as a lost connection just while we're waiting for the database
- * to confirm a commit.  It all depends on the type of exception.
- *
- * The callback takes no arguments.  If you're using lambdas, the easy way to
- * pass arguments is for the lambda to "capture" them from your variables.  Or,
- * if you're using functions, you may want to use `std::bind`.
- *
- * Once your callback succeeds, it can return a result, and @ref perform will
- * return that result back to you.
- */
-//@{
-
-/// Simple way to execute a transaction with automatic retry.
-/**
- * Executes your transaction code as a callback.  Repeats it until it completes
- * normally, or it throws an error other than the few libpqxx-generated
- * exceptions that the framework understands, or after a given number of failed
- * attempts, or if the transaction ends in an "in-doubt" state.
- *
- * (An in-doubt state is one where libpqxx cannot determine whether the server
- * finally committed a transaction or not.  This can happen if the network
- * connection to the server is lost just while we're waiting for its reply to
- * a "commit" statement.  The server may have completed the commit, or not, but
- * it can't tell you because there's no longer a connection.
- *
- * Using this still takes a bit of care.  If your callback makes use of data
- * from the database, you'll probably have to query that data within your
- * callback.  If the attempt to perform your callback fails, and the framework
- * tries again, you'll be in a new transaction and the data in the database may
- * have changed under your feet.
- *
- * Also be careful about changing variables or data structures from within
- * your callback.  The run may still fail, and perhaps get run again.  The
- * ideal way to do it (in most cases) is to return your result from your
- * callback, and change your program's data state only after @ref perform
- * completes successfully.
- *
- * @param callback Transaction code that can be called with no arguments.
- * @param attempts Maximum number of times to attempt performing callback.
- *	Must be greater than zero.
- * @return Whatever your callback returns.
- */
-template<typename TRANSACTION_CALLBACK>
-inline auto perform(TRANSACTION_CALLBACK &&callback, int attempts = 3)
-  -> std::invoke_result_t<TRANSACTION_CALLBACK>
-{
-  if (attempts <= 0)
-    throw std::invalid_argument{
-      "Zero or negative number of attempts passed to pqxx::perform()."};
-
-  for (; attempts > 0; --attempts)
-  {
-    try
-    {
-      return std::invoke(callback);
-    }
-    catch (in_doubt_error const &)
-    {
-      // Not sure whether transaction went through or not.  The last thing in
-      // the world that we should do now is try again!
-      throw;
-    }
-    catch (statement_completion_unknown const &)
-    {
-      // Not sure whether our last statement succeeded.  Don't risk running it
-      // again.
-      throw;
-    }
-    catch (broken_connection const &)
-    {
-      // Connection failed.  May be worth retrying, if the transactor opens its
-      // own connection.
-      if (attempts <= 1)
-        throw;
-      continue;
-    }
-    catch (transaction_rollback const &)
-    {
-      // Some error that may well be transient, such as serialization failure
-      // or deadlock.  Worth retrying.
-      if (attempts <= 1)
-        throw;
-      continue;
-    }
-  }
-  throw pqxx::internal_error{"No outcome reached on perform()."};
-}
-} // namespace pqxx
-//@}
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/types b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/types
deleted file mode 100644
index 23a5caae1..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/types
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Basic typedefs and forward declarations.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/types.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/types.hxx
deleted file mode 100644
index f95b598f8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/types.hxx
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Basic type aliases and forward declarations.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TYPES
-#define PQXX_H_TYPES
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstddef>
-#include <cstdint>
-#include <iterator>
-
-#if defined(PQXX_HAVE_CONCEPTS) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-
-namespace pqxx
-{
-/// Number of rows in a result set.
-using result_size_type = int;
-
-/// Difference between result sizes.
-using result_difference_type = int;
-
-/// Number of fields in a row of database data.
-using row_size_type = int;
-
-/// Difference between row sizes.
-using row_difference_type = int;
-
-/// Number of bytes in a field of database data.
-using field_size_type = std::size_t;
-
-/// Number of bytes in a large object.
-using large_object_size_type = int64_t;
-
-
-// Forward declarations, to help break compilation dependencies.
-// These won't necessarily include all classes in libpqxx.
-class binarystring;
-class connection;
-class const_result_iterator;
-class const_reverse_result_iterator;
-class const_reverse_row_iterator;
-class const_row_iterator;
-class dbtransaction;
-class field;
-class largeobjectaccess;
-class notification_receiver;
-struct range_error;
-class result;
-class row;
-class stream_from;
-class transaction_base;
-
-/// Marker for @ref stream_from constructors: "stream from table."
-/** @deprecated Use @ref stream_from::table() instead.
- */
-struct from_table_t
-{};
-
-/// Marker for @ref stream_from constructors: "stream from query."
-/** @deprecated Use @ref stream_from::query() instead.
- */
-struct from_query_t
-{};
-
-
-/// Format code: is data text or binary?
-/** Binary-compatible with libpq's format codes.
- */
-enum class format : int
-{
-  text = 0,
-  binary = 1,
-};
-
-
-/// Remove any constness, volatile, and reference-ness from a type.
-/** @deprecated In C++20 we'll replace this with std::remove_cvref.
- */
-template<typename TYPE>
-using strip_t = std::remove_cv_t<std::remove_reference_t<TYPE>>;
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// The type of a container's elements.
-/** At the time of writing there's a similar thing in `std::experimental`,
- * which we may or may not end up using for this.
- */
-template<std::ranges::range CONTAINER>
-using value_type = strip_t<decltype(*std::begin(std::declval<CONTAINER>()))>;
-#else  // PQXX_HAVE_CONCEPTS
-/// The type of a container's elements.
-/** At the time of writing there's a similar thing in `std::experimental`,
- * which we may or may not end up using for this.
- */
-template<typename CONTAINER>
-using value_type = strip_t<decltype(*std::begin(std::declval<CONTAINER>()))>;
-#endif // PQXX_HAVE_CONCEPTS
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: Any type that we can read as a string of `char`.
-template<typename STRING>
-concept char_string = std::ranges::contiguous_range<STRING> and
-                      std::same_as < strip_t<value_type<STRING>>,
-char > ;
-
-/// Concept: Anything we can iterate to get things we can read as strings.
-template<typename RANGE>
-concept char_strings =
-  std::ranges::range<RANGE> and char_string<strip_t<value_type<RANGE>>>;
-
-/// Concept: Anything we might want to treat as binary data.
-template<typename DATA>
-concept potential_binary = std::ranges::contiguous_range<DATA> and
-  (sizeof(value_type<DATA>) == 1);
-#endif // PQXX_HAVE_CONCEPTS
-
-
-// C++20: Retire these compatibility definitions.
-#if defined(PQXX_HAVE_CONCEPTS)
-
-/// Template argument type for a range.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_RANGE_ARG std::ranges::range
-
-/// Template argument type for @ref char_string.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRING_ARG pqxx::char_string
-
-/// Template argument type for @ref char_strings
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRINGS_ARG pqxx::char_strings
-
-#else // PQXX_HAVE_CONCEPTS
-
-/// Template argument type for a range.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_RANGE_ARG typename
-
-/// Template argument type for @ref char_string.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRING_ARG typename
-
-/// Template argument type for @ref char_strings
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRINGS_ARG typename
-
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/util b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/util
deleted file mode 100644
index 6d85ab611..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/util
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Various utility definitions for libpqxx.
- */
-// Actual definitions in .hxx file so editors and such recognize file type
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/util.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/util.hxx
deleted file mode 100644
index 4aa5ecf57..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/util.hxx
+++ /dev/null
@@ -1,521 +0,0 @@
-/* Various utility definitions for libpqxx.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/util instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_UTIL
-#define PQXX_H_UTIL
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cctype>
-#include <cstdio>
-#include <functional>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#include <typeinfo>
-#include <utility>
-#include <vector>
-
-#if __has_include(<version>)
-#  include <version>
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/internal/encodings.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/version.hxx"
-
-
-/// The home of all libpqxx classes, functions, templates, etc.
-namespace pqxx
-{}
-
-#include <pqxx/internal/libpq-forward.hxx>
-
-
-/// Internal items for libpqxx' own use.  Do not use these yourself.
-namespace pqxx::internal
-{
-
-// C++20: Retire wrapper.
-/// Same as `std::cmp_less`, or a workaround where that's not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_less(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_less(lhs, rhs);
-#else
-  // We need a variable just because lgtm.com gives off a false positive
-  // warning when we compare the values directly.  It considers that a
-  // "self-comparison."
-  constexpr bool left_signed{std::is_signed_v<LEFT>};
-  if constexpr (left_signed == std::is_signed_v<RIGHT>)
-    return lhs < rhs;
-  else if constexpr (std::is_signed_v<LEFT>)
-    return (lhs <= 0) ? true : (std::make_unsigned_t<LEFT>(lhs) < rhs);
-  else
-    return (rhs <= 0) ? false : (lhs < std::make_unsigned_t<RIGHT>(rhs));
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_greater, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_greater(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_greater(lhs, rhs);
-#else
-  return cmp_less(rhs, lhs);
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_less_equal, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_less_equal(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_less_equal(lhs, rhs);
-#else
-  return not cmp_less(rhs, lhs);
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_greater_equal, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_greater_equal(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_greater_equal(lhs, rhs);
-#else
-  return not cmp_less(lhs, rhs);
-#endif
-}
-
-
-/// Efficiently concatenate two strings.
-/** This is a special case of concatenate(), needed because dependency
- * management does not let us use that function here.
- */
-[[nodiscard]] inline std::string cat2(std::string_view x, std::string_view y)
-{
-  std::string buf;
-  auto const xs{std::size(x)}, ys{std::size(y)};
-  buf.resize(xs + ys);
-  x.copy(std::data(buf), xs);
-  y.copy(std::data(buf) + xs, ys);
-  return buf;
-}
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-using namespace std::literals;
-
-/// Suppress compiler warning about an unused item.
-template<typename... T> inline constexpr void ignore_unused(T &&...) noexcept
-{}
-
-
-/// Cast a numeric value to another type, or throw if it underflows/overflows.
-/** Both types must be arithmetic types, and they must either be both integral
- * or both floating-point types.
- */
-template<typename TO, typename FROM>
-inline TO check_cast(FROM value, std::string_view description)
-{
-  static_assert(std::is_arithmetic_v<FROM>);
-  static_assert(std::is_arithmetic_v<TO>);
-  static_assert(std::is_integral_v<FROM> == std::is_integral_v<TO>);
-
-  // The rest of this code won't quite work for bool, but bool is trivially
-  // convertible to other arithmetic types as far as I can see.
-  if constexpr (std::is_same_v<FROM, bool>)
-    return static_cast<TO>(value);
-
-  // Depending on our "if constexpr" conditions, this parameter may not be
-  // needed.  Some compilers will warn.
-  ignore_unused(description);
-
-  using from_limits = std::numeric_limits<decltype(value)>;
-  using to_limits = std::numeric_limits<TO>;
-  if constexpr (std::is_signed_v<FROM>)
-  {
-    if constexpr (std::is_signed_v<TO>)
-    {
-      if (value < to_limits::lowest())
-        throw range_error{internal::cat2("Cast underflow: "sv, description)};
-    }
-    else
-    {
-      // FROM is signed, but TO is not.  Treat this as a special case, because
-      // there may not be a good broader type in which the compiler can even
-      // perform our check.
-      if (value < 0)
-        throw range_error{internal::cat2(
-          "Casting negative value to unsigned type: "sv, description)};
-    }
-  }
-  else
-  {
-    // No need to check: the value is unsigned so can't fall below the range
-    // of the TO type.
-  }
-
-  if constexpr (std::is_integral_v<FROM>)
-  {
-    using unsigned_from = std::make_unsigned_t<FROM>;
-    using unsigned_to = std::make_unsigned_t<TO>;
-    constexpr auto from_max{static_cast<unsigned_from>((from_limits::max)())};
-    constexpr auto to_max{static_cast<unsigned_to>((to_limits::max)())};
-    if constexpr (from_max > to_max)
-    {
-      if (internal::cmp_greater(value, to_max))
-        throw range_error{internal::cat2("Cast overflow: "sv, description)};
-    }
-  }
-  else if constexpr ((from_limits::max)() > (to_limits::max)())
-  {
-    if (value > (to_limits::max)())
-      throw range_error{internal::cat2("Cast overflow: ", description)};
-  }
-
-  return static_cast<TO>(value);
-}
-
-
-/** Check library version at link time.
- *
- * Ensures a failure when linking an application against a radically
- * different libpqxx version than the one against which it was compiled.
- *
- * Sometimes application builds fail in unclear ways because they compile
- * using headers from libpqxx version X, but then link against libpqxx
- * binary version Y.  A typical scenario would be one where you're building
- * against a libpqxx which you have built yourself, but a different version
- * is installed on the system.
- *
- * The check_library_version template is declared for any library version,
- * but only actually defined for the version of the libpqxx binary against
- * which the code is linked.
- *
- * If the library binary is a different version than the one declared in
- * these headers, then this call will fail to link: there will be no
- * definition for the function with these exact template parameter values.
- * There will be a definition, but the version in the parameter values will
- * be different.
- */
-inline PQXX_PRIVATE void check_version() noexcept
-{
-  // There is no particular reason to do this here in @ref connection, except
-  // to ensure that every meaningful libpqxx client will execute it.  The call
-  // must be in the execution path somewhere or the compiler won't try to link
-  // it.  We can't use it to initialise a global or class-static variable,
-  // because a smart compiler might resolve it at compile time.
-  //
-  // On the other hand, we don't want to make a useless function call too
-  // often for performance reasons.  A local static variable is initialised
-  // only on the definition's first execution.  Compilers will be well
-  // optimised for this behaviour, so there's a minimal one-time cost.
-  static auto const version_ok{internal::PQXX_VERSION_CHECK()};
-  ignore_unused(version_ok);
-}
-
-
-/// Descriptor of library's thread-safety model.
-/** This describes what the library knows about various risks to thread-safety.
- */
-struct PQXX_LIBEXPORT thread_safety_model
-{
-  /// Is the underlying libpq build thread-safe?
-  bool safe_libpq = false;
-
-  /// Is Kerberos thread-safe?
-  /** @warning Is currently always `false`.
-   *
-   * If your application uses Kerberos, all accesses to libpqxx or Kerberos
-   * must be serialized.  Confine their use to a single thread, or protect it
-   * with a global lock.
-   */
-  bool safe_kerberos = false;
-
-  /// A human-readable description of any thread-safety issues.
-  std::string description;
-};
-
-
-/// Describe thread safety available in this build.
-[[nodiscard]] PQXX_LIBEXPORT thread_safety_model describe_thread_safety();
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-#  define PQXX_POTENTIAL_BINARY_ARG pqxx::potential_binary
-#else
-#  define PQXX_POTENTIAL_BINARY_ARG typename
-#endif
-
-
-/// Cast binary data to a type that libpqxx will recognise as binary.
-/** There are many different formats for storing binary data in memory.  You
- * may have yours as a `std::string`, or a `std::vector<uchar_t>`, or one of
- * many other types.
- *
- * But for libpqxx to recognise your data as binary, it needs to be a
- * `std::basic_string<std::byte>`, or a `std::basic_string_view<std::byte>`;
- * or in C++20 or better, any contiguous block of `std::byte`.
- *
- * Use `binary_cast` as a convenience helper to cast your data as a
- * `std::basic_string_view<std::byte>`.
- *
- * @warning There are two things you should be aware of!  First, the data must
- * be contiguous in memory.  In C++20 the compiler will enforce this, but in
- * C++17 it's your own problem.  Second, you must keep the object where you
- * store the actual data alive for as long as you might use this function's
- * return value.
- */
-template<PQXX_POTENTIAL_BINARY_ARG TYPE>
-std::basic_string_view<std::byte> binary_cast(TYPE const &data)
-{
-  static_assert(sizeof(value_type<TYPE>) == 1);
-  return {
-    reinterpret_cast<std::byte const *>(
-      const_cast<strip_t<decltype(*std::data(data))> const *>(
-        std::data(data))),
-    std::size(data)};
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<typename CHAR>
-concept char_sized = (sizeof(CHAR) == 1);
-#  define PQXX_CHAR_SIZED_ARG char_sized
-#else
-#  define PQXX_CHAR_SIZED_ARG typename
-#endif
-
-/// Construct a type that libpqxx will recognise as binary.
-/** Takes a data pointer and a size, without being too strict about their
- * types, and constructs a `std::basic_string_view<std::byte>` pointing to
- * the same data.
- *
- * This makes it a little easier to turn binary data, in whatever form you
- * happen to have it, into binary data as libpqxx understands it.
- */
-template<PQXX_CHAR_SIZED_ARG CHAR, typename SIZE>
-std::basic_string_view<std::byte> binary_cast(CHAR const *data, SIZE size)
-{
-  static_assert(sizeof(CHAR) == 1);
-  return {
-    reinterpret_cast<std::byte const *>(data),
-    check_cast<std::size_t>(size, "binary data size")};
-}
-
-
-/// The "null" oid.
-constexpr oid oid_none{0};
-} // namespace pqxx
-
-
-/// Private namespace for libpqxx's internal use; do not access.
-/** This namespace hides definitions internal to libpqxx.  These are not
- * supposed to be used by client programs, and they may change at any time
- * without notice.
- *
- * Conversely, if you find something in this namespace tremendously useful, by
- * all means do lodge a request for its publication.
- *
- * @warning Here be dragons!
- */
-namespace pqxx::internal
-{
-using namespace std::literals;
-
-
-/// A safer and more generic replacement for `std::isdigit`.
-/** Turns out `std::isdigit` isn't as easy to use as it sounds.  It takes an
- * `int`, but requires it to be nonnegative.  Which means it's an outright
- * liability on systems where `char` is signed.
- */
-template<typename CHAR> inline constexpr bool is_digit(CHAR c) noexcept
-{
-  return (c >= '0') and (c <= '9');
-}
-
-
-/// Describe an object for humans, based on class name and optional name.
-/** Interprets an empty name as "no name given."
- */
-[[nodiscard]] std::string
-describe_object(std::string_view class_name, std::string_view name);
-
-
-/// Check validity of registering a new "guest" in a "host."
-/** The host might be e.g. a connection, and the guest a transaction.  The
- * host can only have one guest at a time, so it is an error to register a new
- * guest while the host already has a guest.
- *
- * If the new registration is an error, this function throws a descriptive
- * exception.
- *
- * Pass the old guest (if any) and the new guest (if any), for both, a type
- * name (at least if the guest is not null), and optionally an object name
- * (but which may be omitted if the caller did not assign one).
- */
-void check_unique_register(
-  void const *old_guest, std::string_view old_class, std::string_view old_name,
-  void const *new_guest, std::string_view new_class,
-  std::string_view new_name);
-
-
-/// Like @ref check_unique_register, but for un-registering a guest.
-/** Pass the guest which was registered, as well as the guest which is being
- * unregistered, so that the function can check that they are the same one.
- */
-void check_unique_unregister(
-  void const *old_guest, std::string_view old_class, std::string_view old_name,
-  void const *new_guest, std::string_view new_class,
-  std::string_view new_name);
-
-
-/// Compute buffer size needed to escape binary data for use as a BYTEA.
-/** This uses the hex-escaping format.  The return value includes room for the
- * "\x" prefix.
- */
-inline constexpr std::size_t size_esc_bin(std::size_t binary_bytes) noexcept
-{
-  return 2 + (2 * binary_bytes) + 1;
-}
-
-
-/// Compute binary size from the size of its escaped version.
-/** Do not include a terminating zero in `escaped_bytes`.
- */
-inline constexpr std::size_t size_unesc_bin(std::size_t escaped_bytes) noexcept
-{
-  return (escaped_bytes - 2) / 2;
-}
-
-
-// TODO: Use actual binary type for "data".
-/// Hex-escape binary data into a buffer.
-/** The buffer must be able to accommodate
- * `size_esc_bin(std::size(binary_data))` bytes, and the function will write
- * exactly that number of bytes into the buffer.  This includes a trailing
- * zero.
- */
-void PQXX_LIBEXPORT
-esc_bin(std::basic_string_view<std::byte> binary_data, char buffer[]) noexcept;
-
-
-/// Hex-escape binary data into a std::string.
-std::string PQXX_LIBEXPORT
-esc_bin(std::basic_string_view<std::byte> binary_data);
-
-
-/// Reconstitute binary data from its escaped version.
-void PQXX_LIBEXPORT
-unesc_bin(std::string_view escaped_data, std::byte buffer[]);
-
-
-/// Reconstitute binary data from its escaped version.
-std::basic_string<std::byte>
-  PQXX_LIBEXPORT unesc_bin(std::string_view escaped_data);
-
-
-/// Transitional: std::ssize(), or custom implementation if not available.
-template<typename T> auto ssize(T const &c)
-{
-#if defined(__cpp_lib_ssize) && __cplusplus >= __cpp_lib_ssize
-  return std::ssize(c);
-#else
-  using signed_t = std::make_signed_t<decltype(std::size(c))>;
-  return static_cast<signed_t>(std::size(c));
-#endif // __cpp_lib_ssize
-}
-
-
-/// Helper for determining a function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename RETURN, typename... ARGS>
-std::tuple<ARGS...> args_f(RETURN (&func)(ARGS...));
-
-
-/// Helper for determining a `std::function`'s parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename RETURN, typename... ARGS>
-std::tuple<ARGS...> args_f(std::function<RETURN(ARGS...)> const &);
-
-
-/// Helper for determining a member function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CLASS, typename RETURN, typename... ARGS>
-std::tuple<ARGS...> member_args_f(RETURN (CLASS::*)(ARGS...));
-
-
-/// Helper for determining a const member function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CLASS, typename RETURN, typename... ARGS>
-std::tuple<ARGS...> member_args_f(RETURN (CLASS::*)(ARGS...) const);
-
-
-/// Helper for determining a callable type's parameter types.
-/** This specialisation should work for lambdas.
- *
- * This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CALLABLE>
-auto args_f(CALLABLE const &f)
-  -> decltype(member_args_f(&CALLABLE::operator()));
-
-
-/// A callable's parameter types, as a tuple.
-template<typename CALLABLE>
-using args_t = decltype(args_f(std::declval<CALLABLE>()));
-
-
-/// Helper: Apply `strip_t` to each of a tuple type's component types.
-/** This function has no definition.  It is not meant to be called, only to be
- * used to deduce the right types.
- */
-template<typename... TYPES>
-std::tuple<strip_t<TYPES>...> strip_types(std::tuple<TYPES...> const &);
-
-
-/// Take a tuple type and apply @ref strip_t to its component types.
-template<typename... TYPES>
-using strip_types_t = decltype(strip_types(std::declval<TYPES...>()));
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/version b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/version
deleted file mode 100644
index 8dd5e48d4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/version
+++ /dev/null
@@ -1,7 +0,0 @@
-/** libpqxx version info.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/version.hxx"
-#include "pqxx/internal/header-post.hxx"
-
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/version.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/version.hxx
deleted file mode 100644
index a159f1bed..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/version.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Version info for libpqxx.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/version instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_VERSION
-
-#  if !defined(PQXX_HEADER_PRE)
-#    error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#  endif
-
-/// Full libpqxx version string.
-#  define PQXX_VERSION "7.7.3"
-/// Library ABI version.
-#  define PQXX_ABI "7.7"
-
-/// Major version number.
-#  define PQXX_VERSION_MAJOR 7
-/// Minor version number.
-#  define PQXX_VERSION_MINOR 7
-
-#  define PQXX_VERSION_CHECK check_pqxx_version_7_7
-
-namespace pqxx::internal
-{
-/// Library version check stub.
-/** Helps detect version mismatches between libpqxx headers and the libpqxx
- * library binary.
- *
- * Sometimes users run into trouble linking their code against libpqxx because
- * they build their own libpqxx, but the system also has a different version
- * installed.  The declarations in the headers against which they compile their
- * code will differ from the ones used to build the libpqxx version they're
- * using, leading to confusing link errors.  The solution is to generate a link
- * error when the libpqxx binary is not the same version as the libpqxx headers
- * used to compile the code.
- *
- * This function's definition is in the libpqxx binary, so it's based on the
- * version as found in the binary.  The headers contain a call to the function,
- * whose name contains the libpqxx version as found in the headers.  (The
- * library build process will use its own local headers even if another version
- * of the headers is installed on the system.)
- *
- * If the libpqxx binary was compiled for a different version than the user's
- * code, linking will fail with an error: `check_pqxx_version_*_*` will not
- * exist for the given version number.
- */
-PQXX_LIBEXPORT int PQXX_VERSION_CHECK() noexcept;
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/zview b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/zview
deleted file mode 100644
index 66ea2a625..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/zview
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Zero-terminated string view class.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/zview.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/zview.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/zview.hxx
deleted file mode 100644
index 36a779f51..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/include/pqxx/zview.hxx
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Zero-terminated string view.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/zview instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ZVIEW
-#define PQXX_H_ZVIEW
-
-#include <string>
-#include <string_view>
-#include <type_traits>
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx
-{
-/// Marker-type wrapper: zero-terminated `std::string_view`.
-/** @warning Use this only if the underlying string is zero-terminated.
- *
- * When you construct a zview, you are promising that if the data pointer is
- * non-null, the underlying string is zero-terminated.  It otherwise behaves
- * exactly like a std::string_view.
- *
- * The terminating zero is not "in" the string, so it does not count as part of
- * the view's length.
- *
- * The added guarantee lets the view be used as a C-style string, which often
- * matters since libpqxx builds on top of a C library.  For this reason, zview
- * also adds a @ref c_str method.
- */
-class zview : public std::string_view
-{
-public:
-  constexpr zview() noexcept = default;
-
-  /// Convenience overload: construct using pointer and signed length.
-  constexpr zview(char const text[], std::ptrdiff_t len) :
-          std::string_view{text, static_cast<std::size_t>(len)}
-  {}
-
-  /// Convenience overload: construct using pointer and signed length.
-  constexpr zview(char text[], std::ptrdiff_t len) :
-          std::string_view{text, static_cast<std::size_t>(len)}
-  {}
-
-  /// Explicitly promote a `string_view` to a `zview`.
-  explicit constexpr zview(std::string_view other) noexcept :
-          std::string_view{other}
-  {}
-
-  /// Construct from any initialiser you might use for `std::string_view`.
-  /** @warning Only do this if you are sure that the string is zero-terminated.
-   */
-  template<typename... Args>
-  explicit constexpr zview(Args &&...args) :
-          std::string_view(std::forward<Args>(args)...)
-  {}
-
-  // C++20: constexpr.
-  /// @warning There's an implicit conversion from `std::string`.
-  zview(std::string const &str) noexcept :
-          std::string_view{str.c_str(), str.size()}
-  {}
-
-  /// Construct a `zview` from a C-style string.
-  /** @warning This scans the string to discover its length.  So if you need to
-   * do it many times, it's probably better to create the `zview` once and
-   * re-use it.
-   */
-  constexpr zview(char const str[]) : std::string_view{str} {}
-
-  /// Construct a `zview` from a string literal.
-  /** A C++ string literal ("foo") normally looks a lot like a pointer to
-   * char const, but that's not really true.  It's actually an array of char,
-   * which _devolves_ to a pointer when you pass it.
-   *
-   * For the purpose of creating a `zview` there is one big difference: if we
-   * know the array's size, we don't need to scan through the string in order
-   * to find out its length.
-   */
-  template<size_t size>
-  constexpr zview(char const (&literal)[size]) : zview(literal, size - 1)
-  {}
-
-  /// Either a null pointer, or a zero-terminated text buffer.
-  [[nodiscard]] constexpr char const *c_str() const &noexcept
-  {
-    return data();
-  }
-};
-
-
-/// Support @ref zview literals.
-/** You can "import" this selectively into your namespace, without pulling in
- * all of the @ref pqxx namespace:
- *
- * ```cxx
- * using pqxx::operator"" _zv;
- * ```
- */
-constexpr zview operator"" _zv(char const str[], std::size_t len) noexcept
-{
-  return zview{str, len};
-}
-} // namespace pqxx
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// A zview is a view.
-template<> inline constexpr bool std::ranges::enable_view<pqxx::zview>{true};
-
-
-/// A zview is a borrowed range.
-template<>
-inline constexpr bool std::ranges::enable_borrowed_range<pqxx::zview>{true};
-
-namespace pqxx::internal
-{
-/// Concept: T is a known zero-terminated string type.
-/** There's no unified API for these string types.  It's just a check for some
- * known types.  Any code that makes use of the concept will still have to
- * support each of these individually.
- */
-template<typename T>
-concept ZString = std::is_convertible_v < strip_t<T>,
-char const * > or std::is_convertible_v<strip_t<T>, zview> or
-  std::is_convertible_v<T, std::string const &>;
-} // namespace pqxx::internal
-#endif // PQXX_HAVE_CONCEPTS
-
-
-namespace pqxx::internal
-{
-/// Get a raw C string pointer.
-inline constexpr char const *as_c_string(char const str[]) noexcept
-{
-  return str;
-}
-/// Get a raw C string pointer.
-template<std::size_t N>
-inline constexpr char const *as_c_string(char (&str)[N]) noexcept
-{
-  return str;
-}
-/// Get a raw C string pointer.
-inline constexpr char const *as_c_string(pqxx::zview str) noexcept
-{
-  return str.c_str();
-}
-// C++20: Make this constexpr.
-/// Get a raw C string pointer.
-inline char const *as_c_string(std::string const &str) noexcept
-{
-  return str.c_str();
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-config-version.cmake b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-config-version.cmake
deleted file mode 100644
index c47d6956d..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-config-version.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-# This is a basic version file for the Config-mode of find_package().
-# It is used by write_basic_package_version_file() as input file for configure_file()
-# to create a version-file which can be installed along a config.cmake file.
-#
-# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-# the requested version string are exactly the same and it sets
-# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
-# but only if the requested major version is the same as the current one.
-# The variable CVF_VERSION must be set before calling configure_file().
-
-
-set(PACKAGE_VERSION "7.7.3")
-
-if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-
-  if("7.7.3" MATCHES "^([0-9]+)\\.")
-    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
-    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
-      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
-    endif()
-  else()
-    set(CVF_VERSION_MAJOR "7.7.3")
-  endif()
-
-  if(PACKAGE_FIND_VERSION_RANGE)
-    # both endpoints of the range must have the expected major version
-    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
-    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
-        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
-          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
-      set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
-        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
-        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
-      set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    else()
-      set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    endif()
-  else()
-    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
-      set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    else()
-      set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    endif()
-
-    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-      set(PACKAGE_VERSION_EXACT TRUE)
-    endif()
-  endif()
-endif()
-
-
-# if the installed project requested no architecture check, don't perform the check
-if("FALSE")
-  return()
-endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
-  return()
-endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
-  math(EXPR installedBits "8 * 8")
-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-config.cmake b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-config.cmake
deleted file mode 100644
index cb25a05f2..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-config.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-include(CMakeFindDependencyMacro)
-find_dependency(PostgreSQL)
-
-include("${CMAKE_CURRENT_LIST_DIR}/libpqxx-targets.cmake")
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-targets-noconfig.cmake b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-targets-noconfig.cmake
deleted file mode 100644
index 980f46098..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-targets-noconfig.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Import target "libpqxx::pqxx" for configuration ""
-set_property(TARGET libpqxx::pqxx APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(libpqxx::pqxx PROPERTIES
-  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
-  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/lib/libpqxx-7.7.a"
-  )
-
-list(APPEND _IMPORT_CHECK_TARGETS libpqxx::pqxx )
-list(APPEND _IMPORT_CHECK_FILES_FOR_libpqxx::pqxx "${_IMPORT_PREFIX}/lib/libpqxx-7.7.a" )
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-targets.cmake b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-targets.cmake
deleted file mode 100644
index 4716fb7b2..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/cmake/libpqxx/libpqxx-targets.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-# Generated by CMake
-
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
-   message(FATAL_ERROR "CMake >= 2.6.0 required")
-endif()
-cmake_policy(PUSH)
-cmake_policy(VERSION 2.6...3.20)
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Protect against multiple inclusion, which would fail when already imported targets are added once more.
-set(_targetsDefined)
-set(_targetsNotDefined)
-set(_expectedTargets)
-foreach(_expectedTarget libpqxx::pqxx)
-  list(APPEND _expectedTargets ${_expectedTarget})
-  if(NOT TARGET ${_expectedTarget})
-    list(APPEND _targetsNotDefined ${_expectedTarget})
-  endif()
-  if(TARGET ${_expectedTarget})
-    list(APPEND _targetsDefined ${_expectedTarget})
-  endif()
-endforeach()
-if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
-  unset(_targetsDefined)
-  unset(_targetsNotDefined)
-  unset(_expectedTargets)
-  set(CMAKE_IMPORT_FILE_VERSION)
-  cmake_policy(POP)
-  return()
-endif()
-if(NOT "${_targetsDefined}" STREQUAL "")
-  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
-endif()
-unset(_targetsDefined)
-unset(_targetsNotDefined)
-unset(_expectedTargets)
-
-
-# Compute the installation prefix relative to this file.
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-if(_IMPORT_PREFIX STREQUAL "/")
-  set(_IMPORT_PREFIX "")
-endif()
-
-# Create imported target libpqxx::pqxx
-add_library(libpqxx::pqxx STATIC IMPORTED)
-
-set_target_properties(libpqxx::pqxx PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "/usr/lib/x86_64-linux-gnu/libpq.so"
-)
-
-if(CMAKE_VERSION VERSION_LESS 2.8.12)
-  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
-endif()
-
-# Load information for each installed configuration.
-get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-file(GLOB CONFIG_FILES "${_DIR}/libpqxx-targets-*.cmake")
-foreach(f ${CONFIG_FILES})
-  include(${f})
-endforeach()
-
-# Cleanup temporary variables.
-set(_IMPORT_PREFIX)
-
-# Loop over all imported files and verify that they actually exist
-foreach(target ${_IMPORT_CHECK_TARGETS} )
-  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
-    if(NOT EXISTS "${file}" )
-      message(FATAL_ERROR "The imported target \"${target}\" references the file
-   \"${file}\"
-but this file does not exist.  Possible reasons include:
-* The file was deleted, renamed, or moved to another location.
-* An install or uninstall procedure did not complete successfully.
-* The installation package was faulty and contained
-   \"${CMAKE_CURRENT_LIST_FILE}\"
-but not all the files it references.
-")
-    endif()
-  endforeach()
-  unset(_IMPORT_CHECK_FILES_FOR_${target})
-endforeach()
-unset(_IMPORT_CHECK_TARGETS)
-
-# This file does not depend on other imported targets which have
-# been exported from the same project but in a separate export set.
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-cmake_policy(POP)
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/libpqxx-7.7.a b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/libpqxx-7.7.a
deleted file mode 100644
index fb941debb..000000000
Binary files a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/libpqxx-7.7.a and /dev/null differ
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/libpqxx.a b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/libpqxx.a
deleted file mode 120000
index d9fcdab85..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/lib/libpqxx.a
+++ /dev/null
@@ -1 +0,0 @@
-libpqxx-7.7.a
\ No newline at end of file
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/accessing-results.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/accessing-results.md
deleted file mode 100644
index 920fb6f3b..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/accessing-results.md
+++ /dev/null
@@ -1,157 +0,0 @@
-Accessing results and result rows                   {#accessing-results}
----------------------------------
-
-When you execute a query using one of the transaction `exec` functions, you
-normally get a `result` object back.  A `result` is a container of `row`s.
-
-(There are exceptions.  The `exec1` functions expect exactly one row of data,
-so they return just a `row`, not a full `result`.)
-
-Result objects are an all-or-nothing affair.  The `exec` function waits until
-it's received all the result data, and then gives it to you in the form of the
-`result`.  _(There is a faster, easier way of executing simple queries, so see
-"streaming rows" below as well.)_
-
-For example, your code might do:
-
-```cxx
-    pqxx::result r = tx.exec("SELECT * FROM mytable");
-```
-
-Now, how do you access the data inside `r`?
-
-Result sets act as standard C++ containers of rows.  Rows act as standard
-C++ containers of fields.  So the easiest way to go through them is:
-
-```cxx
-    for (auto const &row: r)
-    {
-       for (auto const &field: row) std::cout << field.c_str() << '\t';
-       std::cout << '\n';
-    }
-```
-
-But results and rows also support other kinds of access.  Array-style
-indexing, for instance, such as `r[rownum]`:
-
-```cxx
-    std::size_t const num_rows = std::size(r);
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-      pqxx::row const row = r[rownum];
-      std::size_t const num_cols = std::size(row);
-      for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-      {
-        pqxx::field const field = row[colnum];
-        std::cout << field.c_str() << '\t';
-      }
-
-      std::cout << '\n';
-    }
-```
-
-Every row in the result has the same number of columns, so you don't need to
-look up the number of fields again for each one:
-
-```cxx
-    std::size_t const num_rows = std::size(r);
-    std::size_t const num_cols = r.columns();
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-      pqxx::row const row = r[rownum];
-      for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-      {
-        pqxx::field const field = row[colnum];
-        std::cout << field.c_str() << '\t';
-      }
-
-      std::cout << '\n';
-    }
-```
-
-You can even address a field by indexing the `row` using the field's _name:_
-
-```cxx
-    std::cout << row["salary"] << '\n';
-```
-
-But try not to do that if speed matters, because looking up the column by name
-takes time.  At least you'd want to look up the column index before your loop
-and then use numerical indexes inside the loop.
-
-For C++23 or better, there's also a two-dimensional array access operator:
-
-```cxx
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-        for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-	    std::cout result[rownum, colnum].c_str() << '\t';
-	std::cout << '\n';
-    }
-```
-
-And of course you can use classic "begin/end" loops:
-
-```cxx
-    for (auto row = std::begin(r); row != std::end(r); row++)
-    {
-      for (auto field = std::begin(row); field != std::end(row); field++)
-        std::cout << field->c_str() << '\t';
-      std::cout << '\n';
-    }
-```
-
-Result sets are immutable, so all iterators on results and rows are actually
-`const_iterator`s.  There are also `const_reverse_iterator` types, which
-iterate backwards from `rbegin()` to `rend()` exclusive.
-
-All these iterator types provide one extra bit of convenience that you won't
-normally find in C++ iterators: referential transparency.  You don't need to
-dereference them to get to the row or field they refer to.  That is, instead
-of `row->end()` you can also choose to say `row.end()`.  Similarly, you
-may prefer `field.c_str()` over `field->c_str()`.
-
-This becomes really helpful with the array-indexing operator.  With regular
-C++ iterators you would need ugly expressions like `(*row)[0]` or
-`row->operator[](0)`.  With the iterator types defined by the result and
-row classes you can simply say `row[0]`.
-
-
-Streaming rows
---------------
-
-There's another way to go through the rows coming out of a query.  It's
-usually easier and faster, but there are drawbacks.
-
-**One,** you start getting rows before all the data has come in from the
-database.  That speeds things up, but what happens if you lose your network
-connection while transferring the data?  Your application may already have
-processed some of the data before finding out that the rest isn't coming.  If
-that is a problem for your application, streaming may not be the right choice.
-
-**Two,** streaming only works for some types of query.  The `stream()` function
-wraps your query in a PostgreSQL `COPY` command, and `COPY` only supports a few
-commands: `SELECT`, `VALUES`, `or an `INSERT`, `UPDATE`, or `DELETE` with a
-`RETURNING` clause.  See the `COPY` documentation here:
-https://www.postgresql.org/docs/current/sql-copy.html
-
-**Three,** when you convert a field to a "view" type (such as
-`std::string_view` or `std::basic_string_view<std::byte>`), the view points to
-underlying data which only stays valid until you iterate to the next row or
-exit the loop.  So if you want to use that data for longer than a single
-iteration of the streaming loop, you'll have to store it somewhere yourself.
-
-Now for the good news.  Streaming does make it very easy to query data and loop
-over it:
-
-```cxx
-    for (auto [id, name, x, y] :
-        tx.stream<int, std::string_view, float, float>(
-            "SELECT id, name, x, y FROM point"))
-      process(id + 1, "point-" + name, x * 10.0, y * 10.0);
-```
-
-The conversion to C++ types (here `int`, `std::string_view`, and two `float`s)
-is built into the function.  You never even see `row` objects, `field` objects,
-iterators, or conversion methods.  You just put in your query and you receive
-your data.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/binary-data.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/binary-data.md
deleted file mode 100644
index 20da8dc0c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/binary-data.md
+++ /dev/null
@@ -1,56 +0,0 @@
-Binary data                                                        {#binary}
-===========
-
-The database has two ways of storing binary data: `BYTEA` is like a string, but
-containing bytes rather than text characters.  And _large objects_ are more
-like a separate table containing binary objects.
-
-Generally you'll want to use `BYTEA` for reasonably-sized values, and large
-objects for very large values.
-
-That's the database side.  On the C++ side, in libpqxx, all binary data must be
-either `std::basic_string<std::byte>` or `std::basic_string_view<std::byte>`;
-or if you're building in C++20 or better, anything that's a block of
-contiguous `std::byte` in memory.
-
-So for example, if you want to write a large object, you'd create a
-`pqxx::blob` object.  And you might use that to write data in the form of
-`std::basic_string_view<std::byte>`.
-
-Your particular binary data may look different though.  You may have it in a
-`std::string`, or a `std::vector<unsigned char>`, or a pointer to `char`
-accompanied by a size (which could be signed or unsigned, and of any of a few
-different widths).  Sometimes that's your choice, or sometimes some other
-library will dictate what form it takes.
-
-So long as it's _basically_ still a block of bytes though, you can use
-`pqxx::binary_cast` to construct a `std::basic_string_view<std::byte>` from it.
-
-There are two forms of `binary_cast`.  One takes a single argument that must
-support `std::data()` and `std::size()`:
-
-    std::string hi{"Hello binary world"};
-    my_blob.write(pqxx::binary_cast(hi);
-
-The other takes a pointer and a size:
-
-    char const greeting[] = "Hello binary world";
-    char const *hi = greeting;
-    my_blob.write(pqxx::binary_cast(hi, sizeof(greeting)));
-
-
-Caveats
--------
-
-There are some restrictions on `binary_cast` that you must be aware of.
-
-First, your data must of a type that gives us _bytes._  So: `char`,
-`unsigned char`, `signed char`, `int8_t`, `uint8_t`, or of course `std::byte`.
-You can't feed in a vector of `double`, or anything like that.
-
-Second, the data must be laid out as a contiguous block in memory.  If there's
-no `std::data()` implementation for your type, it's not suitable.
-
-Third, `binary_cast` only constructs something like a `std::string_view`.  It
-does not make a copy of your actual data.  So, make sure that your data remains
-alive and in the same place while you're using it.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/datatypes.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/datatypes.md
deleted file mode 100644
index bc14c8b90..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/datatypes.md
+++ /dev/null
@@ -1,373 +0,0 @@
-Supporting additional data types                              {#datatypes}
-================================
-
-Communication with the database mostly happens in a text format.  When you
-include an integer value in a query, you use `to_string` to convert it to that
-text format.  When you get a query result field "as a float," it converts from
-the text format to a floating-point type.  These conversions are everywhere in
-libpqxx.
-
-The conversion sydstem supports many built-in types, but it is also extensible.
-You can "teach" libpqxx (in the scope of your own application) to convert
-additional types of values to and from PostgreSQL's string format.
-
-This is massively useful, but it's not for the faint of heart.  You'll need to
-specialise some templates.  And, **the API for doing this can change with any
-major libpqxx release.**
-
-
-Converting types
-----------------
-
-In your application, a conversion is driven entirely by a C++ type you specify.
-The value's SQL type has nothing to do with it, nor is there anything in the
-string that would identify its type.
-
-So, if you've SELECTed a 64-bit integer from the database, and you try to
-convert it to a C++ "short," one of two things will happen: either the number
-is small enough to fit in your `short` (and it just works), or else it throws a
-conversion exception.
-
-Or, your database table might have a text column, but a given field may contain
-a string that _looks_ just like a number.  You can convert that value to an
-integer type just fine.  Or to a floating-point type.  All that matters to the
-conversion is the actual value, and the type.
-
-In some cases the templates for these conversions can tell the type from the
-arguments you pass them:
-
-    auto x = to_string(99);
-
-In other cases you may need to instantiate template explicitly:
-
-    auto y = from_string<int>("99");
-
-
-Supporting a new type
----------------------
-
-Let's say you have some other SQL type which you want to be able to store in,
-or retrieve from, the database.  What would it take to support that?
-
-Sometimes you do not need _complete_ support.  You might need a conversion _to_
-a string but not _from_ a string, for example.  The conversion is defined at
-compile time, so don't be too afraid to be incomplete.  If you leave out one of
-these steps, it's not going to crash at run time or mess up your data.  The
-worst that can happen is that your code won't build.
-
-So what do you need for a complete conversion?
-
-First off, of course, you need a C++ type.  It may be your own, but it
-doesn't have to be.  It could be a type from a third-party library, or even one
-from the standard library that libpqxx does not yet support.
-
-You also specialise the `pqxx::type_name` variable to specify the type's name.
-This is important for all code which mentions your type in human-readable text,
-such as error messages.
-
-Then, does your type have a built-in null value?  You specialise the
-`pqxx::nullness` template to specify the details.
-
-Finally, you specialise the `pqxx::string_traits` template.  This is where you
-define the actual conversions.
-
-Let's go through these steps one by one.
-
-
-Your type
----------
-
-You'll need a type for which the conversions are not yet defined, because the
-C++ type is what determines the right conversion.  One type, one set of
-conversions.
-
-The type doesn't have to be one that you create.  The conversion logic was
-designed such that you can build it around any type.  So you can just as
-easily build a conversion for a type that's defined somewhere else.  There's
-no need to include any special methods or other members inside it.  That's also
-how libpqxx can support converting built-in types like `int`.
-
-By the way, if the type is an enum, you don't need to do any of this.  Just
-invoke the preprocessor macro `PQXX_DECLARE_ENUM_CONVERSION`, from the global
-namespace near the top of your translation unit, and pass the type as an
-argument.
-
-The library also provides specialisations for `std::optional<T>`,
-`std::shared_ptr<T>`, and `std::unique_ptr<T>`.  If you have conversions for
-`T`, you'll also have conversions for those.
-
-
-Specialise `type_name`
-----------------------
-
-When errors happen during conversion, libpqxx will compose error messages for
-the user.  Sometimes these will include the name of the type that's being
-converted.
-
-To tell libpqxx the name of each type, there's a template variable called
-`pqxx::type_name`.  For any given type `T`, it should have a specialisation
-that provides that `T`'s human-readable name:
-
-    namespace pqxx
-    {
-    template<> std::string const type_name<T>{"T"};
-    }
-
-(Yes, this means that you need to define something inside the pqxx namespace.
-Future versions of libpqxx may move this into a separate namespace.)
-
-Define this early on in your translation unit, before any code that might cause
-libpqxx to need the name.  That way, the libpqxx code which needs to know the
-type's name can see your definition.
-
-
-Specialise `nullness`
----------------------
-
-A struct template `pqxx::nullness` defines whether your type has a natural
-"null value" built in.  If so, it also provides member functions for producing
-and recognising null values.
-
-The simplest scenario is also the most common: most types don't have a null
-value built in.  In that case, derive your nullness traits from
-`pqxx::no_null`:
-
-    namespace pqxx
-    {
-    template<> struct nullness<T> : pqxx::no_null<T> {};
-    }
-
-(Here again you're defining this in the pqxx namespace.)
-
-If your type does have a natural null value, the definition gets a little more
-complex:
-
-    namespace pqxx
-    {
-    template<> struct nullness<T>
-    {
-      static constexpr bool has_null{true};
-      static constexpr bool always_null{false};
-
-      static bool is_null(T const &value)
-      {
-        // Return whether "value" is null.
-        return ...;
-      }
-
-      [[nodiscard]] static T null()
-      {
-        // Return a null value.
-        return ...;
-      }
-    };
-    }
-
-You may be wondering why there's a function to produce a null value, but also a
-function to check whether a value is null.  Why not just compare the value to
-the result of `null()`?  Because two null values may not be equal.  `T` may
-have several different null values.  Or it may override the comparison
-operator, similar to SQL where NULL is not equal to NULL.
-
-As a third case, your type may be one that _always_ represents a null value.
-This is the case for `std::nullptr_t` and `std::nullopt_t`.  In that case, you
-set `nullness<TYPE>::always_null` to `true` (as well as `has_null` of course),
-and you won't need to define any actual conversions.
-
-
-Specialise `string_traits`
--------------------------
-
-This part is more work.  (You can skip it for types that are _always_ null,
-but those will be rare.)  Specialise the `pqxx::string_traits` template:
-
-    namespace pqxx
-    {
-    template<> struct string_traits<T>
-    {
-      static T from_string(std::string_view text);
-      static zview to_buf(char *begin, char *end, T const &value);
-      static char *into_buf(char *begin, char *end, T const &value);
-      static std::size_t size_buffer(T const &value) noexcept;
-    };
-    }
-
-You'll also need to write those member functions, or as many of them as needed
-to get your code to build.
-
-
-### `from_string`
-
-We start off simple: `from_string` parses a string as a value of `T`, and
-returns that value.
-
-The string may not be zero-terminated; it's just the `string_view` from
-beginning to end (exclusive).  In your tests, cover cases where the string
-does not end in a zero byte.
-
-It's perfectly possible that the string isn't actually a `T` value.  Mistakes
-happen.  In that case, throw a `pqxx::conversion_error`.
-
-(Of course it's also possible that you run into some other error, so it's fine
-to throw different exceptions as well.  But when it's definitely "this is not
-the right format for a `T`," throw `conversion_error`.)
-
-
-### `to_buf`
-
-In this function, you convert a value of `T` into a string that the postgres
-server will understand.
-
-The caller will provide you with a buffer where you can write the string, if
-you need it: from `begin` to `end` exclusive.  It's a half-open interval, so
-don't access `*end`.
-
-If the buffer is insufficient for you to do the conversion, throw a
-`pqxx::conversion_overrun`.  It doesn't have to be exact: you can be a little
-pessimistic and demand a bit more space than you need.  Just be sure to throw
-the exception if there's any risk of overrunning the buffer.
-
-You don't _have_ to use the buffer for this function though.  For example,
-`pqxx::string_traits<bool>::to_buf` returns a compile-time constant string and
-ignores the buffer.
-
-Even if you do use the buffer, your string does not _have_ to start at the
-beginning of the buffer.  For example, the integer conversions start by writing
-the _least_ significant digit to the _end_ of the buffer, and then writes the
-more significant digits before it.  It was just more convenient.
-
-Return a `pqxx::zview`.  This is basically a `std::string_view`, but with one
-difference: a `zview` guarantees that there will be a valid zero byte right
-after the `string_view`.  The zero byte is not counted as part of its size, but
-it will be there.
-
-Expressed in code, this rule must hold:
-
-    void invariant(zview z)
-    {
-      assert(z[std::size(z)] == 0);
-    }
-
-Make sure you write your trailing zero _before_ the `end`.  If the trailing
-zero doesn't fit in the buffer, then there's just not enough room to perform
-the conversion.
-
-Beware of locales when converting.  If you use standard library features like
-`sprintf`, they may obey whatever locale is currently set on the system.   That
-means that a simple integer like 1000000 may come out as "1000000" on your
-system, but as "1,000,000" on mine, or as "1.000.000" for somebody else, and on
-an Indian system it may be "1,00,000".  Values coming from or going to the
-database should be in non-localised formats.  You can use libpqxx functions for
-those conversions: `pqxx::from_string`, `pqxx::to_string`, `pqxx::to_buf`.
-
-
-### `into_buf`
-
-This is a stricter version of `to_buf`.  All the same requirements apply, but
-in addition you must write your string into the buffer provided, starting
-_exactly_ at `begin`.
-
-That's why this function returns just a simple pointer: the address right
-behind the trailing zero.  If the caller wants to use the string, they can
-find it at `begin`.  If they want to write a different value into the rest of
-the buffer, they can start at the location you returned.
-
-
-### `size_buffer`
-
-Here you estimate how much buffer space you need for converting a `T` to a
-string.  Be precise if you can, but pessimistic if you must.  It's usually
-better to waste a few unnecessary bytes than to spend a lot of time computing
-the exact buffer space you need.  And failing the conversion because you
-under-budgeted the buffer is worst of all.
-
-Include the trailing zero in the buffer size.  If your `to_buf` takes more
-space than just what's needed to store the result, include that too.
-
-Make `size_buffer` a `constexpr` function if you can.  It can allow the caller
-to allocate the buffer on the stack, with a size known at compile time.
-
-
-Optional: Specialise `is_unquoted_safe`
----------------------------------------
-
-When converting arrays or composite values to strings, libpqxx may need to
-quote values and escape any special characters.  This takes time.
-
-Some types though, such as integral or floating-point types, can never have
-any special characters such as quotes, commas, or backslashes in their string
-representations.  In such cases, there's no need to quote or escape such values
-in arrays or composite types.
-
-If your type is like that, you can tell libpqxx about this by defining:
-
-    namespace pqxx
-    {
-    template<> inline constexpr bool is_unquoted_safe<MY_TYPE>{true};
-    }
-
-The code that converts this type of field to strings in an array or a composite
-type can then use a simpler, more efficient variant of the code.  It's always
-safe to leave this out; it's _just_ an optimisation for when you're completely
-sure that it's safe.
-
-Do not do this if a string representation of your type may contain a comma;
-semicolon; parenthesis; brace; quote; backslash; newline; or any other
-character that might need escaping.
-
-
-Optional: Specialise `param_format`
------------------------------------
-
-This one you don't generally need to worry about.  Read on if you're writing a
-type which represents raw binary data, or if you're writing a template where
-_some specialisations_ may contain raw binary data.
-
-When you call parameterised statements, or prepared statements with parameters,
-libpqxx needs to your parameters on to libpq, the underlying C-level PostgreSQL
-client library.
-
-There are two formats for doing that: _text_ and _binary._  In the first, we
-represent all values as strings, and the server then converts them into its own
-internal binary representation.  That's what the string conversions are all
-about, and it's what we do for almost all types of parameters.
-
-But we do it differently when the parameter is a contiguous series of raw bytes
-and the corresponding SQL type is `BYTEA`.  There is a text format for those,
-but we bypass it for efficiency.  The server can use the binary data in the
-exact same form, without any conversion or extra processing.  The binary data
-is also twice as compact during transport.
-
-(People sometimes ask why we can't just treat all types as binary.  However the
-general case isn't so clear-cut.  The binary formats are not documented, there
-are no guarantees that they will be platform-independent or that they will
-remain stable, and there's no really solid way to detect when we might get the
-format wrong.  But also, the conversions aren't necessarily as straightforward
-and efficient as they sound.  So, for the general case, libpqxx sticks with the
-text formats.  Raw binary data alone stands out as a clear win.)
-
-Long story short, the machinery for passing parameters needs to know: is this
-parameter a binary string, or not?  In the normal case it can assume "no," and
-that's what it does.  The text format is always a safe choice; we just try to
-use the binary format where it's faster.
-
-The `param_format` function template is what makes the decision.  We specialise
-it for types which may be binary strings, and use the default for all other
-types.
-
-"Types which _may_ be binary"?  You might think we know whether a type is a
-binary type or not.  But there are some complications with generic types.
-
-Templates like `std::shared_ptr`, `std::optional`, and so on act like
-"wrappers" for another type.  A `std::optional<T>` is binary if `T` is binary.
-Otherwise, it's not.  If you're building support for a template of this nature,
-you'll probably want to implement `param_format` for it.
-
-The decision to use binary format is made based on a given object, not
-necessarily based on the type in general.  Look at `std::variant`.  If you have
-a `std::variant` type which can hold an `int` or a binary string, is that a
-binary parameter?  We can't decide without knowing the individual object.
-
-Containers are another hard case.  Should we pass `std::vector<T>` in binary?
-Even when `T` is a binary type, we don't currently have any way to pass an
-array in binary format, so we always pass it as text.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/escaping.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/escaping.md
deleted file mode 100644
index 2ad9fe3db..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/escaping.md
+++ /dev/null
@@ -1,74 +0,0 @@
-String escaping                      {#escaping}
-===============
-
-Writing queries as strings is easy.  But sometimes you need a variable in
-there: `"SELECT id FROM user WHERE name = '" + name + "'"`.
-
-This is dangerous.  See the bug?  If `name` can contain quotes, you may have
-an SQL injection vulnerability there, where users can enter nasty stuff like
-"`.'; DROP TABLE user`".  Or if you're lucky, it's just a nasty bug that you
-discover when `name` happens to be "d'Arcy".
-
-So, you'll need to _escape_ the `name` before you insert it.  This is where
-quotes and other problematic characters are marked as "this is just a character
-in the string, not the end of the string."  There are
-[several functions](@ref escaping-functions) in libpqxx to do this for you.
-
-
-SQL injection
--------------
-
-To understand what SQL injection vulnerabilities are and why they should be
-prevented, imagine you use the following SQL statement somewhere in your
-program:
-
-    TX.exec(
-    	"SELECT number,amount "
-    	"FROM accounts "
-    	"WHERE allowed_to_see('" + userid + "','" + password + "')");
-
-This shows a logged-in user important information on all accounts he is
-authorized to view.  The userid and password strings are variables entered
-by the user himself.
-
-Now, if the user is actually an attacker who knows (or can guess) the
-general shape of this SQL statement, imagine he enters the following
-password:
-
-    x') OR ('x' = 'x
-
-Does that make sense to you?  Probably not.  But if this is inserted into
-the SQL string by the C++ code above, the query becomes:
-
-    SELECT number,amount
-    FROM accounts
-    WHERE allowed_to_see('user','x') OR ('x' = 'x')
-
-Is this what you wanted to happen?  Probably not!  The neat `allowed_to_see()`
-clause is completely circumvented by the "`OR ('x' = 'x')`" clause, which is
-always `true`.  Therefore, the attacker will get to see all accounts in the
-database!
-
-
-Using the esc functions
------------------------
-
-Here's how you can fix the problem in the example above:
-
-    TX.exec(
-    	"SELECT number,amount "
-    	"FROM accounts "
-    	"WHERE allowed_to_see('" + TX.esc(userid) + "', "
-    		"'" + TX.esc(password) + "')");
-
-Now, the quotes embedded in the attacker's string will be neatly escaped so
-they can't "break out" of the quoted SQL string they were meant to go into:
-
-    SELECT number,amount
-    FROM accounts
-    WHERE allowed_to_see('user', 'x'') OR (''x'' = ''x')
-
-If you look carefully, you'll see that thanks to the added escape characters
-(a single-quote is escaped in SQL by doubling it) all we get is a very
-strange-looking password string--but not a change in the SQL statement.
-
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/getting-started.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/getting-started.md
deleted file mode 100644
index 1b87b881f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/getting-started.md
+++ /dev/null
@@ -1,142 +0,0 @@
-Getting started                              {#getting-started}
-===============
-
-The most basic three types in libpqxx are the _connection_, the _transaction_,
-and the _result_.
-
-They fit together as follows:
-* You connect to the database by creating a `pqxx::connection` object (see
-  @ref connections).
-
-* You create a transaction object (see @ref transactions) operating on that
-  connection.  You'll usually want the `pqxx::work` variety.
-
-  Once you're done you call the transaction's `commit` function to make its
-  work final.  If you don't call this, the work will be rolled back when the
-  transaction object is destroyed.
-
-* Until then, use the transaction's `exec`, `query_value`, and `stream`
-  functions (and variants) to execute SQL statements.  You pass the statements
-  themselves in as simple strings.  (See @ref streams for more about data
-  streaming).
-
-* Most of the `exec` functions return a `pqxx::result` object, which acts
-  as a standard container of rows: `pqxx::row`.
-
-  Each row in a result, in turn, acts as a container of fields: `pqxx::field`.
-  See @ref accessing-results for more about results, rows, and fields.
-
-* Each field's data is stored internally as a text string, in a format defined
-  by PostgreSQL.  You can convert field or row values using their `as()` and
-  `to()` member functions.
-
-* After you've closed the transaction, the connection is free to run a next
-  transaction.
-
-Here's a very basic example.  It connects to the default database (you'll
-need to have one set up), queries it for a very simple result, converts it to
-an `int`, and prints it out.  It also contains some basic error handling.
-
-    #include <iostream>
-    #include <pqxx/pqxx>
-
-    int main()
-    {
-      try
-      {
-        // Connect to the database.  In practice we may have to pass some
-        // arguments to say where the database server is, and so on.
-        // The constructor parses options exactly like libpq's
-        // PQconnectdb/PQconnect, see:
-        // https://www.postgresql.org/docs/10/static/libpq-connect.html
-        pqxx::connection c;
-
-        // Start a transaction.  In libpqxx, you always work in one.
-        pqxx::work w(c);
-
-        // work::exec1() executes a query returning a single row of data.
-        // We'll just ask the database to return the number 1 to us.
-        pqxx::row r = w.exec1("SELECT 1");
-
-        // Commit your transaction.  If an exception occurred before this
-        // point, execution will have left the block, and the transaction will
-        // have been destroyed along the way.  In that case, the failed
-        // transaction would implicitly abort instead of getting to this point.
-        w.commit();
-
-        // Look at the first and only field in the row, parse it as an integer,
-        // and print it.
-        //
-        // "r[0]" returns the first field, which has an "as<...>()" member
-        // function template to convert its contents from their string format
-        // to a type of your choice.
-        std::cout << r[0].as<int>() << std::endl;
-      }
-      catch (std::exception const &e)
-      {
-        std::cerr << e.what() << std::endl;
-        return 1;
-      }
-    }
-
-This prints the number 1.  Notice that you can keep the result object around
-after you've closed the transaction or even the connection.  There are
-situations where you can't do it, but generally it's fine.  If you're
-interested: you can install your own callbacks for receiving error messages
-from the database, and in that case you'll have to keep the connection object
-alive.  But otherwise, it's nice to be able to "fire and forget" your
-connection and deal with the data.
-
-You can also convert an entire row to a series of C++-side types in one go,
-using the @c as member function on the row:
-
-    pqxx::connection c;
-    pqxx::work w(c);
-    pqxx::row r = w.exec1("SELECT 1, 2, 'Hello'");
-    auto [one, two, hello] = r.as<int, int, std::string>();
-    std::cout << (one + two) << ' ' << std::strlen(hello) << std::endl;
-
-Here's a slightly more complicated example.  It takes an argument from the
-command line and retrieves a string with that value.  The interesting part is
-that it uses the escaping-and-quoting function `quote` to embed this
-string value in SQL safely.  It also reads the result field's value as a
-plain C-style string using its `c_str` function.
-
-    #include <iostream>
-    #include <stdexcept>
-    #include <pqxx/pqxx>
-
-    int main(int argc, char *argv[])
-    {
-      try
-      {
-        if (!argv[1]) throw std::runtime_error("Give me a string!");
-
-        pqxx::connection c;
-        pqxx::work w(c);
-
-        // work::exec() returns a full result set, which can consist of any
-        // number of rows.
-        pqxx::result r = w.exec("SELECT " + w.quote(argv[1]));
-
-        // End our transaction here.  We can still use the result afterwards.
-        w.commit();
-
-        // Print the first field of the first row.  Read it as a C string,
-        // just like std::string::c_str() does.
-        std::cout << r[0][0].c_str() << std::endl;
-      }
-      catch (std::exception const &e)
-      {
-        std::cerr << e.what() << std::endl;
-        return 1;
-      }
-    }
-
-You can find more about converting field values to native types, or
-converting values to strings for use with libpqxx, under
-@ref stringconversion.  More about getting to the rows and fields of a
-result is under @ref accessing-results.
-
-If you want to handle exceptions thrown by libpqxx in more detail, for
-example to print the SQL contents of a query that failed, see @ref exception.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/mainpage.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/mainpage.md
deleted file mode 100644
index 5d4b8f9b2..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/mainpage.md
+++ /dev/null
@@ -1,28 +0,0 @@
-libpqxx                                      {#mainpage}
-=======
-
-@version 7.7.3
-@author Jeroen T. Vermeulen
-@see http://pqxx.org
-@see https://github.com/jtv/libpqxx
-
-Welcome to libpqxx, the C++ API to the PostgreSQL database management system.
-
-Compiling this package requires PostgreSQL to be installed -- including the
-C headers for client development.  The library builds on top of PostgreSQL's
-standard C API, libpq.  The libpq headers are not needed to compile client
-programs, however.
-
-For a quick introduction to installing and using libpqxx, see the README.md
-file.  The latest information can be found at http://pqxx.org/
-
-
-Some links that should help you find your bearings:
-* @ref getting-started
-* @ref thread-safety
-* @ref connections
-* @ref transactions
-* @ref escaping
-* @ref performance
-* @ref transactor
-* @ref datatypes
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/parameters.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/parameters.md
deleted file mode 100644
index 7ac792025..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/parameters.md
+++ /dev/null
@@ -1,90 +0,0 @@
-Statement parameters                                        {#parameters}
-====================
-
-When you execute a prepared statement (see @ref prepared), or a parameterised
-statement (using functions like `pqxx::connection::exec_params`), you may write
-special _placeholders_ in the query text.  They look like `$1`, `$2`, and so
-on.
-
-If you execute the query and pass parameter values, the call will respectively
-substitute the first where it finds `$1`, the second where it finds `$2`, et
-cetera.
-
-Doing this saves you work.  If you don't use statement parameters, you'll need
-to quote and escape your values (see `connection::quote()` and friends) as you
-insert them into your query as literal values.
-
-Or if you forget to do that, you leave yourself open to horrible
-[SQL injection attacks](https://xkcd.com/327/).  Trust me, I was born in a town
-whose name started with an apostrophe!
-
-Statement parameters save you this work.  With these parameters you can pass
-your values as-is, and they will go across the wire to the database in a safe
-format.
-
-In some cases it may even be faster!  When a parameter represents binary data
-(as in the SQL `BYTEA` type), libpqxx will send it directly as binary, which is
-a bit more efficient.  If you insert the binary data directly in your query
-text, your CPU will have some extra work to do, converting the data into a text
-format, escaping it, and adding quotes.
-
-
-Dynamic parameter lists
------------------------
-
-In rare cases you may just not know how many parameters you'll pass into your
-statement when you call it.
-
-For these situations, have a look at `params`.  It lets you compose your
-parameters list on the fly, even add whole ranges of parameters at a time.
-
-You can pass a `params` into your statement as a normal parameter.  It will
-fill in all the parameter values it contains into that position of the
-statement's overall parameter list.
-
-So if you call your statement passing a regular parameter `a`, a
-`params` containing just a parameter `b`, and another regular parameter `c`,
-then your call will pass parameters `a`, `b`, and `c`.  Or if the params object
-is empty, it will pass just `a` and `c`.  If the params object contains `x` and
-`y`, your call will pass `a, x, y, c`.
-
-You can mix static and dynamic parameters freely.  Don't go overboard though:
-complexity is where bugs happen!
-
-
-Generating placeholders
------------------------
-
-If your code gets particularly complex, it may sometimes happen that it becomes
-hard to track which parameter value belongs with which placeholder.  Did you
-intend to pass this numeric value as `$7`, or as `$8`?  The answer may depend
-on an `if` that happened earlier in a different function.
-
-(Generally if things get that complex, it's a good idea to look for simpler
-solutions.  But especially when performance matters, sometimes you can't avoid
-complexity like that.)
-
-There's a little helper class called `placeholders`.  You can use it as a
-counter which produces those placeholder strings, `$1`, `$2`, `$3`, et cetera.
-When you start generating a complex statement, you can create both a `params`
-and a `placeholders`:
-
-    pqxx::params values;
-    pqxx::placeholders name;
-
-Let's say you've got some complex code to generate the conditions for an SQL
-"WHERE" clause.  You'll generally want to do these things close together in
-your, so that you don't accidentally update one part and forget another:
-
-    if (extra_clause)
-    {
-      // Extend the query text, using the current placeholder.
-      query += " AND x = " + name.get();
-      // Add the parameter value.
-      values.append(my_x);
-      // Move on to the next placeholder value.
-      name.next();
-    }
-
-Depending on the starting value of `name`, this might add to `query` a fragment
-like "` AND x = $3`" or "` AND x = $5`".
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/performance.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/performance.md
deleted file mode 100644
index 6c403684f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/performance.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Performance features                       {#performance}
-====================
-
-If your program's database interaction is not as efficient as it needs to be,
-the first place to look is usually the SQL you're executing.  But libpqxx
-has a few specialized features to help you squeeze more performance out
-of how you issue commands and retrieve data:
-
-* @ref streams.  Use these as a faster way to transfer data between your
-    code and the database.
-* `std::string_view` and `pqxx::zview`.  In places where traditional C++ worked
-    with `std::string`, see whether `std::string_view` or `pqxx::zview` will
-    do.  Of course that means that you'll have to look at the data's lifetime
-    more carefully, but it'll save the computer a lot of copying.
-* @ref prepared.  These can be executed many times without the server
-    parsing and planning them anew each time.  They also save you having to
-    escape string parameters.
-* `pqxx::pipeline` lets you send queries to the database in batches, and
-    continue other processing while they are executing.
-* `pqxx::connecting` lets you start setting up a database connection, but
-    without blocking the thread.
-
-As always of course, don't risk the quality of your code for optimizations
-that you don't need!
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/prepared-statement.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/prepared-statement.md
deleted file mode 100644
index 5193866a6..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/prepared-statement.md
+++ /dev/null
@@ -1,125 +0,0 @@
-Prepared statements                    {#prepared}
-===================
-
-Prepared statements are SQL queries that you define once and then invoke
-as many times as you like, typically with varying parameters.  It's basically
-a function that you can define ad hoc.
-
-If you have an SQL statement that you're going to execute many times in
-quick succession, it may be more efficient to prepare it once and reuse it.
-This saves the database backend the effort of parsing complex SQL and
-figuring out an efficient execution plan.  Another nice side effect is that
-you don't need to worry about escaping parameters.  Some corporate coding
-standards require all SQL parameters to be passed in this way, to reduce the
-risk of programmer mistakes leaving room for SQL injections.
-
-
-Preparing a statement
----------------------
-
-You create a prepared statement by preparing it on the connection (using the
-`pqxx::connection::prepare` functions), passing an identifier and its SQL text.
-
-The identifier is the name by which the prepared statement will be known; it
-should consist of ASCII letters, digits, and underscores only, and start with
-an ASCII letter.  The name is case-sensitive.
-
-```cxx
-    void prepare_my_statement(pqxx::connection &c)
-    {
-      c.prepare(
-          "my_statement",
-          "SELECT * FROM Employee WHERE name = 'Xavier'");
-    }
-```
-
-Once you've done this, you'll be able to call `my_statement` from any
-transaction you execute on the same connection.  For this, use the
-`pqxx::transaction_base::exec_prepared` functions.
-
-```cxx
-    pqxx::result execute_my_statement(pqxx::transaction_base &t)
-    {
-      return t.exec_prepared("my_statement");
-    }
-```
-
-
-Parameters
-----------
-
-Did I mention that prepared statements can have parameters?  The query text
-can contain `$1`, `$2` etc. as placeholders for parameter values that you
-will provide when you invoke the prepared satement.
-
-See @ref parameters for more about this.  And here's a simple example of
-preparing a statement and invoking it with parameters:
-
-```cxx
-    void prepare_find(pqxx::connection &c)
-    {
-      // Prepare a statement called "find" that looks for employees with a
-      // given name (parameter 1) whose salary exceeds a given number
-      // (parameter 2).
-      c.prepare(
-  	    "find",
-  	    "SELECT * FROM Employee WHERE name = $1 AND salary > $2");
-    }
-```
-
-This example looks up the prepared statement "find," passes `name` and
-`min_salary` as parameters, and invokes the statement with those values:
-
-```cxx
-    pqxx::result execute_find(
-      pqxx::transaction_base &t, std::string name, int min_salary)
-    {
-      return t.exec_prepared("find", name, min_salary);
-    }
-```
-
-
-A special prepared statement
-----------------------------
-
-There is one special case: the _nameless_ prepared statement.  You may prepare
-a statement without a name, i.e. whose name is an empty string.  The unnamed
-statement can be redefined at any time, without un-preparing it first.
-
-
-Performance note
-----------------
-
-Don't assume that using prepared statements will speed up your application.
-There are cases where prepared statements are actually slower than plain SQL.
-
-The reason is that the backend can often produce a better execution plan when
-it knows the statement's actual parameter values.
-
-For example, say you've got a web application and you're querying for users
-with status "inactive" who have email addresses in a given domain name X.  If
-X is a very popular provider, the best way for the database engine to plan the
-query may be to list the inactive users first and then filter for the email
-addresses you're looking for.  But in other cases, it may be much faster to
-find matching email addresses first and then see which of their owners are
-"inactive."  A prepared statement must be planned to fit either case, but a
-direct query will be optimised based on table statistics, partial indexes, etc.
-
-
-Zero bytes
-----------
-
-@warning Beware of "nul" bytes!
-
-Any string you pass as a parameter will end at the _first char with value
-zero._  If you pass a string that contains a zero byte, the last byte in the
-value will be the one just before the zero.
-
-So, if you need a zero byte in a string, consider that it's really a _binary
-string,_ which is not the same thing as a text string.  SQL represents binary
-data as the `BYTEA` type, or in binary large objects ("blobs").
-
-In libpqxx, you represent binary data as a range of `std::byte`.  They must be
-contiguous in memory, so that libpqxx can pass pointers to the underlying C
-library.  So you might use `std::basic_string<std::byte>`, or
-`std::basic_string_view<std::byte>`, or `std::vector<std::byte>`.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/streams.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/streams.md
deleted file mode 100644
index 3df4d6126..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/streams.md
+++ /dev/null
@@ -1,107 +0,0 @@
-Streams						{#streams}
-=======
-
-Most of the time it's fine to retrieve data from the database using `SELECT`
-queries, and store data using `INSERT`.  But for those cases where efficiency
-matters, there are two classes to help you do this better: `stream_from` and
-`stream_to`.  They're less flexible than SQL queries, and there's the risk of
-losing your connection while you're in mid-stream, but you get some speed and
-memory efficiencies in return.
-
-Both stream classes do data conversion for you: `stream_from` receives values
-from the database in PostgreSQL's text format, and converts them to the C++
-types you specify.  Likewise, `stream_to` converts C++ values you provide to
-PostgreSQL's text format for transfer.  (On its end, the database of course
-converts values to and from their SQL types.)
-
-
-Null values
------------
-
-So how do you deal with nulls?  It depends on the C++ type you're using.  Some
-types may have a built-in null value.  For instance, if you have a
-`char const *` value and you convert it to an SQL string, then converting a
-`nullptr` will produce a NULL SQL value.
-
-But what do you do about C++ types which don't have a built-in null value, such
-as `int`?  The trick is to wrap it in `std::optional`.  The difference between
-`int` and `std::optional<int>` is that the former always has an `int` value,
-and the latter doesn't have to.
-
-Actually it's not just `std::optional`.  You can do the same thing with
-`std::unique_ptr` or `std::shared_ptr`.  A smart pointer is less efficient than
-`std::optional` in most situations because they allocate their value on the
-heap, but sometimes that's what you want in order to save moving or copying
-large values around.
-
-This part is not generic though.  It won't work with just any smart-pointer
-type, just the ones which are explicitly supported: `shared_ptr` and
-`unique_ptr`.  If you really need to, you can build support for additional
-wrappers and smart pointers by copying the implementation patterns from the
-existing smart-pointer support.
-
-
-stream\_from
-------------
-
-Use `stream_from` to read data directly from the database.  It's faster than
-the transaction's `exec` functions if the result contains enough rows.  But
-also, you won't need to keep your full result set in memory.  That can really
-matter with larger data sets.
-
-And, you can start processing your data right after the first row of data comes
-in from the server.  With `exec()` you need to wait to receive all data, and
-then you begin processing.  With `stream_from` you can be processing data on
-the client side while the server is still sending you the rest.
-
-You don't actually need to create a `stream_from` object yourself, though you
-can.  Two shorthand functions, @ref pqxx::transaction_base::stream
-and @ref pqxx::transaction_base::for_each, can create the streams for you with
-a minimum of overhead.
-
-Not all kinds of queries will work in a stream.  Internally the streams make
-use of PostgreSQL's `COPY` command, so see the PostgreSQL documentation for
-`COPY` for the exact limitations.  Basic `SELECT` and `UPDATE ... RETURNING`
-queries should just work.
-
-As you read a row, the stream converts its fields to a tuple type containing
-the value types you ask for:
-
-    auto stream pqxx::stream_from::query(
-        tx, "SELECT name, points FROM score");
-    std::tuple<std::string, int> row;
-    while (stream >> row)
-      process(row);
-    stream.complete();
-
-As the stream reads each row, it converts that row's data into your tuple,
-goes through your loop body, and then promptly forgets that row's data.  This
-means you can easily process more data than will fit in memory.
-
-
-stream\_to
-----------
-
-Use `stream_to` to write data directly to a database table.  This saves you
-having to perform an `INSERT` for every row, and so it can be significantly
-faster if you want to insert more than just one or two rows at a time.
-
-As with `stream_from`, you can specify the table and the columns, and not much
-else.  You insert tuple-like objects of your choice:
-
-    pqxx::stream_to stream{
-        tx,
-        "score",
-        std::vector<std::string>{"name", "points"}};
-    for (auto const &entry: scores)
-        stream << entry;
-    stream.complete();
-
-Each row is processed as you provide it, and not retained in memory after that.
-
-The call to `complete()` is more important here than it is for `stream_from`.
-It's a lot like a "commit" or "abort" at the end of a transaction.  If you omit
-it, it will be done automatically during the stream's destructor.  But since
-destructors can't throw exceptions, any failures at that stage won't be visible
-in your code.  So, always call `complete()` on a `stream_to` to close it off
-properly!
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/thread-safety.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/thread-safety.md
deleted file mode 100644
index 07c7f9984..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/amd64/share/doc/libpqxx/thread-safety.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Thread safety                    {#thread-safety}
-=============
-
-This library does not contain any locking code to protect objects against
-simultaneous modification in multi-threaded programs.  Therefore it is up
-to you, the user of the library, to ensure that your threaded client
-programs perform no conflicting operations concurrently.
-
-Most of the time this isn't hard.  Result sets are immutable, so you can
-share them between threads without problem.  The main rule is:
-
-@li Treat a connection, together with any and all objects related to it, as
-a "world" of its own.  You should generally make sure that the same "world"
-is never accessed by another thread while you're doing anything non-const
-in there.
-
-That means: don't issue a query on a transaction while you're also opening
-a subtransaction, don't access a cursor while you may also be committing,
-and so on.
-
-In particular, cursors are tricky.  It's easy to perform a non-const
-operation without noticing.  So, if you're going to share cursors or
-cursor-related objects between threads, lock very conservatively!
-
-Use `pqxx::describe_thread_safety` to find out at runtime what level of
-thread safety is implemented in your build and version of libpqxx.  It
-returns a `pqxx::thread_safety_model` describing what you can and cannot rely
-on.  A command-line utility `tools/pqxxthreadsafety` prints out the same
-information.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/array b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/array
deleted file mode 100644
index 689f5b27b..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/array
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Handling of SQL arrays.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/array.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/array.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/array.hxx
deleted file mode 100644
index 8440a244f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/array.hxx
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Handling of SQL arrays.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/field instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ARRAY
-#define PQXX_H_ARRAY
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <stdexcept>
-#include <string>
-#include <utility>
-
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/internal/encodings.hxx"
-
-
-namespace pqxx
-{
-/// Low-level array parser.
-/** Use this to read an array field retrieved from the database.
- *
- * This parser will only work reliably if your client encoding is UTF-8, ASCII,
- * or a single-byte encoding which is a superset of ASCII (such as Latin-1).
- *
- * Also, the parser only supports array element types which use either a comma
- * or a semicolon ("," or ";") as the separator between array elements.  All
- * built-in types use comma, except for one which uses semicolon, but some
- * custom types may not work.
- *
- * The input is a C-style string containing the textual representation of an
- * array, as returned by the database.  The parser reads this representation
- * on the fly.  The string must remain in memory until parsing is done.
- *
- * Parse the array by making calls to @ref get_next until it returns a
- * @ref juncture of "done".  The @ref juncture tells you what the parser found
- * in that step: did the array "nest" to a deeper level, or "un-nest" back up?
- */
-class PQXX_LIBEXPORT array_parser
-{
-public:
-  /// What's the latest thing found in the array?
-  enum class juncture
-  {
-    /// Starting a new row.
-    row_start,
-    /// Ending the current row.
-    row_end,
-    /// Found a NULL value.
-    null_value,
-    /// Found a string value.
-    string_value,
-    /// Parsing has completed.
-    done,
-  };
-
-  // TODO: constexpr noexcept.  Breaks ABI.
-  /// Constructor.  You don't need this; use @ref field::as_array instead.
-  /** The parser only remains valid while the data underlying the @ref result
-   * remains valid.  Once all `result` objects referring to that data have been
-   * destroyed, the parser will no longer refer to valid memory.
-   */
-  explicit array_parser(
-    std::string_view input,
-    internal::encoding_group = internal::encoding_group::MONOBYTE);
-
-  /// Parse the next step in the array.
-  /** Returns what it found.  If the juncture is @ref juncture::string_value,
-   * the string will contain the value.  Otherwise, it will be empty.
-   *
-   * Call this until the @ref array_parser::juncture it returns is
-   * @ref juncture::done.
-   */
-  std::pair<juncture, std::string> get_next();
-
-private:
-  std::string_view m_input;
-  internal::glyph_scanner_func *const m_scan;
-
-  /// Current parsing position in the input.
-  std::string::size_type m_pos = 0u;
-
-  std::string::size_type scan_single_quoted_string() const;
-  std::string parse_single_quoted_string(std::string::size_type end) const;
-  std::string::size_type scan_double_quoted_string() const;
-  std::string parse_double_quoted_string(std::string::size_type end) const;
-  std::string::size_type scan_unquoted_string() const;
-  std::string parse_unquoted_string(std::string::size_type end) const;
-
-  std::string::size_type scan_glyph(std::string::size_type pos) const;
-  std::string::size_type
-  scan_glyph(std::string::size_type pos, std::string::size_type end) const;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/binarystring b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/binarystring
deleted file mode 100644
index 77551d9f7..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/binarystring
+++ /dev/null
@@ -1,6 +0,0 @@
-/** BYTEA (binary string) conversions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/binarystring.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/binarystring.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/binarystring.hxx
deleted file mode 100644
index 47c82a035..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/binarystring.hxx
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Deprecated representation for raw, binary data.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/binarystring instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_BINARYSTRING
-#define PQXX_H_BINARYSTRING
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <memory>
-#include <string>
-#include <string_view>
-
-#include "pqxx/result.hxx"
-#include "pqxx/strconv.hxx"
-
-namespace pqxx
-{
-class binarystring;
-template<> struct string_traits<binarystring>;
-
-
-/// Binary data corresponding to PostgreSQL's "BYTEA" binary-string type.
-/** @ingroup escaping-functions
- * @deprecated Use @c std::basic_string<std::byte> and
- * @c std::basic_string_view<std::byte> for binary data.  In C++20 or better,
- * any @c contiguous_range of @c std::byte will do.
- *
- * This class represents a binary string as stored in a field of type @c bytea.
- *
- * Internally a binarystring is zero-terminated, but it may also contain null
- * bytes, they're just like any other byte value.  So don't assume that it's
- * safe to treat the contents as a C-style string.
- *
- * The binarystring retains its value even if the result it was obtained from
- * is destroyed, but it cannot be copied or assigned.
- *
- * \relatesalso transaction_base::quote_raw
- *
- * To include a @c binarystring value in an SQL query, escape and quote it
- * using the transaction's @c quote_raw function.
- *
- * @warning This class is implemented as a reference-counting smart pointer.
- * Copying, swapping, and destroying binarystring objects that refer to the
- * same underlying data block is <em>not thread-safe</em>.  If you wish to pass
- * binarystrings around between threads, make sure that each of these
- * operations is protected against concurrency with similar operations on the
- * same object, or other objects pointing to the same data block.
- */
-class PQXX_LIBEXPORT binarystring
-{
-public:
-  using char_type = unsigned char;
-  using value_type = std::char_traits<char_type>::char_type;
-  using size_type = std::size_t;
-  using difference_type = long;
-  using const_reference = value_type const &;
-  using const_pointer = value_type const *;
-  using const_iterator = const_pointer;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    binarystring const &) = default;
-
-  /// Read and unescape bytea field.
-  /** The field will be zero-terminated, even if the original bytea field
-   * isn't.
-   * @param F the field to read; must be a bytea field
-   */
-  [[deprecated("Use std::byte for binary data.")]] explicit binarystring(
-    field const &);
-
-  /// Copy binary data from std::string_view on binary data.
-  /** This is inefficient in that it copies the data to a buffer allocated on
-   * the heap.
-   */
-  [[deprecated("Use std::byte for binary data.")]] explicit binarystring(
-    std::string_view);
-
-  /// Copy binary data of given length straight out of memory.
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    void const *, std::size_t);
-
-  /// Efficiently wrap a buffer of binary data in a @c binarystring.
-  [[deprecated("Use std::byte for binary data.")]] binarystring(
-    std::shared_ptr<value_type> ptr, size_type size) :
-          m_buf{std::move(ptr)}, m_size{size}
-  {}
-
-  /// Size of converted string in bytes.
-  [[nodiscard]] size_type size() const noexcept { return m_size; }
-  /// Size of converted string in bytes.
-  [[nodiscard]] size_type length() const noexcept { return size(); }
-  [[nodiscard]] bool empty() const noexcept { return size() == 0; }
-
-  [[nodiscard]] const_iterator begin() const noexcept { return data(); }
-  [[nodiscard]] const_iterator cbegin() const noexcept { return begin(); }
-  [[nodiscard]] const_iterator end() const noexcept { return data() + m_size; }
-  [[nodiscard]] const_iterator cend() const noexcept { return end(); }
-
-  [[nodiscard]] const_reference front() const noexcept { return *begin(); }
-  [[nodiscard]] const_reference back() const noexcept
-  {
-    return *(data() + m_size - 1);
-  }
-
-  [[nodiscard]] const_reverse_iterator rbegin() const
-  {
-    return const_reverse_iterator{end()};
-  }
-  [[nodiscard]] const_reverse_iterator crbegin() const { return rbegin(); }
-  [[nodiscard]] const_reverse_iterator rend() const
-  {
-    return const_reverse_iterator{begin()};
-  }
-  [[nodiscard]] const_reverse_iterator crend() const { return rend(); }
-
-  /// Unescaped field contents.
-  [[nodiscard]] value_type const *data() const noexcept { return m_buf.get(); }
-
-  [[nodiscard]] const_reference operator[](size_type i) const noexcept
-  {
-    return data()[i];
-  }
-
-  [[nodiscard]] PQXX_PURE bool operator==(binarystring const &) const noexcept;
-  [[nodiscard]] bool operator!=(binarystring const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-
-  binarystring &operator=(binarystring const &);
-
-  /// Index contained string, checking for valid index.
-  const_reference at(size_type) const;
-
-  /// Swap contents with other binarystring.
-  void swap(binarystring &);
-
-  /// Raw character buffer (no terminating zero is added).
-  /** @warning No terminating zero is added!  If the binary data did not end in
-   * a null character, you will not find one here.
-   */
-  [[nodiscard]] char const *get() const noexcept
-  {
-    return reinterpret_cast<char const *>(m_buf.get());
-  }
-
-  /// Read contents as a std::string_view.
-  [[nodiscard]] std::string_view view() const noexcept
-  {
-    return std::string_view(get(), size());
-  }
-
-  /// Read as regular C++ string (may include null characters).
-  /** This creates and returns a new string object.  Don't call this
-   * repeatedly; retrieve your string once and keep it in a local variable.
-   * Also, do not expect to be able to compare the string's address to that of
-   * an earlier invocation.
-   */
-  [[nodiscard]] std::string str() const;
-
-  /// Access data as a pointer to @c std::byte.
-  [[nodiscard]] std::byte const *bytes() const
-  {
-    return reinterpret_cast<std::byte const *>(get());
-  }
-
-  /// Read data as a @c std::basic_string_view<std::byte>.
-  [[nodiscard]] std::basic_string_view<std::byte> bytes_view() const
-  {
-    return std::basic_string_view<std::byte>{bytes(), size()};
-  }
-
-private:
-  std::shared_ptr<value_type> m_buf;
-  size_type m_size{0};
-};
-
-
-template<> struct nullness<binarystring> : no_null<binarystring>
-{};
-
-
-/// String conversion traits for @c binarystring.
-/** Defines the conversions between a @c binarystring and its PostgreSQL
- * textual format, for communication with the database.
- *
- * These conversions rely on the "hex" format which was introduced in
- * PostgreSQL 9.0.  Both your libpq and the server must be recent enough to
- * speak this format.
- */
-template<> struct string_traits<binarystring>
-{
-  static std::size_t size_buffer(binarystring const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(char *begin, char *end, binarystring const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, binarystring const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    std::string_view text{value.view()};
-    internal::esc_bin(binary_cast(text), begin);
-    return begin + budget;
-  }
-
-  static binarystring from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::shared_ptr<unsigned char> buf{
-      new unsigned char[size], [](unsigned char const *x) { delete[] x; }};
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.get()));
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return binarystring{std::move(buf), size};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/blob b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/blob
deleted file mode 100644
index 3fd0afac9..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/blob
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Binary Large Objects interface.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/blob.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/blob.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/blob.hxx
deleted file mode 100644
index 6d77be724..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/blob.hxx
+++ /dev/null
@@ -1,351 +0,0 @@
-/* Binary Large Objects interface.
- *
- * Read or write large objects, stored in their own storage on the server.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/largeobject instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_BLOB
-#define PQXX_H_BLOB
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstdint>
-
-#if defined(PQXX_HAVE_PATH)
-#  include <filesystem>
-#endif
-
-#if defined(PQXX_HAVE_RANGES) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#if defined(PQXX_HAVE_SPAN) && __has_include(<span>)
-#  include <span>
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-
-namespace pqxx
-{
-/** Binary large object.
- *
- * This is how you store data that may be too large for the `BYTEA` type.
- * Access operations are similar to those for a file: you can read, write,
- * query or set the current reading/writing position, and so on.
- *
- * These large objects live in their own storage on the server, indexed by an
- * integer object identifier ("oid").
- *
- * Two `blob` objects may refer to the same actual large object in the
- * database at the same time.  Each will have its own reading/writing position,
- * but writes to the one will of course affect what the other sees.
- */
-class PQXX_LIBEXPORT blob
-{
-public:
-  /// Create a new, empty large object.
-  /** You may optionally specify an oid for the new blob.  If you do, then
-   * the new object will have that oid -- or creation will fail if there
-   * already is an object with that oid.
-   */
-  [[nodiscard]] static oid create(dbtransaction &, oid = 0);
-
-  /// Delete a large object, or fail if it does not exist.
-  static void remove(dbtransaction &, oid);
-
-  /// Open blob for reading.  Any attempt to write to it will fail.
-  [[nodiscard]] static blob open_r(dbtransaction &, oid);
-  // Open blob for writing.  Any attempt to read from it will fail.
-  [[nodiscard]] static blob open_w(dbtransaction &, oid);
-  // Open blob for reading and/or writing.
-  [[nodiscard]] static blob open_rw(dbtransaction &, oid);
-
-  /// You can default-construct a blob, but it won't do anything useful.
-  /** Most operations on a default-constructed blob will throw @ref
-   * usage_error.
-   */
-  blob() = default;
-
-  /// You can move a blob, but not copy it.  The original becomes unusable.
-  blob(blob &&);
-  /// You can move a blob, but not copy it.  The original becomes unusable.
-  blob &operator=(blob &&);
-
-  blob(blob const &) = delete;
-  blob &operator=(blob const &) = delete;
-  ~blob();
-
-  /// Maximum number of bytes that can be read or written at a time.
-  /** The underlying protocol only supports reads and writes up to 2 GB
-   * exclusive.
-   *
-   * If you need to read or write more data to or from a binary large object,
-   * you'll have to break it up into chunks.
-   */
-  static constexpr std::size_t chunk_limit = 0x7fffffff;
-
-  /// Read up to `size` bytes of the object into `buf`.
-  /** Uses a buffer that you provide, resizing it as needed.  If it suits you,
-   * this lets you allocate the buffer once and then re-use it multiple times.
-   *
-   * Resizes `buf` as needed.
-   *
-   * @warning The underlying protocol only supports reads up to 2GB at a time.
-   * If you need to read more, try making repeated calls to @ref append_to_buf.
-   */
-  std::size_t read(std::basic_string<std::byte> &buf, std::size_t size);
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** Retrieves bytes from the blob, at the current position, until `buf` is
-   * full or there are no more bytes to read, whichever comes first.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<std::size_t extent = std::dynamic_extent>
-  std::span<std::byte> read(std::span<std::byte, extent> buf)
-  {
-    return buf.subspan(0, raw_read(std::data(buf), std::size(buf)));
-  }
-#endif // PQXX_HAVE_SPAN
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** Retrieves bytes from the blob, at the current position, until `buf` is
-   * full or there are no more bytes to read, whichever comes first.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<binary DATA> std::span<std::byte> read(DATA &buf)
-  {
-    return {std::data(buf), raw_read(std::data(buf), std::size(buf))};
-  }
-#else  // PQXX_HAVE_CONCEPTS && PQXX_HAVE_SPAN
-  /// Read up to `std::size(buf)` bytes from the object.
-  /** @deprecated As libpqxx moves to C++20 as its baseline language version,
-   * this will take and return `std::span<std::byte>`.
-   *
-   * Retrieves bytes from the blob, at the current position, until `buf` is
-   * full (i.e. its current size is reached), or there are no more bytes to
-   * read, whichever comes first.
-   *
-   * This function will not change either the size or the capacity of `buf`,
-   * only its contents.
-   *
-   * Returns the filled portion of `buf`.  This may be empty.
-   */
-  template<typename ALLOC>
-  std::basic_string_view<std::byte> read(std::vector<std::byte, ALLOC> &buf)
-  {
-    return {std::data(buf), raw_read(std::data(buf), std::size(buf))};
-  }
-#endif // PQXX_HAVE_CONCEPTS && PQXX_HAVE_SPAN
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Write `data` to large object, at the current position.
-  /** If the writing position is at the end of the object, this will append
-   * `data` to the object's contents and move the writing position so that
-   * it's still at the end.
-   *
-   * If the writing position was not at the end, writing will overwrite the
-   * prior data, but it will not remove data that follows the part where you
-   * wrote your new data.
-   *
-   * @warning This is a big difference from writing to a file.  You can
-   * overwrite some data in a large object, but this does not truncate the
-   * data that was already there.  For example, if the object contained binary
-   * data "abc", and you write "12" at the starting position, the object will
-   * contain "12c".
-   *
-   * @warning The underlying protocol only supports writes up to 2 GB at a
-   * time.  If you need to write more, try making repeated calls to
-   * @ref append_from_buf.
-   */
-  template<binary DATA> void write(DATA const &data)
-  {
-    raw_write(std::data(data), std::size(data));
-  }
-#else
-  /// Write `data` large object, at the current position.
-  /** If the writing position is at the end of the object, this will append
-   * `data` to the object's contents and move the writing position so that
-   * it's still at the end.
-   *
-   * If the writing position was not at the end, writing will overwrite the
-   * prior data, but it will not remove data that follows the part where you
-   * wrote your new data.
-   *
-   * @warning This is a big difference from writing to a file.  You can
-   * overwrite some data in a large object, but this does not truncate the
-   * data that was already there.  For example, if the object contained binary
-   * data "abc", and you write "12" at the starting position, the object will
-   * contain "12c".
-   *
-   * @warning The underlying protocol only supports writes up to 2 GB at a
-   * time.  If you need to write more, try making repeated calls to
-   * @ref append_from_buf.
-   */
-  template<typename DATA> void write(DATA const &data)
-  {
-    raw_write(std::data(data), std::size(data));
-  }
-#endif
-
-  /// Resize large object to `size` bytes.
-  /** If the blob is more than `size` bytes long, this removes the end so as
-   * to make the blob the desired length.
-   *
-   * If the blob is less than `size` bytes long, it adds enough zero bytes to
-   * make it the desired length.
-   */
-  void resize(std::int64_t size);
-
-  /// Return the current reading/writing position in the large object.
-  [[nodiscard]] std::int64_t tell() const;
-
-  /// Set the current reading/writing position to an absolute offset.
-  /** Returns the new file offset. */
-  std::int64_t seek_abs(std::int64_t offset = 0);
-  /// Move the current reading/writing position forwards by an offset.
-  /** To move backwards, pass a negative offset.
-   *
-   * Returns the new file offset.
-   */
-  std::int64_t seek_rel(std::int64_t offset = 0);
-  /// Set the current position to an offset relative to the end of the blob.
-  /** You'll probably want an offset of zero or less.
-   *
-   * Returns the new file offset.
-   */
-  std::int64_t seek_end(std::int64_t offset = 0);
-
-  /// Create a binary large object containing given `data`.
-  /** You may optionally specify an oid for the new object.  If you do, and an
-   * object with that oid already exists, creation will fail.
-   */
-  static oid from_buf(
-    dbtransaction &tx, std::basic_string_view<std::byte> data, oid id = 0);
-
-  /// Append `data` to binary large object.
-  /** The underlying protocol only supports appending blocks up to 2 GB.
-   */
-  static void append_from_buf(
-    dbtransaction &tx, std::basic_string_view<std::byte> data, oid id);
-
-  /// Read client-side file and store it server-side as a binary large object.
-  [[nodiscard]] static oid from_file(dbtransaction &, char const path[]);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Read client-side file and store it server-side as a binary large object.
-  /** This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  [[nodiscard]] static oid
-  from_file(dbtransaction &tx, std::filesystem::path const &path)
-  {
-    return from_file(tx, path.c_str());
-  }
-#endif
-
-  /// Read client-side file and store it server-side as a binary large object.
-  /** In this version, you specify the binary large object's oid.  If that oid
-   * is already in use, the operation will fail.
-   */
-  static oid from_file(dbtransaction &, char const path[], oid);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Read client-side file and store it server-side as a binary large object.
-  /** In this version, you specify the binary large object's oid.  If that oid
-   * is already in use, the operation will fail.
-   *
-   * This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  static oid
-  from_file(dbtransaction &tx, std::filesystem::path const &path, oid id)
-  {
-    return from_file(tx, path.c_str(), id);
-  }
-#endif
-
-  /// Convenience function: Read up to `max_size` bytes from blob with `id`.
-  /** You could easily do this yourself using the @ref open_r and @ref read
-   * functions, but it can save you a bit of code to do it this way.
-   */
-  static void to_buf(
-    dbtransaction &, oid, std::basic_string<std::byte> &,
-    std::size_t max_size);
-
-  /// Read part of the binary large object with `id`, and append it to `buf`.
-  /** Use this to break up a large read from one binary large object into one
-   * massive buffer.  Just keep calling this function until it returns zero.
-   *
-   * The `offset` is how far into the large object your desired chunk is, and
-   * `append_max` says how much to try and read in one go.
-   */
-  static std::size_t append_to_buf(
-    dbtransaction &tx, oid id, std::int64_t offset,
-    std::basic_string<std::byte> &buf, std::size_t append_max);
-
-  /// Write a binary large object's contents to a client-side file.
-  static void to_file(dbtransaction &, oid, char const path[]);
-
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  /// Write a binary large object's contents to a client-side file.
-  /** This overload is not available on Windows, where `std::filesystem::path`
-   * converts to a `wchar_t` string rather than a `char` string.
-   */
-  static void
-  to_file(dbtransaction &tx, oid id, std::filesystem::path const &path)
-  {
-    to_file(tx, id, path.c_str());
-  }
-#endif
-
-  /// Close this blob.
-  /** This does not delete the blob from the database; it only terminates your
-   * local object for accessing the blob.
-   *
-   * Resets the blob to a useless state similar to one that was
-   * default-constructed.
-   *
-   * The destructor will do this for you automatically.  Still, there is a
-   * reason to `close()` objects explicitly where possible: if an error should
-   * occur while closing, `close()` can throw an exception.  A destructor
-   * cannot.
-   */
-  void close();
-
-private:
-  PQXX_PRIVATE blob(connection &conn, int fd) noexcept :
-          m_conn{&conn}, m_fd{fd}
-  {}
-  static PQXX_PRIVATE blob open_internal(dbtransaction &, oid, int);
-  static PQXX_PRIVATE pqxx::internal::pq::PGconn *
-  raw_conn(pqxx::connection *) noexcept;
-  static PQXX_PRIVATE pqxx::internal::pq::PGconn *
-  raw_conn(pqxx::dbtransaction const &) noexcept;
-  static PQXX_PRIVATE std::string errmsg(connection const *);
-  static PQXX_PRIVATE std::string errmsg(dbtransaction const &tx)
-  {
-    return errmsg(&tx.conn());
-  }
-  PQXX_PRIVATE std::string errmsg() const { return errmsg(m_conn); }
-  PQXX_PRIVATE std::int64_t seek(std::int64_t offset, int whence);
-  std::size_t raw_read(std::byte buf[], std::size_t size);
-  void raw_write(std::byte const buf[], std::size_t size);
-
-  connection *m_conn = nullptr;
-  int m_fd = -1;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/composite b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/composite
deleted file mode 100644
index 2bfa7ade9..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/composite
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Handling of SQL "composite types."
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/composite.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/composite.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/composite.hxx
deleted file mode 100644
index 439b133a8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/composite.hxx
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef PQXX_H_COMPOSITE
-#define PQXX_H_COMPOSITE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/internal/array-composite.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Parse a string representation of a value of a composite type.
-/** @warning This code is still experimental.  Use with care.
- *
- * You may use this as a helper while implementing your own @ref string_traits
- * for a composite type.
- *
- * This function interprets `text` as the string representation of a value of
- * some composite type, and sets each of `fields` to the respective values of
- * its fields.  The field types must be copy-assignable.
- *
- * The number of fields must match the number of fields in the composite type,
- * and there must not be any other text in the input.  The function is meant to
- * handle any value string that the backend can produce, but not necessarily
- * every valid alternative spelling.
- *
- * Fields in composite types can be null.  When this happens, the C++ type of
- * the corresponding field reference must be of a type that can handle nulls.
- * If you are working with a type that does not have an inherent null value,
- * such as e.g. `int`, consider using `std::optional`.
- */
-template<typename... T>
-inline void parse_composite(
-  pqxx::internal::encoding_group enc, std::string_view text, T &...fields)
-{
-  static_assert(sizeof...(fields) > 0);
-
-  auto const scan{pqxx::internal::get_glyph_scanner(enc)};
-  auto const data{std::data(text)};
-  auto const size{std::size(text)};
-  if (size == 0)
-    throw conversion_error{"Cannot parse composite value from empty string."};
-
-  std::size_t here{0}, next{scan(data, size, here)};
-  if (next != 1 or data[here] != '(')
-    throw conversion_error{
-      internal::concat("Invalid composite value string: ", text)};
-
-  here = next;
-
-  constexpr auto num_fields{sizeof...(fields)};
-  std::size_t index{0};
-  (pqxx::internal::parse_composite_field(
-     index, text, here, fields, scan, num_fields - 1),
-   ...);
-  if (here != std::size(text))
-    throw conversion_error{internal::concat(
-      "Composite value did not end at the closing parenthesis: '", text,
-      "'.")};
-  if (text[here - 1] != ')')
-    throw conversion_error{internal::concat(
-      "Composive value did not end in parenthesis: '", text, "'")};
-}
-
-
-/// Parse a string representation of a value of a composite type.
-/** @warning This version only works for UTF-8 and single-byte encodings.
- *
- * For proper encoding support, use the composite-type support in the
- * `field` class.
- */
-template<typename... T>
-inline void parse_composite(std::string_view text, T &...fields)
-{
-  parse_composite(pqxx::internal::encoding_group::MONOBYTE, text, fields...);
-}
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-constexpr char empty_composite_str[]{"()"};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// Estimate the buffer size needed to represent a value of a composite type.
-/** Returns a conservative estimate.
- */
-template<typename... T>
-[[nodiscard]] inline std::size_t
-composite_size_buffer(T const &...fields) noexcept
-{
-  constexpr auto num{sizeof...(fields)};
-
-  // Size for a multi-field composite includes room for...
-  //  + opening parenthesis
-  //  + field budgets
-  //  + separating comma per field
-  //  - comma after final field
-  //  + closing parenthesis
-  //  + terminating zero
-
-  if constexpr (num == 0)
-    return std::size(pqxx::internal::empty_composite_str);
-  else
-    return 1 + (pqxx::internal::size_composite_field_buffer(fields) + ...) +
-           num + 1;
-}
-
-
-/// Render a series of values as a single composite SQL value.
-/** @warning This code is still experimental.  Use with care.
- *
- * You may use this as a helper while implementing your own `string_traits`
- * for a composite type.
- */
-template<typename... T>
-inline char *composite_into_buf(char *begin, char *end, T const &...fields)
-{
-  if (std::size_t(end - begin) < composite_size_buffer(fields...))
-    throw conversion_error{
-      "Buffer space may not be enough to represent composite value."};
-
-  constexpr auto num_fields{sizeof...(fields)};
-  if constexpr (num_fields == 0)
-  {
-    constexpr char empty[]{"()"};
-    std::memcpy(begin, empty, std::size(empty));
-    return begin + std::size(empty);
-  }
-
-  char *pos{begin};
-  *pos++ = '(';
-
-  (pqxx::internal::write_composite_field<T>(pos, end, fields), ...);
-
-  // If we've got multiple fields, "backspace" that last comma.
-  if constexpr (num_fields > 1)
-    --pos;
-  *pos++ = ')';
-  *pos++ = '\0';
-  return pos;
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/config-public-compiler.h b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/config-public-compiler.h
deleted file mode 100644
index 3668a10f8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/config-public-compiler.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* include/pqxx/config.h.in.  Generated from configure.ac by autoheader.  */
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-/* Define to 1 if you have the `pq' library (-lpq). */
-/* #undef HAVE_LIBPQ */
-/* Define to 1 if you have the <memory.h> header file. */
-/* #undef HAVE_MEMORY_H */
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
-/* Define to 1 if you have the <stdlib.h> header file. */
-/* #undef HAVE_STDLIB_H */
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-/* Define to 1 if you have the <string.h> header file. */
-/* #undef HAVE_STRING_H */
-/* Define to 1 if you have the <sys/stat.h> header file. */
-/* #undef HAVE_SYS_STAT_H */
-/* Define to 1 if you have the <sys/types.h> header file. */
-/* #undef HAVE_SYS_TYPES_H */
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-/* #undef LT_OBJDIR */
-/* Name of package */
-/* #undef PACKAGE */
-/* Define to the address where bug reports for this package should be sent. */
-/* #undef PACKAGE_BUGREPORT */
-/* Define to the full name of this package. */
-/* #undef PACKAGE_NAME */
-/* Define to the full name and version of this package. */
-/* #undef PACKAGE_STRING */
-/* Define to the one symbol short name of this package. */
-/* #undef PACKAGE_TARNAME */
-/* Define to the home page for this package. */
-/* #undef PACKAGE_URL */
-/* Define to the version of this package. */
-/* #undef PACKAGE_VERSION */
-/* Define if <charconv> supports floating-point conversion. */
-#define PQXX_HAVE_CHARCONV_FLOAT
-/* Define if <charconv> supports integer conversion. */
-#define PQXX_HAVE_CHARCONV_INT
-/* Define if compiler has C++20 std::cmp_greater etc. */
-/* #undef PQXX_HAVE_CMP */
-/* Define if compiler supports Concepts and <ranges> header. */
-/* #undef PQXX_HAVE_CONCEPTS */
-/* Define if compiler supports __cxa_demangle */
-#define PQXX_HAVE_CXA_DEMANGLE
-/* Define if g++ supports pure attribute */
-#define PQXX_HAVE_GCC_PURE
-/* Define if g++ supports visibility attribute. */
-#define PQXX_HAVE_GCC_VISIBILITY
-/* Define if likely & unlikely work. */
-/* #undef PQXX_HAVE_LIKELY */
-/* Define if operator[] can take multiple arguments. */
-/* #undef PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT */
-/* Define if compiler has usable std::filesystem::path. */
-#define PQXX_HAVE_PATH
-/* Define if poll() is available. */
-#define PQXX_HAVE_POLL
-/* Define if libpq has PQencryptPasswordConn (since pg 10). */
-#define PQXX_HAVE_PQENCRYPTPASSWORDCONN
-/* Define if libpq has pipeline mode (since pg 14). */
-#define PQXX_HAVE_PQ_PIPELINE
-/* Define if std::this_thread::sleep_for works. */
-#define PQXX_HAVE_SLEEP_FOR
-/* Define if compiler has std::span. */
-/* #undef PQXX_HAVE_SPAN */
-/* Define if strerror_r() is available. */
-#define PQXX_HAVE_STRERROR_R
-/* Define if strerror_s() is available. */
-/* #undef PQXX_HAVE_STRERROR_S */
-/* Define if thread_local is fully supported. */
-#define PQXX_HAVE_THREAD_LOCAL
-/* Define if std::chrono has year_month_day etc. */
-/* #undef PQXX_HAVE_YEAR_MONTH_DAY */
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-/* Version number of package */
-/* #undef VERSION */
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/connection b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/connection
deleted file mode 100644
index 82ff43aa5..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/connection
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::connection class.
- *
- * pqxx::connection encapsulates a connection to a database.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/connection.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/connection.hxx
deleted file mode 100644
index 92454bb47..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/connection.hxx
+++ /dev/null
@@ -1,1261 +0,0 @@
-/* Definition of the connection class.
- *
- * pqxx::connection encapsulates a connection to a database.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/connection instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_CONNECTION
-#define PQXX_H_CONNECTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstddef>
-#include <ctime>
-#include <functional>
-#include <initializer_list>
-#include <list>
-#include <map>
-#include <memory>
-#include <string_view>
-#include <tuple>
-#include <utility>
-
-// Double-check in order to suppress an overzealous Visual C++ warning (#418).
-#if defined(PQXX_HAVE_CONCEPTS) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-
-/**
- * @addtogroup connections
- *
- * Use of the libpqxx library starts here.
- *
- * Everything that can be done with a database through libpqxx must go through
- * a @ref pqxx::connection object.  It connects to a database when you create
- * it, and it terminates that communication during destruction.
- *
- * Many things come together in this class.  Handling of error and warning
- * messages, for example, is defined by @ref pqxx::errorhandler objects in the
- * context of a connection.  Prepared statements are also defined here.
- *
- * When you connect to a database, you pass a connection string containing any
- * parameters and options, such as the server address and the database name.
- *
- * These are identical to the ones in libpq, the C language binding upon which
- * libpqxx itself is built:
- *
- * https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
- *
- * There are also environment variables you can set to provide defaults, again
- * as defined by libpq:
- *
- * https://www.postgresql.org/docs/current/libpq-envars.html
- *
- * You can also create a database connection _asynchronously_ using an
- * intermediate @ref pqxx::connecting object.
- */
-
-namespace pqxx::internal
-{
-class sql_cursor;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: T is a range of pairs of zero-terminated strings.
-template<typename T>
-concept ZKey_ZValues = std::ranges::input_range<T> and requires(T t)
-{
-  {std::cbegin(t)};
-  {
-    std::get<0>(*std::cbegin(t))
-    } -> ZString;
-  {
-    std::get<1>(*std::cbegin(t))
-    } -> ZString;
-} and std::tuple_size_v<typename std::ranges::iterator_t<T>::value_type>
-== 2;
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx::internal
-
-
-namespace pqxx::internal::gate
-{
-class connection_dbtransaction;
-class connection_errorhandler;
-class connection_largeobject;
-class connection_notification_receiver;
-class connection_pipeline;
-class connection_sql_cursor;
-class connection_stream_from;
-class connection_stream_to;
-class connection_transaction;
-class const_connection_largeobject;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Representation of a PostgreSQL table path.
-/** A "table path" consists of a table name, optionally prefixed by a schema
- * name, which in turn is optionally prefixed by a database name.
- *
- * A minimal example of a table path would be `{mytable}`.  But a table path
- * may also take the forms `{myschema,mytable}` or
- * `{mydb,myschema,mytable}`.
- */
-using table_path = std::initializer_list<std::string_view>;
-
-
-/// Encrypt a password.  @deprecated Use connection::encrypt_password instead.
-[[nodiscard,
-  deprecated("Use connection::encrypt_password instead.")]] std::string
-  PQXX_LIBEXPORT
-  encrypt_password(char const user[], char const password[]);
-
-/// Encrypt password.  @deprecated Use connection::encrypt_password instead.
-[[nodiscard,
-  deprecated("Use connection::encrypt_password instead.")]] inline std::string
-encrypt_password(zview user, zview password)
-{
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return encrypt_password(user.c_str(), password.c_str());
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-/// Error verbosity levels.
-enum class error_verbosity : int
-{
-  // These values must match those in libpq's PGVerbosity enum.
-  terse = 0,
-  normal = 1,
-  verbose = 2
-};
-
-
-/// Connection to a database.
-/** This is the first class to look at when you wish to work with a database
- * through libpqxx.  The connection opens during construction, and closes upon
- * destruction.
- *
- * When creating a connection, you can pass a connection URI or a postgres
- * connection string, to specify the database server's address, a login
- * username, and so on.  If you don't, the connection will try to obtain them
- * from certain environment variables.  If those are not set either, the
- * default is to try and connect to the local system's port 5432.
- *
- * Find more about connection strings here:
- *
- * https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
- *
- * The variables are documented here:
- *
- * https://www.postgresql.org/docs/current/libpq-envars.html
- *
- * To query or manipulate the database once connected, use one of the
- * transaction classes (see pqxx/transaction_base.hxx) and perhaps also the
- * transactor framework (see pqxx/transactor.hxx).
- *
- * When a connection breaks, you will typically get a @ref broken_connection
- * exception.  This can happen at almost any point.
- *
- * @warning On Unix-like systems, including GNU and BSD systems, your program
- * may receive the SIGPIPE signal when the connection to the backend breaks. By
- * default this signal will abort your program.  Use "signal(SIGPIPE, SIG_IGN)"
- * if you want your program to continue running after a connection fails.
- */
-class PQXX_LIBEXPORT connection
-{
-public:
-  connection() : connection{""} {}
-
-  /// Connect to a database, using `options` string.
-  explicit connection(char const options[])
-  {
-    check_version();
-    init(options);
-  }
-
-  /// Connect to a database, using `options` string.
-  explicit connection(zview options) : connection{options.c_str()}
-  {
-    // (Delegates to other constructor which calls check_version for us.)
-  }
-
-  /// Move constructor.
-  /** Moving a connection is not allowed if it has an open transaction, or has
-   * error handlers or notification receivers registered on it.  In those
-   * situations, other objects may hold references to the old object which
-   * would become invalid and might produce hard-to-diagnose bugs.
-   */
-  connection(connection &&rhs);
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Connect to a database, passing options as a range of key/value pairs.
-  /** @warning Experimental.  Requires C++20 "concepts" support.  Define
-   * `PQXX_HAVE_CONCEPTS` to enable it.
-   *
-   * There's no need to escape the parameter values.
-   *
-   * See the PostgreSQL libpq documentation for the full list of possible
-   * options:
-   *
-   * https://postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS
-   *
-   * The options can be anything that can be iterated as a series of pairs of
-   * zero-terminated strings: `std::pair<std::string, std::string>`, or
-   * `std::tuple<pqxx::zview, char const *>`, or
-   * `std::map<std::string, pqxx::zview>`, and so on.
-   */
-  template<internal::ZKey_ZValues MAPPING>
-  inline connection(MAPPING const &params);
-#endif // PQXX_HAVE_CONCEPTS
-
-  ~connection()
-  {
-    try
-    {
-      close();
-    }
-    catch (std::exception const &)
-    {}
-  }
-
-  /// Move assignment.
-  /** Neither connection can have an open transaction, registered error
-   * handlers, or registered notification receivers.
-   */
-  connection &operator=(connection &&rhs);
-
-  connection(connection const &) = delete;
-  connection &operator=(connection const &) = delete;
-
-  /// Is this connection open at the moment?
-  /** @warning This function is **not** needed in most code.  Resist the
-   * temptation to check it after opening a connection.  The `connection`
-   * constructor will throw a @ref broken_connection exception if can't connect
-   * to the database.
-   */
-  [[nodiscard]] bool PQXX_PURE is_open() const noexcept;
-
-  /// Invoke notice processor function.  The message should end in newline.
-  void process_notice(char const[]) noexcept;
-  /// Invoke notice processor function.  Newline at end is recommended.
-  /** The zview variant, with a message ending in newline, is the most
-   * efficient way to call process_notice.
-   */
-  void process_notice(zview) noexcept;
-
-  /// Enable tracing to a given output stream, or nullptr to disable.
-  void trace(std::FILE *) noexcept;
-
-  /**
-   * @name Connection properties
-   *
-   * These are probably not of great interest, since most are derived from
-   * information supplied by the client program itself, but they are included
-   * for completeness.
-   *
-   * The connection needs to be currently active for these to work.
-   */
-  //@{
-  /// Name of database we're connected to, if any.
-  [[nodiscard]] char const *dbname() const;
-
-  /// Database user ID we're connected under, if any.
-  [[nodiscard]] char const *username() const;
-
-  /// Address of server, or nullptr if none specified (i.e. default or local)
-  [[nodiscard]] char const *hostname() const;
-
-  /// Server port number we're connected to.
-  [[nodiscard]] char const *port() const;
-
-  /// Process ID for backend process, or 0 if inactive.
-  [[nodiscard]] int PQXX_PURE backendpid() const &noexcept;
-
-  /// Socket currently used for connection, or -1 for none.  Use with care!
-  /** Query the current socket number.  This is intended for event loops based
-   * on functions such as select() or poll(), where you're waiting for any of
-   * multiple file descriptors to become ready for communication.
-   *
-   * Please try to stay away from this function.  It is really only meant for
-   * event loops that need to wait on more than one file descriptor.  If all
-   * you need is to block until a notification arrives, for instance, use
-   * await_notification().  If you want to issue queries and retrieve results
-   * in nonblocking fashion, check out the pipeline class.
-   */
-  [[nodiscard]] int PQXX_PURE sock() const &noexcept;
-
-  /// What version of the PostgreSQL protocol is this connection using?
-  /** The answer can be 0 (when there is no connection); 3 for protocol 3.0; or
-   * possibly higher values as newer protocol versions come into use.
-   */
-  [[nodiscard]] int PQXX_PURE protocol_version() const noexcept;
-
-  /// What version of the PostgreSQL server are we connected to?
-  /** The result is a bit complicated: each of the major, medium, and minor
-   * release numbers is written as a two-digit decimal number, and the three
-   * are then concatenated.  Thus server version 9.4.2 will be returned as the
-   * decimal number 90402.  If there is no connection to the server, this
-   * returns zero.
-   *
-   * @warning When writing version numbers in your code, don't add zero at the
-   * beginning!  Numbers beginning with zero are interpreted as octal (base-8)
-   * in C++.  Thus, 070402 is not the same as 70402, and 080000 is not a number
-   * at all because there is no digit "8" in octal notation.  Use strictly
-   * decimal notation when it comes to these version numbers.
-   */
-  [[nodiscard]] int PQXX_PURE server_version() const noexcept;
-  //@}
-
-  /// @name Text encoding
-  /**
-   * Each connection is governed by a "client encoding," which dictates how
-   * strings and other text is represented in bytes.  The database server will
-   * send text data to you in this encoding, and you should use it for the
-   * queries and data which you send to the server.
-   *
-   * Search the PostgreSQL documentation for "character set encodings" to find
-   * out more about the available encodings, how to extend them, and how to use
-   * them.  Not all server-side encodings are compatible with all client-side
-   * encodings or vice versa.
-   *
-   * Encoding names are case-insensitive, so e.g. "UTF8" is equivalent to
-   * "utf8".
-   *
-   * You can change the client encoding, but this may not work when the
-   * connection is in a special state, such as when streaming a table.  It's
-   * not clear what happens if you change the encoding during a transaction,
-   * and then abort the transaction.
-   */
-  //@{
-  /// Get client-side character encoding, by name.
-  [[nodiscard]] std::string get_client_encoding() const;
-
-  /// Set client-side character encoding, by name.
-  /**
-   * @param encoding Name of the character set encoding to use.
-   */
-  void set_client_encoding(zview encoding) &
-  {
-    set_client_encoding(encoding.c_str());
-  }
-
-  /// Set client-side character encoding, by name.
-  /**
-   * @param encoding Name of the character set encoding to use.
-   */
-  void set_client_encoding(char const encoding[]) &;
-
-  /// Get the connection's encoding, as a PostgreSQL-defined code.
-  [[nodiscard]] int PQXX_PRIVATE encoding_id() const;
-
-  //@}
-
-  /// Set session variable, using SQL's `SET` command.
-  /** @deprecated To set a session variable, use @ref set_session_var.  To set
-   * a transaction-local variable, execute an SQL `SET` command.
-   *
-   * @warning When setting a string value, you must escape and quote it first.
-   * Use the @ref quote() function to do that.
-   *
-   * @warning This executes an SQL query, so do not get or set variables while
-   * a table stream or pipeline is active on the same connection.
-   *
-   * @param var Variable to set.
-   * @param value New value for Var.  This can be any SQL expression.  If it's
-   * a string, be sure that it's properly escaped and quoted.
-   */
-  [[deprecated("To set session variables, use set_session_var.")]] void
-  set_variable(std::string_view var, std::string_view value) &;
-
-  /// Set one of the session variables to a new value.
-  /** This executes SQL, so do not do it while a pipeline or stream is active
-   * on the connection.
-   *
-   * The value you set here will last for the rest of the connection's
-   * duration, or until you set a new value.
-   *
-   * If you set the value while in a @ref dbtransaction (i.e. any transaction
-   * that is not a @ref nontransaction), then rolling back the transaction will
-   * undo the change.
-   *
-   * All applies to setting _session_ variables.  You can also set the same
-   * variables as _local_ variables, in which case they will always revert to
-   * their previous value when the transaction ends (or when you overwrite them
-   * of course).  To set a local variable, simply execute an SQL statement
-   * along the lines of "`SET LOCAL var = 'value'`" inside your transaction.
-   *
-   * @param var The variable to set.
-   * @param value The new value for the variable.
-   * @throw @ref variable_set_to_null if the value is null; this is not
-   * allowed.
-   */
-  template<typename TYPE>
-  void set_session_var(std::string_view var, TYPE const &value) &
-  {
-    if constexpr (nullness<TYPE>::has_null)
-    {
-      if (nullness<TYPE>::is_null(value))
-        throw variable_set_to_null{
-          internal::concat("Attempted to set variable ", var, " to null.")};
-    }
-    exec(internal::concat("SET ", quote_name(var), "=", quote(value)));
-  }
-
-  /// Read session variable, using SQL's `SHOW` command.
-  /** @warning This executes an SQL query, so do not get or set variables while
-   * a table stream or pipeline is active on the same connection.
-   */
-  [[deprecated("Use get_var instead.")]] std::string
-    get_variable(std::string_view);
-
-  /// Read currently applicable value of a variable.
-  /** This function executes an SQL statement, so it won't work while a
-   * @ref pipeline or query stream is active on the connection.
-   *
-   * @return a blank `std::optional` if the variable's value is null, or its
-   * string value otherwise.
-   */
-  std::string get_var(std::string_view var);
-
-  /// Read currently applicable value of a variable.
-  /** This function executes an SQL statement, so it won't work while a
-   * @ref pipeline or query stream is active on the connection.
-   *
-   * If there is any possibility that the variable is null, ensure that `TYPE`
-   * can represent null values.
-   */
-  template<typename TYPE> TYPE get_var_as(std::string_view var)
-  {
-    return from_string<TYPE>(get_var(var));
-  }
-
-  /**
-   * @name Notifications and Receivers
-   */
-  //@{
-  /// Check for pending notifications and take appropriate action.
-  /** This does not block.  To wait for incoming notifications, either call
-   * await_notification() (it calls this function); or wait for incoming data
-   * on the connection's socket (i.e. wait to read), and then call this
-   * function repeatedly until it returns zero.  After that, there are no more
-   * pending notifications so you may want to wait again.
-   *
-   * If any notifications are pending when you call this function, it
-   * processes them by finding any receivers that match the notification string
-   * and invoking those.  If no receivers match, there is nothing to invoke but
-   * we do consider the notification processed.
-   *
-   * If any of the client-registered receivers throws an exception, the
-   * function will report it using the connection's errorhandlers.  It does not
-   * re-throw the exceptions.
-   *
-   * @return Number of notifications processed.
-   */
-  int get_notifs();
-
-  /// Wait for a notification to come in.
-  /** There are other events that will also terminate the wait, such as the
-   * backend failing.  It will also wake up periodically.
-   *
-   * If a notification comes in, the call will process it, along with any other
-   * notifications that may have been pending.
-   *
-   * To wait for notifications into your own event loop instead, wait until
-   * there is incoming data on the connection's socket to be read, then call
-   * @ref get_notifs() repeatedly until it returns zero.
-   *
-   * @return Number of notifications processed.
-   */
-  int await_notification();
-
-  /// Wait for a notification to come in, or for given timeout to pass.
-  /** There are other events that will also terminate the wait, such as the
-   * backend failing, or timeout expiring.
-   *
-   * If a notification comes in, the call will process it, along with any other
-   * notifications that may have been pending.
-   *
-   * To wait for notifications into your own event loop instead, wait until
-   * there is incoming data on the connection's socket to be read, then call
-   * @ref get_notifs repeatedly until it returns zero.
-   *
-   * @return Number of notifications processed
-   */
-  int await_notification(std::time_t seconds, long microseconds);
-  //@}
-
-  /**
-   * @name Password encryption
-   *
-   * Use this when setting a new password for the user if password encryption
-   * is enabled.  Inputs are the SQL name for the user for whom you with to
-   * encrypt a password; the plaintext password; and the hash algorithm.
-   *
-   * The algorithm must be one of "md5", "scram-sha-256" (introduced in
-   * PostgreSQL 10), or `nullptr`.  If the pointer is null, this will query
-   * the `password_encryption setting` from the server, and use the default
-   * algorithm as defined there.
-   *
-   * @return encrypted version of the password, suitable for encrypted
-   * PostgreSQL authentication.
-   *
-   * Thus you can change a user's password with:
-   * ```cxx
-   * void setpw(transaction_base &t, string const &user, string const &pw)
-   * {
-   *   t.exec0("ALTER USER " + user + " "
-   *   	"PASSWORD '" + t.conn().encrypt_password(user,pw) + "'");
-   * }
-   * ```
-   *
-   * When building this against a libpq older than version 10, this will use
-   * an older function which only supports md5.  In that case, requesting a
-   * different algorithm than md5 will result in a @ref feature_not_supported
-   * exception.
-   */
-  //@{
-  /// Encrypt a password for a given user.
-  [[nodiscard]] std::string
-  encrypt_password(zview user, zview password, zview algorithm)
-  {
-    return encrypt_password(user.c_str(), password.c_str(), algorithm.c_str());
-  }
-  /// Encrypt a password for a given user.
-  [[nodiscard]] std::string encrypt_password(
-    char const user[], char const password[], char const *algorithm = nullptr);
-  //@}
-
-  /**
-   * @name Prepared statements
-   *
-   * PostgreSQL supports prepared SQL statements, i.e. statements that you can
-   * register under a name you choose, optimized once by the backend, and
-   * executed any number of times under the given name.
-   *
-   * Prepared statement definitions are not sensitive to transaction
-   * boundaries. A statement defined inside a transaction will remain defined
-   * outside that transaction, even if the transaction itself is subsequently
-   * aborted.  Once a statement has been prepared, it will only go away if you
-   * close the connection or explicitly "unprepare" the statement.
-   *
-   * Use the `pqxx::transaction_base::exec_prepared` functions to execute a
-   * prepared statement.  See @ref prepared for a full discussion.
-   *
-   * @warning Using prepared statements can save time, but if your statement
-   * takes parameters, it may also make your application significantly slower!
-   * The reason is that the server works out a plan for executing the query
-   * when you prepare it.  At that time, of course it does not know the values
-   * for the parameters that you will pass.  If you execute a query without
-   * preparing it, then the server works out the plan on the spot, with full
-   * knowledge of the parameter values.
-   *
-   * A statement's definition can refer to its parameters as `$1`, `$2`, etc.
-   * The first parameter you pass to the call provides a value for `$1`, and
-   * so on.
-   *
-   * Here's an example of how to use prepared statements.
-   *
-   * ```cxx
-   * using namespace pqxx;
-   * void foo(connection &c)
-   * {
-   *   c.prepare("findtable", "select * from pg_tables where name=$1");
-   *   work tx{c};
-   *   result r = tx.exec_prepared("findtable", "mytable");
-   *   if (std::empty(r)) throw runtime_error{"mytable not found!"};
-   * }
-   * ```
-   */
-  //@{
-
-  /// Define a prepared statement.
-  /**
-   * @param name unique name for the new prepared statement.
-   * @param definition SQL statement to prepare.
-   */
-  void prepare(zview name, zview definition) &
-  {
-    prepare(name.c_str(), definition.c_str());
-  }
-
-  /**
-   * @param name unique name for the new prepared statement.
-   * @param definition SQL statement to prepare.
-   */
-  void prepare(char const name[], char const definition[]) &;
-
-  /// Define a nameless prepared statement.
-  /**
-   * This can be useful if you merely want to pass large binary parameters to a
-   * statement without otherwise wishing to prepare it.  If you use this
-   * feature, always keep the definition and the use close together to avoid
-   * the nameless statement being redefined unexpectedly by code somewhere
-   * else.
-   */
-  void prepare(char const definition[]) &;
-  void prepare(zview definition) & { return prepare(definition.c_str()); }
-
-  /// Drop prepared statement.
-  void unprepare(std::string_view name);
-
-  //@}
-
-  // C++20: constexpr.  Breaks ABI.
-  /// Suffix unique number to name to make it unique within session context.
-  /** Used internally to generate identifiers for SQL objects (such as cursors
-   * and nested transactions) based on a given human-readable base name.
-   */
-  [[nodiscard]] std::string adorn_name(std::string_view);
-
-  /**
-   * @defgroup escaping-functions String-escaping functions
-   */
-  //@{
-
-  /// Escape string for use as SQL string literal on this connection.
-  /** @warning This accepts a length, and it does not require a terminating
-   * zero byte.  But if there is a zero byte, escaping stops there even if
-   * it's not at the end of the string!
-   */
-  [[deprecated("Use std::string_view or pqxx:zview.")]] std::string
-  esc(char const text[], std::size_t maxlen) const
-  {
-    return esc(std::string_view{text, maxlen});
-  }
-
-  /// Escape string for use as SQL string literal on this connection.
-  [[nodiscard]] std::string esc(char const text[]) const
-  {
-    return esc(std::string_view{text});
-  }
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Escape string for use as SQL string literal, into `buffer`.
-  /** Use this variant when you want to re-use the same buffer across multiple
-   * calls.  If that's not the case, or convenience and simplicity are more
-   * important, use the single-argument variant.
-   *
-   * For every byte in `text`, there must be at least 2 bytes of space in
-   * `buffer`; plus there must be one byte of space for a trailing zero.
-   * Throws @ref range_error if this space is not available.
-   *
-   * Returns a reference to the escaped string, which is actually stored in
-   * `buffer`.
-   */
-  [[nodiscard]] std::string_view
-  esc(std::string_view text, std::span<char> buffer)
-  {
-    auto const size{std::size(text)}, space{std::size(buffer)};
-    auto const needed{2 * size + 1};
-    if (space < needed)
-      throw range_error{internal::concat(
-        "Not enough room to escape string of ", size, " byte(s): need ",
-        needed, " bytes of buffer space, but buffer size is ", space, ".")};
-    auto const data{buffer.data()};
-    return {data, esc_to_buf(text, data)};
-  }
-#endif
-
-  /// Escape string for use as SQL string literal on this connection.
-  /** @warning This is meant for text strings only.  It cannot contain bytes
-   * whose value is zero ("nul bytes").
-   */
-  [[nodiscard]] std::string esc(std::string_view text) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** This is identical to `esc_raw(data)`. */
-  template<binary DATA> [[nodiscard]] std::string esc(DATA const &data) const
-  {
-    return esc_raw(data);
-  }
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  /** Use this variant when you want to re-use the same buffer across multiple
-   * calls.  If that's not the case, or convenience and simplicity are more
-   * important, use the single-argument variant.
-   *
-   * For every byte in `data`, there must be at least two bytes of space in
-   * `buffer`; plus there must be two bytes of space for a header and one for
-   * a trailing zero.  Throws @ref range_error if this space is not available.
-   *
-   * Returns a reference to the escaped string, which is actually stored in
-   * `buffer`.
-   */
-  template<binary DATA>
-  [[nodiscard]] zview esc(DATA const &data, std::span<char> buffer) const
-  {
-    auto const size{std::size(data)}, space{std::size(buffer)};
-    auto const needed{internal::size_esc_bin(std::size(data))};
-    if (space < needed)
-      throw range_error{internal::concat(
-        "Not enough room to escape binary string of ", size, " byte(s): need ",
-        needed, " bytes of buffer space, but buffer size is ", space, ".")};
-
-    std::basic_string_view<std::byte> view{std::data(data), std::size(data)};
-    auto const out{std::data(buffer)};
-    // Actually, in the modern format, we know beforehand exactly how many
-    // bytes we're going to fill.  Just leave out the trailing zero.
-    internal::esc_bin(view, out);
-    return zview{out, needed - 1};
-  }
-#endif
-
-  /// Escape binary string for use as SQL string literal on this connection.
-  [[deprecated("Use std::byte for binary data.")]] std::string
-  esc_raw(unsigned char const bin[], std::size_t len) const;
-
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** You can also just use @ref esc with a binary string. */
-  [[nodiscard]] std::string esc_raw(std::basic_string_view<std::byte>) const;
-
-#if defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  /** You can also just use @ref esc with a binary string. */
-  [[nodiscard]] std::string
-  esc_raw(std::basic_string_view<std::byte>, std::span<char> buffer) const;
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape binary string for use as SQL string literal on this connection.
-  /** You can also just use @ref esc with a binary string. */
-  template<binary DATA>
-  [[nodiscard]] std::string esc_raw(DATA const &data) const
-  {
-    return esc_raw(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif
-
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  /// Escape binary string for use as SQL string literal, into `buffer`.
-  template<binary DATA>
-  [[nodiscard]] zview esc_raw(DATA const &data, std::span<char> buffer) const
-  {
-    return this->esc(binary_cast(data), buffer);
-  }
-#endif
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(zview text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return unesc_raw(text.c_str());
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(char const text[]) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   *
-   * (The data must be encoded in PostgreSQL's "hex" format.  The legacy
-   * "bytea" escape format, used prior to PostgreSQL 9.0, is no longer
-   * supported.)
-   */
-  [[nodiscard]] std::basic_string<std::byte>
-  unesc_bin(std::string_view text) const
-  {
-    std::basic_string<std::byte> buf;
-    buf.resize(pqxx::internal::size_unesc_bin(std::size(text)));
-    pqxx::internal::unesc_bin(text, buf.data());
-    return buf;
-  }
-
-  /// Escape and quote a string of binary data.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(unsigned char const bin[], std::size_t len) const;
-
-  /// Escape and quote a string of binary data.
-  std::string quote_raw(std::basic_string_view<std::byte>) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Escape and quote a string of binary data.
-  /** You can also just use @ref quote with binary data. */
-  template<binary DATA>
-  [[nodiscard]] std::string quote_raw(DATA const &data) const
-  {
-    return quote_raw(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote an SQL identifier for use in a query.
-  [[nodiscard]] std::string quote_name(std::string_view identifier) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote a table name.
-  /** When passing just a table name, this is just another name for
-   * @ref quote_name.
-   */
-  [[nodiscard]] std::string quote_table(std::string_view name) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote a table path.
-  /** A table path consists of a table name, optionally prefixed by a schema
-   * name; and if both are given, they are in turn optionally prefixed by a
-   * database name.
-   *
-   * Each portion of the path (database name, schema name, table name) will be
-   * quoted separately, and they will be joined together by dots.  So for
-   * example, `myschema.mytable` will become `"myschema"."mytable"`.
-   */
-  [[nodiscard]] std::string quote_table(table_path) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Quote and comma-separate a series of column names.
-  /** Use this to save a bit of work in cases where you repeatedly need to pass
-   * the same list of column names, e.g. with @ref stream_to and @ref
-   * stream_from. Some functions that need to quote the columns list
-   * internally, will have a "raw" alternative which let you do the quoting
-   * yourself.  It's a bit of extra work, but it can in rare cases let you
-   * eliminate some duplicate work in quoting them repeatedly.
-   */
-  template<PQXX_CHAR_STRINGS_ARG STRINGS>
-  inline std::string quote_columns(STRINGS const &columns) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Represent object as SQL string, including quoting & escaping.
-  /**
-   * Recognises nulls and represents them as SQL nulls.  They get no quotes.
-   */
-  template<typename T>
-  [[nodiscard]] inline std::string quote(T const &t) const;
-
-  [[deprecated("Use std::byte for binary data.")]] std::string
-  quote(binarystring const &) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape and quote binary data for use as a BYTEA value in SQL statement.
-  [[nodiscard]] std::string
-  quote(std::basic_string_view<std::byte> bytes) const;
-
-  // TODO: Make "into buffer" variant to eliminate a string allocation.
-  /// Escape string for literal LIKE match.
-  /** Use this when part of an SQL "LIKE" pattern should match only as a
-   * literal string, not as a pattern, even if it contains "%" or "_"
-   * characters that would normally act as wildcards.
-   *
-   * The string does not get string-escaped or quoted.  You do that later.
-   *
-   * For instance, let's say you have a string `name` entered by the user,
-   * and you're searching a `file` column for items that match `name`
-   * followed by a dot and three letters.  Even if `name` contains wildcard
-   * characters "%" or "_", you only want those to match literally, so "_"
-   * only matches "_" and "%" only matches a single "%".
-   *
-   * You do that by "like-escaping" `name`, appending the wildcard pattern
-   * `".___"`, and finally, escaping and quoting the result for inclusion in
-   * your query:
-   *
-   * ```cxx
-   *    tx.exec(
-   *        "SELECT file FROM item WHERE file LIKE " +
-   *        tx.quote(tx.esc_like(name) + ".___"));
-   * ```
-   *
-   * The SQL "LIKE" operator also lets you choose your own escape character.
-   * This is supported, but must be a single-byte character.
-   */
-  [[nodiscard]] std::string
-  esc_like(std::string_view text, char escape_char = '\\') const;
-  //@}
-
-  /// Attempt to cancel the ongoing query, if any.
-  /** You can use this from another thread, and/or while a query is executing
-   * in a pipeline, but it's up to you to ensure that you're not canceling the
-   * wrong query.  This may involve locking.
-   */
-  void cancel_query();
-
-#if defined(_WIN32) || __has_include(<fcntl.h>)
-  /// Set socket to blocking (true) or nonblocking (false).
-  /** @warning Do not use this unless you _really_ know what you're doing.
-   * @warning This function is available on most systems, but not necessarily
-   * all.
-   */
-  void set_blocking(bool block) &;
-#endif // defined(_WIN32) || __has_include(<fcntl.h>)
-
-  /// Set session verbosity.
-  /** Set the verbosity of error messages to "terse", "normal" (the default),
-   * or "verbose."
-   *
-   *  If "terse", returned messages include severity, primary text, and
-   * position only; this will normally fit on a single line. "normal" produces
-   * messages that include the above plus any detail, hint, or context fields
-   * (these might span multiple lines).  "verbose" includes all available
-   * fields.
-   */
-  void set_verbosity(error_verbosity verbosity) &noexcept;
-
-  /// Return pointers to the active errorhandlers.
-  /** The entries are ordered from oldest to newest handler.
-   *
-   * You may use this to find errorhandlers that your application wants to
-   * delete when destroying the connection.  Be aware, however, that libpqxx
-   * may also add errorhandlers of its own, and those will be included in the
-   * list.  If this is a problem for you, derive your errorhandlers from a
-   * custom base class derived from pqxx::errorhandler.  Then use dynamic_cast
-   * to find which of the error handlers are yours.
-   *
-   * The pointers point to the real errorhandlers.  The container it returns
-   * however is a copy of the one internal to the connection, not a reference.
-   */
-  [[nodiscard]] std::vector<errorhandler *> get_errorhandlers() const;
-
-  /// Return a connection string encapsulating this connection's options.
-  /** The connection must be currently open for this to work.
-   *
-   * Returns a reconstruction of this connection's connection string.  It may
-   * not exactly match the connection string you passed in when creating this
-   * connection.
-   */
-  [[nodiscard]] std::string connection_string() const;
-
-  /// Explicitly close the connection.
-  /** The destructor will do this for you automatically.  Still, there is a
-   * reason to `close()` objects explicitly where possible: if an error should
-   * occur while closing, `close()` can throw an exception.  A destructor
-   * cannot.
-   *
-   * Closing a connection is idempotent.  Closing a connection that's already
-   * closed does nothing.
-   */
-  void close();
-
-  /// Seize control of a raw libpq connection.
-  /** @warning Do not do this.  Please.  It's for very rare, very specific
-   * use-cases.  The mechanism may change (or break) in unexpected ways in
-   * future versions.
-   *
-   * @param raw_conn a raw libpq `PQconn` pointer.
-   */
-  static connection seize_raw_connection(internal::pq::PGconn *raw_conn)
-  {
-    return connection{raw_conn};
-  }
-
-  /// Release the raw connection without closing it.
-  /** @warning Do not do this.  It's for very rare, very specific use-cases.
-   * The mechanism may change (or break) in unexpected ways in future versions.
-   *
-   * The `connection` object becomes unusable after this.
-   */
-  internal::pq::PGconn *release_raw_connection() &&
-  {
-    return std::exchange(m_conn, nullptr);
-  }
-
-private:
-  friend class connecting;
-  enum connect_mode
-  {
-    connect_nonblocking
-  };
-  connection(connect_mode, zview connection_string);
-
-  /// For use by @ref seize_raw_connection.
-  explicit connection(internal::pq::PGconn *raw_conn) : m_conn{raw_conn} {}
-
-  /// Poll for ongoing connection, try to progress towards completion.
-  /** Returns a pair of "now please wait to read data from socket" and "now
-   * please wait to write data to socket."  Both will be false when done.
-   *
-   * Throws an exception if polling indicates that the connection has failed.
-   */
-  std::pair<bool, bool> poll_connect();
-
-  // Initialise based on connection string.
-  void init(char const options[]);
-  // Initialise based on parameter names and values.
-  void init(char const *params[], char const *values[]);
-  void complete_init();
-
-  result make_result(
-    internal::pq::PGresult *pgr, std::shared_ptr<std::string> const &query,
-    std::string_view desc = ""sv);
-
-  void PQXX_PRIVATE set_up_state();
-
-  int PQXX_PRIVATE PQXX_PURE status() const noexcept;
-
-  /// Escape a string, into a buffer allocated by the caller.
-  /** The buffer must have room for at least `2*std::size(text) + 1` bytes.
-   *
-   * Returns the number of bytes written, including the trailing zero.
-   */
-  std::size_t esc_to_buf(std::string_view text, char *buf) const;
-
-  friend class internal::gate::const_connection_largeobject;
-  char const *PQXX_PURE err_msg() const noexcept;
-
-  void PQXX_PRIVATE process_notice_raw(char const msg[]) noexcept;
-
-  result exec_prepared(std::string_view statement, internal::c_params const &);
-
-  /// Throw @ref usage_error if this connection is not in a movable state.
-  void check_movable() const;
-  /// Throw @ref usage_error if not in a state where it can be move-assigned.
-  void check_overwritable() const;
-
-  friend class internal::gate::connection_errorhandler;
-  void PQXX_PRIVATE register_errorhandler(errorhandler *);
-  void PQXX_PRIVATE unregister_errorhandler(errorhandler *) noexcept;
-
-  friend class internal::gate::connection_transaction;
-  result exec(std::string_view, std::string_view = ""sv);
-  result
-    PQXX_PRIVATE exec(std::shared_ptr<std::string>, std::string_view = ""sv);
-  void PQXX_PRIVATE register_transaction(transaction_base *);
-  void PQXX_PRIVATE unregister_transaction(transaction_base *) noexcept;
-
-  friend class internal::gate::connection_stream_from;
-  std::pair<std::unique_ptr<char, std::function<void(char *)>>, std::size_t>
-    PQXX_PRIVATE read_copy_line();
-
-  friend class internal::gate::connection_stream_to;
-  void PQXX_PRIVATE write_copy_line(std::string_view);
-  void PQXX_PRIVATE end_copy_write();
-
-  friend class internal::gate::connection_largeobject;
-  internal::pq::PGconn *raw_connection() const { return m_conn; }
-
-  friend class internal::gate::connection_notification_receiver;
-  void add_receiver(notification_receiver *);
-  void remove_receiver(notification_receiver *) noexcept;
-
-  friend class internal::gate::connection_pipeline;
-  void PQXX_PRIVATE start_exec(char const query[]);
-  bool PQXX_PRIVATE consume_input() noexcept;
-  bool PQXX_PRIVATE is_busy() const noexcept;
-  internal::pq::PGresult *get_result();
-
-  friend class internal::gate::connection_dbtransaction;
-  friend class internal::gate::connection_sql_cursor;
-
-  result exec_params(std::string_view query, internal::c_params const &args);
-
-  /// Connection handle.
-  internal::pq::PGconn *m_conn = nullptr;
-
-  /// Active transaction on connection, if any.
-  /** We don't use this for anything, except to check for open transactions
-   * when we close the connection or start a new transaction.
-   *
-   * We also don't allow move construction or move assignment while there's a
-   * transaction, since moving the connection in that case would leave one or
-   * more pointers back from the transaction to the connection dangling.
-   */
-  transaction_base const *m_trans = nullptr;
-
-  std::list<errorhandler *> m_errorhandlers;
-
-  using receiver_list =
-    std::multimap<std::string, pqxx::notification_receiver *>;
-  /// Notification receivers.
-  receiver_list m_receivers;
-
-  /// Unique number to use as suffix for identifiers (see adorn_name()).
-  int m_unique_id = 0;
-};
-
-
-/// @deprecated Old base class for connection.  They are now the same class.
-using connection_base = connection;
-
-
-/// An ongoing, non-blocking stepping stone to a connection.
-/** Use this when you want to create a connection to the database, but without
- * blocking your whole thread.   It is only available on systems that have
- * the `<fcntl.h>` header, and Windows.
- *
- * Connecting in this way is probably not "faster" (it's more complicated and
- * has some extra overhead), but in some situations you can use it to make your
- * application as a whole faster.  It all depends on having other useful work
- * to do in the same thread, and being able to wait on a socket.  If you have
- * other I/O going on at the same time, your event loop can wait for both the
- * libpqxx socket and your own sockets, and wake up whenever any of them is
- * ready to do work.
- *
- * Connecting in this way is not properly "asynchronous;" it's merely
- * "nonblocking."  This means it's not a super-high-performance mechanism like
- * you might get with e.g. `io_uring`.  In particular, if we need to look up
- * the database hostname in DNS, that will happen synchronously.
- *
- * To use this, create the `connecting` object, passing a connection string.
- * Then loop: If @ref wait_to_read returns true, wait for the socket to have
- * incoming data on it.  If @ref wait_to_write returns true, wait for the
- * socket to be ready for writing.  Then call @ref process to process any
- * incoming or outgoing data.  Do all of this until @ref done returns true (or
- * there is an exception).  Finally, call @ref produce to get the completed
- * connection.
- *
- * For example:
- *
- * ```cxx
- *     pqxx::connecting cg{};
- *
- *     // Loop until we're done connecting.
- *     while (!cg.done())
- *     {
- *         wait_for_fd(cg.sock(), cg.wait_to_read(), cg.wait_to_write());
- *         cg.process();
- *     }
- *
- *     pqxx::connection conn = std::move(cg).produce();
- *
- *     // At this point, conn is a working connection.  You can no longer use
- *     // cg at all.
- * ```
- */
-class PQXX_LIBEXPORT connecting
-{
-public:
-  /// Start connecting.
-  connecting(zview connection_string = ""_zv);
-
-  connecting(connecting const &) = delete;
-  connecting(connecting &&) = default;
-  connecting &operator=(connecting const &) = delete;
-  connecting &operator=(connecting &&) = default;
-
-  /// Get the socket.  The socket may change during the connection process.
-  [[nodiscard]] int sock() const &noexcept { return m_conn.sock(); }
-
-  /// Should we currently wait to be able to _read_ from the socket?
-  [[nodiscard]] constexpr bool wait_to_read() const &noexcept
-  {
-    return m_reading;
-  }
-
-  /// Should we currently wait to be able to _write_ to the socket?
-  [[nodiscard]] constexpr bool wait_to_write() const &noexcept
-  {
-    return m_writing;
-  }
-
-  /// Progress towards completion (but don't block).
-  void process() &;
-
-  /// Is our connection finished?
-  [[nodiscard]] constexpr bool done() const &noexcept
-  {
-    return not m_reading and not m_writing;
-  }
-
-  /// Produce the completed connection object.
-  /** Use this only once, after @ref done returned `true`.  Once you have
-   * called this, the `connecting` instance has no more use or meaning.  You
-   * can't call any of its member functions afterwards.
-   *
-   * This member function is rvalue-qualified, meaning that you can only call
-   * it on an rvalue instance of the class.  If what you have is not an rvalue,
-   * turn it into one by wrapping it in `std::move()`.
-   */
-  [[nodiscard]] connection produce() &&;
-
-private:
-  connection m_conn;
-  bool m_reading{false};
-  bool m_writing{true};
-};
-
-
-template<typename T> inline std::string connection::quote(T const &t) const
-{
-  if constexpr (nullness<T>::always_null)
-  {
-    return "NULL";
-  }
-  else
-  {
-    if (is_null(t))
-      return "NULL";
-    auto const text{to_string(t)};
-
-    // Okay, there's an easy way to do this and there's a hard way.  The easy
-    // way was "quote, esc(to_string(t)), quote".  I'm going with the hard way
-    // because it's going to save some string manipulation that will probably
-    // incur some unnecessary memory allocations and deallocations.
-    std::string buf{'\''};
-    buf.resize(2 + 2 * std::size(text) + 1);
-    auto const content_bytes{esc_to_buf(text, buf.data() + 1)};
-    auto const closing_quote{1 + content_bytes};
-    buf[closing_quote] = '\'';
-    auto const end{closing_quote + 1};
-    buf.resize(end);
-    return buf;
-  }
-}
-
-
-template<PQXX_CHAR_STRINGS_ARG STRINGS>
-inline std::string connection::quote_columns(STRINGS const &columns) const
-{
-  return separated_list(
-    ","sv, std::cbegin(columns), std::cend(columns),
-    [this](auto col) { return this->quote_name(*col); });
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<internal::ZKey_ZValues MAPPING>
-inline connection::connection(MAPPING const &params)
-{
-  check_version();
-
-  std::vector<char const *> keys, values;
-  if constexpr (std::ranges::sized_range<MAPPING>)
-  {
-    auto const size{std::ranges::size(params) + 1};
-    keys.reserve(size);
-    values.reserve(size);
-  }
-  for (auto const &[key, value] : params)
-  {
-    keys.push_back(internal::as_c_string(key));
-    values.push_back(internal::as_c_string(value));
-  }
-  keys.push_back(nullptr);
-  values.push_back(nullptr);
-  init(std::data(keys), std::data(values));
-}
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/cursor b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/cursor
deleted file mode 100644
index e20b3a4fa..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/cursor
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Definition of the iterator/container-style cursor classes.
- *
- * C++-style wrappers for SQL cursors
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/cursor.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/cursor.hxx
deleted file mode 100644
index b392e2407..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/cursor.hxx
+++ /dev/null
@@ -1,483 +0,0 @@
-/* Definition of the iterator/container-style cursor classes.
- *
- * C++-style wrappers for SQL cursors.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/cursor instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_CURSOR
-#define PQXX_H_CURSOR
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <limits>
-#include <stdexcept>
-
-#include "pqxx/result.hxx"
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-/// Common definitions for cursor types
-/** In C++ terms, fetches are always done in pre-increment or pre-decrement
- * fashion--i.e. the result does not include the row the cursor is on at the
- * beginning of the fetch, and the cursor ends up being positioned on the last
- * row in the result.
- *
- * There are singular positions akin to `end()` at both the beginning and the
- * end of the cursor's range of movement, although these fit in so naturally
- * with the semantics that one rarely notices them.  The cursor begins at the
- * first of these, but any fetch in the forward direction will move the cursor
- * off this position and onto the first row before returning anything.
- */
-class PQXX_LIBEXPORT cursor_base
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-  /// Cursor access-pattern policy
-  /** Allowing a cursor to move forward only can result in better performance,
-   * so use this access policy whenever possible.
-   */
-  enum access_policy
-  {
-    /// Cursor can move forward only
-    forward_only,
-    /// Cursor can move back and forth
-    random_access
-  };
-
-  /// Cursor update policy
-  /**
-   * @warning Not all PostgreSQL versions support updatable cursors.
-   */
-  enum update_policy
-  {
-    /// Cursor can be used to read data but not to write
-    read_only,
-    /// Cursor can be used to update data as well as read it
-    update
-  };
-
-  /// Cursor destruction policy
-  /** The normal thing to do is to make a cursor object the owner of the SQL
-   * cursor it represents.  There may be cases, however, where a cursor needs
-   * to persist beyond the end of the current transaction (and thus also beyond
-   * the lifetime of the cursor object that created it!), where it can be
-   * "adopted" into a new cursor object.  See the basic_cursor documentation
-   * for an explanation of cursor adoption.
-   *
-   * If a cursor is created with "loose" ownership policy, the object
-   * representing the underlying SQL cursor will not take the latter with it
-   * when its own lifetime ends, nor will its originating transaction.
-   *
-   * @warning Use this feature with care and moderation.  Only one cursor
-   * object should be responsible for any one underlying SQL cursor at any
-   * given time.
-   */
-  enum ownership_policy
-  {
-    /// Destroy SQL cursor when cursor object is closed at end of transaction
-    owned,
-    /// Leave SQL cursor in existence after close of object and transaction
-    loose
-  };
-
-  cursor_base() = delete;
-  cursor_base(cursor_base const &) = delete;
-  cursor_base &operator=(cursor_base const &) = delete;
-
-  /**
-   * @name Special movement distances.
-   */
-  //@{
-
-  // TODO: Make constexpr inline (but breaks ABI).
-  /// Special value: read until end.
-  /** @return Maximum value for result::difference_type, so the cursor will
-   * attempt to read the largest possible result set.
-   */
-  [[nodiscard]] static difference_type all() noexcept;
-
-  /// Special value: read one row only.
-  /** @return Unsurprisingly, 1.
-   */
-  [[nodiscard]] static constexpr difference_type next() noexcept { return 1; }
-
-  /// Special value: read backwards, one row only.
-  /** @return Unsurprisingly, -1.
-   */
-  [[nodiscard]] static constexpr difference_type prior() noexcept
-  {
-    return -1;
-  }
-
-  // TODO: Make constexpr inline (but breaks ABI).
-  /// Special value: read backwards from current position back to origin.
-  /** @return Minimum value for result::difference_type.
-   */
-  [[nodiscard]] static difference_type backward_all() noexcept;
-
-  //@}
-
-  /// Name of underlying SQL cursor
-  /**
-   * @returns Name of SQL cursor, which may differ from original given name.
-   * @warning Don't use this to access the SQL cursor directly without going
-   * through the provided wrapper classes!
-   */
-  [[nodiscard]] constexpr std::string const &name() const noexcept
-  {
-    return m_name;
-  }
-
-protected:
-  cursor_base(connection &, std::string_view Name, bool embellish_name = true);
-
-  std::string const m_name;
-};
-} // namespace pqxx
-
-
-#include <pqxx/internal/sql_cursor.hxx>
-
-
-namespace pqxx
-{
-/// "Stateless cursor" class: easy API for retrieving parts of result sets
-/** This is a front-end for SQL cursors, but with a more C++-like API.
- *
- * Actually, stateless_cursor feels entirely different from SQL cursors.  You
- * don't keep track of positions, fetches, and moves; you just say which rows
- * you want.  See the retrieve() member function.
- */
-template<cursor_base::update_policy up, cursor_base::ownership_policy op>
-class stateless_cursor
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-  /// Create cursor.
-  /**
-   * @param tx The transaction within which you want to create the cursor.
-   * @param query The SQL query whose results the cursor should traverse.
-   * @param cname A hint for the cursor's name.  The actual SQL cursor's name
-   *     will be based on this (though not necessarily identical).
-   * @param hold Create a `WITH HOLD` cursor?  Such cursors stay alive after
-   *     the transaction has ended, so you can continue to use it.
-   */
-  stateless_cursor(
-    transaction_base &tx, std::string_view query, std::string_view cname,
-    bool hold) :
-          m_cur{tx, query, cname, cursor_base::random_access, up, op, hold}
-  {}
-
-  /// Adopt an existing scrolling SQL cursor.
-  /** This lets you define a cursor yourself, and then wrap it in a
-   * libpqxx-managed `stateless_cursor` object.
-   *
-   * @param tx The transaction within which you want to manage the cursor.
-   * @param adopted_cursor Your cursor's SQL name.
-   */
-  stateless_cursor(transaction_base &tx, std::string_view adopted_cursor) :
-          m_cur{tx, adopted_cursor, op}
-  {
-    // Put cursor in known position
-    m_cur.move(cursor_base::backward_all());
-  }
-
-  /// Close this cursor.
-  /** The destructor will do this for you automatically.
-   *
-   * Closing a cursor is idempotent.  Closing a cursor that's already closed
-   * does nothing.
-   */
-  void close() noexcept { m_cur.close(); }
-
-  /// Number of rows in cursor's result set
-  /** @note This function is not const; it may need to scroll to find the size
-   * of the result set.
-   */
-  [[nodiscard]] size_type size()
-  {
-    return internal::obtain_stateless_cursor_size(m_cur);
-  }
-
-  /// Retrieve rows from begin_pos (inclusive) to end_pos (exclusive)
-  /** Rows are numbered starting from 0 to size()-1.
-   *
-   * @param begin_pos First row to retrieve.  May be one row beyond the end of
-   * the result set, to avoid errors for empty result sets.  Otherwise, must be
-   * a valid row number in the result set.
-   * @param end_pos Row up to which to fetch.  Rows are returned ordered from
-   * begin_pos to end_pos, i.e. in ascending order if begin_pos < end_pos but
-   * in descending order if begin_pos > end_pos.  The end_pos may be
-   * arbitrarily inside or outside the result set; only existing rows are
-   * included in the result.
-   */
-  result retrieve(difference_type begin_pos, difference_type end_pos)
-  {
-    return internal::stateless_cursor_retrieve(
-      m_cur, result::difference_type(size()), begin_pos, end_pos);
-  }
-
-  /// Return this cursor's name.
-  [[nodiscard]] constexpr std::string const &name() const noexcept
-  {
-    return m_cur.name();
-  }
-
-private:
-  internal::sql_cursor m_cur;
-};
-
-
-class icursor_iterator;
-} // namespace pqxx
-
-
-namespace pqxx::internal::gate
-{
-class icursor_iterator_icursorstream;
-class icursorstream_icursor_iterator;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Simple read-only cursor represented as a stream of results
-/** SQL cursors can be tricky, especially in C++ since the two languages seem
- * to have been designed on different planets.  An SQL cursor has two singular
- * positions akin to `end()` on either side of the underlying result set.
- *
- * These cultural differences are hidden from view somewhat by libpqxx, which
- * tries to make SQL cursors behave more like familiar C++ entities such as
- * iterators, sequences, streams, and containers.
- *
- * Data is fetched from the cursor as a sequence of result objects.  Each of
- * these will contain the number of rows defined as the stream's stride, except
- * of course the last block of data which may contain fewer rows.
- *
- * This class can create or adopt cursors that live outside any backend
- * transaction, which your backend version may not support.
- */
-class PQXX_LIBEXPORT icursorstream
-{
-public:
-  using size_type = cursor_base::size_type;
-  using difference_type = cursor_base::difference_type;
-
-  /// Set up a read-only, forward-only cursor.
-  /** Roughly equivalent to a C++ Standard Library istream, this cursor type
-   * supports only two operations: reading a block of rows while moving
-   * forward, and moving forward without reading any data.
-   *
-   * @param context Transaction context in which this cursor will be active.
-   * @param query SQL query whose results this cursor shall iterate.
-   * @param basename Suggested name for the SQL cursor; the library will append
-   * a unique code to ensure its uniqueness.
-   * @param sstride Number of rows to fetch per read operation; must be a
-   * positive number.
-   */
-  icursorstream(
-    transaction_base &context, std::string_view query,
-    std::string_view basename, difference_type sstride = 1);
-
-  /// Adopt existing SQL cursor.  Use with care.
-  /** Forms a cursor stream around an existing SQL cursor, as returned by e.g.
-   * a server-side function.  The SQL cursor will be cleaned up by the stream's
-   * destructor as if it had been created by the stream; cleaning it up by hand
-   * or adopting the same cursor twice is an error.
-   *
-   * Passing the name of the cursor as a string is not allowed, both to avoid
-   * confusion with the other constructor and to discourage unnecessary use of
-   * adopted cursors.
-   *
-   * @warning It is technically possible to adopt a "WITH HOLD" cursor, i.e. a
-   * cursor that stays alive outside its creating transaction.  However, any
-   * cursor stream (including the underlying SQL cursor, naturally) must be
-   * destroyed before its transaction context object is destroyed.  Therefore
-   * the only way to use SQL's WITH HOLD feature is to adopt the cursor, but
-   * defer doing so until after entering the transaction context that will
-   * eventually destroy it.
-   *
-   * @param context Transaction context in which this cursor will be active.
-   * @param cname Result field containing the name of the SQL cursor to adopt.
-   * @param sstride Number of rows to fetch per read operation; must be a
-   * positive number.
-   * @param op Ownership policy.  Determines whether the cursor underlying this
-   * stream will be destroyed when the stream is closed.
-   */
-  icursorstream(
-    transaction_base &context, field const &cname, difference_type sstride = 1,
-    cursor_base::ownership_policy op = cursor_base::owned);
-
-  /// Return `true` if this stream may still return more data.
-  constexpr operator bool() const &noexcept { return not m_done; }
-
-  /// Read new value into given result object; same as operator `>>`.
-  /** The result set may continue any number of rows from zero to the chosen
-   * stride, inclusive.  An empty result will only be returned if there are no
-   * more rows to retrieve.
-   *
-   * @param res Write the retrieved data into this result object.
-   * @return Reference to this very stream, to facilitate "chained" invocations
-   * ("C.get(r1).get(r2);")
-   */
-  icursorstream &get(result &res)
-  {
-    res = fetchblock();
-    return *this;
-  }
-  /// Read new value into given result object; same as `get(result&)`.
-  /** The result set may continue any number of rows from zero to the chosen
-   * stride, inclusive.  An empty result will only be returned if there are no
-   * more rows to retrieve.
-   *
-   * @param res Write the retrieved data into this result object.
-   * @return Reference to this very stream, to facilitate "chained" invocations
-   * ("C >> r1 >> r2;")
-   */
-  icursorstream &operator>>(result &res) { return get(res); }
-
-  /// Move given number of rows forward without reading data.
-  /** Ignores any stride that you may have set.  It moves by a given number of
-   * rows, not a number of strides.
-   *
-   * @return Reference to this stream itself, to facilitate "chained"
-   * invocations.
-   */
-  icursorstream &ignore(std::streamsize n = 1) &;
-
-  /// Change stride, i.e. the number of rows to fetch per read operation.
-  /**
-   * @param stride Must be a positive number.
-   */
-  void set_stride(difference_type stride) &;
-  [[nodiscard]] constexpr difference_type stride() const noexcept
-  {
-    return m_stride;
-  }
-
-private:
-  result fetchblock();
-
-  friend class internal::gate::icursorstream_icursor_iterator;
-  size_type forward(size_type n = 1);
-  void insert_iterator(icursor_iterator *) noexcept;
-  void remove_iterator(icursor_iterator *) const noexcept;
-
-  void service_iterators(difference_type);
-
-  internal::sql_cursor m_cur;
-
-  difference_type m_stride;
-  difference_type m_realpos, m_reqpos;
-
-  mutable icursor_iterator *m_iterators;
-
-  bool m_done;
-};
-
-
-/// Approximate istream_iterator for icursorstream.
-/** Intended as an implementation of an input_iterator (as defined by the C++
- * Standard Library), this class supports only two basic operations: reading
- * the current element, and moving forward.  In addition to the minimal
- * guarantees for istream_iterators, this class supports multiple successive
- * reads of the same position (the current result set is cached in the
- * iterator) even after copying and even after new data have been read from the
- * stream.  This appears to be a requirement for input_iterators.  Comparisons
- * are also supported in the general case.
- *
- * The iterator does not care about its own position, however.  Moving an
- * iterator forward moves the underlying stream forward and reads the data from
- * the new stream position, regardless of the iterator's old position in the
- * stream.
- *
- * The stream's stride defines the granularity for all iterator movement or
- * access operations, i.e. "ici += 1" advances the stream by one stride's worth
- * of rows, and "*ici++" reads one stride's worth of rows from the stream.
- *
- * @warning Do not read from the underlying stream or its cursor, move its read
- * position, or change its stride, between the time the first icursor_iterator
- * on it is created and the time its last icursor_iterator is destroyed.
- *
- * @warning Manipulating these iterators within the context of a single cursor
- * stream is <em>not thread-safe</em>.  Creating a new iterator, copying one,
- * or destroying one affects the stream as a whole.
- */
-class PQXX_LIBEXPORT icursor_iterator
-{
-public:
-  using iterator_category = std::input_iterator_tag;
-  using value_type = result;
-  using pointer = result const *;
-  using reference = result const &;
-  using istream_type = icursorstream;
-  using size_type = istream_type::size_type;
-  using difference_type = istream_type::difference_type;
-
-  icursor_iterator() noexcept;
-  explicit icursor_iterator(istream_type &) noexcept;
-  icursor_iterator(icursor_iterator const &) noexcept;
-  ~icursor_iterator() noexcept;
-
-  result const &operator*() const
-  {
-    refresh();
-    return m_here;
-  }
-  result const *operator->() const
-  {
-    refresh();
-    return &m_here;
-  }
-  icursor_iterator &operator++();
-  icursor_iterator operator++(int);
-  icursor_iterator &operator+=(difference_type);
-  icursor_iterator &operator=(icursor_iterator const &) noexcept;
-
-  [[nodiscard]] bool operator==(icursor_iterator const &rhs) const;
-  [[nodiscard]] bool operator!=(icursor_iterator const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  [[nodiscard]] bool operator<(icursor_iterator const &rhs) const;
-  [[nodiscard]] bool operator>(icursor_iterator const &rhs) const
-  {
-    return rhs < *this;
-  }
-  [[nodiscard]] bool operator<=(icursor_iterator const &rhs) const
-  {
-    return not(*this > rhs);
-  }
-  [[nodiscard]] bool operator>=(icursor_iterator const &rhs) const
-  {
-    return not(*this < rhs);
-  }
-
-private:
-  void refresh() const;
-
-  friend class internal::gate::icursor_iterator_icursorstream;
-  difference_type pos() const noexcept { return m_pos; }
-  void fill(result const &);
-
-  icursorstream *m_stream{nullptr};
-  result m_here;
-  difference_type m_pos;
-  icursor_iterator *m_prev{nullptr}, *m_next{nullptr};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/dbtransaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/dbtransaction
deleted file mode 100644
index fa8d26476..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/dbtransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::dbtransaction abstract base class.
- *
- * pqxx::dbransaction defines a real transaction on the database.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/dbtransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/dbtransaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/dbtransaction.hxx
deleted file mode 100644
index d85cb170f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/dbtransaction.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Definition of the pqxx::dbtransaction abstract base class.
- *
- * pqxx::dbransaction defines a real transaction on the database.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/dbtransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_DBTRANSACTION
-#define PQXX_H_DBTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/transaction_base.hxx"
-
-namespace pqxx
-{
-/// Abstract transaction base class: bracket transactions on the database.
-/**
- * @ingroup transactions
- *
- * Use a dbtransaction-derived object such as "work" (transaction<>) to enclose
- * operations on a database in a single "unit of work."  This ensures that the
- * whole series of operations either succeeds as a whole or fails completely.
- * In no case will it leave half-finished work behind in the database.
- *
- * Once processing on a transaction has succeeded and any changes should be
- * allowed to become permanent in the database, call commit().  If something
- * has gone wrong and the changes should be forgotten, call abort() instead.
- * If you do neither, an implicit abort() is executed at destruction time.
- *
- * It is an error to abort a transaction that has already been committed, or to
- * commit a transaction that has already been aborted.  Aborting an already
- * aborted transaction or committing an already committed one is allowed, to
- * make error handling easier.  Repeated aborts or commits have no effect after
- * the first one.
- *
- * Database transactions are not suitable for guarding long-running processes.
- * If your transaction code becomes too long or too complex, consider ways to
- * break it up into smaller ones.  Unfortunately there is no universal recipe
- * for this.
- *
- * The actual operations for committing/aborting the backend transaction are
- * implemented by a derived class.  The implementing concrete class must also
- * call @ref close from its destructor.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE dbtransaction : public transaction_base
-{
-protected:
-  /// Begin transaction.
-  explicit dbtransaction(connection &c) : transaction_base{c} {}
-  /// Begin transaction.
-  dbtransaction(connection &c, std::string_view tname) :
-          transaction_base{c, tname}
-  {}
-  /// Begin transaction.
-  dbtransaction(
-    connection &c, std::string_view tname,
-    std::shared_ptr<std::string> rollback_cmd) :
-          transaction_base{c, tname, rollback_cmd}
-  {}
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/errorhandler b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/errorhandler
deleted file mode 100644
index ea572ee79..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/errorhandler
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::errorhandler class.
- *
- * Callbacks for handling errors and warnings.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/errorhandler.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/errorhandler.hxx
deleted file mode 100644
index 2ffb5703c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/errorhandler.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Definition of the pqxx::errorhandler class.
- *
- * pqxx::errorhandler handlers errors and warnings in a database session.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/errorhandler instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ERRORHANDLER
-#define PQXX_H_ERRORHANDLER
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx::internal::gate
-{
-class errorhandler_connection;
-}
-
-
-namespace pqxx
-{
-/**
- * @addtogroup errorhandler
- */
-//@{
-
-/// Base class for error-handler callbacks.
-/** To receive errors and warnings from a connection, subclass this with your
- * own error-handler functor, and instantiate it for the connection. Destroying
- * the handler un-registers it.
- *
- * A connection can have multiple error handlers at the same time.  When the
- * database connection emits an error or warning message, it passes the message
- * to each error handler, starting with the most recently registered one and
- * progressing towards the oldest one.  However an error handler may also
- * instruct the connection not to pass the message to further handlers by
- * returning "false."
- *
- * @warning Strange things happen when a result object outlives its parent
- * connection.  If you register an error handler on a connection, then you must
- * not access the result after destroying the connection.  This applies even if
- * you destroy the error handler first!
- */
-class PQXX_LIBEXPORT errorhandler
-{
-public:
-  explicit errorhandler(connection &);
-  virtual ~errorhandler();
-
-  /// Define in subclass: receive an error or warning message from the
-  /// database.
-  /**
-   * @return Whether the same error message should also be passed to the
-   * remaining, older errorhandlers.
-   */
-  virtual bool operator()(char const msg[]) noexcept = 0;
-
-  errorhandler() = delete;
-  errorhandler(errorhandler const &) = delete;
-  errorhandler &operator=(errorhandler const &) = delete;
-
-private:
-  connection *m_home;
-
-  friend class internal::gate::errorhandler_connection;
-  void unregister() noexcept;
-};
-
-
-/// An error handler that suppresses any previously registered error handlers.
-class quiet_errorhandler : public errorhandler
-{
-public:
-  /// Suppress error notices.
-  quiet_errorhandler(connection &conn) : errorhandler{conn} {}
-
-  /// Revert to previous handling of error notices.
-  virtual bool operator()(char const[]) noexcept override { return false; }
-};
-
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/except b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/except
deleted file mode 100644
index e5dd508bf..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/except
+++ /dev/null
@@ -1,8 +0,0 @@
-/** libpqxx exception classes.
- *
- * pqxx::sql_error, pqxx::broken_connection, pqxx::in_doubt_error, ...
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/except.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/except.hxx
deleted file mode 100644
index 24f959437..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/except.hxx
+++ /dev/null
@@ -1,447 +0,0 @@
-/* Definition of libpqxx exception classes.
- *
- * pqxx::sql_error, pqxx::broken_connection, pqxx::in_doubt_error, ...
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/except instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_EXCEPT
-#define PQXX_H_EXCEPT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <stdexcept>
-#include <string>
-
-
-namespace pqxx
-{
-/**
- * @addtogroup exception Exception classes
- *
- * These exception classes follow, roughly, the two-level hierarchy defined by
- * the PostgreSQL SQLSTATE error codes (see Appendix A of the PostgreSQL
- * documentation corresponding to your server version).  This is not a complete
- * mapping though.  There are other differences as well, e.g. the error code
- * for `statement_completion_unknown` has a separate status in libpqxx as
- * @ref in_doubt_error, and `too_many_connections` is classified as a
- * `broken_connection` rather than a subtype of `insufficient_resources`.
- *
- * @see http://www.postgresql.org/docs/9.4/interactive/errcodes-appendix.html
- *
- * @{
- */
-
-/// Run-time failure encountered by libpqxx, similar to std::runtime_error.
-struct PQXX_LIBEXPORT failure : std::runtime_error
-{
-  explicit failure(std::string const &);
-};
-
-
-/// Exception class for lost or failed backend connection.
-/**
- * @warning When this happens on Unix-like systems, you may also get a SIGPIPE
- * signal.  That signal aborts the program by default, so if you wish to be
- * able to continue after a connection breaks, be sure to disarm this signal.
- *
- * If you're working on a Unix-like system, see the manual page for
- * `signal` (2) on how to deal with SIGPIPE.  The easiest way to make this
- * signal harmless is to make your program ignore it:
- *
- * ```cxx
- * #include <signal.h>
- *
- * int main()
- * {
- *   signal(SIGPIPE, SIG_IGN);
- *   // ...
- * ```
- */
-struct PQXX_LIBEXPORT broken_connection : failure
-{
-  broken_connection();
-  explicit broken_connection(std::string const &);
-};
-
-
-/// The caller attempted to set a variable to null, which is not allowed.
-struct PQXX_LIBEXPORT variable_set_to_null : failure
-{
-  variable_set_to_null();
-  explicit variable_set_to_null(std::string const &);
-};
-
-
-/// Exception class for failed queries.
-/** Carries, in addition to a regular error message, a copy of the failed query
- * and (if available) the SQLSTATE value accompanying the error.
- */
-class PQXX_LIBEXPORT sql_error : public failure
-{
-  /// Query string.  Empty if unknown.
-  std::string const m_query;
-  /// SQLSTATE string describing the error type, if known; or empty string.
-  std::string const m_sqlstate;
-
-public:
-  explicit sql_error(
-    std::string const &whatarg = "", std::string const &Q = "",
-    char const sqlstate[] = nullptr);
-  virtual ~sql_error() noexcept override;
-
-  /// The query whose execution triggered the exception
-  [[nodiscard]] PQXX_PURE std::string const &query() const noexcept;
-
-  /// SQLSTATE error code if known, or empty string otherwise.
-  [[nodiscard]] PQXX_PURE std::string const &sqlstate() const noexcept;
-};
-
-
-/// "Help, I don't know whether transaction was committed successfully!"
-/** Exception that might be thrown in rare cases where the connection to the
- * database is lost while finishing a database transaction, and there's no way
- * of telling whether it was actually executed by the backend.  In this case
- * the database is left in an indeterminate (but consistent) state, and only
- * manual inspection will tell which is the case.
- */
-struct PQXX_LIBEXPORT in_doubt_error : failure
-{
-  explicit in_doubt_error(std::string const &);
-};
-
-
-/// The backend saw itself forced to roll back the ongoing transaction.
-struct PQXX_LIBEXPORT transaction_rollback : sql_error
-{
-  explicit transaction_rollback(
-    std::string const &whatarg, std::string const &q = "",
-    char const sqlstate[] = nullptr);
-};
-
-
-/// Transaction failed to serialize.  Please retry it.
-/** Can only happen at transaction isolation levels REPEATABLE READ and
- * SERIALIZABLE.
- *
- * The current transaction cannot be committed without violating the guarantees
- * made by its isolation level.  This is the effect of a conflict with another
- * ongoing transaction.  The transaction may still succeed if you try to
- * perform it again.
- */
-struct PQXX_LIBEXPORT serialization_failure : transaction_rollback
-{
-  explicit serialization_failure(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// We can't tell whether our last statement succeeded.
-struct PQXX_LIBEXPORT statement_completion_unknown : transaction_rollback
-{
-  explicit statement_completion_unknown(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// The ongoing transaction has deadlocked.  Retrying it may help.
-struct PQXX_LIBEXPORT deadlock_detected : transaction_rollback
-{
-  explicit deadlock_detected(
-    std::string const &whatarg, std::string const &q,
-    char const sqlstate[] = nullptr);
-};
-
-
-/// Internal error in libpqxx library
-struct PQXX_LIBEXPORT internal_error : std::logic_error
-{
-  explicit internal_error(std::string const &);
-};
-
-
-/// Error in usage of libpqxx library, similar to std::logic_error
-struct PQXX_LIBEXPORT usage_error : std::logic_error
-{
-  explicit usage_error(std::string const &);
-};
-
-
-/// Invalid argument passed to libpqxx, similar to std::invalid_argument
-struct PQXX_LIBEXPORT argument_error : std::invalid_argument
-{
-  explicit argument_error(std::string const &);
-};
-
-
-/// Value conversion failed, e.g. when converting "Hello" to int.
-struct PQXX_LIBEXPORT conversion_error : std::domain_error
-{
-  explicit conversion_error(std::string const &);
-};
-
-
-/// Could not convert value to string: not enough buffer space.
-struct PQXX_LIBEXPORT conversion_overrun : conversion_error
-{
-  explicit conversion_overrun(std::string const &);
-};
-
-
-/// Something is out of range, similar to std::out_of_range
-struct PQXX_LIBEXPORT range_error : std::out_of_range
-{
-  explicit range_error(std::string const &);
-};
-
-
-/// Query returned an unexpected number of rows.
-struct PQXX_LIBEXPORT unexpected_rows : public range_error
-{
-  explicit unexpected_rows(std::string const &msg) : range_error{msg} {}
-};
-
-
-/// Database feature not supported in current setup.
-struct PQXX_LIBEXPORT feature_not_supported : sql_error
-{
-  explicit feature_not_supported(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Error in data provided to SQL statement.
-struct PQXX_LIBEXPORT data_exception : sql_error
-{
-  explicit data_exception(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT integrity_constraint_violation : sql_error
-{
-  explicit integrity_constraint_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT restrict_violation : integrity_constraint_violation
-{
-  explicit restrict_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT not_null_violation : integrity_constraint_violation
-{
-  explicit not_null_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT foreign_key_violation : integrity_constraint_violation
-{
-  explicit foreign_key_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT unique_violation : integrity_constraint_violation
-{
-  explicit unique_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT check_violation : integrity_constraint_violation
-{
-  explicit check_violation(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          integrity_constraint_violation{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_cursor_state : sql_error
-{
-  explicit invalid_cursor_state(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_sql_statement_name : sql_error
-{
-  explicit invalid_sql_statement_name(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT invalid_cursor_name : sql_error
-{
-  explicit invalid_cursor_name(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT syntax_error : sql_error
-{
-  /// Approximate position in string where error occurred, or -1 if unknown.
-  int const error_position;
-
-  explicit syntax_error(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr, int pos = -1) :
-          sql_error{err, Q, sqlstate}, error_position{pos}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_column : syntax_error
-{
-  explicit undefined_column(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_function : syntax_error
-{
-  explicit undefined_function(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT undefined_table : syntax_error
-{
-  explicit undefined_table(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          syntax_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT insufficient_privilege : sql_error
-{
-  explicit insufficient_privilege(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Resource shortage on the server
-struct PQXX_LIBEXPORT insufficient_resources : sql_error
-{
-  explicit insufficient_resources(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT disk_full : insufficient_resources
-{
-  explicit disk_full(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          insufficient_resources{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT out_of_memory : insufficient_resources
-{
-  explicit out_of_memory(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          insufficient_resources{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT too_many_connections : broken_connection
-{
-  explicit too_many_connections(std::string const &err) :
-          broken_connection{err}
-  {}
-};
-
-/// PL/pgSQL error
-/** Exceptions derived from this class are errors from PL/pgSQL procedures.
- */
-struct PQXX_LIBEXPORT plpgsql_error : sql_error
-{
-  explicit plpgsql_error(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          sql_error{err, Q, sqlstate}
-  {}
-};
-
-/// Exception raised in PL/pgSQL procedure
-struct PQXX_LIBEXPORT plpgsql_raise : plpgsql_error
-{
-  explicit plpgsql_raise(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT plpgsql_no_data_found : plpgsql_error
-{
-  explicit plpgsql_no_data_found(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT plpgsql_too_many_rows : plpgsql_error
-{
-  explicit plpgsql_too_many_rows(
-    std::string const &err, std::string const &Q = "",
-    char const sqlstate[] = nullptr) :
-          plpgsql_error{err, Q, sqlstate}
-  {}
-};
-
-struct PQXX_LIBEXPORT blob_already_exists : failure
-{
-  explicit blob_already_exists(std::string const &);
-};
-
-/**
- * @}
- */
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/field b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/field
deleted file mode 100644
index 37cb69e84..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/field
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::field class.
- *
- * pqxx::field refers to a field in a query result.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/field.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/field.hxx
deleted file mode 100644
index b8b869fe4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/field.hxx
+++ /dev/null
@@ -1,542 +0,0 @@
-/* Definitions for the pqxx::field class.
- *
- * pqxx::field refers to a field in a query result.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/field instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_FIELD
-#define PQXX_H_FIELD
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <optional>
-
-#include "pqxx/array.hxx"
-#include "pqxx/composite.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/types.hxx"
-
-namespace pqxx
-{
-/// Reference to a field in a result set.
-/** A field represents one entry in a row.  It represents an actual value
- * in the result set, and can be converted to various types.
- */
-class PQXX_LIBEXPORT field
-{
-public:
-  using size_type = field_size_type;
-
-  /// Constructor.  Do not call this yourself; libpqxx will do it for you.
-  /** Create field as reference to a field in a result set.
-   * @param r Row that this field is part of.
-   * @param c Column number of this field.
-   */
-  [[deprecated(
-    "Do not construct fields yourself.  Get them from the row.")]] field(row const &r, row_size_type c) noexcept;
-
-  /// Constructor.  Do not call this yourself; libpqxx will do it for you.
-  [[deprecated(
-    "Do not construct fields yourself.  Get them from the "
-    "row.")]] field() noexcept = default;
-
-  /**
-   * @name Comparison
-   */
-  //@{
-  // TODO: noexcept.  Breaks ABI.
-  /// Byte-by-byte comparison of two fields (all nulls are considered equal)
-  /** @warning null handling is still open to discussion and change!
-   *
-   * Handling of null values differs from that in SQL where a comparison
-   * involving a null value yields null, so nulls are never considered equal
-   * to one another or even to themselves.
-   *
-   * Null handling also probably differs from the closest equivalent in C++,
-   * which is the NaN (Not-a-Number) value, a singularity comparable to
-   * SQL's null.  This is because the builtin == operator demands that a == a.
-   *
-   * The usefulness of this operator is questionable.  No interpretation
-   * whatsoever is imposed on the data; 0 and 0.0 are considered different,
-   * as are null vs. the empty string, or even different (but possibly
-   * equivalent and equally valid) encodings of the same Unicode character
-   * etc.
-   */
-  [[nodiscard]] PQXX_PURE bool operator==(field const &) const;
-
-  /// Byte-by-byte comparison (all nulls are considered equal)
-  /** @warning See operator==() for important information about this operator
-   */
-  [[nodiscard]] PQXX_PURE bool operator!=(field const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Column name.
-  [[nodiscard]] PQXX_PURE char const *name() const &;
-
-  /// Column type.
-  [[nodiscard]] oid PQXX_PURE type() const;
-
-  /// What table did this column come from?
-  [[nodiscard]] PQXX_PURE oid table() const;
-
-  /// Return row number.  The first row is row 0, the second is row 1, etc.
-  PQXX_PURE constexpr row_size_type num() const noexcept { return col(); }
-
-  /// What column number in its originating table did this column come from?
-  [[nodiscard]] PQXX_PURE row_size_type table_column() const;
-  //@}
-
-  /**
-   * @name Content access
-   */
-  //@{
-  /// Read as `string_view`, or an empty one if null.
-  /** The result only remains usable while the data for the underlying
-   * @ref result exists.  Once all `result` objects referring to that data have
-   * been destroyed, the `string_view` will no longer point to valid memory.
-   */
-  [[nodiscard]] PQXX_PURE std::string_view view() const &
-  {
-    return std::string_view(c_str(), size());
-  }
-
-  /// Read as plain C string.
-  /** Since the field's data is stored internally in the form of a
-   * zero-terminated C string, this is the fastest way to read it.  Use the
-   * to() or as() functions to convert the string to other types such as
-   * `int`, or to C++ strings.
-   *
-   * Do not use this for BYTEA values, or other binary values.  To read those,
-   * convert the value to your desired type using `to()` or `as()`.  For
-   * example: `f.as<std::basic_string<std::byte>>()`.
-   */
-  [[nodiscard]] PQXX_PURE char const *c_str() const &;
-
-  /// Is this field's value null?
-  [[nodiscard]] PQXX_PURE bool is_null() const noexcept;
-
-  /// Return number of bytes taken up by the field's value.
-  [[nodiscard]] PQXX_PURE size_type size() const noexcept;
-
-  /// Read value into obj; or if null, leave obj untouched and return `false`.
-  /** This can be used with optional types (except pointers other than C-style
-   * strings).
-   */
-  template<typename T>
-  auto to(T &obj) const -> typename std::enable_if_t<
-    (not std::is_pointer<T>::value or std::is_same<T, char const *>::value),
-    bool>
-  {
-    if (is_null())
-    {
-      return false;
-    }
-    else
-    {
-      auto const bytes{c_str()};
-      from_string(bytes, obj);
-      return true;
-    }
-  }
-
-  /// Read field as a composite value, write its components into `fields`.
-  /** @warning This is still experimental.  It may change or be replaced.
-   *
-   * Returns whether the field was null.  If it was, it will not touch the
-   * values in `fields`.
-   */
-  template<typename... T> bool composite_to(T &...fields) const
-  {
-    if (is_null())
-    {
-      return false;
-    }
-    else
-    {
-      parse_composite(m_home.m_encoding, view(), fields...);
-      return true;
-    }
-  }
-
-  /// Read value into obj; or leave obj untouched and return `false` if null.
-  template<typename T> bool operator>>(T &obj) const { return to(obj); }
-
-  /// Read value into obj; or if null, use default value and return `false`.
-  /** This can be used with `std::optional`, as well as with standard smart
-   * pointer types, but not with raw pointers.  If the conversion from a
-   * PostgreSQL string representation allocates a pointer (e.g. using `new`),
-   * then the object's later deallocation should be baked in as well, right
-   * from the point where the object is created.  So if you want a pointer, use
-   * a smart pointer, not a raw pointer.
-   *
-   * There is one exception, of course: C-style strings.  Those are just
-   * pointers to the field's internal text data.
-   */
-  template<typename T>
-  auto to(T &obj, T const &default_value) const -> typename std::enable_if_t<
-    (not std::is_pointer<T>::value or std::is_same<T, char const *>::value),
-    bool>
-  {
-    bool const null{is_null()};
-    if (null)
-      obj = default_value;
-    else
-      obj = from_string<T>(this->view());
-    return not null;
-  }
-
-  /// Return value as object of given type, or default value if null.
-  /** Note that unless the function is instantiated with an explicit template
-   * argument, the Default value's type also determines the result type.
-   */
-  template<typename T> T as(T const &default_value) const
-  {
-    if (is_null())
-      return default_value;
-    else
-      return from_string<T>(this->view());
-  }
-
-  /// Return value as object of given type, or throw exception if null.
-  /** Use as `as<std::optional<int>>()` or `as<my_untemplated_optional_t>()` as
-   * an alternative to `get<int>()`; this is disabled for use with raw pointers
-   * (other than C-strings) because storage for the value can't safely be
-   * allocated here
-   */
-  template<typename T> T as() const
-  {
-    if (is_null())
-    {
-      if constexpr (not nullness<T>::has_null)
-        internal::throw_null_conversion(type_name<T>);
-      else
-        return nullness<T>::null();
-    }
-    else
-    {
-      return from_string<T>(this->view());
-    }
-  }
-
-  /// Return value wrapped in some optional type (empty for nulls).
-  /** Use as `get<int>()` as before to obtain previous behavior, or specify
-   * container type with `get<int, std::optional>()`
-   */
-  template<typename T, template<typename> class O = std::optional>
-  constexpr O<T> get() const
-  {
-    return as<O<T>>();
-  }
-
-  // TODO: constexpr noexcept, once array_parser constructor gets those.
-  /// Parse the field as an SQL array.
-  /** Call the parser to retrieve values (and structure) from the array.
-   *
-   * Make sure the @ref result object stays alive until parsing is finished. If
-   * you keep the @ref row of `field` object alive, it will keep the @ref
-   * result object alive as well.
-   */
-  array_parser as_array() const &
-  {
-    return array_parser{c_str(), m_home.m_encoding};
-  }
-  //@}
-
-
-protected:
-  constexpr result const &home() const noexcept { return m_home; }
-  constexpr result::size_type idx() const noexcept { return m_row; }
-  constexpr row_size_type col() const noexcept { return m_col; }
-
-  // TODO: Create gates.
-  friend class pqxx::result;
-  friend class pqxx::row;
-  field(
-    result const &r, result_size_type row_num, row_size_type col_num) noexcept
-          :
-          m_col{col_num}, m_home{r}, m_row{row_num}
-  {}
-
-  /**
-   * You'd expect this to be unsigned, but due to the way reverse iterators
-   * are related to regular iterators, it must be allowed to underflow to -1.
-   */
-  row_size_type m_col;
-
-private:
-  result m_home;
-  result::size_type m_row;
-};
-
-
-template<> inline bool field::to<std::string>(std::string &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = std::string{view()};
-  return not null;
-}
-
-
-template<>
-inline bool field::to<std::string>(
-  std::string &obj, std::string const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = std::string{view()};
-  return not null;
-}
-
-
-/// Specialization: `to(char const *&)`.
-/** The buffer has the same lifetime as the data in this result (i.e. of this
- * result object, or the last remaining one copied from it etc.), so take care
- * not to use it after the last result object referring to this query result is
- * destroyed.
- */
-template<> inline bool field::to<char const *>(char const *&obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = c_str();
-  return not null;
-}
-
-
-template<> inline bool field::to<std::string_view>(std::string_view &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = view();
-  return not null;
-}
-
-
-template<>
-inline bool field::to<std::string_view>(
-  std::string_view &obj, std::string_view const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = view();
-  return not null;
-}
-
-
-template<> inline std::string_view field::as<std::string_view>() const
-{
-  if (is_null())
-    PQXX_UNLIKELY
-  internal::throw_null_conversion(type_name<std::string_view>);
-  return view();
-}
-
-
-template<>
-inline std::string_view
-field::as<std::string_view>(std::string_view const &default_value) const
-{
-  return is_null() ? default_value : view();
-}
-
-
-template<> inline bool field::to<zview>(zview &obj) const
-{
-  bool const null{is_null()};
-  if (not null)
-    obj = zview{c_str(), size()};
-  return not null;
-}
-
-
-template<>
-inline bool field::to<zview>(zview &obj, zview const &default_value) const
-{
-  bool const null{is_null()};
-  if (null)
-    obj = default_value;
-  else
-    obj = zview{c_str(), size()};
-  return not null;
-}
-
-
-template<> inline zview field::as<zview>() const
-{
-  if (is_null())
-    PQXX_UNLIKELY
-  internal::throw_null_conversion(type_name<zview>);
-  return zview{c_str(), size()};
-}
-
-
-template<> inline zview field::as<zview>(zview const &default_value) const
-{
-  return is_null() ? default_value : zview{c_str(), size()};
-}
-
-
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class field_streambuf : public std::basic_streambuf<CHAR, TRAITS>
-{
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-  using openmode = std::ios::openmode;
-  using seekdir = std::ios::seekdir;
-
-  explicit field_streambuf(field const &f) : m_field{f} { initialize(); }
-
-protected:
-  virtual int sync() override { return traits_type::eof(); }
-
-  virtual pos_type seekoff(off_type, seekdir, openmode) override
-  {
-    return traits_type::eof();
-  }
-  virtual pos_type seekpos(pos_type, openmode) override
-  {
-    return traits_type::eof();
-  }
-  virtual int_type overflow(int_type) override { return traits_type::eof(); }
-  virtual int_type underflow() override { return traits_type::eof(); }
-
-private:
-  field const &m_field;
-
-  int_type initialize()
-  {
-    auto g{static_cast<char_type *>(const_cast<char *>(m_field.c_str()))};
-    this->setg(g, g, g + std::size(m_field));
-    return int_type(std::size(m_field));
-  }
-};
-
-
-/// Input stream that gets its data from a result field
-/** Use this class exactly as you would any other istream to read data from a
- * field.  All formatting and streaming operations of `std::istream` are
- * supported.  What you'll typically want to use, however, is the fieldstream
- * alias (which defines a @ref basic_fieldstream for `char`).  This is similar
- * to how e.g. `std::ifstream` relates to `std::basic_ifstream`.
- *
- * This class has only been tested for the char type (and its default traits).
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_fieldstream : public std::basic_istream<CHAR, TRAITS>
-{
-  using super = std::basic_istream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-  basic_fieldstream(field const &f) : super{nullptr}, m_buf{f}
-  {
-    super::init(&m_buf);
-  }
-
-private:
-  field_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using fieldstream = basic_fieldstream<char>;
-
-/// Write a result field to any type of stream
-/** This can be convenient when writing a field to an output stream.  More
- * importantly, it lets you write a field to e.g. a `stringstream` which you
- * can then use to read, format and convert the field in ways that to() does
- * not support.
- *
- * Example: parse a field into a variable of the nonstandard
- * "<tt>long long</tt>" type.
- *
- * ```cxx
- * extern result R;
- * long long L;
- * stringstream S;
- *
- * // Write field's string into S
- * S << R[0][0];
- *
- * // Parse contents of S into L
- * S >> L;
- * ```
- */
-template<typename CHAR>
-inline std::basic_ostream<CHAR> &
-operator<<(std::basic_ostream<CHAR> &s, field const &value)
-{
-  s.write(value.c_str(), std::streamsize(std::size(value)));
-  return s;
-}
-
-
-/// Convert a field's value to type `T`.
-/** Unlike the "regular" `from_string`, this knows how to deal with null
- * values.
- */
-template<typename T> inline T from_string(field const &value)
-{
-  if (value.is_null())
-  {
-    if constexpr (nullness<T>::has_null)
-      return nullness<T>::null();
-    else
-      internal::throw_null_conversion(type_name<T>);
-  }
-  else
-  {
-    return from_string<T>(value.view());
-  }
-}
-
-
-/// Convert a field's value to `nullptr_t`.
-/** Yes, you read that right.  This conversion does nothing useful.  It always
- * returns `nullptr`.
- *
- * Except... what if the field is not null?  In that case, this throws
- * @ref conversion_error.
- */
-template<>
-inline std::nullptr_t from_string<std::nullptr_t>(field const &value)
-{
-  if (not value.is_null())
-    throw conversion_error{
-      "Extracting non-null field into nullptr_t variable."};
-  return nullptr;
-}
-
-
-/// Convert a field to a string.
-template<> PQXX_LIBEXPORT std::string to_string(field const &value);
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/array-composite.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/array-composite.hxx
deleted file mode 100644
index d2b6603e5..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/array-composite.hxx
+++ /dev/null
@@ -1,305 +0,0 @@
-#if !defined(PQXX_ARRAY_COMPOSITE_HXX)
-#  define PQXX_ARRAY_COMPOSITE_HXX
-
-#  include <cassert>
-
-#  include "pqxx/strconv.hxx"
-
-namespace pqxx::internal
-{
-// Find the end of a double-quoted string.
-/** `input[pos]` must be the opening double quote.
- *
- * Returns the offset of the first position after the closing quote.
- */
-inline std::size_t scan_double_quoted_string(
-  char const input[], std::size_t size, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  // XXX: find_char<'"', '\\'>().
-  auto next{scan(input, size, pos)};
-  bool at_quote{false};
-  for (pos = next, next = scan(input, size, pos); pos < size;
-       pos = next, next = scan(input, size, pos))
-  {
-    if (at_quote)
-    {
-      if (next - pos == 1 and input[pos] == '"')
-      {
-        // We just read a pair of double quotes.  Carry on.
-        at_quote = false;
-      }
-      else
-      {
-        // We just read one double quote, and now we're at a character that's
-        // not a second double quote.  Ergo, that last character was the
-        // closing double quote and this is the position right after it.
-        return pos;
-      }
-    }
-    else if (next - pos == 1)
-    {
-      switch (input[pos])
-      {
-      case '\\':
-        // Backslash escape.  Skip ahead by one more character.
-        pos = next;
-        next = scan(input, size, pos);
-        break;
-
-      case '"':
-        // This is either the closing double quote, or the first of a pair of
-        // double quotes.
-        at_quote = true;
-        break;
-      }
-    }
-    else
-    {
-      // Multibyte character.  Carry on.
-    }
-  }
-  if (not at_quote)
-    throw argument_error{
-      "Missing closing double-quote: " + std::string{input}};
-  return pos;
-}
-
-
-/// Un-quote and un-escape a double-quoted SQL string.
-inline std::string parse_double_quoted_string(
-  char const input[], std::size_t end, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  std::string output;
-  // Maximum output size is same as the input size, minus the opening and
-  // closing quotes.  Or in the extreme opposite case, the real number could be
-  // half that.  Usually it'll be a pretty close estimate.
-  output.reserve(std::size_t(end - pos - 2));
-
-  for (auto here{scan(input, end, pos)}, next{scan(input, end, here)};
-       here < end - 1; here = next, next = scan(input, end, here))
-  {
-    // A backslash here is always an escape.  So is a double-quote, since we're
-    // inside the double-quoted string.  In either case, we can just ignore the
-    // escape character and use the next character.  This is the one redeeming
-    // feature of SQL's escaping system.
-    if ((next - here == 1) and (input[here] == '\\' or input[here] == '"'))
-    {
-      // Skip escape.
-      here = next;
-      next = scan(input, end, here);
-    }
-    output.append(input + here, input + next);
-  }
-  return output;
-}
-
-
-/// Find the end of an unquoted string in an array or composite-type value.
-/** Stops when it gets to the end of the input; or when it sees any of the
- * characters in STOP which has not been escaped.
- *
- * For array values, STOP is a comma, a semicolon, or a closing brace.  For
- * a value of a composite type, STOP is a comma or a closing parenthesis.
- */
-template<char... STOP>
-inline std::size_t scan_unquoted_string(
-  char const input[], std::size_t size, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  bool at_backslash{false};
-  auto next{scan(input, size, pos)};
-  while ((pos < size) and
-         ((next - pos) > 1 or at_backslash or ((input[pos] != STOP) and ...)))
-  {
-    pos = next;
-    next = scan(input, size, pos);
-    at_backslash =
-      ((not at_backslash) and ((next - pos) == 1) and (input[pos] == '\\'));
-  }
-  return pos;
-}
-
-
-/// Parse an unquoted array entry or cfield of a composite-type field.
-inline std::string parse_unquoted_string(
-  char const input[], std::size_t end, std::size_t pos,
-  pqxx::internal::glyph_scanner_func *scan)
-{
-  std::string output;
-  bool at_backslash{false};
-  output.reserve(end - pos);
-  for (auto next{scan(input, end, pos)}; pos < end;
-       pos = next, next = scan(input, end, pos))
-  {
-    at_backslash =
-      ((not at_backslash) and ((next - pos) == 1) and (input[pos] == '\\'));
-    if (not at_backslash)
-      output.append(input + pos, next - pos);
-  }
-  return output;
-}
-
-
-/// Parse a field of a composite-type value.
-/** `T` is the C++ type of the field we're parsing, and `index` is its
- * zero-based number.
- *
- * Strip off the leading parenthesis or bracket yourself before parsing.
- * However, this function will parse the lcosing parenthesis or bracket.
- *
- * After a successful parse, `pos` will point at `std::end(text)`.
- *
- * For the purposes of parsing, ranges and arrays count as compositve values,
- * so this function supports parsing those.  If you specifically need a closing
- * parenthesis, check afterwards that `text` did not end in a bracket instead.
- *
- * @param index Index of the current field, zero-based.  It will increment for
- *     the next field.
- * @param input Full input text for the entire composite-type value.
- * @param pos Starting position (in `input`) of the field that we're parsing.
- *     After parsing, this will point at the beginning of the next field if
- *     there is one, or one position past the last character otherwise.
- * @param field Destination for the parsed value.
- * @param scan Glyph scanning function for the relevant encoding type.
- * @param last_field Number of the last field in the value (zero-based).  When
- *     parsing the last field, this will equal `index`.
- */
-template<typename T>
-inline void parse_composite_field(
-  std::size_t &index, std::string_view input, std::size_t &pos, T &field,
-  glyph_scanner_func *scan, std::size_t last_field)
-{
-  assert(index <= last_field);
-  auto next{scan(std::data(input), std::size(input), pos)};
-  if ((next - pos) != 1)
-    throw conversion_error{"Non-ASCII character in composite-type syntax."};
-
-  // Expect a field.
-  switch (input[pos])
-  {
-  case ',':
-  case ')':
-  case ']':
-    // The field is empty, i.e, null.
-    if constexpr (nullness<T>::has_null)
-      field = nullness<T>::null();
-    else
-      throw conversion_error{
-        "Can't read composite field " + to_string(index) + ": C++ type " +
-        type_name<T> + " does not support nulls."};
-    break;
-
-  case '"': {
-    auto const stop{scan_double_quoted_string(
-      std::data(input), std::size(input), pos, scan)};
-    auto const text{
-      parse_double_quoted_string(std::data(input), stop, pos, scan)};
-    field = from_string<T>(text);
-    pos = stop;
-  }
-  break;
-
-  default: {
-    auto const stop{scan_unquoted_string<',', ')', ']'>(
-      std::data(input), std::size(input), pos, scan)};
-    auto const text{parse_unquoted_string(std::data(input), stop, pos, scan)};
-    field = from_string<T>(text);
-    pos = stop;
-  }
-  break;
-  }
-
-  // Expect a comma or a closing parenthesis.
-  next = scan(std::data(input), std::size(input), pos);
-
-  if ((next - pos) != 1)
-    throw conversion_error{
-      "Unexpected non-ASCII character after composite field: " +
-      std::string{input}};
-
-  if (index < last_field)
-  {
-    if (input[pos] != ',')
-      throw conversion_error{
-        "Found '" + std::string{input[pos]} +
-        "' in composite value where comma was expected: " + std::data(input)};
-  }
-  else
-  {
-    if (input[pos] == ',')
-      throw conversion_error{
-        "Composite value contained more fields than the expected " +
-        to_string(last_field) + ": " + std::data(input)};
-    if (input[pos] != ')' and input[pos] != ']')
-      throw conversion_error{
-        "Composite value has unexpected characters where closing parenthesis "
-        "was expected: " +
-        std::string{input}};
-    if (next != std::size(input))
-      throw conversion_error{
-        "Composite value has unexpected text after closing parenthesis: " +
-        std::string{input}};
-  }
-
-  pos = next;
-  ++index;
-}
-
-
-/// Conservatively estimate buffer size needed for a composite field.
-template<typename T>
-inline std::size_t size_composite_field_buffer(T const &field)
-{
-  if constexpr (is_unquoted_safe<T>)
-  {
-    // Safe to copy, without quotes or escaping.  Drop the terminating zero.
-    return size_buffer(field) - 1;
-  }
-  else
-  {
-    // + Opening quote.
-    // + Field budget.
-    // - Terminating zero.
-    // + Escaping for each byte in the field's string representation.
-    // - Escaping for terminating zero.
-    // + Closing quote.
-    return 1 + 2 * (size_buffer(field) - 1) + 1;
-  }
-}
-
-
-template<typename T>
-inline void write_composite_field(char *&pos, char *end, T const &field)
-{
-  if constexpr (is_unquoted_safe<T>)
-  {
-    // No need for quoting or escaping.  Convert it straight into its final
-    // place in the buffer, and "backspace" the trailing zero.
-    pos = string_traits<T>::into_buf(pos, end, field) - 1;
-  }
-  else
-  {
-    // The field may need escaping, which means we need an intermediate buffer.
-    // To avoid allocating that at run time, we use the end of the buffer that
-    // we have.
-    auto const budget{size_buffer(field)};
-    *pos++ = '"';
-
-    // Now escape buf into its final position.
-    for (char const c : string_traits<T>::to_buf(end - budget, end, field))
-    {
-      if ((c == '"') or (c == '\\'))
-        *pos++ = '\\';
-
-      *pos++ = c;
-    }
-
-    *pos++ = '"';
-  }
-
-  *pos++ = ',';
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/callgate.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/callgate.hxx
deleted file mode 100644
index 42f7703e3..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/callgate.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef PQXX_H_CALLGATE
-#define PQXX_H_CALLGATE
-
-/*
-Here's what a typical gate class definition looks like:
-
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE @gateclass@ : callgate<@host@>
-{
-  friend class @client@;
-
-  @gateclass@(reference x) : super(x) {}
-
-  // Methods here.  Use home() to access the host-class object.
-};
-} // namespace pqxx::internal::gate
-*/
-
-namespace pqxx::internal
-{
-/// Base class for call gates.
-/**
- * A call gate defines a limited, private interface on the host class that
- * specified client classes can access.
- *
- * The metaphor works as follows: the gate stands in front of a "home," which
- * is really a class, and only lets specific friends in.
- *
- * To implement a call gate that gives client C access to host H,
- * * derive a gate class from callgate<H>;
- * * make the gate class a friend of H;
- * * make C a friend of the gate class; and
- * * implement "stuff C can do with H" as private members in the gate class.
- *
- * This special kind of "gated" friendship gives C private access to H, but
- * only through an expressly limited interface.  The gate class can access its
- * host object as home().
- *
- * Keep gate classes entirely stateless.  They should be ultra-lightweight
- * wrappers for their host classes, and be optimized away as much as possible
- * by the compiler.  Once you start adding state, you're on a slippery slope
- * away from the pure, clean, limited interface pattern that gate classes are
- * meant to implement.
- *
- * Ideally, all member functions of the gate class should be one-liners passing
- * calls straight on to the host class.  It can be useful however to break this
- * rule temporarily during inter-class refactoring.
- */
-template<typename HOME> class PQXX_PRIVATE callgate
-{
-protected:
-  /// This class, to keep constructors easy.
-  using super = callgate<HOME>;
-  /// A reference to the host class.  Helps keep constructors easy.
-  using reference = HOME &;
-
-  callgate(reference x) : m_home(x) {}
-
-  /// The home object.  The gate class has full "private" access.
-  reference home() const noexcept { return m_home; }
-
-private:
-  reference m_home;
-};
-} // namespace pqxx::internal
-
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/concat.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/concat.hxx
deleted file mode 100644
index cd28bde7c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/concat.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#if !defined(PQXX_CONCAT_HXX)
-#  define PQXX_CONCAT_HXX
-
-#  include <string>
-#  include <string_view>
-
-#  include "pqxx/strconv.hxx"
-
-namespace pqxx::internal
-{
-/// Convert item to a string, write it into [here, end).
-template<typename TYPE>
-void render_item(TYPE const &item, char *&here, char *end)
-{
-  here = string_traits<TYPE>::into_buf(here, end, item) - 1;
-}
-
-
-// C++20: Support non-random_access_range ranges.
-/// Efficiently combine a bunch of items into one big string.
-/** Use this as an optimised version of string concatentation.  It takes just
- * about any type; it will represent each item as a string according to its
- * @ref string_traits.
- *
- * This is a simpler, more specialised version of @ref separated_list for a
- * statically known series of items, possibly of different types.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::string concat(TYPE... item)
-{
-  std::string buf;
-  // Size to accommodate string representations of all inputs, minus their
-  // terminating zero bytes.
-  buf.resize(size_buffer(item...));
-
-  char *const data{buf.data()};
-  char *here = data;
-  char *end = data + std::size(buf);
-  (render_item(item, here, end), ...);
-
-  buf.resize(static_cast<std::size_t>(here - data));
-  return buf;
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/conversions.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/conversions.hxx
deleted file mode 100644
index 1df4fdead..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/conversions.hxx
+++ /dev/null
@@ -1,1188 +0,0 @@
-#include <array>
-#include <cstring>
-#include <map>
-#include <memory>
-#include <numeric>
-#include <optional>
-
-#if defined(PQXX_HAVE_SPAN) && __has_include(<span>)
-#  include <span>
-#endif
-
-#include <type_traits>
-#include <variant>
-#include <vector>
-
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-
-
-/* Internal helpers for string conversion, and conversion implementations.
- *
- * Do not include this header directly.  The libpqxx headers do it for you.
- */
-namespace pqxx::internal
-{
-/// Convert a number in [0, 9] to its ASCII digit.
-inline constexpr char number_to_digit(int i) noexcept
-{
-  return static_cast<char>(i + '0');
-}
-
-
-/// Compute numeric value of given textual digit (assuming that it is a digit).
-constexpr int digit_to_number(char c) noexcept
-{
-  return c - '0';
-}
-
-
-/// Summarize buffer overrun.
-/** Don't worry about the exact parameter types: the sizes will be reasonably
- * small, and nonnegative.
- */
-std::string PQXX_LIBEXPORT
-state_buffer_overrun(int have_bytes, int need_bytes);
-
-
-template<typename HAVE, typename NEED>
-inline std::string state_buffer_overrun(HAVE have_bytes, NEED need_bytes)
-{
-  return state_buffer_overrun(
-    static_cast<int>(have_bytes), static_cast<int>(need_bytes));
-}
-
-
-/// Throw exception for attempt to convert null to given type.
-[[noreturn]] PQXX_LIBEXPORT void
-throw_null_conversion(std::string const &type);
-
-
-/// Deliberately nonfunctional conversion traits for `char` types.
-/** There are no string conversions for `char` and its signed and unsigned
- * variants.  Such a conversion would be dangerously ambiguous: should we treat
- * it as text, or as a small integer?  It'd be an open invitation for bugs.
- *
- * But the error message when you get this wrong is very cryptic.  So, we
- * derive dummy @ref string_traits implementations from this dummy type, and
- * ensure that the compiler disallows their use.  The compiler error message
- * will at least contain a hint of the root of the problem.
- */
-template<typename CHAR_TYPE> struct disallowed_ambiguous_char_conversion
-{
-  static char *into_buf(char *, char *, CHAR_TYPE) = delete;
-  static constexpr zview
-  to_buf(char *, char *, CHAR_TYPE const &) noexcept = delete;
-
-  static constexpr std::size_t
-  size_buffer(CHAR_TYPE const &) noexcept = delete;
-  static CHAR_TYPE from_string(std::string_view) = delete;
-};
-
-
-template<typename T> PQXX_LIBEXPORT extern std::string to_string_float(T);
-
-
-/// Generic implementation for into_buf, on top of to_buf.
-template<typename T>
-inline char *generic_into_buf(char *begin, char *end, T const &value)
-{
-  zview const text{string_traits<T>::to_buf(begin, end, value)};
-  auto const space{end - begin};
-  // Include the trailing zero.
-  auto const len = std::size(text) + 1;
-  if (internal::cmp_greater(len, space))
-    throw conversion_overrun{
-      "Not enough buffer space to insert " + type_name<T> + ".  " +
-      state_buffer_overrun(space, len)};
-  std::memmove(begin, text.data(), len);
-  return begin + len;
-}
-
-
-/// String traits for builtin integral types (though not bool).
-template<typename T> struct integral_traits
-{
-  static PQXX_LIBEXPORT T from_string(std::string_view text);
-  static PQXX_LIBEXPORT zview to_buf(char *begin, char *end, T const &value);
-  static PQXX_LIBEXPORT char *into_buf(char *begin, char *end, T const &value);
-
-  static constexpr std::size_t size_buffer(T const &) noexcept
-  {
-    /** Includes a sign if needed; the number of base-10 digits which the type
-     * can reliably represent; the one extra base-10 digit which the type can
-     * only partially represent; and the terminating zero.
-     */
-    return std::is_signed_v<T> + std::numeric_limits<T>::digits10 + 1 + 1;
-  }
-};
-
-
-/// String traits for builtin floating-point types.
-template<typename T> struct float_traits
-{
-  static PQXX_LIBEXPORT T from_string(std::string_view text);
-  static PQXX_LIBEXPORT zview to_buf(char *begin, char *end, T const &value);
-  static PQXX_LIBEXPORT char *into_buf(char *begin, char *end, T const &value);
-
-  // Return a nonnegative integral value's number of decimal digits.
-  static constexpr std::size_t digits10(std::size_t value) noexcept
-  {
-    if (value < 10)
-      return 1;
-    else
-      return 1 + digits10(value / 10);
-  }
-
-  static constexpr std::size_t size_buffer(T const &) noexcept
-  {
-    using lims = std::numeric_limits<T>;
-    // See #328 for a detailed discussion on the maximum number of digits.
-    //
-    // In a nutshell: for the big cases, the scientific notation is always
-    // the shortest one, and therefore the one that to_chars will pick.
-    //
-    // So... How long can the scientific notation get?  1 (for sign) + 1 (for
-    // decimal point) + 1 (for 'e') + 1 (for exponent sign) + max_digits10 +
-    // max number of digits in the exponent + 1 (terminating zero).
-    //
-    // What's the max number of digits in the exponent?  It's the max number of
-    // digits out of the most negative exponent and the most positive one.
-    //
-    // The longest positive exponent is easy: 1 + ceil(log10(max_exponent10)).
-    // (The extra 1 is because 10^n takes up 1 + n digits, not n.)
-    //
-    // The longest negative exponent is a bit harder: min_exponent10 gives us
-    // the smallest power of 10 which a normalised version of T can represent.
-    // But the smallest denormalised power of 10 that T can represent is
-    // another max_digits10 powers of 10 below that.
-    // needs a minus sign.
-    //
-    // All this stuff messes with my head a bit because it's on the order of
-    // log10(log10(n)).  It's easy to get the number of logs wrong.
-    auto const max_pos_exp{digits10(lims::max_exponent10)};
-    // Really want std::abs(lims::min_exponent10), but MSVC 2017 apparently has
-    // problems with std::abs.  So we use -lims::min_exponent10 instead.
-    auto const max_neg_exp{
-      digits10(lims::max_digits10 - lims::min_exponent10)};
-    return 1 +                                    // Sign.
-           1 +                                    // Decimal point.
-           std::numeric_limits<T>::max_digits10 + // Mantissa digits.
-           1 +                                    // Exponent "e".
-           1 +                                    // Exponent sign.
-           // Spell this weirdly to stop Windows compilers from reading this as
-           // a call to their "max" macro when NOMINMAX is not defined.
-           (std::max)(max_pos_exp, max_neg_exp) + // Exponent digits.
-           1;                                     // Terminating zero.
-  }
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// The built-in arithmetic types do not have inherent null values.
-template<typename T>
-struct nullness<T, std::enable_if_t<std::is_arithmetic_v<T>>> : no_null<T>
-{};
-
-
-template<> struct string_traits<short> : internal::integral_traits<short>
-{};
-template<> inline constexpr bool is_unquoted_safe<short>{true};
-template<>
-struct string_traits<unsigned short>
-        : internal::integral_traits<unsigned short>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned short>{true};
-template<> struct string_traits<int> : internal::integral_traits<int>
-{};
-template<> inline constexpr bool is_unquoted_safe<int>{true};
-template<> struct string_traits<unsigned> : internal::integral_traits<unsigned>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned>{true};
-template<> struct string_traits<long> : internal::integral_traits<long>
-{};
-template<> inline constexpr bool is_unquoted_safe<long>{true};
-template<>
-struct string_traits<unsigned long> : internal::integral_traits<unsigned long>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned long>{true};
-template<>
-struct string_traits<long long> : internal::integral_traits<long long>
-{};
-template<> inline constexpr bool is_unquoted_safe<long long>{true};
-template<>
-struct string_traits<unsigned long long>
-        : internal::integral_traits<unsigned long long>
-{};
-template<> inline constexpr bool is_unquoted_safe<unsigned long long>{true};
-template<> struct string_traits<float> : internal::float_traits<float>
-{};
-template<> inline constexpr bool is_unquoted_safe<float>{true};
-template<> struct string_traits<double> : internal::float_traits<double>
-{};
-template<> inline constexpr bool is_unquoted_safe<double>{true};
-template<>
-struct string_traits<long double> : internal::float_traits<long double>
-{};
-template<> inline constexpr bool is_unquoted_safe<long double>{true};
-
-
-template<> struct string_traits<bool>
-{
-  static PQXX_LIBEXPORT bool from_string(std::string_view text);
-
-  static constexpr zview to_buf(char *, char *, bool const &value) noexcept
-  {
-    return value ? "true"_zv : "false"_zv;
-  }
-
-  static char *into_buf(char *begin, char *end, bool const &value)
-  {
-    return pqxx::internal::generic_into_buf(begin, end, value);
-  }
-
-  static constexpr std::size_t size_buffer(bool const &) noexcept { return 6; }
-};
-
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<char>
-        : internal::disallowed_ambiguous_char_conversion<char>
-{};
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<signed char>
-        : internal::disallowed_ambiguous_char_conversion<signed char>
-{};
-
-/// We don't support conversion to/from `char` types.
-/** Why are these disallowed?  Because they are ambiguous.  It's not inherently
- * clear whether we should treat values of these types as text or as small
- * integers.  Either choice would lead to bugs.
- */
-template<>
-struct string_traits<unsigned char>
-        : internal::disallowed_ambiguous_char_conversion<unsigned char>
-{};
-
-
-template<> inline constexpr bool is_unquoted_safe<bool>{true};
-
-
-template<typename T> struct nullness<std::optional<T>>
-{
-  static constexpr bool has_null = true;
-  /// Technically, you could have an optional of an always-null type.
-  static constexpr bool always_null = nullness<T>::always_null;
-  static constexpr bool is_null(std::optional<T> const &v) noexcept
-  {
-    return ((not v.has_value()) or pqxx::is_null(*v));
-  }
-  static constexpr std::optional<T> null() { return {}; }
-};
-
-
-template<typename T>
-inline constexpr format param_format(std::optional<T> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T> struct string_traits<std::optional<T>>
-{
-  static char *into_buf(char *begin, char *end, std::optional<T> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-
-  static zview to_buf(char *begin, char *end, std::optional<T> const &value)
-  {
-    if (value.has_value())
-      return string_traits<T>::to_buf(begin, end, *value);
-    else
-      return {};
-  }
-
-  static std::optional<T> from_string(std::string_view text)
-  {
-    return std::optional<T>{
-      std::in_place, string_traits<T>::from_string(text)};
-  }
-
-  static std::size_t size_buffer(std::optional<T> const &value) noexcept
-  {
-    return pqxx::size_buffer(value.value());
-  }
-};
-
-
-template<typename T>
-inline constexpr bool is_unquoted_safe<std::optional<T>>{is_unquoted_safe<T>};
-
-
-template<typename... T> struct nullness<std::variant<T...>>
-{
-  static constexpr bool has_null = (nullness<T>::has_null or ...);
-  static constexpr bool always_null = (nullness<T>::always_null and ...);
-  static constexpr bool is_null(std::variant<T...> const &value) noexcept
-  {
-    return std::visit(
-      [](auto const &i) noexcept {
-        return nullness<strip_t<decltype(i)>>::is_null(i);
-      },
-      value);
-  }
-
-  // We don't support `null()` for `std::variant`.
-  /** It would be technically possible to have a `null` in the case where just
-   * one of the types has a null, but it gets complicated and arbitrary.
-   */
-  static constexpr std::variant<T...> null() = delete;
-};
-
-
-template<typename... T> struct string_traits<std::variant<T...>>
-{
-  static char *
-  into_buf(char *begin, char *end, std::variant<T...> const &value)
-  {
-    return std::visit(
-      [begin, end](auto const &i) {
-        return string_traits<strip_t<decltype(i)>>::into_buf(begin, end, i);
-      },
-      value);
-  }
-  static zview to_buf(char *begin, char *end, std::variant<T...> const &value)
-  {
-    return std::visit(
-      [begin, end](auto const &i) {
-        return string_traits<strip_t<decltype(i)>>::to_buf(begin, end, i);
-      },
-      value);
-  }
-  static std::size_t size_buffer(std::variant<T...> const &value) noexcept
-  {
-    return std::visit(
-      [](auto const &i) noexcept { return pqxx::size_buffer(i); }, value);
-  }
-
-  /** There's no from_string for std::variant.  We could have one with a rule
-   * like "pick the first type which fits the value," but we'd have to look
-   * into how natural that API feels to users.
-   */
-  static std::variant<T...> from_string(std::string_view) = delete;
-};
-
-
-template<typename... Args>
-inline constexpr format param_format(std::variant<Args...> const &value)
-{
-  return std::visit([](auto &v) { return param_format(v); }, value);
-}
-
-
-template<typename... T>
-inline constexpr bool is_unquoted_safe<std::variant<T...>>{
-  (is_unquoted_safe<T> and ...)};
-
-
-template<typename T> inline T from_string(std::stringstream const &text)
-{
-  return from_string<T>(text.str());
-}
-
-
-template<> struct string_traits<std::nullptr_t>
-{
-  static char *into_buf(char *, char *, std::nullptr_t) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::nullptr_t const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::nullptr_t = nullptr) noexcept
-  {
-    return 0;
-  }
-  static std::nullptr_t from_string(std::string_view) = delete;
-};
-
-
-template<> struct string_traits<std::nullopt_t>
-{
-  static char *into_buf(char *, char *, std::nullopt_t) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::nullopt_t const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::nullopt_t) noexcept
-  {
-    return 0;
-  }
-  static std::nullopt_t from_string(std::string_view) = delete;
-};
-
-
-template<> struct string_traits<std::monostate>
-{
-  static char *into_buf(char *, char *, std::monostate) = delete;
-
-  static constexpr zview
-  to_buf(char *, char *, std::monostate const &) noexcept
-  {
-    return {};
-  }
-
-  static constexpr std::size_t size_buffer(std::monostate) noexcept
-  {
-    return 0;
-  }
-  static std::monostate from_string(std::string_view) = delete;
-};
-
-
-template<> inline constexpr bool is_unquoted_safe<std::nullptr_t>{true};
-
-
-template<> struct nullness<char const *>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(char const *t) noexcept
-  {
-    return t == nullptr;
-  }
-  static constexpr char const *null() noexcept { return nullptr; }
-};
-
-
-/// String traits for C-style string ("pointer to char const").
-template<> struct string_traits<char const *>
-{
-  static char const *from_string(std::string_view text) { return text.data(); }
-
-  static zview to_buf(char *begin, char *end, char const *const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, char const *const &value)
-  {
-    auto const space{end - begin};
-    // Count the trailing zero, even though std::strlen() and friends don't.
-    auto const len{std::strlen(value) + 1};
-    if (space < ptrdiff_t(len))
-      throw conversion_overrun{
-        "Could not copy string: buffer too small.  " +
-        pqxx::internal::state_buffer_overrun(space, len)};
-    std::memmove(begin, value, len);
-    return begin + len;
-  }
-
-  static std::size_t size_buffer(char const *const &value) noexcept
-  {
-    return std::strlen(value) + 1;
-  }
-};
-
-
-template<> struct nullness<char *>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(char const *t) noexcept
-  {
-    return t == nullptr;
-  }
-  static constexpr char const *null() { return nullptr; }
-};
-
-
-/// String traits for non-const C-style string ("pointer to char").
-template<> struct string_traits<char *>
-{
-  static char *into_buf(char *begin, char *end, char *const &value)
-  {
-    return string_traits<char const *>::into_buf(begin, end, value);
-  }
-  static zview to_buf(char *begin, char *end, char *const &value)
-  {
-    return string_traits<char const *>::to_buf(begin, end, value);
-  }
-  static std::size_t size_buffer(char *const &value) noexcept
-  {
-    return string_traits<char const *>::size_buffer(value);
-  }
-
-  /// Don't allow conversion to this type since it breaks const-safety.
-  static char *from_string(std::string_view) = delete;
-};
-
-
-template<std::size_t N> struct nullness<char[N]> : no_null<char[N]>
-{};
-
-
-/// String traits for C-style string constant ("array of char").
-/** @warning This assumes that every array-of-char is a C-style string literal.
- * So, it must include a trailing zero. and it must have static duration.
- */
-template<std::size_t N> struct string_traits<char[N]>
-{
-  static constexpr zview
-  to_buf(char *, char *, char const (&value)[N]) noexcept
-  {
-    return zview{value, N - 1};
-  }
-
-  static char *into_buf(char *begin, char *end, char const (&value)[N])
-  {
-    if (internal::cmp_less(end - begin, size_buffer(value)))
-      throw conversion_overrun{
-        "Could not convert char[] to string: too long for buffer."};
-    std::memcpy(begin, value, N);
-    return begin + N;
-  }
-  static constexpr std::size_t size_buffer(char const (&)[N]) noexcept
-  {
-    return N;
-  }
-
-  /// Don't allow conversion to this type.
-  static void from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<std::string> : no_null<std::string>
-{};
-
-
-template<> struct string_traits<std::string>
-{
-  static std::string from_string(std::string_view text)
-  {
-    return std::string{text};
-  }
-
-  static char *into_buf(char *begin, char *end, std::string const &value)
-  {
-    if (internal::cmp_greater_equal(std::size(value), end - begin))
-      throw conversion_overrun{
-        "Could not convert string to string: too long for buffer."};
-    // Include the trailing zero.
-    value.copy(begin, std::size(value));
-    begin[std::size(value)] = '\0';
-    return begin + std::size(value) + 1;
-  }
-
-  static zview to_buf(char *begin, char *end, std::string const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static std::size_t size_buffer(std::string const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-};
-
-
-/// There's no real null for `std::string_view`.
-/** I'm not sure how clear-cut this is: a `string_view` may have a null
- * data pointer, which is analogous to a null `char` pointer.
- */
-template<> struct nullness<std::string_view> : no_null<std::string_view>
-{};
-
-
-/// String traits for `string_view`.
-template<> struct string_traits<std::string_view>
-{
-  static constexpr std::size_t
-  size_buffer(std::string_view const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-
-  static char *into_buf(char *begin, char *end, std::string_view const &value)
-  {
-    if (internal::cmp_greater_equal(std::size(value), end - begin))
-      throw conversion_overrun{
-        "Could not store string_view: too long for buffer."};
-    value.copy(begin, std::size(value));
-    begin[std::size(value)] = '\0';
-    return begin + std::size(value) + 1;
-  }
-
-  /// Don't convert to this type; it has nowhere to store its contents.
-  static std::string_view from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<zview> : no_null<zview>
-{};
-
-
-/// String traits for `zview`.
-template<> struct string_traits<zview>
-{
-  static constexpr std::size_t
-  size_buffer(std::string_view const &value) noexcept
-  {
-    return std::size(value) + 1;
-  }
-
-  static char *into_buf(char *begin, char *end, zview const &value)
-  {
-    auto const size{std::size(value)};
-    if (internal::cmp_less_equal(end - begin, std::size(value)))
-      throw conversion_overrun{"Not enough buffer space to store this zview."};
-    value.copy(begin, size);
-    begin[size] = '\0';
-    return begin + size + 1;
-  }
-
-  static std::string_view to_buf(char *begin, char *end, zview const &value)
-  {
-    return {into_buf(begin, end, value), std::size(value)};
-  }
-
-  /// Don't convert to this type; it has nowhere to store its contents.
-  static zview from_string(std::string_view) = delete;
-};
-
-
-template<> struct nullness<std::stringstream> : no_null<std::stringstream>
-{};
-
-
-template<> struct string_traits<std::stringstream>
-{
-  static std::size_t size_buffer(std::stringstream const &) = delete;
-
-  static std::stringstream from_string(std::string_view text)
-  {
-    std::stringstream stream;
-    stream.write(text.data(), std::streamsize(std::size(text)));
-    return stream;
-  }
-
-  static char *into_buf(char *, char *, std::stringstream const &) = delete;
-  static std::string_view
-  to_buf(char *, char *, std::stringstream const &) = delete;
-};
-
-
-template<> struct nullness<std::nullptr_t>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::nullptr_t const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::nullptr_t null() noexcept { return nullptr; }
-};
-
-
-template<> struct nullness<std::nullopt_t>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::nullopt_t const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::nullopt_t null() noexcept { return std::nullopt; }
-};
-
-
-template<> struct nullness<std::monostate>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = true;
-  static constexpr bool is_null(std::monostate const &) noexcept
-  {
-    return true;
-  }
-  static constexpr std::monostate null() noexcept { return {}; }
-};
-
-
-template<typename T> struct nullness<std::unique_ptr<T>>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(std::unique_ptr<T> const &t) noexcept
-  {
-    return not t or pqxx::is_null(*t);
-  }
-  static constexpr std::unique_ptr<T> null() { return {}; }
-};
-
-
-template<typename T, typename... Args>
-struct string_traits<std::unique_ptr<T, Args...>>
-{
-  static std::unique_ptr<T> from_string(std::string_view text)
-  {
-    return std::make_unique<T>(string_traits<T>::from_string(text));
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::unique_ptr<T, Args...> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-
-  static zview
-  to_buf(char *begin, char *end, std::unique_ptr<T, Args...> const &value)
-  {
-    if (value)
-      return string_traits<T>::to_buf(begin, end, *value);
-    else
-      return {};
-  }
-
-  static std::size_t
-  size_buffer(std::unique_ptr<T, Args...> const &value) noexcept
-  {
-    return pqxx::size_buffer(*value.get());
-  }
-};
-
-
-template<typename T, typename... Args>
-inline format param_format(std::unique_ptr<T, Args...> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T, typename... Args>
-inline constexpr bool is_unquoted_safe<std::unique_ptr<T, Args...>>{
-  is_unquoted_safe<T>};
-
-
-template<typename T> struct nullness<std::shared_ptr<T>>
-{
-  static constexpr bool has_null = true;
-  static constexpr bool always_null = false;
-  static constexpr bool is_null(std::shared_ptr<T> const &t) noexcept
-  {
-    return not t or pqxx::is_null(*t);
-  }
-  static constexpr std::shared_ptr<T> null() { return {}; }
-};
-
-
-template<typename T> struct string_traits<std::shared_ptr<T>>
-{
-  static std::shared_ptr<T> from_string(std::string_view text)
-  {
-    return std::make_shared<T>(string_traits<T>::from_string(text));
-  }
-
-  static zview to_buf(char *begin, char *end, std::shared_ptr<T> const &value)
-  {
-    return string_traits<T>::to_buf(begin, end, *value);
-  }
-  static char *
-  into_buf(char *begin, char *end, std::shared_ptr<T> const &value)
-  {
-    return string_traits<T>::into_buf(begin, end, *value);
-  }
-  static std::size_t size_buffer(std::shared_ptr<T> const &value) noexcept
-  {
-    return pqxx::size_buffer(*value);
-  }
-};
-
-
-template<typename T> format param_format(std::shared_ptr<T> const &value)
-{
-  return param_format(*value);
-}
-
-
-template<typename T>
-inline constexpr bool is_unquoted_safe<std::shared_ptr<T>>{
-  is_unquoted_safe<T>};
-
-
-template<>
-struct nullness<std::basic_string<std::byte>>
-        : no_null<std::basic_string<std::byte>>
-{};
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<binary DATA> struct nullness<DATA> : no_null<DATA>
-{};
-
-
-template<binary DATA> inline constexpr format param_format(DATA const &)
-{
-  return format::binary;
-}
-
-
-template<binary DATA> struct string_traits<DATA>
-{
-  static std::size_t size_buffer(DATA const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(char *begin, char *end, DATA const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, DATA const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  static DATA from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::basic_string<std::byte> buf;
-    buf.resize(size);
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.data()));
-    return buf;
-  }
-};
-#endif // PQXX_HAVE_CONCEPTS
-
-
-template<> struct string_traits<std::basic_string<std::byte>>
-{
-  static std::size_t
-  size_buffer(std::basic_string<std::byte> const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview
-  to_buf(char *begin, char *end, std::basic_string<std::byte> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::basic_string<std::byte> const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  static std::basic_string<std::byte> from_string(std::string_view text)
-  {
-    auto const size{pqxx::internal::size_unesc_bin(std::size(text))};
-    std::basic_string<std::byte> buf;
-    buf.resize(size);
-    pqxx::internal::unesc_bin(text, reinterpret_cast<std::byte *>(buf.data()));
-    return buf;
-  }
-};
-
-
-template<>
-inline constexpr format param_format(std::basic_string<std::byte> const &)
-{
-  return format::binary;
-}
-
-
-template<>
-struct nullness<std::basic_string_view<std::byte>>
-        : no_null<std::basic_string_view<std::byte>>
-{};
-
-
-template<> struct string_traits<std::basic_string_view<std::byte>>
-{
-  static std::size_t
-  size_buffer(std::basic_string_view<std::byte> const &value) noexcept
-  {
-    return internal::size_esc_bin(std::size(value));
-  }
-
-  static zview to_buf(
-    char *begin, char *end, std::basic_string_view<std::byte> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(
-    char *begin, char *end, std::basic_string_view<std::byte> const &value)
-  {
-    auto const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to escape binary data."};
-    internal::esc_bin(value, begin);
-    return begin + budget;
-  }
-
-  // There's no from_string, because there's nobody to hold the data.
-};
-
-template<>
-inline constexpr format param_format(std::basic_string_view<std::byte> const &)
-{
-  return format::binary;
-}
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// String traits for SQL arrays.
-template<typename Container> struct array_string_traits
-{
-private:
-  using elt_type = strip_t<value_type<Container>>;
-  using elt_traits = string_traits<elt_type>;
-  static constexpr zview s_null{"NULL"};
-
-public:
-  static zview to_buf(char *begin, char *end, Container const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *into_buf(char *begin, char *end, Container const &value)
-  {
-    std::size_t const budget{size_buffer(value)};
-    if (internal::cmp_less(end - begin, budget))
-      throw conversion_overrun{
-        "Not enough buffer space to convert array to string."};
-
-    char *here = begin;
-    *here++ = '{';
-
-    bool nonempty{false};
-    for (auto const &elt : value)
-    {
-      if (is_null(elt))
-      {
-        s_null.copy(here, std::size(s_null));
-        here += std::size(s_null);
-      }
-      else if constexpr (is_sql_array<elt_type>)
-      {
-        // Render nested array in-place.  Then erase the trailing zero.
-        here = elt_traits::into_buf(here, end, elt) - 1;
-      }
-      else if constexpr (is_unquoted_safe<elt_type>)
-      {
-        // No need to quote or escape.  Just convert the value straight into
-        // its place in the array, and "backspace" the trailing zero.
-        here = elt_traits::into_buf(here, end, elt) - 1;
-      }
-      else
-      {
-        *here++ = '"';
-
-        // Use the tail end of the destination buffer as an intermediate
-        // buffer.
-        auto const elt_budget{pqxx::size_buffer(elt)};
-        for (char const c : elt_traits::to_buf(end - elt_budget, end, elt))
-        {
-          if (c == '\\' or c == '"')
-            *here++ = '\\';
-          *here++ = c;
-        }
-        *here++ = '"';
-      }
-      *here++ = array_separator<elt_type>;
-      nonempty = true;
-    }
-
-    // Erase that last comma, if present.
-    if (nonempty)
-      here--;
-
-    *here++ = '}';
-    *here++ = '\0';
-
-    return here;
-  }
-
-  static std::size_t size_buffer(Container const &value) noexcept
-  {
-    if constexpr (is_unquoted_safe<elt_type>)
-      return 3 + std::accumulate(
-                   std::begin(value), std::end(value), std::size_t{},
-                   [](std::size_t acc, elt_type const &elt) {
-                     return acc +
-                            (pqxx::is_null(elt) ?
-                               std::size(s_null) :
-                               elt_traits::size_buffer(elt)) -
-                            1;
-                   });
-    else
-      return 3 + std::accumulate(
-                   std::begin(value), std::end(value), std::size_t{},
-                   [](std::size_t acc, elt_type const &elt) {
-                     // Opening and closing quotes, plus worst-case escaping,
-                     // but don't count the trailing zeroes.
-                     std::size_t const elt_size{
-                       pqxx::is_null(elt) ? std::size(s_null) :
-                                            elt_traits::size_buffer(elt) - 1};
-                     return acc + 2 * elt_size + 2;
-                   });
-  }
-
-  // We don't yet support parsing of array types using from_string.  Doing so
-  // would require a reference to the connection.
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-template<typename T, typename... Args>
-struct nullness<std::vector<T, Args...>> : no_null<std::vector<T>>
-{};
-
-
-template<typename T, typename... Args>
-struct string_traits<std::vector<T, Args...>>
-        : internal::array_string_traits<std::vector<T, Args...>>
-{};
-
-
-/// We don't know how to pass array params in binary format, so pass as text.
-template<typename T, typename... Args>
-inline constexpr format param_format(std::vector<T, Args...> const &)
-{
-  return format::text;
-}
-
-
-/// A `std::vector<std::byte>` is a binary string.  Other vectors are not.
-template<typename... Args>
-inline constexpr format param_format(std::vector<std::byte, Args...> const &)
-{
-  return format::binary;
-}
-
-
-template<typename T> inline constexpr bool is_sql_array<std::vector<T>>{true};
-
-
-template<typename T, std::size_t N>
-struct nullness<std::array<T, N>> : no_null<std::array<T, N>>
-{};
-
-
-template<typename T, std::size_t N>
-struct string_traits<std::array<T, N>>
-        : internal::array_string_traits<std::array<T, N>>
-{};
-
-
-/// We don't know how to pass array params in binary format, so pass as text.
-template<typename T, typename... Args, Args... args>
-inline constexpr format param_format(std::array<T, args...> const &)
-{
-  return format::text;
-}
-
-
-/// An array of `std::byte` is a binary string.
-template<typename... Args, Args... args>
-inline constexpr format param_format(std::array<std::byte, args...> const &)
-{
-  return format::binary;
-}
-
-
-template<typename T, std::size_t N>
-inline constexpr bool is_sql_array<std::array<T, N>>{true};
-} // namespace pqxx
-
-
-namespace pqxx
-{
-template<typename T> inline std::string to_string(T const &value)
-{
-  if (is_null(value))
-    throw conversion_error{
-      "Attempt to convert null " + type_name<T> + " to a string."};
-
-  std::string buf;
-  // We can't just reserve() space; modifying the terminating zero leads to
-  // undefined behaviour.
-  buf.resize(size_buffer(value));
-  auto const data{buf.data()};
-  auto const end{
-    string_traits<T>::into_buf(data, data + std::size(buf), value)};
-  buf.resize(static_cast<std::size_t>(end - data - 1));
-  return buf;
-}
-
-
-template<> inline std::string to_string(float const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(double const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(long double const &value)
-{
-  return internal::to_string_float(value);
-}
-template<> inline std::string to_string(std::stringstream const &value)
-{
-  return value.str();
-}
-
-
-template<typename T> inline void into_string(T const &value, std::string &out)
-{
-  if (is_null(value))
-    throw conversion_error{
-      "Attempt to convert null " + type_name<T> + " to a string."};
-
-  // We can't just reserve() data; modifying the terminating zero leads to
-  // undefined behaviour.
-  out.resize(size_buffer(value) + 1);
-  auto const data{out.data()};
-  auto const end{
-    string_traits<T>::into_buf(data, data + std::size(out), value)};
-  out.resize(static_cast<std::size_t>(end - data - 1));
-}
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/encoding_group.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/encoding_group.hxx
deleted file mode 100644
index e17736e5b..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/encoding_group.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/** Enum type for supporting encodings in libpqxx
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ENCODING_GROUP
-#define PQXX_H_ENCODING_GROUP
-
-#include <cstddef>
-
-namespace pqxx::internal
-{
-// Types of encodings supported by PostgreSQL, see
-// https://www.postgresql.org/docs/current/static/multibyte.html#CHARSET-TABLE
-enum class encoding_group
-{
-  // Handles all single-byte fixed-width encodings
-  MONOBYTE,
-
-  // Multibyte encodings.
-  // Many of these can embed ASCII-like bytes inside multibyte characters,
-  // notably Big5, SJIS, SHIFT_JIS_2004, GP18030, GBK, JOHAB, UHC.
-  BIG5,
-  EUC_CN,
-  // TODO: Merge EUC_JP and EUC_JIS_2004?
-  EUC_JP,
-  EUC_JIS_2004,
-  EUC_KR,
-  EUC_TW,
-  GB18030,
-  GBK,
-  JOHAB,
-  MULE_INTERNAL,
-  // TODO: Merge SJIS and SHIFT_JIS_2004?
-  SJIS,
-  SHIFT_JIS_2004,
-  UHC,
-  UTF8,
-};
-
-
-// TODO:: Can we just use string_view now?
-/// Function type: "find the end of the current glyph."
-/** This type of function takes a text buffer, and a location in that buffer,
- * and returns the location one byte past the end of the current glyph.
- *
- * The start offset marks the beginning of the current glyph.  It must fall
- * within the buffer.
- *
- * There are multiple different glyph scanner implementations, for different
- * kinds of encodings.
- */
-using glyph_scanner_func =
-  std::size_t(char const buffer[], std::size_t buffer_len, std::size_t start);
-} // namespace pqxx::internal
-
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/encodings.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/encodings.hxx
deleted file mode 100644
index ba7fecc70..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/encodings.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/** Internal string encodings support for libpqxx
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ENCODINGS
-#define PQXX_H_ENCODINGS
-
-#include "pqxx/internal/encoding_group.hxx"
-
-#include <string>
-#include <string_view>
-
-
-namespace pqxx::internal
-{
-char const *name_encoding(int encoding_id);
-
-/// Convert libpq encoding enum or encoding name to its libpqxx group.
-encoding_group enc_group(int /* libpq encoding ID */);
-encoding_group enc_group(std::string_view);
-
-
-/// Look up the glyph scanner function for a given encoding group.
-/** To identify the glyph boundaries in a buffer, call this to obtain the
- * scanner function appropriate for the buffer's encoding.  Then, repeatedly
- * call the scanner function to find the glyphs.
- */
-PQXX_LIBEXPORT glyph_scanner_func *get_glyph_scanner(encoding_group);
-
-
-// TODO: For ASCII search, treat UTF8/EUC_*/MULE_INTERNAL as MONOBYTE.
-
-/// Find any of the ASCII characters `NEEDLE` in `haystack`.
-/** Scans through `haystack` until it finds a single-byte character that
- * matches any value in `NEEDLE`.
- *
- * If it finds one, returns its offset.  If not, returns the end of the
- * haystack.
- */
-template<char... NEEDLE>
-inline std::size_t find_char(
-  glyph_scanner_func *scanner, std::string_view haystack,
-  std::size_t here = 0u)
-{
-  auto const sz{std::size(haystack)};
-  auto const data{std::data(haystack)};
-  while (here < sz)
-  {
-    auto next{scanner(data, sz, here)};
-    // (For some reason gcc had a problem with a right-fold here.  But clang
-    // was fine.)
-    if ((... or (data[here] == NEEDLE)))
-    {
-      // Also check against a multibyte character starting with a bytes which
-      // just happens to match one of the ASCII bytes we're looking for.  It'd
-      // be cleaner to check that first, but either works.  So, let's apply the
-      // most selective filter first and skip this check in almost all cases.
-      if (next == here + 1)
-        return here;
-    }
-
-    // Nope, no hit.  Move on.
-    here = next;
-  }
-  return sz;
-}
-
-
-/// Iterate over the glyphs in a buffer.
-/** Scans the glyphs in the buffer, and for each, passes its begin and its
- * one-past-end pointers to `callback`.
- */
-template<typename CALLABLE>
-inline void for_glyphs(
-  encoding_group enc, CALLABLE callback, char const buffer[],
-  std::size_t buffer_len, std::size_t start = 0)
-{
-  auto const scan{get_glyph_scanner(enc)};
-  for (std::size_t here = start, next; here < buffer_len; here = next)
-  {
-    next = scan(buffer, buffer_len, here);
-    callback(buffer + here, buffer + next);
-  }
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-errorhandler.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-errorhandler.hxx
deleted file mode 100644
index ffc12a6cf..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-errorhandler.hxx
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx
-{
-class connection;
-class errorhandler;
-} // namespace pqxx
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_errorhandler : callgate<connection>
-{
-  friend class pqxx::errorhandler;
-
-  connection_errorhandler(reference x) : super(x) {}
-
-  void register_errorhandler(errorhandler *h)
-  {
-    home().register_errorhandler(h);
-  }
-  void unregister_errorhandler(errorhandler *h)
-  {
-    home().unregister_errorhandler(h);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-largeobject.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-largeobject.hxx
deleted file mode 100644
index 49feaf9e6..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-largeobject.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <string>
-
-#include <pqxx/internal/callgate.hxx>
-#include <pqxx/internal/libpq-forward.hxx>
-
-namespace pqxx
-{
-class blob;
-class largeobject;
-} // namespace pqxx
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_largeobject : callgate<connection>
-{
-  friend class pqxx::blob;
-  friend class pqxx::largeobject;
-
-  connection_largeobject(reference x) : super(x) {}
-
-  pq::PGconn *raw_connection() const { return home().raw_connection(); }
-};
-
-
-class PQXX_PRIVATE const_connection_largeobject : callgate<connection const>
-{
-  friend class pqxx::blob;
-  friend class pqxx::largeobject;
-
-  const_connection_largeobject(reference x) : super(x) {}
-
-  std::string error_message() const { return home().err_msg(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-notification_receiver.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-notification_receiver.hxx
deleted file mode 100644
index 0bcb2db17..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-notification_receiver.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/connection.hxx"
-
-
-namespace pqxx
-{
-class notification_receiver;
-}
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_notification_receiver : callgate<connection>
-{
-  friend class pqxx::notification_receiver;
-
-  connection_notification_receiver(reference x) : super(x) {}
-
-  void add_receiver(notification_receiver *receiver)
-  {
-    home().add_receiver(receiver);
-  }
-  void remove_receiver(notification_receiver *receiver) noexcept
-  {
-    home().remove_receiver(receiver);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-pipeline.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-pipeline.hxx
deleted file mode 100644
index c6ae6e17a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-pipeline.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "pqxx/internal/libpq-forward.hxx"
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/pipeline.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_pipeline : callgate<connection>
-{
-  friend class pqxx::pipeline;
-
-  connection_pipeline(reference x) : super(x) {}
-
-  void start_exec(char const query[]) { home().start_exec(query); }
-  pqxx::internal::pq::PGresult *get_result() { return home().get_result(); }
-  void cancel_query() { home().cancel_query(); }
-
-  bool consume_input() noexcept { return home().consume_input(); }
-  bool is_busy() const noexcept { return home().is_busy(); }
-
-  int encoding_id() { return home().encoding_id(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-sql_cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-sql_cursor.hxx
deleted file mode 100644
index 51a889844..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-sql_cursor.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal
-{
-class sql_cursor;
-}
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_sql_cursor : callgate<connection>
-{
-  friend class pqxx::internal::sql_cursor;
-
-  connection_sql_cursor(reference x) : super(x) {}
-
-  result exec(char const query[]) { return home().exec(query); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-stream_from.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-stream_from.hxx
deleted file mode 100644
index 8961e7146..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-stream_from.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/connection.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_stream_from : callgate<connection>
-{
-  friend class pqxx::stream_from;
-
-  connection_stream_from(reference x) : super{x} {}
-
-  auto read_copy_line() { return home().read_copy_line(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-stream_to.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-stream_to.hxx
deleted file mode 100644
index a6974fb21..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-stream_to.hxx
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/stream_to.hxx"
-
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_stream_to : callgate<connection>
-{
-  friend class pqxx::stream_to;
-
-  connection_stream_to(reference x) : super(x) {}
-
-  void write_copy_line(std::string_view line) { home().write_copy_line(line); }
-  void end_copy_write() { home().end_copy_write(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-transaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-transaction.hxx
deleted file mode 100644
index 74d659253..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/connection-transaction.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx
-{
-class connection;
-}
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE connection_transaction : callgate<connection>
-{
-  friend class pqxx::transaction_base;
-
-  connection_transaction(reference x) : super(x) {}
-
-  template<typename STRING> result exec(STRING query, std::string_view desc)
-  {
-    return home().exec(query, desc);
-  }
-
-  void register_transaction(transaction_base *t)
-  {
-    home().register_transaction(t);
-  }
-  void unregister_transaction(transaction_base *t) noexcept
-  {
-    home().unregister_transaction(t);
-  }
-
-  auto read_copy_line() { return home().read_copy_line(); }
-  void write_copy_line(std::string_view line) { home().write_copy_line(line); }
-  void end_copy_write() { home().end_copy_write(); }
-
-  result exec_prepared(zview statement, internal::c_params const &args)
-  {
-    return home().exec_prepared(statement, args);
-  }
-
-  result exec_params(zview query, internal::c_params const &args)
-  {
-    return home().exec_params(query, args);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/errorhandler-connection.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/errorhandler-connection.hxx
deleted file mode 100644
index 5560cedec..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/errorhandler-connection.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE errorhandler_connection : callgate<errorhandler>
-{
-  friend class pqxx::connection;
-
-  errorhandler_connection(reference x) : super(x) {}
-
-  void unregister() noexcept { home().unregister(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
deleted file mode 100644
index 296d22145..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE icursor_iterator_icursorstream : callgate<icursor_iterator>
-{
-  friend class pqxx::icursorstream;
-
-  icursor_iterator_icursorstream(reference x) : super(x) {}
-
-  icursor_iterator::difference_type pos() const noexcept
-  {
-    return home().pos();
-  }
-
-  icursor_iterator *get_prev() { return home().m_prev; }
-  void set_prev(icursor_iterator *i) { home().m_prev = i; }
-
-  icursor_iterator *get_next() { return home().m_next; }
-  void set_next(icursor_iterator *i) { home().m_next = i; }
-
-  void fill(result const &r) { home().fill(r); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx
deleted file mode 100644
index 56056d5ef..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE icursorstream_icursor_iterator : callgate<icursorstream>
-{
-  friend class pqxx::icursor_iterator;
-
-  icursorstream_icursor_iterator(reference x) : super(x) {}
-
-  void insert_iterator(icursor_iterator *i) noexcept
-  {
-    home().insert_iterator(i);
-  }
-
-  void remove_iterator(icursor_iterator *i) const noexcept
-  {
-    home().remove_iterator(i);
-  }
-
-  icursorstream::size_type forward() { return home().forward(); }
-  icursorstream::size_type forward(icursorstream::size_type n)
-  {
-    return home().forward(n);
-  }
-
-  void service_iterators(icursorstream::difference_type p)
-  {
-    home().service_iterators(p);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-connection.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-connection.hxx
deleted file mode 100644
index daa0808c0..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-connection.hxx
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_connection : callgate<result const>
-{
-  friend class pqxx::connection;
-
-  result_connection(reference x) : super(x) {}
-
-  operator bool() const { return bool(home()); }
-  bool operator!() const { return not home(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-creation.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-creation.hxx
deleted file mode 100644
index 3d9205f2c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-creation.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_creation : callgate<result const>
-{
-  friend class pqxx::connection;
-  friend class pqxx::pipeline;
-
-  result_creation(reference x) : super(x) {}
-
-  static result create(
-    internal::pq::PGresult *rhs, std::shared_ptr<std::string> const &query,
-    encoding_group enc)
-  {
-    return result(rhs, query, enc);
-  }
-
-  void check_status(std::string_view desc = ""sv) const
-  {
-    return home().check_status(desc);
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-pipeline.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-pipeline.hxx
deleted file mode 100644
index 3ebe436d2..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-pipeline.hxx
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_pipeline : callgate<result const>
-{
-  friend class pqxx::pipeline;
-
-  result_pipeline(reference x) : super(x) {}
-
-  std::shared_ptr<std::string const> query_ptr() const
-  {
-    return home().query_ptr();
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-sql_cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-sql_cursor.hxx
deleted file mode 100644
index 78b450739..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/result-sql_cursor.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE result_sql_cursor : callgate<result const>
-{
-  friend class pqxx::internal::sql_cursor;
-
-  result_sql_cursor(reference x) : super(x) {}
-
-  char const *cmd_status() const noexcept { return home().cmd_status(); }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/transaction-sql_cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/transaction-sql_cursor.hxx
deleted file mode 100644
index 4ed78dc93..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/transaction-sql_cursor.hxx
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE transaction_sql_cursor : callgate<transaction_base>
-{
-  friend class pqxx::internal::sql_cursor;
-  transaction_sql_cursor(reference x) : super(x) {}
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/transaction-transaction_focus.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/transaction-transaction_focus.hxx
deleted file mode 100644
index ca7939a99..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/gates/transaction-transaction_focus.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <pqxx/internal/callgate.hxx>
-
-#include "pqxx/transaction_base.hxx"
-
-namespace pqxx::internal::gate
-{
-class PQXX_PRIVATE transaction_transaction_focus : callgate<transaction_base>
-{
-  friend class pqxx::transaction_focus;
-
-  transaction_transaction_focus(reference x) : super(x) {}
-
-  void register_focus(transaction_focus *focus)
-  {
-    home().register_focus(focus);
-  }
-  void unregister_focus(transaction_focus *focus) noexcept
-  {
-    home().unregister_focus(focus);
-  }
-  void register_pending_error(zview error)
-  {
-    home().register_pending_error(error);
-  }
-  void register_pending_error(std::string &&error)
-  {
-    home().register_pending_error(std::move(error));
-  }
-};
-} // namespace pqxx::internal::gate
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/header-post.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/header-post.hxx
deleted file mode 100644
index ff6bf8986..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/header-post.hxx
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Compiler deficiency workarounds for compiling libpqxx headers.
- *
- * To be included at the end of each libpqxx header, in order to restore the
- * client program's settings.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-// NO GUARDS HERE! This code should be executed every time!
-
-#if defined(_MSC_VER)
-#  pragma warning(pop) // Restore compiler's warning state
-#endif
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include pqxx/internal/header-post.hxx AFTER its 'pre' counterpart."
-#endif
-
-#undef PQXX_HEADER_PRE
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/header-pre.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/header-pre.hxx
deleted file mode 100644
index abc1a398d..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/header-pre.hxx
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Compiler settings for compiling libpqxx headers, and workarounds for all.
- *
- * Include this before including any other libpqxx headers from within libpqxx.
- * And to balance it out, also include header-post.hxx at the end of the batch
- * of headers.
- *
- * The public libpqxx headers (e.g. `<pqxx/connection>`) include this already;
- * there's no need to do this from within an application.
- *
- * Include this file at the highest aggregation level possible to avoid nesting
- * and to keep things simple.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-
-// NO GUARD HERE! This part should be included every time this file is.
-#if defined(_MSC_VER)
-
-// Save compiler's warning state, and set warning level 4 for maximum
-// sensitivity to warnings.
-#  pragma warning(push, 4)
-
-// Visual C++ generates some entirely unreasonable warnings.  Disable them.
-// Copy constructor could not be generated.
-#  pragma warning(disable : 4511)
-// Assignment operator could not be generated.
-#  pragma warning(disable : 4512)
-// Can't expose outside classes without exporting them.  Except the MSVC docs
-// say please ignore the warning if it's a standard library class.
-#  pragma warning(disable : 4251)
-// Can't derive library classes from outside classes without exporting them.
-// Except the MSVC docs say please ignore the warning if the parent class is
-// in the standard library.
-#  pragma warning(disable : 4275)
-// Can't inherit from non-exported class.
-#  pragma warning(disable : 4275)
-
-#endif // _MSC_VER
-
-
-#if defined(PQXX_HEADER_PRE)
-#  error "Avoid nesting #include of pqxx/internal/header-pre.hxx."
-#endif
-
-#define PQXX_HEADER_PRE
-
-
-// Workarounds & definitions that need to be included even in library's headers
-#include "pqxx/config-public-compiler.h"
-
-// Enable ISO-646 alternative operaotr representations: "and" instead of "&&"
-// etc. on older compilers.  C++20 removes this header.
-#if __has_include(<ciso646>)
-#  include <ciso646>
-#endif
-
-
-#if defined(PQXX_HAVE_GCC_PURE)
-/// Declare function "pure": no side effects, only reads globals and its args.
-#  define PQXX_PURE __attribute__((pure))
-#else
-#  define PQXX_PURE /* pure */
-#endif
-
-
-#if defined(__GNUC__)
-/// Tell the compiler to optimise a function for size, not speed.
-#  define PQXX_COLD __attribute__((cold))
-#else
-#  define PQXX_COLD /* cold */
-#endif
-
-
-// Workarounds for Windows
-#ifdef _WIN32
-
-/* For now, export DLL symbols if _DLL is defined.  This is done automatically
- * by the compiler when linking to the dynamic version of the runtime library,
- * according to "gzh"
- */
-#  if defined(PQXX_SHARED) && !defined(PQXX_LIBEXPORT)
-#    define PQXX_LIBEXPORT __declspec(dllimport)
-#  endif // PQXX_SHARED && !PQXX_LIBEXPORT
-
-
-// Workarounds for Microsoft Visual C++
-#  ifdef _MSC_VER
-
-// Suppress vtables on abstract classes.
-#    define PQXX_NOVTABLE __declspec(novtable)
-
-// Automatically link with the appropriate libpq (static or dynamic, debug or
-// release).  The default is to use the release DLL.  Define PQXX_PQ_STATIC to
-// link to a static version of libpq, and _DEBUG to link to a debug version.
-// The two may be combined.
-#    if defined(PQXX_AUTOLINK)
-#      if defined(PQXX_PQ_STATIC)
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqd")
-#        else
-#          pragma comment(lib, "libpq")
-#        endif
-#      else
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqddll")
-#        else
-#          pragma comment(lib, "libpqdll")
-#        endif
-#      endif
-#    endif
-
-// If we're not compiling libpqxx itself, automatically link with the
-// appropriate libpqxx library.  To link with the libpqxx DLL, define
-// PQXX_SHARED; the default is to link with the static library.  A static link
-// is the recommended practice.
-//
-// The preprocessor macro PQXX_INTERNAL is used to detect whether we
-// are compiling the libpqxx library itself.  When you compile the library
-// yourself using your own project file, make sure to include this macro.
-#    if defined(PQXX_AUTOLINK) && !defined(PQXX_INTERNAL)
-#      ifdef PQXX_SHARED
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqxxD")
-#        else
-#          pragma comment(lib, "libpqxx")
-#        endif
-#      else // !PQXX_SHARED
-#        ifdef _DEBUG
-#          pragma comment(lib, "libpqxx_staticD")
-#        else
-#          pragma comment(lib, "libpqxx_static")
-#        endif
-#      endif
-#    endif
-
-#  endif // _MSC_VER
-
-#elif defined(PQXX_HAVE_GCC_VISIBILITY) // !_WIN32
-
-#  define PQXX_LIBEXPORT __attribute__((visibility("default")))
-#  define PQXX_PRIVATE __attribute__((visibility("hidden")))
-
-#endif // PQXX_HAVE_GCC_VISIBILITY
-
-
-#ifndef PQXX_LIBEXPORT
-#  define PQXX_LIBEXPORT /* libexport */
-#endif
-
-#ifndef PQXX_PRIVATE
-#  define PQXX_PRIVATE /* private */
-#endif
-
-#ifndef PQXX_NOVTABLE
-#  define PQXX_NOVTABLE /* novtable */
-#endif
-
-// C++20: Assume support.
-#if defined(PQXX_HAVE_LIKELY)
-#  define PQXX_LIKELY [[likely]]
-#  define PQXX_UNLIKELY [[unlikely]]
-#else
-#  define PQXX_LIKELY   /* [[likely]] */
-#  define PQXX_UNLIKELY /* [[unlikely]] */
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/ignore-deprecated-post.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/ignore-deprecated-post.hxx
deleted file mode 100644
index cebcf0594..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/ignore-deprecated-post.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/// End a code block started by "ignore-deprecated-pre.hxx".
-
-#if !defined(PQXX_IGNORING_DEPRECATED)
-#  error "Ended an 'ignore-deprecated' block while none was active."
-#endif
-
-#if defined(__GNUC__)
-#  pragma GCC diagnostic pop
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-
-#undef PQXX_IGNORING_DEPRECATED
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/ignore-deprecated-pre.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/ignore-deprecated-pre.hxx
deleted file mode 100644
index 8ac57afaa..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/ignore-deprecated-pre.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/** Start a block of deprecated code which may call other deprecated code.
- *
- * Most compilers will emit warnings when deprecated code is invoked from
- * non-deprecated code.  But some compilers (notably gcc) will always emit the
- * warning even when the calling code is also deprecated.
- *
- * This header starts a block where those warnings are suppressed.  It can be
- * included inside a code block.
- *
- * Always match the #include with a closing #include of
- * "ignore-deprecated-post.hxx".  To avoid mistakes, keep the enclosed area as
- * small as possible.
- */
-#if defined(PQXX_IGNORING_DEPRECATED)
-#  error "Started an 'ignore-deprecated' block inside another."
-#endif
-
-#define PQXX_IGNORING_DEPRECATED
-
-#if defined(__GNUC__)
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable : 4996)
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/libpq-forward.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/libpq-forward.hxx
deleted file mode 100644
index 9e74f79ec..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/libpq-forward.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/** Minimal forward declarations of libpq types needed in libpqxx headers.
- *
- * DO NOT INCLUDE THIS FILE when building client programs.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-extern "C"
-{
-  struct pg_conn;
-  struct pg_result;
-  struct pgNotify;
-}
-
-/// Forward declarations of libpq types as needed in libpqxx headers.
-namespace pqxx::internal::pq
-{
-using PGconn = pg_conn;
-using PGresult = pg_result;
-using PGnotify = pgNotify;
-using PQnoticeProcessor = void (*)(void *, char const *);
-} // namespace pqxx::internal::pq
-
-namespace pqxx
-{
-/// PostgreSQL database row identifier.
-using oid = unsigned int;
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/result_iter.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/result_iter.hxx
deleted file mode 100644
index 1fa1f7d8a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/result_iter.hxx
+++ /dev/null
@@ -1,124 +0,0 @@
-/** Result loops.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT_ITER
-#define PQXX_H_RESULT_ITER
-
-#include <memory>
-
-#include "pqxx/strconv.hxx"
-
-namespace pqxx
-{
-class result;
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-// C++20: Replace with generator?
-/// Iterator for looped unpacking of a result.
-template<typename... TYPE> class result_iter
-{
-public:
-  using value_type = std::tuple<TYPE...>;
-
-  /// Construct an "end" iterator.
-  result_iter() = default;
-
-  explicit result_iter(result const &home) :
-          m_home{&home}, m_size{std::size(home)}
-  {
-    if (not std::empty(home))
-      read();
-  }
-  result_iter(result_iter const &) = default;
-
-  result_iter &operator++()
-  {
-    m_index++;
-    if (m_index >= m_size)
-      m_home = nullptr;
-    else
-      read();
-    return *this;
-  }
-
-  /// Comparison only works for comparing to end().
-  bool operator==(result_iter const &rhs) const
-  {
-    return m_home == rhs.m_home;
-  }
-  bool operator!=(result_iter const &rhs) const { return not(*this == rhs); }
-
-  value_type const &operator*() const { return m_value; }
-
-private:
-  void read() { (*m_home)[m_index].convert(m_value); }
-
-  result const *m_home{nullptr};
-  result::size_type m_index{0};
-  result::size_type m_size;
-  value_type m_value;
-};
-
-
-template<typename... TYPE> class result_iteration
-{
-public:
-  using iterator = result_iter<TYPE...>;
-  explicit result_iteration(result const &home) : m_home{home}
-  {
-    constexpr auto tup_size{sizeof...(TYPE)};
-    if (home.columns() != tup_size)
-      throw usage_error{internal::concat(
-        "Tried to extract ", to_string(tup_size),
-        " field(s) from a result with ", to_string(home.columns()),
-        " column(s).")};
-  }
-  iterator begin() const
-  {
-    if (std::size(m_home) == 0)
-      return end();
-    else
-      return iterator{m_home};
-  }
-  iterator end() const { return {}; }
-
-private:
-  pqxx::result const &m_home;
-};
-} // namespace pqxx::internal
-
-
-template<typename... TYPE> inline auto pqxx::result::iter() const
-{
-  return pqxx::internal::result_iteration<TYPE...>{*this};
-}
-
-
-template<typename CALLABLE>
-inline void pqxx::result::for_each(CALLABLE &&func) const
-{
-  using args_tuple = internal::args_t<decltype(func)>;
-  constexpr auto sz{std::tuple_size_v<args_tuple>};
-  static_assert(
-    sz > 0,
-    "Callback for for_each must take parameters, one for each column in the "
-    "result.");
-
-  auto const cols{this->columns()};
-  if (sz != cols)
-    throw usage_error{internal::concat(
-      "Callback to for_each takes ", sz, "parameter", (sz == 1) ? "" : "s",
-      ", but result set has ", cols, "field", (cols == 1) ? "" : "s", ".")};
-
-  using pass_tuple = pqxx::internal::strip_types_t<args_tuple>;
-  for (auto const r : *this) std::apply(func, r.as_tuple<pass_tuple>());
-}
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/result_iterator.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/result_iterator.hxx
deleted file mode 100644
index 3f27a1d3f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/result_iterator.hxx
+++ /dev/null
@@ -1,389 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT_ITERATOR
-#define PQXX_H_RESULT_ITERATOR
-
-#include "pqxx/row.hxx"
-
-
-/* Result iterator.
- *
- * Don't include this header from your own application; it is included for you
- * by other libpqxx headers.
- */
-
-namespace pqxx
-{
-/// Iterator for rows in a result.  Use as result::const_iterator.
-/** A result, once obtained, cannot be modified.  Therefore there is no
- * plain iterator type for result.  However its const_iterator type can be
- * used to inspect its rows without changing them.
- */
-class PQXX_LIBEXPORT const_result_iterator : public row
-{
-public:
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = row const;
-  using pointer = row const *;
-  using reference = row;
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create an iterator, but in an unusable state.
-  const_result_iterator() noexcept = default;
-  /// Copy an iterator.
-  const_result_iterator(const_result_iterator const &) noexcept = default;
-  /// Move an iterator.
-  const_result_iterator(const_result_iterator &&) noexcept = default;
-
-  /// Begin iterating a @ref row.
-  const_result_iterator(row const &t) noexcept : row{t} {}
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /**
-   * @name Dereferencing operators
-   *
-   * An iterator "points to" its own row, which is also itself.  This makes it
-   * easy to address a @ref result as a two-dimensional container, without
-   * going through the intermediate step of dereferencing the iterator.  It
-   * makes the interface similar to C pointer/array semantics.
-   *
-   * IIRC Alex Stepanov, the inventor of the STL, once remarked that having
-   * this as standard behaviour for pointers would be useful in some
-   * algorithms.  So even if this makes me look foolish, I would seem to be in
-   * distinguished company.
-   */
-  //@{
-  /// Dereference the iterator.
-  [[nodiscard]] pointer operator->() const { return this; }
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Dereference the iterator.
-  [[nodiscard]] reference operator*() const { return *this; }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  //@}
-
-  /**
-   * @name Field access
-   */
-  //@{
-  using row::back;
-  using row::front;
-  using row::operator[];
-  using row::at;
-  using row::rownumber;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_result_iterator &operator=(const_result_iterator const &rhs)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::operator=(rhs);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    return *this;
-  }
-
-  const_result_iterator &operator=(const_result_iterator &&rhs)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::operator=(std::move(rhs));
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    return *this;
-  }
-
-  const_result_iterator operator++(int);
-  const_result_iterator &operator++()
-  {
-    ++m_index;
-    return *this;
-  }
-  const_result_iterator operator--(int);
-  const_result_iterator &operator--()
-  {
-    --m_index;
-    return *this;
-  }
-
-  const_result_iterator &operator+=(difference_type i)
-  {
-    m_index += i;
-    return *this;
-  }
-  const_result_iterator &operator-=(difference_type i)
-  {
-    m_index -= i;
-    return *this;
-  }
-
-  /// Interchange two iterators in an exception-safe manner.
-  void swap(const_result_iterator &other) noexcept
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row::swap(other);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool operator==(const_result_iterator const &i) const
-  {
-    return m_index == i.m_index;
-  }
-  [[nodiscard]] bool operator!=(const_result_iterator const &i) const
-  {
-    return m_index != i.m_index;
-  }
-  [[nodiscard]] bool operator<(const_result_iterator const &i) const
-  {
-    return m_index < i.m_index;
-  }
-  [[nodiscard]] bool operator<=(const_result_iterator const &i) const
-  {
-    return m_index <= i.m_index;
-  }
-  [[nodiscard]] bool operator>(const_result_iterator const &i) const
-  {
-    return m_index > i.m_index;
-  }
-  [[nodiscard]] bool operator>=(const_result_iterator const &i) const
-  {
-    return m_index >= i.m_index;
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] inline const_result_iterator operator+(difference_type) const;
-  friend const_result_iterator
-  operator+(difference_type, const_result_iterator const &);
-  [[nodiscard]] inline const_result_iterator operator-(difference_type) const;
-  [[nodiscard]] inline difference_type
-  operator-(const_result_iterator const &) const;
-  //@}
-
-private:
-  friend class pqxx::result;
-  const_result_iterator(pqxx::result const *r, result_size_type i) noexcept :
-          row{*r, i, r->columns()}
-  {}
-};
-
-
-/// Reverse iterator for result.  Use as result::const_reverse_iterator.
-class PQXX_LIBEXPORT const_reverse_result_iterator
-        : private const_result_iterator
-{
-public:
-  using super = const_result_iterator;
-  using iterator_type = const_result_iterator;
-  using iterator_type::difference_type;
-  using iterator_type::iterator_category;
-  using iterator_type::pointer;
-  using value_type = iterator_type::value_type;
-  using reference = iterator_type::reference;
-
-  /// Create an iterator, but in an unusable state.
-  const_reverse_result_iterator() = default;
-  /// Copy an iterator.
-  const_reverse_result_iterator(const_reverse_result_iterator const &rhs) =
-    default;
-  /// Copy a reverse iterator from a regular iterator.
-  explicit const_reverse_result_iterator(const_result_iterator const &rhs) :
-          const_result_iterator{rhs}
-  {
-    super::operator--();
-  }
-
-  /// Move a regular iterator into a reverse iterator.
-  explicit const_reverse_result_iterator(const_result_iterator const &&rhs) :
-          const_result_iterator{std::move(rhs)}
-  {
-    super::operator--();
-  }
-
-  /// Return the underlying "regular" iterator (as per standard library).
-  [[nodiscard]] PQXX_PURE const_result_iterator base() const noexcept;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  /// Dereference iterator.
-  using const_result_iterator::operator->;
-  /// Dereference iterator.
-  using const_result_iterator::operator*;
-  //@}
-
-  /**
-   * @name Field access
-   */
-  //@{
-  using const_result_iterator::back;
-  using const_result_iterator::front;
-  using const_result_iterator::operator[];
-  using const_result_iterator::at;
-  using const_result_iterator::rownumber;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_reverse_result_iterator &
-  operator=(const_reverse_result_iterator const &r)
-  {
-    iterator_type::operator=(r);
-    return *this;
-  }
-  const_reverse_result_iterator &operator=(const_reverse_result_iterator &&r)
-  {
-    iterator_type::operator=(std::move(r));
-    return *this;
-  }
-  const_reverse_result_iterator &operator++()
-  {
-    iterator_type::operator--();
-    return *this;
-  }
-  const_reverse_result_iterator operator++(int);
-  const_reverse_result_iterator &operator--()
-  {
-    iterator_type::operator++();
-    return *this;
-  }
-  const_reverse_result_iterator operator--(int);
-  const_reverse_result_iterator &operator+=(difference_type i)
-  {
-    iterator_type::operator-=(i);
-    return *this;
-  }
-  const_reverse_result_iterator &operator-=(difference_type i)
-  {
-    iterator_type::operator+=(i);
-    return *this;
-  }
-
-  void swap(const_reverse_result_iterator &other) noexcept
-  {
-    const_result_iterator::swap(other);
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] const_reverse_result_iterator
-  operator+(difference_type i) const
-  {
-    return const_reverse_result_iterator(base() - i);
-  }
-  [[nodiscard]] const_reverse_result_iterator operator-(difference_type i)
-  {
-    return const_reverse_result_iterator(base() + i);
-  }
-  [[nodiscard]] difference_type
-  operator-(const_reverse_result_iterator const &rhs) const
-  {
-    return rhs.const_result_iterator::operator-(*this);
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool
-  operator==(const_reverse_result_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator==(rhs);
-  }
-  [[nodiscard]] bool
-  operator!=(const_reverse_result_iterator const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-
-  [[nodiscard]] bool operator<(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator>(rhs);
-  }
-  [[nodiscard]] bool operator<=(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator>=(rhs);
-  }
-  [[nodiscard]] bool operator>(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator<(rhs);
-  }
-  [[nodiscard]] bool operator>=(const_reverse_result_iterator const &rhs) const
-  {
-    return iterator_type::operator<=(rhs);
-  }
-  //@}
-};
-
-
-inline const_result_iterator
-const_result_iterator::operator+(result::difference_type o) const
-{
-  return {&m_result, size_type(result::difference_type(m_index) + o)};
-}
-
-inline const_result_iterator
-operator+(result::difference_type o, const_result_iterator const &i)
-{
-  return i + o;
-}
-
-inline const_result_iterator
-const_result_iterator::operator-(result::difference_type o) const
-{
-  return {&m_result, result_size_type(result::difference_type(m_index) - o)};
-}
-
-inline result::difference_type
-const_result_iterator::operator-(const const_result_iterator &i) const
-{
-  return result::difference_type(num() - i.num());
-}
-
-inline const_result_iterator result::end() const noexcept
-{
-  return {this, size()};
-}
-
-
-inline const_result_iterator result::cend() const noexcept
-{
-  return end();
-}
-
-
-inline const_reverse_result_iterator
-operator+(result::difference_type n, const_reverse_result_iterator const &i)
-{
-  return const_reverse_result_iterator{i.base() - n};
-}
-
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/sql_cursor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/sql_cursor.hxx
deleted file mode 100644
index a26d06306..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/sql_cursor.hxx
+++ /dev/null
@@ -1,118 +0,0 @@
-/** Internal wrapper for SQL cursors.  Supports higher-level cursor classes.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY.  Other headers include it for you.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SQL_CURSOR
-#define PQXX_H_SQL_CURSOR
-
-namespace pqxx::internal
-{
-/// Cursor with SQL positioning semantics.
-/** Thin wrapper around an SQL cursor, with SQL's ideas of positioning.
- *
- * SQL cursors have pre-increment/pre-decrement semantics, with on either end
- * of the result set a special position that does not repesent a row.  This
- * class models SQL cursors for the purpose of implementing more C++-like
- * semantics on top.
- *
- * Positions of actual rows are numbered starting at 1.  Position 0 exists but
- * does not refer to a row.  There is a similar non-row position at the end of
- * the result set.
- *
- * Don't use this at home.  You deserve better.  Use the stateles_cursor
- * instead.
- */
-class PQXX_LIBEXPORT sql_cursor : public cursor_base
-{
-public:
-  sql_cursor(
-    transaction_base &t, std::string_view query, std::string_view cname,
-    cursor_base::access_policy ap, cursor_base::update_policy up,
-    cursor_base::ownership_policy op, bool hold);
-
-  sql_cursor(
-    transaction_base &t, std::string_view cname,
-    cursor_base::ownership_policy op);
-
-  ~sql_cursor() noexcept { close(); }
-
-  result fetch(difference_type rows, difference_type &displacement);
-  result fetch(difference_type rows)
-  {
-    difference_type d = 0;
-    return fetch(rows, d);
-  }
-  difference_type move(difference_type rows, difference_type &displacement);
-  difference_type move(difference_type rows)
-  {
-    difference_type d = 0;
-    return move(rows, d);
-  }
-
-  /// Current position, or -1 for unknown
-  /**
-   * The starting position, just before the first row, counts as position zero.
-   *
-   * Position may be unknown if (and only if) this cursor was adopted, and has
-   * never hit its starting position (position zero).
-   */
-  difference_type pos() const noexcept { return m_pos; }
-
-  /// End position, or -1 for unknown
-  /**
-   * Returns the final position, just after the last row in the result set. The
-   * starting position, just before the first row, counts as position zero.
-   *
-   * End position is unknown until it is encountered during use.
-   */
-  difference_type endpos() const noexcept { return m_endpos; }
-
-  /// Return zero-row result for this cursor.
-  result const &empty_result() const noexcept { return m_empty_result; }
-
-  void close() noexcept;
-
-private:
-  difference_type adjust(difference_type hoped, difference_type actual);
-  static std::string stridestring(difference_type);
-  /// Initialize cached empty result.  Call only at beginning or end!
-  void init_empty_result(transaction_base &);
-
-  /// Connection in which this cursor lives.
-  connection &m_home;
-
-  /// Zero-row result from this cursor (or plain empty one if cursor is
-  /// adopted)
-  result m_empty_result;
-
-  result m_cached_current_row;
-
-  /// Is this cursor adopted (as opposed to created by this cursor object)?
-  bool m_adopted;
-
-  /// Will this cursor object destroy its SQL cursor when it dies?
-  cursor_base::ownership_policy m_ownership;
-
-  /// At starting position (-1), somewhere in the middle (0), or past end (1)
-  int m_at_end;
-
-  /// Position, or -1 for unknown
-  difference_type m_pos;
-
-  /// End position, or -1 for unknown
-  difference_type m_endpos = -1;
-};
-
-
-PQXX_LIBEXPORT result_size_type obtain_stateless_cursor_size(sql_cursor &);
-PQXX_LIBEXPORT result stateless_cursor_retrieve(
-  sql_cursor &, result::difference_type size,
-  result::difference_type begin_pos, result::difference_type end_pos);
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/statement_parameters.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/statement_parameters.hxx
deleted file mode 100644
index b078bf6e0..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/statement_parameters.hxx
+++ /dev/null
@@ -1,131 +0,0 @@
-/** Common implementation for statement parameter lists.
- *
- * These are used for both prepared statements and parameterized statements.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY.  Other headers include it for you.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STATEMENT_PARAMETER
-#define PQXX_H_STATEMENT_PARAMETER
-
-#include <cstring>
-#include <functional>
-#include <iterator>
-#include <string>
-#include <vector>
-
-#include "pqxx/binarystring.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/util.hxx"
-
-
-namespace pqxx::internal
-{
-template<typename ITERATOR>
-constexpr inline auto const iterator_identity{
-  [](decltype(*std::declval<ITERATOR>()) x) { return x; }};
-
-
-/// Marker type: pass a dynamically-determined number of statement parameters.
-/** @deprecated Use @ref params instead.
- *
- * Normally when invoking a prepared or parameterised statement, the number
- * of parameters is known at compile time.  For instance,
- * `t.exec_prepared("foo", 1, "x");` executes statement `foo` with two
- * parameters, an `int` and a C string.
- *
- * But sometimes you may want to pass a number of parameters known only at run
- * time.  In those cases, a @ref dynamic_params encodes a dynamically
- * determined number of parameters.  You can mix these with regular, static
- * parameter lists, and you can re-use them for multiple statement invocations.
- *
- * A dynamic_params object does not store copies of its parameters, so make
- * sure they remain accessible until you've executed the statement.
- *
- * The ACCESSOR is an optional callable (such as a lambda).  If you pass an
- * accessor `a`, then each parameter `p` goes into your statement as `a(p)`.
- */
-template<typename IT, typename ACCESSOR = decltype(iterator_identity<IT>)>
-class dynamic_params
-{
-public:
-  /// Wrap a sequence of pointers or iterators.
-  constexpr dynamic_params(IT begin, IT end) :
-          m_begin(begin), m_end(end), m_accessor(iterator_identity<IT>)
-  {}
-
-  /// Wrap a sequence of pointers or iterators.
-  /** This version takes an accessor callable.  If you pass an accessor `acc`,
-   * then any parameter `p` will go into the statement's parameter list as
-   * `acc(p)`.
-   */
-  constexpr dynamic_params(IT begin, IT end, ACCESSOR &acc) :
-          m_begin(begin), m_end(end), m_accessor(acc)
-  {}
-
-  /// Wrap a container.
-  template<typename C>
-  explicit constexpr dynamic_params(C &container) :
-          dynamic_params(std::begin(container), std::end(container))
-  {}
-
-  /// Wrap a container.
-  /** This version takes an accessor callable.  If you pass an accessor `acc`,
-   * then any parameter `p` will go into the statement's parameter list as
-   * `acc(p)`.
-   */
-  template<typename C>
-  explicit constexpr dynamic_params(C &container, ACCESSOR &acc) :
-          dynamic_params(std::begin(container), std::end(container), acc)
-  {}
-
-  constexpr IT begin() const noexcept { return m_begin; }
-  constexpr IT end() const noexcept { return m_end; }
-
-  constexpr auto access(decltype(*std::declval<IT>()) value) const
-    -> decltype(std::declval<ACCESSOR>()(value))
-  {
-    return m_accessor(value);
-  }
-
-private:
-  IT const m_begin, m_end;
-  ACCESSOR m_accessor = iterator_identity<IT>;
-};
-
-
-/// Internal type: encode statement parameters.
-/** Compiles arguments for prepared statements and parameterised queries into
- * a format that can be passed into libpq.
- *
- * Objects of this type are meant to be short-lived: a `c_params` lives and
- * dies entirely within the call to execute.  So, for example, if you pass in a
- * non-null pointer as a parameter, @ref params may simply use that pointer as
- * a parameter value, without arranging longer-term storage for the data to
- * which it points.  All values referenced by parameters must remain "live"
- * until the parameterised or prepared statement has been executed.
- */
-struct PQXX_LIBEXPORT c_params
-{
-  c_params() = default;
-  /// Copying these objects is pointless and expensive.  Don't do it.
-  c_params(c_params const &) = delete;
-  c_params(c_params &&) = default;
-
-  /// Pre-allocate storage for `n` parameters.
-  void reserve(std::size_t n) &;
-
-  /// As used by libpq: pointers to parameter values.
-  std::vector<char const *> values;
-  /// As used by libpq: lengths of non-null arguments, in bytes.
-  std::vector<int> lengths;
-  /// As used by libpq: effectively boolean "is this a binary parameter?"
-  std::vector<format> formats;
-};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/stream_iterator.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/stream_iterator.hxx
deleted file mode 100644
index f240dcfa7..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/stream_iterator.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/** Stream iterators.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_ITERATOR
-#define PQXX_H_STREAM_ITERATOR
-
-#include <memory>
-
-namespace pqxx
-{
-class stream_from;
-}
-
-
-namespace pqxx::internal
-{
-// C++20: Replace with generator?
-/// Input iterator for stream_from.
-/** Just barely enough to support range-based "for" loops.  Don't assume that
- * any of the usual behaviour works beyond that.
- */
-template<typename... TYPE> class stream_input_iterator
-{
-public:
-  using value_type = std::tuple<TYPE...>;
-
-  /// Construct an "end" iterator.
-  stream_input_iterator() = default;
-
-  explicit stream_input_iterator(stream_from &home) : m_home(&home)
-  {
-    advance();
-  }
-  stream_input_iterator(stream_input_iterator const &) = default;
-
-  stream_input_iterator &operator++()
-  {
-    advance();
-    return *this;
-  }
-
-  value_type const &operator*() const { return m_value; }
-
-  /// Comparison only works for comparing to end().
-  bool operator==(stream_input_iterator const &rhs) const
-  {
-    return m_home == rhs.m_home;
-  }
-  /// Comparison only works for comparing to end().
-  bool operator!=(stream_input_iterator const &rhs) const
-  {
-    return not(*this == rhs);
-  }
-
-private:
-  void advance()
-  {
-    if (m_home == nullptr)
-      throw usage_error{"Moving stream_from iterator beyond end()."};
-    if (not((*m_home) >> m_value))
-      m_home = nullptr;
-  }
-
-  stream_from *m_home{nullptr};
-  value_type m_value;
-};
-
-
-// C++20: Replace with generator?
-/// Iteration over a @ref stream_from.
-template<typename... TYPE> class stream_input_iteration
-{
-public:
-  using iterator = stream_input_iterator<TYPE...>;
-  explicit stream_input_iteration(stream_from &home) : m_home{home} {}
-  iterator begin() const { return iterator{m_home}; }
-  iterator end() const { return {}; }
-
-private:
-  stream_from &m_home;
-};
-
-
-// C++20: Replace with generator?
-/// Iteration over a @ref stream_from, deleting it once done.
-template<typename... TYPE> class owning_stream_input_iteration
-{
-public:
-  using iterator = stream_input_iterator<TYPE...>;
-  explicit owning_stream_input_iteration(std::unique_ptr<stream_from> &&home) :
-          m_home{std::move(home)}
-  {}
-  iterator begin() const { return iterator{*m_home.get()}; }
-  iterator end() const { return {}; }
-
-private:
-  std::unique_ptr<stream_from> m_home;
-};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/wait.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/wait.hxx
deleted file mode 100644
index 7a82e6553..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/internal/wait.hxx
+++ /dev/null
@@ -1,18 +0,0 @@
-#if !defined(PQXX_WAIT_HXX)
-#  define PQXX_WAIT_HXX
-
-namespace pqxx::internal
-{
-/// Wait.
-/** This is normally `std::this_thread::sleep_for()`.  But MinGW's `thread`
- * header doesn't work, so we must be careful about including it.
- */
-void PQXX_LIBEXPORT wait_for(unsigned int microseconds);
-
-
-/// Wait for a socket to be ready for reading/writing, or timeout.
-PQXX_LIBEXPORT void wait_fd(
-  int fd, bool for_read, bool for_write, unsigned seconds = 1,
-  unsigned microseconds = 0);
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/isolation b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/isolation
deleted file mode 100644
index 1b801329b..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/isolation
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Transaction isolation levels.
- *
- * Policies and traits describing SQL transaction isolation levels
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/isolation.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/isolation.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/isolation.hxx
deleted file mode 100644
index 0698c6ab4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/isolation.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Definitions for transaction isolation levels, and such.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/isolation instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ISOLATION
-#define PQXX_H_ISOLATION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Should a transaction be read-only, or read-write?
-/** No, this is not an isolation level.  So it really doesn't belong here.
- * But it's not really worth a separate header.
- */
-enum class write_policy
-{
-  read_only,
-  read_write
-};
-
-
-/// Transaction isolation levels.
-/** These are as defined in the SQL standard.  But there are a few notes
- * specific to PostgreSQL.
- *
- * First, postgres does not support "read uncommitted."  The lowest level you
- * can get is "read committed," which is better.  PostgreSQL is built on the
- * MVCC paradigm, which guarantees "read committed" isolation without any
- * additional performance overhead, so there was no point in providing the
- * lower level.
- *
- * Second, "repeatable read" also makes more isolation guarantees than the
- * standard requires.  According to the standard, this level prevents "dirty
- * reads" and "nonrepeatable reads," but not "phantom reads."  In postgres,
- * it actually prevents all three.
- *
- * Third, "serializable" is only properly supported starting at postgres 9.1.
- * If you request "serializable" isolation on an older backend, you will get
- * the same isolation as in "repeatable read."  It's better than the
- * "repeatable read" defined in the SQL standard, but not a complete
- * implementation of the standard's "serializable" isolation level.
- *
- * In general, a lower isolation level will allow more surprising interactions
- * between ongoing transactions, but improve performance.  A higher level
- * gives you more protection from subtle concurrency bugs, but sometimes it
- * may not be possible to complete your transaction without avoiding paradoxes
- * in the data.  In that case a transaction may fail, and the application will
- * have to re-do the whole thing based on the latest state of the database.
- * (If you want to retry your code in that situation, have a look at the
- * transactor framework.)
- *
- * Study the levels and design your application with the right level in mind.
- */
-enum isolation_level
-{
-  // PostgreSQL only has the better isolation levels.
-  // read_uncommitted,
-
-  read_committed,
-  repeatable_read,
-  serializable,
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/largeobject b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/largeobject
deleted file mode 100644
index 1f2f94790..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/largeobject
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Large Objects interface.
- *
- * Supports direct access to large objects, as well as through I/O streams
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/largeobject.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/largeobject.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/largeobject.hxx
deleted file mode 100644
index ebafc51d8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/largeobject.hxx
+++ /dev/null
@@ -1,735 +0,0 @@
-/* Large Objects interface.  Deprecated; use blob instead.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/largeobject instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_LARGEOBJECT
-#define PQXX_H_LARGEOBJECT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <streambuf>
-
-#include "pqxx/dbtransaction.hxx"
-
-
-namespace pqxx
-{
-/// Identity of a large object.
-/** @deprecated Use the @ref blob class instead.
- *
- * Encapsulates the identity of a large object.
- *
- * A largeobject must be accessed only from within a backend transaction, but
- * the object's identity remains valid as long as the object exists.
- */
-class PQXX_LIBEXPORT largeobject
-{
-public:
-  using size_type = large_object_size_type;
-
-  /// Refer to a nonexistent large object (similar to what a null pointer
-  /// does).
-  [[deprecated("Use blob instead.")]] largeobject() noexcept = default;
-
-  /// Create new large object.
-  /** @param t Backend transaction in which the object is to be created.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobject(dbtransaction &t);
-
-  /// Wrap object with given oid.
-  /** Convert combination of a transaction and object identifier into a
-   * large object identity.  Does not affect the database.
-   * @param o Object identifier for the given object.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobject(oid o) noexcept :
-          m_id{o}
-  {}
-
-  /// Import large object from a local file.
-  /** Creates a large object containing the data found in the given file.
-   * @param t Backend transaction in which the large object is to be created.
-   * @param file A filename on the client program's filesystem.
-   */
-  [[deprecated("Use blob instead.")]] largeobject(
-    dbtransaction &t, std::string_view file);
-
-  /// Take identity of an opened large object.
-  /** Copy identity of already opened large object.  Note that this may be done
-   * as an implicit conversion.
-   * @param o Already opened large object to copy identity from.
-   */
-  [[deprecated("Use blob instead.")]] largeobject(
-    largeobjectaccess const &o) noexcept;
-
-  /// Object identifier.
-  /** The number returned by this function identifies the large object in the
-   * database we're connected to (or oid_none is returned if we refer to the
-   * null object).
-   */
-  [[nodiscard]] oid id() const noexcept { return m_id; }
-
-  /**
-   * @name Identity comparisons
-   *
-   * These operators compare the object identifiers of large objects.  This has
-   * nothing to do with the objects' actual contents; use them only for keeping
-   * track of containers of references to large objects and such.
-   */
-  //@{
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator==(largeobject const &other) const
-  {
-    return m_id == other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator!=(largeobject const &other) const
-  {
-    return m_id != other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator<=(largeobject const &other) const
-  {
-    return m_id <= other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator>=(largeobject const &other) const
-  {
-    return m_id >= other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator<(largeobject const &other) const
-  {
-    return m_id < other.m_id;
-  }
-  /// Compare object identities
-  /** @warning Only valid between large objects in the same database. */
-  [[nodiscard]] bool operator>(largeobject const &other) const
-  {
-    return m_id > other.m_id;
-  }
-  //@}
-
-  /// Export large object's contents to a local file
-  /** Writes the data stored in the large object to the given file.
-   * @param t Transaction in which the object is to be accessed
-   * @param file A filename on the client's filesystem
-   */
-  void to_file(dbtransaction &t, std::string_view file) const;
-
-  /// Delete large object from database
-  /** Unlike its low-level equivalent cunlink, this will throw an exception if
-   * deletion fails.
-   * @param t Transaction in which the object is to be deleted
-   */
-  void remove(dbtransaction &t) const;
-
-protected:
-  PQXX_PURE static internal::pq::PGconn *
-  raw_connection(dbtransaction const &T);
-
-  PQXX_PRIVATE std::string reason(connection const &, int err) const;
-
-private:
-  oid m_id = oid_none;
-};
-
-
-/// Accessor for large object's contents.
-/** @deprecated Use the `blob` class instead.
- */
-class PQXX_LIBEXPORT largeobjectaccess : private largeobject
-{
-public:
-  using largeobject::size_type;
-  using off_type = size_type;
-  using pos_type = size_type;
-
-  /// Open mode: `in`, `out` (can be combined using "bitwise or").
-  /** According to the C++ standard, these should be in `std::ios_base`.  We
-   * take them from derived class `std::ios` instead, which is easier on the
-   * eyes.
-   *
-   * Historical note: taking it from std::ios was originally a workaround for a
-   * problem with gcc 2.95.
-   */
-  using openmode = std::ios::openmode;
-
-  /// Default open mode: in, out, binary.
-  static constexpr auto default_mode{
-    std::ios::in | std::ios::out | std::ios::binary};
-
-  /// Seek direction: `beg`, `cur`, `end`.
-  using seekdir = std::ios::seekdir;
-
-  /// Create new large object and open it.
-  /**
-   * @param t Backend transaction in which the object is to be created.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] explicit largeobjectaccess(
-    dbtransaction &t, openmode mode = default_mode);
-
-  /// Open large object with given oid.
-  /** Convert combination of a transaction and object identifier into a
-   * large object identity.  Does not affect the database.
-   * @param t Transaction in which the object is to be accessed.
-   * @param o Object identifier for the given object.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, oid o, openmode mode = default_mode);
-
-  /// Open given large object.
-  /** Open a large object with the given identity for reading and/or writing.
-   * @param t Transaction in which the object is to be accessed.
-   * @param o Identity for the large object to be accessed.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out |
-   * ios_base::binary.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, largeobject o, openmode mode = default_mode);
-
-  /// Import large object from a local file and open it.
-  /** Creates a large object containing the data found in the given file.
-   * @param t Backend transaction in which the large object is to be created.
-   * @param file A filename on the client program's filesystem.
-   * @param mode Access mode, defaults to ios_base::in | ios_base::out.
-   */
-  [[deprecated("Use blob instead.")]] largeobjectaccess(
-    dbtransaction &t, std::string_view file, openmode mode = default_mode);
-
-  ~largeobjectaccess() noexcept { close(); }
-
-  /// Object identifier.
-  /** The number returned by this function uniquely identifies the large object
-   * in the context of the database we're connected to.
-   */
-  using largeobject::id;
-
-  /// Export large object's contents to a local file.
-  /** Writes the data stored in the large object to the given file.
-   * @param file A filename on the client's filesystem.
-   */
-  void to_file(std::string_view file) const
-  {
-    largeobject::to_file(m_trans, file);
-  }
-
-  using largeobject::to_file;
-
-  /**
-   * @name High-level access to object contents.
-   */
-  //@{
-  /// Write data to large object.
-  /** @warning The size of a write is currently limited to 2GB.
-   *
-   * @param buf Data to write.
-   * @param len Number of bytes from Buf to write.
-   */
-  void write(char const buf[], std::size_t len);
-
-  /// Write string to large object.
-  /** If not all bytes could be written, an exception is thrown.
-   * @param buf Data to write; no terminating zero is written.
-   */
-  void write(std::string_view buf) { write(std::data(buf), std::size(buf)); }
-
-  /// Read data from large object.
-  /** Throws an exception if an error occurs while reading.
-   * @param buf Location to store the read data in.
-   * @param len Number of bytes to try and read.
-   * @return Number of bytes read, which may be less than the number requested
-   * if the end of the large object is reached.
-   */
-  size_type read(char buf[], std::size_t len);
-
-  /// Seek in large object's data stream.
-  /** Throws an exception if an error occurs.
-   * @return The new position in the large object
-   */
-  size_type seek(size_type dest, seekdir dir);
-
-  /// Report current position in large object's data stream.
-  /** Throws an exception if an error occurs.
-   * @return The current position in the large object.
-   */
-  [[nodiscard]] size_type tell() const;
-  //@}
-
-  /**
-   * @name Low-level access to object contents.
-   *
-   * These functions provide a more "C-like" access interface, returning
-   * special values instead of throwing exceptions on error.  These functions
-   * are generally best avoided in favour of the high-level access functions,
-   * which behave more like C++ functions should.
-   *
-   * Due to libpq's underlying API, some operations are limited to "int"
-   * sizes, typically 2 GB, even though a large object can grow much larger.
-   */
-  //@{
-  /// Seek in large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param dest Offset to go to.
-   * @param dir Origin to which dest is relative: ios_base::beg (from beginning
-   *        of the object), ios_base::cur (from current access position), or
-   *        ios_base;:end (from end of object).
-   * @return New position in large object, or -1 if an error occurred.
-   */
-  pos_type cseek(off_type dest, seekdir dir) noexcept;
-
-  /// Write to large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param buf Data to write.
-   * @param len Number of bytes to write.
-   * @return Number of bytes actually written, or -1 if an error occurred.
-   */
-  off_type cwrite(char const buf[], std::size_t len) noexcept;
-
-  /// Read from large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @param buf Area where incoming bytes should be stored.
-   * @param len Number of bytes to read.
-   * @return Number of bytes actually read, or -1 if an error occurred..
-   */
-  off_type cread(char buf[], std::size_t len) noexcept;
-
-  /// Report current position in large object's data stream.
-  /** Does not throw exception in case of error; inspect return value and
-   * `errno` instead.
-   * @return Current position in large object, of -1 if an error occurred.
-   */
-  [[nodiscard]] pos_type ctell() const noexcept;
-  //@}
-
-  /**
-   * @name Error/warning output
-   */
-  //@{
-  /// Issue message to transaction's notice processor.
-  void process_notice(zview) noexcept;
-  //@}
-
-  using largeobject::remove;
-
-  using largeobject::operator==;
-  using largeobject::operator!=;
-  using largeobject::operator<;
-  using largeobject::operator<=;
-  using largeobject::operator>;
-  using largeobject::operator>=;
-
-  largeobjectaccess() = delete;
-  largeobjectaccess(largeobjectaccess const &) = delete;
-  largeobjectaccess operator=(largeobjectaccess const &) = delete;
-
-private:
-  PQXX_PRIVATE std::string reason(int err) const;
-  internal::pq::PGconn *raw_connection() const
-  {
-    return largeobject::raw_connection(m_trans);
-  }
-
-  PQXX_PRIVATE void open(openmode mode);
-  void close() noexcept;
-
-  dbtransaction &m_trans;
-  int m_fd = -1;
-};
-
-
-/// Streambuf to use large objects in standard I/O streams.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * The standard streambuf classes provide uniform access to data storage such
- * as files or string buffers, so they can be accessed using standard input or
- * output streams.  This streambuf implementation provided similar access to
- * large objects, so they could be read and written using the same stream
- * classes.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class largeobject_streambuf : public std::basic_streambuf<CHAR, TRAITS>
-{
-  using size_type = largeobject::size_type;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-  using openmode = largeobjectaccess::openmode;
-  using seekdir = largeobjectaccess::seekdir;
-
-  /// Default open mode: in, out, binary.
-  static constexpr auto default_mode{
-    std::ios::in | std::ios::out | std::ios::binary};
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  [[deprecated("Use blob instead.")]] largeobject_streambuf(
-    dbtransaction &t, largeobject o, openmode mode = default_mode,
-    size_type buf_size = 512) :
-          m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr}
-  {
-    initialize(mode);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  [[deprecated("Use blob instead.")]] largeobject_streambuf(
-    dbtransaction &t, oid o, openmode mode = default_mode,
-    size_type buf_size = 512) :
-          m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr}
-  {
-    initialize(mode);
-  }
-
-  virtual ~largeobject_streambuf() noexcept
-  {
-    delete[] m_p;
-    delete[] m_g;
-  }
-
-  /// For use by large object stream classes.
-  void process_notice(zview const &s) { m_obj.process_notice(s); }
-
-protected:
-  virtual int sync() override
-  {
-    // setg() sets eback, gptr, egptr.
-    this->setg(this->eback(), this->eback(), this->egptr());
-    return overflow(eof());
-  }
-
-  virtual pos_type seekoff(off_type offset, seekdir dir, openmode) override
-  {
-    return adjust_eof(m_obj.cseek(largeobjectaccess::off_type(offset), dir));
-  }
-
-  virtual pos_type seekpos(pos_type pos, openmode) override
-  {
-    largeobjectaccess::pos_type const newpos{
-      m_obj.cseek(largeobjectaccess::off_type(pos), std::ios::beg)};
-    return adjust_eof(newpos);
-  }
-
-  virtual int_type overflow(int_type ch) override
-  {
-    auto *const pp{this->pptr()};
-    if (pp == nullptr)
-      return eof();
-    auto *const pb{this->pbase()};
-    int_type res{0};
-
-    if (pp > pb)
-    {
-      auto const write_sz{pp - pb};
-      auto const written_sz{
-        m_obj.cwrite(pb, static_cast<std::size_t>(pp - pb))};
-      if (internal::cmp_less_equal(written_sz, 0))
-        throw internal_error{
-          "pqxx::largeobject: write failed "
-          "(is transaction still valid on write or flush?), "
-          "libpq reports error"};
-      else if (write_sz != written_sz)
-        throw internal_error{
-          "pqxx::largeobject: write failed "
-          "(is transaction still valid on write or flush?), " +
-          std::to_string(written_sz) + "/" + std::to_string(write_sz) +
-          " bytes written"};
-      auto const out{adjust_eof(written_sz)};
-
-      if constexpr (std::is_arithmetic_v<decltype(out)>)
-        res = check_cast<int_type>(out, "largeobject position"sv);
-      else
-        res = int_type(out);
-    }
-    this->setp(m_p, m_p + m_bufsize);
-
-    // Write that one more character, if it's there.
-    if (ch != eof())
-    {
-      *this->pptr() = static_cast<char_type>(ch);
-      this->pbump(1);
-    }
-    return res;
-  }
-
-  virtual int_type overflow() { return overflow(eof()); }
-
-  virtual int_type underflow() override
-  {
-    if (this->gptr() == nullptr)
-      return eof();
-    auto *const eb{this->eback()};
-    auto const res{adjust_eof(
-      m_obj.cread(this->eback(), static_cast<std::size_t>(m_bufsize)))};
-    this->setg(
-      eb, eb, eb + (res == eof() ? 0 : static_cast<std::size_t>(res)));
-    return (res == eof() or res == 0) ? eof() : traits_type::to_int_type(*eb);
-  }
-
-private:
-  /// Shortcut for traits_type::eof().
-  static int_type eof() { return traits_type::eof(); }
-
-  /// Helper: change error position of -1 to EOF (probably a no-op).
-  template<typename INTYPE> static std::streampos adjust_eof(INTYPE pos)
-  {
-    bool const at_eof{pos == -1};
-    if constexpr (std::is_arithmetic_v<std::streampos>)
-    {
-      return check_cast<std::streampos>(
-        (at_eof ? eof() : pos), "large object seek"sv);
-    }
-    else
-    {
-      return std::streampos(at_eof ? eof() : pos);
-    }
-  }
-
-  void initialize(openmode mode)
-  {
-    if ((mode & std::ios::in) != 0)
-    {
-      m_g = new char_type[unsigned(m_bufsize)];
-      this->setg(m_g, m_g, m_g);
-    }
-    if ((mode & std::ios::out) != 0)
-    {
-      m_p = new char_type[unsigned(m_bufsize)];
-      this->setp(m_p, m_p + m_bufsize);
-    }
-  }
-
-  size_type const m_bufsize;
-  largeobjectaccess m_obj;
-
-  /// Get & put buffers.
-  char_type *m_g, *m_p;
-};
-
-
-/// Input stream that gets its data from a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This class worked like any other istream, but to read data from a large
- * object.  It supported all formatting and streaming operations of
- * `std::istream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_ilostream : public std::basic_istream<CHAR, TRAITS>
-{
-  using super = std::basic_istream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create a basic_ilostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_ilostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::in | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// Create a basic_ilostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Identifier of a large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_ilostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::in | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using ilostream = basic_ilostream<char>;
-
-
-/// Output stream that writes data back to a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This worked like any other ostream, but to write data to a large object.
- * It supported all formatting and streaming operations of `std::ostream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_olostream : public std::basic_ostream<CHAR, TRAITS>
-{
-  using super = std::basic_ostream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// Create a basic_olostream.
-  /**
-   * @param t transaction in which this stream is to exist.
-   * @param o a large object to access.
-   * @param buf_size size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_olostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// Create a basic_olostream.
-  /**
-   * @param t transaction in which this stream is to exist.
-   * @param o a large object to access.
-   * @param buf_size size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_olostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{t, o, std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  ~basic_olostream()
-  {
-    try
-    {
-      m_buf.pubsync();
-      m_buf.pubsync();
-    }
-    catch (std::exception const &e)
-    {
-      m_buf.process_notice(e.what());
-    }
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using olostream = basic_olostream<char>;
-
-
-/// Stream that reads and writes a large object.
-/** @deprecated Access large objects directly using the @ref blob class.
- *
- * This worked like a std::iostream, but to read data from, or write data to, a
- * large object.  It supported all formatting and streaming operations of
- * `std::iostream`.
- *
- * This functionality was considered too fragile and complex, so it has been
- * replaced with a single, much simpler class.
- */
-template<typename CHAR = char, typename TRAITS = std::char_traits<CHAR>>
-class basic_lostream : public std::basic_iostream<CHAR, TRAITS>
-{
-  using super = std::basic_iostream<CHAR, TRAITS>;
-
-public:
-  using char_type = CHAR;
-  using traits_type = TRAITS;
-  using int_type = typename traits_type::int_type;
-  using pos_type = typename traits_type::pos_type;
-  using off_type = typename traits_type::off_type;
-
-  /// Create a basic_lostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_lostream(
-    dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{
-            t, o, std::ios::in | std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  /// Create a basic_lostream.
-  /**
-   * @param t Transaction in which this stream is to exist.
-   * @param o Large object to access.
-   * @param buf_size Size of buffer to use internally (optional).
-   */
-  [[deprecated("Use blob instead.")]] basic_lostream(
-    dbtransaction &t, oid o, largeobject::size_type buf_size = 512) :
-          super{nullptr},
-          m_buf{
-            t, o, std::ios::in | std::ios::out | std::ios::binary, buf_size}
-  {
-    super::init(&m_buf);
-  }
-
-  ~basic_lostream()
-  {
-    try
-    {
-      m_buf.pubsync();
-      m_buf.pubsync();
-    }
-    catch (std::exception const &e)
-    {
-      m_buf.process_notice(e.what());
-    }
-  }
-
-private:
-  largeobject_streambuf<CHAR, TRAITS> m_buf;
-};
-
-using lostream = basic_lostream<char>;
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/nontransaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/nontransaction
deleted file mode 100644
index bb5b79724..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/nontransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::nontransaction class.
- *
- * pqxx::nontransaction provides nontransactional database access.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/nontransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/nontransaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/nontransaction.hxx
deleted file mode 100644
index c50715594..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/nontransaction.hxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Definition of the pqxx::nontransaction class.
- *
- * pqxx::nontransaction provides nontransactional database access
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/nontransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_NONTRANSACTION
-#define PQXX_H_NONTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/connection.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/transaction.hxx"
-
-namespace pqxx
-{
-using namespace std::literals;
-
-/// Simple "transaction" class offering no transactional integrity.
-/**
- * @ingroup transactions
- *
- * nontransaction, like transaction or any other transaction_base-derived
- * class, provides access to a database through a connection.  Unlike its
- * siblings, however, nontransaction does not maintain any kind of
- * transactional integrity.  This may be useful eg. for read-only access to the
- * database that does not require a consistent, atomic view on its data; or for
- * operations that are not allowed within a backend transaction, such as
- * creating tables.
- *
- * For queries that update the database, however, a real transaction is likely
- * to be faster unless the transaction consists of only a single record update.
- *
- * Also, you can keep a nontransaction open for as long as you like.  Actual
- * back-end transactions are limited in lifespan, and will sometimes fail just
- * because they took too long to execute or were left idle for too long.  This
- * will not happen with a nontransaction (although the connection may still
- * time out, e.g. when the network is unavailable for a very long time).
- *
- * Any query executed in a nontransaction is committed immediately, and neither
- * commit() nor abort() has any effect.
- *
- * Database features that require a backend transaction, such as cursors or
- * large objects, will not work in a nontransaction.
- */
-class PQXX_LIBEXPORT nontransaction final : public transaction_base
-{
-public:
-  /// Constructor.
-  /** Create a "dummy" transaction.
-   * @param c Connection in which this "transaction" will operate.
-   * @param tname Optional tname for the transaction, beginning with a letter
-   * and containing only letters and digits.
-   */
-  nontransaction(connection &c, std::string_view tname = ""sv) :
-          transaction_base{c, tname, std::shared_ptr<std::string>{}}
-  {
-    register_transaction();
-  }
-
-  virtual ~nontransaction() override { close(); }
-
-private:
-  virtual void do_commit() override {}
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/notification b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/notification
deleted file mode 100644
index a0bd1c73e..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/notification
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::notification_receiver functor interface.
- *
- * pqxx::notification_receiver handles incoming notifications.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/notification.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/notification.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/notification.hxx
deleted file mode 100644
index b59b8567a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/notification.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Definition of the pqxx::notification_receiver functor interface.
- *
- * pqxx::notification_receiver handles incoming notifications.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/notification instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_NOTIFICATION
-#define PQXX_H_NOTIFICATION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <string>
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx
-{
-/// "Observer" base class for notifications.
-/** @addtogroup notification Notifications and Receivers
- *
- * To listen on a notification issued using the NOTIFY command, derive your own
- * class from notification_receiver and define its function-call operator to
- * perform whatever action you wish to take when the given notification
- * arrives. Then create an object of that class and pass it to your connection.
- * DO NOT use raw SQL to listen for notifications, or your attempts to listen
- * won't be resumed when a connection fails--and you'll have no way to notice.
- *
- * Notifications never arrive inside a transaction, not even in a
- * nontransaction.  Therefore, you are free to open a transaction of your own
- * inside your receiver's function invocation operator.
- *
- * Notifications you are listening for may arrive anywhere within libpqxx code,
- * but be aware that **PostgreSQL defers notifications occurring inside
- * transactions.**  (This was done for excellent reasons; just think about what
- * happens if the transaction where you happen to handle an incoming
- * notification is later rolled back for other reasons).  So if you're keeping
- * a transaction open, don't expect any of your receivers on the same
- * connection to be notified.
- *
- * (For very similar reasons, outgoing notifications are also not sent until
- * the transaction that sends them commits.)
- *
- * Multiple receivers on the same connection may listen on a notification of
- * the same name.  An incoming notification is processed by invoking all
- * receivers (zero or more) of the same name.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE notification_receiver
-{
-public:
-  /// Register the receiver with a connection.
-  /**
-   * @param c Connnection to operate on.
-   * @param channel Name of the notification to listen for.
-   */
-  notification_receiver(connection &c, std::string_view channel);
-  /// Register the receiver with a connection.
-  notification_receiver(notification_receiver const &) = delete;
-  /// Register the receiver with a connection.
-  notification_receiver &operator=(notification_receiver const &) = delete;
-  /// Deregister the receiver.
-  virtual ~notification_receiver();
-
-  /// The channel that this receiver listens on.
-  [[nodiscard]] std::string const &channel() const & { return m_channel; }
-
-  // TODO: Change API to take payload as zview instead of string ref.
-  /// Overridable: action to invoke when notification arrives.
-  /**
-   * @param payload An optional string that may have been passed to the NOTIFY
-   * command.
-   * @param backend_pid Process ID of the database backend process that served
-   * our connection when the notification arrived.  The actual process ID
-   * behind the connection may have changed by the time this method is called.
-   */
-  virtual void operator()(std::string const &payload, int backend_pid) = 0;
-
-protected:
-  connection &conn() const noexcept { return m_conn; }
-
-private:
-  connection &m_conn;
-  std::string m_channel;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/params b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/params
deleted file mode 100644
index 4098782aa..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/params
+++ /dev/null
@@ -1,8 +0,0 @@
-/** Helper classes for passing statement parameters.
- *
- * Use these for prepared statements and parameterised statements.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/params.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/params.hxx
deleted file mode 100644
index 2d29cdfed..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/params.hxx
+++ /dev/null
@@ -1,383 +0,0 @@
-/* Helpers for prepared statements and parameterised statements.
- *
- * See the connection class for more about such statements.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_PARAMS
-#define PQXX_H_PARAMS
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <array>
-
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/statement_parameters.hxx"
-#include "pqxx/types.hxx"
-
-
-/// @deprecated The new @ref params class replaces all of this.
-namespace pqxx::prepare
-{
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * sequence ranging from `begin` to `end` exclusively.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic sequences.
- *
- * @param begin A pointer or iterator for iterating parameters.
- * @param end A pointer or iterator for iterating parameters.
- * @return An object representing the parameters.
- */
-template<typename IT>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(IT begin, IT end)
-{
-  return pqxx::internal::dynamic_params(begin, end);
-}
-
-
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * container of parameter values.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic containers.
- *
- * @param container A container of parameter values.
- * @return An object representing the parameters.
- */
-template<typename C>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(C const &container)
-{
-  using IT = typename C::const_iterator;
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return pqxx::internal::dynamic_params<IT>{container};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-/// Pass a number of statement parameters only known at runtime.
-/** @deprecated Use @ref params instead.
- *
- * When you call any of the `exec_params` functions, the number of arguments
- * is normally known at compile time.  This helper function supports the case
- * where it is not.
- *
- * Use this function to pass a variable number of parameters, based on a
- * container of parameter values.
- *
- * The technique combines with the regular static parameters.  You can use it
- * to insert dynamic parameter lists in any place, or places, among the call's
- * parameters.  You can even insert multiple dynamic containers.
- *
- * @param container A container of parameter values.
- * @param accessor For each parameter `p`, pass `accessor(p)`.
- * @return An object representing the parameters.
- */
-template<typename C, typename ACCESSOR>
-[[deprecated("Use the params class instead.")]] constexpr inline auto
-make_dynamic_params(C &container, ACCESSOR accessor)
-{
-  using IT = decltype(std::begin(container));
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return pqxx::internal::dynamic_params<IT, ACCESSOR>{container, accessor};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-} // namespace pqxx::prepare
-
-
-namespace pqxx
-{
-/// Generate parameter placeholders for use in an SQL statement.
-/** When you want to pass parameters to a prepared statement or a parameterised
- * statement, you insert placeholders into the SQL.  During invocation, the
- * database replaces those with the respective parameter values you passed.
- *
- * The placeholders look like `$1` (for the first parameter value), `$2` (for
- * the second), and so on.  You can just write those directly in your
- * statement.  But for those rare cases where it becomes difficult to track
- * which number a placeholder should have, you can use a `placeholders` object
- * to count and generate them in order.
- */
-template<typename COUNTER = unsigned int> class placeholders
-{
-public:
-  /// Maximum number of parameters we support.
-  static inline constexpr unsigned int max_params{
-    (std::numeric_limits<COUNTER>::max)()};
-
-  placeholders()
-  {
-    static constexpr auto initial{"$1\0"sv};
-    initial.copy(std::data(m_buf), std::size(initial));
-  }
-
-  /// Read an ephemeral version of the current placeholder text.
-  /** @warning Changing the current placeholder number will overwrite this.
-   * Use the view immediately, or lose it.
-   */
-  constexpr zview view() const &noexcept
-  {
-    return zview{std::data(m_buf), m_len};
-  }
-
-  /// Read the current placeholder text, as a `std::string`.
-  /** This will be slightly slower than converting to a `zview`.  With most
-   * C++ implementations however, until you get into ridiculous numbers of
-   * parameters, the string will benefit from the Short String Optimization, or
-   * SSO.
-   */
-  std::string get() const { return std::string(std::data(m_buf), m_len); }
-
-  /// Move on to the next parameter.
-  void next() &
-  {
-    if (m_current >= max_params)
-      throw range_error{pqxx::internal::concat(
-        "Too many parameters in one statement: limit is ", max_params, ".")};
-    ++m_current;
-    if (m_current % 10 == 0)
-    {
-      // Carry the 1.  Don't get too clever for this relatively rare
-      // case, just rewrite the entire number.  Leave the $ in place
-      // though.
-      char *const data{std::data(m_buf)};
-      char *const end{string_traits<COUNTER>::into_buf(
-        data + 1, data + std::size(m_buf), m_current)};
-      // (Subtract because we don't include the trailing zero.)
-      m_len = check_cast<COUNTER>(end - data, "placeholders counter") - 1;
-    }
-    else
-    {
-      PQXX_LIKELY
-      // Shortcut for the common case: just increment that last digit.
-      ++m_buf[m_len - 1];
-    }
-  }
-
-  /// Return the current placeholder number.  The initial placeholder is 1.
-  COUNTER count() const noexcept { return m_current; }
-
-private:
-  /// Current placeholder number.  Starts at 1.
-  COUNTER m_current = 1;
-
-  /// Length of the current placeholder string, not including trailing zero.
-  COUNTER m_len = 2;
-
-  /// Text buffer where we render the placeholders, with a trailing zero.
-  /** We keep reusing this for every subsequent placeholder, just because we
-   * don't like string allocations.
-   *
-   * Maximum length is the maximum base-10 digits that COUNTER can fully
-   * represent, plus 1 more for the extra digit that it can only partially
-   * fill up, plus room for the dollar sign and the trailing zero.
-   */
-  std::array<char, std::numeric_limits<COUNTER>::digits10 + 3> m_buf;
-};
-
-
-/// Build a parameter list for a parameterised or prepared statement.
-/** When calling a parameterised statement or a prepared statement, you can
- * pass parameters into the statement directly in the invocation, as
- * additional arguments to `exec_prepared` or `exec_params`.  But in
- * complex cases, sometimes that's just not convenient.
- *
- * In those situations, you can create a `params` and append your parameters
- * into that, one by one.  Then you pass the `params` to `exec_prepared` or
- * `exec_params`.
- *
- * Combinations also work: if you have a `params` containing a string
- * parameter, and you call `exec_params` with an `int` argument followed by
- * your `params`, you'll be passing the `int` as the first parameter and
- * the string as the second.  You can even insert a `params` in a `params`,
- * or pass two `params` objects to a statement.
- */
-class PQXX_LIBEXPORT params
-{
-public:
-  params() = default;
-
-  /// Pre-populate a `params` with `args`.  Feel free to add more later.
-  template<typename... Args> constexpr params(Args &&...args)
-  {
-    reserve(sizeof...(args));
-    append_pack(std::forward<Args>(args)...);
-  }
-
-  /// Pre-allocate room for at least `n` parameters.
-  /** This is not needed, but it may improve efficiency.
-   *
-   * Reserve space if you're going to add parameters individually, and you've
-   * got some idea of how many there are going to be.  It may save some
-   * memory re-allocations.
-   */
-  void reserve(std::size_t n) &;
-
-  // C++20: constexpr.
-  /// Get the number of parameters currently in this `params`.
-  [[nodiscard]] auto size() const noexcept { return m_params.size(); }
-
-  // C++20: Use the vector's ssize() directly and go noexcept+constexpr.
-  /// Get the number of parameters (signed).
-  /** Unlike `size()`, this is not yet `noexcept`.  That's because C++17's
-   * `std::vector` does not have a `ssize()` member function.  These member
-   * functions are `noexcept`, but `std::size()` and `std::ssize()` are
-   * not.
-   */
-  [[nodiscard]] auto ssize() const { return pqxx::internal::ssize(m_params); }
-
-  /// Append a null value.
-  void append() &;
-
-  /// Append a non-null zview parameter.
-  /** The underlying data must stay valid for as long as the `params`
-   * remains active.
-   */
-  void append(zview) &;
-
-  /// Append a non-null string parameter.
-  /** Copies the underlying data into internal storage.  For best efficiency,
-   * use the @ref zview variant if you can, or `std::move()`
-   */
-  void append(std::string const &) &;
-
-  /// Append a non-null string parameter.
-  void append(std::string &&) &;
-
-  /// Append a non-null binary parameter.
-  /** The underlying data must stay valid for as long as the `params`
-   * remains active.
-   */
-  void append(std::basic_string_view<std::byte>) &;
-
-  /// Append a non-null binary parameter.
-  /** Copies the underlying data into internal storage.  For best efficiency,
-   * use the `std::basic_string_view<std::byte>` variant if you can, or
-   * `std::move()`.
-   */
-  void append(std::basic_string<std::byte> const &) &;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Append a non-null binary parameter.
-  /** The `data` object must stay in place and unchanged, for as long as the
-   * `params` remains active.
-   */
-  template<binary DATA> void append(DATA const &data) &
-  {
-    append(
-      std::basic_string_view<std::byte>{std::data(data), std::size(data)});
-  }
-#endif // PQXX_HAVE_CONCEPTS
-
-  /// Append a non-null binary parameter.
-  void append(std::basic_string<std::byte> &&) &;
-
-  /// @deprecated Append binarystring parameter.
-  /** The binarystring must stay valid for as long as the `params` remains
-   * active.
-   */
-  void append(binarystring const &value) &;
-
-  /// Append all parameters from value.
-  template<typename IT, typename ACCESSOR>
-  void append(pqxx::internal::dynamic_params<IT, ACCESSOR> const &value) &
-  {
-    for (auto &param : value) append(value.access(param));
-  }
-
-  void append(params const &value) &;
-
-  void append(params &&value) &;
-
-  /// Append a non-null parameter, converting it to its string
-  /// representation.
-  template<typename TYPE> void append(TYPE const &value) &
-  {
-    // TODO: Pool storage for multiple string conversions in one buffer?
-    if constexpr (nullness<strip_t<TYPE>>::always_null)
-    {
-      ignore_unused(value);
-      m_params.emplace_back();
-    }
-    else if (is_null(value))
-    {
-      m_params.emplace_back();
-    }
-    else
-    {
-      m_params.emplace_back(entry{to_string(value)});
-    }
-  }
-
-  /// Append all elements of `range` as parameters.
-  template<PQXX_RANGE_ARG RANGE> void append_multi(RANGE const &range) &
-  {
-#if defined(PQXX_HAVE_CONCEPTS)
-    if constexpr (std::ranges::sized_range<RANGE>)
-      reserve(std::size(*this) + std::size(range));
-#endif
-    for (auto &value : range) append(value);
-  }
-
-  /// For internal use: Generate a `params` object for use in calls.
-  /** The params object encapsulates the pointers which we will need to pass
-   * to libpq when calling a parameterised or prepared statement.
-   *
-   * The pointers in the params will refer to storage owned by either the
-   * params object, or the caller.  This is not a problem because a
-   * `c_params` object is guaranteed to live only while the call is going on.
-   * As soon as we climb back out of that call tree, we're done with that
-   * data.
-   */
-  pqxx::internal::c_params make_c_params() const;
-
-private:
-  /// Recursively append a pack of params.
-  template<typename Arg, typename... More>
-  void append_pack(Arg &&arg, More &&...args)
-  {
-    this->append(std::forward<Arg>(arg));
-    // Recurse for remaining args.
-    append_pack(std::forward<More>(args)...);
-  }
-
-  /// Terminating case: append an empty parameter pack.  It's not hard BTW.
-  constexpr void append_pack() noexcept {}
-
-  // The way we store a parameter depends on whether it's binary or text
-  // (most types are text), and whether we're responsible for storing the
-  // contents.
-  using entry = std::variant<
-    std::nullptr_t, zview, std::string, std::basic_string_view<std::byte>,
-    std::basic_string<std::byte>>;
-  std::vector<entry> m_params;
-
-  static constexpr std::string_view s_overflow{
-    "Statement parameter length overflow."sv};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pipeline b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pipeline
deleted file mode 100644
index bf828843a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pipeline
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::pipeline class.
- *
- * Throughput-optimized query interface.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/pipeline.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pipeline.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pipeline.hxx
deleted file mode 100644
index 049dcdd58..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pipeline.hxx
+++ /dev/null
@@ -1,237 +0,0 @@
-/* Definition of the pqxx::pipeline class.
- *
- *   Throughput-optimized mechanism for executing queries.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/pipeline instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_PIPELINE
-#define PQXX_H_PIPELINE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <limits>
-#include <map>
-#include <string>
-
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-// TODO: libpq 14 introduced a similar "pipeline mode."  Can we use that?
-
-/// Processes several queries in FIFO manner, optimized for high throughput.
-/** Use a pipeline if you want to keep doing useful work while your queries are
- * executing.  Result retrieval is decoupled from execution request; queries
- * "go in at the front" and results "come out the back."
- *
- * Actually, you can retrieve the results in any order if you want, but it may
- * lead to surprising "time travel" effects if any of the queries fails.  In
- * particular, syntax errors in the queries can confuse things and show up too
- * early in the stream of results.
- *
- * Generally, if any of the queries fails, it will throw an exception at the
- * point where you request its result.  But it may happen earlier, especially
- * if you request results out of chronological order.
- *
- * @warning While a pipeline is active, you cannot execute queries, open
- * streams, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT pipeline : public transaction_focus
-{
-public:
-  /// Identifying numbers for queries.
-  using query_id = long;
-
-  pipeline(pipeline const &) = delete;
-  pipeline &operator=(pipeline const &) = delete;
-
-  /// Start a pipeline.
-  explicit pipeline(transaction_base &t) : transaction_focus{t, s_classname}
-  {
-    init();
-  }
-  /// Start a pipeline.  Assign it a name, for more helpful error messages.
-  pipeline(transaction_base &t, std::string_view tname) :
-          transaction_focus{t, s_classname, tname}
-  {
-    init();
-  }
-
-  /// Close the pipeline.
-  ~pipeline() noexcept;
-
-  /// Add query to the pipeline.
-  /** Queries accumulate in the pipeline, which sends them to the backend in a
-   * batch separated by semicolons.  The queries you insert must not use this
-   * trick themselves, or the pipeline will get hopelessly confused!
-   *
-   * @return Identifier for this query, unique only within this pipeline.
-   */
-  query_id insert(std::string_view) &;
-
-  /// Wait for all ongoing or pending operations to complete, and detach.
-  /** Detaches from the transaction when done.
-   *
-   * This does not produce the queries' results, so it may not report any
-   * errors which may have occurred in their execution.  To be sure that your
-   * statements succeeded, call @ref retrieve until the pipeline is empty.
-   */
-  void complete();
-
-  /// Forget all ongoing or pending operations and retrieved results.
-  /** Queries already sent to the backend may still be completed, depending
-   * on implementation and timing.
-   *
-   * Any error state (unless caused by an internal error) will also be cleared.
-   * This is mostly useful in a nontransaction, since a backend transaction is
-   * aborted automatically when an error occurs.
-   *
-   * Detaches from the transaction when done.
-   */
-  void flush();
-
-  /// Cancel ongoing query, if any.
-  /** May cancel any or all of the queries that have been inserted at this
-   * point whose results have not yet been retrieved.  If the pipeline lives in
-   * a backend transaction, that transaction may be left in a nonfunctional
-   * state in which it can only be aborted.
-   *
-   * Therefore, either use this function in a nontransaction, or abort the
-   * transaction after calling it.
-   */
-  void cancel();
-
-  /// Is result for given query available?
-  [[nodiscard]] bool is_finished(query_id) const;
-
-  /// Retrieve result for given query.
-  /** If the query failed for whatever reason, this will throw an exception.
-   * The function will block if the query has not finished yet.
-   * @warning If results are retrieved out-of-order, i.e. in a different order
-   * than the one in which their queries were inserted, errors may "propagate"
-   * to subsequent queries.
-   */
-  result retrieve(query_id qid)
-  {
-    return retrieve(m_queries.find(qid)).second;
-  }
-
-  /// Retrieve oldest unretrieved result (possibly wait for one).
-  /** @return The query's identifier and its result set. */
-  std::pair<query_id, result> retrieve();
-
-  [[nodiscard]] bool empty() const noexcept { return std::empty(m_queries); }
-
-  /// Set maximum number of queries to retain before issuing them to the
-  /// backend.
-  /** The pipeline will perform better if multiple queries are issued at once,
-   * but retaining queries until the results are needed (as opposed to issuing
-   * them to the backend immediately) may negate any performance benefits the
-   * pipeline can offer.
-   *
-   * Recommended practice is to set this value no higher than the number of
-   * queries you intend to insert at a time.
-   * @param retain_max A nonnegative "retention capacity;" passing zero will
-   * cause queries to be issued immediately
-   * @return Old retention capacity
-   */
-  int retain(int retain_max = 2) &;
-
-
-  /// Resume retained query emission.  Harmless when not needed.
-  void resume() &;
-
-private:
-  struct PQXX_PRIVATE Query
-  {
-    explicit Query(std::string_view q) :
-            query{std::make_shared<std::string>(q)}
-    {}
-
-    std::shared_ptr<std::string> query;
-    result res;
-  };
-
-  using QueryMap = std::map<query_id, Query>;
-
-  void init();
-  void attach();
-  void detach();
-
-  /// Upper bound to query id's.
-  static constexpr query_id qid_limit() noexcept
-  {
-    // Parenthesise this to work around an eternal Visual C++ problem:
-    // Without the extra parentheses, unless NOMINMAX is defined, the
-    // preprocessor will mistake this "max" for its annoying built-in macro
-    // of the same name.
-    return (std::numeric_limits<query_id>::max)();
-  }
-
-  /// Create new query_id.
-  PQXX_PRIVATE query_id generate_id();
-
-  bool have_pending() const noexcept
-  {
-    return m_issuedrange.second != m_issuedrange.first;
-  }
-
-  PQXX_PRIVATE void issue();
-
-  /// The given query failed; never issue anything beyond that.
-  void set_error_at(query_id qid) noexcept
-  {
-    PQXX_UNLIKELY
-    if (qid < m_error)
-      m_error = qid;
-  }
-
-  /// Throw pqxx::internal_error.
-  [[noreturn]] PQXX_PRIVATE void internal_error(std::string const &err);
-
-  PQXX_PRIVATE bool obtain_result(bool expect_none = false);
-
-  PQXX_PRIVATE void obtain_dummy();
-  PQXX_PRIVATE void get_further_available_results();
-  PQXX_PRIVATE void check_end_results();
-
-  /// Receive any results that happen to be available; it's not urgent.
-  PQXX_PRIVATE void receive_if_available();
-
-  /// Receive results, up to stop if possible.
-  PQXX_PRIVATE void receive(pipeline::QueryMap::const_iterator stop);
-  std::pair<pipeline::query_id, result> retrieve(pipeline::QueryMap::iterator);
-
-  QueryMap m_queries;
-  std::pair<QueryMap::iterator, QueryMap::iterator> m_issuedrange;
-  int m_retain = 0;
-  int m_num_waiting = 0;
-  query_id m_q_id = 0;
-
-  /// Is there a "dummy query" pending?
-  bool m_dummy_pending = false;
-
-  /// Point at which an error occurred; no results beyond it will be available
-  query_id m_error = qid_limit();
-
-  /// Encoding.
-  /** We store this in the object to avoid the risk of exceptions at awkward
-   * moments.
-   */
-  internal::encoding_group m_encoding;
-
-  static constexpr std::string_view s_classname{"pipeline"};
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pqxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pqxx
deleted file mode 100644
index 17a8eaa9c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/pqxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/// Convenience header: include all libpqxx definitions.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/array.hxx"
-#include "pqxx/binarystring.hxx"
-#include "pqxx/blob.hxx"
-#include "pqxx/connection.hxx"
-#include "pqxx/cursor.hxx"
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/largeobject.hxx"
-#include "pqxx/nontransaction.hxx"
-#include "pqxx/notification.hxx"
-#include "pqxx/params.hxx"
-#include "pqxx/pipeline.hxx"
-#include "pqxx/prepared_statement.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/internal/result_iterator.hxx"
-#include "pqxx/internal/result_iter.hxx"
-#include "pqxx/robusttransaction.hxx"
-#include "pqxx/row.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/stream_to.hxx"
-#include "pqxx/subtransaction.hxx"
-#include "pqxx/transaction.hxx"
-#include "pqxx/transactor.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/prepared_statement b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/prepared_statement
deleted file mode 100644
index 674be7090..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/prepared_statement
+++ /dev/null
@@ -1,3 +0,0 @@
-/// @deprecated Include @c <pqxx/params> instead.
-
-#include "params.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/prepared_statement.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/prepared_statement.hxx
deleted file mode 100644
index 674be7090..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/prepared_statement.hxx
+++ /dev/null
@@ -1,3 +0,0 @@
-/// @deprecated Include @c <pqxx/params> instead.
-
-#include "params.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/range b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/range
deleted file mode 100644
index 11985eca4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/range
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Client-side support for SQL range types.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/range.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/range.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/range.hxx
deleted file mode 100644
index dc480e4b7..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/range.hxx
+++ /dev/null
@@ -1,515 +0,0 @@
-#ifndef PQXX_H_RANGE
-#define PQXX_H_RANGE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <variant>
-
-#include "pqxx/internal/array-composite.hxx"
-#include "pqxx/internal/concat.hxx"
-
-namespace pqxx
-{
-/// An _unlimited_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should extend
- * to infinity on that side.
- *
- * An unlimited boundary is always inclusive of "infinity" values, if the
- * range's value type supports them.
- */
-struct no_bound
-{
-  template<typename TYPE> constexpr bool extends_down_to(TYPE const &) const
-  {
-    return true;
-  }
-  template<typename TYPE> constexpr bool extends_up_to(TYPE const &) const
-  {
-    return true;
-  }
-};
-
-
-/// An _inclusive_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should include
- * the value.
- */
-template<typename TYPE> class inclusive_bound
-{
-public:
-  inclusive_bound() = delete;
-  explicit inclusive_bound(TYPE const &value) : m_value{value}
-  {
-    if (is_null(value))
-      throw argument_error{"Got null value as an inclusive range bound."};
-  }
-
-  [[nodiscard]] constexpr TYPE const &get() const &noexcept { return m_value; }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as a lower bound, include value?
-  [[nodiscard]] bool extends_down_to(TYPE const &value) const
-  {
-    return not(value < m_value);
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as an upper bound, include value?
-  [[nodiscard]] bool extends_up_to(TYPE const &value) const
-  {
-    return not(m_value < value);
-  }
-
-private:
-  TYPE m_value;
-};
-
-
-/// An _exclusive_ boundary value to a @ref pqxx::range.
-/** Use this as a lower or upper bound for a range if the range should _not_
- * include the value.
- */
-template<typename TYPE> class exclusive_bound
-{
-public:
-  exclusive_bound() = delete;
-  explicit exclusive_bound(TYPE const &value) : m_value{value}
-  {
-    if (is_null(value))
-      throw argument_error{"Got null value as an exclusive range bound."};
-  }
-
-  [[nodiscard]] constexpr TYPE const &get() const &noexcept { return m_value; }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as a lower bound, include value?
-  [[nodiscard]] bool extends_down_to(TYPE const &value) const
-  {
-    return m_value < value;
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Would this bound, as an upper bound, include value?
-  [[nodiscard]] bool extends_up_to(TYPE const &value) const
-  {
-    return value < m_value;
-  }
-
-private:
-  TYPE m_value;
-};
-
-
-/// A range boundary value.
-/** A range bound is either no bound at all; or an inclusive bound; or an
- * exclusive bound.  Pass one of the three to the constructor.
- */
-template<typename TYPE> class range_bound
-{
-public:
-  range_bound() = delete;
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(no_bound) : m_bound{} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(inclusive_bound<TYPE> const &bound) : m_bound{bound} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(exclusive_bound<TYPE> const &bound) : m_bound{bound} {}
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(range_bound const &) = default;
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  range_bound(range_bound &&) = default;
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  bool operator==(range_bound const &rhs) const
-  {
-    if (this->is_limited())
-      return (
-        rhs.is_limited() and (this->is_inclusive() == rhs.is_inclusive()) and
-        (*this->value() == *rhs.value()));
-    else
-      return not rhs.is_limited();
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  bool operator!=(range_bound const &rhs) const { return not(*this == rhs); }
-  range_bound &operator=(range_bound const &) = default;
-  range_bound &operator=(range_bound &&) = default;
-
-  /// Is this a finite bound?
-  constexpr bool is_limited() const noexcept
-  {
-    return not std::holds_alternative<no_bound>(m_bound);
-  }
-
-  /// Is this boundary an inclusive one?
-  constexpr bool is_inclusive() const noexcept
-  {
-    return std::holds_alternative<inclusive_bound<TYPE>>(m_bound);
-  }
-
-  /// Is this boundary an exclusive one?
-  constexpr bool is_exclusive() const noexcept
-  {
-    return std::holds_alternative<exclusive_bound<TYPE>>(m_bound);
-  }
-
-  // TODO: constexpr/noexcept if underlying function supports it.
-  /// Would this bound, as a lower bound, include `value`?
-  bool extends_down_to(TYPE const &value) const
-  {
-    return std::visit(
-      [&value](auto const &bound) { return bound.extends_down_to(value); },
-      m_bound);
-  }
-
-  // TODO: constexpr/noexcept if underlying function supports it.
-  /// Would this bound, as an upper bound, include `value`?
-  bool extends_up_to(TYPE const &value) const
-  {
-    return std::visit(
-      [&value](auto const &bound) { return bound.extends_up_to(value); },
-      m_bound);
-  }
-
-  /// Return bound value, or `nullptr` if it's not limited.
-  [[nodiscard]] constexpr TYPE const *value() const &noexcept
-  {
-    return std::visit(
-      [](auto const &bound) noexcept {
-        using bound_t = std::decay_t<decltype(bound)>;
-        if constexpr (std::is_same_v<bound_t, no_bound>)
-          return static_cast<TYPE const *>(nullptr);
-        else
-          return &bound.get();
-      },
-      m_bound);
-  }
-
-private:
-  std::variant<no_bound, inclusive_bound<TYPE>, exclusive_bound<TYPE>> m_bound;
-};
-
-
-// C++20: Concepts for comparisons, construction, etc.
-/// A C++ equivalent to PostgreSQL's range types.
-/** You can use this as a client-side representation of a "range" in SQL.
- *
- * PostgreSQL defines several range types, differing in the data type over
- * which they range.  You can also define your own range types.
- *
- * Usually you'll want the server to deal with ranges.  But on occasions where
- * you need to work with them client-side, you may want to use @ref
- * pqxx::range. (In cases where all you do is pass them along to the server
- * though, it's not worth the complexity.  In that case you might as well treat
- * ranges as just strings.)
- *
- * For documentation on PostgreSQL's range types, see:
- * https://www.postgresql.org/docs/current/rangetypes.html
- *
- * The value type must be copyable and default-constructible, and support the
- * less-than (`<`) and equals (`==`) comparisons.  Value initialisation must
- * produce a consistent value.
- */
-template<typename TYPE> class range
-{
-public:
-  /// Create a range.
-  /** For each of the two bounds, pass a @ref no_bound, @ref inclusive_bound,
-   * or
-   * @ref exclusive_bound.
-   */
-  range(range_bound<TYPE> lower, range_bound<TYPE> upper) :
-          m_lower{lower}, m_upper{upper}
-  {
-    if (
-      lower.is_limited() and upper.is_limited() and
-      (*upper.value() < *lower.value()))
-      throw range_error{internal::concat(
-        "Range's lower bound (", *lower.value(),
-        ") is greater than its upper bound (", *upper.value(), ").")};
-  }
-
-  // TODO: constexpr and/or noexcept if underlying constructor supports it.
-  /// Create an empty range.
-  /** SQL has a separate literal to denote an empty range, but any range which
-   * encompasses no values is an empty range.
-   */
-  range() :
-          m_lower{exclusive_bound<TYPE>{TYPE{}}},
-          m_upper{exclusive_bound<TYPE>{TYPE{}}}
-  {}
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  bool operator==(range const &rhs) const
-  {
-    return (this->lower_bound() == rhs.lower_bound() and
-            this->upper_bound() == rhs.upper_bound()) or
-           (this->empty() and rhs.empty());
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  bool operator!=(range const &rhs) const { return !(*this == rhs); }
-
-  range(range const &) = default;
-  range(range &&) = default;
-  range &operator=(range const &) = default;
-  range &operator=(range &&) = default;
-
-  // TODO: constexpr and/or noexcept if underlying operator supports it.
-  /// Is this range clearly empty?
-  /** An empty range encompasses no values.
-   *
-   * It is possible to "fool" this.  For example, if your range is of an
-   * integer type and has exclusive bounds of 0 and 1, it encompasses no values
-   * but its `empty()` will return false.  The PostgreSQL implementation, by
-   * contrast, will notice that it is empty.  Similar things can happen for
-   * floating-point types, but with more subtleties and edge cases.
-   */
-  bool empty() const
-  {
-    return (m_lower.is_exclusive() or m_upper.is_exclusive()) and
-           m_lower.is_limited() and m_upper.is_limited() and
-           not(*m_lower.value() < *m_upper.value());
-  }
-
-  // TODO: constexpr and/or noexcept if underlying functions support it.
-  /// Does this range encompass `value`?
-  bool contains(TYPE value) const
-  {
-    return m_lower.extends_down_to(value) and m_upper.extends_up_to(value);
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  /// Does this range encompass all of `other`?
-  /** This function is not particularly smart.  It does not know, for example,
-   * that integer ranges `[0,9]` and `[0,10)` contain the same values.
-   */
-  bool contains(range<TYPE> const &other) const
-  {
-    return (*this & other) == other;
-  }
-
-  [[nodiscard]] constexpr range_bound<TYPE> const &
-  lower_bound() const &noexcept
-  {
-    return m_lower;
-  }
-  [[nodiscard]] constexpr range_bound<TYPE> const &
-  upper_bound() const &noexcept
-  {
-    return m_upper;
-  }
-
-  // TODO: constexpr and/or noexcept if underlying operators support it.
-  /// Intersection of two ranges.
-  /** Returns a range describing those values which are in both ranges.
-   */
-  range operator&(range const &other) const
-  {
-    range_bound<TYPE> lower{no_bound{}};
-    if (not this->lower_bound().is_limited())
-      lower = other.lower_bound();
-    else if (not other.lower_bound().is_limited())
-      lower = this->lower_bound();
-    else if (*this->lower_bound().value() < *other.lower_bound().value())
-      lower = other.lower_bound();
-    else if (*other.lower_bound().value() < *this->lower_bound().value())
-      lower = this->lower_bound();
-    else if (this->lower_bound().is_exclusive())
-      lower = this->lower_bound();
-    else
-      lower = other.lower_bound();
-
-    range_bound<TYPE> upper{no_bound{}};
-    if (not this->upper_bound().is_limited())
-      upper = other.upper_bound();
-    else if (not other.upper_bound().is_limited())
-      upper = this->upper_bound();
-    else if (*other.upper_bound().value() < *this->upper_bound().value())
-      upper = other.upper_bound();
-    else if (*this->upper_bound().value() < *other.upper_bound().value())
-      upper = this->upper_bound();
-    else if (this->upper_bound().is_exclusive())
-      upper = this->upper_bound();
-    else
-      upper = other.upper_bound();
-
-    if (
-      lower.is_limited() and upper.is_limited() and
-      (*upper.value() < *lower.value()))
-      return {};
-    else
-      return {lower, upper};
-  }
-
-  /// Convert to another base type.
-  template<typename DEST> operator range<DEST>() const
-  {
-    range_bound<DEST> lower{no_bound{}}, upper{no_bound{}};
-    if (lower_bound().is_inclusive())
-      lower = inclusive_bound<DEST>{*lower_bound().value()};
-    else if (lower_bound().is_exclusive())
-      lower = exclusive_bound<DEST>{*lower_bound().value()};
-
-    if (upper_bound().is_inclusive())
-      upper = inclusive_bound<DEST>{*upper_bound().value()};
-    else if (upper_bound().is_exclusive())
-      upper = exclusive_bound<DEST>{*upper_bound().value()};
-
-    return {lower, upper};
-  }
-
-private:
-  range_bound<TYPE> m_lower, m_upper;
-};
-
-
-/// String conversions for a @ref range type.
-/** Conversion assumes that either your client encoding is UTF-8, or the values
- * are pure ASCII.
- */
-template<typename TYPE> struct string_traits<range<TYPE>>
-{
-  [[nodiscard]] static inline zview
-  to_buf(char *begin, char *end, range<TYPE> const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static inline char *
-  into_buf(char *begin, char *end, range<TYPE> const &value)
-  {
-    if (value.empty())
-    {
-      if ((end - begin) <= internal::ssize(s_empty))
-        throw conversion_overrun{s_overrun.c_str()};
-      char *here = begin + s_empty.copy(begin, std::size(s_empty));
-      *here++ = '\0';
-      return here;
-    }
-    else
-    {
-      if (end - begin < 4)
-        throw conversion_overrun{s_overrun.c_str()};
-      char *here = begin;
-      *here++ =
-        (static_cast<char>(value.lower_bound().is_inclusive() ? '[' : '('));
-      TYPE const *lower{value.lower_bound().value()};
-      // Convert bound (but go back to overwrite that trailing zero).
-      if (lower != nullptr)
-        here = string_traits<TYPE>::into_buf(here, end, *lower) - 1;
-      *here++ = ',';
-      TYPE const *upper{value.upper_bound().value()};
-      // Convert bound (but go back to overwrite that trailing zero).
-      if (upper != nullptr)
-        here = string_traits<TYPE>::into_buf(here, end, *upper) - 1;
-      if ((end - here) < 2)
-        throw conversion_overrun{s_overrun.c_str()};
-      *here++ =
-        static_cast<char>(value.upper_bound().is_inclusive() ? ']' : ')');
-      *here++ = '\0';
-      return here;
-    }
-  }
-
-  [[nodiscard]] static inline range<TYPE> from_string(std::string_view text)
-  {
-    if (std::size(text) < 3)
-      throw pqxx::conversion_error{err_bad_input(text)};
-    bool left_inc{false};
-    switch (text[0])
-    {
-    case '[': left_inc = true; break;
-
-    case '(': break;
-
-    case 'e':
-    case 'E':
-      if (
-        (std::size(text) != std::size(s_empty)) or
-        (text[1] != 'm' and text[1] != 'M') or
-        (text[2] != 'p' and text[2] != 'P') or
-        (text[3] != 't' and text[3] != 'T') or
-        (text[4] != 'y' and text[4] != 'Y'))
-        throw pqxx::conversion_error{err_bad_input(text)};
-      return {};
-      break;
-
-    default: throw pqxx::conversion_error{err_bad_input(text)};
-    }
-
-    auto scan{internal::get_glyph_scanner(internal::encoding_group::UTF8)};
-    // The field parser uses this to track which field it's parsing, and
-    // when not to expect a field separator.
-    std::size_t index{0};
-    // The last field we expect to see.
-    static constexpr std::size_t last{1};
-    // Current parsing position.  We skip the opening parenthesis or bracket.
-    std::size_t pos{1};
-    // The string may leave out either bound to indicate that it's unlimited.
-    std::optional<TYPE> lower, upper;
-    // We reuse the same field parser we use for composite values and arrays.
-    internal::parse_composite_field(index, text, pos, lower, scan, last);
-    internal::parse_composite_field(index, text, pos, upper, scan, last);
-
-    // We need one more character: the closing parenthesis or bracket.
-    if (pos != std::size(text))
-      throw pqxx::conversion_error{err_bad_input(text)};
-    char const closing{text[pos - 1]};
-    if (closing != ')' and closing != ']')
-      throw pqxx::conversion_error{err_bad_input(text)};
-    bool const right_inc{closing == ']'};
-
-    range_bound<TYPE> lower_bound{no_bound{}}, upper_bound{no_bound{}};
-    if (lower)
-    {
-      if (left_inc)
-        lower_bound = inclusive_bound{*lower};
-      else
-        lower_bound = exclusive_bound{*lower};
-    }
-    if (upper)
-    {
-      if (right_inc)
-        upper_bound = inclusive_bound{*upper};
-      else
-        upper_bound = exclusive_bound{*upper};
-    }
-
-    return {lower_bound, upper_bound};
-  }
-
-  [[nodiscard]] static inline constexpr std::size_t
-  size_buffer(range<TYPE> const &value) noexcept
-  {
-    TYPE const *lower{value.lower_bound().value()},
-      *upper{value.upper_bound().value()};
-    std::size_t const lsz{
-      lower == nullptr ? 0 : string_traits<TYPE>::size_buffer(*lower) - 1},
-      usz{upper == nullptr ? 0 : string_traits<TYPE>::size_buffer(*upper) - 1};
-
-    if (value.empty())
-      return std::size(s_empty) + 1;
-    else
-      return 1 + lsz + 1 + usz + 2;
-  }
-
-private:
-  static constexpr zview s_empty{"empty"_zv};
-  static constexpr auto s_overrun{"Not enough space in buffer for range."_zv};
-
-  /// Compose error message for invalid range input.
-  static std::string err_bad_input(std::string_view text)
-  {
-    return internal::concat("Invalid range input: '", text, "'");
-  }
-};
-
-
-/// A range type does not have an innate null value.
-template<typename TYPE> struct nullness<range<TYPE>> : no_null<range<TYPE>>
-{};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/result b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/result
deleted file mode 100644
index 523394b72..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/result
+++ /dev/null
@@ -1,16 +0,0 @@
-/** pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/result.hxx"
-
-// Now include some types which depend on result, but which the user will
-// expect to see defined after including this header.
-#include "pqxx/internal/result_iterator.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/internal/result_iter.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/result.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/result.hxx
deleted file mode 100644
index 6c41cc096..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/result.hxx
+++ /dev/null
@@ -1,335 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_RESULT
-#define PQXX_H_RESULT
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <functional>
-#include <ios>
-#include <memory>
-#include <stdexcept>
-
-#include "pqxx/except.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-#include "pqxx/internal/encodings.hxx"
-
-
-namespace pqxx::internal
-{
-// TODO: Make noexcept (but breaks ABI).
-PQXX_LIBEXPORT void clear_result(pq::PGresult const *);
-} // namespace pqxx::internal
-
-
-namespace pqxx::internal::gate
-{
-class result_connection;
-class result_creation;
-class result_pipeline;
-class result_row;
-class result_sql_cursor;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-/// Result set containing data returned by a query or command.
-/** This behaves as a container (as defined by the C++ standard library) and
- * provides random access const iterators to iterate over its rows.  You can
- * also access a row by indexing a `result R` by the row's zero-based
- * number:
- *
- *
- *	for (result::size_type i=0; i < std::size(R); ++i) Process(R[i]);
- *
- *
- * Result sets in libpqxx are lightweight, reference-counted wrapper objects
- * which are relatively small and cheap to copy.  Think of a result object as
- * a "smart pointer" to an underlying result set.
- *
- * @warning The result set that a result object points to is not thread-safe.
- * If you copy a result object, it still refers to the same underlying result
- * set.  So never copy, destroy, query, or otherwise access a result while
- * another thread may be copying, destroying, querying, or otherwise accessing
- * the same result set--even if it is doing so through a different result
- * object!
- */
-class PQXX_LIBEXPORT result
-{
-public:
-  using size_type = result_size_type;
-  using difference_type = result_difference_type;
-  using reference = row;
-  using const_iterator = const_result_iterator;
-  using pointer = const_iterator;
-  using iterator = const_iterator;
-  using const_reverse_iterator = const_reverse_result_iterator;
-  using reverse_iterator = const_reverse_iterator;
-
-  result() noexcept :
-          m_data{make_data_pointer()},
-          m_query{},
-          m_encoding{internal::encoding_group::MONOBYTE}
-  {}
-
-  result(result const &rhs) noexcept = default;
-  result(result &&rhs) noexcept = default;
-
-  /// Assign one result to another.
-  /** Copying results is cheap: it copies only smart pointers, but the actual
-   * data stays in the same place.
-   */
-  result &operator=(result const &rhs) noexcept = default;
-
-  /// Assign one result to another, invaliding the old one.
-  result &operator=(result &&rhs) noexcept = default;
-
-  /**
-   * @name Comparisons
-   *
-   * You can compare results for equality.  Beware: this is a very strict,
-   * dumb comparison.  The smallest difference between two results (such as a
-   * string "Foo" versus a string "foo") will make them unequal.
-   */
-  //@{
-  /// Compare two results for equality.
-  [[nodiscard]] bool operator==(result const &) const noexcept;
-  /// Compare two results for inequality.
-  [[nodiscard]] bool operator!=(result const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  /// Iterate rows, reading them directly into a tuple of "TYPE...".
-  /** Converts the fields to values of the given respective types.
-   *
-   * Use this only with a ranged "for" loop.  The iteration produces
-   * std::tuple<TYPE...> which you can "unpack" to a series of `auto`
-   * variables.
-   */
-  template<typename... TYPE> auto iter() const;
-
-  [[nodiscard]] const_reverse_iterator rbegin() const;
-  [[nodiscard]] const_reverse_iterator crbegin() const;
-  [[nodiscard]] const_reverse_iterator rend() const;
-  [[nodiscard]] const_reverse_iterator crend() const;
-
-  [[nodiscard]] const_iterator begin() const noexcept;
-  [[nodiscard]] const_iterator cbegin() const noexcept;
-  [[nodiscard]] inline const_iterator end() const noexcept;
-  [[nodiscard]] inline const_iterator cend() const noexcept;
-
-  [[nodiscard]] reference front() const noexcept;
-  [[nodiscard]] reference back() const noexcept;
-
-  [[nodiscard]] PQXX_PURE size_type size() const noexcept;
-  [[nodiscard]] PQXX_PURE bool empty() const noexcept;
-  [[nodiscard]] size_type capacity() const noexcept { return size(); }
-
-  /// Exchange two `result` values in an exception-safe manner.
-  /** If the swap fails, the two values will be exactly as they were before.
-   *
-   * The swap is not necessarily thread-safe.
-   */
-  void swap(result &) noexcept;
-
-  /// Index a row by number.
-  /** This returns a @ref row object.  Generally you should not keep the row
-   * around as a variable, but if you do, make sure that your variable is a
-   * `row`, not a `row&`.
-   */
-  [[nodiscard]] row operator[](size_type i) const noexcept;
-
-#if defined(PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT)
-  // TODO: If C++23 will let us, also accept string for the column.
-  [[nodiscard]] field
-  operator[](size_type row_num, row_size_type col_num) const noexcept;
-#endif
-
-  /// Index a row by number, but check that the row number is valid.
-  row at(size_type) const;
-
-  /// Index a field by row number and column number.
-  field at(size_type, row_size_type) const;
-
-  /// Let go of the result's data.
-  /** Use this if you need to deallocate the result data earlier than you can
-   * destroy the `result` object itself.
-   *
-   * Multiple `result` objects can refer to the same set of underlying data.
-   * The underlying data will be deallocated once all `result` objects that
-   * refer to it are cleared or destroyed.
-   */
-  void clear() noexcept
-  {
-    m_data.reset();
-    m_query = nullptr;
-  }
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Number of columns in result.
-  [[nodiscard]] PQXX_PURE row_size_type columns() const noexcept;
-
-  /// Number of given column (throws exception if it doesn't exist).
-  [[nodiscard]] row_size_type column_number(zview name) const;
-
-  /// Name of column with this number (throws exception if it doesn't exist)
-  [[nodiscard]] char const *column_name(row_size_type number) const &;
-
-  /// Return column's type, as an OID from the system catalogue.
-  [[nodiscard]] oid column_type(row_size_type col_num) const;
-
-  /// Return column's type, as an OID from the system catalogue.
-  [[nodiscard]] oid column_type(zview col_name) const
-  {
-    return column_type(column_number(col_name));
-  }
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(row_size_type col_num) const;
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(zview col_name) const
-  {
-    return column_table(column_number(col_name));
-  }
-
-  /// What column in its table did this column come from?
-  [[nodiscard]] row_size_type table_column(row_size_type col_num) const;
-
-  /// What column in its table did this column come from?
-  [[nodiscard]] row_size_type table_column(zview col_name) const
-  {
-    return table_column(column_number(col_name));
-  }
-  //@}
-
-  /// Query that produced this result, if available (empty string otherwise)
-  [[nodiscard]] PQXX_PURE std::string const &query() const &noexcept;
-
-  /// If command was an `INSERT` of 1 row, return oid of the inserted row.
-  /** @return Identifier of inserted row if exactly one row was inserted, or
-   * @ref oid_none otherwise.
-   */
-  [[nodiscard]] PQXX_PURE oid inserted_oid() const;
-
-  /// If command was `INSERT`, `UPDATE`, or `DELETE`: number of affected rows.
-  /** @return Number of affected rows if last command was `INSERT`, `UPDATE`,
-   * or `DELETE`; zero for all other commands.
-   */
-  [[nodiscard]] PQXX_PURE size_type affected_rows() const;
-
-  // C++20: Concept like std::invocable, but without specifying param types.
-  /// Run `func` on each row, passing the row's fields as parameters.
-  /** Goes through the rows from first to last.  You provide a callable `func`.
-   *
-   * For each row in the `result`, `for_each` will call `func`.  It converts
-   * the row's fields to the types of `func`'s parameters, and pass them to
-   * `func`.
-   *
-   * (Therefore `func` must have a _single_ signature.  It can't be a generic
-   * lambda, or an object of a class with multiple overloaded function call
-   * operators.  Otherwise, `for_each` will have no way to detect a parameter
-   * list without ambiguity.)
-   *
-   * If any of your parameter types is `std::string_view`, it refers to the
-   * underlying storage of this `result`.
-   *
-   * If any of your parameter types is a reference type, its argument will
-   * refer to a temporary value which only lives for the duration of that
-   * single invocation to `func`.  If the reference is an lvalue reference, it
-   * must be `const`.
-   *
-   * For example, this queries employee names and salaries from the database
-   * and prints how much each would like to earn instead:
-   * ```cxx
-   *   tx.exec("SELECT name, salary FROM employee").for_each(
-   *       [](std::string_view name, float salary){
-   *           std::cout << name << " would like " << salary * 2 << ".\n";
-   *       })
-   * ```
-   *
-   * If `func` throws an exception, processing stops at that point and
-   * propagates the exception.
-   *
-   * @throws usage_error if `func`'s number of parameters does not match the
-   * number of columns in this result.
-   */
-  template<typename CALLABLE> inline void for_each(CALLABLE &&func) const;
-
-private:
-  using data_pointer = std::shared_ptr<internal::pq::PGresult const>;
-
-  /// Underlying libpq result set.
-  data_pointer m_data;
-
-  /// Factory for data_pointer.
-  static data_pointer
-  make_data_pointer(internal::pq::PGresult const *res = nullptr) noexcept
-  {
-    return {res, internal::clear_result};
-  }
-
-  friend class pqxx::internal::gate::result_pipeline;
-  PQXX_PURE std::shared_ptr<std::string const> query_ptr() const noexcept
-  {
-    return m_query;
-  }
-
-  /// Query string.
-  std::shared_ptr<std::string const> m_query;
-
-  internal::encoding_group m_encoding;
-
-  static std::string const s_empty_string;
-
-  friend class pqxx::field;
-  // TODO: noexcept.  Breaks ABI.
-  PQXX_PURE char const *get_value(size_type row, row_size_type col) const;
-  // TODO: noexcept.  Breaks ABI.
-  PQXX_PURE bool get_is_null(size_type row, row_size_type col) const;
-  PQXX_PURE
-  field_size_type get_length(size_type, row_size_type) const noexcept;
-
-  friend class pqxx::internal::gate::result_creation;
-  result(
-    internal::pq::PGresult *rhs, std::shared_ptr<std::string> query,
-    internal::encoding_group enc);
-
-  PQXX_PRIVATE void check_status(std::string_view desc = ""sv) const;
-
-  friend class pqxx::internal::gate::result_connection;
-  friend class pqxx::internal::gate::result_row;
-  bool operator!() const noexcept { return m_data.get() == nullptr; }
-  operator bool() const noexcept { return m_data.get() != nullptr; }
-
-  [[noreturn]] PQXX_PRIVATE void
-  throw_sql_error(std::string const &Err, std::string const &Query) const;
-  PQXX_PRIVATE PQXX_PURE int errorposition() const;
-  PQXX_PRIVATE std::string status_error() const;
-
-  friend class pqxx::internal::gate::result_sql_cursor;
-  PQXX_PURE char const *cmd_status() const noexcept;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/robusttransaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/robusttransaction
deleted file mode 100644
index 04b71d7cc..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/robusttransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::robusttransaction class.
- *
- * pqxx::robusttransaction is a slower but safer transaction class.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/robusttransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/robusttransaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/robusttransaction.hxx
deleted file mode 100644
index faf6dbf5e..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/robusttransaction.hxx
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Definition of the pqxx::robusttransaction class.
- *
- * pqxx::robusttransaction is a slower but safer transaction class.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/robusttransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ROBUSTTRANSACTION
-#define PQXX_H_ROBUSTTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx::internal
-{
-/// Helper base class for the @ref robusttransaction class template.
-class PQXX_LIBEXPORT PQXX_NOVTABLE basic_robusttransaction
-        : public dbtransaction
-{
-public:
-  virtual ~basic_robusttransaction() override = 0;
-
-protected:
-  basic_robusttransaction(
-    connection &c, zview begin_command, std::string_view tname);
-  basic_robusttransaction(connection &c, zview begin_command);
-
-private:
-  using IDType = unsigned long;
-
-  std::string m_conn_string;
-  std::string m_xid;
-  int m_backendpid = -1;
-
-  void init(zview begin_command);
-
-  // @warning This function will become `final`.
-  virtual void do_commit() override;
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- *
- * @{
- */
-
-/// Slightly slower, better-fortified version of transaction.
-/** Requires PostgreSQL 10 or better.
- *
- * robusttransaction is similar to transaction, but spends more time and effort
- * to deal with the hopefully rare case that the connection to the backend is
- * lost just while it's trying to commit.  In such cases, the client does not
- * know whether the backend (on the other side of the broken connection)
- * managed to commit the transaction.
- *
- * When this happens, robusttransaction tries to reconnect to the database and
- * figure out what happened.
- *
- * This service level was made optional since you may not want to pay the
- * overhead where it is not necessary.  Certainly the use of this class makes
- * no sense for local connections, or for transactions that read the database
- * but never modify it, or for noncritical database manipulations.
- *
- * Besides being slower, it's also more complex.  Which means that in practice
- * a robusttransaction could actually fail more instead of less often than a
- * normal transaction.  What robusttransaction tries to achieve is to give you
- * certainty, not just be more successful per se.
- */
-template<isolation_level ISOLATION = read_committed>
-class robusttransaction final : public internal::basic_robusttransaction
-{
-public:
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   * @param tname optional human-readable name for this transaction.
-   */
-  robusttransaction(connection &c, std::string_view tname) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>,
-            tname}
-  {}
-
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   * @param tname optional human-readable name for this transaction.
-   */
-  robusttransaction(connection &c, std::string &&tname) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>,
-            std::move(tname)}
-  {}
-
-  /** Create robusttransaction of given name.
-   * @param c Connection inside which this robusttransaction should live.
-   */
-  explicit robusttransaction(connection &c) :
-          internal::basic_robusttransaction{
-            c, pqxx::internal::begin_cmd<ISOLATION, write_policy::read_write>}
-  {}
-
-  virtual ~robusttransaction() noexcept override { close(); }
-};
-
-/**
- * @}
- */
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/row b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/row
deleted file mode 100644
index 62a950ac8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/row
+++ /dev/null
@@ -1,11 +0,0 @@
-/** pqxx::row class.
- *
- * pqxx::row refers to a row in a result.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/row.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/row.hxx
deleted file mode 100644
index 5be5132e3..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/row.hxx
+++ /dev/null
@@ -1,561 +0,0 @@
-/* Definitions for the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/result instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ROW
-#define PQXX_H_ROW
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/result.hxx"
-
-#include "pqxx/internal/concat.hxx"
-
-namespace pqxx::internal
-{
-template<typename... T> class result_iter;
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/// Reference to one row in a result.
-/** A row represents one row (also called a row) in a query result set.
- * It also acts as a container mapping column numbers or names to field
- * values (see below):
- *
- * ```cxx
- *	cout << row["date"].c_str() << ": " << row["name"].c_str() << endl;
- * ```
- *
- * The row itself acts like a (non-modifyable) container, complete with its
- * own const_iterator and const_reverse_iterator.
- */
-class PQXX_LIBEXPORT row
-{
-public:
-  using size_type = row_size_type;
-  using difference_type = row_difference_type;
-  using const_iterator = const_row_iterator;
-  using iterator = const_iterator;
-  using reference = field;
-  using pointer = const_row_iterator;
-  using const_reverse_iterator = const_reverse_row_iterator;
-  using reverse_iterator = const_reverse_iterator;
-
-  row() noexcept = default;
-  row(row &&) noexcept = default;
-  row(row const &) noexcept = default;
-  row &operator=(row const &) noexcept = default;
-  row &operator=(row &&) noexcept = default;
-
-  /**
-   * @name Comparison
-   */
-  //@{
-  [[nodiscard]] PQXX_PURE bool operator==(row const &) const noexcept;
-  [[nodiscard]] bool operator!=(row const &rhs) const noexcept
-  {
-    return not operator==(rhs);
-  }
-  //@}
-
-  [[nodiscard]] const_iterator begin() const noexcept;
-  [[nodiscard]] const_iterator cbegin() const noexcept;
-  [[nodiscard]] const_iterator end() const noexcept;
-  [[nodiscard]] const_iterator cend() const noexcept;
-
-  /**
-   * @name Field access
-   */
-  //@{
-  [[nodiscard]] reference front() const noexcept;
-  [[nodiscard]] reference back() const noexcept;
-
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator rbegin() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator crbegin() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator rend() const;
-  // TODO: noexcept.  Breaks ABI.
-  [[nodiscard]] const_reverse_row_iterator crend() const;
-
-  [[nodiscard]] reference operator[](size_type) const noexcept;
-  /** Address field by name.
-   * @warning This is much slower than indexing by number, or iterating.
-   */
-  [[nodiscard]] reference operator[](zview col_name) const;
-
-  reference at(size_type) const;
-  /** Address field by name.
-   * @warning This is much slower than indexing by number, or iterating.
-   */
-  reference at(zview col_name) const;
-
-  [[nodiscard]] constexpr size_type size() const noexcept
-  {
-    return m_end - m_begin;
-  }
-
-  [[deprecated("Swap iterators, not rows.")]] void swap(row &) noexcept;
-
-  /// Row number, assuming this is a real row and not end()/rend().
-  [[nodiscard]] constexpr result::size_type rownumber() const noexcept
-  {
-    return m_index;
-  }
-
-  /**
-   * @name Column information
-   */
-  //@{
-  /// Number of given column (throws exception if it doesn't exist).
-  [[nodiscard]] size_type column_number(zview col_name) const;
-
-  /// Return a column's type.
-  [[nodiscard]] oid column_type(size_type) const;
-
-  /// Return a column's type.
-  [[nodiscard]] oid column_type(zview col_name) const
-  {
-    return column_type(column_number(col_name));
-  }
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(size_type col_num) const;
-
-  /// What table did this column come from?
-  [[nodiscard]] oid column_table(zview col_name) const
-  {
-    return column_table(column_number(col_name));
-  }
-
-  /// What column number in its table did this result column come from?
-  /** A meaningful answer can be given only if the column in question comes
-   * directly from a column in a table.  If the column is computed in any
-   * other way, a logic_error will be thrown.
-   *
-   * @param col_num a zero-based column number in this result set
-   * @return a zero-based column number in originating table
-   */
-  [[nodiscard]] size_type table_column(size_type) const;
-
-  /// What column number in its table did this result column come from?
-  [[nodiscard]] size_type table_column(zview col_name) const
-  {
-    return table_column(column_number(col_name));
-  }
-  //@}
-
-  [[nodiscard]] constexpr result::size_type num() const noexcept
-  {
-    return rownumber();
-  }
-
-  /** Produce a slice of this row, containing the given range of columns.
-   *
-   * @deprecated I haven't heard of anyone caring about row slicing at all in
-   * at least the last 15 years.  Yet it adds complexity, so unless anyone
-   * files a bug explaining why they really need this feature, I'm going to
-   * remove it.  Even if they do, the feature may need an update.
-   *
-   * The slice runs from the range's starting column to the range's end
-   * column, exclusive.  It looks just like a normal result row, except
-   * slices can be empty.
-   */
-  [[deprecated("Row slicing is going away.  File a bug if you need it.")]] row
-  slice(size_type sbegin, size_type send) const;
-
-  /// Is this a row without fields?  Can only happen to a slice.
-  [[nodiscard, deprecated("Row slicing is going away.")]] PQXX_PURE bool
-  empty() const noexcept;
-
-  /// Extract entire row's values into a tuple.
-  /** Converts to the types of the tuple's respective fields.
-   */
-  template<typename Tuple> void to(Tuple &t) const
-  {
-    check_size(std::tuple_size_v<Tuple>);
-    convert(t);
-  }
-
-  template<typename... TYPE> std::tuple<TYPE...> as() const
-  {
-    check_size(sizeof...(TYPE));
-    using seq = std::make_index_sequence<sizeof...(TYPE)>;
-    return get_tuple<std::tuple<TYPE...>>(seq{});
-  }
-
-protected:
-  friend class const_row_iterator;
-  friend class result;
-  row(result const &r, result_size_type index, size_type cols) noexcept;
-
-  /// Throw @ref usage_error if row size is not `expected`.
-  void check_size(size_type expected) const
-  {
-    if (size() != expected)
-      throw usage_error{internal::concat(
-        "Tried to extract ", expected, " field(s) from a row of ", size(),
-        ".")};
-  }
-
-  /// Convert to a given tuple of values, don't check sizes.
-  /** We need this for cases where we have a full tuple of field types, but
-   * not a parameter pack.
-   */
-  template<typename TUPLE> TUPLE as_tuple() const
-  {
-    using seq = std::make_index_sequence<std::tuple_size_v<TUPLE>>;
-    return get_tuple<TUPLE>(seq{});
-  }
-
-  template<typename... T> friend class pqxx::internal::result_iter;
-  /// Convert entire row to tuple fields, without checking row size.
-  template<typename Tuple> void convert(Tuple &t) const
-  {
-    extract_fields(t, std::make_index_sequence<std::tuple_size_v<Tuple>>{});
-  }
-
-  friend class field;
-
-  /// Result set of which this is one row.
-  result m_result;
-
-  /// Row number.
-  /**
-   * You'd expect this to be unsigned, but due to the way reverse iterators
-   * are related to regular iterators, it must be allowed to underflow to -1.
-   */
-  result::size_type m_index = 0;
-
-  // TODO: Remove m_begin and (if possible) m_end when we remove slice().
-  /// First column in slice.  This row ignores lower-numbered columns.
-  size_type m_begin = 0;
-  /// End column in slice.  This row only sees lower-numbered columns.
-  size_type m_end = 0;
-
-private:
-  template<typename Tuple, std::size_t... indexes>
-  void extract_fields(Tuple &t, std::index_sequence<indexes...>) const
-  {
-    (extract_value<Tuple, indexes>(t), ...);
-  }
-
-  template<typename Tuple, std::size_t index>
-  void extract_value(Tuple &t) const;
-
-  /// Convert row's values as a new tuple.
-  template<typename TUPLE, std::size_t... indexes>
-  auto get_tuple(std::index_sequence<indexes...>) const
-  {
-    return std::make_tuple(get_field<TUPLE, indexes>()...);
-  }
-
-  /// Extract and convert a field.
-  template<typename TUPLE, std::size_t index> auto get_field() const
-  {
-    return (*this)[index].as<std::tuple_element_t<index, TUPLE>>();
-  }
-};
-
-
-/// Iterator for fields in a row.  Use as row::const_iterator.
-class PQXX_LIBEXPORT const_row_iterator : public field
-{
-public:
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = field const;
-  using pointer = field const *;
-  using size_type = row_size_type;
-  using difference_type = row_difference_type;
-  using reference = field;
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  const_row_iterator() = default;
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  const_row_iterator(row const &t, row_size_type c) noexcept :
-          field{t.m_result, t.m_index, c}
-  {}
-  const_row_iterator(field const &F) noexcept : field{F} {}
-  const_row_iterator(const_row_iterator const &) noexcept = default;
-  const_row_iterator(const_row_iterator &&) noexcept = default;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  [[nodiscard]] constexpr pointer operator->() const noexcept { return this; }
-  [[nodiscard]] reference operator*() const noexcept { return {*this}; }
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_row_iterator &operator=(const_row_iterator const &) noexcept = default;
-  const_row_iterator &operator=(const_row_iterator &&) noexcept = default;
-
-  // TODO: noexcept.  Breaks ABI.
-  const_row_iterator operator++(int);
-  const_row_iterator &operator++() noexcept
-  {
-    ++m_col;
-    return *this;
-  }
-  // TODO: noexcept.  Breaks ABI.
-  const_row_iterator operator--(int);
-  const_row_iterator &operator--() noexcept
-  {
-    --m_col;
-    return *this;
-  }
-
-  const_row_iterator &operator+=(difference_type i) noexcept
-  {
-    m_col = size_type(difference_type(m_col) + i);
-    return *this;
-  }
-  const_row_iterator &operator-=(difference_type i) noexcept
-  {
-    m_col = size_type(difference_type(m_col) - i);
-    return *this;
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] constexpr bool
-  operator==(const_row_iterator const &i) const noexcept
-  {
-    return col() == i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator!=(const_row_iterator const &i) const noexcept
-  {
-    return col() != i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator<(const_row_iterator const &i) const noexcept
-  {
-    return col() < i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator<=(const_row_iterator const &i) const noexcept
-  {
-    return col() <= i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator>(const_row_iterator const &i) const noexcept
-  {
-    return col() > i.col();
-  }
-  [[nodiscard]] constexpr bool
-  operator>=(const_row_iterator const &i) const noexcept
-  {
-    return col() >= i.col();
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] inline const_row_iterator
-  operator+(difference_type) const noexcept;
-
-  friend const_row_iterator
-  operator+(difference_type, const_row_iterator const &) noexcept;
-
-  [[nodiscard]] inline const_row_iterator
-  operator-(difference_type) const noexcept;
-  [[nodiscard]] inline difference_type
-  operator-(const_row_iterator const &) const noexcept;
-  //@}
-};
-
-
-/// Reverse iterator for a row.  Use as row::const_reverse_iterator.
-class PQXX_LIBEXPORT const_reverse_row_iterator : private const_row_iterator
-{
-public:
-  using super = const_row_iterator;
-  using iterator_type = const_row_iterator;
-  using iterator_type::difference_type;
-  using iterator_type::iterator_category;
-  using iterator_type::pointer;
-  using value_type = iterator_type::value_type;
-  using reference = iterator_type::reference;
-
-  const_reverse_row_iterator() noexcept = default;
-  const_reverse_row_iterator(const_reverse_row_iterator const &) noexcept =
-    default;
-  const_reverse_row_iterator(const_reverse_row_iterator &&) noexcept = default;
-
-  explicit const_reverse_row_iterator(super const &rhs) noexcept :
-          const_row_iterator{rhs}
-  {
-    super::operator--();
-  }
-
-  [[nodiscard]] PQXX_PURE iterator_type base() const noexcept;
-
-  /**
-   * @name Dereferencing operators
-   */
-  //@{
-  using iterator_type::operator->;
-  using iterator_type::operator*;
-  //@}
-
-  /**
-   * @name Manipulations
-   */
-  //@{
-  const_reverse_row_iterator &
-  operator=(const_reverse_row_iterator const &r) noexcept
-  {
-    iterator_type::operator=(r);
-    return *this;
-  }
-  const_reverse_row_iterator operator++() noexcept
-  {
-    iterator_type::operator--();
-    return *this;
-  }
-  // TODO: noexcept.  Breaks ABI.
-  const_reverse_row_iterator operator++(int);
-  const_reverse_row_iterator &operator--() noexcept
-  {
-    iterator_type::operator++();
-    return *this;
-  }
-  const_reverse_row_iterator operator--(int);
-  // TODO: noexcept.  Breaks ABI.
-  const_reverse_row_iterator &operator+=(difference_type i) noexcept
-  {
-    iterator_type::operator-=(i);
-    return *this;
-  }
-  const_reverse_row_iterator &operator-=(difference_type i) noexcept
-  {
-    iterator_type::operator+=(i);
-    return *this;
-  }
-  //@}
-
-  /**
-   * @name Arithmetic operators
-   */
-  //@{
-  [[nodiscard]] const_reverse_row_iterator
-  operator+(difference_type i) const noexcept
-  {
-    return const_reverse_row_iterator{base() - i};
-  }
-  [[nodiscard]] const_reverse_row_iterator
-  operator-(difference_type i) noexcept
-  {
-    return const_reverse_row_iterator{base() + i};
-  }
-  [[nodiscard]] difference_type
-  operator-(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return rhs.const_row_iterator::operator-(*this);
-  }
-  //@}
-
-  /**
-   * @name Comparisons
-   */
-  //@{
-  [[nodiscard]] bool
-  operator==(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator==(rhs);
-  }
-  [[nodiscard]] bool
-  operator!=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return !operator==(rhs);
-  }
-
-  [[nodiscard]] constexpr bool
-  operator<(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator>(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator<=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator>=(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator>(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator<(rhs);
-  }
-  [[nodiscard]] constexpr bool
-  operator>=(const_reverse_row_iterator const &rhs) const noexcept
-  {
-    return iterator_type::operator<=(rhs);
-  }
-  //@}
-};
-
-
-const_row_iterator
-const_row_iterator::operator+(difference_type o) const noexcept
-{
-  // TODO:: More direct route to home().columns()?
-  return {
-    row{home(), idx(), home().columns()},
-    size_type(difference_type(col()) + o)};
-}
-
-inline const_row_iterator operator+(
-  const_row_iterator::difference_type o, const_row_iterator const &i) noexcept
-{
-  return i + o;
-}
-
-inline const_row_iterator
-const_row_iterator::operator-(difference_type o) const noexcept
-{
-  // TODO:: More direct route to home().columns()?
-  return {
-    row{home(), idx(), home().columns()},
-    size_type(difference_type(col()) - o)};
-}
-
-inline const_row_iterator::difference_type
-const_row_iterator::operator-(const_row_iterator const &i) const noexcept
-{
-  return difference_type(num() - i.num());
-}
-
-
-template<typename Tuple, std::size_t index>
-inline void row::extract_value(Tuple &t) const
-{
-  using field_type = strip_t<decltype(std::get<index>(t))>;
-  field const f{m_result, m_index, index};
-  std::get<index>(t) = from_string<field_type>(f);
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/separated_list b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/separated_list
deleted file mode 100644
index 1bdf51c6a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/separated_list
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Helper similar to Python's @c str.join().
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/separated_list.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/separated_list.hxx
deleted file mode 100644
index d4230ea08..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/separated_list.hxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Helper similar to Python's `str.join()`.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/separated_list instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SEPARATED_LIST
-#define PQXX_H_SEPARATED_LIST
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <algorithm>
-#include <numeric>
-
-#include "pqxx/strconv.hxx"
-
-// C++20: Simplify using std::ranges::range.
-// C++20: Optimise buffer allocation using random_access_range/iterator.
-namespace pqxx
-{
-/**
- * @defgroup utility Utility functions
- */
-//@{
-
-/// Represent sequence of values as a string, joined by a given separator.
-/**
- * Use this to turn e.g. the numbers 1, 2, and 3 into a string "1, 2, 3".
- *
- * @param sep separator string (to be placed between items)
- * @param begin beginning of items sequence
- * @param end end of items sequence
- * @param access functor defining how to dereference sequence elements
- */
-template<typename ITER, typename ACCESS>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, ITER begin, ITER end, ACCESS access)
-{
-  if (end == begin)
-    return {};
-  auto next{begin};
-  ++next;
-  if (next == end)
-    return to_string(access(begin));
-
-  // From here on, we've got at least 2 elements -- meaning that we need sep.
-  using elt_type = strip_t<decltype(access(begin))>;
-  using traits = string_traits<elt_type>;
-
-  std::size_t budget{0};
-  for (ITER cnt{begin}; cnt != end; ++cnt)
-    budget += traits::size_buffer(access(cnt));
-  budget +=
-    static_cast<std::size_t>(std::distance(begin, end)) * std::size(sep);
-
-  std::string result;
-  result.resize(budget);
-
-  char *const data{result.data()};
-  char *here{data};
-  char *stop{data + budget};
-  here = traits::into_buf(here, stop, access(begin)) - 1;
-  for (++begin; begin != end; ++begin)
-  {
-    here += sep.copy(here, std::size(sep));
-    here = traits::into_buf(here, stop, access(begin)) - 1;
-  }
-  result.resize(static_cast<std::size_t>(here - data));
-  return result;
-}
-
-
-/// Render sequence as a string, using given separator between items.
-template<typename ITER>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, ITER begin, ITER end)
-{
-  return separated_list(sep, begin, end, [](ITER i) { return *i; });
-}
-
-
-/// Render items in a container as a string, using given separator.
-template<typename CONTAINER>
-[[nodiscard]] inline auto
-separated_list(std::string_view sep, CONTAINER const &c)
-  /*
-  Always std::string; necessary because SFINAE doesn't work with the
-  contents of function bodies, so the check for iterability has to be in
-  the signature.
-  */
-  -> typename std::enable_if<
-    (not std::is_void<decltype(std::begin(c))>::value and
-     not std::is_void<decltype(std::end(c))>::value),
-    std::string>::type
-{
-  return separated_list(sep, std::begin(c), std::end(c));
-}
-
-
-/// Render items in a tuple as a string, using given separator.
-template<
-  typename TUPLE, std::size_t INDEX = 0, typename ACCESS,
-  typename std::enable_if<
-    (INDEX == std::tuple_size<TUPLE>::value - 1), int>::type = 0>
-[[nodiscard]] inline std::string separated_list(
-  std::string_view /* sep */, TUPLE const &t, ACCESS const &access)
-{
-  return to_string(access(&std::get<INDEX>(t)));
-}
-
-template<
-  typename TUPLE, std::size_t INDEX = 0, typename ACCESS,
-  typename std::enable_if<
-    (INDEX < std::tuple_size<TUPLE>::value - 1), int>::type = 0>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, TUPLE const &t, ACCESS const &access)
-{
-  std::string out{to_string(access(&std::get<INDEX>(t)))};
-  out.append(sep);
-  out.append(separated_list<TUPLE, INDEX + 1>(sep, t, access));
-  return out;
-}
-
-template<
-  typename TUPLE, std::size_t INDEX = 0,
-  typename std::enable_if<
-    (INDEX <= std::tuple_size<TUPLE>::value), int>::type = 0>
-[[nodiscard]] inline std::string
-separated_list(std::string_view sep, TUPLE const &t)
-{
-  // TODO: Optimise allocation.
-  return separated_list(sep, t, [](TUPLE const &tup) { return *tup; });
-}
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/strconv b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/strconv
deleted file mode 100644
index aa2c40ed5..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/strconv
+++ /dev/null
@@ -1,6 +0,0 @@
-/** String conversion definitions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/strconv.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/strconv.hxx
deleted file mode 100644
index 863711228..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/strconv.hxx
+++ /dev/null
@@ -1,468 +0,0 @@
-/* String conversion definitions.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stringconv instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STRCONV
-#define PQXX_H_STRCONV
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <algorithm>
-#include <cstring>
-#include <limits>
-#include <sstream>
-#include <stdexcept>
-#include <typeinfo>
-
-#if __has_include(<charconv>)
-#  include <charconv>
-#endif
-
-#if defined(PQXX_HAVE_RANGES) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/zview.hxx"
-
-
-namespace pqxx::internal
-{
-/// Attempt to demangle @c std::type_info::name() to something human-readable.
-PQXX_LIBEXPORT std::string demangle_type_name(char const[]);
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @defgroup stringconversion String conversion
- *
- * The PostgreSQL server accepts and represents data in string form.  It has
- * its own formats for various data types.  The string conversions define how
- * various C++ types translate to and from their respective PostgreSQL text
- * representations.
- *
- * Each conversion is defined by a specialisations of @c string_traits.  It
- * gets complicated if you want top performance, but until you do, all you
- * really need to care about when converting values between C++ in-memory
- * representations such as @c int and the postgres string representations is
- * the @c pqxx::to_string and @c pqxx::from_string functions.
- *
- * If you need to convert a type which is not supported out of the box, you'll
- * need to define your own specialisations for these templates, similar to the
- * ones defined here and in `pqxx/conversions.hxx`.  Any conversion code which
- * "sees" your specialisation will now support your conversion.  In particular,
- * you'll be able to read result fields into a variable of the new type.
- *
- * There is a macro to help you define conversions for individual enumeration
- * types.  The conversion will represent enumeration values as numeric strings.
- */
-//@{
-
-/// A human-readable name for a type, used in error messages and such.
-/** Actually this may not always be very user-friendly.  It uses
- * @c std::type_info::name().  On gcc-like compilers we try to demangle its
- * output.  Visual Studio produces human-friendly names out of the box.
- *
- * This variable is not inline.  Inlining it gives rise to "memory leak"
- * warnings from asan, the address sanitizer, possibly from use of
- * @c std::type_info::name.
- */
-template<typename TYPE>
-std::string const type_name{internal::demangle_type_name(typeid(TYPE).name())};
-
-
-/// Traits describing a type's "null value," if any.
-/** Some C++ types have a special value or state which correspond directly to
- * SQL's NULL.
- *
- * The @c nullness traits describe whether it exists, and whether a particular
- * value is null.
- */
-template<typename TYPE, typename ENABLE = void> struct nullness
-{
-  /// Does this type have a null value?
-  static bool has_null;
-
-  /// Is this type always null?
-  static bool always_null;
-
-  /// Is @c value a null?
-  static bool is_null(TYPE const &value);
-
-  /// Return a null value.
-  /** Don't use this in generic code to compare a value and see whether it is
-   * null.  Some types may have multiple null values which do not compare as
-   * equal, or may define a null value which is not equal to anything including
-   * itself, like in SQL.
-   */
-  [[nodiscard]] static TYPE null();
-};
-
-
-/// Nullness traits describing a type which does not have a null value.
-template<typename TYPE> struct no_null
-{
-  /// Does @c TYPE have a "built-in null value"?
-  /** For example, a pointer can equal @c nullptr, which makes a very natural
-   * representation of an SQL null value.  For such types, the code sometimes
-   * needs to make special allowances.
-   *
-   * for most types, such as @c int or @c std::string, there is no built-in
-   * null.  If you want to represent an SQL null value for such a type, you
-   * would have to wrap it in something that does have a null value.  For
-   * example, you could use @c std::optional<int> for "either an @c int or a
-   * null value."
-   */
-  static constexpr bool has_null = false;
-
-  /// Are all values of this type null?
-  /** There are a few special C++ types which are always null - mainly
-   * @c std::nullptr_t.
-   */
-  static constexpr bool always_null = false;
-
-  /// Does a given value correspond to an SQL null value?
-  /** Most C++ types, such as @c int or @c std::string, have no inherent null
-   * value.  But some types such as C-style string pointers do have a natural
-   * equivalent to an SQL null.
-   */
-  [[nodiscard]] static constexpr bool is_null(TYPE const &) noexcept
-  {
-    return false;
-  }
-};
-
-
-/// Traits class for use in string conversions.
-/** Specialize this template for a type for which you wish to add to_string
- * and from_string support.
- *
- * String conversions are not meant to work for nulls.  Check for null before
- * converting a value of @c TYPE to a string, or vice versa.
- */
-template<typename TYPE> struct string_traits
-{
-  /// Return a @c string_view representing value, plus terminating zero.
-  /** Produces a @c string_view containing the PostgreSQL string representation
-   * for @c value.
-   *
-   * Uses the space from @c begin to @c end as a buffer, if needed.  The
-   * returned string may lie somewhere in that buffer, or it may be a
-   * compile-time constant, or it may be null if value was a null value.  Even
-   * if the string is stored in the buffer, its @c begin() may or may not be
-   * the same as @c begin.
-   *
-   * The @c string_view is guaranteed to be valid as long as the buffer from
-   * @c begin to @c end remains accessible and unmodified.
-   *
-   * @throws pqxx::conversion_overrun if the provided buffer space may not be
-   * enough.  For maximum performance, this is a conservative estimate.  It may
-   * complain about a buffer which is actually large enough for your value, if
-   * an exact check gets too expensive.
-   */
-  [[nodiscard]] static inline zview
-  to_buf(char *begin, char *end, TYPE const &value);
-
-  /// Write value's string representation into buffer at @c begin.
-  /** Assumes that value is non-null.
-   *
-   * Writes value's string representation into the buffer, starting exactly at
-   * @c begin, and ensuring a trailing zero.  Returns the address just beyond
-   * the trailing zero, so the caller could use it as the @c begin for another
-   * call to @c into_buf writing a next value.
-   */
-  static inline char *into_buf(char *begin, char *end, TYPE const &value);
-
-  /// Parse a string representation of a @c TYPE value.
-  /** Throws @c conversion_error if @c value does not meet the expected format
-   * for a value of this type.
-   */
-  [[nodiscard]] static inline TYPE from_string(std::string_view text);
-
-  // C++20: Can we make these all constexpr?
-  /// Estimate how much buffer space is needed to represent value.
-  /** The estimate may be a little pessimistic, if it saves time.
-   *
-   * The estimate includes the terminating zero.
-   */
-  [[nodiscard]] static inline std::size_t
-  size_buffer(TYPE const &value) noexcept;
-};
-
-
-/// Nullness: Enums do not have an inherent null value.
-template<typename ENUM>
-struct nullness<ENUM, std::enable_if_t<std::is_enum_v<ENUM>>> : no_null<ENUM>
-{};
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// Helper class for defining enum conversions.
-/** The conversion will convert enum values to numeric strings, and vice versa.
- *
- * To define a string conversion for an enum type, derive a @c string_traits
- * specialisation for the enum from this struct.
- *
- * There's usually an easier way though: the @c PQXX_DECLARE_ENUM_CONVERSION
- * macro.  Use @c enum_traits manually only if you need to customise your
- * traits type in more detail.
- */
-template<typename ENUM> struct enum_traits
-{
-  using impl_type = std::underlying_type_t<ENUM>;
-  using impl_traits = string_traits<impl_type>;
-
-  [[nodiscard]] static constexpr zview
-  to_buf(char *begin, char *end, ENUM const &value)
-  {
-    return impl_traits::to_buf(begin, end, to_underlying(value));
-  }
-
-  static constexpr char *into_buf(char *begin, char *end, ENUM const &value)
-  {
-    return impl_traits::into_buf(begin, end, to_underlying(value));
-  }
-
-  [[nodiscard]] static ENUM from_string(std::string_view text)
-  {
-    return static_cast<ENUM>(impl_traits::from_string(text));
-  }
-
-  [[nodiscard]] static std::size_t size_buffer(ENUM const &value) noexcept
-  {
-    return impl_traits::size_buffer(to_underlying(value));
-  }
-
-private:
-  // C++23: Replace with std::to_underlying.
-  static constexpr impl_type to_underlying(ENUM const &value) noexcept
-  {
-    return static_cast<impl_type>(value);
-  }
-};
-} // namespace pqxx::internal
-
-
-/// Macro: Define a string conversion for an enum type.
-/** This specialises the @c pqxx::string_traits template, so use it in the
- * @c ::pqxx namespace.
- *
- * For example:
- *
- *      #include <iostream>
- *      #include <pqxx/strconv>
- *      enum X { xa, xb };
- *      namespace pqxx { PQXX_DECLARE_ENUM_CONVERSION(x); }
- *      int main() { std::cout << pqxx::to_string(xa) << std::endl; }
- */
-#define PQXX_DECLARE_ENUM_CONVERSION(ENUM)                                    \
-  template<> struct string_traits<ENUM> : pqxx::internal::enum_traits<ENUM>   \
-  {};                                                                         \
-  template<> inline std::string const type_name<ENUM> { #ENUM }
-
-
-namespace pqxx
-{
-/// Parse a value in postgres' text format as a TYPE.
-/** If the form of the value found in the string does not match the expected
- * type, e.g. if a decimal point is found when converting to an integer type,
- * the conversion fails.  Overflows (e.g. converting "9999999999" to a 16-bit
- * C++ type) are also treated as errors.  If in some cases this behaviour
- * should be inappropriate, convert to something bigger such as @c long @c int
- * first and then truncate the resulting value.
- *
- * Only the simplest possible conversions are supported.  Fancy features like
- * hexadecimal or octal, spurious signs, or exponent notation won't work.
- * Whitespace is not stripped away.  Only the kinds of strings that come out of
- * PostgreSQL and out of to_string() can be converted.
- */
-template<typename TYPE>
-[[nodiscard]] inline TYPE from_string(std::string_view text)
-{
-  return string_traits<TYPE>::from_string(text);
-}
-
-
-/// "Convert" a std::string_view to a std::string_view.
-/** Just returns its input.
- *
- * @warning Of course the result is only valid for as long as the original
- * string remains valid!  Never access the string referenced by the return
- * value after the original has been destroyed.
- */
-template<>
-[[nodiscard]] inline std::string_view from_string(std::string_view text)
-{
-  return text;
-}
-
-
-/// Attempt to convert postgres-generated string to given built-in object.
-/** This is like the single-argument form of the function, except instead of
- * returning the value, it sets @c value.
- *
- * You may find this more convenient in that it infers the type you want from
- * the argument you pass.  But there are disadvantages: it requires an
- * assignment operator, and it may be less efficient.
- */
-template<typename T> inline void from_string(std::string_view text, T &value)
-{
-  value = from_string<T>(text);
-}
-
-
-/// Convert a value to a readable string that PostgreSQL will understand.
-/** The conversion does no special formatting, and ignores any locale settings.
- * The resulting string will be human-readable and in a format suitable for use
- * in SQL queries.  It won't have niceties such as "thousands separators"
- * though.
- */
-template<typename TYPE> inline std::string to_string(TYPE const &value);
-
-
-/// Convert multiple values to strings inside a single buffer.
-/** There must be enough room for all values, or this will throw
- * @c conversion_overrun.  You can obtain a conservative estimate of the buffer
- * space required by calling @c size_buffer() on the values.
- *
- * The @c std::string_view results may point into the buffer, so don't assume
- * that they will remain valid after you destruct or move the buffer.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::vector<std::string_view>
-to_buf(char *here, char const *end, TYPE... value)
-{
-  return {[&here, end](auto v) {
-    auto begin = here;
-    here = string_traits<decltype(v)>::into_buf(begin, end, v);
-    // Exclude the trailing zero out of the string_view.
-    auto len{static_cast<std::size_t>(here - begin) - 1};
-    return std::string_view{begin, len};
-  }(value)...};
-}
-
-/// Convert a value to a readable string that PostgreSQL will understand.
-/** This variant of to_string can sometimes save a bit of time in loops, by
- * re-using a std::string for multiple conversions.
- */
-template<typename TYPE>
-inline void into_string(TYPE const &value, std::string &out);
-
-
-/// Is @c value null?
-template<typename TYPE>
-[[nodiscard]] inline constexpr bool is_null(TYPE const &value) noexcept
-{
-  return nullness<strip_t<TYPE>>::is_null(value);
-}
-
-
-/// Estimate how much buffer space is needed to represent values as a string.
-/** The estimate may be a little pessimistic, if it saves time.  It also
- * includes room for a terminating zero after each value.
- */
-template<typename... TYPE>
-[[nodiscard]] inline std::size_t size_buffer(TYPE const &...value) noexcept
-{
-  return (string_traits<strip_t<TYPE>>::size_buffer(value) + ...);
-}
-
-
-/// Does this type translate to an SQL array?
-/** Specialisations may override this to be true for container types.
- *
- * This may not always be a black-and-white choice.  For instance, a
- * @c std::string is a container, but normally it translates to an SQL string,
- * not an SQL array.
- */
-template<typename TYPE> inline constexpr bool is_sql_array{false};
-
-
-/// Can we use this type in arrays and composite types without quoting them?
-/** Define this as @c true only if values of @c TYPE can never contain any
- * special characters that might need escaping or confuse the parsing of array
- * or composite * types, such as commas, quotes, parentheses, braces, newlines,
- * and so on.
- *
- * When converting a value of such a type to a string in an array or a field in
- * a composite type, we do not need to add quotes, nor escape any special
- * characters.
- *
- * This is just an optimisation, so it defaults to @c false to err on the side
- * of slow correctness.
- */
-template<typename TYPE> inline constexpr bool is_unquoted_safe{false};
-
-
-/// Element separator between SQL array elements of this type.
-template<typename T> inline constexpr char array_separator{','};
-
-
-/// What's the preferred format for passing non-null parameters of this type?
-/** This affects how we pass parameters of @c TYPE when calling parameterised
- * statements or prepared statements.
- *
- * Generally we pass parameters in text format, but binary strings are the
- * exception.  We also pass nulls in binary format, so this function need not
- * handle null values.
- */
-template<typename TYPE> inline constexpr format param_format(TYPE const &)
-{
-  return format::text;
-}
-
-
-/// Implement @c string_traits<TYPE>::to_buf by calling @c into_buf.
-/** When you specialise @c string_traits for a new type, most of the time its
- * @c to_buf implementation has no special optimisation tricks and just writes
- * its text into the buffer it receives from the caller, starting at the
- * beginning.
- *
- * In that common situation, you can implement @c to_buf as just a call to
- * @c generic_to_buf.  It will call @c into_buf and return the right result for
- * @c to_buf.
- */
-template<typename TYPE>
-inline zview generic_to_buf(char *begin, char *end, TYPE const &value)
-{
-  using traits = string_traits<TYPE>;
-  // The trailing zero does not count towards the zview's size, so subtract 1
-  // from the result we get from into_buf().
-  if (is_null(value))
-    return {};
-  else
-    return {begin, traits::into_buf(begin, end, value) - begin - 1};
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: Binary string, akin to @c std::string for binary data.
-/** Any type that satisfies this concept can represent an SQL BYTEA value.
- *
- * A @c binary has a @c begin(), @c end(), @c size(), and @data().  Each byte
- * is a @c std::byte, and they must all be laid out contiguously in memory so
- * we can reference them by a pointer.
- */
-template<class TYPE>
-concept binary = std::ranges::contiguous_range<TYPE> and
-  std::is_same_v<strip_t<value_type<TYPE>>, std::byte>;
-#endif
-//@}
-} // namespace pqxx
-
-
-#include "pqxx/internal/conversions.hxx"
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_from b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_from
deleted file mode 100644
index 972762443..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_from
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::stream_from class.
- *
- * pqxx::stream_from enables optimized batch reads from a database table.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_from.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_from.hxx
deleted file mode 100644
index ff4a93d2e..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_from.hxx
+++ /dev/null
@@ -1,361 +0,0 @@
-/* Definition of the pqxx::stream_from class.
- *
- * pqxx::stream_from enables optimized batch reads from a database table.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stream_from instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_FROM
-#define PQXX_H_STREAM_FROM
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cassert>
-#include <functional>
-#include <variant>
-
-#include "pqxx/connection.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/internal/stream_iterator.hxx"
-#include "pqxx/separated_list.hxx"
-#include "pqxx/transaction_focus.hxx"
-
-
-namespace pqxx
-{
-class transaction_base;
-
-
-/// Pass this to a `stream_from` constructor to stream table contents.
-/** @deprecated Use @ref stream_from::table() instead.
- */
-constexpr from_table_t from_table;
-/// Pass this to a `stream_from` constructor to stream query results.
-/** @deprecated Use stream_from::query() instead.
- */
-constexpr from_query_t from_query;
-
-
-/// Stream data from the database.
-/** For larger data sets, retrieving data this way is likely to be faster than
- * executing a query and then iterating and converting the rows fields.  You
- * will also be able to start processing before all of the data has come in.
- *
- * There are also downsides.  Not all kinds of query will work in a stream.
- * But straightforward `SELECT` and `UPDATE ... RETURNING` queries should work.
- * This function makes use of @ref pqxx::stream_from, which in turn uses
- * PostgreSQL's `COPY` command, so see the documentation for those to get the
- * full details.
- *
- * There are other downsides.  If there stream encounters an error, it may
- * leave the entire connection in an unusable state, so you'll have to give the
- * whole thing up.  Finally, opening a stream puts the connection in a special
- * state, so you won't be able to do many other things with the connection or
- * the transaction while the stream is open.
- *
- * There are two ways of starting a stream: you stream either all rows in a
- * table (using one of the factories, `table()` or `raw_table()`), or the
- * results of a query (using the `query()` factory).
- *
- * Usually you'll want the `stream` convenience wrapper in
- * @ref transaction_base, * so you don't need to deal with this class directly.
- *
- * @warning While a stream is active, you cannot execute queries, open a
- * pipeline, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT stream_from : transaction_focus
-{
-public:
-  using raw_line =
-    std::pair<std::unique_ptr<char, std::function<void(char *)>>, std::size_t>;
-
-  /// Factory: Execute query, and stream the results.
-  /** The query can be a SELECT query or a VALUES query; or it can be an
-   * UPDATE, INSERT, or DELETE with a RETURNING clause.
-   *
-   * The query is executed as part of a COPY statement, so there are additional
-   * restrictions on what kind of query you can use here.  See the PostgreSQL
-   * documentation for the COPY command:
-   *
-   *     https://www.postgresql.org/docs/current/sql-copy.html
-   */
-  static stream_from query(transaction_base &tx, std::string_view q)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return {tx, from_query, q};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /**
-   * @name Streaming data from tables
-   *
-   * You can use `stream_from` to read a table's contents.  This is a quick
-   * and easy way to read a table, but it comes with limitations.  It cannot
-   * stream from a view, only from a table.  It does not support conditions.
-   * And there are no guarantees about ordering.  If you need any of those
-   * things, consider streaming from a query instead.
-   */
-  //@{
-
-  /// Factory: Stream data from a pre-quoted table and columns.
-  /** Use this factory if you need to create multiple streams using the same
-   * table path and/or columns list, and you want to save a bit of work on
-   * composing the internal SQL statement for starting the stream.  It lets you
-   * compose the string representations for the table path and the columns
-   * list, so you can compute these once and then re-use them later.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path Name or path for the table upon which the stream will
-   *     operate.  If any part of the table path may contain special
-   *     characters or be case-sensitive, quote the path using
-   *     pqxx::connection::quote_table().
-   * @param columns Columns which the stream will read.  They should be
-   *     comma-separated and, if needed, quoted.  You can produce the string
-   *     using pqxx::connection::quote_columns().  If you omit this argument,
-   *     the stream will read all columns in the table, in schema order.
-   */
-  static stream_from raw_table(
-    transaction_base &tx, std::string_view path,
-    std::string_view columns = ""sv);
-
-  /// Factory: Stream data from a given table.
-  /** This is the convenient way to stream from a table.
-   */
-  static stream_from table(
-    transaction_base &tx, table_path path,
-    std::initializer_list<std::string_view> columns = {});
-  //@}
-
-  /// Execute query, and stream over the results.
-  /** @deprecated Use factory function @ref query instead.
-   */
-  [[deprecated("Use query() factory instead.")]] stream_from(
-    transaction_base &, from_query_t, std::string_view query);
-
-  /// Stream all rows in table, all columns.
-  /** @deprecated Use factories @ref table or @ref raw_table instead.
-   */
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &, from_table_t, std::string_view table);
-
-  /// Stream given columns from all rows in table.
-  /** @deprecated Use factories @ref table or @ref raw_table instead.
-   */
-  template<typename Iter>
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &, from_table_t, std::string_view table,
-    Iter columns_begin, Iter columns_end);
-
-  /// Stream given columns from all rows in table.
-  /** @deprecated Use factory function @ref query instead.
-   */
-  template<typename Columns>
-  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-    transaction_base &tx, from_table_t, std::string_view table,
-    Columns const &columns);
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &tx, std::string_view table) :
-          stream_from{tx, from_table, table}
-  {}
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  template<typename Columns>
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &tx, std::string_view table, Columns const &columns) :
-          stream_from{tx, from_table, table, columns}
-  {}
-
-  /// @deprecated Use factories @ref table or @ref raw_table instead.
-  template<typename Iter>
-  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-    transaction_base &, std::string_view table, Iter columns_begin,
-    Iter columns_end);
-
-  ~stream_from() noexcept;
-
-  /// May this stream still produce more data?
-  [[nodiscard]] constexpr operator bool() const noexcept
-  {
-    return not m_finished;
-  }
-  /// Has this stream produced all the data it is going to produce?
-  [[nodiscard]] constexpr bool operator!() const noexcept
-  {
-    return m_finished;
-  }
-
-  /// Finish this stream.  Call this before continuing to use the connection.
-  /** Consumes all remaining lines, and closes the stream.
-   *
-   * This may take a while if you're abandoning the stream before it's done, so
-   * skip it in error scenarios where you're not planning to use the connection
-   * again afterwards.
-   */
-  void complete();
-
-  /// Read one row into a tuple.
-  /** Converts the row's fields into the fields making up the tuple.
-   *
-   * For a column which can contain nulls, be sure to give the corresponding
-   * tuple field a type which can be null.  For example, to read a field as
-   * `int` when it may contain nulls, read it as `std::optional<int>`.
-   * Using `std::shared_ptr` or `std::unique_ptr` will also work.
-   */
-  template<typename Tuple> stream_from &operator>>(Tuple &);
-
-  /// Doing this with a `std::variant` is going to be horrifically borked.
-  template<typename... Vs>
-  stream_from &operator>>(std::variant<Vs...> &) = delete;
-
-  /// Iterate over this stream.  Supports range-based "for" loops.
-  /** Produces an input iterator over the stream.
-   *
-   * Do not call this yourself.  Use it like "for (auto data : stream.iter())".
-   */
-  template<typename... TYPE> [[nodiscard]] auto iter() &
-  {
-    return pqxx::internal::stream_input_iteration<TYPE...>{*this};
-  }
-
-  /// Read a row.  Return fields as views, valid until you read the next row.
-  /** Returns `nullptr` when there are no more rows to read.  Do not attempt
-   * to read any further rows after that.
-   *
-   * Do not access the vector, or the storage referenced by the views, after
-   * closing or completing the stream, or after attempting to read a next row.
-   *
-   * A @ref pqxx::zview is like a `std::string_view`, but with the added
-   * guarantee that if its data pointer is non-null, the string is followed by
-   * a terminating zero (which falls just outside the view itself).
-   *
-   * If any of the views' data pointer is null, that means that the
-   * corresponding SQL field is null.
-   *
-   * @warning The return type may change in the future, to support C++20
-   * coroutine-based usage.
-   */
-  std::vector<zview> const *read_row() &;
-
-  /// Read a raw line of text from the COPY command.
-  /** @warning Do not use this unless you really know what you're doing. */
-  raw_line get_raw_line();
-
-private:
-  // TODO: Clean up this signature once we cull the deprecated constructors.
-  /// @deprecated
-  stream_from(
-    transaction_base &tx, std::string_view table, std::string_view columns,
-    from_table_t);
-
-  // TODO: Clean up this signature once we cull the deprecated constructors.
-  /// @deprecated
-  stream_from(
-    transaction_base &, std::string_view unquoted_table,
-    std::string_view columns, from_table_t, int);
-
-  template<typename Tuple, std::size_t... indexes>
-  void extract_fields(Tuple &t, std::index_sequence<indexes...>) const
-  {
-    (extract_value<Tuple, indexes>(t), ...);
-  }
-
-  pqxx::internal::glyph_scanner_func *m_glyph_scanner;
-
-  /// Current row's fields' text, combined into one reusable string.
-  std::string m_row;
-
-  /// The current row's fields.
-  std::vector<zview> m_fields;
-
-  bool m_finished = false;
-
-  void close();
-
-  template<typename Tuple, std::size_t index>
-  void extract_value(Tuple &) const;
-
-  /// Read a line of COPY data, write `m_row` and `m_fields`.
-  void parse_line();
-};
-
-
-template<typename Columns>
-inline stream_from::stream_from(
-  transaction_base &tx, from_table_t, std::string_view table_name,
-  Columns const &columns) :
-        stream_from{
-          tx, from_table, table_name, std::begin(columns), std::end(columns)}
-{}
-
-
-template<typename Iter>
-inline stream_from::stream_from(
-  transaction_base &tx, from_table_t, std::string_view table,
-  Iter columns_begin, Iter columns_end) :
-        stream_from{
-          tx, table, separated_list(",", columns_begin, columns_end),
-          from_table, 1}
-{}
-
-
-template<typename Tuple> inline stream_from &stream_from::operator>>(Tuple &t)
-{
-  if (m_finished)
-    return *this;
-  static constexpr auto tup_size{std::tuple_size_v<Tuple>};
-  m_fields.reserve(tup_size);
-  parse_line();
-  if (m_finished)
-    return *this;
-
-  if (std::size(m_fields) != tup_size)
-    throw usage_error{internal::concat(
-      "Tried to extract ", tup_size, " field(s) from a stream of ",
-      std::size(m_fields), ".")};
-
-  extract_fields(t, std::make_index_sequence<tup_size>{});
-  return *this;
-}
-
-
-template<typename Tuple, std::size_t index>
-inline void stream_from::extract_value(Tuple &t) const
-{
-  using field_type = strip_t<decltype(std::get<index>(t))>;
-  using nullity = nullness<field_type>;
-  assert(index < std::size(m_fields));
-  if constexpr (nullity::always_null)
-  {
-    if (std::data(m_fields[index]) != nullptr)
-      throw conversion_error{"Streaming non-null value into null field."};
-  }
-  else if (std::data(m_fields[index]) == nullptr)
-  {
-    if constexpr (nullity::has_null)
-      std::get<index>(t) = nullity::null();
-    else
-      internal::throw_null_conversion(type_name<field_type>);
-  }
-  else
-  {
-    // Don't ever try to convert a non-null value to nullptr_t!
-    std::get<index>(t) = from_string<field_type>(m_fields[index]);
-  }
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_to b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_to
deleted file mode 100644
index 8760cf1f4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_to
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::stream_to class.
- *
- * pqxx::stream_to enables optimized batch updates to a database table.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/stream_to.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_to.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_to.hxx
deleted file mode 100644
index 2a49d8f85..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/stream_to.hxx
+++ /dev/null
@@ -1,455 +0,0 @@
-/* Definition of the pqxx::stream_to class.
- *
- * pqxx::stream_to enables optimized batch updates to a database table.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/stream_to.hxx instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_STREAM_TO
-#define PQXX_H_STREAM_TO
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/separated_list.hxx"
-#include "pqxx/transaction_base.hxx"
-
-
-namespace pqxx
-{
-/// Efficiently write data directly to a database table.
-/** If you wish to insert rows of data into a table, you can compose INSERT
- * statements and execute them.  But it's slow and tedious, and you need to
- * worry about quoting and escaping the data.
- *
- * If you're just inserting a single row, it probably won't matter much.  You
- * can use prepared or parameterised statements to take care of the escaping
- * for you.  But if you're inserting large numbers of rows you will want
- * something better.
- *
- * Inserting rows one by one using INSERT statements involves a lot of
- * pointless overhead, especially when you are working with a remote database
- * server over the network.  You may end up sending each row over the network
- * as a separate query, and waiting for a reply.  Do it "in bulk" using
- * `stream_to`, and you may find that it goes many times faster.  Sometimes
- * you gain orders of magnitude in speed.
- *
- * Here's how it works: you create a `stream_to` stream to start writing to
- * your table.  You will probably want to specify the columns.  Then, you
- * feed your data into the stream one row at a time.  And finally, you call the
- * stream's @ref complete function to tell it to finalise the operation, wait
- * for completion, and check for errors.
- *
- * (You _must_ complete the stream before committing or aborting the
- * transaction.  The connection is in a special state while the stream is
- * active, where it can't process commands, and can't commit or abort a
- * transaction.)
- *
- * So how do you feed a row of data into the stream?  There's several ways, but
- * the preferred one is to call its @ref write_values.  Pass the field values
- * as arguments.  Doesn't matter what type they are, as long as libpqxx knows
- * how to convert them to PostgreSQL's text format: `int`, `std::string` or
- * `std:string_view`, `float` and `double`, `bool`...  lots of basic types
- * are supported.  If some of the values are null, feel free to use
- * `std::optional`, `std::shared_ptr`, or `std::unique_ptr`.
- *
- * The arguments' types don't even have to match the fields' SQL types.  If you
- * want to insert an `int` into a `DECIMAL` column, that's your choice -- it
- * will produce a `DECIMAL` value which happens to be integral.  Insert a
- * `float` into a `VARCHAR` column?  That's fine, you'll get a string whose
- * contents happen to read like a number.  And so on.  You can even insert
- * different types of value in the same column on different rows.  If you have
- * a code path where a particular field is always null, just insert `nullptr`.
- *
- * There is another way to insert rows: the `<<` ("shift-left") operator.
- * It's not as fast and it doesn't support variable arguments: each row must be
- * either a `std::tuple` or something iterable, such as a `std::vector`, or
- * anything else with a `begin()` and `end()`.
- *
- * @warning While a stream is active, you cannot execute queries, open a
- * pipeline, etc. on the same transaction.  A transaction can have at most one
- * object of a type derived from @ref pqxx::transaction_focus active on it at a
- * time.
- */
-class PQXX_LIBEXPORT stream_to : transaction_focus
-{
-public:
-  /// Stream data to a pre-quoted table and columns.
-  /** This factory can be useful when it's not convenient to provide the
-   * columns list in the form of a `std::initializer_list`, or when the list
-   * of columns is simply not known at compile time.
-   *
-   * Also use this if you need to create multiple streams using the same table
-   * path and/or columns list, and you want to save a bit of work on composing
-   * the internal SQL statement for starting the stream.  It lets you compose
-   * the string representations for the table path and the columns list, so you
-   * can compute these once and then re-use them later.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path Name or path for the table upon which the stream will
-   *     operate.  If any part of the table path may contain special
-   *     characters or be case-sensitive, quote the path using
-   *     pqxx::connection::quote_table().
-   * @param columns Columns to which the stream will write.  They should be
-   *     comma-separated and, if needed, quoted.  You can produce the string
-   *     using pqxx::connection::quote_columns().  If you omit this argument,
-   *     the stream will write all columns in the table, in schema order.
-   */
-  static stream_to raw_table(
-    transaction_base &tx, std::string_view path, std::string_view columns = "")
-  {
-    return {tx, path, columns};
-  }
-
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this to stream data to a table, where the list of columns is known at
-   * compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns Optionally, the columns to which the stream should write.
-   *     If you do not pass this, the stream will write to all columns in the
-   *     table, in schema order.
-   */
-  static stream_to table(
-    transaction_base &tx, table_path path,
-    std::initializer_list<std::string_view> columns = {})
-  {
-    auto const &conn{tx.conn()};
-    return raw_table(tx, conn.quote_table(path), conn.quote_columns(columns));
-  }
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this version to stream data to a table, when the list of columns is
-   * not known at compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns The columns to which the stream should write.
-   */
-  template<PQXX_CHAR_STRINGS_ARG COLUMNS>
-  static stream_to
-  table(transaction_base &tx, table_path path, COLUMNS const &columns)
-  {
-    auto const &conn{tx.conn()};
-    return stream_to::raw_table(
-      tx, conn.quote_table(path), tx.conn().quote_columns(columns));
-  }
-
-  /// Create a `stream_to` writing to a named table and columns.
-  /** Use this version to stream data to a table, when the list of columns is
-   * not known at compile time.
-   *
-   * @param tx The transaction within which the stream will operate.
-   * @param path A @ref table_path designating the target table.
-   * @param columns The columns to which the stream should write.
-   */
-  template<PQXX_CHAR_STRINGS_ARG COLUMNS>
-  static stream_to
-  table(transaction_base &tx, std::string_view path, COLUMNS const &columns)
-  {
-    return stream_to::raw_table(tx, path, tx.conn().quote_columns(columns));
-  }
-#endif // PQXX_HAVE_CONCEPTS
-
-  /// Create a stream, without specifying columns.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   *
-   * Fields will be inserted in whatever order the columns have in the
-   * database.
-   *
-   * You'll probably want to specify the columns, so that the mapping between
-   * your data fields and the table is explicit in your code, and not hidden
-   * in an "implicit contract" between your code and your schema.
-   */
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &tx, std::string_view table_name) :
-          stream_to{tx, table_name, ""sv}
-  {}
-
-  /// Create a stream, specifying column names as a container of strings.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   */
-  template<typename Columns>
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &, std::string_view table_name, Columns const &columns);
-
-  /// Create a stream, specifying column names as a sequence of strings.
-  /** @deprecated Use @ref table or @ref raw_table as a factory.
-   */
-  template<typename Iter>
-  [[deprecated("Use table() or raw_table() factory.")]] stream_to(
-    transaction_base &, std::string_view table_name, Iter columns_begin,
-    Iter columns_end);
-
-  ~stream_to() noexcept;
-
-  /// Does this stream still need to @ref complete()?
-  [[nodiscard]] constexpr operator bool() const noexcept
-  {
-    return not m_finished;
-  }
-  /// Has this stream been through its concluding @c complete()?
-  [[nodiscard]] constexpr bool operator!() const noexcept
-  {
-    return m_finished;
-  }
-
-  /// Complete the operation, and check for errors.
-  /** Always call this to close the stream in an orderly fashion, even after
-   * an error.  (In the case of an error, abort the transaction afterwards.)
-   *
-   * The only circumstance where it's safe to skip this is after an error, if
-   * you're discarding the entire connection.
-   */
-  void complete();
-
-  /// Insert a row of data.
-  /** Returns a reference to the stream, so you can chain the calls.
-   *
-   * The @c row can be a tuple, or any type that can be iterated.  Each
-   * item becomes a field in the row, in the same order as the columns you
-   * specified when creating the stream.
-   *
-   * If you don't already happen to have your fields in the form of a tuple or
-   * container, prefer @c write_values.  It's faster and more convenient.
-   */
-  template<typename Row> stream_to &operator<<(Row const &row)
-  {
-    write_row(row);
-    return *this;
-  }
-
-  /// Stream a `stream_from` straight into a `stream_to`.
-  /** This can be useful when copying between different databases.  If the
-   * source and the destination are on the same database, you'll get better
-   * performance doing it all in a regular query.
-   */
-  stream_to &operator<<(stream_from &);
-
-  /// Insert a row of data, given in the form of a @c std::tuple or container.
-  /** The @c row can be a tuple, or any type that can be iterated.  Each
-   * item becomes a field in the row, in the same order as the columns you
-   * specified when creating the stream.
-   *
-   * The preferred way to insert a row is @c write_values.
-   */
-  template<typename Row> void write_row(Row const &row)
-  {
-    fill_buffer(row);
-    write_buffer();
-  }
-
-  /// Insert values as a row.
-  /** This is the recommended way of inserting data.  Pass your field values,
-   * of any convertible type.
-   */
-  template<typename... Ts> void write_values(Ts const &...fields)
-  {
-    fill_buffer(fields...);
-    write_buffer();
-  }
-
-private:
-  /// Stream a pre-quoted table name and columns list.
-  stream_to(
-    transaction_base &tx, std::string_view path, std::string_view columns);
-
-  bool m_finished = false;
-
-  /// Reusable buffer for a row.  Saves doing an allocation for each row.
-  std::string m_buffer;
-
-  /// Reusable buffer for converting/escaping a field.
-  std::string m_field_buf;
-
-  /// Glyph scanner, for parsing the client encoding.
-  internal::glyph_scanner_func *m_scanner;
-
-  /// Write a row of raw text-format data into the destination table.
-  void write_raw_line(std::string_view);
-
-  /// Write a row of data from @c m_buffer into the destination table.
-  /** Resets the buffer for the next row.
-   */
-  void write_buffer();
-
-  /// COPY encoding for a null field, plus subsequent separator.
-  static constexpr std::string_view null_field{"\\N\t"};
-
-  /// Estimate buffer space needed for a field which is always null.
-  template<typename T>
-  static std::enable_if_t<nullness<T>::always_null, std::size_t>
-  estimate_buffer(T const &)
-  {
-    return std::size(null_field);
-  }
-
-  /// Estimate buffer space needed for field f.
-  /** The estimate is not very precise.  We don't actually know how much space
-   * we'll need once the escaping comes in.
-   */
-  template<typename T>
-  static std::enable_if_t<not nullness<T>::always_null, std::size_t>
-  estimate_buffer(T const &field)
-  {
-    return is_null(field) ? std::size(null_field) : size_buffer(field);
-  }
-
-  /// Append escaped version of @c data to @c m_buffer, plus a tab.
-  void escape_field_to_buffer(std::string_view data);
-
-  /// Append string representation for @c f to @c m_buffer.
-  /** This is for the general case, where the field may contain a value.
-   *
-   * Also appends a tab.  The tab is meant to be a separator, not a terminator,
-   * so if you write any fields at all, you'll end up with one tab too many
-   * at the end of the buffer.
-   */
-  template<typename Field>
-  std::enable_if_t<not nullness<Field>::always_null>
-  append_to_buffer(Field const &f)
-  {
-    // We append each field, terminated by a tab.  That will leave us with
-    // one tab too many, assuming we write any fields at all; we remove that
-    // at the end.
-    if (is_null(f))
-    {
-      // Easy.  Append null and tab in one go.
-      m_buffer.append(null_field);
-    }
-    else
-    {
-      // Convert f into m_buffer.
-
-      using traits = string_traits<Field>;
-      auto const budget{estimate_buffer(f)};
-      auto const offset{std::size(m_buffer)};
-
-      if constexpr (std::is_arithmetic_v<Field>)
-      {
-        // Specially optimised for "safe" types, which never need any
-        // escaping.  Convert straight into m_buffer.
-
-        // The budget we get from size_buffer() includes room for the trailing
-        // zero, which we must remove.  But we're also inserting tabs between
-        // fields, so we re-purpose the extra byte for that.
-        auto const total{offset + budget};
-        m_buffer.resize(total);
-        auto const data{m_buffer.data()};
-        char *const end{traits::into_buf(data + offset, data + total, f)};
-        *(end - 1) = '\t';
-        // Shrink to fit.  Keep the tab though.
-        m_buffer.resize(static_cast<std::size_t>(end - data));
-      }
-      else if constexpr (
-        std::is_same_v<Field, std::string> or
-        std::is_same_v<Field, std::string_view> or
-        std::is_same_v<Field, zview>)
-      {
-        // This string may need escaping.
-        m_field_buf.resize(budget);
-        escape_field_to_buffer(f);
-      }
-      else
-      {
-        // This field needs to be converted to a string, and after that,
-        // escaped as well.
-        m_field_buf.resize(budget);
-        auto const data{m_field_buf.data()};
-        escape_field_to_buffer(
-          traits::to_buf(data, data + std::size(m_field_buf), f));
-      }
-    }
-  }
-
-  /// Append string representation for a null field to @c m_buffer.
-  /** This special case is for types which are always null.
-   *
-   * Also appends a tab.  The tab is meant to be a separator, not a terminator,
-   * so if you write any fields at all, you'll end up with one tab too many
-   * at the end of the buffer.
-   */
-  template<typename Field>
-  std::enable_if_t<nullness<Field>::always_null>
-  append_to_buffer(Field const &)
-  {
-    m_buffer.append(null_field);
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on a container of fields.
-  template<typename Container>
-  std::enable_if_t<not std::is_same_v<typename Container::value_type, char>>
-  fill_buffer(Container const &c)
-  {
-    // To avoid unnecessary allocations and deallocations, we run through c
-    // twice: once to determine how much buffer space we may need, and once to
-    // actually write it into the buffer.
-    std::size_t budget{0};
-    for (auto const &f : c) budget += estimate_buffer(f);
-    m_buffer.reserve(budget);
-    for (auto const &f : c) append_to_buffer(f);
-  }
-
-  /// Estimate how many buffer bytes we need to write tuple.
-  template<typename Tuple, std::size_t... indexes>
-  static std::size_t
-  budget_tuple(Tuple const &t, std::index_sequence<indexes...>)
-  {
-    return (estimate_buffer(std::get<indexes>(t)) + ...);
-  }
-
-  /// Write tuple of fields to @c m_buffer.
-  template<typename Tuple, std::size_t... indexes>
-  void append_tuple(Tuple const &t, std::index_sequence<indexes...>)
-  {
-    (append_to_buffer(std::get<indexes>(t)), ...);
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on a tuple of fields.
-  template<typename... Elts> void fill_buffer(std::tuple<Elts...> const &t)
-  {
-    using indexes = std::make_index_sequence<sizeof...(Elts)>;
-
-    m_buffer.reserve(budget_tuple(t, indexes{}));
-    append_tuple(t, indexes{});
-  }
-
-  /// Write raw COPY line into @c m_buffer, based on varargs fields.
-  template<typename... Ts> void fill_buffer(const Ts &...fields)
-  {
-    (..., append_to_buffer(fields));
-  }
-
-  constexpr static std::string_view s_classname{"stream_to"};
-};
-
-
-template<typename Columns>
-inline stream_to::stream_to(
-  transaction_base &tx, std::string_view table_name, Columns const &columns) :
-        stream_to{tx, table_name, std::begin(columns), std::end(columns)}
-{}
-
-
-template<typename Iter>
-inline stream_to::stream_to(
-  transaction_base &tx, std::string_view table_name, Iter columns_begin,
-  Iter columns_end) :
-        stream_to{
-          tx,
-          tx.quote_name(
-            table_name,
-            separated_list(",", columns_begin, columns_end, [&tx](auto col) {
-              return tx.quote_name(*col);
-            }))}
-{}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/subtransaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/subtransaction
deleted file mode 100644
index e0d154903..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/subtransaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::subtransaction class.
- *
- * pqxx::subtransaction is a nested transaction, i.e. one inside a transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/subtransaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/subtransaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/subtransaction.hxx
deleted file mode 100644
index e66b7a7a8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/subtransaction.hxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Definition of the pqxx::subtransaction class.
- *
- * pqxx::subtransaction is a nested transaction, i.e. one within a transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/subtransaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_SUBTRANSACTION
-#define PQXX_H_SUBTRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- */
-/// "Transaction" nested within another transaction
-/** A subtransaction can be executed inside a backend transaction, or inside
- * another subtransaction.  This can be useful when, for example, statements in
- * a transaction may harmlessly fail and you don't want them to abort the
- * entire transaction.  Here's an example of how a temporary table may be
- * dropped before re-creating it, without failing if the table did not exist:
- *
- * ```cxx
- * void do_job(connection &C)
- * {
- *   string const temptable = "fleetingtable";
- *
- *   work W(C, "do_job");
- *   do_firstpart(W);
- *
- *   // Attempt to delete our temporary table if it already existed.
- *   try
- *   {
- *     subtransaction S(W, "droptemp");
- *     S.exec0("DROP TABLE " + temptable);
- *     S.commit();
- *   }
- *   catch (undefined_table const &)
- *   {
- *     // Table did not exist.  Which is what we were hoping to achieve anyway.
- *     // Carry on without regrets.
- *   }
- *
- *   // S may have gone into a failed state and been destroyed, but the
- *   // upper-level transaction W is still fine.  We can continue to use it.
- *   W.exec0("CREATE TEMP TABLE " + temptable + "(bar integer, splat
- * varchar)");
- *
- *   do_lastpart(W);
- * }
- * ```
- *
- * (This is just an example.  If you really wanted to do drop a table without
- * an error if it doesn't exist, you'd use DROP TABLE IF EXISTS.)
- *
- * There are no isolation levels inside a transaction.  They are not needed
- * because all actions within the same backend transaction are always performed
- * sequentially anyway.
- *
- * @warning While the subtransaction is "live," you cannot execute queries or
- * open streams etc. on its parent transaction.  A transaction can have at most
- * one object of a type derived from @ref pqxx::transaction_focus active on it
- * at a time.
- */
-class PQXX_LIBEXPORT subtransaction : public transaction_focus,
-                                      public dbtransaction
-{
-public:
-  /// Nest a subtransaction nested in another transaction.
-  explicit subtransaction(dbtransaction &t, std::string_view tname = ""sv);
-
-  /// Nest a subtransaction in another subtransaction.
-  explicit subtransaction(subtransaction &t, std::string_view name = ""sv);
-
-  virtual ~subtransaction() noexcept override;
-
-private:
-  std::string quoted_name() const
-  {
-    return quote_name(transaction_focus::name());
-  }
-  virtual void do_commit() override;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/time b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/time
deleted file mode 100644
index 85df05744..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/time
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Date/time string conversions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/time.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/time.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/time.hxx
deleted file mode 100644
index effed05e0..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/time.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/** Support for date/time values.
- *
- * At the moment this supports dates, but not times.
- */
-#ifndef PQXX_H_TIME
-#define PQXX_H_TIME
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <chrono>
-#include <cstdlib>
-
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/strconv.hxx"
-
-
-#if defined(PQXX_HAVE_YEAR_MONTH_DAY)
-
-namespace pqxx
-{
-using namespace std::literals;
-
-template<>
-struct nullness<std::chrono::year_month_day>
-        : no_null<std::chrono::year_month_day>
-{};
-
-
-/// String representation for a Gregorian date in ISO-8601 format.
-/** @warning Experimental.  There may still be design problems, particularly
- * when it comes to BC years.
- *
- * PostgreSQL supports a choice of date formats, but libpqxx does not.  The
- * other formats in turn support a choice of "month before day" versus "day
- * before month," meaning that it's not necessarily known which format a given
- * date is supposed to be.  So I repeat: ISO-8601-style format only!
- *
- * Invalid dates will not convert.  This includes February 29 on non-leap
- * years, which is why it matters that `year_month_day` represents a
- * _Gregorian_ date.
- *
- * The range of years is limited.  At the time of writing, PostgreSQL 14
- * supports years from 4713 BC to 294276 AD inclusive, and C++20 supports
- * a range of 32767 BC to 32767 AD inclusive.  So in practice, years must fall
- * between 4713 BC and 32767 AD, inclusive.
- *
- * @warning Support for BC (or BCE) years is still experimental.  I still need
- * confirmation on this issue: it looks as if C++ years are astronomical years,
- * which means they have a Year Zero.  Regular BC/AD years do not have a year
- * zero, so the year 1 AD follows directly after 1 BC.
- *
- * So, what to our calendars (and to PostgreSQL) is the year "0001 BC" seems to
- * count as year "0" in a `std::chrono::year_month_day`.  The year 0001 AD is
- * still equal to 1 as you'd expect, and all AD years work normally, but all
- * years before then are shifted by one.  For instance, the year 543 BC would
- * be -542 in C++.
- */
-template<> struct PQXX_LIBEXPORT string_traits<std::chrono::year_month_day>
-{
-  [[nodiscard]] static zview
-  to_buf(char *begin, char *end, std::chrono::year_month_day const &value)
-  {
-    return generic_to_buf(begin, end, value);
-  }
-
-  static char *
-  into_buf(char *begin, char *end, std::chrono::year_month_day const &value);
-
-  [[nodiscard]] static std::chrono::year_month_day
-  from_string(std::string_view text);
-
-  [[nodiscard]] static std::size_t
-  size_buffer(std::chrono::year_month_day const &) noexcept
-  {
-    static_assert(int{(std::chrono::year::min)()} >= -99999);
-    static_assert(int{(std::chrono::year::max)()} <= 99999);
-    return 5 + 1 + 2 + 1 + 2 + std::size(s_bc) + 1;
-  }
-
-private:
-  /// The "BC" suffix for years before 1 AD.
-  static constexpr std::string_view s_bc{" BC"sv};
-};
-} // namespace pqxx
-#endif // PQXX_HAVE_YEAR_MONTH_DAY
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction
deleted file mode 100644
index a7ae39d43..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::transaction class.
- *
- * pqxx::transaction represents a standard database transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transaction.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction.hxx
deleted file mode 100644
index e90917e38..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Definition of the pqxx::transaction class.
- * pqxx::transaction represents a standard database transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transaction instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION
-#define PQXX_H_TRANSACTION
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/dbtransaction.hxx"
-
-namespace pqxx::internal
-{
-/// Helper base class for the @ref transaction class template.
-class PQXX_LIBEXPORT basic_transaction : public dbtransaction
-{
-protected:
-  basic_transaction(
-    connection &c, zview begin_command, std::string_view tname);
-  basic_transaction(connection &c, zview begin_command, std::string &&tname);
-  basic_transaction(connection &c, zview begin_command);
-
-  virtual ~basic_transaction() noexcept override = 0;
-
-private:
-  virtual void do_commit() override;
-};
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-/**
- * @ingroup transactions
- */
-//@{
-
-/// Standard back-end transaction, templatised on isolation level.
-/** This is the type you'll normally want to use to represent a transaction on
- * the database.
- *
- * Usage example: double all wages.
- *
- * ```cxx
- * extern connection C;
- * work T(C);
- * try
- * {
- *   T.exec0("UPDATE employees SET wage=wage*2");
- *   T.commit();	// NOTE: do this inside try block
- * }
- * catch (exception const &e)
- * {
- *   cerr << e.what() << endl;
- *   T.abort();		// Usually not needed; same happens when T's life ends.
- * }
- * ```
- */
-template<
-  isolation_level ISOLATION = isolation_level::read_committed,
-  write_policy READWRITE = write_policy::read_write>
-class transaction final : public internal::basic_transaction
-{
-public:
-  /// Begin a transaction.
-  /**
-   * @param c Connection for this transaction to operate on.
-   * @param tname Optional name for transaction.  Must begin with a letter and
-   * may contain letters and digits only.
-   */
-  transaction(connection &c, std::string_view tname) :
-          internal::basic_transaction{
-            c, internal::begin_cmd<ISOLATION, READWRITE>, tname}
-  {}
-
-  /// Begin a transaction.
-  /**
-   * @param c Connection for this transaction to operate on.
-   * may contain letters and digits only.
-   */
-  explicit transaction(connection &c) :
-          internal::basic_transaction{
-            c, internal::begin_cmd<ISOLATION, READWRITE>}
-  {}
-
-  virtual ~transaction() noexcept override { close(); }
-};
-
-
-/// The default transaction type.
-using work = transaction<>;
-
-/// Read-only transaction.
-using read_transaction =
-  transaction<isolation_level::read_committed, write_policy::read_only>;
-
-//@}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_base b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_base
deleted file mode 100644
index c39219aac..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_base
+++ /dev/null
@@ -1,9 +0,0 @@
-/** Base for the transaction classes.
- *
- * pqxx::transaction_base defines the interface for any abstract class that
- * represents a database transaction.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transaction_base.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_base.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_base.hxx
deleted file mode 100644
index 4363cc56a..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_base.hxx
+++ /dev/null
@@ -1,810 +0,0 @@
-/* Common code and definitions for the transaction classes.
- *
- * pqxx::transaction_base defines the interface for any abstract class that
- * represents a database transaction.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transaction_base instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION_BASE
-#define PQXX_H_TRANSACTION_BASE
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <string_view>
-#include <utility>
-
-/* End-user programs need not include this file, unless they define their own
- * transaction classes.  This is not something the typical program should want
- * to do.
- *
- * However, reading this file is worthwhile because it defines the public
- * interface for the available transaction classes such as transaction and
- * nontransaction.
- */
-
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/isolation.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/util.hxx"
-
-namespace pqxx::internal::gate
-{
-class transaction_subtransaction;
-class transaction_sql_cursor;
-class transaction_stream_to;
-class transaction_transaction_focus;
-} // namespace pqxx::internal::gate
-
-
-namespace pqxx
-{
-using namespace std::literals;
-
-
-class transaction_focus;
-
-
-/**
- * @defgroup transactions Transaction classes
- *
- * All database access goes through instances of these classes.
- * However, not all implementations of this interface need to provide full
- * transactional integrity.
- *
- * Several implementations of this interface are shipped with libpqxx,
- * including the plain transaction class, the entirely unprotected
- * nontransaction, and the more cautious robusttransaction.
- */
-
-/// Interface definition (and common code) for "transaction" classes.
-/**
- * @ingroup transactions
- *
- * Abstract base class for all transaction types.
- */
-class PQXX_LIBEXPORT PQXX_NOVTABLE transaction_base
-{
-public:
-  transaction_base() = delete;
-  transaction_base(transaction_base const &) = delete;
-  transaction_base(transaction_base &&) = delete;
-  transaction_base &operator=(transaction_base const &) = delete;
-  transaction_base &operator=(transaction_base &&) = delete;
-
-  virtual ~transaction_base() = 0;
-
-  /// Commit the transaction.
-  /** Make the effects of this transaction definite.  If you destroy a
-   * transaction without invoking its @ref commit() first, that will implicitly
-   * abort it.  (For the @ref nontransaction class though, "commit" and "abort"
-   * really don't do anything, hence its name.)
-   *
-   * There is, however, a minute risk that you might lose your connection to
-   * the database at just the wrong moment here.  In that case, libpqxx may be
-   * unable to determine whether the database was able to complete the
-   * transaction, or had to roll it back.  In that scenario, @ref commit() will
-   * throw an in_doubt_error.  There is a different transaction class called
-   * @ref robusttransaction which takes some special precautions to reduce this
-   * risk.
-   */
-  void commit();
-
-  /// Abort the transaction.
-  /** No special effort is required to call this function; it will be called
-   * implicitly when the transaction is destructed.
-   */
-  void abort();
-
-  /**
-   * @ingroup escaping-functions
-   *
-   * Use these when writing SQL queries that incorporate C++ values as SQL
-   * constants.
-   *
-   * The functions you see here are just convenience shortcuts to the same
-   * functions on the connection object.
-   */
-  //@{
-  /// Escape string for use as SQL string literal in this transaction.
-  template<typename... ARGS> [[nodiscard]] auto esc(ARGS &&...args) const
-  {
-    return conn().esc(std::forward<ARGS>(args)...);
-  }
-
-  /// Escape binary data for use as SQL string literal in this transaction.
-  /** Raw, binary data is treated differently from regular strings.  Binary
-   * strings are never interpreted as text, so they may safely include byte
-   * values or byte sequences that don't happen to represent valid characters
-   * in the character encoding being used.
-   *
-   * The binary string does not stop at the first zero byte, as is the case
-   * with textual strings.  Instead, it may contain zero bytes anywhere.  If
-   * it happens to contain bytes that look like quote characters, or other
-   * things that can disrupt their use in SQL queries, they will be replaced
-   * with special escape sequences.
-   */
-  template<typename... ARGS> [[nodiscard]] auto esc_raw(ARGS &&...args) const
-  {
-    return conn().esc_raw(std::forward<ARGS>(args)...);
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(zview text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return conn().unesc_raw(text);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard]] std::basic_string<std::byte> unesc_bin(zview text)
-  {
-    return conn().unesc_bin(text);
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard, deprecated("Use unesc_bin() instead.")]] std::string
-  unesc_raw(char const *text) const
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return conn().unesc_raw(text);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Unescape binary data, e.g. from a table field or notification payload.
-  /** Takes a binary string as escaped by PostgreSQL, and returns a restored
-   * copy of the original binary data.
-   */
-  [[nodiscard]] std::basic_string<std::byte> unesc_bin(char const text[])
-  {
-    return conn().unesc_bin(text);
-  }
-
-  /// Represent object as SQL string, including quoting & escaping.
-  /** Nulls are recognized and represented as SQL nulls. */
-  template<typename T> [[nodiscard]] std::string quote(T const &t) const
-  {
-    return conn().quote(t);
-  }
-
-  [[deprecated(
-    "Use std::basic_string<std::byte> instead of binarystring.")]] std::string
-  quote(binarystring const &t) const
-  {
-    return conn().quote(t.bytes_view());
-  }
-
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(unsigned char const bin[], std::size_t len) const
-  {
-    return quote(binary_cast(bin, len));
-  }
-
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  [[deprecated("Use quote(std::basic_string_view<std::byte>).")]] std::string
-  quote_raw(zview bin) const;
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  /// Binary-escape and quote a binary string for use as an SQL constant.
-  /** For binary data you can also just use @ref quote(data). */
-  template<binary DATA>
-  [[nodiscard]] std::string quote_raw(DATA const &data) const
-  {
-    return conn().quote_raw(data);
-  }
-#endif
-
-  /// Escape an SQL identifier for use in a query.
-  [[nodiscard]] std::string quote_name(std::string_view identifier) const
-  {
-    return conn().quote_name(identifier);
-  }
-
-  /// Escape string for literal LIKE match.
-  [[nodiscard]] std::string
-  esc_like(std::string_view bin, char escape_char = '\\') const
-  {
-    return conn().esc_like(bin, escape_char);
-  }
-  //@}
-
-  /**
-   * @name Command execution
-   *
-   * There are many functions for executing (or "performing") a command (or
-   * "query").  This is the most fundamental thing you can do with the library,
-   * and you always do it from a transaction class.
-   *
-   * Command execution can throw many types of exception, including sql_error,
-   * broken_connection, and many sql_error subtypes such as
-   * feature_not_supported or insufficient_privilege.  But any exception thrown
-   * by the C++ standard library may also occur here.  All exceptions you will
-   * see libpqxx throw are derived from std::exception.
-   *
-   * One unusual feature in libpqxx is that you can give your query a name or
-   * description.  This does not mean anything to the database, but sometimes
-   * it can help libpqxx produce more helpful error messages, making problems
-   * in your code easier to debug.
-   *
-   * Many of the execution functions used to accept a `desc` argument, a
-   * human-readable description of the statement for use in error messages.
-   * This could make failures easier to debug.  Future versions will use
-   * C++20's `std::source_location` to identify the failing statement.
-   */
-  //@{
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @param desc Optional identifier for query, to help pinpoint SQL errors.
-   * @return A result set describing the query's or command's result.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec(std::string_view query, std::string_view desc);
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @return A result set describing the query's or command's result.
-   */
-  result exec(std::string_view query)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec(query, std::string_view{});
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute a command.
-  /**
-   * @param query Query or command to execute.
-   * @param desc Optional identifier for query, to help pinpoint SQL errors.
-   * @return A result set describing the query's or command's result.
-   */
-  [[deprecated(
-    "Pass your query as a std::string_view, not stringstream.")]] result
-  exec(std::stringstream const &query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec(query.str(), desc);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command, which should return zero rows of data.
-  /** Works like @ref exec, but fails if the result contains data.  It still
-   * returns a result, however, which may contain useful metadata.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec0(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(0, query, desc);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command, which should return zero rows of data.
-  /** Works like @ref exec, but fails if the result contains data.  It still
-   * returns a result, however, which may contain useful metadata.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  result exec0(zview query) { return exec_n(0, query); }
-
-  /// Execute command returning a single row of data.
-  /** Works like @ref exec, but requires the result to contain exactly one row.
-   * The row can be addressed directly, without the need to find the first row
-   * in a result set.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] row
-  exec1(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(1, query, desc).front();
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Execute command returning a single row of data.
-  /** Works like @ref exec, but requires the result to contain exactly one row.
-   * The row can be addressed directly, without the need to find the first row
-   * in a result set.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  row exec1(zview query) { return exec_n(1, query).front(); }
-
-  /// Execute command, expect given number of rows.
-  /** Works like @ref exec, but checks that the result has exactly the expected
-   * number of rows.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  [[deprecated("The desc parameter is going away.")]] result
-  exec_n(result::size_type rows, zview query, std::string_view desc);
-
-  /// Execute command, expect given number of rows.
-  /** Works like @ref exec, but checks that the result has exactly the expected
-   * number of rows.
-   *
-   * @throw unexpected_rows If the query returned the wrong number of rows.
-   */
-  result exec_n(result::size_type rows, zview query)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return exec_n(rows, query, std::string_view{});
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-
-  /// Perform query, expecting exactly 1 row with 1 field, and convert it.
-  /** This is convenience shorthand for querying exactly one value from the
-   * database.  It returns that value, converted to the type you specify.
-   */
-  template<typename TYPE>
-  [[deprecated("The desc parameter is going away.")]] TYPE
-  query_value(zview query, std::string_view desc)
-  {
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-    row const r{exec1(query, desc)};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-    if (std::size(r) != 1)
-      throw usage_error{internal::concat(
-        "Queried single value from result with ", std::size(r), " columns.")};
-    return r[0].as<TYPE>();
-  }
-
-  /// Perform query, expecting exactly 1 row with 1 field, and convert it.
-  /** This is convenience shorthand for querying exactly one value from the
-   * database.  It returns that value, converted to the type you specify.
-   */
-  template<typename TYPE> TYPE query_value(zview query)
-  {
-    row const r{exec1(query)};
-    if (std::size(r) != 1)
-      throw usage_error{internal::concat(
-        "Queried single value from result with ", std::size(r), " columns.")};
-    return r[0].as<TYPE>();
-  }
-
-  /// Execute a query, and loop over the results row by row.
-  /** Converts the rows to `std::tuple`, of the column types you specify.
-   *
-   * Use this with a range-based "for" loop.  It executes the query, and
-   * directly maps the resulting rows onto a `std::tuple` of the types you
-   * specify.  It starts before all the data from the server is in, so if your
-   * network connection to the server breaks while you're iterating, you'll get
-   * an exception partway through.
-   *
-   * The stream lives entirely within the lifetime of the transaction.  Make
-   * sure you destroy the stream before you destroy the transaction.  Either
-   * iterate the stream all the way to the end, or destroy first the stream
-   * and then the transaction without touching either in any other way.  Until
-   * the stream has finished, the transaction is in a special state where it
-   * cannot execute queries.
-   *
-   * As a special case, tuple may contain `std::string_view` fields, but the
-   * strings to which they point will only remain valid until you extract the
-   * next row.  After that, the memory holding the string may be overwritten or
-   * deallocated.
-   *
-   * If any of the columns can be null, and the C++ type to which it translates
-   * does not have a null value, wrap the type in `std::optional` (or if
-   * you prefer, `std::shared_ptr` or `std::unique_ptr)`.  These templates
-   * do recognise null values, and libpqxx will know how to convert to them.
-   *
-   * The connection is in a special state until the iteration finishes.  So if
-   * it does not finish due to a `break` or a `return` or an exception, then
-   * the entire connection becomes effectively unusable.
-   *
-   * Querying in this way is faster than the `exec()` methods for larger
-   * results (but slower for small ones).  You can start processing rows before
-   * the full result is in.  Also, `stream()` scales better in terms of memory
-   * usage.  Where @ref exec() reads the entire result into memory at once,
-   * `stream()` will read and process one row at at a time.
-   *
-   * Your query executes as part of a COPY command, not as a stand-alone query,
-   * so there are limitations to what you can do in the query.  It can be
-   * either a SELECT or VALUES query; or an INSERT, UPDATE, or DELETE with a
-   * RETURNING clause.  See the documentation for PostgreSQL's COPY command for
-   * the details:
-   *
-   *     https://www.postgresql.org/docs/current/sql-copy.html
-   *
-   * Iterating in this way does require each of the field types you pass to be
-   * default-constructible, copy-constructible, and assignable.  These
-   * requirements may be loosened once libpqxx moves on to C++20.
-   */
-  template<typename... TYPE>
-  [[nodiscard]] auto stream(std::string_view query) &
-  {
-    // Tricky: std::make_unique() supports constructors but not RVO functions.
-    return pqxx::internal::owning_stream_input_iteration<TYPE...>{
-      std::unique_ptr<stream_from>{
-        new stream_from{stream_from::query(*this, query)}}};
-  }
-
-  // C++20: Concept like std::invocable, but without specifying param types.
-  /// Perform a streaming query, and for each result row, call `func`.
-  /** Here, `func` can be a function, a `std::function`, a lambda, or an
-   * object that supports the function call operator.  Of course `func` must
-   * have an unambiguous signature; it can't be overloaded or generic.
-   *
-   * The `for_each` function executes `query` in a stream using
-   * @ref pqxx::stream_from.  Every time a row of data comes in from the
-   * server, it converts the row's fields to the types of `func`'s respective
-   * parameters, and calls `func` with those values.
-   *
-   * This will not work for all queries, but straightforward `SELECT` and
-   * `UPDATE ... RETURNING` queries should work.  Consult the documentation for
-   * @ref pqxx::stream_from and PostgreSQL's underlying `COPY` command for the
-   * full details.
-   *
-   * Streaming a query like this is likely to be slower than the @ref exec()
-   * functions for small result sets, but faster for large result sets.  So if
-   * performance matters, you'll want to use `for_each` if you query large
-   * amounts of data, but not if you do lots of queries with small outputs.
-   */
-  template<typename CALLABLE>
-  inline auto for_each(std::string_view query, CALLABLE &&func)
-  {
-    using param_types =
-      pqxx::internal::strip_types_t<pqxx::internal::args_t<CALLABLE>>;
-    param_types const *const sample{nullptr};
-    auto data_stream{stream_like(query, sample)};
-    for (auto const &fields : data_stream) std::apply(func, fields);
-  }
-
-  /**
-   * @name Parameterized statements
-   *
-   * You'll often need parameters in the queries you execute: "select the
-   * car with this licence plate."  If the parameter is a string, you need to
-   * quote it and escape any special characters inside it, or it may become a
-   * target for an SQL injection attack.  If it's an integer (for example),
-   * you need to convert it to a string, but in the database's format, without
-   * locale-specific niceties like "," separators between the thousands.
-   *
-   * Parameterised statements are an easier and safer way to do this.  They're
-   * like prepared statements, but for a single use.  You don't need to name
-   * them, and you don't need to prepare them first.
-   *
-   * Your query will include placeholders like `$1` and `$2` etc. in the places
-   * where you want the arguments to go.  Then, you pass the argument values
-   * and the actual query is constructed for you.
-   *
-   * Pass the exact right number of parameters, and in the right order.  The
-   * parameters in the query don't have to be neatly ordered from `$1` to
-   * `$2` to `$3` - but you must pass the argument for `$1` first, the one
-   * for `$2` second, etc.
-   *
-   * @warning Beware of "nul" bytes.  Any string you pass as a parameter will
-   * end at the first char with value zero.  If you pass a string that contains
-   * a zero byte, the last byte in the value will be the one just before the
-   * zero.
-   */
-  //@{
-  /// Execute an SQL statement with parameters.
-  template<typename... Args> result exec_params(zview query, Args &&...args)
-  {
-    params pp(args...);
-    return internal_exec_params(query, pp.make_c_params());
-  }
-
-  // Execute parameterised statement, expect a single-row result.
-  /** @throw unexpected_rows if the result does not consist of exactly one row.
-   */
-  template<typename... Args> row exec_params1(zview query, Args &&...args)
-  {
-    return exec_params_n(1, query, std::forward<Args>(args)...).front();
-  }
-
-  // Execute parameterised statement, expect a result with zero rows.
-  /** @throw unexpected_rows if the result contains rows.
-   */
-  template<typename... Args> result exec_params0(zview query, Args &&...args)
-  {
-    return exec_params_n(0, query, std::forward<Args>(args)...);
-  }
-
-  // Execute parameterised statement, expect exactly a given number of rows.
-  /** @throw unexpected_rows if the result contains the wrong number of rows.
-   */
-  template<typename... Args>
-  result exec_params_n(std::size_t rows, zview query, Args &&...args)
-  {
-    auto const r{exec_params(query, std::forward<Args>(args)...)};
-    check_rowcount_params(rows, std::size(r));
-    return r;
-  }
-  //@}
-
-  /**
-   * @name Prepared statements
-   *
-   * These are very similar to parameterised statements.  The difference is
-   * that you prepare them in advance, giving them identifying names.  You can
-   * then call them by these names, passing in the argument values appropriate
-   * for that call.
-   *
-   * You prepare a statement on the connection, using
-   * @ref pqxx::connection::prepare().  But you then call the statement in a
-   * transaction, using the functions you see here.
-   *
-   * Never try to prepare, execute, or unprepare a prepared statement manually
-   * using direct SQL queries when you also use the libpqxx equivalents.  For
-   * any given statement, either prepare, manage, and execute it through the
-   * dedicated libpqxx functions; or do it all directly in SQL.  Don't mix the
-   * two, or the code may get confused.
-   *
-   * See \ref prepared for a full discussion.
-   *
-   * @warning Beware of "nul" bytes.  Any string you pass as a parameter will
-   * end at the first char with value zero.  If you pass a string that contains
-   * a zero byte, the last byte in the value will be the one just before the
-   * zero.  If you need a zero byte, you're dealing with binary strings, not
-   * regular strings.  Represent binary strings on the SQL side as `BYTEA`
-   * (or as large objects).  On the C++ side, use types like
-   * `std::basic_string<std::byte>` or `std::basic_string_view<std::byte>`
-   * or (in C++20) `std::vector<std::byte>`.  Also, consider large objects on
-   * the SQL side and @ref blob on the C++ side.
-   */
-  //@{
-
-  /// Execute a prepared statement, with optional arguments.
-  template<typename... Args>
-  result exec_prepared(zview statement, Args &&...args)
-  {
-    params pp(args...);
-    return internal_exec_prepared(statement, pp.make_c_params());
-  }
-
-  /// Execute a prepared statement, and expect a single-row result.
-  /** @throw pqxx::unexpected_rows if the result was not exactly 1 row.
-   */
-  template<typename... Args>
-  row exec_prepared1(zview statement, Args &&...args)
-  {
-    return exec_prepared_n(1, statement, std::forward<Args>(args)...).front();
-  }
-
-  /// Execute a prepared statement, and expect a result with zero rows.
-  /** @throw pqxx::unexpected_rows if the result contained rows.
-   */
-  template<typename... Args>
-  result exec_prepared0(zview statement, Args &&...args)
-  {
-    return exec_prepared_n(0, statement, std::forward<Args>(args)...);
-  }
-
-  /// Execute a prepared statement, expect a result with given number of rows.
-  /** @throw pqxx::unexpected_rows if the result did not contain exactly the
-   *  given number of rows.
-   */
-  template<typename... Args>
-  result
-  exec_prepared_n(result::size_type rows, zview statement, Args &&...args)
-  {
-    auto const r{exec_prepared(statement, std::forward<Args>(args)...)};
-    check_rowcount_prepared(statement, rows, std::size(r));
-    return r;
-  }
-
-  //@}
-
-  /**
-   * @name Error/warning output
-   */
-  //@{
-  /// Have connection process a warning message.
-  void process_notice(char const msg[]) const { m_conn.process_notice(msg); }
-  /// Have connection process a warning message.
-  void process_notice(zview msg) const { m_conn.process_notice(msg); }
-  //@}
-
-  /// The connection in which this transaction lives.
-  [[nodiscard]] constexpr connection &conn() const noexcept { return m_conn; }
-
-  /// Set session variable using SQL "SET" command.
-  /** @deprecated To set a transaction-local variable, execute an SQL `SET`
-   * command.  To set a session variable, use the connection's
-   * @ref set_session_var function.
-   *
-   * @warning When setting a string value, you must make sure that the string
-   * is "safe."  If you call @ref quote() on the string, it will return a
-   * safely escaped and quoted version for use as an SQL literal.
-   *
-   * @warning This function executes SQL.  Do not try to set or get variables
-   * while a pipeline or table stream is active.
-   *
-   * @param var The variable to set.
-   * @param value The new value to store in the variable.  This can be any SQL
-   * expression.
-   */
-  [[deprecated(
-    "Set transaction-local variables using SQL SET statements.")]] void
-  set_variable(std::string_view var, std::string_view value);
-
-  /// Read session variable using SQL "SHOW" command.
-  /** @warning This executes SQL.  Do not try to set or get variables while a
-   * pipeline or table stream is active.
-   */
-  [[deprecated("Read variables using SQL SHOW statements.")]] std::string
-    get_variable(std::string_view);
-
-  // C++20: constexpr.
-  /// Transaction name, if you passed one to the constructor; or empty string.
-  [[nodiscard]] std::string_view name() const &noexcept { return m_name; }
-
-protected:
-  /// Create a transaction (to be called by implementation classes only).
-  /** The name, if nonempty, must begin with a letter and may contain letters
-   * and digits only.
-   */
-  transaction_base(
-    connection &c, std::string_view tname,
-    std::shared_ptr<std::string> rollback_cmd) :
-          m_conn{c}, m_name{tname}, m_rollback_cmd{rollback_cmd}
-  {}
-
-  /// Create a transaction (to be called by implementation classes only).
-  /** Its rollback command will be "ROLLBACK".
-   *
-   * The name, if nonempty, must begin with a letter and may contain letters
-   * and digits only.
-   */
-  transaction_base(connection &c, std::string_view tname);
-
-  /// Create a transaction (to be called by implementation classes only).
-  explicit transaction_base(connection &c);
-
-  /// Register this transaction with the connection.
-  void register_transaction();
-
-  /// End transaction.  To be called by implementing class' destructor.
-  void close() noexcept;
-
-  /// To be implemented by derived implementation class: commit transaction.
-  virtual void do_commit() = 0;
-
-  /// Transaction type-specific way of aborting a transaction.
-  /** @warning This will become "final", since this function can be called
-   * from the implementing class destructor.
-   */
-  virtual void do_abort();
-
-  /// Set the rollback command.
-  void set_rollback_cmd(std::shared_ptr<std::string> cmd)
-  {
-    m_rollback_cmd = cmd;
-  }
-
-  /// Execute query on connection directly.
-  result direct_exec(std::string_view, std::string_view desc = ""sv);
-  result
-  direct_exec(std::shared_ptr<std::string>, std::string_view desc = ""sv);
-
-private:
-  enum class status
-  {
-    active,
-    aborted,
-    committed,
-    in_doubt
-  };
-
-  PQXX_PRIVATE void check_pending_error();
-
-  result
-  internal_exec_prepared(zview statement, internal::c_params const &args);
-
-  result internal_exec_params(zview query, internal::c_params const &args);
-
-  /// Throw unexpected_rows if prepared statement returned wrong no. of rows.
-  void check_rowcount_prepared(
-    zview statement, result::size_type expected_rows,
-    result::size_type actual_rows);
-
-  /// Throw unexpected_rows if wrong row count from parameterised statement.
-  void
-  check_rowcount_params(std::size_t expected_rows, std::size_t actual_rows);
-
-  /// Describe this transaction to humans, e.g. "transaction 'foo'".
-  [[nodiscard]] std::string description() const;
-
-  friend class pqxx::internal::gate::transaction_transaction_focus;
-  PQXX_PRIVATE void register_focus(transaction_focus *);
-  PQXX_PRIVATE void unregister_focus(transaction_focus *) noexcept;
-  PQXX_PRIVATE void register_pending_error(zview) noexcept;
-  PQXX_PRIVATE void register_pending_error(std::string &&) noexcept;
-
-  /// Like @ref stream(), but takes a tuple rather than a parameter pack.
-  template<typename... ARGS>
-  auto stream_like(std::string_view query, std::tuple<ARGS...> const *)
-  {
-    return stream<ARGS...>(query);
-  }
-
-  connection &m_conn;
-
-  /// Current "focus": a pipeline, a nested transaction, a stream...
-  /** This pointer is used for only one purpose: sanity checks against mistakes
-   * such as opening one while another is still active.
-   */
-  transaction_focus const *m_focus = nullptr;
-
-  status m_status = status::active;
-  bool m_registered = false;
-  std::string m_name;
-  std::string m_pending_error;
-
-  /// SQL command for aborting this type of transaction.
-  std::shared_ptr<std::string> m_rollback_cmd;
-
-  static constexpr std::string_view s_type_name{"transaction"sv};
-};
-
-
-// C++20: Can borrowed_range help?
-/// Forbidden specialisation: underlying buffer immediately goes out of scope.
-template<>
-std::string_view transaction_base::query_value<std::string_view>(
-  zview query, std::string_view desc) = delete;
-/// Forbidden specialisation: underlying buffer immediately goes out of scope.
-template<>
-zview transaction_base::query_value<zview>(
-  zview query, std::string_view desc) = delete;
-
-} // namespace pqxx
-
-
-namespace pqxx::internal
-{
-/// The SQL command for starting a given type of transaction.
-template<pqxx::isolation_level isolation, pqxx::write_policy rw>
-extern const zview begin_cmd;
-
-// These are not static members, so "constexpr" does not imply "inline".
-template<>
-inline constexpr zview begin_cmd<read_committed, write_policy::read_write>{
-  "BEGIN"_zv};
-template<>
-inline constexpr zview begin_cmd<read_committed, write_policy::read_only>{
-  "BEGIN READ ONLY"_zv};
-template<>
-inline constexpr zview begin_cmd<repeatable_read, write_policy::read_write>{
-  "BEGIN ISOLATION LEVEL REPEATABLE READ"_zv};
-template<>
-inline constexpr zview begin_cmd<repeatable_read, write_policy::read_only>{
-  "BEGIN ISOLATION LEVEL REPEATABLE READ READ ONLY"_zv};
-template<>
-inline constexpr zview begin_cmd<serializable, write_policy::read_write>{
-  "BEGIN ISOLATION LEVEL SERIALIZABLE"_zv};
-template<>
-inline constexpr zview begin_cmd<serializable, write_policy::read_only>{
-  "BEGIN ISOLATION LEVEL SERIALIZABLE READ ONLY"_zv};
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_focus b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_focus
deleted file mode 100644
index fe78a9bcc..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_focus
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Transaction focus: types which monopolise a transaction's attention.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_focus.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_focus.hxx
deleted file mode 100644
index 0707e3cc4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transaction_focus.hxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/** Transaction focus: types which monopolise a transaction's attention.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTION_FOCUS
-#define PQXX_H_TRANSACTION_FOCUS
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include "pqxx/util.hxx"
-
-namespace pqxx
-{
-/// Base class for things that monopolise a transaction's attention.
-/** You probably won't need to use this class.  But it can be useful to _know_
- * that a given libpqxx class is derived from it.
- *
- * Pipelines, SQL statements, and data streams are examples of classes derived
- * from `transaction_focus`.  For any given transaction, only one object of
- * such a class can be active at any given time.
- */
-class PQXX_LIBEXPORT transaction_focus
-{
-public:
-  transaction_focus(
-    transaction_base &t, std::string_view cname, std::string_view oname) :
-          m_trans{t}, m_classname{cname}, m_name{oname}
-  {}
-
-  transaction_focus(
-    transaction_base &t, std::string_view cname, std::string &&oname) :
-          m_trans{t}, m_classname{cname}, m_name{std::move(oname)}
-  {}
-
-  transaction_focus(transaction_base &t, std::string_view cname) :
-          m_trans{t}, m_classname{cname}
-  {}
-
-  transaction_focus() = delete;
-  transaction_focus(transaction_focus const &) = delete;
-  transaction_focus &operator=(transaction_focus const &) = delete;
-
-  /// Class name, for human consumption.
-  [[nodiscard]] constexpr std::string_view classname() const noexcept
-  {
-    return m_classname;
-  }
-
-  /// Name for this object, if the caller passed one; empty string otherwise.
-  [[nodiscard]] std::string_view name() const &noexcept { return m_name; }
-
-  [[nodiscard]] std::string description() const
-  {
-    return pqxx::internal::describe_object(m_classname, m_name);
-  }
-
-  /// Can't move a transaction_focus.
-  /** Moving the transaction_focus would break the transaction's reference back
-   * to the object.
-   */
-  transaction_focus(transaction_focus &&) = delete;
-
-  /// Can't move a transaction_focus.
-  /** Moving the transaction_focus would break the transaction's reference back
-   * to the object.
-   */
-  transaction_focus &operator=(transaction_focus &&) = delete;
-
-protected:
-  void register_me();
-  void unregister_me() noexcept;
-  void reg_pending_error(std::string const &) noexcept;
-  bool registered() const noexcept { return m_registered; }
-
-  transaction_base &m_trans;
-
-private:
-  bool m_registered = false;
-  std::string_view m_classname;
-  std::string m_name;
-};
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transactor b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transactor
deleted file mode 100644
index 29d1b9640..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transactor
+++ /dev/null
@@ -1,8 +0,0 @@
-/** pqxx::transactor class.
- *
- * pqxx::transactor is a framework-style wrapper for safe transactions.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/transactor.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transactor.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transactor.hxx
deleted file mode 100644
index eefd04ba1..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/transactor.hxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Transactor framework, a wrapper for safely retryable transactions.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/transactor instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TRANSACTOR
-#define PQXX_H_TRANSACTOR
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <functional>
-#include <type_traits>
-
-#include "pqxx/connection.hxx"
-#include "pqxx/transaction.hxx"
-
-namespace pqxx
-{
-/**
- * @defgroup transactor Transactor framework
- *
- * Sometimes a transaction can fail for completely transient reasons, such as a
- * conflict with another transaction in SERIALIZABLE isolation.  The right way
- * to handle those failures is often just to re-run the transaction from
- * scratch.
- *
- * For example, your REST API might be handling each HTTP request in its own
- * database transaction, and if this kind of transient failure happens, you
- * simply want to "replay" the whole request, in a fresh transaction.
- *
- * You won't necessarily want to execute the exact same SQL commands with the
- * exact same data.  Some of your SQL statements may depend on state that can
- * vary between retries.  Data in the database may already have changed, for
- * instance.  So instead of dumbly replaying the SQL, you re-run the same
- * application code that produced those SQL commands, from the start.
- *
- * The transactor framework makes it a little easier for you to do this safely,
- * and avoid typical pitfalls.  You encapsulate the work that you want to do
- * into a callable that you pass to the @ref perform function.
- *
- * Here's how it works.  You write your transaction code as a lambda or
- * function, which creates its own transaction object, does its work, and
- * commits at the end.  You pass that callback to @ref pqxx::perform, which
- * runs it for you.
- *
- * If there's a failure inside your callback, there will be an exception.  Your
- * transaction object goes out of scope and gets destroyed, so that it aborts
- * implicitly.  Seeing this, @ref perform tries running your callback again. It
- * stops doing that when the callback succeeds, or when it has failed too many
- * times, or when there's an error that leaves the database in an unknown
- * state, such as a lost connection just while we're waiting for the database
- * to confirm a commit.  It all depends on the type of exception.
- *
- * The callback takes no arguments.  If you're using lambdas, the easy way to
- * pass arguments is for the lambda to "capture" them from your variables.  Or,
- * if you're using functions, you may want to use `std::bind`.
- *
- * Once your callback succeeds, it can return a result, and @ref perform will
- * return that result back to you.
- */
-//@{
-
-/// Simple way to execute a transaction with automatic retry.
-/**
- * Executes your transaction code as a callback.  Repeats it until it completes
- * normally, or it throws an error other than the few libpqxx-generated
- * exceptions that the framework understands, or after a given number of failed
- * attempts, or if the transaction ends in an "in-doubt" state.
- *
- * (An in-doubt state is one where libpqxx cannot determine whether the server
- * finally committed a transaction or not.  This can happen if the network
- * connection to the server is lost just while we're waiting for its reply to
- * a "commit" statement.  The server may have completed the commit, or not, but
- * it can't tell you because there's no longer a connection.
- *
- * Using this still takes a bit of care.  If your callback makes use of data
- * from the database, you'll probably have to query that data within your
- * callback.  If the attempt to perform your callback fails, and the framework
- * tries again, you'll be in a new transaction and the data in the database may
- * have changed under your feet.
- *
- * Also be careful about changing variables or data structures from within
- * your callback.  The run may still fail, and perhaps get run again.  The
- * ideal way to do it (in most cases) is to return your result from your
- * callback, and change your program's data state only after @ref perform
- * completes successfully.
- *
- * @param callback Transaction code that can be called with no arguments.
- * @param attempts Maximum number of times to attempt performing callback.
- *	Must be greater than zero.
- * @return Whatever your callback returns.
- */
-template<typename TRANSACTION_CALLBACK>
-inline auto perform(TRANSACTION_CALLBACK &&callback, int attempts = 3)
-  -> std::invoke_result_t<TRANSACTION_CALLBACK>
-{
-  if (attempts <= 0)
-    throw std::invalid_argument{
-      "Zero or negative number of attempts passed to pqxx::perform()."};
-
-  for (; attempts > 0; --attempts)
-  {
-    try
-    {
-      return std::invoke(callback);
-    }
-    catch (in_doubt_error const &)
-    {
-      // Not sure whether transaction went through or not.  The last thing in
-      // the world that we should do now is try again!
-      throw;
-    }
-    catch (statement_completion_unknown const &)
-    {
-      // Not sure whether our last statement succeeded.  Don't risk running it
-      // again.
-      throw;
-    }
-    catch (broken_connection const &)
-    {
-      // Connection failed.  May be worth retrying, if the transactor opens its
-      // own connection.
-      if (attempts <= 1)
-        throw;
-      continue;
-    }
-    catch (transaction_rollback const &)
-    {
-      // Some error that may well be transient, such as serialization failure
-      // or deadlock.  Worth retrying.
-      if (attempts <= 1)
-        throw;
-      continue;
-    }
-  }
-  throw pqxx::internal_error{"No outcome reached on perform()."};
-}
-} // namespace pqxx
-//@}
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/types b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/types
deleted file mode 100644
index 23a5caae1..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/types
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Basic typedefs and forward declarations.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/types.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/types.hxx
deleted file mode 100644
index f95b598f8..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/types.hxx
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Basic type aliases and forward declarations.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_TYPES
-#define PQXX_H_TYPES
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cstddef>
-#include <cstdint>
-#include <iterator>
-
-#if defined(PQXX_HAVE_CONCEPTS) && __has_include(<ranges>)
-#  include <ranges>
-#endif
-
-
-namespace pqxx
-{
-/// Number of rows in a result set.
-using result_size_type = int;
-
-/// Difference between result sizes.
-using result_difference_type = int;
-
-/// Number of fields in a row of database data.
-using row_size_type = int;
-
-/// Difference between row sizes.
-using row_difference_type = int;
-
-/// Number of bytes in a field of database data.
-using field_size_type = std::size_t;
-
-/// Number of bytes in a large object.
-using large_object_size_type = int64_t;
-
-
-// Forward declarations, to help break compilation dependencies.
-// These won't necessarily include all classes in libpqxx.
-class binarystring;
-class connection;
-class const_result_iterator;
-class const_reverse_result_iterator;
-class const_reverse_row_iterator;
-class const_row_iterator;
-class dbtransaction;
-class field;
-class largeobjectaccess;
-class notification_receiver;
-struct range_error;
-class result;
-class row;
-class stream_from;
-class transaction_base;
-
-/// Marker for @ref stream_from constructors: "stream from table."
-/** @deprecated Use @ref stream_from::table() instead.
- */
-struct from_table_t
-{};
-
-/// Marker for @ref stream_from constructors: "stream from query."
-/** @deprecated Use @ref stream_from::query() instead.
- */
-struct from_query_t
-{};
-
-
-/// Format code: is data text or binary?
-/** Binary-compatible with libpq's format codes.
- */
-enum class format : int
-{
-  text = 0,
-  binary = 1,
-};
-
-
-/// Remove any constness, volatile, and reference-ness from a type.
-/** @deprecated In C++20 we'll replace this with std::remove_cvref.
- */
-template<typename TYPE>
-using strip_t = std::remove_cv_t<std::remove_reference_t<TYPE>>;
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// The type of a container's elements.
-/** At the time of writing there's a similar thing in `std::experimental`,
- * which we may or may not end up using for this.
- */
-template<std::ranges::range CONTAINER>
-using value_type = strip_t<decltype(*std::begin(std::declval<CONTAINER>()))>;
-#else  // PQXX_HAVE_CONCEPTS
-/// The type of a container's elements.
-/** At the time of writing there's a similar thing in `std::experimental`,
- * which we may or may not end up using for this.
- */
-template<typename CONTAINER>
-using value_type = strip_t<decltype(*std::begin(std::declval<CONTAINER>()))>;
-#endif // PQXX_HAVE_CONCEPTS
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// Concept: Any type that we can read as a string of `char`.
-template<typename STRING>
-concept char_string = std::ranges::contiguous_range<STRING> and
-                      std::same_as < strip_t<value_type<STRING>>,
-char > ;
-
-/// Concept: Anything we can iterate to get things we can read as strings.
-template<typename RANGE>
-concept char_strings =
-  std::ranges::range<RANGE> and char_string<strip_t<value_type<RANGE>>>;
-
-/// Concept: Anything we might want to treat as binary data.
-template<typename DATA>
-concept potential_binary = std::ranges::contiguous_range<DATA> and
-  (sizeof(value_type<DATA>) == 1);
-#endif // PQXX_HAVE_CONCEPTS
-
-
-// C++20: Retire these compatibility definitions.
-#if defined(PQXX_HAVE_CONCEPTS)
-
-/// Template argument type for a range.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_RANGE_ARG std::ranges::range
-
-/// Template argument type for @ref char_string.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRING_ARG pqxx::char_string
-
-/// Template argument type for @ref char_strings
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRINGS_ARG pqxx::char_strings
-
-#else // PQXX_HAVE_CONCEPTS
-
-/// Template argument type for a range.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_RANGE_ARG typename
-
-/// Template argument type for @ref char_string.
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRING_ARG typename
-
-/// Template argument type for @ref char_strings
-/** This is a concept, so only available in C++20 or better.  In pre-C++20
- * environments it's just an alias for @ref typename.
- */
-#  define PQXX_CHAR_STRINGS_ARG typename
-
-#endif // PQXX_HAVE_CONCEPTS
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/util b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/util
deleted file mode 100644
index 6d85ab611..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/util
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Various utility definitions for libpqxx.
- */
-// Actual definitions in .hxx file so editors and such recognize file type
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/util.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/util.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/util.hxx
deleted file mode 100644
index 4aa5ecf57..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/util.hxx
+++ /dev/null
@@ -1,521 +0,0 @@
-/* Various utility definitions for libpqxx.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/util instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_UTIL
-#define PQXX_H_UTIL
-
-#if !defined(PQXX_HEADER_PRE)
-#  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#endif
-
-#include <cctype>
-#include <cstdio>
-#include <functional>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#include <typeinfo>
-#include <utility>
-#include <vector>
-
-#if __has_include(<version>)
-#  include <version>
-#endif
-
-#include "pqxx/except.hxx"
-#include "pqxx/internal/encodings.hxx"
-#include "pqxx/types.hxx"
-#include "pqxx/version.hxx"
-
-
-/// The home of all libpqxx classes, functions, templates, etc.
-namespace pqxx
-{}
-
-#include <pqxx/internal/libpq-forward.hxx>
-
-
-/// Internal items for libpqxx' own use.  Do not use these yourself.
-namespace pqxx::internal
-{
-
-// C++20: Retire wrapper.
-/// Same as `std::cmp_less`, or a workaround where that's not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_less(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_less(lhs, rhs);
-#else
-  // We need a variable just because lgtm.com gives off a false positive
-  // warning when we compare the values directly.  It considers that a
-  // "self-comparison."
-  constexpr bool left_signed{std::is_signed_v<LEFT>};
-  if constexpr (left_signed == std::is_signed_v<RIGHT>)
-    return lhs < rhs;
-  else if constexpr (std::is_signed_v<LEFT>)
-    return (lhs <= 0) ? true : (std::make_unsigned_t<LEFT>(lhs) < rhs);
-  else
-    return (rhs <= 0) ? false : (lhs < std::make_unsigned_t<RIGHT>(rhs));
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_greater, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_greater(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_greater(lhs, rhs);
-#else
-  return cmp_less(rhs, lhs);
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_less_equal, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_less_equal(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_less_equal(lhs, rhs);
-#else
-  return not cmp_less(rhs, lhs);
-#endif
-}
-
-
-// C++20: Retire wrapper.
-/// C++20 std::cmp_greater_equal, or workaround if not available.
-template<typename LEFT, typename RIGHT>
-inline constexpr bool cmp_greater_equal(LEFT lhs, RIGHT rhs) noexcept
-{
-#if defined(PQXX_HAVE_CMP)
-  return std::cmp_greater_equal(lhs, rhs);
-#else
-  return not cmp_less(lhs, rhs);
-#endif
-}
-
-
-/// Efficiently concatenate two strings.
-/** This is a special case of concatenate(), needed because dependency
- * management does not let us use that function here.
- */
-[[nodiscard]] inline std::string cat2(std::string_view x, std::string_view y)
-{
-  std::string buf;
-  auto const xs{std::size(x)}, ys{std::size(y)};
-  buf.resize(xs + ys);
-  x.copy(std::data(buf), xs);
-  y.copy(std::data(buf) + xs, ys);
-  return buf;
-}
-} // namespace pqxx::internal
-
-
-namespace pqxx
-{
-using namespace std::literals;
-
-/// Suppress compiler warning about an unused item.
-template<typename... T> inline constexpr void ignore_unused(T &&...) noexcept
-{}
-
-
-/// Cast a numeric value to another type, or throw if it underflows/overflows.
-/** Both types must be arithmetic types, and they must either be both integral
- * or both floating-point types.
- */
-template<typename TO, typename FROM>
-inline TO check_cast(FROM value, std::string_view description)
-{
-  static_assert(std::is_arithmetic_v<FROM>);
-  static_assert(std::is_arithmetic_v<TO>);
-  static_assert(std::is_integral_v<FROM> == std::is_integral_v<TO>);
-
-  // The rest of this code won't quite work for bool, but bool is trivially
-  // convertible to other arithmetic types as far as I can see.
-  if constexpr (std::is_same_v<FROM, bool>)
-    return static_cast<TO>(value);
-
-  // Depending on our "if constexpr" conditions, this parameter may not be
-  // needed.  Some compilers will warn.
-  ignore_unused(description);
-
-  using from_limits = std::numeric_limits<decltype(value)>;
-  using to_limits = std::numeric_limits<TO>;
-  if constexpr (std::is_signed_v<FROM>)
-  {
-    if constexpr (std::is_signed_v<TO>)
-    {
-      if (value < to_limits::lowest())
-        throw range_error{internal::cat2("Cast underflow: "sv, description)};
-    }
-    else
-    {
-      // FROM is signed, but TO is not.  Treat this as a special case, because
-      // there may not be a good broader type in which the compiler can even
-      // perform our check.
-      if (value < 0)
-        throw range_error{internal::cat2(
-          "Casting negative value to unsigned type: "sv, description)};
-    }
-  }
-  else
-  {
-    // No need to check: the value is unsigned so can't fall below the range
-    // of the TO type.
-  }
-
-  if constexpr (std::is_integral_v<FROM>)
-  {
-    using unsigned_from = std::make_unsigned_t<FROM>;
-    using unsigned_to = std::make_unsigned_t<TO>;
-    constexpr auto from_max{static_cast<unsigned_from>((from_limits::max)())};
-    constexpr auto to_max{static_cast<unsigned_to>((to_limits::max)())};
-    if constexpr (from_max > to_max)
-    {
-      if (internal::cmp_greater(value, to_max))
-        throw range_error{internal::cat2("Cast overflow: "sv, description)};
-    }
-  }
-  else if constexpr ((from_limits::max)() > (to_limits::max)())
-  {
-    if (value > (to_limits::max)())
-      throw range_error{internal::cat2("Cast overflow: ", description)};
-  }
-
-  return static_cast<TO>(value);
-}
-
-
-/** Check library version at link time.
- *
- * Ensures a failure when linking an application against a radically
- * different libpqxx version than the one against which it was compiled.
- *
- * Sometimes application builds fail in unclear ways because they compile
- * using headers from libpqxx version X, but then link against libpqxx
- * binary version Y.  A typical scenario would be one where you're building
- * against a libpqxx which you have built yourself, but a different version
- * is installed on the system.
- *
- * The check_library_version template is declared for any library version,
- * but only actually defined for the version of the libpqxx binary against
- * which the code is linked.
- *
- * If the library binary is a different version than the one declared in
- * these headers, then this call will fail to link: there will be no
- * definition for the function with these exact template parameter values.
- * There will be a definition, but the version in the parameter values will
- * be different.
- */
-inline PQXX_PRIVATE void check_version() noexcept
-{
-  // There is no particular reason to do this here in @ref connection, except
-  // to ensure that every meaningful libpqxx client will execute it.  The call
-  // must be in the execution path somewhere or the compiler won't try to link
-  // it.  We can't use it to initialise a global or class-static variable,
-  // because a smart compiler might resolve it at compile time.
-  //
-  // On the other hand, we don't want to make a useless function call too
-  // often for performance reasons.  A local static variable is initialised
-  // only on the definition's first execution.  Compilers will be well
-  // optimised for this behaviour, so there's a minimal one-time cost.
-  static auto const version_ok{internal::PQXX_VERSION_CHECK()};
-  ignore_unused(version_ok);
-}
-
-
-/// Descriptor of library's thread-safety model.
-/** This describes what the library knows about various risks to thread-safety.
- */
-struct PQXX_LIBEXPORT thread_safety_model
-{
-  /// Is the underlying libpq build thread-safe?
-  bool safe_libpq = false;
-
-  /// Is Kerberos thread-safe?
-  /** @warning Is currently always `false`.
-   *
-   * If your application uses Kerberos, all accesses to libpqxx or Kerberos
-   * must be serialized.  Confine their use to a single thread, or protect it
-   * with a global lock.
-   */
-  bool safe_kerberos = false;
-
-  /// A human-readable description of any thread-safety issues.
-  std::string description;
-};
-
-
-/// Describe thread safety available in this build.
-[[nodiscard]] PQXX_LIBEXPORT thread_safety_model describe_thread_safety();
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-#  define PQXX_POTENTIAL_BINARY_ARG pqxx::potential_binary
-#else
-#  define PQXX_POTENTIAL_BINARY_ARG typename
-#endif
-
-
-/// Cast binary data to a type that libpqxx will recognise as binary.
-/** There are many different formats for storing binary data in memory.  You
- * may have yours as a `std::string`, or a `std::vector<uchar_t>`, or one of
- * many other types.
- *
- * But for libpqxx to recognise your data as binary, it needs to be a
- * `std::basic_string<std::byte>`, or a `std::basic_string_view<std::byte>`;
- * or in C++20 or better, any contiguous block of `std::byte`.
- *
- * Use `binary_cast` as a convenience helper to cast your data as a
- * `std::basic_string_view<std::byte>`.
- *
- * @warning There are two things you should be aware of!  First, the data must
- * be contiguous in memory.  In C++20 the compiler will enforce this, but in
- * C++17 it's your own problem.  Second, you must keep the object where you
- * store the actual data alive for as long as you might use this function's
- * return value.
- */
-template<PQXX_POTENTIAL_BINARY_ARG TYPE>
-std::basic_string_view<std::byte> binary_cast(TYPE const &data)
-{
-  static_assert(sizeof(value_type<TYPE>) == 1);
-  return {
-    reinterpret_cast<std::byte const *>(
-      const_cast<strip_t<decltype(*std::data(data))> const *>(
-        std::data(data))),
-    std::size(data)};
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<typename CHAR>
-concept char_sized = (sizeof(CHAR) == 1);
-#  define PQXX_CHAR_SIZED_ARG char_sized
-#else
-#  define PQXX_CHAR_SIZED_ARG typename
-#endif
-
-/// Construct a type that libpqxx will recognise as binary.
-/** Takes a data pointer and a size, without being too strict about their
- * types, and constructs a `std::basic_string_view<std::byte>` pointing to
- * the same data.
- *
- * This makes it a little easier to turn binary data, in whatever form you
- * happen to have it, into binary data as libpqxx understands it.
- */
-template<PQXX_CHAR_SIZED_ARG CHAR, typename SIZE>
-std::basic_string_view<std::byte> binary_cast(CHAR const *data, SIZE size)
-{
-  static_assert(sizeof(CHAR) == 1);
-  return {
-    reinterpret_cast<std::byte const *>(data),
-    check_cast<std::size_t>(size, "binary data size")};
-}
-
-
-/// The "null" oid.
-constexpr oid oid_none{0};
-} // namespace pqxx
-
-
-/// Private namespace for libpqxx's internal use; do not access.
-/** This namespace hides definitions internal to libpqxx.  These are not
- * supposed to be used by client programs, and they may change at any time
- * without notice.
- *
- * Conversely, if you find something in this namespace tremendously useful, by
- * all means do lodge a request for its publication.
- *
- * @warning Here be dragons!
- */
-namespace pqxx::internal
-{
-using namespace std::literals;
-
-
-/// A safer and more generic replacement for `std::isdigit`.
-/** Turns out `std::isdigit` isn't as easy to use as it sounds.  It takes an
- * `int`, but requires it to be nonnegative.  Which means it's an outright
- * liability on systems where `char` is signed.
- */
-template<typename CHAR> inline constexpr bool is_digit(CHAR c) noexcept
-{
-  return (c >= '0') and (c <= '9');
-}
-
-
-/// Describe an object for humans, based on class name and optional name.
-/** Interprets an empty name as "no name given."
- */
-[[nodiscard]] std::string
-describe_object(std::string_view class_name, std::string_view name);
-
-
-/// Check validity of registering a new "guest" in a "host."
-/** The host might be e.g. a connection, and the guest a transaction.  The
- * host can only have one guest at a time, so it is an error to register a new
- * guest while the host already has a guest.
- *
- * If the new registration is an error, this function throws a descriptive
- * exception.
- *
- * Pass the old guest (if any) and the new guest (if any), for both, a type
- * name (at least if the guest is not null), and optionally an object name
- * (but which may be omitted if the caller did not assign one).
- */
-void check_unique_register(
-  void const *old_guest, std::string_view old_class, std::string_view old_name,
-  void const *new_guest, std::string_view new_class,
-  std::string_view new_name);
-
-
-/// Like @ref check_unique_register, but for un-registering a guest.
-/** Pass the guest which was registered, as well as the guest which is being
- * unregistered, so that the function can check that they are the same one.
- */
-void check_unique_unregister(
-  void const *old_guest, std::string_view old_class, std::string_view old_name,
-  void const *new_guest, std::string_view new_class,
-  std::string_view new_name);
-
-
-/// Compute buffer size needed to escape binary data for use as a BYTEA.
-/** This uses the hex-escaping format.  The return value includes room for the
- * "\x" prefix.
- */
-inline constexpr std::size_t size_esc_bin(std::size_t binary_bytes) noexcept
-{
-  return 2 + (2 * binary_bytes) + 1;
-}
-
-
-/// Compute binary size from the size of its escaped version.
-/** Do not include a terminating zero in `escaped_bytes`.
- */
-inline constexpr std::size_t size_unesc_bin(std::size_t escaped_bytes) noexcept
-{
-  return (escaped_bytes - 2) / 2;
-}
-
-
-// TODO: Use actual binary type for "data".
-/// Hex-escape binary data into a buffer.
-/** The buffer must be able to accommodate
- * `size_esc_bin(std::size(binary_data))` bytes, and the function will write
- * exactly that number of bytes into the buffer.  This includes a trailing
- * zero.
- */
-void PQXX_LIBEXPORT
-esc_bin(std::basic_string_view<std::byte> binary_data, char buffer[]) noexcept;
-
-
-/// Hex-escape binary data into a std::string.
-std::string PQXX_LIBEXPORT
-esc_bin(std::basic_string_view<std::byte> binary_data);
-
-
-/// Reconstitute binary data from its escaped version.
-void PQXX_LIBEXPORT
-unesc_bin(std::string_view escaped_data, std::byte buffer[]);
-
-
-/// Reconstitute binary data from its escaped version.
-std::basic_string<std::byte>
-  PQXX_LIBEXPORT unesc_bin(std::string_view escaped_data);
-
-
-/// Transitional: std::ssize(), or custom implementation if not available.
-template<typename T> auto ssize(T const &c)
-{
-#if defined(__cpp_lib_ssize) && __cplusplus >= __cpp_lib_ssize
-  return std::ssize(c);
-#else
-  using signed_t = std::make_signed_t<decltype(std::size(c))>;
-  return static_cast<signed_t>(std::size(c));
-#endif // __cpp_lib_ssize
-}
-
-
-/// Helper for determining a function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename RETURN, typename... ARGS>
-std::tuple<ARGS...> args_f(RETURN (&func)(ARGS...));
-
-
-/// Helper for determining a `std::function`'s parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename RETURN, typename... ARGS>
-std::tuple<ARGS...> args_f(std::function<RETURN(ARGS...)> const &);
-
-
-/// Helper for determining a member function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CLASS, typename RETURN, typename... ARGS>
-std::tuple<ARGS...> member_args_f(RETURN (CLASS::*)(ARGS...));
-
-
-/// Helper for determining a const member function's parameter types.
-/** This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CLASS, typename RETURN, typename... ARGS>
-std::tuple<ARGS...> member_args_f(RETURN (CLASS::*)(ARGS...) const);
-
-
-/// Helper for determining a callable type's parameter types.
-/** This specialisation should work for lambdas.
- *
- * This function has no definition.  It's not meant to be actually called.
- * It's just there for pattern-matching in the compiler, so we can use its
- * hypothetical return value.
- */
-template<typename CALLABLE>
-auto args_f(CALLABLE const &f)
-  -> decltype(member_args_f(&CALLABLE::operator()));
-
-
-/// A callable's parameter types, as a tuple.
-template<typename CALLABLE>
-using args_t = decltype(args_f(std::declval<CALLABLE>()));
-
-
-/// Helper: Apply `strip_t` to each of a tuple type's component types.
-/** This function has no definition.  It is not meant to be called, only to be
- * used to deduce the right types.
- */
-template<typename... TYPES>
-std::tuple<strip_t<TYPES>...> strip_types(std::tuple<TYPES...> const &);
-
-
-/// Take a tuple type and apply @ref strip_t to its component types.
-template<typename... TYPES>
-using strip_types_t = decltype(strip_types(std::declval<TYPES...>()));
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/version b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/version
deleted file mode 100644
index 8dd5e48d4..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/version
+++ /dev/null
@@ -1,7 +0,0 @@
-/** libpqxx version info.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/version.hxx"
-#include "pqxx/internal/header-post.hxx"
-
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/version.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/version.hxx
deleted file mode 100644
index a159f1bed..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/version.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Version info for libpqxx.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/version instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_VERSION
-
-#  if !defined(PQXX_HEADER_PRE)
-#    error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
-#  endif
-
-/// Full libpqxx version string.
-#  define PQXX_VERSION "7.7.3"
-/// Library ABI version.
-#  define PQXX_ABI "7.7"
-
-/// Major version number.
-#  define PQXX_VERSION_MAJOR 7
-/// Minor version number.
-#  define PQXX_VERSION_MINOR 7
-
-#  define PQXX_VERSION_CHECK check_pqxx_version_7_7
-
-namespace pqxx::internal
-{
-/// Library version check stub.
-/** Helps detect version mismatches between libpqxx headers and the libpqxx
- * library binary.
- *
- * Sometimes users run into trouble linking their code against libpqxx because
- * they build their own libpqxx, but the system also has a different version
- * installed.  The declarations in the headers against which they compile their
- * code will differ from the ones used to build the libpqxx version they're
- * using, leading to confusing link errors.  The solution is to generate a link
- * error when the libpqxx binary is not the same version as the libpqxx headers
- * used to compile the code.
- *
- * This function's definition is in the libpqxx binary, so it's based on the
- * version as found in the binary.  The headers contain a call to the function,
- * whose name contains the libpqxx version as found in the headers.  (The
- * library build process will use its own local headers even if another version
- * of the headers is installed on the system.)
- *
- * If the libpqxx binary was compiled for a different version than the user's
- * code, linking will fail with an error: `check_pqxx_version_*_*` will not
- * exist for the given version number.
- */
-PQXX_LIBEXPORT int PQXX_VERSION_CHECK() noexcept;
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/zview b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/zview
deleted file mode 100644
index 66ea2a625..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/zview
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Zero-terminated string view class.
- */
-// Actual definitions in .hxx file so editors and such recognize file type.
-#include "pqxx/internal/header-pre.hxx"
-#include "pqxx/zview.hxx"
-#include "pqxx/internal/header-post.hxx"
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/zview.hxx b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/zview.hxx
deleted file mode 100644
index 36a779f51..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/include/pqxx/zview.hxx
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Zero-terminated string view.
- *
- * DO NOT INCLUDE THIS FILE DIRECTLY; include pqxx/zview instead.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#ifndef PQXX_H_ZVIEW
-#define PQXX_H_ZVIEW
-
-#include <string>
-#include <string_view>
-#include <type_traits>
-
-#include "pqxx/types.hxx"
-
-
-namespace pqxx
-{
-/// Marker-type wrapper: zero-terminated `std::string_view`.
-/** @warning Use this only if the underlying string is zero-terminated.
- *
- * When you construct a zview, you are promising that if the data pointer is
- * non-null, the underlying string is zero-terminated.  It otherwise behaves
- * exactly like a std::string_view.
- *
- * The terminating zero is not "in" the string, so it does not count as part of
- * the view's length.
- *
- * The added guarantee lets the view be used as a C-style string, which often
- * matters since libpqxx builds on top of a C library.  For this reason, zview
- * also adds a @ref c_str method.
- */
-class zview : public std::string_view
-{
-public:
-  constexpr zview() noexcept = default;
-
-  /// Convenience overload: construct using pointer and signed length.
-  constexpr zview(char const text[], std::ptrdiff_t len) :
-          std::string_view{text, static_cast<std::size_t>(len)}
-  {}
-
-  /// Convenience overload: construct using pointer and signed length.
-  constexpr zview(char text[], std::ptrdiff_t len) :
-          std::string_view{text, static_cast<std::size_t>(len)}
-  {}
-
-  /// Explicitly promote a `string_view` to a `zview`.
-  explicit constexpr zview(std::string_view other) noexcept :
-          std::string_view{other}
-  {}
-
-  /// Construct from any initialiser you might use for `std::string_view`.
-  /** @warning Only do this if you are sure that the string is zero-terminated.
-   */
-  template<typename... Args>
-  explicit constexpr zview(Args &&...args) :
-          std::string_view(std::forward<Args>(args)...)
-  {}
-
-  // C++20: constexpr.
-  /// @warning There's an implicit conversion from `std::string`.
-  zview(std::string const &str) noexcept :
-          std::string_view{str.c_str(), str.size()}
-  {}
-
-  /// Construct a `zview` from a C-style string.
-  /** @warning This scans the string to discover its length.  So if you need to
-   * do it many times, it's probably better to create the `zview` once and
-   * re-use it.
-   */
-  constexpr zview(char const str[]) : std::string_view{str} {}
-
-  /// Construct a `zview` from a string literal.
-  /** A C++ string literal ("foo") normally looks a lot like a pointer to
-   * char const, but that's not really true.  It's actually an array of char,
-   * which _devolves_ to a pointer when you pass it.
-   *
-   * For the purpose of creating a `zview` there is one big difference: if we
-   * know the array's size, we don't need to scan through the string in order
-   * to find out its length.
-   */
-  template<size_t size>
-  constexpr zview(char const (&literal)[size]) : zview(literal, size - 1)
-  {}
-
-  /// Either a null pointer, or a zero-terminated text buffer.
-  [[nodiscard]] constexpr char const *c_str() const &noexcept
-  {
-    return data();
-  }
-};
-
-
-/// Support @ref zview literals.
-/** You can "import" this selectively into your namespace, without pulling in
- * all of the @ref pqxx namespace:
- *
- * ```cxx
- * using pqxx::operator"" _zv;
- * ```
- */
-constexpr zview operator"" _zv(char const str[], std::size_t len) noexcept
-{
-  return zview{str, len};
-}
-} // namespace pqxx
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-/// A zview is a view.
-template<> inline constexpr bool std::ranges::enable_view<pqxx::zview>{true};
-
-
-/// A zview is a borrowed range.
-template<>
-inline constexpr bool std::ranges::enable_borrowed_range<pqxx::zview>{true};
-
-namespace pqxx::internal
-{
-/// Concept: T is a known zero-terminated string type.
-/** There's no unified API for these string types.  It's just a check for some
- * known types.  Any code that makes use of the concept will still have to
- * support each of these individually.
- */
-template<typename T>
-concept ZString = std::is_convertible_v < strip_t<T>,
-char const * > or std::is_convertible_v<strip_t<T>, zview> or
-  std::is_convertible_v<T, std::string const &>;
-} // namespace pqxx::internal
-#endif // PQXX_HAVE_CONCEPTS
-
-
-namespace pqxx::internal
-{
-/// Get a raw C string pointer.
-inline constexpr char const *as_c_string(char const str[]) noexcept
-{
-  return str;
-}
-/// Get a raw C string pointer.
-template<std::size_t N>
-inline constexpr char const *as_c_string(char (&str)[N]) noexcept
-{
-  return str;
-}
-/// Get a raw C string pointer.
-inline constexpr char const *as_c_string(pqxx::zview str) noexcept
-{
-  return str.c_str();
-}
-// C++20: Make this constexpr.
-/// Get a raw C string pointer.
-inline char const *as_c_string(std::string const &str) noexcept
-{
-  return str.c_str();
-}
-} // namespace pqxx::internal
-#endif
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-config-version.cmake b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-config-version.cmake
deleted file mode 100644
index c47d6956d..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-config-version.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-# This is a basic version file for the Config-mode of find_package().
-# It is used by write_basic_package_version_file() as input file for configure_file()
-# to create a version-file which can be installed along a config.cmake file.
-#
-# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-# the requested version string are exactly the same and it sets
-# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
-# but only if the requested major version is the same as the current one.
-# The variable CVF_VERSION must be set before calling configure_file().
-
-
-set(PACKAGE_VERSION "7.7.3")
-
-if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-
-  if("7.7.3" MATCHES "^([0-9]+)\\.")
-    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
-    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
-      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
-    endif()
-  else()
-    set(CVF_VERSION_MAJOR "7.7.3")
-  endif()
-
-  if(PACKAGE_FIND_VERSION_RANGE)
-    # both endpoints of the range must have the expected major version
-    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
-    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
-        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
-          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
-      set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
-        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
-        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
-      set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    else()
-      set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    endif()
-  else()
-    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
-      set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    else()
-      set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    endif()
-
-    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-      set(PACKAGE_VERSION_EXACT TRUE)
-    endif()
-  endif()
-endif()
-
-
-# if the installed project requested no architecture check, don't perform the check
-if("FALSE")
-  return()
-endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
-  return()
-endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
-  math(EXPR installedBits "8 * 8")
-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-config.cmake b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-config.cmake
deleted file mode 100644
index cb25a05f2..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-config.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-include(CMakeFindDependencyMacro)
-find_dependency(PostgreSQL)
-
-include("${CMAKE_CURRENT_LIST_DIR}/libpqxx-targets.cmake")
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-targets-noconfig.cmake b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-targets-noconfig.cmake
deleted file mode 100644
index 980f46098..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-targets-noconfig.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Import target "libpqxx::pqxx" for configuration ""
-set_property(TARGET libpqxx::pqxx APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(libpqxx::pqxx PROPERTIES
-  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
-  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/lib/libpqxx-7.7.a"
-  )
-
-list(APPEND _IMPORT_CHECK_TARGETS libpqxx::pqxx )
-list(APPEND _IMPORT_CHECK_FILES_FOR_libpqxx::pqxx "${_IMPORT_PREFIX}/lib/libpqxx-7.7.a" )
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-targets.cmake b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-targets.cmake
deleted file mode 100644
index c7b525b18..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/cmake/libpqxx/libpqxx-targets.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-# Generated by CMake
-
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
-   message(FATAL_ERROR "CMake >= 2.6.0 required")
-endif()
-cmake_policy(PUSH)
-cmake_policy(VERSION 2.6...3.20)
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Protect against multiple inclusion, which would fail when already imported targets are added once more.
-set(_targetsDefined)
-set(_targetsNotDefined)
-set(_expectedTargets)
-foreach(_expectedTarget libpqxx::pqxx)
-  list(APPEND _expectedTargets ${_expectedTarget})
-  if(NOT TARGET ${_expectedTarget})
-    list(APPEND _targetsNotDefined ${_expectedTarget})
-  endif()
-  if(TARGET ${_expectedTarget})
-    list(APPEND _targetsDefined ${_expectedTarget})
-  endif()
-endforeach()
-if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
-  unset(_targetsDefined)
-  unset(_targetsNotDefined)
-  unset(_expectedTargets)
-  set(CMAKE_IMPORT_FILE_VERSION)
-  cmake_policy(POP)
-  return()
-endif()
-if(NOT "${_targetsDefined}" STREQUAL "")
-  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
-endif()
-unset(_targetsDefined)
-unset(_targetsNotDefined)
-unset(_expectedTargets)
-
-
-# Compute the installation prefix relative to this file.
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-if(_IMPORT_PREFIX STREQUAL "/")
-  set(_IMPORT_PREFIX "")
-endif()
-
-# Create imported target libpqxx::pqxx
-add_library(libpqxx::pqxx STATIC IMPORTED)
-
-set_target_properties(libpqxx::pqxx PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "/usr/lib/aarch64-linux-gnu/libpq.so"
-)
-
-if(CMAKE_VERSION VERSION_LESS 2.8.12)
-  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
-endif()
-
-# Load information for each installed configuration.
-get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-file(GLOB CONFIG_FILES "${_DIR}/libpqxx-targets-*.cmake")
-foreach(f ${CONFIG_FILES})
-  include(${f})
-endforeach()
-
-# Cleanup temporary variables.
-set(_IMPORT_PREFIX)
-
-# Loop over all imported files and verify that they actually exist
-foreach(target ${_IMPORT_CHECK_TARGETS} )
-  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
-    if(NOT EXISTS "${file}" )
-      message(FATAL_ERROR "The imported target \"${target}\" references the file
-   \"${file}\"
-but this file does not exist.  Possible reasons include:
-* The file was deleted, renamed, or moved to another location.
-* An install or uninstall procedure did not complete successfully.
-* The installation package was faulty and contained
-   \"${CMAKE_CURRENT_LIST_FILE}\"
-but not all the files it references.
-")
-    endif()
-  endforeach()
-  unset(_IMPORT_CHECK_FILES_FOR_${target})
-endforeach()
-unset(_IMPORT_CHECK_TARGETS)
-
-# This file does not depend on other imported targets which have
-# been exported from the same project but in a separate export set.
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-cmake_policy(POP)
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/libpqxx-7.7.a b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/libpqxx-7.7.a
deleted file mode 100644
index 2cb705a34..000000000
Binary files a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/libpqxx-7.7.a and /dev/null differ
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/libpqxx.a b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/libpqxx.a
deleted file mode 120000
index d9fcdab85..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/lib/libpqxx.a
+++ /dev/null
@@ -1 +0,0 @@
-libpqxx-7.7.a
\ No newline at end of file
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/accessing-results.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/accessing-results.md
deleted file mode 100644
index 920fb6f3b..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/accessing-results.md
+++ /dev/null
@@ -1,157 +0,0 @@
-Accessing results and result rows                   {#accessing-results}
----------------------------------
-
-When you execute a query using one of the transaction `exec` functions, you
-normally get a `result` object back.  A `result` is a container of `row`s.
-
-(There are exceptions.  The `exec1` functions expect exactly one row of data,
-so they return just a `row`, not a full `result`.)
-
-Result objects are an all-or-nothing affair.  The `exec` function waits until
-it's received all the result data, and then gives it to you in the form of the
-`result`.  _(There is a faster, easier way of executing simple queries, so see
-"streaming rows" below as well.)_
-
-For example, your code might do:
-
-```cxx
-    pqxx::result r = tx.exec("SELECT * FROM mytable");
-```
-
-Now, how do you access the data inside `r`?
-
-Result sets act as standard C++ containers of rows.  Rows act as standard
-C++ containers of fields.  So the easiest way to go through them is:
-
-```cxx
-    for (auto const &row: r)
-    {
-       for (auto const &field: row) std::cout << field.c_str() << '\t';
-       std::cout << '\n';
-    }
-```
-
-But results and rows also support other kinds of access.  Array-style
-indexing, for instance, such as `r[rownum]`:
-
-```cxx
-    std::size_t const num_rows = std::size(r);
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-      pqxx::row const row = r[rownum];
-      std::size_t const num_cols = std::size(row);
-      for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-      {
-        pqxx::field const field = row[colnum];
-        std::cout << field.c_str() << '\t';
-      }
-
-      std::cout << '\n';
-    }
-```
-
-Every row in the result has the same number of columns, so you don't need to
-look up the number of fields again for each one:
-
-```cxx
-    std::size_t const num_rows = std::size(r);
-    std::size_t const num_cols = r.columns();
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-      pqxx::row const row = r[rownum];
-      for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-      {
-        pqxx::field const field = row[colnum];
-        std::cout << field.c_str() << '\t';
-      }
-
-      std::cout << '\n';
-    }
-```
-
-You can even address a field by indexing the `row` using the field's _name:_
-
-```cxx
-    std::cout << row["salary"] << '\n';
-```
-
-But try not to do that if speed matters, because looking up the column by name
-takes time.  At least you'd want to look up the column index before your loop
-and then use numerical indexes inside the loop.
-
-For C++23 or better, there's also a two-dimensional array access operator:
-
-```cxx
-    for (std::size_t rownum=0u; rownum < num_rows; ++rownum)
-    {
-        for (std::size_t colnum=0u; colnum < num_cols; ++colnum)
-	    std::cout result[rownum, colnum].c_str() << '\t';
-	std::cout << '\n';
-    }
-```
-
-And of course you can use classic "begin/end" loops:
-
-```cxx
-    for (auto row = std::begin(r); row != std::end(r); row++)
-    {
-      for (auto field = std::begin(row); field != std::end(row); field++)
-        std::cout << field->c_str() << '\t';
-      std::cout << '\n';
-    }
-```
-
-Result sets are immutable, so all iterators on results and rows are actually
-`const_iterator`s.  There are also `const_reverse_iterator` types, which
-iterate backwards from `rbegin()` to `rend()` exclusive.
-
-All these iterator types provide one extra bit of convenience that you won't
-normally find in C++ iterators: referential transparency.  You don't need to
-dereference them to get to the row or field they refer to.  That is, instead
-of `row->end()` you can also choose to say `row.end()`.  Similarly, you
-may prefer `field.c_str()` over `field->c_str()`.
-
-This becomes really helpful with the array-indexing operator.  With regular
-C++ iterators you would need ugly expressions like `(*row)[0]` or
-`row->operator[](0)`.  With the iterator types defined by the result and
-row classes you can simply say `row[0]`.
-
-
-Streaming rows
---------------
-
-There's another way to go through the rows coming out of a query.  It's
-usually easier and faster, but there are drawbacks.
-
-**One,** you start getting rows before all the data has come in from the
-database.  That speeds things up, but what happens if you lose your network
-connection while transferring the data?  Your application may already have
-processed some of the data before finding out that the rest isn't coming.  If
-that is a problem for your application, streaming may not be the right choice.
-
-**Two,** streaming only works for some types of query.  The `stream()` function
-wraps your query in a PostgreSQL `COPY` command, and `COPY` only supports a few
-commands: `SELECT`, `VALUES`, `or an `INSERT`, `UPDATE`, or `DELETE` with a
-`RETURNING` clause.  See the `COPY` documentation here:
-https://www.postgresql.org/docs/current/sql-copy.html
-
-**Three,** when you convert a field to a "view" type (such as
-`std::string_view` or `std::basic_string_view<std::byte>`), the view points to
-underlying data which only stays valid until you iterate to the next row or
-exit the loop.  So if you want to use that data for longer than a single
-iteration of the streaming loop, you'll have to store it somewhere yourself.
-
-Now for the good news.  Streaming does make it very easy to query data and loop
-over it:
-
-```cxx
-    for (auto [id, name, x, y] :
-        tx.stream<int, std::string_view, float, float>(
-            "SELECT id, name, x, y FROM point"))
-      process(id + 1, "point-" + name, x * 10.0, y * 10.0);
-```
-
-The conversion to C++ types (here `int`, `std::string_view`, and two `float`s)
-is built into the function.  You never even see `row` objects, `field` objects,
-iterators, or conversion methods.  You just put in your query and you receive
-your data.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/binary-data.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/binary-data.md
deleted file mode 100644
index 20da8dc0c..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/binary-data.md
+++ /dev/null
@@ -1,56 +0,0 @@
-Binary data                                                        {#binary}
-===========
-
-The database has two ways of storing binary data: `BYTEA` is like a string, but
-containing bytes rather than text characters.  And _large objects_ are more
-like a separate table containing binary objects.
-
-Generally you'll want to use `BYTEA` for reasonably-sized values, and large
-objects for very large values.
-
-That's the database side.  On the C++ side, in libpqxx, all binary data must be
-either `std::basic_string<std::byte>` or `std::basic_string_view<std::byte>`;
-or if you're building in C++20 or better, anything that's a block of
-contiguous `std::byte` in memory.
-
-So for example, if you want to write a large object, you'd create a
-`pqxx::blob` object.  And you might use that to write data in the form of
-`std::basic_string_view<std::byte>`.
-
-Your particular binary data may look different though.  You may have it in a
-`std::string`, or a `std::vector<unsigned char>`, or a pointer to `char`
-accompanied by a size (which could be signed or unsigned, and of any of a few
-different widths).  Sometimes that's your choice, or sometimes some other
-library will dictate what form it takes.
-
-So long as it's _basically_ still a block of bytes though, you can use
-`pqxx::binary_cast` to construct a `std::basic_string_view<std::byte>` from it.
-
-There are two forms of `binary_cast`.  One takes a single argument that must
-support `std::data()` and `std::size()`:
-
-    std::string hi{"Hello binary world"};
-    my_blob.write(pqxx::binary_cast(hi);
-
-The other takes a pointer and a size:
-
-    char const greeting[] = "Hello binary world";
-    char const *hi = greeting;
-    my_blob.write(pqxx::binary_cast(hi, sizeof(greeting)));
-
-
-Caveats
--------
-
-There are some restrictions on `binary_cast` that you must be aware of.
-
-First, your data must of a type that gives us _bytes._  So: `char`,
-`unsigned char`, `signed char`, `int8_t`, `uint8_t`, or of course `std::byte`.
-You can't feed in a vector of `double`, or anything like that.
-
-Second, the data must be laid out as a contiguous block in memory.  If there's
-no `std::data()` implementation for your type, it's not suitable.
-
-Third, `binary_cast` only constructs something like a `std::string_view`.  It
-does not make a copy of your actual data.  So, make sure that your data remains
-alive and in the same place while you're using it.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/datatypes.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/datatypes.md
deleted file mode 100644
index bc14c8b90..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/datatypes.md
+++ /dev/null
@@ -1,373 +0,0 @@
-Supporting additional data types                              {#datatypes}
-================================
-
-Communication with the database mostly happens in a text format.  When you
-include an integer value in a query, you use `to_string` to convert it to that
-text format.  When you get a query result field "as a float," it converts from
-the text format to a floating-point type.  These conversions are everywhere in
-libpqxx.
-
-The conversion sydstem supports many built-in types, but it is also extensible.
-You can "teach" libpqxx (in the scope of your own application) to convert
-additional types of values to and from PostgreSQL's string format.
-
-This is massively useful, but it's not for the faint of heart.  You'll need to
-specialise some templates.  And, **the API for doing this can change with any
-major libpqxx release.**
-
-
-Converting types
-----------------
-
-In your application, a conversion is driven entirely by a C++ type you specify.
-The value's SQL type has nothing to do with it, nor is there anything in the
-string that would identify its type.
-
-So, if you've SELECTed a 64-bit integer from the database, and you try to
-convert it to a C++ "short," one of two things will happen: either the number
-is small enough to fit in your `short` (and it just works), or else it throws a
-conversion exception.
-
-Or, your database table might have a text column, but a given field may contain
-a string that _looks_ just like a number.  You can convert that value to an
-integer type just fine.  Or to a floating-point type.  All that matters to the
-conversion is the actual value, and the type.
-
-In some cases the templates for these conversions can tell the type from the
-arguments you pass them:
-
-    auto x = to_string(99);
-
-In other cases you may need to instantiate template explicitly:
-
-    auto y = from_string<int>("99");
-
-
-Supporting a new type
----------------------
-
-Let's say you have some other SQL type which you want to be able to store in,
-or retrieve from, the database.  What would it take to support that?
-
-Sometimes you do not need _complete_ support.  You might need a conversion _to_
-a string but not _from_ a string, for example.  The conversion is defined at
-compile time, so don't be too afraid to be incomplete.  If you leave out one of
-these steps, it's not going to crash at run time or mess up your data.  The
-worst that can happen is that your code won't build.
-
-So what do you need for a complete conversion?
-
-First off, of course, you need a C++ type.  It may be your own, but it
-doesn't have to be.  It could be a type from a third-party library, or even one
-from the standard library that libpqxx does not yet support.
-
-You also specialise the `pqxx::type_name` variable to specify the type's name.
-This is important for all code which mentions your type in human-readable text,
-such as error messages.
-
-Then, does your type have a built-in null value?  You specialise the
-`pqxx::nullness` template to specify the details.
-
-Finally, you specialise the `pqxx::string_traits` template.  This is where you
-define the actual conversions.
-
-Let's go through these steps one by one.
-
-
-Your type
----------
-
-You'll need a type for which the conversions are not yet defined, because the
-C++ type is what determines the right conversion.  One type, one set of
-conversions.
-
-The type doesn't have to be one that you create.  The conversion logic was
-designed such that you can build it around any type.  So you can just as
-easily build a conversion for a type that's defined somewhere else.  There's
-no need to include any special methods or other members inside it.  That's also
-how libpqxx can support converting built-in types like `int`.
-
-By the way, if the type is an enum, you don't need to do any of this.  Just
-invoke the preprocessor macro `PQXX_DECLARE_ENUM_CONVERSION`, from the global
-namespace near the top of your translation unit, and pass the type as an
-argument.
-
-The library also provides specialisations for `std::optional<T>`,
-`std::shared_ptr<T>`, and `std::unique_ptr<T>`.  If you have conversions for
-`T`, you'll also have conversions for those.
-
-
-Specialise `type_name`
-----------------------
-
-When errors happen during conversion, libpqxx will compose error messages for
-the user.  Sometimes these will include the name of the type that's being
-converted.
-
-To tell libpqxx the name of each type, there's a template variable called
-`pqxx::type_name`.  For any given type `T`, it should have a specialisation
-that provides that `T`'s human-readable name:
-
-    namespace pqxx
-    {
-    template<> std::string const type_name<T>{"T"};
-    }
-
-(Yes, this means that you need to define something inside the pqxx namespace.
-Future versions of libpqxx may move this into a separate namespace.)
-
-Define this early on in your translation unit, before any code that might cause
-libpqxx to need the name.  That way, the libpqxx code which needs to know the
-type's name can see your definition.
-
-
-Specialise `nullness`
----------------------
-
-A struct template `pqxx::nullness` defines whether your type has a natural
-"null value" built in.  If so, it also provides member functions for producing
-and recognising null values.
-
-The simplest scenario is also the most common: most types don't have a null
-value built in.  In that case, derive your nullness traits from
-`pqxx::no_null`:
-
-    namespace pqxx
-    {
-    template<> struct nullness<T> : pqxx::no_null<T> {};
-    }
-
-(Here again you're defining this in the pqxx namespace.)
-
-If your type does have a natural null value, the definition gets a little more
-complex:
-
-    namespace pqxx
-    {
-    template<> struct nullness<T>
-    {
-      static constexpr bool has_null{true};
-      static constexpr bool always_null{false};
-
-      static bool is_null(T const &value)
-      {
-        // Return whether "value" is null.
-        return ...;
-      }
-
-      [[nodiscard]] static T null()
-      {
-        // Return a null value.
-        return ...;
-      }
-    };
-    }
-
-You may be wondering why there's a function to produce a null value, but also a
-function to check whether a value is null.  Why not just compare the value to
-the result of `null()`?  Because two null values may not be equal.  `T` may
-have several different null values.  Or it may override the comparison
-operator, similar to SQL where NULL is not equal to NULL.
-
-As a third case, your type may be one that _always_ represents a null value.
-This is the case for `std::nullptr_t` and `std::nullopt_t`.  In that case, you
-set `nullness<TYPE>::always_null` to `true` (as well as `has_null` of course),
-and you won't need to define any actual conversions.
-
-
-Specialise `string_traits`
--------------------------
-
-This part is more work.  (You can skip it for types that are _always_ null,
-but those will be rare.)  Specialise the `pqxx::string_traits` template:
-
-    namespace pqxx
-    {
-    template<> struct string_traits<T>
-    {
-      static T from_string(std::string_view text);
-      static zview to_buf(char *begin, char *end, T const &value);
-      static char *into_buf(char *begin, char *end, T const &value);
-      static std::size_t size_buffer(T const &value) noexcept;
-    };
-    }
-
-You'll also need to write those member functions, or as many of them as needed
-to get your code to build.
-
-
-### `from_string`
-
-We start off simple: `from_string` parses a string as a value of `T`, and
-returns that value.
-
-The string may not be zero-terminated; it's just the `string_view` from
-beginning to end (exclusive).  In your tests, cover cases where the string
-does not end in a zero byte.
-
-It's perfectly possible that the string isn't actually a `T` value.  Mistakes
-happen.  In that case, throw a `pqxx::conversion_error`.
-
-(Of course it's also possible that you run into some other error, so it's fine
-to throw different exceptions as well.  But when it's definitely "this is not
-the right format for a `T`," throw `conversion_error`.)
-
-
-### `to_buf`
-
-In this function, you convert a value of `T` into a string that the postgres
-server will understand.
-
-The caller will provide you with a buffer where you can write the string, if
-you need it: from `begin` to `end` exclusive.  It's a half-open interval, so
-don't access `*end`.
-
-If the buffer is insufficient for you to do the conversion, throw a
-`pqxx::conversion_overrun`.  It doesn't have to be exact: you can be a little
-pessimistic and demand a bit more space than you need.  Just be sure to throw
-the exception if there's any risk of overrunning the buffer.
-
-You don't _have_ to use the buffer for this function though.  For example,
-`pqxx::string_traits<bool>::to_buf` returns a compile-time constant string and
-ignores the buffer.
-
-Even if you do use the buffer, your string does not _have_ to start at the
-beginning of the buffer.  For example, the integer conversions start by writing
-the _least_ significant digit to the _end_ of the buffer, and then writes the
-more significant digits before it.  It was just more convenient.
-
-Return a `pqxx::zview`.  This is basically a `std::string_view`, but with one
-difference: a `zview` guarantees that there will be a valid zero byte right
-after the `string_view`.  The zero byte is not counted as part of its size, but
-it will be there.
-
-Expressed in code, this rule must hold:
-
-    void invariant(zview z)
-    {
-      assert(z[std::size(z)] == 0);
-    }
-
-Make sure you write your trailing zero _before_ the `end`.  If the trailing
-zero doesn't fit in the buffer, then there's just not enough room to perform
-the conversion.
-
-Beware of locales when converting.  If you use standard library features like
-`sprintf`, they may obey whatever locale is currently set on the system.   That
-means that a simple integer like 1000000 may come out as "1000000" on your
-system, but as "1,000,000" on mine, or as "1.000.000" for somebody else, and on
-an Indian system it may be "1,00,000".  Values coming from or going to the
-database should be in non-localised formats.  You can use libpqxx functions for
-those conversions: `pqxx::from_string`, `pqxx::to_string`, `pqxx::to_buf`.
-
-
-### `into_buf`
-
-This is a stricter version of `to_buf`.  All the same requirements apply, but
-in addition you must write your string into the buffer provided, starting
-_exactly_ at `begin`.
-
-That's why this function returns just a simple pointer: the address right
-behind the trailing zero.  If the caller wants to use the string, they can
-find it at `begin`.  If they want to write a different value into the rest of
-the buffer, they can start at the location you returned.
-
-
-### `size_buffer`
-
-Here you estimate how much buffer space you need for converting a `T` to a
-string.  Be precise if you can, but pessimistic if you must.  It's usually
-better to waste a few unnecessary bytes than to spend a lot of time computing
-the exact buffer space you need.  And failing the conversion because you
-under-budgeted the buffer is worst of all.
-
-Include the trailing zero in the buffer size.  If your `to_buf` takes more
-space than just what's needed to store the result, include that too.
-
-Make `size_buffer` a `constexpr` function if you can.  It can allow the caller
-to allocate the buffer on the stack, with a size known at compile time.
-
-
-Optional: Specialise `is_unquoted_safe`
----------------------------------------
-
-When converting arrays or composite values to strings, libpqxx may need to
-quote values and escape any special characters.  This takes time.
-
-Some types though, such as integral or floating-point types, can never have
-any special characters such as quotes, commas, or backslashes in their string
-representations.  In such cases, there's no need to quote or escape such values
-in arrays or composite types.
-
-If your type is like that, you can tell libpqxx about this by defining:
-
-    namespace pqxx
-    {
-    template<> inline constexpr bool is_unquoted_safe<MY_TYPE>{true};
-    }
-
-The code that converts this type of field to strings in an array or a composite
-type can then use a simpler, more efficient variant of the code.  It's always
-safe to leave this out; it's _just_ an optimisation for when you're completely
-sure that it's safe.
-
-Do not do this if a string representation of your type may contain a comma;
-semicolon; parenthesis; brace; quote; backslash; newline; or any other
-character that might need escaping.
-
-
-Optional: Specialise `param_format`
------------------------------------
-
-This one you don't generally need to worry about.  Read on if you're writing a
-type which represents raw binary data, or if you're writing a template where
-_some specialisations_ may contain raw binary data.
-
-When you call parameterised statements, or prepared statements with parameters,
-libpqxx needs to your parameters on to libpq, the underlying C-level PostgreSQL
-client library.
-
-There are two formats for doing that: _text_ and _binary._  In the first, we
-represent all values as strings, and the server then converts them into its own
-internal binary representation.  That's what the string conversions are all
-about, and it's what we do for almost all types of parameters.
-
-But we do it differently when the parameter is a contiguous series of raw bytes
-and the corresponding SQL type is `BYTEA`.  There is a text format for those,
-but we bypass it for efficiency.  The server can use the binary data in the
-exact same form, without any conversion or extra processing.  The binary data
-is also twice as compact during transport.
-
-(People sometimes ask why we can't just treat all types as binary.  However the
-general case isn't so clear-cut.  The binary formats are not documented, there
-are no guarantees that they will be platform-independent or that they will
-remain stable, and there's no really solid way to detect when we might get the
-format wrong.  But also, the conversions aren't necessarily as straightforward
-and efficient as they sound.  So, for the general case, libpqxx sticks with the
-text formats.  Raw binary data alone stands out as a clear win.)
-
-Long story short, the machinery for passing parameters needs to know: is this
-parameter a binary string, or not?  In the normal case it can assume "no," and
-that's what it does.  The text format is always a safe choice; we just try to
-use the binary format where it's faster.
-
-The `param_format` function template is what makes the decision.  We specialise
-it for types which may be binary strings, and use the default for all other
-types.
-
-"Types which _may_ be binary"?  You might think we know whether a type is a
-binary type or not.  But there are some complications with generic types.
-
-Templates like `std::shared_ptr`, `std::optional`, and so on act like
-"wrappers" for another type.  A `std::optional<T>` is binary if `T` is binary.
-Otherwise, it's not.  If you're building support for a template of this nature,
-you'll probably want to implement `param_format` for it.
-
-The decision to use binary format is made based on a given object, not
-necessarily based on the type in general.  Look at `std::variant`.  If you have
-a `std::variant` type which can hold an `int` or a binary string, is that a
-binary parameter?  We can't decide without knowing the individual object.
-
-Containers are another hard case.  Should we pass `std::vector<T>` in binary?
-Even when `T` is a binary type, we don't currently have any way to pass an
-array in binary format, so we always pass it as text.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/escaping.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/escaping.md
deleted file mode 100644
index 2ad9fe3db..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/escaping.md
+++ /dev/null
@@ -1,74 +0,0 @@
-String escaping                      {#escaping}
-===============
-
-Writing queries as strings is easy.  But sometimes you need a variable in
-there: `"SELECT id FROM user WHERE name = '" + name + "'"`.
-
-This is dangerous.  See the bug?  If `name` can contain quotes, you may have
-an SQL injection vulnerability there, where users can enter nasty stuff like
-"`.'; DROP TABLE user`".  Or if you're lucky, it's just a nasty bug that you
-discover when `name` happens to be "d'Arcy".
-
-So, you'll need to _escape_ the `name` before you insert it.  This is where
-quotes and other problematic characters are marked as "this is just a character
-in the string, not the end of the string."  There are
-[several functions](@ref escaping-functions) in libpqxx to do this for you.
-
-
-SQL injection
--------------
-
-To understand what SQL injection vulnerabilities are and why they should be
-prevented, imagine you use the following SQL statement somewhere in your
-program:
-
-    TX.exec(
-    	"SELECT number,amount "
-    	"FROM accounts "
-    	"WHERE allowed_to_see('" + userid + "','" + password + "')");
-
-This shows a logged-in user important information on all accounts he is
-authorized to view.  The userid and password strings are variables entered
-by the user himself.
-
-Now, if the user is actually an attacker who knows (or can guess) the
-general shape of this SQL statement, imagine he enters the following
-password:
-
-    x') OR ('x' = 'x
-
-Does that make sense to you?  Probably not.  But if this is inserted into
-the SQL string by the C++ code above, the query becomes:
-
-    SELECT number,amount
-    FROM accounts
-    WHERE allowed_to_see('user','x') OR ('x' = 'x')
-
-Is this what you wanted to happen?  Probably not!  The neat `allowed_to_see()`
-clause is completely circumvented by the "`OR ('x' = 'x')`" clause, which is
-always `true`.  Therefore, the attacker will get to see all accounts in the
-database!
-
-
-Using the esc functions
------------------------
-
-Here's how you can fix the problem in the example above:
-
-    TX.exec(
-    	"SELECT number,amount "
-    	"FROM accounts "
-    	"WHERE allowed_to_see('" + TX.esc(userid) + "', "
-    		"'" + TX.esc(password) + "')");
-
-Now, the quotes embedded in the attacker's string will be neatly escaped so
-they can't "break out" of the quoted SQL string they were meant to go into:
-
-    SELECT number,amount
-    FROM accounts
-    WHERE allowed_to_see('user', 'x'') OR (''x'' = ''x')
-
-If you look carefully, you'll see that thanks to the added escape characters
-(a single-quote is escaped in SQL by doubling it) all we get is a very
-strange-looking password string--but not a change in the SQL statement.
-
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/getting-started.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/getting-started.md
deleted file mode 100644
index 1b87b881f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/getting-started.md
+++ /dev/null
@@ -1,142 +0,0 @@
-Getting started                              {#getting-started}
-===============
-
-The most basic three types in libpqxx are the _connection_, the _transaction_,
-and the _result_.
-
-They fit together as follows:
-* You connect to the database by creating a `pqxx::connection` object (see
-  @ref connections).
-
-* You create a transaction object (see @ref transactions) operating on that
-  connection.  You'll usually want the `pqxx::work` variety.
-
-  Once you're done you call the transaction's `commit` function to make its
-  work final.  If you don't call this, the work will be rolled back when the
-  transaction object is destroyed.
-
-* Until then, use the transaction's `exec`, `query_value`, and `stream`
-  functions (and variants) to execute SQL statements.  You pass the statements
-  themselves in as simple strings.  (See @ref streams for more about data
-  streaming).
-
-* Most of the `exec` functions return a `pqxx::result` object, which acts
-  as a standard container of rows: `pqxx::row`.
-
-  Each row in a result, in turn, acts as a container of fields: `pqxx::field`.
-  See @ref accessing-results for more about results, rows, and fields.
-
-* Each field's data is stored internally as a text string, in a format defined
-  by PostgreSQL.  You can convert field or row values using their `as()` and
-  `to()` member functions.
-
-* After you've closed the transaction, the connection is free to run a next
-  transaction.
-
-Here's a very basic example.  It connects to the default database (you'll
-need to have one set up), queries it for a very simple result, converts it to
-an `int`, and prints it out.  It also contains some basic error handling.
-
-    #include <iostream>
-    #include <pqxx/pqxx>
-
-    int main()
-    {
-      try
-      {
-        // Connect to the database.  In practice we may have to pass some
-        // arguments to say where the database server is, and so on.
-        // The constructor parses options exactly like libpq's
-        // PQconnectdb/PQconnect, see:
-        // https://www.postgresql.org/docs/10/static/libpq-connect.html
-        pqxx::connection c;
-
-        // Start a transaction.  In libpqxx, you always work in one.
-        pqxx::work w(c);
-
-        // work::exec1() executes a query returning a single row of data.
-        // We'll just ask the database to return the number 1 to us.
-        pqxx::row r = w.exec1("SELECT 1");
-
-        // Commit your transaction.  If an exception occurred before this
-        // point, execution will have left the block, and the transaction will
-        // have been destroyed along the way.  In that case, the failed
-        // transaction would implicitly abort instead of getting to this point.
-        w.commit();
-
-        // Look at the first and only field in the row, parse it as an integer,
-        // and print it.
-        //
-        // "r[0]" returns the first field, which has an "as<...>()" member
-        // function template to convert its contents from their string format
-        // to a type of your choice.
-        std::cout << r[0].as<int>() << std::endl;
-      }
-      catch (std::exception const &e)
-      {
-        std::cerr << e.what() << std::endl;
-        return 1;
-      }
-    }
-
-This prints the number 1.  Notice that you can keep the result object around
-after you've closed the transaction or even the connection.  There are
-situations where you can't do it, but generally it's fine.  If you're
-interested: you can install your own callbacks for receiving error messages
-from the database, and in that case you'll have to keep the connection object
-alive.  But otherwise, it's nice to be able to "fire and forget" your
-connection and deal with the data.
-
-You can also convert an entire row to a series of C++-side types in one go,
-using the @c as member function on the row:
-
-    pqxx::connection c;
-    pqxx::work w(c);
-    pqxx::row r = w.exec1("SELECT 1, 2, 'Hello'");
-    auto [one, two, hello] = r.as<int, int, std::string>();
-    std::cout << (one + two) << ' ' << std::strlen(hello) << std::endl;
-
-Here's a slightly more complicated example.  It takes an argument from the
-command line and retrieves a string with that value.  The interesting part is
-that it uses the escaping-and-quoting function `quote` to embed this
-string value in SQL safely.  It also reads the result field's value as a
-plain C-style string using its `c_str` function.
-
-    #include <iostream>
-    #include <stdexcept>
-    #include <pqxx/pqxx>
-
-    int main(int argc, char *argv[])
-    {
-      try
-      {
-        if (!argv[1]) throw std::runtime_error("Give me a string!");
-
-        pqxx::connection c;
-        pqxx::work w(c);
-
-        // work::exec() returns a full result set, which can consist of any
-        // number of rows.
-        pqxx::result r = w.exec("SELECT " + w.quote(argv[1]));
-
-        // End our transaction here.  We can still use the result afterwards.
-        w.commit();
-
-        // Print the first field of the first row.  Read it as a C string,
-        // just like std::string::c_str() does.
-        std::cout << r[0][0].c_str() << std::endl;
-      }
-      catch (std::exception const &e)
-      {
-        std::cerr << e.what() << std::endl;
-        return 1;
-      }
-    }
-
-You can find more about converting field values to native types, or
-converting values to strings for use with libpqxx, under
-@ref stringconversion.  More about getting to the rows and fields of a
-result is under @ref accessing-results.
-
-If you want to handle exceptions thrown by libpqxx in more detail, for
-example to print the SQL contents of a query that failed, see @ref exception.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/mainpage.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/mainpage.md
deleted file mode 100644
index 5d4b8f9b2..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/mainpage.md
+++ /dev/null
@@ -1,28 +0,0 @@
-libpqxx                                      {#mainpage}
-=======
-
-@version 7.7.3
-@author Jeroen T. Vermeulen
-@see http://pqxx.org
-@see https://github.com/jtv/libpqxx
-
-Welcome to libpqxx, the C++ API to the PostgreSQL database management system.
-
-Compiling this package requires PostgreSQL to be installed -- including the
-C headers for client development.  The library builds on top of PostgreSQL's
-standard C API, libpq.  The libpq headers are not needed to compile client
-programs, however.
-
-For a quick introduction to installing and using libpqxx, see the README.md
-file.  The latest information can be found at http://pqxx.org/
-
-
-Some links that should help you find your bearings:
-* @ref getting-started
-* @ref thread-safety
-* @ref connections
-* @ref transactions
-* @ref escaping
-* @ref performance
-* @ref transactor
-* @ref datatypes
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/parameters.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/parameters.md
deleted file mode 100644
index 7ac792025..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/parameters.md
+++ /dev/null
@@ -1,90 +0,0 @@
-Statement parameters                                        {#parameters}
-====================
-
-When you execute a prepared statement (see @ref prepared), or a parameterised
-statement (using functions like `pqxx::connection::exec_params`), you may write
-special _placeholders_ in the query text.  They look like `$1`, `$2`, and so
-on.
-
-If you execute the query and pass parameter values, the call will respectively
-substitute the first where it finds `$1`, the second where it finds `$2`, et
-cetera.
-
-Doing this saves you work.  If you don't use statement parameters, you'll need
-to quote and escape your values (see `connection::quote()` and friends) as you
-insert them into your query as literal values.
-
-Or if you forget to do that, you leave yourself open to horrible
-[SQL injection attacks](https://xkcd.com/327/).  Trust me, I was born in a town
-whose name started with an apostrophe!
-
-Statement parameters save you this work.  With these parameters you can pass
-your values as-is, and they will go across the wire to the database in a safe
-format.
-
-In some cases it may even be faster!  When a parameter represents binary data
-(as in the SQL `BYTEA` type), libpqxx will send it directly as binary, which is
-a bit more efficient.  If you insert the binary data directly in your query
-text, your CPU will have some extra work to do, converting the data into a text
-format, escaping it, and adding quotes.
-
-
-Dynamic parameter lists
------------------------
-
-In rare cases you may just not know how many parameters you'll pass into your
-statement when you call it.
-
-For these situations, have a look at `params`.  It lets you compose your
-parameters list on the fly, even add whole ranges of parameters at a time.
-
-You can pass a `params` into your statement as a normal parameter.  It will
-fill in all the parameter values it contains into that position of the
-statement's overall parameter list.
-
-So if you call your statement passing a regular parameter `a`, a
-`params` containing just a parameter `b`, and another regular parameter `c`,
-then your call will pass parameters `a`, `b`, and `c`.  Or if the params object
-is empty, it will pass just `a` and `c`.  If the params object contains `x` and
-`y`, your call will pass `a, x, y, c`.
-
-You can mix static and dynamic parameters freely.  Don't go overboard though:
-complexity is where bugs happen!
-
-
-Generating placeholders
------------------------
-
-If your code gets particularly complex, it may sometimes happen that it becomes
-hard to track which parameter value belongs with which placeholder.  Did you
-intend to pass this numeric value as `$7`, or as `$8`?  The answer may depend
-on an `if` that happened earlier in a different function.
-
-(Generally if things get that complex, it's a good idea to look for simpler
-solutions.  But especially when performance matters, sometimes you can't avoid
-complexity like that.)
-
-There's a little helper class called `placeholders`.  You can use it as a
-counter which produces those placeholder strings, `$1`, `$2`, `$3`, et cetera.
-When you start generating a complex statement, you can create both a `params`
-and a `placeholders`:
-
-    pqxx::params values;
-    pqxx::placeholders name;
-
-Let's say you've got some complex code to generate the conditions for an SQL
-"WHERE" clause.  You'll generally want to do these things close together in
-your, so that you don't accidentally update one part and forget another:
-
-    if (extra_clause)
-    {
-      // Extend the query text, using the current placeholder.
-      query += " AND x = " + name.get();
-      // Add the parameter value.
-      values.append(my_x);
-      // Move on to the next placeholder value.
-      name.next();
-    }
-
-Depending on the starting value of `name`, this might add to `query` a fragment
-like "` AND x = $3`" or "` AND x = $5`".
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/performance.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/performance.md
deleted file mode 100644
index 6c403684f..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/performance.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Performance features                       {#performance}
-====================
-
-If your program's database interaction is not as efficient as it needs to be,
-the first place to look is usually the SQL you're executing.  But libpqxx
-has a few specialized features to help you squeeze more performance out
-of how you issue commands and retrieve data:
-
-* @ref streams.  Use these as a faster way to transfer data between your
-    code and the database.
-* `std::string_view` and `pqxx::zview`.  In places where traditional C++ worked
-    with `std::string`, see whether `std::string_view` or `pqxx::zview` will
-    do.  Of course that means that you'll have to look at the data's lifetime
-    more carefully, but it'll save the computer a lot of copying.
-* @ref prepared.  These can be executed many times without the server
-    parsing and planning them anew each time.  They also save you having to
-    escape string parameters.
-* `pqxx::pipeline` lets you send queries to the database in batches, and
-    continue other processing while they are executing.
-* `pqxx::connecting` lets you start setting up a database connection, but
-    without blocking the thread.
-
-As always of course, don't risk the quality of your code for optimizations
-that you don't need!
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/prepared-statement.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/prepared-statement.md
deleted file mode 100644
index 5193866a6..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/prepared-statement.md
+++ /dev/null
@@ -1,125 +0,0 @@
-Prepared statements                    {#prepared}
-===================
-
-Prepared statements are SQL queries that you define once and then invoke
-as many times as you like, typically with varying parameters.  It's basically
-a function that you can define ad hoc.
-
-If you have an SQL statement that you're going to execute many times in
-quick succession, it may be more efficient to prepare it once and reuse it.
-This saves the database backend the effort of parsing complex SQL and
-figuring out an efficient execution plan.  Another nice side effect is that
-you don't need to worry about escaping parameters.  Some corporate coding
-standards require all SQL parameters to be passed in this way, to reduce the
-risk of programmer mistakes leaving room for SQL injections.
-
-
-Preparing a statement
----------------------
-
-You create a prepared statement by preparing it on the connection (using the
-`pqxx::connection::prepare` functions), passing an identifier and its SQL text.
-
-The identifier is the name by which the prepared statement will be known; it
-should consist of ASCII letters, digits, and underscores only, and start with
-an ASCII letter.  The name is case-sensitive.
-
-```cxx
-    void prepare_my_statement(pqxx::connection &c)
-    {
-      c.prepare(
-          "my_statement",
-          "SELECT * FROM Employee WHERE name = 'Xavier'");
-    }
-```
-
-Once you've done this, you'll be able to call `my_statement` from any
-transaction you execute on the same connection.  For this, use the
-`pqxx::transaction_base::exec_prepared` functions.
-
-```cxx
-    pqxx::result execute_my_statement(pqxx::transaction_base &t)
-    {
-      return t.exec_prepared("my_statement");
-    }
-```
-
-
-Parameters
-----------
-
-Did I mention that prepared statements can have parameters?  The query text
-can contain `$1`, `$2` etc. as placeholders for parameter values that you
-will provide when you invoke the prepared satement.
-
-See @ref parameters for more about this.  And here's a simple example of
-preparing a statement and invoking it with parameters:
-
-```cxx
-    void prepare_find(pqxx::connection &c)
-    {
-      // Prepare a statement called "find" that looks for employees with a
-      // given name (parameter 1) whose salary exceeds a given number
-      // (parameter 2).
-      c.prepare(
-  	    "find",
-  	    "SELECT * FROM Employee WHERE name = $1 AND salary > $2");
-    }
-```
-
-This example looks up the prepared statement "find," passes `name` and
-`min_salary` as parameters, and invokes the statement with those values:
-
-```cxx
-    pqxx::result execute_find(
-      pqxx::transaction_base &t, std::string name, int min_salary)
-    {
-      return t.exec_prepared("find", name, min_salary);
-    }
-```
-
-
-A special prepared statement
-----------------------------
-
-There is one special case: the _nameless_ prepared statement.  You may prepare
-a statement without a name, i.e. whose name is an empty string.  The unnamed
-statement can be redefined at any time, without un-preparing it first.
-
-
-Performance note
-----------------
-
-Don't assume that using prepared statements will speed up your application.
-There are cases where prepared statements are actually slower than plain SQL.
-
-The reason is that the backend can often produce a better execution plan when
-it knows the statement's actual parameter values.
-
-For example, say you've got a web application and you're querying for users
-with status "inactive" who have email addresses in a given domain name X.  If
-X is a very popular provider, the best way for the database engine to plan the
-query may be to list the inactive users first and then filter for the email
-addresses you're looking for.  But in other cases, it may be much faster to
-find matching email addresses first and then see which of their owners are
-"inactive."  A prepared statement must be planned to fit either case, but a
-direct query will be optimised based on table statistics, partial indexes, etc.
-
-
-Zero bytes
-----------
-
-@warning Beware of "nul" bytes!
-
-Any string you pass as a parameter will end at the _first char with value
-zero._  If you pass a string that contains a zero byte, the last byte in the
-value will be the one just before the zero.
-
-So, if you need a zero byte in a string, consider that it's really a _binary
-string,_ which is not the same thing as a text string.  SQL represents binary
-data as the `BYTEA` type, or in binary large objects ("blobs").
-
-In libpqxx, you represent binary data as a range of `std::byte`.  They must be
-contiguous in memory, so that libpqxx can pass pointers to the underlying C
-library.  So you might use `std::basic_string<std::byte>`, or
-`std::basic_string_view<std::byte>`, or `std::vector<std::byte>`.
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/streams.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/streams.md
deleted file mode 100644
index 3df4d6126..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/streams.md
+++ /dev/null
@@ -1,107 +0,0 @@
-Streams						{#streams}
-=======
-
-Most of the time it's fine to retrieve data from the database using `SELECT`
-queries, and store data using `INSERT`.  But for those cases where efficiency
-matters, there are two classes to help you do this better: `stream_from` and
-`stream_to`.  They're less flexible than SQL queries, and there's the risk of
-losing your connection while you're in mid-stream, but you get some speed and
-memory efficiencies in return.
-
-Both stream classes do data conversion for you: `stream_from` receives values
-from the database in PostgreSQL's text format, and converts them to the C++
-types you specify.  Likewise, `stream_to` converts C++ values you provide to
-PostgreSQL's text format for transfer.  (On its end, the database of course
-converts values to and from their SQL types.)
-
-
-Null values
------------
-
-So how do you deal with nulls?  It depends on the C++ type you're using.  Some
-types may have a built-in null value.  For instance, if you have a
-`char const *` value and you convert it to an SQL string, then converting a
-`nullptr` will produce a NULL SQL value.
-
-But what do you do about C++ types which don't have a built-in null value, such
-as `int`?  The trick is to wrap it in `std::optional`.  The difference between
-`int` and `std::optional<int>` is that the former always has an `int` value,
-and the latter doesn't have to.
-
-Actually it's not just `std::optional`.  You can do the same thing with
-`std::unique_ptr` or `std::shared_ptr`.  A smart pointer is less efficient than
-`std::optional` in most situations because they allocate their value on the
-heap, but sometimes that's what you want in order to save moving or copying
-large values around.
-
-This part is not generic though.  It won't work with just any smart-pointer
-type, just the ones which are explicitly supported: `shared_ptr` and
-`unique_ptr`.  If you really need to, you can build support for additional
-wrappers and smart pointers by copying the implementation patterns from the
-existing smart-pointer support.
-
-
-stream\_from
-------------
-
-Use `stream_from` to read data directly from the database.  It's faster than
-the transaction's `exec` functions if the result contains enough rows.  But
-also, you won't need to keep your full result set in memory.  That can really
-matter with larger data sets.
-
-And, you can start processing your data right after the first row of data comes
-in from the server.  With `exec()` you need to wait to receive all data, and
-then you begin processing.  With `stream_from` you can be processing data on
-the client side while the server is still sending you the rest.
-
-You don't actually need to create a `stream_from` object yourself, though you
-can.  Two shorthand functions, @ref pqxx::transaction_base::stream
-and @ref pqxx::transaction_base::for_each, can create the streams for you with
-a minimum of overhead.
-
-Not all kinds of queries will work in a stream.  Internally the streams make
-use of PostgreSQL's `COPY` command, so see the PostgreSQL documentation for
-`COPY` for the exact limitations.  Basic `SELECT` and `UPDATE ... RETURNING`
-queries should just work.
-
-As you read a row, the stream converts its fields to a tuple type containing
-the value types you ask for:
-
-    auto stream pqxx::stream_from::query(
-        tx, "SELECT name, points FROM score");
-    std::tuple<std::string, int> row;
-    while (stream >> row)
-      process(row);
-    stream.complete();
-
-As the stream reads each row, it converts that row's data into your tuple,
-goes through your loop body, and then promptly forgets that row's data.  This
-means you can easily process more data than will fit in memory.
-
-
-stream\_to
-----------
-
-Use `stream_to` to write data directly to a database table.  This saves you
-having to perform an `INSERT` for every row, and so it can be significantly
-faster if you want to insert more than just one or two rows at a time.
-
-As with `stream_from`, you can specify the table and the columns, and not much
-else.  You insert tuple-like objects of your choice:
-
-    pqxx::stream_to stream{
-        tx,
-        "score",
-        std::vector<std::string>{"name", "points"}};
-    for (auto const &entry: scores)
-        stream << entry;
-    stream.complete();
-
-Each row is processed as you provide it, and not retained in memory after that.
-
-The call to `complete()` is more important here than it is for `stream_from`.
-It's a lot like a "commit" or "abort" at the end of a transaction.  If you omit
-it, it will be done automatically during the stream's destructor.  But since
-destructors can't throw exceptions, any failures at that stage won't be visible
-in your code.  So, always call `complete()` on a `stream_to` to close it off
-properly!
diff --git a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/thread-safety.md b/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/thread-safety.md
deleted file mode 100644
index 07c7f9984..000000000
--- a/ext/libpqxx-7.7.3/install/ubuntu22.04/arm64/share/doc/libpqxx/thread-safety.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Thread safety                    {#thread-safety}
-=============
-
-This library does not contain any locking code to protect objects against
-simultaneous modification in multi-threaded programs.  Therefore it is up
-to you, the user of the library, to ensure that your threaded client
-programs perform no conflicting operations concurrently.
-
-Most of the time this isn't hard.  Result sets are immutable, so you can
-share them between threads without problem.  The main rule is:
-
-@li Treat a connection, together with any and all objects related to it, as
-a "world" of its own.  You should generally make sure that the same "world"
-is never accessed by another thread while you're doing anything non-const
-in there.
-
-That means: don't issue a query on a transaction while you're also opening
-a subtransaction, don't access a cursor while you may also be committing,
-and so on.
-
-In particular, cursors are tricky.  It's easy to perform a non-const
-operation without noticing.  So, if you're going to share cursors or
-cursor-related objects between threads, lock very conservatively!
-
-Use `pqxx::describe_thread_safety` to find out at runtime what level of
-thread safety is implemented in your build and version of libpqxx.  It
-returns a `pqxx::thread_safety_model` describing what you can and cannot rely
-on.  A command-line utility `tools/pqxxthreadsafety` prints out the same
-information.
diff --git a/ext/libpqxx-7.7.3/libpqxx.pc.in b/ext/libpqxx-7.7.3/libpqxx.pc.in
deleted file mode 100644
index eb7dcff49..000000000
--- a/ext/libpqxx-7.7.3/libpqxx.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libpqxx
-Description: C++ client API for the PostgreSQL database management system.
-Version: @VERSION@
-Libs: -L${libdir} -lpqxx
-Cflags: -I${includedir}
diff --git a/ext/libpqxx-7.7.3/requirements.json b/ext/libpqxx-7.7.3/requirements.json
deleted file mode 100644
index 28f8f8ad1..000000000
--- a/ext/libpqxx-7.7.3/requirements.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "description": "Minimum versions needed of various things.",
-    "c++": "17",
-    "libpq": "9.6",
-    "postgresql": "9.6",
-    "gcc": "8",
-    "clang": "11",
-    "msvc": "2019"
-}
diff --git a/ext/libpqxx-7.7.3/src/CMakeLists.txt b/ext/libpqxx-7.7.3/src/CMakeLists.txt
deleted file mode 100644
index 1d697ab7c..000000000
--- a/ext/libpqxx-7.7.3/src/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-if(NOT PostgreSQL_FOUND)
-    if(POLICY CMP0074)
-        cmake_policy(PUSH)
-        # CMP0074 is `OLD` by `cmake_minimum_required(VERSION 3.7)`,
-        # sets `NEW` to enable support CMake variable `PostgreSQL_ROOT`.
-        cmake_policy(SET CMP0074 NEW)
-    endif()
-
-    find_package(PostgreSQL REQUIRED)
-
-    if(POLICY CMP0074)
-        cmake_policy(POP)
-    endif()
-endif()
-
-# When setting up the include paths, mention the binary tree's include
-# directory *before* the source tree's include directory.  If the source tree
-# happens to contain autoconf-generated config headers, we should still prefer
-# the ones in the binary tree.
-macro(library_target_setup tgt)
-    target_include_directories(${tgt}
-    	PUBLIC
-    		$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
-    		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-    		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-    	PRIVATE
-    		${PostgreSQL_INCLUDE_DIRS}
-    )
-    target_link_libraries(${tgt} PRIVATE ${PostgreSQL_LIBRARIES})
-    if(WIN32)
-        target_link_libraries(${tgt} PUBLIC wsock32 ws2_32)
-    endif()
-    install(TARGETS ${tgt} EXPORT libpqxx-targets
-    	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    )
-
-    get_target_property(name ${tgt} NAME)
-    get_target_property(output_name ${tgt} OUTPUT_NAME)
-    if(NOT CMAKE_HOST_WIN32)
-        # Create library symlink
-        get_target_property(target_type ${tgt} TYPE)
-        if(target_type STREQUAL "SHARED_LIBRARY")
-            set(library_prefix ${CMAKE_SHARED_LIBRARY_PREFIX})
-            set(library_suffix ${CMAKE_SHARED_LIBRARY_SUFFIX})
-        elseif(target_type STREQUAL "STATIC_LIBRARY")
-            set(library_prefix ${CMAKE_STATIC_LIBRARY_PREFIX})
-            set(library_suffix ${CMAKE_STATIC_LIBRARY_SUFFIX})
-        endif()
-
-        list(APPEND noop_command "${CMAKE_COMMAND}" "-E" "true")
-        list(APPEND create_symlink_command "${CMAKE_COMMAND}" "-E" "create_symlink" "${library_prefix}${output_name}${library_suffix}" "${library_prefix}${name}${library_suffix}")
-        # `add_custom_command()` does nothing if the `OUTPUT_NAME` and `NAME`
-        # properties are equal, otherwise it creates library symlink.
-        add_custom_command(TARGET ${tgt} POST_BUILD
-            COMMAND "$<IF:$<STREQUAL:${name},${output_name}>,${noop_command},${create_symlink_command}>"
-            VERBATIM
-            COMMAND_EXPAND_LISTS
-        )
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${library_prefix}${name}${library_suffix}
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        )
-    endif()
-endmacro()
-
-file(GLOB CXX_SOURCES *.cxx)
-
-add_library(pqxx ${CXX_SOURCES})
-
-get_target_property(pqxx_target_type pqxx TYPE)
-if(pqxx_target_type STREQUAL "SHARED_LIBRARY")
-    target_compile_definitions(pqxx PUBLIC PQXX_SHARED)
-endif()
-
-set_target_properties(
-    pqxx PROPERTIES
-    OUTPUT_NAME $<IF:$<PLATFORM_ID:Windows>,pqxx,pqxx-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}>
-)
-library_target_setup(pqxx)
-
-# install pkg-config file
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix \${prefix})
-set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-set(VERSION ${PROJECT_VERSION})
-configure_file(${PROJECT_SOURCE_DIR}/libpqxx.pc.in ${PROJECT_BINARY_DIR}/libpqxx.pc)
-install(FILES ${PROJECT_BINARY_DIR}/libpqxx.pc
-	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)
diff --git a/ext/libpqxx-7.7.3/src/Makefile.am b/ext/libpqxx-7.7.3/src/Makefile.am
deleted file mode 100644
index dfd520941..000000000
--- a/ext/libpqxx-7.7.3/src/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-lib_LTLIBRARIES = libpqxx.la
-libpqxx_la_SOURCES = \
-	array.cxx \
-	binarystring.cxx \
-	blob.cxx \
-	connection.cxx \
-	cursor.cxx \
-	encodings.cxx \
-	errorhandler.cxx \
-	except.cxx \
-	field.cxx \
-	largeobject.cxx \
-	notification.cxx \
-	params.cxx \
-	pipeline.cxx \
-	result.cxx \
-	robusttransaction.cxx \
-	sql_cursor.cxx \
-	strconv.cxx \
-	stream_from.cxx \
-	stream_to.cxx \
-	subtransaction.cxx \
-	time.cxx \
-	transaction.cxx \
-	transaction_base.cxx \
-	row.cxx \
-	util.cxx \
-	version.cxx \
-	wait.cxx
-
-libpqxx_version = -release $(PQXX_ABI)
-
-libpqxx_la_LDFLAGS = $(libpqxx_version) \
-	-rpath $(libdir) \
-	${POSTGRES_LIB}
-
-AM_CPPFLAGS = \
-    -I$(top_srcdir)/include -I$(top_builddir)/include ${POSTGRES_INCLUDE}
-
-# Override automatically generated list of default includes.  It contains only
-# unnecessary entries, and incorrectly mentions include/pqxx directly.
-DEFAULT_INCLUDES=
-
-MAINTAINERCLEANFILES=Makefile.in
diff --git a/ext/libpqxx-7.7.3/src/Makefile.in b/ext/libpqxx-7.7.3/src/Makefile.in
deleted file mode 100644
index 3c0152727..000000000
--- a/ext/libpqxx-7.7.3/src/Makefile.in
+++ /dev/null
@@ -1,809 +0,0 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4/libtool.m4 \
-	$(top_srcdir)/config/m4/ltoptions.m4 \
-	$(top_srcdir)/config/m4/ltsugar.m4 \
-	$(top_srcdir)/config/m4/ltversion.m4 \
-	$(top_srcdir)/config/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/pqxx/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libpqxx_la_LIBADD =
-am_libpqxx_la_OBJECTS = array.lo binarystring.lo blob.lo connection.lo \
-	cursor.lo encodings.lo errorhandler.lo except.lo field.lo \
-	largeobject.lo notification.lo params.lo pipeline.lo result.lo \
-	robusttransaction.lo sql_cursor.lo strconv.lo stream_from.lo \
-	stream_to.lo subtransaction.lo time.lo transaction.lo \
-	transaction_base.lo row.lo util.lo version.lo wait.lo
-libpqxx_la_OBJECTS = $(am_libpqxx_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libpqxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(libpqxx_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/array.Plo \
-	./$(DEPDIR)/binarystring.Plo ./$(DEPDIR)/blob.Plo \
-	./$(DEPDIR)/connection.Plo ./$(DEPDIR)/cursor.Plo \
-	./$(DEPDIR)/encodings.Plo ./$(DEPDIR)/errorhandler.Plo \
-	./$(DEPDIR)/except.Plo ./$(DEPDIR)/field.Plo \
-	./$(DEPDIR)/largeobject.Plo ./$(DEPDIR)/notification.Plo \
-	./$(DEPDIR)/params.Plo ./$(DEPDIR)/pipeline.Plo \
-	./$(DEPDIR)/result.Plo ./$(DEPDIR)/robusttransaction.Plo \
-	./$(DEPDIR)/row.Plo ./$(DEPDIR)/sql_cursor.Plo \
-	./$(DEPDIR)/strconv.Plo ./$(DEPDIR)/stream_from.Plo \
-	./$(DEPDIR)/stream_to.Plo ./$(DEPDIR)/subtransaction.Plo \
-	./$(DEPDIR)/time.Plo ./$(DEPDIR)/transaction.Plo \
-	./$(DEPDIR)/transaction_base.Plo ./$(DEPDIR)/util.Plo \
-	./$(DEPDIR)/version.Plo ./$(DEPDIR)/wait.Plo
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(libpqxx_la_SOURCES)
-DIST_SOURCES = $(libpqxx_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \
-	$(top_srcdir)/config/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-PKG_CONFIG = @PKG_CONFIG@
-POSTGRES_INCLUDE = @POSTGRES_INCLUDE@
-PQXXVERSION = @PQXXVERSION@
-PQXX_ABI = @PQXX_ABI@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_postgres_lib = @with_postgres_lib@
-lib_LTLIBRARIES = libpqxx.la
-libpqxx_la_SOURCES = \
-	array.cxx \
-	binarystring.cxx \
-	blob.cxx \
-	connection.cxx \
-	cursor.cxx \
-	encodings.cxx \
-	errorhandler.cxx \
-	except.cxx \
-	field.cxx \
-	largeobject.cxx \
-	notification.cxx \
-	params.cxx \
-	pipeline.cxx \
-	result.cxx \
-	robusttransaction.cxx \
-	sql_cursor.cxx \
-	strconv.cxx \
-	stream_from.cxx \
-	stream_to.cxx \
-	subtransaction.cxx \
-	time.cxx \
-	transaction.cxx \
-	transaction_base.cxx \
-	row.cxx \
-	util.cxx \
-	version.cxx \
-	wait.cxx
-
-libpqxx_version = -release $(PQXX_ABI)
-libpqxx_la_LDFLAGS = $(libpqxx_version) \
-	-rpath $(libdir) \
-	${POSTGRES_LIB}
-
-AM_CPPFLAGS = \
-    -I$(top_srcdir)/include -I$(top_builddir)/include ${POSTGRES_INCLUDE}
-
-
-# Override automatically generated list of default includes.  It contains only
-# unnecessary entries, and incorrectly mentions include/pqxx directly.
-DEFAULT_INCLUDES = 
-MAINTAINERCLEANFILES = Makefile.in
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cxx .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libpqxx.la: $(libpqxx_la_OBJECTS) $(libpqxx_la_DEPENDENCIES) $(EXTRA_libpqxx_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(libpqxx_la_LINK) -rpath $(libdir) $(libpqxx_la_OBJECTS) $(libpqxx_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binarystring.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blob.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encodings.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errorhandler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/except.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/field.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/largeobject.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notification.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/params.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipeline.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/result.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/robusttransaction.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/row.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_cursor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strconv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_from.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_to.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subtransaction.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transaction.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transaction_base.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wait.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.cxx.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cxx.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cxx.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-		-rm -f ./$(DEPDIR)/array.Plo
-	-rm -f ./$(DEPDIR)/binarystring.Plo
-	-rm -f ./$(DEPDIR)/blob.Plo
-	-rm -f ./$(DEPDIR)/connection.Plo
-	-rm -f ./$(DEPDIR)/cursor.Plo
-	-rm -f ./$(DEPDIR)/encodings.Plo
-	-rm -f ./$(DEPDIR)/errorhandler.Plo
-	-rm -f ./$(DEPDIR)/except.Plo
-	-rm -f ./$(DEPDIR)/field.Plo
-	-rm -f ./$(DEPDIR)/largeobject.Plo
-	-rm -f ./$(DEPDIR)/notification.Plo
-	-rm -f ./$(DEPDIR)/params.Plo
-	-rm -f ./$(DEPDIR)/pipeline.Plo
-	-rm -f ./$(DEPDIR)/result.Plo
-	-rm -f ./$(DEPDIR)/robusttransaction.Plo
-	-rm -f ./$(DEPDIR)/row.Plo
-	-rm -f ./$(DEPDIR)/sql_cursor.Plo
-	-rm -f ./$(DEPDIR)/strconv.Plo
-	-rm -f ./$(DEPDIR)/stream_from.Plo
-	-rm -f ./$(DEPDIR)/stream_to.Plo
-	-rm -f ./$(DEPDIR)/subtransaction.Plo
-	-rm -f ./$(DEPDIR)/time.Plo
-	-rm -f ./$(DEPDIR)/transaction.Plo
-	-rm -f ./$(DEPDIR)/transaction_base.Plo
-	-rm -f ./$(DEPDIR)/util.Plo
-	-rm -f ./$(DEPDIR)/version.Plo
-	-rm -f ./$(DEPDIR)/wait.Plo
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/array.Plo
-	-rm -f ./$(DEPDIR)/binarystring.Plo
-	-rm -f ./$(DEPDIR)/blob.Plo
-	-rm -f ./$(DEPDIR)/connection.Plo
-	-rm -f ./$(DEPDIR)/cursor.Plo
-	-rm -f ./$(DEPDIR)/encodings.Plo
-	-rm -f ./$(DEPDIR)/errorhandler.Plo
-	-rm -f ./$(DEPDIR)/except.Plo
-	-rm -f ./$(DEPDIR)/field.Plo
-	-rm -f ./$(DEPDIR)/largeobject.Plo
-	-rm -f ./$(DEPDIR)/notification.Plo
-	-rm -f ./$(DEPDIR)/params.Plo
-	-rm -f ./$(DEPDIR)/pipeline.Plo
-	-rm -f ./$(DEPDIR)/result.Plo
-	-rm -f ./$(DEPDIR)/robusttransaction.Plo
-	-rm -f ./$(DEPDIR)/row.Plo
-	-rm -f ./$(DEPDIR)/sql_cursor.Plo
-	-rm -f ./$(DEPDIR)/strconv.Plo
-	-rm -f ./$(DEPDIR)/stream_from.Plo
-	-rm -f ./$(DEPDIR)/stream_to.Plo
-	-rm -f ./$(DEPDIR)/subtransaction.Plo
-	-rm -f ./$(DEPDIR)/time.Plo
-	-rm -f ./$(DEPDIR)/transaction.Plo
-	-rm -f ./$(DEPDIR)/transaction_base.Plo
-	-rm -f ./$(DEPDIR)/util.Plo
-	-rm -f ./$(DEPDIR)/version.Plo
-	-rm -f ./$(DEPDIR)/wait.Plo
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpqxx-7.7.3/src/array.cxx b/ext/libpqxx-7.7.3/src/array.cxx
deleted file mode 100644
index e35aaddce..000000000
--- a/ext/libpqxx-7.7.3/src/array.cxx
+++ /dev/null
@@ -1,240 +0,0 @@
-/** Handling of SQL arrays.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cassert>
-#include <cstddef>
-#include <cstring>
-#include <utility>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/array.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/array-composite.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/util.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace pqxx
-{
-/// Scan to next glyph in the buffer.  Assumes there is one.
-[[nodiscard]] std::string::size_type
-array_parser::scan_glyph(std::string::size_type pos) const
-{
-  return m_scan(std::data(m_input), std::size(m_input), pos);
-}
-
-
-/// Scan to next glyph in a substring.  Assumes there is one.
-std::string::size_type array_parser::scan_glyph(
-  std::string::size_type pos, std::string::size_type end) const
-{
-  return m_scan(std::data(m_input), end, pos);
-}
-
-
-/// Find the end of a single-quoted SQL string in an SQL array.
-/** Call this while pointed at the opening quote.
- *
- * Returns the offset of the first character after the closing quote.
- */
-std::string::size_type array_parser::scan_single_quoted_string() const
-{
-  assert(m_input[m_pos] == '\'');
-  auto const sz{std::size(m_input)};
-  auto here{pqxx::internal::find_char<'\\', '\''>(m_scan, m_input, m_pos + 1)};
-  while (here < sz)
-  {
-    char const c{m_input[here]};
-    // Consume the slash or quote that we found.
-    ++here;
-    if (c == '\'')
-    {
-      // Single quote.
-
-      // At end?
-      if (here >= sz)
-        return here;
-
-      // SQL escapes single quotes by doubling them.  Terrible idea, but it's
-      // what we have.  Inspect the next character to find out whether this
-      // is the closing quote, or an escaped one inside the string.
-      if (m_input[here] != '\'')
-        return here;
-      // Check against embedded "'" byte in a multichar byte.  If we do have a
-      // multibyte char, then we're still out of the string.
-      if (scan_glyph(here, sz) > here + 1)
-        PQXX_UNLIKELY return here;
-
-      // We have a second quote.  Consume it as well.
-      ++here;
-    }
-    else
-    {
-      assert(c == '\\');
-      // Backslash escape.  Skip ahead by one more character.
-      here = scan_glyph(here, sz);
-    }
-    // Race on to the next quote or backslash.
-    here = pqxx::internal::find_char<'\\', '\''>(m_scan, m_input, here);
-  }
-  throw argument_error{internal::concat("Null byte in SQL string: ", m_input)};
-}
-
-
-/// Parse a single-quoted SQL string: un-quote it and un-escape it.
-std::string
-array_parser::parse_single_quoted_string(std::string::size_type end) const
-{
-  std::string output;
-  // Maximum output size is same as the input size, minus the opening and
-  // closing quotes.  In the worst case, the real number could be half that.
-  // Usually it'll be a pretty close estimate.
-  output.reserve(end - m_pos - 2);
-  // XXX: find_char<'\\', '\''>().
-  for (auto here = m_pos + 1, next = scan_glyph(here, end); here < end - 1;
-       here = next, next = scan_glyph(here, end))
-  {
-    if (next - here == 1 and (m_input[here] == '\'' or m_input[here] == '\\'))
-    {
-      // Skip escape.  (Performance-wise, we bet that these are relatively
-      // rare.)
-      PQXX_UNLIKELY
-      here = next;
-      next = scan_glyph(here, end);
-    }
-
-    output.append(std::data(m_input) + here, std::data(m_input) + next);
-  }
-
-  return output;
-}
-
-
-/// Find the end of a double-quoted SQL string in an SQL array.
-std::string::size_type array_parser::scan_double_quoted_string() const
-{
-  return pqxx::internal::scan_double_quoted_string(
-    std::data(m_input), std::size(m_input), m_pos, m_scan);
-}
-
-
-/// Parse a double-quoted SQL string: un-quote it and un-escape it.
-std::string
-array_parser::parse_double_quoted_string(std::string::size_type end) const
-{
-  return pqxx::internal::parse_double_quoted_string(
-    std::data(m_input), end, m_pos, m_scan);
-}
-
-
-/// Find the end of an unquoted string in an SQL array.
-/** Assumes UTF-8 or an ASCII-superset single-byte encoding.
- */
-std::string::size_type array_parser::scan_unquoted_string() const
-{
-  return pqxx::internal::scan_unquoted_string<',', ';', '}'>(
-    std::data(m_input), std::size(m_input), m_pos, m_scan);
-}
-
-
-/// Parse an unquoted SQL string.
-/** Here, the special unquoted value NULL means a null value, not a string
- * that happens to spell "NULL".
- */
-std::string
-array_parser::parse_unquoted_string(std::string::size_type end) const
-{
-  return pqxx::internal::parse_unquoted_string(
-    std::data(m_input), end, m_pos, m_scan);
-}
-
-
-array_parser::array_parser(
-  std::string_view input, internal::encoding_group enc) :
-        m_input(input), m_scan(internal::get_glyph_scanner(enc))
-{}
-
-
-std::pair<array_parser::juncture, std::string> array_parser::get_next()
-{
-  std::string value;
-
-  if (m_pos >= std::size(m_input))
-    return std::make_pair(juncture::done, value);
-
-  juncture found;
-  std::string::size_type end;
-
-  if (scan_glyph(m_pos) - m_pos > 1)
-  {
-    // Non-ASCII unquoted string.
-    end = scan_unquoted_string();
-    value = parse_unquoted_string(end);
-    found = juncture::string_value;
-  }
-  else
-    switch (m_input[m_pos])
-    {
-    case '\0': throw failure{"Unexpected zero byte in array."};
-    case '{':
-      found = juncture::row_start;
-      end = scan_glyph(m_pos);
-      break;
-    case '}':
-      found = juncture::row_end;
-      end = scan_glyph(m_pos);
-      break;
-    case '\'':
-      found = juncture::string_value;
-      end = scan_single_quoted_string();
-      value = parse_single_quoted_string(end);
-      break;
-    case '"':
-      found = juncture::string_value;
-      end = scan_double_quoted_string();
-      value = parse_double_quoted_string(end);
-      break;
-    default:
-      end = scan_unquoted_string();
-      value = parse_unquoted_string(end);
-      if (value == "NULL")
-      {
-        // In this one situation, as a special case, NULL means a null field,
-        // not a string that happens to spell "NULL".
-        value.clear();
-        found = juncture::null_value;
-      }
-      else
-      {
-        // The normal case: we just parsed an unquoted string.  The value is
-        // what we need.
-        PQXX_LIKELY
-        found = juncture::string_value;
-      }
-      break;
-    }
-
-  // Skip a trailing field separator, if present.
-  if (end < std::size(m_input))
-  {
-    auto next{scan_glyph(end)};
-    if (next - end == 1 and (m_input[end] == ',' or m_input[end] == ';'))
-      PQXX_UNLIKELY
-    end = next;
-  }
-
-  m_pos = end;
-  return std::make_pair(found, value);
-}
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/src/binarystring.cxx b/ext/libpqxx-7.7.3/src/binarystring.cxx
deleted file mode 100644
index 936437006..000000000
--- a/ext/libpqxx-7.7.3/src/binarystring.cxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/** Implementation of bytea (binary string) conversions.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <functional>
-#include <new>
-#include <stdexcept>
-
-extern "C"
-{
-#include <libpq-fe.h>
-}
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/binarystring.hxx"
-#include "pqxx/field.hxx"
-#include "pqxx/strconv.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace
-{
-/// Copy data to a heap-allocated buffer.
-std::shared_ptr<unsigned char>
-  PQXX_COLD copy_to_buffer(void const *data, std::size_t len)
-{
-  void *const output{malloc(len + 1)};
-  if (output == nullptr)
-    throw std::bad_alloc{};
-  static_cast<char *>(output)[len] = '\0';
-  memcpy(static_cast<char *>(output), data, len);
-  return {static_cast<unsigned char *>(output), std::free};
-}
-} // namespace
-
-
-PQXX_COLD pqxx::binarystring::binarystring(field const &F)
-{
-  unsigned char const *data{
-    reinterpret_cast<unsigned char const *>(F.c_str())};
-  m_buf =
-    std::shared_ptr<unsigned char>{PQunescapeBytea(data, &m_size), PQfreemem};
-  if (m_buf == nullptr)
-    throw std::bad_alloc{};
-}
-
-
-pqxx::binarystring::binarystring(std::string_view s) :
-        m_buf{copy_to_buffer(std::data(s), std::size(s))}, m_size{std::size(s)}
-{}
-
-
-pqxx::binarystring::binarystring(void const *binary_data, std::size_t len) :
-        m_buf{copy_to_buffer(binary_data, len)}, m_size{len}
-{}
-
-
-bool pqxx::binarystring::operator==(binarystring const &rhs) const noexcept
-{
-  return (std::size(rhs) == size()) and
-         (std::memcmp(data(), std::data(rhs), size()) == 0);
-}
-
-
-pqxx::binarystring &
-pqxx::binarystring::operator=(binarystring const &rhs) = default;
-
-PQXX_COLD pqxx::binarystring::const_reference
-pqxx::binarystring::at(size_type n) const
-{
-  if (n >= m_size)
-  {
-    if (m_size == 0)
-      throw std::out_of_range{"Accessing empty binarystring"};
-    throw std::out_of_range{
-      "binarystring index out of range: " + to_string(n) +
-      " (should be below " + to_string(m_size) + ")"};
-  }
-  return data()[n];
-}
-
-
-PQXX_COLD void pqxx::binarystring::swap(binarystring &rhs)
-{
-  m_buf.swap(rhs.m_buf);
-
-  // This part very obviously can't go wrong, so do it last
-  auto const s{m_size};
-  m_size = rhs.m_size;
-  rhs.m_size = s;
-}
-
-
-std::string pqxx::binarystring::str() const
-{
-  return std::string{get(), m_size};
-}
diff --git a/ext/libpqxx-7.7.3/src/blob.cxx b/ext/libpqxx-7.7.3/src/blob.cxx
deleted file mode 100644
index 1492d9107..000000000
--- a/ext/libpqxx-7.7.3/src/blob.cxx
+++ /dev/null
@@ -1,337 +0,0 @@
-#include "pqxx-source.hxx"
-
-#include <cerrno>
-#include <stdexcept>
-#include <utility>
-
-#include <libpq-fe.h>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/blob.hxx"
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/gates/connection-largeobject.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace
-{
-constexpr int INV_WRITE{0x00020000}, INV_READ{0x00040000};
-} // namespace
-
-
-pqxx::internal::pq::PGconn *
-pqxx::blob::raw_conn(pqxx::connection *conn) noexcept
-{
-  pqxx::internal::gate::connection_largeobject gate{*conn};
-  return gate.raw_connection();
-}
-
-
-pqxx::internal::pq::PGconn *
-pqxx::blob::raw_conn(pqxx::dbtransaction const &tx) noexcept
-{
-  return raw_conn(&tx.conn());
-}
-
-
-std::string pqxx::blob::errmsg(connection const *conn)
-{
-  pqxx::internal::gate::const_connection_largeobject gate{*conn};
-  return gate.error_message();
-}
-
-
-pqxx::blob pqxx::blob::open_internal(dbtransaction &tx, oid id, int mode)
-{
-  auto &conn{tx.conn()};
-  int fd{lo_open(raw_conn(&conn), id, mode)};
-  if (fd == -1)
-    throw pqxx::failure{internal::concat(
-      "Could not open binary large object ", id, ": ", errmsg(&conn))};
-  return {conn, fd};
-}
-
-
-pqxx::oid pqxx::blob::create(dbtransaction &tx, oid id)
-{
-  oid actual_id{lo_create(raw_conn(tx), id)};
-  if (actual_id == 0)
-    throw failure{internal::concat(
-      "Could not create binary large object: ", errmsg(&tx.conn()))};
-  return actual_id;
-}
-
-
-void pqxx::blob::remove(dbtransaction &tx, oid id)
-{
-  if (id == 0)
-    throw usage_error{"Trying to delete binary large object without an ID."};
-  if (lo_unlink(raw_conn(tx), id) == -1)
-    throw failure{internal::concat(
-      "Could not delete large object ", id, ": ", errmsg(&tx.conn()))};
-}
-
-
-pqxx::blob pqxx::blob::open_r(dbtransaction &tx, oid id)
-{
-  return open_internal(tx, id, INV_READ);
-}
-
-
-pqxx::blob pqxx::blob::open_w(dbtransaction &tx, oid id)
-{
-  return open_internal(tx, id, INV_WRITE);
-}
-
-
-pqxx::blob pqxx::blob::open_rw(dbtransaction &tx, oid id)
-{
-  return open_internal(tx, id, INV_READ | INV_WRITE);
-}
-
-
-pqxx::blob::blob(blob &&other) :
-        m_conn{std::exchange(other.m_conn, nullptr)},
-        m_fd{std::exchange(other.m_fd, -1)}
-{}
-
-
-pqxx::blob &pqxx::blob::operator=(blob &&other)
-{
-  if (m_fd != -1)
-    lo_close(raw_conn(m_conn), m_fd);
-  m_conn = std::exchange(other.m_conn, nullptr);
-  m_fd = std::exchange(other.m_fd, -1);
-  return *this;
-}
-
-
-pqxx::blob::~blob()
-{
-  try
-  {
-    close();
-  }
-  catch (std::exception const &e)
-  {
-    if (m_conn != nullptr)
-      PQXX_UNLIKELY
-    m_conn->process_notice(internal::concat(
-      "Failure while closing binary large object: ", e.what(), "\n"));
-  }
-}
-
-
-void pqxx::blob::close()
-{
-  if (m_fd != -1)
-  {
-    lo_close(raw_conn(m_conn), m_fd);
-    m_fd = -1;
-    m_conn = nullptr;
-  }
-}
-
-
-std::size_t pqxx::blob::raw_read(std::byte buf[], std::size_t size)
-{
-  if (m_conn == nullptr)
-    throw usage_error{"Attempt to read from a closed binary large object."};
-  if (size > chunk_limit)
-    throw range_error{
-      "Reads from a binary large object must be less than 2 GB at once."};
-  auto data{reinterpret_cast<char *>(buf)};
-  int received{lo_read(raw_conn(m_conn), m_fd, data, size)};
-  if (received < 0)
-    throw failure{
-      internal::concat("Could not read from binary large object: ", errmsg())};
-  return static_cast<std::size_t>(received);
-}
-
-
-std::size_t
-pqxx::blob::read(std::basic_string<std::byte> &buf, std::size_t size)
-{
-  buf.resize(size);
-  auto const received{raw_read(std::data(buf), size)};
-  buf.resize(received);
-  return static_cast<std::size_t>(received);
-}
-
-
-void pqxx::blob::raw_write(std::byte const buf[], std::size_t size)
-{
-  if (m_conn == nullptr)
-    throw usage_error{"Attempt to write to a closed binary large object."};
-  if (size > chunk_limit)
-    throw range_error{
-      "Writes to a binary large object must be less than 2 GB at once."};
-  auto ptr{reinterpret_cast<char const *>(buf)};
-  int written{lo_write(raw_conn(m_conn), m_fd, ptr, size)};
-  if (written < 0)
-    throw failure{
-      internal::concat("Write to binary large object failed: ", errmsg())};
-}
-
-
-void pqxx::blob::resize(std::int64_t size)
-{
-  if (m_conn == nullptr)
-    throw usage_error{"Attempt to resize a closed binary large object."};
-  if (lo_truncate64(raw_conn(m_conn), m_fd, size) < 0)
-    throw failure{
-      internal::concat("Binary large object truncation failed: ", errmsg())};
-}
-
-
-std::int64_t pqxx::blob::tell() const
-{
-  if (m_conn == nullptr)
-    throw usage_error{"Attempt to tell() a closed binary large object."};
-  std::int64_t offset{lo_tell64(raw_conn(m_conn), m_fd)};
-  if (offset < 0)
-    throw failure{internal::concat(
-      "Error reading binary large object position: ", errmsg())};
-  return offset;
-}
-
-
-std::int64_t pqxx::blob::seek(std::int64_t offset, int whence)
-{
-  if (m_conn == nullptr)
-    throw usage_error{"Attempt to seek() a closed binary large object."};
-  std::int64_t seek_result{lo_lseek64(raw_conn(m_conn), m_fd, offset, whence)};
-  if (seek_result < 0)
-    throw failure{internal::concat(
-      "Error during seek on binary large object: ", errmsg())};
-  return seek_result;
-}
-
-
-std::int64_t pqxx::blob::seek_abs(std::int64_t offset)
-{
-  return this->seek(offset, SEEK_SET);
-}
-
-
-std::int64_t pqxx::blob::seek_rel(std::int64_t offset)
-{
-  return this->seek(offset, SEEK_CUR);
-}
-
-
-std::int64_t pqxx::blob::seek_end(std::int64_t offset)
-{
-  return this->seek(offset, SEEK_END);
-}
-
-
-pqxx::oid pqxx::blob::from_buf(
-  dbtransaction &tx, std::basic_string_view<std::byte> data, oid id)
-{
-  oid actual_id{create(tx, id)};
-  try
-  {
-    open_w(tx, actual_id).write(data);
-  }
-  catch (std::exception const &)
-  {
-    try
-    {
-      remove(tx, id);
-    }
-    catch (std::exception const &e)
-    {
-      try
-      {
-        tx.conn().process_notice(internal::concat(
-          "Could not clean up partially created large object ", id, ": ",
-          e.what()));
-      }
-      catch (std::exception const &)
-      {}
-    }
-    throw;
-  }
-  return actual_id;
-}
-
-
-void pqxx::blob::append_from_buf(
-  dbtransaction &tx, std::basic_string_view<std::byte> data, oid id)
-{
-  if (std::size(data) > chunk_limit)
-    throw range_error{
-      "Writes to a binary large object must be less than 2 GB at once."};
-  blob b{open_w(tx, id)};
-  b.seek_end();
-  b.write(data);
-}
-
-
-void pqxx::blob::to_buf(
-  dbtransaction &tx, oid id, std::basic_string<std::byte> &buf,
-  std::size_t max_size)
-{
-  open_r(tx, id).read(buf, max_size);
-}
-
-
-std::size_t pqxx::blob::append_to_buf(
-  dbtransaction &tx, oid id, std::int64_t offset,
-  std::basic_string<std::byte> &buf, std::size_t append_max)
-{
-  if (append_max > chunk_limit)
-    throw range_error{
-      "Reads from a binary large object must be less than 2 GB at once."};
-  auto b{open_r(tx, id)};
-  b.seek_abs(offset);
-  auto const org_size{std::size(buf)};
-  buf.resize(org_size + append_max);
-  try
-  {
-    auto here{reinterpret_cast<char *>(std::data(buf) + org_size)};
-    auto chunk{static_cast<std::size_t>(
-      lo_read(b.raw_conn(b.m_conn), b.m_fd, here, append_max))};
-    buf.resize(org_size + chunk);
-    return chunk;
-  }
-  catch (std::exception const &)
-  {
-    buf.resize(org_size);
-    throw;
-  }
-}
-
-
-pqxx::oid pqxx::blob::from_file(dbtransaction &tx, char const path[])
-{
-  auto id{lo_import(raw_conn(tx), path)};
-  if (id == 0)
-    throw failure{internal::concat(
-      "Could not import '", path, "' as a binary large object: ", errmsg(tx))};
-  return id;
-}
-
-
-pqxx::oid pqxx::blob::from_file(dbtransaction &tx, char const path[], oid id)
-{
-  auto actual_id{lo_import_with_oid(raw_conn(tx), path, id)};
-  if (actual_id == 0)
-    throw failure{internal::concat(
-      "Could not import '", path, "' as binary large object ", id, ": ",
-      errmsg(tx))};
-  return actual_id;
-}
-
-
-void pqxx::blob::to_file(dbtransaction &tx, oid id, char const path[])
-{
-  if (lo_export(raw_conn(tx), id, path) < 0)
-    throw failure{internal::concat(
-      "Could not export binary large object ", id, " to file '", path,
-      "': ", errmsg(tx))};
-}
diff --git a/ext/libpqxx-7.7.3/src/connection.cxx b/ext/libpqxx-7.7.3/src/connection.cxx
deleted file mode 100644
index bef8c79aa..000000000
--- a/ext/libpqxx-7.7.3/src/connection.cxx
+++ /dev/null
@@ -1,1274 +0,0 @@
-/** Implementation of the pqxx::connection class.
- *
- * pqxx::connection encapsulates a connection to a database.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>
-#include <functional>
-#include <iterator>
-#include <memory>
-#include <stdexcept>
-#include <utility>
-
-// For fcntl().
-#if __has_include(<fcntl.h>)
-#  include <fcntl.h>
-#endif
-#if __has_include(<unistd.h>)
-#  include <unistd.h>
-#endif
-
-// For ioctlsocket().
-#if defined(_WIN32) && __has_include(<winsock2.h>)
-#  include <winsock2.h>
-#endif
-
-extern "C"
-{
-#include <libpq-fe.h>
-}
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/binarystring.hxx"
-#include "pqxx/internal/wait.hxx"
-#include "pqxx/nontransaction.hxx"
-#include "pqxx/notification.hxx"
-#include "pqxx/pipeline.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/transaction.hxx"
-
-#include "pqxx/internal/gates/errorhandler-connection.hxx"
-#include "pqxx/internal/gates/result-connection.hxx"
-#include "pqxx/internal/gates/result-creation.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-extern "C"
-{
-  // The PQnoticeProcessor that receives an error or warning from libpq and
-  // sends it to the appropriate connection for processing.
-  void pqxx_notice_processor(void *conn, char const *msg) noexcept
-  {
-    reinterpret_cast<pqxx::connection *>(conn)->process_notice(msg);
-  }
-
-
-  // There's no way in libpq to disable a connection's notice processor.  So,
-  // set an inert one to get the same effect.
-  void inert_notice_processor(void *, char const *) noexcept {}
-} // extern "C"
-
-using namespace std::literals;
-
-std::string PQXX_COLD
-pqxx::encrypt_password(char const user[], char const password[])
-{
-  std::unique_ptr<char, std::function<void(char *)>> p{
-    PQencryptPassword(password, user), PQfreemem};
-  return {p.get()};
-}
-
-
-pqxx::connection::connection(connection &&rhs) :
-        m_conn{rhs.m_conn}, m_unique_id{rhs.m_unique_id}
-{
-  rhs.check_movable();
-  rhs.m_conn = nullptr;
-}
-
-
-pqxx::connection::connection(
-  connection::connect_mode, zview connection_string) :
-        m_conn{PQconnectStart(connection_string.c_str())}
-{
-  if (m_conn == nullptr)
-    throw std::bad_alloc{};
-  if (status() == CONNECTION_BAD)
-    throw pqxx::broken_connection{PQerrorMessage(m_conn)};
-}
-
-
-std::pair<bool, bool> pqxx::connection::poll_connect()
-{
-  switch (PQconnectPoll(m_conn))
-  {
-  case PGRES_POLLING_FAILED:
-    throw pqxx::broken_connection{PQerrorMessage(m_conn)};
-  case PGRES_POLLING_READING: return std::make_pair(true, false);
-  case PGRES_POLLING_WRITING: return std::make_pair(false, true);
-  case PGRES_POLLING_OK:
-    if (not is_open())
-      throw pqxx::broken_connection{PQerrorMessage(m_conn)};
-    return std::make_pair(false, false);
-  case PGRES_POLLING_ACTIVE:
-    throw internal_error{
-      "Nonblocking connection poll returned obsolete 'active' state."};
-  default:
-    throw internal_error{
-      "Nonblocking connection poll returned unknown value."};
-  }
-}
-
-void pqxx::connection::complete_init()
-{
-  if (m_conn == nullptr)
-    throw std::bad_alloc{};
-  try
-  {
-    if (not is_open())
-      throw broken_connection{PQerrorMessage(m_conn)};
-
-    set_up_state();
-  }
-  catch (std::exception const &)
-  {
-    PQfinish(m_conn);
-    m_conn = nullptr;
-    throw;
-  }
-}
-
-
-void pqxx::connection::init(char const options[])
-{
-  m_conn = PQconnectdb(options);
-  complete_init();
-}
-
-
-void pqxx::connection::init(char const *params[], char const *values[])
-{
-  m_conn = PQconnectdbParams(params, values, 0);
-  complete_init();
-}
-
-
-void pqxx::connection::check_movable() const
-{
-  if (m_trans)
-    throw pqxx::usage_error{"Moving a connection with a transaction open."};
-  if (not std::empty(m_errorhandlers))
-    throw pqxx::usage_error{
-      "Moving a connection with error handlers registered."};
-  if (not std::empty(m_receivers))
-    throw pqxx::usage_error{
-      "Moving a connection with notification receivers registered."};
-}
-
-
-void pqxx::connection::check_overwritable() const
-{
-  if (m_trans)
-    throw pqxx::usage_error{
-      "Moving a connection onto one with a transaction open."};
-  if (not std::empty(m_errorhandlers))
-    throw pqxx::usage_error{
-      "Moving a connection onto one with error handlers registered."};
-  if (not std::empty(m_receivers))
-    throw usage_error{
-      "Moving a connection onto one "
-      "with notification receivers registered."};
-}
-
-
-pqxx::connection &pqxx::connection::operator=(connection &&rhs)
-{
-  check_overwritable();
-  rhs.check_movable();
-
-  close();
-
-  m_conn = std::exchange(rhs.m_conn, nullptr);
-  m_unique_id = rhs.m_unique_id;
-
-  return *this;
-}
-
-
-pqxx::result pqxx::connection::make_result(
-  internal::pq::PGresult *pgr, std::shared_ptr<std::string> const &query,
-  std::string_view desc)
-{
-  if (pgr == nullptr)
-  {
-    if (is_open())
-      throw failure(err_msg());
-    else
-      throw broken_connection{"Lost connection to the database server."};
-  }
-  internal::encoding_group enc;
-  try
-  {
-    enc = internal::enc_group(encoding_id());
-  }
-  catch (std::exception const &)
-  {
-    // Don't let the PGresult leak.
-    // TODO: Can we just accept a unique_ptr instead?
-    internal::clear_result(pgr);
-    throw;
-  }
-  auto const r{pqxx::internal::gate::result_creation::create(pgr, query, enc)};
-  pqxx::internal::gate::result_creation{r}.check_status(desc);
-  return r;
-}
-
-
-int PQXX_COLD pqxx::connection::backendpid() const &noexcept
-{
-  return (m_conn == nullptr) ? 0 : PQbackendPID(m_conn);
-}
-
-
-namespace
-{
-PQXX_PURE int socket_of(::pqxx::internal::pq::PGconn const *c) noexcept
-{
-  return (c == nullptr) ? -1 : PQsocket(c);
-}
-} // namespace
-
-
-int pqxx::connection::sock() const &noexcept
-{
-  return socket_of(m_conn);
-}
-
-
-int PQXX_COLD pqxx::connection::protocol_version() const noexcept
-{
-  return (m_conn == nullptr) ? 0 : PQprotocolVersion(m_conn);
-}
-
-
-int PQXX_COLD pqxx::connection::server_version() const noexcept
-{
-  return PQserverVersion(m_conn);
-}
-
-
-void pqxx::connection::set_variable(
-  std::string_view var, std::string_view value) &
-{
-  exec(internal::concat("SET ", quote_name(var), "=", value));
-}
-
-
-std::string pqxx::connection::get_variable(std::string_view var)
-{
-  return exec(internal::concat("SHOW ", quote_name(var)))
-    .at(0)
-    .at(0)
-    .as(std::string{});
-}
-
-
-std::string pqxx::connection::get_var(std::string_view var)
-{
-  // (Variables can't be null, so far as I can make out.)
-  return exec(internal::concat("SHOW "sv, quote_name(var)))[0][0]
-    .as<std::string>();
-}
-
-
-/** Set up various parts of logical connection state that may need to be
- * recovered because the physical connection to the database was lost and is
- * being reset, or that may not have been initialized yet.
- */
-void pqxx::connection::set_up_state()
-{
-  if (auto const proto_ver{protocol_version()}; proto_ver < 3)
-  {
-    if (proto_ver == 0)
-      throw broken_connection{"No connection."};
-    else
-      throw feature_not_supported{
-        "Unsupported frontend/backend protocol version; 3.0 is the minimum."};
-  }
-
-  if (server_version() <= 90000)
-    throw feature_not_supported{
-      "Unsupported server version; 9.0 is the minimum."};
-
-  // The default notice processor in libpq writes to stderr.  Ours does
-  // nothing.
-  // If the caller registers an error handler, this gets replaced with an
-  // error handler that walks down the connection's chain of handlers.  We
-  // don't do that by default because there's a danger: libpq may call the
-  // notice processor via a result object, even after the connection has been
-  // destroyed and the handlers list no longer exists.
-  PQXX_LIKELY
-  PQsetNoticeProcessor(m_conn, inert_notice_processor, nullptr);
-}
-
-
-bool pqxx::connection::is_open() const noexcept
-{
-  return status() == CONNECTION_OK;
-}
-
-
-void pqxx::connection::process_notice_raw(char const msg[]) noexcept
-{
-  if ((msg == nullptr) or (*msg == '\0'))
-    return;
-  auto const rbegin = std::crbegin(m_errorhandlers),
-             rend = std::crend(m_errorhandlers);
-  for (auto i{rbegin}; (i != rend) and (**i)(msg); ++i)
-    ;
-}
-
-
-void pqxx::connection::process_notice(char const msg[]) noexcept
-{
-  if (msg == nullptr)
-    return;
-  zview const view{msg};
-  if (std::empty(view))
-    return;
-  else if (msg[std::size(view) - 1] == '\n')
-    process_notice_raw(msg);
-  else
-    // Newline is missing.  Let the zview version of the code add it.
-    PQXX_UNLIKELY
-  process_notice(view);
-}
-
-
-void pqxx::connection::process_notice(zview msg) noexcept
-{
-  if (std::empty(msg))
-    return;
-  else if (msg[std::size(msg) - 1] == '\n')
-    process_notice_raw(msg.c_str());
-  else
-    try
-    {
-      // Add newline.
-      std::string buf;
-      buf.reserve(std::size(msg) + 1);
-      buf.assign(msg);
-      buf.push_back('\n');
-      process_notice_raw(buf.c_str());
-    }
-    catch (std::exception const &)
-    {
-      // If nothing else works, try writing the message without the newline.
-      PQXX_UNLIKELY
-      process_notice_raw(msg.c_str());
-    }
-}
-
-
-void PQXX_COLD pqxx::connection::trace(FILE *out) noexcept
-{
-  if (m_conn)
-  {
-    if (out)
-      PQtrace(m_conn, out);
-    else
-      PQuntrace(m_conn);
-  }
-}
-
-
-void PQXX_COLD pqxx::connection::add_receiver(pqxx::notification_receiver *n)
-{
-  if (n == nullptr)
-    throw argument_error{"Null receiver registered"};
-
-  // Add to receiver list and attempt to start listening.
-  auto const p{m_receivers.find(n->channel())};
-  auto const new_value{receiver_list::value_type{n->channel(), n}};
-
-  if (p == std::end(m_receivers))
-  {
-    // Not listening on this event yet, start doing so.
-    auto const lq{std::make_shared<std::string>(
-      internal::concat("LISTEN ", quote_name(n->channel())))};
-    make_result(PQexec(m_conn, lq->c_str()), lq, *lq);
-    m_receivers.insert(new_value);
-  }
-  else
-  {
-    m_receivers.insert(p, new_value);
-  }
-}
-
-
-void PQXX_COLD
-pqxx::connection::remove_receiver(pqxx::notification_receiver *T) noexcept
-{
-  if (T == nullptr)
-    return;
-
-  try
-  {
-    auto needle{
-      std::pair<std::string const, notification_receiver *>{T->channel(), T}};
-    auto R{m_receivers.equal_range(needle.first)};
-    auto i{find(R.first, R.second, needle)};
-
-    if (i == R.second)
-    {
-      PQXX_UNLIKELY
-      process_notice(internal::concat(
-        "Attempt to remove unknown receiver '", needle.first, "'"));
-    }
-    else
-    {
-      // Erase first; otherwise a notification for the same receiver may yet
-      // come in and wreak havoc.  Thanks Dragan Milenkovic.
-      bool const gone{R.second == ++R.first};
-      m_receivers.erase(i);
-      if (gone)
-        exec(internal::concat("UNLISTEN ", quote_name(needle.first)).c_str());
-    }
-  }
-  catch (std::exception const &e)
-  {
-    PQXX_UNLIKELY
-    process_notice(e.what());
-  }
-}
-
-
-bool pqxx::connection::consume_input() noexcept
-{
-  return PQconsumeInput(m_conn) != 0;
-}
-
-
-bool pqxx::connection::is_busy() const noexcept
-{
-  return PQisBusy(m_conn) != 0;
-}
-
-
-void PQXX_COLD pqxx::connection::cancel_query()
-{
-  using pointer = std::unique_ptr<PGcancel, std::function<void(PGcancel *)>>;
-  pointer cancel{PQgetCancel(m_conn), PQfreeCancel};
-  if (cancel == nullptr)
-    PQXX_UNLIKELY
-  throw std::bad_alloc{};
-
-  std::array<char, 500u> errbuf;
-  auto const err{errbuf.data()};
-  auto const c{
-    PQcancel(cancel.get(), err, static_cast<int>(std::size(errbuf)))};
-  if (c == 0)
-    PQXX_UNLIKELY
-  throw pqxx::sql_error{std::string{err, std::size(errbuf)}, "[cancel]"};
-}
-
-
-namespace
-{
-// C++20: std::span?
-/// Get error string for a given @c errno value.
-template<std::size_t BYTES>
-char const *PQXX_COLD
-error_string(int err_num, std::array<char, BYTES> &buffer)
-{
-  // Not entirely clear whether strerror_s will be in std or global namespace.
-  using namespace std;
-
-#if defined(PQXX_HAVE_STERROR_S) || defined(PQXX_HAVE_STRERROR_R)
-#  if defined(PQXX_HAVE_STRERROR_S)
-  auto const err_result{strerror_s(std::data(buffer), BYTES, err_num)};
-#  else
-  auto const err_result{strerror_r(err_num, std::data(buffer), BYTES)};
-#  endif
-  if constexpr (std::is_same_v<pqxx::strip_t<decltype(err_result)>, char *>)
-  {
-    // GNU version of strerror_r; returns the error string, which may or may
-    // not reside within buffer.
-    return err_result;
-  }
-  else
-  {
-    // Either strerror_s or POSIX strerror_r; returns an error code.
-    // Sorry for being lazy here: Not reporting error string for the case
-    // where we can't retrieve an error string.
-    if (err_result == 0)
-      return std::data(buffer);
-    else
-      return "Compound errors.";
-  }
-
-#else
-  // Fallback case, hopefully for no actual platforms out there.
-  pqxx::ignore_unused(err_num, buffer);
-  return "(No error information available.)";
-#endif
-}
-} // namespace
-
-
-#if defined(_WIN32) || __has_include(<fcntl.h>)
-void pqxx::connection::set_blocking(bool block) &
-{
-  auto const fd{sock()};
-#  if defined _WIN32
-  unsigned long mode{not block};
-  if (::ioctlsocket(fd, FIONBIO, &mode) != 0)
-  {
-    std::array<char, 200> errbuf;
-    char const *err{error_string(WSAGetLastError(), errbuf)};
-    throw broken_connection{
-      internal::concat("Could not set socket's blocking mode: ", err)};
-  }
-#  else  // _WIN32
-  std::array<char, 200> errbuf;
-  auto flags{::fcntl(fd, F_GETFL, 0)};
-  if (flags == -1)
-  {
-    char const *const err{error_string(errno, errbuf)};
-    throw broken_connection{
-      internal::concat("Could not get socket state: ", err)};
-  }
-  if (block)
-    flags |= O_NONBLOCK;
-  else
-    flags &= ~O_NONBLOCK;
-  if (::fcntl(fd, F_SETFL, flags) == -1)
-  {
-    char const *const err{error_string(errno, errbuf)};
-    throw broken_connection{
-      internal::concat("Could not set socket's blocking mode: ", err)};
-  }
-#  endif // _WIN32
-}
-#endif // defined(_WIN32) || __has_include(<fcntl.h>)
-
-
-void PQXX_COLD
-pqxx::connection::set_verbosity(error_verbosity verbosity) &noexcept
-{
-  PQsetErrorVerbosity(m_conn, static_cast<PGVerbosity>(verbosity));
-}
-
-
-namespace
-{
-/// Unique pointer to PGnotify.
-using notify_ptr = std::unique_ptr<PGnotify, std::function<void(PGnotify *)>>;
-
-
-/// Get one notification from a connection, or null.
-notify_ptr get_notif(pqxx::internal::pq::PGconn *conn)
-{
-  return notify_ptr(PQnotifies(conn), PQfreemem);
-}
-} // namespace
-
-
-int pqxx::connection::get_notifs()
-{
-  if (not consume_input())
-    throw broken_connection{"Connection lost."};
-
-  // Even if somehow we receive notifications during our transaction, don't
-  // deliver them.
-  if (m_trans)
-    PQXX_UNLIKELY
-  return 0;
-
-  int notifs = 0;
-  for (auto N{get_notif(m_conn)}; N.get(); N = get_notif(m_conn))
-  {
-    notifs++;
-
-    auto const Hit{m_receivers.equal_range(std::string{N->relname})};
-    if (Hit.second != Hit.first)
-    {
-      std::string payload{N->extra};
-      for (auto i{Hit.first}; i != Hit.second; ++i) try
-        {
-          (*i->second)(payload, N->be_pid);
-        }
-        catch (std::exception const &e)
-        {
-          try
-          {
-            process_notice(internal::concat(
-              "Exception in notification receiver '", i->first,
-              "': ", e.what(), "\n"));
-          }
-          catch (std::bad_alloc const &)
-          {
-            // Out of memory.  Try to get the message out in a more robust way.
-            process_notice(
-              "Exception in notification receiver, "
-              "and also ran out of memory\n");
-          }
-          catch (std::exception const &)
-          {
-            process_notice(
-              "Exception in notification receiver "
-              "(compounded by other error)\n");
-          }
-        }
-    }
-
-    N.reset();
-  }
-  return notifs;
-}
-
-
-char const *PQXX_COLD pqxx::connection::dbname() const
-{
-  return PQdb(m_conn);
-}
-
-
-char const *PQXX_COLD pqxx::connection::username() const
-{
-  return PQuser(m_conn);
-}
-
-
-char const *PQXX_COLD pqxx::connection::hostname() const
-{
-  return PQhost(m_conn);
-}
-
-
-char const *PQXX_COLD pqxx::connection::port() const
-{
-  return PQport(m_conn);
-}
-
-
-char const *pqxx::connection::err_msg() const noexcept
-{
-  return (m_conn == nullptr) ? "No connection to database" :
-                               PQerrorMessage(m_conn);
-}
-
-
-void PQXX_COLD pqxx::connection::register_errorhandler(errorhandler *handler)
-{
-  // Set notice processor on demand, i.e. only when the caller actually
-  // registers an error handler.
-  // We do this just to make it less likely that users fall into the trap
-  // where a result object may hold a notice processor derived from its parent
-  // connection which has already been destroyed.  Our notice processor goes
-  // through the connection's list of error handlers.  If the connection object
-  // has already been destroyed though, that list no longer exists.
-  // By setting the notice processor on demand, we absolve users who never
-  // register an error handler from ahving to care about this nasty subtlety.
-  if (std::empty(m_errorhandlers))
-    PQsetNoticeProcessor(m_conn, pqxx_notice_processor, this);
-  m_errorhandlers.push_back(handler);
-}
-
-
-void PQXX_COLD
-pqxx::connection::unregister_errorhandler(errorhandler *handler) noexcept
-{
-  // The errorhandler itself will take care of nulling its pointer to this
-  // connection.
-  m_errorhandlers.remove(handler);
-  if (std::empty(m_errorhandlers))
-    PQsetNoticeProcessor(m_conn, inert_notice_processor, nullptr);
-}
-
-
-std::vector<pqxx::errorhandler *>
-  PQXX_COLD pqxx::connection::get_errorhandlers() const
-{
-  return {std::begin(m_errorhandlers), std::end(m_errorhandlers)};
-}
-
-
-pqxx::result
-pqxx::connection::exec(std::string_view query, std::string_view desc)
-{
-  return exec(std::make_shared<std::string>(query), desc);
-}
-
-
-pqxx::result pqxx::connection::exec(
-  std::shared_ptr<std::string> query, std::string_view desc)
-{
-  auto const res{make_result(PQexec(m_conn, query->c_str()), query, desc)};
-  get_notifs();
-  return res;
-}
-
-
-std::string pqxx::connection::encrypt_password(
-  char const user[], char const password[], char const *algorithm)
-{
-#if defined(PQXX_HAVE_PQENCRYPTPASSWORDCONN)
-  {
-    auto const buf{PQencryptPasswordConn(m_conn, password, user, algorithm)};
-    std::unique_ptr<char const, std::function<void(char const *)>> ptr{
-      buf, [](char const *x) { PQfreemem(const_cast<char *>(x)); }};
-    return std::string(ptr.get());
-  }
-#else
-  {
-    // No PQencryptPasswordConn.  Fall back on the old PQencryptPassword...
-    // unless the caller selects a different algorithm.
-    if (algorithm != nullptr and std::strcmp(algorithm, "md5") != 0)
-      throw feature_not_supported{
-        "Could not encrypt password: available libpq version does not support "
-        "algorithms other than md5."};
-#  include "pqxx/internal/ignore-deprecated-pre.hxx"
-    return pqxx::encrypt_password(user, password);
-#  include "pqxx/internal/ignore-deprecated-post.hxx"
-  }
-#endif // PQXX_HAVE_PQENCRYPTPASSWORDCONN
-}
-
-
-void pqxx::connection::prepare(char const name[], char const definition[]) &
-{
-  auto const q{std::make_shared<std::string>(
-    pqxx::internal::concat("[PREPARE ", name, "]"))};
-
-  auto const r{
-    make_result(PQprepare(m_conn, name, definition, 0, nullptr), q, *q)};
-}
-
-
-void pqxx::connection::prepare(char const definition[]) &
-{
-  this->prepare("", definition);
-}
-
-
-void pqxx::connection::unprepare(std::string_view name)
-{
-  exec(internal::concat("DEALLOCATE ", quote_name(name)));
-}
-
-
-pqxx::result pqxx::connection::exec_prepared(
-  std::string_view statement, internal::c_params const &args)
-{
-  auto const q{std::make_shared<std::string>(statement)};
-  auto const pq_result{PQexecPrepared(
-    m_conn, q->c_str(),
-    check_cast<int>(std::size(args.values), "exec_prepared"sv),
-    args.values.data(), args.lengths.data(),
-    reinterpret_cast<int const *>(args.formats.data()),
-    static_cast<int>(format::text))};
-  auto const r{make_result(pq_result, q, statement)};
-  get_notifs();
-  return r;
-}
-
-
-void pqxx::connection::close()
-{
-  try
-  {
-    if (m_trans)
-      PQXX_UNLIKELY
-    process_notice(internal::concat(
-      "Closing connection while ",
-      internal::describe_object("transaction"sv, m_trans->name()),
-      " is still open."));
-
-    if (not std::empty(m_receivers))
-    {
-      PQXX_UNLIKELY
-      process_notice("Closing connection with outstanding receivers.");
-      m_receivers.clear();
-    }
-
-    std::list<errorhandler *> old_handlers;
-    m_errorhandlers.swap(old_handlers);
-    auto const rbegin{std::crbegin(old_handlers)},
-      rend{std::crend(old_handlers)};
-    for (auto i{rbegin}; i != rend; ++i)
-      pqxx::internal::gate::errorhandler_connection{**i}.unregister();
-
-    PQfinish(m_conn);
-    m_conn = nullptr;
-  }
-  catch (std::exception const &)
-  {
-    m_conn = nullptr;
-    throw;
-  }
-}
-
-
-int pqxx::connection::status() const noexcept
-{
-  return PQstatus(m_conn);
-}
-
-
-namespace
-{
-/// Return a name for t, if t is non-null and has a name; or empty string.
-std::string_view get_name(pqxx::transaction_base const *t)
-{
-  return (t == nullptr) ? ""sv : t->name();
-}
-} // namespace
-
-
-void pqxx::connection::register_transaction(transaction_base *t)
-{
-  internal::check_unique_register(
-    m_trans, "transaction", get_name(m_trans), t, "transaction", get_name(t));
-  m_trans = t;
-}
-
-
-void pqxx::connection::unregister_transaction(transaction_base *t) noexcept
-{
-  try
-  {
-    internal::check_unique_unregister(
-      m_trans, "transaction", get_name(m_trans), t, "transaction",
-      get_name(t));
-  }
-  catch (std::exception const &e)
-  {
-    process_notice(e.what());
-  }
-  m_trans = nullptr;
-}
-
-
-std::pair<std::unique_ptr<char, std::function<void(char *)>>, std::size_t>
-pqxx::connection::read_copy_line()
-{
-  char *buf{nullptr};
-
-  // Allocate once, re-use across invocations.
-  static auto const q{std::make_shared<std::string>("[END COPY]")};
-
-  auto const line_len{PQgetCopyData(m_conn, &buf, false)};
-  switch (line_len)
-  {
-  case -2: // Error.
-    throw failure{
-      internal::concat("Reading of table data failed: ", err_msg())};
-
-  case -1: // End of COPY.
-    make_result(PQgetResult(m_conn), q, *q);
-    return {};
-
-  case 0: // "Come back later."
-    throw internal_error{"table read inexplicably went asynchronous"};
-
-  default: // Success, got buffer size.
-    // Line size includes a trailing zero, which we ignore.
-    auto const text_len{static_cast<std::size_t>(line_len) - 1};
-    return std::make_pair(
-      std::unique_ptr<char, std::function<void(char *)>>{buf, PQfreemem},
-      text_len);
-  }
-}
-
-
-void pqxx::connection::write_copy_line(std::string_view line)
-{
-  static std::string const err_prefix{"Error writing to table: "};
-  auto const size{check_cast<int>(
-    internal::ssize(line), "Line in stream_to is too long to process."sv)};
-  if (PQputCopyData(m_conn, line.data(), size) <= 0)
-    PQXX_UNLIKELY
-  throw failure{err_prefix + err_msg()};
-  if (PQputCopyData(m_conn, "\n", 1) <= 0)
-    PQXX_UNLIKELY
-  throw failure{err_prefix + err_msg()};
-}
-
-
-void pqxx::connection::end_copy_write()
-{
-  int res{PQputCopyEnd(m_conn, nullptr)};
-  switch (res)
-  {
-  case -1:
-    throw failure{internal::concat("Write to table failed: ", err_msg())};
-  case 0: throw internal_error{"table write is inexplicably asynchronous"};
-  case 1:
-    // Normal termination.  Retrieve result object.
-    break;
-
-  default:
-    throw internal_error{
-      internal::concat("unexpected result ", res, " from PQputCopyEnd()")};
-  }
-
-  static auto const q{std::make_shared<std::string>("[END COPY]")};
-  make_result(PQgetResult(m_conn), q, *q);
-}
-
-
-void pqxx::connection::start_exec(char const query[])
-{
-  if (PQsendQuery(m_conn, query) == 0)
-    PQXX_UNLIKELY
-  throw failure{err_msg()};
-}
-
-
-pqxx::internal::pq::PGresult *pqxx::connection::get_result()
-{
-  return PQgetResult(m_conn);
-}
-
-
-size_t pqxx::connection::esc_to_buf(std::string_view text, char *buf) const
-{
-  int err{0};
-  auto const copied{
-    PQescapeStringConn(m_conn, buf, text.data(), std::size(text), &err)};
-  if (err)
-    PQXX_UNLIKELY
-  throw argument_error{err_msg()};
-  return copied;
-}
-
-
-std::string pqxx::connection::esc(std::string_view text) const
-{
-  std::string buf;
-  buf.resize(2 * std::size(text) + 1);
-  auto const copied{esc_to_buf(text, buf.data())};
-  buf.resize(copied);
-  return buf;
-}
-
-
-std::string PQXX_COLD
-pqxx::connection::esc_raw(unsigned char const bin[], std::size_t len) const
-{
-  return pqxx::internal::esc_bin(binary_cast(bin, len));
-}
-
-
-std::string
-pqxx::connection::esc_raw(std::basic_string_view<std::byte> bin) const
-{
-  return pqxx::internal::esc_bin(bin);
-}
-
-
-std::string PQXX_COLD pqxx::connection::unesc_raw(char const text[]) const
-{
-  if (text[0] == '\\' and text[1] == 'x')
-  {
-    // Hex-escaped format.
-    std::string buf;
-    buf.resize(pqxx::internal::size_unesc_bin(std::strlen(text)));
-    pqxx::internal::unesc_bin(
-      std::string_view{text}, reinterpret_cast<std::byte *>(buf.data()));
-    return buf;
-  }
-  else
-  {
-    // Legacy escape format.
-    // TODO: Remove legacy support.
-    std::size_t len;
-    auto bytes{const_cast<unsigned char *>(
-      reinterpret_cast<unsigned char const *>(text))};
-    std::unique_ptr<unsigned char, std::function<void(unsigned char *)>> const
-      ptr{PQunescapeBytea(bytes, &len), PQfreemem};
-    return std::string{ptr.get(), ptr.get() + len};
-  }
-}
-
-
-std::string PQXX_COLD
-pqxx::connection::quote_raw(unsigned char const bin[], std::size_t len) const
-{
-  return internal::concat("'", esc_raw(binary_cast(bin, len)), "'::bytea");
-}
-
-
-std::string
-pqxx::connection::quote_raw(std::basic_string_view<std::byte> bytes) const
-{
-  return internal::concat("'", esc_raw(bytes), "'::bytea");
-}
-
-
-std::string PQXX_COLD pqxx::connection::quote(binarystring const &b) const
-{
-  return quote(b.bytes_view());
-}
-
-
-std::string pqxx::connection::quote(std::basic_string_view<std::byte> b) const
-{
-  return internal::concat("'", esc_raw(b), "'::bytea");
-}
-
-
-std::string pqxx::connection::quote_name(std::string_view identifier) const
-{
-  std::unique_ptr<char, std::function<void(char *)>> buf{
-    PQescapeIdentifier(m_conn, identifier.data(), std::size(identifier)),
-    PQfreemem};
-  if (buf.get() == nullptr)
-    PQXX_UNLIKELY
-  throw failure{err_msg()};
-  return std::string{buf.get()};
-}
-
-
-std::string pqxx::connection::quote_table(std::string_view table_name) const
-{
-  return this->quote_name(table_name);
-}
-
-
-std::string pqxx::connection::quote_table(table_path path) const
-{
-  return separated_list(
-    ".", std::begin(path), std::end(path),
-    [this](auto name) { return this->quote_name(*name); });
-}
-
-
-std::string
-pqxx::connection::esc_like(std::string_view text, char escape_char) const
-{
-  std::string out;
-  out.reserve(std::size(text));
-  internal::for_glyphs(
-    internal::enc_group(encoding_id()),
-    [&out, escape_char](char const *gbegin, char const *gend) {
-      if ((gend - gbegin == 1) and (*gbegin == '_' or *gbegin == '%'))
-        // We're not expecting a lot of wildcards in a string.  Usually.
-        PQXX_UNLIKELY
-      out.push_back(escape_char);
-
-      for (; gbegin != gend; ++gbegin) out.push_back(*gbegin);
-    },
-    text.data(), std::size(text));
-  return out;
-}
-
-
-int pqxx::connection::await_notification()
-{
-  int notifs = get_notifs();
-  if (notifs == 0)
-  {
-    PQXX_LIKELY
-    internal::wait_fd(socket_of(m_conn), true, false, 10, 0);
-    notifs = get_notifs();
-  }
-  return notifs;
-}
-
-
-int pqxx::connection::await_notification(
-  std::time_t seconds, long microseconds)
-{
-  int notifs = get_notifs();
-  if (notifs == 0)
-  {
-    PQXX_LIKELY
-    internal::wait_fd(
-      socket_of(m_conn), true, false,
-      check_cast<unsigned>(seconds, "Seconds out of range."),
-      check_cast<unsigned>(microseconds, "Microseconds out of range."));
-    return get_notifs();
-  }
-  return notifs;
-}
-
-
-std::string pqxx::connection::adorn_name(std::string_view n)
-{
-  auto const id{to_string(++m_unique_id)};
-  if (std::empty(n))
-    return pqxx::internal::concat("x", id);
-  else
-    return pqxx::internal::concat(n, "_", id);
-}
-
-
-std::string pqxx::connection::get_client_encoding() const
-{
-  return internal::name_encoding(encoding_id());
-}
-
-
-void PQXX_COLD pqxx::connection::set_client_encoding(char const encoding[]) &
-{
-  switch (auto const retval{PQsetClientEncoding(m_conn, encoding)}; retval)
-  {
-  case 0:
-    // OK.
-    PQXX_LIKELY
-    break;
-  case -1:
-    PQXX_UNLIKELY
-    if (is_open())
-      throw failure{"Setting client encoding failed."};
-    else
-      throw broken_connection{"Lost connection to the database server."};
-  default:
-    PQXX_UNLIKELY
-    throw internal_error{internal::concat(
-      "Unexpected result from PQsetClientEncoding: ", retval)};
-  }
-}
-
-
-int pqxx::connection::encoding_id() const
-{
-  int const enc{PQclientEncoding(m_conn)};
-  if (enc == -1)
-  {
-    // PQclientEncoding does not query the database, but it does check for
-    // broken connections.  And unfortunately, we check the encoding right
-    // *before* checking a query result for failure.  So, we need to handle
-    // connection failure here and it will apply in lots of places.
-    // TODO: Make pqxx::result::result(...) do all the checking.
-    PQXX_UNLIKELY
-    if (is_open())
-      throw failure{"Could not obtain client encoding."};
-    else
-      throw broken_connection{"Lost connection to the database server."};
-  }
-  PQXX_LIKELY
-  return enc;
-}
-
-
-pqxx::result pqxx::connection::exec_params(
-  std::string_view query, internal::c_params const &args)
-{
-  auto const q{std::make_shared<std::string>(query)};
-  auto const pq_result{PQexecParams(
-    m_conn, q->c_str(),
-    check_cast<int>(std::size(args.values), "exec_params"sv), nullptr,
-    args.values.data(), args.lengths.data(),
-    reinterpret_cast<int const *>(args.formats.data()),
-    static_cast<int>(format::text))};
-  auto const r{make_result(pq_result, q)};
-  get_notifs();
-  return r;
-}
-
-
-namespace
-{
-/// Get the prevailing default value for a connection parameter.
-char const *get_default(PQconninfoOption const &opt) noexcept
-{
-  if (opt.envvar == nullptr)
-  {
-    // There's no environment variable for this setting.  The only default is
-    // the one that was compiled in.
-    return opt.compiled;
-  }
-  // As of C++11, std::getenv() uses thread-local storage, so it should be
-  // thread-safe.  MSVC still warns about it though.
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable : 4996)
-#endif
-  char const *var{std::getenv(opt.envvar)};
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#endif
-  if (var == nullptr)
-  {
-    // There's an environment variable for this setting, but it's not set.
-    return opt.compiled;
-  }
-
-  // The environment variable is the prevailing default.
-  return var;
-}
-} // namespace
-
-
-std::string pqxx::connection::connection_string() const
-{
-  if (m_conn == nullptr)
-    PQXX_UNLIKELY
-  throw usage_error{"Can't get connection string: connection is not open."};
-
-  std::unique_ptr<
-    PQconninfoOption, std::function<void(PQconninfoOption *)>> const params{
-    PQconninfo(m_conn), PQconninfoFree};
-  if (params.get() == nullptr)
-    PQXX_UNLIKELY
-  throw std::bad_alloc{};
-
-  std::string buf;
-  for (std::size_t i{0}; params.get()[i].keyword != nullptr; ++i)
-  {
-    auto const param{params.get()[i]};
-    if (param.val != nullptr)
-    {
-      auto const default_val{get_default(param)};
-      if (
-        (default_val == nullptr) or (std::strcmp(param.val, default_val) != 0))
-      {
-        if (not std::empty(buf))
-          buf.push_back(' ');
-        buf += param.keyword;
-        buf.push_back('=');
-        buf += param.val;
-      }
-    }
-  }
-  return buf;
-}
-
-
-#if defined(_WIN32) || __has_include(<fcntl.h>)
-pqxx::connecting::connecting(zview connection_string) :
-        m_conn{connection::connect_nonblocking, connection_string}
-{}
-#endif // defined(_WIN32) || __has_include(<fcntl.h>
-
-
-#if defined(_WIN32) || __has_include(<fcntl.h>)
-void pqxx::connecting::process() &
-{
-  auto const [reading, writing]{m_conn.poll_connect()};
-  m_reading = reading;
-  m_writing = writing;
-}
-#endif // defined(_WIN32) || __has_include(<fcntl.h>
-
-
-#if defined(_WIN32) || __has_include(<fcntl.h>)
-pqxx::connection pqxx::connecting::produce() &&
-{
-  if (!done())
-    throw usage_error{
-      "Tried to produce a nonblocking connection before it was done."};
-  m_conn.complete_init();
-  return std::move(m_conn);
-}
-#endif // defined(_WIN32) || __has_include(<fcntl.h>
diff --git a/ext/libpqxx-7.7.3/src/cursor.cxx b/ext/libpqxx-7.7.3/src/cursor.cxx
deleted file mode 100644
index 28e8ba42f..000000000
--- a/ext/libpqxx-7.7.3/src/cursor.cxx
+++ /dev/null
@@ -1,339 +0,0 @@
-/** Implementation of libpqxx STL-style cursor classes.
- *
- * These classes wrap SQL cursors in STL-like interfaces.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <iterator>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/cursor.hxx"
-#include "pqxx/internal/gates/icursor_iterator-icursorstream.hxx"
-#include "pqxx/internal/gates/icursorstream-icursor_iterator.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/strconv.hxx"
-#include "pqxx/transaction.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-pqxx::cursor_base::difference_type pqxx::cursor_base::all() noexcept
-{
-  // Implemented out-of-line so we don't fall afoul of Visual Studio defining
-  // min() and max() macros, which turn this expression into malformed code:
-  return std::numeric_limits<int>::max() - 1;
-}
-
-
-pqxx::cursor_base::difference_type pqxx::cursor_base::backward_all() noexcept
-{
-  // Implemented out-of-line so we don't fall afoul of Visual Studio defining
-  // min() and max() macros, which turn this expression into malformed code:
-  return std::numeric_limits<int>::min() + 1;
-}
-
-
-pqxx::cursor_base::cursor_base(
-  connection &context, std::string_view Name, bool embellish_name) :
-        m_name{embellish_name ? context.adorn_name(Name) : Name}
-{}
-
-
-pqxx::result::size_type
-pqxx::internal::obtain_stateless_cursor_size(sql_cursor &cur)
-{
-  if (cur.endpos() == -1)
-    cur.move(cursor_base::all());
-  return result::size_type(cur.endpos() - 1);
-}
-
-
-pqxx::result pqxx::internal::stateless_cursor_retrieve(
-  sql_cursor &cur, result::difference_type size,
-  result::difference_type begin_pos, result::difference_type end_pos)
-{
-  if (begin_pos < 0 or begin_pos > size)
-    throw range_error{"Starting position out of range"};
-
-  if (end_pos < -1)
-    end_pos = -1;
-  else if (end_pos > size)
-    end_pos = size;
-
-  if (begin_pos == end_pos)
-    return cur.empty_result();
-
-  int const direction{((begin_pos < end_pos) ? 1 : -1)};
-  cur.move((begin_pos - direction) - (cur.pos() - 1));
-  return cur.fetch(end_pos - begin_pos);
-}
-
-
-pqxx::icursorstream::icursorstream(
-  transaction_base &context, std::string_view query, std::string_view basename,
-  difference_type sstride) :
-        m_cur{
-          context,
-          query,
-          basename,
-          cursor_base::forward_only,
-          cursor_base::read_only,
-          cursor_base::owned,
-          false},
-        m_stride{sstride},
-        m_realpos{0},
-        m_reqpos{0},
-        m_iterators{nullptr},
-        m_done{false}
-{
-  set_stride(sstride);
-}
-
-
-pqxx::icursorstream::icursorstream(
-  transaction_base &context, field const &cname, difference_type sstride,
-  cursor_base::ownership_policy op) :
-        m_cur{context, cname.c_str(), op},
-        m_stride{sstride},
-        m_realpos{0},
-        m_reqpos{0},
-        m_iterators{nullptr},
-        m_done{false}
-{
-  set_stride(sstride);
-}
-
-
-void pqxx::icursorstream::set_stride(difference_type stride) &
-{
-  if (stride < 1)
-    throw argument_error{
-      internal::concat("Attempt to set cursor stride to ", stride)};
-  m_stride = stride;
-}
-
-
-pqxx::result pqxx::icursorstream::fetchblock()
-{
-  result const r{m_cur.fetch(m_stride)};
-  m_realpos += std::size(r);
-  if (std::empty(r))
-    m_done = true;
-  return r;
-}
-
-
-pqxx::icursorstream &pqxx::icursorstream::ignore(std::streamsize n) &
-{
-  auto offset{m_cur.move(difference_type(n))};
-  m_realpos += offset;
-  if (offset < n)
-    m_done = true;
-  return *this;
-}
-
-
-pqxx::icursorstream::size_type pqxx::icursorstream::forward(size_type n)
-{
-  m_reqpos += difference_type(n) * m_stride;
-  return icursorstream::size_type(m_reqpos);
-}
-
-
-void pqxx::icursorstream::insert_iterator(icursor_iterator *i) noexcept
-{
-  pqxx::internal::gate::icursor_iterator_icursorstream{*i}.set_next(
-    m_iterators);
-  if (m_iterators != nullptr)
-    pqxx::internal::gate::icursor_iterator_icursorstream{*m_iterators}
-      .set_prev(i);
-  m_iterators = i;
-}
-
-
-void pqxx::icursorstream::remove_iterator(icursor_iterator *i) const noexcept
-{
-  pqxx::internal::gate::icursor_iterator_icursorstream igate{*i};
-  if (i == m_iterators)
-  {
-    m_iterators = igate.get_next();
-    if (m_iterators != nullptr)
-      pqxx::internal::gate::icursor_iterator_icursorstream{*m_iterators}
-        .set_prev(nullptr);
-  }
-  else
-  {
-    auto prev{igate.get_prev()}, next{igate.get_next()};
-    pqxx::internal::gate::icursor_iterator_icursorstream{*prev}.set_next(next);
-    if (next != nullptr)
-      pqxx::internal::gate::icursor_iterator_icursorstream{*next}.set_prev(
-        prev);
-  }
-  igate.set_prev(nullptr);
-  igate.set_next(nullptr);
-}
-
-
-void pqxx::icursorstream::service_iterators(difference_type topos)
-{
-  if (topos < m_realpos)
-    return;
-
-  using todolist = std::multimap<difference_type, icursor_iterator *>;
-  todolist todo;
-  for (icursor_iterator *i{m_iterators}, *next; i != nullptr; i = next)
-  {
-    pqxx::internal::gate::icursor_iterator_icursorstream gate{*i};
-    auto const ipos{gate.pos()};
-    if (ipos >= m_realpos and ipos <= topos)
-      todo.insert(todolist::value_type(ipos, i));
-    next = gate.get_next();
-  }
-  auto const todo_end = std::end(todo);
-  for (auto i{std::begin(todo)}; i != todo_end;)
-  {
-    auto const readpos{i->first};
-    if (readpos > m_realpos)
-      ignore(readpos - m_realpos);
-    result const r{fetchblock()};
-    for (; i != todo_end and i->first == readpos; ++i)
-      pqxx::internal::gate::icursor_iterator_icursorstream{*i->second}.fill(r);
-  }
-}
-
-
-pqxx::icursor_iterator::icursor_iterator() noexcept : m_pos{0} {}
-
-
-pqxx::icursor_iterator::icursor_iterator(istream_type &s) noexcept :
-        m_stream{&s},
-        m_pos{difference_type(
-          pqxx::internal::gate::icursorstream_icursor_iterator(s).forward(0))}
-{
-  pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}
-    .insert_iterator(this);
-}
-
-
-pqxx::icursor_iterator::icursor_iterator(icursor_iterator const &rhs) noexcept
-        :
-        m_stream{rhs.m_stream}, m_here{rhs.m_here}, m_pos{rhs.m_pos}
-{
-  if (m_stream != nullptr)
-    pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}
-      .insert_iterator(this);
-}
-
-
-pqxx::icursor_iterator::~icursor_iterator() noexcept
-{
-  if (m_stream != nullptr)
-    pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}
-      .remove_iterator(this);
-}
-
-
-pqxx::icursor_iterator pqxx::icursor_iterator::operator++(int)
-{
-  icursor_iterator old{*this};
-  m_pos = difference_type(
-    pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}.forward());
-  m_here.clear();
-  return old;
-}
-
-
-pqxx::icursor_iterator &pqxx::icursor_iterator::operator++()
-{
-  m_pos = difference_type(
-    pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}.forward());
-  m_here.clear();
-  return *this;
-}
-
-
-pqxx::icursor_iterator &pqxx::icursor_iterator::operator+=(difference_type n)
-{
-  if (n <= 0)
-  {
-    PQXX_UNLIKELY
-    if (n == 0)
-      return *this;
-    throw argument_error{"Advancing icursor_iterator by negative offset."};
-  }
-  PQXX_LIKELY
-  m_pos = difference_type(
-    pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}.forward(
-      icursorstream::size_type(n)));
-  m_here.clear();
-  return *this;
-}
-
-
-pqxx::icursor_iterator &
-pqxx::icursor_iterator::operator=(icursor_iterator const &rhs) noexcept
-{
-  if (rhs.m_stream == m_stream)
-  {
-    PQXX_UNLIKELY
-    m_here = rhs.m_here;
-    m_pos = rhs.m_pos;
-  }
-  else
-  {
-    PQXX_LIKELY
-    if (m_stream != nullptr)
-      pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}
-        .remove_iterator(this);
-    m_here = rhs.m_here;
-    m_pos = rhs.m_pos;
-    m_stream = rhs.m_stream;
-    if (m_stream != nullptr)
-      pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}
-        .insert_iterator(this);
-  }
-  return *this;
-}
-
-
-bool pqxx::icursor_iterator::operator==(icursor_iterator const &rhs) const
-{
-  if (m_stream == rhs.m_stream)
-    return pos() == rhs.pos();
-  if (m_stream != nullptr and rhs.m_stream != nullptr)
-    return false;
-  refresh();
-  rhs.refresh();
-  return std::empty(m_here) and std::empty(rhs.m_here);
-}
-
-
-bool pqxx::icursor_iterator::operator<(icursor_iterator const &rhs) const
-{
-  if (m_stream == rhs.m_stream)
-    return pos() < rhs.pos();
-  refresh();
-  rhs.refresh();
-  return not std::empty(m_here);
-}
-
-
-void pqxx::icursor_iterator::refresh() const
-{
-  if (m_stream != nullptr)
-    pqxx::internal::gate::icursorstream_icursor_iterator{*m_stream}
-      .service_iterators(pos());
-}
-
-
-void pqxx::icursor_iterator::fill(result const &r)
-{
-  m_here = r;
-}
diff --git a/ext/libpqxx-7.7.3/src/encodings.cxx b/ext/libpqxx-7.7.3/src/encodings.cxx
deleted file mode 100644
index 99f038724..000000000
--- a/ext/libpqxx-7.7.3/src/encodings.cxx
+++ /dev/null
@@ -1,839 +0,0 @@
-/** Implementation of string encodings support
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cstring>
-#include <iomanip>
-#include <map>
-#include <sstream>
-
-extern "C"
-{
-#include <libpq-fe.h>
-}
-
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/encodings.hxx"
-#include "pqxx/strconv.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace pqxx
-{
-PQXX_DECLARE_ENUM_CONVERSION(pqxx::internal::encoding_group);
-}
-
-
-// Internal helper functions
-namespace
-{
-/// Extract byte from buffer, return as unsigned char.
-constexpr PQXX_PURE unsigned char
-get_byte(char const buffer[], std::size_t offset) noexcept
-{
-  return static_cast<unsigned char>(buffer[offset]);
-}
-
-
-[[noreturn]] void throw_for_encoding_error(
-  char const *encoding_name, char const buffer[], std::size_t start,
-  std::size_t count)
-{
-  std::stringstream s;
-  s << "Invalid byte sequence for encoding " << encoding_name << " at byte "
-    << start << ": " << std::hex << std::setw(2) << std::setfill('0');
-  for (std::size_t i{0}; i < count; ++i)
-  {
-    s << "0x" << static_cast<unsigned int>(get_byte(buffer, start + i));
-    if (i + 1 < count)
-      s << " ";
-  }
-  throw pqxx::argument_error{s.str()};
-}
-
-
-/// Does value lie between bottom and top, inclusive?
-constexpr PQXX_PURE bool
-between_inc(unsigned char value, unsigned bottom, unsigned top)
-{
-  return value >= bottom and value <= top;
-}
-
-
-/*
-EUC-JP and EUC-JIS-2004 represent slightly different code points but iterate
-the same:
- * https://en.wikipedia.org/wiki/Extended_Unix_Code#EUC-JP
- * http://x0213.org/codetable/index.en.html
-*/
-PQXX_PURE std::size_t next_seq_for_euc_jplike(
-  char const buffer[], std::size_t buffer_len, std::size_t start,
-  char const encoding_name[])
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error(encoding_name, buffer, start, 1);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (byte1 == 0x8e)
-  {
-    if (not between_inc(byte2, 0xa1, 0xfe))
-      PQXX_UNLIKELY
-    throw_for_encoding_error(encoding_name, buffer, start, 2);
-
-    return start + 2;
-  }
-
-  if (between_inc(byte1, 0xa1, 0xfe))
-  {
-    if (not between_inc(byte2, 0xa1, 0xfe))
-      PQXX_UNLIKELY
-    throw_for_encoding_error(encoding_name, buffer, start, 2);
-
-    return start + 2;
-  }
-
-  if (byte1 == 0x8f and start + 3 <= buffer_len)
-  {
-    auto const byte3{get_byte(buffer, start + 2)};
-    if (
-      not between_inc(byte2, 0xa1, 0xfe) or not between_inc(byte3, 0xa1, 0xfe))
-      PQXX_UNLIKELY
-    throw_for_encoding_error(encoding_name, buffer, start, 3);
-
-    return start + 3;
-  }
-
-  throw_for_encoding_error(encoding_name, buffer, start, 1);
-}
-
-/*
-As far as I can tell, for the purposes of iterating the only difference between
-SJIS and SJIS-2004 is increased range in the first byte of two-byte sequences
-(0xEF increased to 0xFC).  Officially, that is; apparently the version of SJIS
-used by Postgres has the same range as SJIS-2004.  They both have increased
-range over the documented versions, not having the even/odd restriction for the
-first byte in 2-byte sequences.
-*/
-// https://en.wikipedia.org/wiki/Shift_JIS#Shift_JIS_byte_map
-// http://x0213.org/codetable/index.en.html
-PQXX_PURE std::size_t next_seq_for_sjislike(
-  char const buffer[], std::size_t buffer_len, std::size_t start,
-  char const *encoding_name)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80 or between_inc(byte1, 0xa1, 0xdf))
-    return start + 1;
-
-  if (
-    not between_inc(byte1, 0x81, 0x9f) and not between_inc(byte1, 0xe0, 0xfc))
-    PQXX_UNLIKELY
-  throw_for_encoding_error(encoding_name, buffer, start, 1);
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error(encoding_name, buffer, start, buffer_len - start);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (byte2 == 0x7f)
-    PQXX_UNLIKELY
-  throw_for_encoding_error(encoding_name, buffer, start, 2);
-
-  if (between_inc(byte2, 0x40, 0x9e) or between_inc(byte2, 0x9f, 0xfc))
-    return start + 2;
-
-  PQXX_UNLIKELY
-  throw_for_encoding_error(encoding_name, buffer, start, 2);
-}
-} // namespace
-
-
-// Implement template specializations first.
-namespace pqxx::internal
-{
-template<encoding_group> struct glyph_scanner
-{
-  PQXX_PURE static std::size_t
-  call(char const buffer[], std::size_t buffer_len, std::size_t start);
-};
-
-template<> struct glyph_scanner<encoding_group::MONOBYTE>
-{
-  static PQXX_PURE constexpr std::size_t
-  call(char const /* buffer */[], std::size_t buffer_len, std::size_t start)
-  {
-    if (start >= buffer_len)
-      return std::string::npos;
-    else
-      return start + 1;
-  }
-};
-
-// https://en.wikipedia.org/wiki/Big5#Organization
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::BIG5>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (not between_inc(byte1, 0x81, 0xfe) or (start + 2 > buffer_len))
-    PQXX_UNLIKELY
-  throw_for_encoding_error("BIG5", buffer, start, 1);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (
-    not between_inc(byte2, 0x40, 0x7e) and not between_inc(byte2, 0xa1, 0xfe))
-    PQXX_UNLIKELY
-  throw_for_encoding_error("BIG5", buffer, start, 2);
-
-  return start + 2;
-}
-
-/*
-The PostgreSQL documentation claims that the EUC_* encodings are 1-3 bytes
-each, but other documents explain that the EUC sets can contain 1-(2,3,4) bytes
-depending on the specific extension:
-    EUC_CN      : 1-2
-    EUC_JP      : 1-3
-    EUC_JIS_2004: 1-2
-    EUC_KR      : 1-2
-    EUC_TW      : 1-4
-*/
-
-// https://en.wikipedia.org/wiki/GB_2312#EUC-CN
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::EUC_CN>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (not between_inc(byte1, 0xa1, 0xf7) or start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("EUC_CN", buffer, start, 1);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (not between_inc(byte2, 0xa1, 0xfe))
-    PQXX_UNLIKELY
-  throw_for_encoding_error("EUC_CN", buffer, start, 2);
-
-  return start + 2;
-}
-
-
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::EUC_JP>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  return next_seq_for_euc_jplike(buffer, buffer_len, start, "EUC_JP");
-}
-
-
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::EUC_JIS_2004>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  return next_seq_for_euc_jplike(buffer, buffer_len, start, "EUC_JIS_2004");
-}
-
-
-// https://en.wikipedia.org/wiki/Extended_Unix_Code#EUC-KR
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::EUC_KR>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (not between_inc(byte1, 0xa1, 0xfe) or start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("EUC_KR", buffer, start, 1);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (not between_inc(byte2, 0xa1, 0xfe))
-    PQXX_UNLIKELY
-  throw_for_encoding_error("EUC_KR", buffer, start, 1);
-
-  return start + 2;
-}
-
-// https://en.wikipedia.org/wiki/Extended_Unix_Code#EUC-TW
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::EUC_TW>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    PQXX_UNLIKELY
-  return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("EUC_KR", buffer, start, 1);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (between_inc(byte1, 0xa1, 0xfe))
-  {
-    if (not between_inc(byte2, 0xa1, 0xfe))
-      PQXX_UNLIKELY
-    throw_for_encoding_error("EUC_KR", buffer, start, 2);
-
-    return start + 2;
-  }
-
-  if (byte1 != 0x8e or start + 4 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("EUC_KR", buffer, start, 1);
-
-  if (
-    between_inc(byte2, 0xa1, 0xb0) and
-    between_inc(get_byte(buffer, start + 2), 0xa1, 0xfe) and
-    between_inc(get_byte(buffer, start + 3), 0xa1, 0xfe))
-    return start + 4;
-
-  PQXX_UNLIKELY
-  throw_for_encoding_error("EUC_KR", buffer, start, 4);
-}
-
-// https://en.wikipedia.org/wiki/GB_18030#Mapping
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::GB18030>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-  if (byte1 == 0x80)
-    throw_for_encoding_error("GB18030", buffer, start, buffer_len - start);
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("GB18030", buffer, start, buffer_len - start);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (between_inc(byte2, 0x40, 0xfe))
-  {
-    if (byte2 == 0x7f)
-      PQXX_UNLIKELY
-    throw_for_encoding_error("GB18030", buffer, start, 2);
-
-    return start + 2;
-  }
-
-  if (start + 4 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("GB18030", buffer, start, buffer_len - start);
-
-  if (
-    between_inc(byte2, 0x30, 0x39) and
-    between_inc(get_byte(buffer, start + 2), 0x81, 0xfe) and
-    between_inc(get_byte(buffer, start + 3), 0x30, 0x39))
-    return start + 4;
-
-  PQXX_UNLIKELY
-  throw_for_encoding_error("GB18030", buffer, start, 4);
-}
-
-// https://en.wikipedia.org/wiki/GBK_(character_encoding)#Encoding
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::GBK>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("GBK", buffer, start, 1);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (
-    (between_inc(byte1, 0xa1, 0xa9) and between_inc(byte2, 0xa1, 0xfe)) or
-    (between_inc(byte1, 0xb0, 0xf7) and between_inc(byte2, 0xa1, 0xfe)) or
-    (between_inc(byte1, 0x81, 0xa0) and between_inc(byte2, 0x40, 0xfe) and
-     byte2 != 0x7f) or
-    (between_inc(byte1, 0xaa, 0xfe) and between_inc(byte2, 0x40, 0xa0) and
-     byte2 != 0x7f) or
-    (between_inc(byte1, 0xa8, 0xa9) and between_inc(byte2, 0x40, 0xa0) and
-     byte2 != 0x7f) or
-    (between_inc(byte1, 0xaa, 0xaf) and between_inc(byte2, 0xa1, 0xfe)) or
-    (between_inc(byte1, 0xf8, 0xfe) and between_inc(byte2, 0xa1, 0xfe)) or
-    (between_inc(byte1, 0xa1, 0xa7) and between_inc(byte2, 0x40, 0xa0) and
-     byte2 != 0x7f))
-    return start + 2;
-
-  PQXX_UNLIKELY
-  throw_for_encoding_error("GBK", buffer, start, 2);
-}
-
-/*
-The PostgreSQL documentation claims that the JOHAB encoding is 1-3 bytes, but
-"CJKV Information Processing" describes it (actually just the Hangul portion)
-as "three five-bit segments" that reside inside 16 bits (2 bytes).
-
-CJKV Information Processing by Ken Lunde, pg. 269:
-
-  https://bit.ly/2BEOu5V
-*/
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::JOHAB>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("JOHAB", buffer, start, 1);
-
-  auto const byte2{get_byte(buffer, start)};
-  if (
-    (between_inc(byte1, 0x84, 0xd3) and
-     (between_inc(byte2, 0x41, 0x7e) or between_inc(byte2, 0x81, 0xfe))) or
-    ((between_inc(byte1, 0xd8, 0xde) or between_inc(byte1, 0xe0, 0xf9)) and
-     (between_inc(byte2, 0x31, 0x7e) or between_inc(byte2, 0x91, 0xfe))))
-    return start + 2;
-
-  PQXX_UNLIKELY
-  throw_for_encoding_error("JOHAB", buffer, start, 2);
-}
-
-/*
-PostgreSQL's MULE_INTERNAL is the emacs rather than Xemacs implementation;
-see the server/mb/pg_wchar.h PostgreSQL header file.
-This is implemented according to the description in said header file, but I was
-unable to get it to successfully iterate a MULE-encoded test CSV generated
-using PostgreSQL 9.2.23.  Use this at your own risk.
-*/
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::MULE_INTERNAL>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("MULE_INTERNAL", buffer, start, 1);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (between_inc(byte1, 0x81, 0x8d) and byte2 >= 0xa0)
-    return start + 2;
-
-  if (start + 3 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("MULE_INTERNAL", buffer, start, 2);
-
-  if (
-    ((byte1 == 0x9a and between_inc(byte2, 0xa0, 0xdf)) or
-     (byte1 == 0x9b and between_inc(byte2, 0xe0, 0xef)) or
-     (between_inc(byte1, 0x90, 0x99) and byte2 >= 0xa0)) and
-    (byte2 >= 0xa0))
-    return start + 3;
-
-  if (start + 4 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("MULE_INTERNAL", buffer, start, 3);
-
-  if (
-    ((byte1 == 0x9c and between_inc(byte2, 0xf0, 0xf4)) or
-     (byte1 == 0x9d and between_inc(byte2, 0xf5, 0xfe))) and
-    get_byte(buffer, start + 2) >= 0xa0 and
-    get_byte(buffer, start + 4) >= 0xa0)
-    return start + 4;
-
-  PQXX_UNLIKELY
-  throw_for_encoding_error("MULE_INTERNAL", buffer, start, 4);
-}
-
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::SJIS>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  return next_seq_for_sjislike(buffer, buffer_len, start, "SJIS");
-}
-
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::SHIFT_JIS_2004>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  return next_seq_for_sjislike(buffer, buffer_len, start, "SHIFT_JIS_2004");
-}
-
-// https://en.wikipedia.org/wiki/Unified_Hangul_Code
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::UHC>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("UHC", buffer, start, buffer_len - start);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (between_inc(byte1, 0x80, 0xc6))
-  {
-    if (
-      between_inc(byte2, 0x41, 0x5a) or between_inc(byte2, 0x61, 0x7a) or
-      between_inc(byte2, 0x80, 0xfe))
-      return start + 2;
-
-    PQXX_UNLIKELY
-    throw_for_encoding_error("UHC", buffer, start, 2);
-  }
-
-  if (between_inc(byte1, 0xa1, 0xfe))
-  {
-    if (not between_inc(byte2, 0xa1, 0xfe))
-      PQXX_UNLIKELY
-    throw_for_encoding_error("UHC", buffer, start, 2);
-
-    return start + 2;
-  }
-
-  throw_for_encoding_error("UHC", buffer, start, 1);
-}
-
-// https://en.wikipedia.org/wiki/UTF-8#Description
-template<>
-PQXX_PURE std::size_t glyph_scanner<encoding_group::UTF8>::call(
-  char const buffer[], std::size_t buffer_len, std::size_t start)
-{
-  if (start >= buffer_len)
-    return std::string::npos;
-
-  auto const byte1{get_byte(buffer, start)};
-  if (byte1 < 0x80)
-    return start + 1;
-
-  if (start + 2 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("UTF8", buffer, start, buffer_len - start);
-
-  auto const byte2{get_byte(buffer, start + 1)};
-  if (between_inc(byte1, 0xc0, 0xdf))
-  {
-    if (not between_inc(byte2, 0x80, 0xbf))
-      PQXX_UNLIKELY
-    throw_for_encoding_error("UTF8", buffer, start, 2);
-
-    return start + 2;
-  }
-
-  if (start + 3 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("UTF8", buffer, start, buffer_len - start);
-
-  auto const byte3{get_byte(buffer, start + 2)};
-  if (between_inc(byte1, 0xe0, 0xef))
-  {
-    if (between_inc(byte2, 0x80, 0xbf) and between_inc(byte3, 0x80, 0xbf))
-      return start + 3;
-
-    PQXX_UNLIKELY
-    throw_for_encoding_error("UTF8", buffer, start, 3);
-  }
-
-  if (start + 4 > buffer_len)
-    PQXX_UNLIKELY
-  throw_for_encoding_error("UTF8", buffer, start, buffer_len - start);
-
-  if (between_inc(byte1, 0xf0, 0xf7))
-  {
-    if (
-      between_inc(byte2, 0x80, 0xbf) and between_inc(byte3, 0x80, 0xbf) and
-      between_inc(get_byte(buffer, start + 3), 0x80, 0xbf))
-      return start + 4;
-
-    PQXX_UNLIKELY
-    throw_for_encoding_error("UTF8", buffer, start, 4);
-  }
-
-  PQXX_UNLIKELY
-  throw_for_encoding_error("UTF8", buffer, start, 1);
-}
-
-
-PQXX_PURE char const *name_encoding(int encoding_id)
-{
-  return pg_encoding_to_char(encoding_id);
-}
-
-
-encoding_group enc_group(int libpq_enc_id)
-{
-  return enc_group(name_encoding(libpq_enc_id));
-}
-
-
-encoding_group enc_group(std::string_view encoding_name)
-{
-  struct mapping
-  {
-    std::string_view const name;
-    encoding_group const group;
-    constexpr mapping(std::string_view n, encoding_group g) : name{n}, group{g}
-    {}
-    constexpr bool operator<(mapping const &rhs) const
-    {
-      return name < rhs.name;
-    }
-  };
-
-  // C++20: Once compilers are ready, go full constexpr, leave to the compiler.
-  auto const sz{std::size(encoding_name)};
-  if (sz > 0u)
-    switch (encoding_name[0])
-    {
-    case 'B':
-      if (encoding_name == "BIG5"sv)
-        return encoding_group::BIG5;
-      PQXX_UNLIKELY
-      break;
-    case 'E':
-      // C++20: Use string_view::starts_with().
-      if ((sz >= 6u) and (encoding_name.substr(0, 4) == "EUC_"sv))
-      {
-        auto const subtype{encoding_name.substr(4)};
-        static constexpr std::array<mapping, 5> subtypes{
-          mapping{"CN"sv, encoding_group::EUC_CN},
-          mapping{"JIS_2004"sv, encoding_group::EUC_JIS_2004},
-          mapping{"JP"sv, encoding_group::EUC_JP},
-          mapping{"KR"sv, encoding_group::EUC_KR},
-          mapping{"TW"sv, encoding_group::EUC_TW},
-        };
-        for (auto const &m : subtypes)
-          if (m.name == subtype)
-            return m.group;
-      }
-      PQXX_UNLIKELY
-      break;
-    case 'G':
-      if (encoding_name == "GB18030"sv)
-        return encoding_group::GB18030;
-      else if (encoding_name == "GBK"sv)
-        return encoding_group::GBK;
-      PQXX_UNLIKELY
-      break;
-    case 'I':
-      // We know iso-8859-X, where 5 <= X < 9.  They're all monobyte encodings.
-      if ((sz == 10) and (encoding_name.substr(0, 9) == "ISO_8859_"sv))
-      {
-        char const subtype{encoding_name[9]};
-        if (('5' <= subtype) and (subtype < '9'))
-          return encoding_group::MONOBYTE;
-      }
-      PQXX_UNLIKELY
-      break;
-    case 'J':
-      if (encoding_name == "JOHAB"sv)
-        return encoding_group::JOHAB;
-      PQXX_UNLIKELY
-      break;
-    case 'K':
-      if ((encoding_name == "KOI8R"sv) or (encoding_name == "KOI8U"sv))
-        return encoding_group::MONOBYTE;
-      PQXX_UNLIKELY
-      break;
-    case 'L':
-      // We know LATIN1 through LATIN10.
-      if (encoding_name.substr(0, 5) == "LATIN"sv)
-      {
-        auto const subtype{encoding_name.substr(5)};
-        if (subtype.size() == 1)
-        {
-          char const n{subtype[0]};
-          if (('1' <= n) and (n <= '9'))
-            return encoding_group::MONOBYTE;
-        }
-        else if (subtype == "10"sv)
-        {
-          return encoding_group::MONOBYTE;
-        }
-      }
-      PQXX_UNLIKELY
-      break;
-    case 'M':
-      if (encoding_name == "MULE_INTERNAL"sv)
-        return encoding_group::MULE_INTERNAL;
-      PQXX_UNLIKELY
-      break;
-    case 'S':
-      if (encoding_name == "SHIFT_JIS_2004"sv)
-        return encoding_group::SHIFT_JIS_2004;
-      else if (encoding_name == "SJIS"sv)
-        return encoding_group::SJIS;
-      else if (encoding_name == "SQL_ASCII"sv)
-        return encoding_group::MONOBYTE;
-      PQXX_UNLIKELY
-      break;
-    case 'U':
-      if (encoding_name == "UHC"sv)
-        return encoding_group::UHC;
-      else if (encoding_name == "UTF8"sv)
-        return encoding_group::UTF8;
-      PQXX_UNLIKELY
-      break;
-    case 'W':
-      if (encoding_name.substr(0, 3) == "WIN"sv)
-      {
-        auto const subtype{encoding_name.substr(3)};
-        static constexpr std::array<std::string_view, 11u> subtypes{
-          "866"sv,  "874"sv,  "1250"sv, "1251"sv, "1252"sv, "1253"sv,
-          "1254"sv, "1255"sv, "1256"sv, "1257"sv, "1258"sv,
-        };
-        for (auto const n : subtypes)
-          if (n == subtype)
-            return encoding_group::MONOBYTE;
-      }
-      PQXX_UNLIKELY
-      break;
-    default: PQXX_UNLIKELY break;
-    }
-  PQXX_UNLIKELY
-  throw std::invalid_argument{
-    internal::concat("Unrecognized encoding: '", encoding_name, "'.")};
-}
-
-
-/// Look up instantiation @c T<enc>::call at runtime.
-/** Here, "T" is a struct template with a static member function "call", whose
- * type is "F".
- *
- * The return value is a pointer to the "call" member function for the
- * instantiation of T for encoding group enc.
- */
-template<template<encoding_group> class T, typename F>
-constexpr inline F *for_encoding(encoding_group enc)
-{
-#define CASE_GROUP(ENC)                                                       \
-  case encoding_group::ENC: return T<encoding_group::ENC>::call
-
-  switch (enc)
-  {
-    PQXX_LIKELY CASE_GROUP(MONOBYTE);
-    CASE_GROUP(BIG5);
-    CASE_GROUP(EUC_CN);
-    CASE_GROUP(EUC_JP);
-    CASE_GROUP(EUC_JIS_2004);
-    CASE_GROUP(EUC_KR);
-    CASE_GROUP(EUC_TW);
-    CASE_GROUP(GB18030);
-    CASE_GROUP(GBK);
-    CASE_GROUP(JOHAB);
-    CASE_GROUP(MULE_INTERNAL);
-    CASE_GROUP(SJIS);
-    CASE_GROUP(SHIFT_JIS_2004);
-    CASE_GROUP(UHC);
-    PQXX_LIKELY CASE_GROUP(UTF8);
-  }
-  PQXX_UNLIKELY
-  throw pqxx::usage_error{
-    internal::concat("Unsupported encoding group code ", enc, ".")};
-
-#undef CASE_GROUP
-}
-
-
-PQXX_PURE glyph_scanner_func *get_glyph_scanner(encoding_group enc)
-{
-  return for_encoding<glyph_scanner, glyph_scanner_func>(enc);
-}
-
-
-template<encoding_group E> struct char_finder
-{
-  constexpr static PQXX_PURE std::size_t
-  call(std::string_view haystack, char needle, std::size_t start)
-  {
-    auto const buffer{std::data(haystack)};
-    auto const size{std::size(haystack)};
-    for (auto here{start}; here + 1 <= size;
-         here = glyph_scanner<E>::call(buffer, size, here))
-    {
-      if (haystack[here] == needle)
-        return here;
-    }
-    return std::string::npos;
-  }
-};
-
-
-template<encoding_group E> struct string_finder
-{
-  PQXX_PURE constexpr static PQXX_PURE std::size_t
-  call(std::string_view haystack, std::string_view needle, std::size_t start)
-  {
-    auto const buffer{std::data(haystack)};
-    auto const size{std::size(haystack)};
-    auto const needle_size{std::size(needle)};
-    for (auto here{start}; here + needle_size <= size;
-         here = glyph_scanner<E>::call(buffer, size, here))
-    {
-      if (std::memcmp(buffer + here, std::data(needle), needle_size) == 0)
-        return here;
-    }
-    return std::string::npos;
-  }
-};
-
-#undef DISPATCH_ENCODING_OPERATION
-} // namespace pqxx::internal
diff --git a/ext/libpqxx-7.7.3/src/errorhandler.cxx b/ext/libpqxx-7.7.3/src/errorhandler.cxx
deleted file mode 100644
index de120ff3d..000000000
--- a/ext/libpqxx-7.7.3/src/errorhandler.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/** Implementation of pqxx::errorhandler and helpers.
- *
- * pqxx::errorhandler allows programs to receive errors and warnings.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/connection.hxx"
-#include "pqxx/errorhandler.hxx"
-#include "pqxx/internal/gates/connection-errorhandler.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-pqxx::errorhandler::errorhandler(connection &conn) : m_home{&conn}
-{
-  pqxx::internal::gate::connection_errorhandler{*m_home}.register_errorhandler(
-    this);
-}
-
-
-pqxx::errorhandler::~errorhandler()
-{
-  unregister();
-}
-
-
-void pqxx::errorhandler::unregister() noexcept
-{
-  if (m_home != nullptr)
-  {
-    pqxx::internal::gate::connection_errorhandler connection_gate{*m_home};
-    m_home = nullptr;
-    connection_gate.unregister_errorhandler(this);
-  }
-}
diff --git a/ext/libpqxx-7.7.3/src/except.cxx b/ext/libpqxx-7.7.3/src/except.cxx
deleted file mode 100644
index 4974e8ac0..000000000
--- a/ext/libpqxx-7.7.3/src/except.cxx
+++ /dev/null
@@ -1,126 +0,0 @@
-/** Implementation of libpqxx exception classes.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-pqxx::failure::failure(std::string const &whatarg) :
-        std::runtime_error{whatarg}
-{}
-
-
-pqxx::broken_connection::broken_connection() :
-        failure{"Connection to database failed."}
-{}
-
-
-pqxx::broken_connection::broken_connection(std::string const &whatarg) :
-        failure{whatarg}
-{}
-
-
-pqxx::variable_set_to_null::variable_set_to_null() :
-        variable_set_to_null{
-          "Attempt to set a variable to null.  This is not allowed."}
-{}
-
-
-pqxx::variable_set_to_null::variable_set_to_null(std::string const &whatarg) :
-        failure{whatarg}
-{}
-
-
-pqxx::sql_error::sql_error(
-  std::string const &whatarg, std::string const &Q, char const sqlstate[]) :
-        failure{whatarg}, m_query{Q}, m_sqlstate{sqlstate ? sqlstate : ""}
-{}
-
-
-pqxx::sql_error::~sql_error() noexcept = default;
-
-
-PQXX_PURE std::string const &pqxx::sql_error::query() const noexcept
-{
-  return m_query;
-}
-
-
-PQXX_PURE std::string const &pqxx::sql_error::sqlstate() const noexcept
-{
-  return m_sqlstate;
-}
-
-
-pqxx::in_doubt_error::in_doubt_error(std::string const &whatarg) :
-        failure{whatarg}
-{}
-
-
-pqxx::transaction_rollback::transaction_rollback(
-  std::string const &whatarg, std::string const &q, char const sqlstate[]) :
-        sql_error{whatarg, q, sqlstate}
-{}
-
-
-pqxx::serialization_failure::serialization_failure(
-  std::string const &whatarg, std::string const &q, char const sqlstate[]) :
-        transaction_rollback{whatarg, q, sqlstate}
-{}
-
-
-pqxx::statement_completion_unknown::statement_completion_unknown(
-  std::string const &whatarg, std::string const &q, char const sqlstate[]) :
-        transaction_rollback{whatarg, q, sqlstate}
-{}
-
-
-pqxx::deadlock_detected::deadlock_detected(
-  std::string const &whatarg, std::string const &q, char const sqlstate[]) :
-        transaction_rollback{whatarg, q, sqlstate}
-{}
-
-
-pqxx::internal_error::internal_error(std::string const &whatarg) :
-        std::logic_error{internal::concat("libpqxx internal error: ", whatarg)}
-{}
-
-
-pqxx::usage_error::usage_error(std::string const &whatarg) :
-        std::logic_error{whatarg}
-{}
-
-
-pqxx::argument_error::argument_error(std::string const &whatarg) :
-        invalid_argument{whatarg}
-{}
-
-
-pqxx::conversion_error::conversion_error(std::string const &whatarg) :
-        domain_error{whatarg}
-{}
-
-
-pqxx::conversion_overrun::conversion_overrun(std::string const &whatarg) :
-        conversion_error{whatarg}
-{}
-
-
-pqxx::range_error::range_error(std::string const &whatarg) :
-        out_of_range{whatarg}
-{}
-
-
-pqxx::blob_already_exists::blob_already_exists(std::string const &whatarg) :
-        failure{whatarg}
-{}
diff --git a/ext/libpqxx-7.7.3/src/field.cxx b/ext/libpqxx-7.7.3/src/field.cxx
deleted file mode 100644
index f5026ced2..000000000
--- a/ext/libpqxx-7.7.3/src/field.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/** Implementation of the pqxx::field class.
- *
- * pqxx::field refers to a field in a query result.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cstring>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/field.hxx"
-#include "pqxx/internal/libpq-forward.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-pqxx::field::field(pqxx::row const &r, pqxx::row::size_type c) noexcept :
-        m_col{c}, m_home{r.m_result}, m_row{r.m_index}
-{}
-
-
-bool PQXX_COLD pqxx::field::operator==(field const &rhs) const
-{
-  if (is_null() and rhs.is_null())
-    return true;
-  if (is_null() != rhs.is_null())
-    return false;
-  auto const s{size()};
-  return (s == std::size(rhs)) and (std::memcmp(c_str(), rhs.c_str(), s) == 0);
-}
-
-
-char const *pqxx::field::name() const &
-{
-  return home().column_name(col());
-}
-
-
-pqxx::oid pqxx::field::type() const
-{
-  return home().column_type(col());
-}
-
-
-pqxx::oid pqxx::field::table() const
-{
-  return home().column_table(col());
-}
-
-
-pqxx::row::size_type pqxx::field::table_column() const
-{
-  return home().table_column(col());
-}
-
-
-char const *pqxx::field::c_str() const &
-{
-  return home().get_value(idx(), col());
-}
-
-
-bool pqxx::field::is_null() const noexcept
-{
-  return home().get_is_null(idx(), col());
-}
-
-
-pqxx::field::size_type pqxx::field::size() const noexcept
-{
-  return home().get_length(idx(), col());
-}
diff --git a/ext/libpqxx-7.7.3/src/largeobject.cxx b/ext/libpqxx-7.7.3/src/largeobject.cxx
deleted file mode 100644
index c57de3c73..000000000
--- a/ext/libpqxx-7.7.3/src/largeobject.cxx
+++ /dev/null
@@ -1,322 +0,0 @@
-/** Implementation of the Large Objects interface.
- *
- * Allows direct access to large objects, as well as though I/O streams.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <algorithm>
-#include <cerrno>
-#include <stdexcept>
-
-extern "C"
-{
-#include <libpq-fe.h>
-}
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/gates/connection-largeobject.hxx"
-#include "pqxx/largeobject.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-
-namespace
-{
-constexpr inline int PQXX_COLD std_mode_to_pq_mode(std::ios::openmode mode)
-{
-  /// Mode bits, copied from libpq-fs.h so that we no longer need that header.
-  constexpr int INV_WRITE{0x00020000}, INV_READ{0x00040000};
-
-  return ((mode & std::ios::in) ? INV_READ : 0) |
-         ((mode & std::ios::out) ? INV_WRITE : 0);
-}
-
-
-constexpr int PQXX_COLD std_dir_to_pq_dir(std::ios::seekdir dir) noexcept
-{
-  if constexpr (
-    static_cast<int>(std::ios::beg) == int(SEEK_SET) and
-    static_cast<int>(std::ios::cur) == int(SEEK_CUR) and
-    static_cast<int>(std::ios::end) == int(SEEK_END))
-  {
-    // Easy optimisation: they're the same constants.  This is actually the
-    // case for the gcc I'm using.
-    return dir;
-  }
-  else
-    switch (dir)
-    {
-    case std::ios::beg: return SEEK_SET; break;
-    case std::ios::cur: return SEEK_CUR; break;
-    case std::ios::end: return SEEK_END; break;
-
-    // Shouldn't happen, but may silence compiler warning.
-    default: return dir; break;
-    }
-}
-} // namespace
-
-
-PQXX_COLD pqxx::largeobject::largeobject(dbtransaction &t)
-{
-  // (Mode is ignored as of postgres 8.1.)
-  m_id = lo_creat(raw_connection(t), 0);
-  if (m_id == oid_none)
-  {
-    int const err{errno};
-    if (err == ENOMEM)
-      throw std::bad_alloc{};
-    throw failure{internal::concat(
-      "Could not create large object: ", reason(t.conn(), err))};
-  }
-}
-
-
-PQXX_COLD
-pqxx::largeobject::largeobject(dbtransaction &t, std::string_view file)
-{
-  m_id = lo_import(raw_connection(t), std::data(file));
-  if (m_id == oid_none)
-  {
-    int const err{errno};
-    if (err == ENOMEM)
-      throw std::bad_alloc{};
-    throw failure{internal::concat(
-      "Could not import file '", file,
-      "' to large object: ", reason(t.conn(), err))};
-  }
-}
-
-
-PQXX_COLD pqxx::largeobject::largeobject(largeobjectaccess const &o) noexcept :
-        m_id{o.id()}
-{}
-
-
-void PQXX_COLD
-pqxx::largeobject::to_file(dbtransaction &t, std::string_view file) const
-{
-  if (id() == oid_none)
-    throw usage_error{"No object selected."};
-  if (lo_export(raw_connection(t), id(), std::data(file)) == -1)
-  {
-    int const err{errno};
-    if (err == ENOMEM)
-      throw std::bad_alloc{};
-    throw failure{internal::concat(
-      "Could not export large object ", m_id, " to file '", file,
-      "': ", reason(t.conn(), err))};
-  }
-}
-
-
-void PQXX_COLD pqxx::largeobject::remove(dbtransaction &t) const
-{
-  if (id() == oid_none)
-    throw usage_error{"No object selected."};
-  if (lo_unlink(raw_connection(t), id()) == -1)
-  {
-    int const err{errno};
-    if (err == ENOMEM)
-      throw std::bad_alloc{};
-    throw failure{internal::concat(
-      "Could not delete large object ", m_id, ": ", reason(t.conn(), err))};
-  }
-}
-
-
-pqxx::internal::pq::PGconn *PQXX_COLD
-pqxx::largeobject::raw_connection(dbtransaction const &t)
-{
-  return pqxx::internal::gate::connection_largeobject{t.conn()}
-    .raw_connection();
-}
-
-
-std::string PQXX_COLD
-pqxx::largeobject::reason(connection const &c, int err) const
-{
-  if (err == ENOMEM)
-    return "Out of memory";
-  return pqxx::internal::gate::const_connection_largeobject{c}.error_message();
-}
-
-
-PQXX_COLD
-pqxx::largeobjectaccess::largeobjectaccess(dbtransaction &t, openmode mode) :
-        largeobject{t}, m_trans{t}
-{
-  open(mode);
-}
-
-
-PQXX_COLD pqxx::largeobjectaccess::largeobjectaccess(
-  dbtransaction &t, oid o, openmode mode) :
-        largeobject{o}, m_trans{t}
-{
-  open(mode);
-}
-
-
-PQXX_COLD pqxx::largeobjectaccess::largeobjectaccess(
-  dbtransaction &t, largeobject o, openmode mode) :
-        largeobject{o}, m_trans{t}
-{
-  open(mode);
-}
-
-
-PQXX_COLD pqxx::largeobjectaccess::largeobjectaccess(
-  dbtransaction &t, std::string_view file, openmode mode) :
-        largeobject{t, file}, m_trans{t}
-{
-  open(mode);
-}
-
-
-pqxx::largeobjectaccess::size_type PQXX_COLD
-pqxx::largeobjectaccess::seek(size_type dest, seekdir dir)
-{
-  auto const res{cseek(dest, dir)};
-  if (res == -1)
-  {
-    int const err{errno};
-    if (err == ENOMEM)
-      throw std::bad_alloc{};
-    if (id() == oid_none)
-      throw usage_error{"No object selected."};
-    throw failure{
-      internal::concat("Error seeking in large object: ", reason(err))};
-  }
-
-  return res;
-}
-
-
-pqxx::largeobjectaccess::pos_type PQXX_COLD
-pqxx::largeobjectaccess::cseek(off_type dest, seekdir dir) noexcept
-{
-  return lo_lseek64(raw_connection(), m_fd, dest, std_dir_to_pq_dir(dir));
-}
-
-
-pqxx::largeobjectaccess::pos_type PQXX_COLD
-pqxx::largeobjectaccess::cwrite(char const buf[], std::size_t len) noexcept
-{
-  return std::max(lo_write(raw_connection(), m_fd, buf, len), -1);
-}
-
-
-pqxx::largeobjectaccess::pos_type PQXX_COLD
-pqxx::largeobjectaccess::cread(char buf[], std::size_t len) noexcept
-{
-  return std::max(lo_read(raw_connection(), m_fd, buf, len), -1);
-}
-
-
-pqxx::largeobjectaccess::pos_type PQXX_COLD
-pqxx::largeobjectaccess::ctell() const noexcept
-{
-  return lo_tell64(raw_connection(), m_fd);
-}
-
-
-void PQXX_COLD
-pqxx::largeobjectaccess::write(char const buf[], std::size_t len)
-{
-  if (id() == oid_none)
-    throw usage_error{"No object selected."};
-  if (auto const bytes{cwrite(buf, len)}; internal::cmp_less(bytes, len))
-  {
-    int const err{errno};
-    if (err == ENOMEM)
-      throw std::bad_alloc{};
-    if (bytes < 0)
-      throw failure{internal::concat(
-        "Error writing to large object #", id(), ": ", reason(err))};
-    if (bytes == 0)
-      throw failure{internal::concat(
-        "Could not write to large object #", id(), ": ", reason(err))};
-
-    throw failure{internal::concat(
-      "Wanted to write ", len, " bytes to large object #", id(),
-      "; could only write ", bytes, ".")};
-  }
-}
-
-
-pqxx::largeobjectaccess::size_type PQXX_COLD
-pqxx::largeobjectaccess::read(char buf[], std::size_t len)
-{
-  if (id() == oid_none)
-    throw usage_error{"No object selected."};
-  auto const bytes{cread(buf, len)};
-  if (bytes < 0)
-  {
-    int const err{errno};
-    if (err == ENOMEM)
-      throw std::bad_alloc{};
-    throw failure{internal::concat(
-      "Error reading from large object #", id(), ": ", reason(err))};
-  }
-  return bytes;
-}
-
-
-void PQXX_COLD pqxx::largeobjectaccess::open(openmode mode)
-{
-  if (id() == oid_none)
-    throw usage_error{"No object selected."};
-  m_fd = lo_open(raw_connection(), id(), std_mode_to_pq_mode(mode));
-  if (m_fd < 0)
-  {
-    int const err{errno};
-    if (err == ENOMEM)
-      throw std::bad_alloc{};
-    throw failure{internal::concat(
-      "Could not open large object ", id(), ": ", reason(err))};
-  }
-}
-
-
-void PQXX_COLD pqxx::largeobjectaccess::close() noexcept
-{
-  if (m_fd >= 0)
-    lo_close(raw_connection(), m_fd);
-}
-
-
-pqxx::largeobjectaccess::size_type PQXX_COLD
-pqxx::largeobjectaccess::tell() const
-{
-  auto const res{ctell()};
-  if (res == -1)
-    throw failure{reason(errno)};
-  return res;
-}
-
-
-std::string PQXX_COLD pqxx::largeobjectaccess::reason(int err) const
-{
-  if (m_fd == -1)
-    return "No object opened.";
-  return largeobject::reason(m_trans.conn(), err);
-}
-
-
-void PQXX_COLD pqxx::largeobjectaccess::process_notice(zview s) noexcept
-{
-  m_trans.process_notice(s);
-}
-
-#include "pqxx/internal/ignore-deprecated-post.hxx"
diff --git a/ext/libpqxx-7.7.3/src/notification.cxx b/ext/libpqxx-7.7.3/src/notification.cxx
deleted file mode 100644
index eb8d5e1a1..000000000
--- a/ext/libpqxx-7.7.3/src/notification.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/** Implementation of the pqxx::notification_receiever class.
- *
- * pqxx::notification_receiver processes notifications.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <string>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/internal/gates/connection-notification_receiver.hxx"
-#include "pqxx/notification.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-pqxx::notification_receiver::notification_receiver(
-  connection &c, std::string_view channel) :
-        m_conn{c}, m_channel{channel}
-{
-  pqxx::internal::gate::connection_notification_receiver{c}.add_receiver(this);
-}
-
-
-pqxx::notification_receiver::~notification_receiver()
-{
-  pqxx::internal::gate::connection_notification_receiver{this->conn()}
-    .remove_receiver(this);
-}
diff --git a/ext/libpqxx-7.7.3/src/params.cxx b/ext/libpqxx-7.7.3/src/params.cxx
deleted file mode 100644
index bd3fc108c..000000000
--- a/ext/libpqxx-7.7.3/src/params.cxx
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Implementations related to prepared and parameterised statements.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/params.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-void pqxx::internal::c_params::reserve(std::size_t n) &
-{
-  values.reserve(n);
-  lengths.reserve(n);
-  formats.reserve(n);
-}
-
-
-void pqxx::params::reserve(std::size_t n) &
-{
-  m_params.reserve(n);
-}
-
-
-void pqxx::params::append() &
-{
-  m_params.emplace_back(nullptr);
-}
-
-
-void pqxx::params::append(zview value) &
-{
-  m_params.emplace_back(value);
-}
-
-
-void pqxx::params::append(std::string const &value) &
-{
-  m_params.emplace_back(value);
-}
-
-
-void pqxx::params::append(std::string &&value) &
-{
-  m_params.emplace_back(std::move(value));
-}
-
-
-void pqxx::params::append(params const &value) &
-{
-  this->reserve(std::size(value.m_params) + std::size(this->m_params));
-  for (auto const &param : value.m_params) m_params.emplace_back(param);
-}
-
-
-void pqxx::params::append(std::basic_string_view<std::byte> value) &
-{
-  m_params.emplace_back(value);
-}
-
-
-void pqxx::params::append(std::basic_string<std::byte> const &value) &
-{
-  m_params.emplace_back(value);
-}
-
-
-void pqxx::params::append(std::basic_string<std::byte> &&value) &
-{
-  m_params.emplace_back(std::move(value));
-}
-
-
-void PQXX_COLD pqxx::params::append(binarystring const &value) &
-{
-  m_params.push_back(entry{value.bytes_view()});
-}
-
-
-void pqxx::params::append(params &&value) &
-{
-  this->reserve(std::size(value.m_params) + std::size(this->m_params));
-  for (auto const &param : value.m_params)
-    m_params.emplace_back(std::move(param));
-  value.m_params.clear();
-}
-
-
-pqxx::internal::c_params pqxx::params::make_c_params() const
-{
-  pqxx::internal::c_params p;
-  p.reserve(std::size(m_params));
-  for (auto const &param : m_params)
-    std::visit(
-      [&p](auto const &value) {
-        using T = strip_t<decltype(value)>;
-
-        if constexpr (std::is_same_v<T, std::nullptr_t>)
-        {
-          p.values.push_back(nullptr);
-          p.lengths.push_back(0);
-        }
-        else
-        {
-          p.values.push_back(reinterpret_cast<char const *>(std::data(value)));
-          p.lengths.push_back(
-            check_cast<int>(internal::ssize(value), s_overflow));
-        }
-
-        p.formats.push_back(param_format(value));
-      },
-      param);
-
-  return p;
-}
diff --git a/ext/libpqxx-7.7.3/src/pipeline.cxx b/ext/libpqxx-7.7.3/src/pipeline.cxx
deleted file mode 100644
index 854b1a70e..000000000
--- a/ext/libpqxx-7.7.3/src/pipeline.cxx
+++ /dev/null
@@ -1,448 +0,0 @@
-/** Implementation of the pqxx::pipeline class.
- *
- * Throughput-optimized query interface.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <iterator>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/dbtransaction.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/gates/connection-pipeline.hxx"
-#include "pqxx/internal/gates/result-creation.hxx"
-#include "pqxx/internal/gates/result-pipeline.hxx"
-#include "pqxx/pipeline.hxx"
-#include "pqxx/separated_list.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace
-{
-std::string const theSeparator{"; "};
-std::string const theDummyValue{"1"};
-std::string const theDummyQuery{"SELECT " + theDummyValue + theSeparator};
-} // namespace
-
-
-void pqxx::pipeline::init()
-{
-  m_encoding = internal::enc_group(m_trans.conn().encoding_id());
-  m_issuedrange = make_pair(std::end(m_queries), std::end(m_queries));
-  attach();
-}
-
-
-pqxx::pipeline::~pipeline() noexcept
-{
-  try
-  {
-    cancel();
-  }
-  catch (std::exception const &)
-  {}
-  detach();
-}
-
-
-void pqxx::pipeline::attach()
-{
-  if (not registered())
-    register_me();
-}
-
-
-void pqxx::pipeline::detach()
-{
-  if (registered())
-    unregister_me();
-}
-
-
-pqxx::pipeline::query_id pqxx::pipeline::insert(std::string_view q) &
-{
-  attach();
-  query_id const qid{generate_id()};
-  auto const i{m_queries.insert(std::make_pair(qid, Query(q))).first};
-
-  if (m_issuedrange.second == std::end(m_queries))
-  {
-    m_issuedrange.second = i;
-    if (m_issuedrange.first == std::end(m_queries))
-      m_issuedrange.first = i;
-  }
-  m_num_waiting++;
-
-  if (m_num_waiting > m_retain)
-  {
-    if (have_pending())
-      receive_if_available();
-    if (not have_pending())
-      issue();
-  }
-
-  return qid;
-}
-
-
-void pqxx::pipeline::complete()
-{
-  if (have_pending())
-    receive(m_issuedrange.second);
-  if (m_num_waiting and (m_error == qid_limit()))
-  {
-    issue();
-    receive(std::end(m_queries));
-  }
-  detach();
-}
-
-
-void pqxx::pipeline::flush()
-{
-  if (not std::empty(m_queries))
-  {
-    if (have_pending())
-      receive(m_issuedrange.second);
-    m_issuedrange.first = m_issuedrange.second = std::end(m_queries);
-    m_num_waiting = 0;
-    m_dummy_pending = false;
-    m_queries.clear();
-  }
-  detach();
-}
-
-
-void PQXX_COLD pqxx::pipeline::cancel()
-{
-  while (have_pending())
-  {
-    pqxx::internal::gate::connection_pipeline(m_trans.conn()).cancel_query();
-    auto canceled_query{m_issuedrange.first};
-    ++m_issuedrange.first;
-    m_queries.erase(canceled_query);
-  }
-}
-
-
-bool pqxx::pipeline::is_finished(pipeline::query_id q) const
-{
-  if (m_queries.find(q) == std::end(m_queries))
-    throw std::logic_error{
-      internal::concat("Requested status for unknown query '", q, "'.")};
-  return (QueryMap::const_iterator(m_issuedrange.first) ==
-          std::end(m_queries)) or
-         (q < m_issuedrange.first->first and q < m_error);
-}
-
-
-std::pair<pqxx::pipeline::query_id, pqxx::result> pqxx::pipeline::retrieve()
-{
-  if (std::empty(m_queries))
-    throw std::logic_error{"Attempt to retrieve result from empty pipeline."};
-  return retrieve(std::begin(m_queries));
-}
-
-
-int pqxx::pipeline::retain(int retain_max) &
-{
-  if (retain_max < 0)
-    throw range_error{internal::concat(
-      "Attempt to make pipeline retain ", retain_max, " queries")};
-
-  int const oldvalue{m_retain};
-  m_retain = retain_max;
-
-  if (m_num_waiting >= m_retain)
-    resume();
-
-  return oldvalue;
-}
-
-
-void pqxx::pipeline::resume() &
-{
-  if (have_pending())
-    receive_if_available();
-  if (not have_pending() and m_num_waiting)
-  {
-    issue();
-    receive_if_available();
-  }
-}
-
-
-pqxx::pipeline::query_id pqxx::pipeline::generate_id()
-{
-  if (m_q_id == qid_limit())
-    throw std::overflow_error{"Too many queries went through pipeline."};
-  ++m_q_id;
-  return m_q_id;
-}
-
-
-void pqxx::pipeline::issue()
-{
-  // Retrieve that null result for the last query, if needed.
-  obtain_result();
-
-  // Don't issue anything if we've encountered an error.
-  if (m_error < qid_limit())
-    return;
-
-  // Start with oldest query (lowest id) not in previous issue range.
-  auto oldest{m_issuedrange.second};
-
-  // Construct cumulative query string for entire batch.
-  auto cum{separated_list(
-    theSeparator, oldest, std::end(m_queries),
-    [](QueryMap::const_iterator i) { return i->second.query; })};
-  auto const num_issued{
-    QueryMap::size_type(std::distance(oldest, std::end(m_queries)))};
-  bool const prepend_dummy{num_issued > 1};
-  if (prepend_dummy)
-    cum = theDummyQuery + cum;
-
-  pqxx::internal::gate::connection_pipeline{m_trans.conn()}.start_exec(
-    cum.c_str());
-
-  // Since we managed to send out these queries, update state to reflect this.
-  m_dummy_pending = prepend_dummy;
-  m_issuedrange.first = oldest;
-  m_issuedrange.second = std::end(m_queries);
-  m_num_waiting -= check_cast<int>(num_issued, "pipeline issue()"sv);
-}
-
-
-void PQXX_COLD pqxx::pipeline::internal_error(std::string const &err)
-{
-  set_error_at(0);
-  throw pqxx::internal_error{err};
-}
-
-
-bool pqxx::pipeline::obtain_result(bool expect_none)
-{
-  pqxx::internal::gate::connection_pipeline gate{m_trans.conn()};
-  auto const r{gate.get_result()};
-  if (r == nullptr)
-  {
-    if (have_pending() and not expect_none)
-    {
-      PQXX_UNLIKELY
-      set_error_at(m_issuedrange.first->first);
-      m_issuedrange.second = m_issuedrange.first;
-    }
-    return false;
-  }
-
-  result const res{pqxx::internal::gate::result_creation::create(
-    r, std::begin(m_queries)->second.query, m_encoding)};
-
-  if (not have_pending())
-  {
-    PQXX_UNLIKELY
-    set_error_at(std::begin(m_queries)->first);
-    throw std::logic_error{
-      "Got more results from pipeline than there were queries."};
-  }
-
-  // Must be the result for the oldest pending query.
-  if (not std::empty(m_issuedrange.first->second.res))
-    PQXX_UNLIKELY
-  internal_error("Multiple results for one query.");
-
-  m_issuedrange.first->second.res = res;
-  ++m_issuedrange.first;
-
-  return true;
-}
-
-
-void pqxx::pipeline::obtain_dummy()
-{
-  // Allocate once, re-use across invocations.
-  static auto const text{
-    std::make_shared<std::string>("[DUMMY PIPELINE QUERY]")};
-
-  pqxx::internal::gate::connection_pipeline gate{m_trans.conn()};
-  auto const r{gate.get_result()};
-  m_dummy_pending = false;
-
-  if (r == nullptr)
-    PQXX_UNLIKELY
-  internal_error("Pipeline got no result from backend when it expected one.");
-
-  result R{pqxx::internal::gate::result_creation::create(r, text, m_encoding)};
-
-  bool OK{false};
-  try
-  {
-    pqxx::internal::gate::result_creation{R}.check_status();
-    OK = true;
-  }
-  catch (sql_error const &)
-  {}
-  if (OK)
-  {
-    PQXX_LIKELY
-    if (std::size(R) > 1)
-      PQXX_UNLIKELY
-    internal_error("Unexpected result for dummy query in pipeline.");
-
-    if (R.at(0).at(0).as<std::string>() != theDummyValue)
-      PQXX_UNLIKELY
-    internal_error("Dummy query in pipeline returned unexpected value.");
-    return;
-  }
-
-  // TODO: Can we actually re-issue statements after a failure?
-  /* Execution of this batch failed.
-   *
-   * When we send multiple statements in one go, the backend treats them as a
-   * single transaction.  So the entire batch was effectively rolled back.
-   *
-   * Since none of the queries in the batch were actually executed, we can
-   * afford to replay them one by one until we find the exact query that
-   * caused the error.  This gives us not only a more specific error message
-   * to report, but also tells us which query to report it for.
-   */
-  // First, give the whole batch the same syntax error message, in case all
-  // else is going to fail.
-  for (auto i{m_issuedrange.first}; i != m_issuedrange.second; ++i)
-    i->second.res = R;
-
-  // Remember where the end of this batch was
-  auto const stop{m_issuedrange.second};
-
-  // Retrieve that null result for the last query, if needed
-  obtain_result(true);
-
-  // Reset internal state to forget botched batch attempt
-  m_num_waiting += check_cast<int>(
-    std::distance(m_issuedrange.first, stop), "pipeline obtain_dummy()"sv);
-  m_issuedrange.second = m_issuedrange.first;
-
-  // Issue queries in failed batch one at a time.
-  unregister_me();
-  try
-  {
-    do {
-      m_num_waiting--;
-      auto const query{*m_issuedrange.first->second.query};
-      auto &holder{m_issuedrange.first->second};
-      holder.res = m_trans.exec(query);
-      pqxx::internal::gate::result_creation{holder.res}.check_status();
-      ++m_issuedrange.first;
-    } while (m_issuedrange.first != stop);
-  }
-  catch (std::exception const &)
-  {
-    auto const thud{m_issuedrange.first->first};
-    ++m_issuedrange.first;
-    m_issuedrange.second = m_issuedrange.first;
-    auto q{m_issuedrange.first};
-    set_error_at((q == std::end(m_queries)) ? thud + 1 : q->first);
-  }
-}
-
-
-std::pair<pqxx::pipeline::query_id, pqxx::result>
-pqxx::pipeline::retrieve(pipeline::QueryMap::iterator q)
-{
-  if (q == std::end(m_queries))
-    throw std::logic_error{"Attempt to retrieve result for unknown query."};
-
-  if (q->first >= m_error)
-    throw std::runtime_error{
-      "Could not complete query in pipeline due to error in earlier query."};
-
-  // If query hasn't issued yet, do it now.
-  if (
-    m_issuedrange.second != std::end(m_queries) and
-    (q->first >= m_issuedrange.second->first))
-  {
-    if (have_pending())
-      receive(m_issuedrange.second);
-    if (m_error == qid_limit())
-      issue();
-  }
-
-  // If result not in yet, get it; else get at least whatever's convenient.
-  if (have_pending())
-  {
-    if (q->first >= m_issuedrange.first->first)
-    {
-      auto suc{q};
-      ++suc;
-      receive(suc);
-    }
-    else
-    {
-      receive_if_available();
-    }
-  }
-
-  if (q->first >= m_error)
-    throw std::runtime_error{
-      "Could not complete query in pipeline due to error in earlier query."};
-
-  // Don't leave the backend idle if there are queries waiting to be issued.
-  if (m_num_waiting and not have_pending() and (m_error == qid_limit()))
-    issue();
-
-  result const R{q->second.res};
-  auto const P{std::make_pair(q->first, R)};
-
-  m_queries.erase(q);
-
-  pqxx::internal::gate::result_creation{R}.check_status();
-  return P;
-}
-
-
-void pqxx::pipeline::get_further_available_results()
-{
-  pqxx::internal::gate::connection_pipeline gate{m_trans.conn()};
-  while (not gate.is_busy() and obtain_result())
-    if (not gate.consume_input())
-      throw broken_connection{};
-}
-
-
-void pqxx::pipeline::receive_if_available()
-{
-  pqxx::internal::gate::connection_pipeline gate{m_trans.conn()};
-  if (not gate.consume_input())
-    throw broken_connection{};
-  if (gate.is_busy())
-    return;
-
-  if (m_dummy_pending)
-    obtain_dummy();
-  if (have_pending())
-    get_further_available_results();
-}
-
-
-void pqxx::pipeline::receive(pipeline::QueryMap::const_iterator stop)
-{
-  if (m_dummy_pending)
-    obtain_dummy();
-
-  while (obtain_result() and
-         QueryMap::const_iterator{m_issuedrange.first} != stop)
-    ;
-
-  // Also haul in any remaining "targets of opportunity".
-  if (QueryMap::const_iterator{m_issuedrange.first} == stop)
-    get_further_available_results();
-}
diff --git a/ext/libpqxx-7.7.3/src/pqxx-source.hxx b/ext/libpqxx-7.7.3/src/pqxx-source.hxx
deleted file mode 100644
index 1a8f5fb11..000000000
--- a/ext/libpqxx-7.7.3/src/pqxx-source.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Compiler settings for compiling libpqxx itself.
- *
- * Include this header in every source file that goes into the libpqxx library
- * binary, and nowhere else.
- *
- * To ensure this, include this file once, as the very first header, in each
- * compilation unit for the library.
- *
- * DO NOT INCLUDE THIS FILE when building client programs.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-
-// Workarounds & definitions needed to compile libpqxx into a library.
-#include "pqxx/config-internal-compiler.h"
-
-#ifdef _WIN32
-
-#  ifdef PQXX_SHARED
-// We're building libpqxx as a shared library.
-#    undef PQXX_LIBEXPORT
-#    define PQXX_LIBEXPORT __declspec(dllexport)
-#    define PQXX_PRIVATE __declspec()
-#  endif // PQXX_SHARED
-
-#endif // _WIN32
diff --git a/ext/libpqxx-7.7.3/src/result.cxx b/ext/libpqxx-7.7.3/src/result.cxx
deleted file mode 100644
index 86a739004..000000000
--- a/ext/libpqxx-7.7.3/src/result.cxx
+++ /dev/null
@@ -1,536 +0,0 @@
-/** Implementation of the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cstdlib>
-#include <cstring>
-#include <stdexcept>
-
-extern "C"
-{
-#include <libpq-fe.h>
-}
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/result_iterator.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace pqxx
-{
-PQXX_DECLARE_ENUM_CONVERSION(ExecStatusType);
-}
-
-std::string const pqxx::result::s_empty_string;
-
-
-/// C++ wrapper for libpq's PQclear.
-void pqxx::internal::clear_result(pq::PGresult const *data)
-{
-  PQclear(const_cast<pq::PGresult *>(data));
-}
-
-
-pqxx::result::result(
-  pqxx::internal::pq::PGresult *rhs, std::shared_ptr<std::string> query,
-  internal::encoding_group enc) :
-        m_data{make_data_pointer(rhs)}, m_query{query}, m_encoding(enc)
-{}
-
-
-bool pqxx::result::operator==(result const &rhs) const noexcept
-{
-  if (&rhs == this)
-    PQXX_UNLIKELY return true;
-  auto const s{size()};
-  if (std::size(rhs) != s)
-    return false;
-  for (size_type i{0}; i < s; ++i)
-    if ((*this)[i] != rhs[i])
-      return false;
-  return true;
-}
-
-
-pqxx::result::const_reverse_iterator pqxx::result::rbegin() const
-{
-  return const_reverse_iterator{end()};
-}
-
-
-pqxx::result::const_reverse_iterator pqxx::result::crbegin() const
-{
-  return rbegin();
-}
-
-
-pqxx::result::const_reverse_iterator pqxx::result::rend() const
-{
-  return const_reverse_iterator{begin()};
-}
-
-
-pqxx::result::const_reverse_iterator pqxx::result::crend() const
-{
-  return rend();
-}
-
-
-pqxx::result::const_iterator pqxx::result::begin() const noexcept
-{
-  return {this, 0};
-}
-
-
-pqxx::result::const_iterator pqxx::result::cbegin() const noexcept
-{
-  return begin();
-}
-
-
-pqxx::result::size_type pqxx::result::size() const noexcept
-{
-  return (m_data.get() == nullptr) ?
-           0 :
-           static_cast<size_type>(PQntuples(m_data.get()));
-}
-
-
-bool pqxx::result::empty() const noexcept
-{
-  return (m_data.get() == nullptr) or (PQntuples(m_data.get()) == 0);
-}
-
-
-pqxx::result::reference pqxx::result::front() const noexcept
-{
-  return row{*this, 0, columns()};
-}
-
-
-pqxx::result::reference pqxx::result::back() const noexcept
-{
-  return row{*this, size() - 1, columns()};
-}
-
-
-void pqxx::result::swap(result &rhs) noexcept
-{
-  m_data.swap(rhs.m_data);
-  m_query.swap(rhs.m_query);
-}
-
-
-pqxx::row pqxx::result::operator[](result_size_type i) const noexcept
-{
-  return row{*this, i, columns()};
-}
-
-
-#if defined(PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT)
-pqxx::field pqxx::result::operator[](
-  result_size_type row_num, row_size_type col_num) const noexcept
-{
-  return {*this, row_num, field_num};
-}
-#endif
-
-
-pqxx::row pqxx::result::at(pqxx::result::size_type i) const
-{
-  if (i >= size())
-    throw range_error{"Row number out of range."};
-  return operator[](i);
-}
-
-
-pqxx::field pqxx::result::at(
-  pqxx::result_size_type row_num, pqxx::row_size_type col_num) const
-{
-  if (row_num >= size())
-    throw range_error{"Row number out of range."};
-  if (col_num >= columns())
-    throw range_error{"Column out of range."};
-  return {*this, row_num, col_num};
-}
-
-
-namespace
-{
-/// C string comparison.
-inline bool equal(char const lhs[], char const rhs[])
-{
-  return strcmp(lhs, rhs) == 0;
-}
-} // namespace
-
-void PQXX_COLD pqxx::result::throw_sql_error(
-  std::string const &Err, std::string const &Query) const
-{
-  // Try to establish more precise error type, and throw corresponding
-  // type of exception.
-  char const *const code{PQresultErrorField(m_data.get(), PG_DIAG_SQLSTATE)};
-  if (code == nullptr)
-  {
-    // No SQLSTATE at all.  Can this even happen?
-    // Let's assume the connection is no longer usable.
-    throw broken_connection{Err};
-  }
-
-  switch (code[0])
-  {
-    PQXX_UNLIKELY
-  case '\0':
-    // SQLSTATE is empty.  We may have seen this happen in one
-    // circumstance: a client-side socket timeout (while using the
-    // tcp_user_timeout connection option).  Unfortunately in that case the
-    // connection was just fine, so we had no real way of detecting the
-    // problem.  (Trying to continue to use the connection does break
-    // though, so I feel justified in panicking.)
-    throw broken_connection{Err};
-
-  case '0':
-    switch (code[1])
-    {
-    case 'A': throw feature_not_supported{Err, Query, code};
-    case '8': throw broken_connection{Err};
-    case 'L':
-    case 'P': throw insufficient_privilege{Err, Query, code};
-    }
-    break;
-  case '2':
-    switch (code[1])
-    {
-    case '2': throw data_exception{Err, Query, code};
-    case '3':
-      if (equal(code, "23001"))
-        throw restrict_violation{Err, Query, code};
-      if (equal(code, "23502"))
-        throw not_null_violation{Err, Query, code};
-      if (equal(code, "23503"))
-        throw foreign_key_violation{Err, Query, code};
-      if (equal(code, "23505"))
-        throw unique_violation{Err, Query, code};
-      if (equal(code, "23514"))
-        throw check_violation{Err, Query, code};
-      throw integrity_constraint_violation{Err, Query, code};
-    case '4': throw invalid_cursor_state{Err, Query, code};
-    case '6': throw invalid_sql_statement_name{Err, Query, code};
-    }
-    break;
-  case '3':
-    switch (code[1])
-    {
-    case '4': throw invalid_cursor_name{Err, Query, code};
-    }
-    break;
-  case '4':
-    switch (code[1])
-    {
-    case '0':
-      if (equal(code, "40000"))
-        throw transaction_rollback{Err, Query, code};
-      if (equal(code, "40001"))
-        throw serialization_failure{Err, Query, code};
-      if (equal(code, "40003"))
-        throw statement_completion_unknown{Err, Query, code};
-      if (equal(code, "40P01"))
-        throw deadlock_detected{Err, Query, code};
-      break;
-    case '2':
-      if (equal(code, "42501"))
-        throw insufficient_privilege{Err, Query};
-      if (equal(code, "42601"))
-        throw syntax_error{Err, Query, code, errorposition()};
-      if (equal(code, "42703"))
-        throw undefined_column{Err, Query, code};
-      if (equal(code, "42883"))
-        throw undefined_function{Err, Query, code};
-      if (equal(code, "42P01"))
-        throw undefined_table{Err, Query, code};
-    }
-    break;
-  case '5':
-    switch (code[1])
-    {
-    case '3':
-      if (equal(code, "53100"))
-        throw disk_full{Err, Query, code};
-      if (equal(code, "53200"))
-        throw out_of_memory{Err, Query, code};
-      if (equal(code, "53300"))
-        throw too_many_connections{Err};
-      throw insufficient_resources{Err, Query, code};
-    }
-    break;
-
-  case 'P':
-    if (equal(code, "P0001"))
-      throw plpgsql_raise{Err, Query, code};
-    if (equal(code, "P0002"))
-      throw plpgsql_no_data_found{Err, Query, code};
-    if (equal(code, "P0003"))
-      throw plpgsql_too_many_rows{Err, Query, code};
-    throw plpgsql_error{Err, Query, code};
-  }
-
-  // Unknown error code.
-  throw sql_error{Err, Query, code};
-}
-
-void pqxx::result::check_status(std::string_view desc) const
-{
-  if (auto err{status_error()}; not std::empty(err))
-  {
-    PQXX_UNLIKELY
-    if (not std::empty(desc))
-      err = pqxx::internal::concat("Failure during '", desc, "': ", err);
-    throw_sql_error(err, query());
-  }
-}
-
-
-std::string pqxx::result::status_error() const
-{
-  if (m_data.get() == nullptr)
-    throw failure{"No result set given."};
-
-  std::string err;
-
-  switch (PQresultStatus(m_data.get()))
-  {
-  case PGRES_EMPTY_QUERY: // The string sent to the backend was empty.
-  case PGRES_COMMAND_OK:  // Successful completion, no result data.
-  case PGRES_TUPLES_OK:   // The query successfully executed.
-    break;
-
-  case PGRES_COPY_OUT: // Copy Out (from server) data transfer started.
-  case PGRES_COPY_IN:  // Copy In (to server) data transfer started.
-    break;
-
-  case PGRES_BAD_RESPONSE: // The server's response was not understood.
-  case PGRES_NONFATAL_ERROR:
-  case PGRES_FATAL_ERROR: err = PQresultErrorMessage(m_data.get()); break;
-
-  default:
-    throw internal_error{internal::concat(
-      "pqxx::result: Unrecognized response code ",
-      PQresultStatus(m_data.get()))};
-  }
-  return err;
-}
-
-
-char const *pqxx::result::cmd_status() const noexcept
-{
-  return PQcmdStatus(const_cast<internal::pq::PGresult *>(m_data.get()));
-}
-
-
-std::string const &pqxx::result::query() const &noexcept
-{
-  return (m_query.get() == nullptr) ? s_empty_string : *m_query;
-}
-
-
-pqxx::oid pqxx::result::inserted_oid() const
-{
-  if (m_data.get() == nullptr)
-    throw usage_error{
-      "Attempt to read oid of inserted row without an INSERT result"};
-  return PQoidValue(const_cast<internal::pq::PGresult *>(m_data.get()));
-}
-
-
-pqxx::result::size_type pqxx::result::affected_rows() const
-{
-  auto const rows_str{
-    PQcmdTuples(const_cast<internal::pq::PGresult *>(m_data.get()))};
-  return (rows_str[0] == '\0') ? 0 : size_type(atoi(rows_str));
-}
-
-
-char const *pqxx::result::get_value(
-  pqxx::result::size_type row, pqxx::row::size_type col) const
-{
-  return PQgetvalue(m_data.get(), row, col);
-}
-
-
-bool pqxx::result::get_is_null(
-  pqxx::result::size_type row, pqxx::row::size_type col) const
-{
-  return PQgetisnull(m_data.get(), row, col) != 0;
-}
-
-pqxx::field::size_type pqxx::result::get_length(
-  pqxx::result::size_type row, pqxx::row::size_type col) const noexcept
-{
-  return static_cast<pqxx::field::size_type>(
-    PQgetlength(m_data.get(), row, col));
-}
-
-
-pqxx::oid pqxx::result::column_type(row::size_type col_num) const
-{
-  oid const t{PQftype(m_data.get(), col_num)};
-  if (t == oid_none)
-    throw argument_error{internal::concat(
-      "Attempt to retrieve type of nonexistent column ", col_num,
-      " of query result.")};
-  return t;
-}
-
-
-pqxx::row::size_type pqxx::result::column_number(zview col_name) const
-{
-  auto const n{PQfnumber(
-    const_cast<internal::pq::PGresult *>(m_data.get()), col_name.c_str())};
-  if (n == -1)
-    throw argument_error{
-      internal::concat("Unknown column name: '", col_name, "'.")};
-
-  return static_cast<row::size_type>(n);
-}
-
-
-pqxx::oid pqxx::result::column_table(row::size_type col_num) const
-{
-  oid const t{PQftable(m_data.get(), col_num)};
-
-  /* If we get oid_none, it may be because the column is computed, or because
-   * we got an invalid row number.
-   */
-  if (t == oid_none and col_num >= columns())
-    throw argument_error{internal::concat(
-      "Attempt to retrieve table ID for column ", col_num, " out of ",
-      columns())};
-
-  return t;
-}
-
-
-pqxx::row::size_type pqxx::result::table_column(row::size_type col_num) const
-{
-  auto const n{row::size_type(PQftablecol(m_data.get(), col_num))};
-  if (n != 0)
-    PQXX_LIKELY
-  return n - 1;
-
-  // Failed.  Now find out why, so we can throw a sensible exception.
-  auto const col_str{to_string(col_num)};
-  if (col_num > columns())
-    throw range_error{
-      internal::concat("Invalid column index in table_column(): ", col_str)};
-
-  if (m_data.get() == nullptr)
-    throw usage_error{internal::concat(
-      "Can't query origin of column ", col_str,
-      ": result is not initialized.")};
-
-  throw usage_error{internal::concat(
-    "Can't query origin of column ", col_str,
-    ": not derived from table column.")};
-}
-
-
-int pqxx::result::errorposition() const
-{
-  int pos{-1};
-  if (m_data.get())
-  {
-    auto const p{PQresultErrorField(
-      const_cast<internal::pq::PGresult *>(m_data.get()),
-      PG_DIAG_STATEMENT_POSITION)};
-    if (p)
-      pos = from_string<decltype(pos)>(p);
-  }
-  return pos;
-}
-
-
-char const *pqxx::result::column_name(pqxx::row::size_type number) const &
-{
-  auto const n{PQfname(m_data.get(), number)};
-  if (n == nullptr)
-  {
-    PQXX_UNLIKELY
-    if (m_data.get() == nullptr)
-      throw usage_error{"Queried column name on null result."};
-    throw range_error{internal::concat(
-      "Invalid column number: ", number, " (maximum is ", (columns() - 1),
-      ").")};
-  }
-  return n;
-}
-
-
-pqxx::row::size_type pqxx::result::columns() const noexcept
-{
-  auto ptr{const_cast<internal::pq::PGresult *>(m_data.get())};
-  return (ptr == nullptr) ? 0 : row::size_type(PQnfields(ptr));
-}
-
-
-// const_result_iterator
-
-pqxx::const_result_iterator pqxx::const_result_iterator::operator++(int)
-{
-  const_result_iterator old{*this};
-  m_index++;
-  return old;
-}
-
-
-pqxx::const_result_iterator pqxx::const_result_iterator::operator--(int)
-{
-  const_result_iterator old{*this};
-  m_index--;
-  return old;
-}
-
-
-pqxx::result::const_iterator
-pqxx::result::const_reverse_iterator::base() const noexcept
-{
-  iterator_type tmp{*this};
-  return ++tmp;
-}
-
-
-pqxx::const_reverse_result_iterator
-pqxx::const_reverse_result_iterator::operator++(int)
-{
-  const_reverse_result_iterator tmp{*this};
-  iterator_type::operator--();
-  return tmp;
-}
-
-
-pqxx::const_reverse_result_iterator
-pqxx::const_reverse_result_iterator::operator--(int)
-{
-  const_reverse_result_iterator tmp{*this};
-  iterator_type::operator++();
-  return tmp;
-}
-
-
-template<> std::string pqxx::to_string(field const &value)
-{
-  return {value.c_str(), std::size(value)};
-}
diff --git a/ext/libpqxx-7.7.3/src/robusttransaction.cxx b/ext/libpqxx-7.7.3/src/robusttransaction.cxx
deleted file mode 100644
index 5bbfd64f8..000000000
--- a/ext/libpqxx-7.7.3/src/robusttransaction.cxx
+++ /dev/null
@@ -1,221 +0,0 @@
-/** Implementation of the pqxx::robusttransaction class.
- *
- * pqxx::robusttransaction is a slower but safer transaction class.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <chrono>
-#include <cstdint>
-#include <stdexcept>
-#include <unordered_map>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/wait.hxx"
-#include "pqxx/nontransaction.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/robusttransaction.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-using namespace std::literals;
-
-namespace
-{
-using pqxx::operator"" _zv;
-
-/// Statuses in which we may find our transaction.
-/** There's also "in the future," but it manifests as an error, not as an
- * actual status.
- */
-enum tx_stat
-{
-  tx_unknown,
-  tx_committed,
-  tx_aborted,
-  tx_in_progress,
-};
-
-
-constexpr auto committed{"committed"_zv}, aborted{"aborted"_zv},
-  in_progress{"in progress"_zv};
-
-
-/// Parse a nonempty transaction status string.
-constexpr tx_stat parse_status(std::string_view text) noexcept
-{
-  switch (text[0])
-  {
-  case 'a':
-    if (text == aborted)
-      PQXX_LIKELY return tx_aborted;
-    break;
-  case 'c':
-    if (text == committed)
-      PQXX_LIKELY return tx_committed;
-    break;
-  case 'i':
-    if (text == in_progress)
-      PQXX_LIKELY return tx_in_progress;
-    break;
-  }
-  return tx_unknown;
-}
-
-
-tx_stat query_status(std::string const &xid, std::string const &conn_str)
-{
-  static std::string const name{"robusttxck"sv};
-  auto const query{pqxx::internal::concat("SELECT txid_status(", xid, ")")};
-  pqxx::connection c{conn_str};
-  pqxx::nontransaction w{c, name};
-  auto const status_row{w.exec1(query)};
-  auto const status_field{status_row[0]};
-  if (std::size(status_field) == 0)
-    throw pqxx::internal_error{"Transaction status string is empty."};
-  auto const status{parse_status(status_field.as<std::string_view>())};
-  if (status == tx_unknown)
-    throw pqxx::internal_error{pqxx::internal::concat(
-      "Unknown transaction status string: ", status_field.view())};
-  return status;
-}
-} // namespace
-
-
-void pqxx::internal::basic_robusttransaction::init(zview begin_command)
-{
-  static auto const txid_q{
-    std::make_shared<std::string>("SELECT txid_current()"sv)};
-  m_backendpid = conn().backendpid();
-  direct_exec(begin_command);
-  direct_exec(txid_q)[0][0].to(m_xid);
-}
-
-
-pqxx::internal::basic_robusttransaction::basic_robusttransaction(
-  connection &c, zview begin_command, std::string_view tname) :
-        dbtransaction(c, tname), m_conn_string{c.connection_string()}
-{
-  init(begin_command);
-}
-
-
-pqxx::internal::basic_robusttransaction::basic_robusttransaction(
-  connection &c, zview begin_command) :
-        dbtransaction(c), m_conn_string{c.connection_string()}
-{
-  init(begin_command);
-}
-
-
-pqxx::internal::basic_robusttransaction::~basic_robusttransaction() = default;
-
-
-void pqxx::internal::basic_robusttransaction::do_commit()
-{
-  static auto const check_constraints_q{
-    std::make_shared<std::string>("SET CONSTRAINTS ALL IMMEDIATE"sv)},
-    commit_q{std::make_shared<std::string>("COMMIT"sv)};
-  // Check constraints before sending the COMMIT to the database, so as to
-  // minimise our in-doubt window.
-  try
-  {
-    direct_exec(check_constraints_q);
-  }
-  catch (std::exception const &)
-  {
-    do_abort();
-    throw;
-  }
-
-  // Here comes the in-doubt window.  If we lose our connection here, we'll be
-  // left clueless as to what happened on the backend.  It may have received
-  // the commit command and completed the transaction, and ended up with a
-  // success it could not report back to us.  Or it may have noticed the broken
-  // connection and aborted the transaction.  It may even still be executing
-  // the commit, only to fail later.
-  //
-  // All this uncertainty requires some special handling, and that s what makes
-  // robusttransaction what it is.
-  try
-  {
-    direct_exec(commit_q);
-
-    // If we make it here, great.  Normal, successful commit.
-    return;
-  }
-  catch (broken_connection const &)
-  {
-    // Oops, lost connection at the crucial moment.  Fall through to in-doubt
-    // handling below.
-  }
-  catch (std::exception const &)
-  {
-    if (conn().is_open())
-    {
-      // Commit failed, for some other reason.
-      do_abort();
-      throw;
-    }
-    // Otherwise, fall through to in-doubt handling.
-  }
-
-  // If we get here, we're in doubt.  Figure out what happened.
-
-  int const max_attempts{500};
-  static_assert(max_attempts > 0);
-
-  tx_stat stat;
-  for (int attempts{0}; attempts < max_attempts;
-       ++attempts, pqxx::internal::wait_for(300u))
-  {
-    stat = tx_unknown;
-    try
-    {
-      stat = query_status(m_xid, m_conn_string);
-    }
-    catch (pqxx::broken_connection const &)
-    {
-      // Swallow the error.  Pause and retry.
-    }
-    switch (stat)
-    {
-    case tx_unknown:
-      // We were unable to reconnect and query transaction status.
-      // Stay in it for another attempt.
-      return;
-    case tx_committed:
-      // Success!  We're done.
-      return;
-    case tx_aborted:
-      // Aborted.  We're done.
-      do_abort();
-      return;
-    case tx_in_progress:
-      // The transaction is still running.  Stick around until we know what
-      // transpires.
-      break;
-    }
-  }
-
-  // Okay, this has taken too long.  Give up, report in-doubt state.
-  throw in_doubt_error{internal::concat(
-    "Transaction ", name(), " (with transaction ID ", m_xid,
-    ") "
-    "lost connection while committing.  It's impossible to tell whether "
-    "it committed, or aborted, or is still running.  "
-    "Attempts to find out its outcome have failed.  "
-    "The backend process on the server had process ID ",
-    m_backendpid,
-    ".  "
-    "You may be able to check what happened to that process.")};
-}
diff --git a/ext/libpqxx-7.7.3/src/row.cxx b/ext/libpqxx-7.7.3/src/row.cxx
deleted file mode 100644
index f0974c839..000000000
--- a/ext/libpqxx-7.7.3/src/row.cxx
+++ /dev/null
@@ -1,250 +0,0 @@
-/** Implementation of the pqxx::result class and support classes.
- *
- * pqxx::result represents the set of result rows from a database query.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cstdlib>
-#include <cstring>
-
-extern "C"
-{
-#include <libpq-fe.h>
-}
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/except.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/row.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-pqxx::row::row(
-  result const &r, result::size_type index, size_type cols) noexcept :
-        m_result{r}, m_index{index}, m_end{cols}
-{}
-
-
-pqxx::row::const_iterator pqxx::row::begin() const noexcept
-{
-  return {*this, m_begin};
-}
-
-
-pqxx::row::const_iterator pqxx::row::cbegin() const noexcept
-{
-  return begin();
-}
-
-
-pqxx::row::const_iterator pqxx::row::end() const noexcept
-{
-  return {*this, m_end};
-}
-
-
-pqxx::row::const_iterator pqxx::row::cend() const noexcept
-{
-  return end();
-}
-
-
-pqxx::row::reference pqxx::row::front() const noexcept
-{
-  return field{m_result, m_index, m_begin};
-}
-
-
-pqxx::row::reference pqxx::row::back() const noexcept
-{
-  return field{m_result, m_index, m_end - 1};
-}
-
-
-pqxx::row::const_reverse_iterator pqxx::row::rbegin() const
-{
-  return const_reverse_row_iterator{end()};
-}
-
-
-pqxx::row::const_reverse_iterator pqxx::row::crbegin() const
-{
-  return rbegin();
-}
-
-
-pqxx::row::const_reverse_iterator pqxx::row::rend() const
-{
-  return const_reverse_row_iterator{begin()};
-}
-
-
-pqxx::row::const_reverse_iterator pqxx::row::crend() const
-{
-  return rend();
-}
-
-
-bool pqxx::row::operator==(row const &rhs) const noexcept
-{
-  if (&rhs == this)
-    return true;
-  auto const s{size()};
-  if (std::size(rhs) != s)
-    return false;
-  for (size_type i{0}; i < s; ++i)
-    if ((*this)[i] != rhs[i])
-      return false;
-  return true;
-}
-
-
-pqxx::row::reference pqxx::row::operator[](size_type i) const noexcept
-{
-  return field{m_result, m_index, m_begin + i};
-}
-
-
-pqxx::row::reference pqxx::row::operator[](zview col_name) const
-{
-  return at(col_name);
-}
-
-
-void pqxx::row::swap(row &rhs) noexcept
-{
-  auto const i{m_index};
-  auto const b{m_begin};
-  auto const e{m_end};
-  m_result.swap(rhs.m_result);
-  m_index = rhs.m_index;
-  m_begin = rhs.m_begin;
-  m_end = rhs.m_end;
-  rhs.m_index = i;
-  rhs.m_begin = b;
-  rhs.m_end = e;
-}
-
-
-pqxx::field pqxx::row::at(zview col_name) const
-{
-  return {m_result, m_index, m_begin + column_number(col_name)};
-}
-
-
-pqxx::field pqxx::row::at(pqxx::row::size_type i) const
-{
-  if (i >= size())
-    throw range_error{"Invalid field number."};
-
-  return operator[](i);
-}
-
-
-pqxx::oid pqxx::row::column_type(size_type col_num) const
-{
-  return m_result.column_type(m_begin + col_num);
-}
-
-
-pqxx::oid pqxx::row::column_table(size_type col_num) const
-{
-  return m_result.column_table(m_begin + col_num);
-}
-
-
-pqxx::row::size_type pqxx::row::table_column(size_type col_num) const
-{
-  return m_result.table_column(m_begin + col_num);
-}
-
-
-pqxx::row::size_type pqxx::row::column_number(zview col_name) const
-{
-  auto const n{m_result.column_number(col_name)};
-  if (n >= m_end)
-    throw argument_error{
-      "Column '" + std::string{col_name} + "' falls outside slice."};
-  if (n >= m_begin)
-    return n - m_begin;
-
-  // This deals with a really nasty possibility: that the column name occurs
-  // twice - once before the beginning of the slice, and once inside the slice.
-  char const *const adapted_name{m_result.column_name(n)};
-  for (auto i{m_begin}; i < m_end; ++i)
-    if (strcmp(adapted_name, m_result.column_name(i)) == 0)
-      return i - m_begin;
-
-  // Didn't find any?  Recurse just to produce the same error message.
-  return result{}.column_number(col_name);
-}
-
-
-pqxx::row PQXX_COLD pqxx::row::slice(size_type sbegin, size_type send) const
-{
-  if (sbegin > send or send > size())
-    throw range_error{"Invalid field range."};
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  row res{*this};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  res.m_begin = m_begin + sbegin;
-  res.m_end = m_begin + send;
-  return res;
-}
-
-
-bool PQXX_COLD pqxx::row::empty() const noexcept
-{
-  return m_begin == m_end;
-}
-
-
-pqxx::const_row_iterator pqxx::const_row_iterator::operator++(int)
-{
-  auto const old{*this};
-  m_col++;
-  return old;
-}
-
-
-pqxx::const_row_iterator pqxx::const_row_iterator::operator--(int)
-{
-  auto const old{*this};
-  m_col--;
-  return old;
-}
-
-
-pqxx::const_row_iterator
-pqxx::const_reverse_row_iterator::base() const noexcept
-{
-  iterator_type tmp{*this};
-  return ++tmp;
-}
-
-
-pqxx::const_reverse_row_iterator
-pqxx::const_reverse_row_iterator::operator++(int)
-{
-  auto tmp{*this};
-  operator++();
-  return tmp;
-}
-
-
-pqxx::const_reverse_row_iterator
-pqxx::const_reverse_row_iterator::operator--(int)
-{
-  auto tmp{*this};
-  operator--();
-  return tmp;
-}
diff --git a/ext/libpqxx-7.7.3/src/sql_cursor.cxx b/ext/libpqxx-7.7.3/src/sql_cursor.cxx
deleted file mode 100644
index 1e5d6a790..000000000
--- a/ext/libpqxx-7.7.3/src/sql_cursor.cxx
+++ /dev/null
@@ -1,276 +0,0 @@
-/** Implementation of libpqxx STL-style cursor classes.
- *
- * These classes wrap SQL cursors in STL-like interfaces.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <iterator>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/cursor.hxx"
-#include "pqxx/internal/encodings.hxx"
-#include "pqxx/internal/gates/connection-sql_cursor.hxx"
-#include "pqxx/internal/gates/transaction-sql_cursor.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-using namespace std::literals;
-
-namespace
-{
-/// Is this character a "useless trailing character" in a query?
-/** A character is "useless" at the end of a query if it is either whitespace
- * or a semicolon.
- */
-inline bool useless_trail(char c)
-{
-  return isspace(c) or c == ';';
-}
-
-
-/// Find end of nonempty query, stripping off any trailing semicolon.
-/** When executing a normal query, a trailing semicolon is meaningless but
- * won't hurt.  That's why we can't rule out that some code may include one.
- *
- * But for cursor queries, a trailing semicolon is a problem.  The query gets
- * embedded in a larger statement, which a semicolon would break into two.
- * We'll have to remove it if present.
- *
- * A trailing semicolon may not actually be at the end.  It could be masked by
- * subsequent whitespace.  If there's also a comment though, that's the
- * caller's own lookout.  We can't guard against every possible mistake, and
- * text processing is actually remarkably sensitive to mistakes in a
- * multi-encoding world.
- *
- * If there is a trailing semicolon, this function returns its offset.  If
- * there are more than one, it returns the offset of the first one.  If there
- * is no trailing semicolon, it returns the length of the query string.
- *
- * The query must be nonempty.
- */
-std::string::size_type
-find_query_end(std::string_view query, pqxx::internal::encoding_group enc)
-{
-  auto const text{std::data(query)};
-  auto const size{std::size(query)};
-  std::string::size_type end;
-  if (enc == pqxx::internal::encoding_group::MONOBYTE)
-  {
-    // This is an encoding where we can scan backwards from the end.
-    for (end = std::size(query); end > 0 and useless_trail(text[end - 1]);
-         --end)
-      ;
-  }
-  else
-  {
-    // Complex encoding.  We only know how to iterate forwards, so start from
-    // the beginning.
-    end = 0;
-
-    pqxx::internal::for_glyphs(
-      enc,
-      [text, &end](char const *gbegin, char const *gend) {
-        if (gend - gbegin > 1 or not useless_trail(*gbegin))
-          end = std::string::size_type(gend - text);
-      },
-      text, size);
-  }
-
-  return end;
-}
-} // namespace
-
-
-pqxx::internal::sql_cursor::sql_cursor(
-  transaction_base &t, std::string_view query, std::string_view cname,
-  cursor_base::access_policy ap, cursor_base::update_policy up,
-  cursor_base::ownership_policy op, bool hold) :
-        cursor_base{t.conn(), cname},
-        m_home{t.conn()},
-        m_adopted{false},
-        m_at_end{-1},
-        m_pos{0}
-{
-  if (&t.conn() != &m_home)
-    throw internal_error{"Cursor in wrong connection"};
-
-  if (std::empty(query))
-    throw usage_error{"Cursor has empty query."};
-  auto const enc{enc_group(t.conn().encoding_id())};
-  auto const qend{find_query_end(query, enc)};
-  if (qend == 0)
-    throw usage_error{"Cursor has effectively empty query."};
-  query.remove_suffix(std::size(query) - qend);
-
-  std::string const cq{internal::concat(
-    "DECLARE "sv, t.quote_name(name()), " "sv,
-    ((ap == cursor_base::forward_only) ? "NO "sv : ""sv), "SCROLL CURSOR "sv,
-    (hold ? "WITH HOLD "sv : ""sv), "FOR "sv, query, " "sv,
-    ((up == cursor_base::update) ? "FOR UPDATE "sv : "FOR READ ONLY "sv))};
-
-  t.exec(cq);
-
-  // Now that we're here in the starting position, keep a copy of an empty
-  // result.  That may come in handy later, because we may not be able to
-  // construct an empty result with all the right metadata due to the weird
-  // meaning of "FETCH 0."
-  init_empty_result(t);
-
-  m_ownership = op;
-}
-
-
-pqxx::internal::sql_cursor::sql_cursor(
-  transaction_base &t, std::string_view cname,
-  cursor_base::ownership_policy op) :
-        cursor_base{t.conn(), cname, false},
-        m_home{t.conn()},
-        m_empty_result{},
-        m_adopted{true},
-        m_at_end{0},
-        m_pos{-1}
-{
-  m_adopted = true;
-  m_ownership = op;
-}
-
-
-void pqxx::internal::sql_cursor::close() noexcept
-{
-  if (m_ownership == cursor_base::owned)
-  {
-    try
-    {
-      gate::connection_sql_cursor{m_home}.exec(
-        internal::concat("CLOSE "sv, m_home.quote_name(name())).c_str());
-    }
-    catch (std::exception const &)
-    {}
-    m_ownership = cursor_base::loose;
-  }
-}
-
-
-void pqxx::internal::sql_cursor::init_empty_result(transaction_base &t)
-{
-  if (pos() != 0)
-    throw internal_error{"init_empty_result() from bad pos()."};
-  m_empty_result =
-    t.exec(internal::concat("FETCH 0 IN "sv, m_home.quote_name(name())));
-}
-
-
-/// Compute actual displacement based on requested and reported displacements.
-pqxx::internal::sql_cursor::difference_type pqxx::internal::sql_cursor::adjust(
-  difference_type hoped, difference_type actual)
-{
-  if (actual < 0)
-    throw internal_error{"Negative rows in cursor movement."};
-  if (hoped == 0)
-    return 0;
-  int const direction{((hoped < 0) ? -1 : 1)};
-  bool hit_end{false};
-  if (actual != labs(hoped))
-  {
-    if (actual > labs(hoped))
-      throw internal_error{"Cursor displacement larger than requested."};
-
-    // If we see fewer rows than requested, then we've hit an end (on either
-    // side) of the result set.  Wether we make an extra step to a one-past-end
-    // position or whether we're already there depends on where we were
-    // previously: if our last move was in the same direction and also fell
-    // short, we're already at a one-past-end row.
-    if (m_at_end != direction)
-      ++actual;
-
-    // If we hit the beginning, make sure our position calculation ends up
-    // at zero (even if we didn't previously know where we were!), and if we
-    // hit the other end, register the fact that we now know where the end
-    // of the result set is.
-    if (direction > 0)
-      hit_end = true;
-    else if (m_pos == -1)
-      m_pos = actual;
-    else if (m_pos != actual)
-      throw internal_error{internal::concat(
-        "Moved back to beginning, but wrong position: hoped=", hoped,
-        ", actual=", actual, ", m_pos=", m_pos, ", direction=", direction,
-        ".")};
-
-    m_at_end = direction;
-  }
-  else
-  {
-    m_at_end = 0;
-  }
-
-  if (m_pos >= 0)
-    m_pos += direction * actual;
-  if (hit_end)
-  {
-    if (m_endpos >= 0 and m_pos != m_endpos)
-      throw internal_error{"Inconsistent cursor end positions."};
-    m_endpos = m_pos;
-  }
-  return direction * actual;
-}
-
-
-pqxx::result pqxx::internal::sql_cursor::fetch(
-  difference_type rows, difference_type &displacement)
-{
-  if (rows == 0)
-  {
-    displacement = 0;
-    return m_empty_result;
-  }
-  auto const query{pqxx::internal::concat(
-    "FETCH "sv, stridestring(rows), " IN "sv, m_home.quote_name(name()))};
-  auto const r{gate::connection_sql_cursor{m_home}.exec(query.c_str())};
-  displacement = adjust(rows, difference_type(std::size(r)));
-  return r;
-}
-
-
-pqxx::cursor_base::difference_type pqxx::internal::sql_cursor::move(
-  difference_type rows, difference_type &displacement)
-{
-  if (rows == 0)
-  {
-    displacement = 0;
-    return 0;
-  }
-
-  auto const query{pqxx::internal::concat(
-    "MOVE "sv, stridestring(rows), " IN "sv, m_home.quote_name(name()))};
-  auto const r{gate::connection_sql_cursor{m_home}.exec(query.c_str())};
-  auto d{static_cast<difference_type>(r.affected_rows())};
-  displacement = adjust(rows, d);
-  return d;
-}
-
-
-std::string pqxx::internal::sql_cursor::stridestring(difference_type n)
-{
-  /* Some special-casing for ALL and BACKWARD ALL here.  We used to use numeric
-   * "infinities" for difference_type for this (the highest and lowest possible
-   * values for "long"), but for PostgreSQL 8.0 at least, the backend appears
-   * to expect a 32-bit number and fails to parse large 64-bit numbers. We
-   * could change the alias to match this behaviour, but that would break
-   * if/when Postgres is changed to accept 64-bit displacements.
-   */
-  static std::string const All{"ALL"}, BackAll{"BACKWARD ALL"};
-  if (n >= cursor_base::all())
-    return All;
-  else if (n <= cursor_base::backward_all())
-    return BackAll;
-  return to_string(n);
-}
diff --git a/ext/libpqxx-7.7.3/src/strconv.cxx b/ext/libpqxx-7.7.3/src/strconv.cxx
deleted file mode 100644
index 2bd206b2a..000000000
--- a/ext/libpqxx-7.7.3/src/strconv.cxx
+++ /dev/null
@@ -1,785 +0,0 @@
-/** Implementation of string conversions.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
-#include <functional>
-#include <limits>
-#include <locale>
-#include <string_view>
-#include <system_error>
-
-#if __has_include(<cxxabi.h>)
-#  include <cxxabi.h>
-#endif
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/except.hxx"
-#include "pqxx/strconv.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace
-{
-#if !defined(PQXX_HAVE_CHARCONV_FLOAT)
-/// Do we have fully functional thread_local support?
-/** When building with libcxxrt on clang, you can't create thread_local objects
- * of non-POD types.  Any attempt will result in a link error.
- */
-constexpr bool have_thread_local
-{
-#  if defined(PQXX_HAVE_THREAD_LOCAL)
-  true
-#  else
-  false
-#  endif
-};
-#endif
-
-
-/// String comparison between string_view.
-constexpr inline bool equal(std::string_view lhs, std::string_view rhs)
-{
-  return lhs.compare(rhs) == 0;
-}
-
-
-/// The lowest possible value of integral type T.
-template<typename T> constexpr T bottom{std::numeric_limits<T>::min()};
-
-/// The highest possible value of integral type T.
-template<typename T> constexpr T top{std::numeric_limits<T>::max()};
-
-/// Write nonnegative integral value at end of buffer.  Return start.
-/** Assumes a sufficiently large buffer.
- *
- * Includes a single trailing null byte, right before @c *end.
- */
-template<typename T> constexpr inline char *nonneg_to_buf(char *end, T value)
-{
-  char *pos = end;
-  *--pos = '\0';
-  do {
-    *--pos = pqxx::internal::number_to_digit(int(value % 10));
-    value = T(value / 10);
-  } while (value > 0);
-  return pos;
-}
-
-
-/// Write negative version of value at end of buffer.  Return start.
-/** Like @c nonneg_to_buf, but prefixes a minus sign.
- */
-template<typename T> constexpr inline char *neg_to_buf(char *end, T value)
-{
-  char *pos = nonneg_to_buf(end, value);
-  *--pos = '-';
-  return pos;
-}
-
-
-/// Write lowest possible negative value at end of buffer.
-/** Like @c neg_to_buf, but for the special case of the bottom value.
- */
-template<typename T> constexpr inline char *bottom_to_buf(char *end)
-{
-  static_assert(std::is_signed_v<T>);
-
-  // This is the hard case.  In two's-complement systems, which includes
-  // any modern-day system I can think of, a signed type's bottom value
-  // has no positive equivalent.  Luckily the C++ standards committee can't
-  // think of any exceptions either, so it's the required representation as
-  // of C++20.  We'll assume it right now, while still on C++17.
-  static_assert(-(bottom<T> + 1) == top<T>);
-
-  // The unsigned version of T does have the unsigned version of bottom.
-  using unsigned_t = std::make_unsigned_t<T>;
-
-  // Careful though.  If we tried to negate value in order to promote to
-  // unsigned_t, the value will overflow, which means behaviour is
-  // undefined.  Promotion of a negative value to an unsigned type is
-  // well-defined, given a representation, so let's do that:
-  constexpr auto positive{static_cast<unsigned_t>(bottom<T>)};
-
-  // As luck would have it, in two's complement, this gives us exactly the
-  // value we want.
-  static_assert(positive == top<unsigned_t> / 2 + 1);
-
-  // So the only thing we need to do differently from the regular negative
-  // case is to skip that overflowing negation and promote to an unsigned type!
-  return neg_to_buf(end, positive);
-}
-
-
-#if defined(PQXX_HAVE_CHARCONV_INT) || defined(PQXX_HAVE_CHARCONV_FLOAT)
-/// Call to_chars, report errors as exceptions, add zero, return pointer.
-template<typename T>
-[[maybe_unused]] inline char *
-wrap_to_chars(char *begin, char *end, T const &value)
-{
-  auto res{std::to_chars(begin, end - 1, value)};
-  if (res.ec != std::errc())
-    PQXX_UNLIKELY
-  switch (res.ec)
-  {
-  case std::errc::value_too_large:
-    throw pqxx::conversion_overrun{
-      "Could not convert " + pqxx::type_name<T> +
-      " to string: "
-      "buffer too small (" +
-      pqxx::to_string(end - begin) + " bytes)."};
-  default:
-    throw pqxx::conversion_error{
-      "Could not convert " + pqxx::type_name<T> + " to string."};
-  }
-  // No need to check for overrun here: we never even told to_chars about that
-  // last byte in the buffer, so it didn't get used up.
-  *res.ptr++ = '\0';
-  return res.ptr;
-}
-#endif
-} // namespace
-
-
-namespace pqxx::internal
-{
-template<typename T>
-zview integral_traits<T>::to_buf(char *begin, char *end, T const &value)
-{
-  static_assert(std::is_integral_v<T>);
-  auto const space{end - begin},
-    need{static_cast<ptrdiff_t>(size_buffer(value))};
-  if (space < need)
-    throw conversion_overrun{
-      "Could not convert " + type_name<T> +
-      " to string: "
-      "buffer too small.  " +
-      pqxx::internal::state_buffer_overrun(space, need)};
-
-  char *pos;
-  if constexpr (std::is_unsigned_v<T>)
-    pos = nonneg_to_buf(end, value);
-  else if (value >= 0)
-    pos = nonneg_to_buf(end, value);
-  else if (value > bottom<T>)
-    pos = neg_to_buf(end, -value);
-  else
-    pos = bottom_to_buf<T>(end);
-
-  return {pos, end - pos - 1};
-}
-
-
-template zview integral_traits<short>::to_buf(char *, char *, short const &);
-template zview integral_traits<unsigned short>::to_buf(
-  char *, char *, unsigned short const &);
-template zview integral_traits<int>::to_buf(char *, char *, int const &);
-template zview
-integral_traits<unsigned>::to_buf(char *, char *, unsigned const &);
-template zview integral_traits<long>::to_buf(char *, char *, long const &);
-template zview
-integral_traits<unsigned long>::to_buf(char *, char *, unsigned long const &);
-template zview
-integral_traits<long long>::to_buf(char *, char *, long long const &);
-template zview integral_traits<unsigned long long>::to_buf(
-  char *, char *, unsigned long long const &);
-
-
-template<typename T>
-char *integral_traits<T>::into_buf(char *begin, char *end, T const &value)
-{
-#if defined(PQXX_HAVE_CHARCONV_INT)
-  // This is exactly what to_chars is good at.  Trust standard library
-  // implementers to optimise better than we can.
-  return wrap_to_chars(begin, end, value);
-#else
-  return generic_into_buf(begin, end, value);
-#endif
-}
-
-
-template char *integral_traits<short>::into_buf(char *, char *, short const &);
-template char *integral_traits<unsigned short>::into_buf(
-  char *, char *, unsigned short const &);
-template char *integral_traits<int>::into_buf(char *, char *, int const &);
-template char *
-integral_traits<unsigned>::into_buf(char *, char *, unsigned const &);
-template char *integral_traits<long>::into_buf(char *, char *, long const &);
-template char *integral_traits<unsigned long>::into_buf(
-  char *, char *, unsigned long const &);
-template char *
-integral_traits<long long>::into_buf(char *, char *, long long const &);
-template char *integral_traits<unsigned long long>::into_buf(
-  char *, char *, unsigned long long const &);
-} // namespace pqxx::internal
-
-
-namespace pqxx::internal
-{
-std::string demangle_type_name(char const raw[])
-{
-#if defined(PQXX_HAVE_CXA_DEMANGLE)
-  // We've got __cxa_demangle.  Use it to get a friendlier type name.
-  int status{0};
-
-  // We've seen this fail on FreeBSD 11.3 (see #361).  Trying to throw a
-  // meaningful exception only made things worse.  So in case of error, just
-  // fall back to the raw name.
-  //
-  // When __cxa_demangle fails, it's guaranteed to return null.
-  char *demangled{abi::__cxa_demangle(raw, nullptr, nullptr, &status)};
-#else
-  static constexpr char *demangled{nullptr};
-#endif
-  std::string const name{(demangled == nullptr) ? raw : demangled};
-
-  // Check for nullness to work around jemalloc bug (see #508).
-  if (demangled != nullptr)
-    std::free(demangled);
-  return name;
-}
-
-void PQXX_COLD throw_null_conversion(std::string const &type)
-{
-  throw conversion_error{"Attempt to convert null to " + type + "."};
-}
-
-
-std::string PQXX_COLD state_buffer_overrun(int have_bytes, int need_bytes)
-{
-  // We convert these in standard library terms, not for the localisation
-  // so much as to avoid "error cycles," if these values in turn should fail
-  // to get enough buffer space.
-  std::stringstream have, need;
-  have << have_bytes;
-  need << need_bytes;
-  return "Have " + have.str() + " bytes, need " + need.str() + ".";
-}
-} // namespace pqxx::internal
-
-
-namespace
-{
-#if defined(PQXX_HAVE_CHARCONV_INT) || defined(PQXX_HAVE_CHARCONV_FLOAT)
-template<typename TYPE>
-[[maybe_unused]] inline TYPE from_string_arithmetic(std::string_view in)
-{
-  char const *here;
-  auto const end{std::data(in) + std::size(in)};
-
-  // Skip whitespace.  This is not the proper way to do it, but I see no way
-  // that any of the supported encodings could ever produce a valid character
-  // whose byte sequence would confuse this code.
-  for (here = std::data(in); here < end and (*here == ' ' or *here == '\t');
-       ++here)
-    ;
-
-  TYPE out{};
-  auto const res{std::from_chars(here, end, out)};
-  if (res.ec == std::errc() and res.ptr == end)
-    PQXX_LIKELY
-  return out;
-
-  std::string msg;
-  if (res.ec == std::errc())
-  {
-    msg = "Could not parse full string.";
-  }
-  else
-  {
-    switch (res.ec)
-    {
-    case std::errc::result_out_of_range: msg = "Value out of range."; break;
-    case std::errc::invalid_argument: msg = "Invalid argument."; break;
-    default: break;
-    }
-  }
-
-  auto const base{
-    "Could not convert '" + std::string(in) +
-    "' "
-    "to " +
-    pqxx::type_name<TYPE>};
-  if (std::empty(msg))
-    throw pqxx::conversion_error{base + "."};
-  else
-    throw pqxx::conversion_error{base + ": " + msg};
-}
-#endif
-} // namespace
-
-
-namespace
-{
-#if !defined(PQXX_HAVE_CHARCONV_INT)
-[[noreturn, maybe_unused]] void PQXX_COLD report_overflow()
-{
-  throw pqxx::conversion_error{
-    "Could not convert string to integer: value out of range."};
-}
-
-template<typename T> struct numeric_ten
-{
-  static inline constexpr T value = 10;
-};
-
-template<typename T> struct numeric_high_threshold
-{
-  static inline constexpr T value =
-    (std::numeric_limits<T>::max)() / numeric_ten<T>::value;
-};
-
-template<typename T> struct numeric_low_threshold
-{
-  static inline constexpr T value =
-    (std::numeric_limits<T>::min)() / numeric_ten<T>::value;
-};
-
-/// Return 10*n, or throw exception if it overflows.
-template<typename T>
-[[maybe_unused]] constexpr inline T safe_multiply_by_ten(T n)
-{
-  using limits = std::numeric_limits<T>;
-
-  if (n > numeric_high_threshold<T>::value)
-    PQXX_UNLIKELY
-  report_overflow();
-  if constexpr (limits::is_signed)
-  {
-    if (numeric_low_threshold<T>::value > n)
-      PQXX_UNLIKELY
-    report_overflow();
-  }
-  return T(n * numeric_ten<T>::value);
-}
-
-
-/// Add digit d to nonnegative n, or throw exception if it overflows.
-template<typename T>
-[[maybe_unused]] constexpr inline T safe_add_digit(T n, T d)
-{
-  T const high_threshold{static_cast<T>(std::numeric_limits<T>::max() - d)};
-  if (n > high_threshold)
-    PQXX_UNLIKELY
-  report_overflow();
-  return static_cast<T>(n + d);
-}
-
-
-/// Subtract digit d to nonpositive n, or throw exception if it overflows.
-template<typename T>
-[[maybe_unused]] constexpr inline T safe_sub_digit(T n, T d)
-{
-  T const low_threshold{static_cast<T>(std::numeric_limits<T>::min() + d)};
-  if (n < low_threshold)
-    PQXX_UNLIKELY
-  report_overflow();
-  return static_cast<T>(n - d);
-}
-
-
-/// For use in string parsing: add new numeric digit to intermediate value.
-template<typename L, typename R>
-[[maybe_unused]] constexpr inline L absorb_digit_positive(L value, R digit)
-{
-  return safe_add_digit(safe_multiply_by_ten(value), L(digit));
-}
-
-
-/// For use in string parsing: subtract digit from intermediate value.
-template<typename L, typename R>
-[[maybe_unused]] constexpr inline L absorb_digit_negative(L value, R digit)
-{
-  return safe_sub_digit(safe_multiply_by_ten(value), L(digit));
-}
-
-
-template<typename T>
-[[maybe_unused]] constexpr T from_string_integer(std::string_view text)
-{
-  if (std::size(text) == 0)
-    throw pqxx::conversion_error{
-      "Attempt to convert empty string to " + pqxx::type_name<T> + "."};
-
-  char const *const data{std::data(text)};
-  std::size_t i{0};
-
-  // Skip whitespace.  This is not the proper way to do it, but I see no way
-  // that any of the supported encodings could ever produce a valid character
-  // whose byte sequence would confuse this code.
-  //
-  // Why skip whitespace?  Because that's how integral conversions are meant to
-  // work _for composite types._  I see no clean way to support leading
-  // whitespace there without putting the code in here.  A shame about the
-  // overhead, modest as it is, for the normal case.
-  for (; i < std::size(text) and (data[i] == ' ' or data[i] == '\t'); ++i)
-    ;
-  if (i == std::size(text))
-    throw pqxx::conversion_error{
-      "Converting string to " + pqxx::type_name<T> +
-      ", but it contains only whitespace."};
-
-  char const initial{data[i]};
-  T result{0};
-
-  if (pqxx::internal::is_digit(initial))
-  {
-    for (; pqxx::internal::is_digit(data[i]); ++i)
-      result = absorb_digit_positive(
-        result, pqxx::internal::digit_to_number(data[i]));
-  }
-  else if (initial == '-')
-  {
-    if constexpr (not std::is_signed_v<T>)
-      throw pqxx::conversion_error{
-        "Attempt to convert negative value to " + pqxx::type_name<T> + "."};
-
-    ++i;
-    if (i >= std::size(text))
-      throw pqxx::conversion_error{
-        "Converting string to " + pqxx::type_name<T> +
-        ", but it contains only a sign."};
-    for (; i < std::size(text) and pqxx::internal::is_digit(data[i]); ++i)
-      result = absorb_digit_negative(
-        result, pqxx::internal::digit_to_number(data[i]));
-  }
-  else
-  {
-    throw pqxx::conversion_error{
-      "Could not convert string to " + pqxx::type_name<T> +
-      ": "
-      "'" +
-      std::string{text} + "'."};
-  }
-
-  if (i < std::size(text))
-    throw pqxx::conversion_error{
-      "Unexpected text after " + pqxx::type_name<T> +
-      ": "
-      "'" +
-      std::string{text} + "'."};
-
-  return result;
-}
-#endif // !PQXX_HAVE_CHARCONV_INT
-} // namespace
-
-
-namespace
-{
-[[maybe_unused]] constexpr bool
-valid_infinity_string(std::string_view text) noexcept
-{
-  return equal("infinity", text) or equal("Infinity", text) or
-         equal("INFINITY", text) or equal("inf", text);
-}
-} // namespace
-
-
-#if !defined(PQXX_HAVE_CHARCONV_FLOAT)
-namespace
-{
-/// Wrapper for std::stringstream with C locale.
-/** We use this to work around missing std::to_chars for floating-point types.
- *
- * Initialising the stream (including locale and tweaked precision) seems to
- * be expensive.  So, create thread-local instances which we re-use.  It's a
- * lockless way of keeping global variables thread-safe, basically.
- *
- * The stream initialisation happens once per thread, in the constructor.
- * And that's why we need to wrap this in a class.  We can't just do it at the
- * call site, or we'd still be doing it for every call.
- */
-template<typename T> class dumb_stringstream : public std::stringstream
-{
-public:
-  // Do not initialise the base-class object using "stringstream{}" (with curly
-  // braces): that breaks on Visual C++.  The classic "stringstream()" syntax
-  // (with parentheses) does work.
-  PQXX_COLD dumb_stringstream()
-  {
-    this->imbue(std::locale::classic());
-    this->precision(std::numeric_limits<T>::max_digits10);
-  }
-};
-
-
-template<typename F>
-inline bool PQXX_COLD from_dumb_stringstream(
-  dumb_stringstream<F> &s, F &result, std::string_view text)
-{
-  s.str(std::string{text});
-  return static_cast<bool>(s >> result);
-}
-
-
-// These are hard, and some popular compilers still lack std::from_chars.
-template<typename T>
-inline T PQXX_COLD from_string_awful_float(std::string_view text)
-{
-  if (std::empty(text))
-    throw pqxx::conversion_error{
-      "Trying to convert empty string to " + pqxx::type_name<T> + "."};
-
-  bool ok{false};
-  T result;
-
-  switch (text[0])
-  {
-  case 'N':
-  case 'n':
-    // Accept "NaN," "nan," etc.
-    ok =
-      (std::size(text) == 3 and (text[1] == 'A' or text[1] == 'a') and
-       (text[2] == 'N' or text[2] == 'n'));
-    result = std::numeric_limits<T>::quiet_NaN();
-    break;
-
-  case 'I':
-  case 'i':
-    ok = valid_infinity_string(text);
-    result = std::numeric_limits<T>::infinity();
-    break;
-
-  default:
-    if (text[0] == '-' and valid_infinity_string(text.substr(1)))
-    {
-      ok = true;
-      result = -std::numeric_limits<T>::infinity();
-    }
-    else
-    {
-      PQXX_LIKELY
-      if constexpr (have_thread_local)
-      {
-        thread_local dumb_stringstream<T> S;
-        // Visual Studio 2017 seems to fail on repeated conversions if the
-        // clear() is done before the seekg().  Still don't know why!  See #124
-        // and #125.
-        S.seekg(0);
-        S.clear();
-        ok = from_dumb_stringstream(S, result, text);
-      }
-      else
-      {
-        dumb_stringstream<T> S;
-        ok = from_dumb_stringstream(S, result, text);
-      }
-    }
-    break;
-  }
-
-  if (not ok)
-    throw pqxx::conversion_error{
-      "Could not convert string to numeric value: '" + std::string{text} +
-      "'."};
-
-  return result;
-}
-} // namespace
-#endif // !PQXX_HAVE_CHARCONV_FLOAT
-
-
-namespace pqxx::internal
-{
-/// Floating-point to_buf implemented in terms of to_string.
-template<typename T>
-zview float_traits<T>::to_buf(char *begin, char *end, T const &value)
-{
-#if defined(PQXX_HAVE_CHARCONV_FLOAT)
-  {
-    // Definitely prefer to let the standard library handle this!
-    auto const ptr{wrap_to_chars(begin, end, value)};
-    return zview{begin, std::size_t(ptr - begin - 1)};
-  }
-#else
-  {
-    // Implement it ourselves.  Weird detail: since this workaround is based on
-    // std::stringstream, which produces a std::string, it's actually easier to
-    // build the to_buf() on top of the to_string() than the other way around.
-    if (std::isnan(value))
-      return "nan"_zv;
-    if (std::isinf(value))
-      return (value > 0) ? "infinity"_zv : "-infinity"_zv;
-    auto text{to_string_float(value)};
-    auto have{end - begin};
-    auto need{std::size(text) + 1};
-    if (need > std::size_t(have))
-      throw conversion_error{
-        "Could not convert floating-point number to string: "
-        "buffer too small.  " +
-        state_buffer_overrun(have, need)};
-    text.copy(begin, need);
-    return zview{begin, std::size(text)};
-  }
-#endif
-}
-
-
-template zview float_traits<float>::to_buf(char *, char *, float const &);
-template zview float_traits<double>::to_buf(char *, char *, double const &);
-template zview
-float_traits<long double>::to_buf(char *, char *, long double const &);
-
-
-template<typename T>
-char *float_traits<T>::into_buf(char *begin, char *end, T const &value)
-{
-#if defined(PQXX_HAVE_CHARCONV_FLOAT)
-  return wrap_to_chars(begin, end, value);
-#else
-  return generic_into_buf(begin, end, value);
-#endif
-}
-
-
-template char *float_traits<float>::into_buf(char *, char *, float const &);
-template char *float_traits<double>::into_buf(char *, char *, double const &);
-template char *
-float_traits<long double>::into_buf(char *, char *, long double const &);
-
-
-#if !defined(PQXX_HAVE_CHARCONV_FLOAT)
-template<typename F>
-inline std::string PQXX_COLD
-to_dumb_stringstream(dumb_stringstream<F> &s, F value)
-{
-  s.str("");
-  s << value;
-  return s.str();
-}
-#endif
-
-
-/// Floating-point implementations for @c pqxx::to_string().
-template<typename T> std::string to_string_float(T value)
-{
-#if defined(PQXX_HAVE_CHARCONV_FLOAT)
-  {
-    static constexpr auto space{float_traits<T>::size_buffer(value)};
-    std::string buf;
-    buf.resize(space);
-    std::string_view const view{
-      float_traits<T>::to_buf(std::data(buf), std::data(buf) + space, value)};
-    buf.resize(static_cast<std::size_t>(std::end(view) - std::begin(view)));
-    return buf;
-  }
-#else
-  {
-    // In this rare case, we can convert to std::string but not to a simple
-    // buffer.  So, implement to_buf in terms of to_string instead of the other
-    // way around.
-    if constexpr (have_thread_local)
-    {
-      thread_local dumb_stringstream<T> s;
-      return to_dumb_stringstream(s, value);
-    }
-    else
-    {
-      dumb_stringstream<T> s;
-      return to_dumb_stringstream(s, value);
-    }
-  }
-#endif
-}
-} // namespace pqxx::internal
-
-
-namespace pqxx::internal
-{
-template<typename T> T integral_traits<T>::from_string(std::string_view text)
-{
-#if defined(PQXX_HAVE_CHARCONV_INT)
-  return from_string_arithmetic<T>(text);
-#else
-  return from_string_integer<T>(text);
-#endif
-}
-
-template short integral_traits<short>::from_string(std::string_view);
-template unsigned short
-  integral_traits<unsigned short>::from_string(std::string_view);
-template int integral_traits<int>::from_string(std::string_view);
-template unsigned integral_traits<unsigned>::from_string(std::string_view);
-template long integral_traits<long>::from_string(std::string_view);
-template unsigned long
-  integral_traits<unsigned long>::from_string(std::string_view);
-template long long integral_traits<long long>::from_string(std::string_view);
-template unsigned long long
-  integral_traits<unsigned long long>::from_string(std::string_view);
-
-
-template<typename T> T float_traits<T>::from_string(std::string_view text)
-{
-#if defined(PQXX_HAVE_CHARCONV_FLOAT)
-  return from_string_arithmetic<T>(text);
-#else
-  return from_string_awful_float<T>(text);
-#endif
-}
-
-
-template float float_traits<float>::from_string(std::string_view);
-template double float_traits<double>::from_string(std::string_view);
-template long double float_traits<long double>::from_string(std::string_view);
-
-
-template std::string to_string_float(float);
-template std::string to_string_float(double);
-template std::string to_string_float(long double);
-} // namespace pqxx::internal
-
-
-bool pqxx::string_traits<bool>::from_string(std::string_view text)
-{
-  std::optional<bool> result;
-
-  switch (std::size(text))
-  {
-  case 0: result = false; break;
-
-  case 1:
-    switch (text[0])
-    {
-    case 'f':
-    case 'F':
-    case '0': result = false; break;
-
-    case 't':
-    case 'T':
-    case '1': result = true; break;
-
-    default: break;
-    }
-    break;
-
-  case 4:
-    if (equal(text, "true") or equal(text, "TRUE"))
-      result = true;
-    break;
-
-  case 5:
-    if (equal(text, "false") or equal(text, "FALSE"))
-      result = false;
-    break;
-
-  default: break;
-  }
-
-  if (result)
-    return *result;
-  else
-    throw conversion_error{
-      "Failed conversion to bool: '" + std::string{text} + "'."};
-}
diff --git a/ext/libpqxx-7.7.3/src/stream_from.cxx b/ext/libpqxx-7.7.3/src/stream_from.cxx
deleted file mode 100644
index f710300ea..000000000
--- a/ext/libpqxx-7.7.3/src/stream_from.cxx
+++ /dev/null
@@ -1,327 +0,0 @@
-/** Implementation of the pqxx::stream_from class.
- *
- * pqxx::stream_from enables optimized batch reads from a database table.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cassert>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/internal/encodings.hxx"
-#include "pqxx/internal/gates/connection-stream_from.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/transaction_base.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace
-{
-pqxx::internal::glyph_scanner_func *
-get_scanner(pqxx::transaction_base const &tx)
-{
-  auto const group{pqxx::internal::enc_group(tx.conn().encoding_id())};
-  return pqxx::internal::get_glyph_scanner(group);
-}
-
-
-constexpr std::string_view class_name{"stream_from"};
-} // namespace
-
-
-pqxx::stream_from::stream_from(
-  transaction_base &tx, from_query_t, std::string_view query) :
-        transaction_focus{tx, class_name}, m_glyph_scanner{get_scanner(tx)}
-{
-  tx.exec0(internal::concat("COPY ("sv, query, ") TO STDOUT"sv));
-  register_me();
-}
-
-
-pqxx::stream_from::stream_from(
-  transaction_base &tx, from_table_t, std::string_view table) :
-        transaction_focus{tx, class_name, table},
-        m_glyph_scanner{get_scanner(tx)}
-{
-  tx.exec0(internal::concat("COPY "sv, tx.quote_name(table), " TO STDOUT"sv));
-  register_me();
-}
-
-
-pqxx::stream_from::stream_from(
-  transaction_base &tx, std::string_view table, std::string_view columns,
-  from_table_t) :
-        transaction_focus{tx, class_name, table},
-        m_glyph_scanner{get_scanner(tx)}
-{
-  if (std::empty(columns))
-    PQXX_UNLIKELY
-  tx.exec0(internal::concat("COPY "sv, table, " TO STDOUT"sv));
-  else PQXX_LIKELY tx.exec0(
-    internal::concat("COPY "sv, table, "("sv, columns, ") TO STDOUT"sv));
-  register_me();
-}
-
-
-pqxx::stream_from::stream_from(
-  transaction_base &tx, std::string_view unquoted_table,
-  std::string_view columns, from_table_t, int) :
-        stream_from{
-          tx, tx.conn().quote_table(unquoted_table), columns, from_table}
-{}
-
-
-pqxx::stream_from pqxx::stream_from::raw_table(
-  transaction_base &tx, std::string_view path, std::string_view columns)
-{
-  return {tx, path, columns, from_table};
-}
-
-
-pqxx::stream_from pqxx::stream_from::table(
-  transaction_base &tx, table_path path,
-  std::initializer_list<std::string_view> columns)
-{
-  auto const &conn{tx.conn()};
-  return raw_table(tx, conn.quote_table(path), conn.quote_columns(columns));
-}
-
-
-pqxx::stream_from::~stream_from() noexcept
-{
-  try
-  {
-    close();
-  }
-  catch (std::exception const &e)
-  {
-    reg_pending_error(e.what());
-  }
-}
-
-
-pqxx::stream_from::raw_line pqxx::stream_from::get_raw_line()
-{
-  if (*this)
-  {
-    internal::gate::connection_stream_from gate{m_trans.conn()};
-    try
-    {
-      raw_line line{gate.read_copy_line()};
-      if (line.first.get() == nullptr)
-        close();
-      return line;
-    }
-    catch (std::exception const &)
-    {
-      close();
-      throw;
-    }
-  }
-  else
-  {
-    return {};
-  }
-}
-
-
-void pqxx::stream_from::close()
-{
-  if (not m_finished)
-  {
-    PQXX_UNLIKELY
-    m_finished = true;
-    unregister_me();
-  }
-}
-
-
-void pqxx::stream_from::complete()
-{
-  if (m_finished)
-    return;
-  try
-  {
-    // Flush any remaining lines - libpq will automatically close the stream
-    // when it hits the end.
-    bool done{false};
-    while (not done)
-    {
-      auto [line, size] = get_raw_line();
-      ignore_unused(size);
-      done = not line.get();
-    }
-  }
-  catch (broken_connection const &)
-  {
-    close();
-    throw;
-  }
-  catch (std::exception const &e)
-  {
-    reg_pending_error(e.what());
-  }
-  close();
-}
-
-
-void pqxx::stream_from::parse_line()
-{
-  if (m_finished)
-    PQXX_UNLIKELY
-  return;
-  auto const next_seq{m_glyph_scanner};
-
-  m_fields.clear();
-
-  auto const [line, line_size] = get_raw_line();
-  if (line.get() == nullptr)
-  {
-    m_finished = true;
-    return;
-  }
-
-  if (line_size >= (std::numeric_limits<decltype(line_size)>::max() / 2))
-    throw range_error{"Stream produced a ridiculously long line."};
-
-  // Make room for unescaping the line.  It's a pessimistic size.
-  // Unusually, we're storing terminating zeroes *inside* the string.
-  // This is the only place where we modify m_row.  MAKE SURE THE BUFFER DOES
-  // NOT GET RESIZED while we're working, because we're working with views into
-  // its buffer.
-  m_row.resize(line_size + 1);
-
-  char const *line_begin{line.get()};
-  char const *line_end{line_begin + line_size};
-  char const *read{line_begin};
-
-  // Output iterator for unescaped text.
-  char *write{m_row.data()};
-
-  // The pointer cannot be null at this point.  But we initialise field_begin
-  // with this value, and carry it around the loop, and it can later become
-  // null.  Static analysis in clang-tidy then likes to assume a case where
-  // field_begin is null, and deduces from this that "write" must have been
-  // null -- and so it marks "*write" as a null pointer dereference.
-  //
-  // This assertion tells clang-tidy just what it needs in order to deduce
-  // that *write never dereferences a null pointer.
-  assert(write != nullptr);
-
-  // Beginning of current field in m_row, or nullptr for null fields.
-  char const *field_begin{write};
-
-  while (read < line_end)
-  {
-    auto const offset{static_cast<std::size_t>(read - line_begin)};
-    auto const glyph_end{line_begin + next_seq(line_begin, line_size, offset)};
-    // XXX: find_char<'\t', '\\'>().
-    if (glyph_end == read + 1)
-    {
-      // Single-byte character.
-      char c{*read++};
-      switch (c)
-      {
-      case '\t': // Field separator.
-        // End the field.
-        if (field_begin == nullptr)
-        {
-          m_fields.emplace_back();
-        }
-        else
-        {
-          // Would love to emplace_back() here, but gcc 9.1 warns about the
-          // constructor not throwing.  It suggests adding "noexcept."  Which
-          // we can hardly do, without std::string_view guaranteeing it.
-          m_fields.push_back(zview{field_begin, write - field_begin});
-          *write++ = '\0';
-        }
-        field_begin = write;
-        break;
-
-        PQXX_UNLIKELY
-      case '\\': {
-        // Escape sequence.
-        if (read >= line_end)
-          throw failure{"Row ends in backslash"};
-
-        c = *read++;
-        switch (c)
-        {
-        case 'N':
-          // Null value.
-          if (write != field_begin)
-            throw failure{"Null sequence found in nonempty field"};
-          field_begin = nullptr;
-          // (If there's any characters _after_ the null we'll just crash.)
-          break;
-
-        case 'b': // Backspace.
-          PQXX_UNLIKELY
-          *write++ = '\b';
-          break;
-        case 'f': // Form feed
-          PQXX_UNLIKELY
-          *write++ = '\f';
-          break;
-        case 'n': // Line feed.
-          *write++ = '\n';
-          break;
-        case 'r': // Carriage return.
-          *write++ = '\r';
-          break;
-        case 't': // Horizontal tab.
-          *write++ = '\t';
-          break;
-        case 'v': // Vertical tab.
-          *write++ = '\v';
-          break;
-
-        default:
-          PQXX_LIKELY
-          // Regular character ("self-escaped").
-          *write++ = c;
-          break;
-        }
-      }
-      break;
-
-        PQXX_LIKELY
-      default: *write++ = c; break;
-      }
-    }
-    else
-    {
-      // Multi-byte sequence.  Never treated specially, so just append.
-      while (read < glyph_end) *write++ = *read++;
-    }
-  }
-
-  // End the last field here.
-  if (field_begin == nullptr)
-  {
-    m_fields.emplace_back();
-  }
-  else
-  {
-    m_fields.push_back(zview{field_begin, write - field_begin});
-    *write++ = '\0';
-  }
-
-  // DO NOT shrink m_row to fit.  We're carrying string_views pointing into
-  // the buffer.  (Also, how useful would shrinking really be?)
-}
-
-
-std::vector<pqxx::zview> const *pqxx::stream_from::read_row() &
-{
-  parse_line();
-  return m_finished ? nullptr : &m_fields;
-}
diff --git a/ext/libpqxx-7.7.3/src/stream_to.cxx b/ext/libpqxx-7.7.3/src/stream_to.cxx
deleted file mode 100644
index 1693ba377..000000000
--- a/ext/libpqxx-7.7.3/src/stream_to.cxx
+++ /dev/null
@@ -1,170 +0,0 @@
-/** Implementation of the pqxx::stream_to class.
- *
- * pqxx::stream_to enables optimized batch updates to a database table.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/gates/connection-stream_to.hxx"
-#include "pqxx/stream_from.hxx"
-#include "pqxx/stream_to.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace
-{
-using namespace std::literals;
-
-void begin_copy(
-  pqxx::transaction_base &tx, std::string_view table, std::string_view columns)
-{
-  tx.exec0(
-    std::empty(columns) ?
-      pqxx::internal::concat("COPY "sv, table, " FROM STDIN"sv) :
-      pqxx::internal::concat(
-        "COPY "sv, table, "("sv, columns, ") FROM STDIN"sv));
-}
-} // namespace
-
-
-pqxx::stream_to::~stream_to() noexcept
-{
-  try
-  {
-    complete();
-  }
-  catch (std::exception const &e)
-  {
-    reg_pending_error(e.what());
-  }
-}
-
-
-void pqxx::stream_to::write_raw_line(std::string_view text)
-{
-  internal::gate::connection_stream_to{m_trans.conn()}.write_copy_line(text);
-}
-
-
-void pqxx::stream_to::write_buffer()
-{
-  if (not std::empty(m_buffer))
-  {
-    // In append_to_buffer() we write a tab after each field.  We only want a
-    // tab _between_ fields.  Remove that last one.
-    assert(m_buffer[std::size(m_buffer) - 1] == '\t');
-    m_buffer.resize(std::size(m_buffer) - 1);
-  }
-  write_raw_line(m_buffer);
-  m_buffer.clear();
-}
-
-
-pqxx::stream_to &pqxx::stream_to::operator<<(stream_from &tr)
-{
-  while (tr)
-  {
-    const auto [line, size] = tr.get_raw_line();
-    if (line.get() == nullptr)
-      break;
-    write_raw_line(std::string_view{line.get(), size});
-  }
-  return *this;
-}
-
-
-pqxx::stream_to::stream_to(
-  transaction_base &tx, std::string_view path, std::string_view columns) :
-        transaction_focus{tx, s_classname, path},
-        m_scanner{get_glyph_scanner(
-          pqxx::internal::enc_group(tx.conn().encoding_id()))}
-{
-  begin_copy(tx, path, columns);
-  register_me();
-}
-
-
-void pqxx::stream_to::complete()
-{
-  if (!m_finished)
-  {
-    m_finished = true;
-    unregister_me();
-    internal::gate::connection_stream_to{m_trans.conn()}.end_copy_write();
-  }
-}
-
-
-/// Return escape letter for c's backslash sequence, or 0 if not needed.
-/** The API is a bit weird: you pass the width of the character, and its first
- * byte.  That's because we never need to escape a multibyte character anyway.
- */
-constexpr char escape(std::size_t width, char c)
-{
-  if (width == 1u)
-    switch (c)
-    {
-    case '\b': return 'b';
-    case '\f': return 'f';
-    case '\n': return 'n';
-    case '\r': return 'r';
-    case '\t': return 't';
-    case '\v': return 'v';
-    case '\\': return '\\';
-    }
-
-  PQXX_LIKELY
-  return '\0';
-}
-
-
-void pqxx::stream_to::escape_field_to_buffer(std::string_view data)
-{
-  if (not std::empty(data))
-  {
-    // Mark the beginning of a stretch that we can copy into our buffer in one
-    // go.  It feels like a waste to invoke generic multi-byte copies for every
-    // individual character in this loop, most of them actually probably only
-    // one byte long.
-    std::size_t begin_stretch{0};
-
-    std::size_t begin_char{0}, end;
-    // XXX: find_char<'\b', '\f', '\n', '\r', '\t', \v', '\\'>().
-    for (end = m_scanner(std::data(data), std::size(data), begin_char);
-         begin_char < std::size(data); begin_char = end,
-        end = m_scanner(std::data(data), std::size(data), begin_char))
-    {
-      // Escape sequence letter, if needed.
-      char const esc{escape(end - begin_char, data[begin_char])};
-      if (esc != '\0')
-      {
-        // This character needs escaping.  So, it ends any trivially copyable
-        // stretch that we may have been having.
-
-        // Copy the stretch we've built up into our buffer.
-        m_buffer.append(
-          std::data(data) + begin_stretch, begin_char - begin_stretch);
-
-        // Escape the current character.
-        m_buffer.push_back('\\');
-        m_buffer.push_back(esc);
-
-        // Start a new stretch, right after the current character.
-        begin_stretch = end;
-      }
-    }
-    // Copy the final stretch.
-    m_buffer.append(
-      std::data(data) + begin_stretch, begin_char - begin_stretch);
-  }
-  m_buffer.push_back('\t');
-}
diff --git a/ext/libpqxx-7.7.3/src/subtransaction.cxx b/ext/libpqxx-7.7.3/src/subtransaction.cxx
deleted file mode 100644
index 186ad13e8..000000000
--- a/ext/libpqxx-7.7.3/src/subtransaction.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/** Implementation of the pqxx::subtransaction class.
- *
- * pqxx::transaction is a nested transaction, i.e. one within a transaction
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <memory>
-#include <stdexcept>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/subtransaction.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace
-{
-using namespace std::literals;
-constexpr std::string_view class_name{"subtransaction"sv};
-} // namespace
-
-
-pqxx::subtransaction::subtransaction(
-  dbtransaction &t, std::string_view tname) :
-        transaction_focus{t, class_name, t.conn().adorn_name(tname)},
-        // We can't initialise the rollback command here, because we don't yet
-        // have a full object to implement quoted_name().
-        dbtransaction{t.conn(), tname, std::shared_ptr<std::string>{}}
-{
-  set_rollback_cmd(std::make_shared<std::string>(
-    internal::concat("ROLLBACK TO SAVEPOINT ", quoted_name())));
-  direct_exec(std::make_shared<std::string>(
-    internal::concat("SAVEPOINT ", quoted_name())));
-}
-
-
-namespace
-{
-using dbtransaction_ref = pqxx::dbtransaction &;
-}
-
-
-pqxx::subtransaction::subtransaction(
-  subtransaction &t, std::string_view tname) :
-        subtransaction(dbtransaction_ref(t), tname)
-{}
-
-
-pqxx::subtransaction::~subtransaction() noexcept
-{
-  close();
-}
-
-
-void pqxx::subtransaction::do_commit()
-{
-  direct_exec(std::make_shared<std::string>(
-    internal::concat("RELEASE SAVEPOINT ", quoted_name())));
-}
diff --git a/ext/libpqxx-7.7.3/src/time.cxx b/ext/libpqxx-7.7.3/src/time.cxx
deleted file mode 100644
index 6b3ffdb1c..000000000
--- a/ext/libpqxx-7.7.3/src/time.cxx
+++ /dev/null
@@ -1,226 +0,0 @@
-/** Implementation of date/time support.
- */
-#include "pqxx-source.hxx"
-
-#include <cstdlib>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/time.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-// std::chrono::year_month_day is C++20, so let's worry a bit less about C++17
-// compatibility in this file.
-#if defined(PQXX_HAVE_YEAR_MONTH_DAY)
-namespace
-{
-using namespace std::literals;
-
-
-/// Render the numeric part of a year value into a buffer.
-/** Converts the year from "common era" (with a Year Zero) to "anno domini"
- * (without a Year Zero).
- *
- * Doesn't render the sign.  When you're rendering a date, you indicate a
- * negative year by suffixing "BC" at the very end.
- *
- * Where @c string_traits::into_buf() returns a pointer to the position right
- * after the terminating zero, this function returns a pointer to the character
- * right after the last digit.  (It may or may not write a terminating zero at
- * that position itself.)
- */
-inline char *
-year_into_buf(char *begin, char *end, std::chrono::year const &value)
-{
-  int const y{value};
-  if (y == int{(std::chrono::year::min)()})
-  {
-    // This is an evil special case: C++ year -32767 translates to 32768 BC,
-    // which is a number we can't fit into a short.  At the moment postgres
-    // doesn't handle years before 4713 BC, but who knows, right?
-    static_assert(int{(std::chrono::year::min)()} == -32767);
-    constexpr auto hardcoded{"32768"sv};
-    PQXX_UNLIKELY
-    begin += hardcoded.copy(begin, std::size(hardcoded));
-  }
-  else
-  {
-    // C++ std::chrono::year has a year zero.  PostgreSQL does not.  So, C++
-    // year zero is 1 BC in the postgres calendar; C++ 1 BC is postgres 2 BC,
-    // and so on.
-    auto const absy{static_cast<short>(std::abs(y) + int{y <= 0})};
-
-    // PostgreSQL requires year input to be at least 3 digits long, or it
-    // won't be able to deduce the date format correctly.  However on output
-    // it always writes years as at least 4 digits, and we'll do the same.
-    // Dates and times are a dirty, dirty business.
-    if (absy < 1000)
-    {
-      PQXX_UNLIKELY
-      *begin++ = '0';
-      if (absy < 100)
-        *begin++ = '0';
-      if (absy < 10)
-        *begin++ = '0';
-    }
-    begin = pqxx::string_traits<short>::into_buf(begin, end, absy) - 1;
-  }
-  return begin;
-}
-
-
-/// Parse the numeric part of a year value.
-inline int year_from_buf(std::string_view text)
-{
-  if (std::size(text) < 4)
-    throw pqxx::conversion_error{
-      pqxx::internal::concat("Year field is too small: '", text, "'.")};
-  // Parse as int, so we can accommodate 32768 BC which won't fit in a short
-  // as-is, but equates to 32767 BCE which will.
-  int const year{pqxx::string_traits<int>::from_string(text)};
-  if (year <= 0)
-    throw pqxx::conversion_error{
-      pqxx::internal::concat("Bad year: '", text, "'.")};
-  return year;
-}
-
-
-/// Render a valid 1-based month number into a buffer.
-/* Where @c string_traits::into_buf() returns a pointer to the position right
- * after the terminating zero, this function returns a pointer to the character
- * right after the last digit.  (It may or may not write a terminating zero at
- * that position itself.)
- */
-inline static char *
-month_into_buf(char *begin, std::chrono::month const &value)
-{
-  unsigned const m{value};
-  if (m >= 10)
-    *begin = '1';
-  else
-    *begin = '0';
-  ++begin;
-  *begin++ = pqxx::internal::number_to_digit(static_cast<int>(m % 10));
-  return begin;
-}
-
-
-/// Parse a 1-based month value.
-inline std::chrono::month month_from_string(std::string_view text)
-{
-  if (
-    not pqxx::internal::is_digit(text[0]) or
-    not pqxx::internal::is_digit(text[1]))
-    throw pqxx::conversion_error{
-      pqxx::internal::concat("Invalid month: '", text, "'.")};
-  return std::chrono::month{unsigned(
-    (10 * pqxx::internal::digit_to_number(text[0])) +
-    pqxx::internal::digit_to_number(text[1]))};
-}
-
-
-/// Render a valid 1-based day-of-month value into a buffer.
-inline char *day_into_buf(char *begin, std::chrono::day const &value)
-{
-  unsigned d{value};
-  *begin++ = pqxx::internal::number_to_digit(static_cast<int>(d / 10));
-  *begin++ = pqxx::internal::number_to_digit(static_cast<int>(d % 10));
-  return begin;
-}
-
-
-/// Parse a 1-based day-of-month value.
-inline std::chrono::day day_from_string(std::string_view text)
-{
-  if (
-    not pqxx::internal::is_digit(text[0]) or
-    not pqxx::internal::is_digit(text[1]))
-    throw pqxx::conversion_error{
-      pqxx::internal::concat("Bad day in date: '", text, "'.")};
-  std::chrono::day const d{unsigned(
-    (10 * pqxx::internal::digit_to_number(text[0])) +
-    pqxx::internal::digit_to_number(text[1]))};
-  if (not d.ok())
-    throw pqxx::conversion_error{
-      pqxx::internal::concat("Bad day in date: '", text, "'.")};
-  return d;
-}
-
-
-/// Look for the dash separating year and month.
-/** Assumes that @c text is nonempty.
- */
-inline std::size_t find_year_month_separator(std::string_view text) noexcept
-{
-  // We're looking for a dash.  PostgreSQL won't output a negative year, so
-  // no worries about a leading dash.  We could start searching at offset 4,
-  // but starting at the beginning produces more helpful error messages for
-  // malformed years.
-  std::size_t here;
-  for (here = 0; here < std::size(text) and text[here] != '-'; ++here)
-    ;
-  return here;
-}
-
-
-/// Componse generic "invalid date" message for given (invalid) date text.
-std::string make_parse_error(std::string_view text)
-{
-  return pqxx::internal::concat("Invalid date: '", text, "'.");
-}
-} // namespace
-
-
-namespace pqxx
-{
-char *string_traits<std::chrono::year_month_day>::into_buf(
-  char *begin, char *end, std::chrono::year_month_day const &value)
-{
-  if (std::size_t(end - begin) < size_buffer(value))
-    throw conversion_overrun{"Not enough room in buffer for date."};
-  begin = year_into_buf(begin, end, value.year());
-  *begin++ = '-';
-  begin = month_into_buf(begin, value.month());
-  *begin++ = '-';
-  begin = day_into_buf(begin, value.day());
-  if (int{value.year()} <= 0)
-  {
-    PQXX_UNLIKELY
-    begin += s_bc.copy(begin, std::size(s_bc));
-  }
-  *begin++ = '\0';
-  return begin;
-}
-
-
-std::chrono::year_month_day
-string_traits<std::chrono::year_month_day>::from_string(std::string_view text)
-{
-  // We can't just re-use the std::chrono::year conversions, because the "BC"
-  // suffix comes at the very end.
-  if (std::size(text) < 9)
-    throw conversion_error{make_parse_error(text)};
-  bool const is_bc{text.ends_with(s_bc)};
-  if (is_bc)
-    PQXX_UNLIKELY
-  text = text.substr(0, std::size(text) - std::size(s_bc));
-  auto const ymsep{find_year_month_separator(text)};
-  if ((std::size(text) - ymsep) != 6)
-    throw conversion_error{make_parse_error(text)};
-  auto const base_year{
-    year_from_buf(std::string_view{std::data(text), ymsep})};
-  if (base_year == 0)
-    throw conversion_error{"Year zero conversion."};
-  std::chrono::year const y{is_bc ? (-base_year + 1) : base_year};
-  auto const m{month_from_string(text.substr(ymsep + 1, 2))};
-  if (text[ymsep + 3] != '-')
-    throw conversion_error{make_parse_error(text)};
-  auto const d{day_from_string(text.substr(ymsep + 4, 2))};
-  std::chrono::year_month_day const date{y, m, d};
-  if (not date.ok())
-    throw conversion_error{make_parse_error(text)};
-  return date;
-}
-} // namespace pqxx
-#endif
diff --git a/ext/libpqxx-7.7.3/src/transaction.cxx b/ext/libpqxx-7.7.3/src/transaction.cxx
deleted file mode 100644
index 61ed29ef7..000000000
--- a/ext/libpqxx-7.7.3/src/transaction.cxx
+++ /dev/null
@@ -1,107 +0,0 @@
-/** Implementation of the pqxx::transaction class.
- *
- * pqxx::transaction represents a regular database transaction.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <stdexcept>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/connection.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/transaction.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-pqxx::internal::basic_transaction::basic_transaction(
-  connection &c, zview begin_command, std::string_view tname) :
-        dbtransaction(c, tname)
-{
-  register_transaction();
-  direct_exec(begin_command);
-}
-
-
-pqxx::internal::basic_transaction::basic_transaction(
-  connection &c, zview begin_command, std::string &&tname) :
-        dbtransaction(c, std::move(tname))
-{
-  register_transaction();
-  direct_exec(begin_command);
-}
-
-
-pqxx::internal::basic_transaction::basic_transaction(
-  connection &c, zview begin_command) :
-        dbtransaction(c)
-{
-  register_transaction();
-  direct_exec(begin_command);
-}
-
-
-// This should stop the compiler from generating the same vtables and
-// destructor in multiple translation units.  More importantly, if we don't do
-// this, the sanitisers in g++ 7 and clang++ 6 complain about pointers to
-// dbtransaction actually pointing to basic_transaction.  Which is odd, in that
-// any basic_transaction pointer should also be a dbtransaction pointer.  But,
-// apparently the vtable isn't the right one.
-pqxx::internal::basic_transaction::~basic_transaction() noexcept = default;
-
-
-void pqxx::internal::basic_transaction::do_commit()
-{
-  static auto const commit_q{std::make_shared<std::string>("COMMIT"sv)};
-  try
-  {
-    direct_exec(commit_q);
-  }
-  catch (statement_completion_unknown const &e)
-  {
-    // Outcome of "commit" is unknown.  This is a disaster: we don't know the
-    // resulting state of the database.
-    process_notice(internal::concat(e.what(), "\n"));
-
-    std::string msg{internal::concat(
-      "WARNING: Commit of transaction '", name(),
-      "' is unknown. "
-      "There is no way to tell whether the transaction succeeded "
-      "or was aborted except to check manually.\n")};
-    process_notice(msg);
-    // Strip newline.  It was only needed for process_notice().
-    msg.pop_back();
-    throw in_doubt_error{std::move(msg)};
-  }
-  catch (std::exception const &e)
-  {
-    if (not conn().is_open())
-    {
-      // We've lost the connection while committing.  There is just no way of
-      // telling what happened on the other end.  >8-O
-      process_notice(internal::concat(e.what(), "\n"));
-
-      auto msg{internal::concat(
-        "WARNING: Connection lost while committing transaction '", name(),
-        "'. There is no way to tell whether the transaction succeeded "
-        "or was aborted except to check manually.\n")};
-      process_notice(msg);
-      // Strip newline.  It was only needed for process_notice().
-      msg.pop_back();
-      throw in_doubt_error{std::move(msg)};
-    }
-    else
-    {
-      // Commit failed--probably due to a constraint violation or something
-      // similar.
-      throw;
-    }
-  }
-}
diff --git a/ext/libpqxx-7.7.3/src/transaction_base.cxx b/ext/libpqxx-7.7.3/src/transaction_base.cxx
deleted file mode 100644
index c7d01ac08..000000000
--- a/ext/libpqxx-7.7.3/src/transaction_base.cxx
+++ /dev/null
@@ -1,539 +0,0 @@
-/** Common code and definitions for the transaction classes.
- *
- * pqxx::transaction_base defines the interface for any abstract class that
- * represents a database transaction.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cstring>
-#include <stdexcept>
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/connection.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/internal/encodings.hxx"
-#include "pqxx/internal/gates/connection-transaction.hxx"
-#include "pqxx/internal/gates/transaction-transaction_focus.hxx"
-#include "pqxx/result.hxx"
-#include "pqxx/transaction_base.hxx"
-#include "pqxx/transaction_focus.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-using namespace std::literals;
-
-namespace
-{
-/// Return a query pointer for the command "ROLLBACK".
-/** Concentrates constructions so as to minimise the number of allocations.
- * This way, the string gets allocated once and then all subsequent invocations
- * copy shared_ptr instances to the same string.
- */
-std::shared_ptr<std::string> make_rollback_cmd()
-{
-  static auto const cmd{std::make_shared<std::string>("ROLLBACK")};
-  return cmd;
-}
-} // namespace
-
-pqxx::transaction_base::transaction_base(connection &c) :
-        m_conn{c}, m_rollback_cmd{make_rollback_cmd()}
-{}
-
-
-pqxx::transaction_base::transaction_base(
-  connection &c, std::string_view tname) :
-        m_conn{c}, m_name{tname}, m_rollback_cmd{make_rollback_cmd()}
-{}
-
-
-pqxx::transaction_base::~transaction_base()
-{
-  try
-  {
-    if (not std::empty(m_pending_error))
-      PQXX_UNLIKELY
-    process_notice(
-      internal::concat("UNPROCESSED ERROR: ", m_pending_error, "\n"));
-
-    if (m_registered)
-    {
-      m_conn.process_notice(
-        internal::concat(description(), " was never closed properly!\n"));
-      pqxx::internal::gate::connection_transaction{conn()}
-        .unregister_transaction(this);
-    }
-  }
-  catch (std::exception const &e)
-  {
-    try
-    {
-      process_notice(internal::concat(e.what(), "\n"));
-    }
-    catch (std::exception const &)
-    {
-      process_notice(e.what());
-    }
-  }
-}
-
-
-void pqxx::transaction_base::register_transaction()
-{
-  pqxx::internal::gate::connection_transaction{conn()}.register_transaction(
-    this);
-  m_registered = true;
-}
-
-
-void pqxx::transaction_base::commit()
-{
-  check_pending_error();
-
-  // Check previous status code.  Caller should only call this function if
-  // we're in "implicit" state, but multiple commits are silently accepted.
-  switch (m_status)
-  {
-  case status::active: // Just fine.  This is what we expect.
-    break;
-
-  case status::aborted:
-    throw usage_error{internal::concat(
-      "Attempt to commit previously aborted ", description())};
-
-  case status::committed:
-    // Transaction has been committed already.  This is not exactly proper
-    // behaviour, but throwing an exception here would only give the impression
-    // that an abort is needed--which would only confuse things further at this
-    // stage.
-    // Therefore, multiple commits are accepted, though under protest.
-    m_conn.process_notice(
-      internal::concat(description(), " committed more than once.\n"));
-    return;
-
-  case status::in_doubt:
-    // Transaction may or may not have been committed.  The only thing we can
-    // really do is keep telling the caller that the transaction is in doubt.
-    throw in_doubt_error{internal::concat(
-      description(), " committed again while in an indeterminate state.")};
-
-  default: throw internal_error{"pqxx::transaction: invalid status code."};
-  }
-
-  // Tricky one.  If stream is nested in transaction but inside the same scope,
-  // the commit() will come before the stream is closed.  Which means the
-  // commit is premature.  Punish this swiftly and without fail to discourage
-  // the habit from forming.
-  if (m_focus != nullptr)
-    throw failure{internal::concat(
-      "Attempt to commit ", description(), " with ", m_focus->description(),
-      " still open.")};
-
-  // Check that we're still connected (as far as we know--this is not an
-  // absolute thing!) before trying to commit.  If the connection was broken
-  // already, the commit would fail anyway but this way at least we don't
-  // remain in-doubt as to whether the backend got the commit order at all.
-  if (not m_conn.is_open())
-    throw broken_connection{
-      "Broken connection to backend; cannot complete transaction."};
-
-  try
-  {
-    do_commit();
-    m_status = status::committed;
-  }
-  catch (in_doubt_error const &)
-  {
-    m_status = status::in_doubt;
-    throw;
-  }
-  catch (std::exception const &)
-  {
-    m_status = status::aborted;
-    throw;
-  }
-
-  close();
-}
-
-
-void pqxx::transaction_base::do_abort()
-{
-  if (m_rollback_cmd)
-    direct_exec(m_rollback_cmd);
-}
-
-
-void pqxx::transaction_base::abort()
-{
-  // Check previous status code.  Quietly accept multiple aborts to
-  // simplify emergency bailout code.
-  switch (m_status)
-  {
-  case status::active:
-    try
-    {
-      do_abort();
-    }
-    catch (std::exception const &e)
-    {
-      m_conn.process_notice(internal::concat(e.what(), "\n"));
-    }
-    break;
-
-  case status::aborted: return;
-
-  case status::committed:
-    throw usage_error{internal::concat(
-      "Attempt to abort previously committed ", description())};
-
-  case status::in_doubt:
-    // Aborting an in-doubt transaction is probably a reasonably sane response
-    // to an insane situation.  Log it, but do not fail.
-    m_conn.process_notice(internal::concat(
-      "Warning: ", description(),
-      " aborted after going into indeterminate state; "
-      "it may have been executed anyway.\n"));
-    return;
-
-  default: throw internal_error{"Invalid transaction status."};
-  }
-
-  m_status = status::aborted;
-  close();
-}
-
-
-std::string PQXX_COLD pqxx::transaction_base::quote_raw(zview bin) const
-{
-  return conn().quote(binary_cast(bin));
-}
-
-
-namespace
-{
-/// Guard command execution against clashes with pipelines and such.
-/** A transaction can have only one focus at a time.  Command execution is the
- * most basic example of a transaction focus.
- */
-class PQXX_PRIVATE command : pqxx::transaction_focus
-{
-public:
-  command(pqxx::transaction_base &tx, std::string_view oname) :
-          transaction_focus{tx, "command"sv, oname}
-  {
-    register_me();
-  }
-
-  ~command() { unregister_me(); }
-};
-} // namespace
-
-pqxx::result
-pqxx::transaction_base::exec(std::string_view query, std::string_view desc)
-{
-  check_pending_error();
-
-  command cmd{*this, desc};
-
-  switch (m_status)
-  {
-  case status::active: break;
-
-  case status::committed:
-  case status::aborted:
-  case status::in_doubt: {
-    std::string const n{
-      std::empty(desc) ? "" : internal::concat("'", desc, "' ")};
-
-    throw usage_error{internal::concat(
-      "Could not execute command ", n, ": transaction is already closed.")};
-  }
-
-  default: throw internal_error{"pqxx::transaction: invalid status code."};
-  }
-
-  return direct_exec(query, desc);
-}
-
-
-pqxx::result pqxx::transaction_base::exec_n(
-  result::size_type rows, zview query, std::string_view desc)
-{
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  result const r{exec(query, desc)};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  if (std::size(r) != rows)
-  {
-    std::string const N{
-      std::empty(desc) ? "" : internal::concat("'", desc, "'")};
-    throw unexpected_rows{internal::concat(
-      "Expected ", rows, " row(s) of data from query ", N, ", got ",
-      std::size(r), ".")};
-  }
-  return r;
-}
-
-
-void pqxx::transaction_base::check_rowcount_prepared(
-  zview statement, result::size_type expected_rows,
-  result::size_type actual_rows)
-{
-  if (actual_rows != expected_rows)
-    throw unexpected_rows{internal::concat(
-      "Expected ", expected_rows, " row(s) of data from prepared statement '",
-      statement, "', got ", actual_rows, ".")};
-}
-
-
-void pqxx::transaction_base::check_rowcount_params(
-  std::size_t expected_rows, std::size_t actual_rows)
-{
-  if (actual_rows != expected_rows)
-    throw unexpected_rows{internal::concat(
-      "Expected ", expected_rows,
-      " row(s) of data from parameterised query, got ", actual_rows, ".")};
-}
-
-
-pqxx::result pqxx::transaction_base::internal_exec_prepared(
-  zview statement, internal::c_params const &args)
-{
-  command cmd{*this, statement};
-  return pqxx::internal::gate::connection_transaction{conn()}.exec_prepared(
-    statement, args);
-}
-
-
-pqxx::result pqxx::transaction_base::internal_exec_params(
-  zview query, internal::c_params const &args)
-{
-  command cmd{*this, query};
-  return pqxx::internal::gate::connection_transaction{conn()}.exec_params(
-    query, args);
-}
-
-
-void pqxx::transaction_base::set_variable(
-  std::string_view var, std::string_view value)
-{
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  conn().set_variable(var, value);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-std::string pqxx::transaction_base::get_variable(std::string_view var)
-{
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return conn().get_variable(var);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-void pqxx::transaction_base::close() noexcept
-{
-  try
-  {
-    try
-    {
-      check_pending_error();
-    }
-    catch (std::exception const &e)
-    {
-      m_conn.process_notice(e.what());
-    }
-
-    if (m_registered)
-    {
-      m_registered = false;
-      pqxx::internal::gate::connection_transaction{conn()}
-        .unregister_transaction(this);
-    }
-
-    if (m_status != status::active)
-      return;
-
-    if (m_focus != nullptr)
-      PQXX_UNLIKELY
-    m_conn.process_notice(internal::concat(
-      "Closing ", description(), "  with ", m_focus->description(),
-      " still open.\n"));
-
-    try
-    {
-      abort();
-    }
-    catch (std::exception const &e)
-    {
-      m_conn.process_notice(e.what());
-    }
-  }
-  catch (std::exception const &e)
-  {
-    try
-    {
-      m_conn.process_notice(e.what());
-    }
-    catch (std::exception const &)
-    {}
-  }
-}
-
-
-namespace
-{
-[[nodiscard]] std::string_view
-get_classname(pqxx::transaction_focus const *focus)
-{
-  return (focus == nullptr) ? ""sv : focus->classname();
-}
-
-
-[[nodiscard]] std::string_view
-get_obj_name(pqxx::transaction_focus const *focus)
-{
-  return (focus == nullptr) ? ""sv : focus->name();
-}
-} // namespace
-
-
-void pqxx::transaction_base::register_focus(transaction_focus *new_focus)
-{
-  internal::check_unique_register(
-    m_focus, get_classname(m_focus), get_obj_name(m_focus), new_focus,
-    get_classname(new_focus), get_obj_name(new_focus));
-  m_focus = new_focus;
-}
-
-
-void pqxx::transaction_base::unregister_focus(
-  transaction_focus *new_focus) noexcept
-{
-  try
-  {
-    pqxx::internal::check_unique_unregister(
-      m_focus, get_classname(m_focus), get_obj_name(m_focus), new_focus,
-      get_classname(new_focus), get_obj_name(new_focus));
-    m_focus = nullptr;
-  }
-  catch (std::exception const &e)
-  {
-    m_conn.process_notice(internal::concat(e.what(), "\n"));
-  }
-}
-
-
-pqxx::result pqxx::transaction_base::direct_exec(
-  std::string_view cmd, std::string_view desc)
-{
-  check_pending_error();
-  return pqxx::internal::gate::connection_transaction{conn()}.exec(cmd, desc);
-}
-
-
-pqxx::result pqxx::transaction_base::direct_exec(
-  std::shared_ptr<std::string> cmd, std::string_view desc)
-{
-  check_pending_error();
-  return pqxx::internal::gate::connection_transaction{conn()}.exec(cmd, desc);
-}
-
-
-void pqxx::transaction_base::register_pending_error(zview err) noexcept
-{
-  if (std::empty(m_pending_error) and not std::empty(err))
-  {
-    try
-    {
-      m_pending_error = err;
-    }
-    catch (std::exception const &e)
-    {
-      try
-      {
-        PQXX_UNLIKELY
-        process_notice("UNABLE TO PROCESS ERROR\n");
-        process_notice(e.what());
-        process_notice("ERROR WAS:");
-        process_notice(err);
-      }
-      catch (...)
-      {}
-    }
-  }
-}
-
-
-void pqxx::transaction_base::register_pending_error(std::string &&err) noexcept
-{
-  if (std::empty(m_pending_error) and not std::empty(err))
-  {
-    try
-    {
-      m_pending_error = std::move(err);
-    }
-    catch (std::exception const &e)
-    {
-      try
-      {
-        PQXX_UNLIKELY
-        process_notice("UNABLE TO PROCESS ERROR\n");
-        process_notice(e.what());
-        process_notice("ERROR WAS:");
-        process_notice(err);
-      }
-      catch (...)
-      {}
-    }
-  }
-}
-
-
-void pqxx::transaction_base::check_pending_error()
-{
-  if (not std::empty(m_pending_error))
-  {
-    std::string err;
-    err.swap(m_pending_error);
-    throw failure{err};
-  }
-}
-
-
-std::string pqxx::transaction_base::description() const
-{
-  return internal::describe_object("transaction", name());
-}
-
-
-void pqxx::transaction_focus::register_me()
-{
-  pqxx::internal::gate::transaction_transaction_focus{m_trans}.register_focus(
-    this);
-  m_registered = true;
-}
-
-
-void pqxx::transaction_focus::unregister_me() noexcept
-{
-  pqxx::internal::gate::transaction_transaction_focus{m_trans}
-    .unregister_focus(this);
-  m_registered = false;
-}
-
-
-void pqxx::transaction_focus::reg_pending_error(
-  std::string const &err) noexcept
-{
-  pqxx::internal::gate::transaction_transaction_focus{m_trans}
-    .register_pending_error(err);
-}
diff --git a/ext/libpqxx-7.7.3/src/util.cxx b/ext/libpqxx-7.7.3/src/util.cxx
deleted file mode 100644
index fe859bd2a..000000000
--- a/ext/libpqxx-7.7.3/src/util.cxx
+++ /dev/null
@@ -1,194 +0,0 @@
-/** Various utility functions.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include <cerrno>
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
-#include <new>
-
-extern "C"
-{
-#include <libpq-fe.h>
-}
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/except.hxx"
-#include "pqxx/internal/concat.hxx"
-#include "pqxx/util.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-using namespace std::literals;
-
-pqxx::thread_safety_model PQXX_COLD pqxx::describe_thread_safety()
-{
-  thread_safety_model model;
-  model.safe_libpq = (PQisthreadsafe() != 0);
-  // Sadly I'm not aware of any way to avoid this just yet.
-  model.safe_kerberos = false;
-
-  model.description = internal::concat(
-    (model.safe_libpq ? ""sv :
-                        "Using a libpq build that is not thread-safe.\n"sv),
-    (model.safe_kerberos ?
-       ""sv :
-       "Kerberos is not thread-safe.  If your application uses Kerberos, "
-       "protect all calls to Kerberos or libpqxx using a global lock.\n"sv));
-  return model;
-}
-
-
-std::string pqxx::internal::describe_object(
-  std::string_view class_name, std::string_view obj_name)
-{
-  if (std::empty(obj_name))
-    return std::string{class_name};
-  else
-    return pqxx::internal::concat(class_name, " '", obj_name, "'");
-}
-
-
-void pqxx::internal::check_unique_register(
-  void const *old_guest, std::string_view old_class, std::string_view old_name,
-  void const *new_guest, std::string_view new_class, std::string_view new_name)
-{
-  if (new_guest == nullptr)
-    throw internal_error{"Null pointer registered."};
-
-  if (old_guest != nullptr)
-    throw usage_error{
-      (old_guest == new_guest) ?
-        concat("Started twice: ", describe_object(old_class, old_name), ".") :
-        concat(
-          "Started new ", describe_object(new_class, new_name), " while ",
-          describe_object(new_class, new_name), " was still active.")};
-}
-
-
-void pqxx::internal::check_unique_unregister(
-  void const *old_guest, std::string_view old_class, std::string_view old_name,
-  void const *new_guest, std::string_view new_class, std::string_view new_name)
-{
-  if (new_guest != old_guest)
-  {
-    PQXX_UNLIKELY
-    if (new_guest == nullptr)
-      throw usage_error{concat(
-        "Expected to close ", describe_object(old_class, old_name),
-        ", but got null pointer instead.")};
-    if (old_guest == nullptr)
-      throw usage_error{concat(
-        "Closed while not open: ", describe_object(new_class, new_name))};
-    else
-      throw usage_error{concat(
-        "Closed ", describe_object(new_class, new_name),
-        "; expected to close ", describe_object(old_class, old_name))};
-  }
-}
-
-
-namespace
-{
-constexpr char hex_digits[] = {'0', '1', '2', '3', '4', '5', '6', '7',
-                               '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
-
-/// Translate a number (must be between 0 and 16 exclusive) to a hex digit.
-constexpr char hex_digit(int c) noexcept
-{
-  return hex_digits[c];
-}
-
-
-/// Translate a hex digit to a nibble.  Return -1 if it's not a valid digit.
-constexpr int nibble(int c) noexcept
-{
-  if (c >= '0' and c <= '9')
-    PQXX_LIKELY
-  return c - '0';
-  else if (c >= 'a' and c <= 'f') return 10 + (c - 'a');
-  else if (c >= 'A' and c <= 'F') return 10 + (c - 'A');
-  else return -1;
-}
-} // namespace
-
-
-void pqxx::internal::esc_bin(
-  std::basic_string_view<std::byte> binary_data, char buffer[]) noexcept
-{
-  auto here{buffer};
-  *here++ = '\\';
-  *here++ = 'x';
-
-  for (auto const byte : binary_data)
-  {
-    auto uc{static_cast<unsigned char>(byte)};
-    *here++ = hex_digit(uc >> 4);
-    *here++ = hex_digit(uc & 0x0f);
-  }
-
-  // (No need to increment further.  Facebook's "infer" complains if we do.)
-  *here = '\0';
-}
-
-
-std::string
-pqxx::internal::esc_bin(std::basic_string_view<std::byte> binary_data)
-{
-  auto const bytes{size_esc_bin(std::size(binary_data))};
-  std::string buf;
-  buf.resize(bytes);
-  esc_bin(binary_data, buf.data());
-  // Strip off the trailing zero.
-  buf.resize(bytes - 1);
-  return buf;
-}
-
-
-void pqxx::internal::unesc_bin(
-  std::string_view escaped_data, std::byte buffer[])
-{
-  auto const in_size{std::size(escaped_data)};
-  if (in_size < 2)
-    throw pqxx::failure{"Binary data appears truncated."};
-  if ((in_size % 2) != 0)
-    throw pqxx::failure{"Invalid escaped binary length."};
-  char const *in{escaped_data.data()};
-  char const *const end{in + in_size};
-  if (*in++ != '\\' or *in++ != 'x')
-    throw pqxx::failure(
-      "Escaped binary data did not start with '\\x'`.  Is the server or libpq "
-      "too old?");
-  auto out{buffer};
-  while (in != end)
-  {
-    int hi{nibble(*in++)};
-    if (hi < 0)
-      throw pqxx::failure{"Invalid hex-escaped data."};
-    int lo{nibble(*in++)};
-    if (lo < 0)
-      throw pqxx::failure{"Invalid hex-escaped data."};
-    *out++ = static_cast<std::byte>((hi << 4) | lo);
-  }
-}
-
-
-std::basic_string<std::byte>
-pqxx::internal::unesc_bin(std::string_view escaped_data)
-{
-  auto const bytes{size_unesc_bin(std::size(escaped_data))};
-  std::basic_string<std::byte> buf;
-  buf.resize(bytes);
-  unesc_bin(escaped_data, buf.data());
-  return buf;
-}
diff --git a/ext/libpqxx-7.7.3/src/version.cxx b/ext/libpqxx-7.7.3/src/version.cxx
deleted file mode 100644
index e216ecd4f..000000000
--- a/ext/libpqxx-7.7.3/src/version.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/** Version check.
- *
- * Copyright (c) 2000-2022, Jeroen T. Vermeulen.
- *
- * See COPYING for copyright license.  If you did not receive a file called
- * COPYING with this source code, please notify the distributor of this
- * mistake, or contact the author.
- */
-#include "pqxx-source.hxx"
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/version.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace pqxx::internal
-{
-// One, single definition of this function.  If a call fails to link, and
-// (some) other calls do link, then the libpqxx binary was built against a
-// different libpqxx version than the code which is being linked against it.
-PQXX_LIBEXPORT int PQXX_VERSION_CHECK() noexcept
-{
-  return 0;
-}
-} // namespace pqxx::internal
diff --git a/ext/libpqxx-7.7.3/src/wait.cxx b/ext/libpqxx-7.7.3/src/wait.cxx
deleted file mode 100644
index 276d9659e..000000000
--- a/ext/libpqxx-7.7.3/src/wait.cxx
+++ /dev/null
@@ -1,136 +0,0 @@
-/** Functions that wait.
- */
-#include "pqxx-source.hxx"
-
-// The <thread> header is still broken on MinGW.  :-(
-#if defined(PQXX_HAVE_SLEEP_FOR)
-#  include <thread>
-#endif
-
-// For WSAPoll():
-#if __has_include(<winsock2.h>)
-#  include <winsock2.h>
-#  define PQXX_HAVE_SELECT
-#endif
-#if __has_include(<ws2tcpip.h>)
-#  include <ws2tcpip.h>
-#endif
-#if __has_include(<mstcpip.h>)
-#  include <mstcpip.h>
-#endif
-
-// For poll():
-#if __has_include(<poll.h>)
-#  include <poll.h>
-#endif
-
-// For select() on recent POSIX systems.
-#if __has_include(<sys/select.h>)
-#  include <sys/select.h>
-#  define PQXX_HAVE_SELECT
-#endif
-
-// For select() on some older POSIX systems.
-#if __has_include(<sys/types.h>)
-#  include <sys/types.h>
-#  define PQXX_HAVE_SELECT
-#endif
-#if __has_include(<unistd.h>)
-#  include <unistd.h>
-#endif
-#if __has_include(<sys/time.h>)
-#  include <sys/time.h>
-#endif
-
-
-#include "pqxx/internal/header-pre.hxx"
-
-#include "pqxx/internal/wait.hxx"
-#include "pqxx/util.hxx"
-
-#include "pqxx/internal/header-post.hxx"
-
-
-namespace
-{
-template<typename T> T to_milli(unsigned seconds, unsigned microseconds)
-{
-  return pqxx::check_cast<T>(
-    (seconds * 1000) + (microseconds / 1000),
-    "Wait timeout value out of bounds.");
-}
-
-
-#if defined(PQXX_HAVE_SELECT)
-/// Set a bit on an fd_set.
-[[maybe_unused]] void set_fdbit(fd_set &bits, int fd)
-{
-#  ifdef _MSC_VER
-// Suppress pointless, unfixable warnings in Visual Studio.
-#    pragma warning(push)
-#    pragma warning(disable : 4389) // Signed/unsigned mismatch.
-#    pragma warning(disable : 4127) // Conditional expression is constant.
-#  endif
-  FD_SET(fd, &bits);
-#  ifdef _MSV_VER
-// Restore prevalent warning settings.
-#    pragma warning(pop)
-#  endif
-}
-#endif
-} // namespace
-
-
-void pqxx::internal::wait_fd(
-  int fd, bool for_read, bool for_write, unsigned seconds,
-  unsigned microseconds)
-{
-// WSAPoll is available in winsock2.h only for versions of Windows >= 0x0600
-#if defined(_WIN32) && (_WIN32_WINNT >= 0x0600)
-  short const events{static_cast<short>(
-    (for_read ? POLLRDNORM : 0) | (for_write ? POLLWRNORM : 0))};
-  WSAPOLLFD fdarray{SOCKET(fd), events, 0};
-  WSAPoll(&fdarray, 1u, to_milli<unsigned>(seconds, microseconds));
-  // TODO: Check for errors.
-#elif defined(PQXX_HAVE_POLL)
-  auto const events{static_cast<short>(
-    POLLERR | POLLHUP | POLLNVAL | (for_read ? POLLIN : 0) |
-    (for_write ? POLLOUT : 0))};
-  pollfd pfd{fd, events, 0};
-  poll(&pfd, 1, to_milli<int>(seconds, microseconds));
-  // TODO: Check for errors.
-#else
-  // No poll()?  Our last option is select().
-  fd_set read_fds;
-  FD_ZERO(&read_fds);
-  if (for_read)
-    set_fdbit(read_fds, fd);
-
-  fd_set write_fds;
-  FD_ZERO(&write_fds);
-  if (for_write)
-    set_fdbit(write_fds, fd);
-
-  fd_set except_fds;
-  FD_ZERO(&except_fds);
-  set_fdbit(except_fds, fd);
-
-  timeval tv = {seconds, microseconds};
-  select(fd + 1, &read_fds, &write_fds, &except_fds, &tv);
-  // TODO: Check for errors.
-#endif
-}
-
-
-void PQXX_COLD pqxx::internal::wait_for(unsigned int microseconds)
-{
-#if defined(PQXX_HAVE_SLEEP_FOR)
-  std::this_thread::sleep_for(std::chrono::microseconds{microseconds});
-#else
-  // MinGW still does not have a functioning <thread> header.  Work around this
-  // using select().
-  // Not worth optimising for though -- they'll have to fix it at some point.
-  timeval tv{microseconds / 1'000'000u, microseconds % 1'000'000u};
-  select(0, nullptr, nullptr, nullptr, &tv);
-#endif
-}
diff --git a/ext/libpqxx-7.7.3/test/CMakeLists.txt b/ext/libpqxx-7.7.3/test/CMakeLists.txt
deleted file mode 100644
index 331631145..000000000
--- a/ext/libpqxx-7.7.3/test/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-enable_testing()
-
-if(NOT PostgreSQL_FOUND)
-    find_package(PostgreSQL REQUIRED)
-endif()
-
-file(GLOB TEST_SOURCES test*.cxx unit/test_*.cxx runner.cxx)
-
-add_executable(runner ${TEST_SOURCES})
-target_link_libraries(runner PUBLIC pqxx)
-target_include_directories(runner PRIVATE ${PostgreSQL_INCLUDE_DIRS})
-add_test(
-    NAME runner
-    WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-    COMMAND runner
-)
-
-if(INSTALL_TEST)
-    install(
-        PROGRAMS runner
-        TYPE BIN
-        RENAME libpqxx-test-runner
-    )
-endif()
diff --git a/ext/libpqxx-7.7.3/test/Makefile.am b/ext/libpqxx-7.7.3/test/Makefile.am
deleted file mode 100644
index e3ce4be7b..000000000
--- a/ext/libpqxx-7.7.3/test/Makefile.am
+++ /dev/null
@@ -1,129 +0,0 @@
-# ##############################################################################
-# AUTOMATICALLY GENERATED FILE -- DO NOT EDIT.
-#
-# This file is generated automatically by libpqxx's template2mak.py script, and
-# will be rewritten from time to time.
-#
-# If you modify this file, chances are your modifications will be lost.
-#
-# The template2mak.py script should be available in the tools directory of the
-# libpqxx source archive.
-#
-# Generated from template './test/Makefile.am.template'.
-# ##############################################################################
-# Makefile.am is generated automatically for automake whenever test programs are
-# added to libpqxx.
-
-EXTRA_DIST = Makefile.am.template
-
-# Use the serial test runner, so tests don't get run in parallel.  Otherwise,
-# output from test failures will be hidden away in log files where we can't
-# see them when running in a build slave.
-AUTOMAKE_OPTIONS=serial-tests
-
-
-AM_CPPFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include
-
-# Override automatically generated list of default includes.  It contains only
-# unnecessary entries, and incorrectly mentions include/pqxx directly.
-DEFAULT_INCLUDES=
-
-noinst_HEADERS = test_helpers.hxx
-
-CLEANFILES=pqxxlo.txt
-MAINTAINERCLEANFILES=Makefile.in
-
-#TESTS_ENVIRONMENT=PGDATABASE=libpqxx
-# PGDATABASE, PGHOST, PGPORT, PGUSER
-
-runner_SOURCES = \
-  test00.cxx \
-  test01.cxx \
-  test02.cxx \
-  test04.cxx \
-  test07.cxx \
-  test10.cxx \
-  test11.cxx \
-  test13.cxx \
-  test14.cxx \
-  test16.cxx \
-  test17.cxx \
-  test18.cxx \
-  test20.cxx \
-  test21.cxx \
-  test26.cxx \
-  test29.cxx \
-  test30.cxx \
-  test32.cxx \
-  test37.cxx \
-  test39.cxx \
-  test46.cxx \
-  test56.cxx \
-  test60.cxx \
-  test61.cxx \
-  test62.cxx \
-  test69.cxx \
-  test70.cxx \
-  test71.cxx \
-  test72.cxx \
-  test74.cxx \
-  test75.cxx \
-  test76.cxx \
-  test77.cxx \
-  test78.cxx \
-  test79.cxx \
-  test82.cxx \
-  test84.cxx \
-  test87.cxx \
-  test88.cxx \
-  test89.cxx \
-  test90.cxx \
-  unit/test_array.cxx \
-  unit/test_binarystring.cxx \
-  unit/test_blob.cxx \
-  unit/test_cancel_query.cxx \
-  unit/test_column.cxx \
-  unit/test_composite.cxx \
-  unit/test_connection.cxx \
-  unit/test_cursor.cxx \
-  unit/test_encodings.cxx \
-  unit/test_error_verbosity.cxx \
-  unit/test_errorhandler.cxx \
-  unit/test_escape.cxx \
-  unit/test_exceptions.cxx \
-  unit/test_field.cxx \
-  unit/test_float.cxx \
-  unit/test_largeobject.cxx \
-  unit/test_nonblocking_connect.cxx \
-  unit/test_notification.cxx \
-  unit/test_pipeline.cxx \
-  unit/test_prepared_statement.cxx \
-  unit/test_range.cxx \
-  unit/test_read_transaction.cxx \
-  unit/test_result_iteration.cxx \
-  unit/test_result_slicing.cxx \
-  unit/test_row.cxx \
-  unit/test_separated_list.cxx \
-  unit/test_simultaneous_transactions.cxx \
-  unit/test_sql_cursor.cxx \
-  unit/test_stateless_cursor.cxx \
-  unit/test_strconv.cxx \
-  unit/test_stream_from.cxx \
-  unit/test_stream_to.cxx \
-  unit/test_string_conversion.cxx \
-  unit/test_subtransaction.cxx \
-  unit/test_test_helpers.cxx \
-  unit/test_thread_safety_model.cxx \
-  unit/test_time.cxx \
-  unit/test_transaction.cxx \
-  unit/test_transaction_base.cxx \
-  unit/test_transaction_focus.cxx \
-  unit/test_transactor.cxx \
-  unit/test_type_name.cxx \
-  unit/test_zview.cxx \
-  runner.cxx
-
-runner_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB}
-
-TESTS = runner
-check_PROGRAMS = ${TESTS}
diff --git a/ext/libpqxx-7.7.3/test/Makefile.am.template b/ext/libpqxx-7.7.3/test/Makefile.am.template
deleted file mode 100644
index 2a21f6ef7..000000000
--- a/ext/libpqxx-7.7.3/test/Makefile.am.template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Makefile.am is generated automatically for automake whenever test programs are
-# added to libpqxx.
-
-EXTRA_DIST = Makefile.am.template
-
-# Use the serial test runner, so tests don't get run in parallel.  Otherwise,
-# output from test failures will be hidden away in log files where we can't
-# see them when running in a build slave.
-AUTOMAKE_OPTIONS=serial-tests
-
-
-AM_CPPFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include
-
-# Override automatically generated list of default includes.  It contains only
-# unnecessary entries, and incorrectly mentions include/pqxx directly.
-DEFAULT_INCLUDES=
-
-noinst_HEADERS = test_helpers.hxx
-
-CLEANFILES=pqxxlo.txt
-MAINTAINERCLEANFILES=Makefile.in
-
-#TESTS_ENVIRONMENT=PGDATABASE=libpqxx
-# PGDATABASE, PGHOST, PGPORT, PGUSER
-
-runner_SOURCES = \
-###MAKTEMPLATE:FOREACH test/test*.cxx
-  ###BASENAME###.cxx \
-###MAKTEMPLATE:ENDFOREACH
-###MAKTEMPLATE:FOREACH test/unit/test_*.cxx
-  unit/###BASENAME###.cxx \
-###MAKTEMPLATE:ENDFOREACH
-  runner.cxx
-
-runner_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB}
-
-TESTS = runner
-check_PROGRAMS = ${TESTS}
diff --git a/ext/libpqxx-7.7.3/test/Makefile.in b/ext/libpqxx-7.7.3/test/Makefile.in
deleted file mode 100644
index 8ffcca06c..000000000
--- a/ext/libpqxx-7.7.3/test/Makefile.in
+++ /dev/null
@@ -1,1302 +0,0 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# ##############################################################################
-# AUTOMATICALLY GENERATED FILE -- DO NOT EDIT.
-#
-# This file is generated automatically by libpqxx's template2mak.py script, and
-# will be rewritten from time to time.
-#
-# If you modify this file, chances are your modifications will be lost.
-#
-# The template2mak.py script should be available in the tools directory of the
-# libpqxx source archive.
-#
-# Generated from template './test/Makefile.am.template'.
-# ##############################################################################
-# Makefile.am is generated automatically for automake whenever test programs are
-# added to libpqxx.
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-TESTS = runner$(EXEEXT)
-check_PROGRAMS = $(am__EXEEXT_1)
-subdir = test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4/libtool.m4 \
-	$(top_srcdir)/config/m4/ltoptions.m4 \
-	$(top_srcdir)/config/m4/ltsugar.m4 \
-	$(top_srcdir)/config/m4/ltversion.m4 \
-	$(top_srcdir)/config/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
-	$(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/pqxx/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = runner$(EXEEXT)
-am__dirstamp = $(am__leading_dot)dirstamp
-am_runner_OBJECTS = test00.$(OBJEXT) test01.$(OBJEXT) test02.$(OBJEXT) \
-	test04.$(OBJEXT) test07.$(OBJEXT) test10.$(OBJEXT) \
-	test11.$(OBJEXT) test13.$(OBJEXT) test14.$(OBJEXT) \
-	test16.$(OBJEXT) test17.$(OBJEXT) test18.$(OBJEXT) \
-	test20.$(OBJEXT) test21.$(OBJEXT) test26.$(OBJEXT) \
-	test29.$(OBJEXT) test30.$(OBJEXT) test32.$(OBJEXT) \
-	test37.$(OBJEXT) test39.$(OBJEXT) test46.$(OBJEXT) \
-	test56.$(OBJEXT) test60.$(OBJEXT) test61.$(OBJEXT) \
-	test62.$(OBJEXT) test69.$(OBJEXT) test70.$(OBJEXT) \
-	test71.$(OBJEXT) test72.$(OBJEXT) test74.$(OBJEXT) \
-	test75.$(OBJEXT) test76.$(OBJEXT) test77.$(OBJEXT) \
-	test78.$(OBJEXT) test79.$(OBJEXT) test82.$(OBJEXT) \
-	test84.$(OBJEXT) test87.$(OBJEXT) test88.$(OBJEXT) \
-	test89.$(OBJEXT) test90.$(OBJEXT) unit/test_array.$(OBJEXT) \
-	unit/test_binarystring.$(OBJEXT) unit/test_blob.$(OBJEXT) \
-	unit/test_cancel_query.$(OBJEXT) unit/test_column.$(OBJEXT) \
-	unit/test_composite.$(OBJEXT) unit/test_connection.$(OBJEXT) \
-	unit/test_cursor.$(OBJEXT) unit/test_encodings.$(OBJEXT) \
-	unit/test_error_verbosity.$(OBJEXT) \
-	unit/test_errorhandler.$(OBJEXT) unit/test_escape.$(OBJEXT) \
-	unit/test_exceptions.$(OBJEXT) unit/test_field.$(OBJEXT) \
-	unit/test_float.$(OBJEXT) unit/test_largeobject.$(OBJEXT) \
-	unit/test_nonblocking_connect.$(OBJEXT) \
-	unit/test_notification.$(OBJEXT) unit/test_pipeline.$(OBJEXT) \
-	unit/test_prepared_statement.$(OBJEXT) \
-	unit/test_range.$(OBJEXT) unit/test_read_transaction.$(OBJEXT) \
-	unit/test_result_iteration.$(OBJEXT) \
-	unit/test_result_slicing.$(OBJEXT) unit/test_row.$(OBJEXT) \
-	unit/test_separated_list.$(OBJEXT) \
-	unit/test_simultaneous_transactions.$(OBJEXT) \
-	unit/test_sql_cursor.$(OBJEXT) \
-	unit/test_stateless_cursor.$(OBJEXT) \
-	unit/test_strconv.$(OBJEXT) unit/test_stream_from.$(OBJEXT) \
-	unit/test_stream_to.$(OBJEXT) \
-	unit/test_string_conversion.$(OBJEXT) \
-	unit/test_subtransaction.$(OBJEXT) \
-	unit/test_test_helpers.$(OBJEXT) \
-	unit/test_thread_safety_model.$(OBJEXT) \
-	unit/test_time.$(OBJEXT) unit/test_transaction.$(OBJEXT) \
-	unit/test_transaction_base.$(OBJEXT) \
-	unit/test_transaction_focus.$(OBJEXT) \
-	unit/test_transactor.$(OBJEXT) unit/test_type_name.$(OBJEXT) \
-	unit/test_zview.$(OBJEXT) runner.$(OBJEXT)
-runner_OBJECTS = $(am_runner_OBJECTS)
-runner_DEPENDENCIES = $(top_builddir)/src/libpqxx.la
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/runner.Po ./$(DEPDIR)/test00.Po \
-	./$(DEPDIR)/test01.Po ./$(DEPDIR)/test02.Po \
-	./$(DEPDIR)/test04.Po ./$(DEPDIR)/test07.Po \
-	./$(DEPDIR)/test10.Po ./$(DEPDIR)/test11.Po \
-	./$(DEPDIR)/test13.Po ./$(DEPDIR)/test14.Po \
-	./$(DEPDIR)/test16.Po ./$(DEPDIR)/test17.Po \
-	./$(DEPDIR)/test18.Po ./$(DEPDIR)/test20.Po \
-	./$(DEPDIR)/test21.Po ./$(DEPDIR)/test26.Po \
-	./$(DEPDIR)/test29.Po ./$(DEPDIR)/test30.Po \
-	./$(DEPDIR)/test32.Po ./$(DEPDIR)/test37.Po \
-	./$(DEPDIR)/test39.Po ./$(DEPDIR)/test46.Po \
-	./$(DEPDIR)/test56.Po ./$(DEPDIR)/test60.Po \
-	./$(DEPDIR)/test61.Po ./$(DEPDIR)/test62.Po \
-	./$(DEPDIR)/test69.Po ./$(DEPDIR)/test70.Po \
-	./$(DEPDIR)/test71.Po ./$(DEPDIR)/test72.Po \
-	./$(DEPDIR)/test74.Po ./$(DEPDIR)/test75.Po \
-	./$(DEPDIR)/test76.Po ./$(DEPDIR)/test77.Po \
-	./$(DEPDIR)/test78.Po ./$(DEPDIR)/test79.Po \
-	./$(DEPDIR)/test82.Po ./$(DEPDIR)/test84.Po \
-	./$(DEPDIR)/test87.Po ./$(DEPDIR)/test88.Po \
-	./$(DEPDIR)/test89.Po ./$(DEPDIR)/test90.Po \
-	unit/$(DEPDIR)/test_array.Po \
-	unit/$(DEPDIR)/test_binarystring.Po \
-	unit/$(DEPDIR)/test_blob.Po \
-	unit/$(DEPDIR)/test_cancel_query.Po \
-	unit/$(DEPDIR)/test_column.Po unit/$(DEPDIR)/test_composite.Po \
-	unit/$(DEPDIR)/test_connection.Po \
-	unit/$(DEPDIR)/test_cursor.Po unit/$(DEPDIR)/test_encodings.Po \
-	unit/$(DEPDIR)/test_error_verbosity.Po \
-	unit/$(DEPDIR)/test_errorhandler.Po \
-	unit/$(DEPDIR)/test_escape.Po \
-	unit/$(DEPDIR)/test_exceptions.Po unit/$(DEPDIR)/test_field.Po \
-	unit/$(DEPDIR)/test_float.Po \
-	unit/$(DEPDIR)/test_largeobject.Po \
-	unit/$(DEPDIR)/test_nonblocking_connect.Po \
-	unit/$(DEPDIR)/test_notification.Po \
-	unit/$(DEPDIR)/test_pipeline.Po \
-	unit/$(DEPDIR)/test_prepared_statement.Po \
-	unit/$(DEPDIR)/test_range.Po \
-	unit/$(DEPDIR)/test_read_transaction.Po \
-	unit/$(DEPDIR)/test_result_iteration.Po \
-	unit/$(DEPDIR)/test_result_slicing.Po \
-	unit/$(DEPDIR)/test_row.Po \
-	unit/$(DEPDIR)/test_separated_list.Po \
-	unit/$(DEPDIR)/test_simultaneous_transactions.Po \
-	unit/$(DEPDIR)/test_sql_cursor.Po \
-	unit/$(DEPDIR)/test_stateless_cursor.Po \
-	unit/$(DEPDIR)/test_strconv.Po \
-	unit/$(DEPDIR)/test_stream_from.Po \
-	unit/$(DEPDIR)/test_stream_to.Po \
-	unit/$(DEPDIR)/test_string_conversion.Po \
-	unit/$(DEPDIR)/test_subtransaction.Po \
-	unit/$(DEPDIR)/test_test_helpers.Po \
-	unit/$(DEPDIR)/test_thread_safety_model.Po \
-	unit/$(DEPDIR)/test_time.Po unit/$(DEPDIR)/test_transaction.Po \
-	unit/$(DEPDIR)/test_transaction_base.Po \
-	unit/$(DEPDIR)/test_transaction_focus.Po \
-	unit/$(DEPDIR)/test_transactor.Po \
-	unit/$(DEPDIR)/test_type_name.Po unit/$(DEPDIR)/test_zview.Po
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(runner_SOURCES)
-DIST_SOURCES = $(runner_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-HEADERS = $(noinst_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
-}
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \
-	$(top_srcdir)/config/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-PKG_CONFIG = @PKG_CONFIG@
-POSTGRES_INCLUDE = @POSTGRES_INCLUDE@
-PQXXVERSION = @PQXXVERSION@
-PQXX_ABI = @PQXX_ABI@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_postgres_lib = @with_postgres_lib@
-EXTRA_DIST = Makefile.am.template
-
-# Use the serial test runner, so tests don't get run in parallel.  Otherwise,
-# output from test failures will be hidden away in log files where we can't
-# see them when running in a build slave.
-AUTOMAKE_OPTIONS = serial-tests
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-
-# Override automatically generated list of default includes.  It contains only
-# unnecessary entries, and incorrectly mentions include/pqxx directly.
-DEFAULT_INCLUDES = 
-noinst_HEADERS = test_helpers.hxx
-CLEANFILES = pqxxlo.txt
-MAINTAINERCLEANFILES = Makefile.in
-
-#TESTS_ENVIRONMENT=PGDATABASE=libpqxx
-# PGDATABASE, PGHOST, PGPORT, PGUSER
-runner_SOURCES = \
-  test00.cxx \
-  test01.cxx \
-  test02.cxx \
-  test04.cxx \
-  test07.cxx \
-  test10.cxx \
-  test11.cxx \
-  test13.cxx \
-  test14.cxx \
-  test16.cxx \
-  test17.cxx \
-  test18.cxx \
-  test20.cxx \
-  test21.cxx \
-  test26.cxx \
-  test29.cxx \
-  test30.cxx \
-  test32.cxx \
-  test37.cxx \
-  test39.cxx \
-  test46.cxx \
-  test56.cxx \
-  test60.cxx \
-  test61.cxx \
-  test62.cxx \
-  test69.cxx \
-  test70.cxx \
-  test71.cxx \
-  test72.cxx \
-  test74.cxx \
-  test75.cxx \
-  test76.cxx \
-  test77.cxx \
-  test78.cxx \
-  test79.cxx \
-  test82.cxx \
-  test84.cxx \
-  test87.cxx \
-  test88.cxx \
-  test89.cxx \
-  test90.cxx \
-  unit/test_array.cxx \
-  unit/test_binarystring.cxx \
-  unit/test_blob.cxx \
-  unit/test_cancel_query.cxx \
-  unit/test_column.cxx \
-  unit/test_composite.cxx \
-  unit/test_connection.cxx \
-  unit/test_cursor.cxx \
-  unit/test_encodings.cxx \
-  unit/test_error_verbosity.cxx \
-  unit/test_errorhandler.cxx \
-  unit/test_escape.cxx \
-  unit/test_exceptions.cxx \
-  unit/test_field.cxx \
-  unit/test_float.cxx \
-  unit/test_largeobject.cxx \
-  unit/test_nonblocking_connect.cxx \
-  unit/test_notification.cxx \
-  unit/test_pipeline.cxx \
-  unit/test_prepared_statement.cxx \
-  unit/test_range.cxx \
-  unit/test_read_transaction.cxx \
-  unit/test_result_iteration.cxx \
-  unit/test_result_slicing.cxx \
-  unit/test_row.cxx \
-  unit/test_separated_list.cxx \
-  unit/test_simultaneous_transactions.cxx \
-  unit/test_sql_cursor.cxx \
-  unit/test_stateless_cursor.cxx \
-  unit/test_strconv.cxx \
-  unit/test_stream_from.cxx \
-  unit/test_stream_to.cxx \
-  unit/test_string_conversion.cxx \
-  unit/test_subtransaction.cxx \
-  unit/test_test_helpers.cxx \
-  unit/test_thread_safety_model.cxx \
-  unit/test_time.cxx \
-  unit/test_transaction.cxx \
-  unit/test_transaction_base.cxx \
-  unit/test_transaction_focus.cxx \
-  unit/test_transactor.cxx \
-  unit/test_type_name.cxx \
-  unit/test_zview.cxx \
-  runner.cxx
-
-runner_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB}
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cxx .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu test/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-unit/$(am__dirstamp):
-	@$(MKDIR_P) unit
-	@: > unit/$(am__dirstamp)
-unit/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) unit/$(DEPDIR)
-	@: > unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_array.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_binarystring.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_blob.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_cancel_query.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_column.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_composite.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_connection.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_cursor.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_encodings.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_error_verbosity.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_errorhandler.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_escape.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_exceptions.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_field.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_float.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_largeobject.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_nonblocking_connect.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_notification.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_pipeline.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_prepared_statement.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_range.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_read_transaction.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_result_iteration.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_result_slicing.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_row.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_separated_list.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_simultaneous_transactions.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_sql_cursor.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_stateless_cursor.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_strconv.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_stream_from.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_stream_to.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_string_conversion.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_subtransaction.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_test_helpers.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_thread_safety_model.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_time.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_transaction.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_transaction_base.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_transaction_focus.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_transactor.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_type_name.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-unit/test_zview.$(OBJEXT): unit/$(am__dirstamp) \
-	unit/$(DEPDIR)/$(am__dirstamp)
-
-runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES) $(EXTRA_runner_DEPENDENCIES) 
-	@rm -f runner$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(runner_OBJECTS) $(runner_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f unit/*.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runner.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test00.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test01.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test02.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test04.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test07.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test10.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test11.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test13.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test14.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test16.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test17.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test18.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test20.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test21.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test26.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test29.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test30.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test32.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test37.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test39.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test46.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test56.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test60.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test61.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test62.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test69.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test70.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test71.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test72.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test74.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test75.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test76.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test77.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test78.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test79.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test82.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test84.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test87.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test88.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test89.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test90.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_array.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_binarystring.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_blob.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_cancel_query.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_column.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_composite.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_connection.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_cursor.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_encodings.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_error_verbosity.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_errorhandler.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_escape.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_exceptions.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_field.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_float.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_largeobject.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_nonblocking_connect.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_notification.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_pipeline.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_prepared_statement.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_range.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_read_transaction.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_result_iteration.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_result_slicing.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_row.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_separated_list.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_simultaneous_transactions.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_sql_cursor.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_stateless_cursor.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_strconv.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_stream_from.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_stream_to.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_string_conversion.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_subtransaction.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_test_helpers.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_thread_safety_model.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_time.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_transaction.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_transaction_base.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_transaction_focus.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_transactor.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_type_name.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_zview.Po@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.cxx.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cxx.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cxx.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(HEADERS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f unit/$(DEPDIR)/$(am__dirstamp)
-	-rm -f unit/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-		-rm -f ./$(DEPDIR)/runner.Po
-	-rm -f ./$(DEPDIR)/test00.Po
-	-rm -f ./$(DEPDIR)/test01.Po
-	-rm -f ./$(DEPDIR)/test02.Po
-	-rm -f ./$(DEPDIR)/test04.Po
-	-rm -f ./$(DEPDIR)/test07.Po
-	-rm -f ./$(DEPDIR)/test10.Po
-	-rm -f ./$(DEPDIR)/test11.Po
-	-rm -f ./$(DEPDIR)/test13.Po
-	-rm -f ./$(DEPDIR)/test14.Po
-	-rm -f ./$(DEPDIR)/test16.Po
-	-rm -f ./$(DEPDIR)/test17.Po
-	-rm -f ./$(DEPDIR)/test18.Po
-	-rm -f ./$(DEPDIR)/test20.Po
-	-rm -f ./$(DEPDIR)/test21.Po
-	-rm -f ./$(DEPDIR)/test26.Po
-	-rm -f ./$(DEPDIR)/test29.Po
-	-rm -f ./$(DEPDIR)/test30.Po
-	-rm -f ./$(DEPDIR)/test32.Po
-	-rm -f ./$(DEPDIR)/test37.Po
-	-rm -f ./$(DEPDIR)/test39.Po
-	-rm -f ./$(DEPDIR)/test46.Po
-	-rm -f ./$(DEPDIR)/test56.Po
-	-rm -f ./$(DEPDIR)/test60.Po
-	-rm -f ./$(DEPDIR)/test61.Po
-	-rm -f ./$(DEPDIR)/test62.Po
-	-rm -f ./$(DEPDIR)/test69.Po
-	-rm -f ./$(DEPDIR)/test70.Po
-	-rm -f ./$(DEPDIR)/test71.Po
-	-rm -f ./$(DEPDIR)/test72.Po
-	-rm -f ./$(DEPDIR)/test74.Po
-	-rm -f ./$(DEPDIR)/test75.Po
-	-rm -f ./$(DEPDIR)/test76.Po
-	-rm -f ./$(DEPDIR)/test77.Po
-	-rm -f ./$(DEPDIR)/test78.Po
-	-rm -f ./$(DEPDIR)/test79.Po
-	-rm -f ./$(DEPDIR)/test82.Po
-	-rm -f ./$(DEPDIR)/test84.Po
-	-rm -f ./$(DEPDIR)/test87.Po
-	-rm -f ./$(DEPDIR)/test88.Po
-	-rm -f ./$(DEPDIR)/test89.Po
-	-rm -f ./$(DEPDIR)/test90.Po
-	-rm -f unit/$(DEPDIR)/test_array.Po
-	-rm -f unit/$(DEPDIR)/test_binarystring.Po
-	-rm -f unit/$(DEPDIR)/test_blob.Po
-	-rm -f unit/$(DEPDIR)/test_cancel_query.Po
-	-rm -f unit/$(DEPDIR)/test_column.Po
-	-rm -f unit/$(DEPDIR)/test_composite.Po
-	-rm -f unit/$(DEPDIR)/test_connection.Po
-	-rm -f unit/$(DEPDIR)/test_cursor.Po
-	-rm -f unit/$(DEPDIR)/test_encodings.Po
-	-rm -f unit/$(DEPDIR)/test_error_verbosity.Po
-	-rm -f unit/$(DEPDIR)/test_errorhandler.Po
-	-rm -f unit/$(DEPDIR)/test_escape.Po
-	-rm -f unit/$(DEPDIR)/test_exceptions.Po
-	-rm -f unit/$(DEPDIR)/test_field.Po
-	-rm -f unit/$(DEPDIR)/test_float.Po
-	-rm -f unit/$(DEPDIR)/test_largeobject.Po
-	-rm -f unit/$(DEPDIR)/test_nonblocking_connect.Po
-	-rm -f unit/$(DEPDIR)/test_notification.Po
-	-rm -f unit/$(DEPDIR)/test_pipeline.Po
-	-rm -f unit/$(DEPDIR)/test_prepared_statement.Po
-	-rm -f unit/$(DEPDIR)/test_range.Po
-	-rm -f unit/$(DEPDIR)/test_read_transaction.Po
-	-rm -f unit/$(DEPDIR)/test_result_iteration.Po
-	-rm -f unit/$(DEPDIR)/test_result_slicing.Po
-	-rm -f unit/$(DEPDIR)/test_row.Po
-	-rm -f unit/$(DEPDIR)/test_separated_list.Po
-	-rm -f unit/$(DEPDIR)/test_simultaneous_transactions.Po
-	-rm -f unit/$(DEPDIR)/test_sql_cursor.Po
-	-rm -f unit/$(DEPDIR)/test_stateless_cursor.Po
-	-rm -f unit/$(DEPDIR)/test_strconv.Po
-	-rm -f unit/$(DEPDIR)/test_stream_from.Po
-	-rm -f unit/$(DEPDIR)/test_stream_to.Po
-	-rm -f unit/$(DEPDIR)/test_string_conversion.Po
-	-rm -f unit/$(DEPDIR)/test_subtransaction.Po
-	-rm -f unit/$(DEPDIR)/test_test_helpers.Po
-	-rm -f unit/$(DEPDIR)/test_thread_safety_model.Po
-	-rm -f unit/$(DEPDIR)/test_time.Po
-	-rm -f unit/$(DEPDIR)/test_transaction.Po
-	-rm -f unit/$(DEPDIR)/test_transaction_base.Po
-	-rm -f unit/$(DEPDIR)/test_transaction_focus.Po
-	-rm -f unit/$(DEPDIR)/test_transactor.Po
-	-rm -f unit/$(DEPDIR)/test_type_name.Po
-	-rm -f unit/$(DEPDIR)/test_zview.Po
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/runner.Po
-	-rm -f ./$(DEPDIR)/test00.Po
-	-rm -f ./$(DEPDIR)/test01.Po
-	-rm -f ./$(DEPDIR)/test02.Po
-	-rm -f ./$(DEPDIR)/test04.Po
-	-rm -f ./$(DEPDIR)/test07.Po
-	-rm -f ./$(DEPDIR)/test10.Po
-	-rm -f ./$(DEPDIR)/test11.Po
-	-rm -f ./$(DEPDIR)/test13.Po
-	-rm -f ./$(DEPDIR)/test14.Po
-	-rm -f ./$(DEPDIR)/test16.Po
-	-rm -f ./$(DEPDIR)/test17.Po
-	-rm -f ./$(DEPDIR)/test18.Po
-	-rm -f ./$(DEPDIR)/test20.Po
-	-rm -f ./$(DEPDIR)/test21.Po
-	-rm -f ./$(DEPDIR)/test26.Po
-	-rm -f ./$(DEPDIR)/test29.Po
-	-rm -f ./$(DEPDIR)/test30.Po
-	-rm -f ./$(DEPDIR)/test32.Po
-	-rm -f ./$(DEPDIR)/test37.Po
-	-rm -f ./$(DEPDIR)/test39.Po
-	-rm -f ./$(DEPDIR)/test46.Po
-	-rm -f ./$(DEPDIR)/test56.Po
-	-rm -f ./$(DEPDIR)/test60.Po
-	-rm -f ./$(DEPDIR)/test61.Po
-	-rm -f ./$(DEPDIR)/test62.Po
-	-rm -f ./$(DEPDIR)/test69.Po
-	-rm -f ./$(DEPDIR)/test70.Po
-	-rm -f ./$(DEPDIR)/test71.Po
-	-rm -f ./$(DEPDIR)/test72.Po
-	-rm -f ./$(DEPDIR)/test74.Po
-	-rm -f ./$(DEPDIR)/test75.Po
-	-rm -f ./$(DEPDIR)/test76.Po
-	-rm -f ./$(DEPDIR)/test77.Po
-	-rm -f ./$(DEPDIR)/test78.Po
-	-rm -f ./$(DEPDIR)/test79.Po
-	-rm -f ./$(DEPDIR)/test82.Po
-	-rm -f ./$(DEPDIR)/test84.Po
-	-rm -f ./$(DEPDIR)/test87.Po
-	-rm -f ./$(DEPDIR)/test88.Po
-	-rm -f ./$(DEPDIR)/test89.Po
-	-rm -f ./$(DEPDIR)/test90.Po
-	-rm -f unit/$(DEPDIR)/test_array.Po
-	-rm -f unit/$(DEPDIR)/test_binarystring.Po
-	-rm -f unit/$(DEPDIR)/test_blob.Po
-	-rm -f unit/$(DEPDIR)/test_cancel_query.Po
-	-rm -f unit/$(DEPDIR)/test_column.Po
-	-rm -f unit/$(DEPDIR)/test_composite.Po
-	-rm -f unit/$(DEPDIR)/test_connection.Po
-	-rm -f unit/$(DEPDIR)/test_cursor.Po
-	-rm -f unit/$(DEPDIR)/test_encodings.Po
-	-rm -f unit/$(DEPDIR)/test_error_verbosity.Po
-	-rm -f unit/$(DEPDIR)/test_errorhandler.Po
-	-rm -f unit/$(DEPDIR)/test_escape.Po
-	-rm -f unit/$(DEPDIR)/test_exceptions.Po
-	-rm -f unit/$(DEPDIR)/test_field.Po
-	-rm -f unit/$(DEPDIR)/test_float.Po
-	-rm -f unit/$(DEPDIR)/test_largeobject.Po
-	-rm -f unit/$(DEPDIR)/test_nonblocking_connect.Po
-	-rm -f unit/$(DEPDIR)/test_notification.Po
-	-rm -f unit/$(DEPDIR)/test_pipeline.Po
-	-rm -f unit/$(DEPDIR)/test_prepared_statement.Po
-	-rm -f unit/$(DEPDIR)/test_range.Po
-	-rm -f unit/$(DEPDIR)/test_read_transaction.Po
-	-rm -f unit/$(DEPDIR)/test_result_iteration.Po
-	-rm -f unit/$(DEPDIR)/test_result_slicing.Po
-	-rm -f unit/$(DEPDIR)/test_row.Po
-	-rm -f unit/$(DEPDIR)/test_separated_list.Po
-	-rm -f unit/$(DEPDIR)/test_simultaneous_transactions.Po
-	-rm -f unit/$(DEPDIR)/test_sql_cursor.Po
-	-rm -f unit/$(DEPDIR)/test_stateless_cursor.Po
-	-rm -f unit/$(DEPDIR)/test_strconv.Po
-	-rm -f unit/$(DEPDIR)/test_stream_from.Po
-	-rm -f unit/$(DEPDIR)/test_stream_to.Po
-	-rm -f unit/$(DEPDIR)/test_string_conversion.Po
-	-rm -f unit/$(DEPDIR)/test_subtransaction.Po
-	-rm -f unit/$(DEPDIR)/test_test_helpers.Po
-	-rm -f unit/$(DEPDIR)/test_thread_safety_model.Po
-	-rm -f unit/$(DEPDIR)/test_time.Po
-	-rm -f unit/$(DEPDIR)/test_transaction.Po
-	-rm -f unit/$(DEPDIR)/test_transaction_base.Po
-	-rm -f unit/$(DEPDIR)/test_transaction_focus.Po
-	-rm -f unit/$(DEPDIR)/test_transactor.Po
-	-rm -f unit/$(DEPDIR)/test_type_name.Po
-	-rm -f unit/$(DEPDIR)/test_zview.Po
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpqxx-7.7.3/test/runner.cxx b/ext/libpqxx-7.7.3/test/runner.cxx
deleted file mode 100644
index 38c9849d8..000000000
--- a/ext/libpqxx-7.7.3/test/runner.cxx
+++ /dev/null
@@ -1,203 +0,0 @@
-/* libpqxx test runner.
- */
-#include <cassert>
-#include <iostream>
-#include <list>
-#include <map>
-#include <new>
-#include <stdexcept>
-#include <string>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-namespace
-{
-inline std::string deref_field(pqxx::field const &f)
-{
-  return f.c_str();
-}
-} // namespace
-
-
-namespace pqxx::test
-{
-test_failure::test_failure(
-  std::string const &ffile, int fline, std::string const &desc) :
-        std::logic_error(desc), m_file(ffile), m_line(fline)
-{}
-
-test_failure::~test_failure() noexcept = default;
-
-
-/// Drop table, if it exists.
-inline void drop_table(transaction_base &t, std::string const &table)
-{
-  t.exec("DROP TABLE IF EXISTS " + table);
-}
-
-
-[[noreturn]] void
-check_notreached(char const file[], int line, std::string desc)
-{
-  throw test_failure(file, line, desc);
-}
-
-
-void check(
-  char const file[], int line, bool condition, char const text[],
-  std::string const &desc)
-{
-  if (not condition)
-    throw test_failure(
-      file, line, desc + " (failed expression: " + text + ")");
-}
-
-
-void expected_exception(std::string const &message)
-{
-  std::cout << "(Expected) " << message << std::endl;
-}
-
-
-std::string list_row(row Obj)
-{
-  return separated_list(", ", std::begin(Obj), std::end(Obj), deref_field);
-}
-
-
-std::string list_result(result Obj)
-{
-  if (std::empty(Obj))
-    return "<empty>";
-  return "{" +
-         separated_list(
-           "}\n{", std::begin(Obj), std::end(Obj),
-           [](row r) { return list_row(r); }) +
-         "}";
-}
-
-
-std::string list_result_iterator(result::const_iterator Obj)
-{
-  return "<iterator at " + to_string(Obj.rownumber()) + ">";
-}
-
-
-void create_pqxxevents(transaction_base &t)
-{
-  t.exec(
-    "CREATE TEMP TABLE pqxxevents(year integer, event varchar) "
-    "ON COMMIT PRESERVE ROWS");
-  t.exec("INSERT INTO pqxxevents(year, event) VALUES (71, 'jtv')");
-  t.exec("INSERT INTO pqxxevents(year, event) VALUES (38, 'time_t overflow')");
-  t.exec(
-    "INSERT INTO pqxxevents(year, event) VALUES (1, '''911'' WTC attack')");
-  t.exec("INSERT INTO pqxxevents(year, event) VALUES (81, 'C:\\>')");
-  t.exec(
-    "INSERT INTO pqxxevents(year, event) VALUES (1978, 'bloody\t\tcold')");
-  t.exec("INSERT INTO pqxxevents(year, event) VALUES (99, '')");
-  t.exec("INSERT INTO pqxxevents(year, event) VALUES (2002, 'libpqxx')");
-  t.exec(
-    "INSERT INTO pqxxevents(year, event) "
-    "VALUES (1989, 'Ode an die Freiheit')");
-  t.exec(
-    "INSERT INTO pqxxevents(year, event) VALUES (2001, 'New millennium')");
-  t.exec("INSERT INTO pqxxevents(year, event) VALUES (1974, '')");
-  t.exec("INSERT INTO pqxxevents(year, event) VALUES (97, 'Asian crisis')");
-  t.exec(
-    "INSERT INTO pqxxevents(year, event) VALUES (2001, 'A Space Odyssey')");
-}
-} // namespace pqxx::test
-
-
-namespace
-{
-std::map<std::string const, pqxx::test::testfunc> *all_tests{nullptr};
-} // namespace
-
-
-namespace pqxx::test
-{
-void register_test(char const name[], pqxx::test::testfunc func)
-{
-  if (all_tests == nullptr)
-  {
-    all_tests = new std::map<std::string const, pqxx::test::testfunc>();
-  }
-  else
-  {
-    assert(all_tests->find(name) == all_tests->end());
-  }
-  (*all_tests)[name] = func;
-}
-} // namespace pqxx::test
-
-
-int main(int argc, char const *argv[])
-{
-  char const *const test_name{(argc > 1) ? argv[1] : nullptr};
-
-  int test_count = 0;
-  std::list<std::string> failed;
-  for (auto const &i : *all_tests)
-    if (test_name == nullptr or std::string{test_name} == std::string{i.first})
-    {
-      std::cout << std::endl << "Running: " << i.first << std::endl;
-
-      bool success = false;
-      try
-      {
-        i.second();
-        success = true;
-      }
-      catch (pqxx::test::test_failure const &e)
-      {
-        std::cerr << "Test failure in " + e.file() + " line " +
-                       pqxx::to_string(e.line())
-                  << ": " << e.what() << std::endl;
-      }
-      catch (std::bad_alloc const &)
-      {
-        std::cerr << "Out of memory!" << std::endl;
-      }
-      catch (pqxx::feature_not_supported const &e)
-      {
-        std::cerr << "Not testing unsupported feature: " << e.what()
-                  << std::endl;
-        success = true;
-        --test_count;
-      }
-      catch (pqxx::sql_error const &e)
-      {
-        std::cerr << "SQL error: " << e.what() << std::endl
-                  << "Query was: " << e.query() << std::endl;
-      }
-      catch (std::exception const &e)
-      {
-        std::cerr << "Exception: " << e.what() << std::endl;
-      }
-      catch (...)
-      {
-        std::cerr << "Unknown exception" << std::endl;
-      }
-
-      if (not success)
-      {
-        std::cerr << "FAILED: " << i.first << std::endl;
-        failed.emplace_back(i.first);
-      }
-      ++test_count;
-    }
-
-  std::cout << "Ran " << test_count << " test(s).\n";
-
-  if (not std::empty(failed))
-  {
-    std::cerr << "*** " << std::size(failed) << " test(s) failed: ***\n";
-    for (auto const &i : failed) std::cerr << "\t" << i << '\n';
-  }
-
-  return int(std::size(failed));
-}
diff --git a/ext/libpqxx-7.7.3/test/test00.cxx b/ext/libpqxx-7.7.3/test/test00.cxx
deleted file mode 100644
index 698c9b81b..000000000
--- a/ext/libpqxx-7.7.3/test/test00.cxx
+++ /dev/null
@@ -1,114 +0,0 @@
-#include <locale>
-
-#include <pqxx/cursor>
-#include <pqxx/strconv>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Initial test program for libpqxx.  Test functionality that doesn't require a
-// running database.
-
-namespace
-{
-template<typename T>
-inline void
-strconv(std::string const &type, T const &Obj, std::string const &expected)
-{
-  std::string const Objstr{to_string(Obj)};
-
-  PQXX_CHECK_EQUAL(Objstr, expected, "String mismatch for " + type + ".");
-  T NewObj;
-  from_string(Objstr, NewObj);
-  PQXX_CHECK_EQUAL(
-    to_string(NewObj), expected, "String mismatch for recycled " + type + ".");
-}
-
-// There's no from_string<char const *>()...
-inline void
-strconv(std::string const &type, char const Obj[], std::string const &expected)
-{
-  std::string const Objstr(to_string(Obj));
-  PQXX_CHECK_EQUAL(Objstr, expected, "String mismatch for " + type + ".");
-}
-
-constexpr double not_a_number{std::numeric_limits<double>::quiet_NaN()};
-
-struct intderef
-{
-  template<typename ITER> int operator()(ITER i) const noexcept
-  {
-    return int(*i);
-  }
-};
-
-
-void test_000()
-{
-  PQXX_CHECK_EQUAL(
-    oid_none, 0u,
-    "InvalidIod is not zero as it used to be.  This may conceivably "
-    "cause problems in libpqxx.");
-
-  PQXX_CHECK(
-    cursor_base::prior() < 0 and cursor_base::backward_all() < 0,
-    "cursor_base::difference_type appears to be unsigned.");
-
-  constexpr char weird[]{"foo\t\n\0bar"};
-  std::string const weirdstr(weird, std::size(weird) - 1);
-
-  // Test string conversions
-  strconv("char const[]", "", "");
-  strconv("char const[]", "foo", "foo");
-  strconv("int", 0, "0");
-  strconv("int", 100, "100");
-  strconv("int", -1, "-1");
-
-#if defined(_MSC_VER)
-  long const long_min{LONG_MIN}, long_max{LONG_MAX};
-#else
-  long const long_min{std::numeric_limits<long>::min()},
-    long_max{std::numeric_limits<long>::max()};
-#endif
-
-  std::stringstream lminstr, lmaxstr, llminstr, llmaxstr, ullmaxstr;
-  lminstr.imbue(std::locale("C"));
-  lmaxstr.imbue(std::locale("C"));
-  llminstr.imbue(std::locale("C"));
-  llmaxstr.imbue(std::locale("C"));
-  ullmaxstr.imbue(std::locale("C"));
-
-  lminstr << long_min;
-  lmaxstr << long_max;
-
-  auto const ullong_max{std::numeric_limits<unsigned long long>::max()};
-  auto const llong_max{std::numeric_limits<long long>::max()},
-    llong_min{std::numeric_limits<long long>::min()};
-
-  llminstr << llong_min;
-  llmaxstr << llong_max;
-  ullmaxstr << ullong_max;
-
-  strconv("long", 0, "0");
-  strconv("long", long_min, lminstr.str());
-  strconv("long", long_max, lmaxstr.str());
-  strconv("double", not_a_number, "nan");
-  strconv("string", std::string{}, "");
-  strconv("string", weirdstr, weirdstr);
-  strconv("long long", 0LL, "0");
-  strconv("long long", llong_min, llminstr.str());
-  strconv("long long", llong_max, llmaxstr.str());
-  strconv("unsigned long long", 0ULL, "0");
-  strconv("unsigned long long", ullong_max, ullmaxstr.str());
-
-  std::stringstream ss;
-  strconv("empty stringstream", ss, "");
-  ss << -3.1415;
-  strconv("stringstream", ss, ss.str());
-}
-
-
-PQXX_REGISTER_TEST(test_000);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test01.cxx b/ext/libpqxx-7.7.3/test/test01.cxx
deleted file mode 100644
index 84b7f3b78..000000000
--- a/ext/libpqxx-7.7.3/test/test01.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <iostream>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-namespace
-{
-// Simple test program for libpqxx.  Open connection to database, start
-// a transaction, and perform a query inside it.
-void test_001()
-{
-  connection conn;
-
-  // Begin a transaction acting on our current connection.  Give it a human-
-  // readable name so the library can include it in error messages.
-  work tx{conn, "test1"};
-
-  // Perform a query on the database, storing result rows in R.
-  result r(tx.exec("SELECT * FROM pg_tables"));
-
-  // We're expecting to find some tables...
-  PQXX_CHECK(not std::empty(r), "No tables found.");
-
-  tx.commit();
-}
-
-
-PQXX_REGISTER_TEST(test_001);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test02.cxx b/ext/libpqxx-7.7.3/test/test02.cxx
deleted file mode 100644
index f98e18d08..000000000
--- a/ext/libpqxx-7.7.3/test/test02.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Example/test program for libpqxx.  Perform a query and enumerate its output
-// using array indexing.
-
-namespace
-{
-void bad_connect()
-{
-  connection conn{"totally#invalid@connect$string!?"};
-}
-
-void test_002()
-{
-  // Before we really connect, test the expected behaviour of the default
-  // connection type, where a failure to connect results in an immediate
-  // exception rather than a silent retry.
-  PQXX_CHECK_THROWS_EXCEPTION(
-    bad_connect(), "Invalid connection string did not cause exception.");
-
-  // Set up connection to database
-  std::string ConnectString;
-  connection C{ConnectString};
-
-  // Start transaction within context of connection.
-  work T{C, "test2"};
-
-  // Perform query within transaction.
-  result R(T.exec("SELECT * FROM pg_tables"));
-
-  // Let's keep the database waiting as briefly as possible: commit now,
-  // before we start processing results.  We could do this later, or since
-  // we're not making any changes in the database that need to be committed,
-  // we could in this case even omit it altogether.
-  T.commit();
-
-  // Ah, this version of postgres will tell you which table a column in a
-  // result came from.  Let's just test that functionality...
-  oid const rtable{R.column_table(0)};
-  PQXX_CHECK_EQUAL(
-    rtable, R.column_table(pqxx::row::size_type(0)),
-    "Inconsistent answers from column_table()");
-
-  std::string const rcol{R.column_name(0)};
-  oid const crtable{R.column_table(rcol)};
-  PQXX_CHECK_EQUAL(
-    crtable, rtable, "Field looked up by name gives different origin.");
-
-  // Now we've got all that settled, let's process our results.
-  for (auto const &f : R)
-  {
-    oid const ftable{f[0].table()};
-    PQXX_CHECK_EQUAL(ftable, rtable, "field::table() is broken.");
-
-    oid const ttable{f.column_table(0)};
-
-    PQXX_CHECK_EQUAL(
-      ttable, f.column_table(pqxx::row::size_type(0)),
-      "Inconsistent pqxx::row::column_table().");
-
-    PQXX_CHECK_EQUAL(ttable, rtable, "Inconsistent result::column_table().");
-
-    oid const cttable{f.column_table(rcol)};
-
-    PQXX_CHECK_EQUAL(cttable, rtable, "pqxx::row::column_table() is broken.");
-  }
-}
-
-
-PQXX_REGISTER_TEST(test_002);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test04.cxx b/ext/libpqxx-7.7.3/test/test04.cxx
deleted file mode 100644
index 623446398..000000000
--- a/ext/libpqxx-7.7.3/test/test04.cxx
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <cerrno>
-#include <chrono>
-#include <cstring>
-#include <ctime>
-
-#include <pqxx/internal/header-pre.hxx>
-
-#include <pqxx/internal/wait.hxx>
-
-#include <pqxx/internal/header-post.hxx>
-
-#include <pqxx/notification>
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-// Example program for libpqxx.  Send notification to self.
-
-namespace
-{
-int Backend_PID{0};
-
-
-// Sample implementation of notification receiver.
-class TestListener final : public notification_receiver
-{
-  bool m_done;
-
-public:
-  explicit TestListener(connection &conn) :
-          notification_receiver(conn, "listen"), m_done(false)
-  {}
-
-  virtual void operator()(std::string const &, int be_pid) override
-  {
-    m_done = true;
-    PQXX_CHECK_EQUAL(
-      be_pid, Backend_PID, "Notification came from wrong backend process.");
-  }
-
-  bool done() const { return m_done; }
-};
-
-
-void test_004()
-{
-  connection conn;
-
-  TestListener L{conn};
-  // Trigger our notification receiver.
-  perform([&conn, &L] {
-    work tx(conn);
-    tx.exec0("NOTIFY " + conn.quote_name(L.channel()));
-    Backend_PID = conn.backendpid();
-    tx.commit();
-  });
-
-  int notifs{0};
-  for (int i{0}; (i < 20) and not L.done(); ++i)
-  {
-    PQXX_CHECK_EQUAL(notifs, 0, "Got unexpected notifications.");
-    // Sleep for one second.  I'm not proud of this, but how does one inject
-    // a change to the built-in clock in a static language?
-    pqxx::internal::wait_for(1'000'000u);
-    notifs = conn.get_notifs();
-  }
-
-  PQXX_CHECK_NOT_EQUAL(L.done(), false, "No notification received.");
-  PQXX_CHECK_EQUAL(notifs, 1, "Got too many notifications.");
-}
-
-
-PQXX_REGISTER_TEST(test_004);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test07.cxx b/ext/libpqxx-7.7.3/test/test07.cxx
deleted file mode 100644
index 875ee8d50..000000000
--- a/ext/libpqxx-7.7.3/test/test07.cxx
+++ /dev/null
@@ -1,133 +0,0 @@
-#include <iostream>
-#include <map>
-
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Example program for libpqxx.  Modify the database, retaining transactional
-// integrity using the transactor framework.
-//
-// This assumes the existence of a database table "pqxxevents" containing a
-// 2-digit "year" field, which is extended to a 4-digit format by assuming all
-// year numbers of 70 or higher are in the 20th century, and all others in the
-// 21st, and that no years before 1970 are possible.
-
-namespace
-{
-// Convert year to 4-digit format.
-int To4Digits(int Y)
-{
-  int Result{Y};
-
-  PQXX_CHECK(Y >= 0, "Negative year: " + to_string(Y));
-  if (Y < 70)
-    Result += 2000;
-  else if (Y < 100)
-    Result += 1900;
-  else if (Y < 1970)
-    PQXX_CHECK_NOTREACHED("Unexpected year: " + to_string(Y));
-
-  return Result;
-}
-
-
-void test_007()
-{
-  connection conn;
-  conn.set_client_encoding("SQL_ASCII");
-
-  {
-    work tx{conn};
-    test::create_pqxxevents(tx);
-    tx.commit();
-  }
-
-  // Perform (an instantiation of) the UpdateYears transactor we've defined
-  // in the code above.  This is where the work gets done.
-  std::map<int, int> conversions;
-  perform([&conversions, &conn] {
-    work tx{conn};
-    // First select all different years occurring in the table.
-    result R(tx.exec("SELECT year FROM pqxxevents"));
-
-    // See if we get reasonable type identifier for this column.
-    oid const rctype{R.column_type(0)};
-    PQXX_CHECK_EQUAL(
-      R.column_type(pqxx::row::size_type(0)), rctype,
-      "Inconsistent result::column_type().");
-
-    std::string const rct{to_string(rctype)};
-    PQXX_CHECK(rctype > 0, "Got strange type ID for column: " + rct);
-
-    std::string const rcol{R.column_name(0)};
-    PQXX_CHECK(not std::empty(rcol), "Didn't get a name for column.");
-
-    oid const rcctype{R.column_type(rcol)};
-    PQXX_CHECK_EQUAL(
-      rcctype, rctype, "Column type is not what it is by name.");
-
-    oid const rawrcctype{R.column_type(rcol)};
-    PQXX_CHECK_EQUAL(
-      rawrcctype, rctype, "Column type by C-style name is different.");
-
-    // Note all different years currently occurring in the table, writing
-    // them and their correct mappings to conversions.
-    for (auto const &r : R)
-    {
-      int Y{0};
-
-      // Read year, and if it is non-null, note its converted value
-      if (r[0] >> Y)
-        conversions[Y] = To4Digits(Y);
-
-      // See if type identifiers are consistent
-      oid const tctype{r.column_type(0)};
-
-      PQXX_CHECK_EQUAL(
-        tctype, r.column_type(pqxx::row::size_type(0)),
-        "Inconsistent pqxx::row::column_type()");
-
-      PQXX_CHECK_EQUAL(
-        tctype, rctype,
-        "pqxx::row::column_type() is inconsistent with "
-        "result::column_type().");
-
-      oid const ctctype{r.column_type(rcol)};
-
-      PQXX_CHECK_EQUAL(
-        ctctype, rctype, "Column type lookup by column name is broken.");
-
-      oid const rawctctype{r.column_type(rcol)};
-
-      PQXX_CHECK_EQUAL(
-        rawctctype, rctype, "Column type lookup by C-style name is broken.");
-
-      oid const fctype{r[0].type()};
-      PQXX_CHECK_EQUAL(fctype, rctype, "Field type lookup is broken.");
-    }
-
-    // For each occurring year, write converted date back to whereever it may
-    // occur in the table.  Since we're in a transaction, any changes made by
-    // others at the same time will not affect us.
-    for (auto const &c : conversions)
-    {
-      auto const query{
-        "UPDATE pqxxevents "
-        "SET year=" +
-        to_string(c.second) +
-        " "
-        "WHERE year=" +
-        to_string(c.first)};
-      R = tx.exec0(query);
-    }
-  });
-}
-
-
-PQXX_REGISTER_TEST(test_007);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test10.cxx b/ext/libpqxx-7.7.3/test/test10.cxx
deleted file mode 100644
index 4cb4aaba1..000000000
--- a/ext/libpqxx-7.7.3/test/test10.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-#include <cstdio>
-#include <iostream>
-#include <vector>
-
-#include <pqxx/nontransaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Open connection to database, start a transaction,
-// abort it, and verify that it "never happened."
-
-namespace
-{
-// Let's take a boring year that is not going to be in the "pqxxevents" table
-constexpr int BoringYear{1977};
-
-std::string const Table("pqxxevents");
-
-
-// Count events, and boring events, in table
-std::pair<int, int> CountEvents(transaction_base &T)
-{
-  std::string const events_query{"SELECT count(*) FROM " + Table};
-  std::string const boring_query{
-    events_query + " WHERE year=" + to_string(BoringYear)};
-  return std::make_pair(
-    T.query_value<int>(events_query), T.query_value<int>(boring_query));
-}
-
-
-// Try adding a record, then aborting it, and check whether the abort was
-// performed correctly.
-void Test(connection &C, bool ExplicitAbort)
-{
-  std::pair<int, int> EventCounts;
-
-  // First run our doomed transaction.  This will refuse to run if an event
-  // exists for our Boring Year.
-  {
-    // Begin a transaction acting on our current connection; we'll abort it
-    // later though.
-    work Doomed{C, "Doomed"};
-
-    // Verify that our Boring Year was not yet in the events table
-    EventCounts = CountEvents(Doomed);
-
-    PQXX_CHECK_EQUAL(
-      EventCounts.second, 0, "Can't run, boring year is already in table.");
-
-    // Now let's try to introduce a row for our Boring Year
-    Doomed.exec0(
-      "INSERT INTO " + Table +
-      "(year, event) "
-      "VALUES (" +
-      to_string(BoringYear) + ", 'yawn')");
-
-    auto const Recount{CountEvents(Doomed)};
-    PQXX_CHECK_EQUAL(
-      Recount.second, 1, "Wrong # events for " + to_string(BoringYear));
-
-    PQXX_CHECK_EQUAL(
-      Recount.first, EventCounts.first + 1, "Number of events changed.");
-
-    // Okay, we've added an entry but we don't really want to.  Abort it
-    // explicitly if requested, or simply let the Transaction object "expire."
-    if (ExplicitAbort)
-      Doomed.abort();
-
-    // If now explicit abort requested, Doomed Transaction still ends here
-  }
-
-  // Now check that we're back in the original state.  Note that this may go
-  // wrong if somebody managed to change the table between our two
-  // transactions.
-  work Checkup(C, "Checkup");
-
-  auto const NewEvents{CountEvents(Checkup)};
-  PQXX_CHECK_EQUAL(
-    NewEvents.first, EventCounts.first,
-    "Number of events changed.  This may be due to a bug in libpqxx, "
-    "or the test table was modified by some other process.");
-
-  PQXX_CHECK_EQUAL(
-    NewEvents.second, 0,
-    "Found unexpected events.  This may be due to a bug in libpqxx, "
-    "or the test table was modified by some other process.");
-}
-
-
-void test_abort()
-{
-  connection conn;
-  nontransaction t{conn};
-  test::create_pqxxevents(t);
-  connection &c(t.conn());
-  t.commit();
-  Test(c, true);
-  Test(c, false);
-}
-
-
-PQXX_REGISTER_TEST(test_abort);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test11.cxx b/ext/libpqxx-7.7.3/test/test11.cxx
deleted file mode 100644
index 4b42a66d5..000000000
--- a/ext/libpqxx-7.7.3/test/test11.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <cstdio>
-#include <cstring>
-#include <iostream>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Query a table and report its metadata.
-namespace
-{
-void test_011()
-{
-  connection conn;
-  work tx{conn};
-  std::string const Table{"pg_tables"};
-
-  result R(tx.exec("SELECT * FROM " + Table));
-
-  // Print column names
-  for (pqxx::row::size_type c{0}; c < R.columns(); ++c)
-  {
-    std::string N{R.column_name(c)};
-    PQXX_CHECK_EQUAL(R.column_number(N), c, "Inconsistent column numbers.");
-  }
-
-  // If there are rows in R, compare their metadata to R's.
-  if (not std::empty(R))
-  {
-    PQXX_CHECK_EQUAL(R[0].rownumber(), 0, "Row 0 has wrong number.");
-
-    if (std::size(R) >= 2)
-      PQXX_CHECK_EQUAL(R[1].rownumber(), 1, "Row 1 has wrong number.");
-
-    // Test result::iterator::swap()
-    pqxx::result::const_iterator const T1(R[0]), T2(R[1]);
-    PQXX_CHECK_NOT_EQUAL(T1, T2, "Values are identical--can't test swap().");
-    pqxx::result::const_iterator T1s(T1), T2s(T2);
-    PQXX_CHECK_EQUAL(T1s, T1, "Result iterator copy-construction is wrong.");
-    PQXX_CHECK_EQUAL(
-      T2s, T2, "Result iterator copy-construction is inconsistently wrong.");
-    T1s.swap(T2s);
-    PQXX_CHECK_NOT_EQUAL(T1s, T1, "Result iterator swap doesn't work.");
-    PQXX_CHECK_NOT_EQUAL(
-      T2s, T2, "Result iterator swap inconsistently wrong.");
-    PQXX_CHECK_EQUAL(T2s, T1, "Result iterator swap is asymmetric.");
-    PQXX_CHECK_EQUAL(
-      T1s, T2, "Result iterator swap is inconsistently asymmetric.");
-
-    for (pqxx::row::size_type c{0}; c < std::size(R[0]); ++c)
-    {
-      std::string N{R.column_name(c)};
-
-      PQXX_CHECK_EQUAL(
-        std::string{R[0].at(c).c_str()}, R[0].at(N).c_str(),
-        "Field by name != field by number.");
-
-      PQXX_CHECK_EQUAL(
-        std::string{R[0][c].c_str()}, R[0][N].c_str(),
-        "at() is inconsistent with operator[].");
-
-      PQXX_CHECK_EQUAL(R[0][c].name(), N, "Field names are inconsistent.");
-
-      PQXX_CHECK_EQUAL(
-        std::size(R[0][c]), strlen(R[0][c].c_str()),
-        "Field size is not what we expected.");
-    }
-  }
-}
-
-
-PQXX_REGISTER_TEST(test_011);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test13.cxx b/ext/libpqxx-7.7.3/test/test13.cxx
deleted file mode 100644
index b3577a5d3..000000000
--- a/ext/libpqxx-7.7.3/test/test13.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Verify abort behaviour of transactor.
-//
-// The program will attempt to add an entry to a table called "pqxxevents",
-// with a key column called "year"--and then abort the change.
-//
-// Note for the superstitious: the numbering for this test program is pure
-// coincidence.
-namespace
-{
-// Let's take a boring year that is not going to be in the "pqxxevents" table
-constexpr unsigned int BoringYear = 1977;
-
-
-// Count events and specifically events occurring in Boring Year, leaving the
-// former count in the result pair's first member, and the latter in second.
-std::pair<int, int> count_events(connection &conn, std::string const &table)
-{
-  work tx{conn};
-  std::string const count_query{"SELECT count(*) FROM " + table};
-  return std::make_pair(
-    tx.query_value<int>(count_query),
-    tx.query_value<int>(count_query + " WHERE year=" + to_string(BoringYear)));
-}
-
-
-struct deliberate_error : std::exception
-{};
-
-
-void failed_insert(connection &C, std::string const &table)
-{
-  work tx(C);
-  result R = tx.exec0(
-    "INSERT INTO " + table + " VALUES (" + to_string(BoringYear) +
-    ", "
-    "'yawn')");
-
-  PQXX_CHECK_EQUAL(R.affected_rows(), 1, "Bad affected_rows().");
-  throw deliberate_error();
-}
-
-
-void test_013()
-{
-  connection conn;
-  {
-    work tx{conn};
-    test::create_pqxxevents(tx);
-    tx.commit();
-  }
-
-  std::string const Table{"pqxxevents"};
-
-  auto const Before{
-    perform([&conn, &Table] { return count_events(conn, Table); })};
-  PQXX_CHECK_EQUAL(
-    Before.second, 0,
-    "Already have event for " + to_string(BoringYear) + "--can't test.");
-
-  quiet_errorhandler d(conn);
-  PQXX_CHECK_THROWS(
-    perform([&conn, &Table] { failed_insert(conn, Table); }), deliberate_error,
-    "Failing transactor failed to throw correct exception.");
-
-  auto const After{
-    perform([&conn, &Table] { return count_events(conn, Table); })};
-
-  PQXX_CHECK_EQUAL(
-    After.first, Before.first, "abort() didn't reset event count.");
-
-  PQXX_CHECK_EQUAL(
-    After.second, Before.second,
-    "abort() didn't reset event count for " + to_string(BoringYear));
-}
-
-
-PQXX_REGISTER_TEST(test_013);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test14.cxx b/ext/libpqxx-7.7.3/test/test14.cxx
deleted file mode 100644
index c82f2323c..000000000
--- a/ext/libpqxx-7.7.3/test/test14.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <iostream>
-
-#include <pqxx/nontransaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test nontransaction.
-
-namespace
-{
-void test_014()
-{
-  connection conn;
-
-  // Begin a "non-transaction" acting on our current connection.  This is
-  // really all the transactional integrity we need since we're only
-  // performing one query which does not modify the database.
-  nontransaction tx{conn, "test14"};
-
-  // The transaction class family also has process_notice() functions.
-  // These simply pass the notice through to their connection, but this may
-  // be more convenient in some cases.  All process_notice() functions accept
-  // C++ strings as well as C strings.
-  tx.process_notice(std::string{"Started nontransaction\n"});
-
-  // "Commit" the non-transaction.  This doesn't really do anything since
-  // nontransaction doesn't start a backend transaction.
-  tx.commit();
-}
-
-
-PQXX_REGISTER_TEST(test_014);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test16.cxx b/ext/libpqxx-7.7.3/test/test16.cxx
deleted file mode 100644
index 211bbba6a..000000000
--- a/ext/libpqxx-7.7.3/test/test16.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <iostream>
-
-#include <pqxx/connection>
-#include <pqxx/robusttransaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test robusttransaction.
-namespace
-{
-void test_016()
-{
-  connection conn;
-  robusttransaction<> tx{conn};
-  result R{tx.exec("SELECT * FROM pg_tables")};
-
-  result::const_iterator c;
-  for (c = std::begin(R); c != std::end(R); ++c)
-    ;
-
-  // See if back() and row comparison work properly
-  PQXX_CHECK(
-    std::size(R) >= 2, "Not enough rows in pg_tables to test, sorry!");
-
-  --c;
-
-  PQXX_CHECK_EQUAL(
-    c->size(), std::size(R.back()),
-    "Size mismatch between row iterator and back().");
-
-  std::string const nullstr;
-  for (pqxx::row::size_type i{0}; i < c->size(); ++i)
-    PQXX_CHECK_EQUAL(
-      c[i].as(nullstr), R.back()[i].as(nullstr), "Value mismatch in back().");
-  PQXX_CHECK(*c == R.back(), "Row equality is broken.");
-  PQXX_CHECK(not(*c != R.back()), "Row inequality is broken.");
-
-  tx.commit();
-}
-
-
-PQXX_REGISTER_TEST(test_016);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test17.cxx b/ext/libpqxx-7.7.3/test/test17.cxx
deleted file mode 100644
index 7c99a35cc..000000000
--- a/ext/libpqxx-7.7.3/test/test17.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <iostream>
-
-#include <pqxx/connection>
-#include <pqxx/nontransaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Simple test program for libpqxx.  Open connection to database, start
-// a dummy transaction to gain nontransactional access, and perform a query.
-namespace
-{
-void test_017()
-{
-  connection conn;
-  perform([&conn] {
-    nontransaction tx{conn};
-    auto const r{tx.exec("SELECT * FROM generate_series(1, 4)")};
-    PQXX_CHECK_EQUAL(std::size(r), 4, "Weird query result.");
-    tx.commit();
-  });
-}
-
-
-PQXX_REGISTER_TEST(test_017);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test18.cxx b/ext/libpqxx-7.7.3/test/test18.cxx
deleted file mode 100644
index 9718d2daa..000000000
--- a/ext/libpqxx-7.7.3/test/test18.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <pqxx/connection>
-#include <pqxx/nontransaction>
-#include <pqxx/robusttransaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Verify abort behaviour of RobustTransaction.
-//
-// The program will attempt to add an entry to a table called "pqxxevents",
-// with a key column called "year"--and then abort the change.
-namespace
-{
-// Let's take a boring year that is not going to be in the "pqxxevents" table
-constexpr long BoringYear{1977};
-
-
-// Count events and specifically events occurring in Boring Year, leaving the
-// former count in the result pair's first member, and the latter in second.
-std::pair<int, int> count_events(connection &conn, std::string const &table)
-{
-  nontransaction tx{conn};
-  std::string const count_query{"SELECT count(*) FROM " + table};
-  return std::make_pair(
-    tx.query_value<int>(count_query),
-    tx.query_value<int>(count_query + " WHERE year=" + to_string(BoringYear)));
-}
-
-
-struct deliberate_error : std::exception
-{};
-
-
-void test_018()
-{
-  connection conn;
-  {
-    work tx{conn};
-    test::create_pqxxevents(tx);
-    tx.commit();
-  }
-
-  std::string const Table{"pqxxevents"};
-
-  auto const Before{
-    perform([&conn, &Table] { return count_events(conn, Table); })};
-  PQXX_CHECK_EQUAL(
-    Before.second, 0,
-    "Already have event for " + to_string(BoringYear) + ", cannot run.");
-
-  {
-    quiet_errorhandler d{conn};
-    PQXX_CHECK_THROWS(
-      perform([&conn, Table] {
-        robusttransaction<serializable> tx{conn};
-        tx.exec0(
-          "INSERT INTO " + Table + " VALUES (" + to_string(BoringYear) +
-          ", '" + tx.esc("yawn") + "')");
-
-        throw deliberate_error();
-      }),
-      deliberate_error,
-      "Not getting expected exception from failing transactor.");
-  }
-
-  auto const After{
-    perform([&conn, &Table] { return count_events(conn, Table); })};
-
-  PQXX_CHECK_EQUAL(After.first, Before.first, "Event count changed.");
-  PQXX_CHECK_EQUAL(
-    After.second, Before.second,
-    "Event count for " + to_string(BoringYear) + " changed.");
-}
-
-
-PQXX_REGISTER_TEST(test_018);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test20.cxx b/ext/libpqxx-7.7.3/test/test20.cxx
deleted file mode 100644
index 1ddd4b09a..000000000
--- a/ext/libpqxx-7.7.3/test/test20.cxx
+++ /dev/null
@@ -1,95 +0,0 @@
-#include <iostream>
-
-#include <pqxx/connection>
-#include <pqxx/nontransaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test: nontransaction changes are not rolled back on abort.
-namespace
-{
-constexpr unsigned long BoringYear{1977};
-
-
-void test_020()
-{
-  connection conn;
-  nontransaction t1{conn};
-  test::create_pqxxevents(t1);
-
-  std::string const Table{"pqxxevents"};
-
-  // Verify our start condition before beginning: there must not be a 1977
-  // record already.
-  result R(t1.exec(("SELECT * FROM " + Table +
-                    " "
-                    "WHERE year=" +
-                    to_string(BoringYear))
-                     .c_str()));
-  PQXX_CHECK_EQUAL(
-    std::size(R), 0,
-    "Already have a row for " + to_string(BoringYear) + ", cannot test.");
-
-  // (Not needed, but verify that clear() works on empty containers)
-  R.clear();
-  PQXX_CHECK(std::empty(R), "result::clear() is broken.");
-
-  // OK.  Having laid that worry to rest, add a record for 1977.
-  t1.exec0(
-    "INSERT INTO " + Table +
-    " VALUES"
-    "(" +
-    to_string(BoringYear) +
-    ","
-    "'Yawn'"
-    ")");
-
-  // Abort T1.  Since T1 is a nontransaction, which provides only the
-  // transaction class interface without providing any form of transactional
-  // integrity, this is not going to undo our work.
-  t1.abort();
-
-  // Verify that our record was added, despite the Abort()
-  nontransaction t2{conn, "t2"};
-  R = t2.exec(("SELECT * FROM " + Table +
-               " "
-               "WHERE year=" +
-               to_string(BoringYear))
-                .c_str());
-
-  PQXX_CHECK_EQUAL(
-    std::size(R), 1,
-    "Found wrong number of rows for " + to_string(BoringYear) + ".");
-
-  PQXX_CHECK(R.capacity() >= std::size(R), "Result's capacity is too small.");
-
-  R.clear();
-  PQXX_CHECK(std::empty(R), "result::clear() doesn't work.");
-
-  // Now remove our record again
-  t2.exec0(
-    "DELETE FROM " + Table +
-    " "
-    "WHERE year=" +
-    to_string(BoringYear));
-
-  t2.commit();
-
-  // And again, verify results
-  nontransaction t3{conn, "t3"};
-
-  R = t3.exec(("SELECT * FROM " + Table +
-               " "
-               "WHERE year=" +
-               to_string(BoringYear))
-                .c_str());
-
-  PQXX_CHECK_EQUAL(std::size(R), 0, "Record still found after removal.");
-}
-
-
-PQXX_REGISTER_TEST(test_020);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test21.cxx b/ext/libpqxx-7.7.3/test/test21.cxx
deleted file mode 100644
index 1090050d9..000000000
--- a/ext/libpqxx-7.7.3/test/test21.cxx
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <iostream>
-
-#include <pqxx/connection>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Simple test program for libpqxx.  Open a connection to database, start a
-// transaction, and perform a query inside it.
-namespace
-{
-void test_021()
-{
-  connection conn;
-
-  std::string const HostName{
-    ((conn.hostname() == nullptr) ? "<local>" : conn.hostname())};
-  conn.process_notice(
-    std::string{} + "database=" + conn.dbname() +
-    ", "
-    "username=" +
-    conn.username() +
-    ", "
-    "hostname=" +
-    HostName +
-    ", "
-    "port=" +
-    to_string(conn.port()) +
-    ", "
-    "backendpid=" +
-    to_string(conn.backendpid()) + "\n");
-
-  work tx{conn, "test_021"};
-
-  // By now our connection should really have been created
-  conn.process_notice("Printing details on actual connection\n");
-  conn.process_notice(
-    std::string{} + "database=" + conn.dbname() +
-    ", "
-    "username=" +
-    conn.username() +
-    ", "
-    "hostname=" +
-    HostName +
-    ", "
-    "port=" +
-    to_string(conn.port()) +
-    ", "
-    "backendpid=" +
-    to_string(conn.backendpid()) + "\n");
-
-  std::string P;
-  from_string(conn.port(), P);
-  PQXX_CHECK_EQUAL(
-    P, to_string(conn.port()), "Port string conversion is broken.");
-  PQXX_CHECK_EQUAL(to_string(P), P, "Port string conversion is broken.");
-
-  result R(tx.exec("SELECT * FROM pg_tables"));
-
-  tx.process_notice(pqxx::internal::concat(
-    to_string(std::size(R)), " result row in transaction ", tx.name(), "\n"));
-  tx.commit();
-}
-
-
-PQXX_REGISTER_TEST(test_021);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test26.cxx b/ext/libpqxx-7.7.3/test/test26.cxx
deleted file mode 100644
index 69b04d839..000000000
--- a/ext/libpqxx-7.7.3/test/test26.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <iostream>
-#include <map>
-
-#include <pqxx/nontransaction>
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Example program for libpqxx.  Modify the database, retaining transactional
-// integrity using the transactor framework.
-namespace
-{
-// Convert year to 4-digit format.
-int To4Digits(int Y)
-{
-  int Result{Y};
-
-  PQXX_CHECK(Y >= 0, "Negative year: " + to_string(Y));
-
-  if (Y < 70)
-    Result += 2000;
-  else if (Y < 100)
-    Result += 1900;
-  else
-    PQXX_CHECK(Y >= 1970, "Unexpected year: " + to_string(Y));
-  return Result;
-}
-
-
-// Transaction definition for year-field update.  Returns conversions done.
-std::map<int, int> update_years(connection &C)
-{
-  std::map<int, int> conversions;
-  work tx{C};
-
-  // Note all different years currently occurring in the table, writing them
-  // and their correct mappings to m_conversions
-  for (auto const &[y] :
-       tx.stream<std::optional<int>>("SELECT year FROM pqxxevents"))
-  {
-    // Read year, and if it is non-null, note its converted value
-    if (bool(y))
-      conversions[y.value()] = To4Digits(y.value());
-  }
-
-  // For each occurring year, write converted date back to whereever it may
-  // occur in the table.  Since we're in a transaction, any changes made by
-  // others at the same time will not affect us.
-  for (auto const &c : conversions)
-    tx.exec0(
-      "UPDATE pqxxevents "
-      "SET year=" +
-      to_string(c.second) +
-      " "
-      "WHERE year=" +
-      to_string(c.first));
-
-  tx.commit();
-
-  return conversions;
-}
-
-
-void test_026()
-{
-  connection conn;
-  {
-    nontransaction tx{conn};
-    test::create_pqxxevents(tx);
-    tx.commit();
-  }
-
-  // Perform (an instantiation of) the UpdateYears transactor we've defined
-  // in the code above.  This is where the work gets done.
-  auto const conversions{perform([&conn] { return update_years(conn); })};
-
-  PQXX_CHECK(not std::empty(conversions), "No conversions done!");
-}
-
-
-PQXX_REGISTER_TEST(test_026);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test29.cxx b/ext/libpqxx-7.7.3/test/test29.cxx
deleted file mode 100644
index 4547523f1..000000000
--- a/ext/libpqxx-7.7.3/test/test29.cxx
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <cstdio>
-#include <iostream>
-#include <vector>
-
-#include <pqxx/nontransaction>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Open connection to database, start a transaction,
-// abort it, and verify that it "never happened."
-//
-// The program will attempt to add an entry to a table called "pqxxevents",
-// with a key column called "year"--and then abort the change.
-namespace
-{
-// Let's take a boring year that is not going to be in the "pqxxevents" table
-constexpr int BoringYear{1977};
-
-std::string const Table{"pqxxevents"};
-
-
-// Count events, and boring events, in table
-std::pair<int, int> CountEvents(transaction_base &tx)
-{
-  std::string const events_query{"SELECT count(*) FROM " + Table};
-  std::string const boring_query{
-    events_query + " WHERE year=" + to_string(BoringYear)};
-
-  return std::make_pair(
-    tx.query_value<int>(events_query), tx.query_value<int>(boring_query));
-}
-
-
-// Try adding a record, then aborting it, and check whether the abort was
-// performed correctly.
-void Test(connection &conn, bool ExplicitAbort)
-{
-  std::vector<std::string> BoringRow{to_string(BoringYear), "yawn"};
-
-  std::pair<int, int> EventCounts;
-
-  // First run our doomed transaction.  This will refuse to run if an event
-  // exists for our Boring Year.
-  {
-    // Begin a transaction acting on our current connection; we'll abort it
-    // later though.
-    work Doomed(conn, "Doomed");
-
-    // Verify that our Boring Year was not yet in the events table
-    EventCounts = CountEvents(Doomed);
-
-    PQXX_CHECK_EQUAL(
-      EventCounts.second, 0,
-      "Can't run; " + to_string(BoringYear) + " is already in the table.");
-
-    // Now let's try to introduce a row for our Boring Year
-    Doomed.exec0(
-      "INSERT INTO " + Table +
-      "(year, event) "
-      "VALUES (" +
-      to_string(BoringYear) + ", 'yawn')");
-
-    auto Recount{CountEvents(Doomed)};
-    PQXX_CHECK_EQUAL(Recount.second, 1, "Unexpected number of events.");
-    PQXX_CHECK_EQUAL(
-      Recount.first, EventCounts.first + 1, "Number of events changed.");
-
-    // Okay, we've added an entry but we don't really want to.  Abort it
-    // explicitly if requested, or simply let the Transaction object "expire."
-    if (ExplicitAbort)
-      Doomed.abort();
-
-    // If now explicit abort requested, Doomed Transaction still ends here
-  }
-
-  // Now check that we're back in the original state.  Note that this may go
-  // wrong if somebody managed to change the table between our two
-  // transactions.
-  work Checkup(conn, "Checkup");
-
-  auto NewEvents{CountEvents(Checkup)};
-  PQXX_CHECK_EQUAL(
-    NewEvents.first, EventCounts.first, "Wrong number of events.");
-
-  PQXX_CHECK_EQUAL(NewEvents.second, 0, "Found unexpected events.");
-}
-
-
-void test_029()
-{
-  connection conn;
-  {
-    nontransaction tx{conn};
-    test::create_pqxxevents(tx);
-  }
-
-  // Test abort semantics, both with explicit and implicit abort
-  Test(conn, true);
-  Test(conn, false);
-}
-
-
-PQXX_REGISTER_TEST(test_029);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test30.cxx b/ext/libpqxx-7.7.3/test/test30.cxx
deleted file mode 100644
index fb6a05da0..000000000
--- a/ext/libpqxx-7.7.3/test/test30.cxx
+++ /dev/null
@@ -1,73 +0,0 @@
-#include <cstdio>
-#include <cstring>
-#include <iostream>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Query a table and report its metadata.
-namespace
-{
-void test_030()
-{
-  std::string const Table{"pg_tables"};
-
-  connection conn;
-  work tx{conn, "test30"};
-
-  result R(tx.exec(("SELECT * FROM " + Table).c_str()));
-  PQXX_CHECK(not std::empty(R), "Table " + Table + " is empty, cannot test.");
-
-  // Print column names
-  for (pqxx::row::size_type c{0}; c < R.columns(); ++c)
-  {
-    std::string N{R.column_name(c)};
-
-    PQXX_CHECK_EQUAL(
-      R[0].column_number(N), R.column_number(N),
-      "row::column_number() is inconsistent with result::column_number().");
-
-    PQXX_CHECK_EQUAL(R[0].column_number(N), c, "Inconsistent column numbers.");
-  }
-
-  // If there are rows in R, compare their metadata to R's.
-  if (std::empty(R))
-  {
-    std::cout << "(Table is empty.)\n";
-    return;
-  }
-
-  PQXX_CHECK_EQUAL(R[0].rownumber(), 0, "Row 0 reports wrong number.");
-
-  if (std::size(R) < 2)
-    std::cout << "(Only one row in table.)\n";
-  else
-    PQXX_CHECK_EQUAL(R[1].rownumber(), 1, "Row 1 reports wrong number.");
-
-  for (pqxx::row::size_type c{0}; c < std::size(R[0]); ++c)
-  {
-    std::string N{R.column_name(c)};
-
-    PQXX_CHECK_EQUAL(
-      std::string{R[0].at(c).c_str()}, R[0].at(N).c_str(),
-      "Different field values by name and by number.");
-
-    PQXX_CHECK_EQUAL(
-      std::string{R[0][c].c_str()}, R[0][N].c_str(),
-      "at() is inconsistent with operator[].");
-
-    PQXX_CHECK_EQUAL(R[0][c].name(), N, "Inconsistent field names.");
-
-    PQXX_CHECK_EQUAL(
-      std::size(R[0][c]), std::strlen(R[0][c].c_str()),
-      "Inconsistent field lengths.");
-  }
-}
-
-
-PQXX_REGISTER_TEST(test_030);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test32.cxx b/ext/libpqxx-7.7.3/test/test32.cxx
deleted file mode 100644
index 90f0db68c..000000000
--- a/ext/libpqxx-7.7.3/test/test32.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <pqxx/nontransaction>
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Verify abort behaviour of transactor.
-//
-// The program will attempt to add an entry to a table called "pqxxevents",
-// with a key column called "year"--and then abort the change.
-//
-// Note for the superstitious: the numbering for this test program is pure
-// coincidence.
-
-namespace
-{
-// Let's take a boring year that is not going to be in the "pqxxevents" table
-constexpr int BoringYear{1977};
-
-std::pair<int, int> count_events(connection &conn, std::string const &table)
-{
-  std::string const count_query{"SELECT count(*) FROM " + table};
-  work tx{conn};
-  return std::make_pair(
-    tx.query_value<int>(count_query),
-    tx.query_value<int>(count_query + " WHERE year=" + to_string(BoringYear)));
-}
-
-
-struct deliberate_error : std::exception
-{};
-
-
-void test_032()
-{
-  connection conn;
-  {
-    nontransaction tx{conn};
-    test::create_pqxxevents(tx);
-  }
-
-  std::string const Table{"pqxxevents"};
-
-  std::pair<int, int> const Before{
-    perform([&conn, &Table] { return count_events(conn, Table); })};
-  PQXX_CHECK_EQUAL(
-    Before.second, 0,
-    "Already have event for " + to_string(BoringYear) + ", cannot test.");
-
-  {
-    quiet_errorhandler d(conn);
-    PQXX_CHECK_THROWS(
-      perform([&conn, &Table] {
-        work{conn}.exec0(
-          "INSERT INTO " + Table + " VALUES (" + to_string(BoringYear) +
-          ", "
-          "'yawn')");
-        throw deliberate_error();
-      }),
-      deliberate_error,
-      "Did not get expected exception from failing transactor.");
-  }
-
-  std::pair<int, int> const After{
-    perform([&conn, &Table] { return count_events(conn, Table); })};
-
-  PQXX_CHECK_EQUAL(After.first, Before.first, "Event count changed.");
-  PQXX_CHECK_EQUAL(
-    After.second, Before.second,
-    "Event count for " + to_string(BoringYear) + " changed.");
-}
-
-
-PQXX_REGISTER_TEST(test_032);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test37.cxx b/ext/libpqxx-7.7.3/test/test37.cxx
deleted file mode 100644
index fe231d39b..000000000
--- a/ext/libpqxx-7.7.3/test/test37.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <pqxx/nontransaction>
-#include <pqxx/robusttransaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Verify abort behaviour of RobustTransaction.
-//
-// The program will attempt to add an entry to a table called "pqxxevents",
-// with a key column called "year"--and then abort the change.
-namespace
-{
-// Let's take a boring year that is not going to be in the "pqxxevents" table
-constexpr int BoringYear{1977};
-
-// Count events and specifically events occurring in Boring Year, leaving the
-// former count in the result pair's first member, and the latter in second.
-std::pair<int, int> count_events(connection &conn, std::string const &table)
-{
-  std::string const count_query{"SELECT count(*) FROM " + table};
-  nontransaction tx{conn};
-  return std::make_pair(
-    tx.query_value<int>(count_query),
-    tx.query_value<int>(count_query + " WHERE year=" + to_string(BoringYear)));
-}
-
-
-struct deliberate_error : std::exception
-{};
-
-
-void test_037()
-{
-  connection conn;
-  {
-    nontransaction tx{conn};
-    test::create_pqxxevents(tx);
-  }
-
-  std::string const Table{"pqxxevents"};
-
-  auto const Before{
-    perform([&conn, &Table] { return count_events(conn, Table); })};
-  PQXX_CHECK_EQUAL(
-    Before.second, 0,
-    "Already have event for " + to_string(BoringYear) + ", cannot test.");
-
-  {
-    quiet_errorhandler d(conn);
-    PQXX_CHECK_THROWS(
-      perform([&conn, &Table] {
-        robusttransaction<> tx{conn};
-        tx.exec0(
-          "INSERT INTO " + Table + " VALUES (" + to_string(BoringYear) +
-          ", "
-          "'yawn')");
-
-        throw deliberate_error();
-      }),
-      deliberate_error,
-      "Did not get expected exception from failing transactor.");
-  }
-
-  auto const After{
-    perform([&conn, &Table] { return count_events(conn, Table); })};
-
-  PQXX_CHECK_EQUAL(After.first, Before.first, "Number of events changed.");
-  PQXX_CHECK_EQUAL(
-    After.second, Before.second,
-    "Number of events for " + to_string(BoringYear) + " changed.");
-}
-
-
-PQXX_REGISTER_TEST(test_037);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test39.cxx b/ext/libpqxx-7.7.3/test/test39.cxx
deleted file mode 100644
index d26855811..000000000
--- a/ext/libpqxx-7.7.3/test/test39.cxx
+++ /dev/null
@@ -1,89 +0,0 @@
-#include <pqxx/nontransaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test: nontransaction changes are committed immediately.
-namespace
-{
-int BoringYear{1977};
-
-
-void test_039()
-{
-  connection conn;
-  nontransaction tx1{conn};
-  test::create_pqxxevents(tx1);
-  std::string const Table{"pqxxevents"};
-
-  // Verify our start condition before beginning: there must not be a 1977
-  // record already.
-  result R(tx1.exec(
-    "SELECT * FROM " + Table +
-    " "
-    "WHERE year=" +
-    to_string(BoringYear)));
-
-  PQXX_CHECK_EQUAL(
-    std::size(R), 0,
-    "Already have a row for " + to_string(BoringYear) + ", cannot test.");
-
-  // (Not needed, but verify that clear() works on empty containers)
-  R.clear();
-  PQXX_CHECK(std::empty(R), "Result is non-empty after clear().");
-
-  // OK.  Having laid that worry to rest, add a record for 1977.
-  tx1.exec0(
-    "INSERT INTO " + Table +
-    " VALUES"
-    "(" +
-    to_string(BoringYear) +
-    ","
-    "'Yawn'"
-    ")");
-
-  // Abort tx1.  Since tx1 is a nontransaction, which provides only the
-  // transaction class interface without providing any form of transactional
-  // integrity, this is not going to undo our work.
-  tx1.abort();
-
-  // Verify that our record was added, despite the Abort()
-  nontransaction tx2(conn, "tx2");
-  R = tx2.exec(
-    "SELECT * FROM " + Table +
-    " "
-    "WHERE year=" +
-    to_string(BoringYear));
-  PQXX_CHECK_EQUAL(std::size(R), 1, "Unexpected result size.");
-
-  PQXX_CHECK(R.capacity() >= std::size(R), "Result's capacity is too small.");
-
-  R.clear();
-  PQXX_CHECK(std::empty(R), "result::clear() is broken.");
-
-  // Now remove our record again
-  tx2.exec0(
-    "DELETE FROM " + Table +
-    " "
-    "WHERE year=" +
-    to_string(BoringYear));
-
-  tx2.commit();
-
-  // And again, verify results
-  nontransaction tx3(conn, "tx3");
-
-  R = tx3.exec(
-    "SELECT * FROM " + Table +
-    " "
-    "WHERE year=" +
-    to_string(BoringYear));
-
-  PQXX_CHECK_EQUAL(std::size(R), 0, "Record is not gone as expected.");
-}
-
-
-PQXX_REGISTER_TEST(test_039);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test46.cxx b/ext/libpqxx-7.7.3/test/test46.cxx
deleted file mode 100644
index 0fa88915a..000000000
--- a/ext/libpqxx-7.7.3/test/test46.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <cmath>
-#include <iostream>
-#include <sstream>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Streams test program for libpqxx.  Insert a result field into various
-// types of streams.
-namespace
-{
-void test_046()
-{
-  connection conn;
-  work tx{conn};
-
-  row R{tx.exec1("SELECT count(*) FROM pg_tables")};
-
-  // Read the value into a stringstream.
-  std::stringstream I;
-  I << R[0];
-
-  // Now convert the stringstream into a numeric type
-  long L{}, L2{};
-  I >> L;
-
-  R[0].to(L2);
-  PQXX_CHECK_EQUAL(L, L2, "Inconsistency between conversion methods.");
-
-  float F{}, F2{};
-  std::stringstream I2;
-  I2 << R[0];
-  I2 >> F;
-  R[0].to(F2);
-  PQXX_CHECK_BOUNDS(F2, F - 0.01, F + 0.01, "Bad floating-point result.");
-
-  auto F3{from_string<float>(R[0].c_str())};
-  PQXX_CHECK_BOUNDS(F3, F - 0.01, F + 0.01, "Bad float from from_string.");
-
-  auto D{from_string<double>(R[0].c_str())};
-  PQXX_CHECK_BOUNDS(D, F - 0.01, F + 0.01, "Bad double from from_string.");
-
-  auto LD{from_string<long double>(R[0].c_str())};
-  PQXX_CHECK_BOUNDS(
-    LD, F - 0.01, F + 0.01, "Bad long double from from_string.");
-
-  auto S{from_string<std::string>(R[0].c_str())},
-    S2{from_string<std::string>(std::string{R[0].c_str()})},
-    S3{from_string<std::string>(R[0])};
-
-  PQXX_CHECK_EQUAL(
-    S2, S,
-    "from_string(char const[], std::string &) "
-    "is inconsistent with "
-    "from_string(std::string const &, std::string &).");
-
-  PQXX_CHECK_EQUAL(
-    S3, S2,
-    "from_string(result::field const &, std::string &) "
-    "is inconsistent with "
-    "from_string(std::string const &, std::string &).");
-
-  PQXX_CHECK(tx.query_value<bool>("SELECT 1=1"), "1=1 doesn't yield 'true.'");
-
-  PQXX_CHECK(not tx.query_value<bool>("SELECT 2+2=5"), "2+2=5 yields 'true.'");
-}
-
-
-PQXX_REGISTER_TEST(test_046);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test56.cxx b/ext/libpqxx-7.7.3/test/test56.cxx
deleted file mode 100644
index 3aef757bb..000000000
--- a/ext/libpqxx-7.7.3/test/test56.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Simple test program for libpqxx.  Issue invalid query and handle error.
-namespace
-{
-void test_056()
-{
-  connection conn;
-  work tx{conn};
-  quiet_errorhandler d(conn);
-
-  PQXX_CHECK_THROWS(
-    tx.exec("DELIBERATELY INVALID TEST QUERY..."), sql_error,
-    "SQL syntax error did not raise expected exception.");
-}
-
-
-PQXX_REGISTER_TEST(test_056);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test60.cxx b/ext/libpqxx-7.7.3/test/test60.cxx
deleted file mode 100644
index a29ce9ff7..000000000
--- a/ext/libpqxx-7.7.3/test/test60.cxx
+++ /dev/null
@@ -1,85 +0,0 @@
-#include <iostream>
-
-#include <pqxx/nontransaction>
-#include <pqxx/pipeline>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Example program for libpqxx.  Test session variable functionality.
-namespace
-{
-std::string GetDatestyle(connection &conn)
-{
-  return conn.get_var("DATESTYLE");
-}
-
-
-std::string SetDatestyle(connection &conn, std::string style)
-{
-  conn.set_session_var("DATESTYLE", style);
-  std::string const fullname{GetDatestyle(conn)};
-  PQXX_CHECK(
-    not std::empty(fullname),
-    "Setting datestyle to " + style + " makes it an empty string.");
-
-  return fullname;
-}
-
-
-void CheckDatestyle(connection &conn, std::string expected)
-{
-  PQXX_CHECK_EQUAL(GetDatestyle(conn), expected, "Got wrong datestyle.");
-}
-
-
-void RedoDatestyle(
-  connection &conn, std::string const &style, std::string const &expected)
-{
-  PQXX_CHECK_EQUAL(
-    SetDatestyle(conn, style), expected, "Set wrong datestyle.");
-}
-
-
-void ActivationTest(
-  connection &conn, std::string const &style, std::string const &expected)
-{
-  RedoDatestyle(conn, style, expected);
-  CheckDatestyle(conn, expected);
-}
-
-
-void test_060()
-{
-  connection conn;
-
-  PQXX_CHECK(not std::empty(GetDatestyle(conn)), "Initial datestyle not set.");
-
-  std::string const ISOname{SetDatestyle(conn, "ISO")};
-  std::string const SQLname{SetDatestyle(conn, "SQL")};
-
-  PQXX_CHECK_NOT_EQUAL(ISOname, SQLname, "Same datestyle in SQL and ISO.");
-
-  RedoDatestyle(conn, "SQL", SQLname);
-
-  ActivationTest(conn, "ISO", ISOname);
-  ActivationTest(conn, "SQL", SQLname);
-
-  PQXX_CHECK_THROWS(
-    conn.set_session_var("bonjour_name", std::optional<std::string>{}),
-    pqxx::variable_set_to_null,
-    "Setting a variable to null did not report the error correctly.");
-
-  // Prove that setting an unknown variable causes an error, as expected
-  quiet_errorhandler d{conn};
-  PQXX_CHECK_THROWS(
-    conn.set_session_var("NONEXISTENT_VARIABLE_I_HOPE", 1), sql_error,
-    "Setting unknown variable failed to fail.");
-}
-
-
-PQXX_REGISTER_TEST(test_060);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test61.cxx b/ext/libpqxx-7.7.3/test/test61.cxx
deleted file mode 100644
index a9c871bdb..000000000
--- a/ext/libpqxx-7.7.3/test/test61.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <iostream>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Example program for libpqxx.  Test local variable functionality.
-namespace
-{
-std::string GetDatestyle(transaction_base &T)
-{
-  return T.conn().get_var("DATESTYLE");
-}
-
-
-std::string SetDatestyle(transaction_base &T, std::string style)
-{
-  T.conn().set_session_var("DATESTYLE", style);
-  std::string const fullname{GetDatestyle(T)};
-  PQXX_CHECK(
-    not std::empty(fullname),
-    "Setting datestyle to " + style + " makes it an empty string.");
-
-  return fullname;
-}
-
-
-void RedoDatestyle(
-  transaction_base &T, std::string const &style, std::string const &expected)
-{
-  PQXX_CHECK_EQUAL(SetDatestyle(T, style), expected, "Set wrong datestyle.");
-}
-
-
-void test_061()
-{
-  connection conn;
-  work tx{conn};
-
-  PQXX_CHECK(not std::empty(GetDatestyle(tx)), "Initial datestyle not set.");
-
-  std::string const ISOname{SetDatestyle(tx, "ISO")};
-  std::string const SQLname{SetDatestyle(tx, "SQL")};
-
-  PQXX_CHECK_NOT_EQUAL(ISOname, SQLname, "Same datestyle in SQL and ISO.");
-
-  RedoDatestyle(tx, "SQL", SQLname);
-
-  // Prove that setting an unknown variable causes an error, as expected
-  quiet_errorhandler d(tx.conn());
-  PQXX_CHECK_THROWS(
-    conn.set_session_var("NONEXISTENT_VARIABLE_I_HOPE", 1), sql_error,
-    "Setting unknown variable failed to fail.");
-}
-
-
-PQXX_REGISTER_TEST(test_061);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test62.cxx b/ext/libpqxx-7.7.3/test/test62.cxx
deleted file mode 100644
index d23e49e5a..000000000
--- a/ext/libpqxx-7.7.3/test/test62.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <cstring>
-#include <iostream>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-
-using namespace pqxx;
-
-
-// Example program for libpqxx.  Test binary string functionality.
-namespace
-{
-void test_062()
-{
-  connection conn;
-  work tx{conn};
-
-  std::string const TestStr{
-    "Nasty\n\030Test\n\t String with \200\277 weird bytes "
-    "\r\0 and Trailer\\\\\0"};
-
-  tx.exec0("CREATE TEMP TABLE pqxxbin (binfield bytea)");
-
-  std::string const Esc{tx.esc_raw(std::basic_string<std::byte>{
-    reinterpret_cast<std::byte const *>(std::data(TestStr)),
-    std::size(TestStr)})};
-
-  tx.exec0("INSERT INTO pqxxbin VALUES ('" + Esc + "')");
-
-  result R{tx.exec("SELECT * from pqxxbin")};
-  tx.exec0("DELETE FROM pqxxbin");
-
-  auto const B{R.at(0).at(0).as<std::basic_string<std::byte>>()};
-
-  PQXX_CHECK(not std::empty(B), "Binary string became empty in conversion.");
-
-  PQXX_CHECK_EQUAL(
-    std::size(B), std::size(TestStr), "Binary string was mangled.");
-
-  std::basic_string<std::byte>::const_iterator c;
-  std::basic_string<std::byte>::size_type i;
-  for (i = 0, c = std::begin(B); i < std::size(B); ++i, ++c)
-  {
-    PQXX_CHECK(c != std::end(B), "Premature end to binary string.");
-
-    char const x{TestStr.at(i)}, y{char(B.at(i))}, z{char(std::data(B)[i])};
-
-    PQXX_CHECK_EQUAL(
-      std::string(&x, 1), std::string(&y, 1), "Binary string byte changed.");
-
-    PQXX_CHECK_EQUAL(
-      std::string(&y, 1), std::string(&z, 1),
-      "Inconsistent byte at offset " + to_string(i) + ".");
-  }
-}
-
-
-PQXX_REGISTER_TEST(test_062);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test69.cxx b/ext/libpqxx-7.7.3/test/test69.cxx
deleted file mode 100644
index d15ff1489..000000000
--- a/ext/libpqxx-7.7.3/test/test69.cxx
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <iostream>
-
-#include <pqxx/pipeline>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Issue a query repeatedly through a pipeline, and
-// compare results.
-namespace
-{
-void TestPipeline(pipeline &P, int numqueries)
-{
-  std::string const Q{"SELECT 99"};
-
-  for (int i{numqueries}; i > 0; --i) P.insert(Q);
-
-  PQXX_CHECK(
-    (numqueries == 0) or not std::empty(P), "pipeline::empty() is broken.");
-
-  int res{0};
-  for (int i{numqueries}; i > 0; --i)
-  {
-    PQXX_CHECK(
-      not std::empty(P), "Got wrong number of queries from pipeline.");
-
-    auto R{P.retrieve()};
-
-    if (res != 0)
-      PQXX_CHECK_EQUAL(
-        R.second[0][0].as<int>(), res,
-        "Got unexpected result out of pipeline.");
-
-    res = R.second[0][0].as<int>();
-  }
-
-  PQXX_CHECK(std::empty(P), "Pipeline not empty after retrieval.");
-}
-
-
-void test_069()
-{
-  connection conn;
-  work tx{conn};
-  pipeline P(tx);
-  PQXX_CHECK(std::empty(P), "Pipeline is not empty initially.");
-  for (int i{0}; i < 5; ++i) TestPipeline(P, i);
-}
-
-
-PQXX_REGISTER_TEST(test_069);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/test70.cxx b/ext/libpqxx-7.7.3/test/test70.cxx
deleted file mode 100644
index 0f72089f1..000000000
--- a/ext/libpqxx-7.7.3/test/test70.cxx
+++ /dev/null
@@ -1,101 +0,0 @@
-#include <pqxx/pipeline>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-namespace
-{
-void TestPipeline(pipeline &P, int numqueries)
-{
-  std::string const Q{"SELECT * FROM generate_series(1, 10)"};
-  result const Empty;
-  PQXX_CHECK(std::empty(Empty), "Default-constructed result is not empty.");
-  PQXX_CHECK(
-    std::empty(Empty.query()), "Default-constructed result has query");
-
-  P.retain();
-  for (int i{numqueries}; i > 0; --i) P.insert(Q);
-  P.resume();
-
-  PQXX_CHECK(
-    (numqueries == 0) || not std::empty(P), "pipeline::empty() is broken.");
-
-  int res{0};
-  result Prev;
-  PQXX_CHECK_EQUAL(Prev, Empty, "Default-constructed results are not equal.");
-
-  for (int i{numqueries}; i > 0; --i)
-  {
-    PQXX_CHECK(not std::empty(P), "Got no results from pipeline.");
-
-    auto R{P.retrieve()};
-
-    PQXX_CHECK_NOT_EQUAL(R.second, Empty, "Got empty result.");
-    if (Prev != Empty)
-      PQXX_CHECK_EQUAL(R.second, Prev, "Results to same query are different.");
-
-    Prev = R.second;
-    PQXX_CHECK_EQUAL(Prev, R.second, "Assignment breaks result equality.");
-    PQXX_CHECK_EQUAL(R.second.query(), Q, "Result is for unexpected query.");
-
-    if (res != 0)
-      PQXX_CHECK_EQUAL(Prev[0][0].as<int>(), res, "Bad result from pipeline.");
-
-    res = Prev[0][0].as<int>();
-  }
-
-  PQXX_CHECK(std::empty(P), "Pipeline was not empty after retrieval.");
-}
-
-
-// Test program for libpqxx.  Issue a query repeatedly through a pipeline, and
-// compare results.  Use retain() and resume() for performance.
-void test_070()
-{
-  connection conn;
-  work tx{conn};
-  pipeline P(tx);
-
-  PQXX_CHECK(std::empty(P), "Pipeline is not empty initially.");
-
-  // Try to confuse the pipeline by feeding it a query and flushing
-  P.retain();
-  std::string const Q{"SELECT * FROM pg_tables"};
-  P.insert(Q);
-  P.flush();
-
-  PQXX_CHECK(std::empty(P), "Pipeline was not empty after flush().");
-
-  // See if complete() breaks retain() as it should
-  P.retain();
-  P.insert(Q);
-  PQXX_CHECK(not std::empty(P), "Pipeline was empty after insert().");
-  P.complete();
-  PQXX_CHECK(not std::empty(P), "complete() emptied pipeline.");
-
-  PQXX_CHECK_EQUAL(
-    P.retrieve().second.query(), Q, "Result is for wrong query.");
-
-  PQXX_CHECK(std::empty(P), "Pipeline not empty after retrieve().");
-
-  // See if retrieve() breaks retain() when it needs to
-  P.retain();
-  P.insert(Q);
-  PQXX_CHECK_EQUAL(
-    P.retrieve().second.query(), Q, "Got result for wrong query.");
-
-  // See if regular retain()/resume() works
-  for (int i{0}; i < 5; ++i) TestPipeline(P, i);
-
-  // See if retrieve() fails on an empty pipeline, as it should
-  quiet_errorhandler d(conn);
-  PQXX_CHECK_THROWS_EXCEPTION(
-    P.retrieve(), "Empty pipeline allows retrieve().");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_070);
diff --git a/ext/libpqxx-7.7.3/test/test71.cxx b/ext/libpqxx-7.7.3/test/test71.cxx
deleted file mode 100644
index e669d9ad5..000000000
--- a/ext/libpqxx-7.7.3/test/test71.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <iostream>
-#include <map>
-
-#include <pqxx/pipeline>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Issue queries through a pipeline, and retrieve
-// results both in-order and out-of-order.
-namespace
-{
-using Exp = std::map<pipeline::query_id, int>;
-
-template<typename PAIR> void checkresult(pipeline &P, PAIR c)
-{
-  result const r{P.retrieve(c.first)};
-  int const val{r.at(0).at(0).as(int(0))};
-  PQXX_CHECK_EQUAL(val, c.second, "Wrong result from pipeline.");
-}
-
-
-void test_071()
-{
-  connection conn;
-  work tx{conn};
-  pipeline P(tx);
-
-  // Keep expected result for every query we issue
-  Exp values;
-
-  // Insert queries returning various numbers.
-  for (int i{1}; i < 10; ++i) values[P.insert("SELECT " + to_string(i))] = i;
-
-  // Retrieve results in query_id order, and compare to expected values
-  for (auto &c : values) checkresult(P, c);
-
-  PQXX_CHECK(std::empty(P), "Pipeline was not empty retrieving all results.");
-
-  values.clear();
-
-  // Insert more queries returning various numbers
-  P.retain(20);
-  for (int i{100}; i > 90; --i) values[P.insert("SELECT " + to_string(i))] = i;
-
-  P.resume();
-
-  // Retrieve results in reverse order
-  for (auto c{std::rbegin(values)}; c != std::rend(values); ++c)
-    checkresult(P, *c);
-
-  values.clear();
-  P.retain(10);
-  for (int i{1010}; i > 1000; --i)
-    values[P.insert("SELECT " + to_string(i))] = i;
-  for (auto &c : values)
-  {
-    if (P.is_finished(c.first))
-      std::cout << "Query #" << c.first << " completed despite retain()"
-                << std::endl;
-  }
-
-  // See that all results are retrieved by complete()
-  P.complete();
-  for (auto &c : values)
-    PQXX_CHECK(P.is_finished(c.first), "Query not finished after complete().");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_071);
diff --git a/ext/libpqxx-7.7.3/test/test72.cxx b/ext/libpqxx-7.7.3/test/test72.cxx
deleted file mode 100644
index 716081ed7..000000000
--- a/ext/libpqxx-7.7.3/test/test72.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <iostream>
-
-#include <pqxx/pipeline>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Test error handling for pipeline.
-namespace
-{
-void test_072()
-{
-  connection conn;
-  work tx{conn};
-  pipeline P{tx};
-
-  // Ensure all queries are issued at once to make the test more interesting
-  P.retain();
-
-  // The middle query should fail; the surrounding two should succeed
-  auto const id_1{P.insert("SELECT 1")};
-  auto const id_f{P.insert("SELECT * FROM pg_nonexist")};
-  auto const id_2{P.insert("SELECT 2")};
-
-  // See that we can process the queries without stumbling over the error
-  P.complete();
-
-  // We should be able to get the first result, which preceeds the error
-  auto const res_1{P.retrieve(id_1).at(0).at(0).as<int>()};
-  PQXX_CHECK_EQUAL(res_1, 1, "Got wrong result from pipeline.");
-
-  // We should *not* get a result for the query behind the error
-  {
-    quiet_errorhandler d{conn};
-    PQXX_CHECK_THROWS(
-      P.retrieve(id_2).at(0).at(0).as<int>(), std::runtime_error,
-      "Pipeline wrongly resumed after SQL error.");
-  }
-
-  // Now see that we get an exception when we touch the failed result
-  {
-    quiet_errorhandler d{conn};
-    PQXX_CHECK_THROWS(
-      P.retrieve(id_f), sql_error, "Pipeline failed to register SQL error.");
-  }
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_072);
diff --git a/ext/libpqxx-7.7.3/test/test74.cxx b/ext/libpqxx-7.7.3/test/test74.cxx
deleted file mode 100644
index ff1abd993..000000000
--- a/ext/libpqxx-7.7.3/test/test74.cxx
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <cmath>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-using namespace pqxx;
-
-
-// Test program for libpqxx.  Test fieldstream.
-namespace
-{
-void test_074()
-{
-  connection conn;
-  work tx{conn};
-
-  result R{tx.exec("SELECT * FROM pg_tables")};
-  std::string const sval{R.at(0).at(1).c_str()};
-  std::string sval2;
-  fieldstream fs1(R.front()[1]);
-  fs1 >> sval2;
-  PQXX_CHECK_EQUAL(sval2, sval, "fieldstream returned wrong value.");
-
-  R = tx.exec("SELECT count(*) FROM pg_tables");
-  int ival;
-  fieldstream fs2(R.at(0).at(0));
-  fs2 >> ival;
-  PQXX_CHECK_EQUAL(
-    ival, R.front().front().as<int>(), "fieldstream::front() is broken.");
-
-  double dval;
-  (fieldstream(R.at(0).at(0))) >> dval;
-  PQXX_CHECK_BOUNDS(
-    dval, R[0][0].as<double>() - 0.1, R[0][0].as<double>() + 0.1,
-    "Got wrong double from fieldstream.");
-
-  auto const roughpi{static_cast<float>(3.1415926435)};
-  R = tx.exec("SELECT " + to_string(roughpi));
-  float pival;
-  (fieldstream(R.at(0).at(0))) >> pival;
-  PQXX_CHECK_BOUNDS(
-    pival, roughpi - 0.001, roughpi + 0.001,
-    "Pi approximation came back wrong from fieldstream.");
-
-  PQXX_CHECK_EQUAL(
-    to_string(R[0][0]), R[0][0].c_str(),
-    "to_string(result::field) is inconsistent with c_str().");
-
-  float float_pi;
-  from_string(to_string(roughpi), float_pi);
-  PQXX_CHECK_BOUNDS(
-    float_pi, roughpi - 0.00001, roughpi + 0.00001,
-    "Float changed in conversion.");
-
-  double double_pi;
-  pqxx::from_string(pqxx::to_string(static_cast<double>(roughpi)), double_pi);
-  PQXX_CHECK_BOUNDS(
-    double_pi, roughpi - 0.00001, roughpi + 0.00001,
-    "Double changed in conversion.");
-
-  long double const ld{roughpi};
-  long double long_double_pi;
-  from_string(to_string(ld), long_double_pi);
-  PQXX_CHECK_BOUNDS(
-    long_double_pi, roughpi - 0.00001, roughpi + 0.00001,
-    "long double changed in conversion.");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_074);
diff --git a/ext/libpqxx-7.7.3/test/test75.cxx b/ext/libpqxx-7.7.3/test/test75.cxx
deleted file mode 100644
index 07f00141e..000000000
--- a/ext/libpqxx-7.7.3/test/test75.cxx
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <iostream>
-#include <vector>
-
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-
-// Test program for libpqxx.  Compare const_reverse_iterator iteration of a
-// result to a regular, const_iterator iteration.
-namespace
-{
-void test_075()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  pqxx::test::create_pqxxevents(tx);
-  auto const R(tx.exec("SELECT year FROM pqxxevents"));
-  PQXX_CHECK(not std::empty(R), "No events found, cannot test.");
-
-  PQXX_CHECK_EQUAL(R[0], R.at(0), "Inconsistent result indexing.");
-  PQXX_CHECK(not(R[0] != R.at(0)), "result::row::operator!=() is broken.");
-
-  PQXX_CHECK_EQUAL(R[0][0], R[0].at(0), "Inconsistent row indexing.");
-  PQXX_CHECK(
-    not(R[0][0] != R[0].at(0)), "result::field::operator!=() is broken.");
-
-  std::vector<std::string> contents;
-  for (auto const &i : R) contents.push_back(i.at(0).as<std::string>());
-
-  PQXX_CHECK_EQUAL(
-    std::size(contents), std::vector<std::string>::size_type(std::size(R)),
-    "Number of values does not match result size.");
-
-  for (pqxx::result::size_type i{0}; i < std::size(R); ++i)
-    PQXX_CHECK_EQUAL(
-      contents[static_cast<std::size_t>(i)], R.at(i).at(0).c_str(),
-      "Inconsistent iteration.");
-
-  // Thorough test for result::const_reverse_iterator
-  pqxx::result::const_reverse_iterator ri1(std::rbegin(R)), ri2(ri1),
-    ri3(std::end(R));
-  ri2 = std::rbegin(R);
-
-  PQXX_CHECK(ri2 == ri1, "reverse_iterator copy constructor is broken.");
-  PQXX_CHECK(ri3 == ri2, "result::end() does not generate rbegin().");
-  PQXX_CHECK_EQUAL(
-    ri2 - ri3, 0,
-    "const_reverse_iterator is at nonzero distance from its own copy.");
-
-  PQXX_CHECK(ri2 == ri3 + 0, "reverse_iterator+0 gives strange result.");
-  PQXX_CHECK(ri2 == ri3 - 0, "reverse_iterator-0 gives strange result.");
-  PQXX_CHECK(not(ri3 < ri2), "operator<() breaks on equal reverse_iterators.");
-  PQXX_CHECK(ri2 <= ri3, "operator<=() breaks on equal reverse_iterators.");
-
-  PQXX_CHECK(ri3++ == ri2, "reverse_iterator post-increment is broken.");
-
-  PQXX_CHECK_EQUAL(ri3 - ri2, 1, "Wrong nonzero reverse_iterator distance.");
-  PQXX_CHECK(ri3 > ri2, "reverse_iterator operator>() is broken.");
-  PQXX_CHECK(ri3 >= ri2, "reverse_iterator operator>=() is broken.");
-  PQXX_CHECK(ri2 < ri3, "reverse_iterator operator<() is broken.");
-  PQXX_CHECK(ri2 <= ri3, "reverse_iterator operator<=() is broken.");
-  PQXX_CHECK(ri3 == ri2 + 1, "Adding int to reverse_iterator is broken.");
-  PQXX_CHECK(
-    ri2 == ri3 - 1, "Subtracting int from reverse_iterator is broken.");
-
-  PQXX_CHECK(ri3 == ++ri2, "reverse_iterator pre-increment is broken.");
-  PQXX_CHECK(ri3 >= ri2, "operator>=() breaks on equal reverse_iterators.");
-  PQXX_CHECK(ri3 >= ri2, "operator<=() breaks on equal reverse_iterators.");
-
-  PQXX_CHECK(
-    *ri3.base() == R.back(), "reverse_iterator does not arrive at back().");
-
-  PQXX_CHECK(
-    ri1->at(0) == (*ri1).at(0),
-    "reverse_iterator operator->() is inconsistent with operator*().");
-
-  PQXX_CHECK(ri2-- == ri3, "reverse_iterator post-decrement is broken.");
-  PQXX_CHECK(ri2 == --ri3, "reverse_iterator pre-decrement is broken.");
-  PQXX_CHECK(ri2 == std::rbegin(R), "reverse_iterator decrement is broken.");
-
-  ri2 += 1;
-  ri3 -= -1;
-
-  PQXX_CHECK(
-    ri2 != std::rbegin(R), "Adding to reverse_iterator does not work.");
-  PQXX_CHECK(
-    ri3 == ri2, "reverse_iterator operator-=() breaks on negative distances.");
-
-  ri2 -= 1;
-  PQXX_CHECK(
-    ri2 == std::rbegin(R),
-    "reverse_iterator operator+=() and operator-=() do not cancel out.");
-
-  // Now verify that reverse iterator also sees the same results...
-  auto l{std::rbegin(contents)};
-  for (auto i{std::rbegin(R)}; i != std::rend(R); ++i, ++l)
-    PQXX_CHECK_EQUAL(*l, i->at(0).c_str(), "Inconsistent reverse iteration.");
-
-  PQXX_CHECK(l == std::rend(contents), "Reverse iteration ended too soon.");
-
-  PQXX_CHECK(not std::empty(R), "No events found in table, cannot test.");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_075);
diff --git a/ext/libpqxx-7.7.3/test/test76.cxx b/ext/libpqxx-7.7.3/test/test76.cxx
deleted file mode 100644
index 122c0445c..000000000
--- a/ext/libpqxx-7.7.3/test/test76.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <pqxx/nontransaction>
-
-#include "test_helpers.hxx"
-
-// Simple test program for libpqxx.  Test string conversion routines.
-namespace
-{
-void test_076()
-{
-  pqxx::connection conn;
-  pqxx::nontransaction tx{conn};
-
-  auto RFalse{tx.exec1("SELECT 1=0")}, RTrue{tx.exec1("SELECT 1=1")};
-  auto False{pqxx::from_string<bool>(RFalse[0])},
-    True{pqxx::from_string<bool>(RTrue[0])};
-  PQXX_CHECK(not False, "False bool converted to true.");
-  PQXX_CHECK(True, "True bool converted to false.");
-
-  RFalse = tx.exec1("SELECT " + pqxx::to_string(False));
-  RTrue = tx.exec1("SELECT " + pqxx::to_string(True));
-  False = pqxx::from_string<bool>(RFalse[0]);
-  True = pqxx::from_string<bool>(RTrue[0]);
-  PQXX_CHECK(not False, "False bool converted to true.");
-  PQXX_CHECK(True, "True bool converted to false.");
-
-  short const svals[]{-1, 1, 999, -32767, -32768, 32767, 0};
-  for (int i{0}; svals[i] != 0; ++i)
-  {
-    auto s{pqxx::from_string<short>(pqxx::to_string(svals[i]))};
-    PQXX_CHECK_EQUAL(s, svals[i], "short/string conversion not bijective.");
-    s = pqxx::from_string<short>(
-      tx.exec1("SELECT " + pqxx::to_string(svals[i]))[0].c_str());
-    PQXX_CHECK_EQUAL(s, svals[i], "Roundtrip through backend changed short.");
-  }
-
-  unsigned short const uvals[]{1, 999, 32767, 32768, 65535, 0};
-  for (int i{0}; uvals[i] != 0; ++i)
-  {
-    auto u{pqxx::from_string<unsigned short>(pqxx::to_string(uvals[i]))};
-    PQXX_CHECK_EQUAL(
-      u, uvals[i], "unsigned short/string conversion not bijective.");
-
-    u = pqxx::from_string<unsigned short>(
-      tx.exec1("SELECT " + pqxx::to_string(uvals[i]))[0].c_str());
-    PQXX_CHECK_EQUAL(
-      u, uvals[i], "Roundtrip through backend changed unsigned short.");
-  }
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_076);
diff --git a/ext/libpqxx-7.7.3/test/test77.cxx b/ext/libpqxx-7.7.3/test/test77.cxx
deleted file mode 100644
index 88e83c26d..000000000
--- a/ext/libpqxx-7.7.3/test/test77.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <pqxx/nontransaction>
-
-#include "test_helpers.hxx"
-
-
-// Test program for libpqxx.  Test result::swap()
-namespace
-{
-void test_077()
-{
-  pqxx::connection conn;
-  pqxx::nontransaction tx{conn};
-
-  auto RFalse{tx.exec("SELECT 1=0")}, RTrue{tx.exec("SELECT 1=1")};
-  auto f{pqxx::from_string<bool>(RFalse[0][0])};
-  auto t{pqxx::from_string<bool>(RTrue[0][0])};
-  PQXX_CHECK(
-    not f and t, "Booleans converted incorrectly; can't trust this test.");
-
-  RFalse.swap(RTrue);
-  f = pqxx::from_string<bool>(RFalse[0][0]);
-  t = pqxx::from_string<bool>(RTrue[0][0]);
-  PQXX_CHECK(f and not t, "result::swap() is broken.");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_077);
diff --git a/ext/libpqxx-7.7.3/test/test78.cxx b/ext/libpqxx-7.7.3/test/test78.cxx
deleted file mode 100644
index f970cc926..000000000
--- a/ext/libpqxx-7.7.3/test/test78.cxx
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <cerrno>
-#include <cstring>
-#include <iostream>
-
-#include <pqxx/notification>
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-
-// Example program for libpqxx.  Send notification to self, using a
-// notification name with unusal characters, and without polling.
-namespace
-{
-// Sample implementation of notification receiver.
-class TestListener : public pqxx::notification_receiver
-{
-  bool m_done;
-
-public:
-  explicit TestListener(pqxx::connection &conn, std::string const &Name) :
-          pqxx::notification_receiver(conn, Name), m_done(false)
-  {}
-
-  void operator()(std::string const &, int be_pid) override
-  {
-    m_done = true;
-    PQXX_CHECK_EQUAL(
-      be_pid, conn().backendpid(),
-      "Got notification from wrong backend process.");
-
-    std::cout << "Received notification: " << channel() << " pid=" << be_pid
-              << std::endl;
-  }
-
-  bool done() const { return m_done; }
-};
-
-
-void test_078()
-{
-  pqxx::connection conn;
-
-  std::string const NotifName{"my listener"};
-  TestListener L{conn, NotifName};
-
-  pqxx::perform([&conn, &L] {
-    pqxx::work tx{conn};
-    tx.exec0("NOTIFY " + tx.quote_name(L.channel()));
-    tx.commit();
-  });
-
-  int notifs{0};
-  for (int i{0}; (i < 20) and not L.done(); ++i)
-  {
-    PQXX_CHECK_EQUAL(notifs, 0, "Got unexpected notifications.");
-    std::cout << ".";
-    notifs = conn.await_notification();
-  }
-  std::cout << std::endl;
-
-  PQXX_CHECK(L.done(), "No notification received.");
-  PQXX_CHECK_EQUAL(notifs, 1, "Got unexpected number of notifications.");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_078);
diff --git a/ext/libpqxx-7.7.3/test/test79.cxx b/ext/libpqxx-7.7.3/test/test79.cxx
deleted file mode 100644
index 761e5f3c3..000000000
--- a/ext/libpqxx-7.7.3/test/test79.cxx
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <cerrno>
-#include <cstring>
-#include <iostream>
-
-#include <pqxx/notification>
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-
-// Example program for libpqxx.  Test waiting for notification with timeout.
-namespace
-{
-// Sample implementation of notification receiver.
-class TestListener final : public pqxx::notification_receiver
-{
-  bool m_done;
-
-public:
-  explicit TestListener(pqxx::connection &conn, std::string const &Name) :
-          pqxx::notification_receiver(conn, Name), m_done(false)
-  {}
-
-  void operator()(std::string const &, int be_pid) override
-  {
-    m_done = true;
-    PQXX_CHECK_EQUAL(
-      be_pid, conn().backendpid(), "Notification came from wrong backend.");
-
-    std::cout << "Received notification: " << channel() << " pid=" << be_pid
-              << std::endl;
-  }
-
-  bool done() const { return m_done; }
-};
-
-
-void test_079()
-{
-  pqxx::connection conn;
-
-  std::string const NotifName{"mylistener"};
-  TestListener L(conn, NotifName);
-
-  // First see if the timeout really works: we're not expecting any notifs
-  int notifs{conn.await_notification(0, 1)};
-  PQXX_CHECK_EQUAL(notifs, 0, "Got unexpected notification.");
-
-  pqxx::perform([&conn, &L] {
-    pqxx::work tx{conn};
-    tx.exec0("NOTIFY " + L.channel());
-    tx.commit();
-  });
-
-  for (int i{0}; (i < 20) and not L.done(); ++i)
-  {
-    PQXX_CHECK_EQUAL(notifs, 0, "Got notifications, but no handler called.");
-    std::cout << ".";
-    notifs = conn.await_notification(1, 0);
-  }
-  std::cout << std::endl;
-
-  PQXX_CHECK(L.done(), "No notifications received.");
-  PQXX_CHECK_EQUAL(notifs, 1, "Got unexpected notifications.");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_079);
diff --git a/ext/libpqxx-7.7.3/test/test82.cxx b/ext/libpqxx-7.7.3/test/test82.cxx
deleted file mode 100644
index e7b2769c7..000000000
--- a/ext/libpqxx-7.7.3/test/test82.cxx
+++ /dev/null
@@ -1,154 +0,0 @@
-#include <iostream>
-
-#include <pqxx/nontransaction>
-
-#include "test_helpers.hxx"
-
-
-// Test program for libpqxx.  Read and print table using row iterators.
-namespace
-{
-void test_082()
-{
-  pqxx::connection conn;
-  pqxx::nontransaction tx{conn};
-
-  pqxx::test::create_pqxxevents(tx);
-  std::string const Table{"pqxxevents"};
-  pqxx::result R{tx.exec("SELECT * FROM " + Table)};
-
-  PQXX_CHECK(not std::empty(R), "Got empty result.");
-
-  std::string const nullstr("[null]");
-
-  for (auto const &r : R)
-  {
-    pqxx::row::const_iterator f2(r[0]);
-    for (auto const &f : r)
-    {
-      PQXX_CHECK_EQUAL(
-        (*f2).as(nullstr), f.as(nullstr), "Inconsistent iteration result.");
-      ++f2;
-    }
-
-    PQXX_CHECK(
-      std::begin(r) + pqxx::row::difference_type(std::size(r)) == std::end(r),
-      "Row end() appears to be in the wrong place.");
-    PQXX_CHECK(
-      pqxx::row::difference_type(std::size(r)) + std::begin(r) == std::end(r),
-      "Row iterator addition is not commutative.");
-    PQXX_CHECK_EQUAL(
-      std::begin(r)->num(), 0, "Wrong column number at begin().");
-
-    pqxx::row::const_iterator f3(r[std::size(r)]);
-
-    PQXX_CHECK(f3 == std::end(r), "Did not get end() at end of row.");
-
-    PQXX_CHECK(
-      f3 > std::begin(r), "Row end() appears to precede its begin().");
-
-    PQXX_CHECK(
-      f3 >= std::end(r) and std::begin(r) < f3,
-      "Row iterator operator<() is broken.");
-
-    PQXX_CHECK(f3 > std::begin(r), "Row end() not greater than begin().");
-
-    pqxx::row::const_iterator f4{r, std::size(r)};
-    PQXX_CHECK(f4 == f3, "Row iterator constructor with offset is broken.");
-
-    --f3;
-    f4 -= 1;
-
-    PQXX_CHECK(f3 < std::end(r), "Last field in row is not before end().");
-    PQXX_CHECK(f3 >= std::begin(r), "Last field in row precedes begin().");
-    PQXX_CHECK(
-      f3 == std::end(r) - 1, "Back from end() doese not yield end()-1.");
-    PQXX_CHECK_EQUAL(
-      std::end(r) - f3, 1, "Wrong distance from last row to end().");
-
-    PQXX_CHECK(f4 == f3, "Row iterator operator-=() is broken.");
-    f4 += 1;
-    PQXX_CHECK(f4 == std::end(r), "Row iterator operator+=() is broken.");
-
-    for (auto fr = std::rbegin(r); fr != std::rend(r); ++fr, --f3)
-      PQXX_CHECK_EQUAL(
-        *fr, *f3,
-        "Reverse traversal is not consistent with forward traversal.");
-  }
-
-  // Thorough test for row::const_reverse_iterator
-  pqxx::row::const_reverse_iterator ri1(std::rbegin(R.front())), ri2(ri1),
-    ri3(std::end(R.front()));
-  ri2 = std::rbegin(R.front());
-
-  PQXX_CHECK(
-    ri1 == ri2, "Copy-constructed reverse_iterator is not equal to original.");
-
-  PQXX_CHECK(ri2 == ri3, "result::end() does not generate rbegin().");
-  PQXX_CHECK_EQUAL(
-    ri2 - ri3, 0,
-    "Distance between identical const_reverse_iterators was nonzero.");
-
-  PQXX_CHECK(
-    pqxx::row::const_reverse_iterator(ri1.base()) == ri1,
-    "Back-conversion of reverse_iterator base() fails.");
-
-  PQXX_CHECK(ri2 == ri3 + 0, "reverse_iterator+0 gives strange result.");
-  PQXX_CHECK(ri2 == ri3 - 0, "reverse_iterator-0 gives strange result.");
-
-  PQXX_CHECK(
-    not(ri3 < ri2),
-    "reverse_iterator operator<() breaks on identical iterators.");
-  PQXX_CHECK(
-    ri2 <= ri3,
-    "reverse_iterator operator<=() breaks on identical iterators.");
-  PQXX_CHECK(ri3++ == ri2, "reverse_iterator post-increment is broken.");
-
-  PQXX_CHECK_EQUAL(ri3 - ri2, 1, "Wrong reverse_iterator distance.");
-  PQXX_CHECK(ri3 > ri2, "reverse_iterator operator>() is broken.");
-  PQXX_CHECK(ri3 >= ri2, "reverse_iterator operator>=() is broken.");
-  PQXX_CHECK(ri2 < ri3, "reverse_iterator operator<() is broken.");
-  PQXX_CHECK(ri2 <= ri3, "reverse_iterator operator<=() is broken.");
-  PQXX_CHECK(ri3 == ri2 + 1, "Adding number to reverse_iterator goes wrong.");
-  PQXX_CHECK(ri2 == ri3 - 1, "Subtracting from reverse_iterator goes wrong.");
-
-  PQXX_CHECK(
-    ri3 == ++ri2, "reverse_iterator pre-incremen returns wrong result.");
-
-  PQXX_CHECK(
-    ri3 >= ri2, "reverse_iterator operator>=() breaks on equal iterators.");
-  PQXX_CHECK(
-    ri3 >= ri2, "reverse_iterator operator<=() breaks on equal iterators.");
-  PQXX_CHECK(
-    *ri3.base() == R.front().back(),
-    "reverse_iterator does not arrive at back().");
-  PQXX_CHECK(
-    ri1->c_str()[0] == (*ri1).c_str()[0],
-    "reverse_iterator operator->() is inconsistent with operator*().");
-  PQXX_CHECK(
-    ri2-- == ri3, "reverse_iterator post-decrement returns wrong result.");
-  PQXX_CHECK(
-    ri2 == --ri3, "reverse_iterator pre-increment returns wrong result.");
-  PQXX_CHECK(
-    ri2 == std::rbegin(R.front()),
-    "Moving iterator back and forth doesn't get it back to origin.");
-
-  ri2 += 1;
-  ri3 -= -1;
-
-  PQXX_CHECK(
-    ri2 != std::rbegin(R.front()), "Adding to reverse_iterator doesn't work.");
-  PQXX_CHECK(
-    ri2 != std::rbegin(R.front()), "Adding to reverse_iterator doesn't work.");
-  PQXX_CHECK(
-    ri3 == ri2, "reverse_iterator operator-=() breaks on negative numbers.");
-
-  ri2 -= 1;
-  PQXX_CHECK(
-    ri2 == std::rbegin(R.front()),
-    "reverse_iterator operator+=() and operator-=() do not cancel out");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_082);
diff --git a/ext/libpqxx-7.7.3/test/test84.cxx b/ext/libpqxx-7.7.3/test/test84.cxx
deleted file mode 100644
index d35dc521b..000000000
--- a/ext/libpqxx-7.7.3/test/test84.cxx
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <algorithm>
-#include <cstdio>
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <pqxx/cursor>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-
-// "Adopted SQL Cursor" test program for libpqxx.  Create SQL cursor, wrap it
-// in a cursor stream, then use it to fetch data and check for consistent
-// results. Compare results against an icursor_iterator so that is tested as
-// well.
-namespace
-{
-void test_084()
-{
-  pqxx::connection conn;
-  pqxx::transaction<pqxx::serializable> tx{conn};
-
-  std::string const Table{"pg_tables"}, Key{"tablename"};
-
-  // Count rows.
-  pqxx::result R(tx.exec("SELECT count(*) FROM " + Table));
-
-  PQXX_CHECK(
-    R.at(0).at(0).as<long>() > 20,
-    "Not enough rows in " + Table + ", cannot test.");
-
-  // Create an SQL cursor and, for good measure, muddle up its state a bit.
-  std::string const CurName{"MYCUR"},
-    Query{"SELECT * FROM " + Table + " ORDER BY " + Key};
-  constexpr int InitialSkip{2}, GetRows{3};
-
-  tx.exec0("DECLARE " + tx.quote_name(CurName) + " CURSOR FOR " + Query);
-  tx.exec0(
-    "MOVE " + pqxx::to_string(InitialSkip * GetRows) +
-    " "
-    "IN " +
-    tx.quote_name(CurName));
-
-  // Wrap cursor in cursor stream.  Apply some trickery to get its name inside
-  // a result field for this purpose.  This isn't easy because it's not
-  // supposed to be easy; normally we'd only construct streams around existing
-  // SQL cursors if they were being returned by functions.
-  pqxx::icursorstream C{
-    tx, tx.exec("SELECT '" + tx.esc(CurName) + "'")[0][0], GetRows};
-
-  // Create parallel cursor to check results
-  pqxx::icursorstream C2{tx, Query, "CHECKCUR", GetRows};
-  pqxx::icursor_iterator i2{C2};
-
-  // Remember, our adopted cursor is at position (InitialSkip*GetRows)
-  pqxx::icursor_iterator i3(i2);
-
-  PQXX_CHECK(
-    (i3 == i2) and not(i3 != i2),
-    "Equality on copy-constructed icursor_iterator is broken.");
-  PQXX_CHECK(
-    not(i3 > i2) and not(i3 < i2) and (i3 <= i2) and (i3 >= i2),
-    "Comparison on identical icursor_iterators is broken.");
-
-  i3 += InitialSkip;
-
-  PQXX_CHECK(not(i3 <= i2), "icursor_iterator operator<=() is broken.");
-
-  pqxx::icursor_iterator iend, i4;
-  PQXX_CHECK(i3 != iend, "Early end to icursor_iterator iteration.");
-  i4 = iend;
-  PQXX_CHECK(i4 == iend, "Assigning empty icursor_iterator fails.");
-
-  // Now start testing our new Cursor.
-  C >> R;
-  i2 = i3;
-  pqxx::result R2(*i2++);
-
-  PQXX_CHECK_EQUAL(
-    std::size(R), static_cast<pqxx::result::size_type>(GetRows),
-    "Got unexpected number of rows.");
-
-  PQXX_CHECK_EQUAL(R, R2, "Unexpected result at [1]");
-
-  C.get(R);
-  R2 = *i2;
-  PQXX_CHECK_EQUAL(R, R2, "Unexpected result at [2]");
-  i2 += 1;
-
-  C.ignore(GetRows);
-  C.get(R);
-  R2 = *++i2;
-
-  PQXX_CHECK_EQUAL(R, R2, "Unexpected result at [3]");
-
-  ++i2;
-  R2 = *i2++;
-  for (int i{1}; C.get(R) and i2 != iend; R2 = *i2++, ++i)
-    PQXX_CHECK_EQUAL(
-      R, R2, "Unexpected result in iteration at " + pqxx::to_string(i));
-
-  PQXX_CHECK(i2 == iend, "Adopted cursor terminated early.");
-  PQXX_CHECK(not(C >> R), "icursor_iterator terminated early.");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_084);
diff --git a/ext/libpqxx-7.7.3/test/test87.cxx b/ext/libpqxx-7.7.3/test/test87.cxx
deleted file mode 100644
index 3a9a58b16..000000000
--- a/ext/libpqxx-7.7.3/test/test87.cxx
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "pqxx/config-public-compiler.h"
-#include <cctype>
-#include <cerrno>
-#include <cstring>
-#include <ctime>
-#include <iostream>
-
-#include <pqxx/internal/header-pre.hxx>
-
-#include <pqxx/internal/wait.hxx>
-
-#include <pqxx/internal/header-post.hxx>
-
-#include <pqxx/notification>
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "test_helpers.hxx"
-
-
-// Test program for libpqxx.  Send notification to self, and wait on the
-// socket's connection for it to come in.  In a simple situation you'd use
-// connection::await_notification() for this, but that won't let you wait for
-// multiple sockets.
-namespace
-{
-// Sample implementation of notification receiver.
-class TestListener final : public pqxx::notification_receiver
-{
-  bool m_done;
-
-public:
-  explicit TestListener(pqxx::connection &conn, std::string Name) :
-          pqxx::notification_receiver(conn, Name), m_done(false)
-  {}
-
-  void operator()(std::string const &, int be_pid) override
-  {
-    m_done = true;
-    PQXX_CHECK_EQUAL(
-      be_pid, conn().backendpid(),
-      "Notification came from wrong backend process.");
-
-    std::cout << "Received notification: " << channel() << " pid=" << be_pid
-              << std::endl;
-  }
-
-  bool done() const { return m_done; }
-};
-
-
-void test_087()
-{
-  pqxx::connection conn;
-
-  std::string const NotifName{"my notification"};
-  TestListener L{conn, NotifName};
-
-  pqxx::perform([&conn, &L] {
-    pqxx::work tx{conn};
-    tx.exec0("NOTIFY " + tx.quote_name(L.channel()));
-    tx.commit();
-  });
-
-  int notifs{0};
-  for (int i{0}; (i < 20) and not L.done(); ++i)
-  {
-    PQXX_CHECK_EQUAL(notifs, 0, "Got unexpected notifications.");
-
-    std::cout << ".";
-
-    pqxx::internal::wait_fd(conn.sock(), true, false);
-    notifs = conn.get_notifs();
-  }
-  std::cout << std::endl;
-
-  PQXX_CHECK(L.done(), "No notification received.");
-  PQXX_CHECK_EQUAL(notifs, 1, "Got unexpected number of notifications.");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_087);
diff --git a/ext/libpqxx-7.7.3/test/test88.cxx b/ext/libpqxx-7.7.3/test/test88.cxx
deleted file mode 100644
index d5deaea75..000000000
--- a/ext/libpqxx-7.7.3/test/test88.cxx
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <iostream>
-
-#include <pqxx/subtransaction>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-
-// Test program for libpqxx.  Attempt to perform nested transactions.
-namespace
-{
-void test_088()
-{
-  pqxx::connection conn;
-
-  pqxx::work tx0{conn};
-  pqxx::test::create_pqxxevents(tx0);
-
-  // Trivial test: create subtransactions, and commit/abort
-  std::cout << tx0.exec1("SELECT 'tx0 starts'")[0].c_str() << std::endl;
-
-  pqxx::subtransaction T0a(static_cast<pqxx::dbtransaction &>(tx0), "T0a");
-  T0a.commit();
-
-  pqxx::subtransaction T0b(static_cast<pqxx::dbtransaction &>(tx0), "T0b");
-  T0b.abort();
-  std::cout << tx0.exec1("SELECT 'tx0 ends'")[0].c_str() << std::endl;
-  tx0.commit();
-
-  // Basic functionality: perform query in subtransaction; abort, continue
-  pqxx::work tx1{conn, "tx1"};
-  std::cout << tx1.exec1("SELECT 'tx1 starts'")[0].c_str() << std::endl;
-  pqxx::subtransaction tx1a{tx1, "tx1a"};
-  std::cout << tx1a.exec1("SELECT '  a'")[0].c_str() << std::endl;
-  tx1a.commit();
-  pqxx::subtransaction tx1b{tx1, "tx1b"};
-  std::cout << tx1b.exec1("SELECT '  b'")[0].c_str() << std::endl;
-  tx1b.abort();
-  pqxx::subtransaction tx1c{tx1, "tx1c"};
-  std::cout << tx1c.exec1("SELECT '  c'")[0].c_str() << std::endl;
-  tx1c.commit();
-  std::cout << tx1.exec1("SELECT 'tx1 ends'")[0].c_str() << std::endl;
-  tx1.commit();
-
-  // Commit/rollback functionality
-  pqxx::work tx2{conn, "tx2"};
-  std::string const Table{"test088"};
-  tx2.exec0("CREATE TEMP TABLE " + Table + "(no INTEGER, text VARCHAR)");
-
-  tx2.exec0("INSERT INTO " + Table + " VALUES(1,'tx2')");
-
-  pqxx::subtransaction tx2a{tx2, "tx2a"};
-  tx2a.exec0("INSERT INTO " + Table + " VALUES(2,'tx2a')");
-  tx2a.commit();
-  pqxx::subtransaction tx2b{tx2, "tx2b"};
-  tx2b.exec0("INSERT INTO " + Table + " VALUES(3,'tx2b')");
-  tx2b.abort();
-  pqxx::subtransaction tx2c{tx2, "tx2c"};
-  tx2c.exec0("INSERT INTO " + Table + " VALUES(4,'tx2c')");
-  tx2c.commit();
-  auto const R{tx2.exec("SELECT * FROM " + Table + " ORDER BY no")};
-  for (auto const &i : R)
-    std::cout << '\t' << i[0].c_str() << '\t' << i[1].c_str() << std::endl;
-
-  PQXX_CHECK_EQUAL(std::size(R), 3, "Wrong number of results.");
-
-  int expected[3]{1, 2, 4};
-  for (pqxx::result::size_type n{0}; n < std::size(R); ++n)
-    PQXX_CHECK_EQUAL(
-      R[n][0].as<int>(), expected[n], "Hit unexpected row number.");
-
-  tx2.abort();
-
-  // Auto-abort should only roll back the subtransaction.
-  pqxx::work tx3{conn, "tx3"};
-  pqxx::subtransaction tx3a(tx3, "tx3a");
-  PQXX_CHECK_THROWS(
-    tx3a.exec("SELECT * FROM nonexistent_table WHERE nonattribute=0"),
-    pqxx::sql_error, "Bogus query did not fail.");
-
-  // Subtransaction can only be aborted now, because there was an error.
-  tx3a.abort();
-  // We're back in our top-level transaction.  This did not abort.
-  tx3.exec1("SELECT count(*) FROM pqxxevents");
-  // Make sure we can commit exactly one more level of transaction.
-  tx3.commit();
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_088);
diff --git a/ext/libpqxx-7.7.3/test/test89.cxx b/ext/libpqxx-7.7.3/test/test89.cxx
deleted file mode 100644
index 2b96dfcd2..000000000
--- a/ext/libpqxx-7.7.3/test/test89.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <iostream>
-
-#include <pqxx/subtransaction>
-#include <pqxx/transaction>
-
-#include "test_helpers.hxx"
-
-// Test program for libpqxx.  Attempt to perform nested queries on various
-// types of connections.
-namespace
-{
-void test_089()
-{
-  pqxx::connection C;
-
-  // Trivial test: create subtransactions, and commit/abort
-  pqxx::work T0(C, "T0");
-  T0.exec1("SELECT 'T0 starts'");
-  pqxx::subtransaction T0a(T0, "T0a");
-  T0a.commit();
-  pqxx::subtransaction T0b(T0, "T0b");
-  T0b.abort();
-  T0.exec1("SELECT 'T0 ends'");
-  T0.commit();
-
-  // Basic functionality: perform query in subtransaction; abort, continue
-  pqxx::work T1(C, "T1");
-  T1.exec1("SELECT 'T1 starts'");
-  pqxx::subtransaction T1a(T1, "T1a");
-  T1a.exec1("SELECT '  a'");
-  T1a.commit();
-  pqxx::subtransaction T1b(T1, "T1b");
-  T1b.exec1("SELECT '  b'");
-  T1b.abort();
-  pqxx::subtransaction T1c(T1, "T1c");
-  T1c.exec1("SELECT '  c'");
-  T1c.commit();
-  T1.exec1("SELECT 'T1 ends'");
-  T1.commit();
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_089);
diff --git a/ext/libpqxx-7.7.3/test/test90.cxx b/ext/libpqxx-7.7.3/test/test90.cxx
deleted file mode 100644
index d7d97f9f3..000000000
--- a/ext/libpqxx-7.7.3/test/test90.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <pqxx/connection>
-
-#include "test_helpers.hxx"
-
-// Test program for libpqxx.  Test adorn_name.
-
-namespace
-{
-void test_090()
-{
-  pqxx::connection conn;
-
-  // Test connection's adorn_name() function for uniqueness
-  std::string const nametest{"basename"};
-
-  PQXX_CHECK_NOT_EQUAL(
-    conn.adorn_name(nametest), conn.adorn_name(nametest),
-    "\"Unique\" names are not unique.");
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_090);
diff --git a/ext/libpqxx-7.7.3/test/test_helpers.hxx b/ext/libpqxx-7.7.3/test/test_helpers.hxx
deleted file mode 100644
index 6db3ab971..000000000
--- a/ext/libpqxx-7.7.3/test/test_helpers.hxx
+++ /dev/null
@@ -1,305 +0,0 @@
-#include <stdexcept>
-#include <string>
-
-#include <pqxx/result>
-#include <pqxx/row>
-
-namespace pqxx
-{
-namespace test
-{
-class test_failure : public std::logic_error
-{
-  std::string const m_file;
-  int m_line;
-
-public:
-  test_failure(std::string const &ffile, int fline, std::string const &desc);
-
-  ~test_failure() noexcept override;
-
-  std::string const &file() const noexcept { return m_file; }
-  int line() const noexcept { return m_line; }
-};
-
-
-/// Drop a table, if it exists.
-void drop_table(transaction_base &, std::string const &table);
-
-
-using testfunc = void (*)();
-
-
-void register_test(char const name[], testfunc func);
-
-
-/// Register a test while not inside a function.
-struct registrar
-{
-  registrar(char const name[], testfunc func)
-  {
-    pqxx::test::register_test(name, func);
-  }
-};
-
-
-// Register a test function, so the runner will run it.
-#define PQXX_REGISTER_TEST(func)                                              \
-  pqxx::test::registrar tst_##func { #func, func }
-
-
-// Unconditional test failure.
-#define PQXX_CHECK_NOTREACHED(desc)                                           \
-  pqxx::test::check_notreached(__FILE__, __LINE__, (desc))
-[[noreturn]] void
-check_notreached(char const file[], int line, std::string desc);
-
-// Verify that a condition is met, similar to assert()
-#define PQXX_CHECK(condition, desc)                                           \
-  pqxx::test::check(__FILE__, __LINE__, (condition), #condition, (desc))
-void check(
-  char const file[], int line, bool condition, char const text[],
-  std::string const &desc);
-
-// Verify that variable has the expected value.
-#define PQXX_CHECK_EQUAL(actual, expected, desc)                              \
-  pqxx::test::check_equal(                                                    \
-    __FILE__, __LINE__, (actual), #actual, (expected), #expected, (desc))
-template<typename ACTUAL, typename EXPECTED>
-inline void check_equal(
-  char const file[], int line, ACTUAL actual, char const actual_text[],
-  EXPECTED expected, char const expected_text[], std::string const &desc)
-{
-  if (expected == actual)
-    return;
-  std::string const fulldesc = desc + " (" + actual_text + " <> " +
-                               expected_text +
-                               ": "
-                               "actual=" +
-                               to_string(actual) +
-                               ", "
-                               "expected=" +
-                               to_string(expected) + ")";
-  throw test_failure(file, line, fulldesc);
-}
-
-// Verify that two values are not equal.
-#define PQXX_CHECK_NOT_EQUAL(value1, value2, desc)                            \
-  pqxx::test::check_not_equal(                                                \
-    __FILE__, __LINE__, (value1), #value1, (value2), #value2, (desc))
-template<typename VALUE1, typename VALUE2>
-inline void check_not_equal(
-  char const file[], int line, VALUE1 value1, char const text1[],
-  VALUE2 value2, char const text2[], std::string const &desc)
-{
-  if (value1 != value2)
-    return;
-  std::string const fulldesc = desc + " (" + text1 + " == " + text2 +
-                               ": "
-                               "both are " +
-                               to_string(value2) + ")";
-  throw test_failure(file, line, fulldesc);
-}
-
-
-// Verify that value1 is less than value2.
-#define PQXX_CHECK_LESS(value1, value2, desc)                                 \
-  pqxx::test::check_less(                                                     \
-    __FILE__, __LINE__, (value1), #value1, (value2), #value2, (desc))
-// Verify that value1 is greater than value2.
-#define PQXX_CHECK_GREATER(value2, value1, desc)                              \
-  pqxx::test::check_less(                                                     \
-    __FILE__, __LINE__, (value1), #value1, (value2), #value2, (desc))
-template<typename VALUE1, typename VALUE2>
-inline void check_less(
-  char const file[], int line, VALUE1 value1, char const text1[],
-  VALUE2 value2, char const text2[], std::string const &desc)
-{
-  if (value1 < value2)
-    return;
-  std::string const fulldesc = desc + " (" + text1 + " >= " + text2 +
-                               ": "
-                               "\"lower\"=" +
-                               to_string(value1) +
-                               ", "
-                               "\"upper\"=" +
-                               to_string(value2) + ")";
-  throw test_failure(file, line, fulldesc);
-}
-
-
-// Verify that value1 is less than or equal to value2.
-#define PQXX_CHECK_LESS_EQUAL(value1, value2, desc)                           \
-  pqxx::test::check_less_equal(                                               \
-    __FILE__, __LINE__, (value1), #value1, (value2), #value2, (desc))
-// Verify that value1 is greater than or equal to value2.
-#define PQXX_CHECK_GREATER_EQUAL(value2, value1, desc)                        \
-  pqxx::test::check_less_equal(                                               \
-    __FILE__, __LINE__, (value1), #value1, (value2), #value2, (desc))
-template<typename VALUE1, typename VALUE2>
-inline void check_less_equal(
-  char const file[], int line, VALUE1 value1, char const text1[],
-  VALUE2 value2, char const text2[], std::string const &desc)
-{
-  if (value1 <= value2)
-    return;
-  std::string const fulldesc = desc + " (" + text1 + " > " + text2 +
-                               ": "
-                               "\"lower\"=" +
-                               to_string(value1) +
-                               ", "
-                               "\"upper\"=" +
-                               to_string(value2) + ")";
-  throw test_failure(file, line, fulldesc);
-}
-
-
-struct failure_to_fail
-{};
-
-
-namespace internal
-{
-/// Syntactic placeholder: require (and accept) semicolon after block.
-inline void end_of_statement() {}
-} // namespace internal
-
-
-// Verify that "action" does not throw an exception.
-#define PQXX_CHECK_SUCCEEDS(action, desc)                                     \
-  {                                                                           \
-    try                                                                       \
-    {                                                                         \
-      action;                                                                 \
-    }                                                                         \
-    catch (std::exception const &e)                                           \
-    {                                                                         \
-      PQXX_CHECK_NOTREACHED(                                                  \
-        std::string{desc} + " - \"" +                                         \
-        #action "\" threw exception: " + e.what());                           \
-    }                                                                         \
-    catch (...)                                                               \
-    {                                                                         \
-      PQXX_CHECK_NOTREACHED(                                                  \
-        std::string{desc} + " - \"" + #action "\" threw a non-exception!");   \
-    }                                                                         \
-  }                                                                           \
-  pqxx::test::internal::end_of_statement()
-
-// Verify that "action" throws an exception, of any std::exception-based type.
-#define PQXX_CHECK_THROWS_EXCEPTION(action, desc)                             \
-  {                                                                           \
-    try                                                                       \
-    {                                                                         \
-      action;                                                                 \
-      throw pqxx::test::failure_to_fail();                                    \
-    }                                                                         \
-    catch (pqxx::test::failure_to_fail const &)                               \
-    {                                                                         \
-      PQXX_CHECK_NOTREACHED(                                                  \
-        std::string{desc} + " (\"" #action "\" did not throw)");              \
-    }                                                                         \
-    catch (std::exception const &)                                            \
-    {}                                                                        \
-    catch (...)                                                               \
-    {                                                                         \
-      PQXX_CHECK_NOTREACHED(                                                  \
-        std::string{desc} + " (\"" #action "\" threw non-exception type)");   \
-    }                                                                         \
-  }                                                                           \
-  pqxx::test::internal::end_of_statement()
-
-// Verify that "action" throws "exception_type" (which is not std::exception).
-#define PQXX_CHECK_THROWS(action, exception_type, desc)                       \
-  {                                                                           \
-    try                                                                       \
-    {                                                                         \
-      action;                                                                 \
-      throw pqxx::test::failure_to_fail();                                    \
-    }                                                                         \
-    catch (pqxx::test::failure_to_fail const &)                               \
-    {                                                                         \
-      PQXX_CHECK_NOTREACHED(                                                  \
-        std::string{desc} + " (\"" #action                                    \
-                            "\" did not throw " #exception_type ")");         \
-    }                                                                         \
-    catch (exception_type const &)                                            \
-    {}                                                                        \
-    catch (std::exception const &e)                                           \
-    {                                                                         \
-      PQXX_CHECK_NOTREACHED(                                                  \
-        std::string{desc} +                                                   \
-        " (\"" #action                                                        \
-        "\" "                                                                 \
-        "threw exception other than " #exception_type ": " +                  \
-        e.what() + ")");                                                      \
-    }                                                                         \
-    catch (...)                                                               \
-    {                                                                         \
-      PQXX_CHECK_NOTREACHED(                                                  \
-        std::string{desc} + " (\"" #action "\" threw non-exception type)");   \
-    }                                                                         \
-  }                                                                           \
-  pqxx::test::internal::end_of_statement()
-
-#define PQXX_CHECK_BOUNDS(value, lower, upper, desc)                          \
-  pqxx::test::check_bounds(                                                   \
-    __FILE__, __LINE__, (value), #value, (lower), #lower, (upper), #upper,    \
-    (desc))
-template<typename VALUE, typename LOWER, typename UPPER>
-inline void check_bounds(
-  char const file[], int line, VALUE value, char const text[], LOWER lower,
-  char const lower_text[], UPPER upper, char const upper_text[],
-  std::string const &desc)
-{
-  std::string const range_check = std::string{lower_text} + " < " + upper_text,
-                    lower_check =
-                      std::string{"!("} + text + " < " + lower_text + ")",
-                    upper_check = std::string{text} + " < " + upper_text;
-
-  pqxx::test::check(
-    file, line, lower < upper, range_check.c_str(),
-    desc + " (acceptable range is empty; value was " + text + ")");
-  pqxx::test::check(
-    file, line, not(value < lower), lower_check.c_str(),
-    desc + " (" + text + " is below lower bound " + lower_text + ")");
-  pqxx::test::check(
-    file, line, value < upper, upper_check.c_str(),
-    desc + " (" + text + " is not below upper bound " + upper_text + ")");
-}
-
-
-// Report expected exception
-void expected_exception(std::string const &);
-
-
-// Represent result row as string.
-std::string list_row(row);
-// Represent result as string.
-std::string list_result(result);
-// Represent result iterator as string.
-std::string list_result_iterator(result::const_iterator);
-
-
-// @deprecated Set up test data for legacy tests.
-void create_pqxxevents(transaction_base &);
-} // namespace test
-
-
-template<> inline std::string to_string(row const &value)
-{
-  return pqxx::test::list_row(value);
-}
-
-
-template<> inline std::string to_string(result const &value)
-{
-  return pqxx::test::list_result(value);
-}
-
-
-template<> inline std::string to_string(result::const_iterator const &value)
-{
-  return pqxx::test::list_result_iterator(value);
-}
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/test/test_types.hxx b/ext/libpqxx-7.7.3/test/test_types.hxx
deleted file mode 100644
index 38c045370..000000000
--- a/ext/libpqxx-7.7.3/test/test_types.hxx
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Custom types for testing & libpqxx support those types
- */
-
-#include <pqxx/strconv>
-
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <exception>
-#include <iomanip>
-#include <regex>
-#include <sstream>
-#include <string>
-#include <vector>
-
-
-namespace pqxx
-{
-template<> struct nullness<std::byte> : no_null<std::byte>
-{};
-
-
-constexpr static auto hex_digit{"0123456789abcdef"};
-
-
-template<> struct string_traits<std::byte>
-{
-  static std::size_t size_buffer(std::byte const &) { return 3; }
-
-  static zview to_buf(char *begin, char *end, std::byte const &value)
-  {
-    if (pqxx::internal::cmp_less(end - begin, size_buffer(value)))
-      throw pqxx::conversion_overrun{
-        "Not enough buffer to convert std::byte."};
-    auto uc{static_cast<unsigned char>(value)};
-    begin[0] = hex_digit[uc >> 4];
-    begin[1] = hex_digit[uc & 0x0f];
-    return zview{begin, 2u};
-  }
-
-  static char *into_buf(char *begin, char *end, std::byte const &value)
-  {
-    auto view{to_buf(begin, end, value)};
-    return begin + std::size(view);
-  }
-};
-} // namespace pqxx
-
-
-class ipv4
-{
-public:
-  ipv4() : m_as_int{0u} {}
-  ipv4(ipv4 const &) = default;
-  ipv4(ipv4 &&) = default;
-  explicit ipv4(uint32_t i) : m_as_int{i} {}
-  ipv4(
-    unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4) :
-          ipv4()
-  {
-    set_byte(0, b1);
-    set_byte(1, b2);
-    set_byte(2, b3);
-    set_byte(3, b4);
-  }
-
-  bool operator==(ipv4 const &o) const { return m_as_int == o.m_as_int; }
-  ipv4 &operator=(ipv4 const &) = default;
-
-  /// Index bytes, from 0 to 3, in network (i.e. Big-Endian) byte order.
-  unsigned int operator[](int byte) const
-  {
-    if (byte < 0 or byte > 3)
-      throw pqxx::usage_error("Byte out of range.");
-    auto const shift = compute_shift(byte);
-    return static_cast<unsigned int>((m_as_int >> shift) & 0xff);
-  }
-
-  /// Set individual byte, in network byte order.
-  void set_byte(int byte, uint32_t value)
-  {
-    auto const shift = compute_shift(byte);
-    auto const blanked = (m_as_int & ~uint32_t(0xff << shift));
-    m_as_int = (blanked | ((value & 0xff) << shift));
-  }
-
-private:
-  static unsigned compute_shift(int byte)
-  {
-    if (byte < 0 or byte > 3)
-      throw pqxx::usage_error("Byte out of range.");
-    return static_cast<unsigned>((3 - byte) * 8);
-  }
-
-  uint32_t m_as_int;
-};
-
-
-using bytea = std::vector<unsigned char>;
-
-
-namespace pqxx
-{
-template<> struct nullness<ipv4> : no_null<ipv4>
-{};
-
-
-template<> struct string_traits<ipv4>
-{
-  static ipv4 from_string(std::string_view text)
-  {
-    ipv4 ts;
-    if (std::data(text) == nullptr)
-      internal::throw_null_conversion(type_name<ipv4>);
-    std::regex ipv4_regex{R"--((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3}))--"};
-    std::smatch match;
-    // Need non-temporary for `std::regex_match()`
-    std::string sstr{text};
-    if (not std::regex_match(sstr, match, ipv4_regex) or std::size(match) != 5)
-      throw std::runtime_error{"Invalid ipv4 format: " + std::string{text}};
-    try
-    {
-      for (std::size_t i{0}; i < 4; ++i)
-        ts.set_byte(int(i), uint32_t(std::stoi(match[i + 1])));
-    }
-    catch (std::invalid_argument const &)
-    {
-      throw std::runtime_error{"Invalid ipv4 format: " + std::string{text}};
-    }
-    catch (std::out_of_range const &)
-    {
-      throw std::runtime_error{"Invalid ipv4 format: " + std::string{text}};
-    }
-    return ts;
-  }
-
-  static char *into_buf(char *begin, char *end, ipv4 const &value)
-  {
-    if (pqxx::internal::cmp_less(end - begin, size_buffer(value)))
-      throw conversion_error{"Buffer too small for ipv4."};
-    char *here = begin;
-    for (int i = 0; i < 4; ++i)
-    {
-      here = string_traits<unsigned>::into_buf(here, end, value[i]);
-      *(here - 1) = '.';
-    }
-    *(here - 1) = '\0';
-    return here;
-  }
-
-  static zview to_buf(char *begin, char *end, ipv4 const &value)
-  {
-    return zview{
-      begin,
-      static_cast<std::size_t>(into_buf(begin, end, value) - begin - 1)};
-  }
-
-  static constexpr std::size_t size_buffer(ipv4 const &) noexcept
-  {
-    return 20;
-  }
-};
-
-
-namespace
-{
-inline char nibble_to_hex(unsigned nibble)
-{
-  if (nibble < 10)
-    return char('0' + nibble);
-  else if (nibble < 16)
-    return char('a' + (nibble - 10));
-  else
-    throw std::runtime_error{"Invalid digit going into bytea."};
-}
-
-
-inline unsigned hex_to_digit(char hex)
-{
-  auto x = static_cast<unsigned char>(hex);
-  if (x >= '0' and x <= '9')
-    return x - '0';
-  else if (x >= 'a' and x <= 'f')
-    return 10 + x - 'a';
-  else if (x >= 'A' and x <= 'F')
-    return 10 + x - 'A';
-  else
-    throw std::runtime_error{"Invalid hex in bytea."};
-}
-} // namespace
-
-
-template<> struct nullness<bytea> : no_null<bytea>
-{};
-
-
-template<> struct string_traits<bytea>
-{
-  static bytea from_string(std::string_view text)
-  {
-    if ((std::size(text) & 1) != 0)
-      throw std::runtime_error{"Odd hex size."};
-    bytea value;
-    value.reserve((std::size(text) - 2) / 2);
-    for (std::size_t i = 2; i < std::size(text); i += 2)
-    {
-      auto hi = hex_to_digit(text[i]), lo = hex_to_digit(text[i + 1]);
-      value.push_back(static_cast<unsigned char>((hi << 4) | lo));
-    }
-    return value;
-  }
-
-  static zview to_buf(char *begin, char *end, bytea const &value)
-  {
-    auto const need = size_buffer(value);
-    auto const have = end - begin;
-    if (std::size_t(have) < need)
-      throw pqxx::conversion_overrun{"Not enough space in buffer for bytea."};
-    char *pos = begin;
-    *pos++ = '\\';
-    *pos++ = 'x';
-    for (unsigned char const u : value)
-    {
-      *pos++ = nibble_to_hex(unsigned(u) >> 4);
-      *pos++ = nibble_to_hex(unsigned(u) & 0x0f);
-    }
-    *pos++ = '\0';
-    return {begin, pos - begin - 1};
-  }
-
-  static char *into_buf(char *begin, char *end, bytea const &value)
-  {
-    return begin + std::size(to_buf(begin, end, value)) + 1;
-  }
-
-  static std::size_t size_buffer(bytea const &value)
-  {
-    return 2 + 2 * std::size(value) + 1;
-  }
-};
-} // namespace pqxx
diff --git a/ext/libpqxx-7.7.3/test/unit/CMakeLists.txt b/ext/libpqxx-7.7.3/test/unit/CMakeLists.txt
deleted file mode 100644
index f938a4181..000000000
--- a/ext/libpqxx-7.7.3/test/unit/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-if(NOT PostgreSQL_FOUND)
-    if(POLICY CMP0074)
-        cmake_policy(PUSH)
-        # CMP0074 is `OLD` by `cmake_minimum_required(VERSION 3.7)`, sets `NEW`
-        # to enable support CMake variable `PostgreSQL_ROOT`.
-        cmake_policy(SET CMP0074 NEW)
-    endif()
-
-    find_package(PostgreSQL REQUIRED)
-
-    if(POLICY CMP0074)
-        cmake_policy(POP)
-    endif()
-endif()
-
-file(GLOB UNIT_TEST_SOURCES *.cxx)
-
-add_executable(unit_runner ${UNIT_TEST_SOURCES})
-target_link_libraries(unit_runner PUBLIC pqxx)
-target_include_directories(unit_runner PRIVATE ${PostgreSQL_INCLUDE_DIRS})
-add_test(
-    NAME unit_runner
-    WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-    COMMAND unit_runner
-)
diff --git a/ext/libpqxx-7.7.3/test/unit/test_array.cxx b/ext/libpqxx-7.7.3/test/unit/test_array.cxx
deleted file mode 100644
index 229ac5145..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_array.cxx
+++ /dev/null
@@ -1,548 +0,0 @@
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-// Test program for libpqxx array parsing.
-
-namespace pqxx
-{
-template<>
-struct nullness<array_parser::juncture> : no_null<array_parser::juncture>
-{};
-
-
-inline std::string to_string(pqxx::array_parser::juncture const &j)
-{
-  using junc = pqxx::array_parser::juncture;
-  switch (j)
-  {
-  case junc::row_start: return "row_start";
-  case junc::row_end: return "row_end";
-  case junc::null_value: return "null_value";
-  case junc::string_value: return "string_value";
-  case junc::done: return "done";
-  default: return "UNKNOWN JUNCTURE: " + to_string(static_cast<int>(j));
-  }
-}
-} // namespace pqxx
-
-
-namespace
-{
-void test_empty_arrays()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-
-  // Parsing a null pointer just immediately returns "done".
-  output = pqxx::array_parser(std::string_view()).get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "get_next on null array did not return done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  // Parsing an empty array string immediately returns "done".
-  output = pqxx::array_parser("").get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "get_next on an empty array string did not return done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  // Parsing an empty array returns "row_start", "row_end", "done".
-  pqxx::array_parser empty_parser("{}");
-  output = empty_parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Empty array did not start with row_start.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = empty_parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Empty array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = empty_parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Empty array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_null_value()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser containing_null("{NULL}");
-
-  output = containing_null.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array containing null did not start with row_start.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = containing_null.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::null_value,
-    "Array containing null did not return null_value.");
-  PQXX_CHECK_EQUAL(output.second, "", "Null value was not empty.");
-
-  output = containing_null.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array containing null did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = containing_null.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array containing null did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_single_quoted_string()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser("{'item'}");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "item", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_single_quoted_escaping()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser("{'don''t\\\\ care'}");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "don't\\ care", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_double_quoted_string()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser("{\"item\"}");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "item", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_double_quoted_escaping()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser(R"--({"don''t\\ care"})--");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "don''t\\ care", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-// A pair of double quotes in a double-quoted string is an escaped quote.
-void test_double_double_quoted_string()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser{R"--({"3"" steel"})--"};
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-
-  PQXX_CHECK_EQUAL(output.second, "3\" steel", "Unexpected string value.");
-}
-
-
-void test_unquoted_string()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser("{item}");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "item", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_multiple_values()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser("{1,2}");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "1", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "2", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_nested_array()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser("{{item}}");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Nested array did not start 2nd dimension with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "item", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Nested array did not end 2nd dimension with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_nested_array_with_multiple_entries()
-{
-  std::pair<pqxx::array_parser::juncture, std::string> output;
-  pqxx::array_parser parser("{{1,2},{3,4}}");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Nested array did not start 2nd dimension with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "1", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "2", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Nested array did not end 2nd dimension with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_start,
-    "Nested array did not descend to 2nd dimension with row_start.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "3", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::string_value,
-    "Array did not return string_value.");
-  PQXX_CHECK_EQUAL(output.second, "4", "Unexpected string value.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Nested array did not leave 2nd dimension with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::row_end,
-    "Array did not end with row_end.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-
-  output = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    output.first, pqxx::array_parser::juncture::done,
-    "Array did not conclude with done.");
-  PQXX_CHECK_EQUAL(output.second, "", "Unexpected nonempty output.");
-}
-
-
-void test_array_parse()
-{
-  test_empty_arrays();
-  test_null_value();
-  test_single_quoted_string();
-  test_single_quoted_escaping();
-  test_double_quoted_string();
-  test_double_quoted_escaping();
-  test_double_double_quoted_string();
-  test_unquoted_string();
-  test_multiple_values();
-  test_nested_array();
-  test_nested_array_with_multiple_entries();
-}
-
-
-void test_generate_empty_array()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<int>{}), "{}",
-    "Basic array output is not as expected.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<std::string>{}), "{}",
-    "String array comes out different.");
-}
-
-
-void test_generate_null_value()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<char const *>{nullptr}), "{NULL}",
-    "Null array value did not come out as expected.");
-}
-
-
-void test_generate_single_item()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<int>{42}), "{42}",
-    "Numeric conversion came out wrong.");
-
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<char const *>{"foo"}), "{\"foo\"}",
-    "String array conversion came out wrong.");
-}
-
-
-void test_generate_multiple_items()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<int>{5, 4, 3, 2}), "{5,4,3,2}",
-    "Array with multiple values is not correct.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<std::string>{"foo", "bar"}),
-    "{\"foo\",\"bar\"}", "Array with multiple strings came out wrong.");
-}
-
-
-void test_generate_nested_array()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<std::vector<int>>{{1, 2}, {3, 4}}),
-    "{{1,2},{3,4}}", "Nested arrays don't work right.");
-}
-
-
-void test_generate_escaped_strings()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<std::string>{"a\\b"}), "{\"a\\\\b\"}",
-    "Backslashes are not escaped properly.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::vector<std::string>{"x\"y\""}), "{\"x\\\"y\\\"\"}",
-    "Double quotes are not escaped properly.");
-}
-
-
-void test_array_generate()
-{
-  test_generate_empty_array();
-  test_generate_null_value();
-  test_generate_single_item();
-  test_generate_multiple_items();
-  test_generate_nested_array();
-  test_generate_escaped_strings();
-}
-
-
-void test_array_roundtrip()
-{
-  pqxx::connection c;
-  pqxx::work w{c};
-
-  std::vector<int> const in{0, 1, 2, 3, 5};
-  auto const r1{w.exec1("SELECT " + c.quote(in) + "::integer[]")};
-  pqxx::array_parser parser{r1[0].view()};
-  auto item{parser.get_next()};
-  PQXX_CHECK_EQUAL(
-    item.first, pqxx::array_parser::juncture::row_start,
-    "Array did not start with row_start.");
-
-  std::vector<int> out;
-  for (item = parser.get_next();
-       item.first == pqxx::array_parser::juncture::string_value;
-       item = parser.get_next())
-  {
-    out.push_back(pqxx::from_string<int>(item.second));
-  }
-
-  PQXX_CHECK_EQUAL(
-    item.first, pqxx::array_parser::juncture::row_end,
-    "Array values did not end in row_end.");
-  PQXX_CHECK_EQUAL(
-    std::size(out), std::size(in), "Array came back with different length.");
-
-  for (std::size_t i{0}; i < std::size(in); ++i)
-    PQXX_CHECK_EQUAL(out[i], in[i], "Array element has changed.");
-
-  item = parser.get_next();
-  PQXX_CHECK_EQUAL(
-    item.first, pqxx::array_parser::juncture::done,
-    "Array did not end in done.");
-}
-
-
-PQXX_REGISTER_TEST(test_array_parse);
-PQXX_REGISTER_TEST(test_array_generate);
-PQXX_REGISTER_TEST(test_array_roundtrip);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_binarystring.cxx b/ext/libpqxx-7.7.3/test/unit/test_binarystring.cxx
deleted file mode 100644
index e6097d039..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_binarystring.cxx
+++ /dev/null
@@ -1,211 +0,0 @@
-#include <pqxx/binarystring>
-#include <pqxx/stream_to>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-#include "../test_types.hxx"
-
-
-namespace
-{
-pqxx::binarystring
-make_binarystring(pqxx::transaction_base &T, std::string content)
-{
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  return pqxx::binarystring(T.exec1("SELECT " + T.quote_raw(content))[0]);
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-void test_binarystring()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto b{make_binarystring(tx, "")};
-  PQXX_CHECK(std::empty(b), "Empty binarystring is not empty.");
-  PQXX_CHECK_EQUAL(b.str(), "", "Empty binarystring doesn't work.");
-  PQXX_CHECK_EQUAL(std::size(b), 0u, "Empty binarystring has nonzero size.");
-  PQXX_CHECK_EQUAL(b.length(), 0u, "Length/size mismatch.");
-  PQXX_CHECK(std::begin(b) == std::end(b), "Empty binarystring iterates.");
-  PQXX_CHECK(
-    std::cbegin(b) == std::begin(b), "Wrong cbegin for empty binarystring.");
-  PQXX_CHECK(
-    std::rbegin(b) == std::rend(b), "Empty binarystring reverse-iterates.");
-  PQXX_CHECK(
-    std::crbegin(b) == std::rbegin(b),
-    "Wrong crbegin for empty binarystring.");
-  PQXX_CHECK_THROWS(
-    b.at(0), std::out_of_range, "Empty binarystring accepts at().");
-
-  b = make_binarystring(tx, "z");
-  PQXX_CHECK_EQUAL(b.str(), "z", "Basic nonempty binarystring is broken.");
-  PQXX_CHECK(not std::empty(b), "Nonempty binarystring is empty.");
-  PQXX_CHECK_EQUAL(std::size(b), 1u, "Bad binarystring size.");
-  PQXX_CHECK_EQUAL(b.length(), 1u, "Length/size mismatch.");
-  PQXX_CHECK(
-    std::begin(b) != std::end(b), "Nonempty binarystring does not iterate.");
-  PQXX_CHECK(
-    std::rbegin(b) != std::rend(b),
-    "Nonempty binarystring does not reverse-iterate.");
-  PQXX_CHECK(std::begin(b) + 1 == std::end(b), "Bad iteration.");
-  PQXX_CHECK(std::rbegin(b) + 1 == std::rend(b), "Bad reverse iteration.");
-  PQXX_CHECK(std::cbegin(b) == std::begin(b), "Wrong cbegin.");
-  PQXX_CHECK(std::cend(b) == std::end(b), "Wrong cend.");
-  PQXX_CHECK(std::crbegin(b) == std::rbegin(b), "Wrong crbegin.");
-  PQXX_CHECK(std::crend(b) == std::rend(b), "Wrong crend.");
-  PQXX_CHECK(b.front() == 'z', "Unexpected front().");
-  PQXX_CHECK(b.back() == 'z', "Unexpected back().");
-  PQXX_CHECK(b.at(0) == 'z', "Unexpected data at index 0.");
-  PQXX_CHECK_THROWS(
-    b.at(1), std::out_of_range, "Failed to catch range error.");
-
-  std::string const simple{"ab"};
-  b = make_binarystring(tx, simple);
-  PQXX_CHECK_EQUAL(
-    b.str(), simple, "Binary (un)escaping went wrong somewhere.");
-  PQXX_CHECK_EQUAL(
-    std::size(b), std::size(simple), "Escaping confuses length.");
-
-  std::string const simple_escaped{
-    tx.esc_raw(std::basic_string_view<std::byte>{
-      reinterpret_cast<std::byte const *>(std::data(simple)),
-      std::size(simple)})};
-  for (auto c : simple_escaped)
-  {
-    auto const uc{static_cast<unsigned char>(c)};
-    PQXX_CHECK(uc <= 127, "Non-ASCII byte in escaped string.");
-  }
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  PQXX_CHECK_EQUAL(
-    tx.quote_raw(
-      reinterpret_cast<unsigned char const *>(simple.c_str()),
-      std::size(simple)),
-    tx.quote(b), "quote_raw is broken");
-  PQXX_CHECK_EQUAL(
-    tx.quote(b), tx.quote_raw(simple), "Binary quoting is broken.");
-  PQXX_CHECK_EQUAL(
-    pqxx::binarystring(tx.exec1("SELECT " + tx.quote(b))[0]).str(), simple,
-    "Binary string is not idempotent.");
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  std::string const bytes("\x01\x23\x23\xa1\x2b\x0c\xff");
-  b = make_binarystring(tx, bytes);
-  PQXX_CHECK_EQUAL(b.str(), bytes, "Binary data breaks (un)escaping.");
-
-  std::string const nully("a\0b", 3);
-  b = make_binarystring(tx, nully);
-  PQXX_CHECK_EQUAL(b.str(), nully, "Nul byte broke binary (un)escaping.");
-  PQXX_CHECK_EQUAL(std::size(b), 3u, "Nul byte broke binarystring size.");
-
-  b = make_binarystring(tx, "foo");
-  PQXX_CHECK_EQUAL(std::string(b.get(), 3), "foo", "get() appears broken.");
-
-  auto b1{make_binarystring(tx, "1")}, b2{make_binarystring(tx, "2")};
-  PQXX_CHECK_NOT_EQUAL(b1.get(), b2.get(), "Madness rules.");
-  PQXX_CHECK_NOT_EQUAL(b1.str(), b2.str(), "Logic has no more meaning.");
-  b1.swap(b2);
-  PQXX_CHECK_NOT_EQUAL(b1.str(), b2.str(), "swap() equalized binarystrings.");
-  PQXX_CHECK_NOT_EQUAL(b1.str(), "1", "swap() did not happen.");
-  PQXX_CHECK_EQUAL(b1.str(), "2", "swap() is broken.");
-  PQXX_CHECK_EQUAL(b2.str(), "1", "swap() went insane.");
-
-  b = make_binarystring(tx, "bar");
-  b.swap(b);
-  PQXX_CHECK_EQUAL(b.str(), "bar", "Self-swap confuses binarystring.");
-
-  b = make_binarystring(tx, "\\x");
-  PQXX_CHECK_EQUAL(b.str(), "\\x", "Hex-escape header confused (un)escaping.");
-}
-
-
-void test_binarystring_conversion()
-{
-  constexpr char bytes[]{"f\to\0o\n\0"};
-  std::string_view const data{bytes, std::size(bytes) - 1};
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  pqxx::binarystring bin{data};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-  auto const escaped{pqxx::to_string(bin)};
-  PQXX_CHECK_EQUAL(
-    escaped, std::string_view{"\\x66096f006f0a00"}, "Unexpected hex escape.");
-  auto const restored{pqxx::from_string<pqxx::binarystring>(escaped)};
-  PQXX_CHECK_EQUAL(
-    std::size(restored), std::size(data), "Unescaping produced wrong length.");
-}
-
-
-void test_binarystring_stream()
-{
-  constexpr char bytes[]{"a\tb\0c"};
-  std::string_view const data{bytes, std::size(bytes) - 1};
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  pqxx::binarystring bin{data};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  pqxx::connection conn;
-  pqxx::transaction tx{conn};
-  tx.exec0("CREATE TEMP TABLE pqxxbinstream(id integer, bin bytea)");
-
-  auto to{pqxx::stream_to::table(tx, {"pqxxbinstream"})};
-  to.write_values(0, bin);
-  to.complete();
-
-  auto ptr{reinterpret_cast<std::byte const *>(std::data(data))};
-  auto expect{
-    tx.quote(std::basic_string_view<std::byte>{ptr, std::size(data)})};
-  PQXX_CHECK(
-    tx.query_value<bool>("SELECT bin = " + expect + " FROM pqxxbinstream"),
-    "binarystring did not stream_to properly.");
-  PQXX_CHECK_EQUAL(
-    tx.query_value<std::size_t>("SELECT octet_length(bin) FROM pqxxbinstream"),
-    std::size(data), "Did the terminating zero break the bytea?");
-}
-
-
-void test_binarystring_array_stream()
-{
-  pqxx::connection conn;
-  pqxx::transaction tx{conn};
-  tx.exec0("CREATE TEMP TABLE pqxxbinstream(id integer, vec bytea[])");
-
-  constexpr char bytes1[]{"a\tb\0c"}, bytes2[]{"1\0.2"};
-  std::string_view const data1{bytes1}, data2{bytes2};
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  pqxx::binarystring bin1{data1}, bin2{data2};
-  std::vector<pqxx::binarystring> const vec{bin1, bin2};
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  auto to{pqxx::stream_to::table(tx, {"pqxxbinstream"})};
-  to.write_values(0, vec);
-  to.complete();
-
-  PQXX_CHECK_EQUAL(
-    tx.query_value<std::size_t>(
-      "SELECT array_length(vec, 1) FROM pqxxbinstream"),
-    std::size(vec), "Array came out with wrong length.");
-
-  auto ptr1{reinterpret_cast<std::byte const *>(std::data(data1))},
-    ptr2{reinterpret_cast<std::byte const *>(std::data(data2))};
-  auto expect1{
-    tx.quote(std::basic_string_view<std::byte>{ptr1, std::size(data1)})},
-    expect2{
-      tx.quote(std::basic_string_view<std::byte>{ptr2, std::size(data2)})};
-  PQXX_CHECK(
-    tx.query_value<bool>("SELECT vec[1] = " + expect1 + " FROM pqxxbinstream"),
-    "Bytea in array came out wrong.");
-  PQXX_CHECK(
-    tx.query_value<bool>("SELECT vec[2] = " + expect2 + " FROM pqxxbinstream"),
-    "First bytea in array worked, but second did not.");
-  PQXX_CHECK_EQUAL(
-    tx.query_value<std::size_t>(
-      "SELECT octet_length(vec[1]) FROM pqxxbinstream"),
-    std::size(data1), "Bytea length broke inside array.");
-}
-
-
-PQXX_REGISTER_TEST(test_binarystring);
-PQXX_REGISTER_TEST(test_binarystring_conversion);
-PQXX_REGISTER_TEST(test_binarystring_stream);
-PQXX_REGISTER_TEST(test_binarystring_array_stream);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_blob.cxx b/ext/libpqxx-7.7.3/test/unit/test_blob.cxx
deleted file mode 100644
index 709c1f489..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_blob.cxx
+++ /dev/null
@@ -1,644 +0,0 @@
-#include <cstdio>
-
-#include <pqxx/blob>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-#include "../test_types.hxx"
-
-
-namespace
-{
-void test_blob_is_useless_by_default()
-{
-  pqxx::blob b{};
-  std::basic_string<std::byte> buf;
-  PQXX_CHECK_THROWS(
-    b.read(buf, 1), pqxx::usage_error,
-    "Read on default-constructed blob did not throw failure.");
-  PQXX_CHECK_THROWS(
-    b.write(buf), pqxx::usage_error,
-    "Write on default-constructed blob did not throw failure.");
-}
-
-
-void test_blob_create_makes_empty_blob()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::oid id{pqxx::blob::create(tx)};
-  auto b{pqxx::blob::open_r(tx, id)};
-  b.seek_end(0);
-  PQXX_CHECK_EQUAL(b.tell(), 0, "New blob is not empty.");
-}
-
-
-void test_blob_create_with_oid_requires_oid_be_free()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::create(tx)};
-
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(pqxx::blob::create(tx, id)), pqxx::failure,
-    "Not getting expected error when oid not free.");
-}
-
-
-void test_blob_create_with_oid_obeys_oid()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::create(tx)};
-  pqxx::blob::remove(tx, id);
-
-  auto actual_id{pqxx::blob::create(tx, id)};
-  PQXX_CHECK_EQUAL(actual_id, id, "Create with oid returned different oid.");
-}
-
-
-void test_blobs_are_transactional()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::oid id{pqxx::blob::create(tx)};
-  tx.abort();
-  pqxx::work tx2{conn};
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(pqxx::blob::open_r(tx2, id)), pqxx::failure,
-    "Blob from aborted transaction still exists.");
-}
-
-
-void test_blob_remove_removes_blob()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::oid id{pqxx::blob::create(tx)};
-  pqxx::blob::remove(tx, id);
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(pqxx::blob::open_r(tx, id)), pqxx::failure,
-    "Attempt to open blob after removing should have failed.");
-}
-
-
-void test_blob_remove_is_not_idempotent()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::oid id{pqxx::blob::create(tx)};
-  pqxx::blob::remove(tx, id);
-  PQXX_CHECK_THROWS(
-    pqxx::blob::remove(tx, id), pqxx::failure,
-    "Redundant remove() did not throw failure.");
-}
-
-
-void test_blob_checks_open_mode()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::oid id{pqxx::blob::create(tx)};
-  pqxx::blob b_r{pqxx::blob::open_r(tx, id)};
-  pqxx::blob b_w{pqxx::blob::open_w(tx, id)};
-  pqxx::blob b_rw{pqxx::blob::open_rw(tx, id)};
-
-  std::basic_string<std::byte> buf{std::byte{3}, std::byte{2}, std::byte{1}};
-
-  // These are all allowed:
-  b_w.write(buf);
-  b_r.read(buf, 3);
-  b_rw.seek_end(0);
-  b_rw.write(buf);
-  b_rw.seek_abs(0);
-  b_rw.read(buf, 6);
-
-  // These are not:
-  PQXX_CHECK_THROWS(
-    b_r.write(buf), pqxx::failure, "Read-only blob did not stop write.");
-  PQXX_CHECK_THROWS(
-    b_w.read(buf, 10), pqxx::failure, "Write-only blob did not stop read.");
-}
-
-
-void test_blob_supports_move()
-{
-  std::basic_string<std::byte> buf;
-  buf.push_back(std::byte{'x'});
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::oid id{pqxx::blob::create(tx)};
-  pqxx::blob b1{pqxx::blob::open_rw(tx, id)};
-  b1.write(buf);
-
-  pqxx::blob b2{std::move(b1)};
-  b2.seek_abs(0);
-  b2.read(buf, 1u);
-
-  PQXX_CHECK_THROWS(
-    b1.read(buf, 1u), pqxx::usage_error,
-    "Blob still works after move construction.");
-
-  b1 = std::move(b2);
-  b1.read(buf, 1u);
-
-  PQXX_CHECK_THROWS(
-    b2.read(buf, 1u), pqxx::usage_error,
-    "Blob still works after move assignment.");
-}
-
-
-void test_blob_read_reads_data()
-{
-  std::basic_string<std::byte> const data{
-    std::byte{'a'}, std::byte{'b'}, std::byte{'c'}};
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::oid id{pqxx::blob::from_buf(tx, data)};
-
-  std::basic_string<std::byte> buf;
-  auto b{pqxx::blob::open_rw(tx, id)};
-  PQXX_CHECK_EQUAL(
-    b.read(buf, 2), 2u, "Full read() returned an unexpected value.");
-  PQXX_CHECK_EQUAL(
-    buf, (std::basic_string<std::byte>{std::byte{'a'}, std::byte{'b'}}),
-    "Read back the wrong data.");
-  PQXX_CHECK_EQUAL(
-    b.read(buf, 2), 1u, "Partial read() returned an unexpected value.");
-  PQXX_CHECK_EQUAL(
-    buf, (std::basic_string<std::byte>{std::byte{'c'}}),
-    "Continued read produced wrong data.");
-  PQXX_CHECK_EQUAL(
-    b.read(buf, 2), 0u, "read at end returned an unexpected value.");
-  PQXX_CHECK_EQUAL(
-    buf, (std::basic_string<std::byte>{}), "Read past end produced data.");
-}
-
-
-void test_blob_read_span()
-{
-#if defined(PQXX_HAVE_SPAN)
-  std::basic_string<std::byte> const data{std::byte{'u'}, std::byte{'v'},
-                                          std::byte{'w'}, std::byte{'x'},
-                                          std::byte{'y'}, std::byte{'z'}};
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::oid id{pqxx::blob::from_buf(tx, data)};
-
-  auto b{pqxx::blob::open_r(tx, id)};
-  std::basic_string<std::byte> string_buf;
-  string_buf.resize(2);
-
-  std::span<std::byte> output;
-
-  output = b.read(std::span<std::byte>{});
-  PQXX_CHECK_EQUAL(
-    std::size(output), 0u, "Empty read produced nonempty buffer.");
-  output = b.read(string_buf);
-  PQXX_CHECK_EQUAL(
-    std::size(output), 2u, "Got unexpected buf size from blob::read().");
-  PQXX_CHECK_EQUAL(
-    output[0], std::byte{'u'}, "Unexpected byte from blob::read().");
-  PQXX_CHECK_EQUAL(
-    output[1], std::byte{'v'}, "Unexpected byte from blob::read().");
-
-  string_buf.resize(100);
-  output = b.read(std::span<std::byte>{string_buf.data(), 1});
-  PQXX_CHECK_EQUAL(
-    std::size(output), 1u,
-    "Did blob::read() follow string size instead of span size?");
-  PQXX_CHECK_EQUAL(
-    output[0], std::byte{'w'}, "Unexpected byte from blob::read().");
-
-  std::vector<std::byte> vec_buf;
-  vec_buf.resize(2);
-  auto output2{b.read(vec_buf)};
-  PQXX_CHECK_EQUAL(
-    std::size(output2), 2u, "Got unexpected buf size from blob::read().");
-  PQXX_CHECK_EQUAL(
-    output2[0], std::byte{'x'}, "Unexpected byte from blob::read().");
-  PQXX_CHECK_EQUAL(
-    output2[1], std::byte{'y'}, "Unexpected byte from blob::read().");
-
-  vec_buf.resize(100);
-  output2 = b.read(vec_buf);
-  PQXX_CHECK_EQUAL(std::size(output2), 1u, "Weird things happened at EOF.");
-  PQXX_CHECK_EQUAL(output2[0], std::byte{'z'}, "Bad data at EOF.");
-#endif // PQXX_HAVE_SPAN
-}
-
-
-void test_blob_reads_vector()
-{
-  char const content[]{"abcd"};
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::from_buf(
-    tx, std::basic_string_view<std::byte>{
-          reinterpret_cast<std::byte const *>(content), std::size(content)})};
-  std::vector<std::byte> buf;
-  buf.resize(10);
-  auto out{pqxx::blob::open_r(tx, id).read(buf)};
-  PQXX_CHECK_EQUAL(
-    std::size(out), std::size(content),
-    "Got wrong length back when reading as vector.");
-  PQXX_CHECK_EQUAL(
-    out[0], std::byte{'a'}, "Got bad data when reading as vector.");
-}
-
-
-void test_blob_write_appends_at_insertion_point()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::create(tx)};
-
-  auto b{pqxx::blob::open_rw(tx, id)};
-  b.write(std::basic_string<std::byte>{std::byte{'z'}});
-  b.write(std::basic_string<std::byte>{std::byte{'a'}});
-
-  std::basic_string<std::byte> buf;
-  b.read(buf, 5);
-  PQXX_CHECK_EQUAL(
-    buf, (std::basic_string<std::byte>{}), "Found data at the end.");
-  b.seek_abs(0);
-  b.read(buf, 5);
-  PQXX_CHECK_EQUAL(
-    buf, (std::basic_string<std::byte>{std::byte{'z'}, std::byte{'a'}}),
-    "Consecutive writes did not append correctly.");
-
-  b.write(std::basic_string<std::byte>{std::byte{'x'}});
-  // Blob now contains "zax".  That's not we wanted...  Rewind and rewrite.
-  b.seek_abs(1);
-  b.write(std::basic_string<std::byte>{std::byte{'y'}});
-  b.seek_abs(0);
-  b.read(buf, 5);
-  PQXX_CHECK_EQUAL(
-    buf,
-    (std::basic_string<std::byte>{
-      std::byte{'z'}, std::byte{'y'}, std::byte{'x'}}),
-    "Rewriting in the middle did not work right.");
-}
-
-
-void test_blob_writes_span()
-{
-#if defined(PQXX_HAVE_SPAN)
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  constexpr char content[]{"gfbltk"};
-  std::basic_string<std::byte> data{
-    reinterpret_cast<std::byte const *>(content), std::size(content)};
-
-  auto id{pqxx::blob::create(tx)};
-  auto b{pqxx::blob::open_rw(tx, id)};
-  b.write(std::span<std::byte>{data.data() + 1, 3u});
-  b.seek_abs(0);
-
-  std::vector<std::byte> buf;
-  buf.resize(4);
-  auto out{b.read(std::span<std::byte>{buf.data(), 4u})};
-  PQXX_CHECK_EQUAL(
-    std::size(out), 3u, "Did not get expected number of bytes back.");
-  PQXX_CHECK_EQUAL(out[0], std::byte{'f'}, "Data did not come back right.");
-  PQXX_CHECK_EQUAL(out[2], std::byte{'l'}, "Data started right, ended wrong!");
-#endif // PQXX_HAVE_SPAN
-}
-
-
-void test_blob_resize_shortens_to_desired_length()
-{
-  std::basic_string<std::byte> const data{
-    std::byte{'w'}, std::byte{'o'}, std::byte{'r'}, std::byte{'k'}};
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::from_buf(tx, data)};
-
-  pqxx::blob::open_w(tx, id).resize(2);
-  std::basic_string<std::byte> buf;
-  pqxx::blob::to_buf(tx, id, buf, 10);
-  PQXX_CHECK_EQUAL(
-    buf, (std::basic_string<std::byte>{std::byte{'w'}, std::byte{'o'}}),
-    "Truncate did not shorten correctly.");
-}
-
-
-void test_blob_resize_extends_to_desired_length()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{
-    pqxx::blob::from_buf(tx, std::basic_string<std::byte>{std::byte{100}})};
-  pqxx::blob::open_w(tx, id).resize(3);
-  std::basic_string<std::byte> buf;
-  pqxx::blob::to_buf(tx, id, buf, 10);
-  PQXX_CHECK_EQUAL(
-    buf,
-    (std::basic_string<std::byte>{std::byte{100}, std::byte{0}, std::byte{0}}),
-    "Resize did not zero-extend correctly.");
-}
-
-
-void test_blob_tell_tracks_position()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::create(tx)};
-  auto b{pqxx::blob::open_rw(tx, id)};
-
-  PQXX_CHECK_EQUAL(
-    b.tell(), 0, "Empty blob started out in non-zero position.");
-  b.write(std::basic_string<std::byte>{std::byte{'e'}, std::byte{'f'}});
-  PQXX_CHECK_EQUAL(
-    b.tell(), 2, "Empty blob started out in non-zero position.");
-  b.seek_abs(1);
-  PQXX_CHECK_EQUAL(b.tell(), 1, "tell() did not track seek.");
-}
-
-
-void test_blob_seek_sets_positions()
-{
-  std::basic_string<std::byte> data{
-    std::byte{0}, std::byte{1}, std::byte{2}, std::byte{3}, std::byte{4},
-    std::byte{5}, std::byte{6}, std::byte{7}, std::byte{8}, std::byte{9}};
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::from_buf(tx, data)};
-  auto b{pqxx::blob::open_r(tx, id)};
-
-  std::basic_string<std::byte> buf;
-  b.seek_rel(3);
-  b.read(buf, 1u);
-  PQXX_CHECK_EQUAL(
-    buf[0], std::byte{3},
-    "seek_rel() from beginning did not take us to the right position.");
-
-  b.seek_abs(2);
-  b.read(buf, 1u);
-  PQXX_CHECK_EQUAL(
-    buf[0], std::byte{2}, "seek_abs() did not take us to the right position.");
-
-  b.seek_end(-2);
-  b.read(buf, 1u);
-  PQXX_CHECK_EQUAL(
-    buf[0], std::byte{8}, "seek_end() did not take us to the right position.");
-}
-
-
-void test_blob_from_buf_interoperates_with_to_buf()
-{
-  std::basic_string<std::byte> const data{std::byte{'h'}, std::byte{'i'}};
-  std::basic_string<std::byte> buf;
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::blob::to_buf(tx, pqxx::blob::from_buf(tx, data), buf, 10);
-  PQXX_CHECK_EQUAL(buf, data, "from_buf()/to_buf() roundtrip did not work.");
-}
-
-
-void test_blob_append_from_buf_appends()
-{
-  std::basic_string<std::byte> const data{std::byte{'h'}, std::byte{'o'}};
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::create(tx)};
-  pqxx::blob::append_from_buf(tx, data, id);
-  pqxx::blob::append_from_buf(tx, data, id);
-  std::basic_string<std::byte> buf;
-  pqxx::blob::to_buf(tx, id, buf, 10);
-  PQXX_CHECK_EQUAL(buf, data + data, "append_from_buf() wrote wrong data?");
-}
-
-
-namespace
-{
-/// Wrap `std::fopen`.
-/** This is just here to stop Visual Studio from advertising its own
- * alternative.
- */
-std::unique_ptr<FILE, std::function<int(FILE *)>>
-my_fopen(char const *path, char const *mode)
-{
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable : 4996)
-#endif
-  return {std::fopen(path, mode), std::fclose};
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#endif
-}
-
-
-void read_file(
-  char const path[], std::size_t len, std::basic_string<std::byte> &buf)
-{
-  buf.resize(len);
-  auto f{my_fopen(path, "rb")};
-  auto bytes{
-    std::fread(reinterpret_cast<char *>(buf.data()), 1, len, f.get())};
-  if (bytes == 0)
-    throw std::runtime_error{"Error reading test file."};
-  buf.resize(bytes);
-}
-
-
-void write_file(char const path[], std::basic_string_view<std::byte> data)
-{
-  try
-  {
-    auto f{my_fopen(path, "wb")};
-    if (
-      std::fwrite(
-        reinterpret_cast<char const *>(data.data()), 1, std::size(data),
-        f.get()) < std::size(data))
-      std::runtime_error{"File write failed."};
-  }
-  catch (const std::exception &)
-  {
-    std::remove(path);
-    throw;
-  }
-}
-
-
-/// Temporary file.
-class TempFile
-{
-public:
-  /// Create (and later clean up) a file at path containing data.
-  TempFile(char const path[], std::basic_string_view<std::byte> data) :
-          m_path(path)
-  {
-    write_file(path, data);
-  }
-
-  ~TempFile() { std::remove(m_path.c_str()); }
-
-private:
-  std::string m_path;
-};
-} // namespace
-
-
-void test_blob_from_file_creates_blob_from_file_contents()
-{
-  char const temp_file[] = "blob-test-from_file.tmp";
-  std::basic_string<std::byte> const data{std::byte{'4'}, std::byte{'2'}};
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  std::basic_string<std::byte> buf;
-
-  pqxx::oid id;
-  {
-    TempFile f{temp_file, data};
-    id = pqxx::blob::from_file(tx, temp_file);
-  }
-  pqxx::blob::to_buf(tx, id, buf, 10);
-  PQXX_CHECK_EQUAL(buf, data, "Wrong data from blob::from_file().");
-}
-
-
-void test_blob_from_file_with_oid_writes_blob()
-{
-  std::basic_string<std::byte> const data{std::byte{'6'}, std::byte{'9'}};
-  char const temp_file[] = "blob-test-from_file-oid.tmp";
-  std::basic_string<std::byte> buf;
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  // Guarantee (more or less) that id is not in use.
-  auto id{pqxx::blob::create(tx)};
-  pqxx::blob::remove(tx, id);
-
-  {
-    TempFile f{temp_file, data};
-    pqxx::blob::from_file(tx, temp_file, id);
-  }
-  pqxx::blob::to_buf(tx, id, buf, 10);
-  PQXX_CHECK_EQUAL(buf, data, "Wrong data from blob::from_file().");
-}
-
-
-void test_blob_append_to_buf_appends()
-{
-  std::basic_string<std::byte> const data{
-    std::byte{'b'}, std::byte{'l'}, std::byte{'u'}, std::byte{'b'}};
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::from_buf(tx, data)};
-
-  std::basic_string<std::byte> buf;
-  PQXX_CHECK_EQUAL(
-    pqxx::blob::append_to_buf(tx, id, 0u, buf, 1u), 1u,
-    "append_to_buf() returned unexpected value.");
-  PQXX_CHECK_EQUAL(std::size(buf), 1u, "Appended the wrong number of bytes.");
-  PQXX_CHECK_EQUAL(
-    pqxx::blob::append_to_buf(tx, id, 1u, buf, 5u), 3u,
-    "append_to_buf() returned unexpected value.");
-  PQXX_CHECK_EQUAL(std::size(buf), 4u, "Appended the wrong number of bytes.");
-
-  PQXX_CHECK_EQUAL(
-    buf, data, "Reading using append_to_buf gave us wrong data.");
-}
-
-
-void test_blob_to_file_writes_file()
-{
-  std::basic_string<std::byte> const data{
-    std::byte{'C'}, std::byte{'+'}, std::byte{'+'}};
-
-  char const temp_file[] = "blob-test-to_file.tmp";
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{pqxx::blob::from_buf(tx, data)};
-  std::basic_string<std::byte> buf;
-
-  try
-  {
-    pqxx::blob::to_file(tx, id, temp_file);
-    read_file(temp_file, 10u, buf);
-    std::remove(temp_file);
-  }
-  catch (std::exception const &)
-  {
-    std::remove(temp_file);
-    throw;
-  }
-  PQXX_CHECK_EQUAL(buf, data, "Got wrong data from to_file().");
-}
-
-
-void test_blob_close_leaves_blob_unusable()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto id{
-    pqxx::blob::from_buf(tx, std::basic_string<std::byte>{std::byte{1}})};
-  auto b{pqxx::blob::open_rw(tx, id)};
-  b.close();
-  std::basic_string<std::byte> buf;
-  PQXX_CHECK_THROWS(
-    b.read(buf, 1), pqxx::usage_error,
-    "Reading from closed blob did not fail right.");
-}
-
-
-void test_blob_accepts_std_filesystem_path()
-{
-#if defined(PQXX_HAVE_PATH) && !defined(_WIN32)
-  // A bug in gcc 8's ~std::filesystem::path() causes a run-time crash.
-#  if !defined(__GNUC__) || (__GNUC__ > 8)
-
-  char const temp_file[] = "blob-test-filesystem-path.tmp";
-  std::basic_string<std::byte> const data{std::byte{'4'}, std::byte{'2'}};
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  std::basic_string<std::byte> buf;
-
-  TempFile f{temp_file, data};
-  std::filesystem::path const path{temp_file};
-  auto id{pqxx::blob::from_file(tx, path)};
-  pqxx::blob::to_buf(tx, id, buf, 10);
-  PQXX_CHECK_EQUAL(buf, data, "Wrong data from blob::from_file().");
-
-#  endif
-#endif
-}
-
-
-PQXX_REGISTER_TEST(test_blob_is_useless_by_default);
-PQXX_REGISTER_TEST(test_blob_create_makes_empty_blob);
-PQXX_REGISTER_TEST(test_blob_create_with_oid_requires_oid_be_free);
-PQXX_REGISTER_TEST(test_blob_create_with_oid_obeys_oid);
-PQXX_REGISTER_TEST(test_blobs_are_transactional);
-PQXX_REGISTER_TEST(test_blob_remove_removes_blob);
-PQXX_REGISTER_TEST(test_blob_remove_is_not_idempotent);
-PQXX_REGISTER_TEST(test_blob_checks_open_mode);
-PQXX_REGISTER_TEST(test_blob_supports_move);
-PQXX_REGISTER_TEST(test_blob_read_reads_data);
-PQXX_REGISTER_TEST(test_blob_reads_vector);
-PQXX_REGISTER_TEST(test_blob_read_span);
-PQXX_REGISTER_TEST(test_blob_write_appends_at_insertion_point);
-PQXX_REGISTER_TEST(test_blob_writes_span);
-PQXX_REGISTER_TEST(test_blob_resize_shortens_to_desired_length);
-PQXX_REGISTER_TEST(test_blob_resize_extends_to_desired_length);
-PQXX_REGISTER_TEST(test_blob_tell_tracks_position);
-PQXX_REGISTER_TEST(test_blob_seek_sets_positions);
-PQXX_REGISTER_TEST(test_blob_from_buf_interoperates_with_to_buf);
-PQXX_REGISTER_TEST(test_blob_append_from_buf_appends);
-PQXX_REGISTER_TEST(test_blob_from_file_creates_blob_from_file_contents);
-PQXX_REGISTER_TEST(test_blob_from_file_with_oid_writes_blob);
-PQXX_REGISTER_TEST(test_blob_append_to_buf_appends);
-PQXX_REGISTER_TEST(test_blob_to_file_writes_file);
-PQXX_REGISTER_TEST(test_blob_close_leaves_blob_unusable);
-PQXX_REGISTER_TEST(test_blob_accepts_std_filesystem_path);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_cancel_query.cxx b/ext/libpqxx-7.7.3/test/unit/test_cancel_query.cxx
deleted file mode 100644
index 5329d195f..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_cancel_query.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <pqxx/pipeline>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_cancel_query()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  // Calling cancel_query() while none is in progress has no effect.
-  conn.cancel_query();
-
-  // Nothing much is guaranteed about cancel_query, except that it doesn't make
-  // the process die in flames.
-  pqxx::pipeline p{tx, "test_cancel_query"};
-  p.retain(0);
-  p.insert("SELECT pg_sleep(1)");
-  conn.cancel_query();
-}
-
-
-PQXX_REGISTER_TEST(test_cancel_query);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_column.cxx b/ext/libpqxx-7.7.3/test/unit/test_column.cxx
deleted file mode 100644
index 9c50faff4..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_column.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_table_column()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  tx.exec0("CREATE TEMP TABLE pqxxfoo (x varchar, y integer, z integer)");
-  tx.exec0("INSERT INTO pqxxfoo VALUES ('xx', 1, 2)");
-  auto R{tx.exec("SELECT z,y,x FROM pqxxfoo")};
-  auto X{tx.exec("SELECT x,y,z,99 FROM pqxxfoo")};
-
-  pqxx::row::size_type x{R.table_column(2)}, y{R.table_column(1)},
-    z{R.table_column(static_cast<int>(0))};
-
-  PQXX_CHECK_EQUAL(x, 0, "Wrong column number.");
-  PQXX_CHECK_EQUAL(y, 1, "Wrong column number.");
-  PQXX_CHECK_EQUAL(z, 2, "Wrong column number.");
-
-  x = R.table_column("x");
-  y = R.table_column("y");
-  z = R.table_column("z");
-
-  PQXX_CHECK_EQUAL(x, 0, "Wrong number for named column.");
-  PQXX_CHECK_EQUAL(y, 1, "Wrong number for named column.");
-  PQXX_CHECK_EQUAL(z, 2, "Wrong number for named column.");
-
-  pqxx::row::size_type xx{X[0].table_column(static_cast<int>(0))},
-    yx{X[0].table_column(pqxx::row::size_type(1))}, zx{X[0].table_column("z")};
-
-  PQXX_CHECK_EQUAL(xx, 0, "Bad result from table_column(int).");
-  PQXX_CHECK_EQUAL(yx, 1, "Bad result from table_column(size_type).");
-  PQXX_CHECK_EQUAL(zx, 2, "Bad result from table_column(string).");
-
-  for (pqxx::row::size_type i{0}; i < std::size(R[0]); ++i)
-    PQXX_CHECK_EQUAL(
-      R[0][i].table_column(), R.table_column(i),
-      "Bad result from column_table().");
-
-  int col;
-  PQXX_CHECK_THROWS_EXCEPTION(
-    col = R.table_column(3), "table_column() with invalid index didn't fail.");
-  pqxx::ignore_unused(col);
-
-  PQXX_CHECK_THROWS_EXCEPTION(
-    col = R.table_column("nonexistent"),
-    "table_column() with invalid column name didn't fail.");
-  pqxx::ignore_unused(col);
-
-  PQXX_CHECK_THROWS_EXCEPTION(
-    col = X.table_column(3), "table_column() on non-table didn't fail.");
-  pqxx::ignore_unused(col);
-}
-} // namespace
-
-
-PQXX_REGISTER_TEST(test_table_column);
diff --git a/ext/libpqxx-7.7.3/test/unit/test_composite.cxx b/ext/libpqxx-7.7.3/test/unit/test_composite.cxx
deleted file mode 100644
index dcd65360c..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_composite.cxx
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "../test_helpers.hxx"
-
-#include "pqxx/composite"
-#include "pqxx/transaction"
-
-namespace
-{
-void test_composite()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0("CREATE TYPE pqxxfoo AS (a integer, b text)");
-  auto const r{tx.exec1("SELECT '(5,hello)'::pqxxfoo")};
-
-  int a;
-  std::string b;
-  pqxx::parse_composite(r[0].view(), a, b);
-
-  PQXX_CHECK_EQUAL(a, 5, "Integer composite field came back wrong.");
-  PQXX_CHECK_EQUAL(b, "hello", "String composite field came back wrong.");
-}
-
-
-void test_composite_escapes()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::row r;
-  tx.exec0("CREATE TYPE pqxxsingle AS (x text)");
-  std::string s;
-
-  r = tx.exec1(R"--(SELECT '("a""b")'::pqxxsingle)--");
-  pqxx::parse_composite(r[0].view(), s);
-  PQXX_CHECK_EQUAL(
-    s, "a\"b", "Double-double-quotes escaping did not parse correctly.");
-
-  r = tx.exec1(R"--(SELECT '("a\"b")'::pqxxsingle)--");
-  pqxx::parse_composite(r[0].view(), s);
-  PQXX_CHECK_EQUAL(s, "a\"b", "Backslash escaping did not parse correctly.");
-}
-
-
-void test_composite_handles_nulls()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::row r;
-
-  tx.exec0("CREATE TYPE pqxxnull AS (a integer)");
-  int nonnull;
-  r = tx.exec1("SELECT '()'::pqxxnull");
-  PQXX_CHECK_THROWS(
-    pqxx::parse_composite(r[0].view(), nonnull), pqxx::conversion_error,
-    "No conversion error when reading a null into a nulless variable.");
-  std::optional<int> nullable{5};
-  pqxx::parse_composite(r[0].view(), nullable);
-  PQXX_CHECK(
-    not nullable.has_value(), "Null integer came out as having a value.");
-
-  tx.exec0("CREATE TYPE pqxxnulls AS (a integer, b integer)");
-  std::optional<int> a{2}, b{4};
-  r = tx.exec1("SELECT '(,)'::pqxxnulls");
-  pqxx::parse_composite(r[0].view(), a, b);
-  PQXX_CHECK(not a.has_value(), "Null first integer stored as value.");
-  PQXX_CHECK(not b.has_value(), "Null second integer stored as value.");
-}
-
-
-void test_composite_renders_to_string()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  char buf[1000];
-
-  pqxx::composite_into_buf(
-    std::begin(buf), std::end(buf), 355, "foo", "b\na\\r");
-  PQXX_CHECK_EQUAL(
-    std::string{buf}, "(355,\"foo\",\"b\na\\\\r\")",
-    "Composite was not rendered as expected.");
-
-  tx.exec0("CREATE TYPE pqxxcomp AS (a integer, b text, c text)");
-  auto const r{tx.exec1("SELECT '" + std::string{buf} + "'::pqxxcomp")};
-
-  int a;
-  std::string b, c;
-  bool const nonnull{r[0].composite_to(a, b, c)};
-  PQXX_CHECK(nonnull, "Mistaken nullness.");
-  PQXX_CHECK_EQUAL(a, 355, "Int came back wrong.");
-  PQXX_CHECK_EQUAL(b, "foo", "Simple string came back wrong.");
-  PQXX_CHECK_EQUAL(c, "b\na\\r", "Escaping went wrong.");
-}
-
-
-PQXX_REGISTER_TEST(test_composite);
-PQXX_REGISTER_TEST(test_composite_escapes);
-PQXX_REGISTER_TEST(test_composite_handles_nulls);
-PQXX_REGISTER_TEST(test_composite_renders_to_string);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_connection.cxx b/ext/libpqxx-7.7.3/test/unit/test_connection.cxx
deleted file mode 100644
index bbb780854..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_connection.cxx
+++ /dev/null
@@ -1,212 +0,0 @@
-#include <numeric>
-
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_connection_string_constructor()
-{
-  pqxx::connection c1{""};
-  pqxx::connection c2{std::string{}};
-}
-
-
-void test_move_constructor()
-{
-  pqxx::connection c1;
-  PQXX_CHECK(c1.is_open(), "New connection is not open.");
-
-  pqxx::connection c2{std::move(c1)};
-
-  PQXX_CHECK(not c1.is_open(), "Moving did not close original connection.");
-  PQXX_CHECK(c2.is_open(), "Moved constructor is not open.");
-
-  pqxx::work tx{c2};
-  PQXX_CHECK_EQUAL(tx.query_value<int>("SELECT 5"), 5, "Weird result!");
-
-  PQXX_CHECK_THROWS(
-    pqxx::connection c3{std::move(c2)}, pqxx::usage_error,
-    "Moving a connection with a transaction open should be an error.");
-}
-
-
-void test_move_assign()
-{
-  pqxx::connection c1;
-  pqxx::connection c2;
-
-  c2.close();
-
-  c2 = std::move(c1);
-
-  PQXX_CHECK(not c1.is_open(), "Connection still open after being moved out.");
-  PQXX_CHECK(c2.is_open(), "Moved constructor is not open.");
-
-  {
-    pqxx::work tx1{c2};
-    PQXX_CHECK_EQUAL(tx1.query_value<int>("SELECT 8"), 8, "What!?");
-
-    pqxx::connection c3;
-    PQXX_CHECK_THROWS(
-      c3 = std::move(c2), pqxx::usage_error,
-      "Moving a connection with a transaction open should be an error.");
-
-    PQXX_CHECK_THROWS(
-      c2 = std::move(c3), pqxx::usage_error,
-      "Moving a connection onto one with a transaction open should be "
-      "an error.");
-  }
-
-  // After failed move attempts, the connection is still usable.
-  pqxx::work tx2{c2};
-  PQXX_CHECK_EQUAL(tx2.query_value<int>("SELECT 6"), 6, "Huh!?");
-}
-
-
-void test_encrypt_password()
-{
-  pqxx::connection c;
-  auto pw{c.encrypt_password("user", "password")};
-  PQXX_CHECK(not std::empty(pw), "Encrypted password was empty.");
-  PQXX_CHECK_EQUAL(
-    std::strlen(pw.c_str()), std::size(pw),
-    "Encrypted password contains a null byte.");
-}
-
-
-void test_connection_string()
-{
-  pqxx::connection c;
-  std::string const connstr{c.connection_string()};
-
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable : 4996)
-#endif
-  if (std::getenv("PGUSER") == nullptr)
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#endif
-  {
-    PQXX_CHECK(
-      connstr.find("user=" + std::string{c.username()}) != std::string::npos,
-      "Connection string did not specify user name: " + connstr);
-  }
-  else
-  {
-    PQXX_CHECK(
-      connstr.find("user=" + std::string{c.username()}) == std::string::npos,
-      "Connection string specified user name, even when using default: " +
-        connstr);
-  }
-}
-
-
-#if defined(PQXX_HAVE_CONCEPTS)
-template<typename STR> std::size_t length(STR const &str)
-{
-  return std::size(str);
-}
-
-
-std::size_t length(char const str[])
-{
-  return std::strlen(str);
-}
-#endif // PQXX_HAVE_CONCEPTS
-
-
-template<typename MAP> void test_params_type()
-{
-#if defined(PQXX_HAVE_CONCEPTS)
-  using item_t = std::remove_reference_t<
-    decltype(*std::declval<std::ranges::iterator_t<MAP>>())>;
-  using key_t = decltype(std::get<0>(std::declval<item_t>()));
-  using value_t = decltype(std::get<1>(std::declval<item_t>()));
-
-  // Set some parameters that are relatively safe to change arbitrarily.
-  MAP const params{{
-    {key_t{"application_name"}, value_t{"pqxx-test"}},
-    {key_t{"connect_timeout"}, value_t{"96"}},
-    {key_t{"keepalives_idle"}, value_t{"771"}},
-  }};
-
-  // Can we create a connection from these parameters?
-  pqxx::connection c{params};
-
-  // Check that the parameters came through in the connection string.
-  // We don't know the exact format, but the parameters have to be in there.
-  auto const min_size{std::accumulate(
-    std::cbegin(params), std::cend(params), std::size(params) - 1,
-    [](auto count, auto item) {
-      return count + length(std::get<0>(item)) + 1 + length(std::get<1>(item));
-    })};
-
-  auto const connstr{c.connection_string()};
-  PQXX_CHECK_GREATER_EQUAL(
-    std::size(connstr), min_size,
-    "Connection string can't possibly contain the options we gave.");
-  for (auto const &[key, value] : params)
-  {
-    PQXX_CHECK_NOT_EQUAL(
-      connstr.find(key), std::string::npos,
-      "Could not find param name '" + std::string{key} +
-        "' in connection string: " + connstr);
-    PQXX_CHECK_NOT_EQUAL(
-      connstr.find(value), std::string::npos,
-      "Could not find value for '" + std::string{value} +
-        "' in connection string: " + connstr);
-  }
-#endif // PQXX_HAVE_CONCEPTS
-}
-
-
-void test_connection_params()
-{
-  // Connecting in this way supports a wide variety of formats for the
-  // parameters.
-  test_params_type<std::map<char const *, char const *>>();
-  test_params_type<std::map<pqxx::zview, pqxx::zview>>();
-  test_params_type<std::map<std::string, std::string>>();
-  test_params_type<std::map<std::string, pqxx::zview>>();
-  test_params_type<std::map<pqxx::zview, char const *>>();
-  test_params_type<std::vector<std::tuple<char const *, char const *>>>();
-  test_params_type<std::vector<std::tuple<pqxx::zview, std::string>>>();
-  test_params_type<std::vector<std::pair<std::string, char const *>>>();
-  test_params_type<std::vector<std::array<std::string, 2>>>();
-}
-
-
-void test_raw_connection()
-{
-  pqxx::connection conn1;
-  PQXX_CHECK(conn1.is_open(), "Fresh connection is not open!");
-  pqxx::work tx1{conn1};
-  PQXX_CHECK_EQUAL(
-    tx1.query_value<int>("SELECT 8"), 8, "Something weird happened.");
-  pqxx::internal::pq::PGconn *raw{std::move(conn1).release_raw_connection()};
-  PQXX_CHECK(raw != nullptr, "Raw connection is null.");
-  PQXX_CHECK(
-    not conn1.is_open(),
-    "Releasing raw connection did not close pqxx::connection.");
-
-  pqxx::connection conn2{pqxx::connection::seize_raw_connection(raw)};
-  PQXX_CHECK(
-    conn2.is_open(), "Can't produce open connection from raw connection.");
-  pqxx::work tx2{conn2};
-  PQXX_CHECK_EQUAL(
-    tx2.query_value<int>("SELECT 9"), 9,
-    "Raw connection did not produce a working new connection.");
-}
-
-
-PQXX_REGISTER_TEST(test_connection_string_constructor);
-PQXX_REGISTER_TEST(test_move_constructor);
-PQXX_REGISTER_TEST(test_move_assign);
-PQXX_REGISTER_TEST(test_encrypt_password);
-PQXX_REGISTER_TEST(test_connection_string);
-PQXX_REGISTER_TEST(test_connection_params);
-PQXX_REGISTER_TEST(test_raw_connection);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_cursor.cxx b/ext/libpqxx-7.7.3/test/unit/test_cursor.cxx
deleted file mode 100644
index 8761f6946..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_cursor.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <pqxx/cursor>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_stateless_cursor_provides_random_access(pqxx::connection &conn)
-{
-  pqxx::work tx{conn};
-  pqxx::stateless_cursor<
-    pqxx::cursor_base::read_only, pqxx::cursor_base::owned>
-    c{tx, "SELECT * FROM generate_series(0, 3)", "count", false};
-
-  auto r{c.retrieve(1, 2)};
-  PQXX_CHECK_EQUAL(std::size(r), 1, "Wrong number of rows from retrieve().");
-  PQXX_CHECK_EQUAL(r[0][0].as<int>(), 1, "Cursor retrieved wrong data.");
-
-  r = c.retrieve(3, 10);
-  PQXX_CHECK_EQUAL(std::size(r), 1, "Expected 1 row retrieving past end.");
-  PQXX_CHECK_EQUAL(r[0][0].as<int>(), 3, "Wrong data retrieved at end.");
-
-  r = c.retrieve(0, 1);
-  PQXX_CHECK_EQUAL(std::size(r), 1, "Wrong number of rows back at beginning.");
-  PQXX_CHECK_EQUAL(r[0][0].as<int>(), 0, "Wrong data back at beginning.");
-}
-
-
-void test_stateless_cursor_ignores_trailing_semicolon(pqxx::connection &conn)
-{
-  pqxx::work tx{conn};
-  pqxx::stateless_cursor<
-    pqxx::cursor_base::read_only, pqxx::cursor_base::owned>
-    c{tx, "SELECT * FROM generate_series(0, 3)  ;; ; \n \t  ", "count", false};
-
-  auto r{c.retrieve(1, 2)};
-  PQXX_CHECK_EQUAL(std::size(r), 1, "Trailing semicolon confused retrieve().");
-}
-
-
-void test_cursor()
-{
-  pqxx::connection conn;
-  test_stateless_cursor_provides_random_access(conn);
-  test_stateless_cursor_ignores_trailing_semicolon(conn);
-}
-
-
-PQXX_REGISTER_TEST(test_cursor);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_encodings.cxx b/ext/libpqxx-7.7.3/test/unit/test_encodings.cxx
deleted file mode 100644
index 4374671c6..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_encodings.cxx
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "../test_helpers.hxx"
-
-#include "pqxx/internal/encodings.hxx"
-
-
-namespace
-{
-void test_scan_ascii()
-{
-  auto const scan{pqxx::internal::get_glyph_scanner(
-    pqxx::internal::encoding_group::MONOBYTE)};
-  std::string const text{"hello"};
-
-  PQXX_CHECK_EQUAL(
-    scan(text.c_str(), std::size(text), 0), 1ul,
-    "Monobyte scanner acting up.");
-  PQXX_CHECK_EQUAL(
-    scan(text.c_str(), std::size(text), 1), 2ul,
-    "Monobyte scanner is inconsistent.");
-}
-
-
-void test_scan_utf8()
-{
-  auto const scan{
-    pqxx::internal::get_glyph_scanner(pqxx::internal::encoding_group::UTF8)};
-
-  // Thai: "Khrab".
-  std::string const text{"\xe0\xb8\x95\xe0\xb8\xa3\xe0\xb8\xb1\xe0\xb8\x9a"};
-  PQXX_CHECK_EQUAL(
-    scan(text.c_str(), std::size(text), 0), 3ul,
-    "UTF-8 scanner mis-scanned Thai khor khwai.");
-  PQXX_CHECK_EQUAL(
-    scan(text.c_str(), std::size(text), 3), 6ul,
-    "UTF-8 scanner mis-scanned Thai ror reua.");
-}
-
-
-void test_for_glyphs_empty()
-{
-  bool iterated{false};
-  pqxx::internal::for_glyphs(
-    pqxx::internal::encoding_group::MONOBYTE,
-    [&iterated](char const *, char const *) { iterated = true; }, "", 0);
-  PQXX_CHECK(!iterated, "Empty string went through an iteration.");
-}
-
-
-void test_for_glyphs_ascii()
-{
-  std::string const text{"hi"};
-  std::vector<std::ptrdiff_t> points;
-
-  pqxx::internal::for_glyphs(
-    pqxx::internal::encoding_group::UTF8,
-    [&points](char const *gbegin, char const *gend) {
-      points.push_back(gend - gbegin);
-    },
-    text.c_str(), std::size(text));
-
-  PQXX_CHECK_EQUAL(std::size(points), 2u, "Wrong number of ASCII iterations.");
-  PQXX_CHECK_EQUAL(points[0], 1u, "ASCII iteration started off wrong.");
-  PQXX_CHECK_EQUAL(points[1], 1u, "ASCII iteration was inconsistent.");
-}
-
-
-void test_for_glyphs_utf8()
-{
-  // Greek: alpha omega.
-  std::string const text{"\xce\x91\xce\xa9"};
-  std::vector<std::ptrdiff_t> points;
-
-  pqxx::internal::for_glyphs(
-    pqxx::internal::encoding_group::UTF8,
-    [&points](char const *gbegin, char const *gend) {
-      points.push_back(gend - gbegin);
-    },
-    text.c_str(), std::size(text));
-
-  PQXX_CHECK_EQUAL(std::size(points), 2u, "Wrong number of UTF-8 iterations.");
-  PQXX_CHECK_EQUAL(points[0], 2u, "UTF-8 iteration started off wrong.");
-  PQXX_CHECK_EQUAL(points[1], 2u, "ASCII iteration was inconsistent.");
-
-  // Greek lambda, ASCII plus sign, Old Persian Gu.
-  std::string const mix{"\xce\xbb+\xf0\x90\x8e\xa6"};
-  points.clear();
-
-  pqxx::internal::for_glyphs(
-    pqxx::internal::encoding_group::UTF8,
-    [&points](char const *gbegin, char const *gend) {
-      points.push_back(gend - gbegin);
-    },
-    mix.c_str(), std::size(mix));
-
-  PQXX_CHECK_EQUAL(std::size(points), 3u, "Mixed UTF-8 iteration is broken.");
-  PQXX_CHECK_EQUAL(points[0], 2u, "Mixed UTF-8 iteration started off wrong.");
-  PQXX_CHECK_EQUAL(points[1], 1u, "Mixed UTF-8 iteration got ASCII wrong.");
-  PQXX_CHECK_EQUAL(
-    points[2], 4u, "Mixed UTF-8 iteration got long char wrong.");
-}
-
-
-void test_encodings()
-{
-  test_scan_ascii();
-  test_scan_utf8();
-  test_for_glyphs_empty();
-  test_for_glyphs_ascii();
-  test_for_glyphs_utf8();
-}
-
-
-PQXX_REGISTER_TEST(test_encodings);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_error_verbosity.cxx b/ext/libpqxx-7.7.3/test/unit/test_error_verbosity.cxx
deleted file mode 100644
index 67dc88763..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_error_verbosity.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-extern "C"
-{
-#include <libpq-fe.h>
-}
-
-namespace
-{
-void test_error_verbosity()
-{
-  PQXX_CHECK_EQUAL(
-    static_cast<int>(pqxx::error_verbosity::terse),
-    static_cast<int>(PQERRORS_TERSE),
-    "error_verbosity enum should match PGVerbosity.");
-  PQXX_CHECK_EQUAL(
-    static_cast<int>(pqxx::error_verbosity::normal),
-    static_cast<int>(PQERRORS_DEFAULT),
-    "error_verbosity enum should match PGVerbosity.");
-  PQXX_CHECK_EQUAL(
-    static_cast<int>(pqxx::error_verbosity::verbose),
-    static_cast<int>(PQERRORS_VERBOSE),
-    "error_verbosity enum should match PGVerbosity.");
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  conn.set_verbosity(pqxx::error_verbosity::terse);
-  tx.exec1("SELECT 1");
-  conn.set_verbosity(pqxx::error_verbosity::verbose);
-  tx.exec1("SELECT 2");
-}
-
-
-PQXX_REGISTER_TEST(test_error_verbosity);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_errorhandler.cxx b/ext/libpqxx-7.7.3/test/unit/test_errorhandler.cxx
deleted file mode 100644
index c2cd4a797..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_errorhandler.cxx
+++ /dev/null
@@ -1,223 +0,0 @@
-#include <vector>
-
-#include <pqxx/connection>
-#include <pqxx/errorhandler>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-class TestErrorHandler final : public pqxx::errorhandler
-{
-public:
-  TestErrorHandler(
-    pqxx::connection &c, std::vector<TestErrorHandler *> &activated_handlers,
-    bool retval = true) :
-          pqxx::errorhandler(c),
-          return_value(retval),
-          message(),
-          handler_list(activated_handlers)
-  {}
-
-  bool operator()(char const msg[]) noexcept override
-  {
-    message = std::string{msg};
-    handler_list.push_back(this);
-    return return_value;
-  }
-
-  bool return_value;
-  std::string message;
-  std::vector<TestErrorHandler *> &handler_list;
-};
-} // namespace
-
-
-namespace pqxx
-{
-template<> struct nullness<TestErrorHandler *>
-{
-  // clang warns about these being unused.  And clang 6 won't accept a
-  // [[maybe_unused]] attribute on them either!
-
-  // static inline constexpr bool has_null{true};
-  // static inline constexpr bool always_null{false};
-
-  static constexpr bool is_null(TestErrorHandler *e) noexcept
-  {
-    return e == nullptr;
-  }
-  static constexpr TestErrorHandler *null() noexcept { return nullptr; }
-};
-
-
-template<> struct string_traits<TestErrorHandler *>
-{
-  static constexpr std::size_t size_buffer(TestErrorHandler *const &) noexcept
-  {
-    return 100;
-  }
-
-  static char *into_buf(char *begin, char *end, TestErrorHandler *const &value)
-  {
-    std::string text{"TestErrorHandler at " + pqxx::to_string(value)};
-    if (pqxx::internal::cmp_greater_equal(std::size(text), end - begin))
-      throw conversion_overrun{"Not enough buffer for TestErrorHandler."};
-    std::memcpy(begin, text.c_str(), std::size(text) + 1);
-    return begin + std::size(text) + 1;
-  }
-};
-} // namespace pqxx
-
-
-namespace
-{
-void test_process_notice_calls_errorhandler(pqxx::connection &c)
-{
-  std::vector<TestErrorHandler *> dummy;
-  TestErrorHandler handler(c, dummy);
-  c.process_notice("Error!\n");
-  PQXX_CHECK_EQUAL(handler.message, "Error!\n", "Error not handled.");
-}
-
-
-void test_error_handlers_get_called_newest_to_oldest(pqxx::connection &c)
-{
-  std::vector<TestErrorHandler *> handlers;
-  TestErrorHandler h1(c, handlers);
-  TestErrorHandler h2(c, handlers);
-  TestErrorHandler h3(c, handlers);
-  c.process_notice("Warning.\n");
-  PQXX_CHECK_EQUAL(h3.message, "Warning.\n", "Message not handled.");
-  PQXX_CHECK_EQUAL(h2.message, "Warning.\n", "Broken handling chain.");
-  PQXX_CHECK_EQUAL(h1.message, "Warning.\n", "Insane handling chain.");
-  PQXX_CHECK_EQUAL(std::size(handlers), 3u, "Wrong number of handler calls.");
-  PQXX_CHECK_EQUAL(&h3, handlers[0], "Unexpected handling order.");
-  PQXX_CHECK_EQUAL(&h2, handlers[1], "Insane handling order.");
-  PQXX_CHECK_EQUAL(&h1, handlers[2], "Impossible handling order.");
-}
-
-void test_returning_false_stops_error_handling(pqxx::connection &c)
-{
-  std::vector<TestErrorHandler *> handlers;
-  TestErrorHandler starved(c, handlers);
-  TestErrorHandler blocker(c, handlers, false);
-  c.process_notice("Error output.\n");
-  PQXX_CHECK_EQUAL(std::size(handlers), 1u, "Handling chain was not stopped.");
-  PQXX_CHECK_EQUAL(handlers[0], &blocker, "Wrong handler got message.");
-  PQXX_CHECK_EQUAL(blocker.message, "Error output.\n", "Didn't get message.");
-  PQXX_CHECK_EQUAL(starved.message, "", "Message received; it shouldn't be.");
-}
-
-void test_destroyed_error_handlers_are_not_called(pqxx::connection &c)
-{
-  std::vector<TestErrorHandler *> handlers;
-  {
-    TestErrorHandler doomed(c, handlers);
-  }
-  c.process_notice("Unheard output.");
-  PQXX_CHECK(
-    std::empty(handlers), "Message was received on dead errorhandler.");
-}
-
-void test_destroying_connection_unregisters_handlers()
-{
-  TestErrorHandler *survivor;
-  std::vector<TestErrorHandler *> handlers;
-  {
-    pqxx::connection c;
-    survivor = new TestErrorHandler(c, handlers);
-  }
-  // Make some pointless use of survivor just to prove that this doesn't crash.
-  (*survivor)("Hi");
-  PQXX_CHECK_EQUAL(
-    std::size(handlers), 1u, "Ghost of dead ex-connection haunts handler.");
-  delete survivor;
-}
-
-
-class MinimalErrorHandler final : public pqxx::errorhandler
-{
-public:
-  explicit MinimalErrorHandler(pqxx::connection &c) : pqxx::errorhandler(c) {}
-  bool operator()(char const[]) noexcept override { return true; }
-};
-
-
-void test_get_errorhandlers(pqxx::connection &c)
-{
-  std::unique_ptr<MinimalErrorHandler> eh3;
-  auto const handlers_before{c.get_errorhandlers()};
-  std::size_t const base_handlers{std::size(handlers_before)};
-
-  {
-    MinimalErrorHandler eh1(c);
-    auto const handlers_with_eh1{c.get_errorhandlers()};
-    PQXX_CHECK_EQUAL(
-      std::size(handlers_with_eh1), base_handlers + 1,
-      "Registering a handler didn't create exactly one handler.");
-    PQXX_CHECK_EQUAL(
-      std::size_t(*std::rbegin(handlers_with_eh1)), std::size_t(&eh1),
-      "Wrong handler or wrong order.");
-
-    {
-      MinimalErrorHandler eh2(c);
-      auto const handlers_with_eh2{c.get_errorhandlers()};
-      PQXX_CHECK_EQUAL(
-        std::size(handlers_with_eh2), base_handlers + 2,
-        "Adding second handler didn't work.");
-      PQXX_CHECK_EQUAL(
-        std::size_t(*(std::rbegin(handlers_with_eh2) + 1)), std::size_t(&eh1),
-        "Second handler upset order.");
-      PQXX_CHECK_EQUAL(
-        std::size_t(*std::rbegin(handlers_with_eh2)), std::size_t(&eh2),
-        "Second handler isn't right.");
-    }
-    auto const handlers_without_eh2{c.get_errorhandlers()};
-    PQXX_CHECK_EQUAL(
-      std::size(handlers_without_eh2), base_handlers + 1,
-      "Handler destruction produced wrong-sized handlers list.");
-    PQXX_CHECK_EQUAL(
-      std::size_t(*std::rbegin(handlers_without_eh2)), std::size_t(&eh1),
-      "Destroyed wrong handler.");
-
-    eh3 = std::make_unique<MinimalErrorHandler>(c);
-    auto const handlers_with_eh3{c.get_errorhandlers()};
-    PQXX_CHECK_EQUAL(
-      std::size(handlers_with_eh3), base_handlers + 2,
-      "Remove-and-add breaks.");
-    PQXX_CHECK_EQUAL(
-      std::size_t(*std::rbegin(handlers_with_eh3)), std::size_t(eh3.get()),
-      "Added wrong third handler.");
-  }
-  auto const handlers_without_eh1{c.get_errorhandlers()};
-  PQXX_CHECK_EQUAL(
-    std::size(handlers_without_eh1), base_handlers + 1,
-    "Destroying oldest handler didn't work as expected.");
-  PQXX_CHECK_EQUAL(
-    std::size_t(*std::rbegin(handlers_without_eh1)), std::size_t(eh3.get()),
-    "Destroyed wrong handler.");
-
-  eh3.reset();
-
-  auto const handlers_without_all{c.get_errorhandlers()};
-  PQXX_CHECK_EQUAL(
-    std::size(handlers_without_all), base_handlers,
-    "Destroying all custom handlers didn't work as expected.");
-}
-
-
-void test_errorhandler()
-{
-  pqxx::connection conn;
-  test_process_notice_calls_errorhandler(conn);
-  test_error_handlers_get_called_newest_to_oldest(conn);
-  test_returning_false_stops_error_handling(conn);
-  test_destroyed_error_handlers_are_not_called(conn);
-  test_destroying_connection_unregisters_handlers();
-  test_get_errorhandlers(conn);
-}
-
-
-PQXX_REGISTER_TEST(test_errorhandler);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_escape.cxx b/ext/libpqxx-7.7.3/test/unit/test_escape.cxx
deleted file mode 100644
index baff4d62c..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_escape.cxx
+++ /dev/null
@@ -1,228 +0,0 @@
-#include <iostream>
-
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-using namespace std::literals;
-
-
-void compare_esc(
-  pqxx::connection &c, pqxx::transaction_base &t, char const text[])
-{
-  std::size_t const len{std::size(std::string{text})};
-  PQXX_CHECK_EQUAL(
-    c.esc(std::string_view{text, len}), t.esc(std::string_view{text, len}),
-    "Connection & transaction escape differently.");
-
-  PQXX_CHECK_EQUAL(
-    t.esc(std::string_view{text, len}), t.esc(text),
-    "Length argument to esc() changes result.");
-
-  PQXX_CHECK_EQUAL(
-    t.esc(std::string{text}), t.esc(text),
-    "esc(std::string()) differs from esc(char const[]).");
-
-  PQXX_CHECK_EQUAL(
-    text,
-    t.query_value<std::string>(
-      "SELECT '" + t.esc(std::string_view{text, len}) + "'"),
-    "esc() is not idempotent.");
-
-  PQXX_CHECK_EQUAL(
-    t.esc(std::string_view{text, len}), t.esc(text),
-    "Oversized buffer affects esc().");
-}
-
-
-void test_esc(pqxx::connection &c, pqxx::transaction_base &t)
-{
-  PQXX_CHECK_EQUAL(
-    t.esc(std::string_view{"", 0}), "",
-    "Empty string doesn't escape properly.");
-  PQXX_CHECK_EQUAL(
-    t.esc(std::string_view{"'", 1}), "''",
-    "Single quote escaped incorrectly.");
-  PQXX_CHECK_EQUAL(
-    t.esc(std::string_view{"hello"}), "hello", "Trivial escape went wrong.");
-  char const *const escstrings[]{"x", " ", "", nullptr};
-  for (std::size_t i{0}; escstrings[i] != nullptr; ++i)
-    compare_esc(c, t, escstrings[i]);
-}
-
-
-void test_quote(pqxx::connection &c, pqxx::transaction_base &t)
-{
-  PQXX_CHECK_EQUAL(t.quote("x"), "'x'", "Basic quote() fails.");
-  PQXX_CHECK_EQUAL(
-    t.quote(1), "'1'", "quote() not dealing with int properly.");
-  PQXX_CHECK_EQUAL(t.quote(0), "'0'", "Quoting zero is a problem.");
-  char const *const null_ptr{nullptr};
-  PQXX_CHECK_EQUAL(t.quote(null_ptr), "NULL", "Not quoting NULL correctly.");
-  PQXX_CHECK_EQUAL(
-    t.quote(std::string{"'"}), "''''", "Escaping quotes goes wrong.");
-
-  PQXX_CHECK_EQUAL(
-    t.quote("x"), c.quote("x"),
-    "Connection and transaction quote differently.");
-
-  char const *test_strings[]{"",   "x",   "\\", "\\\\", "'",
-                             "''", "\\'", "\t", "\n",   nullptr};
-
-  for (std::size_t i{0}; test_strings[i] != nullptr; ++i)
-  {
-    auto r{t.query_value<std::string>("SELECT " + t.quote(test_strings[i]))};
-    PQXX_CHECK_EQUAL(
-      r, test_strings[i], "Selecting quoted string does not come back equal.");
-  }
-}
-
-
-void test_quote_name(pqxx::transaction_base &t)
-{
-  PQXX_CHECK_EQUAL(
-    "\"A b\"", t.quote_name("A b"), "Escaped identifier is not as expected.");
-  PQXX_CHECK_EQUAL(
-    std::string{"A b"},
-    t.exec("SELECT 1 AS " + t.quote_name("A b")).column_name(0),
-    "Escaped identifier does not work in SQL.");
-}
-
-
-void test_esc_raw_unesc_raw(pqxx::transaction_base &t)
-{
-  constexpr char binary[]{"1\0023\\4x5"};
-  std::basic_string<std::byte> const data(
-    reinterpret_cast<std::byte const *>(binary), std::size(binary));
-  std::string const escaped{t.esc_raw(
-    std::basic_string_view<std::byte>{std::data(data), std::size(binary)})};
-
-  for (auto const i : escaped)
-  {
-    PQXX_CHECK_GREATER(
-      static_cast<unsigned>(static_cast<unsigned char>(i)), 7u,
-      "Non-ASCII character in escaped data: " + escaped);
-    PQXX_CHECK_LESS(
-      static_cast<unsigned>(static_cast<unsigned char>(i)), 127u,
-      "Non-ASCII character in escaped data: " + escaped);
-  }
-
-  for (auto const i : escaped)
-    PQXX_CHECK(
-      isprint(i), "Unprintable character in escaped data: " + escaped);
-
-  PQXX_CHECK_EQUAL(
-    escaped, "\\x3102335c34783500", "Binary data escaped wrong.");
-  PQXX_CHECK_EQUAL(
-    std::size(t.unesc_bin(escaped)), std::size(data),
-    "Wrong size after unescaping.");
-  auto unescaped{t.unesc_bin(escaped)};
-  PQXX_CHECK_EQUAL(
-    std::size(unescaped), std::size(data),
-    "Unescaping did not restore original size.");
-  for (std::size_t i{0}; i < std::size(unescaped); ++i)
-    PQXX_CHECK_EQUAL(
-      int(unescaped[i]), int(data[i]),
-      "Unescaping binary data did not restore byte #" + pqxx::to_string(i) +
-        ".");
-}
-
-
-void test_esc_like(pqxx::transaction_base &tx)
-{
-  PQXX_CHECK_EQUAL(tx.esc_like(""), "", "esc_like breaks on empty string.");
-  PQXX_CHECK_EQUAL(tx.esc_like("abc"), "abc", "esc_like is broken.");
-  PQXX_CHECK_EQUAL(tx.esc_like("_"), "\\_", "esc_like fails on underscore.");
-  PQXX_CHECK_EQUAL(tx.esc_like("%"), "\\%", "esc_like fails on %.");
-  PQXX_CHECK_EQUAL(
-    tx.esc_like("a%b_c"), "a\\%b\\_c", "esc_like breaks on mix.");
-  PQXX_CHECK_EQUAL(
-    tx.esc_like("_", '+'), "+_", "esc_like ignores escape character.");
-}
-
-
-void test_escaping()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  test_esc(conn, tx);
-  test_quote(conn, tx);
-  test_quote_name(tx);
-  test_esc_raw_unesc_raw(tx);
-  test_esc_like(tx);
-}
-
-
-void test_esc_escapes_into_buffer()
-{
-#if defined(PQXX_HAVE_CONCEPTS)
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  std::string buffer;
-  buffer.resize(20);
-
-  auto const text{"Ain't"sv};
-  auto escaped_text{tx.esc(text, buffer)};
-  PQXX_CHECK_EQUAL(escaped_text, "Ain''t", "Escaping into buffer went wrong.");
-
-  std::basic_string<std::byte> const data{std::byte{0x22}, std::byte{0x43}};
-  auto escaped_data(tx.esc(data, buffer));
-  PQXX_CHECK_EQUAL(escaped_data, "\\x2243", "Binary data escaped wrong.");
-#endif
-}
-
-
-void test_esc_accepts_various_types()
-{
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  std::string buffer;
-  buffer.resize(20);
-
-  std::string const text{"it's"};
-  auto escaped_text{tx.esc(text, buffer)};
-  PQXX_CHECK_EQUAL(escaped_text, "it''s", "Escaping into buffer went wrong.");
-
-  std::vector<std::byte> const data{std::byte{0x23}, std::byte{0x44}};
-  auto escaped_data(tx.esc(data, buffer));
-  PQXX_CHECK_EQUAL(escaped_data, "\\x2344", "Binary data escaped wrong.");
-#endif
-}
-
-
-void test_binary_esc_checks_buffer_length()
-{
-#if defined(PQXX_HAVE_CONCEPTS) && defined(PQXX_HAVE_SPAN)
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  std::string buf;
-  std::basic_string<std::byte> bin{
-    std::byte{'b'}, std::byte{'o'}, std::byte{'o'}};
-
-  buf.resize(2 * std::size(bin) + 3);
-  pqxx::ignore_unused(tx.esc(bin, buf));
-  PQXX_CHECK_EQUAL(int{buf[0]}, int{'\\'}, "Unexpected binary escape format.");
-  PQXX_CHECK_NOT_EQUAL(
-    int(buf[std::size(buf) - 2]), int('\0'), "Escaped binary ends too soon.");
-  PQXX_CHECK_EQUAL(
-    int(buf[std::size(buf) - 1]), int('\0'), "Terminating zero is missing.");
-
-  buf.resize(2 * std::size(bin) + 2);
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(tx.esc(bin, buf)), pqxx::range_error,
-    "Didn't get expected exception from escape overrun.");
-#endif
-}
-
-
-PQXX_REGISTER_TEST(test_escaping);
-PQXX_REGISTER_TEST(test_esc_escapes_into_buffer);
-PQXX_REGISTER_TEST(test_esc_accepts_various_types);
-PQXX_REGISTER_TEST(test_binary_esc_checks_buffer_length);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_exceptions.cxx b/ext/libpqxx-7.7.3/test/unit/test_exceptions.cxx
deleted file mode 100644
index 4b84b7fba..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_exceptions.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <pqxx/except>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-
-namespace
-{
-void test_exceptions()
-{
-  std::string const broken_query{"SELECT HORRIBLE ERROR"},
-    err{"Error message"};
-
-  try
-  {
-    throw pqxx::sql_error{err, broken_query};
-  }
-  catch (std::exception const &e)
-  {
-    PQXX_CHECK_EQUAL(e.what(), err, "Exception contains wrong message.");
-    auto downcast{dynamic_cast<pqxx::sql_error const *>(&e)};
-    PQXX_CHECK(
-      downcast != nullptr, "exception-to-sql_error downcast is broken.");
-    PQXX_CHECK_EQUAL(
-      downcast->query(), broken_query,
-      "Getting query from pqxx exception is broken.");
-  }
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  try
-  {
-    tx.exec("INVALID QUERY HERE");
-  }
-  catch (pqxx::syntax_error const &e)
-  {
-    // SQL syntax error has sqlstate error 42601.
-    PQXX_CHECK_EQUAL(
-      e.sqlstate(), "42601", "Unexpected sqlstate on syntax error.");
-  }
-}
-
-
-PQXX_REGISTER_TEST(test_exceptions);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_field.cxx b/ext/libpqxx-7.7.3/test/unit/test_field.cxx
deleted file mode 100644
index 013ea1a82..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_field.cxx
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_field()
-{
-  pqxx::connection c;
-  pqxx::work tx{c};
-  auto const r1{tx.exec1("SELECT 9")};
-  auto const &f1{r1[0]};
-
-  PQXX_CHECK_EQUAL(f1.as<std::string>(), "9", "as<string>() is broken.");
-  PQXX_CHECK_EQUAL(
-    f1.as<std::string>("z"), "9", "as<string>(string) is broken.");
-
-  PQXX_CHECK_EQUAL(f1.as<int>(), 9, "as<int>() is broken.");
-  PQXX_CHECK_EQUAL(f1.as<int>(10), 9, "as<int>(int) is broken.");
-
-  std::string s;
-  PQXX_CHECK(f1.to(s), "to(string) failed.");
-  PQXX_CHECK_EQUAL(s, "9", "to(string) is broken.");
-  s = "x";
-  PQXX_CHECK(f1.to(s, std::string{"7"}), "to(string, string) failed.");
-  PQXX_CHECK_EQUAL(s, "9", "to(string, string) is broken.");
-
-  int i{};
-  PQXX_CHECK(f1.to(i), "to(int) failed.");
-  PQXX_CHECK_EQUAL(i, 9, "to(int) is broken.");
-  i = 8;
-  PQXX_CHECK(f1.to(i, 12), "to(int, int) failed.");
-  PQXX_CHECK_EQUAL(i, 9, "to(int, int) is broken.");
-
-  auto const r2{tx.exec1("SELECT NULL")};
-  auto const f2{r2[0]};
-  i = 100;
-  PQXX_CHECK_THROWS(
-    f2.as<int>(), pqxx::conversion_error, "Null conversion failed to throw.");
-  PQXX_CHECK_EQUAL(i, 100, "Null conversion touched its output.");
-
-  PQXX_CHECK_EQUAL(f2.as<int>(66), 66, "as<int> default is broken.");
-
-  PQXX_CHECK(!(f2.to(i)), "to(int) failed to report a null.");
-  PQXX_CHECK(!(f2.to(i, 54)), "to(int, int) failed to report a null.");
-  PQXX_CHECK_EQUAL(i, 54, "to(int, int) failed to default.");
-
-  auto const r3{tx.exec("SELECT generate_series(1, 5)")};
-  PQXX_CHECK_EQUAL(r3.at(3, 0).as<int>(), 4, "Two-argument at() went wrong.");
-#if defined(PQXX_HAVE_MULTIDIMENSIONAL_SUBSCRIPT)
-  PQXX_CHECK_EQUAL((r3[3, 0].as<int>()), 4, "Two-argument [] went wrong.");
-#endif
-}
-
-
-PQXX_REGISTER_TEST(test_field);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_float.cxx b/ext/libpqxx-7.7.3/test/unit/test_float.cxx
deleted file mode 100644
index a0463e4d0..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_float.cxx
+++ /dev/null
@@ -1,175 +0,0 @@
-#include <cmath>
-
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-/// Test conversions for some floating-point type.
-template<typename T> void infinity_test()
-{
-  T inf{std::numeric_limits<T>::infinity()};
-  std::string inf_string;
-  T back_conversion;
-
-  inf_string = pqxx::to_string(inf);
-  pqxx::from_string(inf_string, back_conversion);
-  PQXX_CHECK_LESS(
-    T(999999999), back_conversion,
-    "Infinity doesn't convert back to something huge.");
-
-  inf_string = pqxx::to_string(-inf);
-  pqxx::from_string(inf_string, back_conversion);
-  PQXX_CHECK_LESS(
-    back_conversion, -T(999999999), "Negative infinity is broken");
-}
-
-void test_infinities()
-{
-  infinity_test<float>();
-  infinity_test<double>();
-  infinity_test<long double>();
-}
-
-
-/// Reproduce bug #262: repeated float conversions break without charconv.
-template<typename T> void bug_262()
-{
-  pqxx::connection conn;
-  conn.prepare("stmt", "select cast($1 as float)");
-  pqxx::work tr{conn};
-
-  // We must use the same float type both for passing the value to the
-  // statement and for retrieving result of the statement execution.  This is
-  // due to an internal stringstream being instantiated as a a parameterized
-  // thread-local singleton.  So, there are separate stream<float>,
-  // stream<double>, stream<long double>, but every such instance is a
-  // singleton. We should use only one of them for this test.
-
-  pqxx::row row;
-
-  // Nothing bad here, select a float value.
-  // The stream is clear, so just fill it with the value and extract str().
-  row = tr.exec1("SELECT 1.0");
-
-  // This works properly, but as we parse the value from the stream, the
-  // seeking cursor moves towards the EOF. When the inevitable EOF happens
-  // 'eof' flag is set in the stream and 'good' flag is unset.
-  row[0].as<T>();
-
-  // The second try. Select a float value again. The stream is not clean, so
-  // we need to put an empty string into its buffer {stream.str("");}. This
-  // resets the seeking cursor to 0. Then we will put the value using
-  // operator<<().
-  // ...
-  // ...
-  // OOPS. stream.str("") does not reset 'eof' flag and 'good' flag! We are
-  // trying to read from EOF! This is no good.
-  // Throws on unpatched pqxx v6.4.5
-  row = tr.exec1("SELECT 2.0");
-
-  // We won't get here without patch. The following statements are just for
-  // demonstration of how are intended to work. If we
-  // simply just reset the stream flags properly, this would work fine.
-  // The most obvious patch is just explicitly stream.seekg(0).
-  row[0].as<T>();
-  row = tr.exec1("SELECT 3.0");
-  row[0].as<T>();
-}
-
-
-/// Test for bug #262.
-void test_bug_262()
-{
-  bug_262<float>();
-  bug_262<double>();
-  bug_262<long double>();
-}
-
-
-/// Test conversion of malformed floating-point values.
-void test_bad_float()
-{
-  float x [[maybe_unused]];
-  PQXX_CHECK_THROWS(
-    x = pqxx::from_string<float>(""), pqxx::conversion_error,
-    "Conversion of empty string to float was not caught.");
-
-  PQXX_CHECK_THROWS(
-    x = pqxx::from_string<float>("Infancy"), pqxx::conversion_error,
-    "Misleading infinity was not caught.");
-  PQXX_CHECK_THROWS(
-    x = pqxx::from_string<float>("-Infighting"), pqxx::conversion_error,
-    "Misleading negative infinity was not caught.");
-
-  PQXX_CHECK_THROWS(
-    x = pqxx::from_string<float>("Nanny"), pqxx::conversion_error,
-    "Conversion of misleading NaN was not caught.");
-}
-
-
-template<typename T> void test_float_length(T value)
-{
-  auto const text{pqxx::to_string(value)};
-  PQXX_CHECK_GREATER_EQUAL(
-    pqxx::size_buffer(value), std::size(text) + 1,
-    "Not enough buffer space for " + text + ".");
-}
-
-
-/// Test conversion of long float values to strings.
-void test_long_float()
-{
-  test_float_length(0.1f);
-  test_float_length(0.1);
-
-  test_float_length(std::numeric_limits<float>::denorm_min());
-  test_float_length(-std::numeric_limits<float>::denorm_min());
-  test_float_length(std::numeric_limits<float>::min());
-  test_float_length(-std::numeric_limits<float>::min());
-  test_float_length(std::numeric_limits<float>::max());
-  test_float_length(-std::numeric_limits<float>::max());
-  test_float_length(-std::nextafter(1.0f, 2.0f));
-
-  test_float_length(std::numeric_limits<double>::denorm_min());
-  test_float_length(-std::numeric_limits<double>::denorm_min());
-  test_float_length(std::numeric_limits<double>::min());
-  test_float_length(-std::numeric_limits<double>::min());
-  test_float_length(std::numeric_limits<double>::max());
-  test_float_length(-std::numeric_limits<double>::max());
-  test_float_length(-std::nextafter(1.0, 2.0));
-
-  test_float_length(std::numeric_limits<long double>::denorm_min());
-  test_float_length(-std::numeric_limits<long double>::denorm_min());
-  test_float_length(std::numeric_limits<long double>::min());
-  test_float_length(-std::numeric_limits<long double>::min());
-  test_float_length(std::numeric_limits<long double>::max());
-  test_float_length(-std::numeric_limits<long double>::max());
-  test_float_length(-std::nextafter(1.0L, 2.0L));
-
-  // Ahem.  I'm not proud of this.  We really can't assume much about the
-  // floating-point types, but I'd really like to try a few things to see that
-  // buffer sizes are in the right ballpark.  So, if "double" is at least 64
-  // bits, check for some examples of long conversions.
-  if constexpr (sizeof(double) >= 8)
-  {
-    auto constexpr awkward{-2.2250738585072014e-308};
-    auto const text{pqxx::to_string(awkward)};
-    PQXX_CHECK_LESS_EQUAL(
-      std::size(text), 25u, text + " converted to too long a string.");
-  }
-  if constexpr (sizeof(double) <= 8)
-  {
-    auto const text{pqxx::to_string(0.99)};
-    PQXX_CHECK_LESS_EQUAL(
-      pqxx::size_buffer(0.99), 25u, text + " converted to too long a string.");
-  }
-}
-
-
-PQXX_REGISTER_TEST(test_infinities);
-PQXX_REGISTER_TEST(test_bug_262);
-PQXX_REGISTER_TEST(test_bad_float);
-PQXX_REGISTER_TEST(test_long_float);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_largeobject.cxx b/ext/libpqxx-7.7.3/test/unit/test_largeobject.cxx
deleted file mode 100644
index 8184fa2f8..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_largeobject.cxx
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <iostream>
-#include <sstream>
-
-#include <pqxx/largeobject>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_stream_large_object()
-{
-  pqxx::connection conn;
-
-  // Construct a really nasty string.  (Don't just construct a std::string from
-  // a char[] constant, because it'll terminate at the embedded zero.)
-  //
-  // The crucial thing is the "ff" byte at the beginning.  It tests for
-  // possible conflation between "eof" (-1) and a char which just happens to
-  // have the same bit pattern as an 8-bit value of -1.  This conflation can be
-  // a problem when it occurs at buffer boundaries.
-  constexpr char bytes[]{"\xff\0end"};
-  std::string const contents{bytes, std::size(bytes)};
-
-  pqxx::work tx{conn};
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  pqxx::largeobject new_obj{tx};
-
-  pqxx::olostream write{tx, new_obj};
-  write << contents;
-  write.flush();
-
-  pqxx::largeobjectaccess check{tx, new_obj, std::ios::in | std::ios::binary};
-  std::array<char, 50> buf;
-  std::size_t const len{
-    static_cast<std::size_t>(check.read(std::data(buf), std::size(buf)))};
-  PQXX_CHECK_EQUAL(len, std::size(contents), "olostream truncated data.");
-  std::string const check_str{std::data(buf), len};
-  PQXX_CHECK_EQUAL(check_str, contents, "olostream mangled data.");
-
-  pqxx::ilostream read{tx, new_obj};
-  std::string read_back;
-  std::string chunk;
-  while (read >> chunk) read_back += chunk;
-
-  new_obj.remove(tx);
-
-  PQXX_CHECK_EQUAL(read_back, contents, "Got wrong data from ilostream.");
-  PQXX_CHECK_EQUAL(
-    std::size(read_back), std::size(contents), "ilostream truncated data.");
-  PQXX_CHECK_EQUAL(
-    std::size(read_back), std::size(bytes), "ilostream truncated data.");
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-}
-
-
-PQXX_REGISTER_TEST(test_stream_large_object);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_nonblocking_connect.cxx b/ext/libpqxx-7.7.3/test/unit/test_nonblocking_connect.cxx
deleted file mode 100644
index d1a32ac64..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_nonblocking_connect.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <pqxx/transaction>
-
-#include <pqxx/internal/wait.hxx>
-
-#include "../test_helpers.hxx"
-
-
-namespace
-{
-void test_nonblocking_connect()
-{
-  pqxx::connecting nbc;
-  while (not nbc.done())
-  {
-    pqxx::internal::wait_fd(
-      nbc.sock(), nbc.wait_to_read(), nbc.wait_to_write());
-    nbc.process();
-  }
-
-  pqxx::connection conn{std::move(nbc).produce()};
-  pqxx::work tx{conn};
-  PQXX_CHECK_EQUAL(tx.query_value<int>("SELECT 10"), 10, "Bad value!?");
-}
-
-
-PQXX_REGISTER_TEST(test_nonblocking_connect);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_notification.cxx b/ext/libpqxx-7.7.3/test/unit/test_notification.cxx
deleted file mode 100644
index 6487169b4..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_notification.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <chrono>
-
-#include <pqxx/internal/header-pre.hxx>
-
-#include <pqxx/internal/wait.hxx>
-
-#include <pqxx/internal/header-post.hxx>
-
-#include <pqxx/nontransaction>
-#include <pqxx/notification>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-class TestReceiver final : public pqxx::notification_receiver
-{
-public:
-  std::string payload;
-  int backend_pid;
-
-  TestReceiver(pqxx::connection &c, std::string const &channel_name) :
-          pqxx::notification_receiver(c, channel_name),
-          payload(),
-          backend_pid(0)
-  {}
-
-  virtual void
-  operator()(std::string const &payload_string, int backend) override
-  {
-    this->payload = payload_string;
-    this->backend_pid = backend;
-  }
-};
-
-
-void test_receive(
-  pqxx::transaction_base &t, std::string const &channel,
-  char const payload[] = nullptr)
-{
-  pqxx::connection &conn(t.conn());
-
-  std::string SQL{"NOTIFY \"" + channel + "\""};
-  if (payload != nullptr)
-    SQL += ", " + t.quote(payload);
-
-  TestReceiver receiver{t.conn(), channel};
-
-  // Clear out any previously pending notifications that might otherwise
-  // confuse the test.
-  conn.get_notifs();
-
-  // Notify, and receive.
-  t.exec(SQL);
-  t.commit();
-
-  int notifs{0};
-  for (int i{0}; (i < 10) and (notifs == 0);
-       ++i, pqxx::internal::wait_for(1'000'000u))
-    notifs = conn.get_notifs();
-
-  PQXX_CHECK_EQUAL(notifs, 1, "Got wrong number of notifications.");
-  PQXX_CHECK_EQUAL(receiver.backend_pid, conn.backendpid(), "Bad pid.");
-  if (payload == nullptr)
-    PQXX_CHECK(std::empty(receiver.payload), "Unexpected payload.");
-  else
-    PQXX_CHECK_EQUAL(receiver.payload, payload, "Bad payload.");
-}
-
-
-void test_notification()
-{
-  pqxx::connection conn;
-  TestReceiver receiver(conn, "mychannel");
-  PQXX_CHECK_EQUAL(receiver.channel(), "mychannel", "Bad channel.");
-
-  pqxx::work tx{conn};
-  test_receive(tx, "channel1");
-
-  pqxx::nontransaction u(conn);
-  test_receive(u, "channel2", "payload");
-}
-
-
-PQXX_REGISTER_TEST(test_notification);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_pipeline.cxx b/ext/libpqxx-7.7.3/test/unit/test_pipeline.cxx
deleted file mode 100644
index 63b97662b..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_pipeline.cxx
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <chrono>
-
-#include <pqxx/pipeline>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_pipeline()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  // A pipeline grabs transaction focus, blocking regular queries and such.
-  pqxx::pipeline pipe(tx, "test_pipeline_detach");
-  PQXX_CHECK_THROWS(
-    tx.exec("SELECT 1"), std::logic_error,
-    "Pipeline does not block regular queries");
-
-  // Flushing a pipeline relinquishes transaction focus.
-  pipe.flush();
-  auto r{tx.exec("SELECT 2")};
-  PQXX_CHECK_EQUAL(
-    std::size(r), 1, "Wrong query result after flushing pipeline.");
-  PQXX_CHECK_EQUAL(
-    r[0][0].as<int>(), 2, "Query returns wrong data after flushing pipeline.");
-
-  // Inserting a query makes the pipeline grab transaction focus back.
-  auto q{pipe.insert("SELECT 2")};
-  PQXX_CHECK_THROWS(
-    tx.exec("SELECT 3"), std::logic_error,
-    "Pipeline does not block regular queries");
-
-  // Invoking complete() also detaches the pipeline from the transaction.
-  pipe.complete();
-  r = tx.exec("SELECT 4");
-  PQXX_CHECK_EQUAL(std::size(r), 1, "Wrong query result after complete().");
-  PQXX_CHECK_EQUAL(
-    r[0][0].as<int>(), 4, "Query returns wrong data after complete().");
-
-  // The complete() also received any pending query results from the backend.
-  r = pipe.retrieve(q);
-  PQXX_CHECK_EQUAL(std::size(r), 1, "Wrong result from pipeline.");
-  PQXX_CHECK_EQUAL(r[0][0].as<int>(), 2, "Pipeline returned wrong data.");
-
-  // We can cancel while the pipe is empty, and things will still work.
-  pipe.cancel();
-
-  // Issue a query and cancel it.  Measure time to see that we don't really
-  // wait.
-  using clock = std::chrono::steady_clock;
-  auto const start{clock::now()};
-  pipe.retain(0);
-  pipe.insert("pg_sleep(10)");
-  pipe.cancel();
-  auto const finish{clock::now()};
-  auto const seconds{
-    std::chrono::duration_cast<std::chrono::seconds>(finish - start).count()};
-  PQXX_CHECK_LESS(seconds, 5, "Canceling a sleep took suspiciously long.");
-}
-} // namespace
-
-PQXX_REGISTER_TEST(test_pipeline);
diff --git a/ext/libpqxx-7.7.3/test/unit/test_prepared_statement.cxx b/ext/libpqxx-7.7.3/test/unit/test_prepared_statement.cxx
deleted file mode 100644
index c9eb4ee84..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_prepared_statement.cxx
+++ /dev/null
@@ -1,334 +0,0 @@
-#include <cassert>
-#include <iostream>
-#include <iterator>
-#include <list>
-
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-// Test program for libpqxx.  Define and use prepared statements.
-
-#define COMPARE_RESULTS(name, lhs, rhs)                                       \
-  PQXX_CHECK_EQUAL(                                                           \
-    rhs, lhs,                                                                 \
-    "Executing " name " as prepared statement yields different results.");
-
-namespace
-{
-using namespace std::literals;
-
-
-template<typename T> std::string stringize(pqxx::transaction_base &t, T i)
-{
-  return stringize(t, pqxx::to_string(i));
-}
-
-
-// Substitute variables in raw query.  This is not likely to be very robust,
-// but it should do for just this test.  The main shortcomings are escaping,
-// and not knowing when to quote the variables.
-// Note we do the replacement backwards (meaning forward_only iterators won't
-// do!) to avoid substituting e.g. "$12" as "$1" first.
-template<typename ITER>
-std::string
-subst(pqxx::transaction_base &t, std::string q, ITER patbegin, ITER patend)
-{
-  ptrdiff_t i{distance(patbegin, patend)};
-  for (ITER arg{patend}; i > 0; --i)
-  {
-    --arg;
-    std::string const marker{"$" + pqxx::to_string(i)},
-      var{stringize(t, *arg)};
-    std::string::size_type const msz{std::size(marker)};
-    while (q.find(marker) != std::string::npos)
-      q.replace(q.find(marker), msz, var);
-  }
-  return q;
-}
-
-
-template<typename CNTNR>
-std::string
-subst(pqxx::transaction_base &t, std::string const &q, CNTNR const &patterns)
-{
-  return subst(t, q, std::begin(patterns), std::end(patterns));
-}
-
-
-void test_registration_and_invocation()
-{
-  constexpr auto count_to_5{"SELECT * FROM generate_series(1, 5)"};
-
-  pqxx::connection c;
-  pqxx::work tx1{c};
-
-  // Prepare a simple statement.
-  tx1.conn().prepare("CountToFive", count_to_5);
-
-  // The statement returns exactly what you'd expect.
-  COMPARE_RESULTS(
-    "CountToFive", tx1.exec_prepared("CountToFive"), tx1.exec(count_to_5));
-
-  // Re-preparing it is an error.
-  PQXX_CHECK_THROWS(
-    tx1.conn().prepare("CountToFive", count_to_5), pqxx::sql_error,
-    "Did not report re-definition of prepared statement.");
-
-  tx1.abort();
-  pqxx::work tx2{c};
-
-  // Executing a nonexistent prepared statement is also an error.
-  PQXX_CHECK_THROWS(
-    tx2.exec_prepared("NonexistentStatement"), pqxx::sql_error,
-    "Did not report invocation of nonexistent prepared statement.");
-}
-
-
-void test_basic_args()
-{
-  pqxx::connection c;
-  c.prepare("EchoNum", "SELECT $1::int");
-  pqxx::work tx{c};
-  auto r{tx.exec_prepared("EchoNum", 7)};
-  PQXX_CHECK_EQUAL(
-    std::size(r), 1, "Did not get 1 row from prepared statement.");
-  PQXX_CHECK_EQUAL(std::size(r.front()), 1, "Did not get exactly one column.");
-  PQXX_CHECK_EQUAL(r[0][0].as<int>(), 7, "Got wrong result.");
-
-  auto rw{tx.exec_prepared1("EchoNum", 8)};
-  PQXX_CHECK_EQUAL(
-    std::size(rw), 1, "Did not get 1 column from exec_prepared1.");
-  PQXX_CHECK_EQUAL(rw[0].as<int>(), 8, "Got wrong result.");
-}
-
-
-void test_multiple_params()
-{
-  pqxx::connection c;
-  c.prepare("CountSeries", "SELECT * FROM generate_series($1::int, $2::int)");
-  pqxx::work tx{c};
-  auto r{tx.exec_prepared_n(4, "CountSeries", 7, 10)};
-  PQXX_CHECK_EQUAL(
-    std::size(r), 4, "Wrong number of rows, but no error raised.");
-  PQXX_CHECK_EQUAL(r.front().front().as<int>(), 7, "Wrong $1.");
-  PQXX_CHECK_EQUAL(r.back().front().as<int>(), 10, "Wrong $2.");
-
-  c.prepare("Reversed", "SELECT * FROM generate_series($2::int, $1::int)");
-  r = tx.exec_prepared_n(3, "Reversed", 8, 6);
-  PQXX_CHECK_EQUAL(
-    r.front().front().as<int>(), 6, "Did parameters get reordered?");
-  PQXX_CHECK_EQUAL(
-    r.back().front().as<int>(), 8, "$2 did not come through properly.");
-}
-
-
-void test_nulls()
-{
-  pqxx::connection c;
-  pqxx::work tx{c};
-  c.prepare("EchoStr", "SELECT $1::varchar");
-  auto rw{tx.exec_prepared1("EchoStr", nullptr)};
-  PQXX_CHECK(rw.front().is_null(), "nullptr did not translate to null.");
-
-  char const *n{nullptr};
-  rw = tx.exec_prepared1("EchoStr", n);
-  PQXX_CHECK(rw.front().is_null(), "Null pointer did not translate to null.");
-}
-
-
-void test_strings()
-{
-  pqxx::connection c;
-  pqxx::work tx{c};
-  c.prepare("EchoStr", "SELECT $1::varchar");
-  auto rw{tx.exec_prepared1("EchoStr", "foo")};
-  PQXX_CHECK_EQUAL(
-    rw.front().as<std::string>(), "foo", "Wrong string result.");
-
-  char const nasty_string[]{R"--('\"\)--"};
-  rw = tx.exec_prepared1("EchoStr", nasty_string);
-  PQXX_CHECK_EQUAL(
-    rw.front().as<std::string>(), std::string(nasty_string),
-    "Prepared statement did not quote/escape correctly.");
-
-  rw = tx.exec_prepared1("EchoStr", std::string{nasty_string});
-  PQXX_CHECK_EQUAL(
-    rw.front().as<std::string>(), std::string(nasty_string),
-    "Quoting/escaping went wrong in std::string.");
-
-  char nonconst[]{"non-const C string"};
-  rw = tx.exec_prepared1("EchoStr", nonconst);
-  PQXX_CHECK_EQUAL(
-    rw.front().as<std::string>(), std::string(nonconst),
-    "Non-const C string passed incorrectly.");
-}
-
-
-void test_binary()
-{
-  pqxx::connection c;
-  pqxx::work tx{c};
-  c.prepare("EchoBin", "SELECT $1::bytea");
-  constexpr char raw_bytes[]{"Binary\0bytes'\"with\tweird\xff bytes"};
-  std::string const input{raw_bytes, std::size(raw_bytes)};
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-  {
-    pqxx::binarystring const bin{input};
-    auto rw{tx.exec_prepared1("EchoBin", bin)};
-    PQXX_CHECK_EQUAL(
-      pqxx::binarystring(rw[0]).str(), input,
-      "Binary string came out damaged.");
-  }
-#include "pqxx/internal/ignore-deprecated-post.hxx"
-
-  {
-    std::basic_string<std::byte> bytes{
-      reinterpret_cast<std::byte const *>(raw_bytes), std::size(raw_bytes)};
-    auto bp{tx.exec_prepared1("EchoBin", bytes)};
-    auto bval{bp[0].as<std::basic_string<std::byte>>()};
-    PQXX_CHECK_EQUAL(
-      (std::string_view{
-        reinterpret_cast<char const *>(bval.c_str()), std::size(bval)}),
-      input, "Binary string parameter went wrong.");
-  }
-
-  // Now try it with a complex type that ultimately uses the conversions of
-  // std::basic_string<std::byte>, but complex enough that the call may
-  // convert the data to a text string on the libpqxx side.  Which would be
-  // okay, except of course it's likely to be slower.
-
-  {
-    auto ptr{std::make_shared<std::basic_string<std::byte>>(
-      reinterpret_cast<std::byte const *>(raw_bytes), std::size(raw_bytes))};
-    auto rp{tx.exec_prepared1("EchoBin", ptr)};
-    auto pval{rp[0].as<std::basic_string<std::byte>>()};
-    PQXX_CHECK_EQUAL(
-      (std::string_view{
-        reinterpret_cast<char const *>(pval.c_str()), std::size(pval)}),
-      input, "Binary string as shared_ptr-to-optional went wrong.");
-  }
-
-  {
-    auto opt{std::optional<std::basic_string<std::byte>>{
-      std::in_place, reinterpret_cast<std::byte const *>(raw_bytes),
-      std::size(raw_bytes)}};
-    auto op{tx.exec_prepared1("EchoBin", opt)};
-    auto oval{op[0].as<std::basic_string<std::byte>>()};
-    PQXX_CHECK_EQUAL(
-      (std::string_view{
-        reinterpret_cast<char const *>(oval.c_str()), std::size(oval)}),
-      input, "Binary string as shared_ptr-to-optional went wrong.");
-  }
-
-#if defined(PQXX_HAVE_CONCEPTS)
-  // By the way, it doesn't have to be a std::basic_string.  Any contiguous
-  // range will do.
-  {
-    std::vector<std::byte> data{std::byte{'x'}, std::byte{'v'}};
-    auto op{tx.exec_prepared1("EchoBin", data)};
-    auto oval{op[0].as<std::basic_string<std::byte>>()};
-    PQXX_CHECK_EQUAL(
-      std::size(oval), 2u, "Binary data came back as wrong length.");
-    PQXX_CHECK_EQUAL(static_cast<int>(oval[0]), int('x'), "Wrong data.");
-    PQXX_CHECK_EQUAL(static_cast<int>(oval[1]), int('v'), "Wrong data.");
-  }
-#endif
-}
-
-
-void test_params()
-{
-  pqxx::connection c;
-  pqxx::work tx{c};
-  c.prepare("Concat2Numbers", "SELECT 10 * $1 + $2");
-  std::vector<int> values{3, 9};
-  pqxx::params params;
-  params.reserve(std::size(values));
-  params.append_multi(values);
-
-  auto const rw39{tx.exec_prepared1("Concat2Numbers", params)};
-  PQXX_CHECK_EQUAL(
-    rw39.front().as<int>(), 39,
-    "Dynamic prepared-statement parameters went wrong.");
-
-  c.prepare("Concat4Numbers", "SELECT 1000*$1 + 100*$2 + 10*$3 + $4");
-  auto const rw1396{tx.exec_prepared1("Concat4Numbers", 1, params, 6)};
-  PQXX_CHECK_EQUAL(
-    rw1396.front().as<int>(), 1396,
-    "Dynamic params did not interleave with static ones properly.");
-}
-
-
-void test_optional()
-{
-  pqxx::connection c;
-  pqxx::work tx{c};
-  c.prepare("EchoNum", "SELECT $1::int");
-  pqxx::row rw{
-    tx.exec_prepared1("EchoNum", std::optional<int>{std::in_place, 10})};
-  PQXX_CHECK_EQUAL(
-    rw.front().as<int>(), 10,
-    "optional (with value) did not return the right value.");
-
-  rw = tx.exec_prepared1("EchoNum", std::optional<int>{});
-  PQXX_CHECK(
-    rw.front().is_null(), "optional without value did not come out as null.");
-}
-
-
-void test_prepared_statements()
-{
-  test_registration_and_invocation();
-  test_basic_args();
-  test_multiple_params();
-  test_nulls();
-  test_strings();
-  test_binary();
-  test_params();
-
-  test_optional();
-}
-
-
-void test_placeholders_generates_names()
-{
-  using pqxx::operator""_zv;
-  pqxx::placeholders name;
-  PQXX_CHECK_EQUAL(name.view(), "$1"_zv, "Bad placeholders initial zview.");
-  PQXX_CHECK_EQUAL(name.view(), "$1"sv, "Bad placeholders string_view.");
-  PQXX_CHECK_EQUAL(name.get(), "$1", "Bad placeholders::get().");
-
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$2"_zv, "Incorrect placeholders::next().");
-
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$3"_zv, "Incorrect placeholders::next().");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$4"_zv, "Incorrect placeholders::next().");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$5"_zv, "Incorrect placeholders::next().");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$6"_zv, "Incorrect placeholders::next().");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$7"_zv, "Incorrect placeholders::next().");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$8"_zv, "Incorrect placeholders::next().");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$9"_zv, "Incorrect placeholders::next().");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$10"_zv, "Incorrect placeholders carry.");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$11"_zv, "Incorrect placeholders 11.");
-
-  while (name.count() < 999) name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$999"_zv, "Incorrect placeholders 999.");
-  name.next();
-  PQXX_CHECK_EQUAL(name.view(), "$1000"_zv, "Incorrect large placeholder.");
-}
-
-
-PQXX_REGISTER_TEST(test_prepared_statements);
-PQXX_REGISTER_TEST(test_placeholders_generates_names);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_range.cxx b/ext/libpqxx-7.7.3/test/unit/test_range.cxx
deleted file mode 100644
index b40d9b043..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_range.cxx
+++ /dev/null
@@ -1,555 +0,0 @@
-#include <pqxx/range>
-#include <pqxx/strconv>
-
-#include "../test_helpers.hxx"
-
-
-namespace
-{
-void test_range_construct()
-{
-  using optint = std::optional<int>;
-  using oibound = pqxx::inclusive_bound<std::optional<int>>;
-  using oxbound = pqxx::inclusive_bound<std::optional<int>>;
-  PQXX_CHECK_THROWS(
-    (pqxx::range<optint>{oibound{optint{}}, oibound{optint{}}}),
-    pqxx::argument_error, "Inclusive bound accepted a null.");
-  PQXX_CHECK_THROWS(
-    (pqxx::range<optint>{oxbound{optint{}}, oxbound{optint{}}}),
-    pqxx::argument_error, "Exclusive bound accepted a null.");
-
-  using ibound = pqxx::inclusive_bound<int>;
-  PQXX_CHECK_THROWS(
-    (pqxx::range<int>{ibound{1}, ibound{0}}), pqxx::range_error,
-    "Range constructor accepted backwards range.");
-
-  PQXX_CHECK_THROWS(
-    (pqxx::range<float>{
-      pqxx::inclusive_bound<float>{-1000.0},
-      pqxx::inclusive_bound<float>{-std::numeric_limits<float>::infinity()}}),
-    pqxx::range_error,
-    "Was able to construct range with infinity bound at the wrong end.");
-}
-
-
-void test_range_equality()
-{
-  using range = pqxx::range<int>;
-  using ibound = pqxx::inclusive_bound<int>;
-  using xbound = pqxx::exclusive_bound<int>;
-  using ubound = pqxx::no_bound;
-
-  PQXX_CHECK_EQUAL(
-    range{}, range{}, "Default-constructed range is not consistent.");
-  PQXX_CHECK_EQUAL(
-    (range{xbound{0}, xbound{0}}), (range{xbound{5}, xbound{5}}),
-    "Empty ranges at different values are not equal.");
-
-  PQXX_CHECK_EQUAL(
-    (range{ubound{}, ubound{}}), (range{ubound{}, ubound{}}),
-    "Universal range is inconsistent.");
-  PQXX_CHECK_EQUAL(
-    (range{ibound{5}, ibound{8}}), (range{ibound{5}, ibound{8}}),
-    "Inclusive range is inconsistent.");
-  PQXX_CHECK_EQUAL(
-    (range{xbound{5}, xbound{8}}), (range{xbound{5}, xbound{8}}),
-    "Exclusive range is inconsistent.");
-  PQXX_CHECK_EQUAL(
-    (range{xbound{5}, ibound{8}}), (range{xbound{5}, ibound{8}}),
-    "Left-exclusive interval is not equal to itself.");
-  PQXX_CHECK_EQUAL(
-    (range{ibound{5}, xbound{8}}), (range{ibound{5}, xbound{8}}),
-    "Right-exclusive interval is not equal to itself.");
-  PQXX_CHECK_EQUAL(
-    (range{ubound{}, ibound{8}}), (range{ubound{}, ibound{8}}),
-    "Unlimited lower bound does not compare equal to same.");
-  PQXX_CHECK_EQUAL(
-    (range{ibound{8}, ubound{}}), (range{ibound{8}, ubound{}}),
-    "Unlimited upper bound does not compare equal to same.");
-
-  PQXX_CHECK_NOT_EQUAL(
-    (range{ibound{5}, ibound{8}}), (range{xbound{5}, ibound{8}}),
-    "Equality does not detect inclusive vs. exclusive lower bound.");
-  PQXX_CHECK_NOT_EQUAL(
-    (range{ibound{5}, ibound{8}}), (range{ubound{}, ibound{8}}),
-    "Equality does not detect inclusive vs. unlimited lower bound.");
-  PQXX_CHECK_NOT_EQUAL(
-    (range{xbound{5}, ibound{8}}), (range{ubound{}, ibound{8}}),
-    "Equality does not detect exclusive vs. unlimited lower bound.");
-  PQXX_CHECK_NOT_EQUAL(
-    (range{ibound{5}, ibound{8}}), (range{ibound{5}, xbound{8}}),
-    "Equality does not detect inclusive vs. exclusive upper bound.");
-  PQXX_CHECK_NOT_EQUAL(
-    (range{ibound{5}, ibound{8}}), (range{ibound{5}, ubound{}}),
-    "Equality does not detect inclusive vs. unlimited upper bound.");
-  PQXX_CHECK_NOT_EQUAL(
-    (range{ibound{5}, xbound{8}}), (range{ibound{5}, ubound{}}),
-    "Equality does not detect exclusive vs. unlimited upper bound.");
-
-  PQXX_CHECK_NOT_EQUAL(
-    (range{ibound{5}, ibound{8}}), (range{ibound{4}, ibound{8}}),
-    "Equality does not compare lower inclusive bound value.");
-  PQXX_CHECK_NOT_EQUAL(
-    (range{xbound{5}, ibound{8}}), (range{xbound{4}, ibound{8}}),
-    "Equality does not compare lower exclusive bound value.");
-  PQXX_CHECK_NOT_EQUAL(
-    (range{xbound{5}, ibound{8}}), (range{xbound{5}, ibound{7}}),
-    "Equality does not compare upper inclusive bound value.");
-  PQXX_CHECK_NOT_EQUAL(
-    (range{xbound{5}, xbound{8}}), (range{xbound{5}, xbound{7}}),
-    "Equality does not compare lower exclusive bound value.");
-}
-
-
-void test_range_empty()
-{
-  using range = pqxx::range<int>;
-  using ibound = pqxx::inclusive_bound<int>;
-  using xbound = pqxx::exclusive_bound<int>;
-  using ubound = pqxx::no_bound;
-  PQXX_CHECK((range{}.empty()), "Default-constructed range is not empty.");
-  PQXX_CHECK(
-    (range{ibound{10}, xbound{10}}).empty(),
-    "Right-exclusive zero-length interval is not empty.");
-  PQXX_CHECK(
-    (range{xbound{10}, ibound{10}}).empty(),
-    "Left-exclusive zero-length interval is not empty.");
-  PQXX_CHECK(
-    (range{xbound{10}, xbound{10}}).empty(),
-    "Exclusive zero-length interval is not empty.");
-
-  PQXX_CHECK(
-    not(range{ibound{10}, ibound{10}}).empty(),
-    "Inclusive zero-length interval is empty.");
-  PQXX_CHECK(
-    not(range{xbound{10}, ibound{11}}.empty()),
-    "Interval is incorrectly empty.");
-  PQXX_CHECK(
-    not(range{ubound{}, ubound{}}.empty()),
-    "Double-unlimited interval is empty.");
-  PQXX_CHECK(
-    not(range{ubound{}, xbound{0}}.empty()),
-    "Left-unlimited interval is empty.");
-  PQXX_CHECK(
-    not(range{xbound{0}, ubound{}}.empty()),
-    "Right-unlimited interval is empty.");
-}
-
-
-void test_range_contains()
-{
-  using range = pqxx::range<int>;
-  using ibound = pqxx::inclusive_bound<int>;
-  using xbound = pqxx::exclusive_bound<int>;
-  using ubound = pqxx::no_bound;
-
-  PQXX_CHECK(not(range{}.contains(-1)), "Empty range contains a value.");
-  PQXX_CHECK(not(range{}.contains(0)), "Empty range contains a value.");
-  PQXX_CHECK(not(range{}.contains(1)), "Empty range contains a value.");
-
-  PQXX_CHECK(
-    not(range{ibound{5}, ibound{8}}.contains(4)),
-    "Inclusive range contains value outside its left bound.");
-  PQXX_CHECK(
-    (range{ibound{5}, ibound{8}}.contains(5)),
-    "Inclusive range does not contain value on its left bound.");
-  PQXX_CHECK(
-    (range{ibound{5}, ibound{8}}.contains(6)),
-    "Inclusive range does not contain value inside it.");
-  PQXX_CHECK(
-    (range{ibound{5}, ibound{8}}.contains(8)),
-    "Inclusive range does not contain value on its right bound.");
-  PQXX_CHECK(
-    not(range{ibound{5}, ibound{8}}.contains(9)),
-    "Inclusive range contains value outside its right bound.");
-
-  PQXX_CHECK(
-    not(range{ibound{5}, xbound{8}}.contains(4)),
-    "Left-inclusive range contains value outside its left bound.");
-  PQXX_CHECK(
-    (range{ibound{5}, xbound{8}}.contains(5)),
-    "Left-inclusive range does not contain value on its left bound.");
-  PQXX_CHECK(
-    (range{ibound{5}, xbound{8}}.contains(6)),
-    "Left-inclusive range does not contain value inside it.");
-  PQXX_CHECK(
-    not(range{ibound{5}, xbound{8}}.contains(8)),
-    "Left-inclusive range contains value on its right bound.");
-  PQXX_CHECK(
-    not(range{ibound{5}, xbound{8}}.contains(9)),
-    "Left-inclusive range contains value outside its right bound.");
-
-  PQXX_CHECK(
-    not(range{xbound{5}, ibound{8}}.contains(4)),
-    "Right-inclusive range contains value outside its left bound.");
-  PQXX_CHECK(
-    not(range{xbound{5}, ibound{8}}.contains(5)),
-    "Right-inclusive range does contains value on its left bound.");
-  PQXX_CHECK(
-    (range{xbound{5}, ibound{8}}.contains(6)),
-    "Right-inclusive range does not contain value inside it.");
-  PQXX_CHECK(
-    (range{xbound{5}, ibound{8}}.contains(8)),
-    "Right-inclusive range does not contain value on its right bound.");
-  PQXX_CHECK(
-    not(range{xbound{5}, ibound{8}}.contains(9)),
-    "Right-inclusive range contains value outside its right bound.");
-
-  PQXX_CHECK(
-    not(range{xbound{5}, xbound{8}}.contains(4)),
-    "Exclusive range contains value outside its left bound.");
-  PQXX_CHECK(
-    not(range{xbound{5}, xbound{8}}.contains(5)),
-    "Exclusive range contains value on its left bound.");
-  PQXX_CHECK(
-    (range{xbound{5}, xbound{8}}.contains(6)),
-    "Exclusive range does not contain value inside it.");
-  PQXX_CHECK(
-    not(range{xbound{5}, xbound{8}}.contains(8)),
-    "Exclusive range does contains value on its right bound.");
-  PQXX_CHECK(
-    not(range{xbound{5}, xbound{8}}.contains(9)),
-    "Exclusive range contains value outside its right bound.");
-
-  PQXX_CHECK(
-    (range{ubound{}, ibound{8}}.contains(7)),
-    "Right-inclusive range does not contain value inside it.");
-  PQXX_CHECK(
-    (range{ubound{}, ibound{8}}.contains(8)),
-    "Right-inclusive range does not contain value on its right bound.");
-  PQXX_CHECK(
-    not(range{ubound{}, ibound{8}}.contains(9)),
-    "Right-inclusive range contains value outside its right bound.");
-
-  PQXX_CHECK(
-    (range{ubound{}, xbound{8}}.contains(7)),
-    "Right-exclusive range does not contain value inside it.");
-  PQXX_CHECK(
-    not(range{ubound{}, xbound{8}}.contains(8)),
-    "Right-exclusive range contains value on its right bound.");
-  PQXX_CHECK(
-    not(range{ubound{}, xbound{8}}.contains(9)),
-    "Right-exclusive range contains value outside its right bound.");
-
-  PQXX_CHECK(
-    not(range{ibound{5}, ubound{}}.contains(4)),
-    "Left-inclusive range contains value outside its left bound.");
-  PQXX_CHECK(
-    (range{ibound{5}, ubound{}}.contains(5)),
-    "Left-inclusive range does not contain value on its left bound.");
-  PQXX_CHECK(
-    (range{ibound{5}, ubound{}}.contains(6)),
-    "Left-inclusive range does not contain value inside it.");
-
-  PQXX_CHECK(
-    not(range{xbound{5}, ubound{}}.contains(4)),
-    "Left-exclusive range contains value outside its left bound.");
-  PQXX_CHECK(
-    not(range{xbound{5}, ubound{}}.contains(5)),
-    "Left-exclusive range contains value on its left bound.");
-  PQXX_CHECK(
-    (range{xbound{5}, ubound{}}.contains(6)),
-    "Left-exclusive range does not contain value inside it.");
-
-  PQXX_CHECK(
-    (range{ubound{}, ubound{}}.contains(-1)), "Value not in universal range.");
-  PQXX_CHECK(
-    (range{ubound{}, ubound{}}.contains(0)), "Value not in universal range.");
-  PQXX_CHECK(
-    (range{ubound{}, ubound{}}.contains(1)), "Value not in universal range.");
-}
-
-
-void test_float_range_contains()
-{
-  using range = pqxx::range<double>;
-  using ibound = pqxx::inclusive_bound<double>;
-  using xbound = pqxx::exclusive_bound<double>;
-  using ubound = pqxx::no_bound;
-  using limits = std::numeric_limits<double>;
-  constexpr auto inf{limits::infinity()};
-
-  PQXX_CHECK(
-    not(range{ibound{4.0}, ibound{8.0}}.contains(3.9)),
-    "Float inclusive range contains value beyond its lower bound.");
-  PQXX_CHECK(
-    (range{ibound{4.0}, ibound{8.0}}.contains(4.0)),
-    "Float inclusive range does not contain its lower bound value.");
-  PQXX_CHECK(
-    (range{ibound{4.0}, ibound{8.0}}.contains(5.0)),
-    "Float inclusive range does not contain value inside it.");
-
-  PQXX_CHECK(
-    (range{ibound{0}, ibound{inf}}).contains(9999.0),
-    "Range to infinity did not include large number.");
-  PQXX_CHECK(
-    not(range{ibound{0}, ibound{inf}}.contains(-0.1)),
-    "Range to infinity includes number outside it.");
-  PQXX_CHECK(
-    (range{ibound{0}, xbound{inf}}.contains(9999.0)),
-    "Range to exclusive infinity did not include large number.");
-  PQXX_CHECK(
-    (range{ibound{0}, ibound{inf}}).contains(inf),
-    "Range to inclusive infinity does not include infinity.");
-  PQXX_CHECK(
-    not(range{ibound{0}, xbound{inf}}.contains(inf)),
-    "Range to exclusive infinity includes infinity.");
-  PQXX_CHECK(
-    (range{ibound{0}, ubound{}}).contains(inf),
-    "Right-unlimited range does not include infinity.");
-
-  PQXX_CHECK(
-    (range{ibound{-inf}, ibound{0}}).contains(-9999.0),
-    "Range from infinity did not include large negative number.");
-  PQXX_CHECK(
-    not(range{ibound{-inf}, ibound{0}}.contains(0.1)),
-    "Range from infinity includes number outside it.");
-  PQXX_CHECK(
-    (range{xbound{-inf}, ibound{0}}).contains(-9999.0),
-    "Range from exclusive infinity did not include large negative number.");
-  PQXX_CHECK(
-    (range{ibound{-inf}, ibound{0}}).contains(-inf),
-    "Range from inclusive infinity does not include negative infinity.");
-  PQXX_CHECK(
-    not(range{xbound{-inf}, ibound{0}}).contains(-inf),
-    "Range to infinity exclusive includes negative infinity.");
-  PQXX_CHECK(
-    (range{ubound{}, ibound{0}}).contains(-inf),
-    "Left-unlimited range does not include negative infinity.");
-}
-
-
-void test_range_subset()
-{
-  using range = pqxx::range<int>;
-  using traits = pqxx::string_traits<range>;
-
-  std::string_view subsets[][2]{
-    {"empty", "empty"},  {"(,)", "empty"},    {"(0,1)", "empty"},
-    {"(,)", "[-10,10]"}, {"(,)", "(-10,10)"}, {"(,)", "(,)"},
-    {"(,10)", "(,10)"},  {"(,10)", "(,9)"},   {"(,10]", "(,10)"},
-    {"(,10]", "(,10]"},  {"(1,)", "(10,)"},   {"(1,)", "(9,)"},
-    {"[1,)", "(10,)"},   {"[1,)", "[10,)"},   {"[0,5]", "[1,4]"},
-    {"(0,5)", "[1,4]"},
-  };
-  for (auto const [super, sub] : subsets)
-    PQXX_CHECK(
-      traits::from_string(super).contains(traits::from_string(sub)),
-      pqxx::internal::concat(
-        "Range '", super, "' did not contain '", sub, "'."));
-
-  std::string_view non_subsets[][2]{
-    {"empty", "[0,0]"},   {"empty", "(,)"},     {"[-10,10]", "(,)"},
-    {"(-10,10)", "(,)"},  {"(,9)", "(,10)"},    {"(,10)", "(,10]"},
-    {"[1,4]", "[0,4]"},   {"[1,4]", "[1,5]"},   {"(0,10)", "[0,10]"},
-    {"(0,10)", "(0,10]"}, {"(0,10)", "[0,10)"},
-  };
-  for (auto const [super, sub] : non_subsets)
-    PQXX_CHECK(
-      not traits::from_string(super).contains(traits::from_string(sub)),
-      pqxx::internal::concat("Range '", super, "' contained '", sub, "'."));
-}
-
-
-void test_range_to_string()
-{
-  using range = pqxx::range<int>;
-  using ibound = pqxx::inclusive_bound<int>;
-  using xbound = pqxx::exclusive_bound<int>;
-  using ubound = pqxx::no_bound;
-
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{}), "empty", "Empty range came out wrong.");
-
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{ibound{5}, ibound{8}}), "[5,8]",
-    "Inclusive range came out wrong.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{xbound{5}, ibound{8}}), "(5,8]",
-    "Left-exclusive range came out wrong.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{ibound{5}, xbound{8}}), "[5,8)",
-    "Right-exclusive range came out wrong.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{xbound{5}, xbound{8}}), "(5,8)",
-    "Exclusive range came out wrong.");
-
-  // Unlimited boundaries can use brackets or parentheses.  Doesn't matter.
-  // We cheat and use some white-box knowledge of our implementation here.
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{ubound{}, ubound{}}), "(,)",
-    "Universal range came out unexpected.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{ubound{}, ibound{8}}), "(,8]",
-    "Left-unlimited range came out unexpected.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{ubound{}, xbound{8}}), "(,8)",
-    "Left-unlimited range came out unexpected.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{ibound{5}, ubound{}}), "[5,)",
-    "Right-unlimited range came out unexpected.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(range{xbound{5}, ubound{}}), "(5,)",
-    "Right-unlimited range came out unexpected.");
-}
-
-
-void test_parse_range()
-{
-  using range = pqxx::range<int>;
-  using ubound = pqxx::no_bound;
-  using traits = pqxx::string_traits<range>;
-
-  constexpr std::string_view empties[]{"empty", "EMPTY", "eMpTy"};
-  for (auto empty : empties)
-    PQXX_CHECK(
-      traits::from_string(empty).empty(),
-      pqxx::internal::concat(
-        "This was supposed to produce an empty range: '", empty, "'"));
-
-  constexpr std::string_view universals[]{"(,)", "[,)", "(,]", "[,]"};
-  for (auto univ : universals)
-    PQXX_CHECK_EQUAL(
-      traits::from_string(univ), (range{ubound{}, ubound{}}),
-      pqxx::internal::concat(
-        "This was supposed to produce a universal range: '", univ, "'"));
-
-  PQXX_CHECK(
-    traits::from_string("(0,10]").lower_bound().is_exclusive(),
-    "Exclusive lower bound did not parse right.");
-  PQXX_CHECK(
-    traits::from_string("[0,10]").lower_bound().is_inclusive(),
-    "Inclusive lower bound did not parse right.");
-  PQXX_CHECK(
-    traits::from_string("(0,10)").upper_bound().is_exclusive(),
-    "Exclusive upper bound did not parse right.");
-  PQXX_CHECK(
-    traits::from_string("[0,10]").upper_bound().is_inclusive(),
-    "Inclusive upper bound did not parse right.");
-
-  PQXX_CHECK_EQUAL(
-    *traits::from_string("(\"0\",\"10\")").lower_bound().value(), 0,
-    "Quoted range boundary did not parse right.");
-  PQXX_CHECK_EQUAL(
-    *traits::from_string("(\"0\",\"10\")").upper_bound().value(), 10,
-    "Quoted upper boundary did not parse right.");
-
-  auto floats{
-    pqxx::string_traits<pqxx::range<double>>::from_string("(0,1.0)")};
-  PQXX_CHECK_GREATER(
-    *floats.lower_bound().value(), -0.001,
-    "Float lower bound is out of range.");
-  PQXX_CHECK_LESS(
-    *floats.lower_bound().value(), 0.001,
-    "Float lower bound is out of range.");
-  PQXX_CHECK_GREATER(
-    *floats.upper_bound().value(), 0.999,
-    "Float upper bound is out of range.");
-  PQXX_CHECK_LESS(
-    *floats.upper_bound().value(), 1.001,
-    "Float upper bound is out of range.");
-}
-
-
-void test_parse_bad_range()
-{
-  using range = pqxx::range<int>;
-  using conv_err = pqxx::conversion_error;
-  using traits = pqxx::string_traits<range>;
-  constexpr std::string_view bad_ranges[]{
-    "",   "x",       "e",          "empt",       "emptyy",   "()",
-    "[]", "(empty)", "(empty, 0)", "(0, empty)", ",",        "(,",
-    ",)", "(1,2,3)", "(4,5x)",     "(null, 0)",  "[0, 1.0]", "[1.0, 0]",
-  };
-
-  for (auto bad : bad_ranges)
-    PQXX_CHECK_THROWS(
-      pqxx::ignore_unused(traits::from_string(bad)), conv_err,
-      pqxx::internal::concat(
-        "This range wasn't supposed to parse: '", bad, "'"));
-}
-
-
-/// Parse ranges lhs and rhs, return their intersection as a string.
-template<typename TYPE>
-std::string intersect(std::string_view lhs, std::string_view rhs)
-{
-  using traits = pqxx::string_traits<pqxx::range<TYPE>>;
-  return pqxx::to_string(traits::from_string(lhs) & traits::from_string(rhs));
-}
-
-
-void test_range_intersection()
-{
-  // Intersections and their expected results, in text form.
-  // Each row contains two ranges, and their intersection.
-  std::string_view intersections[][3]{
-    {"empty", "empty", "empty"},
-    {"(,)", "empty", "empty"},
-    {"[,]", "empty", "empty"},
-    {"empty", "[0,10]", "empty"},
-    {"(,)", "(,)", "(,)"},
-    {"(,)", "(5,8)", "(5,8)"},
-    {"(,)", "[5,8)", "[5,8)"},
-    {"(,)", "(5,8]", "(5,8]"},
-    {"(,)", "[5,8]", "[5,8]"},
-    {"(-1000,10)", "(0,1000)", "(0,10)"},
-    {"[-1000,10)", "(0,1000)", "(0,10)"},
-    {"(-1000,10]", "(0,1000)", "(0,10]"},
-    {"[-1000,10]", "(0,1000)", "(0,10]"},
-    {"[0,100]", "[0,100]", "[0,100]"},
-    {"[0,100]", "[0,100)", "[0,100)"},
-    {"[0,100]", "(0,100]", "(0,100]"},
-    {"[0,100]", "(0,100)", "(0,100)"},
-    {"[0,10]", "[11,20]", "empty"},
-    {"[0,10]", "(11,20]", "empty"},
-    {"[0,10]", "[11,20)", "empty"},
-    {"[0,10]", "(11,20)", "empty"},
-    {"[0,10]", "[10,11]", "[10,10]"},
-    {"[0,10)", "[10,11]", "empty"},
-    {"[0,10]", "(10,11]", "empty"},
-    {"[0,10)", "(10,11]", "empty"},
-  };
-  for (auto [left, right, expected] : intersections)
-  {
-    PQXX_CHECK_EQUAL(
-      intersect<int>(left, right), expected,
-      pqxx::internal::concat(
-        "Intersection of '", left, "' and '", right,
-        " produced unexpected result."));
-    PQXX_CHECK_EQUAL(
-      intersect<int>(right, left), expected,
-      pqxx::internal::concat(
-        "Intersection of '", left, "' and '", right, " was asymmetric."));
-  }
-}
-
-
-void test_range_conversion()
-{
-  std::string_view const ranges[]{
-    "empty", "(,)", "(,10)", "(0,)", "[0,10]", "[0,10)", "(0,10]", "(0,10)",
-  };
-
-  for (auto r : ranges)
-  {
-    auto const shortr{pqxx::from_string<pqxx::range<short>>(r)};
-    pqxx::range<int> intr{shortr};
-    PQXX_CHECK_EQUAL(
-      pqxx::to_string(intr), r, "Converted range looks different.");
-  }
-}
-
-
-PQXX_REGISTER_TEST(test_range_construct);
-PQXX_REGISTER_TEST(test_range_equality);
-PQXX_REGISTER_TEST(test_range_empty);
-PQXX_REGISTER_TEST(test_range_contains);
-PQXX_REGISTER_TEST(test_float_range_contains);
-PQXX_REGISTER_TEST(test_range_subset);
-PQXX_REGISTER_TEST(test_range_to_string);
-PQXX_REGISTER_TEST(test_parse_range);
-PQXX_REGISTER_TEST(test_parse_bad_range);
-PQXX_REGISTER_TEST(test_range_intersection);
-PQXX_REGISTER_TEST(test_range_conversion);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_read_transaction.cxx b/ext/libpqxx-7.7.3/test/unit/test_read_transaction.cxx
deleted file mode 100644
index 402f2a06f..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_read_transaction.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_read_transaction()
-{
-  pqxx::connection conn;
-  pqxx::read_transaction tx{conn};
-  PQXX_CHECK_EQUAL(
-    tx.exec("SELECT 1")[0][0].as<int>(), 1,
-    "Bad result from read transaction.");
-
-  PQXX_CHECK_THROWS(
-    tx.exec("CREATE TABLE should_not_exist(x integer)"), pqxx::sql_error,
-    "Read-only transaction allows database to be modified.");
-}
-
-
-PQXX_REGISTER_TEST(test_read_transaction);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_result_iteration.cxx b/ext/libpqxx-7.7.3/test/unit/test_result_iteration.cxx
deleted file mode 100644
index 3d26e3c3e..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_result_iteration.cxx
+++ /dev/null
@@ -1,137 +0,0 @@
-#include <pqxx/stream_to>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_result_iteration()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::result r{tx.exec("SELECT generate_series(1, 3)")};
-
-  PQXX_CHECK(std::end(r) != std::begin(r), "Broken begin/end.");
-  PQXX_CHECK(std::rend(r) != std::rbegin(r), "Broken rbegin/rend.");
-
-  PQXX_CHECK(std::cbegin(r) == std::begin(r), "Wrong cbegin.");
-  PQXX_CHECK(std::cend(r) == std::end(r), "Wrong cend.");
-  PQXX_CHECK(std::crbegin(r) == std::rbegin(r), "Wrong crbegin.");
-  PQXX_CHECK(std::crend(r) == std::rend(r), "Wrong crend.");
-
-  PQXX_CHECK_EQUAL(r.front().front().as<int>(), 1, "Unexpected front().");
-  PQXX_CHECK_EQUAL(r.back().front().as<int>(), 3, "Unexpected back().");
-}
-
-
-void test_result_iter()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::result r{tx.exec("SELECT generate_series(1, 3)")};
-
-  int total{0};
-  for (auto const &[i] : r.iter<int>()) total += i;
-  PQXX_CHECK_EQUAL(total, 6, "iter() loop did not get the right values.");
-}
-
-
-void test_result_iterator_swap()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::result r{tx.exec("SELECT generate_series(1, 3)")};
-
-  auto head{std::begin(r)}, next{head + 1};
-  head.swap(next);
-  PQXX_CHECK_EQUAL(head[0].as<int>(), 2, "Result iterator swap is wrong.");
-  PQXX_CHECK_EQUAL(next[0].as<int>(), 1, "Result iterator swap is crazy.");
-
-  auto tail{std::rbegin(r)}, prev{tail + 1};
-  tail.swap(prev);
-  PQXX_CHECK_EQUAL(tail[0].as<int>(), 2, "Reverse iterator swap is wrong.");
-  PQXX_CHECK_EQUAL(prev[0].as<int>(), 3, "Reverse iterator swap is crazy.");
-}
-
-
-void test_result_iterator_assignment()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::result r{tx.exec("SELECT generate_series(1, 3)")};
-
-  pqxx::result::const_iterator fwd;
-  pqxx::result::const_reverse_iterator rev;
-
-  fwd = std::begin(r);
-  PQXX_CHECK_EQUAL(
-    fwd[0].as<int>(), std::begin(r)[0].as<int>(),
-    "Result iterator assignment is wrong.");
-
-  rev = std::rbegin(r);
-  PQXX_CHECK_EQUAL(
-    rev[0].as<int>(), std::rbegin(r)[0].as<int>(),
-    "Reverse iterator assignment is wrong.");
-}
-
-
-void check_employee(std::string name, int salary)
-{
-  PQXX_CHECK(name == "x" or name == "y" or name == "z", "Unknown name.");
-  PQXX_CHECK(
-    salary == 1000 or salary == 1200 or salary == 1500, "Unknown salary.");
-}
-
-
-void test_result_for_each()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0("CREATE TEMP TABLE employee(name varchar, salary int)");
-  auto fill{pqxx::stream_to::table(tx, {"employee"}, {"name", "salary"})};
-  fill.write_values("x", 1000);
-  fill.write_values("y", 1200);
-  fill.write_values("z", 1500);
-  fill.complete();
-
-  auto const res{tx.exec("SELECT name, salary FROM employee ORDER BY name")};
-
-  // Use for_each with a function.
-  res.for_each(check_employee);
-
-  // Use for_each with a simple lambda.
-  res.for_each(
-    [](std::string name, int salary) { check_employee(name, salary); });
-
-  // Use for_each with a lambda closure.
-  std::string names{};
-  int total{0};
-
-  res.for_each([&names, &total](std::string name, int salary) {
-    names.append(name);
-    total += salary;
-  });
-  PQXX_CHECK_EQUAL(
-    names, "xyz", "result::for_each did not accumulate names correctly.");
-  PQXX_CHECK_EQUAL(total, 1000 + 1200 + 1500, "Salaries added up wrong.");
-
-  // In addition to regular conversions, you can receive arguments as
-  // string_view, or as references.
-  names.clear();
-  total = 0;
-  res.for_each([&names, &total](std::string_view &&name, int const &salary) {
-    names.append(name);
-    total += salary;
-  });
-  PQXX_CHECK_EQUAL(
-    names, "xyz", "result::for_each did not accumulate names correctly.");
-  PQXX_CHECK_EQUAL(total, 1000 + 1200 + 1500, "Salaries added up wrong.");
-}
-
-
-PQXX_REGISTER_TEST(test_result_iteration);
-PQXX_REGISTER_TEST(test_result_iter);
-PQXX_REGISTER_TEST(test_result_iterator_swap);
-PQXX_REGISTER_TEST(test_result_iterator_assignment);
-PQXX_REGISTER_TEST(test_result_for_each);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_result_slicing.cxx b/ext/libpqxx-7.7.3/test/unit/test_result_slicing.cxx
deleted file mode 100644
index be2055ee3..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_result_slicing.cxx
+++ /dev/null
@@ -1,157 +0,0 @@
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-#include "pqxx/internal/ignore-deprecated-pre.hxx"
-
-namespace pqxx
-{
-template<> struct nullness<row::const_iterator> : no_null<row::const_iterator>
-{};
-
-template<>
-struct nullness<row::const_reverse_iterator>
-        : no_null<const_reverse_row_iterator>
-{};
-
-
-template<> struct string_traits<row::const_iterator>
-{
-  static constexpr zview text{"[row::const_iterator]"};
-  static zview to_buf(char *, char *, row::const_iterator const &)
-  {
-    return text;
-  }
-  static char *into_buf(char *begin, char *end, row::const_iterator const &)
-  {
-    if ((end - begin) <= 30)
-      throw conversion_overrun{"Not enough buffer for const row iterator."};
-    std::memcpy(begin, text.c_str(), std::size(text) + 1);
-    return begin + std::size(text);
-  }
-  static constexpr std::size_t
-  size_buffer(row::const_iterator const &) noexcept
-  {
-    return std::size(text) + 1;
-  }
-};
-
-
-template<> struct string_traits<row::const_reverse_iterator>
-{
-  static constexpr zview text{"[row::const_reverse_iterator]"};
-  static pqxx::zview
-  to_buf(char *, char *, row::const_reverse_iterator const &)
-  {
-    return text;
-  }
-  static char *
-  into_buf(char *begin, char *end, row::const_reverse_iterator const &)
-  {
-    if ((end - begin) <= 30)
-      throw conversion_overrun{"Not enough buffer for const row iterator."};
-    std::memcpy(begin, text.c_str(), std::size(text) + 1);
-    return begin + std::size(text);
-  }
-  static constexpr std::size_t
-  size_buffer(row::const_reverse_iterator const &) noexcept
-  {
-    return 100;
-  }
-};
-} // namespace pqxx
-
-namespace
-{
-void test_result_slicing()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  auto r{tx.exec("SELECT 1")};
-
-  PQXX_CHECK(not std::empty(r[0]), "A plain row shows up as empty.");
-
-  // Empty slice at beginning of row.
-  pqxx::row s{r[0].slice(0, 0)};
-  PQXX_CHECK(std::empty(s), "Empty slice does not show up as empty.");
-  PQXX_CHECK_EQUAL(std::size(s), 0, "Slicing produces wrong row size.");
-  PQXX_CHECK_EQUAL(
-    std::begin(s), std::end(s), "Slice begin()/end() are broken.");
-  PQXX_CHECK_EQUAL(
-    std::rbegin(s), std::rend(s), "Slice rbegin()/rend() are broken.");
-
-  PQXX_CHECK_THROWS(s.at(0), pqxx::range_error, "at() does not throw.");
-  pqxx::row slice;
-  PQXX_CHECK_THROWS(
-    slice = r[0].slice(0, 2), pqxx::range_error, "No range check.");
-  pqxx::ignore_unused(slice);
-  PQXX_CHECK_THROWS(
-    slice = r[0].slice(1, 0), pqxx::range_error, "Can reverse-slice.");
-  pqxx::ignore_unused(slice);
-
-  // Empty slice at end of row.
-  s = r[0].slice(1, 1);
-  PQXX_CHECK(std::empty(s), "empty() is broken.");
-  PQXX_CHECK_EQUAL(std::size(s), 0, "size() is broken.");
-  PQXX_CHECK_EQUAL(std::begin(s), std::end(s), "begin()/end() are broken.");
-  PQXX_CHECK_EQUAL(
-    std::rbegin(s), std::rend(s), "rbegin()/rend() are broken.");
-
-  PQXX_CHECK_THROWS(s.at(0), pqxx::range_error, "at() is inconsistent.");
-
-  // Slice that matches the entire row.
-  s = r[0].slice(0, 1);
-  PQXX_CHECK(not std::empty(s), "Nonempty slice shows up as empty.");
-  PQXX_CHECK_EQUAL(std::size(s), 1, "size() breaks for non-empty slice.");
-  PQXX_CHECK_EQUAL(std::begin(s) + 1, std::end(s), "Iteration is broken.");
-  PQXX_CHECK_EQUAL(
-    std::rbegin(s) + 1, std::rend(s), "Reverse iteration is broken.");
-  PQXX_CHECK_EQUAL(s.at(0).as<int>(), 1, "Accessing a slice is broken.");
-  PQXX_CHECK_EQUAL(s[0].as<int>(), 1, "operator[] is broken.");
-  PQXX_CHECK_THROWS(s.at(1).as<int>(), pqxx::range_error, "at() is off.");
-
-  // Meaningful slice at beginning of row.
-  r = tx.exec("SELECT 1, 2, 3");
-  s = r[0].slice(0, 1);
-  PQXX_CHECK(not std::empty(s), "Slicing confuses empty().");
-  PQXX_CHECK_THROWS(
-    s.at(1).as<int>(), pqxx::range_error, "at() does not enforce slice.");
-
-  // Meaningful slice that skips an initial column.
-  s = r[0].slice(1, 2);
-  PQXX_CHECK(
-    not std::empty(s), "Slicing away leading columns confuses empty().");
-  PQXX_CHECK_EQUAL(s[0].as<int>(), 2, "Slicing offset is broken.");
-  PQXX_CHECK_EQUAL(
-    std::begin(s)->as<int>(), 2, "Iteration uses wrong offset.");
-  PQXX_CHECK_EQUAL(
-    std::begin(s) + 1, std::end(s), "Iteration has wrong range.");
-  PQXX_CHECK_EQUAL(
-    std::rbegin(s) + 1, std::rend(s), "Reverse iteration has wrong range.");
-  PQXX_CHECK_THROWS(
-    s.at(1).as<int>(), pqxx::range_error, "Offset slicing is broken.");
-
-  // Column names in a slice.
-  r = tx.exec("SELECT 1 AS one, 2 AS two, 3 AS three");
-  s = r[0].slice(1, 2);
-  PQXX_CHECK_EQUAL(s["two"].as<int>(), 2, "Column addressing breaks.");
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(s.column_number("one")), pqxx::argument_error,
-    "Can access column name before slice.");
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(s.column_number("three")), pqxx::argument_error,
-    "Can access column name after slice.");
-  PQXX_CHECK_EQUAL(
-    s.column_number("Two"), 0, "Column name is case sensitive.");
-
-  // Identical column names.
-  r = tx.exec("SELECT 1 AS x, 2 AS x");
-  s = r[0].slice(1, 2);
-  PQXX_CHECK_EQUAL(s["x"].as<int>(), 2, "Identical column names break slice.");
-}
-
-
-PQXX_REGISTER_TEST(test_result_slicing);
-} // namespace
-
-#include "pqxx/internal/ignore-deprecated-post.hxx"
diff --git a/ext/libpqxx-7.7.3/test/unit/test_row.cxx b/ext/libpqxx-7.7.3/test/unit/test_row.cxx
deleted file mode 100644
index 41770e3b1..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_row.cxx
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_row()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::result rows{tx.exec("SELECT 1, 2, 3")};
-  pqxx::row r{rows[0]};
-  PQXX_CHECK_EQUAL(std::size(r), 3, "Unexpected row size.");
-  PQXX_CHECK_EQUAL(r.at(0).as<int>(), 1, "Wrong value at index 0.");
-  PQXX_CHECK(std::begin(r) != std::end(r), "Broken row iteration.");
-  PQXX_CHECK(std::begin(r) < std::end(r), "Row begin does not precede end.");
-  PQXX_CHECK(std::cbegin(r) == std::begin(r), "Wrong cbegin.");
-  PQXX_CHECK(std::cend(r) == std::end(r), "Wrong cend.");
-  PQXX_CHECK(std::rbegin(r) != std::rend(r), "Broken reverse row iteration.");
-  PQXX_CHECK(std::crbegin(r) == std::rbegin(r), "Wrong crbegin.");
-  PQXX_CHECK(std::crend(r) == std::rend(r), "Wrong crend.");
-  PQXX_CHECK_EQUAL(r.front().as<int>(), 1, "Wrong row front().");
-  PQXX_CHECK_EQUAL(r.back().as<int>(), 3, "Wrong row back().");
-}
-
-
-void test_row_iterator()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::result rows{tx.exec("SELECT 1, 2, 3")};
-
-  auto i{std::begin(rows[0])};
-  PQXX_CHECK_EQUAL(i->as<int>(), 1, "Row iterator is wrong.");
-  auto i2{i};
-  PQXX_CHECK_EQUAL(i2->as<int>(), 1, "Row iterator copy is wrong.");
-  i2++;
-  PQXX_CHECK_EQUAL(i2->as<int>(), 2, "Row iterator increment is wrong.");
-  pqxx::row::const_iterator i3;
-  i3 = i2;
-  PQXX_CHECK_EQUAL(i3->as<int>(), 2, "Row iterator assignment is wrong.");
-
-  auto r{std::rbegin(rows[0])};
-  PQXX_CHECK_EQUAL(r->as<int>(), 3, "Row reverse iterator is wrong.");
-  auto r2{r};
-  PQXX_CHECK_EQUAL(r2->as<int>(), 3, "Row reverse iterator copy is wrong.");
-  r2++;
-  PQXX_CHECK_EQUAL(
-    r2->as<int>(), 2, "Row reverse iterator increment is wrong.");
-  pqxx::row::const_reverse_iterator r3;
-  r3 = r2;
-  PQXX_CHECK_EQUAL(
-    i3->as<int>(), 2, "Row reverse iterator assignment is wrong.");
-}
-
-
-void test_row_as()
-{
-  using pqxx::operator"" _zv;
-
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  pqxx::row const r{tx.exec1("SELECT 1, 2, 3")};
-  auto [one, two, three]{r.as<int, float, pqxx::zview>()};
-  static_assert(std::is_same_v<decltype(one), int>);
-  static_assert(std::is_same_v<decltype(two), float>);
-  static_assert(std::is_same_v<decltype(three), pqxx::zview>);
-  PQXX_CHECK_EQUAL(one, 1, "row::as() did not produce the right int.");
-  PQXX_CHECK_GREATER(two, 1.9, "row::as() did not produce the right float.");
-  PQXX_CHECK_LESS(two, 2.1, "row::as() did not produce the right float.");
-  PQXX_CHECK_EQUAL(
-    three, "3"_zv, "row::as() did not produce the right zview.");
-
-  PQXX_CHECK_EQUAL(
-    std::get<0>(tx.exec1("SELECT 999").as<int>()), 999,
-    "Unary tuple did not extract right.");
-}
-
-
-PQXX_REGISTER_TEST(test_row);
-PQXX_REGISTER_TEST(test_row_iterator);
-PQXX_REGISTER_TEST(test_row_as);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_separated_list.cxx b/ext/libpqxx-7.7.3/test/unit/test_separated_list.cxx
deleted file mode 100644
index 748379b47..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_separated_list.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <pqxx/separated_list>
-
-#include "../test_helpers.hxx"
-
-// Test program for separated_list.
-
-namespace
-{
-void test_separated_list()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::separated_list(",", std::vector<int>{}), "",
-    "Empty list came out wrong.");
-
-  PQXX_CHECK_EQUAL(
-    pqxx::separated_list(",", std::vector<int>{5}), "5",
-    "Single-element list came out wrong.");
-
-  PQXX_CHECK_EQUAL(
-    pqxx::separated_list(",", std::vector<int>{3, 6}), "3,6",
-    "Things go wrong once separators come in.");
-
-  std::vector<int> const nums{1, 2, 3};
-  PQXX_CHECK_EQUAL(
-    pqxx::separated_list(
-      "+", std::begin(nums), std::end(nums),
-      [](auto elt) { return *elt * 2; }),
-    "2+4+6", "Accessors don't seem to work.");
-}
-
-
-PQXX_REGISTER_TEST(test_separated_list);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_simultaneous_transactions.cxx b/ext/libpqxx-7.7.3/test/unit/test_simultaneous_transactions.cxx
deleted file mode 100644
index 9c1e2fe9c..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_simultaneous_transactions.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <pqxx/nontransaction>
-#include <pqxx/subtransaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_simultaneous_transactions()
-{
-  pqxx::connection conn;
-
-  pqxx::nontransaction n1{conn};
-  PQXX_CHECK_THROWS(
-    pqxx::nontransaction n2{conn}, std::logic_error,
-    "Allowed to open simultaneous nontransactions.");
-}
-
-
-PQXX_REGISTER_TEST(test_simultaneous_transactions);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_sql_cursor.cxx b/ext/libpqxx-7.7.3/test/unit/test_sql_cursor.cxx
deleted file mode 100644
index a0109a00b..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_sql_cursor.cxx
+++ /dev/null
@@ -1,270 +0,0 @@
-#include <pqxx/cursor>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_forward_sql_cursor()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  // Plain owned, scoped, forward-only read-only cursor.
-  pqxx::internal::sql_cursor forward(
-    tx, "SELECT generate_series(1, 4)", "forward",
-    pqxx::cursor_base::forward_only, pqxx::cursor_base::read_only,
-    pqxx::cursor_base::owned, false);
-
-  PQXX_CHECK_EQUAL(forward.pos(), 0, "Wrong initial position");
-  PQXX_CHECK_EQUAL(forward.endpos(), -1, "Wrong initial endpos()");
-
-  auto empty_result{forward.empty_result()};
-  PQXX_CHECK_EQUAL(std::size(empty_result), 0, "Empty result not empty");
-
-  auto displacement{0};
-  auto one{forward.fetch(1, displacement)};
-  PQXX_CHECK_EQUAL(std::size(one), 1, "Fetched wrong number of rows");
-  PQXX_CHECK_EQUAL(one[0][0].as<std::string>(), "1", "Unexpected result");
-  PQXX_CHECK_EQUAL(displacement, 1, "Wrong displacement");
-  PQXX_CHECK_EQUAL(forward.pos(), 1, "In wrong position");
-
-  auto offset{forward.move(1, displacement)};
-  PQXX_CHECK_EQUAL(offset, 1, "Unexpected offset from move()");
-  PQXX_CHECK_EQUAL(displacement, 1, "Unexpected displacement after move()");
-  PQXX_CHECK_EQUAL(forward.pos(), 2, "Wrong position after move()");
-  PQXX_CHECK_EQUAL(forward.endpos(), -1, "endpos() unexpectedly set");
-
-  auto row{forward.fetch(0, displacement)};
-  PQXX_CHECK_EQUAL(std::size(row), 0, "fetch(0, displacement) returns rows");
-  PQXX_CHECK_EQUAL(displacement, 0, "Unexpected displacement after fetch(0)");
-  PQXX_CHECK_EQUAL(forward.pos(), 2, "fetch(0, displacement) affected pos()");
-
-  row = forward.fetch(0);
-  PQXX_CHECK_EQUAL(std::size(row), 0, "fetch(0) fetched wrong number of rows");
-  PQXX_CHECK_EQUAL(forward.pos(), 2, "fetch(0) moved cursor");
-  PQXX_CHECK_EQUAL(forward.pos(), 2, "fetch(0) affected pos()");
-
-  offset = forward.move(1);
-  PQXX_CHECK_EQUAL(offset, 1, "move(1) returned unexpected value");
-  PQXX_CHECK_EQUAL(forward.pos(), 3, "move(1) after fetch(0) broke");
-
-  row = forward.fetch(1);
-  PQXX_CHECK_EQUAL(
-    std::size(row), 1, "fetch(1) returned wrong number of rows");
-  PQXX_CHECK_EQUAL(forward.pos(), 4, "fetch(1) results in bad pos()");
-  PQXX_CHECK_EQUAL(row[0][0].as<std::string>(), "4", "pos() is lying");
-
-  empty_result = forward.fetch(1, displacement);
-  PQXX_CHECK_EQUAL(std::size(empty_result), 0, "Got rows at end of cursor");
-  PQXX_CHECK_EQUAL(forward.pos(), 5, "Not at one-past-end position");
-  PQXX_CHECK_EQUAL(forward.endpos(), 5, "Failed to notice end position");
-  PQXX_CHECK_EQUAL(displacement, 1, "Wrong displacement at end position");
-
-  offset = forward.move(5, displacement);
-  PQXX_CHECK_EQUAL(offset, 0, "move() lied at end of result set");
-  PQXX_CHECK_EQUAL(forward.pos(), 5, "pos() is beyond end");
-  PQXX_CHECK_EQUAL(forward.endpos(), 5, "endpos() changed after end position");
-  PQXX_CHECK_EQUAL(displacement, 0, "Wrong displacement after end position");
-
-  // Move through entire result set at once.
-  pqxx::internal::sql_cursor forward2(
-    tx, "SELECT generate_series(1, 4)", "forward",
-    pqxx::cursor_base::forward_only, pqxx::cursor_base::read_only,
-    pqxx::cursor_base::owned, false);
-
-  // Move through entire result set at once.
-  offset = forward2.move(pqxx::cursor_base::all(), displacement);
-  PQXX_CHECK_EQUAL(offset, 4, "Unexpected number of rows in result set");
-  PQXX_CHECK_EQUAL(displacement, 5, "displacement != rows+1");
-  PQXX_CHECK_EQUAL(forward2.pos(), 5, "Bad pos() after skipping all rows");
-  PQXX_CHECK_EQUAL(forward2.endpos(), 5, "Bad endpos() after skipping");
-
-  pqxx::internal::sql_cursor forward3(
-    tx, "SELECT generate_series(1, 4)", "forward",
-    pqxx::cursor_base::forward_only, pqxx::cursor_base::read_only,
-    pqxx::cursor_base::owned, false);
-
-  // Fetch entire result set at once.
-  auto rows{forward3.fetch(pqxx::cursor_base::all(), displacement)};
-  PQXX_CHECK_EQUAL(
-    std::size(rows), 4, "Unexpected number of rows in result set");
-  PQXX_CHECK_EQUAL(displacement, 5, "displacement != rows+1");
-  PQXX_CHECK_EQUAL(forward3.pos(), 5, "Bad pos() after fetching all rows");
-  PQXX_CHECK_EQUAL(forward3.endpos(), 5, "Bad endpos() after fetching");
-
-  pqxx::internal::sql_cursor forward_empty(
-    tx, "SELECT generate_series(0, -1)", "forward_empty",
-    pqxx::cursor_base::forward_only, pqxx::cursor_base::read_only,
-    pqxx::cursor_base::owned, false);
-
-  offset = forward_empty.move(3, displacement);
-  PQXX_CHECK_EQUAL(forward_empty.pos(), 1, "Bad pos() at end of result");
-  PQXX_CHECK_EQUAL(forward_empty.endpos(), 1, "Bad endpos() in empty result");
-  PQXX_CHECK_EQUAL(displacement, 1, "Bad displacement in empty result");
-  PQXX_CHECK_EQUAL(offset, 0, "move() in empty result counted rows");
-}
-
-void test_scroll_sql_cursor()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  pqxx::internal::sql_cursor scroll(
-    tx, "SELECT generate_series(1, 10)", "scroll",
-    pqxx::cursor_base::random_access, pqxx::cursor_base::read_only,
-    pqxx::cursor_base::owned, false);
-
-  PQXX_CHECK_EQUAL(scroll.pos(), 0, "Scroll cursor's initial pos() is wrong");
-  PQXX_CHECK_EQUAL(scroll.endpos(), -1, "New scroll cursor has endpos() set");
-
-  auto rows{scroll.fetch(pqxx::cursor_base::next())};
-  PQXX_CHECK_EQUAL(std::size(rows), 1, "Scroll cursor is broken");
-  PQXX_CHECK_EQUAL(scroll.pos(), 1, "Scroll cursor's pos() is broken");
-  PQXX_CHECK_EQUAL(scroll.endpos(), -1, "endpos() set prematurely");
-
-  // Turn cursor around.  This is where we begin to feel SQL cursors'
-  // semantics: we pre-decrement, ending up on the position in front of the
-  // first row and returning no rows.
-  rows = scroll.fetch(pqxx::cursor_base::prior());
-  PQXX_CHECK_EQUAL(std::empty(rows), true, "Turning around on fetch() broke");
-  PQXX_CHECK_EQUAL(scroll.pos(), 0, "pos() is not back at zero");
-  PQXX_CHECK_EQUAL(
-    scroll.endpos(), -1, "endpos() set on wrong side of result");
-
-  // Bounce off the left-hand side of the result set.  Can't move before the
-  // starting position.
-  auto offset{0}, displacement{0};
-  offset = scroll.move(-3, displacement);
-  PQXX_CHECK_EQUAL(offset, 0, "Rows found before beginning");
-  PQXX_CHECK_EQUAL(displacement, 0, "Failed to bounce off beginning");
-  PQXX_CHECK_EQUAL(scroll.pos(), 0, "pos() moved back from zero");
-  PQXX_CHECK_EQUAL(scroll.endpos(), -1, "endpos() set on left-side bounce");
-
-  // Try bouncing off the left-hand side a little harder.  Take 4 paces away
-  // from the boundary and run into it.
-  offset = scroll.move(4, displacement);
-  PQXX_CHECK_EQUAL(offset, 4, "Offset mismatch");
-  PQXX_CHECK_EQUAL(displacement, 4, "Displacement mismatch");
-  PQXX_CHECK_EQUAL(scroll.pos(), 4, "Position mismatch");
-  PQXX_CHECK_EQUAL(scroll.endpos(), -1, "endpos() set at weird time");
-
-  offset = scroll.move(-10, displacement);
-  PQXX_CHECK_EQUAL(offset, 3, "Offset mismatch");
-  PQXX_CHECK_EQUAL(displacement, -4, "Displacement mismatch");
-  PQXX_CHECK_EQUAL(scroll.pos(), 0, "Hard bounce failed");
-  PQXX_CHECK_EQUAL(scroll.endpos(), -1, "endpos() set during hard bounce");
-
-  rows = scroll.fetch(3);
-  PQXX_CHECK_EQUAL(scroll.pos(), 3, "Bad pos()");
-  PQXX_CHECK_EQUAL(std::size(rows), 3, "Wrong number of rows");
-  PQXX_CHECK_EQUAL(rows[2][0].as<int>(), 3, "pos() does not match data");
-  rows = scroll.fetch(-1);
-  PQXX_CHECK_EQUAL(scroll.pos(), 2, "Bad pos()");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 2, "pos() does not match data");
-
-  rows = scroll.fetch(1);
-  PQXX_CHECK_EQUAL(scroll.pos(), 3, "Bad pos() after inverse turnaround");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 3, "Data position mismatch");
-}
-
-
-void test_adopted_sql_cursor()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  tx.exec0(
-    "DECLARE adopted SCROLL CURSOR FOR "
-    "SELECT generate_series(1, 3)");
-  pqxx::internal::sql_cursor adopted(tx, "adopted", pqxx::cursor_base::owned);
-  PQXX_CHECK_EQUAL(adopted.pos(), -1, "Adopted cursor has known pos()");
-  PQXX_CHECK_EQUAL(adopted.endpos(), -1, "Adopted cursor has known endpos()");
-
-  auto displacement{0};
-  auto rows{adopted.fetch(pqxx::cursor_base::all(), displacement)};
-  PQXX_CHECK_EQUAL(std::size(rows), 3, "Wrong number of rows in result");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 1, "Wrong result data");
-  PQXX_CHECK_EQUAL(rows[2][0].as<int>(), 3, "Wrong result data");
-  PQXX_CHECK_EQUAL(displacement, 4, "Wrong displacement");
-  PQXX_CHECK_EQUAL(
-    adopted.pos(), -1, "End-of-result set pos() on adopted cur");
-  PQXX_CHECK_EQUAL(adopted.endpos(), -1, "endpos() set too early");
-
-  rows = adopted.fetch(pqxx::cursor_base::backward_all(), displacement);
-  PQXX_CHECK_EQUAL(std::size(rows), 3, "Wrong number of rows in result");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 3, "Wrong result data");
-  PQXX_CHECK_EQUAL(rows[2][0].as<int>(), 1, "Wrong result data");
-  PQXX_CHECK_EQUAL(displacement, -4, "Wrong displacement");
-  PQXX_CHECK_EQUAL(adopted.pos(), 0, "Failed to recognize starting position");
-  PQXX_CHECK_EQUAL(adopted.endpos(), -1, "endpos() set too early");
-
-  auto offset{adopted.move(pqxx::cursor_base::all())};
-  PQXX_CHECK_EQUAL(offset, 3, "Unexpected move() offset");
-  PQXX_CHECK_EQUAL(adopted.pos(), 4, "Bad position on adopted cursor");
-  PQXX_CHECK_EQUAL(adopted.endpos(), 4, "endpos() not set properly");
-
-  // Owned adopted cursors are cleaned up on destruction.
-  pqxx::connection conn2;
-  pqxx::work tx2(conn2, "tx2");
-  tx2.exec0(
-    "DECLARE adopted2 CURSOR FOR "
-    "SELECT generate_series(1, 3)");
-  {
-    pqxx::internal::sql_cursor(tx2, "adopted2", pqxx::cursor_base::owned);
-  }
-  // Modern backends: accessing the cursor now is an error, as you'd expect.
-  PQXX_CHECK_THROWS(
-    tx2.exec("FETCH 1 IN adopted2"), pqxx::sql_error,
-    "Owned adopted cursor not cleaned up");
-
-  tx2.abort();
-
-  pqxx::work tx3(conn2, "tx3");
-  tx3.exec(
-    "DECLARE adopted3 CURSOR FOR "
-    "SELECT generate_series(1, 3)");
-  {
-    pqxx::internal::sql_cursor(tx3, "adopted3", pqxx::cursor_base::loose);
-  }
-  tx3.exec("MOVE 1 IN adopted3");
-}
-
-void test_hold_cursor()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  // "With hold" cursor is kept after commit.
-  pqxx::internal::sql_cursor with_hold(
-    tx, "SELECT generate_series(1, 3)", "hold_cursor",
-    pqxx::cursor_base::forward_only, pqxx::cursor_base::read_only,
-    pqxx::cursor_base::owned, true);
-  tx.commit();
-  pqxx::work tx2(conn, "tx2");
-  auto rows{with_hold.fetch(1)};
-  PQXX_CHECK_EQUAL(
-    std::size(rows), 1, "Did not get 1 row from with-hold cursor");
-
-  // Cursor without hold is closed on commit.
-  pqxx::internal::sql_cursor no_hold(
-    tx2, "SELECT generate_series(1, 3)", "no_hold_cursor",
-    pqxx::cursor_base::forward_only, pqxx::cursor_base::read_only,
-    pqxx::cursor_base::owned, false);
-  tx2.commit();
-  pqxx::work tx3(conn, "tx3");
-  PQXX_CHECK_THROWS(
-    no_hold.fetch(1), pqxx::sql_error, "Cursor not closed on commit");
-}
-
-
-void cursor_tests()
-{
-  test_forward_sql_cursor();
-  test_scroll_sql_cursor();
-  test_adopted_sql_cursor();
-  test_hold_cursor();
-}
-
-
-PQXX_REGISTER_TEST(cursor_tests);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_stateless_cursor.cxx b/ext/libpqxx-7.7.3/test/unit/test_stateless_cursor.cxx
deleted file mode 100644
index 79307c19e..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_stateless_cursor.cxx
+++ /dev/null
@@ -1,85 +0,0 @@
-#include <pqxx/cursor>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_stateless_cursor()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  pqxx::stateless_cursor<
-    pqxx::cursor_base::read_only, pqxx::cursor_base::owned>
-    empty(tx, "SELECT generate_series(0, -1)", "empty", false);
-
-  auto rows{empty.retrieve(0, 0)};
-  PQXX_CHECK_EQUAL(std::empty(rows), true, "Empty result not empty");
-  rows = empty.retrieve(0, 1);
-  PQXX_CHECK_EQUAL(std::size(rows), 0, "Empty result returned rows");
-
-  PQXX_CHECK_EQUAL(empty.size(), 0, "Empty cursor not empty");
-
-  PQXX_CHECK_THROWS(
-    empty.retrieve(1, 0), std::out_of_range, "Empty cursor tries to retrieve");
-
-  pqxx::stateless_cursor<
-    pqxx::cursor_base::read_only, pqxx::cursor_base::owned>
-    stateless(tx, "SELECT generate_series(0, 9)", "stateless", false);
-
-  PQXX_CHECK_EQUAL(stateless.size(), 10, "stateless_cursor::size() mismatch");
-
-  // Retrieve nothing.
-  rows = stateless.retrieve(1, 1);
-  PQXX_CHECK_EQUAL(std::size(rows), 0, "1-to-1 retrieval not empty");
-
-  // Retrieve two rows.
-  rows = stateless.retrieve(1, 3);
-  PQXX_CHECK_EQUAL(std::size(rows), 2, "Retrieved wrong number of rows");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 1, "Data/position mismatch");
-  PQXX_CHECK_EQUAL(rows[1][0].as<int>(), 2, "Data/position mismatch");
-
-  // Retrieve same rows in reverse.
-  rows = stateless.retrieve(2, 0);
-  PQXX_CHECK_EQUAL(std::size(rows), 2, "Retrieved wrong number of rows");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 2, "Data/position mismatch");
-  PQXX_CHECK_EQUAL(rows[1][0].as<int>(), 1, "Data/position mismatch");
-
-  // Retrieve beyond end.
-  rows = stateless.retrieve(9, 13);
-  PQXX_CHECK_EQUAL(std::size(rows), 1, "Row count wrong at end");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 9, "Data/pos mismatch at end");
-
-  // Retrieve beyond beginning.
-  rows = stateless.retrieve(0, -4);
-  PQXX_CHECK_EQUAL(std::size(rows), 1, "Row count wrong at beginning");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 0, "Data/pos mismatch at beginning");
-
-  // Retrieve entire result set backwards.
-  rows = stateless.retrieve(10, -15);
-  PQXX_CHECK_EQUAL(
-    std::size(rows), 10, "Reverse complete retrieval is broken");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 9, "Data mismatch");
-  PQXX_CHECK_EQUAL(rows[9][0].as<int>(), 0, "Data mismatch");
-
-  // Normal usage pattern: step through result set, 4 rows at a time.
-  rows = stateless.retrieve(0, 4);
-  PQXX_CHECK_EQUAL(std::size(rows), 4, "Wrong batch size");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 0, "Batch in wrong place");
-  PQXX_CHECK_EQUAL(rows[3][0].as<int>(), 3, "Batch in wrong place");
-
-  rows = stateless.retrieve(4, 8);
-  PQXX_CHECK_EQUAL(std::size(rows), 4, "Wrong batch size");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 4, "Batch in wrong place");
-  PQXX_CHECK_EQUAL(rows[3][0].as<int>(), 7, "Batch in wrong place");
-
-  rows = stateless.retrieve(8, 12);
-  PQXX_CHECK_EQUAL(std::size(rows), 2, "Wrong batch size");
-  PQXX_CHECK_EQUAL(rows[0][0].as<int>(), 8, "Batch in wrong place");
-  PQXX_CHECK_EQUAL(rows[1][0].as<int>(), 9, "Batch in wrong place");
-}
-
-
-PQXX_REGISTER_TEST(test_stateless_cursor);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_strconv.cxx b/ext/libpqxx-7.7.3/test/unit/test_strconv.cxx
deleted file mode 100644
index 602084e18..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_strconv.cxx
+++ /dev/null
@@ -1,143 +0,0 @@
-#include <memory>
-#include <optional>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-enum colour
-{
-  red,
-  green,
-  blue
-};
-enum class weather : short
-{
-  hot,
-  cold,
-  wet
-};
-enum class many : unsigned long long
-{
-  bottom = 0,
-  top = std::numeric_limits<unsigned long long>::max(),
-};
-} // namespace
-
-namespace pqxx
-{
-PQXX_DECLARE_ENUM_CONVERSION(colour);
-PQXX_DECLARE_ENUM_CONVERSION(weather);
-PQXX_DECLARE_ENUM_CONVERSION(many);
-} // namespace pqxx
-
-
-namespace
-{
-void test_strconv_bool()
-{
-  PQXX_CHECK_EQUAL(pqxx::to_string(false), "false", "Wrong to_string(false).");
-  PQXX_CHECK_EQUAL(pqxx::to_string(true), "true", "Wrong to_string(true).");
-
-  bool result;
-  pqxx::from_string("false", result);
-  PQXX_CHECK_EQUAL(result, false, "Wrong from_string('false').");
-  pqxx::from_string("FALSE", result);
-  PQXX_CHECK_EQUAL(result, false, "Wrong from_string('FALSE').");
-  pqxx::from_string("f", result);
-  PQXX_CHECK_EQUAL(result, false, "Wrong from_string('f').");
-  pqxx::from_string("F", result);
-  PQXX_CHECK_EQUAL(result, false, "Wrong from_string('F').");
-  pqxx::from_string("0", result);
-  PQXX_CHECK_EQUAL(result, false, "Wrong from_string('0').");
-  pqxx::from_string("true", result);
-  PQXX_CHECK_EQUAL(result, true, "Wrong from_string('true').");
-  pqxx::from_string("TRUE", result);
-  PQXX_CHECK_EQUAL(result, true, "Wrong from_string('TRUE').");
-  pqxx::from_string("t", result);
-  PQXX_CHECK_EQUAL(result, true, "Wrong from_string('t').");
-  pqxx::from_string("T", result);
-  PQXX_CHECK_EQUAL(result, true, "Wrong from_string('T').");
-  pqxx::from_string("1", result);
-  PQXX_CHECK_EQUAL(result, true, "Wrong from_string('1').");
-}
-
-
-void test_strconv_enum()
-{
-  PQXX_CHECK_EQUAL(pqxx::to_string(red), "0", "Enum value did not convert.");
-  PQXX_CHECK_EQUAL(pqxx::to_string(green), "1", "Enum value did not convert.");
-  PQXX_CHECK_EQUAL(pqxx::to_string(blue), "2", "Enum value did not convert.");
-
-  colour col;
-  pqxx::from_string("2", col);
-  PQXX_CHECK_EQUAL(col, blue, "Could not recover enum value from string.");
-}
-
-
-void test_strconv_class_enum()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(weather::hot), "0", "Class enum value did not convert.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(weather::wet), "2", "Enum value did not convert.");
-
-  weather w;
-  pqxx::from_string("2", w);
-  PQXX_CHECK_EQUAL(
-    w, weather::wet, "Could not recover class enum value from string.");
-
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(many::bottom), "0",
-    "Small wide enum did not convert right.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(many::top),
-    pqxx::to_string(std::numeric_limits<unsigned long long>::max()),
-    "Large wide enum did not convert right.");
-}
-
-
-void test_strconv_optional()
-{
-  PQXX_CHECK_THROWS(
-    pqxx::to_string(std::optional<int>{}), pqxx::conversion_error,
-    "Converting an empty optional did not throw conversion error.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::optional<int>{std::in_place, 10}), "10",
-    "std::optional<int> does not convert right.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::optional<int>{std::in_place, -10000}), "-10000",
-    "std::optional<int> does not convert right.");
-}
-
-
-void test_strconv_smart_pointer()
-{
-  PQXX_CHECK_THROWS(
-    pqxx::to_string(std::unique_ptr<int>{}), pqxx::conversion_error,
-    "Converting an empty unique_ptr did not throw conversion error.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::make_unique<int>(10)), "10",
-    "std::unique_ptr<int> does not convert right.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::make_unique<int>(-10000)), "-10000",
-    "std::unique_ptr<int> does not convert right.");
-
-  PQXX_CHECK_THROWS(
-    pqxx::to_string(std::shared_ptr<int>{}), pqxx::conversion_error,
-    "Converting an empty shared_ptr did not throw conversion error.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::make_shared<int>(10)), "10",
-    "std::shared_ptr<int> does not convert right.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::make_shared<int>(-10000)), "-10000",
-    "std::shared_ptr<int> does not convert right.");
-}
-
-
-PQXX_REGISTER_TEST(test_strconv_bool);
-PQXX_REGISTER_TEST(test_strconv_enum);
-PQXX_REGISTER_TEST(test_strconv_class_enum);
-PQXX_REGISTER_TEST(test_strconv_optional);
-PQXX_REGISTER_TEST(test_strconv_smart_pointer);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_stream_from.cxx b/ext/libpqxx-7.7.3/test/unit/test_stream_from.cxx
deleted file mode 100644
index d8adb8bd1..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_stream_from.cxx
+++ /dev/null
@@ -1,344 +0,0 @@
-#include <pqxx/stream_from>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-#include "../test_types.hxx"
-
-#include <cstring>
-#include <iostream>
-#include <set>
-#include <string>
-#include <tuple>
-#include <vector>
-
-#include <optional>
-
-
-namespace
-{
-void test_nonoptionals(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto extractor{pqxx::stream_from::query(
-    tx, "SELECT * FROM stream_from_test ORDER BY number0")};
-  PQXX_CHECK(extractor, "stream_from failed to initialize.");
-
-  std::tuple<int, std::string, int, ipv4, std::string, bytea> got_tuple;
-
-  try
-  {
-    // We can't read the "910" row -- it contains nulls, which our tuple does
-    // not accept.
-    extractor >> got_tuple;
-    PQXX_CHECK_NOTREACHED(
-      "Failed to fail to stream null values into null-less fields.");
-  }
-  catch (pqxx::conversion_error const &e)
-  {
-    std::string const what{e.what()};
-    if (what.find("null") == std::string::npos)
-      throw;
-    pqxx::test::expected_exception(
-      "Could not stream nulls into null-less fields: " + what);
-  }
-
-  // The stream is still good though.
-  // The second tuple is fine.
-  extractor >> got_tuple;
-  PQXX_CHECK(extractor, "Stream ended prematurely.");
-
-  PQXX_CHECK_EQUAL(std::get<0>(got_tuple), 1234, "Bad value.");
-  // Don't know much about the timestamp, but let's assume it starts with a
-  // year in the second millennium.
-  PQXX_CHECK(
-    std::get<1>(got_tuple).at(0) == '2', "Bad value.  Expected timestamp.");
-  PQXX_CHECK_LESS(
-    std::size(std::get<1>(got_tuple)), 40u, "Unexpected length.");
-  PQXX_CHECK_GREATER(
-    std::size(std::get<1>(got_tuple)), 20u, "Unexpected length.");
-  PQXX_CHECK_EQUAL(std::get<2>(got_tuple), 4321, "Bad value.");
-  PQXX_CHECK_EQUAL(std::get<3>(got_tuple), (ipv4{8, 8, 8, 8}), "Bad value.");
-  PQXX_CHECK_EQUAL(std::get<4>(got_tuple), "hello\n \tworld", "Bad value.");
-  PQXX_CHECK_EQUAL(
-    std::get<5>(got_tuple), (bytea{'\x00', '\x01', '\x02'}), "Bad value.");
-
-  // The third tuple contains some nulls. For what it's worth, when we *know*
-  // that we're getting nulls, we can stream them into nullptr_t fields.
-  std::tuple<
-    int, std::string, std::nullptr_t, std::nullptr_t, std::string, bytea>
-    tup_w_nulls;
-
-  extractor >> tup_w_nulls;
-  PQXX_CHECK(extractor, "Stream ended prematurely.");
-
-  PQXX_CHECK_EQUAL(std::get<0>(tup_w_nulls), 5678, "Bad value.");
-  PQXX_CHECK(std::get<2>(tup_w_nulls) == nullptr, "Bad null.");
-  PQXX_CHECK(std::get<3>(tup_w_nulls) == nullptr, "Bad null.");
-
-  // We're at the end of the stream.
-  extractor >> tup_w_nulls;
-  PQXX_CHECK(not extractor, "Stream did not end.");
-
-  // Of course we can't stream a non-null value into a nullptr field.
-  auto ex2{pqxx::stream_from::query(tx, "SELECT 1")};
-  std::tuple<std::nullptr_t> null_tup;
-  try
-  {
-    ex2 >> null_tup;
-    PQXX_CHECK_NOTREACHED(
-      "stream_from should have refused to convert non-null value to "
-      "nullptr_t.");
-  }
-  catch (pqxx::conversion_error const &e)
-  {
-    std::string const what{e.what()};
-    if (what.find("null") == std::string::npos)
-      throw;
-    pqxx::test::expected_exception(
-      std::string{"Could not extract row: "} + what);
-  }
-  ex2 >> null_tup;
-  PQXX_CHECK(not ex2, "Stream did not end.");
-
-  PQXX_CHECK_SUCCEEDS(
-    tx.exec1("SELECT 1"), "Could not use transaction after stream_from.");
-}
-
-
-void test_bad_tuples(pqxx::connection &conn)
-{
-  pqxx::work tx{conn};
-  auto extractor{pqxx::stream_from::table(tx, {"stream_from_test"})};
-  PQXX_CHECK(extractor, "stream_from failed to initialize");
-
-  std::tuple<int> got_tuple_too_short;
-  try
-  {
-    extractor >> got_tuple_too_short;
-    PQXX_CHECK_NOTREACHED("stream_from improperly read first row");
-  }
-  catch (pqxx::usage_error const &e)
-  {
-    std::string what{e.what()};
-    if (
-      what.find("1") == std::string::npos or
-      what.find("6") == std::string::npos)
-      throw;
-    pqxx::test::expected_exception("Tuple is wrong size: " + what);
-  }
-
-  std::tuple<int, std::string, int, ipv4, std::string, bytea, std::string>
-    got_tuple_too_long;
-  try
-  {
-    extractor >> got_tuple_too_long;
-    PQXX_CHECK_NOTREACHED("stream_from improperly read first row");
-  }
-  catch (pqxx::usage_error const &e)
-  {
-    std::string what{e.what()};
-    if (
-      what.find("6") == std::string::npos or
-      what.find("7") == std::string::npos)
-      throw;
-    pqxx::test::expected_exception("Could not extract row: " + what);
-  }
-
-  extractor.complete();
-}
-
-
-#define ASSERT_FIELD_EQUAL(OPT, VAL)                                          \
-  PQXX_CHECK(static_cast<bool>(OPT), "unexpected null field");                \
-  PQXX_CHECK_EQUAL(*OPT, VAL, "field value mismatch")
-#define ASSERT_FIELD_NULL(OPT)                                                \
-  PQXX_CHECK(not static_cast<bool>(OPT), "expected null field")
-
-
-template<template<typename...> class O>
-void test_optional(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto extractor{pqxx::stream_from::query(
-    tx, "SELECT * FROM stream_from_test ORDER BY number0")};
-  PQXX_CHECK(extractor, "stream_from failed to initialize");
-
-  std::tuple<int, O<std::string>, O<int>, O<ipv4>, O<std::string>, O<bytea>>
-    got_tuple;
-
-  extractor >> got_tuple;
-  PQXX_CHECK(extractor, "stream_from failed to read third row");
-  PQXX_CHECK_EQUAL(std::get<0>(got_tuple), 910, "field value mismatch");
-  ASSERT_FIELD_NULL(std::get<1>(got_tuple));
-  ASSERT_FIELD_NULL(std::get<2>(got_tuple));
-  ASSERT_FIELD_NULL(std::get<3>(got_tuple));
-  ASSERT_FIELD_EQUAL(std::get<4>(got_tuple), "\\N");
-  ASSERT_FIELD_EQUAL(std::get<5>(got_tuple), bytea{});
-
-  extractor >> got_tuple;
-  PQXX_CHECK(extractor, "stream_from failed to read first row.");
-  PQXX_CHECK_EQUAL(std::get<0>(got_tuple), 1234, "Field value mismatch.");
-  PQXX_CHECK(
-    static_cast<bool>(std::get<1>(got_tuple)), "Unexpected null field.");
-  // PQXX_CHECK_EQUAL(*std::get<1>(got_tuple), , "field value mismatch");
-  ASSERT_FIELD_EQUAL(std::get<2>(got_tuple), 4321);
-  ASSERT_FIELD_EQUAL(std::get<3>(got_tuple), (ipv4{8, 8, 8, 8}));
-  ASSERT_FIELD_EQUAL(std::get<4>(got_tuple), "hello\n \tworld");
-  ASSERT_FIELD_EQUAL(std::get<5>(got_tuple), (bytea{'\x00', '\x01', '\x02'}));
-
-  extractor >> got_tuple;
-  PQXX_CHECK(extractor, "stream_from failed to read second row");
-  PQXX_CHECK_EQUAL(std::get<0>(got_tuple), 5678, "field value mismatch");
-  ASSERT_FIELD_EQUAL(std::get<1>(got_tuple), "2018-11-17 21:23:00");
-  ASSERT_FIELD_NULL(std::get<2>(got_tuple));
-  ASSERT_FIELD_NULL(std::get<3>(got_tuple));
-  ASSERT_FIELD_EQUAL(std::get<4>(got_tuple), "\u3053\u3093\u306b\u3061\u308f");
-  ASSERT_FIELD_EQUAL(
-    std::get<5>(got_tuple), (bytea{'f', 'o', 'o', ' ', 'b', 'a', 'r', '\0'}));
-
-  extractor >> got_tuple;
-  PQXX_CHECK(not extractor, "stream_from failed to detect end of stream");
-
-  extractor.complete();
-}
-
-
-void test_stream_from()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0(
-    "CREATE TEMP TABLE stream_from_test ("
-    "number0 INT NOT NULL,"
-    "ts1     TIMESTAMP NULL,"
-    "number2 INT NULL,"
-    "addr3   INET NULL,"
-    "txt4    TEXT NULL,"
-    "bin5    BYTEA NOT NULL"
-    ")");
-  tx.exec_params(
-    "INSERT INTO stream_from_test VALUES ($1,$2,$3,$4,$5,$6)", 910, nullptr,
-    nullptr, nullptr, "\\N", bytea{});
-  tx.exec_params(
-    "INSERT INTO stream_from_test VALUES ($1,$2,$3,$4,$5,$6)", 1234, "now",
-    4321, ipv4{8, 8, 8, 8}, "hello\n \tworld", bytea{'\x00', '\x01', '\x02'});
-  tx.exec_params(
-    "INSERT INTO stream_from_test VALUES ($1,$2,$3,$4,$5,$6)", 5678,
-    "2018-11-17 21:23:00", nullptr, nullptr, "\u3053\u3093\u306b\u3061\u308f",
-    bytea{'f', 'o', 'o', ' ', 'b', 'a', 'r', '\0'});
-  tx.commit();
-
-  test_nonoptionals(conn);
-  test_bad_tuples(conn);
-  std::cout << "testing `std::unique_ptr` as optional...\n";
-  test_optional<std::unique_ptr>(conn);
-  std::cout << "testing `std::optional` as optional...\n";
-  test_optional<std::optional>(conn);
-}
-
-
-void test_stream_from_does_escaping()
-{
-  std::string const input{"a\t\n\n\n \\b\nc"};
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0("CREATE TEMP TABLE badstr (str text)");
-  tx.exec0("INSERT INTO badstr (str) VALUES (" + tx.quote(input) + ")");
-  auto reader{pqxx::stream_from::table(tx, {"badstr"})};
-  std::tuple<std::string> out;
-  reader >> out;
-  PQXX_CHECK_EQUAL(
-    std::get<0>(out), input, "stream_from got weird characters wrong.");
-}
-
-
-void test_stream_from_does_iteration()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0("CREATE TEMP TABLE str (s text)");
-  tx.exec0("INSERT INTO str (s) VALUES ('foo')");
-  auto reader{pqxx::stream_from::table(tx, {"str"})};
-
-  int i{0};
-  std::string out;
-  for (std::tuple<std::string> t : reader.iter<std::string>())
-  {
-    i++;
-    out = std::get<0>(t);
-  }
-  PQXX_CHECK_EQUAL(i, 1, "Wrong number of iterations.");
-  PQXX_CHECK_EQUAL(out, "foo", "Got wrong string.");
-
-  tx.exec0("INSERT INTO str (s) VALUES ('bar')");
-  i = 0;
-  std::set<std::string> strings;
-  auto reader2{pqxx::stream_from::table(tx, {"str"})};
-  for (std::tuple<std::string> t : reader2.iter<std::string>())
-  {
-    i++;
-    strings.insert(std::get<0>(t));
-  }
-  PQXX_CHECK_EQUAL(i, 2, "Wrong number of iterations.");
-  PQXX_CHECK_EQUAL(
-    std::size(strings), 2u, "Wrong number of strings retrieved.");
-  PQXX_CHECK(strings.find("foo") != std::end(strings), "Missing key.");
-  PQXX_CHECK(strings.find("bar") != std::end(strings), "Missing key.");
-}
-
-
-void test_transaction_stream_from()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0("CREATE TEMP TABLE sample (id integer, name varchar)");
-  tx.exec0("INSERT INTO sample (id, name) VALUES (321, 'something')");
-
-  int items{0};
-  int id{0};
-  std::string name;
-
-  for (auto [iid, iname] :
-       tx.stream<int, std::string_view>("SELECT id, name FROM sample"))
-  {
-    items++;
-    id = iid;
-    name = iname;
-  }
-  PQXX_CHECK_EQUAL(items, 1, "Wrong number of iterations.");
-  PQXX_CHECK_EQUAL(id, 321, "Got wrong int.");
-  PQXX_CHECK_EQUAL(name, std::string{"something"}, "Got wrong string.");
-
-  PQXX_CHECK_EQUAL(
-    tx.query_value<int>("SELECT 4"), 4,
-    "Loop did not relinquish transaction.");
-}
-
-
-void test_stream_from_read_row()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0("CREATE TEMP TABLE sample (id integer, name varchar, opt integer)");
-  tx.exec0("INSERT INTO sample (id, name) VALUES (321, 'something')");
-
-  auto stream{pqxx::stream_from::table(tx, {"sample"})};
-  auto fields{stream.read_row()};
-  PQXX_CHECK_EQUAL(fields->size(), 3ul, "Wrong number of fields.");
-  PQXX_CHECK_EQUAL(
-    std::string((*fields)[0]), "321", "Integer field came out wrong.");
-  PQXX_CHECK_EQUAL(
-    std::string((*fields)[1]), "something", "Text field came out wrong.");
-  PQXX_CHECK(std::data((*fields)[2]) == nullptr, "Null field came out wrong.");
-
-  auto last{stream.read_row()};
-  PQXX_CHECK(last == nullptr, "No null pointer at end of stream.");
-}
-
-
-PQXX_REGISTER_TEST(test_stream_from);
-PQXX_REGISTER_TEST(test_stream_from_does_escaping);
-PQXX_REGISTER_TEST(test_stream_from_does_iteration);
-PQXX_REGISTER_TEST(test_transaction_stream_from);
-PQXX_REGISTER_TEST(test_stream_from_read_row);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_stream_to.cxx b/ext/libpqxx-7.7.3/test/unit/test_stream_to.cxx
deleted file mode 100644
index ae4eb3c65..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_stream_to.cxx
+++ /dev/null
@@ -1,445 +0,0 @@
-#include <iostream>
-#include <optional>
-
-#include <pqxx/stream_to>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-#include "../test_types.hxx"
-
-namespace
-{
-std::string truncate_sql_error(std::string const &what)
-{
-  auto trunc{what.substr(0, what.find('\n'))};
-  if (std::size(trunc) > 64)
-    trunc = trunc.substr(0, 61) + "...";
-  return trunc;
-}
-
-
-void test_nonoptionals(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  auto const nonascii{"\u3053\u3093\u306b\u3061\u308f"};
-  bytea const binary{'\x00', '\x01', '\x02'},
-    text{'f', 'o', 'o', ' ', 'b', 'a', 'r', '\0'};
-
-  inserter << std::make_tuple(
-    1234, "now", 4321, ipv4{8, 8, 4, 4}, "hello nonoptional world", binary);
-  inserter << std::make_tuple(
-    5678, "2018-11-17 21:23:00", nullptr, nullptr, nonascii, text);
-  inserter << std::make_tuple(910, nullptr, nullptr, nullptr, "\\N", bytea{});
-
-  inserter.complete();
-
-  auto r1{tx.exec1("SELECT * FROM stream_to_test WHERE number0 = 1234")};
-  PQXX_CHECK_EQUAL(r1[0].as<int>(), 1234, "Read back wrong first int.");
-  PQXX_CHECK_EQUAL(
-    r1[4].as<std::string>(), "hello nonoptional world",
-    "Read back wrong string.");
-  PQXX_CHECK_EQUAL(r1[3].as<ipv4>(), ipv4(8, 8, 4, 4), "Read back wrong ip.");
-  PQXX_CHECK_EQUAL(r1[5].as<bytea>(), binary, "Read back wrong bytea.");
-
-  auto r2{tx.exec1("SELECT * FROM stream_to_test WHERE number0 = 5678")};
-  PQXX_CHECK_EQUAL(r2[0].as<int>(), 5678, "Wrong int on second row.");
-  PQXX_CHECK(r2[2].is_null(), "Field 2 was meant to be null.");
-  PQXX_CHECK(r2[3].is_null(), "Field 3 was meant to be null.");
-  PQXX_CHECK_EQUAL(r2[4].as<std::string>(), nonascii, "Wrong non-ascii text.");
-  tx.commit();
-}
-
-void test_nonoptionals_fold(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  auto const nonascii{"\u3053\u3093\u306b\u3061\u308f"};
-  bytea const binary{'\x00', '\x01', '\x02'},
-    text{'f', 'o', 'o', ' ', 'b', 'a', 'r', '\0'};
-
-  inserter.write_values(
-    1234, "now", 4321, ipv4{8, 8, 4, 4}, "hello nonoptional world", binary);
-  inserter.write_values(
-    5678, "2018-11-17 21:23:00", nullptr, nullptr, nonascii, text);
-  inserter.write_values(910, nullptr, nullptr, nullptr, "\\N", bytea{});
-
-  inserter.complete();
-
-  auto r1{tx.exec1("SELECT * FROM stream_to_test WHERE number0 = 1234")};
-  PQXX_CHECK_EQUAL(r1[0].as<int>(), 1234, "Read back wrong first int.");
-  PQXX_CHECK_EQUAL(
-    r1[4].as<std::string>(), "hello nonoptional world",
-    "Read back wrong string.");
-  PQXX_CHECK_EQUAL(r1[3].as<ipv4>(), ipv4(8, 8, 4, 4), "Read back wrong ip.");
-  PQXX_CHECK_EQUAL(r1[5].as<bytea>(), binary, "Read back wrong bytera.");
-
-  auto r2{tx.exec1("SELECT * FROM stream_to_test WHERE number0 = 5678")};
-  PQXX_CHECK_EQUAL(r2[0].as<int>(), 5678, "Wrong int on second row.");
-  PQXX_CHECK(r2[2].is_null(), "Field 2 was meant to be null.");
-  PQXX_CHECK(r2[3].is_null(), "Field 3 was meant to be null.");
-  PQXX_CHECK_EQUAL(r2[4].as<std::string>(), nonascii, "Wrong non-ascii text.");
-  tx.commit();
-}
-
-
-/// Try to violate stream_to_test's not-null constraint using a stream_to.
-void insert_bad_null_tuple(pqxx::stream_to &inserter)
-{
-  inserter << std::make_tuple(
-    nullptr, "now", 4321, ipv4{8, 8, 8, 8}, "hello world",
-    bytea{'\x00', '\x01', '\x02'});
-  inserter.complete();
-}
-
-
-void test_bad_null(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-  PQXX_CHECK_THROWS(
-    insert_bad_null_tuple(inserter), pqxx::not_null_violation,
-    "Did not expected not_null_violation when stream_to inserts a bad null.");
-}
-
-
-/// Try to violate stream_to_test's not-null construct using a stream_to.
-void insert_bad_null_write(pqxx::stream_to &inserter)
-{
-  inserter.write_values(
-    nullptr, "now", 4321, ipv4{8, 8, 8, 8}, "hello world",
-    bytea{'\x00', '\x01', '\x02'});
-  inserter.complete();
-}
-
-
-void test_bad_null_fold(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-  PQXX_CHECK_THROWS(
-    insert_bad_null_write(inserter), pqxx::not_null_violation,
-    "Did not expected not_null_violation when stream_to inserts a bad null.");
-}
-
-
-void test_too_few_fields(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  try
-  {
-    inserter << std::make_tuple(1234, "now", 4321, ipv4{8, 8, 8, 8});
-    inserter.complete();
-    tx.commit();
-    PQXX_CHECK_NOTREACHED("stream_from improperly inserted row");
-  }
-  catch (pqxx::sql_error const &e)
-  {
-    std::string what{e.what()};
-    if (what.find("missing data for column") == std::string::npos)
-      throw;
-    pqxx::test::expected_exception(
-      "Could not insert row: " + truncate_sql_error(what));
-  }
-}
-
-void test_too_few_fields_fold(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  try
-  {
-    inserter.write_values(1234, "now", 4321, ipv4{8, 8, 8, 8});
-    inserter.complete();
-    tx.commit();
-    PQXX_CHECK_NOTREACHED("stream_from_fold improperly inserted row");
-  }
-  catch (pqxx::sql_error const &e)
-  {
-    std::string what{e.what()};
-    if (what.find("missing data for column") == std::string::npos)
-      throw;
-    pqxx::test::expected_exception(
-      "Fold - Could not insert row: " + truncate_sql_error(what));
-  }
-}
-
-
-void test_too_many_fields(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  try
-  {
-    inserter << std::make_tuple(
-      1234, "now", 4321, ipv4{8, 8, 8, 8}, "hello world",
-      bytea{'\x00', '\x01', '\x02'}, 5678);
-    inserter.complete();
-    tx.commit();
-    PQXX_CHECK_NOTREACHED("stream_from improperly inserted row");
-  }
-  catch (pqxx::sql_error const &e)
-  {
-    std::string what{e.what()};
-    if (what.find("extra data") == std::string::npos)
-      throw;
-    pqxx::test::expected_exception(
-      "Could not insert row: " + truncate_sql_error(what));
-  }
-}
-
-void test_too_many_fields_fold(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  try
-  {
-    inserter.write_values(
-      1234, "now", 4321, ipv4{8, 8, 8, 8}, "hello world",
-      bytea{'\x00', '\x01', '\x02'}, 5678);
-    inserter.complete();
-    tx.commit();
-    PQXX_CHECK_NOTREACHED("stream_from_fold improperly inserted row");
-  }
-  catch (pqxx::sql_error const &e)
-  {
-    std::string what{e.what()};
-    if (what.find("extra data") == std::string::npos)
-      throw;
-    pqxx::test::expected_exception(
-      "Fold - Could not insert row: " + truncate_sql_error(what));
-  }
-}
-
-
-void test_stream_to_does_nonnull_optional()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0("CREATE TEMP TABLE foo(x integer, y text)");
-  auto inserter{pqxx::stream_to::table(tx, {"foo"})};
-  inserter.write_values(
-    std::optional<int>{368}, std::optional<std::string>{"Text"});
-  inserter.complete();
-  auto const row{tx.exec1("SELECT x, y FROM foo")};
-  PQXX_CHECK_EQUAL(
-    row[0].as<std::string>(), "368", "Non-null int optional came out wrong.");
-  PQXX_CHECK_EQUAL(
-    row[1].as<std::string>(), "Text",
-    "Non-null string optional came out wrong.");
-}
-
-
-template<template<typename...> class O>
-void test_optional(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  inserter << std::make_tuple(
-    910, O<std::string>{pqxx::nullness<O<std::string>>::null()},
-    O<int>{pqxx::nullness<O<int>>::null()},
-    O<ipv4>{pqxx::nullness<O<ipv4>>::null()}, "\\N", bytea{});
-
-  inserter.complete();
-  tx.commit();
-}
-
-template<template<typename...> class O>
-void test_optional_fold(pqxx::connection &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  inserter.write_values(
-    910, O<std::string>{pqxx::nullness<O<std::string>>::null()},
-    O<int>{pqxx::nullness<O<int>>::null()},
-    O<ipv4>{pqxx::nullness<O<ipv4>>::null()}, "\\N", bytea{});
-
-  inserter.complete();
-  tx.commit();
-}
-
-
-// As an alternative to a tuple, you can also insert a container.
-void test_container_stream_to()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  tx.exec0("CREATE TEMP TABLE test_container(a integer, b integer)");
-
-  auto inserter{pqxx::stream_to::table(tx, {"test_container"})};
-
-  inserter << std::vector{112, 244};
-  inserter.complete();
-
-  auto read{tx.exec1("SELECT * FROM test_container")};
-  PQXX_CHECK_EQUAL(
-    read[0].as<int>(), 112, "stream_to on container went wrong.");
-  PQXX_CHECK_EQUAL(
-    read[1].as<int>(), 244, "Second container field went wrong.");
-  tx.commit();
-}
-
-void test_variant_fold(pqxx::connection_base &connection)
-{
-  pqxx::work tx{connection};
-  auto inserter{pqxx::stream_to::table(tx, {"stream_to_test"})};
-  PQXX_CHECK(inserter, "stream_to failed to initialize");
-
-  inserter.write_values(
-    std::variant<std::string, int>{1234},
-    std::variant<float, std::string>{"now"}, 4321, ipv4{8, 8, 8, 8},
-    "hello world", bytea{'\x00', '\x01', '\x02'});
-  inserter.write_values(
-    5678, "2018-11-17 21:23:00", nullptr, nullptr,
-    "\u3053\u3093\u306b\u3061\u308f",
-    bytea{'f', 'o', 'o', ' ', 'b', 'a', 'r', '\0'});
-  inserter.write_values(910, nullptr, nullptr, nullptr, "\\N", bytea{});
-
-  inserter.complete();
-  tx.commit();
-}
-
-void clear_table(pqxx::connection &conn)
-{
-  pqxx::work tx{conn};
-  tx.exec0("DELETE FROM stream_to_test");
-  tx.commit();
-}
-
-
-void test_stream_to()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  tx.exec0(
-    "CREATE TEMP TABLE stream_to_test ("
-    "number0 INT NOT NULL,"
-    "ts1     TIMESTAMP NULL,"
-    "number2 INT NULL,"
-    "addr3   INET NULL,"
-    "txt4    TEXT NULL,"
-    "bin5    BYTEA NOT NULL"
-    ")");
-  tx.commit();
-
-  test_nonoptionals(conn);
-  clear_table(conn);
-  test_nonoptionals_fold(conn);
-  clear_table(conn);
-  test_bad_null(conn);
-  clear_table(conn);
-  test_bad_null_fold(conn);
-  clear_table(conn);
-  test_too_few_fields(conn);
-  clear_table(conn);
-  test_too_few_fields_fold(conn);
-  clear_table(conn);
-  test_too_many_fields(conn);
-  clear_table(conn);
-  test_too_many_fields_fold(conn);
-  clear_table(conn);
-  test_optional<std::unique_ptr>(conn);
-  clear_table(conn);
-  test_optional_fold<std::unique_ptr>(conn);
-  clear_table(conn);
-  test_optional<std::optional>(conn);
-  clear_table(conn);
-  test_optional_fold<std::optional>(conn);
-  clear_table(conn);
-  test_variant_fold(conn);
-}
-
-
-void test_stream_to_factory_with_static_columns()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  tx.exec0("CREATE TEMP TABLE pqxx_stream_to(a integer, b varchar)");
-
-  auto stream{pqxx::stream_to::table(tx, {"pqxx_stream_to"}, {"a", "b"})};
-  stream.write_values(3, "three");
-  stream.complete();
-
-  auto r{tx.exec1("SELECT a, b FROM pqxx_stream_to")};
-  PQXX_CHECK_EQUAL(r[0].as<int>(), 3, "Failed to stream_to a table.");
-  PQXX_CHECK_EQUAL(
-    r[1].as<std::string>(), "three",
-    "Failed to stream_to a string to a table.");
-}
-
-
-void test_stream_to_factory_with_dynamic_columns()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  tx.exec0("CREATE TEMP TABLE pqxx_stream_to(a integer, b varchar)");
-
-  std::vector<std::string_view> columns{"a", "b"};
-#if defined(PQXX_HAVE_CONCEPTS)
-  auto stream{pqxx::stream_to::table(tx, {"pqxx_stream_to"}, columns)};
-#else
-  auto stream{pqxx::stream_to::raw_table(
-    tx, conn.quote_table({"pqxx_stream_to"}), conn.quote_columns(columns))};
-#endif
-  stream.write_values(4, "four");
-  stream.complete();
-
-  auto r{tx.exec1("SELECT a, b FROM pqxx_stream_to")};
-  PQXX_CHECK_EQUAL(
-    r[0].as<int>(), 4, "Failed to stream_to a table with dynamic columns.");
-  PQXX_CHECK_EQUAL(
-    r[1].as<std::string>(), "four",
-    "Failed to stream_to a string to a table with dynamic columns.");
-}
-
-
-void test_stream_to_quotes_arguments()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-
-  std::string const table{R"--(pqxx_Stream"'x)--"}, column{R"--(a'"b)--"};
-
-  tx.exec0(
-    "CREATE TEMP TABLE " + tx.quote_name(table) + "(" + tx.quote_name(column) +
-    " integer)");
-  auto write{pqxx::stream_to::table(tx, {table}, {column})};
-  write.write_values<int>(12);
-  write.complete();
-
-  PQXX_CHECK_EQUAL(
-    tx.query_value<int>(
-      "SELECT " + tx.quote_name(column) + " FROM " + tx.quote_name(table)),
-    12, "Stream wrote wrong value.");
-}
-
-
-PQXX_REGISTER_TEST(test_stream_to);
-PQXX_REGISTER_TEST(test_container_stream_to);
-PQXX_REGISTER_TEST(test_stream_to_does_nonnull_optional);
-PQXX_REGISTER_TEST(test_stream_to_factory_with_static_columns);
-PQXX_REGISTER_TEST(test_stream_to_factory_with_dynamic_columns);
-PQXX_REGISTER_TEST(test_stream_to_quotes_arguments);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_string_conversion.cxx b/ext/libpqxx-7.7.3/test/unit/test_string_conversion.cxx
deleted file mode 100644
index 30bc084f5..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_string_conversion.cxx
+++ /dev/null
@@ -1,178 +0,0 @@
-#include <cstdint>
-#include <variant>
-
-#include <pqxx/connection>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-// Some enums with string conversions.
-enum EnumA
-{
-  ea0,
-  ea1,
-  ea2
-};
-enum EnumB
-{
-  eb0,
-  eb1,
-  eb2
-};
-namespace pqxx
-{
-PQXX_DECLARE_ENUM_CONVERSION(EnumA);
-PQXX_DECLARE_ENUM_CONVERSION(EnumB);
-} // namespace pqxx
-
-
-namespace
-{
-// "A minimal difference."
-constexpr double thres{0.00001};
-
-
-void test_string_conversion()
-{
-  PQXX_CHECK_EQUAL(
-    "C string array", pqxx::to_string("C string array"),
-    "C-style string constant does not convert to string properly.");
-
-  char text_array[]{"C char array"};
-  PQXX_CHECK_EQUAL(
-    "C char array", pqxx::to_string(text_array),
-    "C-style non-const char array does not convert to string properly.");
-
-  char const *text_ptr{"C string pointer"};
-  PQXX_CHECK_EQUAL(
-    "C string pointer", pqxx::to_string(text_ptr),
-    "C-style string pointer does not convert to string properly.");
-
-  std::string const cxx_string{"C++ string"};
-  PQXX_CHECK_EQUAL(
-    "C++ string", pqxx::to_string(cxx_string),
-    "C++-style string object does not convert to string properly.");
-
-  PQXX_CHECK_EQUAL("0", pqxx::to_string(0), "Zero does not convert right.");
-  PQXX_CHECK_EQUAL(
-    "1", pqxx::to_string(1), "Basic integer does not convert right.");
-  PQXX_CHECK_EQUAL("-1", pqxx::to_string(-1), "Negative numbers don't work.");
-  PQXX_CHECK_EQUAL(
-    "9999", pqxx::to_string(9999), "Larger numbers don't work.");
-  PQXX_CHECK_EQUAL(
-    "-9999", pqxx::to_string(-9999), "Larger negative numbers don't work.");
-
-  int x;
-  pqxx::from_string("0", x);
-  PQXX_CHECK_EQUAL(0, x, "Zero does not parse right.");
-  pqxx::from_string("1", x);
-  PQXX_CHECK_EQUAL(1, x, "Basic integer does not parse right.");
-  pqxx::from_string("-1", x);
-  PQXX_CHECK_EQUAL(-1, x, "Negative numbers don't work.");
-  pqxx::from_string("9999", x);
-  PQXX_CHECK_EQUAL(9999, x, "Larger numbers don't work.");
-  pqxx::from_string("-9999", x);
-  PQXX_CHECK_EQUAL(-9999, x, "Larger negative numbers don't work.");
-
-  // Bug #263 describes a case where this kind of overflow went undetected.
-  if (sizeof(unsigned int) == 4)
-  {
-    std::uint32_t u;
-    PQXX_CHECK_THROWS(
-      pqxx::from_string("4772185884", u), pqxx::conversion_error,
-      "Overflow not detected.");
-  }
-
-  // We can convert to and from long double.  The implementation may fall
-  // back on a thread-local std::stringstream.  Each call does its own
-  // cleanup, so the conversion works multiple times.
-  constexpr long double ld1{123456789.25}, ld2{9876543210.5};
-  constexpr char lds1[]{"123456789.25"}, lds2[]{"9876543210.5"};
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(ld1).substr(0, 12), lds1,
-    "Wrong conversion from long double.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(ld2).substr(0, 12), lds2,
-    "Wrong value on repeated conversion from long double.");
-  long double ldi1, ldi2;
-  pqxx::from_string(lds1, ldi1);
-  PQXX_CHECK_BOUNDS(
-    ldi1, ld1 - thres, ld1 + thres, "Wrong conversion to long double.");
-  pqxx::from_string(lds2, ldi2);
-  PQXX_CHECK_BOUNDS(
-    ldi2, ld2 - thres, ld2 + thres,
-    "Wrong repeated conversion to long double.");
-
-  // We can define string conversions for enums.
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(ea0), "0", "Enum-to-string conversion is broken.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(eb0), "0",
-    "Enum-to-string conversion is inconsistent between enum types.");
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(ea1), "1",
-    "Enum-to-string conversion breaks for nonzero value.");
-
-  EnumA ea;
-  pqxx::from_string("2", ea);
-  PQXX_CHECK_EQUAL(ea, ea2, "String-to-enum conversion is broken.");
-}
-
-
-void test_convert_variant_to_string()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::variant<int, std::string>{99}), "99",
-    "First variant field did not convert right.");
-
-  PQXX_CHECK_EQUAL(
-    pqxx::to_string(std::variant<int, std::string>{"Text"}), "Text",
-    "Second variant field did not convert right.");
-}
-
-
-void test_integer_conversion()
-{
-  PQXX_CHECK_EQUAL(
-    pqxx::from_string<int>("12"), 12, "Basic integer conversion failed.");
-  PQXX_CHECK_EQUAL(
-    pqxx::from_string<int>(" 12"), 12,
-    "Leading whitespace confused integer conversion.");
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(pqxx::from_string<int>("")), pqxx::conversion_error,
-    "Converting empty string to integer did not throw conversion error.");
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(pqxx::from_string<int>(" ")), pqxx::conversion_error,
-    "Converting whitespace to integer did not throw conversion error.");
-  PQXX_CHECK_EQUAL(
-    pqxx::from_string<int>("-6"), -6,
-    "Leading whitespace did not work with negative number.");
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(pqxx::from_string<int>("- 3")), pqxx::conversion_error,
-    "A space between negation and number was not properly flagged.");
-  PQXX_CHECK_THROWS(
-    pqxx::ignore_unused(pqxx::from_string<int>("-")), pqxx::conversion_error,
-    "Just a minus sign should not parse as an integer.");
-}
-
-
-void test_convert_null()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  PQXX_CHECK_EQUAL(
-    tx.quote(nullptr), "NULL", "Null pointer did not come out as SQL 'null'.");
-  PQXX_CHECK_EQUAL(
-    tx.quote(std::nullopt), "NULL",
-    "std::nullopt did not come out as SQL 'null'.");
-  PQXX_CHECK_EQUAL(
-    tx.quote(std::monostate{}), "NULL",
-    "std::monostate did not come out as SQL 'null'.");
-}
-
-
-PQXX_REGISTER_TEST(test_string_conversion);
-PQXX_REGISTER_TEST(test_convert_variant_to_string);
-PQXX_REGISTER_TEST(test_integer_conversion);
-PQXX_REGISTER_TEST(test_convert_null);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_subtransaction.cxx b/ext/libpqxx-7.7.3/test/unit/test_subtransaction.cxx
deleted file mode 100644
index 4ba909bec..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_subtransaction.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <pqxx/subtransaction>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void make_table(pqxx::transaction_base &trans)
-{
-  trans.exec0("CREATE TEMP TABLE foo (x INTEGER)");
-}
-
-
-void insert_row(pqxx::transaction_base &trans)
-{
-  trans.exec0("INSERT INTO foo(x) VALUES (1)");
-}
-
-
-int count_rows(pqxx::transaction_base &trans)
-{
-  return trans.query_value<int>("SELECT count(*) FROM foo");
-}
-
-
-void test_subtransaction_commits_if_commit_called(pqxx::connection &conn)
-{
-  pqxx::work trans(conn);
-  make_table(trans);
-  {
-    pqxx::subtransaction sub(trans);
-    insert_row(sub);
-    sub.commit();
-  }
-  PQXX_CHECK_EQUAL(
-    count_rows(trans), 1, "Work done in committed subtransaction was lost.");
-}
-
-
-void test_subtransaction_aborts_if_abort_called(pqxx::connection &conn)
-{
-  pqxx::work trans(conn);
-  make_table(trans);
-  {
-    pqxx::subtransaction sub(trans);
-    insert_row(sub);
-    sub.abort();
-  }
-  PQXX_CHECK_EQUAL(
-    count_rows(trans), 0, "Aborted subtransaction was not rolled back.");
-}
-
-
-void test_subtransaction_aborts_implicitly(pqxx::connection &conn)
-{
-  pqxx::work trans(conn);
-  make_table(trans);
-  {
-    pqxx::subtransaction sub(trans);
-    insert_row(sub);
-  }
-  PQXX_CHECK_EQUAL(
-    count_rows(trans), 0,
-    "Uncommitted subtransaction was not rolled back uring destruction.");
-}
-
-
-void test_subtransaction()
-{
-  pqxx::connection conn;
-  test_subtransaction_commits_if_commit_called(conn);
-  test_subtransaction_aborts_if_abort_called(conn);
-  test_subtransaction_aborts_implicitly(conn);
-}
-
-
-PQXX_REGISTER_TEST(test_subtransaction);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_test_helpers.cxx b/ext/libpqxx-7.7.3/test/unit/test_test_helpers.cxx
deleted file mode 100644
index 89cde627e..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_test_helpers.cxx
+++ /dev/null
@@ -1,214 +0,0 @@
-#include "../test_helpers.hxx"
-
-namespace
-{
-void empty() {}
-
-
-void test_check_notreached()
-{
-  // At a minimum, PQXX_CHECK_NOTREACHED must work.
-  bool failed{true};
-  try
-  {
-    PQXX_CHECK_NOTREACHED("(expected)");
-    failed = false;
-  }
-  catch (pqxx::test::test_failure const &)
-  {
-    // This is what we expect.
-  }
-  if (not failed)
-    throw pqxx::test::test_failure(
-      __FILE__, __LINE__, "PQXX_CHECK_NOTREACHED is broken.");
-}
-
-
-// Test PQXX_CHECK.
-void test_check()
-{
-  PQXX_CHECK(true, "PQXX_CHECK is broken.");
-
-  bool failed{true};
-  try
-  {
-    PQXX_CHECK(false, "(expected)");
-    failed = false;
-  }
-  catch (pqxx::test::test_failure const &)
-  {}
-  if (not failed)
-    PQXX_CHECK_NOTREACHED("PQXX_CHECK failed to notice failure.");
-}
-
-
-// Test PQXX_CHECK_THROWS_EXCEPTION.
-void test_check_throws_exception()
-{
-  // PQXX_CHECK_THROWS_EXCEPTION expects std::exception...
-  PQXX_CHECK_THROWS_EXCEPTION(
-    throw std::exception(),
-    "PQXX_CHECK_THROWS_EXCEPTION did not catch std::exception.");
-
-  // ...or any exception type derived from it.
-  PQXX_CHECK_THROWS_EXCEPTION(
-    throw pqxx::test::test_failure(__FILE__, __LINE__, "(expected)"),
-    "PQXX_CHECK_THROWS_EXCEPTION() failed to catch expected exception.");
-
-  // Any other type is an error.
-  bool failed{true};
-  try
-  {
-    PQXX_CHECK_THROWS_EXCEPTION(throw 1, "(expected)");
-    failed = false;
-  }
-  catch (pqxx::test::test_failure const &)
-  {}
-  PQXX_CHECK(
-    failed,
-    "PQXX_CHECK_THROWS_EXCEPTION did not complain about non-exception.");
-
-  // But there _must_ be an exception.
-  failed = true;
-  try
-  {
-    // If the test fails to throw, this throws a failure.
-    PQXX_CHECK_THROWS_EXCEPTION(empty(), "(expected)");
-    // So we shouldn't get to this point.
-    failed = false;
-  }
-  catch (pqxx::test::test_failure const &)
-  {
-    // Instead, we go straight here.
-  }
-  PQXX_CHECK(
-    failed, "PQXX_CHECK_THROWS_EXCEPTION did not notice missing exception.");
-
-  // PQXX_CHECK_THROWS_EXCEPTION can test itself...
-  PQXX_CHECK_THROWS_EXCEPTION(
-    PQXX_CHECK_THROWS_EXCEPTION(empty(), "(expected)"),
-    "PQXX_CHECK_THROWS_EXCEPTION failed to throw for missing exception.");
-
-  PQXX_CHECK_THROWS_EXCEPTION(
-    PQXX_CHECK_THROWS_EXCEPTION(throw 1, "(expected)"),
-    "PQXX_CHECK_THROWS_EXCEPTION ignored wrong exception type.");
-}
-
-
-// Test PQXX_CHECK_THROWS.
-void test_check_throws()
-{
-  PQXX_CHECK_THROWS(
-    throw pqxx::test::test_failure(__FILE__, __LINE__, "(expected)"),
-    pqxx::test::test_failure,
-    "PQXX_CHECK_THROWS() failed to catch expected exception.");
-
-  // Even if it's not std::exception-derived.
-  PQXX_CHECK_THROWS(throw 1, int, "(expected)");
-
-  // PQXX_CHECK_THROWS means there _must_ be an exception.
-  bool failed{true};
-  try
-  {
-    // If the test fails to throw, PQXX_CHECK_THROWS throws a failure.
-    PQXX_CHECK_THROWS(empty(), std::runtime_error, "(expected)");
-    // So we shouldn't get to this point.
-    failed = false;
-  }
-  catch (pqxx::test::test_failure const &)
-  {
-    // Instead, we go straight here.
-  }
-  PQXX_CHECK(failed, "PQXX_CHECK_THROWS did not notice missing exception.");
-
-  // The exception must be of the right type (or a subclass of the right type).
-  failed = true;
-  try
-  {
-    // If the test throws the wrong type, PQXX_CHECK_THROWS throws a failure.
-    PQXX_CHECK_THROWS(
-      throw std::exception(), pqxx::test::test_failure, "(expected)");
-    failed = false;
-  }
-  catch (pqxx::test::test_failure const &)
-  {
-    // Instead, we go straight here.
-  }
-  PQXX_CHECK(failed, "PQXX_CHECK_THROWS did not notice wrong exception type.");
-
-  // PQXX_CHECK_THROWS can test itself...
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_THROWS(empty(), pqxx::test::test_failure, "(expected)"),
-    pqxx::test::test_failure,
-    "PQXX_CHECK_THROWS failed to throw for missing exception.");
-
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_THROWS(throw 1, std::runtime_error, "(expected)"),
-    pqxx::test::test_failure,
-    "PQXX_CHECK_THROWS failed to throw for wrong exception type.");
-}
-
-
-void test_test_helpers()
-{
-  test_check_notreached();
-  test_check();
-  test_check_throws_exception();
-  test_check_throws();
-
-  // Test other helpers against PQXX_CHECK_THROWS.
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_NOTREACHED("(expected)"), pqxx::test::test_failure,
-    "PQXX_CHECK_THROWS did not catch PQXX_CHECK_NOTREACHED.");
-
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK(false, "(expected)"), pqxx::test::test_failure,
-    "PQXX_CHECK_THROWS did not catch failing PQXX_CHECK.");
-
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_THROWS(
-      PQXX_CHECK(true, "(shouldn't happen)"), pqxx::test::test_failure,
-      "(expected)"),
-    pqxx::test::test_failure,
-    "PQXX_CHECK_THROWS on successful PQXX_CHECK failed to throw.");
-
-  // PQXX_CHECK_EQUAL tests for equality.  Its arguments need not be of the
-  // same type, as long as equality between them is defined.
-  PQXX_CHECK_EQUAL(1, 1, "PQXX_CHECK_EQUAL is broken.");
-  PQXX_CHECK_EQUAL(1, 1L, "PQXX_CHECK_EQUAL breaks on type mismatch.");
-
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_EQUAL(1, 2, "(expected)"), pqxx::test::test_failure,
-    "PQXX_CHECK_EQUAL fails to spot inequality.");
-
-  // PQXX_CHECK_NOT_EQUAL is like PQXX_CHECK_EQUAL, but tests for inequality.
-  PQXX_CHECK_NOT_EQUAL(1, 2, "PQXX_CHECK_NOT_EQUAL is broken.");
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_NOT_EQUAL(1, 1, "(expected)"), pqxx::test::test_failure,
-    "PQXX_CHECK_NOT_EQUAL fails to fail when arguments are equal.");
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_NOT_EQUAL(1, 1L, "(expected)"), pqxx::test::test_failure,
-    "PQXX_CHECK_NOT_EQUAL breaks on type mismatch.");
-
-  // PQXX_CHECK_BOUNDS checks a value against a range.
-  PQXX_CHECK_BOUNDS(2, 1, 3, "PQXX_CHECK_BOUNDS wrongly finds fault.");
-
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_BOUNDS(1, 2, 3, "(Expected)"), pqxx::test::test_failure,
-    "PQXX_CHECK_BOUNDS did not detect value below permitted range.");
-
-  // PQXX_CHECK_BOUNDS tests against a half-open interval.
-  PQXX_CHECK_BOUNDS(1, 1, 3, "PQXX_CHECK_BOUNDS goes wrong on lower bound.");
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_BOUNDS(3, 1, 3, "(Expected)"), pqxx::test::test_failure,
-    "PQXX_CHECK_BOUNDS interval is not half-open.");
-
-  // PQXX_CHECK_BOUNDS deals well with empty intervals.
-  PQXX_CHECK_THROWS(
-    PQXX_CHECK_BOUNDS(1, 2, 1, "(Expected)"), pqxx::test::test_failure,
-    "PQXX_CHECK_BOUNDS did not detect empty interval.");
-}
-
-
-PQXX_REGISTER_TEST(test_test_helpers);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_thread_safety_model.cxx b/ext/libpqxx-7.7.3/test/unit/test_thread_safety_model.cxx
deleted file mode 100644
index cf7627cb3..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_thread_safety_model.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "../test_helpers.hxx"
-
-#include <pqxx/util>
-
-namespace
-{
-void test_thread_safety_model()
-{
-  auto const model{pqxx::describe_thread_safety()};
-
-  if (model.safe_libpq and model.safe_kerberos)
-    PQXX_CHECK_EQUAL(
-      model.description, "",
-      "Thread-safety looks okay but model description is nonempty.");
-  else
-    PQXX_CHECK_NOT_EQUAL(
-      model.description, "",
-      "Thread-safety model is imperfect but lacks description.");
-}
-
-
-PQXX_REGISTER_TEST(test_thread_safety_model);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_time.cxx b/ext/libpqxx-7.7.3/test/unit/test_time.cxx
deleted file mode 100644
index 2fb79d472..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_time.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <pqxx/time>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-#if defined(PQXX_HAVE_YEAR_MONTH_DAY)
-using namespace std::literals;
-
-
-void test_date_string_conversion()
-{
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  std::tuple<int, unsigned, unsigned, std::string_view> const conversions[]{
-    {-542, 1, 1, "0543-01-01 BC"sv},
-    {-1, 2, 3, "0002-02-03 BC"sv},
-    {0, 9, 14, "0001-09-14 BC"sv},
-    {1, 12, 8, "0001-12-08"sv},
-    {2021, 10, 24, "2021-10-24"sv},
-    {10191, 8, 30, "10191-08-30"sv},
-    {-4712, 1, 1, "4713-01-01 BC"sv},
-    {32767, 12, 31, "32767-12-31"sv},
-    {2000, 2, 29, "2000-02-29"sv},
-    {2004, 2, 29, "2004-02-29"sv},
-    // This one won't work in postgres, but we can test the conversions.
-    {-32767, 11, 3, "32768-11-03 BC"sv},
-  };
-  for (auto const &[y, m, d, text] : conversions)
-  {
-    std::chrono::year_month_day const date{
-      std::chrono::year{y}, std::chrono::month{m}, std::chrono::day{d}};
-    PQXX_CHECK_EQUAL(
-      pqxx::to_string(date), text, "Date did not convert right.");
-    PQXX_CHECK_EQUAL(
-      pqxx::from_string<std::chrono::year_month_day>(text), date,
-      "Date did not parse right.");
-    if (int{date.year()} > -4712)
-    {
-      // We can't test this for years before 4713 BC (4712 BCE), because
-      // postgres doesn't handle earlier years.
-      PQXX_CHECK_EQUAL(
-        tx.query_value<std::string>(
-          "SELECT '" + pqxx::to_string(date) + "'::date"),
-        text, "Backend interpreted date differently.");
-    }
-  }
-
-  std::string_view const invalid[]{
-    ""sv,
-    "yesterday"sv,
-    "1981-01"sv,
-    "2010"sv,
-    "2010-8-9"sv,
-    "1900-02-29"sv,
-    "2021-02-29"sv,
-    "2000-11-29-3"sv,
-    "1900-02-29"sv,
-    "2003-02-29"sv,
-    "12-12-12"sv,
-    "0000-09-16"sv,
-    "-01-01"sv,
-    "-1000-01-01"sv,
-    "1000-00-01"sv,
-    "1000-01-00"sv,
-    "2001y-01-01"sv,
-    "10-09-08"sv,
-    "0-01-01"sv,
-    "0000-01-01"sv,
-    "2021-13-01"sv,
-    "2021-+02-01"sv,
-    "2021-12-32"sv,
-  };
-  for (auto const text : invalid)
-    PQXX_CHECK_THROWS(
-      pqxx::ignore_unused(
-        pqxx::from_string<std::chrono::year_month_day>(text)),
-      pqxx::conversion_error,
-      pqxx::internal::concat("Invalid date '", text, "' parsed as if valid."));
-}
-
-
-PQXX_REGISTER_TEST(test_date_string_conversion);
-#endif // PQXX_HAVE_YEAR_MONTH_DAY
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_transaction.cxx b/ext/libpqxx-7.7.3/test/unit/test_transaction.cxx
deleted file mode 100644
index 2ae016a26..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_transaction.cxx
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <pqxx/nontransaction>
-#include <pqxx/robusttransaction>
-
-#include "../test_helpers.hxx"
-
-
-namespace
-{
-void test_nontransaction_continues_after_error()
-{
-  pqxx::connection c;
-  pqxx::nontransaction tx{c};
-
-  PQXX_CHECK_EQUAL(
-    tx.query_value<int>("SELECT 9"), 9, "Simple query went wrong.");
-  PQXX_CHECK_THROWS(
-    tx.exec("SELECT 1/0"), pqxx::sql_error, "Expected error did not happen.");
-
-  PQXX_CHECK_EQUAL(
-    tx.query_value<int>("SELECT 5"), 5, "Wrong result after error.");
-}
-
-
-std::string const table{"pqxx_test_transaction"};
-
-
-void delete_temp_table(pqxx::transaction_base &tx)
-{
-  tx.exec0(std::string{"DROP TABLE IF EXISTS "} + table);
-}
-
-
-void create_temp_table(pqxx::transaction_base &tx)
-{
-  tx.exec0("CREATE TEMP TABLE " + table + " (x integer)");
-}
-
-
-void insert_temp_table(pqxx::transaction_base &tx, int value)
-{
-  tx.exec0(
-    "INSERT INTO " + table + " (x) VALUES (" + pqxx::to_string(value) + ")");
-}
-
-int count_temp_table(pqxx::transaction_base &tx)
-{
-  return tx.query_value<int>("SELECT count(*) FROM " + table);
-}
-
-
-void test_nontransaction_autocommits()
-{
-  pqxx::connection c;
-
-  pqxx::nontransaction tx1{c};
-  delete_temp_table(tx1);
-  create_temp_table(tx1);
-  tx1.commit();
-
-  pqxx::nontransaction tx2{c};
-  insert_temp_table(tx2, 4);
-  tx2.abort();
-
-  pqxx::nontransaction tx3{c};
-  PQXX_CHECK_EQUAL(
-    count_temp_table(tx3), 1,
-    "Did not keep effect of aborted nontransaction.");
-  delete_temp_table(tx3);
-}
-
-
-template<typename TX> void test_double_close()
-{
-  pqxx::connection c;
-
-  TX tx1{c};
-  tx1.exec1("SELECT 1");
-  tx1.commit();
-  tx1.commit();
-
-  TX tx2{c};
-  tx2.exec1("SELECT 2");
-  tx2.abort();
-  tx2.abort();
-
-  TX tx3{c};
-  tx3.exec1("SELECT 3");
-  tx3.commit();
-  PQXX_CHECK_THROWS(
-    tx3.abort(), pqxx::usage_error, "Abort after commit not caught.");
-  ;
-
-  TX tx4{c};
-  tx4.exec1("SELECT 4");
-  tx4.abort();
-  PQXX_CHECK_THROWS(
-    tx4.commit(), pqxx::usage_error, "Commit after abort not caught.");
-}
-
-
-void test_transaction()
-{
-  test_nontransaction_continues_after_error();
-  test_nontransaction_autocommits();
-  test_double_close<pqxx::transaction<>>();
-  test_double_close<pqxx::read_transaction>();
-  test_double_close<pqxx::nontransaction>();
-  test_double_close<pqxx::robusttransaction<>>();
-}
-
-
-PQXX_REGISTER_TEST(test_transaction);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_transaction_base.cxx b/ext/libpqxx-7.7.3/test/unit/test_transaction_base.cxx
deleted file mode 100644
index bea15b190..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_transaction_base.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-#include <pqxx/stream_to>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_exec0(pqxx::transaction_base &trans)
-{
-  pqxx::result E{trans.exec0("SELECT * FROM pg_tables WHERE 0 = 1")};
-  PQXX_CHECK(std::empty(E), "Nonempty result from exec0.");
-
-  PQXX_CHECK_THROWS(
-    trans.exec0("SELECT 99"), pqxx::unexpected_rows,
-    "Nonempty exec0 result did not throw unexpected_rows.");
-}
-
-
-void test_exec1(pqxx::transaction_base &trans)
-{
-  pqxx::row R{trans.exec1("SELECT 99")};
-  PQXX_CHECK_EQUAL(std::size(R), 1, "Wrong size result from exec1.");
-  PQXX_CHECK_EQUAL(R.front().as<int>(), 99, "Wrong result from exec1.");
-
-  PQXX_CHECK_THROWS(
-    trans.exec1("SELECT * FROM pg_tables WHERE 0 = 1"), pqxx::unexpected_rows,
-    "Empty exec1 result did not throw unexpected_rows.");
-  PQXX_CHECK_THROWS(
-    trans.exec1("SELECT * FROM generate_series(1, 2)"), pqxx::unexpected_rows,
-    "Two-row exec1 result did not throw unexpected_rows.");
-}
-
-
-void test_exec_n(pqxx::transaction_base &trans)
-{
-  pqxx::result R{trans.exec_n(3, "SELECT * FROM generate_series(1, 3)")};
-  PQXX_CHECK_EQUAL(std::size(R), 3, "Wrong result size from exec_n.");
-
-  PQXX_CHECK_THROWS(
-    trans.exec_n(2, "SELECT * FROM generate_series(1, 3)"),
-    pqxx::unexpected_rows,
-    "exec_n did not throw unexpected_rows for an undersized result.");
-  PQXX_CHECK_THROWS(
-    trans.exec_n(4, "SELECT * FROM generate_series(1, 3)"),
-    pqxx::unexpected_rows,
-    "exec_n did not throw unexpected_rows for an oversized result.");
-}
-
-
-void test_query_value(pqxx::connection &conn)
-{
-  pqxx::work tx{conn};
-
-  PQXX_CHECK_EQUAL(
-    tx.query_value<int>("SELECT 84 / 2"), 42,
-    "Got wrong value from query_value.");
-  PQXX_CHECK_THROWS(
-    tx.query_value<int>("SAVEPOINT dummy"), pqxx::unexpected_rows,
-    "Got field when none expected.");
-  PQXX_CHECK_THROWS(
-    tx.query_value<int>("SELECT generate_series(1, 2)"), pqxx::unexpected_rows,
-    "Failed to fail for multiple rows.");
-  PQXX_CHECK_THROWS(
-    tx.query_value<int>("SELECT 1, 2"), pqxx::usage_error,
-    "No error for too many fields.");
-  PQXX_CHECK_THROWS(
-    tx.query_value<int>("SELECT 3.141"), pqxx::conversion_error,
-    "Got int field from float string.");
-}
-
-
-void test_transaction_base()
-{
-  pqxx::connection conn;
-  {
-    pqxx::work tx{conn};
-    test_exec_n(tx);
-    test_exec0(tx);
-    test_exec1(tx);
-  }
-  test_query_value(conn);
-}
-
-
-void test_transaction_for_each()
-{
-  constexpr auto query{
-    "SELECT i, concat('x', (2*i)::text) "
-    "FROM generate_series(1, 3) AS i "
-    "ORDER BY i"};
-  pqxx::connection conn;
-  pqxx::work tx{conn};
-  std::string ints;
-  std::string strings;
-  tx.for_each(query, [&ints, &strings](int i, std::string const &s) {
-    ints += pqxx::to_string(i) + " ";
-    strings += s + " ";
-  });
-  PQXX_CHECK_EQUAL(ints, "1 2 3 ", "Unexpected int sequence.");
-  PQXX_CHECK_EQUAL(strings, "x2 x4 x6 ", "Unexpected string sequence.");
-}
-
-
-PQXX_REGISTER_TEST(test_transaction_base);
-PQXX_REGISTER_TEST(test_transaction_for_each);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_transaction_focus.cxx b/ext/libpqxx-7.7.3/test/unit/test_transaction_focus.cxx
deleted file mode 100644
index 48fdfdd3f..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_transaction_focus.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <pqxx/stream_from>
-#include <pqxx/transaction>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-auto make_focus(pqxx::dbtransaction &tx)
-{
-  return pqxx::stream_from::query(tx, "SELECT * from generate_series(1, 10)");
-}
-
-
-void test_cannot_run_statement_during_focus()
-{
-  pqxx::connection conn;
-  pqxx::transaction tx{conn};
-  tx.exec("SELECT 1");
-  auto focus{make_focus(tx)};
-  PQXX_CHECK_THROWS(
-    tx.exec("SELECT 1"), pqxx::usage_error,
-    "Command during focus did not throw expected error.");
-}
-
-
-void test_cannot_run_prepared_statement_during_focus()
-{
-  pqxx::connection conn;
-  conn.prepare("foo", "SELECT 1");
-  pqxx::transaction tx{conn};
-  tx.exec_prepared("foo");
-  auto focus{make_focus(tx)};
-  PQXX_CHECK_THROWS(
-    tx.exec_prepared("foo"), pqxx::usage_error,
-    "Prepared statement during focus did not throw expected error.");
-}
-
-void test_cannot_run_params_statement_during_focus()
-{
-  pqxx::connection conn;
-  pqxx::transaction tx{conn};
-  tx.exec_params("select $1", 10);
-  auto focus{make_focus(tx)};
-  PQXX_CHECK_THROWS(
-    tx.exec_params("select $1", 10), pqxx::usage_error,
-    "Parameterized statement during focus did not throw expected error.");
-}
-
-
-PQXX_REGISTER_TEST(test_cannot_run_statement_during_focus);
-PQXX_REGISTER_TEST(test_cannot_run_prepared_statement_during_focus);
-PQXX_REGISTER_TEST(test_cannot_run_params_statement_during_focus);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_transactor.cxx b/ext/libpqxx-7.7.3/test/unit/test_transactor.cxx
deleted file mode 100644
index 43034807e..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_transactor.cxx
+++ /dev/null
@@ -1,130 +0,0 @@
-#include <pqxx/transaction>
-#include <pqxx/transactor>
-
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_transactor_newstyle_executes_simple_query()
-{
-  pqxx::connection conn;
-  auto const r{pqxx::perform([&conn] {
-    return pqxx::work{conn}.exec("SELECT generate_series(1, 4)");
-  })};
-
-  PQXX_CHECK_EQUAL(std::size(r), 4, "Unexpected result size.");
-  PQXX_CHECK_EQUAL(r.columns(), 1, "Unexpected number of columns.");
-  PQXX_CHECK_EQUAL(r[0][0].as<int>(), 1, "Unexpected first row.");
-  PQXX_CHECK_EQUAL(r[3][0].as<int>(), 4, "Unexpected last row.");
-}
-
-
-void test_transactor_newstyle_can_return_void()
-{
-  bool done{false};
-  pqxx::perform([&done]() noexcept { done = true; });
-  PQXX_CHECK(done, "Callback was not executed.");
-}
-
-
-void test_transactor_newstyle_completes_upon_success()
-{
-  int attempts{0};
-  pqxx::perform([&attempts]() noexcept { attempts++; });
-  PQXX_CHECK_EQUAL(attempts, 1, "Successful transactor didn't run 1 time.");
-}
-
-
-void test_transactor_newstyle_retries_broken_connection()
-{
-  int counter{0};
-  auto const &callback{[&counter] {
-    ++counter;
-    if (counter == 1)
-      throw pqxx::broken_connection();
-    return counter;
-  }};
-
-  int const result{pqxx::perform(callback)};
-  PQXX_CHECK_EQUAL(result, 2, "Transactor run returned wrong result.");
-  PQXX_CHECK_EQUAL(counter, result, "Number of retries does not match.");
-}
-
-
-void test_transactor_newstyle_retries_rollback()
-{
-  int counter{0};
-  auto const &callback{[&counter] {
-    ++counter;
-    if (counter == 1)
-      throw pqxx::transaction_rollback("Simulated error");
-    return counter;
-  }};
-
-  int const result{pqxx::perform(callback)};
-  PQXX_CHECK_EQUAL(result, 2, "Transactor run returned wrong result.");
-  PQXX_CHECK_EQUAL(counter, result, "Number of retries does not match.");
-}
-
-
-void test_transactor_newstyle_does_not_retry_in_doubt_error()
-{
-  int counter{0};
-  auto const &callback{[&counter] {
-    ++counter;
-    throw pqxx::in_doubt_error("Simulated error");
-  }};
-
-  PQXX_CHECK_THROWS(
-    pqxx::perform(callback), pqxx::in_doubt_error,
-    "Transactor did not propagate in_doubt_error.");
-  PQXX_CHECK_EQUAL(counter, 1, "Transactor retried after in_doubt_error.");
-}
-
-
-void test_transactor_newstyle_does_not_retry_other_error()
-{
-  int counter{0};
-  auto const &callback{[&counter] {
-    ++counter;
-    throw std::runtime_error("Simulated error");
-  }};
-
-  PQXX_CHECK_THROWS(
-    pqxx::perform(callback), std::runtime_error,
-    "Transactor did not propagate std exception.");
-  PQXX_CHECK_EQUAL(counter, 1, "Transactor retried after std exception.");
-}
-
-
-void test_transactor_newstyle_repeats_up_to_given_number_of_attempts()
-{
-  int const attempts{5};
-  int counter{0};
-  auto const &callback{[&counter] {
-    ++counter;
-    throw pqxx::transaction_rollback("Simulated error");
-  }};
-
-  PQXX_CHECK_THROWS(
-    pqxx::perform(callback, attempts), pqxx::transaction_rollback,
-    "Not propagating original exception.");
-  PQXX_CHECK_EQUAL(counter, attempts, "Number of retries does not match.");
-}
-
-
-void test_transactor()
-{
-  test_transactor_newstyle_executes_simple_query();
-  test_transactor_newstyle_can_return_void();
-  test_transactor_newstyle_completes_upon_success();
-  test_transactor_newstyle_retries_broken_connection();
-  test_transactor_newstyle_retries_rollback();
-  test_transactor_newstyle_does_not_retry_in_doubt_error();
-  test_transactor_newstyle_does_not_retry_other_error();
-  test_transactor_newstyle_repeats_up_to_given_number_of_attempts();
-}
-
-
-PQXX_REGISTER_TEST(test_transactor);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_type_name.cxx b/ext/libpqxx-7.7.3/test/unit/test_type_name.cxx
deleted file mode 100644
index af1c93eb5..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_type_name.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "../test_helpers.hxx"
-
-namespace
-{
-void test_type_name()
-{
-  // It's hard to test in more detail, because spellings may differ.
-  // For instance, one compiler might call "const unsigned int*" what another
-  // might call "unsigned const *".  And Visual Studio prefixes "class" to
-  // class types.
-  std::string const i{pqxx::type_name<int>};
-  PQXX_CHECK_LESS(std::size(i), 5u, "type_name<int> is suspiciously long.");
-  PQXX_CHECK_EQUAL(
-    i.substr(0, 1), "i", "type_name<int> does not start with 'i'.");
-}
-
-
-PQXX_REGISTER_TEST(test_type_name);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/test/unit/test_zview.cxx b/ext/libpqxx-7.7.3/test/unit/test_zview.cxx
deleted file mode 100644
index f8ce5b9e1..000000000
--- a/ext/libpqxx-7.7.3/test/unit/test_zview.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <pqxx/zview>
-
-#include "../test_helpers.hxx"
-
-
-namespace
-{
-void test_zview_literal()
-{
-  using pqxx::operator"" _zv;
-
-  PQXX_CHECK_EQUAL(("foo"_zv), pqxx::zview{"foo"}, "zview literal is broken.");
-}
-
-PQXX_REGISTER_TEST(test_zview_literal);
-} // namespace
diff --git a/ext/libpqxx-7.7.3/tools/Makefile.am b/ext/libpqxx-7.7.3/tools/Makefile.am
deleted file mode 100644
index 9f918cd5a..000000000
--- a/ext/libpqxx-7.7.3/tools/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-EXTRA_DIST = \
-	extract_version \
-	lint \
-	rmlo.cxx \
-	splitconfig \
-	template2mak.py \
-	pqxxthreadsafety.cxx
-
-AM_CPPFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include ${POSTGRES_INCLUDE}
-# Override automatically generated list of default includes.  It contains only
-# unnecessary entries, and incorrectly mentions include/pqxx directly.
-DEFAULT_INCLUDES=
-
-noinst_PROGRAMS = rmlo pqxxthreadsafety
-
-rmlo_SOURCES = rmlo.cxx
-rmlo_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB}
-
-pqxxthreadsafety_SOURCES = pqxxthreadsafety.cxx
-pqxxthreadsafety_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB}
diff --git a/ext/libpqxx-7.7.3/tools/Makefile.in b/ext/libpqxx-7.7.3/tools/Makefile.in
deleted file mode 100644
index 4e21cb265..000000000
--- a/ext/libpqxx-7.7.3/tools/Makefile.in
+++ /dev/null
@@ -1,638 +0,0 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-noinst_PROGRAMS = rmlo$(EXEEXT) pqxxthreadsafety$(EXEEXT)
-subdir = tools
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4/libtool.m4 \
-	$(top_srcdir)/config/m4/ltoptions.m4 \
-	$(top_srcdir)/config/m4/ltsugar.m4 \
-	$(top_srcdir)/config/m4/ltversion.m4 \
-	$(top_srcdir)/config/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/pqxx/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am_pqxxthreadsafety_OBJECTS = pqxxthreadsafety.$(OBJEXT)
-pqxxthreadsafety_OBJECTS = $(am_pqxxthreadsafety_OBJECTS)
-pqxxthreadsafety_DEPENDENCIES = $(top_builddir)/src/libpqxx.la
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-am_rmlo_OBJECTS = rmlo.$(OBJEXT)
-rmlo_OBJECTS = $(am_rmlo_OBJECTS)
-rmlo_DEPENDENCIES = $(top_builddir)/src/libpqxx.la
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/pqxxthreadsafety.Po \
-	./$(DEPDIR)/rmlo.Po
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(pqxxthreadsafety_SOURCES) $(rmlo_SOURCES)
-DIST_SOURCES = $(pqxxthreadsafety_SOURCES) $(rmlo_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \
-	$(top_srcdir)/config/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_DOT = @HAVE_DOT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR = @MKDIR@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PG_CONFIG = @PG_CONFIG@
-PKG_CONFIG = @PKG_CONFIG@
-POSTGRES_INCLUDE = @POSTGRES_INCLUDE@
-PQXXVERSION = @PQXXVERSION@
-PQXX_ABI = @PQXX_ABI@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-with_postgres_lib = @with_postgres_lib@
-EXTRA_DIST = \
-	extract_version \
-	lint \
-	rmlo.cxx \
-	splitconfig \
-	template2mak.py \
-	pqxxthreadsafety.cxx
-
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include ${POSTGRES_INCLUDE}
-# Override automatically generated list of default includes.  It contains only
-# unnecessary entries, and incorrectly mentions include/pqxx directly.
-DEFAULT_INCLUDES = 
-rmlo_SOURCES = rmlo.cxx
-rmlo_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB}
-pqxxthreadsafety_SOURCES = pqxxthreadsafety.cxx
-pqxxthreadsafety_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB}
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cxx .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tools/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-pqxxthreadsafety$(EXEEXT): $(pqxxthreadsafety_OBJECTS) $(pqxxthreadsafety_DEPENDENCIES) $(EXTRA_pqxxthreadsafety_DEPENDENCIES) 
-	@rm -f pqxxthreadsafety$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(pqxxthreadsafety_OBJECTS) $(pqxxthreadsafety_LDADD) $(LIBS)
-
-rmlo$(EXEEXT): $(rmlo_OBJECTS) $(rmlo_DEPENDENCIES) $(EXTRA_rmlo_DEPENDENCIES) 
-	@rm -f rmlo$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(rmlo_OBJECTS) $(rmlo_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pqxxthreadsafety.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmlo.Po@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.cxx.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cxx.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cxx.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-	mostlyclean-am
-
-distclean: distclean-am
-		-rm -f ./$(DEPDIR)/pqxxthreadsafety.Po
-	-rm -f ./$(DEPDIR)/rmlo.Po
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/pqxxthreadsafety.Po
-	-rm -f ./$(DEPDIR)/rmlo.Po
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpqxx-7.7.3/tools/deprecations b/ext/libpqxx-7.7.3/tools/deprecations
deleted file mode 100755
index f3970838b..000000000
--- a/ext/libpqxx-7.7.3/tools/deprecations
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-set -eu
-
-MARKER='include.*ignore-deprecated-pre'
-FILES="src include tools/*.cxx test config-tests"
-grep -Ircl $MARKER $FILES | sort
diff --git a/ext/libpqxx-7.7.3/tools/extract_version b/ext/libpqxx-7.7.3/tools/extract_version
deleted file mode 100755
index 920ed9aad..000000000
--- a/ext/libpqxx-7.7.3/tools/extract_version
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-set -eu
-
-ARG="${1:-}"
-
-# Source directory.  In out-of-tree builds, Automake sets this for us.
-srcdir=${srcdir:-.}
-
-
-# Print usage information.
-usage() {
-	cat <<EOF
-Print libpqxx version information based on the source tree's VERSION file.
-
-Usage: $0 [option]
-
-Version strings look like: <major>.<minor>.<revision>.
-
-Acceptable option values are:
-    -h, --help     Print this message, and exit.
-    -a, --abi      Show libpqxx ABI version; leave out revision number.
-    -f, --full     Show full libpqxx version string (the default).
-    -M, --major    Show major libpqxx version.
-    -m, --minor    Show minor libpqxx version (between major and revision).
-EOF
-}
-
-
-# Print "unknown argument" error.
-unknown_arg() {
-	cat <<EOF >&2
-Unknown argument: $1.
-Try
-
-	$0 --help
-
-for usage information.
-EOF
-}
-
-
-case "$ARG" in
-''|-f|--full)
-	# Default: Print full version.
-	cat $srcdir/VERSION
-	;;
-
--h|--help)
-	# Print usage information, and exit.
-	usage
-	exit
-	;;
-
--a|--abi)
-	# Print just the ABI version (major & minor).
-	sed -e 's/^\([^.]*\.[^.]*\)\..*/\1/' $srcdir/VERSION
-	;;
-
--M|--major)
-	# Print the major version number.
-	sed -e 's/^\([^.]*\)\..*/\1/' $srcdir/VERSION
-	;;
-
--m|--minor)
-	# Print the minor version number.
-	sed -e 's/^[^.]*\.\([^.]*\)\..*/\1/' $srcdir/VERSION
-	;;
-
-*)
-	unknown_arg $ARG
-	exit 1
-	;;
-esac
diff --git a/ext/libpqxx-7.7.3/tools/format b/ext/libpqxx-7.7.3/tools/format
deleted file mode 100755
index 2645ccdf6..000000000
--- a/ext/libpqxx-7.7.3/tools/format
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/bash
-#
-# Reformat source code using clang-format.
-#
-# This script is not portable: as of Ubuntu 21.04, virtualenv's "activate"
-# seems to rely on a non-POSIX variable, $OSTYPE.
-
-set -C -u -e
-
-# Reformat C++ files.
-find -name \*.cxx -o -name \*.hxx | xargs clang-format -i
-
-
-# Reformat CMake files.
-WORKDIR=$(mktemp -d)
-virtualenv -q --python=$(which python3) "$WORKDIR/venv"
-. "$WORKDIR/venv/bin/activate"
-pip install -q six pyaml cmake-format
-(find -name CMakeLists.txt | xargs cmake-format -i) || /bin/true
-rm -rf "$WORKDIR"
diff --git a/ext/libpqxx-7.7.3/tools/lint b/ext/libpqxx-7.7.3/tools/lint
deleted file mode 100755
index 7beadbb27..000000000
--- a/ext/libpqxx-7.7.3/tools/lint
+++ /dev/null
@@ -1,197 +0,0 @@
-#! /bin/bash
-#
-# Routine sanity checks for libpqxx source tree.
-#
-# Optionally, set environment variable "srcdir" to the source directory.  It
-# defaults to the parent directory of the one where this script is.  This trick
-# requires bash (or a close equivalent) as the shell.
-
-set -eu -o pipefail
-
-SRCDIR="${srcdir:-$(dirname "${BASH_SOURCE[0]}")/..}"
-PQXXVERSION="$(cd "$SRCDIR" && "$SRCDIR/tools/extract_version")"
-
-ARGS="${1:-}"
-
-
-# Check that all source code is ASCII.
-#
-# I'd love to have rich Unicode, but I can live without it.  But we don't want
-# any surprises in contributions.
-check_ascii() {
-    local exotics=$(
-        find -name \*.cxx -o -name \*.hxx |
-	xargs cat |
-        tr -d '\011-\176' |
-	wc -c
-    )
-    if [ $exotics != 0 ]
-    then
-        echo >&2 "There's a non-ASCII character somewhere."
-	exit 1
-    fi
-}
-
-
-# This version must be at the top of the NEWS file.
-check_news_version() {
-    if ! head -n1 $SRCDIR/NEWS | grep -q "^$PQXXVERSION\$"
-    then
-        cat <<EOF >&2
-Version $PQXXVERSION is not at the top of NEWS.
-EOF
-        exit 1
-    fi
-}
-
-
-# Count number of times header $1 is included from each of given input files.
-# Output is lines of <filename>:<count>, one line per file, sorted.
-count_includes() {
-    local HEADER_NAME WS PAT
-    HEADER_NAME="$1"
-    shift
-    WS="[[:space:]]*"
-    PAT="^${WS}#${WS}include${WS}[<\"]$HEADER_NAME[>\"]"
-    # It's OK for the grep to fail.
-    (grep -c "$PAT" $* || /bin/true) | sort
-}
-
-
-# Check that any includes of $1-pre.hxx are matched by $1-post.hxx ones.
-match_pre_post_headers() {
-    local NAME TEMPDIR PRE POST HEADERS
-    NAME="$1"
-    TEMPDIR="$(mktemp -d)"
-    if test -z "$TEMPDIR"
-    then
-        echo >&2 "Could not create temporary directory."
-        exit 1
-    fi
-    PRE="$TEMPDIR/pre"
-    POST="$TEMPDIR/post"
-    HEADERS=$(find include/pqxx/* -type f | grep -v '\.swp$')
-    count_includes \
-        $SRCDIR/NAME-pre.hxx $HEADERS >"$PRE"
-    count_includes \
-        $SRCDIR/NAME-post.hxx $HEADERS >"$POST"
-    DIFF="$(diff "$PRE" "$POST")" || /bin/true
-    rm -r -- "$TEMPDIR"
-    if test -n "$DIFF"
-    then
-        cat <<EOF >&2
-Mismatched pre/post header pairs:
-
-$DIFF
-EOF
-        exit 1
-    fi
-}
-
-
-# Any file that includes header-pre.hxx must also include header-post.hxx, and
-# vice versa.  Similar for ignore-deprecated-{pre|post}.hxx.
-check_compiler_internal_headers() {
-    match_pre_post_headers "pqxx/internal/header"
-    match_pre_post_headers "pqxx/internal/ignore-deprecated"
-}
-
-
-cpplint() {
-    local cxxflags dialect includes
-
-    if which clang-tidy >/dev/null
-    then
-        if [ -e compile_flags ]
-        then
-	    # Pick out relevant flags, but leave out the rest.
-	    # If we're not compiling with clang, compile_flags may contain
-	    # options that clang-tidy doesn't recognise.
-            dialect="$(grep -o -- '-std=[^[:space:]]*' compile_flags || true)"
-	    includes="$(
-	        grep -o -- '-I[[:space:]]*[^[:space:]]*' compile_flags ||
-		true)"
-        else
-            dialect=""
-	    includes=""
-        fi
-
-	cxxflags="$dialect $includes"
-
-# TODO: Please, is there any way we can parallelise this?
-# TODO: I'd like cppcoreguidelines-*, but it's a tsunami of false positives.
-# TODO: Some useful checks in abseil-*, but it recommends "use our library."
-# TODO: Check test/, but tolerate some of the dubious stuff tests do.
-        clang-tidy \
-            $(find $SRCDIR/src $SRCDIR/tools -name \*.cxx) \
-            --checks=boost-*, \
-            -- \
-            -I$SRCDIR/include -Iinclude $cxxflags
-    fi
-
-    # Run Facebook's "infer" static analyser, if available.
-    # Instructions here: https://fbinfer.com/docs/getting-started/
-    if which infer >/dev/null
-    then
-        # This will work in an out-of-tree build, but either way it does
-	# require a successful "configure", or a cmake with the "make"
-	# generator.
-        infer capture -- make -j$(nproc)
-	infer run
-    fi
-}
-
-
-pylint() {
-    local PYFILES="$SRCDIR/tools/*.py $SRCDIR/tools/splitconfig"
-    echo "Skipping pocketlint; it's not up to date with Python3."
-    # if which pocketlint >/dev/null
-    # then
-    # 	pocketlint $PYFILES
-    # fi
-
-    if which pyflakes3 >/dev/null
-    then
-        pyflakes3 $PYFILES
-    fi
-}
-
-
-main() {
-    local full="no"
-    for arg in $ARGS
-    do
-        case $arg in
-        -h|--help)
-	    cat <<EOF
-Perform static checks on libpqxx build tree.
-
-Usage:
-    $0 -h|--help -- print this message and exit.
-    $0 -f|--full -- perform full check, including C++ analysis.
-    $0 -- perform default check.
-EOF
-            exit 0
-        ;;
-        -f|--full)
-	    full="yes"
-        ;;
-        *)
-	    echo >&2 "Unknown argument: '$arg'"
-	    exit 1
-        ;;
-        esac
-    done
-
-    check_ascii
-    pylint
-    check_news_version
-    check_compiler_internal_headers
-    if [ $full == "yes" ]
-    then
-        cpplint
-    fi
-}
-
-
-main
diff --git a/ext/libpqxx-7.7.3/tools/m4esc.py b/ext/libpqxx-7.7.3/tools/m4esc.py
deleted file mode 100755
index 355169db2..000000000
--- a/ext/libpqxx-7.7.3/tools/m4esc.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /usr/bin/env python3
-
-"""M4-quote text, for use as a literal in configure.ac.
-
-Produces M4 "code" which evaluates to the input text.
-
-It's not easy to read plain text from an input file in M4, without having it
-expanded as M4.  Sometimes all we want is literal text!
-"""
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-from argparse import ArgumentParser
-from sys import (
-    stdin,
-    stdout,
-    )
-
-
-def parse_args():
-    parser = ArgumentParser(description=__doc__)
-    parser.add_argument(
-        '--open', '-a', default='[[', help="Current open-quote symbol.")
-    parser.add_argument(
-        '--close', '-b', default=']]', help="Current close-quote symbol.")
-    parser.add_argument(
-        '--input', '-i', default='-', help="Input file, or '-' for stdin.")
-    parser.add_argument(
-        '--output', '-o', default='-', help="Output file, or '-' for stdout.")
-    return parser.parse_args()
-
-
-def open_input(in_file):
-    if in_file == '-':
-        return stdin
-    else:
-        return open(in_file)
-
-
-def open_output(out_file):
-    if out_file == '-':
-        return stdout
-    else:
-        return open(out_file, 'w')
-
-
-def escape(line):
-    return (
-        line
-        .replace('[', '@<:@')
-        .replace(']', '@:>@')
-        .replace('#', '@%:@')
-        .replace('$', '@S|@')
-    )
-
-
-def main(args):
-    with open_input(args.input) as istr, open_output(args.output) as ostr:
-        ostr.write(args.open)
-        for line in istr:
-            ostr.write(escape(line))
-            ostr.write('\n')
-        ostr.write(args.close)
-
-
-if __name__ == '__main__':
-    main(parse_args())
diff --git a/ext/libpqxx-7.7.3/tools/pqxxthreadsafety.cxx b/ext/libpqxx-7.7.3/tools/pqxxthreadsafety.cxx
deleted file mode 100644
index afa8fb01f..000000000
--- a/ext/libpqxx-7.7.3/tools/pqxxthreadsafety.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-// Print thread-safety information for present libpqxx build.
-#include <iostream>
-
-#include "pqxx/util"
-
-
-int main()
-{
-  std::cout << pqxx::describe_thread_safety().description << std::endl;
-}
diff --git a/ext/libpqxx-7.7.3/tools/rmlo.cxx b/ext/libpqxx-7.7.3/tools/rmlo.cxx
deleted file mode 100644
index 5db9605f1..000000000
--- a/ext/libpqxx-7.7.3/tools/rmlo.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-// Remove large objects given on the command line from the default database.
-#include <iostream>
-
-#include "pqxx/pqxx"
-
-
-int main(int, char *argv[])
-{
-  pqxx::connection conn;
-  bool failures = false;
-
-  try
-  {
-    for (int i{1}; argv[i]; ++i)
-    {
-      auto o{pqxx::from_string<pqxx::oid>(argv[i])};
-      try
-      {
-        pqxx::perform([o, &conn] {
-          pqxx::work tx{conn};
-          pqxx::blob::remove(tx, o);
-          tx.commit();
-        });
-      }
-      catch (std::exception const &e)
-      {
-        std::cerr << e.what() << std::endl;
-        failures = true;
-      }
-    }
-  }
-  catch (std::exception const &e)
-  {
-    std::cerr << e.what() << std::endl;
-    return 2;
-  }
-
-  return failures;
-}
diff --git a/ext/libpqxx-7.7.3/tools/splitconfig b/ext/libpqxx-7.7.3/tools/splitconfig
deleted file mode 100755
index 2f4be957f..000000000
--- a/ext/libpqxx-7.7.3/tools/splitconfig
+++ /dev/null
@@ -1,244 +0,0 @@
-#! /usr/bin/env python3
-
-"""Extract configuration items into various configuration headers.
-
-This uses the configitems file, a database consisting of text lines with the
-following single-tab-separated fields:
- - Name of the configuration item, e.g. PQXX_HAVE_PTRDIFF_T.
- - Publication marker: public or internal.
- - A single environmental factor determining the item, e.g. libpq or compiler.
-"""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-from argparse import ArgumentParser
-import codecs
-from errno import ENOENT
-import os.path
-from os import getcwd
-import re
-from sys import (
-    getdefaultencoding,
-    getfilesystemencoding,
-    stdout,
-    )
-
-__metaclass__ = type
-
-
-def guess_fs_encoding():
-    """Try to establish the filesystem encoding.
-
-    It's a sad thing: some guesswork is involved.  The encoding often seems to
-    be conservatively, and incorrectly, set to ascii.
-    """
-    candidates = [
-        getfilesystemencoding(),
-        getdefaultencoding(),
-        'utf-8',
-        ]
-    for encoding in candidates:
-        lower = encoding.lower()
-        if lower != 'ascii' and lower != 'ansi_x3.4-1968':
-            return encoding
-    raise AssertionError("unreachable code reached.")
-
-
-def guess_output_encoding():
-    """Return the encoding of standard output."""
-    # Apparently builds in Docker containers may have None as an encoding.
-    # Fall back to ASCII.  If this ever happens in a non-ASCII path, well,
-    # there may be a more difficult decision to be made.  We'll burn that
-    # bridge when we get to it, as they almost say.
-    return stdout.encoding or 'ascii'
-
-
-def decode_path(path):
-    """Decode a path element from bytes to unicode string."""
-    return path.decode(guess_fs_encoding())
-
-
-def encode_path(path):
-    """Encode a path element from unicode string to bytes."""
-    # Nasty detail: unicode strings are stored as UTF-16.  Which can contain
-    # surrogate pairs.  And those break in encoding, unless you use this
-    # special error handler.
-    return path.encode(guess_fs_encoding(), 'surrogateescape')
-
-
-def read_text_file(path, encoding='utf-8'):
-    """Read text file, return as string, or `None` if file is not there."""
-    assert isinstance(path, type(''))
-    try:
-        with codecs.open(encode_path(path), encoding=encoding) as stream:
-            return stream.read()
-    except IOError as error:
-        if error.errno == ENOENT:
-            return None
-        else:
-            raise
-
-
-def read_lines(path, encoding='utf-8'):
-    """Read text file, return as list of lines."""
-    assert isinstance(path, type(''))
-    with codecs.open(encode_path(path), encoding=encoding) as stream:
-        return list(stream)
-
-
-def read_configitems(filename):
-    """Read the configuration-items database.
-
-    :param filename: Path to the configitems file.
-    :return: Sequence of text lines from configitems file.
-    """
-    return [line.split() for line in read_lines(filename)]
-
-
-def map_configitems(items):
-    """Map each config item to publication/factor.
-
-    :param items: Sequence of config items: (name, publication, factor).
-    :return: Dict mapping each item name to a tuple (publication, factor).
-    """
-    return {
-        item: (publication, factor)
-        for item, publication, factor in items
-        }
-
-
-def read_header(source_tree, filename):
-    """Read the original config.h generated by autoconf.
-
-    :param source_tree: Path to libpqxx source tree.
-    :param filename: Path to the config.h file.
-    :return: Sequence of text lines from config.h.
-    """
-    assert isinstance(source_tree, type(''))
-    assert isinstance(filename, type(''))
-    return read_lines(os.path.join(source_tree, filename))
-
-
-def extract_macro_name(config_line):
-    """Extract a cpp macro name from a configuration line.
-
-    :param config_line: Text line from config.h which may define a macro.
-    :return: Name of macro defined in `config_line` if it is a `#define`
-        statement, or None.
-    """
-    config_line = config_line.strip()
-    match = re.match('\s*#\s*define\s+([^\s]+)', config_line)
-    if match is None:
-        return None
-    else:
-        return match.group(1)
-
-
-def extract_section(header_lines, items, publication, factor):
-    """Extract config items for given publication/factor from header lines.
-
-    :param header_lines: Sequence of header lines from config.h.
-    :param items: Dict mapping macro names to (publication, factor).
-    :param publication: Extract only macros for this publication tag.
-    :param factor: Extract only macros for this environmental factor.
-    :return: Sequence of `#define` lines from `header_lines` insofar they
-        fall within the requested section.
-    """
-    return sorted(
-        line.strip()
-        for line in header_lines
-        if items.get(extract_macro_name(line)) == (publication, factor)
-        )
-
-
-def compose_header(lines, publication, factor):
-    """Generate header text containing given lines."""
-    intro = (
-        "/* Automatically generated from config.h: %s/%s config. */"
-        % (publication, factor)
-        )
-    return '\n'.join([intro, ''] + lines + [''])
-
-
-def generate_config(source_tree, header_lines, items, publication, factor):
-    """Generate config file for a given section, if appropriate.
-
-    Writes nothing if the configuration file ends up identical to one that's
-    already there.
-
-    :param source_tree: Location of the libpqxx source tree.
-    :param header_lines: Sequence of header lines from config.h.
-    :param items: Dict mapping macro names to (publication, factor).
-    :param publication: Extract only macros for this publication tag.
-    :param factor: Extract only macros for this environmental factor.
-    """
-    assert isinstance(source_tree, type(''))
-    config_file = os.path.join(
-        source_tree, 'include', 'pqxx',
-        'config-%s-%s.h' % (publication, factor))
-    unicode_path = config_file.encode(guess_output_encoding(), 'replace')
-    section = extract_section(header_lines, items, publication, factor)
-    contents = compose_header(section, publication, factor)
-    if read_text_file(config_file) == contents:
-        print("Generating %s: no changes--skipping." % unicode_path)
-        return
-
-    print("Generating %s: %d item(s)." % (unicode_path, len(section)))
-    path = encode_path(config_file)
-    with codecs.open(path, 'wb', encoding='ascii') as header:
-        header.write(contents)
-
-
-def parse_args():
-    """Parse command-line arguments."""
-    default_source_tree = os.path.dirname(
-        os.path.dirname(os.path.normpath(os.path.abspath(__file__))))
-    parser = ArgumentParser(description=__doc__)
-    parser.add_argument(
-        'sourcetree', metavar='PATH', default=default_source_tree,
-        help="Location of libpqxx source tree.  Defaults to '%(default)s'.")
-    return parser.parse_args()
-
-
-def check_args(args):
-    """Validate command-line arguments."""
-    if not os.path.isdir(args.sourcetree):
-        raise Exception("Not a directory: '%s'." % args.sourcetree)
-
-
-def get_current_dir():
-    cwd = getcwd()
-    if isinstance(cwd, bytes):
-        return decode_path(cwd)
-    else:
-        return cwd
-
-
-def main():
-    """Main program entry point."""
-    args = parse_args()
-    check_args(args)
-    # The configitems file is under revision control; it's in sourcetree.
-    items = read_configitems(os.path.join(args.sourcetree, 'configitems'))
-    publications = sorted(set(item[1] for item in items))
-    factors = sorted(set(item[2] for item in items))
-    # The config.h header is generated; it's in the build tree, which should
-    # be where we are.
-    directory = get_current_dir()
-    original_header = read_header(
-        directory,
-        os.path.join('include', 'pqxx', 'config.h'))
-    items_map = map_configitems(items)
-
-    for publication in publications:
-        for factor in factors:
-            generate_config(
-                directory, original_header, items_map, publication, factor)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/ext/libpqxx-7.7.3/tools/template2mak.py b/ext/libpqxx-7.7.3/tools/template2mak.py
deleted file mode 100755
index 9a5286d95..000000000
--- a/ext/libpqxx-7.7.3/tools/template2mak.py
+++ /dev/null
@@ -1,194 +0,0 @@
-#! /usr/bin/env python3
-"""Minimal macro processor.  Used for generating VC++ makefiles.
-
-The available template commands are:
-
-    Expand a template section for each file in a list of file patterns::
-        ###MAKTEMPLATE:FOREACH my/path*/*.cxx,other*.cxx
-        ...
-        ###MAKTEMPLATE:ENDFOREACH
-
-    In the template section, you can use `###BASENAME###` to get the base name
-    of the file being processed (e.g. "base" for "../base.cxx"), and you can
-    use `###FILENAME###` to get the full filename.
-
-
-Copyright (c) 2000-2022, Bart Samwel and Jeroen T. Vermeulen.
-"""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-from argparse import (
-    ArgumentError,
-    ArgumentParser,
-    RawDescriptionHelpFormatter,
-    )
-from contextlib import contextmanager
-from glob import glob
-import os
-from sys import (
-    argv,
-    stdin,
-    stderr,
-    stdout,
-    )
-import sys
-from textwrap import dedent
-
-
-def expand_foreach_file(path, block, outfile):
-    """Expand a "foreach" block for a single file path.
-
-    Write the results to outfile.
-    """
-    basepath, _ = os.path.splitext(os.path.basename(path))
-    for line in block:
-        line = line.replace("###FILENAME###", path)
-        line = line.replace("###BASENAME###", basepath)
-        outfile.write(line)
-
-
-def match_globs(globs):
-    """List all files matching any item in globs.
-
-    Eliminates duplicates.
-    """
-    return sorted({
-        path
-        for pattern in globs
-        for path in glob(pattern)
-        })
-
-
-def expand_foreach(globs, block, outfile):
-    """Expand a foreach block for each file matching one of globs.
-
-    Write the results to outfile.
-    """
-    # We'll be iterating over block a variable number of times.  Turn it
-    # from a generic iterable into an immutable array.
-    block = tuple(block)
-    for path in match_globs(globs):
-        expand_foreach_file(path, block, outfile)
-
-
-# Header to be prefixed to the generated file.
-OUTPUT_HEADER = dedent("""\
-    # AUTOMATICALLY GENERATED FILE -- DO NOT EDIT.
-    #
-    # This file is generated automatically by libpqxx's {script} script, and
-    # will be rewritten from time to time.
-    #
-    # If you modify this file, chances are your modifications will be lost.
-    #
-    # The {script} script should be available in the tools directory of the
-    # libpqxx source archive.
-    """)
-
-
-foreach_marker = r"###MAKTEMPLATE:FOREACH "
-end_foreach_marker = r"###MAKTEMPLATE:ENDFOREACH"
-
-
-def parse_foreach(line):
-    """Parse FOREACH directive, if line contains one.
-
-    :param line: One line of template input.
-    :return: A list of FOREACH globs, or None if this was not a FOREACH line.
-    """
-    line = line.strip()
-    if line.startswith(foreach_marker):
-        return line[len(foreach_marker):].split(',')
-    else:
-        return None
-
-
-def read_foreach_block(infile):
-    """Read a FOREACH block from infile (not including the FOREACH directive).
-
-    Assumes that the FOREACH directive was in the preceding line.  Consumes
-    the line with the ENDFOREACH directive, but does not yield it.
-
-    :return: Iterable of lines.
-    """
-    for line in infile:
-        if line.strip().startswith(end_foreach_marker):
-            return
-        yield line
-
-
-def expand_template(infile, outfile):
-    """Expand the template in infile, and write the results to outfile."""
-    for line in infile:
-        globs = parse_foreach(line)
-        if globs is None:
-            # Not a FOREACH line.  Copy to output.
-            outfile.write(line)
-        else:
-            block = read_foreach_block(infile)
-            expand_foreach(globs, block, outfile)
-
-
-@contextmanager
-def open_stream(path=None, default=None, mode='r'):
-    """Open file at given path, or yield default.  Close as appropriate.
-
-    The default should be a stream, not a path; closing the context will not
-    close it.
-    """
-    if path is None:
-        yield default
-    else:
-        with open(path, mode) as stream:
-            yield stream
-
-
-def parse_args():
-    """Parse command-line arguments.
-
-    :return: Tuple of: input path (or None for stdin), output path (or None
-        for stdout).
-    """
-    parser = ArgumentParser(
-        description=__doc__, formatter_class=RawDescriptionHelpFormatter)
-
-    parser.add_argument(
-        'template', nargs='?',
-        help="Input template.  Defaults to standard input.")
-    parser.add_argument(
-        'output', nargs='?',
-        help="Output file.  Defaults to standard output.")
-
-    args = parser.parse_args()
-    return args.template, args.output
-
-
-def write_header(stream, template_path=None):
-    """Write header to stream."""
-    hr = ('# ' + '#' * 78) + "\n"
-    script = os.path.basename(argv[0])
-
-    outstream.write(hr)
-    outstream.write(OUTPUT_HEADER.format(script=script))
-    if template_path is not None:
-        outstream.write("#\n")
-        outstream.write("# Generated from template '%s'.\n" % template_path)
-    outstream.write(hr)
-
-
-if __name__ == '__main__':
-    try:
-        template_path, output_path = parse_args()
-    except ArgumentError as error:
-        stderr.write('%s\n' % error)
-        sys.exit(2)
-
-    input_stream = open_stream(template_path, stdin, 'r')
-    output_stream = open_stream(output_path, stdout, 'w')
-    with input_stream as instream, output_stream as outstream:
-        write_header(outstream, template_path)
-        expand_template(instream, outstream)
diff --git a/ext/libpqxx-7.7.3/tools/test_all.py b/ext/libpqxx-7.7.3/tools/test_all.py
deleted file mode 100755
index 29f33050c..000000000
--- a/ext/libpqxx-7.7.3/tools/test_all.py
+++ /dev/null
@@ -1,630 +0,0 @@
-#! /usr/bin/env python3
-"""Brute-force test script: test libpqxx against many compilers etc.
-
-This script makes no changes in the source tree; all builds happen in
-temporary directories.
-
-To make this possible, you may need to run "make distclean" in the
-source tree.  The configure script will refuse to configure otherwise.
-"""
-
-# Without this, pocketlint does not yet understand the print function.
-from __future__ import print_function
-
-from abc import (
-    ABCMeta,
-    abstractmethod,
-    )
-from argparse import ArgumentParser
-from contextlib import contextmanager
-from datetime import datetime
-from functools import partial
-import json
-from multiprocessing import (
-    JoinableQueue,
-    Process,
-    Queue,
-    )
-from multiprocessing.pool import (
-    Pool,
-    )
-from os import (
-    cpu_count,
-    getcwd,
-    )
-import os.path
-from queue import Empty
-from shutil import rmtree
-from subprocess import (
-    CalledProcessError,
-    check_call,
-    check_output,
-    DEVNULL,
-    )
-from sys import (
-    stderr,
-    stdout,
-    )
-from tempfile import mkdtemp
-from textwrap import dedent
-
-
-CPUS = cpu_count()
-
-GCC_VERSIONS = list(range(8, 14))
-GCC = ['g++-%d' % ver for ver in GCC_VERSIONS]
-CLANG_VERSIONS = list(range(7, 15))
-CLANG = ['clang++-6.0'] + ['clang++-%d' % ver for ver in CLANG_VERSIONS]
-CXX = GCC + CLANG
-
-STDLIB = (
-    '',
-    '-stdlib=libc++',
-    )
-
-OPT = ('-O0', '-O3')
-
-LINK = {
-    'static': ['--enable-static', '--disable-shared'],
-    'dynamic': ['--disable-static', '--enable-shared'],
-}
-
-DEBUG = {
-    'plain': [],
-    'audit': ['--enable-audit'],
-    'maintainer': ['--enable-maintainer-mode'],
-    'full': ['--enable-audit', '--enable-maintainer-mode'],
-}
-
-
-# CMake "generators."  Maps a value for cmake's -G option to a command line to
-# run.
-#
-# I prefer Ninja if available, because it's fast.  But hey, the default will
-# work.
-#
-# Maps the name of the generator (as used with cmake's -G option) to the
-# actual command line needed to do the build.
-CMAKE_GENERATORS = {
-    'Ninja': ['ninja'],
-    'Unix Makefiles': ['make', '-j%d' % CPUS],
-}
-
-
-class Fail(Exception):
-    """A known, well-handled exception.  Doesn't need a traceback."""
-
-
-class Skip(Exception):
-    """"We're not doing this build.  It's not an error though."""
-
-
-def run(cmd, output, cwd=None):
-    """Run a command, write output to file-like object."""
-    command_line = ' '.join(cmd)
-    output.write("%s\n\n" % command_line)
-    check_call(cmd, stdout=output, stderr=output, cwd=cwd)
-
-
-def report(output, message):
-    """Report a message to output, and standard output."""
-    print(message, flush=True)
-    output.write('\n\n')
-    output.write(message)
-    output.write('\n')
-
-
-def file_contains(path, text):
-    """Does the file at path contain text?"""
-    with open(path) as stream:
-        for line in stream:
-            if text in line:
-                return True
-    return False
-
-
-@contextmanager
-def tmp_dir():
-    """Create a temporary directory, and clean it up again."""
-    tmp = mkdtemp()
-    try:
-        yield tmp
-    finally:
-        rmtree(tmp)
-
-
-def write_check_code(work_dir):
-    """Write a simple C++ program so we can tesst whether we can compile it.
-
-    Returns the file's full path.
-    """
-    path = os.path.join(work_dir, "check.cxx")
-    with open(path, 'w') as source:
-        source.write(dedent("""\
-            #include <iostream>
-            int main()
-            {
-                std::cout << "Hello world." << std::endl;
-            }
-            """))
-
-    return path
-
-
-def check_compiler(work_dir, cxx, stdlib, check, verbose=False):
-    """Is the given compiler combo available?"""
-    err_file = os.path.join(work_dir, 'stderr.log')
-    if verbose:
-        err_output = open(err_file, 'w')
-    else:
-        err_output = DEVNULL
-    try:
-        command = [cxx, check]
-        if stdlib != '':
-            command.append(stdlib)
-        check_call(command, cwd=work_dir, stderr=err_output)
-    except (OSError, CalledProcessError):
-        if verbose:
-            with open(err_file) as errors:
-                stdout.write(errors.read())
-            print("Can't build with '%s %s'.  Skipping." % (cxx, stdlib))
-        return False
-    else:
-        return True
-
-
-# TODO: Use Pool.
-def check_compilers(compilers, stdlibs, verbose=False):
-    """Check which compiler configurations are viable."""
-    with tmp_dir() as work_dir:
-        check = write_check_code(work_dir)
-        return [
-            (cxx, stdlib)
-            for stdlib in stdlibs
-            for cxx in compilers
-            if check_compiler(
-                work_dir, cxx, stdlib, check=check, verbose=verbose)
-        ]
-
-
-def find_cmake_command():
-    """Figure out a CMake generator we can use, or None."""
-    try:
-        caps = check_output(['cmake', '-E', 'capabilities'])
-    except FileNotFoundError:
-        return None
-
-    names = {generator['name'] for generator in json.loads(caps)['generators']}
-    for gen in CMAKE_GENERATORS.keys():
-        if gen in names:
-            return gen
-    return None
-
-
-class Config:
-    """Configuration for a build.
-
-    These classes must be suitable for pickling, so we can send its objects to
-    worker processes.
-    """
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def name(self):
-        """Return an identifier for this build configuration."""
-
-    def make_log_name(self):
-        """Compose log file name for this build."""
-        return "build-%s.out" % self.name()
-
-
-class Build:
-    """A pending or ondoing build, in its own directory.
-
-    Each step returns True for Success, or False for failure.
-
-    These classes must be suitable for pickling, so we can send its objects to
-    worker processes.
-    """
-    def __init__(self, logs_dir, config=None):
-        self.config = config
-        self.log = os.path.join(logs_dir, config.make_log_name())
-        # Start a fresh log file.
-        with open(self.log, 'w') as log:
-            log.write("Starting %s.\n" % datetime.utcnow())
-        self.work_dir = mkdtemp()
-
-    def clean_up(self):
-        """Delete the build tree."""
-        rmtree(self.work_dir)
-
-    @abstractmethod
-    def configure(self, log):
-        """Prepare for a build."""
-
-    @abstractmethod
-    def build(self, log):
-        """Build the code, including the tests.  Don't run tests though."""
-
-    def test(self, log):
-        """Run tests."""
-        run(
-            [os.path.join(os.path.curdir, 'test', 'runner')], log,
-            cwd=self.work_dir)
-
-    def logging(self, function):
-        """Call function, pass open write handle for `self.log`."""
-# TODO: Should probably be a decorator.
-        with open(self.log, 'a') as log:
-            try:
-                function(log)
-            except Exception as error:
-                log.write("%s\n" % error)
-                raise
-
-    def do_configure(self):
-        """Call `configure`, writing output to `self.log`."""
-        self.logging(self.configure)
-
-    def do_build(self):
-        """Call `build`, writing output to `self.log`."""
-        self.logging(self.build)
-
-    def do_test(self):
-        """Call `test`, writing output to `self.log`."""
-        self.logging(self.test)
-
-
-class AutotoolsConfig(Config):
-    """A combination of build options for the "configure" script."""
-    def __init__(self, cxx, opt, stdlib, link, link_opts, debug, debug_opts):
-        self.cxx = cxx
-        self.opt = opt
-        self.stdlib = stdlib
-        self.link = link
-        self.link_opts = link_opts
-        self.debug = debug
-        self.debug_opts = debug_opts
-
-    def name(self):
-        return '_'.join([
-            self.cxx, self.opt, self.stdlib, self.link, self.debug])
-
-
-class AutotoolsBuild(Build):
-    """Build using the "configure" script."""
-    __metaclass__ = ABCMeta
-
-    def configure(self, log):
-        configure = [
-            os.path.join(getcwd(), "configure"),
-            "CXX=%s" % self.config.cxx,
-            ]
-
-        if self.config.stdlib == '':
-            configure += [
-                "CXXFLAGS=%s" % self.config.opt,
-            ]
-        else:
-            configure += [
-                "CXXFLAGS=%s %s" % (self.config.opt, self.config.stdlib),
-                "LDFLAGS=%s" % self.config.stdlib,
-                ]
-
-        configure += [
-            "--disable-documentation",
-            ] + self.config.link_opts + self.config.debug_opts
-
-        run(configure, log, cwd=self.work_dir)
-
-    def build(self, log):
-        run(['make', '-j%d' % CPUS], log, cwd=self.work_dir)
-        # Passing "TESTS=" like this will suppress the actual running of
-        # the tests.  We run them in the "test" stage.
-        run(['make', '-j%d' % CPUS, 'check', 'TESTS='], log, cwd=self.work_dir)
-
-
-class CMakeConfig(Config):
-    """Configuration for a CMake build."""
-    def __init__(self, generator):
-        self.generator = generator
-        self.builder = CMAKE_GENERATORS[generator]
-
-    def name(self):
-        return "cmake"
-
-
-class CMakeBuild(Build):
-    """Build using CMake.
-
-    Ignores the config for now.
-    """
-    __metaclass__ = ABCMeta
-
-    def configure(self, log):
-        source_dir = getcwd()
-        generator = self.config.generator
-        run(
-            ['cmake', '-G', generator, source_dir], output=log,
-            cwd=self.work_dir)
-
-    def build(self, log):
-        run(self.config.builder, log, cwd=self.work_dir)
-
-
-def parse_args():
-    """Parse command-line arguments."""
-    parser = ArgumentParser(description=__doc__)
-    parser.add_argument('--verbose', '-v', action='store_true')
-    parser.add_argument(
-        '--compilers', '-c', default=','.join(CXX),
-        help="Compilers, separated by commas.  Default is %(default)s.")
-    parser.add_argument(
-        '--optimize', '-O', default=','.join(OPT),
-        help=(
-            "Alternative optimisation options, separated by commas.  "
-            "Default is %(default)s."))
-    parser.add_argument(
-        '--stdlibs', '-L', default=','.join(STDLIB),
-        help=(
-            "Comma-separated options for choosing standard library.  "
-            "Defaults to %(default)s."))
-    parser.add_argument(
-        '--logs', '-l', default='.', metavar='DIRECTORY',
-        help="Write build logs to DIRECTORY.")
-    parser.add_argument(
-        '--jobs', '-j', default=CPUS, metavar='CPUS',
-        help=(
-            "When running 'make', run up to CPUS concurrent processes.  "
-            "Defaults to %(default)s."))
-    parser.add_argument(
-        '--minimal', '-m', action='store_true',
-        help="Make it as short a run as possible.  For testing this script.")
-    return parser.parse_args()
-
-
-def soft_get(queue, block=True):
-    """Get an item off `queue`, or `None` if the queue is empty."""
-    try:
-        return queue.get(block)
-    except Empty:
-        return None
-
-
-def read_queue(queue, block=True):
-    """Read entries off `queue`, terminating when it gets a `None`.
-
-    Also terminates when the queue is empty.
-    """
-    entry = soft_get(queue, block)
-    while entry is not None:
-        yield entry
-        entry = soft_get(queue, block)
-
-
-def service_builds(in_queue, fail_queue, out_queue):
-    """Worker process for "build" stage: process one job at a time.
-
-    Sends successful builds to `out_queue`, and failed builds to `fail_queue`.
-
-    Terminates when it receives a `None`, at which point it will send a `None`
-    into `out_queue` in turn.
-    """
-    for build in read_queue(in_queue):
-        try:
-            build.do_build()
-        except Exception as error:
-            fail_queue.put((build, "%s" % error))
-        else:
-            out_queue.put(build)
-        in_queue.task_done()
-
-    # Mark the end of the queue.
-    out_queue.put(None)
-
-
-def service_tests(in_queue, fail_queue, out_queue):
-    """Worker process for "test" stage: test one build at a time.
-
-    Sends successful builds to `out_queue`, and failed builds to `fail_queue`.
-
-    Terminates when it receives a final `None`.  Does not send out a final
-    `None` of its own.
-    """
-    for build in read_queue(in_queue):
-        try:
-            build.do_test()
-        except Exception as error:
-            fail_queue.put((build, "%s" % error))
-        else:
-            out_queue.put(build)
-        in_queue.task_done()
-
-
-def report_failures(queue, message):
-    """Report failures from a failure queue.  Return total number."""
-    failures = 0
-    for build, error in read_queue(queue, block=False):
-        print("%s: %s - %s" % (message, build.config.name(), error))
-        failures += 1
-    return failures
-
-
-def count_entries(queue):
-    """Get and discard all entries from `queue`, return the total count."""
-    total = 0
-    for _ in read_queue(queue, block=False):
-        total += 1
-    return total
-
-
-def gather_builds(args):
-    """Produce the list of builds we want to perform."""
-    if args.verbose:
-        print("\nChecking available compilers.")
-
-    compiler_candidates = args.compilers.split(',')
-    compilers = check_compilers(
-        compiler_candidates, args.stdlibs.split(','),
-        verbose=args.verbose)
-    if list(compilers) == []:
-        raise Fail(
-            "Did not find any viable compilers.  Tried: %s."
-            % ', '.join(compiler_candidates))
-
-    opt_levels = args.optimize.split(',')
-    link_types = LINK.items()
-    debug_mixes = DEBUG.items()
-
-    if args.minimal:
-        compilers = compilers[:1]
-        opt_levels = opt_levels[:1]
-        link_types = list(link_types)[:1]
-        debug_mixes = list(debug_mixes)[:1]
-
-    builds = [
-        AutotoolsBuild(
-            args.logs,
-            AutotoolsConfig(
-                opt=opt, link=link, link_opts=link_opts, debug=debug,
-                debug_opts=debug_opts, cxx=cxx, stdlib=stdlib))
-        for opt in sorted(opt_levels)
-        for link, link_opts in sorted(link_types)
-        for debug, debug_opts in sorted(debug_mixes)
-        for cxx, stdlib in compilers
-    ]
-
-    cmake = find_cmake_command()
-    if cmake is not None:
-        builds.append(CMakeBuild(args.logs, CMakeConfig(cmake)))
-    return builds
-
-
-def enqueue(queue, build, *args):
-    """Put `build` on `queue`.
-
-    Ignores additional arguments, so that it can be used as a clalback for
-    `Pool`.
-
-    We do this instead of a lambda in order to get the closure right.  We want
-    the build for the current iteration, not the last one that was executed
-    before the lambda runs.
-    """
-    queue.put(build)
-
-
-def enqueue_error(queue, build, error):
-    """Put the pair of `build` and `error` on `queue`."""
-    queue.put((build, error))
-
-
-def main(args):
-    """Do it all."""
-    if not os.path.isdir(args.logs):
-        raise Fail("Logs location '%s' is not a directory." % args.logs)
-
-    builds = gather_builds(args)
-    if args.verbose:
-        print("Lined up %d builds." % len(builds))
-
-    # The "configure" step is single-threaded.  We can run many at the same
-    # time, even when we're also running a "build" step at the same time.
-    # This means we may run a lot more processes than we have CPUs, but there's
-    # no law against that.  There's also I/O time to be covered.
-    configure_pool = Pool()
-
-    # Builds which have failed the "configure" stage, with their errors.  This
-    # queue must never stall, so that we can let results pile up here while the
-    # work continues.
-    configure_fails = Queue(len(builds))
-
-    # Waiting list for the "build" stage.  It contains Build objects,
-    # terminated by a final None to signify that there are no more builds to be
-    # done.
-    build_queue = JoinableQueue(10)
-
-    # Builds that have failed the "build" stage.
-    build_fails = Queue(len(builds))
-
-    # Waiting list for the "test" stage.  It contains Build objects, terminated
-    # by a final None.
-    test_queue = JoinableQueue(10)
-
-    # The "build" step tries to utilise all CPUs, and it may use a fair bit of
-    # memory.  Run only one of these at a time, in a single worker process.
-    build_worker = Process(
-        target=service_builds, args=(build_queue, build_fails, test_queue))
-    build_worker.start()
-
-    # Builds that have failed the "test" stage.
-    test_fails = Queue(len(builds))
-
-    # Completed builds.  This must never stall.
-    done_queue = JoinableQueue(len(builds))
-
-    # The "test" step can not run concurrently (yet).  So, run tests serially
-    # in a single worker process.  It takes its jobs directly from the "build"
-    # worker.
-    test_worker = Process(
-        target=service_tests, args=(test_queue, test_fails, done_queue))
-    test_worker.start()
-
-    # Feed all builds into the "configure" pool.  Each build which passes this
-    # stage goes into the "build" queue.
-    for build in builds:
-        configure_pool.apply_async(
-            build.do_configure, callback=partial(enqueue, build_queue, build),
-            error_callback=partial(enqueue_error, configure_fails, build))
-    if args.verbose:
-        print("All jobs are underway.")
-    configure_pool.close()
-    configure_pool.join()
-
-# TODO: Async reporting for faster feedback.
-    configure_fail_count = report_failures(configure_fails, "CONFIGURE FAIL")
-    if args.verbose:
-        print("Configure stage done.")
-
-    # Mark the end of the build queue for the build worker.
-    build_queue.put(None)
-
-    build_worker.join()
-# TODO: Async reporting for faster feedback.
-    build_fail_count = report_failures(build_fails, "BUILD FAIL")
-    if args.verbose:
-        print("Build step done.")
-
-    # Mark the end of the test queue for the test worker.
-    test_queue.put(None)
-
-    test_worker.join()
-# TODO: Async reporting for faster feedback.
-# TODO: Collate failures into meaningful output, e.g. "shared library fails."
-    test_fail_count = report_failures(test_fails, "TEST FAIL")
-    if args.verbose:
-        print("Test step done.")
-
-    # All done.  Clean up.
-    for build in builds:
-        build.clean_up()
-
-    ok_count = count_entries(done_queue)
-    if ok_count == len(builds):
-        print("All tests OK.")
-    else:
-        print(
-            "Failures during configure: %d - build: %d - test: %d.  OK: %d."
-            % (
-                configure_fail_count,
-                build_fail_count,
-                test_fail_count,
-                ok_count,
-            ))
-
-
-if __name__ == '__main__':
-    try:
-        exit(main(parse_args()))
-    except Fail as failure:
-        stderr.write("%s\n" % failure)
-        exit(2)
diff --git a/ext/libpqxx-7.7.3/tools/todo b/ext/libpqxx-7.7.3/tools/todo
deleted file mode 100755
index 87429f4b2..000000000
--- a/ext/libpqxx-7.7.3/tools/todo
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/bash
-#
-# List "TODO" and "XXX" items in the given files, or throughout the source
-# code.
-
-set -e -u -o pipefail
-
-# TODO: Make location-independent?
-find_source() {
-    echo configure.ac
-    find . -name \*.cxx -o -name \*.hxx | sed -e 's|^\./||' | sort
-    for f in $(ls tools)
-    do
-        echo tools/$f
-    done
-}
-
-
-FILES=${*:-$(find_source)}
-
-
-# Search for "$1:" in files $2.
-# (This function adds the colon.  That way, the search statement itself won't
-# show up in the search.)
-search_for() {
-    grep $1: $2
-}
-
-
-search_for XXX "$FILES" || true
-search_for TODO "$FILES" || true
diff --git a/ext/libpqxx-7.7.3/tools/update-copyright b/ext/libpqxx-7.7.3/tools/update-copyright
deleted file mode 100755
index 9d1eb5a97..000000000
--- a/ext/libpqxx-7.7.3/tools/update-copyright
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/bash
-#
-# Update the libpqxx copyright strings in the current directory.
-#
-# Usage: update-copyright [year]
-#
-# Where "year" is the new copyright year.  Defaults to the current year.
-#
-# Assumes GNU grep and GNU sed.
-set -eu -o pipefail
-
-# The regexes are a bit awkward because they must work in both grep and sed.
-#
-# F'rinstance, PREFIX can't include the dash because our replacement string in
-# sed would have a backreference (e.g. "\3") immediately followed by a year
-# (e.g. 2022), and there's no clear boundary between the backreference number
-# and the year: "\32022".
-PREFIX='Copyright (c),* 2000'
-YEAR='20[0-9][0-9]'
-NEW_YEAR="${1:-$(date '+%Y')}"
-SUFFIX=',* \(.* and \)*Jeroen T\. Vermeulen'
-grep -rIl "$PREFIX-$YEAR$SUFFIX" |
-    xargs -r sed -i -e "s/\\($PREFIX\\)-$YEAR\\($SUFFIX\\)/\\1-$NEW_YEAR\\2/"
-
-# This one is so different that I'd rather keep it a special case.
-sed \
-    -i \
-    -e "s/\\(2000\\)-$YEAR\\(,* Jeroen T\\. Vermeulen\\)/\1-$NEW_YEAR\\2/" \
-    doc/conf.py
diff --git a/ext/lwip/CHANGELOG b/ext/lwip/CHANGELOG
new file mode 100644
index 000000000..af68299ed
--- /dev/null
+++ b/ext/lwip/CHANGELOG
@@ -0,0 +1,3349 @@
+HISTORY
+
+(CVS HEAD)
+
+  * [Enter new changes just after this line - do not remove this line]
+
+ ++ New features:
+
+
+ ++ Bugfixes:
+
+
+
+
+(STABLE-1.4.1)
+
+  ++ New features:
+
+  2012-03-25: Simon Goldschmidt (idea by Mason)
+  * posix/*: added posix-compatibility include files posix/netdb.h and posix/sys/socket.h
+    which are a simple wrapper to the correct lwIP include files.
+ 
+  2012-01-16: Simon Goldschmidt
+  * opt.h, icmp.c: Added option CHECKSUM_GEN_ICMP
+
+  2011-12-17: Simon Goldschmidt
+  * ip.h: implemented API functions to access so_options of IP pcbs (UDP, TCP, RAW)
+    (fixes bug #35061)
+
+  2011-09-27: Simon Goldschmidt
+  * opt.h, tcp.c, tcp_in.c: Implemented limiting data on ooseq queue (task #9989)
+    (define TCP_OOSEQ_MAX_BYTES / TCP_OOSEQ_MAX_PBUFS in lwipopts.h)
+
+  2011-09-21: Simon Goldschmidt
+  * opt.h, api.h, api_lib.c, api_msg.h/.c, sockets.c: Implemented timeout on
+    send (TCP only, bug #33820)
+
+  2011-09-21: Simon Goldschmidt
+  * init.c: Converted runtime-sanity-checks into compile-time checks that can
+    be disabled (since runtime checks can often not be seen on embedded targets)
+
+  2011-09-11: Simon Goldschmidt
+  * ppp.h, ppp_impl.h: splitted ppp.h to an internal and external header file
+    to get a clear separation of which functions an application or port may use
+    (task #11281)
+
+ 2011-09-11: Simon Goldschmidt
+  * opt.h, tcp_impl.h, tcp.c, udp.h/.c: Added a config option to randomize
+    initial local TCP/UDP ports (so that different port ranges are used after
+    a reboot; bug #33818; this one added tcp_init/udp_init functions again)
+
+  2011-09-03: Simon Goldschmidt
+  * dhcp.c: DHCP uses LWIP_RAND() for xid's (bug #30302)
+
+  2011-08-24: Simon Goldschmidt
+  * opt.h, netif.h/.c: added netif remove callback (bug #32397)
+
+  2011-07-26: Simon Goldschmidt
+  * etharp.c: ETHARP_SUPPORT_VLAN: add support for an external VLAN filter
+    function instead of only checking for one VLAN (define ETHARP_VLAN_CHECK_FN)
+
+  2011-07-21: Simon Goldschmidt (patch by hanhui)
+  * ip4.c, etharp.c, pbuf.h: bug #33634 ip_forward() have a faulty behaviour:
+    Added pbuf flags to mark incoming packets as link-layer broadcast/multicast.
+    Also added code to allow ip_forward() to forward non-broadcast packets to
+    the input netif (set IP_FORWARD_ALLOW_TX_ON_RX_NETIF==1).
+
+  2011-06-26: Simon Goldschmidt (patch by Cameron Gutman)
+  * tcp.c, tcp_out.c: bug #33604: added some more asserts to check that
+    pcb->state != LISTEN
+
+   2011-05-14: Simon Goldschmidt (patch by St�phane Lesage)
+  * tcpip.c/.h: patch #7449 allow tcpip callback from interrupt with static
+    memory message
+
+
+ ++ Bugfixes:
+
+  2012-09-26: Simon Goldschmidt
+  * api_msg.c: fixed bug #37405 'err_tcp()' uses already freed 'netconn' object
+
+  2012-09-26: patch by Henrik Persson
+  * dhcp.c: patch #7843 Fix corner case with dhcp timeouts
+
+  2012-09-26: patch by Henrik Persson
+  * dhcp.c: patch #7840 Segfault in dhcp_parse_reply if no end marker in dhcp packet
+
+  2012-08-22: Simon Goldschmidt
+  * memp.c: fixed bug #37166: memp_sanity check loops itself
+
+  2012-05-08: Simon Goldschmidt
+  * tcp_out.c: fixed bug: #36380 unsent_oversize mismatch in 1.4.1RC1 (this was
+    a debug-check issue only)
+
+  2012-03-27: Simon Goldschmidt
+  * vj.c: fixed bug #35756 header length calculation problem in ppp/vj.c
+
+  2012-03-27: Simon Goldschmidt (patch by Mason)
+  * tcp_out.c: fixed bug #35945: SYN packet should provide the recv MSS not the
+    send MSS
+
+  2012-03-22: Simon Goldschmidt
+  * ip4.c: fixed bug #35927: missing refragmentaion in ip_forward
+ 
+  2012-03-20: Simon Goldschmidt (patch by Mason)
+  * netdb.c: fixed bug #35907: lwip_gethostbyname_r returns an invalid h_addr_list
+ 
+  2012-03-12: Simon Goldschmidt (patch by Bostjan Meglic)
+  * ppp.c: fixed bug #35809: PPP GetMask(): Compiler warning on big endian,
+    possible bug on little endian system
+
+  2012-02-23: Simon Goldschmidt
+  * etharp.c: fixed bug #35595: Impossible to send broadcast without a gateway
+    (introduced when fixing bug# 33551)
+
+  2012-02-16: Simon Goldschmidt
+  * ppp.c: fixed pbuf leak when PPP session is aborted through pppSigHUP()
+    (bug #35541: PPP Memory Leak)
+
+  2012-02-16: Simon Goldschmidt
+  * etharp.c: fixed bug #35531: Impossible to send multicast without a gateway
+    (introduced when fixing bug# 33551)
+
+  2012-02-16: Simon Goldschmidt (patch by St�phane Lesage)
+  * msg_in.c, msg_out.c: fixed bug #35536 SNMP: error too big response is malformed
+
+  2012-02-15: Simon Goldschmidt
+  * init.c: fixed bug #35537: MEMP_NUM_* sanity checks should be disabled with
+    MEMP_MEM_MALLOC==1
+
+  2012-02-12: Simon Goldschmidt
+  * tcp.h, tcp_in.c, tcp_out.c: partly fixed bug #25882: TCP hangs on
+    MSS > pcb->snd_wnd (by not creating segments bigger than half the window)
+
+  2012-02-11: Simon Goldschmidt
+  * tcp.c: fixed bug #35435: No pcb state check before adding it to time-wait
+    queue while closing
+
+  2012-01-22: Simon Goldschmidt
+  * tcp.c, tcp_in.c: fixed bug #35305: pcb may be freed too early on shutdown(WR)
+
+  2012-01-21: Simon Goldschmidt
+  * tcp.c: fixed bug #34636: FIN_WAIT_2 - Incorrect shutdown of TCP pcb
+
+  2012-01-20: Simon Goldschmidt
+  * dhcp.c: fixed bug #35151: DHCP asserts on incoming option lengths
+
+ 2012-01-20: Simon Goldschmidt
+  * pbuf.c: fixed bug #35291: NULL pointer in pbuf_copy
+
+  2011-11-25: Simon Goldschmidt
+  * tcp.h/.c, tcp_impl.h, tcp_in.c: fixed bug #31177: tcp timers can corrupt
+    tcp_active_pcbs in some cases
+
+  2011-11-23: Simon Goldschmidt
+  * sys.c: fixed bug #34884: sys_msleep() body needs to be surrounded with
+    '#ifndef sys_msleep'
+
+  2011-11-22: Simon Goldschmidt
+  * netif.c, etharp.h/.c: fixed bug #34684: Clear the arp table cache when
+    netif is brought down
+
+  2011-10-28: Simon Goldschmidt
+  * tcp_in.c: fixed bug #34638: Dead code in tcp_receive - pcb->dupacks
+
+  2011-10-23: Simon Goldschmidt
+  * mem.c: fixed bug #34429: possible memory corruption with
+    LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT set to 1
+
+  2011-10-18: Simon Goldschmidt
+  * arch.h, netdb.c: fixed bug #34592: lwip_gethostbyname_r uses nonstandard
+    error value
+
+  2011-10-18: Simon Goldschmidt
+  * opt.h: fixed default values of TCP_SNDLOWAT and TCP_SNDQUEUELOWAT for small
+    windows (bug #34176 select after non-blocking send times out)
+
+  2011-10-18: Simon Goldschmidt
+  * tcp_impl.h, tcp_out.c: fixed bug #34587: TCP_BUILD_MSS_OPTION doesn't
+    consider netif->mtu, causes slow network
+
+  2011-10-18: Simon Goldschmidt
+  * sockets.c: fixed bug #34581 missing parentheses in udplite sockets code
+
+  2011-10-18: Simon Goldschmidt
+  * sockets.h: fixed bug #34580 fcntl() is missing in LWIP_COMPAT_SOCKETS
+
+  2011-10-17: Simon Goldschmidt
+  * api_msg.c: fixed bug #34569: shutdown(SHUT_WR) crashes netconn/socket api
+
+  2011-10-13: Simon Goldschmidt
+  * tcp_in.c, tcp_out.c: fixed bug #34517 (persist timer is started although no
+    zero window is received) by starting the persist timer when a zero window is
+    received, not when we have more data queued for sending than fits into the
+    window
+
+  2011-10-13: Simon Goldschmidt
+  * def.h, timers.c: fixed bug #34541: LWIP_U32_DIFF is unnecessarily complex
+
+  2011-10-13: Simon Goldschmidt
+  * sockets.c, api_lib.c: fixed bug #34540: compiler error when CORE_LOCKING is
+    used and not all protocols are enabled
+
+  2011-10-12: Simon Goldschmidt
+  * pbuf.c: fixed bug #34534: Error in sending fragmented IP if MEM_ALIGNMENT > 4
+
+  2011-10-09: Simon Goldschmidt
+  * tcp_out.c: fixed bug #34426: tcp_zero_window_probe() transmits incorrect
+    byte value when pcb->unacked != NULL
+
+  2011-10-09: Simon Goldschmidt
+  * ip4.c: fixed bug #34447 LWIP_IP_ACCEPT_UDP_PORT(dst_port) wrong
+
+  2011-09-27: Simon Goldschmidt
+  * tcp_in.c, tcp_out.c: Reset pcb->unsent_oversize in 2 more places...
+
+  2011-09-27: Simon Goldschmidt
+  * tcp_in.c: fixed bug #28288: Data after FIN in oos queue
+
+  2011-09-27: Simon Goldschmidt
+  * dhcp.c: fixed bug #34406 dhcp_option_hostname() can overflow the pbuf
+
+  2011-09-24: Simon Goldschmidt
+  * mem.h: fixed bug #34377 MEM_SIZE_F is not defined if MEM_LIBC_MALLOC==1
+
+  2011-09-23: Simon Goldschmidt
+  * pbuf.h, tcp.c, tcp_in.c: fixed bug #33871: rejecting TCP_EVENT_RECV() for
+    the last packet including FIN can lose data
+
+  2011-09-22: Simon Goldschmidt
+  * tcp_impl.h: fixed bug #34355: nagle does not take snd_buf/snd_queuelen into
+    account
+
+  2011-09-21: Simon Goldschmidt
+  * opt.h: fixed default value of TCP_SND_BUF to not violate the sanity checks
+    in init.c
+
+  2011-09-20: Simon Goldschmidt
+  * timers.c: fixed bug #34337 (possible NULL pointer in sys_check_timeouts)
+
+  2011-09-11: Simon Goldschmidt
+  * tcp_out.c: use pcb->mss instead of TCP_MSS for preallocate mss-sized pbufs
+    (bug #34019)
+
+  2011-09-09: Simon Goldschmidt
+  * udp.c: fixed bug #34072: UDP broadcast is received from wrong UDP pcb if
+    udp port matches
+
+  2011-09-03: Simon Goldschmidt
+  * tcp_in.c: fixed bug #33952 PUSH flag in incoming packet is lost when packet
+    is aggregated and sent to application
+
+  2011-09-01: Simon Goldschmidt
+  * opt.h: fixed bug #31809 LWIP_EVENT_API in opts.h is inconsistent compared
+    to other options
+
+  2011-09-01: Simon Goldschmidt
+  * tcp_in.c: fixed bug #34111 RST for ACK to listening pcb has wrong seqno
+
+  2011-08-24: Simon Goldschmidt
+  * api_msg.c, sockets.c: fixed bug #33956 Wrong error returned when calling
+    accept() on UDP connections
+
+  2011-08-24: Simon Goldschmidt
+  * sockets.h: fixed bug #34057 socklen_t should be a typedef
+
+  2011-08-24: Simon Goldschmidt
+  * pbuf.c: fixed bug #34112 Odd check in pbuf_alloced_custom (typo)
+
+  2011-08-24: Simon Goldschmidt
+  * dhcp.c: fixed bug #34122 dhcp: hostname can overflow
+
+  2011-08-24: Simon Goldschmidt
+  * netif.c: fixed bug #34121 netif_add/netif_set_ipaddr fail on NULL ipaddr
+
+  2011-08-22: Simon Goldschmidt
+  * tcp_out.c: fixed bug #33962 TF_FIN not always set after FIN is sent. (This
+    merely prevents nagle from not transmitting fast after closing.)
+
+  2011-07-22: Simon Goldschmidt
+  * api_lib.c, api_msg.c, sockets.c, api.h: fixed bug #31084 (socket API returns
+    always EMSGSIZE on non-blocking sockets if data size > send buffers) -> now
+    lwip_send() sends as much as possible for non-blocking sockets
+
+  2011-07-22: Simon Goldschmidt
+  * pbuf.c/.h, timers.c: freeing ooseq pbufs when the pbuf pool is empty implemented
+    for NO_SYS==1: when not using sys_check_timeouts(), call PBUF_CHECK_FREE_OOSEQ()
+    at regular intervals from main level.
+
+  2011-07-21: Simon Goldschmidt
+  * etharp.c: fixed bug #33551 (ARP entries may time out although in use) by
+    sending an ARP request when an ARP entry is used in the last minute before
+    it would time out.
+
+  2011-07-04: Simon Goldschmidt
+  * sys_arch.txt: Fixed documentation after changing sys arch prototypes for 1.4.0.
+
+  2011-06-26: Simon Goldschmidt
+  * tcp.c: fixed bug #31723 (tcp_kill_prio() kills pcbs with the same prio) by
+    updating its documentation only.
+
+ 2011-06-26: Simon Goldschmidt
+  * mem.c: fixed bug #33545: With MEM_USE_POOLS==1, mem_malloc can return an
+    unaligned pointer.
+
+  2011-06-26: Simon Goldschmidt
+  * mem.c: fixed bug #33544 "warning in mem.c in lwip 1.4.0 with NO_SYS=1"
+
+   2011-05-25: Simon Goldschmidt
+  * tcp.c: fixed bug #33398 (pointless conversion when checking TCP port range)
+
+
+
+(STABLE-1.4.0)
+
+  ++ New features:
+
+  2011-03-27: Simon Goldschmidt
+  * tcp_impl.h, tcp_in.c, tcp_out.c: Removed 'dataptr' from 'struct tcp_seg' and
+    calculate it in tcp_zero_window_probe (the only place where it was used).
+
+  2010-11-21: Simon Goldschmidt
+  * dhcp.c/.h: Added a function to deallocate the struct dhcp from a netif
+    (fixes bug #31525).
+
+  2010-07-12: Simon Goldschmidt (patch by Stephane Lesage)
+  * ip.c, udp.c/.h, pbuf.h, sockets.c: task #10495: Added support for
+    IP_MULTICAST_LOOP at socket- and raw-API level.
+
+  2010-06-16: Simon Goldschmidt
+  * ip.c: Added an optional define (LWIP_IP_ACCEPT_UDP_PORT) that can allow
+    link-layer-addressed UDP traffic to be received while a netif is down (just
+    like DHCP during configuration)
+
+  2010-05-22: Simon Goldschmidt
+  * many many files: bug #27352: removed packing from ip_addr_t, the packed
+    version is now only used in protocol headers. Added global storage for
+    current src/dest IP address while in input functions.
+
+  2010-05-16: Simon Goldschmidt
+  * def.h: task #10391: Add preprocessor-macros for compile-time htonl
+    calculation (and use them throughout the stack where applicable)
+
+  2010-05-16: Simon Goldschmidt
+  * opt.h, memp_std.h, memp.c, ppp_oe.h/.c: PPPoE now uses its own MEMP pool
+    instead of the heap (moved struct pppoe_softc from ppp_oe.c to ppp_oe.h)
+
+  2010-05-16: Simon Goldschmidt
+  * opt.h, memp_std.h, dns.h/.c: DNS_LOCAL_HOSTLIST_IS_DYNAMIC uses its own
+    MEMP pool instead of the heap
+
+  2010-05-13: Simon Goldschmidt
+  * tcp.c, udp.c: task #6995: Implement SO_REUSEADDR (correctly), added
+    new option SO_REUSE_RXTOALL to pass received UDP broadcast/multicast
+    packets to more than one pcb.
+
+  2010-05-02: Simon Goldschmidt
+  * netbuf.h/.c, sockets.c, api_msg.c: use checksum-on-copy for sending
+    UDP data for LWIP_NETIF_TX_SINGLE_PBUF==1
+
+  2010-04-30: Simon Goldschmidt
+  * udp.h/.c, pbuf.h/.c: task #6849: added udp_send(_to/_if) functions that
+    take a precalculated checksum, added pbuf_fill_chksum() to copy data
+    into a pbuf and at the same time calculating the checksum for that data
+
+  2010-04-29: Simon Goldschmidt
+  * ip_addr.h, etharp.h/.c, autoip.c: Create overridable macros for copying
+    2-byte-aligned IP addresses and MAC addresses
+
+  2010-04-28: Patch by Bill Auerbach
+  * ip.c: Inline generating IP checksum to save a function call
+
+  2010-04-14: Simon Goldschmidt
+  * tcpip.h/.c, timers.c: Added an overridable define to get informed when the
+    tcpip_thread processes messages or timeouts to implement a watchdog.
+
+  2010-03-28: Simon Goldschmidt
+  * ip_frag.c: create a new (contiguous) PBUF_RAM for every outgoing
+    fragment if LWIP_NETIF_TX_SINGLE_PBUF==1
+
+  2010-03-27: Simon Goldschmidt
+  * etharp.c: Speedup TX by moving code from find_entry to etharp_output/
+    etharp_query to prevent unnecessary function calls (inspired by
+    patch #7135).
+
+  2010-03-20: Simon Goldschmidt
+  * opt.h, tcpip.c/.h: Added an option to disable tcpip_(un)timeout code
+    since the linker cannot do this automatically to save space.
+
+  2010-03-20: Simon Goldschmidt
+  * opt.h, etharp.c/.h: Added support for static ARP table entries
+
+  2010-03-14: Simon Goldschmidt
+  * tcp_impl.h, tcp_out.c, inet_chksum.h/.c: task #6849: Calculate checksum
+    when creating TCP segments, not when (re-)transmitting them.
+
+  2010-03-07: Simon Goldschmidt
+  * sockets.c: bug #28775 (select/event_callback: only check select_cb_list
+    on change) plus use SYS_LIGHTWEIGHT_PROT to protect the select code.
+    This should speed up receiving data on sockets as the select code in
+    event_callback is only executed when select is waiting.
+
+  2010-03-06: Simon Goldschmidt
+  * tcp_out.c: task #7013 (Create option to have all packets delivered to
+    netif->output in one piece): Always copy to try to create single pbufs
+    in tcp_write.
+
+  2010-03-06: Simon Goldschmidt
+  * api.h, api_lib.c, sockets.c: task #10167 (sockets: speed up TCP recv
+    by not allocating a netbuf): added function netconn_recv_tcp_pbuf()
+    for tcp netconns to receive pbufs, not netbufs; use that function
+    for tcp sockets.
+
+  2010-03-05: Jakob Ole Stoklundsen / Simon Goldschmidt
+  * opt.h, tcp.h, tcp_impl.h, tcp.c, tcp_in.c, tcp_out.c: task #7040:
+    Work on tcp_enqueue: Don't waste memory when chaining segments,
+    added option TCP_OVERSIZE to prevent creating many small pbufs when
+    calling tcp_write with many small blocks of data. Instead, pbufs are
+    allocated larger than needed and the space is used for later calls to
+    tcp_write.
+
+  2010-02-21: Simon Goldschmidt
+  * stats.c/.h: Added const char* name to mem- and memp-stats for easier
+    debugging.
+
+  2010-02-21: Simon Goldschmidt
+  * tcp.h (and usages), added tcp_impl.h: Splitted API and internal
+    implementation of tcp to make API usage cleare to application programmers
+
+  2010-02-14: Simon Goldschmidt/Stephane Lesage
+  * ip_addr.h: Improved some defines working on ip addresses, added faster
+    macro to copy addresses that cannot be NULL
+
+  2010-02-13: Simon Goldschmidt
+  * api.h, api_lib.c, api_msg.c, sockets.c: task #7865 (implement non-
+    blocking send operation)
+
+  2010-02-12: Simon Goldschmidt
+  * sockets.c/.h: Added a minimal version of posix fctl() to have a
+    standardised way to set O_NONBLOCK for nonblocking sockets.
+
+  2010-02-12: Simon Goldschmidt
+  * dhcp.c/.h, autoip.c/.h: task #10139 (Prefer statically allocated
+    memory): added autoip_set_struct() and dhcp_set_struct() to let autoip
+    and dhcp work with user-allocated structs instead of callin mem_malloc
+
+  2010-02-12: Simon Goldschmidt/Jeff Barber
+  * tcp.c/h: patch #6865 (SO_REUSEADDR for TCP): if pcb.so_options has
+    SOF_REUSEADDR set, allow binding to endpoint in TIME_WAIT
+
+  2010-02-12: Simon Goldschmidt
+  * sys layer: task #10139 (Prefer statically allocated memory): converted
+    mbox and semaphore functions to take pointers to sys_mbox_t/sys_sem_t;
+    converted sys_mbox_new/sys_sem_new to take pointers and return err_t;
+    task #7212: Add Mutex concept in sys_arch (define LWIP_COMPAT_MUTEX
+    to let sys.h use binary semaphores instead of mutexes - as before)
+
+  2010-02-09: Simon Goldschmidt (Simon Kallweit)
+  * timers.c/.h: Added function sys_restart_timeouts() from patch #7085
+    (Restart system timeout handling)
+
+  2010-02-09: Simon Goldschmidt
+  * netif.c/.h, removed loopif.c/.h: task #10153 (Integrate loopif into
+    netif.c) - loopif does not have to be created by the port any more,
+    just define LWIP_HAVE_LOOPIF to 1.
+
+  2010-02-08: Simon Goldschmidt
+  * inet.h, ip_addr.c/.h: Added reentrant versions of inet_ntoa/ipaddr_ntoa
+    inet_ntoa_r/ipaddr_ntoa_r
+
+  2010-02-08: Simon Goldschmidt
+  * netif.h: Added netif_s/get_igmp_mac_filter() macros
+
+  2010-02-05: Simon Goldschmidt
+  * netif.h: Added function-like macros to get/set the hostname on a netif
+
+  2010-02-04: Simon Goldschmidt
+  * nearly every file: Replaced struct ip_addr by typedef ip_addr_t to
+    make changing the actual implementation behind the typedef easier.
+
+  2010-02-01: Simon Goldschmidt
+  * opt.h, memp_std.h, dns.h, netdb.c, memp.c: Let netdb use a memp pool
+    for allocating memory when getaddrinfo() is called.
+
+  2010-01-31: Simon Goldschmidt
+  * dhcp.h, dhcp.c: Reworked the code that parses DHCP options: parse
+    them once instead of parsing for every option. This also removes
+    the need for mem_malloc from dhcp_recv and makes it possible to
+    correctly retrieve the BOOTP file.
+
+  2010-01-30: simon Goldschmidt
+  * sockets.c: Use SYS_LIGHTWEIGHT_PROT instead of a semaphore to protect
+    the sockets array.
+
+  2010-01-29: Simon Goldschmidt (patch by Laura Garrett)
+  * api.h, api_msg.c, sockets.c: Added except set support in select
+    (patch #6860)
+
+  2010-01-29: Simon Goldschmidt (patch by Laura Garrett)
+  * api.h, sockets.h, err.h, api_lib.c, api_msg.c, sockets.c, err.c:
+    Add non-blocking support for connect (partly from patch #6860),
+    plus many cleanups in socket & netconn API.
+
+  2010-01-27: Simon Goldschmidt
+  * opt.h, tcp.h, init.c, api_msg.c: Added TCP_SNDQUEUELOWAT corresponding
+    to TCP_SNDLOWAT and added tcp_sndqueuelen() - this fixes bug #28605
+
+  2010-01-26: Simon Goldschmidt
+  * snmp: Use memp pools for snmp instead of the heap; added 4 new pools.
+
+  2010-01-14: Simon Goldschmidt
+  * ppp.c/.h: Fixed bug #27856: PPP: Set netif link- and status-callback
+    by adding ppp_set_netif_statuscallback()/ppp_set_netif_linkcallback()
+
+  2010-01-13: Simon Goldschmidt
+  * mem.c: The heap now may be moved to user-defined memory by defining
+    LWIP_RAM_HEAP_POINTER as a void pointer to that memory's address
+    (patch #6966 and bug #26133)
+
+  2010-01-10: Simon Goldschmidt (Bill Auerbach)
+  * opt.h, memp.c: patch #6822 (Add option to place memory pools in
+    separate arrays)
+
+  2010-01-10: Simon Goldschmidt
+  * init.c, igmp.c: patch #6463 (IGMP - Adding Random Delay): added define
+    LWIP_RAND() for lwip-wide randomization (to be defined in cc.h)
+
+  2009-12-31: Simon Goldschmidt
+  * tcpip.c, init.c, memp.c, sys.c, memp_std.h, sys.h, tcpip.h
+    added timers.c/.h: Separated timer implementation from semaphore/mbox
+    implementation, moved timer implementation to timers.c/.h, timers are
+    now only called from tcpip_thread or by explicitly checking them.
+    (TASK#7235)
+
+  2009-12-27: Simon Goldschmidt
+  * opt.h, etharp.h/.c, init.c, tcpip.c: Added an additional option
+    LWIP_ETHERNET to support ethernet without ARP (necessary for pure PPPoE)
+
+
+  ++ Bugfixes:
+
+  2011-04-20: Simon Goldschmidt
+  * sys_arch.txt: sys_arch_timeouts() is not needed any more.
+
+  2011-04-13: Simon Goldschmidt
+  * tcp.c, udp.c: Fixed bug #33048 (Bad range for IP source port numbers) by
+    using ports in the IANA private/dynamic range (49152 through 65535).
+
+  2011-03-29: Simon Goldschmidt, patch by Emil Lhungdahl:
+  * etharp.h/.c: Fixed broken VLAN support.
+
+  2011-03-27: Simon Goldschmidt
+  * tcp.c: Fixed bug #32926 (TCP_RMV(&tcp_bound_pcbs) is called on unbound tcp
+    pcbs) by checking if the pcb was bound (local_port != 0).
+
+  2011-03-27: Simon Goldschmidt
+  * ppp.c: Fixed bug #32280 (ppp: a pbuf is freed twice)
+
+  2011-03-27: Simon Goldschmidt
+  * sockets.c: Fixed bug #32906: lwip_connect+lwip_send did not work for udp and
+    raw pcbs with LWIP_TCPIP_CORE_LOCKING==1.
+  
+  2011-03-27: Simon Goldschmidt
+  * tcp_out.c: Fixed bug #32820 (Outgoing TCP connections created before route
+    is present never times out) by starting retransmission timer before checking
+    route.
+
+  2011-03-22: Simon Goldschmidt
+  * ppp.c: Fixed bug #32648 (PPP code crashes when terminating a link) by only
+    calling sio_read_abort() if the file descriptor is valid.
+
+  2011-03-14: Simon Goldschmidt
+  * err.h/.c, sockets.c, api_msg.c: fixed bug #31748 (Calling non-blocking connect
+    more than once can render a socket useless) since it mainly involves changing
+    "FATAL" classification of error codes: ERR_USE and ERR_ISCONN just aren't fatal.
+
+  2011-03-13: Simon Goldschmidt
+  * sockets.c: fixed bug #32769 (ESHUTDOWN is linux-specific) by fixing
+    err_to_errno_table (ERR_CLSD: ENOTCONN instead of ESHUTDOWN), ERR_ISCONN:
+    use EALRADY instead of -1
+
+  2011-03-13: Simon Goldschmidt
+  * api_lib.c: netconn_accept: return ERR_ABRT instead of ERR_CLSD if the
+    connection has been aborted by err_tcp (since this is not a normal closing
+    procedure).
+
+  2011-03-13: Simon Goldschmidt
+  * tcp.c: tcp_bind: return ERR_VAL instead of ERR_ISCONN when trying to bind
+    with pcb->state != CLOSED
+
+  2011-02-17: Simon Goldschmidt
+  * rawapi.txt: Fixed bug #32561 tcp_poll argument definition out-of-order in
+    documentation
+
+  2011-02-17: Simon Goldschmidt
+  * many files: Added missing U/UL modifiers to fix 16-bit-arch portability.
+
+  2011-01-24: Simon Goldschmidt
+  * sockets.c: Fixed bug #31741: lwip_select seems to have threading problems
+
+  2010-12-02: Simon Goldschmidt
+  * err.h: Fixed ERR_IS_FATAL so that ERR_WOULDBLOCK is not fatal.
+
+  2010-11-23: Simon Goldschmidt
+  * api.h, api_lib.c, api_msg.c, sockets.c: netconn.recv_avail is only used for
+    LWIP_SO_RCVBUF and ioctl/FIONREAD.
+
+  2010-11-23: Simon Goldschmidt
+  * etharp.c: Fixed bug #31720: ARP-queueing: RFC 1122 recommends to queue at
+    least 1 packet -> ARP_QUEUEING==0 now queues the most recent packet.
+
+  2010-11-23: Simon Goldschmidt
+  * tcp_in.c: Fixed bug #30577: tcp_input: don't discard ACK-only packets after
+    refusing 'refused_data' again.
+  
+  2010-11-22: Simon Goldschmidt
+  * sockets.c: Fixed bug #31590: getsockopt(... SO_ERROR ...) gives EINPROGRESS
+    after a successful nonblocking connection.
+
+  2010-11-22: Simon Goldschmidt
+  * etharp.c: Fixed bug #31722: IP packets sent with an AutoIP source addr
+    must be sent link-local
+
+  2010-11-22: Simon Goldschmidt
+  * timers.c: patch #7329: tcp_timer_needed prototype was ifdef'ed out for
+    LWIP_TIMERS==0
+
+  2010-11-20: Simon Goldschmidt
+  * sockets.c: Fixed bug #31170: lwip_setsockopt() does not set socket number
+
+  2010-11-20: Simon Goldschmidt
+  * sockets.h: Fixed bug #31304: Changed SHUT_RD, SHUT_WR and SHUT_RDWR to
+    resemble other stacks.
+
+  2010-11-20: Simon Goldschmidt
+  * dns.c: Fixed bug #31535: TCP_SND_QUEUELEN must be at least 2 or else
+    no-copy TCP writes will never succeed.
+
+  2010-11-20: Simon Goldschmidt
+  * dns.c: Fixed bug #31701: Error return value from dns_gethostbyname() does
+    not match documentation: return ERR_ARG instead of ERR_VAL if not
+    initialized or wrong argument.
+
+  2010-10-20: Simon Goldschmidt
+  * sockets.h: Fixed bug #31385: sizeof(struct sockaddr) is 30 but should be 16
+
+  2010-10-05: Simon Goldschmidt
+  * dhcp.c: Once again fixed #30038: DHCP/AutoIP cooperation failed when
+    replugging the network cable after an AutoIP address was assigned.
+
+  2010-08-10: Simon Goldschmidt
+  * tcp.c: Fixed bug #30728: tcp_new_port() did not check listen pcbs
+
+  2010-08-03: Simon Goldschmidt
+  * udp.c, raw.c: Don't chain empty pbufs when sending them (fixes bug #30625)
+
+  2010-08-01: Simon Goldschmidt (patch by Greg Renda)
+  * ppp.c: Applied patch #7264 (PPP protocols are rejected incorrectly on big
+    endian architectures)
+  
+  2010-07-28: Simon Goldschmidt
+  * api_lib.c, api_msg.c, sockets.c, mib2.c: Fixed compilation with TCP or UDP
+    disabled.
+  
+  2010-07-27: Simon Goldschmidt
+  * tcp.c: Fixed bug #30565 (tcp_connect() check bound list): that check did no
+    harm but never did anything
+  
+  2010-07-21: Simon Goldschmidt
+  * ip.c: Fixed invalid fix for bug #30402 (CHECKSUM_GEN_IP_INLINE does not
+    add IP options)
+
+  2010-07-16: Kieran Mansley
+  * msg_in.c: Fixed SNMP ASN constant defines to not use ! operator 
+
+  2010-07-10: Simon Goldschmidt
+  * ip.c: Fixed bug #30402: CHECKSUM_GEN_IP_INLINE does not add IP options
+
+  2010-06-30: Simon Goldschmidt
+  * api_msg.c: fixed bug #30300 (shutdown parameter was not initialized in
+    netconn_delete)
+
+  2010-06-28: Kieran Mansley
+  * timers.c remove unportable printing of C function pointers
+
+  2010-06-24: Simon Goldschmidt
+  * init.c, timers.c/.h, opt.h, memp_std.h: From patch #7221: added flag
+    NO_SYS_NO_TIMERS to drop timer support for NO_SYS==1 for easier upgrading
+
+  2010-06-24: Simon Goldschmidt
+  * api(_lib).c/.h, api_msg.c/.h, sockets.c/.h: Fixed bug #10088: Correctly
+    implemented shutdown at socket level.
+
+  2010-06-21: Simon Goldschmidt
+  * pbuf.c/.h, ip_frag.c/.h, opt.h, memp_std.h: Fixed bug #29361 (ip_frag has
+    problems with zero-copy DMA MACs) by adding custom pbufs and implementing
+    custom pbufs that reference other (original) pbufs. Additionally set
+    IP_FRAG_USES_STATIC_BUF=0 as default to be on the safe side.
+
+  2010-06-15: Simon Goldschmidt
+  * dhcp.c: Fixed bug #29970: DHCP endian issue parsing option responses
+
+  2010-06-14: Simon Goldschmidt
+  * autoip.c: Fixed bug #30039: AutoIP does not reuse previous addresses
+
+  2010-06-12: Simon Goldschmidt
+  * dhcp.c: Fixed bug #30038: dhcp_network_changed doesn't reset AUTOIP coop
+    state
+
+  2010-05-17: Simon Goldschmidt
+  * netdb.c: Correctly NULL-terminate h_addr_list
+
+  2010-05-16: Simon Goldschmidt
+  * def.h/.c: changed the semantics of LWIP_PREFIX_BYTEORDER_FUNCS to prevent
+    "symbol already defined" i.e. when linking to winsock
+
+  2010-05-05: Simon Goldschmidt
+  * def.h, timers.c: Fixed bug #29769 (sys_check_timeouts: sys_now() may
+    overflow)
+
+  2010-04-21: Simon Goldschmidt
+  * api_msg.c: Fixed bug #29617 (sometime cause stall on delete listening
+    connection)
+
+  2010-03-28: Luca Ceresoli
+  * ip_addr.c/.h: patch #7143: Add a few missing const qualifiers
+
+  2010-03-27: Luca Ceresoli
+  * mib2.c: patch #7130: remove meaningless const qualifiers
+
+  2010-03-26: Simon Goldschmidt
+  * tcp_out.c: Make LWIP_NETIF_TX_SINGLE_PBUF work for TCP, too
+
+  2010-03-26: Simon Goldschmidt
+  * various files: Fixed compiling with different options disabled (TCP/UDP),
+    triggered by bug #29345; don't allocate acceptmbox if LWIP_TCP is disabled
+
+  2010-03-25: Simon Goldschmidt
+  * sockets.c: Fixed bug #29332: lwip_select() processes readset incorrectly
+
+  2010-03-25: Simon Goldschmidt
+  * tcp_in.c, test_tcp_oos.c: Fixed bug #29080: Correctly handle remote side
+    overrunning our rcv_wnd in ooseq case.
+
+  2010-03-22: Simon Goldschmidt
+  * tcp.c: tcp_listen() did not copy the pcb's prio.
+
+  2010-03-19: Simon Goldschmidt
+  * snmp_msg.c: Fixed bug #29256: SNMP Trap address was not correctly set
+
+  2010-03-14: Simon Goldschmidt
+  * opt.h, etharp.h: Fixed bug #29148 (Incorrect PBUF_POOL_BUFSIZE for ports
+    where ETH_PAD_SIZE > 0) by moving definition of ETH_PAD_SIZE to opt.h
+    and basing PBUF_LINK_HLEN on it.
+
+  2010-03-08: Simon Goldschmidt
+  * netif.c, ipv4/ip.c: task #10241 (AutoIP: don't break existing connections
+    when assiging routable address): when checking incoming packets and
+    aborting existing connection on address change, filter out link-local
+    addresses.
+
+  2010-03-06: Simon Goldschmidt
+  * sockets.c: Fixed LWIP_NETIF_TX_SINGLE_PBUF for LWIP_TCPIP_CORE_LOCKING
+
+  2010-03-06: Simon Goldschmidt
+  * ipv4/ip.c: Don't try to forward link-local addresses
+
+  2010-03-06: Simon Goldschmidt
+  * etharp.c: Fixed bug #29087: etharp: don't send packets for LinkLocal-
+    addresses to gw
+
+  2010-03-05: Simon Goldschmidt
+  * dhcp.c: Fixed bug #29072: Correctly set ciaddr based on message-type
+    and state.
+
+  2010-03-05: Simon Goldschmidt
+  * api_msg.c: Correctly set TCP_WRITE_FLAG_MORE when netconn_write is split
+    into multiple calls to tcp_write.    
+
+  2010-02-21: Simon Goldschmidt
+  * opt.h, mem.h, dns.c: task #10140: Remove DNS_USES_STATIC_BUF (keep
+    the implementation of DNS_USES_STATIC_BUF==1)
+
+  2010-02-20: Simon Goldschmidt
+  * tcp.h, tcp.c, tcp_in.c, tcp_out.c: Task #10088: Correctly implement
+    close() vs. shutdown(). Now the application does not get any more
+    recv callbacks after calling tcp_close(). Added tcp_shutdown().
+
+  2010-02-19: Simon Goldschmidt
+  * mem.c/.h, pbuf.c: Renamed mem_realloc() to mem_trim() to prevent
+    confusion with realloc()
+
+  2010-02-15: Simon Goldschmidt/Stephane Lesage
+  * netif.c/.h: Link status does not depend on LWIP_NETIF_LINK_CALLBACK
+    (fixes bug #28899)
+
+  2010-02-14: Simon Goldschmidt
+  * netif.c: Fixed bug #28877 (Duplicate ARP gratuitous packet with
+    LWIP_NETIF_LINK_CALLBACK set on) by only sending if both link- and
+    admin-status of a netif are up
+
+  2010-02-14: Simon Goldschmidt
+  * opt.h: Disable ETHARP_TRUST_IP_MAC by default since it slows down packet
+    reception and is not really necessary
+
+  2010-02-14: Simon Goldschmidt
+  * etharp.c/.h: Fixed ARP input processing: only add a new entry if a
+    request was directed as us (RFC 826, Packet Reception), otherwise
+    only update existing entries; internalized some functions
+
+  2010-02-14: Simon Goldschmidt
+  * netif.h, etharp.c, tcpip.c: Fixed bug #28183 (ARP and TCP/IP cannot be
+    disabled on netif used for PPPoE) by adding a new netif flag
+    (NETIF_FLAG_ETHERNET) that tells the stack the device is an ethernet
+    device but prevents usage of ARP (so that ethernet_input can be used
+    for PPPoE).
+
+  2010-02-12: Simon Goldschmidt
+  * netif.c: netif_set_link_up/down: only do something if the link state
+    actually changes
+
+  2010-02-12: Simon Goldschmidt/Stephane Lesage
+  * api_msg.c: Fixed bug #28865 (Cannot close socket/netconn in non-blocking
+    connect)
+
+  2010-02-12: Simon Goldschmidt
+  * mem.h: Fixed bug #28866 (mem_realloc function defined in mem.h)
+
+  2010-02-09: Simon Goldschmidt
+  * api_lib.c, api_msg.c, sockets.c, api.h, api_msg.h: Fixed bug #22110
+   (recv() makes receive window update for data that wasn't received by
+    application)
+
+  2010-02-09: Simon Goldschmidt/Stephane Lesage
+  * sockets.c: Fixed bug #28853 (lwip_recvfrom() returns 0 on receive time-out
+    or any netconn_recv() error)
+
+  2010-02-09: Simon Goldschmidt
+  * ppp.c: task #10154 (PPP: Update snmp in/out counters for tx/rx packets)
+
+  2010-02-09: Simon Goldschmidt
+  * netif.c: For loopback packets, adjust the stats- and snmp-counters
+    for the loopback netif.
+
+  2010-02-08: Simon Goldschmidt
+  * igmp.c/.h, ip.h: Moved most defines from igmp.h to igmp.c for clarity
+    since they are not used anywhere else.
+
+  2010-02-08: Simon Goldschmidt (St�phane Lesage)
+  * igmp.c, igmp.h, stats.c, stats.h: Improved IGMP stats
+    (patch from bug #28798)
+
+  2010-02-08: Simon Goldschmidt (St�phane Lesage)
+  * igmp.c: Fixed bug #28798 (Error in "Max Response Time" processing) and
+    another bug when LWIP_RAND() returns zero.
+
+  2010-02-04: Simon Goldschmidt
+  * nearly every file: Use macros defined in ip_addr.h (some of them new)
+    to work with IP addresses (preparation for bug #27352 - Change ip_addr
+    from struct to typedef (u32_t) - and better code).
+
+  2010-01-31: Simon Goldschmidt
+  * netif.c: Don't call the link-callback from netif_set_up/down() since
+    this invalidly retriggers DHCP.
+
+  2010-01-29: Simon Goldschmidt
+  * ip_addr.h, inet.h, def.h, inet.c, def.c, more: Cleanly separate the
+    portability file inet.h and its contents from the stack: moved htonX-
+    functions to def.h (and the new def.c - they are not ipv4 dependent),
+    let inet.h depend on ip_addr.h and not the other way round.
+    This fixes bug #28732.
+
+  2010-01-28: Kieran Mansley
+  * tcp.c: Ensure ssthresh >= 2*MSS
+
+  2010-01-27: Simon Goldschmidt
+  * tcp.h, tcp.c, tcp_in.c: Fixed bug #27871: Calling tcp_abort() in recv
+    callback can lead to accessing unallocated memory. As a consequence,
+    ERR_ABRT means the application has called tcp_abort()!
+
+  2010-01-25: Simon Goldschmidt
+  * snmp_structs.h, msg_in.c: Partly fixed bug #22070 (MIB_OBJECT_WRITE_ONLY
+    not implemented in SNMP): write-only or not-accessible are still
+    returned by getnext (though not by get)
+
+  2010-01-24: Simon Goldschmidt
+  * snmp: Renamed the private mib node from 'private' to 'mib_private' to
+    not use reserved C/C++ keywords
+
+  2010-01-23: Simon Goldschmidt
+  * sockets.c: Fixed bug #28716: select() returns 0 after waiting for less
+    than 1 ms
+
+  2010-01-21: Simon Goldschmidt
+  * tcp.c, api_msg.c: Fixed bug #28651 (tcp_connect: no callbacks called
+    if tcp_enqueue fails) both in raw- and netconn-API
+
+  2010-01-19: Simon Goldschmidt
+  * api_msg.c: Fixed bug #27316: netconn: Possible deadlock in err_tcp
+
+  2010-01-18: Iordan Neshev/Simon Goldschmidt
+  * src/netif/ppp: reorganised PPP sourcecode to 2.3.11 including some
+    bugfix backports from 2.4.x.
+
+  2010-01-18: Simon Goldschmidt
+  * mem.c: Fixed bug #28679: mem_realloc calculates mem_stats wrong
+
+  2010-01-17: Simon Goldschmidt
+  * api_lib.c, api_msg.c, (api_msg.h, api.h, sockets.c, tcpip.c):
+    task #10102: "netconn: clean up conn->err threading issues" by adding
+    error return value to struct api_msg_msg
+
+  2010-01-17: Simon Goldschmidt
+  * api.h, api_lib.c, sockets.c: Changed netconn_recv() and netconn_accept()
+    to return err_t (bugs #27709 and #28087)
+
+  2010-01-14: Simon Goldschmidt
+  * ...: Use typedef for function prototypes throughout the stack.
+
+  2010-01-13: Simon Goldschmidt
+  * api_msg.h/.c, api_lib.c: Fixed bug #26672 (close connection when receive
+    window = 0) by correctly draining recvmbox/acceptmbox
+
+  2010-01-11: Simon Goldschmidt
+  * pap.c: Fixed bug #13315 (PPP PAP authentication can result in
+    erroneous callbacks) by copying the code from recent pppd
+
+  2010-01-10: Simon Goldschmidt
+  * raw.c: Fixed bug #28506 (raw_bind should filter received packets)
+
+  2010-01-10: Simon Goldschmidt
+  * tcp.h/.c: bug #28127 (remove call to tcp_output() from tcp_ack(_now)())
+
+  2010-01-08: Simon Goldschmidt
+  * sockets.c: Fixed bug #28519 (lwip_recvfrom bug with len > 65535)
+
+  2010-01-08: Simon Goldschmidt
+  * dns.c: Copy hostname for DNS_LOCAL_HOSTLIST_IS_DYNAMIC==1 since string
+    passed to dns_local_addhost() might be volatile
+
+  2010-01-07: Simon Goldschmidt
+  * timers.c, tcp.h: Call tcp_timer_needed() with NO_SYS==1, too
+
+  2010-01-06: Simon Goldschmidt
+  * netdb.h: Fixed bug #28496: missing include guards in netdb.h
+
+  2009-12-31: Simon Goldschmidt
+  * many ppp files: Reorganised PPP source code from ucip structure to pppd
+    structure to easily compare our code against the pppd code (around v2.3.1)
+
+  2009-12-27: Simon Goldschmidt
+  * tcp_in.c: Another fix for bug #28241 (ooseq processing) and adapted
+    unit test
+
+
+(STABLE-1.3.2)
+
+  ++ New features:
+
+  2009-10-27 Simon Goldschmidt/Stephan Lesage
+  * netifapi.c/.h: Added netifapi_netif_set_addr()
+
+  2009-10-07 Simon Goldschmidt/Fabian Koch
+  * api_msg.c, netbuf.c/.h, opt.h: patch #6888: Patch for UDP Netbufs to
+    support dest-addr and dest-port (optional: LWIP_NETBUF_RECVINFO)
+
+  2009-08-26 Simon Goldschmidt/Simon Kallweit
+  * slipif.c/.h: bug #26397: SLIP polling support
+
+  2009-08-25 Simon Goldschmidt
+  * opt.h, etharp.h/.c: task #9033: Support IEEE 802.1q tagged frame (VLAN),
+    New configuration options ETHARP_SUPPORT_VLAN and ETHARP_VLAN_CHECK.
+
+  2009-08-25 Simon Goldschmidt
+  * ip_addr.h, netdb.c: patch #6900: added define ip_ntoa(struct ip_addr*)
+
+  2009-08-24 Jakob Stoklund Olesen
+  * autoip.c, dhcp.c, netif.c: patch #6725: Teach AutoIP and DHCP to respond
+    to netif_set_link_up().
+
+  2009-08-23 Simon Goldschmidt
+  * tcp.h/.c: Added function tcp_debug_state_str() to convert a tcp state
+    to a human-readable string.
+
+  ++ Bugfixes:
+
+  2009-12-24: Kieran Mansley
+  * tcp_in.c Apply patches from Oleg Tyshev to improve OOS processing
+    (BUG#28241)
+
+  2009-12-06: Simon Goldschmidt
+  * ppp.h/.c: Fixed bug #27079 (Yet another leak in PPP): outpacket_buf can
+    be statically allocated (like in ucip)
+
+  2009-12-04: Simon Goldschmidt (patch by Ioardan Neshev)
+  * pap.c: patch #6969: PPP: missing PAP authentication UNTIMEOUT
+
+  2009-12-03: Simon Goldschmidt
+  * tcp.h, tcp_in.c, tcp_out.c: Fixed bug #28106: dup ack for fast retransmit
+    could have non-zero length
+
+  2009-12-02: Simon Goldschmidt
+  * tcp_in.c: Fixed bug #27904: TCP sends too many ACKs: delay resetting
+    tcp_input_pcb until after calling the pcb's callbacks
+
+  2009-11-29: Simon Goldschmidt
+  * tcp_in.c: Fixed bug #28054: Two segments with FIN flag on the out-of-
+    sequence queue, also fixed PBUF_POOL leak in the out-of-sequence code
+
+  2009-11-29: Simon Goldschmidt
+  * pbuf.c: Fixed bug #28064: pbuf_alloc(PBUF_POOL) is not thread-safe by
+    queueing a call into tcpip_thread to free ooseq-bufs if the pool is empty
+
+  2009-11-26: Simon Goldschmidt
+  * tcp.h: Fixed bug #28098: Nagle can prevent fast retransmit from sending
+    segment
+
+  2009-11-26: Simon Goldschmidt
+  * tcp.h, sockets.c: Fixed bug #28099: API required to disable Nagle
+    algorithm at PCB level
+
+  2009-11-22: Simon Goldschmidt
+  * tcp_out.c: Fixed bug #27905: FIN isn't combined with data on unsent
+
+  2009-11-22: Simon Goldschmidt (suggested by Bill Auerbach)
+  * tcp.c: tcp_alloc: prevent increasing stats.err for MEMP_TCP_PCB when
+    reusing time-wait pcb
+
+  2009-11-20: Simon Goldschmidt (patch by Albert Bartel)
+  * sockets.c: Fixed bug #28062: Data received directly after accepting
+    does not wake up select
+
+  2009-11-11: Simon Goldschmidt
+  * netdb.h: Fixed bug #27994: incorrect define for freeaddrinfo(addrinfo)
+
+  2009-10-30: Simon Goldschmidt
+  * opt.h: Increased default value for TCP_MSS to 536, updated default
+    value for TCP_WND to 4*TCP_MSS to keep delayed ACK working.
+
+  2009-10-28: Kieran Mansley
+  * tcp_in.c, tcp_out.c, tcp.h: re-work the fast retransmission code
+    to follow algorithm from TCP/IP Illustrated
+
+  2009-10-27: Kieran Mansley
+  * tcp_in.c: fix BUG#27445: grow cwnd with every duplicate ACK
+
+  2009-10-25: Simon Goldschmidt
+  * tcp.h: bug-fix in the TCP_EVENT_RECV macro (has to call tcp_recved if
+    pcb->recv is NULL to keep rcv_wnd correct)
+
+  2009-10-25: Simon Goldschmidt
+  * tcp_in.c: Fixed bug #26251: RST process in TIME_WAIT TCP state
+
+  2009-10-23: Simon Goldschmidt (David Empson)
+  * tcp.c: Fixed bug #27783: Silly window avoidance for small window sizes
+
+  2009-10-21: Simon Goldschmidt
+  * tcp_in.c: Fixed bug #27215: TCP sent() callback gives leading and
+    trailing 1 byte len (SYN/FIN)
+
+  2009-10-21: Simon Goldschmidt
+  * tcp_out.c: Fixed bug #27315: zero window probe and FIN
+
+  2009-10-19: Simon Goldschmidt
+  * dhcp.c/.h: Minor code simplification (don't store received pbuf, change
+    conditional code to assert where applicable), check pbuf length before
+    testing for valid reply
+
+  2009-10-19: Simon Goldschmidt
+  * dhcp.c: Removed most calls to udp_connect since they aren't necessary
+    when using udp_sendto_if() - always stay connected to IP_ADDR_ANY.
+
+  2009-10-16: Simon Goldschmidt
+  * ip.c: Fixed bug #27390: Source IP check in ip_input() causes it to drop
+    valid DHCP packets -> allow 0.0.0.0 as source address when LWIP_DHCP is
+    enabled
+
+  2009-10-15: Simon Goldschmidt (Oleg Tyshev)
+  * tcp_in.c: Fixed bug #27329: dupacks by unidirectional data transmit
+
+  2009-10-15: Simon Goldschmidt
+  * api_lib.c: Fixed bug #27709: conn->err race condition on netconn_recv()
+    timeout
+
+  2009-10-15: Simon Goldschmidt
+  * autoip.c: Fixed bug #27704: autoip starts with wrong address
+    LWIP_AUTOIP_CREATE_SEED_ADDR() returned address in host byte order instead
+    of network byte order
+
+  2009-10-11 Simon Goldschmidt (J�rg Kesten)
+  * tcp_out.c: Fixed bug #27504: tcp_enqueue wrongly concatenates segments
+    which are not consecutive when retransmitting unacked segments
+
+  2009-10-09 Simon Goldschmidt
+  * opt.h: Fixed default values of some stats to only be enabled if used
+    Fixes bug #27338: sys_stats is defined when NO_SYS = 1
+
+  2009-08-30 Simon Goldschmidt
+  * ip.c: Fixed bug bug #27345: "ip_frag() does not use the LWIP_NETIF_LOOPBACK
+    function" by checking for loopback before calling ip_frag
+
+  2009-08-25 Simon Goldschmidt
+  * dhcp.c: fixed invalid dependency to etharp_query if DHCP_DOES_ARP_CHECK==0
+
+  2009-08-23 Simon Goldschmidt
+  * ppp.c: bug #27078: Possible memory leak in pppInit()
+
+  2009-08-23 Simon Goldschmidt
+  * netdb.c, dns.c: bug #26657: DNS, if host name is "localhost", result
+    is error.
+
+  2009-08-23 Simon Goldschmidt
+  * opt.h, init.c: bug #26649: TCP fails when TCP_MSS > TCP_SND_BUF
+    Fixed wrong parenthesis, added check in init.c
+
+  2009-08-23 Simon Goldschmidt
+  * ppp.c: bug #27266: wait-state debug message in pppMain occurs every ms
+
+  2009-08-23 Simon Goldschmidt
+  * many ppp files: bug #27267: Added include to string.h where needed
+
+  2009-08-23 Simon Goldschmidt
+  * tcp.h: patch #6843: tcp.h macro optimization patch (for little endian)
+
+
+(STABLE-1.3.1)
+
+  ++ New features:
+
+  2009-05-10 Simon Goldschmidt
+  * opt.h, sockets.c, pbuf.c, netbuf.h, pbuf.h: task #7013: Added option
+    LWIP_NETIF_TX_SINGLE_PBUF to try to create transmit packets from only
+    one pbuf to help MACs that don't support scatter-gather DMA.
+
+  2009-05-09 Simon Goldschmidt
+  * icmp.h, icmp.c: Shrinked ICMP code, added option to NOT check icoming
+    ECHO pbuf for size (just use it): LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN
+
+  2009-05-05 Simon Goldschmidt, Jakob Stoklund Olesen
+  * ip.h, ip.c: Added ip_current_netif() & ip_current_header() to receive
+    extended info about the currently received packet.
+
+  2009-04-27 Simon Goldschmidt
+  * sys.h: Made SYS_LIGHTWEIGHT_PROT and sys_now() work with NO_SYS=1
+
+  2009-04-25 Simon Goldschmidt
+  * mem.c, opt.h: Added option MEM_USE_POOLS_TRY_BIGGER_POOL to try the next
+    bigger malloc pool if one is empty (only usable with MEM_USE_POOLS).
+
+  2009-04-21 Simon Goldschmidt
+  * dns.c, init.c, dns.h, opt.h: task #7507, patch #6786: DNS supports static
+    hosts table. New configuration options DNS_LOCAL_HOSTLIST and
+    DNS_LOCAL_HOSTLIST_IS_DYNAMIC. Also, DNS_LOOKUP_LOCAL_EXTERN() can be defined
+    as an external function for lookup.
+
+  2009-04-15 Simon Goldschmidt
+  * dhcp.c: patch #6763: Global DHCP XID can be redefined to something more unique
+
+  2009-03-31 Kieran Mansley
+  * tcp.c, tcp_out.c, tcp_in.c, sys.h, tcp.h, opts.h: add support for
+    TCP timestamp options, off by default.  Rework tcp_enqueue() to
+    take option flags rather than specified option data
+
+  2009-02-18 Simon Goldschmidt
+  * cc.h: Added printf formatter for size_t: SZT_F
+
+  2009-02-16 Simon Goldschmidt (patch by Rishi Khan)
+  * icmp.c, opt.h: patch #6539: (configurable) response to broadcast- and multicast
+    pings
+
+  2009-02-12 Simon Goldschmidt
+  * init.h: Added LWIP_VERSION to get the current version of the stack
+
+  2009-02-11 Simon Goldschmidt (suggested by Gottfried Spitaler)
+  * opt.h, memp.h/.c: added MEMP_MEM_MALLOC to use mem_malloc/mem_free instead
+    of the pool allocator (can save code size with MEM_LIBC_MALLOC if libc-malloc
+    is otherwise used)
+
+  2009-01-28 Jonathan Larmour (suggested by Bill Bauerbach)
+  * ipv4/inet_chksum.c, ipv4/lwip/inet_chksum.h: inet_chksum_pseudo_partial()
+  is only used by UDPLITE at present, so conditionalise it.
+
+  2008-12-03 Simon Goldschmidt (base on patch from Luca Ceresoli)
+  * autoip.c: checked in (slightly modified) patch #6683: Customizable AUTOIP
+    "seed" address. This should reduce AUTOIP conflicts if
+    LWIP_AUTOIP_CREATE_SEED_ADDR is overridden.
+
+  2008-10-02 Jonathan Larmour and Rishi Khan
+  * sockets.c (lwip_accept): Return EWOULDBLOCK if would block on non-blocking
+    socket.
+
+  2008-06-30 Simon Goldschmidt
+  * mem.c, opt.h, stats.h: fixed bug #21433: Calling mem_free/pbuf_free from
+    interrupt context isn't safe: LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT allows
+    mem_free to run between mem_malloc iterations. Added illegal counter for
+    mem stats.
+
+  2008-06-27 Simon Goldschmidt
+  * stats.h/.c, some other files: patch #6483: stats module improvement:
+    Added defines to display each module's statistic individually, added stats
+    defines for MEM, MEMP and SYS modules, removed (unused) rexmit counter.
+
+  2008-06-17 Simon Goldschmidt
+  * err.h: patch #6459: Made err_t overridable to use a more efficient type
+    (define LWIP_ERR_T in cc.h)
+
+  2008-06-17 Simon Goldschmidt
+  * slipif.c: patch #6480: Added a configuration option for slipif for symmetry
+    to loopif
+
+  2008-06-17 Simon Goldschmidt (patch by Luca Ceresoli)
+  * netif.c, loopif.c, ip.c, netif.h, loopif.h, opt.h: Checked in slightly
+    modified version of patch # 6370: Moved loopif code to netif.c so that
+    loopback traffic is supported on all netifs (all local IPs).
+    Added option to limit loopback packets for each netifs.
+
+
+  ++ Bugfixes:
+  2009-08-12 Kieran Mansley
+  * tcp_in.c, tcp.c: Fix bug #27209: handle trimming of segments when
+    out of window or out of order properly
+
+  2009-08-12 Kieran Mansley
+  * tcp_in.c: Fix bug #27199: use snd_wl2 instead of snd_wl1
+
+  2009-07-28 Simon Goldschmidt
+  * mem.h: Fixed bug #27105: "realloc() cannot replace mem_realloc()"s
+
+  2009-07-27 Kieran Mansley
+  * api.h api_msg.h netdb.h sockets.h: add missing #include directives
+
+  2009-07-09 Kieran Mansley
+  * api_msg.c, sockets.c, api.h: BUG23240 use signed counters for
+    recv_avail and don't increment counters until message successfully
+    sent to mbox
+
+  2009-06-25 Kieran Mansley
+  * api_msg.c api.h: BUG26722: initialise netconn write variables 
+    in netconn_alloc
+
+  2009-06-25 Kieran Mansley
+  * tcp.h: BUG26879: set ret value in TCP_EVENT macros when function is not set
+
+  2009-06-25 Kieran Mansley
+  * tcp.c, tcp_in.c, tcp_out.c, tcp.h: BUG26301 and BUG26267: correct
+    simultaneous close behaviour, and make snd_nxt have the same meaning 
+    as in the RFCs.
+
+  2009-05-12 Simon Goldschmidt
+  * etharp.h, etharp.c, netif.c: fixed bug #26507: "Gratuitous ARP depends on
+    arp_table / uses etharp_query" by adding etharp_gratuitous()
+
+  2009-05-12 Simon Goldschmidt
+  * ip.h, ip.c, igmp.c: bug #26487: Added ip_output_if_opt that can add IP options
+    to the IP header (used by igmp_ip_output_if)
+
+  2009-05-06 Simon Goldschmidt
+  * inet_chksum.c: On little endian architectures, use LWIP_PLATFORM_HTONS (if
+    defined) for SWAP_BYTES_IN_WORD to speed up checksumming.
+
+  2009-05-05 Simon Goldschmidt
+  * sockets.c: bug #26405: Prematurely released semaphore causes lwip_select()
+    to crash
+
+  2009-05-04 Simon Goldschmidt
+  * init.c: snmp was not initialized in lwip_init()
+
+  2009-05-04 Fr�d�ric Bernon
+  * dhcp.c, netbios.c: Changes if IP_SOF_BROADCAST is enabled.
+
+  2009-05-03 Simon Goldschmidt
+  * tcp.h: bug #26349: Nagle algorithm doesn't send although segment is full
+    (and unsent->next == NULL)
+
+  2009-05-02 Simon Goldschmidt
+  * tcpip.h, tcpip.c: fixed tcpip_untimeout (does not need the time, broken after
+    1.3.0 in CVS only) - fixes compilation of ppp_oe.c
+
+  2009-05-02 Simon Goldschmidt
+  * msg_in.c: fixed bug #25636: SNMPSET value is ignored for integer fields
+
+  2009-05-01 Simon Goldschmidt
+  * pap.c: bug #21680: PPP upap_rauthnak() drops legal NAK packets
+
+  2009-05-01 Simon Goldschmidt
+  * ppp.c: bug #24228: Memory corruption with PPP and DHCP
+
+  2009-04-29 Fr�d�ric Bernon
+  * raw.c, udp.c, init.c, opt.h, ip.h, sockets.h: bug #26309: Implement the
+    SO(F)_BROADCAST filter for all API layers. Avoid the unindented reception
+    of broadcast packets even when this option wasn't set. Port maintainers
+    which want to enable this filter have to set IP_SOF_BROADCAST=1 in opt.h.
+    If you want this option also filter broadcast on recv operations, you also
+    have to set IP_SOF_BROADCAST_RECV=1 in opt.h.
+
+  2009-04-28 Simon Goldschmidt, Jakob Stoklund Olesen
+  * dhcp.c: patch #6721, bugs #25575, #25576: Some small fixes to DHCP and
+    DHCP/AUTOIP cooperation
+
+  2009-04-25 Simon Goldschmidt, Oleg Tyshev
+  * tcp_out.c: bug #24212: Deadlocked tcp_retransmit due to exceeded pcb->cwnd
+    Fixed by sorting the unsent and unacked queues (segments are inserted at the
+    right place in tcp_output and tcp_rexmit).
+
+  2009-04-25 Simon Goldschmidt
+  * memp.c, mem.c, memp.h, mem_std.h: bug #26213 "Problem with memory allocation
+    when debugging": memp_sizes contained the wrong sizes (including sanity
+    regions); memp pools for MEM_USE_POOLS were too small
+
+  2009-04-24 Simon Goldschmidt, Fr�d�ric Bernon
+  * inet.c: patch #6765: Fix a small problem with the last changes (incorrect
+    behavior, with with ip address string not ended by a '\0', a space or a
+    end of line)
+
+  2009-04-19 Simon Goldschmidt
+  * rawapi.txt: Fixed bug #26069: Corrected documentation: if tcp_connect fails,
+    pcb->err is called, not pcb->connected (with an error code).
+
+  2009-04-19 Simon Goldschmidt
+  * tcp_out.c: Fixed bug #26236: "TCP options (timestamp) don't work with
+    no-copy-tcpwrite": deallocate option data, only concat segments with same flags
+
+  2009-04-19 Simon Goldschmidt
+  * tcp_out.c: Fixed bug #25094: "Zero-length pbuf" (options are now allocated
+    in the header pbuf, not the data pbuf)
+
+  2009-04-18 Simon Goldschmidt
+  * api_msg.c: fixed bug #25695: Segmentation fault in do_writemore()
+
+  2009-04-15 Simon Goldschmidt
+  * sockets.c: tried to fix bug #23559: lwip_recvfrom problem with tcp
+
+  2009-04-15 Simon Goldschmidt
+  * dhcp.c: task #9192: mem_free of dhcp->options_in and dhcp->msg_in
+
+  2009-04-15 Simon Goldschmidt
+  * ip.c, ip6.c, tcp_out.c, ip.h: patch #6808: Add a utility function
+    ip_hinted_output() (for smaller code mainly)
+
+  2009-04-15 Simon Goldschmidt
+  * inet.c: patch #6765: Supporting new line characters in inet_aton()
+
+  2009-04-15 Simon Goldschmidt
+  * dhcp.c: patch #6764: DHCP rebind and renew did not send hostnam option;
+    Converted constant OPTION_MAX_MSG_SIZE to netif->mtu, check if netif->mtu
+    is big enough in dhcp_start
+
+  2009-04-15 Simon Goldschmidt
+  * netbuf.c: bug #26027: netbuf_chain resulted in pbuf memory leak
+
+  2009-04-15 Simon Goldschmidt
+  * sockets.c, ppp.c: bug #25763: corrected 4 occurrences of SMEMCPY to MEMCPY
+
+  2009-04-15 Simon Goldschmidt
+  * sockets.c: bug #26121: set_errno can be overridden
+
+  2009-04-09 Kieran Mansley (patch from Luca Ceresoli <lucaceresoli>)
+  * init.c, opt.h: Patch#6774 TCP_QUEUE_OOSEQ breaks compilation when
+    LWIP_TCP==0
+
+  2009-04-09 Kieran Mansley (patch from Roy Lee <roylee17>)
+  * tcp.h: Patch#6802 Add do-while-clauses to those function like
+    macros in tcp.h
+
+  2009-03-31 Kieran Mansley
+  * tcp.c, tcp_in.c, tcp_out.c, tcp.h, opt.h: Rework the way window
+    updates are calculated and sent (BUG20515)
+
+  * tcp_in.c: cope with SYN packets received during established states,
+    and retransmission of initial SYN.
+
+  * tcp_out.c: set push bit correctly when tcp segments are merged
+
+  2009-03-27 Kieran Mansley
+  * tcp_out.c set window correctly on probes (correcting change made
+    yesterday)
+
+  2009-03-26 Kieran Mansley
+  * tcp.c, tcp_in.c, tcp.h: add tcp_abandon() to cope with dropping
+    connections where no reset required (bug #25622)
+
+  * tcp_out.c: set TCP_ACK flag on keepalive and zero window probes 
+    (bug #20779)
+
+  2009-02-18 Simon Goldschmidt (Jonathan Larmour and Bill Auerbach)
+  * ip_frag.c: patch #6528: the buffer used for IP_FRAG_USES_STATIC_BUF could be
+    too small depending on MEM_ALIGNMENT
+
+  2009-02-16 Simon Goldschmidt
+  * sockets.h/.c, api_*.h/.c: fixed arguments of socket functions to match the standard;
+    converted size argument of netconn_write to 'size_t'
+
+  2009-02-16 Simon Goldschmidt
+  * tcp.h, tcp.c: fixed bug #24440: TCP connection close problem on 64-bit host
+    by moving accept callback function pointer to TCP_PCB_COMMON
+
+  2009-02-12 Simon Goldschmidt
+  * dhcp.c: fixed bug #25345 (DHCPDECLINE is sent with "Maximum message size"
+    option)
+
+  2009-02-11 Simon Goldschmidt
+  * dhcp.c: fixed bug #24480 (releasing old udp_pdb and pbuf in dhcp_start)
+
+  2009-02-11 Simon Goldschmidt
+  * opt.h, api_msg.c: added configurable default valud for netconn->recv_bufsize:
+    RECV_BUFSIZE_DEFAULT (fixes bug #23726: pbuf pool exhaustion on slow recv())
+
+  2009-02-10 Simon Goldschmidt
+  * tcp.c: fixed bug #25467: Listen backlog is not reset on timeout in SYN_RCVD:
+    Accepts_pending is decrease on a corresponding listen pcb when a connection
+    in state SYN_RCVD is close.
+
+  2009-01-28 Jonathan Larmour
+  * pbuf.c: reclaim pbufs from TCP out-of-sequence segments if we run
+    out of pool pbufs.
+
+  2008-12-19 Simon Goldschmidt
+  * many files: patch #6699: fixed some warnings on platform where sizeof(int) == 2 
+
+  2008-12-10 Tamas Somogyi, Fr�d�ric Bernon
+  * sockets.c: fixed bug #25051: lwip_recvfrom problem with udp: fromaddr and
+    port uses deleted netbuf.
+
+  2008-10-18 Simon Goldschmidt
+  * tcp_in.c: fixed bug ##24596: Vulnerability on faulty TCP options length
+    in tcp_parseopt
+
+  2008-10-15 Simon Goldschmidt
+  * ip_frag.c: fixed bug #24517: IP reassembly crashes on unaligned IP headers
+    by packing the struct ip_reass_helper.
+
+  2008-10-03 David Woodhouse, Jonathan Larmour
+  * etharp.c (etharp_arp_input): Fix type aliasing problem copying ip address.
+
+  2008-10-02 Jonathan Larmour
+  * dns.c: Hard-code structure sizes, to avoid issues on some compilers where
+    padding is included.
+
+  2008-09-30 Jonathan Larmour
+  * sockets.c (lwip_accept): check addr isn't NULL. If it's valid, do an
+    assertion check that addrlen isn't NULL.
+
+  2008-09-30 Jonathan Larmour
+  * tcp.c: Fix bug #24227, wrong error message in tcp_bind.
+
+  2008-08-26 Simon Goldschmidt
+  * inet.h, ip_addr.h: fixed bug #24132: Cross-dependency between ip_addr.h and
+    inet.h -> moved declaration of struct in_addr from ip_addr.h to inet.h
+
+  2008-08-14 Simon Goldschmidt
+  * api_msg.c: fixed bug #23847: do_close_internal references freed memory (when
+    tcp_close returns != ERR_OK)
+
+  2008-07-08 Fr�d�ric Bernon
+  * stats.h: Fix some build bugs introduced with patch #6483 (missing some parameters
+    in macros, mainly if MEM_STATS=0 and MEMP_STATS=0).
+
+  2008-06-24 Jonathan Larmour
+  * tcp_in.c: Fix for bug #23693 as suggested by Art R. Ensure cseg is unused
+    if tcp_seg_copy fails.
+
+  2008-06-17 Simon Goldschmidt
+  * inet_chksum.c: Checked in some ideas of patch #6460 (loop optimizations)
+    and created defines for swapping bytes and folding u32 to u16.
+
+  2008-05-30 Kieran Mansley
+  * tcp_in.c Remove redundant "if" statement, and use real rcv_wnd
+    rather than rcv_ann_wnd when deciding if packets are in-window.
+    Contributed by <arasmussen@consultant.datasys.swri.edu>
+
+  2008-05-30 Kieran Mansley
+  * mem.h: Fix BUG#23254.  Change macro definition of mem_* to allow
+    passing as function pointers when MEM_LIBC_MALLOC is defined.
+
+  2008-05-09 Jonathan Larmour
+  * err.h, err.c, sockets.c: Fix bug #23119: Reorder timeout error code to
+    stop it being treated as a fatal error.
+
+  2008-04-15 Simon Goldschmidt
+  * dhcp.c: fixed bug #22804: dhcp_stop doesn't clear NETIF_FLAG_DHCP
+    (flag now cleared)
+
+  2008-03-27 Simon Goldschmidt
+  * mem.c, tcpip.c, tcpip.h, opt.h: fixed bug #21433 (Calling mem_free/pbuf_free
+    from interrupt context isn't safe): set LWIP_USE_HEAP_FROM_INTERRUPT to 1
+    in lwipopts.h or use pbuf_free_callback(p)/mem_free_callback(m) to free pbufs
+    or heap memory from interrupt context
+
+  2008-03-26 Simon Goldschmidt
+  * tcp_in.c, tcp.c: fixed bug #22249: division by zero could occur if a remote
+    host sent a zero mss as TCP option.
+
+
+(STABLE-1.3.0)
+
+  ++ New features:
+
+  2008-03-10 Jonathan Larmour
+  * inet_chksum.c: Allow choice of one of the sample algorithms to be
+    made from lwipopts.h. Fix comment on how to override LWIP_CHKSUM.
+
+  2008-01-22 Fr�d�ric Bernon
+  * tcp.c, tcp_in.c, tcp.h, opt.h: Rename LWIP_CALCULATE_EFF_SEND_MSS in 
+    TCP_CALCULATE_EFF_SEND_MSS to have coherent TCP options names.
+
+  2008-01-14 Fr�d�ric Bernon
+  * rawapi.txt, api_msg.c, tcp.c, tcp_in.c, tcp.h: changes for task #7675 "Enable
+    to refuse data on a TCP_EVENT_RECV call". Important, behavior changes for the
+    tcp_recv callback (see rawapi.txt).
+
+  2008-01-14 Fr�d�ric Bernon, Marc Chaland
+  * ip.c: Integrate patch #6369" ip_input : checking before realloc".
+  
+  2008-01-12 Fr�d�ric Bernon
+  * tcpip.h, tcpip.c, api.h, api_lib.c, api_msg.c, sockets.c: replace the field
+    netconn::sem per netconn::op_completed like suggested for the task #7490
+    "Add return value to sys_mbox_post".
+
+  2008-01-12 Fr�d�ric Bernon
+  * api_msg.c, opt.h: replace DEFAULT_RECVMBOX_SIZE per DEFAULT_TCP_RECVMBOX_SIZE,
+    DEFAULT_UDP_RECVMBOX_SIZE and DEFAULT_RAW_RECVMBOX_SIZE (to optimize queues
+    sizes), like suggested for the task #7490 "Add return value to sys_mbox_post".
+
+  2008-01-10 Fr�d�ric Bernon
+  * tcpip.h, tcpip.c: add tcpip_callback_with_block function for the task #7490
+    "Add return value to sys_mbox_post". tcpip_callback is always defined as
+    "blocking" ("block" parameter = 1).
+
+  2008-01-10 Fr�d�ric Bernon
+  * tcpip.h, tcpip.c, api.h, api_lib.c, api_msg.c, sockets.c: replace the field
+    netconn::mbox (sys_mbox_t) per netconn::sem (sys_sem_t) for the task #7490
+    "Add return value to sys_mbox_post".
+
+  2008-01-05 Fr�d�ric Bernon
+  * sys_arch.txt, api.h, api_lib.c, api_msg.h, api_msg.c, tcpip.c, sys.h, opt.h:
+    Introduce changes for task #7490 "Add return value to sys_mbox_post" with some
+    modifications in the sys_mbox api: sys_mbox_new take a "size" parameters which
+    indicate the number of pointers query by the mailbox. There is three defines
+    in opt.h to indicate sizes for tcpip::mbox, netconn::recvmbox, and for the 
+    netconn::acceptmbox. Port maintainers, you can decide to just add this new 
+    parameter in your implementation, but to ignore it to keep the previous behavior.
+    The new sys_mbox_trypost function return a value to know if the mailbox is
+    full or if the message is posted. Take a look to sys_arch.txt for more details.
+    This new function is used in tcpip_input (so, can be called in an interrupt
+    context since the function is not blocking), and in recv_udp and recv_raw.
+
+  2008-01-04 Fr�d�ric Bernon, Simon Goldschmidt, Jonathan Larmour
+  * rawapi.txt, api.h, api_lib.c, api_msg.h, api_msg.c, sockets.c, tcp.h, tcp.c,
+    tcp_in.c, init.c, opt.h: rename backlog options with TCP_ prefix, limit the
+    "backlog" parameter in an u8_t, 0 is interpreted as "smallest queue", add
+    documentation in the rawapi.txt file.
+
+  2007-12-31 Kieran Mansley (based on patch from Per-Henrik Lundbolm)
+  * tcp.c, tcp_in.c, tcp_out.c, tcp.h: Add TCP persist timer
+
+  2007-12-31 Fr�d�ric Bernon, Luca Ceresoli
+  * autoip.c, etharp.c: ip_addr.h: Integrate patch #6348: "Broadcast ARP packets
+    in autoip". The change in etharp_raw could be removed, since all calls to
+    etharp_raw use ethbroadcast for the "ethdst_addr" parameter. But it could be
+    wrong in the future.
+
+  2007-12-30 Fr�d�ric Bernon, Tom Evans
+  * ip.c: Fix bug #21846 "LwIP doesn't appear to perform any IP Source Address
+    Filtering" reported by Tom Evans.
+
+  2007-12-21 Fr�d�ric Bernon, Simon Goldschmidt, Jonathan Larmour
+  * tcp.h, opt.h, api.h, api_msg.h, tcp.c, tcp_in.c, api_lib.c, api_msg.c,
+    sockets.c, init.c: task #7252: Implement TCP listen backlog: Warning: raw API
+    applications have to call 'tcp_accepted(pcb)' in their accept callback to
+    keep accepting new connections.
+
+  2007-12-13 Fr�d�ric Bernon
+  * api_msg.c, err.h, err.c, sockets.c, dns.c, dns.h: replace "enum dns_result"
+    by err_t type. Add a new err_t code "ERR_INPROGRESS".
+
+  2007-12-12 Fr�d�ric Bernon
+  * dns.h, dns.c, opt.h: move DNS options to the "right" place. Most visibles
+    are the one which have ram usage.
+
+  2007-12-05 Fr�d�ric Bernon
+  * netdb.c: add a LWIP_DNS_API_HOSTENT_STORAGE option to decide to use a static
+    set of variables (=0) or a local one (=1). In this last case, your port should
+    provide a function "struct hostent* sys_thread_hostent( struct hostent* h)"
+    which have to do a copy of "h" and return a pointer ont the "per-thread" copy.
+
+  2007-12-03 Simon Goldschmidt
+  * ip.c: ip_input: check if a packet is for inp first before checking all other
+    netifs on netif_list (speeds up packet receiving in most cases)
+
+  2007-11-30 Simon Goldschmidt
+  * udp.c, raw.c: task #7497: Sort lists (pcb, netif, ...) for faster access
+    UDP: move a (connected) pcb selected for input to the front of the list of
+    pcbs so that it is found faster next time. Same for RAW pcbs that have eaten
+    a packet.
+
+  2007-11-28 Simon Goldschmidt
+  * etharp.c, stats.c, stats.h, opt.h: Introduced ETHARP_STATS
+
+  2007-11-25 Simon Goldschmidt
+  * dhcp.c: dhcp_unfold_reply() uses pbuf_copy_partial instead of its own copy
+    algorithm.
+
+  2007-11-24 Simon Goldschmidt
+  * netdb.h, netdb.c, sockets.h/.c: Moved lwip_gethostbyname from sockets.c
+    to the new file netdb.c; included lwip_getaddrinfo.
+
+  2007-11-21 Simon Goldschmidt
+  * tcp.h, opt.h, tcp.c, tcp_in.c: implemented calculating the effective send-mss
+    based on the MTU of the netif used to send. Enabled by default. Disable by
+    setting LWIP_CALCULATE_EFF_SEND_MSS to 0. This fixes bug #21492.
+
+  2007-11-19 Fr�d�ric Bernon
+  * api_msg.c, dns.h, dns.c: Implement DNS_DOES_NAME_CHECK option (check if name
+    received match the name query), implement DNS_USES_STATIC_BUF (the place where
+    copy dns payload to parse the response), return an error if there is no place
+    for a new query, and fix some minor problems.
+
+  2007-11-16 Simon Goldschmidt
+  * new files: ipv4/inet.c, ipv4/inet_chksum.c, ipv6/inet6.c
+    removed files: core/inet.c, core/inet6.c
+    Moved inet files into ipv4/ipv6 directory; splitted inet.c/inet.h into
+    inet and chksum part; changed includes in all lwIP files as appropriate
+
+  2007-11-16 Simon Goldschmidt
+  * api.h, api_msg.h, api_lib.c, api_msg.c, socket.h, socket.c: Added sequential
+    dns resolver function for netconn api (netconn_gethostbyname) and socket api
+    (gethostbyname/gethostbyname_r).
+
+  2007-11-15 Jim Pettinato, Fr�d�ric Bernon
+  * opt.h, init.c, tcpip.c, dhcp.c, dns.h, dns.c: add DNS client for simple name
+    requests with RAW api interface. Initialization is done in lwip_init() with
+    build time options. DNS timer is added in tcpip_thread context. DHCP can set
+    DNS server ip addresses when options are received. You need to set LWIP_DNS=1
+    in your lwipopts.h file (LWIP_DNS=0 in opt.h). DNS_DEBUG can be set to get
+    some traces with LWIP_DEBUGF. Sanity check have been added. There is a "todo"
+    list with points to improve.
+
+  2007-11-06 Simon Goldschmidt
+  * opt.h, mib2.c: Patch #6215: added ifAdminStatus write support (if explicitly
+    enabled by defining SNMP_SAFE_REQUESTS to 0); added code to check link status
+    for ifOperStatus if LWIP_NETIF_LINK_CALLBACK is defined.
+
+  2007-11-06 Simon Goldschmidt
+  * api.h, api_msg.h and dependent files: Task #7410: Removed the need to include
+    core header files in api.h (ip/tcp/udp/raw.h) to hide the internal
+    implementation from netconn api applications.
+
+  2007-11-03 Fr�d�ric Bernon
+  * api.h, api_lib.c, api_msg.c, sockets.c, opt.h: add SO_RCVBUF option for UDP &
+    RAW netconn. You need to set LWIP_SO_RCVBUF=1 in your lwipopts.h (it's disabled
+    by default). Netconn API users can use the netconn_recv_bufsize macro to access
+    it. This is a first release which have to be improve for TCP. Note it used the
+    netconn::recv_avail which need to be more "thread-safe" (note there is already
+    the problem for FIONREAD with lwip_ioctl/ioctlsocket).
+
+  2007-11-01 Fr�d�ric Bernon, Marc Chaland
+  * sockets.h, sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c, tcp.h, tcp_out.c:
+    Integrate "patch #6250 : MSG_MORE flag for send". MSG_MORE is used at socket api
+    layer, NETCONN_MORE at netconn api layer, and TCP_WRITE_FLAG_MORE at raw api
+    layer. This option enable to delayed TCP PUSH flag on multiple "write" calls.
+    Note that previous "copy" parameter for "write" APIs is now called "apiflags".
+
+  2007-10-24 Fr�d�ric Bernon
+  * api.h, api_lib.c, api_msg.c: Add macro API_EVENT in the same spirit than 
+    TCP_EVENT_xxx macros to get a code more readable. It could also help to remove
+    some code (like we have talk in "patch #5919 : Create compile switch to remove
+    select code"), but it could be done later.
+
+  2007-10-08 Simon Goldschmidt
+  * many files: Changed initialization: many init functions are not needed any
+    more since we now rely on the compiler initializing global and static
+    variables to zero!
+
+  2007-10-06 Simon Goldschmidt
+  * ip_frag.c, memp.c, mib2.c, ip_frag.h, memp_std.h, opt.h: Changed IP_REASSEMBLY
+    to enqueue the received pbufs so that multiple packets can be reassembled
+    simultaneously and no static reassembly buffer is needed.
+
+  2007-10-05 Simon Goldschmidt
+  * tcpip.c, etharp.h, etharp.c: moved ethernet_input from tcpip.c to etharp.c so
+    all netifs (or ports) can use it.
+
+  2007-10-05 Fr�d�ric Bernon
+  * netifapi.h, netifapi.c: add function netifapi_netif_set_default. Change the 
+    common function to reduce a little bit the footprint (for all functions using
+    only the "netif" parameter).
+
+  2007-10-03 Fr�d�ric Bernon
+  * netifapi.h, netifapi.c: add functions netifapi_netif_set_up, netifapi_netif_set_down,
+    netifapi_autoip_start and netifapi_autoip_stop. Use a common function to reduce
+    a little bit the footprint (for all functions using only the "netif" parameter).
+
+  2007-09-15 Fr�d�ric Bernon
+  * udp.h, udp.c, sockets.c: Changes for "#20503 IGMP Improvement". Add IP_MULTICAST_IF
+    option in socket API, and a new field "multicast_ip" in "struct udp_pcb" (for
+    netconn and raw API users), only if LWIP_IGMP=1. Add getsockopt processing for
+    IP_MULTICAST_TTL and IP_MULTICAST_IF.
+
+  2007-09-10 Fr�d�ric Bernon
+  * snmp.h, mib2.c: enable to remove SNMP timer (which consumne several cycles
+    even when it's not necessary). snmp_agent.txt tell to call snmp_inc_sysuptime()
+    each 10ms (but, it's intrusive if you use sys_timeout feature). Now, you can
+    decide to call snmp_add_sysuptime(100) each 1000ms (which is bigger "step", but
+    call to a lower frequency). Or, you can decide to not call snmp_inc_sysuptime()
+    or snmp_add_sysuptime(), and to define the SNMP_GET_SYSUPTIME(sysuptime) macro.
+    This one is undefined by default in mib2.c. SNMP_GET_SYSUPTIME is called inside
+    snmp_get_sysuptime(u32_t *value), and enable to change "sysuptime" value only
+    when it's queried (any direct call to "sysuptime" is changed by a call to 
+    snmp_get_sysuptime).
+
+  2007-09-09 Fr�d�ric Bernon, Bill Florac
+  * igmp.h, igmp.c, netif.h, netif.c, ip.c: To enable to have interfaces with IGMP,
+    and others without it, there is a new NETIF_FLAG_IGMP flag to set in netif->flags
+    if you want IGMP on an interface. igmp_stop() is now called inside netif_remove().
+    igmp_report_groups() is now called inside netif_set_link_up() (need to have
+    LWIP_NETIF_LINK_CALLBACK=1) to resend reports once the link is up (avoid to wait
+    the next query message to receive the matching multicast streams).
+
+  2007-09-08 Fr�d�ric Bernon
+  * sockets.c, ip.h, api.h, tcp.h: declare a "struct ip_pcb" which only contains
+    IP_PCB. Add in the netconn's "pcb" union a "struct ip_pcb *ip;" (no size change).
+    Use this new field to access to common pcb fields (ttl, tos, so_options, etc...).
+    Enable to access to these fields with LWIP_TCP=0.
+
+  2007-09-05 Fr�d�ric Bernon
+  * udp.c, ipv4/icmp.c, ipv4/ip.c, ipv6/icmp.c, ipv6/ip6.c, ipv4/icmp.h,
+    ipv6/icmp.h, opt.h: Integrate "task #7272 : LWIP_ICMP option". The new option
+    LWIP_ICMP enable/disable ICMP module inside the IP stack (enable per default).
+    Be careful, disabling ICMP make your product non-compliant to RFC1122, but
+    help to reduce footprint, and to reduce "visibility" on the Internet.
+
+  2007-09-05 Fr�d�ric Bernon, Bill Florac
+  * opt.h, sys.h, tcpip.c, slipif.c, ppp.c, sys_arch.txt: Change parameters list
+    for sys_thread_new (see "task #7252 : Create sys_thread_new_ex()"). Two new
+    parameters have to be provided: a task name, and a task stack size. For this
+    one, since it's platform dependant, you could define the best one for you in
+    your lwipopts.h. For port maintainers, you can just add these new parameters
+    in your sys_arch.c file, and but it's not mandatory, use them in your OS
+    specific functions.
+
+  2007-09-05 Fr�d�ric Bernon
+  * inet.c, autoip.c, msg_in.c, msg_out.c, init.c: Move some build time checkings
+    inside init.c for task #7142 "Sanity check user-configurable values".
+
+  2007-09-04 Fr�d�ric Bernon, Bill Florac
+  * igmp.h, igmp.c, memp_std.h, memp.c, init.c, opt.h: Replace mem_malloc call by
+    memp_malloc, and use a new MEMP_NUM_IGMP_GROUP option (see opt.h to define the
+    value). It will avoid potential fragmentation problems, use a counter to know
+    how many times a group is used on an netif, and free it when all applications
+    leave it. MEMP_NUM_IGMP_GROUP got 8 as default value (and init.c got a sanity
+    check if LWIP_IGMP!=0).
+
+  2007-09-03 Fr�d�ric Bernon
+  * igmp.h, igmp.c, sockets.c, api_msg.c: Changes for "#20503 IGMP Improvement".
+    Initialize igmp_mac_filter to NULL in netif_add (this field should be set in
+    the netif's "init" function). Use the "imr_interface" field (for socket layer)
+    and/or the "interface" field (for netconn layer), for join/leave operations.
+    The igmp_join/leavegroup first parameter change from a netif to an ipaddr.
+    This field could be a netif's ipaddr, or "any" (same meaning than ip_addr_isany).
+
+  2007-08-30 Fr�d�ric Bernon
+  * Add netbuf.h, netbuf.c, Change api.h, api_lib.c: #7249 "Split netbuf functions
+    from api/api_lib". Now netbuf API is independant of netconn, and can be used
+    with other API (application based on raw API, or future "socket2" API). Ports
+    maintainers just have to add src/api/netbuf.c in their makefile/projects.
+
+  2007-08-30 Fr�d�ric Bernon, Jonathan Larmour
+  * init.c: Add first version of lwip_sanity_check for task #7142 "Sanity check
+    user-configurable values".
+
+  2007-08-29 Fr�d�ric Bernon
+  * igmp.h, igmp.c, tcpip.c, init.c, netif.c: change igmp_init and add igmp_start.
+    igmp_start is call inside netif_add. Now, igmp initialization is in the same
+    spirit than the others modules. Modify some IGMP debug traces.
+
+  2007-08-29 Fr�d�ric Bernon
+  * Add init.h, init.c, Change opt.h, tcpip.c: Task  #7213 "Add a lwip_init function"
+    Add lwip_init function to regroup all modules initializations, and to provide
+    a place to add code for task #7142 "Sanity check user-configurable values".
+    Ports maintainers should remove direct initializations calls from their code,
+    and add init.c in their makefiles. Note that lwip_init() function is called
+    inside tcpip_init, but can also be used by raw api users since all calls are
+    disabled when matching options are disabled. Also note that their is new options
+    in opt.h, you should configure in your lwipopts.h (they are enabled per default).
+
+  2007-08-26 Marc Boucher
+  * api_msg.c: do_close_internal(): Reset the callbacks and arg (conn) to NULL
+    since they can under certain circumstances be called with an invalid conn
+    pointer after the connection has been closed (and conn has been freed). 
+
+  2007-08-25 Fr�d�ric Bernon (Artem Migaev's Patch)
+  * netif.h, netif.c: Integrate "patch #6163 : Function to check if link layer is up".
+    Add a netif_is_link_up() function if LWIP_NETIF_LINK_CALLBACK option is set.
+
+  2007-08-22 Fr�d�ric Bernon
+  * netif.h, netif.c, opt.h: Rename LWIP_NETIF_CALLBACK in LWIP_NETIF_STATUS_CALLBACK
+    to be coherent with new LWIP_NETIF_LINK_CALLBACK option before next release.
+
+  2007-08-22 Fr�d�ric Bernon
+  * tcpip.h, tcpip.c, ethernetif.c, opt.h: remove options ETHARP_TCPIP_INPUT &
+    ETHARP_TCPIP_ETHINPUT, now, only "ethinput" code is supported, even if the 
+    name is tcpip_input (we keep the name of 1.2.0 function).
+
+  2007-08-17 Jared Grubb
+  * memp_std.h, memp.h, memp.c, mem.c, stats.c: (Task #7136) Centralize mempool 
+    settings into new memp_std.h and optional user file lwippools.h. This adds
+    more dynamic mempools, and allows the user to create an arbitrary number of
+    mempools for mem_malloc.
+
+  2007-08-16 Marc Boucher
+  * api_msg.c: Initialize newconn->state to NETCONN_NONE in accept_function;
+    otherwise it was left to NETCONN_CLOSE and sent_tcp() could prematurely
+    close the connection.
+
+  2007-08-16 Marc Boucher
+  * sockets.c: lwip_accept(): check netconn_peer() error return.
+
+  2007-08-16 Marc Boucher
+  * mem.c, mem.h: Added mem_calloc().
+
+  2007-08-16 Marc Boucher
+  * tcpip.c, tcpip.h memp.c, memp.h: Added distinct memp (MEMP_TCPIP_MSG_INPKT)
+    for input packets to prevent floods from consuming all of MEMP_TCPIP_MSG
+    and starving other message types.
+    Renamed MEMP_TCPIP_MSG to MEMP_TCPIP_MSG_API
+
+  2007-08-16 Marc Boucher
+  * pbuf.c, pbuf.h, etharp.c, tcp_in.c, sockets.c: Split pbuf flags in pbuf
+    type and flgs (later renamed to flags).
+    Use enum pbuf_flag as pbuf_type.  Renumber PBUF_FLAG_*.
+    Improved lwip_recvfrom().  TCP push now propagated.
+
+  2007-08-16 Marc Boucher
+  * ethernetif.c, contrib/ports/various: ethbroadcast now a shared global
+    provided by etharp.
+
+  2007-08-16 Marc Boucher
+  * ppp_oe.c ppp_oe.h, auth.c chap.c fsm.c lcp.c ppp.c ppp.h,
+    etharp.c ethernetif.c, etharp.h, opt.h tcpip.h, tcpip.c:
+    Added PPPoE support and various PPP improvements.
+
+  2007-07-25 Simon Goldschmidt
+  * api_lib.c, ip_frag.c, pbuf.c, api.h, pbuf.h: Introduced pbuf_copy_partial,
+    making netbuf_copy_partial use this function.
+
+  2007-07-25 Simon Goldschmidt
+  * tcp_in.c: Fix bug #20506: Slow start / initial congestion window starts with
+    2 * mss (instead of 1 * mss previously) to comply with some newer RFCs and
+    other stacks.
+
+  2007-07-13 Jared Grubb (integrated by Fr�d�ric Bernon)
+  * opt.h, netif.h, netif.c, ethernetif.c: Add new configuration option to add
+    a link callback in the netif struct, and functions to handle it. Be carefull
+    for port maintainers to add the NETIF_FLAG_LINK_UP flag (like in ethernetif.c)
+    if you want to be sure to be compatible with future changes...
+
+  2007-06-30 Fr�d�ric Bernon
+  * sockets.h, sockets.c: Implement MSG_PEEK flag for recv/recvfrom functions.
+
+  2007-06-21 Simon Goldschmidt
+  * etharp.h, etharp.c: Combined etharp_request with etharp_raw for both
+    LWIP_AUTOIP =0 and =1 to remove redundant code.
+
+  2007-06-21 Simon Goldschmidt
+  * mem.c, memp.c, mem.h, memp.h, opt.h: task #6863: Introduced the option
+    MEM_USE_POOLS to use 4 pools with different sized elements instead of a
+    heap. This both prevents memory fragmentation and gives a higher speed
+    at the cost of more memory consumption. Turned off by default.
+
+  2007-06-21 Simon Goldschmidt
+  * api_lib.c, api_msg.c, api.h, api_msg.h: Converted the length argument of
+    netconn_write (and therefore also api_msg_msg.msg.w.len) from u16_t into
+    int to be able to send a bigger buffer than 64K with one time (mainly
+    used from lwip_send).
+
+  2007-06-21 Simon Goldschmidt
+  * tcp.h, api_msg.c: Moved the nagle algorithm from netconn_write/do_write
+    into a define (tcp_output_nagle) in tcp.h to provide it to raw api users, too.
+
+  2007-06-21 Simon Goldschmidt
+  * api.h, api_lib.c, api_msg.c: Fixed bug #20021: Moved sendbuf-processing in
+    netconn_write from api_lib.c to api_msg.c to also prevent multiple context-
+    changes on low memory or empty send-buffer.
+
+  2007-06-18 Simon Goldschmidt
+  * etharp.c, etharp.h: Changed etharp to use a defined hardware address length
+    of 6 to avoid loading netif->hwaddr_len every time (since this file is only
+    used for ethernet and struct eth_addr already had a defined length of 6).
+
+  2007-06-17 Simon Goldschmidt
+  * sockets.c, sockets.h: Implemented socket options SO_NO_CHECK for UDP sockets
+    to disable UDP checksum generation on transmit.
+
+  2007-06-13 Fr�d�ric Bernon, Simon Goldschmidt
+  * debug.h, api_msg.c: change LWIP_ERROR to use it to check errors like invalid
+    pointers or parameters, and let the possibility to redefined it in cc.h. Use
+    this macro to check "conn" parameter in api_msg.c functions.
+
+  2007-06-11 Simon Goldschmidt
+  * sockets.c, sockets.h: Added UDP lite support for sockets
+
+  2007-06-10 Simon Goldschmidt
+  * udp.h, opt.h, api_msg.c, ip.c, udp.c: Included switch LWIP_UDPLITE (enabled
+    by default) to switch off UDP-Lite support if not needed (reduces udp.c code
+    size)
+
+  2007-06-09 Dominik Spies (integrated by Fr�d�ric Bernon)
+  * autoip.h, autoip.c, dhcp.h, dhcp.c, netif.h, netif.c, etharp.h, etharp.c, opt.h:
+    AutoIP implementation available for IPv4, with new options LWIP_AUTOIP and
+    LWIP_DHCP_AUTOIP_COOP if you want to cooperate with DHCP. Some tips to adapt
+    (see TODO mark in the source code).
+
+  2007-06-09 Simon Goldschmidt
+  * etharp.h, etharp.c, ethernetif.c: Modified order of parameters for
+    etharp_output() to match netif->output so etharp_output() can be used
+    directly as netif->output to save one function call.
+
+  2007-06-08 Simon Goldschmidt
+  * netif.h, ethernetif.c, slipif.c, loopif.c: Added define
+    NETIF_INIT_SNMP(netif, type, speed) to initialize per-netif snmp variables,
+    added initialization of those to ethernetif, slipif and loopif.
+
+  2007-05-18 Simon Goldschmidt
+  * opt.h, ip_frag.c, ip_frag.h, ip.c: Added option IP_FRAG_USES_STATIC_BUF
+    (defaulting to off for now) that can be set to 0 to send fragmented
+    packets by passing PBUF_REFs down the stack.
+
+  2007-05-23 Fr�d�ric Bernon
+  * api_lib.c: Implement SO_RCVTIMEO for accept and recv on TCP
+    connections, such present in patch #5959.
+
+  2007-05-23 Fr�d�ric Bernon
+  * api.h, api_lib.c, api_msg.c, sockets.c: group the different NETCONN_UDPxxx
+    code in only one part...
+
+  2007-05-18 Simon Goldschmidt
+  * opt.h, memp.h, memp.c: Added option MEMP_OVERFLOW_CHECK to check for memp
+    elements to overflow. This is achieved by adding some bytes before and after
+    each pool element (increasing their size, of course), filling them with a
+    prominent value and checking them on freeing the element.
+    Set it to 2 to also check every element in every pool each time memp_malloc()
+    or memp_free() is called (slower but more helpful).
+
+  2007-05-10 Simon Goldschmidt
+  * opt.h, memp.h, memp.c, pbuf.c (see task #6831): use a new memp pool for
+    PBUF_POOL pbufs instead of the old pool implementation in pbuf.c to reduce
+    code size.
+
+  2007-05-11 Fr�d�ric Bernon
+  * sockets.c, api_lib.c, api_msg.h, api_msg.c, netifapi.h, netifapi.c, tcpip.c:
+    Include a function pointer instead of a table index in the message to reduce
+    footprint. Disable some part of lwip_send and lwip_sendto if some options are
+    not set (LWIP_TCP, LWIP_UDP, LWIP_RAW).
+
+  2007-05-10 Simon Goldschmidt
+  * *.h (except netif/ppp/*.h): Included patch #5448: include '#ifdef __cplusplus
+    \ extern "C" {' in all header files. Now you can write your application using
+    the lwIP stack in C++ and simply #include the core files. Note I have left
+    out the netif/ppp/*h header files for now, since I don't know which files are
+    included by applications and which are for internal use only.
+
+  2007-05-09 Simon Goldschmidt
+  * opt.h, *.c/*.h: Included patch #5920: Create define to override C-library
+    memcpy. 2 Defines are created: MEMCPY() for normal memcpy, SMEMCPY() for
+    situations where some compilers might inline the copy and save a function
+    call. Also replaced all calls to memcpy() with calls to (S)MEMCPY().
+
+  2007-05-08 Simon Goldschmidt
+  * mem.h: If MEM_LIBC_MALLOC==1, allow the defines (e.g. mem_malloc() -> malloc())
+    to be overriden in case the C-library malloc implementation is not protected
+    against concurrent access.
+
+  2007-05-04 Simon Goldschmidt (Atte Kojo)
+  * etharp.c: Introduced fast one-entry-cache to speed up ARP lookup when sending
+    multiple packets to the same host.
+
+  2007-05-04 Fr�d�ric Bernon, Jonathan Larmour
+  * sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c: Fix bug #19162 "lwip_sento: a possible
+    to corrupt remote addr/port connection state". Reduce problems "not enought memory" with
+    netbuf (if we receive lot of datagrams). Improve lwip_sendto (only one exchange between
+    sockets api and api_msg which run in tcpip_thread context). Add netconn_sento function.
+    Warning, if you directly access to "fromaddr" & "fromport" field from netbuf struct,
+    these fields are now renamed "addr" & "port".
+
+  2007-04-11 Jonathan Larmour
+  * sys.h, api_lib.c: Provide new sys_mbox_tryfetch function. Require ports to provide new
+    sys_arch_mbox_tryfetch function to get a message if one is there, otherwise return
+    with SYS_MBOX_EMPTY. sys_arch_mbox_tryfetch can be implemented as a function-like macro
+    by the port in sys_arch.h if desired.
+
+  2007-04-06 Fr�d�ric Bernon, Simon Goldschmidt
+  * opt.h, tcpip.h, tcpip.c, netifapi.h, netifapi.c: New configuration option LWIP_NETIF_API
+    allow to use thread-safe functions to add/remove netif in list, and to start/stop dhcp
+    clients, using new functions from netifapi.h. Disable as default (no port change to do).
+
+  2007-04-05 Fr�d�ric Bernon
+  * sockets.c: remplace ENOBUFS errors on alloc_socket by ENFILE to be more BSD compliant.
+
+  2007-04-04 Simon Goldschmidt
+  * arch.h, api_msg.c, dhcp.c, msg_in.c, sockets.c: Introduced #define LWIP_UNUSED_ARG(x)
+    use this for and architecture-independent form to tell the compiler you intentionally
+    are not using this variable. Can be overriden in cc.h.
+
+  2007-03-28 Fr�d�ric Bernon
+  * opt.h, netif.h, dhcp.h, dhcp.c: New configuration option LWIP_NETIF_HOSTNAME allow to
+    define a hostname in netif struct (this is just a pointer, so, you can use a hardcoded
+    string, point on one of your's ethernetif field, or alloc a string you will free yourself).
+    It will be used by DHCP to register a client hostname, but can also be use when you call
+    snmp_set_sysname.
+
+  2007-03-28 Fr�d�ric Bernon
+  * netif.h, netif.c: A new NETIF_FLAG_ETHARP flag is defined in netif.h, to allow to 
+    initialize a network interface's flag with. It tell this interface is an ethernet
+    device, and we can use ARP with it to do a "gratuitous ARP" (RFC 3220 "IP Mobility
+    Support for IPv4" section 4.6) when interface is "up" with netif_set_up().
+
+  2007-03-26 Fr�d�ric Bernon, Jonathan Larmour
+  * opt.h, tcpip.c: New configuration option LWIP_ARP allow to disable ARP init at build
+    time if you only use PPP or SLIP. The default is enable. Note we don't have to call 
+    etharp_init in your port's initilization sequence if you use tcpip.c, because this call
+    is done in tcpip_init function.
+
+  2007-03-22 Fr�d�ric Bernon
+  * stats.h, stats.c, msg_in.c: Stats counters can be change to u32_t if necessary with the
+    new option LWIP_STATS_LARGE. If you need this option, define LWIP_STATS_LARGE to 1 in
+    your lwipopts.h. More, unused counters are not defined in the stats structs, and not 
+    display by stats_display(). Note that some options (SYS_STATS and RAW_STATS) are defined
+    but never used. Fix msg_in.c with the correct #if test for a stat display.
+
+  2007-03-21 Kieran Mansley
+  * netif.c, netif.h: Apply patch#4197 with some changes (originator: rireland@hmgsl.com). 
+    Provides callback on netif up/down state change.
+
+  2007-03-11 Fr�d�ric Bernon, Mace Gael, Steve Reynolds
+  * sockets.h, sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c, igmp.h, igmp.c,
+    ip.c, netif.h, tcpip.c, opt.h:
+    New configuration option LWIP_IGMP to enable IGMP processing. Based on only one 
+    filter per all network interfaces. Declare a new function in netif to enable to
+    control the MAC filter (to reduce lwIP traffic processing).
+
+  2007-03-11 Fr�d�ric Bernon
+  * tcp.h, tcp.c, sockets.c, tcp_out.c, tcp_in.c, opt.h: Keepalive values can
+    be configured at run time with LWIP_TCP_KEEPALIVE, but don't change this
+    unless you know what you're doing (default are RFC1122 compliant). Note
+    that TCP_KEEPIDLE and TCP_KEEPINTVL have to be set in seconds.
+
+  2007-03-08 Fr�d�ric Bernon
+  * tcp.h: Keepalive values can be configured at compile time, but don't change
+    this unless you know what you're doing (default are RFC1122 compliant).
+
+  2007-03-08 Fr�d�ric Bernon
+  * sockets.c, api.h, api_lib.c, tcpip.c, sys.h, sys.c, err.c, opt.h:
+    Implement LWIP_SO_RCVTIMEO configuration option to enable/disable SO_RCVTIMEO
+    on UDP sockets/netconn.
+
+  2007-03-08 Simon Goldschmidt
+  * snmp_msg.h, msg_in.c: SNMP UDP ports can be configured at compile time.
+
+  2007-03-06 Fr�d�ric Bernon
+  * api.h, api_lib.c, sockets.h, sockets.c, tcpip.c, sys.h, sys.c, err.h: 
+    Implement SO_RCVTIMEO on UDP sockets/netconn.
+
+  2007-02-28 Kieran Mansley (based on patch from Simon Goldschmidt)
+  * api_lib.c, tcpip.c, memp.c, memp.h: make API msg structs allocated
+    on the stack and remove the API msg type from memp
+
+  2007-02-26 Jonathan Larmour (based on patch from Simon Goldschmidt)
+  * sockets.h, sockets.c: Move socket initialization to new
+    lwip_socket_init() function.
+    NOTE: this changes the API with ports. Ports will have to be
+    updated to call lwip_socket_init() now.
+
+  2007-02-26 Jonathan Larmour (based on patch from Simon Goldschmidt)
+  * api_lib.c: Use memcpy in netbuf_copy_partial.
+
+
+  ++ Bug fixes:
+
+  2008-03-17 Fr�d�ric Bernon, Ed Kerekes
+  * igmp.h, igmp.c: Fix bug #22613 "IGMP iphdr problem" (could have
+    some problems to fill the IP header on some targets, use now the
+    ip.h macros to do it).
+
+  2008-03-13 Fr�d�ric Bernon
+  * sockets.c: Fix bug #22435 "lwip_recvfrom with TCP break;". Using
+    (lwip_)recvfrom with valid "from" and "fromlen" parameters, on a
+    TCP connection caused a crash. Note that using (lwip_)recvfrom
+    like this is a bit slow and that using (lwip)getpeername is the
+    good lwip way to do it (so, using recv is faster on tcp sockets).
+
+  2008-03-12 Fr�d�ric Bernon, Jonathan Larmour
+  * api_msg.c, contrib/apps/ping.c: Fix bug #22530 "api_msg.c's
+    recv_raw() does not consume data", and the ping sample (with
+    LWIP_SOCKET=1, the code did the wrong supposition that lwip_recvfrom
+    returned the IP payload, without the IP header).
+
+  2008-03-04 Jonathan Larmour
+  * mem.c, stats.c, mem.h: apply patch #6414 to avoid compiler errors
+  and/or warnings on some systems where mem_size_t and size_t differ.
+  * pbuf.c, ppp.c: Fix warnings on some systems with mem_malloc.
+
+  2008-03-04 Kieran Mansley (contributions by others) 
+  * Numerous small compiler error/warning fixes from contributions to
+    mailing list after 1.3.0 release candidate made.
+
+  2008-01-25 Cui hengbin (integrated by Fr�d�ric Bernon)
+  * dns.c: Fix bug #22108 "DNS problem" caused by unaligned structures.
+
+  2008-01-15 Kieran Mansley
+  * tcp_out.c: BUG20511.  Modify persist timer to start when we are
+    prevented from sending by a small send window, not just a zero
+    send window.
+
+  2008-01-09 Jonathan Larmour
+  * opt.h, ip.c: Rename IP_OPTIONS define to IP_OPTIONS_ALLOWED to avoid
+    conflict with Linux system headers.
+
+  2008-01-06 Jonathan Larmour
+  * dhcp.c: fix bug #19927: "DHCP NACK problem" by clearing any existing set IP
+    address entirely on receiving a DHCPNAK, and restarting discovery.
+
+  2007-12-21 Simon Goldschmidt
+  * sys.h, api_lib.c, api_msg.c, sockets.c: fix bug #21698: "netconn->recv_avail
+    is not protected" by using new macros for interlocked access to modify/test
+    netconn->recv_avail.
+
+  2007-12-20 Kieran Mansley (based on patch from Oleg Tyshev)
+  * tcp_in.c: fix bug# 21535 (nrtx not reset correctly in SYN_SENT state)
+
+  2007-12-20 Kieran Mansley (based on patch from Per-Henrik Lundbolm)
+  * tcp.c, tcp_in.c, tcp_out.c, tcp.h: fix bug #20199 (better handling
+    of silly window avoidance and prevent lwIP from shrinking the window)
+
+  2007-12-04 Simon Goldschmidt
+  * tcp.c, tcp_in.c: fix bug #21699 (segment leak in ooseq processing when last
+    data packet was lost): add assert that all segment lists are empty in
+    tcp_pcb_remove before setting pcb to CLOSED state; don't directly set CLOSED
+    state from LAST_ACK in tcp_process
+
+  2007-12-02 Simon Goldschmidt
+  * sockets.h: fix bug #21654: exclude definition of struct timeval from #ifndef FD_SET
+    If including <sys/time.h> for system-struct timeval, LWIP_TIMEVAL_PRIVATE now
+    has to be set to 0 in lwipopts.h
+
+  2007-12-02 Simon Goldschmidt
+  * api_msg.c, api_lib.c: fix bug #21656 (recvmbox problem in netconn API): always
+    allocate a recvmbox in netconn_new_with_proto_and_callback. For a tcp-listen
+    netconn, this recvmbox is later freed and a new mbox is allocated for acceptmbox.
+    This is a fix for thread-safety and allocates all items needed for a netconn
+    when the netconn is created.
+
+  2007-11-30 Simon Goldschmidt
+  * udp.c: first attempt to fix bug #21655 (DHCP doesn't work reliably with multiple
+    netifs): if LWIP_DHCP is enabled, UDP packets to DHCP_CLIENT_PORT are passed
+    to netif->dhcp->pcb only (if that exists) and not to any other pcb for the same
+    port (only solution to let UDP pcbs 'bind' to a netif instead of an IP address)
+
+  2007-11-27 Simon Goldschmidt
+  * ip.c: fixed bug #21643 (udp_send/raw_send don't fail if netif is down) by
+    letting ip_route only use netifs that are up.
+
+  2007-11-27 Simon Goldschmidt
+  * err.h, api_lib.c, api_msg.c, sockets.c: Changed error handling: ERR_MEM, ERR_BUF
+    and ERR_RTE are seen as non-fatal, all other errors are fatal. netconns and
+    sockets block most operations once they have seen a fatal error.
+
+  2007-11-27 Simon Goldschmidt
+  * udp.h, udp.c, dhcp.c: Implemented new function udp_sendto_if which takes the
+    netif to send as an argument (to be able to send on netifs that are down).
+
+  2007-11-26 Simon Goldschmidt
+  * tcp_in.c: Fixed bug #21582: pcb->acked accounting can be wrong when ACKs
+    arrive out-of-order
+
+  2007-11-21 Simon Goldschmidt
+  * tcp.h, tcp_out.c, api_msg.c: Fixed bug #20287: tcp_output_nagle sends too early
+    Fixed the nagle algorithm; nagle now also works for all raw API applications
+    and has to be explicitly disabled with 'tcp_pcb->flags |= TF_NODELAY'
+
+  2007-11-12 Fr�d�ric Bernon
+  * sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c: Fixed bug #20900. Now, most
+    of the netconn_peer and netconn_addr processing is done inside tcpip_thread
+    context in do_getaddr.
+
+  2007-11-10 Simon Goldschmidt
+  * etharp.c: Fixed bug: assert fired when MEMP_ARP_QUEUE was empty (which can
+    happen any time). Now the packet simply isn't enqueued when out of memory.
+
+  2007-11-01 Simon Goldschmidt
+  * tcp.c, tcp_in.c: Fixed bug #21494: The send mss (pcb->mss) is set to 536 (or
+    TCP_MSS if that is smaller) as long as no MSS option is received from the
+    remote host.
+
+  2007-11-01 Simon Goldschmidt
+  * tcp.h, tcp.c, tcp_in.c: Fixed bug #21491: The MSS option sent (with SYN)
+    is now based on TCP_MSS instead of pcb->mss (on passive open now effectively
+    sending our configured TCP_MSS instead of the one received).
+
+  2007-11-01 Simon Goldschmidt
+  * tcp_in.c: Fixed bug #21181: On active open, the initial congestion window was
+    calculated based on the configured TCP_MSS, not on the MSS option received
+    with SYN+ACK.
+
+  2007-10-09 Simon Goldschmidt
+  * udp.c, inet.c, inet.h: Fixed UDPLite: send: Checksum was always generated too
+    short and also was generated wrong if checksum coverage != tot_len;
+    receive: checksum was calculated wrong if checksum coverage != tot_len
+
+  2007-10-08 Simon Goldschmidt
+  * mem.c: lfree was not updated in mem_realloc!
+
+  2007-10-07 Fr�d�ric Bernon
+  * sockets.c, api.h, api_lib.c: First step to fix "bug #20900 : Potential
+    crash error problem with netconn_peer & netconn_addr". VERY IMPORTANT:
+    this change cause an API breakage for netconn_addr, since a parameter
+    type change. Any compiler should cause an error without any changes in
+    yours netconn_peer calls (so, it can't be a "silent change"). It also
+    reduce a little bit the footprint for socket layer (lwip_getpeername &
+    lwip_getsockname use now a common lwip_getaddrname function since 
+    netconn_peer & netconn_addr have the same parameters).
+
+  2007-09-20 Simon Goldschmidt
+  * tcp.c: Fixed bug #21080 (tcp_bind without check pcbs in TIME_WAIT state)
+    by checking  tcp_tw_pcbs also
+
+  2007-09-19 Simon Goldschmidt
+  * icmp.c: Fixed bug #21107 (didn't reset IP TTL in ICMP echo replies)
+
+  2007-09-15 Mike Kleshov
+  * mem.c: Fixed bug #21077 (inaccuracy in calculation of lwip_stat.mem.used)
+
+  2007-09-06 Fr�d�ric Bernon
+  * several-files: replace some #include "arch/cc.h" by "lwip/arch.h", or simply remove
+    it as long as "lwip/opt.h" is included before (this one include "lwip/debug.h" which
+    already include "lwip/arch.h"). Like that, default defines are provided by "lwip/arch.h"
+    if they are not defined in cc.h, in the same spirit than "lwip/opt.h" for lwipopts.h.
+
+  2007-08-30 Fr�d�ric Bernon
+  * igmp.h, igmp.c: Some changes to remove some redundant code, add some traces, 
+    and fix some coding style.
+
+  2007-08-28 Fr�d�ric Bernon
+  * tcpip.c: Fix TCPIP_MSG_INPKT processing: now, tcpip_input can be used for any
+    kind of packets. These packets are considered like Ethernet packets (payload 
+    pointing to ethhdr) if the netif got the NETIF_FLAG_ETHARP flag. Else, packets 
+    are considered like IP packets (payload pointing to iphdr).
+
+  2007-08-27 Fr�d�ric Bernon
+  * api.h, api_lib.c, api_msg.c: First fix for "bug #20900 : Potential crash error
+    problem with netconn_peer & netconn_addr". Introduce NETCONN_LISTEN netconn_state
+    and remove obsolete ones (NETCONN_RECV & NETCONN_ACCEPT).
+
+  2007-08-24 Kieran Mansley
+  * inet.c Modify (acc >> 16) test to ((acc >> 16) != 0) to help buggy
+    compiler (Paradigm C++)
+
+  2007-08-09 Fr�d�ric Bernon, Bill Florac
+  * stats.h, stats.c, igmp.h, igmp.c, opt.h: Fix for bug #20503 : IGMP Improvement.
+    Introduce IGMP_STATS to centralize statistics management.
+
+  2007-08-09 Fr�d�ric Bernon, Bill Florac
+  * udp.c: Fix for bug #20503 : IGMP Improvement. Enable to receive a multicast
+    packet on a udp pcb binded on an netif's IP address, and not on "any".
+
+  2007-08-09 Fr�d�ric Bernon, Bill Florac
+  * igmp.h, igmp.c, ip.c: Fix minor changes from bug #20503 : IGMP Improvement.
+    This is mainly on using lookup/lookfor, and some coding styles...
+
+  2007-07-26 Fr�d�ric Bernon (and "thedoctor")
+  * igmp.c: Fix bug #20595 to accept IGMPv3 "Query" messages.
+
+  2007-07-25 Simon Goldschmidt
+  * api_msg.c, tcp.c: Another fix for bug #20021: by not returning an error if
+    tcp_output fails in tcp_close, the code in do_close_internal gets simpler
+    (tcp_output is called again later from tcp timers).
+
+  2007-07-25 Simon Goldschmidt
+  * ip_frag.c: Fixed bug #20429: use the new pbuf_copy_partial instead of the old
+    copy_from_pbuf, which illegally modified the given pbuf.
+
+  2007-07-25 Simon Goldschmidt
+  * tcp_out.c: tcp_enqueue: pcb->snd_queuelen didn't work for chaine PBUF_RAMs:
+    changed snd_queuelen++ to snd_queuelen += pbuf_clen(p).
+
+  2007-07-24 Simon Goldschmidt
+  * api_msg.c, tcp.c: Fix bug #20480: Check the pcb passed to tcp_listen() for the
+    correct state (must be CLOSED).
+
+  2007-07-13 Thomas Taranowski (commited by Jared Grubb)
+  * memp.c: Fix bug #20478: memp_malloc returned NULL+MEMP_SIZE on failed
+    allocation. It now returns NULL.
+
+  2007-07-13 Fr�d�ric Bernon
+  * api_msg.c: Fix bug #20318: api_msg "recv" callbacks don't call pbuf_free in
+    all error cases.
+
+  2007-07-13 Fr�d�ric Bernon
+  * api_msg.c: Fix bug #20315: possible memory leak problem if tcp_listen failed,
+    because current code doesn't follow rawapi.txt documentation.
+
+  2007-07-13 Kieran Mansley
+  * src/core/tcp_in.c Apply patch#5741 from Oleg Tyshev to fix bug in
+    out of sequence processing of received packets
+
+  2007-07-03 Simon Goldschmidt
+  * nearly-all-files: Added assertions where PBUF_RAM pbufs are used and an
+    assumption is made that this pbuf is in one piece (i.e. not chained). These
+    assumptions clash with the possibility of converting to fully pool-based
+    pbuf implementations, where PBUF_RAM pbufs might be chained.
+
+  2007-07-03 Simon Goldschmidt
+  * api.h, api_lib.c, api_msg.c: Final fix for bug #20021 and some other problems
+    when closing tcp netconns: removed conn->sem, less context switches when
+    closing, both netconn_close and netconn_delete should safely close tcp
+    connections.
+
+  2007-07-02 Simon Goldschmidt
+  * ipv4/ip.h, ipv6/ip.h, opt.h, netif.h, etharp.h, ipv4/ip.c, netif.c, raw.c,
+    tcp_out.c, udp.c, etharp.c: Added option LWIP_NETIF_HWADDRHINT (default=off)
+    to cache ARP table indices with each pcb instead of single-entry cache for
+    the complete stack.
+
+  2007-07-02 Simon Goldschmidt
+  * tcp.h, tcp.c, tcp_in.c, tcp_out.c: Added some ASSERTS and casts to prevent
+    warnings when assigning to smaller types.
+
+  2007-06-28 Simon Goldschmidt
+  * tcp_out.c: Added check to prevent tcp_pcb->snd_queuelen from overflowing.
+
+  2007-06-28 Simon Goldschmidt
+  * tcp.h: Fixed bug #20287: Fixed nagle algorithm (sending was done too early if
+    a segment contained chained pbufs)
+
+  2007-06-28 Fr�d�ric Bernon
+  * autoip.c: replace most of rand() calls by a macro LWIP_AUTOIP_RAND which compute
+    a "pseudo-random" value based on netif's MAC and some autoip fields. It's always
+    possible to define this macro in your own lwipopts.h to always use C library's
+    rand(). Note that autoip_create_rand_addr doesn't use this macro.
+
+  2007-06-28 Fr�d�ric Bernon
+  * netifapi.h, netifapi.c, tcpip.h, tcpip.c: Update code to handle the option
+    LWIP_TCPIP_CORE_LOCKING, and do some changes to be coherent with last modifications
+    in api_lib/api_msg (use pointers and not type with table, etc...) 
+
+  2007-06-26 Simon Goldschmidt
+  * udp.h: Fixed bug #20259: struct udp_hdr was lacking the packin defines.
+
+  2007-06-25 Simon Goldschmidt
+  * udp.c: Fixed bug #20253: icmp_dest_unreach was called with a wrong p->payload
+    for udp packets with no matching pcb.
+
+  2007-06-25 Simon Goldschmidt
+  * udp.c: Fixed bug #20220: UDP PCB search in udp_input(): a non-local match
+    could get udp input packets if the remote side matched.
+
+  2007-06-13 Simon Goldschmidt
+  * netif.c: Fixed bug #20180 (TCP pcbs listening on IP_ADDR_ANY could get
+    changed in netif_set_ipaddr if previous netif->ip_addr.addr was 0.
+
+  2007-06-13 Simon Goldschmidt
+  * api_msg.c: pcb_new sets conn->err if protocol is not implemented
+    -> netconn_new_..() does not allocate a new connection for unsupported
+    protocols.
+
+  2007-06-13 Fr�d�ric Bernon, Simon Goldschmidt
+  * api_lib.c: change return expression in netconn_addr and netconn_peer, because
+    conn->err was reset to ERR_OK without any reasons (and error was lost)...
+
+  2007-06-13 Fr�d�ric Bernon, Matthias Weisser
+  * opt.h, mem.h, mem.c, memp.c, pbuf.c, ip_frag.c, vj.c: Fix bug #20162. Rename
+    MEM_ALIGN in LWIP_MEM_ALIGN and MEM_ALIGN_SIZE in LWIP_MEM_ALIGN_SIZE to avoid
+    some macro names collision with some OS macros.
+
+  2007-06-11 Simon Goldschmidt
+  * udp.c: UDP Lite: corrected the use of chksum_len (based on RFC3828: if it's 0,
+    create checksum over the complete packet. On RX, if it's < 8 (and not 0),
+    discard the packet. Also removed the duplicate 'udphdr->chksum = 0' for both
+    UDP & UDP Lite.
+
+  2007-06-11 Srinivas Gollakota & Oleg Tyshev
+  * tcp_out.c: Fix for bug #20075 : "A problem with keep-alive timer and TCP flags"
+    where TCP flags wasn't initialized in tcp_keepalive.
+
+  2007-06-03 Simon Goldschmidt
+  * udp.c: udp_input(): Input pbuf was not freed if pcb had no recv function
+    registered, p->payload was modified without modifying p->len if sending
+    icmp_dest_unreach() (had no negative effect but was definitively wrong).
+
+  2007-06-03 Simon Goldschmidt
+  * icmp.c: Corrected bug #19937: For responding to an icmp echo request, icmp
+    re-used the input pbuf even if that didn't have enough space to include the
+    link headers. Now the space is tested and a new pbuf is allocated for the
+    echo response packet if the echo request pbuf isn't big enough.
+
+  2007-06-01 Simon Goldschmidt
+  * sockets.c: Checked in patch #5914: Moved sockopt processing into tcpip_thread.
+
+  2007-05-23 Fr�d�ric Bernon
+  * api_lib.c, sockets.c: Fixed bug #5958 for netconn_listen (acceptmbox only
+    allocated by do_listen if success) and netconn_accept errors handling. In
+    most of api_lib functions, we replace some errors checkings like "if (conn==NULL)"
+    by ASSERT, except for netconn_delete.
+
+  2007-05-23 Fr�d�ric Bernon
+  * api_lib.c: Fixed bug #5957 "Safe-thread problem inside netconn_recv" to return
+    an error code if it's impossible to fetch a pbuf on a TCP connection (and not
+    directly close the recvmbox).
+
+  2007-05-22 Simon Goldschmidt
+  * tcp.c: Fixed bug #1895 (tcp_bind not correct) by introducing a list of
+    bound but unconnected (and non-listening) tcp_pcbs.
+
+  2007-05-22 Fr�d�ric Bernon
+  * sys.h, sys.c, api_lib.c, tcpip.c: remove sys_mbox_fetch_timeout() (was only
+    used for LWIP_SO_RCVTIMEO option) and use sys_arch_mbox_fetch() instead of
+    sys_mbox_fetch() in api files. Now, users SHOULD NOT use internal lwIP features
+    like "sys_timeout" in their application threads.
+
+  2007-05-22 Fr�d�ric Bernon
+  * api.h, api_lib.c, api_msg.h, api_msg.c: change the struct api_msg_msg to see
+    which parameters are used by which do_xxx function, and to avoid "misusing"
+    parameters (patch #5938).
+
+  2007-05-22 Simon Goldschmidt
+  * api_lib.c, api_msg.c, raw.c, api.h, api_msg.h, raw.h: Included patch #5938:
+    changed raw_pcb.protocol from u16_t to u8_t since for IPv4 and IPv6, proto
+    is only 8 bits wide. This affects the api, as there, the protocol was
+    u16_t, too.
+
+  2007-05-18 Simon Goldschmidt
+  * memp.c: addition to patch #5913: smaller pointer was returned but
+    memp_memory was the same size -> did not save memory.
+
+  2007-05-16 Simon Goldschmidt
+  * loopif.c, slipif.c: Fix bug #19729: free pbuf if netif->input() returns
+    != ERR_OK.
+
+  2007-05-16 Simon Goldschmidt
+  * api_msg.c, udp.c: If a udp_pcb has a local_ip set, check if it is the same
+    as the one of the netif used for sending to prevent sending from old
+    addresses after a netif address gets changed (partly fixes bug #3168).
+
+  2007-05-16 Fr�d�ric Bernon
+  * tcpip.c, igmp.h, igmp.c: Fixed bug "#19800 : IGMP: igmp_tick() will not work
+    with NO_SYS=1". Note that igmp_init is always in tcpip_thread (and not in 
+    tcpip_init) because we have to be sure that network interfaces are already
+    added (mac filter is updated only in igmp_init for the moment).
+
+  2007-05-16 Simon Goldschmidt
+  * mem.c, memp.c: Removed semaphores from memp, changed sys_sem_wait calls
+    into sys_arch_sem_wait calls to prevent timers from running while waiting
+    for the heap. This fixes bug #19167.
+
+  2007-05-13 Simon Goldschmidt
+  * tcp.h, sockets.h, sockets.c: Fixed bug from patch #5865 by moving the defines
+    for socket options (lwip_set/-getsockopt) used with level IPPROTO_TCP from
+    tcp.h to sockets.h.
+
+  2007-05-07 Simon Goldschmidt
+  * mem.c: Another attempt to fix bug #17922.
+
+  2007-05-04 Simon Goldschmidt
+  * pbuf.c, pbuf.h, etharp.c: Further update to ARP queueing: Changed pbuf_copy()
+    implementation so that it can be reused (don't allocate the target
+    pbuf inside pbuf_copy()).
+
+  2007-05-04 Simon Goldschmidt
+  * memp.c: checked in patch #5913: in memp_malloc() we can return memp as mem
+    to save a little RAM (next pointer of memp is not used while not in pool).
+
+  2007-05-03 "maq"
+  * sockets.c: Fix ioctl FIONREAD when some data remains from last recv.
+    (patch #3574).
+
+  2007-04-23 Simon Goldschmidt
+  * loopif.c, loopif.h, opt.h, src/netif/FILES: fix bug #2595: "loopif results
+    in NULL reference for incoming TCP packets". Loopif has to be configured
+    (using LWIP_LOOPIF_MULTITHREADING) to directly call netif->input()
+    (multithreading environments, e.g. netif->input() = tcpip_input()) or
+    putting packets on a list that is fed to the stack by calling loopif_poll()
+    (single-thread / NO_SYS / polling environment where e.g.
+    netif->input() = ip_input).
+
+  2007-04-17 Jonathan Larmour
+  * pbuf.c: Use s32_t in pbuf_realloc(), as an s16_t can't reliably hold
+    the difference between two u16_t's.
+  * sockets.h: FD_SETSIZE needs to match number of sockets, which is
+    MEMP_NUM_NETCONN in sockets.c right now.
+
+  2007-04-12 Jonathan Larmour
+  * icmp.c: Reset IP header TTL in ICMP ECHO responses (bug #19580).
+
+  2007-04-12 Kieran Mansley
+  * tcp.c, tcp_in.c, tcp_out.c, tcp.h: Modify way the retransmission
+    timer is reset to fix bug#19434, with help from Oleg Tyshev.
+
+  2007-04-11 Simon Goldschmidt
+  * etharp.c, pbuf.c, pbuf.h: 3rd fix for bug #11400 (arp-queuing): More pbufs than
+    previously thought need to be copied (everything but PBUF_ROM!). Cleaned up
+    pbuf.c: removed functions no needed any more (by etharp).
+
+  2007-04-11 Kieran Mansley
+  * inet.c, ip_addr.h, sockets.h, sys.h, tcp.h: Apply patch #5745: Fix
+    "Constant is long" warnings with 16bit compilers.  Contributed by
+    avatar@mmlab.cse.yzu.edu.tw
+
+  2007-04-05 Fr�d�ric Bernon, Jonathan Larmour
+  * api_msg.c: Fix bug #16830: "err_tcp() posts to connection mailbox when no pend on
+    the mailbox is active". Now, the post is only done during a connect, and do_send,
+    do_write and do_join_leave_group don't do anything if a previous error was signaled.
+
+  2007-04-03 Fr�d�ric Bernon
+  * ip.c: Don't set the IP_DF ("Don't fragment") flag in the IP header in IP output
+    packets. See patch #5834.
+
+  2007-03-30 Fr�d�ric Bernon
+  * api_msg.c: add a "pcb_new" helper function to avoid redundant code, and to add
+    missing  pcb allocations checking (in do_bind, and for each raw_new). Fix style.
+
+  2007-03-30 Fr�d�ric Bernon
+  * most of files: prefix all debug.h define with "LWIP_" to avoid any conflict with
+    others environment defines (these were too "generic").
+
+  2007-03-28 Fr�d�ric Bernon
+  * api.h, api_lib.c, sockets.c: netbuf_ref doesn't check its internal pbuf_alloc call
+    result and can cause a crash. lwip_send now check netbuf_ref result.
+
+  2007-03-28 Simon Goldschmidt
+  * sockets.c Remove "#include <errno.h>" from sockets.c to avoid multiple
+    definition of macros (in errno.h and lwip/arch.h) if LWIP_PROVIDE_ERRNO is
+    defined. This is the way it should have been already (looking at
+    doc/sys_arch.txt)
+
+  2007-03-28 Kieran Mansley
+  * opt.h Change default PBUF_POOL_BUFSIZE (again) to accomodate default MSS +
+    IP and TCP headers *and* physical link headers
+
+  2007-03-26 Fr�d�ric Bernon (based on patch from Dmitry Potapov)
+  * api_lib.c: patch for netconn_write(), fixes a possible race condition which cause
+    to send some garbage. It is not a definitive solution, but the patch does solve
+    the problem for most cases.
+
+  2007-03-22 Fr�d�ric Bernon
+  * api_msg.h, api_msg.c: Remove obsolete API_MSG_ACCEPT and do_accept (never used).
+
+  2007-03-22 Fr�d�ric Bernon
+  * api_lib.c: somes resources couldn't be freed if there was errors during
+    netconn_new_with_proto_and_callback.
+
+  2007-03-22 Fr�d�ric Bernon
+  * ethernetif.c: update netif->input calls to check return value. In older ports,
+    it's a good idea to upgrade them, even if before, there could be another problem
+    (access to an uninitialized mailbox).
+
+  2007-03-21 Simon Goldschmidt
+  * sockets.c: fixed bug #5067 (essentialy a signed/unsigned warning fixed
+    by casting to unsigned).
+
+  2007-03-21 Fr�d�ric Bernon
+  * api_lib.c, api_msg.c, tcpip.c: integrate sys_mbox_fetch(conn->mbox, NULL) calls from
+    api_lib.c to tcpip.c's tcpip_apimsg(). Now, use a local variable and not a
+    dynamic one from memp to send tcpip_msg to tcpip_thread in a synchrone call.
+    Free tcpip_msg from tcpip_apimsg is not done in tcpip_thread. This give a
+    faster and more reliable communication between api_lib and tcpip.
+
+  2007-03-21 Fr�d�ric Bernon
+  * opt.h: Add LWIP_NETIF_CALLBACK (to avoid compiler warning) and set it to 0.
+
+  2007-03-21 Fr�d�ric Bernon
+  * api_msg.c, igmp.c, igmp.h: Fix C++ style comments
+
+  2007-03-21 Kieran Mansley
+  * opt.h Change default PBUF_POOL_BUFSIZE to accomodate default MSS +
+    IP and TCP headers
+
+  2007-03-21 Kieran Mansley
+  * Fix all uses of pbuf_header to check the return value.  In some
+    cases just assert if it fails as I'm not sure how to fix them, but
+    this is no worse than before when they would carry on regardless
+    of the failure.
+
+  2007-03-21 Kieran Mansley
+  * sockets.c, igmp.c, igmp.h, memp.h: Fix C++ style comments and
+    comment out missing header include in icmp.c
+
+  2007-03-20 Fr�d�ric Bernon
+  * memp.h, stats.c: Fix stats_display function where memp_names table wasn't
+    synchronized with memp.h.
+
+  2007-03-20 Fr�d�ric Bernon
+  * tcpip.c: Initialize tcpip's mbox, and verify if initialized in tcpip_input,
+    tcpip_ethinput, tcpip_callback, tcpip_apimsg, to fix a init problem with 
+    network interfaces. Also fix a compiler warning.
+
+  2007-03-20 Kieran Mansley
+  * udp.c: Only try and use pbuf_header() to make space for headers if
+    not a ROM or REF pbuf.
+
+  2007-03-19 Fr�d�ric Bernon
+  * api_msg.h, api_msg.c, tcpip.h, tcpip.c: Add return types to tcpip_apimsg()
+    and api_msg_post().
+
+  2007-03-19 Fr�d�ric Bernon
+  * Remove unimplemented "memp_realloc" function from memp.h.
+
+  2007-03-11 Simon Goldschmidt
+  * pbuf.c: checked in patch #5796: pbuf_alloc: len field claculation caused
+    memory corruption.
+
+  2007-03-11 Simon Goldschmidt (based on patch from Dmitry Potapov)
+  * api_lib.c, sockets.c, api.h, api_msg.h, sockets.h: Fixed bug #19251
+    (missing `const' qualifier in socket functions), to get more compatible to
+    standard POSIX sockets.
+
+  2007-03-11 Fr�d�ric Bernon (based on patch from Dmitry Potapov)
+  * sockets.c: Add asserts inside bind, connect and sendto to check input
+    parameters. Remove excessive set_errno() calls after get_socket(), because
+    errno is set inside of get_socket(). Move last sock_set_errno() inside
+    lwip_close.
+
+  2007-03-09 Simon Goldschmidt
+  * memp.c: Fixed bug #11400: New etharp queueing introduced bug: memp_memory
+    was allocated too small.
+
+  2007-03-06 Simon Goldschmidt
+  * tcpip.c: Initialize dhcp timers in tcpip_thread (if LWIP_DHCP) to protect
+    the stack from concurrent access.
+
+  2007-03-06 Fr�d�ric Bernon, Dmitry Potapov
+  * tcpip.c, ip_frag.c, ethernetif.c: Fix some build problems, and a redundancy
+    call to "lwip_stats.link.recv++;" in low_level_input() & ethernetif_input().
+
+  2007-03-06 Simon Goldschmidt
+  * ip_frag.c, ip_frag.h: Reduce code size: don't include code in those files
+    if IP_FRAG == 0 and IP_REASSEMBLY == 0
+
+  2007-03-06 Fr�d�ric Bernon, Simon Goldschmidt
+  * opt.h, ip_frag.h, tcpip.h, tcpip.c, ethernetif.c: add new configuration
+    option named ETHARP_TCPIP_ETHINPUT, which enable the new tcpip_ethinput.
+    Allow to do ARP processing for incoming packets inside tcpip_thread
+    (protecting ARP layer against concurrent access). You can also disable
+    old code using tcp_input with new define ETHARP_TCPIP_INPUT set to 0.
+    Older ports have to use tcpip_ethinput.
+
+  2007-03-06 Simon Goldschmidt (based on patch from Dmitry Potapov)
+  * err.h, err.c: fixed compiler warning "initialization dircards qualifiers
+    from pointer target type"
+
+  2007-03-05 Fr�d�ric Bernon
+  * opt.h, sockets.h: add new configuration options (LWIP_POSIX_SOCKETS_IO_NAMES,
+    ETHARP_TRUST_IP_MAC, review SO_REUSE)
+
+  2007-03-04 Fr�d�ric Bernon
+  * api_msg.c: Remove some compiler warnings : parameter "pcb" was never
+    referenced.
+
+  2007-03-04 Fr�d�ric Bernon
+  * api_lib.c: Fix "[patch #5764] api_lib.c cleanup: after patch #5687" (from
+    Dmitry Potapov).
+    The api_msg struct stay on the stack (not moved to netconn struct).
+
+  2007-03-04 Simon Goldschmidt (based on patch from Dmitry Potapov)
+  * pbuf.c: Fix BUG#19168 - pbuf_free can cause deadlock (if
+    SYS_LIGHTWEIGHT_PROT=1 & freeing PBUF_RAM when mem_sem is not available)
+    Also fixed cast warning in pbuf_alloc()
+
+  2007-03-04 Simon Goldschmidt
+  * etharp.c, etharp.h, memp.c, memp.h, opt.h: Fix BUG#11400 - don't corrupt
+    existing pbuf chain when enqueuing multiple pbufs to a pending ARP request
+
+  2007-03-03 Fr�d�ric Bernon
+  * udp.c: remove obsolete line "static struct udp_pcb *pcb_cache = NULL;"
+    It is static, and never used in udp.c except udp_init().
+
+  2007-03-02 Simon Goldschmidt
+  * tcpip.c: Moved call to ip_init(), udp_init() and tcp_init() from
+    tcpip_thread() to tcpip_init(). This way, raw API connections can be
+    initialized before tcpip_thread is running (e.g. before OS is started)
+
+  2007-03-02 Fr�d�ric Bernon
+  * rawapi.txt: Fix documentation mismatch with etharp.h about etharp_tmr's call
+    interval.
+
+  2007-02-28 Kieran Mansley 
+  * pbuf.c: Fix BUG#17645 - ensure pbuf payload pointer is not moved
+    outside the region of the pbuf by pbuf_header()
+
+  2007-02-28 Kieran Mansley 
+  * sockets.c: Fix BUG#19161 - ensure milliseconds timeout is non-zero
+    when supplied timeout is also non-zero 
+
+(STABLE-1.2.0)
+
+  2006-12-05 Leon Woestenberg
+  * CHANGELOG: Mention STABLE-1.2.0 release.
+
+  ++ New features:
+
+  2006-12-01 Christiaan Simons
+  * mem.h, opt.h: Added MEM_LIBC_MALLOC option.
+    Note this is a workaround. Currently I have no other options left.
+
+  2006-10-26 Christiaan Simons (accepted patch by Jonathan Larmour)
+  * ipv4/ip_frag.c: rename MAX_MTU to IP_FRAG_MAX_MTU and move define
+    to include/lwip/opt.h.
+  * ipv4/lwip/ip_frag.h: Remove unused IP_REASS_INTERVAL.
+    Move IP_REASS_MAXAGE and IP_REASS_BUFSIZE to include/lwip/opt.h.
+  * opt.h: Add above new options.
+
+  2006-08-18 Christiaan Simons
+  * tcp_{in,out}.c: added SNMP counters.
+  * ipv4/ip.c: added SNMP counters.
+  * ipv4/ip_frag.c: added SNMP counters.
+
+  2006-08-08 Christiaan Simons
+  * etharp.{c,h}: added etharp_find_addr() to read
+    (stable) ethernet/IP address pair from ARP table
+
+  2006-07-14 Christiaan Simons
+  * mib_structs.c: added
+  * include/lwip/snmp_structs.h: added
+  * netif.{c,h}, netif/ethernetif.c: added SNMP statistics to netif struct
+
+  2006-07-06 Christiaan Simons
+  * snmp/asn1_{enc,dec}.c added
+  * snmp/mib2.c added
+  * snmp/msg_{in,out}.c added
+  * include/lwip/snmp_asn1.h added
+  * include/lwip/snmp_msg.h added
+  * doc/snmp_agent.txt added
+
+  2006-03-29 Christiaan Simons
+  * inet.c, inet.h: Added platform byteswap support.
+    Added LWIP_PLATFORM_BYTESWAP define (defaults to 0) and
+    optional LWIP_PLATFORM_HTONS(), LWIP_PLATFORM_HTONL() macros.
+
+  ++ Bug fixes:
+
+  2006-11-30 Christiaan Simons
+  * dhcp.c: Fixed false triggers of request_timeout.
+
+  2006-11-28 Christiaan Simons
+  * netif.c: In netif_add() fixed missing clear of ip_addr, netmask, gw and flags.
+
+  2006-10-11 Christiaan Simons
+  * api_lib.c etharp.c, ip.c, memp.c, stats.c, sys.{c,h} tcp.h:
+    Partially accepted patch #5449 for ANSI C compatibility / build fixes.
+  * ipv4/lwip/ip.h ipv6/lwip/ip.h: Corrected UDP-Lite protocol
+    identifier from 170 to 136 (bug #17574).
+
+  2006-10-10 Christiaan Simons
+  * api_msg.c: Fixed Nagle algorithm as reported by Bob Grice.
+
+  2006-08-17 Christiaan Simons
+  * udp.c: Fixed bug #17200, added check for broadcast
+    destinations for PCBs bound to a unicast address.
+
+  2006-08-07 Christiaan Simons
+  * api_msg.c: Flushing TCP output in do_close() (bug #15926).
+
+  2006-06-27 Christiaan Simons
+  * api_msg.c: Applied patch for cold case (bug #11135).
+    In accept_function() ensure newconn->callback is always initialized.
+
+  2006-06-15 Christiaan Simons
+  * mem.h: added MEM_SIZE_F alias to fix an ancient cold case (bug #1748),
+    facilitate printing of mem_size_t and u16_t statistics.
+
+  2006-06-14 Christiaan Simons
+  * api_msg.c: Applied patch #5146 to handle allocation failures
+    in accept() by Kevin Lawson.
+
+  2006-05-26 Christiaan Simons
+  * api_lib.c: Removed conn->sem creation and destruction 
+    from netconn_write() and added sys_sem_new to netconn_new_*.
+
+(STABLE-1_1_1)
+
+  2006-03-03  Christiaan Simons
+  * ipv4/ip_frag.c: Added bound-checking assertions on ip_reassbitmap
+    access and added pbuf_alloc() return value checks.
+
+  2006-01-01  Leon Woestenberg <leon.woestenberg@gmx.net>
+  * tcp_{in,out}.c, tcp_out.c: Removed 'even sndbuf' fix in TCP, which is
+    now handled by the checksum routine properly.
+
+  2006-02-27  Leon Woestenberg <leon.woestenberg@gmx.net>
+   * pbuf.c: Fix alignment; pbuf_init() would not work unless
+     pbuf_pool_memory[] was properly aligned. (Patch by Curt McDowell.)
+
+  2005-12-20  Leon Woestenberg <leon.woestenberg@gmx.net>
+  * tcp.c: Remove PCBs which stay in LAST_ACK state too long. Patch
+    submitted by Mitrani Hiroshi.
+
+  2005-12-15  Christiaan Simons
+  * inet.c: Disabled the added summing routine to preserve code space.
+
+  2005-12-14  Leon Woestenberg <leon.woestenberg@gmx.net>
+  * tcp_in.c: Duplicate FIN ACK race condition fix by Kelvin Lawson.
+    Added Curt McDowell's optimized checksumming routine for future
+    inclusion. Need to create test case for unaliged, aligned, odd,
+    even length combination of cases on various endianess machines.
+
+  2005-12-09  Christiaan Simons
+  * inet.c: Rewrote standard checksum routine in proper portable C.
+
+  2005-11-25  Christiaan Simons
+  * udp.c tcp.c: Removed SO_REUSE hack. Should reside in socket code only.
+  * *.c: introduced cc.h LWIP_DEBUG formatters matching the u16_t, s16_t,
+    u32_t, s32_t typedefs. This solves most debug word-length assumes.
+
+  2005-07-17 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * inet.c: Fixed unaligned 16-bit access in the standard checksum
+    routine by Peter Jolasson.
+  * slipif.c: Fixed implementation assumption of single-pbuf datagrams.
+
+  2005-02-04 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * tcp_out.c: Fixed uninitialized 'queue' referenced in memerr branch.
+  * tcp_{out|in}.c: Applied patch fixing unaligned access.
+
+  2005-01-04 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * pbuf.c: Fixed missing semicolon after LWIP_DEBUG statement.
+
+  2005-01-03 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * udp.c: UDP pcb->recv() was called even when it was NULL.
+
+(STABLE-1_1_0)
+
+  2004-12-28 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * etharp.*: Disabled multiple packets on the ARP queue.
+    This clashes with TCP queueing.
+
+  2004-11-28 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * etharp.*: Fixed race condition from ARP request to ARP timeout.
+    Halved the ARP period, doubled the period counts.
+    ETHARP_MAX_PENDING now should be at least 2. This prevents
+    the counter from reaching 0 right away (which would allow
+    too little time for ARP responses to be received).
+
+  2004-11-25 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * dhcp.c: Decline messages were not multicast but unicast.
+  * etharp.c: ETHARP_CREATE is renamed to ETHARP_TRY_HARD.
+    Do not try hard to insert arbitrary packet's source address,
+    etharp_ip_input() now calls etharp_update() without ETHARP_TRY_HARD. 
+    etharp_query() now always DOES call ETHARP_TRY_HARD so that users
+    querying an address will see it appear in the cache (DHCP could
+    suffer from this when a server invalidly gave an in-use address.)
+  * ipv4/ip_addr.h: Renamed ip_addr_maskcmp() to _netcmp() as we are
+    comparing network addresses (identifiers), not the network masks
+    themselves.
+  * ipv4/ip_addr.c: ip_addr_isbroadcast() now checks that the given
+    IP address actually belongs to the network of the given interface.
+
+  2004-11-24 Kieran Mansley <kjm25@cam.ac.uk>
+  * tcp.c: Increment pcb->snd_buf when ACK is received in SYN_SENT state.
+
+(STABLE-1_1_0-RC1)
+
+  2004-10-16 Kieran Mansley <kjm25@cam.ac.uk>
+  * tcp.c: Add code to tcp_recved() to send an ACK (window update) immediately,
+    even if one is already pending, if the rcv_wnd is above a threshold
+    (currently TCP_WND/2). This avoids waiting for a timer to expire to send a
+    delayed ACK in order to open the window if the stack is only receiving data.
+
+  2004-09-12 Kieran Mansley <kjm25@cam.ac.uk>
+  * tcp*.*: Retransmit time-out handling improvement by Sam Jansen.
+
+  2004-08-20 Tony Mountifield <tony@softins.co.uk>
+  * etharp.c: Make sure the first pbuf queued on an ARP entry
+    is properly ref counted.
+
+  2004-07-27 Tony Mountifield <tony@softins.co.uk>
+  * debug.h: Added (int) cast in LWIP_DEBUGF() to avoid compiler
+    warnings about comparison.
+  * pbuf.c: Stopped compiler complaining of empty if statement
+    when LWIP_DEBUGF() empty.  Closed an unclosed comment.
+  * tcp.c: Stopped compiler complaining of empty if statement
+    when LWIP_DEBUGF() empty.
+  * ip.h Corrected IPH_TOS() macro: returns a byte, so doesn't need htons().
+  * inet.c: Added a couple of casts to quiet the compiler.
+    No need to test isascii(c) before isdigit(c) or isxdigit(c).
+
+  2004-07-22 Tony Mountifield <tony@softins.co.uk>
+  * inet.c: Made data types consistent in inet_ntoa().
+    Added casts for return values of checksum routines, to pacify compiler.
+  * ip_frag.c, tcp_out.c, sockets.c, pbuf.c
+    Small corrections to some debugging statements, to pacify compiler.
+
+  2004-07-21 Tony Mountifield <tony@softins.co.uk>
+  * etharp.c: Removed spurious semicolon and added missing end-of-comment.
+  * ethernetif.c Updated low_level_output() to match prototype for
+    netif->linkoutput and changed low_level_input() similarly for consistency.
+  * api_msg.c: Changed recv_raw() from int to u8_t, to match prototype
+    of raw_recv() in raw.h and so avoid compiler error.
+  * sockets.c: Added trivial (int) cast to keep compiler happier.
+  * ip.c, netif.c Changed debug statements to use the tidier ip4_addrN() macros.
+
+(STABLE-1_0_0)
+
+  ++ Changes:
+
+  2004-07-05 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * sockets.*: Restructured LWIP_PRIVATE_TIMEVAL. Make sure
+    your cc.h file defines this either 1 or 0. If non-defined,
+    defaults to 1.
+  * .c: Added <string.h> and <errno.h> includes where used.
+  * etharp.c: Made some array indices unsigned.
+
+  2004-06-27 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * netif.*: Added netif_set_up()/down().
+  * dhcp.c: Changes to restart program flow.
+
+  2004-05-07 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * etharp.c: In find_entry(), instead of a list traversal per candidate, do a
+    single-pass lookup for different candidates. Should exploit locality.
+
+  2004-04-29 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * tcp*.c: Cleaned up source comment documentation for Doxygen processing.
+  * opt.h: ETHARP_ALWAYS_INSERT option removed to comply with ARP RFC.
+  * etharp.c: update_arp_entry() only adds new ARP entries when adviced to by
+    the caller. This deprecates the ETHARP_ALWAYS_INSERT overrule option.
+
+  ++ Bug fixes:
+
+  2004-04-27 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * etharp.c: Applied patch of bug #8708 by Toni Mountifield with a solution
+    suggested by Timmy Brolin. Fix for 32-bit processors that cannot access
+    non-aligned 32-bit words, such as soms 32-bit TCP/IP header fields. Fix
+    is to prefix the 14-bit Ethernet headers with two padding bytes.
+
+  2004-04-23 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * ip_addr.c: Fix in the ip_addr_isbroadcast() check.
+  * etharp.c: Fixed the case where the packet that initiates the ARP request
+    is not queued, and gets lost. Fixed the case where the packets destination
+    address is already known; we now always queue the packet and perform an ARP
+    request.
+
+(STABLE-0_7_0)
+
+  ++ Bug fixes:
+
+  * Fixed TCP bug for SYN_SENT to ESTABLISHED state transition.
+  * Fixed TCP bug in dequeueing of FIN from out of order segment queue.
+  * Fixed two possible NULL references in rare cases.
+
+(STABLE-0_6_6)
+
+  ++ Bug fixes:
+
+  * Fixed DHCP which did not include the IP address in DECLINE messages.
+
+  ++ Changes:
+
+  * etharp.c has been hauled over a bit.
+
+(STABLE-0_6_5)
+
+  ++ Bug fixes:
+
+  * Fixed TCP bug induced by bad window resizing with unidirectional TCP traffic.
+  * Packets sent from ARP queue had invalid source hardware address.
+
+  ++ Changes:
+
+  * Pass-by ARP requests do now update the cache.
+
+  ++ New features:
+
+  * No longer dependent on ctype.h.
+  * New socket options.
+  * Raw IP pcb support.
+
+(STABLE-0_6_4)
+
+  ++ Bug fixes:
+
+  * Some debug formatters and casts fixed.
+  * Numereous fixes in PPP.
+
+  ++ Changes:
+
+  * DEBUGF now is LWIP_DEBUGF
+  * pbuf_dechain() has been re-enabled.
+  * Mentioned the changed use of CVS branches in README.
+
+(STABLE-0_6_3)
+
+  ++ Bug fixes:
+
+  * Fixed pool pbuf memory leak in pbuf_alloc().
+    Occured if not enough PBUF_POOL pbufs for a packet pbuf chain.
+    Reported by Savin Zlobec.
+
+  * PBUF_POOL chains had their tot_len field not set for non-first
+    pbufs. Fixed in pbuf_alloc().
+
+  ++ New features:
+
+  * Added PPP stack contributed by Marc Boucher
+
+  ++ Changes:
+
+  * Now drops short packets for ICMP/UDP/TCP protocols. More robust.
+
+  * ARP queueuing now queues the latest packet instead of the first.
+    This is the RFC recommended behaviour, but can be overridden in
+    lwipopts.h.
+
+(0.6.2)
+
+  ++ Bugfixes:
+
+  * TCP has been fixed to deal with the new use of the pbuf->ref
+    counter.
+
+  * DHCP dhcp_inform() crash bug fixed.
+
+  ++ Changes:
+
+  * Removed pbuf_pool_free_cache and pbuf_pool_alloc_cache. Also removed
+    pbuf_refresh(). This has sped up pbuf pool operations considerably.
+    Implemented by David Haas.
+
+(0.6.1)
+
+  ++ New features:
+
+  * The packet buffer implementation has been enhanced to support
+    zero-copy and copy-on-demand for packet buffers which have their
+    payloads in application-managed memory.
+    Implemented by David Haas.
+
+    Use PBUF_REF to make a pbuf refer to RAM. lwIP will use zero-copy
+    if an outgoing packet can be directly sent on the link, or perform
+    a copy-on-demand when necessary.
+
+    The application can safely assume the packet is sent, and the RAM
+    is available to the application directly after calling udp_send()
+    or similar function.
+
+  ++ Bugfixes:
+
+  * ARP_QUEUEING should now correctly work for all cases, including
+    PBUF_REF.
+    Implemented by Leon Woestenberg.
+
+  ++ Changes:
+
+  * IP_ADDR_ANY is no longer a NULL pointer. Instead, it is a pointer
+    to a '0.0.0.0' IP address.
+
+  * The packet buffer implementation is changed. The pbuf->ref counter
+    meaning has changed, and several pbuf functions have been
+    adapted accordingly.
+
+  * netif drivers have to be changed to set the hardware address length field
+    that must be initialized correctly by the driver (hint: 6 for Ethernet MAC).
+    See the contrib/ports/c16x cs8900 driver as a driver example.
+
+  * netif's have a dhcp field that must be initialized to NULL by the driver.
+    See the contrib/ports/c16x cs8900 driver as a driver example.
+
+(0.5.x) This file has been unmaintained up to 0.6.1. All changes are
+  logged in CVS but have not been explained here.
+
+(0.5.3) Changes since version 0.5.2
+
+  ++ Bugfixes:
+
+  * memp_malloc(MEMP_API_MSG) could fail with multiple application
+    threads because it wasn't protected by semaphores.
+
+  ++ Other changes:
+
+  * struct ip_addr now packed.
+
+  * The name of the time variable in arp.c has been changed to ctime
+    to avoid conflicts with the time() function.
+
+(0.5.2) Changes since version 0.5.1
+
+  ++ New features:
+
+  * A new TCP function, tcp_tmr(), now handles both TCP timers.
+
+  ++ Bugfixes:
+
+  * A bug in tcp_parseopt() could cause the stack to hang because of a
+    malformed TCP option.
+
+  * The address of new connections in the accept() function in the BSD
+    socket library was not handled correctly.
+
+  * pbuf_dechain() did not update the ->tot_len field of the tail.
+
+  * Aborted TCP connections were not handled correctly in all
+    situations.
+
+  ++ Other changes:
+
+  * All protocol header structs are now packed.
+
+  * The ->len field in the tcp_seg structure now counts the actual
+    amount of data, and does not add one for SYN and FIN segments.
+
+(0.5.1) Changes since version 0.5.0
+
+  ++ New features:
+
+  * Possible to run as a user process under Linux.
+
+  * Preliminary support for cross platform packed structs.
+
+  * ARP timer now implemented.
+
+  ++ Bugfixes:
+
+  * TCP output queue length was badly initialized when opening
+    connections.
+
+  * TCP delayed ACKs were not sent correctly.
+
+  * Explicit initialization of BSS segment variables.
+
+  * read() in BSD socket library could drop data.
+
+  * Problems with memory alignment.
+
+  * Situations when all TCP buffers were used could lead to
+    starvation.
+
+  * TCP MSS option wasn't parsed correctly.
+
+  * Problems with UDP checksum calculation.
+
+  * IP multicast address tests had endianess problems.
+
+  * ARP requests had wrong destination hardware address.
+
+  ++ Other changes:
+
+  * struct eth_addr changed from u16_t[3] array to u8_t[6].
+
+  * A ->linkoutput() member was added to struct netif.
+
+  * TCP and UDP ->dest_* struct members where changed to ->remote_*.
+
+  * ntoh* macros are now null definitions for big endian CPUs.
+
+(0.5.0) Changes since version 0.4.2
+
+  ++ New features:
+
+  * Redesigned operating system emulation layer to make porting easier.
+
+  * Better control over TCP output buffers.
+
+  * Documenation added.
+
+  ++ Bugfixes:
+
+  * Locking issues in buffer management.
+
+  * Bugfixes in the sequential API.
+
+  * IP forwarding could cause memory leakage. This has been fixed.
+
+  ++ Other changes:
+
+  * Directory structure somewhat changed; the core/ tree has been
+    collapsed.
+
+(0.4.2) Changes since version 0.4.1
+
+  ++ New features:
+
+  * Experimental ARP implementation added.
+
+  * Skeleton Ethernet driver added.
+
+  * Experimental BSD socket API library added.
+
+  ++ Bugfixes:
+
+  * In very intense situations, memory leakage could occur. This has
+    been fixed.
+
+  ++ Other changes:
+
+  * Variables named "data" and "code" have been renamed in order to
+    avoid name conflicts in certain compilers.
+
+  * Variable++ have in appliciable cases been translated to ++variable
+    since some compilers generate better code in the latter case.
+
+(0.4.1) Changes since version 0.4
+
+  ++ New features:
+
+  * TCP: Connection attempts time out earlier than data
+    transmissions. Nagle algorithm implemented. Push flag set on the
+    last segment in a burst.
+
+  * UDP: experimental support for UDP-Lite extensions.
+
+  ++ Bugfixes:
+
+  * TCP: out of order segments were in some cases handled incorrectly,
+    and this has now been fixed. Delayed acknowledgements was broken
+    in 0.4, has now been fixed. Binding to an address that is in use
+    now results in an error. Reset connections sometimes hung an
+    application; this has been fixed.
+
+  * Checksum calculation sometimes failed for chained pbufs with odd
+    lengths. This has been fixed.
+
+  * API: a lot of bug fixes in the API. The UDP API has been improved
+    and tested. Error reporting and handling has been
+    improved. Logical flaws and race conditions for incoming TCP
+    connections has been found and removed.
+
+  * Memory manager: alignment issues. Reallocating memory sometimes
+    failed, this has been fixed.
+
+  * Generic library: bcopy was flawed and has been fixed.
+
+  ++ Other changes:
+
+  * API: all datatypes has been changed from generic ones such as
+    ints, to specified ones such as u16_t. Functions that return
+    errors now have the correct type (err_t).
+
+  * General: A lot of code cleaned up and debugging code removed. Many
+    portability issues have been fixed.
+
+  * The license was changed; the advertising clause was removed.
+
+  * C64 port added.
+
+  * Thanks: Huge thanks go to Dagan Galarneau, Horst Garnetzke, Petri
+    Kosunen, Mikael Caleres, and Frits Wilmink for reporting and
+    fixing bugs!
+
+(0.4) Changes since version 0.3.1
+
+  * Memory management has been radically changed; instead of
+    allocating memory from a shared heap, memory for objects that are
+    rapidly allocated and deallocated is now kept in pools. Allocation
+    and deallocation from those memory pools is very fast. The shared
+    heap is still present but is used less frequently.
+
+  * The memory, memory pool, and packet buffer subsystems now support
+    4-, 2-, or 1-byte alignment.
+
+  * "Out of memory" situations are handled in a more robust way.
+
+  * Stack usage has been reduced.
+
+  * Easier configuration of lwIP parameters such as memory usage,
+    TTLs, statistics gathering, etc. All configuration parameters are
+    now kept in a single header file "lwipopts.h".
+
+  * The directory structure has been changed slightly so that all
+    architecture specific files are kept under the src/arch
+    hierarchy.
+
+  * Error propagation has been improved, both in the protocol modules
+    and in the API.
+
+  * The code for the RTXC architecture has been implemented, tested
+    and put to use.
+
+  * Bugs have been found and corrected in the TCP, UDP, IP, API, and
+    the Internet checksum modules.
+
+  * Bugs related to porting between a 32-bit and a 16-bit architecture
+    have been found and corrected.
+
+  * The license has been changed slightly to conform more with the
+    original BSD license, including the advertisement clause.
+
+(0.3.1) Changes since version 0.3
+
+  * Fix of a fatal bug in the buffer management. Pbufs with allocated
+    RAM never returned the RAM when the pbuf was deallocated.
+
+  * TCP congestion control, window updates and retransmissions did not
+    work correctly. This has now been fixed.
+
+  * Bugfixes in the API.
+
+(0.3) Changes since version 0.2
+
+  * New and improved directory structure. All include files are now
+    kept in a dedicated include/ directory.
+
+  * The API now has proper error handling. A new function,
+    netconn_err(), now returns an error code for the connection in
+    case of errors.
+
+  * Improvements in the memory management subsystem. The system now
+    keeps a pointer to the lowest free memory block. A new function,
+    mem_malloc2() tries to allocate memory once, and if it fails tries
+    to free some memory and retry the allocation.
+
+  * Much testing has been done with limited memory
+    configurations. lwIP now does a better job when overloaded.
+
+  * Some bugfixes and improvements to the buffer (pbuf) subsystem.
+
+  * Many bugfixes in the TCP code:
+
+    - Fixed a bug in tcp_close().
+
+    - The TCP receive window was incorrectly closed when out of
+      sequence segments was received. This has been fixed.
+
+    - Connections are now timed-out of the FIN-WAIT-2 state.
+
+    - The initial congestion window could in some cases be too
+      large. This has been fixed.
+
+    - The retransmission queue could in some cases be screwed up. This
+      has been fixed.
+
+    - TCP RST flag now handled correctly.
+
+    - Out of sequence data was in some cases never delivered to the
+      application. This has been fixed.
+
+    - Retransmitted segments now contain the correct acknowledgment
+      number and advertised window.
+
+    - TCP retransmission timeout backoffs are not correctly computed
+      (ala BSD). After a number of retransmissions, TCP now gives up
+      the connection.
+
+  * TCP connections now are kept on three lists, one for active
+    connections, one for listening connections, and one for
+    connections that are in TIME-WAIT. This greatly speeds up the fast
+    timeout processing for sending delayed ACKs.
+
+  * TCP now provides proper feedback to the application when a
+    connection has been successfully set up.
+
+  * More comments have been added to the code. The code has also been
+    somewhat cleaned up.
+
+(0.2) Initial public release.
diff --git a/ext/lwip/COPYING b/ext/lwip/COPYING
new file mode 100644
index 000000000..e23898b5e
--- /dev/null
+++ b/ext/lwip/COPYING
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+
diff --git a/ext/lwip/FILES b/ext/lwip/FILES
new file mode 100644
index 000000000..66253196f
--- /dev/null
+++ b/ext/lwip/FILES
@@ -0,0 +1,4 @@
+src/      - The source code for the lwIP TCP/IP stack.
+doc/      - The documentation for lwIP.
+
+See also the FILES file in each subdirectory.
diff --git a/ext/lwip/README b/ext/lwip/README
new file mode 100644
index 000000000..a62cc4f38
--- /dev/null
+++ b/ext/lwip/README
@@ -0,0 +1,89 @@
+INTRODUCTION
+
+lwIP is a small independent implementation of the TCP/IP protocol
+suite that has been developed by Adam Dunkels at the Computer and
+Networks Architectures (CNA) lab at the Swedish Institute of Computer
+Science (SICS).
+
+The focus of the lwIP TCP/IP implementation is to reduce the RAM usage
+while still having a full scale TCP. This making lwIP suitable for use
+in embedded systems with tens of kilobytes of free RAM and room for
+around 40 kilobytes of code ROM.
+
+FEATURES
+
+  * IP (Internet Protocol) including packet forwarding over multiple network
+    interfaces
+  * ICMP (Internet Control Message Protocol) for network maintenance and debugging
+  * IGMP (Internet Group Management Protocol) for multicast traffic management
+  * UDP (User Datagram Protocol) including experimental UDP-lite extensions
+  * TCP (Transmission Control Protocol) with congestion control, RTT estimation
+    and fast recovery/fast retransmit
+  * Specialized raw/native API for enhanced performance
+  * Optional Berkeley-like socket API
+  * DNS (Domain names resolver)
+  * SNMP (Simple Network Management Protocol)
+  * DHCP (Dynamic Host Configuration Protocol)
+  * AUTOIP (for IPv4, conform with RFC 3927)
+  * PPP (Point-to-Point Protocol)
+  * ARP (Address Resolution Protocol) for Ethernet
+
+LICENSE
+
+lwIP is freely available under a BSD license.
+
+DEVELOPMENT
+
+lwIP has grown into an excellent TCP/IP stack for embedded devices,
+and developers using the stack often submit bug fixes, improvements,
+and additions to the stack to further increase its usefulness.
+
+Development of lwIP is hosted on Savannah, a central point for
+software development, maintenance and distribution. Everyone can
+help improve lwIP by use of Savannah's interface, CVS and the
+mailing list. A core team of developers will commit changes to the
+CVS source tree.
+
+The lwIP TCP/IP stack is maintained in the 'lwip' CVS module and
+contributions (such as platform ports) are in the 'contrib' module.
+
+See doc/savannah.txt for details on CVS server access for users and
+developers.
+
+Last night's CVS tar ball can be downloaded from:
+  http://savannah.gnu.org/cvs.backups/lwip.tar.gz [CHANGED - NEEDS FIXING]
+
+The current CVS trees are web-browsable:
+  http://savannah.nongnu.org/cgi-bin/viewcvs/lwip/lwip/
+  http://savannah.nongnu.org/cgi-bin/viewcvs/lwip/contrib/
+
+Submit patches and bugs via the lwIP project page:
+  http://savannah.nongnu.org/projects/lwip/
+
+
+DOCUMENTATION
+
+The original out-dated homepage of lwIP and Adam Dunkels' papers on
+lwIP are at the official lwIP home page:
+  http://www.sics.se/~adam/lwip/
+
+Self documentation of the source code is regularly extracted from the
+current CVS sources and is available from this web page:
+  http://www.nongnu.org/lwip/
+
+There is now a constantly growin wiki about lwIP at
+  http://lwip.wikia.com/wiki/LwIP_Wiki
+
+Also, there are mailing lists you can subscribe at
+  http://savannah.nongnu.org/mail/?group=lwip
+plus searchable archives:
+  http://lists.nongnu.org/archive/html/lwip-users/
+  http://lists.nongnu.org/archive/html/lwip-devel/
+
+Reading Adam's papers, the files in docs/, browsing the source code
+documentation and browsing the mailing list archives is a good way to
+become familiar with the design of lwIP.
+
+Adam Dunkels <adam@sics.se>
+Leon Woestenberg <leon.woestenberg@gmx.net>
+
diff --git a/ext/lwip/UPGRADING b/ext/lwip/UPGRADING
new file mode 100644
index 000000000..6501107a7
--- /dev/null
+++ b/ext/lwip/UPGRADING
@@ -0,0 +1,144 @@
+This file lists major changes between release versions that require
+ports or applications to be changed. Use it to update a port or an
+application written for an older version of lwIP to correctly work
+with newer versions.
+
+
+(CVS HEAD)
+
+  * [Enter new changes just after this line - do not remove this line]
+
+  ++ Application changes:
+
+  * Replaced struct ip_addr by typedef ip_addr_t (struct ip_addr is kept for
+    compatibility to old applications, but will be removed in the future).
+
+  * Renamed mem_realloc() to mem_trim() to prevent confusion with realloc()
+
+  +++ Raw API:
+    * Changed the semantics of tcp_close() (since it was rather a
+      shutdown before): Now the application does *NOT* get any calls to the recv
+      callback (aside from NULL/closed) after calling tcp_close()
+
+    * When calling tcp_abort() from a raw API TCP callback function,
+      make sure you return ERR_ABRT to prevent accessing unallocated memory.
+      (ERR_ABRT now means the applicaiton has called tcp_abort!)
+
+  +++ Netconn API:
+    * Changed netconn_receive() and netconn_accept() to return
+      err_t, not a pointer to new data/netconn.
+
+  +++ Socket API:
+    * LWIP_SO_RCVTIMEO: when accept() or recv() time out, they
+      now set errno to EWOULDBLOCK/EAGAIN, not ETIMEDOUT.
+
+    * Added a minimal version of posix fctl() to have a
+      standardised way to set O_NONBLOCK for nonblocking sockets.
+
+  +++ all APIs:
+    * correctly implemented SO(F)_REUSEADDR
+
+  ++ Port changes
+
+  +++ new files:
+
+    * Added 4 new files: def.c, timers.c, timers.h, tcp_impl.h:
+
+    * Moved stack-internal parts of tcp.h to tcp_impl.h, tcp.h now only contains
+      the actual application programmer's API
+  
+    * Separated timer implementation from sys.h/.c, moved to timers.h/.c;
+      Added timer implementation for NO_SYS==1, set NO_SYS_NO_TIMERS==1 if you
+      still want to use your own timer implementation for NO_SYS==0 (as before).
+
+  +++ sys layer:
+
+    * Converted mbox- and semaphore-functions to take pointers to sys_mbox_t/
+      sys_sem_t;
+
+    * Converted sys_mbox_new/sys_sem_new to take pointers and return err_t;
+
+    * Added Mutex concept in sys_arch (define LWIP_COMPAT_MUTEX to let sys.h use
+      binary semaphores instead of mutexes - as before)
+
+  +++ new options:
+
+     * Don't waste memory when chaining segments, added option TCP_OVERSIZE to
+       prevent creating many small pbufs when calling tcp_write with many small
+       blocks of data. Instead, pbufs are allocated larger than needed and the
+       space is used for later calls to tcp_write.
+
+     * Added LWIP_NETIF_TX_SINGLE_PBUF to always copy to try to create single pbufs
+       in tcp_write/udp_send.
+
+    * Added an additional option LWIP_ETHERNET to support ethernet without ARP
+      (necessary for pure PPPoE)
+
+    * Add MEMP_SEPARATE_POOLS to place memory pools in separate arrays. This may
+      be used to place these pools into user-defined memory by using external
+      declaration.
+
+    * Added TCP_SNDQUEUELOWAT corresponding to TCP_SNDLOWAT
+
+  +++ new pools:
+
+     * Netdb uses a memp pool for allocating memory when getaddrinfo() is called,
+       so MEMP_NUM_NETDB has to be set accordingly.
+
+     * DNS_LOCAL_HOSTLIST_IS_DYNAMIC uses a memp pool instead of the heap, so
+       MEMP_NUM_LOCALHOSTLIST has to be set accordingly.
+
+     * Snmp-agent uses a memp pools instead of the heap, so MEMP_NUM_SNMP_* have
+       to be set accordingly.
+
+     * PPPoE uses a MEMP pool instead of the heap, so MEMP_NUM_PPPOE_INTERFACES
+       has to be set accordingly
+
+  * Integrated loopif into netif.c - loopif does not have to be created by the
+    port any more, just define LWIP_HAVE_LOOPIF to 1.
+
+  * Added define LWIP_RAND() for lwip-wide randomization (needs to be defined
+    in cc.h, e.g. used by igmp)
+
+  * Added printf-formatter X8_F to printf u8_t as hex
+
+  * The heap now may be moved to user-defined memory by defining
+    LWIP_RAM_HEAP_POINTER as a void pointer to that memory's address
+
+  * added autoip_set_struct() and dhcp_set_struct() to let autoip and dhcp work
+    with user-allocated structs instead of calling mem_malloc
+
+  * Added const char* name to mem- and memp-stats for easier debugging.
+
+  * Calculate the TCP/UDP checksum while copying to only fetch data once:
+    Define LWIP_CHKSUM_COPY to a memcpy-like function that returns the checksum
+
+  * Added SO_REUSE_RXTOALL to pass received UDP broadcast/multicast packets to
+    more than one pcb.
+
+  * Changed the semantics of ARP_QUEUEING==0: ARP_QUEUEING now cannot be turned
+    off any more, if this is set to 0, only one packet (the most recent one) is
+    queued (like demanded by RFC 1122).
+
+  
+  ++ Major bugfixes/improvements
+
+  * Implemented tcp_shutdown() to only shut down one end of a connection
+  * Implemented shutdown() at socket- and netconn-level
+  * Added errorset support to select() + improved select speed overhead
+  * Merged pppd to v2.3.11 (including some backported bugfixes from 2.4.x)
+  * Added timer implementation for NO_SYS==1 (may be disabled with NO_SYS_NO_TIMERS==1
+  * Use macros defined in ip_addr.h to work with IP addresses
+  * Implemented many nonblocking socket/netconn functions
+  * Fixed ARP input processing: only add a new entry if a request was directed as us
+  * mem_realloc() to mem_trim() to prevent confusion with realloc()
+  * Some improvements for AutoIP (don't route/forward link-local addresses, don't break
+    existing connections when assigning a routable address)
+  * Correctly handle remote side overrunning our rcv_wnd in ooseq case
+  * Removed packing from ip_addr_t, the packed version is now only used in protocol headers
+  * Corrected PBUF_POOL_BUFSIZE for ports where ETH_PAD_SIZE > 0
+  * Added support for static ARP table entries
+
+(STABLE-1.3.2)
+
+  * initial version of this file
diff --git a/ext/lwip/src/FILES b/ext/lwip/src/FILES
new file mode 100644
index 000000000..952aeabb4
--- /dev/null
+++ b/ext/lwip/src/FILES
@@ -0,0 +1,13 @@
+api/      - The code for the high-level wrapper API. Not needed if
+            you use the lowel-level call-back/raw API.
+
+core/     - The core of the TPC/IP stack; protocol implementations,
+            memory and buffer management, and the low-level raw API.
+
+include/  - lwIP include files.
+
+netif/    - Generic network interface device drivers are kept here,
+            as well as the ARP module.
+
+For more information on the various subdirectories, check the FILES
+file in each directory.
diff --git a/ext/lwip/src/api/api_lib.c b/ext/lwip/src/api/api_lib.c
new file mode 100644
index 000000000..4bdf08edf
--- /dev/null
+++ b/ext/lwip/src/api/api_lib.c
@@ -0,0 +1,780 @@
+/**
+ * @file
+ * Sequential API External module
+ *
+ */
+ 
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+/* This is the part of the API that is linked with
+   the application */
+
+#include "lwip/opt.h"
+
+#if LWIP_NETCONN /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/api.h"
+#include "lwip/tcpip.h"
+#include "lwip/memp.h"
+
+#include "lwip/ip.h"
+#include "lwip/raw.h"
+#include "lwip/udp.h"
+#include "lwip/tcp.h"
+
+#include <string.h>
+
+/**
+ * Create a new netconn (of a specific type) that has a callback function.
+ * The corresponding pcb is also created.
+ *
+ * @param t the type of 'connection' to create (@see enum netconn_type)
+ * @param proto the IP protocol for RAW IP pcbs
+ * @param callback a function to call on status changes (RX available, TX'ed)
+ * @return a newly allocated struct netconn or
+ *         NULL on memory error
+ */
+struct netconn*
+netconn_new_with_proto_and_callback(enum netconn_type t, u8_t proto, netconn_callback callback)
+{
+  struct netconn *conn;
+  struct api_msg msg;
+
+  conn = netconn_alloc(t, callback);
+  if (conn != NULL) {
+    msg.function = do_newconn;
+    msg.msg.msg.n.proto = proto;
+    msg.msg.conn = conn;
+    if (TCPIP_APIMSG(&msg) != ERR_OK) {
+      LWIP_ASSERT("freeing conn without freeing pcb", conn->pcb.tcp == NULL);
+      LWIP_ASSERT("conn has no op_completed", sys_sem_valid(&conn->op_completed));
+      LWIP_ASSERT("conn has no recvmbox", sys_mbox_valid(&conn->recvmbox));
+#if LWIP_TCP
+      LWIP_ASSERT("conn->acceptmbox shouldn't exist", !sys_mbox_valid(&conn->acceptmbox));
+#endif /* LWIP_TCP */
+      sys_sem_free(&conn->op_completed);
+      sys_mbox_free(&conn->recvmbox);
+      memp_free(MEMP_NETCONN, conn);
+      return NULL;
+    }
+  }
+  return conn;
+}
+
+/**
+ * Close a netconn 'connection' and free its resources.
+ * UDP and RAW connection are completely closed, TCP pcbs might still be in a waitstate
+ * after this returns.
+ *
+ * @param conn the netconn to delete
+ * @return ERR_OK if the connection was deleted
+ */
+err_t
+netconn_delete(struct netconn *conn)
+{
+  struct api_msg msg;
+
+  /* No ASSERT here because possible to get a (conn == NULL) if we got an accept error */
+  if (conn == NULL) {
+    return ERR_OK;
+  }
+
+  msg.function = do_delconn;
+  msg.msg.conn = conn;
+  tcpip_apimsg(&msg);
+
+  netconn_free(conn);
+
+  /* don't care for return value of do_delconn since it only calls void functions */
+
+  return ERR_OK;
+}
+
+/**
+ * Get the local or remote IP address and port of a netconn.
+ * For RAW netconns, this returns the protocol instead of a port!
+ *
+ * @param conn the netconn to query
+ * @param addr a pointer to which to save the IP address
+ * @param port a pointer to which to save the port (or protocol for RAW)
+ * @param local 1 to get the local IP address, 0 to get the remote one
+ * @return ERR_CONN for invalid connections
+ *         ERR_OK if the information was retrieved
+ */
+err_t
+netconn_getaddr(struct netconn *conn, ip_addr_t *addr, u16_t *port, u8_t local)
+{
+  struct api_msg msg;
+  err_t err;
+
+  LWIP_ERROR("netconn_getaddr: invalid conn", (conn != NULL), return ERR_ARG;);
+  LWIP_ERROR("netconn_getaddr: invalid addr", (addr != NULL), return ERR_ARG;);
+  LWIP_ERROR("netconn_getaddr: invalid port", (port != NULL), return ERR_ARG;);
+
+  msg.function = do_getaddr;
+  msg.msg.conn = conn;
+  msg.msg.msg.ad.ipaddr = addr;
+  msg.msg.msg.ad.port = port;
+  msg.msg.msg.ad.local = local;
+  err = TCPIP_APIMSG(&msg);
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+}
+
+/**
+ * Bind a netconn to a specific local IP address and port.
+ * Binding one netconn twice might not always be checked correctly!
+ *
+ * @param conn the netconn to bind
+ * @param addr the local IP address to bind the netconn to (use IP_ADDR_ANY
+ *             to bind to all addresses)
+ * @param port the local port to bind the netconn to (not used for RAW)
+ * @return ERR_OK if bound, any other err_t on failure
+ */
+err_t
+netconn_bind(struct netconn *conn, ip_addr_t *addr, u16_t port)
+{
+  struct api_msg msg;
+  err_t err;
+
+  LWIP_ERROR("netconn_bind: invalid conn", (conn != NULL), return ERR_ARG;);
+
+  msg.function = do_bind;
+  msg.msg.conn = conn;
+  msg.msg.msg.bc.ipaddr = addr;
+  msg.msg.msg.bc.port = port;
+  err = TCPIP_APIMSG(&msg);
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+}
+
+/**
+ * Connect a netconn to a specific remote IP address and port.
+ *
+ * @param conn the netconn to connect
+ * @param addr the remote IP address to connect to
+ * @param port the remote port to connect to (no used for RAW)
+ * @return ERR_OK if connected, return value of tcp_/udp_/raw_connect otherwise
+ */
+err_t
+netconn_connect(struct netconn *conn, ip_addr_t *addr, u16_t port)
+{
+  struct api_msg msg;
+  err_t err;
+
+  LWIP_ERROR("netconn_connect: invalid conn", (conn != NULL), return ERR_ARG;);
+
+  msg.function = do_connect;
+  msg.msg.conn = conn;
+  msg.msg.msg.bc.ipaddr = addr;
+  msg.msg.msg.bc.port = port;
+  /* This is the only function which need to not block tcpip_thread */
+  err = tcpip_apimsg(&msg);
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+}
+
+/**
+ * Disconnect a netconn from its current peer (only valid for UDP netconns).
+ *
+ * @param conn the netconn to disconnect
+ * @return TODO: return value is not set here...
+ */
+err_t
+netconn_disconnect(struct netconn *conn)
+{
+  struct api_msg msg;
+  err_t err;
+
+  LWIP_ERROR("netconn_disconnect: invalid conn", (conn != NULL), return ERR_ARG;);
+
+  msg.function = do_disconnect;
+  msg.msg.conn = conn;
+  err = TCPIP_APIMSG(&msg);
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+}
+
+/**
+ * Set a TCP netconn into listen mode
+ *
+ * @param conn the tcp netconn to set to listen mode
+ * @param backlog the listen backlog, only used if TCP_LISTEN_BACKLOG==1
+ * @return ERR_OK if the netconn was set to listen (UDP and RAW netconns
+ *         don't return any error (yet?))
+ */
+err_t
+netconn_listen_with_backlog(struct netconn *conn, u8_t backlog)
+{
+#if LWIP_TCP
+  struct api_msg msg;
+  err_t err;
+
+  /* This does no harm. If TCP_LISTEN_BACKLOG is off, backlog is unused. */
+  LWIP_UNUSED_ARG(backlog);
+
+  LWIP_ERROR("netconn_listen: invalid conn", (conn != NULL), return ERR_ARG;);
+
+  msg.function = do_listen;
+  msg.msg.conn = conn;
+#if TCP_LISTEN_BACKLOG
+  msg.msg.msg.lb.backlog = backlog;
+#endif /* TCP_LISTEN_BACKLOG */
+  err = TCPIP_APIMSG(&msg);
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+#else /* LWIP_TCP */
+  LWIP_UNUSED_ARG(conn);
+  LWIP_UNUSED_ARG(backlog);
+  return ERR_ARG;
+#endif /* LWIP_TCP */
+}
+
+/**
+ * Accept a new connection on a TCP listening netconn.
+ *
+ * @param conn the TCP listen netconn
+ * @param new_conn pointer where the new connection is stored
+ * @return ERR_OK if a new connection has been received or an error
+ *                code otherwise
+ */
+err_t
+netconn_accept(struct netconn *conn, struct netconn **new_conn)
+{
+#if LWIP_TCP
+  struct netconn *newconn;
+  err_t err;
+#if TCP_LISTEN_BACKLOG
+  struct api_msg msg;
+#endif /* TCP_LISTEN_BACKLOG */
+
+  LWIP_ERROR("netconn_accept: invalid pointer",    (new_conn != NULL),                  return ERR_ARG;);
+  *new_conn = NULL;
+  LWIP_ERROR("netconn_accept: invalid conn",       (conn != NULL),                      return ERR_ARG;);
+  LWIP_ERROR("netconn_accept: invalid acceptmbox", sys_mbox_valid(&conn->acceptmbox),   return ERR_ARG;);
+
+  err = conn->last_err;
+  if (ERR_IS_FATAL(err)) {
+    /* don't recv on fatal errors: this might block the application task
+       waiting on acceptmbox forever! */
+    return err;
+  }
+
+#if LWIP_SO_RCVTIMEO
+  if (sys_arch_mbox_fetch(&conn->acceptmbox, (void **)&newconn, conn->recv_timeout) == SYS_ARCH_TIMEOUT) {
+    NETCONN_SET_SAFE_ERR(conn, ERR_TIMEOUT);
+    return ERR_TIMEOUT;
+  }
+#else
+  sys_arch_mbox_fetch(&conn->acceptmbox, (void **)&newconn, 0);
+#endif /* LWIP_SO_RCVTIMEO*/
+  /* Register event with callback */
+  API_EVENT(conn, NETCONN_EVT_RCVMINUS, 0);
+
+  if (newconn == NULL) {
+    /* connection has been aborted */
+    NETCONN_SET_SAFE_ERR(conn, ERR_ABRT);
+    return ERR_ABRT;
+  }
+#if TCP_LISTEN_BACKLOG
+  /* Let the stack know that we have accepted the connection. */
+  msg.function = do_recv;
+  msg.msg.conn = conn;
+  /* don't care for the return value of do_recv */
+  TCPIP_APIMSG(&msg);
+#endif /* TCP_LISTEN_BACKLOG */
+
+  *new_conn = newconn;
+  /* don't set conn->last_err: it's only ERR_OK, anyway */
+  return ERR_OK;
+#else /* LWIP_TCP */
+  LWIP_UNUSED_ARG(conn);
+  LWIP_UNUSED_ARG(new_conn);
+  return ERR_ARG;
+#endif /* LWIP_TCP */
+}
+
+/**
+ * Receive data: actual implementation that doesn't care whether pbuf or netbuf
+ * is received
+ *
+ * @param conn the netconn from which to receive data
+ * @param new_buf pointer where a new pbuf/netbuf is stored when received data
+ * @return ERR_OK if data has been received, an error code otherwise (timeout,
+ *                memory error or another error)
+ */
+static err_t
+netconn_recv_data(struct netconn *conn, void **new_buf)
+{
+  void *buf = NULL;
+  u16_t len;
+  err_t err;
+#if LWIP_TCP
+  struct api_msg msg;
+#endif /* LWIP_TCP */
+
+  LWIP_ERROR("netconn_recv: invalid pointer", (new_buf != NULL), return ERR_ARG;);
+  *new_buf = NULL;
+  LWIP_ERROR("netconn_recv: invalid conn",    (conn != NULL),    return ERR_ARG;);
+  LWIP_ERROR("netconn_accept: invalid recvmbox", sys_mbox_valid(&conn->recvmbox), return ERR_CONN;);
+
+  err = conn->last_err;
+  if (ERR_IS_FATAL(err)) {
+    /* don't recv on fatal errors: this might block the application task
+       waiting on recvmbox forever! */
+    /* @todo: this does not allow us to fetch data that has been put into recvmbox
+       before the fatal error occurred - is that a problem? */
+    return err;
+  }
+
+#if LWIP_SO_RCVTIMEO
+  if (sys_arch_mbox_fetch(&conn->recvmbox, &buf, conn->recv_timeout) == SYS_ARCH_TIMEOUT) {
+    NETCONN_SET_SAFE_ERR(conn, ERR_TIMEOUT);
+    return ERR_TIMEOUT;
+  }
+#else
+  sys_arch_mbox_fetch(&conn->recvmbox, &buf, 0);
+#endif /* LWIP_SO_RCVTIMEO*/
+
+#if LWIP_TCP
+#if (LWIP_UDP || LWIP_RAW)
+  if (conn->type == NETCONN_TCP)
+#endif /* (LWIP_UDP || LWIP_RAW) */
+  {
+    if (!netconn_get_noautorecved(conn) || (buf == NULL)) {
+      /* Let the stack know that we have taken the data. */
+      /* TODO: Speedup: Don't block and wait for the answer here
+         (to prevent multiple thread-switches). */
+      msg.function = do_recv;
+      msg.msg.conn = conn;
+      if (buf != NULL) {
+        msg.msg.msg.r.len = ((struct pbuf *)buf)->tot_len;
+      } else {
+        msg.msg.msg.r.len = 1;
+      }
+      /* don't care for the return value of do_recv */
+      TCPIP_APIMSG(&msg);
+    }
+
+    /* If we are closed, we indicate that we no longer wish to use the socket */
+    if (buf == NULL) {
+      API_EVENT(conn, NETCONN_EVT_RCVMINUS, 0);
+      /* Avoid to lose any previous error code */
+      NETCONN_SET_SAFE_ERR(conn, ERR_CLSD);
+      return ERR_CLSD;
+    }
+    len = ((struct pbuf *)buf)->tot_len;
+  }
+#endif /* LWIP_TCP */
+#if LWIP_TCP && (LWIP_UDP || LWIP_RAW)
+  else
+#endif /* LWIP_TCP && (LWIP_UDP || LWIP_RAW) */
+#if (LWIP_UDP || LWIP_RAW)
+  {
+    LWIP_ASSERT("buf != NULL", buf != NULL);
+    len = netbuf_len((struct netbuf *)buf);
+  }
+#endif /* (LWIP_UDP || LWIP_RAW) */
+
+#if LWIP_SO_RCVBUF
+  SYS_ARCH_DEC(conn->recv_avail, len);
+#endif /* LWIP_SO_RCVBUF */
+  /* Register event with callback */
+  API_EVENT(conn, NETCONN_EVT_RCVMINUS, len);
+
+  LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_recv_data: received %p, len=%"U16_F"\n", buf, len));
+
+  *new_buf = buf;
+  /* don't set conn->last_err: it's only ERR_OK, anyway */
+  return ERR_OK;
+}
+
+/**
+ * Receive data (in form of a pbuf) from a TCP netconn
+ *
+ * @param conn the netconn from which to receive data
+ * @param new_buf pointer where a new pbuf is stored when received data
+ * @return ERR_OK if data has been received, an error code otherwise (timeout,
+ *                memory error or another error)
+ *         ERR_ARG if conn is not a TCP netconn
+ */
+err_t
+netconn_recv_tcp_pbuf(struct netconn *conn, struct pbuf **new_buf)
+{
+  LWIP_ERROR("netconn_recv: invalid conn", (conn != NULL) &&
+             netconn_type(conn) == NETCONN_TCP, return ERR_ARG;);
+
+  return netconn_recv_data(conn, (void **)new_buf);
+}
+
+/**
+ * Receive data (in form of a netbuf containing a packet buffer) from a netconn
+ *
+ * @param conn the netconn from which to receive data
+ * @param new_buf pointer where a new netbuf is stored when received data
+ * @return ERR_OK if data has been received, an error code otherwise (timeout,
+ *                memory error or another error)
+ */
+err_t
+netconn_recv(struct netconn *conn, struct netbuf **new_buf)
+{
+#if LWIP_TCP
+  struct netbuf *buf = NULL;
+  err_t err;
+#endif /* LWIP_TCP */
+
+  LWIP_ERROR("netconn_recv: invalid pointer", (new_buf != NULL), return ERR_ARG;);
+  *new_buf = NULL;
+  LWIP_ERROR("netconn_recv: invalid conn",    (conn != NULL),    return ERR_ARG;);
+  LWIP_ERROR("netconn_accept: invalid recvmbox", sys_mbox_valid(&conn->recvmbox), return ERR_CONN;);
+
+#if LWIP_TCP
+#if (LWIP_UDP || LWIP_RAW)
+  if (conn->type == NETCONN_TCP)
+#endif /* (LWIP_UDP || LWIP_RAW) */
+  {
+    struct pbuf *p = NULL;
+    /* This is not a listening netconn, since recvmbox is set */
+
+    buf = (struct netbuf *)memp_malloc(MEMP_NETBUF);
+    if (buf == NULL) {
+      NETCONN_SET_SAFE_ERR(conn, ERR_MEM);
+      return ERR_MEM;
+    }
+
+    err = netconn_recv_data(conn, (void **)&p);
+    if (err != ERR_OK) {
+      memp_free(MEMP_NETBUF, buf);
+      return err;
+    }
+    LWIP_ASSERT("p != NULL", p != NULL);
+
+    buf->p = p;
+    buf->ptr = p;
+    buf->port = 0;
+    ip_addr_set_any(&buf->addr);
+    *new_buf = buf;
+    /* don't set conn->last_err: it's only ERR_OK, anyway */
+    return ERR_OK;
+  }
+#endif /* LWIP_TCP */
+#if LWIP_TCP && (LWIP_UDP || LWIP_RAW)
+  else
+#endif /* LWIP_TCP && (LWIP_UDP || LWIP_RAW) */
+  {
+#if (LWIP_UDP || LWIP_RAW)
+    return netconn_recv_data(conn, (void **)new_buf);
+#endif /* (LWIP_UDP || LWIP_RAW) */
+  }
+}
+
+/**
+ * TCP: update the receive window: by calling this, the application
+ * tells the stack that it has processed data and is able to accept
+ * new data.
+ * ATTENTION: use with care, this is mainly used for sockets!
+ * Can only be used when calling netconn_set_noautorecved(conn, 1) before.
+ *
+ * @param conn the netconn for which to update the receive window
+ * @param length amount of data processed (ATTENTION: this must be accurate!)
+ */
+void
+netconn_recved(struct netconn *conn, u32_t length)
+{
+#if LWIP_TCP
+  if ((conn != NULL) && (conn->type == NETCONN_TCP) &&
+      (netconn_get_noautorecved(conn))) {
+    struct api_msg msg;
+    /* Let the stack know that we have taken the data. */
+    /* TODO: Speedup: Don't block and wait for the answer here
+       (to prevent multiple thread-switches). */
+    msg.function = do_recv;
+    msg.msg.conn = conn;
+    msg.msg.msg.r.len = length;
+    /* don't care for the return value of do_recv */
+    TCPIP_APIMSG(&msg);
+  }
+#else /* LWIP_TCP */
+  LWIP_UNUSED_ARG(conn);
+  LWIP_UNUSED_ARG(length);
+#endif /* LWIP_TCP */
+}
+
+/**
+ * Send data (in form of a netbuf) to a specific remote IP address and port.
+ * Only to be used for UDP and RAW netconns (not TCP).
+ *
+ * @param conn the netconn over which to send data
+ * @param buf a netbuf containing the data to send
+ * @param addr the remote IP address to which to send the data
+ * @param port the remote port to which to send the data
+ * @return ERR_OK if data was sent, any other err_t on error
+ */
+err_t
+netconn_sendto(struct netconn *conn, struct netbuf *buf, ip_addr_t *addr, u16_t port)
+{
+  if (buf != NULL) {
+    ip_addr_set(&buf->addr, addr);
+    buf->port = port;
+    return netconn_send(conn, buf);
+  }
+  return ERR_VAL;
+}
+
+/**
+ * Send data over a UDP or RAW netconn (that is already connected).
+ *
+ * @param conn the UDP or RAW netconn over which to send data
+ * @param buf a netbuf containing the data to send
+ * @return ERR_OK if data was sent, any other err_t on error
+ */
+err_t
+netconn_send(struct netconn *conn, struct netbuf *buf)
+{
+  struct api_msg msg;
+  err_t err;
+
+  LWIP_ERROR("netconn_send: invalid conn",  (conn != NULL), return ERR_ARG;);
+
+  LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_send: sending %"U16_F" bytes\n", buf->p->tot_len));
+  msg.function = do_send;
+  msg.msg.conn = conn;
+  msg.msg.msg.b = buf;
+  err = TCPIP_APIMSG(&msg);
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+}
+
+/**
+ * Send data over a TCP netconn.
+ *
+ * @param conn the TCP netconn over which to send data
+ * @param dataptr pointer to the application buffer that contains the data to send
+ * @param size size of the application data to send
+ * @param apiflags combination of following flags :
+ * - NETCONN_COPY: data will be copied into memory belonging to the stack
+ * - NETCONN_MORE: for TCP connection, PSH flag will be set on last segment sent
+ * - NETCONN_DONTBLOCK: only write the data if all dat can be written at once
+ * @param bytes_written pointer to a location that receives the number of written bytes
+ * @return ERR_OK if data was sent, any other err_t on error
+ */
+err_t
+netconn_write_partly(struct netconn *conn, const void *dataptr, size_t size,
+                     u8_t apiflags, size_t *bytes_written)
+{
+  struct api_msg msg;
+  err_t err;
+  u8_t dontblock;
+
+  LWIP_ERROR("netconn_write: invalid conn",  (conn != NULL), return ERR_ARG;);
+  LWIP_ERROR("netconn_write: invalid conn->type",  (conn->type == NETCONN_TCP), return ERR_VAL;);
+  if (size == 0) {
+    return ERR_OK;
+  }
+  dontblock = netconn_is_nonblocking(conn) || (apiflags & NETCONN_DONTBLOCK);
+  if (dontblock && !bytes_written) {
+    /* This implies netconn_write() cannot be used for non-blocking send, since
+       it has no way to return the number of bytes written. */
+    return ERR_VAL;
+  }
+
+  /* non-blocking write sends as much  */
+  msg.function = do_write;
+  msg.msg.conn = conn;
+  msg.msg.msg.w.dataptr = dataptr;
+  msg.msg.msg.w.apiflags = apiflags;
+  msg.msg.msg.w.len = size;
+#if LWIP_SO_SNDTIMEO
+  if (conn->send_timeout != 0) {
+    /* get the time we started, which is later compared to
+        sys_now() + conn->send_timeout */
+    msg.msg.msg.w.time_started = sys_now();
+  } else {
+    msg.msg.msg.w.time_started = 0;
+  }
+#endif /* LWIP_SO_SNDTIMEO */
+
+  /* For locking the core: this _can_ be delayed on low memory/low send buffer,
+     but if it is, this is done inside api_msg.c:do_write(), so we can use the
+     non-blocking version here. */
+  err = TCPIP_APIMSG(&msg);
+  if ((err == ERR_OK) && (bytes_written != NULL)) {
+    if (dontblock
+#if LWIP_SO_SNDTIMEO
+        || (conn->send_timeout != 0)
+#endif /* LWIP_SO_SNDTIMEO */
+       ) {
+      /* nonblocking write: maybe the data has been sent partly */
+      *bytes_written = msg.msg.msg.w.len;
+    } else {
+      /* blocking call succeeded: all data has been sent if it */
+      *bytes_written = size;
+    }
+  }
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+}
+
+/**
+ * Close ot shutdown a TCP netconn (doesn't delete it).
+ *
+ * @param conn the TCP netconn to close or shutdown
+ * @param how fully close or only shutdown one side?
+ * @return ERR_OK if the netconn was closed, any other err_t on error
+ */
+static err_t
+netconn_close_shutdown(struct netconn *conn, u8_t how)
+{
+  struct api_msg msg;
+  err_t err;
+
+  LWIP_ERROR("netconn_close: invalid conn",  (conn != NULL), return ERR_ARG;);
+
+  msg.function = do_close;
+  msg.msg.conn = conn;
+  /* shutting down both ends is the same as closing */
+  msg.msg.msg.sd.shut = how;
+  /* because of the LWIP_TCPIP_CORE_LOCKING implementation of do_close,
+     don't use TCPIP_APIMSG here */
+  err = tcpip_apimsg(&msg);
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+}
+
+/**
+ * Close a TCP netconn (doesn't delete it).
+ *
+ * @param conn the TCP netconn to close
+ * @return ERR_OK if the netconn was closed, any other err_t on error
+ */
+err_t
+netconn_close(struct netconn *conn)
+{
+  /* shutting down both ends is the same as closing */
+  return netconn_close_shutdown(conn, NETCONN_SHUT_RDWR);
+}
+
+/**
+ * Shut down one or both sides of a TCP netconn (doesn't delete it).
+ *
+ * @param conn the TCP netconn to shut down
+ * @return ERR_OK if the netconn was closed, any other err_t on error
+ */
+err_t
+netconn_shutdown(struct netconn *conn, u8_t shut_rx, u8_t shut_tx)
+{
+  return netconn_close_shutdown(conn, (shut_rx ? NETCONN_SHUT_RD : 0) | (shut_tx ? NETCONN_SHUT_WR : 0));
+}
+
+#if LWIP_IGMP
+/**
+ * Join multicast groups for UDP netconns.
+ *
+ * @param conn the UDP netconn for which to change multicast addresses
+ * @param multiaddr IP address of the multicast group to join or leave
+ * @param netif_addr the IP address of the network interface on which to send
+ *                  the igmp message
+ * @param join_or_leave flag whether to send a join- or leave-message
+ * @return ERR_OK if the action was taken, any err_t on error
+ */
+err_t
+netconn_join_leave_group(struct netconn *conn,
+                         ip_addr_t *multiaddr,
+                         ip_addr_t *netif_addr,
+                         enum netconn_igmp join_or_leave)
+{
+  struct api_msg msg;
+  err_t err;
+
+  LWIP_ERROR("netconn_join_leave_group: invalid conn",  (conn != NULL), return ERR_ARG;);
+
+  msg.function = do_join_leave_group;
+  msg.msg.conn = conn;
+  msg.msg.msg.jl.multiaddr = multiaddr;
+  msg.msg.msg.jl.netif_addr = netif_addr;
+  msg.msg.msg.jl.join_or_leave = join_or_leave;
+  err = TCPIP_APIMSG(&msg);
+
+  NETCONN_SET_SAFE_ERR(conn, err);
+  return err;
+}
+#endif /* LWIP_IGMP */
+
+#if LWIP_DNS
+/**
+ * Execute a DNS query, only one IP address is returned
+ *
+ * @param name a string representation of the DNS host name to query
+ * @param addr a preallocated ip_addr_t where to store the resolved IP address
+ * @return ERR_OK: resolving succeeded
+ *         ERR_MEM: memory error, try again later
+ *         ERR_ARG: dns client not initialized or invalid hostname
+ *         ERR_VAL: dns server response was invalid
+ */
+err_t
+netconn_gethostbyname(const char *name, ip_addr_t *addr)
+{
+  struct dns_api_msg msg;
+  err_t err;
+  sys_sem_t sem;
+
+  LWIP_ERROR("netconn_gethostbyname: invalid name", (name != NULL), return ERR_ARG;);
+  LWIP_ERROR("netconn_gethostbyname: invalid addr", (addr != NULL), return ERR_ARG;);
+
+  err = sys_sem_new(&sem, 0);
+  if (err != ERR_OK) {
+    return err;
+  }
+
+  msg.name = name;
+  msg.addr = addr;
+  msg.err = &err;
+  msg.sem = &sem;
+
+  tcpip_callback(do_gethostbyname, &msg);
+  sys_sem_wait(&sem);
+  sys_sem_free(&sem);
+
+  return err;
+}
+#endif /* LWIP_DNS*/
+
+#endif /* LWIP_NETCONN */
diff --git a/ext/lwip/src/api/api_msg.c b/ext/lwip/src/api/api_msg.c
new file mode 100644
index 000000000..d4e44b9ad
--- /dev/null
+++ b/ext/lwip/src/api/api_msg.c
@@ -0,0 +1,1565 @@
+/**
+ * @file
+ * Sequential API Internal module
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_NETCONN /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/api_msg.h"
+
+#include "lwip/ip.h"
+#include "lwip/udp.h"
+#include "lwip/tcp.h"
+#include "lwip/raw.h"
+
+#include "lwip/memp.h"
+#include "lwip/tcpip.h"
+#include "lwip/igmp.h"
+#include "lwip/dns.h"
+
+#include <string.h>
+
+#define SET_NONBLOCKING_CONNECT(conn, val)  do { if(val) { \
+  (conn)->flags |= NETCONN_FLAG_IN_NONBLOCKING_CONNECT; \
+} else { \
+  (conn)->flags &= ~ NETCONN_FLAG_IN_NONBLOCKING_CONNECT; }} while(0)
+#define IN_NONBLOCKING_CONNECT(conn) (((conn)->flags & NETCONN_FLAG_IN_NONBLOCKING_CONNECT) != 0)
+
+/* forward declarations */
+#if LWIP_TCP
+static err_t do_writemore(struct netconn *conn);
+static void do_close_internal(struct netconn *conn);
+#endif
+
+#if LWIP_RAW
+/**
+ * Receive callback function for RAW netconns.
+ * Doesn't 'eat' the packet, only references it and sends it to
+ * conn->recvmbox
+ *
+ * @see raw.h (struct raw_pcb.recv) for parameters and return value
+ */
+static u8_t
+recv_raw(void *arg, struct raw_pcb *pcb, struct pbuf *p,
+    ip_addr_t *addr)
+{
+  struct pbuf *q;
+  struct netbuf *buf;
+  struct netconn *conn;
+
+  LWIP_UNUSED_ARG(addr);
+  conn = (struct netconn *)arg;
+
+  if ((conn != NULL) && sys_mbox_valid(&conn->recvmbox)) {
+#if LWIP_SO_RCVBUF
+    int recv_avail;
+    SYS_ARCH_GET(conn->recv_avail, recv_avail);
+    if ((recv_avail + (int)(p->tot_len)) > conn->recv_bufsize) {
+      return 0;
+    }
+#endif /* LWIP_SO_RCVBUF */
+    /* copy the whole packet into new pbufs */
+    q = pbuf_alloc(PBUF_RAW, p->tot_len, PBUF_RAM);
+    if(q != NULL) {
+      if (pbuf_copy(q, p) != ERR_OK) {
+        pbuf_free(q);
+        q = NULL;
+      }
+    }
+
+    if (q != NULL) {
+      u16_t len;
+      buf = (struct netbuf *)memp_malloc(MEMP_NETBUF);
+      if (buf == NULL) {
+        pbuf_free(q);
+        return 0;
+      }
+
+      buf->p = q;
+      buf->ptr = q;
+      ip_addr_copy(buf->addr, *ip_current_src_addr());
+      buf->port = pcb->protocol;
+
+      len = q->tot_len;
+      if (sys_mbox_trypost(&conn->recvmbox, buf) != ERR_OK) {
+        netbuf_delete(buf);
+        return 0;
+      } else {
+#if LWIP_SO_RCVBUF
+        SYS_ARCH_INC(conn->recv_avail, len);
+#endif /* LWIP_SO_RCVBUF */
+        /* Register event with callback */
+        API_EVENT(conn, NETCONN_EVT_RCVPLUS, len);
+      }
+    }
+  }
+
+  return 0; /* do not eat the packet */
+}
+#endif /* LWIP_RAW*/
+
+#if LWIP_UDP
+/**
+ * Receive callback function for UDP netconns.
+ * Posts the packet to conn->recvmbox or deletes it on memory error.
+ *
+ * @see udp.h (struct udp_pcb.recv) for parameters
+ */
+static void
+recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
+   ip_addr_t *addr, u16_t port)
+{
+  struct netbuf *buf;
+  struct netconn *conn;
+  u16_t len;
+#if LWIP_SO_RCVBUF
+  int recv_avail;
+#endif /* LWIP_SO_RCVBUF */
+
+  LWIP_UNUSED_ARG(pcb); /* only used for asserts... */
+  LWIP_ASSERT("recv_udp must have a pcb argument", pcb != NULL);
+  LWIP_ASSERT("recv_udp must have an argument", arg != NULL);
+  conn = (struct netconn *)arg;
+  LWIP_ASSERT("recv_udp: recv for wrong pcb!", conn->pcb.udp == pcb);
+
+#if LWIP_SO_RCVBUF
+  SYS_ARCH_GET(conn->recv_avail, recv_avail);
+  if ((conn == NULL) || !sys_mbox_valid(&conn->recvmbox) ||
+      ((recv_avail + (int)(p->tot_len)) > conn->recv_bufsize)) {
+#else  /* LWIP_SO_RCVBUF */
+  if ((conn == NULL) || !sys_mbox_valid(&conn->recvmbox)) {
+#endif /* LWIP_SO_RCVBUF */
+    pbuf_free(p);
+    return;
+  }
+
+  buf = (struct netbuf *)memp_malloc(MEMP_NETBUF);
+  if (buf == NULL) {
+    pbuf_free(p);
+    return;
+  } else {
+    buf->p = p;
+    buf->ptr = p;
+    ip_addr_set(&buf->addr, addr);
+    buf->port = port;
+#if LWIP_NETBUF_RECVINFO
+    {
+      const struct ip_hdr* iphdr = ip_current_header();
+      /* get the UDP header - always in the first pbuf, ensured by udp_input */
+      const struct udp_hdr* udphdr = (void*)(((char*)iphdr) + IPH_LEN(iphdr));
+#if LWIP_CHECKSUM_ON_COPY
+      buf->flags = NETBUF_FLAG_DESTADDR;
+#endif /* LWIP_CHECKSUM_ON_COPY */
+      ip_addr_set(&buf->toaddr, ip_current_dest_addr());
+      buf->toport_chksum = udphdr->dest;
+    }
+#endif /* LWIP_NETBUF_RECVINFO */
+  }
+
+  len = p->tot_len;
+  if (sys_mbox_trypost(&conn->recvmbox, buf) != ERR_OK) {
+    netbuf_delete(buf);
+    return;
+  } else {
+#if LWIP_SO_RCVBUF
+    SYS_ARCH_INC(conn->recv_avail, len);
+#endif /* LWIP_SO_RCVBUF */
+    /* Register event with callback */
+    API_EVENT(conn, NETCONN_EVT_RCVPLUS, len);
+  }
+}
+#endif /* LWIP_UDP */
+
+#if LWIP_TCP
+/**
+ * Receive callback function for TCP netconns.
+ * Posts the packet to conn->recvmbox, but doesn't delete it on errors.
+ *
+ * @see tcp.h (struct tcp_pcb.recv) for parameters and return value
+ */
+static err_t
+recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
+{
+  struct netconn *conn;
+  u16_t len;
+
+  LWIP_UNUSED_ARG(pcb);
+  LWIP_ASSERT("recv_tcp must have a pcb argument", pcb != NULL);
+  LWIP_ASSERT("recv_tcp must have an argument", arg != NULL);
+  conn = (struct netconn *)arg;
+  LWIP_ASSERT("recv_tcp: recv for wrong pcb!", conn->pcb.tcp == pcb);
+
+  if (conn == NULL) {
+    return ERR_VAL;
+  }
+  if (!sys_mbox_valid(&conn->recvmbox)) {
+    /* recvmbox already deleted */
+    if (p != NULL) {
+      tcp_recved(pcb, p->tot_len);
+      pbuf_free(p);
+    }
+    return ERR_OK;
+  }
+  /* Unlike for UDP or RAW pcbs, don't check for available space
+     using recv_avail since that could break the connection
+     (data is already ACKed) */
+
+  /* don't overwrite fatal errors! */
+  NETCONN_SET_SAFE_ERR(conn, err);
+
+  if (p != NULL) {
+    len = p->tot_len;
+  } else {
+    len = 0;
+  }
+
+  if (sys_mbox_trypost(&conn->recvmbox, p) != ERR_OK) {
+    /* don't deallocate p: it is presented to us later again from tcp_fasttmr! */
+    return ERR_MEM;
+  } else {
+#if LWIP_SO_RCVBUF
+    SYS_ARCH_INC(conn->recv_avail, len);
+#endif /* LWIP_SO_RCVBUF */
+    /* Register event with callback */
+    API_EVENT(conn, NETCONN_EVT_RCVPLUS, len);
+  }
+
+  return ERR_OK;
+}
+
+/**
+ * Poll callback function for TCP netconns.
+ * Wakes up an application thread that waits for a connection to close
+ * or data to be sent. The application thread then takes the
+ * appropriate action to go on.
+ *
+ * Signals the conn->sem.
+ * netconn_close waits for conn->sem if closing failed.
+ *
+ * @see tcp.h (struct tcp_pcb.poll) for parameters and return value
+ */
+static err_t
+poll_tcp(void *arg, struct tcp_pcb *pcb)
+{
+  struct netconn *conn = (struct netconn *)arg;
+
+  LWIP_UNUSED_ARG(pcb);
+  LWIP_ASSERT("conn != NULL", (conn != NULL));
+
+  if (conn->state == NETCONN_WRITE) {
+    do_writemore(conn);
+  } else if (conn->state == NETCONN_CLOSE) {
+    do_close_internal(conn);
+  }
+  /* @todo: implement connect timeout here? */
+
+  /* Did a nonblocking write fail before? Then check available write-space. */
+  if (conn->flags & NETCONN_FLAG_CHECK_WRITESPACE) {
+    /* If the queued byte- or pbuf-count drops below the configured low-water limit,
+       let select mark this pcb as writable again. */
+    if ((conn->pcb.tcp != NULL) && (tcp_sndbuf(conn->pcb.tcp) > TCP_SNDLOWAT) &&
+      (tcp_sndqueuelen(conn->pcb.tcp) < TCP_SNDQUEUELOWAT)) {
+      conn->flags &= ~NETCONN_FLAG_CHECK_WRITESPACE;
+      API_EVENT(conn, NETCONN_EVT_SENDPLUS, 0);
+    }
+  }
+
+  return ERR_OK;
+}
+
+/**
+ * Sent callback function for TCP netconns.
+ * Signals the conn->sem and calls API_EVENT.
+ * netconn_write waits for conn->sem if send buffer is low.
+ *
+ * @see tcp.h (struct tcp_pcb.sent) for parameters and return value
+ */
+static err_t
+sent_tcp(void *arg, struct tcp_pcb *pcb, u16_t len)
+{
+  struct netconn *conn = (struct netconn *)arg;
+
+  LWIP_UNUSED_ARG(pcb);
+  LWIP_ASSERT("conn != NULL", (conn != NULL));
+
+  if (conn->state == NETCONN_WRITE) {
+    do_writemore(conn);
+  } else if (conn->state == NETCONN_CLOSE) {
+    do_close_internal(conn);
+  }
+
+  if (conn) {
+    /* If the queued byte- or pbuf-count drops below the configured low-water limit,
+       let select mark this pcb as writable again. */
+    if ((conn->pcb.tcp != NULL) && (tcp_sndbuf(conn->pcb.tcp) > TCP_SNDLOWAT) &&
+      (tcp_sndqueuelen(conn->pcb.tcp) < TCP_SNDQUEUELOWAT)) {
+      conn->flags &= ~NETCONN_FLAG_CHECK_WRITESPACE;
+      API_EVENT(conn, NETCONN_EVT_SENDPLUS, len);
+    }
+  }
+  
+  return ERR_OK;
+}
+
+/**
+ * Error callback function for TCP netconns.
+ * Signals conn->sem, posts to all conn mboxes and calls API_EVENT.
+ * The application thread has then to decide what to do.
+ *
+ * @see tcp.h (struct tcp_pcb.err) for parameters
+ */
+static void
+err_tcp(void *arg, err_t err)
+{
+  struct netconn *conn;
+  enum netconn_state old_state;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  conn = (struct netconn *)arg;
+  LWIP_ASSERT("conn != NULL", (conn != NULL));
+
+  conn->pcb.tcp = NULL;
+
+  /* no check since this is always fatal! */
+  SYS_ARCH_PROTECT(lev);
+  conn->last_err = err;
+  SYS_ARCH_UNPROTECT(lev);
+
+  /* reset conn->state now before waking up other threads */
+  old_state = conn->state;
+  conn->state = NETCONN_NONE;
+
+  /* Notify the user layer about a connection error. Used to signal
+     select. */
+  API_EVENT(conn, NETCONN_EVT_ERROR, 0);
+  /* Try to release selects pending on 'read' or 'write', too.
+     They will get an error if they actually try to read or write. */
+  API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0);
+  API_EVENT(conn, NETCONN_EVT_SENDPLUS, 0);
+
+  /* pass NULL-message to recvmbox to wake up pending recv */
+  if (sys_mbox_valid(&conn->recvmbox)) {
+    /* use trypost to prevent deadlock */
+    sys_mbox_trypost(&conn->recvmbox, NULL);
+  }
+  /* pass NULL-message to acceptmbox to wake up pending accept */
+  if (sys_mbox_valid(&conn->acceptmbox)) {
+    /* use trypost to preven deadlock */
+    sys_mbox_trypost(&conn->acceptmbox, NULL);
+  }
+
+  if ((old_state == NETCONN_WRITE) || (old_state == NETCONN_CLOSE) ||
+      (old_state == NETCONN_CONNECT)) {
+    /* calling do_writemore/do_close_internal is not necessary
+       since the pcb has already been deleted! */
+    int was_nonblocking_connect = IN_NONBLOCKING_CONNECT(conn);
+    SET_NONBLOCKING_CONNECT(conn, 0);
+
+    if (!was_nonblocking_connect) {
+      /* set error return code */
+      LWIP_ASSERT("conn->current_msg != NULL", conn->current_msg != NULL);
+      conn->current_msg->err = err;
+      conn->current_msg = NULL;
+      /* wake up the waiting task */
+      sys_sem_signal(&conn->op_completed);
+    }
+  } else {
+    LWIP_ASSERT("conn->current_msg == NULL", conn->current_msg == NULL);
+  }
+}
+
+/**
+ * Setup a tcp_pcb with the correct callback function pointers
+ * and their arguments.
+ *
+ * @param conn the TCP netconn to setup
+ */
+static void
+setup_tcp(struct netconn *conn)
+{
+  struct tcp_pcb *pcb;
+
+  pcb = conn->pcb.tcp;
+  tcp_arg(pcb, conn);
+  tcp_recv(pcb, recv_tcp);
+  tcp_sent(pcb, sent_tcp);
+  tcp_poll(pcb, poll_tcp, 4);
+  tcp_err(pcb, err_tcp);
+}
+
+/**
+ * Accept callback function for TCP netconns.
+ * Allocates a new netconn and posts that to conn->acceptmbox.
+ *
+ * @see tcp.h (struct tcp_pcb_listen.accept) for parameters and return value
+ */
+static err_t
+accept_function(void *arg, struct tcp_pcb *newpcb, err_t err)
+{
+  struct netconn *newconn;
+  struct netconn *conn = (struct netconn *)arg;
+
+  LWIP_DEBUGF(API_MSG_DEBUG, ("accept_function: newpcb->tate: %s\n", tcp_debug_state_str(newpcb->state)));
+
+  if (!sys_mbox_valid(&conn->acceptmbox)) {
+    LWIP_DEBUGF(API_MSG_DEBUG, ("accept_function: acceptmbox already deleted\n"));
+    return ERR_VAL;
+  }
+
+  /* We have to set the callback here even though
+   * the new socket is unknown. conn->socket is marked as -1. */
+  newconn = netconn_alloc(conn->type, conn->callback);
+  if (newconn == NULL) {
+    return ERR_MEM;
+  }
+  newconn->pcb.tcp = newpcb;
+  setup_tcp(newconn);
+  /* no protection: when creating the pcb, the netconn is not yet known
+     to the application thread */
+  newconn->last_err = err;
+
+  if (sys_mbox_trypost(&conn->acceptmbox, newconn) != ERR_OK) {
+    /* When returning != ERR_OK, the pcb is aborted in tcp_process(),
+       so do nothing here! */
+    /* remove all references to this netconn from the pcb */
+    struct tcp_pcb* pcb = newconn->pcb.tcp;
+    tcp_arg(pcb, NULL);
+    tcp_recv(pcb, NULL);
+    tcp_sent(pcb, NULL);
+    tcp_poll(pcb, NULL, 4);
+    tcp_err(pcb, NULL);
+    /* remove reference from to the pcb from this netconn */
+    newconn->pcb.tcp = NULL;
+    /* no need to drain since we know the recvmbox is empty. */
+    sys_mbox_free(&newconn->recvmbox);
+    sys_mbox_set_invalid(&newconn->recvmbox);
+    netconn_free(newconn);
+    return ERR_MEM;
+  } else {
+    /* Register event with callback */
+    API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0);
+  }
+
+  return ERR_OK;
+}
+#endif /* LWIP_TCP */
+
+/**
+ * Create a new pcb of a specific type.
+ * Called from do_newconn().
+ *
+ * @param msg the api_msg_msg describing the connection type
+ * @return msg->conn->err, but the return value is currently ignored
+ */
+static void
+pcb_new(struct api_msg_msg *msg)
+{
+  LWIP_ASSERT("pcb_new: pcb already allocated", msg->conn->pcb.tcp == NULL);
+
+  /* Allocate a PCB for this connection */
+  switch(NETCONNTYPE_GROUP(msg->conn->type)) {
+#if LWIP_RAW
+  case NETCONN_RAW:
+    msg->conn->pcb.raw = raw_new(msg->msg.n.proto);
+    if(msg->conn->pcb.raw == NULL) {
+      msg->err = ERR_MEM;
+      break;
+    }
+    raw_recv(msg->conn->pcb.raw, recv_raw, msg->conn);
+    break;
+#endif /* LWIP_RAW */
+#if LWIP_UDP
+  case NETCONN_UDP:
+    msg->conn->pcb.udp = udp_new();
+    if(msg->conn->pcb.udp == NULL) {
+      msg->err = ERR_MEM;
+      break;
+    }
+#if LWIP_UDPLITE
+    if (msg->conn->type==NETCONN_UDPLITE) {
+      udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_UDPLITE);
+    }
+#endif /* LWIP_UDPLITE */
+    if (msg->conn->type==NETCONN_UDPNOCHKSUM) {
+      udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_NOCHKSUM);
+    }
+    udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
+    break;
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+  case NETCONN_TCP:
+    msg->conn->pcb.tcp = tcp_new();
+    if(msg->conn->pcb.tcp == NULL) {
+      msg->err = ERR_MEM;
+      break;
+    }
+    setup_tcp(msg->conn);
+    break;
+#endif /* LWIP_TCP */
+  default:
+    /* Unsupported netconn type, e.g. protocol disabled */
+    msg->err = ERR_VAL;
+    break;
+  }
+}
+
+/**
+ * Create a new pcb of a specific type inside a netconn.
+ * Called from netconn_new_with_proto_and_callback.
+ *
+ * @param msg the api_msg_msg describing the connection type
+ */
+void
+do_newconn(struct api_msg_msg *msg)
+{
+  msg->err = ERR_OK;
+  if(msg->conn->pcb.tcp == NULL) {
+    pcb_new(msg);
+  }
+  /* Else? This "new" connection already has a PCB allocated. */
+  /* Is this an error condition? Should it be deleted? */
+  /* We currently just are happy and return. */
+
+  TCPIP_APIMSG_ACK(msg);
+}
+
+/**
+ * Create a new netconn (of a specific type) that has a callback function.
+ * The corresponding pcb is NOT created!
+ *
+ * @param t the type of 'connection' to create (@see enum netconn_type)
+ * @param proto the IP protocol for RAW IP pcbs
+ * @param callback a function to call on status changes (RX available, TX'ed)
+ * @return a newly allocated struct netconn or
+ *         NULL on memory error
+ */
+struct netconn*
+netconn_alloc(enum netconn_type t, netconn_callback callback)
+{
+  struct netconn *conn;
+  int size;
+
+  conn = (struct netconn *)memp_malloc(MEMP_NETCONN);
+  if (conn == NULL) {
+    return NULL;
+  }
+
+  conn->last_err = ERR_OK;
+  conn->type = t;
+  conn->pcb.tcp = NULL;
+
+#if (DEFAULT_RAW_RECVMBOX_SIZE == DEFAULT_UDP_RECVMBOX_SIZE) && \
+    (DEFAULT_RAW_RECVMBOX_SIZE == DEFAULT_TCP_RECVMBOX_SIZE)
+  size = DEFAULT_RAW_RECVMBOX_SIZE;
+#else
+  switch(NETCONNTYPE_GROUP(t)) {
+#if LWIP_RAW
+  case NETCONN_RAW:
+    size = DEFAULT_RAW_RECVMBOX_SIZE;
+    break;
+#endif /* LWIP_RAW */
+#if LWIP_UDP
+  case NETCONN_UDP:
+    size = DEFAULT_UDP_RECVMBOX_SIZE;
+    break;
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+  case NETCONN_TCP:
+    size = DEFAULT_TCP_RECVMBOX_SIZE;
+    break;
+#endif /* LWIP_TCP */
+  default:
+    LWIP_ASSERT("netconn_alloc: undefined netconn_type", 0);
+    goto free_and_return;
+  }
+#endif
+
+  if (sys_sem_new(&conn->op_completed, 0) != ERR_OK) {
+    goto free_and_return;
+  }
+  if (sys_mbox_new(&conn->recvmbox, size) != ERR_OK) {
+    sys_sem_free(&conn->op_completed);
+    goto free_and_return;
+  }
+
+#if LWIP_TCP
+  sys_mbox_set_invalid(&conn->acceptmbox);
+#endif
+  conn->state        = NETCONN_NONE;
+#if LWIP_SOCKET
+  /* initialize socket to -1 since 0 is a valid socket */
+  conn->socket       = -1;
+#endif /* LWIP_SOCKET */
+  conn->callback     = callback;
+#if LWIP_TCP
+  conn->current_msg  = NULL;
+  conn->write_offset = 0;
+#endif /* LWIP_TCP */
+#if LWIP_SO_SNDTIMEO
+  conn->send_timeout = 0;
+#endif /* LWIP_SO_SNDTIMEO */
+#if LWIP_SO_RCVTIMEO
+  conn->recv_timeout = 0;
+#endif /* LWIP_SO_RCVTIMEO */
+#if LWIP_SO_RCVBUF
+  conn->recv_bufsize = RECV_BUFSIZE_DEFAULT;
+  conn->recv_avail   = 0;
+#endif /* LWIP_SO_RCVBUF */
+  conn->flags = 0;
+  return conn;
+free_and_return:
+  memp_free(MEMP_NETCONN, conn);
+  return NULL;
+}
+
+/**
+ * Delete a netconn and all its resources.
+ * The pcb is NOT freed (since we might not be in the right thread context do this).
+ *
+ * @param conn the netconn to free
+ */
+void
+netconn_free(struct netconn *conn)
+{
+  LWIP_ASSERT("PCB must be deallocated outside this function", conn->pcb.tcp == NULL);
+  LWIP_ASSERT("recvmbox must be deallocated before calling this function",
+    !sys_mbox_valid(&conn->recvmbox));
+#if LWIP_TCP
+  LWIP_ASSERT("acceptmbox must be deallocated before calling this function",
+    !sys_mbox_valid(&conn->acceptmbox));
+#endif /* LWIP_TCP */
+
+  sys_sem_free(&conn->op_completed);
+  sys_sem_set_invalid(&conn->op_completed);
+
+  memp_free(MEMP_NETCONN, conn);
+}
+
+/**
+ * Delete rcvmbox and acceptmbox of a netconn and free the left-over data in
+ * these mboxes
+ *
+ * @param conn the netconn to free
+ * @bytes_drained bytes drained from recvmbox
+ * @accepts_drained pending connections drained from acceptmbox
+ */
+static void
+netconn_drain(struct netconn *conn)
+{
+  void *mem;
+#if LWIP_TCP
+  struct pbuf *p;
+#endif /* LWIP_TCP */
+
+  /* This runs in tcpip_thread, so we don't need to lock against rx packets */
+
+  /* Delete and drain the recvmbox. */
+  if (sys_mbox_valid(&conn->recvmbox)) {
+    while (sys_mbox_tryfetch(&conn->recvmbox, &mem) != SYS_MBOX_EMPTY) {
+#if LWIP_TCP
+      if (conn->type == NETCONN_TCP) {
+        if(mem != NULL) {
+          p = (struct pbuf*)mem;
+          /* pcb might be set to NULL already by err_tcp() */
+          if (conn->pcb.tcp != NULL) {
+            tcp_recved(conn->pcb.tcp, p->tot_len);
+          }
+          pbuf_free(p);
+        }
+      } else
+#endif /* LWIP_TCP */
+      {
+        netbuf_delete((struct netbuf *)mem);
+      }
+    }
+    sys_mbox_free(&conn->recvmbox);
+    sys_mbox_set_invalid(&conn->recvmbox);
+  }
+
+  /* Delete and drain the acceptmbox. */
+#if LWIP_TCP
+  if (sys_mbox_valid(&conn->acceptmbox)) {
+    while (sys_mbox_tryfetch(&conn->acceptmbox, &mem) != SYS_MBOX_EMPTY) {
+      struct netconn *newconn = (struct netconn *)mem;
+      /* Only tcp pcbs have an acceptmbox, so no need to check conn->type */
+      /* pcb might be set to NULL already by err_tcp() */
+      if (conn->pcb.tcp != NULL) {
+        tcp_accepted(conn->pcb.tcp);
+      }
+      /* drain recvmbox */
+      netconn_drain(newconn);
+      if (newconn->pcb.tcp != NULL) {
+        tcp_abort(newconn->pcb.tcp);
+        newconn->pcb.tcp = NULL;
+      }
+      netconn_free(newconn);
+    }
+    sys_mbox_free(&conn->acceptmbox);
+    sys_mbox_set_invalid(&conn->acceptmbox);
+  }
+#endif /* LWIP_TCP */
+}
+
+#if LWIP_TCP
+/**
+ * Internal helper function to close a TCP netconn: since this sometimes
+ * doesn't work at the first attempt, this function is called from multiple
+ * places.
+ *
+ * @param conn the TCP netconn to close
+ */
+static void
+do_close_internal(struct netconn *conn)
+{
+  err_t err;
+  u8_t shut, shut_rx, shut_tx, close;
+
+  LWIP_ASSERT("invalid conn", (conn != NULL));
+  LWIP_ASSERT("this is for tcp netconns only", (conn->type == NETCONN_TCP));
+  LWIP_ASSERT("conn must be in state NETCONN_CLOSE", (conn->state == NETCONN_CLOSE));
+  LWIP_ASSERT("pcb already closed", (conn->pcb.tcp != NULL));
+  LWIP_ASSERT("conn->current_msg != NULL", conn->current_msg != NULL);
+
+  shut = conn->current_msg->msg.sd.shut;
+  shut_rx = shut & NETCONN_SHUT_RD;
+  shut_tx = shut & NETCONN_SHUT_WR;
+  /* shutting down both ends is the same as closing */
+  close = shut == NETCONN_SHUT_RDWR;
+
+  /* Set back some callback pointers */
+  if (close) {
+    tcp_arg(conn->pcb.tcp, NULL);
+  }
+  if (conn->pcb.tcp->state == LISTEN) {
+    tcp_accept(conn->pcb.tcp, NULL);
+  } else {
+    /* some callbacks have to be reset if tcp_close is not successful */
+    if (shut_rx) {
+      tcp_recv(conn->pcb.tcp, NULL);
+      tcp_accept(conn->pcb.tcp, NULL);
+    }
+    if (shut_tx) {
+      tcp_sent(conn->pcb.tcp, NULL);
+    }
+    if (close) {
+      tcp_poll(conn->pcb.tcp, NULL, 4);
+      tcp_err(conn->pcb.tcp, NULL);
+    }
+  }
+  /* Try to close the connection */
+  if (close) {
+    err = tcp_close(conn->pcb.tcp);
+  } else {
+    err = tcp_shutdown(conn->pcb.tcp, shut_rx, shut_tx);
+  }
+  if (err == ERR_OK) {
+    /* Closing succeeded */
+    conn->current_msg->err = ERR_OK;
+    conn->current_msg = NULL;
+    conn->state = NETCONN_NONE;
+    if (close) {
+      /* Set back some callback pointers as conn is going away */
+      conn->pcb.tcp = NULL;
+      /* Trigger select() in socket layer. Make sure everybody notices activity
+       on the connection, error first! */
+      API_EVENT(conn, NETCONN_EVT_ERROR, 0);
+    }
+    if (shut_rx) {
+      API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0);
+    }
+    if (shut_tx) {
+      API_EVENT(conn, NETCONN_EVT_SENDPLUS, 0);
+    }
+    /* wake up the application task */
+    sys_sem_signal(&conn->op_completed);
+  } else {
+    /* Closing failed, restore some of the callbacks */
+    /* Closing of listen pcb will never fail! */
+    LWIP_ASSERT("Closing a listen pcb may not fail!", (conn->pcb.tcp->state != LISTEN));
+    tcp_sent(conn->pcb.tcp, sent_tcp);
+    tcp_poll(conn->pcb.tcp, poll_tcp, 4);
+    tcp_err(conn->pcb.tcp, err_tcp);
+    tcp_arg(conn->pcb.tcp, conn);
+    /* don't restore recv callback: we don't want to receive any more data */
+  }
+  /* If closing didn't succeed, we get called again either
+     from poll_tcp or from sent_tcp */
+}
+#endif /* LWIP_TCP */
+
+/**
+ * Delete the pcb inside a netconn.
+ * Called from netconn_delete.
+ *
+ * @param msg the api_msg_msg pointing to the connection
+ */
+void
+do_delconn(struct api_msg_msg *msg)
+{
+  /* @todo TCP: abort running write/connect? */
+ if ((msg->conn->state != NETCONN_NONE) &&
+     (msg->conn->state != NETCONN_LISTEN) &&
+     (msg->conn->state != NETCONN_CONNECT)) {
+    /* this only happens for TCP netconns */
+    LWIP_ASSERT("msg->conn->type == NETCONN_TCP", msg->conn->type == NETCONN_TCP);
+    msg->err = ERR_INPROGRESS;
+  } else {
+    LWIP_ASSERT("blocking connect in progress",
+      (msg->conn->state != NETCONN_CONNECT) || IN_NONBLOCKING_CONNECT(msg->conn));
+    /* Drain and delete mboxes */
+    netconn_drain(msg->conn);
+
+    if (msg->conn->pcb.tcp != NULL) {
+
+      switch (NETCONNTYPE_GROUP(msg->conn->type)) {
+#if LWIP_RAW
+      case NETCONN_RAW:
+        raw_remove(msg->conn->pcb.raw);
+        break;
+#endif /* LWIP_RAW */
+#if LWIP_UDP
+      case NETCONN_UDP:
+        msg->conn->pcb.udp->recv_arg = NULL;
+        udp_remove(msg->conn->pcb.udp);
+        break;
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+      case NETCONN_TCP:
+        LWIP_ASSERT("already writing or closing", msg->conn->current_msg == NULL &&
+          msg->conn->write_offset == 0);
+        msg->conn->state = NETCONN_CLOSE;
+        msg->msg.sd.shut = NETCONN_SHUT_RDWR;
+        msg->conn->current_msg = msg;
+        do_close_internal(msg->conn);
+        /* API_EVENT is called inside do_close_internal, before releasing
+           the application thread, so we can return at this point! */
+        return;
+#endif /* LWIP_TCP */
+      default:
+        break;
+      }
+      msg->conn->pcb.tcp = NULL;
+    }
+    /* tcp netconns don't come here! */
+
+    /* @todo: this lets select make the socket readable and writable,
+       which is wrong! errfd instead? */
+    API_EVENT(msg->conn, NETCONN_EVT_RCVPLUS, 0);
+    API_EVENT(msg->conn, NETCONN_EVT_SENDPLUS, 0);
+  }
+  if (sys_sem_valid(&msg->conn->op_completed)) {
+    sys_sem_signal(&msg->conn->op_completed);
+  }
+}
+
+/**
+ * Bind a pcb contained in a netconn
+ * Called from netconn_bind.
+ *
+ * @param msg the api_msg_msg pointing to the connection and containing
+ *            the IP address and port to bind to
+ */
+void
+do_bind(struct api_msg_msg *msg)
+{
+  if (ERR_IS_FATAL(msg->conn->last_err)) {
+    msg->err = msg->conn->last_err;
+  } else {
+    msg->err = ERR_VAL;
+    if (msg->conn->pcb.tcp != NULL) {
+      switch (NETCONNTYPE_GROUP(msg->conn->type)) {
+#if LWIP_RAW
+      case NETCONN_RAW:
+        msg->err = raw_bind(msg->conn->pcb.raw, msg->msg.bc.ipaddr);
+        break;
+#endif /* LWIP_RAW */
+#if LWIP_UDP
+      case NETCONN_UDP:
+        msg->err = udp_bind(msg->conn->pcb.udp, msg->msg.bc.ipaddr, msg->msg.bc.port);
+        break;
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+      case NETCONN_TCP:
+        msg->err = tcp_bind(msg->conn->pcb.tcp, msg->msg.bc.ipaddr, msg->msg.bc.port);
+        break;
+#endif /* LWIP_TCP */
+      default:
+        break;
+      }
+    }
+  }
+  TCPIP_APIMSG_ACK(msg);
+}
+
+#if LWIP_TCP
+/**
+ * TCP callback function if a connection (opened by tcp_connect/do_connect) has
+ * been established (or reset by the remote host).
+ *
+ * @see tcp.h (struct tcp_pcb.connected) for parameters and return values
+ */
+static err_t
+do_connected(void *arg, struct tcp_pcb *pcb, err_t err)
+{
+  struct netconn *conn;
+  int was_blocking;
+
+  LWIP_UNUSED_ARG(pcb);
+
+  conn = (struct netconn *)arg;
+
+  if (conn == NULL) {
+    return ERR_VAL;
+  }
+
+  LWIP_ASSERT("conn->state == NETCONN_CONNECT", conn->state == NETCONN_CONNECT);
+  LWIP_ASSERT("(conn->current_msg != NULL) || conn->in_non_blocking_connect",
+    (conn->current_msg != NULL) || IN_NONBLOCKING_CONNECT(conn));
+
+  if (conn->current_msg != NULL) {
+    conn->current_msg->err = err;
+  }
+  if ((conn->type == NETCONN_TCP) && (err == ERR_OK)) {
+    setup_tcp(conn);
+  }
+  was_blocking = !IN_NONBLOCKING_CONNECT(conn);
+  SET_NONBLOCKING_CONNECT(conn, 0);
+  conn->current_msg = NULL;
+  conn->state = NETCONN_NONE;
+  if (!was_blocking) {
+    NETCONN_SET_SAFE_ERR(conn, ERR_OK);
+  }
+  API_EVENT(conn, NETCONN_EVT_SENDPLUS, 0);
+
+  if (was_blocking) {
+    sys_sem_signal(&conn->op_completed);
+  }
+  return ERR_OK;
+}
+#endif /* LWIP_TCP */
+
+/**
+ * Connect a pcb contained inside a netconn
+ * Called from netconn_connect.
+ *
+ * @param msg the api_msg_msg pointing to the connection and containing
+ *            the IP address and port to connect to
+ */
+void
+do_connect(struct api_msg_msg *msg)
+{
+  if (msg->conn->pcb.tcp == NULL) {
+    /* This may happen when calling netconn_connect() a second time */
+    msg->err = ERR_CLSD;
+  } else {
+    switch (NETCONNTYPE_GROUP(msg->conn->type)) {
+#if LWIP_RAW
+  case NETCONN_RAW:
+    msg->err = raw_connect(msg->conn->pcb.raw, msg->msg.bc.ipaddr);
+    break;
+#endif /* LWIP_RAW */
+#if LWIP_UDP
+  case NETCONN_UDP:
+    msg->err = udp_connect(msg->conn->pcb.udp, msg->msg.bc.ipaddr, msg->msg.bc.port);
+    break;
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+  case NETCONN_TCP:
+    /* Prevent connect while doing any other action. */
+    if (msg->conn->state != NETCONN_NONE) {
+      msg->err = ERR_ISCONN;
+    } else {
+      setup_tcp(msg->conn);
+      msg->err = tcp_connect(msg->conn->pcb.tcp, msg->msg.bc.ipaddr,
+        msg->msg.bc.port, do_connected);
+      if (msg->err == ERR_OK) {
+        u8_t non_blocking = netconn_is_nonblocking(msg->conn);
+        msg->conn->state = NETCONN_CONNECT;
+        SET_NONBLOCKING_CONNECT(msg->conn, non_blocking);
+        if (non_blocking) {
+          msg->err = ERR_INPROGRESS;
+        } else {
+          msg->conn->current_msg = msg;
+          /* sys_sem_signal() is called from do_connected (or err_tcp()),
+          * when the connection is established! */
+          return;
+        }
+      }
+    }
+    break;
+#endif /* LWIP_TCP */
+  default:
+    LWIP_ERROR("Invalid netconn type", 0, do{ msg->err = ERR_VAL; }while(0));
+    break;
+    }
+  }
+  sys_sem_signal(&msg->conn->op_completed);
+}
+
+/**
+ * Connect a pcb contained inside a netconn
+ * Only used for UDP netconns.
+ * Called from netconn_disconnect.
+ *
+ * @param msg the api_msg_msg pointing to the connection to disconnect
+ */
+void
+do_disconnect(struct api_msg_msg *msg)
+{
+#if LWIP_UDP
+  if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) {
+    udp_disconnect(msg->conn->pcb.udp);
+    msg->err = ERR_OK;
+  } else
+#endif /* LWIP_UDP */
+  {
+    msg->err = ERR_VAL;
+  }
+  TCPIP_APIMSG_ACK(msg);
+}
+
+#if LWIP_TCP
+/**
+ * Set a TCP pcb contained in a netconn into listen mode
+ * Called from netconn_listen.
+ *
+ * @param msg the api_msg_msg pointing to the connection
+ */
+void
+do_listen(struct api_msg_msg *msg)
+{
+  if (ERR_IS_FATAL(msg->conn->last_err)) {
+    msg->err = msg->conn->last_err;
+  } else {
+    msg->err = ERR_CONN;
+    if (msg->conn->pcb.tcp != NULL) {
+      if (msg->conn->type == NETCONN_TCP) {
+        if (msg->conn->state == NETCONN_NONE) {
+#if TCP_LISTEN_BACKLOG
+          struct tcp_pcb* lpcb = tcp_listen_with_backlog(msg->conn->pcb.tcp, msg->msg.lb.backlog);
+#else  /* TCP_LISTEN_BACKLOG */
+          struct tcp_pcb* lpcb = tcp_listen(msg->conn->pcb.tcp);
+#endif /* TCP_LISTEN_BACKLOG */
+          if (lpcb == NULL) {
+            /* in this case, the old pcb is still allocated */
+            msg->err = ERR_MEM;
+          } else {
+            /* delete the recvmbox and allocate the acceptmbox */
+            if (sys_mbox_valid(&msg->conn->recvmbox)) {
+              /** @todo: should we drain the recvmbox here? */
+              sys_mbox_free(&msg->conn->recvmbox);
+              sys_mbox_set_invalid(&msg->conn->recvmbox);
+            }
+            msg->err = ERR_OK;
+            if (!sys_mbox_valid(&msg->conn->acceptmbox)) {
+              msg->err = sys_mbox_new(&msg->conn->acceptmbox, DEFAULT_ACCEPTMBOX_SIZE);
+            }
+            if (msg->err == ERR_OK) {
+              msg->conn->state = NETCONN_LISTEN;
+              msg->conn->pcb.tcp = lpcb;
+              tcp_arg(msg->conn->pcb.tcp, msg->conn);
+              tcp_accept(msg->conn->pcb.tcp, accept_function);
+            } else {
+              /* since the old pcb is already deallocated, free lpcb now */
+              tcp_close(lpcb);
+              msg->conn->pcb.tcp = NULL;
+            }
+          }
+        }
+      } else {
+        msg->err = ERR_ARG;
+      }
+    }
+  }
+  TCPIP_APIMSG_ACK(msg);
+}
+#endif /* LWIP_TCP */
+
+/**
+ * Send some data on a RAW or UDP pcb contained in a netconn
+ * Called from netconn_send
+ *
+ * @param msg the api_msg_msg pointing to the connection
+ */
+void
+do_send(struct api_msg_msg *msg)
+{
+  if (ERR_IS_FATAL(msg->conn->last_err)) {
+    msg->err = msg->conn->last_err;
+  } else {
+    msg->err = ERR_CONN;
+    if (msg->conn->pcb.tcp != NULL) {
+      switch (NETCONNTYPE_GROUP(msg->conn->type)) {
+#if LWIP_RAW
+      case NETCONN_RAW:
+        if (ip_addr_isany(&msg->msg.b->addr)) {
+          msg->err = raw_send(msg->conn->pcb.raw, msg->msg.b->p);
+        } else {
+          msg->err = raw_sendto(msg->conn->pcb.raw, msg->msg.b->p, &msg->msg.b->addr);
+        }
+        break;
+#endif
+#if LWIP_UDP
+      case NETCONN_UDP:
+#if LWIP_CHECKSUM_ON_COPY
+        if (ip_addr_isany(&msg->msg.b->addr)) {
+          msg->err = udp_send_chksum(msg->conn->pcb.udp, msg->msg.b->p,
+            msg->msg.b->flags & NETBUF_FLAG_CHKSUM, msg->msg.b->toport_chksum);
+        } else {
+          msg->err = udp_sendto_chksum(msg->conn->pcb.udp, msg->msg.b->p,
+            &msg->msg.b->addr, msg->msg.b->port,
+            msg->msg.b->flags & NETBUF_FLAG_CHKSUM, msg->msg.b->toport_chksum);
+        }
+#else /* LWIP_CHECKSUM_ON_COPY */
+        if (ip_addr_isany(&msg->msg.b->addr)) {
+          msg->err = udp_send(msg->conn->pcb.udp, msg->msg.b->p);
+        } else {
+          msg->err = udp_sendto(msg->conn->pcb.udp, msg->msg.b->p, &msg->msg.b->addr, msg->msg.b->port);
+        }
+#endif /* LWIP_CHECKSUM_ON_COPY */
+        break;
+#endif /* LWIP_UDP */
+      default:
+        break;
+      }
+    }
+  }
+  TCPIP_APIMSG_ACK(msg);
+}
+
+#if LWIP_TCP
+/**
+ * Indicate data has been received from a TCP pcb contained in a netconn
+ * Called from netconn_recv
+ *
+ * @param msg the api_msg_msg pointing to the connection
+ */
+void
+do_recv(struct api_msg_msg *msg)
+{
+  msg->err = ERR_OK;
+  if (msg->conn->pcb.tcp != NULL) {
+    if (msg->conn->type == NETCONN_TCP) {
+#if TCP_LISTEN_BACKLOG
+      if (msg->conn->pcb.tcp->state == LISTEN) {
+        tcp_accepted(msg->conn->pcb.tcp);
+      } else
+#endif /* TCP_LISTEN_BACKLOG */
+      {
+        u32_t remaining = msg->msg.r.len;
+        do {
+          u16_t recved = (remaining > 0xffff) ? 0xffff : (u16_t)remaining;
+          tcp_recved(msg->conn->pcb.tcp, recved);
+          remaining -= recved;
+        }while(remaining != 0);
+      }
+    }
+  }
+  TCPIP_APIMSG_ACK(msg);
+}
+
+/**
+ * See if more data needs to be written from a previous call to netconn_write.
+ * Called initially from do_write. If the first call can't send all data
+ * (because of low memory or empty send-buffer), this function is called again
+ * from sent_tcp() or poll_tcp() to send more data. If all data is sent, the
+ * blocking application thread (waiting in netconn_write) is released.
+ *
+ * @param conn netconn (that is currently in state NETCONN_WRITE) to process
+ * @return ERR_OK
+ *         ERR_MEM if LWIP_TCPIP_CORE_LOCKING=1 and sending hasn't yet finished
+ */
+static err_t
+do_writemore(struct netconn *conn)
+{
+  err_t err;
+  void *dataptr;
+  u16_t len, available;
+  u8_t write_finished = 0;
+  size_t diff;
+  u8_t dontblock = netconn_is_nonblocking(conn) ||
+       (conn->current_msg->msg.w.apiflags & NETCONN_DONTBLOCK);
+  u8_t apiflags = conn->current_msg->msg.w.apiflags;
+
+  LWIP_ASSERT("conn != NULL", conn != NULL);
+  LWIP_ASSERT("conn->state == NETCONN_WRITE", (conn->state == NETCONN_WRITE));
+  LWIP_ASSERT("conn->current_msg != NULL", conn->current_msg != NULL);
+  LWIP_ASSERT("conn->pcb.tcp != NULL", conn->pcb.tcp != NULL);
+  LWIP_ASSERT("conn->write_offset < conn->current_msg->msg.w.len",
+    conn->write_offset < conn->current_msg->msg.w.len);
+
+#if LWIP_SO_SNDTIMEO
+  if ((conn->send_timeout != 0) &&
+      ((s32_t)(sys_now() - conn->current_msg->msg.w.time_started) >= conn->send_timeout)) {
+    write_finished = 1;
+    if (conn->write_offset == 0) {
+      /* nothing has been written */
+      err = ERR_WOULDBLOCK;
+      conn->current_msg->msg.w.len = 0;
+    } else {
+      /* partial write */
+      err = ERR_OK;
+      conn->current_msg->msg.w.len = conn->write_offset;
+    }
+  } else
+#endif /* LWIP_SO_SNDTIMEO */
+  {
+    dataptr = (u8_t*)conn->current_msg->msg.w.dataptr + conn->write_offset;
+    diff = conn->current_msg->msg.w.len - conn->write_offset;
+    if (diff > 0xffffUL) { /* max_u16_t */
+      len = 0xffff;
+#if LWIP_TCPIP_CORE_LOCKING
+      conn->flags |= NETCONN_FLAG_WRITE_DELAYED;
+#endif
+      apiflags |= TCP_WRITE_FLAG_MORE;
+    } else {
+      len = (u16_t)diff;
+    }
+    available = tcp_sndbuf(conn->pcb.tcp);
+    if (available < len) {
+      /* don't try to write more than sendbuf */
+      len = available;
+      if (dontblock){ 
+        if (!len) {
+          err = ERR_WOULDBLOCK;
+          goto err_mem;
+        }
+      } else {
+#if LWIP_TCPIP_CORE_LOCKING
+        conn->flags |= NETCONN_FLAG_WRITE_DELAYED;
+#endif
+        apiflags |= TCP_WRITE_FLAG_MORE;
+      }
+    }
+    LWIP_ASSERT("do_writemore: invalid length!", ((conn->write_offset + len) <= conn->current_msg->msg.w.len));
+    err = tcp_write(conn->pcb.tcp, dataptr, len, apiflags);
+    /* if OK or memory error, check available space */
+    if ((err == ERR_OK) || (err == ERR_MEM)) {
+err_mem:
+      if (dontblock && (len < conn->current_msg->msg.w.len)) {
+        /* non-blocking write did not write everything: mark the pcb non-writable
+           and let poll_tcp check writable space to mark the pcb writable again */
+        API_EVENT(conn, NETCONN_EVT_SENDMINUS, len);
+        conn->flags |= NETCONN_FLAG_CHECK_WRITESPACE;
+      } else if ((tcp_sndbuf(conn->pcb.tcp) <= TCP_SNDLOWAT) ||
+                 (tcp_sndqueuelen(conn->pcb.tcp) >= TCP_SNDQUEUELOWAT)) {
+        /* The queued byte- or pbuf-count exceeds the configured low-water limit,
+           let select mark this pcb as non-writable. */
+        API_EVENT(conn, NETCONN_EVT_SENDMINUS, len);
+      }
+    }
+
+    if (err == ERR_OK) {
+      conn->write_offset += len;
+      if ((conn->write_offset == conn->current_msg->msg.w.len) || dontblock) {
+        /* return sent length */
+        conn->current_msg->msg.w.len = conn->write_offset;
+        /* everything was written */
+        write_finished = 1;
+        conn->write_offset = 0;
+      }
+      tcp_output(conn->pcb.tcp);
+    } else if ((err == ERR_MEM) && !dontblock) {
+      /* If ERR_MEM, we wait for sent_tcp or poll_tcp to be called
+         we do NOT return to the application thread, since ERR_MEM is
+         only a temporary error! */
+
+      /* tcp_write returned ERR_MEM, try tcp_output anyway */
+      tcp_output(conn->pcb.tcp);
+
+#if LWIP_TCPIP_CORE_LOCKING
+      conn->flags |= NETCONN_FLAG_WRITE_DELAYED;
+#endif
+    } else {
+      /* On errors != ERR_MEM, we don't try writing any more but return
+         the error to the application thread. */
+      write_finished = 1;
+      conn->current_msg->msg.w.len = 0;
+    }
+  }
+  if (write_finished) {
+    /* everything was written: set back connection state
+       and back to application task */
+    conn->current_msg->err = err;
+    conn->current_msg = NULL;
+    conn->state = NETCONN_NONE;
+#if LWIP_TCPIP_CORE_LOCKING
+    if ((conn->flags & NETCONN_FLAG_WRITE_DELAYED) != 0)
+#endif
+    {
+      sys_sem_signal(&conn->op_completed);
+    }
+  }
+#if LWIP_TCPIP_CORE_LOCKING
+  else
+    return ERR_MEM;
+#endif
+  return ERR_OK;
+}
+#endif /* LWIP_TCP */
+
+/**
+ * Send some data on a TCP pcb contained in a netconn
+ * Called from netconn_write
+ *
+ * @param msg the api_msg_msg pointing to the connection
+ */
+void
+do_write(struct api_msg_msg *msg)
+{
+  if (ERR_IS_FATAL(msg->conn->last_err)) {
+    msg->err = msg->conn->last_err;
+  } else {
+    if (msg->conn->type == NETCONN_TCP) {
+#if LWIP_TCP
+      if (msg->conn->state != NETCONN_NONE) {
+        /* netconn is connecting, closing or in blocking write */
+        msg->err = ERR_INPROGRESS;
+      } else if (msg->conn->pcb.tcp != NULL) {
+        msg->conn->state = NETCONN_WRITE;
+        /* set all the variables used by do_writemore */
+        LWIP_ASSERT("already writing or closing", msg->conn->current_msg == NULL &&
+          msg->conn->write_offset == 0);
+        LWIP_ASSERT("msg->msg.w.len != 0", msg->msg.w.len != 0);
+        msg->conn->current_msg = msg;
+        msg->conn->write_offset = 0;
+#if LWIP_TCPIP_CORE_LOCKING
+        msg->conn->flags &= ~NETCONN_FLAG_WRITE_DELAYED;
+        if (do_writemore(msg->conn) != ERR_OK) {
+          LWIP_ASSERT("state!", msg->conn->state == NETCONN_WRITE);
+          UNLOCK_TCPIP_CORE();
+          sys_arch_sem_wait(&msg->conn->op_completed, 0);
+          LOCK_TCPIP_CORE();
+          LWIP_ASSERT("state!", msg->conn->state == NETCONN_NONE);
+        }
+#else /* LWIP_TCPIP_CORE_LOCKING */
+        do_writemore(msg->conn);
+#endif /* LWIP_TCPIP_CORE_LOCKING */
+        /* for both cases: if do_writemore was called, don't ACK the APIMSG
+           since do_writemore ACKs it! */
+        return;
+      } else {
+        msg->err = ERR_CONN;
+      }
+#else /* LWIP_TCP */
+      msg->err = ERR_VAL;
+#endif /* LWIP_TCP */
+#if (LWIP_UDP || LWIP_RAW)
+    } else {
+      msg->err = ERR_VAL;
+#endif /* (LWIP_UDP || LWIP_RAW) */
+    }
+  }
+  TCPIP_APIMSG_ACK(msg);
+}
+
+/**
+ * Return a connection's local or remote address
+ * Called from netconn_getaddr
+ *
+ * @param msg the api_msg_msg pointing to the connection
+ */
+void
+do_getaddr(struct api_msg_msg *msg)
+{
+  if (msg->conn->pcb.ip != NULL) {
+    *(msg->msg.ad.ipaddr) = (msg->msg.ad.local ? msg->conn->pcb.ip->local_ip :
+                             msg->conn->pcb.ip->remote_ip);
+
+    msg->err = ERR_OK;
+    switch (NETCONNTYPE_GROUP(msg->conn->type)) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      if (msg->msg.ad.local) {
+        *(msg->msg.ad.port) = msg->conn->pcb.raw->protocol;
+      } else {
+        /* return an error as connecting is only a helper for upper layers */
+        msg->err = ERR_CONN;
+      }
+      break;
+#endif /* LWIP_RAW */
+#if LWIP_UDP
+    case NETCONN_UDP:
+      if (msg->msg.ad.local) {
+        *(msg->msg.ad.port) = msg->conn->pcb.udp->local_port;
+      } else {
+        if ((msg->conn->pcb.udp->flags & UDP_FLAGS_CONNECTED) == 0) {
+          msg->err = ERR_CONN;
+        } else {
+          *(msg->msg.ad.port) = msg->conn->pcb.udp->remote_port;
+        }
+      }
+      break;
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+    case NETCONN_TCP:
+      *(msg->msg.ad.port) = (msg->msg.ad.local?msg->conn->pcb.tcp->local_port:msg->conn->pcb.tcp->remote_port);
+      break;
+#endif /* LWIP_TCP */
+    default:
+      LWIP_ASSERT("invalid netconn_type", 0);
+      break;
+    }
+  } else {
+    msg->err = ERR_CONN;
+  }
+  TCPIP_APIMSG_ACK(msg);
+}
+
+/**
+ * Close a TCP pcb contained in a netconn
+ * Called from netconn_close
+ *
+ * @param msg the api_msg_msg pointing to the connection
+ */
+void
+do_close(struct api_msg_msg *msg)
+{
+#if LWIP_TCP
+  /* @todo: abort running write/connect? */
+  if ((msg->conn->state != NETCONN_NONE) && (msg->conn->state != NETCONN_LISTEN)) {
+    /* this only happens for TCP netconns */
+    LWIP_ASSERT("msg->conn->type == NETCONN_TCP", msg->conn->type == NETCONN_TCP);
+    msg->err = ERR_INPROGRESS;
+  } else if ((msg->conn->pcb.tcp != NULL) && (msg->conn->type == NETCONN_TCP)) {
+    if ((msg->msg.sd.shut != NETCONN_SHUT_RDWR) && (msg->conn->state == NETCONN_LISTEN)) {
+      /* LISTEN doesn't support half shutdown */
+      msg->err = ERR_CONN;
+    } else {
+      if (msg->msg.sd.shut & NETCONN_SHUT_RD) {
+        /* Drain and delete mboxes */
+        netconn_drain(msg->conn);
+      }
+      LWIP_ASSERT("already writing or closing", msg->conn->current_msg == NULL &&
+        msg->conn->write_offset == 0);
+      msg->conn->state = NETCONN_CLOSE;
+      msg->conn->current_msg = msg;
+      do_close_internal(msg->conn);
+      /* for tcp netconns, do_close_internal ACKs the message */
+      return;
+    }
+  } else
+#endif /* LWIP_TCP */
+  {
+    msg->err = ERR_VAL;
+  }
+  sys_sem_signal(&msg->conn->op_completed);
+}
+
+#if LWIP_IGMP
+/**
+ * Join multicast groups for UDP netconns.
+ * Called from netconn_join_leave_group
+ *
+ * @param msg the api_msg_msg pointing to the connection
+ */
+void
+do_join_leave_group(struct api_msg_msg *msg)
+{ 
+  if (ERR_IS_FATAL(msg->conn->last_err)) {
+    msg->err = msg->conn->last_err;
+  } else {
+    if (msg->conn->pcb.tcp != NULL) {
+      if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) {
+#if LWIP_UDP
+        if (msg->msg.jl.join_or_leave == NETCONN_JOIN) {
+          msg->err = igmp_joingroup(msg->msg.jl.netif_addr, msg->msg.jl.multiaddr);
+        } else {
+          msg->err = igmp_leavegroup(msg->msg.jl.netif_addr, msg->msg.jl.multiaddr);
+        }
+#endif /* LWIP_UDP */
+#if (LWIP_TCP || LWIP_RAW)
+      } else {
+        msg->err = ERR_VAL;
+#endif /* (LWIP_TCP || LWIP_RAW) */
+      }
+    } else {
+      msg->err = ERR_CONN;
+    }
+  }
+  TCPIP_APIMSG_ACK(msg);
+}
+#endif /* LWIP_IGMP */
+
+#if LWIP_DNS
+/**
+ * Callback function that is called when DNS name is resolved
+ * (or on timeout). A waiting application thread is waked up by
+ * signaling the semaphore.
+ */
+static void
+do_dns_found(const char *name, ip_addr_t *ipaddr, void *arg)
+{
+  struct dns_api_msg *msg = (struct dns_api_msg*)arg;
+
+  LWIP_ASSERT("DNS response for wrong host name", strcmp(msg->name, name) == 0);
+  LWIP_UNUSED_ARG(name);
+
+  if (ipaddr == NULL) {
+    /* timeout or memory error */
+    *msg->err = ERR_VAL;
+  } else {
+    /* address was resolved */
+    *msg->err = ERR_OK;
+    *msg->addr = *ipaddr;
+  }
+  /* wake up the application task waiting in netconn_gethostbyname */
+  sys_sem_signal(msg->sem);
+}
+
+/**
+ * Execute a DNS query
+ * Called from netconn_gethostbyname
+ *
+ * @param arg the dns_api_msg pointing to the query
+ */
+void
+do_gethostbyname(void *arg)
+{
+  struct dns_api_msg *msg = (struct dns_api_msg*)arg;
+
+  *msg->err = dns_gethostbyname(msg->name, msg->addr, do_dns_found, msg);
+  if (*msg->err != ERR_INPROGRESS) {
+    /* on error or immediate success, wake up the application
+     * task waiting in netconn_gethostbyname */
+    sys_sem_signal(msg->sem);
+  }
+}
+#endif /* LWIP_DNS */
+
+#endif /* LWIP_NETCONN */
diff --git a/ext/lwip/src/api/err.c b/ext/lwip/src/api/err.c
new file mode 100644
index 000000000..92fa8b7db
--- /dev/null
+++ b/ext/lwip/src/api/err.c
@@ -0,0 +1,75 @@
+/**
+ * @file
+ * Error Management module
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/err.h"
+
+#ifdef LWIP_DEBUG
+
+static const char *err_strerr[] = {
+           "Ok.",                    /* ERR_OK          0  */
+           "Out of memory error.",   /* ERR_MEM        -1  */
+           "Buffer error.",          /* ERR_BUF        -2  */
+           "Timeout.",               /* ERR_TIMEOUT    -3  */
+           "Routing problem.",       /* ERR_RTE        -4  */
+           "Operation in progress.", /* ERR_INPROGRESS -5  */
+           "Illegal value.",         /* ERR_VAL        -6  */
+           "Operation would block.", /* ERR_WOULDBLOCK -7  */
+           "Address in use.",        /* ERR_USE        -8  */
+           "Already connected.",     /* ERR_ISCONN     -9  */
+           "Connection aborted.",    /* ERR_ABRT       -10 */
+           "Connection reset.",      /* ERR_RST        -11 */
+           "Connection closed.",     /* ERR_CLSD       -12 */
+           "Not connected.",         /* ERR_CONN       -13 */
+           "Illegal argument.",      /* ERR_ARG        -14 */
+           "Low-level netif error.", /* ERR_IF         -15 */
+};
+
+/**
+ * Convert an lwip internal error to a string representation.
+ *
+ * @param err an lwip internal err_t
+ * @return a string representation for err
+ */
+const char *
+lwip_strerr(err_t err)
+{
+  return err_strerr[-err];
+
+}
+
+#endif /* LWIP_DEBUG */
diff --git a/ext/lwip/src/api/netbuf.c b/ext/lwip/src/api/netbuf.c
new file mode 100644
index 000000000..9390c9ee9
--- /dev/null
+++ b/ext/lwip/src/api/netbuf.c
@@ -0,0 +1,245 @@
+/**
+ * @file
+ * Network buffer management
+ *
+ */
+ 
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_NETCONN /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/netbuf.h"
+#include "lwip/memp.h"
+
+#include <string.h>
+
+/**
+ * Create (allocate) and initialize a new netbuf.
+ * The netbuf doesn't yet contain a packet buffer!
+ *
+ * @return a pointer to a new netbuf
+ *         NULL on lack of memory
+ */
+struct
+netbuf *netbuf_new(void)
+{
+  struct netbuf *buf;
+
+  buf = (struct netbuf *)memp_malloc(MEMP_NETBUF);
+  if (buf != NULL) {
+    buf->p = NULL;
+    buf->ptr = NULL;
+    ip_addr_set_any(&buf->addr);
+    buf->port = 0;
+#if LWIP_NETBUF_RECVINFO || LWIP_CHECKSUM_ON_COPY
+#if LWIP_CHECKSUM_ON_COPY
+    buf->flags = 0;
+#endif /* LWIP_CHECKSUM_ON_COPY */
+    buf->toport_chksum = 0;
+#if LWIP_NETBUF_RECVINFO
+    ip_addr_set_any(&buf->toaddr);
+#endif /* LWIP_NETBUF_RECVINFO */
+#endif /* LWIP_NETBUF_RECVINFO || LWIP_CHECKSUM_ON_COPY */
+    return buf;
+  } else {
+    return NULL;
+  }
+}
+
+/**
+ * Deallocate a netbuf allocated by netbuf_new().
+ *
+ * @param buf pointer to a netbuf allocated by netbuf_new()
+ */
+void
+netbuf_delete(struct netbuf *buf)
+{
+  if (buf != NULL) {
+    if (buf->p != NULL) {
+      pbuf_free(buf->p);
+      buf->p = buf->ptr = NULL;
+    }
+    memp_free(MEMP_NETBUF, buf);
+  }
+}
+
+/**
+ * Allocate memory for a packet buffer for a given netbuf.
+ *
+ * @param buf the netbuf for which to allocate a packet buffer
+ * @param size the size of the packet buffer to allocate
+ * @return pointer to the allocated memory
+ *         NULL if no memory could be allocated
+ */
+void *
+netbuf_alloc(struct netbuf *buf, u16_t size)
+{
+  LWIP_ERROR("netbuf_alloc: invalid buf", (buf != NULL), return NULL;);
+
+  /* Deallocate any previously allocated memory. */
+  if (buf->p != NULL) {
+    pbuf_free(buf->p);
+  }
+  buf->p = pbuf_alloc(PBUF_TRANSPORT, size, PBUF_RAM);
+  if (buf->p == NULL) {
+     return NULL;
+  }
+  LWIP_ASSERT("check that first pbuf can hold size",
+             (buf->p->len >= size));
+  buf->ptr = buf->p;
+  return buf->p->payload;
+}
+
+/**
+ * Free the packet buffer included in a netbuf
+ *
+ * @param buf pointer to the netbuf which contains the packet buffer to free
+ */
+void
+netbuf_free(struct netbuf *buf)
+{
+  LWIP_ERROR("netbuf_free: invalid buf", (buf != NULL), return;);
+  if (buf->p != NULL) {
+    pbuf_free(buf->p);
+  }
+  buf->p = buf->ptr = NULL;
+}
+
+/**
+ * Let a netbuf reference existing (non-volatile) data.
+ *
+ * @param buf netbuf which should reference the data
+ * @param dataptr pointer to the data to reference
+ * @param size size of the data
+ * @return ERR_OK if data is referenced
+ *         ERR_MEM if data couldn't be referenced due to lack of memory
+ */
+err_t
+netbuf_ref(struct netbuf *buf, const void *dataptr, u16_t size)
+{
+  LWIP_ERROR("netbuf_ref: invalid buf", (buf != NULL), return ERR_ARG;);
+  if (buf->p != NULL) {
+    pbuf_free(buf->p);
+  }
+  buf->p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_REF);
+  if (buf->p == NULL) {
+    buf->ptr = NULL;
+    return ERR_MEM;
+  }
+  buf->p->payload = (void*)dataptr;
+  buf->p->len = buf->p->tot_len = size;
+  buf->ptr = buf->p;
+  return ERR_OK;
+}
+
+/**
+ * Chain one netbuf to another (@see pbuf_chain)
+ *
+ * @param head the first netbuf
+ * @param tail netbuf to chain after head, freed by this function, may not be reference after returning
+ */
+void
+netbuf_chain(struct netbuf *head, struct netbuf *tail)
+{
+  LWIP_ERROR("netbuf_ref: invalid head", (head != NULL), return;);
+  LWIP_ERROR("netbuf_chain: invalid tail", (tail != NULL), return;);
+  pbuf_cat(head->p, tail->p);
+  head->ptr = head->p;
+  memp_free(MEMP_NETBUF, tail);
+}
+
+/**
+ * Get the data pointer and length of the data inside a netbuf.
+ *
+ * @param buf netbuf to get the data from
+ * @param dataptr pointer to a void pointer where to store the data pointer
+ * @param len pointer to an u16_t where the length of the data is stored
+ * @return ERR_OK if the information was retreived,
+ *         ERR_BUF on error.
+ */
+err_t
+netbuf_data(struct netbuf *buf, void **dataptr, u16_t *len)
+{
+  LWIP_ERROR("netbuf_data: invalid buf", (buf != NULL), return ERR_ARG;);
+  LWIP_ERROR("netbuf_data: invalid dataptr", (dataptr != NULL), return ERR_ARG;);
+  LWIP_ERROR("netbuf_data: invalid len", (len != NULL), return ERR_ARG;);
+
+  if (buf->ptr == NULL) {
+    return ERR_BUF;
+  }
+  *dataptr = buf->ptr->payload;
+  *len = buf->ptr->len;
+  return ERR_OK;
+}
+
+/**
+ * Move the current data pointer of a packet buffer contained in a netbuf
+ * to the next part.
+ * The packet buffer itself is not modified.
+ *
+ * @param buf the netbuf to modify
+ * @return -1 if there is no next part
+ *         1  if moved to the next part but now there is no next part
+ *         0  if moved to the next part and there are still more parts
+ */
+s8_t
+netbuf_next(struct netbuf *buf)
+{
+  LWIP_ERROR("netbuf_free: invalid buf", (buf != NULL), return -1;);
+  if (buf->ptr->next == NULL) {
+    return -1;
+  }
+  buf->ptr = buf->ptr->next;
+  if (buf->ptr->next == NULL) {
+    return 1;
+  }
+  return 0;
+}
+
+/**
+ * Move the current data pointer of a packet buffer contained in a netbuf
+ * to the beginning of the packet.
+ * The packet buffer itself is not modified.
+ *
+ * @param buf the netbuf to modify
+ */
+void
+netbuf_first(struct netbuf *buf)
+{
+  LWIP_ERROR("netbuf_free: invalid buf", (buf != NULL), return;);
+  buf->ptr = buf->p;
+}
+
+#endif /* LWIP_NETCONN */
diff --git a/ext/lwip/src/api/netdb.c b/ext/lwip/src/api/netdb.c
new file mode 100644
index 000000000..6a4bac561
--- /dev/null
+++ b/ext/lwip/src/api/netdb.c
@@ -0,0 +1,353 @@
+/**
+ * @file
+ * API functions for name resolving
+ *
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Simon Goldschmidt
+ *
+ */
+
+#include "lwip/netdb.h"
+
+#if LWIP_DNS && LWIP_SOCKET
+
+#include "lwip/err.h"
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+#include "lwip/ip_addr.h"
+#include "lwip/api.h"
+#include "lwip/dns.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+/** helper struct for gethostbyname_r to access the char* buffer */
+struct gethostbyname_r_helper {
+  ip_addr_t *addr_list[2];
+  ip_addr_t addr;
+  char *aliases;
+};
+
+/** h_errno is exported in netdb.h for access by applications. */
+#if LWIP_DNS_API_DECLARE_H_ERRNO
+int h_errno;
+#endif /* LWIP_DNS_API_DECLARE_H_ERRNO */
+
+/** define "hostent" variables storage: 0 if we use a static (but unprotected)
+ * set of variables for lwip_gethostbyname, 1 if we use a local storage */
+#ifndef LWIP_DNS_API_HOSTENT_STORAGE
+#define LWIP_DNS_API_HOSTENT_STORAGE 0
+#endif
+
+/** define "hostent" variables storage */
+#if LWIP_DNS_API_HOSTENT_STORAGE
+#define HOSTENT_STORAGE
+#else
+#define HOSTENT_STORAGE static
+#endif /* LWIP_DNS_API_STATIC_HOSTENT */
+
+/**
+ * Returns an entry containing addresses of address family AF_INET
+ * for the host with name name.
+ * Due to dns_gethostbyname limitations, only one address is returned.
+ *
+ * @param name the hostname to resolve
+ * @return an entry containing addresses of address family AF_INET
+ *         for the host with name name
+ */
+struct hostent*
+lwip_gethostbyname(const char *name)
+{
+  err_t err;
+  ip_addr_t addr;
+
+  /* buffer variables for lwip_gethostbyname() */
+  HOSTENT_STORAGE struct hostent s_hostent;
+  HOSTENT_STORAGE char *s_aliases;
+  HOSTENT_STORAGE ip_addr_t s_hostent_addr;
+  HOSTENT_STORAGE ip_addr_t *s_phostent_addr[2];
+
+  /* query host IP address */
+  err = netconn_gethostbyname(name, &addr);
+  if (err != ERR_OK) {
+    LWIP_DEBUGF(DNS_DEBUG, ("lwip_gethostbyname(%s) failed, err=%d\n", name, err));
+    h_errno = HOST_NOT_FOUND;
+    return NULL;
+  }
+
+  /* fill hostent */
+  s_hostent_addr = addr;
+  s_phostent_addr[0] = &s_hostent_addr;
+  s_phostent_addr[1] = NULL;
+  s_hostent.h_name = (char*)name;
+  s_hostent.h_aliases = &s_aliases;
+  s_hostent.h_addrtype = AF_INET;
+  s_hostent.h_length = sizeof(ip_addr_t);
+  s_hostent.h_addr_list = (char**)&s_phostent_addr;
+
+#if DNS_DEBUG
+  /* dump hostent */
+  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_name           == %s\n", s_hostent.h_name));
+  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_aliases        == %p\n", s_hostent.h_aliases));
+  if (s_hostent.h_aliases != NULL) {
+    u8_t idx;
+    for ( idx=0; s_hostent.h_aliases[idx]; idx++) {
+      LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_aliases[%i]->   == %p\n", idx, s_hostent.h_aliases[idx]));
+      LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_aliases[%i]->   == %s\n", idx, s_hostent.h_aliases[idx]));
+    }
+  }
+  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_addrtype       == %d\n", s_hostent.h_addrtype));
+  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_length         == %d\n", s_hostent.h_length));
+  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_addr_list      == %p\n", s_hostent.h_addr_list));
+  if (s_hostent.h_addr_list != NULL) {
+    u8_t idx;
+    for ( idx=0; s_hostent.h_addr_list[idx]; idx++) {
+      LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_addr_list[%i]   == %p\n", idx, s_hostent.h_addr_list[idx]));
+      LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_addr_list[%i]-> == %s\n", idx, ip_ntoa((ip_addr_t*)s_hostent.h_addr_list[idx])));
+    }
+  }
+#endif /* DNS_DEBUG */
+
+#if LWIP_DNS_API_HOSTENT_STORAGE
+  /* this function should return the "per-thread" hostent after copy from s_hostent */
+  return sys_thread_hostent(&s_hostent);
+#else
+  return &s_hostent;
+#endif /* LWIP_DNS_API_HOSTENT_STORAGE */
+}
+
+/**
+ * Thread-safe variant of lwip_gethostbyname: instead of using a static
+ * buffer, this function takes buffer and errno pointers as arguments
+ * and uses these for the result.
+ *
+ * @param name the hostname to resolve
+ * @param ret pre-allocated struct where to store the result
+ * @param buf pre-allocated buffer where to store additional data
+ * @param buflen the size of buf
+ * @param result pointer to a hostent pointer that is set to ret on success
+ *               and set to zero on error
+ * @param h_errnop pointer to an int where to store errors (instead of modifying
+ *                 the global h_errno)
+ * @return 0 on success, non-zero on error, additional error information
+ *         is stored in *h_errnop instead of h_errno to be thread-safe
+ */
+int
+lwip_gethostbyname_r(const char *name, struct hostent *ret, char *buf,
+                size_t buflen, struct hostent **result, int *h_errnop)
+{
+  err_t err;
+  struct gethostbyname_r_helper *h;
+  char *hostname;
+  size_t namelen;
+  int lh_errno;
+
+  if (h_errnop == NULL) {
+    /* ensure h_errnop is never NULL */
+    h_errnop = &lh_errno;
+  }
+
+  if (result == NULL) {
+    /* not all arguments given */
+    *h_errnop = EINVAL;
+    return -1;
+  }
+  /* first thing to do: set *result to nothing */
+  *result = NULL;
+  if ((name == NULL) || (ret == NULL) || (buf == NULL)) {
+    /* not all arguments given */
+    *h_errnop = EINVAL;
+    return -1;
+  }
+
+  namelen = strlen(name);
+  if (buflen < (sizeof(struct gethostbyname_r_helper) + namelen + 1 + (MEM_ALIGNMENT - 1))) {
+    /* buf can't hold the data needed + a copy of name */
+    *h_errnop = ERANGE;
+    return -1;
+  }
+
+  h = (struct gethostbyname_r_helper*)LWIP_MEM_ALIGN(buf);
+  hostname = ((char*)h) + sizeof(struct gethostbyname_r_helper);
+
+  /* query host IP address */
+  err = netconn_gethostbyname(name, &h->addr);
+  if (err != ERR_OK) {
+    LWIP_DEBUGF(DNS_DEBUG, ("lwip_gethostbyname(%s) failed, err=%d\n", name, err));
+    *h_errnop = HOST_NOT_FOUND;
+    return -1;
+  }
+
+  /* copy the hostname into buf */
+  MEMCPY(hostname, name, namelen);
+  hostname[namelen] = 0;
+
+  /* fill hostent */
+  h->addr_list[0] = &h->addr;
+  h->addr_list[1] = NULL;
+  h->aliases = NULL;
+  ret->h_name = hostname;
+  ret->h_aliases = &h->aliases;
+  ret->h_addrtype = AF_INET;
+  ret->h_length = sizeof(ip_addr_t);
+  ret->h_addr_list = (char**)&h->addr_list;
+
+  /* set result != NULL */
+  *result = ret;
+
+  /* return success */
+  return 0;
+}
+
+/**
+ * Frees one or more addrinfo structures returned by getaddrinfo(), along with
+ * any additional storage associated with those structures. If the ai_next field
+ * of the structure is not null, the entire list of structures is freed.
+ *
+ * @param ai struct addrinfo to free
+ */
+void
+lwip_freeaddrinfo(struct addrinfo *ai)
+{
+  struct addrinfo *next;
+
+  while (ai != NULL) {
+    next = ai->ai_next;
+    memp_free(MEMP_NETDB, ai);
+    ai = next;
+  }
+}
+
+/**
+ * Translates the name of a service location (for example, a host name) and/or
+ * a service name and returns a set of socket addresses and associated
+ * information to be used in creating a socket with which to address the
+ * specified service.
+ * Memory for the result is allocated internally and must be freed by calling
+ * lwip_freeaddrinfo()!
+ *
+ * Due to a limitation in dns_gethostbyname, only the first address of a
+ * host is returned.
+ * Also, service names are not supported (only port numbers)!
+ *
+ * @param nodename descriptive name or address string of the host
+ *                 (may be NULL -> local address)
+ * @param servname port number as string of NULL 
+ * @param hints structure containing input values that set socktype and protocol
+ * @param res pointer to a pointer where to store the result (set to NULL on failure)
+ * @return 0 on success, non-zero on failure
+ */
+int
+lwip_getaddrinfo(const char *nodename, const char *servname,
+       const struct addrinfo *hints, struct addrinfo **res)
+{
+  err_t err;
+  ip_addr_t addr;
+  struct addrinfo *ai;
+  struct sockaddr_in *sa = NULL;
+  int port_nr = 0;
+  size_t total_size;
+  size_t namelen = 0;
+
+  if (res == NULL) {
+    return EAI_FAIL;
+  }
+  *res = NULL;
+  if ((nodename == NULL) && (servname == NULL)) {
+    return EAI_NONAME;
+  }
+
+  if (servname != NULL) {
+    /* service name specified: convert to port number
+     * @todo?: currently, only ASCII integers (port numbers) are supported! */
+    port_nr = atoi(servname);
+    if ((port_nr <= 0) || (port_nr > 0xffff)) {
+      return EAI_SERVICE;
+    }
+  }
+
+  if (nodename != NULL) {
+    /* service location specified, try to resolve */
+    err = netconn_gethostbyname(nodename, &addr);
+    if (err != ERR_OK) {
+      return EAI_FAIL;
+    }
+  } else {
+    /* service location specified, use loopback address */
+    ip_addr_set_loopback(&addr);
+  }
+
+  total_size = sizeof(struct addrinfo) + sizeof(struct sockaddr_in);
+  if (nodename != NULL) {
+    namelen = strlen(nodename);
+    LWIP_ASSERT("namelen is too long", (namelen + 1) <= (mem_size_t)-1);
+    total_size += namelen + 1;
+  }
+  /* If this fails, please report to lwip-devel! :-) */
+  LWIP_ASSERT("total_size <= NETDB_ELEM_SIZE: please report this!",
+    total_size <= NETDB_ELEM_SIZE);
+  ai = (struct addrinfo *)memp_malloc(MEMP_NETDB);
+  if (ai == NULL) {
+    goto memerr;
+  }
+  memset(ai, 0, total_size);
+  sa = (struct sockaddr_in*)((u8_t*)ai + sizeof(struct addrinfo));
+  /* set up sockaddr */
+  inet_addr_from_ipaddr(&sa->sin_addr, &addr);
+  sa->sin_family = AF_INET;
+  sa->sin_len = sizeof(struct sockaddr_in);
+  sa->sin_port = htons((u16_t)port_nr);
+
+  /* set up addrinfo */
+  ai->ai_family = AF_INET;
+  if (hints != NULL) {
+    /* copy socktype & protocol from hints if specified */
+    ai->ai_socktype = hints->ai_socktype;
+    ai->ai_protocol = hints->ai_protocol;
+  }
+  if (nodename != NULL) {
+    /* copy nodename to canonname if specified */
+    ai->ai_canonname = ((char*)ai + sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
+    MEMCPY(ai->ai_canonname, nodename, namelen);
+    ai->ai_canonname[namelen] = 0;
+  }
+  ai->ai_addrlen = sizeof(struct sockaddr_in);
+  ai->ai_addr = (struct sockaddr*)sa;
+
+  *res = ai;
+
+  return 0;
+memerr:
+  if (ai != NULL) {
+    memp_free(MEMP_NETDB, ai);
+  }
+  return EAI_MEMORY;
+}
+
+#endif /* LWIP_DNS && LWIP_SOCKET */
diff --git a/ext/lwip/src/api/netifapi.c b/ext/lwip/src/api/netifapi.c
new file mode 100644
index 000000000..43e47203a
--- /dev/null
+++ b/ext/lwip/src/api/netifapi.c
@@ -0,0 +1,160 @@
+/**
+ * @file
+ * Network Interface Sequential API module
+ *
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_NETIF_API /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/netifapi.h"
+#include "lwip/tcpip.h"
+
+/**
+ * Call netif_add() inside the tcpip_thread context.
+ */
+void
+do_netifapi_netif_add(struct netifapi_msg_msg *msg)
+{
+  if (!netif_add( msg->netif,
+                  msg->msg.add.ipaddr,
+                  msg->msg.add.netmask,
+                  msg->msg.add.gw,
+                  msg->msg.add.state,
+                  msg->msg.add.init,
+                  msg->msg.add.input)) {
+    msg->err = ERR_IF;
+  } else {
+    msg->err = ERR_OK;
+  }
+  TCPIP_NETIFAPI_ACK(msg);
+}
+
+/**
+ * Call netif_set_addr() inside the tcpip_thread context.
+ */
+void
+do_netifapi_netif_set_addr(struct netifapi_msg_msg *msg)
+{
+  netif_set_addr( msg->netif,
+                  msg->msg.add.ipaddr,
+                  msg->msg.add.netmask,
+                  msg->msg.add.gw);
+  msg->err = ERR_OK;
+  TCPIP_NETIFAPI_ACK(msg);
+}
+
+/**
+ * Call the "errtfunc" (or the "voidfunc" if "errtfunc" is NULL) inside the
+ * tcpip_thread context.
+ */
+void
+do_netifapi_netif_common(struct netifapi_msg_msg *msg)
+{
+  if (msg->msg.common.errtfunc != NULL) {
+    msg->err = msg->msg.common.errtfunc(msg->netif);
+  } else {
+    msg->err = ERR_OK;
+    msg->msg.common.voidfunc(msg->netif);
+  }
+  TCPIP_NETIFAPI_ACK(msg);
+}
+
+/**
+ * Call netif_add() in a thread-safe way by running that function inside the
+ * tcpip_thread context.
+ *
+ * @note for params @see netif_add()
+ */
+err_t
+netifapi_netif_add(struct netif *netif,
+                   ip_addr_t *ipaddr,
+                   ip_addr_t *netmask,
+                   ip_addr_t *gw,
+                   void *state,
+                   netif_init_fn init,
+                   netif_input_fn input)
+{
+  struct netifapi_msg msg;
+  msg.function = do_netifapi_netif_add;
+  msg.msg.netif = netif;
+  msg.msg.msg.add.ipaddr  = ipaddr;
+  msg.msg.msg.add.netmask = netmask;
+  msg.msg.msg.add.gw      = gw;
+  msg.msg.msg.add.state   = state;
+  msg.msg.msg.add.init    = init;
+  msg.msg.msg.add.input   = input;
+  TCPIP_NETIFAPI(&msg);
+  return msg.msg.err;
+}
+
+/**
+ * Call netif_set_addr() in a thread-safe way by running that function inside the
+ * tcpip_thread context.
+ *
+ * @note for params @see netif_set_addr()
+ */
+err_t
+netifapi_netif_set_addr(struct netif *netif,
+                        ip_addr_t *ipaddr,
+                        ip_addr_t *netmask,
+                        ip_addr_t *gw)
+{
+  struct netifapi_msg msg;
+  msg.function = do_netifapi_netif_set_addr;
+  msg.msg.netif = netif;
+  msg.msg.msg.add.ipaddr  = ipaddr;
+  msg.msg.msg.add.netmask = netmask;
+  msg.msg.msg.add.gw      = gw;
+  TCPIP_NETIFAPI(&msg);
+  return msg.msg.err;
+}
+
+/**
+ * call the "errtfunc" (or the "voidfunc" if "errtfunc" is NULL) in a thread-safe
+ * way by running that function inside the tcpip_thread context.
+ *
+ * @note use only for functions where there is only "netif" parameter.
+ */
+err_t
+netifapi_netif_common(struct netif *netif, netifapi_void_fn voidfunc,
+                       netifapi_errt_fn errtfunc)
+{
+  struct netifapi_msg msg;
+  msg.function = do_netifapi_netif_common;
+  msg.msg.netif = netif;
+  msg.msg.msg.common.voidfunc = voidfunc;
+  msg.msg.msg.common.errtfunc = errtfunc;
+  TCPIP_NETIFAPI(&msg);
+  return msg.msg.err;
+}
+
+#endif /* LWIP_NETIF_API */
diff --git a/ext/lwip/src/api/sockets.c b/ext/lwip/src/api/sockets.c
new file mode 100644
index 000000000..359919e78
--- /dev/null
+++ b/ext/lwip/src/api/sockets.c
@@ -0,0 +1,2374 @@
+/**
+ * @file
+ * Sockets BSD-Like API module
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ * Improved by Marc Boucher <marc@mbsi.ca> and David Haas <dhaas@alum.rpi.edu>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/sockets.h"
+#include "lwip/api.h"
+#include "lwip/sys.h"
+#include "lwip/igmp.h"
+#include "lwip/inet.h"
+#include "lwip/tcp.h"
+#include "lwip/raw.h"
+#include "lwip/udp.h"
+#include "lwip/tcpip.h"
+#include "lwip/pbuf.h"
+#if LWIP_CHECKSUM_ON_COPY
+#include "lwip/inet_chksum.h"
+#endif
+
+#include <string.h>
+
+#define NUM_SOCKETS MEMP_NUM_NETCONN
+
+/** Contains all internal pointers and states used for a socket */
+struct lwip_sock {
+  /** sockets currently are built on netconns, each socket has one netconn */
+  struct netconn *conn;
+  /** data that was left from the previous read */
+  void *lastdata;
+  /** offset in the data that was left from the previous read */
+  u16_t lastoffset;
+  /** number of times data was received, set by event_callback(),
+      tested by the receive and select functions */
+  s16_t rcvevent;
+  /** number of times data was ACKed (free send buffer), set by event_callback(),
+      tested by select */
+  u16_t sendevent;
+  /** error happened for this socket, set by event_callback(), tested by select */
+  u16_t errevent; 
+  /** last error that occurred on this socket */
+  int err;
+  /** counter of how many threads are waiting for this socket using select */
+  int select_waiting;
+};
+
+/** Description for a task waiting in select */
+struct lwip_select_cb {
+  /** Pointer to the next waiting task */
+  struct lwip_select_cb *next;
+  /** Pointer to the previous waiting task */
+  struct lwip_select_cb *prev;
+  /** readset passed to select */
+  fd_set *readset;
+  /** writeset passed to select */
+  fd_set *writeset;
+  /** unimplemented: exceptset passed to select */
+  fd_set *exceptset;
+  /** don't signal the same semaphore twice: set to 1 when signalled */
+  int sem_signalled;
+  /** semaphore to wake up a task waiting for select */
+  sys_sem_t sem;
+};
+
+/** This struct is used to pass data to the set/getsockopt_internal
+ * functions running in tcpip_thread context (only a void* is allowed) */
+struct lwip_setgetsockopt_data {
+  /** socket struct for which to change options */
+  struct lwip_sock *sock;
+#ifdef LWIP_DEBUG
+  /** socket index for which to change options */
+  int s;
+#endif /* LWIP_DEBUG */
+  /** level of the option to process */
+  int level;
+  /** name of the option to process */
+  int optname;
+  /** set: value to set the option to
+    * get: value of the option is stored here */
+  void *optval;
+  /** size of *optval */
+  socklen_t *optlen;
+  /** if an error occures, it is temporarily stored here */
+  err_t err;
+};
+
+/** The global array of available sockets */
+static struct lwip_sock sockets[NUM_SOCKETS];
+/** The global list of tasks waiting for select */
+static struct lwip_select_cb *select_cb_list;
+/** This counter is increased from lwip_select when the list is chagned
+    and checked in event_callback to see if it has changed. */
+static volatile int select_cb_ctr;
+
+/** Table to quickly map an lwIP error (err_t) to a socket error
+  * by using -err as an index */
+static const int err_to_errno_table[] = {
+  0,             /* ERR_OK          0      No error, everything OK. */
+  ENOMEM,        /* ERR_MEM        -1      Out of memory error.     */
+  ENOBUFS,       /* ERR_BUF        -2      Buffer error.            */
+  EWOULDBLOCK,   /* ERR_TIMEOUT    -3      Timeout                  */
+  EHOSTUNREACH,  /* ERR_RTE        -4      Routing problem.         */
+  EINPROGRESS,   /* ERR_INPROGRESS -5      Operation in progress    */
+  EINVAL,        /* ERR_VAL        -6      Illegal value.           */
+  EWOULDBLOCK,   /* ERR_WOULDBLOCK -7      Operation would block.   */
+  EADDRINUSE,    /* ERR_USE        -8      Address in use.          */
+  EALREADY,      /* ERR_ISCONN     -9      Already connected.       */
+  ECONNABORTED,  /* ERR_ABRT       -10     Connection aborted.      */
+  ECONNRESET,    /* ERR_RST        -11     Connection reset.        */
+  ENOTCONN,      /* ERR_CLSD       -12     Connection closed.       */
+  ENOTCONN,      /* ERR_CONN       -13     Not connected.           */
+  EIO,           /* ERR_ARG        -14     Illegal argument.        */
+  -1,            /* ERR_IF         -15     Low-level netif error    */
+};
+
+#define ERR_TO_ERRNO_TABLE_SIZE \
+  (sizeof(err_to_errno_table)/sizeof(err_to_errno_table[0]))
+
+#define err_to_errno(err) \
+  ((unsigned)(-(err)) < ERR_TO_ERRNO_TABLE_SIZE ? \
+    err_to_errno_table[-(err)] : EIO)
+
+#ifdef ERRNO
+#ifndef set_errno
+#define set_errno(err) errno = (err)
+#endif
+#else /* ERRNO */
+#define set_errno(err)
+#endif /* ERRNO */
+
+#define sock_set_errno(sk, e) do { \
+  sk->err = (e); \
+  set_errno(sk->err); \
+} while (0)
+
+/* Forward delcaration of some functions */
+static void event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len);
+static void lwip_getsockopt_internal(void *arg);
+static void lwip_setsockopt_internal(void *arg);
+
+/**
+ * Initialize this module. This function has to be called before any other
+ * functions in this module!
+ */
+void
+lwip_socket_init(void)
+{
+}
+
+/**
+ * Map a externally used socket index to the internal socket representation.
+ *
+ * @param s externally used socket index
+ * @return struct lwip_sock for the socket or NULL if not found
+ */
+static struct lwip_sock *
+get_socket(int s)
+{
+  struct lwip_sock *sock;
+
+  if ((s < 0) || (s >= NUM_SOCKETS)) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("get_socket(%d): invalid\n", s));
+    set_errno(EBADF);
+    return NULL;
+  }
+
+  sock = &sockets[s];
+
+  if (!sock->conn) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("get_socket(%d): not active\n", s));
+    set_errno(EBADF);
+    return NULL;
+  }
+
+  return sock;
+}
+
+/**
+ * Same as get_socket but doesn't set errno
+ *
+ * @param s externally used socket index
+ * @return struct lwip_sock for the socket or NULL if not found
+ */
+static struct lwip_sock *
+tryget_socket(int s)
+{
+  if ((s < 0) || (s >= NUM_SOCKETS)) {
+    return NULL;
+  }
+  if (!sockets[s].conn) {
+    return NULL;
+  }
+  return &sockets[s];
+}
+
+/**
+ * Allocate a new socket for a given netconn.
+ *
+ * @param newconn the netconn for which to allocate a socket
+ * @param accepted 1 if socket has been created by accept(),
+ *                 0 if socket has been created by socket()
+ * @return the index of the new socket; -1 on error
+ */
+static int
+alloc_socket(struct netconn *newconn, int accepted)
+{
+  int i;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  /* allocate a new socket identifier */
+  for (i = 0; i < NUM_SOCKETS; ++i) {
+    /* Protect socket array */
+    SYS_ARCH_PROTECT(lev);
+    if (!sockets[i].conn) {
+      sockets[i].conn       = newconn;
+      /* The socket is not yet known to anyone, so no need to protect
+         after having marked it as used. */
+      SYS_ARCH_UNPROTECT(lev);
+      sockets[i].lastdata   = NULL;
+      sockets[i].lastoffset = 0;
+      sockets[i].rcvevent   = 0;
+      /* TCP sendbuf is empty, but the socket is not yet writable until connected
+       * (unless it has been created by accept()). */
+      sockets[i].sendevent  = (newconn->type == NETCONN_TCP ? (accepted != 0) : 1);
+      sockets[i].errevent   = 0;
+      sockets[i].err        = 0;
+      sockets[i].select_waiting = 0;
+      return i;
+    }
+    SYS_ARCH_UNPROTECT(lev);
+  }
+  return -1;
+}
+
+/** Free a socket. The socket's netconn must have been
+ * delete before!
+ *
+ * @param sock the socket to free
+ * @param is_tcp != 0 for TCP sockets, used to free lastdata
+ */
+static void
+free_socket(struct lwip_sock *sock, int is_tcp)
+{
+  void *lastdata;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  lastdata         = sock->lastdata;
+  sock->lastdata   = NULL;
+  sock->lastoffset = 0;
+  sock->err        = 0;
+
+  /* Protect socket array */
+  SYS_ARCH_PROTECT(lev);
+  sock->conn       = NULL;
+  SYS_ARCH_UNPROTECT(lev);
+  /* don't use 'sock' after this line, as another task might have allocated it */
+
+  if (lastdata != NULL) {
+    if (is_tcp) {
+      pbuf_free((struct pbuf *)lastdata);
+    } else {
+      netbuf_delete((struct netbuf *)lastdata);
+    }
+  }
+}
+
+/* Below this, the well-known socket functions are implemented.
+ * Use google.com or opengroup.org to get a good description :-)
+ *
+ * Exceptions are documented!
+ */
+
+int
+lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
+{
+  struct lwip_sock *sock, *nsock;
+  struct netconn *newconn;
+  ip_addr_t naddr;
+  u16_t port;
+  int newsock;
+  struct sockaddr_in sin;
+  err_t err;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d)...\n", s));
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  if (netconn_is_nonblocking(sock->conn) && (sock->rcvevent <= 0)) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d): returning EWOULDBLOCK\n", s));
+    sock_set_errno(sock, EWOULDBLOCK);
+    return -1;
+  }
+
+  /* wait for a new connection */
+  err = netconn_accept(sock->conn, &newconn);
+  if (err != ERR_OK) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d): netconn_acept failed, err=%d\n", s, err));
+    if (netconn_type(sock->conn) != NETCONN_TCP) {
+      sock_set_errno(sock, EOPNOTSUPP);
+      return EOPNOTSUPP;
+    }
+    sock_set_errno(sock, err_to_errno(err));
+    return -1;
+  }
+  LWIP_ASSERT("newconn != NULL", newconn != NULL);
+  /* Prevent automatic window updates, we do this on our own! */
+  netconn_set_noautorecved(newconn, 1);
+
+  /* get the IP address and port of the remote host */
+  err = netconn_peer(newconn, &naddr, &port);
+  if (err != ERR_OK) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d): netconn_peer failed, err=%d\n", s, err));
+    netconn_delete(newconn);
+    sock_set_errno(sock, err_to_errno(err));
+    return -1;
+  }
+
+  /* Note that POSIX only requires us to check addr is non-NULL. addrlen must
+   * not be NULL if addr is valid.
+   */
+  if (NULL != addr) {
+    LWIP_ASSERT("addr valid but addrlen NULL", addrlen != NULL);
+    memset(&sin, 0, sizeof(sin));
+    sin.sin_len = sizeof(sin);
+    sin.sin_family = AF_INET;
+    sin.sin_port = htons(port);
+    inet_addr_from_ipaddr(&sin.sin_addr, &naddr);
+
+    if (*addrlen > sizeof(sin))
+      *addrlen = sizeof(sin);
+
+    MEMCPY(addr, &sin, *addrlen);
+  }
+
+  newsock = alloc_socket(newconn, 1);
+  if (newsock == -1) {
+    netconn_delete(newconn);
+    sock_set_errno(sock, ENFILE);
+    return -1;
+  }
+  LWIP_ASSERT("invalid socket index", (newsock >= 0) && (newsock < NUM_SOCKETS));
+  LWIP_ASSERT("newconn->callback == event_callback", newconn->callback == event_callback);
+  nsock = &sockets[newsock];
+
+  /* See event_callback: If data comes in right away after an accept, even
+   * though the server task might not have created a new socket yet.
+   * In that case, newconn->socket is counted down (newconn->socket--),
+   * so nsock->rcvevent is >= 1 here!
+   */
+  SYS_ARCH_PROTECT(lev);
+  nsock->rcvevent += (s16_t)(-1 - newconn->socket);
+  newconn->socket = newsock;
+  SYS_ARCH_UNPROTECT(lev);
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d) returning new sock=%d addr=", s, newsock));
+  ip_addr_debug_print(SOCKETS_DEBUG, &naddr);
+  LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F"\n", port));
+
+  sock_set_errno(sock, 0);
+  return newsock;
+}
+
+int
+lwip_bind(int s, const struct sockaddr *name, socklen_t namelen)
+{
+  struct lwip_sock *sock;
+  ip_addr_t local_addr;
+  u16_t local_port;
+  err_t err;
+  const struct sockaddr_in *name_in;
+
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  /* check size, familiy and alignment of 'name' */
+  LWIP_ERROR("lwip_bind: invalid address", ((namelen == sizeof(struct sockaddr_in)) &&
+             ((name->sa_family) == AF_INET) && ((((mem_ptr_t)name) % 4) == 0)),
+             sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
+  name_in = (const struct sockaddr_in *)(void*)name;
+
+  inet_addr_to_ipaddr(&local_addr, &name_in->sin_addr);
+  local_port = name_in->sin_port;
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_bind(%d, addr=", s));
+  ip_addr_debug_print(SOCKETS_DEBUG, &local_addr);
+  LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", ntohs(local_port)));
+
+  err = netconn_bind(sock->conn, &local_addr, ntohs(local_port));
+
+  if (err != ERR_OK) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_bind(%d) failed, err=%d\n", s, err));
+    sock_set_errno(sock, err_to_errno(err));
+    return -1;
+  }
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_bind(%d) succeeded\n", s));
+  sock_set_errno(sock, 0);
+  return 0;
+}
+
+int
+lwip_close(int s)
+{
+  struct lwip_sock *sock;
+  int is_tcp = 0;
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_close(%d)\n", s));
+
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  if(sock->conn != NULL) {
+    is_tcp = netconn_type(sock->conn) == NETCONN_TCP;
+  } else {
+    LWIP_ASSERT("sock->lastdata == NULL", sock->lastdata == NULL);
+  }
+
+  netconn_delete(sock->conn);
+
+  free_socket(sock, is_tcp);
+  set_errno(0);
+  return 0;
+}
+
+int
+lwip_connect(int s, const struct sockaddr *name, socklen_t namelen)
+{
+  struct lwip_sock *sock;
+  err_t err;
+  const struct sockaddr_in *name_in;
+
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  /* check size, familiy and alignment of 'name' */
+  LWIP_ERROR("lwip_connect: invalid address", ((namelen == sizeof(struct sockaddr_in)) &&
+             ((name->sa_family) == AF_INET) && ((((mem_ptr_t)name) % 4) == 0)),
+             sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
+  name_in = (const struct sockaddr_in *)(void*)name;
+
+  if (name_in->sin_family == AF_UNSPEC) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d, AF_UNSPEC)\n", s));
+    err = netconn_disconnect(sock->conn);
+  } else {
+    ip_addr_t remote_addr;
+    u16_t remote_port;
+
+    inet_addr_to_ipaddr(&remote_addr, &name_in->sin_addr);
+    remote_port = name_in->sin_port;
+
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d, addr=", s));
+    ip_addr_debug_print(SOCKETS_DEBUG, &remote_addr);
+    LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", ntohs(remote_port)));
+
+    err = netconn_connect(sock->conn, &remote_addr, ntohs(remote_port));
+  }
+
+  if (err != ERR_OK) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d) failed, err=%d\n", s, err));
+    sock_set_errno(sock, err_to_errno(err));
+    return -1;
+  }
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d) succeeded\n", s));
+  sock_set_errno(sock, 0);
+  return 0;
+}
+
+/**
+ * Set a socket into listen mode.
+ * The socket may not have been used for another connection previously.
+ *
+ * @param s the socket to set to listening mode
+ * @param backlog (ATTENTION: needs TCP_LISTEN_BACKLOG=1)
+ * @return 0 on success, non-zero on failure
+ */
+int
+lwip_listen(int s, int backlog)
+{
+  struct lwip_sock *sock;
+  err_t err;
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_listen(%d, backlog=%d)\n", s, backlog));
+
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  /* limit the "backlog" parameter to fit in an u8_t */
+  backlog = LWIP_MIN(LWIP_MAX(backlog, 0), 0xff);
+
+  err = netconn_listen_with_backlog(sock->conn, (u8_t)backlog);
+
+  if (err != ERR_OK) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_listen(%d) failed, err=%d\n", s, err));
+    if (netconn_type(sock->conn) != NETCONN_TCP) {
+      sock_set_errno(sock, EOPNOTSUPP);
+      return EOPNOTSUPP;
+    }
+    sock_set_errno(sock, err_to_errno(err));
+    return -1;
+  }
+
+  sock_set_errno(sock, 0);
+  return 0;
+}
+
+int
+lwip_recvfrom(int s, void *mem, size_t len, int flags,
+        struct sockaddr *from, socklen_t *fromlen)
+{
+  struct lwip_sock *sock;
+  void             *buf = NULL;
+  struct pbuf      *p;
+  u16_t            buflen, copylen;
+  int              off = 0;
+  ip_addr_t        *addr;
+  u16_t            port;
+  u8_t             done = 0;
+  err_t            err;
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d, %p, %"SZT_F", 0x%x, ..)\n", s, mem, len, flags));
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  do {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: top while sock->lastdata=%p\n", sock->lastdata));
+    /* Check if there is data left from the last recv operation. */
+    if (sock->lastdata) {
+      buf = sock->lastdata;
+    } else {
+      /* If this is non-blocking call, then check first */
+      if (((flags & MSG_DONTWAIT) || netconn_is_nonblocking(sock->conn)) && 
+          (sock->rcvevent <= 0)) {
+        if (off > 0) {
+          /* update receive window */
+          netconn_recved(sock->conn, (u32_t)off);
+          /* already received data, return that */
+          sock_set_errno(sock, 0);
+          return off;
+        }
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): returning EWOULDBLOCK\n", s));
+        sock_set_errno(sock, EWOULDBLOCK);
+        return -1;
+      }
+
+      /* No data was left from the previous operation, so we try to get
+         some from the network. */
+      if (netconn_type(sock->conn) == NETCONN_TCP) {
+        err = netconn_recv_tcp_pbuf(sock->conn, (struct pbuf **)&buf);
+      } else {
+        err = netconn_recv(sock->conn, (struct netbuf **)&buf);
+      }
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: netconn_recv err=%d, netbuf=%p\n",
+        err, buf));
+
+      if (err != ERR_OK) {
+        if (off > 0) {
+          /* update receive window */
+          netconn_recved(sock->conn, (u32_t)off);
+          /* already received data, return that */
+          sock_set_errno(sock, 0);
+          return off;
+        }
+        /* We should really do some error checking here. */
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): buf == NULL, error is \"%s\"!\n",
+          s, lwip_strerr(err)));
+        sock_set_errno(sock, err_to_errno(err));
+        if (err == ERR_CLSD) {
+          return 0;
+        } else {
+          return -1;
+        }
+      }
+      LWIP_ASSERT("buf != NULL", buf != NULL);
+      sock->lastdata = buf;
+    }
+
+    if (netconn_type(sock->conn) == NETCONN_TCP) {
+      p = (struct pbuf *)buf;
+    } else {
+      p = ((struct netbuf *)buf)->p;
+    }
+    buflen = p->tot_len;
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: buflen=%"U16_F" len=%"SZT_F" off=%d sock->lastoffset=%"U16_F"\n",
+      buflen, len, off, sock->lastoffset));
+
+    buflen -= sock->lastoffset;
+
+    if (len > buflen) {
+      copylen = buflen;
+    } else {
+      copylen = (u16_t)len;
+    }
+
+    /* copy the contents of the received buffer into
+    the supplied memory pointer mem */
+    pbuf_copy_partial(p, (u8_t*)mem + off, copylen, sock->lastoffset);
+
+    off += copylen;
+
+    if (netconn_type(sock->conn) == NETCONN_TCP) {
+      LWIP_ASSERT("invalid copylen, len would underflow", len >= copylen);
+      len -= copylen;
+      if ( (len <= 0) || 
+           (p->flags & PBUF_FLAG_PUSH) || 
+           (sock->rcvevent <= 0) || 
+           ((flags & MSG_PEEK)!=0)) {
+        done = 1;
+      }
+    } else {
+      done = 1;
+    }
+
+    /* Check to see from where the data was.*/
+    if (done) {
+      ip_addr_t fromaddr;
+      if (from && fromlen) {
+        struct sockaddr_in sin;
+
+        if (netconn_type(sock->conn) == NETCONN_TCP) {
+          addr = &fromaddr;
+          netconn_getaddr(sock->conn, addr, &port, 0);
+        } else {
+          addr = netbuf_fromaddr((struct netbuf *)buf);
+          port = netbuf_fromport((struct netbuf *)buf);
+        }
+
+        memset(&sin, 0, sizeof(sin));
+        sin.sin_len = sizeof(sin);
+        sin.sin_family = AF_INET;
+        sin.sin_port = htons(port);
+        inet_addr_from_ipaddr(&sin.sin_addr, addr);
+
+        if (*fromlen > sizeof(sin)) {
+          *fromlen = sizeof(sin);
+        }
+
+        MEMCPY(from, &sin, *fromlen);
+
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): addr=", s));
+        ip_addr_debug_print(SOCKETS_DEBUG, addr);
+        LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F" len=%d\n", port, off));
+      } else {
+#if SOCKETS_DEBUG
+        if (netconn_type(sock->conn) == NETCONN_TCP) {
+          addr = &fromaddr;
+          netconn_getaddr(sock->conn, addr, &port, 0);
+        } else {
+          addr = netbuf_fromaddr((struct netbuf *)buf);
+          port = netbuf_fromport((struct netbuf *)buf);
+        }
+
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): addr=", s));
+        ip_addr_debug_print(SOCKETS_DEBUG, addr);
+        LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F" len=%d\n", port, off));
+#endif /*  SOCKETS_DEBUG */
+      }
+    }
+
+    /* If we don't peek the incoming message... */
+    if ((flags & MSG_PEEK) == 0) {
+      /* If this is a TCP socket, check if there is data left in the
+         buffer. If so, it should be saved in the sock structure for next
+         time around. */
+      if ((netconn_type(sock->conn) == NETCONN_TCP) && (buflen - copylen > 0)) {
+        sock->lastdata = buf;
+        sock->lastoffset += copylen;
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: lastdata now netbuf=%p\n", buf));
+      } else {
+        sock->lastdata = NULL;
+        sock->lastoffset = 0;
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: deleting netbuf=%p\n", buf));
+        if (netconn_type(sock->conn) == NETCONN_TCP) {
+          pbuf_free((struct pbuf *)buf);
+        } else {
+          netbuf_delete((struct netbuf *)buf);
+        }
+      }
+    }
+  } while (!done);
+
+  if (off > 0) {
+    /* update receive window */
+    netconn_recved(sock->conn, (u32_t)off);
+  }
+  sock_set_errno(sock, 0);
+  return off;
+}
+
+int
+lwip_read(int s, void *mem, size_t len)
+{
+  return lwip_recvfrom(s, mem, len, 0, NULL, NULL);
+}
+
+int
+lwip_recv(int s, void *mem, size_t len, int flags)
+{
+  return lwip_recvfrom(s, mem, len, flags, NULL, NULL);
+}
+
+int
+lwip_send(int s, const void *data, size_t size, int flags)
+{
+  struct lwip_sock *sock;
+  err_t err;
+  u8_t write_flags;
+  size_t written;
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_send(%d, data=%p, size=%"SZT_F", flags=0x%x)\n",
+                              s, data, size, flags));
+
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  if (sock->conn->type != NETCONN_TCP) {
+#if (LWIP_UDP || LWIP_RAW)
+    return lwip_sendto(s, data, size, flags, NULL, 0);
+#else /* (LWIP_UDP || LWIP_RAW) */
+    sock_set_errno(sock, err_to_errno(ERR_ARG));
+    return -1;
+#endif /* (LWIP_UDP || LWIP_RAW) */
+  }
+
+  write_flags = NETCONN_COPY |
+    ((flags & MSG_MORE)     ? NETCONN_MORE      : 0) |
+    ((flags & MSG_DONTWAIT) ? NETCONN_DONTBLOCK : 0);
+  written = 0;
+  err = netconn_write_partly(sock->conn, data, size, write_flags, &written);
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_send(%d) err=%d written=%"SZT_F"\n", s, err, written));
+  sock_set_errno(sock, err_to_errno(err));
+  return (err == ERR_OK ? (int)written : -1);
+}
+
+int
+lwip_sendto(int s, const void *data, size_t size, int flags,
+       const struct sockaddr *to, socklen_t tolen)
+{
+  struct lwip_sock *sock;
+  err_t err;
+  u16_t short_size;
+  const struct sockaddr_in *to_in;
+  u16_t remote_port;
+#if !LWIP_TCPIP_CORE_LOCKING
+  struct netbuf buf;
+#endif
+
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  if (sock->conn->type == NETCONN_TCP) {
+#if LWIP_TCP
+    return lwip_send(s, data, size, flags);
+#else /* LWIP_TCP */
+    LWIP_UNUSED_ARG(flags);
+    sock_set_errno(sock, err_to_errno(ERR_ARG));
+    return -1;
+#endif /* LWIP_TCP */
+  }
+
+  /* @todo: split into multiple sendto's? */
+  LWIP_ASSERT("lwip_sendto: size must fit in u16_t", size <= 0xffff);
+  short_size = (u16_t)size;
+  LWIP_ERROR("lwip_sendto: invalid address", (((to == NULL) && (tolen == 0)) ||
+             ((tolen == sizeof(struct sockaddr_in)) &&
+             ((to->sa_family) == AF_INET) && ((((mem_ptr_t)to) % 4) == 0))),
+             sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
+  to_in = (const struct sockaddr_in *)(void*)to;
+
+#if LWIP_TCPIP_CORE_LOCKING
+  /* Should only be consider like a sample or a simple way to experiment this option (no check of "to" field...) */
+  {
+    struct pbuf* p;
+    ip_addr_t *remote_addr;
+
+#if LWIP_NETIF_TX_SINGLE_PBUF
+    p = pbuf_alloc(PBUF_TRANSPORT, short_size, PBUF_RAM);
+    if (p != NULL) {
+#if LWIP_CHECKSUM_ON_COPY
+      u16_t chksum = 0;
+      if (sock->conn->type != NETCONN_RAW) {
+        chksum = LWIP_CHKSUM_COPY(p->payload, data, short_size);
+      } else
+#endif /* LWIP_CHECKSUM_ON_COPY */
+      MEMCPY(p->payload, data, size);
+#else /* LWIP_NETIF_TX_SINGLE_PBUF */
+    p = pbuf_alloc(PBUF_TRANSPORT, short_size, PBUF_REF);
+    if (p != NULL) {
+      p->payload = (void*)data;
+#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
+
+      if (to_in != NULL) {
+        inet_addr_to_ipaddr_p(remote_addr, &to_in->sin_addr);
+        remote_port = ntohs(to_in->sin_port);
+      } else {
+        remote_addr = &sock->conn->pcb.ip->remote_ip;
+#if LWIP_UDP
+        if (NETCONNTYPE_GROUP(sock->conn->type) == NETCONN_UDP) {
+          remote_port = sock->conn->pcb.udp->remote_port;
+        } else
+#endif /* LWIP_UDP */
+        {
+          remote_port = 0;
+        }
+      }
+
+      LOCK_TCPIP_CORE();
+      if (netconn_type(sock->conn) == NETCONN_RAW) {
+#if LWIP_RAW
+        err = sock->conn->last_err = raw_sendto(sock->conn->pcb.raw, p, remote_addr);
+#else /* LWIP_RAW */
+        err = ERR_ARG;
+#endif /* LWIP_RAW */
+      }
+#if LWIP_UDP && LWIP_RAW
+      else
+#endif /* LWIP_UDP && LWIP_RAW */
+      {
+#if LWIP_UDP
+#if LWIP_CHECKSUM_ON_COPY && LWIP_NETIF_TX_SINGLE_PBUF
+        err = sock->conn->last_err = udp_sendto_chksum(sock->conn->pcb.udp, p,
+          remote_addr, remote_port, 1, chksum);
+#else /* LWIP_CHECKSUM_ON_COPY && LWIP_NETIF_TX_SINGLE_PBUF */
+        err = sock->conn->last_err = udp_sendto(sock->conn->pcb.udp, p,
+          remote_addr, remote_port);
+#endif /* LWIP_CHECKSUM_ON_COPY && LWIP_NETIF_TX_SINGLE_PBUF */
+#else /* LWIP_UDP */
+        err = ERR_ARG;
+#endif /* LWIP_UDP */
+      }
+      UNLOCK_TCPIP_CORE();
+      
+      pbuf_free(p);
+    } else {
+      err = ERR_MEM;
+    }
+  }
+#else /* LWIP_TCPIP_CORE_LOCKING */
+  /* initialize a buffer */
+  buf.p = buf.ptr = NULL;
+#if LWIP_CHECKSUM_ON_COPY
+  buf.flags = 0;
+#endif /* LWIP_CHECKSUM_ON_COPY */
+  if (to) {
+    inet_addr_to_ipaddr(&buf.addr, &to_in->sin_addr);
+    remote_port           = ntohs(to_in->sin_port);
+    netbuf_fromport(&buf) = remote_port;
+  } else {
+    remote_port           = 0;
+    ip_addr_set_any(&buf.addr);
+    netbuf_fromport(&buf) = 0;
+  }
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_sendto(%d, data=%p, short_size=%"U16_F", flags=0x%x to=",
+              s, data, short_size, flags));
+  ip_addr_debug_print(SOCKETS_DEBUG, &buf.addr);
+  LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F"\n", remote_port));
+
+  /* make the buffer point to the data that should be sent */
+#if LWIP_NETIF_TX_SINGLE_PBUF
+  /* Allocate a new netbuf and copy the data into it. */
+  if (netbuf_alloc(&buf, short_size) == NULL) {
+    err = ERR_MEM;
+  } else {
+#if LWIP_CHECKSUM_ON_COPY
+    if (sock->conn->type != NETCONN_RAW) {
+      u16_t chksum = LWIP_CHKSUM_COPY(buf.p->payload, data, short_size);
+      netbuf_set_chksum(&buf, chksum);
+      err = ERR_OK;
+    } else
+#endif /* LWIP_CHECKSUM_ON_COPY */
+    {
+      err = netbuf_take(&buf, data, short_size);
+    }
+  }
+#else /* LWIP_NETIF_TX_SINGLE_PBUF */
+  err = netbuf_ref(&buf, data, short_size);
+#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
+  if (err == ERR_OK) {
+    /* send the data */
+    err = netconn_send(sock->conn, &buf);
+  }
+
+  /* deallocated the buffer */
+  netbuf_free(&buf);
+#endif /* LWIP_TCPIP_CORE_LOCKING */
+  sock_set_errno(sock, err_to_errno(err));
+  return (err == ERR_OK ? short_size : -1);
+}
+
+int
+lwip_socket(int domain, int type, int protocol)
+{
+  struct netconn *conn;
+  int i;
+
+  LWIP_UNUSED_ARG(domain);
+
+  /* create a netconn */
+  switch (type) {
+  case SOCK_RAW:
+    conn = netconn_new_with_proto_and_callback(NETCONN_RAW, (u8_t)protocol, event_callback);
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_socket(%s, SOCK_RAW, %d) = ",
+                                 domain == PF_INET ? "PF_INET" : "UNKNOWN", protocol));
+    break;
+  case SOCK_DGRAM:
+    conn = netconn_new_with_callback( (protocol == IPPROTO_UDPLITE) ?
+                 NETCONN_UDPLITE : NETCONN_UDP, event_callback);
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_socket(%s, SOCK_DGRAM, %d) = ",
+                                 domain == PF_INET ? "PF_INET" : "UNKNOWN", protocol));
+    break;
+  case SOCK_STREAM:
+    conn = netconn_new_with_callback(NETCONN_TCP, event_callback);
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_socket(%s, SOCK_STREAM, %d) = ",
+                                 domain == PF_INET ? "PF_INET" : "UNKNOWN", protocol));
+    if (conn != NULL) {
+      /* Prevent automatic window updates, we do this on our own! */
+      netconn_set_noautorecved(conn, 1);
+    }
+    break;
+  default:
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_socket(%d, %d/UNKNOWN, %d) = -1\n",
+                                 domain, type, protocol));
+    set_errno(EINVAL);
+    return -1;
+  }
+
+  if (!conn) {
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("-1 / ENOBUFS (could not create netconn)\n"));
+    set_errno(ENOBUFS);
+    return -1;
+  }
+
+  i = alloc_socket(conn, 0);
+
+  if (i == -1) {
+    netconn_delete(conn);
+    set_errno(ENFILE);
+    return -1;
+  }
+  conn->socket = i;
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("%d\n", i));
+  set_errno(0);
+  return i;
+}
+
+int
+lwip_write(int s, const void *data, size_t size)
+{
+  return lwip_send(s, data, size, 0);
+}
+
+/**
+ * Go through the readset and writeset lists and see which socket of the sockets
+ * set in the sets has events. On return, readset, writeset and exceptset have
+ * the sockets enabled that had events.
+ *
+ * exceptset is not used for now!!!
+ *
+ * @param maxfdp1 the highest socket index in the sets
+ * @param readset_in:    set of sockets to check for read events
+ * @param writeset_in:   set of sockets to check for write events
+ * @param exceptset_in:  set of sockets to check for error events
+ * @param readset_out:   set of sockets that had read events
+ * @param writeset_out:  set of sockets that had write events
+ * @param exceptset_out: set os sockets that had error events
+ * @return number of sockets that had events (read/write/exception) (>= 0)
+ */
+static int
+lwip_selscan(int maxfdp1, fd_set *readset_in, fd_set *writeset_in, fd_set *exceptset_in,
+             fd_set *readset_out, fd_set *writeset_out, fd_set *exceptset_out)
+{
+  int i, nready = 0;
+  fd_set lreadset, lwriteset, lexceptset;
+  struct lwip_sock *sock;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  FD_ZERO(&lreadset);
+  FD_ZERO(&lwriteset);
+  FD_ZERO(&lexceptset);
+
+  /* Go through each socket in each list to count number of sockets which
+     currently match */
+  for(i = 0; i < maxfdp1; i++) {
+    void* lastdata = NULL;
+    s16_t rcvevent = 0;
+    u16_t sendevent = 0;
+    u16_t errevent = 0;
+    /* First get the socket's status (protected)... */
+    SYS_ARCH_PROTECT(lev);
+    sock = tryget_socket(i);
+    if (sock != NULL) {
+      lastdata = sock->lastdata;
+      rcvevent = sock->rcvevent;
+      sendevent = sock->sendevent;
+      errevent = sock->errevent;
+    }
+    SYS_ARCH_UNPROTECT(lev);
+    /* ... then examine it: */
+    /* See if netconn of this socket is ready for read */
+    if (readset_in && FD_ISSET(i, readset_in) && ((lastdata != NULL) || (rcvevent > 0))) {
+      FD_SET(i, &lreadset);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_selscan: fd=%d ready for reading\n", i));
+      nready++;
+    }
+    /* See if netconn of this socket is ready for write */
+    if (writeset_in && FD_ISSET(i, writeset_in) && (sendevent != 0)) {
+      FD_SET(i, &lwriteset);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_selscan: fd=%d ready for writing\n", i));
+      nready++;
+    }
+    /* See if netconn of this socket had an error */
+    if (exceptset_in && FD_ISSET(i, exceptset_in) && (errevent != 0)) {
+      FD_SET(i, &lexceptset);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_selscan: fd=%d ready for exception\n", i));
+      nready++;
+    }
+  }
+  /* copy local sets to the ones provided as arguments */
+  *readset_out = lreadset;
+  *writeset_out = lwriteset;
+  *exceptset_out = lexceptset;
+
+  LWIP_ASSERT("nready >= 0", nready >= 0);
+  return nready;
+}
+
+/**
+ * Processing exceptset is not yet implemented.
+ */
+int
+lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
+            struct timeval *timeout)
+{
+  u32_t waitres = 0;
+  int nready;
+  fd_set lreadset, lwriteset, lexceptset;
+  u32_t msectimeout;
+  struct lwip_select_cb select_cb;
+  err_t err;
+  int i;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select(%d, %p, %p, %p, tvsec=%"S32_F" tvusec=%"S32_F")\n",
+                  maxfdp1, (void *)readset, (void *) writeset, (void *) exceptset,
+                  timeout ? (s32_t)timeout->tv_sec : (s32_t)-1,
+                  timeout ? (s32_t)timeout->tv_usec : (s32_t)-1));
+
+  /* Go through each socket in each list to count number of sockets which
+     currently match */
+  nready = lwip_selscan(maxfdp1, readset, writeset, exceptset, &lreadset, &lwriteset, &lexceptset);
+
+  /* If we don't have any current events, then suspend if we are supposed to */
+  if (!nready) {
+    if (timeout && timeout->tv_sec == 0 && timeout->tv_usec == 0) {
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select: no timeout, returning 0\n"));
+      /* This is OK as the local fdsets are empty and nready is zero,
+         or we would have returned earlier. */
+      goto return_copy_fdsets;
+    }
+
+    /* None ready: add our semaphore to list:
+       We don't actually need any dynamic memory. Our entry on the
+       list is only valid while we are in this function, so it's ok
+       to use local variables. */
+
+    select_cb.next = NULL;
+    select_cb.prev = NULL;
+    select_cb.readset = readset;
+    select_cb.writeset = writeset;
+    select_cb.exceptset = exceptset;
+    select_cb.sem_signalled = 0;
+    err = sys_sem_new(&select_cb.sem, 0);
+    if (err != ERR_OK) {
+      /* failed to create semaphore */
+      set_errno(ENOMEM);
+      return -1;
+    }
+
+    /* Protect the select_cb_list */
+    SYS_ARCH_PROTECT(lev);
+
+    /* Put this select_cb on top of list */
+    select_cb.next = select_cb_list;
+    if (select_cb_list != NULL) {
+      select_cb_list->prev = &select_cb;
+    }
+    select_cb_list = &select_cb;
+    /* Increasing this counter tells even_callback that the list has changed. */
+    select_cb_ctr++;
+
+    /* Now we can safely unprotect */
+    SYS_ARCH_UNPROTECT(lev);
+
+    /* Increase select_waiting for each socket we are interested in */
+    for(i = 0; i < maxfdp1; i++) {
+      if ((readset && FD_ISSET(i, readset)) ||
+          (writeset && FD_ISSET(i, writeset)) ||
+          (exceptset && FD_ISSET(i, exceptset))) {
+        struct lwip_sock *sock = tryget_socket(i);
+        LWIP_ASSERT("sock != NULL", sock != NULL);
+        SYS_ARCH_PROTECT(lev);
+        sock->select_waiting++;
+        LWIP_ASSERT("sock->select_waiting > 0", sock->select_waiting > 0);
+        SYS_ARCH_UNPROTECT(lev);
+      }
+    }
+
+    /* Call lwip_selscan again: there could have been events between
+       the last scan (whithout us on the list) and putting us on the list! */
+    nready = lwip_selscan(maxfdp1, readset, writeset, exceptset, &lreadset, &lwriteset, &lexceptset);
+    if (!nready) {
+      /* Still none ready, just wait to be woken */
+      if (timeout == 0) {
+        /* Wait forever */
+        msectimeout = 0;
+      } else {
+        msectimeout =  ((timeout->tv_sec * 1000) + ((timeout->tv_usec + 500)/1000));
+        if (msectimeout == 0) {
+          /* Wait 1ms at least (0 means wait forever) */
+          msectimeout = 1;
+        }
+      }
+
+      waitres = sys_arch_sem_wait(&select_cb.sem, msectimeout);
+    }
+    /* Increase select_waiting for each socket we are interested in */
+    for(i = 0; i < maxfdp1; i++) {
+      if ((readset && FD_ISSET(i, readset)) ||
+          (writeset && FD_ISSET(i, writeset)) ||
+          (exceptset && FD_ISSET(i, exceptset))) {
+        struct lwip_sock *sock = tryget_socket(i);
+        LWIP_ASSERT("sock != NULL", sock != NULL);
+        SYS_ARCH_PROTECT(lev);
+        sock->select_waiting--;
+        LWIP_ASSERT("sock->select_waiting >= 0", sock->select_waiting >= 0);
+        SYS_ARCH_UNPROTECT(lev);
+      }
+    }
+    /* Take us off the list */
+    SYS_ARCH_PROTECT(lev);
+    if (select_cb.next != NULL) {
+      select_cb.next->prev = select_cb.prev;
+    }
+    if (select_cb_list == &select_cb) {
+      LWIP_ASSERT("select_cb.prev == NULL", select_cb.prev == NULL);
+      select_cb_list = select_cb.next;
+    } else {
+      LWIP_ASSERT("select_cb.prev != NULL", select_cb.prev != NULL);
+      select_cb.prev->next = select_cb.next;
+    }
+    /* Increasing this counter tells even_callback that the list has changed. */
+    select_cb_ctr++;
+    SYS_ARCH_UNPROTECT(lev);
+
+    sys_sem_free(&select_cb.sem);
+    if (waitres == SYS_ARCH_TIMEOUT)  {
+      /* Timeout */
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select: timeout expired\n"));
+      /* This is OK as the local fdsets are empty and nready is zero,
+         or we would have returned earlier. */
+      goto return_copy_fdsets;
+    }
+
+    /* See what's set */
+    nready = lwip_selscan(maxfdp1, readset, writeset, exceptset, &lreadset, &lwriteset, &lexceptset);
+  }
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select: nready=%d\n", nready));
+return_copy_fdsets:
+  set_errno(0);
+  if (readset) {
+    *readset = lreadset;
+  }
+  if (writeset) {
+    *writeset = lwriteset;
+  }
+  if (exceptset) {
+    *exceptset = lexceptset;
+  }
+
+
+  return nready;
+}
+
+/**
+ * Callback registered in the netconn layer for each socket-netconn.
+ * Processes recvevent (data available) and wakes up tasks waiting for select.
+ */
+static void
+event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len)
+{
+  int s;
+  struct lwip_sock *sock;
+  struct lwip_select_cb *scb;
+  int last_select_cb_ctr;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  LWIP_UNUSED_ARG(len);
+
+  /* Get socket */
+  if (conn) {
+    s = conn->socket;
+    if (s < 0) {
+      /* Data comes in right away after an accept, even though
+       * the server task might not have created a new socket yet.
+       * Just count down (or up) if that's the case and we
+       * will use the data later. Note that only receive events
+       * can happen before the new socket is set up. */
+      SYS_ARCH_PROTECT(lev);
+      if (conn->socket < 0) {
+        if (evt == NETCONN_EVT_RCVPLUS) {
+          conn->socket--;
+        }
+        SYS_ARCH_UNPROTECT(lev);
+        return;
+      }
+      s = conn->socket;
+      SYS_ARCH_UNPROTECT(lev);
+    }
+
+    sock = get_socket(s);
+    if (!sock) {
+      return;
+    }
+  } else {
+    return;
+  }
+
+  SYS_ARCH_PROTECT(lev);
+  /* Set event as required */
+  switch (evt) {
+    case NETCONN_EVT_RCVPLUS:
+      sock->rcvevent++;
+      break;
+    case NETCONN_EVT_RCVMINUS:
+      sock->rcvevent--;
+      break;
+    case NETCONN_EVT_SENDPLUS:
+      sock->sendevent = 1;
+      break;
+    case NETCONN_EVT_SENDMINUS:
+      sock->sendevent = 0;
+      break;
+    case NETCONN_EVT_ERROR:
+      sock->errevent = 1;
+      break;
+    default:
+      LWIP_ASSERT("unknown event", 0);
+      break;
+  }
+
+  if (sock->select_waiting == 0) {
+    /* noone is waiting for this socket, no need to check select_cb_list */
+    SYS_ARCH_UNPROTECT(lev);
+    return;
+  }
+
+  /* Now decide if anyone is waiting for this socket */
+  /* NOTE: This code goes through the select_cb_list list multiple times
+     ONLY IF a select was actually waiting. We go through the list the number
+     of waiting select calls + 1. This list is expected to be small. */
+
+  /* At this point, SYS_ARCH is still protected! */
+again:
+  for (scb = select_cb_list; scb != NULL; scb = scb->next) {
+    if (scb->sem_signalled == 0) {
+      /* semaphore not signalled yet */
+      int do_signal = 0;
+      /* Test this select call for our socket */
+      if (sock->rcvevent > 0) {
+        if (scb->readset && FD_ISSET(s, scb->readset)) {
+          do_signal = 1;
+        }
+      }
+      if (sock->sendevent != 0) {
+        if (!do_signal && scb->writeset && FD_ISSET(s, scb->writeset)) {
+          do_signal = 1;
+        }
+      }
+      if (sock->errevent != 0) {
+        if (!do_signal && scb->exceptset && FD_ISSET(s, scb->exceptset)) {
+          do_signal = 1;
+        }
+      }
+      if (do_signal) {
+        scb->sem_signalled = 1;
+        /* Don't call SYS_ARCH_UNPROTECT() before signaling the semaphore, as this might
+           lead to the select thread taking itself off the list, invalidagin the semaphore. */
+        sys_sem_signal(&scb->sem);
+      }
+    }
+    /* unlock interrupts with each step */
+    last_select_cb_ctr = select_cb_ctr;
+    SYS_ARCH_UNPROTECT(lev);
+    /* this makes sure interrupt protection time is short */
+    SYS_ARCH_PROTECT(lev);
+    if (last_select_cb_ctr != select_cb_ctr) {
+      /* someone has changed select_cb_list, restart at the beginning */
+      goto again;
+    }
+  }
+  SYS_ARCH_UNPROTECT(lev);
+}
+
+/**
+ * Unimplemented: Close one end of a full-duplex connection.
+ * Currently, the full connection is closed.
+ */
+int
+lwip_shutdown(int s, int how)
+{
+  struct lwip_sock *sock;
+  err_t err;
+  u8_t shut_rx = 0, shut_tx = 0;
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_shutdown(%d, how=%d)\n", s, how));
+
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  if (sock->conn != NULL) {
+    if (netconn_type(sock->conn) != NETCONN_TCP) {
+      sock_set_errno(sock, EOPNOTSUPP);
+      return EOPNOTSUPP;
+    }
+  } else {
+    sock_set_errno(sock, ENOTCONN);
+    return ENOTCONN;
+  }
+
+  if (how == SHUT_RD) {
+    shut_rx = 1;
+  } else if (how == SHUT_WR) {
+    shut_tx = 1;
+  } else if(how == SHUT_RDWR) {
+    shut_rx = 1;
+    shut_tx = 1;
+  } else {
+    sock_set_errno(sock, EINVAL);
+    return EINVAL;
+  }
+  err = netconn_shutdown(sock->conn, shut_rx, shut_tx);
+
+  sock_set_errno(sock, err_to_errno(err));
+  return (err == ERR_OK ? 0 : -1);
+}
+
+static int
+lwip_getaddrname(int s, struct sockaddr *name, socklen_t *namelen, u8_t local)
+{
+  struct lwip_sock *sock;
+  struct sockaddr_in sin;
+  ip_addr_t naddr;
+
+  sock = get_socket(s);
+  if (!sock) {
+    return -1;
+  }
+
+  memset(&sin, 0, sizeof(sin));
+  sin.sin_len = sizeof(sin);
+  sin.sin_family = AF_INET;
+
+  /* get the IP address and port */
+  netconn_getaddr(sock->conn, &naddr, &sin.sin_port, local);
+
+  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getaddrname(%d, addr=", s));
+  ip_addr_debug_print(SOCKETS_DEBUG, &naddr);
+  LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", sin.sin_port));
+
+  sin.sin_port = htons(sin.sin_port);
+  inet_addr_from_ipaddr(&sin.sin_addr, &naddr);
+
+  if (*namelen > sizeof(sin)) {
+    *namelen = sizeof(sin);
+  }
+
+  MEMCPY(name, &sin, *namelen);
+  sock_set_errno(sock, 0);
+  return 0;
+}
+
+int
+lwip_getpeername(int s, struct sockaddr *name, socklen_t *namelen)
+{
+  return lwip_getaddrname(s, name, namelen, 0);
+}
+
+int
+lwip_getsockname(int s, struct sockaddr *name, socklen_t *namelen)
+{
+  return lwip_getaddrname(s, name, namelen, 1);
+}
+
+int
+lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen)
+{
+  err_t err = ERR_OK;
+  struct lwip_sock *sock = get_socket(s);
+  struct lwip_setgetsockopt_data data;
+
+  if (!sock) {
+    return -1;
+  }
+
+  if ((NULL == optval) || (NULL == optlen)) {
+    sock_set_errno(sock, EFAULT);
+    return -1;
+  }
+
+  /* Do length and type checks for the various options first, to keep it readable. */
+  switch (level) {
+   
+/* Level: SOL_SOCKET */
+  case SOL_SOCKET:
+    switch (optname) {
+       
+    case SO_ACCEPTCONN:
+    case SO_BROADCAST:
+    /* UNIMPL case SO_DEBUG: */
+    /* UNIMPL case SO_DONTROUTE: */
+    case SO_ERROR:
+    case SO_KEEPALIVE:
+    /* UNIMPL case SO_CONTIMEO: */
+#if LWIP_SO_SNDTIMEO
+    case SO_SNDTIMEO:
+#endif /* LWIP_SO_SNDTIMEO */
+#if LWIP_SO_RCVTIMEO
+    case SO_RCVTIMEO:
+#endif /* LWIP_SO_RCVTIMEO */
+#if LWIP_SO_RCVBUF
+    case SO_RCVBUF:
+#endif /* LWIP_SO_RCVBUF */
+    /* UNIMPL case SO_OOBINLINE: */
+    /* UNIMPL case SO_SNDBUF: */
+    /* UNIMPL case SO_RCVLOWAT: */
+    /* UNIMPL case SO_SNDLOWAT: */
+#if SO_REUSE
+    case SO_REUSEADDR:
+    case SO_REUSEPORT:
+#endif /* SO_REUSE */
+    case SO_TYPE:
+    /* UNIMPL case SO_USELOOPBACK: */
+      if (*optlen < sizeof(int)) {
+        err = EINVAL;
+      }
+      break;
+
+    case SO_NO_CHECK:
+      if (*optlen < sizeof(int)) {
+        err = EINVAL;
+      }
+#if LWIP_UDP
+      if ((sock->conn->type != NETCONN_UDP) ||
+          ((udp_flags(sock->conn->pcb.udp) & UDP_FLAGS_UDPLITE) != 0)) {
+        /* this flag is only available for UDP, not for UDP lite */
+        err = EAFNOSUPPORT;
+      }
+#endif /* LWIP_UDP */
+      break;
+
+    default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, UNIMPL: optname=0x%x, ..)\n",
+                                  s, optname));
+      err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
+                     
+/* Level: IPPROTO_IP */
+  case IPPROTO_IP:
+    switch (optname) {
+    /* UNIMPL case IP_HDRINCL: */
+    /* UNIMPL case IP_RCVDSTADDR: */
+    /* UNIMPL case IP_RCVIF: */
+    case IP_TTL:
+    case IP_TOS:
+      if (*optlen < sizeof(int)) {
+        err = EINVAL;
+      }
+      break;
+#if LWIP_IGMP
+    case IP_MULTICAST_TTL:
+      if (*optlen < sizeof(u8_t)) {
+        err = EINVAL;
+      }
+      break;
+    case IP_MULTICAST_IF:
+      if (*optlen < sizeof(struct in_addr)) {
+        err = EINVAL;
+      }
+      break;
+    case IP_MULTICAST_LOOP:
+      if (*optlen < sizeof(u8_t)) {
+        err = EINVAL;
+      }
+      if (NETCONNTYPE_GROUP(sock->conn->type) != NETCONN_UDP) {
+        err = EAFNOSUPPORT;
+      }
+      break;
+#endif /* LWIP_IGMP */
+
+    default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, UNIMPL: optname=0x%x, ..)\n",
+                                  s, optname));
+      err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
+         
+#if LWIP_TCP
+/* Level: IPPROTO_TCP */
+  case IPPROTO_TCP:
+    if (*optlen < sizeof(int)) {
+      err = EINVAL;
+      break;
+    }
+    
+    /* If this is no TCP socket, ignore any options. */
+    if (sock->conn->type != NETCONN_TCP)
+      return 0;
+
+    switch (optname) {
+    case TCP_NODELAY:
+    case TCP_KEEPALIVE:
+#if LWIP_TCP_KEEPALIVE
+    case TCP_KEEPIDLE:
+    case TCP_KEEPINTVL:
+    case TCP_KEEPCNT:
+#endif /* LWIP_TCP_KEEPALIVE */
+      break;
+       
+    default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, UNIMPL: optname=0x%x, ..)\n",
+                                  s, optname));
+      err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
+#endif /* LWIP_TCP */
+#if LWIP_UDP && LWIP_UDPLITE
+/* Level: IPPROTO_UDPLITE */
+  case IPPROTO_UDPLITE:
+    if (*optlen < sizeof(int)) {
+      err = EINVAL;
+      break;
+    }
+    
+    /* If this is no UDP lite socket, ignore any options. */
+    if (sock->conn->type != NETCONN_UDPLITE) {
+      return 0;
+    }
+
+    switch (optname) {
+    case UDPLITE_SEND_CSCOV:
+    case UDPLITE_RECV_CSCOV:
+      break;
+       
+    default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_UDPLITE, UNIMPL: optname=0x%x, ..)\n",
+                                  s, optname));
+      err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
+#endif /* LWIP_UDP && LWIP_UDPLITE*/
+/* UNDEFINED LEVEL */
+  default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, level=0x%x, UNIMPL: optname=0x%x, ..)\n",
+                                  s, level, optname));
+      err = ENOPROTOOPT;
+  }  /* switch */
+
+   
+  if (err != ERR_OK) {
+    sock_set_errno(sock, err);
+    return -1;
+  }
+
+  /* Now do the actual option processing */
+  data.sock = sock;
+#ifdef LWIP_DEBUG
+  data.s = s;
+#endif /* LWIP_DEBUG */
+  data.level = level;
+  data.optname = optname;
+  data.optval = optval;
+  data.optlen = optlen;
+  data.err = err;
+  tcpip_callback(lwip_getsockopt_internal, &data);
+  sys_arch_sem_wait(&sock->conn->op_completed, 0);
+  /* maybe lwip_getsockopt_internal has changed err */
+  err = data.err;
+
+  sock_set_errno(sock, err);
+  return err ? -1 : 0;
+}
+
+static void
+lwip_getsockopt_internal(void *arg)
+{
+  struct lwip_sock *sock;
+#ifdef LWIP_DEBUG
+  int s;
+#endif /* LWIP_DEBUG */
+  int level, optname;
+  void *optval;
+  struct lwip_setgetsockopt_data *data;
+
+  LWIP_ASSERT("arg != NULL", arg != NULL);
+
+  data = (struct lwip_setgetsockopt_data*)arg;
+  sock = data->sock;
+#ifdef LWIP_DEBUG
+  s = data->s;
+#endif /* LWIP_DEBUG */
+  level = data->level;
+  optname = data->optname;
+  optval = data->optval;
+
+  switch (level) {
+
+/* Level: SOL_SOCKET */
+  case SOL_SOCKET:
+    switch (optname) {
+
+    /* The option flags */
+    case SO_ACCEPTCONN:
+    case SO_BROADCAST:
+    /* UNIMPL case SO_DEBUG: */
+    /* UNIMPL case SO_DONTROUTE: */
+    case SO_KEEPALIVE:
+    /* UNIMPL case SO_OOBINCLUDE: */
+#if SO_REUSE
+    case SO_REUSEADDR:
+    case SO_REUSEPORT:
+#endif /* SO_REUSE */
+    /*case SO_USELOOPBACK: UNIMPL */
+      *(int*)optval = ip_get_option(sock->conn->pcb.ip, optname);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, optname=0x%x, ..) = %s\n",
+                                  s, optname, (*(int*)optval?"on":"off")));
+      break;
+
+    case SO_TYPE:
+      switch (NETCONNTYPE_GROUP(sock->conn->type)) {
+      case NETCONN_RAW:
+        *(int*)optval = SOCK_RAW;
+        break;
+      case NETCONN_TCP:
+        *(int*)optval = SOCK_STREAM;
+        break;
+      case NETCONN_UDP:
+        *(int*)optval = SOCK_DGRAM;
+        break;
+      default: /* unrecognized socket type */
+        *(int*)optval = sock->conn->type;
+        LWIP_DEBUGF(SOCKETS_DEBUG,
+                    ("lwip_getsockopt(%d, SOL_SOCKET, SO_TYPE): unrecognized socket type %d\n",
+                    s, *(int *)optval));
+      }  /* switch (sock->conn->type) */
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, SO_TYPE) = %d\n",
+                  s, *(int *)optval));
+      break;
+
+    case SO_ERROR:
+      /* only overwrite ERR_OK or tempoary errors */
+      if ((sock->err == 0) || (sock->err == EINPROGRESS)) {
+        sock_set_errno(sock, err_to_errno(sock->conn->last_err));
+      } 
+      *(int *)optval = sock->err;
+      sock->err = 0;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, SO_ERROR) = %d\n",
+                  s, *(int *)optval));
+      break;
+
+#if LWIP_SO_SNDTIMEO
+    case SO_SNDTIMEO:
+      *(int *)optval = netconn_get_sendtimeout(sock->conn);
+      break;
+#endif /* LWIP_SO_SNDTIMEO */
+#if LWIP_SO_RCVTIMEO
+    case SO_RCVTIMEO:
+      *(int *)optval = netconn_get_recvtimeout(sock->conn);
+      break;
+#endif /* LWIP_SO_RCVTIMEO */
+#if LWIP_SO_RCVBUF
+    case SO_RCVBUF:
+      *(int *)optval = netconn_get_recvbufsize(sock->conn);
+      break;
+#endif /* LWIP_SO_RCVBUF */
+#if LWIP_UDP
+    case SO_NO_CHECK:
+      *(int*)optval = (udp_flags(sock->conn->pcb.udp) & UDP_FLAGS_NOCHKSUM) ? 1 : 0;
+      break;
+#endif /* LWIP_UDP*/
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
+
+/* Level: IPPROTO_IP */
+  case IPPROTO_IP:
+    switch (optname) {
+    case IP_TTL:
+      *(int*)optval = sock->conn->pcb.ip->ttl;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_TTL) = %d\n",
+                  s, *(int *)optval));
+      break;
+    case IP_TOS:
+      *(int*)optval = sock->conn->pcb.ip->tos;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_TOS) = %d\n",
+                  s, *(int *)optval));
+      break;
+#if LWIP_IGMP
+    case IP_MULTICAST_TTL:
+      *(u8_t*)optval = sock->conn->pcb.ip->ttl;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_MULTICAST_TTL) = %d\n",
+                  s, *(int *)optval));
+      break;
+    case IP_MULTICAST_IF:
+      inet_addr_from_ipaddr((struct in_addr*)optval, &sock->conn->pcb.udp->multicast_ip);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_MULTICAST_IF) = 0x%"X32_F"\n",
+                  s, *(u32_t *)optval));
+      break;
+    case IP_MULTICAST_LOOP:
+      if ((sock->conn->pcb.udp->flags & UDP_FLAGS_MULTICAST_LOOP) != 0) {
+        *(u8_t*)optval = 1;
+      } else {
+        *(u8_t*)optval = 0;
+      }
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_MULTICAST_LOOP) = %d\n",
+                  s, *(int *)optval));
+      break;
+#endif /* LWIP_IGMP */
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
+
+#if LWIP_TCP
+/* Level: IPPROTO_TCP */
+  case IPPROTO_TCP:
+    switch (optname) {
+    case TCP_NODELAY:
+      *(int*)optval = tcp_nagle_disabled(sock->conn->pcb.tcp);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, TCP_NODELAY) = %s\n",
+                  s, (*(int*)optval)?"on":"off") );
+      break;
+    case TCP_KEEPALIVE:
+      *(int*)optval = (int)sock->conn->pcb.tcp->keep_idle;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, TCP_KEEPALIVE) = %d\n",
+                  s, *(int *)optval));
+      break;
+
+#if LWIP_TCP_KEEPALIVE
+    case TCP_KEEPIDLE:
+      *(int*)optval = (int)(sock->conn->pcb.tcp->keep_idle/1000);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, TCP_KEEPIDLE) = %d\n",
+                  s, *(int *)optval));
+      break;
+    case TCP_KEEPINTVL:
+      *(int*)optval = (int)(sock->conn->pcb.tcp->keep_intvl/1000);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, TCP_KEEPINTVL) = %d\n",
+                  s, *(int *)optval));
+      break;
+    case TCP_KEEPCNT:
+      *(int*)optval = (int)sock->conn->pcb.tcp->keep_cnt;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, TCP_KEEPCNT) = %d\n",
+                  s, *(int *)optval));
+      break;
+#endif /* LWIP_TCP_KEEPALIVE */
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
+#endif /* LWIP_TCP */
+#if LWIP_UDP && LWIP_UDPLITE
+  /* Level: IPPROTO_UDPLITE */
+  case IPPROTO_UDPLITE:
+    switch (optname) {
+    case UDPLITE_SEND_CSCOV:
+      *(int*)optval = sock->conn->pcb.udp->chksum_len_tx;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_UDPLITE, UDPLITE_SEND_CSCOV) = %d\n",
+                  s, (*(int*)optval)) );
+      break;
+    case UDPLITE_RECV_CSCOV:
+      *(int*)optval = sock->conn->pcb.udp->chksum_len_rx;
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_UDPLITE, UDPLITE_RECV_CSCOV) = %d\n",
+                  s, (*(int*)optval)) );
+      break;
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
+#endif /* LWIP_UDP */
+  default:
+    LWIP_ASSERT("unhandled level", 0);
+    break;
+  } /* switch (level) */
+  sys_sem_signal(&sock->conn->op_completed);
+}
+
+int
+lwip_setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen)
+{
+  struct lwip_sock *sock = get_socket(s);
+  err_t err = ERR_OK;
+  struct lwip_setgetsockopt_data data;
+
+  if (!sock) {
+    return -1;
+  }
+
+  if (NULL == optval) {
+    sock_set_errno(sock, EFAULT);
+    return -1;
+  }
+
+  /* Do length and type checks for the various options first, to keep it readable. */
+  switch (level) {
+
+/* Level: SOL_SOCKET */
+  case SOL_SOCKET:
+    switch (optname) {
+
+    case SO_BROADCAST:
+    /* UNIMPL case SO_DEBUG: */
+    /* UNIMPL case SO_DONTROUTE: */
+    case SO_KEEPALIVE:
+    /* UNIMPL case case SO_CONTIMEO: */
+#if LWIP_SO_SNDTIMEO
+    case SO_SNDTIMEO:
+#endif /* LWIP_SO_SNDTIMEO */
+#if LWIP_SO_RCVTIMEO
+    case SO_RCVTIMEO:
+#endif /* LWIP_SO_RCVTIMEO */
+#if LWIP_SO_RCVBUF
+    case SO_RCVBUF:
+#endif /* LWIP_SO_RCVBUF */
+    /* UNIMPL case SO_OOBINLINE: */
+    /* UNIMPL case SO_SNDBUF: */
+    /* UNIMPL case SO_RCVLOWAT: */
+    /* UNIMPL case SO_SNDLOWAT: */
+#if SO_REUSE
+    case SO_REUSEADDR:
+    case SO_REUSEPORT:
+#endif /* SO_REUSE */
+    /* UNIMPL case SO_USELOOPBACK: */
+      if (optlen < sizeof(int)) {
+        err = EINVAL;
+      }
+      break;
+    case SO_NO_CHECK:
+      if (optlen < sizeof(int)) {
+        err = EINVAL;
+      }
+#if LWIP_UDP
+      if ((sock->conn->type != NETCONN_UDP) ||
+          ((udp_flags(sock->conn->pcb.udp) & UDP_FLAGS_UDPLITE) != 0)) {
+        /* this flag is only available for UDP, not for UDP lite */
+        err = EAFNOSUPPORT;
+      }
+#endif /* LWIP_UDP */
+      break;
+    default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, SOL_SOCKET, UNIMPL: optname=0x%x, ..)\n",
+                  s, optname));
+      err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
+
+/* Level: IPPROTO_IP */
+  case IPPROTO_IP:
+    switch (optname) {
+    /* UNIMPL case IP_HDRINCL: */
+    /* UNIMPL case IP_RCVDSTADDR: */
+    /* UNIMPL case IP_RCVIF: */
+    case IP_TTL:
+    case IP_TOS:
+      if (optlen < sizeof(int)) {
+        err = EINVAL;
+      }
+      break;
+#if LWIP_IGMP
+    case IP_MULTICAST_TTL:
+      if (optlen < sizeof(u8_t)) {
+        err = EINVAL;
+      }
+      if (NETCONNTYPE_GROUP(sock->conn->type) != NETCONN_UDP) {
+        err = EAFNOSUPPORT;
+      }
+      break;
+    case IP_MULTICAST_IF:
+      if (optlen < sizeof(struct in_addr)) {
+        err = EINVAL;
+      }
+      if (NETCONNTYPE_GROUP(sock->conn->type) != NETCONN_UDP) {
+        err = EAFNOSUPPORT;
+      }
+      break;
+    case IP_MULTICAST_LOOP:
+      if (optlen < sizeof(u8_t)) {
+        err = EINVAL;
+      }
+      if (NETCONNTYPE_GROUP(sock->conn->type) != NETCONN_UDP) {
+        err = EAFNOSUPPORT;
+      }
+      break;
+    case IP_ADD_MEMBERSHIP:
+    case IP_DROP_MEMBERSHIP:
+      if (optlen < sizeof(struct ip_mreq)) {
+        err = EINVAL;
+      }
+      if (NETCONNTYPE_GROUP(sock->conn->type) != NETCONN_UDP) {
+        err = EAFNOSUPPORT;
+      }
+      break;
+#endif /* LWIP_IGMP */
+      default:
+        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IP, UNIMPL: optname=0x%x, ..)\n",
+                    s, optname));
+        err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
+
+#if LWIP_TCP
+/* Level: IPPROTO_TCP */
+  case IPPROTO_TCP:
+    if (optlen < sizeof(int)) {
+      err = EINVAL;
+      break;
+    }
+
+    /* If this is no TCP socket, ignore any options. */
+    if (sock->conn->type != NETCONN_TCP)
+      return 0;
+
+    switch (optname) {
+    case TCP_NODELAY:
+    case TCP_KEEPALIVE:
+#if LWIP_TCP_KEEPALIVE
+    case TCP_KEEPIDLE:
+    case TCP_KEEPINTVL:
+    case TCP_KEEPCNT:
+#endif /* LWIP_TCP_KEEPALIVE */
+      break;
+
+    default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, UNIMPL: optname=0x%x, ..)\n",
+                  s, optname));
+      err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
+#endif /* LWIP_TCP */
+#if LWIP_UDP && LWIP_UDPLITE
+/* Level: IPPROTO_UDPLITE */
+  case IPPROTO_UDPLITE:
+    if (optlen < sizeof(int)) {
+      err = EINVAL;
+      break;
+    }
+
+    /* If this is no UDP lite socket, ignore any options. */
+    if (sock->conn->type != NETCONN_UDPLITE)
+      return 0;
+
+    switch (optname) {
+    case UDPLITE_SEND_CSCOV:
+    case UDPLITE_RECV_CSCOV:
+      break;
+
+    default:
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_UDPLITE, UNIMPL: optname=0x%x, ..)\n",
+                  s, optname));
+      err = ENOPROTOOPT;
+    }  /* switch (optname) */
+    break;
+#endif /* LWIP_UDP && LWIP_UDPLITE */
+/* UNDEFINED LEVEL */
+  default:
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, level=0x%x, UNIMPL: optname=0x%x, ..)\n",
+                s, level, optname));
+    err = ENOPROTOOPT;
+  }  /* switch (level) */
+
+
+  if (err != ERR_OK) {
+    sock_set_errno(sock, err);
+    return -1;
+  }
+
+
+  /* Now do the actual option processing */
+  data.sock = sock;
+#ifdef LWIP_DEBUG
+  data.s = s;
+#endif /* LWIP_DEBUG */
+  data.level = level;
+  data.optname = optname;
+  data.optval = (void*)optval;
+  data.optlen = &optlen;
+  data.err = err;
+  tcpip_callback(lwip_setsockopt_internal, &data);
+  sys_arch_sem_wait(&sock->conn->op_completed, 0);
+  /* maybe lwip_setsockopt_internal has changed err */
+  err = data.err;
+
+  sock_set_errno(sock, err);
+  return err ? -1 : 0;
+}
+
+static void
+lwip_setsockopt_internal(void *arg)
+{
+  struct lwip_sock *sock;
+#ifdef LWIP_DEBUG
+  int s;
+#endif /* LWIP_DEBUG */
+  int level, optname;
+  const void *optval;
+  struct lwip_setgetsockopt_data *data;
+
+  LWIP_ASSERT("arg != NULL", arg != NULL);
+
+  data = (struct lwip_setgetsockopt_data*)arg;
+  sock = data->sock;
+#ifdef LWIP_DEBUG
+  s = data->s;
+#endif /* LWIP_DEBUG */
+  level = data->level;
+  optname = data->optname;
+  optval = data->optval;
+
+  switch (level) {
+
+/* Level: SOL_SOCKET */
+  case SOL_SOCKET:
+    switch (optname) {
+
+    /* The option flags */
+    case SO_BROADCAST:
+    /* UNIMPL case SO_DEBUG: */
+    /* UNIMPL case SO_DONTROUTE: */
+    case SO_KEEPALIVE:
+    /* UNIMPL case SO_OOBINCLUDE: */
+#if SO_REUSE
+    case SO_REUSEADDR:
+    case SO_REUSEPORT:
+#endif /* SO_REUSE */
+    /* UNIMPL case SO_USELOOPBACK: */
+      if (*(int*)optval) {
+        ip_set_option(sock->conn->pcb.ip, optname);
+      } else {
+        ip_reset_option(sock->conn->pcb.ip, optname);
+      }
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, SOL_SOCKET, optname=0x%x, ..) -> %s\n",
+                  s, optname, (*(int*)optval?"on":"off")));
+      break;
+#if LWIP_SO_SNDTIMEO
+    case SO_SNDTIMEO:
+      netconn_set_sendtimeout(sock->conn, (s32_t)*(int*)optval);
+      break;
+#endif /* LWIP_SO_SNDTIMEO */
+#if LWIP_SO_RCVTIMEO
+    case SO_RCVTIMEO:
+      netconn_set_recvtimeout(sock->conn, *(int*)optval);
+      break;
+#endif /* LWIP_SO_RCVTIMEO */
+#if LWIP_SO_RCVBUF
+    case SO_RCVBUF:
+      netconn_set_recvbufsize(sock->conn, *(int*)optval);
+      break;
+#endif /* LWIP_SO_RCVBUF */
+#if LWIP_UDP
+    case SO_NO_CHECK:
+      if (*(int*)optval) {
+        udp_setflags(sock->conn->pcb.udp, udp_flags(sock->conn->pcb.udp) | UDP_FLAGS_NOCHKSUM);
+      } else {
+        udp_setflags(sock->conn->pcb.udp, udp_flags(sock->conn->pcb.udp) & ~UDP_FLAGS_NOCHKSUM);
+      }
+      break;
+#endif /* LWIP_UDP */
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
+
+/* Level: IPPROTO_IP */
+  case IPPROTO_IP:
+    switch (optname) {
+    case IP_TTL:
+      sock->conn->pcb.ip->ttl = (u8_t)(*(int*)optval);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IP, IP_TTL, ..) -> %d\n",
+                  s, sock->conn->pcb.ip->ttl));
+      break;
+    case IP_TOS:
+      sock->conn->pcb.ip->tos = (u8_t)(*(int*)optval);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IP, IP_TOS, ..)-> %d\n",
+                  s, sock->conn->pcb.ip->tos));
+      break;
+#if LWIP_IGMP
+    case IP_MULTICAST_TTL:
+      sock->conn->pcb.udp->ttl = (u8_t)(*(u8_t*)optval);
+      break;
+    case IP_MULTICAST_IF:
+      inet_addr_to_ipaddr(&sock->conn->pcb.udp->multicast_ip, (struct in_addr*)optval);
+      break;
+    case IP_MULTICAST_LOOP:
+      if (*(u8_t*)optval) {
+        udp_setflags(sock->conn->pcb.udp, udp_flags(sock->conn->pcb.udp) | UDP_FLAGS_MULTICAST_LOOP);
+      } else {
+        udp_setflags(sock->conn->pcb.udp, udp_flags(sock->conn->pcb.udp) & ~UDP_FLAGS_MULTICAST_LOOP);
+      }
+      break;
+    case IP_ADD_MEMBERSHIP:
+    case IP_DROP_MEMBERSHIP:
+      {
+        /* If this is a TCP or a RAW socket, ignore these options. */
+        struct ip_mreq *imr = (struct ip_mreq *)optval;
+        ip_addr_t if_addr;
+        ip_addr_t multi_addr;
+        inet_addr_to_ipaddr(&if_addr, &imr->imr_interface);
+        inet_addr_to_ipaddr(&multi_addr, &imr->imr_multiaddr);
+        if(optname == IP_ADD_MEMBERSHIP){
+          data->err = igmp_joingroup(&if_addr, &multi_addr);
+        } else {
+          data->err = igmp_leavegroup(&if_addr, &multi_addr);
+        }
+        if(data->err != ERR_OK) {
+          data->err = EADDRNOTAVAIL;
+        }
+      }
+      break;
+#endif /* LWIP_IGMP */
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
+
+#if LWIP_TCP
+/* Level: IPPROTO_TCP */
+  case IPPROTO_TCP:
+    switch (optname) {
+    case TCP_NODELAY:
+      if (*(int*)optval) {
+        tcp_nagle_disable(sock->conn->pcb.tcp);
+      } else {
+        tcp_nagle_enable(sock->conn->pcb.tcp);
+      }
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_NODELAY) -> %s\n",
+                  s, (*(int *)optval)?"on":"off") );
+      break;
+    case TCP_KEEPALIVE:
+      sock->conn->pcb.tcp->keep_idle = (u32_t)(*(int*)optval);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_KEEPALIVE) -> %"U32_F"\n",
+                  s, sock->conn->pcb.tcp->keep_idle));
+      break;
+
+#if LWIP_TCP_KEEPALIVE
+    case TCP_KEEPIDLE:
+      sock->conn->pcb.tcp->keep_idle = 1000*(u32_t)(*(int*)optval);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_KEEPIDLE) -> %"U32_F"\n",
+                  s, sock->conn->pcb.tcp->keep_idle));
+      break;
+    case TCP_KEEPINTVL:
+      sock->conn->pcb.tcp->keep_intvl = 1000*(u32_t)(*(int*)optval);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_KEEPINTVL) -> %"U32_F"\n",
+                  s, sock->conn->pcb.tcp->keep_intvl));
+      break;
+    case TCP_KEEPCNT:
+      sock->conn->pcb.tcp->keep_cnt = (u32_t)(*(int*)optval);
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_KEEPCNT) -> %"U32_F"\n",
+                  s, sock->conn->pcb.tcp->keep_cnt));
+      break;
+#endif /* LWIP_TCP_KEEPALIVE */
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
+#endif /* LWIP_TCP*/
+#if LWIP_UDP && LWIP_UDPLITE
+  /* Level: IPPROTO_UDPLITE */
+  case IPPROTO_UDPLITE:
+    switch (optname) {
+    case UDPLITE_SEND_CSCOV:
+      if ((*(int*)optval != 0) && ((*(int*)optval < 8) || (*(int*)optval > 0xffff))) {
+        /* don't allow illegal values! */
+        sock->conn->pcb.udp->chksum_len_tx = 8;
+      } else {
+        sock->conn->pcb.udp->chksum_len_tx = (u16_t)*(int*)optval;
+      }
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_UDPLITE, UDPLITE_SEND_CSCOV) -> %d\n",
+                  s, (*(int*)optval)) );
+      break;
+    case UDPLITE_RECV_CSCOV:
+      if ((*(int*)optval != 0) && ((*(int*)optval < 8) || (*(int*)optval > 0xffff))) {
+        /* don't allow illegal values! */
+        sock->conn->pcb.udp->chksum_len_rx = 8;
+      } else {
+        sock->conn->pcb.udp->chksum_len_rx = (u16_t)*(int*)optval;
+      }
+      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_UDPLITE, UDPLITE_RECV_CSCOV) -> %d\n",
+                  s, (*(int*)optval)) );
+      break;
+    default:
+      LWIP_ASSERT("unhandled optname", 0);
+      break;
+    }  /* switch (optname) */
+    break;
+#endif /* LWIP_UDP */
+  default:
+    LWIP_ASSERT("unhandled level", 0);
+    break;
+  }  /* switch (level) */
+  sys_sem_signal(&sock->conn->op_completed);
+}
+
+int
+lwip_ioctl(int s, long cmd, void *argp)
+{
+  struct lwip_sock *sock = get_socket(s);
+  u8_t val;
+#if LWIP_SO_RCVBUF
+  u16_t buflen = 0;
+  s16_t recv_avail;
+#endif /* LWIP_SO_RCVBUF */
+
+  if (!sock) {
+    return -1;
+  }
+
+  switch (cmd) {
+#if LWIP_SO_RCVBUF
+  case FIONREAD:
+    if (!argp) {
+      sock_set_errno(sock, EINVAL);
+      return -1;
+    }
+
+    SYS_ARCH_GET(sock->conn->recv_avail, recv_avail);
+    if (recv_avail < 0) {
+      recv_avail = 0;
+    }
+    *((u16_t*)argp) = (u16_t)recv_avail;
+
+    /* Check if there is data left from the last recv operation. /maq 041215 */
+    if (sock->lastdata) {
+      struct pbuf *p = (struct pbuf *)sock->lastdata;
+      if (netconn_type(sock->conn) != NETCONN_TCP) {
+        p = ((struct netbuf *)p)->p;
+      }
+      buflen = p->tot_len;
+      buflen -= sock->lastoffset;
+
+      *((u16_t*)argp) += buflen;
+    }
+
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(%d, FIONREAD, %p) = %"U16_F"\n", s, argp, *((u16_t*)argp)));
+    sock_set_errno(sock, 0);
+    return 0;
+#endif /* LWIP_SO_RCVBUF */
+
+  case FIONBIO:
+    val = 0;
+    if (argp && *(u32_t*)argp) {
+      val = 1;
+    }
+    netconn_set_nonblocking(sock->conn, val);
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(%d, FIONBIO, %d)\n", s, val));
+    sock_set_errno(sock, 0);
+    return 0;
+
+  default:
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(%d, UNIMPL: 0x%lx, %p)\n", s, cmd, argp));
+    sock_set_errno(sock, ENOSYS); /* not yet implemented */
+    return -1;
+  } /* switch (cmd) */
+}
+
+/** A minimal implementation of fcntl.
+ * Currently only the commands F_GETFL and F_SETFL are implemented.
+ * Only the flag O_NONBLOCK is implemented.
+ */
+int
+lwip_fcntl(int s, int cmd, int val)
+{
+  struct lwip_sock *sock = get_socket(s);
+  int ret = -1;
+
+  if (!sock || !sock->conn) {
+    return -1;
+  }
+
+  switch (cmd) {
+  case F_GETFL:
+    ret = netconn_is_nonblocking(sock->conn) ? O_NONBLOCK : 0;
+    break;
+  case F_SETFL:
+    if ((val & ~O_NONBLOCK) == 0) {
+      /* only O_NONBLOCK, all other bits are zero */
+      netconn_set_nonblocking(sock->conn, val & O_NONBLOCK);
+      ret = 0;
+    }
+    break;
+  default:
+    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_fcntl(%d, UNIMPL: %d, %d)\n", s, cmd, val));
+    break;
+  }
+  return ret;
+}
+
+#endif /* LWIP_SOCKET */
diff --git a/ext/lwip/src/api/tcpip.c b/ext/lwip/src/api/tcpip.c
new file mode 100644
index 000000000..18d5f679f
--- /dev/null
+++ b/ext/lwip/src/api/tcpip.c
@@ -0,0 +1,511 @@
+/**
+ * @file
+ * Sequential API Main thread module
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if !NO_SYS /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/sys.h"
+#include "lwip/memp.h"
+#include "lwip/mem.h"
+#include "lwip/pbuf.h"
+#include "lwip/tcpip.h"
+#include "lwip/init.h"
+#include "netif/etharp.h"
+#include "netif/ppp_oe.h"
+
+/* global variables */
+static tcpip_init_done_fn tcpip_init_done;
+static void *tcpip_init_done_arg;
+static sys_mbox_t mbox;
+
+#if LWIP_TCPIP_CORE_LOCKING
+/** The global semaphore to lock the stack. */
+sys_mutex_t lock_tcpip_core;
+#endif /* LWIP_TCPIP_CORE_LOCKING */
+
+
+/**
+ * The main lwIP thread. This thread has exclusive access to lwIP core functions
+ * (unless access to them is not locked). Other threads communicate with this
+ * thread using message boxes.
+ *
+ * It also starts all the timers to make sure they are running in the right
+ * thread context.
+ *
+ * @param arg unused argument
+ */
+static void
+tcpip_thread(void *arg)
+{
+  struct tcpip_msg *msg;
+  LWIP_UNUSED_ARG(arg);
+
+  if (tcpip_init_done != NULL) {
+    tcpip_init_done(tcpip_init_done_arg);
+  }
+
+  LOCK_TCPIP_CORE();
+  while (1) {                          /* MAIN Loop */
+    UNLOCK_TCPIP_CORE();
+    LWIP_TCPIP_THREAD_ALIVE();
+    /* wait for a message, timeouts are processed while waiting */
+    sys_timeouts_mbox_fetch(&mbox, (void **)&msg);
+    LOCK_TCPIP_CORE();
+    switch (msg->type) {
+#if LWIP_NETCONN
+    case TCPIP_MSG_API:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: API message %p\n", (void *)msg));
+      msg->msg.apimsg->function(&(msg->msg.apimsg->msg));
+      break;
+#endif /* LWIP_NETCONN */
+
+#if !LWIP_TCPIP_CORE_LOCKING_INPUT
+    case TCPIP_MSG_INPKT:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PACKET %p\n", (void *)msg));
+#if LWIP_ETHERNET
+      if (msg->msg.inp.netif->flags & (NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET)) {
+        ethernet_input(msg->msg.inp.p, msg->msg.inp.netif);
+      } else
+#endif /* LWIP_ETHERNET */
+      {
+        ip_input(msg->msg.inp.p, msg->msg.inp.netif);
+      }
+      memp_free(MEMP_TCPIP_MSG_INPKT, msg);
+      break;
+#endif /* LWIP_TCPIP_CORE_LOCKING_INPUT */
+
+#if LWIP_NETIF_API
+    case TCPIP_MSG_NETIFAPI:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: Netif API message %p\n", (void *)msg));
+      msg->msg.netifapimsg->function(&(msg->msg.netifapimsg->msg));
+      break;
+#endif /* LWIP_NETIF_API */
+
+#if LWIP_TCPIP_TIMEOUT
+    case TCPIP_MSG_TIMEOUT:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: TIMEOUT %p\n", (void *)msg));
+      sys_timeout(msg->msg.tmo.msecs, msg->msg.tmo.h, msg->msg.tmo.arg);
+      memp_free(MEMP_TCPIP_MSG_API, msg);
+      break;
+    case TCPIP_MSG_UNTIMEOUT:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: UNTIMEOUT %p\n", (void *)msg));
+      sys_untimeout(msg->msg.tmo.h, msg->msg.tmo.arg);
+      memp_free(MEMP_TCPIP_MSG_API, msg);
+      break;
+#endif /* LWIP_TCPIP_TIMEOUT */
+
+    case TCPIP_MSG_CALLBACK:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: CALLBACK %p\n", (void *)msg));
+      msg->msg.cb.function(msg->msg.cb.ctx);
+      memp_free(MEMP_TCPIP_MSG_API, msg);
+      break;
+
+    case TCPIP_MSG_CALLBACK_STATIC:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: CALLBACK_STATIC %p\n", (void *)msg));
+      msg->msg.cb.function(msg->msg.cb.ctx);
+      break;
+
+    default:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: invalid message: %d\n", msg->type));
+      LWIP_ASSERT("tcpip_thread: invalid message", 0);
+      break;
+    }
+  }
+}
+
+/**
+ * Pass a received packet to tcpip_thread for input processing
+ *
+ * @param p the received packet, p->payload pointing to the Ethernet header or
+ *          to an IP header (if inp doesn't have NETIF_FLAG_ETHARP or
+ *          NETIF_FLAG_ETHERNET flags)
+ * @param inp the network interface on which the packet was received
+ */
+err_t
+tcpip_input(struct pbuf *p, struct netif *inp)
+{
+#if LWIP_TCPIP_CORE_LOCKING_INPUT
+  err_t ret;
+  LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_input: PACKET %p/%p\n", (void *)p, (void *)inp));
+  LOCK_TCPIP_CORE();
+#if LWIP_ETHERNET
+  if (inp->flags & (NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET)) {
+    ret = ethernet_input(p, inp);
+  } else
+#endif /* LWIP_ETHERNET */
+  {
+    ret = ip_input(p, inp);
+  }
+  UNLOCK_TCPIP_CORE();
+  return ret;
+#else /* LWIP_TCPIP_CORE_LOCKING_INPUT */
+  struct tcpip_msg *msg;
+
+  if (!sys_mbox_valid(&mbox)) {
+    return ERR_VAL;
+  }
+  msg = (struct tcpip_msg *)memp_malloc(MEMP_TCPIP_MSG_INPKT);
+  if (msg == NULL) {
+    return ERR_MEM;
+  }
+
+  msg->type = TCPIP_MSG_INPKT;
+  msg->msg.inp.p = p;
+  msg->msg.inp.netif = inp;
+  if (sys_mbox_trypost(&mbox, msg) != ERR_OK) {
+    memp_free(MEMP_TCPIP_MSG_INPKT, msg);
+    return ERR_MEM;
+  }
+  return ERR_OK;
+#endif /* LWIP_TCPIP_CORE_LOCKING_INPUT */
+}
+
+/**
+ * Call a specific function in the thread context of
+ * tcpip_thread for easy access synchronization.
+ * A function called in that way may access lwIP core code
+ * without fearing concurrent access.
+ *
+ * @param f the function to call
+ * @param ctx parameter passed to f
+ * @param block 1 to block until the request is posted, 0 to non-blocking mode
+ * @return ERR_OK if the function was called, another err_t if not
+ */
+err_t
+tcpip_callback_with_block(tcpip_callback_fn function, void *ctx, u8_t block)
+{
+  struct tcpip_msg *msg;
+
+  if (sys_mbox_valid(&mbox)) {
+    msg = (struct tcpip_msg *)memp_malloc(MEMP_TCPIP_MSG_API);
+    if (msg == NULL) {
+      return ERR_MEM;
+    }
+
+    msg->type = TCPIP_MSG_CALLBACK;
+    msg->msg.cb.function = function;
+    msg->msg.cb.ctx = ctx;
+    if (block) {
+      sys_mbox_post(&mbox, msg);
+    } else {
+      if (sys_mbox_trypost(&mbox, msg) != ERR_OK) {
+        memp_free(MEMP_TCPIP_MSG_API, msg);
+        return ERR_MEM;
+      }
+    }
+    return ERR_OK;
+  }
+  return ERR_VAL;
+}
+
+#if LWIP_TCPIP_TIMEOUT
+/**
+ * call sys_timeout in tcpip_thread
+ *
+ * @param msec time in milliseconds for timeout
+ * @param h function to be called on timeout
+ * @param arg argument to pass to timeout function h
+ * @return ERR_MEM on memory error, ERR_OK otherwise
+ */
+err_t
+tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg)
+{
+  struct tcpip_msg *msg;
+
+  if (sys_mbox_valid(&mbox)) {
+    msg = (struct tcpip_msg *)memp_malloc(MEMP_TCPIP_MSG_API);
+    if (msg == NULL) {
+      return ERR_MEM;
+    }
+
+    msg->type = TCPIP_MSG_TIMEOUT;
+    msg->msg.tmo.msecs = msecs;
+    msg->msg.tmo.h = h;
+    msg->msg.tmo.arg = arg;
+    sys_mbox_post(&mbox, msg);
+    return ERR_OK;
+  }
+  return ERR_VAL;
+}
+
+/**
+ * call sys_untimeout in tcpip_thread
+ *
+ * @param msec time in milliseconds for timeout
+ * @param h function to be called on timeout
+ * @param arg argument to pass to timeout function h
+ * @return ERR_MEM on memory error, ERR_OK otherwise
+ */
+err_t
+tcpip_untimeout(sys_timeout_handler h, void *arg)
+{
+  struct tcpip_msg *msg;
+
+  if (sys_mbox_valid(&mbox)) {
+    msg = (struct tcpip_msg *)memp_malloc(MEMP_TCPIP_MSG_API);
+    if (msg == NULL) {
+      return ERR_MEM;
+    }
+
+    msg->type = TCPIP_MSG_UNTIMEOUT;
+    msg->msg.tmo.h = h;
+    msg->msg.tmo.arg = arg;
+    sys_mbox_post(&mbox, msg);
+    return ERR_OK;
+  }
+  return ERR_VAL;
+}
+#endif /* LWIP_TCPIP_TIMEOUT */
+
+#if LWIP_NETCONN
+/**
+ * Call the lower part of a netconn_* function
+ * This function is then running in the thread context
+ * of tcpip_thread and has exclusive access to lwIP core code.
+ *
+ * @param apimsg a struct containing the function to call and its parameters
+ * @return ERR_OK if the function was called, another err_t if not
+ */
+err_t
+tcpip_apimsg(struct api_msg *apimsg)
+{
+  struct tcpip_msg msg;
+#ifdef LWIP_DEBUG
+  /* catch functions that don't set err */
+  apimsg->msg.err = ERR_VAL;
+#endif
+  
+  if (sys_mbox_valid(&mbox)) {
+    msg.type = TCPIP_MSG_API;
+    msg.msg.apimsg = apimsg;
+    sys_mbox_post(&mbox, &msg);
+    sys_arch_sem_wait(&apimsg->msg.conn->op_completed, 0);
+    return apimsg->msg.err;
+  }
+  return ERR_VAL;
+}
+
+#if LWIP_TCPIP_CORE_LOCKING
+/**
+ * Call the lower part of a netconn_* function
+ * This function has exclusive access to lwIP core code by locking it
+ * before the function is called.
+ *
+ * @param apimsg a struct containing the function to call and its parameters
+ * @return ERR_OK (only for compatibility fo tcpip_apimsg())
+ */
+err_t
+tcpip_apimsg_lock(struct api_msg *apimsg)
+{
+#ifdef LWIP_DEBUG
+  /* catch functions that don't set err */
+  apimsg->msg.err = ERR_VAL;
+#endif
+
+  LOCK_TCPIP_CORE();
+  apimsg->function(&(apimsg->msg));
+  UNLOCK_TCPIP_CORE();
+  return apimsg->msg.err;
+
+}
+#endif /* LWIP_TCPIP_CORE_LOCKING */
+#endif /* LWIP_NETCONN */
+
+#if LWIP_NETIF_API
+#if !LWIP_TCPIP_CORE_LOCKING
+/**
+ * Much like tcpip_apimsg, but calls the lower part of a netifapi_*
+ * function.
+ *
+ * @param netifapimsg a struct containing the function to call and its parameters
+ * @return error code given back by the function that was called
+ */
+err_t
+tcpip_netifapi(struct netifapi_msg* netifapimsg)
+{
+  struct tcpip_msg msg;
+  
+  if (sys_mbox_valid(&mbox)) {
+    err_t err = sys_sem_new(&netifapimsg->msg.sem, 0);
+    if (err != ERR_OK) {
+      netifapimsg->msg.err = err;
+      return err;
+    }
+    
+    msg.type = TCPIP_MSG_NETIFAPI;
+    msg.msg.netifapimsg = netifapimsg;
+    sys_mbox_post(&mbox, &msg);
+    sys_sem_wait(&netifapimsg->msg.sem);
+    sys_sem_free(&netifapimsg->msg.sem);
+    return netifapimsg->msg.err;
+  }
+  return ERR_VAL;
+}
+#else /* !LWIP_TCPIP_CORE_LOCKING */
+/**
+ * Call the lower part of a netifapi_* function
+ * This function has exclusive access to lwIP core code by locking it
+ * before the function is called.
+ *
+ * @param netifapimsg a struct containing the function to call and its parameters
+ * @return ERR_OK (only for compatibility fo tcpip_netifapi())
+ */
+err_t
+tcpip_netifapi_lock(struct netifapi_msg* netifapimsg)
+{
+  LOCK_TCPIP_CORE();  
+  netifapimsg->function(&(netifapimsg->msg));
+  UNLOCK_TCPIP_CORE();
+  return netifapimsg->msg.err;
+}
+#endif /* !LWIP_TCPIP_CORE_LOCKING */
+#endif /* LWIP_NETIF_API */
+
+/**
+ * Allocate a structure for a static callback message and initialize it.
+ * This is intended to be used to send "static" messages from interrupt context.
+ *
+ * @param function the function to call
+ * @param ctx parameter passed to function
+ * @return a struct pointer to pass to tcpip_trycallback().
+ */
+struct tcpip_callback_msg* tcpip_callbackmsg_new(tcpip_callback_fn function, void *ctx)
+{
+  struct tcpip_msg *msg = (struct tcpip_msg *)memp_malloc(MEMP_TCPIP_MSG_API);
+  if (msg == NULL) {
+    return NULL;
+  }
+  msg->type = TCPIP_MSG_CALLBACK_STATIC;
+  msg->msg.cb.function = function;
+  msg->msg.cb.ctx = ctx;
+  return (struct tcpip_callback_msg*)msg;
+}
+
+/**
+ * Free a callback message allocated by tcpip_callbackmsg_new().
+ *
+ * @param msg the message to free
+ */
+void tcpip_callbackmsg_delete(struct tcpip_callback_msg* msg)
+{
+  memp_free(MEMP_TCPIP_MSG_API, msg);
+}
+
+/**
+ * Try to post a callback-message to the tcpip_thread mbox
+ * This is intended to be used to send "static" messages from interrupt context.
+ *
+ * @param msg pointer to the message to post
+ * @return sys_mbox_trypost() return code
+ */
+err_t
+tcpip_trycallback(struct tcpip_callback_msg* msg)
+{
+  if (!sys_mbox_valid(&mbox)) {
+    return ERR_VAL;
+  }
+  return sys_mbox_trypost(&mbox, msg);
+}
+
+/**
+ * Initialize this module:
+ * - initialize all sub modules
+ * - start the tcpip_thread
+ *
+ * @param initfunc a function to call when tcpip_thread is running and finished initializing
+ * @param arg argument to pass to initfunc
+ */
+void
+tcpip_init(tcpip_init_done_fn initfunc, void *arg)
+{
+  lwip_init();
+
+  tcpip_init_done = initfunc;
+  tcpip_init_done_arg = arg;
+  if(sys_mbox_new(&mbox, TCPIP_MBOX_SIZE) != ERR_OK) {
+    LWIP_ASSERT("failed to create tcpip_thread mbox", 0);
+  }
+#if LWIP_TCPIP_CORE_LOCKING
+  if(sys_mutex_new(&lock_tcpip_core) != ERR_OK) {
+    LWIP_ASSERT("failed to create lock_tcpip_core", 0);
+  }
+#endif /* LWIP_TCPIP_CORE_LOCKING */
+
+  sys_thread_new(TCPIP_THREAD_NAME, tcpip_thread, NULL, TCPIP_THREAD_STACKSIZE, TCPIP_THREAD_PRIO);
+}
+
+/**
+ * Simple callback function used with tcpip_callback to free a pbuf
+ * (pbuf_free has a wrong signature for tcpip_callback)
+ *
+ * @param p The pbuf (chain) to be dereferenced.
+ */
+static void
+pbuf_free_int(void *p)
+{
+  struct pbuf *q = (struct pbuf *)p;
+  pbuf_free(q);
+}
+
+/**
+ * A simple wrapper function that allows you to free a pbuf from interrupt context.
+ *
+ * @param p The pbuf (chain) to be dereferenced.
+ * @return ERR_OK if callback could be enqueued, an err_t if not
+ */
+err_t
+pbuf_free_callback(struct pbuf *p)
+{
+  return tcpip_callback_with_block(pbuf_free_int, p, 0);
+}
+
+/**
+ * A simple wrapper function that allows you to free heap memory from
+ * interrupt context.
+ *
+ * @param m the heap memory to free
+ * @return ERR_OK if callback could be enqueued, an err_t if not
+ */
+err_t
+mem_free_callback(void *m)
+{
+  return tcpip_callback_with_block(mem_free, m, 0);
+}
+
+#endif /* !NO_SYS */
diff --git a/ext/lwip/src/core/def.c b/ext/lwip/src/core/def.c
new file mode 100644
index 000000000..352b55241
--- /dev/null
+++ b/ext/lwip/src/core/def.c
@@ -0,0 +1,108 @@
+/**
+ * @file
+ * Common functions used throughout the stack.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Simon Goldschmidt
+ *
+ */
+
+#include "lwip/opt.h"
+#include "lwip/def.h"
+
+/**
+ * These are reference implementations of the byte swapping functions.
+ * Again with the aim of being simple, correct and fully portable.
+ * Byte swapping is the second thing you would want to optimize. You will
+ * need to port it to your architecture and in your cc.h:
+ * 
+ * #define LWIP_PLATFORM_BYTESWAP 1
+ * #define LWIP_PLATFORM_HTONS(x) <your_htons>
+ * #define LWIP_PLATFORM_HTONL(x) <your_htonl>
+ *
+ * Note ntohs() and ntohl() are merely references to the htonx counterparts.
+ */
+
+#if (LWIP_PLATFORM_BYTESWAP == 0) && (BYTE_ORDER == LITTLE_ENDIAN)
+
+/**
+ * Convert an u16_t from host- to network byte order.
+ *
+ * @param n u16_t in host byte order
+ * @return n in network byte order
+ */
+u16_t
+lwip_htons(u16_t n)
+{
+  return ((n & 0xff) << 8) | ((n & 0xff00) >> 8);
+}
+
+/**
+ * Convert an u16_t from network- to host byte order.
+ *
+ * @param n u16_t in network byte order
+ * @return n in host byte order
+ */
+u16_t
+lwip_ntohs(u16_t n)
+{
+  return lwip_htons(n);
+}
+
+/**
+ * Convert an u32_t from host- to network byte order.
+ *
+ * @param n u32_t in host byte order
+ * @return n in network byte order
+ */
+u32_t
+lwip_htonl(u32_t n)
+{
+  return ((n & 0xff) << 24) |
+    ((n & 0xff00) << 8) |
+    ((n & 0xff0000UL) >> 8) |
+    ((n & 0xff000000UL) >> 24);
+}
+
+/**
+ * Convert an u32_t from network- to host byte order.
+ *
+ * @param n u32_t in network byte order
+ * @return n in host byte order
+ */
+u32_t
+lwip_ntohl(u32_t n)
+{
+  return lwip_htonl(n);
+}
+
+#endif /* (LWIP_PLATFORM_BYTESWAP == 0) && (BYTE_ORDER == LITTLE_ENDIAN) */
diff --git a/ext/lwip/src/core/dhcp.c b/ext/lwip/src/core/dhcp.c
new file mode 100644
index 000000000..cf864a8fe
--- /dev/null
+++ b/ext/lwip/src/core/dhcp.c
@@ -0,0 +1,1770 @@
+/**
+ * @file
+ * Dynamic Host Configuration Protocol client
+ *
+ */
+
+/*
+ *
+ * Copyright (c) 2001-2004 Leon Woestenberg <leon.woestenberg@gmx.net>
+ * Copyright (c) 2001-2004 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is a contribution to the lwIP TCP/IP stack.
+ * The Swedish Institute of Computer Science and Adam Dunkels
+ * are specifically granted permission to redistribute this
+ * source code.
+ *
+ * Author: Leon Woestenberg <leon.woestenberg@gmx.net>
+ *
+ * This is a DHCP client for the lwIP TCP/IP stack. It aims to conform
+ * with RFC 2131 and RFC 2132.
+ *
+ * TODO:
+ * - Support for interfaces other than Ethernet (SLIP, PPP, ...)
+ *
+ * Please coordinate changes and requests with Leon Woestenberg
+ * <leon.woestenberg@gmx.net>
+ *
+ * Integration with your code:
+ *
+ * In lwip/dhcp.h
+ * #define DHCP_COARSE_TIMER_SECS (recommended 60 which is a minute)
+ * #define DHCP_FINE_TIMER_MSECS (recommended 500 which equals TCP coarse timer)
+ *
+ * Then have your application call dhcp_coarse_tmr() and
+ * dhcp_fine_tmr() on the defined intervals.
+ *
+ * dhcp_start(struct netif *netif);
+ * starts a DHCP client instance which configures the interface by
+ * obtaining an IP address lease and maintaining it.
+ *
+ * Use dhcp_release(netif) to end the lease and use dhcp_stop(netif)
+ * to remove the DHCP client.
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_DHCP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/stats.h"
+#include "lwip/mem.h"
+#include "lwip/udp.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/def.h"
+#include "lwip/dhcp.h"
+#include "lwip/autoip.h"
+#include "lwip/dns.h"
+#include "netif/etharp.h"
+
+#include <string.h>
+
+/** DHCP_CREATE_RAND_XID: if this is set to 1, the xid is created using
+ * LWIP_RAND() (this overrides DHCP_GLOBAL_XID)
+ */
+#ifndef DHCP_CREATE_RAND_XID
+#define DHCP_CREATE_RAND_XID 1
+#endif
+
+/** Default for DHCP_GLOBAL_XID is 0xABCD0000
+ * This can be changed by defining DHCP_GLOBAL_XID and DHCP_GLOBAL_XID_HEADER, e.g.
+ *  #define DHCP_GLOBAL_XID_HEADER "stdlib.h"
+ *  #define DHCP_GLOBAL_XID rand()
+ */
+#ifdef DHCP_GLOBAL_XID_HEADER
+#include DHCP_GLOBAL_XID_HEADER /* include optional starting XID generation prototypes */
+#endif
+
+/** DHCP_OPTION_MAX_MSG_SIZE is set to the MTU
+ * MTU is checked to be big enough in dhcp_start */
+#define DHCP_MAX_MSG_LEN(netif)        (netif->mtu)
+#define DHCP_MAX_MSG_LEN_MIN_REQUIRED  576
+/** Minimum length for reply before packet is parsed */
+#define DHCP_MIN_REPLY_LEN             44
+
+#define REBOOT_TRIES 2
+
+/** Option handling: options are parsed in dhcp_parse_reply
+ * and saved in an array where other functions can load them from.
+ * This might be moved into the struct dhcp (not necessarily since
+ * lwIP is single-threaded and the array is only used while in recv
+ * callback). */
+#define DHCP_OPTION_IDX_OVERLOAD    0
+#define DHCP_OPTION_IDX_MSG_TYPE    1
+#define DHCP_OPTION_IDX_SERVER_ID   2
+#define DHCP_OPTION_IDX_LEASE_TIME  3
+#define DHCP_OPTION_IDX_T1          4
+#define DHCP_OPTION_IDX_T2          5
+#define DHCP_OPTION_IDX_SUBNET_MASK 6
+#define DHCP_OPTION_IDX_ROUTER      7
+#define DHCP_OPTION_IDX_DNS_SERVER  8
+#define DHCP_OPTION_IDX_MAX         (DHCP_OPTION_IDX_DNS_SERVER + DNS_MAX_SERVERS)
+
+/** Holds the decoded option values, only valid while in dhcp_recv.
+    @todo: move this into struct dhcp? */
+u32_t dhcp_rx_options_val[DHCP_OPTION_IDX_MAX];
+/** Holds a flag which option was received and is contained in dhcp_rx_options_val,
+    only valid while in dhcp_recv.
+    @todo: move this into struct dhcp? */
+u8_t  dhcp_rx_options_given[DHCP_OPTION_IDX_MAX];
+
+#ifdef DHCP_GLOBAL_XID
+static u32_t xid;
+static u8_t xid_initialised;
+#endif /* DHCP_GLOBAL_XID */
+
+#define dhcp_option_given(dhcp, idx)          (dhcp_rx_options_given[idx] != 0)
+#define dhcp_got_option(dhcp, idx)            (dhcp_rx_options_given[idx] = 1)
+#define dhcp_clear_option(dhcp, idx)          (dhcp_rx_options_given[idx] = 0)
+#define dhcp_clear_all_options(dhcp)          (memset(dhcp_rx_options_given, 0, sizeof(dhcp_rx_options_given)))
+#define dhcp_get_option_value(dhcp, idx)      (dhcp_rx_options_val[idx])
+#define dhcp_set_option_value(dhcp, idx, val) (dhcp_rx_options_val[idx] = (val))
+
+
+/* DHCP client state machine functions */
+static err_t dhcp_discover(struct netif *netif);
+static err_t dhcp_select(struct netif *netif);
+static void dhcp_bind(struct netif *netif);
+#if DHCP_DOES_ARP_CHECK
+static err_t dhcp_decline(struct netif *netif);
+#endif /* DHCP_DOES_ARP_CHECK */
+static err_t dhcp_rebind(struct netif *netif);
+static err_t dhcp_reboot(struct netif *netif);
+static void dhcp_set_state(struct dhcp *dhcp, u8_t new_state);
+
+/* receive, unfold, parse and free incoming messages */
+static void dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port);
+
+/* set the DHCP timers */
+static void dhcp_timeout(struct netif *netif);
+static void dhcp_t1_timeout(struct netif *netif);
+static void dhcp_t2_timeout(struct netif *netif);
+
+/* build outgoing messages */
+/* create a DHCP message, fill in common headers */
+static err_t dhcp_create_msg(struct netif *netif, struct dhcp *dhcp, u8_t message_type);
+/* free a DHCP request */
+static void dhcp_delete_msg(struct dhcp *dhcp);
+/* add a DHCP option (type, then length in bytes) */
+static void dhcp_option(struct dhcp *dhcp, u8_t option_type, u8_t option_len);
+/* add option values */
+static void dhcp_option_byte(struct dhcp *dhcp, u8_t value);
+static void dhcp_option_short(struct dhcp *dhcp, u16_t value);
+static void dhcp_option_long(struct dhcp *dhcp, u32_t value);
+#if LWIP_NETIF_HOSTNAME
+static void dhcp_option_hostname(struct dhcp *dhcp, struct netif *netif);
+#endif /* LWIP_NETIF_HOSTNAME */
+/* always add the DHCP options trailer to end and pad */
+static void dhcp_option_trailer(struct dhcp *dhcp);
+
+/**
+ * Back-off the DHCP client (because of a received NAK response).
+ *
+ * Back-off the DHCP client because of a received NAK. Receiving a
+ * NAK means the client asked for something non-sensible, for
+ * example when it tries to renew a lease obtained on another network.
+ *
+ * We clear any existing set IP address and restart DHCP negotiation
+ * afresh (as per RFC2131 3.2.3).
+ *
+ * @param netif the netif under DHCP control
+ */
+static void
+dhcp_handle_nak(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_handle_nak(netif=%p) %c%c%"U16_F"\n", 
+    (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
+  /* Set the interface down since the address must no longer be used, as per RFC2131 */
+  netif_set_down(netif);
+  /* remove IP address from interface */
+  netif_set_ipaddr(netif, IP_ADDR_ANY);
+  netif_set_gw(netif, IP_ADDR_ANY);
+  netif_set_netmask(netif, IP_ADDR_ANY); 
+  /* Change to a defined state */
+  dhcp_set_state(dhcp, DHCP_BACKING_OFF);
+  /* We can immediately restart discovery */
+  dhcp_discover(netif);
+}
+
+#if DHCP_DOES_ARP_CHECK
+/**
+ * Checks if the offered IP address is already in use.
+ *
+ * It does so by sending an ARP request for the offered address and
+ * entering CHECKING state. If no ARP reply is received within a small
+ * interval, the address is assumed to be free for use by us.
+ *
+ * @param netif the netif under DHCP control
+ */
+static void
+dhcp_check(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  err_t result;
+  u16_t msecs;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_check(netif=%p) %c%c\n", (void *)netif, (s16_t)netif->name[0],
+    (s16_t)netif->name[1]));
+  dhcp_set_state(dhcp, DHCP_CHECKING);
+  /* create an ARP query for the offered IP address, expecting that no host
+     responds, as the IP address should not be in use. */
+  result = etharp_query(netif, &dhcp->offered_ip_addr, NULL);
+  if (result != ERR_OK) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("dhcp_check: could not perform ARP query\n"));
+  }
+  dhcp->tries++;
+  msecs = 500;
+  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_check(): set request timeout %"U16_F" msecs\n", msecs));
+}
+#endif /* DHCP_DOES_ARP_CHECK */
+
+/**
+ * Remember the configuration offered by a DHCP server.
+ *
+ * @param netif the netif under DHCP control
+ */
+static void
+dhcp_handle_offer(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_handle_offer(netif=%p) %c%c%"U16_F"\n",
+    (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
+  /* obtain the server address */
+  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_SERVER_ID)) {
+    ip4_addr_set_u32(&dhcp->server_ip_addr, htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_SERVER_ID)));
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_handle_offer(): server 0x%08"X32_F"\n",
+      ip4_addr_get_u32(&dhcp->server_ip_addr)));
+    /* remember offered address */
+    ip_addr_copy(dhcp->offered_ip_addr, dhcp->msg_in->yiaddr);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_handle_offer(): offer for 0x%08"X32_F"\n",
+      ip4_addr_get_u32(&dhcp->offered_ip_addr)));
+
+    dhcp_select(netif);
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
+      ("dhcp_handle_offer(netif=%p) did not get server ID!\n", (void*)netif));
+  }
+}
+
+/**
+ * Select a DHCP server offer out of all offers.
+ *
+ * Simply select the first offer received.
+ *
+ * @param netif the netif under DHCP control
+ * @return lwIP specific error (see error.h)
+ */
+static err_t
+dhcp_select(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  err_t result;
+  u16_t msecs;
+
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_select(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
+  dhcp_set_state(dhcp, DHCP_REQUESTING);
+
+  /* create and initialize the DHCP message header */
+  result = dhcp_create_msg(netif, dhcp, DHCP_REQUEST);
+  if (result == ERR_OK) {
+    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
+    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN(netif));
+
+    /* MUST request the offered IP address */
+    dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
+    dhcp_option_long(dhcp, ntohl(ip4_addr_get_u32(&dhcp->offered_ip_addr)));
+
+    dhcp_option(dhcp, DHCP_OPTION_SERVER_ID, 4);
+    dhcp_option_long(dhcp, ntohl(ip4_addr_get_u32(&dhcp->server_ip_addr)));
+
+    dhcp_option(dhcp, DHCP_OPTION_PARAMETER_REQUEST_LIST, 4/*num options*/);
+    dhcp_option_byte(dhcp, DHCP_OPTION_SUBNET_MASK);
+    dhcp_option_byte(dhcp, DHCP_OPTION_ROUTER);
+    dhcp_option_byte(dhcp, DHCP_OPTION_BROADCAST);
+    dhcp_option_byte(dhcp, DHCP_OPTION_DNS_SERVER);
+
+#if LWIP_NETIF_HOSTNAME
+    dhcp_option_hostname(dhcp, netif);
+#endif /* LWIP_NETIF_HOSTNAME */
+
+    dhcp_option_trailer(dhcp);
+    /* shrink the pbuf to the actual content length */
+    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
+
+    /* send broadcast to any DHCP server */
+    udp_sendto_if(dhcp->pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
+    dhcp_delete_msg(dhcp);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_select: REQUESTING\n"));
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("dhcp_select: could not allocate DHCP request\n"));
+  }
+  dhcp->tries++;
+  msecs = (dhcp->tries < 6 ? 1 << dhcp->tries : 60) * 1000;
+  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_select(): set request timeout %"U16_F" msecs\n", msecs));
+  return result;
+}
+
+/**
+ * The DHCP timer that checks for lease renewal/rebind timeouts.
+ */
+void
+dhcp_coarse_tmr()
+{
+  struct netif *netif = netif_list;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_coarse_tmr()\n"));
+  /* iterate through all network interfaces */
+  while (netif != NULL) {
+    /* only act on DHCP configured interfaces */
+    if (netif->dhcp != NULL) {
+      /* timer is active (non zero), and triggers (zeroes) now? */
+      if (netif->dhcp->t2_timeout-- == 1) {
+        LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_coarse_tmr(): t2 timeout\n"));
+        /* this clients' rebind timeout triggered */
+        dhcp_t2_timeout(netif);
+      /* timer is active (non zero), and triggers (zeroes) now */
+      } else if (netif->dhcp->t1_timeout-- == 1) {
+        LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_coarse_tmr(): t1 timeout\n"));
+        /* this clients' renewal timeout triggered */
+        dhcp_t1_timeout(netif);
+      }
+    }
+    /* proceed to next netif */
+    netif = netif->next;
+  }
+}
+
+/**
+ * DHCP transaction timeout handling
+ *
+ * A DHCP server is expected to respond within a short period of time.
+ * This timer checks whether an outstanding DHCP request is timed out.
+ */
+void
+dhcp_fine_tmr()
+{
+  struct netif *netif = netif_list;
+  /* loop through netif's */
+  while (netif != NULL) {
+    /* only act on DHCP configured interfaces */
+    if (netif->dhcp != NULL) {
+      /* timer is active (non zero), and is about to trigger now */      
+      if (netif->dhcp->request_timeout > 1) {
+        netif->dhcp->request_timeout--;
+      }
+      else if (netif->dhcp->request_timeout == 1) {
+        netif->dhcp->request_timeout--;
+        /* { netif->dhcp->request_timeout == 0 } */
+        LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_fine_tmr(): request timeout\n"));
+        /* this client's request timeout triggered */
+        dhcp_timeout(netif);
+      }
+    }
+    /* proceed to next network interface */
+    netif = netif->next;
+  }
+}
+
+/**
+ * A DHCP negotiation transaction, or ARP request, has timed out.
+ *
+ * The timer that was started with the DHCP or ARP request has
+ * timed out, indicating no response was received in time.
+ *
+ * @param netif the netif under DHCP control
+ */
+static void
+dhcp_timeout(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_timeout()\n"));
+  /* back-off period has passed, or server selection timed out */
+  if ((dhcp->state == DHCP_BACKING_OFF) || (dhcp->state == DHCP_SELECTING)) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_timeout(): restarting discovery\n"));
+    dhcp_discover(netif);
+  /* receiving the requested lease timed out */
+  } else if (dhcp->state == DHCP_REQUESTING) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): REQUESTING, DHCP request timed out\n"));
+    if (dhcp->tries <= 5) {
+      dhcp_select(netif);
+    } else {
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): REQUESTING, releasing, restarting\n"));
+      dhcp_release(netif);
+      dhcp_discover(netif);
+    }
+#if DHCP_DOES_ARP_CHECK
+  /* received no ARP reply for the offered address (which is good) */
+  } else if (dhcp->state == DHCP_CHECKING) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): CHECKING, ARP request timed out\n"));
+    if (dhcp->tries <= 1) {
+      dhcp_check(netif);
+    /* no ARP replies on the offered address,
+       looks like the IP address is indeed free */
+    } else {
+      /* bind the interface to the offered address */
+      dhcp_bind(netif);
+    }
+#endif /* DHCP_DOES_ARP_CHECK */
+  }
+  /* did not get response to renew request? */
+  else if (dhcp->state == DHCP_RENEWING) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): RENEWING, DHCP request timed out\n"));
+    /* just retry renewal */
+    /* note that the rebind timer will eventually time-out if renew does not work */
+    dhcp_renew(netif);
+  /* did not get response to rebind request? */
+  } else if (dhcp->state == DHCP_REBINDING) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): REBINDING, DHCP request timed out\n"));
+    if (dhcp->tries <= 8) {
+      dhcp_rebind(netif);
+    } else {
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): RELEASING, DISCOVERING\n"));
+      dhcp_release(netif);
+      dhcp_discover(netif);
+    }
+  } else if (dhcp->state == DHCP_REBOOTING) {
+    if (dhcp->tries < REBOOT_TRIES) {
+      dhcp_reboot(netif);
+    } else {
+      dhcp_discover(netif);
+    }
+  }
+}
+
+/**
+ * The renewal period has timed out.
+ *
+ * @param netif the netif under DHCP control
+ */
+static void
+dhcp_t1_timeout(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_t1_timeout()\n"));
+  if ((dhcp->state == DHCP_REQUESTING) || (dhcp->state == DHCP_BOUND) ||
+      (dhcp->state == DHCP_RENEWING)) {
+    /* just retry to renew - note that the rebind timer (t2) will
+     * eventually time-out if renew tries fail. */
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+                ("dhcp_t1_timeout(): must renew\n"));
+    /* This slightly different to RFC2131: DHCPREQUEST will be sent from state
+       DHCP_RENEWING, not DHCP_BOUND */
+    dhcp_renew(netif);
+  }
+}
+
+/**
+ * The rebind period has timed out.
+ *
+ * @param netif the netif under DHCP control
+ */
+static void
+dhcp_t2_timeout(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_t2_timeout()\n"));
+  if ((dhcp->state == DHCP_REQUESTING) || (dhcp->state == DHCP_BOUND) ||
+      (dhcp->state == DHCP_RENEWING)) {
+    /* just retry to rebind */
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+                ("dhcp_t2_timeout(): must rebind\n"));
+    /* This slightly different to RFC2131: DHCPREQUEST will be sent from state
+       DHCP_REBINDING, not DHCP_BOUND */
+    dhcp_rebind(netif);
+  }
+}
+
+/**
+ * Handle a DHCP ACK packet
+ *
+ * @param netif the netif under DHCP control
+ */
+static void
+dhcp_handle_ack(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+#if LWIP_DNS
+  u8_t n;
+#endif /* LWIP_DNS */
+
+  /* clear options we might not get from the ACK */
+  ip_addr_set_zero(&dhcp->offered_sn_mask);
+  ip_addr_set_zero(&dhcp->offered_gw_addr);
+#if LWIP_DHCP_BOOTP_FILE
+  ip_addr_set_zero(&dhcp->offered_si_addr);
+#endif /* LWIP_DHCP_BOOTP_FILE */
+
+  /* lease time given? */
+  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_LEASE_TIME)) {
+    /* remember offered lease time */
+    dhcp->offered_t0_lease = dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_LEASE_TIME);
+  }
+  /* renewal period given? */
+  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_T1)) {
+    /* remember given renewal period */
+    dhcp->offered_t1_renew = dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_T1);
+  } else {
+    /* calculate safe periods for renewal */
+    dhcp->offered_t1_renew = dhcp->offered_t0_lease / 2;
+  }
+
+  /* renewal period given? */
+  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_T2)) {
+    /* remember given rebind period */
+    dhcp->offered_t2_rebind = dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_T2);
+  } else {
+    /* calculate safe periods for rebinding */
+    dhcp->offered_t2_rebind = dhcp->offered_t0_lease;
+  }
+
+  /* (y)our internet address */
+  ip_addr_copy(dhcp->offered_ip_addr, dhcp->msg_in->yiaddr);
+
+#if LWIP_DHCP_BOOTP_FILE
+  /* copy boot server address,
+     boot file name copied in dhcp_parse_reply if not overloaded */
+  ip_addr_copy(dhcp->offered_si_addr, dhcp->msg_in->siaddr);
+#endif /* LWIP_DHCP_BOOTP_FILE */
+
+  /* subnet mask given? */
+  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_SUBNET_MASK)) {
+    /* remember given subnet mask */
+    ip4_addr_set_u32(&dhcp->offered_sn_mask, htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_SUBNET_MASK)));
+    dhcp->subnet_mask_given = 1;
+  } else {
+    dhcp->subnet_mask_given = 0;
+  }
+
+  /* gateway router */
+  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_ROUTER)) {
+    ip4_addr_set_u32(&dhcp->offered_gw_addr, htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_ROUTER)));
+  }
+  
+#if LWIP_DNS
+  /* DNS servers */
+  n = 0;
+  while(dhcp_option_given(dhcp, DHCP_OPTION_IDX_DNS_SERVER + n) && (n < DNS_MAX_SERVERS)) {
+    ip_addr_t dns_addr;
+    ip4_addr_set_u32(&dns_addr, htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_DNS_SERVER + n)));
+    dns_setserver(n, &dns_addr);
+    n++;
+  }
+#endif /* LWIP_DNS */
+}
+
+/** Set a statically allocated struct dhcp to work with.
+ * Using this prevents dhcp_start to allocate it using mem_malloc.
+ *
+ * @param netif the netif for which to set the struct dhcp
+ * @param dhcp (uninitialised) dhcp struct allocated by the application
+ */
+void
+dhcp_set_struct(struct netif *netif, struct dhcp *dhcp)
+{
+  LWIP_ASSERT("netif != NULL", netif != NULL);
+  LWIP_ASSERT("dhcp != NULL", dhcp != NULL);
+  LWIP_ASSERT("netif already has a struct dhcp set", netif->dhcp == NULL);
+
+  /* clear data structure */
+  memset(dhcp, 0, sizeof(struct dhcp));
+  /* dhcp_set_state(&dhcp, DHCP_OFF); */
+  netif->dhcp = dhcp;
+}
+
+/** Removes a struct dhcp from a netif.
+ *
+ * ATTENTION: Only use this when not using dhcp_set_struct() to allocate the
+ *            struct dhcp since the memory is passed back to the heap.
+ *
+ * @param netif the netif from which to remove the struct dhcp
+ */
+void dhcp_cleanup(struct netif *netif)
+{
+  LWIP_ASSERT("netif != NULL", netif != NULL);
+
+  if (netif->dhcp != NULL) {
+    mem_free(netif->dhcp);
+    netif->dhcp = NULL;
+  }
+}
+
+/**
+ * Start DHCP negotiation for a network interface.
+ *
+ * If no DHCP client instance was attached to this interface,
+ * a new client is created first. If a DHCP client instance
+ * was already present, it restarts negotiation.
+ *
+ * @param netif The lwIP network interface
+ * @return lwIP error code
+ * - ERR_OK - No error
+ * - ERR_MEM - Out of memory
+ */
+err_t
+dhcp_start(struct netif *netif)
+{
+  struct dhcp *dhcp;
+  err_t result = ERR_OK;
+
+  LWIP_ERROR("netif != NULL", (netif != NULL), return ERR_ARG;);
+  dhcp = netif->dhcp;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_start(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
+  /* Remove the flag that says this netif is handled by DHCP,
+     it is set when we succeeded starting. */
+  netif->flags &= ~NETIF_FLAG_DHCP;
+
+  /* check hwtype of the netif */
+  if ((netif->flags & NETIF_FLAG_ETHARP) == 0) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): No ETHARP netif\n"));
+    return ERR_ARG;
+  }
+
+  /* check MTU of the netif */
+  if (netif->mtu < DHCP_MAX_MSG_LEN_MIN_REQUIRED) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): Cannot use this netif with DHCP: MTU is too small\n"));
+    return ERR_MEM;
+  }
+
+  /* no DHCP client attached yet? */
+  if (dhcp == NULL) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): starting new DHCP client\n"));
+    dhcp = (struct dhcp *)mem_malloc(sizeof(struct dhcp));
+    if (dhcp == NULL) {
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): could not allocate dhcp\n"));
+      return ERR_MEM;
+    }
+    /* store this dhcp client in the netif */
+    netif->dhcp = dhcp;
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): allocated dhcp"));
+  /* already has DHCP client attached */
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_start(): restarting DHCP configuration\n"));
+    if (dhcp->pcb != NULL) {
+      udp_remove(dhcp->pcb);
+    }
+    LWIP_ASSERT("pbuf p_out wasn't freed", dhcp->p_out == NULL);
+    LWIP_ASSERT("reply wasn't freed", dhcp->msg_in == NULL );
+  }
+    
+  /* clear data structure */
+  memset(dhcp, 0, sizeof(struct dhcp));
+  /* dhcp_set_state(&dhcp, DHCP_OFF); */
+  /* allocate UDP PCB */
+  dhcp->pcb = udp_new();
+  if (dhcp->pcb == NULL) {
+    LWIP_DEBUGF(DHCP_DEBUG  | LWIP_DBG_TRACE, ("dhcp_start(): could not obtain pcb\n"));
+    return ERR_MEM;
+  }
+  ip_set_option(dhcp->pcb, SOF_BROADCAST);
+  /* set up local and remote port for the pcb */
+  udp_bind(dhcp->pcb, IP_ADDR_ANY, DHCP_CLIENT_PORT);
+  udp_connect(dhcp->pcb, IP_ADDR_ANY, DHCP_SERVER_PORT);
+  /* set up the recv callback and argument */
+  udp_recv(dhcp->pcb, dhcp_recv, netif);
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): starting DHCP configuration\n"));
+  /* (re)start the DHCP negotiation */
+  result = dhcp_discover(netif);
+  if (result != ERR_OK) {
+    /* free resources allocated above */
+    dhcp_stop(netif);
+    return ERR_MEM;
+  }
+  /* Set the flag that says this netif is handled by DHCP. */
+  netif->flags |= NETIF_FLAG_DHCP;
+  return result;
+}
+
+/**
+ * Inform a DHCP server of our manual configuration.
+ *
+ * This informs DHCP servers of our fixed IP address configuration
+ * by sending an INFORM message. It does not involve DHCP address
+ * configuration, it is just here to be nice to the network.
+ *
+ * @param netif The lwIP network interface
+ */
+void
+dhcp_inform(struct netif *netif)
+{
+  struct dhcp dhcp;
+  err_t result = ERR_OK;
+  struct udp_pcb *pcb;
+
+  LWIP_ERROR("netif != NULL", (netif != NULL), return;);
+
+  memset(&dhcp, 0, sizeof(struct dhcp));
+  dhcp_set_state(&dhcp, DHCP_INFORM);
+
+  if ((netif->dhcp != NULL) && (netif->dhcp->pcb != NULL)) {
+    /* re-use existing pcb */
+    pcb = netif->dhcp->pcb;
+  } else {
+    pcb = udp_new();
+    if (pcb == NULL) {
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_inform(): could not obtain pcb"));
+      return;
+    }
+    dhcp.pcb = pcb;
+    ip_set_option(dhcp.pcb, SOF_BROADCAST);
+    udp_bind(dhcp.pcb, IP_ADDR_ANY, DHCP_CLIENT_PORT);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_inform(): created new udp pcb\n"));
+  }
+  /* create and initialize the DHCP message header */
+  result = dhcp_create_msg(netif, &dhcp, DHCP_INFORM);
+  if (result == ERR_OK) {
+    dhcp_option(&dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
+    dhcp_option_short(&dhcp, DHCP_MAX_MSG_LEN(netif));
+
+    dhcp_option_trailer(&dhcp);
+
+    pbuf_realloc(dhcp.p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp.options_out_len);
+
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_inform: INFORMING\n"));
+    udp_sendto_if(pcb, dhcp.p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
+    dhcp_delete_msg(&dhcp);
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_inform: could not allocate DHCP request\n"));
+  }
+
+  if (dhcp.pcb != NULL) {
+    /* otherwise, the existing pcb was used */
+    udp_remove(dhcp.pcb);
+  }
+}
+
+/** Handle a possible change in the network configuration.
+ *
+ * This enters the REBOOTING state to verify that the currently bound
+ * address is still valid.
+ */
+void
+dhcp_network_changed(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  if (!dhcp)
+    return;
+  switch (dhcp->state) {
+  case DHCP_REBINDING:
+  case DHCP_RENEWING:
+  case DHCP_BOUND:
+  case DHCP_REBOOTING:
+    netif_set_down(netif);
+    dhcp->tries = 0;
+    dhcp_reboot(netif);
+    break;
+  case DHCP_OFF:
+    /* stay off */
+    break;
+  default:
+    dhcp->tries = 0;
+#if LWIP_DHCP_AUTOIP_COOP
+    if(dhcp->autoip_coop_state == DHCP_AUTOIP_COOP_STATE_ON) {
+      autoip_stop(netif);
+      dhcp->autoip_coop_state = DHCP_AUTOIP_COOP_STATE_OFF;
+    }
+#endif /* LWIP_DHCP_AUTOIP_COOP */
+    dhcp_discover(netif);
+    break;
+  }
+}
+
+#if DHCP_DOES_ARP_CHECK
+/**
+ * Match an ARP reply with the offered IP address.
+ *
+ * @param netif the network interface on which the reply was received
+ * @param addr The IP address we received a reply from
+ */
+void dhcp_arp_reply(struct netif *netif, ip_addr_t *addr)
+{
+  LWIP_ERROR("netif != NULL", (netif != NULL), return;);
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_arp_reply()\n"));
+  /* is a DHCP client doing an ARP check? */
+  if ((netif->dhcp != NULL) && (netif->dhcp->state == DHCP_CHECKING)) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_arp_reply(): CHECKING, arp reply for 0x%08"X32_F"\n",
+      ip4_addr_get_u32(addr)));
+    /* did a host respond with the address we
+       were offered by the DHCP server? */
+    if (ip_addr_cmp(addr, &netif->dhcp->offered_ip_addr)) {
+      /* we will not accept the offered address */
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE | LWIP_DBG_LEVEL_WARNING,
+        ("dhcp_arp_reply(): arp reply matched with offered address, declining\n"));
+      dhcp_decline(netif);
+    }
+  }
+}
+
+/**
+ * Decline an offered lease.
+ *
+ * Tell the DHCP server we do not accept the offered address.
+ * One reason to decline the lease is when we find out the address
+ * is already in use by another host (through ARP).
+ *
+ * @param netif the netif under DHCP control
+ */
+static err_t
+dhcp_decline(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  err_t result = ERR_OK;
+  u16_t msecs;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_decline()\n"));
+  dhcp_set_state(dhcp, DHCP_BACKING_OFF);
+  /* create and initialize the DHCP message header */
+  result = dhcp_create_msg(netif, dhcp, DHCP_DECLINE);
+  if (result == ERR_OK) {
+    dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
+    dhcp_option_long(dhcp, ntohl(ip4_addr_get_u32(&dhcp->offered_ip_addr)));
+
+    dhcp_option_trailer(dhcp);
+    /* resize pbuf to reflect true size of options */
+    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
+
+    /* per section 4.4.4, broadcast DECLINE messages */
+    udp_sendto_if(dhcp->pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
+    dhcp_delete_msg(dhcp);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_decline: BACKING OFF\n"));
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
+      ("dhcp_decline: could not allocate DHCP request\n"));
+  }
+  dhcp->tries++;
+  msecs = 10*1000;
+  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_decline(): set request timeout %"U16_F" msecs\n", msecs));
+  return result;
+}
+#endif /* DHCP_DOES_ARP_CHECK */
+
+
+/**
+ * Start the DHCP process, discover a DHCP server.
+ *
+ * @param netif the netif under DHCP control
+ */
+static err_t
+dhcp_discover(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  err_t result = ERR_OK;
+  u16_t msecs;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover()\n"));
+  ip_addr_set_any(&dhcp->offered_ip_addr);
+  dhcp_set_state(dhcp, DHCP_SELECTING);
+  /* create and initialize the DHCP message header */
+  result = dhcp_create_msg(netif, dhcp, DHCP_DISCOVER);
+  if (result == ERR_OK) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover: making request\n"));
+
+    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
+    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN(netif));
+
+    dhcp_option(dhcp, DHCP_OPTION_PARAMETER_REQUEST_LIST, 4/*num options*/);
+    dhcp_option_byte(dhcp, DHCP_OPTION_SUBNET_MASK);
+    dhcp_option_byte(dhcp, DHCP_OPTION_ROUTER);
+    dhcp_option_byte(dhcp, DHCP_OPTION_BROADCAST);
+    dhcp_option_byte(dhcp, DHCP_OPTION_DNS_SERVER);
+
+    dhcp_option_trailer(dhcp);
+
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover: realloc()ing\n"));
+    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
+
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover: sendto(DISCOVER, IP_ADDR_BROADCAST, DHCP_SERVER_PORT)\n"));
+    udp_sendto_if(dhcp->pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover: deleting()ing\n"));
+    dhcp_delete_msg(dhcp);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_discover: SELECTING\n"));
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_discover: could not allocate DHCP request\n"));
+  }
+  dhcp->tries++;
+#if LWIP_DHCP_AUTOIP_COOP
+  if(dhcp->tries >= LWIP_DHCP_AUTOIP_COOP_TRIES && dhcp->autoip_coop_state == DHCP_AUTOIP_COOP_STATE_OFF) {
+    dhcp->autoip_coop_state = DHCP_AUTOIP_COOP_STATE_ON;
+    autoip_start(netif);
+  }
+#endif /* LWIP_DHCP_AUTOIP_COOP */
+  msecs = (dhcp->tries < 6 ? 1 << dhcp->tries : 60) * 1000;
+  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_discover(): set request timeout %"U16_F" msecs\n", msecs));
+  return result;
+}
+
+
+/**
+ * Bind the interface to the offered IP address.
+ *
+ * @param netif network interface to bind to the offered address
+ */
+static void
+dhcp_bind(struct netif *netif)
+{
+  u32_t timeout;
+  struct dhcp *dhcp;
+  ip_addr_t sn_mask, gw_addr;
+  LWIP_ERROR("dhcp_bind: netif != NULL", (netif != NULL), return;);
+  dhcp = netif->dhcp;
+  LWIP_ERROR("dhcp_bind: dhcp != NULL", (dhcp != NULL), return;);
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_bind(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
+
+  /* temporary DHCP lease? */
+  if (dhcp->offered_t1_renew != 0xffffffffUL) {
+    /* set renewal period timer */
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_bind(): t1 renewal timer %"U32_F" secs\n", dhcp->offered_t1_renew));
+    timeout = (dhcp->offered_t1_renew + DHCP_COARSE_TIMER_SECS / 2) / DHCP_COARSE_TIMER_SECS;
+    if(timeout > 0xffff) {
+      timeout = 0xffff;
+    }
+    dhcp->t1_timeout = (u16_t)timeout;
+    if (dhcp->t1_timeout == 0) {
+      dhcp->t1_timeout = 1;
+    }
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_bind(): set request timeout %"U32_F" msecs\n", dhcp->offered_t1_renew*1000));
+  }
+  /* set renewal period timer */
+  if (dhcp->offered_t2_rebind != 0xffffffffUL) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_bind(): t2 rebind timer %"U32_F" secs\n", dhcp->offered_t2_rebind));
+    timeout = (dhcp->offered_t2_rebind + DHCP_COARSE_TIMER_SECS / 2) / DHCP_COARSE_TIMER_SECS;
+    if(timeout > 0xffff) {
+      timeout = 0xffff;
+    }
+    dhcp->t2_timeout = (u16_t)timeout;
+    if (dhcp->t2_timeout == 0) {
+      dhcp->t2_timeout = 1;
+    }
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_bind(): set request timeout %"U32_F" msecs\n", dhcp->offered_t2_rebind*1000));
+  }
+
+  /* If we have sub 1 minute lease, t2 and t1 will kick in at the same time. */
+  if ((dhcp->t1_timeout >= dhcp->t2_timeout) && (dhcp->t2_timeout > 0)) {
+    dhcp->t1_timeout = 0;
+  }
+
+  if (dhcp->subnet_mask_given) {
+    /* copy offered network mask */
+    ip_addr_copy(sn_mask, dhcp->offered_sn_mask);
+  } else {
+    /* subnet mask not given, choose a safe subnet mask given the network class */
+    u8_t first_octet = ip4_addr1(&dhcp->offered_ip_addr);
+    if (first_octet <= 127) {
+      ip4_addr_set_u32(&sn_mask, PP_HTONL(0xff000000UL));
+    } else if (first_octet >= 192) {
+      ip4_addr_set_u32(&sn_mask, PP_HTONL(0xffffff00UL));
+    } else {
+      ip4_addr_set_u32(&sn_mask, PP_HTONL(0xffff0000UL));
+    }
+  }
+
+  ip_addr_copy(gw_addr, dhcp->offered_gw_addr);
+  /* gateway address not given? */
+  if (ip_addr_isany(&gw_addr)) {
+    /* copy network address */
+    ip_addr_get_network(&gw_addr, &dhcp->offered_ip_addr, &sn_mask);
+    /* use first host address on network as gateway */
+    ip4_addr_set_u32(&gw_addr, ip4_addr_get_u32(&gw_addr) | PP_HTONL(0x00000001UL));
+  }
+
+#if LWIP_DHCP_AUTOIP_COOP
+  if(dhcp->autoip_coop_state == DHCP_AUTOIP_COOP_STATE_ON) {
+    autoip_stop(netif);
+    dhcp->autoip_coop_state = DHCP_AUTOIP_COOP_STATE_OFF;
+  }
+#endif /* LWIP_DHCP_AUTOIP_COOP */
+
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_bind(): IP: 0x%08"X32_F"\n",
+    ip4_addr_get_u32(&dhcp->offered_ip_addr)));
+  netif_set_ipaddr(netif, &dhcp->offered_ip_addr);
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_bind(): SN: 0x%08"X32_F"\n",
+    ip4_addr_get_u32(&sn_mask)));
+  netif_set_netmask(netif, &sn_mask);
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_bind(): GW: 0x%08"X32_F"\n",
+    ip4_addr_get_u32(&gw_addr)));
+  netif_set_gw(netif, &gw_addr);
+  /* bring the interface up */
+  netif_set_up(netif);
+  /* netif is now bound to DHCP leased address */
+  dhcp_set_state(dhcp, DHCP_BOUND);
+}
+
+/**
+ * Renew an existing DHCP lease at the involved DHCP server.
+ *
+ * @param netif network interface which must renew its lease
+ */
+err_t
+dhcp_renew(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  err_t result;
+  u16_t msecs;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_renew()\n"));
+  dhcp_set_state(dhcp, DHCP_RENEWING);
+
+  /* create and initialize the DHCP message header */
+  result = dhcp_create_msg(netif, dhcp, DHCP_REQUEST);
+  if (result == ERR_OK) {
+    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
+    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN(netif));
+
+#if 0
+    dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
+    dhcp_option_long(dhcp, ntohl(dhcp->offered_ip_addr.addr));
+#endif
+
+#if 0
+    dhcp_option(dhcp, DHCP_OPTION_SERVER_ID, 4);
+    dhcp_option_long(dhcp, ntohl(dhcp->server_ip_addr.addr));
+#endif
+
+#if LWIP_NETIF_HOSTNAME
+    dhcp_option_hostname(dhcp, netif);
+#endif /* LWIP_NETIF_HOSTNAME */
+
+    /* append DHCP message trailer */
+    dhcp_option_trailer(dhcp);
+
+    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
+
+    udp_sendto_if(dhcp->pcb, dhcp->p_out, &dhcp->server_ip_addr, DHCP_SERVER_PORT, netif);
+    dhcp_delete_msg(dhcp);
+
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_renew: RENEWING\n"));
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_renew: could not allocate DHCP request\n"));
+  }
+  dhcp->tries++;
+  /* back-off on retries, but to a maximum of 20 seconds */
+  msecs = dhcp->tries < 10 ? dhcp->tries * 2000 : 20 * 1000;
+  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_renew(): set request timeout %"U16_F" msecs\n", msecs));
+  return result;
+}
+
+/**
+ * Rebind with a DHCP server for an existing DHCP lease.
+ *
+ * @param netif network interface which must rebind with a DHCP server
+ */
+static err_t
+dhcp_rebind(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  err_t result;
+  u16_t msecs;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_rebind()\n"));
+  dhcp_set_state(dhcp, DHCP_REBINDING);
+
+  /* create and initialize the DHCP message header */
+  result = dhcp_create_msg(netif, dhcp, DHCP_REQUEST);
+  if (result == ERR_OK) {
+    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
+    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN(netif));
+
+#if LWIP_NETIF_HOSTNAME
+    dhcp_option_hostname(dhcp, netif);
+#endif /* LWIP_NETIF_HOSTNAME */
+
+#if 0
+    dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
+    dhcp_option_long(dhcp, ntohl(dhcp->offered_ip_addr.addr));
+
+    dhcp_option(dhcp, DHCP_OPTION_SERVER_ID, 4);
+    dhcp_option_long(dhcp, ntohl(dhcp->server_ip_addr.addr));
+#endif
+
+    dhcp_option_trailer(dhcp);
+
+    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
+
+    /* broadcast to server */
+    udp_sendto_if(dhcp->pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
+    dhcp_delete_msg(dhcp);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_rebind: REBINDING\n"));
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_rebind: could not allocate DHCP request\n"));
+  }
+  dhcp->tries++;
+  msecs = dhcp->tries < 10 ? dhcp->tries * 1000 : 10 * 1000;
+  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_rebind(): set request timeout %"U16_F" msecs\n", msecs));
+  return result;
+}
+
+/**
+ * Enter REBOOTING state to verify an existing lease
+ *
+ * @param netif network interface which must reboot
+ */
+static err_t
+dhcp_reboot(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  err_t result;
+  u16_t msecs;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_reboot()\n"));
+  dhcp_set_state(dhcp, DHCP_REBOOTING);
+
+  /* create and initialize the DHCP message header */
+  result = dhcp_create_msg(netif, dhcp, DHCP_REQUEST);
+  if (result == ERR_OK) {
+    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
+    dhcp_option_short(dhcp, 576);
+
+    dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
+    dhcp_option_long(dhcp, ntohl(ip4_addr_get_u32(&dhcp->offered_ip_addr)));
+
+    dhcp_option_trailer(dhcp);
+
+    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
+
+    /* broadcast to server */
+    udp_sendto_if(dhcp->pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
+    dhcp_delete_msg(dhcp);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_reboot: REBOOTING\n"));
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_reboot: could not allocate DHCP request\n"));
+  }
+  dhcp->tries++;
+  msecs = dhcp->tries < 10 ? dhcp->tries * 1000 : 10 * 1000;
+  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_reboot(): set request timeout %"U16_F" msecs\n", msecs));
+  return result;
+}
+
+
+/**
+ * Release a DHCP lease.
+ *
+ * @param netif network interface which must release its lease
+ */
+err_t
+dhcp_release(struct netif *netif)
+{
+  struct dhcp *dhcp = netif->dhcp;
+  err_t result;
+  u16_t msecs;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_release()\n"));
+
+  /* idle DHCP client */
+  dhcp_set_state(dhcp, DHCP_OFF);
+  /* clean old DHCP offer */
+  ip_addr_set_zero(&dhcp->server_ip_addr);
+  ip_addr_set_zero(&dhcp->offered_ip_addr);
+  ip_addr_set_zero(&dhcp->offered_sn_mask);
+  ip_addr_set_zero(&dhcp->offered_gw_addr);
+#if LWIP_DHCP_BOOTP_FILE
+  ip_addr_set_zero(&dhcp->offered_si_addr);
+#endif /* LWIP_DHCP_BOOTP_FILE */
+  dhcp->offered_t0_lease = dhcp->offered_t1_renew = dhcp->offered_t2_rebind = 0;
+  
+  /* create and initialize the DHCP message header */
+  result = dhcp_create_msg(netif, dhcp, DHCP_RELEASE);
+  if (result == ERR_OK) {
+    dhcp_option_trailer(dhcp);
+
+    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
+
+    udp_sendto_if(dhcp->pcb, dhcp->p_out, &dhcp->server_ip_addr, DHCP_SERVER_PORT, netif);
+    dhcp_delete_msg(dhcp);
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_release: RELEASED, DHCP_OFF\n"));
+  } else {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_release: could not allocate DHCP request\n"));
+  }
+  dhcp->tries++;
+  msecs = dhcp->tries < 10 ? dhcp->tries * 1000 : 10 * 1000;
+  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_release(): set request timeout %"U16_F" msecs\n", msecs));
+  /* bring the interface down */
+  netif_set_down(netif);
+  /* remove IP address from interface */
+  netif_set_ipaddr(netif, IP_ADDR_ANY);
+  netif_set_gw(netif, IP_ADDR_ANY);
+  netif_set_netmask(netif, IP_ADDR_ANY);
+  
+  return result;
+}
+
+/**
+ * Remove the DHCP client from the interface.
+ *
+ * @param netif The network interface to stop DHCP on
+ */
+void
+dhcp_stop(struct netif *netif)
+{
+  struct dhcp *dhcp;
+  LWIP_ERROR("dhcp_stop: netif != NULL", (netif != NULL), return;);
+  dhcp = netif->dhcp;
+  /* Remove the flag that says this netif is handled by DHCP. */
+  netif->flags &= ~NETIF_FLAG_DHCP;
+
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_stop()\n"));
+  /* netif is DHCP configured? */
+  if (dhcp != NULL) {
+#if LWIP_DHCP_AUTOIP_COOP
+    if(dhcp->autoip_coop_state == DHCP_AUTOIP_COOP_STATE_ON) {
+      autoip_stop(netif);
+      dhcp->autoip_coop_state = DHCP_AUTOIP_COOP_STATE_OFF;
+    }
+#endif /* LWIP_DHCP_AUTOIP_COOP */
+
+    if (dhcp->pcb != NULL) {
+      udp_remove(dhcp->pcb);
+      dhcp->pcb = NULL;
+    }
+    LWIP_ASSERT("reply wasn't freed", dhcp->msg_in == NULL);
+    dhcp_set_state(dhcp, DHCP_OFF);
+  }
+}
+
+/*
+ * Set the DHCP state of a DHCP client.
+ *
+ * If the state changed, reset the number of tries.
+ */
+static void
+dhcp_set_state(struct dhcp *dhcp, u8_t new_state)
+{
+  if (new_state != dhcp->state) {
+    dhcp->state = new_state;
+    dhcp->tries = 0;
+    dhcp->request_timeout = 0;
+  }
+}
+
+/*
+ * Concatenate an option type and length field to the outgoing
+ * DHCP message.
+ *
+ */
+static void
+dhcp_option(struct dhcp *dhcp, u8_t option_type, u8_t option_len)
+{
+  LWIP_ASSERT("dhcp_option: dhcp->options_out_len + 2 + option_len <= DHCP_OPTIONS_LEN", dhcp->options_out_len + 2U + option_len <= DHCP_OPTIONS_LEN);
+  dhcp->msg_out->options[dhcp->options_out_len++] = option_type;
+  dhcp->msg_out->options[dhcp->options_out_len++] = option_len;
+}
+/*
+ * Concatenate a single byte to the outgoing DHCP message.
+ *
+ */
+static void
+dhcp_option_byte(struct dhcp *dhcp, u8_t value)
+{
+  LWIP_ASSERT("dhcp_option_byte: dhcp->options_out_len < DHCP_OPTIONS_LEN", dhcp->options_out_len < DHCP_OPTIONS_LEN);
+  dhcp->msg_out->options[dhcp->options_out_len++] = value;
+}
+
+static void
+dhcp_option_short(struct dhcp *dhcp, u16_t value)
+{
+  LWIP_ASSERT("dhcp_option_short: dhcp->options_out_len + 2 <= DHCP_OPTIONS_LEN", dhcp->options_out_len + 2U <= DHCP_OPTIONS_LEN);
+  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0xff00U) >> 8);
+  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t) (value & 0x00ffU);
+}
+
+static void
+dhcp_option_long(struct dhcp *dhcp, u32_t value)
+{
+  LWIP_ASSERT("dhcp_option_long: dhcp->options_out_len + 4 <= DHCP_OPTIONS_LEN", dhcp->options_out_len + 4U <= DHCP_OPTIONS_LEN);
+  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0xff000000UL) >> 24);
+  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0x00ff0000UL) >> 16);
+  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0x0000ff00UL) >> 8);
+  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0x000000ffUL));
+}
+
+#if LWIP_NETIF_HOSTNAME
+static void
+dhcp_option_hostname(struct dhcp *dhcp, struct netif *netif)
+{
+  if (netif->hostname != NULL) {
+    size_t namelen = strlen(netif->hostname);
+    if (namelen > 0) {
+      u8_t len;
+      const char *p = netif->hostname;
+      /* Shrink len to available bytes (need 2 bytes for OPTION_HOSTNAME
+         and 1 byte for trailer) */
+      size_t available = DHCP_OPTIONS_LEN - dhcp->options_out_len - 3;
+      LWIP_ASSERT("DHCP: hostname is too long!", namelen <= available);
+      len = LWIP_MIN(namelen, available);
+      dhcp_option(dhcp, DHCP_OPTION_HOSTNAME, len);
+      while (len--) {
+        dhcp_option_byte(dhcp, *p++);
+      }
+    }
+  }
+}
+#endif /* LWIP_NETIF_HOSTNAME */
+
+/**
+ * Extract the DHCP message and the DHCP options.
+ *
+ * Extract the DHCP message and the DHCP options, each into a contiguous
+ * piece of memory. As a DHCP message is variable sized by its options,
+ * and also allows overriding some fields for options, the easy approach
+ * is to first unfold the options into a conitguous piece of memory, and
+ * use that further on.
+ *
+ */
+static err_t
+dhcp_parse_reply(struct dhcp *dhcp, struct pbuf *p)
+{
+  u8_t *options;
+  u16_t offset;
+  u16_t offset_max;
+  u16_t options_idx;
+  u16_t options_idx_max;
+  struct pbuf *q;
+  int parse_file_as_options = 0;
+  int parse_sname_as_options = 0;
+
+  /* clear received options */
+  dhcp_clear_all_options(dhcp);
+  /* check that beginning of dhcp_msg (up to and including chaddr) is in first pbuf */
+  if (p->len < DHCP_SNAME_OFS) {
+    return ERR_BUF;
+  }
+  dhcp->msg_in = (struct dhcp_msg *)p->payload;
+#if LWIP_DHCP_BOOTP_FILE
+  /* clear boot file name */
+  dhcp->boot_file_name[0] = 0;
+#endif /* LWIP_DHCP_BOOTP_FILE */
+
+  /* parse options */
+
+  /* start with options field */
+  options_idx = DHCP_OPTIONS_OFS;
+  /* parse options to the end of the received packet */
+  options_idx_max = p->tot_len;
+again:
+  q = p;
+  while((q != NULL) && (options_idx >= q->len)) {
+    options_idx -= q->len;
+    options_idx_max -= q->len;
+    q = q->next;
+  }
+  if (q == NULL) {
+    return ERR_BUF;
+  }
+  offset = options_idx;
+  offset_max = options_idx_max;
+  options = (u8_t*)q->payload;
+  /* at least 1 byte to read and no end marker, then at least 3 bytes to read? */
+  while((q != NULL) && (options[offset] != DHCP_OPTION_END) && (offset < offset_max)) {
+    u8_t op = options[offset];
+    u8_t len;
+    u8_t decode_len = 0;
+    int decode_idx = -1;
+    u16_t val_offset = offset + 2;
+    /* len byte might be in the next pbuf */
+    if (offset + 1 < q->len) {
+      len = options[offset + 1];
+    } else {
+      len = (q->next != NULL ? ((u8_t*)q->next->payload)[0] : 0);
+    }
+    /* LWIP_DEBUGF(DHCP_DEBUG, ("msg_offset=%"U16_F", q->len=%"U16_F, msg_offset, q->len)); */
+    decode_len = len;
+    switch(op) {
+      /* case(DHCP_OPTION_END): handled above */
+      case(DHCP_OPTION_PAD):
+        /* special option: no len encoded */
+        decode_len = len = 0;
+        /* will be increased below */
+        offset--;
+        break;
+      case(DHCP_OPTION_SUBNET_MASK):
+        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_SUBNET_MASK;
+        break;
+      case(DHCP_OPTION_ROUTER):
+        decode_len = 4; /* only copy the first given router */
+        LWIP_ERROR("len >= decode_len", len >= decode_len, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_ROUTER;
+        break;
+      case(DHCP_OPTION_DNS_SERVER):
+        /* special case: there might be more than one server */
+        LWIP_ERROR("len % 4 == 0", len % 4 == 0, return ERR_VAL;);
+        /* limit number of DNS servers */
+        decode_len = LWIP_MIN(len, 4 * DNS_MAX_SERVERS);
+        LWIP_ERROR("len >= decode_len", len >= decode_len, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_DNS_SERVER;
+        break;
+      case(DHCP_OPTION_LEASE_TIME):
+        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_LEASE_TIME;
+        break;
+      case(DHCP_OPTION_OVERLOAD):
+        LWIP_ERROR("len == 1", len == 1, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_OVERLOAD;
+        break;
+      case(DHCP_OPTION_MESSAGE_TYPE):
+        LWIP_ERROR("len == 1", len == 1, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_MSG_TYPE;
+        break;
+      case(DHCP_OPTION_SERVER_ID):
+        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_SERVER_ID;
+        break;
+      case(DHCP_OPTION_T1):
+        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_T1;
+        break;
+      case(DHCP_OPTION_T2):
+        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
+        decode_idx = DHCP_OPTION_IDX_T2;
+        break;
+      default:
+        decode_len = 0;
+        LWIP_DEBUGF(DHCP_DEBUG, ("skipping option %"U16_F" in options\n", op));
+        break;
+    }
+    offset += len + 2;
+    if (decode_len > 0) {
+      u32_t value = 0;
+      u16_t copy_len;
+decode_next:
+      LWIP_ASSERT("check decode_idx", decode_idx >= 0 && decode_idx < DHCP_OPTION_IDX_MAX);
+      if (!dhcp_option_given(dhcp, decode_idx)) {
+        copy_len = LWIP_MIN(decode_len, 4);
+        pbuf_copy_partial(q, &value, copy_len, val_offset);
+        if (decode_len > 4) {
+          /* decode more than one u32_t */
+          LWIP_ERROR("decode_len % 4 == 0", decode_len % 4 == 0, return ERR_VAL;);
+          dhcp_got_option(dhcp, decode_idx);
+          dhcp_set_option_value(dhcp, decode_idx, htonl(value));
+          decode_len -= 4;
+          val_offset += 4;
+          decode_idx++;
+          goto decode_next;
+        } else if (decode_len == 4) {
+          value = ntohl(value);
+        } else {
+          LWIP_ERROR("invalid decode_len", decode_len == 1, return ERR_VAL;);
+          value = ((u8_t*)&value)[0];
+        }
+        dhcp_got_option(dhcp, decode_idx);
+        dhcp_set_option_value(dhcp, decode_idx, value);
+      }
+    }
+    if (offset >= q->len) {
+      offset -= q->len;
+      offset_max -= q->len;
+      if ((offset < offset_max) && offset_max) {
+        q = q->next;
+        LWIP_ASSERT("next pbuf was null", q);
+        options = (u8_t*)q->payload;
+      } else {
+        /* We've run out of bytes, probably no end marker. Don't proceed. */
+        break;
+      }
+    }
+  }
+  /* is this an overloaded message? */
+  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_OVERLOAD)) {
+    u32_t overload = dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_OVERLOAD);
+    dhcp_clear_option(dhcp, DHCP_OPTION_IDX_OVERLOAD);
+    if (overload == DHCP_OVERLOAD_FILE) {
+      parse_file_as_options = 1;
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("overloaded file field\n"));
+    } else if (overload == DHCP_OVERLOAD_SNAME) {
+      parse_sname_as_options = 1;
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("overloaded sname field\n"));
+    } else if (overload == DHCP_OVERLOAD_SNAME_FILE) {
+      parse_sname_as_options = 1;
+      parse_file_as_options = 1;
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("overloaded sname and file field\n"));
+    } else {
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("invalid overload option: %d\n", (int)overload));
+    }
+#if LWIP_DHCP_BOOTP_FILE
+    if (!parse_file_as_options) {
+      /* only do this for ACK messages */
+      if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_MSG_TYPE) &&
+        (dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_MSG_TYPE) == DHCP_ACK))
+      /* copy bootp file name, don't care for sname (server hostname) */
+      pbuf_copy_partial(p, dhcp->boot_file_name, DHCP_FILE_LEN-1, DHCP_FILE_OFS);
+      /* make sure the string is really NULL-terminated */
+      dhcp->boot_file_name[DHCP_FILE_LEN-1] = 0;
+    }
+#endif /* LWIP_DHCP_BOOTP_FILE */
+  }
+  if (parse_file_as_options) {
+    /* if both are overloaded, parse file first and then sname (RFC 2131 ch. 4.1) */
+    parse_file_as_options = 0;
+    options_idx = DHCP_FILE_OFS;
+    options_idx_max = DHCP_FILE_OFS + DHCP_FILE_LEN;
+    goto again;
+  } else if (parse_sname_as_options) {
+    parse_sname_as_options = 0;
+    options_idx = DHCP_SNAME_OFS;
+    options_idx_max = DHCP_SNAME_OFS + DHCP_SNAME_LEN;
+    goto again;
+  }
+  return ERR_OK;
+}
+
+/**
+ * If an incoming DHCP message is in response to us, then trigger the state machine
+ */
+static void
+dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
+{
+  struct netif *netif = (struct netif *)arg;
+  struct dhcp *dhcp = netif->dhcp;
+  struct dhcp_msg *reply_msg = (struct dhcp_msg *)p->payload;
+  u8_t msg_type;
+  u8_t i;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_recv(pbuf = %p) from DHCP server %"U16_F".%"U16_F".%"U16_F".%"U16_F" port %"U16_F"\n", (void*)p,
+    ip4_addr1_16(addr), ip4_addr2_16(addr), ip4_addr3_16(addr), ip4_addr4_16(addr), port));
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("pbuf->len = %"U16_F"\n", p->len));
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("pbuf->tot_len = %"U16_F"\n", p->tot_len));
+  /* prevent warnings about unused arguments */
+  LWIP_UNUSED_ARG(pcb);
+  LWIP_UNUSED_ARG(addr);
+  LWIP_UNUSED_ARG(port);
+
+  LWIP_ASSERT("reply wasn't freed", dhcp->msg_in == NULL);
+
+  if (p->len < DHCP_MIN_REPLY_LEN) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("DHCP reply message or pbuf too short\n"));
+    goto free_pbuf_and_return;
+  }
+
+  if (reply_msg->op != DHCP_BOOTREPLY) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("not a DHCP reply message, but type %"U16_F"\n", (u16_t)reply_msg->op));
+    goto free_pbuf_and_return;
+  }
+  /* iterate through hardware address and match against DHCP message */
+  for (i = 0; i < netif->hwaddr_len; i++) {
+    if (netif->hwaddr[i] != reply_msg->chaddr[i]) {
+      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
+        ("netif->hwaddr[%"U16_F"]==%02"X16_F" != reply_msg->chaddr[%"U16_F"]==%02"X16_F"\n",
+        (u16_t)i, (u16_t)netif->hwaddr[i], (u16_t)i, (u16_t)reply_msg->chaddr[i]));
+      goto free_pbuf_and_return;
+    }
+  }
+  /* match transaction ID against what we expected */
+  if (ntohl(reply_msg->xid) != dhcp->xid) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
+      ("transaction id mismatch reply_msg->xid(%"X32_F")!=dhcp->xid(%"X32_F")\n",ntohl(reply_msg->xid),dhcp->xid));
+    goto free_pbuf_and_return;
+  }
+  /* option fields could be unfold? */
+  if (dhcp_parse_reply(dhcp, p) != ERR_OK) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
+      ("problem unfolding DHCP message - too short on memory?\n"));
+    goto free_pbuf_and_return;
+  }
+
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("searching DHCP_OPTION_MESSAGE_TYPE\n"));
+  /* obtain pointer to DHCP message type */
+  if (!dhcp_option_given(dhcp, DHCP_OPTION_IDX_MSG_TYPE)) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("DHCP_OPTION_MESSAGE_TYPE option not found\n"));
+    goto free_pbuf_and_return;
+  }
+
+  /* read DHCP message type */
+  msg_type = (u8_t)dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_MSG_TYPE);
+  /* message type is DHCP ACK? */
+  if (msg_type == DHCP_ACK) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("DHCP_ACK received\n"));
+    /* in requesting state? */
+    if (dhcp->state == DHCP_REQUESTING) {
+      dhcp_handle_ack(netif);
+#if DHCP_DOES_ARP_CHECK
+      /* check if the acknowledged lease address is already in use */
+      dhcp_check(netif);
+#else
+      /* bind interface to the acknowledged lease address */
+      dhcp_bind(netif);
+#endif
+    }
+    /* already bound to the given lease address? */
+    else if ((dhcp->state == DHCP_REBOOTING) || (dhcp->state == DHCP_REBINDING) || (dhcp->state == DHCP_RENEWING)) {
+      dhcp_bind(netif);
+    }
+  }
+  /* received a DHCP_NAK in appropriate state? */
+  else if ((msg_type == DHCP_NAK) &&
+    ((dhcp->state == DHCP_REBOOTING) || (dhcp->state == DHCP_REQUESTING) ||
+     (dhcp->state == DHCP_REBINDING) || (dhcp->state == DHCP_RENEWING  ))) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("DHCP_NAK received\n"));
+    dhcp_handle_nak(netif);
+  }
+  /* received a DHCP_OFFER in DHCP_SELECTING state? */
+  else if ((msg_type == DHCP_OFFER) && (dhcp->state == DHCP_SELECTING)) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("DHCP_OFFER received in DHCP_SELECTING state\n"));
+    dhcp->request_timeout = 0;
+    /* remember offered lease */
+    dhcp_handle_offer(netif);
+  }
+free_pbuf_and_return:
+  dhcp->msg_in = NULL;
+  pbuf_free(p);
+}
+
+/**
+ * Create a DHCP request, fill in common headers
+ *
+ * @param netif the netif under DHCP control
+ * @param dhcp dhcp control struct
+ * @param message_type message type of the request
+ */
+static err_t
+dhcp_create_msg(struct netif *netif, struct dhcp *dhcp, u8_t message_type)
+{
+  u16_t i;
+#ifndef DHCP_GLOBAL_XID
+  /** default global transaction identifier starting value (easy to match
+   *  with a packet analyser). We simply increment for each new request.
+   *  Predefine DHCP_GLOBAL_XID to a better value or a function call to generate one
+   *  at runtime, any supporting function prototypes can be defined in DHCP_GLOBAL_XID_HEADER */
+#if DHCP_CREATE_RAND_XID && defined(LWIP_RAND)
+  static u32_t xid;
+#else /* DHCP_CREATE_RAND_XID && defined(LWIP_RAND) */
+  static u32_t xid = 0xABCD0000;
+#endif /* DHCP_CREATE_RAND_XID && defined(LWIP_RAND) */
+#else
+  if (!xid_initialised) {
+    xid = DHCP_GLOBAL_XID;
+    xid_initialised = !xid_initialised;
+  }
+#endif
+  LWIP_ERROR("dhcp_create_msg: netif != NULL", (netif != NULL), return ERR_ARG;);
+  LWIP_ERROR("dhcp_create_msg: dhcp != NULL", (dhcp != NULL), return ERR_VAL;);
+  LWIP_ASSERT("dhcp_create_msg: dhcp->p_out == NULL", dhcp->p_out == NULL);
+  LWIP_ASSERT("dhcp_create_msg: dhcp->msg_out == NULL", dhcp->msg_out == NULL);
+  dhcp->p_out = pbuf_alloc(PBUF_TRANSPORT, sizeof(struct dhcp_msg), PBUF_RAM);
+  if (dhcp->p_out == NULL) {
+    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
+      ("dhcp_create_msg(): could not allocate pbuf\n"));
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("dhcp_create_msg: check that first pbuf can hold struct dhcp_msg",
+           (dhcp->p_out->len >= sizeof(struct dhcp_msg)));
+
+  /* reuse transaction identifier in retransmissions */
+  if (dhcp->tries == 0) {
+#if DHCP_CREATE_RAND_XID && defined(LWIP_RAND)
+    xid = LWIP_RAND();
+#else /* DHCP_CREATE_RAND_XID && defined(LWIP_RAND) */
+    xid++;
+#endif /* DHCP_CREATE_RAND_XID && defined(LWIP_RAND) */
+  }
+  dhcp->xid = xid;
+  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE,
+              ("transaction id xid(%"X32_F")\n", xid));
+
+  dhcp->msg_out = (struct dhcp_msg *)dhcp->p_out->payload;
+
+  dhcp->msg_out->op = DHCP_BOOTREQUEST;
+  /* TODO: make link layer independent */
+  dhcp->msg_out->htype = DHCP_HTYPE_ETH;
+  dhcp->msg_out->hlen = netif->hwaddr_len;
+  dhcp->msg_out->hops = 0;
+  dhcp->msg_out->xid = htonl(dhcp->xid);
+  dhcp->msg_out->secs = 0;
+  /* we don't need the broadcast flag since we can receive unicast traffic
+     before being fully configured! */
+  dhcp->msg_out->flags = 0;
+  ip_addr_set_zero(&dhcp->msg_out->ciaddr);
+  /* set ciaddr to netif->ip_addr based on message_type and state */
+  if ((message_type == DHCP_INFORM) || (message_type == DHCP_DECLINE) ||
+      ((message_type == DHCP_REQUEST) && /* DHCP_BOUND not used for sending! */
+       ((dhcp->state==DHCP_RENEWING) || dhcp->state==DHCP_REBINDING))) {
+    ip_addr_copy(dhcp->msg_out->ciaddr, netif->ip_addr);
+  }
+  ip_addr_set_zero(&dhcp->msg_out->yiaddr);
+  ip_addr_set_zero(&dhcp->msg_out->siaddr);
+  ip_addr_set_zero(&dhcp->msg_out->giaddr);
+  for (i = 0; i < DHCP_CHADDR_LEN; i++) {
+    /* copy netif hardware address, pad with zeroes */
+    dhcp->msg_out->chaddr[i] = (i < netif->hwaddr_len) ? netif->hwaddr[i] : 0/* pad byte*/;
+  }
+  for (i = 0; i < DHCP_SNAME_LEN; i++) {
+    dhcp->msg_out->sname[i] = 0;
+  }
+  for (i = 0; i < DHCP_FILE_LEN; i++) {
+    dhcp->msg_out->file[i] = 0;
+  }
+  dhcp->msg_out->cookie = PP_HTONL(DHCP_MAGIC_COOKIE);
+  dhcp->options_out_len = 0;
+  /* fill options field with an incrementing array (for debugging purposes) */
+  for (i = 0; i < DHCP_OPTIONS_LEN; i++) {
+    dhcp->msg_out->options[i] = (u8_t)i; /* for debugging only, no matter if truncated */
+  }
+  /* Add option MESSAGE_TYPE */
+  dhcp_option(dhcp, DHCP_OPTION_MESSAGE_TYPE, DHCP_OPTION_MESSAGE_TYPE_LEN);
+  dhcp_option_byte(dhcp, message_type);
+  return ERR_OK;
+}
+
+/**
+ * Free previously allocated memory used to send a DHCP request.
+ *
+ * @param dhcp the dhcp struct to free the request from
+ */
+static void
+dhcp_delete_msg(struct dhcp *dhcp)
+{
+  LWIP_ERROR("dhcp_delete_msg: dhcp != NULL", (dhcp != NULL), return;);
+  LWIP_ASSERT("dhcp_delete_msg: dhcp->p_out != NULL", dhcp->p_out != NULL);
+  LWIP_ASSERT("dhcp_delete_msg: dhcp->msg_out != NULL", dhcp->msg_out != NULL);
+  if (dhcp->p_out != NULL) {
+    pbuf_free(dhcp->p_out);
+  }
+  dhcp->p_out = NULL;
+  dhcp->msg_out = NULL;
+}
+
+/**
+ * Add a DHCP message trailer
+ *
+ * Adds the END option to the DHCP message, and if
+ * necessary, up to three padding bytes.
+ *
+ * @param dhcp DHCP state structure
+ */
+static void
+dhcp_option_trailer(struct dhcp *dhcp)
+{
+  LWIP_ERROR("dhcp_option_trailer: dhcp != NULL", (dhcp != NULL), return;);
+  LWIP_ASSERT("dhcp_option_trailer: dhcp->msg_out != NULL\n", dhcp->msg_out != NULL);
+  LWIP_ASSERT("dhcp_option_trailer: dhcp->options_out_len < DHCP_OPTIONS_LEN\n", dhcp->options_out_len < DHCP_OPTIONS_LEN);
+  dhcp->msg_out->options[dhcp->options_out_len++] = DHCP_OPTION_END;
+  /* packet is too small, or not 4 byte aligned? */
+  while (((dhcp->options_out_len < DHCP_MIN_OPTIONS_LEN) || (dhcp->options_out_len & 3)) &&
+         (dhcp->options_out_len < DHCP_OPTIONS_LEN)) {
+    /* add a fill/padding byte */
+    dhcp->msg_out->options[dhcp->options_out_len++] = 0;
+  }
+}
+
+#endif /* LWIP_DHCP */
diff --git a/ext/lwip/src/core/dns.c b/ext/lwip/src/core/dns.c
new file mode 100644
index 000000000..d63361226
--- /dev/null
+++ b/ext/lwip/src/core/dns.c
@@ -0,0 +1,970 @@
+/**
+ * @file
+ * DNS - host name to IP address resolver.
+ *
+ */
+
+/**
+
+ * This file implements a DNS host name to IP address resolver.
+
+ * Port to lwIP from uIP
+ * by Jim Pettinato April 2007
+
+ * uIP version Copyright (c) 2002-2003, Adam Dunkels.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * DNS.C
+ *
+ * The lwIP DNS resolver functions are used to lookup a host name and
+ * map it to a numerical IP address. It maintains a list of resolved
+ * hostnames that can be queried with the dns_lookup() function.
+ * New hostnames can be resolved using the dns_query() function.
+ *
+ * The lwIP version of the resolver also adds a non-blocking version of
+ * gethostbyname() that will work with a raw API application. This function
+ * checks for an IP address string first and converts it if it is valid.
+ * gethostbyname() then does a dns_lookup() to see if the name is 
+ * already in the table. If so, the IP is returned. If not, a query is 
+ * issued and the function returns with a ERR_INPROGRESS status. The app
+ * using the dns client must then go into a waiting state.
+ *
+ * Once a hostname has been resolved (or found to be non-existent),
+ * the resolver code calls a specified callback function (which 
+ * must be implemented by the module that uses the resolver).
+ */
+
+/*-----------------------------------------------------------------------------
+ * RFC 1035 - Domain names - implementation and specification
+ * RFC 2181 - Clarifications to the DNS Specification
+ *----------------------------------------------------------------------------*/
+
+/** @todo: define good default values (rfc compliance) */
+/** @todo: improve answer parsing, more checkings... */
+/** @todo: check RFC1035 - 7.3. Processing responses */
+
+/*-----------------------------------------------------------------------------
+ * Includes
+ *----------------------------------------------------------------------------*/
+
+#include "lwip/opt.h"
+
+#if LWIP_DNS /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/udp.h"
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+#include "lwip/dns.h"
+
+#include <string.h>
+
+/** DNS server IP address */
+#ifndef DNS_SERVER_ADDRESS
+#define DNS_SERVER_ADDRESS(ipaddr)        (ip4_addr_set_u32(ipaddr, ipaddr_addr("208.67.222.222"))) /* resolver1.opendns.com */
+#endif
+
+/** DNS server port address */
+#ifndef DNS_SERVER_PORT
+#define DNS_SERVER_PORT           53
+#endif
+
+/** DNS maximum number of retries when asking for a name, before "timeout". */
+#ifndef DNS_MAX_RETRIES
+#define DNS_MAX_RETRIES           4
+#endif
+
+/** DNS resource record max. TTL (one week as default) */
+#ifndef DNS_MAX_TTL
+#define DNS_MAX_TTL               604800
+#endif
+
+/* DNS protocol flags */
+#define DNS_FLAG1_RESPONSE        0x80
+#define DNS_FLAG1_OPCODE_STATUS   0x10
+#define DNS_FLAG1_OPCODE_INVERSE  0x08
+#define DNS_FLAG1_OPCODE_STANDARD 0x00
+#define DNS_FLAG1_AUTHORATIVE     0x04
+#define DNS_FLAG1_TRUNC           0x02
+#define DNS_FLAG1_RD              0x01
+#define DNS_FLAG2_RA              0x80
+#define DNS_FLAG2_ERR_MASK        0x0f
+#define DNS_FLAG2_ERR_NONE        0x00
+#define DNS_FLAG2_ERR_NAME        0x03
+
+/* DNS protocol states */
+#define DNS_STATE_UNUSED          0
+#define DNS_STATE_NEW             1
+#define DNS_STATE_ASKING          2
+#define DNS_STATE_DONE            3
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+/** DNS message header */
+struct dns_hdr {
+  PACK_STRUCT_FIELD(u16_t id);
+  PACK_STRUCT_FIELD(u8_t flags1);
+  PACK_STRUCT_FIELD(u8_t flags2);
+  PACK_STRUCT_FIELD(u16_t numquestions);
+  PACK_STRUCT_FIELD(u16_t numanswers);
+  PACK_STRUCT_FIELD(u16_t numauthrr);
+  PACK_STRUCT_FIELD(u16_t numextrarr);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+#define SIZEOF_DNS_HDR 12
+
+/** DNS query message structure.
+    No packing needed: only used locally on the stack. */
+struct dns_query {
+  /* DNS query record starts with either a domain name or a pointer
+     to a name already present somewhere in the packet. */
+  u16_t type;
+  u16_t cls;
+};
+#define SIZEOF_DNS_QUERY 4
+
+/** DNS answer message structure.
+    No packing needed: only used locally on the stack. */
+struct dns_answer {
+  /* DNS answer record starts with either a domain name or a pointer
+     to a name already present somewhere in the packet. */
+  u16_t type;
+  u16_t cls;
+  u32_t ttl;
+  u16_t len;
+};
+#define SIZEOF_DNS_ANSWER 10
+
+/** DNS table entry */
+struct dns_table_entry {
+  u8_t  state;
+  u8_t  numdns;
+  u8_t  tmr;
+  u8_t  retries;
+  u8_t  seqno;
+  u8_t  err;
+  u32_t ttl;
+  char name[DNS_MAX_NAME_LENGTH];
+  ip_addr_t ipaddr;
+  /* pointer to callback on DNS query done */
+  dns_found_callback found;
+  void *arg;
+};
+
+#if DNS_LOCAL_HOSTLIST
+
+#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
+/** Local host-list. For hostnames in this list, no
+ *  external name resolution is performed */
+static struct local_hostlist_entry *local_hostlist_dynamic;
+#else /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
+
+/** Defining this allows the local_hostlist_static to be placed in a different
+ * linker section (e.g. FLASH) */
+#ifndef DNS_LOCAL_HOSTLIST_STORAGE_PRE
+#define DNS_LOCAL_HOSTLIST_STORAGE_PRE static
+#endif /* DNS_LOCAL_HOSTLIST_STORAGE_PRE */
+/** Defining this allows the local_hostlist_static to be placed in a different
+ * linker section (e.g. FLASH) */
+#ifndef DNS_LOCAL_HOSTLIST_STORAGE_POST
+#define DNS_LOCAL_HOSTLIST_STORAGE_POST
+#endif /* DNS_LOCAL_HOSTLIST_STORAGE_POST */
+DNS_LOCAL_HOSTLIST_STORAGE_PRE struct local_hostlist_entry local_hostlist_static[]
+  DNS_LOCAL_HOSTLIST_STORAGE_POST = DNS_LOCAL_HOSTLIST_INIT;
+
+#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
+
+static void dns_init_local();
+#endif /* DNS_LOCAL_HOSTLIST */
+
+
+/* forward declarations */
+static void dns_recv(void *s, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port);
+static void dns_check_entries(void);
+
+/*-----------------------------------------------------------------------------
+ * Globales
+ *----------------------------------------------------------------------------*/
+
+/* DNS variables */
+static struct udp_pcb        *dns_pcb;
+static u8_t                   dns_seqno;
+static struct dns_table_entry dns_table[DNS_TABLE_SIZE];
+static ip_addr_t              dns_servers[DNS_MAX_SERVERS];
+/** Contiguous buffer for processing responses */
+static u8_t                   dns_payload_buffer[LWIP_MEM_ALIGN_BUFFER(DNS_MSG_SIZE)];
+static u8_t*                  dns_payload;
+
+/**
+ * Initialize the resolver: set up the UDP pcb and configure the default server
+ * (DNS_SERVER_ADDRESS).
+ */
+void
+dns_init()
+{
+  ip_addr_t dnsserver;
+
+  dns_payload = (u8_t *)LWIP_MEM_ALIGN(dns_payload_buffer);
+  
+  /* initialize default DNS server address */
+  DNS_SERVER_ADDRESS(&dnsserver);
+
+  LWIP_DEBUGF(DNS_DEBUG, ("dns_init: initializing\n"));
+
+  /* if dns client not yet initialized... */
+  if (dns_pcb == NULL) {
+    dns_pcb = udp_new();
+
+    if (dns_pcb != NULL) {
+      /* initialize DNS table not needed (initialized to zero since it is a
+       * global variable) */
+      LWIP_ASSERT("For implicit initialization to work, DNS_STATE_UNUSED needs to be 0",
+        DNS_STATE_UNUSED == 0);
+
+      /* initialize DNS client */
+      udp_bind(dns_pcb, IP_ADDR_ANY, 0);
+      udp_recv(dns_pcb, dns_recv, NULL);
+
+      /* initialize default DNS primary server */
+      dns_setserver(0, &dnsserver);
+    }
+  }
+#if DNS_LOCAL_HOSTLIST
+  dns_init_local();
+#endif
+}
+
+/**
+ * Initialize one of the DNS servers.
+ *
+ * @param numdns the index of the DNS server to set must be < DNS_MAX_SERVERS
+ * @param dnsserver IP address of the DNS server to set
+ */
+void
+dns_setserver(u8_t numdns, ip_addr_t *dnsserver)
+{
+  if ((numdns < DNS_MAX_SERVERS) && (dns_pcb != NULL) &&
+      (dnsserver != NULL) && !ip_addr_isany(dnsserver)) {
+    dns_servers[numdns] = (*dnsserver);
+  }
+}
+
+/**
+ * Obtain one of the currently configured DNS server.
+ *
+ * @param numdns the index of the DNS server
+ * @return IP address of the indexed DNS server or "ip_addr_any" if the DNS
+ *         server has not been configured.
+ */
+ip_addr_t
+dns_getserver(u8_t numdns)
+{
+  if (numdns < DNS_MAX_SERVERS) {
+    return dns_servers[numdns];
+  } else {
+    return *IP_ADDR_ANY;
+  }
+}
+
+/**
+ * The DNS resolver client timer - handle retries and timeouts and should
+ * be called every DNS_TMR_INTERVAL milliseconds (every second by default).
+ */
+void
+dns_tmr(void)
+{
+  if (dns_pcb != NULL) {
+    LWIP_DEBUGF(DNS_DEBUG, ("dns_tmr: dns_check_entries\n"));
+    dns_check_entries();
+  }
+}
+
+#if DNS_LOCAL_HOSTLIST
+static void
+dns_init_local()
+{
+#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC && defined(DNS_LOCAL_HOSTLIST_INIT)
+  int i;
+  struct local_hostlist_entry *entry;
+  /* Dynamic: copy entries from DNS_LOCAL_HOSTLIST_INIT to list */
+  struct local_hostlist_entry local_hostlist_init[] = DNS_LOCAL_HOSTLIST_INIT;
+  size_t namelen;
+  for (i = 0; i < sizeof(local_hostlist_init) / sizeof(struct local_hostlist_entry); i++) {
+    struct local_hostlist_entry *init_entry = &local_hostlist_init[i];
+    LWIP_ASSERT("invalid host name (NULL)", init_entry->name != NULL);
+    namelen = strlen(init_entry->name);
+    LWIP_ASSERT("namelen <= DNS_LOCAL_HOSTLIST_MAX_NAMELEN", namelen <= DNS_LOCAL_HOSTLIST_MAX_NAMELEN);
+    entry = (struct local_hostlist_entry *)memp_malloc(MEMP_LOCALHOSTLIST);
+    LWIP_ASSERT("mem-error in dns_init_local", entry != NULL);
+    if (entry != NULL) {
+      entry->name = (char*)entry + sizeof(struct local_hostlist_entry);
+      MEMCPY((char*)entry->name, init_entry->name, namelen);
+      ((char*)entry->name)[namelen] = 0;
+      entry->addr = init_entry->addr;
+      entry->next = local_hostlist_dynamic;
+      local_hostlist_dynamic = entry;
+    }
+  }
+#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC && defined(DNS_LOCAL_HOSTLIST_INIT) */
+}
+
+/**
+ * Scans the local host-list for a hostname.
+ *
+ * @param hostname Hostname to look for in the local host-list
+ * @return The first IP address for the hostname in the local host-list or
+ *         IPADDR_NONE if not found.
+ */
+static u32_t
+dns_lookup_local(const char *hostname)
+{
+#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
+  struct local_hostlist_entry *entry = local_hostlist_dynamic;
+  while(entry != NULL) {
+    if(strcmp(entry->name, hostname) == 0) {
+      return ip4_addr_get_u32(&entry->addr);
+    }
+    entry = entry->next;
+  }
+#else /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
+  int i;
+  for (i = 0; i < sizeof(local_hostlist_static) / sizeof(struct local_hostlist_entry); i++) {
+    if(strcmp(local_hostlist_static[i].name, hostname) == 0) {
+      return ip4_addr_get_u32(&local_hostlist_static[i].addr);
+    }
+  }
+#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
+  return IPADDR_NONE;
+}
+
+#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
+/** Remove all entries from the local host-list for a specific hostname
+ * and/or IP addess
+ *
+ * @param hostname hostname for which entries shall be removed from the local
+ *                 host-list
+ * @param addr address for which entries shall be removed from the local host-list
+ * @return the number of removed entries
+ */
+int
+dns_local_removehost(const char *hostname, const ip_addr_t *addr)
+{
+  int removed = 0;
+  struct local_hostlist_entry *entry = local_hostlist_dynamic;
+  struct local_hostlist_entry *last_entry = NULL;
+  while (entry != NULL) {
+    if (((hostname == NULL) || !strcmp(entry->name, hostname)) &&
+        ((addr == NULL) || ip_addr_cmp(&entry->addr, addr))) {
+      struct local_hostlist_entry *free_entry;
+      if (last_entry != NULL) {
+        last_entry->next = entry->next;
+      } else {
+        local_hostlist_dynamic = entry->next;
+      }
+      free_entry = entry;
+      entry = entry->next;
+      memp_free(MEMP_LOCALHOSTLIST, free_entry);
+      removed++;
+    } else {
+      last_entry = entry;
+      entry = entry->next;
+    }
+  }
+  return removed;
+}
+
+/**
+ * Add a hostname/IP address pair to the local host-list.
+ * Duplicates are not checked.
+ *
+ * @param hostname hostname of the new entry
+ * @param addr IP address of the new entry
+ * @return ERR_OK if succeeded or ERR_MEM on memory error
+ */
+err_t
+dns_local_addhost(const char *hostname, const ip_addr_t *addr)
+{
+  struct local_hostlist_entry *entry;
+  size_t namelen;
+  LWIP_ASSERT("invalid host name (NULL)", hostname != NULL);
+  namelen = strlen(hostname);
+  LWIP_ASSERT("namelen <= DNS_LOCAL_HOSTLIST_MAX_NAMELEN", namelen <= DNS_LOCAL_HOSTLIST_MAX_NAMELEN);
+  entry = (struct local_hostlist_entry *)memp_malloc(MEMP_LOCALHOSTLIST);
+  if (entry == NULL) {
+    return ERR_MEM;
+  }
+  entry->name = (char*)entry + sizeof(struct local_hostlist_entry);
+  MEMCPY((char*)entry->name, hostname, namelen);
+  ((char*)entry->name)[namelen] = 0;
+  ip_addr_copy(entry->addr, *addr);
+  entry->next = local_hostlist_dynamic;
+  local_hostlist_dynamic = entry;
+  return ERR_OK;
+}
+#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC*/
+#endif /* DNS_LOCAL_HOSTLIST */
+
+/**
+ * Look up a hostname in the array of known hostnames.
+ *
+ * @note This function only looks in the internal array of known
+ * hostnames, it does not send out a query for the hostname if none
+ * was found. The function dns_enqueue() can be used to send a query
+ * for a hostname.
+ *
+ * @param name the hostname to look up
+ * @return the hostname's IP address, as u32_t (instead of ip_addr_t to
+ *         better check for failure: != IPADDR_NONE) or IPADDR_NONE if the hostname
+ *         was not found in the cached dns_table.
+ */
+static u32_t
+dns_lookup(const char *name)
+{
+  u8_t i;
+#if DNS_LOCAL_HOSTLIST || defined(DNS_LOOKUP_LOCAL_EXTERN)
+  u32_t addr;
+#endif /* DNS_LOCAL_HOSTLIST || defined(DNS_LOOKUP_LOCAL_EXTERN) */
+#if DNS_LOCAL_HOSTLIST
+  if ((addr = dns_lookup_local(name)) != IPADDR_NONE) {
+    return addr;
+  }
+#endif /* DNS_LOCAL_HOSTLIST */
+#ifdef DNS_LOOKUP_LOCAL_EXTERN
+  if((addr = DNS_LOOKUP_LOCAL_EXTERN(name)) != IPADDR_NONE) {
+    return addr;
+  }
+#endif /* DNS_LOOKUP_LOCAL_EXTERN */
+
+  /* Walk through name list, return entry if found. If not, return NULL. */
+  for (i = 0; i < DNS_TABLE_SIZE; ++i) {
+    if ((dns_table[i].state == DNS_STATE_DONE) &&
+        (strcmp(name, dns_table[i].name) == 0)) {
+      LWIP_DEBUGF(DNS_DEBUG, ("dns_lookup: \"%s\": found = ", name));
+      ip_addr_debug_print(DNS_DEBUG, &(dns_table[i].ipaddr));
+      LWIP_DEBUGF(DNS_DEBUG, ("\n"));
+      return ip4_addr_get_u32(&dns_table[i].ipaddr);
+    }
+  }
+
+  return IPADDR_NONE;
+}
+
+#if DNS_DOES_NAME_CHECK
+/**
+ * Compare the "dotted" name "query" with the encoded name "response"
+ * to make sure an answer from the DNS server matches the current dns_table
+ * entry (otherwise, answers might arrive late for hostname not on the list
+ * any more).
+ *
+ * @param query hostname (not encoded) from the dns_table
+ * @param response encoded hostname in the DNS response
+ * @return 0: names equal; 1: names differ
+ */
+static u8_t
+dns_compare_name(unsigned char *query, unsigned char *response)
+{
+  unsigned char n;
+
+  do {
+    n = *response++;
+    /** @see RFC 1035 - 4.1.4. Message compression */
+    if ((n & 0xc0) == 0xc0) {
+      /* Compressed name */
+      break;
+    } else {
+      /* Not compressed name */
+      while (n > 0) {
+        if ((*query) != (*response)) {
+          return 1;
+        }
+        ++response;
+        ++query;
+        --n;
+      };
+      ++query;
+    }
+  } while (*response != 0);
+
+  return 0;
+}
+#endif /* DNS_DOES_NAME_CHECK */
+
+/**
+ * Walk through a compact encoded DNS name and return the end of the name.
+ *
+ * @param query encoded DNS name in the DNS server response
+ * @return end of the name
+ */
+static unsigned char *
+dns_parse_name(unsigned char *query)
+{
+  unsigned char n;
+
+  do {
+    n = *query++;
+    /** @see RFC 1035 - 4.1.4. Message compression */
+    if ((n & 0xc0) == 0xc0) {
+      /* Compressed name */
+      break;
+    } else {
+      /* Not compressed name */
+      while (n > 0) {
+        ++query;
+        --n;
+      };
+    }
+  } while (*query != 0);
+
+  return query + 1;
+}
+
+/**
+ * Send a DNS query packet.
+ *
+ * @param numdns index of the DNS server in the dns_servers table
+ * @param name hostname to query
+ * @param id index of the hostname in dns_table, used as transaction ID in the
+ *        DNS query packet
+ * @return ERR_OK if packet is sent; an err_t indicating the problem otherwise
+ */
+static err_t
+dns_send(u8_t numdns, const char* name, u8_t id)
+{
+  err_t err;
+  struct dns_hdr *hdr;
+  struct dns_query qry;
+  struct pbuf *p;
+  char *query, *nptr;
+  const char *pHostname;
+  u8_t n;
+
+  LWIP_DEBUGF(DNS_DEBUG, ("dns_send: dns_servers[%"U16_F"] \"%s\": request\n",
+              (u16_t)(numdns), name));
+  LWIP_ASSERT("dns server out of array", numdns < DNS_MAX_SERVERS);
+  LWIP_ASSERT("dns server has no IP address set", !ip_addr_isany(&dns_servers[numdns]));
+
+  /* if here, we have either a new query or a retry on a previous query to process */
+  p = pbuf_alloc(PBUF_TRANSPORT, SIZEOF_DNS_HDR + DNS_MAX_NAME_LENGTH +
+                 SIZEOF_DNS_QUERY, PBUF_RAM);
+  if (p != NULL) {
+    LWIP_ASSERT("pbuf must be in one piece", p->next == NULL);
+    /* fill dns header */
+    hdr = (struct dns_hdr*)p->payload;
+    memset(hdr, 0, SIZEOF_DNS_HDR);
+    hdr->id = htons(id);
+    hdr->flags1 = DNS_FLAG1_RD;
+    hdr->numquestions = PP_HTONS(1);
+    query = (char*)hdr + SIZEOF_DNS_HDR;
+    pHostname = name;
+    --pHostname;
+
+    /* convert hostname into suitable query format. */
+    do {
+      ++pHostname;
+      nptr = query;
+      ++query;
+      for(n = 0; *pHostname != '.' && *pHostname != 0; ++pHostname) {
+        *query = *pHostname;
+        ++query;
+        ++n;
+      }
+      *nptr = n;
+    } while(*pHostname != 0);
+    *query++='\0';
+
+    /* fill dns query */
+    qry.type = PP_HTONS(DNS_RRTYPE_A);
+    qry.cls = PP_HTONS(DNS_RRCLASS_IN);
+    SMEMCPY(query, &qry, SIZEOF_DNS_QUERY);
+
+    /* resize pbuf to the exact dns query */
+    pbuf_realloc(p, (u16_t)((query + SIZEOF_DNS_QUERY) - ((char*)(p->payload))));
+
+    /* connect to the server for faster receiving */
+    udp_connect(dns_pcb, &dns_servers[numdns], DNS_SERVER_PORT);
+    /* send dns packet */
+    err = udp_sendto(dns_pcb, p, &dns_servers[numdns], DNS_SERVER_PORT);
+
+    /* free pbuf */
+    pbuf_free(p);
+  } else {
+    err = ERR_MEM;
+  }
+
+  return err;
+}
+
+/**
+ * dns_check_entry() - see if pEntry has not yet been queried and, if so, sends out a query.
+ * Check an entry in the dns_table:
+ * - send out query for new entries
+ * - retry old pending entries on timeout (also with different servers)
+ * - remove completed entries from the table if their TTL has expired
+ *
+ * @param i index of the dns_table entry to check
+ */
+static void
+dns_check_entry(u8_t i)
+{
+  err_t err;
+  struct dns_table_entry *pEntry = &dns_table[i];
+
+  LWIP_ASSERT("array index out of bounds", i < DNS_TABLE_SIZE);
+
+  switch(pEntry->state) {
+
+    case DNS_STATE_NEW: {
+      /* initialize new entry */
+      pEntry->state   = DNS_STATE_ASKING;
+      pEntry->numdns  = 0;
+      pEntry->tmr     = 1;
+      pEntry->retries = 0;
+      
+      /* send DNS packet for this entry */
+      err = dns_send(pEntry->numdns, pEntry->name, i);
+      if (err != ERR_OK) {
+        LWIP_DEBUGF(DNS_DEBUG | LWIP_DBG_LEVEL_WARNING,
+                    ("dns_send returned error: %s\n", lwip_strerr(err)));
+      }
+      break;
+    }
+
+    case DNS_STATE_ASKING: {
+      if (--pEntry->tmr == 0) {
+        if (++pEntry->retries == DNS_MAX_RETRIES) {
+          if ((pEntry->numdns+1<DNS_MAX_SERVERS) && !ip_addr_isany(&dns_servers[pEntry->numdns+1])) {
+            /* change of server */
+            pEntry->numdns++;
+            pEntry->tmr     = 1;
+            pEntry->retries = 0;
+            break;
+          } else {
+            LWIP_DEBUGF(DNS_DEBUG, ("dns_check_entry: \"%s\": timeout\n", pEntry->name));
+            /* call specified callback function if provided */
+            if (pEntry->found)
+              (*pEntry->found)(pEntry->name, NULL, pEntry->arg);
+            /* flush this entry */
+            pEntry->state   = DNS_STATE_UNUSED;
+            pEntry->found   = NULL;
+            break;
+          }
+        }
+
+        /* wait longer for the next retry */
+        pEntry->tmr = pEntry->retries;
+
+        /* send DNS packet for this entry */
+        err = dns_send(pEntry->numdns, pEntry->name, i);
+        if (err != ERR_OK) {
+          LWIP_DEBUGF(DNS_DEBUG | LWIP_DBG_LEVEL_WARNING,
+                      ("dns_send returned error: %s\n", lwip_strerr(err)));
+        }
+      }
+      break;
+    }
+
+    case DNS_STATE_DONE: {
+      /* if the time to live is nul */
+      if (--pEntry->ttl == 0) {
+        LWIP_DEBUGF(DNS_DEBUG, ("dns_check_entry: \"%s\": flush\n", pEntry->name));
+        /* flush this entry */
+        pEntry->state = DNS_STATE_UNUSED;
+        pEntry->found = NULL;
+      }
+      break;
+    }
+    case DNS_STATE_UNUSED:
+      /* nothing to do */
+      break;
+    default:
+      LWIP_ASSERT("unknown dns_table entry state:", 0);
+      break;
+  }
+}
+
+/**
+ * Call dns_check_entry for each entry in dns_table - check all entries.
+ */
+static void
+dns_check_entries(void)
+{
+  u8_t i;
+
+  for (i = 0; i < DNS_TABLE_SIZE; ++i) {
+    dns_check_entry(i);
+  }
+}
+
+/**
+ * Receive input function for DNS response packets arriving for the dns UDP pcb.
+ *
+ * @params see udp.h
+ */
+static void
+dns_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
+{
+  u16_t i;
+  char *pHostname;
+  struct dns_hdr *hdr;
+  struct dns_answer ans;
+  struct dns_table_entry *pEntry;
+  u16_t nquestions, nanswers;
+
+  LWIP_UNUSED_ARG(arg);
+  LWIP_UNUSED_ARG(pcb);
+  LWIP_UNUSED_ARG(addr);
+  LWIP_UNUSED_ARG(port);
+
+  /* is the dns message too big ? */
+  if (p->tot_len > DNS_MSG_SIZE) {
+    LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: pbuf too big\n"));
+    /* free pbuf and return */
+    goto memerr;
+  }
+
+  /* is the dns message big enough ? */
+  if (p->tot_len < (SIZEOF_DNS_HDR + SIZEOF_DNS_QUERY + SIZEOF_DNS_ANSWER)) {
+    LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: pbuf too small\n"));
+    /* free pbuf and return */
+    goto memerr;
+  }
+
+  /* copy dns payload inside static buffer for processing */ 
+  if (pbuf_copy_partial(p, dns_payload, p->tot_len, 0) == p->tot_len) {
+    /* The ID in the DNS header should be our entry into the name table. */
+    hdr = (struct dns_hdr*)dns_payload;
+    i = htons(hdr->id);
+    if (i < DNS_TABLE_SIZE) {
+      pEntry = &dns_table[i];
+      if(pEntry->state == DNS_STATE_ASKING) {
+        /* This entry is now completed. */
+        pEntry->state = DNS_STATE_DONE;
+        pEntry->err   = hdr->flags2 & DNS_FLAG2_ERR_MASK;
+
+        /* We only care about the question(s) and the answers. The authrr
+           and the extrarr are simply discarded. */
+        nquestions = htons(hdr->numquestions);
+        nanswers   = htons(hdr->numanswers);
+
+        /* Check for error. If so, call callback to inform. */
+        if (((hdr->flags1 & DNS_FLAG1_RESPONSE) == 0) || (pEntry->err != 0) || (nquestions != 1)) {
+          LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": error in flags\n", pEntry->name));
+          /* call callback to indicate error, clean up memory and return */
+          goto responseerr;
+        }
+
+#if DNS_DOES_NAME_CHECK
+        /* Check if the name in the "question" part match with the name in the entry. */
+        if (dns_compare_name((unsigned char *)(pEntry->name), (unsigned char *)dns_payload + SIZEOF_DNS_HDR) != 0) {
+          LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": response not match to query\n", pEntry->name));
+          /* call callback to indicate error, clean up memory and return */
+          goto responseerr;
+        }
+#endif /* DNS_DOES_NAME_CHECK */
+
+        /* Skip the name in the "question" part */
+        pHostname = (char *) dns_parse_name((unsigned char *)dns_payload + SIZEOF_DNS_HDR) + SIZEOF_DNS_QUERY;
+
+        while (nanswers > 0) {
+          /* skip answer resource record's host name */
+          pHostname = (char *) dns_parse_name((unsigned char *)pHostname);
+
+          /* Check for IP address type and Internet class. Others are discarded. */
+          SMEMCPY(&ans, pHostname, SIZEOF_DNS_ANSWER);
+          if((ans.type == PP_HTONS(DNS_RRTYPE_A)) && (ans.cls == PP_HTONS(DNS_RRCLASS_IN)) &&
+             (ans.len == PP_HTONS(sizeof(ip_addr_t))) ) {
+            /* read the answer resource record's TTL, and maximize it if needed */
+            pEntry->ttl = ntohl(ans.ttl);
+            if (pEntry->ttl > DNS_MAX_TTL) {
+              pEntry->ttl = DNS_MAX_TTL;
+            }
+            /* read the IP address after answer resource record's header */
+            SMEMCPY(&(pEntry->ipaddr), (pHostname+SIZEOF_DNS_ANSWER), sizeof(ip_addr_t));
+            LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": response = ", pEntry->name));
+            ip_addr_debug_print(DNS_DEBUG, (&(pEntry->ipaddr)));
+            LWIP_DEBUGF(DNS_DEBUG, ("\n"));
+            /* call specified callback function if provided */
+            if (pEntry->found) {
+              (*pEntry->found)(pEntry->name, &pEntry->ipaddr, pEntry->arg);
+            }
+            /* deallocate memory and return */
+            goto memerr;
+          } else {
+            pHostname = pHostname + SIZEOF_DNS_ANSWER + htons(ans.len);
+          }
+          --nanswers;
+        }
+        LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": error in response\n", pEntry->name));
+        /* call callback to indicate error, clean up memory and return */
+        goto responseerr;
+      }
+    }
+  }
+
+  /* deallocate memory and return */
+  goto memerr;
+
+responseerr:
+  /* ERROR: call specified callback function with NULL as name to indicate an error */
+  if (pEntry->found) {
+    (*pEntry->found)(pEntry->name, NULL, pEntry->arg);
+  }
+  /* flush this entry */
+  pEntry->state = DNS_STATE_UNUSED;
+  pEntry->found = NULL;
+
+memerr:
+  /* free pbuf */
+  pbuf_free(p);
+  return;
+}
+
+/**
+ * Queues a new hostname to resolve and sends out a DNS query for that hostname
+ *
+ * @param name the hostname that is to be queried
+ * @param found a callback founction to be called on success, failure or timeout
+ * @param callback_arg argument to pass to the callback function
+ * @return @return a err_t return code.
+ */
+static err_t
+dns_enqueue(const char *name, dns_found_callback found, void *callback_arg)
+{
+  u8_t i;
+  u8_t lseq, lseqi;
+  struct dns_table_entry *pEntry = NULL;
+  size_t namelen;
+
+  /* search an unused entry, or the oldest one */
+  lseq = lseqi = 0;
+  for (i = 0; i < DNS_TABLE_SIZE; ++i) {
+    pEntry = &dns_table[i];
+    /* is it an unused entry ? */
+    if (pEntry->state == DNS_STATE_UNUSED)
+      break;
+
+    /* check if this is the oldest completed entry */
+    if (pEntry->state == DNS_STATE_DONE) {
+      if ((dns_seqno - pEntry->seqno) > lseq) {
+        lseq = dns_seqno - pEntry->seqno;
+        lseqi = i;
+      }
+    }
+  }
+
+  /* if we don't have found an unused entry, use the oldest completed one */
+  if (i == DNS_TABLE_SIZE) {
+    if ((lseqi >= DNS_TABLE_SIZE) || (dns_table[lseqi].state != DNS_STATE_DONE)) {
+      /* no entry can't be used now, table is full */
+      LWIP_DEBUGF(DNS_DEBUG, ("dns_enqueue: \"%s\": DNS entries table is full\n", name));
+      return ERR_MEM;
+    } else {
+      /* use the oldest completed one */
+      i = lseqi;
+      pEntry = &dns_table[i];
+    }
+  }
+
+  /* use this entry */
+  LWIP_DEBUGF(DNS_DEBUG, ("dns_enqueue: \"%s\": use DNS entry %"U16_F"\n", name, (u16_t)(i)));
+
+  /* fill the entry */
+  pEntry->state = DNS_STATE_NEW;
+  pEntry->seqno = dns_seqno++;
+  pEntry->found = found;
+  pEntry->arg   = callback_arg;
+  namelen = LWIP_MIN(strlen(name), DNS_MAX_NAME_LENGTH-1);
+  MEMCPY(pEntry->name, name, namelen);
+  pEntry->name[namelen] = 0;
+
+  /* force to send query without waiting timer */
+  dns_check_entry(i);
+
+  /* dns query is enqueued */
+  return ERR_INPROGRESS;
+}
+
+/**
+ * Resolve a hostname (string) into an IP address.
+ * NON-BLOCKING callback version for use with raw API!!!
+ *
+ * Returns immediately with one of err_t return codes:
+ * - ERR_OK if hostname is a valid IP address string or the host
+ *   name is already in the local names table.
+ * - ERR_INPROGRESS enqueue a request to be sent to the DNS server
+ *   for resolution if no errors are present.
+ * - ERR_ARG: dns client not initialized or invalid hostname
+ *
+ * @param hostname the hostname that is to be queried
+ * @param addr pointer to a ip_addr_t where to store the address if it is already
+ *             cached in the dns_table (only valid if ERR_OK is returned!)
+ * @param found a callback function to be called on success, failure or timeout (only if
+ *              ERR_INPROGRESS is returned!)
+ * @param callback_arg argument to pass to the callback function
+ * @return a err_t return code.
+ */
+err_t
+dns_gethostbyname(const char *hostname, ip_addr_t *addr, dns_found_callback found,
+                  void *callback_arg)
+{
+  u32_t ipaddr;
+  /* not initialized or no valid server yet, or invalid addr pointer
+   * or invalid hostname or invalid hostname length */
+  if ((dns_pcb == NULL) || (addr == NULL) ||
+      (!hostname) || (!hostname[0]) ||
+      (strlen(hostname) >= DNS_MAX_NAME_LENGTH)) {
+    return ERR_ARG;
+  }
+
+#if LWIP_HAVE_LOOPIF
+  if (strcmp(hostname, "localhost")==0) {
+    ip_addr_set_loopback(addr);
+    return ERR_OK;
+  }
+#endif /* LWIP_HAVE_LOOPIF */
+
+  /* host name already in octet notation? set ip addr and return ERR_OK */
+  ipaddr = ipaddr_addr(hostname);
+  if (ipaddr == IPADDR_NONE) {
+    /* already have this address cached? */
+    ipaddr = dns_lookup(hostname);
+  }
+  if (ipaddr != IPADDR_NONE) {
+    ip4_addr_set_u32(addr, ipaddr);
+    return ERR_OK;
+  }
+
+  /* queue query with specified callback */
+  return dns_enqueue(hostname, found, callback_arg);
+}
+
+#endif /* LWIP_DNS */
diff --git a/ext/lwip/src/core/init.c b/ext/lwip/src/core/init.c
new file mode 100644
index 000000000..50cfff1ae
--- /dev/null
+++ b/ext/lwip/src/core/init.c
@@ -0,0 +1,332 @@
+/**
+ * @file
+ * Modules initialization
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/init.h"
+#include "lwip/stats.h"
+#include "lwip/sys.h"
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+#include "lwip/pbuf.h"
+#include "lwip/netif.h"
+#include "lwip/sockets.h"
+#include "lwip/ip.h"
+#include "lwip/raw.h"
+#include "lwip/udp.h"
+#include "lwip/tcp_impl.h"
+#include "lwip/snmp_msg.h"
+#include "lwip/autoip.h"
+#include "lwip/igmp.h"
+#include "lwip/dns.h"
+#include "lwip/timers.h"
+#include "netif/etharp.h"
+#include "lwip/api.h"
+
+/* Compile-time sanity checks for configuration errors.
+ * These can be done independently of LWIP_DEBUG, without penalty.
+ */
+#ifndef BYTE_ORDER
+  #error "BYTE_ORDER is not defined, you have to define it in your cc.h"
+#endif
+#if (!IP_SOF_BROADCAST && IP_SOF_BROADCAST_RECV)
+  #error "If you want to use broadcast filter per pcb on recv operations, you have to define IP_SOF_BROADCAST=1 in your lwipopts.h"
+#endif
+#if (!LWIP_UDP && LWIP_UDPLITE)
+  #error "If you want to use UDP Lite, you have to define LWIP_UDP=1 in your lwipopts.h"
+#endif
+#if (!LWIP_UDP && LWIP_SNMP)
+  #error "If you want to use SNMP, you have to define LWIP_UDP=1 in your lwipopts.h"
+#endif
+#if (!LWIP_UDP && LWIP_DHCP)
+  #error "If you want to use DHCP, you have to define LWIP_UDP=1 in your lwipopts.h"
+#endif
+#if (!LWIP_UDP && LWIP_IGMP)
+  #error "If you want to use IGMP, you have to define LWIP_UDP=1 in your lwipopts.h"
+#endif
+#if (!LWIP_UDP && LWIP_SNMP)
+  #error "If you want to use SNMP, you have to define LWIP_UDP=1 in your lwipopts.h"
+#endif
+#if (!LWIP_UDP && LWIP_DNS)
+  #error "If you want to use DNS, you have to define LWIP_UDP=1 in your lwipopts.h"
+#endif
+#if !MEMP_MEM_MALLOC /* MEMP_NUM_* checks are disabled when not using the pool allocator */
+#if (LWIP_ARP && ARP_QUEUEING && (MEMP_NUM_ARP_QUEUE<=0))
+  #error "If you want to use ARP Queueing, you have to define MEMP_NUM_ARP_QUEUE>=1 in your lwipopts.h"
+#endif
+#if (LWIP_RAW && (MEMP_NUM_RAW_PCB<=0))
+  #error "If you want to use RAW, you have to define MEMP_NUM_RAW_PCB>=1 in your lwipopts.h"
+#endif
+#if (LWIP_UDP && (MEMP_NUM_UDP_PCB<=0))
+  #error "If you want to use UDP, you have to define MEMP_NUM_UDP_PCB>=1 in your lwipopts.h"
+#endif
+#if (LWIP_TCP && (MEMP_NUM_TCP_PCB<=0))
+  #error "If you want to use TCP, you have to define MEMP_NUM_TCP_PCB>=1 in your lwipopts.h"
+#endif
+#if (LWIP_IGMP && (MEMP_NUM_IGMP_GROUP<=1))
+  #error "If you want to use IGMP, you have to define MEMP_NUM_IGMP_GROUP>1 in your lwipopts.h"
+#endif
+#if ((LWIP_NETCONN || LWIP_SOCKET) && (MEMP_NUM_TCPIP_MSG_API<=0))
+  #error "If you want to use Sequential API, you have to define MEMP_NUM_TCPIP_MSG_API>=1 in your lwipopts.h"
+#endif
+/* There must be sufficient timeouts, taking into account requirements of the subsystems. */
+#if LWIP_TIMERS && (MEMP_NUM_SYS_TIMEOUT < (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT))
+  #error "MEMP_NUM_SYS_TIMEOUT is too low to accomodate all required timeouts"
+#endif
+#if (IP_REASSEMBLY && (MEMP_NUM_REASSDATA > IP_REASS_MAX_PBUFS))
+  #error "MEMP_NUM_REASSDATA > IP_REASS_MAX_PBUFS doesn't make sense since each struct ip_reassdata must hold 2 pbufs at least!"
+#endif
+#endif /* !MEMP_MEM_MALLOC */
+#if (LWIP_TCP && (TCP_WND > 0xffff))
+  #error "If you want to use TCP, TCP_WND must fit in an u16_t, so, you have to reduce it in your lwipopts.h"
+#endif
+#if (LWIP_TCP && (TCP_SND_QUEUELEN > 0xffff))
+  #error "If you want to use TCP, TCP_SND_QUEUELEN must fit in an u16_t, so, you have to reduce it in your lwipopts.h"
+#endif
+#if (LWIP_TCP && (TCP_SND_QUEUELEN < 2))
+  #error "TCP_SND_QUEUELEN must be at least 2 for no-copy TCP writes to work"
+#endif
+#if (LWIP_TCP && ((TCP_MAXRTX > 12) || (TCP_SYNMAXRTX > 12)))
+  #error "If you want to use TCP, TCP_MAXRTX and TCP_SYNMAXRTX must less or equal to 12 (due to tcp_backoff table), so, you have to reduce them in your lwipopts.h"
+#endif
+#if (LWIP_TCP && TCP_LISTEN_BACKLOG && (TCP_DEFAULT_LISTEN_BACKLOG < 0) || (TCP_DEFAULT_LISTEN_BACKLOG > 0xff))
+  #error "If you want to use TCP backlog, TCP_DEFAULT_LISTEN_BACKLOG must fit into an u8_t"
+#endif
+#if (LWIP_NETIF_API && (NO_SYS==1))
+  #error "If you want to use NETIF API, you have to define NO_SYS=0 in your lwipopts.h"
+#endif
+#if ((LWIP_SOCKET || LWIP_NETCONN) && (NO_SYS==1))
+  #error "If you want to use Sequential API, you have to define NO_SYS=0 in your lwipopts.h"
+#endif
+#if (!LWIP_NETCONN && LWIP_SOCKET)
+  #error "If you want to use Socket API, you have to define LWIP_NETCONN=1 in your lwipopts.h"
+#endif
+#if (((!LWIP_DHCP) || (!LWIP_AUTOIP)) && LWIP_DHCP_AUTOIP_COOP)
+  #error "If you want to use DHCP/AUTOIP cooperation mode, you have to define LWIP_DHCP=1 and LWIP_AUTOIP=1 in your lwipopts.h"
+#endif
+#if (((!LWIP_DHCP) || (!LWIP_ARP)) && DHCP_DOES_ARP_CHECK)
+  #error "If you want to use DHCP ARP checking, you have to define LWIP_DHCP=1 and LWIP_ARP=1 in your lwipopts.h"
+#endif
+#if (!LWIP_ARP && LWIP_AUTOIP)
+  #error "If you want to use AUTOIP, you have to define LWIP_ARP=1 in your lwipopts.h"
+#endif
+#if (LWIP_SNMP && (SNMP_CONCURRENT_REQUESTS<=0))
+  #error "If you want to use SNMP, you have to define SNMP_CONCURRENT_REQUESTS>=1 in your lwipopts.h"
+#endif
+#if (LWIP_SNMP && (SNMP_TRAP_DESTINATIONS<=0))
+  #error "If you want to use SNMP, you have to define SNMP_TRAP_DESTINATIONS>=1 in your lwipopts.h"
+#endif
+#if (LWIP_TCP && ((LWIP_EVENT_API && LWIP_CALLBACK_API) || (!LWIP_EVENT_API && !LWIP_CALLBACK_API)))
+  #error "One and exactly one of LWIP_EVENT_API and LWIP_CALLBACK_API has to be enabled in your lwipopts.h"
+#endif
+#if (MEM_LIBC_MALLOC && MEM_USE_POOLS)
+  #error "MEM_LIBC_MALLOC and MEM_USE_POOLS may not both be simultaneously enabled in your lwipopts.h"
+#endif
+#if (MEM_USE_POOLS && !MEMP_USE_CUSTOM_POOLS)
+  #error "MEM_USE_POOLS requires custom pools (MEMP_USE_CUSTOM_POOLS) to be enabled in your lwipopts.h"
+#endif
+#if (PBUF_POOL_BUFSIZE <= MEM_ALIGNMENT)
+  #error "PBUF_POOL_BUFSIZE must be greater than MEM_ALIGNMENT or the offset may take the full first pbuf"
+#endif
+#if (DNS_LOCAL_HOSTLIST && !DNS_LOCAL_HOSTLIST_IS_DYNAMIC && !(defined(DNS_LOCAL_HOSTLIST_INIT)))
+  #error "you have to define define DNS_LOCAL_HOSTLIST_INIT {{'host1', 0x123}, {'host2', 0x234}} to initialize DNS_LOCAL_HOSTLIST"
+#endif
+#if PPP_SUPPORT && !PPPOS_SUPPORT & !PPPOE_SUPPORT
+  #error "PPP_SUPPORT needs either PPPOS_SUPPORT or PPPOE_SUPPORT turned on"
+#endif
+#if !LWIP_ETHERNET && (LWIP_ARP || PPPOE_SUPPORT)
+  #error "LWIP_ETHERNET needs to be turned on for LWIP_ARP or PPPOE_SUPPORT"
+#endif
+#if LWIP_IGMP && !defined(LWIP_RAND)
+  #error "When using IGMP, LWIP_RAND() needs to be defined to a random-function returning an u32_t random value"
+#endif
+#if LWIP_TCPIP_CORE_LOCKING_INPUT && !LWIP_TCPIP_CORE_LOCKING
+  #error "When using LWIP_TCPIP_CORE_LOCKING_INPUT, LWIP_TCPIP_CORE_LOCKING must be enabled, too"
+#endif
+#if LWIP_TCP && LWIP_NETIF_TX_SINGLE_PBUF && !TCP_OVERSIZE
+  #error "LWIP_NETIF_TX_SINGLE_PBUF needs TCP_OVERSIZE enabled to create single-pbuf TCP packets"
+#endif
+#if IP_FRAG && IP_FRAG_USES_STATIC_BUF && LWIP_NETIF_TX_SINGLE_PBUF
+  #error "LWIP_NETIF_TX_SINGLE_PBUF does not work with IP_FRAG_USES_STATIC_BUF==1 as that creates pbuf queues"
+#endif
+#if LWIP_NETCONN && LWIP_TCP
+#if NETCONN_COPY != TCP_WRITE_FLAG_COPY
+  #error "NETCONN_COPY != TCP_WRITE_FLAG_COPY"
+#endif
+#if NETCONN_MORE != TCP_WRITE_FLAG_MORE
+  #error "NETCONN_MORE != TCP_WRITE_FLAG_MORE"
+#endif
+#endif /* LWIP_NETCONN && LWIP_TCP */
+#if LWIP_SOCKET
+/* Check that the SO_* socket options and SOF_* lwIP-internal flags match */
+#if SO_ACCEPTCONN != SOF_ACCEPTCONN
+  #error "SO_ACCEPTCONN != SOF_ACCEPTCONN"
+#endif
+#if SO_REUSEADDR != SOF_REUSEADDR
+  #error "WARNING: SO_REUSEADDR != SOF_REUSEADDR"
+#endif
+#if SO_KEEPALIVE != SOF_KEEPALIVE
+  #error "WARNING: SO_KEEPALIVE != SOF_KEEPALIVE"
+#endif
+#if SO_BROADCAST != SOF_BROADCAST
+  #error "WARNING: SO_BROADCAST != SOF_BROADCAST"
+#endif
+#if SO_LINGER != SOF_LINGER
+  #error "WARNING: SO_LINGER != SOF_LINGER"
+#endif
+#endif /* LWIP_SOCKET */
+
+
+/* Compile-time checks for deprecated options.
+ */
+#ifdef MEMP_NUM_TCPIP_MSG
+  #error "MEMP_NUM_TCPIP_MSG option is deprecated. Remove it from your lwipopts.h."
+#endif
+#ifdef MEMP_NUM_API_MSG
+  #error "MEMP_NUM_API_MSG option is deprecated. Remove it from your lwipopts.h."
+#endif
+#ifdef TCP_REXMIT_DEBUG
+  #error "TCP_REXMIT_DEBUG option is deprecated. Remove it from your lwipopts.h."
+#endif
+#ifdef RAW_STATS
+  #error "RAW_STATS option is deprecated. Remove it from your lwipopts.h."
+#endif
+#ifdef ETHARP_QUEUE_FIRST
+  #error "ETHARP_QUEUE_FIRST option is deprecated. Remove it from your lwipopts.h."
+#endif
+#ifdef ETHARP_ALWAYS_INSERT
+  #error "ETHARP_ALWAYS_INSERT option is deprecated. Remove it from your lwipopts.h."
+#endif
+
+#ifndef LWIP_DISABLE_TCP_SANITY_CHECKS
+#define LWIP_DISABLE_TCP_SANITY_CHECKS  0
+#endif
+#ifndef LWIP_DISABLE_MEMP_SANITY_CHECKS
+#define LWIP_DISABLE_MEMP_SANITY_CHECKS 0
+#endif
+
+/* MEMP sanity checks */
+#if !LWIP_DISABLE_MEMP_SANITY_CHECKS
+#if LWIP_NETCONN
+#if MEMP_MEM_MALLOC
+#if !MEMP_NUM_NETCONN && LWIP_SOCKET
+#error "lwip_sanity_check: WARNING: MEMP_NUM_NETCONN cannot be 0 when using sockets!"
+#endif
+#else /* MEMP_MEM_MALLOC */
+#if MEMP_NUM_NETCONN > (MEMP_NUM_TCP_PCB+MEMP_NUM_TCP_PCB_LISTEN+MEMP_NUM_UDP_PCB+MEMP_NUM_RAW_PCB)
+#error "lwip_sanity_check: WARNING: MEMP_NUM_NETCONN should be less than the sum of MEMP_NUM_{TCP,RAW,UDP}_PCB+MEMP_NUM_TCP_PCB_LISTEN. If you know what you are doing, define LWIP_DISABLE_MEMP_SANITY_CHECKS to 1 to disable this error."
+#endif
+#endif /* MEMP_MEM_MALLOC */
+#endif /* LWIP_NETCONN */
+#endif /* !LWIP_DISABLE_MEMP_SANITY_CHECKS */
+
+/* TCP sanity checks */
+#if !LWIP_DISABLE_TCP_SANITY_CHECKS
+#if LWIP_TCP
+#if !MEMP_MEM_MALLOC && (MEMP_NUM_TCP_SEG < TCP_SND_QUEUELEN)
+  #error "lwip_sanity_check: WARNING: MEMP_NUM_TCP_SEG should be at least as big as TCP_SND_QUEUELEN. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
+#endif
+#if TCP_SND_BUF < (2 * TCP_MSS)
+  #error "lwip_sanity_check: WARNING: TCP_SND_BUF must be at least as much as (2 * TCP_MSS) for things to work smoothly. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
+#endif
+#if TCP_SND_QUEUELEN < (2 * (TCP_SND_BUF / TCP_MSS))
+  #error "lwip_sanity_check: WARNING: TCP_SND_QUEUELEN must be at least as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
+#endif
+#if TCP_SNDLOWAT >= TCP_SND_BUF
+  #error "lwip_sanity_check: WARNING: TCP_SNDLOWAT must be less than TCP_SND_BUF. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
+#endif
+#if TCP_SNDQUEUELOWAT >= TCP_SND_QUEUELEN
+  #error "lwip_sanity_check: WARNING: TCP_SNDQUEUELOWAT must be less than TCP_SND_QUEUELEN. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
+#endif
+#if !MEMP_MEM_MALLOC && (TCP_WND > (PBUF_POOL_SIZE * (PBUF_POOL_BUFSIZE - (PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN))))
+  #error "lwip_sanity_check: WARNING: TCP_WND is larger than space provided by PBUF_POOL_SIZE * (PBUF_POOL_BUFSIZE - protocol headers). If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
+#endif
+#if TCP_WND < TCP_MSS
+  #error "lwip_sanity_check: WARNING: TCP_WND is smaller than MSS. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
+#endif
+#endif /* LWIP_TCP */
+#endif /* !LWIP_DISABLE_TCP_SANITY_CHECKS */
+
+/**
+ * Perform Sanity check of user-configurable values, and initialize all modules.
+ */
+void
+lwip_init(void)
+{
+  /* Modules initialization */
+  stats_init();
+#if !NO_SYS
+  sys_init();
+#endif /* !NO_SYS */
+  mem_init();
+  memp_init();
+  pbuf_init();
+  netif_init();
+#if LWIP_SOCKET
+  //lwip_socket_init();
+#endif /* LWIP_SOCKET */
+  ip_init();
+#if LWIP_ARP
+  etharp_init();
+#endif /* LWIP_ARP */
+#if LWIP_RAW
+  raw_init();
+#endif /* LWIP_RAW */
+#if LWIP_UDP
+  udp_init();
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+  tcp_init();
+#endif /* LWIP_TCP */
+#if LWIP_SNMP
+  snmp_init();
+#endif /* LWIP_SNMP */
+#if LWIP_AUTOIP
+  autoip_init();
+#endif /* LWIP_AUTOIP */
+#if LWIP_IGMP
+  igmp_init();
+#endif /* LWIP_IGMP */
+#if LWIP_DNS
+  dns_init();
+#endif /* LWIP_DNS */
+
+#if LWIP_TIMERS
+  sys_timeouts_init();
+#endif /* LWIP_TIMERS */
+}
diff --git a/ext/lwip/src/core/ipv4/autoip.c b/ext/lwip/src/core/ipv4/autoip.c
new file mode 100644
index 000000000..b122da27e
--- /dev/null
+++ b/ext/lwip/src/core/ipv4/autoip.c
@@ -0,0 +1,528 @@
+/**
+ * @file
+ * AutoIP Automatic LinkLocal IP Configuration
+ *
+ */
+
+/*
+ *
+ * Copyright (c) 2007 Dominik Spies <kontakt@dspies.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Dominik Spies <kontakt@dspies.de>
+ *
+ * This is a AutoIP implementation for the lwIP TCP/IP stack. It aims to conform
+ * with RFC 3927.
+ *
+ *
+ * Please coordinate changes and requests with Dominik Spies
+ * <kontakt@dspies.de>
+ */
+
+/*******************************************************************************
+ * USAGE:
+ * 
+ * define LWIP_AUTOIP 1  in your lwipopts.h
+ * 
+ * If you don't use tcpip.c (so, don't call, you don't call tcpip_init):
+ * - First, call autoip_init().
+ * - call autoip_tmr() all AUTOIP_TMR_INTERVAL msces,
+ *   that should be defined in autoip.h.
+ *   I recommend a value of 100. The value must divide 1000 with a remainder almost 0.
+ *   Possible values are 1000, 500, 333, 250, 200, 166, 142, 125, 111, 100 ....
+ *
+ * Without DHCP:
+ * - Call autoip_start() after netif_add().
+ * 
+ * With DHCP:
+ * - define LWIP_DHCP_AUTOIP_COOP 1 in your lwipopts.h.
+ * - Configure your DHCP Client.
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_AUTOIP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/mem.h"
+#include "lwip/udp.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/autoip.h"
+#include "netif/etharp.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+/* 169.254.0.0 */
+#define AUTOIP_NET         0xA9FE0000
+/* 169.254.1.0 */
+#define AUTOIP_RANGE_START (AUTOIP_NET | 0x0100)
+/* 169.254.254.255 */
+#define AUTOIP_RANGE_END   (AUTOIP_NET | 0xFEFF)
+
+
+/** Pseudo random macro based on netif informations.
+ * You could use "rand()" from the C Library if you define LWIP_AUTOIP_RAND in lwipopts.h */
+#ifndef LWIP_AUTOIP_RAND
+#define LWIP_AUTOIP_RAND(netif) ( (((u32_t)((netif->hwaddr[5]) & 0xff) << 24) | \
+                                   ((u32_t)((netif->hwaddr[3]) & 0xff) << 16) | \
+                                   ((u32_t)((netif->hwaddr[2]) & 0xff) << 8) | \
+                                   ((u32_t)((netif->hwaddr[4]) & 0xff))) + \
+                                   (netif->autoip?netif->autoip->tried_llipaddr:0))
+#endif /* LWIP_AUTOIP_RAND */
+
+/**
+ * Macro that generates the initial IP address to be tried by AUTOIP.
+ * If you want to override this, define it to something else in lwipopts.h.
+ */
+#ifndef LWIP_AUTOIP_CREATE_SEED_ADDR
+#define LWIP_AUTOIP_CREATE_SEED_ADDR(netif) \
+  htonl(AUTOIP_RANGE_START + ((u32_t)(((u8_t)(netif->hwaddr[4])) | \
+                 ((u32_t)((u8_t)(netif->hwaddr[5]))) << 8)))
+#endif /* LWIP_AUTOIP_CREATE_SEED_ADDR */
+
+/* static functions */
+static void autoip_handle_arp_conflict(struct netif *netif);
+
+/* creates a pseudo random LL IP-Address for a network interface */
+static void autoip_create_addr(struct netif *netif, ip_addr_t *ipaddr);
+
+/* sends an ARP probe */
+static err_t autoip_arp_probe(struct netif *netif);
+
+/* sends an ARP announce */
+static err_t autoip_arp_announce(struct netif *netif);
+
+/* configure interface for use with current LL IP-Address */
+static err_t autoip_bind(struct netif *netif);
+
+/* start sending probes for llipaddr */
+static void autoip_start_probing(struct netif *netif);
+
+
+/** Set a statically allocated struct autoip to work with.
+ * Using this prevents autoip_start to allocate it using mem_malloc.
+ *
+ * @param netif the netif for which to set the struct autoip
+ * @param dhcp (uninitialised) dhcp struct allocated by the application
+ */
+void
+autoip_set_struct(struct netif *netif, struct autoip *autoip)
+{
+  LWIP_ASSERT("netif != NULL", netif != NULL);
+  LWIP_ASSERT("autoip != NULL", autoip != NULL);
+  LWIP_ASSERT("netif already has a struct autoip set", netif->autoip == NULL);
+
+  /* clear data structure */
+  memset(autoip, 0, sizeof(struct autoip));
+  /* autoip->state = AUTOIP_STATE_OFF; */
+  netif->autoip = autoip;
+}
+
+/** Restart AutoIP client and check the next address (conflict detected)
+ *
+ * @param netif The netif under AutoIP control
+ */
+static void
+autoip_restart(struct netif *netif)
+{
+  netif->autoip->tried_llipaddr++;
+  autoip_start(netif);
+}
+
+/**
+ * Handle a IP address conflict after an ARP conflict detection
+ */
+static void
+autoip_handle_arp_conflict(struct netif *netif)
+{
+  /* Somehow detect if we are defending or retreating */
+  unsigned char defend = 1; /* tbd */
+
+  if (defend) {
+    if (netif->autoip->lastconflict > 0) {
+      /* retreat, there was a conflicting ARP in the last
+       * DEFEND_INTERVAL seconds
+       */
+      LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+        ("autoip_handle_arp_conflict(): we are defending, but in DEFEND_INTERVAL, retreating\n"));
+
+      /* TODO: close all TCP sessions */
+      autoip_restart(netif);
+    } else {
+      LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+        ("autoip_handle_arp_conflict(): we are defend, send ARP Announce\n"));
+      autoip_arp_announce(netif);
+      netif->autoip->lastconflict = DEFEND_INTERVAL * AUTOIP_TICKS_PER_SECOND;
+    }
+  } else {
+    LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+      ("autoip_handle_arp_conflict(): we do not defend, retreating\n"));
+    /* TODO: close all TCP sessions */
+    autoip_restart(netif);
+  }
+}
+
+/**
+ * Create an IP-Address out of range 169.254.1.0 to 169.254.254.255
+ *
+ * @param netif network interface on which create the IP-Address
+ * @param ipaddr ip address to initialize
+ */
+static void
+autoip_create_addr(struct netif *netif, ip_addr_t *ipaddr)
+{
+  /* Here we create an IP-Address out of range 169.254.1.0 to 169.254.254.255
+   * compliant to RFC 3927 Section 2.1
+   * We have 254 * 256 possibilities */
+
+  u32_t addr = ntohl(LWIP_AUTOIP_CREATE_SEED_ADDR(netif));
+  addr += netif->autoip->tried_llipaddr;
+  addr = AUTOIP_NET | (addr & 0xffff);
+  /* Now, 169.254.0.0 <= addr <= 169.254.255.255 */ 
+
+  if (addr < AUTOIP_RANGE_START) {
+    addr += AUTOIP_RANGE_END - AUTOIP_RANGE_START + 1;
+  }
+  if (addr > AUTOIP_RANGE_END) {
+    addr -= AUTOIP_RANGE_END - AUTOIP_RANGE_START + 1;
+  }
+  LWIP_ASSERT("AUTOIP address not in range", (addr >= AUTOIP_RANGE_START) &&
+    (addr <= AUTOIP_RANGE_END));
+  ip4_addr_set_u32(ipaddr, htonl(addr));
+  
+  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+    ("autoip_create_addr(): tried_llipaddr=%"U16_F", %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+    (u16_t)(netif->autoip->tried_llipaddr), ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr),
+    ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr)));
+}
+
+/**
+ * Sends an ARP probe from a network interface
+ *
+ * @param netif network interface used to send the probe
+ */
+static err_t
+autoip_arp_probe(struct netif *netif)
+{
+  return etharp_raw(netif, (struct eth_addr *)netif->hwaddr, &ethbroadcast,
+    (struct eth_addr *)netif->hwaddr, IP_ADDR_ANY, &ethzero,
+    &netif->autoip->llipaddr, ARP_REQUEST);
+}
+
+/**
+ * Sends an ARP announce from a network interface
+ *
+ * @param netif network interface used to send the announce
+ */
+static err_t
+autoip_arp_announce(struct netif *netif)
+{
+  return etharp_raw(netif, (struct eth_addr *)netif->hwaddr, &ethbroadcast,
+    (struct eth_addr *)netif->hwaddr, &netif->autoip->llipaddr, &ethzero,
+    &netif->autoip->llipaddr, ARP_REQUEST);
+}
+
+/**
+ * Configure interface for use with current LL IP-Address
+ *
+ * @param netif network interface to configure with current LL IP-Address
+ */
+static err_t
+autoip_bind(struct netif *netif)
+{
+  struct autoip *autoip = netif->autoip;
+  ip_addr_t sn_mask, gw_addr;
+
+  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
+    ("autoip_bind(netif=%p) %c%c%"U16_F" %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+    (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num,
+    ip4_addr1_16(&autoip->llipaddr), ip4_addr2_16(&autoip->llipaddr),
+    ip4_addr3_16(&autoip->llipaddr), ip4_addr4_16(&autoip->llipaddr)));
+
+  IP4_ADDR(&sn_mask, 255, 255, 0, 0);
+  IP4_ADDR(&gw_addr, 0, 0, 0, 0);
+
+  netif_set_ipaddr(netif, &autoip->llipaddr);
+  netif_set_netmask(netif, &sn_mask);
+  netif_set_gw(netif, &gw_addr);  
+
+  /* bring the interface up */
+  netif_set_up(netif);
+
+  return ERR_OK;
+}
+
+/**
+ * Start AutoIP client
+ *
+ * @param netif network interface on which start the AutoIP client
+ */
+err_t
+autoip_start(struct netif *netif)
+{
+  struct autoip *autoip = netif->autoip;
+  err_t result = ERR_OK;
+
+  if (netif_is_up(netif)) {
+    netif_set_down(netif);
+  }
+
+  /* Set IP-Address, Netmask and Gateway to 0 to make sure that
+   * ARP Packets are formed correctly
+   */
+  ip_addr_set_zero(&netif->ip_addr);
+  ip_addr_set_zero(&netif->netmask);
+  ip_addr_set_zero(&netif->gw);
+
+  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+    ("autoip_start(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0],
+    netif->name[1], (u16_t)netif->num));
+  if (autoip == NULL) {
+    /* no AutoIP client attached yet? */
+    LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
+      ("autoip_start(): starting new AUTOIP client\n"));
+    autoip = (struct autoip *)mem_malloc(sizeof(struct autoip));
+    if (autoip == NULL) {
+      LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
+        ("autoip_start(): could not allocate autoip\n"));
+      return ERR_MEM;
+    }
+    memset(autoip, 0, sizeof(struct autoip));
+    /* store this AutoIP client in the netif */
+    netif->autoip = autoip;
+    LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE, ("autoip_start(): allocated autoip"));
+  } else {
+    autoip->state = AUTOIP_STATE_OFF;
+    autoip->ttw = 0;
+    autoip->sent_num = 0;
+    ip_addr_set_zero(&autoip->llipaddr);
+    autoip->lastconflict = 0;
+  }
+
+  autoip_create_addr(netif, &(autoip->llipaddr));
+  autoip_start_probing(netif);
+
+  return result;
+}
+
+static void
+autoip_start_probing(struct netif *netif)
+{
+  struct autoip *autoip = netif->autoip;
+
+  autoip->state = AUTOIP_STATE_PROBING;
+  autoip->sent_num = 0;
+  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+     ("autoip_start_probing(): changing state to PROBING: %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+      ip4_addr1_16(&netif->autoip->llipaddr), ip4_addr2_16(&netif->autoip->llipaddr),
+      ip4_addr3_16(&netif->autoip->llipaddr), ip4_addr4_16(&netif->autoip->llipaddr)));
+
+  /* time to wait to first probe, this is randomly
+   * choosen out of 0 to PROBE_WAIT seconds.
+   * compliant to RFC 3927 Section 2.2.1
+   */
+  autoip->ttw = (u16_t)(LWIP_AUTOIP_RAND(netif) % (PROBE_WAIT * AUTOIP_TICKS_PER_SECOND));
+
+  /*
+   * if we tried more then MAX_CONFLICTS we must limit our rate for
+   * accquiring and probing address
+   * compliant to RFC 3927 Section 2.2.1
+   */
+  if (autoip->tried_llipaddr > MAX_CONFLICTS) {
+    autoip->ttw = RATE_LIMIT_INTERVAL * AUTOIP_TICKS_PER_SECOND;
+  }
+}
+
+/**
+ * Handle a possible change in the network configuration.
+ *
+ * If there is an AutoIP address configured, take the interface down
+ * and begin probing with the same address.
+ */
+void
+autoip_network_changed(struct netif *netif)
+{
+  if (netif->autoip && netif->autoip->state != AUTOIP_STATE_OFF) {
+    netif_set_down(netif);
+    autoip_start_probing(netif);
+  }
+}
+
+/**
+ * Stop AutoIP client
+ *
+ * @param netif network interface on which stop the AutoIP client
+ */
+err_t
+autoip_stop(struct netif *netif)
+{
+  netif->autoip->state = AUTOIP_STATE_OFF;
+  netif_set_down(netif);
+  return ERR_OK;
+}
+
+/**
+ * Has to be called in loop every AUTOIP_TMR_INTERVAL milliseconds
+ */
+void
+autoip_tmr()
+{
+  struct netif *netif = netif_list;
+  /* loop through netif's */
+  while (netif != NULL) {
+    /* only act on AutoIP configured interfaces */
+    if (netif->autoip != NULL) {
+      if (netif->autoip->lastconflict > 0) {
+        netif->autoip->lastconflict--;
+      }
+
+      LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
+        ("autoip_tmr() AutoIP-State: %"U16_F", ttw=%"U16_F"\n",
+        (u16_t)(netif->autoip->state), netif->autoip->ttw));
+
+      switch(netif->autoip->state) {
+        case AUTOIP_STATE_PROBING:
+          if (netif->autoip->ttw > 0) {
+            netif->autoip->ttw--;
+          } else {
+            if (netif->autoip->sent_num >= PROBE_NUM) {
+              netif->autoip->state = AUTOIP_STATE_ANNOUNCING;
+              netif->autoip->sent_num = 0;
+              netif->autoip->ttw = ANNOUNCE_WAIT * AUTOIP_TICKS_PER_SECOND;
+              LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+                 ("autoip_tmr(): changing state to ANNOUNCING: %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+                  ip4_addr1_16(&netif->autoip->llipaddr), ip4_addr2_16(&netif->autoip->llipaddr),
+                  ip4_addr3_16(&netif->autoip->llipaddr), ip4_addr4_16(&netif->autoip->llipaddr)));
+            } else {
+              autoip_arp_probe(netif);
+              LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
+                ("autoip_tmr() PROBING Sent Probe\n"));
+              netif->autoip->sent_num++;
+              /* calculate time to wait to next probe */
+              netif->autoip->ttw = (u16_t)((LWIP_AUTOIP_RAND(netif) %
+                ((PROBE_MAX - PROBE_MIN) * AUTOIP_TICKS_PER_SECOND) ) +
+                PROBE_MIN * AUTOIP_TICKS_PER_SECOND);
+            }
+          }
+          break;
+
+        case AUTOIP_STATE_ANNOUNCING:
+          if (netif->autoip->ttw > 0) {
+            netif->autoip->ttw--;
+          } else {
+            if (netif->autoip->sent_num == 0) {
+             /* We are here the first time, so we waited ANNOUNCE_WAIT seconds
+              * Now we can bind to an IP address and use it.
+              *
+              * autoip_bind calls netif_set_up. This triggers a gratuitous ARP
+              * which counts as an announcement.
+              */
+              autoip_bind(netif);
+            } else {
+              autoip_arp_announce(netif);
+              LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
+                ("autoip_tmr() ANNOUNCING Sent Announce\n"));
+            }
+            netif->autoip->ttw = ANNOUNCE_INTERVAL * AUTOIP_TICKS_PER_SECOND;
+            netif->autoip->sent_num++;
+
+            if (netif->autoip->sent_num >= ANNOUNCE_NUM) {
+                netif->autoip->state = AUTOIP_STATE_BOUND;
+                netif->autoip->sent_num = 0;
+                netif->autoip->ttw = 0;
+                 LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+                    ("autoip_tmr(): changing state to BOUND: %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+                     ip4_addr1_16(&netif->autoip->llipaddr), ip4_addr2_16(&netif->autoip->llipaddr),
+                     ip4_addr3_16(&netif->autoip->llipaddr), ip4_addr4_16(&netif->autoip->llipaddr)));
+            }
+          }
+          break;
+      }
+    }
+    /* proceed to next network interface */
+    netif = netif->next;
+  }
+}
+
+/**
+ * Handles every incoming ARP Packet, called by etharp_arp_input.
+ *
+ * @param netif network interface to use for autoip processing
+ * @param hdr Incoming ARP packet
+ */
+void
+autoip_arp_reply(struct netif *netif, struct etharp_hdr *hdr)
+{
+  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE, ("autoip_arp_reply()\n"));
+  if ((netif->autoip != NULL) && (netif->autoip->state != AUTOIP_STATE_OFF)) {
+   /* when ip.src == llipaddr && hw.src != netif->hwaddr
+    *
+    * when probing  ip.dst == llipaddr && hw.src != netif->hwaddr
+    * we have a conflict and must solve it
+    */
+    ip_addr_t sipaddr, dipaddr;
+    struct eth_addr netifaddr;
+    ETHADDR16_COPY(netifaddr.addr, netif->hwaddr);
+
+    /* Copy struct ip_addr2 to aligned ip_addr, to support compilers without
+     * structure packing (not using structure copy which breaks strict-aliasing rules).
+     */
+    IPADDR2_COPY(&sipaddr, &hdr->sipaddr);
+    IPADDR2_COPY(&dipaddr, &hdr->dipaddr);
+      
+    if ((netif->autoip->state == AUTOIP_STATE_PROBING) ||
+        ((netif->autoip->state == AUTOIP_STATE_ANNOUNCING) &&
+         (netif->autoip->sent_num == 0))) {
+     /* RFC 3927 Section 2.2.1:
+      * from beginning to after ANNOUNCE_WAIT
+      * seconds we have a conflict if
+      * ip.src == llipaddr OR
+      * ip.dst == llipaddr && hw.src != own hwaddr
+      */
+      if ((ip_addr_cmp(&sipaddr, &netif->autoip->llipaddr)) ||
+          (ip_addr_cmp(&dipaddr, &netif->autoip->llipaddr) &&
+           !eth_addr_cmp(&netifaddr, &hdr->shwaddr))) {
+        LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE | LWIP_DBG_LEVEL_WARNING,
+          ("autoip_arp_reply(): Probe Conflict detected\n"));
+        autoip_restart(netif);
+      }
+    } else {
+     /* RFC 3927 Section 2.5:
+      * in any state we have a conflict if
+      * ip.src == llipaddr && hw.src != own hwaddr
+      */
+      if (ip_addr_cmp(&sipaddr, &netif->autoip->llipaddr) &&
+          !eth_addr_cmp(&netifaddr, &hdr->shwaddr)) {
+        LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE | LWIP_DBG_LEVEL_WARNING,
+          ("autoip_arp_reply(): Conflicting ARP-Packet detected\n"));
+        autoip_handle_arp_conflict(netif);
+      }
+    }
+  }
+}
+
+#endif /* LWIP_AUTOIP */
diff --git a/ext/lwip/src/core/ipv4/icmp.c b/ext/lwip/src/core/ipv4/icmp.c
new file mode 100644
index 000000000..47ba85713
--- /dev/null
+++ b/ext/lwip/src/core/ipv4/icmp.c
@@ -0,0 +1,339 @@
+/**
+ * @file
+ * ICMP - Internet Control Message Protocol
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+/* Some ICMP messages should be passed to the transport protocols. This
+   is not implemented. */
+
+#include "lwip/opt.h"
+
+#if LWIP_ICMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/icmp.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/ip.h"
+#include "lwip/def.h"
+#include "lwip/stats.h"
+#include "lwip/snmp.h"
+
+#include <string.h>
+
+/** Small optimization: set to 0 if incoming PBUF_POOL pbuf always can be
+ * used to modify and send a response packet (and to 1 if this is not the case,
+ * e.g. when link header is stripped of when receiving) */
+#ifndef LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN
+#define LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN 1
+#endif /* LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN */
+
+/* The amount of data from the original packet to return in a dest-unreachable */
+#define ICMP_DEST_UNREACH_DATASIZE 8
+
+static void icmp_send_response(struct pbuf *p, u8_t type, u8_t code);
+
+/**
+ * Processes ICMP input packets, called from ip_input().
+ *
+ * Currently only processes icmp echo requests and sends
+ * out the echo response.
+ *
+ * @param p the icmp echo request packet, p->payload pointing to the ip header
+ * @param inp the netif on which this packet was received
+ */
+void
+icmp_input(struct pbuf *p, struct netif *inp)
+{
+  u8_t type;
+#ifdef LWIP_DEBUG
+  u8_t code;
+#endif /* LWIP_DEBUG */
+  struct icmp_echo_hdr *iecho;
+  struct ip_hdr *iphdr;
+  s16_t hlen;
+
+  ICMP_STATS_INC(icmp.recv);
+  snmp_inc_icmpinmsgs();
+
+
+  iphdr = (struct ip_hdr *)p->payload;
+  hlen = IPH_HL(iphdr) * 4;
+  if (pbuf_header(p, -hlen) || (p->tot_len < sizeof(u16_t)*2)) {
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: short ICMP (%"U16_F" bytes) received\n", p->tot_len));
+    goto lenerr;
+  }
+
+  type = *((u8_t *)p->payload);
+#ifdef LWIP_DEBUG
+  code = *(((u8_t *)p->payload)+1);
+#endif /* LWIP_DEBUG */
+  switch (type) {
+  case ICMP_ER:
+    /* This is OK, echo reply might have been parsed by a raw PCB
+       (as obviously, an echo request has been sent, too). */
+    break; 
+  case ICMP_ECHO:
+#if !LWIP_MULTICAST_PING || !LWIP_BROADCAST_PING
+    {
+      int accepted = 1;
+#if !LWIP_MULTICAST_PING
+      /* multicast destination address? */
+      if (ip_addr_ismulticast(&current_iphdr_dest)) {
+        accepted = 0;
+      }
+#endif /* LWIP_MULTICAST_PING */
+#if !LWIP_BROADCAST_PING
+      /* broadcast destination address? */
+      if (ip_addr_isbroadcast(&current_iphdr_dest, inp)) {
+        accepted = 0;
+      }
+#endif /* LWIP_BROADCAST_PING */
+      /* broadcast or multicast destination address not acceptd? */
+      if (!accepted) {
+        LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: Not echoing to multicast or broadcast pings\n"));
+        ICMP_STATS_INC(icmp.err);
+        pbuf_free(p);
+        return;
+      }
+    }
+#endif /* !LWIP_MULTICAST_PING || !LWIP_BROADCAST_PING */
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ping\n"));
+    if (p->tot_len < sizeof(struct icmp_echo_hdr)) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: bad ICMP echo received\n"));
+      goto lenerr;
+    }
+    if (inet_chksum_pbuf(p) != 0) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo\n"));
+      pbuf_free(p);
+      ICMP_STATS_INC(icmp.chkerr);
+      snmp_inc_icmpinerrors();
+      return;
+    }
+#if LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN
+    if (pbuf_header(p, (PBUF_IP_HLEN + PBUF_LINK_HLEN))) {
+      /* p is not big enough to contain link headers
+       * allocate a new one and copy p into it
+       */
+      struct pbuf *r;
+      /* switch p->payload to ip header */
+      if (pbuf_header(p, hlen)) {
+        LWIP_ASSERT("icmp_input: moving p->payload to ip header failed\n", 0);
+        goto memerr;
+      }
+      /* allocate new packet buffer with space for link headers */
+      r = pbuf_alloc(PBUF_LINK, p->tot_len, PBUF_RAM);
+      if (r == NULL) {
+        LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: allocating new pbuf failed\n"));
+        goto memerr;
+      }
+      LWIP_ASSERT("check that first pbuf can hold struct the ICMP header",
+                  (r->len >= hlen + sizeof(struct icmp_echo_hdr)));
+      /* copy the whole packet including ip header */
+      if (pbuf_copy(r, p) != ERR_OK) {
+        LWIP_ASSERT("icmp_input: copying to new pbuf failed\n", 0);
+        goto memerr;
+      }
+      iphdr = (struct ip_hdr *)r->payload;
+      /* switch r->payload back to icmp header */
+      if (pbuf_header(r, -hlen)) {
+        LWIP_ASSERT("icmp_input: restoring original p->payload failed\n", 0);
+        goto memerr;
+      }
+      /* free the original p */
+      pbuf_free(p);
+      /* we now have an identical copy of p that has room for link headers */
+      p = r;
+    } else {
+      /* restore p->payload to point to icmp header */
+      if (pbuf_header(p, -(s16_t)(PBUF_IP_HLEN + PBUF_LINK_HLEN))) {
+        LWIP_ASSERT("icmp_input: restoring original p->payload failed\n", 0);
+        goto memerr;
+      }
+    }
+#endif /* LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN */
+    /* At this point, all checks are OK. */
+    /* We generate an answer by switching the dest and src ip addresses,
+     * setting the icmp type to ECHO_RESPONSE and updating the checksum. */
+    iecho = (struct icmp_echo_hdr *)p->payload;
+    ip_addr_copy(iphdr->src, *ip_current_dest_addr());
+    ip_addr_copy(iphdr->dest, *ip_current_src_addr());
+    ICMPH_TYPE_SET(iecho, ICMP_ER);
+#if CHECKSUM_GEN_ICMP
+    /* adjust the checksum */
+    if (iecho->chksum >= PP_HTONS(0xffffU - (ICMP_ECHO << 8))) {
+      iecho->chksum += PP_HTONS(ICMP_ECHO << 8) + 1;
+    } else {
+      iecho->chksum += PP_HTONS(ICMP_ECHO << 8);
+    }
+#else /* CHECKSUM_GEN_ICMP */
+    iecho->chksum = 0;
+#endif /* CHECKSUM_GEN_ICMP */
+
+    /* Set the correct TTL and recalculate the header checksum. */
+    IPH_TTL_SET(iphdr, ICMP_TTL);
+    IPH_CHKSUM_SET(iphdr, 0);
+#if CHECKSUM_GEN_IP
+    IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
+#endif /* CHECKSUM_GEN_IP */
+
+    ICMP_STATS_INC(icmp.xmit);
+    /* increase number of messages attempted to send */
+    snmp_inc_icmpoutmsgs();
+    /* increase number of echo replies attempted to send */
+    snmp_inc_icmpoutechoreps();
+
+    if(pbuf_header(p, hlen)) {
+      LWIP_ASSERT("Can't move over header in packet", 0);
+    } else {
+      err_t ret;
+      /* send an ICMP packet, src addr is the dest addr of the curren packet */
+      ret = ip_output_if(p, ip_current_dest_addr(), IP_HDRINCL,
+                   ICMP_TTL, 0, IP_PROTO_ICMP, inp);
+      if (ret != ERR_OK) {
+        LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ip_output_if returned an error: %c.\n", ret));
+      }
+    }
+    break;
+  default:
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %"S16_F" code %"S16_F" not supported.\n", 
+                (s16_t)type, (s16_t)code));
+    ICMP_STATS_INC(icmp.proterr);
+    ICMP_STATS_INC(icmp.drop);
+  }
+  pbuf_free(p);
+  return;
+lenerr:
+  pbuf_free(p);
+  ICMP_STATS_INC(icmp.lenerr);
+  snmp_inc_icmpinerrors();
+  return;
+#if LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN
+memerr:
+  pbuf_free(p);
+  ICMP_STATS_INC(icmp.err);
+  snmp_inc_icmpinerrors();
+  return;
+#endif /* LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN */
+}
+
+/**
+ * Send an icmp 'destination unreachable' packet, called from ip_input() if
+ * the transport layer protocol is unknown and from udp_input() if the local
+ * port is not bound.
+ *
+ * @param p the input packet for which the 'unreachable' should be sent,
+ *          p->payload pointing to the IP header
+ * @param t type of the 'unreachable' packet
+ */
+void
+icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t)
+{
+  icmp_send_response(p, ICMP_DUR, t);
+}
+
+#if IP_FORWARD || IP_REASSEMBLY
+/**
+ * Send a 'time exceeded' packet, called from ip_forward() if TTL is 0.
+ *
+ * @param p the input packet for which the 'time exceeded' should be sent,
+ *          p->payload pointing to the IP header
+ * @param t type of the 'time exceeded' packet
+ */
+void
+icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t)
+{
+  icmp_send_response(p, ICMP_TE, t);
+}
+
+#endif /* IP_FORWARD || IP_REASSEMBLY */
+
+/**
+ * Send an icmp packet in response to an incoming packet.
+ *
+ * @param p the input packet for which the 'unreachable' should be sent,
+ *          p->payload pointing to the IP header
+ * @param type Type of the ICMP header
+ * @param code Code of the ICMP header
+ */
+static void
+icmp_send_response(struct pbuf *p, u8_t type, u8_t code)
+{
+  struct pbuf *q;
+  struct ip_hdr *iphdr;
+  /* we can use the echo header here */
+  struct icmp_echo_hdr *icmphdr;
+  ip_addr_t iphdr_src;
+
+  /* ICMP header + IP header + 8 bytes of data */
+  q = pbuf_alloc(PBUF_IP, sizeof(struct icmp_echo_hdr) + IP_HLEN + ICMP_DEST_UNREACH_DATASIZE,
+                 PBUF_RAM);
+  if (q == NULL) {
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded: failed to allocate pbuf for ICMP packet.\n"));
+    return;
+  }
+  LWIP_ASSERT("check that first pbuf can hold icmp message",
+             (q->len >= (sizeof(struct icmp_echo_hdr) + IP_HLEN + ICMP_DEST_UNREACH_DATASIZE)));
+
+  iphdr = (struct ip_hdr *)p->payload;
+  LWIP_DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded from "));
+  ip_addr_debug_print(ICMP_DEBUG, &(iphdr->src));
+  LWIP_DEBUGF(ICMP_DEBUG, (" to "));
+  ip_addr_debug_print(ICMP_DEBUG, &(iphdr->dest));
+  LWIP_DEBUGF(ICMP_DEBUG, ("\n"));
+
+  icmphdr = (struct icmp_echo_hdr *)q->payload;
+  icmphdr->type = type;
+  icmphdr->code = code;
+  icmphdr->id = 0;
+  icmphdr->seqno = 0;
+
+  /* copy fields from original packet */
+  SMEMCPY((u8_t *)q->payload + sizeof(struct icmp_echo_hdr), (u8_t *)p->payload,
+          IP_HLEN + ICMP_DEST_UNREACH_DATASIZE);
+
+  /* calculate checksum */
+  icmphdr->chksum = 0;
+  icmphdr->chksum = inet_chksum(icmphdr, q->len);
+  ICMP_STATS_INC(icmp.xmit);
+  /* increase number of messages attempted to send */
+  snmp_inc_icmpoutmsgs();
+  /* increase number of destination unreachable messages attempted to send */
+  snmp_inc_icmpouttimeexcds();
+  ip_addr_copy(iphdr_src, iphdr->src);
+  ip_output(q, NULL, &iphdr_src, ICMP_TTL, 0, IP_PROTO_ICMP);
+  pbuf_free(q);
+}
+
+#endif /* LWIP_ICMP */
diff --git a/ext/lwip/src/core/ipv4/igmp.c b/ext/lwip/src/core/ipv4/igmp.c
new file mode 100644
index 000000000..45bb5d95c
--- /dev/null
+++ b/ext/lwip/src/core/ipv4/igmp.c
@@ -0,0 +1,805 @@
+/**
+ * @file
+ * IGMP - Internet Group Management Protocol
+ *
+ */
+
+/*
+ * Copyright (c) 2002 CITEL Technologies Ltd.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY CITEL TECHNOLOGIES AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ *
+ * This file is a contribution to the lwIP TCP/IP stack.
+ * The Swedish Institute of Computer Science and Adam Dunkels
+ * are specifically granted permission to redistribute this
+ * source code.
+*/
+
+/*-------------------------------------------------------------
+Note 1)
+Although the rfc requires V1 AND V2 capability
+we will only support v2 since now V1 is very old (August 1989)
+V1 can be added if required
+
+a debug print and statistic have been implemented to
+show this up.
+-------------------------------------------------------------
+-------------------------------------------------------------
+Note 2)
+A query for a specific group address (as opposed to ALLHOSTS)
+has now been implemented as I am unsure if it is required
+
+a debug print and statistic have been implemented to
+show this up.
+-------------------------------------------------------------
+-------------------------------------------------------------
+Note 3)
+The router alert rfc 2113 is implemented in outgoing packets
+but not checked rigorously incoming
+-------------------------------------------------------------
+Steve Reynolds
+------------------------------------------------------------*/
+
+/*-----------------------------------------------------------------------------
+ * RFC 988  - Host extensions for IP multicasting                         - V0
+ * RFC 1054 - Host extensions for IP multicasting                         -
+ * RFC 1112 - Host extensions for IP multicasting                         - V1
+ * RFC 2236 - Internet Group Management Protocol, Version 2               - V2  <- this code is based on this RFC (it's the "de facto" standard)
+ * RFC 3376 - Internet Group Management Protocol, Version 3               - V3
+ * RFC 4604 - Using Internet Group Management Protocol Version 3...       - V3+
+ * RFC 2113 - IP Router Alert Option                                      - 
+ *----------------------------------------------------------------------------*/
+
+/*-----------------------------------------------------------------------------
+ * Includes
+ *----------------------------------------------------------------------------*/
+
+#include "lwip/opt.h"
+
+#if LWIP_IGMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/igmp.h"
+#include "lwip/debug.h"
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/ip.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/netif.h"
+#include "lwip/icmp.h"
+#include "lwip/udp.h"
+#include "lwip/tcp.h"
+#include "lwip/stats.h"
+
+#include "string.h"
+
+/* 
+ * IGMP constants
+ */
+#define IGMP_TTL                       1
+#define IGMP_MINLEN                    8
+#define ROUTER_ALERT                   0x9404U
+#define ROUTER_ALERTLEN                4
+
+/*
+ * IGMP message types, including version number.
+ */
+#define IGMP_MEMB_QUERY                0x11 /* Membership query         */
+#define IGMP_V1_MEMB_REPORT            0x12 /* Ver. 1 membership report */
+#define IGMP_V2_MEMB_REPORT            0x16 /* Ver. 2 membership report */
+#define IGMP_LEAVE_GROUP               0x17 /* Leave-group message      */
+
+/* Group  membership states */
+#define IGMP_GROUP_NON_MEMBER          0
+#define IGMP_GROUP_DELAYING_MEMBER     1
+#define IGMP_GROUP_IDLE_MEMBER         2
+
+/**
+ * IGMP packet format.
+ */
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct igmp_msg {
+ PACK_STRUCT_FIELD(u8_t           igmp_msgtype);
+ PACK_STRUCT_FIELD(u8_t           igmp_maxresp);
+ PACK_STRUCT_FIELD(u16_t          igmp_checksum);
+ PACK_STRUCT_FIELD(ip_addr_p_t    igmp_group_address);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+
+static struct igmp_group *igmp_lookup_group(struct netif *ifp, ip_addr_t *addr);
+static err_t  igmp_remove_group(struct igmp_group *group);
+static void   igmp_timeout( struct igmp_group *group);
+static void   igmp_start_timer(struct igmp_group *group, u8_t max_time);
+static void   igmp_delaying_member(struct igmp_group *group, u8_t maxresp);
+static err_t  igmp_ip_output_if(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest, struct netif *netif);
+static void   igmp_send(struct igmp_group *group, u8_t type);
+
+
+static struct igmp_group* igmp_group_list;
+static ip_addr_t     allsystems;
+static ip_addr_t     allrouters;
+
+
+/**
+ * Initialize the IGMP module
+ */
+void
+igmp_init(void)
+{
+  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_init: initializing\n"));
+
+  IP4_ADDR(&allsystems, 224, 0, 0, 1);
+  IP4_ADDR(&allrouters, 224, 0, 0, 2);
+}
+
+#ifdef LWIP_DEBUG
+/**
+ * Dump global IGMP groups list
+ */
+void
+igmp_dump_group_list()
+{ 
+  struct igmp_group *group = igmp_group_list;
+
+  while (group != NULL) {
+    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_dump_group_list: [%"U32_F"] ", (u32_t)(group->group_state)));
+    ip_addr_debug_print(IGMP_DEBUG, &group->group_address);
+    LWIP_DEBUGF(IGMP_DEBUG, (" on if %p\n", group->netif));
+    group = group->next;
+  }
+  LWIP_DEBUGF(IGMP_DEBUG, ("\n"));
+}
+#else
+#define igmp_dump_group_list()
+#endif /* LWIP_DEBUG */
+
+/**
+ * Start IGMP processing on interface
+ *
+ * @param netif network interface on which start IGMP processing
+ */
+err_t
+igmp_start(struct netif *netif)
+{
+  struct igmp_group* group;
+
+  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_start: starting IGMP processing on if %p\n", netif));
+
+  group = igmp_lookup_group(netif, &allsystems);
+
+  if (group != NULL) {
+    group->group_state = IGMP_GROUP_IDLE_MEMBER;
+    group->use++;
+
+    /* Allow the igmp messages at the MAC level */
+    if (netif->igmp_mac_filter != NULL) {
+      LWIP_DEBUGF(IGMP_DEBUG, ("igmp_start: igmp_mac_filter(ADD "));
+      ip_addr_debug_print(IGMP_DEBUG, &allsystems);
+      LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", netif));
+      netif->igmp_mac_filter(netif, &allsystems, IGMP_ADD_MAC_FILTER);
+    }
+
+    return ERR_OK;
+  }
+
+  return ERR_MEM;
+}
+
+/**
+ * Stop IGMP processing on interface
+ *
+ * @param netif network interface on which stop IGMP processing
+ */
+err_t
+igmp_stop(struct netif *netif)
+{
+  struct igmp_group *group = igmp_group_list;
+  struct igmp_group *prev  = NULL;
+  struct igmp_group *next;
+
+  /* look for groups joined on this interface further down the list */
+  while (group != NULL) {
+    next = group->next;
+    /* is it a group joined on this interface? */
+    if (group->netif == netif) {
+      /* is it the first group of the list? */
+      if (group == igmp_group_list) {
+        igmp_group_list = next;
+      }
+      /* is there a "previous" group defined? */
+      if (prev != NULL) {
+        prev->next = next;
+      }
+      /* disable the group at the MAC level */
+      if (netif->igmp_mac_filter != NULL) {
+        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_stop: igmp_mac_filter(DEL "));
+        ip_addr_debug_print(IGMP_DEBUG, &group->group_address);
+        LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", netif));
+        netif->igmp_mac_filter(netif, &(group->group_address), IGMP_DEL_MAC_FILTER);
+      }
+      /* free group */
+      memp_free(MEMP_IGMP_GROUP, group);
+    } else {
+      /* change the "previous" */
+      prev = group;
+    }
+    /* move to "next" */
+    group = next;
+  }
+  return ERR_OK;
+}
+
+/**
+ * Report IGMP memberships for this interface
+ *
+ * @param netif network interface on which report IGMP memberships
+ */
+void
+igmp_report_groups(struct netif *netif)
+{
+  struct igmp_group *group = igmp_group_list;
+
+  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_report_groups: sending IGMP reports on if %p\n", netif));
+
+  while (group != NULL) {
+    if (group->netif == netif) {
+      igmp_delaying_member(group, IGMP_JOIN_DELAYING_MEMBER_TMR);
+    }
+    group = group->next;
+  }
+}
+
+/**
+ * Search for a group in the global igmp_group_list
+ *
+ * @param ifp the network interface for which to look
+ * @param addr the group ip address to search for
+ * @return a struct igmp_group* if the group has been found,
+ *         NULL if the group wasn't found.
+ */
+struct igmp_group *
+igmp_lookfor_group(struct netif *ifp, ip_addr_t *addr)
+{
+  struct igmp_group *group = igmp_group_list;
+
+  while (group != NULL) {
+    if ((group->netif == ifp) && (ip_addr_cmp(&(group->group_address), addr))) {
+      return group;
+    }
+    group = group->next;
+  }
+
+  /* to be clearer, we return NULL here instead of
+   * 'group' (which is also NULL at this point).
+   */
+  return NULL;
+}
+
+/**
+ * Search for a specific igmp group and create a new one if not found-
+ *
+ * @param ifp the network interface for which to look
+ * @param addr the group ip address to search
+ * @return a struct igmp_group*,
+ *         NULL on memory error.
+ */
+struct igmp_group *
+igmp_lookup_group(struct netif *ifp, ip_addr_t *addr)
+{
+  struct igmp_group *group = igmp_group_list;
+  
+  /* Search if the group already exists */
+  group = igmp_lookfor_group(ifp, addr);
+  if (group != NULL) {
+    /* Group already exists. */
+    return group;
+  }
+
+  /* Group doesn't exist yet, create a new one */
+  group = (struct igmp_group *)memp_malloc(MEMP_IGMP_GROUP);
+  if (group != NULL) {
+    group->netif              = ifp;
+    ip_addr_set(&(group->group_address), addr);
+    group->timer              = 0; /* Not running */
+    group->group_state        = IGMP_GROUP_NON_MEMBER;
+    group->last_reporter_flag = 0;
+    group->use                = 0;
+    group->next               = igmp_group_list;
+    
+    igmp_group_list = group;
+  }
+
+  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_lookup_group: %sallocated a new group with address ", (group?"":"impossible to ")));
+  ip_addr_debug_print(IGMP_DEBUG, addr);
+  LWIP_DEBUGF(IGMP_DEBUG, (" on if %p\n", ifp));
+
+  return group;
+}
+
+/**
+ * Remove a group in the global igmp_group_list
+ *
+ * @param group the group to remove from the global igmp_group_list
+ * @return ERR_OK if group was removed from the list, an err_t otherwise
+ */
+static err_t
+igmp_remove_group(struct igmp_group *group)
+{
+  err_t err = ERR_OK;
+
+  /* Is it the first group? */
+  if (igmp_group_list == group) {
+    igmp_group_list = group->next;
+  } else {
+    /* look for group further down the list */
+    struct igmp_group *tmpGroup;
+    for (tmpGroup = igmp_group_list; tmpGroup != NULL; tmpGroup = tmpGroup->next) {
+      if (tmpGroup->next == group) {
+        tmpGroup->next = group->next;
+        break;
+      }
+    }
+    /* Group not found in the global igmp_group_list */
+    if (tmpGroup == NULL)
+      err = ERR_ARG;
+  }
+  /* free group */
+  memp_free(MEMP_IGMP_GROUP, group);
+
+  return err;
+}
+
+/**
+ * Called from ip_input() if a new IGMP packet is received.
+ *
+ * @param p received igmp packet, p->payload pointing to the ip header
+ * @param inp network interface on which the packet was received
+ * @param dest destination ip address of the igmp packet
+ */
+void
+igmp_input(struct pbuf *p, struct netif *inp, ip_addr_t *dest)
+{
+  struct ip_hdr *    iphdr;
+  struct igmp_msg*   igmp;
+  struct igmp_group* group;
+  struct igmp_group* groupref;
+
+  IGMP_STATS_INC(igmp.recv);
+
+  /* Note that the length CAN be greater than 8 but only 8 are used - All are included in the checksum */    
+  iphdr = (struct ip_hdr *)p->payload;
+  if (pbuf_header(p, -(s16_t)(IPH_HL(iphdr) * 4)) || (p->len < IGMP_MINLEN)) {
+    pbuf_free(p);
+    IGMP_STATS_INC(igmp.lenerr);
+    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: length error\n"));
+    return;
+  }
+
+  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: message from "));
+  ip_addr_debug_print(IGMP_DEBUG, &(iphdr->src));
+  LWIP_DEBUGF(IGMP_DEBUG, (" to address "));
+  ip_addr_debug_print(IGMP_DEBUG, &(iphdr->dest));
+  LWIP_DEBUGF(IGMP_DEBUG, (" on if %p\n", inp));
+
+  /* Now calculate and check the checksum */
+  igmp = (struct igmp_msg *)p->payload;
+  if (inet_chksum(igmp, p->len)) {
+    pbuf_free(p);
+    IGMP_STATS_INC(igmp.chkerr);
+    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: checksum error\n"));
+    return;
+  }
+
+  /* Packet is ok so find an existing group */
+  group = igmp_lookfor_group(inp, dest); /* use the destination IP address of incoming packet */
+  
+  /* If group can be found or create... */
+  if (!group) {
+    pbuf_free(p);
+    IGMP_STATS_INC(igmp.drop);
+    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: IGMP frame not for us\n"));
+    return;
+  }
+
+  /* NOW ACT ON THE INCOMING MESSAGE TYPE... */
+  switch (igmp->igmp_msgtype) {
+   case IGMP_MEMB_QUERY: {
+     /* IGMP_MEMB_QUERY to the "all systems" address ? */
+     if ((ip_addr_cmp(dest, &allsystems)) && ip_addr_isany(&igmp->igmp_group_address)) {
+       /* THIS IS THE GENERAL QUERY */
+       LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: General IGMP_MEMB_QUERY on \"ALL SYSTEMS\" address (224.0.0.1) [igmp_maxresp=%i]\n", (int)(igmp->igmp_maxresp)));
+
+       if (igmp->igmp_maxresp == 0) {
+         IGMP_STATS_INC(igmp.rx_v1);
+         LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: got an all hosts query with time== 0 - this is V1 and not implemented - treat as v2\n"));
+         igmp->igmp_maxresp = IGMP_V1_DELAYING_MEMBER_TMR;
+       } else {
+         IGMP_STATS_INC(igmp.rx_general);
+       }
+
+       groupref = igmp_group_list;
+       while (groupref) {
+         /* Do not send messages on the all systems group address! */
+         if ((groupref->netif == inp) && (!(ip_addr_cmp(&(groupref->group_address), &allsystems)))) {
+           igmp_delaying_member(groupref, igmp->igmp_maxresp);
+         }
+         groupref = groupref->next;
+       }
+     } else {
+       /* IGMP_MEMB_QUERY to a specific group ? */
+       if (!ip_addr_isany(&igmp->igmp_group_address)) {
+         LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: IGMP_MEMB_QUERY to a specific group "));
+         ip_addr_debug_print(IGMP_DEBUG, &igmp->igmp_group_address);
+         if (ip_addr_cmp(dest, &allsystems)) {
+           ip_addr_t groupaddr;
+           LWIP_DEBUGF(IGMP_DEBUG, (" using \"ALL SYSTEMS\" address (224.0.0.1) [igmp_maxresp=%i]\n", (int)(igmp->igmp_maxresp)));
+           /* we first need to re-look for the group since we used dest last time */
+           ip_addr_copy(groupaddr, igmp->igmp_group_address);
+           group = igmp_lookfor_group(inp, &groupaddr);
+         } else {
+           LWIP_DEBUGF(IGMP_DEBUG, (" with the group address as destination [igmp_maxresp=%i]\n", (int)(igmp->igmp_maxresp)));
+         }
+
+         if (group != NULL) {
+           IGMP_STATS_INC(igmp.rx_group);
+           igmp_delaying_member(group, igmp->igmp_maxresp);
+         } else {
+           IGMP_STATS_INC(igmp.drop);
+         }
+       } else {
+         IGMP_STATS_INC(igmp.proterr);
+       }
+     }
+     break;
+   }
+   case IGMP_V2_MEMB_REPORT: {
+     LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: IGMP_V2_MEMB_REPORT\n"));
+     IGMP_STATS_INC(igmp.rx_report);
+     if (group->group_state == IGMP_GROUP_DELAYING_MEMBER) {
+       /* This is on a specific group we have already looked up */
+       group->timer = 0; /* stopped */
+       group->group_state = IGMP_GROUP_IDLE_MEMBER;
+       group->last_reporter_flag = 0;
+     }
+     break;
+   }
+   default: {
+     LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: unexpected msg %d in state %d on group %p on if %p\n",
+       igmp->igmp_msgtype, group->group_state, &group, group->netif));
+     IGMP_STATS_INC(igmp.proterr);
+     break;
+   }
+  }
+
+  pbuf_free(p);
+  return;
+}
+
+/**
+ * Join a group on one network interface.
+ *
+ * @param ifaddr ip address of the network interface which should join a new group
+ * @param groupaddr the ip address of the group which to join
+ * @return ERR_OK if group was joined on the netif(s), an err_t otherwise
+ */
+err_t
+igmp_joingroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr)
+{
+  err_t              err = ERR_VAL; /* no matching interface */
+  struct igmp_group *group;
+  struct netif      *netif;
+
+  /* make sure it is multicast address */
+  LWIP_ERROR("igmp_joingroup: attempt to join non-multicast address", ip_addr_ismulticast(groupaddr), return ERR_VAL;);
+  LWIP_ERROR("igmp_joingroup: attempt to join allsystems address", (!ip_addr_cmp(groupaddr, &allsystems)), return ERR_VAL;);
+
+  /* loop through netif's */
+  netif = netif_list;
+  while (netif != NULL) {
+    /* Should we join this interface ? */
+    if ((netif->flags & NETIF_FLAG_IGMP) && ((ip_addr_isany(ifaddr) || ip_addr_cmp(&(netif->ip_addr), ifaddr)))) {
+      /* find group or create a new one if not found */
+      group = igmp_lookup_group(netif, groupaddr);
+
+      if (group != NULL) {
+        /* This should create a new group, check the state to make sure */
+        if (group->group_state != IGMP_GROUP_NON_MEMBER) {
+          LWIP_DEBUGF(IGMP_DEBUG, ("igmp_joingroup: join to group not in state IGMP_GROUP_NON_MEMBER\n"));
+        } else {
+          /* OK - it was new group */
+          LWIP_DEBUGF(IGMP_DEBUG, ("igmp_joingroup: join to new group: "));
+          ip_addr_debug_print(IGMP_DEBUG, groupaddr);
+          LWIP_DEBUGF(IGMP_DEBUG, ("\n"));
+
+          /* If first use of the group, allow the group at the MAC level */
+          if ((group->use==0) && (netif->igmp_mac_filter != NULL)) {
+            LWIP_DEBUGF(IGMP_DEBUG, ("igmp_joingroup: igmp_mac_filter(ADD "));
+            ip_addr_debug_print(IGMP_DEBUG, groupaddr);
+            LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", netif));
+            netif->igmp_mac_filter(netif, groupaddr, IGMP_ADD_MAC_FILTER);
+          }
+
+          IGMP_STATS_INC(igmp.tx_join);
+          igmp_send(group, IGMP_V2_MEMB_REPORT);
+
+          igmp_start_timer(group, IGMP_JOIN_DELAYING_MEMBER_TMR);
+
+          /* Need to work out where this timer comes from */
+          group->group_state = IGMP_GROUP_DELAYING_MEMBER;
+        }
+        /* Increment group use */
+        group->use++;
+        /* Join on this interface */
+        err = ERR_OK;
+      } else {
+        /* Return an error even if some network interfaces are joined */
+        /** @todo undo any other netif already joined */
+        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_joingroup: Not enought memory to join to group\n"));
+        return ERR_MEM;
+      }
+    }
+    /* proceed to next network interface */
+    netif = netif->next;
+  }
+
+  return err;
+}
+
+/**
+ * Leave a group on one network interface.
+ *
+ * @param ifaddr ip address of the network interface which should leave a group
+ * @param groupaddr the ip address of the group which to leave
+ * @return ERR_OK if group was left on the netif(s), an err_t otherwise
+ */
+err_t
+igmp_leavegroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr)
+{
+  err_t              err = ERR_VAL; /* no matching interface */
+  struct igmp_group *group;
+  struct netif      *netif;
+
+  /* make sure it is multicast address */
+  LWIP_ERROR("igmp_leavegroup: attempt to leave non-multicast address", ip_addr_ismulticast(groupaddr), return ERR_VAL;);
+  LWIP_ERROR("igmp_leavegroup: attempt to leave allsystems address", (!ip_addr_cmp(groupaddr, &allsystems)), return ERR_VAL;);
+
+  /* loop through netif's */
+  netif = netif_list;
+  while (netif != NULL) {
+    /* Should we leave this interface ? */
+    if ((netif->flags & NETIF_FLAG_IGMP) && ((ip_addr_isany(ifaddr) || ip_addr_cmp(&(netif->ip_addr), ifaddr)))) {
+      /* find group */
+      group = igmp_lookfor_group(netif, groupaddr);
+
+      if (group != NULL) {
+        /* Only send a leave if the flag is set according to the state diagram */
+        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup: Leaving group: "));
+        ip_addr_debug_print(IGMP_DEBUG, groupaddr);
+        LWIP_DEBUGF(IGMP_DEBUG, ("\n"));
+
+        /* If there is no other use of the group */
+        if (group->use <= 1) {
+          /* If we are the last reporter for this group */
+          if (group->last_reporter_flag) {
+            LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup: sending leaving group\n"));
+            IGMP_STATS_INC(igmp.tx_leave);
+            igmp_send(group, IGMP_LEAVE_GROUP);
+          }
+          
+          /* Disable the group at the MAC level */
+          if (netif->igmp_mac_filter != NULL) {
+            LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup: igmp_mac_filter(DEL "));
+            ip_addr_debug_print(IGMP_DEBUG, groupaddr);
+            LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", netif));
+            netif->igmp_mac_filter(netif, groupaddr, IGMP_DEL_MAC_FILTER);
+          }
+          
+          LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup: remove group: "));
+          ip_addr_debug_print(IGMP_DEBUG, groupaddr);
+          LWIP_DEBUGF(IGMP_DEBUG, ("\n"));          
+          
+          /* Free the group */
+          igmp_remove_group(group);
+        } else {
+          /* Decrement group use */
+          group->use--;
+        }
+        /* Leave on this interface */
+        err = ERR_OK;
+      } else {
+        /* It's not a fatal error on "leavegroup" */
+        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup: not member of group\n"));
+      }
+    }
+    /* proceed to next network interface */
+    netif = netif->next;
+  }
+
+  return err;
+}
+
+/**
+ * The igmp timer function (both for NO_SYS=1 and =0)
+ * Should be called every IGMP_TMR_INTERVAL milliseconds (100 ms is default).
+ */
+void
+igmp_tmr(void)
+{
+  struct igmp_group *group = igmp_group_list;
+
+  while (group != NULL) {
+    if (group->timer > 0) {
+      group->timer--;
+      if (group->timer == 0) {
+        igmp_timeout(group);
+      }
+    }
+    group = group->next;
+  }
+}
+
+/**
+ * Called if a timeout for one group is reached.
+ * Sends a report for this group.
+ *
+ * @param group an igmp_group for which a timeout is reached
+ */
+static void
+igmp_timeout(struct igmp_group *group)
+{
+  /* If the state is IGMP_GROUP_DELAYING_MEMBER then we send a report for this group */
+  if (group->group_state == IGMP_GROUP_DELAYING_MEMBER) {
+    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_timeout: report membership for group with address "));
+    ip_addr_debug_print(IGMP_DEBUG, &(group->group_address));
+    LWIP_DEBUGF(IGMP_DEBUG, (" on if %p\n", group->netif));
+
+    IGMP_STATS_INC(igmp.tx_report);
+    igmp_send(group, IGMP_V2_MEMB_REPORT);
+  }
+}
+
+/**
+ * Start a timer for an igmp group
+ *
+ * @param group the igmp_group for which to start a timer
+ * @param max_time the time in multiples of IGMP_TMR_INTERVAL (decrease with
+ *        every call to igmp_tmr())
+ */
+static void
+igmp_start_timer(struct igmp_group *group, u8_t max_time)
+{
+  /* ensure the input value is > 0 */
+  if (max_time == 0) {
+    max_time = 1;
+  }
+  /* ensure the random value is > 0 */
+  group->timer = (LWIP_RAND() % (max_time - 1)) + 1;
+}
+
+/**
+ * Delaying membership report for a group if necessary
+ *
+ * @param group the igmp_group for which "delaying" membership report
+ * @param maxresp query delay
+ */
+static void
+igmp_delaying_member(struct igmp_group *group, u8_t maxresp)
+{
+  if ((group->group_state == IGMP_GROUP_IDLE_MEMBER) ||
+     ((group->group_state == IGMP_GROUP_DELAYING_MEMBER) &&
+      ((group->timer == 0) || (maxresp < group->timer)))) {
+    igmp_start_timer(group, maxresp);
+    group->group_state = IGMP_GROUP_DELAYING_MEMBER;
+  }
+}
+
+
+/**
+ * Sends an IP packet on a network interface. This function constructs the IP header
+ * and calculates the IP header checksum. If the source IP address is NULL,
+ * the IP address of the outgoing network interface is filled in as source address.
+ *
+ * @param p the packet to send (p->payload points to the data, e.g. next
+            protocol header; if dest == IP_HDRINCL, p already includes an IP
+            header and p->payload points to that IP header)
+ * @param src the source IP address to send from (if src == IP_ADDR_ANY, the
+ *         IP  address of the netif used to send is used as source address)
+ * @param dest the destination IP address to send the packet to
+ * @param ttl the TTL value to be set in the IP header
+ * @param proto the PROTOCOL to be set in the IP header
+ * @param netif the netif on which to send this packet
+ * @return ERR_OK if the packet was sent OK
+ *         ERR_BUF if p doesn't have enough space for IP/LINK headers
+ *         returns errors returned by netif->output
+ */
+static err_t
+igmp_ip_output_if(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest, struct netif *netif)
+{
+  /* This is the "router alert" option */
+  u16_t ra[2];
+  ra[0] = PP_HTONS(ROUTER_ALERT);
+  ra[1] = 0x0000; /* Router shall examine packet */
+  IGMP_STATS_INC(igmp.xmit);
+  return ip_output_if_opt(p, src, dest, IGMP_TTL, 0, IP_PROTO_IGMP, netif, ra, ROUTER_ALERTLEN);
+}
+
+/**
+ * Send an igmp packet to a specific group.
+ *
+ * @param group the group to which to send the packet
+ * @param type the type of igmp packet to send
+ */
+static void
+igmp_send(struct igmp_group *group, u8_t type)
+{
+  struct pbuf*     p    = NULL;
+  struct igmp_msg* igmp = NULL;
+  ip_addr_t   src  = *IP_ADDR_ANY;
+  ip_addr_t*  dest = NULL;
+
+  /* IP header + "router alert" option + IGMP header */
+  p = pbuf_alloc(PBUF_TRANSPORT, IGMP_MINLEN, PBUF_RAM);
+  
+  if (p) {
+    igmp = (struct igmp_msg *)p->payload;
+    LWIP_ASSERT("igmp_send: check that first pbuf can hold struct igmp_msg",
+               (p->len >= sizeof(struct igmp_msg)));
+    ip_addr_copy(src, group->netif->ip_addr);
+     
+    if (type == IGMP_V2_MEMB_REPORT) {
+      dest = &(group->group_address);
+      ip_addr_copy(igmp->igmp_group_address, group->group_address);
+      group->last_reporter_flag = 1; /* Remember we were the last to report */
+    } else {
+      if (type == IGMP_LEAVE_GROUP) {
+        dest = &allrouters;
+        ip_addr_copy(igmp->igmp_group_address, group->group_address);
+      }
+    }
+
+    if ((type == IGMP_V2_MEMB_REPORT) || (type == IGMP_LEAVE_GROUP)) {
+      igmp->igmp_msgtype  = type;
+      igmp->igmp_maxresp  = 0;
+      igmp->igmp_checksum = 0;
+      igmp->igmp_checksum = inet_chksum(igmp, IGMP_MINLEN);
+
+      igmp_ip_output_if(p, &src, dest, group->netif);
+    }
+
+    pbuf_free(p);
+  } else {
+    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_send: not enough memory for igmp_send\n"));
+    IGMP_STATS_INC(igmp.memerr);
+  }
+}
+
+#endif /* LWIP_IGMP */
diff --git a/ext/lwip/src/core/ipv4/inet.c b/ext/lwip/src/core/ipv4/inet.c
new file mode 100644
index 000000000..e283a5766
--- /dev/null
+++ b/ext/lwip/src/core/ipv4/inet.c
@@ -0,0 +1,42 @@
+/**
+ * @file
+ * Functions common to all TCP/IPv4 modules, such as the byte order functions.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/inet.h"
+
diff --git a/ext/lwip/src/core/ipv4/inet_chksum.c b/ext/lwip/src/core/ipv4/inet_chksum.c
new file mode 100644
index 000000000..960252f64
--- /dev/null
+++ b/ext/lwip/src/core/ipv4/inet_chksum.c
@@ -0,0 +1,450 @@
+/**
+ * @file
+ * Incluse internet checksum functions.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/inet_chksum.h"
+#include "lwip/def.h"
+
+#include <stddef.h>
+#include <string.h>
+
+/* These are some reference implementations of the checksum algorithm, with the
+ * aim of being simple, correct and fully portable. Checksumming is the
+ * first thing you would want to optimize for your platform. If you create
+ * your own version, link it in and in your cc.h put:
+ * 
+ * #define LWIP_CHKSUM <your_checksum_routine> 
+ *
+ * Or you can select from the implementations below by defining
+ * LWIP_CHKSUM_ALGORITHM to 1, 2 or 3.
+ */
+
+#ifndef LWIP_CHKSUM
+# define LWIP_CHKSUM lwip_standard_chksum
+# ifndef LWIP_CHKSUM_ALGORITHM
+#  define LWIP_CHKSUM_ALGORITHM 2
+# endif
+#endif
+/* If none set: */
+#ifndef LWIP_CHKSUM_ALGORITHM
+# define LWIP_CHKSUM_ALGORITHM 0
+#endif
+
+#if (LWIP_CHKSUM_ALGORITHM == 1) /* Version #1 */
+/**
+ * lwip checksum
+ *
+ * @param dataptr points to start of data to be summed at any boundary
+ * @param len length of data to be summed
+ * @return host order (!) lwip checksum (non-inverted Internet sum) 
+ *
+ * @note accumulator size limits summable length to 64k
+ * @note host endianess is irrelevant (p3 RFC1071)
+ */
+static u16_t
+lwip_standard_chksum(void *dataptr, u16_t len)
+{
+  u32_t acc;
+  u16_t src;
+  u8_t *octetptr;
+
+  acc = 0;
+  /* dataptr may be at odd or even addresses */
+  octetptr = (u8_t*)dataptr;
+  while (len > 1) {
+    /* declare first octet as most significant
+       thus assume network order, ignoring host order */
+    src = (*octetptr) << 8;
+    octetptr++;
+    /* declare second octet as least significant */
+    src |= (*octetptr);
+    octetptr++;
+    acc += src;
+    len -= 2;
+  }
+  if (len > 0) {
+    /* accumulate remaining octet */
+    src = (*octetptr) << 8;
+    acc += src;
+  }
+  /* add deferred carry bits */
+  acc = (acc >> 16) + (acc & 0x0000ffffUL);
+  if ((acc & 0xffff0000UL) != 0) {
+    acc = (acc >> 16) + (acc & 0x0000ffffUL);
+  }
+  /* This maybe a little confusing: reorder sum using htons()
+     instead of ntohs() since it has a little less call overhead.
+     The caller must invert bits for Internet sum ! */
+  return htons((u16_t)acc);
+}
+#endif
+
+#if (LWIP_CHKSUM_ALGORITHM == 2) /* Alternative version #2 */
+/*
+ * Curt McDowell
+ * Broadcom Corp.
+ * csm@broadcom.com
+ *
+ * IP checksum two bytes at a time with support for
+ * unaligned buffer.
+ * Works for len up to and including 0x20000.
+ * by Curt McDowell, Broadcom Corp. 12/08/2005
+ *
+ * @param dataptr points to start of data to be summed at any boundary
+ * @param len length of data to be summed
+ * @return host order (!) lwip checksum (non-inverted Internet sum) 
+ */
+
+static u16_t
+lwip_standard_chksum(void *dataptr, int len)
+{
+  u8_t *pb = (u8_t *)dataptr;
+  u16_t *ps, t = 0;
+  u32_t sum = 0;
+  int odd = ((mem_ptr_t)pb & 1);
+
+  /* Get aligned to u16_t */
+  if (odd && len > 0) {
+    ((u8_t *)&t)[1] = *pb++;
+    len--;
+  }
+
+  /* Add the bulk of the data */
+  ps = (u16_t *)(void *)pb;
+  while (len > 1) {
+    sum += *ps++;
+    len -= 2;
+  }
+
+  /* Consume left-over byte, if any */
+  if (len > 0) {
+    ((u8_t *)&t)[0] = *(u8_t *)ps;
+  }
+
+  /* Add end bytes */
+  sum += t;
+
+  /* Fold 32-bit sum to 16 bits
+     calling this twice is propably faster than if statements... */
+  sum = FOLD_U32T(sum);
+  sum = FOLD_U32T(sum);
+
+  /* Swap if alignment was odd */
+  if (odd) {
+    sum = SWAP_BYTES_IN_WORD(sum);
+  }
+
+  return (u16_t)sum;
+}
+#endif
+
+#if (LWIP_CHKSUM_ALGORITHM == 3) /* Alternative version #3 */
+/**
+ * An optimized checksum routine. Basically, it uses loop-unrolling on
+ * the checksum loop, treating the head and tail bytes specially, whereas
+ * the inner loop acts on 8 bytes at a time. 
+ *
+ * @arg start of buffer to be checksummed. May be an odd byte address.
+ * @len number of bytes in the buffer to be checksummed.
+ * @return host order (!) lwip checksum (non-inverted Internet sum) 
+ * 
+ * by Curt McDowell, Broadcom Corp. December 8th, 2005
+ */
+
+static u16_t
+lwip_standard_chksum(void *dataptr, int len)
+{
+  u8_t *pb = (u8_t *)dataptr;
+  u16_t *ps, t = 0;
+  u32_t *pl;
+  u32_t sum = 0, tmp;
+  /* starts at odd byte address? */
+  int odd = ((mem_ptr_t)pb & 1);
+
+  if (odd && len > 0) {
+    ((u8_t *)&t)[1] = *pb++;
+    len--;
+  }
+
+  ps = (u16_t *)pb;
+
+  if (((mem_ptr_t)ps & 3) && len > 1) {
+    sum += *ps++;
+    len -= 2;
+  }
+
+  pl = (u32_t *)ps;
+
+  while (len > 7)  {
+    tmp = sum + *pl++;          /* ping */
+    if (tmp < sum) {
+      tmp++;                    /* add back carry */
+    }
+
+    sum = tmp + *pl++;          /* pong */
+    if (sum < tmp) {
+      sum++;                    /* add back carry */
+    }
+
+    len -= 8;
+  }
+
+  /* make room in upper bits */
+  sum = FOLD_U32T(sum);
+
+  ps = (u16_t *)pl;
+
+  /* 16-bit aligned word remaining? */
+  while (len > 1) {
+    sum += *ps++;
+    len -= 2;
+  }
+
+  /* dangling tail byte remaining? */
+  if (len > 0) {                /* include odd byte */
+    ((u8_t *)&t)[0] = *(u8_t *)ps;
+  }
+
+  sum += t;                     /* add end bytes */
+
+  /* Fold 32-bit sum to 16 bits
+     calling this twice is propably faster than if statements... */
+  sum = FOLD_U32T(sum);
+  sum = FOLD_U32T(sum);
+
+  if (odd) {
+    sum = SWAP_BYTES_IN_WORD(sum);
+  }
+
+  return (u16_t)sum;
+}
+#endif
+
+/* inet_chksum_pseudo:
+ *
+ * Calculates the pseudo Internet checksum used by TCP and UDP for a pbuf chain.
+ * IP addresses are expected to be in network byte order.
+ *
+ * @param p chain of pbufs over that a checksum should be calculated (ip data part)
+ * @param src source ip address (used for checksum of pseudo header)
+ * @param dst destination ip address (used for checksum of pseudo header)
+ * @param proto ip protocol (used for checksum of pseudo header)
+ * @param proto_len length of the ip data part (used for checksum of pseudo header)
+ * @return checksum (as u16_t) to be saved directly in the protocol header
+ */
+u16_t
+inet_chksum_pseudo(struct pbuf *p,
+       ip_addr_t *src, ip_addr_t *dest,
+       u8_t proto, u16_t proto_len)
+{
+  u32_t acc;
+  u32_t addr;
+  struct pbuf *q;
+  u8_t swapped;
+
+  acc = 0;
+  swapped = 0;
+  /* iterate through all pbuf in chain */
+  for(q = p; q != NULL; q = q->next) {
+    LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): checksumming pbuf %p (has next %p) \n",
+      (void *)q, (void *)q->next));
+    acc += LWIP_CHKSUM(q->payload, q->len);
+    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): unwrapped lwip_chksum()=%"X32_F" \n", acc));*/
+    /* just executing this next line is probably faster that the if statement needed
+       to check whether we really need to execute it, and does no harm */
+    acc = FOLD_U32T(acc);
+    if (q->len % 2 != 0) {
+      swapped = 1 - swapped;
+      acc = SWAP_BYTES_IN_WORD(acc);
+    }
+    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%"X32_F" \n", acc));*/
+  }
+
+  if (swapped) {
+    acc = SWAP_BYTES_IN_WORD(acc);
+  }
+  addr = ip4_addr_get_u32(src);
+  acc += (addr & 0xffffUL);
+  acc += ((addr >> 16) & 0xffffUL);
+  addr = ip4_addr_get_u32(dest);
+  acc += (addr & 0xffffUL);
+  acc += ((addr >> 16) & 0xffffUL);
+  acc += (u32_t)htons((u16_t)proto);
+  acc += (u32_t)htons(proto_len);
+
+  /* Fold 32-bit sum to 16 bits
+     calling this twice is propably faster than if statements... */
+  acc = FOLD_U32T(acc);
+  acc = FOLD_U32T(acc);
+  LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): pbuf chain lwip_chksum()=%"X32_F"\n", acc));
+  return (u16_t)~(acc & 0xffffUL);
+}
+
+/* inet_chksum_pseudo:
+ *
+ * Calculates the pseudo Internet checksum used by TCP and UDP for a pbuf chain.
+ * IP addresses are expected to be in network byte order.
+ *
+ * @param p chain of pbufs over that a checksum should be calculated (ip data part)
+ * @param src source ip address (used for checksum of pseudo header)
+ * @param dst destination ip address (used for checksum of pseudo header)
+ * @param proto ip protocol (used for checksum of pseudo header)
+ * @param proto_len length of the ip data part (used for checksum of pseudo header)
+ * @return checksum (as u16_t) to be saved directly in the protocol header
+ */
+u16_t
+inet_chksum_pseudo_partial(struct pbuf *p,
+       ip_addr_t *src, ip_addr_t *dest,
+       u8_t proto, u16_t proto_len, u16_t chksum_len)
+{
+  u32_t acc;
+  u32_t addr;
+  struct pbuf *q;
+  u8_t swapped;
+  u16_t chklen;
+
+  acc = 0;
+  swapped = 0;
+  /* iterate through all pbuf in chain */
+  for(q = p; (q != NULL) && (chksum_len > 0); q = q->next) {
+    LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): checksumming pbuf %p (has next %p) \n",
+      (void *)q, (void *)q->next));
+    chklen = q->len;
+    if (chklen > chksum_len) {
+      chklen = chksum_len;
+    }
+    acc += LWIP_CHKSUM(q->payload, chklen);
+    chksum_len -= chklen;
+    LWIP_ASSERT("delete me", chksum_len < 0x7fff);
+    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): unwrapped lwip_chksum()=%"X32_F" \n", acc));*/
+    /* fold the upper bit down */
+    acc = FOLD_U32T(acc);
+    if (q->len % 2 != 0) {
+      swapped = 1 - swapped;
+      acc = SWAP_BYTES_IN_WORD(acc);
+    }
+    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%"X32_F" \n", acc));*/
+  }
+
+  if (swapped) {
+    acc = SWAP_BYTES_IN_WORD(acc);
+  }
+  addr = ip4_addr_get_u32(src);
+  acc += (addr & 0xffffUL);
+  acc += ((addr >> 16) & 0xffffUL);
+  addr = ip4_addr_get_u32(dest);
+  acc += (addr & 0xffffUL);
+  acc += ((addr >> 16) & 0xffffUL);
+  acc += (u32_t)htons((u16_t)proto);
+  acc += (u32_t)htons(proto_len);
+
+  /* Fold 32-bit sum to 16 bits
+     calling this twice is propably faster than if statements... */
+  acc = FOLD_U32T(acc);
+  acc = FOLD_U32T(acc);
+  LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): pbuf chain lwip_chksum()=%"X32_F"\n", acc));
+  return (u16_t)~(acc & 0xffffUL);
+}
+
+/* inet_chksum:
+ *
+ * Calculates the Internet checksum over a portion of memory. Used primarily for IP
+ * and ICMP.
+ *
+ * @param dataptr start of the buffer to calculate the checksum (no alignment needed)
+ * @param len length of the buffer to calculate the checksum
+ * @return checksum (as u16_t) to be saved directly in the protocol header
+ */
+
+u16_t
+inet_chksum(void *dataptr, u16_t len)
+{
+  return ~LWIP_CHKSUM(dataptr, len);
+}
+
+/**
+ * Calculate a checksum over a chain of pbufs (without pseudo-header, much like
+ * inet_chksum only pbufs are used).
+ *
+ * @param p pbuf chain over that the checksum should be calculated
+ * @return checksum (as u16_t) to be saved directly in the protocol header
+ */
+u16_t
+inet_chksum_pbuf(struct pbuf *p)
+{
+  u32_t acc;
+  struct pbuf *q;
+  u8_t swapped;
+
+  acc = 0;
+  swapped = 0;
+  for(q = p; q != NULL; q = q->next) {
+    acc += LWIP_CHKSUM(q->payload, q->len);
+    acc = FOLD_U32T(acc);
+    if (q->len % 2 != 0) {
+      swapped = 1 - swapped;
+      acc = SWAP_BYTES_IN_WORD(acc);
+    }
+  }
+
+  if (swapped) {
+    acc = SWAP_BYTES_IN_WORD(acc);
+  }
+  return (u16_t)~(acc & 0xffffUL);
+}
+
+/* These are some implementations for LWIP_CHKSUM_COPY, which copies data
+ * like MEMCPY but generates a checksum at the same time. Since this is a
+ * performance-sensitive function, you might want to create your own version
+ * in assembly targeted at your hardware by defining it in lwipopts.h:
+ *   #define LWIP_CHKSUM_COPY(dst, src, len) your_chksum_copy(dst, src, len)
+ */
+
+#if (LWIP_CHKSUM_COPY_ALGORITHM == 1) /* Version #1 */
+/** Safe but slow: first call MEMCPY, then call LWIP_CHKSUM.
+ * For architectures with big caches, data might still be in cache when
+ * generating the checksum after copying.
+ */
+u16_t
+lwip_chksum_copy(void *dst, const void *src, u16_t len)
+{
+  MEMCPY(dst, src, len);
+  return LWIP_CHKSUM(dst, len);
+}
+#endif /* (LWIP_CHKSUM_COPY_ALGORITHM == 1) */
diff --git a/ext/lwip/src/core/ipv4/ip.c b/ext/lwip/src/core/ipv4/ip.c
new file mode 100644
index 000000000..0e09b3c04
--- /dev/null
+++ b/ext/lwip/src/core/ipv4/ip.c
@@ -0,0 +1,924 @@
+/**
+ * @file
+ * This is the IPv4 layer implementation for incoming and outgoing IP traffic.
+ *
+ * @see ip_frag.c
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+#include "lwip/ip.h"
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/ip_frag.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/netif.h"
+#include "lwip/icmp.h"
+#include "lwip/igmp.h"
+#include "lwip/raw.h"
+#include "lwip/udp.h"
+#include "lwip/tcp_impl.h"
+#include "lwip/snmp.h"
+#include "lwip/dhcp.h"
+#include "lwip/autoip.h"
+#include "lwip/stats.h"
+#include "arch/perf.h"
+
+#include <string.h>
+
+/** Set this to 0 in the rare case of wanting to call an extra function to
+ * generate the IP checksum (in contrast to calculating it on-the-fly). */
+#ifndef LWIP_INLINE_IP_CHKSUM
+#define LWIP_INLINE_IP_CHKSUM   1
+#endif
+#if LWIP_INLINE_IP_CHKSUM && CHECKSUM_GEN_IP
+#define CHECKSUM_GEN_IP_INLINE  1
+#else
+#define CHECKSUM_GEN_IP_INLINE  0
+#endif
+
+#if LWIP_DHCP || defined(LWIP_IP_ACCEPT_UDP_PORT)
+#define IP_ACCEPT_LINK_LAYER_ADDRESSING 1
+
+/** Some defines for DHCP to let link-layer-addressed packets through while the
+ * netif is down.
+ * To use this in your own application/protocol, define LWIP_IP_ACCEPT_UDP_PORT
+ * to return 1 if the port is accepted and 0 if the port is not accepted.
+ */
+#if LWIP_DHCP && defined(LWIP_IP_ACCEPT_UDP_PORT)
+/* accept DHCP client port and custom port */
+#define IP_ACCEPT_LINK_LAYER_ADDRESSED_PORT(port) (((port) == PP_NTOHS(DHCP_CLIENT_PORT)) \
+         || (LWIP_IP_ACCEPT_UDP_PORT(port)))
+#elif defined(LWIP_IP_ACCEPT_UDP_PORT) /* LWIP_DHCP && defined(LWIP_IP_ACCEPT_UDP_PORT) */
+/* accept custom port only */
+#define IP_ACCEPT_LINK_LAYER_ADDRESSED_PORT(port) (LWIP_IP_ACCEPT_UDP_PORT(port))
+#else /* LWIP_DHCP && defined(LWIP_IP_ACCEPT_UDP_PORT) */
+/* accept DHCP client port only */
+#define IP_ACCEPT_LINK_LAYER_ADDRESSED_PORT(port) ((port) == PP_NTOHS(DHCP_CLIENT_PORT))
+#endif /* LWIP_DHCP && defined(LWIP_IP_ACCEPT_UDP_PORT) */
+
+#else /* LWIP_DHCP */
+#define IP_ACCEPT_LINK_LAYER_ADDRESSING 0
+#endif /* LWIP_DHCP */
+
+/**
+ * The interface that provided the packet for the current callback
+ * invocation.
+ */
+struct netif *current_netif;
+
+/**
+ * Header of the input packet currently being processed.
+ */
+const struct ip_hdr *current_header;
+/** Source IP address of current_header */
+ip_addr_t current_iphdr_src;
+/** Destination IP address of current_header */
+ip_addr_t current_iphdr_dest;
+
+/** The IP header ID of the next outgoing IP packet */
+static u16_t ip_id;
+
+/**
+ * Finds the appropriate network interface for a given IP address. It
+ * searches the list of network interfaces linearly. A match is found
+ * if the masked IP address of the network interface equals the masked
+ * IP address given to the function.
+ *
+ * @param dest the destination IP address for which to find the route
+ * @return the netif on which to send to reach dest
+ */
+struct netif *
+ip_route(ip_addr_t *dest)
+{
+  struct netif *netif;
+
+#ifdef LWIP_HOOK_IP4_ROUTE
+  netif = LWIP_HOOK_IP4_ROUTE(dest);
+  if (netif != NULL) {
+    return netif;
+  }
+#endif
+
+  /* iterate through netifs */
+  for (netif = netif_list; netif != NULL; netif = netif->next) {
+    /* network mask matches? */
+    if (netif_is_up(netif)) {
+      if (ip_addr_netcmp(dest, &(netif->ip_addr), &(netif->netmask))) {
+        /* return netif on which to forward IP packet */
+        return netif;
+      }
+    }
+  }
+  if ((netif_default == NULL) || (!netif_is_up(netif_default))) {
+    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip_route: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+      ip4_addr1_16(dest), ip4_addr2_16(dest), ip4_addr3_16(dest), ip4_addr4_16(dest)));
+    IP_STATS_INC(ip.rterr);
+    snmp_inc_ipoutnoroutes();
+    return NULL;
+  }
+  /* no matching netif found, use default netif */
+  return netif_default;
+}
+
+#if IP_FORWARD
+/**
+ * Determine whether an IP address is in a reserved set of addresses
+ * that may not be forwarded, or whether datagrams to that destination
+ * may be forwarded.
+ * @param p the packet to forward
+ * @param dest the destination IP address
+ * @return 1: can forward 0: discard
+ */
+static int
+ip_canforward(struct pbuf *p)
+{
+  u32_t addr = ip4_addr_get_u32(ip_current_dest_addr());
+
+  if (p->flags & PBUF_FLAG_LLBCAST) {
+    /* don't route link-layer broadcasts */
+    return 0;
+  }
+  if ((p->flags & PBUF_FLAG_LLMCAST) && !IP_MULTICAST(addr)) {
+    /* don't route link-layer multicasts unless the destination address is an IP
+       multicast address */
+    return 0;
+  }
+  if (IP_EXPERIMENTAL(addr)) {
+    return 0;
+  }
+  if (IP_CLASSA(addr)) {
+    u32_t net = addr & IP_CLASSA_NET;
+    if ((net == 0) || (net == (IP_LOOPBACKNET << IP_CLASSA_NSHIFT))) {
+      /* don't route loopback packets */
+      return 0;
+    }
+  }
+  return 1;
+}
+
+/**
+ * Forwards an IP packet. It finds an appropriate route for the
+ * packet, decrements the TTL value of the packet, adjusts the
+ * checksum and outputs the packet on the appropriate interface.
+ *
+ * @param p the packet to forward (p->payload points to IP header)
+ * @param iphdr the IP header of the input packet
+ * @param inp the netif on which this packet was received
+ */
+static void
+ip_forward(struct pbuf *p, struct ip_hdr *iphdr, struct netif *inp)
+{
+  struct netif *netif;
+
+  PERF_START;
+
+  if (!ip_canforward(p)) {
+    goto return_noroute;
+  }
+
+  /* RFC3927 2.7: do not forward link-local addresses */
+  if (ip_addr_islinklocal(&current_iphdr_dest)) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_forward: not forwarding LLA %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+      ip4_addr1_16(&current_iphdr_dest), ip4_addr2_16(&current_iphdr_dest),
+      ip4_addr3_16(&current_iphdr_dest), ip4_addr4_16(&current_iphdr_dest)));
+    goto return_noroute;
+  }
+
+  /* Find network interface where to forward this IP packet to. */
+  netif = ip_route(&current_iphdr_dest);
+  if (netif == NULL) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_forward: no forwarding route for %"U16_F".%"U16_F".%"U16_F".%"U16_F" found\n",
+      ip4_addr1_16(&current_iphdr_dest), ip4_addr2_16(&current_iphdr_dest),
+      ip4_addr3_16(&current_iphdr_dest), ip4_addr4_16(&current_iphdr_dest)));
+    /* @todo: send ICMP_DUR_NET? */
+    goto return_noroute;
+  }
+#if !IP_FORWARD_ALLOW_TX_ON_RX_NETIF
+  /* Do not forward packets onto the same network interface on which
+   * they arrived. */
+  if (netif == inp) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_forward: not bouncing packets back on incoming interface.\n"));
+    goto return_noroute;
+  }
+#endif /* IP_FORWARD_ALLOW_TX_ON_RX_NETIF */
+
+  /* decrement TTL */
+  IPH_TTL_SET(iphdr, IPH_TTL(iphdr) - 1);
+  /* send ICMP if TTL == 0 */
+  if (IPH_TTL(iphdr) == 0) {
+    snmp_inc_ipinhdrerrors();
+#if LWIP_ICMP
+    /* Don't send ICMP messages in response to ICMP messages */
+    if (IPH_PROTO(iphdr) != IP_PROTO_ICMP) {
+      icmp_time_exceeded(p, ICMP_TE_TTL);
+    }
+#endif /* LWIP_ICMP */
+    return;
+  }
+
+  /* Incrementally update the IP checksum. */
+  if (IPH_CHKSUM(iphdr) >= PP_HTONS(0xffffU - 0x100)) {
+    IPH_CHKSUM_SET(iphdr, IPH_CHKSUM(iphdr) + PP_HTONS(0x100) + 1);
+  } else {
+    IPH_CHKSUM_SET(iphdr, IPH_CHKSUM(iphdr) + PP_HTONS(0x100));
+  }
+
+  LWIP_DEBUGF(IP_DEBUG, ("ip_forward: forwarding packet to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+    ip4_addr1_16(&current_iphdr_dest), ip4_addr2_16(&current_iphdr_dest),
+    ip4_addr3_16(&current_iphdr_dest), ip4_addr4_16(&current_iphdr_dest)));
+
+  IP_STATS_INC(ip.fw);
+  IP_STATS_INC(ip.xmit);
+  snmp_inc_ipforwdatagrams();
+
+  PERF_STOP("ip_forward");
+  /* don't fragment if interface has mtu set to 0 [loopif] */
+  if (netif->mtu && (p->tot_len > netif->mtu)) {
+    if ((IPH_OFFSET(iphdr) & PP_NTOHS(IP_DF)) == 0) {
+#if IP_FRAG
+      ip_frag(p, netif, ip_current_dest_addr());
+#else /* IP_FRAG */
+      /* @todo: send ICMP Destination Unreacheable code 13 "Communication administratively prohibited"? */
+#endif /* IP_FRAG */
+    } else {
+      /* send ICMP Destination Unreacheable code 4: "Fragmentation Needed and DF Set" */
+      icmp_dest_unreach(p, ICMP_DUR_FRAG);
+    }
+    return;
+  }
+  /* transmit pbuf on chosen interface */
+  netif->output(netif, p, &current_iphdr_dest);
+  return;
+return_noroute:
+  snmp_inc_ipoutnoroutes();
+}
+#endif /* IP_FORWARD */
+
+/**
+ * This function is called by the network interface device driver when
+ * an IP packet is received. The function does the basic checks of the
+ * IP header such as packet size being at least larger than the header
+ * size etc. If the packet was not destined for us, the packet is
+ * forwarded (using ip_forward). The IP checksum is always checked.
+ *
+ * Finally, the packet is sent to the upper layer protocol input function.
+ *
+ * @param p the received IP packet (p->payload points to IP header)
+ * @param inp the netif on which this packet was received
+ * @return ERR_OK if the packet was processed (could return ERR_* if it wasn't
+ *         processed, but currently always returns ERR_OK)
+ */
+err_t
+ip_input(struct pbuf *p, struct netif *inp)
+{
+  struct ip_hdr *iphdr;
+  struct netif *netif;
+  u16_t iphdr_hlen;
+  u16_t iphdr_len;
+#if IP_ACCEPT_LINK_LAYER_ADDRESSING
+  int check_ip_src=1;
+#endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING */
+
+  IP_STATS_INC(ip.recv);
+  snmp_inc_ipinreceives();
+
+  /* identify the IP header */
+  iphdr = (struct ip_hdr *)p->payload;
+  if (IPH_V(iphdr) != 4) {
+    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_WARNING, ("IP packet dropped due to bad version number %"U16_F"\n", IPH_V(iphdr)));
+    ip_debug_print(p);
+    pbuf_free(p);
+    IP_STATS_INC(ip.err);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipinhdrerrors();
+    return ERR_OK;
+  }
+
+#ifdef LWIP_HOOK_IP4_INPUT
+  if (LWIP_HOOK_IP4_INPUT(p, inp)) {
+    /* the packet has been eaten */
+    return ERR_OK;
+  }
+#endif
+
+  /* obtain IP header length in number of 32-bit words */
+  iphdr_hlen = IPH_HL(iphdr);
+  /* calculate IP header length in bytes */
+  iphdr_hlen *= 4;
+  /* obtain ip length in bytes */
+  iphdr_len = ntohs(IPH_LEN(iphdr));
+
+  /* header length exceeds first pbuf length, or ip length exceeds total pbuf length? */
+  if ((iphdr_hlen > p->len) || (iphdr_len > p->tot_len)) {
+    if (iphdr_hlen > p->len) {
+      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+        ("IP header (len %"U16_F") does not fit in first pbuf (len %"U16_F"), IP packet dropped.\n",
+        iphdr_hlen, p->len));
+    }
+    if (iphdr_len > p->tot_len) {
+      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+        ("IP (len %"U16_F") is longer than pbuf (len %"U16_F"), IP packet dropped.\n",
+        iphdr_len, p->tot_len));
+    }
+    /* free (drop) packet pbufs */
+    pbuf_free(p);
+    IP_STATS_INC(ip.lenerr);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipindiscards();
+    return ERR_OK;
+  }
+
+  /* verify checksum */
+#if CHECKSUM_CHECK_IP
+  if (inet_chksum(iphdr, iphdr_hlen) != 0) {
+
+    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+      ("Checksum (0x%"X16_F") failed, IP packet dropped.\n", inet_chksum(iphdr, iphdr_hlen)));
+    ip_debug_print(p);
+    pbuf_free(p);
+    IP_STATS_INC(ip.chkerr);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipinhdrerrors();
+    return ERR_OK;
+  }
+#endif
+
+  /* Trim pbuf. This should have been done at the netif layer,
+   * but we'll do it anyway just to be sure that its done. */
+  pbuf_realloc(p, iphdr_len);
+
+  /* copy IP addresses to aligned ip_addr_t */
+  ip_addr_copy(current_iphdr_dest, iphdr->dest);
+  ip_addr_copy(current_iphdr_src, iphdr->src);
+
+  /* match packet against an interface, i.e. is this packet for us? */
+#if LWIP_IGMP
+  if (ip_addr_ismulticast(&current_iphdr_dest)) {
+    if ((inp->flags & NETIF_FLAG_IGMP) && (igmp_lookfor_group(inp, &current_iphdr_dest))) {
+      netif = inp;
+    } else {
+      netif = NULL;
+    }
+  } else
+#endif /* LWIP_IGMP */
+  {
+    /* start trying with inp. if that's not acceptable, start walking the
+       list of configured netifs.
+       'first' is used as a boolean to mark whether we started walking the list */
+    int first = 1;
+    netif = inp;
+    do {
+      LWIP_DEBUGF(IP_DEBUG, ("ip_input: iphdr->dest 0x%"X32_F" netif->ip_addr 0x%"X32_F" (0x%"X32_F", 0x%"X32_F", 0x%"X32_F")\n",
+          ip4_addr_get_u32(&iphdr->dest), ip4_addr_get_u32(&netif->ip_addr),
+          ip4_addr_get_u32(&iphdr->dest) & ip4_addr_get_u32(&netif->netmask),
+          ip4_addr_get_u32(&netif->ip_addr) & ip4_addr_get_u32(&netif->netmask),
+          ip4_addr_get_u32(&iphdr->dest) & ~ip4_addr_get_u32(&netif->netmask)));
+
+      /* interface is up and configured? */
+      if ((netif_is_up(netif)) && (!ip_addr_isany(&(netif->ip_addr)))) {
+        /* unicast to this interface address? */
+        if (ip_addr_cmp(&current_iphdr_dest, &(netif->ip_addr)) ||
+            /* or broadcast on this interface network address? */
+            ip_addr_isbroadcast(&current_iphdr_dest, netif)) {
+          LWIP_DEBUGF(IP_DEBUG, ("ip_input: packet accepted on interface %c%c\n",
+              netif->name[0], netif->name[1]));
+          /* break out of for loop */
+          break;
+        }
+#if LWIP_AUTOIP
+        /* connections to link-local addresses must persist after changing
+           the netif's address (RFC3927 ch. 1.9) */
+        if ((netif->autoip != NULL) &&
+            ip_addr_cmp(&current_iphdr_dest, &(netif->autoip->llipaddr))) {
+          LWIP_DEBUGF(IP_DEBUG, ("ip_input: LLA packet accepted on interface %c%c\n",
+              netif->name[0], netif->name[1]));
+          /* break out of for loop */
+          break;
+        }
+#endif /* LWIP_AUTOIP */
+      }
+      if (first) {
+        first = 0;
+        netif = netif_list;
+      } else {
+        netif = netif->next;
+      }
+      if (netif == inp) {
+        netif = netif->next;
+      }
+    } while(netif != NULL);
+  }
+
+#if IP_ACCEPT_LINK_LAYER_ADDRESSING
+  /* Pass DHCP messages regardless of destination address. DHCP traffic is addressed
+   * using link layer addressing (such as Ethernet MAC) so we must not filter on IP.
+   * According to RFC 1542 section 3.1.1, referred by RFC 2131).
+   *
+   * If you want to accept private broadcast communication while a netif is down,
+   * define LWIP_IP_ACCEPT_UDP_PORT(dst_port), e.g.:
+   *
+   * #define LWIP_IP_ACCEPT_UDP_PORT(dst_port) ((dst_port) == PP_NTOHS(12345))
+   */
+  if (netif == NULL) {
+    /* remote port is DHCP server? */
+    if (IPH_PROTO(iphdr) == IP_PROTO_UDP) {
+      struct udp_hdr *udphdr = (struct udp_hdr *)((u8_t *)iphdr + iphdr_hlen);
+      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_TRACE, ("ip_input: UDP packet to DHCP client port %"U16_F"\n",
+        ntohs(udphdr->dest)));
+      if (IP_ACCEPT_LINK_LAYER_ADDRESSED_PORT(udphdr->dest)) {
+        LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_TRACE, ("ip_input: DHCP packet accepted.\n"));
+        netif = inp;
+        check_ip_src = 0;
+      }
+    }
+  }
+#endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING */
+
+  /* broadcast or multicast packet source address? Compliant with RFC 1122: 3.2.1.3 */
+#if IP_ACCEPT_LINK_LAYER_ADDRESSING
+  /* DHCP servers need 0.0.0.0 to be allowed as source address (RFC 1.1.2.2: 3.2.1.3/a) */
+  if (check_ip_src && !ip_addr_isany(&current_iphdr_src))
+#endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING */
+  {  if ((ip_addr_isbroadcast(&current_iphdr_src, inp)) ||
+         (ip_addr_ismulticast(&current_iphdr_src))) {
+      /* packet source is not valid */
+      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("ip_input: packet source is not valid.\n"));
+      /* free (drop) packet pbufs */
+      pbuf_free(p);
+      IP_STATS_INC(ip.drop);
+      snmp_inc_ipinaddrerrors();
+      snmp_inc_ipindiscards();
+      return ERR_OK;
+    }
+  }
+
+  /* packet not for us? */
+  if (netif == NULL) {
+    /* packet not for us, route or discard */
+    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_TRACE, ("ip_input: packet not for us.\n"));
+#if IP_FORWARD
+    /* non-broadcast packet? */
+    if (!ip_addr_isbroadcast(&current_iphdr_dest, inp)) {
+      /* try to forward IP packet on (other) interfaces */
+      ip_forward(p, iphdr, inp);
+    } else
+#endif /* IP_FORWARD */
+    {
+      snmp_inc_ipinaddrerrors();
+      snmp_inc_ipindiscards();
+    }
+    pbuf_free(p);
+    return ERR_OK;
+  }
+  /* packet consists of multiple fragments? */
+  if ((IPH_OFFSET(iphdr) & PP_HTONS(IP_OFFMASK | IP_MF)) != 0) {
+#if IP_REASSEMBLY /* packet fragment reassembly code present? */
+    LWIP_DEBUGF(IP_DEBUG, ("IP packet is a fragment (id=0x%04"X16_F" tot_len=%"U16_F" len=%"U16_F" MF=%"U16_F" offset=%"U16_F"), calling ip_reass()\n",
+      ntohs(IPH_ID(iphdr)), p->tot_len, ntohs(IPH_LEN(iphdr)), !!(IPH_OFFSET(iphdr) & PP_HTONS(IP_MF)), (ntohs(IPH_OFFSET(iphdr)) & IP_OFFMASK)*8));
+    /* reassemble the packet*/
+    p = ip_reass(p);
+    /* packet not fully reassembled yet? */
+    if (p == NULL) {
+      return ERR_OK;
+    }
+    iphdr = (struct ip_hdr *)p->payload;
+#else /* IP_REASSEMBLY == 0, no packet fragment reassembly code present */
+    pbuf_free(p);
+    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("IP packet dropped since it was fragmented (0x%"X16_F") (while IP_REASSEMBLY == 0).\n",
+      ntohs(IPH_OFFSET(iphdr))));
+    IP_STATS_INC(ip.opterr);
+    IP_STATS_INC(ip.drop);
+    /* unsupported protocol feature */
+    snmp_inc_ipinunknownprotos();
+    return ERR_OK;
+#endif /* IP_REASSEMBLY */
+  }
+
+#if IP_OPTIONS_ALLOWED == 0 /* no support for IP options in the IP header? */
+
+#if LWIP_IGMP
+  /* there is an extra "router alert" option in IGMP messages which we allow for but do not police */
+  if((iphdr_hlen > IP_HLEN) &&  (IPH_PROTO(iphdr) != IP_PROTO_IGMP)) {
+#else
+  if (iphdr_hlen > IP_HLEN) {
+#endif /* LWIP_IGMP */
+    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("IP packet dropped since there were IP options (while IP_OPTIONS_ALLOWED == 0).\n"));
+    pbuf_free(p);
+    IP_STATS_INC(ip.opterr);
+    IP_STATS_INC(ip.drop);
+    /* unsupported protocol feature */
+    snmp_inc_ipinunknownprotos();
+    return ERR_OK;
+  }
+#endif /* IP_OPTIONS_ALLOWED == 0 */
+
+  /* send to upper layers */
+  LWIP_DEBUGF(IP_DEBUG, ("ip_input: \n"));
+  ip_debug_print(p);
+  LWIP_DEBUGF(IP_DEBUG, ("ip_input: p->len %"U16_F" p->tot_len %"U16_F"\n", p->len, p->tot_len));
+
+  current_netif = inp;
+  current_header = iphdr;
+
+#if LWIP_RAW
+  /* raw input did not eat the packet? */
+  if (raw_input(p, inp) == 0)
+#endif /* LWIP_RAW */
+  {
+    switch (IPH_PROTO(iphdr)) {
+#if LWIP_UDP
+    case IP_PROTO_UDP:
+#if LWIP_UDPLITE
+    case IP_PROTO_UDPLITE:
+#endif /* LWIP_UDPLITE */
+      snmp_inc_ipindelivers();
+      udp_input(p, inp);
+      break;
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+    case IP_PROTO_TCP:
+      snmp_inc_ipindelivers();
+      tcp_input(p, inp);
+      break;
+#endif /* LWIP_TCP */
+#if LWIP_ICMP
+    case IP_PROTO_ICMP:
+      snmp_inc_ipindelivers();
+      icmp_input(p, inp);
+      break;
+#endif /* LWIP_ICMP */
+#if LWIP_IGMP
+    case IP_PROTO_IGMP:
+      igmp_input(p, inp, &current_iphdr_dest);
+      break;
+#endif /* LWIP_IGMP */
+    default:
+#if LWIP_ICMP
+      /* send ICMP destination protocol unreachable unless is was a broadcast */
+      if (!ip_addr_isbroadcast(&current_iphdr_dest, inp) &&
+          !ip_addr_ismulticast(&current_iphdr_dest)) {
+        p->payload = iphdr;
+        icmp_dest_unreach(p, ICMP_DUR_PROTO);
+      }
+#endif /* LWIP_ICMP */
+      pbuf_free(p);
+
+      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("Unsupported transport protocol %"U16_F"\n", IPH_PROTO(iphdr)));
+
+      IP_STATS_INC(ip.proterr);
+      IP_STATS_INC(ip.drop);
+      snmp_inc_ipinunknownprotos();
+    }
+  }
+
+  current_netif = NULL;
+  current_header = NULL;
+  ip_addr_set_any(&current_iphdr_src);
+  ip_addr_set_any(&current_iphdr_dest);
+
+  return ERR_OK;
+}
+
+/**
+ * Sends an IP packet on a network interface. This function constructs
+ * the IP header and calculates the IP header checksum. If the source
+ * IP address is NULL, the IP address of the outgoing network
+ * interface is filled in as source address.
+ * If the destination IP address is IP_HDRINCL, p is assumed to already
+ * include an IP header and p->payload points to it instead of the data.
+ *
+ * @param p the packet to send (p->payload points to the data, e.g. next
+            protocol header; if dest == IP_HDRINCL, p already includes an IP
+            header and p->payload points to that IP header)
+ * @param src the source IP address to send from (if src == IP_ADDR_ANY, the
+ *         IP  address of the netif used to send is used as source address)
+ * @param dest the destination IP address to send the packet to
+ * @param ttl the TTL value to be set in the IP header
+ * @param tos the TOS value to be set in the IP header
+ * @param proto the PROTOCOL to be set in the IP header
+ * @param netif the netif on which to send this packet
+ * @return ERR_OK if the packet was sent OK
+ *         ERR_BUF if p doesn't have enough space for IP/LINK headers
+ *         returns errors returned by netif->output
+ *
+ * @note ip_id: RFC791 "some host may be able to simply use
+ *  unique identifiers independent of destination"
+ */
+err_t
+ip_output_if(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+             u8_t ttl, u8_t tos,
+             u8_t proto, struct netif *netif)
+{
+#if IP_OPTIONS_SEND
+  return ip_output_if_opt(p, src, dest, ttl, tos, proto, netif, NULL, 0);
+}
+
+/**
+ * Same as ip_output_if() but with the possibility to include IP options:
+ *
+ * @ param ip_options pointer to the IP options, copied into the IP header
+ * @ param optlen length of ip_options
+ */
+err_t ip_output_if_opt(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif, void *ip_options,
+       u16_t optlen)
+{
+#endif /* IP_OPTIONS_SEND */
+  struct ip_hdr *iphdr;
+  ip_addr_t dest_addr;
+#if CHECKSUM_GEN_IP_INLINE
+  u32_t chk_sum = 0;
+#endif /* CHECKSUM_GEN_IP_INLINE */
+
+  /* pbufs passed to IP must have a ref-count of 1 as their payload pointer
+     gets altered as the packet is passed down the stack */
+  LWIP_ASSERT("p->ref == 1", p->ref == 1);
+
+  snmp_inc_ipoutrequests();
+
+  /* Should the IP header be generated or is it already included in p? */
+  if (dest != IP_HDRINCL) {
+    u16_t ip_hlen = IP_HLEN;
+#if IP_OPTIONS_SEND
+    u16_t optlen_aligned = 0;
+    if (optlen != 0) {
+#if CHECKSUM_GEN_IP_INLINE
+      int i;
+#endif /* CHECKSUM_GEN_IP_INLINE */
+      /* round up to a multiple of 4 */
+      optlen_aligned = ((optlen + 3) & ~3);
+      ip_hlen += optlen_aligned;
+      /* First write in the IP options */
+      if (pbuf_header(p, optlen_aligned)) {
+        LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip_output_if_opt: not enough room for IP options in pbuf\n"));
+        IP_STATS_INC(ip.err);
+        snmp_inc_ipoutdiscards();
+        return ERR_BUF;
+      }
+      MEMCPY(p->payload, ip_options, optlen);
+      if (optlen < optlen_aligned) {
+        /* zero the remaining bytes */
+        memset(((char*)p->payload) + optlen, 0, optlen_aligned - optlen);
+      }
+#if CHECKSUM_GEN_IP_INLINE
+      for (i = 0; i < optlen_aligned/2; i++) {
+        chk_sum += ((u16_t*)p->payload)[i];
+      }
+#endif /* CHECKSUM_GEN_IP_INLINE */
+    }
+#endif /* IP_OPTIONS_SEND */
+    /* generate IP header */
+    if (pbuf_header(p, IP_HLEN)) {
+      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip_output: not enough room for IP header in pbuf\n"));
+
+      IP_STATS_INC(ip.err);
+      snmp_inc_ipoutdiscards();
+      return ERR_BUF;
+    }
+
+    iphdr = (struct ip_hdr *)p->payload;
+    LWIP_ASSERT("check that first pbuf can hold struct ip_hdr",
+               (p->len >= sizeof(struct ip_hdr)));
+
+    IPH_TTL_SET(iphdr, ttl);
+    IPH_PROTO_SET(iphdr, proto);
+#if CHECKSUM_GEN_IP_INLINE
+    chk_sum += LWIP_MAKE_U16(proto, ttl);
+#endif /* CHECKSUM_GEN_IP_INLINE */
+
+    /* dest cannot be NULL here */
+    ip_addr_copy(iphdr->dest, *dest);
+#if CHECKSUM_GEN_IP_INLINE
+    chk_sum += ip4_addr_get_u32(&iphdr->dest) & 0xFFFF;
+    chk_sum += ip4_addr_get_u32(&iphdr->dest) >> 16;
+#endif /* CHECKSUM_GEN_IP_INLINE */
+
+    IPH_VHL_SET(iphdr, 4, ip_hlen / 4);
+    IPH_TOS_SET(iphdr, tos);
+#if CHECKSUM_GEN_IP_INLINE
+    chk_sum += LWIP_MAKE_U16(tos, iphdr->_v_hl);
+#endif /* CHECKSUM_GEN_IP_INLINE */
+    IPH_LEN_SET(iphdr, htons(p->tot_len));
+#if CHECKSUM_GEN_IP_INLINE
+    chk_sum += iphdr->_len;
+#endif /* CHECKSUM_GEN_IP_INLINE */
+    IPH_OFFSET_SET(iphdr, 0);
+    IPH_ID_SET(iphdr, htons(ip_id));
+#if CHECKSUM_GEN_IP_INLINE
+    chk_sum += iphdr->_id;
+#endif /* CHECKSUM_GEN_IP_INLINE */
+    ++ip_id;
+
+    if (ip_addr_isany(src)) {
+      ip_addr_copy(iphdr->src, netif->ip_addr);
+    } else {
+      /* src cannot be NULL here */
+      ip_addr_copy(iphdr->src, *src);
+    }
+
+#if CHECKSUM_GEN_IP_INLINE
+    chk_sum += ip4_addr_get_u32(&iphdr->src) & 0xFFFF;
+    chk_sum += ip4_addr_get_u32(&iphdr->src) >> 16;
+    chk_sum = (chk_sum >> 16) + (chk_sum & 0xFFFF);
+    chk_sum = (chk_sum >> 16) + chk_sum;
+    chk_sum = ~chk_sum;
+    iphdr->_chksum = chk_sum; /* network order */
+#else /* CHECKSUM_GEN_IP_INLINE */
+    IPH_CHKSUM_SET(iphdr, 0);
+#if CHECKSUM_GEN_IP
+    IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, ip_hlen));
+#endif
+#endif /* CHECKSUM_GEN_IP_INLINE */
+  } else {
+    /* IP header already included in p */
+    iphdr = (struct ip_hdr *)p->payload;
+    ip_addr_copy(dest_addr, iphdr->dest);
+    dest = &dest_addr;
+  }
+
+  IP_STATS_INC(ip.xmit);
+
+  LWIP_DEBUGF(IP_DEBUG, ("ip_output_if: %c%c%"U16_F"\n", netif->name[0], netif->name[1], netif->num));
+  ip_debug_print(p);
+
+#if ENABLE_LOOPBACK
+  if (ip_addr_cmp(dest, &netif->ip_addr)) {
+    /* Packet to self, enqueue it for loopback */
+    LWIP_DEBUGF(IP_DEBUG, ("netif_loop_output()"));
+    return netif_loop_output(netif, p, dest);
+  }
+#if LWIP_IGMP
+  if ((p->flags & PBUF_FLAG_MCASTLOOP) != 0) {
+    netif_loop_output(netif, p, dest);
+  }
+#endif /* LWIP_IGMP */
+#endif /* ENABLE_LOOPBACK */
+#if IP_FRAG
+  /* don't fragment if interface has mtu set to 0 [loopif] */
+  if (netif->mtu && (p->tot_len > netif->mtu)) {
+    return ip_frag(p, netif, dest);
+  }
+#endif /* IP_FRAG */
+
+  LWIP_DEBUGF(IP_DEBUG, ("netif->output()"));
+  return netif->output(netif, p, dest);
+}
+
+/**
+ * Simple interface to ip_output_if. It finds the outgoing network
+ * interface and calls upon ip_output_if to do the actual work.
+ *
+ * @param p the packet to send (p->payload points to the data, e.g. next
+            protocol header; if dest == IP_HDRINCL, p already includes an IP
+            header and p->payload points to that IP header)
+ * @param src the source IP address to send from (if src == IP_ADDR_ANY, the
+ *         IP  address of the netif used to send is used as source address)
+ * @param dest the destination IP address to send the packet to
+ * @param ttl the TTL value to be set in the IP header
+ * @param tos the TOS value to be set in the IP header
+ * @param proto the PROTOCOL to be set in the IP header
+ *
+ * @return ERR_RTE if no route is found
+ *         see ip_output_if() for more return values
+ */
+err_t
+ip_output(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+          u8_t ttl, u8_t tos, u8_t proto)
+{
+  struct netif *netif;
+
+  /* pbufs passed to IP must have a ref-count of 1 as their payload pointer
+     gets altered as the packet is passed down the stack */
+  LWIP_ASSERT("p->ref == 1", p->ref == 1);
+
+  if ((netif = ip_route(dest)) == NULL) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_output: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+      ip4_addr1_16(dest), ip4_addr2_16(dest), ip4_addr3_16(dest), ip4_addr4_16(dest)));
+    IP_STATS_INC(ip.rterr);
+    return ERR_RTE;
+  }
+
+  return ip_output_if(p, src, dest, ttl, tos, proto, netif);
+}
+
+#if LWIP_NETIF_HWADDRHINT
+/** Like ip_output, but takes and addr_hint pointer that is passed on to netif->addr_hint
+ *  before calling ip_output_if.
+ *
+ * @param p the packet to send (p->payload points to the data, e.g. next
+            protocol header; if dest == IP_HDRINCL, p already includes an IP
+            header and p->payload points to that IP header)
+ * @param src the source IP address to send from (if src == IP_ADDR_ANY, the
+ *         IP  address of the netif used to send is used as source address)
+ * @param dest the destination IP address to send the packet to
+ * @param ttl the TTL value to be set in the IP header
+ * @param tos the TOS value to be set in the IP header
+ * @param proto the PROTOCOL to be set in the IP header
+ * @param addr_hint address hint pointer set to netif->addr_hint before
+ *        calling ip_output_if()
+ *
+ * @return ERR_RTE if no route is found
+ *         see ip_output_if() for more return values
+ */
+err_t
+ip_output_hinted(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+          u8_t ttl, u8_t tos, u8_t proto, u8_t *addr_hint)
+{
+  struct netif *netif;
+  err_t err;
+
+  /* pbufs passed to IP must have a ref-count of 1 as their payload pointer
+     gets altered as the packet is passed down the stack */
+  LWIP_ASSERT("p->ref == 1", p->ref == 1);
+
+  if ((netif = ip_route(dest)) == NULL) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_output: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+      ip4_addr1_16(dest), ip4_addr2_16(dest), ip4_addr3_16(dest), ip4_addr4_16(dest)));
+    IP_STATS_INC(ip.rterr);
+    return ERR_RTE;
+  }
+
+  NETIF_SET_HWADDRHINT(netif, addr_hint);
+  err = ip_output_if(p, src, dest, ttl, tos, proto, netif);
+  NETIF_SET_HWADDRHINT(netif, NULL);
+
+  return err;
+}
+#endif /* LWIP_NETIF_HWADDRHINT*/
+
+#if IP_DEBUG
+/* Print an IP header by using LWIP_DEBUGF
+ * @param p an IP packet, p->payload pointing to the IP header
+ */
+void
+ip_debug_print(struct pbuf *p)
+{
+  struct ip_hdr *iphdr = (struct ip_hdr *)p->payload;
+
+  LWIP_DEBUGF(IP_DEBUG, ("IP header:\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|%2"S16_F" |%2"S16_F" |  0x%02"X16_F" |     %5"U16_F"     | (v, hl, tos, len)\n",
+                    IPH_V(iphdr),
+                    IPH_HL(iphdr),
+                    IPH_TOS(iphdr),
+                    ntohs(IPH_LEN(iphdr))));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|    %5"U16_F"      |%"U16_F"%"U16_F"%"U16_F"|    %4"U16_F"   | (id, flags, offset)\n",
+                    ntohs(IPH_ID(iphdr)),
+                    ntohs(IPH_OFFSET(iphdr)) >> 15 & 1,
+                    ntohs(IPH_OFFSET(iphdr)) >> 14 & 1,
+                    ntohs(IPH_OFFSET(iphdr)) >> 13 & 1,
+                    ntohs(IPH_OFFSET(iphdr)) & IP_OFFMASK));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|  %3"U16_F"  |  %3"U16_F"  |    0x%04"X16_F"     | (ttl, proto, chksum)\n",
+                    IPH_TTL(iphdr),
+                    IPH_PROTO(iphdr),
+                    ntohs(IPH_CHKSUM(iphdr))));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|  %3"U16_F"  |  %3"U16_F"  |  %3"U16_F"  |  %3"U16_F"  | (src)\n",
+                    ip4_addr1_16(&iphdr->src),
+                    ip4_addr2_16(&iphdr->src),
+                    ip4_addr3_16(&iphdr->src),
+                    ip4_addr4_16(&iphdr->src)));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|  %3"U16_F"  |  %3"U16_F"  |  %3"U16_F"  |  %3"U16_F"  | (dest)\n",
+                    ip4_addr1_16(&iphdr->dest),
+                    ip4_addr2_16(&iphdr->dest),
+                    ip4_addr3_16(&iphdr->dest),
+                    ip4_addr4_16(&iphdr->dest)));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+}
+#endif /* IP_DEBUG */
diff --git a/ext/lwip/src/core/ipv4/ip_addr.c b/ext/lwip/src/core/ipv4/ip_addr.c
new file mode 100644
index 000000000..8f633ff23
--- /dev/null
+++ b/ext/lwip/src/core/ipv4/ip_addr.c
@@ -0,0 +1,312 @@
+/**
+ * @file
+ * This is the IPv4 address tools implementation.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+
+/* used by IP_ADDR_ANY and IP_ADDR_BROADCAST in ip_addr.h */
+const ip_addr_t ip_addr_any = { IPADDR_ANY };
+const ip_addr_t ip_addr_broadcast = { IPADDR_BROADCAST };
+
+/**
+ * Determine if an address is a broadcast address on a network interface 
+ * 
+ * @param addr address to be checked
+ * @param netif the network interface against which the address is checked
+ * @return returns non-zero if the address is a broadcast address
+ */
+u8_t
+ip4_addr_isbroadcast(u32_t addr, const struct netif *netif)
+{
+  ip_addr_t ipaddr;
+  ip4_addr_set_u32(&ipaddr, addr);
+
+  /* all ones (broadcast) or all zeroes (old skool broadcast) */
+  if ((~addr == IPADDR_ANY) ||
+      (addr == IPADDR_ANY)) {
+    return 1;
+  /* no broadcast support on this network interface? */
+  } else if ((netif->flags & NETIF_FLAG_BROADCAST) == 0) {
+    /* the given address cannot be a broadcast address
+     * nor can we check against any broadcast addresses */
+    return 0;
+  /* address matches network interface address exactly? => no broadcast */
+  } else if (addr == ip4_addr_get_u32(&netif->ip_addr)) {
+    return 0;
+  /*  on the same (sub) network... */
+  } else if (ip_addr_netcmp(&ipaddr, &(netif->ip_addr), &(netif->netmask))
+         /* ...and host identifier bits are all ones? =>... */
+          && ((addr & ~ip4_addr_get_u32(&netif->netmask)) ==
+           (IPADDR_BROADCAST & ~ip4_addr_get_u32(&netif->netmask)))) {
+    /* => network broadcast address */
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+/** Checks if a netmask is valid (starting with ones, then only zeros)
+ *
+ * @param netmask the IPv4 netmask to check (in network byte order!)
+ * @return 1 if the netmask is valid, 0 if it is not
+ */
+u8_t
+ip4_addr_netmask_valid(u32_t netmask)
+{
+  u32_t mask;
+  u32_t nm_hostorder = lwip_htonl(netmask);
+
+  /* first, check for the first zero */
+  for (mask = 1UL << 31 ; mask != 0; mask >>= 1) {
+    if ((nm_hostorder & mask) == 0) {
+      break;
+    }
+  }
+  /* then check that there is no one */
+  for (; mask != 0; mask >>= 1) {
+    if ((nm_hostorder & mask) != 0) {
+      /* there is a one after the first zero -> invalid */
+      return 0;
+    }
+  }
+  /* no one after the first zero -> valid */
+  return 1;
+}
+
+/* Here for now until needed in other places in lwIP */
+#ifndef isprint
+#define in_range(c, lo, up)  ((u8_t)c >= lo && (u8_t)c <= up)
+#define isprint(c)           in_range(c, 0x20, 0x7f)
+#define isdigit(c)           in_range(c, '0', '9')
+#define isxdigit(c)          (isdigit(c) || in_range(c, 'a', 'f') || in_range(c, 'A', 'F'))
+#define islower(c)           in_range(c, 'a', 'z')
+#define isspace(c)           (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')
+#endif
+
+/**
+ * Ascii internet address interpretation routine.
+ * The value returned is in network order.
+ *
+ * @param cp IP address in ascii represenation (e.g. "127.0.0.1")
+ * @return ip address in network order
+ */
+u32_t
+ipaddr_addr(const char *cp)
+{
+  ip_addr_t val;
+
+  if (ipaddr_aton(cp, &val)) {
+    return ip4_addr_get_u32(&val);
+  }
+  return (IPADDR_NONE);
+}
+
+/**
+ * Check whether "cp" is a valid ascii representation
+ * of an Internet address and convert to a binary address.
+ * Returns 1 if the address is valid, 0 if not.
+ * This replaces inet_addr, the return value from which
+ * cannot distinguish between failure and a local broadcast address.
+ *
+ * @param cp IP address in ascii represenation (e.g. "127.0.0.1")
+ * @param addr pointer to which to save the ip address in network order
+ * @return 1 if cp could be converted to addr, 0 on failure
+ */
+int
+ipaddr_aton(const char *cp, ip_addr_t *addr)
+{
+  u32_t val;
+  u8_t base;
+  char c;
+  u32_t parts[4];
+  u32_t *pp = parts;
+
+  c = *cp;
+  for (;;) {
+    /*
+     * Collect number up to ``.''.
+     * Values are specified as for C:
+     * 0x=hex, 0=octal, 1-9=decimal.
+     */
+    if (!isdigit(c))
+      return (0);
+    val = 0;
+    base = 10;
+    if (c == '0') {
+      c = *++cp;
+      if (c == 'x' || c == 'X') {
+        base = 16;
+        c = *++cp;
+      } else
+        base = 8;
+    }
+    for (;;) {
+      if (isdigit(c)) {
+        val = (val * base) + (int)(c - '0');
+        c = *++cp;
+      } else if (base == 16 && isxdigit(c)) {
+        val = (val << 4) | (int)(c + 10 - (islower(c) ? 'a' : 'A'));
+        c = *++cp;
+      } else
+        break;
+    }
+    if (c == '.') {
+      /*
+       * Internet format:
+       *  a.b.c.d
+       *  a.b.c   (with c treated as 16 bits)
+       *  a.b (with b treated as 24 bits)
+       */
+      if (pp >= parts + 3) {
+        return (0);
+      }
+      *pp++ = val;
+      c = *++cp;
+    } else
+      break;
+  }
+  /*
+   * Check for trailing characters.
+   */
+  if (c != '\0' && !isspace(c)) {
+    return (0);
+  }
+  /*
+   * Concoct the address according to
+   * the number of parts specified.
+   */
+  switch (pp - parts + 1) {
+
+  case 0:
+    return (0);       /* initial nondigit */
+
+  case 1:             /* a -- 32 bits */
+    break;
+
+  case 2:             /* a.b -- 8.24 bits */
+    if (val > 0xffffffUL) {
+      return (0);
+    }
+    val |= parts[0] << 24;
+    break;
+
+  case 3:             /* a.b.c -- 8.8.16 bits */
+    if (val > 0xffff) {
+      return (0);
+    }
+    val |= (parts[0] << 24) | (parts[1] << 16);
+    break;
+
+  case 4:             /* a.b.c.d -- 8.8.8.8 bits */
+    if (val > 0xff) {
+      return (0);
+    }
+    val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+    break;
+  default:
+    LWIP_ASSERT("unhandled", 0);
+    break;
+  }
+  if (addr) {
+    ip4_addr_set_u32(addr, htonl(val));
+  }
+  return (1);
+}
+
+/**
+ * Convert numeric IP address into decimal dotted ASCII representation.
+ * returns ptr to static buffer; not reentrant!
+ *
+ * @param addr ip address in network order to convert
+ * @return pointer to a global static (!) buffer that holds the ASCII
+ *         represenation of addr
+ */
+char *
+ipaddr_ntoa(const ip_addr_t *addr)
+{
+  static char str[16];
+  return ipaddr_ntoa_r(addr, str, 16);
+}
+
+/**
+ * Same as ipaddr_ntoa, but reentrant since a user-supplied buffer is used.
+ *
+ * @param addr ip address in network order to convert
+ * @param buf target buffer where the string is stored
+ * @param buflen length of buf
+ * @return either pointer to buf which now holds the ASCII
+ *         representation of addr or NULL if buf was too small
+ */
+char *ipaddr_ntoa_r(const ip_addr_t *addr, char *buf, int buflen)
+{
+  u32_t s_addr;
+  char inv[3];
+  char *rp;
+  u8_t *ap;
+  u8_t rem;
+  u8_t n;
+  u8_t i;
+  int len = 0;
+
+  s_addr = ip4_addr_get_u32(addr);
+
+  rp = buf;
+  ap = (u8_t *)&s_addr;
+  for(n = 0; n < 4; n++) {
+    i = 0;
+    do {
+      rem = *ap % (u8_t)10;
+      *ap /= (u8_t)10;
+      inv[i++] = '0' + rem;
+    } while(*ap);
+    while(i--) {
+      if (len++ >= buflen) {
+        return NULL;
+      }
+      *rp++ = inv[i];
+    }
+    if (len++ >= buflen) {
+      return NULL;
+    }
+    *rp++ = '.';
+    ap++;
+  }
+  *--rp = 0;
+  return buf;
+}
diff --git a/ext/lwip/src/core/ipv4/ip_frag.c b/ext/lwip/src/core/ipv4/ip_frag.c
new file mode 100644
index 000000000..8d184345d
--- /dev/null
+++ b/ext/lwip/src/core/ipv4/ip_frag.c
@@ -0,0 +1,863 @@
+/**
+ * @file
+ * This is the IPv4 packet segmentation and reassembly implementation.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Jani Monoses <jani@iv.ro> 
+ *         Simon Goldschmidt
+ * original reassembly code by Adam Dunkels <adam@sics.se>
+ * 
+ */
+
+#include "lwip/opt.h"
+#include "lwip/ip_frag.h"
+#include "lwip/def.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/netif.h"
+#include "lwip/snmp.h"
+#include "lwip/stats.h"
+#include "lwip/icmp.h"
+
+#include <string.h>
+
+#if IP_REASSEMBLY
+/**
+ * The IP reassembly code currently has the following limitations:
+ * - IP header options are not supported
+ * - fragments must not overlap (e.g. due to different routes),
+ *   currently, overlapping or duplicate fragments are thrown away
+ *   if IP_REASS_CHECK_OVERLAP=1 (the default)!
+ *
+ * @todo: work with IP header options
+ */
+
+/** Setting this to 0, you can turn off checking the fragments for overlapping
+ * regions. The code gets a little smaller. Only use this if you know that
+ * overlapping won't occur on your network! */
+#ifndef IP_REASS_CHECK_OVERLAP
+#define IP_REASS_CHECK_OVERLAP 1
+#endif /* IP_REASS_CHECK_OVERLAP */
+
+/** Set to 0 to prevent freeing the oldest datagram when the reassembly buffer is
+ * full (IP_REASS_MAX_PBUFS pbufs are enqueued). The code gets a little smaller.
+ * Datagrams will be freed by timeout only. Especially useful when MEMP_NUM_REASSDATA
+ * is set to 1, so one datagram can be reassembled at a time, only. */
+#ifndef IP_REASS_FREE_OLDEST
+#define IP_REASS_FREE_OLDEST 1
+#endif /* IP_REASS_FREE_OLDEST */
+
+#define IP_REASS_FLAG_LASTFRAG 0x01
+
+/** This is a helper struct which holds the starting
+ * offset and the ending offset of this fragment to
+ * easily chain the fragments.
+ * It has the same packing requirements as the IP header, since it replaces
+ * the IP header in memory in incoming fragments (after copying it) to keep
+ * track of the various fragments. (-> If the IP header doesn't need packing,
+ * this struct doesn't need packing, too.)
+ */
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct ip_reass_helper {
+  PACK_STRUCT_FIELD(struct pbuf *next_pbuf);
+  PACK_STRUCT_FIELD(u16_t start);
+  PACK_STRUCT_FIELD(u16_t end);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define IP_ADDRESSES_AND_ID_MATCH(iphdrA, iphdrB)  \
+  (ip_addr_cmp(&(iphdrA)->src, &(iphdrB)->src) && \
+   ip_addr_cmp(&(iphdrA)->dest, &(iphdrB)->dest) && \
+   IPH_ID(iphdrA) == IPH_ID(iphdrB)) ? 1 : 0
+
+/* global variables */
+static struct ip_reassdata *reassdatagrams;
+static u16_t ip_reass_pbufcount;
+
+/* function prototypes */
+static void ip_reass_dequeue_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev);
+static int ip_reass_free_complete_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev);
+
+/**
+ * Reassembly timer base function
+ * for both NO_SYS == 0 and 1 (!).
+ *
+ * Should be called every 1000 msec (defined by IP_TMR_INTERVAL).
+ */
+void
+ip_reass_tmr(void)
+{
+  struct ip_reassdata *r, *prev = NULL;
+
+  r = reassdatagrams;
+  while (r != NULL) {
+    /* Decrement the timer. Once it reaches 0,
+     * clean up the incomplete fragment assembly */
+    if (r->timer > 0) {
+      r->timer--;
+      LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass_tmr: timer dec %"U16_F"\n",(u16_t)r->timer));
+      prev = r;
+      r = r->next;
+    } else {
+      /* reassembly timed out */
+      struct ip_reassdata *tmp;
+      LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass_tmr: timer timed out\n"));
+      tmp = r;
+      /* get the next pointer before freeing */
+      r = r->next;
+      /* free the helper struct and all enqueued pbufs */
+      ip_reass_free_complete_datagram(tmp, prev);
+     }
+   }
+}
+
+/**
+ * Free a datagram (struct ip_reassdata) and all its pbufs.
+ * Updates the total count of enqueued pbufs (ip_reass_pbufcount),
+ * SNMP counters and sends an ICMP time exceeded packet.
+ *
+ * @param ipr datagram to free
+ * @param prev the previous datagram in the linked list
+ * @return the number of pbufs freed
+ */
+static int
+ip_reass_free_complete_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev)
+{
+  u16_t pbufs_freed = 0;
+  u8_t clen;
+  struct pbuf *p;
+  struct ip_reass_helper *iprh;
+
+  LWIP_ASSERT("prev != ipr", prev != ipr);
+  if (prev != NULL) {
+    LWIP_ASSERT("prev->next == ipr", prev->next == ipr);
+  }
+
+  snmp_inc_ipreasmfails();
+#if LWIP_ICMP
+  iprh = (struct ip_reass_helper *)ipr->p->payload;
+  if (iprh->start == 0) {
+    /* The first fragment was received, send ICMP time exceeded. */
+    /* First, de-queue the first pbuf from r->p. */
+    p = ipr->p;
+    ipr->p = iprh->next_pbuf;
+    /* Then, copy the original header into it. */
+    SMEMCPY(p->payload, &ipr->iphdr, IP_HLEN);
+    icmp_time_exceeded(p, ICMP_TE_FRAG);
+    clen = pbuf_clen(p);
+    LWIP_ASSERT("pbufs_freed + clen <= 0xffff", pbufs_freed + clen <= 0xffff);
+    pbufs_freed += clen;
+    pbuf_free(p);
+  }
+#endif /* LWIP_ICMP */
+
+  /* First, free all received pbufs.  The individual pbufs need to be released 
+     separately as they have not yet been chained */
+  p = ipr->p;
+  while (p != NULL) {
+    struct pbuf *pcur;
+    iprh = (struct ip_reass_helper *)p->payload;
+    pcur = p;
+    /* get the next pointer before freeing */
+    p = iprh->next_pbuf;
+    clen = pbuf_clen(pcur);
+    LWIP_ASSERT("pbufs_freed + clen <= 0xffff", pbufs_freed + clen <= 0xffff);
+    pbufs_freed += clen;
+    pbuf_free(pcur);
+  }
+  /* Then, unchain the struct ip_reassdata from the list and free it. */
+  ip_reass_dequeue_datagram(ipr, prev);
+  LWIP_ASSERT("ip_reass_pbufcount >= clen", ip_reass_pbufcount >= pbufs_freed);
+  ip_reass_pbufcount -= pbufs_freed;
+
+  return pbufs_freed;
+}
+
+#if IP_REASS_FREE_OLDEST
+/**
+ * Free the oldest datagram to make room for enqueueing new fragments.
+ * The datagram 'fraghdr' belongs to is not freed!
+ *
+ * @param fraghdr IP header of the current fragment
+ * @param pbufs_needed number of pbufs needed to enqueue
+ *        (used for freeing other datagrams if not enough space)
+ * @return the number of pbufs freed
+ */
+static int
+ip_reass_remove_oldest_datagram(struct ip_hdr *fraghdr, int pbufs_needed)
+{
+  /* @todo Can't we simply remove the last datagram in the
+   *       linked list behind reassdatagrams?
+   */
+  struct ip_reassdata *r, *oldest, *prev;
+  int pbufs_freed = 0, pbufs_freed_current;
+  int other_datagrams;
+
+  /* Free datagrams until being allowed to enqueue 'pbufs_needed' pbufs,
+   * but don't free the datagram that 'fraghdr' belongs to! */
+  do {
+    oldest = NULL;
+    prev = NULL;
+    other_datagrams = 0;
+    r = reassdatagrams;
+    while (r != NULL) {
+      if (!IP_ADDRESSES_AND_ID_MATCH(&r->iphdr, fraghdr)) {
+        /* Not the same datagram as fraghdr */
+        other_datagrams++;
+        if (oldest == NULL) {
+          oldest = r;
+        } else if (r->timer <= oldest->timer) {
+          /* older than the previous oldest */
+          oldest = r;
+        }
+      }
+      if (r->next != NULL) {
+        prev = r;
+      }
+      r = r->next;
+    }
+    if (oldest != NULL) {
+      pbufs_freed_current = ip_reass_free_complete_datagram(oldest, prev);
+      pbufs_freed += pbufs_freed_current;
+    }
+  } while ((pbufs_freed < pbufs_needed) && (other_datagrams > 1));
+  return pbufs_freed;
+}
+#endif /* IP_REASS_FREE_OLDEST */
+
+/**
+ * Enqueues a new fragment into the fragment queue
+ * @param fraghdr points to the new fragments IP hdr
+ * @param clen number of pbufs needed to enqueue (used for freeing other datagrams if not enough space)
+ * @return A pointer to the queue location into which the fragment was enqueued
+ */
+static struct ip_reassdata*
+ip_reass_enqueue_new_datagram(struct ip_hdr *fraghdr, int clen)
+{
+  struct ip_reassdata* ipr;
+  /* No matching previous fragment found, allocate a new reassdata struct */
+  ipr = (struct ip_reassdata *)memp_malloc(MEMP_REASSDATA);
+  if (ipr == NULL) {
+#if IP_REASS_FREE_OLDEST
+    if (ip_reass_remove_oldest_datagram(fraghdr, clen) >= clen) {
+      ipr = (struct ip_reassdata *)memp_malloc(MEMP_REASSDATA);
+    }
+    if (ipr == NULL)
+#endif /* IP_REASS_FREE_OLDEST */
+    {
+      IPFRAG_STATS_INC(ip_frag.memerr);
+      LWIP_DEBUGF(IP_REASS_DEBUG,("Failed to alloc reassdata struct\n"));
+      return NULL;
+    }
+  }
+  memset(ipr, 0, sizeof(struct ip_reassdata));
+  ipr->timer = IP_REASS_MAXAGE;
+
+  /* enqueue the new structure to the front of the list */
+  ipr->next = reassdatagrams;
+  reassdatagrams = ipr;
+  /* copy the ip header for later tests and input */
+  /* @todo: no ip options supported? */
+  SMEMCPY(&(ipr->iphdr), fraghdr, IP_HLEN);
+  return ipr;
+}
+
+/**
+ * Dequeues a datagram from the datagram queue. Doesn't deallocate the pbufs.
+ * @param ipr points to the queue entry to dequeue
+ */
+static void
+ip_reass_dequeue_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev)
+{
+  
+  /* dequeue the reass struct  */
+  if (reassdatagrams == ipr) {
+    /* it was the first in the list */
+    reassdatagrams = ipr->next;
+  } else {
+    /* it wasn't the first, so it must have a valid 'prev' */
+    LWIP_ASSERT("sanity check linked list", prev != NULL);
+    prev->next = ipr->next;
+  }
+
+  /* now we can free the ip_reass struct */
+  memp_free(MEMP_REASSDATA, ipr);
+}
+
+/**
+ * Chain a new pbuf into the pbuf list that composes the datagram.  The pbuf list
+ * will grow over time as  new pbufs are rx.
+ * Also checks that the datagram passes basic continuity checks (if the last
+ * fragment was received at least once).
+ * @param root_p points to the 'root' pbuf for the current datagram being assembled.
+ * @param new_p points to the pbuf for the current fragment
+ * @return 0 if invalid, >0 otherwise
+ */
+static int
+ip_reass_chain_frag_into_datagram_and_validate(struct ip_reassdata *ipr, struct pbuf *new_p)
+{
+  struct ip_reass_helper *iprh, *iprh_tmp, *iprh_prev=NULL;
+  struct pbuf *q;
+  u16_t offset,len;
+  struct ip_hdr *fraghdr;
+  int valid = 1;
+
+  /* Extract length and fragment offset from current fragment */
+  fraghdr = (struct ip_hdr*)new_p->payload; 
+  len = ntohs(IPH_LEN(fraghdr)) - IPH_HL(fraghdr) * 4;
+  offset = (ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) * 8;
+
+  /* overwrite the fragment's ip header from the pbuf with our helper struct,
+   * and setup the embedded helper structure. */
+  /* make sure the struct ip_reass_helper fits into the IP header */
+  LWIP_ASSERT("sizeof(struct ip_reass_helper) <= IP_HLEN",
+              sizeof(struct ip_reass_helper) <= IP_HLEN);
+  iprh = (struct ip_reass_helper*)new_p->payload;
+  iprh->next_pbuf = NULL;
+  iprh->start = offset;
+  iprh->end = offset + len;
+
+  /* Iterate through until we either get to the end of the list (append),
+   * or we find on with a larger offset (insert). */
+  for (q = ipr->p; q != NULL;) {
+    iprh_tmp = (struct ip_reass_helper*)q->payload;
+    if (iprh->start < iprh_tmp->start) {
+      /* the new pbuf should be inserted before this */
+      iprh->next_pbuf = q;
+      if (iprh_prev != NULL) {
+        /* not the fragment with the lowest offset */
+#if IP_REASS_CHECK_OVERLAP
+        if ((iprh->start < iprh_prev->end) || (iprh->end > iprh_tmp->start)) {
+          /* fragment overlaps with previous or following, throw away */
+          goto freepbuf;
+        }
+#endif /* IP_REASS_CHECK_OVERLAP */
+        iprh_prev->next_pbuf = new_p;
+      } else {
+        /* fragment with the lowest offset */
+        ipr->p = new_p;
+      }
+      break;
+    } else if(iprh->start == iprh_tmp->start) {
+      /* received the same datagram twice: no need to keep the datagram */
+      goto freepbuf;
+#if IP_REASS_CHECK_OVERLAP
+    } else if(iprh->start < iprh_tmp->end) {
+      /* overlap: no need to keep the new datagram */
+      goto freepbuf;
+#endif /* IP_REASS_CHECK_OVERLAP */
+    } else {
+      /* Check if the fragments received so far have no wholes. */
+      if (iprh_prev != NULL) {
+        if (iprh_prev->end != iprh_tmp->start) {
+          /* There is a fragment missing between the current
+           * and the previous fragment */
+          valid = 0;
+        }
+      }
+    }
+    q = iprh_tmp->next_pbuf;
+    iprh_prev = iprh_tmp;
+  }
+
+  /* If q is NULL, then we made it to the end of the list. Determine what to do now */
+  if (q == NULL) {
+    if (iprh_prev != NULL) {
+      /* this is (for now), the fragment with the highest offset:
+       * chain it to the last fragment */
+#if IP_REASS_CHECK_OVERLAP
+      LWIP_ASSERT("check fragments don't overlap", iprh_prev->end <= iprh->start);
+#endif /* IP_REASS_CHECK_OVERLAP */
+      iprh_prev->next_pbuf = new_p;
+      if (iprh_prev->end != iprh->start) {
+        valid = 0;
+      }
+    } else {
+#if IP_REASS_CHECK_OVERLAP
+      LWIP_ASSERT("no previous fragment, this must be the first fragment!",
+        ipr->p == NULL);
+#endif /* IP_REASS_CHECK_OVERLAP */
+      /* this is the first fragment we ever received for this ip datagram */
+      ipr->p = new_p;
+    }
+  }
+
+  /* At this point, the validation part begins: */
+  /* If we already received the last fragment */
+  if ((ipr->flags & IP_REASS_FLAG_LASTFRAG) != 0) {
+    /* and had no wholes so far */
+    if (valid) {
+      /* then check if the rest of the fragments is here */
+      /* Check if the queue starts with the first datagram */
+      if (((struct ip_reass_helper*)ipr->p->payload)->start != 0) {
+        valid = 0;
+      } else {
+        /* and check that there are no wholes after this datagram */
+        iprh_prev = iprh;
+        q = iprh->next_pbuf;
+        while (q != NULL) {
+          iprh = (struct ip_reass_helper*)q->payload;
+          if (iprh_prev->end != iprh->start) {
+            valid = 0;
+            break;
+          }
+          iprh_prev = iprh;
+          q = iprh->next_pbuf;
+        }
+        /* if still valid, all fragments are received
+         * (because to the MF==0 already arrived */
+        if (valid) {
+          LWIP_ASSERT("sanity check", ipr->p != NULL);
+          LWIP_ASSERT("sanity check",
+            ((struct ip_reass_helper*)ipr->p->payload) != iprh);
+          LWIP_ASSERT("validate_datagram:next_pbuf!=NULL",
+            iprh->next_pbuf == NULL);
+          LWIP_ASSERT("validate_datagram:datagram end!=datagram len",
+            iprh->end == ipr->datagram_len);
+        }
+      }
+    }
+    /* If valid is 0 here, there are some fragments missing in the middle
+     * (since MF == 0 has already arrived). Such datagrams simply time out if
+     * no more fragments are received... */
+    return valid;
+  }
+  /* If we come here, not all fragments were received, yet! */
+  return 0; /* not yet valid! */
+#if IP_REASS_CHECK_OVERLAP
+freepbuf:
+  ip_reass_pbufcount -= pbuf_clen(new_p);
+  pbuf_free(new_p);
+  return 0;
+#endif /* IP_REASS_CHECK_OVERLAP */
+}
+
+/**
+ * Reassembles incoming IP fragments into an IP datagram.
+ *
+ * @param p points to a pbuf chain of the fragment
+ * @return NULL if reassembly is incomplete, ? otherwise
+ */
+struct pbuf *
+ip_reass(struct pbuf *p)
+{
+  struct pbuf *r;
+  struct ip_hdr *fraghdr;
+  struct ip_reassdata *ipr;
+  struct ip_reass_helper *iprh;
+  u16_t offset, len;
+  u8_t clen;
+  struct ip_reassdata *ipr_prev = NULL;
+
+  IPFRAG_STATS_INC(ip_frag.recv);
+  snmp_inc_ipreasmreqds();
+
+  fraghdr = (struct ip_hdr*)p->payload;
+
+  if ((IPH_HL(fraghdr) * 4) != IP_HLEN) {
+    LWIP_DEBUGF(IP_REASS_DEBUG,("ip_reass: IP options currently not supported!\n"));
+    IPFRAG_STATS_INC(ip_frag.err);
+    goto nullreturn;
+  }
+
+  offset = (ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) * 8;
+  len = ntohs(IPH_LEN(fraghdr)) - IPH_HL(fraghdr) * 4;
+
+  /* Check if we are allowed to enqueue more datagrams. */
+  clen = pbuf_clen(p);
+  if ((ip_reass_pbufcount + clen) > IP_REASS_MAX_PBUFS) {
+#if IP_REASS_FREE_OLDEST
+    if (!ip_reass_remove_oldest_datagram(fraghdr, clen) ||
+        ((ip_reass_pbufcount + clen) > IP_REASS_MAX_PBUFS))
+#endif /* IP_REASS_FREE_OLDEST */
+    {
+      /* No datagram could be freed and still too many pbufs enqueued */
+      LWIP_DEBUGF(IP_REASS_DEBUG,("ip_reass: Overflow condition: pbufct=%d, clen=%d, MAX=%d\n",
+        ip_reass_pbufcount, clen, IP_REASS_MAX_PBUFS));
+      IPFRAG_STATS_INC(ip_frag.memerr);
+      /* @todo: send ICMP time exceeded here? */
+      /* drop this pbuf */
+      goto nullreturn;
+    }
+  }
+
+  /* Look for the datagram the fragment belongs to in the current datagram queue,
+   * remembering the previous in the queue for later dequeueing. */
+  for (ipr = reassdatagrams; ipr != NULL; ipr = ipr->next) {
+    /* Check if the incoming fragment matches the one currently present
+       in the reassembly buffer. If so, we proceed with copying the
+       fragment into the buffer. */
+    if (IP_ADDRESSES_AND_ID_MATCH(&ipr->iphdr, fraghdr)) {
+      LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass: matching previous fragment ID=%"X16_F"\n",
+        ntohs(IPH_ID(fraghdr))));
+      IPFRAG_STATS_INC(ip_frag.cachehit);
+      break;
+    }
+    ipr_prev = ipr;
+  }
+
+  if (ipr == NULL) {
+  /* Enqueue a new datagram into the datagram queue */
+    ipr = ip_reass_enqueue_new_datagram(fraghdr, clen);
+    /* Bail if unable to enqueue */
+    if(ipr == NULL) {
+      goto nullreturn;
+    }
+  } else {
+    if (((ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) == 0) && 
+      ((ntohs(IPH_OFFSET(&ipr->iphdr)) & IP_OFFMASK) != 0)) {
+      /* ipr->iphdr is not the header from the first fragment, but fraghdr is
+       * -> copy fraghdr into ipr->iphdr since we want to have the header
+       * of the first fragment (for ICMP time exceeded and later, for copying
+       * all options, if supported)*/
+      SMEMCPY(&ipr->iphdr, fraghdr, IP_HLEN);
+    }
+  }
+  /* Track the current number of pbufs current 'in-flight', in order to limit 
+  the number of fragments that may be enqueued at any one time */
+  ip_reass_pbufcount += clen;
+
+  /* At this point, we have either created a new entry or pointing 
+   * to an existing one */
+
+  /* check for 'no more fragments', and update queue entry*/
+  if ((IPH_OFFSET(fraghdr) & PP_NTOHS(IP_MF)) == 0) {
+    ipr->flags |= IP_REASS_FLAG_LASTFRAG;
+    ipr->datagram_len = offset + len;
+    LWIP_DEBUGF(IP_REASS_DEBUG,
+     ("ip_reass: last fragment seen, total len %"S16_F"\n",
+      ipr->datagram_len));
+  }
+  /* find the right place to insert this pbuf */
+  /* @todo: trim pbufs if fragments are overlapping */
+  if (ip_reass_chain_frag_into_datagram_and_validate(ipr, p)) {
+    /* the totally last fragment (flag more fragments = 0) was received at least
+     * once AND all fragments are received */
+    ipr->datagram_len += IP_HLEN;
+
+    /* save the second pbuf before copying the header over the pointer */
+    r = ((struct ip_reass_helper*)ipr->p->payload)->next_pbuf;
+
+    /* copy the original ip header back to the first pbuf */
+    fraghdr = (struct ip_hdr*)(ipr->p->payload);
+    SMEMCPY(fraghdr, &ipr->iphdr, IP_HLEN);
+    IPH_LEN_SET(fraghdr, htons(ipr->datagram_len));
+    IPH_OFFSET_SET(fraghdr, 0);
+    IPH_CHKSUM_SET(fraghdr, 0);
+    /* @todo: do we need to set calculate the correct checksum? */
+    IPH_CHKSUM_SET(fraghdr, inet_chksum(fraghdr, IP_HLEN));
+
+    p = ipr->p;
+
+    /* chain together the pbufs contained within the reass_data list. */
+    while(r != NULL) {
+      iprh = (struct ip_reass_helper*)r->payload;
+
+      /* hide the ip header for every succeding fragment */
+      pbuf_header(r, -IP_HLEN);
+      pbuf_cat(p, r);
+      r = iprh->next_pbuf;
+    }
+    /* release the sources allocate for the fragment queue entry */
+    ip_reass_dequeue_datagram(ipr, ipr_prev);
+
+    /* and adjust the number of pbufs currently queued for reassembly. */
+    ip_reass_pbufcount -= pbuf_clen(p);
+
+    /* Return the pbuf chain */
+    return p;
+  }
+  /* the datagram is not (yet?) reassembled completely */
+  LWIP_DEBUGF(IP_REASS_DEBUG,("ip_reass_pbufcount: %d out\n", ip_reass_pbufcount));
+  return NULL;
+
+nullreturn:
+  LWIP_DEBUGF(IP_REASS_DEBUG,("ip_reass: nullreturn\n"));
+  IPFRAG_STATS_INC(ip_frag.drop);
+  pbuf_free(p);
+  return NULL;
+}
+#endif /* IP_REASSEMBLY */
+
+#if IP_FRAG
+#if IP_FRAG_USES_STATIC_BUF
+static u8_t buf[LWIP_MEM_ALIGN_SIZE(IP_FRAG_MAX_MTU + MEM_ALIGNMENT - 1)];
+#else /* IP_FRAG_USES_STATIC_BUF */
+
+#if !LWIP_NETIF_TX_SINGLE_PBUF
+/** Allocate a new struct pbuf_custom_ref */
+static struct pbuf_custom_ref*
+ip_frag_alloc_pbuf_custom_ref(void)
+{
+  return (struct pbuf_custom_ref*)memp_malloc(MEMP_FRAG_PBUF);
+}
+
+/** Free a struct pbuf_custom_ref */
+static void
+ip_frag_free_pbuf_custom_ref(struct pbuf_custom_ref* p)
+{
+  LWIP_ASSERT("p != NULL", p != NULL);
+  memp_free(MEMP_FRAG_PBUF, p);
+}
+
+/** Free-callback function to free a 'struct pbuf_custom_ref', called by
+ * pbuf_free. */
+static void
+ipfrag_free_pbuf_custom(struct pbuf *p)
+{
+  struct pbuf_custom_ref *pcr = (struct pbuf_custom_ref*)p;
+  LWIP_ASSERT("pcr != NULL", pcr != NULL);
+  LWIP_ASSERT("pcr == p", (void*)pcr == (void*)p);
+  if (pcr->original != NULL) {
+    pbuf_free(pcr->original);
+  }
+  ip_frag_free_pbuf_custom_ref(pcr);
+}
+#endif /* !LWIP_NETIF_TX_SINGLE_PBUF */
+#endif /* IP_FRAG_USES_STATIC_BUF */
+
+/**
+ * Fragment an IP datagram if too large for the netif.
+ *
+ * Chop the datagram in MTU sized chunks and send them in order
+ * by using a fixed size static memory buffer (PBUF_REF) or
+ * point PBUF_REFs into p (depending on IP_FRAG_USES_STATIC_BUF).
+ *
+ * @param p ip packet to send
+ * @param netif the netif on which to send
+ * @param dest destination ip address to which to send
+ *
+ * @return ERR_OK if sent successfully, err_t otherwise
+ */
+err_t 
+ip_frag(struct pbuf *p, struct netif *netif, ip_addr_t *dest)
+{
+  struct pbuf *rambuf;
+#if IP_FRAG_USES_STATIC_BUF
+  struct pbuf *header;
+#else
+#if !LWIP_NETIF_TX_SINGLE_PBUF
+  struct pbuf *newpbuf;
+#endif
+  struct ip_hdr *original_iphdr;
+#endif
+  struct ip_hdr *iphdr;
+  u16_t nfb;
+  u16_t left, cop;
+  u16_t mtu = netif->mtu;
+  u16_t ofo, omf;
+  u16_t last;
+  u16_t poff = IP_HLEN;
+  u16_t tmp;
+#if !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF
+  u16_t newpbuflen = 0;
+  u16_t left_to_copy;
+#endif
+
+  /* Get a RAM based MTU sized pbuf */
+#if IP_FRAG_USES_STATIC_BUF
+  /* When using a static buffer, we use a PBUF_REF, which we will
+   * use to reference the packet (without link header).
+   * Layer and length is irrelevant.
+   */
+  rambuf = pbuf_alloc(PBUF_LINK, 0, PBUF_REF);
+  if (rambuf == NULL) {
+    LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_frag: pbuf_alloc(PBUF_LINK, 0, PBUF_REF) failed\n"));
+    return ERR_MEM;
+  }
+  rambuf->tot_len = rambuf->len = mtu;
+  rambuf->payload = LWIP_MEM_ALIGN((void *)buf);
+
+  /* Copy the IP header in it */
+  iphdr = (struct ip_hdr *)rambuf->payload;
+  SMEMCPY(iphdr, p->payload, IP_HLEN);
+#else /* IP_FRAG_USES_STATIC_BUF */
+  original_iphdr = (struct ip_hdr *)p->payload;
+  iphdr = original_iphdr;
+#endif /* IP_FRAG_USES_STATIC_BUF */
+
+  /* Save original offset */
+  tmp = ntohs(IPH_OFFSET(iphdr));
+  ofo = tmp & IP_OFFMASK;
+  omf = tmp & IP_MF;
+
+  left = p->tot_len - IP_HLEN;
+
+  nfb = (mtu - IP_HLEN) / 8;
+
+  while (left) {
+    last = (left <= mtu - IP_HLEN);
+
+    /* Set new offset and MF flag */
+    tmp = omf | (IP_OFFMASK & (ofo));
+    if (!last) {
+      tmp = tmp | IP_MF;
+    }
+
+    /* Fill this fragment */
+    cop = last ? left : nfb * 8;
+
+#if IP_FRAG_USES_STATIC_BUF
+    poff += pbuf_copy_partial(p, (u8_t*)iphdr + IP_HLEN, cop, poff);
+#else /* IP_FRAG_USES_STATIC_BUF */
+#if LWIP_NETIF_TX_SINGLE_PBUF
+    rambuf = pbuf_alloc(PBUF_IP, cop, PBUF_RAM);
+    if (rambuf == NULL) {
+      return ERR_MEM;
+    }
+    LWIP_ASSERT("this needs a pbuf in one piece!",
+      (rambuf->len == rambuf->tot_len) && (rambuf->next == NULL));
+    poff += pbuf_copy_partial(p, rambuf->payload, cop, poff);
+    /* make room for the IP header */
+    if(pbuf_header(rambuf, IP_HLEN)) {
+      pbuf_free(rambuf);
+      return ERR_MEM;
+    }
+    /* fill in the IP header */
+    SMEMCPY(rambuf->payload, original_iphdr, IP_HLEN);
+    iphdr = rambuf->payload;
+#else /* LWIP_NETIF_TX_SINGLE_PBUF */
+    /* When not using a static buffer, create a chain of pbufs.
+     * The first will be a PBUF_RAM holding the link and IP header.
+     * The rest will be PBUF_REFs mirroring the pbuf chain to be fragged,
+     * but limited to the size of an mtu.
+     */
+    rambuf = pbuf_alloc(PBUF_LINK, IP_HLEN, PBUF_RAM);
+    if (rambuf == NULL) {
+      return ERR_MEM;
+    }
+    LWIP_ASSERT("this needs a pbuf in one piece!",
+                (p->len >= (IP_HLEN)));
+    SMEMCPY(rambuf->payload, original_iphdr, IP_HLEN);
+    iphdr = (struct ip_hdr *)rambuf->payload;
+
+    /* Can just adjust p directly for needed offset. */
+    p->payload = (u8_t *)p->payload + poff;
+    p->len -= poff;
+
+    left_to_copy = cop;
+    while (left_to_copy) {
+      struct pbuf_custom_ref *pcr;
+      newpbuflen = (left_to_copy < p->len) ? left_to_copy : p->len;
+      /* Is this pbuf already empty? */
+      if (!newpbuflen) {
+        p = p->next;
+        continue;
+      }
+      pcr = ip_frag_alloc_pbuf_custom_ref();
+      if (pcr == NULL) {
+        pbuf_free(rambuf);
+        return ERR_MEM;
+      }
+      /* Mirror this pbuf, although we might not need all of it. */
+      newpbuf = pbuf_alloced_custom(PBUF_RAW, newpbuflen, PBUF_REF, &pcr->pc, p->payload, newpbuflen);
+      if (newpbuf == NULL) {
+        ip_frag_free_pbuf_custom_ref(pcr);
+        pbuf_free(rambuf);
+        return ERR_MEM;
+      }
+      pbuf_ref(p);
+      pcr->original = p;
+      pcr->pc.custom_free_function = ipfrag_free_pbuf_custom;
+
+      /* Add it to end of rambuf's chain, but using pbuf_cat, not pbuf_chain
+       * so that it is removed when pbuf_dechain is later called on rambuf.
+       */
+      pbuf_cat(rambuf, newpbuf);
+      left_to_copy -= newpbuflen;
+      if (left_to_copy) {
+        p = p->next;
+      }
+    }
+    poff = newpbuflen;
+#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
+#endif /* IP_FRAG_USES_STATIC_BUF */
+
+    /* Correct header */
+    IPH_OFFSET_SET(iphdr, htons(tmp));
+    IPH_LEN_SET(iphdr, htons(cop + IP_HLEN));
+    IPH_CHKSUM_SET(iphdr, 0);
+    IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
+
+#if IP_FRAG_USES_STATIC_BUF
+    if (last) {
+      pbuf_realloc(rambuf, left + IP_HLEN);
+    }
+
+    /* This part is ugly: we alloc a RAM based pbuf for 
+     * the link level header for each chunk and then 
+     * free it.A PBUF_ROM style pbuf for which pbuf_header
+     * worked would make things simpler.
+     */
+    header = pbuf_alloc(PBUF_LINK, 0, PBUF_RAM);
+    if (header != NULL) {
+      pbuf_chain(header, rambuf);
+      netif->output(netif, header, dest);
+      IPFRAG_STATS_INC(ip_frag.xmit);
+      snmp_inc_ipfragcreates();
+      pbuf_free(header);
+    } else {
+      LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_frag: pbuf_alloc() for header failed\n"));
+      pbuf_free(rambuf);
+      return ERR_MEM;
+    }
+#else /* IP_FRAG_USES_STATIC_BUF */
+    /* No need for separate header pbuf - we allowed room for it in rambuf
+     * when allocated.
+     */
+    netif->output(netif, rambuf, dest);
+    IPFRAG_STATS_INC(ip_frag.xmit);
+
+    /* Unfortunately we can't reuse rambuf - the hardware may still be
+     * using the buffer. Instead we free it (and the ensuing chain) and
+     * recreate it next time round the loop. If we're lucky the hardware
+     * will have already sent the packet, the free will really free, and
+     * there will be zero memory penalty.
+     */
+    
+    pbuf_free(rambuf);
+#endif /* IP_FRAG_USES_STATIC_BUF */
+    left -= cop;
+    ofo += nfb;
+  }
+#if IP_FRAG_USES_STATIC_BUF
+  pbuf_free(rambuf);
+#endif /* IP_FRAG_USES_STATIC_BUF */
+  snmp_inc_ipfragoks();
+  return ERR_OK;
+}
+#endif /* IP_FRAG */
diff --git a/ext/lwip/src/core/ipv6/README b/ext/lwip/src/core/ipv6/README
new file mode 100644
index 000000000..362000486
--- /dev/null
+++ b/ext/lwip/src/core/ipv6/README
@@ -0,0 +1 @@
+IPv6 support in lwIP is very experimental.
diff --git a/ext/lwip/src/core/ipv6/icmp6.c b/ext/lwip/src/core/ipv6/icmp6.c
new file mode 100644
index 000000000..4fcc89551
--- /dev/null
+++ b/ext/lwip/src/core/ipv6/icmp6.c
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+/* Some ICMP messages should be passed to the transport protocols. This
+   is not implemented. */
+
+#include "lwip/opt.h"
+
+#if LWIP_ICMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/icmp.h"
+#include "lwip/inet.h"
+#include "lwip/ip.h"
+#include "lwip/def.h"
+#include "lwip/stats.h"
+
+void
+icmp_input(struct pbuf *p, struct netif *inp)
+{
+  u8_t type;
+  struct icmp_echo_hdr *iecho;
+  struct ip_hdr *iphdr;
+  struct ip_addr tmpaddr;
+
+  ICMP_STATS_INC(icmp.recv);
+
+  /* TODO: check length before accessing payload! */
+
+  type = ((u8_t *)p->payload)[0];
+
+  switch (type) {
+  case ICMP6_ECHO:
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ping\n"));
+
+    if (p->tot_len < sizeof(struct icmp_echo_hdr)) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: bad ICMP echo received\n"));
+
+      pbuf_free(p);
+      ICMP_STATS_INC(icmp.lenerr);
+      return;
+    }
+    iecho = p->payload;
+    iphdr = (struct ip_hdr *)((u8_t *)p->payload - IP_HLEN);
+    if (inet_chksum_pbuf(p) != 0) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo (%"X16_F")\n", inet_chksum_pseudo(p, &(iphdr->src), &(iphdr->dest), IP_PROTO_ICMP, p->tot_len)));
+      ICMP_STATS_INC(icmp.chkerr);
+    /*      return;*/
+    }
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp: p->len %"S16_F" p->tot_len %"S16_F"\n", p->len, p->tot_len));
+    ip_addr_set(&tmpaddr, &(iphdr->src));
+    ip_addr_set(&(iphdr->src), &(iphdr->dest));
+    ip_addr_set(&(iphdr->dest), &tmpaddr);
+    iecho->type = ICMP6_ER;
+    /* adjust the checksum */
+    if (iecho->chksum >= htons(0xffff - (ICMP6_ECHO << 8))) {
+      iecho->chksum += htons(ICMP6_ECHO << 8) + 1;
+    } else {
+      iecho->chksum += htons(ICMP6_ECHO << 8);
+    }
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo (%"X16_F")\n", inet_chksum_pseudo(p, &(iphdr->src), &(iphdr->dest), IP_PROTO_ICMP, p->tot_len)));
+    ICMP_STATS_INC(icmp.xmit);
+
+    /*    LWIP_DEBUGF("icmp: p->len %"U16_F" p->tot_len %"U16_F"\n", p->len, p->tot_len);*/
+    ip_output_if (p, &(iphdr->src), IP_HDRINCL,
+     iphdr->hoplim, IP_PROTO_ICMP, inp);
+    break;
+  default:
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %"S16_F" not supported.\n", (s16_t)type));
+    ICMP_STATS_INC(icmp.proterr);
+    ICMP_STATS_INC(icmp.drop);
+  }
+
+  pbuf_free(p);
+}
+
+void
+icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t)
+{
+  struct pbuf *q;
+  struct ip_hdr *iphdr;
+  struct icmp_dur_hdr *idur;
+
+  /* @todo: can this be PBUF_LINK instead of PBUF_IP? */
+  q = pbuf_alloc(PBUF_IP, 8 + IP_HLEN + 8, PBUF_RAM);
+  /* ICMP header + IP header + 8 bytes of data */
+  if (q == NULL) {
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_dest_unreach: failed to allocate pbuf for ICMP packet.\n"));
+    pbuf_free(p);
+    return;
+  }
+  LWIP_ASSERT("check that first pbuf can hold icmp message",
+             (q->len >= (8 + IP_HLEN + 8)));
+
+  iphdr = p->payload;
+
+  idur = q->payload;
+  idur->type = (u8_t)ICMP6_DUR;
+  idur->icode = (u8_t)t;
+
+  SMEMCPY((u8_t *)q->payload + 8, p->payload, IP_HLEN + 8);
+
+  /* calculate checksum */
+  idur->chksum = 0;
+  idur->chksum = inet_chksum(idur, q->len);
+  ICMP_STATS_INC(icmp.xmit);
+
+  ip_output(q, NULL,
+      (struct ip_addr *)&(iphdr->src), ICMP_TTL, IP_PROTO_ICMP);
+  pbuf_free(q);
+}
+
+void
+icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t)
+{
+  struct pbuf *q;
+  struct ip_hdr *iphdr;
+  struct icmp_te_hdr *tehdr;
+
+  LWIP_DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded\n"));
+
+  /* @todo: can this be PBUF_LINK instead of PBUF_IP? */
+  q = pbuf_alloc(PBUF_IP, 8 + IP_HLEN + 8, PBUF_RAM);
+  /* ICMP header + IP header + 8 bytes of data */
+  if (q == NULL) {
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_dest_unreach: failed to allocate pbuf for ICMP packet.\n"));
+    pbuf_free(p);
+    return;
+  }
+  LWIP_ASSERT("check that first pbuf can hold icmp message",
+             (q->len >= (8 + IP_HLEN + 8)));
+
+  iphdr = p->payload;
+
+  tehdr = q->payload;
+  tehdr->type = (u8_t)ICMP6_TE;
+  tehdr->icode = (u8_t)t;
+
+  /* copy fields from original packet */
+  SMEMCPY((u8_t *)q->payload + 8, (u8_t *)p->payload, IP_HLEN + 8);
+
+  /* calculate checksum */
+  tehdr->chksum = 0;
+  tehdr->chksum = inet_chksum(tehdr, q->len);
+  ICMP_STATS_INC(icmp.xmit);
+  ip_output(q, NULL,
+      (struct ip_addr *)&(iphdr->src), ICMP_TTL, IP_PROTO_ICMP);
+  pbuf_free(q);
+}
+
+#endif /* LWIP_ICMP */
diff --git a/ext/lwip/src/core/ipv6/inet6.c b/ext/lwip/src/core/ipv6/inet6.c
new file mode 100644
index 000000000..c3de85c09
--- /dev/null
+++ b/ext/lwip/src/core/ipv6/inet6.c
@@ -0,0 +1,163 @@
+/**
+ * @file
+ * Functions common to all TCP/IPv6 modules, such as the Internet checksum and the
+ * byte order functions.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/def.h"
+#include "lwip/inet.h"
+
+/* chksum:
+ *
+ * Sums up all 16 bit words in a memory portion. Also includes any odd byte.
+ * This function is used by the other checksum functions.
+ *
+ * For now, this is not optimized. Must be optimized for the particular processor
+ * arcitecture on which it is to run. Preferebly coded in assembler.
+ */
+
+static u32_t
+chksum(void *dataptr, u16_t len)
+{
+  u16_t *sdataptr = dataptr;
+  u32_t acc;
+  
+  
+  for(acc = 0; len > 1; len -= 2) {
+    acc += *sdataptr++;
+  }
+
+  /* add up any odd byte */
+  if (len == 1) {
+    acc += htons((u16_t)(*(u8_t *)dataptr) << 8);
+  }
+
+  return acc;
+
+}
+
+/* inet_chksum_pseudo:
+ *
+ * Calculates the pseudo Internet checksum used by TCP and UDP for a pbuf chain.
+ */
+
+u16_t
+inet_chksum_pseudo(struct pbuf *p,
+       struct ip_addr *src, struct ip_addr *dest,
+       u8_t proto, u32_t proto_len)
+{
+  u32_t acc;
+  struct pbuf *q;
+  u8_t swapped, i;
+
+  acc = 0;
+  swapped = 0;
+  for(q = p; q != NULL; q = q->next) {    
+    acc += chksum(q->payload, q->len);
+    while (acc >> 16) {
+      acc = (acc & 0xffff) + (acc >> 16);
+    }
+    if (q->len % 2 != 0) {
+      swapped = 1 - swapped;
+      acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8);
+    }
+  }
+
+  if (swapped) {
+    acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8);
+  }
+  
+  for(i = 0; i < 8; i++) {
+    acc += ((u16_t *)src->addr)[i] & 0xffff;
+    acc += ((u16_t *)dest->addr)[i] & 0xffff;
+    while (acc >> 16) {
+      acc = (acc & 0xffff) + (acc >> 16);
+    }
+  }
+  acc += (u16_t)htons((u16_t)proto);
+  acc += ((u16_t *)&proto_len)[0] & 0xffff;
+  acc += ((u16_t *)&proto_len)[1] & 0xffff;
+
+  while (acc >> 16) {
+    acc = (acc & 0xffff) + (acc >> 16);
+  }
+  return ~(acc & 0xffff);
+}
+
+/* inet_chksum:
+ *
+ * Calculates the Internet checksum over a portion of memory. Used primarely for IP
+ * and ICMP.
+ */
+
+u16_t
+inet_chksum(void *dataptr, u16_t len)
+{
+  u32_t acc, sum;
+
+  acc = chksum(dataptr, len);
+  sum = (acc & 0xffff) + (acc >> 16);
+  sum += (sum >> 16);
+  return ~(sum & 0xffff);
+}
+
+u16_t
+inet_chksum_pbuf(struct pbuf *p)
+{
+  u32_t acc;
+  struct pbuf *q;
+  u8_t swapped;
+  
+  acc = 0;
+  swapped = 0;
+  for(q = p; q != NULL; q = q->next) {
+    acc += chksum(q->payload, q->len);
+    while (acc >> 16) {
+      acc = (acc & 0xffff) + (acc >> 16);
+    }    
+    if (q->len % 2 != 0) {
+      swapped = 1 - swapped;
+      acc = (acc & 0xff << 8) | (acc & 0xff00 >> 8);
+    }
+  }
+ 
+  if (swapped) {
+    acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8);
+  }
+  return ~(acc & 0xffff);
+}
diff --git a/ext/lwip/src/core/ipv6/ip6.c b/ext/lwip/src/core/ipv6/ip6.c
new file mode 100644
index 000000000..ad59b725c
--- /dev/null
+++ b/ext/lwip/src/core/ipv6/ip6.c
@@ -0,0 +1,397 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+
+
+/* ip.c
+ *
+ * This is the code for the IP layer for IPv6.
+ *
+ */
+
+
+#include "lwip/opt.h"
+
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/ip.h"
+#include "lwip/inet.h"
+#include "lwip/netif.h"
+#include "lwip/icmp.h"
+#include "lwip/udp.h"
+#include "lwip/tcp_impl.h"
+
+#include "lwip/stats.h"
+
+#include "arch/perf.h"
+
+/* ip_init:
+ *
+ * Initializes the IP layer.
+ */
+
+void
+ip_init(void)
+{
+}
+
+/* ip_route:
+ *
+ * Finds the appropriate network interface for a given IP address. It searches the
+ * list of network interfaces linearly. A match is found if the masked IP address of
+ * the network interface equals the masked IP address given to the function.
+ */
+
+struct netif *
+ip_route(struct ip_addr *dest)
+{
+  struct netif *netif;
+
+  for(netif = netif_list; netif != NULL; netif = netif->next) {
+    if (ip_addr_netcmp(dest, &(netif->ip_addr), &(netif->netmask))) {
+      return netif;
+    }
+  }
+
+  return netif_default;
+}
+
+/* ip_forward:
+ *
+ * Forwards an IP packet. It finds an appropriate route for the packet, decrements
+ * the TTL value of the packet, adjusts the checksum and outputs the packet on the
+ * appropriate interface.
+ */
+
+static void
+ip_forward(struct pbuf *p, struct ip_hdr *iphdr)
+{
+  struct netif *netif;
+
+  PERF_START;
+
+  if ((netif = ip_route((struct ip_addr *)&(iphdr->dest))) == NULL) {
+
+    LWIP_DEBUGF(IP_DEBUG, ("ip_input: no forwarding route found for "));
+#if IP_DEBUG
+    ip_addr_debug_print(IP_DEBUG, ((struct ip_addr *)&(iphdr->dest)));
+#endif /* IP_DEBUG */
+    LWIP_DEBUGF(IP_DEBUG, ("\n"));
+    pbuf_free(p);
+    return;
+  }
+  /* Decrement TTL and send ICMP if ttl == 0. */
+  if (--iphdr->hoplim == 0) {
+#if LWIP_ICMP
+    /* Don't send ICMP messages in response to ICMP messages */
+    if (iphdr->nexthdr != IP_PROTO_ICMP) {
+      icmp_time_exceeded(p, ICMP_TE_TTL);
+    }
+#endif /* LWIP_ICMP */
+    pbuf_free(p);
+    return;
+  }
+
+  /* Incremental update of the IP checksum. */
+  /*  if (iphdr->chksum >= htons(0xffff - 0x100)) {
+    iphdr->chksum += htons(0x100) + 1;
+  } else {
+    iphdr->chksum += htons(0x100);
+    }*/
+
+
+  LWIP_DEBUGF(IP_DEBUG, ("ip_forward: forwarding packet to "));
+#if IP_DEBUG
+  ip_addr_debug_print(IP_DEBUG, ((struct ip_addr *)&(iphdr->dest)));
+#endif /* IP_DEBUG */
+  LWIP_DEBUGF(IP_DEBUG, ("\n"));
+
+  IP_STATS_INC(ip.fw);
+  IP_STATS_INC(ip.xmit);
+
+  PERF_STOP("ip_forward");
+
+  netif->output(netif, p, (struct ip_addr *)&(iphdr->dest));
+}
+
+/* ip_input:
+ *
+ * This function is called by the network interface device driver when an IP packet is
+ * received. The function does the basic checks of the IP header such as packet size
+ * being at least larger than the header size etc. If the packet was not destined for
+ * us, the packet is forwarded (using ip_forward). The IP checksum is always checked.
+ *
+ * Finally, the packet is sent to the upper layer protocol input function.
+ */
+
+void
+ip_input(struct pbuf *p, struct netif *inp) {
+  struct ip_hdr *iphdr;
+  struct netif *netif;
+
+
+  PERF_START;
+
+#if IP_DEBUG
+  ip_debug_print(p);
+#endif /* IP_DEBUG */
+
+
+  IP_STATS_INC(ip.recv);
+
+  /* identify the IP header */
+  iphdr = p->payload;
+
+
+  if (iphdr->v != 6) {
+    LWIP_DEBUGF(IP_DEBUG, ("IP packet dropped due to bad version number\n"));
+#if IP_DEBUG
+    ip_debug_print(p);
+#endif /* IP_DEBUG */
+    pbuf_free(p);
+    IP_STATS_INC(ip.err);
+    IP_STATS_INC(ip.drop);
+    return;
+  }
+
+  /* is this packet for us? */
+  for(netif = netif_list; netif != NULL; netif = netif->next) {
+#if IP_DEBUG
+    LWIP_DEBUGF(IP_DEBUG, ("ip_input: iphdr->dest "));
+    ip_addr_debug_print(IP_DEBUG, ((struct ip_addr *)&(iphdr->dest)));
+    LWIP_DEBUGF(IP_DEBUG, ("netif->ip_addr "));
+    ip_addr_debug_print(IP_DEBUG, ((struct ip_addr *)&(iphdr->dest)));
+    LWIP_DEBUGF(IP_DEBUG, ("\n"));
+#endif /* IP_DEBUG */
+    if (ip_addr_cmp(&(iphdr->dest), &(netif->ip_addr))) {
+      break;
+    }
+  }
+
+
+  if (netif == NULL) {
+    /* packet not for us, route or discard */
+#if IP_FORWARD
+    ip_forward(p, iphdr);
+#endif
+    pbuf_free(p);
+    return;
+  }
+
+  pbuf_realloc(p, IP_HLEN + ntohs(iphdr->len));
+
+  /* send to upper layers */
+#if IP_DEBUG
+  /*  LWIP_DEBUGF("ip_input: \n");
+  ip_debug_print(p);
+  LWIP_DEBUGF("ip_input: p->len %"U16_F" p->tot_len %"U16_F"\n", p->len, p->tot_len);*/
+#endif /* IP_DEBUG */
+
+  if(pbuf_header(p, -IP_HLEN)) {
+    LWIP_ASSERT("Can't move over header in packet", 0);
+    return;
+  }
+
+  switch (iphdr->nexthdr) {
+  case IP_PROTO_UDP:
+    udp_input(p, inp);
+    break;
+  case IP_PROTO_TCP:
+    tcp_input(p, inp);
+    break;
+#if LWIP_ICMP
+  case IP_PROTO_ICMP:
+    icmp_input(p, inp);
+    break;
+#endif /* LWIP_ICMP */
+  default:
+#if LWIP_ICMP
+    /* send ICMP destination protocol unreachable */
+    icmp_dest_unreach(p, ICMP_DUR_PROTO);
+#endif /* LWIP_ICMP */
+    pbuf_free(p);
+    LWIP_DEBUGF(IP_DEBUG, ("Unsupported transport protocol %"U16_F"\n",
+          iphdr->nexthdr));
+
+    IP_STATS_INC(ip.proterr);
+    IP_STATS_INC(ip.drop);
+  }
+  PERF_STOP("ip_input");
+}
+
+
+/* ip_output_if:
+ *
+ * Sends an IP packet on a network interface. This function constructs the IP header
+ * and calculates the IP header checksum. If the source IP address is NULL,
+ * the IP address of the outgoing network interface is filled in as source address.
+ */
+
+err_t
+ip_output_if (struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
+       u8_t ttl,
+       u8_t proto, struct netif *netif)
+{
+  struct ip_hdr *iphdr;
+
+  PERF_START;
+
+  LWIP_DEBUGF(IP_DEBUG, ("len %"U16_F" tot_len %"U16_F"\n", p->len, p->tot_len));
+  if (pbuf_header(p, IP_HLEN)) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_output: not enough room for IP header in pbuf\n"));
+    IP_STATS_INC(ip.err);
+
+    return ERR_BUF;
+  }
+  LWIP_DEBUGF(IP_DEBUG, ("len %"U16_F" tot_len %"U16_F"\n", p->len, p->tot_len));
+
+  iphdr = p->payload;
+
+
+  if (dest != IP_HDRINCL) {
+    LWIP_DEBUGF(IP_DEBUG, ("!IP_HDRLINCL\n"));
+    iphdr->hoplim = ttl;
+    iphdr->nexthdr = proto;
+    iphdr->len = htons(p->tot_len - IP_HLEN);
+    ip_addr_set(&(iphdr->dest), dest);
+
+    iphdr->v = 6;
+
+    if (ip_addr_isany(src)) {
+      ip_addr_set(&(iphdr->src), &(netif->ip_addr));
+    } else {
+      ip_addr_set(&(iphdr->src), src);
+    }
+
+  } else {
+    dest = &(iphdr->dest);
+  }
+
+  IP_STATS_INC(ip.xmit);
+
+  LWIP_DEBUGF(IP_DEBUG, ("ip_output_if: %c%c (len %"U16_F")\n", netif->name[0], netif->name[1], p->tot_len));
+#if IP_DEBUG
+  ip_debug_print(p);
+#endif /* IP_DEBUG */
+
+  PERF_STOP("ip_output_if");
+  return netif->output(netif, p, dest);
+}
+
+/* ip_output:
+ *
+ * Simple interface to ip_output_if. It finds the outgoing network interface and
+ * calls upon ip_output_if to do the actual work.
+ */
+
+err_t
+ip_output(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
+    u8_t ttl, u8_t proto)
+{
+  struct netif *netif;
+  if ((netif = ip_route(dest)) == NULL) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_output: No route to 0x%"X32_F"\n", dest->addr));
+    IP_STATS_INC(ip.rterr);
+    return ERR_RTE;
+  }
+
+  return ip_output_if (p, src, dest, ttl, proto, netif);
+}
+
+#if LWIP_NETIF_HWADDRHINT
+err_t
+ip_output_hinted(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
+          u8_t ttl, u8_t tos, u8_t proto, u8_t *addr_hint)
+{
+  struct netif *netif;
+  err_t err;
+
+  if ((netif = ip_route(dest)) == NULL) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_output: No route to 0x%"X32_F"\n", dest->addr));
+    IP_STATS_INC(ip.rterr);
+    return ERR_RTE;
+  }
+
+  LWIP_NETIF_HWADDRHINT(netif, addr_hint);
+  err = ip_output_if(p, src, dest, ttl, tos, proto, netif);
+  LWIP_NETIF_HWADDRHINT(netif, NULL);
+
+  return err;
+}
+#endif /* LWIP_NETIF_HWADDRHINT*/
+
+#if IP_DEBUG
+void
+ip_debug_print(struct pbuf *p)
+{
+  struct ip_hdr *iphdr = p->payload;
+
+  LWIP_DEBUGF(IP_DEBUG, ("IP header:\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|%2"S16_F" |  %"X16_F"%"X16_F"  |      %"X16_F"%"X16_F"           | (v, traffic class, flow label)\n",
+        iphdr->v,
+        iphdr->tclass1, iphdr->tclass2,
+        iphdr->flow1, iphdr->flow2));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|    %5"U16_F"      | %2"U16_F"  |  %2"U16_F"   | (len, nexthdr, hoplim)\n",
+        ntohs(iphdr->len),
+        iphdr->nexthdr,
+        iphdr->hoplim));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|       %4"X32_F"      |       %4"X32_F"     | (src)\n",
+        (ntohl(iphdr->src.addr[0]) >> 16) & 0xffff,
+        ntohl(iphdr->src.addr[0]) & 0xffff));
+  LWIP_DEBUGF(IP_DEBUG, ("|       %4"X32_F"      |       %4"X32_F"     | (src)\n",
+        (ntohl(iphdr->src.addr[1]) >> 16) & 0xffff,
+        ntohl(iphdr->src.addr[1]) & 0xffff));
+  LWIP_DEBUGF(IP_DEBUG, ("|       %4"X32_F"      |       %4"X32_F"     | (src)\n",
+        (ntohl(iphdr->src.addr[2]) >> 16) & 0xffff,
+        ntohl(iphdr->src.addr[2]) & 0xffff));
+  LWIP_DEBUGF(IP_DEBUG, ("|       %4"X32_F"      |       %4"X32_F"     | (src)\n",
+        (ntohl(iphdr->src.addr[3]) >> 16) & 0xffff,
+        ntohl(iphdr->src.addr[3]) & 0xffff));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|       %4"X32_F"      |       %4"X32_F"     | (dest)\n",
+        (ntohl(iphdr->dest.addr[0]) >> 16) & 0xffff,
+        ntohl(iphdr->dest.addr[0]) & 0xffff));
+  LWIP_DEBUGF(IP_DEBUG, ("|       %4"X32_F"      |       %4"X32_F"     | (dest)\n",
+        (ntohl(iphdr->dest.addr[1]) >> 16) & 0xffff,
+        ntohl(iphdr->dest.addr[1]) & 0xffff));
+  LWIP_DEBUGF(IP_DEBUG, ("|       %4"X32_F"      |       %4"X32_F"     | (dest)\n",
+        (ntohl(iphdr->dest.addr[2]) >> 16) & 0xffff,
+        ntohl(iphdr->dest.addr[2]) & 0xffff));
+  LWIP_DEBUGF(IP_DEBUG, ("|       %4"X32_F"      |       %4"X32_F"     | (dest)\n",
+        (ntohl(iphdr->dest.addr[3]) >> 16) & 0xffff,
+        ntohl(iphdr->dest.addr[3]) & 0xffff));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+}
+#endif /* IP_DEBUG */
diff --git a/ext/lwip/src/core/ipv6/ip6_addr.c b/ext/lwip/src/core/ipv6/ip6_addr.c
new file mode 100644
index 000000000..2da6cea42
--- /dev/null
+++ b/ext/lwip/src/core/ipv6/ip6_addr.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+#include "lwip/ip_addr.h"
+#include "lwip/inet.h"
+
+u8_t
+ip_addr_netcmp(struct ip_addr *addr1, struct ip_addr *addr2,
+                struct ip_addr *mask)
+{
+  return((addr1->addr[0] & mask->addr[0]) == (addr2->addr[0] & mask->addr[0]) &&
+         (addr1->addr[1] & mask->addr[1]) == (addr2->addr[1] & mask->addr[1]) &&
+         (addr1->addr[2] & mask->addr[2]) == (addr2->addr[2] & mask->addr[2]) &&
+         (addr1->addr[3] & mask->addr[3]) == (addr2->addr[3] & mask->addr[3]));
+        
+}
+
+u8_t
+ip_addr_cmp(struct ip_addr *addr1, struct ip_addr *addr2)
+{
+  return(addr1->addr[0] == addr2->addr[0] &&
+         addr1->addr[1] == addr2->addr[1] &&
+         addr1->addr[2] == addr2->addr[2] &&
+         addr1->addr[3] == addr2->addr[3]);
+}
+
+void
+ip_addr_set(struct ip_addr *dest, struct ip_addr *src)
+{
+  SMEMCPY(dest, src, sizeof(struct ip_addr));
+  /*  dest->addr[0] = src->addr[0];
+  dest->addr[1] = src->addr[1];
+  dest->addr[2] = src->addr[2];
+  dest->addr[3] = src->addr[3];*/
+}
+
+u8_t
+ip_addr_isany(struct ip_addr *addr)
+{
+  if (addr == NULL) return 1;
+  return((addr->addr[0] | addr->addr[1] | addr->addr[2] | addr->addr[3]) == 0);
+}
diff --git a/ext/lwip/src/core/mem.c b/ext/lwip/src/core/mem.c
new file mode 100644
index 000000000..f1bb3595d
--- /dev/null
+++ b/ext/lwip/src/core/mem.c
@@ -0,0 +1,675 @@
+/**
+ * @file
+ * Dynamic memory manager
+ *
+ * This is a lightweight replacement for the standard C library malloc().
+ *
+ * If you want to use the standard C library malloc() instead, define
+ * MEM_LIBC_MALLOC to 1 in your lwipopts.h
+ *
+ * To let mem_malloc() use pools (prevents fragmentation and is much faster than
+ * a heap but might waste some memory), define MEM_USE_POOLS to 1, define
+ * MEM_USE_CUSTOM_POOLS to 1 and create a file "lwippools.h" that includes a list
+ * of pools like this (more pools can be added between _START and _END):
+ *
+ * Define three pools with sizes 256, 512, and 1512 bytes
+ * LWIP_MALLOC_MEMPOOL_START
+ * LWIP_MALLOC_MEMPOOL(20, 256)
+ * LWIP_MALLOC_MEMPOOL(10, 512)
+ * LWIP_MALLOC_MEMPOOL(5, 1512)
+ * LWIP_MALLOC_MEMPOOL_END
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *         Simon Goldschmidt
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if !MEM_LIBC_MALLOC /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/sys.h"
+#include "lwip/stats.h"
+#include "lwip/err.h"
+
+#include <string.h>
+
+#if MEM_USE_POOLS
+/* lwIP head implemented with different sized pools */
+
+/**
+ * Allocate memory: determine the smallest pool that is big enough
+ * to contain an element of 'size' and get an element from that pool.
+ *
+ * @param size the size in bytes of the memory needed
+ * @return a pointer to the allocated memory or NULL if the pool is empty
+ */
+void *
+mem_malloc(mem_size_t size)
+{
+  void *ret;
+  struct memp_malloc_helper *element;
+  memp_t poolnr;
+  mem_size_t required_size = size + LWIP_MEM_ALIGN_SIZE(sizeof(struct memp_malloc_helper));
+
+  for (poolnr = MEMP_POOL_FIRST; poolnr <= MEMP_POOL_LAST; poolnr = (memp_t)(poolnr + 1)) {
+#if MEM_USE_POOLS_TRY_BIGGER_POOL
+again:
+#endif /* MEM_USE_POOLS_TRY_BIGGER_POOL */
+    /* is this pool big enough to hold an element of the required size
+       plus a struct memp_malloc_helper that saves the pool this element came from? */
+    if (required_size <= memp_sizes[poolnr]) {
+      break;
+    }
+  }
+  if (poolnr > MEMP_POOL_LAST) {
+    LWIP_ASSERT("mem_malloc(): no pool is that big!", 0);
+    return NULL;
+  }
+  element = (struct memp_malloc_helper*)memp_malloc(poolnr);
+  if (element == NULL) {
+    /* No need to DEBUGF or ASSERT: This error is already
+       taken care of in memp.c */
+#if MEM_USE_POOLS_TRY_BIGGER_POOL
+    /** Try a bigger pool if this one is empty! */
+    if (poolnr < MEMP_POOL_LAST) {
+      poolnr++;
+      goto again;
+    }
+#endif /* MEM_USE_POOLS_TRY_BIGGER_POOL */
+    return NULL;
+  }
+
+  /* save the pool number this element came from */
+  element->poolnr = poolnr;
+  /* and return a pointer to the memory directly after the struct memp_malloc_helper */
+  ret = (u8_t*)element + LWIP_MEM_ALIGN_SIZE(sizeof(struct memp_malloc_helper));
+
+  return ret;
+}
+
+/**
+ * Free memory previously allocated by mem_malloc. Loads the pool number
+ * and calls memp_free with that pool number to put the element back into
+ * its pool
+ *
+ * @param rmem the memory element to free
+ */
+void
+mem_free(void *rmem)
+{
+  struct memp_malloc_helper *hmem;
+
+  LWIP_ASSERT("rmem != NULL", (rmem != NULL));
+  LWIP_ASSERT("rmem == MEM_ALIGN(rmem)", (rmem == LWIP_MEM_ALIGN(rmem)));
+
+  /* get the original struct memp_malloc_helper */
+  hmem = (struct memp_malloc_helper*)(void*)((u8_t*)rmem - LWIP_MEM_ALIGN_SIZE(sizeof(struct memp_malloc_helper)));
+
+  LWIP_ASSERT("hmem != NULL", (hmem != NULL));
+  LWIP_ASSERT("hmem == MEM_ALIGN(hmem)", (hmem == LWIP_MEM_ALIGN(hmem)));
+  LWIP_ASSERT("hmem->poolnr < MEMP_MAX", (hmem->poolnr < MEMP_MAX));
+
+  /* and put it in the pool we saved earlier */
+  memp_free(hmem->poolnr, hmem);
+}
+
+#else /* MEM_USE_POOLS */
+/* lwIP replacement for your libc malloc() */
+
+/**
+ * The heap is made up as a list of structs of this type.
+ * This does not have to be aligned since for getting its size,
+ * we only use the macro SIZEOF_STRUCT_MEM, which automatically alignes.
+ */
+struct mem {
+  /** index (-> ram[next]) of the next struct */
+  mem_size_t next;
+  /** index (-> ram[prev]) of the previous struct */
+  mem_size_t prev;
+  /** 1: this area is used; 0: this area is unused */
+  u8_t used;
+};
+
+/** All allocated blocks will be MIN_SIZE bytes big, at least!
+ * MIN_SIZE can be overridden to suit your needs. Smaller values save space,
+ * larger values could prevent too small blocks to fragment the RAM too much. */
+#ifndef MIN_SIZE
+#define MIN_SIZE             12
+#endif /* MIN_SIZE */
+/* some alignment macros: we define them here for better source code layout */
+#define MIN_SIZE_ALIGNED     LWIP_MEM_ALIGN_SIZE(MIN_SIZE)
+#define SIZEOF_STRUCT_MEM    LWIP_MEM_ALIGN_SIZE(sizeof(struct mem))
+#define MEM_SIZE_ALIGNED     LWIP_MEM_ALIGN_SIZE(MEM_SIZE)
+
+/** If you want to relocate the heap to external memory, simply define
+ * LWIP_RAM_HEAP_POINTER as a void-pointer to that location.
+ * If so, make sure the memory at that location is big enough (see below on
+ * how that space is calculated). */
+#ifndef LWIP_RAM_HEAP_POINTER
+/** the heap. we need one struct mem at the end and some room for alignment */
+u8_t ram_heap[MEM_SIZE_ALIGNED + (2*SIZEOF_STRUCT_MEM) + MEM_ALIGNMENT];
+#define LWIP_RAM_HEAP_POINTER ram_heap
+#endif /* LWIP_RAM_HEAP_POINTER */
+
+/** pointer to the heap (ram_heap): for alignment, ram is now a pointer instead of an array */
+static u8_t *ram;
+/** the last entry, always unused! */
+static struct mem *ram_end;
+/** pointer to the lowest free block, this is used for faster search */
+static struct mem *lfree;
+
+/** concurrent access protection */
+#if !NO_SYS
+static sys_mutex_t mem_mutex;
+#endif
+
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+
+static volatile u8_t mem_free_count;
+
+/* Allow mem_free from other (e.g. interrupt) context */
+#define LWIP_MEM_FREE_DECL_PROTECT()  SYS_ARCH_DECL_PROTECT(lev_free)
+#define LWIP_MEM_FREE_PROTECT()       SYS_ARCH_PROTECT(lev_free)
+#define LWIP_MEM_FREE_UNPROTECT()     SYS_ARCH_UNPROTECT(lev_free)
+#define LWIP_MEM_ALLOC_DECL_PROTECT() SYS_ARCH_DECL_PROTECT(lev_alloc)
+#define LWIP_MEM_ALLOC_PROTECT()      SYS_ARCH_PROTECT(lev_alloc)
+#define LWIP_MEM_ALLOC_UNPROTECT()    SYS_ARCH_UNPROTECT(lev_alloc)
+
+#else /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+
+/* Protect the heap only by using a semaphore */
+#define LWIP_MEM_FREE_DECL_PROTECT()
+#define LWIP_MEM_FREE_PROTECT()    sys_mutex_lock(&mem_mutex)
+#define LWIP_MEM_FREE_UNPROTECT()  sys_mutex_unlock(&mem_mutex)
+/* mem_malloc is protected using semaphore AND LWIP_MEM_ALLOC_PROTECT */
+#define LWIP_MEM_ALLOC_DECL_PROTECT()
+#define LWIP_MEM_ALLOC_PROTECT()
+#define LWIP_MEM_ALLOC_UNPROTECT()
+
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+
+
+/**
+ * "Plug holes" by combining adjacent empty struct mems.
+ * After this function is through, there should not exist
+ * one empty struct mem pointing to another empty struct mem.
+ *
+ * @param mem this points to a struct mem which just has been freed
+ * @internal this function is only called by mem_free() and mem_trim()
+ *
+ * This assumes access to the heap is protected by the calling function
+ * already.
+ */
+static void
+plug_holes(struct mem *mem)
+{
+  struct mem *nmem;
+  struct mem *pmem;
+
+  LWIP_ASSERT("plug_holes: mem >= ram", (u8_t *)mem >= ram);
+  LWIP_ASSERT("plug_holes: mem < ram_end", (u8_t *)mem < (u8_t *)ram_end);
+  LWIP_ASSERT("plug_holes: mem->used == 0", mem->used == 0);
+
+  /* plug hole forward */
+  LWIP_ASSERT("plug_holes: mem->next <= MEM_SIZE_ALIGNED", mem->next <= MEM_SIZE_ALIGNED);
+
+  nmem = (struct mem *)(void *)&ram[mem->next];
+  if (mem != nmem && nmem->used == 0 && (u8_t *)nmem != (u8_t *)ram_end) {
+    /* if mem->next is unused and not end of ram, combine mem and mem->next */
+    if (lfree == nmem) {
+      lfree = mem;
+    }
+    mem->next = nmem->next;
+    ((struct mem *)(void *)&ram[nmem->next])->prev = (mem_size_t)((u8_t *)mem - ram);
+  }
+
+  /* plug hole backward */
+  pmem = (struct mem *)(void *)&ram[mem->prev];
+  if (pmem != mem && pmem->used == 0) {
+    /* if mem->prev is unused, combine mem and mem->prev */
+    if (lfree == mem) {
+      lfree = pmem;
+    }
+    pmem->next = mem->next;
+    ((struct mem *)(void *)&ram[mem->next])->prev = (mem_size_t)((u8_t *)pmem - ram);
+  }
+}
+
+/**
+ * Zero the heap and initialize start, end and lowest-free
+ */
+void
+mem_init(void)
+{
+  struct mem *mem;
+
+  LWIP_ASSERT("Sanity check alignment",
+    (SIZEOF_STRUCT_MEM & (MEM_ALIGNMENT-1)) == 0);
+
+  /* align the heap */
+  ram = (u8_t *)LWIP_MEM_ALIGN(LWIP_RAM_HEAP_POINTER);
+  /* initialize the start of the heap */
+  mem = (struct mem *)(void *)ram;
+  mem->next = MEM_SIZE_ALIGNED;
+  mem->prev = 0;
+  mem->used = 0;
+  /* initialize the end of the heap */
+  ram_end = (struct mem *)(void *)&ram[MEM_SIZE_ALIGNED];
+  ram_end->used = 1;
+  ram_end->next = MEM_SIZE_ALIGNED;
+  ram_end->prev = MEM_SIZE_ALIGNED;
+
+  /* initialize the lowest-free pointer to the start of the heap */
+  lfree = (struct mem *)(void *)ram;
+
+  MEM_STATS_AVAIL(avail, MEM_SIZE_ALIGNED);
+
+  if(sys_mutex_new(&mem_mutex) != ERR_OK) {
+    LWIP_ASSERT("failed to create mem_mutex", 0);
+  }
+}
+
+/**
+ * Put a struct mem back on the heap
+ *
+ * @param rmem is the data portion of a struct mem as returned by a previous
+ *             call to mem_malloc()
+ */
+void
+mem_free(void *rmem)
+{
+  struct mem *mem;
+  LWIP_MEM_FREE_DECL_PROTECT();
+
+  if (rmem == NULL) {
+    LWIP_DEBUGF(MEM_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("mem_free(p == NULL) was called.\n"));
+    return;
+  }
+  LWIP_ASSERT("mem_free: sanity check alignment", (((mem_ptr_t)rmem) & (MEM_ALIGNMENT-1)) == 0);
+
+  LWIP_ASSERT("mem_free: legal memory", (u8_t *)rmem >= (u8_t *)ram &&
+    (u8_t *)rmem < (u8_t *)ram_end);
+
+  if ((u8_t *)rmem < (u8_t *)ram || (u8_t *)rmem >= (u8_t *)ram_end) {
+    SYS_ARCH_DECL_PROTECT(lev);
+    LWIP_DEBUGF(MEM_DEBUG | LWIP_DBG_LEVEL_SEVERE, ("mem_free: illegal memory\n"));
+    /* protect mem stats from concurrent access */
+    SYS_ARCH_PROTECT(lev);
+    MEM_STATS_INC(illegal);
+    SYS_ARCH_UNPROTECT(lev);
+    return;
+  }
+  /* protect the heap from concurrent access */
+  LWIP_MEM_FREE_PROTECT();
+  /* Get the corresponding struct mem ... */
+  mem = (struct mem *)(void *)((u8_t *)rmem - SIZEOF_STRUCT_MEM);
+  /* ... which has to be in a used state ... */
+  LWIP_ASSERT("mem_free: mem->used", mem->used);
+  /* ... and is now unused. */
+  mem->used = 0;
+
+  if (mem < lfree) {
+    /* the newly freed struct is now the lowest */
+    lfree = mem;
+  }
+
+  MEM_STATS_DEC_USED(used, mem->next - (mem_size_t)(((u8_t *)mem - ram)));
+
+  /* finally, see if prev or next are free also */
+  plug_holes(mem);
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+  mem_free_count = 1;
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+  LWIP_MEM_FREE_UNPROTECT();
+}
+
+/**
+ * Shrink memory returned by mem_malloc().
+ *
+ * @param rmem pointer to memory allocated by mem_malloc the is to be shrinked
+ * @param newsize required size after shrinking (needs to be smaller than or
+ *                equal to the previous size)
+ * @return for compatibility reasons: is always == rmem, at the moment
+ *         or NULL if newsize is > old size, in which case rmem is NOT touched
+ *         or freed!
+ */
+void *
+mem_trim(void *rmem, mem_size_t newsize)
+{
+  mem_size_t size;
+  mem_size_t ptr, ptr2;
+  struct mem *mem, *mem2;
+  /* use the FREE_PROTECT here: it protects with sem OR SYS_ARCH_PROTECT */
+  LWIP_MEM_FREE_DECL_PROTECT();
+
+  /* Expand the size of the allocated memory region so that we can
+     adjust for alignment. */
+  newsize = LWIP_MEM_ALIGN_SIZE(newsize);
+
+  if(newsize < MIN_SIZE_ALIGNED) {
+    /* every data block must be at least MIN_SIZE_ALIGNED long */
+    newsize = MIN_SIZE_ALIGNED;
+  }
+
+  if (newsize > MEM_SIZE_ALIGNED) {
+    return NULL;
+  }
+
+  LWIP_ASSERT("mem_trim: legal memory", (u8_t *)rmem >= (u8_t *)ram &&
+   (u8_t *)rmem < (u8_t *)ram_end);
+
+  if ((u8_t *)rmem < (u8_t *)ram || (u8_t *)rmem >= (u8_t *)ram_end) {
+    SYS_ARCH_DECL_PROTECT(lev);
+    LWIP_DEBUGF(MEM_DEBUG | LWIP_DBG_LEVEL_SEVERE, ("mem_trim: illegal memory\n"));
+    /* protect mem stats from concurrent access */
+    SYS_ARCH_PROTECT(lev);
+    MEM_STATS_INC(illegal);
+    SYS_ARCH_UNPROTECT(lev);
+    return rmem;
+  }
+  /* Get the corresponding struct mem ... */
+  mem = (struct mem *)(void *)((u8_t *)rmem - SIZEOF_STRUCT_MEM);
+  /* ... and its offset pointer */
+  ptr = (mem_size_t)((u8_t *)mem - ram);
+
+  size = mem->next - ptr - SIZEOF_STRUCT_MEM;
+  LWIP_ASSERT("mem_trim can only shrink memory", newsize <= size);
+  if (newsize > size) {
+    /* not supported */
+    return NULL;
+  }
+  if (newsize == size) {
+    /* No change in size, simply return */
+    return rmem;
+  }
+
+  /* protect the heap from concurrent access */
+  LWIP_MEM_FREE_PROTECT();
+
+  mem2 = (struct mem *)(void *)&ram[mem->next];
+  if(mem2->used == 0) {
+    /* The next struct is unused, we can simply move it at little */
+    mem_size_t next;
+    /* remember the old next pointer */
+    next = mem2->next;
+    /* create new struct mem which is moved directly after the shrinked mem */
+    ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize;
+    if (lfree == mem2) {
+      lfree = (struct mem *)(void *)&ram[ptr2];
+    }
+    mem2 = (struct mem *)(void *)&ram[ptr2];
+    mem2->used = 0;
+    /* restore the next pointer */
+    mem2->next = next;
+    /* link it back to mem */
+    mem2->prev = ptr;
+    /* link mem to it */
+    mem->next = ptr2;
+    /* last thing to restore linked list: as we have moved mem2,
+     * let 'mem2->next->prev' point to mem2 again. but only if mem2->next is not
+     * the end of the heap */
+    if (mem2->next != MEM_SIZE_ALIGNED) {
+      ((struct mem *)(void *)&ram[mem2->next])->prev = ptr2;
+    }
+    MEM_STATS_DEC_USED(used, (size - newsize));
+    /* no need to plug holes, we've already done that */
+  } else if (newsize + SIZEOF_STRUCT_MEM + MIN_SIZE_ALIGNED <= size) {
+    /* Next struct is used but there's room for another struct mem with
+     * at least MIN_SIZE_ALIGNED of data.
+     * Old size ('size') must be big enough to contain at least 'newsize' plus a struct mem
+     * ('SIZEOF_STRUCT_MEM') with some data ('MIN_SIZE_ALIGNED').
+     * @todo we could leave out MIN_SIZE_ALIGNED. We would create an empty
+     *       region that couldn't hold data, but when mem->next gets freed,
+     *       the 2 regions would be combined, resulting in more free memory */
+    ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize;
+    mem2 = (struct mem *)(void *)&ram[ptr2];
+    if (mem2 < lfree) {
+      lfree = mem2;
+    }
+    mem2->used = 0;
+    mem2->next = mem->next;
+    mem2->prev = ptr;
+    mem->next = ptr2;
+    if (mem2->next != MEM_SIZE_ALIGNED) {
+      ((struct mem *)(void *)&ram[mem2->next])->prev = ptr2;
+    }
+    MEM_STATS_DEC_USED(used, (size - newsize));
+    /* the original mem->next is used, so no need to plug holes! */
+  }
+  /* else {
+    next struct mem is used but size between mem and mem2 is not big enough
+    to create another struct mem
+    -> don't do anyhting.
+    -> the remaining space stays unused since it is too small
+  } */
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+  mem_free_count = 1;
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+  LWIP_MEM_FREE_UNPROTECT();
+  return rmem;
+}
+
+/**
+ * Adam's mem_malloc() plus solution for bug #17922
+ * Allocate a block of memory with a minimum of 'size' bytes.
+ *
+ * @param size is the minimum size of the requested block in bytes.
+ * @return pointer to allocated memory or NULL if no free memory was found.
+ *
+ * Note that the returned value will always be aligned (as defined by MEM_ALIGNMENT).
+ */
+ #include <stdio.h>
+
+void *
+mem_malloc(mem_size_t size)
+{
+  mem_size_t ptr, ptr2;
+  struct mem *mem, *mem2;
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+  u8_t local_mem_free_count = 0;
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+  LWIP_MEM_ALLOC_DECL_PROTECT();
+
+  if (size == 0) {
+    return NULL;
+  }
+
+  /* Expand the size of the allocated memory region so that we can
+     adjust for alignment. */
+  size = LWIP_MEM_ALIGN_SIZE(size);
+
+  if(size < MIN_SIZE_ALIGNED) {
+    /* every data block must be at least MIN_SIZE_ALIGNED long */
+    size = MIN_SIZE_ALIGNED;
+  }
+
+  if (size > MEM_SIZE_ALIGNED) {
+    return NULL;
+  }
+
+  /* protect the heap from concurrent access */
+  sys_mutex_lock(&mem_mutex);
+  LWIP_MEM_ALLOC_PROTECT();
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+  /* run as long as a mem_free disturbed mem_malloc or mem_trim */
+  do {
+    local_mem_free_count = 0;
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+
+    /* Scan through the heap searching for a free block that is big enough,
+     * beginning with the lowest free block.
+     */
+     printf("ptr = (mem_size_t)((u8_t *)lfree - ram) = %d\n", (mem_size_t)((u8_t *)lfree - ram));
+     printf("MEM_SIZE_ALIGNED - size = %d\n", MEM_SIZE_ALIGNED - size);
+     //printf("\n", );
+
+    for (ptr = (mem_size_t)((u8_t *)lfree - ram); ptr < MEM_SIZE_ALIGNED - size;
+         ptr = ((struct mem *)(void *)&ram[ptr])->next) {
+
+printf("ptr = 0x%x\n", ptr);
+      mem = (struct mem *)(void *)&ram[ptr];
+      printf("mem = 0x%x\n", mem);
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+      mem_free_count = 0;
+      printf("A\n");
+      LWIP_MEM_ALLOC_UNPROTECT();
+      /* allow mem_free or mem_trim to run */
+      printf("B\n");
+      LWIP_MEM_ALLOC_PROTECT();
+      printf("C\n");
+      if (mem_free_count != 0) {
+        printf("mem_free_count != 0\n");
+        /* If mem_free or mem_trim have run, we have to restart since they
+           could have altered our current struct mem. */
+        local_mem_free_count = 1;
+        break;
+      }
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+
+if(mem == NULL)
+  printf("mem == NULL\n");
+
+      if ((!mem->used) &&
+          (mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size) {
+        /* mem is not used and at least perfect fit is possible:
+         * mem->next - (ptr + SIZEOF_STRUCT_MEM) gives us the 'user data size' of mem */
+
+        if (mem->next - (ptr + SIZEOF_STRUCT_MEM) >= (size + SIZEOF_STRUCT_MEM + MIN_SIZE_ALIGNED)) {
+          /* (in addition to the above, we test if another struct mem (SIZEOF_STRUCT_MEM) containing
+           * at least MIN_SIZE_ALIGNED of data also fits in the 'user data space' of 'mem')
+           * -> split large block, create empty remainder,
+           * remainder must be large enough to contain MIN_SIZE_ALIGNED data: if
+           * mem->next - (ptr + (2*SIZEOF_STRUCT_MEM)) == size,
+           * struct mem would fit in but no data between mem2 and mem2->next
+           * @todo we could leave out MIN_SIZE_ALIGNED. We would create an empty
+           *       region that couldn't hold data, but when mem->next gets freed,
+           *       the 2 regions would be combined, resulting in more free memory
+           */
+          ptr2 = ptr + SIZEOF_STRUCT_MEM + size;
+          /* create mem2 struct */
+          mem2 = (struct mem *)(void *)&ram[ptr2];
+          mem2->used = 0;
+          mem2->next = mem->next;
+          mem2->prev = ptr;
+          /* and insert it between mem and mem->next */
+          mem->next = ptr2;
+          mem->used = 1;
+
+          if (mem2->next != MEM_SIZE_ALIGNED) {
+            ((struct mem *)(void *)&ram[mem2->next])->prev = ptr2;
+          }
+          MEM_STATS_INC_USED(used, (size + SIZEOF_STRUCT_MEM));
+        } else {
+          /* (a mem2 struct does no fit into the user data space of mem and mem->next will always
+           * be used at this point: if not we have 2 unused structs in a row, plug_holes should have
+           * take care of this).
+           * -> near fit or excact fit: do not split, no mem2 creation
+           * also can't move mem->next directly behind mem, since mem->next
+           * will always be used at this point!
+           */
+          mem->used = 1;
+          MEM_STATS_INC_USED(used, mem->next - (mem_size_t)((u8_t *)mem - ram));
+        }
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+mem_malloc_adjust_lfree:
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+        if (mem == lfree) {
+          struct mem *cur = lfree;
+          /* Find next free block after mem and update lowest free pointer */
+          while (cur->used && cur != ram_end) {
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+            mem_free_count = 0;
+            LWIP_MEM_ALLOC_UNPROTECT();
+            /* prevent high interrupt latency... */
+            LWIP_MEM_ALLOC_PROTECT();
+            if (mem_free_count != 0) {
+              /* If mem_free or mem_trim have run, we have to restart since they
+                 could have altered our current struct mem or lfree. */
+              goto mem_malloc_adjust_lfree;
+            }
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+            cur = (struct mem *)(void *)&ram[cur->next];
+          }
+          lfree = cur;
+          LWIP_ASSERT("mem_malloc: !lfree->used", ((lfree == ram_end) || (!lfree->used)));
+        }
+        LWIP_MEM_ALLOC_UNPROTECT();
+        sys_mutex_unlock(&mem_mutex);
+        LWIP_ASSERT("mem_malloc: allocated memory not above ram_end.",
+         (mem_ptr_t)mem + SIZEOF_STRUCT_MEM + size <= (mem_ptr_t)ram_end);
+        LWIP_ASSERT("mem_malloc: allocated memory properly aligned.",
+         ((mem_ptr_t)mem + SIZEOF_STRUCT_MEM) % MEM_ALIGNMENT == 0);
+        LWIP_ASSERT("mem_malloc: sanity check alignment",
+          (((mem_ptr_t)mem) & (MEM_ALIGNMENT-1)) == 0);
+
+        return (u8_t *)mem + SIZEOF_STRUCT_MEM;
+      }
+    }
+#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+    /* if we got interrupted by a mem_free, try again */
+  } while(local_mem_free_count != 0);
+#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
+  LWIP_DEBUGF(MEM_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("mem_malloc: could not allocate %"S16_F" bytes\n", (s16_t)size));
+  MEM_STATS_INC(err);
+  LWIP_MEM_ALLOC_UNPROTECT();
+  sys_mutex_unlock(&mem_mutex);
+  return NULL;
+}
+
+#endif /* MEM_USE_POOLS */
+/**
+ * Contiguously allocates enough space for count objects that are size bytes
+ * of memory each and returns a pointer to the allocated memory.
+ *
+ * The allocated memory is filled with bytes of value zero.
+ *
+ * @param count number of objects to allocate
+ * @param size size of the objects to allocate
+ * @return pointer to allocated memory / NULL pointer if there is an error
+ */
+void *mem_calloc(mem_size_t count, mem_size_t size)
+{
+  void *p;
+
+  /* allocate 'count' objects of size 'size' */
+  p = mem_malloc(count * size);
+  if (p) {
+    /* zero the memory */
+    memset(p, 0, count * size);
+  }
+  return p;
+}
+
+#endif /* !MEM_LIBC_MALLOC */
diff --git a/ext/lwip/src/core/memp.c b/ext/lwip/src/core/memp.c
new file mode 100644
index 000000000..9f680e244
--- /dev/null
+++ b/ext/lwip/src/core/memp.c
@@ -0,0 +1,470 @@
+/**
+ * @file
+ * Dynamic pool memory manager
+ *
+ * lwIP has dedicated pools for many structures (netconn, protocol control blocks,
+ * packet buffers, ...). All these pools are managed here.
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/memp.h"
+#include "lwip/pbuf.h"
+#include "lwip/udp.h"
+#include "lwip/raw.h"
+#include "lwip/tcp_impl.h"
+#include "lwip/igmp.h"
+#include "lwip/api.h"
+#include "lwip/api_msg.h"
+#include "lwip/tcpip.h"
+#include "lwip/sys.h"
+#include "lwip/timers.h"
+#include "lwip/stats.h"
+#include "netif/etharp.h"
+#include "lwip/ip_frag.h"
+#include "lwip/snmp_structs.h"
+#include "lwip/snmp_msg.h"
+#include "lwip/dns.h"
+#include "netif/ppp_oe.h"
+
+#include <string.h>
+
+#if !MEMP_MEM_MALLOC /* don't build if not configured for use in lwipopts.h */
+
+struct memp {
+  struct memp *next;
+#if MEMP_OVERFLOW_CHECK
+  const char *file;
+  int line;
+#endif /* MEMP_OVERFLOW_CHECK */
+};
+
+#if MEMP_OVERFLOW_CHECK
+/* if MEMP_OVERFLOW_CHECK is turned on, we reserve some bytes at the beginning
+ * and at the end of each element, initialize them as 0xcd and check
+ * them later. */
+/* If MEMP_OVERFLOW_CHECK is >= 2, on every call to memp_malloc or memp_free,
+ * every single element in each pool is checked!
+ * This is VERY SLOW but also very helpful. */
+/* MEMP_SANITY_REGION_BEFORE and MEMP_SANITY_REGION_AFTER can be overridden in
+ * lwipopts.h to change the amount reserved for checking. */
+#ifndef MEMP_SANITY_REGION_BEFORE
+#define MEMP_SANITY_REGION_BEFORE  16
+#endif /* MEMP_SANITY_REGION_BEFORE*/
+#if MEMP_SANITY_REGION_BEFORE > 0
+#define MEMP_SANITY_REGION_BEFORE_ALIGNED    LWIP_MEM_ALIGN_SIZE(MEMP_SANITY_REGION_BEFORE)
+#else
+#define MEMP_SANITY_REGION_BEFORE_ALIGNED    0
+#endif /* MEMP_SANITY_REGION_BEFORE*/
+#ifndef MEMP_SANITY_REGION_AFTER
+#define MEMP_SANITY_REGION_AFTER   16
+#endif /* MEMP_SANITY_REGION_AFTER*/
+#if MEMP_SANITY_REGION_AFTER > 0
+#define MEMP_SANITY_REGION_AFTER_ALIGNED     LWIP_MEM_ALIGN_SIZE(MEMP_SANITY_REGION_AFTER)
+#else
+#define MEMP_SANITY_REGION_AFTER_ALIGNED     0
+#endif /* MEMP_SANITY_REGION_AFTER*/
+
+/* MEMP_SIZE: save space for struct memp and for sanity check */
+#define MEMP_SIZE          (LWIP_MEM_ALIGN_SIZE(sizeof(struct memp)) + MEMP_SANITY_REGION_BEFORE_ALIGNED)
+#define MEMP_ALIGN_SIZE(x) (LWIP_MEM_ALIGN_SIZE(x) + MEMP_SANITY_REGION_AFTER_ALIGNED)
+
+#else /* MEMP_OVERFLOW_CHECK */
+
+/* No sanity checks
+ * We don't need to preserve the struct memp while not allocated, so we
+ * can save a little space and set MEMP_SIZE to 0.
+ */
+#define MEMP_SIZE           0
+#define MEMP_ALIGN_SIZE(x) (LWIP_MEM_ALIGN_SIZE(x))
+
+#endif /* MEMP_OVERFLOW_CHECK */
+
+/** This array holds the first free element of each pool.
+ *  Elements form a linked list. */
+static struct memp *memp_tab[MEMP_MAX];
+
+#else /* MEMP_MEM_MALLOC */
+
+#define MEMP_ALIGN_SIZE(x) (LWIP_MEM_ALIGN_SIZE(x))
+
+#endif /* MEMP_MEM_MALLOC */
+
+/** This array holds the element sizes of each pool. */
+#if !MEM_USE_POOLS && !MEMP_MEM_MALLOC
+static
+#endif
+const u16_t memp_sizes[MEMP_MAX] = {
+#define LWIP_MEMPOOL(name,num,size,desc)  LWIP_MEM_ALIGN_SIZE(size),
+#include "lwip/memp_std.h"
+};
+
+#if !MEMP_MEM_MALLOC /* don't build if not configured for use in lwipopts.h */
+
+/** This array holds the number of elements in each pool. */
+static const u16_t memp_num[MEMP_MAX] = {
+#define LWIP_MEMPOOL(name,num,size,desc)  (num),
+#include "lwip/memp_std.h"
+};
+
+/** This array holds a textual description of each pool. */
+#ifdef LWIP_DEBUG
+static const char *memp_desc[MEMP_MAX] = {
+#define LWIP_MEMPOOL(name,num,size,desc)  (desc),
+#include "lwip/memp_std.h"
+};
+#endif /* LWIP_DEBUG */
+
+#if MEMP_SEPARATE_POOLS
+
+/** This creates each memory pool. These are named memp_memory_XXX_base (where
+ * XXX is the name of the pool defined in memp_std.h).
+ * To relocate a pool, declare it as extern in cc.h. Example for GCC:
+ *   extern u8_t __attribute__((section(".onchip_mem"))) memp_memory_UDP_PCB_base[];
+ */
+#define LWIP_MEMPOOL(name,num,size,desc) u8_t memp_memory_ ## name ## _base \
+  [((num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size)))];   
+#include "lwip/memp_std.h"
+
+/** This array holds the base of each memory pool. */
+static u8_t *const memp_bases[] = { 
+#define LWIP_MEMPOOL(name,num,size,desc) memp_memory_ ## name ## _base,   
+#include "lwip/memp_std.h"
+};
+
+#else /* MEMP_SEPARATE_POOLS */
+
+/** This is the actual memory used by the pools (all pools in one big block). */
+static u8_t memp_memory[MEM_ALIGNMENT - 1 
+#define LWIP_MEMPOOL(name,num,size,desc) + ( (num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size) ) )
+#include "lwip/memp_std.h"
+];
+
+#endif /* MEMP_SEPARATE_POOLS */
+
+#if MEMP_SANITY_CHECK
+/**
+ * Check that memp-lists don't form a circle, using "Floyd's cycle-finding algorithm".
+ */
+static int
+memp_sanity(void)
+{
+  s16_t i;
+  struct memp *t, *h;
+
+  for (i = 0; i < MEMP_MAX; i++) {
+    t = memp_tab[i];
+    if(t != NULL) {
+      for (h = t->next; (t != NULL) && (h != NULL); t = t->next,
+        h = (((h->next != NULL) && (h->next->next != NULL)) ? h->next->next : NULL)) {
+        if (t == h) {
+          return 0;
+        }
+      }
+    }
+  }
+  return 1;
+}
+#endif /* MEMP_SANITY_CHECK*/
+#if MEMP_OVERFLOW_CHECK
+#if defined(LWIP_DEBUG) && MEMP_STATS
+static const char * memp_overflow_names[] = {
+#define LWIP_MEMPOOL(name,num,size,desc) "/"desc,
+#include "lwip/memp_std.h"
+  };
+#endif
+
+/**
+ * Check if a memp element was victim of an overflow
+ * (e.g. the restricted area after it has been altered)
+ *
+ * @param p the memp element to check
+ * @param memp_type the pool p comes from
+ */
+static void
+memp_overflow_check_element_overflow(struct memp *p, u16_t memp_type)
+{
+  u16_t k;
+  u8_t *m;
+#if MEMP_SANITY_REGION_AFTER_ALIGNED > 0
+  m = (u8_t*)p + MEMP_SIZE + memp_sizes[memp_type];
+  for (k = 0; k < MEMP_SANITY_REGION_AFTER_ALIGNED; k++) {
+    if (m[k] != 0xcd) {
+      char errstr[128] = "detected memp overflow in pool ";
+      char digit[] = "0";
+      if(memp_type >= 10) {
+        digit[0] = '0' + (memp_type/10);
+        strcat(errstr, digit);
+      }
+      digit[0] = '0' + (memp_type%10);
+      strcat(errstr, digit);
+#if defined(LWIP_DEBUG) && MEMP_STATS
+      strcat(errstr, memp_overflow_names[memp_type]);
+#endif
+      LWIP_ASSERT(errstr, 0);
+    }
+  }
+#endif
+}
+
+/**
+ * Check if a memp element was victim of an underflow
+ * (e.g. the restricted area before it has been altered)
+ *
+ * @param p the memp element to check
+ * @param memp_type the pool p comes from
+ */
+static void
+memp_overflow_check_element_underflow(struct memp *p, u16_t memp_type)
+{
+  u16_t k;
+  u8_t *m;
+#if MEMP_SANITY_REGION_BEFORE_ALIGNED > 0
+  m = (u8_t*)p + MEMP_SIZE - MEMP_SANITY_REGION_BEFORE_ALIGNED;
+  for (k = 0; k < MEMP_SANITY_REGION_BEFORE_ALIGNED; k++) {
+    if (m[k] != 0xcd) {
+      char errstr[128] = "detected memp underflow in pool ";
+      char digit[] = "0";
+      if(memp_type >= 10) {
+        digit[0] = '0' + (memp_type/10);
+        strcat(errstr, digit);
+      }
+      digit[0] = '0' + (memp_type%10);
+      strcat(errstr, digit);
+#if defined(LWIP_DEBUG) && MEMP_STATS
+      strcat(errstr, memp_overflow_names[memp_type]);
+#endif
+      LWIP_ASSERT(errstr, 0);
+    }
+  }
+#endif
+}
+
+/**
+ * Do an overflow check for all elements in every pool.
+ *
+ * @see memp_overflow_check_element for a description of the check
+ */
+static void
+memp_overflow_check_all(void)
+{
+  u16_t i, j;
+  struct memp *p;
+
+  p = (struct memp *)LWIP_MEM_ALIGN(memp_memory);
+  for (i = 0; i < MEMP_MAX; ++i) {
+    p = p;
+    for (j = 0; j < memp_num[i]; ++j) {
+      memp_overflow_check_element_overflow(p, i);
+      p = (struct memp*)((u8_t*)p + MEMP_SIZE + memp_sizes[i] + MEMP_SANITY_REGION_AFTER_ALIGNED);
+    }
+  }
+  p = (struct memp *)LWIP_MEM_ALIGN(memp_memory);
+  for (i = 0; i < MEMP_MAX; ++i) {
+    p = p;
+    for (j = 0; j < memp_num[i]; ++j) {
+      memp_overflow_check_element_underflow(p, i);
+      p = (struct memp*)((u8_t*)p + MEMP_SIZE + memp_sizes[i] + MEMP_SANITY_REGION_AFTER_ALIGNED);
+    }
+  }
+}
+
+/**
+ * Initialize the restricted areas of all memp elements in every pool.
+ */
+static void
+memp_overflow_init(void)
+{
+  u16_t i, j;
+  struct memp *p;
+  u8_t *m;
+
+  p = (struct memp *)LWIP_MEM_ALIGN(memp_memory);
+  for (i = 0; i < MEMP_MAX; ++i) {
+    p = p;
+    for (j = 0; j < memp_num[i]; ++j) {
+#if MEMP_SANITY_REGION_BEFORE_ALIGNED > 0
+      m = (u8_t*)p + MEMP_SIZE - MEMP_SANITY_REGION_BEFORE_ALIGNED;
+      memset(m, 0xcd, MEMP_SANITY_REGION_BEFORE_ALIGNED);
+#endif
+#if MEMP_SANITY_REGION_AFTER_ALIGNED > 0
+      m = (u8_t*)p + MEMP_SIZE + memp_sizes[i];
+      memset(m, 0xcd, MEMP_SANITY_REGION_AFTER_ALIGNED);
+#endif
+      p = (struct memp*)((u8_t*)p + MEMP_SIZE + memp_sizes[i] + MEMP_SANITY_REGION_AFTER_ALIGNED);
+    }
+  }
+}
+#endif /* MEMP_OVERFLOW_CHECK */
+
+/**
+ * Initialize this module.
+ * 
+ * Carves out memp_memory into linked lists for each pool-type.
+ */
+void
+memp_init(void)
+{
+  struct memp *memp;
+  u16_t i, j;
+
+  for (i = 0; i < MEMP_MAX; ++i) {
+    MEMP_STATS_AVAIL(used, i, 0);
+    MEMP_STATS_AVAIL(max, i, 0);
+    MEMP_STATS_AVAIL(err, i, 0);
+    MEMP_STATS_AVAIL(avail, i, memp_num[i]);
+  }
+
+#if !MEMP_SEPARATE_POOLS
+  memp = (struct memp *)LWIP_MEM_ALIGN(memp_memory);
+#endif /* !MEMP_SEPARATE_POOLS */
+  /* for every pool: */
+  for (i = 0; i < MEMP_MAX; ++i) {
+    memp_tab[i] = NULL;
+#if MEMP_SEPARATE_POOLS
+    memp = (struct memp*)memp_bases[i];
+#endif /* MEMP_SEPARATE_POOLS */
+    /* create a linked list of memp elements */
+    for (j = 0; j < memp_num[i]; ++j) {
+      memp->next = memp_tab[i];
+      memp_tab[i] = memp;
+      memp = (struct memp *)(void *)((u8_t *)memp + MEMP_SIZE + memp_sizes[i]
+#if MEMP_OVERFLOW_CHECK
+        + MEMP_SANITY_REGION_AFTER_ALIGNED
+#endif
+      );
+    }
+  }
+#if MEMP_OVERFLOW_CHECK
+  memp_overflow_init();
+  /* check everything a first time to see if it worked */
+  memp_overflow_check_all();
+#endif /* MEMP_OVERFLOW_CHECK */
+}
+
+/**
+ * Get an element from a specific pool.
+ *
+ * @param type the pool to get an element from
+ *
+ * the debug version has two more parameters:
+ * @param file file name calling this function
+ * @param line number of line where this function is called
+ *
+ * @return a pointer to the allocated memory or a NULL pointer on error
+ */
+void *
+#if !MEMP_OVERFLOW_CHECK
+memp_malloc(memp_t type)
+#else
+memp_malloc_fn(memp_t type, const char* file, const int line)
+#endif
+{
+  struct memp *memp;
+  SYS_ARCH_DECL_PROTECT(old_level);
+ 
+  LWIP_ERROR("memp_malloc: type < MEMP_MAX", (type < MEMP_MAX), return NULL;);
+
+  SYS_ARCH_PROTECT(old_level);
+#if MEMP_OVERFLOW_CHECK >= 2
+  memp_overflow_check_all();
+#endif /* MEMP_OVERFLOW_CHECK >= 2 */
+
+  memp = memp_tab[type];
+  
+  if (memp != NULL) {
+    memp_tab[type] = memp->next;
+#if MEMP_OVERFLOW_CHECK
+    memp->next = NULL;
+    memp->file = file;
+    memp->line = line;
+#endif /* MEMP_OVERFLOW_CHECK */
+    MEMP_STATS_INC_USED(used, type);
+    LWIP_ASSERT("memp_malloc: memp properly aligned",
+                ((mem_ptr_t)memp % MEM_ALIGNMENT) == 0);
+    memp = (struct memp*)(void *)((u8_t*)memp + MEMP_SIZE);
+  } else {
+    LWIP_DEBUGF(MEMP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("memp_malloc: out of memory in pool %s\n", memp_desc[type]));
+    MEMP_STATS_INC(err, type);
+  }
+
+  SYS_ARCH_UNPROTECT(old_level);
+
+  return memp;
+}
+
+/**
+ * Put an element back into its pool.
+ *
+ * @param type the pool where to put mem
+ * @param mem the memp element to free
+ */
+void
+memp_free(memp_t type, void *mem)
+{
+  struct memp *memp;
+  SYS_ARCH_DECL_PROTECT(old_level);
+
+  if (mem == NULL) {
+    return;
+  }
+  LWIP_ASSERT("memp_free: mem properly aligned",
+                ((mem_ptr_t)mem % MEM_ALIGNMENT) == 0);
+
+  memp = (struct memp *)(void *)((u8_t*)mem - MEMP_SIZE);
+
+  SYS_ARCH_PROTECT(old_level);
+#if MEMP_OVERFLOW_CHECK
+#if MEMP_OVERFLOW_CHECK >= 2
+  memp_overflow_check_all();
+#else
+  memp_overflow_check_element_overflow(memp, type);
+  memp_overflow_check_element_underflow(memp, type);
+#endif /* MEMP_OVERFLOW_CHECK >= 2 */
+#endif /* MEMP_OVERFLOW_CHECK */
+
+  MEMP_STATS_DEC(used, type); 
+  
+  memp->next = memp_tab[type]; 
+  memp_tab[type] = memp;
+
+#if MEMP_SANITY_CHECK
+  LWIP_ASSERT("memp sanity", memp_sanity());
+#endif /* MEMP_SANITY_CHECK */
+
+  SYS_ARCH_UNPROTECT(old_level);
+}
+
+#endif /* MEMP_MEM_MALLOC */
diff --git a/ext/lwip/src/core/netif.c b/ext/lwip/src/core/netif.c
new file mode 100644
index 000000000..8c1e4e58a
--- /dev/null
+++ b/ext/lwip/src/core/netif.c
@@ -0,0 +1,774 @@
+/**
+ * @file
+ * lwIP network interface abstraction
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/def.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/tcp_impl.h"
+#include "lwip/snmp.h"
+#include "lwip/igmp.h"
+#include "netif/etharp.h"
+#include "lwip/stats.h"
+#if ENABLE_LOOPBACK
+#include "lwip/sys.h"
+#if LWIP_NETIF_LOOPBACK_MULTITHREADING
+#include "lwip/tcpip.h"
+#endif /* LWIP_NETIF_LOOPBACK_MULTITHREADING */
+#endif /* ENABLE_LOOPBACK */
+
+#if LWIP_AUTOIP
+#include "lwip/autoip.h"
+#endif /* LWIP_AUTOIP */
+#if LWIP_DHCP
+#include "lwip/dhcp.h"
+#endif /* LWIP_DHCP */
+
+#if LWIP_NETIF_STATUS_CALLBACK
+#define NETIF_STATUS_CALLBACK(n) do{ if (n->status_callback) { (n->status_callback)(n); }}while(0)
+#else
+#define NETIF_STATUS_CALLBACK(n)
+#endif /* LWIP_NETIF_STATUS_CALLBACK */
+
+#if LWIP_NETIF_LINK_CALLBACK
+#define NETIF_LINK_CALLBACK(n) do{ if (n->link_callback) { (n->link_callback)(n); }}while(0)
+#else
+#define NETIF_LINK_CALLBACK(n)
+#endif /* LWIP_NETIF_LINK_CALLBACK */
+
+struct netif *netif_list;
+struct netif *netif_default;
+
+static u8_t netif_num;
+
+#if LWIP_HAVE_LOOPIF
+static struct netif loop_netif;
+
+/**
+ * Initialize a lwip network interface structure for a loopback interface
+ *
+ * @param netif the lwip network interface structure for this loopif
+ * @return ERR_OK if the loopif is initialized
+ *         ERR_MEM if private data couldn't be allocated
+ */
+static err_t
+netif_loopif_init(struct netif *netif)
+{
+  /* initialize the snmp variables and counters inside the struct netif
+   * ifSpeed: no assumption can be made!
+   */
+  NETIF_INIT_SNMP(netif, snmp_ifType_softwareLoopback, 0);
+
+  netif->name[0] = 'l';
+  netif->name[1] = 'o';
+  netif->output = netif_loop_output;
+  return ERR_OK;
+}
+#endif /* LWIP_HAVE_LOOPIF */
+
+void
+netif_init(void)
+{
+#if LWIP_HAVE_LOOPIF
+  ip_addr_t loop_ipaddr, loop_netmask, loop_gw;
+  IP4_ADDR(&loop_gw, 127,0,0,1);
+  IP4_ADDR(&loop_ipaddr, 127,0,0,1);
+  IP4_ADDR(&loop_netmask, 255,0,0,0);
+
+#if NO_SYS
+  netif_add(&loop_netif, &loop_ipaddr, &loop_netmask, &loop_gw, NULL, netif_loopif_init, ip_input);
+#else  /* NO_SYS */
+  netif_add(&loop_netif, &loop_ipaddr, &loop_netmask, &loop_gw, NULL, netif_loopif_init, tcpip_input);
+#endif /* NO_SYS */
+  netif_set_up(&loop_netif);
+
+#endif /* LWIP_HAVE_LOOPIF */
+}
+
+/**
+ * Add a network interface to the list of lwIP netifs.
+ *
+ * @param netif a pre-allocated netif structure
+ * @param ipaddr IP address for the new netif
+ * @param netmask network mask for the new netif
+ * @param gw default gateway IP address for the new netif
+ * @param state opaque data passed to the new netif
+ * @param init callback function that initializes the interface
+ * @param input callback function that is called to pass
+ * ingress packets up in the protocol layer stack.
+ *
+ * @return netif, or NULL if failed.
+ */
+struct netif *
+netif_add(struct netif *netif, ip_addr_t *ipaddr, ip_addr_t *netmask,
+  ip_addr_t *gw, void *state, netif_init_fn init, netif_input_fn input)
+{
+
+  LWIP_ASSERT("No init function given", init != NULL);
+
+  /* reset new interface configuration state */
+  ip_addr_set_zero(&netif->ip_addr);
+  ip_addr_set_zero(&netif->netmask);
+  ip_addr_set_zero(&netif->gw);
+  netif->flags = 0;
+#if LWIP_DHCP
+  /* netif not under DHCP control by default */
+  netif->dhcp = NULL;
+#endif /* LWIP_DHCP */
+#if LWIP_AUTOIP
+  /* netif not under AutoIP control by default */
+  netif->autoip = NULL;
+#endif /* LWIP_AUTOIP */
+#if LWIP_NETIF_STATUS_CALLBACK
+  netif->status_callback = NULL;
+#endif /* LWIP_NETIF_STATUS_CALLBACK */
+#if LWIP_NETIF_LINK_CALLBACK
+  netif->link_callback = NULL;
+#endif /* LWIP_NETIF_LINK_CALLBACK */
+#if LWIP_IGMP
+  netif->igmp_mac_filter = NULL;
+#endif /* LWIP_IGMP */
+#if ENABLE_LOOPBACK
+  netif->loop_first = NULL;
+  netif->loop_last = NULL;
+#endif /* ENABLE_LOOPBACK */
+
+  /* remember netif specific state information data */
+  netif->state = state;
+  netif->num = netif_num++;
+  netif->input = input;
+  NETIF_SET_HWADDRHINT(netif, NULL);
+#if ENABLE_LOOPBACK && LWIP_LOOPBACK_MAX_PBUFS
+  netif->loop_cnt_current = 0;
+#endif /* ENABLE_LOOPBACK && LWIP_LOOPBACK_MAX_PBUFS */
+
+  netif_set_addr(netif, ipaddr, netmask, gw);
+
+  /* call user specified initialization function for netif */
+  if (init(netif) != ERR_OK) {
+    return NULL;
+  }
+
+  /* add this netif to the list */
+  netif->next = netif_list;
+  netif_list = netif;
+  snmp_inc_iflist();
+
+#if LWIP_IGMP
+  /* start IGMP processing */
+  if (netif->flags & NETIF_FLAG_IGMP) {
+    igmp_start(netif);
+  }
+#endif /* LWIP_IGMP */
+
+  LWIP_DEBUGF(NETIF_DEBUG, ("netif: added interface %c%c IP addr ",
+    netif->name[0], netif->name[1]));
+  ip_addr_debug_print(NETIF_DEBUG, ipaddr);
+  LWIP_DEBUGF(NETIF_DEBUG, (" netmask "));
+  ip_addr_debug_print(NETIF_DEBUG, netmask);
+  LWIP_DEBUGF(NETIF_DEBUG, (" gw "));
+  ip_addr_debug_print(NETIF_DEBUG, gw);
+  LWIP_DEBUGF(NETIF_DEBUG, ("\n"));
+  return netif;
+}
+
+/**
+ * Change IP address configuration for a network interface (including netmask
+ * and default gateway).
+ *
+ * @param netif the network interface to change
+ * @param ipaddr the new IP address
+ * @param netmask the new netmask
+ * @param gw the new default gateway
+ */
+void
+netif_set_addr(struct netif *netif, ip_addr_t *ipaddr, ip_addr_t *netmask,
+    ip_addr_t *gw)
+{
+  netif_set_ipaddr(netif, ipaddr);
+  netif_set_netmask(netif, netmask);
+  netif_set_gw(netif, gw);
+}
+
+/**
+ * Remove a network interface from the list of lwIP netifs.
+ *
+ * @param netif the network interface to remove
+ */
+void
+netif_remove(struct netif *netif)
+{
+  if (netif == NULL) {
+    return;
+  }
+
+#if LWIP_IGMP
+  /* stop IGMP processing */
+  if (netif->flags & NETIF_FLAG_IGMP) {
+    igmp_stop(netif);
+  }
+#endif /* LWIP_IGMP */
+  if (netif_is_up(netif)) {
+    /* set netif down before removing (call callback function) */
+    netif_set_down(netif);
+  }
+
+  snmp_delete_ipaddridx_tree(netif);
+
+  /*  is it the first netif? */
+  if (netif_list == netif) {
+    netif_list = netif->next;
+  } else {
+    /*  look for netif further down the list */
+    struct netif * tmpNetif;
+    for (tmpNetif = netif_list; tmpNetif != NULL; tmpNetif = tmpNetif->next) {
+      if (tmpNetif->next == netif) {
+        tmpNetif->next = netif->next;
+        break;
+      }
+    }
+    if (tmpNetif == NULL)
+      return; /*  we didn't find any netif today */
+  }
+  snmp_dec_iflist();
+  /* this netif is default? */
+  if (netif_default == netif) {
+    /* reset default netif */
+    netif_set_default(NULL);
+  }
+#if LWIP_NETIF_REMOVE_CALLBACK
+  if (netif->remove_callback) {
+    netif->remove_callback(netif);
+  }
+#endif /* LWIP_NETIF_REMOVE_CALLBACK */
+  LWIP_DEBUGF( NETIF_DEBUG, ("netif_remove: removed netif\n") );
+}
+
+/**
+ * Find a network interface by searching for its name
+ *
+ * @param name the name of the netif (like netif->name) plus concatenated number
+ * in ascii representation (e.g. 'en0')
+ */
+struct netif *
+netif_find(char *name)
+{
+  struct netif *netif;
+  u8_t num;
+
+  if (name == NULL) {
+    return NULL;
+  }
+
+  num = name[2] - '0';
+
+  for(netif = netif_list; netif != NULL; netif = netif->next) {
+    if (num == netif->num &&
+       name[0] == netif->name[0] &&
+       name[1] == netif->name[1]) {
+      LWIP_DEBUGF(NETIF_DEBUG, ("netif_find: found %c%c\n", name[0], name[1]));
+      return netif;
+    }
+  }
+  LWIP_DEBUGF(NETIF_DEBUG, ("netif_find: didn't find %c%c\n", name[0], name[1]));
+  return NULL;
+}
+
+/**
+ * Change the IP address of a network interface
+ *
+ * @param netif the network interface to change
+ * @param ipaddr the new IP address
+ *
+ * @note call netif_set_addr() if you also want to change netmask and
+ * default gateway
+ */
+void
+netif_set_ipaddr(struct netif *netif, ip_addr_t *ipaddr)
+{
+  /* TODO: Handling of obsolete pcbs */
+  /* See:  http://mail.gnu.org/archive/html/lwip-users/2003-03/msg00118.html */
+#if LWIP_TCP
+  struct tcp_pcb *pcb;
+  struct tcp_pcb_listen *lpcb;
+
+  /* address is actually being changed? */
+  if (ipaddr && (ip_addr_cmp(ipaddr, &(netif->ip_addr))) == 0) {
+    /* extern struct tcp_pcb *tcp_active_pcbs; defined by tcp.h */
+    LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_STATE, ("netif_set_ipaddr: netif address being changed\n"));
+    pcb = tcp_active_pcbs;
+    while (pcb != NULL) {
+      /* PCB bound to current local interface address? */
+      if (ip_addr_cmp(&(pcb->local_ip), &(netif->ip_addr))
+#if LWIP_AUTOIP
+        /* connections to link-local addresses must persist (RFC3927 ch. 1.9) */
+        && !ip_addr_islinklocal(&(pcb->local_ip))
+#endif /* LWIP_AUTOIP */
+        ) {
+        /* this connection must be aborted */
+        struct tcp_pcb *next = pcb->next;
+        LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_STATE, ("netif_set_ipaddr: aborting TCP pcb %p\n", (void *)pcb));
+        tcp_abort(pcb);
+        pcb = next;
+      } else {
+        pcb = pcb->next;
+      }
+    }
+    for (lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = lpcb->next) {
+      /* PCB bound to current local interface address? */
+      if ((!(ip_addr_isany(&(lpcb->local_ip)))) &&
+          (ip_addr_cmp(&(lpcb->local_ip), &(netif->ip_addr)))) {
+        /* The PCB is listening to the old ipaddr and
+         * is set to listen to the new one instead */
+        ip_addr_set(&(lpcb->local_ip), ipaddr);
+      }
+    }
+  }
+#endif
+  snmp_delete_ipaddridx_tree(netif);
+  snmp_delete_iprteidx_tree(0,netif);
+  /* set new IP address to netif */
+  ip_addr_set(&(netif->ip_addr), ipaddr);
+  snmp_insert_ipaddridx_tree(netif);
+  snmp_insert_iprteidx_tree(0,netif);
+
+  LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: IP address of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+    netif->name[0], netif->name[1],
+    ip4_addr1_16(&netif->ip_addr),
+    ip4_addr2_16(&netif->ip_addr),
+    ip4_addr3_16(&netif->ip_addr),
+    ip4_addr4_16(&netif->ip_addr)));
+}
+
+/**
+ * Change the default gateway for a network interface
+ *
+ * @param netif the network interface to change
+ * @param gw the new default gateway
+ *
+ * @note call netif_set_addr() if you also want to change ip address and netmask
+ */
+void
+netif_set_gw(struct netif *netif, ip_addr_t *gw)
+{
+  ip_addr_set(&(netif->gw), gw);
+  LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: GW address of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+    netif->name[0], netif->name[1],
+    ip4_addr1_16(&netif->gw),
+    ip4_addr2_16(&netif->gw),
+    ip4_addr3_16(&netif->gw),
+    ip4_addr4_16(&netif->gw)));
+}
+
+/**
+ * Change the netmask of a network interface
+ *
+ * @param netif the network interface to change
+ * @param netmask the new netmask
+ *
+ * @note call netif_set_addr() if you also want to change ip address and
+ * default gateway
+ */
+void
+netif_set_netmask(struct netif *netif, ip_addr_t *netmask)
+{
+  snmp_delete_iprteidx_tree(0, netif);
+  /* set new netmask to netif */
+  ip_addr_set(&(netif->netmask), netmask);
+  snmp_insert_iprteidx_tree(0, netif);
+  LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: netmask of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+    netif->name[0], netif->name[1],
+    ip4_addr1_16(&netif->netmask),
+    ip4_addr2_16(&netif->netmask),
+    ip4_addr3_16(&netif->netmask),
+    ip4_addr4_16(&netif->netmask)));
+}
+
+/**
+ * Set a network interface as the default network interface
+ * (used to output all packets for which no specific route is found)
+ *
+ * @param netif the default network interface
+ */
+void
+netif_set_default(struct netif *netif)
+{
+  if (netif == NULL) {
+    /* remove default route */
+    snmp_delete_iprteidx_tree(1, netif);
+  } else {
+    /* install default route */
+    snmp_insert_iprteidx_tree(1, netif);
+  }
+  netif_default = netif;
+  LWIP_DEBUGF(NETIF_DEBUG, ("netif: setting default interface %c%c\n",
+           netif ? netif->name[0] : '\'', netif ? netif->name[1] : '\''));
+}
+
+/**
+ * Bring an interface up, available for processing
+ * traffic.
+ *
+ * @note: Enabling DHCP on a down interface will make it come
+ * up once configured.
+ *
+ * @see dhcp_start()
+ */
+void netif_set_up(struct netif *netif)
+{
+  if (!(netif->flags & NETIF_FLAG_UP)) {
+    netif->flags |= NETIF_FLAG_UP;
+
+#if LWIP_SNMP
+    snmp_get_sysuptime(&netif->ts);
+#endif /* LWIP_SNMP */
+
+    NETIF_STATUS_CALLBACK(netif);
+
+    if (netif->flags & NETIF_FLAG_LINK_UP) {
+#if LWIP_ARP
+      /* For Ethernet network interfaces, we would like to send a "gratuitous ARP" */
+      if (netif->flags & (NETIF_FLAG_ETHARP)) {
+        etharp_gratuitous(netif);
+      }
+#endif /* LWIP_ARP */
+
+#if LWIP_IGMP
+      /* resend IGMP memberships */
+      if (netif->flags & NETIF_FLAG_IGMP) {
+        igmp_report_groups( netif);
+      }
+#endif /* LWIP_IGMP */
+    }
+  }
+}
+
+/**
+ * Bring an interface down, disabling any traffic processing.
+ *
+ * @note: Enabling DHCP on a down interface will make it come
+ * up once configured.
+ *
+ * @see dhcp_start()
+ */
+void netif_set_down(struct netif *netif)
+{
+  if (netif->flags & NETIF_FLAG_UP) {
+    netif->flags &= ~NETIF_FLAG_UP;
+#if LWIP_SNMP
+    snmp_get_sysuptime(&netif->ts);
+#endif
+
+#if LWIP_ARP
+    if (netif->flags & NETIF_FLAG_ETHARP) {
+      etharp_cleanup_netif(netif);
+    }
+#endif /* LWIP_ARP */
+    NETIF_STATUS_CALLBACK(netif);
+  }
+}
+
+#if LWIP_NETIF_STATUS_CALLBACK
+/**
+ * Set callback to be called when interface is brought up/down
+ */
+void netif_set_status_callback(struct netif *netif, netif_status_callback_fn status_callback)
+{
+  if (netif) {
+    netif->status_callback = status_callback;
+  }
+}
+#endif /* LWIP_NETIF_STATUS_CALLBACK */
+
+#if LWIP_NETIF_REMOVE_CALLBACK
+/**
+ * Set callback to be called when the interface has been removed
+ */
+void
+netif_set_remove_callback(struct netif *netif, netif_status_callback_fn remove_callback)
+{
+  if (netif) {
+    netif->remove_callback = remove_callback;
+  }
+}
+#endif /* LWIP_NETIF_REMOVE_CALLBACK */
+
+/**
+ * Called by a driver when its link goes up
+ */
+void netif_set_link_up(struct netif *netif )
+{
+  if (!(netif->flags & NETIF_FLAG_LINK_UP)) {
+    netif->flags |= NETIF_FLAG_LINK_UP;
+
+#if LWIP_DHCP
+    if (netif->dhcp) {
+      dhcp_network_changed(netif);
+    }
+#endif /* LWIP_DHCP */
+
+#if LWIP_AUTOIP
+    if (netif->autoip) {
+      autoip_network_changed(netif);
+    }
+#endif /* LWIP_AUTOIP */
+
+    if (netif->flags & NETIF_FLAG_UP) {
+#if LWIP_ARP
+      /* For Ethernet network interfaces, we would like to send a "gratuitous ARP" */
+      if (netif->flags & NETIF_FLAG_ETHARP) {
+        etharp_gratuitous(netif);
+      }
+#endif /* LWIP_ARP */
+
+#if LWIP_IGMP
+      /* resend IGMP memberships */
+      if (netif->flags & NETIF_FLAG_IGMP) {
+        igmp_report_groups( netif);
+      }
+#endif /* LWIP_IGMP */
+    }
+    NETIF_LINK_CALLBACK(netif);
+  }
+}
+
+/**
+ * Called by a driver when its link goes down
+ */
+void netif_set_link_down(struct netif *netif )
+{
+  if (netif->flags & NETIF_FLAG_LINK_UP) {
+    netif->flags &= ~NETIF_FLAG_LINK_UP;
+    NETIF_LINK_CALLBACK(netif);
+  }
+}
+
+#if LWIP_NETIF_LINK_CALLBACK
+/**
+ * Set callback to be called when link is brought up/down
+ */
+void netif_set_link_callback(struct netif *netif, netif_status_callback_fn link_callback)
+{
+  if (netif) {
+    netif->link_callback = link_callback;
+  }
+}
+#endif /* LWIP_NETIF_LINK_CALLBACK */
+
+#if ENABLE_LOOPBACK
+/**
+ * Send an IP packet to be received on the same netif (loopif-like).
+ * The pbuf is simply copied and handed back to netif->input.
+ * In multithreaded mode, this is done directly since netif->input must put
+ * the packet on a queue.
+ * In callback mode, the packet is put on an internal queue and is fed to
+ * netif->input by netif_poll().
+ *
+ * @param netif the lwip network interface structure
+ * @param p the (IP) packet to 'send'
+ * @param ipaddr the ip address to send the packet to (not used)
+ * @return ERR_OK if the packet has been sent
+ *         ERR_MEM if the pbuf used to copy the packet couldn't be allocated
+ */
+err_t
+netif_loop_output(struct netif *netif, struct pbuf *p,
+       ip_addr_t *ipaddr)
+{
+  struct pbuf *r;
+  err_t err;
+  struct pbuf *last;
+#if LWIP_LOOPBACK_MAX_PBUFS
+  u8_t clen = 0;
+#endif /* LWIP_LOOPBACK_MAX_PBUFS */
+  /* If we have a loopif, SNMP counters are adjusted for it,
+   * if not they are adjusted for 'netif'. */
+#if LWIP_SNMP
+#if LWIP_HAVE_LOOPIF
+  struct netif *stats_if = &loop_netif;
+#else /* LWIP_HAVE_LOOPIF */
+  struct netif *stats_if = netif;
+#endif /* LWIP_HAVE_LOOPIF */
+#endif /* LWIP_SNMP */
+  SYS_ARCH_DECL_PROTECT(lev);
+  LWIP_UNUSED_ARG(ipaddr);
+
+  /* Allocate a new pbuf */
+  r = pbuf_alloc(PBUF_LINK, p->tot_len, PBUF_RAM);
+  if (r == NULL) {
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.drop);
+    snmp_inc_ifoutdiscards(stats_if);
+    return ERR_MEM;
+  }
+#if LWIP_LOOPBACK_MAX_PBUFS
+  clen = pbuf_clen(r);
+  /* check for overflow or too many pbuf on queue */
+  if(((netif->loop_cnt_current + clen) < netif->loop_cnt_current) ||
+     ((netif->loop_cnt_current + clen) > LWIP_LOOPBACK_MAX_PBUFS)) {
+    pbuf_free(r);
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.drop);
+    snmp_inc_ifoutdiscards(stats_if);
+    return ERR_MEM;
+  }
+  netif->loop_cnt_current += clen;
+#endif /* LWIP_LOOPBACK_MAX_PBUFS */
+
+  /* Copy the whole pbuf queue p into the single pbuf r */
+  if ((err = pbuf_copy(r, p)) != ERR_OK) {
+    pbuf_free(r);
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.drop);
+    snmp_inc_ifoutdiscards(stats_if);
+    return err;
+  }
+
+  /* Put the packet on a linked list which gets emptied through calling
+     netif_poll(). */
+
+  /* let last point to the last pbuf in chain r */
+  for (last = r; last->next != NULL; last = last->next);
+
+  SYS_ARCH_PROTECT(lev);
+  if(netif->loop_first != NULL) {
+    LWIP_ASSERT("if first != NULL, last must also be != NULL", netif->loop_last != NULL);
+    netif->loop_last->next = r;
+    netif->loop_last = last;
+  } else {
+    netif->loop_first = r;
+    netif->loop_last = last;
+  }
+  SYS_ARCH_UNPROTECT(lev);
+
+  LINK_STATS_INC(link.xmit);
+  snmp_add_ifoutoctets(stats_if, p->tot_len);
+  snmp_inc_ifoutucastpkts(stats_if);
+
+#if LWIP_NETIF_LOOPBACK_MULTITHREADING
+  /* For multithreading environment, schedule a call to netif_poll */
+  tcpip_callback((tcpip_callback_fn)netif_poll, netif);
+#endif /* LWIP_NETIF_LOOPBACK_MULTITHREADING */
+
+  return ERR_OK;
+}
+
+/**
+ * Call netif_poll() in the main loop of your application. This is to prevent
+ * reentering non-reentrant functions like tcp_input(). Packets passed to
+ * netif_loop_output() are put on a list that is passed to netif->input() by
+ * netif_poll().
+ */
+void
+netif_poll(struct netif *netif)
+{
+  struct pbuf *in;
+  /* If we have a loopif, SNMP counters are adjusted for it,
+   * if not they are adjusted for 'netif'. */
+#if LWIP_SNMP
+#if LWIP_HAVE_LOOPIF
+  struct netif *stats_if = &loop_netif;
+#else /* LWIP_HAVE_LOOPIF */
+  struct netif *stats_if = netif;
+#endif /* LWIP_HAVE_LOOPIF */
+#endif /* LWIP_SNMP */
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  do {
+    /* Get a packet from the list. With SYS_LIGHTWEIGHT_PROT=1, this is protected */
+    SYS_ARCH_PROTECT(lev);
+    in = netif->loop_first;
+    if (in != NULL) {
+      struct pbuf *in_end = in;
+#if LWIP_LOOPBACK_MAX_PBUFS
+      u8_t clen = pbuf_clen(in);
+      /* adjust the number of pbufs on queue */
+      LWIP_ASSERT("netif->loop_cnt_current underflow",
+        ((netif->loop_cnt_current - clen) < netif->loop_cnt_current));
+      netif->loop_cnt_current -= clen;
+#endif /* LWIP_LOOPBACK_MAX_PBUFS */
+      while (in_end->len != in_end->tot_len) {
+        LWIP_ASSERT("bogus pbuf: len != tot_len but next == NULL!", in_end->next != NULL);
+        in_end = in_end->next;
+      }
+      /* 'in_end' now points to the last pbuf from 'in' */
+      if (in_end == netif->loop_last) {
+        /* this was the last pbuf in the list */
+        netif->loop_first = netif->loop_last = NULL;
+      } else {
+        /* pop the pbuf off the list */
+        netif->loop_first = in_end->next;
+        LWIP_ASSERT("should not be null since first != last!", netif->loop_first != NULL);
+      }
+      /* De-queue the pbuf from its successors on the 'loop_' list. */
+      in_end->next = NULL;
+    }
+    SYS_ARCH_UNPROTECT(lev);
+
+    if (in != NULL) {
+      LINK_STATS_INC(link.recv);
+      snmp_add_ifinoctets(stats_if, in->tot_len);
+      snmp_inc_ifinucastpkts(stats_if);
+      /* loopback packets are always IP packets! */
+      if (ip_input(in, netif) != ERR_OK) {
+        pbuf_free(in);
+      }
+      /* Don't reference the packet any more! */
+      in = NULL;
+    }
+  /* go on while there is a packet on the list */
+  } while (netif->loop_first != NULL);
+}
+
+#if !LWIP_NETIF_LOOPBACK_MULTITHREADING
+/**
+ * Calls netif_poll() for every netif on the netif_list.
+ */
+void
+netif_poll_all(void)
+{
+  struct netif *netif = netif_list;
+  /* loop through netifs */
+  while (netif != NULL) {
+    netif_poll(netif);
+    /* proceed to next network interface */
+    netif = netif->next;
+  }
+}
+#endif /* !LWIP_NETIF_LOOPBACK_MULTITHREADING */
+#endif /* ENABLE_LOOPBACK */
diff --git a/ext/lwip/src/core/pbuf.c b/ext/lwip/src/core/pbuf.c
new file mode 100644
index 000000000..bd9bf916f
--- /dev/null
+++ b/ext/lwip/src/core/pbuf.c
@@ -0,0 +1,1179 @@
+/**
+ * @file
+ * Packet buffer management
+ *
+ * Packets are built from the pbuf data structure. It supports dynamic
+ * memory allocation for packet contents or can reference externally
+ * managed packet contents both in RAM and ROM. Quick allocation for
+ * incoming packets is provided through pools with fixed sized pbufs.
+ *
+ * A packet may span over multiple pbufs, chained as a singly linked
+ * list. This is called a "pbuf chain".
+ *
+ * Multiple packets may be queued, also using this singly linked list.
+ * This is called a "packet queue".
+ * 
+ * So, a packet queue consists of one or more pbuf chains, each of
+ * which consist of one or more pbufs. CURRENTLY, PACKET QUEUES ARE
+ * NOT SUPPORTED!!! Use helper structs to queue multiple packets.
+ * 
+ * The differences between a pbuf chain and a packet queue are very
+ * precise but subtle. 
+ *
+ * The last pbuf of a packet has a ->tot_len field that equals the
+ * ->len field. It can be found by traversing the list. If the last
+ * pbuf of a packet has a ->next field other than NULL, more packets
+ * are on the queue.
+ *
+ * Therefore, looping through a pbuf of a single packet, has an
+ * loop end condition (tot_len == p->len), NOT (next == NULL).
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/stats.h"
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+#include "lwip/pbuf.h"
+#include "lwip/sys.h"
+#include "arch/perf.h"
+#if LWIP_TCP && TCP_QUEUE_OOSEQ
+#include "lwip/tcp_impl.h"
+#endif
+#if LWIP_CHECKSUM_ON_COPY
+#include "lwip/inet_chksum.h"
+#endif
+
+#include <string.h>
+
+#define SIZEOF_STRUCT_PBUF        LWIP_MEM_ALIGN_SIZE(sizeof(struct pbuf))
+/* Since the pool is created in memp, PBUF_POOL_BUFSIZE will be automatically
+   aligned there. Therefore, PBUF_POOL_BUFSIZE_ALIGNED can be used here. */
+#define PBUF_POOL_BUFSIZE_ALIGNED LWIP_MEM_ALIGN_SIZE(PBUF_POOL_BUFSIZE)
+
+#if !LWIP_TCP || !TCP_QUEUE_OOSEQ || !PBUF_POOL_FREE_OOSEQ
+#define PBUF_POOL_IS_EMPTY()
+#else /* !LWIP_TCP || !TCP_QUEUE_OOSEQ || !PBUF_POOL_FREE_OOSEQ */
+
+#if !NO_SYS
+#ifndef PBUF_POOL_FREE_OOSEQ_QUEUE_CALL
+#include "lwip/tcpip.h"
+#define PBUF_POOL_FREE_OOSEQ_QUEUE_CALL()  do { \
+  if(tcpip_callback_with_block(pbuf_free_ooseq_callback, NULL, 0) != ERR_OK) { \
+      SYS_ARCH_PROTECT(old_level); \
+      pbuf_free_ooseq_pending = 0; \
+      SYS_ARCH_UNPROTECT(old_level); \
+  } } while(0)
+#endif /* PBUF_POOL_FREE_OOSEQ_QUEUE_CALL */
+#endif /* !NO_SYS */
+
+volatile u8_t pbuf_free_ooseq_pending;
+#define PBUF_POOL_IS_EMPTY() pbuf_pool_is_empty()
+
+/**
+ * Attempt to reclaim some memory from queued out-of-sequence TCP segments
+ * if we run out of pool pbufs. It's better to give priority to new packets
+ * if we're running out.
+ *
+ * This must be done in the correct thread context therefore this function
+ * can only be used with NO_SYS=0 and through tcpip_callback.
+ */
+#if !NO_SYS
+static
+#endif /* !NO_SYS */
+void
+pbuf_free_ooseq(void)
+{
+  struct tcp_pcb* pcb;
+  SYS_ARCH_DECL_PROTECT(old_level);
+
+  SYS_ARCH_PROTECT(old_level);
+  pbuf_free_ooseq_pending = 0;
+  SYS_ARCH_UNPROTECT(old_level);
+
+  for (pcb = tcp_active_pcbs; NULL != pcb; pcb = pcb->next) {
+    if (NULL != pcb->ooseq) {
+      /** Free the ooseq pbufs of one PCB only */
+      LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free_ooseq: freeing out-of-sequence pbufs\n"));
+      tcp_segs_free(pcb->ooseq);
+      pcb->ooseq = NULL;
+      return;
+    }
+  }
+}
+
+#if !NO_SYS
+/**
+ * Just a callback function for tcpip_timeout() that calls pbuf_free_ooseq().
+ */
+static void
+pbuf_free_ooseq_callback(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+  pbuf_free_ooseq();
+}
+#endif /* !NO_SYS */
+
+/** Queue a call to pbuf_free_ooseq if not already queued. */
+static void
+pbuf_pool_is_empty(void)
+{
+#ifndef PBUF_POOL_FREE_OOSEQ_QUEUE_CALL
+  SYS_ARCH_DECL_PROTECT(old_level);
+  SYS_ARCH_PROTECT(old_level);
+  pbuf_free_ooseq_pending = 1;
+  SYS_ARCH_UNPROTECT(old_level);
+#else /* PBUF_POOL_FREE_OOSEQ_QUEUE_CALL */
+  u8_t queued;
+  SYS_ARCH_DECL_PROTECT(old_level);
+  SYS_ARCH_PROTECT(old_level);
+  queued = pbuf_free_ooseq_pending;
+  pbuf_free_ooseq_pending = 1;
+  SYS_ARCH_UNPROTECT(old_level);
+
+  if(!queued) {
+    /* queue a call to pbuf_free_ooseq if not already queued */
+    //PBUF_POOL_FREE_OOSEQ_QUEUE_CALL();
+  }
+#endif /* PBUF_POOL_FREE_OOSEQ_QUEUE_CALL */
+}
+#endif /* !LWIP_TCP || !TCP_QUEUE_OOSEQ || !PBUF_POOL_FREE_OOSEQ */
+
+/**
+ * Allocates a pbuf of the given type (possibly a chain for PBUF_POOL type).
+ *
+ * The actual memory allocated for the pbuf is determined by the
+ * layer at which the pbuf is allocated and the requested size
+ * (from the size parameter).
+ *
+ * @param layer flag to define header size
+ * @param length size of the pbuf's payload
+ * @param type this parameter decides how and where the pbuf
+ * should be allocated as follows:
+ *
+ * - PBUF_RAM: buffer memory for pbuf is allocated as one large
+ *             chunk. This includes protocol headers as well.
+ * - PBUF_ROM: no buffer memory is allocated for the pbuf, even for
+ *             protocol headers. Additional headers must be prepended
+ *             by allocating another pbuf and chain in to the front of
+ *             the ROM pbuf. It is assumed that the memory used is really
+ *             similar to ROM in that it is immutable and will not be
+ *             changed. Memory which is dynamic should generally not
+ *             be attached to PBUF_ROM pbufs. Use PBUF_REF instead.
+ * - PBUF_REF: no buffer memory is allocated for the pbuf, even for
+ *             protocol headers. It is assumed that the pbuf is only
+ *             being used in a single thread. If the pbuf gets queued,
+ *             then pbuf_take should be called to copy the buffer.
+ * - PBUF_POOL: the pbuf is allocated as a pbuf chain, with pbufs from
+ *              the pbuf pool that is allocated during pbuf_init().
+ *
+ * @return the allocated pbuf. If multiple pbufs where allocated, this
+ * is the first pbuf of a pbuf chain.
+ */
+struct pbuf *
+pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type)
+{
+  struct pbuf *p, *q, *r;
+  u16_t offset;
+  s32_t rem_len; /* remaining length */
+  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc(length=%"U16_F")\n", length));
+
+  /* determine header offset */
+  switch (layer) {
+  case PBUF_TRANSPORT:
+    /* add room for transport (often TCP) layer header */
+    offset = PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN;
+    break;
+  case PBUF_IP:
+    /* add room for IP layer header */
+    offset = PBUF_LINK_HLEN + PBUF_IP_HLEN;
+    break;
+  case PBUF_LINK:
+    /* add room for link layer header */
+    offset = PBUF_LINK_HLEN;
+    break;
+  case PBUF_RAW:
+    offset = 0;
+    break;
+  default:
+    LWIP_ASSERT("pbuf_alloc: bad pbuf layer", 0);
+    return NULL;
+  }
+
+  switch (type) {
+  case PBUF_POOL:
+    /* allocate head of pbuf chain into p */
+    p = (struct pbuf *)memp_malloc(MEMP_PBUF_POOL);
+    LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc: allocated pbuf %p\n", (void *)p));
+    if (p == NULL) {
+      PBUF_POOL_IS_EMPTY();
+      return NULL;
+    }
+    p->type = type;
+    p->next = NULL;
+
+    /* make the payload pointer point 'offset' bytes into pbuf data memory */
+    p->payload = LWIP_MEM_ALIGN((void *)((u8_t *)p + (SIZEOF_STRUCT_PBUF + offset)));
+    LWIP_ASSERT("pbuf_alloc: pbuf p->payload properly aligned",
+            ((mem_ptr_t)p->payload % MEM_ALIGNMENT) == 0);
+    /* the total length of the pbuf chain is the requested size */
+    p->tot_len = length;
+    /* set the length of the first pbuf in the chain */
+    p->len = LWIP_MIN(length, PBUF_POOL_BUFSIZE_ALIGNED - LWIP_MEM_ALIGN_SIZE(offset));
+    LWIP_ASSERT("check p->payload + p->len does not overflow pbuf",
+                ((u8_t*)p->payload + p->len <=
+                 (u8_t*)p + SIZEOF_STRUCT_PBUF + PBUF_POOL_BUFSIZE_ALIGNED));
+    LWIP_ASSERT("PBUF_POOL_BUFSIZE must be bigger than MEM_ALIGNMENT",
+      (PBUF_POOL_BUFSIZE_ALIGNED - LWIP_MEM_ALIGN_SIZE(offset)) > 0 );
+    /* set reference count (needed here in case we fail) */
+    p->ref = 1;
+
+    /* now allocate the tail of the pbuf chain */
+
+    /* remember first pbuf for linkage in next iteration */
+    r = p;
+    /* remaining length to be allocated */
+    rem_len = length - p->len;
+    /* any remaining pbufs to be allocated? */
+    while (rem_len > 0) {
+      q = (struct pbuf *)memp_malloc(MEMP_PBUF_POOL);
+      if (q == NULL) {
+        PBUF_POOL_IS_EMPTY();
+        /* free chain so far allocated */
+        pbuf_free(p);
+        /* bail out unsuccesfully */
+        return NULL;
+      }
+      q->type = type;
+      q->flags = 0;
+      q->next = NULL;
+      /* make previous pbuf point to this pbuf */
+      r->next = q;
+      /* set total length of this pbuf and next in chain */
+      LWIP_ASSERT("rem_len < max_u16_t", rem_len < 0xffff);
+      q->tot_len = (u16_t)rem_len;
+      /* this pbuf length is pool size, unless smaller sized tail */
+      q->len = LWIP_MIN((u16_t)rem_len, PBUF_POOL_BUFSIZE_ALIGNED);
+      q->payload = (void *)((u8_t *)q + SIZEOF_STRUCT_PBUF);
+      LWIP_ASSERT("pbuf_alloc: pbuf q->payload properly aligned",
+              ((mem_ptr_t)q->payload % MEM_ALIGNMENT) == 0);
+      LWIP_ASSERT("check p->payload + p->len does not overflow pbuf",
+                  ((u8_t*)p->payload + p->len <=
+                   (u8_t*)p + SIZEOF_STRUCT_PBUF + PBUF_POOL_BUFSIZE_ALIGNED));
+      q->ref = 1;
+      /* calculate remaining length to be allocated */
+      rem_len -= q->len;
+      /* remember this pbuf for linkage in next iteration */
+      r = q;
+    }
+    /* end of chain */
+    /*r->next = NULL;*/
+
+    break;
+  case PBUF_RAM:
+    /* If pbuf is to be allocated in RAM, allocate memory for it. */
+    p = (struct pbuf*)mem_malloc(LWIP_MEM_ALIGN_SIZE(SIZEOF_STRUCT_PBUF + offset) + LWIP_MEM_ALIGN_SIZE(length));
+    if (p == NULL) {
+      return NULL;
+    }
+    /* Set up internal structure of the pbuf. */
+    p->payload = LWIP_MEM_ALIGN((void *)((u8_t *)p + SIZEOF_STRUCT_PBUF + offset));
+    p->len = p->tot_len = length;
+    p->next = NULL;
+    p->type = type;
+
+    LWIP_ASSERT("pbuf_alloc: pbuf->payload properly aligned",
+           ((mem_ptr_t)p->payload % MEM_ALIGNMENT) == 0);
+    break;
+  /* pbuf references existing (non-volatile static constant) ROM payload? */
+  case PBUF_ROM:
+  /* pbuf references existing (externally allocated) RAM payload? */
+  case PBUF_REF:
+    /* only allocate memory for the pbuf structure */
+    p = (struct pbuf *)memp_malloc(MEMP_PBUF);
+    if (p == NULL) {
+      LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+                  ("pbuf_alloc: Could not allocate MEMP_PBUF for PBUF_%s.\n",
+                  (type == PBUF_ROM) ? "ROM" : "REF"));
+      return NULL;
+    }
+    /* caller must set this field properly, afterwards */
+    p->payload = NULL;
+    p->len = p->tot_len = length;
+    p->next = NULL;
+    p->type = type;
+    break;
+  default:
+    LWIP_ASSERT("pbuf_alloc: erroneous type", 0);
+    return NULL;
+  }
+  /* set reference count */
+  p->ref = 1;
+  /* set flags */
+  p->flags = 0;
+  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc(length=%"U16_F") == %p\n", length, (void *)p));
+  return p;
+}
+
+#if LWIP_SUPPORT_CUSTOM_PBUF
+/** Initialize a custom pbuf (already allocated).
+ *
+ * @param layer flag to define header size
+ * @param length size of the pbuf's payload
+ * @param type type of the pbuf (only used to treat the pbuf accordingly, as
+ *        this function allocates no memory)
+ * @param p pointer to the custom pbuf to initialize (already allocated)
+ * @param payload_mem pointer to the buffer that is used for payload and headers,
+ *        must be at least big enough to hold 'length' plus the header size,
+ *        may be NULL if set later.
+ *        ATTENTION: The caller is responsible for correct alignment of this buffer!!
+ * @param payload_mem_len the size of the 'payload_mem' buffer, must be at least
+ *        big enough to hold 'length' plus the header size
+ */
+struct pbuf*
+pbuf_alloced_custom(pbuf_layer l, u16_t length, pbuf_type type, struct pbuf_custom *p,
+                    void *payload_mem, u16_t payload_mem_len)
+{
+  u16_t offset;
+  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloced_custom(length=%"U16_F")\n", length));
+
+  /* determine header offset */
+  switch (l) {
+  case PBUF_TRANSPORT:
+    /* add room for transport (often TCP) layer header */
+    offset = PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN;
+    break;
+  case PBUF_IP:
+    /* add room for IP layer header */
+    offset = PBUF_LINK_HLEN + PBUF_IP_HLEN;
+    break;
+  case PBUF_LINK:
+    /* add room for link layer header */
+    offset = PBUF_LINK_HLEN;
+    break;
+  case PBUF_RAW:
+    offset = 0;
+    break;
+  default:
+    LWIP_ASSERT("pbuf_alloced_custom: bad pbuf layer", 0);
+    return NULL;
+  }
+
+  if (LWIP_MEM_ALIGN_SIZE(offset) + length > payload_mem_len) {
+    LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_LEVEL_WARNING, ("pbuf_alloced_custom(length=%"U16_F") buffer too short\n", length));
+    return NULL;
+  }
+
+  p->pbuf.next = NULL;
+  if (payload_mem != NULL) {
+    p->pbuf.payload = (u8_t *)payload_mem + LWIP_MEM_ALIGN_SIZE(offset);
+  } else {
+    p->pbuf.payload = NULL;
+  }
+  p->pbuf.flags = PBUF_FLAG_IS_CUSTOM;
+  p->pbuf.len = p->pbuf.tot_len = length;
+  p->pbuf.type = type;
+  p->pbuf.ref = 1;
+  return &p->pbuf;
+}
+#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
+
+/**
+ * Shrink a pbuf chain to a desired length.
+ *
+ * @param p pbuf to shrink.
+ * @param new_len desired new length of pbuf chain
+ *
+ * Depending on the desired length, the first few pbufs in a chain might
+ * be skipped and left unchanged. The new last pbuf in the chain will be
+ * resized, and any remaining pbufs will be freed.
+ *
+ * @note If the pbuf is ROM/REF, only the ->tot_len and ->len fields are adjusted.
+ * @note May not be called on a packet queue.
+ *
+ * @note Despite its name, pbuf_realloc cannot grow the size of a pbuf (chain).
+ */
+void
+pbuf_realloc(struct pbuf *p, u16_t new_len)
+{
+  struct pbuf *q;
+  u16_t rem_len; /* remaining length */
+  s32_t grow;
+
+  LWIP_ASSERT("pbuf_realloc: p != NULL", p != NULL);
+  LWIP_ASSERT("pbuf_realloc: sane p->type", p->type == PBUF_POOL ||
+              p->type == PBUF_ROM ||
+              p->type == PBUF_RAM ||
+              p->type == PBUF_REF);
+
+  /* desired length larger than current length? */
+  if (new_len >= p->tot_len) {
+    /* enlarging not yet supported */
+    return;
+  }
+
+  /* the pbuf chain grows by (new_len - p->tot_len) bytes
+   * (which may be negative in case of shrinking) */
+  grow = new_len - p->tot_len;
+
+  /* first, step over any pbufs that should remain in the chain */
+  rem_len = new_len;
+  q = p;
+  /* should this pbuf be kept? */
+  while (rem_len > q->len) {
+    /* decrease remaining length by pbuf length */
+    rem_len -= q->len;
+    /* decrease total length indicator */
+    LWIP_ASSERT("grow < max_u16_t", grow < 0xffff);
+    q->tot_len += (u16_t)grow;
+    /* proceed to next pbuf in chain */
+    q = q->next;
+    LWIP_ASSERT("pbuf_realloc: q != NULL", q != NULL);
+  }
+  /* we have now reached the new last pbuf (in q) */
+  /* rem_len == desired length for pbuf q */
+
+  /* shrink allocated memory for PBUF_RAM */
+  /* (other types merely adjust their length fields */
+  if ((q->type == PBUF_RAM) && (rem_len != q->len)) {
+    /* reallocate and adjust the length of the pbuf that will be split */
+    q = (struct pbuf *)mem_trim(q, (u16_t)((u8_t *)q->payload - (u8_t *)q) + rem_len);
+    LWIP_ASSERT("mem_trim returned q == NULL", q != NULL);
+  }
+  /* adjust length fields for new last pbuf */
+  q->len = rem_len;
+  q->tot_len = q->len;
+
+  /* any remaining pbufs in chain? */
+  if (q->next != NULL) {
+    /* free remaining pbufs in chain */
+    pbuf_free(q->next);
+  }
+  /* q is last packet in chain */
+  q->next = NULL;
+
+}
+
+/**
+ * Adjusts the payload pointer to hide or reveal headers in the payload.
+ *
+ * Adjusts the ->payload pointer so that space for a header
+ * (dis)appears in the pbuf payload.
+ *
+ * The ->payload, ->tot_len and ->len fields are adjusted.
+ *
+ * @param p pbuf to change the header size.
+ * @param header_size_increment Number of bytes to increment header size which
+ * increases the size of the pbuf. New space is on the front.
+ * (Using a negative value decreases the header size.)
+ * If hdr_size_inc is 0, this function does nothing and returns succesful.
+ *
+ * PBUF_ROM and PBUF_REF type buffers cannot have their sizes increased, so
+ * the call will fail. A check is made that the increase in header size does
+ * not move the payload pointer in front of the start of the buffer.
+ * @return non-zero on failure, zero on success.
+ *
+ */
+u8_t
+pbuf_header(struct pbuf *p, s16_t header_size_increment)
+{
+  u16_t type;
+  void *payload;
+  u16_t increment_magnitude;
+
+  LWIP_ASSERT("p != NULL", p != NULL);
+  if ((header_size_increment == 0) || (p == NULL)) {
+    return 0;
+  }
+ 
+  if (header_size_increment < 0){
+    increment_magnitude = -header_size_increment;
+    /* Check that we aren't going to move off the end of the pbuf */
+    LWIP_ERROR("increment_magnitude <= p->len", (increment_magnitude <= p->len), return 1;);
+  } else {
+    increment_magnitude = header_size_increment;
+#if 0
+    /* Can't assert these as some callers speculatively call
+         pbuf_header() to see if it's OK.  Will return 1 below instead. */
+    /* Check that we've got the correct type of pbuf to work with */
+    LWIP_ASSERT("p->type == PBUF_RAM || p->type == PBUF_POOL", 
+                p->type == PBUF_RAM || p->type == PBUF_POOL);
+    /* Check that we aren't going to move off the beginning of the pbuf */
+    LWIP_ASSERT("p->payload - increment_magnitude >= p + SIZEOF_STRUCT_PBUF",
+                (u8_t *)p->payload - increment_magnitude >= (u8_t *)p + SIZEOF_STRUCT_PBUF);
+#endif
+  }
+
+  type = p->type;
+  /* remember current payload pointer */
+  payload = p->payload;
+
+  /* pbuf types containing payloads? */
+  if (type == PBUF_RAM || type == PBUF_POOL) {
+    /* set new payload pointer */
+    p->payload = (u8_t *)p->payload - header_size_increment;
+    /* boundary check fails? */
+    if ((u8_t *)p->payload < (u8_t *)p + SIZEOF_STRUCT_PBUF) {
+      LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+        ("pbuf_header: failed as %p < %p (not enough space for new header size)\n",
+        (void *)p->payload, (void *)(p + 1)));
+      /* restore old payload pointer */
+      p->payload = payload;
+      /* bail out unsuccesfully */
+      return 1;
+    }
+  /* pbuf types refering to external payloads? */
+  } else if (type == PBUF_REF || type == PBUF_ROM) {
+    /* hide a header in the payload? */
+    if ((header_size_increment < 0) && (increment_magnitude <= p->len)) {
+      /* increase payload pointer */
+      p->payload = (u8_t *)p->payload - header_size_increment;
+    } else {
+      /* cannot expand payload to front (yet!)
+       * bail out unsuccesfully */
+      return 1;
+    }
+  } else {
+    /* Unknown type */
+    LWIP_ASSERT("bad pbuf type", 0);
+    return 1;
+  }
+  /* modify pbuf length fields */
+  p->len += header_size_increment;
+  p->tot_len += header_size_increment;
+
+  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_header: old %p new %p (%"S16_F")\n",
+    (void *)payload, (void *)p->payload, header_size_increment));
+
+  return 0;
+}
+
+/**
+ * Dereference a pbuf chain or queue and deallocate any no-longer-used
+ * pbufs at the head of this chain or queue.
+ *
+ * Decrements the pbuf reference count. If it reaches zero, the pbuf is
+ * deallocated.
+ *
+ * For a pbuf chain, this is repeated for each pbuf in the chain,
+ * up to the first pbuf which has a non-zero reference count after
+ * decrementing. So, when all reference counts are one, the whole
+ * chain is free'd.
+ *
+ * @param p The pbuf (chain) to be dereferenced.
+ *
+ * @return the number of pbufs that were de-allocated
+ * from the head of the chain.
+ *
+ * @note MUST NOT be called on a packet queue (Not verified to work yet).
+ * @note the reference counter of a pbuf equals the number of pointers
+ * that refer to the pbuf (or into the pbuf).
+ *
+ * @internal examples:
+ *
+ * Assuming existing chains a->b->c with the following reference
+ * counts, calling pbuf_free(a) results in:
+ * 
+ * 1->2->3 becomes ...1->3
+ * 3->3->3 becomes 2->3->3
+ * 1->1->2 becomes ......1
+ * 2->1->1 becomes 1->1->1
+ * 1->1->1 becomes .......
+ *
+ */
+u8_t
+pbuf_free(struct pbuf *p)
+{
+  u16_t type;
+  struct pbuf *q;
+  u8_t count;
+
+  if (p == NULL) {
+    LWIP_ASSERT("p != NULL", p != NULL);
+    /* if assertions are disabled, proceed with debug output */
+    LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+      ("pbuf_free(p == NULL) was called.\n"));
+    return 0;
+  }
+  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free(%p)\n", (void *)p));
+
+  PERF_START;
+
+  LWIP_ASSERT("pbuf_free: sane type",
+    p->type == PBUF_RAM || p->type == PBUF_ROM ||
+    p->type == PBUF_REF || p->type == PBUF_POOL);
+
+  count = 0;
+  /* de-allocate all consecutive pbufs from the head of the chain that
+   * obtain a zero reference count after decrementing*/
+  while (p != NULL) {
+    u16_t ref;
+    SYS_ARCH_DECL_PROTECT(old_level);
+    /* Since decrementing ref cannot be guaranteed to be a single machine operation
+     * we must protect it. We put the new ref into a local variable to prevent
+     * further protection. */
+    SYS_ARCH_PROTECT(old_level);
+    /* all pbufs in a chain are referenced at least once */
+    LWIP_ASSERT("pbuf_free: p->ref > 0", p->ref > 0);
+    /* decrease reference count (number of pointers to pbuf) */
+    ref = --(p->ref);
+    SYS_ARCH_UNPROTECT(old_level);
+    /* this pbuf is no longer referenced to? */
+    if (ref == 0) {
+      /* remember next pbuf in chain for next iteration */
+      q = p->next;
+      LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free: deallocating %p\n", (void *)p));
+      type = p->type;
+#if LWIP_SUPPORT_CUSTOM_PBUF
+      /* is this a custom pbuf? */
+      if ((p->flags & PBUF_FLAG_IS_CUSTOM) != 0) {
+        struct pbuf_custom *pc = (struct pbuf_custom*)p;
+        LWIP_ASSERT("pc->custom_free_function != NULL", pc->custom_free_function != NULL);
+        pc->custom_free_function(p);
+      } else
+#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
+      {
+        /* is this a pbuf from the pool? */
+        if (type == PBUF_POOL) {
+          memp_free(MEMP_PBUF_POOL, p);
+        /* is this a ROM or RAM referencing pbuf? */
+        } else if (type == PBUF_ROM || type == PBUF_REF) {
+          memp_free(MEMP_PBUF, p);
+        /* type == PBUF_RAM */
+        } else {
+          mem_free(p);
+        }
+      }
+      count++;
+      /* proceed to next pbuf */
+      p = q;
+    /* p->ref > 0, this pbuf is still referenced to */
+    /* (and so the remaining pbufs in chain as well) */
+    } else {
+      LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free: %p has ref %"U16_F", ending here.\n", (void *)p, ref));
+      /* stop walking through the chain */
+      p = NULL;
+    }
+  }
+  PERF_STOP("pbuf_free");
+  /* return number of de-allocated pbufs */
+  return count;
+}
+
+/**
+ * Count number of pbufs in a chain
+ *
+ * @param p first pbuf of chain
+ * @return the number of pbufs in a chain
+ */
+
+u8_t
+pbuf_clen(struct pbuf *p)
+{
+  u8_t len;
+
+  len = 0;
+  while (p != NULL) {
+    ++len;
+    p = p->next;
+  }
+  return len;
+}
+
+/**
+ * Increment the reference count of the pbuf.
+ *
+ * @param p pbuf to increase reference counter of
+ *
+ */
+void
+pbuf_ref(struct pbuf *p)
+{
+  SYS_ARCH_DECL_PROTECT(old_level);
+  /* pbuf given? */
+  if (p != NULL) {
+    SYS_ARCH_PROTECT(old_level);
+    ++(p->ref);
+    SYS_ARCH_UNPROTECT(old_level);
+  }
+}
+
+/**
+ * Concatenate two pbufs (each may be a pbuf chain) and take over
+ * the caller's reference of the tail pbuf.
+ * 
+ * @note The caller MAY NOT reference the tail pbuf afterwards.
+ * Use pbuf_chain() for that purpose.
+ * 
+ * @see pbuf_chain()
+ */
+
+void
+pbuf_cat(struct pbuf *h, struct pbuf *t)
+{
+  struct pbuf *p;
+
+  LWIP_ERROR("(h != NULL) && (t != NULL) (programmer violates API)",
+             ((h != NULL) && (t != NULL)), return;);
+
+  /* proceed to last pbuf of chain */
+  for (p = h; p->next != NULL; p = p->next) {
+    /* add total length of second chain to all totals of first chain */
+    p->tot_len += t->tot_len;
+  }
+  /* { p is last pbuf of first h chain, p->next == NULL } */
+  LWIP_ASSERT("p->tot_len == p->len (of last pbuf in chain)", p->tot_len == p->len);
+  LWIP_ASSERT("p->next == NULL", p->next == NULL);
+  /* add total length of second chain to last pbuf total of first chain */
+  p->tot_len += t->tot_len;
+  /* chain last pbuf of head (p) with first of tail (t) */
+  p->next = t;
+  /* p->next now references t, but the caller will drop its reference to t,
+   * so netto there is no change to the reference count of t.
+   */
+}
+
+/**
+ * Chain two pbufs (or pbuf chains) together.
+ * 
+ * The caller MUST call pbuf_free(t) once it has stopped
+ * using it. Use pbuf_cat() instead if you no longer use t.
+ * 
+ * @param h head pbuf (chain)
+ * @param t tail pbuf (chain)
+ * @note The pbufs MUST belong to the same packet.
+ * @note MAY NOT be called on a packet queue.
+ *
+ * The ->tot_len fields of all pbufs of the head chain are adjusted.
+ * The ->next field of the last pbuf of the head chain is adjusted.
+ * The ->ref field of the first pbuf of the tail chain is adjusted.
+ *
+ */
+void
+pbuf_chain(struct pbuf *h, struct pbuf *t)
+{
+  pbuf_cat(h, t);
+  /* t is now referenced by h */
+  pbuf_ref(t);
+  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_chain: %p references %p\n", (void *)h, (void *)t));
+}
+
+/**
+ * Dechains the first pbuf from its succeeding pbufs in the chain.
+ *
+ * Makes p->tot_len field equal to p->len.
+ * @param p pbuf to dechain
+ * @return remainder of the pbuf chain, or NULL if it was de-allocated.
+ * @note May not be called on a packet queue.
+ */
+struct pbuf *
+pbuf_dechain(struct pbuf *p)
+{
+  struct pbuf *q;
+  u8_t tail_gone = 1;
+  /* tail */
+  q = p->next;
+  /* pbuf has successor in chain? */
+  if (q != NULL) {
+    /* assert tot_len invariant: (p->tot_len == p->len + (p->next? p->next->tot_len: 0) */
+    LWIP_ASSERT("p->tot_len == p->len + q->tot_len", q->tot_len == p->tot_len - p->len);
+    /* enforce invariant if assertion is disabled */
+    q->tot_len = p->tot_len - p->len;
+    /* decouple pbuf from remainder */
+    p->next = NULL;
+    /* total length of pbuf p is its own length only */
+    p->tot_len = p->len;
+    /* q is no longer referenced by p, free it */
+    LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_dechain: unreferencing %p\n", (void *)q));
+    tail_gone = pbuf_free(q);
+    if (tail_gone > 0) {
+      LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE,
+                  ("pbuf_dechain: deallocated %p (as it is no longer referenced)\n", (void *)q));
+    }
+    /* return remaining tail or NULL if deallocated */
+  }
+  /* assert tot_len invariant: (p->tot_len == p->len + (p->next? p->next->tot_len: 0) */
+  LWIP_ASSERT("p->tot_len == p->len", p->tot_len == p->len);
+  return ((tail_gone > 0) ? NULL : q);
+}
+
+/**
+ *
+ * Create PBUF_RAM copies of pbufs.
+ *
+ * Used to queue packets on behalf of the lwIP stack, such as
+ * ARP based queueing.
+ *
+ * @note You MUST explicitly use p = pbuf_take(p);
+ *
+ * @note Only one packet is copied, no packet queue!
+ *
+ * @param p_to pbuf destination of the copy
+ * @param p_from pbuf source of the copy
+ *
+ * @return ERR_OK if pbuf was copied
+ *         ERR_ARG if one of the pbufs is NULL or p_to is not big
+ *                 enough to hold p_from
+ */
+err_t
+pbuf_copy(struct pbuf *p_to, struct pbuf *p_from)
+{
+  u16_t offset_to=0, offset_from=0, len;
+
+  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_copy(%p, %p)\n",
+    (void*)p_to, (void*)p_from));
+
+  /* is the target big enough to hold the source? */
+  LWIP_ERROR("pbuf_copy: target not big enough to hold source", ((p_to != NULL) &&
+             (p_from != NULL) && (p_to->tot_len >= p_from->tot_len)), return ERR_ARG;);
+
+  /* iterate through pbuf chain */
+  do
+  {
+    /* copy one part of the original chain */
+    if ((p_to->len - offset_to) >= (p_from->len - offset_from)) {
+      /* complete current p_from fits into current p_to */
+      len = p_from->len - offset_from;
+    } else {
+      /* current p_from does not fit into current p_to */
+      len = p_to->len - offset_to;
+    }
+    MEMCPY((u8_t*)p_to->payload + offset_to, (u8_t*)p_from->payload + offset_from, len);
+    offset_to += len;
+    offset_from += len;
+    LWIP_ASSERT("offset_to <= p_to->len", offset_to <= p_to->len);
+    LWIP_ASSERT("offset_from <= p_from->len", offset_from <= p_from->len);
+    if (offset_from >= p_from->len) {
+      /* on to next p_from (if any) */
+      offset_from = 0;
+      p_from = p_from->next;
+    }
+    if (offset_to == p_to->len) {
+      /* on to next p_to (if any) */
+      offset_to = 0;
+      p_to = p_to->next;
+      LWIP_ERROR("p_to != NULL", (p_to != NULL) || (p_from == NULL) , return ERR_ARG;);
+    }
+
+    if((p_from != NULL) && (p_from->len == p_from->tot_len)) {
+      /* don't copy more than one packet! */
+      LWIP_ERROR("pbuf_copy() does not allow packet queues!\n",
+                 (p_from->next == NULL), return ERR_VAL;);
+    }
+    if((p_to != NULL) && (p_to->len == p_to->tot_len)) {
+      /* don't copy more than one packet! */
+      LWIP_ERROR("pbuf_copy() does not allow packet queues!\n",
+                  (p_to->next == NULL), return ERR_VAL;);
+    }
+  } while (p_from);
+  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_copy: end of chain reached.\n"));
+  return ERR_OK;
+}
+
+/**
+ * Copy (part of) the contents of a packet buffer
+ * to an application supplied buffer.
+ *
+ * @param buf the pbuf from which to copy data
+ * @param dataptr the application supplied buffer
+ * @param len length of data to copy (dataptr must be big enough). No more 
+ * than buf->tot_len will be copied, irrespective of len
+ * @param offset offset into the packet buffer from where to begin copying len bytes
+ * @return the number of bytes copied, or 0 on failure
+ */
+u16_t
+pbuf_copy_partial(struct pbuf *buf, void *dataptr, u16_t len, u16_t offset)
+{
+  struct pbuf *p;
+  u16_t left;
+  u16_t buf_copy_len;
+  u16_t copied_total = 0;
+
+  LWIP_ERROR("pbuf_copy_partial: invalid buf", (buf != NULL), return 0;);
+  LWIP_ERROR("pbuf_copy_partial: invalid dataptr", (dataptr != NULL), return 0;);
+
+  left = 0;
+
+  if((buf == NULL) || (dataptr == NULL)) {
+    return 0;
+  }
+
+  /* Note some systems use byte copy if dataptr or one of the pbuf payload pointers are unaligned. */
+  for(p = buf; len != 0 && p != NULL; p = p->next) {
+    if ((offset != 0) && (offset >= p->len)) {
+      /* don't copy from this buffer -> on to the next */
+      offset -= p->len;
+    } else {
+      /* copy from this buffer. maybe only partially. */
+      buf_copy_len = p->len - offset;
+      if (buf_copy_len > len)
+          buf_copy_len = len;
+      /* copy the necessary parts of the buffer */
+      MEMCPY(&((char*)dataptr)[left], &((char*)p->payload)[offset], buf_copy_len);
+      copied_total += buf_copy_len;
+      left += buf_copy_len;
+      len -= buf_copy_len;
+      offset = 0;
+    }
+  }
+  return copied_total;
+}
+
+/**
+ * Copy application supplied data into a pbuf.
+ * This function can only be used to copy the equivalent of buf->tot_len data.
+ *
+ * @param buf pbuf to fill with data
+ * @param dataptr application supplied data buffer
+ * @param len length of the application supplied data buffer
+ *
+ * @return ERR_OK if successful, ERR_MEM if the pbuf is not big enough
+ */
+err_t
+pbuf_take(struct pbuf *buf, const void *dataptr, u16_t len)
+{
+  struct pbuf *p;
+  u16_t buf_copy_len;
+  u16_t total_copy_len = len;
+  u16_t copied_total = 0;
+
+  LWIP_ERROR("pbuf_take: invalid buf", (buf != NULL), return 0;);
+  LWIP_ERROR("pbuf_take: invalid dataptr", (dataptr != NULL), return 0;);
+
+  if ((buf == NULL) || (dataptr == NULL) || (buf->tot_len < len)) {
+    return ERR_ARG;
+  }
+
+  /* Note some systems use byte copy if dataptr or one of the pbuf payload pointers are unaligned. */
+  for(p = buf; total_copy_len != 0; p = p->next) {
+    LWIP_ASSERT("pbuf_take: invalid pbuf", p != NULL);
+    buf_copy_len = total_copy_len;
+    if (buf_copy_len > p->len) {
+      /* this pbuf cannot hold all remaining data */
+      buf_copy_len = p->len;
+    }
+    /* copy the necessary parts of the buffer */
+    MEMCPY(p->payload, &((char*)dataptr)[copied_total], buf_copy_len);
+    total_copy_len -= buf_copy_len;
+    copied_total += buf_copy_len;
+  }
+  LWIP_ASSERT("did not copy all data", total_copy_len == 0 && copied_total == len);
+  return ERR_OK;
+}
+
+/**
+ * Creates a single pbuf out of a queue of pbufs.
+ *
+ * @remark: Either the source pbuf 'p' is freed by this function or the original
+ *          pbuf 'p' is returned, therefore the caller has to check the result!
+ *
+ * @param p the source pbuf
+ * @param layer pbuf_layer of the new pbuf
+ *
+ * @return a new, single pbuf (p->next is NULL)
+ *         or the old pbuf if allocation fails
+ */
+struct pbuf*
+pbuf_coalesce(struct pbuf *p, pbuf_layer layer)
+{
+  struct pbuf *q;
+  err_t err;
+  if (p->next == NULL) {
+    return p;
+  }
+  q = pbuf_alloc(layer, p->tot_len, PBUF_RAM);
+  if (q == NULL) {
+    /* @todo: what do we do now? */
+    return p;
+  }
+  err = pbuf_copy(q, p);
+  LWIP_ASSERT("pbuf_copy failed", err == ERR_OK);
+  pbuf_free(p);
+  return q;
+}
+
+#if LWIP_CHECKSUM_ON_COPY
+/**
+ * Copies data into a single pbuf (*not* into a pbuf queue!) and updates
+ * the checksum while copying
+ *
+ * @param p the pbuf to copy data into
+ * @param start_offset offset of p->payload where to copy the data to
+ * @param dataptr data to copy into the pbuf
+ * @param len length of data to copy into the pbuf
+ * @param chksum pointer to the checksum which is updated
+ * @return ERR_OK if successful, another error if the data does not fit
+ *         within the (first) pbuf (no pbuf queues!)
+ */
+err_t
+pbuf_fill_chksum(struct pbuf *p, u16_t start_offset, const void *dataptr,
+                 u16_t len, u16_t *chksum)
+{
+  u32_t acc;
+  u16_t copy_chksum;
+  char *dst_ptr;
+  LWIP_ASSERT("p != NULL", p != NULL);
+  LWIP_ASSERT("dataptr != NULL", dataptr != NULL);
+  LWIP_ASSERT("chksum != NULL", chksum != NULL);
+  LWIP_ASSERT("len != 0", len != 0);
+
+  if ((start_offset >= p->len) || (start_offset + len > p->len)) {
+    return ERR_ARG;
+  }
+
+  dst_ptr = ((char*)p->payload) + start_offset;
+  copy_chksum = LWIP_CHKSUM_COPY(dst_ptr, dataptr, len);
+  if ((start_offset & 1) != 0) {
+    copy_chksum = SWAP_BYTES_IN_WORD(copy_chksum);
+  }
+  acc = *chksum;
+  acc += copy_chksum;
+  *chksum = FOLD_U32T(acc);
+  return ERR_OK;
+}
+#endif /* LWIP_CHECKSUM_ON_COPY */
+
+ /** Get one byte from the specified position in a pbuf
+ * WARNING: returns zero for offset >= p->tot_len
+ *
+ * @param p pbuf to parse
+ * @param offset offset into p of the byte to return
+ * @return byte at an offset into p OR ZERO IF 'offset' >= p->tot_len
+ */
+u8_t
+pbuf_get_at(struct pbuf* p, u16_t offset)
+{
+  u16_t copy_from = offset;
+  struct pbuf* q = p;
+
+  /* get the correct pbuf */
+  while ((q != NULL) && (q->len <= copy_from)) {
+    copy_from -= q->len;
+    q = q->next;
+  }
+  /* return requested data if pbuf is OK */
+  if ((q != NULL) && (q->len > copy_from)) {
+    return ((u8_t*)q->payload)[copy_from];
+  }
+  return 0;
+}
+
+/** Compare pbuf contents at specified offset with memory s2, both of length n
+ *
+ * @param p pbuf to compare
+ * @param offset offset into p at wich to start comparing
+ * @param s2 buffer to compare
+ * @param n length of buffer to compare
+ * @return zero if equal, nonzero otherwise
+ *         (0xffff if p is too short, diffoffset+1 otherwise)
+ */
+u16_t
+pbuf_memcmp(struct pbuf* p, u16_t offset, const void* s2, u16_t n)
+{
+  u16_t start = offset;
+  struct pbuf* q = p;
+
+  /* get the correct pbuf */
+  while ((q != NULL) && (q->len <= start)) {
+    start -= q->len;
+    q = q->next;
+  }
+  /* return requested data if pbuf is OK */
+  if ((q != NULL) && (q->len > start)) {
+    u16_t i;
+    for(i = 0; i < n; i++) {
+      u8_t a = pbuf_get_at(q, start + i);
+      u8_t b = ((u8_t*)s2)[i];
+      if (a != b) {
+        return i+1;
+      }
+    }
+    return 0;
+  }
+  return 0xffff;
+}
+
+/** Find occurrence of mem (with length mem_len) in pbuf p, starting at offset
+ * start_offset.
+ *
+ * @param p pbuf to search, maximum length is 0xFFFE since 0xFFFF is used as
+ *        return value 'not found'
+ * @param mem search for the contents of this buffer
+ * @param mem_len length of 'mem'
+ * @param start_offset offset into p at which to start searching
+ * @return 0xFFFF if substr was not found in p or the index where it was found
+ */
+u16_t
+pbuf_memfind(struct pbuf* p, const void* mem, u16_t mem_len, u16_t start_offset)
+{
+  u16_t i;
+  u16_t max = p->tot_len - mem_len;
+  if (p->tot_len >= mem_len + start_offset) {
+    for(i = start_offset; i <= max; ) {
+      u16_t plus = pbuf_memcmp(p, i, mem, mem_len);
+      if (plus == 0) {
+        return i;
+      } else {
+        i += plus;
+      }
+    }
+  }
+  return 0xFFFF;
+}
+
+/** Find occurrence of substr with length substr_len in pbuf p, start at offset
+ * start_offset
+ * WARNING: in contrast to strstr(), this one does not stop at the first \0 in
+ * the pbuf/source string!
+ *
+ * @param p pbuf to search, maximum length is 0xFFFE since 0xFFFF is used as
+ *        return value 'not found'
+ * @param substr string to search for in p, maximum length is 0xFFFE
+ * @return 0xFFFF if substr was not found in p or the index where it was found
+ */
+u16_t
+pbuf_strstr(struct pbuf* p, const char* substr)
+{
+  size_t substr_len;
+  if ((substr == NULL) || (substr[0] == 0) || (p->tot_len == 0xFFFF)) {
+    return 0xFFFF;
+  }
+  substr_len = strlen(substr);
+  if (substr_len >= 0xFFFF) {
+    return 0xFFFF;
+  }
+  return pbuf_memfind(p, substr, (u16_t)substr_len, 0);
+}
diff --git a/ext/lwip/src/core/raw.c b/ext/lwip/src/core/raw.c
new file mode 100644
index 000000000..7160c0fbd
--- /dev/null
+++ b/ext/lwip/src/core/raw.c
@@ -0,0 +1,350 @@
+/**
+ * @file
+ * Implementation of raw protocol PCBs for low-level handling of
+ * different types of protocols besides (or overriding) those
+ * already available in lwIP.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_RAW /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/def.h"
+#include "lwip/memp.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/raw.h"
+#include "lwip/stats.h"
+#include "arch/perf.h"
+
+#include <string.h>
+
+/** The list of RAW PCBs */
+static struct raw_pcb *raw_pcbs;
+
+/**
+ * Determine if in incoming IP packet is covered by a RAW PCB
+ * and if so, pass it to a user-provided receive callback function.
+ *
+ * Given an incoming IP datagram (as a chain of pbufs) this function
+ * finds a corresponding RAW PCB and calls the corresponding receive
+ * callback function.
+ *
+ * @param p pbuf to be demultiplexed to a RAW PCB.
+ * @param inp network interface on which the datagram was received.
+ * @return - 1 if the packet has been eaten by a RAW PCB receive
+ *           callback function. The caller MAY NOT not reference the
+ *           packet any longer, and MAY NOT call pbuf_free().
+ * @return - 0 if packet is not eaten (pbuf is still referenced by the
+ *           caller).
+ *
+ */
+u8_t
+raw_input(struct pbuf *p, struct netif *inp)
+{
+  struct raw_pcb *pcb, *prev;
+  struct ip_hdr *iphdr;
+  s16_t proto;
+  u8_t eaten = 0;
+
+  LWIP_UNUSED_ARG(inp);
+
+  iphdr = (struct ip_hdr *)p->payload;
+  proto = IPH_PROTO(iphdr);
+
+  prev = NULL;
+  pcb = raw_pcbs;
+  /* loop through all raw pcbs until the packet is eaten by one */
+  /* this allows multiple pcbs to match against the packet by design */
+  while ((eaten == 0) && (pcb != NULL)) {
+    if ((pcb->protocol == proto) &&
+        (ip_addr_isany(&pcb->local_ip) ||
+         ip_addr_cmp(&(pcb->local_ip), &current_iphdr_dest))) {
+#if IP_SOF_BROADCAST_RECV
+      /* broadcast filter? */
+      if (ip_get_option(pcb, SOF_BROADCAST) || !ip_addr_isbroadcast(&current_iphdr_dest, inp))
+#endif /* IP_SOF_BROADCAST_RECV */
+      {
+        /* receive callback function available? */
+        if (pcb->recv != NULL) {
+          /* the receive callback function did not eat the packet? */
+          if (pcb->recv(pcb->recv_arg, pcb, p, ip_current_src_addr()) != 0) {
+            /* receive function ate the packet */
+            p = NULL;
+            eaten = 1;
+            if (prev != NULL) {
+            /* move the pcb to the front of raw_pcbs so that is
+               found faster next time */
+              prev->next = pcb->next;
+              pcb->next = raw_pcbs;
+              raw_pcbs = pcb;
+            }
+          }
+        }
+        /* no receive callback function was set for this raw PCB */
+      }
+      /* drop the packet */
+    }
+    prev = pcb;
+    pcb = pcb->next;
+  }
+  return eaten;
+}
+
+/**
+ * Bind a RAW PCB.
+ *
+ * @param pcb RAW PCB to be bound with a local address ipaddr.
+ * @param ipaddr local IP address to bind with. Use IP_ADDR_ANY to
+ * bind to all local interfaces.
+ *
+ * @return lwIP error code.
+ * - ERR_OK. Successful. No error occured.
+ * - ERR_USE. The specified IP address is already bound to by
+ * another RAW PCB.
+ *
+ * @see raw_disconnect()
+ */
+err_t
+raw_bind(struct raw_pcb *pcb, ip_addr_t *ipaddr)
+{
+  ip_addr_set(&pcb->local_ip, ipaddr);
+  return ERR_OK;
+}
+
+/**
+ * Connect an RAW PCB. This function is required by upper layers
+ * of lwip. Using the raw api you could use raw_sendto() instead
+ *
+ * This will associate the RAW PCB with the remote address.
+ *
+ * @param pcb RAW PCB to be connected with remote address ipaddr and port.
+ * @param ipaddr remote IP address to connect with.
+ *
+ * @return lwIP error code
+ *
+ * @see raw_disconnect() and raw_sendto()
+ */
+err_t
+raw_connect(struct raw_pcb *pcb, ip_addr_t *ipaddr)
+{
+  ip_addr_set(&pcb->remote_ip, ipaddr);
+  return ERR_OK;
+}
+
+
+/**
+ * Set the callback function for received packets that match the
+ * raw PCB's protocol and binding. 
+ * 
+ * The callback function MUST either
+ * - eat the packet by calling pbuf_free() and returning non-zero. The
+ *   packet will not be passed to other raw PCBs or other protocol layers.
+ * - not free the packet, and return zero. The packet will be matched
+ *   against further PCBs and/or forwarded to another protocol layers.
+ * 
+ * @return non-zero if the packet was free()d, zero if the packet remains
+ * available for others.
+ */
+void
+raw_recv(struct raw_pcb *pcb, raw_recv_fn recv, void *recv_arg)
+{
+  /* remember recv() callback and user data */
+  pcb->recv = recv;
+  pcb->recv_arg = recv_arg;
+}
+
+/**
+ * Send the raw IP packet to the given address. Note that actually you cannot
+ * modify the IP headers (this is inconsistent with the receive callback where
+ * you actually get the IP headers), you can only specify the IP payload here.
+ * It requires some more changes in lwIP. (there will be a raw_send() function
+ * then.)
+ *
+ * @param pcb the raw pcb which to send
+ * @param p the IP payload to send
+ * @param ipaddr the destination address of the IP packet
+ *
+ */
+err_t
+raw_sendto(struct raw_pcb *pcb, struct pbuf *p, ip_addr_t *ipaddr)
+{
+  err_t err;
+  struct netif *netif;
+  ip_addr_t *src_ip;
+  struct pbuf *q; /* q will be sent down the stack */
+  
+  LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_TRACE, ("raw_sendto\n"));
+  
+  /* not enough space to add an IP header to first pbuf in given p chain? */
+  if (pbuf_header(p, IP_HLEN)) {
+    /* allocate header in new pbuf */
+    q = pbuf_alloc(PBUF_IP, 0, PBUF_RAM);
+    /* new header pbuf could not be allocated? */
+    if (q == NULL) {
+      LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("raw_sendto: could not allocate header\n"));
+      return ERR_MEM;
+    }
+    if (p->tot_len != 0) {
+      /* chain header q in front of given pbuf p */
+      pbuf_chain(q, p);
+    }
+    /* { first pbuf q points to header pbuf } */
+    LWIP_DEBUGF(RAW_DEBUG, ("raw_sendto: added header pbuf %p before given pbuf %p\n", (void *)q, (void *)p));
+  }  else {
+    /* first pbuf q equals given pbuf */
+    q = p;
+    if(pbuf_header(q, -IP_HLEN)) {
+      LWIP_ASSERT("Can't restore header we just removed!", 0);
+      return ERR_MEM;
+    }
+  }
+
+  if ((netif = ip_route(ipaddr)) == NULL) {
+    LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_LEVEL_WARNING, ("raw_sendto: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+      ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr), ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr)));
+    /* free any temporary header pbuf allocated by pbuf_header() */
+    if (q != p) {
+      pbuf_free(q);
+    }
+    return ERR_RTE;
+  }
+
+#if IP_SOF_BROADCAST
+  /* broadcast filter? */
+  if (!ip_get_option(pcb, SOF_BROADCAST) && ip_addr_isbroadcast(ipaddr, netif)) {
+    LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_LEVEL_WARNING, ("raw_sendto: SOF_BROADCAST not enabled on pcb %p\n", (void *)pcb));
+    /* free any temporary header pbuf allocated by pbuf_header() */
+    if (q != p) {
+      pbuf_free(q);
+    }
+    return ERR_VAL;
+  }
+#endif /* IP_SOF_BROADCAST */
+
+  if (ip_addr_isany(&pcb->local_ip)) {
+    /* use outgoing network interface IP address as source address */
+    src_ip = &(netif->ip_addr);
+  } else {
+    /* use RAW PCB local IP address as source address */
+    src_ip = &(pcb->local_ip);
+  }
+
+  NETIF_SET_HWADDRHINT(netif, &pcb->addr_hint);
+  err = ip_output_if (q, src_ip, ipaddr, pcb->ttl, pcb->tos, pcb->protocol, netif);
+  NETIF_SET_HWADDRHINT(netif, NULL);
+
+  /* did we chain a header earlier? */
+  if (q != p) {
+    /* free the header */
+    pbuf_free(q);
+  }
+  return err;
+}
+
+/**
+ * Send the raw IP packet to the address given by raw_connect()
+ *
+ * @param pcb the raw pcb which to send
+ * @param p the IP payload to send
+ *
+ */
+err_t
+raw_send(struct raw_pcb *pcb, struct pbuf *p)
+{
+  return raw_sendto(pcb, p, &pcb->remote_ip);
+}
+
+/**
+ * Remove an RAW PCB.
+ *
+ * @param pcb RAW PCB to be removed. The PCB is removed from the list of
+ * RAW PCB's and the data structure is freed from memory.
+ *
+ * @see raw_new()
+ */
+void
+raw_remove(struct raw_pcb *pcb)
+{
+  struct raw_pcb *pcb2;
+  /* pcb to be removed is first in list? */
+  if (raw_pcbs == pcb) {
+    /* make list start at 2nd pcb */
+    raw_pcbs = raw_pcbs->next;
+    /* pcb not 1st in list */
+  } else {
+    for(pcb2 = raw_pcbs; pcb2 != NULL; pcb2 = pcb2->next) {
+      /* find pcb in raw_pcbs list */
+      if (pcb2->next != NULL && pcb2->next == pcb) {
+        /* remove pcb from list */
+        pcb2->next = pcb->next;
+      }
+    }
+  }
+  memp_free(MEMP_RAW_PCB, pcb);
+}
+
+/**
+ * Create a RAW PCB.
+ *
+ * @return The RAW PCB which was created. NULL if the PCB data structure
+ * could not be allocated.
+ *
+ * @param proto the protocol number of the IPs payload (e.g. IP_PROTO_ICMP)
+ *
+ * @see raw_remove()
+ */
+struct raw_pcb *
+raw_new(u8_t proto)
+{
+  struct raw_pcb *pcb;
+
+  LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_TRACE, ("raw_new\n"));
+
+  pcb = (struct raw_pcb *)memp_malloc(MEMP_RAW_PCB);
+  /* could allocate RAW PCB? */
+  if (pcb != NULL) {
+    /* initialize PCB to all zeroes */
+    memset(pcb, 0, sizeof(struct raw_pcb));
+    pcb->protocol = proto;
+    pcb->ttl = RAW_TTL;
+    pcb->next = raw_pcbs;
+    raw_pcbs = pcb;
+  }
+  return pcb;
+}
+
+#endif /* LWIP_RAW */
diff --git a/ext/lwip/src/core/snmp/asn1_dec.c b/ext/lwip/src/core/snmp/asn1_dec.c
new file mode 100644
index 000000000..1d5658207
--- /dev/null
+++ b/ext/lwip/src/core/snmp/asn1_dec.c
@@ -0,0 +1,657 @@
+/**
+ * @file
+ * Abstract Syntax Notation One (ISO 8824, 8825) decoding
+ *
+ * @todo not optimised (yet), favor correctness over speed, favor speed over size
+ */
+
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/snmp_asn1.h"
+
+/**
+ * Retrieves type field from incoming pbuf chain.
+ *
+ * @param p points to a pbuf holding an ASN1 coded type field
+ * @param ofs points to the offset within the pbuf chain of the ASN1 coded type field
+ * @param type return ASN1 type
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) decode
+ */
+err_t
+snmp_asn1_dec_type(struct pbuf *p, u16_t ofs, u8_t *type)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+      *type = *msg_ptr;
+      return ERR_OK;
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Decodes length field from incoming pbuf chain into host length.
+ *
+ * @param p points to a pbuf holding an ASN1 coded length
+ * @param ofs points to the offset within the pbuf chain of the ASN1 coded length
+ * @param octets_used returns number of octets used by the length code
+ * @param length return host order length, upto 64k
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) decode
+ */
+err_t
+snmp_asn1_dec_length(struct pbuf *p, u16_t ofs, u8_t *octets_used, u16_t *length)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+
+      if (*msg_ptr < 0x80)
+      {
+        /* primitive definite length format */
+        *octets_used = 1;
+        *length = *msg_ptr;
+        return ERR_OK;
+      }
+      else if (*msg_ptr == 0x80)
+      {
+        /* constructed indefinite length format, termination with two zero octets */
+        u8_t zeros;
+        u8_t i;
+
+        *length = 0;
+        zeros = 0;
+        while (zeros != 2)
+        {
+          i = 2;
+          while (i > 0)
+          {
+            i--;
+            (*length) += 1;
+            ofs += 1;
+            if (ofs >= plen)
+            {
+              /* next octet in next pbuf */
+              p = p->next;
+              if (p == NULL) { return ERR_ARG; }
+              msg_ptr = (u8_t*)p->payload;
+              plen += p->len;
+            }
+            else
+            {
+              /* next octet in same pbuf */
+              msg_ptr++;
+            }
+            if (*msg_ptr == 0)
+            {
+              zeros++;
+              if (zeros == 2)
+              {
+                /* stop while (i > 0) */
+                i = 0;
+              }
+            }
+            else
+            {
+              zeros = 0;
+            }
+          }
+        }
+        *octets_used = 1;
+        return ERR_OK;
+      }
+      else if (*msg_ptr == 0x81)
+      {
+        /* constructed definite length format, one octet */
+        ofs += 1;
+        if (ofs >= plen)
+        {
+          /* next octet in next pbuf */
+          p = p->next;
+          if (p == NULL) { return ERR_ARG; }
+          msg_ptr = (u8_t*)p->payload;
+        }
+        else
+        {
+          /* next octet in same pbuf */
+          msg_ptr++;
+        }
+        *length = *msg_ptr;
+        *octets_used = 2;
+        return ERR_OK;
+      }
+      else if (*msg_ptr == 0x82)
+      {
+        u8_t i;
+
+        /* constructed definite length format, two octets */
+        i = 2;
+        while (i > 0)
+        {
+          i--;
+          ofs += 1;
+          if (ofs >= plen)
+          {
+            /* next octet in next pbuf */
+            p = p->next;
+            if (p == NULL) { return ERR_ARG; }
+            msg_ptr = (u8_t*)p->payload;
+            plen += p->len;
+          }
+          else
+          {
+            /* next octet in same pbuf */
+            msg_ptr++;
+          }
+          if (i == 0)
+          {
+            /* least significant length octet */
+            *length |= *msg_ptr;
+          }
+          else
+          {
+            /* most significant length octet */
+            *length = (*msg_ptr) << 8;
+          }
+        }
+        *octets_used = 3;
+        return ERR_OK;
+      }
+      else
+      {
+        /* constructed definite length format 3..127 octets, this is too big (>64k) */
+        /**  @todo: do we need to accept inefficient codings with many leading zero's? */
+        *octets_used = 1 + ((*msg_ptr) & 0x7f);
+        return ERR_ARG;
+      }
+    }
+    p = p->next;
+  }
+
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Decodes positive integer (counter, gauge, timeticks) into u32_t.
+ *
+ * @param p points to a pbuf holding an ASN1 coded integer
+ * @param ofs points to the offset within the pbuf chain of the ASN1 coded integer
+ * @param len length of the coded integer field
+ * @param value return host order integer
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) decode
+ *
+ * @note ASN coded integers are _always_ signed. E.g. +0xFFFF is coded
+ * as 0x00,0xFF,0xFF. Note the leading sign octet. A positive value
+ * of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!!
+ */
+err_t
+snmp_asn1_dec_u32t(struct pbuf *p, u16_t ofs, u16_t len, u32_t *value)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+      if ((len > 0) && (len < 6))
+      {
+        /* start from zero */
+        *value = 0;
+        if (*msg_ptr & 0x80)
+        {
+          /* negative, expecting zero sign bit! */
+          return ERR_ARG;
+        }
+        else
+        {
+          /* positive */
+          if ((len > 1) && (*msg_ptr == 0))
+          {
+            /* skip leading "sign byte" octet 0x00 */
+            len--;
+            ofs += 1;
+            if (ofs >= plen)
+            {
+              /* next octet in next pbuf */
+              p = p->next;
+              if (p == NULL) { return ERR_ARG; }
+              msg_ptr = (u8_t*)p->payload;
+              plen += p->len;
+            }
+            else
+            {
+              /* next octet in same pbuf */
+              msg_ptr++;
+            }
+          }
+        }
+        /* OR octets with value */
+        while (len > 1)
+        {
+          len--;
+          *value |= *msg_ptr;
+          *value <<= 8;
+          ofs += 1;
+          if (ofs >= plen)
+          {
+            /* next octet in next pbuf */
+            p = p->next;
+            if (p == NULL) { return ERR_ARG; }
+            msg_ptr = (u8_t*)p->payload;
+            plen += p->len;
+          }
+          else
+          {
+            /* next octet in same pbuf */
+            msg_ptr++;
+          }
+        }
+        *value |= *msg_ptr;
+        return ERR_OK;
+      }
+      else
+      {
+        return ERR_ARG;
+      }
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Decodes integer into s32_t.
+ *
+ * @param p points to a pbuf holding an ASN1 coded integer
+ * @param ofs points to the offset within the pbuf chain of the ASN1 coded integer
+ * @param len length of the coded integer field
+ * @param value return host order integer
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) decode
+ *
+ * @note ASN coded integers are _always_ signed!
+ */
+err_t
+snmp_asn1_dec_s32t(struct pbuf *p, u16_t ofs, u16_t len, s32_t *value)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+#if BYTE_ORDER == LITTLE_ENDIAN
+  u8_t *lsb_ptr = (u8_t*)value;
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+  u8_t *lsb_ptr = (u8_t*)value + sizeof(s32_t) - 1;
+#endif
+  u8_t sign;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+      if ((len > 0) && (len < 5))
+      {
+        if (*msg_ptr & 0x80)
+        {
+          /* negative, start from -1 */
+          *value = -1;
+          sign = 1;
+        }
+        else
+        {
+          /* positive, start from 0 */
+          *value = 0;
+          sign = 0;
+        }
+        /* OR/AND octets with value */
+        while (len > 1)
+        {
+          len--;
+          if (sign)
+          {
+            *lsb_ptr &= *msg_ptr;
+            *value <<= 8;
+            *lsb_ptr |= 255;
+          }
+          else
+          {
+            *lsb_ptr |= *msg_ptr;
+            *value <<= 8;
+          }
+          ofs += 1;
+          if (ofs >= plen)
+          {
+            /* next octet in next pbuf */
+            p = p->next;
+            if (p == NULL) { return ERR_ARG; }
+            msg_ptr = (u8_t*)p->payload;
+            plen += p->len;
+          }
+          else
+          {
+            /* next octet in same pbuf */
+            msg_ptr++;
+          }
+        }
+        if (sign)
+        {
+          *lsb_ptr &= *msg_ptr;
+        }
+        else
+        {
+          *lsb_ptr |= *msg_ptr;
+        }
+        return ERR_OK;
+      }
+      else
+      {
+        return ERR_ARG;
+      }
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Decodes object identifier from incoming message into array of s32_t.
+ *
+ * @param p points to a pbuf holding an ASN1 coded object identifier
+ * @param ofs points to the offset within the pbuf chain of the ASN1 coded object identifier
+ * @param len length of the coded object identifier
+ * @param oid return object identifier struct
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) decode
+ */
+err_t
+snmp_asn1_dec_oid(struct pbuf *p, u16_t ofs, u16_t len, struct snmp_obj_id *oid)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+  s32_t *oid_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+
+      oid->len = 0;
+      oid_ptr = &oid->id[0];
+      if (len > 0)
+      {
+        /* first compressed octet */
+        if (*msg_ptr == 0x2B)
+        {
+          /* (most) common case 1.3 (iso.org) */
+          *oid_ptr = 1;
+          oid_ptr++;
+          *oid_ptr = 3;
+          oid_ptr++;
+        }
+        else if (*msg_ptr < 40)
+        {
+          *oid_ptr = 0;
+          oid_ptr++;
+          *oid_ptr = *msg_ptr;
+          oid_ptr++;
+        }
+        else if (*msg_ptr < 80)
+        {
+          *oid_ptr = 1;
+          oid_ptr++;
+          *oid_ptr = (*msg_ptr) - 40;
+          oid_ptr++;
+        }
+        else
+        {
+          *oid_ptr = 2;
+          oid_ptr++;
+          *oid_ptr = (*msg_ptr) - 80;
+          oid_ptr++;
+        }
+        oid->len = 2;
+      }
+      else
+      {
+        /* accepting zero length identifiers e.g. for
+           getnext operation. uncommon but valid */
+        return ERR_OK;
+      }
+      len--;
+      if (len > 0)
+      {
+        ofs += 1;
+        if (ofs >= plen)
+        {
+          /* next octet in next pbuf */
+          p = p->next;
+          if (p == NULL) { return ERR_ARG; }
+          msg_ptr = (u8_t*)p->payload;
+          plen += p->len;
+        }
+        else
+        {
+          /* next octet in same pbuf */
+          msg_ptr++;
+        }
+      }
+      while ((len > 0) && (oid->len < LWIP_SNMP_OBJ_ID_LEN))
+      {
+        /* sub-identifier uses multiple octets */
+        if (*msg_ptr & 0x80)
+        {
+          s32_t sub_id = 0;
+
+          while ((*msg_ptr & 0x80) && (len > 1))
+          {
+            len--;
+            sub_id = (sub_id << 7) + (*msg_ptr & ~0x80);
+            ofs += 1;
+            if (ofs >= plen)
+            {
+              /* next octet in next pbuf */
+              p = p->next;
+              if (p == NULL) { return ERR_ARG; }
+              msg_ptr = (u8_t*)p->payload;
+              plen += p->len;
+            }
+            else
+            {
+              /* next octet in same pbuf */
+              msg_ptr++;
+            }
+          }
+          if (!(*msg_ptr & 0x80) && (len > 0))
+          {
+            /* last octet sub-identifier */
+            len--;
+            sub_id = (sub_id << 7) + *msg_ptr;
+            *oid_ptr = sub_id;
+          }
+        }
+        else
+        {
+          /* !(*msg_ptr & 0x80) sub-identifier uses single octet */
+          len--;
+          *oid_ptr = *msg_ptr;
+        }
+        if (len > 0)
+        {
+          /* remaining oid bytes available ... */
+          ofs += 1;
+          if (ofs >= plen)
+          {
+            /* next octet in next pbuf */
+            p = p->next;
+            if (p == NULL) { return ERR_ARG; }
+            msg_ptr = (u8_t*)p->payload;
+            plen += p->len;
+          }
+          else
+          {
+            /* next octet in same pbuf */
+            msg_ptr++;
+          }
+        }
+        oid_ptr++;
+        oid->len++;
+      }
+      if (len == 0)
+      {
+        /* len == 0, end of oid */
+        return ERR_OK;
+      }
+      else
+      {
+        /* len > 0, oid->len == LWIP_SNMP_OBJ_ID_LEN or malformed encoding */
+        return ERR_ARG;
+      }
+
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Decodes (copies) raw data (ip-addresses, octet strings, opaque encoding)
+ * from incoming message into array.
+ *
+ * @param p points to a pbuf holding an ASN1 coded raw data
+ * @param ofs points to the offset within the pbuf chain of the ASN1 coded raw data
+ * @param len length of the coded raw data (zero is valid, e.g. empty string!)
+ * @param raw_len length of the raw return value
+ * @param raw return raw bytes
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) decode
+ */
+err_t
+snmp_asn1_dec_raw(struct pbuf *p, u16_t ofs, u16_t len, u16_t raw_len, u8_t *raw)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  if (len > 0)
+  {
+    plen = 0;
+    while (p != NULL)
+    {
+      base = plen;
+      plen += p->len;
+      if (ofs < plen)
+      {
+        msg_ptr = (u8_t*)p->payload;
+        msg_ptr += ofs - base;
+        if (raw_len >= len)
+        {
+          while (len > 1)
+          {
+            /* copy len - 1 octets */
+            len--;
+            *raw = *msg_ptr;
+            raw++;
+            ofs += 1;
+            if (ofs >= plen)
+            {
+              /* next octet in next pbuf */
+              p = p->next;
+              if (p == NULL) { return ERR_ARG; }
+              msg_ptr = (u8_t*)p->payload;
+              plen += p->len;
+            }
+            else
+            {
+              /* next octet in same pbuf */
+              msg_ptr++;
+            }
+          }
+          /* copy last octet */
+          *raw = *msg_ptr;
+          return ERR_OK;
+        }
+        else
+        {
+          /* raw_len < len, not enough dst space */
+          return ERR_ARG;
+        }
+      }
+      p = p->next;
+    }
+    /* p == NULL, ofs >= plen */
+    return ERR_ARG;
+  }
+  else
+  {
+    /* len == 0, empty string */
+    return ERR_OK;
+  }
+}
+
+#endif /* LWIP_SNMP */
diff --git a/ext/lwip/src/core/snmp/asn1_enc.c b/ext/lwip/src/core/snmp/asn1_enc.c
new file mode 100644
index 000000000..64dfc5f6e
--- /dev/null
+++ b/ext/lwip/src/core/snmp/asn1_enc.c
@@ -0,0 +1,611 @@
+/**
+ * @file
+ * Abstract Syntax Notation One (ISO 8824, 8825) encoding
+ *
+ * @todo not optimised (yet), favor correctness over speed, favor speed over size
+ */
+
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/snmp_asn1.h"
+
+/**
+ * Returns octet count for length.
+ *
+ * @param length
+ * @param octets_needed points to the return value
+ */
+void
+snmp_asn1_enc_length_cnt(u16_t length, u8_t *octets_needed)
+{
+  if (length < 0x80U)
+  {
+    *octets_needed = 1;
+  }
+  else if (length < 0x100U)
+  {
+    *octets_needed = 2;
+  }
+  else
+  {
+    *octets_needed = 3;
+  }
+}
+
+/**
+ * Returns octet count for an u32_t.
+ *
+ * @param value
+ * @param octets_needed points to the return value
+ *
+ * @note ASN coded integers are _always_ signed. E.g. +0xFFFF is coded
+ * as 0x00,0xFF,0xFF. Note the leading sign octet. A positive value
+ * of 0xFFFFFFFF is preceded with 0x00 and the length is 5 octets!!
+ */
+void
+snmp_asn1_enc_u32t_cnt(u32_t value, u16_t *octets_needed)
+{
+  if (value < 0x80UL)
+  {
+    *octets_needed = 1;
+  }
+  else if (value < 0x8000UL)
+  {
+    *octets_needed = 2;
+  }
+  else if (value < 0x800000UL)
+  {
+    *octets_needed = 3;
+  }
+  else if (value < 0x80000000UL)
+  {
+    *octets_needed = 4;
+  }
+  else
+  {
+    *octets_needed = 5;
+  }
+}
+
+/**
+ * Returns octet count for an s32_t.
+ *
+ * @param value
+ * @param octets_needed points to the return value
+ *
+ * @note ASN coded integers are _always_ signed.
+ */
+void
+snmp_asn1_enc_s32t_cnt(s32_t value, u16_t *octets_needed)
+{
+  if (value < 0)
+  {
+    value = ~value;
+  }
+  if (value < 0x80L)
+  {
+    *octets_needed = 1;
+  }
+  else if (value < 0x8000L)
+  {
+    *octets_needed = 2;
+  }
+  else if (value < 0x800000L)
+  {
+    *octets_needed = 3;
+  }
+  else
+  {
+    *octets_needed = 4;
+  }
+}
+
+/**
+ * Returns octet count for an object identifier.
+ *
+ * @param ident_len object identifier array length
+ * @param ident points to object identifier array
+ * @param octets_needed points to the return value
+ */
+void
+snmp_asn1_enc_oid_cnt(u8_t ident_len, s32_t *ident, u16_t *octets_needed)
+{
+  s32_t sub_id;
+  u8_t cnt;
+
+  cnt = 0;
+  if (ident_len > 1)
+  {
+    /* compressed prefix in one octet */
+    cnt++;
+    ident_len -= 2;
+    ident += 2;
+  }
+  while(ident_len > 0)
+  {
+    ident_len--;
+    sub_id = *ident;
+
+    sub_id >>= 7;
+    cnt++;
+    while(sub_id > 0)
+    {
+      sub_id >>= 7;
+      cnt++;
+    }
+    ident++;
+  }
+  *octets_needed = cnt;
+}
+
+/**
+ * Encodes ASN type field into a pbuf chained ASN1 msg.
+ *
+ * @param p points to output pbuf to encode value into
+ * @param ofs points to the offset within the pbuf chain
+ * @param type input ASN1 type
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) encode
+ */
+err_t
+snmp_asn1_enc_type(struct pbuf *p, u16_t ofs, u8_t type)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+      *msg_ptr = type;
+      return ERR_OK;
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Encodes host order length field into a pbuf chained ASN1 msg.
+ *
+ * @param p points to output pbuf to encode length into
+ * @param ofs points to the offset within the pbuf chain
+ * @param length is the host order length to be encoded
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) encode
+ */
+err_t
+snmp_asn1_enc_length(struct pbuf *p, u16_t ofs, u16_t length)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+
+      if (length < 0x80)
+      {
+        *msg_ptr = (u8_t)length;
+        return ERR_OK;
+      }
+      else if (length < 0x100)
+      {
+        *msg_ptr = 0x81;
+        ofs += 1;
+        if (ofs >= plen)
+        {
+          /* next octet in next pbuf */
+          p = p->next;
+          if (p == NULL) { return ERR_ARG; }
+          msg_ptr = (u8_t*)p->payload;
+        }
+        else
+        {
+          /* next octet in same pbuf */
+          msg_ptr++;
+        }
+        *msg_ptr = (u8_t)length;
+        return ERR_OK;
+      }
+      else
+      {
+        u8_t i;
+
+        /* length >= 0x100 && length <= 0xFFFF */
+        *msg_ptr = 0x82;
+        i = 2;
+        while (i > 0)
+        {
+          i--;
+          ofs += 1;
+          if (ofs >= plen)
+          {
+            /* next octet in next pbuf */
+            p = p->next;
+            if (p == NULL) { return ERR_ARG; }
+            msg_ptr = (u8_t*)p->payload;
+            plen += p->len;
+          }
+          else
+          {
+            /* next octet in same pbuf */
+            msg_ptr++;
+          }
+          if (i == 0)
+          {
+            /* least significant length octet */
+            *msg_ptr = (u8_t)length;
+          }
+          else
+          {
+            /* most significant length octet */
+            *msg_ptr = (u8_t)(length >> 8);
+          }
+        }
+        return ERR_OK;
+      }
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Encodes u32_t (counter, gauge, timeticks) into a pbuf chained ASN1 msg.
+ *
+ * @param p points to output pbuf to encode value into
+ * @param ofs points to the offset within the pbuf chain
+ * @param octets_needed encoding length (from snmp_asn1_enc_u32t_cnt())
+ * @param value is the host order u32_t value to be encoded
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) encode
+ *
+ * @see snmp_asn1_enc_u32t_cnt()
+ */
+err_t
+snmp_asn1_enc_u32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, u32_t value)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+
+      if (octets_needed == 5)
+      {
+        /* not enough bits in 'value' add leading 0x00 */
+        octets_needed--;
+        *msg_ptr = 0x00;
+        ofs += 1;
+        if (ofs >= plen)
+        {
+          /* next octet in next pbuf */
+          p = p->next;
+          if (p == NULL) { return ERR_ARG; }
+          msg_ptr = (u8_t*)p->payload;
+          plen += p->len;
+        }
+        else
+        {
+          /* next octet in same pbuf */
+          msg_ptr++;
+        }
+      }
+      while (octets_needed > 1)
+      {
+        octets_needed--;
+        *msg_ptr = (u8_t)(value >> (octets_needed << 3));
+        ofs += 1;
+        if (ofs >= plen)
+        {
+          /* next octet in next pbuf */
+          p = p->next;
+          if (p == NULL) { return ERR_ARG; }
+          msg_ptr = (u8_t*)p->payload;
+          plen += p->len;
+        }
+        else
+        {
+          /* next octet in same pbuf */
+          msg_ptr++;
+        }
+      }
+      /* (only) one least significant octet */
+      *msg_ptr = (u8_t)value;
+      return ERR_OK;
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Encodes s32_t integer into a pbuf chained ASN1 msg.
+ *
+ * @param p points to output pbuf to encode value into
+ * @param ofs points to the offset within the pbuf chain
+ * @param octets_needed encoding length (from snmp_asn1_enc_s32t_cnt())
+ * @param value is the host order s32_t value to be encoded
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) encode
+ *
+ * @see snmp_asn1_enc_s32t_cnt()
+ */
+err_t
+snmp_asn1_enc_s32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, s32_t value)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+
+      while (octets_needed > 1)
+      {
+        octets_needed--;
+        *msg_ptr = (u8_t)(value >> (octets_needed << 3));
+        ofs += 1;
+        if (ofs >= plen)
+        {
+          /* next octet in next pbuf */
+          p = p->next;
+          if (p == NULL) { return ERR_ARG; }
+          msg_ptr = (u8_t*)p->payload;
+          plen += p->len;
+        }
+        else
+        {
+          /* next octet in same pbuf */
+          msg_ptr++;
+        }
+      }
+      /* (only) one least significant octet */
+      *msg_ptr = (u8_t)value;
+      return ERR_OK;
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Encodes object identifier into a pbuf chained ASN1 msg.
+ *
+ * @param p points to output pbuf to encode oid into
+ * @param ofs points to the offset within the pbuf chain
+ * @param ident_len object identifier array length
+ * @param ident points to object identifier array
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) encode
+ */
+err_t
+snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, s32_t *ident)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+
+      if (ident_len > 1)
+      {
+        if ((ident[0] == 1) && (ident[1] == 3))
+        {
+          /* compressed (most common) prefix .iso.org */
+          *msg_ptr = 0x2b;
+        }
+        else
+        {
+          /* calculate prefix */
+          *msg_ptr = (u8_t)((ident[0] * 40) + ident[1]);
+        }
+        ofs += 1;
+        if (ofs >= plen)
+        {
+          /* next octet in next pbuf */
+          p = p->next;
+          if (p == NULL) { return ERR_ARG; }
+          msg_ptr = (u8_t*)p->payload;
+          plen += p->len;
+        }
+        else
+        {
+          /* next octet in same pbuf */
+          msg_ptr++;
+        }
+        ident_len -= 2;
+        ident += 2;
+      }
+      else
+      {
+/* @bug:  allow empty varbinds for symmetry (we must decode them for getnext), allow partial compression??  */
+        /* ident_len <= 1, at least we need zeroDotZero (0.0) (ident_len == 2) */
+        return ERR_ARG;
+      }
+      while (ident_len > 0)
+      {
+        s32_t sub_id;
+        u8_t shift, tail;
+
+        ident_len--;
+        sub_id = *ident;
+        tail = 0;
+        shift = 28;
+        while(shift > 0)
+        {
+          u8_t code;
+
+          code = (u8_t)(sub_id >> shift);
+          if ((code != 0) || (tail != 0))
+          {
+            tail = 1;
+            *msg_ptr = code | 0x80;
+            ofs += 1;
+            if (ofs >= plen)
+            {
+              /* next octet in next pbuf */
+              p = p->next;
+              if (p == NULL) { return ERR_ARG; }
+              msg_ptr = (u8_t*)p->payload;
+              plen += p->len;
+            }
+            else
+            {
+              /* next octet in same pbuf */
+              msg_ptr++;
+            }
+          }
+          shift -= 7;
+        }
+        *msg_ptr = (u8_t)sub_id & 0x7F;
+        if (ident_len > 0)
+        {
+          ofs += 1;
+          if (ofs >= plen)
+          {
+            /* next octet in next pbuf */
+            p = p->next;
+            if (p == NULL) { return ERR_ARG; }
+            msg_ptr = (u8_t*)p->payload;
+            plen += p->len;
+          }
+          else
+          {
+            /* next octet in same pbuf */
+            msg_ptr++;
+          }
+        }
+        /* proceed to next sub-identifier */
+        ident++;
+      }
+      return ERR_OK;
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+/**
+ * Encodes raw data (octet string, opaque) into a pbuf chained ASN1 msg.
+ *
+ * @param p points to output pbuf to encode raw data into
+ * @param ofs points to the offset within the pbuf chain
+ * @param raw_len raw data length
+ * @param raw points raw data
+ * @return ERR_OK if successfull, ERR_ARG if we can't (or won't) encode
+ */
+err_t
+snmp_asn1_enc_raw(struct pbuf *p, u16_t ofs, u16_t raw_len, u8_t *raw)
+{
+  u16_t plen, base;
+  u8_t *msg_ptr;
+
+  plen = 0;
+  while (p != NULL)
+  {
+    base = plen;
+    plen += p->len;
+    if (ofs < plen)
+    {
+      msg_ptr = (u8_t*)p->payload;
+      msg_ptr += ofs - base;
+
+      while (raw_len > 1)
+      {
+        /* copy raw_len - 1 octets */
+        raw_len--;
+        *msg_ptr = *raw;
+        raw++;
+        ofs += 1;
+        if (ofs >= plen)
+        {
+          /* next octet in next pbuf */
+          p = p->next;
+          if (p == NULL) { return ERR_ARG; }
+          msg_ptr = (u8_t*)p->payload;
+          plen += p->len;
+        }
+        else
+        {
+          /* next octet in same pbuf */
+          msg_ptr++;
+        }
+      }
+      if (raw_len > 0)
+      {
+        /* copy last or single octet */
+        *msg_ptr = *raw;
+      }
+      return ERR_OK;
+    }
+    p = p->next;
+  }
+  /* p == NULL, ofs >= plen */
+  return ERR_ARG;
+}
+
+#endif /* LWIP_SNMP */
diff --git a/ext/lwip/src/core/snmp/mib2.c b/ext/lwip/src/core/snmp/mib2.c
new file mode 100644
index 000000000..4775ba993
--- /dev/null
+++ b/ext/lwip/src/core/snmp/mib2.c
@@ -0,0 +1,4146 @@
+/**
+ * @file
+ * Management Information Base II (RFC1213) objects and functions.
+ *
+ * @note the object identifiers for this MIB-2 and private MIB tree
+ * must be kept in sorted ascending order. This to ensure correct getnext operation.
+ */
+
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/snmp.h"
+#include "lwip/netif.h"
+#include "lwip/ip.h"
+#include "lwip/ip_frag.h"
+#include "lwip/mem.h"
+#include "lwip/tcp_impl.h"
+#include "lwip/udp.h"
+#include "lwip/snmp_asn1.h"
+#include "lwip/snmp_structs.h"
+#include "lwip/sys.h"
+#include "netif/etharp.h"
+
+/**
+ * IANA assigned enterprise ID for lwIP is 26381
+ * @see http://www.iana.org/assignments/enterprise-numbers
+ *
+ * @note this enterprise ID is assigned to the lwIP project,
+ * all object identifiers living under this ID are assigned
+ * by the lwIP maintainers (contact Christiaan Simons)!
+ * @note don't change this define, use snmp_set_sysobjid()
+ *
+ * If you need to create your own private MIB you'll need
+ * to apply for your own enterprise ID with IANA:
+ * http://www.iana.org/numbers.html
+ */
+#define SNMP_ENTERPRISE_ID 26381
+#define SNMP_SYSOBJID_LEN 7
+#define SNMP_SYSOBJID {1, 3, 6, 1, 4, 1, SNMP_ENTERPRISE_ID}
+
+#ifndef SNMP_SYSSERVICES
+#define SNMP_SYSSERVICES ((1 << 6) | (1 << 3) | ((IP_FORWARD) << 2))
+#endif
+
+#ifndef SNMP_GET_SYSUPTIME
+#define SNMP_GET_SYSUPTIME(sysuptime)  (sysuptime = (sys_now() / 10))
+#endif
+
+static void system_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void system_get_value(struct obj_def *od, u16_t len, void *value);
+static u8_t system_set_test(struct obj_def *od, u16_t len, void *value);
+static void system_set_value(struct obj_def *od, u16_t len, void *value);
+static void interfaces_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void interfaces_get_value(struct obj_def *od, u16_t len, void *value);
+static void ifentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void ifentry_get_value(struct obj_def *od, u16_t len, void *value);
+#if !SNMP_SAFE_REQUESTS
+static u8_t ifentry_set_test (struct obj_def *od, u16_t len, void *value);
+static void ifentry_set_value (struct obj_def *od, u16_t len, void *value);
+#endif /* SNMP_SAFE_REQUESTS */
+static void atentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void atentry_get_value(struct obj_def *od, u16_t len, void *value);
+static void ip_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void ip_get_value(struct obj_def *od, u16_t len, void *value);
+static u8_t ip_set_test(struct obj_def *od, u16_t len, void *value);
+static void ip_addrentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void ip_addrentry_get_value(struct obj_def *od, u16_t len, void *value);
+static void ip_rteentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void ip_rteentry_get_value(struct obj_def *od, u16_t len, void *value);
+static void ip_ntomentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void ip_ntomentry_get_value(struct obj_def *od, u16_t len, void *value);
+static void icmp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void icmp_get_value(struct obj_def *od, u16_t len, void *value);
+#if LWIP_TCP
+static void tcp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void tcp_get_value(struct obj_def *od, u16_t len, void *value);
+#ifdef THIS_SEEMS_UNUSED
+static void tcpconnentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void tcpconnentry_get_value(struct obj_def *od, u16_t len, void *value);
+#endif
+#endif
+static void udp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void udp_get_value(struct obj_def *od, u16_t len, void *value);
+static void udpentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void udpentry_get_value(struct obj_def *od, u16_t len, void *value);
+static void snmp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+static void snmp_get_value(struct obj_def *od, u16_t len, void *value);
+static u8_t snmp_set_test(struct obj_def *od, u16_t len, void *value);
+static void snmp_set_value(struct obj_def *od, u16_t len, void *value);
+
+
+/* snmp .1.3.6.1.2.1.11 */
+const mib_scalar_node snmp_scalar = {
+  &snmp_get_object_def,
+  &snmp_get_value,
+  &snmp_set_test,
+  &snmp_set_value,
+  MIB_NODE_SC,
+  0
+};
+const s32_t snmp_ids[28] = {
+  1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+  17, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30
+};
+struct mib_node* const snmp_nodes[28] = {
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar,
+  (struct mib_node*)&snmp_scalar, (struct mib_node*)&snmp_scalar
+};
+const struct mib_array_node snmp = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  28,
+  snmp_ids,
+  snmp_nodes
+};
+
+/* dot3 and EtherLike MIB not planned. (transmission .1.3.6.1.2.1.10) */
+/* historical (some say hysterical). (cmot .1.3.6.1.2.1.9) */
+/* lwIP has no EGP, thus may not implement it. (egp .1.3.6.1.2.1.8) */
+
+/* udp .1.3.6.1.2.1.7 */
+/** index root node for udpTable */
+struct mib_list_rootnode udp_root = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_LR,
+  0,
+  NULL,
+  NULL,
+  0
+};
+const s32_t udpentry_ids[2] = { 1, 2 };
+struct mib_node* const udpentry_nodes[2] = {
+  (struct mib_node*)&udp_root, (struct mib_node*)&udp_root,
+};
+const struct mib_array_node udpentry = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  2,
+  udpentry_ids,
+  udpentry_nodes
+};
+
+s32_t udptable_id = 1;
+struct mib_node* udptable_node = (struct mib_node*)&udpentry;
+struct mib_ram_array_node udptable = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_RA,
+  0,
+  &udptable_id,
+  &udptable_node
+};
+
+const mib_scalar_node udp_scalar = {
+  &udp_get_object_def,
+  &udp_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_SC,
+  0
+};
+const s32_t udp_ids[5] = { 1, 2, 3, 4, 5 };
+struct mib_node* const udp_nodes[5] = {
+  (struct mib_node*)&udp_scalar, (struct mib_node*)&udp_scalar,
+  (struct mib_node*)&udp_scalar, (struct mib_node*)&udp_scalar,
+  (struct mib_node*)&udptable
+};
+const struct mib_array_node udp = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  5,
+  udp_ids,
+  udp_nodes
+};
+
+/* tcp .1.3.6.1.2.1.6 */
+#if LWIP_TCP
+/* only if the TCP protocol is available may implement this group */
+/** index root node for tcpConnTable */
+struct mib_list_rootnode tcpconntree_root = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_LR,
+  0,
+  NULL,
+  NULL,
+  0
+};
+const s32_t tcpconnentry_ids[5] = { 1, 2, 3, 4, 5 };
+struct mib_node* const tcpconnentry_nodes[5] = {
+  (struct mib_node*)&tcpconntree_root, (struct mib_node*)&tcpconntree_root,
+  (struct mib_node*)&tcpconntree_root, (struct mib_node*)&tcpconntree_root,
+  (struct mib_node*)&tcpconntree_root
+};
+const struct mib_array_node tcpconnentry = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  5,
+  tcpconnentry_ids,
+  tcpconnentry_nodes
+};
+
+s32_t tcpconntable_id = 1;
+struct mib_node* tcpconntable_node = (struct mib_node*)&tcpconnentry;
+struct mib_ram_array_node tcpconntable = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_RA,
+/** @todo update maxlength when inserting / deleting from table
+   0 when table is empty, 1 when more than one entry */
+  0,
+  &tcpconntable_id,
+  &tcpconntable_node
+};
+
+const mib_scalar_node tcp_scalar = {
+  &tcp_get_object_def,
+  &tcp_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_SC,
+  0
+};
+const s32_t tcp_ids[15] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+struct mib_node* const tcp_nodes[15] = {
+  (struct mib_node*)&tcp_scalar, (struct mib_node*)&tcp_scalar,
+  (struct mib_node*)&tcp_scalar, (struct mib_node*)&tcp_scalar,
+  (struct mib_node*)&tcp_scalar, (struct mib_node*)&tcp_scalar,
+  (struct mib_node*)&tcp_scalar, (struct mib_node*)&tcp_scalar,
+  (struct mib_node*)&tcp_scalar, (struct mib_node*)&tcp_scalar,
+  (struct mib_node*)&tcp_scalar, (struct mib_node*)&tcp_scalar,
+  (struct mib_node*)&tcpconntable, (struct mib_node*)&tcp_scalar,
+  (struct mib_node*)&tcp_scalar
+};
+const struct mib_array_node tcp = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  15,
+  tcp_ids,
+  tcp_nodes
+};
+#endif
+
+/* icmp .1.3.6.1.2.1.5 */
+const mib_scalar_node icmp_scalar = {
+  &icmp_get_object_def,
+  &icmp_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_SC,
+  0
+};
+const s32_t icmp_ids[26] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 };
+struct mib_node* const icmp_nodes[26] = {
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar,
+  (struct mib_node*)&icmp_scalar, (struct mib_node*)&icmp_scalar
+};
+const struct mib_array_node icmp = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  26,
+  icmp_ids,
+  icmp_nodes
+};
+
+/** index root node for ipNetToMediaTable */
+struct mib_list_rootnode ipntomtree_root = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_LR,
+  0,
+  NULL,
+  NULL,
+  0
+};
+const s32_t ipntomentry_ids[4] = { 1, 2, 3, 4 };
+struct mib_node* const ipntomentry_nodes[4] = {
+  (struct mib_node*)&ipntomtree_root, (struct mib_node*)&ipntomtree_root,
+  (struct mib_node*)&ipntomtree_root, (struct mib_node*)&ipntomtree_root
+};
+const struct mib_array_node ipntomentry = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  4,
+  ipntomentry_ids,
+  ipntomentry_nodes
+};
+
+s32_t ipntomtable_id = 1;
+struct mib_node* ipntomtable_node = (struct mib_node*)&ipntomentry;
+struct mib_ram_array_node ipntomtable = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_RA,
+  0,
+  &ipntomtable_id,
+  &ipntomtable_node
+};
+
+/** index root node for ipRouteTable */
+struct mib_list_rootnode iprtetree_root = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_LR,
+  0,
+  NULL,
+  NULL,
+  0
+};
+const s32_t iprteentry_ids[13] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
+struct mib_node* const iprteentry_nodes[13] = {
+  (struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root,
+  (struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root,
+  (struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root,
+  (struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root,
+  (struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root,
+  (struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root,
+  (struct mib_node*)&iprtetree_root
+};
+const struct mib_array_node iprteentry = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  13,
+  iprteentry_ids,
+  iprteentry_nodes
+};
+
+s32_t iprtetable_id = 1;
+struct mib_node* iprtetable_node = (struct mib_node*)&iprteentry;
+struct mib_ram_array_node iprtetable = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_RA,
+  0,
+  &iprtetable_id,
+  &iprtetable_node
+};
+
+/** index root node for ipAddrTable */
+struct mib_list_rootnode ipaddrtree_root = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_LR,
+  0,
+  NULL,
+  NULL,
+  0
+};
+const s32_t ipaddrentry_ids[5] = { 1, 2, 3, 4, 5 };
+struct mib_node* const ipaddrentry_nodes[5] = {
+  (struct mib_node*)&ipaddrtree_root,
+  (struct mib_node*)&ipaddrtree_root,
+  (struct mib_node*)&ipaddrtree_root,
+  (struct mib_node*)&ipaddrtree_root,
+  (struct mib_node*)&ipaddrtree_root
+};
+const struct mib_array_node ipaddrentry = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  5,
+  ipaddrentry_ids,
+  ipaddrentry_nodes
+};
+
+s32_t ipaddrtable_id = 1;
+struct mib_node* ipaddrtable_node = (struct mib_node*)&ipaddrentry;
+struct mib_ram_array_node ipaddrtable = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_RA,
+  0,
+  &ipaddrtable_id,
+  &ipaddrtable_node
+};
+
+/* ip .1.3.6.1.2.1.4 */
+const mib_scalar_node ip_scalar = {
+  &ip_get_object_def,
+  &ip_get_value,
+  &ip_set_test,
+  &noleafs_set_value,
+  MIB_NODE_SC,
+  0
+};
+const s32_t ip_ids[23] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 };
+struct mib_node* const ip_nodes[23] = {
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ip_scalar,
+  (struct mib_node*)&ip_scalar, (struct mib_node*)&ipaddrtable,
+  (struct mib_node*)&iprtetable, (struct mib_node*)&ipntomtable,
+  (struct mib_node*)&ip_scalar
+};
+const struct mib_array_node mib2_ip = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  23,
+  ip_ids,
+  ip_nodes
+};
+
+/** index root node for atTable */
+struct mib_list_rootnode arptree_root = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_LR,
+  0,
+  NULL,
+  NULL,
+  0
+};
+const s32_t atentry_ids[3] = { 1, 2, 3 };
+struct mib_node* const atentry_nodes[3] = {
+  (struct mib_node*)&arptree_root,
+  (struct mib_node*)&arptree_root,
+  (struct mib_node*)&arptree_root
+};
+const struct mib_array_node atentry = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  3,
+  atentry_ids,
+  atentry_nodes
+};
+
+const s32_t attable_id = 1;
+struct mib_node* const attable_node = (struct mib_node*)&atentry;
+const struct mib_array_node attable = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  1,
+  &attable_id,
+  &attable_node
+};
+
+/* at .1.3.6.1.2.1.3 */
+s32_t at_id = 1;
+struct mib_node* mib2_at_node = (struct mib_node*)&attable;
+struct mib_ram_array_node at = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_RA,
+  0,
+  &at_id,
+  &mib2_at_node
+};
+
+/** index root node for ifTable */
+struct mib_list_rootnode iflist_root = {
+  &ifentry_get_object_def,
+  &ifentry_get_value,
+#if SNMP_SAFE_REQUESTS
+  &noleafs_set_test,
+  &noleafs_set_value,
+#else /* SNMP_SAFE_REQUESTS */
+  &ifentry_set_test,
+  &ifentry_set_value,
+#endif /* SNMP_SAFE_REQUESTS */
+  MIB_NODE_LR,
+  0,
+  NULL,
+  NULL,
+  0
+};
+const s32_t ifentry_ids[22] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22 };
+struct mib_node* const ifentry_nodes[22] = {
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root,
+  (struct mib_node*)&iflist_root, (struct mib_node*)&iflist_root
+};
+const struct mib_array_node ifentry = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  22,
+  ifentry_ids,
+  ifentry_nodes
+};
+
+s32_t iftable_id = 1;
+struct mib_node* iftable_node = (struct mib_node*)&ifentry;
+struct mib_ram_array_node iftable = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_RA,
+  0,
+  &iftable_id,
+  &iftable_node
+};
+
+/* interfaces .1.3.6.1.2.1.2 */
+const mib_scalar_node interfaces_scalar = {
+  &interfaces_get_object_def,
+  &interfaces_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_SC,
+  0
+};
+const s32_t interfaces_ids[2] = { 1, 2 };
+struct mib_node* const interfaces_nodes[2] = {
+  (struct mib_node*)&interfaces_scalar, (struct mib_node*)&iftable
+};
+const struct mib_array_node interfaces = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  2,
+  interfaces_ids,
+  interfaces_nodes
+};
+
+
+/*             0 1 2 3 4 5 6 */
+/* system .1.3.6.1.2.1.1 */
+const mib_scalar_node sys_tem_scalar = {
+  &system_get_object_def,
+  &system_get_value,
+  &system_set_test,
+  &system_set_value,
+  MIB_NODE_SC,
+  0
+};
+const s32_t sys_tem_ids[7] = { 1, 2, 3, 4, 5, 6, 7 };
+struct mib_node* const sys_tem_nodes[7] = {
+  (struct mib_node*)&sys_tem_scalar, (struct mib_node*)&sys_tem_scalar,
+  (struct mib_node*)&sys_tem_scalar, (struct mib_node*)&sys_tem_scalar,
+  (struct mib_node*)&sys_tem_scalar, (struct mib_node*)&sys_tem_scalar,
+  (struct mib_node*)&sys_tem_scalar
+};
+/* work around name issue with 'sys_tem', some compiler(s?) seem to reserve 'system' */
+const struct mib_array_node sys_tem = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  7,
+  sys_tem_ids,
+  sys_tem_nodes
+};
+
+/* mib-2 .1.3.6.1.2.1 */
+#if LWIP_TCP
+#define MIB2_GROUPS 8
+#else
+#define MIB2_GROUPS 7
+#endif
+const s32_t mib2_ids[MIB2_GROUPS] =
+{
+  1,
+  2,
+  3,
+  4,
+  5,
+#if LWIP_TCP
+  6,
+#endif
+  7,
+  11
+};
+struct mib_node* const mib2_nodes[MIB2_GROUPS] = {
+  (struct mib_node*)&sys_tem,
+  (struct mib_node*)&interfaces,
+  (struct mib_node*)&at,
+  (struct mib_node*)&mib2_ip,
+  (struct mib_node*)&icmp,
+#if LWIP_TCP
+  (struct mib_node*)&tcp,
+#endif
+  (struct mib_node*)&udp,
+  (struct mib_node*)&snmp
+};
+
+const struct mib_array_node mib2 = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  MIB2_GROUPS,
+  mib2_ids,
+  mib2_nodes
+};
+
+/* mgmt .1.3.6.1.2 */
+const s32_t mgmt_ids[1] = { 1 };
+struct mib_node* const mgmt_nodes[1] = { (struct mib_node*)&mib2 };
+const struct mib_array_node mgmt = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  1,
+  mgmt_ids,
+  mgmt_nodes
+};
+
+/* internet .1.3.6.1 */
+#if SNMP_PRIVATE_MIB
+/* When using a private MIB, you have to create a file 'private_mib.h' that contains
+ * a 'struct mib_array_node mib_private' which contains your MIB. */
+s32_t internet_ids[2] = { 2, 4 };
+struct mib_node* const internet_nodes[2] = { (struct mib_node*)&mgmt, (struct mib_node*)&mib_private };
+const struct mib_array_node internet = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  2,
+  internet_ids,
+  internet_nodes
+};
+#else
+const s32_t internet_ids[1] = { 2 };
+struct mib_node* const internet_nodes[1] = { (struct mib_node*)&mgmt };
+const struct mib_array_node internet = {
+  &noleafs_get_object_def,
+  &noleafs_get_value,
+  &noleafs_set_test,
+  &noleafs_set_value,
+  MIB_NODE_AR,
+  1,
+  internet_ids,
+  internet_nodes
+};
+#endif
+
+/** mib-2.system.sysObjectID  */
+static struct snmp_obj_id sysobjid = {SNMP_SYSOBJID_LEN, SNMP_SYSOBJID};
+/** enterprise ID for generic TRAPs, .iso.org.dod.internet.mgmt.mib-2.snmp */
+static struct snmp_obj_id snmpgrp_id = {7,{1,3,6,1,2,1,11}};
+/** mib-2.system.sysServices */
+static const s32_t sysservices = SNMP_SYSSERVICES;
+
+/** mib-2.system.sysDescr */
+static const u8_t sysdescr_len_default = 4;
+static const u8_t sysdescr_default[] = "lwIP";
+static u8_t* sysdescr_len_ptr = (u8_t*)&sysdescr_len_default;
+static u8_t* sysdescr_ptr = (u8_t*)&sysdescr_default[0];
+/** mib-2.system.sysContact */
+static const u8_t syscontact_len_default = 0;
+static const u8_t syscontact_default[] = "";
+static u8_t* syscontact_len_ptr = (u8_t*)&syscontact_len_default;
+static u8_t* syscontact_ptr = (u8_t*)&syscontact_default[0];
+/** mib-2.system.sysName */
+static const u8_t sysname_len_default = 8;
+static const u8_t sysname_default[] = "FQDN-unk";
+static u8_t* sysname_len_ptr = (u8_t*)&sysname_len_default;
+static u8_t* sysname_ptr = (u8_t*)&sysname_default[0];
+/** mib-2.system.sysLocation */
+static const u8_t syslocation_len_default = 0;
+static const u8_t syslocation_default[] = "";
+static u8_t* syslocation_len_ptr = (u8_t*)&syslocation_len_default;
+static u8_t* syslocation_ptr = (u8_t*)&syslocation_default[0];
+/** mib-2.snmp.snmpEnableAuthenTraps */
+static const u8_t snmpenableauthentraps_default = 2; /* disabled */
+static u8_t* snmpenableauthentraps_ptr = (u8_t*)&snmpenableauthentraps_default;
+
+/** mib-2.interfaces.ifTable.ifEntry.ifSpecific (zeroDotZero) */
+static const struct snmp_obj_id ifspecific = {2, {0, 0}};
+/** mib-2.ip.ipRouteTable.ipRouteEntry.ipRouteInfo (zeroDotZero) */
+static const struct snmp_obj_id iprouteinfo = {2, {0, 0}};
+
+
+
+/* mib-2.system counter(s) */
+static u32_t sysuptime = 0;
+
+/* mib-2.ip counter(s) */
+static u32_t ipinreceives = 0,
+             ipinhdrerrors = 0,
+             ipinaddrerrors = 0,
+             ipforwdatagrams = 0,
+             ipinunknownprotos = 0,
+             ipindiscards = 0,
+             ipindelivers = 0,
+             ipoutrequests = 0,
+             ipoutdiscards = 0,
+             ipoutnoroutes = 0,
+             ipreasmreqds = 0,
+             ipreasmoks = 0,
+             ipreasmfails = 0,
+             ipfragoks = 0,
+             ipfragfails = 0,
+             ipfragcreates = 0,
+             iproutingdiscards = 0;
+/* mib-2.icmp counter(s) */
+static u32_t icmpinmsgs = 0,
+             icmpinerrors = 0,
+             icmpindestunreachs = 0,
+             icmpintimeexcds = 0,
+             icmpinparmprobs = 0,
+             icmpinsrcquenchs = 0,
+             icmpinredirects = 0,
+             icmpinechos = 0,
+             icmpinechoreps = 0,
+             icmpintimestamps = 0,
+             icmpintimestampreps = 0,
+             icmpinaddrmasks = 0,
+             icmpinaddrmaskreps = 0,
+             icmpoutmsgs = 0,
+             icmpouterrors = 0,
+             icmpoutdestunreachs = 0,
+             icmpouttimeexcds = 0,
+             icmpoutparmprobs = 0,
+             icmpoutsrcquenchs = 0,
+             icmpoutredirects = 0,
+             icmpoutechos = 0,
+             icmpoutechoreps = 0,
+             icmpouttimestamps = 0,
+             icmpouttimestampreps = 0,
+             icmpoutaddrmasks = 0,
+             icmpoutaddrmaskreps = 0;
+/* mib-2.tcp counter(s) */
+static u32_t tcpactiveopens = 0,
+             tcppassiveopens = 0,
+             tcpattemptfails = 0,
+             tcpestabresets = 0,
+             tcpinsegs = 0,
+             tcpoutsegs = 0,
+             tcpretranssegs = 0,
+             tcpinerrs = 0,
+             tcpoutrsts = 0;
+/* mib-2.udp counter(s) */
+static u32_t udpindatagrams = 0,
+             udpnoports = 0,
+             udpinerrors = 0,
+             udpoutdatagrams = 0;
+/* mib-2.snmp counter(s) */
+static u32_t snmpinpkts = 0,
+             snmpoutpkts = 0,
+             snmpinbadversions = 0,
+             snmpinbadcommunitynames = 0,
+             snmpinbadcommunityuses = 0,
+             snmpinasnparseerrs = 0,
+             snmpintoobigs = 0,
+             snmpinnosuchnames = 0,
+             snmpinbadvalues = 0,
+             snmpinreadonlys = 0,
+             snmpingenerrs = 0,
+             snmpintotalreqvars = 0,
+             snmpintotalsetvars = 0,
+             snmpingetrequests = 0,
+             snmpingetnexts = 0,
+             snmpinsetrequests = 0,
+             snmpingetresponses = 0,
+             snmpintraps = 0,
+             snmpouttoobigs = 0,
+             snmpoutnosuchnames = 0,
+             snmpoutbadvalues = 0,
+             snmpoutgenerrs = 0,
+             snmpoutgetrequests = 0,
+             snmpoutgetnexts = 0,
+             snmpoutsetrequests = 0,
+             snmpoutgetresponses = 0,
+             snmpouttraps = 0;
+
+
+
+/* prototypes of the following functions are in lwip/src/include/lwip/snmp.h */
+/**
+ * Copy octet string.
+ *
+ * @param dst points to destination
+ * @param src points to source
+ * @param n number of octets to copy.
+ */
+static void ocstrncpy(u8_t *dst, u8_t *src, u16_t n)
+{
+  u16_t i = n;
+  while (i > 0) {
+    i--;
+    *dst++ = *src++;
+  }
+}
+
+/**
+ * Copy object identifier (s32_t) array.
+ *
+ * @param dst points to destination
+ * @param src points to source
+ * @param n number of sub identifiers to copy.
+ */
+void objectidncpy(s32_t *dst, s32_t *src, u8_t n)
+{
+  u8_t i = n;
+  while(i > 0) {
+    i--;
+    *dst++ = *src++;
+  }
+}
+
+/**
+ * Initializes sysDescr pointers.
+ *
+ * @param str if non-NULL then copy str pointer
+ * @param len points to string length, excluding zero terminator
+ */
+void snmp_set_sysdesr(u8_t *str, u8_t *len)
+{
+  if (str != NULL)
+  {
+    sysdescr_ptr = str;
+    sysdescr_len_ptr = len;
+  }
+}
+
+void snmp_get_sysobjid_ptr(struct snmp_obj_id **oid)
+{
+  *oid = &sysobjid;
+}
+
+/**
+ * Initializes sysObjectID value.
+ *
+ * @param oid points to stuct snmp_obj_id to copy
+ */
+void snmp_set_sysobjid(struct snmp_obj_id *oid)
+{
+  sysobjid = *oid;
+}
+
+/**
+ * Must be called at regular 10 msec interval from a timer interrupt
+ * or signal handler depending on your runtime environment.
+ */
+void snmp_inc_sysuptime(void)
+{
+  sysuptime++;
+}
+
+void snmp_add_sysuptime(u32_t value)
+{
+  sysuptime+=value;
+}
+
+void snmp_get_sysuptime(u32_t *value)
+{
+  SNMP_GET_SYSUPTIME(sysuptime);
+  *value = sysuptime;
+}
+
+/**
+ * Initializes sysContact pointers,
+ * e.g. ptrs to non-volatile memory external to lwIP.
+ *
+ * @param ocstr if non-NULL then copy str pointer
+ * @param ocstrlen points to string length, excluding zero terminator
+ */
+void snmp_set_syscontact(u8_t *ocstr, u8_t *ocstrlen)
+{
+  if (ocstr != NULL)
+  {
+    syscontact_ptr = ocstr;
+    syscontact_len_ptr = ocstrlen;
+  }
+}
+
+/**
+ * Initializes sysName pointers,
+ * e.g. ptrs to non-volatile memory external to lwIP.
+ *
+ * @param ocstr if non-NULL then copy str pointer
+ * @param ocstrlen points to string length, excluding zero terminator
+ */
+void snmp_set_sysname(u8_t *ocstr, u8_t *ocstrlen)
+{
+  if (ocstr != NULL)
+  {
+    sysname_ptr = ocstr;
+    sysname_len_ptr = ocstrlen;
+  }
+}
+
+/**
+ * Initializes sysLocation pointers,
+ * e.g. ptrs to non-volatile memory external to lwIP.
+ *
+ * @param ocstr if non-NULL then copy str pointer
+ * @param ocstrlen points to string length, excluding zero terminator
+ */
+void snmp_set_syslocation(u8_t *ocstr, u8_t *ocstrlen)
+{
+  if (ocstr != NULL)
+  {
+    syslocation_ptr = ocstr;
+    syslocation_len_ptr = ocstrlen;
+  }
+}
+
+
+void snmp_add_ifinoctets(struct netif *ni, u32_t value)
+{
+  ni->ifinoctets += value;
+}
+
+void snmp_inc_ifinucastpkts(struct netif *ni)
+{
+  (ni->ifinucastpkts)++;
+}
+
+void snmp_inc_ifinnucastpkts(struct netif *ni)
+{
+  (ni->ifinnucastpkts)++;
+}
+
+void snmp_inc_ifindiscards(struct netif *ni)
+{
+  (ni->ifindiscards)++;
+}
+
+void snmp_add_ifoutoctets(struct netif *ni, u32_t value)
+{
+  ni->ifoutoctets += value;
+}
+
+void snmp_inc_ifoutucastpkts(struct netif *ni)
+{
+  (ni->ifoutucastpkts)++;
+}
+
+void snmp_inc_ifoutnucastpkts(struct netif *ni)
+{
+  (ni->ifoutnucastpkts)++;
+}
+
+void snmp_inc_ifoutdiscards(struct netif *ni)
+{
+  (ni->ifoutdiscards)++;
+}
+
+void snmp_inc_iflist(void)
+{
+  struct mib_list_node *if_node = NULL;
+
+  snmp_mib_node_insert(&iflist_root, iflist_root.count + 1, &if_node);
+  /* enable getnext traversal on filled table */
+  iftable.maxlength = 1;
+}
+
+void snmp_dec_iflist(void)
+{
+  snmp_mib_node_delete(&iflist_root, iflist_root.tail);
+  /* disable getnext traversal on empty table */
+  if(iflist_root.count == 0) iftable.maxlength = 0;
+}
+
+/**
+ * Inserts ARP table indexes (.xIfIndex.xNetAddress)
+ * into arp table index trees (both atTable and ipNetToMediaTable).
+ */
+void snmp_insert_arpidx_tree(struct netif *ni, ip_addr_t *ip)
+{
+  struct mib_list_rootnode *at_rn;
+  struct mib_list_node *at_node;
+  s32_t arpidx[5];
+  u8_t level, tree;
+
+  LWIP_ASSERT("ni != NULL", ni != NULL);
+  snmp_netiftoifindex(ni, &arpidx[0]);
+  snmp_iptooid(ip, &arpidx[1]);
+
+  for (tree = 0; tree < 2; tree++)
+  {
+    if (tree == 0)
+    {
+      at_rn = &arptree_root;
+    }
+    else
+    {
+      at_rn = &ipntomtree_root;
+    }
+    for (level = 0; level < 5; level++)
+    {
+      at_node = NULL;
+      snmp_mib_node_insert(at_rn, arpidx[level], &at_node);
+      if ((level != 4) && (at_node != NULL))
+      {
+        if (at_node->nptr == NULL)
+        {
+          at_rn = snmp_mib_lrn_alloc();
+          at_node->nptr = (struct mib_node*)at_rn;
+          if (at_rn != NULL)
+          {
+            if (level == 3)
+            {
+              if (tree == 0)
+              {
+                at_rn->get_object_def = atentry_get_object_def;
+                at_rn->get_value = atentry_get_value;
+              }
+              else
+              {
+                at_rn->get_object_def = ip_ntomentry_get_object_def;
+                at_rn->get_value = ip_ntomentry_get_value;
+              }
+              at_rn->set_test = noleafs_set_test;
+              at_rn->set_value = noleafs_set_value;
+            }
+          }
+          else
+          {
+            /* at_rn == NULL, malloc failure */
+            LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_arpidx_tree() insert failed, mem full"));
+            break;
+          }
+        }
+        else
+        {
+          at_rn = (struct mib_list_rootnode*)at_node->nptr;
+        }
+      }
+    }
+  }
+  /* enable getnext traversal on filled tables */
+  at.maxlength = 1;
+  ipntomtable.maxlength = 1;
+}
+
+/**
+ * Removes ARP table indexes (.xIfIndex.xNetAddress)
+ * from arp table index trees.
+ */
+void snmp_delete_arpidx_tree(struct netif *ni, ip_addr_t *ip)
+{
+  struct mib_list_rootnode *at_rn, *next, *del_rn[5];
+  struct mib_list_node *at_n, *del_n[5];
+  s32_t arpidx[5];
+  u8_t fc, tree, level, del_cnt;
+
+  snmp_netiftoifindex(ni, &arpidx[0]);
+  snmp_iptooid(ip, &arpidx[1]);
+
+  for (tree = 0; tree < 2; tree++)
+  {
+    /* mark nodes for deletion */
+    if (tree == 0)
+    {
+      at_rn = &arptree_root;
+    }
+    else
+    {
+      at_rn = &ipntomtree_root;
+    }
+    level = 0;
+    del_cnt = 0;
+    while ((level < 5) && (at_rn != NULL))
+    {
+      fc = snmp_mib_node_find(at_rn, arpidx[level], &at_n);
+      if (fc == 0)
+      {
+        /* arpidx[level] does not exist */
+        del_cnt = 0;
+        at_rn = NULL;
+      }
+      else if (fc == 1)
+      {
+        del_rn[del_cnt] = at_rn;
+        del_n[del_cnt] = at_n;
+        del_cnt++;
+        at_rn = (struct mib_list_rootnode*)(at_n->nptr);
+      }
+      else if (fc == 2)
+      {
+        /* reset delete (2 or more childs) */
+        del_cnt = 0;
+        at_rn = (struct mib_list_rootnode*)(at_n->nptr);
+      }
+      level++;
+    }
+    /* delete marked index nodes */
+    while (del_cnt > 0)
+    {
+      del_cnt--;
+
+      at_rn = del_rn[del_cnt];
+      at_n = del_n[del_cnt];
+
+      next = snmp_mib_node_delete(at_rn, at_n);
+      if (next != NULL)
+      {
+        LWIP_ASSERT("next_count == 0",next->count == 0);
+        snmp_mib_lrn_free(next);
+      }
+    }
+  }
+  /* disable getnext traversal on empty tables */
+  if(arptree_root.count == 0) at.maxlength = 0;
+  if(ipntomtree_root.count == 0) ipntomtable.maxlength = 0;
+}
+
+void snmp_inc_ipinreceives(void)
+{
+  ipinreceives++;
+}
+
+void snmp_inc_ipinhdrerrors(void)
+{
+  ipinhdrerrors++;
+}
+
+void snmp_inc_ipinaddrerrors(void)
+{
+  ipinaddrerrors++;
+}
+
+void snmp_inc_ipforwdatagrams(void)
+{
+  ipforwdatagrams++;
+}
+
+void snmp_inc_ipinunknownprotos(void)
+{
+  ipinunknownprotos++;
+}
+
+void snmp_inc_ipindiscards(void)
+{
+  ipindiscards++;
+}
+
+void snmp_inc_ipindelivers(void)
+{
+  ipindelivers++;
+}
+
+void snmp_inc_ipoutrequests(void)
+{
+  ipoutrequests++;
+}
+
+void snmp_inc_ipoutdiscards(void)
+{
+  ipoutdiscards++;
+}
+
+void snmp_inc_ipoutnoroutes(void)
+{
+  ipoutnoroutes++;
+}
+
+void snmp_inc_ipreasmreqds(void)
+{
+  ipreasmreqds++;
+}
+
+void snmp_inc_ipreasmoks(void)
+{
+  ipreasmoks++;
+}
+
+void snmp_inc_ipreasmfails(void)
+{
+  ipreasmfails++;
+}
+
+void snmp_inc_ipfragoks(void)
+{
+  ipfragoks++;
+}
+
+void snmp_inc_ipfragfails(void)
+{
+  ipfragfails++;
+}
+
+void snmp_inc_ipfragcreates(void)
+{
+  ipfragcreates++;
+}
+
+void snmp_inc_iproutingdiscards(void)
+{
+  iproutingdiscards++;
+}
+
+/**
+ * Inserts ipAddrTable indexes (.ipAdEntAddr)
+ * into index tree.
+ */
+void snmp_insert_ipaddridx_tree(struct netif *ni)
+{
+  struct mib_list_rootnode *ipa_rn;
+  struct mib_list_node *ipa_node;
+  s32_t ipaddridx[4];
+  u8_t level;
+
+  LWIP_ASSERT("ni != NULL", ni != NULL);
+  snmp_iptooid(&ni->ip_addr, &ipaddridx[0]);
+
+  level = 0;
+  ipa_rn = &ipaddrtree_root;
+  while (level < 4)
+  {
+    ipa_node = NULL;
+    snmp_mib_node_insert(ipa_rn, ipaddridx[level], &ipa_node);
+    if ((level != 3) && (ipa_node != NULL))
+    {
+      if (ipa_node->nptr == NULL)
+      {
+        ipa_rn = snmp_mib_lrn_alloc();
+        ipa_node->nptr = (struct mib_node*)ipa_rn;
+        if (ipa_rn != NULL)
+        {
+          if (level == 2)
+          {
+            ipa_rn->get_object_def = ip_addrentry_get_object_def;
+            ipa_rn->get_value = ip_addrentry_get_value;
+            ipa_rn->set_test = noleafs_set_test;
+            ipa_rn->set_value = noleafs_set_value;
+          }
+        }
+        else
+        {
+          /* ipa_rn == NULL, malloc failure */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_ipaddridx_tree() insert failed, mem full"));
+          break;
+        }
+      }
+      else
+      {
+        ipa_rn = (struct mib_list_rootnode*)ipa_node->nptr;
+      }
+    }
+    level++;
+  }
+  /* enable getnext traversal on filled table */
+  ipaddrtable.maxlength = 1;
+}
+
+/**
+ * Removes ipAddrTable indexes (.ipAdEntAddr)
+ * from index tree.
+ */
+void snmp_delete_ipaddridx_tree(struct netif *ni)
+{
+  struct mib_list_rootnode *ipa_rn, *next, *del_rn[4];
+  struct mib_list_node *ipa_n, *del_n[4];
+  s32_t ipaddridx[4];
+  u8_t fc, level, del_cnt;
+
+  LWIP_ASSERT("ni != NULL", ni != NULL);
+  snmp_iptooid(&ni->ip_addr, &ipaddridx[0]);
+
+  /* mark nodes for deletion */
+  level = 0;
+  del_cnt = 0;
+  ipa_rn = &ipaddrtree_root;
+  while ((level < 4) && (ipa_rn != NULL))
+  {
+    fc = snmp_mib_node_find(ipa_rn, ipaddridx[level], &ipa_n);
+    if (fc == 0)
+    {
+      /* ipaddridx[level] does not exist */
+      del_cnt = 0;
+      ipa_rn = NULL;
+    }
+    else if (fc == 1)
+    {
+      del_rn[del_cnt] = ipa_rn;
+      del_n[del_cnt] = ipa_n;
+      del_cnt++;
+      ipa_rn = (struct mib_list_rootnode*)(ipa_n->nptr);
+    }
+    else if (fc == 2)
+    {
+      /* reset delete (2 or more childs) */
+      del_cnt = 0;
+      ipa_rn = (struct mib_list_rootnode*)(ipa_n->nptr);
+    }
+    level++;
+  }
+  /* delete marked index nodes */
+  while (del_cnt > 0)
+  {
+    del_cnt--;
+
+    ipa_rn = del_rn[del_cnt];
+    ipa_n = del_n[del_cnt];
+
+    next = snmp_mib_node_delete(ipa_rn, ipa_n);
+    if (next != NULL)
+    {
+      LWIP_ASSERT("next_count == 0",next->count == 0);
+      snmp_mib_lrn_free(next);
+    }
+  }
+  /* disable getnext traversal on empty table */
+  if (ipaddrtree_root.count == 0) ipaddrtable.maxlength = 0;
+}
+
+/**
+ * Inserts ipRouteTable indexes (.ipRouteDest)
+ * into index tree.
+ *
+ * @param dflt non-zero for the default rte, zero for network rte
+ * @param ni points to network interface for this rte
+ *
+ * @todo record sysuptime for _this_ route when it is installed
+ *   (needed for ipRouteAge) in the netif.
+ */
+void snmp_insert_iprteidx_tree(u8_t dflt, struct netif *ni)
+{
+  u8_t insert = 0;
+  ip_addr_t dst;
+
+  if (dflt != 0)
+  {
+    /* the default route 0.0.0.0 */
+    ip_addr_set_any(&dst);
+    insert = 1;
+  }
+  else
+  {
+    /* route to the network address */
+    ip_addr_get_network(&dst, &ni->ip_addr, &ni->netmask);
+    /* exclude 0.0.0.0 network (reserved for default rte) */
+    if (!ip_addr_isany(&dst)) {
+      insert = 1;
+    }
+  }
+  if (insert)
+  {
+    struct mib_list_rootnode *iprte_rn;
+    struct mib_list_node *iprte_node;
+    s32_t iprteidx[4];
+    u8_t level;
+
+    snmp_iptooid(&dst, &iprteidx[0]);
+    level = 0;
+    iprte_rn = &iprtetree_root;
+    while (level < 4)
+    {
+      iprte_node = NULL;
+      snmp_mib_node_insert(iprte_rn, iprteidx[level], &iprte_node);
+      if ((level != 3) && (iprte_node != NULL))
+      {
+        if (iprte_node->nptr == NULL)
+        {
+          iprte_rn = snmp_mib_lrn_alloc();
+          iprte_node->nptr = (struct mib_node*)iprte_rn;
+          if (iprte_rn != NULL)
+          {
+            if (level == 2)
+            {
+              iprte_rn->get_object_def = ip_rteentry_get_object_def;
+              iprte_rn->get_value = ip_rteentry_get_value;
+              iprte_rn->set_test = noleafs_set_test;
+              iprte_rn->set_value = noleafs_set_value;
+            }
+          }
+          else
+          {
+            /* iprte_rn == NULL, malloc failure */
+            LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_iprteidx_tree() insert failed, mem full"));
+            break;
+          }
+        }
+        else
+        {
+          iprte_rn = (struct mib_list_rootnode*)iprte_node->nptr;
+        }
+      }
+      level++;
+    }
+  }
+  /* enable getnext traversal on filled table */
+  iprtetable.maxlength = 1;
+}
+
+/**
+ * Removes ipRouteTable indexes (.ipRouteDest)
+ * from index tree.
+ *
+ * @param dflt non-zero for the default rte, zero for network rte
+ * @param ni points to network interface for this rte or NULL
+ *   for default route to be removed.
+ */
+void snmp_delete_iprteidx_tree(u8_t dflt, struct netif *ni)
+{
+  u8_t del = 0;
+  ip_addr_t dst;
+
+  if (dflt != 0)
+  {
+    /* the default route 0.0.0.0 */
+    ip_addr_set_any(&dst);
+    del = 1;
+  }
+  else
+  {
+    /* route to the network address */
+    ip_addr_get_network(&dst, &ni->ip_addr, &ni->netmask);
+    /* exclude 0.0.0.0 network (reserved for default rte) */
+    if (!ip_addr_isany(&dst)) {
+      del = 1;
+    }
+  }
+  if (del)
+  {
+    struct mib_list_rootnode *iprte_rn, *next, *del_rn[4];
+    struct mib_list_node *iprte_n, *del_n[4];
+    s32_t iprteidx[4];
+    u8_t fc, level, del_cnt;
+
+    snmp_iptooid(&dst, &iprteidx[0]);
+    /* mark nodes for deletion */
+    level = 0;
+    del_cnt = 0;
+    iprte_rn = &iprtetree_root;
+    while ((level < 4) && (iprte_rn != NULL))
+    {
+      fc = snmp_mib_node_find(iprte_rn, iprteidx[level], &iprte_n);
+      if (fc == 0)
+      {
+        /* iprteidx[level] does not exist */
+        del_cnt = 0;
+        iprte_rn = NULL;
+      }
+      else if (fc == 1)
+      {
+        del_rn[del_cnt] = iprte_rn;
+        del_n[del_cnt] = iprte_n;
+        del_cnt++;
+        iprte_rn = (struct mib_list_rootnode*)(iprte_n->nptr);
+      }
+      else if (fc == 2)
+      {
+        /* reset delete (2 or more childs) */
+        del_cnt = 0;
+        iprte_rn = (struct mib_list_rootnode*)(iprte_n->nptr);
+      }
+      level++;
+    }
+    /* delete marked index nodes */
+    while (del_cnt > 0)
+    {
+      del_cnt--;
+
+      iprte_rn = del_rn[del_cnt];
+      iprte_n = del_n[del_cnt];
+
+      next = snmp_mib_node_delete(iprte_rn, iprte_n);
+      if (next != NULL)
+      {
+        LWIP_ASSERT("next_count == 0",next->count == 0);
+        snmp_mib_lrn_free(next);
+      }
+    }
+  }
+  /* disable getnext traversal on empty table */
+  if (iprtetree_root.count == 0) iprtetable.maxlength = 0;
+}
+
+
+void snmp_inc_icmpinmsgs(void)
+{
+  icmpinmsgs++;
+}
+
+void snmp_inc_icmpinerrors(void)
+{
+  icmpinerrors++;
+}
+
+void snmp_inc_icmpindestunreachs(void)
+{
+  icmpindestunreachs++;
+}
+
+void snmp_inc_icmpintimeexcds(void)
+{
+  icmpintimeexcds++;
+}
+
+void snmp_inc_icmpinparmprobs(void)
+{
+  icmpinparmprobs++;
+}
+
+void snmp_inc_icmpinsrcquenchs(void)
+{
+  icmpinsrcquenchs++;
+}
+
+void snmp_inc_icmpinredirects(void)
+{
+  icmpinredirects++;
+}
+
+void snmp_inc_icmpinechos(void)
+{
+  icmpinechos++;
+}
+
+void snmp_inc_icmpinechoreps(void)
+{
+  icmpinechoreps++;
+}
+
+void snmp_inc_icmpintimestamps(void)
+{
+  icmpintimestamps++;
+}
+
+void snmp_inc_icmpintimestampreps(void)
+{
+  icmpintimestampreps++;
+}
+
+void snmp_inc_icmpinaddrmasks(void)
+{
+  icmpinaddrmasks++;
+}
+
+void snmp_inc_icmpinaddrmaskreps(void)
+{
+  icmpinaddrmaskreps++;
+}
+
+void snmp_inc_icmpoutmsgs(void)
+{
+  icmpoutmsgs++;
+}
+
+void snmp_inc_icmpouterrors(void)
+{
+  icmpouterrors++;
+}
+
+void snmp_inc_icmpoutdestunreachs(void)
+{
+  icmpoutdestunreachs++;
+}
+
+void snmp_inc_icmpouttimeexcds(void)
+{
+  icmpouttimeexcds++;
+}
+
+void snmp_inc_icmpoutparmprobs(void)
+{
+  icmpoutparmprobs++;
+}
+
+void snmp_inc_icmpoutsrcquenchs(void)
+{
+  icmpoutsrcquenchs++;
+}
+
+void snmp_inc_icmpoutredirects(void)
+{
+  icmpoutredirects++;
+}
+
+void snmp_inc_icmpoutechos(void)
+{
+  icmpoutechos++;
+}
+
+void snmp_inc_icmpoutechoreps(void)
+{
+  icmpoutechoreps++;
+}
+
+void snmp_inc_icmpouttimestamps(void)
+{
+  icmpouttimestamps++;
+}
+
+void snmp_inc_icmpouttimestampreps(void)
+{
+  icmpouttimestampreps++;
+}
+
+void snmp_inc_icmpoutaddrmasks(void)
+{
+  icmpoutaddrmasks++;
+}
+
+void snmp_inc_icmpoutaddrmaskreps(void)
+{
+  icmpoutaddrmaskreps++;
+}
+
+void snmp_inc_tcpactiveopens(void)
+{
+  tcpactiveopens++;
+}
+
+void snmp_inc_tcppassiveopens(void)
+{
+  tcppassiveopens++;
+}
+
+void snmp_inc_tcpattemptfails(void)
+{
+  tcpattemptfails++;
+}
+
+void snmp_inc_tcpestabresets(void)
+{
+  tcpestabresets++;
+}
+
+void snmp_inc_tcpinsegs(void)
+{
+  tcpinsegs++;
+}
+
+void snmp_inc_tcpoutsegs(void)
+{
+  tcpoutsegs++;
+}
+
+void snmp_inc_tcpretranssegs(void)
+{
+  tcpretranssegs++;
+}
+
+void snmp_inc_tcpinerrs(void)
+{
+  tcpinerrs++;
+}
+
+void snmp_inc_tcpoutrsts(void)
+{
+  tcpoutrsts++;
+}
+
+void snmp_inc_udpindatagrams(void)
+{
+  udpindatagrams++;
+}
+
+void snmp_inc_udpnoports(void)
+{
+  udpnoports++;
+}
+
+void snmp_inc_udpinerrors(void)
+{
+  udpinerrors++;
+}
+
+void snmp_inc_udpoutdatagrams(void)
+{
+  udpoutdatagrams++;
+}
+
+/**
+ * Inserts udpTable indexes (.udpLocalAddress.udpLocalPort)
+ * into index tree.
+ */
+void snmp_insert_udpidx_tree(struct udp_pcb *pcb)
+{
+  struct mib_list_rootnode *udp_rn;
+  struct mib_list_node *udp_node;
+  s32_t udpidx[5];
+  u8_t level;
+
+  LWIP_ASSERT("pcb != NULL", pcb != NULL);
+  snmp_iptooid(&pcb->local_ip, &udpidx[0]);
+  udpidx[4] = pcb->local_port;
+
+  udp_rn = &udp_root;
+  for (level = 0; level < 5; level++)
+  {
+    udp_node = NULL;
+    snmp_mib_node_insert(udp_rn, udpidx[level], &udp_node);
+    if ((level != 4) && (udp_node != NULL))
+    {
+      if (udp_node->nptr == NULL)
+      {
+        udp_rn = snmp_mib_lrn_alloc();
+        udp_node->nptr = (struct mib_node*)udp_rn;
+        if (udp_rn != NULL)
+        {
+          if (level == 3)
+          {
+            udp_rn->get_object_def = udpentry_get_object_def;
+            udp_rn->get_value = udpentry_get_value;
+            udp_rn->set_test = noleafs_set_test;
+            udp_rn->set_value = noleafs_set_value;
+          }
+        }
+        else
+        {
+          /* udp_rn == NULL, malloc failure */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_insert_udpidx_tree() insert failed, mem full"));
+          break;
+        }
+      }
+      else
+      {
+        udp_rn = (struct mib_list_rootnode*)udp_node->nptr;
+      }
+    }
+  }
+  udptable.maxlength = 1;
+}
+
+/**
+ * Removes udpTable indexes (.udpLocalAddress.udpLocalPort)
+ * from index tree.
+ */
+void snmp_delete_udpidx_tree(struct udp_pcb *pcb)
+{
+  struct udp_pcb *npcb;
+  struct mib_list_rootnode *udp_rn, *next, *del_rn[5];
+  struct mib_list_node *udp_n, *del_n[5];
+  s32_t udpidx[5];
+  u8_t bindings, fc, level, del_cnt;
+
+  LWIP_ASSERT("pcb != NULL", pcb != NULL);
+  snmp_iptooid(&pcb->local_ip, &udpidx[0]);
+  udpidx[4] = pcb->local_port;
+
+  /* count PCBs for a given binding
+     (e.g. when reusing ports or for temp output PCBs) */
+  bindings = 0;
+  npcb = udp_pcbs;
+  while ((npcb != NULL))
+  {
+    if (ip_addr_cmp(&npcb->local_ip, &pcb->local_ip) &&
+        (npcb->local_port == udpidx[4]))
+    {
+      bindings++;
+    }
+    npcb = npcb->next;
+  }
+  if (bindings == 1)
+  {
+    /* selectively remove */
+    /* mark nodes for deletion */
+    level = 0;
+    del_cnt = 0;
+    udp_rn = &udp_root;
+    while ((level < 5) && (udp_rn != NULL))
+    {
+      fc = snmp_mib_node_find(udp_rn, udpidx[level], &udp_n);
+      if (fc == 0)
+      {
+        /* udpidx[level] does not exist */
+        del_cnt = 0;
+        udp_rn = NULL;
+      }
+      else if (fc == 1)
+      {
+        del_rn[del_cnt] = udp_rn;
+        del_n[del_cnt] = udp_n;
+        del_cnt++;
+        udp_rn = (struct mib_list_rootnode*)(udp_n->nptr);
+      }
+      else if (fc == 2)
+      {
+        /* reset delete (2 or more childs) */
+        del_cnt = 0;
+        udp_rn = (struct mib_list_rootnode*)(udp_n->nptr);
+      }
+      level++;
+    }
+    /* delete marked index nodes */
+    while (del_cnt > 0)
+    {
+      del_cnt--;
+
+      udp_rn = del_rn[del_cnt];
+      udp_n = del_n[del_cnt];
+
+      next = snmp_mib_node_delete(udp_rn, udp_n);
+      if (next != NULL)
+      {
+        LWIP_ASSERT("next_count == 0",next->count == 0);
+        snmp_mib_lrn_free(next);
+      }
+    }
+  }
+  /* disable getnext traversal on empty table */
+  if (udp_root.count == 0) udptable.maxlength = 0;
+}
+
+
+void snmp_inc_snmpinpkts(void)
+{
+  snmpinpkts++;
+}
+
+void snmp_inc_snmpoutpkts(void)
+{
+  snmpoutpkts++;
+}
+
+void snmp_inc_snmpinbadversions(void)
+{
+  snmpinbadversions++;
+}
+
+void snmp_inc_snmpinbadcommunitynames(void)
+{
+  snmpinbadcommunitynames++;
+}
+
+void snmp_inc_snmpinbadcommunityuses(void)
+{
+  snmpinbadcommunityuses++;
+}
+
+void snmp_inc_snmpinasnparseerrs(void)
+{
+  snmpinasnparseerrs++;
+}
+
+void snmp_inc_snmpintoobigs(void)
+{
+  snmpintoobigs++;
+}
+
+void snmp_inc_snmpinnosuchnames(void)
+{
+  snmpinnosuchnames++;
+}
+
+void snmp_inc_snmpinbadvalues(void)
+{
+  snmpinbadvalues++;
+}
+
+void snmp_inc_snmpinreadonlys(void)
+{
+  snmpinreadonlys++;
+}
+
+void snmp_inc_snmpingenerrs(void)
+{
+  snmpingenerrs++;
+}
+
+void snmp_add_snmpintotalreqvars(u8_t value)
+{
+  snmpintotalreqvars += value;
+}
+
+void snmp_add_snmpintotalsetvars(u8_t value)
+{
+  snmpintotalsetvars += value;
+}
+
+void snmp_inc_snmpingetrequests(void)
+{
+  snmpingetrequests++;
+}
+
+void snmp_inc_snmpingetnexts(void)
+{
+  snmpingetnexts++;
+}
+
+void snmp_inc_snmpinsetrequests(void)
+{
+  snmpinsetrequests++;
+}
+
+void snmp_inc_snmpingetresponses(void)
+{
+  snmpingetresponses++;
+}
+
+void snmp_inc_snmpintraps(void)
+{
+  snmpintraps++;
+}
+
+void snmp_inc_snmpouttoobigs(void)
+{
+  snmpouttoobigs++;
+}
+
+void snmp_inc_snmpoutnosuchnames(void)
+{
+  snmpoutnosuchnames++;
+}
+
+void snmp_inc_snmpoutbadvalues(void)
+{
+  snmpoutbadvalues++;
+}
+
+void snmp_inc_snmpoutgenerrs(void)
+{
+  snmpoutgenerrs++;
+}
+
+void snmp_inc_snmpoutgetrequests(void)
+{
+  snmpoutgetrequests++;
+}
+
+void snmp_inc_snmpoutgetnexts(void)
+{
+  snmpoutgetnexts++;
+}
+
+void snmp_inc_snmpoutsetrequests(void)
+{
+  snmpoutsetrequests++;
+}
+
+void snmp_inc_snmpoutgetresponses(void)
+{
+  snmpoutgetresponses++;
+}
+
+void snmp_inc_snmpouttraps(void)
+{
+  snmpouttraps++;
+}
+
+void snmp_get_snmpgrpid_ptr(struct snmp_obj_id **oid)
+{
+  *oid = &snmpgrp_id;
+}
+
+void snmp_set_snmpenableauthentraps(u8_t *value)
+{
+  if (value != NULL)
+  {
+    snmpenableauthentraps_ptr = value;
+  }
+}
+
+void snmp_get_snmpenableauthentraps(u8_t *value)
+{
+  *value = *snmpenableauthentraps_ptr;
+}
+
+void
+noleafs_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  LWIP_UNUSED_ARG(ident_len);
+  LWIP_UNUSED_ARG(ident);
+  od->instance = MIB_OBJECT_NONE;
+}
+
+void
+noleafs_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  LWIP_UNUSED_ARG(od);
+  LWIP_UNUSED_ARG(len);
+  LWIP_UNUSED_ARG(value);
+}
+
+u8_t
+noleafs_set_test(struct obj_def *od, u16_t len, void *value)
+{
+  LWIP_UNUSED_ARG(od);
+  LWIP_UNUSED_ARG(len);
+  LWIP_UNUSED_ARG(value);
+  /* can't set */
+  return 0;
+}
+
+void
+noleafs_set_value(struct obj_def *od, u16_t len, void *value)
+{
+  LWIP_UNUSED_ARG(od);
+  LWIP_UNUSED_ARG(len);
+  LWIP_UNUSED_ARG(value);
+}
+
+
+/**
+ * Returns systems object definitions.
+ *
+ * @param ident_len the address length (2)
+ * @param ident points to objectname.0 (object id trailer)
+ * @param od points to object definition.
+ */
+static void
+system_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  u8_t id;
+
+  /* return to object name, adding index depth (1) */
+  ident_len += 1;
+  ident -= 1;
+  if (ident_len == 2)
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("get_object_def system.%"U16_F".0\n",(u16_t)id));
+    switch (id)
+    {
+      case 1: /* sysDescr */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
+        od->v_len = *sysdescr_len_ptr;
+        break;
+      case 2: /* sysObjectID */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID);
+        od->v_len = sysobjid.len * sizeof(s32_t);
+        break;
+      case 3: /* sysUpTime */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS);
+        od->v_len = sizeof(u32_t);
+        break;
+      case 4: /* sysContact */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
+        od->v_len = *syscontact_len_ptr;
+        break;
+      case 5: /* sysName */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
+        od->v_len = *sysname_len_ptr;
+        break;
+      case 6: /* sysLocation */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
+        od->v_len = *syslocation_len_ptr;
+        break;
+      case 7: /* sysServices */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("system_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    };
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("system_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+/**
+ * Returns system object value.
+ *
+ * @param ident_len the address length (2)
+ * @param ident points to objectname.0 (object id trailer)
+ * @param len return value space (in bytes)
+ * @param value points to (varbind) space to copy value into.
+ */
+static void
+system_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id;
+
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 1: /* sysDescr */
+      ocstrncpy((u8_t*)value, sysdescr_ptr, len);
+      break;
+    case 2: /* sysObjectID */
+      objectidncpy((s32_t*)value, (s32_t*)sysobjid.id, (u8_t)(len / sizeof(s32_t)));
+      break;
+    case 3: /* sysUpTime */
+      {
+        snmp_get_sysuptime((u32_t*)value);
+      }
+      break;
+    case 4: /* sysContact */
+      ocstrncpy((u8_t*)value, syscontact_ptr, len);
+      break;
+    case 5: /* sysName */
+      ocstrncpy((u8_t*)value, sysname_ptr, len);
+      break;
+    case 6: /* sysLocation */
+      ocstrncpy((u8_t*)value, syslocation_ptr, len);
+      break;
+    case 7: /* sysServices */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        *sint_ptr = sysservices;
+      }
+      break;
+  };
+}
+
+static u8_t
+system_set_test(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id, set_ok;
+
+  LWIP_UNUSED_ARG(value);
+  set_ok = 0;
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 4: /* sysContact */
+      if ((syscontact_ptr != syscontact_default) &&
+          (len <= 255))
+      {
+        set_ok = 1;
+      }
+      break;
+    case 5: /* sysName */
+      if ((sysname_ptr != sysname_default) &&
+          (len <= 255))
+      {
+        set_ok = 1;
+      }
+      break;
+    case 6: /* sysLocation */
+      if ((syslocation_ptr != syslocation_default) &&
+          (len <= 255))
+      {
+        set_ok = 1;
+      }
+      break;
+  };
+  return set_ok;
+}
+
+static void
+system_set_value(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id;
+
+  LWIP_ASSERT("invalid len", len <= 0xff);
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 4: /* sysContact */
+      ocstrncpy(syscontact_ptr, (u8_t*)value, len);
+      *syscontact_len_ptr = (u8_t)len;
+      break;
+    case 5: /* sysName */
+      ocstrncpy(sysname_ptr, (u8_t*)value, len);
+      *sysname_len_ptr = (u8_t)len;
+      break;
+    case 6: /* sysLocation */
+      ocstrncpy(syslocation_ptr, (u8_t*)value, len);
+      *syslocation_len_ptr = (u8_t)len;
+      break;
+  };
+}
+
+/**
+ * Returns interfaces.ifnumber object definition.
+ *
+ * @param ident_len the address length (2)
+ * @param ident points to objectname.index
+ * @param od points to object definition.
+ */
+static void
+interfaces_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (1) */
+  ident_len += 1;
+  ident -= 1;
+  if (ident_len == 2)
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    od->instance = MIB_OBJECT_SCALAR;
+    od->access = MIB_OBJECT_READ_ONLY;
+    od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+    od->v_len = sizeof(s32_t);
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("interfaces_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+/**
+ * Returns interfaces.ifnumber object value.
+ *
+ * @param ident_len the address length (2)
+ * @param ident points to objectname.0 (object id trailer)
+ * @param len return value space (in bytes)
+ * @param value points to (varbind) space to copy value into.
+ */
+static void
+interfaces_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  LWIP_UNUSED_ARG(len);
+  if (od->id_inst_ptr[0] == 1)
+  {
+    s32_t *sint_ptr = (s32_t*)value;
+    *sint_ptr = iflist_root.count;
+  }
+}
+
+/**
+ * Returns ifentry object definitions.
+ *
+ * @param ident_len the address length (2)
+ * @param ident points to objectname.index
+ * @param od points to object definition.
+ */
+static void
+ifentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  u8_t id;
+
+  /* return to object name, adding index depth (1) */
+  ident_len += 1;
+  ident -= 1;
+  if (ident_len == 2)
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("get_object_def ifentry.%"U16_F"\n",(u16_t)id));
+    switch (id)
+    {
+      case 1: /* ifIndex */
+      case 3: /* ifType */
+      case 4: /* ifMtu */
+      case 8: /* ifOperStatus */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 2: /* ifDescr */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
+        /** @todo this should be some sort of sizeof(struct netif.name) */
+        od->v_len = 2;
+        break;
+      case 5: /* ifSpeed */
+      case 21: /* ifOutQLen */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE);
+        od->v_len = sizeof(u32_t);
+        break;
+      case 6: /* ifPhysAddress */
+        {
+          struct netif *netif;
+
+          snmp_ifindextonetif(ident[1], &netif);
+          od->instance = MIB_OBJECT_TAB;
+          od->access = MIB_OBJECT_READ_ONLY;
+          od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
+          od->v_len = netif->hwaddr_len;
+        }
+        break;
+      case 7: /* ifAdminStatus */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 9: /* ifLastChange */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS);
+        od->v_len = sizeof(u32_t);
+        break;
+      case 10: /* ifInOctets */
+      case 11: /* ifInUcastPkts */
+      case 12: /* ifInNUcastPkts */
+      case 13: /* ifInDiscarts */
+      case 14: /* ifInErrors */
+      case 15: /* ifInUnkownProtos */
+      case 16: /* ifOutOctets */
+      case 17: /* ifOutUcastPkts */
+      case 18: /* ifOutNUcastPkts */
+      case 19: /* ifOutDiscarts */
+      case 20: /* ifOutErrors */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER);
+        od->v_len = sizeof(u32_t);
+        break;
+      case 22: /* ifSpecific */
+        /** @note returning zeroDotZero (0.0) no media specific MIB support */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID);
+        od->v_len = ifspecific.len * sizeof(s32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("ifentry_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    };
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("ifentry_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+/**
+ * Returns ifentry object value.
+ *
+ * @param ident_len the address length (2)
+ * @param ident points to objectname.0 (object id trailer)
+ * @param len return value space (in bytes)
+ * @param value points to (varbind) space to copy value into.
+ */
+static void
+ifentry_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  struct netif *netif;
+  u8_t id;
+
+  snmp_ifindextonetif(od->id_inst_ptr[1], &netif);
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 1: /* ifIndex */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        *sint_ptr = od->id_inst_ptr[1];
+      }
+      break;
+    case 2: /* ifDescr */
+      ocstrncpy((u8_t*)value, (u8_t*)netif->name, len);
+      break;
+    case 3: /* ifType */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        *sint_ptr = netif->link_type;
+      }
+      break;
+    case 4: /* ifMtu */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        *sint_ptr = netif->mtu;
+      }
+      break;
+    case 5: /* ifSpeed */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->link_speed;
+      }
+      break;
+    case 6: /* ifPhysAddress */
+      ocstrncpy((u8_t*)value, netif->hwaddr, len);
+      break;
+    case 7: /* ifAdminStatus */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        if (netif_is_up(netif))
+        {
+          if (netif_is_link_up(netif))
+          {
+            *sint_ptr = 1; /* up */
+          }
+          else
+          {
+            *sint_ptr = 7; /* lowerLayerDown */
+          }
+        }
+        else
+        {
+          *sint_ptr = 2; /* down */
+        }
+      }
+      break;
+    case 8: /* ifOperStatus */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        if (netif_is_up(netif))
+        {
+          *sint_ptr = 1;
+        }
+        else
+        {
+          *sint_ptr = 2;
+        }
+      }
+      break;
+    case 9: /* ifLastChange */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ts;
+      }
+      break;
+    case 10: /* ifInOctets */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ifinoctets;
+      }
+      break;
+    case 11: /* ifInUcastPkts */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ifinucastpkts;
+      }
+      break;
+    case 12: /* ifInNUcastPkts */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ifinnucastpkts;
+      }
+      break;
+    case 13: /* ifInDiscarts */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ifindiscards;
+      }
+      break;
+    case 14: /* ifInErrors */
+    case 15: /* ifInUnkownProtos */
+      /** @todo add these counters! */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = 0;
+      }
+      break;
+    case 16: /* ifOutOctets */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ifoutoctets;
+      }
+      break;
+    case 17: /* ifOutUcastPkts */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ifoutucastpkts;
+      }
+      break;
+    case 18: /* ifOutNUcastPkts */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ifoutnucastpkts;
+      }
+      break;
+    case 19: /* ifOutDiscarts */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = netif->ifoutdiscards;
+      }
+      break;
+    case 20: /* ifOutErrors */
+       /** @todo add this counter! */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = 0;
+      }
+      break;
+    case 21: /* ifOutQLen */
+      /** @todo figure out if this must be 0 (no queue) or 1? */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = 0;
+      }
+      break;
+    case 22: /* ifSpecific */
+      objectidncpy((s32_t*)value, (s32_t*)ifspecific.id, (u8_t)(len / sizeof(s32_t)));
+      break;
+  };
+}
+
+#if !SNMP_SAFE_REQUESTS
+static u8_t
+ifentry_set_test(struct obj_def *od, u16_t len, void *value)
+{
+  struct netif *netif;
+  u8_t id, set_ok;
+  LWIP_UNUSED_ARG(len);
+
+  set_ok = 0;
+  snmp_ifindextonetif(od->id_inst_ptr[1], &netif);
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 7: /* ifAdminStatus */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        if (*sint_ptr == 1 || *sint_ptr == 2)
+          set_ok = 1;
+      }
+      break;
+  }
+  return set_ok;
+}
+
+static void
+ifentry_set_value(struct obj_def *od, u16_t len, void *value)
+{
+  struct netif *netif;
+  u8_t id;
+  LWIP_UNUSED_ARG(len);
+
+  snmp_ifindextonetif(od->id_inst_ptr[1], &netif);
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 7: /* ifAdminStatus */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        if (*sint_ptr == 1)
+        {
+          netif_set_up(netif);
+        }
+        else if (*sint_ptr == 2)
+        {
+          netif_set_down(netif);
+         }
+      }
+      break;
+  }
+}
+#endif /* SNMP_SAFE_REQUESTS */
+
+/**
+ * Returns atentry object definitions.
+ *
+ * @param ident_len the address length (6)
+ * @param ident points to objectname.atifindex.atnetaddress
+ * @param od points to object definition.
+ */
+static void
+atentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (5) */
+  ident_len += 5;
+  ident -= 5;
+
+  if (ident_len == 6)
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    switch (ident[0])
+    {
+      case 1: /* atIfIndex */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 2: /* atPhysAddress */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
+        od->v_len = 6; /** @todo try to use netif::hwaddr_len */
+        break;
+      case 3: /* atNetAddress */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR);
+        od->v_len = 4;
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("atentry_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    }
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("atentry_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+atentry_get_value(struct obj_def *od, u16_t len, void *value)
+{
+#if LWIP_ARP
+  u8_t id;
+  struct eth_addr* ethaddr_ret;
+  ip_addr_t* ipaddr_ret;
+#endif /* LWIP_ARP */
+  ip_addr_t ip;
+  struct netif *netif;
+
+  LWIP_UNUSED_ARG(len);
+  LWIP_UNUSED_ARG(value);/* if !LWIP_ARP */
+
+  snmp_ifindextonetif(od->id_inst_ptr[1], &netif);
+  snmp_oidtoip(&od->id_inst_ptr[2], &ip);
+
+#if LWIP_ARP /** @todo implement a netif_find_addr */
+  if (etharp_find_addr(netif, &ip, &ethaddr_ret, &ipaddr_ret) > -1)
+  {
+    LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+    id = (u8_t)od->id_inst_ptr[0];
+    switch (id)
+    {
+      case 1: /* atIfIndex */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+          *sint_ptr = od->id_inst_ptr[1];
+        }
+        break;
+      case 2: /* atPhysAddress */
+        {
+          struct eth_addr *dst = (struct eth_addr*)value;
+
+          *dst = *ethaddr_ret;
+        }
+        break;
+      case 3: /* atNetAddress */
+        {
+          ip_addr_t *dst = (ip_addr_t*)value;
+
+          *dst = *ipaddr_ret;
+        }
+        break;
+    }
+  }
+#endif /* LWIP_ARP */
+}
+
+static void
+ip_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  u8_t id;
+
+  /* return to object name, adding index depth (1) */
+  ident_len += 1;
+  ident -= 1;
+  if (ident_len == 2)
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("get_object_def ip.%"U16_F".0\n",(u16_t)id));
+    switch (id)
+    {
+      case 1: /* ipForwarding */
+      case 2: /* ipDefaultTTL */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 3: /* ipInReceives */
+      case 4: /* ipInHdrErrors */
+      case 5: /* ipInAddrErrors */
+      case 6: /* ipForwDatagrams */
+      case 7: /* ipInUnknownProtos */
+      case 8: /* ipInDiscards */
+      case 9: /* ipInDelivers */
+      case 10: /* ipOutRequests */
+      case 11: /* ipOutDiscards */
+      case 12: /* ipOutNoRoutes */
+      case 14: /* ipReasmReqds */
+      case 15: /* ipReasmOKs */
+      case 16: /* ipReasmFails */
+      case 17: /* ipFragOKs */
+      case 18: /* ipFragFails */
+      case 19: /* ipFragCreates */
+      case 23: /* ipRoutingDiscards */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER);
+        od->v_len = sizeof(u32_t);
+        break;
+      case 13: /* ipReasmTimeout */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    };
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+ip_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id;
+
+  LWIP_UNUSED_ARG(len);
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 1: /* ipForwarding */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+#if IP_FORWARD
+        /* forwarding */
+        *sint_ptr = 1;
+#else
+        /* not-forwarding */
+        *sint_ptr = 2;
+#endif
+      }
+      break;
+    case 2: /* ipDefaultTTL */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+        *sint_ptr = IP_DEFAULT_TTL;
+      }
+      break;
+    case 3: /* ipInReceives */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipinreceives;
+      }
+      break;
+    case 4: /* ipInHdrErrors */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipinhdrerrors;
+      }
+      break;
+    case 5: /* ipInAddrErrors */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipinaddrerrors;
+      }
+      break;
+    case 6: /* ipForwDatagrams */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipforwdatagrams;
+      }
+      break;
+    case 7: /* ipInUnknownProtos */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipinunknownprotos;
+      }
+      break;
+    case 8: /* ipInDiscards */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipindiscards;
+      }
+      break;
+    case 9: /* ipInDelivers */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipindelivers;
+      }
+      break;
+    case 10: /* ipOutRequests */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipoutrequests;
+      }
+      break;
+    case 11: /* ipOutDiscards */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipoutdiscards;
+      }
+      break;
+    case 12: /* ipOutNoRoutes */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipoutnoroutes;
+      }
+      break;
+    case 13: /* ipReasmTimeout */
+      {
+        s32_t *sint_ptr = (s32_t*)value;
+#if IP_REASSEMBLY
+        *sint_ptr = IP_REASS_MAXAGE;
+#else
+        *sint_ptr = 0;
+#endif
+      }
+      break;
+    case 14: /* ipReasmReqds */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipreasmreqds;
+      }
+      break;
+    case 15: /* ipReasmOKs */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipreasmoks;
+      }
+      break;
+    case 16: /* ipReasmFails */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipreasmfails;
+      }
+      break;
+    case 17: /* ipFragOKs */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipfragoks;
+      }
+      break;
+    case 18: /* ipFragFails */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipfragfails;
+      }
+      break;
+    case 19: /* ipFragCreates */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = ipfragcreates;
+      }
+      break;
+    case 23: /* ipRoutingDiscards */
+      /** @todo can lwIP discard routes at all?? hardwire this to 0?? */
+      {
+        u32_t *uint_ptr = (u32_t*)value;
+        *uint_ptr = iproutingdiscards;
+      }
+      break;
+  };
+}
+
+/**
+ * Test ip object value before setting.
+ *
+ * @param od is the object definition
+ * @param len return value space (in bytes)
+ * @param value points to (varbind) space to copy value from.
+ *
+ * @note we allow set if the value matches the hardwired value,
+ *   otherwise return badvalue.
+ */
+static u8_t
+ip_set_test(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id, set_ok;
+  s32_t *sint_ptr = (s32_t*)value;
+
+  LWIP_UNUSED_ARG(len);
+  set_ok = 0;
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 1: /* ipForwarding */
+#if IP_FORWARD
+      /* forwarding */
+      if (*sint_ptr == 1)
+#else
+      /* not-forwarding */
+      if (*sint_ptr == 2)
+#endif
+      {
+        set_ok = 1;
+      }
+      break;
+    case 2: /* ipDefaultTTL */
+      if (*sint_ptr == IP_DEFAULT_TTL)
+      {
+        set_ok = 1;
+      }
+      break;
+  };
+  return set_ok;
+}
+
+static void
+ip_addrentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (4) */
+  ident_len += 4;
+  ident -= 4;
+
+  if (ident_len == 5)
+  {
+    u8_t id;
+
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    switch (id)
+    {
+      case 1: /* ipAdEntAddr */
+      case 3: /* ipAdEntNetMask */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR);
+        od->v_len = 4;
+        break;
+      case 2: /* ipAdEntIfIndex */
+      case 4: /* ipAdEntBcastAddr */
+      case 5: /* ipAdEntReasmMaxSize */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_addrentry_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    }
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_addrentry_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+ip_addrentry_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id;
+  u16_t ifidx;
+  ip_addr_t ip;
+  struct netif *netif = netif_list;
+
+  LWIP_UNUSED_ARG(len);
+  snmp_oidtoip(&od->id_inst_ptr[1], &ip);
+  ifidx = 0;
+  while ((netif != NULL) && !ip_addr_cmp(&ip, &netif->ip_addr))
+  {
+    netif = netif->next;
+    ifidx++;
+  }
+
+  if (netif != NULL)
+  {
+    LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+    id = (u8_t)od->id_inst_ptr[0];
+    switch (id)
+    {
+      case 1: /* ipAdEntAddr */
+        {
+          ip_addr_t *dst = (ip_addr_t*)value;
+          *dst = netif->ip_addr;
+        }
+        break;
+      case 2: /* ipAdEntIfIndex */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+          *sint_ptr = ifidx + 1;
+        }
+        break;
+      case 3: /* ipAdEntNetMask */
+        {
+          ip_addr_t *dst = (ip_addr_t*)value;
+          *dst = netif->netmask;
+        }
+        break;
+      case 4: /* ipAdEntBcastAddr */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+
+          /* lwIP oddity, there's no broadcast
+            address in the netif we can rely on */
+          *sint_ptr = IPADDR_BROADCAST & 1;
+        }
+        break;
+      case 5: /* ipAdEntReasmMaxSize */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+#if IP_REASSEMBLY
+          /* @todo The theoretical maximum is IP_REASS_MAX_PBUFS * size of the pbufs,
+           * but only if receiving one fragmented packet at a time.
+           * The current solution is to calculate for 2 simultaneous packets...
+           */
+          *sint_ptr = (IP_HLEN + ((IP_REASS_MAX_PBUFS/2) *
+            (PBUF_POOL_BUFSIZE - PBUF_LINK_HLEN - IP_HLEN)));
+#else
+          /** @todo returning MTU would be a bad thing and
+             returning a wild guess like '576' isn't good either */
+          *sint_ptr = 0;
+#endif
+        }
+        break;
+    }
+  }
+}
+
+/**
+ * @note
+ * lwIP IP routing is currently using the network addresses in netif_list.
+ * if no suitable network IP is found in netif_list, the default_netif is used.
+ */
+static void
+ip_rteentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  u8_t id;
+
+  /* return to object name, adding index depth (4) */
+  ident_len += 4;
+  ident -= 4;
+
+  if (ident_len == 5)
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    switch (id)
+    {
+      case 1: /* ipRouteDest */
+      case 7: /* ipRouteNextHop */
+      case 11: /* ipRouteMask */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR);
+        od->v_len = 4;
+        break;
+      case 2: /* ipRouteIfIndex */
+      case 3: /* ipRouteMetric1 */
+      case 4: /* ipRouteMetric2 */
+      case 5: /* ipRouteMetric3 */
+      case 6: /* ipRouteMetric4 */
+      case 8: /* ipRouteType */
+      case 10: /* ipRouteAge */
+      case 12: /* ipRouteMetric5 */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 9: /* ipRouteProto */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 13: /* ipRouteInfo */
+        /** @note returning zeroDotZero (0.0) no routing protocol specific MIB */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID);
+        od->v_len = iprouteinfo.len * sizeof(s32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_rteentry_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    }
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_rteentry_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+ip_rteentry_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  struct netif *netif;
+  ip_addr_t dest;
+  s32_t *ident;
+  u8_t id;
+
+  ident = od->id_inst_ptr;
+  snmp_oidtoip(&ident[1], &dest);
+
+  if (ip_addr_isany(&dest))
+  {
+    /* ip_route() uses default netif for default route */
+    netif = netif_default;
+  }
+  else
+  {
+    /* not using ip_route(), need exact match! */
+    netif = netif_list;
+    while ((netif != NULL) &&
+            !ip_addr_netcmp(&dest, &(netif->ip_addr), &(netif->netmask)) )
+    {
+      netif = netif->next;
+    }
+  }
+  if (netif != NULL)
+  {
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    switch (id)
+    {
+      case 1: /* ipRouteDest */
+        {
+          ip_addr_t *dst = (ip_addr_t*)value;
+
+          if (ip_addr_isany(&dest))
+          {
+            /* default rte has 0.0.0.0 dest */
+            ip_addr_set_zero(dst);
+          }
+          else
+          {
+            /* netifs have netaddress dest */
+            ip_addr_get_network(dst, &netif->ip_addr, &netif->netmask);
+          }
+        }
+        break;
+      case 2: /* ipRouteIfIndex */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+
+          snmp_netiftoifindex(netif, sint_ptr);
+        }
+        break;
+      case 3: /* ipRouteMetric1 */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+
+          if (ip_addr_isany(&dest))
+          {
+            /* default rte has metric 1 */
+            *sint_ptr = 1;
+          }
+          else
+          {
+            /* other rtes have metric 0 */
+            *sint_ptr = 0;
+          }
+        }
+        break;
+      case 4: /* ipRouteMetric2 */
+      case 5: /* ipRouteMetric3 */
+      case 6: /* ipRouteMetric4 */
+      case 12: /* ipRouteMetric5 */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+          /* not used */
+          *sint_ptr = -1;
+        }
+        break;
+      case 7: /* ipRouteNextHop */
+        {
+          ip_addr_t *dst = (ip_addr_t*)value;
+
+          if (ip_addr_isany(&dest))
+          {
+            /* default rte: gateway */
+            *dst = netif->gw;
+          }
+          else
+          {
+            /* other rtes: netif ip_addr  */
+            *dst = netif->ip_addr;
+          }
+        }
+        break;
+      case 8: /* ipRouteType */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+
+          if (ip_addr_isany(&dest))
+          {
+            /* default rte is indirect */
+            *sint_ptr = 4;
+          }
+          else
+          {
+            /* other rtes are direct */
+            *sint_ptr = 3;
+          }
+        }
+        break;
+      case 9: /* ipRouteProto */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+          /* locally defined routes */
+          *sint_ptr = 2;
+        }
+        break;
+      case 10: /* ipRouteAge */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+          /** @todo (sysuptime - timestamp last change) / 100
+              @see snmp_insert_iprteidx_tree() */
+          *sint_ptr = 0;
+        }
+        break;
+      case 11: /* ipRouteMask */
+        {
+          ip_addr_t *dst = (ip_addr_t*)value;
+
+          if (ip_addr_isany(&dest))
+          {
+            /* default rte use 0.0.0.0 mask */
+            ip_addr_set_zero(dst);
+          }
+          else
+          {
+            /* other rtes use netmask */
+            *dst = netif->netmask;
+          }
+        }
+        break;
+      case 13: /* ipRouteInfo */
+        objectidncpy((s32_t*)value, (s32_t*)iprouteinfo.id, (u8_t)(len / sizeof(s32_t)));
+        break;
+    }
+  }
+}
+
+static void
+ip_ntomentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (5) */
+  ident_len += 5;
+  ident -= 5;
+
+  if (ident_len == 6)
+  {
+    u8_t id;
+
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    switch (id)
+    {
+      case 1: /* ipNetToMediaIfIndex */
+      case 4: /* ipNetToMediaType */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 2: /* ipNetToMediaPhysAddress */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
+        od->v_len = 6; /** @todo try to use netif::hwaddr_len */
+        break;
+      case 3: /* ipNetToMediaNetAddress */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR);
+        od->v_len = 4;
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_ntomentry_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    }
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_ntomentry_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+ip_ntomentry_get_value(struct obj_def *od, u16_t len, void *value)
+{
+#if LWIP_ARP
+  u8_t id;
+  struct eth_addr* ethaddr_ret;
+  ip_addr_t* ipaddr_ret;
+#endif /* LWIP_ARP */
+  ip_addr_t ip;
+  struct netif *netif;
+
+  LWIP_UNUSED_ARG(len);
+  LWIP_UNUSED_ARG(value);/* if !LWIP_ARP */
+
+  snmp_ifindextonetif(od->id_inst_ptr[1], &netif);
+  snmp_oidtoip(&od->id_inst_ptr[2], &ip);
+
+#if LWIP_ARP /** @todo implement a netif_find_addr */
+  if (etharp_find_addr(netif, &ip, &ethaddr_ret, &ipaddr_ret) > -1)
+  {
+    LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+    id = (u8_t)od->id_inst_ptr[0];
+    switch (id)
+    {
+      case 1: /* ipNetToMediaIfIndex */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+          *sint_ptr = od->id_inst_ptr[1];
+        }
+        break;
+      case 2: /* ipNetToMediaPhysAddress */
+        {
+          struct eth_addr *dst = (struct eth_addr*)value;
+
+          *dst = *ethaddr_ret;
+        }
+        break;
+      case 3: /* ipNetToMediaNetAddress */
+        {
+          ip_addr_t *dst = (ip_addr_t*)value;
+
+          *dst = *ipaddr_ret;
+        }
+        break;
+      case 4: /* ipNetToMediaType */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+          /* dynamic (?) */
+          *sint_ptr = 3;
+        }
+        break;
+    }
+  }
+#endif /* LWIP_ARP */
+}
+
+static void
+icmp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (1) */
+  ident_len += 1;
+  ident -= 1;
+  if ((ident_len == 2) &&
+      (ident[0] > 0) && (ident[0] < 27))
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    od->instance = MIB_OBJECT_SCALAR;
+    od->access = MIB_OBJECT_READ_ONLY;
+    od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER);
+    od->v_len = sizeof(u32_t);
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("icmp_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+icmp_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  u32_t *uint_ptr = (u32_t*)value;
+  u8_t id;
+
+  LWIP_UNUSED_ARG(len);
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 1: /* icmpInMsgs */
+      *uint_ptr = icmpinmsgs;
+      break;
+    case 2: /* icmpInErrors */
+      *uint_ptr = icmpinerrors;
+      break;
+    case 3: /* icmpInDestUnreachs */
+      *uint_ptr = icmpindestunreachs;
+      break;
+    case 4: /* icmpInTimeExcds */
+      *uint_ptr = icmpintimeexcds;
+      break;
+    case 5: /* icmpInParmProbs */
+      *uint_ptr = icmpinparmprobs;
+      break;
+    case 6: /* icmpInSrcQuenchs */
+      *uint_ptr = icmpinsrcquenchs;
+      break;
+    case 7: /* icmpInRedirects */
+      *uint_ptr = icmpinredirects;
+      break;
+    case 8: /* icmpInEchos */
+      *uint_ptr = icmpinechos;
+      break;
+    case 9: /* icmpInEchoReps */
+      *uint_ptr = icmpinechoreps;
+      break;
+    case 10: /* icmpInTimestamps */
+      *uint_ptr = icmpintimestamps;
+      break;
+    case 11: /* icmpInTimestampReps */
+      *uint_ptr = icmpintimestampreps;
+      break;
+    case 12: /* icmpInAddrMasks */
+      *uint_ptr = icmpinaddrmasks;
+      break;
+    case 13: /* icmpInAddrMaskReps */
+      *uint_ptr = icmpinaddrmaskreps;
+      break;
+    case 14: /* icmpOutMsgs */
+      *uint_ptr = icmpoutmsgs;
+      break;
+    case 15: /* icmpOutErrors */
+      *uint_ptr = icmpouterrors;
+      break;
+    case 16: /* icmpOutDestUnreachs */
+      *uint_ptr = icmpoutdestunreachs;
+      break;
+    case 17: /* icmpOutTimeExcds */
+      *uint_ptr = icmpouttimeexcds;
+      break;
+    case 18: /* icmpOutParmProbs */
+      *uint_ptr = icmpoutparmprobs;
+      break;
+    case 19: /* icmpOutSrcQuenchs */
+      *uint_ptr = icmpoutsrcquenchs;
+      break;
+    case 20: /* icmpOutRedirects */
+      *uint_ptr = icmpoutredirects;
+      break;
+    case 21: /* icmpOutEchos */
+      *uint_ptr = icmpoutechos;
+      break;
+    case 22: /* icmpOutEchoReps */
+      *uint_ptr = icmpoutechoreps;
+      break;
+    case 23: /* icmpOutTimestamps */
+      *uint_ptr = icmpouttimestamps;
+      break;
+    case 24: /* icmpOutTimestampReps */
+      *uint_ptr = icmpouttimestampreps;
+      break;
+    case 25: /* icmpOutAddrMasks */
+      *uint_ptr = icmpoutaddrmasks;
+      break;
+    case 26: /* icmpOutAddrMaskReps */
+      *uint_ptr = icmpoutaddrmaskreps;
+      break;
+  }
+}
+
+#if LWIP_TCP
+/** @todo tcp grp */
+static void
+tcp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  u8_t id;
+
+  /* return to object name, adding index depth (1) */
+  ident_len += 1;
+  ident -= 1;
+  if (ident_len == 2)
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("get_object_def tcp.%"U16_F".0\n",(u16_t)id));
+
+    switch (id)
+    {
+      case 1: /* tcpRtoAlgorithm */
+      case 2: /* tcpRtoMin */
+      case 3: /* tcpRtoMax */
+      case 4: /* tcpMaxConn */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 5: /* tcpActiveOpens */
+      case 6: /* tcpPassiveOpens */
+      case 7: /* tcpAttemptFails */
+      case 8: /* tcpEstabResets */
+      case 10: /* tcpInSegs */
+      case 11: /* tcpOutSegs */
+      case 12: /* tcpRetransSegs */
+      case 14: /* tcpInErrs */
+      case 15: /* tcpOutRsts */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER);
+        od->v_len = sizeof(u32_t);
+        break;
+      case 9: /* tcpCurrEstab */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE);
+        od->v_len = sizeof(u32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("tcp_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    };
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("tcp_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+tcp_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  u32_t *uint_ptr = (u32_t*)value;
+  s32_t *sint_ptr = (s32_t*)value;
+  u8_t id;
+
+  LWIP_UNUSED_ARG(len);
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 1: /* tcpRtoAlgorithm, vanj(4) */
+      *sint_ptr = 4;
+      break;
+    case 2: /* tcpRtoMin */
+      /* @todo not the actual value, a guess,
+          needs to be calculated */
+      *sint_ptr = 1000;
+      break;
+    case 3: /* tcpRtoMax */
+      /* @todo not the actual value, a guess,
+         needs to be calculated */
+      *sint_ptr = 60000;
+      break;
+    case 4: /* tcpMaxConn */
+      *sint_ptr = MEMP_NUM_TCP_PCB;
+      break;
+    case 5: /* tcpActiveOpens */
+      *uint_ptr = tcpactiveopens;
+      break;
+    case 6: /* tcpPassiveOpens */
+      *uint_ptr = tcppassiveopens;
+      break;
+    case 7: /* tcpAttemptFails */
+      *uint_ptr = tcpattemptfails;
+      break;
+    case 8: /* tcpEstabResets */
+      *uint_ptr = tcpestabresets;
+      break;
+    case 9: /* tcpCurrEstab */
+      {
+        u16_t tcpcurrestab = 0;
+        struct tcp_pcb *pcb = tcp_active_pcbs;
+        while (pcb != NULL)
+        {
+          if ((pcb->state == ESTABLISHED) ||
+              (pcb->state == CLOSE_WAIT))
+          {
+            tcpcurrestab++;
+          }
+          pcb = pcb->next;
+        }
+        *uint_ptr = tcpcurrestab;
+      }
+      break;
+    case 10: /* tcpInSegs */
+      *uint_ptr = tcpinsegs;
+      break;
+    case 11: /* tcpOutSegs */
+      *uint_ptr = tcpoutsegs;
+      break;
+    case 12: /* tcpRetransSegs */
+      *uint_ptr = tcpretranssegs;
+      break;
+    case 14: /* tcpInErrs */
+      *uint_ptr = tcpinerrs;
+      break;
+    case 15: /* tcpOutRsts */
+      *uint_ptr = tcpoutrsts;
+      break;
+  }
+}
+#ifdef THIS_SEEMS_UNUSED
+static void
+tcpconnentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (10) */
+  ident_len += 10;
+  ident -= 10;
+
+  if (ident_len == 11)
+  {
+    u8_t id;
+
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    id = ident[0];
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("get_object_def tcp.%"U16_F".0\n",(u16_t)id));
+
+    switch (id)
+    {
+      case 1: /* tcpConnState */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      case 2: /* tcpConnLocalAddress */
+      case 4: /* tcpConnRemAddress */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR);
+        od->v_len = 4;
+        break;
+      case 3: /* tcpConnLocalPort */
+      case 5: /* tcpConnRemPort */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("tcpconnentry_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    };
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("tcpconnentry_get_object_def: no such object\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+tcpconnentry_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  ip_addr_t lip, rip;
+  u16_t lport, rport;
+  s32_t *ident;
+
+  ident = od->id_inst_ptr;
+  snmp_oidtoip(&ident[1], &lip);
+  lport = ident[5];
+  snmp_oidtoip(&ident[6], &rip);
+  rport = ident[10];
+
+  /** @todo find matching PCB */
+}
+#endif /* if 0 */
+#endif
+
+static void
+udp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (1) */
+  ident_len += 1;
+  ident -= 1;
+  if ((ident_len == 2) &&
+      (ident[0] > 0) && (ident[0] < 6))
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    od->instance = MIB_OBJECT_SCALAR;
+    od->access = MIB_OBJECT_READ_ONLY;
+    od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER);
+    od->v_len = sizeof(u32_t);
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("udp_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+udp_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  u32_t *uint_ptr = (u32_t*)value;
+  u8_t id;
+
+  LWIP_UNUSED_ARG(len);
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+    case 1: /* udpInDatagrams */
+      *uint_ptr = udpindatagrams;
+      break;
+    case 2: /* udpNoPorts */
+      *uint_ptr = udpnoports;
+      break;
+    case 3: /* udpInErrors */
+      *uint_ptr = udpinerrors;
+      break;
+    case 4: /* udpOutDatagrams */
+      *uint_ptr = udpoutdatagrams;
+      break;
+  }
+}
+
+static void
+udpentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (5) */
+  ident_len += 5;
+  ident -= 5;
+
+  if (ident_len == 6)
+  {
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    switch (ident[0])
+    {
+      case 1: /* udpLocalAddress */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR);
+        od->v_len = 4;
+        break;
+      case 2: /* udpLocalPort */
+        od->instance = MIB_OBJECT_TAB;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("udpentry_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    }
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("udpentry_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+udpentry_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id;
+  struct udp_pcb *pcb;
+  ip_addr_t ip;
+  u16_t port;
+
+  LWIP_UNUSED_ARG(len);
+  snmp_oidtoip(&od->id_inst_ptr[1], &ip);
+  LWIP_ASSERT("invalid port", (od->id_inst_ptr[5] >= 0) && (od->id_inst_ptr[5] <= 0xffff));
+  port = (u16_t)od->id_inst_ptr[5];
+
+  pcb = udp_pcbs;
+  while ((pcb != NULL) &&
+         !(ip_addr_cmp(&pcb->local_ip, &ip) &&
+           (pcb->local_port == port)))
+  {
+    pcb = pcb->next;
+  }
+
+  if (pcb != NULL)
+  {
+    LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+    id = (u8_t)od->id_inst_ptr[0];
+    switch (id)
+    {
+      case 1: /* udpLocalAddress */
+        {
+          ip_addr_t *dst = (ip_addr_t*)value;
+          *dst = pcb->local_ip;
+        }
+        break;
+      case 2: /* udpLocalPort */
+        {
+          s32_t *sint_ptr = (s32_t*)value;
+          *sint_ptr = pcb->local_port;
+        }
+        break;
+    }
+  }
+}
+
+static void
+snmp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
+{
+  /* return to object name, adding index depth (1) */
+  ident_len += 1;
+  ident -= 1;
+  if (ident_len == 2)
+  {
+    u8_t id;
+
+    od->id_inst_len = ident_len;
+    od->id_inst_ptr = ident;
+
+    LWIP_ASSERT("invalid id", (ident[0] >= 0) && (ident[0] <= 0xff));
+    id = (u8_t)ident[0];
+    switch (id)
+    {
+      case 1: /* snmpInPkts */
+      case 2: /* snmpOutPkts */
+      case 3: /* snmpInBadVersions */
+      case 4: /* snmpInBadCommunityNames */
+      case 5: /* snmpInBadCommunityUses */
+      case 6: /* snmpInASNParseErrs */
+      case 8: /* snmpInTooBigs */
+      case 9: /* snmpInNoSuchNames */
+      case 10: /* snmpInBadValues */
+      case 11: /* snmpInReadOnlys */
+      case 12: /* snmpInGenErrs */
+      case 13: /* snmpInTotalReqVars */
+      case 14: /* snmpInTotalSetVars */
+      case 15: /* snmpInGetRequests */
+      case 16: /* snmpInGetNexts */
+      case 17: /* snmpInSetRequests */
+      case 18: /* snmpInGetResponses */
+      case 19: /* snmpInTraps */
+      case 20: /* snmpOutTooBigs */
+      case 21: /* snmpOutNoSuchNames */
+      case 22: /* snmpOutBadValues */
+      case 24: /* snmpOutGenErrs */
+      case 25: /* snmpOutGetRequests */
+      case 26: /* snmpOutGetNexts */
+      case 27: /* snmpOutSetRequests */
+      case 28: /* snmpOutGetResponses */
+      case 29: /* snmpOutTraps */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_ONLY;
+        od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER);
+        od->v_len = sizeof(u32_t);
+        break;
+      case 30: /* snmpEnableAuthenTraps */
+        od->instance = MIB_OBJECT_SCALAR;
+        od->access = MIB_OBJECT_READ_WRITE;
+        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG);
+        od->v_len = sizeof(s32_t);
+        break;
+      default:
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_get_object_def: no such object\n"));
+        od->instance = MIB_OBJECT_NONE;
+        break;
+    };
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("snmp_get_object_def: no scalar\n"));
+    od->instance = MIB_OBJECT_NONE;
+  }
+}
+
+static void
+snmp_get_value(struct obj_def *od, u16_t len, void *value)
+{
+  u32_t *uint_ptr = (u32_t*)value;
+  u8_t id;
+
+  LWIP_UNUSED_ARG(len);
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  switch (id)
+  {
+      case 1: /* snmpInPkts */
+        *uint_ptr = snmpinpkts;
+        break;
+      case 2: /* snmpOutPkts */
+        *uint_ptr = snmpoutpkts;
+        break;
+      case 3: /* snmpInBadVersions */
+        *uint_ptr = snmpinbadversions;
+        break;
+      case 4: /* snmpInBadCommunityNames */
+        *uint_ptr = snmpinbadcommunitynames;
+        break;
+      case 5: /* snmpInBadCommunityUses */
+        *uint_ptr = snmpinbadcommunityuses;
+        break;
+      case 6: /* snmpInASNParseErrs */
+        *uint_ptr = snmpinasnparseerrs;
+        break;
+      case 8: /* snmpInTooBigs */
+        *uint_ptr = snmpintoobigs;
+        break;
+      case 9: /* snmpInNoSuchNames */
+        *uint_ptr = snmpinnosuchnames;
+        break;
+      case 10: /* snmpInBadValues */
+        *uint_ptr = snmpinbadvalues;
+        break;
+      case 11: /* snmpInReadOnlys */
+        *uint_ptr = snmpinreadonlys;
+        break;
+      case 12: /* snmpInGenErrs */
+        *uint_ptr = snmpingenerrs;
+        break;
+      case 13: /* snmpInTotalReqVars */
+        *uint_ptr = snmpintotalreqvars;
+        break;
+      case 14: /* snmpInTotalSetVars */
+        *uint_ptr = snmpintotalsetvars;
+        break;
+      case 15: /* snmpInGetRequests */
+        *uint_ptr = snmpingetrequests;
+        break;
+      case 16: /* snmpInGetNexts */
+        *uint_ptr = snmpingetnexts;
+        break;
+      case 17: /* snmpInSetRequests */
+        *uint_ptr = snmpinsetrequests;
+        break;
+      case 18: /* snmpInGetResponses */
+        *uint_ptr = snmpingetresponses;
+        break;
+      case 19: /* snmpInTraps */
+        *uint_ptr = snmpintraps;
+        break;
+      case 20: /* snmpOutTooBigs */
+        *uint_ptr = snmpouttoobigs;
+        break;
+      case 21: /* snmpOutNoSuchNames */
+        *uint_ptr = snmpoutnosuchnames;
+        break;
+      case 22: /* snmpOutBadValues */
+        *uint_ptr = snmpoutbadvalues;
+        break;
+      case 24: /* snmpOutGenErrs */
+        *uint_ptr = snmpoutgenerrs;
+        break;
+      case 25: /* snmpOutGetRequests */
+        *uint_ptr = snmpoutgetrequests;
+        break;
+      case 26: /* snmpOutGetNexts */
+        *uint_ptr = snmpoutgetnexts;
+        break;
+      case 27: /* snmpOutSetRequests */
+        *uint_ptr = snmpoutsetrequests;
+        break;
+      case 28: /* snmpOutGetResponses */
+        *uint_ptr = snmpoutgetresponses;
+        break;
+      case 29: /* snmpOutTraps */
+        *uint_ptr = snmpouttraps;
+        break;
+      case 30: /* snmpEnableAuthenTraps */
+        *uint_ptr = *snmpenableauthentraps_ptr;
+        break;
+  };
+}
+
+/**
+ * Test snmp object value before setting.
+ *
+ * @param od is the object definition
+ * @param len return value space (in bytes)
+ * @param value points to (varbind) space to copy value from.
+ */
+static u8_t
+snmp_set_test(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id, set_ok;
+
+  LWIP_UNUSED_ARG(len);
+  set_ok = 0;
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  if (id == 30)
+  {
+    /* snmpEnableAuthenTraps */
+    s32_t *sint_ptr = (s32_t*)value;
+
+    if (snmpenableauthentraps_ptr != &snmpenableauthentraps_default)
+    {
+      /* we should have writable non-volatile mem here */
+      if ((*sint_ptr == 1) || (*sint_ptr == 2))
+      {
+        set_ok = 1;
+      }
+    }
+    else
+    {
+      /* const or hardwired value */
+      if (*sint_ptr == snmpenableauthentraps_default)
+      {
+        set_ok = 1;
+      }
+    }
+  }
+  return set_ok;
+}
+
+static void
+snmp_set_value(struct obj_def *od, u16_t len, void *value)
+{
+  u8_t id;
+
+  LWIP_UNUSED_ARG(len);
+  LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
+  id = (u8_t)od->id_inst_ptr[0];
+  if (id == 30)
+  {
+    /* snmpEnableAuthenTraps */
+    /* @todo @fixme: which kind of pointer is 'value'? s32_t or u8_t??? */
+    u8_t *ptr = (u8_t*)value;
+    *snmpenableauthentraps_ptr = *ptr;
+  }
+}
+
+#endif /* LWIP_SNMP */
diff --git a/ext/lwip/src/core/snmp/mib_structs.c b/ext/lwip/src/core/snmp/mib_structs.c
new file mode 100644
index 000000000..2f185cb43
--- /dev/null
+++ b/ext/lwip/src/core/snmp/mib_structs.c
@@ -0,0 +1,1174 @@
+/**
+ * @file
+ * MIB tree access/construction functions.
+ */
+
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/snmp_structs.h"
+#include "lwip/memp.h"
+#include "lwip/netif.h"
+
+/** .iso.org.dod.internet address prefix, @see snmp_iso_*() */
+const s32_t prefix[4] = {1, 3, 6, 1};
+
+#define NODE_STACK_SIZE (LWIP_SNMP_OBJ_ID_LEN)
+/** node stack entry (old news?) */
+struct nse
+{
+  /** right child */
+  struct mib_node* r_ptr;
+  /** right child identifier */
+  s32_t r_id;
+  /** right child next level */
+  u8_t r_nl;
+};
+static u8_t node_stack_cnt;
+static struct nse node_stack[NODE_STACK_SIZE];
+
+/**
+ * Pushes nse struct onto stack.
+ */
+static void
+push_node(struct nse* node)
+{
+  LWIP_ASSERT("node_stack_cnt < NODE_STACK_SIZE",node_stack_cnt < NODE_STACK_SIZE);
+  LWIP_DEBUGF(SNMP_MIB_DEBUG,("push_node() node=%p id=%"S32_F"\n",(void*)(node->r_ptr),node->r_id));
+  if (node_stack_cnt < NODE_STACK_SIZE)
+  {
+    node_stack[node_stack_cnt] = *node;
+    node_stack_cnt++;
+  }
+}
+
+/**
+ * Pops nse struct from stack.
+ */
+static void
+pop_node(struct nse* node)
+{
+  if (node_stack_cnt > 0)
+  {
+    node_stack_cnt--;
+    *node = node_stack[node_stack_cnt];
+  }
+  LWIP_DEBUGF(SNMP_MIB_DEBUG,("pop_node() node=%p id=%"S32_F"\n",(void *)(node->r_ptr),node->r_id));
+}
+
+/**
+ * Conversion from ifIndex to lwIP netif
+ * @param ifindex is a s32_t object sub-identifier
+ * @param netif points to returned netif struct pointer
+ */
+void
+snmp_ifindextonetif(s32_t ifindex, struct netif **netif)
+{
+  struct netif *nif = netif_list;
+  s32_t i, ifidx;
+
+  ifidx = ifindex - 1;
+  i = 0;
+  while ((nif != NULL) && (i < ifidx))
+  {
+    nif = nif->next;
+    i++;
+  }
+  *netif = nif;
+}
+
+/**
+ * Conversion from lwIP netif to ifIndex
+ * @param netif points to a netif struct
+ * @param ifidx points to s32_t object sub-identifier
+ */
+void
+snmp_netiftoifindex(struct netif *netif, s32_t *ifidx)
+{
+  struct netif *nif = netif_list;
+  u16_t i;
+
+  i = 0;
+  while ((nif != NULL) && (nif != netif))
+  {
+    nif = nif->next;
+    i++;
+  }
+  *ifidx = i+1;
+}
+
+/**
+ * Conversion from oid to lwIP ip_addr
+ * @param ident points to s32_t ident[4] input
+ * @param ip points to output struct
+ */
+void
+snmp_oidtoip(s32_t *ident, ip_addr_t *ip)
+{
+  IP4_ADDR(ip, ident[0], ident[1], ident[2], ident[3]);
+}
+
+/**
+ * Conversion from lwIP ip_addr to oid
+ * @param ip points to input struct
+ * @param ident points to s32_t ident[4] output
+ */
+void
+snmp_iptooid(ip_addr_t *ip, s32_t *ident)
+{
+  ident[0] = ip4_addr1(ip);
+  ident[1] = ip4_addr2(ip);
+  ident[2] = ip4_addr3(ip);
+  ident[3] = ip4_addr4(ip);
+}
+
+struct mib_list_node *
+snmp_mib_ln_alloc(s32_t id)
+{
+  struct mib_list_node *ln;
+
+  ln = (struct mib_list_node *)memp_malloc(MEMP_SNMP_NODE);
+  if (ln != NULL)
+  {
+    ln->prev = NULL;
+    ln->next = NULL;
+    ln->objid = id;
+    ln->nptr = NULL;
+  }
+  return ln;
+}
+
+void
+snmp_mib_ln_free(struct mib_list_node *ln)
+{
+  memp_free(MEMP_SNMP_NODE, ln);
+}
+
+struct mib_list_rootnode *
+snmp_mib_lrn_alloc(void)
+{
+  struct mib_list_rootnode *lrn;
+
+  lrn = (struct mib_list_rootnode*)memp_malloc(MEMP_SNMP_ROOTNODE);
+  if (lrn != NULL)
+  {
+    lrn->get_object_def = noleafs_get_object_def;
+    lrn->get_value = noleafs_get_value;
+    lrn->set_test = noleafs_set_test;
+    lrn->set_value = noleafs_set_value;
+    lrn->node_type = MIB_NODE_LR;
+    lrn->maxlength = 0;
+    lrn->head = NULL;
+    lrn->tail = NULL;
+    lrn->count = 0;
+  }
+  return lrn;
+}
+
+void
+snmp_mib_lrn_free(struct mib_list_rootnode *lrn)
+{
+  memp_free(MEMP_SNMP_ROOTNODE, lrn);
+}
+
+/**
+ * Inserts node in idx list in a sorted
+ * (ascending order) fashion and
+ * allocates the node if needed.
+ *
+ * @param rn points to the root node
+ * @param objid is the object sub identifier
+ * @param insn points to a pointer to the inserted node
+ *   used for constructing the tree.
+ * @return -1 if failed, 1 if inserted, 2 if present.
+ */
+s8_t
+snmp_mib_node_insert(struct mib_list_rootnode *rn, s32_t objid, struct mib_list_node **insn)
+{
+  struct mib_list_node *nn;
+  s8_t insert;
+
+  LWIP_ASSERT("rn != NULL",rn != NULL);
+
+  /* -1 = malloc failure, 0 = not inserted, 1 = inserted, 2 = was present */
+  insert = 0;
+  if (rn->head == NULL)
+  {
+    /* empty list, add first node */
+    LWIP_DEBUGF(SNMP_MIB_DEBUG,("alloc empty list objid==%"S32_F"\n",objid));
+    nn = snmp_mib_ln_alloc(objid);
+    if (nn != NULL)
+    {
+      rn->head = nn;
+      rn->tail = nn;
+      *insn = nn;
+      insert = 1;
+    }
+    else
+    {
+      insert = -1;
+    }
+  }
+  else
+  {
+    struct mib_list_node *n;
+    /* at least one node is present */
+    n = rn->head;
+    while ((n != NULL) && (insert == 0))
+    {
+      if (n->objid == objid)
+      {
+        /* node is already there */
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("node already there objid==%"S32_F"\n",objid));
+        *insn = n;
+        insert = 2;
+      }
+      else if (n->objid < objid)
+      {
+        if (n->next == NULL)
+        {
+          /* alloc and insert at the tail */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("alloc ins tail objid==%"S32_F"\n",objid));
+          nn = snmp_mib_ln_alloc(objid);
+          if (nn != NULL)
+          {
+            nn->next = NULL;
+            nn->prev = n;
+            n->next = nn;
+            rn->tail = nn;
+            *insn = nn;
+            insert = 1;
+          }
+          else
+          {
+            /* insertion failure */
+            insert = -1;
+          }
+        }
+        else
+        {
+          /* there's more to explore: traverse list */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("traverse list\n"));
+          n = n->next;
+        }
+      }
+      else
+      {
+        /* n->objid > objid */
+        /* alloc and insert between n->prev and n */
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("alloc ins n->prev, objid==%"S32_F", n\n",objid));
+        nn = snmp_mib_ln_alloc(objid);
+        if (nn != NULL)
+        {
+          if (n->prev == NULL)
+          {
+            /* insert at the head */
+            nn->next = n;
+            nn->prev = NULL;
+            rn->head = nn;
+            n->prev = nn;
+          }
+          else
+          {
+            /* insert in the middle */
+            nn->next = n;
+            nn->prev = n->prev;
+            n->prev->next = nn;
+            n->prev = nn;
+          }
+          *insn = nn;
+          insert = 1;
+        }
+        else
+        {
+          /* insertion failure */
+          insert = -1;
+        }
+      }
+    }
+  }
+  if (insert == 1)
+  {
+    rn->count += 1;
+  }
+  LWIP_ASSERT("insert != 0",insert != 0);
+  return insert;
+}
+
+/**
+ * Finds node in idx list and returns deletion mark.
+ *
+ * @param rn points to the root node
+ * @param objid  is the object sub identifier
+ * @param fn returns pointer to found node
+ * @return 0 if not found, 1 if deletable,
+ *   2 can't delete (2 or more children), 3 not a list_node
+ */
+s8_t
+snmp_mib_node_find(struct mib_list_rootnode *rn, s32_t objid, struct mib_list_node **fn)
+{
+  s8_t fc;
+  struct mib_list_node *n;
+
+  LWIP_ASSERT("rn != NULL",rn != NULL);
+  n = rn->head;
+  while ((n != NULL) && (n->objid != objid))
+  {
+    n = n->next;
+  }
+  if (n == NULL)
+  {
+    fc = 0;
+  }
+  else if (n->nptr == NULL)
+  {
+    /* leaf, can delete node */
+    fc = 1;
+  }
+  else
+  {
+    struct mib_list_rootnode *r;
+
+    if (n->nptr->node_type == MIB_NODE_LR)
+    {
+      r = (struct mib_list_rootnode *)n->nptr;
+      if (r->count > 1)
+      {
+        /* can't delete node */
+        fc = 2;
+      }
+      else
+      {
+        /* count <= 1, can delete node */
+        fc = 1;
+      }
+    }
+    else
+    {
+      /* other node type */
+      fc = 3;
+    }
+  }
+  *fn = n;
+  return fc;
+}
+
+/**
+ * Removes node from idx list
+ * if it has a single child left.
+ *
+ * @param rn points to the root node
+ * @param n points to the node to delete
+ * @return the nptr to be freed by caller
+ */
+struct mib_list_rootnode *
+snmp_mib_node_delete(struct mib_list_rootnode *rn, struct mib_list_node *n)
+{
+  struct mib_list_rootnode *next;
+
+  LWIP_ASSERT("rn != NULL",rn != NULL);
+  LWIP_ASSERT("n != NULL",n != NULL);
+
+  /* caller must remove this sub-tree */
+  next = (struct mib_list_rootnode*)(n->nptr);
+  rn->count -= 1;
+
+  if (n == rn->head)
+  {
+    rn->head = n->next;
+    if (n->next != NULL)
+    {
+      /* not last node, new list begin */
+      n->next->prev = NULL;
+    }
+  }
+  else if (n == rn->tail)
+  {
+    rn->tail = n->prev;
+    if (n->prev != NULL)
+    {
+      /* not last node, new list end */
+      n->prev->next = NULL;
+    }
+  }
+  else
+  {
+    /* node must be in the middle */
+    n->prev->next = n->next;
+    n->next->prev = n->prev;
+  }
+  LWIP_DEBUGF(SNMP_MIB_DEBUG,("free list objid==%"S32_F"\n",n->objid));
+  snmp_mib_ln_free(n);
+  if (rn->count == 0)
+  {
+    rn->head = NULL;
+    rn->tail = NULL;
+  }
+  return next;
+}
+
+
+
+/**
+ * Searches tree for the supplied (scalar?) object identifier.
+ *
+ * @param node points to the root of the tree ('.internet')
+ * @param ident_len the length of the supplied object identifier
+ * @param ident points to the array of sub identifiers
+ * @param np points to the found object instance (return)
+ * @return pointer to the requested parent (!) node if success, NULL otherwise
+ */
+struct mib_node *
+snmp_search_tree(struct mib_node *node, u8_t ident_len, s32_t *ident, struct snmp_name_ptr *np)
+{
+  u8_t node_type, ext_level;
+
+  ext_level = 0;
+  LWIP_DEBUGF(SNMP_MIB_DEBUG,("node==%p *ident==%"S32_F"\n",(void*)node,*ident));
+  while (node != NULL)
+  {
+    node_type = node->node_type;
+    if ((node_type == MIB_NODE_AR) || (node_type == MIB_NODE_RA))
+    {
+      struct mib_array_node *an;
+      u16_t i;
+
+      if (ident_len > 0)
+      {
+        /* array node (internal ROM or RAM, fixed length) */
+        an = (struct mib_array_node *)node;
+        i = 0;
+        while ((i < an->maxlength) && (an->objid[i] != *ident))
+        {
+          i++;
+        }
+        if (i < an->maxlength)
+        {
+          /* found it, if available proceed to child, otherwise inspect leaf */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("an->objid[%"U16_F"]==%"S32_F" *ident==%"S32_F"\n",i,an->objid[i],*ident));
+          if (an->nptr[i] == NULL)
+          {
+            /* a scalar leaf OR table,
+               inspect remaining instance number / table index */
+            np->ident_len = ident_len;
+            np->ident = ident;
+            return (struct mib_node*)an;
+          }
+          else
+          {
+            /* follow next child pointer */
+            ident++;
+            ident_len--;
+            node = an->nptr[i];
+          }
+        }
+        else
+        {
+          /* search failed, identifier mismatch (nosuchname) */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("an search failed *ident==%"S32_F"\n",*ident));
+          return NULL;
+        }
+      }
+      else
+      {
+        /* search failed, short object identifier (nosuchname) */
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("an search failed, short object identifier\n"));
+        return NULL;
+      }
+    }
+    else if(node_type == MIB_NODE_LR)
+    {
+      struct mib_list_rootnode *lrn;
+      struct mib_list_node *ln;
+
+      if (ident_len > 0)
+      {
+        /* list root node (internal 'RAM', variable length) */
+        lrn = (struct mib_list_rootnode *)node;
+        ln = lrn->head;
+        /* iterate over list, head to tail */
+        while ((ln != NULL) && (ln->objid != *ident))
+        {
+          ln = ln->next;
+        }
+        if (ln != NULL)
+        {
+          /* found it, proceed to child */;
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("ln->objid==%"S32_F" *ident==%"S32_F"\n",ln->objid,*ident));
+          if (ln->nptr == NULL)
+          {
+            np->ident_len = ident_len;
+            np->ident = ident;
+            return (struct mib_node*)lrn;
+          }
+          else
+          {
+            /* follow next child pointer */
+            ident_len--;
+            ident++;
+            node = ln->nptr;
+          }
+        }
+        else
+        {
+          /* search failed */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("ln search failed *ident==%"S32_F"\n",*ident));
+          return NULL;
+        }
+      }
+      else
+      {
+        /* search failed, short object identifier (nosuchname) */
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("ln search failed, short object identifier\n"));
+        return NULL;
+      }
+    }
+    else if(node_type == MIB_NODE_EX)
+    {
+      struct mib_external_node *en;
+      u16_t i, len;
+
+      if (ident_len > 0)
+      {
+        /* external node (addressing and access via functions) */
+        en = (struct mib_external_node *)node;
+
+        i = 0;
+        len = en->level_length(en->addr_inf,ext_level);
+        while ((i < len) && (en->ident_cmp(en->addr_inf,ext_level,i,*ident) != 0))
+        {
+          i++;
+        }
+        if (i < len)
+        {
+          s32_t debug_id;
+
+          en->get_objid(en->addr_inf,ext_level,i,&debug_id);
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("en->objid==%"S32_F" *ident==%"S32_F"\n",debug_id,*ident));
+          if ((ext_level + 1) == en->tree_levels)
+          {
+            np->ident_len = ident_len;
+            np->ident = ident;
+            return (struct mib_node*)en;
+          }
+          else
+          {
+            /* found it, proceed to child */
+            ident_len--;
+            ident++;
+            ext_level++;
+          }
+        }
+        else
+        {
+          /* search failed */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("en search failed *ident==%"S32_F"\n",*ident));
+          return NULL;
+        }
+      }
+      else
+      {
+        /* search failed, short object identifier (nosuchname) */
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("en search failed, short object identifier\n"));
+        return NULL;
+      }
+    }
+    else if (node_type == MIB_NODE_SC)
+    {
+      mib_scalar_node *sn;
+
+      sn = (mib_scalar_node *)node;
+      if ((ident_len == 1) && (*ident == 0))
+      {
+        np->ident_len = ident_len;
+        np->ident = ident;
+        return (struct mib_node*)sn;
+      }
+      else
+      {
+        /* search failed, short object identifier (nosuchname) */
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("search failed, invalid object identifier length\n"));
+        return NULL;
+      }
+    }
+    else
+    {
+      /* unknown node_type */
+      LWIP_DEBUGF(SNMP_MIB_DEBUG,("search failed node_type %"U16_F" unkown\n",(u16_t)node_type));
+      return NULL;
+    }
+  }
+  /* done, found nothing */
+  LWIP_DEBUGF(SNMP_MIB_DEBUG,("search failed node==%p\n",(void*)node));
+  return NULL;
+}
+
+/**
+ * Test table for presence of at least one table entry.
+ */
+static u8_t
+empty_table(struct mib_node *node)
+{
+  u8_t node_type;
+  u8_t empty = 0;
+
+  if (node != NULL)
+  {
+    node_type = node->node_type;
+    if (node_type == MIB_NODE_LR)
+    {
+      struct mib_list_rootnode *lrn;
+      lrn = (struct mib_list_rootnode *)node;
+      if ((lrn->count == 0) || (lrn->head == NULL))
+      {
+        empty = 1;
+      }
+    }
+    else if ((node_type == MIB_NODE_AR) || (node_type == MIB_NODE_RA))
+    {
+      struct mib_array_node *an;
+      an = (struct mib_array_node *)node;
+      if ((an->maxlength == 0) || (an->nptr == NULL))
+      {
+        empty = 1;
+      }
+    }
+    else if (node_type == MIB_NODE_EX)
+    {
+      struct mib_external_node *en;
+      en = (struct mib_external_node *)node;
+      if (en->tree_levels == 0)
+      {
+        empty = 1;
+      }
+    }
+  }
+  return empty;
+}
+
+/**
+ * Tree expansion.
+ */
+struct mib_node *
+snmp_expand_tree(struct mib_node *node, u8_t ident_len, s32_t *ident, struct snmp_obj_id *oidret)
+{
+  u8_t node_type, ext_level, climb_tree;
+
+  ext_level = 0;
+  /* reset node stack */
+  node_stack_cnt = 0;
+  while (node != NULL)
+  {
+    climb_tree = 0;
+    node_type = node->node_type;
+    if ((node_type == MIB_NODE_AR) || (node_type == MIB_NODE_RA))
+    {
+      struct mib_array_node *an;
+      u16_t i;
+
+      /* array node (internal ROM or RAM, fixed length) */
+      an = (struct mib_array_node *)node;
+      if (ident_len > 0)
+      {
+        i = 0;
+        while ((i < an->maxlength) && (an->objid[i] < *ident))
+        {
+          i++;
+        }
+        if (i < an->maxlength)
+        {
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("an->objid[%"U16_F"]==%"S32_F" *ident==%"S32_F"\n",i,an->objid[i],*ident));
+          /* add identifier to oidret */
+          oidret->id[oidret->len] = an->objid[i];
+          (oidret->len)++;
+
+          if (an->nptr[i] == NULL)
+          {
+            LWIP_DEBUGF(SNMP_MIB_DEBUG,("leaf node\n"));
+            /* leaf node (e.g. in a fixed size table) */
+            if (an->objid[i] > *ident)
+            {
+              return (struct mib_node*)an;
+            }
+            else if ((i + 1) < an->maxlength)
+            {
+              /* an->objid[i] == *ident */
+              (oidret->len)--;
+              oidret->id[oidret->len] = an->objid[i + 1];
+              (oidret->len)++;
+              return (struct mib_node*)an;
+            }
+            else
+            {
+              /* (i + 1) == an->maxlength */
+              (oidret->len)--;
+              climb_tree = 1;
+            }
+          }
+          else
+          {
+            u8_t j;
+            struct nse cur_node;
+
+            LWIP_DEBUGF(SNMP_MIB_DEBUG,("non-leaf node\n"));
+            /* non-leaf, store right child ptr and id */
+            LWIP_ASSERT("i < 0xff", i < 0xff);
+            j = (u8_t)i + 1;
+            while ((j < an->maxlength) && (empty_table(an->nptr[j])))
+            {
+              j++;
+            }
+            if (j < an->maxlength)
+            {
+              cur_node.r_ptr = an->nptr[j];
+              cur_node.r_id = an->objid[j];
+              cur_node.r_nl = 0;
+            }
+            else
+            {
+              cur_node.r_ptr = NULL;
+            }
+            push_node(&cur_node);
+            if (an->objid[i] == *ident)
+            {
+              ident_len--;
+              ident++;
+            }
+            else
+            {
+              /* an->objid[i] < *ident */
+              ident_len = 0;
+            }
+            /* follow next child pointer */
+            node = an->nptr[i];
+          }
+        }
+        else
+        {
+          /* i == an->maxlength */
+          climb_tree = 1;
+        }
+      }
+      else
+      {
+        u8_t j;
+        /* ident_len == 0, complete with leftmost '.thing' */
+        j = 0;
+        while ((j < an->maxlength) && empty_table(an->nptr[j]))
+        {
+          j++;
+        }
+        if (j < an->maxlength)
+        {
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("left an->objid[j]==%"S32_F"\n",an->objid[j]));
+          oidret->id[oidret->len] = an->objid[j];
+          (oidret->len)++;
+          if (an->nptr[j] == NULL)
+          {
+            /* leaf node */
+            return (struct mib_node*)an;
+          }
+          else
+          {
+            /* no leaf, continue */
+            node = an->nptr[j];
+          }
+        }
+        else
+        {
+          /* j == an->maxlength */
+          climb_tree = 1;
+        }
+      }
+    }
+    else if(node_type == MIB_NODE_LR)
+    {
+      struct mib_list_rootnode *lrn;
+      struct mib_list_node *ln;
+
+      /* list root node (internal 'RAM', variable length) */
+      lrn = (struct mib_list_rootnode *)node;
+      if (ident_len > 0)
+      {
+        ln = lrn->head;
+        /* iterate over list, head to tail */
+        while ((ln != NULL) && (ln->objid < *ident))
+        {
+          ln = ln->next;
+        }
+        if (ln != NULL)
+        {
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("ln->objid==%"S32_F" *ident==%"S32_F"\n",ln->objid,*ident));
+          oidret->id[oidret->len] = ln->objid;
+          (oidret->len)++;
+          if (ln->nptr == NULL)
+          {
+            /* leaf node */
+            if (ln->objid > *ident)
+            {
+              return (struct mib_node*)lrn;
+            }
+            else if (ln->next != NULL)
+            {
+              /* ln->objid == *ident */
+              (oidret->len)--;
+              oidret->id[oidret->len] = ln->next->objid;
+              (oidret->len)++;
+              return (struct mib_node*)lrn;
+            }
+            else
+            {
+              /* ln->next == NULL */
+              (oidret->len)--;
+              climb_tree = 1;
+            }
+          }
+          else
+          {
+            struct mib_list_node *jn;
+            struct nse cur_node;
+
+            /* non-leaf, store right child ptr and id */
+            jn = ln->next;
+            while ((jn != NULL) && empty_table(jn->nptr))
+            {
+              jn = jn->next;
+            }
+            if (jn != NULL)
+            {
+              cur_node.r_ptr = jn->nptr;
+              cur_node.r_id = jn->objid;
+              cur_node.r_nl = 0;
+            }
+            else
+            {
+              cur_node.r_ptr = NULL;
+            }
+            push_node(&cur_node);
+            if (ln->objid == *ident)
+            {
+              ident_len--;
+              ident++;
+            }
+            else
+            {
+              /* ln->objid < *ident */
+              ident_len = 0;
+            }
+            /* follow next child pointer */
+            node = ln->nptr;
+          }
+
+        }
+        else
+        {
+          /* ln == NULL */
+          climb_tree = 1;
+        }
+      }
+      else
+      {
+        struct mib_list_node *jn;
+        /* ident_len == 0, complete with leftmost '.thing' */
+        jn = lrn->head;
+        while ((jn != NULL) && empty_table(jn->nptr))
+        {
+          jn = jn->next;
+        }
+        if (jn != NULL)
+        {
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("left jn->objid==%"S32_F"\n",jn->objid));
+          oidret->id[oidret->len] = jn->objid;
+          (oidret->len)++;
+          if (jn->nptr == NULL)
+          {
+            /* leaf node */
+            LWIP_DEBUGF(SNMP_MIB_DEBUG,("jn->nptr == NULL\n"));
+            return (struct mib_node*)lrn;
+          }
+          else
+          {
+            /* no leaf, continue */
+            node = jn->nptr;
+          }
+        }
+        else
+        {
+          /* jn == NULL */
+          climb_tree = 1;
+        }
+      }
+    }
+    else if(node_type == MIB_NODE_EX)
+    {
+      struct mib_external_node *en;
+      s32_t ex_id;
+
+      /* external node (addressing and access via functions) */
+      en = (struct mib_external_node *)node;
+      if (ident_len > 0)
+      {
+        u16_t i, len;
+
+        i = 0;
+        len = en->level_length(en->addr_inf,ext_level);
+        while ((i < len) && (en->ident_cmp(en->addr_inf,ext_level,i,*ident) < 0))
+        {
+          i++;
+        }
+        if (i < len)
+        {
+          /* add identifier to oidret */
+          en->get_objid(en->addr_inf,ext_level,i,&ex_id);
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("en->objid[%"U16_F"]==%"S32_F" *ident==%"S32_F"\n",i,ex_id,*ident));
+          oidret->id[oidret->len] = ex_id;
+          (oidret->len)++;
+
+          if ((ext_level + 1) == en->tree_levels)
+          {
+            LWIP_DEBUGF(SNMP_MIB_DEBUG,("leaf node\n"));
+            /* leaf node */
+            if (ex_id > *ident)
+            {
+              return (struct mib_node*)en;
+            }
+            else if ((i + 1) < len)
+            {
+              /* ex_id == *ident */
+              en->get_objid(en->addr_inf,ext_level,i + 1,&ex_id);
+              (oidret->len)--;
+              oidret->id[oidret->len] = ex_id;
+              (oidret->len)++;
+              return (struct mib_node*)en;
+            }
+            else
+            {
+              /* (i + 1) == len */
+              (oidret->len)--;
+              climb_tree = 1;
+            }
+          }
+          else
+          {
+            u8_t j;
+            struct nse cur_node;
+
+            LWIP_DEBUGF(SNMP_MIB_DEBUG,("non-leaf node\n"));
+            /* non-leaf, store right child ptr and id */
+            LWIP_ASSERT("i < 0xff", i < 0xff);
+            j = (u8_t)i + 1;
+            if (j < len)
+            {
+              /* right node is the current external node */
+              cur_node.r_ptr = node;
+              en->get_objid(en->addr_inf,ext_level,j,&cur_node.r_id);
+              cur_node.r_nl = ext_level + 1;
+            }
+            else
+            {
+              cur_node.r_ptr = NULL;
+            }
+            push_node(&cur_node);
+            if (en->ident_cmp(en->addr_inf,ext_level,i,*ident) == 0)
+            {
+              ident_len--;
+              ident++;
+            }
+            else
+            {
+              /* external id < *ident */
+              ident_len = 0;
+            }
+            /* proceed to child */
+            ext_level++;
+          }
+        }
+        else
+        {
+          /* i == len (en->level_len()) */
+          climb_tree = 1;
+        }
+      }
+      else
+      {
+        /* ident_len == 0, complete with leftmost '.thing' */
+        en->get_objid(en->addr_inf,ext_level,0,&ex_id);
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("left en->objid==%"S32_F"\n",ex_id));
+        oidret->id[oidret->len] = ex_id;
+        (oidret->len)++;
+        if ((ext_level + 1) == en->tree_levels)
+        {
+          /* leaf node */
+          LWIP_DEBUGF(SNMP_MIB_DEBUG,("(ext_level + 1) == en->tree_levels\n"));
+          return (struct mib_node*)en;
+        }
+        else
+        {
+          /* no leaf, proceed to child */
+          ext_level++;
+        }
+      }
+    }
+    else if(node_type == MIB_NODE_SC)
+    {
+      mib_scalar_node *sn;
+
+      /* scalar node  */
+      sn = (mib_scalar_node *)node;
+      if (ident_len > 0)
+      {
+        /* at .0 */
+        climb_tree = 1;
+      }
+      else
+      {
+        /* ident_len == 0, complete object identifier */
+        oidret->id[oidret->len] = 0;
+        (oidret->len)++;
+        /* leaf node */
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("completed scalar leaf\n"));
+        return (struct mib_node*)sn;
+      }
+    }
+    else
+    {
+      /* unknown/unhandled node_type */
+      LWIP_DEBUGF(SNMP_MIB_DEBUG,("expand failed node_type %"U16_F" unkown\n",(u16_t)node_type));
+      return NULL;
+    }
+
+    if (climb_tree)
+    {
+      struct nse child;
+
+      /* find right child ptr */
+      child.r_ptr = NULL;
+      child.r_id = 0;
+      child.r_nl = 0;
+      while ((node_stack_cnt > 0) && (child.r_ptr == NULL))
+      {
+        pop_node(&child);
+        /* trim returned oid */
+        (oidret->len)--;
+      }
+      if (child.r_ptr != NULL)
+      {
+        /* incoming ident is useless beyond this point */
+        ident_len = 0;
+        oidret->id[oidret->len] = child.r_id;
+        oidret->len++;
+        node = child.r_ptr;
+        ext_level = child.r_nl;
+      }
+      else
+      {
+        /* tree ends here ... */
+        LWIP_DEBUGF(SNMP_MIB_DEBUG,("expand failed, tree ends here\n"));
+        return NULL;
+      }
+    }
+  }
+  /* done, found nothing */
+  LWIP_DEBUGF(SNMP_MIB_DEBUG,("expand failed node==%p\n",(void*)node));
+  return NULL;
+}
+
+/**
+ * Test object identifier for the iso.org.dod.internet prefix.
+ *
+ * @param ident_len the length of the supplied object identifier
+ * @param ident points to the array of sub identifiers
+ * @return 1 if it matches, 0 otherwise
+ */
+u8_t
+snmp_iso_prefix_tst(u8_t ident_len, s32_t *ident)
+{
+  if ((ident_len > 3) &&
+      (ident[0] == 1) && (ident[1] == 3) &&
+      (ident[2] == 6) && (ident[3] == 1))
+  {
+    return 1;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+/**
+ * Expands object identifier to the iso.org.dod.internet
+ * prefix for use in getnext operation.
+ *
+ * @param ident_len the length of the supplied object identifier
+ * @param ident points to the array of sub identifiers
+ * @param oidret points to returned expanded object identifier
+ * @return 1 if it matches, 0 otherwise
+ *
+ * @note ident_len 0 is allowed, expanding to the first known object id!!
+ */
+u8_t
+snmp_iso_prefix_expand(u8_t ident_len, s32_t *ident, struct snmp_obj_id *oidret)
+{
+  const s32_t *prefix_ptr;
+  s32_t *ret_ptr;
+  u8_t i;
+
+  i = 0;
+  prefix_ptr = &prefix[0];
+  ret_ptr = &oidret->id[0];
+  ident_len = ((ident_len < 4)?ident_len:4);
+  while ((i < ident_len) && ((*ident) <= (*prefix_ptr)))
+  {
+    *ret_ptr++ = *prefix_ptr++;
+    ident++;
+    i++;
+  }
+  if (i == ident_len)
+  {
+    /* match, complete missing bits */
+    while (i < 4)
+    {
+      *ret_ptr++ = *prefix_ptr++;
+      i++;
+    }
+    oidret->len = i;
+    return 1;
+  }
+  else
+  {
+    /* i != ident_len */
+    return 0;
+  }
+}
+
+#endif /* LWIP_SNMP */
diff --git a/ext/lwip/src/core/snmp/msg_in.c b/ext/lwip/src/core/snmp/msg_in.c
new file mode 100644
index 000000000..be940c62d
--- /dev/null
+++ b/ext/lwip/src/core/snmp/msg_in.c
@@ -0,0 +1,1453 @@
+/**
+ * @file
+ * SNMP input message processing (RFC1157).
+ */
+
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/snmp.h"
+#include "lwip/snmp_asn1.h"
+#include "lwip/snmp_msg.h"
+#include "lwip/snmp_structs.h"
+#include "lwip/ip_addr.h"
+#include "lwip/memp.h"
+#include "lwip/udp.h"
+#include "lwip/stats.h"
+
+#include <string.h>
+
+/* public (non-static) constants */
+/** SNMP v1 == 0 */
+const s32_t snmp_version = 0;
+/** default SNMP community string */
+const char snmp_publiccommunity[7] = "public";
+
+/* statically allocated buffers for SNMP_CONCURRENT_REQUESTS */
+struct snmp_msg_pstat msg_input_list[SNMP_CONCURRENT_REQUESTS];
+/* UDP Protocol Control Block */
+struct udp_pcb *snmp1_pcb;
+
+static void snmp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port);
+static err_t snmp_pdu_header_check(struct pbuf *p, u16_t ofs, u16_t pdu_len, u16_t *ofs_ret, struct snmp_msg_pstat *m_stat);
+static err_t snmp_pdu_dec_varbindlist(struct pbuf *p, u16_t ofs, u16_t *ofs_ret, struct snmp_msg_pstat *m_stat);
+
+
+/**
+ * Starts SNMP Agent.
+ * Allocates UDP pcb and binds it to IP_ADDR_ANY port 161.
+ */
+void
+snmp_init(void)
+{
+  struct snmp_msg_pstat *msg_ps;
+  u8_t i;
+
+  snmp1_pcb = udp_new();
+  if (snmp1_pcb != NULL)
+  {
+    udp_recv(snmp1_pcb, snmp_recv, (void *)SNMP_IN_PORT);
+    udp_bind(snmp1_pcb, IP_ADDR_ANY, SNMP_IN_PORT);
+  }
+  msg_ps = &msg_input_list[0];
+  for (i=0; i<SNMP_CONCURRENT_REQUESTS; i++)
+  {
+    msg_ps->state = SNMP_MSG_EMPTY;
+    msg_ps->error_index = 0;
+    msg_ps->error_status = SNMP_ES_NOERROR;
+    msg_ps++;
+  }
+  trap_msg.pcb = snmp1_pcb;
+
+#ifdef SNMP_PRIVATE_MIB_INIT
+  /* If defined, this must be a function-like define to initialize the
+   * private MIB after the stack has been initialized.
+   * The private MIB can also be initialized in tcpip_callback (or after
+   * the stack is initialized), this define is only for convenience. */
+  SNMP_PRIVATE_MIB_INIT();
+#endif /* SNMP_PRIVATE_MIB_INIT */
+
+  /* The coldstart trap will only be output
+     if our outgoing interface is up & configured  */
+  snmp_coldstart_trap();
+}
+
+static void
+snmp_error_response(struct snmp_msg_pstat *msg_ps, u8_t error)
+{
+  /* move names back from outvb to invb */
+  int v;
+  struct snmp_varbind *vbi = msg_ps->invb.head;
+  struct snmp_varbind *vbo = msg_ps->outvb.head;
+  for (v=0; v<msg_ps->vb_idx; v++) {
+    vbi->ident_len = vbo->ident_len;
+    vbo->ident_len = 0;
+    vbi->ident = vbo->ident;
+    vbo->ident = NULL;
+    vbi = vbi->next;
+    vbo = vbo->next;
+  }
+  /* free outvb */
+  snmp_varbind_list_free(&msg_ps->outvb);
+  /* we send invb back */
+  msg_ps->outvb = msg_ps->invb;
+  msg_ps->invb.head = NULL;
+  msg_ps->invb.tail = NULL;
+  msg_ps->invb.count = 0;
+  msg_ps->error_status = error;
+  /* error index must be 0 for error too big */
+  msg_ps->error_index = (error != SNMP_ES_TOOBIG) ? (1 + msg_ps->vb_idx) : 0;
+  snmp_send_response(msg_ps);
+  snmp_varbind_list_free(&msg_ps->outvb);
+  msg_ps->state = SNMP_MSG_EMPTY;
+}
+
+static void
+snmp_ok_response(struct snmp_msg_pstat *msg_ps)
+{
+  err_t err_ret;
+
+  err_ret = snmp_send_response(msg_ps);
+  if (err_ret == ERR_MEM)
+  {
+    /* serious memory problem, can't return tooBig */
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_event = %"S32_F"\n",msg_ps->error_status));
+  }
+  /* free varbinds (if available) */
+  snmp_varbind_list_free(&msg_ps->invb);
+  snmp_varbind_list_free(&msg_ps->outvb);
+  msg_ps->state = SNMP_MSG_EMPTY;
+}
+
+/**
+ * Service an internal or external event for SNMP GET.
+ *
+ * @param request_id identifies requests from 0 to (SNMP_CONCURRENT_REQUESTS-1)
+ * @param msg_ps points to the assosicated message process state
+ */
+static void
+snmp_msg_get_event(u8_t request_id, struct snmp_msg_pstat *msg_ps)
+{
+  LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_get_event: msg_ps->state==%"U16_F"\n",(u16_t)msg_ps->state));
+
+  if (msg_ps->state == SNMP_MSG_EXTERNAL_GET_OBJDEF)
+  {
+    struct mib_external_node *en;
+    struct snmp_name_ptr np;
+
+    /* get_object_def() answer*/
+    en = msg_ps->ext_mib_node;
+    np = msg_ps->ext_name_ptr;
+
+    /* translate answer into a known lifeform */
+    en->get_object_def_a(request_id, np.ident_len, np.ident, &msg_ps->ext_object_def);
+    if ((msg_ps->ext_object_def.instance != MIB_OBJECT_NONE) &&
+        (msg_ps->ext_object_def.access & MIB_ACCESS_READ))
+    {
+      msg_ps->state = SNMP_MSG_EXTERNAL_GET_VALUE;
+      en->get_value_q(request_id, &msg_ps->ext_object_def);
+    }
+    else
+    {
+      en->get_object_def_pc(request_id, np.ident_len, np.ident);
+      /* search failed, object id points to unknown object (nosuchname) */
+      snmp_error_response(msg_ps,SNMP_ES_NOSUCHNAME);
+    }
+  }
+  else if (msg_ps->state == SNMP_MSG_EXTERNAL_GET_VALUE)
+  {
+    struct mib_external_node *en;
+    struct snmp_varbind *vb;
+
+    /* get_value() answer */
+    en = msg_ps->ext_mib_node;
+
+    /* allocate output varbind */
+    vb = (struct snmp_varbind *)memp_malloc(MEMP_SNMP_VARBIND);
+    if (vb != NULL)
+    {
+      vb->next = NULL;
+      vb->prev = NULL;
+
+      /* move name from invb to outvb */
+      vb->ident = msg_ps->vb_ptr->ident;
+      vb->ident_len = msg_ps->vb_ptr->ident_len;
+      /* ensure this memory is refereced once only */
+      msg_ps->vb_ptr->ident = NULL;
+      msg_ps->vb_ptr->ident_len = 0;
+
+      vb->value_type = msg_ps->ext_object_def.asn_type;
+      LWIP_ASSERT("invalid length", msg_ps->ext_object_def.v_len <= 0xff);
+      vb->value_len = (u8_t)msg_ps->ext_object_def.v_len;
+      if (vb->value_len > 0)
+      {
+        LWIP_ASSERT("SNMP_MAX_OCTET_STRING_LEN is configured too low", vb->value_len <= SNMP_MAX_VALUE_SIZE);
+        vb->value = memp_malloc(MEMP_SNMP_VALUE);
+        if (vb->value != NULL)
+        {
+          en->get_value_a(request_id, &msg_ps->ext_object_def, vb->value_len, vb->value);
+          snmp_varbind_tail_add(&msg_ps->outvb, vb);
+          /* search again (if vb_idx < msg_ps->invb.count) */
+          msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+          msg_ps->vb_idx += 1;
+        }
+        else
+        {
+          en->get_value_pc(request_id, &msg_ps->ext_object_def);
+          LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_event: no variable space\n"));
+          msg_ps->vb_ptr->ident = vb->ident;
+          msg_ps->vb_ptr->ident_len = vb->ident_len;
+          memp_free(MEMP_SNMP_VARBIND, vb);
+          snmp_error_response(msg_ps,SNMP_ES_TOOBIG);
+        }
+      }
+      else
+      {
+        /* vb->value_len == 0, empty value (e.g. empty string) */
+        en->get_value_a(request_id, &msg_ps->ext_object_def, 0, NULL);
+        vb->value = NULL;
+        snmp_varbind_tail_add(&msg_ps->outvb, vb);
+        /* search again (if vb_idx < msg_ps->invb.count) */
+        msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+        msg_ps->vb_idx += 1;
+      }
+    }
+    else
+    {
+      en->get_value_pc(request_id, &msg_ps->ext_object_def);
+      LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_event: no outvb space\n"));
+      snmp_error_response(msg_ps,SNMP_ES_TOOBIG);
+    }
+  }
+
+  while ((msg_ps->state == SNMP_MSG_SEARCH_OBJ) &&
+         (msg_ps->vb_idx < msg_ps->invb.count))
+  {
+    struct mib_node *mn;
+    struct snmp_name_ptr np;
+
+    if (msg_ps->vb_idx == 0)
+    {
+      msg_ps->vb_ptr = msg_ps->invb.head;
+    }
+    else
+    {
+      msg_ps->vb_ptr = msg_ps->vb_ptr->next;
+    }
+    /** test object identifier for .iso.org.dod.internet prefix */
+    if (snmp_iso_prefix_tst(msg_ps->vb_ptr->ident_len,  msg_ps->vb_ptr->ident))
+    {
+      mn = snmp_search_tree((struct mib_node*)&internet, msg_ps->vb_ptr->ident_len - 4,
+                             msg_ps->vb_ptr->ident + 4, &np);
+      if (mn != NULL)
+      {
+        if (mn->node_type == MIB_NODE_EX)
+        {
+          /* external object */
+          struct mib_external_node *en = (struct mib_external_node*)mn;
+
+          msg_ps->state = SNMP_MSG_EXTERNAL_GET_OBJDEF;
+          /* save en && args in msg_ps!! */
+          msg_ps->ext_mib_node = en;
+          msg_ps->ext_name_ptr = np;
+
+          en->get_object_def_q(en->addr_inf, request_id, np.ident_len, np.ident);
+        }
+        else
+        {
+          /* internal object */
+          struct obj_def object_def;
+
+          msg_ps->state = SNMP_MSG_INTERNAL_GET_OBJDEF;
+          mn->get_object_def(np.ident_len, np.ident, &object_def);
+          if ((object_def.instance != MIB_OBJECT_NONE) &&
+            (object_def.access & MIB_ACCESS_READ))
+          {
+            mn = mn;
+          }
+          else
+          {
+            /* search failed, object id points to unknown object (nosuchname) */
+            mn =  NULL;
+          }
+          if (mn != NULL)
+          {
+            struct snmp_varbind *vb;
+
+            msg_ps->state = SNMP_MSG_INTERNAL_GET_VALUE;
+            /* allocate output varbind */
+            vb = (struct snmp_varbind *)memp_malloc(MEMP_SNMP_VARBIND);
+            if (vb != NULL)
+            {
+              vb->next = NULL;
+              vb->prev = NULL;
+
+              /* move name from invb to outvb */
+              vb->ident = msg_ps->vb_ptr->ident;
+              vb->ident_len = msg_ps->vb_ptr->ident_len;
+              /* ensure this memory is refereced once only */
+              msg_ps->vb_ptr->ident = NULL;
+              msg_ps->vb_ptr->ident_len = 0;
+
+              vb->value_type = object_def.asn_type;
+              LWIP_ASSERT("invalid length", object_def.v_len <= 0xff);
+              vb->value_len = (u8_t)object_def.v_len;
+              if (vb->value_len > 0)
+              {
+                LWIP_ASSERT("SNMP_MAX_OCTET_STRING_LEN is configured too low",
+                  vb->value_len <= SNMP_MAX_VALUE_SIZE);
+                vb->value = memp_malloc(MEMP_SNMP_VALUE);
+                if (vb->value != NULL)
+                {
+                  mn->get_value(&object_def, vb->value_len, vb->value);
+                  snmp_varbind_tail_add(&msg_ps->outvb, vb);
+                  msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+                  msg_ps->vb_idx += 1;
+                }
+                else
+                {
+                  LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_event: couldn't allocate variable space\n"));
+                  msg_ps->vb_ptr->ident = vb->ident;
+                  msg_ps->vb_ptr->ident_len = vb->ident_len;
+                  vb->ident = NULL;
+                  vb->ident_len = 0;
+                  memp_free(MEMP_SNMP_VARBIND, vb);
+                  snmp_error_response(msg_ps,SNMP_ES_TOOBIG);
+                }
+              }
+              else
+              {
+                /* vb->value_len == 0, empty value (e.g. empty string) */
+                vb->value = NULL;
+                snmp_varbind_tail_add(&msg_ps->outvb, vb);
+                msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+                msg_ps->vb_idx += 1;
+              }
+            }
+            else
+            {
+              LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_event: couldn't allocate outvb space\n"));
+              snmp_error_response(msg_ps,SNMP_ES_TOOBIG);
+            }
+          }
+        }
+      }
+    }
+    else
+    {
+      mn = NULL;
+    }
+    if (mn == NULL)
+    {
+      /* mn == NULL, noSuchName */
+      snmp_error_response(msg_ps,SNMP_ES_NOSUCHNAME);
+    }
+  }
+  if ((msg_ps->state == SNMP_MSG_SEARCH_OBJ) &&
+      (msg_ps->vb_idx == msg_ps->invb.count))
+  {
+    snmp_ok_response(msg_ps);
+  }
+}
+
+/**
+ * Service an internal or external event for SNMP GETNEXT.
+ *
+ * @param request_id identifies requests from 0 to (SNMP_CONCURRENT_REQUESTS-1)
+ * @param msg_ps points to the assosicated message process state
+ */
+static void
+snmp_msg_getnext_event(u8_t request_id, struct snmp_msg_pstat *msg_ps)
+{
+  LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_getnext_event: msg_ps->state==%"U16_F"\n",(u16_t)msg_ps->state));
+
+  if (msg_ps->state == SNMP_MSG_EXTERNAL_GET_OBJDEF)
+  {
+    struct mib_external_node *en;
+
+    /* get_object_def() answer*/
+    en = msg_ps->ext_mib_node;
+
+    /* translate answer into a known lifeform */
+    en->get_object_def_a(request_id, 1, &msg_ps->ext_oid.id[msg_ps->ext_oid.len - 1], &msg_ps->ext_object_def);
+    if (msg_ps->ext_object_def.instance != MIB_OBJECT_NONE)
+    {
+      msg_ps->state = SNMP_MSG_EXTERNAL_GET_VALUE;
+      en->get_value_q(request_id, &msg_ps->ext_object_def);
+    }
+    else
+    {
+      en->get_object_def_pc(request_id, 1, &msg_ps->ext_oid.id[msg_ps->ext_oid.len - 1]);
+      /* search failed, object id points to unknown object (nosuchname) */
+      snmp_error_response(msg_ps,SNMP_ES_NOSUCHNAME);
+    }
+  }
+  else if (msg_ps->state == SNMP_MSG_EXTERNAL_GET_VALUE)
+  {
+    struct mib_external_node *en;
+    struct snmp_varbind *vb;
+
+    /* get_value() answer */
+    en = msg_ps->ext_mib_node;
+
+    LWIP_ASSERT("invalid length", msg_ps->ext_object_def.v_len <= 0xff);
+    vb = snmp_varbind_alloc(&msg_ps->ext_oid,
+                            msg_ps->ext_object_def.asn_type,
+                            (u8_t)msg_ps->ext_object_def.v_len);
+    if (vb != NULL)
+    {
+      en->get_value_a(request_id, &msg_ps->ext_object_def, vb->value_len, vb->value);
+      snmp_varbind_tail_add(&msg_ps->outvb, vb);
+      msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+      msg_ps->vb_idx += 1;
+    }
+    else
+    {
+      en->get_value_pc(request_id, &msg_ps->ext_object_def);
+      LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_getnext_event: couldn't allocate outvb space\n"));
+      snmp_error_response(msg_ps,SNMP_ES_TOOBIG);
+    }
+  }
+
+  while ((msg_ps->state == SNMP_MSG_SEARCH_OBJ) &&
+         (msg_ps->vb_idx < msg_ps->invb.count))
+  {
+    struct mib_node *mn;
+    struct snmp_obj_id oid;
+
+    if (msg_ps->vb_idx == 0)
+    {
+      msg_ps->vb_ptr = msg_ps->invb.head;
+    }
+    else
+    {
+      msg_ps->vb_ptr = msg_ps->vb_ptr->next;
+    }
+    if (snmp_iso_prefix_expand(msg_ps->vb_ptr->ident_len, msg_ps->vb_ptr->ident, &oid))
+    {
+      if (msg_ps->vb_ptr->ident_len > 3)
+      {
+        /* can offset ident_len and ident */
+        mn = snmp_expand_tree((struct mib_node*)&internet,
+                              msg_ps->vb_ptr->ident_len - 4,
+                              msg_ps->vb_ptr->ident + 4, &oid);
+      }
+      else
+      {
+        /* can't offset ident_len -4, ident + 4 */
+        mn = snmp_expand_tree((struct mib_node*)&internet, 0, NULL, &oid);
+      }
+    }
+    else
+    {
+      mn = NULL;
+    }
+    if (mn != NULL)
+    {
+      if (mn->node_type == MIB_NODE_EX)
+      {
+        /* external object */
+        struct mib_external_node *en = (struct mib_external_node*)mn;
+
+        msg_ps->state = SNMP_MSG_EXTERNAL_GET_OBJDEF;
+        /* save en && args in msg_ps!! */
+        msg_ps->ext_mib_node = en;
+        msg_ps->ext_oid = oid;
+
+        en->get_object_def_q(en->addr_inf, request_id, 1, &oid.id[oid.len - 1]);
+      }
+      else
+      {
+        /* internal object */
+        struct obj_def object_def;
+        struct snmp_varbind *vb;
+
+        msg_ps->state = SNMP_MSG_INTERNAL_GET_OBJDEF;
+        mn->get_object_def(1, &oid.id[oid.len - 1], &object_def);
+
+        LWIP_ASSERT("invalid length", object_def.v_len <= 0xff);
+        vb = snmp_varbind_alloc(&oid, object_def.asn_type, (u8_t)object_def.v_len);
+        if (vb != NULL)
+        {
+          msg_ps->state = SNMP_MSG_INTERNAL_GET_VALUE;
+          mn->get_value(&object_def, object_def.v_len, vb->value);
+          snmp_varbind_tail_add(&msg_ps->outvb, vb);
+          msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+          msg_ps->vb_idx += 1;
+        }
+        else
+        {
+          LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_recv couldn't allocate outvb space\n"));
+          snmp_error_response(msg_ps,SNMP_ES_TOOBIG);
+        }
+      }
+    }
+    if (mn == NULL)
+    {
+      /* mn == NULL, noSuchName */
+      snmp_error_response(msg_ps,SNMP_ES_NOSUCHNAME);
+    }
+  }
+  if ((msg_ps->state == SNMP_MSG_SEARCH_OBJ) &&
+      (msg_ps->vb_idx == msg_ps->invb.count))
+  {
+    snmp_ok_response(msg_ps);
+  }
+}
+
+/**
+ * Service an internal or external event for SNMP SET.
+ *
+ * @param request_id identifies requests from 0 to (SNMP_CONCURRENT_REQUESTS-1)
+ * @param msg_ps points to the assosicated message process state
+ */
+static void
+snmp_msg_set_event(u8_t request_id, struct snmp_msg_pstat *msg_ps)
+{
+  LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_msg_set_event: msg_ps->state==%"U16_F"\n",(u16_t)msg_ps->state));
+
+  if (msg_ps->state == SNMP_MSG_EXTERNAL_GET_OBJDEF)
+  {
+    struct mib_external_node *en;
+    struct snmp_name_ptr np;
+
+    /* get_object_def() answer*/
+    en = msg_ps->ext_mib_node;
+    np = msg_ps->ext_name_ptr;
+
+    /* translate answer into a known lifeform */
+    en->get_object_def_a(request_id, np.ident_len, np.ident, &msg_ps->ext_object_def);
+    if (msg_ps->ext_object_def.instance != MIB_OBJECT_NONE)
+    {
+      msg_ps->state = SNMP_MSG_EXTERNAL_SET_TEST;
+      en->set_test_q(request_id, &msg_ps->ext_object_def);
+    }
+    else
+    {
+      en->get_object_def_pc(request_id, np.ident_len, np.ident);
+      /* search failed, object id points to unknown object (nosuchname) */
+      snmp_error_response(msg_ps,SNMP_ES_NOSUCHNAME);
+    }
+  }
+  else if (msg_ps->state == SNMP_MSG_EXTERNAL_SET_TEST)
+  {
+    struct mib_external_node *en;
+
+    /* set_test() answer*/
+    en = msg_ps->ext_mib_node;
+
+    if (msg_ps->ext_object_def.access & MIB_ACCESS_WRITE)
+    {
+       if ((msg_ps->ext_object_def.asn_type == msg_ps->vb_ptr->value_type) &&
+           (en->set_test_a(request_id,&msg_ps->ext_object_def,
+                           msg_ps->vb_ptr->value_len,msg_ps->vb_ptr->value) != 0))
+      {
+        msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+        msg_ps->vb_idx += 1;
+      }
+      else
+      {
+        en->set_test_pc(request_id,&msg_ps->ext_object_def);
+        /* bad value */
+        snmp_error_response(msg_ps,SNMP_ES_BADVALUE);
+      }
+    }
+    else
+    {
+      en->set_test_pc(request_id,&msg_ps->ext_object_def);
+      /* object not available for set */
+      snmp_error_response(msg_ps,SNMP_ES_NOSUCHNAME);
+    }
+  }
+  else if (msg_ps->state == SNMP_MSG_EXTERNAL_GET_OBJDEF_S)
+  {
+    struct mib_external_node *en;
+    struct snmp_name_ptr np;
+
+    /* get_object_def() answer*/
+    en = msg_ps->ext_mib_node;
+    np = msg_ps->ext_name_ptr;
+
+    /* translate answer into a known lifeform */
+    en->get_object_def_a(request_id, np.ident_len, np.ident, &msg_ps->ext_object_def);
+    if (msg_ps->ext_object_def.instance != MIB_OBJECT_NONE)
+    {
+      msg_ps->state = SNMP_MSG_EXTERNAL_SET_VALUE;
+      en->set_value_q(request_id, &msg_ps->ext_object_def,
+                      msg_ps->vb_ptr->value_len,msg_ps->vb_ptr->value);
+    }
+    else
+    {
+      en->get_object_def_pc(request_id, np.ident_len, np.ident);
+      /* set_value failed, object has disappeared for some odd reason?? */
+      snmp_error_response(msg_ps,SNMP_ES_GENERROR);
+    }
+  }
+  else if (msg_ps->state == SNMP_MSG_EXTERNAL_SET_VALUE)
+  {
+    struct mib_external_node *en;
+
+    /** set_value_a() */
+    en = msg_ps->ext_mib_node;
+    en->set_value_a(request_id, &msg_ps->ext_object_def,
+      msg_ps->vb_ptr->value_len, msg_ps->vb_ptr->value);
+
+    /** @todo use set_value_pc() if toobig */
+    msg_ps->state = SNMP_MSG_INTERNAL_SET_VALUE;
+    msg_ps->vb_idx += 1;
+  }
+
+  /* test all values before setting */
+  while ((msg_ps->state == SNMP_MSG_SEARCH_OBJ) &&
+         (msg_ps->vb_idx < msg_ps->invb.count))
+  {
+    struct mib_node *mn;
+    struct snmp_name_ptr np;
+
+    if (msg_ps->vb_idx == 0)
+    {
+      msg_ps->vb_ptr = msg_ps->invb.head;
+    }
+    else
+    {
+      msg_ps->vb_ptr = msg_ps->vb_ptr->next;
+    }
+    /** test object identifier for .iso.org.dod.internet prefix */
+    if (snmp_iso_prefix_tst(msg_ps->vb_ptr->ident_len,  msg_ps->vb_ptr->ident))
+    {
+      mn = snmp_search_tree((struct mib_node*)&internet, msg_ps->vb_ptr->ident_len - 4,
+                             msg_ps->vb_ptr->ident + 4, &np);
+      if (mn != NULL)
+      {
+        if (mn->node_type == MIB_NODE_EX)
+        {
+          /* external object */
+          struct mib_external_node *en = (struct mib_external_node*)mn;
+
+          msg_ps->state = SNMP_MSG_EXTERNAL_GET_OBJDEF;
+          /* save en && args in msg_ps!! */
+          msg_ps->ext_mib_node = en;
+          msg_ps->ext_name_ptr = np;
+
+          en->get_object_def_q(en->addr_inf, request_id, np.ident_len, np.ident);
+        }
+        else
+        {
+          /* internal object */
+          struct obj_def object_def;
+
+          msg_ps->state = SNMP_MSG_INTERNAL_GET_OBJDEF;
+          mn->get_object_def(np.ident_len, np.ident, &object_def);
+          if (object_def.instance != MIB_OBJECT_NONE)
+          {
+            mn = mn;
+          }
+          else
+          {
+            /* search failed, object id points to unknown object (nosuchname) */
+            mn = NULL;
+          }
+          if (mn != NULL)
+          {
+            msg_ps->state = SNMP_MSG_INTERNAL_SET_TEST;
+
+            if (object_def.access & MIB_ACCESS_WRITE)
+            {
+              if ((object_def.asn_type == msg_ps->vb_ptr->value_type) &&
+                  (mn->set_test(&object_def,msg_ps->vb_ptr->value_len,msg_ps->vb_ptr->value) != 0))
+              {
+                msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+                msg_ps->vb_idx += 1;
+              }
+              else
+              {
+                /* bad value */
+                snmp_error_response(msg_ps,SNMP_ES_BADVALUE);
+              }
+            }
+            else
+            {
+              /* object not available for set */
+              snmp_error_response(msg_ps,SNMP_ES_NOSUCHNAME);
+            }
+          }
+        }
+      }
+    }
+    else
+    {
+      mn = NULL;
+    }
+    if (mn == NULL)
+    {
+      /* mn == NULL, noSuchName */
+      snmp_error_response(msg_ps,SNMP_ES_NOSUCHNAME);
+    }
+  }
+
+  if ((msg_ps->state == SNMP_MSG_SEARCH_OBJ) &&
+      (msg_ps->vb_idx == msg_ps->invb.count))
+  {
+    msg_ps->vb_idx = 0;
+    msg_ps->state = SNMP_MSG_INTERNAL_SET_VALUE;
+  }
+
+  /* set all values "atomically" (be as "atomic" as possible) */
+  while ((msg_ps->state == SNMP_MSG_INTERNAL_SET_VALUE) &&
+         (msg_ps->vb_idx < msg_ps->invb.count))
+  {
+    struct mib_node *mn;
+    struct snmp_name_ptr np;
+
+    if (msg_ps->vb_idx == 0)
+    {
+      msg_ps->vb_ptr = msg_ps->invb.head;
+    }
+    else
+    {
+      msg_ps->vb_ptr = msg_ps->vb_ptr->next;
+    }
+    /* skip iso prefix test, was done previously while settesting() */
+    mn = snmp_search_tree((struct mib_node*)&internet, msg_ps->vb_ptr->ident_len - 4,
+                           msg_ps->vb_ptr->ident + 4, &np);
+    /* check if object is still available
+       (e.g. external hot-plug thingy present?) */
+    if (mn != NULL)
+    {
+      if (mn->node_type == MIB_NODE_EX)
+      {
+        /* external object */
+        struct mib_external_node *en = (struct mib_external_node*)mn;
+
+        msg_ps->state = SNMP_MSG_EXTERNAL_GET_OBJDEF_S;
+        /* save en && args in msg_ps!! */
+        msg_ps->ext_mib_node = en;
+        msg_ps->ext_name_ptr = np;
+
+        en->get_object_def_q(en->addr_inf, request_id, np.ident_len, np.ident);
+      }
+      else
+      {
+        /* internal object */
+        struct obj_def object_def;
+
+        msg_ps->state = SNMP_MSG_INTERNAL_GET_OBJDEF_S;
+        mn->get_object_def(np.ident_len, np.ident, &object_def);
+        msg_ps->state = SNMP_MSG_INTERNAL_SET_VALUE;
+        mn->set_value(&object_def,msg_ps->vb_ptr->value_len,msg_ps->vb_ptr->value);
+        msg_ps->vb_idx += 1;
+      }
+    }
+  }
+  if ((msg_ps->state == SNMP_MSG_INTERNAL_SET_VALUE) &&
+      (msg_ps->vb_idx == msg_ps->invb.count))
+  {
+    /* simply echo the input if we can set it
+       @todo do we need to return the actual value?
+       e.g. if value is silently modified or behaves sticky? */
+    msg_ps->outvb = msg_ps->invb;
+    msg_ps->invb.head = NULL;
+    msg_ps->invb.tail = NULL;
+    msg_ps->invb.count = 0;
+    snmp_ok_response(msg_ps);
+  }
+}
+
+
+/**
+ * Handle one internal or external event.
+ * Called for one async event. (recv external/private answer)
+ *
+ * @param request_id identifies requests from 0 to (SNMP_CONCURRENT_REQUESTS-1)
+ */
+void
+snmp_msg_event(u8_t request_id)
+{
+  struct snmp_msg_pstat *msg_ps;
+
+  if (request_id < SNMP_CONCURRENT_REQUESTS)
+  {
+    msg_ps = &msg_input_list[request_id];
+    if (msg_ps->rt == SNMP_ASN1_PDU_GET_NEXT_REQ)
+    {
+      snmp_msg_getnext_event(request_id, msg_ps);
+    }
+    else if (msg_ps->rt == SNMP_ASN1_PDU_GET_REQ)
+    {
+      snmp_msg_get_event(request_id, msg_ps);
+    }
+    else if(msg_ps->rt == SNMP_ASN1_PDU_SET_REQ)
+    {
+      snmp_msg_set_event(request_id, msg_ps);
+    }
+  }
+}
+
+
+/* lwIP UDP receive callback function */
+static void
+snmp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
+{
+  struct snmp_msg_pstat *msg_ps;
+  u8_t req_idx;
+  err_t err_ret;
+  u16_t payload_len = p->tot_len;
+  u16_t payload_ofs = 0;
+  u16_t varbind_ofs = 0;
+
+  /* suppress unused argument warning */
+  LWIP_UNUSED_ARG(arg);
+
+  /* traverse input message process list, look for SNMP_MSG_EMPTY */
+  msg_ps = &msg_input_list[0];
+  req_idx = 0;
+  while ((req_idx < SNMP_CONCURRENT_REQUESTS) && (msg_ps->state != SNMP_MSG_EMPTY))
+  {
+    req_idx++;
+    msg_ps++;
+  }
+  if (req_idx == SNMP_CONCURRENT_REQUESTS)
+  {
+    /* exceeding number of concurrent requests */
+    pbuf_free(p);
+    return;
+  }
+
+  /* accepting request */
+  snmp_inc_snmpinpkts();
+  /* record used 'protocol control block' */
+  msg_ps->pcb = pcb;
+  /* source address (network order) */
+  msg_ps->sip = *addr;
+  /* source port (host order (lwIP oddity)) */
+  msg_ps->sp = port;
+
+  /* check total length, version, community, pdu type */
+  err_ret = snmp_pdu_header_check(p, payload_ofs, payload_len, &varbind_ofs, msg_ps);
+  /* Only accept requests and requests without error (be robust) */
+  /* Reject response and trap headers or error requests as input! */
+  if ((err_ret != ERR_OK) ||
+      ((msg_ps->rt != SNMP_ASN1_PDU_GET_REQ) &&
+       (msg_ps->rt != SNMP_ASN1_PDU_GET_NEXT_REQ) &&
+       (msg_ps->rt != SNMP_ASN1_PDU_SET_REQ)) ||
+      ((msg_ps->error_status != SNMP_ES_NOERROR) ||
+       (msg_ps->error_index != 0)) )
+  {
+    /* header check failed drop request silently, do not return error! */
+    pbuf_free(p);
+    LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_pdu_header_check() failed\n"));
+    return;
+  }
+  LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_recv ok, community %s\n", msg_ps->community));
+
+  /* Builds a list of variable bindings. Copy the varbinds from the pbuf
+    chain to glue them when these are divided over two or more pbuf's. */
+  err_ret = snmp_pdu_dec_varbindlist(p, varbind_ofs, &varbind_ofs, msg_ps);
+  /* we've decoded the incoming message, release input msg now */
+  pbuf_free(p);
+  if ((err_ret != ERR_OK) || (msg_ps->invb.count == 0))
+  {
+    /* varbind-list decode failed, or varbind list empty.
+       drop request silently, do not return error!
+       (errors are only returned for a specific varbind failure) */
+    LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_pdu_dec_varbindlist() failed\n"));
+    return;
+  }
+
+  msg_ps->error_status = SNMP_ES_NOERROR;
+  msg_ps->error_index = 0;
+  /* find object for each variable binding */
+  msg_ps->state = SNMP_MSG_SEARCH_OBJ;
+  /* first variable binding from list to inspect */
+  msg_ps->vb_idx = 0;
+
+  LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_recv varbind cnt=%"U16_F"\n",(u16_t)msg_ps->invb.count));
+
+  /* handle input event and as much objects as possible in one go */
+  snmp_msg_event(req_idx);
+}
+
+/**
+ * Checks and decodes incoming SNMP message header, logs header errors.
+ *
+ * @param p points to pbuf chain of SNMP message (UDP payload)
+ * @param ofs points to first octet of SNMP message
+ * @param pdu_len the length of the UDP payload
+ * @param ofs_ret returns the ofset of the variable bindings
+ * @param m_stat points to the current message request state return
+ * @return
+ * - ERR_OK SNMP header is sane and accepted
+ * - ERR_ARG SNMP header is either malformed or rejected
+ */
+static err_t
+snmp_pdu_header_check(struct pbuf *p, u16_t ofs, u16_t pdu_len, u16_t *ofs_ret, struct snmp_msg_pstat *m_stat)
+{
+  err_t derr;
+  u16_t len, ofs_base;
+  u8_t  len_octets;
+  u8_t  type;
+  s32_t version;
+
+  ofs_base = ofs;
+  snmp_asn1_dec_type(p, ofs, &type);
+  derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+  if ((derr != ERR_OK) ||
+      (pdu_len != (1 + len_octets + len)) ||
+      (type != (SNMP_ASN1_UNIV | SNMP_ASN1_CONSTR | SNMP_ASN1_SEQ)))
+  {
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  ofs += (1 + len_octets);
+  snmp_asn1_dec_type(p, ofs, &type);
+  derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+  if ((derr != ERR_OK) || (type != (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG)))
+  {
+    /* can't decode or no integer (version) */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  derr = snmp_asn1_dec_s32t(p, ofs + 1 + len_octets, len, &version);
+  if (derr != ERR_OK)
+  {
+    /* can't decode */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  if (version != 0)
+  {
+    /* not version 1 */
+    snmp_inc_snmpinbadversions();
+    return ERR_ARG;
+  }
+  ofs += (1 + len_octets + len);
+  snmp_asn1_dec_type(p, ofs, &type);
+  derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+  if ((derr != ERR_OK) || (type != (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR)))
+  {
+    /* can't decode or no octet string (community) */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  derr = snmp_asn1_dec_raw(p, ofs + 1 + len_octets, len, SNMP_COMMUNITY_STR_LEN, m_stat->community);
+  if (derr != ERR_OK)
+  {
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  /* add zero terminator */
+  len = ((len < (SNMP_COMMUNITY_STR_LEN))?(len):(SNMP_COMMUNITY_STR_LEN));
+  m_stat->community[len] = 0;
+  m_stat->com_strlen = (u8_t)len;
+  if (strncmp(snmp_publiccommunity, (const char*)m_stat->community, SNMP_COMMUNITY_STR_LEN) != 0)
+  {
+    /** @todo: move this if we need to check more names */
+    snmp_inc_snmpinbadcommunitynames();
+    snmp_authfail_trap();
+    return ERR_ARG;
+  }
+  ofs += (1 + len_octets + len);
+  snmp_asn1_dec_type(p, ofs, &type);
+  derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+  if (derr != ERR_OK)
+  {
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  switch(type)
+  {
+    case (SNMP_ASN1_CONTXT | SNMP_ASN1_CONSTR | SNMP_ASN1_PDU_GET_REQ):
+      /* GetRequest PDU */
+      snmp_inc_snmpingetrequests();
+      derr = ERR_OK;
+      break;
+    case (SNMP_ASN1_CONTXT | SNMP_ASN1_CONSTR | SNMP_ASN1_PDU_GET_NEXT_REQ):
+      /* GetNextRequest PDU */
+      snmp_inc_snmpingetnexts();
+      derr = ERR_OK;
+      break;
+    case (SNMP_ASN1_CONTXT | SNMP_ASN1_CONSTR | SNMP_ASN1_PDU_GET_RESP):
+      /* GetResponse PDU */
+      snmp_inc_snmpingetresponses();
+      derr = ERR_ARG;
+      break;
+    case (SNMP_ASN1_CONTXT | SNMP_ASN1_CONSTR | SNMP_ASN1_PDU_SET_REQ):
+      /* SetRequest PDU */
+      snmp_inc_snmpinsetrequests();
+      derr = ERR_OK;
+      break;
+    case (SNMP_ASN1_CONTXT | SNMP_ASN1_CONSTR | SNMP_ASN1_PDU_TRAP):
+      /* Trap PDU */
+      snmp_inc_snmpintraps();
+      derr = ERR_ARG;
+      break;
+    default:
+      snmp_inc_snmpinasnparseerrs();
+      derr = ERR_ARG;
+      break;
+  }
+  if (derr != ERR_OK)
+  {
+    /* unsupported input PDU for this agent (no parse error) */
+    return ERR_ARG;
+  }
+  m_stat->rt = type & 0x1F;
+  ofs += (1 + len_octets);
+  if (len != (pdu_len - (ofs - ofs_base)))
+  {
+    /* decoded PDU length does not equal actual payload length */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  snmp_asn1_dec_type(p, ofs, &type);
+  derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+  if ((derr != ERR_OK) || (type != (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG)))
+  {
+    /* can't decode or no integer (request ID) */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  derr = snmp_asn1_dec_s32t(p, ofs + 1 + len_octets, len, &m_stat->rid);
+  if (derr != ERR_OK)
+  {
+    /* can't decode */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  ofs += (1 + len_octets + len);
+  snmp_asn1_dec_type(p, ofs, &type);
+  derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+  if ((derr != ERR_OK) || (type != (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG)))
+  {
+    /* can't decode or no integer (error-status) */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  /* must be noError (0) for incoming requests.
+     log errors for mib-2 completeness and for debug purposes */
+  derr = snmp_asn1_dec_s32t(p, ofs + 1 + len_octets, len, &m_stat->error_status);
+  if (derr != ERR_OK)
+  {
+    /* can't decode */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  switch (m_stat->error_status)
+  {
+    case SNMP_ES_TOOBIG:
+      snmp_inc_snmpintoobigs();
+      break;
+    case SNMP_ES_NOSUCHNAME:
+      snmp_inc_snmpinnosuchnames();
+      break;
+    case SNMP_ES_BADVALUE:
+      snmp_inc_snmpinbadvalues();
+      break;
+    case SNMP_ES_READONLY:
+      snmp_inc_snmpinreadonlys();
+      break;
+    case SNMP_ES_GENERROR:
+      snmp_inc_snmpingenerrs();
+      break;
+  }
+  ofs += (1 + len_octets + len);
+  snmp_asn1_dec_type(p, ofs, &type);
+  derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+  if ((derr != ERR_OK) || (type != (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG)))
+  {
+    /* can't decode or no integer (error-index) */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  /* must be 0 for incoming requests.
+     decode anyway to catch bad integers (and dirty tricks) */
+  derr = snmp_asn1_dec_s32t(p, ofs + 1 + len_octets, len, &m_stat->error_index);
+  if (derr != ERR_OK)
+  {
+    /* can't decode */
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  ofs += (1 + len_octets + len);
+  *ofs_ret = ofs;
+  return ERR_OK;
+}
+
+static err_t
+snmp_pdu_dec_varbindlist(struct pbuf *p, u16_t ofs, u16_t *ofs_ret, struct snmp_msg_pstat *m_stat)
+{
+  err_t derr;
+  u16_t len, vb_len;
+  u8_t  len_octets;
+  u8_t type;
+
+  /* variable binding list */
+  snmp_asn1_dec_type(p, ofs, &type);
+  derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &vb_len);
+  if ((derr != ERR_OK) ||
+      (type != (SNMP_ASN1_UNIV | SNMP_ASN1_CONSTR | SNMP_ASN1_SEQ)))
+  {
+    snmp_inc_snmpinasnparseerrs();
+    return ERR_ARG;
+  }
+  ofs += (1 + len_octets);
+
+  /* start with empty list */
+  m_stat->invb.count = 0;
+  m_stat->invb.head = NULL;
+  m_stat->invb.tail = NULL;
+
+  while (vb_len > 0)
+  {
+    struct snmp_obj_id oid, oid_value;
+    struct snmp_varbind *vb;
+
+    snmp_asn1_dec_type(p, ofs, &type);
+    derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+    if ((derr != ERR_OK) ||
+        (type != (SNMP_ASN1_UNIV | SNMP_ASN1_CONSTR | SNMP_ASN1_SEQ)) ||
+        (len == 0) || (len > vb_len))
+    {
+      snmp_inc_snmpinasnparseerrs();
+      /* free varbinds (if available) */
+      snmp_varbind_list_free(&m_stat->invb);
+      return ERR_ARG;
+    }
+    ofs += (1 + len_octets);
+    vb_len -= (1 + len_octets);
+
+    snmp_asn1_dec_type(p, ofs, &type);
+    derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+    if ((derr != ERR_OK) || (type != (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID)))
+    {
+      /* can't decode object name length */
+      snmp_inc_snmpinasnparseerrs();
+      /* free varbinds (if available) */
+      snmp_varbind_list_free(&m_stat->invb);
+      return ERR_ARG;
+    }
+    derr = snmp_asn1_dec_oid(p, ofs + 1 + len_octets, len, &oid);
+    if (derr != ERR_OK)
+    {
+      /* can't decode object name */
+      snmp_inc_snmpinasnparseerrs();
+      /* free varbinds (if available) */
+      snmp_varbind_list_free(&m_stat->invb);
+      return ERR_ARG;
+    }
+    ofs += (1 + len_octets + len);
+    vb_len -= (1 + len_octets + len);
+
+    snmp_asn1_dec_type(p, ofs, &type);
+    derr = snmp_asn1_dec_length(p, ofs+1, &len_octets, &len);
+    if (derr != ERR_OK)
+    {
+      /* can't decode object value length */
+      snmp_inc_snmpinasnparseerrs();
+      /* free varbinds (if available) */
+      snmp_varbind_list_free(&m_stat->invb);
+      return ERR_ARG;
+    }
+
+    switch (type)
+    {
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG):
+        vb = snmp_varbind_alloc(&oid, type, sizeof(s32_t));
+        if (vb != NULL)
+        {
+          s32_t *vptr = (s32_t*)vb->value;
+
+          derr = snmp_asn1_dec_s32t(p, ofs + 1 + len_octets, len, vptr);
+          snmp_varbind_tail_add(&m_stat->invb, vb);
+        }
+        else
+        {
+          derr = ERR_ARG;
+        }
+        break;
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS):
+        vb = snmp_varbind_alloc(&oid, type, sizeof(u32_t));
+        if (vb != NULL)
+        {
+          u32_t *vptr = (u32_t*)vb->value;
+
+          derr = snmp_asn1_dec_u32t(p, ofs + 1 + len_octets, len, vptr);
+          snmp_varbind_tail_add(&m_stat->invb, vb);
+        }
+        else
+        {
+          derr = ERR_ARG;
+        }
+        break;
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_OPAQUE):
+        LWIP_ASSERT("invalid length", len <= 0xff);
+        vb = snmp_varbind_alloc(&oid, type, (u8_t)len);
+        if (vb != NULL)
+        {
+          derr = snmp_asn1_dec_raw(p, ofs + 1 + len_octets, len, vb->value_len, (u8_t*)vb->value);
+          snmp_varbind_tail_add(&m_stat->invb, vb);
+        }
+        else
+        {
+          derr = ERR_ARG;
+        }
+        break;
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_NUL):
+        vb = snmp_varbind_alloc(&oid, type, 0);
+        if (vb != NULL)
+        {
+          snmp_varbind_tail_add(&m_stat->invb, vb);
+          derr = ERR_OK;
+        }
+        else
+        {
+          derr = ERR_ARG;
+        }
+        break;
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID):
+        derr = snmp_asn1_dec_oid(p, ofs + 1 + len_octets, len, &oid_value);
+        if (derr == ERR_OK)
+        {
+          vb = snmp_varbind_alloc(&oid, type, oid_value.len * sizeof(s32_t));
+          if (vb != NULL)
+          {
+            u8_t i = oid_value.len;
+            s32_t *vptr = (s32_t*)vb->value;
+
+            while(i > 0)
+            {
+              i--;
+              vptr[i] = oid_value.id[i];
+            }
+            snmp_varbind_tail_add(&m_stat->invb, vb);
+            derr = ERR_OK;
+          }
+          else
+          {
+            derr = ERR_ARG;
+          }
+        }
+        break;
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR):
+        if (len == 4)
+        {
+          /* must be exactly 4 octets! */
+          vb = snmp_varbind_alloc(&oid, type, 4);
+          if (vb != NULL)
+          {
+            derr = snmp_asn1_dec_raw(p, ofs + 1 + len_octets, len, vb->value_len, (u8_t*)vb->value);
+            snmp_varbind_tail_add(&m_stat->invb, vb);
+          }
+          else
+          {
+            derr = ERR_ARG;
+          }
+        }
+        else
+        {
+          derr = ERR_ARG;
+        }
+        break;
+      default:
+        derr = ERR_ARG;
+        break;
+    }
+    if (derr != ERR_OK)
+    {
+      snmp_inc_snmpinasnparseerrs();
+      /* free varbinds (if available) */
+      snmp_varbind_list_free(&m_stat->invb);
+      return ERR_ARG;
+    }
+    ofs += (1 + len_octets + len);
+    vb_len -= (1 + len_octets + len);
+  }
+
+  if (m_stat->rt == SNMP_ASN1_PDU_SET_REQ)
+  {
+    snmp_add_snmpintotalsetvars(m_stat->invb.count);
+  }
+  else
+  {
+    snmp_add_snmpintotalreqvars(m_stat->invb.count);
+  }
+
+  *ofs_ret = ofs;
+  return ERR_OK;
+}
+
+struct snmp_varbind*
+snmp_varbind_alloc(struct snmp_obj_id *oid, u8_t type, u8_t len)
+{
+  struct snmp_varbind *vb;
+
+  vb = (struct snmp_varbind *)memp_malloc(MEMP_SNMP_VARBIND);
+  if (vb != NULL)
+  {
+    u8_t i;
+
+    vb->next = NULL;
+    vb->prev = NULL;
+    i = oid->len;
+    vb->ident_len = i;
+    if (i > 0)
+    {
+      LWIP_ASSERT("SNMP_MAX_TREE_DEPTH is configured too low", i <= SNMP_MAX_TREE_DEPTH);
+      /* allocate array of s32_t for our object identifier */
+      vb->ident = (s32_t*)memp_malloc(MEMP_SNMP_VALUE);
+      if (vb->ident == NULL)
+      {
+        LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: couldn't allocate ident value space\n"));
+        memp_free(MEMP_SNMP_VARBIND, vb);
+        return NULL;
+      }
+      while(i > 0)
+      {
+        i--;
+        vb->ident[i] = oid->id[i];
+      }
+    }
+    else
+    {
+      /* i == 0, pass zero length object identifier */
+      vb->ident = NULL;
+    }
+    vb->value_type = type;
+    vb->value_len = len;
+    if (len > 0)
+    {
+      LWIP_ASSERT("SNMP_MAX_OCTET_STRING_LEN is configured too low", vb->value_len <= SNMP_MAX_VALUE_SIZE);
+      /* allocate raw bytes for our object value */
+      vb->value = memp_malloc(MEMP_SNMP_VALUE);
+      if (vb->value == NULL)
+      {
+        LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: couldn't allocate value space\n"));
+        if (vb->ident != NULL)
+        {
+          memp_free(MEMP_SNMP_VALUE, vb->ident);
+        }
+        memp_free(MEMP_SNMP_VARBIND, vb);
+        return NULL;
+      }
+    }
+    else
+    {
+      /* ASN1_NUL type, or zero length ASN1_OC_STR */
+      vb->value = NULL;
+    }
+  }
+  else
+  {
+    LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_varbind_alloc: couldn't allocate varbind space\n"));
+  }
+  return vb;
+}
+
+void
+snmp_varbind_free(struct snmp_varbind *vb)
+{
+  if (vb->value != NULL )
+  {
+    memp_free(MEMP_SNMP_VALUE, vb->value);
+  }
+  if (vb->ident != NULL )
+  {
+    memp_free(MEMP_SNMP_VALUE, vb->ident);
+  }
+  memp_free(MEMP_SNMP_VARBIND, vb);
+}
+
+void
+snmp_varbind_list_free(struct snmp_varbind_root *root)
+{
+  struct snmp_varbind *vb, *prev;
+
+  vb = root->tail;
+  while ( vb != NULL )
+  {
+    prev = vb->prev;
+    snmp_varbind_free(vb);
+    vb = prev;
+  }
+  root->count = 0;
+  root->head = NULL;
+  root->tail = NULL;
+}
+
+void
+snmp_varbind_tail_add(struct snmp_varbind_root *root, struct snmp_varbind *vb)
+{
+  if (root->count == 0)
+  {
+    /* add first varbind to list */
+    root->head = vb;
+    root->tail = vb;
+  }
+  else
+  {
+    /* add nth varbind to list tail */
+    root->tail->next = vb;
+    vb->prev = root->tail;
+    root->tail = vb;
+  }
+  root->count += 1;
+}
+
+struct snmp_varbind*
+snmp_varbind_tail_remove(struct snmp_varbind_root *root)
+{
+  struct snmp_varbind* vb;
+
+  if (root->count > 0)
+  {
+    /* remove tail varbind */
+    vb = root->tail;
+    root->tail = vb->prev;
+    vb->prev->next = NULL;
+    root->count -= 1;
+  }
+  else
+  {
+    /* nothing to remove */
+    vb = NULL;
+  }
+  return vb;
+}
+
+#endif /* LWIP_SNMP */
diff --git a/ext/lwip/src/core/snmp/msg_out.c b/ext/lwip/src/core/snmp/msg_out.c
new file mode 100644
index 000000000..485f076a5
--- /dev/null
+++ b/ext/lwip/src/core/snmp/msg_out.c
@@ -0,0 +1,674 @@
+/**
+ * @file
+ * SNMP output message processing (RFC1157).
+ *
+ * Output responses and traps are build in two passes:
+ *
+ * Pass 0: iterate over the output message backwards to determine encoding lengths
+ * Pass 1: the actual forward encoding of internal form into ASN1
+ *
+ * The single-pass encoding method described by Comer & Stevens
+ * requires extra buffer space and copying for reversal of the packet.
+ * The buffer requirement can be prohibitively large for big payloads
+ * (>= 484) therefore we use the two encoding passes.
+ */
+
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/udp.h"
+#include "lwip/netif.h"
+#include "lwip/snmp.h"
+#include "lwip/snmp_asn1.h"
+#include "lwip/snmp_msg.h"
+
+struct snmp_trap_dst
+{
+  /* destination IP address in network order */
+  ip_addr_t dip;
+  /* set to 0 when disabled, >0 when enabled */
+  u8_t enable;
+};
+struct snmp_trap_dst trap_dst[SNMP_TRAP_DESTINATIONS];
+
+/** TRAP message structure */
+struct snmp_msg_trap trap_msg;
+
+static u16_t snmp_resp_header_sum(struct snmp_msg_pstat *m_stat, u16_t vb_len);
+static u16_t snmp_trap_header_sum(struct snmp_msg_trap *m_trap, u16_t vb_len);
+static u16_t snmp_varbind_list_sum(struct snmp_varbind_root *root);
+
+static u16_t snmp_resp_header_enc(struct snmp_msg_pstat *m_stat, struct pbuf *p);
+static u16_t snmp_trap_header_enc(struct snmp_msg_trap *m_trap, struct pbuf *p);
+static u16_t snmp_varbind_list_enc(struct snmp_varbind_root *root, struct pbuf *p, u16_t ofs);
+
+/**
+ * Sets enable switch for this trap destination.
+ * @param dst_idx index in 0 .. SNMP_TRAP_DESTINATIONS-1
+ * @param enable switch if 0 destination is disabled >0 enabled.
+ */
+void
+snmp_trap_dst_enable(u8_t dst_idx, u8_t enable)
+{
+  if (dst_idx < SNMP_TRAP_DESTINATIONS)
+  {
+    trap_dst[dst_idx].enable = enable;
+  }
+}
+
+/**
+ * Sets IPv4 address for this trap destination.
+ * @param dst_idx index in 0 .. SNMP_TRAP_DESTINATIONS-1
+ * @param dst IPv4 address in host order.
+ */
+void
+snmp_trap_dst_ip_set(u8_t dst_idx, ip_addr_t *dst)
+{
+  if (dst_idx < SNMP_TRAP_DESTINATIONS)
+  {
+    ip_addr_set(&trap_dst[dst_idx].dip, dst);
+  }
+}
+
+/**
+ * Sends a 'getresponse' message to the request originator.
+ *
+ * @param m_stat points to the current message request state source
+ * @return ERR_OK when success, ERR_MEM if we're out of memory
+ *
+ * @note the caller is responsible for filling in outvb in the m_stat
+ * and provide error-status and index (except for tooBig errors) ...
+ */
+err_t
+snmp_send_response(struct snmp_msg_pstat *m_stat)
+{
+  struct snmp_varbind_root emptyvb = {NULL, NULL, 0, 0, 0};
+  struct pbuf *p;
+  u16_t tot_len;
+  err_t err;
+
+  /* pass 0, calculate length fields */
+  tot_len = snmp_varbind_list_sum(&m_stat->outvb);
+  tot_len = snmp_resp_header_sum(m_stat, tot_len);
+
+  /* try allocating pbuf(s) for complete response */
+  p = pbuf_alloc(PBUF_TRANSPORT, tot_len, PBUF_POOL);
+  if (p == NULL)
+  {
+    LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_snd_response() tooBig\n"));
+
+    /* can't construct reply, return error-status tooBig */
+    m_stat->error_status = SNMP_ES_TOOBIG;
+    m_stat->error_index = 0;
+    /* pass 0, recalculate lengths, for empty varbind-list */
+    tot_len = snmp_varbind_list_sum(&emptyvb);
+    tot_len = snmp_resp_header_sum(m_stat, tot_len);
+    /* retry allocation once for header and empty varbind-list */
+    p = pbuf_alloc(PBUF_TRANSPORT, tot_len, PBUF_POOL);
+  }
+  if (p != NULL)
+  {
+    /* first pbuf alloc try or retry alloc success */
+    u16_t ofs;
+
+    LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_snd_response() p != NULL\n"));
+
+    /* pass 1, size error, encode packet ino the pbuf(s) */
+    ofs = snmp_resp_header_enc(m_stat, p);
+    snmp_varbind_list_enc(&m_stat->outvb, p, ofs);
+
+    switch (m_stat->error_status)
+    {
+      case SNMP_ES_TOOBIG:
+        snmp_inc_snmpouttoobigs();
+        break;
+      case SNMP_ES_NOSUCHNAME:
+        snmp_inc_snmpoutnosuchnames();
+        break;
+      case SNMP_ES_BADVALUE:
+        snmp_inc_snmpoutbadvalues();
+        break;
+      case SNMP_ES_GENERROR:
+        snmp_inc_snmpoutgenerrs();
+        break;
+    }
+    snmp_inc_snmpoutgetresponses();
+    snmp_inc_snmpoutpkts();
+
+    /** @todo do we need separate rx and tx pcbs for threaded case? */
+    /** connect to the originating source */
+    udp_connect(m_stat->pcb, &m_stat->sip, m_stat->sp);
+    err = udp_send(m_stat->pcb, p);
+    if (err == ERR_MEM)
+    {
+      /** @todo release some memory, retry and return tooBig? tooMuchHassle? */
+      err = ERR_MEM;
+    }
+    else
+    {
+      err = ERR_OK;
+    }
+    /** disassociate remote address and port with this pcb */
+    udp_disconnect(m_stat->pcb);
+
+    pbuf_free(p);
+    LWIP_DEBUGF(SNMP_MSG_DEBUG, ("snmp_snd_response() done\n"));
+    return err;
+  }
+  else
+  {
+    /* first pbuf alloc try or retry alloc failed
+       very low on memory, couldn't return tooBig */
+    return ERR_MEM;
+  }
+}
+
+
+/**
+ * Sends an generic or enterprise specific trap message.
+ *
+ * @param generic_trap is the trap code
+ * @param eoid points to enterprise object identifier
+ * @param specific_trap used for enterprise traps when generic_trap == 6
+ * @return ERR_OK when success, ERR_MEM if we're out of memory
+ *
+ * @note the caller is responsible for filling in outvb in the trap_msg
+ * @note the use of the enterpise identifier field
+ * is per RFC1215.
+ * Use .iso.org.dod.internet.mgmt.mib-2.snmp for generic traps
+ * and .iso.org.dod.internet.private.enterprises.yourenterprise
+ * (sysObjectID) for specific traps.
+ */
+err_t
+snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap)
+{
+  struct snmp_trap_dst *td;
+  struct netif *dst_if;
+  ip_addr_t dst_ip;
+  struct pbuf *p;
+  u16_t i,tot_len;
+
+  for (i=0, td = &trap_dst[0]; i<SNMP_TRAP_DESTINATIONS; i++, td++)
+  {
+    if ((td->enable != 0) && !ip_addr_isany(&td->dip))
+    {
+      /* network order trap destination */
+      ip_addr_copy(trap_msg.dip, td->dip);
+      /* lookup current source address for this dst */
+      dst_if = ip_route(&td->dip);
+      ip_addr_copy(dst_ip, dst_if->ip_addr);
+      /* @todo: what about IPv6? */
+      trap_msg.sip_raw[0] = ip4_addr1(&dst_ip);
+      trap_msg.sip_raw[1] = ip4_addr2(&dst_ip);
+      trap_msg.sip_raw[2] = ip4_addr3(&dst_ip);
+      trap_msg.sip_raw[3] = ip4_addr4(&dst_ip);
+      trap_msg.gen_trap = generic_trap;
+      trap_msg.spc_trap = specific_trap;
+      if (generic_trap == SNMP_GENTRAP_ENTERPRISESPC)
+      {
+        /* enterprise-Specific trap */
+        trap_msg.enterprise = eoid;
+      }
+      else
+      {
+        /* generic (MIB-II) trap */
+        snmp_get_snmpgrpid_ptr(&trap_msg.enterprise);
+      }
+      snmp_get_sysuptime(&trap_msg.ts);
+
+      /* pass 0, calculate length fields */
+      tot_len = snmp_varbind_list_sum(&trap_msg.outvb);
+      tot_len = snmp_trap_header_sum(&trap_msg, tot_len);
+
+      /* allocate pbuf(s) */
+      p = pbuf_alloc(PBUF_TRANSPORT, tot_len, PBUF_POOL);
+      if (p != NULL)
+      {
+        u16_t ofs;
+
+        /* pass 1, encode packet ino the pbuf(s) */
+        ofs = snmp_trap_header_enc(&trap_msg, p);
+        snmp_varbind_list_enc(&trap_msg.outvb, p, ofs);
+
+        snmp_inc_snmpouttraps();
+        snmp_inc_snmpoutpkts();
+
+        /** send to the TRAP destination */
+        udp_sendto(trap_msg.pcb, p, &trap_msg.dip, SNMP_TRAP_PORT);
+
+        pbuf_free(p);
+      }
+      else
+      {
+        return ERR_MEM;
+      }
+    }
+  }
+  return ERR_OK;
+}
+
+void
+snmp_coldstart_trap(void)
+{
+  trap_msg.outvb.head = NULL;
+  trap_msg.outvb.tail = NULL;
+  trap_msg.outvb.count = 0;
+  snmp_send_trap(SNMP_GENTRAP_COLDSTART, NULL, 0);
+}
+
+void
+snmp_authfail_trap(void)
+{
+  u8_t enable;
+  snmp_get_snmpenableauthentraps(&enable);
+  if (enable == 1)
+  {
+    trap_msg.outvb.head = NULL;
+    trap_msg.outvb.tail = NULL;
+    trap_msg.outvb.count = 0;
+    snmp_send_trap(SNMP_GENTRAP_AUTHFAIL, NULL, 0);
+  }
+}
+
+/**
+ * Sums response header field lengths from tail to head and
+ * returns resp_header_lengths for second encoding pass.
+ *
+ * @param vb_len varbind-list length
+ * @param rhl points to returned header lengths
+ * @return the required lenght for encoding the response header
+ */
+static u16_t
+snmp_resp_header_sum(struct snmp_msg_pstat *m_stat, u16_t vb_len)
+{
+  u16_t tot_len;
+  struct snmp_resp_header_lengths *rhl;
+
+  rhl = &m_stat->rhl;
+  tot_len = vb_len;
+  snmp_asn1_enc_s32t_cnt(m_stat->error_index, &rhl->erridxlen);
+  snmp_asn1_enc_length_cnt(rhl->erridxlen, &rhl->erridxlenlen);
+  tot_len += 1 + rhl->erridxlenlen + rhl->erridxlen;
+
+  snmp_asn1_enc_s32t_cnt(m_stat->error_status, &rhl->errstatlen);
+  snmp_asn1_enc_length_cnt(rhl->errstatlen, &rhl->errstatlenlen);
+  tot_len += 1 + rhl->errstatlenlen + rhl->errstatlen;
+
+  snmp_asn1_enc_s32t_cnt(m_stat->rid, &rhl->ridlen);
+  snmp_asn1_enc_length_cnt(rhl->ridlen, &rhl->ridlenlen);
+  tot_len += 1 + rhl->ridlenlen + rhl->ridlen;
+
+  rhl->pdulen = tot_len;
+  snmp_asn1_enc_length_cnt(rhl->pdulen, &rhl->pdulenlen);
+  tot_len += 1 + rhl->pdulenlen;
+
+  rhl->comlen = m_stat->com_strlen;
+  snmp_asn1_enc_length_cnt(rhl->comlen, &rhl->comlenlen);
+  tot_len += 1 + rhl->comlenlen + rhl->comlen;
+
+  snmp_asn1_enc_s32t_cnt(snmp_version, &rhl->verlen);
+  snmp_asn1_enc_length_cnt(rhl->verlen, &rhl->verlenlen);
+  tot_len += 1 + rhl->verlen + rhl->verlenlen;
+
+  rhl->seqlen = tot_len;
+  snmp_asn1_enc_length_cnt(rhl->seqlen, &rhl->seqlenlen);
+  tot_len += 1 + rhl->seqlenlen;
+
+  return tot_len;
+}
+
+/**
+ * Sums trap header field lengths from tail to head and
+ * returns trap_header_lengths for second encoding pass.
+ *
+ * @param vb_len varbind-list length
+ * @param thl points to returned header lengths
+ * @return the required lenght for encoding the trap header
+ */
+static u16_t
+snmp_trap_header_sum(struct snmp_msg_trap *m_trap, u16_t vb_len)
+{
+  u16_t tot_len;
+  struct snmp_trap_header_lengths *thl;
+
+  thl = &m_trap->thl;
+  tot_len = vb_len;
+
+  snmp_asn1_enc_u32t_cnt(m_trap->ts, &thl->tslen);
+  snmp_asn1_enc_length_cnt(thl->tslen, &thl->tslenlen);
+  tot_len += 1 + thl->tslen + thl->tslenlen;
+
+  snmp_asn1_enc_s32t_cnt(m_trap->spc_trap, &thl->strplen);
+  snmp_asn1_enc_length_cnt(thl->strplen, &thl->strplenlen);
+  tot_len += 1 + thl->strplen + thl->strplenlen;
+
+  snmp_asn1_enc_s32t_cnt(m_trap->gen_trap, &thl->gtrplen);
+  snmp_asn1_enc_length_cnt(thl->gtrplen, &thl->gtrplenlen);
+  tot_len += 1 + thl->gtrplen + thl->gtrplenlen;
+
+  thl->aaddrlen = 4;
+  snmp_asn1_enc_length_cnt(thl->aaddrlen, &thl->aaddrlenlen);
+  tot_len += 1 + thl->aaddrlen + thl->aaddrlenlen;
+
+  snmp_asn1_enc_oid_cnt(m_trap->enterprise->len, &m_trap->enterprise->id[0], &thl->eidlen);
+  snmp_asn1_enc_length_cnt(thl->eidlen, &thl->eidlenlen);
+  tot_len += 1 + thl->eidlen + thl->eidlenlen;
+
+  thl->pdulen = tot_len;
+  snmp_asn1_enc_length_cnt(thl->pdulen, &thl->pdulenlen);
+  tot_len += 1 + thl->pdulenlen;
+
+  thl->comlen = sizeof(snmp_publiccommunity) - 1;
+  snmp_asn1_enc_length_cnt(thl->comlen, &thl->comlenlen);
+  tot_len += 1 + thl->comlenlen + thl->comlen;
+
+  snmp_asn1_enc_s32t_cnt(snmp_version, &thl->verlen);
+  snmp_asn1_enc_length_cnt(thl->verlen, &thl->verlenlen);
+  tot_len += 1 + thl->verlen + thl->verlenlen;
+
+  thl->seqlen = tot_len;
+  snmp_asn1_enc_length_cnt(thl->seqlen, &thl->seqlenlen);
+  tot_len += 1 + thl->seqlenlen;
+
+  return tot_len;
+}
+
+/**
+ * Sums varbind lengths from tail to head and
+ * annotates lengths in varbind for second encoding pass.
+ *
+ * @param root points to the root of the variable binding list
+ * @return the required lenght for encoding the variable bindings
+ */
+static u16_t
+snmp_varbind_list_sum(struct snmp_varbind_root *root)
+{
+  struct snmp_varbind *vb;
+  u32_t *uint_ptr;
+  s32_t *sint_ptr;
+  u16_t tot_len;
+
+  tot_len = 0;
+  vb = root->tail;
+  while ( vb != NULL )
+  {
+    /* encoded value lenght depends on type */
+    switch (vb->value_type)
+    {
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG):
+        sint_ptr = (s32_t*)vb->value;
+        snmp_asn1_enc_s32t_cnt(*sint_ptr, &vb->vlen);
+        break;
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS):
+        uint_ptr = (u32_t*)vb->value;
+        snmp_asn1_enc_u32t_cnt(*uint_ptr, &vb->vlen);
+        break;
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR):
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_NUL):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_OPAQUE):
+        vb->vlen = vb->value_len;
+        break;
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID):
+        sint_ptr = (s32_t*)vb->value;
+        snmp_asn1_enc_oid_cnt(vb->value_len / sizeof(s32_t), sint_ptr, &vb->vlen);
+        break;
+      default:
+        /* unsupported type */
+        vb->vlen = 0;
+        break;
+    };
+    /* encoding length of value length field */
+    snmp_asn1_enc_length_cnt(vb->vlen, &vb->vlenlen);
+    snmp_asn1_enc_oid_cnt(vb->ident_len, vb->ident, &vb->olen);
+    snmp_asn1_enc_length_cnt(vb->olen, &vb->olenlen);
+
+    vb->seqlen = 1 + vb->vlenlen + vb->vlen;
+    vb->seqlen += 1 + vb->olenlen + vb->olen;
+    snmp_asn1_enc_length_cnt(vb->seqlen, &vb->seqlenlen);
+
+    /* varbind seq */
+    tot_len += 1 + vb->seqlenlen + vb->seqlen;
+
+    vb = vb->prev;
+  }
+
+  /* varbind-list seq */
+  root->seqlen = tot_len;
+  snmp_asn1_enc_length_cnt(root->seqlen, &root->seqlenlen);
+  tot_len += 1 + root->seqlenlen;
+
+  return tot_len;
+}
+
+/**
+ * Encodes response header from head to tail.
+ */
+static u16_t
+snmp_resp_header_enc(struct snmp_msg_pstat *m_stat, struct pbuf *p)
+{
+  u16_t ofs;
+
+  ofs = 0;
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_CONSTR | SNMP_ASN1_SEQ));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_stat->rhl.seqlen);
+  ofs += m_stat->rhl.seqlenlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_stat->rhl.verlen);
+  ofs += m_stat->rhl.verlenlen;
+  snmp_asn1_enc_s32t(p, ofs, m_stat->rhl.verlen, snmp_version);
+  ofs += m_stat->rhl.verlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_stat->rhl.comlen);
+  ofs += m_stat->rhl.comlenlen;
+  snmp_asn1_enc_raw(p, ofs, m_stat->rhl.comlen, m_stat->community);
+  ofs += m_stat->rhl.comlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_CONTXT | SNMP_ASN1_CONSTR | SNMP_ASN1_PDU_GET_RESP));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_stat->rhl.pdulen);
+  ofs += m_stat->rhl.pdulenlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_stat->rhl.ridlen);
+  ofs += m_stat->rhl.ridlenlen;
+  snmp_asn1_enc_s32t(p, ofs, m_stat->rhl.ridlen, m_stat->rid);
+  ofs += m_stat->rhl.ridlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_stat->rhl.errstatlen);
+  ofs += m_stat->rhl.errstatlenlen;
+  snmp_asn1_enc_s32t(p, ofs, m_stat->rhl.errstatlen, m_stat->error_status);
+  ofs += m_stat->rhl.errstatlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_stat->rhl.erridxlen);
+  ofs += m_stat->rhl.erridxlenlen;
+  snmp_asn1_enc_s32t(p, ofs, m_stat->rhl.erridxlen, m_stat->error_index);
+  ofs += m_stat->rhl.erridxlen;
+
+  return ofs;
+}
+
+/**
+ * Encodes trap header from head to tail.
+ */
+static u16_t
+snmp_trap_header_enc(struct snmp_msg_trap *m_trap, struct pbuf *p)
+{
+  u16_t ofs;
+
+  ofs = 0;
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_CONSTR | SNMP_ASN1_SEQ));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.seqlen);
+  ofs += m_trap->thl.seqlenlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.verlen);
+  ofs += m_trap->thl.verlenlen;
+  snmp_asn1_enc_s32t(p, ofs, m_trap->thl.verlen, snmp_version);
+  ofs += m_trap->thl.verlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.comlen);
+  ofs += m_trap->thl.comlenlen;
+  snmp_asn1_enc_raw(p, ofs, m_trap->thl.comlen, (u8_t *)&snmp_publiccommunity[0]);
+  ofs += m_trap->thl.comlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_CONTXT | SNMP_ASN1_CONSTR | SNMP_ASN1_PDU_TRAP));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.pdulen);
+  ofs += m_trap->thl.pdulenlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.eidlen);
+  ofs += m_trap->thl.eidlenlen;
+  snmp_asn1_enc_oid(p, ofs, m_trap->enterprise->len, &m_trap->enterprise->id[0]);
+  ofs += m_trap->thl.eidlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.aaddrlen);
+  ofs += m_trap->thl.aaddrlenlen;
+  snmp_asn1_enc_raw(p, ofs, m_trap->thl.aaddrlen, &m_trap->sip_raw[0]);
+  ofs += m_trap->thl.aaddrlen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.gtrplen);
+  ofs += m_trap->thl.gtrplenlen;
+  snmp_asn1_enc_u32t(p, ofs, m_trap->thl.gtrplen, m_trap->gen_trap);
+  ofs += m_trap->thl.gtrplen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.strplen);
+  ofs += m_trap->thl.strplenlen;
+  snmp_asn1_enc_u32t(p, ofs, m_trap->thl.strplen, m_trap->spc_trap);
+  ofs += m_trap->thl.strplen;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, m_trap->thl.tslen);
+  ofs += m_trap->thl.tslenlen;
+  snmp_asn1_enc_u32t(p, ofs, m_trap->thl.tslen, m_trap->ts);
+  ofs += m_trap->thl.tslen;
+
+  return ofs;
+}
+
+/**
+ * Encodes varbind list from head to tail.
+ */
+static u16_t
+snmp_varbind_list_enc(struct snmp_varbind_root *root, struct pbuf *p, u16_t ofs)
+{
+  struct snmp_varbind *vb;
+  s32_t *sint_ptr;
+  u32_t *uint_ptr;
+  u8_t *raw_ptr;
+
+  snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_CONSTR | SNMP_ASN1_SEQ));
+  ofs += 1;
+  snmp_asn1_enc_length(p, ofs, root->seqlen);
+  ofs += root->seqlenlen;
+
+  vb = root->head;
+  while ( vb != NULL )
+  {
+    snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_CONSTR | SNMP_ASN1_SEQ));
+    ofs += 1;
+    snmp_asn1_enc_length(p, ofs, vb->seqlen);
+    ofs += vb->seqlenlen;
+
+    snmp_asn1_enc_type(p, ofs, (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID));
+    ofs += 1;
+    snmp_asn1_enc_length(p, ofs, vb->olen);
+    ofs += vb->olenlen;
+    snmp_asn1_enc_oid(p, ofs, vb->ident_len, &vb->ident[0]);
+    ofs += vb->olen;
+
+    snmp_asn1_enc_type(p, ofs, vb->value_type);
+    ofs += 1;
+    snmp_asn1_enc_length(p, ofs, vb->vlen);
+    ofs += vb->vlenlen;
+
+    switch (vb->value_type)
+    {
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG):
+        sint_ptr = (s32_t*)vb->value;
+        snmp_asn1_enc_s32t(p, ofs, vb->vlen, *sint_ptr);
+        break;
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS):
+        uint_ptr = (u32_t*)vb->value;
+        snmp_asn1_enc_u32t(p, ofs, vb->vlen, *uint_ptr);
+        break;
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR):
+      case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_OPAQUE):
+        raw_ptr = (u8_t*)vb->value;
+        snmp_asn1_enc_raw(p, ofs, vb->vlen, raw_ptr);
+        break;
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_NUL):
+        break;
+      case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID):
+        sint_ptr = (s32_t*)vb->value;
+        snmp_asn1_enc_oid(p, ofs, vb->value_len / sizeof(s32_t), sint_ptr);
+        break;
+      default:
+        /* unsupported type */
+        break;
+    };
+    ofs += vb->vlen;
+    vb = vb->next;
+  }
+  return ofs;
+}
+
+#endif /* LWIP_SNMP */
diff --git a/ext/lwip/src/core/stats.c b/ext/lwip/src/core/stats.c
new file mode 100644
index 000000000..8ea824976
--- /dev/null
+++ b/ext/lwip/src/core/stats.c
@@ -0,0 +1,176 @@
+/**
+ * @file
+ * Statistics module
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_STATS /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/def.h"
+#include "lwip/stats.h"
+#include "lwip/mem.h"
+
+#include <string.h>
+
+struct stats_ lwip_stats;
+
+void stats_init(void)
+{
+#ifdef LWIP_DEBUG
+#if MEMP_STATS
+  const char * memp_names[] = {
+#define LWIP_MEMPOOL(name,num,size,desc) desc,
+#include "lwip/memp_std.h"
+  };
+  int i;
+  for (i = 0; i < MEMP_MAX; i++) {
+    lwip_stats.memp[i].name = memp_names[i];
+  }
+#endif /* MEMP_STATS */
+#if MEM_STATS
+  lwip_stats.mem.name = "MEM";
+#endif /* MEM_STATS */
+#endif /* LWIP_DEBUG */
+}
+
+#if LWIP_STATS_DISPLAY
+void
+stats_display_proto(struct stats_proto *proto, const char *name)
+{
+  LWIP_PLATFORM_DIAG(("\n%s\n\t", name));
+  LWIP_PLATFORM_DIAG(("xmit: %"STAT_COUNTER_F"\n\t", proto->xmit)); 
+  LWIP_PLATFORM_DIAG(("recv: %"STAT_COUNTER_F"\n\t", proto->recv)); 
+  LWIP_PLATFORM_DIAG(("fw: %"STAT_COUNTER_F"\n\t", proto->fw)); 
+  LWIP_PLATFORM_DIAG(("drop: %"STAT_COUNTER_F"\n\t", proto->drop)); 
+  LWIP_PLATFORM_DIAG(("chkerr: %"STAT_COUNTER_F"\n\t", proto->chkerr)); 
+  LWIP_PLATFORM_DIAG(("lenerr: %"STAT_COUNTER_F"\n\t", proto->lenerr)); 
+  LWIP_PLATFORM_DIAG(("memerr: %"STAT_COUNTER_F"\n\t", proto->memerr)); 
+  LWIP_PLATFORM_DIAG(("rterr: %"STAT_COUNTER_F"\n\t", proto->rterr)); 
+  LWIP_PLATFORM_DIAG(("proterr: %"STAT_COUNTER_F"\n\t", proto->proterr)); 
+  LWIP_PLATFORM_DIAG(("opterr: %"STAT_COUNTER_F"\n\t", proto->opterr)); 
+  LWIP_PLATFORM_DIAG(("err: %"STAT_COUNTER_F"\n\t", proto->err)); 
+  LWIP_PLATFORM_DIAG(("cachehit: %"STAT_COUNTER_F"\n", proto->cachehit)); 
+}
+
+#if IGMP_STATS
+void
+stats_display_igmp(struct stats_igmp *igmp)
+{
+  LWIP_PLATFORM_DIAG(("\nIGMP\n\t"));
+  LWIP_PLATFORM_DIAG(("xmit: %"STAT_COUNTER_F"\n\t", igmp->xmit)); 
+  LWIP_PLATFORM_DIAG(("recv: %"STAT_COUNTER_F"\n\t", igmp->recv)); 
+  LWIP_PLATFORM_DIAG(("drop: %"STAT_COUNTER_F"\n\t", igmp->drop)); 
+  LWIP_PLATFORM_DIAG(("chkerr: %"STAT_COUNTER_F"\n\t", igmp->chkerr)); 
+  LWIP_PLATFORM_DIAG(("lenerr: %"STAT_COUNTER_F"\n\t", igmp->lenerr)); 
+  LWIP_PLATFORM_DIAG(("memerr: %"STAT_COUNTER_F"\n\t", igmp->memerr)); 
+  LWIP_PLATFORM_DIAG(("proterr: %"STAT_COUNTER_F"\n\t", igmp->proterr)); 
+  LWIP_PLATFORM_DIAG(("rx_v1: %"STAT_COUNTER_F"\n\t", igmp->rx_v1)); 
+  LWIP_PLATFORM_DIAG(("rx_group: %"STAT_COUNTER_F"\n", igmp->rx_group));
+  LWIP_PLATFORM_DIAG(("rx_general: %"STAT_COUNTER_F"\n", igmp->rx_general));
+  LWIP_PLATFORM_DIAG(("rx_report: %"STAT_COUNTER_F"\n\t", igmp->rx_report)); 
+  LWIP_PLATFORM_DIAG(("tx_join: %"STAT_COUNTER_F"\n\t", igmp->tx_join)); 
+  LWIP_PLATFORM_DIAG(("tx_leave: %"STAT_COUNTER_F"\n\t", igmp->tx_leave)); 
+  LWIP_PLATFORM_DIAG(("tx_report: %"STAT_COUNTER_F"\n\t", igmp->tx_report)); 
+}
+#endif /* IGMP_STATS */
+
+#if MEM_STATS || MEMP_STATS
+void
+stats_display_mem(struct stats_mem *mem, const char *name)
+{
+  LWIP_PLATFORM_DIAG(("\nMEM %s\n\t", name));
+  LWIP_PLATFORM_DIAG(("avail: %"U32_F"\n\t", (u32_t)mem->avail)); 
+  LWIP_PLATFORM_DIAG(("used: %"U32_F"\n\t", (u32_t)mem->used)); 
+  LWIP_PLATFORM_DIAG(("max: %"U32_F"\n\t", (u32_t)mem->max)); 
+  LWIP_PLATFORM_DIAG(("err: %"U32_F"\n", (u32_t)mem->err));
+}
+
+#if MEMP_STATS
+void
+stats_display_memp(struct stats_mem *mem, int index)
+{
+  char * memp_names[] = {
+#define LWIP_MEMPOOL(name,num,size,desc) desc,
+#include "lwip/memp_std.h"
+  };
+  if(index < MEMP_MAX) {
+    stats_display_mem(mem, memp_names[index]);
+  }
+}
+#endif /* MEMP_STATS */
+#endif /* MEM_STATS || MEMP_STATS */
+
+#if SYS_STATS
+void
+stats_display_sys(struct stats_sys *sys)
+{
+  LWIP_PLATFORM_DIAG(("\nSYS\n\t"));
+  LWIP_PLATFORM_DIAG(("sem.used:  %"U32_F"\n\t", (u32_t)sys->sem.used)); 
+  LWIP_PLATFORM_DIAG(("sem.max:   %"U32_F"\n\t", (u32_t)sys->sem.max)); 
+  LWIP_PLATFORM_DIAG(("sem.err:   %"U32_F"\n\t", (u32_t)sys->sem.err)); 
+  LWIP_PLATFORM_DIAG(("mutex.used: %"U32_F"\n\t", (u32_t)sys->mutex.used)); 
+  LWIP_PLATFORM_DIAG(("mutex.max:  %"U32_F"\n\t", (u32_t)sys->mutex.max)); 
+  LWIP_PLATFORM_DIAG(("mutex.err:  %"U32_F"\n\t", (u32_t)sys->mutex.err)); 
+  LWIP_PLATFORM_DIAG(("mbox.used:  %"U32_F"\n\t", (u32_t)sys->mbox.used)); 
+  LWIP_PLATFORM_DIAG(("mbox.max:   %"U32_F"\n\t", (u32_t)sys->mbox.max)); 
+  LWIP_PLATFORM_DIAG(("mbox.err:   %"U32_F"\n\t", (u32_t)sys->mbox.err)); 
+}
+#endif /* SYS_STATS */
+
+void
+stats_display(void)
+{
+  s16_t i;
+
+  LINK_STATS_DISPLAY();
+  ETHARP_STATS_DISPLAY();
+  IPFRAG_STATS_DISPLAY();
+  IP_STATS_DISPLAY();
+  IGMP_STATS_DISPLAY();
+  ICMP_STATS_DISPLAY();
+  UDP_STATS_DISPLAY();
+  TCP_STATS_DISPLAY();
+  MEM_STATS_DISPLAY();
+  for (i = 0; i < MEMP_MAX; i++) {
+    MEMP_STATS_DISPLAY(i);
+  }
+  SYS_STATS_DISPLAY();
+}
+#endif /* LWIP_STATS_DISPLAY */
+
+#endif /* LWIP_STATS */
+
diff --git a/ext/lwip/src/core/sys.c b/ext/lwip/src/core/sys.c
new file mode 100644
index 000000000..f17773726
--- /dev/null
+++ b/ext/lwip/src/core/sys.c
@@ -0,0 +1,68 @@
+/**
+ * @file
+ * lwIP Operating System abstraction
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/sys.h"
+
+/* Most of the functions defined in sys.h must be implemented in the
+ * architecture-dependent file sys_arch.c */
+
+#if !NO_SYS
+
+#ifndef sys_msleep
+/**
+ * Sleep for some ms. Timeouts are NOT processed while sleeping.
+ *
+ * @param ms number of milliseconds to sleep
+ */
+void
+sys_msleep(u32_t ms)
+{
+  if (ms > 0) {
+    sys_sem_t delaysem;
+    err_t err = sys_sem_new(&delaysem, 0);
+    if (err == ERR_OK) {
+      sys_arch_sem_wait(&delaysem, ms);
+      sys_sem_free(&delaysem);
+    }
+  }
+}
+#endif /* sys_msleep */
+
+#endif /* !NO_SYS */
diff --git a/ext/lwip/src/core/tcp.c b/ext/lwip/src/core/tcp.c
new file mode 100644
index 000000000..105b68e74
--- /dev/null
+++ b/ext/lwip/src/core/tcp.c
@@ -0,0 +1,1742 @@
+/**
+ * @file
+ * Transmission Control Protocol for IP
+ *
+ * This file contains common functions for the TCP implementation, such as functinos
+ * for manipulating the data structures and the TCP timer functions. TCP functions
+ * related to input and output is found in tcp_in.c and tcp_out.c respectively.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+#include "lwip/snmp.h"
+#include "lwip/tcp.h"
+#include "lwip/tcp_impl.h"
+#include "lwip/debug.h"
+#include "lwip/stats.h"
+
+#include <string.h>
+
+#ifndef TCP_LOCAL_PORT_RANGE_START
+/* From http://www.iana.org/assignments/port-numbers:
+   "The Dynamic and/or Private Ports are those from 49152 through 65535" */
+#define TCP_LOCAL_PORT_RANGE_START        0xc000
+#define TCP_LOCAL_PORT_RANGE_END          0xffff
+#define TCP_ENSURE_LOCAL_PORT_RANGE(port) (((port) & ~TCP_LOCAL_PORT_RANGE_START) + TCP_LOCAL_PORT_RANGE_START)
+#endif
+
+#if LWIP_TCP_KEEPALIVE
+#define TCP_KEEP_DUR(pcb)   ((pcb)->keep_cnt * (pcb)->keep_intvl)
+#define TCP_KEEP_INTVL(pcb) ((pcb)->keep_intvl)
+#else /* LWIP_TCP_KEEPALIVE */
+#define TCP_KEEP_DUR(pcb)   TCP_MAXIDLE
+#define TCP_KEEP_INTVL(pcb) TCP_KEEPINTVL_DEFAULT
+#endif /* LWIP_TCP_KEEPALIVE */
+
+const char * const tcp_state_str[] = {
+  "CLOSED",
+  "LISTEN",
+  "SYN_SENT",
+  "SYN_RCVD",
+  "ESTABLISHED",
+  "FIN_WAIT_1",
+  "FIN_WAIT_2",
+  "CLOSE_WAIT",
+  "CLOSING",
+  "LAST_ACK",
+  "TIME_WAIT"
+};
+
+/* last local TCP port */
+static u16_t tcp_port = TCP_LOCAL_PORT_RANGE_START;
+
+/* Incremented every coarse grained timer shot (typically every 500 ms). */
+u32_t tcp_ticks;
+const u8_t tcp_backoff[13] =
+    { 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7};
+ /* Times per slowtmr hits */
+const u8_t tcp_persist_backoff[7] = { 3, 6, 12, 24, 48, 96, 120 };
+
+/* The TCP PCB lists. */
+
+/** List of all TCP PCBs bound but not yet (connected || listening) */
+struct tcp_pcb *tcp_bound_pcbs;
+/** List of all TCP PCBs in LISTEN state */
+union tcp_listen_pcbs_t tcp_listen_pcbs;
+/** List of all TCP PCBs that are in a state in which
+ * they accept or send data. */
+struct tcp_pcb *tcp_active_pcbs;
+/** List of all TCP PCBs in TIME-WAIT state */
+struct tcp_pcb *tcp_tw_pcbs;
+
+#define NUM_TCP_PCB_LISTS               4
+#define NUM_TCP_PCB_LISTS_NO_TIME_WAIT  3
+/** An array with all (non-temporary) PCB lists, mainly used for smaller code size */
+struct tcp_pcb ** const tcp_pcb_lists[] = {&tcp_listen_pcbs.pcbs, &tcp_bound_pcbs,
+  &tcp_active_pcbs, &tcp_tw_pcbs};
+
+/** Only used for temporary storage. */
+struct tcp_pcb *tcp_tmp_pcb;
+
+u8_t tcp_active_pcbs_changed;
+
+/** Timer counter to handle calling slow-timer from tcp_tmr() */
+static u8_t tcp_timer;
+static u8_t tcp_timer_ctr;
+static u16_t tcp_new_port(void);
+
+/**
+ * Initialize this module.
+ */
+void
+tcp_init(void)
+{
+#if LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS && defined(LWIP_RAND)
+  tcp_port = TCP_ENSURE_LOCAL_PORT_RANGE(LWIP_RAND());
+#endif /* LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS && defined(LWIP_RAND) */
+}
+
+/**
+ * Called periodically to dispatch TCP timers.
+ */
+void
+tcp_tmr(void)
+{
+  /* Call tcp_fasttmr() every 250 ms */
+  tcp_fasttmr();
+
+  if (++tcp_timer & 1) {
+    /* Call tcp_tmr() every 500 ms, i.e., every other timer
+       tcp_tmr() is called. */
+    tcp_slowtmr();
+  }
+}
+
+/**
+ * Closes the TX side of a connection held by the PCB.
+ * For tcp_close(), a RST is sent if the application didn't receive all data
+ * (tcp_recved() not called for all data passed to recv callback).
+ *
+ * Listening pcbs are freed and may not be referenced any more.
+ * Connection pcbs are freed if not yet connected and may not be referenced
+ * any more. If a connection is established (at least SYN received or in
+ * a closing state), the connection is closed, and put in a closing state.
+ * The pcb is then automatically freed in tcp_slowtmr(). It is therefore
+ * unsafe to reference it.
+ *
+ * @param pcb the tcp_pcb to close
+ * @return ERR_OK if connection has been closed
+ *         another err_t if closing failed and pcb is not freed
+ */
+static err_t
+tcp_close_shutdown(struct tcp_pcb *pcb, u8_t rst_on_unacked_data)
+{
+  err_t err;
+
+  if (rst_on_unacked_data && ((pcb->state == ESTABLISHED) || (pcb->state == CLOSE_WAIT))) {
+    if ((pcb->refused_data != NULL) || (pcb->rcv_wnd != TCP_WND)) {
+      /* Not all data received by application, send RST to tell the remote
+         side about this. */
+      LWIP_ASSERT("pcb->flags & TF_RXCLOSED", pcb->flags & TF_RXCLOSED);
+
+      /* don't call tcp_abort here: we must not deallocate the pcb since
+         that might not be expected when calling tcp_close */
+      tcp_rst(pcb->snd_nxt, pcb->rcv_nxt, &pcb->local_ip, &pcb->remote_ip,
+        pcb->local_port, pcb->remote_port);
+
+      tcp_pcb_purge(pcb);
+      TCP_RMV_ACTIVE(pcb);
+      if (pcb->state == ESTABLISHED) {
+        /* move to TIME_WAIT since we close actively */
+        pcb->state = TIME_WAIT;
+        TCP_REG(&tcp_tw_pcbs, pcb);
+      } else {
+        /* CLOSE_WAIT: deallocate the pcb since we already sent a RST for it */
+        memp_free(MEMP_TCP_PCB, pcb);
+      }
+      return ERR_OK;
+    }
+  }
+
+  switch (pcb->state) {
+  case CLOSED:
+    /* Closing a pcb in the CLOSED state might seem erroneous,
+     * however, it is in this state once allocated and as yet unused
+     * and the user needs some way to free it should the need arise.
+     * Calling tcp_close() with a pcb that has already been closed, (i.e. twice)
+     * or for a pcb that has been used and then entered the CLOSED state
+     * is erroneous, but this should never happen as the pcb has in those cases
+     * been freed, and so any remaining handles are bogus. */
+    err = ERR_OK;
+    if (pcb->local_port != 0) {
+      TCP_RMV(&tcp_bound_pcbs, pcb);
+    }
+    memp_free(MEMP_TCP_PCB, pcb);
+    pcb = NULL;
+    break;
+  case LISTEN:
+    err = ERR_OK;
+    tcp_pcb_remove(&tcp_listen_pcbs.pcbs, pcb);
+    memp_free(MEMP_TCP_PCB_LISTEN, pcb);
+    pcb = NULL;
+    break;
+  case SYN_SENT:
+    err = ERR_OK;
+    TCP_PCB_REMOVE_ACTIVE(pcb);
+    memp_free(MEMP_TCP_PCB, pcb);
+    pcb = NULL;
+    snmp_inc_tcpattemptfails();
+    break;
+  case SYN_RCVD:
+    err = tcp_send_fin(pcb);
+    if (err == ERR_OK) {
+      snmp_inc_tcpattemptfails();
+      pcb->state = FIN_WAIT_1;
+    }
+    break;
+  case ESTABLISHED:
+    err = tcp_send_fin(pcb);
+    if (err == ERR_OK) {
+      snmp_inc_tcpestabresets();
+      pcb->state = FIN_WAIT_1;
+    }
+    break;
+  case CLOSE_WAIT:
+    err = tcp_send_fin(pcb);
+    if (err == ERR_OK) {
+      snmp_inc_tcpestabresets();
+      pcb->state = LAST_ACK;
+    }
+    break;
+  default:
+    /* Has already been closed, do nothing. */
+    err = ERR_OK;
+    pcb = NULL;
+    break;
+  }
+
+  if (pcb != NULL && err == ERR_OK) {
+    /* To ensure all data has been sent when tcp_close returns, we have
+       to make sure tcp_output doesn't fail.
+       Since we don't really have to ensure all data has been sent when tcp_close
+       returns (unsent data is sent from tcp timer functions, also), we don't care
+       for the return value of tcp_output for now. */
+    /* @todo: When implementing SO_LINGER, this must be changed somehow:
+       If SOF_LINGER is set, the data should be sent and acked before close returns.
+       This can only be valid for sequential APIs, not for the raw API. */
+    tcp_output(pcb);
+  }
+  return err;
+}
+
+/**
+ * Closes the connection held by the PCB.
+ *
+ * Listening pcbs are freed and may not be referenced any more.
+ * Connection pcbs are freed if not yet connected and may not be referenced
+ * any more. If a connection is established (at least SYN received or in
+ * a closing state), the connection is closed, and put in a closing state.
+ * The pcb is then automatically freed in tcp_slowtmr(). It is therefore
+ * unsafe to reference it (unless an error is returned).
+ *
+ * @param pcb the tcp_pcb to close
+ * @return ERR_OK if connection has been closed
+ *         another err_t if closing failed and pcb is not freed
+ */
+err_t
+tcp_close(struct tcp_pcb *pcb)
+{
+#if TCP_DEBUG
+  LWIP_DEBUGF(TCP_DEBUG, ("tcp_close: closing in "));
+  tcp_debug_print_state(pcb->state);
+#endif /* TCP_DEBUG */
+
+  if (pcb->state != LISTEN) {
+    /* Set a flag not to receive any more data... */
+    pcb->flags |= TF_RXCLOSED;
+  }
+  /* ... and close */
+  return tcp_close_shutdown(pcb, 1);
+}
+
+/**
+ * Causes all or part of a full-duplex connection of this PCB to be shut down.
+ * This doesn't deallocate the PCB unless shutting down both sides!
+ * Shutting down both sides is the same as calling tcp_close, so if it succeds,
+ * the PCB should not be referenced any more.
+ *
+ * @param pcb PCB to shutdown
+ * @param shut_rx shut down receive side if this is != 0
+ * @param shut_tx shut down send side if this is != 0
+ * @return ERR_OK if shutdown succeeded (or the PCB has already been shut down)
+ *         another err_t on error.
+ */
+err_t
+tcp_shutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx)
+{
+  if (pcb->state == LISTEN) {
+    return ERR_CONN;
+  }
+  if (shut_rx) {
+    /* shut down the receive side: set a flag not to receive any more data... */
+    pcb->flags |= TF_RXCLOSED;
+    if (shut_tx) {
+      /* shutting down the tx AND rx side is the same as closing for the raw API */
+      return tcp_close_shutdown(pcb, 1);
+    }
+    /* ... and free buffered data */
+    if (pcb->refused_data != NULL) {
+      pbuf_free(pcb->refused_data);
+      pcb->refused_data = NULL;
+    }
+  }
+  if (shut_tx) {
+    /* This can't happen twice since if it succeeds, the pcb's state is changed.
+       Only close in these states as the others directly deallocate the PCB */
+    switch (pcb->state) {
+    case SYN_RCVD:
+    case ESTABLISHED:
+    case CLOSE_WAIT:
+      return tcp_close_shutdown(pcb, shut_rx);
+    default:
+      /* Not (yet?) connected, cannot shutdown the TX side as that would bring us
+        into CLOSED state, where the PCB is deallocated. */
+      return ERR_CONN;
+    }
+  }
+  return ERR_OK;
+}
+
+/**
+ * Abandons a connection and optionally sends a RST to the remote
+ * host.  Deletes the local protocol control block. This is done when
+ * a connection is killed because of shortage of memory.
+ *
+ * @param pcb the tcp_pcb to abort
+ * @param reset boolean to indicate whether a reset should be sent
+ */
+void
+tcp_abandon(struct tcp_pcb *pcb, int reset)
+{
+  u32_t seqno, ackno;
+#if LWIP_CALLBACK_API
+  tcp_err_fn errf;
+#endif /* LWIP_CALLBACK_API */
+  void *errf_arg;
+
+  /* pcb->state LISTEN not allowed here */
+  LWIP_ASSERT("don't call tcp_abort/tcp_abandon for listen-pcbs",
+    pcb->state != LISTEN);
+  /* Figure out on which TCP PCB list we are, and remove us. If we
+     are in an active state, call the receive function associated with
+     the PCB with a NULL argument, and send an RST to the remote end. */
+  if (pcb->state == TIME_WAIT) {
+    tcp_pcb_remove(&tcp_tw_pcbs, pcb);
+    memp_free(MEMP_TCP_PCB, pcb);
+  } else {
+    seqno = pcb->snd_nxt;
+    ackno = pcb->rcv_nxt;
+#if LWIP_CALLBACK_API
+    errf = pcb->errf;
+#endif /* LWIP_CALLBACK_API */
+    errf_arg = pcb->callback_arg;
+    TCP_PCB_REMOVE_ACTIVE(pcb);
+    if (pcb->unacked != NULL) {
+      tcp_segs_free(pcb->unacked);
+    }
+    if (pcb->unsent != NULL) {
+      tcp_segs_free(pcb->unsent);
+    }
+#if TCP_QUEUE_OOSEQ
+    if (pcb->ooseq != NULL) {
+      tcp_segs_free(pcb->ooseq);
+    }
+#endif /* TCP_QUEUE_OOSEQ */
+    if (reset) {
+      LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_abandon: sending RST\n"));
+      tcp_rst(seqno, ackno, &pcb->local_ip, &pcb->remote_ip, pcb->local_port, pcb->remote_port);
+    }
+    memp_free(MEMP_TCP_PCB, pcb);
+    TCP_EVENT_ERR(errf, errf_arg, ERR_ABRT);
+  }
+}
+
+/**
+ * Aborts the connection by sending a RST (reset) segment to the remote
+ * host. The pcb is deallocated. This function never fails.
+ *
+ * ATTENTION: When calling this from one of the TCP callbacks, make
+ * sure you always return ERR_ABRT (and never return ERR_ABRT otherwise
+ * or you will risk accessing deallocated memory or memory leaks!
+ *
+ * @param pcb the tcp pcb to abort
+ */
+void
+tcp_abort(struct tcp_pcb *pcb)
+{
+  tcp_abandon(pcb, 1);
+}
+
+/**
+ * Binds the connection to a local portnumber and IP address. If the
+ * IP address is not given (i.e., ipaddr == NULL), the IP address of
+ * the outgoing network interface is used instead.
+ *
+ * @param pcb the tcp_pcb to bind (no check is done whether this pcb is
+ *        already bound!)
+ * @param ipaddr the local ip address to bind to (use IP_ADDR_ANY to bind
+ *        to any local address
+ * @param port the local port to bind to
+ * @return ERR_USE if the port is already in use
+ *         ERR_VAL if bind failed because the PCB is not in a valid state
+ *         ERR_OK if bound
+ */
+err_t
+tcp_bind(struct tcp_pcb *pcb, ip_addr_t *ipaddr, u16_t port)
+{
+  int i;
+  int max_pcb_list = NUM_TCP_PCB_LISTS;
+  struct tcp_pcb *cpcb;
+
+  LWIP_ERROR("tcp_bind: can only bind in state CLOSED", pcb->state == CLOSED, return ERR_VAL);
+
+#if SO_REUSE
+  /* Unless the REUSEADDR flag is set,
+     we have to check the pcbs in TIME-WAIT state, also.
+     We do not dump TIME_WAIT pcb's; they can still be matched by incoming
+     packets using both local and remote IP addresses and ports to distinguish.
+   */
+  if (ip_get_option(pcb, SOF_REUSEADDR)) {
+    max_pcb_list = NUM_TCP_PCB_LISTS_NO_TIME_WAIT;
+  }
+#endif /* SO_REUSE */
+
+  if (port == 0) {
+    port = tcp_new_port();
+    if (port == 0) {
+      return ERR_BUF;
+    }
+  }
+
+  /* Check if the address already is in use (on all lists) */
+  for (i = 0; i < max_pcb_list; i++) {
+    for(cpcb = *tcp_pcb_lists[i]; cpcb != NULL; cpcb = cpcb->next) {
+      if (cpcb->local_port == port) {
+#if SO_REUSE
+        /* Omit checking for the same port if both pcbs have REUSEADDR set.
+           For SO_REUSEADDR, the duplicate-check for a 5-tuple is done in
+           tcp_connect. */
+        if (!ip_get_option(pcb, SOF_REUSEADDR) ||
+            !ip_get_option(cpcb, SOF_REUSEADDR))
+#endif /* SO_REUSE */
+        {
+          if (ip_addr_isany(&(cpcb->local_ip)) ||
+              ip_addr_isany(ipaddr) ||
+              ip_addr_cmp(&(cpcb->local_ip), ipaddr)) {
+            return ERR_USE;
+          }
+        }
+      }
+    }
+  }
+
+  if (!ip_addr_isany(ipaddr)) {
+    pcb->local_ip = *ipaddr;
+  }
+  pcb->local_port = port;
+  TCP_REG(&tcp_bound_pcbs, pcb);
+  LWIP_DEBUGF(TCP_DEBUG, ("tcp_bind: bind to port %"U16_F"\n", port));
+  return ERR_OK;
+}
+#if LWIP_CALLBACK_API
+/**
+ * Default accept callback if no accept callback is specified by the user.
+ */
+static err_t
+tcp_accept_null(void *arg, struct tcp_pcb *pcb, err_t err)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_UNUSED_ARG(pcb);
+  LWIP_UNUSED_ARG(err);
+
+  return ERR_ABRT;
+}
+#endif /* LWIP_CALLBACK_API */
+
+/**
+ * Set the state of the connection to be LISTEN, which means that it
+ * is able to accept incoming connections. The protocol control block
+ * is reallocated in order to consume less memory. Setting the
+ * connection to LISTEN is an irreversible process.
+ *
+ * @param pcb the original tcp_pcb
+ * @param backlog the incoming connections queue limit
+ * @return tcp_pcb used for listening, consumes less memory.
+ *
+ * @note The original tcp_pcb is freed. This function therefore has to be
+ *       called like this:
+ *             tpcb = tcp_listen(tpcb);
+ */
+struct tcp_pcb *
+tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog)
+{
+  struct tcp_pcb_listen *lpcb;
+
+  LWIP_UNUSED_ARG(backlog);
+  LWIP_ERROR("tcp_listen: pcb already connected", pcb->state == CLOSED, return NULL);
+
+  /* already listening? */
+  if (pcb->state == LISTEN) {
+    return pcb;
+  }
+#if SO_REUSE
+  if (ip_get_option(pcb, SOF_REUSEADDR)) {
+    /* Since SOF_REUSEADDR allows reusing a local address before the pcb's usage
+       is declared (listen-/connection-pcb), we have to make sure now that
+       this port is only used once for every local IP. */
+    for(lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = lpcb->next) {
+      if (lpcb->local_port == pcb->local_port) {
+        if (ip_addr_cmp(&lpcb->local_ip, &pcb->local_ip)) {
+          /* this address/port is already used */
+          return NULL;
+        }
+      }
+    }
+  }
+#endif /* SO_REUSE */
+  lpcb = (struct tcp_pcb_listen *)memp_malloc(MEMP_TCP_PCB_LISTEN);
+  if (lpcb == NULL) {
+    return NULL;
+  }
+  lpcb->callback_arg = pcb->callback_arg;
+  lpcb->local_port = pcb->local_port;
+  lpcb->state = LISTEN;
+  lpcb->prio = pcb->prio;
+  lpcb->so_options = pcb->so_options;
+  ip_set_option(lpcb, SOF_ACCEPTCONN);
+  lpcb->ttl = pcb->ttl;
+  lpcb->tos = pcb->tos;
+  ip_addr_copy(lpcb->local_ip, pcb->local_ip);
+  if (pcb->local_port != 0) {
+    TCP_RMV(&tcp_bound_pcbs, pcb);
+  }
+  memp_free(MEMP_TCP_PCB, pcb);
+#if LWIP_CALLBACK_API
+  lpcb->accept = tcp_accept_null;
+#endif /* LWIP_CALLBACK_API */
+#if TCP_LISTEN_BACKLOG
+  lpcb->accepts_pending = 0;
+  lpcb->backlog = (backlog ? backlog : 1);
+#endif /* TCP_LISTEN_BACKLOG */
+  TCP_REG(&tcp_listen_pcbs.pcbs, (struct tcp_pcb *)lpcb);
+  return (struct tcp_pcb *)lpcb;
+}
+
+/**
+ * Update the state that tracks the available window space to advertise.
+ *
+ * Returns how much extra window would be advertised if we sent an
+ * update now.
+ */
+u32_t tcp_update_rcv_ann_wnd(struct tcp_pcb *pcb)
+{
+  u32_t new_right_edge = pcb->rcv_nxt + pcb->rcv_wnd;
+
+  if (TCP_SEQ_GEQ(new_right_edge, pcb->rcv_ann_right_edge + LWIP_MIN((TCP_WND / 2), pcb->mss))) {
+    /* we can advertise more window */
+    pcb->rcv_ann_wnd = pcb->rcv_wnd;
+    return new_right_edge - pcb->rcv_ann_right_edge;
+  } else {
+    if (TCP_SEQ_GT(pcb->rcv_nxt, pcb->rcv_ann_right_edge)) {
+      /* Can happen due to other end sending out of advertised window,
+       * but within actual available (but not yet advertised) window */
+      pcb->rcv_ann_wnd = 0;
+    } else {
+      /* keep the right edge of window constant */
+      u32_t new_rcv_ann_wnd = pcb->rcv_ann_right_edge - pcb->rcv_nxt;
+      LWIP_ASSERT("new_rcv_ann_wnd <= 0xffff", new_rcv_ann_wnd <= 0xffff);
+      pcb->rcv_ann_wnd = (u16_t)new_rcv_ann_wnd;
+    }
+    return 0;
+  }
+}
+
+/**
+ * This function should be called by the application when it has
+ * processed the data. The purpose is to advertise a larger window
+ * when the data has been processed.
+ *
+ * @param pcb the tcp_pcb for which data is read
+ * @param len the amount of bytes that have been read by the application
+ */
+void
+tcp_recved(struct tcp_pcb *pcb, u16_t len)
+{
+  int wnd_inflation;
+
+  /* pcb->state LISTEN not allowed here */
+  LWIP_ASSERT("don't call tcp_recved for listen-pcbs",
+    pcb->state != LISTEN);
+  LWIP_ASSERT("tcp_recved: len would wrap rcv_wnd\n",
+              len <= 0xffff - pcb->rcv_wnd );
+
+  pcb->rcv_wnd += len;
+  if (pcb->rcv_wnd > TCP_WND) {
+    pcb->rcv_wnd = TCP_WND;
+  }
+
+  wnd_inflation = tcp_update_rcv_ann_wnd(pcb);
+
+  /* If the change in the right edge of window is significant (default
+   * watermark is TCP_WND/4), then send an explicit update now.
+   * Otherwise wait for a packet to be sent in the normal course of
+   * events (or more window to be available later) */
+  if (wnd_inflation >= TCP_WND_UPDATE_THRESHOLD) {
+    tcp_ack_now(pcb);
+    tcp_output(pcb);
+  }
+
+  LWIP_DEBUGF(TCP_DEBUG, ("tcp_recved: recveived %"U16_F" bytes, wnd %"U16_F" (%"U16_F").\n",
+         len, pcb->rcv_wnd, TCP_WND - pcb->rcv_wnd));
+}
+
+/**
+ * Allocate a new local TCP port.
+ *
+ * @return a new (free) local TCP port number
+ */
+static u16_t
+tcp_new_port(void)
+{
+  u8_t i;
+  u16_t n = 0;
+  struct tcp_pcb *pcb;
+
+again:
+  if (tcp_port++ == TCP_LOCAL_PORT_RANGE_END) {
+    tcp_port = TCP_LOCAL_PORT_RANGE_START;
+  }
+  /* Check all PCB lists. */
+  for (i = 0; i < NUM_TCP_PCB_LISTS; i++) {
+    for(pcb = *tcp_pcb_lists[i]; pcb != NULL; pcb = pcb->next) {
+      if (pcb->local_port == tcp_port) {
+        if (++n > (TCP_LOCAL_PORT_RANGE_END - TCP_LOCAL_PORT_RANGE_START)) {
+          return 0;
+        }
+        goto again;
+      }
+    }
+  }
+  return tcp_port;
+}
+
+/**
+ * Connects to another host. The function given as the "connected"
+ * argument will be called when the connection has been established.
+ *
+ * @param pcb the tcp_pcb used to establish the connection
+ * @param ipaddr the remote ip address to connect to
+ * @param port the remote tcp port to connect to
+ * @param connected callback function to call when connected (or on error)
+ * @return ERR_VAL if invalid arguments are given
+ *         ERR_OK if connect request has been sent
+ *         other err_t values if connect request couldn't be sent
+ */
+err_t
+tcp_connect(struct tcp_pcb *pcb, ip_addr_t *ipaddr, u16_t port,
+      tcp_connected_fn connected)
+{
+  err_t ret;
+  u32_t iss;
+  u16_t old_local_port;
+
+  LWIP_ERROR("tcp_connect: can only connect from state CLOSED", pcb->state == CLOSED, return ERR_ISCONN);
+
+  LWIP_DEBUGF(TCP_DEBUG, ("tcp_connect to port %"U16_F"\n", port));
+  if (ipaddr != NULL) {
+    pcb->remote_ip = *ipaddr;
+  } else {
+    return ERR_VAL;
+  }
+  pcb->remote_port = port;
+
+  /* check if we have a route to the remote host */
+  if (ip_addr_isany(&(pcb->local_ip))) {
+    /* no local IP address set, yet. */
+    struct netif *netif = ip_route(&(pcb->remote_ip));
+    if (netif == NULL) {
+      /* Don't even try to send a SYN packet if we have no route
+         since that will fail. */
+      return ERR_RTE;
+    }
+    /* Use the netif's IP address as local address. */
+    ip_addr_copy(pcb->local_ip, netif->ip_addr);
+  }
+
+  old_local_port = pcb->local_port;
+  if (pcb->local_port == 0) {
+    pcb->local_port = tcp_new_port();
+    if (pcb->local_port == 0) {
+      return ERR_BUF;
+    }
+  }
+#if SO_REUSE
+  if (ip_get_option(pcb, SOF_REUSEADDR)) {
+    /* Since SOF_REUSEADDR allows reusing a local address, we have to make sure
+       now that the 5-tuple is unique. */
+    struct tcp_pcb *cpcb;
+    int i;
+    /* Don't check listen- and bound-PCBs, check active- and TIME-WAIT PCBs. */
+    for (i = 2; i < NUM_TCP_PCB_LISTS; i++) {
+      for(cpcb = *tcp_pcb_lists[i]; cpcb != NULL; cpcb = cpcb->next) {
+        if ((cpcb->local_port == pcb->local_port) &&
+            (cpcb->remote_port == port) &&
+            ip_addr_cmp(&cpcb->local_ip, &pcb->local_ip) &&
+            ip_addr_cmp(&cpcb->remote_ip, ipaddr)) {
+          /* linux returns EISCONN here, but ERR_USE should be OK for us */
+          return ERR_USE;
+        }
+      }
+    }
+  }
+#endif /* SO_REUSE */
+  iss = tcp_next_iss();
+  pcb->rcv_nxt = 0;
+  pcb->snd_nxt = iss;
+  pcb->lastack = iss - 1;
+  pcb->snd_lbb = iss - 1;
+  pcb->rcv_wnd = TCP_WND;
+  pcb->rcv_ann_wnd = TCP_WND;
+  pcb->rcv_ann_right_edge = pcb->rcv_nxt;
+  pcb->snd_wnd = TCP_WND;
+  /* As initial send MSS, we use TCP_MSS but limit it to 536.
+     The send MSS is updated when an MSS option is received. */
+  pcb->mss = (TCP_MSS > 536) ? 536 : TCP_MSS;
+#if TCP_CALCULATE_EFF_SEND_MSS
+  pcb->mss = tcp_eff_send_mss(pcb->mss, ipaddr);
+#endif /* TCP_CALCULATE_EFF_SEND_MSS */
+  pcb->cwnd = 1;
+  pcb->ssthresh = pcb->mss * 10;
+#if LWIP_CALLBACK_API
+  pcb->connected = connected;
+#else /* LWIP_CALLBACK_API */
+  LWIP_UNUSED_ARG(connected);
+#endif /* LWIP_CALLBACK_API */
+
+  /* Send a SYN together with the MSS option. */
+  ret = tcp_enqueue_flags(pcb, TCP_SYN);
+  if (ret == ERR_OK) {
+    /* SYN segment was enqueued, changed the pcbs state now */
+    pcb->state = SYN_SENT;
+    if (old_local_port != 0) {
+      TCP_RMV(&tcp_bound_pcbs, pcb);
+    }
+    TCP_REG_ACTIVE(pcb);
+    snmp_inc_tcpactiveopens();
+
+    tcp_output(pcb);
+  }
+  return ret;
+}
+
+/**
+ * Called every 500 ms and implements the retransmission timer and the timer that
+ * removes PCBs that have been in TIME-WAIT for enough time. It also increments
+ * various timers such as the inactivity timer in each PCB.
+ *
+ * Automatically called from tcp_tmr().
+ */
+void
+tcp_slowtmr(void)
+{
+  struct tcp_pcb *pcb, *prev;
+  u16_t eff_wnd;
+  u8_t pcb_remove;      /* flag if a PCB should be removed */
+  u8_t pcb_reset;       /* flag if a RST should be sent when removing */
+  err_t err;
+
+  err = ERR_OK;
+
+  ++tcp_ticks;
+  ++tcp_timer_ctr;
+
+tcp_slowtmr_start:
+  /* Steps through all of the active PCBs. */
+  prev = NULL;
+  pcb = tcp_active_pcbs;
+  if (pcb == NULL) {
+    LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: no active pcbs\n"));
+  }
+  while (pcb != NULL) {
+    LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: processing active pcb\n"));
+    LWIP_ASSERT("tcp_slowtmr: active pcb->state != CLOSED\n", pcb->state != CLOSED);
+    LWIP_ASSERT("tcp_slowtmr: active pcb->state != LISTEN\n", pcb->state != LISTEN);
+    LWIP_ASSERT("tcp_slowtmr: active pcb->state != TIME-WAIT\n", pcb->state != TIME_WAIT);
+    if (pcb->last_timer == tcp_timer_ctr) {
+      /* skip this pcb, we have already processed it */
+      pcb = pcb->next;
+      continue;
+    }
+    pcb->last_timer = tcp_timer_ctr;
+
+    pcb_remove = 0;
+    pcb_reset = 0;
+
+    if (pcb->state == SYN_SENT && pcb->nrtx == TCP_SYNMAXRTX) {
+      ++pcb_remove;
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: max SYN retries reached\n"));
+    }
+    else if (pcb->nrtx == TCP_MAXRTX) {
+      ++pcb_remove;
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: max DATA retries reached\n"));
+    } else {
+      if (pcb->persist_backoff > 0) {
+        /* If snd_wnd is zero, use persist timer to send 1 byte probes
+         * instead of using the standard retransmission mechanism. */
+        pcb->persist_cnt++;
+        if (pcb->persist_cnt >= tcp_persist_backoff[pcb->persist_backoff-1]) {
+          pcb->persist_cnt = 0;
+          if (pcb->persist_backoff < sizeof(tcp_persist_backoff)) {
+            pcb->persist_backoff++;
+          }
+          tcp_zero_window_probe(pcb);
+        }
+      } else {
+        /* Increase the retransmission timer if it is running */
+        if(pcb->rtime >= 0) {
+          ++pcb->rtime;
+        }
+
+        if (pcb->unacked != NULL && pcb->rtime >= pcb->rto) {
+          /* Time for a retransmission. */
+          LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_slowtmr: rtime %"S16_F
+                                      " pcb->rto %"S16_F"\n",
+                                      pcb->rtime, pcb->rto));
+
+          /* Double retransmission time-out unless we are trying to
+           * connect to somebody (i.e., we are in SYN_SENT). */
+          if (pcb->state != SYN_SENT) {
+            pcb->rto = ((pcb->sa >> 3) + pcb->sv) << tcp_backoff[pcb->nrtx];
+          }
+
+          /* Reset the retransmission timer. */
+          pcb->rtime = 0;
+
+          /* Reduce congestion window and ssthresh. */
+          eff_wnd = LWIP_MIN(pcb->cwnd, pcb->snd_wnd);
+          pcb->ssthresh = eff_wnd >> 1;
+          if (pcb->ssthresh < (pcb->mss << 1)) {
+            pcb->ssthresh = (pcb->mss << 1);
+          }
+          pcb->cwnd = pcb->mss;
+          LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_slowtmr: cwnd %"U16_F
+                                       " ssthresh %"U16_F"\n",
+                                       pcb->cwnd, pcb->ssthresh));
+
+          /* The following needs to be called AFTER cwnd is set to one
+             mss - STJ */
+          tcp_rexmit_rto(pcb);
+        }
+      }
+    }
+    /* Check if this PCB has stayed too long in FIN-WAIT-2 */
+    if (pcb->state == FIN_WAIT_2) {
+      /* If this PCB is in FIN_WAIT_2 because of SHUT_WR don't let it time out. */
+      if (pcb->flags & TF_RXCLOSED) {
+        /* PCB was fully closed (either through close() or SHUT_RDWR):
+           normal FIN-WAIT timeout handling. */
+        if ((u32_t)(tcp_ticks - pcb->tmr) >
+            TCP_FIN_WAIT_TIMEOUT / TCP_SLOW_INTERVAL) {
+          ++pcb_remove;
+          LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: removing pcb stuck in FIN-WAIT-2\n"));
+        }
+      }
+    }
+
+    /* Check if KEEPALIVE should be sent */
+    if(ip_get_option(pcb, SOF_KEEPALIVE) &&
+       ((pcb->state == ESTABLISHED) ||
+        (pcb->state == CLOSE_WAIT))) {
+      if((u32_t)(tcp_ticks - pcb->tmr) >
+         (pcb->keep_idle + TCP_KEEP_DUR(pcb)) / TCP_SLOW_INTERVAL)
+      {
+        LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: KEEPALIVE timeout. Aborting connection to %"U16_F".%"U16_F".%"U16_F".%"U16_F".\n",
+                                ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip),
+                                ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip)));
+
+        ++pcb_remove;
+        ++pcb_reset;
+      }
+      else if((u32_t)(tcp_ticks - pcb->tmr) >
+              (pcb->keep_idle + pcb->keep_cnt_sent * TCP_KEEP_INTVL(pcb))
+              / TCP_SLOW_INTERVAL)
+      {
+        tcp_keepalive(pcb);
+        pcb->keep_cnt_sent++;
+      }
+    }
+
+    /* If this PCB has queued out of sequence data, but has been
+       inactive for too long, will drop the data (it will eventually
+       be retransmitted). */
+#if TCP_QUEUE_OOSEQ
+    if (pcb->ooseq != NULL &&
+        (u32_t)tcp_ticks - pcb->tmr >= pcb->rto * TCP_OOSEQ_TIMEOUT) {
+      tcp_segs_free(pcb->ooseq);
+      pcb->ooseq = NULL;
+      LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_slowtmr: dropping OOSEQ queued data\n"));
+    }
+#endif /* TCP_QUEUE_OOSEQ */
+
+    /* Check if this PCB has stayed too long in SYN-RCVD */
+    if (pcb->state == SYN_RCVD) {
+      if ((u32_t)(tcp_ticks - pcb->tmr) >
+          TCP_SYN_RCVD_TIMEOUT / TCP_SLOW_INTERVAL) {
+        ++pcb_remove;
+        LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: removing pcb stuck in SYN-RCVD\n"));
+      }
+    }
+
+    /* Check if this PCB has stayed too long in LAST-ACK */
+    if (pcb->state == LAST_ACK) {
+      if ((u32_t)(tcp_ticks - pcb->tmr) > 2 * TCP_MSL / TCP_SLOW_INTERVAL) {
+        ++pcb_remove;
+        LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: removing pcb stuck in LAST-ACK\n"));
+      }
+    }
+
+    /* If the PCB should be removed, do it. */
+    if (pcb_remove) {
+      struct tcp_pcb *pcb2;
+      tcp_err_fn err_fn;
+      void *err_arg;
+      tcp_pcb_purge(pcb);
+      /* Remove PCB from tcp_active_pcbs list. */
+      if (prev != NULL) {
+        LWIP_ASSERT("tcp_slowtmr: middle tcp != tcp_active_pcbs", pcb != tcp_active_pcbs);
+        prev->next = pcb->next;
+      } else {
+        /* This PCB was the first. */
+        LWIP_ASSERT("tcp_slowtmr: first pcb == tcp_active_pcbs", tcp_active_pcbs == pcb);
+        tcp_active_pcbs = pcb->next;
+      }
+
+      if (pcb_reset) {
+        tcp_rst(pcb->snd_nxt, pcb->rcv_nxt, &pcb->local_ip, &pcb->remote_ip,
+          pcb->local_port, pcb->remote_port);
+      }
+
+      err_fn = pcb->errf;
+      err_arg = pcb->callback_arg;
+      pcb2 = pcb;
+      pcb = pcb->next;
+      memp_free(MEMP_TCP_PCB, pcb2);
+
+      tcp_active_pcbs_changed = 0;
+      TCP_EVENT_ERR(err_fn, err_arg, ERR_ABRT);
+      if (tcp_active_pcbs_changed) {
+        goto tcp_slowtmr_start;
+      }
+    } else {
+      /* get the 'next' element now and work with 'prev' below (in case of abort) */
+      prev = pcb;
+      pcb = pcb->next;
+
+      /* We check if we should poll the connection. */
+      ++prev->polltmr;
+      if (prev->polltmr >= prev->pollinterval) {
+        prev->polltmr = 0;
+        LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: polling application\n"));
+        tcp_active_pcbs_changed = 0;
+        TCP_EVENT_POLL(prev, err);
+        if (tcp_active_pcbs_changed) {
+          goto tcp_slowtmr_start;
+        }
+        /* if err == ERR_ABRT, 'prev' is already deallocated */
+        if (err == ERR_OK) {
+          tcp_output(prev);
+        }
+      }
+    }
+  }
+
+
+  /* Steps through all of the TIME-WAIT PCBs. */
+  prev = NULL;
+  pcb = tcp_tw_pcbs;
+  while (pcb != NULL) {
+    LWIP_ASSERT("tcp_slowtmr: TIME-WAIT pcb->state == TIME-WAIT", pcb->state == TIME_WAIT);
+    pcb_remove = 0;
+
+    /* Check if this PCB has stayed long enough in TIME-WAIT */
+    if ((u32_t)(tcp_ticks - pcb->tmr) > 2 * TCP_MSL / TCP_SLOW_INTERVAL) {
+      ++pcb_remove;
+    }
+
+
+
+    /* If the PCB should be removed, do it. */
+    if (pcb_remove) {
+      struct tcp_pcb *pcb2;
+      tcp_pcb_purge(pcb);
+      /* Remove PCB from tcp_tw_pcbs list. */
+      if (prev != NULL) {
+        LWIP_ASSERT("tcp_slowtmr: middle tcp != tcp_tw_pcbs", pcb != tcp_tw_pcbs);
+        prev->next = pcb->next;
+      } else {
+        /* This PCB was the first. */
+        LWIP_ASSERT("tcp_slowtmr: first pcb == tcp_tw_pcbs", tcp_tw_pcbs == pcb);
+        tcp_tw_pcbs = pcb->next;
+      }
+      pcb2 = pcb;
+      pcb = pcb->next;
+      memp_free(MEMP_TCP_PCB, pcb2);
+    } else {
+      prev = pcb;
+      pcb = pcb->next;
+    }
+  }
+}
+
+/**
+ * Is called every TCP_FAST_INTERVAL (250 ms) and process data previously
+ * "refused" by upper layer (application) and sends delayed ACKs.
+ *
+ * Automatically called from tcp_tmr().
+ */
+void
+tcp_fasttmr(void)
+{
+  struct tcp_pcb *pcb;
+
+  ++tcp_timer_ctr;
+
+tcp_fasttmr_start:
+  pcb = tcp_active_pcbs;
+
+  while(pcb != NULL) {
+    if (pcb->last_timer != tcp_timer_ctr) {
+      struct tcp_pcb *next;
+      pcb->last_timer = tcp_timer_ctr;
+      /* send delayed ACKs */
+      if (pcb->flags & TF_ACK_DELAY) {
+        LWIP_DEBUGF(TCP_DEBUG, ("tcp_fasttmr: delayed ACK\n"));
+        tcp_ack_now(pcb);
+        tcp_output(pcb);
+        pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW);
+      }
+
+      next = pcb->next;
+
+      /* If there is data which was previously "refused" by upper layer */
+      if (pcb->refused_data != NULL) {
+        tcp_active_pcbs_changed = 0;
+        tcp_process_refused_data(pcb);
+        if (tcp_active_pcbs_changed) {
+          /* application callback has changed the pcb list: restart the loop */
+          goto tcp_fasttmr_start;
+        }
+      }
+      pcb = next;
+    }
+  }
+}
+
+/** Pass pcb->refused_data to the recv callback */
+err_t
+tcp_process_refused_data(struct tcp_pcb *pcb)
+{
+  err_t err;
+  u8_t refused_flags = pcb->refused_data->flags;
+  /* set pcb->refused_data to NULL in case the callback frees it and then
+     closes the pcb */
+  struct pbuf *refused_data = pcb->refused_data;
+  pcb->refused_data = NULL;
+  /* Notify again application with data previously received. */
+  LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: notify kept packet\n"));
+  TCP_EVENT_RECV(pcb, refused_data, ERR_OK, err);
+  if (err == ERR_OK) {
+    /* did refused_data include a FIN? */
+    if (refused_flags & PBUF_FLAG_TCP_FIN) {
+      /* correct rcv_wnd as the application won't call tcp_recved()
+         for the FIN's seqno */
+      if (pcb->rcv_wnd != TCP_WND) {
+        pcb->rcv_wnd++;
+      }
+      TCP_EVENT_CLOSED(pcb, err);
+      if (err == ERR_ABRT) {
+        return ERR_ABRT;
+      }
+    }
+  } else if (err == ERR_ABRT) {
+    /* if err == ERR_ABRT, 'pcb' is already deallocated */
+    /* Drop incoming packets because pcb is "full" (only if the incoming
+       segment contains data). */
+    LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: drop incoming packets, because pcb is \"full\"\n"));
+    return ERR_ABRT;
+  } else {
+    /* data is still refused, pbuf is still valid (go on for ACK-only packets) */
+    pcb->refused_data = refused_data;
+  }
+  return ERR_OK;
+}
+
+/**
+ * Deallocates a list of TCP segments (tcp_seg structures).
+ *
+ * @param seg tcp_seg list of TCP segments to free
+ */
+void
+tcp_segs_free(struct tcp_seg *seg)
+{
+  while (seg != NULL) {
+    struct tcp_seg *next = seg->next;
+    tcp_seg_free(seg);
+    seg = next;
+  }
+}
+
+/**
+ * Frees a TCP segment (tcp_seg structure).
+ *
+ * @param seg single tcp_seg to free
+ */
+void
+tcp_seg_free(struct tcp_seg *seg)
+{
+  if (seg != NULL) {
+    if (seg->p != NULL) {
+      pbuf_free(seg->p);
+#if TCP_DEBUG
+      seg->p = NULL;
+#endif /* TCP_DEBUG */
+    }
+    memp_free(MEMP_TCP_SEG, seg);
+  }
+}
+
+/**
+ * Sets the priority of a connection.
+ *
+ * @param pcb the tcp_pcb to manipulate
+ * @param prio new priority
+ */
+void
+tcp_setprio(struct tcp_pcb *pcb, u8_t prio)
+{
+  pcb->prio = prio;
+}
+
+#if TCP_QUEUE_OOSEQ
+/**
+ * Returns a copy of the given TCP segment.
+ * The pbuf and data are not copied, only the pointers
+ *
+ * @param seg the old tcp_seg
+ * @return a copy of seg
+ */
+struct tcp_seg *
+tcp_seg_copy(struct tcp_seg *seg)
+{
+  struct tcp_seg *cseg;
+
+  cseg = (struct tcp_seg *)memp_malloc(MEMP_TCP_SEG);
+  if (cseg == NULL) {
+    return NULL;
+  }
+  SMEMCPY((u8_t *)cseg, (const u8_t *)seg, sizeof(struct tcp_seg));
+  pbuf_ref(cseg->p);
+  return cseg;
+}
+#endif /* TCP_QUEUE_OOSEQ */
+
+#if LWIP_CALLBACK_API
+/**
+ * Default receive callback that is called if the user didn't register
+ * a recv callback for the pcb.
+ */
+err_t
+tcp_recv_null(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
+{
+  LWIP_UNUSED_ARG(arg);
+  if (p != NULL) {
+    tcp_recved(pcb, p->tot_len);
+    pbuf_free(p);
+  } else if (err == ERR_OK) {
+    return tcp_close(pcb);
+  }
+  return ERR_OK;
+}
+#endif /* LWIP_CALLBACK_API */
+
+/**
+ * Kills the oldest active connection that has the same or lower priority than
+ * 'prio'.
+ *
+ * @param prio minimum priority
+ */
+static void
+tcp_kill_prio(u8_t prio)
+{
+  struct tcp_pcb *pcb, *inactive;
+  u32_t inactivity;
+  u8_t mprio;
+
+
+  mprio = TCP_PRIO_MAX;
+
+  /* We kill the oldest active connection that has lower priority than prio. */
+  inactivity = 0;
+  inactive = NULL;
+  for(pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
+    if (pcb->prio <= prio &&
+       pcb->prio <= mprio &&
+       (u32_t)(tcp_ticks - pcb->tmr) >= inactivity) {
+      inactivity = tcp_ticks - pcb->tmr;
+      inactive = pcb;
+      mprio = pcb->prio;
+    }
+  }
+  if (inactive != NULL) {
+    LWIP_DEBUGF(TCP_DEBUG, ("tcp_kill_prio: killing oldest PCB %p (%"S32_F")\n",
+           (void *)inactive, inactivity));
+    tcp_abort(inactive);
+  }
+}
+
+/**
+ * Kills the oldest connection that is in TIME_WAIT state.
+ * Called from tcp_alloc() if no more connections are available.
+ */
+static void
+tcp_kill_timewait(void)
+{
+  struct tcp_pcb *pcb, *inactive;
+  u32_t inactivity;
+
+  inactivity = 0;
+  inactive = NULL;
+  /* Go through the list of TIME_WAIT pcbs and get the oldest pcb. */
+  for(pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) {
+    if ((u32_t)(tcp_ticks - pcb->tmr) >= inactivity) {
+      inactivity = tcp_ticks - pcb->tmr;
+      inactive = pcb;
+    }
+  }
+  if (inactive != NULL) {
+    LWIP_DEBUGF(TCP_DEBUG, ("tcp_kill_timewait: killing oldest TIME-WAIT PCB %p (%"S32_F")\n",
+           (void *)inactive, inactivity));
+    tcp_abort(inactive);
+  }
+}
+
+/**
+ * Allocate a new tcp_pcb structure.
+ *
+ * @param prio priority for the new pcb
+ * @return a new tcp_pcb that initially is in state CLOSED
+ */
+struct tcp_pcb *
+tcp_alloc(u8_t prio)
+{
+  struct tcp_pcb *pcb;
+  u32_t iss;
+
+  pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB);
+  if (pcb == NULL) {
+    /* Try killing oldest connection in TIME-WAIT. */
+    LWIP_DEBUGF(TCP_DEBUG, ("tcp_alloc: killing off oldest TIME-WAIT connection\n"));
+    tcp_kill_timewait();
+    /* Try to allocate a tcp_pcb again. */
+    pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB);
+    if (pcb == NULL) {
+      /* Try killing active connections with lower priority than the new one. */
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_alloc: killing connection with prio lower than %d\n", prio));
+      tcp_kill_prio(prio);
+      /* Try to allocate a tcp_pcb again. */
+      pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB);
+      if (pcb != NULL) {
+        /* adjust err stats: memp_malloc failed twice before */
+        MEMP_STATS_DEC(err, MEMP_TCP_PCB);
+      }
+    }
+    if (pcb != NULL) {
+      /* adjust err stats: timewait PCB was freed above */
+      MEMP_STATS_DEC(err, MEMP_TCP_PCB);
+    }
+  }
+  if (pcb != NULL) {
+    memset(pcb, 0, sizeof(struct tcp_pcb));
+    pcb->prio = prio;
+    pcb->snd_buf = TCP_SND_BUF;
+    pcb->snd_queuelen = 0;
+    pcb->rcv_wnd = TCP_WND;
+    pcb->rcv_ann_wnd = TCP_WND;
+    pcb->tos = 0;
+    pcb->ttl = TCP_TTL;
+    /* As initial send MSS, we use TCP_MSS but limit it to 536.
+       The send MSS is updated when an MSS option is received. */
+    pcb->mss = (TCP_MSS > 536) ? 536 : TCP_MSS;
+    pcb->rto = 3000 / TCP_SLOW_INTERVAL;
+    pcb->sa = 0;
+    pcb->sv = 3000 / TCP_SLOW_INTERVAL;
+    pcb->rtime = -1;
+    pcb->cwnd = 1;
+    iss = tcp_next_iss();
+    pcb->snd_wl2 = iss;
+    pcb->snd_nxt = iss;
+    pcb->lastack = iss;
+    pcb->snd_lbb = iss;
+    pcb->tmr = tcp_ticks;
+    pcb->last_timer = tcp_timer_ctr;
+
+    pcb->polltmr = 0;
+
+#if LWIP_CALLBACK_API
+    pcb->recv = tcp_recv_null;
+#endif /* LWIP_CALLBACK_API */
+
+    /* Init KEEPALIVE timer */
+    pcb->keep_idle  = TCP_KEEPIDLE_DEFAULT;
+
+#if LWIP_TCP_KEEPALIVE
+    pcb->keep_intvl = TCP_KEEPINTVL_DEFAULT;
+    pcb->keep_cnt   = TCP_KEEPCNT_DEFAULT;
+#endif /* LWIP_TCP_KEEPALIVE */
+
+    pcb->keep_cnt_sent = 0;
+  }
+  return pcb;
+}
+
+/**
+ * Creates a new TCP protocol control block but doesn't place it on
+ * any of the TCP PCB lists.
+ * The pcb is not put on any list until binding using tcp_bind().
+ *
+ * @internal: Maybe there should be a idle TCP PCB list where these
+ * PCBs are put on. Port reservation using tcp_bind() is implemented but
+ * allocated pcbs that are not bound can't be killed automatically if wanting
+ * to allocate a pcb with higher prio (@see tcp_kill_prio())
+ *
+ * @return a new tcp_pcb that initially is in state CLOSED
+ */
+struct tcp_pcb *
+tcp_new(void)
+{
+  return tcp_alloc(TCP_PRIO_NORMAL);
+}
+
+/**
+ * Used to specify the argument that should be passed callback
+ * functions.
+ *
+ * @param pcb tcp_pcb to set the callback argument
+ * @param arg void pointer argument to pass to callback functions
+ */
+void
+tcp_arg(struct tcp_pcb *pcb, void *arg)
+{
+  /* This function is allowed to be called for both listen pcbs and
+     connection pcbs. */
+  pcb->callback_arg = arg;
+}
+#if LWIP_CALLBACK_API
+
+/**
+ * Used to specify the function that should be called when a TCP
+ * connection receives data.
+ *
+ * @param pcb tcp_pcb to set the recv callback
+ * @param recv callback function to call for this pcb when data is received
+ */
+void
+tcp_recv(struct tcp_pcb *pcb, tcp_recv_fn recv)
+{
+  LWIP_ASSERT("invalid socket state for recv callback", pcb->state != LISTEN);
+  pcb->recv = recv;
+}
+
+/**
+ * Used to specify the function that should be called when TCP data
+ * has been successfully delivered to the remote host.
+ *
+ * @param pcb tcp_pcb to set the sent callback
+ * @param sent callback function to call for this pcb when data is successfully sent
+ */
+void
+tcp_sent(struct tcp_pcb *pcb, tcp_sent_fn sent)
+{
+  LWIP_ASSERT("invalid socket state for sent callback", pcb->state != LISTEN);
+  pcb->sent = sent;
+}
+
+/**
+ * Used to specify the function that should be called when a fatal error
+ * has occured on the connection.
+ *
+ * @param pcb tcp_pcb to set the err callback
+ * @param err callback function to call for this pcb when a fatal error
+ *        has occured on the connection
+ */
+void
+tcp_err(struct tcp_pcb *pcb, tcp_err_fn err)
+{
+  LWIP_ASSERT("invalid socket state for err callback", pcb->state != LISTEN);
+  pcb->errf = err;
+}
+
+/**
+ * Used for specifying the function that should be called when a
+ * LISTENing connection has been connected to another host.
+ *
+ * @param pcb tcp_pcb to set the accept callback
+ * @param accept callback function to call for this pcb when LISTENing
+ *        connection has been connected to another host
+ */
+void
+tcp_accept(struct tcp_pcb *pcb, tcp_accept_fn accept)
+{
+  /* This function is allowed to be called for both listen pcbs and
+     connection pcbs. */
+  pcb->accept = accept;
+}
+#endif /* LWIP_CALLBACK_API */
+
+
+/**
+ * Used to specify the function that should be called periodically
+ * from TCP. The interval is specified in terms of the TCP coarse
+ * timer interval, which is called twice a second.
+ *
+ */
+void
+tcp_poll(struct tcp_pcb *pcb, tcp_poll_fn poll, u8_t interval)
+{
+  LWIP_ASSERT("invalid socket state for poll", pcb->state != LISTEN);
+#if LWIP_CALLBACK_API
+  pcb->poll = poll;
+#else /* LWIP_CALLBACK_API */
+  LWIP_UNUSED_ARG(poll);
+#endif /* LWIP_CALLBACK_API */
+  pcb->pollinterval = interval;
+}
+
+/**
+ * Purges a TCP PCB. Removes any buffered data and frees the buffer memory
+ * (pcb->ooseq, pcb->unsent and pcb->unacked are freed).
+ *
+ * @param pcb tcp_pcb to purge. The pcb itself is not deallocated!
+ */
+void
+tcp_pcb_purge(struct tcp_pcb *pcb)
+{
+  if (pcb->state != CLOSED &&
+     pcb->state != TIME_WAIT &&
+     pcb->state != LISTEN) {
+
+    LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge\n"));
+
+#if TCP_LISTEN_BACKLOG
+    if (pcb->state == SYN_RCVD) {
+      /* Need to find the corresponding listen_pcb and decrease its accepts_pending */
+      struct tcp_pcb_listen *lpcb;
+      LWIP_ASSERT("tcp_pcb_purge: pcb->state == SYN_RCVD but tcp_listen_pcbs is NULL",
+        tcp_listen_pcbs.listen_pcbs != NULL);
+      for (lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = lpcb->next) {
+        if ((lpcb->local_port == pcb->local_port) &&
+            (ip_addr_isany(&lpcb->local_ip) ||
+             ip_addr_cmp(&pcb->local_ip, &lpcb->local_ip))) {
+            /* port and address of the listen pcb match the timed-out pcb */
+            LWIP_ASSERT("tcp_pcb_purge: listen pcb does not have accepts pending",
+              lpcb->accepts_pending > 0);
+            lpcb->accepts_pending--;
+            break;
+          }
+      }
+    }
+#endif /* TCP_LISTEN_BACKLOG */
+
+
+    if (pcb->refused_data != NULL) {
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge: data left on ->refused_data\n"));
+      pbuf_free(pcb->refused_data);
+      pcb->refused_data = NULL;
+    }
+    if (pcb->unsent != NULL) {
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge: not all data sent\n"));
+    }
+    if (pcb->unacked != NULL) {
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge: data left on ->unacked\n"));
+    }
+#if TCP_QUEUE_OOSEQ
+    if (pcb->ooseq != NULL) {
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge: data left on ->ooseq\n"));
+    }
+    tcp_segs_free(pcb->ooseq);
+    pcb->ooseq = NULL;
+#endif /* TCP_QUEUE_OOSEQ */
+
+    /* Stop the retransmission timer as it will expect data on unacked
+       queue if it fires */
+    pcb->rtime = -1;
+
+    tcp_segs_free(pcb->unsent);
+    tcp_segs_free(pcb->unacked);
+    pcb->unacked = pcb->unsent = NULL;
+#if TCP_OVERSIZE
+    pcb->unsent_oversize = 0;
+#endif /* TCP_OVERSIZE */
+  }
+}
+
+/**
+ * Purges the PCB and removes it from a PCB list. Any delayed ACKs are sent first.
+ *
+ * @param pcblist PCB list to purge.
+ * @param pcb tcp_pcb to purge. The pcb itself is NOT deallocated!
+ */
+void
+tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb)
+{
+  TCP_RMV(pcblist, pcb);
+
+  tcp_pcb_purge(pcb);
+
+  /* if there is an outstanding delayed ACKs, send it */
+  if (pcb->state != TIME_WAIT &&
+     pcb->state != LISTEN &&
+     pcb->flags & TF_ACK_DELAY) {
+    pcb->flags |= TF_ACK_NOW;
+    tcp_output(pcb);
+  }
+
+  if (pcb->state != LISTEN) {
+    LWIP_ASSERT("unsent segments leaking", pcb->unsent == NULL);
+    LWIP_ASSERT("unacked segments leaking", pcb->unacked == NULL);
+#if TCP_QUEUE_OOSEQ
+    LWIP_ASSERT("ooseq segments leaking", pcb->ooseq == NULL);
+#endif /* TCP_QUEUE_OOSEQ */
+  }
+
+  pcb->state = CLOSED;
+
+  LWIP_ASSERT("tcp_pcb_remove: tcp_pcbs_sane()", tcp_pcbs_sane());
+}
+
+/**
+ * Calculates a new initial sequence number for new connections.
+ *
+ * @return u32_t pseudo random sequence number
+ */
+u32_t
+tcp_next_iss(void)
+{
+  static u32_t iss = 6510;
+
+  iss += tcp_ticks;       /* XXX */
+  return iss;
+}
+
+#if TCP_CALCULATE_EFF_SEND_MSS
+/**
+ * Calcluates the effective send mss that can be used for a specific IP address
+ * by using ip_route to determin the netif used to send to the address and
+ * calculating the minimum of TCP_MSS and that netif's mtu (if set).
+ */
+u16_t
+tcp_eff_send_mss(u16_t sendmss, ip_addr_t *addr)
+{
+  u16_t mss_s;
+  struct netif *outif;
+
+  outif = ip_route(addr);
+  if ((outif != NULL) && (outif->mtu != 0)) {
+    mss_s = outif->mtu - IP_HLEN - TCP_HLEN;
+    /* RFC 1122, chap 4.2.2.6:
+     * Eff.snd.MSS = min(SendMSS+20, MMS_S) - TCPhdrsize - IPoptionsize
+     * We correct for TCP options in tcp_write(), and don't support IP options.
+     */
+    sendmss = LWIP_MIN(sendmss, mss_s);
+  }
+  return sendmss;
+}
+#endif /* TCP_CALCULATE_EFF_SEND_MSS */
+
+const char*
+tcp_debug_state_str(enum tcp_state s)
+{
+  return tcp_state_str[s];
+}
+
+#if TCP_DEBUG || TCP_INPUT_DEBUG || TCP_OUTPUT_DEBUG
+/**
+ * Print a tcp header for debugging purposes.
+ *
+ * @param tcphdr pointer to a struct tcp_hdr
+ */
+void
+tcp_debug_print(struct tcp_hdr *tcphdr)
+{
+  LWIP_DEBUGF(TCP_DEBUG, ("TCP header:\n"));
+  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(TCP_DEBUG, ("|    %5"U16_F"      |    %5"U16_F"      | (src port, dest port)\n",
+         ntohs(tcphdr->src), ntohs(tcphdr->dest)));
+  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(TCP_DEBUG, ("|           %010"U32_F"          | (seq no)\n",
+          ntohl(tcphdr->seqno)));
+  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(TCP_DEBUG, ("|           %010"U32_F"          | (ack no)\n",
+         ntohl(tcphdr->ackno)));
+  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(TCP_DEBUG, ("| %2"U16_F" |   |%"U16_F"%"U16_F"%"U16_F"%"U16_F"%"U16_F"%"U16_F"|     %5"U16_F"     | (hdrlen, flags (",
+       TCPH_HDRLEN(tcphdr),
+         TCPH_FLAGS(tcphdr) >> 5 & 1,
+         TCPH_FLAGS(tcphdr) >> 4 & 1,
+         TCPH_FLAGS(tcphdr) >> 3 & 1,
+         TCPH_FLAGS(tcphdr) >> 2 & 1,
+         TCPH_FLAGS(tcphdr) >> 1 & 1,
+         TCPH_FLAGS(tcphdr) & 1,
+         ntohs(tcphdr->wnd)));
+  tcp_debug_print_flags(TCPH_FLAGS(tcphdr));
+  LWIP_DEBUGF(TCP_DEBUG, ("), win)\n"));
+  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(TCP_DEBUG, ("|    0x%04"X16_F"     |     %5"U16_F"     | (chksum, urgp)\n",
+         ntohs(tcphdr->chksum), ntohs(tcphdr->urgp)));
+  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
+}
+
+/**
+ * Print a tcp state for debugging purposes.
+ *
+ * @param s enum tcp_state to print
+ */
+void
+tcp_debug_print_state(enum tcp_state s)
+{
+  LWIP_DEBUGF(TCP_DEBUG, ("State: %s\n", tcp_state_str[s]));
+}
+
+/**
+ * Print tcp flags for debugging purposes.
+ *
+ * @param flags tcp flags, all active flags are printed
+ */
+void
+tcp_debug_print_flags(u8_t flags)
+{
+  if (flags & TCP_FIN) {
+    LWIP_DEBUGF(TCP_DEBUG, ("FIN "));
+  }
+  if (flags & TCP_SYN) {
+    LWIP_DEBUGF(TCP_DEBUG, ("SYN "));
+  }
+  if (flags & TCP_RST) {
+    LWIP_DEBUGF(TCP_DEBUG, ("RST "));
+  }
+  if (flags & TCP_PSH) {
+    LWIP_DEBUGF(TCP_DEBUG, ("PSH "));
+  }
+  if (flags & TCP_ACK) {
+    LWIP_DEBUGF(TCP_DEBUG, ("ACK "));
+  }
+  if (flags & TCP_URG) {
+    LWIP_DEBUGF(TCP_DEBUG, ("URG "));
+  }
+  if (flags & TCP_ECE) {
+    LWIP_DEBUGF(TCP_DEBUG, ("ECE "));
+  }
+  if (flags & TCP_CWR) {
+    LWIP_DEBUGF(TCP_DEBUG, ("CWR "));
+  }
+  LWIP_DEBUGF(TCP_DEBUG, ("\n"));
+}
+
+/**
+ * Print all tcp_pcbs in every list for debugging purposes.
+ */
+void
+tcp_debug_print_pcbs(void)
+{
+  struct tcp_pcb *pcb;
+  LWIP_DEBUGF(TCP_DEBUG, ("Active PCB states:\n"));
+  for(pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
+    LWIP_DEBUGF(TCP_DEBUG, ("Local port %"U16_F", foreign port %"U16_F" snd_nxt %"U32_F" rcv_nxt %"U32_F" ",
+                       pcb->local_port, pcb->remote_port,
+                       pcb->snd_nxt, pcb->rcv_nxt));
+    tcp_debug_print_state(pcb->state);
+  }
+  LWIP_DEBUGF(TCP_DEBUG, ("Listen PCB states:\n"));
+  for(pcb = (struct tcp_pcb *)tcp_listen_pcbs.pcbs; pcb != NULL; pcb = pcb->next) {
+    LWIP_DEBUGF(TCP_DEBUG, ("Local port %"U16_F", foreign port %"U16_F" snd_nxt %"U32_F" rcv_nxt %"U32_F" ",
+                       pcb->local_port, pcb->remote_port,
+                       pcb->snd_nxt, pcb->rcv_nxt));
+    tcp_debug_print_state(pcb->state);
+  }
+  LWIP_DEBUGF(TCP_DEBUG, ("TIME-WAIT PCB states:\n"));
+  for(pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) {
+    LWIP_DEBUGF(TCP_DEBUG, ("Local port %"U16_F", foreign port %"U16_F" snd_nxt %"U32_F" rcv_nxt %"U32_F" ",
+                       pcb->local_port, pcb->remote_port,
+                       pcb->snd_nxt, pcb->rcv_nxt));
+    tcp_debug_print_state(pcb->state);
+  }
+}
+
+/**
+ * Check state consistency of the tcp_pcb lists.
+ */
+s16_t
+tcp_pcbs_sane(void)
+{
+  struct tcp_pcb *pcb;
+  for(pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
+    LWIP_ASSERT("tcp_pcbs_sane: active pcb->state != CLOSED", pcb->state != CLOSED);
+    LWIP_ASSERT("tcp_pcbs_sane: active pcb->state != LISTEN", pcb->state != LISTEN);
+    LWIP_ASSERT("tcp_pcbs_sane: active pcb->state != TIME-WAIT", pcb->state != TIME_WAIT);
+  }
+  for(pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) {
+    LWIP_ASSERT("tcp_pcbs_sane: tw pcb->state == TIME-WAIT", pcb->state == TIME_WAIT);
+  }
+  return 1;
+}
+#endif /* TCP_DEBUG */
+
+#endif /* LWIP_TCP */
diff --git a/ext/lwip/src/core/tcp_in.c b/ext/lwip/src/core/tcp_in.c
new file mode 100644
index 000000000..051869ff9
--- /dev/null
+++ b/ext/lwip/src/core/tcp_in.c
@@ -0,0 +1,1619 @@
+/**
+ * @file
+ * Transmission Control Protocol, incoming traffic
+ *
+ * The input processing functions of the TCP layer.
+ *
+ * These functions are generally called in the order (ip_input() ->)
+ * tcp_input() -> * tcp_process() -> tcp_receive() (-> application).
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/tcp_impl.h"
+#include "lwip/def.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/stats.h"
+#include "lwip/snmp.h"
+#include "arch/perf.h"
+
+/* These variables are global to all functions involved in the input
+   processing of TCP segments. They are set by the tcp_input()
+   function. */
+static struct tcp_seg inseg;
+static struct tcp_hdr *tcphdr;
+static struct ip_hdr *iphdr;
+static u32_t seqno, ackno;
+static u8_t flags;
+static u16_t tcplen;
+
+static u8_t recv_flags;
+static struct pbuf *recv_data;
+
+struct tcp_pcb *tcp_input_pcb;
+
+/* Forward declarations. */
+static err_t tcp_process(struct tcp_pcb *pcb);
+static void tcp_receive(struct tcp_pcb *pcb);
+static void tcp_parseopt(struct tcp_pcb *pcb);
+
+static err_t tcp_listen_input(struct tcp_pcb_listen *pcb);
+static err_t tcp_timewait_input(struct tcp_pcb *pcb);
+
+/**
+ * The initial input processing of TCP. It verifies the TCP header, demultiplexes
+ * the segment between the PCBs and passes it on to tcp_process(), which implements
+ * the TCP finite state machine. This function is called by the IP layer (in
+ * ip_input()).
+ *
+ * @param p received TCP segment to process (p->payload pointing to the IP header)
+ * @param inp network interface on which this segment was received
+ */
+void
+tcp_input(struct pbuf *p, struct netif *inp)
+{
+  struct tcp_pcb *pcb, *prev;
+  struct tcp_pcb_listen *lpcb;
+#if SO_REUSE
+  struct tcp_pcb *lpcb_prev = NULL;
+  struct tcp_pcb_listen *lpcb_any = NULL;
+#endif /* SO_REUSE */
+  u8_t hdrlen;
+  err_t err;
+
+  PERF_START;
+
+  TCP_STATS_INC(tcp.recv);
+  snmp_inc_tcpinsegs();
+
+  iphdr = (struct ip_hdr *)p->payload;
+  tcphdr = (struct tcp_hdr *)((u8_t *)p->payload + IPH_HL(iphdr) * 4);
+
+#if TCP_INPUT_DEBUG
+  tcp_debug_print(tcphdr);
+#endif
+
+  /* remove header from payload */
+  if (pbuf_header(p, -((s16_t)(IPH_HL(iphdr) * 4))) || (p->tot_len < sizeof(struct tcp_hdr))) {
+    /* drop short packets */
+    LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: short packet (%"U16_F" bytes) discarded\n", p->tot_len));
+    TCP_STATS_INC(tcp.lenerr);
+    goto dropped;
+  }
+
+  /* Don't even process incoming broadcasts/multicasts. */
+  if (ip_addr_isbroadcast(&current_iphdr_dest, inp) ||
+      ip_addr_ismulticast(&current_iphdr_dest)) {
+    TCP_STATS_INC(tcp.proterr);
+    goto dropped;
+  }
+
+#if CHECKSUM_CHECK_TCP
+  /* Verify TCP checksum. */
+  if (inet_chksum_pseudo(p, ip_current_src_addr(), ip_current_dest_addr(),
+      IP_PROTO_TCP, p->tot_len) != 0) {
+      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packet discarded due to failing checksum 0x%04"X16_F"\n",
+        inet_chksum_pseudo(p, ip_current_src_addr(), ip_current_dest_addr(),
+      IP_PROTO_TCP, p->tot_len)));
+#if TCP_DEBUG
+    tcp_debug_print(tcphdr);
+#endif /* TCP_DEBUG */
+    TCP_STATS_INC(tcp.chkerr);
+    goto dropped;
+  }
+#endif
+
+  /* Move the payload pointer in the pbuf so that it points to the
+     TCP data instead of the TCP header. */
+  hdrlen = TCPH_HDRLEN(tcphdr);
+  if(pbuf_header(p, -(hdrlen * 4))){
+    /* drop short packets */
+    LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: short packet\n"));
+    TCP_STATS_INC(tcp.lenerr);
+    goto dropped;
+  }
+
+  /* Convert fields in TCP header to host byte order. */
+  tcphdr->src = ntohs(tcphdr->src);
+  tcphdr->dest = ntohs(tcphdr->dest);
+  seqno = tcphdr->seqno = ntohl(tcphdr->seqno);
+  ackno = tcphdr->ackno = ntohl(tcphdr->ackno);
+  tcphdr->wnd = ntohs(tcphdr->wnd);
+
+  flags = TCPH_FLAGS(tcphdr);
+  tcplen = p->tot_len + ((flags & (TCP_FIN | TCP_SYN)) ? 1 : 0);
+
+  /* Demultiplex an incoming segment. First, we check if it is destined
+     for an active connection. */
+  prev = NULL;
+
+
+  for(pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
+    LWIP_ASSERT("tcp_input: active pcb->state != CLOSED", pcb->state != CLOSED);
+    LWIP_ASSERT("tcp_input: active pcb->state != TIME-WAIT", pcb->state != TIME_WAIT);
+    LWIP_ASSERT("tcp_input: active pcb->state != LISTEN", pcb->state != LISTEN);
+    if (pcb->remote_port == tcphdr->src &&
+       pcb->local_port == tcphdr->dest &&
+       ip_addr_cmp(&(pcb->remote_ip), &current_iphdr_src) &&
+       ip_addr_cmp(&(pcb->local_ip), &current_iphdr_dest)) {
+
+      /* Move this PCB to the front of the list so that subsequent
+         lookups will be faster (we exploit locality in TCP segment
+         arrivals). */
+      LWIP_ASSERT("tcp_input: pcb->next != pcb (before cache)", pcb->next != pcb);
+      if (prev != NULL) {
+        prev->next = pcb->next;
+        pcb->next = tcp_active_pcbs;
+        tcp_active_pcbs = pcb;
+      }
+      LWIP_ASSERT("tcp_input: pcb->next != pcb (after cache)", pcb->next != pcb);
+      break;
+    }
+    prev = pcb;
+  }
+
+  if (pcb == NULL) {
+    /* If it did not go to an active connection, we check the connections
+       in the TIME-WAIT state. */
+    for(pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) {
+      LWIP_ASSERT("tcp_input: TIME-WAIT pcb->state == TIME-WAIT", pcb->state == TIME_WAIT);
+      if (pcb->remote_port == tcphdr->src &&
+         pcb->local_port == tcphdr->dest &&
+         ip_addr_cmp(&(pcb->remote_ip), &current_iphdr_src) &&
+         ip_addr_cmp(&(pcb->local_ip), &current_iphdr_dest)) {
+        /* We don't really care enough to move this PCB to the front
+           of the list since we are not very likely to receive that
+           many segments for connections in TIME-WAIT. */
+        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packed for TIME_WAITing connection.\n"));
+        tcp_timewait_input(pcb);
+        pbuf_free(p);
+        return;
+      }
+    }
+
+    /* Finally, if we still did not get a match, we check all PCBs that
+       are LISTENing for incoming connections. */
+    prev = NULL;
+    for(lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = lpcb->next) {
+      if (lpcb->local_port == tcphdr->dest) {
+#if SO_REUSE
+        if (ip_addr_cmp(&(lpcb->local_ip), &current_iphdr_dest)) {
+          /* found an exact match */
+          break;
+        } else if(ip_addr_isany(&(lpcb->local_ip))) {
+          /* found an ANY-match */
+          lpcb_any = lpcb;
+          lpcb_prev = prev;
+        }
+#else /* SO_REUSE */
+        if (ip_addr_cmp(&(lpcb->local_ip), &current_iphdr_dest) ||
+            ip_addr_isany(&(lpcb->local_ip))) {
+          /* found a match */
+          break;
+        }
+#endif /* SO_REUSE */
+      }
+      prev = (struct tcp_pcb *)lpcb;
+    }
+#if SO_REUSE
+    /* first try specific local IP */
+    if (lpcb == NULL) {
+      /* only pass to ANY if no specific local IP has been found */
+      lpcb = lpcb_any;
+      prev = lpcb_prev;
+    }
+#endif /* SO_REUSE */
+    if (lpcb != NULL) {
+      /* Move this PCB to the front of the list so that subsequent
+         lookups will be faster (we exploit locality in TCP segment
+         arrivals). */
+      if (prev != NULL) {
+        ((struct tcp_pcb_listen *)prev)->next = lpcb->next;
+              /* our successor is the remainder of the listening list */
+        lpcb->next = tcp_listen_pcbs.listen_pcbs;
+              /* put this listening pcb at the head of the listening list */
+        tcp_listen_pcbs.listen_pcbs = lpcb;
+      }
+
+      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packed for LISTENing connection.\n"));
+      tcp_listen_input(lpcb);
+      pbuf_free(p);
+      return;
+    }
+  }
+
+#if TCP_INPUT_DEBUG
+  LWIP_DEBUGF(TCP_INPUT_DEBUG, ("+-+-+-+-+-+-+-+-+-+-+-+-+-+- tcp_input: flags "));
+  tcp_debug_print_flags(TCPH_FLAGS(tcphdr));
+  LWIP_DEBUGF(TCP_INPUT_DEBUG, ("-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n"));
+#endif /* TCP_INPUT_DEBUG */
+
+
+  if (pcb != NULL) {
+    /* The incoming segment belongs to a connection. */
+#if TCP_INPUT_DEBUG
+#if TCP_DEBUG
+    tcp_debug_print_state(pcb->state);
+#endif /* TCP_DEBUG */
+#endif /* TCP_INPUT_DEBUG */
+
+    /* Set up a tcp_seg structure. */
+    inseg.next = NULL;
+    inseg.len = p->tot_len;
+    inseg.p = p;
+    inseg.tcphdr = tcphdr;
+
+    recv_data = NULL;
+    recv_flags = 0;
+
+    if (flags & TCP_PSH) {
+      p->flags |= PBUF_FLAG_PUSH;
+    }
+
+    /* If there is data which was previously "refused" by upper layer */
+    if (pcb->refused_data != NULL) {
+      if ((tcp_process_refused_data(pcb) == ERR_ABRT) ||
+        ((pcb->refused_data != NULL) && (tcplen > 0))) {
+        /* pcb has been aborted or refused data is still refused and the new
+           segment contains data */
+        TCP_STATS_INC(tcp.drop);
+        snmp_inc_tcpinerrs();
+        goto aborted;
+      }
+    }
+    tcp_input_pcb = pcb;
+    err = tcp_process(pcb);
+    /* A return value of ERR_ABRT means that tcp_abort() was called
+       and that the pcb has been freed. If so, we don't do anything. */
+    if (err != ERR_ABRT) {
+      if (recv_flags & TF_RESET) {
+        /* TF_RESET means that the connection was reset by the other
+           end. We then call the error callback to inform the
+           application that the connection is dead before we
+           deallocate the PCB. */
+        TCP_EVENT_ERR(pcb->errf, pcb->callback_arg, ERR_RST);
+        tcp_pcb_remove(&tcp_active_pcbs, pcb);
+        memp_free(MEMP_TCP_PCB, pcb);
+      } else if (recv_flags & TF_CLOSED) {
+        /* The connection has been closed and we will deallocate the
+           PCB. */
+        if (!(pcb->flags & TF_RXCLOSED)) {
+          /* Connection closed although the application has only shut down the
+             tx side: call the PCB's err callback and indicate the closure to
+             ensure the application doesn't continue using the PCB. */
+          TCP_EVENT_ERR(pcb->errf, pcb->callback_arg, ERR_CLSD);
+        }
+        tcp_pcb_remove(&tcp_active_pcbs, pcb);
+        memp_free(MEMP_TCP_PCB, pcb);
+      } else {
+        err = ERR_OK;
+        /* If the application has registered a "sent" function to be
+           called when new send buffer space is available, we call it
+           now. */
+        if (pcb->acked > 0) {
+          TCP_EVENT_SENT(pcb, pcb->acked, err);
+          if (err == ERR_ABRT) {
+            goto aborted;
+          }
+        }
+
+        if (recv_data != NULL) {
+          LWIP_ASSERT("pcb->refused_data == NULL", pcb->refused_data == NULL);
+          if (pcb->flags & TF_RXCLOSED) {
+            /* received data although already closed -> abort (send RST) to
+               notify the remote host that not all data has been processed */
+            pbuf_free(recv_data);
+            tcp_abort(pcb);
+            goto aborted;
+          }
+
+          /* Notify application that data has been received. */
+          TCP_EVENT_RECV(pcb, recv_data, ERR_OK, err);
+          if (err == ERR_ABRT) {
+            goto aborted;
+          }
+
+          /* If the upper layer can't receive this data, store it */
+          if (err != ERR_OK) {
+            pcb->refused_data = recv_data;
+            LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: keep incoming packet, because pcb is \"full\"\n"));
+          }
+        }
+
+        /* If a FIN segment was received, we call the callback
+           function with a NULL buffer to indicate EOF. */
+        if (recv_flags & TF_GOT_FIN) {
+          if (pcb->refused_data != NULL) {
+            /* Delay this if we have refused data. */
+            pcb->refused_data->flags |= PBUF_FLAG_TCP_FIN;
+          } else {
+            /* correct rcv_wnd as the application won't call tcp_recved()
+               for the FIN's seqno */
+            if (pcb->rcv_wnd != TCP_WND) {
+              pcb->rcv_wnd++;
+            }
+            TCP_EVENT_CLOSED(pcb, err);
+            if (err == ERR_ABRT) {
+              goto aborted;
+            }
+          }
+        }
+
+        tcp_input_pcb = NULL;
+        /* Try to send something out. */
+        tcp_output(pcb);
+#if TCP_INPUT_DEBUG
+#if TCP_DEBUG
+        tcp_debug_print_state(pcb->state);
+#endif /* TCP_DEBUG */
+#endif /* TCP_INPUT_DEBUG */
+      }
+    }
+    /* Jump target if pcb has been aborted in a callback (by calling tcp_abort()).
+       Below this line, 'pcb' may not be dereferenced! */
+aborted:
+    tcp_input_pcb = NULL;
+    recv_data = NULL;
+
+    /* give up our reference to inseg.p */
+    if (inseg.p != NULL)
+    {
+      pbuf_free(inseg.p);
+      inseg.p = NULL;
+    }
+  } else {
+
+    /* If no matching PCB was found, send a TCP RST (reset) to the
+       sender. */
+    LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_input: no PCB match found, resetting.\n"));
+    if (!(TCPH_FLAGS(tcphdr) & TCP_RST)) {
+      TCP_STATS_INC(tcp.proterr);
+      TCP_STATS_INC(tcp.drop);
+      tcp_rst(ackno, seqno + tcplen,
+        ip_current_dest_addr(), ip_current_src_addr(),
+        tcphdr->dest, tcphdr->src);
+    }
+    pbuf_free(p);
+  }
+
+  LWIP_ASSERT("tcp_input: tcp_pcbs_sane()", tcp_pcbs_sane());
+  PERF_STOP("tcp_input");
+  return;
+dropped:
+  TCP_STATS_INC(tcp.drop);
+  snmp_inc_tcpinerrs();
+  pbuf_free(p);
+}
+
+/**
+ * Called by tcp_input() when a segment arrives for a listening
+ * connection (from tcp_input()).
+ *
+ * @param pcb the tcp_pcb_listen for which a segment arrived
+ * @return ERR_OK if the segment was processed
+ *         another err_t on error
+ *
+ * @note the return value is not (yet?) used in tcp_input()
+ * @note the segment which arrived is saved in global variables, therefore only the pcb
+ *       involved is passed as a parameter to this function
+ */
+static err_t
+tcp_listen_input(struct tcp_pcb_listen *pcb)
+{
+  struct tcp_pcb *npcb;
+  err_t rc;
+
+  if (flags & TCP_RST) {
+    /* An incoming RST should be ignored. Return. */
+    return ERR_OK;
+  }
+
+  /* In the LISTEN state, we check for incoming SYN segments,
+     creates a new PCB, and responds with a SYN|ACK. */
+  if (flags & TCP_ACK) {
+    /* For incoming segments with the ACK flag set, respond with a
+       RST. */
+    LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_listen_input: ACK in LISTEN, sending reset\n"));
+    tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(),
+      ip_current_src_addr(), tcphdr->dest, tcphdr->src);
+  } else if (flags & TCP_SYN) {
+    LWIP_DEBUGF(TCP_DEBUG, ("TCP connection request %"U16_F" -> %"U16_F".\n", tcphdr->src, tcphdr->dest));
+#if TCP_LISTEN_BACKLOG
+    if (pcb->accepts_pending >= pcb->backlog) {
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_listen_input: listen backlog exceeded for port %"U16_F"\n", tcphdr->dest));
+      return ERR_ABRT;
+    }
+#endif /* TCP_LISTEN_BACKLOG */
+    npcb = tcp_alloc(pcb->prio);
+    /* If a new PCB could not be created (probably due to lack of memory),
+       we don't do anything, but rely on the sender will retransmit the
+       SYN at a time when we have more memory available. */
+    if (npcb == NULL) {
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_listen_input: could not allocate PCB\n"));
+      TCP_STATS_INC(tcp.memerr);
+      return ERR_MEM;
+    }
+#if TCP_LISTEN_BACKLOG
+    pcb->accepts_pending++;
+#endif /* TCP_LISTEN_BACKLOG */
+    /* Set up the new PCB. */
+    ip_addr_copy(npcb->local_ip, current_iphdr_dest);
+    npcb->local_port = pcb->local_port;
+    ip_addr_copy(npcb->remote_ip, current_iphdr_src);
+    npcb->remote_port = tcphdr->src;
+    npcb->state = SYN_RCVD;
+    npcb->rcv_nxt = seqno + 1;
+    npcb->rcv_ann_right_edge = npcb->rcv_nxt;
+    npcb->snd_wnd = tcphdr->wnd;
+    npcb->snd_wnd_max = tcphdr->wnd;
+    npcb->ssthresh = npcb->snd_wnd;
+    npcb->snd_wl1 = seqno - 1;/* initialise to seqno-1 to force window update */
+    npcb->callback_arg = pcb->callback_arg;
+#if LWIP_CALLBACK_API
+    npcb->accept = pcb->accept;
+#endif /* LWIP_CALLBACK_API */
+    /* inherit socket options */
+    npcb->so_options = pcb->so_options & SOF_INHERITED;
+    /* Register the new PCB so that we can begin receiving segments
+       for it. */
+    TCP_REG_ACTIVE(npcb);
+
+    /* Parse any options in the SYN. */
+    tcp_parseopt(npcb);
+#if TCP_CALCULATE_EFF_SEND_MSS
+    npcb->mss = tcp_eff_send_mss(npcb->mss, &(npcb->remote_ip));
+#endif /* TCP_CALCULATE_EFF_SEND_MSS */
+
+    snmp_inc_tcppassiveopens();
+
+    /* Send a SYN|ACK together with the MSS option. */
+    rc = tcp_enqueue_flags(npcb, TCP_SYN | TCP_ACK);
+    if (rc != ERR_OK) {
+      tcp_abandon(npcb, 0);
+      return rc;
+    }
+    return tcp_output(npcb);
+  }
+  return ERR_OK;
+}
+
+/**
+ * Called by tcp_input() when a segment arrives for a connection in
+ * TIME_WAIT.
+ *
+ * @param pcb the tcp_pcb for which a segment arrived
+ *
+ * @note the segment which arrived is saved in global variables, therefore only the pcb
+ *       involved is passed as a parameter to this function
+ */
+static err_t
+tcp_timewait_input(struct tcp_pcb *pcb)
+{
+  /* RFC 1337: in TIME_WAIT, ignore RST and ACK FINs + any 'acceptable' segments */
+  /* RFC 793 3.9 Event Processing - Segment Arrives:
+   * - first check sequence number - we skip that one in TIME_WAIT (always
+   *   acceptable since we only send ACKs)
+   * - second check the RST bit (... return) */
+  if (flags & TCP_RST)  {
+    return ERR_OK;
+  }
+  /* - fourth, check the SYN bit, */
+  if (flags & TCP_SYN) {
+    /* If an incoming segment is not acceptable, an acknowledgment
+       should be sent in reply */
+    if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt, pcb->rcv_nxt+pcb->rcv_wnd)) {
+      /* If the SYN is in the window it is an error, send a reset */
+      tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(), ip_current_src_addr(),
+        tcphdr->dest, tcphdr->src);
+      return ERR_OK;
+    }
+  } else if (flags & TCP_FIN) {
+    /* - eighth, check the FIN bit: Remain in the TIME-WAIT state.
+         Restart the 2 MSL time-wait timeout.*/
+    pcb->tmr = tcp_ticks;
+  }
+
+  if ((tcplen > 0))  {
+    /* Acknowledge data, FIN or out-of-window SYN */
+    pcb->flags |= TF_ACK_NOW;
+    return tcp_output(pcb);
+  }
+  return ERR_OK;
+}
+
+/**
+ * Implements the TCP state machine. Called by tcp_input. In some
+ * states tcp_receive() is called to receive data. The tcp_seg
+ * argument will be freed by the caller (tcp_input()) unless the
+ * recv_data pointer in the pcb is set.
+ *
+ * @param pcb the tcp_pcb for which a segment arrived
+ *
+ * @note the segment which arrived is saved in global variables, therefore only the pcb
+ *       involved is passed as a parameter to this function
+ */
+static err_t
+tcp_process(struct tcp_pcb *pcb)
+{
+  struct tcp_seg *rseg;
+  u8_t acceptable = 0;
+  err_t err;
+
+  err = ERR_OK;
+
+  /* Process incoming RST segments. */
+  if (flags & TCP_RST) {
+    /* First, determine if the reset is acceptable. */
+    if (pcb->state == SYN_SENT) {
+      if (ackno == pcb->snd_nxt) {
+        acceptable = 1;
+      }
+    } else {
+      if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt,
+                          pcb->rcv_nxt+pcb->rcv_wnd)) {
+        acceptable = 1;
+      }
+    }
+
+    if (acceptable) {
+      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_process: Connection RESET\n"));
+      LWIP_ASSERT("tcp_input: pcb->state != CLOSED", pcb->state != CLOSED);
+      recv_flags |= TF_RESET;
+      pcb->flags &= ~TF_ACK_DELAY;
+      return ERR_RST;
+    } else {
+      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_process: unacceptable reset seqno %"U32_F" rcv_nxt %"U32_F"\n",
+       seqno, pcb->rcv_nxt));
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_process: unacceptable reset seqno %"U32_F" rcv_nxt %"U32_F"\n",
+       seqno, pcb->rcv_nxt));
+      return ERR_OK;
+    }
+  }
+
+  if ((flags & TCP_SYN) && (pcb->state != SYN_SENT && pcb->state != SYN_RCVD)) {
+    /* Cope with new connection attempt after remote end crashed */
+    tcp_ack_now(pcb);
+    return ERR_OK;
+  }
+
+  if ((pcb->flags & TF_RXCLOSED) == 0) {
+    /* Update the PCB (in)activity timer unless rx is closed (see tcp_shutdown) */
+    pcb->tmr = tcp_ticks;
+  }
+  pcb->keep_cnt_sent = 0;
+
+  tcp_parseopt(pcb);
+
+  /* Do different things depending on the TCP state. */
+  switch (pcb->state) {
+  case SYN_SENT:
+    LWIP_DEBUGF(TCP_INPUT_DEBUG, ("SYN-SENT: ackno %"U32_F" pcb->snd_nxt %"U32_F" unacked %"U32_F"\n", ackno,
+     pcb->snd_nxt, ntohl(pcb->unacked->tcphdr->seqno)));
+    /* received SYN ACK with expected sequence number? */
+    if ((flags & TCP_ACK) && (flags & TCP_SYN)
+        && ackno == ntohl(pcb->unacked->tcphdr->seqno) + 1) {
+      pcb->snd_buf++;
+      pcb->rcv_nxt = seqno + 1;
+      pcb->rcv_ann_right_edge = pcb->rcv_nxt;
+      pcb->lastack = ackno;
+      pcb->snd_wnd = tcphdr->wnd;
+      pcb->snd_wnd_max = tcphdr->wnd;
+      pcb->snd_wl1 = seqno - 1; /* initialise to seqno - 1 to force window update */
+      pcb->state = ESTABLISHED;
+
+#if TCP_CALCULATE_EFF_SEND_MSS
+      pcb->mss = tcp_eff_send_mss(pcb->mss, &(pcb->remote_ip));
+#endif /* TCP_CALCULATE_EFF_SEND_MSS */
+
+      /* Set ssthresh again after changing pcb->mss (already set in tcp_connect
+       * but for the default value of pcb->mss) */
+      pcb->ssthresh = pcb->mss * 10;
+
+      pcb->cwnd = ((pcb->cwnd == 1) ? (pcb->mss * 2) : pcb->mss);
+      LWIP_ASSERT("pcb->snd_queuelen > 0", (pcb->snd_queuelen > 0));
+      --pcb->snd_queuelen;
+      LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_process: SYN-SENT --queuelen %"U16_F"\n", (u16_t)pcb->snd_queuelen));
+      rseg = pcb->unacked;
+      pcb->unacked = rseg->next;
+      tcp_seg_free(rseg);
+
+      /* If there's nothing left to acknowledge, stop the retransmit
+         timer, otherwise reset it to start again */
+      if(pcb->unacked == NULL)
+        pcb->rtime = -1;
+      else {
+        pcb->rtime = 0;
+        pcb->nrtx = 0;
+      }
+
+      /* Call the user specified function to call when sucessfully
+       * connected. */
+      TCP_EVENT_CONNECTED(pcb, ERR_OK, err);
+      if (err == ERR_ABRT) {
+        return ERR_ABRT;
+      }
+      tcp_ack_now(pcb);
+    }
+    /* received ACK? possibly a half-open connection */
+    else if (flags & TCP_ACK) {
+      /* send a RST to bring the other side in a non-synchronized state. */
+      tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(), ip_current_src_addr(),
+        tcphdr->dest, tcphdr->src);
+    }
+    break;
+  case SYN_RCVD:
+    if (flags & TCP_ACK) {
+      /* expected ACK number? */
+      if (TCP_SEQ_BETWEEN(ackno, pcb->lastack+1, pcb->snd_nxt)) {
+        u16_t old_cwnd;
+        pcb->state = ESTABLISHED;
+        LWIP_DEBUGF(TCP_DEBUG, ("TCP connection established %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
+#if LWIP_CALLBACK_API
+        LWIP_ASSERT("pcb->accept != NULL", pcb->accept != NULL);
+#endif
+        /* Call the accept function. */
+        TCP_EVENT_ACCEPT(pcb, ERR_OK, err);
+        if (err != ERR_OK) {
+          /* If the accept function returns with an error, we abort
+           * the connection. */
+          /* Already aborted? */
+          if (err != ERR_ABRT) {
+            tcp_abort(pcb);
+          }
+          return ERR_ABRT;
+        }
+        old_cwnd = pcb->cwnd;
+        /* If there was any data contained within this ACK,
+         * we'd better pass it on to the application as well. */
+        tcp_receive(pcb);
+
+        /* Prevent ACK for SYN to generate a sent event */
+        if (pcb->acked != 0) {
+          pcb->acked--;
+        }
+
+        pcb->cwnd = ((old_cwnd == 1) ? (pcb->mss * 2) : pcb->mss);
+
+        if (recv_flags & TF_GOT_FIN) {
+          tcp_ack_now(pcb);
+          pcb->state = CLOSE_WAIT;
+        }
+      } else {
+        /* incorrect ACK number, send RST */
+        tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(), ip_current_src_addr(),
+                tcphdr->dest, tcphdr->src);
+      }
+    } else if ((flags & TCP_SYN) && (seqno == pcb->rcv_nxt - 1)) {
+      /* Looks like another copy of the SYN - retransmit our SYN-ACK */
+      tcp_rexmit(pcb);
+    }
+    break;
+  case CLOSE_WAIT:
+    /* FALLTHROUGH */
+  case ESTABLISHED:
+    tcp_receive(pcb);
+    if (recv_flags & TF_GOT_FIN) { /* passive close */
+      tcp_ack_now(pcb);
+      pcb->state = CLOSE_WAIT;
+    }
+    break;
+  case FIN_WAIT_1:
+    tcp_receive(pcb);
+    if (recv_flags & TF_GOT_FIN) {
+      if ((flags & TCP_ACK) && (ackno == pcb->snd_nxt)) {
+        LWIP_DEBUGF(TCP_DEBUG,
+          ("TCP connection closed: FIN_WAIT_1 %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
+        tcp_ack_now(pcb);
+        tcp_pcb_purge(pcb);
+        TCP_RMV_ACTIVE(pcb);
+        pcb->state = TIME_WAIT;
+        TCP_REG(&tcp_tw_pcbs, pcb);
+      } else {
+        tcp_ack_now(pcb);
+        pcb->state = CLOSING;
+      }
+    } else if ((flags & TCP_ACK) && (ackno == pcb->snd_nxt)) {
+      pcb->state = FIN_WAIT_2;
+    }
+    break;
+  case FIN_WAIT_2:
+    tcp_receive(pcb);
+    if (recv_flags & TF_GOT_FIN) {
+      LWIP_DEBUGF(TCP_DEBUG, ("TCP connection closed: FIN_WAIT_2 %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
+      tcp_ack_now(pcb);
+      tcp_pcb_purge(pcb);
+      TCP_RMV_ACTIVE(pcb);
+      pcb->state = TIME_WAIT;
+      TCP_REG(&tcp_tw_pcbs, pcb);
+    }
+    break;
+  case CLOSING:
+    tcp_receive(pcb);
+    if (flags & TCP_ACK && ackno == pcb->snd_nxt) {
+      LWIP_DEBUGF(TCP_DEBUG, ("TCP connection closed: CLOSING %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
+      tcp_pcb_purge(pcb);
+      TCP_RMV_ACTIVE(pcb);
+      pcb->state = TIME_WAIT;
+      TCP_REG(&tcp_tw_pcbs, pcb);
+    }
+    break;
+  case LAST_ACK:
+    tcp_receive(pcb);
+    if (flags & TCP_ACK && ackno == pcb->snd_nxt) {
+      LWIP_DEBUGF(TCP_DEBUG, ("TCP connection closed: LAST_ACK %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
+      /* bugfix #21699: don't set pcb->state to CLOSED here or we risk leaking segments */
+      recv_flags |= TF_CLOSED;
+    }
+    break;
+  default:
+    break;
+  }
+  return ERR_OK;
+}
+
+#if TCP_QUEUE_OOSEQ
+/**
+ * Insert segment into the list (segments covered with new one will be deleted)
+ *
+ * Called from tcp_receive()
+ */
+static void
+tcp_oos_insert_segment(struct tcp_seg *cseg, struct tcp_seg *next)
+{
+  struct tcp_seg *old_seg;
+
+  if (TCPH_FLAGS(cseg->tcphdr) & TCP_FIN) {
+    /* received segment overlaps all following segments */
+    tcp_segs_free(next);
+    next = NULL;
+  }
+  else {
+    /* delete some following segments
+       oos queue may have segments with FIN flag */
+    while (next &&
+           TCP_SEQ_GEQ((seqno + cseg->len),
+                      (next->tcphdr->seqno + next->len))) {
+      /* cseg with FIN already processed */
+      if (TCPH_FLAGS(next->tcphdr) & TCP_FIN) {
+        TCPH_SET_FLAG(cseg->tcphdr, TCP_FIN);
+      }
+      old_seg = next;
+      next = next->next;
+      tcp_seg_free(old_seg);
+    }
+    if (next &&
+        TCP_SEQ_GT(seqno + cseg->len, next->tcphdr->seqno)) {
+      /* We need to trim the incoming segment. */
+      cseg->len = (u16_t)(next->tcphdr->seqno - seqno);
+      pbuf_realloc(cseg->p, cseg->len);
+    }
+  }
+  cseg->next = next;
+}
+#endif /* TCP_QUEUE_OOSEQ */
+
+/**
+ * Called by tcp_process. Checks if the given segment is an ACK for outstanding
+ * data, and if so frees the memory of the buffered data. Next, is places the
+ * segment on any of the receive queues (pcb->recved or pcb->ooseq). If the segment
+ * is buffered, the pbuf is referenced by pbuf_ref so that it will not be freed until
+ * it has been removed from the buffer.
+ *
+ * If the incoming segment constitutes an ACK for a segment that was used for RTT
+ * estimation, the RTT is estimated here as well.
+ *
+ * Called from tcp_process().
+ */
+static void
+tcp_receive(struct tcp_pcb *pcb)
+{
+  struct tcp_seg *next;
+#if TCP_QUEUE_OOSEQ
+  struct tcp_seg *prev, *cseg;
+#endif /* TCP_QUEUE_OOSEQ */
+  struct pbuf *p;
+  s32_t off;
+  s16_t m;
+  u32_t right_wnd_edge;
+  u16_t new_tot_len;
+  int found_dupack = 0;
+#if TCP_OOSEQ_MAX_BYTES || TCP_OOSEQ_MAX_PBUFS
+  u32_t ooseq_blen;
+  u16_t ooseq_qlen;
+#endif /* TCP_OOSEQ_MAX_BYTES || TCP_OOSEQ_MAX_PBUFS */
+
+  LWIP_ASSERT("tcp_receive: wrong state", pcb->state >= ESTABLISHED);
+
+  if (flags & TCP_ACK) {
+    right_wnd_edge = pcb->snd_wnd + pcb->snd_wl2;
+
+    /* Update window. */
+    if (TCP_SEQ_LT(pcb->snd_wl1, seqno) ||
+       (pcb->snd_wl1 == seqno && TCP_SEQ_LT(pcb->snd_wl2, ackno)) ||
+       (pcb->snd_wl2 == ackno && tcphdr->wnd > pcb->snd_wnd)) {
+      pcb->snd_wnd = tcphdr->wnd;
+      /* keep track of the biggest window announced by the remote host to calculate
+         the maximum segment size */
+      if (pcb->snd_wnd_max < tcphdr->wnd) {
+        pcb->snd_wnd_max = tcphdr->wnd;
+      }
+      pcb->snd_wl1 = seqno;
+      pcb->snd_wl2 = ackno;
+      if (pcb->snd_wnd == 0) {
+        if (pcb->persist_backoff == 0) {
+          /* start persist timer */
+          pcb->persist_cnt = 0;
+          pcb->persist_backoff = 1;
+        }
+      } else if (pcb->persist_backoff > 0) {
+        /* stop persist timer */
+          pcb->persist_backoff = 0;
+      }
+      LWIP_DEBUGF(TCP_WND_DEBUG, ("tcp_receive: window update %"U16_F"\n", pcb->snd_wnd));
+#if TCP_WND_DEBUG
+    } else {
+      if (pcb->snd_wnd != tcphdr->wnd) {
+        LWIP_DEBUGF(TCP_WND_DEBUG,
+                    ("tcp_receive: no window update lastack %"U32_F" ackno %"
+                     U32_F" wl1 %"U32_F" seqno %"U32_F" wl2 %"U32_F"\n",
+                     pcb->lastack, ackno, pcb->snd_wl1, seqno, pcb->snd_wl2));
+      }
+#endif /* TCP_WND_DEBUG */
+    }
+
+    /* (From Stevens TCP/IP Illustrated Vol II, p970.) Its only a
+     * duplicate ack if:
+     * 1) It doesn't ACK new data
+     * 2) length of received packet is zero (i.e. no payload)
+     * 3) the advertised window hasn't changed
+     * 4) There is outstanding unacknowledged data (retransmission timer running)
+     * 5) The ACK is == biggest ACK sequence number so far seen (snd_una)
+     *
+     * If it passes all five, should process as a dupack:
+     * a) dupacks < 3: do nothing
+     * b) dupacks == 3: fast retransmit
+     * c) dupacks > 3: increase cwnd
+     *
+     * If it only passes 1-3, should reset dupack counter (and add to
+     * stats, which we don't do in lwIP)
+     *
+     * If it only passes 1, should reset dupack counter
+     *
+     */
+
+    /* Clause 1 */
+    if (TCP_SEQ_LEQ(ackno, pcb->lastack)) {
+      pcb->acked = 0;
+      /* Clause 2 */
+      if (tcplen == 0) {
+        /* Clause 3 */
+        if (pcb->snd_wl2 + pcb->snd_wnd == right_wnd_edge){
+          /* Clause 4 */
+          if (pcb->rtime >= 0) {
+            /* Clause 5 */
+            if (pcb->lastack == ackno) {
+              found_dupack = 1;
+              if ((u8_t)(pcb->dupacks + 1) > pcb->dupacks) {
+                ++pcb->dupacks;
+              }
+              if (pcb->dupacks > 3) {
+                /* Inflate the congestion window, but not if it means that
+                   the value overflows. */
+                if ((u16_t)(pcb->cwnd + pcb->mss) > pcb->cwnd) {
+                  pcb->cwnd += pcb->mss;
+                }
+              } else if (pcb->dupacks == 3) {
+                /* Do fast retransmit */
+                tcp_rexmit_fast(pcb);
+              }
+            }
+          }
+        }
+      }
+      /* If Clause (1) or more is true, but not a duplicate ack, reset
+       * count of consecutive duplicate acks */
+      if (!found_dupack) {
+        pcb->dupacks = 0;
+      }
+    } else if (TCP_SEQ_BETWEEN(ackno, pcb->lastack+1, pcb->snd_nxt)){
+      /* We come here when the ACK acknowledges new data. */
+
+      /* Reset the "IN Fast Retransmit" flag, since we are no longer
+         in fast retransmit. Also reset the congestion window to the
+         slow start threshold. */
+      if (pcb->flags & TF_INFR) {
+        pcb->flags &= ~TF_INFR;
+        pcb->cwnd = pcb->ssthresh;
+      }
+
+      /* Reset the number of retransmissions. */
+      pcb->nrtx = 0;
+
+      /* Reset the retransmission time-out. */
+      pcb->rto = (pcb->sa >> 3) + pcb->sv;
+
+      /* Update the send buffer space. Diff between the two can never exceed 64K? */
+      pcb->acked = (u16_t)(ackno - pcb->lastack);
+
+      pcb->snd_buf += pcb->acked;
+
+      /* Reset the fast retransmit variables. */
+      pcb->dupacks = 0;
+      pcb->lastack = ackno;
+
+      /* Update the congestion control variables (cwnd and
+         ssthresh). */
+      if (pcb->state >= ESTABLISHED) {
+        if (pcb->cwnd < pcb->ssthresh) {
+          if ((u16_t)(pcb->cwnd + pcb->mss) > pcb->cwnd) {
+            pcb->cwnd += pcb->mss;
+          }
+          LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_receive: slow start cwnd %"U16_F"\n", pcb->cwnd));
+        } else {
+          u16_t new_cwnd = (pcb->cwnd + pcb->mss * pcb->mss / pcb->cwnd);
+          if (new_cwnd > pcb->cwnd) {
+            pcb->cwnd = new_cwnd;
+          }
+          LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_receive: congestion avoidance cwnd %"U16_F"\n", pcb->cwnd));
+        }
+      }
+      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: ACK for %"U32_F", unacked->seqno %"U32_F":%"U32_F"\n",
+                                    ackno,
+                                    pcb->unacked != NULL?
+                                    ntohl(pcb->unacked->tcphdr->seqno): 0,
+                                    pcb->unacked != NULL?
+                                    ntohl(pcb->unacked->tcphdr->seqno) + TCP_TCPLEN(pcb->unacked): 0));
+
+      /* Remove segment from the unacknowledged list if the incoming
+         ACK acknowlegdes them. */
+      while (pcb->unacked != NULL &&
+             TCP_SEQ_LEQ(ntohl(pcb->unacked->tcphdr->seqno) +
+                         TCP_TCPLEN(pcb->unacked), ackno)) {
+        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: removing %"U32_F":%"U32_F" from pcb->unacked\n",
+                                      ntohl(pcb->unacked->tcphdr->seqno),
+                                      ntohl(pcb->unacked->tcphdr->seqno) +
+                                      TCP_TCPLEN(pcb->unacked)));
+
+        next = pcb->unacked;
+        pcb->unacked = pcb->unacked->next;
+
+        LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_receive: queuelen %"U16_F" ... ", (u16_t)pcb->snd_queuelen));
+        LWIP_ASSERT("pcb->snd_queuelen >= pbuf_clen(next->p)", (pcb->snd_queuelen >= pbuf_clen(next->p)));
+        /* Prevent ACK for FIN to generate a sent event */
+        if ((pcb->acked != 0) && ((TCPH_FLAGS(next->tcphdr) & TCP_FIN) != 0)) {
+          pcb->acked--;
+        }
+
+        pcb->snd_queuelen -= pbuf_clen(next->p);
+        tcp_seg_free(next);
+
+        LWIP_DEBUGF(TCP_QLEN_DEBUG, ("%"U16_F" (after freeing unacked)\n", (u16_t)pcb->snd_queuelen));
+        if (pcb->snd_queuelen != 0) {
+          LWIP_ASSERT("tcp_receive: valid queue length", pcb->unacked != NULL ||
+                      pcb->unsent != NULL);
+        }
+      }
+
+      /* If there's nothing left to acknowledge, stop the retransmit
+         timer, otherwise reset it to start again */
+      if(pcb->unacked == NULL)
+        pcb->rtime = -1;
+      else
+        pcb->rtime = 0;
+
+      pcb->polltmr = 0;
+    } else {
+      /* Fix bug bug #21582: out of sequence ACK, didn't really ack anything */
+      pcb->acked = 0;
+    }
+
+    /* We go through the ->unsent list to see if any of the segments
+       on the list are acknowledged by the ACK. This may seem
+       strange since an "unsent" segment shouldn't be acked. The
+       rationale is that lwIP puts all outstanding segments on the
+       ->unsent list after a retransmission, so these segments may
+       in fact have been sent once. */
+    while (pcb->unsent != NULL &&
+           TCP_SEQ_BETWEEN(ackno, ntohl(pcb->unsent->tcphdr->seqno) +
+                           TCP_TCPLEN(pcb->unsent), pcb->snd_nxt)) {
+      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: removing %"U32_F":%"U32_F" from pcb->unsent\n",
+                                    ntohl(pcb->unsent->tcphdr->seqno), ntohl(pcb->unsent->tcphdr->seqno) +
+                                    TCP_TCPLEN(pcb->unsent)));
+
+      next = pcb->unsent;
+      pcb->unsent = pcb->unsent->next;
+#if TCP_OVERSIZE
+      if (pcb->unsent == NULL) {
+        pcb->unsent_oversize = 0;
+      }
+#endif /* TCP_OVERSIZE */
+      LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_receive: queuelen %"U16_F" ... ", (u16_t)pcb->snd_queuelen));
+      LWIP_ASSERT("pcb->snd_queuelen >= pbuf_clen(next->p)", (pcb->snd_queuelen >= pbuf_clen(next->p)));
+      /* Prevent ACK for FIN to generate a sent event */
+      if ((pcb->acked != 0) && ((TCPH_FLAGS(next->tcphdr) & TCP_FIN) != 0)) {
+        pcb->acked--;
+      }
+      pcb->snd_queuelen -= pbuf_clen(next->p);
+      tcp_seg_free(next);
+      LWIP_DEBUGF(TCP_QLEN_DEBUG, ("%"U16_F" (after freeing unsent)\n", (u16_t)pcb->snd_queuelen));
+      if (pcb->snd_queuelen != 0) {
+        LWIP_ASSERT("tcp_receive: valid queue length",
+          pcb->unacked != NULL || pcb->unsent != NULL);
+      }
+    }
+    /* End of ACK for new data processing. */
+
+    LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_receive: pcb->rttest %"U32_F" rtseq %"U32_F" ackno %"U32_F"\n",
+                                pcb->rttest, pcb->rtseq, ackno));
+
+    /* RTT estimation calculations. This is done by checking if the
+       incoming segment acknowledges the segment we use to take a
+       round-trip time measurement. */
+    if (pcb->rttest && TCP_SEQ_LT(pcb->rtseq, ackno)) {
+      /* diff between this shouldn't exceed 32K since this are tcp timer ticks
+         and a round-trip shouldn't be that long... */
+      m = (s16_t)(tcp_ticks - pcb->rttest);
+
+      LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_receive: experienced rtt %"U16_F" ticks (%"U16_F" msec).\n",
+                                  m, m * TCP_SLOW_INTERVAL));
+
+      /* This is taken directly from VJs original code in his paper */
+      m = m - (pcb->sa >> 3);
+      pcb->sa += m;
+      if (m < 0) {
+        m = -m;
+      }
+      m = m - (pcb->sv >> 2);
+      pcb->sv += m;
+      pcb->rto = (pcb->sa >> 3) + pcb->sv;
+
+      LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_receive: RTO %"U16_F" (%"U16_F" milliseconds)\n",
+                                  pcb->rto, pcb->rto * TCP_SLOW_INTERVAL));
+
+      pcb->rttest = 0;
+    }
+  }
+
+  /* If the incoming segment contains data, we must process it
+     further unless the pcb already received a FIN.
+     (RFC 793, chapeter 3.9, "SEGMENT ARRIVES" in states CLOSE-WAIT, CLOSING,
+     LAST-ACK and TIME-WAIT: "Ignore the segment text.") */
+  if ((tcplen > 0) && (pcb->state < CLOSE_WAIT)) {
+    /* This code basically does three things:
+
+    +) If the incoming segment contains data that is the next
+    in-sequence data, this data is passed to the application. This
+    might involve trimming the first edge of the data. The rcv_nxt
+    variable and the advertised window are adjusted.
+
+    +) If the incoming segment has data that is above the next
+    sequence number expected (->rcv_nxt), the segment is placed on
+    the ->ooseq queue. This is done by finding the appropriate
+    place in the ->ooseq queue (which is ordered by sequence
+    number) and trim the segment in both ends if needed. An
+    immediate ACK is sent to indicate that we received an
+    out-of-sequence segment.
+
+    +) Finally, we check if the first segment on the ->ooseq queue
+    now is in sequence (i.e., if rcv_nxt >= ooseq->seqno). If
+    rcv_nxt > ooseq->seqno, we must trim the first edge of the
+    segment on ->ooseq before we adjust rcv_nxt. The data in the
+    segments that are now on sequence are chained onto the
+    incoming segment so that we only need to call the application
+    once.
+    */
+
+    /* First, we check if we must trim the first edge. We have to do
+       this if the sequence number of the incoming segment is less
+       than rcv_nxt, and the sequence number plus the length of the
+       segment is larger than rcv_nxt. */
+    /*    if (TCP_SEQ_LT(seqno, pcb->rcv_nxt)){
+          if (TCP_SEQ_LT(pcb->rcv_nxt, seqno + tcplen)) {*/
+    if (TCP_SEQ_BETWEEN(pcb->rcv_nxt, seqno + 1, seqno + tcplen - 1)){
+      /* Trimming the first edge is done by pushing the payload
+         pointer in the pbuf downwards. This is somewhat tricky since
+         we do not want to discard the full contents of the pbuf up to
+         the new starting point of the data since we have to keep the
+         TCP header which is present in the first pbuf in the chain.
+
+         What is done is really quite a nasty hack: the first pbuf in
+         the pbuf chain is pointed to by inseg.p. Since we need to be
+         able to deallocate the whole pbuf, we cannot change this
+         inseg.p pointer to point to any of the later pbufs in the
+         chain. Instead, we point the ->payload pointer in the first
+         pbuf to data in one of the later pbufs. We also set the
+         inseg.data pointer to point to the right place. This way, the
+         ->p pointer will still point to the first pbuf, but the
+         ->p->payload pointer will point to data in another pbuf.
+
+         After we are done with adjusting the pbuf pointers we must
+         adjust the ->data pointer in the seg and the segment
+         length.*/
+
+      off = pcb->rcv_nxt - seqno;
+      p = inseg.p;
+      LWIP_ASSERT("inseg.p != NULL", inseg.p);
+      LWIP_ASSERT("insane offset!", (off < 0x7fff));
+      if (inseg.p->len < off) {
+        LWIP_ASSERT("pbuf too short!", (((s32_t)inseg.p->tot_len) >= off));
+        new_tot_len = (u16_t)(inseg.p->tot_len - off);
+        while (p->len < off) {
+          off -= p->len;
+          /* KJM following line changed (with addition of new_tot_len var)
+             to fix bug #9076
+             inseg.p->tot_len -= p->len; */
+          p->tot_len = new_tot_len;
+          p->len = 0;
+          p = p->next;
+        }
+        if(pbuf_header(p, (s16_t)-off)) {
+          /* Do we need to cope with this failing?  Assert for now */
+          LWIP_ASSERT("pbuf_header failed", 0);
+        }
+      } else {
+        if(pbuf_header(inseg.p, (s16_t)-off)) {
+          /* Do we need to cope with this failing?  Assert for now */
+          LWIP_ASSERT("pbuf_header failed", 0);
+        }
+      }
+      inseg.len -= (u16_t)(pcb->rcv_nxt - seqno);
+      inseg.tcphdr->seqno = seqno = pcb->rcv_nxt;
+    }
+    else {
+      if (TCP_SEQ_LT(seqno, pcb->rcv_nxt)){
+        /* the whole segment is < rcv_nxt */
+        /* must be a duplicate of a packet that has already been correctly handled */
+
+        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: duplicate seqno %"U32_F"\n", seqno));
+        tcp_ack_now(pcb);
+      }
+    }
+
+    /* The sequence number must be within the window (above rcv_nxt
+       and below rcv_nxt + rcv_wnd) in order to be further
+       processed. */
+    if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt,
+                        pcb->rcv_nxt + pcb->rcv_wnd - 1)){
+      if (pcb->rcv_nxt == seqno) {
+        /* The incoming segment is the next in sequence. We check if
+           we have to trim the end of the segment and update rcv_nxt
+           and pass the data to the application. */
+        tcplen = TCP_TCPLEN(&inseg);
+
+        if (tcplen > pcb->rcv_wnd) {
+          LWIP_DEBUGF(TCP_INPUT_DEBUG,
+                      ("tcp_receive: other end overran receive window"
+                       "seqno %"U32_F" len %"U16_F" right edge %"U32_F"\n",
+                       seqno, tcplen, pcb->rcv_nxt + pcb->rcv_wnd));
+          if (TCPH_FLAGS(inseg.tcphdr) & TCP_FIN) {
+            /* Must remove the FIN from the header as we're trimming
+             * that byte of sequence-space from the packet */
+            TCPH_FLAGS_SET(inseg.tcphdr, TCPH_FLAGS(inseg.tcphdr) &~ TCP_FIN);
+          }
+          /* Adjust length of segment to fit in the window. */
+          inseg.len = pcb->rcv_wnd;
+          if (TCPH_FLAGS(inseg.tcphdr) & TCP_SYN) {
+            inseg.len -= 1;
+          }
+          pbuf_realloc(inseg.p, inseg.len);
+          tcplen = TCP_TCPLEN(&inseg);
+          LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd\n",
+                      (seqno + tcplen) == (pcb->rcv_nxt + pcb->rcv_wnd));
+        }
+#if TCP_QUEUE_OOSEQ
+        /* Received in-sequence data, adjust ooseq data if:
+           - FIN has been received or
+           - inseq overlaps with ooseq */
+        if (pcb->ooseq != NULL) {
+          if (TCPH_FLAGS(inseg.tcphdr) & TCP_FIN) {
+            LWIP_DEBUGF(TCP_INPUT_DEBUG,
+                        ("tcp_receive: received in-order FIN, binning ooseq queue\n"));
+            /* Received in-order FIN means anything that was received
+             * out of order must now have been received in-order, so
+             * bin the ooseq queue */
+            while (pcb->ooseq != NULL) {
+              struct tcp_seg *old_ooseq = pcb->ooseq;
+              pcb->ooseq = pcb->ooseq->next;
+              tcp_seg_free(old_ooseq);
+            }
+          } else {
+            next = pcb->ooseq;
+            /* Remove all segments on ooseq that are covered by inseg already.
+             * FIN is copied from ooseq to inseg if present. */
+            while (next &&
+                   TCP_SEQ_GEQ(seqno + tcplen,
+                               next->tcphdr->seqno + next->len)) {
+              /* inseg cannot have FIN here (already processed above) */
+              if (TCPH_FLAGS(next->tcphdr) & TCP_FIN &&
+                  (TCPH_FLAGS(inseg.tcphdr) & TCP_SYN) == 0) {
+                TCPH_SET_FLAG(inseg.tcphdr, TCP_FIN);
+                tcplen = TCP_TCPLEN(&inseg);
+              }
+              prev = next;
+              next = next->next;
+              tcp_seg_free(prev);
+            }
+            /* Now trim right side of inseg if it overlaps with the first
+             * segment on ooseq */
+            if (next &&
+                TCP_SEQ_GT(seqno + tcplen,
+                           next->tcphdr->seqno)) {
+              /* inseg cannot have FIN here (already processed above) */
+              inseg.len = (u16_t)(next->tcphdr->seqno - seqno);
+              if (TCPH_FLAGS(inseg.tcphdr) & TCP_SYN) {
+                inseg.len -= 1;
+              }
+              pbuf_realloc(inseg.p, inseg.len);
+              tcplen = TCP_TCPLEN(&inseg);
+              LWIP_ASSERT("tcp_receive: segment not trimmed correctly to ooseq queue\n",
+                          (seqno + tcplen) == next->tcphdr->seqno);
+            }
+            pcb->ooseq = next;
+          }
+        }
+#endif /* TCP_QUEUE_OOSEQ */
+
+        pcb->rcv_nxt = seqno + tcplen;
+
+        /* Update the receiver's (our) window. */
+        LWIP_ASSERT("tcp_receive: tcplen > rcv_wnd\n", pcb->rcv_wnd >= tcplen);
+        pcb->rcv_wnd -= tcplen;
+
+        tcp_update_rcv_ann_wnd(pcb);
+
+        /* If there is data in the segment, we make preparations to
+           pass this up to the application. The ->recv_data variable
+           is used for holding the pbuf that goes to the
+           application. The code for reassembling out-of-sequence data
+           chains its data on this pbuf as well.
+
+           If the segment was a FIN, we set the TF_GOT_FIN flag that will
+           be used to indicate to the application that the remote side has
+           closed its end of the connection. */
+        if (inseg.p->tot_len > 0) {
+          recv_data = inseg.p;
+          /* Since this pbuf now is the responsibility of the
+             application, we delete our reference to it so that we won't
+             (mistakingly) deallocate it. */
+          inseg.p = NULL;
+        }
+        if (TCPH_FLAGS(inseg.tcphdr) & TCP_FIN) {
+          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: received FIN.\n"));
+          recv_flags |= TF_GOT_FIN;
+        }
+
+#if TCP_QUEUE_OOSEQ
+        /* We now check if we have segments on the ->ooseq queue that
+           are now in sequence. */
+        while (pcb->ooseq != NULL &&
+               pcb->ooseq->tcphdr->seqno == pcb->rcv_nxt) {
+
+          cseg = pcb->ooseq;
+          seqno = pcb->ooseq->tcphdr->seqno;
+
+          pcb->rcv_nxt += TCP_TCPLEN(cseg);
+          LWIP_ASSERT("tcp_receive: ooseq tcplen > rcv_wnd\n",
+                      pcb->rcv_wnd >= TCP_TCPLEN(cseg));
+          pcb->rcv_wnd -= TCP_TCPLEN(cseg);
+
+          tcp_update_rcv_ann_wnd(pcb);
+
+          if (cseg->p->tot_len > 0) {
+            /* Chain this pbuf onto the pbuf that we will pass to
+               the application. */
+            if (recv_data) {
+              pbuf_cat(recv_data, cseg->p);
+            } else {
+              recv_data = cseg->p;
+            }
+            cseg->p = NULL;
+          }
+          if (TCPH_FLAGS(cseg->tcphdr) & TCP_FIN) {
+            LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: dequeued FIN.\n"));
+            recv_flags |= TF_GOT_FIN;
+            if (pcb->state == ESTABLISHED) { /* force passive close or we can move to active close */
+              pcb->state = CLOSE_WAIT;
+            }
+          }
+
+          pcb->ooseq = cseg->next;
+          tcp_seg_free(cseg);
+        }
+#endif /* TCP_QUEUE_OOSEQ */
+
+
+        /* Acknowledge the segment(s). */
+        tcp_ack(pcb);
+
+      } else {
+        /* We get here if the incoming segment is out-of-sequence. */
+        tcp_send_empty_ack(pcb);
+#if TCP_QUEUE_OOSEQ
+        /* We queue the segment on the ->ooseq queue. */
+        if (pcb->ooseq == NULL) {
+          pcb->ooseq = tcp_seg_copy(&inseg);
+        } else {
+          /* If the queue is not empty, we walk through the queue and
+             try to find a place where the sequence number of the
+             incoming segment is between the sequence numbers of the
+             previous and the next segment on the ->ooseq queue. That is
+             the place where we put the incoming segment. If needed, we
+             trim the second edges of the previous and the incoming
+             segment so that it will fit into the sequence.
+
+             If the incoming segment has the same sequence number as a
+             segment on the ->ooseq queue, we discard the segment that
+             contains less data. */
+
+          prev = NULL;
+          for(next = pcb->ooseq; next != NULL; next = next->next) {
+            if (seqno == next->tcphdr->seqno) {
+              /* The sequence number of the incoming segment is the
+                 same as the sequence number of the segment on
+                 ->ooseq. We check the lengths to see which one to
+                 discard. */
+              if (inseg.len > next->len) {
+                /* The incoming segment is larger than the old
+                   segment. We replace some segments with the new
+                   one. */
+                cseg = tcp_seg_copy(&inseg);
+                if (cseg != NULL) {
+                  if (prev != NULL) {
+                    prev->next = cseg;
+                  } else {
+                    pcb->ooseq = cseg;
+                  }
+                  tcp_oos_insert_segment(cseg, next);
+                }
+                break;
+              } else {
+                /* Either the lenghts are the same or the incoming
+                   segment was smaller than the old one; in either
+                   case, we ditch the incoming segment. */
+                break;
+              }
+            } else {
+              if (prev == NULL) {
+                if (TCP_SEQ_LT(seqno, next->tcphdr->seqno)) {
+                  /* The sequence number of the incoming segment is lower
+                     than the sequence number of the first segment on the
+                     queue. We put the incoming segment first on the
+                     queue. */
+                  cseg = tcp_seg_copy(&inseg);
+                  if (cseg != NULL) {
+                    pcb->ooseq = cseg;
+                    tcp_oos_insert_segment(cseg, next);
+                  }
+                  break;
+                }
+              } else {
+                /*if (TCP_SEQ_LT(prev->tcphdr->seqno, seqno) &&
+                  TCP_SEQ_LT(seqno, next->tcphdr->seqno)) {*/
+                if (TCP_SEQ_BETWEEN(seqno, prev->tcphdr->seqno+1, next->tcphdr->seqno-1)) {
+                  /* The sequence number of the incoming segment is in
+                     between the sequence numbers of the previous and
+                     the next segment on ->ooseq. We trim trim the previous
+                     segment, delete next segments that included in received segment
+                     and trim received, if needed. */
+                  cseg = tcp_seg_copy(&inseg);
+                  if (cseg != NULL) {
+                    if (TCP_SEQ_GT(prev->tcphdr->seqno + prev->len, seqno)) {
+                      /* We need to trim the prev segment. */
+                      prev->len = (u16_t)(seqno - prev->tcphdr->seqno);
+                      pbuf_realloc(prev->p, prev->len);
+                    }
+                    prev->next = cseg;
+                    tcp_oos_insert_segment(cseg, next);
+                  }
+                  break;
+                }
+              }
+              /* If the "next" segment is the last segment on the
+                 ooseq queue, we add the incoming segment to the end
+                 of the list. */
+              if (next->next == NULL &&
+                  TCP_SEQ_GT(seqno, next->tcphdr->seqno)) {
+                if (TCPH_FLAGS(next->tcphdr) & TCP_FIN) {
+                  /* segment "next" already contains all data */
+                  break;
+                }
+                next->next = tcp_seg_copy(&inseg);
+                if (next->next != NULL) {
+                  if (TCP_SEQ_GT(next->tcphdr->seqno + next->len, seqno)) {
+                    /* We need to trim the last segment. */
+                    next->len = (u16_t)(seqno - next->tcphdr->seqno);
+                    pbuf_realloc(next->p, next->len);
+                  }
+                  /* check if the remote side overruns our receive window */
+                  if ((u32_t)tcplen + seqno > pcb->rcv_nxt + (u32_t)pcb->rcv_wnd) {
+                    LWIP_DEBUGF(TCP_INPUT_DEBUG,
+                                ("tcp_receive: other end overran receive window"
+                                 "seqno %"U32_F" len %"U16_F" right edge %"U32_F"\n",
+                                 seqno, tcplen, pcb->rcv_nxt + pcb->rcv_wnd));
+                    if (TCPH_FLAGS(next->next->tcphdr) & TCP_FIN) {
+                      /* Must remove the FIN from the header as we're trimming
+                       * that byte of sequence-space from the packet */
+                      TCPH_FLAGS_SET(next->next->tcphdr, TCPH_FLAGS(next->next->tcphdr) &~ TCP_FIN);
+                    }
+                    /* Adjust length of segment to fit in the window. */
+                    next->next->len = pcb->rcv_nxt + pcb->rcv_wnd - seqno;
+                    pbuf_realloc(next->next->p, next->next->len);
+                    tcplen = TCP_TCPLEN(next->next);
+                    LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd\n",
+                                (seqno + tcplen) == (pcb->rcv_nxt + pcb->rcv_wnd));
+                  }
+                }
+                break;
+              }
+            }
+            prev = next;
+          }
+        }
+#if TCP_OOSEQ_MAX_BYTES || TCP_OOSEQ_MAX_PBUFS
+        /* Check that the data on ooseq doesn't exceed one of the limits
+           and throw away everything above that limit. */
+        ooseq_blen = 0;
+        ooseq_qlen = 0;
+        prev = NULL;
+        for(next = pcb->ooseq; next != NULL; prev = next, next = next->next) {
+          struct pbuf *p = next->p;
+          ooseq_blen += p->tot_len;
+          ooseq_qlen += pbuf_clen(p);
+          if ((ooseq_blen > TCP_OOSEQ_MAX_BYTES) ||
+              (ooseq_qlen > TCP_OOSEQ_MAX_PBUFS)) {
+             /* too much ooseq data, dump this and everything after it */
+             tcp_segs_free(next);
+             if (prev == NULL) {
+               /* first ooseq segment is too much, dump the whole queue */
+               pcb->ooseq = NULL;
+             } else {
+               /* just dump 'next' and everything after it */
+               prev->next = NULL;
+             }
+             break;
+          }
+        }
+#endif /* TCP_OOSEQ_MAX_BYTES || TCP_OOSEQ_MAX_PBUFS */
+#endif /* TCP_QUEUE_OOSEQ */
+      }
+    } else {
+      /* The incoming segment is not withing the window. */
+      tcp_send_empty_ack(pcb);
+    }
+  } else {
+    /* Segments with length 0 is taken care of here. Segments that
+       fall out of the window are ACKed. */
+    /*if (TCP_SEQ_GT(pcb->rcv_nxt, seqno) ||
+      TCP_SEQ_GEQ(seqno, pcb->rcv_nxt + pcb->rcv_wnd)) {*/
+    if(!TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt, pcb->rcv_nxt + pcb->rcv_wnd-1)){
+      tcp_ack_now(pcb);
+    }
+  }
+}
+
+/**
+ * Parses the options contained in the incoming segment.
+ *
+ * Called from tcp_listen_input() and tcp_process().
+ * Currently, only the MSS option is supported!
+ *
+ * @param pcb the tcp_pcb for which a segment arrived
+ */
+static void
+tcp_parseopt(struct tcp_pcb *pcb)
+{
+  u16_t c, max_c;
+  u16_t mss;
+  u8_t *opts, opt;
+#if LWIP_TCP_TIMESTAMPS
+  u32_t tsval;
+#endif
+
+  opts = (u8_t *)tcphdr + TCP_HLEN;
+
+  /* Parse the TCP MSS option, if present. */
+  if(TCPH_HDRLEN(tcphdr) > 0x5) {
+    max_c = (TCPH_HDRLEN(tcphdr) - 5) << 2;
+    for (c = 0; c < max_c; ) {
+      opt = opts[c];
+      switch (opt) {
+      case 0x00:
+        /* End of options. */
+        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: EOL\n"));
+        return;
+      case 0x01:
+        /* NOP option. */
+        ++c;
+        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: NOP\n"));
+        break;
+      case 0x02:
+        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: MSS\n"));
+        if (opts[c + 1] != 0x04 || c + 0x04 > max_c) {
+          /* Bad length */
+          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: bad length\n"));
+          return;
+        }
+        /* An MSS option with the right option length. */
+        mss = (opts[c + 2] << 8) | opts[c + 3];
+        /* Limit the mss to the configured TCP_MSS and prevent division by zero */
+        pcb->mss = ((mss > TCP_MSS) || (mss == 0)) ? TCP_MSS : mss;
+        /* Advance to next option */
+        c += 0x04;
+        break;
+#if LWIP_TCP_TIMESTAMPS
+      case 0x08:
+        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: TS\n"));
+        if (opts[c + 1] != 0x0A || c + 0x0A > max_c) {
+          /* Bad length */
+          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: bad length\n"));
+          return;
+        }
+        /* TCP timestamp option with valid length */
+        tsval = (opts[c+2]) | (opts[c+3] << 8) |
+          (opts[c+4] << 16) | (opts[c+5] << 24);
+        if (flags & TCP_SYN) {
+          pcb->ts_recent = ntohl(tsval);
+          pcb->flags |= TF_TIMESTAMP;
+        } else if (TCP_SEQ_BETWEEN(pcb->ts_lastacksent, seqno, seqno+tcplen)) {
+          pcb->ts_recent = ntohl(tsval);
+        }
+        /* Advance to next option */
+        c += 0x0A;
+        break;
+#endif
+      default:
+        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: other\n"));
+        if (opts[c + 1] == 0) {
+          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: bad length\n"));
+          /* If the length field is zero, the options are malformed
+             and we don't process them further. */
+          return;
+        }
+        /* All other options have a length field, so that we easily
+           can skip past them. */
+        c += opts[c + 1];
+      }
+    }
+  }
+}
+
+#endif /* LWIP_TCP */
diff --git a/ext/lwip/src/core/tcp_out.c b/ext/lwip/src/core/tcp_out.c
new file mode 100644
index 000000000..94395e25d
--- /dev/null
+++ b/ext/lwip/src/core/tcp_out.c
@@ -0,0 +1,1485 @@
+/**
+ * @file
+ * Transmission Control Protocol, outgoing traffic
+ *
+ * The output functions of TCP.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/tcp_impl.h"
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/stats.h"
+#include "lwip/snmp.h"
+#if LWIP_TCP_TIMESTAMPS
+#include "lwip/sys.h"
+#endif
+
+#include <string.h>
+
+/* Define some copy-macros for checksum-on-copy so that the code looks
+   nicer by preventing too many ifdef's. */
+#if TCP_CHECKSUM_ON_COPY
+#define TCP_DATA_COPY(dst, src, len, seg) do { \
+  tcp_seg_add_chksum(LWIP_CHKSUM_COPY(dst, src, len), \
+                     len, &seg->chksum, &seg->chksum_swapped); \
+  seg->flags |= TF_SEG_DATA_CHECKSUMMED; } while(0)
+#define TCP_DATA_COPY2(dst, src, len, chksum, chksum_swapped)  \
+  tcp_seg_add_chksum(LWIP_CHKSUM_COPY(dst, src, len), len, chksum, chksum_swapped);
+#else /* TCP_CHECKSUM_ON_COPY*/
+#define TCP_DATA_COPY(dst, src, len, seg)                     MEMCPY(dst, src, len)
+#define TCP_DATA_COPY2(dst, src, len, chksum, chksum_swapped) MEMCPY(dst, src, len)
+#endif /* TCP_CHECKSUM_ON_COPY*/
+
+/** Define this to 1 for an extra check that the output checksum is valid
+ * (usefule when the checksum is generated by the application, not the stack) */
+#ifndef TCP_CHECKSUM_ON_COPY_SANITY_CHECK
+#define TCP_CHECKSUM_ON_COPY_SANITY_CHECK   0
+#endif
+
+/* Forward declarations.*/
+static void tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb);
+
+/** Allocate a pbuf and create a tcphdr at p->payload, used for output
+ * functions other than the default tcp_output -> tcp_output_segment
+ * (e.g. tcp_send_empty_ack, etc.)
+ *
+ * @param pcb tcp pcb for which to send a packet (used to initialize tcp_hdr)
+ * @param optlen length of header-options
+ * @param datalen length of tcp data to reserve in pbuf
+ * @param seqno_be seqno in network byte order (big-endian)
+ * @return pbuf with p->payload being the tcp_hdr
+ */
+static struct pbuf *
+tcp_output_alloc_header(struct tcp_pcb *pcb, u16_t optlen, u16_t datalen,
+                      u32_t seqno_be /* already in network byte order */)
+{
+  struct tcp_hdr *tcphdr;
+  struct pbuf *p = pbuf_alloc(PBUF_IP, TCP_HLEN + optlen + datalen, PBUF_RAM);
+  if (p != NULL) {
+    LWIP_ASSERT("check that first pbuf can hold struct tcp_hdr",
+                 (p->len >= TCP_HLEN + optlen));
+    tcphdr = (struct tcp_hdr *)p->payload;
+    tcphdr->src = htons(pcb->local_port);
+    tcphdr->dest = htons(pcb->remote_port);
+    tcphdr->seqno = seqno_be;
+    tcphdr->ackno = htonl(pcb->rcv_nxt);
+    TCPH_HDRLEN_FLAGS_SET(tcphdr, (5 + optlen / 4), TCP_ACK);
+    tcphdr->wnd = htons(pcb->rcv_ann_wnd);
+    tcphdr->chksum = 0;
+    tcphdr->urgp = 0;
+
+    /* If we're sending a packet, update the announced right window edge */
+    pcb->rcv_ann_right_edge = pcb->rcv_nxt + pcb->rcv_ann_wnd;
+  }
+  return p;
+}
+
+/**
+ * Called by tcp_close() to send a segment including FIN flag but not data.
+ *
+ * @param pcb the tcp_pcb over which to send a segment
+ * @return ERR_OK if sent, another err_t otherwise
+ */
+err_t
+tcp_send_fin(struct tcp_pcb *pcb)
+{
+  /* first, try to add the fin to the last unsent segment */
+  if (pcb->unsent != NULL) {
+    struct tcp_seg *last_unsent;
+    for (last_unsent = pcb->unsent; last_unsent->next != NULL;
+         last_unsent = last_unsent->next);
+
+    if ((TCPH_FLAGS(last_unsent->tcphdr) & (TCP_SYN | TCP_FIN | TCP_RST)) == 0) {
+      /* no SYN/FIN/RST flag in the header, we can add the FIN flag */
+      TCPH_SET_FLAG(last_unsent->tcphdr, TCP_FIN);
+      pcb->flags |= TF_FIN;
+      return ERR_OK;
+    }
+  }
+  /* no data, no length, flags, copy=1, no optdata */
+  return tcp_enqueue_flags(pcb, TCP_FIN);
+}
+
+/**
+ * Create a TCP segment with prefilled header.
+ *
+ * Called by tcp_write and tcp_enqueue_flags.
+ *
+ * @param pcb Protocol control block for the TCP connection.
+ * @param p pbuf that is used to hold the TCP header.
+ * @param flags TCP flags for header.
+ * @param seqno TCP sequence number of this packet
+ * @param optflags options to include in TCP header
+ * @return a new tcp_seg pointing to p, or NULL.
+ * The TCP header is filled in except ackno and wnd.
+ * p is freed on failure.
+ */
+static struct tcp_seg *
+tcp_create_segment(struct tcp_pcb *pcb, struct pbuf *p, u8_t flags, u32_t seqno, u8_t optflags)
+{
+  struct tcp_seg *seg;
+  u8_t optlen = LWIP_TCP_OPT_LENGTH(optflags);
+
+  if ((seg = (struct tcp_seg *)memp_malloc(MEMP_TCP_SEG)) == NULL) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_create_segment: no memory.\n"));
+    pbuf_free(p);
+    return NULL;
+  }
+  seg->flags = optflags;
+  seg->next = NULL;
+  seg->p = p;
+  seg->len = p->tot_len - optlen;
+#if TCP_OVERSIZE_DBGCHECK
+  seg->oversize_left = 0;
+#endif /* TCP_OVERSIZE_DBGCHECK */
+#if TCP_CHECKSUM_ON_COPY
+  seg->chksum = 0;
+  seg->chksum_swapped = 0;
+  /* check optflags */
+  LWIP_ASSERT("invalid optflags passed: TF_SEG_DATA_CHECKSUMMED",
+              (optflags & TF_SEG_DATA_CHECKSUMMED) == 0);
+#endif /* TCP_CHECKSUM_ON_COPY */
+
+  /* build TCP header */
+  if (pbuf_header(p, TCP_HLEN)) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_create_segment: no room for TCP header in pbuf.\n"));
+    TCP_STATS_INC(tcp.err);
+    tcp_seg_free(seg);
+    return NULL;
+  }
+  seg->tcphdr = (struct tcp_hdr *)seg->p->payload;
+  seg->tcphdr->src = htons(pcb->local_port);
+  seg->tcphdr->dest = htons(pcb->remote_port);
+  seg->tcphdr->seqno = htonl(seqno);
+  /* ackno is set in tcp_output */
+  TCPH_HDRLEN_FLAGS_SET(seg->tcphdr, (5 + optlen / 4), flags);
+  /* wnd and chksum are set in tcp_output */
+  seg->tcphdr->urgp = 0;
+  return seg;
+}
+
+/**
+ * Allocate a PBUF_RAM pbuf, perhaps with extra space at the end.
+ *
+ * This function is like pbuf_alloc(layer, length, PBUF_RAM) except
+ * there may be extra bytes available at the end.
+ *
+ * @param layer flag to define header size.
+ * @param length size of the pbuf's payload.
+ * @param max_length maximum usable size of payload+oversize.
+ * @param oversize pointer to a u16_t that will receive the number of usable tail bytes.
+ * @param pcb The TCP connection that willo enqueue the pbuf.
+ * @param apiflags API flags given to tcp_write.
+ * @param first_seg true when this pbuf will be used in the first enqueued segment.
+ * @param
+ */
+#if TCP_OVERSIZE
+static struct pbuf *
+tcp_pbuf_prealloc(pbuf_layer layer, u16_t length, u16_t max_length,
+                  u16_t *oversize, struct tcp_pcb *pcb, u8_t apiflags,
+                  u8_t first_seg)
+{
+  struct pbuf *p;
+  u16_t alloc = length;
+
+#if LWIP_NETIF_TX_SINGLE_PBUF
+  LWIP_UNUSED_ARG(max_length);
+  LWIP_UNUSED_ARG(pcb);
+  LWIP_UNUSED_ARG(apiflags);
+  LWIP_UNUSED_ARG(first_seg);
+  /* always create MSS-sized pbufs */
+  alloc = max_length;
+#else /* LWIP_NETIF_TX_SINGLE_PBUF */
+  if (length < max_length) {
+    /* Should we allocate an oversized pbuf, or just the minimum
+     * length required? If tcp_write is going to be called again
+     * before this segment is transmitted, we want the oversized
+     * buffer. If the segment will be transmitted immediately, we can
+     * save memory by allocating only length. We use a simple
+     * heuristic based on the following information:
+     *
+     * Did the user set TCP_WRITE_FLAG_MORE?
+     *
+     * Will the Nagle algorithm defer transmission of this segment?
+     */
+    if ((apiflags & TCP_WRITE_FLAG_MORE) ||
+        (!(pcb->flags & TF_NODELAY) &&
+         (!first_seg ||
+          pcb->unsent != NULL ||
+          pcb->unacked != NULL))) {
+      alloc = LWIP_MIN(max_length, LWIP_MEM_ALIGN_SIZE(length + TCP_OVERSIZE));
+    }
+  }
+#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
+  p = pbuf_alloc(layer, alloc, PBUF_RAM);
+  if (p == NULL) {
+    return NULL;
+  }
+  LWIP_ASSERT("need unchained pbuf", p->next == NULL);
+  *oversize = p->len - length;
+  /* trim p->len to the currently used size */
+  p->len = p->tot_len = length;
+  return p;
+}
+#else /* TCP_OVERSIZE */
+#define tcp_pbuf_prealloc(layer, length, mx, os, pcb, api, fst) pbuf_alloc((layer), (length), PBUF_RAM)
+#endif /* TCP_OVERSIZE */
+
+#if TCP_CHECKSUM_ON_COPY
+/** Add a checksum of newly added data to the segment */
+static void
+tcp_seg_add_chksum(u16_t chksum, u16_t len, u16_t *seg_chksum,
+                   u8_t *seg_chksum_swapped)
+{
+  u32_t helper;
+  /* add chksum to old chksum and fold to u16_t */
+  helper = chksum + *seg_chksum;
+  chksum = FOLD_U32T(helper);
+  if ((len & 1) != 0) {
+    *seg_chksum_swapped = 1 - *seg_chksum_swapped;
+    chksum = SWAP_BYTES_IN_WORD(chksum);
+  }
+  *seg_chksum = chksum;
+}
+#endif /* TCP_CHECKSUM_ON_COPY */
+
+/** Checks if tcp_write is allowed or not (checks state, snd_buf and snd_queuelen).
+ *
+ * @param pcb the tcp pcb to check for
+ * @param len length of data to send (checked agains snd_buf)
+ * @return ERR_OK if tcp_write is allowed to proceed, another err_t otherwise
+ */
+static err_t
+tcp_write_checks(struct tcp_pcb *pcb, u16_t len)
+{
+  /* connection is in invalid state for data transmission? */
+  if ((pcb->state != ESTABLISHED) &&
+      (pcb->state != CLOSE_WAIT) &&
+      (pcb->state != SYN_SENT) &&
+      (pcb->state != SYN_RCVD)) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_STATE | LWIP_DBG_LEVEL_SEVERE, ("tcp_write() called in invalid state\n"));
+    return ERR_CONN;
+  } else if (len == 0) {
+    return ERR_OK;
+  }
+
+  /* fail on too much data */
+  if (len > pcb->snd_buf) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 3, ("tcp_write: too much data (len=%"U16_F" > snd_buf=%"U16_F")\n",
+      len, pcb->snd_buf));
+    pcb->flags |= TF_NAGLEMEMERR;
+    return ERR_MEM;
+  }
+
+  LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_write: queuelen: %"U16_F"\n", (u16_t)pcb->snd_queuelen));
+
+  /* If total number of pbufs on the unsent/unacked queues exceeds the
+   * configured maximum, return an error */
+  /* check for configured max queuelen and possible overflow */
+  if ((pcb->snd_queuelen >= TCP_SND_QUEUELEN) || (pcb->snd_queuelen > TCP_SNDQUEUELEN_OVERFLOW)) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 3, ("tcp_write: too long queue %"U16_F" (max %"U16_F")\n",
+      pcb->snd_queuelen, TCP_SND_QUEUELEN));
+    TCP_STATS_INC(tcp.memerr);
+    pcb->flags |= TF_NAGLEMEMERR;
+    return ERR_MEM;
+  }
+  if (pcb->snd_queuelen != 0) {
+    LWIP_ASSERT("tcp_write: pbufs on queue => at least one queue non-empty",
+      pcb->unacked != NULL || pcb->unsent != NULL);
+  } else {
+    LWIP_ASSERT("tcp_write: no pbufs on queue => both queues empty",
+      pcb->unacked == NULL && pcb->unsent == NULL);
+  }
+  return ERR_OK;
+}
+
+/**
+ * Write data for sending (but does not send it immediately).
+ *
+ * It waits in the expectation of more data being sent soon (as
+ * it can send them more efficiently by combining them together).
+ * To prompt the system to send data now, call tcp_output() after
+ * calling tcp_write().
+ *
+ * @param pcb Protocol control block for the TCP connection to enqueue data for.
+ * @param arg Pointer to the data to be enqueued for sending.
+ * @param len Data length in bytes
+ * @param apiflags combination of following flags :
+ * - TCP_WRITE_FLAG_COPY (0x01) data will be copied into memory belonging to the stack
+ * - TCP_WRITE_FLAG_MORE (0x02) for TCP connection, PSH flag will be set on last segment sent,
+ * @return ERR_OK if enqueued, another err_t on error
+ */
+err_t
+tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
+{
+  struct pbuf *concat_p = NULL;
+  struct tcp_seg *last_unsent = NULL, *seg = NULL, *prev_seg = NULL, *queue = NULL;
+  u16_t pos = 0; /* position in 'arg' data */
+  u16_t queuelen;
+  u8_t optlen = 0;
+  u8_t optflags = 0;
+#if TCP_OVERSIZE
+  u16_t oversize = 0;
+  u16_t oversize_used = 0;
+#endif /* TCP_OVERSIZE */
+#if TCP_CHECKSUM_ON_COPY
+  u16_t concat_chksum = 0;
+  u8_t concat_chksum_swapped = 0;
+  u16_t concat_chksummed = 0;
+#endif /* TCP_CHECKSUM_ON_COPY */
+  err_t err;
+  /* don't allocate segments bigger than half the maximum window we ever received */
+  u16_t mss_local = LWIP_MIN(pcb->mss, pcb->snd_wnd_max/2);
+
+#if LWIP_NETIF_TX_SINGLE_PBUF
+  /* Always copy to try to create single pbufs for TX */
+  apiflags |= TCP_WRITE_FLAG_COPY;
+#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
+
+  LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_write(pcb=%p, data=%p, len=%"U16_F", apiflags=%"U16_F")\n",
+    (void *)pcb, arg, len, (u16_t)apiflags));
+  LWIP_ERROR("tcp_write: arg == NULL (programmer violates API)",
+             arg != NULL, return ERR_ARG;);
+
+  err = tcp_write_checks(pcb, len);
+  if (err != ERR_OK) {
+    return err;
+  }
+  queuelen = pcb->snd_queuelen;
+
+#if LWIP_TCP_TIMESTAMPS
+  if ((pcb->flags & TF_TIMESTAMP)) {
+    optflags = TF_SEG_OPTS_TS;
+    optlen = LWIP_TCP_OPT_LENGTH(TF_SEG_OPTS_TS);
+  }
+#endif /* LWIP_TCP_TIMESTAMPS */
+
+
+  /*
+   * TCP segmentation is done in three phases with increasing complexity:
+   *
+   * 1. Copy data directly into an oversized pbuf.
+   * 2. Chain a new pbuf to the end of pcb->unsent.
+   * 3. Create new segments.
+   *
+   * We may run out of memory at any point. In that case we must
+   * return ERR_MEM and not change anything in pcb. Therefore, all
+   * changes are recorded in local variables and committed at the end
+   * of the function. Some pcb fields are maintained in local copies:
+   *
+   * queuelen = pcb->snd_queuelen
+   * oversize = pcb->unsent_oversize
+   *
+   * These variables are set consistently by the phases:
+   *
+   * seg points to the last segment tampered with.
+   *
+   * pos records progress as data is segmented.
+   */
+
+  /* Find the tail of the unsent queue. */
+  if (pcb->unsent != NULL) {
+    u16_t space;
+    u16_t unsent_optlen;
+
+    /* @todo: this could be sped up by keeping last_unsent in the pcb */
+    for (last_unsent = pcb->unsent; last_unsent->next != NULL;
+         last_unsent = last_unsent->next);
+
+    /* Usable space at the end of the last unsent segment */
+    unsent_optlen = LWIP_TCP_OPT_LENGTH(last_unsent->flags);
+    space = mss_local - (last_unsent->len + unsent_optlen);
+
+    /*
+     * Phase 1: Copy data directly into an oversized pbuf.
+     *
+     * The number of bytes copied is recorded in the oversize_used
+     * variable. The actual copying is done at the bottom of the
+     * function.
+     */
+#if TCP_OVERSIZE
+#if TCP_OVERSIZE_DBGCHECK
+    /* check that pcb->unsent_oversize matches last_unsent->unsent_oversize */
+    LWIP_ASSERT("unsent_oversize mismatch (pcb vs. last_unsent)",
+                pcb->unsent_oversize == last_unsent->oversize_left);
+#endif /* TCP_OVERSIZE_DBGCHECK */
+    oversize = pcb->unsent_oversize;
+    if (oversize > 0) {
+      LWIP_ASSERT("inconsistent oversize vs. space", oversize_used <= space);
+      seg = last_unsent;
+      oversize_used = oversize < len ? oversize : len;
+      pos += oversize_used;
+      oversize -= oversize_used;
+      space -= oversize_used;
+    }
+    /* now we are either finished or oversize is zero */
+    LWIP_ASSERT("inconsistend oversize vs. len", (oversize == 0) || (pos == len));
+#endif /* TCP_OVERSIZE */
+
+    /*
+     * Phase 2: Chain a new pbuf to the end of pcb->unsent.
+     *
+     * We don't extend segments containing SYN/FIN flags or options
+     * (len==0). The new pbuf is kept in concat_p and pbuf_cat'ed at
+     * the end.
+     */
+    if ((pos < len) && (space > 0) && (last_unsent->len > 0)) {
+      u16_t seglen = space < len - pos ? space : len - pos;
+      seg = last_unsent;
+
+      /* Create a pbuf with a copy or reference to seglen bytes. We
+       * can use PBUF_RAW here since the data appears in the middle of
+       * a segment. A header will never be prepended. */
+      if (apiflags & TCP_WRITE_FLAG_COPY) {
+        /* Data is copied */
+        if ((concat_p = tcp_pbuf_prealloc(PBUF_RAW, seglen, space, &oversize, pcb, apiflags, 1)) == NULL) {
+          LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2,
+                      ("tcp_write : could not allocate memory for pbuf copy size %"U16_F"\n",
+                       seglen));
+          goto memerr;
+        }
+#if TCP_OVERSIZE_DBGCHECK
+        last_unsent->oversize_left += oversize;
+#endif /* TCP_OVERSIZE_DBGCHECK */
+        TCP_DATA_COPY2(concat_p->payload, (u8_t*)arg + pos, seglen, &concat_chksum, &concat_chksum_swapped);
+#if TCP_CHECKSUM_ON_COPY
+        concat_chksummed += seglen;
+#endif /* TCP_CHECKSUM_ON_COPY */
+      } else {
+        /* Data is not copied */
+        if ((concat_p = pbuf_alloc(PBUF_RAW, seglen, PBUF_ROM)) == NULL) {
+          LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2,
+                      ("tcp_write: could not allocate memory for zero-copy pbuf\n"));
+          goto memerr;
+        }
+#if TCP_CHECKSUM_ON_COPY
+        /* calculate the checksum of nocopy-data */
+        tcp_seg_add_chksum(~inet_chksum((u8_t*)arg + pos, seglen), seglen,
+          &concat_chksum, &concat_chksum_swapped);
+        concat_chksummed += seglen;
+#endif /* TCP_CHECKSUM_ON_COPY */
+        /* reference the non-volatile payload data */
+        concat_p->payload = (u8_t*)arg + pos;
+      }
+
+      pos += seglen;
+      queuelen += pbuf_clen(concat_p);
+    }
+  } else {
+#if TCP_OVERSIZE
+    LWIP_ASSERT("unsent_oversize mismatch (pcb->unsent is NULL)",
+                pcb->unsent_oversize == 0);
+#endif /* TCP_OVERSIZE */
+  }
+
+  /*
+   * Phase 3: Create new segments.
+   *
+   * The new segments are chained together in the local 'queue'
+   * variable, ready to be appended to pcb->unsent.
+   */
+  while (pos < len) {
+    struct pbuf *p;
+    u16_t left = len - pos;
+    u16_t max_len = mss_local - optlen;
+    u16_t seglen = left > max_len ? max_len : left;
+#if TCP_CHECKSUM_ON_COPY
+    u16_t chksum = 0;
+    u8_t chksum_swapped = 0;
+#endif /* TCP_CHECKSUM_ON_COPY */
+
+    if (apiflags & TCP_WRITE_FLAG_COPY) {
+      /* If copy is set, memory should be allocated and data copied
+       * into pbuf */
+      if ((p = tcp_pbuf_prealloc(PBUF_TRANSPORT, seglen + optlen, mss_local, &oversize, pcb, apiflags, queue == NULL)) == NULL) {
+        LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_write : could not allocate memory for pbuf copy size %"U16_F"\n", seglen));
+        goto memerr;
+      }
+      LWIP_ASSERT("tcp_write: check that first pbuf can hold the complete seglen",
+                  (p->len >= seglen));
+      TCP_DATA_COPY2((char *)p->payload + optlen, (u8_t*)arg + pos, seglen, &chksum, &chksum_swapped);
+    } else {
+      /* Copy is not set: First allocate a pbuf for holding the data.
+       * Since the referenced data is available at least until it is
+       * sent out on the link (as it has to be ACKed by the remote
+       * party) we can safely use PBUF_ROM instead of PBUF_REF here.
+       */
+      struct pbuf *p2;
+#if TCP_OVERSIZE
+      LWIP_ASSERT("oversize == 0", oversize == 0);
+#endif /* TCP_OVERSIZE */
+      if ((p2 = pbuf_alloc(PBUF_TRANSPORT, seglen, PBUF_ROM)) == NULL) {
+        LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_write: could not allocate memory for zero-copy pbuf\n"));
+        goto memerr;
+      }
+#if TCP_CHECKSUM_ON_COPY
+      /* calculate the checksum of nocopy-data */
+      chksum = ~inet_chksum((u8_t*)arg + pos, seglen);
+#endif /* TCP_CHECKSUM_ON_COPY */
+      /* reference the non-volatile payload data */
+      p2->payload = (u8_t*)arg + pos;
+
+      /* Second, allocate a pbuf for the headers. */
+      if ((p = pbuf_alloc(PBUF_TRANSPORT, optlen, PBUF_RAM)) == NULL) {
+        /* If allocation fails, we have to deallocate the data pbuf as
+         * well. */
+        pbuf_free(p2);
+        LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_write: could not allocate memory for header pbuf\n"));
+        goto memerr;
+      }
+      /* Concatenate the headers and data pbufs together. */
+      pbuf_cat(p/*header*/, p2/*data*/);
+    }
+
+    queuelen += pbuf_clen(p);
+
+    /* Now that there are more segments queued, we check again if the
+     * length of the queue exceeds the configured maximum or
+     * overflows. */
+    if ((queuelen > TCP_SND_QUEUELEN) || (queuelen > TCP_SNDQUEUELEN_OVERFLOW)) {
+      LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_write: queue too long %"U16_F" (%"U16_F")\n", queuelen, TCP_SND_QUEUELEN));
+      pbuf_free(p);
+      goto memerr;
+    }
+
+    if ((seg = tcp_create_segment(pcb, p, 0, pcb->snd_lbb + pos, optflags)) == NULL) {
+      goto memerr;
+    }
+#if TCP_OVERSIZE_DBGCHECK
+    seg->oversize_left = oversize;
+#endif /* TCP_OVERSIZE_DBGCHECK */
+#if TCP_CHECKSUM_ON_COPY
+    seg->chksum = chksum;
+    seg->chksum_swapped = chksum_swapped;
+    seg->flags |= TF_SEG_DATA_CHECKSUMMED;
+#endif /* TCP_CHECKSUM_ON_COPY */
+
+    /* first segment of to-be-queued data? */
+    if (queue == NULL) {
+      queue = seg;
+    } else {
+      /* Attach the segment to the end of the queued segments */
+      LWIP_ASSERT("prev_seg != NULL", prev_seg != NULL);
+      prev_seg->next = seg;
+    }
+    /* remember last segment of to-be-queued data for next iteration */
+    prev_seg = seg;
+
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_TRACE, ("tcp_write: queueing %"U32_F":%"U32_F"\n",
+      ntohl(seg->tcphdr->seqno),
+      ntohl(seg->tcphdr->seqno) + TCP_TCPLEN(seg)));
+
+    pos += seglen;
+  }
+
+  /*
+   * All three segmentation phases were successful. We can commit the
+   * transaction.
+   */
+
+  /*
+   * Phase 1: If data has been added to the preallocated tail of
+   * last_unsent, we update the length fields of the pbuf chain.
+   */
+#if TCP_OVERSIZE
+  if (oversize_used > 0) {
+    struct pbuf *p;
+    /* Bump tot_len of whole chain, len of tail */
+    for (p = last_unsent->p; p; p = p->next) {
+      p->tot_len += oversize_used;
+      if (p->next == NULL) {
+        TCP_DATA_COPY((char *)p->payload + p->len, arg, oversize_used, last_unsent);
+        p->len += oversize_used;
+      }
+    }
+    last_unsent->len += oversize_used;
+#if TCP_OVERSIZE_DBGCHECK
+    LWIP_ASSERT("last_unsent->oversize_left >= oversize_used",
+                last_unsent->oversize_left >= oversize_used);
+    last_unsent->oversize_left -= oversize_used;
+#endif /* TCP_OVERSIZE_DBGCHECK */
+  }
+  pcb->unsent_oversize = oversize;
+#endif /* TCP_OVERSIZE */
+
+  /*
+   * Phase 2: concat_p can be concatenated onto last_unsent->p
+   */
+  if (concat_p != NULL) {
+    LWIP_ASSERT("tcp_write: cannot concatenate when pcb->unsent is empty",
+      (last_unsent != NULL));
+    pbuf_cat(last_unsent->p, concat_p);
+    last_unsent->len += concat_p->tot_len;
+#if TCP_CHECKSUM_ON_COPY
+    if (concat_chksummed) {
+      tcp_seg_add_chksum(concat_chksum, concat_chksummed, &last_unsent->chksum,
+        &last_unsent->chksum_swapped);
+      last_unsent->flags |= TF_SEG_DATA_CHECKSUMMED;
+    }
+#endif /* TCP_CHECKSUM_ON_COPY */
+  }
+
+  /*
+   * Phase 3: Append queue to pcb->unsent. Queue may be NULL, but that
+   * is harmless
+   */
+  if (last_unsent == NULL) {
+    pcb->unsent = queue;
+  } else {
+    last_unsent->next = queue;
+  }
+
+  /*
+   * Finally update the pcb state.
+   */
+  pcb->snd_lbb += len;
+  pcb->snd_buf -= len;
+  pcb->snd_queuelen = queuelen;
+
+  LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_write: %"S16_F" (after enqueued)\n",
+    pcb->snd_queuelen));
+  if (pcb->snd_queuelen != 0) {
+    LWIP_ASSERT("tcp_write: valid queue length",
+                pcb->unacked != NULL || pcb->unsent != NULL);
+  }
+
+  /* Set the PSH flag in the last segment that we enqueued. */
+  if (seg != NULL && seg->tcphdr != NULL && ((apiflags & TCP_WRITE_FLAG_MORE)==0)) {
+    TCPH_SET_FLAG(seg->tcphdr, TCP_PSH);
+  }
+
+  return ERR_OK;
+memerr:
+  pcb->flags |= TF_NAGLEMEMERR;
+  TCP_STATS_INC(tcp.memerr);
+
+  if (concat_p != NULL) {
+    pbuf_free(concat_p);
+  }
+  if (queue != NULL) {
+    tcp_segs_free(queue);
+  }
+  if (pcb->snd_queuelen != 0) {
+    LWIP_ASSERT("tcp_write: valid queue length", pcb->unacked != NULL ||
+      pcb->unsent != NULL);
+  }
+  LWIP_DEBUGF(TCP_QLEN_DEBUG | LWIP_DBG_STATE, ("tcp_write: %"S16_F" (with mem err)\n", pcb->snd_queuelen));
+  return ERR_MEM;
+}
+
+/**
+ * Enqueue TCP options for transmission.
+ *
+ * Called by tcp_connect(), tcp_listen_input(), and tcp_send_ctrl().
+ *
+ * @param pcb Protocol control block for the TCP connection.
+ * @param flags TCP header flags to set in the outgoing segment.
+ * @param optdata pointer to TCP options, or NULL.
+ * @param optlen length of TCP options in bytes.
+ */
+err_t
+tcp_enqueue_flags(struct tcp_pcb *pcb, u8_t flags)
+{
+  struct pbuf *p;
+  struct tcp_seg *seg;
+  u8_t optflags = 0;
+  u8_t optlen = 0;
+
+  LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_enqueue_flags: queuelen: %"U16_F"\n", (u16_t)pcb->snd_queuelen));
+
+  LWIP_ASSERT("tcp_enqueue_flags: need either TCP_SYN or TCP_FIN in flags (programmer violates API)",
+              (flags & (TCP_SYN | TCP_FIN)) != 0);
+
+  /* check for configured max queuelen and possible overflow */
+  if ((pcb->snd_queuelen >= TCP_SND_QUEUELEN) || (pcb->snd_queuelen > TCP_SNDQUEUELEN_OVERFLOW)) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 3, ("tcp_enqueue_flags: too long queue %"U16_F" (max %"U16_F")\n",
+                                       pcb->snd_queuelen, TCP_SND_QUEUELEN));
+    TCP_STATS_INC(tcp.memerr);
+    pcb->flags |= TF_NAGLEMEMERR;
+    return ERR_MEM;
+  }
+
+  if (flags & TCP_SYN) {
+    optflags = TF_SEG_OPTS_MSS;
+  }
+#if LWIP_TCP_TIMESTAMPS
+  if ((pcb->flags & TF_TIMESTAMP)) {
+    optflags |= TF_SEG_OPTS_TS;
+  }
+#endif /* LWIP_TCP_TIMESTAMPS */
+  optlen = LWIP_TCP_OPT_LENGTH(optflags);
+
+  /* tcp_enqueue_flags is always called with either SYN or FIN in flags.
+   * We need one available snd_buf byte to do that.
+   * This means we can't send FIN while snd_buf==0. A better fix would be to
+   * not include SYN and FIN sequence numbers in the snd_buf count. */
+  if (pcb->snd_buf == 0) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 3, ("tcp_enqueue_flags: no send buffer available\n"));
+    TCP_STATS_INC(tcp.memerr);
+    return ERR_MEM;
+  }
+
+  /* Allocate pbuf with room for TCP header + options */
+  if ((p = pbuf_alloc(PBUF_TRANSPORT, optlen, PBUF_RAM)) == NULL) {
+    pcb->flags |= TF_NAGLEMEMERR;
+    TCP_STATS_INC(tcp.memerr);
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("tcp_enqueue_flags: check that first pbuf can hold optlen",
+              (p->len >= optlen));
+
+  /* Allocate memory for tcp_seg, and fill in fields. */
+  if ((seg = tcp_create_segment(pcb, p, flags, pcb->snd_lbb, optflags)) == NULL) {
+    pcb->flags |= TF_NAGLEMEMERR;
+    TCP_STATS_INC(tcp.memerr);
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("seg->tcphdr not aligned", ((mem_ptr_t)seg->tcphdr % MEM_ALIGNMENT) == 0);
+  LWIP_ASSERT("tcp_enqueue_flags: invalid segment length", seg->len == 0);
+
+  LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_TRACE,
+              ("tcp_enqueue_flags: queueing %"U32_F":%"U32_F" (0x%"X16_F")\n",
+               ntohl(seg->tcphdr->seqno),
+               ntohl(seg->tcphdr->seqno) + TCP_TCPLEN(seg),
+               (u16_t)flags));
+
+  /* Now append seg to pcb->unsent queue */
+  if (pcb->unsent == NULL) {
+    pcb->unsent = seg;
+  } else {
+    struct tcp_seg *useg;
+    for (useg = pcb->unsent; useg->next != NULL; useg = useg->next);
+    useg->next = seg;
+  }
+#if TCP_OVERSIZE
+  /* The new unsent tail has no space */
+  pcb->unsent_oversize = 0;
+#endif /* TCP_OVERSIZE */
+
+  /* SYN and FIN bump the sequence number */
+  if ((flags & TCP_SYN) || (flags & TCP_FIN)) {
+    pcb->snd_lbb++;
+    /* optlen does not influence snd_buf */
+    pcb->snd_buf--;
+  }
+  if (flags & TCP_FIN) {
+    pcb->flags |= TF_FIN;
+  }
+
+  /* update number of segments on the queues */
+  pcb->snd_queuelen += pbuf_clen(seg->p);
+  LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_enqueue_flags: %"S16_F" (after enqueued)\n", pcb->snd_queuelen));
+  if (pcb->snd_queuelen != 0) {
+    LWIP_ASSERT("tcp_enqueue_flags: invalid queue length",
+      pcb->unacked != NULL || pcb->unsent != NULL);
+  }
+
+  return ERR_OK;
+}
+
+#if LWIP_TCP_TIMESTAMPS
+/* Build a timestamp option (12 bytes long) at the specified options pointer)
+ *
+ * @param pcb tcp_pcb
+ * @param opts option pointer where to store the timestamp option
+ */
+static void
+tcp_build_timestamp_option(struct tcp_pcb *pcb, u32_t *opts)
+{
+  /* Pad with two NOP options to make everything nicely aligned */
+  opts[0] = PP_HTONL(0x0101080A);
+  opts[1] = htonl(sys_now());
+  opts[2] = htonl(pcb->ts_recent);
+}
+#endif
+
+/** Send an ACK without data.
+ *
+ * @param pcb Protocol control block for the TCP connection to send the ACK
+ */
+err_t
+tcp_send_empty_ack(struct tcp_pcb *pcb)
+{
+  struct pbuf *p;
+  struct tcp_hdr *tcphdr;
+  u8_t optlen = 0;
+
+#if LWIP_TCP_TIMESTAMPS
+  if (pcb->flags & TF_TIMESTAMP) {
+    optlen = LWIP_TCP_OPT_LENGTH(TF_SEG_OPTS_TS);
+  }
+#endif
+
+  p = tcp_output_alloc_header(pcb, optlen, 0, htonl(pcb->snd_nxt));
+  if (p == NULL) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: (ACK) could not allocate pbuf\n"));
+    return ERR_BUF;
+  }
+  tcphdr = (struct tcp_hdr *)p->payload;
+  LWIP_DEBUGF(TCP_OUTPUT_DEBUG,
+              ("tcp_output: sending ACK for %"U32_F"\n", pcb->rcv_nxt));
+  /* remove ACK flags from the PCB, as we send an empty ACK now */
+  pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW);
+
+  /* NB. MSS option is only sent on SYNs, so ignore it here */
+#if LWIP_TCP_TIMESTAMPS
+  pcb->ts_lastacksent = pcb->rcv_nxt;
+
+  if (pcb->flags & TF_TIMESTAMP) {
+    tcp_build_timestamp_option(pcb, (u32_t *)(tcphdr + 1));
+  }
+#endif
+
+#if CHECKSUM_GEN_TCP
+  tcphdr->chksum = inet_chksum_pseudo(p, &(pcb->local_ip), &(pcb->remote_ip),
+        IP_PROTO_TCP, p->tot_len);
+#endif
+#if LWIP_NETIF_HWADDRHINT
+  ip_output_hinted(p, &(pcb->local_ip), &(pcb->remote_ip), pcb->ttl, pcb->tos,
+      IP_PROTO_TCP, &(pcb->addr_hint));
+#else /* LWIP_NETIF_HWADDRHINT*/
+  ip_output(p, &(pcb->local_ip), &(pcb->remote_ip), pcb->ttl, pcb->tos,
+      IP_PROTO_TCP);
+#endif /* LWIP_NETIF_HWADDRHINT*/
+  pbuf_free(p);
+
+  return ERR_OK;
+}
+
+/**
+ * Find out what we can send and send it
+ *
+ * @param pcb Protocol control block for the TCP connection to send data
+ * @return ERR_OK if data has been sent or nothing to send
+ *         another err_t on error
+ */
+err_t
+tcp_output(struct tcp_pcb *pcb)
+{
+  struct tcp_seg *seg, *useg;
+  u32_t wnd, snd_nxt;
+#if TCP_CWND_DEBUG
+  s16_t i = 0;
+#endif /* TCP_CWND_DEBUG */
+
+  /* pcb->state LISTEN not allowed here */
+  LWIP_ASSERT("don't call tcp_output for listen-pcbs",
+    pcb->state != LISTEN);
+
+  /* First, check if we are invoked by the TCP input processing
+     code. If so, we do not output anything. Instead, we rely on the
+     input processing code to call us when input processing is done
+     with. */
+  if (tcp_input_pcb == pcb) {
+    return ERR_OK;
+  }
+
+  wnd = LWIP_MIN(pcb->snd_wnd, pcb->cwnd);
+
+  seg = pcb->unsent;
+
+  /* If the TF_ACK_NOW flag is set and no data will be sent (either
+   * because the ->unsent queue is empty or because the window does
+   * not allow it), construct an empty ACK segment and send it.
+   *
+   * If data is to be sent, we will just piggyback the ACK (see below).
+   */
+  if (pcb->flags & TF_ACK_NOW &&
+     (seg == NULL ||
+      ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len > wnd)) {
+     return tcp_send_empty_ack(pcb);
+  }
+
+  /* useg should point to last segment on unacked queue */
+  useg = pcb->unacked;
+  if (useg != NULL) {
+    for (; useg->next != NULL; useg = useg->next);
+  }
+
+#if TCP_OUTPUT_DEBUG
+  if (seg == NULL) {
+    LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: nothing to send (%p)\n",
+                                   (void*)pcb->unsent));
+  }
+#endif /* TCP_OUTPUT_DEBUG */
+#if TCP_CWND_DEBUG
+  if (seg == NULL) {
+    LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_output: snd_wnd %"U16_F
+                                 ", cwnd %"U16_F", wnd %"U32_F
+                                 ", seg == NULL, ack %"U32_F"\n",
+                                 pcb->snd_wnd, pcb->cwnd, wnd, pcb->lastack));
+  } else {
+    LWIP_DEBUGF(TCP_CWND_DEBUG,
+                ("tcp_output: snd_wnd %"U16_F", cwnd %"U16_F", wnd %"U32_F
+                 ", effwnd %"U32_F", seq %"U32_F", ack %"U32_F"\n",
+                 pcb->snd_wnd, pcb->cwnd, wnd,
+                 ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len,
+                 ntohl(seg->tcphdr->seqno), pcb->lastack));
+  }
+#endif /* TCP_CWND_DEBUG */
+  /* data available and window allows it to be sent? */
+  while (seg != NULL &&
+         ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) {
+    LWIP_ASSERT("RST not expected here!",
+                (TCPH_FLAGS(seg->tcphdr) & TCP_RST) == 0);
+    /* Stop sending if the nagle algorithm would prevent it
+     * Don't stop:
+     * - if tcp_write had a memory error before (prevent delayed ACK timeout) or
+     * - if FIN was already enqueued for this PCB (SYN is always alone in a segment -
+     *   either seg->next != NULL or pcb->unacked == NULL;
+     *   RST is no sent using tcp_write/tcp_output.
+     */
+    if((tcp_do_output_nagle(pcb) == 0) &&
+      ((pcb->flags & (TF_NAGLEMEMERR | TF_FIN)) == 0)){
+      break;
+    }
+#if TCP_CWND_DEBUG
+    LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_output: snd_wnd %"U16_F", cwnd %"U16_F", wnd %"U32_F", effwnd %"U32_F", seq %"U32_F", ack %"U32_F", i %"S16_F"\n",
+                            pcb->snd_wnd, pcb->cwnd, wnd,
+                            ntohl(seg->tcphdr->seqno) + seg->len -
+                            pcb->lastack,
+                            ntohl(seg->tcphdr->seqno), pcb->lastack, i));
+    ++i;
+#endif /* TCP_CWND_DEBUG */
+
+    pcb->unsent = seg->next;
+
+    if (pcb->state != SYN_SENT) {
+      TCPH_SET_FLAG(seg->tcphdr, TCP_ACK);
+      pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW);
+    }
+
+    tcp_output_segment(seg, pcb);
+    snd_nxt = ntohl(seg->tcphdr->seqno) + TCP_TCPLEN(seg);
+    if (TCP_SEQ_LT(pcb->snd_nxt, snd_nxt)) {
+      pcb->snd_nxt = snd_nxt;
+    }
+    /* put segment on unacknowledged list if length > 0 */
+    if (TCP_TCPLEN(seg) > 0) {
+      seg->next = NULL;
+      /* unacked list is empty? */
+      if (pcb->unacked == NULL) {
+        pcb->unacked = seg;
+        useg = seg;
+      /* unacked list is not empty? */
+      } else {
+        /* In the case of fast retransmit, the packet should not go to the tail
+         * of the unacked queue, but rather somewhere before it. We need to check for
+         * this case. -STJ Jul 27, 2004 */
+        if (TCP_SEQ_LT(ntohl(seg->tcphdr->seqno), ntohl(useg->tcphdr->seqno))) {
+          /* add segment to before tail of unacked list, keeping the list sorted */
+          struct tcp_seg **cur_seg = &(pcb->unacked);
+          while (*cur_seg &&
+            TCP_SEQ_LT(ntohl((*cur_seg)->tcphdr->seqno), ntohl(seg->tcphdr->seqno))) {
+              cur_seg = &((*cur_seg)->next );
+          }
+          seg->next = (*cur_seg);
+          (*cur_seg) = seg;
+        } else {
+          /* add segment to tail of unacked list */
+          useg->next = seg;
+          useg = useg->next;
+        }
+      }
+    /* do not queue empty segments on the unacked list */
+    } else {
+      tcp_seg_free(seg);
+    }
+    seg = pcb->unsent;
+  }
+#if TCP_OVERSIZE
+  if (pcb->unsent == NULL) {
+    /* last unsent has been removed, reset unsent_oversize */
+    pcb->unsent_oversize = 0;
+  }
+#endif /* TCP_OVERSIZE */
+
+  pcb->flags &= ~TF_NAGLEMEMERR;
+  return ERR_OK;
+}
+
+/**
+ * Called by tcp_output() to actually send a TCP segment over IP.
+ *
+ * @param seg the tcp_seg to send
+ * @param pcb the tcp_pcb for the TCP connection used to send the segment
+ */
+static void
+tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb)
+{
+  u16_t len;
+  struct netif *netif;
+  u32_t *opts;
+
+  /** @bug Exclude retransmitted segments from this count. */
+  snmp_inc_tcpoutsegs();
+
+  /* The TCP header has already been constructed, but the ackno and
+   wnd fields remain. */
+  seg->tcphdr->ackno = htonl(pcb->rcv_nxt);
+
+  /* advertise our receive window size in this TCP segment */
+  seg->tcphdr->wnd = htons(pcb->rcv_ann_wnd);
+
+  pcb->rcv_ann_right_edge = pcb->rcv_nxt + pcb->rcv_ann_wnd;
+
+  /* Add any requested options.  NB MSS option is only set on SYN
+     packets, so ignore it here */
+  opts = (u32_t *)(void *)(seg->tcphdr + 1);
+  if (seg->flags & TF_SEG_OPTS_MSS) {
+    u16_t mss;
+#if TCP_CALCULATE_EFF_SEND_MSS
+    mss = tcp_eff_send_mss(TCP_MSS, &pcb->remote_ip);
+#else /* TCP_CALCULATE_EFF_SEND_MSS */
+    mss = TCP_MSS;
+#endif /* TCP_CALCULATE_EFF_SEND_MSS */
+    *opts = TCP_BUILD_MSS_OPTION(mss);
+    opts += 1;
+  }
+#if LWIP_TCP_TIMESTAMPS
+  pcb->ts_lastacksent = pcb->rcv_nxt;
+
+  if (seg->flags & TF_SEG_OPTS_TS) {
+    tcp_build_timestamp_option(pcb, opts);
+    opts += 3;
+  }
+#endif
+
+  /* Set retransmission timer running if it is not currently enabled
+     This must be set before checking the route. */
+  if (pcb->rtime == -1) {
+    pcb->rtime = 0;
+  }
+
+  /* If we don't have a local IP address, we get one by
+     calling ip_route(). */
+  if (ip_addr_isany(&(pcb->local_ip))) {
+    netif = ip_route(&(pcb->remote_ip));
+    if (netif == NULL) {
+      return;
+    }
+    ip_addr_copy(pcb->local_ip, netif->ip_addr);
+  }
+
+  if (pcb->rttest == 0) {
+    pcb->rttest = tcp_ticks;
+    pcb->rtseq = ntohl(seg->tcphdr->seqno);
+
+    LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_output_segment: rtseq %"U32_F"\n", pcb->rtseq));
+  }
+  LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output_segment: %"U32_F":%"U32_F"\n",
+          htonl(seg->tcphdr->seqno), htonl(seg->tcphdr->seqno) +
+          seg->len));
+
+  len = (u16_t)((u8_t *)seg->tcphdr - (u8_t *)seg->p->payload);
+
+  seg->p->len -= len;
+  seg->p->tot_len -= len;
+
+  seg->p->payload = seg->tcphdr;
+
+  seg->tcphdr->chksum = 0;
+#if CHECKSUM_GEN_TCP
+#if TCP_CHECKSUM_ON_COPY
+  {
+    u32_t acc;
+#if TCP_CHECKSUM_ON_COPY_SANITY_CHECK
+    u16_t chksum_slow = inet_chksum_pseudo(seg->p, &(pcb->local_ip),
+           &(pcb->remote_ip),
+           IP_PROTO_TCP, seg->p->tot_len);
+#endif /* TCP_CHECKSUM_ON_COPY_SANITY_CHECK */
+    if ((seg->flags & TF_SEG_DATA_CHECKSUMMED) == 0) {
+      LWIP_ASSERT("data included but not checksummed",
+        seg->p->tot_len == (TCPH_HDRLEN(seg->tcphdr) * 4));
+    }
+
+    /* rebuild TCP header checksum (TCP header changes for retransmissions!) */
+    acc = inet_chksum_pseudo_partial(seg->p, &(pcb->local_ip),
+             &(pcb->remote_ip),
+             IP_PROTO_TCP, seg->p->tot_len, TCPH_HDRLEN(seg->tcphdr) * 4);
+    /* add payload checksum */
+    if (seg->chksum_swapped) {
+      seg->chksum = SWAP_BYTES_IN_WORD(seg->chksum);
+      seg->chksum_swapped = 0;
+    }
+    acc += (u16_t)~(seg->chksum);
+    seg->tcphdr->chksum = FOLD_U32T(acc);
+#if TCP_CHECKSUM_ON_COPY_SANITY_CHECK
+    if (chksum_slow != seg->tcphdr->chksum) {
+      LWIP_DEBUGF(TCP_DEBUG | LWIP_DBG_LEVEL_WARNING,
+                  ("tcp_output_segment: calculated checksum is %"X16_F" instead of %"X16_F"\n",
+                  seg->tcphdr->chksum, chksum_slow));
+      seg->tcphdr->chksum = chksum_slow;
+    }
+#endif /* TCP_CHECKSUM_ON_COPY_SANITY_CHECK */
+  }
+#else /* TCP_CHECKSUM_ON_COPY */
+  seg->tcphdr->chksum = inet_chksum_pseudo(seg->p, &(pcb->local_ip),
+         &(pcb->remote_ip),
+         IP_PROTO_TCP, seg->p->tot_len);
+#endif /* TCP_CHECKSUM_ON_COPY */
+#endif /* CHECKSUM_GEN_TCP */
+  TCP_STATS_INC(tcp.xmit);
+
+#if LWIP_NETIF_HWADDRHINT
+  ip_output_hinted(seg->p, &(pcb->local_ip), &(pcb->remote_ip), pcb->ttl, pcb->tos,
+      IP_PROTO_TCP, &(pcb->addr_hint));
+#else /* LWIP_NETIF_HWADDRHINT*/
+  ip_output(seg->p, &(pcb->local_ip), &(pcb->remote_ip), pcb->ttl, pcb->tos,
+      IP_PROTO_TCP);
+#endif /* LWIP_NETIF_HWADDRHINT*/
+}
+
+/**
+ * Send a TCP RESET packet (empty segment with RST flag set) either to
+ * abort a connection or to show that there is no matching local connection
+ * for a received segment.
+ *
+ * Called by tcp_abort() (to abort a local connection), tcp_input() (if no
+ * matching local pcb was found), tcp_listen_input() (if incoming segment
+ * has ACK flag set) and tcp_process() (received segment in the wrong state)
+ *
+ * Since a RST segment is in most cases not sent for an active connection,
+ * tcp_rst() has a number of arguments that are taken from a tcp_pcb for
+ * most other segment output functions.
+ *
+ * @param seqno the sequence number to use for the outgoing segment
+ * @param ackno the acknowledge number to use for the outgoing segment
+ * @param local_ip the local IP address to send the segment from
+ * @param remote_ip the remote IP address to send the segment to
+ * @param local_port the local TCP port to send the segment from
+ * @param remote_port the remote TCP port to send the segment to
+ */
+void
+tcp_rst(u32_t seqno, u32_t ackno,
+  ip_addr_t *local_ip, ip_addr_t *remote_ip,
+  u16_t local_port, u16_t remote_port)
+{
+  struct pbuf *p;
+  struct tcp_hdr *tcphdr;
+  p = pbuf_alloc(PBUF_IP, TCP_HLEN, PBUF_RAM);
+  if (p == NULL) {
+      LWIP_DEBUGF(TCP_DEBUG, ("tcp_rst: could not allocate memory for pbuf\n"));
+      return;
+  }
+  LWIP_ASSERT("check that first pbuf can hold struct tcp_hdr",
+              (p->len >= sizeof(struct tcp_hdr)));
+
+  tcphdr = (struct tcp_hdr *)p->payload;
+  tcphdr->src = htons(local_port);
+  tcphdr->dest = htons(remote_port);
+  tcphdr->seqno = htonl(seqno);
+  tcphdr->ackno = htonl(ackno);
+  TCPH_HDRLEN_FLAGS_SET(tcphdr, TCP_HLEN/4, TCP_RST | TCP_ACK);
+  tcphdr->wnd = PP_HTONS(TCP_WND);
+  tcphdr->chksum = 0;
+  tcphdr->urgp = 0;
+
+#if CHECKSUM_GEN_TCP
+  tcphdr->chksum = inet_chksum_pseudo(p, local_ip, remote_ip,
+              IP_PROTO_TCP, p->tot_len);
+#endif
+  TCP_STATS_INC(tcp.xmit);
+  snmp_inc_tcpoutrsts();
+   /* Send output with hardcoded TTL since we have no access to the pcb */
+  ip_output(p, local_ip, remote_ip, TCP_TTL, 0, IP_PROTO_TCP);
+  pbuf_free(p);
+  LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_rst: seqno %"U32_F" ackno %"U32_F".\n", seqno, ackno));
+}
+
+/**
+ * Requeue all unacked segments for retransmission
+ *
+ * Called by tcp_slowtmr() for slow retransmission.
+ *
+ * @param pcb the tcp_pcb for which to re-enqueue all unacked segments
+ */
+void
+tcp_rexmit_rto(struct tcp_pcb *pcb)
+{
+  struct tcp_seg *seg;
+
+  if (pcb->unacked == NULL) {
+    return;
+  }
+
+  /* Move all unacked segments to the head of the unsent queue */
+  for (seg = pcb->unacked; seg->next != NULL; seg = seg->next);
+  /* concatenate unsent queue after unacked queue */
+  seg->next = pcb->unsent;
+  /* unsent queue is the concatenated queue (of unacked, unsent) */
+  pcb->unsent = pcb->unacked;
+  /* unacked queue is now empty */
+  pcb->unacked = NULL;
+  /* last unsent hasn't changed, no need to reset unsent_oversize */
+
+  /* increment number of retransmissions */
+  ++pcb->nrtx;
+
+  /* Don't take any RTT measurements after retransmitting. */
+  pcb->rttest = 0;
+
+  /* Do the actual retransmission */
+  tcp_output(pcb);
+}
+
+/**
+ * Requeue the first unacked segment for retransmission
+ *
+ * Called by tcp_receive() for fast retramsmit.
+ *
+ * @param pcb the tcp_pcb for which to retransmit the first unacked segment
+ */
+void
+tcp_rexmit(struct tcp_pcb *pcb)
+{
+  struct tcp_seg *seg;
+  struct tcp_seg **cur_seg;
+
+  if (pcb->unacked == NULL) {
+    return;
+  }
+
+  /* Move the first unacked segment to the unsent queue */
+  /* Keep the unsent queue sorted. */
+  seg = pcb->unacked;
+  pcb->unacked = seg->next;
+
+  cur_seg = &(pcb->unsent);
+  while (*cur_seg &&
+    TCP_SEQ_LT(ntohl((*cur_seg)->tcphdr->seqno), ntohl(seg->tcphdr->seqno))) {
+      cur_seg = &((*cur_seg)->next );
+  }
+  seg->next = *cur_seg;
+  *cur_seg = seg;
+#if TCP_OVERSIZE
+  if (seg->next == NULL) {
+    /* the retransmitted segment is last in unsent, so reset unsent_oversize */
+    pcb->unsent_oversize = 0;
+  }
+#endif /* TCP_OVERSIZE */
+
+  ++pcb->nrtx;
+
+  /* Don't take any rtt measurements after retransmitting. */
+  pcb->rttest = 0;
+
+  /* Do the actual retransmission. */
+  snmp_inc_tcpretranssegs();
+  /* No need to call tcp_output: we are always called from tcp_input()
+     and thus tcp_output directly returns. */
+}
+
+
+/**
+ * Handle retransmission after three dupacks received
+ *
+ * @param pcb the tcp_pcb for which to retransmit the first unacked segment
+ */
+void
+tcp_rexmit_fast(struct tcp_pcb *pcb)
+{
+  if (pcb->unacked != NULL && !(pcb->flags & TF_INFR)) {
+    /* This is fast retransmit. Retransmit the first unacked segment. */
+    LWIP_DEBUGF(TCP_FR_DEBUG,
+                ("tcp_receive: dupacks %"U16_F" (%"U32_F
+                 "), fast retransmit %"U32_F"\n",
+                 (u16_t)pcb->dupacks, pcb->lastack,
+                 ntohl(pcb->unacked->tcphdr->seqno)));
+    tcp_rexmit(pcb);
+
+    /* Set ssthresh to half of the minimum of the current
+     * cwnd and the advertised window */
+    if (pcb->cwnd > pcb->snd_wnd) {
+      pcb->ssthresh = pcb->snd_wnd / 2;
+    } else {
+      pcb->ssthresh = pcb->cwnd / 2;
+    }
+
+    /* The minimum value for ssthresh should be 2 MSS */
+    if (pcb->ssthresh < 2*pcb->mss) {
+      LWIP_DEBUGF(TCP_FR_DEBUG,
+                  ("tcp_receive: The minimum value for ssthresh %"U16_F
+                   " should be min 2 mss %"U16_F"...\n",
+                   pcb->ssthresh, 2*pcb->mss));
+      pcb->ssthresh = 2*pcb->mss;
+    }
+
+    pcb->cwnd = pcb->ssthresh + 3 * pcb->mss;
+    pcb->flags |= TF_INFR;
+  }
+}
+
+
+/**
+ * Send keepalive packets to keep a connection active although
+ * no data is sent over it.
+ *
+ * Called by tcp_slowtmr()
+ *
+ * @param pcb the tcp_pcb for which to send a keepalive packet
+ */
+void
+tcp_keepalive(struct tcp_pcb *pcb)
+{
+  struct pbuf *p;
+  struct tcp_hdr *tcphdr;
+
+  LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: sending KEEPALIVE probe to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+                          ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip),
+                          ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip)));
+
+  LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: tcp_ticks %"U32_F"   pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n",
+                          tcp_ticks, pcb->tmr, pcb->keep_cnt_sent));
+
+  p = tcp_output_alloc_header(pcb, 0, 0, htonl(pcb->snd_nxt - 1));
+  if(p == NULL) {
+    LWIP_DEBUGF(TCP_DEBUG,
+                ("tcp_keepalive: could not allocate memory for pbuf\n"));
+    return;
+  }
+  tcphdr = (struct tcp_hdr *)p->payload;
+
+#if CHECKSUM_GEN_TCP
+  tcphdr->chksum = inet_chksum_pseudo(p, &pcb->local_ip, &pcb->remote_ip,
+                                      IP_PROTO_TCP, p->tot_len);
+#endif
+  TCP_STATS_INC(tcp.xmit);
+
+  /* Send output to IP */
+#if LWIP_NETIF_HWADDRHINT
+  ip_output_hinted(p, &pcb->local_ip, &pcb->remote_ip, pcb->ttl, 0, IP_PROTO_TCP,
+    &(pcb->addr_hint));
+#else /* LWIP_NETIF_HWADDRHINT*/
+  ip_output(p, &pcb->local_ip, &pcb->remote_ip, pcb->ttl, 0, IP_PROTO_TCP);
+#endif /* LWIP_NETIF_HWADDRHINT*/
+
+  pbuf_free(p);
+
+  LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: seqno %"U32_F" ackno %"U32_F".\n",
+                          pcb->snd_nxt - 1, pcb->rcv_nxt));
+}
+
+
+/**
+ * Send persist timer zero-window probes to keep a connection active
+ * when a window update is lost.
+ *
+ * Called by tcp_slowtmr()
+ *
+ * @param pcb the tcp_pcb for which to send a zero-window probe packet
+ */
+void
+tcp_zero_window_probe(struct tcp_pcb *pcb)
+{
+  struct pbuf *p;
+  struct tcp_hdr *tcphdr;
+  struct tcp_seg *seg;
+  u16_t len;
+  u8_t is_fin;
+
+  LWIP_DEBUGF(TCP_DEBUG,
+              ("tcp_zero_window_probe: sending ZERO WINDOW probe to %"
+               U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+               ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip),
+               ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip)));
+
+  LWIP_DEBUGF(TCP_DEBUG,
+              ("tcp_zero_window_probe: tcp_ticks %"U32_F
+               "   pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n",
+               tcp_ticks, pcb->tmr, pcb->keep_cnt_sent));
+
+  seg = pcb->unacked;
+
+  if(seg == NULL) {
+    seg = pcb->unsent;
+  }
+  if(seg == NULL) {
+    return;
+  }
+
+  is_fin = ((TCPH_FLAGS(seg->tcphdr) & TCP_FIN) != 0) && (seg->len == 0);
+  /* we want to send one seqno: either FIN or data (no options) */
+  len = is_fin ? 0 : 1;
+
+  p = tcp_output_alloc_header(pcb, 0, len, seg->tcphdr->seqno);
+  if(p == NULL) {
+    LWIP_DEBUGF(TCP_DEBUG, ("tcp_zero_window_probe: no memory for pbuf\n"));
+    return;
+  }
+  tcphdr = (struct tcp_hdr *)p->payload;
+
+  if (is_fin) {
+    /* FIN segment, no data */
+    TCPH_FLAGS_SET(tcphdr, TCP_ACK | TCP_FIN);
+  } else {
+    /* Data segment, copy in one byte from the head of the unacked queue */
+    char *d = ((char *)p->payload + TCP_HLEN);
+    /* Depending on whether the segment has already been sent (unacked) or not
+       (unsent), seg->p->payload points to the IP header or TCP header.
+       Ensure we copy the first TCP data byte: */
+    pbuf_copy_partial(seg->p, d, 1, seg->p->tot_len - seg->len);
+  }
+
+#if CHECKSUM_GEN_TCP
+  tcphdr->chksum = inet_chksum_pseudo(p, &pcb->local_ip, &pcb->remote_ip,
+                                      IP_PROTO_TCP, p->tot_len);
+#endif
+  TCP_STATS_INC(tcp.xmit);
+
+  /* Send output to IP */
+#if LWIP_NETIF_HWADDRHINT
+  ip_output_hinted(p, &pcb->local_ip, &pcb->remote_ip, pcb->ttl, 0, IP_PROTO_TCP,
+    &(pcb->addr_hint));
+#else /* LWIP_NETIF_HWADDRHINT*/
+  ip_output(p, &pcb->local_ip, &pcb->remote_ip, pcb->ttl, 0, IP_PROTO_TCP);
+#endif /* LWIP_NETIF_HWADDRHINT*/
+
+  pbuf_free(p);
+
+  LWIP_DEBUGF(TCP_DEBUG, ("tcp_zero_window_probe: seqno %"U32_F
+                          " ackno %"U32_F".\n",
+                          pcb->snd_nxt - 1, pcb->rcv_nxt));
+}
+#endif /* LWIP_TCP */
diff --git a/ext/lwip/src/core/timers.c b/ext/lwip/src/core/timers.c
new file mode 100644
index 000000000..e30846660
--- /dev/null
+++ b/ext/lwip/src/core/timers.c
@@ -0,0 +1,487 @@
+/**
+ * @file
+ * Stack-internal timers implementation.
+ * This file includes timer callbacks for stack-internal timers as well as
+ * functions to set up or stop timers and check for expired timers.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *         Simon Goldschmidt
+ *
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/timers.h"
+#include "lwip/tcp_impl.h"
+
+#if LWIP_TIMERS
+
+#include "lwip/def.h"
+#include "lwip/memp.h"
+#include "lwip/tcpip.h"
+
+#include "lwip/ip_frag.h"
+#include "netif/etharp.h"
+#include "lwip/dhcp.h"
+#include "lwip/autoip.h"
+#include "lwip/igmp.h"
+#include "lwip/dns.h"
+#include "lwip/sys.h"
+#include "lwip/pbuf.h"
+
+
+/** The one and only timeout list */
+static struct sys_timeo *next_timeout;
+#if NO_SYS
+static u32_t timeouts_last_time;
+#endif /* NO_SYS */
+
+#if LWIP_TCP
+/** global variable that shows if the tcp timer is currently scheduled or not */
+static int tcpip_tcp_timer_active;
+
+/**
+ * Timer callback function that calls tcp_tmr() and reschedules itself.
+ *
+ * @param arg unused argument
+ */
+static void
+tcpip_tcp_timer(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+
+  /* call TCP timer handler */
+  tcp_tmr();
+  /* timer still needed? */
+  if (tcp_active_pcbs || tcp_tw_pcbs) {
+    /* restart timer */
+    sys_timeout(TCP_TMR_INTERVAL, tcpip_tcp_timer, NULL);
+  } else {
+    /* disable timer */
+    tcpip_tcp_timer_active = 0;
+  }
+}
+
+/**
+ * Called from TCP_REG when registering a new PCB:
+ * the reason is to have the TCP timer only running when
+ * there are active (or time-wait) PCBs.
+ */
+void
+tcp_timer_needed(void)
+{
+  /* timer is off but needed again? */
+  if (!tcpip_tcp_timer_active && (tcp_active_pcbs || tcp_tw_pcbs)) {
+    /* enable and start timer */
+    tcpip_tcp_timer_active = 1;
+    sys_timeout(TCP_TMR_INTERVAL, tcpip_tcp_timer, NULL);
+  }
+}
+#endif /* LWIP_TCP */
+
+#if IP_REASSEMBLY
+/**
+ * Timer callback function that calls ip_reass_tmr() and reschedules itself.
+ *
+ * @param arg unused argument
+ */
+static void
+ip_reass_timer(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: ip_reass_tmr()\n"));
+  ip_reass_tmr();
+  sys_timeout(IP_TMR_INTERVAL, ip_reass_timer, NULL);
+}
+#endif /* IP_REASSEMBLY */
+
+#if LWIP_ARP
+/**
+ * Timer callback function that calls etharp_tmr() and reschedules itself.
+ *
+ * @param arg unused argument
+ */
+static void
+arp_timer(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: etharp_tmr()\n"));
+  etharp_tmr();
+  sys_timeout(ARP_TMR_INTERVAL, arp_timer, NULL);
+}
+#endif /* LWIP_ARP */
+
+#if LWIP_DHCP
+/**
+ * Timer callback function that calls dhcp_coarse_tmr() and reschedules itself.
+ *
+ * @param arg unused argument
+ */
+static void
+dhcp_timer_coarse(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: dhcp_coarse_tmr()\n"));
+  dhcp_coarse_tmr();
+  sys_timeout(DHCP_COARSE_TIMER_MSECS, dhcp_timer_coarse, NULL);
+}
+
+/**
+ * Timer callback function that calls dhcp_fine_tmr() and reschedules itself.
+ *
+ * @param arg unused argument
+ */
+static void
+dhcp_timer_fine(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: dhcp_fine_tmr()\n"));
+  dhcp_fine_tmr();
+  sys_timeout(DHCP_FINE_TIMER_MSECS, dhcp_timer_fine, NULL);
+}
+#endif /* LWIP_DHCP */
+
+#if LWIP_AUTOIP
+/**
+ * Timer callback function that calls autoip_tmr() and reschedules itself.
+ *
+ * @param arg unused argument
+ */
+static void
+autoip_timer(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: autoip_tmr()\n"));
+  autoip_tmr();
+  sys_timeout(AUTOIP_TMR_INTERVAL, autoip_timer, NULL);
+}
+#endif /* LWIP_AUTOIP */
+
+#if LWIP_IGMP
+/**
+ * Timer callback function that calls igmp_tmr() and reschedules itself.
+ *
+ * @param arg unused argument
+ */
+static void
+igmp_timer(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: igmp_tmr()\n"));
+  igmp_tmr();
+  sys_timeout(IGMP_TMR_INTERVAL, igmp_timer, NULL);
+}
+#endif /* LWIP_IGMP */
+
+#if LWIP_DNS
+/**
+ * Timer callback function that calls dns_tmr() and reschedules itself.
+ *
+ * @param arg unused argument
+ */
+static void
+dns_timer(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+  LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: dns_tmr()\n"));
+  dns_tmr();
+  sys_timeout(DNS_TMR_INTERVAL, dns_timer, NULL);
+}
+#endif /* LWIP_DNS */
+
+/** Initialize this module */
+void sys_timeouts_init(void)
+{
+#if IP_REASSEMBLY
+  sys_timeout(IP_TMR_INTERVAL, ip_reass_timer, NULL);
+#endif /* IP_REASSEMBLY */
+#if LWIP_ARP
+  sys_timeout(ARP_TMR_INTERVAL, arp_timer, NULL);
+#endif /* LWIP_ARP */
+#if LWIP_DHCP
+  sys_timeout(DHCP_COARSE_TIMER_MSECS, dhcp_timer_coarse, NULL);
+  sys_timeout(DHCP_FINE_TIMER_MSECS, dhcp_timer_fine, NULL);
+#endif /* LWIP_DHCP */
+#if LWIP_AUTOIP
+  sys_timeout(AUTOIP_TMR_INTERVAL, autoip_timer, NULL);
+#endif /* LWIP_AUTOIP */
+#if LWIP_IGMP
+  sys_timeout(IGMP_TMR_INTERVAL, igmp_timer, NULL);
+#endif /* LWIP_IGMP */
+#if LWIP_DNS
+  sys_timeout(DNS_TMR_INTERVAL, dns_timer, NULL);
+#endif /* LWIP_DNS */
+
+#if NO_SYS
+  /* Initialise timestamp for sys_check_timeouts */
+  timeouts_last_time = sys_now();
+#endif
+}
+
+/**
+ * Create a one-shot timer (aka timeout). Timeouts are processed in the
+ * following cases:
+ * - while waiting for a message using sys_timeouts_mbox_fetch()
+ * - by calling sys_check_timeouts() (NO_SYS==1 only)
+ *
+ * @param msecs time in milliseconds after that the timer should expire
+ * @param handler callback function to call when msecs have elapsed
+ * @param arg argument to pass to the callback function
+ */
+#if LWIP_DEBUG_TIMERNAMES
+void
+sys_timeout_debug(u32_t msecs, sys_timeout_handler handler, void *arg, const char* handler_name)
+#else /* LWIP_DEBUG_TIMERNAMES */
+void
+sys_timeout(u32_t msecs, sys_timeout_handler handler, void *arg)
+#endif /* LWIP_DEBUG_TIMERNAMES */
+{
+  struct sys_timeo *timeout, *t;
+
+  timeout = (struct sys_timeo *)memp_malloc(MEMP_SYS_TIMEOUT);
+  if (timeout == NULL) {
+    LWIP_ASSERT("sys_timeout: timeout != NULL, pool MEMP_SYS_TIMEOUT is empty", timeout != NULL);
+    return;
+  }
+  timeout->next = NULL;
+  timeout->h = handler;
+  timeout->arg = arg;
+  timeout->time = msecs;
+#if LWIP_DEBUG_TIMERNAMES
+  timeout->handler_name = handler_name;
+  LWIP_DEBUGF(TIMERS_DEBUG, ("sys_timeout: %p msecs=%"U32_F" handler=%s arg=%p\n",
+    (void *)timeout, msecs, handler_name, (void *)arg));
+#endif /* LWIP_DEBUG_TIMERNAMES */
+
+  if (next_timeout == NULL) {
+    next_timeout = timeout;
+    return;
+  }
+
+  if (next_timeout->time > msecs) {
+    next_timeout->time -= msecs;
+    timeout->next = next_timeout;
+    next_timeout = timeout;
+  } else {
+    for(t = next_timeout; t != NULL; t = t->next) {
+      timeout->time -= t->time;
+      if (t->next == NULL || t->next->time > timeout->time) {
+        if (t->next != NULL) {
+          t->next->time -= timeout->time;
+        }
+        timeout->next = t->next;
+        t->next = timeout;
+        break;
+      }
+    }
+  }
+}
+
+/**
+ * Go through timeout list (for this task only) and remove the first matching
+ * entry, even though the timeout has not triggered yet.
+ *
+ * @note This function only works as expected if there is only one timeout
+ * calling 'handler' in the list of timeouts.
+ *
+ * @param handler callback function that would be called by the timeout
+ * @param arg callback argument that would be passed to handler
+*/
+void
+sys_untimeout(sys_timeout_handler handler, void *arg)
+{
+  struct sys_timeo *prev_t, *t;
+
+  if (next_timeout == NULL) {
+    return;
+  }
+
+  for (t = next_timeout, prev_t = NULL; t != NULL; prev_t = t, t = t->next) {
+    if ((t->h == handler) && (t->arg == arg)) {
+      /* We have a match */
+      /* Unlink from previous in list */
+      if (prev_t == NULL) {
+        next_timeout = t->next;
+      } else {
+        prev_t->next = t->next;
+      }
+      /* If not the last one, add time of this one back to next */
+      if (t->next != NULL) {
+        t->next->time += t->time;
+      }
+      memp_free(MEMP_SYS_TIMEOUT, t);
+      return;
+    }
+  }
+  return;
+}
+
+#if NO_SYS
+
+/** Handle timeouts for NO_SYS==1 (i.e. without using
+ * tcpip_thread/sys_timeouts_mbox_fetch(). Uses sys_now() to call timeout
+ * handler functions when timeouts expire.
+ *
+ * Must be called periodically from your main loop.
+ */
+void
+sys_check_timeouts(void)
+{
+  if (next_timeout) {
+    struct sys_timeo *tmptimeout;
+    u32_t diff;
+    sys_timeout_handler handler;
+    void *arg;
+    u8_t had_one;
+    u32_t now;
+
+    now = sys_now();
+    /* this cares for wraparounds */
+    diff = now - timeouts_last_time;
+    do
+    {
+#if PBUF_POOL_FREE_OOSEQ
+      PBUF_CHECK_FREE_OOSEQ();
+#endif /* PBUF_POOL_FREE_OOSEQ */
+      had_one = 0;
+      tmptimeout = next_timeout;
+      if (tmptimeout && (tmptimeout->time <= diff)) {
+        /* timeout has expired */
+        had_one = 1;
+        timeouts_last_time = now;
+        diff -= tmptimeout->time;
+        next_timeout = tmptimeout->next;
+        handler = tmptimeout->h;
+        arg = tmptimeout->arg;
+#if LWIP_DEBUG_TIMERNAMES
+        if (handler != NULL) {
+          LWIP_DEBUGF(TIMERS_DEBUG, ("sct calling h=%s arg=%p\n",
+            tmptimeout->handler_name, arg));
+        }
+#endif /* LWIP_DEBUG_TIMERNAMES */
+        memp_free(MEMP_SYS_TIMEOUT, tmptimeout);
+        if (handler != NULL) {
+          handler(arg);
+        }
+      }
+    /* repeat until all expired timers have been called */
+    }while(had_one);
+  }
+}
+
+/** Set back the timestamp of the last call to sys_check_timeouts()
+ * This is necessary if sys_check_timeouts() hasn't been called for a long
+ * time (e.g. while saving energy) to prevent all timer functions of that
+ * period being called.
+ */
+void
+sys_restart_timeouts(void)
+{
+  timeouts_last_time = sys_now();
+}
+
+#else /* NO_SYS */
+
+/**
+ * Wait (forever) for a message to arrive in an mbox.
+ * While waiting, timeouts are processed.
+ *
+ * @param mbox the mbox to fetch the message from
+ * @param msg the place to store the message
+ */
+void
+sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg)
+{
+  u32_t time_needed;
+  struct sys_timeo *tmptimeout;
+  sys_timeout_handler handler;
+  void *arg;
+
+ again:
+  if (!next_timeout) {
+    time_needed = sys_arch_mbox_fetch(mbox, msg, 0);
+  } else {
+    if (next_timeout->time > 0) {
+      time_needed = sys_arch_mbox_fetch(mbox, msg, next_timeout->time);
+    } else {
+      time_needed = SYS_ARCH_TIMEOUT;
+    }
+
+    if (time_needed == SYS_ARCH_TIMEOUT) {
+      /* If time == SYS_ARCH_TIMEOUT, a timeout occured before a message
+         could be fetched. We should now call the timeout handler and
+         deallocate the memory allocated for the timeout. */
+      tmptimeout = next_timeout;
+      next_timeout = tmptimeout->next;
+      handler = tmptimeout->h;
+      arg = tmptimeout->arg;
+#if LWIP_DEBUG_TIMERNAMES
+      if (handler != NULL) {
+        LWIP_DEBUGF(TIMERS_DEBUG, ("stmf calling h=%s arg=%p\n",
+          tmptimeout->handler_name, arg));
+      }
+#endif /* LWIP_DEBUG_TIMERNAMES */
+      memp_free(MEMP_SYS_TIMEOUT, tmptimeout);
+      if (handler != NULL) {
+        /* For LWIP_TCPIP_CORE_LOCKING, lock the core before calling the
+           timeout handler function. */
+        LOCK_TCPIP_CORE();
+        handler(arg);
+        UNLOCK_TCPIP_CORE();
+      }
+      LWIP_TCPIP_THREAD_ALIVE();
+
+      /* We try again to fetch a message from the mbox. */
+      goto again;
+    } else {
+      /* If time != SYS_ARCH_TIMEOUT, a message was received before the timeout
+         occured. The time variable is set to the number of
+         milliseconds we waited for the message. */
+      if (time_needed < next_timeout->time) {
+        next_timeout->time -= time_needed;
+      } else {
+        next_timeout->time = 0;
+      }
+    }
+  }
+}
+
+#endif /* NO_SYS */
+
+#else /* LWIP_TIMERS */
+/* Satisfy the TCP code which calls this function */
+void
+tcp_timer_needed(void)
+{
+}
+#endif /* LWIP_TIMERS */
diff --git a/ext/lwip/src/core/udp.c b/ext/lwip/src/core/udp.c
new file mode 100644
index 000000000..32c7d3840
--- /dev/null
+++ b/ext/lwip/src/core/udp.c
@@ -0,0 +1,1013 @@
+/**
+ * @file
+ * User Datagram Protocol module
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+
+/* udp.c
+ *
+ * The code for the User Datagram Protocol UDP & UDPLite (RFC 3828).
+ *
+ */
+
+/* @todo Check the use of '(struct udp_pcb).chksum_len_rx'!
+ */
+
+#include "lwip/opt.h"
+
+#if LWIP_UDP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/udp.h"
+#include "lwip/def.h"
+#include "lwip/memp.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/icmp.h"
+#include "lwip/stats.h"
+#include "lwip/snmp.h"
+#include "arch/perf.h"
+#include "lwip/dhcp.h"
+
+#include <string.h>
+
+#ifndef UDP_LOCAL_PORT_RANGE_START
+/* From http://www.iana.org/assignments/port-numbers:
+   "The Dynamic and/or Private Ports are those from 49152 through 65535" */
+#define UDP_LOCAL_PORT_RANGE_START  0xc000
+#define UDP_LOCAL_PORT_RANGE_END    0xffff
+#define UDP_ENSURE_LOCAL_PORT_RANGE(port) (((port) & ~UDP_LOCAL_PORT_RANGE_START) + UDP_LOCAL_PORT_RANGE_START)
+#endif
+
+/* last local UDP port */
+static u16_t udp_port = UDP_LOCAL_PORT_RANGE_START;
+
+/* The list of UDP PCBs */
+/* exported in udp.h (was static) */
+struct udp_pcb *udp_pcbs;
+
+/**
+ * Initialize this module.
+ */
+void
+udp_init(void)
+{
+#if LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS && defined(LWIP_RAND)
+  udp_port = UDP_ENSURE_LOCAL_PORT_RANGE(LWIP_RAND());
+#endif /* LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS && defined(LWIP_RAND) */
+}
+
+/**
+ * Allocate a new local UDP port.
+ *
+ * @return a new (free) local UDP port number
+ */
+static u16_t
+udp_new_port(void)
+{
+  u16_t n = 0;
+  struct udp_pcb *pcb;
+  
+again:
+  if (udp_port++ == UDP_LOCAL_PORT_RANGE_END) {
+    udp_port = UDP_LOCAL_PORT_RANGE_START;
+  }
+  /* Check all PCBs. */
+  for(pcb = udp_pcbs; pcb != NULL; pcb = pcb->next) {
+    if (pcb->local_port == udp_port) {
+      if (++n > (UDP_LOCAL_PORT_RANGE_END - UDP_LOCAL_PORT_RANGE_START)) {
+        return 0;
+      }
+      goto again;
+    }
+  }
+  return udp_port;
+#if 0
+  struct udp_pcb *ipcb = udp_pcbs;
+  while ((ipcb != NULL) && (udp_port != UDP_LOCAL_PORT_RANGE_END)) {
+    if (ipcb->local_port == udp_port) {
+      /* port is already used by another udp_pcb */
+      udp_port++;
+      /* restart scanning all udp pcbs */
+      ipcb = udp_pcbs;
+    } else {
+      /* go on with next udp pcb */
+      ipcb = ipcb->next;
+    }
+  }
+  if (ipcb != NULL) {
+    return 0;
+  }
+  return udp_port;
+#endif
+}
+
+/**
+ * Process an incoming UDP datagram.
+ *
+ * Given an incoming UDP datagram (as a chain of pbufs) this function
+ * finds a corresponding UDP PCB and hands over the pbuf to the pcbs
+ * recv function. If no pcb is found or the datagram is incorrect, the
+ * pbuf is freed.
+ *
+ * @param p pbuf to be demultiplexed to a UDP PCB.
+ * @param inp network interface on which the datagram was received.
+ *
+ */
+void
+udp_input(struct pbuf *p, struct netif *inp)
+{
+  struct udp_hdr *udphdr;
+  struct udp_pcb *pcb, *prev;
+  struct udp_pcb *uncon_pcb;
+  struct ip_hdr *iphdr;
+  u16_t src, dest;
+  u8_t local_match;
+  u8_t broadcast;
+
+  PERF_START;
+
+  UDP_STATS_INC(udp.recv);
+
+  iphdr = (struct ip_hdr *)p->payload;
+
+  /* Check minimum length (IP header + UDP header)
+   * and move payload pointer to UDP header */
+  if (p->tot_len < (IPH_HL(iphdr) * 4 + UDP_HLEN) || pbuf_header(p, -(s16_t)(IPH_HL(iphdr) * 4))) {
+    /* drop short packets */
+    LWIP_DEBUGF(UDP_DEBUG,
+                ("udp_input: short UDP datagram (%"U16_F" bytes) discarded\n", p->tot_len));
+    UDP_STATS_INC(udp.lenerr);
+    UDP_STATS_INC(udp.drop);
+    snmp_inc_udpinerrors();
+    pbuf_free(p);
+    goto end;
+  }
+
+  udphdr = (struct udp_hdr *)p->payload;
+
+  /* is broadcast packet ? */
+  broadcast = ip_addr_isbroadcast(&current_iphdr_dest, inp);
+
+  LWIP_DEBUGF(UDP_DEBUG, ("udp_input: received datagram of length %"U16_F"\n", p->tot_len));
+
+  /* convert src and dest ports to host byte order */
+  src = ntohs(udphdr->src);
+  dest = ntohs(udphdr->dest);
+
+  udp_debug_print(udphdr);
+
+  /* print the UDP source and destination */
+  LWIP_DEBUGF(UDP_DEBUG,
+              ("udp (%"U16_F".%"U16_F".%"U16_F".%"U16_F", %"U16_F") <-- "
+               "(%"U16_F".%"U16_F".%"U16_F".%"U16_F", %"U16_F")\n",
+               ip4_addr1_16(&iphdr->dest), ip4_addr2_16(&iphdr->dest),
+               ip4_addr3_16(&iphdr->dest), ip4_addr4_16(&iphdr->dest), ntohs(udphdr->dest),
+               ip4_addr1_16(&iphdr->src), ip4_addr2_16(&iphdr->src),
+               ip4_addr3_16(&iphdr->src), ip4_addr4_16(&iphdr->src), ntohs(udphdr->src)));
+
+#if LWIP_DHCP
+  pcb = NULL;
+  /* when LWIP_DHCP is active, packets to DHCP_CLIENT_PORT may only be processed by
+     the dhcp module, no other UDP pcb may use the local UDP port DHCP_CLIENT_PORT */
+  if (dest == DHCP_CLIENT_PORT) {
+    /* all packets for DHCP_CLIENT_PORT not coming from DHCP_SERVER_PORT are dropped! */
+    if (src == DHCP_SERVER_PORT) {
+      if ((inp->dhcp != NULL) && (inp->dhcp->pcb != NULL)) {
+        /* accept the packe if 
+           (- broadcast or directed to us) -> DHCP is link-layer-addressed, local ip is always ANY!
+           - inp->dhcp->pcb->remote == ANY or iphdr->src */
+        if ((ip_addr_isany(&inp->dhcp->pcb->remote_ip) ||
+           ip_addr_cmp(&(inp->dhcp->pcb->remote_ip), &current_iphdr_src))) {
+          pcb = inp->dhcp->pcb;
+        }
+      }
+    }
+  } else
+#endif /* LWIP_DHCP */
+  {
+    prev = NULL;
+    local_match = 0;
+    uncon_pcb = NULL;
+    /* Iterate through the UDP pcb list for a matching pcb.
+     * 'Perfect match' pcbs (connected to the remote port & ip address) are
+     * preferred. If no perfect match is found, the first unconnected pcb that
+     * matches the local port and ip address gets the datagram. */
+    for (pcb = udp_pcbs; pcb != NULL; pcb = pcb->next) {
+      local_match = 0;
+      /* print the PCB local and remote address */
+      LWIP_DEBUGF(UDP_DEBUG,
+                  ("pcb (%"U16_F".%"U16_F".%"U16_F".%"U16_F", %"U16_F") --- "
+                   "(%"U16_F".%"U16_F".%"U16_F".%"U16_F", %"U16_F")\n",
+                   ip4_addr1_16(&pcb->local_ip), ip4_addr2_16(&pcb->local_ip),
+                   ip4_addr3_16(&pcb->local_ip), ip4_addr4_16(&pcb->local_ip), pcb->local_port,
+                   ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip),
+                   ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip), pcb->remote_port));
+
+      /* compare PCB local addr+port to UDP destination addr+port */
+      if (pcb->local_port == dest) {
+        if (
+           (!broadcast && ip_addr_isany(&pcb->local_ip)) ||
+           ip_addr_cmp(&(pcb->local_ip), &current_iphdr_dest) ||
+#if LWIP_IGMP
+           ip_addr_ismulticast(&current_iphdr_dest) ||
+#endif /* LWIP_IGMP */
+#if IP_SOF_BROADCAST_RECV
+            (broadcast && ip_get_option(pcb, SOF_BROADCAST) &&
+             (ip_addr_isany(&pcb->local_ip) ||
+              ip_addr_netcmp(&pcb->local_ip, ip_current_dest_addr(), &inp->netmask)))) {
+#else /* IP_SOF_BROADCAST_RECV */
+            (broadcast &&
+             (ip_addr_isany(&pcb->local_ip) ||
+              ip_addr_netcmp(&pcb->local_ip, ip_current_dest_addr(), &inp->netmask)))) {
+#endif /* IP_SOF_BROADCAST_RECV */ 
+          local_match = 1;
+          if ((uncon_pcb == NULL) && 
+              ((pcb->flags & UDP_FLAGS_CONNECTED) == 0)) {
+            /* the first unconnected matching PCB */
+            uncon_pcb = pcb;
+          }
+        }
+      }
+      /* compare PCB remote addr+port to UDP source addr+port */
+      if ((local_match != 0) &&
+          (pcb->remote_port == src) &&
+          (ip_addr_isany(&pcb->remote_ip) ||
+           ip_addr_cmp(&(pcb->remote_ip), &current_iphdr_src))) {
+        /* the first fully matching PCB */
+        if (prev != NULL) {
+          /* move the pcb to the front of udp_pcbs so that is
+             found faster next time */
+          prev->next = pcb->next;
+          pcb->next = udp_pcbs;
+          udp_pcbs = pcb;
+        } else {
+          UDP_STATS_INC(udp.cachehit);
+        }
+        break;
+      }
+      prev = pcb;
+    }
+    /* no fully matching pcb found? then look for an unconnected pcb */
+    if (pcb == NULL) {
+      pcb = uncon_pcb;
+    }
+  }
+
+  /* Check checksum if this is a match or if it was directed at us. */
+  if (pcb != NULL || ip_addr_cmp(&inp->ip_addr, &current_iphdr_dest)) {
+    LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_input: calculating checksum\n"));
+#if LWIP_UDPLITE
+    if (IPH_PROTO(iphdr) == IP_PROTO_UDPLITE) {
+      /* Do the UDP Lite checksum */
+#if CHECKSUM_CHECK_UDP
+      u16_t chklen = ntohs(udphdr->len);
+      if (chklen < sizeof(struct udp_hdr)) {
+        if (chklen == 0) {
+          /* For UDP-Lite, checksum length of 0 means checksum
+             over the complete packet (See RFC 3828 chap. 3.1) */
+          chklen = p->tot_len;
+        } else {
+          /* At least the UDP-Lite header must be covered by the
+             checksum! (Again, see RFC 3828 chap. 3.1) */
+          UDP_STATS_INC(udp.chkerr);
+          UDP_STATS_INC(udp.drop);
+          snmp_inc_udpinerrors();
+          pbuf_free(p);
+          goto end;
+        }
+      }
+      if (inet_chksum_pseudo_partial(p, &current_iphdr_src, &current_iphdr_dest,
+                             IP_PROTO_UDPLITE, p->tot_len, chklen) != 0) {
+       LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+                   ("udp_input: UDP Lite datagram discarded due to failing checksum\n"));
+        UDP_STATS_INC(udp.chkerr);
+        UDP_STATS_INC(udp.drop);
+        snmp_inc_udpinerrors();
+        pbuf_free(p);
+        goto end;
+      }
+#endif /* CHECKSUM_CHECK_UDP */
+    } else
+#endif /* LWIP_UDPLITE */
+    {
+#if CHECKSUM_CHECK_UDP
+      if (udphdr->chksum != 0) {
+        if (inet_chksum_pseudo(p, ip_current_src_addr(), ip_current_dest_addr(),
+                               IP_PROTO_UDP, p->tot_len) != 0) {
+          LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+                      ("udp_input: UDP datagram discarded due to failing checksum\n"));
+          UDP_STATS_INC(udp.chkerr);
+          UDP_STATS_INC(udp.drop);
+          snmp_inc_udpinerrors();
+          pbuf_free(p);
+          goto end;
+        }
+      }
+#endif /* CHECKSUM_CHECK_UDP */
+    }
+    if(pbuf_header(p, -UDP_HLEN)) {
+      /* Can we cope with this failing? Just assert for now */
+      LWIP_ASSERT("pbuf_header failed\n", 0);
+      UDP_STATS_INC(udp.drop);
+      snmp_inc_udpinerrors();
+      pbuf_free(p);
+      goto end;
+    }
+    if (pcb != NULL) {
+      snmp_inc_udpindatagrams();
+#if SO_REUSE && SO_REUSE_RXTOALL
+      if ((broadcast || ip_addr_ismulticast(&current_iphdr_dest)) &&
+          ip_get_option(pcb, SOF_REUSEADDR)) {
+        /* pass broadcast- or multicast packets to all multicast pcbs
+           if SOF_REUSEADDR is set on the first match */
+        struct udp_pcb *mpcb;
+        u8_t p_header_changed = 0;
+        for (mpcb = udp_pcbs; mpcb != NULL; mpcb = mpcb->next) {
+          if (mpcb != pcb) {
+            /* compare PCB local addr+port to UDP destination addr+port */
+            if ((mpcb->local_port == dest) &&
+                ((!broadcast && ip_addr_isany(&mpcb->local_ip)) ||
+                 ip_addr_cmp(&(mpcb->local_ip), &current_iphdr_dest) ||
+#if LWIP_IGMP
+                 ip_addr_ismulticast(&current_iphdr_dest) ||
+#endif /* LWIP_IGMP */
+#if IP_SOF_BROADCAST_RECV
+                 (broadcast && ip_get_option(mpcb, SOF_BROADCAST)))) {
+#else  /* IP_SOF_BROADCAST_RECV */
+                 (broadcast))) {
+#endif /* IP_SOF_BROADCAST_RECV */
+              /* pass a copy of the packet to all local matches */
+              if (mpcb->recv != NULL) {
+                struct pbuf *q;
+                /* for that, move payload to IP header again */
+                if (p_header_changed == 0) {
+                  pbuf_header(p, (s16_t)((IPH_HL(iphdr) * 4) + UDP_HLEN));
+                  p_header_changed = 1;
+                }
+                q = pbuf_alloc(PBUF_RAW, p->tot_len, PBUF_RAM);
+                if (q != NULL) {
+                  err_t err = pbuf_copy(q, p);
+                  if (err == ERR_OK) {
+                    /* move payload to UDP data */
+                    pbuf_header(q, -(s16_t)((IPH_HL(iphdr) * 4) + UDP_HLEN));
+                    mpcb->recv(mpcb->recv_arg, mpcb, q, ip_current_src_addr(), src);
+                  }
+                }
+              }
+            }
+          }
+        }
+        if (p_header_changed) {
+          /* and move payload to UDP data again */
+          pbuf_header(p, -(s16_t)((IPH_HL(iphdr) * 4) + UDP_HLEN));
+        }
+      }
+#endif /* SO_REUSE && SO_REUSE_RXTOALL */
+      /* callback */
+      if (pcb->recv != NULL) {
+        /* now the recv function is responsible for freeing p */
+        pcb->recv(pcb->recv_arg, pcb, p, ip_current_src_addr(), src);
+      } else {
+        /* no recv function registered? then we have to free the pbuf! */
+        pbuf_free(p);
+        goto end;
+      }
+    } else {
+      LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_input: not for us.\n"));
+
+#if LWIP_ICMP
+      /* No match was found, send ICMP destination port unreachable unless
+         destination address was broadcast/multicast. */
+      if (!broadcast &&
+          !ip_addr_ismulticast(&current_iphdr_dest)) {
+        /* move payload pointer back to ip header */
+        pbuf_header(p, (IPH_HL(iphdr) * 4) + UDP_HLEN);
+        LWIP_ASSERT("p->payload == iphdr", (p->payload == iphdr));
+        icmp_dest_unreach(p, ICMP_DUR_PORT);
+      }
+#endif /* LWIP_ICMP */
+      UDP_STATS_INC(udp.proterr);
+      UDP_STATS_INC(udp.drop);
+      snmp_inc_udpnoports();
+      pbuf_free(p);
+    }
+  } else {
+    pbuf_free(p);
+  }
+end:
+  PERF_STOP("udp_input");
+}
+
+/**
+ * Send data using UDP.
+ *
+ * @param pcb UDP PCB used to send the data.
+ * @param p chain of pbuf's to be sent.
+ *
+ * The datagram will be sent to the current remote_ip & remote_port
+ * stored in pcb. If the pcb is not bound to a port, it will
+ * automatically be bound to a random port.
+ *
+ * @return lwIP error code.
+ * - ERR_OK. Successful. No error occured.
+ * - ERR_MEM. Out of memory.
+ * - ERR_RTE. Could not find route to destination address.
+ * - More errors could be returned by lower protocol layers.
+ *
+ * @see udp_disconnect() udp_sendto()
+ */
+err_t
+udp_send(struct udp_pcb *pcb, struct pbuf *p)
+{
+  /* send to the packet using remote ip and port stored in the pcb */
+  return udp_sendto(pcb, p, &pcb->remote_ip, pcb->remote_port);
+}
+
+#if LWIP_CHECKSUM_ON_COPY
+/** Same as udp_send() but with checksum
+ */
+err_t
+udp_send_chksum(struct udp_pcb *pcb, struct pbuf *p,
+                u8_t have_chksum, u16_t chksum)
+{
+  /* send to the packet using remote ip and port stored in the pcb */
+  return udp_sendto_chksum(pcb, p, &pcb->remote_ip, pcb->remote_port,
+    have_chksum, chksum);
+}
+#endif /* LWIP_CHECKSUM_ON_COPY */
+
+/**
+ * Send data to a specified address using UDP.
+ *
+ * @param pcb UDP PCB used to send the data.
+ * @param p chain of pbuf's to be sent.
+ * @param dst_ip Destination IP address.
+ * @param dst_port Destination UDP port.
+ *
+ * dst_ip & dst_port are expected to be in the same byte order as in the pcb.
+ *
+ * If the PCB already has a remote address association, it will
+ * be restored after the data is sent.
+ * 
+ * @return lwIP error code (@see udp_send for possible error codes)
+ *
+ * @see udp_disconnect() udp_send()
+ */
+err_t
+udp_sendto(struct udp_pcb *pcb, struct pbuf *p,
+  ip_addr_t *dst_ip, u16_t dst_port)
+{
+#if LWIP_CHECKSUM_ON_COPY
+  return udp_sendto_chksum(pcb, p, dst_ip, dst_port, 0, 0);
+}
+
+/** Same as udp_sendto(), but with checksum */
+err_t
+udp_sendto_chksum(struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *dst_ip,
+                  u16_t dst_port, u8_t have_chksum, u16_t chksum)
+{
+#endif /* LWIP_CHECKSUM_ON_COPY */
+  struct netif *netif;
+
+  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_send\n"));
+
+  /* find the outgoing network interface for this packet */
+#if LWIP_IGMP
+  netif = ip_route((ip_addr_ismulticast(dst_ip))?(&(pcb->multicast_ip)):(dst_ip));
+#else
+  netif = ip_route(dst_ip);
+#endif /* LWIP_IGMP */
+
+  /* no outgoing network interface could be found? */
+  if (netif == NULL) {
+    LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("udp_send: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+      ip4_addr1_16(dst_ip), ip4_addr2_16(dst_ip), ip4_addr3_16(dst_ip), ip4_addr4_16(dst_ip)));
+    UDP_STATS_INC(udp.rterr);
+    return ERR_RTE;
+  }
+#if LWIP_CHECKSUM_ON_COPY
+  return udp_sendto_if_chksum(pcb, p, dst_ip, dst_port, netif, have_chksum, chksum);
+#else /* LWIP_CHECKSUM_ON_COPY */
+  return udp_sendto_if(pcb, p, dst_ip, dst_port, netif);
+#endif /* LWIP_CHECKSUM_ON_COPY */
+}
+
+/**
+ * Send data to a specified address using UDP.
+ * The netif used for sending can be specified.
+ *
+ * This function exists mainly for DHCP, to be able to send UDP packets
+ * on a netif that is still down.
+ *
+ * @param pcb UDP PCB used to send the data.
+ * @param p chain of pbuf's to be sent.
+ * @param dst_ip Destination IP address.
+ * @param dst_port Destination UDP port.
+ * @param netif the netif used for sending.
+ *
+ * dst_ip & dst_port are expected to be in the same byte order as in the pcb.
+ *
+ * @return lwIP error code (@see udp_send for possible error codes)
+ *
+ * @see udp_disconnect() udp_send()
+ */
+err_t
+udp_sendto_if(struct udp_pcb *pcb, struct pbuf *p,
+  ip_addr_t *dst_ip, u16_t dst_port, struct netif *netif)
+{
+#if LWIP_CHECKSUM_ON_COPY
+  return udp_sendto_if_chksum(pcb, p, dst_ip, dst_port, netif, 0, 0);
+}
+
+/** Same as udp_sendto_if(), but with checksum */
+err_t
+udp_sendto_if_chksum(struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *dst_ip,
+                     u16_t dst_port, struct netif *netif, u8_t have_chksum,
+                     u16_t chksum)
+{
+#endif /* LWIP_CHECKSUM_ON_COPY */
+  struct udp_hdr *udphdr;
+  ip_addr_t *src_ip;
+  err_t err;
+  struct pbuf *q; /* q will be sent down the stack */
+
+#if IP_SOF_BROADCAST
+  /* broadcast filter? */
+  if (!ip_get_option(pcb, SOF_BROADCAST) && ip_addr_isbroadcast(dst_ip, netif)) {
+    LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
+      ("udp_sendto_if: SOF_BROADCAST not enabled on pcb %p\n", (void *)pcb));
+    return ERR_VAL;
+  }
+#endif /* IP_SOF_BROADCAST */
+
+  /* if the PCB is not yet bound to a port, bind it here */
+  if (pcb->local_port == 0) {
+    LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_send: not yet bound to a port, binding now\n"));
+    err = udp_bind(pcb, &pcb->local_ip, pcb->local_port);
+    if (err != ERR_OK) {
+      LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("udp_send: forced port bind failed\n"));
+      return err;
+    }
+  }
+
+  /* not enough space to add an UDP header to first pbuf in given p chain? */
+  if (pbuf_header(p, UDP_HLEN)) {
+    /* allocate header in a separate new pbuf */
+    q = pbuf_alloc(PBUF_IP, UDP_HLEN, PBUF_RAM);
+    /* new header pbuf could not be allocated? */
+    if (q == NULL) {
+      LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("udp_send: could not allocate header\n"));
+      return ERR_MEM;
+    }
+    if (p->tot_len != 0) {
+      /* chain header q in front of given pbuf p (only if p contains data) */
+      pbuf_chain(q, p);
+    }
+    /* first pbuf q points to header pbuf */
+    LWIP_DEBUGF(UDP_DEBUG,
+                ("udp_send: added header pbuf %p before given pbuf %p\n", (void *)q, (void *)p));
+  } else {
+    /* adding space for header within p succeeded */
+    /* first pbuf q equals given pbuf */
+    q = p;
+    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: added header in given pbuf %p\n", (void *)p));
+  }
+  LWIP_ASSERT("check that first pbuf can hold struct udp_hdr",
+              (q->len >= sizeof(struct udp_hdr)));
+  /* q now represents the packet to be sent */
+  udphdr = (struct udp_hdr *)q->payload;
+  udphdr->src = htons(pcb->local_port);
+  udphdr->dest = htons(dst_port);
+  /* in UDP, 0 checksum means 'no checksum' */
+  udphdr->chksum = 0x0000; 
+
+  /* Multicast Loop? */
+#if LWIP_IGMP
+  if (ip_addr_ismulticast(dst_ip) && ((pcb->flags & UDP_FLAGS_MULTICAST_LOOP) != 0)) {
+    q->flags |= PBUF_FLAG_MCASTLOOP;
+  }
+#endif /* LWIP_IGMP */
+
+
+  /* PCB local address is IP_ANY_ADDR? */
+  if (ip_addr_isany(&pcb->local_ip)) {
+    /* use outgoing network interface IP address as source address */
+    src_ip = &(netif->ip_addr);
+  } else {
+    /* check if UDP PCB local IP address is correct
+     * this could be an old address if netif->ip_addr has changed */
+    if (!ip_addr_cmp(&(pcb->local_ip), &(netif->ip_addr))) {
+      /* local_ip doesn't match, drop the packet */
+      if (q != p) {
+        /* free the header pbuf */
+        pbuf_free(q);
+        q = NULL;
+        /* p is still referenced by the caller, and will live on */
+      }
+      return ERR_VAL;
+    }
+    /* use UDP PCB local IP address as source address */
+    src_ip = &(pcb->local_ip);
+  }
+
+  LWIP_DEBUGF(UDP_DEBUG, ("udp_send: sending datagram of length %"U16_F"\n", q->tot_len));
+
+#if LWIP_UDPLITE
+  /* UDP Lite protocol? */
+  if (pcb->flags & UDP_FLAGS_UDPLITE) {
+    u16_t chklen, chklen_hdr;
+    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: UDP LITE packet length %"U16_F"\n", q->tot_len));
+    /* set UDP message length in UDP header */
+    chklen_hdr = chklen = pcb->chksum_len_tx;
+    if ((chklen < sizeof(struct udp_hdr)) || (chklen > q->tot_len)) {
+      if (chklen != 0) {
+        LWIP_DEBUGF(UDP_DEBUG, ("udp_send: UDP LITE pcb->chksum_len is illegal: %"U16_F"\n", chklen));
+      }
+      /* For UDP-Lite, checksum length of 0 means checksum
+         over the complete packet. (See RFC 3828 chap. 3.1)
+         At least the UDP-Lite header must be covered by the
+         checksum, therefore, if chksum_len has an illegal
+         value, we generate the checksum over the complete
+         packet to be safe. */
+      chklen_hdr = 0;
+      chklen = q->tot_len;
+    }
+    udphdr->len = htons(chklen_hdr);
+    /* calculate checksum */
+#if CHECKSUM_GEN_UDP
+    udphdr->chksum = inet_chksum_pseudo_partial(q, src_ip, dst_ip,
+      IP_PROTO_UDPLITE, q->tot_len,
+#if !LWIP_CHECKSUM_ON_COPY
+      chklen);
+#else /* !LWIP_CHECKSUM_ON_COPY */
+      (have_chksum ? UDP_HLEN : chklen));
+    if (have_chksum) {
+      u32_t acc;
+      acc = udphdr->chksum + (u16_t)~(chksum);
+      udphdr->chksum = FOLD_U32T(acc);
+    }
+#endif /* !LWIP_CHECKSUM_ON_COPY */
+
+    /* chksum zero must become 0xffff, as zero means 'no checksum' */
+    if (udphdr->chksum == 0x0000) {
+      udphdr->chksum = 0xffff;
+    }
+#endif /* CHECKSUM_GEN_UDP */
+    /* output to IP */
+    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: ip_output_if (,,,,IP_PROTO_UDPLITE,)\n"));
+    NETIF_SET_HWADDRHINT(netif, &pcb->addr_hint);
+    err = ip_output_if(q, src_ip, dst_ip, pcb->ttl, pcb->tos, IP_PROTO_UDPLITE, netif);
+    NETIF_SET_HWADDRHINT(netif, NULL);
+  } else
+#endif /* LWIP_UDPLITE */
+  {      /* UDP */
+    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: UDP packet length %"U16_F"\n", q->tot_len));
+    udphdr->len = htons(q->tot_len);
+    /* calculate checksum */
+#if CHECKSUM_GEN_UDP
+    if ((pcb->flags & UDP_FLAGS_NOCHKSUM) == 0) {
+      u16_t udpchksum;
+#if LWIP_CHECKSUM_ON_COPY
+      if (have_chksum) {
+        u32_t acc;
+        udpchksum = inet_chksum_pseudo_partial(q, src_ip, dst_ip, IP_PROTO_UDP,
+          q->tot_len, UDP_HLEN);
+        acc = udpchksum + (u16_t)~(chksum);
+        udpchksum = FOLD_U32T(acc);
+      } else
+#endif /* LWIP_CHECKSUM_ON_COPY */
+      {
+        udpchksum = inet_chksum_pseudo(q, src_ip, dst_ip, IP_PROTO_UDP, q->tot_len);
+      }
+
+      /* chksum zero must become 0xffff, as zero means 'no checksum' */
+      if (udpchksum == 0x0000) {
+        udpchksum = 0xffff;
+      }
+      udphdr->chksum = udpchksum;
+    }
+#endif /* CHECKSUM_GEN_UDP */
+    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: UDP checksum 0x%04"X16_F"\n", udphdr->chksum));
+    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: ip_output_if (,,,,IP_PROTO_UDP,)\n"));
+    /* output to IP */
+    NETIF_SET_HWADDRHINT(netif, &pcb->addr_hint);
+    err = ip_output_if(q, src_ip, dst_ip, pcb->ttl, pcb->tos, IP_PROTO_UDP, netif);
+    NETIF_SET_HWADDRHINT(netif, NULL);
+  }
+  /* TODO: must this be increased even if error occured? */
+  snmp_inc_udpoutdatagrams();
+
+  /* did we chain a separate header pbuf earlier? */
+  if (q != p) {
+    /* free the header pbuf */
+    pbuf_free(q);
+    q = NULL;
+    /* p is still referenced by the caller, and will live on */
+  }
+
+  UDP_STATS_INC(udp.xmit);
+  return err;
+}
+
+/**
+ * Bind an UDP PCB.
+ *
+ * @param pcb UDP PCB to be bound with a local address ipaddr and port.
+ * @param ipaddr local IP address to bind with. Use IP_ADDR_ANY to
+ * bind to all local interfaces.
+ * @param port local UDP port to bind with. Use 0 to automatically bind
+ * to a random port between UDP_LOCAL_PORT_RANGE_START and
+ * UDP_LOCAL_PORT_RANGE_END.
+ *
+ * ipaddr & port are expected to be in the same byte order as in the pcb.
+ *
+ * @return lwIP error code.
+ * - ERR_OK. Successful. No error occured.
+ * - ERR_USE. The specified ipaddr and port are already bound to by
+ * another UDP PCB.
+ *
+ * @see udp_disconnect()
+ */
+err_t
+udp_bind(struct udp_pcb *pcb, ip_addr_t *ipaddr, u16_t port)
+{
+  struct udp_pcb *ipcb;
+  u8_t rebind;
+
+  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_bind(ipaddr = "));
+  ip_addr_debug_print(UDP_DEBUG, ipaddr);
+  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, (", port = %"U16_F")\n", port));
+
+  rebind = 0;
+  /* Check for double bind and rebind of the same pcb */
+  for (ipcb = udp_pcbs; ipcb != NULL; ipcb = ipcb->next) {
+    /* is this UDP PCB already on active list? */
+    if (pcb == ipcb) {
+      /* pcb may occur at most once in active list */
+      LWIP_ASSERT("rebind == 0", rebind == 0);
+      /* pcb already in list, just rebind */
+      rebind = 1;
+    }
+
+    /* By default, we don't allow to bind to a port that any other udp
+       PCB is alread bound to, unless *all* PCBs with that port have tha
+       REUSEADDR flag set. */
+#if SO_REUSE
+    else if (!ip_get_option(pcb, SOF_REUSEADDR) &&
+             !ip_get_option(ipcb, SOF_REUSEADDR)) {
+#else /* SO_REUSE */
+    /* port matches that of PCB in list and REUSEADDR not set -> reject */
+    else {
+#endif /* SO_REUSE */
+      if ((ipcb->local_port == port) &&
+          /* IP address matches, or one is IP_ADDR_ANY? */
+          (ip_addr_isany(&(ipcb->local_ip)) ||
+           ip_addr_isany(ipaddr) ||
+           ip_addr_cmp(&(ipcb->local_ip), ipaddr))) {
+        /* other PCB already binds to this local IP and port */
+        LWIP_DEBUGF(UDP_DEBUG,
+                    ("udp_bind: local port %"U16_F" already bound by another pcb\n", port));
+        return ERR_USE;
+      }
+    }
+  }
+
+  ip_addr_set(&pcb->local_ip, ipaddr);
+
+  /* no port specified? */
+  if (port == 0) {
+    port = udp_new_port();
+    if (port == 0) {
+      /* no more ports available in local range */
+      LWIP_DEBUGF(UDP_DEBUG, ("udp_bind: out of free UDP ports\n"));
+      return ERR_USE;
+    }
+  }
+  pcb->local_port = port;
+  snmp_insert_udpidx_tree(pcb);
+  /* pcb not active yet? */
+  if (rebind == 0) {
+    /* place the PCB on the active list if not already there */
+    pcb->next = udp_pcbs;
+    udp_pcbs = pcb;
+  }
+  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+              ("udp_bind: bound to %"U16_F".%"U16_F".%"U16_F".%"U16_F", port %"U16_F"\n",
+               ip4_addr1_16(&pcb->local_ip), ip4_addr2_16(&pcb->local_ip),
+               ip4_addr3_16(&pcb->local_ip), ip4_addr4_16(&pcb->local_ip),
+               pcb->local_port));
+  return ERR_OK;
+}
+/**
+ * Connect an UDP PCB.
+ *
+ * This will associate the UDP PCB with the remote address.
+ *
+ * @param pcb UDP PCB to be connected with remote address ipaddr and port.
+ * @param ipaddr remote IP address to connect with.
+ * @param port remote UDP port to connect with.
+ *
+ * @return lwIP error code
+ *
+ * ipaddr & port are expected to be in the same byte order as in the pcb.
+ *
+ * The udp pcb is bound to a random local port if not already bound.
+ *
+ * @see udp_disconnect()
+ */
+err_t
+udp_connect(struct udp_pcb *pcb, ip_addr_t *ipaddr, u16_t port)
+{
+  struct udp_pcb *ipcb;
+
+  if (pcb->local_port == 0) {
+    err_t err = udp_bind(pcb, &pcb->local_ip, pcb->local_port);
+    if (err != ERR_OK) {
+      return err;
+    }
+  }
+
+  ip_addr_set(&pcb->remote_ip, ipaddr);
+  pcb->remote_port = port;
+  pcb->flags |= UDP_FLAGS_CONNECTED;
+/** TODO: this functionality belongs in upper layers */
+#ifdef LWIP_UDP_TODO
+  /* Nail down local IP for netconn_addr()/getsockname() */
+  if (ip_addr_isany(&pcb->local_ip) && !ip_addr_isany(&pcb->remote_ip)) {
+    struct netif *netif;
+
+    if ((netif = ip_route(&(pcb->remote_ip))) == NULL) {
+      LWIP_DEBUGF(UDP_DEBUG, ("udp_connect: No route to 0x%lx\n", pcb->remote_ip.addr));
+      UDP_STATS_INC(udp.rterr);
+      return ERR_RTE;
+    }
+    /** TODO: this will bind the udp pcb locally, to the interface which
+        is used to route output packets to the remote address. However, we
+        might want to accept incoming packets on any interface! */
+    pcb->local_ip = netif->ip_addr;
+  } else if (ip_addr_isany(&pcb->remote_ip)) {
+    pcb->local_ip.addr = 0;
+  }
+#endif
+  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
+              ("udp_connect: connected to %"U16_F".%"U16_F".%"U16_F".%"U16_F",port %"U16_F"\n",
+               ip4_addr1_16(&pcb->local_ip), ip4_addr2_16(&pcb->local_ip),
+               ip4_addr3_16(&pcb->local_ip), ip4_addr4_16(&pcb->local_ip),
+               pcb->local_port));
+
+  /* Insert UDP PCB into the list of active UDP PCBs. */
+  for (ipcb = udp_pcbs; ipcb != NULL; ipcb = ipcb->next) {
+    if (pcb == ipcb) {
+      /* already on the list, just return */
+      return ERR_OK;
+    }
+  }
+  /* PCB not yet on the list, add PCB now */
+  pcb->next = udp_pcbs;
+  udp_pcbs = pcb;
+  return ERR_OK;
+}
+
+/**
+ * Disconnect a UDP PCB
+ *
+ * @param pcb the udp pcb to disconnect.
+ */
+void
+udp_disconnect(struct udp_pcb *pcb)
+{
+  /* reset remote address association */
+  ip_addr_set_any(&pcb->remote_ip);
+  pcb->remote_port = 0;
+  /* mark PCB as unconnected */
+  pcb->flags &= ~UDP_FLAGS_CONNECTED;
+}
+
+/**
+ * Set a receive callback for a UDP PCB
+ *
+ * This callback will be called when receiving a datagram for the pcb.
+ *
+ * @param pcb the pcb for wich to set the recv callback
+ * @param recv function pointer of the callback function
+ * @param recv_arg additional argument to pass to the callback function
+ */
+void
+udp_recv(struct udp_pcb *pcb, udp_recv_fn recv, void *recv_arg)
+{
+  /* remember recv() callback and user data */
+  pcb->recv = recv;
+  pcb->recv_arg = recv_arg;
+}
+
+/**
+ * Remove an UDP PCB.
+ *
+ * @param pcb UDP PCB to be removed. The PCB is removed from the list of
+ * UDP PCB's and the data structure is freed from memory.
+ *
+ * @see udp_new()
+ */
+void
+udp_remove(struct udp_pcb *pcb)
+{
+  struct udp_pcb *pcb2;
+
+  snmp_delete_udpidx_tree(pcb);
+  /* pcb to be removed is first in list? */
+  if (udp_pcbs == pcb) {
+    /* make list start at 2nd pcb */
+    udp_pcbs = udp_pcbs->next;
+    /* pcb not 1st in list */
+  } else {
+    for (pcb2 = udp_pcbs; pcb2 != NULL; pcb2 = pcb2->next) {
+      /* find pcb in udp_pcbs list */
+      if (pcb2->next != NULL && pcb2->next == pcb) {
+        /* remove pcb from list */
+        pcb2->next = pcb->next;
+      }
+    }
+  }
+  memp_free(MEMP_UDP_PCB, pcb);
+}
+
+/**
+ * Create a UDP PCB.
+ *
+ * @return The UDP PCB which was created. NULL if the PCB data structure
+ * could not be allocated.
+ *
+ * @see udp_remove()
+ */
+struct udp_pcb *
+udp_new(void)
+{
+  struct udp_pcb *pcb;
+  pcb = (struct udp_pcb *)memp_malloc(MEMP_UDP_PCB);
+  /* could allocate UDP PCB? */
+  if (pcb != NULL) {
+    /* UDP Lite: by initializing to all zeroes, chksum_len is set to 0
+     * which means checksum is generated over the whole datagram per default
+     * (recommended as default by RFC 3828). */
+    /* initialize PCB to all zeroes */
+    memset(pcb, 0, sizeof(struct udp_pcb));
+    pcb->ttl = UDP_TTL;
+  }
+  return pcb;
+}
+
+#if UDP_DEBUG
+/**
+ * Print UDP header information for debug purposes.
+ *
+ * @param udphdr pointer to the udp header in memory.
+ */
+void
+udp_debug_print(struct udp_hdr *udphdr)
+{
+  LWIP_DEBUGF(UDP_DEBUG, ("UDP header:\n"));
+  LWIP_DEBUGF(UDP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(UDP_DEBUG, ("|     %5"U16_F"     |     %5"U16_F"     | (src port, dest port)\n",
+                          ntohs(udphdr->src), ntohs(udphdr->dest)));
+  LWIP_DEBUGF(UDP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(UDP_DEBUG, ("|     %5"U16_F"     |     0x%04"X16_F"    | (len, chksum)\n",
+                          ntohs(udphdr->len), ntohs(udphdr->chksum)));
+  LWIP_DEBUGF(UDP_DEBUG, ("+-------------------------------+\n"));
+}
+#endif /* UDP_DEBUG */
+
+#endif /* LWIP_UDP */
diff --git a/ext/lwip/src/include/arch/cc.h b/ext/lwip/src/include/arch/cc.h
new file mode 100644
index 000000000..462124dac
--- /dev/null
+++ b/ext/lwip/src/include/arch/cc.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __ARCH_CC_H__
+#define __ARCH_CC_H__
+
+/* Include some files for defining library routines */
+#include <string.h>
+#include <sys/time.h>
+#include <limits.h>
+
+#define LWIP_TIMEVAL_PRIVATE 0
+
+/* Define platform endianness */
+#ifndef BYTE_ORDER
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif /* BYTE_ORDER */
+
+/* Define generic types used in lwIP */
+typedef unsigned   char    u8_t;
+typedef signed     char    s8_t;
+typedef unsigned   short   u16_t;
+typedef signed     short   s16_t;
+typedef unsigned   int     u32_t;
+typedef signed     int     s32_t;
+
+typedef unsigned long mem_ptr_t;
+
+/* Define (sn)printf formatters for these lwIP types */
+#define X8_F  "02x"
+#define U16_F "hu"
+#define S16_F "hd"
+#define X16_F "hx"
+#define U32_F "u"
+#define S32_F "d"
+#define X32_F "x"
+
+/* If only we could use C99 and get %zu */
+#if defined(__x86_64__)
+#define SZT_F "lu"
+#else
+#define SZT_F "u"
+#endif
+
+/* Compiler hints for packing structures */
+#define PACK_STRUCT_FIELD(x) x
+#define PACK_STRUCT_STRUCT __attribute__((packed))
+#define PACK_STRUCT_BEGIN
+#define PACK_STRUCT_END
+
+/* prototypes for printf() and abort() */
+#include <stdio.h>
+#include <stdlib.h>
+/* Plaform specific diagnostic output */
+#define LWIP_PLATFORM_DIAG(x)	do {printf x;} while(0)
+
+#define LWIP_PLATFORM_ASSERT(x) do {printf("Assertion \"%s\" failed at line %d in %s\n", \
+                                     x, __LINE__, __FILE__); fflush(NULL); abort();} while(0)
+
+#define LWIP_RAND() ((u32_t)rand())
+
+#endif /* __ARCH_CC_H__ */
diff --git a/ext/lwip/src/include/arch/perf.h b/ext/lwip/src/include/arch/perf.h
new file mode 100644
index 000000000..9fbcf600e
--- /dev/null
+++ b/ext/lwip/src/include/arch/perf.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __ARCH_PERF_H__
+#define __ARCH_PERF_H__
+
+#include <sys/times.h>
+
+#ifdef PERF
+#define PERF_START  { \
+                         unsigned long __c1l, __c1h, __c2l, __c2h; \
+                         __asm__(".byte 0x0f, 0x31" : "=a" (__c1l), "=d" (__c1h))
+#define PERF_STOP(x)   __asm__(".byte 0x0f, 0x31" : "=a" (__c2l), "=d" (__c2h)); \
+                       perf_print(__c1l, __c1h, __c2l, __c2h, x);}
+
+/*#define PERF_START do { \
+                     struct tms __perf_start, __perf_end; \
+                     times(&__perf_start)
+#define PERF_STOP(x) times(&__perf_end); \
+                     perf_print_times(&__perf_start, &__perf_end, x);\
+                     } while(0)*/
+#else /* PERF */
+#define PERF_START    /* null definition */
+#define PERF_STOP(x)  /* null definition */
+#endif /* PERF */
+
+void perf_print(unsigned long c1l, unsigned long c1h,
+		unsigned long c2l, unsigned long c2h,
+		char *key);
+
+void perf_print_times(struct tms *start, struct tms *end, char *key);
+
+void perf_init(char *fname);
+
+#endif /* __ARCH_PERF_H__ */
diff --git a/ext/lwip/src/include/arch/sys_arch.h b/ext/lwip/src/include/arch/sys_arch.h
new file mode 100644
index 000000000..56d20af07
--- /dev/null
+++ b/ext/lwip/src/include/arch/sys_arch.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __ARCH_SYS_ARCH_H__
+#define __ARCH_SYS_ARCH_H__
+
+#include <errno.h>
+
+#define SYS_MBOX_NULL NULL
+#define SYS_SEM_NULL  NULL
+
+typedef u32_t sys_prot_t;
+
+struct sys_sem;
+typedef struct sys_sem * sys_sem_t;
+#define sys_sem_valid(sem) (((sem) != NULL) && (*(sem) != NULL))
+#define sys_sem_set_invalid(sem) do { if((sem) != NULL) { *(sem) = NULL; }}while(0)
+
+/* let sys.h use binary semaphores for mutexes */
+#define LWIP_COMPAT_MUTEX 1
+
+struct sys_mbox;
+typedef struct sys_mbox *sys_mbox_t;
+#define sys_mbox_valid(mbox) (((mbox) != NULL) && (*(mbox) != NULL))
+#define sys_mbox_set_invalid(mbox) do { if((mbox) != NULL) { *(mbox) = NULL; }}while(0)
+
+struct sys_thread;
+typedef struct sys_thread * sys_thread_t;
+
+#endif /* __ARCH_SYS_ARCH_H__ */
+
diff --git a/ext/lwip/src/include/ipv4/lwip/autoip.h b/ext/lwip/src/include/ipv4/lwip/autoip.h
new file mode 100644
index 000000000..e62b72e8c
--- /dev/null
+++ b/ext/lwip/src/include/ipv4/lwip/autoip.h
@@ -0,0 +1,118 @@
+/**
+ * @file
+ *
+ * AutoIP Automatic LinkLocal IP Configuration
+ */
+
+/*
+ *
+ * Copyright (c) 2007 Dominik Spies <kontakt@dspies.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Dominik Spies <kontakt@dspies.de>
+ *
+ * This is a AutoIP implementation for the lwIP TCP/IP stack. It aims to conform
+ * with RFC 3927.
+ *
+ *
+ * Please coordinate changes and requests with Dominik Spies
+ * <kontakt@dspies.de>
+ */
+ 
+#ifndef __LWIP_AUTOIP_H__
+#define __LWIP_AUTOIP_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_AUTOIP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/netif.h"
+#include "lwip/udp.h"
+#include "netif/etharp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* AutoIP Timing */
+#define AUTOIP_TMR_INTERVAL      100
+#define AUTOIP_TICKS_PER_SECOND (1000 / AUTOIP_TMR_INTERVAL)
+
+/* RFC 3927 Constants */
+#define PROBE_WAIT               1   /* second   (initial random delay)                 */
+#define PROBE_MIN                1   /* second   (minimum delay till repeated probe)    */
+#define PROBE_MAX                2   /* seconds  (maximum delay till repeated probe)    */
+#define PROBE_NUM                3   /*          (number of probe packets)              */
+#define ANNOUNCE_NUM             2   /*          (number of announcement packets)       */
+#define ANNOUNCE_INTERVAL        2   /* seconds  (time between announcement packets)    */
+#define ANNOUNCE_WAIT            2   /* seconds  (delay before announcing)              */
+#define MAX_CONFLICTS            10  /*          (max conflicts before rate limiting)   */
+#define RATE_LIMIT_INTERVAL      60  /* seconds  (delay between successive attempts)    */
+#define DEFEND_INTERVAL          10  /* seconds  (min. wait between defensive ARPs)     */
+
+/* AutoIP client states */
+#define AUTOIP_STATE_OFF         0
+#define AUTOIP_STATE_PROBING     1
+#define AUTOIP_STATE_ANNOUNCING  2
+#define AUTOIP_STATE_BOUND       3
+
+struct autoip
+{
+  ip_addr_t llipaddr;       /* the currently selected, probed, announced or used LL IP-Address */
+  u8_t state;               /* current AutoIP state machine state */
+  u8_t sent_num;            /* sent number of probes or announces, dependent on state */
+  u16_t ttw;                /* ticks to wait, tick is AUTOIP_TMR_INTERVAL long */
+  u8_t lastconflict;        /* ticks until a conflict can be solved by defending */
+  u8_t tried_llipaddr;      /* total number of probed/used Link Local IP-Addresses */
+};
+
+
+#define autoip_init() /* Compatibility define, no init needed. */
+
+/** Set a struct autoip allocated by the application to work with */
+void autoip_set_struct(struct netif *netif, struct autoip *autoip);
+
+/** Start AutoIP client */
+err_t autoip_start(struct netif *netif);
+
+/** Stop AutoIP client */
+err_t autoip_stop(struct netif *netif);
+
+/** Handles every incoming ARP Packet, called by etharp_arp_input */
+void autoip_arp_reply(struct netif *netif, struct etharp_hdr *hdr);
+
+/** Has to be called in loop every AUTOIP_TMR_INTERVAL milliseconds */
+void autoip_tmr(void);
+
+/** Handle a possible change in the network configuration */
+void autoip_network_changed(struct netif *netif);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_AUTOIP */
+
+#endif /* __LWIP_AUTOIP_H__ */
diff --git a/ext/lwip/src/include/ipv4/lwip/icmp.h b/ext/lwip/src/include/ipv4/lwip/icmp.h
new file mode 100644
index 000000000..d47a7d8a2
--- /dev/null
+++ b/ext/lwip/src/include/ipv4/lwip/icmp.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_ICMP_H__
+#define __LWIP_ICMP_H__
+
+#include "lwip/opt.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ICMP_ER   0    /* echo reply */
+#define ICMP_DUR  3    /* destination unreachable */
+#define ICMP_SQ   4    /* source quench */
+#define ICMP_RD   5    /* redirect */
+#define ICMP_ECHO 8    /* echo */
+#define ICMP_TE  11    /* time exceeded */
+#define ICMP_PP  12    /* parameter problem */
+#define ICMP_TS  13    /* timestamp */
+#define ICMP_TSR 14    /* timestamp reply */
+#define ICMP_IRQ 15    /* information request */
+#define ICMP_IR  16    /* information reply */
+
+enum icmp_dur_type {
+  ICMP_DUR_NET   = 0,  /* net unreachable */
+  ICMP_DUR_HOST  = 1,  /* host unreachable */
+  ICMP_DUR_PROTO = 2,  /* protocol unreachable */
+  ICMP_DUR_PORT  = 3,  /* port unreachable */
+  ICMP_DUR_FRAG  = 4,  /* fragmentation needed and DF set */
+  ICMP_DUR_SR    = 5   /* source route failed */
+};
+
+enum icmp_te_type {
+  ICMP_TE_TTL  = 0,    /* time to live exceeded in transit */
+  ICMP_TE_FRAG = 1     /* fragment reassembly time exceeded */
+};
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+/** This is the standard ICMP header only that the u32_t data
+ *  is splitted to two u16_t like ICMP echo needs it.
+ *  This header is also used for other ICMP types that do not
+ *  use the data part.
+ */
+PACK_STRUCT_BEGIN
+struct icmp_echo_hdr {
+  PACK_STRUCT_FIELD(u8_t type);
+  PACK_STRUCT_FIELD(u8_t code);
+  PACK_STRUCT_FIELD(u16_t chksum);
+  PACK_STRUCT_FIELD(u16_t id);
+  PACK_STRUCT_FIELD(u16_t seqno);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define ICMPH_TYPE(hdr) ((hdr)->type)
+#define ICMPH_CODE(hdr) ((hdr)->code)
+
+/** Combines type and code to an u16_t */
+#define ICMPH_TYPE_SET(hdr, t) ((hdr)->type = (t))
+#define ICMPH_CODE_SET(hdr, c) ((hdr)->code = (c))
+
+
+#if LWIP_ICMP /* don't build if not configured for use in lwipopts.h */
+
+void icmp_input(struct pbuf *p, struct netif *inp);
+void icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t);
+void icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t);
+
+#endif /* LWIP_ICMP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_ICMP_H__ */
diff --git a/ext/lwip/src/include/ipv4/lwip/igmp.h b/ext/lwip/src/include/ipv4/lwip/igmp.h
new file mode 100644
index 000000000..8aabac248
--- /dev/null
+++ b/ext/lwip/src/include/ipv4/lwip/igmp.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2002 CITEL Technologies Ltd.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY CITEL TECHNOLOGIES AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ *
+ * This file is a contribution to the lwIP TCP/IP stack.
+ * The Swedish Institute of Computer Science and Adam Dunkels
+ * are specifically granted permission to redistribute this
+ * source code.
+*/
+
+#ifndef __LWIP_IGMP_H__
+#define __LWIP_IGMP_H__
+
+#include "lwip/opt.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/pbuf.h"
+
+#if LWIP_IGMP /* don't build if not configured for use in lwipopts.h */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* IGMP timer */
+#define IGMP_TMR_INTERVAL              100 /* Milliseconds */
+#define IGMP_V1_DELAYING_MEMBER_TMR   (1000/IGMP_TMR_INTERVAL)
+#define IGMP_JOIN_DELAYING_MEMBER_TMR (500 /IGMP_TMR_INTERVAL)
+
+/* MAC Filter Actions, these are passed to a netif's
+ * igmp_mac_filter callback function. */
+#define IGMP_DEL_MAC_FILTER            0
+#define IGMP_ADD_MAC_FILTER            1
+
+
+/**
+ * igmp group structure - there is
+ * a list of groups for each interface
+ * these should really be linked from the interface, but
+ * if we keep them separate we will not affect the lwip original code
+ * too much
+ * 
+ * There will be a group for the all systems group address but this 
+ * will not run the state machine as it is used to kick off reports
+ * from all the other groups
+ */
+struct igmp_group {
+  /** next link */
+  struct igmp_group *next;
+  /** interface on which the group is active */
+  struct netif      *netif;
+  /** multicast address */
+  ip_addr_t          group_address;
+  /** signifies we were the last person to report */
+  u8_t               last_reporter_flag;
+  /** current state of the group */
+  u8_t               group_state;
+  /** timer for reporting, negative is OFF */
+  u16_t              timer;
+  /** counter of simultaneous uses */
+  u8_t               use;
+};
+
+/*  Prototypes */
+void   igmp_init(void);
+err_t  igmp_start(struct netif *netif);
+err_t  igmp_stop(struct netif *netif);
+void   igmp_report_groups(struct netif *netif);
+struct igmp_group *igmp_lookfor_group(struct netif *ifp, ip_addr_t *addr);
+void   igmp_input(struct pbuf *p, struct netif *inp, ip_addr_t *dest);
+err_t  igmp_joingroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr);
+err_t  igmp_leavegroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr);
+void   igmp_tmr(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_IGMP */
+
+#endif /* __LWIP_IGMP_H__ */
diff --git a/ext/lwip/src/include/ipv4/lwip/inet.h b/ext/lwip/src/include/ipv4/lwip/inet.h
new file mode 100644
index 000000000..7bff49b59
--- /dev/null
+++ b/ext/lwip/src/include/ipv4/lwip/inet.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_INET_H__
+#define __LWIP_INET_H__
+
+#include "lwip/opt.h"
+#include "lwip/def.h"
+#include "lwip/ip_addr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** For compatibility with BSD code */
+struct in_addr {
+  u32_t s_addr;
+};
+
+/** 255.255.255.255 */
+#define INADDR_NONE         IPADDR_NONE
+/** 127.0.0.1 */
+#define INADDR_LOOPBACK     IPADDR_LOOPBACK
+/** 0.0.0.0 */
+#define INADDR_ANY          IPADDR_ANY
+/** 255.255.255.255 */
+#define INADDR_BROADCAST    IPADDR_BROADCAST
+
+/* Definitions of the bits in an Internet address integer.
+
+   On subnets, host and network parts are found according to
+   the subnet mask, not these masks.  */
+#define IN_CLASSA(a)        IP_CLASSA(a)
+#define IN_CLASSA_NET       IP_CLASSA_NET
+#define IN_CLASSA_NSHIFT    IP_CLASSA_NSHIFT
+#define IN_CLASSA_HOST      IP_CLASSA_HOST
+#define IN_CLASSA_MAX       IP_CLASSA_MAX
+
+#define IN_CLASSB(b)        IP_CLASSB(b)
+#define IN_CLASSB_NET       IP_CLASSB_NET
+#define IN_CLASSB_NSHIFT    IP_CLASSB_NSHIFT
+#define IN_CLASSB_HOST      IP_CLASSB_HOST
+#define IN_CLASSB_MAX       IP_CLASSB_MAX
+
+#define IN_CLASSC(c)        IP_CLASSC(c)
+#define IN_CLASSC_NET       IP_CLASSC_NET
+#define IN_CLASSC_NSHIFT    IP_CLASSC_NSHIFT
+#define IN_CLASSC_HOST      IP_CLASSC_HOST
+#define IN_CLASSC_MAX       IP_CLASSC_MAX
+
+#define IN_CLASSD(d)        IP_CLASSD(d)
+#define IN_CLASSD_NET       IP_CLASSD_NET     /* These ones aren't really */
+#define IN_CLASSD_NSHIFT    IP_CLASSD_NSHIFT  /*   net and host fields, but */
+#define IN_CLASSD_HOST      IP_CLASSD_HOST    /*   routing needn't know. */
+#define IN_CLASSD_MAX       IP_CLASSD_MAX
+
+#define IN_MULTICAST(a)     IP_MULTICAST(a)
+
+#define IN_EXPERIMENTAL(a)  IP_EXPERIMENTAL(a)
+#define IN_BADCLASS(a)      IP_BADCLASS(a)
+
+#define IN_LOOPBACKNET      IP_LOOPBACKNET
+
+#define inet_addr_from_ipaddr(target_inaddr, source_ipaddr) ((target_inaddr)->s_addr = ip4_addr_get_u32(source_ipaddr))
+#define inet_addr_to_ipaddr(target_ipaddr, source_inaddr)   (ip4_addr_set_u32(target_ipaddr, (source_inaddr)->s_addr))
+/* ATTENTION: the next define only works because both s_addr and ip_addr_t are an u32_t effectively! */
+#define inet_addr_to_ipaddr_p(target_ipaddr_p, source_inaddr)   ((target_ipaddr_p) = (ip_addr_t*)&((source_inaddr)->s_addr))
+
+/* directly map this to the lwip internal functions */
+#define inet_addr(cp)         ipaddr_addr(cp)
+#define inet_aton(cp, addr)   ipaddr_aton(cp, (ip_addr_t*)addr)
+#define inet_ntoa(addr)       ipaddr_ntoa((ip_addr_t*)&(addr))
+#define inet_ntoa_r(addr, buf, buflen) ipaddr_ntoa_r((ip_addr_t*)&(addr), buf, buflen)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_INET_H__ */
diff --git a/ext/lwip/src/include/ipv4/lwip/inet_chksum.h b/ext/lwip/src/include/ipv4/lwip/inet_chksum.h
new file mode 100644
index 000000000..79a2d90f2
--- /dev/null
+++ b/ext/lwip/src/include/ipv4/lwip/inet_chksum.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_INET_CHKSUM_H__
+#define __LWIP_INET_CHKSUM_H__
+
+#include "lwip/opt.h"
+
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+
+/** Swap the bytes in an u16_t: much like htons() for little-endian */
+#ifndef SWAP_BYTES_IN_WORD
+#if LWIP_PLATFORM_BYTESWAP && (BYTE_ORDER == LITTLE_ENDIAN)
+/* little endian and PLATFORM_BYTESWAP defined */
+#define SWAP_BYTES_IN_WORD(w) LWIP_PLATFORM_HTONS(w)
+#else /* LWIP_PLATFORM_BYTESWAP && (BYTE_ORDER == LITTLE_ENDIAN) */
+/* can't use htons on big endian (or PLATFORM_BYTESWAP not defined)... */
+#define SWAP_BYTES_IN_WORD(w) (((w) & 0xff) << 8) | (((w) & 0xff00) >> 8)
+#endif /* LWIP_PLATFORM_BYTESWAP && (BYTE_ORDER == LITTLE_ENDIAN)*/
+#endif /* SWAP_BYTES_IN_WORD */
+
+/** Split an u32_t in two u16_ts and add them up */
+#ifndef FOLD_U32T
+#define FOLD_U32T(u)          (((u) >> 16) + ((u) & 0x0000ffffUL))
+#endif
+
+#if LWIP_CHECKSUM_ON_COPY
+/** Function-like macro: same as MEMCPY but returns the checksum of copied data
+    as u16_t */
+#ifndef LWIP_CHKSUM_COPY
+#define LWIP_CHKSUM_COPY(dst, src, len) lwip_chksum_copy(dst, src, len)
+#ifndef LWIP_CHKSUM_COPY_ALGORITHM
+#define LWIP_CHKSUM_COPY_ALGORITHM 1
+#endif /* LWIP_CHKSUM_COPY_ALGORITHM */
+#endif /* LWIP_CHKSUM_COPY */
+#else /* LWIP_CHECKSUM_ON_COPY */
+#define LWIP_CHKSUM_COPY_ALGORITHM 0
+#endif /* LWIP_CHECKSUM_ON_COPY */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+u16_t inet_chksum(void *dataptr, u16_t len);
+u16_t inet_chksum_pbuf(struct pbuf *p);
+u16_t inet_chksum_pseudo(struct pbuf *p,
+       ip_addr_t *src, ip_addr_t *dest,
+       u8_t proto, u16_t proto_len);
+u16_t inet_chksum_pseudo_partial(struct pbuf *p,
+       ip_addr_t *src, ip_addr_t *dest,
+       u8_t proto, u16_t proto_len, u16_t chksum_len);
+#if LWIP_CHKSUM_COPY_ALGORITHM
+u16_t lwip_chksum_copy(void *dst, const void *src, u16_t len);
+#endif /* LWIP_CHKSUM_COPY_ALGORITHM */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_INET_H__ */
+
diff --git a/ext/lwip/src/include/ipv4/lwip/ip.h b/ext/lwip/src/include/ipv4/lwip/ip.h
new file mode 100644
index 000000000..00c83a0a1
--- /dev/null
+++ b/ext/lwip/src/include/ipv4/lwip/ip.h
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_IP_H__
+#define __LWIP_IP_H__
+
+#include "lwip/opt.h"
+
+#include "lwip/def.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+#include "lwip/err.h"
+#include "lwip/netif.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Currently, the function ip_output_if_opt() is only used with IGMP */
+#define IP_OPTIONS_SEND   LWIP_IGMP
+
+#define IP_HLEN 20
+
+#define IP_PROTO_ICMP    1
+#define IP_PROTO_IGMP    2
+#define IP_PROTO_UDP     17
+#define IP_PROTO_UDPLITE 136
+#define IP_PROTO_TCP     6
+
+/* This is passed as the destination address to ip_output_if (not
+   to ip_output), meaning that an IP header already is constructed
+   in the pbuf. This is used when TCP retransmits. */
+#ifdef IP_HDRINCL
+#undef IP_HDRINCL
+#endif /* IP_HDRINCL */
+#define IP_HDRINCL  NULL
+
+#if LWIP_NETIF_HWADDRHINT
+#define IP_PCB_ADDRHINT ;u8_t addr_hint
+#else
+#define IP_PCB_ADDRHINT
+#endif /* LWIP_NETIF_HWADDRHINT */
+
+/* This is the common part of all PCB types. It needs to be at the
+   beginning of a PCB type definition. It is located here so that
+   changes to this common part are made in one location instead of
+   having to change all PCB structs. */
+#define IP_PCB \
+  /* ip addresses in network byte order */ \
+  ip_addr_t local_ip; \
+  ip_addr_t remote_ip; \
+   /* Socket options */  \
+  u8_t so_options;      \
+   /* Type Of Service */ \
+  u8_t tos;              \
+  /* Time To Live */     \
+  u8_t ttl               \
+  /* link layer address resolution hint */ \
+  IP_PCB_ADDRHINT
+
+struct ip_pcb {
+/* Common members of all PCB types */
+  IP_PCB;
+};
+
+/*
+ * Option flags per-socket. These are the same like SO_XXX.
+ */
+/*#define SOF_DEBUG       0x01U     Unimplemented: turn on debugging info recording */
+#define SOF_ACCEPTCONN    0x02U  /* socket has had listen() */
+#define SOF_REUSEADDR     0x04U  /* allow local address reuse */
+#define SOF_KEEPALIVE     0x08U  /* keep connections alive */
+/*#define SOF_DONTROUTE   0x10U     Unimplemented: just use interface addresses */
+#define SOF_BROADCAST     0x20U  /* permit to send and to receive broadcast messages (see IP_SOF_BROADCAST option) */
+/*#define SOF_USELOOPBACK 0x40U     Unimplemented: bypass hardware when possible */
+#define SOF_LINGER        0x80U  /* linger on close if data present */
+/*#define SOF_OOBINLINE   0x0100U   Unimplemented: leave received OOB data in line */
+/*#define SOF_REUSEPORT   0x0200U   Unimplemented: allow local address & port reuse */
+
+/* These flags are inherited (e.g. from a listen-pcb to a connection-pcb): */
+#define SOF_INHERITED   (SOF_REUSEADDR|SOF_KEEPALIVE|SOF_LINGER/*|SOF_DEBUG|SOF_DONTROUTE|SOF_OOBINLINE*/)
+
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct ip_hdr {
+  /* version / header length */
+  PACK_STRUCT_FIELD(u8_t _v_hl);
+  /* type of service */
+  PACK_STRUCT_FIELD(u8_t _tos);
+  /* total length */
+  PACK_STRUCT_FIELD(u16_t _len);
+  /* identification */
+  PACK_STRUCT_FIELD(u16_t _id);
+  /* fragment offset field */
+  PACK_STRUCT_FIELD(u16_t _offset);
+#define IP_RF 0x8000U        /* reserved fragment flag */
+#define IP_DF 0x4000U        /* dont fragment flag */
+#define IP_MF 0x2000U        /* more fragments flag */
+#define IP_OFFMASK 0x1fffU   /* mask for fragmenting bits */
+  /* time to live */
+  PACK_STRUCT_FIELD(u8_t _ttl);
+  /* protocol*/
+  PACK_STRUCT_FIELD(u8_t _proto);
+  /* checksum */
+  PACK_STRUCT_FIELD(u16_t _chksum);
+  /* source and destination IP addresses */
+  PACK_STRUCT_FIELD(ip_addr_p_t src);
+  PACK_STRUCT_FIELD(ip_addr_p_t dest); 
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define IPH_V(hdr)  ((hdr)->_v_hl >> 4)
+#define IPH_HL(hdr) ((hdr)->_v_hl & 0x0f)
+#define IPH_TOS(hdr) ((hdr)->_tos)
+#define IPH_LEN(hdr) ((hdr)->_len)
+#define IPH_ID(hdr) ((hdr)->_id)
+#define IPH_OFFSET(hdr) ((hdr)->_offset)
+#define IPH_TTL(hdr) ((hdr)->_ttl)
+#define IPH_PROTO(hdr) ((hdr)->_proto)
+#define IPH_CHKSUM(hdr) ((hdr)->_chksum)
+
+#define IPH_VHL_SET(hdr, v, hl) (hdr)->_v_hl = (((v) << 4) | (hl))
+#define IPH_TOS_SET(hdr, tos) (hdr)->_tos = (tos)
+#define IPH_LEN_SET(hdr, len) (hdr)->_len = (len)
+#define IPH_ID_SET(hdr, id) (hdr)->_id = (id)
+#define IPH_OFFSET_SET(hdr, off) (hdr)->_offset = (off)
+#define IPH_TTL_SET(hdr, ttl) (hdr)->_ttl = (u8_t)(ttl)
+#define IPH_PROTO_SET(hdr, proto) (hdr)->_proto = (u8_t)(proto)
+#define IPH_CHKSUM_SET(hdr, chksum) (hdr)->_chksum = (chksum)
+
+/** The interface that provided the packet for the current callback invocation. */
+extern struct netif *current_netif;
+/** Header of the input packet currently being processed. */
+extern const struct ip_hdr *current_header;
+/** Source IP address of current_header */
+extern ip_addr_t current_iphdr_src;
+/** Destination IP address of current_header */
+extern ip_addr_t current_iphdr_dest;
+
+#define ip_init() /* Compatibility define, not init needed. */
+struct netif *ip_route(ip_addr_t *dest);
+err_t ip_input(struct pbuf *p, struct netif *inp);
+err_t ip_output(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto);
+err_t ip_output_if(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto,
+       struct netif *netif);
+#if LWIP_NETIF_HWADDRHINT
+err_t ip_output_hinted(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto, u8_t *addr_hint);
+#endif /* LWIP_NETIF_HWADDRHINT */
+#if IP_OPTIONS_SEND
+err_t ip_output_if_opt(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif, void *ip_options,
+       u16_t optlen);
+#endif /* IP_OPTIONS_SEND */
+/** Get the interface that received the current packet.
+ * This function must only be called from a receive callback (udp_recv,
+ * raw_recv, tcp_accept). It will return NULL otherwise. */
+#define ip_current_netif()  (current_netif)
+/** Get the IP header of the current packet.
+ * This function must only be called from a receive callback (udp_recv,
+ * raw_recv, tcp_accept). It will return NULL otherwise. */
+#define ip_current_header() (current_header)
+/** Source IP address of current_header */
+#define ip_current_src_addr()  (&current_iphdr_src)
+/** Destination IP address of current_header */
+#define ip_current_dest_addr() (&current_iphdr_dest)
+
+/** Gets an IP pcb option (SOF_* flags) */
+#define ip_get_option(pcb, opt)   ((pcb)->so_options & (opt))
+/** Sets an IP pcb option (SOF_* flags) */
+#define ip_set_option(pcb, opt)   ((pcb)->so_options |= (opt))
+/** Resets an IP pcb option (SOF_* flags) */
+#define ip_reset_option(pcb, opt) ((pcb)->so_options &= ~(opt))
+
+#if IP_DEBUG
+void ip_debug_print(struct pbuf *p);
+#else
+#define ip_debug_print(p)
+#endif /* IP_DEBUG */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_IP_H__ */
+
+
diff --git a/ext/lwip/src/include/ipv4/lwip/ip_addr.h b/ext/lwip/src/include/ipv4/lwip/ip_addr.h
new file mode 100644
index 000000000..77f84e02c
--- /dev/null
+++ b/ext/lwip/src/include/ipv4/lwip/ip_addr.h
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_IP_ADDR_H__
+#define __LWIP_IP_ADDR_H__
+
+#include "lwip/opt.h"
+#include "lwip/def.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is the aligned version of ip_addr_t,
+   used as local variable, on the stack, etc. */
+struct ip_addr {
+  u32_t addr;
+};
+
+/* This is the packed version of ip_addr_t,
+   used in network headers that are itself packed */
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct ip_addr_packed {
+  PACK_STRUCT_FIELD(u32_t addr);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+/** ip_addr_t uses a struct for convenience only, so that the same defines can
+ * operate both on ip_addr_t as well as on ip_addr_p_t. */
+typedef struct ip_addr ip_addr_t;
+typedef struct ip_addr_packed ip_addr_p_t;
+
+/*
+ * struct ipaddr2 is used in the definition of the ARP packet format in
+ * order to support compilers that don't have structure packing.
+ */
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct ip_addr2 {
+  PACK_STRUCT_FIELD(u16_t addrw[2]);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+/* Forward declaration to not include netif.h */
+struct netif;
+
+extern const ip_addr_t ip_addr_any;
+extern const ip_addr_t ip_addr_broadcast;
+
+/** IP_ADDR_ can be used as a fixed IP address
+ *  for the wildcard and the broadcast address
+ */
+#define IP_ADDR_ANY         ((ip_addr_t *)&ip_addr_any)
+#define IP_ADDR_BROADCAST   ((ip_addr_t *)&ip_addr_broadcast)
+
+/** 255.255.255.255 */
+#define IPADDR_NONE         ((u32_t)0xffffffffUL)
+/** 127.0.0.1 */
+#define IPADDR_LOOPBACK     ((u32_t)0x7f000001UL)
+/** 0.0.0.0 */
+#define IPADDR_ANY          ((u32_t)0x00000000UL)
+/** 255.255.255.255 */
+#define IPADDR_BROADCAST    ((u32_t)0xffffffffUL)
+
+/* Definitions of the bits in an Internet address integer.
+
+   On subnets, host and network parts are found according to
+   the subnet mask, not these masks.  */
+#define IP_CLASSA(a)        ((((u32_t)(a)) & 0x80000000UL) == 0)
+#define IP_CLASSA_NET       0xff000000
+#define IP_CLASSA_NSHIFT    24
+#define IP_CLASSA_HOST      (0xffffffff & ~IP_CLASSA_NET)
+#define IP_CLASSA_MAX       128
+
+#define IP_CLASSB(a)        ((((u32_t)(a)) & 0xc0000000UL) == 0x80000000UL)
+#define IP_CLASSB_NET       0xffff0000
+#define IP_CLASSB_NSHIFT    16
+#define IP_CLASSB_HOST      (0xffffffff & ~IP_CLASSB_NET)
+#define IP_CLASSB_MAX       65536
+
+#define IP_CLASSC(a)        ((((u32_t)(a)) & 0xe0000000UL) == 0xc0000000UL)
+#define IP_CLASSC_NET       0xffffff00
+#define IP_CLASSC_NSHIFT    8
+#define IP_CLASSC_HOST      (0xffffffff & ~IP_CLASSC_NET)
+
+#define IP_CLASSD(a)        (((u32_t)(a) & 0xf0000000UL) == 0xe0000000UL)
+#define IP_CLASSD_NET       0xf0000000          /* These ones aren't really */
+#define IP_CLASSD_NSHIFT    28                  /*   net and host fields, but */
+#define IP_CLASSD_HOST      0x0fffffff          /*   routing needn't know. */
+#define IP_MULTICAST(a)     IP_CLASSD(a)
+
+#define IP_EXPERIMENTAL(a)  (((u32_t)(a) & 0xf0000000UL) == 0xf0000000UL)
+#define IP_BADCLASS(a)      (((u32_t)(a) & 0xf0000000UL) == 0xf0000000UL)
+
+#define IP_LOOPBACKNET      127                 /* official! */
+
+
+#if BYTE_ORDER == BIG_ENDIAN
+/** Set an IP address given by the four byte-parts */
+#define IP4_ADDR(ipaddr, a,b,c,d) \
+        (ipaddr)->addr = ((u32_t)((a) & 0xff) << 24) | \
+                         ((u32_t)((b) & 0xff) << 16) | \
+                         ((u32_t)((c) & 0xff) << 8)  | \
+                          (u32_t)((d) & 0xff)
+#else
+/** Set an IP address given by the four byte-parts.
+    Little-endian version that prevents the use of htonl. */
+#define IP4_ADDR(ipaddr, a,b,c,d) \
+        (ipaddr)->addr = ((u32_t)((d) & 0xff) << 24) | \
+                         ((u32_t)((c) & 0xff) << 16) | \
+                         ((u32_t)((b) & 0xff) << 8)  | \
+                          (u32_t)((a) & 0xff)
+#endif
+
+/** MEMCPY-like copying of IP addresses where addresses are known to be
+ * 16-bit-aligned if the port is correctly configured (so a port could define
+ * this to copying 2 u16_t's) - no NULL-pointer-checking needed. */
+#ifndef IPADDR2_COPY
+#define IPADDR2_COPY(dest, src) SMEMCPY(dest, src, sizeof(ip_addr_t))
+#endif
+
+/** Copy IP address - faster than ip_addr_set: no NULL check */
+#define ip_addr_copy(dest, src) ((dest).addr = (src).addr)
+/** Safely copy one IP address to another (src may be NULL) */
+#define ip_addr_set(dest, src) ((dest)->addr = \
+                                    ((src) == NULL ? 0 : \
+                                    (src)->addr))
+/** Set complete address to zero */
+#define ip_addr_set_zero(ipaddr)      ((ipaddr)->addr = 0)
+/** Set address to IPADDR_ANY (no need for htonl()) */
+#define ip_addr_set_any(ipaddr)       ((ipaddr)->addr = IPADDR_ANY)
+/** Set address to loopback address */
+#define ip_addr_set_loopback(ipaddr)  ((ipaddr)->addr = PP_HTONL(IPADDR_LOOPBACK))
+/** Safely copy one IP address to another and change byte order
+ * from host- to network-order. */
+#define ip_addr_set_hton(dest, src) ((dest)->addr = \
+                               ((src) == NULL ? 0:\
+                               htonl((src)->addr)))
+/** IPv4 only: set the IP address given as an u32_t */
+#define ip4_addr_set_u32(dest_ipaddr, src_u32) ((dest_ipaddr)->addr = (src_u32))
+/** IPv4 only: get the IP address as an u32_t */
+#define ip4_addr_get_u32(src_ipaddr) ((src_ipaddr)->addr)
+
+/** Get the network address by combining host address with netmask */
+#define ip_addr_get_network(target, host, netmask) ((target)->addr = ((host)->addr) & ((netmask)->addr))
+
+/**
+ * Determine if two address are on the same network.
+ *
+ * @arg addr1 IP address 1
+ * @arg addr2 IP address 2
+ * @arg mask network identifier mask
+ * @return !0 if the network identifiers of both address match
+ */
+#define ip_addr_netcmp(addr1, addr2, mask) (((addr1)->addr & \
+                                              (mask)->addr) == \
+                                             ((addr2)->addr & \
+                                              (mask)->addr))
+#define ip_addr_cmp(addr1, addr2) ((addr1)->addr == (addr2)->addr)
+
+#define ip_addr_isany(addr1) ((addr1) == NULL || (addr1)->addr == IPADDR_ANY)
+
+#define ip_addr_isbroadcast(ipaddr, netif) ip4_addr_isbroadcast((ipaddr)->addr, (netif))
+u8_t ip4_addr_isbroadcast(u32_t addr, const struct netif *netif);
+
+#define ip_addr_netmask_valid(netmask) ip4_addr_netmask_valid((netmask)->addr)
+u8_t ip4_addr_netmask_valid(u32_t netmask);
+
+#define ip_addr_ismulticast(addr1) (((addr1)->addr & PP_HTONL(0xf0000000UL)) == PP_HTONL(0xe0000000UL))
+
+#define ip_addr_islinklocal(addr1) (((addr1)->addr & PP_HTONL(0xffff0000UL)) == PP_HTONL(0xa9fe0000UL))
+
+#define ip_addr_debug_print(debug, ipaddr) \
+  LWIP_DEBUGF(debug, ("%"U16_F".%"U16_F".%"U16_F".%"U16_F,             \
+                      ipaddr != NULL ? ip4_addr1_16(ipaddr) : 0,       \
+                      ipaddr != NULL ? ip4_addr2_16(ipaddr) : 0,       \
+                      ipaddr != NULL ? ip4_addr3_16(ipaddr) : 0,       \
+                      ipaddr != NULL ? ip4_addr4_16(ipaddr) : 0))
+
+/* Get one byte from the 4-byte address */
+#define ip4_addr1(ipaddr) (((u8_t*)(ipaddr))[0])
+#define ip4_addr2(ipaddr) (((u8_t*)(ipaddr))[1])
+#define ip4_addr3(ipaddr) (((u8_t*)(ipaddr))[2])
+#define ip4_addr4(ipaddr) (((u8_t*)(ipaddr))[3])
+/* These are cast to u16_t, with the intent that they are often arguments
+ * to printf using the U16_F format from cc.h. */
+#define ip4_addr1_16(ipaddr) ((u16_t)ip4_addr1(ipaddr))
+#define ip4_addr2_16(ipaddr) ((u16_t)ip4_addr2(ipaddr))
+#define ip4_addr3_16(ipaddr) ((u16_t)ip4_addr3(ipaddr))
+#define ip4_addr4_16(ipaddr) ((u16_t)ip4_addr4(ipaddr))
+
+/** For backwards compatibility */
+#define ip_ntoa(ipaddr)  ipaddr_ntoa(ipaddr)
+
+u32_t ipaddr_addr(const char *cp);
+int ipaddr_aton(const char *cp, ip_addr_t *addr);
+/** returns ptr to static buffer; not reentrant! */
+char *ipaddr_ntoa(const ip_addr_t *addr);
+char *ipaddr_ntoa_r(const ip_addr_t *addr, char *buf, int buflen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_IP_ADDR_H__ */
diff --git a/ext/lwip/src/include/ipv4/lwip/ip_frag.h b/ext/lwip/src/include/ipv4/lwip/ip_frag.h
new file mode 100644
index 000000000..77b5eb1ee
--- /dev/null
+++ b/ext/lwip/src/include/ipv4/lwip/ip_frag.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Jani Monoses <jani@iv.ro>
+ *
+ */
+
+#ifndef __LWIP_IP_FRAG_H__
+#define __LWIP_IP_FRAG_H__
+
+#include "lwip/opt.h"
+#include "lwip/err.h"
+#include "lwip/pbuf.h"
+#include "lwip/netif.h"
+#include "lwip/ip_addr.h"
+#include "lwip/ip.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if IP_REASSEMBLY
+/* The IP reassembly timer interval in milliseconds. */
+#define IP_TMR_INTERVAL 1000
+
+/* IP reassembly helper struct.
+ * This is exported because memp needs to know the size.
+ */
+struct ip_reassdata {
+  struct ip_reassdata *next;
+  struct pbuf *p;
+  struct ip_hdr iphdr;
+  u16_t datagram_len;
+  u8_t flags;
+  u8_t timer;
+};
+
+void ip_reass_init(void);
+void ip_reass_tmr(void);
+struct pbuf * ip_reass(struct pbuf *p);
+#endif /* IP_REASSEMBLY */
+
+#if IP_FRAG
+#if !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF
+/** A custom pbuf that holds a reference to another pbuf, which is freed
+ * when this custom pbuf is freed. This is used to create a custom PBUF_REF
+ * that points into the original pbuf. */
+struct pbuf_custom_ref {
+  /** 'base class' */
+  struct pbuf_custom pc;
+  /** pointer to the original pbuf that is referenced */
+  struct pbuf *original;
+};
+#endif /* !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF */
+
+err_t ip_frag(struct pbuf *p, struct netif *netif, ip_addr_t *dest);
+#endif /* IP_FRAG */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_IP_FRAG_H__ */
diff --git a/ext/lwip/src/include/ipv6/lwip/icmp.h b/ext/lwip/src/include/ipv6/lwip/icmp.h
new file mode 100644
index 000000000..87e9ffd96
--- /dev/null
+++ b/ext/lwip/src/include/ipv6/lwip/icmp.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_ICMP_H__
+#define __LWIP_ICMP_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_ICMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/pbuf.h"
+#include "lwip/netif.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ICMP6_DUR  1
+#define ICMP6_TE   3
+#define ICMP6_ECHO 128    /* echo */
+#define ICMP6_ER   129      /* echo reply */
+
+
+enum icmp_dur_type {
+  ICMP_DUR_NET = 0,    /* net unreachable */
+  ICMP_DUR_HOST = 1,   /* host unreachable */
+  ICMP_DUR_PROTO = 2,  /* protocol unreachable */
+  ICMP_DUR_PORT = 3,   /* port unreachable */
+  ICMP_DUR_FRAG = 4,   /* fragmentation needed and DF set */
+  ICMP_DUR_SR = 5      /* source route failed */
+};
+
+enum icmp_te_type {
+  ICMP_TE_TTL = 0,     /* time to live exceeded in transit */
+  ICMP_TE_FRAG = 1     /* fragment reassembly time exceeded */
+};
+
+void icmp_input(struct pbuf *p, struct netif *inp);
+
+void icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t);
+void icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t);
+
+struct icmp_echo_hdr {
+  u8_t type;
+  u8_t icode;
+  u16_t chksum;
+  u16_t id;
+  u16_t seqno;
+};
+
+struct icmp_dur_hdr {
+  u8_t type;
+  u8_t icode;
+  u16_t chksum;
+  u32_t unused;
+};
+
+struct icmp_te_hdr {
+  u8_t type;
+  u8_t icode;
+  u16_t chksum;
+  u32_t unused;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_ICMP */
+
+#endif /* __LWIP_ICMP_H__ */
+
diff --git a/ext/lwip/src/include/ipv6/lwip/inet.h b/ext/lwip/src/include/ipv6/lwip/inet.h
new file mode 100644
index 000000000..de1a0b636
--- /dev/null
+++ b/ext/lwip/src/include/ipv6/lwip/inet.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_INET_H__
+#define __LWIP_INET_H__
+
+#include "lwip/opt.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+u16_t inet_chksum(void *data, u16_t len);
+u16_t inet_chksum_pbuf(struct pbuf *p);
+u16_t inet_chksum_pseudo(struct pbuf *p,
+       struct ip_addr *src, struct ip_addr *dest,
+       u8_t proto, u32_t proto_len);
+
+u32_t inet_addr(const char *cp);
+s8_t inet_aton(const char *cp, struct in_addr *addr);
+
+#ifndef _MACHINE_ENDIAN_H_
+#ifndef _NETINET_IN_H
+#ifndef _LINUX_BYTEORDER_GENERIC_H
+u16_t htons(u16_t n);
+u16_t ntohs(u16_t n);
+u32_t htonl(u32_t n);
+u32_t ntohl(u32_t n);
+#endif /* _LINUX_BYTEORDER_GENERIC_H */
+#endif /* _NETINET_IN_H */
+#endif /* _MACHINE_ENDIAN_H_ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_INET_H__ */
+
diff --git a/ext/lwip/src/include/ipv6/lwip/ip.h b/ext/lwip/src/include/ipv6/lwip/ip.h
new file mode 100644
index 000000000..a01cfc65b
--- /dev/null
+++ b/ext/lwip/src/include/ipv6/lwip/ip.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_IP_H__
+#define __LWIP_IP_H__
+
+#include "lwip/opt.h"
+#include "lwip/def.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+
+#include "lwip/err.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IP_HLEN 40
+
+#define IP_PROTO_ICMP    58
+#define IP_PROTO_UDP     17
+#define IP_PROTO_UDPLITE 136
+#define IP_PROTO_TCP     6
+
+/* This is passed as the destination address to ip_output_if (not
+   to ip_output), meaning that an IP header already is constructed
+   in the pbuf. This is used when TCP retransmits. */
+#ifdef IP_HDRINCL
+#undef IP_HDRINCL
+#endif /* IP_HDRINCL */
+#define IP_HDRINCL  NULL
+
+#if LWIP_NETIF_HWADDRHINT
+#define IP_PCB_ADDRHINT ;u8_t addr_hint
+#else
+#define IP_PCB_ADDRHINT
+#endif /* LWIP_NETIF_HWADDRHINT */
+
+/* This is the common part of all PCB types. It needs to be at the
+   beginning of a PCB type definition. It is located here so that
+   changes to this common part are made in one location instead of
+   having to change all PCB structs. */
+#define IP_PCB struct ip_addr local_ip; \
+  struct ip_addr remote_ip; \
+   /* Socket options */  \
+  u16_t so_options;      \
+   /* Type Of Service */ \
+  u8_t tos;              \
+  /* Time To Live */     \
+  u8_t ttl;              \
+  /* link layer address resolution hint */ \
+  IP_PCB_ADDRHINT
+
+
+/* The IPv6 header. */
+struct ip_hdr {
+#if BYTE_ORDER == LITTLE_ENDIAN
+  u8_t tclass1:4, v:4;
+  u8_t flow1:4, tclass2:4;  
+#else
+  u8_t v:4, tclass1:4;
+  u8_t tclass2:8, flow1:4;
+#endif
+  u16_t flow2;
+  u16_t len;                /* payload length */
+  u8_t nexthdr;             /* next header */
+  u8_t hoplim;              /* hop limit (TTL) */
+  struct ip_addr src, dest;          /* source and destination IP addresses */
+};
+
+#define IPH_PROTO(hdr) (iphdr->nexthdr)
+
+void ip_init(void);
+
+#include "lwip/netif.h"
+
+struct netif *ip_route(struct ip_addr *dest);
+
+void ip_input(struct pbuf *p, struct netif *inp);
+
+/* source and destination addresses in network byte order, please */
+err_t ip_output(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
+         u8_t ttl, u8_t proto);
+
+err_t ip_output_if(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
+      u8_t ttl, u8_t proto,
+      struct netif *netif);
+
+#define ip_current_netif() NULL
+#define ip_current_header() NULL
+
+#if IP_DEBUG
+void ip_debug_print(struct pbuf *p);
+#endif /* IP_DEBUG */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_IP_H__ */
+
+
diff --git a/ext/lwip/src/include/ipv6/lwip/ip_addr.h b/ext/lwip/src/include/ipv6/lwip/ip_addr.h
new file mode 100644
index 000000000..b2d8ae566
--- /dev/null
+++ b/ext/lwip/src/include/ipv6/lwip/ip_addr.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_IP_ADDR_H__
+#define __LWIP_IP_ADDR_H__
+
+#include "lwip/opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IP_ADDR_ANY 0
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+ struct ip_addr {
+  PACK_STRUCT_FIELD(u32_t addr[4]);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+/*
+ * struct ipaddr2 is used in the definition of the ARP packet format in
+ * order to support compilers that don't have structure packing.
+ */
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct ip_addr2 {
+  PACK_STRUCT_FIELD(u16_t addrw[2]);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define IP6_ADDR(ipaddr, a,b,c,d,e,f,g,h) do { (ipaddr)->addr[0] = htonl((u32_t)((a & 0xffff) << 16) | (b & 0xffff)); \
+                                               (ipaddr)->addr[1] = htonl(((c & 0xffff) << 16) | (d & 0xffff)); \
+                                               (ipaddr)->addr[2] = htonl(((e & 0xffff) << 16) | (f & 0xffff)); \
+                                               (ipaddr)->addr[3] = htonl(((g & 0xffff) << 16) | (h & 0xffff)); } while(0)
+
+u8_t ip_addr_netcmp(struct ip_addr *addr1, struct ip_addr *addr2,
+        struct ip_addr *mask);
+u8_t ip_addr_cmp(struct ip_addr *addr1, struct ip_addr *addr2);
+void ip_addr_set(struct ip_addr *dest, struct ip_addr *src);
+u8_t ip_addr_isany(struct ip_addr *addr);
+
+#define ip_addr_debug_print(debug, ipaddr) \
+        LWIP_DEBUGF(debug, ("%"X32_F":%"X32_F":%"X32_F":%"X32_F":%"X32_F":%"X32_F":%"X32_F":%"X32_F"\n", \
+         (ntohl(ipaddr->addr[0]) >> 16) & 0xffff, \
+         ntohl(ipaddr->addr[0]) & 0xffff, \
+         (ntohl(ipaddr->addr[1]) >> 16) & 0xffff, \
+         ntohl(ipaddr->addr[1]) & 0xffff, \
+         (ntohl(ipaddr->addr[2]) >> 16) & 0xffff, \
+         ntohl(ipaddr->addr[2]) & 0xffff, \
+         (ntohl(ipaddr->addr[3]) >> 16) & 0xffff, \
+         ntohl(ipaddr->addr[3]) & 0xffff));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_IP_ADDR_H__ */
diff --git a/ext/lwip/src/include/lwip/api.h b/ext/lwip/src/include/lwip/api.h
new file mode 100644
index 000000000..7a9fa9366
--- /dev/null
+++ b/ext/lwip/src/include/lwip/api.h
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_API_H__
+#define __LWIP_API_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_NETCONN /* don't build if not configured for use in lwipopts.h */
+
+#include <stddef.h> /* for size_t */
+
+#include "lwip/netbuf.h"
+#include "lwip/sys.h"
+#include "lwip/ip_addr.h"
+#include "lwip/err.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Throughout this file, IP addresses and port numbers are expected to be in
+ * the same byte order as in the corresponding pcb.
+ */
+
+/* Flags for netconn_write (u8_t) */
+#define NETCONN_NOFLAG    0x00
+#define NETCONN_NOCOPY    0x00 /* Only for source code compatibility */
+#define NETCONN_COPY      0x01
+#define NETCONN_MORE      0x02
+#define NETCONN_DONTBLOCK 0x04
+
+/* Flags for struct netconn.flags (u8_t) */
+/** TCP: when data passed to netconn_write doesn't fit into the send buffer,
+    this temporarily stores whether to wake up the original application task
+    if data couldn't be sent in the first try. */
+#define NETCONN_FLAG_WRITE_DELAYED            0x01
+/** Should this netconn avoid blocking? */
+#define NETCONN_FLAG_NON_BLOCKING             0x02
+/** Was the last connect action a non-blocking one? */
+#define NETCONN_FLAG_IN_NONBLOCKING_CONNECT   0x04
+/** If this is set, a TCP netconn must call netconn_recved() to update
+    the TCP receive window (done automatically if not set). */
+#define NETCONN_FLAG_NO_AUTO_RECVED           0x08
+/** If a nonblocking write has been rejected before, poll_tcp needs to
+    check if the netconn is writable again */
+#define NETCONN_FLAG_CHECK_WRITESPACE         0x10
+
+
+/* Helpers to process several netconn_types by the same code */
+#define NETCONNTYPE_GROUP(t)    (t&0xF0)
+#define NETCONNTYPE_DATAGRAM(t) (t&0xE0)
+
+/** Protocol family and type of the netconn */
+enum netconn_type {
+  NETCONN_INVALID    = 0,
+  /* NETCONN_TCP Group */
+  NETCONN_TCP        = 0x10,
+  /* NETCONN_UDP Group */
+  NETCONN_UDP        = 0x20,
+  NETCONN_UDPLITE    = 0x21,
+  NETCONN_UDPNOCHKSUM= 0x22,
+  /* NETCONN_RAW Group */
+  NETCONN_RAW        = 0x40
+};
+
+/** Current state of the netconn. Non-TCP netconns are always
+ * in state NETCONN_NONE! */
+enum netconn_state {
+  NETCONN_NONE,
+  NETCONN_WRITE,
+  NETCONN_LISTEN,
+  NETCONN_CONNECT,
+  NETCONN_CLOSE
+};
+
+/** Use to inform the callback function about changes */
+enum netconn_evt {
+  NETCONN_EVT_RCVPLUS,
+  NETCONN_EVT_RCVMINUS,
+  NETCONN_EVT_SENDPLUS,
+  NETCONN_EVT_SENDMINUS,
+  NETCONN_EVT_ERROR
+};
+
+#if LWIP_IGMP
+/** Used for netconn_join_leave_group() */
+enum netconn_igmp {
+  NETCONN_JOIN,
+  NETCONN_LEAVE
+};
+#endif /* LWIP_IGMP */
+
+/* forward-declare some structs to avoid to include their headers */
+struct ip_pcb;
+struct tcp_pcb;
+struct udp_pcb;
+struct raw_pcb;
+struct netconn;
+struct api_msg_msg;
+
+/** A callback prototype to inform about events for a netconn */
+typedef void (* netconn_callback)(struct netconn *, enum netconn_evt, u16_t len);
+
+/** A netconn descriptor */
+struct netconn {
+  /** type of the netconn (TCP, UDP or RAW) */
+  enum netconn_type type;
+  /** current state of the netconn */
+  enum netconn_state state;
+  /** the lwIP internal protocol control block */
+  union {
+    struct ip_pcb  *ip;
+    struct tcp_pcb *tcp;
+    struct udp_pcb *udp;
+    struct raw_pcb *raw;
+  } pcb;
+  /** the last error this netconn had */
+  err_t last_err;
+  /** sem that is used to synchroneously execute functions in the core context */
+  sys_sem_t op_completed;
+  /** mbox where received packets are stored until they are fetched
+      by the netconn application thread (can grow quite big) */
+  sys_mbox_t recvmbox;
+#if LWIP_TCP
+  /** mbox where new connections are stored until processed
+      by the application thread */
+  sys_mbox_t acceptmbox;
+#endif /* LWIP_TCP */
+  /** only used for socket layer */
+#if LWIP_SOCKET
+  int socket;
+#endif /* LWIP_SOCKET */
+#if LWIP_SO_SNDTIMEO
+  /** timeout to wait for sending data (which means enqueueing data for sending
+      in internal buffers) */
+  s32_t send_timeout;
+#endif /* LWIP_SO_RCVTIMEO */
+#if LWIP_SO_RCVTIMEO
+  /** timeout to wait for new data to be received
+      (or connections to arrive for listening netconns) */
+  int recv_timeout;
+#endif /* LWIP_SO_RCVTIMEO */
+#if LWIP_SO_RCVBUF
+  /** maximum amount of bytes queued in recvmbox
+      not used for TCP: adjust TCP_WND instead! */
+  int recv_bufsize;
+  /** number of bytes currently in recvmbox to be received,
+      tested against recv_bufsize to limit bytes on recvmbox
+      for UDP and RAW, used for FIONREAD */
+  s16_t recv_avail;
+#endif /* LWIP_SO_RCVBUF */
+  /** flags holding more netconn-internal state, see NETCONN_FLAG_* defines */
+  u8_t flags;
+#if LWIP_TCP
+  /** TCP: when data passed to netconn_write doesn't fit into the send buffer,
+      this temporarily stores how much is already sent. */
+  size_t write_offset;
+  /** TCP: when data passed to netconn_write doesn't fit into the send buffer,
+      this temporarily stores the message.
+      Also used during connect and close. */
+  struct api_msg_msg *current_msg;
+#endif /* LWIP_TCP */
+  /** A callback function that is informed about events for this netconn */
+  netconn_callback callback;
+};
+
+/** Register an Network connection event */
+#define API_EVENT(c,e,l) if (c->callback) {         \
+                           (*c->callback)(c, e, l); \
+                         }
+
+/** Set conn->last_err to err but don't overwrite fatal errors */
+#define NETCONN_SET_SAFE_ERR(conn, err) do { \
+  SYS_ARCH_DECL_PROTECT(lev); \
+  SYS_ARCH_PROTECT(lev); \
+  if (!ERR_IS_FATAL((conn)->last_err)) { \
+    (conn)->last_err = err; \
+  } \
+  SYS_ARCH_UNPROTECT(lev); \
+} while(0);
+
+/* Network connection functions: */
+#define netconn_new(t)                  netconn_new_with_proto_and_callback(t, 0, NULL)
+#define netconn_new_with_callback(t, c) netconn_new_with_proto_and_callback(t, 0, c)
+struct
+netconn *netconn_new_with_proto_and_callback(enum netconn_type t, u8_t proto,
+                                             netconn_callback callback);
+err_t   netconn_delete(struct netconn *conn);
+/** Get the type of a netconn (as enum netconn_type). */
+#define netconn_type(conn) (conn->type)
+
+err_t   netconn_getaddr(struct netconn *conn, ip_addr_t *addr,
+                        u16_t *port, u8_t local);
+#define netconn_peer(c,i,p) netconn_getaddr(c,i,p,0)
+#define netconn_addr(c,i,p) netconn_getaddr(c,i,p,1)
+
+err_t   netconn_bind(struct netconn *conn, ip_addr_t *addr, u16_t port);
+err_t   netconn_connect(struct netconn *conn, ip_addr_t *addr, u16_t port);
+err_t   netconn_disconnect (struct netconn *conn);
+err_t   netconn_listen_with_backlog(struct netconn *conn, u8_t backlog);
+#define netconn_listen(conn) netconn_listen_with_backlog(conn, TCP_DEFAULT_LISTEN_BACKLOG)
+err_t   netconn_accept(struct netconn *conn, struct netconn **new_conn);
+err_t   netconn_recv(struct netconn *conn, struct netbuf **new_buf);
+err_t   netconn_recv_tcp_pbuf(struct netconn *conn, struct pbuf **new_buf);
+void    netconn_recved(struct netconn *conn, u32_t length);
+err_t   netconn_sendto(struct netconn *conn, struct netbuf *buf,
+                       ip_addr_t *addr, u16_t port);
+err_t   netconn_send(struct netconn *conn, struct netbuf *buf);
+err_t   netconn_write_partly(struct netconn *conn, const void *dataptr, size_t size,
+                             u8_t apiflags, size_t *bytes_written);
+#define netconn_write(conn, dataptr, size, apiflags) \
+          netconn_write_partly(conn, dataptr, size, apiflags, NULL)
+err_t   netconn_close(struct netconn *conn);
+err_t   netconn_shutdown(struct netconn *conn, u8_t shut_rx, u8_t shut_tx);
+
+#if LWIP_IGMP
+err_t   netconn_join_leave_group(struct netconn *conn, ip_addr_t *multiaddr,
+                                 ip_addr_t *netif_addr, enum netconn_igmp join_or_leave);
+#endif /* LWIP_IGMP */
+#if LWIP_DNS
+err_t   netconn_gethostbyname(const char *name, ip_addr_t *addr);
+#endif /* LWIP_DNS */
+
+#define netconn_err(conn)               ((conn)->last_err)
+#define netconn_recv_bufsize(conn)      ((conn)->recv_bufsize)
+
+/** Set the blocking status of netconn calls (@todo: write/send is missing) */
+#define netconn_set_nonblocking(conn, val)  do { if(val) { \
+  (conn)->flags |= NETCONN_FLAG_NON_BLOCKING; \
+} else { \
+  (conn)->flags &= ~ NETCONN_FLAG_NON_BLOCKING; }} while(0)
+/** Get the blocking status of netconn calls (@todo: write/send is missing) */
+#define netconn_is_nonblocking(conn)        (((conn)->flags & NETCONN_FLAG_NON_BLOCKING) != 0)
+
+/** TCP: Set the no-auto-recved status of netconn calls (see NETCONN_FLAG_NO_AUTO_RECVED) */
+#define netconn_set_noautorecved(conn, val)  do { if(val) { \
+  (conn)->flags |= NETCONN_FLAG_NO_AUTO_RECVED; \
+} else { \
+  (conn)->flags &= ~ NETCONN_FLAG_NO_AUTO_RECVED; }} while(0)
+/** TCP: Get the no-auto-recved status of netconn calls (see NETCONN_FLAG_NO_AUTO_RECVED) */
+#define netconn_get_noautorecved(conn)        (((conn)->flags & NETCONN_FLAG_NO_AUTO_RECVED) != 0)
+
+#if LWIP_SO_SNDTIMEO
+/** Set the send timeout in milliseconds */
+#define netconn_set_sendtimeout(conn, timeout)      ((conn)->send_timeout = (timeout))
+/** Get the send timeout in milliseconds */
+#define netconn_get_sendtimeout(conn)               ((conn)->send_timeout)
+#endif /* LWIP_SO_SNDTIMEO */
+#if LWIP_SO_RCVTIMEO
+/** Set the receive timeout in milliseconds */
+#define netconn_set_recvtimeout(conn, timeout)      ((conn)->recv_timeout = (timeout))
+/** Get the receive timeout in milliseconds */
+#define netconn_get_recvtimeout(conn)               ((conn)->recv_timeout)
+#endif /* LWIP_SO_RCVTIMEO */
+#if LWIP_SO_RCVBUF
+/** Set the receive buffer in bytes */
+#define netconn_set_recvbufsize(conn, recvbufsize)  ((conn)->recv_bufsize = (recvbufsize))
+/** Get the receive buffer in bytes */
+#define netconn_get_recvbufsize(conn)               ((conn)->recv_bufsize)
+#endif /* LWIP_SO_RCVBUF*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_NETCONN */
+
+#endif /* __LWIP_API_H__ */
diff --git a/ext/lwip/src/include/lwip/api_msg.h b/ext/lwip/src/include/lwip/api_msg.h
new file mode 100644
index 000000000..f9e1c7d29
--- /dev/null
+++ b/ext/lwip/src/include/lwip/api_msg.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_API_MSG_H__
+#define __LWIP_API_MSG_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_NETCONN /* don't build if not configured for use in lwipopts.h */
+
+#include <stddef.h> /* for size_t */
+
+#include "lwip/ip_addr.h"
+#include "lwip/err.h"
+#include "lwip/sys.h"
+#include "lwip/igmp.h"
+#include "lwip/api.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For the netconn API, these values are use as a bitmask! */
+#define NETCONN_SHUT_RD   1
+#define NETCONN_SHUT_WR   2
+#define NETCONN_SHUT_RDWR (NETCONN_SHUT_RD | NETCONN_SHUT_WR)
+
+/* IP addresses and port numbers are expected to be in
+ * the same byte order as in the corresponding pcb.
+ */
+/** This struct includes everything that is necessary to execute a function
+    for a netconn in another thread context (mainly used to process netconns
+    in the tcpip_thread context to be thread safe). */
+struct api_msg_msg {
+  /** The netconn which to process - always needed: it includes the semaphore
+      which is used to block the application thread until the function finished. */
+  struct netconn *conn;
+  /** The return value of the function executed in tcpip_thread. */
+  err_t err;
+  /** Depending on the executed function, one of these union members is used */
+  union {
+    /** used for do_send */
+    struct netbuf *b;
+    /** used for do_newconn */
+    struct {
+      u8_t proto;
+    } n;
+    /** used for do_bind and do_connect */
+    struct {
+      ip_addr_t *ipaddr;
+      u16_t port;
+    } bc;
+    /** used for do_getaddr */
+    struct {
+      ip_addr_t *ipaddr;
+      u16_t *port;
+      u8_t local;
+    } ad;
+    /** used for do_write */
+    struct {
+      const void *dataptr;
+      size_t len;
+      u8_t apiflags;
+#if LWIP_SO_SNDTIMEO
+      u32_t time_started;
+#endif /* LWIP_SO_SNDTIMEO */
+    } w;
+    /** used for do_recv */
+    struct {
+      u32_t len;
+    } r;
+    /** used for do_close (/shutdown) */
+    struct {
+      u8_t shut;
+    } sd;
+#if LWIP_IGMP
+    /** used for do_join_leave_group */
+    struct {
+      ip_addr_t *multiaddr;
+      ip_addr_t *netif_addr;
+      enum netconn_igmp join_or_leave;
+    } jl;
+#endif /* LWIP_IGMP */
+#if TCP_LISTEN_BACKLOG
+    struct {
+      u8_t backlog;
+    } lb;
+#endif /* TCP_LISTEN_BACKLOG */
+  } msg;
+};
+
+/** This struct contains a function to execute in another thread context and
+    a struct api_msg_msg that serves as an argument for this function.
+    This is passed to tcpip_apimsg to execute functions in tcpip_thread context. */
+struct api_msg {
+  /** function to execute in tcpip_thread context */
+  void (* function)(struct api_msg_msg *msg);
+  /** arguments for this function */
+  struct api_msg_msg msg;
+};
+
+#if LWIP_DNS
+/** As do_gethostbyname requires more arguments but doesn't require a netconn,
+    it has its own struct (to avoid struct api_msg getting bigger than necessary).
+    do_gethostbyname must be called using tcpip_callback instead of tcpip_apimsg
+    (see netconn_gethostbyname). */
+struct dns_api_msg {
+  /** Hostname to query or dotted IP address string */
+  const char *name;
+  /** Rhe resolved address is stored here */
+  ip_addr_t *addr;
+  /** This semaphore is posted when the name is resolved, the application thread
+      should wait on it. */
+  sys_sem_t *sem;
+  /** Errors are given back here */
+  err_t *err;
+};
+#endif /* LWIP_DNS */
+
+void do_newconn         ( struct api_msg_msg *msg);
+void do_delconn         ( struct api_msg_msg *msg);
+void do_bind            ( struct api_msg_msg *msg);
+void do_connect         ( struct api_msg_msg *msg);
+void do_disconnect      ( struct api_msg_msg *msg);
+void do_listen          ( struct api_msg_msg *msg);
+void do_send            ( struct api_msg_msg *msg);
+void do_recv            ( struct api_msg_msg *msg);
+void do_write           ( struct api_msg_msg *msg);
+void do_getaddr         ( struct api_msg_msg *msg);
+void do_close           ( struct api_msg_msg *msg);
+void do_shutdown        ( struct api_msg_msg *msg);
+#if LWIP_IGMP
+void do_join_leave_group( struct api_msg_msg *msg);
+#endif /* LWIP_IGMP */
+
+#if LWIP_DNS
+void do_gethostbyname(void *arg);
+#endif /* LWIP_DNS */
+
+struct netconn* netconn_alloc(enum netconn_type t, netconn_callback callback);
+void netconn_free(struct netconn *conn);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_NETCONN */
+
+#endif /* __LWIP_API_MSG_H__ */
diff --git a/ext/lwip/src/include/lwip/arch.h b/ext/lwip/src/include/lwip/arch.h
new file mode 100644
index 000000000..4d6df773f
--- /dev/null
+++ b/ext/lwip/src/include/lwip/arch.h
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_ARCH_H__
+#define __LWIP_ARCH_H__
+
+#ifndef LITTLE_ENDIAN
+#define LITTLE_ENDIAN 1234
+#endif
+
+#ifndef BIG_ENDIAN
+#define BIG_ENDIAN 4321
+#endif
+
+#include "arch/cc.h"
+
+/** Temporary: define format string for size_t if not defined in cc.h */
+#ifndef SZT_F
+#define SZT_F U32_F
+#endif /* SZT_F */
+/** Temporary upgrade helper: define format string for u8_t as hex if not
+    defined in cc.h */
+#ifndef X8_F
+#define X8_F  "02x"
+#endif /* X8_F */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef PACK_STRUCT_BEGIN
+#define PACK_STRUCT_BEGIN
+#endif /* PACK_STRUCT_BEGIN */
+
+#ifndef PACK_STRUCT_END
+#define PACK_STRUCT_END
+#endif /* PACK_STRUCT_END */
+
+#ifndef PACK_STRUCT_FIELD
+#define PACK_STRUCT_FIELD(x) x
+#endif /* PACK_STRUCT_FIELD */
+
+
+#ifndef LWIP_UNUSED_ARG
+#define LWIP_UNUSED_ARG(x) (void)x
+#endif /* LWIP_UNUSED_ARG */ 
+
+
+#ifdef LWIP_PROVIDE_ERRNO
+
+#define  EPERM         1  /* Operation not permitted */
+#define  ENOENT        2  /* No such file or directory */
+#define  ESRCH         3  /* No such process */
+#define  EINTR         4  /* Interrupted system call */
+#define  EIO           5  /* I/O error */
+#define  ENXIO         6  /* No such device or address */
+#define  E2BIG         7  /* Arg list too long */
+#define  ENOEXEC       8  /* Exec format error */
+#define  EBADF         9  /* Bad file number */
+#define  ECHILD       10  /* No child processes */
+#define  EAGAIN       11  /* Try again */
+#define  ENOMEM       12  /* Out of memory */
+#define  EACCES       13  /* Permission denied */
+#define  EFAULT       14  /* Bad address */
+#define  ENOTBLK      15  /* Block device required */
+#define  EBUSY        16  /* Device or resource busy */
+#define  EEXIST       17  /* File exists */
+#define  EXDEV        18  /* Cross-device link */
+#define  ENODEV       19  /* No such device */
+#define  ENOTDIR      20  /* Not a directory */
+#define  EISDIR       21  /* Is a directory */
+#define  EINVAL       22  /* Invalid argument */
+#define  ENFILE       23  /* File table overflow */
+#define  EMFILE       24  /* Too many open files */
+#define  ENOTTY       25  /* Not a typewriter */
+#define  ETXTBSY      26  /* Text file busy */
+#define  EFBIG        27  /* File too large */
+#define  ENOSPC       28  /* No space left on device */
+#define  ESPIPE       29  /* Illegal seek */
+#define  EROFS        30  /* Read-only file system */
+#define  EMLINK       31  /* Too many links */
+#define  EPIPE        32  /* Broken pipe */
+#define  EDOM         33  /* Math argument out of domain of func */
+#define  ERANGE       34  /* Math result not representable */
+#define  EDEADLK      35  /* Resource deadlock would occur */
+#define  ENAMETOOLONG 36  /* File name too long */
+#define  ENOLCK       37  /* No record locks available */
+#define  ENOSYS       38  /* Function not implemented */
+#define  ENOTEMPTY    39  /* Directory not empty */
+#define  ELOOP        40  /* Too many symbolic links encountered */
+#define  EWOULDBLOCK  EAGAIN  /* Operation would block */
+#define  ENOMSG       42  /* No message of desired type */
+#define  EIDRM        43  /* Identifier removed */
+#define  ECHRNG       44  /* Channel number out of range */
+#define  EL2NSYNC     45  /* Level 2 not synchronized */
+#define  EL3HLT       46  /* Level 3 halted */
+#define  EL3RST       47  /* Level 3 reset */
+#define  ELNRNG       48  /* Link number out of range */
+#define  EUNATCH      49  /* Protocol driver not attached */
+#define  ENOCSI       50  /* No CSI structure available */
+#define  EL2HLT       51  /* Level 2 halted */
+#define  EBADE        52  /* Invalid exchange */
+#define  EBADR        53  /* Invalid request descriptor */
+#define  EXFULL       54  /* Exchange full */
+#define  ENOANO       55  /* No anode */
+#define  EBADRQC      56  /* Invalid request code */
+#define  EBADSLT      57  /* Invalid slot */
+
+#define  EDEADLOCK    EDEADLK
+
+#define  EBFONT       59  /* Bad font file format */
+#define  ENOSTR       60  /* Device not a stream */
+#define  ENODATA      61  /* No data available */
+#define  ETIME        62  /* Timer expired */
+#define  ENOSR        63  /* Out of streams resources */
+#define  ENONET       64  /* Machine is not on the network */
+#define  ENOPKG       65  /* Package not installed */
+#define  EREMOTE      66  /* Object is remote */
+#define  ENOLINK      67  /* Link has been severed */
+#define  EADV         68  /* Advertise error */
+#define  ESRMNT       69  /* Srmount error */
+#define  ECOMM        70  /* Communication error on send */
+#define  EPROTO       71  /* Protocol error */
+#define  EMULTIHOP    72  /* Multihop attempted */
+#define  EDOTDOT      73  /* RFS specific error */
+#define  EBADMSG      74  /* Not a data message */
+#define  EOVERFLOW    75  /* Value too large for defined data type */
+#define  ENOTUNIQ     76  /* Name not unique on network */
+#define  EBADFD       77  /* File descriptor in bad state */
+#define  EREMCHG      78  /* Remote address changed */
+#define  ELIBACC      79  /* Can not access a needed shared library */
+#define  ELIBBAD      80  /* Accessing a corrupted shared library */
+#define  ELIBSCN      81  /* .lib section in a.out corrupted */
+#define  ELIBMAX      82  /* Attempting to link in too many shared libraries */
+#define  ELIBEXEC     83  /* Cannot exec a shared library directly */
+#define  EILSEQ       84  /* Illegal byte sequence */
+#define  ERESTART     85  /* Interrupted system call should be restarted */
+#define  ESTRPIPE     86  /* Streams pipe error */
+#define  EUSERS       87  /* Too many users */
+#define  ENOTSOCK     88  /* Socket operation on non-socket */
+#define  EDESTADDRREQ 89  /* Destination address required */
+#define  EMSGSIZE     90  /* Message too long */
+#define  EPROTOTYPE   91  /* Protocol wrong type for socket */
+#define  ENOPROTOOPT  92  /* Protocol not available */
+#define  EPROTONOSUPPORT 93  /* Protocol not supported */
+#define  ESOCKTNOSUPPORT 94  /* Socket type not supported */
+#define  EOPNOTSUPP      95  /* Operation not supported on transport endpoint */
+#define  EPFNOSUPPORT    96  /* Protocol family not supported */
+#define  EAFNOSUPPORT    97  /* Address family not supported by protocol */
+#define  EADDRINUSE      98  /* Address already in use */
+#define  EADDRNOTAVAIL   99  /* Cannot assign requested address */
+#define  ENETDOWN       100  /* Network is down */
+#define  ENETUNREACH    101  /* Network is unreachable */
+#define  ENETRESET      102  /* Network dropped connection because of reset */
+#define  ECONNABORTED   103  /* Software caused connection abort */
+#define  ECONNRESET     104  /* Connection reset by peer */
+#define  ENOBUFS        105  /* No buffer space available */
+#define  EISCONN        106  /* Transport endpoint is already connected */
+#define  ENOTCONN       107  /* Transport endpoint is not connected */
+#define  ESHUTDOWN      108  /* Cannot send after transport endpoint shutdown */
+#define  ETOOMANYREFS   109  /* Too many references: cannot splice */
+#define  ETIMEDOUT      110  /* Connection timed out */
+#define  ECONNREFUSED   111  /* Connection refused */
+#define  EHOSTDOWN      112  /* Host is down */
+#define  EHOSTUNREACH   113  /* No route to host */
+#define  EALREADY       114  /* Operation already in progress */
+#define  EINPROGRESS    115  /* Operation now in progress */
+#define  ESTALE         116  /* Stale NFS file handle */
+#define  EUCLEAN        117  /* Structure needs cleaning */
+#define  ENOTNAM        118  /* Not a XENIX named type file */
+#define  ENAVAIL        119  /* No XENIX semaphores available */
+#define  EISNAM         120  /* Is a named type file */
+#define  EREMOTEIO      121  /* Remote I/O error */
+#define  EDQUOT         122  /* Quota exceeded */
+
+#define  ENOMEDIUM      123  /* No medium found */
+#define  EMEDIUMTYPE    124  /* Wrong medium type */
+
+#ifndef errno
+extern int errno;
+#endif
+
+#endif /* LWIP_PROVIDE_ERRNO */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_ARCH_H__ */
diff --git a/ext/lwip/src/include/lwip/debug.h b/ext/lwip/src/include/lwip/debug.h
new file mode 100644
index 000000000..0fe041396
--- /dev/null
+++ b/ext/lwip/src/include/lwip/debug.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_DEBUG_H__
+#define __LWIP_DEBUG_H__
+
+#include "lwip/arch.h"
+#include "lwip/opt.h"
+
+/** lower two bits indicate debug level
+ * - 0 all
+ * - 1 warning
+ * - 2 serious
+ * - 3 severe
+ */
+#define LWIP_DBG_LEVEL_ALL     0x00
+#define LWIP_DBG_LEVEL_OFF     LWIP_DBG_LEVEL_ALL /* compatibility define only */
+#define LWIP_DBG_LEVEL_WARNING 0x01 /* bad checksums, dropped packets, ... */
+#define LWIP_DBG_LEVEL_SERIOUS 0x02 /* memory allocation failures, ... */
+#define LWIP_DBG_LEVEL_SEVERE  0x03
+#define LWIP_DBG_MASK_LEVEL    0x03
+
+/** flag for LWIP_DEBUGF to enable that debug message */
+#define LWIP_DBG_ON            0x80U
+/** flag for LWIP_DEBUGF to disable that debug message */
+#define LWIP_DBG_OFF           0x00U
+
+/** flag for LWIP_DEBUGF indicating a tracing message (to follow program flow) */
+#define LWIP_DBG_TRACE         0x40U
+/** flag for LWIP_DEBUGF indicating a state debug message (to follow module states) */
+#define LWIP_DBG_STATE         0x20U
+/** flag for LWIP_DEBUGF indicating newly added code, not thoroughly tested yet */
+#define LWIP_DBG_FRESH         0x10U
+/** flag for LWIP_DEBUGF to halt after printing this debug message */
+#define LWIP_DBG_HALT          0x08U
+
+#ifndef LWIP_NOASSERT
+#define LWIP_ASSERT(message, assertion) do { if(!(assertion)) \
+  LWIP_PLATFORM_ASSERT(message); } while(0)
+#else  /* LWIP_NOASSERT */
+#define LWIP_ASSERT(message, assertion) 
+#endif /* LWIP_NOASSERT */
+
+/** if "expression" isn't true, then print "message" and execute "handler" expression */
+#ifndef LWIP_ERROR
+#define LWIP_ERROR(message, expression, handler) do { if (!(expression)) { \
+  LWIP_PLATFORM_ASSERT(message); handler;}} while(0)
+#endif /* LWIP_ERROR */
+
+#ifdef LWIP_DEBUG
+/** print debug message only if debug message type is enabled...
+ *  AND is of correct type AND is at least LWIP_DBG_LEVEL
+ */
+#define LWIP_DEBUGF(debug, message) do { \
+                               if ( \
+                                   ((debug) & LWIP_DBG_ON) && \
+                                   ((debug) & LWIP_DBG_TYPES_ON) && \
+                                   ((s16_t)((debug) & LWIP_DBG_MASK_LEVEL) >= LWIP_DBG_MIN_LEVEL)) { \
+                                 LWIP_PLATFORM_DIAG(message); \
+                                 if ((debug) & LWIP_DBG_HALT) { \
+                                   while(1); \
+                                 } \
+                               } \
+                             } while(0)
+
+#else  /* LWIP_DEBUG */
+#define LWIP_DEBUGF(debug, message) 
+#endif /* LWIP_DEBUG */
+
+#endif /* __LWIP_DEBUG_H__ */
+
diff --git a/ext/lwip/src/include/lwip/def.h b/ext/lwip/src/include/lwip/def.h
new file mode 100644
index 000000000..73a1b560b
--- /dev/null
+++ b/ext/lwip/src/include/lwip/def.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_DEF_H__
+#define __LWIP_DEF_H__
+
+/* arch.h might define NULL already */
+#include "lwip/arch.h"
+#include "lwip/opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define LWIP_MAX(x , y)  (((x) > (y)) ? (x) : (y))
+#define LWIP_MIN(x , y)  (((x) < (y)) ? (x) : (y))
+
+#ifndef NULL
+#define NULL ((void *)0)
+#endif
+
+/* Endianess-optimized shifting of two u8_t to create one u16_t */
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define LWIP_MAKE_U16(a, b) ((a << 8) | b)
+#else
+#define LWIP_MAKE_U16(a, b) ((b << 8) | a)
+#endif 
+
+#ifndef LWIP_PLATFORM_BYTESWAP
+#define LWIP_PLATFORM_BYTESWAP 0
+#endif
+
+#ifndef LWIP_PREFIX_BYTEORDER_FUNCS
+/* workaround for naming collisions on some platforms */
+
+#ifdef htons
+#undef htons
+#endif /* htons */
+#ifdef htonl
+#undef htonl
+#endif /* htonl */
+#ifdef ntohs
+#undef ntohs
+#endif /* ntohs */
+#ifdef ntohl
+#undef ntohl
+#endif /* ntohl */
+
+#define htons(x) lwip_htons(x)
+#define ntohs(x) lwip_ntohs(x)
+#define htonl(x) lwip_htonl(x)
+#define ntohl(x) lwip_ntohl(x)
+#endif /* LWIP_PREFIX_BYTEORDER_FUNCS */
+
+#if BYTE_ORDER == BIG_ENDIAN
+#define lwip_htons(x) (x)
+#define lwip_ntohs(x) (x)
+#define lwip_htonl(x) (x)
+#define lwip_ntohl(x) (x)
+#define PP_HTONS(x) (x)
+#define PP_NTOHS(x) (x)
+#define PP_HTONL(x) (x)
+#define PP_NTOHL(x) (x)
+#else /* BYTE_ORDER != BIG_ENDIAN */
+#if LWIP_PLATFORM_BYTESWAP
+#define lwip_htons(x) LWIP_PLATFORM_HTONS(x)
+#define lwip_ntohs(x) LWIP_PLATFORM_HTONS(x)
+#define lwip_htonl(x) LWIP_PLATFORM_HTONL(x)
+#define lwip_ntohl(x) LWIP_PLATFORM_HTONL(x)
+#else /* LWIP_PLATFORM_BYTESWAP */
+u16_t lwip_htons(u16_t x);
+u16_t lwip_ntohs(u16_t x);
+u32_t lwip_htonl(u32_t x);
+u32_t lwip_ntohl(u32_t x);
+#endif /* LWIP_PLATFORM_BYTESWAP */
+
+/* These macros should be calculated by the preprocessor and are used
+   with compile-time constants only (so that there is no little-endian
+   overhead at runtime). */
+#define PP_HTONS(x) ((((x) & 0xff) << 8) | (((x) & 0xff00) >> 8))
+#define PP_NTOHS(x) PP_HTONS(x)
+#define PP_HTONL(x) ((((x) & 0xff) << 24) | \
+                     (((x) & 0xff00) << 8) | \
+                     (((x) & 0xff0000UL) >> 8) | \
+                     (((x) & 0xff000000UL) >> 24))
+#define PP_NTOHL(x) PP_HTONL(x)
+
+#endif /* BYTE_ORDER == BIG_ENDIAN */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_DEF_H__ */
+
diff --git a/ext/lwip/src/include/lwip/dhcp.h b/ext/lwip/src/include/lwip/dhcp.h
new file mode 100644
index 000000000..32d93381d
--- /dev/null
+++ b/ext/lwip/src/include/lwip/dhcp.h
@@ -0,0 +1,242 @@
+/** @file
+ */
+
+#ifndef __LWIP_DHCP_H__
+#define __LWIP_DHCP_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_DHCP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/netif.h"
+#include "lwip/udp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** period (in seconds) of the application calling dhcp_coarse_tmr() */
+#define DHCP_COARSE_TIMER_SECS 60 
+/** period (in milliseconds) of the application calling dhcp_coarse_tmr() */
+#define DHCP_COARSE_TIMER_MSECS (DHCP_COARSE_TIMER_SECS * 1000UL)
+/** period (in milliseconds) of the application calling dhcp_fine_tmr() */
+#define DHCP_FINE_TIMER_MSECS 500 
+
+#define DHCP_CHADDR_LEN 16U
+#define DHCP_SNAME_LEN  64U
+#define DHCP_FILE_LEN   128U
+
+struct dhcp
+{
+  /** transaction identifier of last sent request */ 
+  u32_t xid;
+  /** our connection to the DHCP server */ 
+  struct udp_pcb *pcb;
+  /** incoming msg */
+  struct dhcp_msg *msg_in;
+  /** current DHCP state machine state */
+  u8_t state;
+  /** retries of current request */
+  u8_t tries;
+#if LWIP_DHCP_AUTOIP_COOP
+  u8_t autoip_coop_state;
+#endif
+  u8_t subnet_mask_given;
+
+  struct pbuf *p_out; /* pbuf of outcoming msg */
+  struct dhcp_msg *msg_out; /* outgoing msg */
+  u16_t options_out_len; /* outgoing msg options length */
+  u16_t request_timeout; /* #ticks with period DHCP_FINE_TIMER_SECS for request timeout */
+  u16_t t1_timeout;  /* #ticks with period DHCP_COARSE_TIMER_SECS for renewal time */
+  u16_t t2_timeout;  /* #ticks with period DHCP_COARSE_TIMER_SECS for rebind time */
+  ip_addr_t server_ip_addr; /* dhcp server address that offered this lease */
+  ip_addr_t offered_ip_addr;
+  ip_addr_t offered_sn_mask;
+  ip_addr_t offered_gw_addr;
+ 
+  u32_t offered_t0_lease; /* lease period (in seconds) */
+  u32_t offered_t1_renew; /* recommended renew time (usually 50% of lease period) */
+  u32_t offered_t2_rebind; /* recommended rebind time (usually 66% of lease period)  */
+  /* @todo: LWIP_DHCP_BOOTP_FILE configuration option?
+     integrate with possible TFTP-client for booting? */
+#if LWIP_DHCP_BOOTP_FILE
+  ip_addr_t offered_si_addr;
+  char boot_file_name[DHCP_FILE_LEN];
+#endif /* LWIP_DHCP_BOOTPFILE */
+};
+
+/* MUST be compiled with "pack structs" or equivalent! */
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+/** minimum set of fields of any DHCP message */
+struct dhcp_msg
+{
+  PACK_STRUCT_FIELD(u8_t op);
+  PACK_STRUCT_FIELD(u8_t htype);
+  PACK_STRUCT_FIELD(u8_t hlen);
+  PACK_STRUCT_FIELD(u8_t hops);
+  PACK_STRUCT_FIELD(u32_t xid);
+  PACK_STRUCT_FIELD(u16_t secs);
+  PACK_STRUCT_FIELD(u16_t flags);
+  PACK_STRUCT_FIELD(ip_addr_p_t ciaddr);
+  PACK_STRUCT_FIELD(ip_addr_p_t yiaddr);
+  PACK_STRUCT_FIELD(ip_addr_p_t siaddr);
+  PACK_STRUCT_FIELD(ip_addr_p_t giaddr);
+  PACK_STRUCT_FIELD(u8_t chaddr[DHCP_CHADDR_LEN]);
+  PACK_STRUCT_FIELD(u8_t sname[DHCP_SNAME_LEN]);
+  PACK_STRUCT_FIELD(u8_t file[DHCP_FILE_LEN]);
+  PACK_STRUCT_FIELD(u32_t cookie);
+#define DHCP_MIN_OPTIONS_LEN 68U
+/** make sure user does not configure this too small */
+#if ((defined(DHCP_OPTIONS_LEN)) && (DHCP_OPTIONS_LEN < DHCP_MIN_OPTIONS_LEN))
+#  undef DHCP_OPTIONS_LEN
+#endif
+/** allow this to be configured in lwipopts.h, but not too small */
+#if (!defined(DHCP_OPTIONS_LEN))
+/** set this to be sufficient for your options in outgoing DHCP msgs */
+#  define DHCP_OPTIONS_LEN DHCP_MIN_OPTIONS_LEN
+#endif
+  PACK_STRUCT_FIELD(u8_t options[DHCP_OPTIONS_LEN]);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+void dhcp_set_struct(struct netif *netif, struct dhcp *dhcp);
+/** Remove a struct dhcp previously set to the netif using dhcp_set_struct() */
+#define dhcp_remove_struct(netif) do { (netif)->dhcp = NULL; } while(0)
+void dhcp_cleanup(struct netif *netif);
+/** start DHCP configuration */
+err_t dhcp_start(struct netif *netif);
+/** enforce early lease renewal (not needed normally)*/
+err_t dhcp_renew(struct netif *netif);
+/** release the DHCP lease, usually called before dhcp_stop()*/
+err_t dhcp_release(struct netif *netif);
+/** stop DHCP configuration */
+void dhcp_stop(struct netif *netif);
+/** inform server of our manual IP address */
+void dhcp_inform(struct netif *netif);
+/** Handle a possible change in the network configuration */
+void dhcp_network_changed(struct netif *netif);
+
+/** if enabled, check whether the offered IP address is not in use, using ARP */
+#if DHCP_DOES_ARP_CHECK
+void dhcp_arp_reply(struct netif *netif, ip_addr_t *addr);
+#endif
+
+/** to be called every minute */
+void dhcp_coarse_tmr(void);
+/** to be called every half second */
+void dhcp_fine_tmr(void);
+ 
+/** DHCP message item offsets and length */
+#define DHCP_OP_OFS       0
+#define DHCP_HTYPE_OFS    1
+#define DHCP_HLEN_OFS     2
+#define DHCP_HOPS_OFS     3
+#define DHCP_XID_OFS      4
+#define DHCP_SECS_OFS     8
+#define DHCP_FLAGS_OFS    10
+#define DHCP_CIADDR_OFS   12
+#define DHCP_YIADDR_OFS   16
+#define DHCP_SIADDR_OFS   20
+#define DHCP_GIADDR_OFS   24
+#define DHCP_CHADDR_OFS   28
+#define DHCP_SNAME_OFS    44
+#define DHCP_FILE_OFS     108
+#define DHCP_MSG_LEN      236
+
+#define DHCP_COOKIE_OFS   DHCP_MSG_LEN
+#define DHCP_OPTIONS_OFS  (DHCP_MSG_LEN + 4)
+
+#define DHCP_CLIENT_PORT  68  
+#define DHCP_SERVER_PORT  67
+
+/** DHCP client states */
+#define DHCP_OFF          0
+#define DHCP_REQUESTING   1
+#define DHCP_INIT         2
+#define DHCP_REBOOTING    3
+#define DHCP_REBINDING    4
+#define DHCP_RENEWING     5
+#define DHCP_SELECTING    6
+#define DHCP_INFORMING    7
+#define DHCP_CHECKING     8
+#define DHCP_PERMANENT    9
+#define DHCP_BOUND        10
+/** not yet implemented #define DHCP_RELEASING 11 */
+#define DHCP_BACKING_OFF  12
+
+/** AUTOIP cooperatation flags */
+#define DHCP_AUTOIP_COOP_STATE_OFF  0
+#define DHCP_AUTOIP_COOP_STATE_ON   1
+ 
+#define DHCP_BOOTREQUEST  1
+#define DHCP_BOOTREPLY    2
+
+/** DHCP message types */
+#define DHCP_DISCOVER 1
+#define DHCP_OFFER    2
+#define DHCP_REQUEST  3
+#define DHCP_DECLINE  4
+#define DHCP_ACK      5
+#define DHCP_NAK      6
+#define DHCP_RELEASE  7
+#define DHCP_INFORM   8
+
+/** DHCP hardware type, currently only ethernet is supported */
+#define DHCP_HTYPE_ETH 1
+
+#define DHCP_MAGIC_COOKIE 0x63825363UL
+
+/* This is a list of options for BOOTP and DHCP, see RFC 2132 for descriptions */
+
+/** BootP options */
+#define DHCP_OPTION_PAD 0
+#define DHCP_OPTION_SUBNET_MASK 1 /* RFC 2132 3.3 */
+#define DHCP_OPTION_ROUTER 3
+#define DHCP_OPTION_DNS_SERVER 6 
+#define DHCP_OPTION_HOSTNAME 12
+#define DHCP_OPTION_IP_TTL 23
+#define DHCP_OPTION_MTU 26
+#define DHCP_OPTION_BROADCAST 28
+#define DHCP_OPTION_TCP_TTL 37
+#define DHCP_OPTION_END 255
+
+/** DHCP options */
+#define DHCP_OPTION_REQUESTED_IP 50 /* RFC 2132 9.1, requested IP address */
+#define DHCP_OPTION_LEASE_TIME 51 /* RFC 2132 9.2, time in seconds, in 4 bytes */
+#define DHCP_OPTION_OVERLOAD 52 /* RFC2132 9.3, use file and/or sname field for options */
+
+#define DHCP_OPTION_MESSAGE_TYPE 53 /* RFC 2132 9.6, important for DHCP */
+#define DHCP_OPTION_MESSAGE_TYPE_LEN 1
+
+#define DHCP_OPTION_SERVER_ID 54 /* RFC 2132 9.7, server IP address */
+#define DHCP_OPTION_PARAMETER_REQUEST_LIST 55 /* RFC 2132 9.8, requested option types */
+
+#define DHCP_OPTION_MAX_MSG_SIZE 57 /* RFC 2132 9.10, message size accepted >= 576 */
+#define DHCP_OPTION_MAX_MSG_SIZE_LEN 2
+
+#define DHCP_OPTION_T1 58 /* T1 renewal time */
+#define DHCP_OPTION_T2 59 /* T2 rebinding time */
+#define DHCP_OPTION_US 60
+#define DHCP_OPTION_CLIENT_ID 61
+#define DHCP_OPTION_TFTP_SERVERNAME 66
+#define DHCP_OPTION_BOOTFILE 67
+
+/** possible combinations of overloading the file and sname fields with options */
+#define DHCP_OVERLOAD_NONE 0
+#define DHCP_OVERLOAD_FILE 1
+#define DHCP_OVERLOAD_SNAME  2
+#define DHCP_OVERLOAD_SNAME_FILE 3
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_DHCP */
+
+#endif /*__LWIP_DHCP_H__*/
diff --git a/ext/lwip/src/include/lwip/dns.h b/ext/lwip/src/include/lwip/dns.h
new file mode 100644
index 000000000..6c7d9b073
--- /dev/null
+++ b/ext/lwip/src/include/lwip/dns.h
@@ -0,0 +1,124 @@
+/**
+ * lwip DNS resolver header file.
+
+ * Author: Jim Pettinato 
+ *   April 2007
+
+ * ported from uIP resolv.c Copyright (c) 2002-2003, Adam Dunkels.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __LWIP_DNS_H__
+#define __LWIP_DNS_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_DNS /* don't build if not configured for use in lwipopts.h */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** DNS timer period */
+#define DNS_TMR_INTERVAL          1000
+
+/** DNS field TYPE used for "Resource Records" */
+#define DNS_RRTYPE_A              1     /* a host address */
+#define DNS_RRTYPE_NS             2     /* an authoritative name server */
+#define DNS_RRTYPE_MD             3     /* a mail destination (Obsolete - use MX) */
+#define DNS_RRTYPE_MF             4     /* a mail forwarder (Obsolete - use MX) */
+#define DNS_RRTYPE_CNAME          5     /* the canonical name for an alias */
+#define DNS_RRTYPE_SOA            6     /* marks the start of a zone of authority */
+#define DNS_RRTYPE_MB             7     /* a mailbox domain name (EXPERIMENTAL) */
+#define DNS_RRTYPE_MG             8     /* a mail group member (EXPERIMENTAL) */
+#define DNS_RRTYPE_MR             9     /* a mail rename domain name (EXPERIMENTAL) */
+#define DNS_RRTYPE_NULL           10    /* a null RR (EXPERIMENTAL) */
+#define DNS_RRTYPE_WKS            11    /* a well known service description */
+#define DNS_RRTYPE_PTR            12    /* a domain name pointer */
+#define DNS_RRTYPE_HINFO          13    /* host information */
+#define DNS_RRTYPE_MINFO          14    /* mailbox or mail list information */
+#define DNS_RRTYPE_MX             15    /* mail exchange */
+#define DNS_RRTYPE_TXT            16    /* text strings */
+
+/** DNS field CLASS used for "Resource Records" */
+#define DNS_RRCLASS_IN            1     /* the Internet */
+#define DNS_RRCLASS_CS            2     /* the CSNET class (Obsolete - used only for examples in some obsolete RFCs) */
+#define DNS_RRCLASS_CH            3     /* the CHAOS class */
+#define DNS_RRCLASS_HS            4     /* Hesiod [Dyer 87] */
+#define DNS_RRCLASS_FLUSH         0x800 /* Flush bit */
+
+/* The size used for the next line is rather a hack, but it prevents including socket.h in all files
+   that include memp.h, and that would possibly break portability (since socket.h defines some types
+   and constants possibly already define by the OS).
+   Calculation rule:
+   sizeof(struct addrinfo) + sizeof(struct sockaddr_in) + DNS_MAX_NAME_LENGTH + 1 byte zero-termination */
+#define NETDB_ELEM_SIZE           (32 + 16 + DNS_MAX_NAME_LENGTH + 1)
+
+#if DNS_LOCAL_HOSTLIST
+/** struct used for local host-list */
+struct local_hostlist_entry {
+  /** static hostname */
+  const char *name;
+  /** static host address in network byteorder */
+  ip_addr_t addr;
+  struct local_hostlist_entry *next;
+};
+#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
+#ifndef DNS_LOCAL_HOSTLIST_MAX_NAMELEN
+#define DNS_LOCAL_HOSTLIST_MAX_NAMELEN  DNS_MAX_NAME_LENGTH
+#endif
+#define LOCALHOSTLIST_ELEM_SIZE ((sizeof(struct local_hostlist_entry) + DNS_LOCAL_HOSTLIST_MAX_NAMELEN + 1))
+#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
+#endif /* DNS_LOCAL_HOSTLIST */
+
+/** Callback which is invoked when a hostname is found.
+ * A function of this type must be implemented by the application using the DNS resolver.
+ * @param name pointer to the name that was looked up.
+ * @param ipaddr pointer to an ip_addr_t containing the IP address of the hostname,
+ *        or NULL if the name could not be found (or on any other error).
+ * @param callback_arg a user-specified callback argument passed to dns_gethostbyname
+*/
+typedef void (*dns_found_callback)(const char *name, ip_addr_t *ipaddr, void *callback_arg);
+
+void           dns_init(void);
+void           dns_tmr(void);
+void           dns_setserver(u8_t numdns, ip_addr_t *dnsserver);
+ip_addr_t      dns_getserver(u8_t numdns);
+err_t          dns_gethostbyname(const char *hostname, ip_addr_t *addr,
+                                 dns_found_callback found, void *callback_arg);
+
+#if DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC
+int            dns_local_removehost(const char *hostname, const ip_addr_t *addr);
+err_t          dns_local_addhost(const char *hostname, const ip_addr_t *addr);
+#endif /* DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_DNS */
+
+#endif /* __LWIP_DNS_H__ */
diff --git a/ext/lwip/src/include/lwip/err.h b/ext/lwip/src/include/lwip/err.h
new file mode 100644
index 000000000..ac907729f
--- /dev/null
+++ b/ext/lwip/src/include/lwip/err.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_ERR_H__
+#define __LWIP_ERR_H__
+
+#include "lwip/opt.h"
+#include "lwip/arch.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Define LWIP_ERR_T in cc.h if you want to use
+ *  a different type for your platform (must be signed). */
+#ifdef LWIP_ERR_T
+typedef LWIP_ERR_T err_t;
+#else /* LWIP_ERR_T */
+typedef s8_t err_t;
+#endif /* LWIP_ERR_T*/
+
+/* Definitions for error constants. */
+
+#define ERR_OK          0    /* No error, everything OK. */
+#define ERR_MEM        -1    /* Out of memory error.     */
+#define ERR_BUF        -2    /* Buffer error.            */
+#define ERR_TIMEOUT    -3    /* Timeout.                 */
+#define ERR_RTE        -4    /* Routing problem.         */
+#define ERR_INPROGRESS -5    /* Operation in progress    */
+#define ERR_VAL        -6    /* Illegal value.           */
+#define ERR_WOULDBLOCK -7    /* Operation would block.   */
+#define ERR_USE        -8    /* Address in use.          */
+#define ERR_ISCONN     -9    /* Already connected.       */
+
+#define ERR_IS_FATAL(e) ((e) < ERR_ISCONN)
+
+#define ERR_ABRT       -10   /* Connection aborted.      */
+#define ERR_RST        -11   /* Connection reset.        */
+#define ERR_CLSD       -12   /* Connection closed.       */
+#define ERR_CONN       -13   /* Not connected.           */
+
+#define ERR_ARG        -14   /* Illegal argument.        */
+
+#define ERR_IF         -15   /* Low-level netif error    */
+
+
+#ifdef LWIP_DEBUG
+extern const char *lwip_strerr(err_t err);
+#else
+#define lwip_strerr(x) ""
+#endif /* LWIP_DEBUG */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_ERR_H__ */
diff --git a/ext/lwip/src/include/lwip/init.h b/ext/lwip/src/include/lwip/init.h
new file mode 100644
index 000000000..323853454
--- /dev/null
+++ b/ext/lwip/src/include/lwip/init.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_INIT_H__
+#define __LWIP_INIT_H__
+
+#include "lwip/opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** X.x.x: Major version of the stack */
+#define LWIP_VERSION_MAJOR      1U
+/** x.X.x: Minor version of the stack */
+#define LWIP_VERSION_MINOR      4U
+/** x.x.X: Revision of the stack */
+#define LWIP_VERSION_REVISION   1U
+/** For release candidates, this is set to 1..254
+  * For official releases, this is set to 255 (LWIP_RC_RELEASE)
+  * For development versions (CVS), this is set to 0 (LWIP_RC_DEVELOPMENT) */
+#define LWIP_VERSION_RC         255U
+
+/** LWIP_VERSION_RC is set to LWIP_RC_RELEASE for official releases */
+#define LWIP_RC_RELEASE         255U
+/** LWIP_VERSION_RC is set to LWIP_RC_DEVELOPMENT for CVS versions */
+#define LWIP_RC_DEVELOPMENT     0U
+
+#define LWIP_VERSION_IS_RELEASE     (LWIP_VERSION_RC == LWIP_RC_RELEASE)
+#define LWIP_VERSION_IS_DEVELOPMENT (LWIP_VERSION_RC == LWIP_RC_DEVELOPMENT)
+#define LWIP_VERSION_IS_RC          ((LWIP_VERSION_RC != LWIP_RC_RELEASE) && (LWIP_VERSION_RC != LWIP_RC_DEVELOPMENT))
+
+/** Provides the version of the stack */
+#define LWIP_VERSION   (LWIP_VERSION_MAJOR << 24   | LWIP_VERSION_MINOR << 16 | \
+                        LWIP_VERSION_REVISION << 8 | LWIP_VERSION_RC)
+
+/* Modules initialization */
+void lwip_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_INIT_H__ */
diff --git a/ext/lwip/src/include/lwip/ip.h b/ext/lwip/src/include/lwip/ip.h
new file mode 100644
index 000000000..00c83a0a1
--- /dev/null
+++ b/ext/lwip/src/include/lwip/ip.h
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_IP_H__
+#define __LWIP_IP_H__
+
+#include "lwip/opt.h"
+
+#include "lwip/def.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+#include "lwip/err.h"
+#include "lwip/netif.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Currently, the function ip_output_if_opt() is only used with IGMP */
+#define IP_OPTIONS_SEND   LWIP_IGMP
+
+#define IP_HLEN 20
+
+#define IP_PROTO_ICMP    1
+#define IP_PROTO_IGMP    2
+#define IP_PROTO_UDP     17
+#define IP_PROTO_UDPLITE 136
+#define IP_PROTO_TCP     6
+
+/* This is passed as the destination address to ip_output_if (not
+   to ip_output), meaning that an IP header already is constructed
+   in the pbuf. This is used when TCP retransmits. */
+#ifdef IP_HDRINCL
+#undef IP_HDRINCL
+#endif /* IP_HDRINCL */
+#define IP_HDRINCL  NULL
+
+#if LWIP_NETIF_HWADDRHINT
+#define IP_PCB_ADDRHINT ;u8_t addr_hint
+#else
+#define IP_PCB_ADDRHINT
+#endif /* LWIP_NETIF_HWADDRHINT */
+
+/* This is the common part of all PCB types. It needs to be at the
+   beginning of a PCB type definition. It is located here so that
+   changes to this common part are made in one location instead of
+   having to change all PCB structs. */
+#define IP_PCB \
+  /* ip addresses in network byte order */ \
+  ip_addr_t local_ip; \
+  ip_addr_t remote_ip; \
+   /* Socket options */  \
+  u8_t so_options;      \
+   /* Type Of Service */ \
+  u8_t tos;              \
+  /* Time To Live */     \
+  u8_t ttl               \
+  /* link layer address resolution hint */ \
+  IP_PCB_ADDRHINT
+
+struct ip_pcb {
+/* Common members of all PCB types */
+  IP_PCB;
+};
+
+/*
+ * Option flags per-socket. These are the same like SO_XXX.
+ */
+/*#define SOF_DEBUG       0x01U     Unimplemented: turn on debugging info recording */
+#define SOF_ACCEPTCONN    0x02U  /* socket has had listen() */
+#define SOF_REUSEADDR     0x04U  /* allow local address reuse */
+#define SOF_KEEPALIVE     0x08U  /* keep connections alive */
+/*#define SOF_DONTROUTE   0x10U     Unimplemented: just use interface addresses */
+#define SOF_BROADCAST     0x20U  /* permit to send and to receive broadcast messages (see IP_SOF_BROADCAST option) */
+/*#define SOF_USELOOPBACK 0x40U     Unimplemented: bypass hardware when possible */
+#define SOF_LINGER        0x80U  /* linger on close if data present */
+/*#define SOF_OOBINLINE   0x0100U   Unimplemented: leave received OOB data in line */
+/*#define SOF_REUSEPORT   0x0200U   Unimplemented: allow local address & port reuse */
+
+/* These flags are inherited (e.g. from a listen-pcb to a connection-pcb): */
+#define SOF_INHERITED   (SOF_REUSEADDR|SOF_KEEPALIVE|SOF_LINGER/*|SOF_DEBUG|SOF_DONTROUTE|SOF_OOBINLINE*/)
+
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct ip_hdr {
+  /* version / header length */
+  PACK_STRUCT_FIELD(u8_t _v_hl);
+  /* type of service */
+  PACK_STRUCT_FIELD(u8_t _tos);
+  /* total length */
+  PACK_STRUCT_FIELD(u16_t _len);
+  /* identification */
+  PACK_STRUCT_FIELD(u16_t _id);
+  /* fragment offset field */
+  PACK_STRUCT_FIELD(u16_t _offset);
+#define IP_RF 0x8000U        /* reserved fragment flag */
+#define IP_DF 0x4000U        /* dont fragment flag */
+#define IP_MF 0x2000U        /* more fragments flag */
+#define IP_OFFMASK 0x1fffU   /* mask for fragmenting bits */
+  /* time to live */
+  PACK_STRUCT_FIELD(u8_t _ttl);
+  /* protocol*/
+  PACK_STRUCT_FIELD(u8_t _proto);
+  /* checksum */
+  PACK_STRUCT_FIELD(u16_t _chksum);
+  /* source and destination IP addresses */
+  PACK_STRUCT_FIELD(ip_addr_p_t src);
+  PACK_STRUCT_FIELD(ip_addr_p_t dest); 
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define IPH_V(hdr)  ((hdr)->_v_hl >> 4)
+#define IPH_HL(hdr) ((hdr)->_v_hl & 0x0f)
+#define IPH_TOS(hdr) ((hdr)->_tos)
+#define IPH_LEN(hdr) ((hdr)->_len)
+#define IPH_ID(hdr) ((hdr)->_id)
+#define IPH_OFFSET(hdr) ((hdr)->_offset)
+#define IPH_TTL(hdr) ((hdr)->_ttl)
+#define IPH_PROTO(hdr) ((hdr)->_proto)
+#define IPH_CHKSUM(hdr) ((hdr)->_chksum)
+
+#define IPH_VHL_SET(hdr, v, hl) (hdr)->_v_hl = (((v) << 4) | (hl))
+#define IPH_TOS_SET(hdr, tos) (hdr)->_tos = (tos)
+#define IPH_LEN_SET(hdr, len) (hdr)->_len = (len)
+#define IPH_ID_SET(hdr, id) (hdr)->_id = (id)
+#define IPH_OFFSET_SET(hdr, off) (hdr)->_offset = (off)
+#define IPH_TTL_SET(hdr, ttl) (hdr)->_ttl = (u8_t)(ttl)
+#define IPH_PROTO_SET(hdr, proto) (hdr)->_proto = (u8_t)(proto)
+#define IPH_CHKSUM_SET(hdr, chksum) (hdr)->_chksum = (chksum)
+
+/** The interface that provided the packet for the current callback invocation. */
+extern struct netif *current_netif;
+/** Header of the input packet currently being processed. */
+extern const struct ip_hdr *current_header;
+/** Source IP address of current_header */
+extern ip_addr_t current_iphdr_src;
+/** Destination IP address of current_header */
+extern ip_addr_t current_iphdr_dest;
+
+#define ip_init() /* Compatibility define, not init needed. */
+struct netif *ip_route(ip_addr_t *dest);
+err_t ip_input(struct pbuf *p, struct netif *inp);
+err_t ip_output(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto);
+err_t ip_output_if(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto,
+       struct netif *netif);
+#if LWIP_NETIF_HWADDRHINT
+err_t ip_output_hinted(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto, u8_t *addr_hint);
+#endif /* LWIP_NETIF_HWADDRHINT */
+#if IP_OPTIONS_SEND
+err_t ip_output_if_opt(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
+       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif, void *ip_options,
+       u16_t optlen);
+#endif /* IP_OPTIONS_SEND */
+/** Get the interface that received the current packet.
+ * This function must only be called from a receive callback (udp_recv,
+ * raw_recv, tcp_accept). It will return NULL otherwise. */
+#define ip_current_netif()  (current_netif)
+/** Get the IP header of the current packet.
+ * This function must only be called from a receive callback (udp_recv,
+ * raw_recv, tcp_accept). It will return NULL otherwise. */
+#define ip_current_header() (current_header)
+/** Source IP address of current_header */
+#define ip_current_src_addr()  (&current_iphdr_src)
+/** Destination IP address of current_header */
+#define ip_current_dest_addr() (&current_iphdr_dest)
+
+/** Gets an IP pcb option (SOF_* flags) */
+#define ip_get_option(pcb, opt)   ((pcb)->so_options & (opt))
+/** Sets an IP pcb option (SOF_* flags) */
+#define ip_set_option(pcb, opt)   ((pcb)->so_options |= (opt))
+/** Resets an IP pcb option (SOF_* flags) */
+#define ip_reset_option(pcb, opt) ((pcb)->so_options &= ~(opt))
+
+#if IP_DEBUG
+void ip_debug_print(struct pbuf *p);
+#else
+#define ip_debug_print(p)
+#endif /* IP_DEBUG */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_IP_H__ */
+
+
diff --git a/ext/lwip/src/include/lwip/mem.h b/ext/lwip/src/include/lwip/mem.h
new file mode 100644
index 000000000..5bb906b63
--- /dev/null
+++ b/ext/lwip/src/include/lwip/mem.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_MEM_H__
+#define __LWIP_MEM_H__
+
+#include "lwip/opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if MEM_LIBC_MALLOC
+
+#include <stddef.h> /* for size_t */
+
+typedef size_t mem_size_t;
+#define MEM_SIZE_F SZT_F
+
+/* aliases for C library malloc() */
+#define mem_init()
+/* in case C library malloc() needs extra protection,
+ * allow these defines to be overridden.
+ */
+#ifndef mem_free
+#define mem_free free
+#endif
+#ifndef mem_malloc
+#define mem_malloc malloc
+#endif
+#ifndef mem_calloc
+#define mem_calloc calloc
+#endif
+/* Since there is no C library allocation function to shrink memory without
+   moving it, define this to nothing. */
+#ifndef mem_trim
+#define mem_trim(mem, size) (mem)
+#endif
+#else /* MEM_LIBC_MALLOC */
+
+/* MEM_SIZE would have to be aligned, but using 64000 here instead of
+ * 65535 leaves some room for alignment...
+ */
+#if MEM_SIZE > 64000L
+typedef u32_t mem_size_t;
+#define MEM_SIZE_F U32_F
+#else
+typedef u16_t mem_size_t;
+#define MEM_SIZE_F U16_F
+#endif /* MEM_SIZE > 64000 */
+
+#if MEM_USE_POOLS
+/** mem_init is not used when using pools instead of a heap */
+#define mem_init()
+/** mem_trim is not used when using pools instead of a heap:
+    we can't free part of a pool element and don't want to copy the rest */
+#define mem_trim(mem, size) (mem)
+#else /* MEM_USE_POOLS */
+/* lwIP alternative malloc */
+void  mem_init(void);
+void *mem_trim(void *mem, mem_size_t size);
+#endif /* MEM_USE_POOLS */
+void *mem_malloc(mem_size_t size);
+void *mem_calloc(mem_size_t count, mem_size_t size);
+void  mem_free(void *mem);
+#endif /* MEM_LIBC_MALLOC */
+
+/** Calculate memory size for an aligned buffer - returns the next highest
+ * multiple of MEM_ALIGNMENT (e.g. LWIP_MEM_ALIGN_SIZE(3) and
+ * LWIP_MEM_ALIGN_SIZE(4) will both yield 4 for MEM_ALIGNMENT == 4).
+ */
+#ifndef LWIP_MEM_ALIGN_SIZE
+#define LWIP_MEM_ALIGN_SIZE(size) (((size) + MEM_ALIGNMENT - 1) & ~(MEM_ALIGNMENT-1))
+#endif
+
+/** Calculate safe memory size for an aligned buffer when using an unaligned
+ * type as storage. This includes a safety-margin on (MEM_ALIGNMENT - 1) at the
+ * start (e.g. if buffer is u8_t[] and actual data will be u32_t*)
+ */
+#ifndef LWIP_MEM_ALIGN_BUFFER
+#define LWIP_MEM_ALIGN_BUFFER(size) (((size) + MEM_ALIGNMENT - 1))
+#endif
+
+/** Align a memory pointer to the alignment defined by MEM_ALIGNMENT
+ * so that ADDR % MEM_ALIGNMENT == 0
+ */
+#ifndef LWIP_MEM_ALIGN
+#define LWIP_MEM_ALIGN(addr) ((void *)(((mem_ptr_t)(addr) + MEM_ALIGNMENT - 1) & ~(mem_ptr_t)(MEM_ALIGNMENT-1)))
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_MEM_H__ */
diff --git a/ext/lwip/src/include/lwip/memp.h b/ext/lwip/src/include/lwip/memp.h
new file mode 100644
index 000000000..f0d073994
--- /dev/null
+++ b/ext/lwip/src/include/lwip/memp.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#ifndef __LWIP_MEMP_H__
+#define __LWIP_MEMP_H__
+
+#include "lwip/opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Create the list of all memory pools managed by memp. MEMP_MAX represents a NULL pool at the end */
+typedef enum {
+#define LWIP_MEMPOOL(name,num,size,desc)  MEMP_##name,
+#include "lwip/memp_std.h"
+  MEMP_MAX
+} memp_t;
+
+#if MEM_USE_POOLS
+/* Use a helper type to get the start and end of the user "memory pools" for mem_malloc */
+typedef enum {
+    /* Get the first (via:
+       MEMP_POOL_HELPER_START = ((u8_t) 1*MEMP_POOL_A + 0*MEMP_POOL_B + 0*MEMP_POOL_C + 0)*/
+    MEMP_POOL_HELPER_FIRST = ((u8_t)
+#define LWIP_MEMPOOL(name,num,size,desc)
+#define LWIP_MALLOC_MEMPOOL_START 1
+#define LWIP_MALLOC_MEMPOOL(num, size) * MEMP_POOL_##size + 0
+#define LWIP_MALLOC_MEMPOOL_END
+#include "lwip/memp_std.h"
+    ) ,
+    /* Get the last (via:
+       MEMP_POOL_HELPER_END = ((u8_t) 0 + MEMP_POOL_A*0 + MEMP_POOL_B*0 + MEMP_POOL_C*1) */
+    MEMP_POOL_HELPER_LAST = ((u8_t)
+#define LWIP_MEMPOOL(name,num,size,desc)
+#define LWIP_MALLOC_MEMPOOL_START
+#define LWIP_MALLOC_MEMPOOL(num, size) 0 + MEMP_POOL_##size *
+#define LWIP_MALLOC_MEMPOOL_END 1
+#include "lwip/memp_std.h"
+    )
+} memp_pool_helper_t;
+
+/* The actual start and stop values are here (cast them over)
+   We use this helper type and these defines so we can avoid using const memp_t values */
+#define MEMP_POOL_FIRST ((memp_t) MEMP_POOL_HELPER_FIRST)
+#define MEMP_POOL_LAST   ((memp_t) MEMP_POOL_HELPER_LAST)
+#endif /* MEM_USE_POOLS */
+
+#if MEMP_MEM_MALLOC || MEM_USE_POOLS
+extern const u16_t memp_sizes[MEMP_MAX];
+#endif /* MEMP_MEM_MALLOC || MEM_USE_POOLS */
+
+#if MEMP_MEM_MALLOC
+
+#include "mem.h"
+
+#define memp_init()
+#define memp_malloc(type)     mem_malloc(memp_sizes[type])
+#define memp_free(type, mem)  mem_free(mem)
+
+#else /* MEMP_MEM_MALLOC */
+
+#if MEM_USE_POOLS
+/** This structure is used to save the pool one element came from. */
+struct memp_malloc_helper
+{
+   memp_t poolnr;
+};
+#endif /* MEM_USE_POOLS */
+
+void  memp_init(void);
+
+#if MEMP_OVERFLOW_CHECK
+void *memp_malloc_fn(memp_t type, const char* file, const int line);
+#define memp_malloc(t) memp_malloc_fn((t), __FILE__, __LINE__)
+#else
+void *memp_malloc(memp_t type);
+#endif
+void  memp_free(memp_t type, void *mem);
+
+#endif /* MEMP_MEM_MALLOC */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_MEMP_H__ */
diff --git a/ext/lwip/src/include/lwip/memp_std.h b/ext/lwip/src/include/lwip/memp_std.h
new file mode 100644
index 000000000..461ed1acf
--- /dev/null
+++ b/ext/lwip/src/include/lwip/memp_std.h
@@ -0,0 +1,122 @@
+/*
+ * SETUP: Make sure we define everything we will need.
+ *
+ * We have create three types of pools:
+ *   1) MEMPOOL - standard pools
+ *   2) MALLOC_MEMPOOL - to be used by mem_malloc in mem.c
+ *   3) PBUF_MEMPOOL - a mempool of pbuf's, so include space for the pbuf struct
+ *
+ * If the include'r doesn't require any special treatment of each of the types
+ * above, then will declare #2 & #3 to be just standard mempools.
+ */
+#ifndef LWIP_MALLOC_MEMPOOL
+/* This treats "malloc pools" just like any other pool.
+   The pools are a little bigger to provide 'size' as the amount of user data. */
+#define LWIP_MALLOC_MEMPOOL(num, size) LWIP_MEMPOOL(POOL_##size, num, (size + sizeof(struct memp_malloc_helper)), "MALLOC_"#size)
+#define LWIP_MALLOC_MEMPOOL_START
+#define LWIP_MALLOC_MEMPOOL_END
+#endif /* LWIP_MALLOC_MEMPOOL */ 
+
+#ifndef LWIP_PBUF_MEMPOOL
+/* This treats "pbuf pools" just like any other pool.
+ * Allocates buffers for a pbuf struct AND a payload size */
+#define LWIP_PBUF_MEMPOOL(name, num, payload, desc) LWIP_MEMPOOL(name, num, (MEMP_ALIGN_SIZE(sizeof(struct pbuf)) + MEMP_ALIGN_SIZE(payload)), desc)
+#endif /* LWIP_PBUF_MEMPOOL */
+
+
+/*
+ * A list of internal pools used by LWIP.
+ *
+ * LWIP_MEMPOOL(pool_name, number_elements, element_size, pool_description)
+ *     creates a pool name MEMP_pool_name. description is used in stats.c
+ */
+#if LWIP_RAW
+LWIP_MEMPOOL(RAW_PCB,        MEMP_NUM_RAW_PCB,         sizeof(struct raw_pcb),        "RAW_PCB")
+#endif /* LWIP_RAW */
+
+#if LWIP_UDP
+LWIP_MEMPOOL(UDP_PCB,        MEMP_NUM_UDP_PCB,         sizeof(struct udp_pcb),        "UDP_PCB")
+#endif /* LWIP_UDP */
+
+#if LWIP_TCP
+LWIP_MEMPOOL(TCP_PCB,        MEMP_NUM_TCP_PCB,         sizeof(struct tcp_pcb),        "TCP_PCB")
+LWIP_MEMPOOL(TCP_PCB_LISTEN, MEMP_NUM_TCP_PCB_LISTEN,  sizeof(struct tcp_pcb_listen), "TCP_PCB_LISTEN")
+LWIP_MEMPOOL(TCP_SEG,        MEMP_NUM_TCP_SEG,         sizeof(struct tcp_seg),        "TCP_SEG")
+#endif /* LWIP_TCP */
+
+#if IP_REASSEMBLY
+LWIP_MEMPOOL(REASSDATA,      MEMP_NUM_REASSDATA,       sizeof(struct ip_reassdata),   "REASSDATA")
+#endif /* IP_REASSEMBLY */
+#if IP_FRAG && !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF
+LWIP_MEMPOOL(FRAG_PBUF,      MEMP_NUM_FRAG_PBUF,       sizeof(struct pbuf_custom_ref),"FRAG_PBUF")
+#endif /* IP_FRAG && !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF */
+
+#if LWIP_NETCONN
+LWIP_MEMPOOL(NETBUF,         MEMP_NUM_NETBUF,          sizeof(struct netbuf),         "NETBUF")
+LWIP_MEMPOOL(NETCONN,        MEMP_NUM_NETCONN,         sizeof(struct netconn),        "NETCONN")
+#endif /* LWIP_NETCONN */
+
+#if NO_SYS==0
+LWIP_MEMPOOL(TCPIP_MSG_API,  MEMP_NUM_TCPIP_MSG_API,   sizeof(struct tcpip_msg),      "TCPIP_MSG_API")
+#if !LWIP_TCPIP_CORE_LOCKING_INPUT
+LWIP_MEMPOOL(TCPIP_MSG_INPKT,MEMP_NUM_TCPIP_MSG_INPKT, sizeof(struct tcpip_msg),      "TCPIP_MSG_INPKT")
+#endif /* !LWIP_TCPIP_CORE_LOCKING_INPUT */
+#endif /* NO_SYS==0 */
+
+#if LWIP_ARP && ARP_QUEUEING
+LWIP_MEMPOOL(ARP_QUEUE,      MEMP_NUM_ARP_QUEUE,       sizeof(struct etharp_q_entry), "ARP_QUEUE")
+#endif /* LWIP_ARP && ARP_QUEUEING */
+
+#if LWIP_IGMP
+LWIP_MEMPOOL(IGMP_GROUP,     MEMP_NUM_IGMP_GROUP,      sizeof(struct igmp_group),     "IGMP_GROUP")
+#endif /* LWIP_IGMP */
+
+#if (!NO_SYS || (NO_SYS && !NO_SYS_NO_TIMERS)) /* LWIP_TIMERS */
+LWIP_MEMPOOL(SYS_TIMEOUT,    MEMP_NUM_SYS_TIMEOUT,     sizeof(struct sys_timeo),      "SYS_TIMEOUT")
+#endif /* LWIP_TIMERS */
+
+#if LWIP_SNMP
+LWIP_MEMPOOL(SNMP_ROOTNODE,  MEMP_NUM_SNMP_ROOTNODE,   sizeof(struct mib_list_rootnode), "SNMP_ROOTNODE")
+LWIP_MEMPOOL(SNMP_NODE,      MEMP_NUM_SNMP_NODE,       sizeof(struct mib_list_node),     "SNMP_NODE")
+LWIP_MEMPOOL(SNMP_VARBIND,   MEMP_NUM_SNMP_VARBIND,    sizeof(struct snmp_varbind),      "SNMP_VARBIND")
+LWIP_MEMPOOL(SNMP_VALUE,     MEMP_NUM_SNMP_VALUE,      SNMP_MAX_VALUE_SIZE,              "SNMP_VALUE")
+#endif /* LWIP_SNMP */
+#if LWIP_DNS && LWIP_SOCKET
+LWIP_MEMPOOL(NETDB,          MEMP_NUM_NETDB,           NETDB_ELEM_SIZE,               "NETDB")
+#endif /* LWIP_DNS && LWIP_SOCKET */
+#if LWIP_DNS && DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC
+LWIP_MEMPOOL(LOCALHOSTLIST,  MEMP_NUM_LOCALHOSTLIST,   LOCALHOSTLIST_ELEM_SIZE,       "LOCALHOSTLIST")
+#endif /* LWIP_DNS && DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
+#if PPP_SUPPORT && PPPOE_SUPPORT
+LWIP_MEMPOOL(PPPOE_IF,      MEMP_NUM_PPPOE_INTERFACES, sizeof(struct pppoe_softc),    "PPPOE_IF")
+#endif /* PPP_SUPPORT && PPPOE_SUPPORT */
+
+/*
+ * A list of pools of pbuf's used by LWIP.
+ *
+ * LWIP_PBUF_MEMPOOL(pool_name, number_elements, pbuf_payload_size, pool_description)
+ *     creates a pool name MEMP_pool_name. description is used in stats.c
+ *     This allocates enough space for the pbuf struct and a payload.
+ *     (Example: pbuf_payload_size=0 allocates only size for the struct)
+ */
+LWIP_PBUF_MEMPOOL(PBUF,      MEMP_NUM_PBUF,            0,                             "PBUF_REF/ROM")
+LWIP_PBUF_MEMPOOL(PBUF_POOL, PBUF_POOL_SIZE,           PBUF_POOL_BUFSIZE,             "PBUF_POOL")
+
+
+/*
+ * Allow for user-defined pools; this must be explicitly set in lwipopts.h
+ * since the default is to NOT look for lwippools.h
+ */
+#if MEMP_USE_CUSTOM_POOLS
+#include "lwippools.h"
+#endif /* MEMP_USE_CUSTOM_POOLS */
+
+/*
+ * REQUIRED CLEANUP: Clear up so we don't get "multiply defined" error later
+ * (#undef is ignored for something that is not defined)
+ */
+#undef LWIP_MEMPOOL
+#undef LWIP_MALLOC_MEMPOOL
+#undef LWIP_MALLOC_MEMPOOL_START
+#undef LWIP_MALLOC_MEMPOOL_END
+#undef LWIP_PBUF_MEMPOOL
diff --git a/ext/lwip/src/include/lwip/netbuf.h b/ext/lwip/src/include/lwip/netbuf.h
new file mode 100644
index 000000000..7d247d71b
--- /dev/null
+++ b/ext/lwip/src/include/lwip/netbuf.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_NETBUF_H__
+#define __LWIP_NETBUF_H__
+
+#include "lwip/opt.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** This netbuf has dest-addr/port set */
+#define NETBUF_FLAG_DESTADDR    0x01
+/** This netbuf includes a checksum */
+#define NETBUF_FLAG_CHKSUM      0x02
+
+struct netbuf {
+  struct pbuf *p, *ptr;
+  ip_addr_t addr;
+  u16_t port;
+#if LWIP_NETBUF_RECVINFO || LWIP_CHECKSUM_ON_COPY
+#if LWIP_CHECKSUM_ON_COPY
+  u8_t flags;
+#endif /* LWIP_CHECKSUM_ON_COPY */
+  u16_t toport_chksum;
+#if LWIP_NETBUF_RECVINFO
+  ip_addr_t toaddr;
+#endif /* LWIP_NETBUF_RECVINFO */
+#endif /* LWIP_NETBUF_RECVINFO || LWIP_CHECKSUM_ON_COPY */
+};
+
+/* Network buffer functions: */
+struct netbuf *   netbuf_new      (void);
+void              netbuf_delete   (struct netbuf *buf);
+void *            netbuf_alloc    (struct netbuf *buf, u16_t size);
+void              netbuf_free     (struct netbuf *buf);
+err_t             netbuf_ref      (struct netbuf *buf,
+                                   const void *dataptr, u16_t size);
+void              netbuf_chain    (struct netbuf *head,
+           struct netbuf *tail);
+
+err_t             netbuf_data     (struct netbuf *buf,
+                                   void **dataptr, u16_t *len);
+s8_t              netbuf_next     (struct netbuf *buf);
+void              netbuf_first    (struct netbuf *buf);
+
+
+#define netbuf_copy_partial(buf, dataptr, len, offset) \
+  pbuf_copy_partial((buf)->p, (dataptr), (len), (offset))
+#define netbuf_copy(buf,dataptr,len) netbuf_copy_partial(buf, dataptr, len, 0)
+#define netbuf_take(buf, dataptr, len) pbuf_take((buf)->p, dataptr, len)
+#define netbuf_len(buf)              ((buf)->p->tot_len)
+#define netbuf_fromaddr(buf)         (&((buf)->addr))
+#define netbuf_set_fromaddr(buf, fromaddr) ip_addr_set((&(buf)->addr), fromaddr)
+#define netbuf_fromport(buf)         ((buf)->port)
+#if LWIP_NETBUF_RECVINFO
+#define netbuf_destaddr(buf)         (&((buf)->toaddr))
+#define netbuf_set_destaddr(buf, destaddr) ip_addr_set((&(buf)->addr), destaddr)
+#define netbuf_destport(buf)         (((buf)->flags & NETBUF_FLAG_DESTADDR) ? (buf)->toport_chksum : 0)
+#endif /* LWIP_NETBUF_RECVINFO */
+#if LWIP_CHECKSUM_ON_COPY
+#define netbuf_set_chksum(buf, chksum) do { (buf)->flags = NETBUF_FLAG_CHKSUM; \
+                                            (buf)->toport_chksum = chksum; } while(0)
+#endif /* LWIP_CHECKSUM_ON_COPY */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_NETBUF_H__ */
diff --git a/ext/lwip/src/include/lwip/netdb.h b/ext/lwip/src/include/lwip/netdb.h
new file mode 100644
index 000000000..7587e2f2d
--- /dev/null
+++ b/ext/lwip/src/include/lwip/netdb.h
@@ -0,0 +1,124 @@
+/*
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Simon Goldschmidt
+ *
+ */
+#ifndef __LWIP_NETDB_H__
+#define __LWIP_NETDB_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_DNS && LWIP_SOCKET
+
+#include <stddef.h> /* for size_t */
+
+#include "lwip/inet.h"
+#include "lwip/sockets.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* some rarely used options */
+#ifndef LWIP_DNS_API_DECLARE_H_ERRNO
+#define LWIP_DNS_API_DECLARE_H_ERRNO 1
+#endif
+
+#ifndef LWIP_DNS_API_DEFINE_ERRORS
+#define LWIP_DNS_API_DEFINE_ERRORS 1
+#endif
+
+#ifndef LWIP_DNS_API_DECLARE_STRUCTS
+#define LWIP_DNS_API_DECLARE_STRUCTS 1
+#endif
+
+#if LWIP_DNS_API_DEFINE_ERRORS
+/** Errors used by the DNS API functions, h_errno can be one of them */
+#define EAI_NONAME      200
+#define EAI_SERVICE     201
+#define EAI_FAIL        202
+#define EAI_MEMORY      203
+
+#define HOST_NOT_FOUND  210
+#define NO_DATA         211
+#define NO_RECOVERY     212
+#define TRY_AGAIN       213
+#endif /* LWIP_DNS_API_DEFINE_ERRORS */
+
+#if LWIP_DNS_API_DECLARE_STRUCTS
+struct hostent {
+    char  *h_name;      /* Official name of the host. */
+    char **h_aliases;   /* A pointer to an array of pointers to alternative host names,
+                           terminated by a null pointer. */
+    int    h_addrtype;  /* Address type. */
+    int    h_length;    /* The length, in bytes, of the address. */
+    char **h_addr_list; /* A pointer to an array of pointers to network addresses (in
+                           network byte order) for the host, terminated by a null pointer. */
+#define h_addr h_addr_list[0] /* for backward compatibility */
+};
+
+struct addrinfo {
+    int               ai_flags;      /* Input flags. */
+    int               ai_family;     /* Address family of socket. */
+    int               ai_socktype;   /* Socket type. */
+    int               ai_protocol;   /* Protocol of socket. */
+    socklen_t         ai_addrlen;    /* Length of socket address. */
+    struct sockaddr  *ai_addr;       /* Socket address of socket. */
+    char             *ai_canonname;  /* Canonical name of service location. */
+    struct addrinfo  *ai_next;       /* Pointer to next in list. */
+};
+#endif /* LWIP_DNS_API_DECLARE_STRUCTS */
+
+#if LWIP_DNS_API_DECLARE_H_ERRNO
+/* application accessable error code set by the DNS API functions */
+extern int h_errno;
+#endif /* LWIP_DNS_API_DECLARE_H_ERRNO*/
+
+struct hostent *lwip_gethostbyname(const char *name);
+int lwip_gethostbyname_r(const char *name, struct hostent *ret, char *buf,
+                size_t buflen, struct hostent **result, int *h_errnop);
+void lwip_freeaddrinfo(struct addrinfo *ai);
+int lwip_getaddrinfo(const char *nodename,
+       const char *servname,
+       const struct addrinfo *hints,
+       struct addrinfo **res);
+
+#if LWIP_COMPAT_SOCKETS
+#define gethostbyname(name) lwip_gethostbyname(name)
+#define gethostbyname_r(name, ret, buf, buflen, result, h_errnop) \
+       lwip_gethostbyname_r(name, ret, buf, buflen, result, h_errnop)
+#define freeaddrinfo(addrinfo) lwip_freeaddrinfo(addrinfo)
+#define getaddrinfo(nodname, servname, hints, res) \
+       lwip_getaddrinfo(nodname, servname, hints, res)
+#endif /* LWIP_COMPAT_SOCKETS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_DNS && LWIP_SOCKET */
+
+#endif /* __LWIP_NETDB_H__ */
diff --git a/ext/lwip/src/include/lwip/netif.h b/ext/lwip/src/include/lwip/netif.h
new file mode 100644
index 000000000..f7e493745
--- /dev/null
+++ b/ext/lwip/src/include/lwip/netif.h
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_NETIF_H__
+#define __LWIP_NETIF_H__
+
+#include "lwip/opt.h"
+
+#define ENABLE_LOOPBACK (LWIP_NETIF_LOOPBACK || LWIP_HAVE_LOOPIF)
+
+#include "lwip/err.h"
+
+#include "lwip/ip_addr.h"
+
+#include "lwip/def.h"
+#include "lwip/pbuf.h"
+#if LWIP_DHCP
+struct dhcp;
+#endif
+#if LWIP_AUTOIP
+struct autoip;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Throughout this file, IP addresses are expected to be in
+ * the same byte order as in IP_PCB. */
+
+/** must be the maximum of all used hardware address lengths
+    across all types of interfaces in use */
+#define NETIF_MAX_HWADDR_LEN 6U
+
+/** Whether the network interface is 'up'. This is
+ * a software flag used to control whether this network
+ * interface is enabled and processes traffic.
+ * It is set by the startup code (for static IP configuration) or
+ * by dhcp/autoip when an address has been assigned.
+ */
+#define NETIF_FLAG_UP           0x01U
+/** If set, the netif has broadcast capability.
+ * Set by the netif driver in its init function. */
+#define NETIF_FLAG_BROADCAST    0x02U
+/** If set, the netif is one end of a point-to-point connection.
+ * Set by the netif driver in its init function. */
+#define NETIF_FLAG_POINTTOPOINT 0x04U
+/** If set, the interface is configured using DHCP.
+ * Set by the DHCP code when starting or stopping DHCP. */
+#define NETIF_FLAG_DHCP         0x08U
+/** If set, the interface has an active link
+ *  (set by the network interface driver).
+ * Either set by the netif driver in its init function (if the link
+ * is up at that time) or at a later point once the link comes up
+ * (if link detection is supported by the hardware). */
+#define NETIF_FLAG_LINK_UP      0x10U
+/** If set, the netif is an ethernet device using ARP.
+ * Set by the netif driver in its init function.
+ * Used to check input packet types and use of DHCP. */
+#define NETIF_FLAG_ETHARP       0x20U
+/** If set, the netif is an ethernet device. It might not use
+ * ARP or TCP/IP if it is used for PPPoE only.
+ */
+#define NETIF_FLAG_ETHERNET     0x40U
+/** If set, the netif has IGMP capability.
+ * Set by the netif driver in its init function. */
+#define NETIF_FLAG_IGMP         0x80U
+
+/** Function prototype for netif init functions. Set up flags and output/linkoutput
+ * callback functions in this function.
+ *
+ * @param netif The netif to initialize
+ */
+typedef err_t (*netif_init_fn)(struct netif *netif);
+/** Function prototype for netif->input functions. This function is saved as 'input'
+ * callback function in the netif struct. Call it when a packet has been received.
+ *
+ * @param p The received packet, copied into a pbuf
+ * @param inp The netif which received the packet
+ */
+typedef err_t (*netif_input_fn)(struct pbuf *p, struct netif *inp);
+/** Function prototype for netif->output functions. Called by lwIP when a packet
+ * shall be sent. For ethernet netif, set this to 'etharp_output' and set
+ * 'linkoutput'.
+ *
+ * @param netif The netif which shall send a packet
+ * @param p The packet to send (p->payload points to IP header)
+ * @param ipaddr The IP address to which the packet shall be sent
+ */
+typedef err_t (*netif_output_fn)(struct netif *netif, struct pbuf *p,
+       ip_addr_t *ipaddr);
+/** Function prototype for netif->linkoutput functions. Only used for ethernet
+ * netifs. This function is called by ARP when a packet shall be sent.
+ *
+ * @param netif The netif which shall send a packet
+ * @param p The packet to send (raw ethernet packet)
+ */
+typedef err_t (*netif_linkoutput_fn)(struct netif *netif, struct pbuf *p);
+/** Function prototype for netif status- or link-callback functions. */
+typedef void (*netif_status_callback_fn)(struct netif *netif);
+/** Function prototype for netif igmp_mac_filter functions */
+typedef err_t (*netif_igmp_mac_filter_fn)(struct netif *netif,
+       ip_addr_t *group, u8_t action);
+
+/** Generic data structure used for all lwIP network interfaces.
+ *  The following fields should be filled in by the initialization
+ *  function for the device driver: hwaddr_len, hwaddr[], mtu, flags */
+struct netif {
+  /** pointer to next in linked list */
+  struct netif *next;
+
+  /** IP address configuration in network byte order */
+  ip_addr_t ip_addr;
+  ip_addr_t netmask;
+  ip_addr_t gw;
+
+  /** This function is called by the network device driver
+   *  to pass a packet up the TCP/IP stack. */
+  netif_input_fn input;
+  /** This function is called by the IP module when it wants
+   *  to send a packet on the interface. This function typically
+   *  first resolves the hardware address, then sends the packet. */
+  netif_output_fn output;
+  /** This function is called by the ARP module when it wants
+   *  to send a packet on the interface. This function outputs
+   *  the pbuf as-is on the link medium. */
+  netif_linkoutput_fn linkoutput;
+#if LWIP_NETIF_STATUS_CALLBACK
+  /** This function is called when the netif state is set to up or down
+   */
+  netif_status_callback_fn status_callback;
+#endif /* LWIP_NETIF_STATUS_CALLBACK */
+#if LWIP_NETIF_LINK_CALLBACK
+  /** This function is called when the netif link is set to up or down
+   */
+  netif_status_callback_fn link_callback;
+#endif /* LWIP_NETIF_LINK_CALLBACK */
+#if LWIP_NETIF_REMOVE_CALLBACK
+  /** This function is called when the netif has been removed */
+  netif_status_callback_fn remove_callback;
+#endif /* LWIP_NETIF_REMOVE_CALLBACK */
+  /** This field can be set by the device driver and could point
+   *  to state information for the device. */
+  void *state;
+#if LWIP_DHCP
+  /** the DHCP client state information for this netif */
+  struct dhcp *dhcp;
+#endif /* LWIP_DHCP */
+#if LWIP_AUTOIP
+  /** the AutoIP client state information for this netif */
+  struct autoip *autoip;
+#endif
+#if LWIP_NETIF_HOSTNAME
+  /* the hostname for this netif, NULL is a valid value */
+  char*  hostname;
+#endif /* LWIP_NETIF_HOSTNAME */
+  /** maximum transfer unit (in bytes) */
+  u16_t mtu;
+  /** number of bytes used in hwaddr */
+  u8_t hwaddr_len;
+  /** link level hardware address of this interface */
+  u8_t hwaddr[NETIF_MAX_HWADDR_LEN];
+  /** flags (see NETIF_FLAG_ above) */
+  u8_t flags;
+  /** descriptive abbreviation */
+  char name[2];
+  /** number of this interface */
+  u8_t num;
+#if LWIP_SNMP
+  /** link type (from "snmp_ifType" enum from snmp.h) */
+  u8_t link_type;
+  /** (estimate) link speed */
+  u32_t link_speed;
+  /** timestamp at last change made (up/down) */
+  u32_t ts;
+  /** counters */
+  u32_t ifinoctets;
+  u32_t ifinucastpkts;
+  u32_t ifinnucastpkts;
+  u32_t ifindiscards;
+  u32_t ifoutoctets;
+  u32_t ifoutucastpkts;
+  u32_t ifoutnucastpkts;
+  u32_t ifoutdiscards;
+#endif /* LWIP_SNMP */
+#if LWIP_IGMP
+  /** This function could be called to add or delete a entry in the multicast
+      filter table of the ethernet MAC.*/
+  netif_igmp_mac_filter_fn igmp_mac_filter;
+#endif /* LWIP_IGMP */
+#if LWIP_NETIF_HWADDRHINT
+  u8_t *addr_hint;
+#endif /* LWIP_NETIF_HWADDRHINT */
+#if ENABLE_LOOPBACK
+  /* List of packets to be queued for ourselves. */
+  struct pbuf *loop_first;
+  struct pbuf *loop_last;
+#if LWIP_LOOPBACK_MAX_PBUFS
+  u16_t loop_cnt_current;
+#endif /* LWIP_LOOPBACK_MAX_PBUFS */
+#endif /* ENABLE_LOOPBACK */
+};
+
+#if LWIP_SNMP
+#define NETIF_INIT_SNMP(netif, type, speed) \
+  /* use "snmp_ifType" enum from snmp.h for "type", snmp_ifType_ethernet_csmacd by example */ \
+  (netif)->link_type = (type);    \
+  /* your link speed here (units: bits per second) */  \
+  (netif)->link_speed = (speed);  \
+  (netif)->ts = 0;              \
+  (netif)->ifinoctets = 0;      \
+  (netif)->ifinucastpkts = 0;   \
+  (netif)->ifinnucastpkts = 0;  \
+  (netif)->ifindiscards = 0;    \
+  (netif)->ifoutoctets = 0;     \
+  (netif)->ifoutucastpkts = 0;  \
+  (netif)->ifoutnucastpkts = 0; \
+  (netif)->ifoutdiscards = 0
+#else /* LWIP_SNMP */
+#define NETIF_INIT_SNMP(netif, type, speed)
+#endif /* LWIP_SNMP */
+
+
+/** The list of network interfaces. */
+extern struct netif *netif_list;
+/** The default network interface. */
+extern struct netif *netif_default;
+
+void netif_init(void);
+
+struct netif *netif_add(struct netif *netif, ip_addr_t *ipaddr, ip_addr_t *netmask,
+      ip_addr_t *gw, void *state, netif_init_fn init, netif_input_fn input);
+
+void
+netif_set_addr(struct netif *netif, ip_addr_t *ipaddr, ip_addr_t *netmask,
+      ip_addr_t *gw);
+void netif_remove(struct netif * netif);
+
+/* Returns a network interface given its name. The name is of the form
+   "et0", where the first two letters are the "name" field in the
+   netif structure, and the digit is in the num field in the same
+   structure. */
+struct netif *netif_find(char *name);
+
+void netif_set_default(struct netif *netif);
+
+void netif_set_ipaddr(struct netif *netif, ip_addr_t *ipaddr);
+void netif_set_netmask(struct netif *netif, ip_addr_t *netmask);
+void netif_set_gw(struct netif *netif, ip_addr_t *gw);
+
+void netif_set_up(struct netif *netif);
+void netif_set_down(struct netif *netif);
+/** Ask if an interface is up */
+#define netif_is_up(netif) (((netif)->flags & NETIF_FLAG_UP) ? (u8_t)1 : (u8_t)0)
+
+#if LWIP_NETIF_STATUS_CALLBACK
+void netif_set_status_callback(struct netif *netif, netif_status_callback_fn status_callback);
+#endif /* LWIP_NETIF_STATUS_CALLBACK */
+#if LWIP_NETIF_REMOVE_CALLBACK
+void netif_set_remove_callback(struct netif *netif, netif_status_callback_fn remove_callback);
+#endif /* LWIP_NETIF_REMOVE_CALLBACK */
+
+void netif_set_link_up(struct netif *netif);
+void netif_set_link_down(struct netif *netif);
+/** Ask if a link is up */ 
+#define netif_is_link_up(netif) (((netif)->flags & NETIF_FLAG_LINK_UP) ? (u8_t)1 : (u8_t)0)
+
+#if LWIP_NETIF_LINK_CALLBACK
+void netif_set_link_callback(struct netif *netif, netif_status_callback_fn link_callback);
+#endif /* LWIP_NETIF_LINK_CALLBACK */
+
+#if LWIP_NETIF_HOSTNAME
+#define netif_set_hostname(netif, name) do { if((netif) != NULL) { (netif)->hostname = name; }}while(0)
+#define netif_get_hostname(netif) (((netif) != NULL) ? ((netif)->hostname) : NULL)
+#endif /* LWIP_NETIF_HOSTNAME */
+
+#if LWIP_IGMP
+#define netif_set_igmp_mac_filter(netif, function) do { if((netif) != NULL) { (netif)->igmp_mac_filter = function; }}while(0)
+#define netif_get_igmp_mac_filter(netif) (((netif) != NULL) ? ((netif)->igmp_mac_filter) : NULL)
+#endif /* LWIP_IGMP */
+
+#if ENABLE_LOOPBACK
+err_t netif_loop_output(struct netif *netif, struct pbuf *p, ip_addr_t *dest_ip);
+void netif_poll(struct netif *netif);
+#if !LWIP_NETIF_LOOPBACK_MULTITHREADING
+void netif_poll_all(void);
+#endif /* !LWIP_NETIF_LOOPBACK_MULTITHREADING */
+#endif /* ENABLE_LOOPBACK */
+
+#if LWIP_NETIF_HWADDRHINT
+#define NETIF_SET_HWADDRHINT(netif, hint) ((netif)->addr_hint = (hint))
+#else /* LWIP_NETIF_HWADDRHINT */
+#define NETIF_SET_HWADDRHINT(netif, hint)
+#endif /* LWIP_NETIF_HWADDRHINT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_NETIF_H__ */
diff --git a/ext/lwip/src/include/lwip/netifapi.h b/ext/lwip/src/include/lwip/netifapi.h
new file mode 100644
index 000000000..33318efaf
--- /dev/null
+++ b/ext/lwip/src/include/lwip/netifapi.h
@@ -0,0 +1,108 @@
+/*
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ */
+ 
+#ifndef __LWIP_NETIFAPI_H__
+#define __LWIP_NETIFAPI_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_NETIF_API /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/sys.h"
+#include "lwip/netif.h"
+#include "lwip/dhcp.h"
+#include "lwip/autoip.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*netifapi_void_fn)(struct netif *netif);
+typedef err_t (*netifapi_errt_fn)(struct netif *netif);
+
+struct netifapi_msg_msg {
+#if !LWIP_TCPIP_CORE_LOCKING
+  sys_sem_t sem;
+#endif /* !LWIP_TCPIP_CORE_LOCKING */
+  err_t err;
+  struct netif *netif;
+  union {
+    struct {
+      ip_addr_t *ipaddr;
+      ip_addr_t *netmask;
+      ip_addr_t *gw;
+      void *state;
+      netif_init_fn init;
+      netif_input_fn input;
+    } add;
+    struct {
+      netifapi_void_fn voidfunc;
+      netifapi_errt_fn errtfunc;
+    } common;
+  } msg;
+};
+
+struct netifapi_msg {
+  void (* function)(struct netifapi_msg_msg *msg);
+  struct netifapi_msg_msg msg;
+};
+
+
+/* API for application */
+err_t netifapi_netif_add       ( struct netif *netif,
+                                 ip_addr_t *ipaddr,
+                                 ip_addr_t *netmask,
+                                 ip_addr_t *gw,
+                                 void *state,
+                                 netif_init_fn init,
+                                 netif_input_fn input);
+
+err_t netifapi_netif_set_addr  ( struct netif *netif,
+                                 ip_addr_t *ipaddr,
+                                 ip_addr_t *netmask,
+                                 ip_addr_t *gw );
+
+err_t netifapi_netif_common    ( struct netif *netif,
+                                 netifapi_void_fn voidfunc,
+                                 netifapi_errt_fn errtfunc);
+
+#define netifapi_netif_remove(n)      netifapi_netif_common(n, netif_remove, NULL)
+#define netifapi_netif_set_up(n)      netifapi_netif_common(n, netif_set_up, NULL)
+#define netifapi_netif_set_down(n)    netifapi_netif_common(n, netif_set_down, NULL)
+#define netifapi_netif_set_default(n) netifapi_netif_common(n, netif_set_default, NULL)
+#define netifapi_dhcp_start(n)        netifapi_netif_common(n, NULL, dhcp_start)
+#define netifapi_dhcp_stop(n)         netifapi_netif_common(n, dhcp_stop, NULL)
+#define netifapi_autoip_start(n)      netifapi_netif_common(n, NULL, autoip_start)
+#define netifapi_autoip_stop(n)       netifapi_netif_common(n, NULL, autoip_stop)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_NETIF_API */
+
+#endif /* __LWIP_NETIFAPI_H__ */
diff --git a/ext/lwip/src/include/lwip/opt.h b/ext/lwip/src/include/lwip/opt.h
new file mode 100644
index 000000000..e00097232
--- /dev/null
+++ b/ext/lwip/src/include/lwip/opt.h
@@ -0,0 +1,2133 @@
+/**
+ * @file
+ *
+ * lwIP Options Configuration
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_OPT_H__
+#define __LWIP_OPT_H__
+
+/*
+ * Include user defined options first. Anything not defined in these files
+ * will be set to standard values. Override anything you dont like!
+ */
+#include "../../../lwipopts.h"
+#include "lwip/debug.h"
+
+/*
+   -----------------------------------------------
+   ---------- Platform specific locking ----------
+   -----------------------------------------------
+*/
+
+/**
+ * SYS_LIGHTWEIGHT_PROT==1: if you want inter-task protection for certain
+ * critical regions during buffer allocation, deallocation and memory
+ * allocation and deallocation.
+ */
+#ifndef SYS_LIGHTWEIGHT_PROT
+#define SYS_LIGHTWEIGHT_PROT            0
+#endif
+
+/**
+ * NO_SYS==1: Provides VERY minimal functionality. Otherwise,
+ * use lwIP facilities.
+ */
+#ifndef NO_SYS
+#define NO_SYS                          1
+#endif
+
+/**
+ * NO_SYS_NO_TIMERS==1: Drop support for sys_timeout when NO_SYS==1
+ * Mainly for compatibility to old versions.
+ */
+#ifndef NO_SYS_NO_TIMERS
+#define NO_SYS_NO_TIMERS                0
+#endif
+
+/**
+ * MEMCPY: override this if you have a faster implementation at hand than the
+ * one included in your C library
+ */
+#ifndef MEMCPY
+#define MEMCPY(dst,src,len)             memcpy(dst,src,len)
+#endif
+
+/**
+ * SMEMCPY: override this with care! Some compilers (e.g. gcc) can inline a
+ * call to memcpy() if the length is known at compile time and is small.
+ */
+#ifndef SMEMCPY
+#define SMEMCPY(dst,src,len)            memcpy(dst,src,len)
+#endif
+
+/*
+   ------------------------------------
+   ---------- Memory options ----------
+   ------------------------------------
+*/
+/**
+ * MEM_LIBC_MALLOC==1: Use malloc/free/realloc provided by your C-library
+ * instead of the lwip internal allocator. Can save code size if you
+ * already use it.
+ */
+#ifndef MEM_LIBC_MALLOC
+#define MEM_LIBC_MALLOC                 0
+#endif
+
+/**
+* MEMP_MEM_MALLOC==1: Use mem_malloc/mem_free instead of the lwip pool allocator.
+* Especially useful with MEM_LIBC_MALLOC but handle with care regarding execution
+* speed and usage from interrupts!
+*/
+#ifndef MEMP_MEM_MALLOC
+#define MEMP_MEM_MALLOC                 0
+#endif
+
+/**
+ * MEM_ALIGNMENT: should be set to the alignment of the CPU
+ *    4 byte alignment -> #define MEM_ALIGNMENT 4
+ *    2 byte alignment -> #define MEM_ALIGNMENT 2
+ */
+#ifndef MEM_ALIGNMENT
+#define MEM_ALIGNMENT                   1
+#endif
+
+/**
+ * MEM_SIZE: the size of the heap memory. If the application will send
+ * a lot of data that needs to be copied, this should be set high.
+ */
+#ifndef MEM_SIZE
+#define MEM_SIZE                        1024 * 1024 * 64
+#endif
+
+/**
+ * MEMP_SEPARATE_POOLS: if defined to 1, each pool is placed in its own array.
+ * This can be used to individually change the location of each pool.
+ * Default is one big array for all pools
+ */
+#ifndef MEMP_SEPARATE_POOLS
+#define MEMP_SEPARATE_POOLS             0
+#endif
+
+/**
+ * MEMP_OVERFLOW_CHECK: memp overflow protection reserves a configurable
+ * amount of bytes before and after each memp element in every pool and fills
+ * it with a prominent default value.
+ *    MEMP_OVERFLOW_CHECK == 0 no checking
+ *    MEMP_OVERFLOW_CHECK == 1 checks each element when it is freed
+ *    MEMP_OVERFLOW_CHECK >= 2 checks each element in every pool every time
+ *      memp_malloc() or memp_free() is called (useful but slow!)
+ */
+#ifndef MEMP_OVERFLOW_CHECK
+#define MEMP_OVERFLOW_CHECK             0
+#endif
+
+/**
+ * MEMP_SANITY_CHECK==1: run a sanity check after each memp_free() to make
+ * sure that there are no cycles in the linked lists.
+ */
+#ifndef MEMP_SANITY_CHECK
+#define MEMP_SANITY_CHECK               0
+#endif
+
+/**
+ * MEM_USE_POOLS==1: Use an alternative to malloc() by allocating from a set
+ * of memory pools of various sizes. When mem_malloc is called, an element of
+ * the smallest pool that can provide the length needed is returned.
+ * To use this, MEMP_USE_CUSTOM_POOLS also has to be enabled.
+ */
+#ifndef MEM_USE_POOLS
+#define MEM_USE_POOLS                   0
+#endif
+
+/**
+ * MEM_USE_POOLS_TRY_BIGGER_POOL==1: if one malloc-pool is empty, try the next
+ * bigger pool - WARNING: THIS MIGHT WASTE MEMORY but it can make a system more
+ * reliable. */
+#ifndef MEM_USE_POOLS_TRY_BIGGER_POOL
+#define MEM_USE_POOLS_TRY_BIGGER_POOL   0
+#endif
+
+/**
+ * MEMP_USE_CUSTOM_POOLS==1: whether to include a user file lwippools.h
+ * that defines additional pools beyond the "standard" ones required
+ * by lwIP. If you set this to 1, you must have lwippools.h in your
+ * inlude path somewhere.
+ */
+#ifndef MEMP_USE_CUSTOM_POOLS
+#define MEMP_USE_CUSTOM_POOLS           0
+#endif
+
+/**
+ * Set this to 1 if you want to free PBUF_RAM pbufs (or call mem_free()) from
+ * interrupt context (or another context that doesn't allow waiting for a
+ * semaphore).
+ * If set to 1, mem_malloc will be protected by a semaphore and SYS_ARCH_PROTECT,
+ * while mem_free will only use SYS_ARCH_PROTECT. mem_malloc SYS_ARCH_UNPROTECTs
+ * with each loop so that mem_free can run.
+ *
+ * ATTENTION: As you can see from the above description, this leads to dis-/
+ * enabling interrupts often, which can be slow! Also, on low memory, mem_malloc
+ * can need longer.
+ *
+ * If you don't want that, at least for NO_SYS=0, you can still use the following
+ * functions to enqueue a deallocation call which then runs in the tcpip_thread
+ * context:
+ * - pbuf_free_callback(p);
+ * - mem_free_callback(m);
+ */
+#ifndef LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
+#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 0
+#endif
+
+/*
+   ------------------------------------------------
+   ---------- Internal Memory Pool Sizes ----------
+   ------------------------------------------------
+*/
+/**
+ * MEMP_NUM_PBUF: the number of memp struct pbufs (used for PBUF_ROM and PBUF_REF).
+ * If the application sends a lot of data out of ROM (or other static memory),
+ * this should be set high.
+ */
+#ifndef MEMP_NUM_PBUF
+#define MEMP_NUM_PBUF                   128
+#endif
+
+/**
+ * MEMP_NUM_RAW_PCB: Number of raw connection PCBs
+ * (requires the LWIP_RAW option)
+ */
+#ifndef MEMP_NUM_RAW_PCB
+#define MEMP_NUM_RAW_PCB                64
+#endif
+
+/**
+ * MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
+ * per active UDP "connection".
+ * (requires the LWIP_UDP option)
+ */
+#ifndef MEMP_NUM_UDP_PCB
+#define MEMP_NUM_UDP_PCB                4
+#endif
+
+/**
+ * MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections.
+ * (requires the LWIP_TCP option)
+ */
+#ifndef MEMP_NUM_TCP_PCB
+#define MEMP_NUM_TCP_PCB                64
+#endif
+
+/**
+ * MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections.
+ * (requires the LWIP_TCP option)
+ */
+#ifndef MEMP_NUM_TCP_PCB_LISTEN
+#define MEMP_NUM_TCP_PCB_LISTEN         64
+#endif
+
+/**
+ * MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments.
+ * (requires the LWIP_TCP option)
+ */
+#ifndef MEMP_NUM_TCP_SEG
+#define MEMP_NUM_TCP_SEG                256
+#endif
+
+/**
+ * MEMP_NUM_REASSDATA: the number of IP packets simultaneously queued for
+ * reassembly (whole packets, not fragments!)
+ */
+#ifndef MEMP_NUM_REASSDATA
+#define MEMP_NUM_REASSDATA              5
+#endif
+
+/**
+ * MEMP_NUM_FRAG_PBUF: the number of IP fragments simultaneously sent
+ * (fragments, not whole packets!).
+ * This is only used with IP_FRAG_USES_STATIC_BUF==0 and
+ * LWIP_NETIF_TX_SINGLE_PBUF==0 and only has to be > 1 with DMA-enabled MACs
+ * where the packet is not yet sent when netif->output returns.
+ */
+#ifndef MEMP_NUM_FRAG_PBUF
+#define MEMP_NUM_FRAG_PBUF              15
+#endif
+
+/**
+ * MEMP_NUM_ARP_QUEUE: the number of simulateously queued outgoing
+ * packets (pbufs) that are waiting for an ARP request (to resolve
+ * their destination address) to finish.
+ * (requires the ARP_QUEUEING option)
+ */
+#ifndef MEMP_NUM_ARP_QUEUE
+#define MEMP_NUM_ARP_QUEUE              30
+#endif
+
+/**
+ * MEMP_NUM_IGMP_GROUP: The number of multicast groups whose network interfaces
+ * can be members et the same time (one per netif - allsystems group -, plus one
+ * per netif membership).
+ * (requires the LWIP_IGMP option)
+ */
+#ifndef MEMP_NUM_IGMP_GROUP
+#define MEMP_NUM_IGMP_GROUP             8
+#endif
+
+/**
+ * MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts.
+ * (requires NO_SYS==0)
+ * The default number of timeouts is calculated here for all enabled modules.
+ * The formula expects settings to be either '0' or '1'.
+ */
+#ifndef MEMP_NUM_SYS_TIMEOUT
+#define MEMP_NUM_SYS_TIMEOUT            (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT)
+#endif
+
+/**
+ * MEMP_NUM_NETBUF: the number of struct netbufs.
+ * (only needed if you use the sequential API, like api_lib.c)
+ */
+#ifndef MEMP_NUM_NETBUF
+#define MEMP_NUM_NETBUF                 2
+#endif
+
+/**
+ * MEMP_NUM_NETCONN: the number of struct netconns.
+ * (only needed if you use the sequential API, like api_lib.c)
+ */
+#ifndef MEMP_NUM_NETCONN
+#define MEMP_NUM_NETCONN                4
+#endif
+
+/**
+ * MEMP_NUM_TCPIP_MSG_API: the number of struct tcpip_msg, which are used
+ * for callback/timeout API communication.
+ * (only needed if you use tcpip.c)
+ */
+#ifndef MEMP_NUM_TCPIP_MSG_API
+#define MEMP_NUM_TCPIP_MSG_API          8
+#endif
+
+/**
+ * MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used
+ * for incoming packets.
+ * (only needed if you use tcpip.c)
+ */
+#ifndef MEMP_NUM_TCPIP_MSG_INPKT
+#define MEMP_NUM_TCPIP_MSG_INPKT        8
+#endif
+
+/**
+ * MEMP_NUM_SNMP_NODE: the number of leafs in the SNMP tree.
+ */
+#ifndef MEMP_NUM_SNMP_NODE
+#define MEMP_NUM_SNMP_NODE              50
+#endif
+
+/**
+ * MEMP_NUM_SNMP_ROOTNODE: the number of branches in the SNMP tree.
+ * Every branch has one leaf (MEMP_NUM_SNMP_NODE) at least!
+ */
+#ifndef MEMP_NUM_SNMP_ROOTNODE
+#define MEMP_NUM_SNMP_ROOTNODE          30
+#endif
+
+/**
+ * MEMP_NUM_SNMP_VARBIND: the number of concurrent requests (does not have to
+ * be changed normally) - 2 of these are used per request (1 for input,
+ * 1 for output)
+ */
+#ifndef MEMP_NUM_SNMP_VARBIND
+#define MEMP_NUM_SNMP_VARBIND           2
+#endif
+
+/**
+ * MEMP_NUM_SNMP_VALUE: the number of OID or values concurrently used
+ * (does not have to be changed normally) - 3 of these are used per request
+ * (1 for the value read and 2 for OIDs - input and output)
+ */
+#ifndef MEMP_NUM_SNMP_VALUE
+#define MEMP_NUM_SNMP_VALUE             3
+#endif
+
+/**
+ * MEMP_NUM_NETDB: the number of concurrently running lwip_addrinfo() calls
+ * (before freeing the corresponding memory using lwip_freeaddrinfo()).
+ */
+#ifndef MEMP_NUM_NETDB
+#define MEMP_NUM_NETDB                  1
+#endif
+
+/**
+ * MEMP_NUM_LOCALHOSTLIST: the number of host entries in the local host list
+ * if DNS_LOCAL_HOSTLIST_IS_DYNAMIC==1.
+ */
+#ifndef MEMP_NUM_LOCALHOSTLIST
+#define MEMP_NUM_LOCALHOSTLIST          1
+#endif
+
+/**
+ * MEMP_NUM_PPPOE_INTERFACES: the number of concurrently active PPPoE
+ * interfaces (only used with PPPOE_SUPPORT==1)
+ */
+#ifndef MEMP_NUM_PPPOE_INTERFACES
+#define MEMP_NUM_PPPOE_INTERFACES       1
+#endif
+
+/**
+ * PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
+ */
+#ifndef PBUF_POOL_SIZE
+#define PBUF_POOL_SIZE                  16
+#endif
+
+/*
+   ---------------------------------
+   ---------- ARP options ----------
+   ---------------------------------
+*/
+/**
+ * LWIP_ARP==1: Enable ARP functionality.
+ */
+#ifndef LWIP_ARP
+#define LWIP_ARP                        1
+#endif
+
+/**
+ * ARP_TABLE_SIZE: Number of active MAC-IP address pairs cached.
+ */
+#ifndef ARP_TABLE_SIZE
+#define ARP_TABLE_SIZE                  10
+#endif
+
+/**
+ * ARP_QUEUEING==1: Multiple outgoing packets are queued during hardware address
+ * resolution. By default, only the most recent packet is queued per IP address.
+ * This is sufficient for most protocols and mainly reduces TCP connection
+ * startup time. Set this to 1 if you know your application sends more than one
+ * packet in a row to an IP address that is not in the ARP cache.
+ */
+#ifndef ARP_QUEUEING
+#define ARP_QUEUEING                    0
+#endif
+
+/**
+ * ETHARP_TRUST_IP_MAC==1: Incoming IP packets cause the ARP table to be
+ * updated with the source MAC and IP addresses supplied in the packet.
+ * You may want to disable this if you do not trust LAN peers to have the
+ * correct addresses, or as a limited approach to attempt to handle
+ * spoofing. If disabled, lwIP will need to make a new ARP request if
+ * the peer is not already in the ARP table, adding a little latency.
+ * The peer *is* in the ARP table if it requested our address before.
+ * Also notice that this slows down input processing of every IP packet!
+ */
+#ifndef ETHARP_TRUST_IP_MAC
+#define ETHARP_TRUST_IP_MAC             0
+#endif
+
+/**
+ * ETHARP_SUPPORT_VLAN==1: support receiving ethernet packets with VLAN header.
+ * Additionally, you can define ETHARP_VLAN_CHECK to an u16_t VLAN ID to check.
+ * If ETHARP_VLAN_CHECK is defined, only VLAN-traffic for this VLAN is accepted.
+ * If ETHARP_VLAN_CHECK is not defined, all traffic is accepted.
+ * Alternatively, define a function/define ETHARP_VLAN_CHECK_FN(eth_hdr, vlan)
+ * that returns 1 to accept a packet or 0 to drop a packet.
+ */
+#ifndef ETHARP_SUPPORT_VLAN
+#define ETHARP_SUPPORT_VLAN             0
+#endif
+
+/** LWIP_ETHERNET==1: enable ethernet support for PPPoE even though ARP
+ * might be disabled
+ */
+#ifndef LWIP_ETHERNET
+#define LWIP_ETHERNET                   (LWIP_ARP || PPPOE_SUPPORT)
+#endif
+
+/** ETH_PAD_SIZE: number of bytes added before the ethernet header to ensure
+ * alignment of payload after that header. Since the header is 14 bytes long,
+ * without this padding e.g. addresses in the IP header will not be aligned
+ * on a 32-bit boundary, so setting this to 2 can speed up 32-bit-platforms.
+ */
+#ifndef ETH_PAD_SIZE
+#define ETH_PAD_SIZE                    0
+#endif
+
+/** ETHARP_SUPPORT_STATIC_ENTRIES==1: enable code to support static ARP table
+ * entries (using etharp_add_static_entry/etharp_remove_static_entry).
+ */
+#ifndef ETHARP_SUPPORT_STATIC_ENTRIES
+#define ETHARP_SUPPORT_STATIC_ENTRIES   0
+#endif
+
+
+/*
+   --------------------------------
+   ---------- IP options ----------
+   --------------------------------
+*/
+/**
+ * IP_FORWARD==1: Enables the ability to forward IP packets across network
+ * interfaces. If you are going to run lwIP on a device with only one network
+ * interface, define this to 0.
+ */
+#ifndef IP_FORWARD
+#define IP_FORWARD                      0
+#endif
+
+/**
+ * IP_OPTIONS_ALLOWED: Defines the behavior for IP options.
+ *      IP_OPTIONS_ALLOWED==0: All packets with IP options are dropped.
+ *      IP_OPTIONS_ALLOWED==1: IP options are allowed (but not parsed).
+ */
+#ifndef IP_OPTIONS_ALLOWED
+#define IP_OPTIONS_ALLOWED              1
+#endif
+
+/**
+ * IP_REASSEMBLY==1: Reassemble incoming fragmented IP packets. Note that
+ * this option does not affect outgoing packet sizes, which can be controlled
+ * via IP_FRAG.
+ */
+#ifndef IP_REASSEMBLY
+#define IP_REASSEMBLY                   1
+#endif
+
+/**
+ * IP_FRAG==1: Fragment outgoing IP packets if their size exceeds MTU. Note
+ * that this option does not affect incoming packet sizes, which can be
+ * controlled via IP_REASSEMBLY.
+ */
+#ifndef IP_FRAG
+#define IP_FRAG                         1
+#endif
+
+/**
+ * IP_REASS_MAXAGE: Maximum time (in multiples of IP_TMR_INTERVAL - so seconds, normally)
+ * a fragmented IP packet waits for all fragments to arrive. If not all fragments arrived
+ * in this time, the whole packet is discarded.
+ */
+#ifndef IP_REASS_MAXAGE
+#define IP_REASS_MAXAGE                 3
+#endif
+
+/**
+ * IP_REASS_MAX_PBUFS: Total maximum amount of pbufs waiting to be reassembled.
+ * Since the received pbufs are enqueued, be sure to configure
+ * PBUF_POOL_SIZE > IP_REASS_MAX_PBUFS so that the stack is still able to receive
+ * packets even if the maximum amount of fragments is enqueued for reassembly!
+ */
+#ifndef IP_REASS_MAX_PBUFS
+#define IP_REASS_MAX_PBUFS              10
+#endif
+
+/**
+ * IP_FRAG_USES_STATIC_BUF==1: Use a static MTU-sized buffer for IP
+ * fragmentation. Otherwise pbufs are allocated and reference the original
+ * packet data to be fragmented (or with LWIP_NETIF_TX_SINGLE_PBUF==1,
+ * new PBUF_RAM pbufs are used for fragments).
+ * ATTENTION: IP_FRAG_USES_STATIC_BUF==1 may not be used for DMA-enabled MACs!
+ */
+#ifndef IP_FRAG_USES_STATIC_BUF
+#define IP_FRAG_USES_STATIC_BUF         0
+#endif
+
+/**
+ * IP_FRAG_MAX_MTU: Assumed max MTU on any interface for IP frag buffer
+ * (requires IP_FRAG_USES_STATIC_BUF==1)
+ */
+#if IP_FRAG_USES_STATIC_BUF && !defined(IP_FRAG_MAX_MTU)
+#define IP_FRAG_MAX_MTU                 1500
+#endif
+
+/**
+ * IP_DEFAULT_TTL: Default value for Time-To-Live used by transport layers.
+ */
+#ifndef IP_DEFAULT_TTL
+#define IP_DEFAULT_TTL                  255
+#endif
+
+/**
+ * IP_SOF_BROADCAST=1: Use the SOF_BROADCAST field to enable broadcast
+ * filter per pcb on udp and raw send operations. To enable broadcast filter
+ * on recv operations, you also have to set IP_SOF_BROADCAST_RECV=1.
+ */
+#ifndef IP_SOF_BROADCAST
+#define IP_SOF_BROADCAST                0
+#endif
+
+/**
+ * IP_SOF_BROADCAST_RECV (requires IP_SOF_BROADCAST=1) enable the broadcast
+ * filter on recv operations.
+ */
+#ifndef IP_SOF_BROADCAST_RECV
+#define IP_SOF_BROADCAST_RECV           0
+#endif
+
+/**
+ * IP_FORWARD_ALLOW_TX_ON_RX_NETIF==1: allow ip_forward() to send packets back
+ * out on the netif where it was received. This should only be used for
+ * wireless networks.
+ * ATTENTION: When this is 1, make sure your netif driver correctly marks incoming
+ * link-layer-broadcast/multicast packets as such using the corresponding pbuf flags!
+ */
+#ifndef IP_FORWARD_ALLOW_TX_ON_RX_NETIF
+#define IP_FORWARD_ALLOW_TX_ON_RX_NETIF 0
+#endif
+
+/**
+ * LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS==1: randomize the local port for the first
+ * local TCP/UDP pcb (default==0). This can prevent creating predictable port
+ * numbers after booting a device.
+ */
+#ifndef LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS
+#define LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS 0
+#endif
+
+/*
+   ----------------------------------
+   ---------- ICMP options ----------
+   ----------------------------------
+*/
+/**
+ * LWIP_ICMP==1: Enable ICMP module inside the IP stack.
+ * Be careful, disable that make your product non-compliant to RFC1122
+ */
+#ifndef LWIP_ICMP
+#define LWIP_ICMP                       1
+#endif
+
+/**
+ * ICMP_TTL: Default value for Time-To-Live used by ICMP packets.
+ */
+#ifndef ICMP_TTL
+#define ICMP_TTL                       (IP_DEFAULT_TTL)
+#endif
+
+/**
+ * LWIP_BROADCAST_PING==1: respond to broadcast pings (default is unicast only)
+ */
+#ifndef LWIP_BROADCAST_PING
+#define LWIP_BROADCAST_PING             0
+#endif
+
+/**
+ * LWIP_MULTICAST_PING==1: respond to multicast pings (default is unicast only)
+ */
+#ifndef LWIP_MULTICAST_PING
+#define LWIP_MULTICAST_PING             0
+#endif
+
+/*
+   ---------------------------------
+   ---------- RAW options ----------
+   ---------------------------------
+*/
+/**
+ * LWIP_RAW==1: Enable application layer to hook into the IP layer itself.
+ */
+#ifndef LWIP_RAW
+#define LWIP_RAW                        1
+#endif
+
+/**
+ * LWIP_RAW==1: Enable application layer to hook into the IP layer itself.
+ */
+#ifndef RAW_TTL
+#define RAW_TTL                        (IP_DEFAULT_TTL)
+#endif
+
+/*
+   ----------------------------------
+   ---------- DHCP options ----------
+   ----------------------------------
+*/
+/**
+ * LWIP_DHCP==1: Enable DHCP module.
+ */
+#ifndef LWIP_DHCP
+#define LWIP_DHCP                       0
+#endif
+
+/**
+ * DHCP_DOES_ARP_CHECK==1: Do an ARP check on the offered address.
+ */
+#ifndef DHCP_DOES_ARP_CHECK
+#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
+#endif
+
+/*
+   ------------------------------------
+   ---------- AUTOIP options ----------
+   ------------------------------------
+*/
+/**
+ * LWIP_AUTOIP==1: Enable AUTOIP module.
+ */
+#ifndef LWIP_AUTOIP
+#define LWIP_AUTOIP                     0
+#endif
+
+/**
+ * LWIP_DHCP_AUTOIP_COOP==1: Allow DHCP and AUTOIP to be both enabled on
+ * the same interface at the same time.
+ */
+#ifndef LWIP_DHCP_AUTOIP_COOP
+#define LWIP_DHCP_AUTOIP_COOP           0
+#endif
+
+/**
+ * LWIP_DHCP_AUTOIP_COOP_TRIES: Set to the number of DHCP DISCOVER probes
+ * that should be sent before falling back on AUTOIP. This can be set
+ * as low as 1 to get an AutoIP address very quickly, but you should
+ * be prepared to handle a changing IP address when DHCP overrides
+ * AutoIP.
+ */
+#ifndef LWIP_DHCP_AUTOIP_COOP_TRIES
+#define LWIP_DHCP_AUTOIP_COOP_TRIES     9
+#endif
+
+/*
+   ----------------------------------
+   ---------- SNMP options ----------
+   ----------------------------------
+*/
+/**
+ * LWIP_SNMP==1: Turn on SNMP module. UDP must be available for SNMP
+ * transport.
+ */
+#ifndef LWIP_SNMP
+#define LWIP_SNMP                       0
+#endif
+
+/**
+ * SNMP_CONCURRENT_REQUESTS: Number of concurrent requests the module will
+ * allow. At least one request buffer is required.
+ * Does not have to be changed unless external MIBs answer request asynchronously
+ */
+#ifndef SNMP_CONCURRENT_REQUESTS
+#define SNMP_CONCURRENT_REQUESTS        1
+#endif
+
+/**
+ * SNMP_TRAP_DESTINATIONS: Number of trap destinations. At least one trap
+ * destination is required
+ */
+#ifndef SNMP_TRAP_DESTINATIONS
+#define SNMP_TRAP_DESTINATIONS          1
+#endif
+
+/**
+ * SNMP_PRIVATE_MIB:
+ * When using a private MIB, you have to create a file 'private_mib.h' that contains
+ * a 'struct mib_array_node mib_private' which contains your MIB.
+ */
+#ifndef SNMP_PRIVATE_MIB
+#define SNMP_PRIVATE_MIB                0
+#endif
+
+/**
+ * Only allow SNMP write actions that are 'safe' (e.g. disabeling netifs is not
+ * a safe action and disabled when SNMP_SAFE_REQUESTS = 1).
+ * Unsafe requests are disabled by default!
+ */
+#ifndef SNMP_SAFE_REQUESTS
+#define SNMP_SAFE_REQUESTS              1
+#endif
+
+/**
+ * The maximum length of strings used. This affects the size of
+ * MEMP_SNMP_VALUE elements.
+ */
+#ifndef SNMP_MAX_OCTET_STRING_LEN
+#define SNMP_MAX_OCTET_STRING_LEN       127
+#endif
+
+/**
+ * The maximum depth of the SNMP tree.
+ * With private MIBs enabled, this depends on your MIB!
+ * This affects the size of MEMP_SNMP_VALUE elements.
+ */
+#ifndef SNMP_MAX_TREE_DEPTH
+#define SNMP_MAX_TREE_DEPTH             15
+#endif
+
+/**
+ * The size of the MEMP_SNMP_VALUE elements, normally calculated from
+ * SNMP_MAX_OCTET_STRING_LEN and SNMP_MAX_TREE_DEPTH.
+ */
+#ifndef SNMP_MAX_VALUE_SIZE
+#define SNMP_MAX_VALUE_SIZE             LWIP_MAX((SNMP_MAX_OCTET_STRING_LEN)+1, sizeof(s32_t)*(SNMP_MAX_TREE_DEPTH))
+#endif
+
+/*
+   ----------------------------------
+   ---------- IGMP options ----------
+   ----------------------------------
+*/
+/**
+ * LWIP_IGMP==1: Turn on IGMP module.
+ */
+#ifndef LWIP_IGMP
+#define LWIP_IGMP                       0
+#endif
+
+/*
+   ----------------------------------
+   ---------- DNS options -----------
+   ----------------------------------
+*/
+/**
+ * LWIP_DNS==1: Turn on DNS module. UDP must be available for DNS
+ * transport.
+ */
+#ifndef LWIP_DNS
+#define LWIP_DNS                        0
+#endif
+
+/** DNS maximum number of entries to maintain locally. */
+#ifndef DNS_TABLE_SIZE
+#define DNS_TABLE_SIZE                  4
+#endif
+
+/** DNS maximum host name length supported in the name table. */
+#ifndef DNS_MAX_NAME_LENGTH
+#define DNS_MAX_NAME_LENGTH             256
+#endif
+
+/** The maximum of DNS servers */
+#ifndef DNS_MAX_SERVERS
+#define DNS_MAX_SERVERS                 2
+#endif
+
+/** DNS do a name checking between the query and the response. */
+#ifndef DNS_DOES_NAME_CHECK
+#define DNS_DOES_NAME_CHECK             1
+#endif
+
+/** DNS message max. size. Default value is RFC compliant. */
+#ifndef DNS_MSG_SIZE
+#define DNS_MSG_SIZE                    512
+#endif
+
+/** DNS_LOCAL_HOSTLIST: Implements a local host-to-address list. If enabled,
+ *  you have to define
+ *    #define DNS_LOCAL_HOSTLIST_INIT {{"host1", 0x123}, {"host2", 0x234}}
+ *  (an array of structs name/address, where address is an u32_t in network
+ *  byte order).
+ *
+ *  Instead, you can also use an external function:
+ *  #define DNS_LOOKUP_LOCAL_EXTERN(x) extern u32_t my_lookup_function(const char *name)
+ *  that returns the IP address or INADDR_NONE if not found.
+ */
+#ifndef DNS_LOCAL_HOSTLIST
+#define DNS_LOCAL_HOSTLIST              0
+#endif /* DNS_LOCAL_HOSTLIST */
+
+/** If this is turned on, the local host-list can be dynamically changed
+ *  at runtime. */
+#ifndef DNS_LOCAL_HOSTLIST_IS_DYNAMIC
+#define DNS_LOCAL_HOSTLIST_IS_DYNAMIC   0
+#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
+
+/*
+   ---------------------------------
+   ---------- UDP options ----------
+   ---------------------------------
+*/
+/**
+ * LWIP_UDP==1: Turn on UDP.
+ */
+#ifndef LWIP_UDP
+#define LWIP_UDP                        1
+#endif
+
+/**
+ * LWIP_UDPLITE==1: Turn on UDP-Lite. (Requires LWIP_UDP)
+ */
+#ifndef LWIP_UDPLITE
+#define LWIP_UDPLITE                    0
+#endif
+
+/**
+ * UDP_TTL: Default Time-To-Live value.
+ */
+#ifndef UDP_TTL
+#define UDP_TTL                         (IP_DEFAULT_TTL)
+#endif
+
+/**
+ * LWIP_NETBUF_RECVINFO==1: append destination addr and port to every netbuf.
+ */
+#ifndef LWIP_NETBUF_RECVINFO
+#define LWIP_NETBUF_RECVINFO            0
+#endif
+
+/*
+   ---------------------------------
+   ---------- TCP options ----------
+   ---------------------------------
+*/
+/**
+ * LWIP_TCP==1: Turn on TCP.
+ */
+#ifndef LWIP_TCP
+#define LWIP_TCP                        1
+#endif
+
+/**
+ * TCP_TTL: Default Time-To-Live value.
+ */
+#ifndef TCP_TTL
+#define TCP_TTL                         (IP_DEFAULT_TTL)
+#endif
+
+/**
+ * TCP_WND: The size of a TCP window.  This must be at least
+ * (2 * TCP_MSS) for things to work well
+ */
+#ifndef TCP_WND
+#define TCP_WND                         (4 * TCP_MSS)
+#endif
+
+/**
+ * TCP_MAXRTX: Maximum number of retransmissions of data segments.
+ */
+#ifndef TCP_MAXRTX
+#define TCP_MAXRTX                      12
+#endif
+
+/**
+ * TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments.
+ */
+#ifndef TCP_SYNMAXRTX
+#define TCP_SYNMAXRTX                   6
+#endif
+
+/**
+ * TCP_QUEUE_OOSEQ==1: TCP will queue segments that arrive out of order.
+ * Define to 0 if your device is low on memory.
+ */
+#ifndef TCP_QUEUE_OOSEQ
+#define TCP_QUEUE_OOSEQ                 (LWIP_TCP)
+#endif
+
+/**
+ * TCP_MSS: TCP Maximum segment size. (default is 536, a conservative default,
+ * you might want to increase this.)
+ * For the receive side, this MSS is advertised to the remote side
+ * when opening a connection. For the transmit size, this MSS sets
+ * an upper limit on the MSS advertised by the remote host.
+ */
+#ifndef TCP_MSS
+#define TCP_MSS                         8192
+#endif
+
+/**
+ * TCP_CALCULATE_EFF_SEND_MSS: "The maximum size of a segment that TCP really
+ * sends, the 'effective send MSS,' MUST be the smaller of the send MSS (which
+ * reflects the available reassembly buffer size at the remote host) and the
+ * largest size permitted by the IP layer" (RFC 1122)
+ * Setting this to 1 enables code that checks TCP_MSS against the MTU of the
+ * netif used for a connection and limits the MSS if it would be too big otherwise.
+ */
+#ifndef TCP_CALCULATE_EFF_SEND_MSS
+#define TCP_CALCULATE_EFF_SEND_MSS      1
+#endif
+
+
+/**
+ * TCP_SND_BUF: TCP sender buffer space (bytes).
+ * To achieve good performance, this should be at least 2 * TCP_MSS.
+ */
+#ifndef TCP_SND_BUF
+#define TCP_SND_BUF                     8192 * 7
+#endif
+
+/**
+ * TCP_SND_QUEUELEN: TCP sender buffer space (pbufs). This must be at least
+ * as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work.
+ */
+#ifndef TCP_SND_QUEUELEN
+#define TCP_SND_QUEUELEN                128
+#endif
+
+/**
+ * TCP_SNDLOWAT: TCP writable space (bytes). This must be less than
+ * TCP_SND_BUF. It is the amount of space which must be available in the
+ * TCP snd_buf for select to return writable (combined with TCP_SNDQUEUELOWAT).
+ */
+#ifndef TCP_SNDLOWAT
+#define TCP_SNDLOWAT                    LWIP_MIN(LWIP_MAX(((TCP_SND_BUF)/2), (2 * TCP_MSS) + 1), (TCP_SND_BUF) - 1)
+#endif
+
+/**
+ * TCP_SNDQUEUELOWAT: TCP writable bufs (pbuf count). This must be less
+ * than TCP_SND_QUEUELEN. If the number of pbufs queued on a pcb drops below
+ * this number, select returns writable (combined with TCP_SNDLOWAT).
+ */
+#ifndef TCP_SNDQUEUELOWAT
+#define TCP_SNDQUEUELOWAT               LWIP_MAX(((TCP_SND_QUEUELEN)/2), 5)
+#endif
+
+/**
+ * TCP_OOSEQ_MAX_BYTES: The maximum number of bytes queued on ooseq per pcb.
+ * Default is 0 (no limit). Only valid for TCP_QUEUE_OOSEQ==0.
+ */
+#ifndef TCP_OOSEQ_MAX_BYTES
+#define TCP_OOSEQ_MAX_BYTES             0
+#endif
+
+/**
+ * TCP_OOSEQ_MAX_PBUFS: The maximum number of pbufs queued on ooseq per pcb.
+ * Default is 0 (no limit). Only valid for TCP_QUEUE_OOSEQ==0.
+ */
+#ifndef TCP_OOSEQ_MAX_PBUFS
+#define TCP_OOSEQ_MAX_PBUFS             0
+#endif
+
+/**
+ * TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb.
+ */
+#ifndef TCP_LISTEN_BACKLOG
+#define TCP_LISTEN_BACKLOG              0
+#endif
+
+/**
+ * The maximum allowed backlog for TCP listen netconns.
+ * This backlog is used unless another is explicitly specified.
+ * 0xff is the maximum (u8_t).
+ */
+#ifndef TCP_DEFAULT_LISTEN_BACKLOG
+#define TCP_DEFAULT_LISTEN_BACKLOG      0xff
+#endif
+
+/**
+ * TCP_OVERSIZE: The maximum number of bytes that tcp_write may
+ * allocate ahead of time in an attempt to create shorter pbuf chains
+ * for transmission. The meaningful range is 0 to TCP_MSS. Some
+ * suggested values are:
+ *
+ * 0:         Disable oversized allocation. Each tcp_write() allocates a new
+              pbuf (old behaviour).
+ * 1:         Allocate size-aligned pbufs with minimal excess. Use this if your
+ *            scatter-gather DMA requires aligned fragments.
+ * 128:       Limit the pbuf/memory overhead to 20%.
+ * TCP_MSS:   Try to create unfragmented TCP packets.
+ * TCP_MSS/4: Try to create 4 fragments or less per TCP packet.
+ */
+#ifndef TCP_OVERSIZE
+#define TCP_OVERSIZE                    TCP_MSS
+#endif
+
+/**
+ * LWIP_TCP_TIMESTAMPS==1: support the TCP timestamp option.
+ */
+#ifndef LWIP_TCP_TIMESTAMPS
+#define LWIP_TCP_TIMESTAMPS             0
+#endif
+
+/**
+ * TCP_WND_UPDATE_THRESHOLD: difference in window to trigger an
+ * explicit window update
+ */
+#ifndef TCP_WND_UPDATE_THRESHOLD
+#define TCP_WND_UPDATE_THRESHOLD   (TCP_WND / 4)
+#endif
+
+/**
+ * LWIP_EVENT_API and LWIP_CALLBACK_API: Only one of these should be set to 1.
+ *     LWIP_EVENT_API==1: The user defines lwip_tcp_event() to receive all
+ *         events (accept, sent, etc) that happen in the system.
+ *     LWIP_CALLBACK_API==1: The PCB callback function is called directly
+ *         for the event. This is the default.
+ */
+#if !defined(LWIP_EVENT_API) && !defined(LWIP_CALLBACK_API)
+#define LWIP_EVENT_API                  0
+#define LWIP_CALLBACK_API               1
+#endif
+
+
+/*
+   ----------------------------------
+   ---------- Pbuf options ----------
+   ----------------------------------
+*/
+/**
+ * PBUF_LINK_HLEN: the number of bytes that should be allocated for a
+ * link level header. The default is 14, the standard value for
+ * Ethernet.
+ */
+#ifndef PBUF_LINK_HLEN
+#define PBUF_LINK_HLEN                  (14 + ETH_PAD_SIZE)
+#endif
+
+/**
+ * PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. The default is
+ * designed to accomodate single full size TCP frame in one pbuf, including
+ * TCP_MSS, IP header, and link header.
+ */
+#ifndef PBUF_POOL_BUFSIZE
+#define PBUF_POOL_BUFSIZE               LWIP_MEM_ALIGN_SIZE(TCP_MSS+40+PBUF_LINK_HLEN)
+#endif
+
+/*
+   ------------------------------------------------
+   ---------- Network Interfaces options ----------
+   ------------------------------------------------
+*/
+/**
+ * LWIP_NETIF_HOSTNAME==1: use DHCP_OPTION_HOSTNAME with netif's hostname
+ * field.
+ */
+#ifndef LWIP_NETIF_HOSTNAME
+#define LWIP_NETIF_HOSTNAME             0
+#endif
+
+/**
+ * LWIP_NETIF_API==1: Support netif api (in netifapi.c)
+ */
+#ifndef LWIP_NETIF_API
+#define LWIP_NETIF_API                  0
+#endif
+
+/**
+ * LWIP_NETIF_STATUS_CALLBACK==1: Support a callback function whenever an interface
+ * changes its up/down status (i.e., due to DHCP IP acquistion)
+ */
+#ifndef LWIP_NETIF_STATUS_CALLBACK
+#define LWIP_NETIF_STATUS_CALLBACK      0
+#endif
+
+/**
+ * LWIP_NETIF_LINK_CALLBACK==1: Support a callback function from an interface
+ * whenever the link changes (i.e., link down)
+ */
+#ifndef LWIP_NETIF_LINK_CALLBACK
+#define LWIP_NETIF_LINK_CALLBACK        0
+#endif
+
+/**
+ * LWIP_NETIF_REMOVE_CALLBACK==1: Support a callback function that is called
+ * when a netif has been removed
+ */
+#ifndef LWIP_NETIF_REMOVE_CALLBACK
+#define LWIP_NETIF_REMOVE_CALLBACK      0
+#endif
+
+/**
+ * LWIP_NETIF_HWADDRHINT==1: Cache link-layer-address hints (e.g. table
+ * indices) in struct netif. TCP and UDP can make use of this to prevent
+ * scanning the ARP table for every sent packet. While this is faster for big
+ * ARP tables or many concurrent connections, it might be counterproductive
+ * if you have a tiny ARP table or if there never are concurrent connections.
+ */
+#ifndef LWIP_NETIF_HWADDRHINT
+#define LWIP_NETIF_HWADDRHINT           0
+#endif
+
+/**
+ * LWIP_NETIF_LOOPBACK==1: Support sending packets with a destination IP
+ * address equal to the netif IP address, looping them back up the stack.
+ */
+#ifndef LWIP_NETIF_LOOPBACK
+#define LWIP_NETIF_LOOPBACK             0
+#endif
+
+/**
+ * LWIP_LOOPBACK_MAX_PBUFS: Maximum number of pbufs on queue for loopback
+ * sending for each netif (0 = disabled)
+ */
+#ifndef LWIP_LOOPBACK_MAX_PBUFS
+#define LWIP_LOOPBACK_MAX_PBUFS         0
+#endif
+
+/**
+ * LWIP_NETIF_LOOPBACK_MULTITHREADING: Indicates whether threading is enabled in
+ * the system, as netifs must change how they behave depending on this setting
+ * for the LWIP_NETIF_LOOPBACK option to work.
+ * Setting this is needed to avoid reentering non-reentrant functions like
+ * tcp_input().
+ *    LWIP_NETIF_LOOPBACK_MULTITHREADING==1: Indicates that the user is using a
+ *       multithreaded environment like tcpip.c. In this case, netif->input()
+ *       is called directly.
+ *    LWIP_NETIF_LOOPBACK_MULTITHREADING==0: Indicates a polling (or NO_SYS) setup.
+ *       The packets are put on a list and netif_poll() must be called in
+ *       the main application loop.
+ */
+#ifndef LWIP_NETIF_LOOPBACK_MULTITHREADING
+#define LWIP_NETIF_LOOPBACK_MULTITHREADING    (!NO_SYS)
+#endif
+
+/**
+ * LWIP_NETIF_TX_SINGLE_PBUF: if this is set to 1, lwIP tries to put all data
+ * to be sent into one single pbuf. This is for compatibility with DMA-enabled
+ * MACs that do not support scatter-gather.
+ * Beware that this might involve CPU-memcpy before transmitting that would not
+ * be needed without this flag! Use this only if you need to!
+ *
+ * @todo: TCP and IP-frag do not work with this, yet:
+ */
+#ifndef LWIP_NETIF_TX_SINGLE_PBUF
+#define LWIP_NETIF_TX_SINGLE_PBUF             0
+#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
+
+/*
+   ------------------------------------
+   ---------- LOOPIF options ----------
+   ------------------------------------
+*/
+/**
+ * LWIP_HAVE_LOOPIF==1: Support loop interface (127.0.0.1) and loopif.c
+ */
+#ifndef LWIP_HAVE_LOOPIF
+#define LWIP_HAVE_LOOPIF                0
+#endif
+
+/*
+   ------------------------------------
+   ---------- SLIPIF options ----------
+   ------------------------------------
+*/
+/**
+ * LWIP_HAVE_SLIPIF==1: Support slip interface and slipif.c
+ */
+#ifndef LWIP_HAVE_SLIPIF
+#define LWIP_HAVE_SLIPIF                0
+#endif
+
+/*
+   ------------------------------------
+   ---------- Thread options ----------
+   ------------------------------------
+*/
+/**
+ * TCPIP_THREAD_NAME: The name assigned to the main tcpip thread.
+ */
+#ifndef TCPIP_THREAD_NAME
+#define TCPIP_THREAD_NAME              "tcpip_thread"
+#endif
+
+/**
+ * TCPIP_THREAD_STACKSIZE: The stack size used by the main tcpip thread.
+ * The stack size value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef TCPIP_THREAD_STACKSIZE
+#define TCPIP_THREAD_STACKSIZE          0
+#endif
+
+/**
+ * TCPIP_THREAD_PRIO: The priority assigned to the main tcpip thread.
+ * The priority value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef TCPIP_THREAD_PRIO
+#define TCPIP_THREAD_PRIO               1
+#endif
+
+/**
+ * TCPIP_MBOX_SIZE: The mailbox size for the tcpip thread messages
+ * The queue size value itself is platform-dependent, but is passed to
+ * sys_mbox_new() when tcpip_init is called.
+ */
+#ifndef TCPIP_MBOX_SIZE
+#define TCPIP_MBOX_SIZE                 0
+#endif
+
+/**
+ * SLIPIF_THREAD_NAME: The name assigned to the slipif_loop thread.
+ */
+#ifndef SLIPIF_THREAD_NAME
+#define SLIPIF_THREAD_NAME             "slipif_loop"
+#endif
+
+/**
+ * SLIP_THREAD_STACKSIZE: The stack size used by the slipif_loop thread.
+ * The stack size value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef SLIPIF_THREAD_STACKSIZE
+#define SLIPIF_THREAD_STACKSIZE         0
+#endif
+
+/**
+ * SLIPIF_THREAD_PRIO: The priority assigned to the slipif_loop thread.
+ * The priority value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef SLIPIF_THREAD_PRIO
+#define SLIPIF_THREAD_PRIO              1
+#endif
+
+/**
+ * PPP_THREAD_NAME: The name assigned to the pppInputThread.
+ */
+#ifndef PPP_THREAD_NAME
+#define PPP_THREAD_NAME                "pppInputThread"
+#endif
+
+/**
+ * PPP_THREAD_STACKSIZE: The stack size used by the pppInputThread.
+ * The stack size value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef PPP_THREAD_STACKSIZE
+#define PPP_THREAD_STACKSIZE            0
+#endif
+
+/**
+ * PPP_THREAD_PRIO: The priority assigned to the pppInputThread.
+ * The priority value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef PPP_THREAD_PRIO
+#define PPP_THREAD_PRIO                 1
+#endif
+
+/**
+ * DEFAULT_THREAD_NAME: The name assigned to any other lwIP thread.
+ */
+#ifndef DEFAULT_THREAD_NAME
+#define DEFAULT_THREAD_NAME            "lwIP"
+#endif
+
+/**
+ * DEFAULT_THREAD_STACKSIZE: The stack size used by any other lwIP thread.
+ * The stack size value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef DEFAULT_THREAD_STACKSIZE
+#define DEFAULT_THREAD_STACKSIZE        0
+#endif
+
+/**
+ * DEFAULT_THREAD_PRIO: The priority assigned to any other lwIP thread.
+ * The priority value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef DEFAULT_THREAD_PRIO
+#define DEFAULT_THREAD_PRIO             1
+#endif
+
+/**
+ * DEFAULT_RAW_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
+ * NETCONN_RAW. The queue size value itself is platform-dependent, but is passed
+ * to sys_mbox_new() when the recvmbox is created.
+ */
+#ifndef DEFAULT_RAW_RECVMBOX_SIZE
+#define DEFAULT_RAW_RECVMBOX_SIZE       0
+#endif
+
+/**
+ * DEFAULT_UDP_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
+ * NETCONN_UDP. The queue size value itself is platform-dependent, but is passed
+ * to sys_mbox_new() when the recvmbox is created.
+ */
+#ifndef DEFAULT_UDP_RECVMBOX_SIZE
+#define DEFAULT_UDP_RECVMBOX_SIZE       0
+#endif
+
+/**
+ * DEFAULT_TCP_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
+ * NETCONN_TCP. The queue size value itself is platform-dependent, but is passed
+ * to sys_mbox_new() when the recvmbox is created.
+ */
+#ifndef DEFAULT_TCP_RECVMBOX_SIZE
+#define DEFAULT_TCP_RECVMBOX_SIZE       0
+#endif
+
+/**
+ * DEFAULT_ACCEPTMBOX_SIZE: The mailbox size for the incoming connections.
+ * The queue size value itself is platform-dependent, but is passed to
+ * sys_mbox_new() when the acceptmbox is created.
+ */
+#ifndef DEFAULT_ACCEPTMBOX_SIZE
+#define DEFAULT_ACCEPTMBOX_SIZE         0
+#endif
+
+/*
+   ----------------------------------------------
+   ---------- Sequential layer options ----------
+   ----------------------------------------------
+*/
+/**
+ * LWIP_TCPIP_CORE_LOCKING: (EXPERIMENTAL!)
+ * Don't use it if you're not an active lwIP project member
+ */
+#ifndef LWIP_TCPIP_CORE_LOCKING
+#define LWIP_TCPIP_CORE_LOCKING         0
+#endif
+
+/**
+ * LWIP_TCPIP_CORE_LOCKING_INPUT: (EXPERIMENTAL!)
+ * Don't use it if you're not an active lwIP project member
+ */
+#ifndef LWIP_TCPIP_CORE_LOCKING_INPUT
+#define LWIP_TCPIP_CORE_LOCKING_INPUT   0
+#endif
+
+/**
+ * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
+ */
+#ifndef LWIP_NETCONN
+#define LWIP_NETCONN                    1
+#endif
+
+/** LWIP_TCPIP_TIMEOUT==1: Enable tcpip_timeout/tcpip_untimeout tod create
+ * timers running in tcpip_thread from another thread.
+ */
+#ifndef LWIP_TCPIP_TIMEOUT
+#define LWIP_TCPIP_TIMEOUT              1
+#endif
+
+/*
+   ------------------------------------
+   ---------- Socket options ----------
+   ------------------------------------
+*/
+/**
+ * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
+ */
+#ifndef LWIP_SOCKET
+#define LWIP_SOCKET                     1
+#endif
+
+/**
+ * LWIP_COMPAT_SOCKETS==1: Enable BSD-style sockets functions names.
+ * (only used if you use sockets.c)
+ */
+#ifndef LWIP_COMPAT_SOCKETS
+#define LWIP_COMPAT_SOCKETS             1
+#endif
+
+/**
+ * LWIP_POSIX_SOCKETS_IO_NAMES==1: Enable POSIX-style sockets functions names.
+ * Disable this option if you use a POSIX operating system that uses the same
+ * names (read, write & close). (only used if you use sockets.c)
+ */
+#ifndef LWIP_POSIX_SOCKETS_IO_NAMES
+#define LWIP_POSIX_SOCKETS_IO_NAMES     1
+#endif
+
+/**
+ * LWIP_TCP_KEEPALIVE==1: Enable TCP_KEEPIDLE, TCP_KEEPINTVL and TCP_KEEPCNT
+ * options processing. Note that TCP_KEEPIDLE and TCP_KEEPINTVL have to be set
+ * in seconds. (does not require sockets.c, and will affect tcp.c)
+ */
+#ifndef LWIP_TCP_KEEPALIVE
+#define LWIP_TCP_KEEPALIVE              0
+#endif
+
+/**
+ * LWIP_SO_SNDTIMEO==1: Enable send timeout for sockets/netconns and
+ * SO_SNDTIMEO processing.
+ */
+#ifndef LWIP_SO_SNDTIMEO
+#define LWIP_SO_SNDTIMEO                0
+#endif
+
+/**
+ * LWIP_SO_RCVTIMEO==1: Enable receive timeout for sockets/netconns and
+ * SO_RCVTIMEO processing.
+ */
+#ifndef LWIP_SO_RCVTIMEO
+#define LWIP_SO_RCVTIMEO                0
+#endif
+
+/**
+ * LWIP_SO_RCVBUF==1: Enable SO_RCVBUF processing.
+ */
+#ifndef LWIP_SO_RCVBUF
+#define LWIP_SO_RCVBUF                  0
+#endif
+
+/**
+ * If LWIP_SO_RCVBUF is used, this is the default value for recv_bufsize.
+ */
+#ifndef RECV_BUFSIZE_DEFAULT
+#define RECV_BUFSIZE_DEFAULT            INT_MAX
+#endif
+
+/**
+ * SO_REUSE==1: Enable SO_REUSEADDR option.
+ */
+#ifndef SO_REUSE
+#define SO_REUSE                        0
+#endif
+
+/**
+ * SO_REUSE_RXTOALL==1: Pass a copy of incoming broadcast/multicast packets
+ * to all local matches if SO_REUSEADDR is turned on.
+ * WARNING: Adds a memcpy for every packet if passing to more than one pcb!
+ */
+#ifndef SO_REUSE_RXTOALL
+#define SO_REUSE_RXTOALL                0
+#endif
+
+/*
+   ----------------------------------------
+   ---------- Statistics options ----------
+   ----------------------------------------
+*/
+/**
+ * LWIP_STATS==1: Enable statistics collection in lwip_stats.
+ */
+#ifndef LWIP_STATS
+#define LWIP_STATS                      1
+#endif
+
+#if LWIP_STATS
+
+/**
+ * LWIP_STATS_DISPLAY==1: Compile in the statistics output functions.
+ */
+#ifndef LWIP_STATS_DISPLAY
+#define LWIP_STATS_DISPLAY              0
+#endif
+
+/**
+ * LINK_STATS==1: Enable link stats.
+ */
+#ifndef LINK_STATS
+#define LINK_STATS                      1
+#endif
+
+/**
+ * ETHARP_STATS==1: Enable etharp stats.
+ */
+#ifndef ETHARP_STATS
+#define ETHARP_STATS                    (LWIP_ARP)
+#endif
+
+/**
+ * IP_STATS==1: Enable IP stats.
+ */
+#ifndef IP_STATS
+#define IP_STATS                        1
+#endif
+
+/**
+ * IPFRAG_STATS==1: Enable IP fragmentation stats. Default is
+ * on if using either frag or reass.
+ */
+#ifndef IPFRAG_STATS
+#define IPFRAG_STATS                    (IP_REASSEMBLY || IP_FRAG)
+#endif
+
+/**
+ * ICMP_STATS==1: Enable ICMP stats.
+ */
+#ifndef ICMP_STATS
+#define ICMP_STATS                      1
+#endif
+
+/**
+ * IGMP_STATS==1: Enable IGMP stats.
+ */
+#ifndef IGMP_STATS
+#define IGMP_STATS                      (LWIP_IGMP)
+#endif
+
+/**
+ * UDP_STATS==1: Enable UDP stats. Default is on if
+ * UDP enabled, otherwise off.
+ */
+#ifndef UDP_STATS
+#define UDP_STATS                       (LWIP_UDP)
+#endif
+
+/**
+ * TCP_STATS==1: Enable TCP stats. Default is on if TCP
+ * enabled, otherwise off.
+ */
+#ifndef TCP_STATS
+#define TCP_STATS                       (LWIP_TCP)
+#endif
+
+/**
+ * MEM_STATS==1: Enable mem.c stats.
+ */
+#ifndef MEM_STATS
+#define MEM_STATS                       ((MEM_LIBC_MALLOC == 0) && (MEM_USE_POOLS == 0))
+#endif
+
+/**
+ * MEMP_STATS==1: Enable memp.c pool stats.
+ */
+#ifndef MEMP_STATS
+#define MEMP_STATS                      (MEMP_MEM_MALLOC == 0)
+#endif
+
+/**
+ * SYS_STATS==1: Enable system stats (sem and mbox counts, etc).
+ */
+#ifndef SYS_STATS
+#define SYS_STATS                       (NO_SYS == 0)
+#endif
+
+#else
+
+#define LINK_STATS                      0
+#define IP_STATS                        0
+#define IPFRAG_STATS                    0
+#define ICMP_STATS                      0
+#define IGMP_STATS                      0
+#define UDP_STATS                       0
+#define TCP_STATS                       1
+#define MEM_STATS                       1
+#define MEMP_STATS                      0
+#define SYS_STATS                       1
+#define LWIP_STATS_DISPLAY              0
+
+#endif /* LWIP_STATS */
+
+/*
+   ---------------------------------
+   ---------- PPP options ----------
+   ---------------------------------
+*/
+/**
+ * PPP_SUPPORT==1: Enable PPP.
+ */
+#ifndef PPP_SUPPORT
+#define PPP_SUPPORT                     0
+#endif
+
+/**
+ * PPPOE_SUPPORT==1: Enable PPP Over Ethernet
+ */
+#ifndef PPPOE_SUPPORT
+#define PPPOE_SUPPORT                   0
+#endif
+
+/**
+ * PPPOS_SUPPORT==1: Enable PPP Over Serial
+ */
+#ifndef PPPOS_SUPPORT
+#define PPPOS_SUPPORT                   PPP_SUPPORT
+#endif
+
+#if PPP_SUPPORT
+
+/**
+ * NUM_PPP: Max PPP sessions.
+ */
+#ifndef NUM_PPP
+#define NUM_PPP                         1
+#endif
+
+/**
+ * PAP_SUPPORT==1: Support PAP.
+ */
+#ifndef PAP_SUPPORT
+#define PAP_SUPPORT                     0
+#endif
+
+/**
+ * CHAP_SUPPORT==1: Support CHAP.
+ */
+#ifndef CHAP_SUPPORT
+#define CHAP_SUPPORT                    0
+#endif
+
+/**
+ * MSCHAP_SUPPORT==1: Support MSCHAP. CURRENTLY NOT SUPPORTED! DO NOT SET!
+ */
+#ifndef MSCHAP_SUPPORT
+#define MSCHAP_SUPPORT                  0
+#endif
+
+/**
+ * CBCP_SUPPORT==1: Support CBCP. CURRENTLY NOT SUPPORTED! DO NOT SET!
+ */
+#ifndef CBCP_SUPPORT
+#define CBCP_SUPPORT                    0
+#endif
+
+/**
+ * CCP_SUPPORT==1: Support CCP. CURRENTLY NOT SUPPORTED! DO NOT SET!
+ */
+#ifndef CCP_SUPPORT
+#define CCP_SUPPORT                     0
+#endif
+
+/**
+ * VJ_SUPPORT==1: Support VJ header compression.
+ */
+#ifndef VJ_SUPPORT
+#define VJ_SUPPORT                      0
+#endif
+
+/**
+ * MD5_SUPPORT==1: Support MD5 (see also CHAP).
+ */
+#ifndef MD5_SUPPORT
+#define MD5_SUPPORT                     0
+#endif
+
+/*
+ * Timeouts
+ */
+#ifndef FSM_DEFTIMEOUT
+#define FSM_DEFTIMEOUT                  6       /* Timeout time in seconds */
+#endif
+
+#ifndef FSM_DEFMAXTERMREQS
+#define FSM_DEFMAXTERMREQS              2       /* Maximum Terminate-Request transmissions */
+#endif
+
+#ifndef FSM_DEFMAXCONFREQS
+#define FSM_DEFMAXCONFREQS              10      /* Maximum Configure-Request transmissions */
+#endif
+
+#ifndef FSM_DEFMAXNAKLOOPS
+#define FSM_DEFMAXNAKLOOPS              5       /* Maximum number of nak loops */
+#endif
+
+#ifndef UPAP_DEFTIMEOUT
+#define UPAP_DEFTIMEOUT                 6       /* Timeout (seconds) for retransmitting req */
+#endif
+
+#ifndef UPAP_DEFREQTIME
+#define UPAP_DEFREQTIME                 30      /* Time to wait for auth-req from peer */
+#endif
+
+#ifndef CHAP_DEFTIMEOUT
+#define CHAP_DEFTIMEOUT                 6       /* Timeout time in seconds */
+#endif
+
+#ifndef CHAP_DEFTRANSMITS
+#define CHAP_DEFTRANSMITS               10      /* max # times to send challenge */
+#endif
+
+/* Interval in seconds between keepalive echo requests, 0 to disable. */
+#ifndef LCP_ECHOINTERVAL
+#define LCP_ECHOINTERVAL                0
+#endif
+
+/* Number of unanswered echo requests before failure. */
+#ifndef LCP_MAXECHOFAILS
+#define LCP_MAXECHOFAILS                3
+#endif
+
+/* Max Xmit idle time (in jiffies) before resend flag char. */
+#ifndef PPP_MAXIDLEFLAG
+#define PPP_MAXIDLEFLAG                 100
+#endif
+
+/*
+ * Packet sizes
+ *
+ * Note - lcp shouldn't be allowed to negotiate stuff outside these
+ *    limits.  See lcp.h in the pppd directory.
+ * (XXX - these constants should simply be shared by lcp.c instead
+ *    of living in lcp.h)
+ */
+#define PPP_MTU                         1500     /* Default MTU (size of Info field) */
+#ifndef PPP_MAXMTU
+/* #define PPP_MAXMTU  65535 - (PPP_HDRLEN + PPP_FCSLEN) */
+#define PPP_MAXMTU                      1500 /* Largest MTU we allow */
+#endif
+#define PPP_MINMTU                      64
+#define PPP_MRU                         1500     /* default MRU = max length of info field */
+#define PPP_MAXMRU                      1500     /* Largest MRU we allow */
+#ifndef PPP_DEFMRU
+#define PPP_DEFMRU                      296             /* Try for this */
+#endif
+#define PPP_MINMRU                      128             /* No MRUs below this */
+
+#ifndef MAXNAMELEN
+#define MAXNAMELEN                      256     /* max length of hostname or name for auth */
+#endif
+#ifndef MAXSECRETLEN
+#define MAXSECRETLEN                    256     /* max length of password or secret */
+#endif
+
+#endif /* PPP_SUPPORT */
+
+/*
+   --------------------------------------
+   ---------- Checksum options ----------
+   --------------------------------------
+*/
+/**
+ * CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.
+ */
+#ifndef CHECKSUM_GEN_IP
+#define CHECKSUM_GEN_IP                 1
+#endif
+
+/**
+ * CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.
+ */
+#ifndef CHECKSUM_GEN_UDP
+#define CHECKSUM_GEN_UDP                1
+#endif
+
+/**
+ * CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.
+ */
+#ifndef CHECKSUM_GEN_TCP
+#define CHECKSUM_GEN_TCP                1
+#endif
+
+/**
+ * CHECKSUM_GEN_ICMP==1: Generate checksums in software for outgoing ICMP packets.
+ */
+#ifndef CHECKSUM_GEN_ICMP
+#define CHECKSUM_GEN_ICMP               1
+#endif
+
+/**
+ * CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.
+ */
+#ifndef CHECKSUM_CHECK_IP
+#define CHECKSUM_CHECK_IP               1
+#endif
+
+/**
+ * CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.
+ */
+#ifndef CHECKSUM_CHECK_UDP
+#define CHECKSUM_CHECK_UDP              1
+#endif
+
+/**
+ * CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.
+ */
+#ifndef CHECKSUM_CHECK_TCP
+#define CHECKSUM_CHECK_TCP              1
+#endif
+
+/**
+ * LWIP_CHECKSUM_ON_COPY==1: Calculate checksum when copying data from
+ * application buffers to pbufs.
+ */
+#ifndef LWIP_CHECKSUM_ON_COPY
+#define LWIP_CHECKSUM_ON_COPY           0
+#endif
+
+/*
+   ---------------------------------------
+   ---------- Hook options ---------------
+   ---------------------------------------
+*/
+
+/* Hooks are undefined by default, define them to a function if you need them. */
+
+/**
+ * LWIP_HOOK_IP4_INPUT(pbuf, input_netif):
+ * - called from ip_input() (IPv4)
+ * - pbuf: received struct pbuf passed to ip_input()
+ * - input_netif: struct netif on which the packet has been received
+ * Return values:
+ * - 0: Hook has not consumed the packet, packet is processed as normal
+ * - != 0: Hook has consumed the packet.
+ * If the hook consumed the packet, 'pbuf' is in the responsibility of the hook
+ * (i.e. free it when done).
+ */
+
+/**
+ * LWIP_HOOK_IP4_ROUTE(dest):
+ * - called from ip_route() (IPv4)
+ * - dest: destination IPv4 address
+ * Returns the destination netif or NULL if no destination netif is found. In
+ * that case, ip_route() continues as normal.
+ */
+
+/*
+   ---------------------------------------
+   ---------- Debugging options ----------
+   ---------------------------------------
+*/
+/**
+ * LWIP_DBG_MIN_LEVEL: After masking, the value of the debug is
+ * compared against this value. If it is smaller, then debugging
+ * messages are written.
+ */
+#ifndef LWIP_DBG_MIN_LEVEL
+#define LWIP_DBG_MIN_LEVEL              LWIP_DBG_LEVEL_ALL
+#endif
+
+/**
+ * LWIP_DBG_TYPES_ON: A mask that can be used to globally enable/disable
+ * debug messages of certain types.
+ */
+#ifndef LWIP_DBG_TYPES_ON
+#define LWIP_DBG_TYPES_ON               LWIP_DBG_ON
+#endif
+
+/**
+ * ETHARP_DEBUG: Enable debugging in etharp.c.
+ */
+#ifndef ETHARP_DEBUG
+#define ETHARP_DEBUG                    LWIP_DBG_OFF
+#endif
+
+/**
+ * NETIF_DEBUG: Enable debugging in netif.c.
+ */
+#ifndef NETIF_DEBUG
+#define NETIF_DEBUG                     LWIP_DBG_OFF
+#endif
+
+/**
+ * PBUF_DEBUG: Enable debugging in pbuf.c.
+ */
+#ifndef PBUF_DEBUG
+#define PBUF_DEBUG                      LWIP_DBG_OFF
+#endif
+
+/**
+ * API_LIB_DEBUG: Enable debugging in api_lib.c.
+ */
+#ifndef API_LIB_DEBUG
+#define API_LIB_DEBUG                   LWIP_DBG_OFF
+#endif
+
+/**
+ * API_MSG_DEBUG: Enable debugging in api_msg.c.
+ */
+#ifndef API_MSG_DEBUG
+#define API_MSG_DEBUG                   LWIP_DBG_OFF
+#endif
+
+/**
+ * SOCKETS_DEBUG: Enable debugging in sockets.c.
+ */
+#ifndef SOCKETS_DEBUG
+#define SOCKETS_DEBUG                   LWIP_DBG_OFF
+#endif
+
+/**
+ * ICMP_DEBUG: Enable debugging in icmp.c.
+ */
+#ifndef ICMP_DEBUG
+#define ICMP_DEBUG                      LWIP_DBG_OFF
+#endif
+
+/**
+ * IGMP_DEBUG: Enable debugging in igmp.c.
+ */
+#ifndef IGMP_DEBUG
+#define IGMP_DEBUG                      LWIP_DBG_OFF
+#endif
+
+/**
+ * INET_DEBUG: Enable debugging in inet.c.
+ */
+#ifndef INET_DEBUG
+#define INET_DEBUG                      LWIP_DBG_OFF
+#endif
+
+/**
+ * IP_DEBUG: Enable debugging for IP.
+ */
+#ifndef IP_DEBUG
+#define IP_DEBUG                        LWIP_DBG_OFF
+#endif
+
+/**
+ * IP_REASS_DEBUG: Enable debugging in ip_frag.c for both frag & reass.
+ */
+#ifndef IP_REASS_DEBUG
+#define IP_REASS_DEBUG                  LWIP_DBG_OFF
+#endif
+
+/**
+ * RAW_DEBUG: Enable debugging in raw.c.
+ */
+#ifndef RAW_DEBUG
+#define RAW_DEBUG                       LWIP_DBG_OFF
+#endif
+
+/**
+ * MEM_DEBUG: Enable debugging in mem.c.
+ */
+#ifndef MEM_DEBUG
+#define MEM_DEBUG                       LWIP_DBG_OFF
+#endif
+
+/**
+ * MEMP_DEBUG: Enable debugging in memp.c.
+ */
+#ifndef MEMP_DEBUG
+#define MEMP_DEBUG                      LWIP_DBG_OFF
+#endif
+
+/**
+ * SYS_DEBUG: Enable debugging in sys.c.
+ */
+#ifndef SYS_DEBUG
+#define SYS_DEBUG                       LWIP_DBG_OFF
+#endif
+
+/**
+ * TIMERS_DEBUG: Enable debugging in timers.c.
+ */
+#ifndef TIMERS_DEBUG
+#define TIMERS_DEBUG                    LWIP_DBG_OFF
+#endif
+
+/**
+ * TCP_DEBUG: Enable debugging for TCP.
+ */
+#ifndef TCP_DEBUG
+#define TCP_DEBUG                       LWIP_DBG_OFF
+#endif
+
+/**
+ * TCP_INPUT_DEBUG: Enable debugging in tcp_in.c for incoming debug.
+ */
+#ifndef TCP_INPUT_DEBUG
+#define TCP_INPUT_DEBUG                 LWIP_DBG_OFF
+#endif
+
+/**
+ * TCP_FR_DEBUG: Enable debugging in tcp_in.c for fast retransmit.
+ */
+#ifndef TCP_FR_DEBUG
+#define TCP_FR_DEBUG                    LWIP_DBG_OFF
+#endif
+
+/**
+ * TCP_RTO_DEBUG: Enable debugging in TCP for retransmit
+ * timeout.
+ */
+#ifndef TCP_RTO_DEBUG
+#define TCP_RTO_DEBUG                   LWIP_DBG_OFF
+#endif
+
+/**
+ * TCP_CWND_DEBUG: Enable debugging for TCP congestion window.
+ */
+#ifndef TCP_CWND_DEBUG
+#define TCP_CWND_DEBUG                  LWIP_DBG_OFF
+#endif
+
+/**
+ * TCP_WND_DEBUG: Enable debugging in tcp_in.c for window updating.
+ */
+#ifndef TCP_WND_DEBUG
+#define TCP_WND_DEBUG                   LWIP_DBG_OFF
+#endif
+
+/**
+ * TCP_OUTPUT_DEBUG: Enable debugging in tcp_out.c output functions.
+ */
+#ifndef TCP_OUTPUT_DEBUG
+#define TCP_OUTPUT_DEBUG                LWIP_DBG_ON
+#endif
+
+/**
+ * TCP_RST_DEBUG: Enable debugging for TCP with the RST message.
+ */
+#ifndef TCP_RST_DEBUG
+#define TCP_RST_DEBUG                   LWIP_DBG_OFF
+#endif
+
+/**
+ * TCP_QLEN_DEBUG: Enable debugging for TCP queue lengths.
+ */
+#ifndef TCP_QLEN_DEBUG
+#define TCP_QLEN_DEBUG                  LWIP_DBG_ON
+#endif
+
+/**
+ * UDP_DEBUG: Enable debugging in UDP.
+ */
+#ifndef UDP_DEBUG
+#define UDP_DEBUG                       LWIP_DBG_OFF
+#endif
+
+/**
+ * TCPIP_DEBUG: Enable debugging in tcpip.c.
+ */
+#ifndef TCPIP_DEBUG
+#define TCPIP_DEBUG                     LWIP_DBG_ON
+#endif
+
+/**
+ * PPP_DEBUG: Enable debugging for PPP.
+ */
+#ifndef PPP_DEBUG
+#define PPP_DEBUG                       LWIP_DBG_OFF
+#endif
+
+/**
+ * SLIP_DEBUG: Enable debugging in slipif.c.
+ */
+#ifndef SLIP_DEBUG
+#define SLIP_DEBUG                      LWIP_DBG_OFF
+#endif
+
+/**
+ * DHCP_DEBUG: Enable debugging in dhcp.c.
+ */
+#ifndef DHCP_DEBUG
+#define DHCP_DEBUG                      LWIP_DBG_OFF
+#endif
+
+/**
+ * AUTOIP_DEBUG: Enable debugging in autoip.c.
+ */
+#ifndef AUTOIP_DEBUG
+#define AUTOIP_DEBUG                    LWIP_DBG_OFF
+#endif
+
+/**
+ * SNMP_MSG_DEBUG: Enable debugging for SNMP messages.
+ */
+#ifndef SNMP_MSG_DEBUG
+#define SNMP_MSG_DEBUG                  LWIP_DBG_OFF
+#endif
+
+/**
+ * SNMP_MIB_DEBUG: Enable debugging for SNMP MIBs.
+ */
+#ifndef SNMP_MIB_DEBUG
+#define SNMP_MIB_DEBUG                  LWIP_DBG_OFF
+#endif
+
+/**
+ * DNS_DEBUG: Enable debugging for DNS.
+ */
+#ifndef DNS_DEBUG
+#define DNS_DEBUG                       LWIP_DBG_OFF
+#endif
+
+#endif /* __LWIP_OPT_H__ */
diff --git a/ext/lwip/src/include/lwip/pbuf.h b/ext/lwip/src/include/lwip/pbuf.h
new file mode 100644
index 000000000..99d5443bf
--- /dev/null
+++ b/ext/lwip/src/include/lwip/pbuf.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#ifndef __LWIP_PBUF_H__
+#define __LWIP_PBUF_H__
+
+#include "lwip/opt.h"
+#include "lwip/err.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Currently, the pbuf_custom code is only needed for one specific configuration
+ * of IP_FRAG */
+#define LWIP_SUPPORT_CUSTOM_PBUF (IP_FRAG && !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF)
+
+#define PBUF_TRANSPORT_HLEN 20
+#define PBUF_IP_HLEN        20
+
+typedef enum {
+  PBUF_TRANSPORT,
+  PBUF_IP,
+  PBUF_LINK,
+  PBUF_RAW
+} pbuf_layer;
+
+typedef enum {
+  PBUF_RAM, /* pbuf data is stored in RAM */
+  PBUF_ROM, /* pbuf data is stored in ROM */
+  PBUF_REF, /* pbuf comes from the pbuf pool */
+  PBUF_POOL /* pbuf payload refers to RAM */
+} pbuf_type;
+
+
+/** indicates this packet's data should be immediately passed to the application */
+#define PBUF_FLAG_PUSH      0x01U
+/** indicates this is a custom pbuf: pbuf_free and pbuf_header handle such a
+    a pbuf differently */
+#define PBUF_FLAG_IS_CUSTOM 0x02U
+/** indicates this pbuf is UDP multicast to be looped back */
+#define PBUF_FLAG_MCASTLOOP 0x04U
+/** indicates this pbuf was received as link-level broadcast */
+#define PBUF_FLAG_LLBCAST   0x08U
+/** indicates this pbuf was received as link-level multicast */
+#define PBUF_FLAG_LLMCAST   0x10U
+/** indicates this pbuf includes a TCP FIN flag */
+#define PBUF_FLAG_TCP_FIN   0x20U
+
+struct pbuf {
+  /** next pbuf in singly linked pbuf chain */
+  struct pbuf *next;
+
+  /** pointer to the actual data in the buffer */
+  void *payload;
+
+  /**
+   * total length of this buffer and all next buffers in chain
+   * belonging to the same packet.
+   *
+   * For non-queue packet chains this is the invariant:
+   * p->tot_len == p->len + (p->next? p->next->tot_len: 0)
+   */
+  u16_t tot_len;
+
+  /** length of this buffer */
+  u16_t len;
+
+  /** pbuf_type as u8_t instead of enum to save space */
+  u8_t /*pbuf_type*/ type;
+
+  /** misc flags */
+  u8_t flags;
+
+  /**
+   * the reference count always equals the number of pointers
+   * that refer to this pbuf. This can be pointers from an application,
+   * the stack itself, or pbuf->next pointers from a chain.
+   */
+  u16_t ref;
+};
+
+#if LWIP_SUPPORT_CUSTOM_PBUF
+/** Prototype for a function to free a custom pbuf */
+typedef void (*pbuf_free_custom_fn)(struct pbuf *p);
+
+/** A custom pbuf: like a pbuf, but following a function pointer to free it. */
+struct pbuf_custom {
+  /** The actual pbuf */
+  struct pbuf pbuf;
+  /** This function is called when pbuf_free deallocates this pbuf(_custom) */
+  pbuf_free_custom_fn custom_free_function;
+};
+#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
+
+#if LWIP_TCP && TCP_QUEUE_OOSEQ
+/** Define this to 0 to prevent freeing ooseq pbufs when the PBUF_POOL is empty */
+#ifndef PBUF_POOL_FREE_OOSEQ
+#define PBUF_POOL_FREE_OOSEQ 1
+#endif /* PBUF_POOL_FREE_OOSEQ */
+#if NO_SYS && PBUF_POOL_FREE_OOSEQ
+extern volatile u8_t pbuf_free_ooseq_pending;
+void pbuf_free_ooseq();
+/** When not using sys_check_timeouts(), call PBUF_CHECK_FREE_OOSEQ()
+    at regular intervals from main level to check if ooseq pbufs need to be
+    freed! */
+#define PBUF_CHECK_FREE_OOSEQ() do { if(pbuf_free_ooseq_pending) { \
+  /* pbuf_alloc() reported PBUF_POOL to be empty -> try to free some \
+     ooseq queued pbufs now */ \
+  pbuf_free_ooseq(); }}while(0)
+#endif /* NO_SYS && PBUF_POOL_FREE_OOSEQ*/
+#endif /* LWIP_TCP && TCP_QUEUE_OOSEQ */
+
+/* Initializes the pbuf module. This call is empty for now, but may not be in future. */
+#define pbuf_init()
+
+struct pbuf *pbuf_alloc(pbuf_layer l, u16_t length, pbuf_type type);
+#if LWIP_SUPPORT_CUSTOM_PBUF
+struct pbuf *pbuf_alloced_custom(pbuf_layer l, u16_t length, pbuf_type type,
+                                 struct pbuf_custom *p, void *payload_mem,
+                                 u16_t payload_mem_len);
+#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
+void pbuf_realloc(struct pbuf *p, u16_t size); 
+u8_t pbuf_header(struct pbuf *p, s16_t header_size);
+void pbuf_ref(struct pbuf *p);
+u8_t pbuf_free(struct pbuf *p);
+u8_t pbuf_clen(struct pbuf *p);  
+void pbuf_cat(struct pbuf *head, struct pbuf *tail);
+void pbuf_chain(struct pbuf *head, struct pbuf *tail);
+struct pbuf *pbuf_dechain(struct pbuf *p);
+err_t pbuf_copy(struct pbuf *p_to, struct pbuf *p_from);
+u16_t pbuf_copy_partial(struct pbuf *p, void *dataptr, u16_t len, u16_t offset);
+err_t pbuf_take(struct pbuf *buf, const void *dataptr, u16_t len);
+struct pbuf *pbuf_coalesce(struct pbuf *p, pbuf_layer layer);
+#if LWIP_CHECKSUM_ON_COPY
+err_t pbuf_fill_chksum(struct pbuf *p, u16_t start_offset, const void *dataptr,
+                       u16_t len, u16_t *chksum);
+#endif /* LWIP_CHECKSUM_ON_COPY */
+
+u8_t pbuf_get_at(struct pbuf* p, u16_t offset);
+u16_t pbuf_memcmp(struct pbuf* p, u16_t offset, const void* s2, u16_t n);
+u16_t pbuf_memfind(struct pbuf* p, const void* mem, u16_t mem_len, u16_t start_offset);
+u16_t pbuf_strstr(struct pbuf* p, const char* substr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_PBUF_H__ */
diff --git a/ext/lwip/src/include/lwip/raw.h b/ext/lwip/src/include/lwip/raw.h
new file mode 100644
index 000000000..17d0a1c54
--- /dev/null
+++ b/ext/lwip/src/include/lwip/raw.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_RAW_H__
+#define __LWIP_RAW_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_RAW /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/pbuf.h"
+#include "lwip/def.h"
+#include "lwip/ip.h"
+#include "lwip/ip_addr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct raw_pcb;
+
+/** Function prototype for raw pcb receive callback functions.
+ * @param arg user supplied argument (raw_pcb.recv_arg)
+ * @param pcb the raw_pcb which received data
+ * @param p the packet buffer that was received
+ * @param addr the remote IP address from which the packet was received
+ * @return 1 if the packet was 'eaten' (aka. deleted),
+ *         0 if the packet lives on
+ * If returning 1, the callback is responsible for freeing the pbuf
+ * if it's not used any more.
+ */
+typedef u8_t (*raw_recv_fn)(void *arg, struct raw_pcb *pcb, struct pbuf *p,
+    ip_addr_t *addr);
+
+struct raw_pcb {
+  /* Common members of all PCB types */
+  IP_PCB;
+
+  struct raw_pcb *next;
+
+  u8_t protocol;
+
+  /** receive callback function */
+  raw_recv_fn recv;
+  /* user-supplied argument for the recv callback */
+  void *recv_arg;
+};
+
+/* The following functions is the application layer interface to the
+   RAW code. */
+struct raw_pcb * raw_new        (u8_t proto);
+void             raw_remove     (struct raw_pcb *pcb);
+err_t            raw_bind       (struct raw_pcb *pcb, ip_addr_t *ipaddr);
+err_t            raw_connect    (struct raw_pcb *pcb, ip_addr_t *ipaddr);
+
+void             raw_recv       (struct raw_pcb *pcb, raw_recv_fn recv, void *recv_arg);
+err_t            raw_sendto     (struct raw_pcb *pcb, struct pbuf *p, ip_addr_t *ipaddr);
+err_t            raw_send       (struct raw_pcb *pcb, struct pbuf *p);
+
+/* The following functions are the lower layer interface to RAW. */
+u8_t             raw_input      (struct pbuf *p, struct netif *inp);
+#define raw_init() /* Compatibility define, not init needed. */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_RAW */
+
+#endif /* __LWIP_RAW_H__ */
diff --git a/ext/lwip/src/include/lwip/sio.h b/ext/lwip/src/include/lwip/sio.h
new file mode 100644
index 000000000..28ae2f225
--- /dev/null
+++ b/ext/lwip/src/include/lwip/sio.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ */
+
+/*
+ * This is the interface to the platform specific serial IO module
+ * It needs to be implemented by those platforms which need SLIP or PPP
+ */
+
+#ifndef __SIO_H__
+#define __SIO_H__
+
+#include "lwip/arch.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* If you want to define sio_fd_t elsewhere or differently,
+   define this in your cc.h file. */
+#ifndef __sio_fd_t_defined
+typedef void * sio_fd_t;
+#endif
+
+/* The following functions can be defined to something else in your cc.h file
+   or be implemented in your custom sio.c file. */
+
+#ifndef sio_open
+/**
+ * Opens a serial device for communication.
+ * 
+ * @param devnum device number
+ * @return handle to serial device if successful, NULL otherwise
+ */
+sio_fd_t sio_open(u8_t devnum);
+#endif
+
+#ifndef sio_send
+/**
+ * Sends a single character to the serial device.
+ * 
+ * @param c character to send
+ * @param fd serial device handle
+ * 
+ * @note This function will block until the character can be sent.
+ */
+void sio_send(u8_t c, sio_fd_t fd);
+#endif
+
+#ifndef sio_recv
+/**
+ * Receives a single character from the serial device.
+ * 
+ * @param fd serial device handle
+ * 
+ * @note This function will block until a character is received.
+ */
+u8_t sio_recv(sio_fd_t fd);
+#endif
+
+#ifndef sio_read
+/**
+ * Reads from the serial device.
+ * 
+ * @param fd serial device handle
+ * @param data pointer to data buffer for receiving
+ * @param len maximum length (in bytes) of data to receive
+ * @return number of bytes actually received - may be 0 if aborted by sio_read_abort
+ * 
+ * @note This function will block until data can be received. The blocking
+ * can be cancelled by calling sio_read_abort().
+ */
+u32_t sio_read(sio_fd_t fd, u8_t *data, u32_t len);
+#endif
+
+#ifndef sio_tryread
+/**
+ * Tries to read from the serial device. Same as sio_read but returns
+ * immediately if no data is available and never blocks.
+ * 
+ * @param fd serial device handle
+ * @param data pointer to data buffer for receiving
+ * @param len maximum length (in bytes) of data to receive
+ * @return number of bytes actually received
+ */
+u32_t sio_tryread(sio_fd_t fd, u8_t *data, u32_t len);
+#endif
+
+#ifndef sio_write
+/**
+ * Writes to the serial device.
+ * 
+ * @param fd serial device handle
+ * @param data pointer to data to send
+ * @param len length (in bytes) of data to send
+ * @return number of bytes actually sent
+ * 
+ * @note This function will block until all data can be sent.
+ */
+u32_t sio_write(sio_fd_t fd, u8_t *data, u32_t len);
+#endif
+
+#ifndef sio_read_abort
+/**
+ * Aborts a blocking sio_read() call.
+ * 
+ * @param fd serial device handle
+ */
+void sio_read_abort(sio_fd_t fd);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SIO_H__ */
diff --git a/ext/lwip/src/include/lwip/snmp.h b/ext/lwip/src/include/lwip/snmp.h
new file mode 100644
index 000000000..2ed043dd5
--- /dev/null
+++ b/ext/lwip/src/include/lwip/snmp.h
@@ -0,0 +1,367 @@
+/*
+ * Copyright (c) 2001, 2002 Leon Woestenberg <leon.woestenberg@axon.tv>
+ * Copyright (c) 2001, 2002 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Leon Woestenberg <leon.woestenberg@axon.tv>
+ *
+ */
+#ifndef __LWIP_SNMP_H__
+#define __LWIP_SNMP_H__
+
+#include "lwip/opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "lwip/ip_addr.h"
+
+struct udp_pcb;
+struct netif;
+
+/**
+ * @see RFC1213, "MIB-II, 6. Definitions"
+ */
+enum snmp_ifType {
+  snmp_ifType_other=1,                /* none of the following */
+  snmp_ifType_regular1822,
+  snmp_ifType_hdh1822,
+  snmp_ifType_ddn_x25,
+  snmp_ifType_rfc877_x25,
+  snmp_ifType_ethernet_csmacd,
+  snmp_ifType_iso88023_csmacd,
+  snmp_ifType_iso88024_tokenBus,
+  snmp_ifType_iso88025_tokenRing,
+  snmp_ifType_iso88026_man,
+  snmp_ifType_starLan,
+  snmp_ifType_proteon_10Mbit,
+  snmp_ifType_proteon_80Mbit,
+  snmp_ifType_hyperchannel,
+  snmp_ifType_fddi,
+  snmp_ifType_lapb,
+  snmp_ifType_sdlc,
+  snmp_ifType_ds1,                    /* T-1 */
+  snmp_ifType_e1,                     /* european equiv. of T-1 */
+  snmp_ifType_basicISDN,
+  snmp_ifType_primaryISDN,            /* proprietary serial */
+  snmp_ifType_propPointToPointSerial,
+  snmp_ifType_ppp,
+  snmp_ifType_softwareLoopback,
+  snmp_ifType_eon,                    /* CLNP over IP [11] */
+  snmp_ifType_ethernet_3Mbit,
+  snmp_ifType_nsip,                   /* XNS over IP */
+  snmp_ifType_slip,                   /* generic SLIP */
+  snmp_ifType_ultra,                  /* ULTRA technologies */
+  snmp_ifType_ds3,                    /* T-3 */
+  snmp_ifType_sip,                    /* SMDS */
+  snmp_ifType_frame_relay
+};
+
+#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+
+/** SNMP "sysuptime" Interval */
+#define SNMP_SYSUPTIME_INTERVAL 10
+
+/** fixed maximum length for object identifier type */
+#define LWIP_SNMP_OBJ_ID_LEN 32
+
+/** internal object identifier representation */
+struct snmp_obj_id
+{
+  u8_t len;
+  s32_t id[LWIP_SNMP_OBJ_ID_LEN];
+};
+
+/* system */
+void snmp_set_sysdesr(u8_t* str, u8_t* len);
+void snmp_set_sysobjid(struct snmp_obj_id *oid);
+void snmp_get_sysobjid_ptr(struct snmp_obj_id **oid);
+void snmp_inc_sysuptime(void);
+void snmp_add_sysuptime(u32_t value);
+void snmp_get_sysuptime(u32_t *value);
+void snmp_set_syscontact(u8_t *ocstr, u8_t *ocstrlen);
+void snmp_set_sysname(u8_t *ocstr, u8_t *ocstrlen);
+void snmp_set_syslocation(u8_t *ocstr, u8_t *ocstrlen);
+
+/* network interface */
+void snmp_add_ifinoctets(struct netif *ni, u32_t value); 
+void snmp_inc_ifinucastpkts(struct netif *ni);
+void snmp_inc_ifinnucastpkts(struct netif *ni);
+void snmp_inc_ifindiscards(struct netif *ni);
+void snmp_add_ifoutoctets(struct netif *ni, u32_t value);
+void snmp_inc_ifoutucastpkts(struct netif *ni);
+void snmp_inc_ifoutnucastpkts(struct netif *ni);
+void snmp_inc_ifoutdiscards(struct netif *ni);
+void snmp_inc_iflist(void);
+void snmp_dec_iflist(void);
+
+/* ARP (for atTable and ipNetToMediaTable) */
+void snmp_insert_arpidx_tree(struct netif *ni, ip_addr_t *ip);
+void snmp_delete_arpidx_tree(struct netif *ni, ip_addr_t *ip);
+
+/* IP */
+void snmp_inc_ipinreceives(void);
+void snmp_inc_ipinhdrerrors(void);
+void snmp_inc_ipinaddrerrors(void);
+void snmp_inc_ipforwdatagrams(void);
+void snmp_inc_ipinunknownprotos(void);
+void snmp_inc_ipindiscards(void);
+void snmp_inc_ipindelivers(void);
+void snmp_inc_ipoutrequests(void);
+void snmp_inc_ipoutdiscards(void);
+void snmp_inc_ipoutnoroutes(void);
+void snmp_inc_ipreasmreqds(void);
+void snmp_inc_ipreasmoks(void);
+void snmp_inc_ipreasmfails(void);
+void snmp_inc_ipfragoks(void);
+void snmp_inc_ipfragfails(void);
+void snmp_inc_ipfragcreates(void);
+void snmp_inc_iproutingdiscards(void);
+void snmp_insert_ipaddridx_tree(struct netif *ni);
+void snmp_delete_ipaddridx_tree(struct netif *ni);
+void snmp_insert_iprteidx_tree(u8_t dflt, struct netif *ni);
+void snmp_delete_iprteidx_tree(u8_t dflt, struct netif *ni);
+
+/* ICMP */
+void snmp_inc_icmpinmsgs(void);
+void snmp_inc_icmpinerrors(void);
+void snmp_inc_icmpindestunreachs(void);
+void snmp_inc_icmpintimeexcds(void);
+void snmp_inc_icmpinparmprobs(void);
+void snmp_inc_icmpinsrcquenchs(void);
+void snmp_inc_icmpinredirects(void);
+void snmp_inc_icmpinechos(void);
+void snmp_inc_icmpinechoreps(void);
+void snmp_inc_icmpintimestamps(void);
+void snmp_inc_icmpintimestampreps(void);
+void snmp_inc_icmpinaddrmasks(void);
+void snmp_inc_icmpinaddrmaskreps(void);
+void snmp_inc_icmpoutmsgs(void);
+void snmp_inc_icmpouterrors(void);
+void snmp_inc_icmpoutdestunreachs(void);
+void snmp_inc_icmpouttimeexcds(void);
+void snmp_inc_icmpoutparmprobs(void);
+void snmp_inc_icmpoutsrcquenchs(void);
+void snmp_inc_icmpoutredirects(void); 
+void snmp_inc_icmpoutechos(void);
+void snmp_inc_icmpoutechoreps(void);
+void snmp_inc_icmpouttimestamps(void);
+void snmp_inc_icmpouttimestampreps(void);
+void snmp_inc_icmpoutaddrmasks(void);
+void snmp_inc_icmpoutaddrmaskreps(void);
+
+/* TCP */
+void snmp_inc_tcpactiveopens(void);
+void snmp_inc_tcppassiveopens(void);
+void snmp_inc_tcpattemptfails(void);
+void snmp_inc_tcpestabresets(void);
+void snmp_inc_tcpinsegs(void);
+void snmp_inc_tcpoutsegs(void);
+void snmp_inc_tcpretranssegs(void);
+void snmp_inc_tcpinerrs(void);
+void snmp_inc_tcpoutrsts(void);
+
+/* UDP */
+void snmp_inc_udpindatagrams(void);
+void snmp_inc_udpnoports(void);
+void snmp_inc_udpinerrors(void);
+void snmp_inc_udpoutdatagrams(void);
+void snmp_insert_udpidx_tree(struct udp_pcb *pcb);
+void snmp_delete_udpidx_tree(struct udp_pcb *pcb);
+
+/* SNMP */
+void snmp_inc_snmpinpkts(void);
+void snmp_inc_snmpoutpkts(void);
+void snmp_inc_snmpinbadversions(void);
+void snmp_inc_snmpinbadcommunitynames(void);
+void snmp_inc_snmpinbadcommunityuses(void);
+void snmp_inc_snmpinasnparseerrs(void);
+void snmp_inc_snmpintoobigs(void);
+void snmp_inc_snmpinnosuchnames(void);
+void snmp_inc_snmpinbadvalues(void);
+void snmp_inc_snmpinreadonlys(void);
+void snmp_inc_snmpingenerrs(void);
+void snmp_add_snmpintotalreqvars(u8_t value);
+void snmp_add_snmpintotalsetvars(u8_t value);
+void snmp_inc_snmpingetrequests(void);
+void snmp_inc_snmpingetnexts(void);
+void snmp_inc_snmpinsetrequests(void);
+void snmp_inc_snmpingetresponses(void);
+void snmp_inc_snmpintraps(void);
+void snmp_inc_snmpouttoobigs(void);
+void snmp_inc_snmpoutnosuchnames(void);
+void snmp_inc_snmpoutbadvalues(void);
+void snmp_inc_snmpoutgenerrs(void);
+void snmp_inc_snmpoutgetrequests(void);
+void snmp_inc_snmpoutgetnexts(void);
+void snmp_inc_snmpoutsetrequests(void);
+void snmp_inc_snmpoutgetresponses(void);
+void snmp_inc_snmpouttraps(void);
+void snmp_get_snmpgrpid_ptr(struct snmp_obj_id **oid);
+void snmp_set_snmpenableauthentraps(u8_t *value);
+void snmp_get_snmpenableauthentraps(u8_t *value);
+
+/* LWIP_SNMP support not available */
+/* define everything to be empty */
+#else
+
+/* system */
+#define snmp_set_sysdesr(str, len)
+#define snmp_set_sysobjid(oid);
+#define snmp_get_sysobjid_ptr(oid)
+#define snmp_inc_sysuptime()
+#define snmp_add_sysuptime(value)
+#define snmp_get_sysuptime(value)
+#define snmp_set_syscontact(ocstr, ocstrlen);
+#define snmp_set_sysname(ocstr, ocstrlen);
+#define snmp_set_syslocation(ocstr, ocstrlen);
+
+/* network interface */
+#define snmp_add_ifinoctets(ni,value) 
+#define snmp_inc_ifinucastpkts(ni)
+#define snmp_inc_ifinnucastpkts(ni)
+#define snmp_inc_ifindiscards(ni)
+#define snmp_add_ifoutoctets(ni,value)
+#define snmp_inc_ifoutucastpkts(ni)
+#define snmp_inc_ifoutnucastpkts(ni)
+#define snmp_inc_ifoutdiscards(ni)
+#define snmp_inc_iflist()
+#define snmp_dec_iflist()
+
+/* ARP */
+#define snmp_insert_arpidx_tree(ni,ip)
+#define snmp_delete_arpidx_tree(ni,ip)
+
+/* IP */
+#define snmp_inc_ipinreceives()
+#define snmp_inc_ipinhdrerrors()
+#define snmp_inc_ipinaddrerrors()
+#define snmp_inc_ipforwdatagrams()
+#define snmp_inc_ipinunknownprotos()
+#define snmp_inc_ipindiscards()
+#define snmp_inc_ipindelivers()
+#define snmp_inc_ipoutrequests()
+#define snmp_inc_ipoutdiscards()
+#define snmp_inc_ipoutnoroutes()
+#define snmp_inc_ipreasmreqds()
+#define snmp_inc_ipreasmoks()
+#define snmp_inc_ipreasmfails()
+#define snmp_inc_ipfragoks()
+#define snmp_inc_ipfragfails()
+#define snmp_inc_ipfragcreates()
+#define snmp_inc_iproutingdiscards()
+#define snmp_insert_ipaddridx_tree(ni)
+#define snmp_delete_ipaddridx_tree(ni)
+#define snmp_insert_iprteidx_tree(dflt, ni)
+#define snmp_delete_iprteidx_tree(dflt, ni)
+
+/* ICMP */
+#define snmp_inc_icmpinmsgs()
+#define snmp_inc_icmpinerrors() 
+#define snmp_inc_icmpindestunreachs() 
+#define snmp_inc_icmpintimeexcds()
+#define snmp_inc_icmpinparmprobs() 
+#define snmp_inc_icmpinsrcquenchs() 
+#define snmp_inc_icmpinredirects() 
+#define snmp_inc_icmpinechos() 
+#define snmp_inc_icmpinechoreps()
+#define snmp_inc_icmpintimestamps() 
+#define snmp_inc_icmpintimestampreps()
+#define snmp_inc_icmpinaddrmasks()
+#define snmp_inc_icmpinaddrmaskreps()
+#define snmp_inc_icmpoutmsgs()
+#define snmp_inc_icmpouterrors()
+#define snmp_inc_icmpoutdestunreachs() 
+#define snmp_inc_icmpouttimeexcds() 
+#define snmp_inc_icmpoutparmprobs()
+#define snmp_inc_icmpoutsrcquenchs()
+#define snmp_inc_icmpoutredirects() 
+#define snmp_inc_icmpoutechos() 
+#define snmp_inc_icmpoutechoreps()
+#define snmp_inc_icmpouttimestamps()
+#define snmp_inc_icmpouttimestampreps()
+#define snmp_inc_icmpoutaddrmasks()
+#define snmp_inc_icmpoutaddrmaskreps()
+/* TCP */
+#define snmp_inc_tcpactiveopens()
+#define snmp_inc_tcppassiveopens()
+#define snmp_inc_tcpattemptfails()
+#define snmp_inc_tcpestabresets()
+#define snmp_inc_tcpinsegs()
+#define snmp_inc_tcpoutsegs()
+#define snmp_inc_tcpretranssegs()
+#define snmp_inc_tcpinerrs()
+#define snmp_inc_tcpoutrsts()
+
+/* UDP */
+#define snmp_inc_udpindatagrams()
+#define snmp_inc_udpnoports()
+#define snmp_inc_udpinerrors()
+#define snmp_inc_udpoutdatagrams()
+#define snmp_insert_udpidx_tree(pcb)
+#define snmp_delete_udpidx_tree(pcb)
+
+/* SNMP */
+#define snmp_inc_snmpinpkts()
+#define snmp_inc_snmpoutpkts()
+#define snmp_inc_snmpinbadversions()
+#define snmp_inc_snmpinbadcommunitynames()
+#define snmp_inc_snmpinbadcommunityuses()
+#define snmp_inc_snmpinasnparseerrs()
+#define snmp_inc_snmpintoobigs()
+#define snmp_inc_snmpinnosuchnames()
+#define snmp_inc_snmpinbadvalues()
+#define snmp_inc_snmpinreadonlys()
+#define snmp_inc_snmpingenerrs()
+#define snmp_add_snmpintotalreqvars(value)
+#define snmp_add_snmpintotalsetvars(value)
+#define snmp_inc_snmpingetrequests()
+#define snmp_inc_snmpingetnexts()
+#define snmp_inc_snmpinsetrequests()
+#define snmp_inc_snmpingetresponses()
+#define snmp_inc_snmpintraps()
+#define snmp_inc_snmpouttoobigs()
+#define snmp_inc_snmpoutnosuchnames()
+#define snmp_inc_snmpoutbadvalues()
+#define snmp_inc_snmpoutgenerrs()
+#define snmp_inc_snmpoutgetrequests()
+#define snmp_inc_snmpoutgetnexts()
+#define snmp_inc_snmpoutsetrequests()
+#define snmp_inc_snmpoutgetresponses()
+#define snmp_inc_snmpouttraps()
+#define snmp_get_snmpgrpid_ptr(oid)
+#define snmp_set_snmpenableauthentraps(value)
+#define snmp_get_snmpenableauthentraps(value)
+
+#endif /* LWIP_SNMP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_SNMP_H__ */
diff --git a/ext/lwip/src/include/lwip/snmp_asn1.h b/ext/lwip/src/include/lwip/snmp_asn1.h
new file mode 100644
index 000000000..605fa3f16
--- /dev/null
+++ b/ext/lwip/src/include/lwip/snmp_asn1.h
@@ -0,0 +1,101 @@
+/**
+ * @file
+ * Abstract Syntax Notation One (ISO 8824, 8825) codec.
+ */
+ 
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#ifndef __LWIP_SNMP_ASN1_H__
+#define __LWIP_SNMP_ASN1_H__
+
+#include "lwip/opt.h"
+#include "lwip/err.h"
+#include "lwip/pbuf.h"
+#include "lwip/snmp.h"
+
+#if LWIP_SNMP
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SNMP_ASN1_UNIV   (0)    /* (!0x80 | !0x40) */
+#define SNMP_ASN1_APPLIC (0x40) /* (!0x80 |  0x40) */
+#define SNMP_ASN1_CONTXT (0x80) /* ( 0x80 | !0x40) */
+
+#define SNMP_ASN1_CONSTR (0x20) /* ( 0x20) */
+#define SNMP_ASN1_PRIMIT (0)    /* (!0x20) */
+
+/* universal tags */
+#define SNMP_ASN1_INTEG  2
+#define SNMP_ASN1_OC_STR 4
+#define SNMP_ASN1_NUL    5
+#define SNMP_ASN1_OBJ_ID 6
+#define SNMP_ASN1_SEQ    16
+
+/* application specific (SNMP) tags */
+#define SNMP_ASN1_IPADDR 0    /* octet string size(4) */
+#define SNMP_ASN1_COUNTER 1   /* u32_t */
+#define SNMP_ASN1_GAUGE 2     /* u32_t */
+#define SNMP_ASN1_TIMETICKS 3 /* u32_t */
+#define SNMP_ASN1_OPAQUE 4    /* octet string */
+
+/* context specific (SNMP) tags */
+#define SNMP_ASN1_PDU_GET_REQ 0
+#define SNMP_ASN1_PDU_GET_NEXT_REQ 1
+#define SNMP_ASN1_PDU_GET_RESP 2
+#define SNMP_ASN1_PDU_SET_REQ 3
+#define SNMP_ASN1_PDU_TRAP 4
+
+err_t snmp_asn1_dec_type(struct pbuf *p, u16_t ofs, u8_t *type);
+err_t snmp_asn1_dec_length(struct pbuf *p, u16_t ofs, u8_t *octets_used, u16_t *length);
+err_t snmp_asn1_dec_u32t(struct pbuf *p, u16_t ofs, u16_t len, u32_t *value);
+err_t snmp_asn1_dec_s32t(struct pbuf *p, u16_t ofs, u16_t len, s32_t *value);
+err_t snmp_asn1_dec_oid(struct pbuf *p, u16_t ofs, u16_t len, struct snmp_obj_id *oid);
+err_t snmp_asn1_dec_raw(struct pbuf *p, u16_t ofs, u16_t len, u16_t raw_len, u8_t *raw);
+
+void snmp_asn1_enc_length_cnt(u16_t length, u8_t *octets_needed);
+void snmp_asn1_enc_u32t_cnt(u32_t value, u16_t *octets_needed);
+void snmp_asn1_enc_s32t_cnt(s32_t value, u16_t *octets_needed);
+void snmp_asn1_enc_oid_cnt(u8_t ident_len, s32_t *ident, u16_t *octets_needed);
+err_t snmp_asn1_enc_type(struct pbuf *p, u16_t ofs, u8_t type);
+err_t snmp_asn1_enc_length(struct pbuf *p, u16_t ofs, u16_t length);
+err_t snmp_asn1_enc_u32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, u32_t value);
+err_t snmp_asn1_enc_s32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, s32_t value);
+err_t snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, s32_t *ident);
+err_t snmp_asn1_enc_raw(struct pbuf *p, u16_t ofs, u16_t raw_len, u8_t *raw);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_SNMP */
+
+#endif /* __LWIP_SNMP_ASN1_H__ */
diff --git a/ext/lwip/src/include/lwip/snmp_msg.h b/ext/lwip/src/include/lwip/snmp_msg.h
new file mode 100644
index 000000000..1183e3a95
--- /dev/null
+++ b/ext/lwip/src/include/lwip/snmp_msg.h
@@ -0,0 +1,315 @@
+/**
+ * @file
+ * SNMP Agent message handling structures.
+ */
+
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#ifndef __LWIP_SNMP_MSG_H__
+#define __LWIP_SNMP_MSG_H__
+
+#include "lwip/opt.h"
+#include "lwip/snmp.h"
+#include "lwip/snmp_structs.h"
+#include "lwip/ip_addr.h"
+#include "lwip/err.h"
+
+#if LWIP_SNMP
+
+#if SNMP_PRIVATE_MIB
+/* When using a private MIB, you have to create a file 'private_mib.h' that contains
+ * a 'struct mib_array_node mib_private' which contains your MIB. */
+#include "private_mib.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* The listen port of the SNMP agent. Clients have to make their requests to
+   this port. Most standard clients won't work if you change this! */
+#ifndef SNMP_IN_PORT
+#define SNMP_IN_PORT 161
+#endif
+/* The remote port the SNMP agent sends traps to. Most standard trap sinks won't
+   work if you change this! */
+#ifndef SNMP_TRAP_PORT
+#define SNMP_TRAP_PORT 162
+#endif
+
+#define SNMP_ES_NOERROR 0
+#define SNMP_ES_TOOBIG 1
+#define SNMP_ES_NOSUCHNAME 2
+#define SNMP_ES_BADVALUE 3
+#define SNMP_ES_READONLY 4
+#define SNMP_ES_GENERROR 5
+
+#define SNMP_GENTRAP_COLDSTART 0
+#define SNMP_GENTRAP_WARMSTART 1
+#define SNMP_GENTRAP_AUTHFAIL 4
+#define SNMP_GENTRAP_ENTERPRISESPC 6
+
+struct snmp_varbind
+{
+  /* next pointer, NULL for last in list */
+  struct snmp_varbind *next;
+  /* previous pointer, NULL for first in list */
+  struct snmp_varbind *prev;
+
+  /* object identifier length (in s32_t) */
+  u8_t ident_len;
+  /* object identifier array */
+  s32_t *ident;
+
+  /* object value ASN1 type */
+  u8_t value_type;
+  /* object value length (in u8_t) */
+  u8_t value_len;
+  /* object value */
+  void *value;
+
+  /* encoding varbind seq length length */
+  u8_t seqlenlen;
+  /* encoding object identifier length length */
+  u8_t olenlen;
+  /* encoding object value length length */
+  u8_t vlenlen;
+  /* encoding varbind seq length */
+  u16_t seqlen;
+  /* encoding object identifier length */
+  u16_t olen;
+  /* encoding object value length */
+  u16_t vlen;
+};
+
+struct snmp_varbind_root
+{
+  struct snmp_varbind *head;
+  struct snmp_varbind *tail;
+  /* number of variable bindings in list */
+  u8_t count;
+  /* encoding varbind-list seq length length */
+  u8_t seqlenlen;
+  /* encoding varbind-list seq length */
+  u16_t seqlen;
+};
+
+/** output response message header length fields */
+struct snmp_resp_header_lengths
+{
+  /* encoding error-index length length */
+  u8_t erridxlenlen;
+  /* encoding error-status length length */
+  u8_t errstatlenlen;
+  /* encoding request id length length */
+  u8_t ridlenlen;
+  /* encoding pdu length length */
+  u8_t pdulenlen;
+  /* encoding community length length */
+  u8_t comlenlen;
+  /* encoding version length length */
+  u8_t verlenlen;
+  /* encoding sequence length length */
+  u8_t seqlenlen;
+
+  /* encoding error-index length */
+  u16_t erridxlen;
+  /* encoding error-status length */
+  u16_t errstatlen;
+  /* encoding request id length */
+  u16_t ridlen;
+  /* encoding pdu length */
+  u16_t pdulen;
+  /* encoding community length */
+  u16_t comlen;
+  /* encoding version length */
+  u16_t verlen;
+  /* encoding sequence length */
+  u16_t seqlen;
+};
+
+/** output response message header length fields */
+struct snmp_trap_header_lengths
+{
+  /* encoding timestamp length length */
+  u8_t tslenlen;
+  /* encoding specific-trap length length */
+  u8_t strplenlen;
+  /* encoding generic-trap length length */
+  u8_t gtrplenlen;
+  /* encoding agent-addr length length */
+  u8_t aaddrlenlen;
+  /* encoding enterprise-id length length */
+  u8_t eidlenlen;
+  /* encoding pdu length length */
+  u8_t pdulenlen;
+  /* encoding community length length */
+  u8_t comlenlen;
+  /* encoding version length length */
+  u8_t verlenlen;
+  /* encoding sequence length length */
+  u8_t seqlenlen;
+
+  /* encoding timestamp length */
+  u16_t tslen;
+  /* encoding specific-trap length */
+  u16_t strplen;
+  /* encoding generic-trap length */
+  u16_t gtrplen;
+  /* encoding agent-addr length */
+  u16_t aaddrlen;
+  /* encoding enterprise-id length */
+  u16_t eidlen;
+  /* encoding pdu length */
+  u16_t pdulen;
+  /* encoding community length */
+  u16_t comlen;
+  /* encoding version length */
+  u16_t verlen;
+  /* encoding sequence length */
+  u16_t seqlen;
+};
+
+/* Accepting new SNMP messages. */
+#define SNMP_MSG_EMPTY                 0
+/* Search for matching object for variable binding. */
+#define SNMP_MSG_SEARCH_OBJ            1
+/* Perform SNMP operation on in-memory object.
+   Pass-through states, for symmetry only. */
+#define SNMP_MSG_INTERNAL_GET_OBJDEF   2
+#define SNMP_MSG_INTERNAL_GET_VALUE    3
+#define SNMP_MSG_INTERNAL_SET_TEST     4
+#define SNMP_MSG_INTERNAL_GET_OBJDEF_S 5
+#define SNMP_MSG_INTERNAL_SET_VALUE    6
+/* Perform SNMP operation on object located externally.
+   In theory this could be used for building a proxy agent.
+   Practical use is for an enterprise spc. app. gateway. */
+#define SNMP_MSG_EXTERNAL_GET_OBJDEF   7
+#define SNMP_MSG_EXTERNAL_GET_VALUE    8
+#define SNMP_MSG_EXTERNAL_SET_TEST     9
+#define SNMP_MSG_EXTERNAL_GET_OBJDEF_S 10
+#define SNMP_MSG_EXTERNAL_SET_VALUE    11
+
+#define SNMP_COMMUNITY_STR_LEN 64
+struct snmp_msg_pstat
+{
+  /* lwIP local port (161) binding */
+  struct udp_pcb *pcb;
+  /* source IP address */
+  ip_addr_t sip;
+  /* source UDP port */
+  u16_t sp;
+  /* request type */
+  u8_t rt;
+  /* request ID */
+  s32_t rid;
+  /* error status */
+  s32_t error_status;
+  /* error index */
+  s32_t error_index;
+  /* community name (zero terminated) */
+  u8_t community[SNMP_COMMUNITY_STR_LEN + 1];
+  /* community string length (exclusive zero term) */
+  u8_t com_strlen;
+  /* one out of MSG_EMPTY, MSG_DEMUX, MSG_INTERNAL, MSG_EXTERNAL_x */
+  u8_t state;
+  /* saved arguments for MSG_EXTERNAL_x */
+  struct mib_external_node *ext_mib_node;
+  struct snmp_name_ptr ext_name_ptr;
+  struct obj_def ext_object_def;
+  struct snmp_obj_id ext_oid;
+  /* index into input variable binding list */
+  u8_t vb_idx;
+  /* ptr into input variable binding list */
+  struct snmp_varbind *vb_ptr;
+  /* list of variable bindings from input */
+  struct snmp_varbind_root invb;
+  /* list of variable bindings to output */
+  struct snmp_varbind_root outvb;
+  /* output response lengths used in ASN encoding */
+  struct snmp_resp_header_lengths rhl;
+};
+
+struct snmp_msg_trap
+{
+  /* lwIP local port (161) binding */
+  struct udp_pcb *pcb;
+  /* destination IP address in network order */
+  ip_addr_t dip;
+
+  /* source enterprise ID (sysObjectID) */
+  struct snmp_obj_id *enterprise;
+  /* source IP address, raw network order format */
+  u8_t sip_raw[4];
+  /* generic trap code */
+  u32_t gen_trap;
+  /* specific trap code */
+  u32_t spc_trap;
+  /* timestamp */
+  u32_t ts;
+  /* list of variable bindings to output */
+  struct snmp_varbind_root outvb;
+  /* output trap lengths used in ASN encoding */
+  struct snmp_trap_header_lengths thl;
+};
+
+/** Agent Version constant, 0 = v1 oddity */
+extern const s32_t snmp_version;
+/** Agent default "public" community string */
+extern const char snmp_publiccommunity[7];
+
+extern struct snmp_msg_trap trap_msg;
+
+/** Agent setup, start listening to port 161. */
+void snmp_init(void);
+void snmp_trap_dst_enable(u8_t dst_idx, u8_t enable);
+void snmp_trap_dst_ip_set(u8_t dst_idx, ip_addr_t *dst);
+
+/** Varbind-list functions. */
+struct snmp_varbind* snmp_varbind_alloc(struct snmp_obj_id *oid, u8_t type, u8_t len);
+void snmp_varbind_free(struct snmp_varbind *vb);
+void snmp_varbind_list_free(struct snmp_varbind_root *root);
+void snmp_varbind_tail_add(struct snmp_varbind_root *root, struct snmp_varbind *vb);
+struct snmp_varbind* snmp_varbind_tail_remove(struct snmp_varbind_root *root);
+
+/** Handle an internal (recv) or external (private response) event. */
+void snmp_msg_event(u8_t request_id);
+err_t snmp_send_response(struct snmp_msg_pstat *m_stat);
+err_t snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap);
+void snmp_coldstart_trap(void);
+void snmp_authfail_trap(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_SNMP */
+
+#endif /* __LWIP_SNMP_MSG_H__ */
diff --git a/ext/lwip/src/include/lwip/snmp_structs.h b/ext/lwip/src/include/lwip/snmp_structs.h
new file mode 100644
index 000000000..0d3b46a92
--- /dev/null
+++ b/ext/lwip/src/include/lwip/snmp_structs.h
@@ -0,0 +1,268 @@
+/**
+ * @file
+ * Generic MIB tree structures.
+ *
+ * @todo namespace prefixes
+ */
+
+/*
+ * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: Christiaan Simons <christiaan.simons@axon.tv>
+ */
+
+#ifndef __LWIP_SNMP_STRUCTS_H__
+#define __LWIP_SNMP_STRUCTS_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/snmp.h"
+
+#if SNMP_PRIVATE_MIB
+/* When using a private MIB, you have to create a file 'private_mib.h' that contains
+ * a 'struct mib_array_node mib_private' which contains your MIB. */
+#include "private_mib.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* MIB object instance */
+#define MIB_OBJECT_NONE 0 
+#define MIB_OBJECT_SCALAR 1
+#define MIB_OBJECT_TAB 2
+
+/* MIB access types */
+#define MIB_ACCESS_READ   1
+#define MIB_ACCESS_WRITE  2
+
+/* MIB object access */
+#define MIB_OBJECT_READ_ONLY      MIB_ACCESS_READ
+#define MIB_OBJECT_READ_WRITE     (MIB_ACCESS_READ | MIB_ACCESS_WRITE)
+#define MIB_OBJECT_WRITE_ONLY     MIB_ACCESS_WRITE
+#define MIB_OBJECT_NOT_ACCESSIBLE 0
+
+/** object definition returned by (get_object_def)() */
+struct obj_def
+{
+  /* MIB_OBJECT_NONE (0), MIB_OBJECT_SCALAR (1), MIB_OBJECT_TAB (2) */
+  u8_t instance;
+  /* 0 read-only, 1 read-write, 2 write-only, 3 not-accessible */
+  u8_t access;
+  /* ASN type for this object */
+  u8_t asn_type;
+  /* value length (host length) */
+  u16_t v_len;
+  /* length of instance part of supplied object identifier */
+  u8_t  id_inst_len;
+  /* instance part of supplied object identifier */
+  s32_t *id_inst_ptr;
+};
+
+struct snmp_name_ptr
+{
+  u8_t ident_len;
+  s32_t *ident;
+};
+
+/** MIB const scalar (.0) node */
+#define MIB_NODE_SC 0x01
+/** MIB const array node */
+#define MIB_NODE_AR 0x02
+/** MIB array node (mem_malloced from RAM) */
+#define MIB_NODE_RA 0x03
+/** MIB list root node (mem_malloced from RAM) */
+#define MIB_NODE_LR 0x04
+/** MIB node for external objects */
+#define MIB_NODE_EX 0x05
+
+/** node "base class" layout, the mandatory fields for a node  */
+struct mib_node
+{
+  /** returns struct obj_def for the given object identifier */
+  void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od);
+  /** returns object value for the given object identifier,
+     @note the caller must allocate at least len bytes for the value */
+  void (*get_value)(struct obj_def *od, u16_t len, void *value);
+  /** tests length and/or range BEFORE setting */
+  u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
+  /** sets object value, only to be called when set_test()  */
+  void (*set_value)(struct obj_def *od, u16_t len, void *value);  
+  /** One out of MIB_NODE_AR, MIB_NODE_LR or MIB_NODE_EX */
+  u8_t node_type;
+  /* array or max list length */
+  u16_t maxlength;
+};
+
+/** derived node for scalars .0 index */
+typedef struct mib_node mib_scalar_node;
+
+/** derived node, points to a fixed size const array
+    of sub-identifiers plus a 'child' pointer */
+struct mib_array_node
+{
+  /* inherited "base class" members */
+  void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od);
+  void (*get_value)(struct obj_def *od, u16_t len, void *value);
+  u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
+  void (*set_value)(struct obj_def *od, u16_t len, void *value);
+
+  u8_t node_type;
+  u16_t maxlength;
+
+  /* additional struct members */
+  const s32_t *objid;
+  struct mib_node* const *nptr;
+};
+
+/** derived node, points to a fixed size mem_malloced array
+    of sub-identifiers plus a 'child' pointer */
+struct mib_ram_array_node
+{
+  /* inherited "base class" members */
+  void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od);
+  void (*get_value)(struct obj_def *od, u16_t len, void *value);
+  u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
+  void (*set_value)(struct obj_def *od, u16_t len, void *value);
+
+  u8_t node_type;
+  u16_t maxlength;
+
+  /* aditional struct members */
+  s32_t *objid;
+  struct mib_node **nptr;
+};
+
+struct mib_list_node
+{
+  struct mib_list_node *prev;  
+  struct mib_list_node *next;
+  s32_t objid;
+  struct mib_node *nptr;
+};
+
+/** derived node, points to a doubly linked list
+    of sub-identifiers plus a 'child' pointer */
+struct mib_list_rootnode
+{
+  /* inherited "base class" members */
+  void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od);
+  void (*get_value)(struct obj_def *od, u16_t len, void *value);
+  u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
+  void (*set_value)(struct obj_def *od, u16_t len, void *value);
+
+  u8_t node_type;
+  u16_t maxlength;
+
+  /* additional struct members */
+  struct mib_list_node *head;
+  struct mib_list_node *tail;
+  /* counts list nodes in list  */
+  u16_t count;
+};
+
+/** derived node, has access functions for mib object in external memory or device
+    using 'tree_level' and 'idx', with a range 0 .. (level_length() - 1) */
+struct mib_external_node
+{
+  /* inherited "base class" members */
+  void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od);
+  void (*get_value)(struct obj_def *od, u16_t len, void *value);
+  u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
+  void (*set_value)(struct obj_def *od, u16_t len, void *value);
+
+  u8_t node_type;
+  u16_t maxlength;
+
+  /* additional struct members */
+  /** points to an external (in memory) record of some sort of addressing
+      information, passed to and interpreted by the funtions below */
+  void* addr_inf;
+  /** tree levels under this node */
+  u8_t tree_levels;
+  /** number of objects at this level */
+  u16_t (*level_length)(void* addr_inf, u8_t level);
+  /** compares object sub identifier with external id
+      return zero when equal, nonzero when unequal */
+  s32_t (*ident_cmp)(void* addr_inf, u8_t level, u16_t idx, s32_t sub_id);
+  void (*get_objid)(void* addr_inf, u8_t level, u16_t idx, s32_t *sub_id);
+
+  /** async Questions */
+  void (*get_object_def_q)(void* addr_inf, u8_t rid, u8_t ident_len, s32_t *ident);
+  void (*get_value_q)(u8_t rid, struct obj_def *od);
+  void (*set_test_q)(u8_t rid, struct obj_def *od);
+  void (*set_value_q)(u8_t rid, struct obj_def *od, u16_t len, void *value);
+  /** async Answers */
+  void (*get_object_def_a)(u8_t rid, u8_t ident_len, s32_t *ident, struct obj_def *od);
+  void (*get_value_a)(u8_t rid, struct obj_def *od, u16_t len, void *value);
+  u8_t (*set_test_a)(u8_t rid, struct obj_def *od, u16_t len, void *value);
+  void (*set_value_a)(u8_t rid, struct obj_def *od, u16_t len, void *value);
+  /** async Panic Close (agent returns error reply, 
+      e.g. used for external transaction cleanup) */
+  void (*get_object_def_pc)(u8_t rid, u8_t ident_len, s32_t *ident);
+  void (*get_value_pc)(u8_t rid, struct obj_def *od);
+  void (*set_test_pc)(u8_t rid, struct obj_def *od);
+  void (*set_value_pc)(u8_t rid, struct obj_def *od);
+};
+
+/** export MIB tree from mib2.c */
+extern const struct mib_array_node internet;
+
+/** dummy function pointers for non-leaf MIB nodes from mib2.c */
+void noleafs_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od);
+void noleafs_get_value(struct obj_def *od, u16_t len, void *value);
+u8_t noleafs_set_test(struct obj_def *od, u16_t len, void *value);
+void noleafs_set_value(struct obj_def *od, u16_t len, void *value);
+
+void snmp_oidtoip(s32_t *ident, ip_addr_t *ip);
+void snmp_iptooid(ip_addr_t *ip, s32_t *ident);
+void snmp_ifindextonetif(s32_t ifindex, struct netif **netif);
+void snmp_netiftoifindex(struct netif *netif, s32_t *ifidx);
+
+struct mib_list_node* snmp_mib_ln_alloc(s32_t id);
+void snmp_mib_ln_free(struct mib_list_node *ln);
+struct mib_list_rootnode* snmp_mib_lrn_alloc(void);
+void snmp_mib_lrn_free(struct mib_list_rootnode *lrn);
+
+s8_t snmp_mib_node_insert(struct mib_list_rootnode *rn, s32_t objid, struct mib_list_node **insn);
+s8_t snmp_mib_node_find(struct mib_list_rootnode *rn, s32_t objid, struct mib_list_node **fn);
+struct mib_list_rootnode *snmp_mib_node_delete(struct mib_list_rootnode *rn, struct mib_list_node *n);
+
+struct mib_node* snmp_search_tree(struct mib_node *node, u8_t ident_len, s32_t *ident, struct snmp_name_ptr *np);
+struct mib_node* snmp_expand_tree(struct mib_node *node, u8_t ident_len, s32_t *ident, struct snmp_obj_id *oidret);
+u8_t snmp_iso_prefix_tst(u8_t ident_len, s32_t *ident);
+u8_t snmp_iso_prefix_expand(u8_t ident_len, s32_t *ident, struct snmp_obj_id *oidret);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_SNMP */
+
+#endif /* __LWIP_SNMP_STRUCTS_H__ */
diff --git a/ext/lwip/src/include/lwip/sockets.h b/ext/lwip/src/include/lwip/sockets.h
new file mode 100644
index 000000000..3ea32f13f
--- /dev/null
+++ b/ext/lwip/src/include/lwip/sockets.h
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+
+#ifndef __LWIP_SOCKETS_H__
+#define __LWIP_SOCKETS_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
+
+#include <stddef.h> /* for size_t */
+
+#include "lwip/ip_addr.h"
+#include "lwip/inet.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* members are in network byte order */
+struct sockaddr_in {
+  u8_t sin_len;
+  u8_t sin_family;
+  u16_t sin_port;
+  struct in_addr sin_addr;
+  char sin_zero[8];
+};
+
+struct sockaddr {
+  u8_t sa_len;
+  u8_t sa_family;
+  char sa_data[14];
+};
+
+/* If your port already typedef's socklen_t, define SOCKLEN_T_DEFINED
+   to prevent this code from redefining it. */
+#if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED)
+typedef u32_t socklen_t;
+#endif
+
+/* Socket protocol types (TCP/UDP/RAW) */
+#define SOCK_STREAM     1
+#define SOCK_DGRAM      2
+#define SOCK_RAW        3
+
+/*
+ * Option flags per-socket. These must match the SOF_ flags in ip.h (checked in init.c)
+ */
+#define  SO_DEBUG       0x0001 /* Unimplemented: turn on debugging info recording */
+#define  SO_ACCEPTCONN  0x0002 /* socket has had listen() */
+#define  SO_REUSEADDR   0x0004 /* Allow local address reuse */
+#define  SO_KEEPALIVE   0x0008 /* keep connections alive */
+#define  SO_DONTROUTE   0x0010 /* Unimplemented: just use interface addresses */
+#define  SO_BROADCAST   0x0020 /* permit to send and to receive broadcast messages (see IP_SOF_BROADCAST option) */
+#define  SO_USELOOPBACK 0x0040 /* Unimplemented: bypass hardware when possible */
+#define  SO_LINGER      0x0080 /* linger on close if data present */
+#define  SO_OOBINLINE   0x0100 /* Unimplemented: leave received OOB data in line */
+#define  SO_REUSEPORT   0x0200 /* Unimplemented: allow local address & port reuse */
+
+#define SO_DONTLINGER   ((int)(~SO_LINGER))
+
+/*
+ * Additional options, not kept in so_options.
+ */
+#define SO_SNDBUF    0x1001    /* Unimplemented: send buffer size */
+#define SO_RCVBUF    0x1002    /* receive buffer size */
+#define SO_SNDLOWAT  0x1003    /* Unimplemented: send low-water mark */
+#define SO_RCVLOWAT  0x1004    /* Unimplemented: receive low-water mark */
+#define SO_SNDTIMEO  0x1005    /* Unimplemented: send timeout */
+#define SO_RCVTIMEO  0x1006    /* receive timeout */
+#define SO_ERROR     0x1007    /* get error status and clear */
+#define SO_TYPE      0x1008    /* get socket type */
+#define SO_CONTIMEO  0x1009    /* Unimplemented: connect timeout */
+#define SO_NO_CHECK  0x100a    /* don't create UDP checksum */
+
+
+/*
+ * Structure used for manipulating linger option.
+ */
+struct linger {
+       int l_onoff;                /* option on/off */
+       int l_linger;               /* linger time */
+};
+
+/*
+ * Level number for (get/set)sockopt() to apply to socket itself.
+ */
+#define  SOL_SOCKET  0xfff    /* options for socket level */
+
+
+#define AF_UNSPEC       0
+#define AF_INET         2
+#define PF_INET         AF_INET
+#define PF_UNSPEC       AF_UNSPEC
+
+#define IPPROTO_IP      0
+#define IPPROTO_TCP     6
+#define IPPROTO_UDP     17
+#define IPPROTO_UDPLITE 136
+
+/* Flags we can use with send and recv. */
+#define MSG_PEEK       0x01    /* Peeks at an incoming message */
+#define MSG_WAITALL    0x02    /* Unimplemented: Requests that the function block until the full amount of data requested can be returned */
+#define MSG_OOB        0x04    /* Unimplemented: Requests out-of-band data. The significance and semantics of out-of-band data are protocol-specific */
+#define MSG_DONTWAIT   0x08    /* Nonblocking i/o for this operation only */
+#define MSG_MORE       0x10    /* Sender will send more */
+
+
+/*
+ * Options for level IPPROTO_IP
+ */
+#define IP_TOS             1
+#define IP_TTL             2
+
+#if LWIP_TCP
+/*
+ * Options for level IPPROTO_TCP
+ */
+#define TCP_NODELAY    0x01    /* don't delay send to coalesce packets */
+#define TCP_KEEPALIVE  0x02    /* send KEEPALIVE probes when idle for pcb->keep_idle milliseconds */
+#define TCP_KEEPIDLE   0x03    /* set pcb->keep_idle  - Same as TCP_KEEPALIVE, but use seconds for get/setsockopt */
+#define TCP_KEEPINTVL  0x04    /* set pcb->keep_intvl - Use seconds for get/setsockopt */
+#define TCP_KEEPCNT    0x05    /* set pcb->keep_cnt   - Use number of probes sent for get/setsockopt */
+#endif /* LWIP_TCP */
+
+#if LWIP_UDP && LWIP_UDPLITE
+/*
+ * Options for level IPPROTO_UDPLITE
+ */
+#define UDPLITE_SEND_CSCOV 0x01 /* sender checksum coverage */
+#define UDPLITE_RECV_CSCOV 0x02 /* minimal receiver checksum coverage */
+#endif /* LWIP_UDP && LWIP_UDPLITE*/
+
+
+#if LWIP_IGMP
+/*
+ * Options and types for UDP multicast traffic handling
+ */
+#define IP_ADD_MEMBERSHIP  3
+#define IP_DROP_MEMBERSHIP 4
+#define IP_MULTICAST_TTL   5
+#define IP_MULTICAST_IF    6
+#define IP_MULTICAST_LOOP  7
+
+typedef struct ip_mreq {
+    struct in_addr imr_multiaddr; /* IP multicast address of group */
+    struct in_addr imr_interface; /* local IP address of interface */
+} ip_mreq;
+#endif /* LWIP_IGMP */
+
+/*
+ * The Type of Service provides an indication of the abstract
+ * parameters of the quality of service desired.  These parameters are
+ * to be used to guide the selection of the actual service parameters
+ * when transmitting a datagram through a particular network.  Several
+ * networks offer service precedence, which somehow treats high
+ * precedence traffic as more important than other traffic (generally
+ * by accepting only traffic above a certain precedence at time of high
+ * load).  The major choice is a three way tradeoff between low-delay,
+ * high-reliability, and high-throughput.
+ * The use of the Delay, Throughput, and Reliability indications may
+ * increase the cost (in some sense) of the service.  In many networks
+ * better performance for one of these parameters is coupled with worse
+ * performance on another.  Except for very unusual cases at most two
+ * of these three indications should be set.
+ */
+#define IPTOS_TOS_MASK          0x1E
+#define IPTOS_TOS(tos)          ((tos) & IPTOS_TOS_MASK)
+#define IPTOS_LOWDELAY          0x10
+#define IPTOS_THROUGHPUT        0x08
+#define IPTOS_RELIABILITY       0x04
+#define IPTOS_LOWCOST           0x02
+#define IPTOS_MINCOST           IPTOS_LOWCOST
+
+/*
+ * The Network Control precedence designation is intended to be used
+ * within a network only.  The actual use and control of that
+ * designation is up to each network. The Internetwork Control
+ * designation is intended for use by gateway control originators only.
+ * If the actual use of these precedence designations is of concern to
+ * a particular network, it is the responsibility of that network to
+ * control the access to, and use of, those precedence designations.
+ */
+#define IPTOS_PREC_MASK                 0xe0
+#define IPTOS_PREC(tos)                ((tos) & IPTOS_PREC_MASK)
+#define IPTOS_PREC_NETCONTROL           0xe0
+#define IPTOS_PREC_INTERNETCONTROL      0xc0
+#define IPTOS_PREC_CRITIC_ECP           0xa0
+#define IPTOS_PREC_FLASHOVERRIDE        0x80
+#define IPTOS_PREC_FLASH                0x60
+#define IPTOS_PREC_IMMEDIATE            0x40
+#define IPTOS_PREC_PRIORITY             0x20
+#define IPTOS_PREC_ROUTINE              0x00
+
+
+/*
+ * Commands for ioctlsocket(),  taken from the BSD file fcntl.h.
+ * lwip_ioctl only supports FIONREAD and FIONBIO, for now
+ *
+ * Ioctl's have the command encoded in the lower word,
+ * and the size of any in or out parameters in the upper
+ * word.  The high 2 bits of the upper word are used
+ * to encode the in/out status of the parameter; for now
+ * we restrict parameters to at most 128 bytes.
+ */
+#if !defined(FIONREAD) || !defined(FIONBIO)
+#define IOCPARM_MASK    0x7fU           /* parameters must be < 128 bytes */
+#define IOC_VOID        0x20000000UL    /* no parameters */
+#define IOC_OUT         0x40000000UL    /* copy out parameters */
+#define IOC_IN          0x80000000UL    /* copy in parameters */
+#define IOC_INOUT       (IOC_IN|IOC_OUT)
+                                        /* 0x20000000 distinguishes new &
+                                           old ioctl's */
+#define _IO(x,y)        (IOC_VOID|((x)<<8)|(y))
+
+#define _IOR(x,y,t)     (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
+
+#define _IOW(x,y,t)     (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
+#endif /* !defined(FIONREAD) || !defined(FIONBIO) */
+
+#ifndef FIONREAD
+#define FIONREAD    _IOR('f', 127, unsigned long) /* get # bytes to read */
+#endif
+#ifndef FIONBIO
+#define FIONBIO     _IOW('f', 126, unsigned long) /* set/clear non-blocking i/o */
+#endif
+
+/* Socket I/O Controls: unimplemented */
+#ifndef SIOCSHIWAT
+#define SIOCSHIWAT  _IOW('s',  0, unsigned long)  /* set high watermark */
+#define SIOCGHIWAT  _IOR('s',  1, unsigned long)  /* get high watermark */
+#define SIOCSLOWAT  _IOW('s',  2, unsigned long)  /* set low watermark */
+#define SIOCGLOWAT  _IOR('s',  3, unsigned long)  /* get low watermark */
+#define SIOCATMARK  _IOR('s',  7, unsigned long)  /* at oob mark? */
+#endif
+
+/* commands for fnctl */
+#ifndef F_GETFL
+#define F_GETFL 3
+#endif
+#ifndef F_SETFL
+#define F_SETFL 4
+#endif
+
+/* File status flags and file access modes for fnctl,
+   these are bits in an int. */
+#ifndef O_NONBLOCK
+#define O_NONBLOCK  1 /* nonblocking I/O */
+#endif
+#ifndef O_NDELAY
+#define O_NDELAY    1 /* same as O_NONBLOCK, for compatibility */
+#endif
+
+#ifndef SHUT_RD
+  #define SHUT_RD   0
+  #define SHUT_WR   1
+  #define SHUT_RDWR 2
+#endif
+
+/* FD_SET used for lwip_select */
+#ifndef FD_SET
+  #undef  FD_SETSIZE
+  /* Make FD_SETSIZE match NUM_SOCKETS in socket.c */
+  #define FD_SETSIZE    MEMP_NUM_NETCONN
+  #define FD_SET(n, p)  ((p)->fd_bits[(n)/8] |=  (1 << ((n) & 7)))
+  #define FD_CLR(n, p)  ((p)->fd_bits[(n)/8] &= ~(1 << ((n) & 7)))
+  #define FD_ISSET(n,p) ((p)->fd_bits[(n)/8] &   (1 << ((n) & 7)))
+  #define FD_ZERO(p)    memset((void*)(p),0,sizeof(*(p)))
+
+  typedef struct fd_set {
+          unsigned char fd_bits [(FD_SETSIZE+7)/8];
+        } fd_set;
+
+#endif /* FD_SET */
+
+/** LWIP_TIMEVAL_PRIVATE: if you want to use the struct timeval provided
+ * by your system, set this to 0 and include <sys/time.h> in cc.h */ 
+#ifndef LWIP_TIMEVAL_PRIVATE
+#define LWIP_TIMEVAL_PRIVATE 1
+#endif
+
+#if LWIP_TIMEVAL_PRIVATE
+struct timeval {
+  long    tv_sec;         /* seconds */
+  long    tv_usec;        /* and microseconds */
+};
+#endif /* LWIP_TIMEVAL_PRIVATE */
+
+void lwip_socket_init(void);
+
+int lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
+int lwip_bind(int s, const struct sockaddr *name, socklen_t namelen);
+int lwip_shutdown(int s, int how);
+int lwip_getpeername (int s, struct sockaddr *name, socklen_t *namelen);
+int lwip_getsockname (int s, struct sockaddr *name, socklen_t *namelen);
+int lwip_getsockopt (int s, int level, int optname, void *optval, socklen_t *optlen);
+int lwip_setsockopt (int s, int level, int optname, const void *optval, socklen_t optlen);
+int lwip_close(int s);
+int lwip_connect(int s, const struct sockaddr *name, socklen_t namelen);
+int lwip_listen(int s, int backlog);
+int lwip_recv(int s, void *mem, size_t len, int flags);
+int lwip_read(int s, void *mem, size_t len);
+int lwip_recvfrom(int s, void *mem, size_t len, int flags,
+      struct sockaddr *from, socklen_t *fromlen);
+int lwip_send(int s, const void *dataptr, size_t size, int flags);
+int lwip_sendto(int s, const void *dataptr, size_t size, int flags,
+    const struct sockaddr *to, socklen_t tolen);
+int lwip_socket(int domain, int type, int protocol);
+int lwip_write(int s, const void *dataptr, size_t size);
+int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
+                struct timeval *timeout);
+int lwip_ioctl(int s, long cmd, void *argp);
+int lwip_fcntl(int s, int cmd, int val);
+
+#if LWIP_COMPAT_SOCKETS
+#define accept(a,b,c)         lwip_accept(a,b,c)
+#define bind(a,b,c)           lwip_bind(a,b,c)
+#define shutdown(a,b)         lwip_shutdown(a,b)
+#define closesocket(s)        lwip_close(s)
+#define connect(a,b,c)        lwip_connect(a,b,c)
+#define getsockname(a,b,c)    lwip_getsockname(a,b,c)
+#define getpeername(a,b,c)    lwip_getpeername(a,b,c)
+#define setsockopt(a,b,c,d,e) lwip_setsockopt(a,b,c,d,e)
+#define getsockopt(a,b,c,d,e) lwip_getsockopt(a,b,c,d,e)
+#define listen(a,b)           lwip_listen(a,b)
+#define recv(a,b,c,d)         lwip_recv(a,b,c,d)
+#define recvfrom(a,b,c,d,e,f) lwip_recvfrom(a,b,c,d,e,f)
+#define send(a,b,c,d)         lwip_send(a,b,c,d)
+#define sendto(a,b,c,d,e,f)   lwip_sendto(a,b,c,d,e,f)
+#define socket(a,b,c)         lwip_socket(a,b,c)
+#define select(a,b,c,d,e)     lwip_select(a,b,c,d,e)
+#define ioctlsocket(a,b,c)    lwip_ioctl(a,b,c)
+
+#if LWIP_POSIX_SOCKETS_IO_NAMES
+#define read(a,b,c)           lwip_read(a,b,c)
+#define write(a,b,c)          lwip_write(a,b,c)
+#define close(s)              lwip_close(s)
+#define fcntl(a,b,c)          lwip_fcntl(a,b,c)
+#endif /* LWIP_POSIX_SOCKETS_IO_NAMES */
+
+#endif /* LWIP_COMPAT_SOCKETS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_SOCKET */
+
+#endif /* __LWIP_SOCKETS_H__ */
diff --git a/ext/lwip/src/include/lwip/stats.h b/ext/lwip/src/include/lwip/stats.h
new file mode 100644
index 000000000..d828980a9
--- /dev/null
+++ b/ext/lwip/src/include/lwip/stats.h
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_STATS_H__
+#define __LWIP_STATS_H__
+
+#include "lwip/opt.h"
+
+#include "lwip/mem.h"
+#include "lwip/memp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if LWIP_STATS
+
+#ifndef LWIP_STATS_LARGE
+#define LWIP_STATS_LARGE 0
+#endif
+
+#if LWIP_STATS_LARGE
+#define STAT_COUNTER     u32_t
+#define STAT_COUNTER_F   U32_F
+#else
+#define STAT_COUNTER     u16_t
+#define STAT_COUNTER_F   U16_F
+#endif
+
+struct stats_proto {
+  STAT_COUNTER xmit;             /* Transmitted packets. */
+  STAT_COUNTER recv;             /* Received packets. */
+  STAT_COUNTER fw;               /* Forwarded packets. */
+  STAT_COUNTER drop;             /* Dropped packets. */
+  STAT_COUNTER chkerr;           /* Checksum error. */
+  STAT_COUNTER lenerr;           /* Invalid length error. */
+  STAT_COUNTER memerr;           /* Out of memory error. */
+  STAT_COUNTER rterr;            /* Routing error. */
+  STAT_COUNTER proterr;          /* Protocol error. */
+  STAT_COUNTER opterr;           /* Error in options. */
+  STAT_COUNTER err;              /* Misc error. */
+  STAT_COUNTER cachehit;
+};
+
+struct stats_igmp {
+  STAT_COUNTER xmit;             /* Transmitted packets. */
+  STAT_COUNTER recv;             /* Received packets. */
+  STAT_COUNTER drop;             /* Dropped packets. */
+  STAT_COUNTER chkerr;           /* Checksum error. */
+  STAT_COUNTER lenerr;           /* Invalid length error. */
+  STAT_COUNTER memerr;           /* Out of memory error. */
+  STAT_COUNTER proterr;          /* Protocol error. */
+  STAT_COUNTER rx_v1;            /* Received v1 frames. */
+  STAT_COUNTER rx_group;         /* Received group-specific queries. */
+  STAT_COUNTER rx_general;       /* Received general queries. */
+  STAT_COUNTER rx_report;        /* Received reports. */
+  STAT_COUNTER tx_join;          /* Sent joins. */
+  STAT_COUNTER tx_leave;         /* Sent leaves. */
+  STAT_COUNTER tx_report;        /* Sent reports. */
+};
+
+struct stats_mem {
+#ifdef LWIP_DEBUG
+  const char *name;
+#endif /* LWIP_DEBUG */
+  mem_size_t avail;
+  mem_size_t used;
+  mem_size_t max;
+  STAT_COUNTER err;
+  STAT_COUNTER illegal;
+};
+
+struct stats_syselem {
+  STAT_COUNTER used;
+  STAT_COUNTER max;
+  STAT_COUNTER err;
+};
+
+struct stats_sys {
+  struct stats_syselem sem;
+  struct stats_syselem mutex;
+  struct stats_syselem mbox;
+};
+
+struct stats_ {
+#if LINK_STATS
+  struct stats_proto link;
+#endif
+#if ETHARP_STATS
+  struct stats_proto etharp;
+#endif
+#if IPFRAG_STATS
+  struct stats_proto ip_frag;
+#endif
+#if IP_STATS
+  struct stats_proto ip;
+#endif
+#if ICMP_STATS
+  struct stats_proto icmp;
+#endif
+#if IGMP_STATS
+  struct stats_igmp igmp;
+#endif
+#if UDP_STATS
+  struct stats_proto udp;
+#endif
+#if TCP_STATS
+  struct stats_proto tcp;
+#endif
+#if MEM_STATS
+  struct stats_mem mem;
+#endif
+#if MEMP_STATS
+  struct stats_mem memp[MEMP_MAX];
+#endif
+#if SYS_STATS
+  struct stats_sys sys;
+#endif
+};
+
+extern struct stats_ lwip_stats;
+
+void stats_init(void);
+
+#define STATS_INC(x) ++lwip_stats.x
+#define STATS_DEC(x) --lwip_stats.x
+#define STATS_INC_USED(x, y) do { lwip_stats.x.used += y; \
+                                if (lwip_stats.x.max < lwip_stats.x.used) { \
+                                    lwip_stats.x.max = lwip_stats.x.used; \
+                                } \
+                             } while(0)
+#else /* LWIP_STATS */
+#define stats_init()
+#define STATS_INC(x)
+#define STATS_DEC(x)
+#define STATS_INC_USED(x)
+#endif /* LWIP_STATS */
+
+#if TCP_STATS
+#define TCP_STATS_INC(x) STATS_INC(x)
+#define TCP_STATS_DISPLAY() stats_display_proto(&lwip_stats.tcp, "TCP")
+#else
+#define TCP_STATS_INC(x)
+#define TCP_STATS_DISPLAY()
+#endif
+
+#if UDP_STATS
+#define UDP_STATS_INC(x) STATS_INC(x)
+#define UDP_STATS_DISPLAY() stats_display_proto(&lwip_stats.udp, "UDP")
+#else
+#define UDP_STATS_INC(x)
+#define UDP_STATS_DISPLAY()
+#endif
+
+#if ICMP_STATS
+#define ICMP_STATS_INC(x) STATS_INC(x)
+#define ICMP_STATS_DISPLAY() stats_display_proto(&lwip_stats.icmp, "ICMP")
+#else
+#define ICMP_STATS_INC(x)
+#define ICMP_STATS_DISPLAY()
+#endif
+
+#if IGMP_STATS
+#define IGMP_STATS_INC(x) STATS_INC(x)
+#define IGMP_STATS_DISPLAY() stats_display_igmp(&lwip_stats.igmp)
+#else
+#define IGMP_STATS_INC(x)
+#define IGMP_STATS_DISPLAY()
+#endif
+
+#if IP_STATS
+#define IP_STATS_INC(x) STATS_INC(x)
+#define IP_STATS_DISPLAY() stats_display_proto(&lwip_stats.ip, "IP")
+#else
+#define IP_STATS_INC(x)
+#define IP_STATS_DISPLAY()
+#endif
+
+#if IPFRAG_STATS
+#define IPFRAG_STATS_INC(x) STATS_INC(x)
+#define IPFRAG_STATS_DISPLAY() stats_display_proto(&lwip_stats.ip_frag, "IP_FRAG")
+#else
+#define IPFRAG_STATS_INC(x)
+#define IPFRAG_STATS_DISPLAY()
+#endif
+
+#if ETHARP_STATS
+#define ETHARP_STATS_INC(x) STATS_INC(x)
+#define ETHARP_STATS_DISPLAY() stats_display_proto(&lwip_stats.etharp, "ETHARP")
+#else
+#define ETHARP_STATS_INC(x)
+#define ETHARP_STATS_DISPLAY()
+#endif
+
+#if LINK_STATS
+#define LINK_STATS_INC(x) STATS_INC(x)
+#define LINK_STATS_DISPLAY() stats_display_proto(&lwip_stats.link, "LINK")
+#else
+#define LINK_STATS_INC(x)
+#define LINK_STATS_DISPLAY()
+#endif
+
+#if MEM_STATS
+#define MEM_STATS_AVAIL(x, y) lwip_stats.mem.x = y
+#define MEM_STATS_INC(x) STATS_INC(mem.x)
+#define MEM_STATS_INC_USED(x, y) STATS_INC_USED(mem, y)
+#define MEM_STATS_DEC_USED(x, y) lwip_stats.mem.x -= y
+#define MEM_STATS_DISPLAY() stats_display_mem(&lwip_stats.mem, "HEAP")
+#else
+#define MEM_STATS_AVAIL(x, y)
+#define MEM_STATS_INC(x)
+#define MEM_STATS_INC_USED(x, y)
+#define MEM_STATS_DEC_USED(x, y)
+#define MEM_STATS_DISPLAY()
+#endif
+
+#if MEMP_STATS
+#define MEMP_STATS_AVAIL(x, i, y) lwip_stats.memp[i].x = y
+#define MEMP_STATS_INC(x, i) STATS_INC(memp[i].x)
+#define MEMP_STATS_DEC(x, i) STATS_DEC(memp[i].x)
+#define MEMP_STATS_INC_USED(x, i) STATS_INC_USED(memp[i], 1)
+#define MEMP_STATS_DISPLAY(i) stats_display_memp(&lwip_stats.memp[i], i)
+#else
+#define MEMP_STATS_AVAIL(x, i, y)
+#define MEMP_STATS_INC(x, i)
+#define MEMP_STATS_DEC(x, i)
+#define MEMP_STATS_INC_USED(x, i)
+#define MEMP_STATS_DISPLAY(i)
+#endif
+
+#if SYS_STATS
+#define SYS_STATS_INC(x) STATS_INC(sys.x)
+#define SYS_STATS_DEC(x) STATS_DEC(sys.x)
+#define SYS_STATS_INC_USED(x) STATS_INC_USED(sys.x, 1)
+#define SYS_STATS_DISPLAY() stats_display_sys(&lwip_stats.sys)
+#else
+#define SYS_STATS_INC(x)
+#define SYS_STATS_DEC(x)
+#define SYS_STATS_INC_USED(x)
+#define SYS_STATS_DISPLAY()
+#endif
+
+/* Display of statistics */
+#if LWIP_STATS_DISPLAY
+void stats_display(void);
+void stats_display_proto(struct stats_proto *proto, const char *name);
+void stats_display_igmp(struct stats_igmp *igmp);
+void stats_display_mem(struct stats_mem *mem, const char *name);
+void stats_display_memp(struct stats_mem *mem, int index);
+void stats_display_sys(struct stats_sys *sys);
+#else /* LWIP_STATS_DISPLAY */
+#define stats_display()
+#define stats_display_proto(proto, name)
+#define stats_display_igmp(igmp)
+#define stats_display_mem(mem, name)
+#define stats_display_memp(mem, index)
+#define stats_display_sys(sys)
+#endif /* LWIP_STATS_DISPLAY */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_STATS_H__ */
diff --git a/ext/lwip/src/include/lwip/sys.h b/ext/lwip/src/include/lwip/sys.h
new file mode 100644
index 000000000..dc9351335
--- /dev/null
+++ b/ext/lwip/src/include/lwip/sys.h
@@ -0,0 +1,337 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_SYS_H__
+#define __LWIP_SYS_H__
+
+#include "lwip/opt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if NO_SYS
+
+/* For a totally minimal and standalone system, we provide null
+   definitions of the sys_ functions. */
+typedef u8_t sys_sem_t;
+typedef u8_t sys_mutex_t;
+typedef u8_t sys_mbox_t;
+
+#define sys_sem_new(s, c) ERR_OK
+#define sys_sem_signal(s)
+#define sys_sem_wait(s)
+#define sys_arch_sem_wait(s,t)
+#define sys_sem_free(s)
+#define sys_sem_valid(s) 0
+#define sys_sem_set_invalid(s)
+#define sys_mutex_new(mu) ERR_OK
+#define sys_mutex_lock(mu)
+#define sys_mutex_unlock(mu)
+#define sys_mutex_free(mu)
+#define sys_mutex_valid(mu) 0
+#define sys_mutex_set_invalid(mu)
+#define sys_mbox_new(m, s) ERR_OK
+#define sys_mbox_fetch(m,d)
+#define sys_mbox_tryfetch(m,d)
+#define sys_mbox_post(m,d)
+#define sys_mbox_trypost(m,d)
+#define sys_mbox_free(m)
+#define sys_mbox_valid(m)
+#define sys_mbox_set_invalid(m)
+
+#define sys_thread_new(n,t,a,s,p)
+
+#define sys_msleep(t)
+
+#else /* NO_SYS */
+
+/** Return code for timeouts from sys_arch_mbox_fetch and sys_arch_sem_wait */
+#define SYS_ARCH_TIMEOUT 0xffffffffUL
+
+/** sys_mbox_tryfetch() returns SYS_MBOX_EMPTY if appropriate.
+ * For now we use the same magic value, but we allow this to change in future.
+ */
+#define SYS_MBOX_EMPTY SYS_ARCH_TIMEOUT 
+
+#include "lwip/err.h"
+#include "arch/sys_arch.h"
+
+/** Function prototype for thread functions */
+typedef void (*lwip_thread_fn)(void *arg);
+
+/* Function prototypes for functions to be implemented by platform ports
+   (in sys_arch.c) */
+
+/* Mutex functions: */
+
+/** Define LWIP_COMPAT_MUTEX if the port has no mutexes and binary semaphores
+    should be used instead */
+#if LWIP_COMPAT_MUTEX
+/* for old ports that don't have mutexes: define them to binary semaphores */
+#define sys_mutex_t                   sys_sem_t
+#define sys_mutex_new(mutex)          sys_sem_new(mutex, 1)
+#define sys_mutex_lock(mutex)         sys_sem_wait(mutex)
+#define sys_mutex_unlock(mutex)       sys_sem_signal(mutex)
+#define sys_mutex_free(mutex)         sys_sem_free(mutex)
+#define sys_mutex_valid(mutex)        sys_sem_valid(mutex)
+#define sys_mutex_set_invalid(mutex)  sys_sem_set_invalid(mutex)
+
+#else /* LWIP_COMPAT_MUTEX */
+
+/** Create a new mutex
+ * @param mutex pointer to the mutex to create
+ * @return a new mutex */
+err_t sys_mutex_new(sys_mutex_t *mutex);
+/** Lock a mutex
+ * @param mutex the mutex to lock */
+void sys_mutex_lock(sys_mutex_t *mutex);
+/** Unlock a mutex
+ * @param mutex the mutex to unlock */
+void sys_mutex_unlock(sys_mutex_t *mutex);
+/** Delete a semaphore
+ * @param mutex the mutex to delete */
+void sys_mutex_free(sys_mutex_t *mutex); 
+#ifndef sys_mutex_valid
+/** Check if a mutex is valid/allocated: return 1 for valid, 0 for invalid */
+int sys_mutex_valid(sys_mutex_t *mutex);
+#endif
+#ifndef sys_mutex_set_invalid
+/** Set a mutex invalid so that sys_mutex_valid returns 0 */
+void sys_mutex_set_invalid(sys_mutex_t *mutex);
+#endif
+#endif /* LWIP_COMPAT_MUTEX */
+
+/* Semaphore functions: */
+
+/** Create a new semaphore
+ * @param sem pointer to the semaphore to create
+ * @param count initial count of the semaphore
+ * @return ERR_OK if successful, another err_t otherwise */
+err_t sys_sem_new(sys_sem_t *sem, u8_t count);
+/** Signals a semaphore
+ * @param sem the semaphore to signal */
+void sys_sem_signal(sys_sem_t *sem);
+/** Wait for a semaphore for the specified timeout
+ * @param sem the semaphore to wait for
+ * @param timeout timeout in milliseconds to wait (0 = wait forever)
+ * @return time (in milliseconds) waited for the semaphore
+ *         or SYS_ARCH_TIMEOUT on timeout */
+u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout);
+/** Delete a semaphore
+ * @param sem semaphore to delete */
+void sys_sem_free(sys_sem_t *sem);
+/** Wait for a semaphore - forever/no timeout */
+#define sys_sem_wait(sem)                  sys_arch_sem_wait(sem, 0)
+#ifndef sys_sem_valid
+/** Check if a sempahore is valid/allocated: return 1 for valid, 0 for invalid */
+int sys_sem_valid(sys_sem_t *sem);
+#endif
+#ifndef sys_sem_set_invalid
+/** Set a semaphore invalid so that sys_sem_valid returns 0 */
+void sys_sem_set_invalid(sys_sem_t *sem);
+#endif
+
+/* Time functions. */
+#ifndef sys_msleep
+void sys_msleep(u32_t ms); /* only has a (close to) 1 jiffy resolution. */
+#endif
+
+/* Mailbox functions. */
+
+/** Create a new mbox of specified size
+ * @param mbox pointer to the mbox to create
+ * @param size (miminum) number of messages in this mbox
+ * @return ERR_OK if successful, another err_t otherwise */
+err_t sys_mbox_new(sys_mbox_t *mbox, int size);
+/** Post a message to an mbox - may not fail
+ * -> blocks if full, only used from tasks not from ISR
+ * @param mbox mbox to posts the message
+ * @param msg message to post (ATTENTION: can be NULL) */
+void sys_mbox_post(sys_mbox_t *mbox, void *msg);
+/** Try to post a message to an mbox - may fail if full or ISR
+ * @param mbox mbox to posts the message
+ * @param msg message to post (ATTENTION: can be NULL) */
+err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg);
+/** Wait for a new message to arrive in the mbox
+ * @param mbox mbox to get a message from
+ * @param msg pointer where the message is stored
+ * @param timeout maximum time (in milliseconds) to wait for a message
+ * @return time (in milliseconds) waited for a message, may be 0 if not waited
+           or SYS_ARCH_TIMEOUT on timeout
+ *         The returned time has to be accurate to prevent timer jitter! */
+u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout);
+/* Allow port to override with a macro, e.g. special timout for sys_arch_mbox_fetch() */
+#ifndef sys_arch_mbox_tryfetch
+/** Wait for a new message to arrive in the mbox
+ * @param mbox mbox to get a message from
+ * @param msg pointer where the message is stored
+ * @param timeout maximum time (in milliseconds) to wait for a message
+ * @return 0 (milliseconds) if a message has been received
+ *         or SYS_MBOX_EMPTY if the mailbox is empty */
+u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg);
+#endif
+/** For now, we map straight to sys_arch implementation. */
+#define sys_mbox_tryfetch(mbox, msg) sys_arch_mbox_tryfetch(mbox, msg)
+/** Delete an mbox
+ * @param mbox mbox to delete */
+void sys_mbox_free(sys_mbox_t *mbox);
+#define sys_mbox_fetch(mbox, msg) sys_arch_mbox_fetch(mbox, msg, 0)
+#ifndef sys_mbox_valid
+/** Check if an mbox is valid/allocated: return 1 for valid, 0 for invalid */
+int sys_mbox_valid(sys_mbox_t *mbox);
+#endif
+#ifndef sys_mbox_set_invalid
+/** Set an mbox invalid so that sys_mbox_valid returns 0 */
+void sys_mbox_set_invalid(sys_mbox_t *mbox);
+#endif
+
+/** The only thread function:
+ * Creates a new thread
+ * @param name human-readable name for the thread (used for debugging purposes)
+ * @param thread thread-function
+ * @param arg parameter passed to 'thread'
+ * @param stacksize stack size in bytes for the new thread (may be ignored by ports)
+ * @param prio priority of the new thread (may be ignored by ports) */
+sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize, int prio);
+
+#endif /* NO_SYS */
+
+/* sys_init() must be called before anthing else. */
+void sys_init(void);
+
+#ifndef sys_jiffies
+/** Ticks/jiffies since power up. */
+u32_t sys_jiffies(void);
+#endif
+
+/** Returns the current time in milliseconds,
+ * may be the same as sys_jiffies or at least based on it. */
+u32_t sys_now(void);
+
+/* Critical Region Protection */
+/* These functions must be implemented in the sys_arch.c file.
+   In some implementations they can provide a more light-weight protection
+   mechanism than using semaphores. Otherwise semaphores can be used for
+   implementation */
+#ifndef SYS_ARCH_PROTECT
+/** SYS_LIGHTWEIGHT_PROT
+ * define SYS_LIGHTWEIGHT_PROT in lwipopts.h if you want inter-task protection
+ * for certain critical regions during buffer allocation, deallocation and memory
+ * allocation and deallocation.
+ */
+#if SYS_LIGHTWEIGHT_PROT
+
+/** SYS_ARCH_DECL_PROTECT
+ * declare a protection variable. This macro will default to defining a variable of
+ * type sys_prot_t. If a particular port needs a different implementation, then
+ * this macro may be defined in sys_arch.h.
+ */
+#define SYS_ARCH_DECL_PROTECT(lev) sys_prot_t lev
+/** SYS_ARCH_PROTECT
+ * Perform a "fast" protect. This could be implemented by
+ * disabling interrupts for an embedded system or by using a semaphore or
+ * mutex. The implementation should allow calling SYS_ARCH_PROTECT when
+ * already protected. The old protection level is returned in the variable
+ * "lev". This macro will default to calling the sys_arch_protect() function
+ * which should be implemented in sys_arch.c. If a particular port needs a
+ * different implementation, then this macro may be defined in sys_arch.h
+ */
+#define SYS_ARCH_PROTECT(lev) lev = sys_arch_protect()
+/** SYS_ARCH_UNPROTECT
+ * Perform a "fast" set of the protection level to "lev". This could be
+ * implemented by setting the interrupt level to "lev" within the MACRO or by
+ * using a semaphore or mutex.  This macro will default to calling the
+ * sys_arch_unprotect() function which should be implemented in
+ * sys_arch.c. If a particular port needs a different implementation, then
+ * this macro may be defined in sys_arch.h
+ */
+#define SYS_ARCH_UNPROTECT(lev) sys_arch_unprotect(lev)
+sys_prot_t sys_arch_protect(void);
+void sys_arch_unprotect(sys_prot_t pval);
+
+#else
+
+#define SYS_ARCH_DECL_PROTECT(lev)
+#define SYS_ARCH_PROTECT(lev)
+#define SYS_ARCH_UNPROTECT(lev)
+
+#endif /* SYS_LIGHTWEIGHT_PROT */
+
+#endif /* SYS_ARCH_PROTECT */
+
+/*
+ * Macros to set/get and increase/decrease variables in a thread-safe way.
+ * Use these for accessing variable that are used from more than one thread.
+ */
+
+#ifndef SYS_ARCH_INC
+#define SYS_ARCH_INC(var, val) do { \
+                                SYS_ARCH_DECL_PROTECT(old_level); \
+                                SYS_ARCH_PROTECT(old_level); \
+                                var += val; \
+                                SYS_ARCH_UNPROTECT(old_level); \
+                              } while(0)
+#endif /* SYS_ARCH_INC */
+
+#ifndef SYS_ARCH_DEC
+#define SYS_ARCH_DEC(var, val) do { \
+                                SYS_ARCH_DECL_PROTECT(old_level); \
+                                SYS_ARCH_PROTECT(old_level); \
+                                var -= val; \
+                                SYS_ARCH_UNPROTECT(old_level); \
+                              } while(0)
+#endif /* SYS_ARCH_DEC */
+
+#ifndef SYS_ARCH_GET
+#define SYS_ARCH_GET(var, ret) do { \
+                                SYS_ARCH_DECL_PROTECT(old_level); \
+                                SYS_ARCH_PROTECT(old_level); \
+                                ret = var; \
+                                SYS_ARCH_UNPROTECT(old_level); \
+                              } while(0)
+#endif /* SYS_ARCH_GET */
+
+#ifndef SYS_ARCH_SET
+#define SYS_ARCH_SET(var, val) do { \
+                                SYS_ARCH_DECL_PROTECT(old_level); \
+                                SYS_ARCH_PROTECT(old_level); \
+                                var = val; \
+                                SYS_ARCH_UNPROTECT(old_level); \
+                              } while(0)
+#endif /* SYS_ARCH_SET */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LWIP_SYS_H__ */
diff --git a/ext/lwip/src/include/lwip/tcp.h b/ext/lwip/src/include/lwip/tcp.h
new file mode 100644
index 000000000..c6e61ad1f
--- /dev/null
+++ b/ext/lwip/src/include/lwip/tcp.h
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_TCP_H__
+#define __LWIP_TCP_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/mem.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip.h"
+#include "lwip/icmp.h"
+#include "lwip/err.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct tcp_pcb;
+
+/** Function prototype for tcp accept callback functions. Called when a new
+ * connection can be accepted on a listening pcb.
+ *
+ * @param arg Additional argument to pass to the callback function (@see tcp_arg())
+ * @param newpcb The new connection pcb
+ * @param err An error code if there has been an error accepting.
+ *            Only return ERR_ABRT if you have called tcp_abort from within the
+ *            callback function!
+ */
+typedef err_t (*tcp_accept_fn)(void *arg, struct tcp_pcb *newpcb, err_t err);
+
+/** Function prototype for tcp receive callback functions. Called when data has
+ * been received.
+ *
+ * @param arg Additional argument to pass to the callback function (@see tcp_arg())
+ * @param tpcb The connection pcb which received data
+ * @param p The received data (or NULL when the connection has been closed!)
+ * @param err An error code if there has been an error receiving
+ *            Only return ERR_ABRT if you have called tcp_abort from within the
+ *            callback function!
+ */
+typedef err_t (*tcp_recv_fn)(void *arg, struct tcp_pcb *tpcb,
+                             struct pbuf *p, err_t err);
+
+/** Function prototype for tcp sent callback functions. Called when sent data has
+ * been acknowledged by the remote side. Use it to free corresponding resources.
+ * This also means that the pcb has now space available to send new data.
+ *
+ * @param arg Additional argument to pass to the callback function (@see tcp_arg())
+ * @param tpcb The connection pcb for which data has been acknowledged
+ * @param len The amount of bytes acknowledged
+ * @return ERR_OK: try to send some data by calling tcp_output
+ *            Only return ERR_ABRT if you have called tcp_abort from within the
+ *            callback function!
+ */
+typedef err_t (*tcp_sent_fn)(void *arg, struct tcp_pcb *tpcb,
+                              u16_t len);
+
+/** Function prototype for tcp poll callback functions. Called periodically as
+ * specified by @see tcp_poll.
+ *
+ * @param arg Additional argument to pass to the callback function (@see tcp_arg())
+ * @param tpcb tcp pcb
+ * @return ERR_OK: try to send some data by calling tcp_output
+ *            Only return ERR_ABRT if you have called tcp_abort from within the
+ *            callback function!
+ */
+typedef err_t (*tcp_poll_fn)(void *arg, struct tcp_pcb *tpcb);
+
+/** Function prototype for tcp error callback functions. Called when the pcb
+ * receives a RST or is unexpectedly closed for any other reason.
+ *
+ * @note The corresponding pcb is already freed when this callback is called!
+ *
+ * @param arg Additional argument to pass to the callback function (@see tcp_arg())
+ * @param err Error code to indicate why the pcb has been closed
+ *            ERR_ABRT: aborted through tcp_abort or by a TCP timer
+ *            ERR_RST: the connection was reset by the remote host
+ */
+typedef void  (*tcp_err_fn)(void *arg, err_t err);
+
+/** Function prototype for tcp connected callback functions. Called when a pcb
+ * is connected to the remote side after initiating a connection attempt by
+ * calling tcp_connect().
+ *
+ * @param arg Additional argument to pass to the callback function (@see tcp_arg())
+ * @param tpcb The connection pcb which is connected
+ * @param err An unused error code, always ERR_OK currently ;-) TODO!
+ *            Only return ERR_ABRT if you have called tcp_abort from within the
+ *            callback function!
+ *
+ * @note When a connection attempt fails, the error callback is currently called!
+ */
+typedef err_t (*tcp_connected_fn)(void *arg, struct tcp_pcb *tpcb, err_t err);
+
+enum tcp_state {
+  CLOSED      = 0,
+  LISTEN      = 1,
+  SYN_SENT    = 2,
+  SYN_RCVD    = 3,
+  ESTABLISHED = 4,
+  FIN_WAIT_1  = 5,
+  FIN_WAIT_2  = 6,
+  CLOSE_WAIT  = 7,
+  CLOSING     = 8,
+  LAST_ACK    = 9,
+  TIME_WAIT   = 10
+};
+
+#if LWIP_CALLBACK_API
+  /* Function to call when a listener has been connected.
+   * @param arg user-supplied argument (tcp_pcb.callback_arg)
+   * @param pcb a new tcp_pcb that now is connected
+   * @param err an error argument (TODO: that is current always ERR_OK?)
+   * @return ERR_OK: accept the new connection,
+   *                 any other err_t abortsthe new connection
+   */
+#define DEF_ACCEPT_CALLBACK  tcp_accept_fn accept;
+#else /* LWIP_CALLBACK_API */
+#define DEF_ACCEPT_CALLBACK
+#endif /* LWIP_CALLBACK_API */
+
+/**
+ * members common to struct tcp_pcb and struct tcp_listen_pcb
+ */
+#define TCP_PCB_COMMON(type) \
+  type *next; /* for the linked list */ \
+  void *callback_arg; \
+  /* the accept callback for listen- and normal pcbs, if LWIP_CALLBACK_API */ \
+  DEF_ACCEPT_CALLBACK \
+  enum tcp_state state; /* TCP state */ \
+  u8_t prio; \
+  /* ports are in host byte order */ \
+  u16_t local_port
+
+
+/* the TCP protocol control block */
+struct tcp_pcb {
+/** common PCB members */
+  IP_PCB;
+/** protocol specific PCB members */
+  TCP_PCB_COMMON(struct tcp_pcb);
+
+  /* ports are in host byte order */
+  u16_t remote_port;
+  
+  u8_t flags;
+#define TF_ACK_DELAY   ((u8_t)0x01U)   /* Delayed ACK. */
+#define TF_ACK_NOW     ((u8_t)0x02U)   /* Immediate ACK. */
+#define TF_INFR        ((u8_t)0x04U)   /* In fast recovery. */
+#define TF_TIMESTAMP   ((u8_t)0x08U)   /* Timestamp option enabled */
+#define TF_RXCLOSED    ((u8_t)0x10U)   /* rx closed by tcp_shutdown */
+#define TF_FIN         ((u8_t)0x20U)   /* Connection was closed locally (FIN segment enqueued). */
+#define TF_NODELAY     ((u8_t)0x40U)   /* Disable Nagle algorithm */
+#define TF_NAGLEMEMERR ((u8_t)0x80U)   /* nagle enabled, memerr, try to output to prevent delayed ACK to happen */
+
+  /* the rest of the fields are in host byte order
+     as we have to do some math with them */
+
+  /* Timers */
+  u8_t polltmr, pollinterval;
+  u8_t last_timer;
+  u32_t tmr;
+
+  /* receiver variables */
+  u32_t rcv_nxt;   /* next seqno expected */
+  u16_t rcv_wnd;   /* receiver window available */
+  u16_t rcv_ann_wnd; /* receiver window to announce */
+  u32_t rcv_ann_right_edge; /* announced right edge of window */
+
+  /* Retransmission timer. */
+  s16_t rtime;
+
+  u16_t mss;   /* maximum segment size */
+
+  /* RTT (round trip time) estimation variables */
+  u32_t rttest; /* RTT estimate in 500ms ticks */
+  u32_t rtseq;  /* sequence number being timed */
+  s16_t sa, sv; /* @todo document this */
+
+  s16_t rto;    /* retransmission time-out */
+  u8_t nrtx;    /* number of retransmissions */
+
+  /* fast retransmit/recovery */
+  u8_t dupacks;
+  u32_t lastack; /* Highest acknowledged seqno. */
+
+  /* congestion avoidance/control variables */
+  u16_t cwnd;
+  u16_t ssthresh;
+
+  /* sender variables */
+  u32_t snd_nxt;   /* next new seqno to be sent */
+  u32_t snd_wl1, snd_wl2; /* Sequence and acknowledgement numbers of last
+                             window update. */
+  u32_t snd_lbb;       /* Sequence number of next byte to be buffered. */
+  u16_t snd_wnd;   /* sender window */
+  u16_t snd_wnd_max; /* the maximum sender window announced by the remote host */
+
+  u16_t acked;
+
+  u16_t snd_buf;   /* Available buffer space for sending (in bytes). */
+#define TCP_SNDQUEUELEN_OVERFLOW (0xffffU-3)
+  u16_t snd_queuelen; /* Available buffer space for sending (in tcp_segs). */
+
+#if TCP_OVERSIZE
+  /* Extra bytes available at the end of the last pbuf in unsent. */
+  u16_t unsent_oversize;
+#endif /* TCP_OVERSIZE */ 
+
+  /* These are ordered by sequence number: */
+  struct tcp_seg *unsent;   /* Unsent (queued) segments. */
+  struct tcp_seg *unacked;  /* Sent but unacknowledged segments. */
+#if TCP_QUEUE_OOSEQ  
+  struct tcp_seg *ooseq;    /* Received out of sequence segments. */
+#endif /* TCP_QUEUE_OOSEQ */
+
+  struct pbuf *refused_data; /* Data previously received but not yet taken by upper layer */
+
+#if LWIP_CALLBACK_API
+  /* Function to be called when more send buffer space is available. */
+  tcp_sent_fn sent;
+  /* Function to be called when (in-sequence) data has arrived. */
+  tcp_recv_fn recv;
+  /* Function to be called when a connection has been set up. */
+  tcp_connected_fn connected;
+  /* Function which is called periodically. */
+  tcp_poll_fn poll;
+  /* Function to be called whenever a fatal error occurs. */
+  tcp_err_fn errf;
+#endif /* LWIP_CALLBACK_API */
+
+#if LWIP_TCP_TIMESTAMPS
+  u32_t ts_lastacksent;
+  u32_t ts_recent;
+#endif /* LWIP_TCP_TIMESTAMPS */
+
+  /* idle time before KEEPALIVE is sent */
+  u32_t keep_idle;
+#if LWIP_TCP_KEEPALIVE
+  u32_t keep_intvl;
+  u32_t keep_cnt;
+#endif /* LWIP_TCP_KEEPALIVE */
+  
+  /* Persist timer counter */
+  u8_t persist_cnt;
+  /* Persist timer back-off */
+  u8_t persist_backoff;
+
+  /* KEEPALIVE counter */
+  u8_t keep_cnt_sent;
+};
+
+struct tcp_pcb_listen {  
+/* Common members of all PCB types */
+  IP_PCB;
+/* Protocol specific PCB members */
+  TCP_PCB_COMMON(struct tcp_pcb_listen);
+
+#if TCP_LISTEN_BACKLOG
+  u8_t backlog;
+  u8_t accepts_pending;
+#endif /* TCP_LISTEN_BACKLOG */
+};
+
+#if LWIP_EVENT_API
+
+enum lwip_event {
+  LWIP_EVENT_ACCEPT,
+  LWIP_EVENT_SENT,
+  LWIP_EVENT_RECV,
+  LWIP_EVENT_CONNECTED,
+  LWIP_EVENT_POLL,
+  LWIP_EVENT_ERR
+};
+
+err_t lwip_tcp_event(void *arg, struct tcp_pcb *pcb,
+         enum lwip_event,
+         struct pbuf *p,
+         u16_t size,
+         err_t err);
+
+#endif /* LWIP_EVENT_API */
+
+/* Application program's interface: */
+struct tcp_pcb * tcp_new     (void);
+
+void             tcp_arg     (struct tcp_pcb *pcb, void *arg);
+void             tcp_accept  (struct tcp_pcb *pcb, tcp_accept_fn accept);
+void             tcp_recv    (struct tcp_pcb *pcb, tcp_recv_fn recv);
+void             tcp_sent    (struct tcp_pcb *pcb, tcp_sent_fn sent);
+void             tcp_poll    (struct tcp_pcb *pcb, tcp_poll_fn poll, u8_t interval);
+void             tcp_err     (struct tcp_pcb *pcb, tcp_err_fn err);
+
+#define          tcp_mss(pcb)             (((pcb)->flags & TF_TIMESTAMP) ? ((pcb)->mss - 12)  : (pcb)->mss)
+#define          tcp_sndbuf(pcb)          ((pcb)->snd_buf)
+#define          tcp_sndqueuelen(pcb)     ((pcb)->snd_queuelen)
+#define          tcp_nagle_disable(pcb)   ((pcb)->flags |= TF_NODELAY)
+#define          tcp_nagle_enable(pcb)    ((pcb)->flags &= ~TF_NODELAY)
+#define          tcp_nagle_disabled(pcb)  (((pcb)->flags & TF_NODELAY) != 0)
+
+#if TCP_LISTEN_BACKLOG
+#define          tcp_accepted(pcb) do { \
+  LWIP_ASSERT("pcb->state == LISTEN (called for wrong pcb?)", pcb->state == LISTEN); \
+  (((struct tcp_pcb_listen *)(pcb))->accepts_pending--); } while(0)
+#else  /* TCP_LISTEN_BACKLOG */
+#define          tcp_accepted(pcb) LWIP_ASSERT("pcb->state == LISTEN (called for wrong pcb?)", \
+                                               (pcb)->state == LISTEN)
+#endif /* TCP_LISTEN_BACKLOG */
+
+void             tcp_recved  (struct tcp_pcb *pcb, u16_t len);
+err_t            tcp_bind    (struct tcp_pcb *pcb, ip_addr_t *ipaddr,
+                              u16_t port);
+err_t            tcp_connect (struct tcp_pcb *pcb, ip_addr_t *ipaddr,
+                              u16_t port, tcp_connected_fn connected);
+
+struct tcp_pcb * tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog);
+#define          tcp_listen(pcb) tcp_listen_with_backlog(pcb, TCP_DEFAULT_LISTEN_BACKLOG)
+
+void             tcp_abort (struct tcp_pcb *pcb);
+err_t            tcp_close   (struct tcp_pcb *pcb);
+err_t            tcp_shutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx);
+
+/* Flags for "apiflags" parameter in tcp_write */
+#define TCP_WRITE_FLAG_COPY 0x01
+#define TCP_WRITE_FLAG_MORE 0x02
+
+err_t            tcp_write   (struct tcp_pcb *pcb, const void *dataptr, u16_t len,
+                              u8_t apiflags);
+
+void             tcp_setprio (struct tcp_pcb *pcb, u8_t prio);
+
+#define TCP_PRIO_MIN    1
+#define TCP_PRIO_NORMAL 64
+#define TCP_PRIO_MAX    127
+
+err_t            tcp_output  (struct tcp_pcb *pcb);
+
+
+const char* tcp_debug_state_str(enum tcp_state s);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_TCP */
+
+#endif /* __LWIP_TCP_H__ */
diff --git a/ext/lwip/src/include/lwip/tcp_impl.h b/ext/lwip/src/include/lwip/tcp_impl.h
new file mode 100644
index 000000000..623f4e33c
--- /dev/null
+++ b/ext/lwip/src/include/lwip/tcp_impl.h
@@ -0,0 +1,486 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_TCP_IMPL_H__
+#define __LWIP_TCP_IMPL_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/tcp.h"
+#include "lwip/mem.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip.h"
+#include "lwip/icmp.h"
+#include "lwip/err.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Functions for interfacing with TCP: */
+
+/* Lower layer interface to TCP: */
+void             tcp_init    (void);  /* Initialize this module. */
+void             tcp_tmr     (void);  /* Must be called every
+                                         TCP_TMR_INTERVAL
+                                         ms. (Typically 250 ms). */
+/* It is also possible to call these two functions at the right
+   intervals (instead of calling tcp_tmr()). */
+void             tcp_slowtmr (void);
+void             tcp_fasttmr (void);
+
+
+/* Only used by IP to pass a TCP segment to TCP: */
+void             tcp_input   (struct pbuf *p, struct netif *inp);
+/* Used within the TCP code only: */
+struct tcp_pcb * tcp_alloc   (u8_t prio);
+void             tcp_abandon (struct tcp_pcb *pcb, int reset);
+err_t            tcp_send_empty_ack(struct tcp_pcb *pcb);
+void             tcp_rexmit  (struct tcp_pcb *pcb);
+void             tcp_rexmit_rto  (struct tcp_pcb *pcb);
+void             tcp_rexmit_fast (struct tcp_pcb *pcb);
+u32_t            tcp_update_rcv_ann_wnd(struct tcp_pcb *pcb);
+err_t            tcp_process_refused_data(struct tcp_pcb *pcb);
+
+/**
+ * This is the Nagle algorithm: try to combine user data to send as few TCP
+ * segments as possible. Only send if
+ * - no previously transmitted data on the connection remains unacknowledged or
+ * - the TF_NODELAY flag is set (nagle algorithm turned off for this pcb) or
+ * - the only unsent segment is at least pcb->mss bytes long (or there is more
+ *   than one unsent segment - with lwIP, this can happen although unsent->len < mss)
+ * - or if we are in fast-retransmit (TF_INFR)
+ */
+#define tcp_do_output_nagle(tpcb) ((((tpcb)->unacked == NULL) || \
+                            ((tpcb)->flags & (TF_NODELAY | TF_INFR)) || \
+                            (((tpcb)->unsent != NULL) && (((tpcb)->unsent->next != NULL) || \
+                              ((tpcb)->unsent->len >= (tpcb)->mss))) || \
+                            ((tcp_sndbuf(tpcb) == 0) || (tcp_sndqueuelen(tpcb) >= TCP_SND_QUEUELEN)) \
+                            ) ? 1 : 0)
+#define tcp_output_nagle(tpcb) (tcp_do_output_nagle(tpcb) ? tcp_output(tpcb) : ERR_OK)
+
+
+#define TCP_SEQ_LT(a,b)     ((s32_t)((u32_t)(a) - (u32_t)(b)) < 0)
+#define TCP_SEQ_LEQ(a,b)    ((s32_t)((u32_t)(a) - (u32_t)(b)) <= 0)
+#define TCP_SEQ_GT(a,b)     ((s32_t)((u32_t)(a) - (u32_t)(b)) > 0)
+#define TCP_SEQ_GEQ(a,b)    ((s32_t)((u32_t)(a) - (u32_t)(b)) >= 0)
+/* is b<=a<=c? */
+#if 0 /* see bug #10548 */
+#define TCP_SEQ_BETWEEN(a,b,c) ((c)-(b) >= (a)-(b))
+#endif
+#define TCP_SEQ_BETWEEN(a,b,c) (TCP_SEQ_GEQ(a,b) && TCP_SEQ_LEQ(a,c))
+#define TCP_FIN 0x01U
+#define TCP_SYN 0x02U
+#define TCP_RST 0x04U
+#define TCP_PSH 0x08U
+#define TCP_ACK 0x10U
+#define TCP_URG 0x20U
+#define TCP_ECE 0x40U
+#define TCP_CWR 0x80U
+
+#define TCP_FLAGS 0x3fU
+
+/* Length of the TCP header, excluding options. */
+#define TCP_HLEN 20
+
+#ifndef TCP_TMR_INTERVAL
+#define TCP_TMR_INTERVAL       1  /* The TCP timer interval in milliseconds. */
+#endif /* TCP_TMR_INTERVAL */
+
+#ifndef TCP_FAST_INTERVAL
+#define TCP_FAST_INTERVAL      TCP_TMR_INTERVAL /* the fine grained timeout in milliseconds */
+#endif /* TCP_FAST_INTERVAL */
+
+#ifndef TCP_SLOW_INTERVAL
+#define TCP_SLOW_INTERVAL      (2*TCP_TMR_INTERVAL)  /* the coarse grained timeout in milliseconds */
+#endif /* TCP_SLOW_INTERVAL */
+
+#define TCP_FIN_WAIT_TIMEOUT 20000 /* milliseconds */
+#define TCP_SYN_RCVD_TIMEOUT 20000 /* milliseconds */
+
+#define TCP_OOSEQ_TIMEOUT        6U /* x RTO */
+
+#ifndef TCP_MSL
+#define TCP_MSL 60000UL /* The maximum segment lifetime in milliseconds */
+#endif
+
+/* Keepalive values, compliant with RFC 1122. Don't change this unless you know what you're doing */
+#ifndef  TCP_KEEPIDLE_DEFAULT
+#define  TCP_KEEPIDLE_DEFAULT     7200000UL /* Default KEEPALIVE timer in milliseconds */
+#endif
+
+#ifndef  TCP_KEEPINTVL_DEFAULT
+#define  TCP_KEEPINTVL_DEFAULT    75000UL   /* Default Time between KEEPALIVE probes in milliseconds */
+#endif
+
+#ifndef  TCP_KEEPCNT_DEFAULT
+#define  TCP_KEEPCNT_DEFAULT      9U        /* Default Counter for KEEPALIVE probes */
+#endif
+
+#define  TCP_MAXIDLE              TCP_KEEPCNT_DEFAULT * TCP_KEEPINTVL_DEFAULT  /* Maximum KEEPALIVE probe time */
+
+/* Fields are (of course) in network byte order.
+ * Some fields are converted to host byte order in tcp_input().
+ */
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct tcp_hdr {
+  PACK_STRUCT_FIELD(u16_t src);
+  PACK_STRUCT_FIELD(u16_t dest);
+  PACK_STRUCT_FIELD(u32_t seqno);
+  PACK_STRUCT_FIELD(u32_t ackno);
+  PACK_STRUCT_FIELD(u16_t _hdrlen_rsvd_flags);
+  PACK_STRUCT_FIELD(u16_t wnd);
+  PACK_STRUCT_FIELD(u16_t chksum);
+  PACK_STRUCT_FIELD(u16_t urgp);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define TCPH_HDRLEN(phdr) (ntohs((phdr)->_hdrlen_rsvd_flags) >> 12)
+#define TCPH_FLAGS(phdr)  (ntohs((phdr)->_hdrlen_rsvd_flags) & TCP_FLAGS)
+
+#define TCPH_HDRLEN_SET(phdr, len) (phdr)->_hdrlen_rsvd_flags = htons(((len) << 12) | TCPH_FLAGS(phdr))
+#define TCPH_FLAGS_SET(phdr, flags) (phdr)->_hdrlen_rsvd_flags = (((phdr)->_hdrlen_rsvd_flags & PP_HTONS((u16_t)(~(u16_t)(TCP_FLAGS)))) | htons(flags))
+#define TCPH_HDRLEN_FLAGS_SET(phdr, len, flags) (phdr)->_hdrlen_rsvd_flags = htons(((len) << 12) | (flags))
+
+#define TCPH_SET_FLAG(phdr, flags ) (phdr)->_hdrlen_rsvd_flags = ((phdr)->_hdrlen_rsvd_flags | htons(flags))
+#define TCPH_UNSET_FLAG(phdr, flags) (phdr)->_hdrlen_rsvd_flags = htons(ntohs((phdr)->_hdrlen_rsvd_flags) | (TCPH_FLAGS(phdr) & ~(flags)) )
+
+#define TCP_TCPLEN(seg) ((seg)->len + ((TCPH_FLAGS((seg)->tcphdr) & (TCP_FIN | TCP_SYN)) != 0))
+
+/** Flags used on input processing, not on pcb->flags
+*/
+#define TF_RESET     (u8_t)0x08U   /* Connection was reset. */
+#define TF_CLOSED    (u8_t)0x10U   /* Connection was sucessfully closed. */
+#define TF_GOT_FIN   (u8_t)0x20U   /* Connection was closed by the remote end. */
+
+
+#if LWIP_EVENT_API
+
+#define TCP_EVENT_ACCEPT(pcb,err,ret)    ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
+                LWIP_EVENT_ACCEPT, NULL, 0, err)
+#define TCP_EVENT_SENT(pcb,space,ret) ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
+                   LWIP_EVENT_SENT, NULL, space, ERR_OK)
+#define TCP_EVENT_RECV(pcb,p,err,ret) ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
+                LWIP_EVENT_RECV, (p), 0, (err))
+#define TCP_EVENT_CLOSED(pcb,ret) ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
+                LWIP_EVENT_RECV, NULL, 0, ERR_OK)
+#define TCP_EVENT_CONNECTED(pcb,err,ret) ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
+                LWIP_EVENT_CONNECTED, NULL, 0, (err))
+#define TCP_EVENT_POLL(pcb,ret)       ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
+                LWIP_EVENT_POLL, NULL, 0, ERR_OK)
+#define TCP_EVENT_ERR(errf,arg,err)  lwip_tcp_event((arg), NULL, \
+                LWIP_EVENT_ERR, NULL, 0, (err))
+
+#else /* LWIP_EVENT_API */
+
+#define TCP_EVENT_ACCEPT(pcb,err,ret)                          \
+  do {                                                         \
+    if((pcb)->accept != NULL)                                  \
+      (ret) = (pcb)->accept((pcb)->callback_arg,(pcb),(err));  \
+    else (ret) = ERR_ARG;                                      \
+  } while (0)
+
+#define TCP_EVENT_SENT(pcb,space,ret)                          \
+  do {                                                         \
+    if((pcb)->sent != NULL)                                    \
+      (ret) = (pcb)->sent((pcb)->callback_arg,(pcb),(space));  \
+    else (ret) = ERR_OK;                                       \
+  } while (0)
+
+#define TCP_EVENT_RECV(pcb,p,err,ret)                          \
+  do {                                                         \
+    if((pcb)->recv != NULL) {                                  \
+      (ret) = (pcb)->recv((pcb)->callback_arg,(pcb),(p),(err));\
+    } else {                                                   \
+      (ret) = tcp_recv_null(NULL, (pcb), (p), (err));          \
+    }                                                          \
+  } while (0)
+
+#define TCP_EVENT_CLOSED(pcb,ret)                                \
+  do {                                                           \
+    if(((pcb)->recv != NULL)) {                                  \
+      (ret) = (pcb)->recv((pcb)->callback_arg,(pcb),NULL,ERR_OK);\
+    } else {                                                     \
+      (ret) = ERR_OK;                                            \
+    }                                                            \
+  } while (0)
+
+#define TCP_EVENT_CONNECTED(pcb,err,ret)                         \
+  do {                                                           \
+    if((pcb)->connected != NULL)                                 \
+      (ret) = (pcb)->connected((pcb)->callback_arg,(pcb),(err)); \
+    else (ret) = ERR_OK;                                         \
+  } while (0)
+
+#define TCP_EVENT_POLL(pcb,ret)                                \
+  do {                                                         \
+    if((pcb)->poll != NULL)                                    \
+      (ret) = (pcb)->poll((pcb)->callback_arg,(pcb));          \
+    else (ret) = ERR_OK;                                       \
+  } while (0)
+
+#define TCP_EVENT_ERR(errf,arg,err)                            \
+  do {                                                         \
+    if((errf) != NULL)                                         \
+      (errf)((arg),(err));                                     \
+  } while (0)
+
+#endif /* LWIP_EVENT_API */
+
+/** Enabled extra-check for TCP_OVERSIZE if LWIP_DEBUG is enabled */
+#if TCP_OVERSIZE && defined(LWIP_DEBUG)
+#define TCP_OVERSIZE_DBGCHECK 1
+#else
+#define TCP_OVERSIZE_DBGCHECK 0
+#endif
+
+/** Don't generate checksum on copy if CHECKSUM_GEN_TCP is disabled */
+#define TCP_CHECKSUM_ON_COPY  (LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_TCP)
+
+/* This structure represents a TCP segment on the unsent, unacked and ooseq queues */
+struct tcp_seg {
+  struct tcp_seg *next;    /* used when putting segements on a queue */
+  struct pbuf *p;          /* buffer containing data + TCP header */
+  u16_t len;               /* the TCP length of this segment */
+#if TCP_OVERSIZE_DBGCHECK
+  u16_t oversize_left;     /* Extra bytes available at the end of the last
+                              pbuf in unsent (used for asserting vs.
+                              tcp_pcb.unsent_oversized only) */
+#endif /* TCP_OVERSIZE_DBGCHECK */
+#if TCP_CHECKSUM_ON_COPY
+  u16_t chksum;
+  u8_t  chksum_swapped;
+#endif /* TCP_CHECKSUM_ON_COPY */
+  u8_t  flags;
+#define TF_SEG_OPTS_MSS         (u8_t)0x01U /* Include MSS option. */
+#define TF_SEG_OPTS_TS          (u8_t)0x02U /* Include timestamp option. */
+#define TF_SEG_DATA_CHECKSUMMED (u8_t)0x04U /* ALL data (not the header) is
+                                               checksummed into 'chksum' */
+  struct tcp_hdr *tcphdr;  /* the TCP header */
+};
+
+#define LWIP_TCP_OPT_LENGTH(flags)              \
+  (flags & TF_SEG_OPTS_MSS ? 4  : 0) +          \
+  (flags & TF_SEG_OPTS_TS  ? 12 : 0)
+
+/** This returns a TCP header option for MSS in an u32_t */
+#define TCP_BUILD_MSS_OPTION(mss) htonl(0x02040000 | ((mss) & 0xFFFF))
+
+/* Global variables: */
+extern struct tcp_pcb *tcp_input_pcb;
+extern u32_t tcp_ticks;
+extern u8_t tcp_active_pcbs_changed;
+
+/* The TCP PCB lists. */
+union tcp_listen_pcbs_t { /* List of all TCP PCBs in LISTEN state. */
+  struct tcp_pcb_listen *listen_pcbs;
+  struct tcp_pcb *pcbs;
+};
+extern struct tcp_pcb *tcp_bound_pcbs;
+extern union tcp_listen_pcbs_t tcp_listen_pcbs;
+extern struct tcp_pcb *tcp_active_pcbs;  /* List of all TCP PCBs that are in a
+              state in which they accept or send
+              data. */
+extern struct tcp_pcb *tcp_tw_pcbs;      /* List of all TCP PCBs in TIME-WAIT. */
+
+extern struct tcp_pcb *tcp_tmp_pcb;      /* Only used for temporary storage. */
+
+/* Axioms about the above lists:
+   1) Every TCP PCB that is not CLOSED is in one of the lists.
+   2) A PCB is only in one of the lists.
+   3) All PCBs in the tcp_listen_pcbs list is in LISTEN state.
+   4) All PCBs in the tcp_tw_pcbs list is in TIME-WAIT state.
+*/
+/* Define two macros, TCP_REG and TCP_RMV that registers a TCP PCB
+   with a PCB list or removes a PCB from a list, respectively. */
+#ifndef TCP_DEBUG_PCB_LISTS
+#define TCP_DEBUG_PCB_LISTS 0
+#endif
+#if TCP_DEBUG_PCB_LISTS
+#define TCP_REG(pcbs, npcb) do {\
+                            LWIP_DEBUGF(TCP_DEBUG, ("TCP_REG %p local port %d\n", (npcb), (npcb)->local_port)); \
+                            for(tcp_tmp_pcb = *(pcbs); \
+          tcp_tmp_pcb != NULL; \
+        tcp_tmp_pcb = tcp_tmp_pcb->next) { \
+                                LWIP_ASSERT("TCP_REG: already registered\n", tcp_tmp_pcb != (npcb)); \
+                            } \
+                            LWIP_ASSERT("TCP_REG: pcb->state != CLOSED", ((pcbs) == &tcp_bound_pcbs) || ((npcb)->state != CLOSED)); \
+                            (npcb)->next = *(pcbs); \
+                            LWIP_ASSERT("TCP_REG: npcb->next != npcb", (npcb)->next != (npcb)); \
+                            *(pcbs) = (npcb); \
+                            LWIP_ASSERT("TCP_RMV: tcp_pcbs sane", tcp_pcbs_sane()); \
+              tcp_timer_needed(); \
+                            } while(0)
+#define TCP_RMV(pcbs, npcb) do { \
+                            LWIP_ASSERT("TCP_RMV: pcbs != NULL", *(pcbs) != NULL); \
+                            LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removing %p from %p\n", (npcb), *(pcbs))); \
+                            if(*(pcbs) == (npcb)) { \
+                               *(pcbs) = (*pcbs)->next; \
+                            } else for(tcp_tmp_pcb = *(pcbs); tcp_tmp_pcb != NULL; tcp_tmp_pcb = tcp_tmp_pcb->next) { \
+                               if(tcp_tmp_pcb->next == (npcb)) { \
+                                  tcp_tmp_pcb->next = (npcb)->next; \
+                                  break; \
+                               } \
+                            } \
+                            (npcb)->next = NULL; \
+                            LWIP_ASSERT("TCP_RMV: tcp_pcbs sane", tcp_pcbs_sane()); \
+                            LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removed %p from %p\n", (npcb), *(pcbs))); \
+                            } while(0)
+
+#else /* LWIP_DEBUG */
+
+#define TCP_REG(pcbs, npcb)                        \
+  do {                                             \
+    (npcb)->next = *pcbs;                          \
+    *(pcbs) = (npcb);                              \
+    tcp_timer_needed();                            \
+  } while (0)
+
+#define TCP_RMV(pcbs, npcb)                        \
+  do {                                             \
+    if(*(pcbs) == (npcb)) {                        \
+      (*(pcbs)) = (*pcbs)->next;                   \
+    }                                              \
+    else {                                         \
+      for(tcp_tmp_pcb = *pcbs;                     \
+          tcp_tmp_pcb != NULL;                     \
+          tcp_tmp_pcb = tcp_tmp_pcb->next) {       \
+        if(tcp_tmp_pcb->next == (npcb)) {          \
+          tcp_tmp_pcb->next = (npcb)->next;        \
+          break;                                   \
+        }                                          \
+      }                                            \
+    }                                              \
+    (npcb)->next = NULL;                           \
+  } while(0)
+
+#endif /* LWIP_DEBUG */
+
+#define TCP_REG_ACTIVE(npcb)                       \
+  do {                                             \
+    TCP_REG(&tcp_active_pcbs, npcb);               \
+    tcp_active_pcbs_changed = 1;                   \
+  } while (0)
+
+#define TCP_RMV_ACTIVE(npcb)                       \
+  do {                                             \
+    TCP_RMV(&tcp_active_pcbs, npcb);               \
+    tcp_active_pcbs_changed = 1;                   \
+  } while (0)
+
+#define TCP_PCB_REMOVE_ACTIVE(pcb)                 \
+  do {                                             \
+    tcp_pcb_remove(&tcp_active_pcbs, pcb);         \
+    tcp_active_pcbs_changed = 1;                   \
+  } while (0)
+
+
+/* Internal functions: */
+struct tcp_pcb *tcp_pcb_copy(struct tcp_pcb *pcb);
+void tcp_pcb_purge(struct tcp_pcb *pcb);
+void tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb);
+
+void tcp_segs_free(struct tcp_seg *seg);
+void tcp_seg_free(struct tcp_seg *seg);
+struct tcp_seg *tcp_seg_copy(struct tcp_seg *seg);
+
+#define tcp_ack(pcb)                               \
+  do {                                             \
+    if((pcb)->flags & TF_ACK_DELAY) {              \
+      (pcb)->flags &= ~TF_ACK_DELAY;               \
+      (pcb)->flags |= TF_ACK_NOW;                  \
+    }                                              \
+    else {                                         \
+      (pcb)->flags |= TF_ACK_DELAY;                \
+    }                                              \
+  } while (0)
+
+#define tcp_ack_now(pcb)                           \
+  do {                                             \
+    (pcb)->flags |= TF_ACK_NOW;                    \
+  } while (0)
+
+err_t tcp_send_fin(struct tcp_pcb *pcb);
+err_t tcp_enqueue_flags(struct tcp_pcb *pcb, u8_t flags);
+
+void tcp_rexmit_seg(struct tcp_pcb *pcb, struct tcp_seg *seg);
+
+void tcp_rst(u32_t seqno, u32_t ackno,
+       ip_addr_t *local_ip, ip_addr_t *remote_ip,
+       u16_t local_port, u16_t remote_port);
+
+u32_t tcp_next_iss(void);
+
+void tcp_keepalive(struct tcp_pcb *pcb);
+void tcp_zero_window_probe(struct tcp_pcb *pcb);
+
+#if TCP_CALCULATE_EFF_SEND_MSS
+u16_t tcp_eff_send_mss(u16_t sendmss, ip_addr_t *addr);
+#endif /* TCP_CALCULATE_EFF_SEND_MSS */
+
+#if LWIP_CALLBACK_API
+err_t tcp_recv_null(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err);
+#endif /* LWIP_CALLBACK_API */
+
+#if TCP_DEBUG || TCP_INPUT_DEBUG || TCP_OUTPUT_DEBUG
+void tcp_debug_print(struct tcp_hdr *tcphdr);
+void tcp_debug_print_flags(u8_t flags);
+void tcp_debug_print_state(enum tcp_state s);
+void tcp_debug_print_pcbs(void);
+s16_t tcp_pcbs_sane(void);
+#else
+#  define tcp_debug_print(tcphdr)
+#  define tcp_debug_print_flags(flags)
+#  define tcp_debug_print_state(s)
+#  define tcp_debug_print_pcbs()
+#  define tcp_pcbs_sane() 1
+#endif /* TCP_DEBUG */
+
+/** External function (implemented in timers.c), called when TCP detects
+ * that a timer is needed (i.e. active- or time-wait-pcb found). */
+void tcp_timer_needed(void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_TCP */
+
+#endif /* __LWIP_TCP_H__ */
diff --git a/ext/lwip/src/include/lwip/tcpip.h b/ext/lwip/src/include/lwip/tcpip.h
new file mode 100644
index 000000000..637476e1a
--- /dev/null
+++ b/ext/lwip/src/include/lwip/tcpip.h
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_TCPIP_H__
+#define __LWIP_TCPIP_H__
+
+#include "lwip/opt.h"
+
+#if !NO_SYS /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/api_msg.h"
+#include "lwip/netifapi.h"
+#include "lwip/pbuf.h"
+#include "lwip/api.h"
+#include "lwip/sys.h"
+#include "lwip/timers.h"
+#include "lwip/netif.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Define this to something that triggers a watchdog. This is called from
+ * tcpip_thread after processing a message. */
+#ifndef LWIP_TCPIP_THREAD_ALIVE
+#define LWIP_TCPIP_THREAD_ALIVE()
+#endif
+
+#if LWIP_TCPIP_CORE_LOCKING
+/** The global semaphore to lock the stack. */
+extern sys_mutex_t lock_tcpip_core;
+#define LOCK_TCPIP_CORE()     sys_mutex_lock(&lock_tcpip_core)
+#define UNLOCK_TCPIP_CORE()   sys_mutex_unlock(&lock_tcpip_core)
+#define TCPIP_APIMSG(m)       tcpip_apimsg_lock(m)
+#define TCPIP_APIMSG_ACK(m)
+#define TCPIP_NETIFAPI(m)     tcpip_netifapi_lock(m)
+#define TCPIP_NETIFAPI_ACK(m)
+#else /* LWIP_TCPIP_CORE_LOCKING */
+#define LOCK_TCPIP_CORE()
+#define UNLOCK_TCPIP_CORE()
+#define TCPIP_APIMSG(m)       tcpip_apimsg(m)
+#define TCPIP_APIMSG_ACK(m)   sys_sem_signal(&m->conn->op_completed)
+#define TCPIP_NETIFAPI(m)     tcpip_netifapi(m)
+#define TCPIP_NETIFAPI_ACK(m) sys_sem_signal(&m->sem)
+#endif /* LWIP_TCPIP_CORE_LOCKING */
+
+/** Function prototype for the init_done function passed to tcpip_init */
+typedef void (*tcpip_init_done_fn)(void *arg);
+/** Function prototype for functions passed to tcpip_callback() */
+typedef void (*tcpip_callback_fn)(void *ctx);
+
+/* Forward declarations */
+struct tcpip_callback_msg;
+
+void tcpip_init(tcpip_init_done_fn tcpip_init_done, void *arg);
+
+#if LWIP_NETCONN
+err_t tcpip_apimsg(struct api_msg *apimsg);
+#if LWIP_TCPIP_CORE_LOCKING
+err_t tcpip_apimsg_lock(struct api_msg *apimsg);
+#endif /* LWIP_TCPIP_CORE_LOCKING */
+#endif /* LWIP_NETCONN */
+
+err_t tcpip_input(struct pbuf *p, struct netif *inp);
+
+#if LWIP_NETIF_API
+err_t tcpip_netifapi(struct netifapi_msg *netifapimsg);
+#if LWIP_TCPIP_CORE_LOCKING
+err_t tcpip_netifapi_lock(struct netifapi_msg *netifapimsg);
+#endif /* LWIP_TCPIP_CORE_LOCKING */
+#endif /* LWIP_NETIF_API */
+
+err_t tcpip_callback_with_block(tcpip_callback_fn function, void *ctx, u8_t block);
+#define tcpip_callback(f, ctx)              tcpip_callback_with_block(f, ctx, 1)
+
+struct tcpip_callback_msg* tcpip_callbackmsg_new(tcpip_callback_fn function, void *ctx);
+void   tcpip_callbackmsg_delete(struct tcpip_callback_msg* msg);
+err_t  tcpip_trycallback(struct tcpip_callback_msg* msg);
+
+/* free pbufs or heap memory from another context without blocking */
+err_t pbuf_free_callback(struct pbuf *p);
+err_t mem_free_callback(void *m);
+
+#if LWIP_TCPIP_TIMEOUT
+err_t tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg);
+err_t tcpip_untimeout(sys_timeout_handler h, void *arg);
+#endif /* LWIP_TCPIP_TIMEOUT */
+
+enum tcpip_msg_type {
+#if LWIP_NETCONN
+  TCPIP_MSG_API,
+#endif /* LWIP_NETCONN */
+  TCPIP_MSG_INPKT,
+#if LWIP_NETIF_API
+  TCPIP_MSG_NETIFAPI,
+#endif /* LWIP_NETIF_API */
+#if LWIP_TCPIP_TIMEOUT
+  TCPIP_MSG_TIMEOUT,
+  TCPIP_MSG_UNTIMEOUT,
+#endif /* LWIP_TCPIP_TIMEOUT */
+  TCPIP_MSG_CALLBACK,
+  TCPIP_MSG_CALLBACK_STATIC
+};
+
+struct tcpip_msg {
+  enum tcpip_msg_type type;
+  sys_sem_t *sem;
+  union {
+#if LWIP_NETCONN
+    struct api_msg *apimsg;
+#endif /* LWIP_NETCONN */
+#if LWIP_NETIF_API
+    struct netifapi_msg *netifapimsg;
+#endif /* LWIP_NETIF_API */
+    struct {
+      struct pbuf *p;
+      struct netif *netif;
+    } inp;
+    struct {
+      tcpip_callback_fn function;
+      void *ctx;
+    } cb;
+#if LWIP_TCPIP_TIMEOUT
+    struct {
+      u32_t msecs;
+      sys_timeout_handler h;
+      void *arg;
+    } tmo;
+#endif /* LWIP_TCPIP_TIMEOUT */
+  } msg;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !NO_SYS */
+
+#endif /* __LWIP_TCPIP_H__ */
diff --git a/ext/lwip/src/include/lwip/timers.h b/ext/lwip/src/include/lwip/timers.h
new file mode 100644
index 000000000..04e78e0fe
--- /dev/null
+++ b/ext/lwip/src/include/lwip/timers.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *         Simon Goldschmidt
+ *
+ */
+#ifndef __LWIP_TIMERS_H__
+#define __LWIP_TIMERS_H__
+
+#include "lwip/opt.h"
+
+/* Timers are not supported when NO_SYS==1 and NO_SYS_NO_TIMERS==1 */
+#define LWIP_TIMERS (!NO_SYS || (NO_SYS && !NO_SYS_NO_TIMERS))
+
+#if LWIP_TIMERS
+
+#include "lwip/err.h"
+#if !NO_SYS
+#include "lwip/sys.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef LWIP_DEBUG_TIMERNAMES
+#ifdef LWIP_DEBUG
+#define LWIP_DEBUG_TIMERNAMES SYS_DEBUG
+#else /* LWIP_DEBUG */
+#define LWIP_DEBUG_TIMERNAMES 0
+#endif /* LWIP_DEBUG*/
+#endif
+
+/** Function prototype for a timeout callback function. Register such a function
+ * using sys_timeout().
+ *
+ * @param arg Additional argument to pass to the function - set up by sys_timeout()
+ */
+typedef void (* sys_timeout_handler)(void *arg);
+
+struct sys_timeo {
+  struct sys_timeo *next;
+  u32_t time;
+  sys_timeout_handler h;
+  void *arg;
+#if LWIP_DEBUG_TIMERNAMES
+  const char* handler_name;
+#endif /* LWIP_DEBUG_TIMERNAMES */
+};
+
+void sys_timeouts_init(void);
+
+#if LWIP_DEBUG_TIMERNAMES
+void sys_timeout_debug(u32_t msecs, sys_timeout_handler handler, void *arg, const char* handler_name);
+#define sys_timeout(msecs, handler, arg) sys_timeout_debug(msecs, handler, arg, #handler)
+#else /* LWIP_DEBUG_TIMERNAMES */
+void sys_timeout(u32_t msecs, sys_timeout_handler handler, void *arg);
+#endif /* LWIP_DEBUG_TIMERNAMES */
+
+void sys_untimeout(sys_timeout_handler handler, void *arg);
+#if NO_SYS
+void sys_check_timeouts(void);
+void sys_restart_timeouts(void);
+#else /* NO_SYS */
+void sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg);
+#endif /* NO_SYS */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_TIMERS */
+#endif /* __LWIP_TIMERS_H__ */
diff --git a/ext/lwip/src/include/lwip/udp.h b/ext/lwip/src/include/lwip/udp.h
new file mode 100644
index 000000000..f1e6d3f1e
--- /dev/null
+++ b/ext/lwip/src/include/lwip/udp.h
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIP_UDP_H__
+#define __LWIP_UDP_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_UDP /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/pbuf.h"
+#include "lwip/netif.h"
+#include "lwip/ip_addr.h"
+#include "lwip/ip.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define UDP_HLEN 8
+
+/* Fields are (of course) in network byte order. */
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct udp_hdr {
+  PACK_STRUCT_FIELD(u16_t src);
+  PACK_STRUCT_FIELD(u16_t dest);  /* src/dest UDP ports */
+  PACK_STRUCT_FIELD(u16_t len);
+  PACK_STRUCT_FIELD(u16_t chksum);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define UDP_FLAGS_NOCHKSUM       0x01U
+#define UDP_FLAGS_UDPLITE        0x02U
+#define UDP_FLAGS_CONNECTED      0x04U
+#define UDP_FLAGS_MULTICAST_LOOP 0x08U
+
+struct udp_pcb;
+
+/** Function prototype for udp pcb receive callback functions
+ * addr and port are in same byte order as in the pcb
+ * The callback is responsible for freeing the pbuf
+ * if it's not used any more.
+ *
+ * ATTENTION: Be aware that 'addr' points into the pbuf 'p' so freeing this pbuf
+ *            makes 'addr' invalid, too.
+ *
+ * @param arg user supplied argument (udp_pcb.recv_arg)
+ * @param pcb the udp_pcb which received data
+ * @param p the packet buffer that was received
+ * @param addr the remote IP address from which the packet was received
+ * @param port the remote port from which the packet was received
+ */
+typedef void (*udp_recv_fn)(void *arg, struct udp_pcb *pcb, struct pbuf *p,
+    ip_addr_t *addr, u16_t port);
+
+
+struct udp_pcb {
+/* Common members of all PCB types */
+  IP_PCB;
+
+/* Protocol specific PCB members */
+
+  struct udp_pcb *next;
+
+  u8_t flags;
+  /** ports are in host byte order */
+  u16_t local_port, remote_port;
+
+#if LWIP_IGMP
+  /** outgoing network interface for multicast packets */
+  ip_addr_t multicast_ip;
+#endif /* LWIP_IGMP */
+
+#if LWIP_UDPLITE
+  /** used for UDP_LITE only */
+  u16_t chksum_len_rx, chksum_len_tx;
+#endif /* LWIP_UDPLITE */
+
+  /** receive callback function */
+  udp_recv_fn recv;
+  /** user-supplied argument for the recv callback */
+  void *recv_arg;  
+};
+/* udp_pcbs export for exernal reference (e.g. SNMP agent) */
+extern struct udp_pcb *udp_pcbs;
+
+/* The following functions is the application layer interface to the
+   UDP code. */
+struct udp_pcb * udp_new        (void);
+void             udp_remove     (struct udp_pcb *pcb);
+err_t            udp_bind       (struct udp_pcb *pcb, ip_addr_t *ipaddr,
+                                 u16_t port);
+err_t            udp_connect    (struct udp_pcb *pcb, ip_addr_t *ipaddr,
+                                 u16_t port);
+void             udp_disconnect (struct udp_pcb *pcb);
+void             udp_recv       (struct udp_pcb *pcb, udp_recv_fn recv,
+                                 void *recv_arg);
+err_t            udp_sendto_if  (struct udp_pcb *pcb, struct pbuf *p,
+                                 ip_addr_t *dst_ip, u16_t dst_port,
+                                 struct netif *netif);
+err_t            udp_sendto     (struct udp_pcb *pcb, struct pbuf *p,
+                                 ip_addr_t *dst_ip, u16_t dst_port);
+err_t            udp_send       (struct udp_pcb *pcb, struct pbuf *p);
+
+#if LWIP_CHECKSUM_ON_COPY
+err_t            udp_sendto_if_chksum(struct udp_pcb *pcb, struct pbuf *p,
+                                 ip_addr_t *dst_ip, u16_t dst_port,
+                                 struct netif *netif, u8_t have_chksum,
+                                 u16_t chksum);
+err_t            udp_sendto_chksum(struct udp_pcb *pcb, struct pbuf *p,
+                                 ip_addr_t *dst_ip, u16_t dst_port,
+                                 u8_t have_chksum, u16_t chksum);
+err_t            udp_send_chksum(struct udp_pcb *pcb, struct pbuf *p,
+                                 u8_t have_chksum, u16_t chksum);
+#endif /* LWIP_CHECKSUM_ON_COPY */
+
+#define          udp_flags(pcb) ((pcb)->flags)
+#define          udp_setflags(pcb, f)  ((pcb)->flags = (f))
+
+/* The following functions are the lower layer interface to UDP. */
+void             udp_input      (struct pbuf *p, struct netif *inp);
+
+void             udp_init       (void);
+
+#if UDP_DEBUG
+void udp_debug_print(struct udp_hdr *udphdr);
+#else
+#define udp_debug_print(udphdr)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_UDP */
+
+#endif /* __LWIP_UDP_H__ */
diff --git a/ext/lwip/src/include/netif/etharp.h b/ext/lwip/src/include/netif/etharp.h
new file mode 100644
index 000000000..859608df9
--- /dev/null
+++ b/ext/lwip/src/include/netif/etharp.h
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2003-2004 Leon Woestenberg <leon.woestenberg@axon.tv>
+ * Copyright (c) 2003-2004 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+#ifndef __NETIF_ETHARP_H__
+#define __NETIF_ETHARP_H__
+
+#include "lwip/opt.h"
+
+#if LWIP_ARP || LWIP_ETHERNET /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+#include "lwip/ip.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef ETHARP_HWADDR_LEN
+#define ETHARP_HWADDR_LEN     6
+#endif
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct eth_addr {
+  PACK_STRUCT_FIELD(u8_t addr[ETHARP_HWADDR_LEN]);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+/** Ethernet header */
+struct eth_hdr {
+#if ETH_PAD_SIZE
+  PACK_STRUCT_FIELD(u8_t padding[ETH_PAD_SIZE]);
+#endif
+  PACK_STRUCT_FIELD(struct eth_addr dest);
+  PACK_STRUCT_FIELD(struct eth_addr src);
+  PACK_STRUCT_FIELD(u16_t type);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define SIZEOF_ETH_HDR (14 + ETH_PAD_SIZE)
+
+#if ETHARP_SUPPORT_VLAN
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+/** VLAN header inserted between ethernet header and payload
+ * if 'type' in ethernet header is ETHTYPE_VLAN.
+ * See IEEE802.Q */
+struct eth_vlan_hdr {
+  PACK_STRUCT_FIELD(u16_t prio_vid);
+  PACK_STRUCT_FIELD(u16_t tpid);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define SIZEOF_VLAN_HDR 4
+#define VLAN_ID(vlan_hdr) (htons((vlan_hdr)->prio_vid) & 0xFFF)
+
+#endif /* ETHARP_SUPPORT_VLAN */
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+/** the ARP message, see RFC 826 ("Packet format") */
+struct etharp_hdr {
+  PACK_STRUCT_FIELD(u16_t hwtype);
+  PACK_STRUCT_FIELD(u16_t proto);
+  PACK_STRUCT_FIELD(u8_t  hwlen);
+  PACK_STRUCT_FIELD(u8_t  protolen);
+  PACK_STRUCT_FIELD(u16_t opcode);
+  PACK_STRUCT_FIELD(struct eth_addr shwaddr);
+  PACK_STRUCT_FIELD(struct ip_addr2 sipaddr);
+  PACK_STRUCT_FIELD(struct eth_addr dhwaddr);
+  PACK_STRUCT_FIELD(struct ip_addr2 dipaddr);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#define SIZEOF_ETHARP_HDR 28
+#define SIZEOF_ETHARP_PACKET (SIZEOF_ETH_HDR + SIZEOF_ETHARP_HDR)
+
+/** 5 seconds period */
+#define ARP_TMR_INTERVAL 5000
+
+#define ETHTYPE_ARP       0x0806U
+#define ETHTYPE_IP        0x0800U
+#define ETHTYPE_VLAN      0x8100U
+#define ETHTYPE_PPPOEDISC 0x8863U  /* PPP Over Ethernet Discovery Stage */
+#define ETHTYPE_PPPOE     0x8864U  /* PPP Over Ethernet Session Stage */
+
+/** MEMCPY-like macro to copy to/from struct eth_addr's that are local variables
+ * or known to be 32-bit aligned within the protocol header. */
+#ifndef ETHADDR32_COPY
+#define ETHADDR32_COPY(src, dst)  SMEMCPY(src, dst, ETHARP_HWADDR_LEN)
+#endif
+
+/** MEMCPY-like macro to copy to/from struct eth_addr's that are no local
+ * variables and known to be 16-bit aligned within the protocol header. */
+#ifndef ETHADDR16_COPY
+#define ETHADDR16_COPY(src, dst)  SMEMCPY(src, dst, ETHARP_HWADDR_LEN)
+#endif
+
+#if LWIP_ARP /* don't build if not configured for use in lwipopts.h */
+
+/** ARP message types (opcodes) */
+#define ARP_REQUEST 1
+#define ARP_REPLY   2
+
+/** Define this to 1 and define LWIP_ARP_FILTER_NETIF_FN(pbuf, netif, type)
+ * to a filter function that returns the correct netif when using multiple
+ * netifs on one hardware interface where the netif's low-level receive
+ * routine cannot decide for the correct netif (e.g. when mapping multiple
+ * IP addresses to one hardware interface).
+ */
+#ifndef LWIP_ARP_FILTER_NETIF
+#define LWIP_ARP_FILTER_NETIF 0
+#endif
+
+#if ARP_QUEUEING
+/** struct for queueing outgoing packets for unknown address
+  * defined here to be accessed by memp.h
+  */
+struct etharp_q_entry {
+  struct etharp_q_entry *next;
+  struct pbuf *p;
+};
+#endif /* ARP_QUEUEING */
+
+#define etharp_init() /* Compatibility define, not init needed. */
+void etharp_tmr(void);
+s8_t etharp_find_addr(struct netif *netif, ip_addr_t *ipaddr,
+         struct eth_addr **eth_ret, ip_addr_t **ip_ret);
+err_t etharp_output(struct netif *netif, struct pbuf *q, ip_addr_t *ipaddr);
+err_t etharp_query(struct netif *netif, ip_addr_t *ipaddr, struct pbuf *q);
+err_t etharp_request(struct netif *netif, ip_addr_t *ipaddr);
+/** For Ethernet network interfaces, we might want to send "gratuitous ARP";
+ *  this is an ARP packet sent by a node in order to spontaneously cause other
+ *  nodes to update an entry in their ARP cache.
+ *  From RFC 3220 "IP Mobility Support for IPv4" section 4.6. */
+#define etharp_gratuitous(netif) etharp_request((netif), &(netif)->ip_addr)
+void etharp_cleanup_netif(struct netif *netif);
+
+#if ETHARP_SUPPORT_STATIC_ENTRIES
+err_t etharp_add_static_entry(ip_addr_t *ipaddr, struct eth_addr *ethaddr);
+err_t etharp_remove_static_entry(ip_addr_t *ipaddr);
+#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
+
+#if LWIP_AUTOIP
+err_t etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr,
+                 const struct eth_addr *ethdst_addr,
+                 const struct eth_addr *hwsrc_addr, const ip_addr_t *ipsrc_addr,
+                 const struct eth_addr *hwdst_addr, const ip_addr_t *ipdst_addr,
+                 const u16_t opcode);
+#endif /* LWIP_AUTOIP */
+
+#endif /* LWIP_ARP */
+
+err_t ethernet_input(struct pbuf *p, struct netif *netif);
+
+#define eth_addr_cmp(addr1, addr2) (memcmp((addr1)->addr, (addr2)->addr, ETHARP_HWADDR_LEN) == 0)
+
+extern const struct eth_addr ethbroadcast, ethzero;
+
+#endif /* LWIP_ARP || LWIP_ETHERNET */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __NETIF_ARP_H__ */
diff --git a/ext/lwip/src/include/netif/ppp_oe.h b/ext/lwip/src/include/netif/ppp_oe.h
new file mode 100644
index 000000000..e1cdfa519
--- /dev/null
+++ b/ext/lwip/src/include/netif/ppp_oe.h
@@ -0,0 +1,190 @@
+/*****************************************************************************
+* ppp_oe.h - PPP Over Ethernet implementation for lwIP.
+*
+* Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 06-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+*****************************************************************************/
+
+
+
+/* based on NetBSD: if_pppoe.c,v 1.64 2006/01/31 23:50:15 martin Exp */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Martin Husemann <martin@NetBSD.org>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef PPP_OE_H
+#define PPP_OE_H
+
+#include "lwip/opt.h"
+
+#if PPPOE_SUPPORT > 0
+
+#include "netif/etharp.h"
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct pppoehdr {
+  PACK_STRUCT_FIELD(u8_t vertype);
+  PACK_STRUCT_FIELD(u8_t code);
+  PACK_STRUCT_FIELD(u16_t session);
+  PACK_STRUCT_FIELD(u16_t plen);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
+PACK_STRUCT_BEGIN
+struct pppoetag {
+  PACK_STRUCT_FIELD(u16_t tag);
+  PACK_STRUCT_FIELD(u16_t len);
+} PACK_STRUCT_STRUCT;
+PACK_STRUCT_END
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
+
+
+#define PPPOE_STATE_INITIAL   0
+#define PPPOE_STATE_PADI_SENT 1
+#define PPPOE_STATE_PADR_SENT 2
+#define PPPOE_STATE_SESSION   3
+#define PPPOE_STATE_CLOSING   4
+/* passive */
+#define PPPOE_STATE_PADO_SENT 1
+
+#define PPPOE_HEADERLEN       sizeof(struct pppoehdr)
+#define PPPOE_VERTYPE         0x11    /* VER=1, TYPE = 1 */
+
+#define PPPOE_TAG_EOL         0x0000  /* end of list */
+#define PPPOE_TAG_SNAME       0x0101  /* service name */
+#define PPPOE_TAG_ACNAME      0x0102  /* access concentrator name */
+#define PPPOE_TAG_HUNIQUE     0x0103  /* host unique */
+#define PPPOE_TAG_ACCOOKIE    0x0104  /* AC cookie */
+#define PPPOE_TAG_VENDOR      0x0105  /* vendor specific */
+#define PPPOE_TAG_RELAYSID    0x0110  /* relay session id */
+#define PPPOE_TAG_SNAME_ERR   0x0201  /* service name error */
+#define PPPOE_TAG_ACSYS_ERR   0x0202  /* AC system error */
+#define PPPOE_TAG_GENERIC_ERR 0x0203  /* gerneric error */
+
+#define PPPOE_CODE_PADI       0x09    /* Active Discovery Initiation */
+#define PPPOE_CODE_PADO       0x07    /* Active Discovery Offer */
+#define PPPOE_CODE_PADR       0x19    /* Active Discovery Request */
+#define PPPOE_CODE_PADS       0x65    /* Active Discovery Session confirmation */
+#define PPPOE_CODE_PADT       0xA7    /* Active Discovery Terminate */
+
+#ifndef ETHERMTU
+#define ETHERMTU 1500
+#endif
+
+/* two byte PPP protocol discriminator, then IP data */
+#define PPPOE_MAXMTU          (ETHERMTU-PPPOE_HEADERLEN-2)
+
+#ifndef PPPOE_MAX_AC_COOKIE_LEN
+#define PPPOE_MAX_AC_COOKIE_LEN   64
+#endif
+
+struct pppoe_softc {
+  struct pppoe_softc *next;
+  struct netif *sc_ethif;      /* ethernet interface we are using */
+  int sc_pd;                   /* ppp unit number */
+  void (*sc_linkStatusCB)(int pd, int up);
+
+  int sc_state;                /* discovery phase or session connected */
+  struct eth_addr sc_dest;     /* hardware address of concentrator */
+  u16_t sc_session;            /* PPPoE session id */
+
+#ifdef PPPOE_TODO
+  char *sc_service_name;       /* if != NULL: requested name of service */
+  char *sc_concentrator_name;  /* if != NULL: requested concentrator id */
+#endif /* PPPOE_TODO */
+  u8_t sc_ac_cookie[PPPOE_MAX_AC_COOKIE_LEN]; /* content of AC cookie we must echo back */
+  size_t sc_ac_cookie_len;     /* length of cookie data */
+#ifdef PPPOE_SERVER
+  u8_t *sc_hunique;            /* content of host unique we must echo back */
+  size_t sc_hunique_len;       /* length of host unique */
+#endif
+  int sc_padi_retried;         /* number of PADI retries already done */
+  int sc_padr_retried;         /* number of PADR retries already done */
+};
+
+
+#define pppoe_init() /* compatibility define, no initialization needed */
+
+err_t pppoe_create(struct netif *ethif, int pd, void (*linkStatusCB)(int pd, int up), struct pppoe_softc **scptr);
+err_t pppoe_destroy(struct netif *ifp);
+
+int pppoe_connect(struct pppoe_softc *sc);
+void pppoe_disconnect(struct pppoe_softc *sc);
+
+void pppoe_disc_input(struct netif *netif, struct pbuf *p);
+void pppoe_data_input(struct netif *netif, struct pbuf *p);
+
+err_t pppoe_xmit(struct pppoe_softc *sc, struct pbuf *pb);
+
+/** used in ppp.c */
+#define PPPOE_HDRLEN (sizeof(struct eth_hdr) + PPPOE_HEADERLEN)
+
+#endif /* PPPOE_SUPPORT */
+
+#endif /* PPP_OE_H */
diff --git a/ext/lwip/src/include/netif/slipif.h b/ext/lwip/src/include/netif/slipif.h
new file mode 100644
index 000000000..7b6ce5e28
--- /dev/null
+++ b/ext/lwip/src/include/netif/slipif.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2001, Swedish Institute of Computer Science.
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 3. Neither the name of the Institute nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __NETIF_SLIPIF_H__
+#define __NETIF_SLIPIF_H__
+
+#include "lwip/opt.h"
+#include "lwip/netif.h"
+
+/** Set this to 1 to start a thread that blocks reading on the serial line
+ * (using sio_read()).
+ */
+#ifndef SLIP_USE_RX_THREAD
+#define SLIP_USE_RX_THREAD !NO_SYS
+#endif
+
+/** Set this to 1 to enable functions to pass in RX bytes from ISR context.
+ * If enabled, slipif_received_byte[s]() process incoming bytes and put assembled
+ * packets on a queue, which is fed into lwIP from slipif_poll().
+ * If disabled, slipif_poll() polls the serila line (using sio_tryread()).
+ */
+#ifndef SLIP_RX_FROM_ISR
+#define SLIP_RX_FROM_ISR 0
+#endif
+
+/** Set this to 1 (default for SLIP_RX_FROM_ISR) to queue incoming packets
+ * received by slipif_received_byte[s]() as long as PBUF_POOL pbufs are available.
+ * If disabled, packets will be dropped if more than one packet is received.
+ */
+#ifndef SLIP_RX_QUEUE
+#define SLIP_RX_QUEUE SLIP_RX_FROM_ISR
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+err_t slipif_init(struct netif * netif);
+void slipif_poll(struct netif *netif);
+#if SLIP_RX_FROM_ISR
+void slipif_process_rxqueue(struct netif *netif);
+void slipif_received_byte(struct netif *netif, u8_t data);
+void slipif_received_bytes(struct netif *netif, u8_t *data, u8_t len);
+#endif /* SLIP_RX_FROM_ISR */
+
+#ifdef __cplusplus
+}
+#endif
+ 
+#endif 
+
diff --git a/ext/lwip/src/include/posix/netdb.h b/ext/lwip/src/include/posix/netdb.h
new file mode 100644
index 000000000..7134032d2
--- /dev/null
+++ b/ext/lwip/src/include/posix/netdb.h
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * This file is a posix wrapper for lwip/netdb.h.
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+#include "lwip/netdb.h"
diff --git a/ext/lwip/src/include/posix/sys/socket.h b/ext/lwip/src/include/posix/sys/socket.h
new file mode 100644
index 000000000..f7c7066e6
--- /dev/null
+++ b/ext/lwip/src/include/posix/sys/socket.h
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * This file is a posix wrapper for lwip/sockets.h.
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+
+#include "lwip/sockets.h"
diff --git a/ext/lwip/src/netif/FILES b/ext/lwip/src/netif/FILES
new file mode 100644
index 000000000..099dbf3ec
--- /dev/null
+++ b/ext/lwip/src/netif/FILES
@@ -0,0 +1,29 @@
+This directory contains generic network interface device drivers that
+do not contain any hardware or architecture specific code. The files
+are:
+
+etharp.c
+          Implements the ARP (Address Resolution Protocol) over
+          Ethernet. The code in this file should be used together with
+          Ethernet device drivers. Note that this module has been
+          largely made Ethernet independent so you should be able to
+          adapt this for other link layers (such as Firewire).
+
+ethernetif.c
+          An example of how an Ethernet device driver could look. This
+          file can be used as a "skeleton" for developing new Ethernet
+          network device drivers. It uses the etharp.c ARP code.
+
+loopif.c
+          A "loopback" network interface driver. It requires configuration
+          through the define LWIP_LOOPIF_MULTITHREADING (see opt.h).
+
+slipif.c
+          A generic implementation of the SLIP (Serial Line IP)
+          protocol. It requires a sio (serial I/O) module to work.
+
+ppp/      Point-to-Point Protocol stack
+          The PPP stack has been ported from ucip (http://ucip.sourceforge.net).
+          It matches quite well to pppd 2.3.1 (http://ppp.samba.org), although
+          compared to that, it has some modifications for embedded systems and
+          the source code has been reordered a bit.
\ No newline at end of file
diff --git a/ext/lwip/src/netif/etharp.c b/ext/lwip/src/netif/etharp.c
new file mode 100644
index 000000000..5e382d1d6
--- /dev/null
+++ b/ext/lwip/src/netif/etharp.c
@@ -0,0 +1,1399 @@
+/**
+ * @file
+ * Address Resolution Protocol module for IP over Ethernet
+ *
+ * Functionally, ARP is divided into two parts. The first maps an IP address
+ * to a physical address when sending a packet, and the second part answers
+ * requests from other machines for our physical address.
+ *
+ * This implementation complies with RFC 826 (Ethernet ARP). It supports
+ * Gratuitious ARP from RFC3220 (IP Mobility Support for IPv4) section 4.6
+ * if an interface calls etharp_gratuitous(our_netif) upon address change.
+ */
+
+/*
+ * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2003-2004 Leon Woestenberg <leon.woestenberg@axon.tv>
+ * Copyright (c) 2003-2004 Axon Digital Design B.V., The Netherlands.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ */
+ 
+#include "lwip/opt.h"
+
+#if LWIP_ARP || LWIP_ETHERNET
+
+#include "lwip/ip_addr.h"
+#include "lwip/def.h"
+#include "lwip/ip.h"
+#include "lwip/stats.h"
+#include "lwip/snmp.h"
+#include "lwip/dhcp.h"
+#include "lwip/autoip.h"
+#include "netif/etharp.h"
+
+#if PPPOE_SUPPORT
+#include "netif/ppp_oe.h"
+#endif /* PPPOE_SUPPORT */
+
+#include <string.h>
+
+const struct eth_addr ethbroadcast = {{0xff,0xff,0xff,0xff,0xff,0xff}};
+const struct eth_addr ethzero = {{0,0,0,0,0,0}};
+
+/** The 24-bit IANA multicast OUI is 01-00-5e: */
+#define LL_MULTICAST_ADDR_0 0x01
+#define LL_MULTICAST_ADDR_1 0x00
+#define LL_MULTICAST_ADDR_2 0x5e
+
+#if LWIP_ARP /* don't build if not configured for use in lwipopts.h */
+
+/** the time an ARP entry stays valid after its last update,
+ *  for ARP_TMR_INTERVAL = 5000, this is
+ *  (240 * 5) seconds = 20 minutes.
+ */
+#define ARP_MAXAGE              240
+/** Re-request a used ARP entry 1 minute before it would expire to prevent
+ *  breaking a steadily used connection because the ARP entry timed out. */
+#define ARP_AGE_REREQUEST_USED  (ARP_MAXAGE - 12)
+
+/** the time an ARP entry stays pending after first request,
+ *  for ARP_TMR_INTERVAL = 5000, this is
+ *  (2 * 5) seconds = 10 seconds.
+ * 
+ *  @internal Keep this number at least 2, otherwise it might
+ *  run out instantly if the timeout occurs directly after a request.
+ */
+#define ARP_MAXPENDING 2
+
+#define HWTYPE_ETHERNET 1
+
+enum etharp_state {
+  ETHARP_STATE_EMPTY = 0,
+  ETHARP_STATE_PENDING,
+  ETHARP_STATE_STABLE,
+  ETHARP_STATE_STABLE_REREQUESTING
+#if ETHARP_SUPPORT_STATIC_ENTRIES
+  ,ETHARP_STATE_STATIC
+#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
+};
+
+struct etharp_entry {
+#if ARP_QUEUEING
+  /** Pointer to queue of pending outgoing packets on this ARP entry. */
+  struct etharp_q_entry *q;
+#else /* ARP_QUEUEING */
+  /** Pointer to a single pending outgoing packet on this ARP entry. */
+  struct pbuf *q;
+#endif /* ARP_QUEUEING */
+  ip_addr_t ipaddr;
+  struct netif *netif;
+  struct eth_addr ethaddr;
+  u8_t state;
+  u8_t ctime;
+};
+
+static struct etharp_entry arp_table[ARP_TABLE_SIZE];
+
+#if !LWIP_NETIF_HWADDRHINT
+static u8_t etharp_cached_entry;
+#endif /* !LWIP_NETIF_HWADDRHINT */
+
+/** Try hard to create a new entry - we want the IP address to appear in
+    the cache (even if this means removing an active entry or so). */
+#define ETHARP_FLAG_TRY_HARD     1
+#define ETHARP_FLAG_FIND_ONLY    2
+#if ETHARP_SUPPORT_STATIC_ENTRIES
+#define ETHARP_FLAG_STATIC_ENTRY 4
+#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
+
+#if LWIP_NETIF_HWADDRHINT
+#define ETHARP_SET_HINT(netif, hint)  if (((netif) != NULL) && ((netif)->addr_hint != NULL))  \
+                                      *((netif)->addr_hint) = (hint);
+#else /* LWIP_NETIF_HWADDRHINT */
+#define ETHARP_SET_HINT(netif, hint)  (etharp_cached_entry = (hint))
+#endif /* LWIP_NETIF_HWADDRHINT */
+
+
+/* Some checks, instead of etharp_init(): */
+#if (LWIP_ARP && (ARP_TABLE_SIZE > 0x7f))
+  #error "ARP_TABLE_SIZE must fit in an s8_t, you have to reduce it in your lwipopts.h"
+#endif
+
+
+#if ARP_QUEUEING
+/**
+ * Free a complete queue of etharp entries
+ *
+ * @param q a qeueue of etharp_q_entry's to free
+ */
+static void
+free_etharp_q(struct etharp_q_entry *q)
+{
+  struct etharp_q_entry *r;
+  LWIP_ASSERT("q != NULL", q != NULL);
+  LWIP_ASSERT("q->p != NULL", q->p != NULL);
+  while (q) {
+    r = q;
+    q = q->next;
+    LWIP_ASSERT("r->p != NULL", (r->p != NULL));
+    pbuf_free(r->p);
+    memp_free(MEMP_ARP_QUEUE, r);
+  }
+}
+#else /* ARP_QUEUEING */
+
+/** Compatibility define: free the queued pbuf */
+#define free_etharp_q(q) pbuf_free(q)
+
+#endif /* ARP_QUEUEING */
+
+/** Clean up ARP table entries */
+static void
+etharp_free_entry(int i)
+{
+  /* remove from SNMP ARP index tree */
+  snmp_delete_arpidx_tree(arp_table[i].netif, &arp_table[i].ipaddr);
+  /* and empty packet queue */
+  if (arp_table[i].q != NULL) {
+    /* remove all queued packets */
+    LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_free_entry: freeing entry %"U16_F", packet queue %p.\n", (u16_t)i, (void *)(arp_table[i].q)));
+    free_etharp_q(arp_table[i].q);
+    arp_table[i].q = NULL;
+  }
+  /* recycle entry for re-use */
+  arp_table[i].state = ETHARP_STATE_EMPTY;
+#ifdef LWIP_DEBUG
+  /* for debugging, clean out the complete entry */
+  arp_table[i].ctime = 0;
+  arp_table[i].netif = NULL;
+  ip_addr_set_zero(&arp_table[i].ipaddr);
+  arp_table[i].ethaddr = ethzero;
+#endif /* LWIP_DEBUG */
+}
+
+/**
+ * Clears expired entries in the ARP table.
+ *
+ * This function should be called every ETHARP_TMR_INTERVAL milliseconds (5 seconds),
+ * in order to expire entries in the ARP table.
+ */
+void
+etharp_tmr(void)
+{
+  u8_t i;
+
+  LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer\n"));
+  /* remove expired entries from the ARP table */
+  for (i = 0; i < ARP_TABLE_SIZE; ++i) {
+    u8_t state = arp_table[i].state;
+    if (state != ETHARP_STATE_EMPTY
+#if ETHARP_SUPPORT_STATIC_ENTRIES
+      && (state != ETHARP_STATE_STATIC)
+#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
+      ) {
+      arp_table[i].ctime++;
+      if ((arp_table[i].ctime >= ARP_MAXAGE) ||
+          ((arp_table[i].state == ETHARP_STATE_PENDING)  &&
+           (arp_table[i].ctime >= ARP_MAXPENDING))) {
+        /* pending or stable entry has become old! */
+        LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer: expired %s entry %"U16_F".\n",
+             arp_table[i].state >= ETHARP_STATE_STABLE ? "stable" : "pending", (u16_t)i));
+        /* clean up entries that have just been expired */
+        etharp_free_entry(i);
+      }
+      else if (arp_table[i].state == ETHARP_STATE_STABLE_REREQUESTING) {
+        /* Reset state to stable, so that the next transmitted packet will
+           re-send an ARP request. */
+        arp_table[i].state = ETHARP_STATE_STABLE;
+      }
+#if ARP_QUEUEING
+      /* still pending entry? (not expired) */
+      if (arp_table[i].state == ETHARP_STATE_PENDING) {
+        /* resend an ARP query here? */
+      }
+#endif /* ARP_QUEUEING */
+    }
+  }
+}
+
+/**
+ * Search the ARP table for a matching or new entry.
+ * 
+ * If an IP address is given, return a pending or stable ARP entry that matches
+ * the address. If no match is found, create a new entry with this address set,
+ * but in state ETHARP_EMPTY. The caller must check and possibly change the
+ * state of the returned entry.
+ * 
+ * If ipaddr is NULL, return a initialized new entry in state ETHARP_EMPTY.
+ * 
+ * In all cases, attempt to create new entries from an empty entry. If no
+ * empty entries are available and ETHARP_FLAG_TRY_HARD flag is set, recycle
+ * old entries. Heuristic choose the least important entry for recycling.
+ *
+ * @param ipaddr IP address to find in ARP cache, or to add if not found.
+ * @param flags @see definition of ETHARP_FLAG_*
+ * @param netif netif related to this address (used for NETIF_HWADDRHINT)
+ *  
+ * @return The ARP entry index that matched or is created, ERR_MEM if no
+ * entry is found or could be recycled.
+ */
+static s8_t
+etharp_find_entry(ip_addr_t *ipaddr, u8_t flags)
+{
+  s8_t old_pending = ARP_TABLE_SIZE, old_stable = ARP_TABLE_SIZE;
+  s8_t empty = ARP_TABLE_SIZE;
+  u8_t i = 0, age_pending = 0, age_stable = 0;
+  /* oldest entry with packets on queue */
+  s8_t old_queue = ARP_TABLE_SIZE;
+  /* its age */
+  u8_t age_queue = 0;
+
+  /**
+   * a) do a search through the cache, remember candidates
+   * b) select candidate entry
+   * c) create new entry
+   */
+
+  /* a) in a single search sweep, do all of this
+   * 1) remember the first empty entry (if any)
+   * 2) remember the oldest stable entry (if any)
+   * 3) remember the oldest pending entry without queued packets (if any)
+   * 4) remember the oldest pending entry with queued packets (if any)
+   * 5) search for a matching IP entry, either pending or stable
+   *    until 5 matches, or all entries are searched for.
+   */
+
+  for (i = 0; i < ARP_TABLE_SIZE; ++i) {
+    u8_t state = arp_table[i].state;
+    /* no empty entry found yet and now we do find one? */
+    if ((empty == ARP_TABLE_SIZE) && (state == ETHARP_STATE_EMPTY)) {
+      LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_find_entry: found empty entry %"U16_F"\n", (u16_t)i));
+      /* remember first empty entry */
+      empty = i;
+    } else if (state != ETHARP_STATE_EMPTY) {
+      LWIP_ASSERT("state == ETHARP_STATE_PENDING || state >= ETHARP_STATE_STABLE",
+        state == ETHARP_STATE_PENDING || state >= ETHARP_STATE_STABLE);
+      /* if given, does IP address match IP address in ARP entry? */
+      if (ipaddr && ip_addr_cmp(ipaddr, &arp_table[i].ipaddr)) {
+        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: found matching entry %"U16_F"\n", (u16_t)i));
+        /* found exact IP address match, simply bail out */
+        return i;
+      }
+      /* pending entry? */
+      if (state == ETHARP_STATE_PENDING) {
+        /* pending with queued packets? */
+        if (arp_table[i].q != NULL) {
+          if (arp_table[i].ctime >= age_queue) {
+            old_queue = i;
+            age_queue = arp_table[i].ctime;
+          }
+        } else
+        /* pending without queued packets? */
+        {
+          if (arp_table[i].ctime >= age_pending) {
+            old_pending = i;
+            age_pending = arp_table[i].ctime;
+          }
+        }
+      /* stable entry? */
+      } else if (state >= ETHARP_STATE_STABLE) {
+#if ETHARP_SUPPORT_STATIC_ENTRIES
+        /* don't record old_stable for static entries since they never expire */
+        if (state < ETHARP_STATE_STATIC)
+#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
+        {
+          /* remember entry with oldest stable entry in oldest, its age in maxtime */
+          if (arp_table[i].ctime >= age_stable) {
+            old_stable = i;
+            age_stable = arp_table[i].ctime;
+          }
+        }
+      }
+    }
+  }
+  /* { we have no match } => try to create a new entry */
+   
+  /* don't create new entry, only search? */
+  if (((flags & ETHARP_FLAG_FIND_ONLY) != 0) ||
+      /* or no empty entry found and not allowed to recycle? */
+      ((empty == ARP_TABLE_SIZE) && ((flags & ETHARP_FLAG_TRY_HARD) == 0))) {
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: no empty entry found and not allowed to recycle\n"));
+    return (s8_t)ERR_MEM;
+  }
+  
+  /* b) choose the least destructive entry to recycle:
+   * 1) empty entry
+   * 2) oldest stable entry
+   * 3) oldest pending entry without queued packets
+   * 4) oldest pending entry with queued packets
+   * 
+   * { ETHARP_FLAG_TRY_HARD is set at this point }
+   */ 
+
+  /* 1) empty entry available? */
+  if (empty < ARP_TABLE_SIZE) {
+    i = empty;
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: selecting empty entry %"U16_F"\n", (u16_t)i));
+  } else {
+    /* 2) found recyclable stable entry? */
+    if (old_stable < ARP_TABLE_SIZE) {
+      /* recycle oldest stable*/
+      i = old_stable;
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: selecting oldest stable entry %"U16_F"\n", (u16_t)i));
+      /* no queued packets should exist on stable entries */
+      LWIP_ASSERT("arp_table[i].q == NULL", arp_table[i].q == NULL);
+    /* 3) found recyclable pending entry without queued packets? */
+    } else if (old_pending < ARP_TABLE_SIZE) {
+      /* recycle oldest pending */
+      i = old_pending;
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: selecting oldest pending entry %"U16_F" (without queue)\n", (u16_t)i));
+    /* 4) found recyclable pending entry with queued packets? */
+    } else if (old_queue < ARP_TABLE_SIZE) {
+      /* recycle oldest pending (queued packets are free in etharp_free_entry) */
+      i = old_queue;
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: selecting oldest pending entry %"U16_F", freeing packet queue %p\n", (u16_t)i, (void *)(arp_table[i].q)));
+      /* no empty or recyclable entries found */
+    } else {
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: no empty or recyclable entries found\n"));
+      return (s8_t)ERR_MEM;
+    }
+
+    /* { empty or recyclable entry found } */
+    LWIP_ASSERT("i < ARP_TABLE_SIZE", i < ARP_TABLE_SIZE);
+    etharp_free_entry(i);
+  }
+
+  LWIP_ASSERT("i < ARP_TABLE_SIZE", i < ARP_TABLE_SIZE);
+  LWIP_ASSERT("arp_table[i].state == ETHARP_STATE_EMPTY",
+    arp_table[i].state == ETHARP_STATE_EMPTY);
+
+  /* IP address given? */
+  if (ipaddr != NULL) {
+    /* set IP address */
+    ip_addr_copy(arp_table[i].ipaddr, *ipaddr);
+  }
+  arp_table[i].ctime = 0;
+  return (err_t)i;
+}
+
+/**
+ * Send an IP packet on the network using netif->linkoutput
+ * The ethernet header is filled in before sending.
+ *
+ * @params netif the lwIP network interface on which to send the packet
+ * @params p the packet to send, p->payload pointing to the (uninitialized) ethernet header
+ * @params src the source MAC address to be copied into the ethernet header
+ * @params dst the destination MAC address to be copied into the ethernet header
+ * @return ERR_OK if the packet was sent, any other err_t on failure
+ */
+static err_t
+etharp_send_ip(struct netif *netif, struct pbuf *p, struct eth_addr *src, struct eth_addr *dst)
+{
+  struct eth_hdr *ethhdr = (struct eth_hdr *)p->payload;
+
+  LWIP_ASSERT("netif->hwaddr_len must be the same as ETHARP_HWADDR_LEN for etharp!",
+              (netif->hwaddr_len == ETHARP_HWADDR_LEN));
+  ETHADDR32_COPY(&ethhdr->dest, dst);
+  ETHADDR16_COPY(&ethhdr->src, src);
+  ethhdr->type = PP_HTONS(ETHTYPE_IP);
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_send_ip: sending packet %p\n", (void *)p));
+  /* send the packet */
+  return netif->linkoutput(netif, p);
+}
+
+/**
+ * Update (or insert) a IP/MAC address pair in the ARP cache.
+ *
+ * If a pending entry is resolved, any queued packets will be sent
+ * at this point.
+ * 
+ * @param netif netif related to this entry (used for NETIF_ADDRHINT)
+ * @param ipaddr IP address of the inserted ARP entry.
+ * @param ethaddr Ethernet address of the inserted ARP entry.
+ * @param flags @see definition of ETHARP_FLAG_*
+ *
+ * @return
+ * - ERR_OK Succesfully updated ARP cache.
+ * - ERR_MEM If we could not add a new ARP entry when ETHARP_FLAG_TRY_HARD was set.
+ * - ERR_ARG Non-unicast address given, those will not appear in ARP cache.
+ *
+ * @see pbuf_free()
+ */
+static err_t
+etharp_update_arp_entry(struct netif *netif, ip_addr_t *ipaddr, struct eth_addr *ethaddr, u8_t flags)
+{
+  s8_t i;
+  LWIP_ASSERT("netif->hwaddr_len == ETHARP_HWADDR_LEN", netif->hwaddr_len == ETHARP_HWADDR_LEN);
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_update_arp_entry: %"U16_F".%"U16_F".%"U16_F".%"U16_F" - %02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F"\n",
+    ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr), ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr),
+    ethaddr->addr[0], ethaddr->addr[1], ethaddr->addr[2],
+    ethaddr->addr[3], ethaddr->addr[4], ethaddr->addr[5]));
+  /* non-unicast address? */
+  if (ip_addr_isany(ipaddr) ||
+      ip_addr_isbroadcast(ipaddr, netif) ||
+      ip_addr_ismulticast(ipaddr)) {
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_update_arp_entry: will not add non-unicast IP address to ARP cache\n"));
+    return ERR_ARG;
+  }
+  /* find or create ARP entry */
+  i = etharp_find_entry(ipaddr, flags);
+  /* bail out if no entry could be found */
+  if (i < 0) {
+    return (err_t)i;
+  }
+
+#if ETHARP_SUPPORT_STATIC_ENTRIES
+  if (flags & ETHARP_FLAG_STATIC_ENTRY) {
+    /* record static type */
+    arp_table[i].state = ETHARP_STATE_STATIC;
+  } else
+#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
+  {
+    /* mark it stable */
+    arp_table[i].state = ETHARP_STATE_STABLE;
+  }
+
+  /* record network interface */
+  arp_table[i].netif = netif;
+  /* insert in SNMP ARP index tree */
+  snmp_insert_arpidx_tree(netif, &arp_table[i].ipaddr);
+
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_update_arp_entry: updating stable entry %"S16_F"\n", (s16_t)i));
+  /* update address */
+  ETHADDR32_COPY(&arp_table[i].ethaddr, ethaddr);
+  /* reset time stamp */
+  arp_table[i].ctime = 0;
+  /* this is where we will send out queued packets! */
+#if ARP_QUEUEING
+  while (arp_table[i].q != NULL) {
+    struct pbuf *p;
+    /* remember remainder of queue */
+    struct etharp_q_entry *q = arp_table[i].q;
+    /* pop first item off the queue */
+    arp_table[i].q = q->next;
+    /* get the packet pointer */
+    p = q->p;
+    /* now queue entry can be freed */
+    memp_free(MEMP_ARP_QUEUE, q);
+#else /* ARP_QUEUEING */
+  if (arp_table[i].q != NULL) {
+    struct pbuf *p = arp_table[i].q;
+    arp_table[i].q = NULL;
+#endif /* ARP_QUEUEING */
+    /* send the queued IP packet */
+    etharp_send_ip(netif, p, (struct eth_addr*)(netif->hwaddr), ethaddr);
+    /* free the queued IP packet */
+    pbuf_free(p);
+  }
+  return ERR_OK;
+}
+
+#if ETHARP_SUPPORT_STATIC_ENTRIES
+/** Add a new static entry to the ARP table. If an entry exists for the
+ * specified IP address, this entry is overwritten.
+ * If packets are queued for the specified IP address, they are sent out.
+ *
+ * @param ipaddr IP address for the new static entry
+ * @param ethaddr ethernet address for the new static entry
+ * @return @see return values of etharp_add_static_entry
+ */
+err_t
+etharp_add_static_entry(ip_addr_t *ipaddr, struct eth_addr *ethaddr)
+{
+  struct netif *netif;
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_add_static_entry: %"U16_F".%"U16_F".%"U16_F".%"U16_F" - %02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F"\n",
+    ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr), ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr),
+    ethaddr->addr[0], ethaddr->addr[1], ethaddr->addr[2],
+    ethaddr->addr[3], ethaddr->addr[4], ethaddr->addr[5]));
+
+  netif = ip_route(ipaddr);
+  if (netif == NULL) {
+    return ERR_RTE;
+  }
+
+  return etharp_update_arp_entry(netif, ipaddr, ethaddr, ETHARP_FLAG_TRY_HARD | ETHARP_FLAG_STATIC_ENTRY);
+}
+
+/** Remove a static entry from the ARP table previously added with a call to
+ * etharp_add_static_entry.
+ *
+ * @param ipaddr IP address of the static entry to remove
+ * @return ERR_OK: entry removed
+ *         ERR_MEM: entry wasn't found
+ *         ERR_ARG: entry wasn't a static entry but a dynamic one
+ */
+err_t
+etharp_remove_static_entry(ip_addr_t *ipaddr)
+{
+  s8_t i;
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_remove_static_entry: %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
+    ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr), ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr)));
+
+  /* find or create ARP entry */
+  i = etharp_find_entry(ipaddr, ETHARP_FLAG_FIND_ONLY);
+  /* bail out if no entry could be found */
+  if (i < 0) {
+    return (err_t)i;
+  }
+
+  if (arp_table[i].state != ETHARP_STATE_STATIC) {
+    /* entry wasn't a static entry, cannot remove it */
+    return ERR_ARG;
+  }
+  /* entry found, free it */
+  etharp_free_entry(i);
+  return ERR_OK;
+}
+#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
+
+/**
+ * Remove all ARP table entries of the specified netif.
+ *
+ * @param netif points to a network interface
+ */
+void etharp_cleanup_netif(struct netif *netif)
+{
+  u8_t i;
+
+  for (i = 0; i < ARP_TABLE_SIZE; ++i) {
+    u8_t state = arp_table[i].state;
+    if ((state != ETHARP_STATE_EMPTY) && (arp_table[i].netif == netif)) {
+      etharp_free_entry(i);
+    }
+  }
+}
+
+/**
+ * Finds (stable) ethernet/IP address pair from ARP table
+ * using interface and IP address index.
+ * @note the addresses in the ARP table are in network order!
+ *
+ * @param netif points to interface index
+ * @param ipaddr points to the (network order) IP address index
+ * @param eth_ret points to return pointer
+ * @param ip_ret points to return pointer
+ * @return table index if found, -1 otherwise
+ */
+s8_t
+etharp_find_addr(struct netif *netif, ip_addr_t *ipaddr,
+         struct eth_addr **eth_ret, ip_addr_t **ip_ret)
+{
+  s8_t i;
+
+  LWIP_ASSERT("eth_ret != NULL && ip_ret != NULL",
+    eth_ret != NULL && ip_ret != NULL);
+
+  LWIP_UNUSED_ARG(netif);
+
+  i = etharp_find_entry(ipaddr, ETHARP_FLAG_FIND_ONLY);
+  if((i >= 0) && (arp_table[i].state >= ETHARP_STATE_STABLE)) {
+      *eth_ret = &arp_table[i].ethaddr;
+      *ip_ret = &arp_table[i].ipaddr;
+      return i;
+  }
+  return -1;
+}
+
+#if ETHARP_TRUST_IP_MAC
+/**
+ * Updates the ARP table using the given IP packet.
+ *
+ * Uses the incoming IP packet's source address to update the
+ * ARP cache for the local network. The function does not alter
+ * or free the packet. This function must be called before the
+ * packet p is passed to the IP layer.
+ *
+ * @param netif The lwIP network interface on which the IP packet pbuf arrived.
+ * @param p The IP packet that arrived on netif.
+ *
+ * @return NULL
+ *
+ * @see pbuf_free()
+ */
+static void
+etharp_ip_input(struct netif *netif, struct pbuf *p)
+{
+  struct eth_hdr *ethhdr;
+  struct ip_hdr *iphdr;
+  ip_addr_t iphdr_src;
+  LWIP_ERROR("netif != NULL", (netif != NULL), return;);
+
+  /* Only insert an entry if the source IP address of the
+     incoming IP packet comes from a host on the local network. */
+  ethhdr = (struct eth_hdr *)p->payload;
+  iphdr = (struct ip_hdr *)((u8_t*)ethhdr + SIZEOF_ETH_HDR);
+#if ETHARP_SUPPORT_VLAN
+  if (ethhdr->type == PP_HTONS(ETHTYPE_VLAN)) {
+    iphdr = (struct ip_hdr *)((u8_t*)ethhdr + SIZEOF_ETH_HDR + SIZEOF_VLAN_HDR);
+  }
+#endif /* ETHARP_SUPPORT_VLAN */
+
+  ip_addr_copy(iphdr_src, iphdr->src);
+
+  /* source is not on the local network? */
+  if (!ip_addr_netcmp(&iphdr_src, &(netif->ip_addr), &(netif->netmask))) {
+    /* do nothing */
+    return;
+  }
+
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_ip_input: updating ETHARP table.\n"));
+  /* update the source IP address in the cache, if present */
+  /* @todo We could use ETHARP_FLAG_TRY_HARD if we think we are going to talk
+   * back soon (for example, if the destination IP address is ours. */
+  etharp_update_arp_entry(netif, &iphdr_src, &(ethhdr->src), ETHARP_FLAG_FIND_ONLY);
+}
+#endif /* ETHARP_TRUST_IP_MAC */
+
+/**
+ * Responds to ARP requests to us. Upon ARP replies to us, add entry to cache  
+ * send out queued IP packets. Updates cache with snooped address pairs.
+ *
+ * Should be called for incoming ARP packets. The pbuf in the argument
+ * is freed by this function.
+ *
+ * @param netif The lwIP network interface on which the ARP packet pbuf arrived.
+ * @param ethaddr Ethernet address of netif.
+ * @param p The ARP packet that arrived on netif. Is freed by this function.
+ *
+ * @return NULL
+ *
+ * @see pbuf_free()
+ */
+static void
+etharp_arp_input(struct netif *netif, struct eth_addr *ethaddr, struct pbuf *p)
+{
+  struct etharp_hdr *hdr;
+  struct eth_hdr *ethhdr;
+  /* these are aligned properly, whereas the ARP header fields might not be */
+  ip_addr_t sipaddr, dipaddr;
+  u8_t for_us;
+#if LWIP_AUTOIP
+  const u8_t * ethdst_hwaddr;
+#endif /* LWIP_AUTOIP */
+
+  LWIP_ERROR("netif != NULL", (netif != NULL), return;);
+
+  /* drop short ARP packets: we have to check for p->len instead of p->tot_len here
+     since a struct etharp_hdr is pointed to p->payload, so it musn't be chained! */
+  if (p->len < SIZEOF_ETHARP_PACKET) {
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
+      ("etharp_arp_input: packet dropped, too short (%"S16_F"/%"S16_F")\n", p->tot_len,
+      (s16_t)SIZEOF_ETHARP_PACKET));
+    ETHARP_STATS_INC(etharp.lenerr);
+    ETHARP_STATS_INC(etharp.drop);
+    pbuf_free(p);
+    return;
+  }
+
+  ethhdr = (struct eth_hdr *)p->payload;
+  hdr = (struct etharp_hdr *)((u8_t*)ethhdr + SIZEOF_ETH_HDR);
+#if ETHARP_SUPPORT_VLAN
+  if (ethhdr->type == PP_HTONS(ETHTYPE_VLAN)) {
+    hdr = (struct etharp_hdr *)(((u8_t*)ethhdr) + SIZEOF_ETH_HDR + SIZEOF_VLAN_HDR);
+  }
+#endif /* ETHARP_SUPPORT_VLAN */
+
+  /* RFC 826 "Packet Reception": */
+  if ((hdr->hwtype != PP_HTONS(HWTYPE_ETHERNET)) ||
+      (hdr->hwlen != ETHARP_HWADDR_LEN) ||
+      (hdr->protolen != sizeof(ip_addr_t)) ||
+      (hdr->proto != PP_HTONS(ETHTYPE_IP)))  {
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
+      ("etharp_arp_input: packet dropped, wrong hw type, hwlen, proto, protolen or ethernet type (%"U16_F"/%"U16_F"/%"U16_F"/%"U16_F")\n",
+      hdr->hwtype, hdr->hwlen, hdr->proto, hdr->protolen));
+    ETHARP_STATS_INC(etharp.proterr);
+    ETHARP_STATS_INC(etharp.drop);
+    pbuf_free(p);
+    return;
+  }
+  ETHARP_STATS_INC(etharp.recv);
+
+#if LWIP_AUTOIP
+  /* We have to check if a host already has configured our random
+   * created link local address and continously check if there is
+   * a host with this IP-address so we can detect collisions */
+  autoip_arp_reply(netif, hdr);
+#endif /* LWIP_AUTOIP */
+
+  /* Copy struct ip_addr2 to aligned ip_addr, to support compilers without
+   * structure packing (not using structure copy which breaks strict-aliasing rules). */
+  IPADDR2_COPY(&sipaddr, &hdr->sipaddr);
+  IPADDR2_COPY(&dipaddr, &hdr->dipaddr);
+
+  /* this interface is not configured? */
+  if (ip_addr_isany(&netif->ip_addr)) {
+    for_us = 0;
+  } else {
+    /* ARP packet directed to us? */
+    for_us = (u8_t)ip_addr_cmp(&dipaddr, &(netif->ip_addr));
+  }
+
+  /* ARP message directed to us?
+      -> add IP address in ARP cache; assume requester wants to talk to us,
+         can result in directly sending the queued packets for this host.
+     ARP message not directed to us?
+      ->  update the source IP address in the cache, if present */
+  etharp_update_arp_entry(netif, &sipaddr, &(hdr->shwaddr),
+                   for_us ? ETHARP_FLAG_TRY_HARD : ETHARP_FLAG_FIND_ONLY);
+
+  /* now act on the message itself */
+  switch (hdr->opcode) {
+  /* ARP request? */
+  case PP_HTONS(ARP_REQUEST):
+    /* ARP request. If it asked for our address, we send out a
+     * reply. In any case, we time-stamp any existing ARP entry,
+     * and possiby send out an IP packet that was queued on it. */
+
+    LWIP_DEBUGF (ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_arp_input: incoming ARP request\n"));
+    /* ARP request for our address? */
+    if (for_us) {
+
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_arp_input: replying to ARP request for our IP address\n"));
+      /* Re-use pbuf to send ARP reply.
+         Since we are re-using an existing pbuf, we can't call etharp_raw since
+         that would allocate a new pbuf. */
+      hdr->opcode = htons(ARP_REPLY);
+
+      IPADDR2_COPY(&hdr->dipaddr, &hdr->sipaddr);
+      IPADDR2_COPY(&hdr->sipaddr, &netif->ip_addr);
+
+      LWIP_ASSERT("netif->hwaddr_len must be the same as ETHARP_HWADDR_LEN for etharp!",
+                  (netif->hwaddr_len == ETHARP_HWADDR_LEN));
+#if LWIP_AUTOIP
+      /* If we are using Link-Local, all ARP packets that contain a Link-Local
+       * 'sender IP address' MUST be sent using link-layer broadcast instead of
+       * link-layer unicast. (See RFC3927 Section 2.5, last paragraph) */
+      ethdst_hwaddr = ip_addr_islinklocal(&netif->ip_addr) ? (u8_t*)(ethbroadcast.addr) : hdr->shwaddr.addr;
+#endif /* LWIP_AUTOIP */
+
+      ETHADDR16_COPY(&hdr->dhwaddr, &hdr->shwaddr);
+#if LWIP_AUTOIP
+      ETHADDR16_COPY(&ethhdr->dest, ethdst_hwaddr);
+#else  /* LWIP_AUTOIP */
+      ETHADDR16_COPY(&ethhdr->dest, &hdr->shwaddr);
+#endif /* LWIP_AUTOIP */
+      ETHADDR16_COPY(&hdr->shwaddr, ethaddr);
+      ETHADDR16_COPY(&ethhdr->src, ethaddr);
+
+      /* hwtype, hwaddr_len, proto, protolen and the type in the ethernet header
+         are already correct, we tested that before */
+
+      /* return ARP reply */
+      netif->linkoutput(netif, p);
+    /* we are not configured? */
+    } else if (ip_addr_isany(&netif->ip_addr)) {
+      /* { for_us == 0 and netif->ip_addr.addr == 0 } */
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_arp_input: we are unconfigured, ARP request ignored.\n"));
+    /* request was not directed to us */
+    } else {
+      /* { for_us == 0 and netif->ip_addr.addr != 0 } */
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_arp_input: ARP request was not for us.\n"));
+    }
+    break;
+  case PP_HTONS(ARP_REPLY):
+    /* ARP reply. We already updated the ARP cache earlier. */
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_arp_input: incoming ARP reply\n"));
+#if (LWIP_DHCP && DHCP_DOES_ARP_CHECK)
+    /* DHCP wants to know about ARP replies from any host with an
+     * IP address also offered to us by the DHCP server. We do not
+     * want to take a duplicate IP address on a single network.
+     * @todo How should we handle redundant (fail-over) interfaces? */
+    dhcp_arp_reply(netif, &sipaddr);
+#endif /* (LWIP_DHCP && DHCP_DOES_ARP_CHECK) */
+    break;
+  default:
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_arp_input: ARP unknown opcode type %"S16_F"\n", htons(hdr->opcode)));
+    ETHARP_STATS_INC(etharp.err);
+    break;
+  }
+  /* free ARP packet */
+  pbuf_free(p);
+}
+
+/** Just a small helper function that sends a pbuf to an ethernet address
+ * in the arp_table specified by the index 'arp_idx'.
+ */
+static err_t
+etharp_output_to_arp_index(struct netif *netif, struct pbuf *q, u8_t arp_idx)
+{
+  LWIP_ASSERT("arp_table[arp_idx].state >= ETHARP_STATE_STABLE",
+              arp_table[arp_idx].state >= ETHARP_STATE_STABLE);
+  /* if arp table entry is about to expire: re-request it,
+     but only if its state is ETHARP_STATE_STABLE to prevent flooding the
+     network with ARP requests if this address is used frequently. */
+  if ((arp_table[arp_idx].state == ETHARP_STATE_STABLE) && 
+      (arp_table[arp_idx].ctime >= ARP_AGE_REREQUEST_USED)) {
+    if (etharp_request(netif, &arp_table[arp_idx].ipaddr) == ERR_OK) {
+      arp_table[arp_idx].state = ETHARP_STATE_STABLE_REREQUESTING;
+    }
+  }
+  
+  return etharp_send_ip(netif, q, (struct eth_addr*)(netif->hwaddr),
+    &arp_table[arp_idx].ethaddr);
+}
+
+/**
+ * Resolve and fill-in Ethernet address header for outgoing IP packet.
+ *
+ * For IP multicast and broadcast, corresponding Ethernet addresses
+ * are selected and the packet is transmitted on the link.
+ *
+ * For unicast addresses, the packet is submitted to etharp_query(). In
+ * case the IP address is outside the local network, the IP address of
+ * the gateway is used.
+ *
+ * @param netif The lwIP network interface which the IP packet will be sent on.
+ * @param q The pbuf(s) containing the IP packet to be sent.
+ * @param ipaddr The IP address of the packet destination.
+ *
+ * @return
+ * - ERR_RTE No route to destination (no gateway to external networks),
+ * or the return type of either etharp_query() or etharp_send_ip().
+ */
+err_t
+etharp_output(struct netif *netif, struct pbuf *q, ip_addr_t *ipaddr)
+{
+  struct eth_addr *dest;
+  struct eth_addr mcastaddr;
+  ip_addr_t *dst_addr = ipaddr;
+
+  LWIP_ASSERT("netif != NULL", netif != NULL);
+  LWIP_ASSERT("q != NULL", q != NULL);
+  LWIP_ASSERT("ipaddr != NULL", ipaddr != NULL);
+
+  /* make room for Ethernet header - should not fail */
+  if (pbuf_header(q, sizeof(struct eth_hdr)) != 0) {
+    /* bail out */
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
+      ("etharp_output: could not allocate room for header.\n"));
+    LINK_STATS_INC(link.lenerr);
+    return ERR_BUF;
+  }
+
+  /* Determine on destination hardware address. Broadcasts and multicasts
+   * are special, other IP addresses are looked up in the ARP table. */
+
+  /* broadcast destination IP address? */
+  if (ip_addr_isbroadcast(ipaddr, netif)) {
+    /* broadcast on Ethernet also */
+    dest = (struct eth_addr *)&ethbroadcast;
+  /* multicast destination IP address? */
+  } else if (ip_addr_ismulticast(ipaddr)) {
+    /* Hash IP multicast address to MAC address.*/
+    mcastaddr.addr[0] = LL_MULTICAST_ADDR_0;
+    mcastaddr.addr[1] = LL_MULTICAST_ADDR_1;
+    mcastaddr.addr[2] = LL_MULTICAST_ADDR_2;
+    mcastaddr.addr[3] = ip4_addr2(ipaddr) & 0x7f;
+    mcastaddr.addr[4] = ip4_addr3(ipaddr);
+    mcastaddr.addr[5] = ip4_addr4(ipaddr);
+    /* destination Ethernet address is multicast */
+    dest = &mcastaddr;
+  /* unicast destination IP address? */
+  } else {
+    s8_t i;
+    /* outside local network? if so, this can neither be a global broadcast nor
+       a subnet broadcast. */
+    if (!ip_addr_netcmp(ipaddr, &(netif->ip_addr), &(netif->netmask)) &&
+        !ip_addr_islinklocal(ipaddr)) {
+#if LWIP_AUTOIP
+      struct ip_hdr *iphdr = (struct ip_hdr*)((u8_t*)q->payload +
+        sizeof(struct eth_hdr));
+      /* According to RFC 3297, chapter 2.6.2 (Forwarding Rules), a packet with
+         a link-local source address must always be "directly to its destination
+         on the same physical link. The host MUST NOT send the packet to any
+         router for forwarding". */
+      if (!ip_addr_islinklocal(&iphdr->src))
+#endif /* LWIP_AUTOIP */
+      {
+        /* interface has default gateway? */
+        if (!ip_addr_isany(&netif->gw)) {
+          /* send to hardware address of default gateway IP address */
+          dst_addr = &(netif->gw);
+        /* no default gateway available */
+        } else {
+          /* no route to destination error (default gateway missing) */
+          return ERR_RTE;
+        }
+      }
+    }
+#if LWIP_NETIF_HWADDRHINT
+    if (netif->addr_hint != NULL) {
+      /* per-pcb cached entry was given */
+      u8_t etharp_cached_entry = *(netif->addr_hint);
+      if (etharp_cached_entry < ARP_TABLE_SIZE) {
+#endif /* LWIP_NETIF_HWADDRHINT */
+        if ((arp_table[etharp_cached_entry].state >= ETHARP_STATE_STABLE) &&
+            (ip_addr_cmp(dst_addr, &arp_table[etharp_cached_entry].ipaddr))) {
+          /* the per-pcb-cached entry is stable and the right one! */
+          ETHARP_STATS_INC(etharp.cachehit);
+          return etharp_output_to_arp_index(netif, q, etharp_cached_entry);
+        }
+#if LWIP_NETIF_HWADDRHINT
+      }
+    }
+#endif /* LWIP_NETIF_HWADDRHINT */
+
+    /* find stable entry: do this here since this is a critical path for
+       throughput and etharp_find_entry() is kind of slow */
+    for (i = 0; i < ARP_TABLE_SIZE; i++) {
+      if ((arp_table[i].state >= ETHARP_STATE_STABLE) &&
+          (ip_addr_cmp(dst_addr, &arp_table[i].ipaddr))) {
+        /* found an existing, stable entry */
+        ETHARP_SET_HINT(netif, i);
+        return etharp_output_to_arp_index(netif, q, i);
+      }
+    }
+    /* no stable entry found, use the (slower) query function:
+       queue on destination Ethernet address belonging to ipaddr */
+    return etharp_query(netif, dst_addr, q);
+  }
+
+  /* continuation for multicast/broadcast destinations */
+  /* obtain source Ethernet address of the given interface */
+  /* send packet directly on the link */
+  return etharp_send_ip(netif, q, (struct eth_addr*)(netif->hwaddr), dest);
+}
+
+/**
+ * Send an ARP request for the given IP address and/or queue a packet.
+ *
+ * If the IP address was not yet in the cache, a pending ARP cache entry
+ * is added and an ARP request is sent for the given address. The packet
+ * is queued on this entry.
+ *
+ * If the IP address was already pending in the cache, a new ARP request
+ * is sent for the given address. The packet is queued on this entry.
+ *
+ * If the IP address was already stable in the cache, and a packet is
+ * given, it is directly sent and no ARP request is sent out. 
+ * 
+ * If the IP address was already stable in the cache, and no packet is
+ * given, an ARP request is sent out.
+ * 
+ * @param netif The lwIP network interface on which ipaddr
+ * must be queried for.
+ * @param ipaddr The IP address to be resolved.
+ * @param q If non-NULL, a pbuf that must be delivered to the IP address.
+ * q is not freed by this function.
+ *
+ * @note q must only be ONE packet, not a packet queue!
+ *
+ * @return
+ * - ERR_BUF Could not make room for Ethernet header.
+ * - ERR_MEM Hardware address unknown, and no more ARP entries available
+ *   to query for address or queue the packet.
+ * - ERR_MEM Could not queue packet due to memory shortage.
+ * - ERR_RTE No route to destination (no gateway to external networks).
+ * - ERR_ARG Non-unicast address given, those will not appear in ARP cache.
+ *
+ */
+err_t
+etharp_query(struct netif *netif, ip_addr_t *ipaddr, struct pbuf *q)
+{
+  struct eth_addr * srcaddr = (struct eth_addr *)netif->hwaddr;
+  err_t result = ERR_MEM;
+  s8_t i; /* ARP entry index */
+
+  /* non-unicast address? */
+  if (ip_addr_isbroadcast(ipaddr, netif) ||
+      ip_addr_ismulticast(ipaddr) ||
+      ip_addr_isany(ipaddr)) {
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: will not add non-unicast IP address to ARP cache\n"));
+    return ERR_ARG;
+  }
+
+  /* find entry in ARP cache, ask to create entry if queueing packet */
+  i = etharp_find_entry(ipaddr, ETHARP_FLAG_TRY_HARD);
+
+  /* could not find or create entry? */
+  if (i < 0) {
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not create ARP entry\n"));
+    if (q) {
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: packet dropped\n"));
+      ETHARP_STATS_INC(etharp.memerr);
+    }
+    return (err_t)i;
+  }
+
+  /* mark a fresh entry as pending (we just sent a request) */
+  if (arp_table[i].state == ETHARP_STATE_EMPTY) {
+    arp_table[i].state = ETHARP_STATE_PENDING;
+  }
+
+  /* { i is either a STABLE or (new or existing) PENDING entry } */
+  LWIP_ASSERT("arp_table[i].state == PENDING or STABLE",
+  ((arp_table[i].state == ETHARP_STATE_PENDING) ||
+   (arp_table[i].state >= ETHARP_STATE_STABLE)));
+
+  /* do we have a pending entry? or an implicit query request? */
+  if ((arp_table[i].state == ETHARP_STATE_PENDING) || (q == NULL)) {
+    /* try to resolve it; send out ARP request */
+    result = etharp_request(netif, ipaddr);
+    if (result != ERR_OK) {
+      /* ARP request couldn't be sent */
+      /* We don't re-send arp request in etharp_tmr, but we still queue packets,
+         since this failure could be temporary, and the next packet calling
+         etharp_query again could lead to sending the queued packets. */
+    }
+    if (q == NULL) {
+      return result;
+    }
+  }
+
+  /* packet given? */
+  LWIP_ASSERT("q != NULL", q != NULL);
+  /* stable entry? */
+  if (arp_table[i].state >= ETHARP_STATE_STABLE) {
+    /* we have a valid IP->Ethernet address mapping */
+    ETHARP_SET_HINT(netif, i);
+    /* send the packet */
+    result = etharp_send_ip(netif, q, srcaddr, &(arp_table[i].ethaddr));
+  /* pending entry? (either just created or already pending */
+  } else if (arp_table[i].state == ETHARP_STATE_PENDING) {
+    /* entry is still pending, queue the given packet 'q' */
+    struct pbuf *p;
+    int copy_needed = 0;
+    /* IF q includes a PBUF_REF, PBUF_POOL or PBUF_RAM, we have no choice but
+     * to copy the whole queue into a new PBUF_RAM (see bug #11400) 
+     * PBUF_ROMs can be left as they are, since ROM must not get changed. */
+    p = q;
+    while (p) {
+      LWIP_ASSERT("no packet queues allowed!", (p->len != p->tot_len) || (p->next == 0));
+      if(p->type != PBUF_ROM) {
+        copy_needed = 1;
+        break;
+      }
+      p = p->next;
+    }
+    if(copy_needed) {
+      /* copy the whole packet into new pbufs */
+      p = pbuf_alloc(PBUF_RAW, p->tot_len, PBUF_RAM);
+      if(p != NULL) {
+        if (pbuf_copy(p, q) != ERR_OK) {
+          pbuf_free(p);
+          p = NULL;
+        }
+      }
+    } else {
+      /* referencing the old pbuf is enough */
+      p = q;
+      pbuf_ref(p);
+    }
+    /* packet could be taken over? */
+    if (p != NULL) {
+      /* queue packet ... */
+#if ARP_QUEUEING
+      struct etharp_q_entry *new_entry;
+      /* allocate a new arp queue entry */
+      new_entry = (struct etharp_q_entry *)memp_malloc(MEMP_ARP_QUEUE);
+      if (new_entry != NULL) {
+        new_entry->next = 0;
+        new_entry->p = p;
+        if(arp_table[i].q != NULL) {
+          /* queue was already existent, append the new entry to the end */
+          struct etharp_q_entry *r;
+          r = arp_table[i].q;
+          while (r->next != NULL) {
+            r = r->next;
+          }
+          r->next = new_entry;
+        } else {
+          /* queue did not exist, first item in queue */
+          arp_table[i].q = new_entry;
+        }
+        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %"S16_F"\n", (void *)q, (s16_t)i));
+        result = ERR_OK;
+      } else {
+        /* the pool MEMP_ARP_QUEUE is empty */
+        pbuf_free(p);
+        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not queue a copy of PBUF_REF packet %p (out of memory)\n", (void *)q));
+        result = ERR_MEM;
+      }
+#else /* ARP_QUEUEING */
+      /* always queue one packet per ARP request only, freeing a previously queued packet */
+      if (arp_table[i].q != NULL) {
+        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: dropped previously queued packet %p for ARP entry %"S16_F"\n", (void *)q, (s16_t)i));
+        pbuf_free(arp_table[i].q);
+      }
+      arp_table[i].q = p;
+      result = ERR_OK;
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %"S16_F"\n", (void *)q, (s16_t)i));
+#endif /* ARP_QUEUEING */
+    } else {
+      ETHARP_STATS_INC(etharp.memerr);
+      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not queue a copy of PBUF_REF packet %p (out of memory)\n", (void *)q));
+      result = ERR_MEM;
+    }
+  }
+  return result;
+}
+
+/**
+ * Send a raw ARP packet (opcode and all addresses can be modified)
+ *
+ * @param netif the lwip network interface on which to send the ARP packet
+ * @param ethsrc_addr the source MAC address for the ethernet header
+ * @param ethdst_addr the destination MAC address for the ethernet header
+ * @param hwsrc_addr the source MAC address for the ARP protocol header
+ * @param ipsrc_addr the source IP address for the ARP protocol header
+ * @param hwdst_addr the destination MAC address for the ARP protocol header
+ * @param ipdst_addr the destination IP address for the ARP protocol header
+ * @param opcode the type of the ARP packet
+ * @return ERR_OK if the ARP packet has been sent
+ *         ERR_MEM if the ARP packet couldn't be allocated
+ *         any other err_t on failure
+ */
+#if !LWIP_AUTOIP
+static
+#endif /* LWIP_AUTOIP */
+err_t
+etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr,
+           const struct eth_addr *ethdst_addr,
+           const struct eth_addr *hwsrc_addr, const ip_addr_t *ipsrc_addr,
+           const struct eth_addr *hwdst_addr, const ip_addr_t *ipdst_addr,
+           const u16_t opcode)
+{
+  struct pbuf *p;
+  err_t result = ERR_OK;
+  struct eth_hdr *ethhdr;
+  struct etharp_hdr *hdr;
+#if LWIP_AUTOIP
+  const u8_t * ethdst_hwaddr;
+#endif /* LWIP_AUTOIP */
+
+  LWIP_ASSERT("netif != NULL", netif != NULL);
+
+  /* allocate a pbuf for the outgoing ARP request packet */
+  p = pbuf_alloc(PBUF_RAW, SIZEOF_ETHARP_PACKET, PBUF_RAM);
+  /* could allocate a pbuf for an ARP request? */
+  if (p == NULL) {
+    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
+      ("etharp_raw: could not allocate pbuf for ARP request.\n"));
+    ETHARP_STATS_INC(etharp.memerr);
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("check that first pbuf can hold struct etharp_hdr",
+              (p->len >= SIZEOF_ETHARP_PACKET));
+
+  ethhdr = (struct eth_hdr *)p->payload;
+  hdr = (struct etharp_hdr *)((u8_t*)ethhdr + SIZEOF_ETH_HDR);
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_raw: sending raw ARP packet.\n"));
+  hdr->opcode = htons(opcode);
+
+  LWIP_ASSERT("netif->hwaddr_len must be the same as ETHARP_HWADDR_LEN for etharp!",
+              (netif->hwaddr_len == ETHARP_HWADDR_LEN));
+#if LWIP_AUTOIP
+  /* If we are using Link-Local, all ARP packets that contain a Link-Local
+   * 'sender IP address' MUST be sent using link-layer broadcast instead of
+   * link-layer unicast. (See RFC3927 Section 2.5, last paragraph) */
+  ethdst_hwaddr = ip_addr_islinklocal(ipsrc_addr) ? (u8_t*)(ethbroadcast.addr) : ethdst_addr->addr;
+#endif /* LWIP_AUTOIP */
+  /* Write the ARP MAC-Addresses */
+  ETHADDR16_COPY(&hdr->shwaddr, hwsrc_addr);
+  ETHADDR16_COPY(&hdr->dhwaddr, hwdst_addr);
+  /* Write the Ethernet MAC-Addresses */
+#if LWIP_AUTOIP
+  ETHADDR16_COPY(&ethhdr->dest, ethdst_hwaddr);
+#else  /* LWIP_AUTOIP */
+  ETHADDR16_COPY(&ethhdr->dest, ethdst_addr);
+#endif /* LWIP_AUTOIP */
+  ETHADDR16_COPY(&ethhdr->src, ethsrc_addr);
+  /* Copy struct ip_addr2 to aligned ip_addr, to support compilers without
+   * structure packing. */ 
+  IPADDR2_COPY(&hdr->sipaddr, ipsrc_addr);
+  IPADDR2_COPY(&hdr->dipaddr, ipdst_addr);
+
+  hdr->hwtype = PP_HTONS(HWTYPE_ETHERNET);
+  hdr->proto = PP_HTONS(ETHTYPE_IP);
+  /* set hwlen and protolen */
+  hdr->hwlen = ETHARP_HWADDR_LEN;
+  hdr->protolen = sizeof(ip_addr_t);
+
+  ethhdr->type = PP_HTONS(ETHTYPE_ARP);
+  /* send ARP query */
+  result = netif->linkoutput(netif, p);
+  ETHARP_STATS_INC(etharp.xmit);
+  /* free ARP query packet */
+  pbuf_free(p);
+  p = NULL;
+  /* could not allocate pbuf for ARP request */
+
+  return result;
+}
+
+/**
+ * Send an ARP request packet asking for ipaddr.
+ *
+ * @param netif the lwip network interface on which to send the request
+ * @param ipaddr the IP address for which to ask
+ * @return ERR_OK if the request has been sent
+ *         ERR_MEM if the ARP packet couldn't be allocated
+ *         any other err_t on failure
+ */
+err_t
+etharp_request(struct netif *netif, ip_addr_t *ipaddr)
+{
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_request: sending ARP request.\n"));
+  return etharp_raw(netif, (struct eth_addr *)netif->hwaddr, &ethbroadcast,
+                    (struct eth_addr *)netif->hwaddr, &netif->ip_addr, &ethzero,
+                    ipaddr, ARP_REQUEST);
+}
+#endif /* LWIP_ARP */
+
+/**
+ * Process received ethernet frames. Using this function instead of directly
+ * calling ip_input and passing ARP frames through etharp in ethernetif_input,
+ * the ARP cache is protected from concurrent access.
+ *
+ * @param p the recevied packet, p->payload pointing to the ethernet header
+ * @param netif the network interface on which the packet was received
+ */
+err_t
+ethernet_input(struct pbuf *p, struct netif *netif)
+{
+  struct eth_hdr* ethhdr;
+  u16_t type;
+#if LWIP_ARP || ETHARP_SUPPORT_VLAN
+  s16_t ip_hdr_offset = SIZEOF_ETH_HDR;
+#endif /* LWIP_ARP || ETHARP_SUPPORT_VLAN */
+
+  if (p->len <= SIZEOF_ETH_HDR) {
+    /* a packet with only an ethernet header (or less) is not valid for us */
+    ETHARP_STATS_INC(etharp.proterr);
+    ETHARP_STATS_INC(etharp.drop);
+    goto free_and_return;
+  }
+
+  /* points to packet payload, which starts with an Ethernet header */
+  ethhdr = (struct eth_hdr *)p->payload;
+  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE,
+    ("ethernet_input: dest:%"X8_F":%"X8_F":%"X8_F":%"X8_F":%"X8_F":%"X8_F", src:%"X8_F":%"X8_F":%"X8_F":%"X8_F":%"X8_F":%"X8_F", type:%"X16_F"\n",
+     (unsigned)ethhdr->dest.addr[0], (unsigned)ethhdr->dest.addr[1], (unsigned)ethhdr->dest.addr[2],
+     (unsigned)ethhdr->dest.addr[3], (unsigned)ethhdr->dest.addr[4], (unsigned)ethhdr->dest.addr[5],
+     (unsigned)ethhdr->src.addr[0], (unsigned)ethhdr->src.addr[1], (unsigned)ethhdr->src.addr[2],
+     (unsigned)ethhdr->src.addr[3], (unsigned)ethhdr->src.addr[4], (unsigned)ethhdr->src.addr[5],
+     (unsigned)htons(ethhdr->type)));
+
+  type = ethhdr->type;
+#if ETHARP_SUPPORT_VLAN
+  if (type == PP_HTONS(ETHTYPE_VLAN)) {
+    struct eth_vlan_hdr *vlan = (struct eth_vlan_hdr*)(((char*)ethhdr) + SIZEOF_ETH_HDR);
+    if (p->len <= SIZEOF_ETH_HDR + SIZEOF_VLAN_HDR) {
+      /* a packet with only an ethernet/vlan header (or less) is not valid for us */
+      ETHARP_STATS_INC(etharp.proterr);
+      ETHARP_STATS_INC(etharp.drop);
+      goto free_and_return;
+    }
+#if defined(ETHARP_VLAN_CHECK) || defined(ETHARP_VLAN_CHECK_FN) /* if not, allow all VLANs */
+#ifdef ETHARP_VLAN_CHECK_FN
+    if (!ETHARP_VLAN_CHECK_FN(ethhdr, vlan)) {
+#elif defined(ETHARP_VLAN_CHECK)
+    if (VLAN_ID(vlan) != ETHARP_VLAN_CHECK) {
+#endif
+      /* silently ignore this packet: not for our VLAN */
+      pbuf_free(p);
+      return ERR_OK;
+    }
+#endif /* defined(ETHARP_VLAN_CHECK) || defined(ETHARP_VLAN_CHECK_FN) */
+    type = vlan->tpid;
+    ip_hdr_offset = SIZEOF_ETH_HDR + SIZEOF_VLAN_HDR;
+  }
+#endif /* ETHARP_SUPPORT_VLAN */
+
+#if LWIP_ARP_FILTER_NETIF
+  netif = LWIP_ARP_FILTER_NETIF_FN(p, netif, htons(type));
+#endif /* LWIP_ARP_FILTER_NETIF*/
+
+  if (ethhdr->dest.addr[0] & 1) {
+    /* this might be a multicast or broadcast packet */
+    if (ethhdr->dest.addr[0] == LL_MULTICAST_ADDR_0) {
+      if ((ethhdr->dest.addr[1] == LL_MULTICAST_ADDR_1) &&
+          (ethhdr->dest.addr[2] == LL_MULTICAST_ADDR_2)) {
+        /* mark the pbuf as link-layer multicast */
+        p->flags |= PBUF_FLAG_LLMCAST;
+      }
+    } else if (eth_addr_cmp(&ethhdr->dest, &ethbroadcast)) {
+      /* mark the pbuf as link-layer broadcast */
+      p->flags |= PBUF_FLAG_LLBCAST;
+    }
+  }
+
+  switch (type) {
+#if LWIP_ARP
+    /* IP packet? */
+    case PP_HTONS(ETHTYPE_IP):
+      if (!(netif->flags & NETIF_FLAG_ETHARP)) {
+        goto free_and_return;
+      }
+#if ETHARP_TRUST_IP_MAC
+      /* update ARP table */
+      etharp_ip_input(netif, p);
+#endif /* ETHARP_TRUST_IP_MAC */
+      /* skip Ethernet header */
+      if(pbuf_header(p, -ip_hdr_offset)) {
+        LWIP_ASSERT("Can't move over header in packet", 0);
+        goto free_and_return;
+      } else {
+        /* pass to IP layer */
+        ip_input(p, netif);
+      }
+      break;
+      
+    case PP_HTONS(ETHTYPE_ARP):
+      if (!(netif->flags & NETIF_FLAG_ETHARP)) {
+        goto free_and_return;
+      }
+      /* pass p to ARP module */
+      etharp_arp_input(netif, (struct eth_addr*)(netif->hwaddr), p);
+      break;
+#endif /* LWIP_ARP */
+#if PPPOE_SUPPORT
+    case PP_HTONS(ETHTYPE_PPPOEDISC): /* PPP Over Ethernet Discovery Stage */
+      pppoe_disc_input(netif, p);
+      break;
+
+    case PP_HTONS(ETHTYPE_PPPOE): /* PPP Over Ethernet Session Stage */
+      pppoe_data_input(netif, p);
+      break;
+#endif /* PPPOE_SUPPORT */
+
+    default:
+      ETHARP_STATS_INC(etharp.proterr);
+      ETHARP_STATS_INC(etharp.drop);
+      goto free_and_return;
+  }
+
+  /* This means the pbuf is freed or consumed,
+     so the caller doesn't have to free it again */
+  return ERR_OK;
+
+free_and_return:
+  pbuf_free(p);
+  return ERR_OK;
+}
+#endif /* LWIP_ARP || LWIP_ETHERNET */
diff --git a/ext/lwip/src/netif/ethernetif.c b/ext/lwip/src/netif/ethernetif.c
new file mode 100644
index 000000000..27060e39b
--- /dev/null
+++ b/ext/lwip/src/netif/ethernetif.c
@@ -0,0 +1,317 @@
+/**
+ * @file
+ * Ethernet Interface Skeleton
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+
+/*
+ * This file is a skeleton for developing Ethernet network interface
+ * drivers for lwIP. Add code to the low_level functions and do a
+ * search-and-replace for the word "ethernetif" to replace it with
+ * something that better describes your network interface.
+ */
+
+#include "lwip/opt.h"
+
+#if 0 /* don't build, this is only a skeleton, see previous comment */
+
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/pbuf.h"
+#include <lwip/stats.h>
+#include <lwip/snmp.h>
+#include "netif/etharp.h"
+#include "netif/ppp_oe.h"
+
+/* Define those to better describe your network interface. */
+#define IFNAME0 'e'
+#define IFNAME1 'n'
+
+/**
+ * Helper struct to hold private data used to operate your ethernet interface.
+ * Keeping the ethernet address of the MAC in this struct is not necessary
+ * as it is already kept in the struct netif.
+ * But this is only an example, anyway...
+ */
+struct ethernetif {
+  struct eth_addr *ethaddr;
+  /* Add whatever per-interface state that is needed here. */
+};
+
+/* Forward declarations. */
+static void  ethernetif_input(struct netif *netif);
+
+/**
+ * In this function, the hardware should be initialized.
+ * Called from ethernetif_init().
+ *
+ * @param netif the already initialized lwip network interface structure
+ *        for this ethernetif
+ */
+static void
+low_level_init(struct netif *netif)
+{
+  struct ethernetif *ethernetif = netif->state;
+
+  /* set MAC hardware address length */
+  netif->hwaddr_len = ETHARP_HWADDR_LEN;
+
+  /* set MAC hardware address */
+  netif->hwaddr[0] = ;
+  ...
+  netif->hwaddr[5] = ;
+
+  /* maximum transfer unit */
+  netif->mtu = 1500;
+
+  /* device capabilities */
+  /* don't set NETIF_FLAG_ETHARP if this device is not an ethernet one */
+  netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP;
+
+  /* Do whatever else is needed to initialize interface. */
+}
+
+/**
+ * This function should do the actual transmission of the packet. The packet is
+ * contained in the pbuf that is passed to the function. This pbuf
+ * might be chained.
+ *
+ * @param netif the lwip network interface structure for this ethernetif
+ * @param p the MAC packet to send (e.g. IP packet including MAC addresses and type)
+ * @return ERR_OK if the packet could be sent
+ *         an err_t value if the packet couldn't be sent
+ *
+ * @note Returning ERR_MEM here if a DMA queue of your MAC is full can lead to
+ *       strange results. You might consider waiting for space in the DMA queue
+ *       to become availale since the stack doesn't retry to send a packet
+ *       dropped because of memory failure (except for the TCP timers).
+ */
+
+static err_t
+low_level_output(struct netif *netif, struct pbuf *p)
+{
+  struct ethernetif *ethernetif = netif->state;
+  struct pbuf *q;
+
+  initiate transfer();
+
+#if ETH_PAD_SIZE
+  pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */
+#endif
+
+  for(q = p; q != NULL; q = q->next) {
+    /* Send the data from the pbuf to the interface, one pbuf at a
+       time. The size of the data in each pbuf is kept in the ->len
+       variable. */
+    send data from(q->payload, q->len);
+  }
+
+  signal that packet should be sent();
+
+#if ETH_PAD_SIZE
+  pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */
+#endif
+
+  LINK_STATS_INC(link.xmit);
+
+  return ERR_OK;
+}
+
+/**
+ * Should allocate a pbuf and transfer the bytes of the incoming
+ * packet from the interface into the pbuf.
+ *
+ * @param netif the lwip network interface structure for this ethernetif
+ * @return a pbuf filled with the received packet (including MAC header)
+ *         NULL on memory error
+ */
+static struct pbuf *
+low_level_input(struct netif *netif)
+{
+  struct ethernetif *ethernetif = netif->state;
+  struct pbuf *p, *q;
+  u16_t len;
+
+  /* Obtain the size of the packet and put it into the "len"
+     variable. */
+  len = ;
+
+#if ETH_PAD_SIZE
+  len += ETH_PAD_SIZE; /* allow room for Ethernet padding */
+#endif
+
+  /* We allocate a pbuf chain of pbufs from the pool. */
+  p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
+
+  if (p != NULL) {
+
+#if ETH_PAD_SIZE
+    pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */
+#endif
+
+    /* We iterate over the pbuf chain until we have read the entire
+     * packet into the pbuf. */
+    for(q = p; q != NULL; q = q->next) {
+      /* Read enough bytes to fill this pbuf in the chain. The
+       * available data in the pbuf is given by the q->len
+       * variable.
+       * This does not necessarily have to be a memcpy, you can also preallocate
+       * pbufs for a DMA-enabled MAC and after receiving truncate it to the
+       * actually received size. In this case, ensure the tot_len member of the
+       * pbuf is the sum of the chained pbuf len members.
+       */
+      read data into(q->payload, q->len);
+    }
+    acknowledge that packet has been read();
+
+#if ETH_PAD_SIZE
+    pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */
+#endif
+
+    LINK_STATS_INC(link.recv);
+  } else {
+    drop packet();
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.drop);
+  }
+
+  return p;
+}
+
+/**
+ * This function should be called when a packet is ready to be read
+ * from the interface. It uses the function low_level_input() that
+ * should handle the actual reception of bytes from the network
+ * interface. Then the type of the received packet is determined and
+ * the appropriate input function is called.
+ *
+ * @param netif the lwip network interface structure for this ethernetif
+ */
+static void
+ethernetif_input(struct netif *netif)
+{
+  struct ethernetif *ethernetif;
+  struct eth_hdr *ethhdr;
+  struct pbuf *p;
+
+  ethernetif = netif->state;
+
+  /* move received packet into a new pbuf */
+  p = low_level_input(netif);
+  /* no packet could be read, silently ignore this */
+  if (p == NULL) return;
+  /* points to packet payload, which starts with an Ethernet header */
+  ethhdr = p->payload;
+
+  switch (htons(ethhdr->type)) {
+  /* IP or ARP packet? */
+  case ETHTYPE_IP:
+  case ETHTYPE_ARP:
+#if PPPOE_SUPPORT
+  /* PPPoE packet? */
+  case ETHTYPE_PPPOEDISC:
+  case ETHTYPE_PPPOE:
+#endif /* PPPOE_SUPPORT */
+    /* full packet send to tcpip_thread to process */
+    if (netif->input(p, netif)!=ERR_OK)
+     { LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_input: IP input error\n"));
+       pbuf_free(p);
+       p = NULL;
+     }
+    break;
+
+  default:
+    pbuf_free(p);
+    p = NULL;
+    break;
+  }
+}
+
+/**
+ * Should be called at the beginning of the program to set up the
+ * network interface. It calls the function low_level_init() to do the
+ * actual setup of the hardware.
+ *
+ * This function should be passed as a parameter to netif_add().
+ *
+ * @param netif the lwip network interface structure for this ethernetif
+ * @return ERR_OK if the loopif is initialized
+ *         ERR_MEM if private data couldn't be allocated
+ *         any other err_t on error
+ */
+err_t
+ethernetif_init(struct netif *netif)
+{
+  struct ethernetif *ethernetif;
+
+  LWIP_ASSERT("netif != NULL", (netif != NULL));
+
+  ethernetif = mem_malloc(sizeof(struct ethernetif));
+  if (ethernetif == NULL) {
+    LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_init: out of memory\n"));
+    return ERR_MEM;
+  }
+
+#if LWIP_NETIF_HOSTNAME
+  /* Initialize interface hostname */
+  netif->hostname = "lwip";
+#endif /* LWIP_NETIF_HOSTNAME */
+
+  /*
+   * Initialize the snmp variables and counters inside the struct netif.
+   * The last argument should be replaced with your link speed, in units
+   * of bits per second.
+   */
+  NETIF_INIT_SNMP(netif, snmp_ifType_ethernet_csmacd, LINK_SPEED_OF_YOUR_NETIF_IN_BPS);
+
+  netif->state = ethernetif;
+  netif->name[0] = IFNAME0;
+  netif->name[1] = IFNAME1;
+  /* We directly use etharp_output() here to save a function call.
+   * You can instead declare your own function an call etharp_output()
+   * from it if you have to do some checks before sending (e.g. if link
+   * is available...) */
+  netif->output = etharp_output;
+  netif->linkoutput = low_level_output;
+
+  ethernetif->ethaddr = (struct eth_addr *)&(netif->hwaddr[0]);
+
+  /* initialize the hardware */
+  low_level_init(netif);
+
+  return ERR_OK;
+}
+
+#endif /* 0 */
diff --git a/ext/lwip/src/netif/ppp/auth.c b/ext/lwip/src/netif/ppp/auth.c
new file mode 100644
index 000000000..0fd87a379
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/auth.c
@@ -0,0 +1,1334 @@
+/*****************************************************************************
+* auth.c - Network Authentication and Phase Control program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* Copyright (c) 1997 by Global Election Systems Inc.  All rights reserved.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-08 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Ported from public pppd code.
+*****************************************************************************/
+/*
+ * auth.c - PPP authentication and phase control.
+ *
+ * Copyright (c) 1993 The Australian National University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the Australian National University.  The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "fsm.h"
+#include "lcp.h"
+#include "pap.h"
+#include "chap.h"
+#include "auth.h"
+#include "ipcp.h"
+
+#if CBCP_SUPPORT
+#include "cbcp.h"
+#endif /* CBCP_SUPPORT */
+
+#include "lwip/inet.h"
+
+#include <string.h>
+
+#if 0 /* UNUSED */
+/* Bits in scan_authfile return value */
+#define NONWILD_SERVER  1
+#define NONWILD_CLIENT  2
+
+#define ISWILD(word)  (word[0] == '*' && word[1] == 0)
+#endif /* UNUSED */
+
+#if PAP_SUPPORT || CHAP_SUPPORT
+/* The name by which the peer authenticated itself to us. */
+static char peer_authname[MAXNAMELEN];
+#endif /* PAP_SUPPORT || CHAP_SUPPORT */
+
+/* Records which authentication operations haven't completed yet. */
+static int auth_pending[NUM_PPP];
+
+/* Set if we have successfully called plogin() */
+static int logged_in;
+
+/* Set if we have run the /etc/ppp/auth-up script. */
+static int did_authup; /* @todo, we don't need this in lwip*/
+
+/* List of addresses which the peer may use. */
+static struct wordlist *addresses[NUM_PPP];
+
+#if 0 /* UNUSED */
+/* Wordlist giving addresses which the peer may use
+   without authenticating itself. */
+static struct wordlist *noauth_addrs;
+
+/* Extra options to apply, from the secrets file entry for the peer. */
+static struct wordlist *extra_options;
+#endif /* UNUSED */
+
+/* Number of network protocols which we have opened. */
+static int num_np_open;
+
+/* Number of network protocols which have come up. */
+static int num_np_up;
+
+#if PAP_SUPPORT || CHAP_SUPPORT
+/* Set if we got the contents of passwd[] from the pap-secrets file. */
+static int passwd_from_file;
+#endif /* PAP_SUPPORT || CHAP_SUPPORT */
+
+#if 0 /* UNUSED */
+/* Set if we require authentication only because we have a default route. */
+static bool default_auth;
+
+/* Hook to enable a plugin to control the idle time limit */
+int (*idle_time_hook) __P((struct ppp_idle *)) = NULL;
+
+/* Hook for a plugin to say whether we can possibly authenticate any peer */
+int (*pap_check_hook) __P((void)) = NULL;
+
+/* Hook for a plugin to check the PAP user and password */
+int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
+        struct wordlist **paddrs,
+        struct wordlist **popts)) = NULL;
+
+/* Hook for a plugin to know about the PAP user logout */
+void (*pap_logout_hook) __P((void)) = NULL;
+
+/* Hook for a plugin to get the PAP password for authenticating us */
+int (*pap_passwd_hook) __P((char *user, char *passwd)) = NULL;
+
+/*
+ * This is used to ensure that we don't start an auth-up/down
+ * script while one is already running.
+ */
+enum script_state {
+    s_down,
+    s_up
+};
+
+static enum script_state auth_state = s_down;
+static enum script_state auth_script_state = s_down;
+static pid_t auth_script_pid = 0;
+
+/*
+ * Option variables.
+ * lwip: some of these are present in the ppp_settings structure
+ */
+bool uselogin = 0;            /* Use /etc/passwd for checking PAP */
+bool cryptpap = 0;            /* Passwords in pap-secrets are encrypted */
+bool refuse_pap = 0;          /* Don't wanna auth. ourselves with PAP */
+bool refuse_chap = 0;         /* Don't wanna auth. ourselves with CHAP */
+bool usehostname = 0;         /* Use hostname for our_name */
+bool auth_required = 0;       /* Always require authentication from peer */
+bool allow_any_ip = 0;        /* Allow peer to use any IP address */
+bool explicit_remote = 0;     /* User specified explicit remote name */
+char remote_name[MAXNAMELEN]; /* Peer's name for authentication */
+
+#endif /* UNUSED */
+
+/* Bits in auth_pending[] */
+#define PAP_WITHPEER    1
+#define PAP_PEER        2
+#define CHAP_WITHPEER   4
+#define CHAP_PEER       8
+
+/* @todo, move this somewhere */
+/* Used for storing a sequence of words.  Usually malloced. */
+struct wordlist {
+  struct wordlist *next;
+  char        word[1];
+};
+
+
+extern char *crypt (const char *, const char *);
+
+/* Prototypes for procedures local to this file. */
+
+static void network_phase (int);
+static void check_idle (void *);
+static void connect_time_expired (void *);
+#if 0
+static int  plogin (char *, char *, char **, int *);
+#endif
+static void plogout (void);
+static int  null_login (int);
+static int  get_pap_passwd (int, char *, char *);
+static int  have_pap_secret (void);
+static int  have_chap_secret (char *, char *, u32_t);
+static int  ip_addr_check (u32_t, struct wordlist *);
+
+#if 0 /* PAP_SUPPORT || CHAP_SUPPORT */
+static int  scan_authfile (FILE *, char *, char *, char *,
+             struct wordlist **, struct wordlist **,
+             char *);
+static void free_wordlist (struct wordlist *);
+static void auth_script (char *);
+static void auth_script_done (void *);
+static void set_allowed_addrs (int unit, struct wordlist *addrs);
+static int  some_ip_ok (struct wordlist *);
+static int  setupapfile (char **);
+static int  privgroup (char **);
+static int  set_noauth_addr (char **);
+static void check_access (FILE *, char *);
+#endif /* 0 */ /* PAP_SUPPORT || CHAP_SUPPORT */
+
+#if 0 /* UNUSED */
+/*
+ * Authentication-related options.
+ */
+option_t auth_options[] = {
+    { "require-pap", o_bool, &lcp_wantoptions[0].neg_upap,
+      "Require PAP authentication from peer", 1, &auth_required },
+    { "+pap", o_bool, &lcp_wantoptions[0].neg_upap,
+      "Require PAP authentication from peer", 1, &auth_required },
+    { "refuse-pap", o_bool, &refuse_pap,
+      "Don't agree to auth to peer with PAP", 1 },
+    { "-pap", o_bool, &refuse_pap,
+      "Don't allow PAP authentication with peer", 1 },
+    { "require-chap", o_bool, &lcp_wantoptions[0].neg_chap,
+      "Require CHAP authentication from peer", 1, &auth_required },
+    { "+chap", o_bool, &lcp_wantoptions[0].neg_chap,
+      "Require CHAP authentication from peer", 1, &auth_required },
+    { "refuse-chap", o_bool, &refuse_chap,
+      "Don't agree to auth to peer with CHAP", 1 },
+    { "-chap", o_bool, &refuse_chap,
+      "Don't allow CHAP authentication with peer", 1 },
+    { "name", o_string, our_name,
+      "Set local name for authentication",
+      OPT_PRIV|OPT_STATIC, NULL, MAXNAMELEN },
+    { "user", o_string, user,
+      "Set name for auth with peer", OPT_STATIC, NULL, MAXNAMELEN },
+    { "usehostname", o_bool, &usehostname,
+      "Must use hostname for authentication", 1 },
+    { "remotename", o_string, remote_name,
+      "Set remote name for authentication", OPT_STATIC,
+      &explicit_remote, MAXNAMELEN },
+    { "auth", o_bool, &auth_required,
+      "Require authentication from peer", 1 },
+    { "noauth", o_bool, &auth_required,
+      "Don't require peer to authenticate", OPT_PRIV, &allow_any_ip },
+    {  "login", o_bool, &uselogin,
+      "Use system password database for PAP", 1 },
+    { "papcrypt", o_bool, &cryptpap,
+      "PAP passwords are encrypted", 1 },
+    { "+ua", o_special, (void *)setupapfile,
+      "Get PAP user and password from file" },
+    { "password", o_string, passwd,
+      "Password for authenticating us to the peer", OPT_STATIC,
+      NULL, MAXSECRETLEN },
+    { "privgroup", o_special, (void *)privgroup,
+      "Allow group members to use privileged options", OPT_PRIV },
+    { "allow-ip", o_special, (void *)set_noauth_addr,
+      "Set IP address(es) which can be used without authentication",
+      OPT_PRIV },
+    { NULL }
+};
+#endif /* UNUSED */
+#if 0 /* UNUSED */
+/*
+ * setupapfile - specifies UPAP info for authenticating with peer.
+ */
+static int
+setupapfile(char **argv)
+{
+    FILE * ufile;
+    int l;
+
+    lcp_allowoptions[0].neg_upap = 1;
+
+    /* open user info file */
+    seteuid(getuid());
+    ufile = fopen(*argv, "r");
+    seteuid(0);
+    if (ufile == NULL) {
+      option_error("unable to open user login data file %s", *argv);
+      return 0;
+    }
+    check_access(ufile, *argv);
+
+    /* get username */
+    if (fgets(user, MAXNAMELEN - 1, ufile) == NULL
+        || fgets(passwd, MAXSECRETLEN - 1, ufile) == NULL){
+      option_error("unable to read user login data file %s", *argv);
+      return 0;
+    }
+    fclose(ufile);
+
+    /* get rid of newlines */
+    l = strlen(user);
+    if (l > 0 && user[l-1] == '\n')
+      user[l-1] = 0;
+    l = strlen(passwd);
+    if (l > 0 && passwd[l-1] == '\n')
+      passwd[l-1] = 0;
+
+    return (1);
+}
+#endif /* UNUSED */
+
+#if 0 /* UNUSED */
+/*
+ * privgroup - allow members of the group to have privileged access.
+ */
+static int
+privgroup(char **argv)
+{
+    struct group *g;
+    int i;
+
+    g = getgrnam(*argv);
+    if (g == 0) {
+      option_error("group %s is unknown", *argv);
+      return 0;
+    }
+    for (i = 0; i < ngroups; ++i) {
+      if (groups[i] == g->gr_gid) {
+        privileged = 1;
+        break;
+      }
+    }
+    return 1;
+}
+#endif
+
+#if 0 /* UNUSED */
+/*
+ * set_noauth_addr - set address(es) that can be used without authentication.
+ * Equivalent to specifying an entry like `"" * "" addr' in pap-secrets.
+ */
+static int
+set_noauth_addr(char **argv)
+{
+    char *addr = *argv;
+    int l = strlen(addr);
+    struct wordlist *wp;
+
+    wp = (struct wordlist *) malloc(sizeof(struct wordlist) + l + 1);
+    if (wp == NULL)
+      novm("allow-ip argument");
+    wp->word = (char *) (wp + 1);
+    wp->next = noauth_addrs;
+    BCOPY(addr, wp->word, l);
+    noauth_addrs = wp;
+    return 1;
+}
+#endif /* UNUSED */
+
+/*
+ * An Open on LCP has requested a change from Dead to Establish phase.
+ * Do what's necessary to bring the physical layer up.
+ */
+void
+link_required(int unit)
+{
+  LWIP_UNUSED_ARG(unit);
+
+  AUTHDEBUG(LOG_INFO, ("link_required: %d\n", unit));
+}
+
+/*
+ * LCP has terminated the link; go to the Dead phase and take the
+ * physical layer down.
+ */
+void
+link_terminated(int unit)
+{
+  AUTHDEBUG(LOG_INFO, ("link_terminated: %d\n", unit));
+  if (lcp_phase[unit] == PHASE_DEAD) {
+    return;
+  }
+  if (logged_in) {
+    plogout();
+  }
+  lcp_phase[unit] = PHASE_DEAD;
+  AUTHDEBUG(LOG_NOTICE, ("Connection terminated.\n"));
+  pppLinkTerminated(unit);
+}
+
+/*
+ * LCP has gone down; it will either die or try to re-establish.
+ */
+void
+link_down(int unit)
+{
+  int i;
+  struct protent *protp;
+
+  AUTHDEBUG(LOG_INFO, ("link_down: %d\n", unit));
+
+  if (did_authup) {
+    /* XXX Do link down processing. */
+    did_authup = 0;
+  }
+  for (i = 0; (protp = ppp_protocols[i]) != NULL; ++i) {
+    if (!protp->enabled_flag) {
+      continue;
+    }
+    if (protp->protocol != PPP_LCP && protp->lowerdown != NULL) {
+      (*protp->lowerdown)(unit);
+    }
+    if (protp->protocol < 0xC000 && protp->close != NULL) {
+      (*protp->close)(unit, "LCP down");
+    }
+  }
+  num_np_open = 0;  /* number of network protocols we have opened */
+  num_np_up = 0;    /* Number of network protocols which have come up */
+
+  if (lcp_phase[unit] != PHASE_DEAD) {
+    lcp_phase[unit] = PHASE_TERMINATE;
+  }
+  pppLinkDown(unit);
+}
+
+/*
+ * The link is established.
+ * Proceed to the Dead, Authenticate or Network phase as appropriate.
+ */
+void
+link_established(int unit)
+{
+  int auth;
+  int i;
+  struct protent *protp;
+  lcp_options *wo = &lcp_wantoptions[unit];
+  lcp_options *go = &lcp_gotoptions[unit];
+#if PAP_SUPPORT || CHAP_SUPPORT
+  lcp_options *ho = &lcp_hisoptions[unit];
+#endif /* PAP_SUPPORT || CHAP_SUPPORT */
+
+  AUTHDEBUG(LOG_INFO, ("link_established: unit %d; Lowering up all protocols...\n", unit));
+  /*
+   * Tell higher-level protocols that LCP is up.
+   */
+  for (i = 0; (protp = ppp_protocols[i]) != NULL; ++i) {
+    if (protp->protocol != PPP_LCP && protp->enabled_flag && protp->lowerup != NULL) {
+      (*protp->lowerup)(unit);
+    }
+  }
+  if (ppp_settings.auth_required && !(go->neg_chap || go->neg_upap)) {
+    /*
+     * We wanted the peer to authenticate itself, and it refused:
+     * treat it as though it authenticated with PAP using a username
+     * of "" and a password of "".  If that's not OK, boot it out.
+     */
+    if (!wo->neg_upap || !null_login(unit)) {
+      AUTHDEBUG(LOG_WARNING, ("peer refused to authenticate\n"));
+      lcp_close(unit, "peer refused to authenticate");
+      return;
+    }
+  }
+
+  lcp_phase[unit] = PHASE_AUTHENTICATE;
+  auth = 0;
+#if CHAP_SUPPORT
+  if (go->neg_chap) {
+    ChapAuthPeer(unit, ppp_settings.our_name, go->chap_mdtype);
+    auth |= CHAP_PEER;
+  } 
+#endif /* CHAP_SUPPORT */
+#if PAP_SUPPORT && CHAP_SUPPORT
+  else
+#endif /* PAP_SUPPORT && CHAP_SUPPORT */
+#if PAP_SUPPORT
+  if (go->neg_upap) {
+    upap_authpeer(unit);
+    auth |= PAP_PEER;
+  }
+#endif /* PAP_SUPPORT */
+#if CHAP_SUPPORT
+  if (ho->neg_chap) {
+    ChapAuthWithPeer(unit, ppp_settings.user, ho->chap_mdtype);
+    auth |= CHAP_WITHPEER;
+  }
+#endif /* CHAP_SUPPORT */
+#if PAP_SUPPORT && CHAP_SUPPORT
+  else
+#endif /* PAP_SUPPORT && CHAP_SUPPORT */
+#if PAP_SUPPORT
+  if (ho->neg_upap) {
+    if (ppp_settings.passwd[0] == 0) {
+      passwd_from_file = 1;
+      if (!get_pap_passwd(unit, ppp_settings.user, ppp_settings.passwd)) {
+        AUTHDEBUG(LOG_ERR, ("No secret found for PAP login\n"));
+      }
+    }
+    upap_authwithpeer(unit, ppp_settings.user, ppp_settings.passwd);
+    auth |= PAP_WITHPEER;
+  }
+#endif /* PAP_SUPPORT */
+  auth_pending[unit] = auth;
+
+  if (!auth) {
+    network_phase(unit);
+  }
+}
+
+/*
+ * Proceed to the network phase.
+ */
+static void
+network_phase(int unit)
+{
+  int i;
+  struct protent *protp;
+  lcp_options *go = &lcp_gotoptions[unit];
+
+  /*
+   * If the peer had to authenticate, run the auth-up script now.
+   */
+  if ((go->neg_chap || go->neg_upap) && !did_authup) {
+    /* XXX Do setup for peer authentication. */
+    did_authup = 1;
+  }
+
+#if CBCP_SUPPORT
+  /*
+   * If we negotiated callback, do it now.
+   */
+  if (go->neg_cbcp) {
+    lcp_phase[unit] = PHASE_CALLBACK;
+    (*cbcp_protent.open)(unit);
+    return;
+  }
+#endif /* CBCP_SUPPORT */
+
+  lcp_phase[unit] = PHASE_NETWORK;
+  for (i = 0; (protp = ppp_protocols[i]) != NULL; ++i) {
+    if (protp->protocol < 0xC000 && protp->enabled_flag && protp->open != NULL) {
+      (*protp->open)(unit);
+      if (protp->protocol != PPP_CCP) {
+        ++num_np_open;
+      }
+    }
+  }
+
+  if (num_np_open == 0) {
+    /* nothing to do */
+    lcp_close(0, "No network protocols running");
+  }
+}
+/* @todo: add void start_networks(void) here (pppd 2.3.11) */
+
+/*
+ * The peer has failed to authenticate himself using `protocol'.
+ */
+void
+auth_peer_fail(int unit, u16_t protocol)
+{
+  LWIP_UNUSED_ARG(protocol);
+
+  AUTHDEBUG(LOG_INFO, ("auth_peer_fail: %d proto=%X\n", unit, protocol));
+  /*
+   * Authentication failure: take the link down
+   */
+  lcp_close(unit, "Authentication failed");
+}
+
+
+#if PAP_SUPPORT || CHAP_SUPPORT
+/*
+ * The peer has been successfully authenticated using `protocol'.
+ */
+void
+auth_peer_success(int unit, u16_t protocol, char *name, int namelen)
+{
+  int pbit;
+
+  AUTHDEBUG(LOG_INFO, ("auth_peer_success: %d proto=%X\n", unit, protocol));
+  switch (protocol) {
+    case PPP_CHAP:
+      pbit = CHAP_PEER;
+      break;
+    case PPP_PAP:
+      pbit = PAP_PEER;
+      break;
+    default:
+      AUTHDEBUG(LOG_WARNING, ("auth_peer_success: unknown protocol %x\n", protocol));
+      return;
+  }
+
+  /*
+   * Save the authenticated name of the peer for later.
+   */
+  if (namelen > (int)sizeof(peer_authname) - 1) {
+    namelen = sizeof(peer_authname) - 1;
+  }
+  BCOPY(name, peer_authname, namelen);
+  peer_authname[namelen] = 0;
+  
+  /*
+   * If there is no more authentication still to be done,
+   * proceed to the network (or callback) phase.
+   */
+  if ((auth_pending[unit] &= ~pbit) == 0) {
+    network_phase(unit);
+  }
+}
+
+/*
+ * We have failed to authenticate ourselves to the peer using `protocol'.
+ */
+void
+auth_withpeer_fail(int unit, u16_t protocol)
+{
+  int errCode = PPPERR_AUTHFAIL;
+
+  LWIP_UNUSED_ARG(protocol);
+
+  AUTHDEBUG(LOG_INFO, ("auth_withpeer_fail: %d proto=%X\n", unit, protocol));
+  if (passwd_from_file) {
+    BZERO(ppp_settings.passwd, MAXSECRETLEN);
+  }
+
+  /*
+   * We've failed to authenticate ourselves to our peer.
+   * He'll probably take the link down, and there's not much
+   * we can do except wait for that.
+   */
+  pppIOCtl(unit, PPPCTLS_ERRCODE, &errCode);
+  lcp_close(unit, "Failed to authenticate ourselves to peer");
+}
+
+/*
+ * We have successfully authenticated ourselves with the peer using `protocol'.
+ */
+void
+auth_withpeer_success(int unit, u16_t protocol)
+{
+  int pbit;
+
+  AUTHDEBUG(LOG_INFO, ("auth_withpeer_success: %d proto=%X\n", unit, protocol));
+  switch (protocol) {
+    case PPP_CHAP:
+      pbit = CHAP_WITHPEER;
+      break;
+    case PPP_PAP:
+      if (passwd_from_file) {
+        BZERO(ppp_settings.passwd, MAXSECRETLEN);
+      }
+      pbit = PAP_WITHPEER;
+      break;
+    default:
+      AUTHDEBUG(LOG_WARNING, ("auth_peer_success: unknown protocol %x\n", protocol));
+      pbit = 0;
+  }
+
+  /*
+   * If there is no more authentication still being done,
+   * proceed to the network (or callback) phase.
+   */
+  if ((auth_pending[unit] &= ~pbit) == 0) {
+    network_phase(unit);
+  }
+}
+#endif /* PAP_SUPPORT || CHAP_SUPPORT */
+
+
+/*
+ * np_up - a network protocol has come up.
+ */
+void
+np_up(int unit, u16_t proto)
+{
+  LWIP_UNUSED_ARG(unit);
+  LWIP_UNUSED_ARG(proto);
+
+  AUTHDEBUG(LOG_INFO, ("np_up: %d proto=%X\n", unit, proto));
+  if (num_np_up == 0) {
+    AUTHDEBUG(LOG_INFO, ("np_up: maxconnect=%d idle_time_limit=%d\n",ppp_settings.maxconnect,ppp_settings.idle_time_limit));
+    /*
+     * At this point we consider that the link has come up successfully.
+     */
+    if (ppp_settings.idle_time_limit > 0) {
+      TIMEOUT(check_idle, NULL, ppp_settings.idle_time_limit);
+    }
+
+    /*
+     * Set a timeout to close the connection once the maximum
+     * connect time has expired.
+     */
+    if (ppp_settings.maxconnect > 0) {
+      TIMEOUT(connect_time_expired, 0, ppp_settings.maxconnect);
+    }
+  }
+  ++num_np_up;
+}
+
+/*
+ * np_down - a network protocol has gone down.
+ */
+void
+np_down(int unit, u16_t proto)
+{
+  LWIP_UNUSED_ARG(unit);
+  LWIP_UNUSED_ARG(proto);
+
+  AUTHDEBUG(LOG_INFO, ("np_down: %d proto=%X\n", unit, proto));
+  if (--num_np_up == 0 && ppp_settings.idle_time_limit > 0) {
+    UNTIMEOUT(check_idle, NULL);
+  }
+}
+
+/*
+ * np_finished - a network protocol has finished using the link.
+ */
+void
+np_finished(int unit, u16_t proto)
+{
+  LWIP_UNUSED_ARG(unit);
+  LWIP_UNUSED_ARG(proto);
+
+  AUTHDEBUG(LOG_INFO, ("np_finished: %d proto=%X\n", unit, proto));
+  if (--num_np_open <= 0) {
+    /* no further use for the link: shut up shop. */
+    lcp_close(0, "No network protocols running");
+  }
+}
+
+/*
+ * check_idle - check whether the link has been idle for long
+ * enough that we can shut it down.
+ */
+static void
+check_idle(void *arg)
+{
+  struct ppp_idle idle;
+  u_short itime;
+  
+  LWIP_UNUSED_ARG(arg);
+  if (!get_idle_time(0, &idle)) {
+    return;
+  }
+  itime = LWIP_MIN(idle.xmit_idle, idle.recv_idle);
+  if (itime >= ppp_settings.idle_time_limit) {
+    /* link is idle: shut it down. */
+    AUTHDEBUG(LOG_INFO, ("Terminating connection due to lack of activity.\n"));
+    lcp_close(0, "Link inactive");
+  } else {
+    TIMEOUT(check_idle, NULL, ppp_settings.idle_time_limit - itime);
+  }
+}
+
+/*
+ * connect_time_expired - log a message and close the connection.
+ */
+static void
+connect_time_expired(void *arg)
+{
+  LWIP_UNUSED_ARG(arg);
+
+  AUTHDEBUG(LOG_INFO, ("Connect time expired\n"));
+  lcp_close(0, "Connect time expired");   /* Close connection */
+}
+
+#if 0 /* UNUSED */
+/*
+ * auth_check_options - called to check authentication options.
+ */
+void
+auth_check_options(void)
+{
+  lcp_options *wo = &lcp_wantoptions[0];
+  int can_auth;
+  ipcp_options *ipwo = &ipcp_wantoptions[0];
+  u32_t remote;
+
+  /* Default our_name to hostname, and user to our_name */
+  if (ppp_settings.our_name[0] == 0 || ppp_settings.usehostname) {
+      strcpy(ppp_settings.our_name, ppp_settings.hostname);
+  }
+
+  if (ppp_settings.user[0] == 0) {
+    strcpy(ppp_settings.user, ppp_settings.our_name);
+  }
+
+  /* If authentication is required, ask peer for CHAP or PAP. */
+  if (ppp_settings.auth_required && !wo->neg_chap && !wo->neg_upap) {
+    wo->neg_chap = 1;
+    wo->neg_upap = 1;
+  }
+  
+  /*
+   * Check whether we have appropriate secrets to use
+   * to authenticate the peer.
+   */
+  can_auth = wo->neg_upap && have_pap_secret();
+  if (!can_auth && wo->neg_chap) {
+    remote = ipwo->accept_remote? 0: ipwo->hisaddr;
+    can_auth = have_chap_secret(ppp_settings.remote_name, ppp_settings.our_name, remote);
+  }
+
+  if (ppp_settings.auth_required && !can_auth) {
+    ppp_panic("No auth secret");
+  }
+}
+#endif /* UNUSED */
+
+/*
+ * auth_reset - called when LCP is starting negotiations to recheck
+ * authentication options, i.e. whether we have appropriate secrets
+ * to use for authenticating ourselves and/or the peer.
+ */
+void
+auth_reset(int unit)
+{
+  lcp_options *go = &lcp_gotoptions[unit];
+  lcp_options *ao = &lcp_allowoptions[0];
+  ipcp_options *ipwo = &ipcp_wantoptions[0];
+  u32_t remote;
+
+  AUTHDEBUG(LOG_INFO, ("auth_reset: %d\n", unit));
+  ao->neg_upap = !ppp_settings.refuse_pap && (ppp_settings.passwd[0] != 0 || get_pap_passwd(unit, NULL, NULL));
+  ao->neg_chap = !ppp_settings.refuse_chap && ppp_settings.passwd[0] != 0 /*have_chap_secret(ppp_settings.user, ppp_settings.remote_name, (u32_t)0)*/;
+
+  if (go->neg_upap && !have_pap_secret()) {
+    go->neg_upap = 0;
+  }
+  if (go->neg_chap) {
+    remote = ipwo->accept_remote? 0: ipwo->hisaddr;
+    if (!have_chap_secret(ppp_settings.remote_name, ppp_settings.our_name, remote)) {
+      go->neg_chap = 0;
+    }
+  }
+}
+
+#if PAP_SUPPORT
+/*
+ * check_passwd - Check the user name and passwd against the PAP secrets
+ * file.  If requested, also check against the system password database,
+ * and login the user if OK.
+ *
+ * returns:
+ *  UPAP_AUTHNAK: Authentication failed.
+ *  UPAP_AUTHACK: Authentication succeeded.
+ * In either case, msg points to an appropriate message.
+ */
+u_char
+check_passwd( int unit, char *auser, int userlen, char *apasswd, int passwdlen, char **msg, int *msglen)
+{
+#if 1 /* XXX Assume all entries OK. */
+  LWIP_UNUSED_ARG(unit);
+  LWIP_UNUSED_ARG(auser);
+  LWIP_UNUSED_ARG(userlen);
+  LWIP_UNUSED_ARG(apasswd);
+  LWIP_UNUSED_ARG(passwdlen);
+  LWIP_UNUSED_ARG(msglen);
+  *msg = (char *) 0;
+  return UPAP_AUTHACK;     /* XXX Assume all entries OK. */
+#else
+  u_char ret = 0;
+  struct wordlist *addrs = NULL;
+  char passwd[256], user[256];
+  char secret[MAXWORDLEN];
+  static u_short attempts = 0;
+  
+  /*
+   * Make copies of apasswd and auser, then null-terminate them.
+   */
+  BCOPY(apasswd, passwd, passwdlen);
+  passwd[passwdlen] = '\0';
+  BCOPY(auser, user, userlen);
+  user[userlen] = '\0';
+  *msg = (char *) 0;
+
+  /* XXX Validate user name and password. */
+  ret = UPAP_AUTHACK;     /* XXX Assume all entries OK. */
+      
+  if (ret == UPAP_AUTHNAK) {
+    if (*msg == (char *) 0) {
+      *msg = "Login incorrect";
+    }
+    *msglen = strlen(*msg);
+    /*
+     * Frustrate passwd stealer programs.
+     * Allow 10 tries, but start backing off after 3 (stolen from login).
+     * On 10'th, drop the connection.
+     */
+    if (attempts++ >= 10) {
+      AUTHDEBUG(LOG_WARNING, ("%d LOGIN FAILURES BY %s\n", attempts, user));
+      /*ppp_panic("Excess Bad Logins");*/
+    }
+    if (attempts > 3) {
+      /* @todo: this was sleep(), i.e. seconds, not milliseconds
+       * I don't think we really need this in lwIP - we would block tcpip_thread!
+       */
+      /*sys_msleep((attempts - 3) * 5);*/
+    }
+    if (addrs != NULL) {
+      free_wordlist(addrs);
+    }
+  } else {
+    attempts = 0; /* Reset count */
+    if (*msg == (char *) 0) {
+      *msg = "Login ok";
+    }
+    *msglen = strlen(*msg);
+    set_allowed_addrs(unit, addrs);
+  }
+
+  BZERO(passwd, sizeof(passwd));
+  BZERO(secret, sizeof(secret));
+
+  return ret;
+#endif
+}
+#endif /* PAP_SUPPORT */
+
+#if 0 /* UNUSED */
+/*
+ * This function is needed for PAM.
+ */
+
+#ifdef USE_PAM
+
+/* lwip does not support PAM*/
+
+#endif  /* USE_PAM */
+
+#endif /* UNUSED */
+
+
+#if 0 /* UNUSED */
+/*
+ * plogin - Check the user name and password against the system
+ * password database, and login the user if OK.
+ *
+ * returns:
+ *  UPAP_AUTHNAK: Login failed.
+ *  UPAP_AUTHACK: Login succeeded.
+ * In either case, msg points to an appropriate message.
+ */
+static int
+plogin(char *user, char *passwd, char **msg, int *msglen)
+{
+
+  LWIP_UNUSED_ARG(user);
+  LWIP_UNUSED_ARG(passwd);
+  LWIP_UNUSED_ARG(msg);
+  LWIP_UNUSED_ARG(msglen);
+
+
+ /* The new lines are here align the file when 
+  * compared against the pppd 2.3.11 code */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /* XXX Fail until we decide that we want to support logins. */
+  return (UPAP_AUTHNAK);
+}
+#endif
+
+
+
+/*
+ * plogout - Logout the user.
+ */
+static void
+plogout(void)
+{
+  logged_in = 0;
+}
+
+/*
+ * null_login - Check if a username of "" and a password of "" are
+ * acceptable, and iff so, set the list of acceptable IP addresses
+ * and return 1.
+ */
+static int
+null_login(int unit)
+{
+  LWIP_UNUSED_ARG(unit);
+  /* XXX Fail until we decide that we want to support logins. */
+  return 0;
+}
+
+
+/*
+ * get_pap_passwd - get a password for authenticating ourselves with
+ * our peer using PAP.  Returns 1 on success, 0 if no suitable password
+ * could be found.
+ */
+static int
+get_pap_passwd(int unit, char *user, char *passwd)
+{
+  LWIP_UNUSED_ARG(unit);
+/* normally we would reject PAP if no password is provided,
+   but this causes problems with some providers (like CHT in Taiwan)
+   who incorrectly request PAP and expect a bogus/empty password, so
+   always provide a default user/passwd of "none"/"none"
+
+   @todo: This should be configured by the user, instead of being hardcoded here!
+*/
+  if(user) {
+    strcpy(user, "none");
+  }
+  if(passwd) {
+    strcpy(passwd, "none");
+  }
+  return 1;
+}
+
+/*
+ * have_pap_secret - check whether we have a PAP file with any
+ * secrets that we could possibly use for authenticating the peer.
+ */
+static int
+have_pap_secret(void)
+{
+  /* XXX Fail until we set up our passwords. */
+  return 0;
+}
+
+/*
+ * have_chap_secret - check whether we have a CHAP file with a
+ * secret that we could possibly use for authenticating `client'
+ * on `server'.  Either can be the null string, meaning we don't
+ * know the identity yet.
+ */
+static int
+have_chap_secret(char *client, char *server, u32_t remote)
+{
+  LWIP_UNUSED_ARG(client);
+  LWIP_UNUSED_ARG(server);
+  LWIP_UNUSED_ARG(remote);
+
+  /* XXX Fail until we set up our passwords. */
+  return 0;
+}
+#if CHAP_SUPPORT
+
+/*
+ * get_secret - open the CHAP secret file and return the secret
+ * for authenticating the given client on the given server.
+ * (We could be either client or server).
+ */
+int
+get_secret(int unit, char *client, char *server, char *secret, int *secret_len, int save_addrs)
+{
+#if 1
+  int len;
+  struct wordlist *addrs;
+
+  LWIP_UNUSED_ARG(unit);
+  LWIP_UNUSED_ARG(server);
+  LWIP_UNUSED_ARG(save_addrs);
+
+  addrs = NULL;
+
+  if(!client || !client[0] || strcmp(client, ppp_settings.user)) {
+    return 0;
+  }
+
+  len = (int)strlen(ppp_settings.passwd);
+  if (len > MAXSECRETLEN) {
+    AUTHDEBUG(LOG_ERR, ("Secret for %s on %s is too long\n", client, server));
+    len = MAXSECRETLEN;
+  }
+
+  BCOPY(ppp_settings.passwd, secret, len);
+  *secret_len = len;
+
+  return 1;
+#else
+  int ret = 0, len;
+  struct wordlist *addrs;
+  char secbuf[MAXWORDLEN];
+  
+  addrs = NULL;
+  secbuf[0] = 0;
+
+  /* XXX Find secret. */
+  if (ret < 0) {
+    return 0;
+  }
+
+  if (save_addrs) {
+    set_allowed_addrs(unit, addrs);
+  }
+
+  len = strlen(secbuf);
+  if (len > MAXSECRETLEN) {
+    AUTHDEBUG(LOG_ERR, ("Secret for %s on %s is too long\n", client, server));
+    len = MAXSECRETLEN;
+  }
+
+  BCOPY(secbuf, secret, len);
+  BZERO(secbuf, sizeof(secbuf));
+  *secret_len = len;
+
+  return 1;
+#endif
+}
+#endif /* CHAP_SUPPORT */
+
+
+#if 0 /* PAP_SUPPORT || CHAP_SUPPORT */
+/*
+ * set_allowed_addrs() - set the list of allowed addresses.
+ */
+static void
+set_allowed_addrs(int unit, struct wordlist *addrs)
+{
+  if (addresses[unit] != NULL) {
+    free_wordlist(addresses[unit]);
+  }
+  addresses[unit] = addrs;
+
+#if 0
+  /*
+   * If there's only one authorized address we might as well
+   * ask our peer for that one right away
+   */
+  if (addrs != NULL && addrs->next == NULL) {
+    char *p = addrs->word;
+    struct ipcp_options *wo = &ipcp_wantoptions[unit];
+    u32_t a;
+    struct hostent *hp;
+    
+    if (wo->hisaddr == 0 && *p != '!' && *p != '-' && strchr(p, '/') == NULL) {
+      hp = gethostbyname(p);
+      if (hp != NULL && hp->h_addrtype == AF_INET) {
+        a = *(u32_t *)hp->h_addr;
+      } else {
+        a = inet_addr(p);
+      }
+      if (a != (u32_t) -1) {
+        wo->hisaddr = a;
+      }
+    }
+  }
+#endif
+}
+#endif /* 0 */ /* PAP_SUPPORT || CHAP_SUPPORT */
+
+/*
+ * auth_ip_addr - check whether the peer is authorized to use
+ * a given IP address.  Returns 1 if authorized, 0 otherwise.
+ */
+int
+auth_ip_addr(int unit, u32_t addr)
+{
+  return ip_addr_check(addr, addresses[unit]);
+}
+
+static int /* @todo: integrate this funtion into auth_ip_addr()*/
+ip_addr_check(u32_t addr, struct wordlist *addrs)
+{
+  /* don't allow loopback or multicast address */
+  if (bad_ip_adrs(addr)) {
+    return 0;
+  }
+
+  if (addrs == NULL) {
+    return !ppp_settings.auth_required; /* no addresses authorized */
+  }
+
+  /* XXX All other addresses allowed. */
+  return 1;
+}
+
+/*
+ * bad_ip_adrs - return 1 if the IP address is one we don't want
+ * to use, such as an address in the loopback net or a multicast address.
+ * addr is in network byte order.
+ */
+int
+bad_ip_adrs(u32_t addr)
+{
+  addr = ntohl(addr);
+  return (addr >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET
+      || IN_MULTICAST(addr) || IN_BADCLASS(addr);
+}
+
+#if 0 /* UNUSED */ /* PAP_SUPPORT || CHAP_SUPPORT */
+/*
+ * some_ip_ok - check a wordlist to see if it authorizes any
+ * IP address(es).
+ */
+static int
+some_ip_ok(struct wordlist *addrs)
+{
+    for (; addrs != 0; addrs = addrs->next) {
+      if (addrs->word[0] == '-')
+        break;
+      if (addrs->word[0] != '!')
+        return 1; /* some IP address is allowed */
+    }
+    return 0;
+}
+
+/*
+ * check_access - complain if a secret file has too-liberal permissions.
+ */
+static void
+check_access(FILE *f, char *filename)
+{
+    struct stat sbuf;
+
+    if (fstat(fileno(f), &sbuf) < 0) {
+      warn("cannot stat secret file %s: %m", filename);
+    } else if ((sbuf.st_mode & (S_IRWXG | S_IRWXO)) != 0) {
+      warn("Warning - secret file %s has world and/or group access",
+            filename);
+    }
+}
+
+
+/*
+ * scan_authfile - Scan an authorization file for a secret suitable
+ * for authenticating `client' on `server'.  The return value is -1
+ * if no secret is found, otherwise >= 0.  The return value has
+ * NONWILD_CLIENT set if the secret didn't have "*" for the client, and
+ * NONWILD_SERVER set if the secret didn't have "*" for the server.
+ * Any following words on the line up to a "--" (i.e. address authorization
+ * info) are placed in a wordlist and returned in *addrs.  Any
+ * following words (extra options) are placed in a wordlist and
+ * returned in *opts.
+ * We assume secret is NULL or points to MAXWORDLEN bytes of space.
+ */
+static int
+scan_authfile(FILE *f, char *client, char *server, char *secret, struct wordlist **addrs, struct wordlist **opts, char *filename)
+{
+  /* We do not (currently) need this in lwip  */
+  return 0; /* dummy */
+}
+/*
+ * free_wordlist - release memory allocated for a wordlist.
+ */
+static void
+free_wordlist(struct wordlist *wp)
+{
+  struct wordlist *next;
+
+  while (wp != NULL) {
+    next = wp->next;
+    free(wp);
+    wp = next;
+  }
+}
+
+/*
+ * auth_script_done - called when the auth-up or auth-down script
+ * has finished.
+ */
+static void
+auth_script_done(void *arg)
+{
+    auth_script_pid = 0;
+    switch (auth_script_state) {
+    case s_up:
+      if (auth_state == s_down) {
+        auth_script_state = s_down;
+        auth_script(_PATH_AUTHDOWN);
+      }
+      break;
+    case s_down:
+      if (auth_state == s_up) {
+        auth_script_state = s_up;
+        auth_script(_PATH_AUTHUP);
+      }
+      break;
+    }
+}
+
+/*
+ * auth_script - execute a script with arguments
+ * interface-name peer-name real-user tty speed
+ */
+static void
+auth_script(char *script)
+{
+    char strspeed[32];
+    struct passwd *pw;
+    char struid[32];
+    char *user_name;
+    char *argv[8];
+
+    if ((pw = getpwuid(getuid())) != NULL && pw->pw_name != NULL)
+      user_name = pw->pw_name;
+    else {
+      slprintf(struid, sizeof(struid), "%d", getuid());
+      user_name = struid;
+    }
+    slprintf(strspeed, sizeof(strspeed), "%d", baud_rate);
+
+    argv[0] = script;
+    argv[1] = ifname;
+    argv[2] = peer_authname;
+    argv[3] = user_name;
+    argv[4] = devnam;
+    argv[5] = strspeed;
+    argv[6] = NULL;
+
+    auth_script_pid = run_program(script, argv, 0, auth_script_done, NULL);
+}
+#endif  /* 0 */ /* PAP_SUPPORT || CHAP_SUPPORT */
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/auth.h b/ext/lwip/src/netif/ppp/auth.h
new file mode 100644
index 000000000..a8069ec46
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/auth.h
@@ -0,0 +1,111 @@
+/*****************************************************************************
+* auth.h -  PPP Authentication and phase control header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1998 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-04 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original derived from BSD pppd.h.
+*****************************************************************************/
+/*
+ * pppd.h - PPP daemon global declarations.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
+#ifndef AUTH_H
+#define AUTH_H
+
+/***********************
+*** PUBLIC FUNCTIONS ***
+***********************/
+
+/* we are starting to use the link */
+void link_required (int);
+
+/* we are finished with the link */
+void link_terminated (int);
+
+/* the LCP layer has left the Opened state */
+void link_down (int);
+
+/* the link is up; authenticate now */
+void link_established (int);
+
+/* a network protocol has come up */
+void np_up (int, u16_t);
+
+/* a network protocol has gone down */
+void np_down (int, u16_t);
+
+/* a network protocol no longer needs link */
+void np_finished (int, u16_t);
+
+/* peer failed to authenticate itself */
+void auth_peer_fail (int, u16_t);
+
+/* peer successfully authenticated itself */
+void auth_peer_success (int, u16_t, char *, int);
+
+/* we failed to authenticate ourselves */
+void auth_withpeer_fail (int, u16_t);
+
+/* we successfully authenticated ourselves */
+void auth_withpeer_success (int, u16_t);
+
+/* check authentication options supplied */
+void auth_check_options (void);
+
+/* check what secrets we have */
+void auth_reset (int);
+
+/* Check peer-supplied username/password */
+u_char check_passwd (int, char *, int, char *, int, char **, int *);
+
+/* get "secret" for chap */
+int  get_secret (int, char *, char *, char *, int *, int);
+
+/* check if IP address is authorized */
+int  auth_ip_addr (int, u32_t);
+
+/* check if IP address is unreasonable */
+int  bad_ip_adrs (u32_t);
+
+#endif /* AUTH_H */
diff --git a/ext/lwip/src/netif/ppp/chap.c b/ext/lwip/src/netif/ppp/chap.c
new file mode 100644
index 000000000..f10e27d2e
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/chap.c
@@ -0,0 +1,908 @@
+/*** WARNING - THIS HAS NEVER BEEN FINISHED ***/
+/*****************************************************************************
+* chap.c - Network Challenge Handshake Authentication Protocol program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 by Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-04 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original based on BSD chap.c.
+*****************************************************************************/
+/*
+ * chap.c - Challenge Handshake Authentication Protocol.
+ *
+ * Copyright (c) 1993 The Australian National University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the Australian National University.  The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Copyright (c) 1991 Gregory M. Christy.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Gregory M. Christy.  The name of the author may not be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
+
+#if CHAP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "magic.h"
+#include "randm.h"
+#include "auth.h"
+#include "md5.h"
+#include "chap.h"
+#include "chpms.h"
+
+#include <string.h>
+
+#if 0 /* UNUSED */
+/*
+ * Command-line options.
+ */
+static option_t chap_option_list[] = {
+    { "chap-restart", o_int, &chap[0].timeouttime,
+      "Set timeout for CHAP" },
+    { "chap-max-challenge", o_int, &chap[0].max_transmits,
+      "Set max #xmits for challenge" },
+    { "chap-interval", o_int, &chap[0].chal_interval,
+      "Set interval for rechallenge" },
+#ifdef MSLANMAN
+    { "ms-lanman", o_bool, &ms_lanman,
+      "Use LanMan passwd when using MS-CHAP", 1 },
+#endif
+    { NULL }
+};
+#endif /* UNUSED */
+
+/*
+ * Protocol entry points.
+ */
+static void ChapInit (int);
+static void ChapLowerUp (int);
+static void ChapLowerDown (int);
+static void ChapInput (int, u_char *, int);
+static void ChapProtocolReject (int);
+#if PPP_ADDITIONAL_CALLBACKS
+static int  ChapPrintPkt (u_char *, int, void (*) (void *, char *, ...), void *);
+#endif
+
+struct protent chap_protent = {
+  PPP_CHAP,
+  ChapInit,
+  ChapInput,
+  ChapProtocolReject,
+  ChapLowerUp,
+  ChapLowerDown,
+  NULL,
+  NULL,
+#if PPP_ADDITIONAL_CALLBACKS
+  ChapPrintPkt,
+  NULL,
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+  1,
+  "CHAP",
+#if PPP_ADDITIONAL_CALLBACKS
+  NULL,
+  NULL,
+  NULL
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+};
+
+chap_state chap[NUM_PPP]; /* CHAP state; one for each unit */
+
+static void ChapChallengeTimeout (void *);
+static void ChapResponseTimeout (void *);
+static void ChapReceiveChallenge (chap_state *, u_char *, u_char, int);
+static void ChapRechallenge (void *);
+static void ChapReceiveResponse (chap_state *, u_char *, int, int);
+static void ChapReceiveSuccess(chap_state *cstate, u_char *inp, u_char id, int len);
+static void ChapReceiveFailure(chap_state *cstate, u_char *inp, u_char id, int len);
+static void ChapSendStatus (chap_state *, int);
+static void ChapSendChallenge (chap_state *);
+static void ChapSendResponse (chap_state *);
+static void ChapGenChallenge (chap_state *);
+
+/*
+ * ChapInit - Initialize a CHAP unit.
+ */
+static void
+ChapInit(int unit)
+{
+  chap_state *cstate = &chap[unit];
+
+  BZERO(cstate, sizeof(*cstate));
+  cstate->unit = unit;
+  cstate->clientstate = CHAPCS_INITIAL;
+  cstate->serverstate = CHAPSS_INITIAL;
+  cstate->timeouttime = CHAP_DEFTIMEOUT;
+  cstate->max_transmits = CHAP_DEFTRANSMITS;
+  /* random number generator is initialized in magic_init */
+}
+
+
+/*
+ * ChapAuthWithPeer - Authenticate us with our peer (start client).
+ *
+ */
+void
+ChapAuthWithPeer(int unit, char *our_name, u_char digest)
+{
+  chap_state *cstate = &chap[unit];
+
+  cstate->resp_name = our_name;
+  cstate->resp_type = digest;
+
+  if (cstate->clientstate == CHAPCS_INITIAL ||
+      cstate->clientstate == CHAPCS_PENDING) {
+    /* lower layer isn't up - wait until later */
+    cstate->clientstate = CHAPCS_PENDING;
+    return;
+  }
+
+  /*
+   * We get here as a result of LCP coming up.
+   * So even if CHAP was open before, we will 
+   * have to re-authenticate ourselves.
+   */
+  cstate->clientstate = CHAPCS_LISTEN;
+}
+
+
+/*
+ * ChapAuthPeer - Authenticate our peer (start server).
+ */
+void
+ChapAuthPeer(int unit, char *our_name, u_char digest)
+{
+  chap_state *cstate = &chap[unit];
+
+  cstate->chal_name = our_name;
+  cstate->chal_type = digest;
+  
+  if (cstate->serverstate == CHAPSS_INITIAL ||
+      cstate->serverstate == CHAPSS_PENDING) {
+    /* lower layer isn't up - wait until later */
+    cstate->serverstate = CHAPSS_PENDING;
+    return;
+  }
+
+  ChapGenChallenge(cstate);
+  ChapSendChallenge(cstate);    /* crank it up dude! */
+  cstate->serverstate = CHAPSS_INITIAL_CHAL;
+}
+
+
+/*
+ * ChapChallengeTimeout - Timeout expired on sending challenge.
+ */
+static void
+ChapChallengeTimeout(void *arg)
+{
+  chap_state *cstate = (chap_state *) arg;
+
+  /* if we aren't sending challenges, don't worry.  then again we */
+  /* probably shouldn't be here either */
+  if (cstate->serverstate != CHAPSS_INITIAL_CHAL &&
+      cstate->serverstate != CHAPSS_RECHALLENGE) {
+    return;
+  }
+
+  if (cstate->chal_transmits >= cstate->max_transmits) {
+    /* give up on peer */
+    CHAPDEBUG(LOG_ERR, ("Peer failed to respond to CHAP challenge\n"));
+    cstate->serverstate = CHAPSS_BADAUTH;
+    auth_peer_fail(cstate->unit, PPP_CHAP);
+    return;
+  }
+
+  ChapSendChallenge(cstate); /* Re-send challenge */
+}
+
+
+/*
+ * ChapResponseTimeout - Timeout expired on sending response.
+ */
+static void
+ChapResponseTimeout(void *arg)
+{
+  chap_state *cstate = (chap_state *) arg;
+
+  /* if we aren't sending a response, don't worry. */
+  if (cstate->clientstate != CHAPCS_RESPONSE) {
+    return;
+  }
+
+  ChapSendResponse(cstate);    /* re-send response */
+}
+
+
+/*
+ * ChapRechallenge - Time to challenge the peer again.
+ */
+static void
+ChapRechallenge(void *arg)
+{
+  chap_state *cstate = (chap_state *) arg;
+  
+  /* if we aren't sending a response, don't worry. */
+  if (cstate->serverstate != CHAPSS_OPEN) {
+    return;
+  }
+
+  ChapGenChallenge(cstate);
+  ChapSendChallenge(cstate);
+  cstate->serverstate = CHAPSS_RECHALLENGE;
+}
+
+
+/*
+ * ChapLowerUp - The lower layer is up.
+ *
+ * Start up if we have pending requests.
+ */
+static void
+ChapLowerUp(int unit)
+{
+  chap_state *cstate = &chap[unit];
+
+  if (cstate->clientstate == CHAPCS_INITIAL) {
+    cstate->clientstate = CHAPCS_CLOSED;
+  } else if (cstate->clientstate == CHAPCS_PENDING) {
+    cstate->clientstate = CHAPCS_LISTEN;
+  }
+
+  if (cstate->serverstate == CHAPSS_INITIAL) {
+    cstate->serverstate = CHAPSS_CLOSED;
+  } else if (cstate->serverstate == CHAPSS_PENDING) {
+    ChapGenChallenge(cstate);
+    ChapSendChallenge(cstate);
+    cstate->serverstate = CHAPSS_INITIAL_CHAL;
+  }
+}
+
+
+/*
+ * ChapLowerDown - The lower layer is down.
+ *
+ * Cancel all timeouts.
+ */
+static void
+ChapLowerDown(int unit)
+{
+  chap_state *cstate = &chap[unit];
+
+  /* Timeout(s) pending?  Cancel if so. */
+  if (cstate->serverstate == CHAPSS_INITIAL_CHAL ||
+      cstate->serverstate == CHAPSS_RECHALLENGE) {
+    UNTIMEOUT(ChapChallengeTimeout, cstate);
+  } else if (cstate->serverstate == CHAPSS_OPEN
+      && cstate->chal_interval != 0) {
+    UNTIMEOUT(ChapRechallenge, cstate);
+  }
+  if (cstate->clientstate == CHAPCS_RESPONSE) {
+    UNTIMEOUT(ChapResponseTimeout, cstate);
+  }
+  cstate->clientstate = CHAPCS_INITIAL;
+  cstate->serverstate = CHAPSS_INITIAL;
+}
+
+
+/*
+ * ChapProtocolReject - Peer doesn't grok CHAP.
+ */
+static void
+ChapProtocolReject(int unit)
+{
+  chap_state *cstate = &chap[unit];
+  
+  if (cstate->serverstate != CHAPSS_INITIAL &&
+      cstate->serverstate != CHAPSS_CLOSED) {
+    auth_peer_fail(unit, PPP_CHAP);
+  }
+  if (cstate->clientstate != CHAPCS_INITIAL &&
+      cstate->clientstate != CHAPCS_CLOSED) {
+    auth_withpeer_fail(unit, PPP_CHAP); /* lwip: just sets the PPP error code on this unit to PPPERR_AUTHFAIL */
+  }
+  ChapLowerDown(unit); /* shutdown chap */
+}
+
+
+/*
+ * ChapInput - Input CHAP packet.
+ */
+static void
+ChapInput(int unit, u_char *inpacket, int packet_len)
+{
+  chap_state *cstate = &chap[unit];
+  u_char *inp;
+  u_char code, id;
+  int len;
+  
+  /*
+   * Parse header (code, id and length).
+   * If packet too short, drop it.
+   */
+  inp = inpacket;
+  if (packet_len < CHAP_HEADERLEN) {
+    CHAPDEBUG(LOG_INFO, ("ChapInput: rcvd short header.\n"));
+    return;
+  }
+  GETCHAR(code, inp);
+  GETCHAR(id, inp);
+  GETSHORT(len, inp);
+  if (len < CHAP_HEADERLEN) {
+    CHAPDEBUG(LOG_INFO, ("ChapInput: rcvd illegal length.\n"));
+    return;
+  }
+  if (len > packet_len) {
+    CHAPDEBUG(LOG_INFO, ("ChapInput: rcvd short packet.\n"));
+    return;
+  }
+  len -= CHAP_HEADERLEN;
+  
+  /*
+   * Action depends on code (as in fact it usually does :-).
+   */
+  switch (code) {
+    case CHAP_CHALLENGE:
+      ChapReceiveChallenge(cstate, inp, id, len);
+      break;
+    
+    case CHAP_RESPONSE:
+      ChapReceiveResponse(cstate, inp, id, len);
+      break;
+    
+    case CHAP_FAILURE:
+      ChapReceiveFailure(cstate, inp, id, len);
+      break;
+    
+    case CHAP_SUCCESS:
+      ChapReceiveSuccess(cstate, inp, id, len);
+      break;
+    
+    default:        /* Need code reject? */
+      CHAPDEBUG(LOG_WARNING, ("Unknown CHAP code (%d) received.\n", code));
+      break;
+  }
+}
+
+
+/*
+ * ChapReceiveChallenge - Receive Challenge and send Response.
+ */
+static void
+ChapReceiveChallenge(chap_state *cstate, u_char *inp, u_char id, int len)
+{
+  int rchallenge_len;
+  u_char *rchallenge;
+  int secret_len;
+  char secret[MAXSECRETLEN];
+  char rhostname[256];
+  MD5_CTX mdContext;
+  u_char hash[MD5_SIGNATURE_SIZE];
+
+  CHAPDEBUG(LOG_INFO, ("ChapReceiveChallenge: Rcvd id %d.\n", id));
+  if (cstate->clientstate == CHAPCS_CLOSED ||
+    cstate->clientstate == CHAPCS_PENDING) {
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveChallenge: in state %d\n",
+         cstate->clientstate));
+    return;
+  }
+
+  if (len < 2) {
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveChallenge: rcvd short packet.\n"));
+    return;
+  }
+
+  GETCHAR(rchallenge_len, inp);
+  len -= sizeof (u_char) + rchallenge_len;  /* now name field length */
+  if (len < 0) {
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveChallenge: rcvd short packet.\n"));
+    return;
+  }
+  rchallenge = inp;
+  INCPTR(rchallenge_len, inp);
+
+  if (len >= (int)sizeof(rhostname)) {
+    len = sizeof(rhostname) - 1;
+  }
+  BCOPY(inp, rhostname, len);
+  rhostname[len] = '\000';
+
+  CHAPDEBUG(LOG_INFO, ("ChapReceiveChallenge: received name field '%s'\n",
+             rhostname));
+
+  /* Microsoft doesn't send their name back in the PPP packet */
+  if (ppp_settings.remote_name[0] != 0 && (ppp_settings.explicit_remote || rhostname[0] == 0)) {
+    strncpy(rhostname, ppp_settings.remote_name, sizeof(rhostname));
+    rhostname[sizeof(rhostname) - 1] = 0;
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveChallenge: using '%s' as remote name\n",
+               rhostname));
+  }
+
+  /* get secret for authenticating ourselves with the specified host */
+  if (!get_secret(cstate->unit, cstate->resp_name, rhostname,
+                  secret, &secret_len, 0)) {
+    secret_len = 0;    /* assume null secret if can't find one */
+    CHAPDEBUG(LOG_WARNING, ("No CHAP secret found for authenticating us to %s\n",
+               rhostname));
+  }
+
+  /* cancel response send timeout if necessary */
+  if (cstate->clientstate == CHAPCS_RESPONSE) {
+    UNTIMEOUT(ChapResponseTimeout, cstate);
+  }
+
+  cstate->resp_id = id;
+  cstate->resp_transmits = 0;
+
+  /*  generate MD based on negotiated type */
+  switch (cstate->resp_type) { 
+
+  case CHAP_DIGEST_MD5:
+    MD5Init(&mdContext);
+    MD5Update(&mdContext, &cstate->resp_id, 1);
+    MD5Update(&mdContext, (u_char*)secret, secret_len);
+    MD5Update(&mdContext, rchallenge, rchallenge_len);
+    MD5Final(hash, &mdContext);
+    BCOPY(hash, cstate->response, MD5_SIGNATURE_SIZE);
+    cstate->resp_length = MD5_SIGNATURE_SIZE;
+    break;
+  
+#if MSCHAP_SUPPORT
+  case CHAP_MICROSOFT:
+    ChapMS(cstate, rchallenge, rchallenge_len, secret, secret_len);
+    break;
+#endif
+
+  default:
+    CHAPDEBUG(LOG_INFO, ("unknown digest type %d\n", cstate->resp_type));
+    return;
+  }
+
+  BZERO(secret, sizeof(secret));
+  ChapSendResponse(cstate);
+}
+
+
+/*
+ * ChapReceiveResponse - Receive and process response.
+ */
+static void
+ChapReceiveResponse(chap_state *cstate, u_char *inp, int id, int len)
+{
+  u_char *remmd, remmd_len;
+  int secret_len, old_state;
+  int code;
+  char rhostname[256];
+  MD5_CTX mdContext;
+  char secret[MAXSECRETLEN];
+  u_char hash[MD5_SIGNATURE_SIZE];
+
+  CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: Rcvd id %d.\n", id));
+  
+  if (cstate->serverstate == CHAPSS_CLOSED ||
+      cstate->serverstate == CHAPSS_PENDING) {
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: in state %d\n",
+    cstate->serverstate));
+    return;
+  }
+
+  if (id != cstate->chal_id) {
+    return;      /* doesn't match ID of last challenge */
+  }
+
+  /*
+  * If we have received a duplicate or bogus Response,
+  * we have to send the same answer (Success/Failure)
+  * as we did for the first Response we saw.
+  */
+  if (cstate->serverstate == CHAPSS_OPEN) {
+    ChapSendStatus(cstate, CHAP_SUCCESS);
+    return;
+  }
+  if (cstate->serverstate == CHAPSS_BADAUTH) {
+    ChapSendStatus(cstate, CHAP_FAILURE);
+    return;
+  }
+  
+  if (len < 2) {
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: rcvd short packet.\n"));
+    return;
+  }
+  GETCHAR(remmd_len, inp); /* get length of MD */
+  remmd = inp;             /* get pointer to MD */
+  INCPTR(remmd_len, inp);
+  
+  len -= sizeof (u_char) + remmd_len;
+  if (len < 0) {
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: rcvd short packet.\n"));
+    return;
+  }
+
+  UNTIMEOUT(ChapChallengeTimeout, cstate);
+  
+  if (len >= (int)sizeof(rhostname)) {
+    len = sizeof(rhostname) - 1;
+  }
+  BCOPY(inp, rhostname, len);
+  rhostname[len] = '\000';
+
+  CHAPDEBUG(LOG_INFO, ("ChapReceiveResponse: received name field: %s\n",
+             rhostname));
+
+  /*
+  * Get secret for authenticating them with us,
+  * do the hash ourselves, and compare the result.
+  */
+  code = CHAP_FAILURE;
+  if (!get_secret(cstate->unit, rhostname, cstate->chal_name,
+                  secret, &secret_len, 1)) {
+    CHAPDEBUG(LOG_WARNING, ("No CHAP secret found for authenticating %s\n",
+               rhostname));
+  } else {
+    /*  generate MD based on negotiated type */
+    switch (cstate->chal_type) {
+
+      case CHAP_DIGEST_MD5:    /* only MD5 is defined for now */
+        if (remmd_len != MD5_SIGNATURE_SIZE) {
+          break;      /* it's not even the right length */
+        }
+        MD5Init(&mdContext);
+        MD5Update(&mdContext, &cstate->chal_id, 1);
+        MD5Update(&mdContext, (u_char*)secret, secret_len);
+        MD5Update(&mdContext, cstate->challenge, cstate->chal_len);
+        MD5Final(hash, &mdContext); 
+        
+        /* compare local and remote MDs and send the appropriate status */
+        if (memcmp (hash, remmd, MD5_SIGNATURE_SIZE) == 0) {
+          code = CHAP_SUCCESS;  /* they are the same! */
+        }
+        break;
+      
+      default:
+        CHAPDEBUG(LOG_INFO, ("unknown digest type %d\n", cstate->chal_type));
+    }
+  }
+  
+  BZERO(secret, sizeof(secret));
+  ChapSendStatus(cstate, code);
+
+  if (code == CHAP_SUCCESS) {
+    old_state = cstate->serverstate;
+    cstate->serverstate = CHAPSS_OPEN;
+    if (old_state == CHAPSS_INITIAL_CHAL) {
+      auth_peer_success(cstate->unit, PPP_CHAP, rhostname, len);
+    }
+    if (cstate->chal_interval != 0) {
+      TIMEOUT(ChapRechallenge, cstate, cstate->chal_interval);
+    }
+  } else {
+    CHAPDEBUG(LOG_ERR, ("CHAP peer authentication failed\n"));
+    cstate->serverstate = CHAPSS_BADAUTH;
+    auth_peer_fail(cstate->unit, PPP_CHAP);
+  }
+}
+
+/*
+ * ChapReceiveSuccess - Receive Success
+ */
+static void
+ChapReceiveSuccess(chap_state *cstate, u_char *inp, u_char id, int len)
+{
+  LWIP_UNUSED_ARG(id);
+  LWIP_UNUSED_ARG(inp);
+
+  CHAPDEBUG(LOG_INFO, ("ChapReceiveSuccess: Rcvd id %d.\n", id));
+
+  if (cstate->clientstate == CHAPCS_OPEN) {
+    /* presumably an answer to a duplicate response */
+    return;
+  }
+
+  if (cstate->clientstate != CHAPCS_RESPONSE) {
+    /* don't know what this is */
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveSuccess: in state %d\n",
+               cstate->clientstate));
+    return;
+  }
+  
+  UNTIMEOUT(ChapResponseTimeout, cstate);
+  
+  /*
+   * Print message.
+   */
+  if (len > 0) {
+    PRINTMSG(inp, len);
+  }
+
+  cstate->clientstate = CHAPCS_OPEN;
+
+  auth_withpeer_success(cstate->unit, PPP_CHAP);
+}
+
+
+/*
+ * ChapReceiveFailure - Receive failure.
+ */
+static void
+ChapReceiveFailure(chap_state *cstate, u_char *inp, u_char id, int len)
+{
+  LWIP_UNUSED_ARG(id);
+  LWIP_UNUSED_ARG(inp);
+
+  CHAPDEBUG(LOG_INFO, ("ChapReceiveFailure: Rcvd id %d.\n", id));
+
+  if (cstate->clientstate != CHAPCS_RESPONSE) {
+    /* don't know what this is */
+    CHAPDEBUG(LOG_INFO, ("ChapReceiveFailure: in state %d\n",
+               cstate->clientstate));
+    return;
+  }
+
+  UNTIMEOUT(ChapResponseTimeout, cstate);
+
+  /*
+   * Print message.
+   */
+  if (len > 0) {
+    PRINTMSG(inp, len);
+  }
+
+  CHAPDEBUG(LOG_ERR, ("CHAP authentication failed\n"));
+  auth_withpeer_fail(cstate->unit, PPP_CHAP); /* lwip: just sets the PPP error code on this unit to PPPERR_AUTHFAIL */
+}
+
+
+/*
+ * ChapSendChallenge - Send an Authenticate challenge.
+ */
+static void
+ChapSendChallenge(chap_state *cstate)
+{
+  u_char *outp;
+  int chal_len, name_len;
+  int outlen;
+  
+  chal_len = cstate->chal_len;
+  name_len = (int)strlen(cstate->chal_name);
+  outlen = CHAP_HEADERLEN + sizeof (u_char) + chal_len + name_len;
+  outp = outpacket_buf[cstate->unit];
+
+  MAKEHEADER(outp, PPP_CHAP);    /* paste in a CHAP header */
+
+  PUTCHAR(CHAP_CHALLENGE, outp);
+  PUTCHAR(cstate->chal_id, outp);
+  PUTSHORT(outlen, outp);
+
+  PUTCHAR(chal_len, outp);    /* put length of challenge */
+  BCOPY(cstate->challenge, outp, chal_len);
+  INCPTR(chal_len, outp);
+
+  BCOPY(cstate->chal_name, outp, name_len);  /* append hostname */
+  
+  pppWrite(cstate->unit, outpacket_buf[cstate->unit], outlen + PPP_HDRLEN);
+
+  CHAPDEBUG(LOG_INFO, ("ChapSendChallenge: Sent id %d.\n", cstate->chal_id));
+  
+  TIMEOUT(ChapChallengeTimeout, cstate, cstate->timeouttime);
+  ++cstate->chal_transmits;
+}
+
+
+/*
+ * ChapSendStatus - Send a status response (ack or nak).
+ */
+static void
+ChapSendStatus(chap_state *cstate, int code)
+{
+  u_char *outp;
+  int outlen, msglen;
+  char msg[256]; /* @todo: this can be a char*, no strcpy needed */
+
+  if (code == CHAP_SUCCESS) {
+    strcpy(msg, "Welcome!");
+  } else {
+    strcpy(msg, "I don't like you.  Go 'way.");
+  }
+  msglen = (int)strlen(msg);
+
+  outlen = CHAP_HEADERLEN + msglen;
+  outp = outpacket_buf[cstate->unit];
+
+  MAKEHEADER(outp, PPP_CHAP);    /* paste in a header */
+  
+  PUTCHAR(code, outp);
+  PUTCHAR(cstate->chal_id, outp);
+  PUTSHORT(outlen, outp);
+  BCOPY(msg, outp, msglen);
+  pppWrite(cstate->unit, outpacket_buf[cstate->unit], outlen + PPP_HDRLEN);
+
+  CHAPDEBUG(LOG_INFO, ("ChapSendStatus: Sent code %d, id %d.\n", code,
+             cstate->chal_id));
+}
+
+/*
+ * ChapGenChallenge is used to generate a pseudo-random challenge string of
+ * a pseudo-random length between min_len and max_len.  The challenge
+ * string and its length are stored in *cstate, and various other fields of
+ * *cstate are initialized.
+ */
+
+static void
+ChapGenChallenge(chap_state *cstate)
+{
+  int chal_len;
+  u_char *ptr = cstate->challenge;
+  int i;
+
+  /* pick a random challenge length between MIN_CHALLENGE_LENGTH and 
+     MAX_CHALLENGE_LENGTH */  
+  chal_len = (unsigned)
+        ((((magic() >> 16) *
+              (MAX_CHALLENGE_LENGTH - MIN_CHALLENGE_LENGTH)) >> 16)
+           + MIN_CHALLENGE_LENGTH);
+  LWIP_ASSERT("chal_len <= 0xff", chal_len <= 0xffff);
+  cstate->chal_len = (u_char)chal_len;
+  cstate->chal_id = ++cstate->id;
+  cstate->chal_transmits = 0;
+
+  /* generate a random string */
+  for (i = 0; i < chal_len; i++ ) {
+    *ptr++ = (char) (magic() & 0xff);
+  }
+}
+
+/*
+ * ChapSendResponse - send a response packet with values as specified
+ * in *cstate.
+ */
+/* ARGSUSED */
+static void
+ChapSendResponse(chap_state *cstate)
+{
+  u_char *outp;
+  int outlen, md_len, name_len;
+
+  md_len = cstate->resp_length;
+  name_len = (int)strlen(cstate->resp_name);
+  outlen = CHAP_HEADERLEN + sizeof (u_char) + md_len + name_len;
+  outp = outpacket_buf[cstate->unit];
+
+  MAKEHEADER(outp, PPP_CHAP);
+  
+  PUTCHAR(CHAP_RESPONSE, outp);  /* we are a response */
+  PUTCHAR(cstate->resp_id, outp);  /* copy id from challenge packet */
+  PUTSHORT(outlen, outp);      /* packet length */
+  
+  PUTCHAR(md_len, outp);      /* length of MD */
+  BCOPY(cstate->response, outp, md_len);    /* copy MD to buffer */
+  INCPTR(md_len, outp);
+
+  BCOPY(cstate->resp_name, outp, name_len);  /* append our name */
+
+  /* send the packet */
+  pppWrite(cstate->unit, outpacket_buf[cstate->unit], outlen + PPP_HDRLEN);
+
+  cstate->clientstate = CHAPCS_RESPONSE;
+  TIMEOUT(ChapResponseTimeout, cstate, cstate->timeouttime);
+  ++cstate->resp_transmits;
+}
+
+#if PPP_ADDITIONAL_CALLBACKS
+static char *ChapCodenames[] = {
+  "Challenge", "Response", "Success", "Failure"
+};
+/*
+ * ChapPrintPkt - print the contents of a CHAP packet.
+ */
+static int
+ChapPrintPkt( u_char *p, int plen, void (*printer) (void *, char *, ...), void *arg)
+{
+  int code, id, len;
+  int clen, nlen;
+  u_char x;
+
+  if (plen < CHAP_HEADERLEN) {
+    return 0;
+  }
+  GETCHAR(code, p);
+  GETCHAR(id, p);
+  GETSHORT(len, p);
+  if (len < CHAP_HEADERLEN || len > plen) {
+    return 0;
+  }
+
+  if (code >= 1 && code <= sizeof(ChapCodenames) / sizeof(char *)) {
+    printer(arg, " %s", ChapCodenames[code-1]);
+  } else {
+    printer(arg, " code=0x%x", code);
+  }
+  printer(arg, " id=0x%x", id);
+  len -= CHAP_HEADERLEN;
+  switch (code) {
+    case CHAP_CHALLENGE:
+    case CHAP_RESPONSE:
+      if (len < 1) {
+        break;
+      }
+      clen = p[0];
+      if (len < clen + 1) {
+        break;
+      }
+      ++p;
+      nlen = len - clen - 1;
+      printer(arg, " <");
+      for (; clen > 0; --clen) {
+        GETCHAR(x, p);
+        printer(arg, "%.2x", x);
+      }
+      printer(arg, ">, name = %.*Z", nlen, p);
+      break;
+    case CHAP_FAILURE:
+    case CHAP_SUCCESS:
+      printer(arg, " %.*Z", len, p);
+      break;
+    default:
+      for (clen = len; clen > 0; --clen) {
+        GETCHAR(x, p);
+        printer(arg, " %.2x", x);
+      }
+  }
+
+  return len + CHAP_HEADERLEN;
+}
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+
+#endif /* CHAP_SUPPORT */
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/chap.h b/ext/lwip/src/netif/ppp/chap.h
new file mode 100644
index 000000000..fedcab8da
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/chap.h
@@ -0,0 +1,150 @@
+/*****************************************************************************
+* chap.h - Network Challenge Handshake Authentication Protocol header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1998 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-03 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original built from BSD network code.
+******************************************************************************/
+/*
+ * chap.h - Challenge Handshake Authentication Protocol definitions.
+ *
+ * Copyright (c) 1993 The Australian National University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the Australian National University.  The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Copyright (c) 1991 Gregory M. Christy
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the author.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Id: chap.h,v 1.6 2010/01/24 13:19:34 goldsimon Exp $
+ */
+
+#ifndef CHAP_H
+#define CHAP_H
+
+/* Code + ID + length */
+#define CHAP_HEADERLEN 4
+
+/*
+ * CHAP codes.
+ */
+
+#define CHAP_DIGEST_MD5      5    /* use MD5 algorithm */
+#define MD5_SIGNATURE_SIZE   16   /* 16 bytes in a MD5 message digest */
+#define CHAP_MICROSOFT       0x80 /* use Microsoft-compatible alg. */
+#define MS_CHAP_RESPONSE_LEN 49   /* Response length for MS-CHAP */
+
+#define CHAP_CHALLENGE       1
+#define CHAP_RESPONSE        2
+#define CHAP_SUCCESS         3
+#define CHAP_FAILURE         4
+
+/*
+ *  Challenge lengths (for challenges we send) and other limits.
+ */
+#define MIN_CHALLENGE_LENGTH 32
+#define MAX_CHALLENGE_LENGTH 64
+#define MAX_RESPONSE_LENGTH  64 /* sufficient for MD5 or MS-CHAP */
+
+/*
+ * Each interface is described by a chap structure.
+ */
+
+typedef struct chap_state {
+  int unit;                               /* Interface unit number */
+  int clientstate;                        /* Client state */
+  int serverstate;                        /* Server state */
+  u_char challenge[MAX_CHALLENGE_LENGTH]; /* last challenge string sent */
+  u_char chal_len;                        /* challenge length */
+  u_char chal_id;                         /* ID of last challenge */
+  u_char chal_type;                       /* hash algorithm for challenges */
+  u_char id;                              /* Current id */
+  char *chal_name;                        /* Our name to use with challenge */
+  int chal_interval;                      /* Time until we challenge peer again */
+  int timeouttime;                        /* Timeout time in seconds */
+  int max_transmits;                      /* Maximum # of challenge transmissions */
+  int chal_transmits;                     /* Number of transmissions of challenge */
+  int resp_transmits;                     /* Number of transmissions of response */
+  u_char response[MAX_RESPONSE_LENGTH];   /* Response to send */
+  u_char resp_length;                     /* length of response */
+  u_char resp_id;                         /* ID for response messages */
+  u_char resp_type;                       /* hash algorithm for responses */
+  char *resp_name;                        /* Our name to send with response */
+} chap_state;
+
+
+/*
+ * Client (peer) states.
+ */
+#define CHAPCS_INITIAL       0 /* Lower layer down, not opened */
+#define CHAPCS_CLOSED        1 /* Lower layer up, not opened */
+#define CHAPCS_PENDING       2 /* Auth us to peer when lower up */
+#define CHAPCS_LISTEN        3 /* Listening for a challenge */
+#define CHAPCS_RESPONSE      4 /* Sent response, waiting for status */
+#define CHAPCS_OPEN          5 /* We've received Success */
+
+/*
+ * Server (authenticator) states.
+ */
+#define CHAPSS_INITIAL       0 /* Lower layer down, not opened */
+#define CHAPSS_CLOSED        1 /* Lower layer up, not opened */
+#define CHAPSS_PENDING       2 /* Auth peer when lower up */
+#define CHAPSS_INITIAL_CHAL  3 /* We've sent the first challenge */
+#define CHAPSS_OPEN          4 /* We've sent a Success msg */
+#define CHAPSS_RECHALLENGE   5 /* We've sent another challenge */
+#define CHAPSS_BADAUTH       6 /* We've sent a Failure msg */
+
+extern chap_state chap[];
+
+void ChapAuthWithPeer (int, char *, u_char);
+void ChapAuthPeer (int, char *, u_char);
+
+extern struct protent chap_protent;
+
+#endif /* CHAP_H */
diff --git a/ext/lwip/src/netif/ppp/chpms.c b/ext/lwip/src/netif/ppp/chpms.c
new file mode 100644
index 000000000..81a887b83
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/chpms.c
@@ -0,0 +1,396 @@
+/*** WARNING - THIS CODE HAS NOT BEEN FINISHED! ***/
+/*** The original PPPD code is written in a way to require either the UNIX DES
+     encryption functions encrypt(3) and setkey(3) or the DES library libdes.
+     Since both is not included in lwIP, MSCHAP currently does not work! */
+/*****************************************************************************
+* chpms.c - Network MicroSoft Challenge Handshake Authentication Protocol program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* Copyright (c) 1997 by Global Election Systems Inc.  All rights reserved.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-08 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original based on BSD chap_ms.c.
+*****************************************************************************/
+/*
+ * chap_ms.c - Microsoft MS-CHAP compatible implementation.
+ *
+ * Copyright (c) 1995 Eric Rosenquist, Strata Software Limited.
+ * http://www.strataware.com/
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Eric Rosenquist.  The name of the author may not be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/*
+ * Modifications by Lauri Pesonen / lpesonen@clinet.fi, april 1997
+ *
+ *   Implemented LANManager type password response to MS-CHAP challenges.
+ *   Now pppd provides both NT style and LANMan style blocks, and the
+ *   prefered is set by option "ms-lanman". Default is to use NT.
+ *   The hash text (StdText) was taken from Win95 RASAPI32.DLL.
+ *
+ *   You should also use DOMAIN\\USERNAME as described in README.MSCHAP80
+ */
+
+#define USE_CRYPT
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#if MSCHAP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "md4.h"
+#ifndef USE_CRYPT
+#include "des.h"
+#endif
+#include "chap.h"
+#include "chpms.h"
+
+#include <string.h>
+
+
+/*************************/
+/*** LOCAL DEFINITIONS ***/
+/*************************/
+
+
+/************************/
+/*** LOCAL DATA TYPES ***/
+/************************/
+typedef struct {
+    u_char LANManResp[24];
+    u_char NTResp[24];
+    u_char UseNT; /* If 1, ignore the LANMan response field */
+} MS_ChapResponse;
+/* We use MS_CHAP_RESPONSE_LEN, rather than sizeof(MS_ChapResponse),
+   in case this struct gets padded. */
+
+
+
+/***********************************/
+/*** LOCAL FUNCTION DECLARATIONS ***/
+/***********************************/
+
+/* XXX Don't know what to do with these. */
+extern void setkey(const char *);
+extern void encrypt(char *, int);
+
+static void DesEncrypt (u_char *, u_char *, u_char *);
+static void MakeKey (u_char *, u_char *);
+
+#ifdef USE_CRYPT
+static void Expand (u_char *, u_char *);
+static void Collapse (u_char *, u_char *);
+#endif
+
+static void ChallengeResponse(
+  u_char *challenge, /* IN   8 octets */
+  u_char *pwHash,    /* IN  16 octets */
+  u_char *response   /* OUT 24 octets */
+);
+static void ChapMS_NT(
+  char *rchallenge,
+  int rchallenge_len,
+  char *secret,
+  int secret_len,
+  MS_ChapResponse *response
+);
+static u_char Get7Bits(
+  u_char *input,
+  int startBit
+);
+
+static void
+ChallengeResponse( u_char *challenge, /* IN   8 octets */
+                   u_char *pwHash,    /* IN  16 octets */
+                   u_char *response   /* OUT 24 octets */)
+{
+  u_char    ZPasswordHash[21];
+
+  BZERO(ZPasswordHash, sizeof(ZPasswordHash));
+  BCOPY(pwHash, ZPasswordHash, 16);
+
+#if 0
+  log_packet(ZPasswordHash, sizeof(ZPasswordHash), "ChallengeResponse - ZPasswordHash", LOG_DEBUG);
+#endif
+
+  DesEncrypt(challenge, ZPasswordHash +  0, response + 0);
+  DesEncrypt(challenge, ZPasswordHash +  7, response + 8);
+  DesEncrypt(challenge, ZPasswordHash + 14, response + 16);
+
+#if 0
+  log_packet(response, 24, "ChallengeResponse - response", LOG_DEBUG);
+#endif
+}
+
+
+#ifdef USE_CRYPT
+static void
+DesEncrypt( u_char *clear, /* IN  8 octets */
+            u_char *key,   /* IN  7 octets */
+            u_char *cipher /* OUT 8 octets */)
+{
+  u_char des_key[8];
+  u_char crypt_key[66];
+  u_char des_input[66];
+
+  MakeKey(key, des_key);
+
+  Expand(des_key, crypt_key);
+  setkey((char*)crypt_key);
+
+#if 0
+  CHAPDEBUG(LOG_INFO, ("DesEncrypt: 8 octet input : %02X%02X%02X%02X%02X%02X%02X%02X\n",
+             clear[0], clear[1], clear[2], clear[3], clear[4], clear[5], clear[6], clear[7]));
+#endif
+
+  Expand(clear, des_input);
+  encrypt((char*)des_input, 0);
+  Collapse(des_input, cipher);
+
+#if 0
+  CHAPDEBUG(LOG_INFO, ("DesEncrypt: 8 octet output: %02X%02X%02X%02X%02X%02X%02X%02X\n",
+             cipher[0], cipher[1], cipher[2], cipher[3], cipher[4], cipher[5], cipher[6], cipher[7]));
+#endif
+}
+
+#else /* USE_CRYPT */
+
+static void
+DesEncrypt( u_char *clear, /* IN  8 octets */
+            u_char *key,   /* IN  7 octets */
+            u_char *cipher /* OUT 8 octets */)
+{
+  des_cblock    des_key;
+  des_key_schedule  key_schedule;
+
+  MakeKey(key, des_key);
+
+  des_set_key(&des_key, key_schedule);
+
+#if 0
+  CHAPDEBUG(LOG_INFO, ("DesEncrypt: 8 octet input : %02X%02X%02X%02X%02X%02X%02X%02X\n",
+             clear[0], clear[1], clear[2], clear[3], clear[4], clear[5], clear[6], clear[7]));
+#endif
+
+  des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, key_schedule, 1);
+
+#if 0
+  CHAPDEBUG(LOG_INFO, ("DesEncrypt: 8 octet output: %02X%02X%02X%02X%02X%02X%02X%02X\n",
+             cipher[0], cipher[1], cipher[2], cipher[3], cipher[4], cipher[5], cipher[6], cipher[7]));
+#endif
+}
+
+#endif /* USE_CRYPT */
+
+
+static u_char
+Get7Bits( u_char *input, int startBit)
+{
+  register unsigned int  word;
+
+  word  = (unsigned)input[startBit / 8] << 8;
+  word |= (unsigned)input[startBit / 8 + 1];
+
+  word >>= 15 - (startBit % 8 + 7);
+
+  return word & 0xFE;
+}
+
+#ifdef USE_CRYPT
+
+/* in == 8-byte string (expanded version of the 56-bit key)
+ * out == 64-byte string where each byte is either 1 or 0
+ * Note that the low-order "bit" is always ignored by by setkey()
+ */
+static void
+Expand(u_char *in, u_char *out)
+{
+  int j, c;
+  int i;
+
+  for(i = 0; i < 64; in++){
+    c = *in;
+    for(j = 7; j >= 0; j--) {
+      *out++ = (c >> j) & 01;
+    }
+    i += 8;
+  }
+}
+
+/* The inverse of Expand
+ */
+static void
+Collapse(u_char *in, u_char *out)
+{
+  int j;
+  int i;
+  unsigned int c;
+
+  for (i = 0; i < 64; i += 8, out++) {
+    c = 0;
+    for (j = 7; j >= 0; j--, in++) {
+      c |= *in << j;
+    }
+    *out = c & 0xff;
+  }
+}
+#endif
+
+static void
+MakeKey( u_char *key,    /* IN  56 bit DES key missing parity bits */
+         u_char *des_key /* OUT 64 bit DES key with parity bits added */)
+{
+  des_key[0] = Get7Bits(key,  0);
+  des_key[1] = Get7Bits(key,  7);
+  des_key[2] = Get7Bits(key, 14);
+  des_key[3] = Get7Bits(key, 21);
+  des_key[4] = Get7Bits(key, 28);
+  des_key[5] = Get7Bits(key, 35);
+  des_key[6] = Get7Bits(key, 42);
+  des_key[7] = Get7Bits(key, 49);
+  
+#ifndef USE_CRYPT
+  des_set_odd_parity((des_cblock *)des_key);
+#endif
+  
+#if 0
+  CHAPDEBUG(LOG_INFO, ("MakeKey: 56-bit input : %02X%02X%02X%02X%02X%02X%02X\n",
+             key[0], key[1], key[2], key[3], key[4], key[5], key[6]));
+  CHAPDEBUG(LOG_INFO, ("MakeKey: 64-bit output: %02X%02X%02X%02X%02X%02X%02X%02X\n",
+             des_key[0], des_key[1], des_key[2], des_key[3], des_key[4], des_key[5], des_key[6], des_key[7]));
+#endif
+}
+
+static void
+ChapMS_NT( char *rchallenge,
+           int rchallenge_len,
+           char *secret,
+           int secret_len,
+           MS_ChapResponse *response)
+{
+  int      i;
+  MDstruct  md4Context;
+  u_char    unicodePassword[MAX_NT_PASSWORD * 2];
+  static int  low_byte_first = -1;
+
+  LWIP_UNUSED_ARG(rchallenge_len);
+
+  /* Initialize the Unicode version of the secret (== password). */
+  /* This implicitly supports 8-bit ISO8859/1 characters. */
+  BZERO(unicodePassword, sizeof(unicodePassword));
+  for (i = 0; i < secret_len; i++) {
+    unicodePassword[i * 2] = (u_char)secret[i];
+  }
+  MDbegin(&md4Context);
+  MDupdate(&md4Context, unicodePassword, secret_len * 2 * 8);  /* Unicode is 2 bytes/char, *8 for bit count */
+
+  if (low_byte_first == -1) {
+    low_byte_first = (PP_HTONS((unsigned short int)1) != 1);
+  }
+  if (low_byte_first == 0) {
+    /* @todo: arg type - u_long* or u_int* ? */
+    MDreverse((unsigned int*)&md4Context);  /*  sfb 961105 */
+  }
+
+  MDupdate(&md4Context, NULL, 0);  /* Tell MD4 we're done */
+
+  ChallengeResponse((u_char*)rchallenge, (u_char*)md4Context.buffer, response->NTResp);
+}
+
+#ifdef MSLANMAN
+static u_char *StdText = (u_char *)"KGS!@#$%"; /* key from rasapi32.dll */
+
+static void
+ChapMS_LANMan( char *rchallenge,
+               int rchallenge_len,
+               char *secret,
+               int secret_len,
+               MS_ChapResponse  *response)
+{
+  int      i;
+  u_char    UcasePassword[MAX_NT_PASSWORD]; /* max is actually 14 */
+  u_char    PasswordHash[16];
+  
+  /* LANMan password is case insensitive */
+  BZERO(UcasePassword, sizeof(UcasePassword));
+  for (i = 0; i < secret_len; i++) {
+    UcasePassword[i] = (u_char)toupper(secret[i]);
+  }
+  DesEncrypt( StdText, UcasePassword + 0, PasswordHash + 0 );
+  DesEncrypt( StdText, UcasePassword + 7, PasswordHash + 8 );
+  ChallengeResponse(rchallenge, PasswordHash, response->LANManResp);
+}
+#endif
+
+void
+ChapMS( chap_state *cstate, char *rchallenge, int rchallenge_len, char *secret, int secret_len)
+{
+  MS_ChapResponse response;
+#ifdef MSLANMAN
+  extern int ms_lanman;
+#endif
+
+#if 0
+  CHAPDEBUG(LOG_INFO, ("ChapMS: secret is '%.*s'\n", secret_len, secret));
+#endif
+  BZERO(&response, sizeof(response));
+
+  /* Calculate both always */
+  ChapMS_NT(rchallenge, rchallenge_len, secret, secret_len, &response);
+
+#ifdef MSLANMAN
+  ChapMS_LANMan(rchallenge, rchallenge_len, secret, secret_len, &response);
+
+  /* prefered method is set by option  */
+  response.UseNT = !ms_lanman;
+#else
+  response.UseNT = 1;
+#endif
+
+  BCOPY(&response, cstate->response, MS_CHAP_RESPONSE_LEN);
+  cstate->resp_length = MS_CHAP_RESPONSE_LEN;
+}
+
+#endif /* MSCHAP_SUPPORT */
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/chpms.h b/ext/lwip/src/netif/ppp/chpms.h
new file mode 100644
index 000000000..df070fb35
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/chpms.h
@@ -0,0 +1,64 @@
+/*****************************************************************************
+* chpms.h - Network Microsoft Challenge Handshake Protocol header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1998 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 98-01-30 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original built from BSD network code.
+******************************************************************************/
+/*
+ * chap.h - Challenge Handshake Authentication Protocol definitions.
+ *
+ * Copyright (c) 1995 Eric Rosenquist, Strata Software Limited.
+ * http://www.strataware.com/
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Eric Rosenquist.  The name of the author may not be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Id: chpms.h,v 1.5 2007/12/19 20:47:23 fbernon Exp $
+ */
+
+#ifndef CHPMS_H
+#define CHPMS_H
+
+#define MAX_NT_PASSWORD 256 /* Maximum number of (Unicode) chars in an NT password */
+
+void ChapMS (chap_state *, char *, int, char *, int);
+
+#endif /* CHPMS_H */
diff --git a/ext/lwip/src/netif/ppp/fsm.c b/ext/lwip/src/netif/ppp/fsm.c
new file mode 100644
index 000000000..e8a254ede
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/fsm.c
@@ -0,0 +1,890 @@
+/*****************************************************************************
+* fsm.c - Network Control Protocol Finite State Machine program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 by Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-01 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original based on BSD fsm.c.
+*****************************************************************************/
+/*
+ * fsm.c - {Link, IP} Control Protocol Finite State Machine.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/*
+ * TODO:
+ * Randomize fsm id on link/init.
+ * Deal with variable outgoing MTU.
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "fsm.h"
+
+#include <string.h>
+
+#if PPP_DEBUG
+static const char *ppperr_strerr[] = {
+           "LS_INITIAL",  /* LS_INITIAL  0 */
+           "LS_STARTING", /* LS_STARTING 1 */
+           "LS_CLOSED",   /* LS_CLOSED   2 */
+           "LS_STOPPED",  /* LS_STOPPED  3 */
+           "LS_CLOSING",  /* LS_CLOSING  4 */
+           "LS_STOPPING", /* LS_STOPPING 5 */
+           "LS_REQSENT",  /* LS_REQSENT  6 */
+           "LS_ACKRCVD",  /* LS_ACKRCVD  7 */
+           "LS_ACKSENT",  /* LS_ACKSENT  8 */
+           "LS_OPENED"    /* LS_OPENED   9 */
+};
+#endif /* PPP_DEBUG */
+
+static void fsm_timeout (void *);
+static void fsm_rconfreq (fsm *, u_char, u_char *, int);
+static void fsm_rconfack (fsm *, int, u_char *, int);
+static void fsm_rconfnakrej (fsm *, int, int, u_char *, int);
+static void fsm_rtermreq (fsm *, int, u_char *, int);
+static void fsm_rtermack (fsm *);
+static void fsm_rcoderej (fsm *, u_char *, int);
+static void fsm_sconfreq (fsm *, int);
+
+#define PROTO_NAME(f) ((f)->callbacks->proto_name)
+
+int peer_mru[NUM_PPP];
+
+
+/*
+ * fsm_init - Initialize fsm.
+ *
+ * Initialize fsm state.
+ */
+void
+fsm_init(fsm *f)
+{
+  f->state = LS_INITIAL;
+  f->flags = 0;
+  f->id = 0;        /* XXX Start with random id? */
+  f->timeouttime = FSM_DEFTIMEOUT;
+  f->maxconfreqtransmits = FSM_DEFMAXCONFREQS;
+  f->maxtermtransmits = FSM_DEFMAXTERMREQS;
+  f->maxnakloops = FSM_DEFMAXNAKLOOPS;
+  f->term_reason_len = 0;
+}
+
+
+/*
+ * fsm_lowerup - The lower layer is up.
+ */
+void
+fsm_lowerup(fsm *f)
+{
+  int oldState = f->state;
+
+  LWIP_UNUSED_ARG(oldState);
+
+  switch( f->state ) {
+    case LS_INITIAL:
+      f->state = LS_CLOSED;
+      break;
+
+    case LS_STARTING:
+      if( f->flags & OPT_SILENT ) {
+        f->state = LS_STOPPED;
+      } else {
+        /* Send an initial configure-request */
+        fsm_sconfreq(f, 0);
+        f->state = LS_REQSENT;
+      }
+    break;
+
+    default:
+      FSMDEBUG(LOG_INFO, ("%s: Up event in state %d (%s)!\n",
+          PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+  }
+
+  FSMDEBUG(LOG_INFO, ("%s: lowerup state %d (%s) -> %d (%s)\n",
+      PROTO_NAME(f), oldState, ppperr_strerr[oldState], f->state, ppperr_strerr[f->state]));
+}
+
+
+/*
+ * fsm_lowerdown - The lower layer is down.
+ *
+ * Cancel all timeouts and inform upper layers.
+ */
+void
+fsm_lowerdown(fsm *f)
+{
+  int oldState = f->state;
+
+  LWIP_UNUSED_ARG(oldState);
+
+  switch( f->state ) {
+    case LS_CLOSED:
+      f->state = LS_INITIAL;
+      break;
+
+    case LS_STOPPED:
+      f->state = LS_STARTING;
+      if( f->callbacks->starting ) {
+        (*f->callbacks->starting)(f);
+      }
+      break;
+
+    case LS_CLOSING:
+      f->state = LS_INITIAL;
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      break;
+
+    case LS_STOPPING:
+    case LS_REQSENT:
+    case LS_ACKRCVD:
+    case LS_ACKSENT:
+      f->state = LS_STARTING;
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      break;
+
+    case LS_OPENED:
+      if( f->callbacks->down ) {
+        (*f->callbacks->down)(f);
+      }
+      f->state = LS_STARTING;
+      break;
+
+    default:
+      FSMDEBUG(LOG_INFO, ("%s: Down event in state %d (%s)!\n",
+          PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+  }
+
+  FSMDEBUG(LOG_INFO, ("%s: lowerdown state %d (%s) -> %d (%s)\n",
+      PROTO_NAME(f), oldState, ppperr_strerr[oldState], f->state, ppperr_strerr[f->state]));
+}
+
+
+/*
+ * fsm_open - Link is allowed to come up.
+ */
+void
+fsm_open(fsm *f)
+{
+  int oldState = f->state;
+
+  LWIP_UNUSED_ARG(oldState);
+
+  switch( f->state ) {
+    case LS_INITIAL:
+      f->state = LS_STARTING;
+      if( f->callbacks->starting ) {
+        (*f->callbacks->starting)(f);
+      }
+      break;
+
+    case LS_CLOSED:
+      if( f->flags & OPT_SILENT ) {
+        f->state = LS_STOPPED;
+      } else {
+        /* Send an initial configure-request */
+        fsm_sconfreq(f, 0);
+        f->state = LS_REQSENT;
+      }
+      break;
+  
+    case LS_CLOSING:
+      f->state = LS_STOPPING;
+      /* fall through */
+    case LS_STOPPED:
+    case LS_OPENED:
+      if( f->flags & OPT_RESTART ) {
+        fsm_lowerdown(f);
+        fsm_lowerup(f);
+      }
+      break;
+  }
+
+  FSMDEBUG(LOG_INFO, ("%s: open state %d (%s) -> %d (%s)\n",
+      PROTO_NAME(f), oldState, ppperr_strerr[oldState], f->state, ppperr_strerr[f->state]));
+}
+
+#if 0 /* backport pppd 2.4.4b1; */
+/*
+ * terminate_layer - Start process of shutting down the FSM
+ *
+ * Cancel any timeout running, notify upper layers we're done, and
+ * send a terminate-request message as configured.
+ */
+static void
+terminate_layer(fsm *f, int nextstate)
+{
+  /* @todo */
+}
+#endif
+
+/*
+ * fsm_close - Start closing connection.
+ *
+ * Cancel timeouts and either initiate close or possibly go directly to
+ * the LS_CLOSED state.
+ */
+void
+fsm_close(fsm *f, char *reason)
+{
+  int oldState = f->state;
+
+  LWIP_UNUSED_ARG(oldState);
+
+  f->term_reason = reason;
+  f->term_reason_len = (reason == NULL ? 0 : (int)strlen(reason));
+  switch( f->state ) {
+    case LS_STARTING:
+      f->state = LS_INITIAL;
+      break;
+    case LS_STOPPED:
+      f->state = LS_CLOSED;
+      break;
+    case LS_STOPPING:
+      f->state = LS_CLOSING;
+      break;
+
+    case LS_REQSENT:
+    case LS_ACKRCVD:
+    case LS_ACKSENT:
+    case LS_OPENED:
+      if( f->state != LS_OPENED ) {
+        UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      } else if( f->callbacks->down ) {
+        (*f->callbacks->down)(f);  /* Inform upper layers we're down */
+      }
+      /* Init restart counter, send Terminate-Request */
+      f->retransmits = f->maxtermtransmits;
+      fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
+            (u_char *) f->term_reason, f->term_reason_len);
+      TIMEOUT(fsm_timeout, f, f->timeouttime);
+      --f->retransmits;
+
+      f->state = LS_CLOSING;
+      break;
+  }
+
+  FSMDEBUG(LOG_INFO, ("%s: close reason=%s state %d (%s) -> %d (%s)\n",
+      PROTO_NAME(f), reason, oldState, ppperr_strerr[oldState], f->state, ppperr_strerr[f->state]));
+}
+
+
+/*
+ * fsm_timeout - Timeout expired.
+ */
+static void
+fsm_timeout(void *arg)
+{
+  fsm *f = (fsm *) arg;
+
+  switch (f->state) {
+    case LS_CLOSING:
+    case LS_STOPPING:
+      if( f->retransmits <= 0 ) {
+        FSMDEBUG(LOG_WARNING, ("%s: timeout sending Terminate-Request state=%d (%s)\n",
+             PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+        /*
+         * We've waited for an ack long enough.  Peer probably heard us.
+         */
+        f->state = (f->state == LS_CLOSING)? LS_CLOSED: LS_STOPPED;
+        if( f->callbacks->finished ) {
+          (*f->callbacks->finished)(f);
+        }
+      } else {
+        FSMDEBUG(LOG_WARNING, ("%s: timeout resending Terminate-Requests state=%d (%s)\n",
+             PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+        /* Send Terminate-Request */
+        fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
+            (u_char *) f->term_reason, f->term_reason_len);
+        TIMEOUT(fsm_timeout, f, f->timeouttime);
+        --f->retransmits;
+      }
+      break;
+
+    case LS_REQSENT:
+    case LS_ACKRCVD:
+    case LS_ACKSENT:
+      if (f->retransmits <= 0) {
+        FSMDEBUG(LOG_WARNING, ("%s: timeout sending Config-Requests state=%d (%s)\n",
+         PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+        f->state = LS_STOPPED;
+        if( (f->flags & OPT_PASSIVE) == 0 && f->callbacks->finished ) {
+          (*f->callbacks->finished)(f);
+        }
+      } else {
+        FSMDEBUG(LOG_WARNING, ("%s: timeout resending Config-Request state=%d (%s)\n",
+         PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+        /* Retransmit the configure-request */
+        if (f->callbacks->retransmit) {
+          (*f->callbacks->retransmit)(f);
+        }
+        fsm_sconfreq(f, 1);    /* Re-send Configure-Request */
+        if( f->state == LS_ACKRCVD ) {
+          f->state = LS_REQSENT;
+        }
+      }
+      break;
+
+    default:
+      FSMDEBUG(LOG_INFO, ("%s: UNHANDLED timeout event in state %d (%s)!\n",
+          PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+  }
+}
+
+
+/*
+ * fsm_input - Input packet.
+ */
+void
+fsm_input(fsm *f, u_char *inpacket, int l)
+{
+  u_char *inp = inpacket;
+  u_char code, id;
+  int len;
+
+  /*
+  * Parse header (code, id and length).
+  * If packet too short, drop it.
+  */
+  if (l < HEADERLEN) {
+    FSMDEBUG(LOG_WARNING, ("fsm_input(%x): Rcvd short header.\n",
+          f->protocol));
+    return;
+  }
+  GETCHAR(code, inp);
+  GETCHAR(id, inp);
+  GETSHORT(len, inp);
+  if (len < HEADERLEN) {
+    FSMDEBUG(LOG_INFO, ("fsm_input(%x): Rcvd illegal length.\n",
+        f->protocol));
+    return;
+  }
+  if (len > l) {
+    FSMDEBUG(LOG_INFO, ("fsm_input(%x): Rcvd short packet.\n",
+        f->protocol));
+    return;
+  }
+  len -= HEADERLEN;    /* subtract header length */
+
+  if( f->state == LS_INITIAL || f->state == LS_STARTING ) {
+    FSMDEBUG(LOG_INFO, ("fsm_input(%x): Rcvd packet in state %d (%s).\n",
+        f->protocol, f->state, ppperr_strerr[f->state]));
+    return;
+  }
+  FSMDEBUG(LOG_INFO, ("fsm_input(%s):%d,%d,%d\n", PROTO_NAME(f), code, id, l));
+  /*
+   * Action depends on code.
+   */
+  switch (code) {
+    case CONFREQ:
+      fsm_rconfreq(f, id, inp, len);
+      break;
+    
+    case CONFACK:
+      fsm_rconfack(f, id, inp, len);
+      break;
+    
+    case CONFNAK:
+    case CONFREJ:
+      fsm_rconfnakrej(f, code, id, inp, len);
+      break;
+    
+    case TERMREQ:
+      fsm_rtermreq(f, id, inp, len);
+      break;
+    
+    case TERMACK:
+      fsm_rtermack(f);
+      break;
+    
+    case CODEREJ:
+      fsm_rcoderej(f, inp, len);
+      break;
+    
+    default:
+      FSMDEBUG(LOG_INFO, ("fsm_input(%s): default: \n", PROTO_NAME(f)));
+      if( !f->callbacks->extcode ||
+          !(*f->callbacks->extcode)(f, code, id, inp, len) ) {
+        fsm_sdata(f, CODEREJ, ++f->id, inpacket, len + HEADERLEN);
+      }
+      break;
+  }
+}
+
+
+/*
+ * fsm_rconfreq - Receive Configure-Request.
+ */
+static void
+fsm_rconfreq(fsm *f, u_char id, u_char *inp, int len)
+{
+  int code, reject_if_disagree;
+
+  FSMDEBUG(LOG_INFO, ("fsm_rconfreq(%s): Rcvd id %d state=%d (%s)\n", 
+        PROTO_NAME(f), id, f->state, ppperr_strerr[f->state]));
+  switch( f->state ) {
+    case LS_CLOSED:
+      /* Go away, we're closed */
+      fsm_sdata(f, TERMACK, id, NULL, 0);
+      return;
+    case LS_CLOSING:
+    case LS_STOPPING:
+      return;
+
+    case LS_OPENED:
+      /* Go down and restart negotiation */
+      if( f->callbacks->down ) {
+        (*f->callbacks->down)(f);  /* Inform upper layers */
+      }
+      fsm_sconfreq(f, 0);    /* Send initial Configure-Request */
+      break;
+
+    case LS_STOPPED:
+      /* Negotiation started by our peer */
+      fsm_sconfreq(f, 0);    /* Send initial Configure-Request */
+      f->state = LS_REQSENT;
+      break;
+  }
+  
+  /*
+  * Pass the requested configuration options
+  * to protocol-specific code for checking.
+  */
+  if (f->callbacks->reqci) {    /* Check CI */
+    reject_if_disagree = (f->nakloops >= f->maxnakloops);
+    code = (*f->callbacks->reqci)(f, inp, &len, reject_if_disagree);
+  } else if (len) {
+    code = CONFREJ;      /* Reject all CI */
+  } else {
+    code = CONFACK;
+  }
+  
+  /* send the Ack, Nak or Rej to the peer */
+  fsm_sdata(f, (u_char)code, id, inp, len);
+  
+  if (code == CONFACK) {
+    if (f->state == LS_ACKRCVD) {
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      f->state = LS_OPENED;
+      if (f->callbacks->up) {
+        (*f->callbacks->up)(f);  /* Inform upper layers */
+      }
+    } else {
+      f->state = LS_ACKSENT;
+    }
+    f->nakloops = 0;
+  } else {
+    /* we sent CONFACK or CONFREJ */
+    if (f->state != LS_ACKRCVD) {
+      f->state = LS_REQSENT;
+    }
+    if( code == CONFNAK ) {
+      ++f->nakloops;
+    }
+  }
+}
+
+
+/*
+ * fsm_rconfack - Receive Configure-Ack.
+ */
+static void
+fsm_rconfack(fsm *f, int id, u_char *inp, int len)
+{
+  FSMDEBUG(LOG_INFO, ("fsm_rconfack(%s): Rcvd id %d state=%d (%s)\n",
+        PROTO_NAME(f), id, f->state, ppperr_strerr[f->state]));
+  
+  if (id != f->reqid || f->seen_ack) {   /* Expected id? */
+    return; /* Nope, toss... */
+  }
+  if( !(f->callbacks->ackci? (*f->callbacks->ackci)(f, inp, len): (len == 0)) ) {
+    /* Ack is bad - ignore it */
+    FSMDEBUG(LOG_INFO, ("%s: received bad Ack (length %d)\n",
+          PROTO_NAME(f), len));
+    return;
+  }
+  f->seen_ack = 1;
+  
+  switch (f->state) {
+    case LS_CLOSED:
+    case LS_STOPPED:
+      fsm_sdata(f, TERMACK, (u_char)id, NULL, 0);
+      break;
+    
+    case LS_REQSENT:
+      f->state = LS_ACKRCVD;
+      f->retransmits = f->maxconfreqtransmits;
+      break;
+    
+    case LS_ACKRCVD:
+      /* Huh? an extra valid Ack? oh well... */
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      fsm_sconfreq(f, 0);
+      f->state = LS_REQSENT;
+      break;
+    
+    case LS_ACKSENT:
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      f->state = LS_OPENED;
+      f->retransmits = f->maxconfreqtransmits;
+      if (f->callbacks->up) {
+        (*f->callbacks->up)(f);  /* Inform upper layers */
+      }
+      break;
+    
+    case LS_OPENED:
+      /* Go down and restart negotiation */
+      if (f->callbacks->down) {
+        (*f->callbacks->down)(f);  /* Inform upper layers */
+      }
+      fsm_sconfreq(f, 0);    /* Send initial Configure-Request */
+      f->state = LS_REQSENT;
+      break;
+  }
+}
+
+
+/*
+ * fsm_rconfnakrej - Receive Configure-Nak or Configure-Reject.
+ */
+static void
+fsm_rconfnakrej(fsm *f, int code, int id, u_char *inp, int len)
+{
+  int (*proc) (fsm *, u_char *, int);
+  int ret;
+
+  FSMDEBUG(LOG_INFO, ("fsm_rconfnakrej(%s): Rcvd id %d state=%d (%s)\n",
+        PROTO_NAME(f), id, f->state, ppperr_strerr[f->state]));
+
+  if (id != f->reqid || f->seen_ack) { /* Expected id? */
+    return;        /* Nope, toss... */
+  }
+  proc = (code == CONFNAK)? f->callbacks->nakci: f->callbacks->rejci;
+  if (!proc || !((ret = proc(f, inp, len)))) {
+    /* Nak/reject is bad - ignore it */
+    FSMDEBUG(LOG_INFO, ("%s: received bad %s (length %d)\n",
+          PROTO_NAME(f), (code==CONFNAK? "Nak": "reject"), len));
+    return;
+  }
+  f->seen_ack = 1;
+
+  switch (f->state) {
+    case LS_CLOSED:
+    case LS_STOPPED:
+      fsm_sdata(f, TERMACK, (u_char)id, NULL, 0);
+      break;
+    
+    case LS_REQSENT:
+    case LS_ACKSENT:
+      /* They didn't agree to what we wanted - try another request */
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      if (ret < 0) {
+        f->state = LS_STOPPED;    /* kludge for stopping CCP */
+      } else {
+        fsm_sconfreq(f, 0);    /* Send Configure-Request */
+      }
+      break;
+    
+    case LS_ACKRCVD:
+      /* Got a Nak/reject when we had already had an Ack?? oh well... */
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      fsm_sconfreq(f, 0);
+      f->state = LS_REQSENT;
+      break;
+    
+    case LS_OPENED:
+      /* Go down and restart negotiation */
+      if (f->callbacks->down) {
+        (*f->callbacks->down)(f);  /* Inform upper layers */
+      }
+      fsm_sconfreq(f, 0);    /* Send initial Configure-Request */
+      f->state = LS_REQSENT;
+      break;
+  }
+}
+
+
+/*
+ * fsm_rtermreq - Receive Terminate-Req.
+ */
+static void
+fsm_rtermreq(fsm *f, int id, u_char *p, int len)
+{
+  LWIP_UNUSED_ARG(p);
+
+  FSMDEBUG(LOG_INFO, ("fsm_rtermreq(%s): Rcvd id %d state=%d (%s)\n",
+        PROTO_NAME(f), id, f->state, ppperr_strerr[f->state]));
+
+  switch (f->state) {
+    case LS_ACKRCVD:
+    case LS_ACKSENT:
+      f->state = LS_REQSENT;    /* Start over but keep trying */
+      break;
+
+    case LS_OPENED:
+      if (len > 0) {
+        FSMDEBUG(LOG_INFO, ("%s terminated by peer (%p)\n", PROTO_NAME(f), p));
+      } else {
+        FSMDEBUG(LOG_INFO, ("%s terminated by peer\n", PROTO_NAME(f)));
+      }
+      if (f->callbacks->down) {
+        (*f->callbacks->down)(f);  /* Inform upper layers */
+      }
+      f->retransmits = 0;
+      f->state = LS_STOPPING;
+      TIMEOUT(fsm_timeout, f, f->timeouttime);
+      break;
+  }
+
+  fsm_sdata(f, TERMACK, (u_char)id, NULL, 0);
+}
+
+
+/*
+ * fsm_rtermack - Receive Terminate-Ack.
+ */
+static void
+fsm_rtermack(fsm *f)
+{
+  FSMDEBUG(LOG_INFO, ("fsm_rtermack(%s): state=%d (%s)\n", 
+        PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+  
+  switch (f->state) {
+    case LS_CLOSING:
+      UNTIMEOUT(fsm_timeout, f);
+      f->state = LS_CLOSED;
+      if( f->callbacks->finished ) {
+        (*f->callbacks->finished)(f);
+      }
+      break;
+
+    case LS_STOPPING:
+      UNTIMEOUT(fsm_timeout, f);
+      f->state = LS_STOPPED;
+      if( f->callbacks->finished ) {
+        (*f->callbacks->finished)(f);
+      }
+      break;
+    
+    case LS_ACKRCVD:
+      f->state = LS_REQSENT;
+      break;
+    
+    case LS_OPENED:
+      if (f->callbacks->down) {
+        (*f->callbacks->down)(f);  /* Inform upper layers */
+      }
+      fsm_sconfreq(f, 0);
+      break;
+    default:
+      FSMDEBUG(LOG_INFO, ("fsm_rtermack(%s): UNHANDLED state=%d (%s)!!!\n", 
+                PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+  }
+}
+
+
+/*
+ * fsm_rcoderej - Receive an Code-Reject.
+ */
+static void
+fsm_rcoderej(fsm *f, u_char *inp, int len)
+{
+  u_char code, id;
+  
+  FSMDEBUG(LOG_INFO, ("fsm_rcoderej(%s): state=%d (%s)\n", 
+        PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+  
+  if (len < HEADERLEN) {
+    FSMDEBUG(LOG_INFO, ("fsm_rcoderej: Rcvd short Code-Reject packet!\n"));
+    return;
+  }
+  GETCHAR(code, inp);
+  GETCHAR(id, inp);
+  FSMDEBUG(LOG_WARNING, ("%s: Rcvd Code-Reject for code %d, id %d\n",
+        PROTO_NAME(f), code, id));
+  
+  if( f->state == LS_ACKRCVD ) {
+    f->state = LS_REQSENT;
+  }
+}
+
+
+/*
+ * fsm_protreject - Peer doesn't speak this protocol.
+ *
+ * Treat this as a catastrophic error (RXJ-).
+ */
+void
+fsm_protreject(fsm *f)
+{
+  switch( f->state ) {
+    case LS_CLOSING:
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      /* fall through */
+    case LS_CLOSED:
+      f->state = LS_CLOSED;
+      if( f->callbacks->finished ) {
+        (*f->callbacks->finished)(f);
+      }
+      break;
+
+    case LS_STOPPING:
+    case LS_REQSENT:
+    case LS_ACKRCVD:
+    case LS_ACKSENT:
+      UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
+      /* fall through */
+    case LS_STOPPED:
+      f->state = LS_STOPPED;
+      if( f->callbacks->finished ) {
+        (*f->callbacks->finished)(f);
+      }
+      break;
+    
+    case LS_OPENED:
+      if( f->callbacks->down ) {
+        (*f->callbacks->down)(f);
+      }
+      /* Init restart counter, send Terminate-Request */
+      f->retransmits = f->maxtermtransmits;
+      fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
+            (u_char *) f->term_reason, f->term_reason_len);
+      TIMEOUT(fsm_timeout, f, f->timeouttime);
+      --f->retransmits;
+
+      f->state = LS_STOPPING;
+      break;
+    
+    default:
+      FSMDEBUG(LOG_INFO, ("%s: Protocol-reject event in state %d (%s)!\n",
+            PROTO_NAME(f), f->state, ppperr_strerr[f->state]));
+    }
+}
+
+
+/*
+ * fsm_sconfreq - Send a Configure-Request.
+ */
+static void
+fsm_sconfreq(fsm *f, int retransmit)
+{
+  u_char *outp;
+  int cilen;
+  
+  if( f->state != LS_REQSENT && f->state != LS_ACKRCVD && f->state != LS_ACKSENT ) {
+    /* Not currently negotiating - reset options */
+    if( f->callbacks->resetci ) {
+      (*f->callbacks->resetci)(f);
+    }
+    f->nakloops = 0;
+  }
+  
+  if( !retransmit ) {
+    /* New request - reset retransmission counter, use new ID */
+    f->retransmits = f->maxconfreqtransmits;
+    f->reqid = ++f->id;
+  }
+  
+  f->seen_ack = 0;
+  
+  /*
+   * Make up the request packet
+   */
+  outp = outpacket_buf[f->unit] + PPP_HDRLEN + HEADERLEN;
+  if( f->callbacks->cilen && f->callbacks->addci ) {
+    cilen = (*f->callbacks->cilen)(f);
+    if( cilen > peer_mru[f->unit] - (int)HEADERLEN ) {
+      cilen = peer_mru[f->unit] - HEADERLEN;
+    }
+    if (f->callbacks->addci) {
+      (*f->callbacks->addci)(f, outp, &cilen);
+    }
+  } else {
+    cilen = 0;
+  }
+
+  /* send the request to our peer */
+  fsm_sdata(f, CONFREQ, f->reqid, outp, cilen);
+  
+  /* start the retransmit timer */
+  --f->retransmits;
+  TIMEOUT(fsm_timeout, f, f->timeouttime);
+  
+  FSMDEBUG(LOG_INFO, ("%s: sending Configure-Request, id %d\n",
+        PROTO_NAME(f), f->reqid));
+}
+
+
+/*
+ * fsm_sdata - Send some data.
+ *
+ * Used for all packets sent to our peer by this module.
+ */
+void
+fsm_sdata( fsm *f, u_char code, u_char id, u_char *data, int datalen)
+{
+  u_char *outp;
+  int outlen;
+
+  /* Adjust length to be smaller than MTU */
+  outp = outpacket_buf[f->unit];
+  if (datalen > peer_mru[f->unit] - (int)HEADERLEN) {
+    datalen = peer_mru[f->unit] - HEADERLEN;
+  }
+  if (datalen && data != outp + PPP_HDRLEN + HEADERLEN) {
+    BCOPY(data, outp + PPP_HDRLEN + HEADERLEN, datalen);
+  }
+  outlen = datalen + HEADERLEN;
+  MAKEHEADER(outp, f->protocol);
+  PUTCHAR(code, outp);
+  PUTCHAR(id, outp);
+  PUTSHORT(outlen, outp);
+  pppWrite(f->unit, outpacket_buf[f->unit], outlen + PPP_HDRLEN);
+  FSMDEBUG(LOG_INFO, ("fsm_sdata(%s): Sent code %d,%d,%d.\n",
+        PROTO_NAME(f), code, id, outlen));
+}
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/fsm.h b/ext/lwip/src/netif/ppp/fsm.h
new file mode 100644
index 000000000..8d41b5f51
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/fsm.h
@@ -0,0 +1,157 @@
+/*****************************************************************************
+* fsm.h - Network Control Protocol Finite State Machine header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* Copyright (c) 1997 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-11-05 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
+*   Original based on BSD code.
+*****************************************************************************/
+/*
+ * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Id: fsm.h,v 1.5 2009/12/31 17:08:08 goldsimon Exp $
+ */
+
+#ifndef FSM_H
+#define FSM_H
+
+/*
+ * LCP Packet header = Code, id, length.
+ */
+#define HEADERLEN (sizeof (u_char) + sizeof (u_char) + sizeof (u_short))
+
+
+/*
+ *  CP (LCP, IPCP, etc.) codes.
+ */
+#define CONFREQ     1 /* Configuration Request */
+#define CONFACK     2 /* Configuration Ack */
+#define CONFNAK     3 /* Configuration Nak */
+#define CONFREJ     4 /* Configuration Reject */
+#define TERMREQ     5 /* Termination Request */
+#define TERMACK     6 /* Termination Ack */
+#define CODEREJ     7 /* Code Reject */
+
+
+/*
+ * Each FSM is described by an fsm structure and fsm callbacks.
+ */
+typedef struct fsm {
+  int unit;                        /* Interface unit number */
+  u_short protocol;                /* Data Link Layer Protocol field value */
+  int state;                       /* State */
+  int flags;                       /* Contains option bits */
+  u_char id;                       /* Current id */
+  u_char reqid;                    /* Current request id */
+  u_char seen_ack;                 /* Have received valid Ack/Nak/Rej to Req */
+  int timeouttime;                 /* Timeout time in milliseconds */
+  int maxconfreqtransmits;         /* Maximum Configure-Request transmissions */
+  int retransmits;                 /* Number of retransmissions left */
+  int maxtermtransmits;            /* Maximum Terminate-Request transmissions */
+  int nakloops;                    /* Number of nak loops since last ack */
+  int maxnakloops;                 /* Maximum number of nak loops tolerated */
+  struct fsm_callbacks* callbacks; /* Callback routines */
+  char* term_reason;               /* Reason for closing protocol */
+  int term_reason_len;             /* Length of term_reason */
+} fsm;
+
+
+typedef struct fsm_callbacks {
+  void (*resetci)(fsm*);                            /* Reset our Configuration Information */
+  int  (*cilen)(fsm*);                              /* Length of our Configuration Information */
+  void (*addci)(fsm*, u_char*, int*);               /* Add our Configuration Information */
+  int  (*ackci)(fsm*, u_char*, int);                /* ACK our Configuration Information */
+  int  (*nakci)(fsm*, u_char*, int);                /* NAK our Configuration Information */
+  int  (*rejci)(fsm*, u_char*, int);                /* Reject our Configuration Information */
+  int  (*reqci)(fsm*, u_char*, int*, int);          /* Request peer's Configuration Information */
+  void (*up)(fsm*);                                 /* Called when fsm reaches LS_OPENED state */
+  void (*down)(fsm*);                               /* Called when fsm leaves LS_OPENED state */
+  void (*starting)(fsm*);                           /* Called when we want the lower layer */
+  void (*finished)(fsm*);                           /* Called when we don't want the lower layer */
+  void (*protreject)(int);                          /* Called when Protocol-Reject received */
+  void (*retransmit)(fsm*);                         /* Retransmission is necessary */
+  int  (*extcode)(fsm*, int, u_char, u_char*, int); /* Called when unknown code received */
+  char *proto_name;                                 /* String name for protocol (for messages) */
+} fsm_callbacks;
+
+
+/*
+ * Link states.
+ */
+#define LS_INITIAL  0 /* Down, hasn't been opened */
+#define LS_STARTING 1 /* Down, been opened */
+#define LS_CLOSED   2 /* Up, hasn't been opened */
+#define LS_STOPPED  3 /* Open, waiting for down event */
+#define LS_CLOSING  4 /* Terminating the connection, not open */
+#define LS_STOPPING 5 /* Terminating, but open */
+#define LS_REQSENT  6 /* We've sent a Config Request */
+#define LS_ACKRCVD  7 /* We've received a Config Ack */
+#define LS_ACKSENT  8 /* We've sent a Config Ack */
+#define LS_OPENED   9 /* Connection available */
+
+/*
+ * Flags - indicate options controlling FSM operation
+ */
+#define OPT_PASSIVE 1 /* Don't die if we don't get a response */
+#define OPT_RESTART 2 /* Treat 2nd OPEN as DOWN, UP */
+#define OPT_SILENT  4 /* Wait for peer to speak first */
+
+
+/*
+ * Prototypes
+ */
+void fsm_init (fsm*);
+void fsm_lowerup (fsm*);
+void fsm_lowerdown (fsm*);
+void fsm_open (fsm*);
+void fsm_close (fsm*, char*);
+void fsm_input (fsm*, u_char*, int);
+void fsm_protreject (fsm*);
+void fsm_sdata (fsm*, u_char, u_char, u_char*, int);
+
+
+/*
+ * Variables
+ */
+extern int peer_mru[]; /* currently negotiated peer MRU (per unit) */
+
+#endif /* FSM_H */
diff --git a/ext/lwip/src/netif/ppp/ipcp.c b/ext/lwip/src/netif/ppp/ipcp.c
new file mode 100644
index 000000000..f0ab2e0e1
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/ipcp.c
@@ -0,0 +1,1411 @@
+/** In contrast to pppd 2.3.1, DNS support has been added, proxy-ARP and
+    dial-on-demand has been stripped. */
+/*****************************************************************************
+* ipcp.c - Network PPP IP Control Protocol program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 by Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-08 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original.
+*****************************************************************************/
+/*
+ * ipcp.c - PPP IP Control Protocol.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "auth.h"
+#include "fsm.h"
+#include "vj.h"
+#include "ipcp.h"
+
+#include "lwip/inet.h"
+
+#include <string.h>
+
+/* #define OLD_CI_ADDRS 1 */ /* Support deprecated address negotiation. */
+
+/* global vars */
+ipcp_options ipcp_wantoptions[NUM_PPP];  /* Options that we want to request */
+ipcp_options ipcp_gotoptions[NUM_PPP];   /* Options that peer ack'd */
+ipcp_options ipcp_allowoptions[NUM_PPP]; /* Options we allow peer to request */
+ipcp_options ipcp_hisoptions[NUM_PPP];   /* Options that we ack'd */
+
+/* local vars */
+static int default_route_set[NUM_PPP]; /* Have set up a default route */
+static int cis_received[NUM_PPP];      /* # Conf-Reqs received */
+
+
+/*
+ * Callbacks for fsm code.  (CI = Configuration Information)
+ */
+static void ipcp_resetci (fsm *);                     /* Reset our CI */
+static int  ipcp_cilen (fsm *);                       /* Return length of our CI */
+static void ipcp_addci (fsm *, u_char *, int *);      /* Add our CI */
+static int  ipcp_ackci (fsm *, u_char *, int);        /* Peer ack'd our CI */
+static int  ipcp_nakci (fsm *, u_char *, int);        /* Peer nak'd our CI */
+static int  ipcp_rejci (fsm *, u_char *, int);        /* Peer rej'd our CI */
+static int  ipcp_reqci (fsm *, u_char *, int *, int); /* Rcv CI */
+static void ipcp_up (fsm *);                          /* We're UP */
+static void ipcp_down (fsm *);                        /* We're DOWN */
+#if PPP_ADDITIONAL_CALLBACKS
+static void ipcp_script (fsm *, char *); /* Run an up/down script */
+#endif
+static void ipcp_finished (fsm *);                    /* Don't need lower layer */
+
+
+fsm ipcp_fsm[NUM_PPP]; /* IPCP fsm structure */
+
+
+static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */
+  ipcp_resetci,  /* Reset our Configuration Information */
+  ipcp_cilen,    /* Length of our Configuration Information */
+  ipcp_addci,    /* Add our Configuration Information */
+  ipcp_ackci,    /* ACK our Configuration Information */
+  ipcp_nakci,    /* NAK our Configuration Information */
+  ipcp_rejci,    /* Reject our Configuration Information */
+  ipcp_reqci,    /* Request peer's Configuration Information */
+  ipcp_up,       /* Called when fsm reaches LS_OPENED state */
+  ipcp_down,     /* Called when fsm leaves LS_OPENED state */
+  NULL,          /* Called when we want the lower layer up */
+  ipcp_finished, /* Called when we want the lower layer down */
+  NULL,          /* Called when Protocol-Reject received */
+  NULL,          /* Retransmission is necessary */
+  NULL,          /* Called to handle protocol-specific codes */
+  "IPCP"         /* String name of protocol */
+};
+
+/*
+ * Protocol entry points from main code.
+ */
+static void ipcp_init (int);
+static void ipcp_open (int);
+static void ipcp_close (int, char *);
+static void ipcp_lowerup (int);
+static void ipcp_lowerdown (int);
+static void ipcp_input (int, u_char *, int);
+static void ipcp_protrej (int);
+
+
+struct protent ipcp_protent = {
+  PPP_IPCP,
+  ipcp_init,
+  ipcp_input,
+  ipcp_protrej,
+  ipcp_lowerup,
+  ipcp_lowerdown,
+  ipcp_open,
+  ipcp_close,
+#if PPP_ADDITIONAL_CALLBACKS
+  ipcp_printpkt,
+  NULL,
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+  1,
+  "IPCP",
+#if PPP_ADDITIONAL_CALLBACKS
+  ip_check_options,
+  NULL,
+  ip_active_pkt
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+};
+
+static void ipcp_clear_addrs (int);
+
+/*
+ * Lengths of configuration options.
+ */
+#define CILEN_VOID     2
+#define CILEN_COMPRESS 4  /* min length for compression protocol opt. */
+#define CILEN_VJ       6  /* length for RFC1332 Van-Jacobson opt. */
+#define CILEN_ADDR     6  /* new-style single address option */
+#define CILEN_ADDRS    10 /* old-style dual address option */
+
+
+#define CODENAME(x) ((x) == CONFACK ? "ACK" : \
+                     (x) == CONFNAK ? "NAK" : "REJ")
+
+
+/*
+ * ipcp_init - Initialize IPCP.
+ */
+static void
+ipcp_init(int unit)
+{
+  fsm           *f = &ipcp_fsm[unit];
+  ipcp_options *wo = &ipcp_wantoptions[unit];
+  ipcp_options *ao = &ipcp_allowoptions[unit];
+
+  f->unit      = unit;
+  f->protocol  = PPP_IPCP;
+  f->callbacks = &ipcp_callbacks;
+  fsm_init(&ipcp_fsm[unit]);
+
+  memset(wo, 0, sizeof(*wo));
+  memset(ao, 0, sizeof(*ao));
+
+  wo->neg_addr      = 1;
+  wo->ouraddr       = 0;
+#if VJ_SUPPORT
+  wo->neg_vj        = 1;
+#else  /* VJ_SUPPORT */
+  wo->neg_vj        = 0;
+#endif /* VJ_SUPPORT */
+  wo->vj_protocol   = IPCP_VJ_COMP;
+  wo->maxslotindex  = MAX_SLOTS - 1;
+  wo->cflag         = 0;
+  wo->default_route = 1;
+
+  ao->neg_addr      = 1;
+#if VJ_SUPPORT
+  ao->neg_vj        = 1;
+#else  /* VJ_SUPPORT */
+  ao->neg_vj        = 0;
+#endif /* VJ_SUPPORT */
+  ao->maxslotindex  = MAX_SLOTS - 1;
+  ao->cflag         = 1;
+  ao->default_route = 1;
+}
+
+
+/*
+ * ipcp_open - IPCP is allowed to come up.
+ */
+static void
+ipcp_open(int unit)
+{
+  fsm_open(&ipcp_fsm[unit]);
+}
+
+
+/*
+ * ipcp_close - Take IPCP down.
+ */
+static void
+ipcp_close(int unit, char *reason)
+{
+  fsm_close(&ipcp_fsm[unit], reason);
+}
+
+
+/*
+ * ipcp_lowerup - The lower layer is up.
+ */
+static void
+ipcp_lowerup(int unit)
+{
+  fsm_lowerup(&ipcp_fsm[unit]);
+}
+
+
+/*
+ * ipcp_lowerdown - The lower layer is down.
+ */
+static void
+ipcp_lowerdown(int unit)
+{
+  fsm_lowerdown(&ipcp_fsm[unit]);
+}
+
+
+/*
+ * ipcp_input - Input IPCP packet.
+ */
+static void
+ipcp_input(int unit, u_char *p, int len)
+{
+  fsm_input(&ipcp_fsm[unit], p, len);
+}
+
+
+/*
+ * ipcp_protrej - A Protocol-Reject was received for IPCP.
+ *
+ * Pretend the lower layer went down, so we shut up.
+ */
+static void
+ipcp_protrej(int unit)
+{
+  fsm_lowerdown(&ipcp_fsm[unit]);
+}
+
+
+/*
+ * ipcp_resetci - Reset our CI.
+ */
+static void
+ipcp_resetci(fsm *f)
+{
+  ipcp_options *wo = &ipcp_wantoptions[f->unit];
+  
+  wo->req_addr = wo->neg_addr && ipcp_allowoptions[f->unit].neg_addr;
+  if (wo->ouraddr == 0) {
+    wo->accept_local = 1;
+  }
+  if (wo->hisaddr == 0) {
+    wo->accept_remote = 1;
+  }
+  /* Request DNS addresses from the peer */
+  wo->req_dns1 = ppp_settings.usepeerdns;
+  wo->req_dns2 = ppp_settings.usepeerdns;
+  ipcp_gotoptions[f->unit] = *wo;
+  cis_received[f->unit] = 0;
+}
+
+
+/*
+ * ipcp_cilen - Return length of our CI.
+ */
+static int
+ipcp_cilen(fsm *f)
+{
+  ipcp_options *go = &ipcp_gotoptions[f->unit];
+  ipcp_options *wo = &ipcp_wantoptions[f->unit];
+  ipcp_options *ho = &ipcp_hisoptions[f->unit];
+
+#define LENCIVJ(neg, old)   (neg ? (old? CILEN_COMPRESS : CILEN_VJ) : 0)
+#define LENCIADDR(neg, old) (neg ? (old? CILEN_ADDRS : CILEN_ADDR) : 0)
+#define LENCIDNS(neg)       (neg ? (CILEN_ADDR) : 0)
+
+  /*
+   * First see if we want to change our options to the old
+   * forms because we have received old forms from the peer.
+   */
+  if (wo->neg_addr && !go->neg_addr && !go->old_addrs) {
+    /* use the old style of address negotiation */
+    go->neg_addr = 1;
+    go->old_addrs = 1;
+  }
+  if (wo->neg_vj && !go->neg_vj && !go->old_vj) {
+    /* try an older style of VJ negotiation */
+    if (cis_received[f->unit] == 0) {
+      /* keep trying the new style until we see some CI from the peer */
+      go->neg_vj = 1;
+    } else {
+      /* use the old style only if the peer did */
+      if (ho->neg_vj && ho->old_vj) {
+        go->neg_vj = 1;
+        go->old_vj = 1;
+        go->vj_protocol = ho->vj_protocol;
+      }
+    }
+  }
+
+  return (LENCIADDR(go->neg_addr, go->old_addrs) +
+          LENCIVJ(go->neg_vj, go->old_vj) +
+          LENCIDNS(go->req_dns1) +
+          LENCIDNS(go->req_dns2));
+}
+
+
+/*
+ * ipcp_addci - Add our desired CIs to a packet.
+ */
+static void
+ipcp_addci(fsm *f, u_char *ucp, int *lenp)
+{
+  ipcp_options *go = &ipcp_gotoptions[f->unit];
+  int len = *lenp;
+
+#define ADDCIVJ(opt, neg, val, old, maxslotindex, cflag) \
+  if (neg) { \
+    int vjlen = old? CILEN_COMPRESS : CILEN_VJ; \
+    if (len >= vjlen) { \
+      PUTCHAR(opt, ucp); \
+      PUTCHAR(vjlen, ucp); \
+      PUTSHORT(val, ucp); \
+      if (!old) { \
+        PUTCHAR(maxslotindex, ucp); \
+        PUTCHAR(cflag, ucp); \
+      } \
+      len -= vjlen; \
+    } else { \
+      neg = 0; \
+    } \
+  }
+
+#define ADDCIADDR(opt, neg, old, val1, val2) \
+  if (neg) { \
+    int addrlen = (old? CILEN_ADDRS: CILEN_ADDR); \
+    if (len >= addrlen) { \
+      u32_t l; \
+      PUTCHAR(opt, ucp); \
+      PUTCHAR(addrlen, ucp); \
+      l = ntohl(val1); \
+      PUTLONG(l, ucp); \
+      if (old) { \
+        l = ntohl(val2); \
+        PUTLONG(l, ucp); \
+      } \
+      len -= addrlen; \
+    } else { \
+      neg = 0; \
+    } \
+  }
+
+#define ADDCIDNS(opt, neg, addr) \
+  if (neg) { \
+    if (len >= CILEN_ADDR) { \
+      u32_t l; \
+      PUTCHAR(opt, ucp); \
+      PUTCHAR(CILEN_ADDR, ucp); \
+      l = ntohl(addr); \
+      PUTLONG(l, ucp); \
+      len -= CILEN_ADDR; \
+    } else { \
+      neg = 0; \
+    } \
+  }
+
+  ADDCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), go->neg_addr,
+      go->old_addrs, go->ouraddr, go->hisaddr);
+
+  ADDCIVJ(CI_COMPRESSTYPE, go->neg_vj, go->vj_protocol, go->old_vj,
+      go->maxslotindex, go->cflag);
+
+  ADDCIDNS(CI_MS_DNS1, go->req_dns1, go->dnsaddr[0]);
+
+  ADDCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]);
+
+  *lenp -= len;
+}
+
+
+/*
+ * ipcp_ackci - Ack our CIs.
+ *
+ * Returns:
+ *  0 - Ack was bad.
+ *  1 - Ack was good.
+ */
+static int
+ipcp_ackci(fsm *f, u_char *p, int len)
+{
+  ipcp_options *go = &ipcp_gotoptions[f->unit];
+  u_short cilen, citype, cishort;
+  u32_t cilong;
+  u_char cimaxslotindex, cicflag;
+
+  /*
+   * CIs must be in exactly the same order that we sent...
+   * Check packet length and CI length at each step.
+   * If we find any deviations, then this packet is bad.
+   */
+
+#define ACKCIVJ(opt, neg, val, old, maxslotindex, cflag) \
+  if (neg) { \
+    int vjlen = old? CILEN_COMPRESS : CILEN_VJ; \
+    if ((len -= vjlen) < 0) { \
+      goto bad; \
+    } \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != vjlen || \
+        citype != opt) { \
+      goto bad; \
+    } \
+    GETSHORT(cishort, p); \
+    if (cishort != val) { \
+      goto bad; \
+    } \
+    if (!old) { \
+      GETCHAR(cimaxslotindex, p); \
+      if (cimaxslotindex != maxslotindex) { \
+        goto bad; \
+      } \
+      GETCHAR(cicflag, p); \
+      if (cicflag != cflag) { \
+        goto bad; \
+      } \
+    } \
+  }
+  
+#define ACKCIADDR(opt, neg, old, val1, val2) \
+  if (neg) { \
+    int addrlen = (old? CILEN_ADDRS: CILEN_ADDR); \
+    u32_t l; \
+    if ((len -= addrlen) < 0) { \
+      goto bad; \
+    } \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != addrlen || \
+        citype != opt) { \
+      goto bad; \
+    } \
+    GETLONG(l, p); \
+    cilong = htonl(l); \
+    if (val1 != cilong) { \
+      goto bad; \
+    } \
+    if (old) { \
+      GETLONG(l, p); \
+      cilong = htonl(l); \
+      if (val2 != cilong) { \
+        goto bad; \
+      } \
+    } \
+  }
+
+#define ACKCIDNS(opt, neg, addr) \
+  if (neg) { \
+    u32_t l; \
+    if ((len -= CILEN_ADDR) < 0) { \
+      goto bad; \
+    } \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != CILEN_ADDR || \
+        citype != opt) { \
+      goto bad; \
+    } \
+    GETLONG(l, p); \
+    cilong = htonl(l); \
+    if (addr != cilong) { \
+      goto bad; \
+    } \
+  }
+
+  ACKCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), go->neg_addr,
+        go->old_addrs, go->ouraddr, go->hisaddr);
+
+  ACKCIVJ(CI_COMPRESSTYPE, go->neg_vj, go->vj_protocol, go->old_vj,
+      go->maxslotindex, go->cflag);
+
+  ACKCIDNS(CI_MS_DNS1, go->req_dns1, go->dnsaddr[0]);
+
+  ACKCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]);
+
+  /*
+   * If there are any remaining CIs, then this packet is bad.
+   */
+  if (len != 0) {
+    goto bad;
+  }
+  return (1);
+
+bad:
+  IPCPDEBUG(LOG_INFO, ("ipcp_ackci: received bad Ack!\n"));
+  return (0);
+}
+
+/*
+ * ipcp_nakci - Peer has sent a NAK for some of our CIs.
+ * This should not modify any state if the Nak is bad
+ * or if IPCP is in the LS_OPENED state.
+ *
+ * Returns:
+ *  0 - Nak was bad.
+ *  1 - Nak was good.
+ */
+static int
+ipcp_nakci(fsm *f, u_char *p, int len)
+{
+  ipcp_options *go = &ipcp_gotoptions[f->unit];
+  u_char cimaxslotindex, cicflag;
+  u_char citype, cilen, *next;
+  u_short cishort;
+  u32_t ciaddr1, ciaddr2, l, cidnsaddr;
+  ipcp_options no;    /* options we've seen Naks for */
+  ipcp_options try;    /* options to request next time */
+
+  BZERO(&no, sizeof(no));
+  try = *go;
+
+  /*
+   * Any Nak'd CIs must be in exactly the same order that we sent.
+   * Check packet length and CI length at each step.
+   * If we find any deviations, then this packet is bad.
+   */
+#define NAKCIADDR(opt, neg, old, code) \
+  if (go->neg && \
+      len >= (cilen = (old? CILEN_ADDRS: CILEN_ADDR)) && \
+      p[1] == cilen && \
+      p[0] == opt) { \
+    len -= cilen; \
+    INCPTR(2, p); \
+    GETLONG(l, p); \
+    ciaddr1 = htonl(l); \
+    if (old) { \
+      GETLONG(l, p); \
+      ciaddr2 = htonl(l); \
+      no.old_addrs = 1; \
+    } else { \
+      ciaddr2 = 0; \
+    } \
+    no.neg = 1; \
+    code \
+  }
+
+#define NAKCIVJ(opt, neg, code) \
+  if (go->neg && \
+      ((cilen = p[1]) == CILEN_COMPRESS || cilen == CILEN_VJ) && \
+      len >= cilen && \
+      p[0] == opt) { \
+    len -= cilen; \
+    INCPTR(2, p); \
+    GETSHORT(cishort, p); \
+    no.neg = 1; \
+    code \
+  }
+  
+#define NAKCIDNS(opt, neg, code) \
+  if (go->neg && \
+      ((cilen = p[1]) == CILEN_ADDR) && \
+      len >= cilen && \
+      p[0] == opt) { \
+    len -= cilen; \
+    INCPTR(2, p); \
+    GETLONG(l, p); \
+    cidnsaddr = htonl(l); \
+    no.neg = 1; \
+    code \
+  }
+
+  /*
+   * Accept the peer's idea of {our,his} address, if different
+   * from our idea, only if the accept_{local,remote} flag is set.
+   */
+  NAKCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), neg_addr, go->old_addrs,
+    if (go->accept_local && ciaddr1) { /* Do we know our address? */
+      try.ouraddr = ciaddr1;
+      IPCPDEBUG(LOG_INFO, ("local IP address %s\n",
+           inet_ntoa(ciaddr1)));
+    }
+    if (go->accept_remote && ciaddr2) { /* Does he know his? */
+      try.hisaddr = ciaddr2;
+      IPCPDEBUG(LOG_INFO, ("remote IP address %s\n",
+           inet_ntoa(ciaddr2)));
+    }
+  );
+
+  /*
+   * Accept the peer's value of maxslotindex provided that it
+   * is less than what we asked for.  Turn off slot-ID compression
+   * if the peer wants.  Send old-style compress-type option if
+   * the peer wants.
+   */
+  NAKCIVJ(CI_COMPRESSTYPE, neg_vj,
+    if (cilen == CILEN_VJ) {
+      GETCHAR(cimaxslotindex, p);
+      GETCHAR(cicflag, p);
+      if (cishort == IPCP_VJ_COMP) {
+        try.old_vj = 0;
+        if (cimaxslotindex < go->maxslotindex) {
+          try.maxslotindex = cimaxslotindex;
+        }
+        if (!cicflag) {
+          try.cflag = 0;
+        }
+      } else {
+        try.neg_vj = 0;
+      }
+    } else {
+      if (cishort == IPCP_VJ_COMP || cishort == IPCP_VJ_COMP_OLD) {
+        try.old_vj = 1;
+        try.vj_protocol = cishort;
+      } else {
+        try.neg_vj = 0;
+      }
+    }
+  );
+
+  NAKCIDNS(CI_MS_DNS1, req_dns1,
+      try.dnsaddr[0] = cidnsaddr;
+        IPCPDEBUG(LOG_INFO, ("primary DNS address %s\n", inet_ntoa(cidnsaddr)));
+      );
+
+  NAKCIDNS(CI_MS_DNS2, req_dns2,
+      try.dnsaddr[1] = cidnsaddr;
+        IPCPDEBUG(LOG_INFO, ("secondary DNS address %s\n", inet_ntoa(cidnsaddr)));
+      );
+
+  /*
+  * There may be remaining CIs, if the peer is requesting negotiation
+  * on an option that we didn't include in our request packet.
+  * If they want to negotiate about IP addresses, we comply.
+  * If they want us to ask for compression, we refuse.
+  */
+  while (len > CILEN_VOID) {
+    GETCHAR(citype, p);
+    GETCHAR(cilen, p);
+    if( (len -= cilen) < 0 ) {
+      goto bad;
+    }
+    next = p + cilen - 2;
+
+    switch (citype) {
+      case CI_COMPRESSTYPE:
+        if (go->neg_vj || no.neg_vj ||
+            (cilen != CILEN_VJ && cilen != CILEN_COMPRESS)) {
+          goto bad;
+        }
+        no.neg_vj = 1;
+        break;
+      case CI_ADDRS:
+        if ((go->neg_addr && go->old_addrs) || no.old_addrs
+            || cilen != CILEN_ADDRS) {
+          goto bad;
+        }
+        try.neg_addr = 1;
+        try.old_addrs = 1;
+        GETLONG(l, p);
+        ciaddr1 = htonl(l);
+        if (ciaddr1 && go->accept_local) {
+          try.ouraddr = ciaddr1;
+        }
+        GETLONG(l, p);
+        ciaddr2 = htonl(l);
+        if (ciaddr2 && go->accept_remote) {
+          try.hisaddr = ciaddr2;
+        }
+        no.old_addrs = 1;
+        break;
+      case CI_ADDR:
+        if (go->neg_addr || no.neg_addr || cilen != CILEN_ADDR) {
+          goto bad;
+        }
+        try.old_addrs = 0;
+        GETLONG(l, p);
+        ciaddr1 = htonl(l);
+        if (ciaddr1 && go->accept_local) {
+          try.ouraddr = ciaddr1;
+        }
+        if (try.ouraddr != 0) {
+          try.neg_addr = 1;
+        }
+        no.neg_addr = 1;
+        break;
+    }
+    p = next;
+  }
+
+  /* If there is still anything left, this packet is bad. */
+  if (len != 0) {
+    goto bad;
+  }
+
+  /*
+   * OK, the Nak is good.  Now we can update state.
+   */
+  if (f->state != LS_OPENED) {
+    *go = try;
+  }
+
+  return 1;
+
+bad:
+  IPCPDEBUG(LOG_INFO, ("ipcp_nakci: received bad Nak!\n"));
+  return 0;
+}
+
+
+/*
+ * ipcp_rejci - Reject some of our CIs.
+ */
+static int
+ipcp_rejci(fsm *f, u_char *p, int len)
+{
+  ipcp_options *go = &ipcp_gotoptions[f->unit];
+  u_char cimaxslotindex, ciflag, cilen;
+  u_short cishort;
+  u32_t cilong;
+  ipcp_options try;    /* options to request next time */
+
+  try = *go;
+  /*
+   * Any Rejected CIs must be in exactly the same order that we sent.
+   * Check packet length and CI length at each step.
+   * If we find any deviations, then this packet is bad.
+   */
+#define REJCIADDR(opt, neg, old, val1, val2) \
+  if (go->neg && \
+      len >= (cilen = old? CILEN_ADDRS: CILEN_ADDR) && \
+      p[1] == cilen && \
+      p[0] == opt) { \
+    u32_t l; \
+    len -= cilen; \
+    INCPTR(2, p); \
+    GETLONG(l, p); \
+    cilong = htonl(l); \
+    /* Check rejected value. */ \
+    if (cilong != val1) { \
+      goto bad; \
+    } \
+    if (old) { \
+      GETLONG(l, p); \
+      cilong = htonl(l); \
+      /* Check rejected value. */ \
+      if (cilong != val2) { \
+        goto bad; \
+      } \
+    } \
+    try.neg = 0; \
+  }
+
+#define REJCIVJ(opt, neg, val, old, maxslot, cflag) \
+  if (go->neg && \
+      p[1] == (old? CILEN_COMPRESS : CILEN_VJ) && \
+      len >= p[1] && \
+      p[0] == opt) { \
+    len -= p[1]; \
+    INCPTR(2, p); \
+    GETSHORT(cishort, p); \
+    /* Check rejected value. */  \
+    if (cishort != val) { \
+      goto bad; \
+    } \
+    if (!old) { \
+      GETCHAR(cimaxslotindex, p); \
+      if (cimaxslotindex != maxslot) { \
+        goto bad; \
+      } \
+      GETCHAR(ciflag, p); \
+      if (ciflag != cflag) { \
+        goto bad; \
+      } \
+    } \
+    try.neg = 0; \
+  }
+
+#define REJCIDNS(opt, neg, dnsaddr) \
+  if (go->neg && \
+      ((cilen = p[1]) == CILEN_ADDR) && \
+      len >= cilen && \
+      p[0] == opt) { \
+    u32_t l; \
+    len -= cilen; \
+    INCPTR(2, p); \
+    GETLONG(l, p); \
+    cilong = htonl(l); \
+    /* Check rejected value. */ \
+    if (cilong != dnsaddr) { \
+      goto bad; \
+    } \
+    try.neg = 0; \
+  }
+
+  REJCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), neg_addr,
+        go->old_addrs, go->ouraddr, go->hisaddr);
+
+  REJCIVJ(CI_COMPRESSTYPE, neg_vj, go->vj_protocol, go->old_vj,
+      go->maxslotindex, go->cflag);
+
+  REJCIDNS(CI_MS_DNS1, req_dns1, go->dnsaddr[0]);
+
+  REJCIDNS(CI_MS_DNS2, req_dns2, go->dnsaddr[1]);
+
+  /*
+   * If there are any remaining CIs, then this packet is bad.
+   */
+  if (len != 0) {
+    goto bad;
+  }
+  /*
+   * Now we can update state.
+   */
+  if (f->state != LS_OPENED) {
+    *go = try;
+  }
+  return 1;
+
+bad:
+  IPCPDEBUG(LOG_INFO, ("ipcp_rejci: received bad Reject!\n"));
+  return 0;
+}
+
+
+/*
+ * ipcp_reqci - Check the peer's requested CIs and send appropriate response.
+ *
+ * Returns: CONFACK, CONFNAK or CONFREJ and input packet modified
+ * appropriately.  If reject_if_disagree is non-zero, doesn't return
+ * CONFNAK; returns CONFREJ if it can't return CONFACK.
+ */
+static int
+ipcp_reqci(fsm *f, u_char *inp/* Requested CIs */,int *len/* Length of requested CIs */,int reject_if_disagree)
+{
+  ipcp_options *wo = &ipcp_wantoptions[f->unit];
+  ipcp_options *ho = &ipcp_hisoptions[f->unit];
+  ipcp_options *ao = &ipcp_allowoptions[f->unit];
+#ifdef OLD_CI_ADDRS
+  ipcp_options *go = &ipcp_gotoptions[f->unit];
+#endif
+  u_char *cip, *next;     /* Pointer to current and next CIs */
+  u_short cilen, citype;  /* Parsed len, type */
+  u_short cishort;        /* Parsed short value */
+  u32_t tl, ciaddr1;      /* Parsed address values */
+#ifdef OLD_CI_ADDRS
+  u32_t ciaddr2;          /* Parsed address values */
+#endif
+  int rc = CONFACK;       /* Final packet return code */
+  int orc;                /* Individual option return code */
+  u_char *p;              /* Pointer to next char to parse */
+  u_char *ucp = inp;      /* Pointer to current output char */
+  int l = *len;           /* Length left */
+  u_char maxslotindex, cflag;
+  int d;
+
+  cis_received[f->unit] = 1;
+
+  /*
+   * Reset all his options.
+   */
+  BZERO(ho, sizeof(*ho));
+
+  /*
+   * Process all his options.
+   */
+  next = inp;
+  while (l) {
+    orc = CONFACK;       /* Assume success */
+    cip = p = next;      /* Remember begining of CI */
+    if (l < 2 ||         /* Not enough data for CI header or */
+        p[1] < 2 ||      /*  CI length too small or */
+        p[1] > l) {      /*  CI length too big? */
+      IPCPDEBUG(LOG_INFO, ("ipcp_reqci: bad CI length!\n"));
+      orc = CONFREJ;     /* Reject bad CI */
+      cilen = (u_short)l;/* Reject till end of packet */
+      l = 0;             /* Don't loop again */
+      goto endswitch;
+    }
+    GETCHAR(citype, p);  /* Parse CI type */
+    GETCHAR(cilen, p);   /* Parse CI length */
+    l -= cilen;          /* Adjust remaining length */
+    next += cilen;       /* Step to next CI */
+
+    switch (citype) {      /* Check CI type */
+#ifdef OLD_CI_ADDRS /* Need to save space... */
+      case CI_ADDRS:
+        IPCPDEBUG(LOG_INFO, ("ipcp_reqci: received ADDRS\n"));
+        if (!ao->neg_addr ||
+            cilen != CILEN_ADDRS) {  /* Check CI length */
+          orc = CONFREJ;    /* Reject CI */
+          break;
+        }
+
+        /*
+         * If he has no address, or if we both have his address but
+         * disagree about it, then NAK it with our idea.
+         * In particular, if we don't know his address, but he does,
+         * then accept it.
+         */
+        GETLONG(tl, p);    /* Parse source address (his) */
+        ciaddr1 = htonl(tl);
+        IPCPDEBUG(LOG_INFO, ("his addr %s\n", inet_ntoa(ciaddr1)));
+        if (ciaddr1 != wo->hisaddr
+            && (ciaddr1 == 0 || !wo->accept_remote)) {
+          orc = CONFNAK;
+          if (!reject_if_disagree) {
+            DECPTR(sizeof(u32_t), p);
+            tl = ntohl(wo->hisaddr);
+            PUTLONG(tl, p);
+          }
+        } else if (ciaddr1 == 0 && wo->hisaddr == 0) {
+          /*
+           * If neither we nor he knows his address, reject the option.
+           */
+          orc = CONFREJ;
+          wo->req_addr = 0;  /* don't NAK with 0.0.0.0 later */
+          break;
+        }
+
+        /*
+         * If he doesn't know our address, or if we both have our address
+         * but disagree about it, then NAK it with our idea.
+         */
+        GETLONG(tl, p);    /* Parse desination address (ours) */
+        ciaddr2 = htonl(tl);
+        IPCPDEBUG(LOG_INFO, ("our addr %s\n", inet_ntoa(ciaddr2)));
+        if (ciaddr2 != wo->ouraddr) {
+          if (ciaddr2 == 0 || !wo->accept_local) {
+            orc = CONFNAK;
+            if (!reject_if_disagree) {
+              DECPTR(sizeof(u32_t), p);
+              tl = ntohl(wo->ouraddr);
+              PUTLONG(tl, p);
+            }
+          } else {
+            go->ouraddr = ciaddr2;  /* accept peer's idea */
+          }
+        }
+
+        ho->neg_addr = 1;
+        ho->old_addrs = 1;
+        ho->hisaddr = ciaddr1;
+        ho->ouraddr = ciaddr2;
+        break;
+#endif
+
+      case CI_ADDR:
+        if (!ao->neg_addr) {
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Reject ADDR not allowed\n"));
+          orc = CONFREJ;        /* Reject CI */
+          break;
+        } else if (cilen != CILEN_ADDR) {  /* Check CI length */
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Reject ADDR bad len\n"));
+          orc = CONFREJ;        /* Reject CI */
+          break;
+        }
+
+        /*
+         * If he has no address, or if we both have his address but
+         * disagree about it, then NAK it with our idea.
+         * In particular, if we don't know his address, but he does,
+         * then accept it.
+         */
+        GETLONG(tl, p);  /* Parse source address (his) */
+        ciaddr1 = htonl(tl);
+        if (ciaddr1 != wo->hisaddr
+            && (ciaddr1 == 0 || !wo->accept_remote)) {
+          orc = CONFNAK;
+          if (!reject_if_disagree) {
+            DECPTR(sizeof(u32_t), p);
+            tl = ntohl(wo->hisaddr);
+            PUTLONG(tl, p);
+          }
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Nak ADDR %s\n", inet_ntoa(ciaddr1)));
+        } else if (ciaddr1 == 0 && wo->hisaddr == 0) {
+          /*
+           * Don't ACK an address of 0.0.0.0 - reject it instead.
+           */
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Reject ADDR %s\n", inet_ntoa(ciaddr1)));
+          orc = CONFREJ;
+          wo->req_addr = 0;  /* don't NAK with 0.0.0.0 later */
+          break;
+        }
+
+        ho->neg_addr = 1;
+        ho->hisaddr = ciaddr1;
+        IPCPDEBUG(LOG_INFO, ("ipcp_reqci: ADDR %s\n", inet_ntoa(ciaddr1)));
+        break;
+
+      case CI_MS_DNS1:
+      case CI_MS_DNS2:
+        /* Microsoft primary or secondary DNS request */
+        d = citype == CI_MS_DNS2;
+
+        /* If we do not have a DNS address then we cannot send it */
+        if (ao->dnsaddr[d] == 0 ||
+            cilen != CILEN_ADDR) {  /* Check CI length */
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Rejecting DNS%d Request\n", d+1));
+          orc = CONFREJ;        /* Reject CI */
+          break;
+        }
+        GETLONG(tl, p);
+        if (htonl(tl) != ao->dnsaddr[d]) {
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Naking DNS%d Request %s\n",
+                d+1, inet_ntoa(tl)));
+          DECPTR(sizeof(u32_t), p);
+          tl = ntohl(ao->dnsaddr[d]);
+          PUTLONG(tl, p);
+          orc = CONFNAK;
+        }
+        IPCPDEBUG(LOG_INFO, ("ipcp_reqci: received DNS%d Request\n", d+1));
+        break;
+
+      case CI_MS_WINS1:
+      case CI_MS_WINS2:
+        /* Microsoft primary or secondary WINS request */
+        d = citype == CI_MS_WINS2;
+        IPCPDEBUG(LOG_INFO, ("ipcp_reqci: received WINS%d Request\n", d+1));
+
+        /* If we do not have a DNS address then we cannot send it */
+        if (ao->winsaddr[d] == 0 ||
+          cilen != CILEN_ADDR) {  /* Check CI length */
+          orc = CONFREJ;      /* Reject CI */
+          break;
+        }
+        GETLONG(tl, p);
+        if (htonl(tl) != ao->winsaddr[d]) {
+          DECPTR(sizeof(u32_t), p);
+          tl = ntohl(ao->winsaddr[d]);
+          PUTLONG(tl, p);
+          orc = CONFNAK;
+        }
+        break;
+
+      case CI_COMPRESSTYPE:
+        if (!ao->neg_vj) {
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Rejecting COMPRESSTYPE not allowed\n"));
+          orc = CONFREJ;
+          break;
+        } else if (cilen != CILEN_VJ && cilen != CILEN_COMPRESS) {
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Rejecting COMPRESSTYPE len=%d\n", cilen));
+          orc = CONFREJ;
+          break;
+        }
+        GETSHORT(cishort, p);
+
+        if (!(cishort == IPCP_VJ_COMP ||
+            (cishort == IPCP_VJ_COMP_OLD && cilen == CILEN_COMPRESS))) {
+          IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Rejecting COMPRESSTYPE %d\n", cishort));
+          orc = CONFREJ;
+          break;
+        }
+
+        ho->neg_vj = 1;
+        ho->vj_protocol = cishort;
+        if (cilen == CILEN_VJ) {
+          GETCHAR(maxslotindex, p);
+          if (maxslotindex > ao->maxslotindex) { 
+            IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Naking VJ max slot %d\n", maxslotindex));
+            orc = CONFNAK;
+            if (!reject_if_disagree) {
+              DECPTR(1, p);
+              PUTCHAR(ao->maxslotindex, p);
+            }
+          }
+          GETCHAR(cflag, p);
+          if (cflag && !ao->cflag) {
+            IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Naking VJ cflag %d\n", cflag));
+            orc = CONFNAK;
+            if (!reject_if_disagree) {
+              DECPTR(1, p);
+              PUTCHAR(wo->cflag, p);
+            }
+          }
+          ho->maxslotindex = maxslotindex;
+          ho->cflag = cflag;
+        } else {
+          ho->old_vj = 1;
+          ho->maxslotindex = MAX_SLOTS - 1;
+          ho->cflag = 1;
+        }
+        IPCPDEBUG(LOG_INFO, (
+              "ipcp_reqci: received COMPRESSTYPE p=%d old=%d maxslot=%d cflag=%d\n",
+              ho->vj_protocol, ho->old_vj, ho->maxslotindex, ho->cflag));
+        break;
+
+      default:
+        IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Rejecting unknown CI type %d\n", citype));
+        orc = CONFREJ;
+        break;
+    }
+
+endswitch:
+    if (orc == CONFACK &&    /* Good CI */
+        rc != CONFACK) {     /*  but prior CI wasnt? */
+      continue;              /* Don't send this one */
+    }
+
+    if (orc == CONFNAK) {    /* Nak this CI? */
+      if (reject_if_disagree) {  /* Getting fed up with sending NAKs? */
+        IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Rejecting too many naks\n"));
+        orc = CONFREJ;       /* Get tough if so */
+      } else {
+        if (rc == CONFREJ) { /* Rejecting prior CI? */
+          continue;          /* Don't send this one */
+        }
+        if (rc == CONFACK) { /* Ack'd all prior CIs? */
+          rc = CONFNAK;      /* Not anymore... */
+          ucp = inp;         /* Backup */
+        }
+      }
+    }
+
+    if (orc == CONFREJ &&    /* Reject this CI */
+        rc != CONFREJ) {  /*  but no prior ones? */
+      rc = CONFREJ;
+      ucp = inp;        /* Backup */
+    }
+    
+    /* Need to move CI? */
+    if (ucp != cip) {
+      BCOPY(cip, ucp, cilen);  /* Move it */
+    }
+
+    /* Update output pointer */
+    INCPTR(cilen, ucp);
+  }
+
+  /*
+   * If we aren't rejecting this packet, and we want to negotiate
+   * their address, and they didn't send their address, then we
+   * send a NAK with a CI_ADDR option appended.  We assume the
+   * input buffer is long enough that we can append the extra
+   * option safely.
+   */
+  if (rc != CONFREJ && !ho->neg_addr &&
+      wo->req_addr && !reject_if_disagree) {
+    IPCPDEBUG(LOG_INFO, ("ipcp_reqci: Requesting peer address\n"));
+    if (rc == CONFACK) {
+      rc = CONFNAK;
+      ucp = inp;        /* reset pointer */
+      wo->req_addr = 0;    /* don't ask again */
+    }
+    PUTCHAR(CI_ADDR, ucp);
+    PUTCHAR(CILEN_ADDR, ucp);
+    tl = ntohl(wo->hisaddr);
+    PUTLONG(tl, ucp);
+  }
+
+  *len = (int)(ucp - inp);    /* Compute output length */
+  IPCPDEBUG(LOG_INFO, ("ipcp_reqci: returning Configure-%s\n", CODENAME(rc)));
+  return (rc);      /* Return final code */
+}
+
+
+#if 0
+/*
+ * ip_check_options - check that any IP-related options are OK,
+ * and assign appropriate defaults.
+ */
+static void
+ip_check_options(u_long localAddr)
+{
+  ipcp_options *wo = &ipcp_wantoptions[0];
+
+  /*
+   * Load our default IP address but allow the remote host to give us
+   * a new address.
+   */
+  if (wo->ouraddr == 0 && !ppp_settings.disable_defaultip) {
+    wo->accept_local = 1;  /* don't insist on this default value */
+    wo->ouraddr = htonl(localAddr);
+  }
+}
+#endif
+
+
+/*
+ * ipcp_up - IPCP has come UP.
+ *
+ * Configure the IP network interface appropriately and bring it up.
+ */
+static void
+ipcp_up(fsm *f)
+{
+  u32_t mask;
+  ipcp_options *ho = &ipcp_hisoptions[f->unit];
+  ipcp_options *go = &ipcp_gotoptions[f->unit];
+  ipcp_options *wo = &ipcp_wantoptions[f->unit];
+
+  np_up(f->unit, PPP_IP);
+  IPCPDEBUG(LOG_INFO, ("ipcp: up\n"));
+
+  /*
+   * We must have a non-zero IP address for both ends of the link.
+   */
+  if (!ho->neg_addr) {
+    ho->hisaddr = wo->hisaddr;
+  }
+
+  if (ho->hisaddr == 0) {
+    IPCPDEBUG(LOG_ERR, ("Could not determine remote IP address\n"));
+    ipcp_close(f->unit, "Could not determine remote IP address");
+    return;
+  }
+  if (go->ouraddr == 0) {
+    IPCPDEBUG(LOG_ERR, ("Could not determine local IP address\n"));
+    ipcp_close(f->unit, "Could not determine local IP address");
+    return;
+  }
+
+  if (ppp_settings.usepeerdns && (go->dnsaddr[0] || go->dnsaddr[1])) {
+    /*pppGotDNSAddrs(go->dnsaddr[0], go->dnsaddr[1]);*/
+  }
+
+  /*
+   * Check that the peer is allowed to use the IP address it wants.
+   */
+  if (!auth_ip_addr(f->unit, ho->hisaddr)) {
+    IPCPDEBUG(LOG_ERR, ("Peer is not authorized to use remote address %s\n",
+        inet_ntoa(ho->hisaddr)));
+    ipcp_close(f->unit, "Unauthorized remote IP address");
+    return;
+  }
+
+  /* set tcp compression */
+  sifvjcomp(f->unit, ho->neg_vj, ho->cflag, ho->maxslotindex);
+
+  /*
+   * Set IP addresses and (if specified) netmask.
+   */
+  mask = GetMask(go->ouraddr);
+
+  if (!sifaddr(f->unit, go->ouraddr, ho->hisaddr, mask, go->dnsaddr[0], go->dnsaddr[1])) {
+    IPCPDEBUG(LOG_WARNING, ("sifaddr failed\n"));
+    ipcp_close(f->unit, "Interface configuration failed");
+    return;
+  }
+
+  /* bring the interface up for IP */
+  if (!sifup(f->unit)) {
+    IPCPDEBUG(LOG_WARNING, ("sifup failed\n"));
+    ipcp_close(f->unit, "Interface configuration failed");
+    return;
+  }
+
+  sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
+
+  /* assign a default route through the interface if required */
+  if (ipcp_wantoptions[f->unit].default_route) {
+    if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr)) {
+      default_route_set[f->unit] = 1;
+    }
+  }
+
+  IPCPDEBUG(LOG_NOTICE, ("local  IP address %s\n", inet_ntoa(go->ouraddr)));
+  IPCPDEBUG(LOG_NOTICE, ("remote IP address %s\n", inet_ntoa(ho->hisaddr)));
+  if (go->dnsaddr[0]) {
+    IPCPDEBUG(LOG_NOTICE, ("primary   DNS address %s\n", inet_ntoa(go->dnsaddr[0])));
+  }
+  if (go->dnsaddr[1]) {
+    IPCPDEBUG(LOG_NOTICE, ("secondary DNS address %s\n", inet_ntoa(go->dnsaddr[1])));
+  }
+}
+
+
+/*
+ * ipcp_down - IPCP has gone DOWN.
+ *
+ * Take the IP network interface down, clear its addresses
+ * and delete routes through it.
+ */
+static void
+ipcp_down(fsm *f)
+{
+  IPCPDEBUG(LOG_INFO, ("ipcp: down\n"));
+  np_down(f->unit, PPP_IP);
+  sifvjcomp(f->unit, 0, 0, 0);
+
+  sifdown(f->unit);
+  ipcp_clear_addrs(f->unit);
+}
+
+
+/*
+ * ipcp_clear_addrs() - clear the interface addresses, routes, etc.
+ */
+static void
+ipcp_clear_addrs(int unit)
+{
+  u32_t ouraddr, hisaddr;
+
+  ouraddr = ipcp_gotoptions[unit].ouraddr;
+  hisaddr = ipcp_hisoptions[unit].hisaddr;
+  if (default_route_set[unit]) {
+    cifdefaultroute(unit, ouraddr, hisaddr);
+    default_route_set[unit] = 0;
+  }
+  cifaddr(unit, ouraddr, hisaddr);
+}
+
+
+/*
+ * ipcp_finished - possibly shut down the lower layers.
+ */
+static void
+ipcp_finished(fsm *f)
+{
+  np_finished(f->unit, PPP_IP);
+}
+
+#if PPP_ADDITIONAL_CALLBACKS
+static int
+ipcp_printpkt(u_char *p, int plen, void (*printer) (void *, char *, ...), void *arg)
+{
+  LWIP_UNUSED_ARG(p);
+  LWIP_UNUSED_ARG(plen);
+  LWIP_UNUSED_ARG(printer);
+  LWIP_UNUSED_ARG(arg);
+  return 0;
+}
+
+/*
+ * ip_active_pkt - see if this IP packet is worth bringing the link up for.
+ * We don't bring the link up for IP fragments or for TCP FIN packets
+ * with no data.
+ */
+#define IP_HDRLEN   20  /* bytes */
+#define IP_OFFMASK  0x1fff
+#define IPPROTO_TCP 6
+#define TCP_HDRLEN  20
+#define TH_FIN      0x01
+
+/*
+ * We use these macros because the IP header may be at an odd address,
+ * and some compilers might use word loads to get th_off or ip_hl.
+ */
+
+#define net_short(x)    (((x)[0] << 8) + (x)[1])
+#define get_iphl(x)     (((unsigned char *)(x))[0] & 0xF)
+#define get_ipoff(x)    net_short((unsigned char *)(x) + 6)
+#define get_ipproto(x)  (((unsigned char *)(x))[9])
+#define get_tcpoff(x)   (((unsigned char *)(x))[12] >> 4)
+#define get_tcpflags(x) (((unsigned char *)(x))[13])
+
+static int
+ip_active_pkt(u_char *pkt, int len)
+{
+  u_char *tcp;
+  int hlen;
+
+  len -= PPP_HDRLEN;
+  pkt += PPP_HDRLEN;
+  if (len < IP_HDRLEN) {
+    return 0;
+  }
+  if ((get_ipoff(pkt) & IP_OFFMASK) != 0) {
+    return 0;
+  }
+  if (get_ipproto(pkt) != IPPROTO_TCP) {
+    return 1;
+  }
+  hlen = get_iphl(pkt) * 4;
+  if (len < hlen + TCP_HDRLEN) {
+    return 0;
+  }
+  tcp = pkt + hlen;
+  if ((get_tcpflags(tcp) & TH_FIN) != 0 && len == hlen + get_tcpoff(tcp) * 4) {
+    return 0;
+  }
+  return 1;
+}
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/ipcp.h b/ext/lwip/src/netif/ppp/ipcp.h
new file mode 100644
index 000000000..de03f460e
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/ipcp.h
@@ -0,0 +1,106 @@
+/*****************************************************************************
+* ipcp.h -  PPP IP NCP: Internet Protocol Network Control Protocol header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-04 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
+*   Original derived from BSD codes.
+*****************************************************************************/
+/*
+ * ipcp.h - IP Control Protocol definitions.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Id: ipcp.h,v 1.4 2010/01/18 20:49:43 goldsimon Exp $
+ */
+
+#ifndef IPCP_H
+#define IPCP_H
+
+/*
+ * Options.
+ */
+#define CI_ADDRS            1      /* IP Addresses */
+#define CI_COMPRESSTYPE     2      /* Compression Type */
+#define CI_ADDR             3
+
+#define CI_MS_DNS1          129    /* Primary DNS value */
+#define CI_MS_WINS1         128    /* Primary WINS value */
+#define CI_MS_DNS2          131    /* Secondary DNS value */
+#define CI_MS_WINS2         130    /* Secondary WINS value */
+
+#define IPCP_VJMODE_OLD     1      /* "old" mode (option # = 0x0037) */
+#define IPCP_VJMODE_RFC1172 2      /* "old-rfc"mode (option # = 0x002d) */
+#define IPCP_VJMODE_RFC1332 3      /* "new-rfc"mode (option # = 0x002d, */
+                                   /*  maxslot and slot number compression) */
+
+#define IPCP_VJ_COMP        0x002d /* current value for VJ compression option */
+#define IPCP_VJ_COMP_OLD    0x0037 /* "old" (i.e, broken) value for VJ */
+                                   /* compression option */ 
+
+typedef struct ipcp_options {
+  u_int   neg_addr      : 1; /* Negotiate IP Address? */
+  u_int   old_addrs     : 1; /* Use old (IP-Addresses) option? */
+  u_int   req_addr      : 1; /* Ask peer to send IP address? */
+  u_int   default_route : 1; /* Assign default route through interface? */
+  u_int   proxy_arp     : 1; /* Make proxy ARP entry for peer? */
+  u_int   neg_vj        : 1; /* Van Jacobson Compression? */
+  u_int   old_vj        : 1; /* use old (short) form of VJ option? */
+  u_int   accept_local  : 1; /* accept peer's value for ouraddr */
+  u_int   accept_remote : 1; /* accept peer's value for hisaddr */
+  u_int   req_dns1      : 1; /* Ask peer to send primary DNS address? */
+  u_int   req_dns2      : 1; /* Ask peer to send secondary DNS address? */
+  u_short vj_protocol;       /* protocol value to use in VJ option */
+  u_char  maxslotindex;      /* VJ slots - 1. */
+  u_char  cflag;             /* VJ slot compression flag. */
+  u32_t   ouraddr, hisaddr;  /* Addresses in NETWORK BYTE ORDER */
+  u32_t   dnsaddr[2];        /* Primary and secondary MS DNS entries */
+  u32_t   winsaddr[2];       /* Primary and secondary MS WINS entries */
+} ipcp_options;
+
+extern fsm ipcp_fsm[];
+extern ipcp_options ipcp_wantoptions[];
+extern ipcp_options ipcp_gotoptions[];
+extern ipcp_options ipcp_allowoptions[];
+extern ipcp_options ipcp_hisoptions[];
+
+extern struct protent ipcp_protent;
+
+#endif /* IPCP_H */
diff --git a/ext/lwip/src/netif/ppp/lcp.c b/ext/lwip/src/netif/ppp/lcp.c
new file mode 100644
index 000000000..54f758aa6
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/lcp.c
@@ -0,0 +1,2066 @@
+/*****************************************************************************
+* lcp.c - Network Link Control Protocol program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 by Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-01 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original.
+*****************************************************************************/
+
+/*
+ * lcp.c - PPP Link Control Protocol.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+ 
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "fsm.h"
+#include "chap.h"
+#include "magic.h"
+#include "auth.h"
+#include "lcp.h"
+
+#include <string.h>
+
+#if PPPOE_SUPPORT
+#include "netif/ppp_oe.h"
+#else
+#define PPPOE_MAXMTU PPP_MAXMRU
+#endif
+
+#if 0 /* UNUSED */
+/*
+ * LCP-related command-line options.
+ */
+int lcp_echo_interval = 0;  /* Interval between LCP echo-requests */
+int lcp_echo_fails = 0;     /* Tolerance to unanswered echo-requests */
+bool  lax_recv = 0;         /* accept control chars in asyncmap */
+
+static int setescape (char **);
+
+static option_t lcp_option_list[] = {
+    /* LCP options */
+    /* list stripped for simplicity */
+    {NULL}
+};
+#endif /* UNUSED */
+
+/* options */
+LinkPhase lcp_phase[NUM_PPP];          /* Phase of link session (RFC 1661) */
+static u_int lcp_echo_interval      = LCP_ECHOINTERVAL; /* Interval between LCP echo-requests */
+static u_int lcp_echo_fails         = LCP_MAXECHOFAILS; /* Tolerance to unanswered echo-requests */
+
+/* global vars */
+static fsm lcp_fsm[NUM_PPP];                            /* LCP fsm structure (global)*/
+lcp_options lcp_wantoptions[NUM_PPP];  /* Options that we want to request */
+lcp_options lcp_gotoptions[NUM_PPP];   /* Options that peer ack'd */
+lcp_options lcp_allowoptions[NUM_PPP]; /* Options we allow peer to request */
+lcp_options lcp_hisoptions[NUM_PPP];   /* Options that we ack'd */
+ext_accm xmit_accm[NUM_PPP];           /* extended transmit ACCM */
+
+static u32_t lcp_echos_pending      = 0;                /* Number of outstanding echo msgs */
+static u32_t lcp_echo_number        = 0;                /* ID number of next echo frame */
+static u32_t lcp_echo_timer_running = 0;                /* TRUE if a timer is running */
+
+/* @todo: do we really need such a large buffer? The typical 1500 bytes seem too much. */
+static u_char nak_buffer[PPP_MRU]; /* where we construct a nak packet */ 
+
+/*
+ * Callbacks for fsm code.  (CI = Configuration Information)
+ */
+static void lcp_resetci (fsm*);                   /* Reset our CI */
+static int  lcp_cilen (fsm*);                     /* Return length of our CI */
+static void lcp_addci (fsm*, u_char*, int*);      /* Add our CI to pkt */
+static int  lcp_ackci (fsm*, u_char*, int);       /* Peer ack'd our CI */
+static int  lcp_nakci (fsm*, u_char*, int);       /* Peer nak'd our CI */
+static int  lcp_rejci (fsm*, u_char*, int);       /* Peer rej'd our CI */
+static int  lcp_reqci (fsm*, u_char*, int*, int); /* Rcv peer CI */
+static void lcp_up (fsm*);                        /* We're UP */
+static void lcp_down (fsm*);                      /* We're DOWN */
+static void lcp_starting (fsm*);                  /* We need lower layer up */
+static void lcp_finished (fsm*);                  /* We need lower layer down */
+static int  lcp_extcode (fsm*, int, u_char, u_char*, int);
+static void lcp_rprotrej (fsm*, u_char*, int);
+
+/*
+ * routines to send LCP echos to peer
+ */
+
+static void lcp_echo_lowerup (int);
+static void lcp_echo_lowerdown (int);
+static void LcpEchoTimeout (void*);
+static void lcp_received_echo_reply (fsm*, int, u_char*, int);
+static void LcpSendEchoRequest (fsm*);
+static void LcpLinkFailure (fsm*);
+static void LcpEchoCheck (fsm*);
+
+static fsm_callbacks lcp_callbacks = { /* LCP callback routines */
+  lcp_resetci,  /* Reset our Configuration Information */
+  lcp_cilen,    /* Length of our Configuration Information */
+  lcp_addci,    /* Add our Configuration Information */
+  lcp_ackci,    /* ACK our Configuration Information */
+  lcp_nakci,    /* NAK our Configuration Information */
+  lcp_rejci,    /* Reject our Configuration Information */
+  lcp_reqci,    /* Request peer's Configuration Information */
+  lcp_up,       /* Called when fsm reaches LS_OPENED state */
+  lcp_down,     /* Called when fsm leaves LS_OPENED state */
+  lcp_starting, /* Called when we want the lower layer up */
+  lcp_finished, /* Called when we want the lower layer down */
+  NULL,         /* Called when Protocol-Reject received */
+  NULL,         /* Retransmission is necessary */
+  lcp_extcode,  /* Called to handle LCP-specific codes */
+  "LCP"         /* String name of protocol */
+};
+
+/*
+ * Protocol entry points.
+ * Some of these are called directly.
+ */
+
+static void lcp_input (int, u_char *, int);
+static void lcp_protrej (int);
+
+struct protent lcp_protent = {
+    PPP_LCP,
+    lcp_init,
+    lcp_input,
+    lcp_protrej,
+    lcp_lowerup,
+    lcp_lowerdown,
+    lcp_open,
+    lcp_close,
+#if PPP_ADDITIONAL_CALLBACKS
+    lcp_printpkt,
+    NULL,
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+    1,
+    "LCP",
+#if PPP_ADDITIONAL_CALLBACKS
+    NULL,
+    NULL,
+    NULL
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+};
+
+int lcp_loopbackfail = DEFLOOPBACKFAIL;
+
+/*
+ * Length of each type of configuration option (in octets)
+ */
+#define CILEN_VOID  2
+#define CILEN_CHAR  3
+#define CILEN_SHORT 4 /* CILEN_VOID + sizeof(short) */
+#define CILEN_CHAP  5 /* CILEN_VOID + sizeof(short) + 1 */
+#define CILEN_LONG  6 /* CILEN_VOID + sizeof(long) */
+#define CILEN_LQR   8 /* CILEN_VOID + sizeof(short) + sizeof(long) */
+#define CILEN_CBCP  3
+
+#define CODENAME(x)  ((x) == CONFACK ? "ACK" : (x) == CONFNAK ? "NAK" : "REJ")
+
+#if 0 /* UNUSED */
+/*
+ * setescape - add chars to the set we escape on transmission.
+ */
+static int
+setescape(argv)
+    char **argv;
+{
+    int n, ret;
+    char *p, *endp;
+
+    p = *argv;
+    ret = 1;
+    while (*p) {
+      n = strtol(p, &endp, 16);
+      if (p == endp) {
+        option_error("escape parameter contains invalid hex number '%s'", p);
+        return 0;
+      }
+      p = endp;
+      if (n < 0 || n == 0x5E || n > 0xFF) {
+        option_error("can't escape character 0x%x", n);
+        ret = 0;
+      } else
+        xmit_accm[0][n >> 5] |= 1 << (n & 0x1F);
+      while (*p == ',' || *p == ' ')
+        ++p;
+    }
+    return ret;
+}
+#endif /* UNUSED */
+
+/*
+ * lcp_init - Initialize LCP.
+ */
+void
+lcp_init(int unit)
+{
+  fsm         *f  = &lcp_fsm[unit];
+  lcp_options *wo = &lcp_wantoptions[unit];
+  lcp_options *ao = &lcp_allowoptions[unit];
+
+  f->unit      = unit;
+  f->protocol  = PPP_LCP;
+  f->callbacks = &lcp_callbacks;
+
+  fsm_init(f);
+
+  wo->passive           = 0;
+  wo->silent            = 0;
+  wo->restart           = 0;               /* Set to 1 in kernels or multi-line implementations */
+  wo->neg_mru           = 1;
+  wo->mru               = PPP_DEFMRU;
+  wo->neg_asyncmap      = 1;
+  wo->asyncmap          = 0x00000000l;     /* Assume don't need to escape any ctl chars. */
+  wo->neg_chap          = 0;               /* Set to 1 on server */
+  wo->neg_upap          = 0;               /* Set to 1 on server */
+  wo->chap_mdtype       = CHAP_DIGEST_MD5;
+  wo->neg_magicnumber   = 1;
+  wo->neg_pcompression  = 1;
+  wo->neg_accompression = 1;
+  wo->neg_lqr           = 0;               /* no LQR implementation yet */
+  wo->neg_cbcp          = 0;
+
+  ao->neg_mru           = 1;
+  ao->mru               = PPP_MAXMRU;
+  ao->neg_asyncmap      = 1;
+  ao->asyncmap          = 0x00000000l;     /* Assume don't need to escape any ctl chars. */
+  ao->neg_chap          = (CHAP_SUPPORT != 0);
+  ao->chap_mdtype       = CHAP_DIGEST_MD5;
+  ao->neg_upap          = (PAP_SUPPORT != 0);
+  ao->neg_magicnumber   = 1;
+  ao->neg_pcompression  = 1;
+  ao->neg_accompression = 1;
+  ao->neg_lqr           = 0;               /* no LQR implementation yet */
+  ao->neg_cbcp          = (CBCP_SUPPORT != 0);
+
+  /* 
+   * Set transmit escape for the flag and escape characters plus anything
+   * set for the allowable options.
+   */
+  memset(xmit_accm[unit], 0, sizeof(xmit_accm[0]));
+  xmit_accm[unit][15] = 0x60;
+  xmit_accm[unit][0]  = (u_char)((ao->asyncmap        & 0xFF));
+  xmit_accm[unit][1]  = (u_char)((ao->asyncmap >> 8)  & 0xFF);
+  xmit_accm[unit][2]  = (u_char)((ao->asyncmap >> 16) & 0xFF);
+  xmit_accm[unit][3]  = (u_char)((ao->asyncmap >> 24) & 0xFF);
+  LCPDEBUG(LOG_INFO, ("lcp_init: xmit_accm=%X %X %X %X\n",
+        xmit_accm[unit][0],
+        xmit_accm[unit][1],
+        xmit_accm[unit][2],
+        xmit_accm[unit][3]));
+  
+  lcp_phase[unit] = PHASE_INITIALIZE;
+}
+
+
+/*
+ * lcp_open - LCP is allowed to come up.
+ */
+void
+lcp_open(int unit)
+{
+  fsm         *f  = &lcp_fsm[unit];
+  lcp_options *wo = &lcp_wantoptions[unit];
+
+  f->flags = 0;
+  if (wo->passive) {
+    f->flags |= OPT_PASSIVE;
+  }
+  if (wo->silent) {
+    f->flags |= OPT_SILENT;
+  }
+  fsm_open(f);
+
+  lcp_phase[unit] = PHASE_ESTABLISH;
+}
+
+
+/*
+ * lcp_close - Take LCP down.
+ */
+void
+lcp_close(int unit, char *reason)
+{
+  fsm *f = &lcp_fsm[unit];
+
+  if (lcp_phase[unit] != PHASE_DEAD) {
+    lcp_phase[unit] = PHASE_TERMINATE;
+  }
+  if (f->state == LS_STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
+    /*
+     * This action is not strictly according to the FSM in RFC1548,
+     * but it does mean that the program terminates if you do an
+     * lcp_close() in passive/silent mode when a connection hasn't
+     * been established.
+     */
+    f->state = LS_CLOSED;
+    lcp_finished(f);
+  } else {
+    fsm_close(f, reason);
+  }
+}
+
+
+/*
+ * lcp_lowerup - The lower layer is up.
+ */
+void
+lcp_lowerup(int unit)
+{
+  lcp_options *wo = &lcp_wantoptions[unit];
+
+  /*
+   * Don't use A/C or protocol compression on transmission,
+   * but accept A/C and protocol compressed packets
+   * if we are going to ask for A/C and protocol compression.
+   */
+  ppp_set_xaccm(unit, &xmit_accm[unit]);
+  ppp_send_config(unit, PPP_MRU, 0xffffffffl, 0, 0);
+  ppp_recv_config(unit, PPP_MRU, 0x00000000l,
+  wo->neg_pcompression, wo->neg_accompression);
+  peer_mru[unit] = PPP_MRU;
+  lcp_allowoptions[unit].asyncmap = (u_long)xmit_accm[unit][0]
+                                 | ((u_long)xmit_accm[unit][1] << 8)
+                                 | ((u_long)xmit_accm[unit][2] << 16)
+                                 | ((u_long)xmit_accm[unit][3] << 24);
+  LCPDEBUG(LOG_INFO, ("lcp_lowerup: asyncmap=%X %X %X %X\n",
+            xmit_accm[unit][3],
+            xmit_accm[unit][2],
+            xmit_accm[unit][1],
+            xmit_accm[unit][0]));
+
+  fsm_lowerup(&lcp_fsm[unit]);
+}
+
+
+/*
+ * lcp_lowerdown - The lower layer is down.
+ */
+void
+lcp_lowerdown(int unit)
+{
+  fsm_lowerdown(&lcp_fsm[unit]);
+}
+
+
+/*
+ * lcp_input - Input LCP packet.
+ */
+static void
+lcp_input(int unit, u_char *p, int len)
+{
+  fsm *f = &lcp_fsm[unit];
+
+  fsm_input(f, p, len);
+}
+
+
+/*
+ * lcp_extcode - Handle a LCP-specific code.
+ */
+static int
+lcp_extcode(fsm *f, int code, u_char id, u_char *inp, int len)
+{
+  u_char *magp;
+
+  switch( code ){
+    case PROTREJ:
+      lcp_rprotrej(f, inp, len);
+      break;
+  
+    case ECHOREQ:
+      if (f->state != LS_OPENED) {
+        break;
+      }
+      LCPDEBUG(LOG_INFO, ("lcp: Echo-Request, Rcvd id %d\n", id));
+      magp = inp;
+      PUTLONG(lcp_gotoptions[f->unit].magicnumber, magp);
+      fsm_sdata(f, ECHOREP, id, inp, len);
+      break;
+
+    case ECHOREP:
+      lcp_received_echo_reply(f, id, inp, len);
+      break;
+
+    case DISCREQ:
+      break;
+
+    default:
+      return 0;
+  }
+  return 1;
+}
+
+
+/*
+ * lcp_rprotrej - Receive an Protocol-Reject.
+ *
+ * Figure out which protocol is rejected and inform it.
+ */
+static void
+lcp_rprotrej(fsm *f, u_char *inp, int len)
+{
+  int i;
+  struct protent *protp;
+  u_short prot;
+
+  if (len < (int)sizeof (u_short)) {
+    LCPDEBUG(LOG_INFO, ("lcp_rprotrej: Rcvd short Protocol-Reject packet!\n"));
+    return;
+  }
+
+  GETSHORT(prot, inp);
+
+  LCPDEBUG(LOG_INFO, ("lcp_rprotrej: Rcvd Protocol-Reject packet for %x!\n", prot));
+
+  /*
+   * Protocol-Reject packets received in any state other than the LCP
+   * LS_OPENED state SHOULD be silently discarded.
+   */
+  if( f->state != LS_OPENED ) {
+    LCPDEBUG(LOG_INFO, ("Protocol-Reject discarded: LCP in state %d\n", f->state));
+    return;
+  }
+
+  /*
+   * Upcall the proper Protocol-Reject routine.
+   */
+  for (i = 0; (protp = ppp_protocols[i]) != NULL; ++i) {
+    if (protp->protocol == prot && protp->enabled_flag) {
+      (*protp->protrej)(f->unit);
+      return;
+    }
+  }
+
+  LCPDEBUG(LOG_WARNING, ("Protocol-Reject for unsupported protocol 0x%x\n", prot));
+}
+
+
+/*
+ * lcp_protrej - A Protocol-Reject was received.
+ */
+static void
+lcp_protrej(int unit)
+{
+  LWIP_UNUSED_ARG(unit);
+  /*
+   * Can't reject LCP!
+   */
+  LCPDEBUG(LOG_WARNING, ("lcp_protrej: Received Protocol-Reject for LCP!\n"));
+  fsm_protreject(&lcp_fsm[unit]);
+}
+
+
+/*
+ * lcp_sprotrej - Send a Protocol-Reject for some protocol.
+ */
+void
+lcp_sprotrej(int unit, u_char *p, int len)
+{
+  /*
+   * Send back the protocol and the information field of the
+   * rejected packet.  We only get here if LCP is in the LS_OPENED state.
+   */
+
+  fsm_sdata(&lcp_fsm[unit], PROTREJ, ++lcp_fsm[unit].id, p, len);
+}
+
+
+/*
+ * lcp_resetci - Reset our CI.
+ */
+static void
+lcp_resetci(fsm *f)
+{
+  lcp_wantoptions[f->unit].magicnumber = magic();
+  lcp_wantoptions[f->unit].numloops = 0;
+  lcp_gotoptions[f->unit] = lcp_wantoptions[f->unit];
+  peer_mru[f->unit] = PPP_MRU;
+  auth_reset(f->unit);
+}
+
+
+/*
+ * lcp_cilen - Return length of our CI.
+ */
+static int
+lcp_cilen(fsm *f)
+{
+  lcp_options *go = &lcp_gotoptions[f->unit];
+
+#define LENCIVOID(neg)  ((neg) ? CILEN_VOID : 0)
+#define LENCICHAP(neg)  ((neg) ? CILEN_CHAP : 0)
+#define LENCISHORT(neg) ((neg) ? CILEN_SHORT : 0)
+#define LENCILONG(neg)  ((neg) ? CILEN_LONG : 0)
+#define LENCILQR(neg)   ((neg) ? CILEN_LQR: 0)
+#define LENCICBCP(neg)  ((neg) ? CILEN_CBCP: 0)
+  /*
+   * NB: we only ask for one of CHAP and UPAP, even if we will
+   * accept either.
+   */
+  return (LENCISHORT(go->neg_mru && go->mru != PPP_DEFMRU) +
+          LENCILONG(go->neg_asyncmap && go->asyncmap != 0xFFFFFFFFl) +
+          LENCICHAP(go->neg_chap) +
+          LENCISHORT(!go->neg_chap && go->neg_upap) +
+          LENCILQR(go->neg_lqr) +
+          LENCICBCP(go->neg_cbcp) +
+          LENCILONG(go->neg_magicnumber) +
+          LENCIVOID(go->neg_pcompression) +
+          LENCIVOID(go->neg_accompression));
+}
+
+
+/*
+ * lcp_addci - Add our desired CIs to a packet.
+ */
+static void
+lcp_addci(fsm *f, u_char *ucp, int *lenp)
+{
+  lcp_options *go = &lcp_gotoptions[f->unit];
+  u_char *start_ucp = ucp;
+
+#define ADDCIVOID(opt, neg) \
+  if (neg) { \
+    LCPDEBUG(LOG_INFO, ("lcp_addci: opt=%d\n", opt)); \
+    PUTCHAR(opt, ucp); \
+    PUTCHAR(CILEN_VOID, ucp); \
+  }
+#define ADDCISHORT(opt, neg, val) \
+  if (neg) { \
+    LCPDEBUG(LOG_INFO, ("lcp_addci: INT opt=%d %X\n", opt, val)); \
+    PUTCHAR(opt, ucp); \
+    PUTCHAR(CILEN_SHORT, ucp); \
+    PUTSHORT(val, ucp); \
+  }
+#define ADDCICHAP(opt, neg, val, digest) \
+  if (neg) { \
+    LCPDEBUG(LOG_INFO, ("lcp_addci: CHAP opt=%d %X\n", opt, val)); \
+    PUTCHAR(opt, ucp); \
+    PUTCHAR(CILEN_CHAP, ucp); \
+    PUTSHORT(val, ucp); \
+    PUTCHAR(digest, ucp); \
+  }
+#define ADDCILONG(opt, neg, val) \
+  if (neg) { \
+    LCPDEBUG(LOG_INFO, ("lcp_addci: L opt=%d %lX\n", opt, val)); \
+    PUTCHAR(opt, ucp); \
+    PUTCHAR(CILEN_LONG, ucp); \
+    PUTLONG(val, ucp); \
+  }
+#define ADDCILQR(opt, neg, val) \
+  if (neg) { \
+    LCPDEBUG(LOG_INFO, ("lcp_addci: LQR opt=%d %lX\n", opt, val)); \
+    PUTCHAR(opt, ucp); \
+    PUTCHAR(CILEN_LQR, ucp); \
+    PUTSHORT(PPP_LQR, ucp); \
+    PUTLONG(val, ucp); \
+  }
+#define ADDCICHAR(opt, neg, val) \
+  if (neg) { \
+    LCPDEBUG(LOG_INFO, ("lcp_addci: CHAR opt=%d %X '%z'\n", opt, val, val)); \
+    PUTCHAR(opt, ucp); \
+    PUTCHAR(CILEN_CHAR, ucp); \
+    PUTCHAR(val, ucp); \
+  }
+
+  ADDCISHORT(CI_MRU, go->neg_mru && go->mru != PPP_DEFMRU, go->mru);
+  ADDCILONG(CI_ASYNCMAP, go->neg_asyncmap && go->asyncmap != 0xFFFFFFFFl, go->asyncmap);
+  ADDCICHAP(CI_AUTHTYPE, go->neg_chap, PPP_CHAP, go->chap_mdtype);
+  ADDCISHORT(CI_AUTHTYPE, !go->neg_chap && go->neg_upap, PPP_PAP);
+  ADDCILQR(CI_QUALITY, go->neg_lqr, go->lqr_period);
+  ADDCICHAR(CI_CALLBACK, go->neg_cbcp, CBCP_OPT);
+  ADDCILONG(CI_MAGICNUMBER, go->neg_magicnumber, go->magicnumber);
+  ADDCIVOID(CI_PCOMPRESSION, go->neg_pcompression);
+  ADDCIVOID(CI_ACCOMPRESSION, go->neg_accompression);
+
+  if (ucp - start_ucp != *lenp) {
+    /* this should never happen, because peer_mtu should be 1500 */
+    LCPDEBUG(LOG_ERR, ("Bug in lcp_addci: wrong length\n"));
+  }
+}
+
+
+/*
+ * lcp_ackci - Ack our CIs.
+ * This should not modify any state if the Ack is bad.
+ *
+ * Returns:
+ *  0 - Ack was bad.
+ *  1 - Ack was good.
+ */
+static int
+lcp_ackci(fsm *f, u_char *p, int len)
+{
+  lcp_options *go = &lcp_gotoptions[f->unit];
+  u_char cilen, citype, cichar;
+  u_short cishort;
+  u32_t cilong;
+
+  /*
+   * CIs must be in exactly the same order that we sent.
+   * Check packet length and CI length at each step.
+   * If we find any deviations, then this packet is bad.
+   */
+#define ACKCIVOID(opt, neg) \
+  if (neg) { \
+    if ((len -= CILEN_VOID) < 0) \
+      goto bad; \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != CILEN_VOID || citype != opt) \
+      goto bad; \
+  }
+#define ACKCISHORT(opt, neg, val) \
+  if (neg) { \
+    if ((len -= CILEN_SHORT) < 0) \
+      goto bad; \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != CILEN_SHORT || citype != opt) \
+      goto bad; \
+    GETSHORT(cishort, p); \
+    if (cishort != val) \
+      goto bad; \
+  }
+#define ACKCICHAR(opt, neg, val) \
+  if (neg) { \
+    if ((len -= CILEN_CHAR) < 0) \
+      goto bad; \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != CILEN_CHAR || citype != opt) \
+      goto bad; \
+    GETCHAR(cichar, p); \
+    if (cichar != val) \
+      goto bad; \
+  }
+#define ACKCICHAP(opt, neg, val, digest) \
+  if (neg) { \
+    if ((len -= CILEN_CHAP) < 0) \
+      goto bad; \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != CILEN_CHAP || citype != opt) \
+      goto bad; \
+    GETSHORT(cishort, p); \
+    if (cishort != val) \
+      goto bad; \
+    GETCHAR(cichar, p); \
+    if (cichar != digest) \
+      goto bad; \
+  }
+#define ACKCILONG(opt, neg, val) \
+  if (neg) { \
+    if ((len -= CILEN_LONG) < 0) \
+      goto bad; \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != CILEN_LONG ||  citype != opt) \
+      goto bad; \
+    GETLONG(cilong, p); \
+    if (cilong != val) \
+      goto bad; \
+  }
+#define ACKCILQR(opt, neg, val) \
+  if (neg) { \
+    if ((len -= CILEN_LQR) < 0) \
+      goto bad; \
+    GETCHAR(citype, p); \
+    GETCHAR(cilen, p); \
+    if (cilen != CILEN_LQR || citype != opt) \
+      goto bad; \
+    GETSHORT(cishort, p); \
+    if (cishort != PPP_LQR) \
+      goto bad; \
+    GETLONG(cilong, p); \
+    if (cilong != val) \
+      goto bad; \
+  }
+
+  ACKCISHORT(CI_MRU, go->neg_mru && go->mru != PPP_DEFMRU, go->mru);
+  ACKCILONG(CI_ASYNCMAP, go->neg_asyncmap && go->asyncmap != 0xFFFFFFFFl, go->asyncmap);
+  ACKCICHAP(CI_AUTHTYPE, go->neg_chap, PPP_CHAP, go->chap_mdtype);
+  ACKCISHORT(CI_AUTHTYPE, !go->neg_chap && go->neg_upap, PPP_PAP);
+  ACKCILQR(CI_QUALITY, go->neg_lqr, go->lqr_period);
+  ACKCICHAR(CI_CALLBACK, go->neg_cbcp, CBCP_OPT);
+  ACKCILONG(CI_MAGICNUMBER, go->neg_magicnumber, go->magicnumber);
+  ACKCIVOID(CI_PCOMPRESSION, go->neg_pcompression);
+  ACKCIVOID(CI_ACCOMPRESSION, go->neg_accompression);
+
+  /*
+   * If there are any remaining CIs, then this packet is bad.
+   */
+  if (len != 0) {
+    goto bad;
+  }
+  LCPDEBUG(LOG_INFO, ("lcp_acki: Ack\n"));
+  return (1);
+bad:
+  LCPDEBUG(LOG_WARNING, ("lcp_acki: received bad Ack!\n"));
+  return (0);
+}
+
+
+/*
+ * lcp_nakci - Peer has sent a NAK for some of our CIs.
+ * This should not modify any state if the Nak is bad
+ * or if LCP is in the LS_OPENED state.
+ *
+ * Returns:
+ *  0 - Nak was bad.
+ *  1 - Nak was good.
+ */
+static int
+lcp_nakci(fsm *f, u_char *p, int len)
+{
+  lcp_options *go = &lcp_gotoptions[f->unit];
+  lcp_options *wo = &lcp_wantoptions[f->unit];
+  u_char citype, cichar, *next;
+  u_short cishort;
+  u32_t cilong;
+  lcp_options no;     /* options we've seen Naks for */
+  lcp_options try;    /* options to request next time */
+  int looped_back = 0;
+  int cilen;
+
+  BZERO(&no, sizeof(no));
+  try = *go;
+
+  /*
+   * Any Nak'd CIs must be in exactly the same order that we sent.
+   * Check packet length and CI length at each step.
+   * If we find any deviations, then this packet is bad.
+   */
+#define NAKCIVOID(opt, neg, code) \
+  if (go->neg && \
+      len >= CILEN_VOID && \
+      p[1] == CILEN_VOID && \
+      p[0] == opt) { \
+    len -= CILEN_VOID; \
+    INCPTR(CILEN_VOID, p); \
+    no.neg = 1; \
+    code \
+  }
+#define NAKCICHAP(opt, neg, code) \
+  if (go->neg && \
+      len >= CILEN_CHAP && \
+      p[1] == CILEN_CHAP && \
+      p[0] == opt) { \
+    len -= CILEN_CHAP; \
+    INCPTR(2, p); \
+    GETSHORT(cishort, p); \
+    GETCHAR(cichar, p); \
+    no.neg = 1; \
+    code \
+  }
+#define NAKCICHAR(opt, neg, code) \
+  if (go->neg && \
+      len >= CILEN_CHAR && \
+      p[1] == CILEN_CHAR && \
+      p[0] == opt) { \
+    len -= CILEN_CHAR; \
+    INCPTR(2, p); \
+    GETCHAR(cichar, p); \
+    no.neg = 1; \
+    code \
+  }
+#define NAKCISHORT(opt, neg, code) \
+  if (go->neg && \
+      len >= CILEN_SHORT && \
+      p[1] == CILEN_SHORT && \
+      p[0] == opt) { \
+    len -= CILEN_SHORT; \
+    INCPTR(2, p); \
+    GETSHORT(cishort, p); \
+    no.neg = 1; \
+    code \
+  }
+#define NAKCILONG(opt, neg, code) \
+  if (go->neg && \
+      len >= CILEN_LONG && \
+      p[1] == CILEN_LONG && \
+      p[0] == opt) { \
+    len -= CILEN_LONG; \
+    INCPTR(2, p); \
+    GETLONG(cilong, p); \
+    no.neg = 1; \
+    code \
+  }
+#define NAKCILQR(opt, neg, code) \
+  if (go->neg && \
+      len >= CILEN_LQR && \
+      p[1] == CILEN_LQR && \
+      p[0] == opt) { \
+    len -= CILEN_LQR; \
+    INCPTR(2, p); \
+    GETSHORT(cishort, p); \
+    GETLONG(cilong, p); \
+    no.neg = 1; \
+    code \
+  }
+
+  /*
+   * We don't care if they want to send us smaller packets than
+   * we want.  Therefore, accept any MRU less than what we asked for,
+   * but then ignore the new value when setting the MRU in the kernel.
+   * If they send us a bigger MRU than what we asked, accept it, up to
+   * the limit of the default MRU we'd get if we didn't negotiate.
+   */
+  if (go->neg_mru && go->mru != PPP_DEFMRU) {
+    NAKCISHORT(CI_MRU, neg_mru,
+      if (cishort <= wo->mru || cishort < PPP_DEFMRU) {
+        try.mru = cishort;
+      }
+    );
+  }
+
+  /*
+   * Add any characters they want to our (receive-side) asyncmap.
+   */
+  if (go->neg_asyncmap && go->asyncmap != 0xFFFFFFFFl) {
+    NAKCILONG(CI_ASYNCMAP, neg_asyncmap,
+      try.asyncmap = go->asyncmap | cilong;
+    );
+  }
+
+  /*
+   * If they've nak'd our authentication-protocol, check whether
+   * they are proposing a different protocol, or a different
+   * hash algorithm for CHAP.
+   */
+  if ((go->neg_chap || go->neg_upap)
+      && len >= CILEN_SHORT
+      && p[0] == CI_AUTHTYPE && p[1] >= CILEN_SHORT && p[1] <= len) {
+    cilen = p[1];
+    len -= cilen;
+    no.neg_chap = go->neg_chap;
+    no.neg_upap = go->neg_upap;
+    INCPTR(2, p);
+    GETSHORT(cishort, p);
+    if (cishort == PPP_PAP && cilen == CILEN_SHORT) {
+      /*
+       * If we were asking for CHAP, they obviously don't want to do it.
+       * If we weren't asking for CHAP, then we were asking for PAP,
+       * in which case this Nak is bad.
+       */
+      if (!go->neg_chap) {
+        goto bad;
+      }
+      try.neg_chap = 0;
+    
+    } else if (cishort == PPP_CHAP && cilen == CILEN_CHAP) {
+      GETCHAR(cichar, p);
+      if (go->neg_chap) {
+        /*
+         * We were asking for CHAP/MD5; they must want a different
+         * algorithm.  If they can't do MD5, we'll have to stop
+         * asking for CHAP.
+         */
+        if (cichar != go->chap_mdtype) {
+          try.neg_chap = 0;
+        }
+      } else {
+        /*
+         * Stop asking for PAP if we were asking for it.
+         */
+        try.neg_upap = 0;
+      }
+    
+    } else {
+      /*
+       * We don't recognize what they're suggesting.
+       * Stop asking for what we were asking for.
+       */
+      if (go->neg_chap) {
+        try.neg_chap = 0;
+      } else {
+        try.neg_upap = 0;
+      }
+      p += cilen - CILEN_SHORT;
+    }
+  }
+
+  /*
+   * If they can't cope with our link quality protocol, we'll have
+   * to stop asking for LQR.  We haven't got any other protocol.
+   * If they Nak the reporting period, take their value XXX ?
+   */
+  NAKCILQR(CI_QUALITY, neg_lqr,
+    if (cishort != PPP_LQR) {
+      try.neg_lqr = 0;
+    } else {
+      try.lqr_period = cilong;
+    }
+  );
+
+  /*
+   * Only implementing CBCP...not the rest of the callback options
+   */
+  NAKCICHAR(CI_CALLBACK, neg_cbcp,
+    try.neg_cbcp = 0;
+  );
+
+  /*
+   * Check for a looped-back line.
+   */
+  NAKCILONG(CI_MAGICNUMBER, neg_magicnumber,
+    try.magicnumber = magic();
+    looped_back = 1;
+  );
+
+  /*
+   * Peer shouldn't send Nak for protocol compression or
+   * address/control compression requests; they should send
+   * a Reject instead.  If they send a Nak, treat it as a Reject.
+   */
+  NAKCIVOID(CI_PCOMPRESSION, neg_pcompression,
+    try.neg_pcompression = 0;
+  );
+  NAKCIVOID(CI_ACCOMPRESSION, neg_accompression,
+    try.neg_accompression = 0;
+  );
+
+  /*
+   * There may be remaining CIs, if the peer is requesting negotiation
+   * on an option that we didn't include in our request packet.
+   * If we see an option that we requested, or one we've already seen
+   * in this packet, then this packet is bad.
+   * If we wanted to respond by starting to negotiate on the requested
+   * option(s), we could, but we don't, because except for the
+   * authentication type and quality protocol, if we are not negotiating
+   * an option, it is because we were told not to.
+   * For the authentication type, the Nak from the peer means
+   * `let me authenticate myself with you' which is a bit pointless.
+   * For the quality protocol, the Nak means `ask me to send you quality
+   * reports', but if we didn't ask for them, we don't want them.
+   * An option we don't recognize represents the peer asking to
+   * negotiate some option we don't support, so ignore it.
+   */
+  while (len > CILEN_VOID) {
+    GETCHAR(citype, p);
+    GETCHAR(cilen, p);
+    if (cilen < CILEN_VOID || (len -= cilen) < 0) {
+      goto bad;
+    }
+    next = p + cilen - 2;
+
+    switch (citype) {
+      case CI_MRU:
+        if ((go->neg_mru && go->mru != PPP_DEFMRU)
+            || no.neg_mru || cilen != CILEN_SHORT) {
+          goto bad;
+        }
+        GETSHORT(cishort, p);
+        if (cishort < PPP_DEFMRU) {
+          try.mru = cishort;
+        }
+        break;
+      case CI_ASYNCMAP:
+        if ((go->neg_asyncmap && go->asyncmap != 0xFFFFFFFFl)
+            || no.neg_asyncmap || cilen != CILEN_LONG) {
+          goto bad;
+        }
+        break;
+      case CI_AUTHTYPE:
+        if (go->neg_chap || no.neg_chap || go->neg_upap || no.neg_upap) {
+          goto bad;
+        }
+        break;
+      case CI_MAGICNUMBER:
+        if (go->neg_magicnumber || no.neg_magicnumber ||
+            cilen != CILEN_LONG) {
+          goto bad;
+        }
+        break;
+      case CI_PCOMPRESSION:
+        if (go->neg_pcompression || no.neg_pcompression
+            || cilen != CILEN_VOID) {
+          goto bad;
+        }
+        break;
+      case CI_ACCOMPRESSION:
+        if (go->neg_accompression || no.neg_accompression
+            || cilen != CILEN_VOID) {
+          goto bad;
+        }
+        break;
+      case CI_QUALITY:
+        if (go->neg_lqr || no.neg_lqr || cilen != CILEN_LQR) {
+          goto bad;
+        }
+        break;
+    }
+    p = next;
+  }
+
+  /* If there is still anything left, this packet is bad. */
+  if (len != 0) {
+    goto bad;
+  }
+
+  /*
+  * OK, the Nak is good.  Now we can update state.
+  */
+  if (f->state != LS_OPENED) {
+    if (looped_back) {
+      if (++try.numloops >= lcp_loopbackfail) {
+        LCPDEBUG(LOG_NOTICE, ("Serial line is looped back.\n"));
+        lcp_close(f->unit, "Loopback detected");
+      }
+    } else {
+      try.numloops = 0;
+    }
+    *go = try;
+  }
+
+  return 1;
+
+bad:
+  LCPDEBUG(LOG_WARNING, ("lcp_nakci: received bad Nak!\n"));
+  return 0;
+}
+
+
+/*
+ * lcp_rejci - Peer has Rejected some of our CIs.
+ * This should not modify any state if the Reject is bad
+ * or if LCP is in the LS_OPENED state.
+ *
+ * Returns:
+ *  0 - Reject was bad.
+ *  1 - Reject was good.
+ */
+static int
+lcp_rejci(fsm *f, u_char *p, int len)
+{
+  lcp_options *go = &lcp_gotoptions[f->unit];
+  u_char cichar;
+  u_short cishort;
+  u32_t cilong;
+  lcp_options try; /* options to request next time */
+
+  try = *go;
+
+  /*
+   * Any Rejected CIs must be in exactly the same order that we sent.
+   * Check packet length and CI length at each step.
+   * If we find any deviations, then this packet is bad.
+   */
+#define REJCIVOID(opt, neg) \
+  if (go->neg && \
+      len >= CILEN_VOID && \
+      p[1] == CILEN_VOID && \
+      p[0] == opt) { \
+    len -= CILEN_VOID; \
+    INCPTR(CILEN_VOID, p); \
+    try.neg = 0; \
+    LCPDEBUG(LOG_INFO, ("lcp_rejci: void opt %d rejected\n", opt)); \
+  }
+#define REJCISHORT(opt, neg, val) \
+  if (go->neg && \
+      len >= CILEN_SHORT && \
+      p[1] == CILEN_SHORT && \
+      p[0] == opt) { \
+    len -= CILEN_SHORT; \
+    INCPTR(2, p); \
+    GETSHORT(cishort, p); \
+    /* Check rejected value. */ \
+    if (cishort != val) { \
+      goto bad; \
+    } \
+    try.neg = 0; \
+    LCPDEBUG(LOG_INFO, ("lcp_rejci: short opt %d rejected\n", opt)); \
+  }
+#define REJCICHAP(opt, neg, val, digest) \
+  if (go->neg && \
+      len >= CILEN_CHAP && \
+      p[1] == CILEN_CHAP && \
+      p[0] == opt) { \
+    len -= CILEN_CHAP; \
+    INCPTR(2, p); \
+    GETSHORT(cishort, p); \
+    GETCHAR(cichar, p); \
+    /* Check rejected value. */ \
+    if (cishort != val || cichar != digest) { \
+      goto bad; \
+    } \
+    try.neg = 0; \
+    try.neg_upap = 0; \
+    LCPDEBUG(LOG_INFO, ("lcp_rejci: chap opt %d rejected\n", opt)); \
+  }
+#define REJCILONG(opt, neg, val) \
+  if (go->neg && \
+      len >= CILEN_LONG && \
+      p[1] == CILEN_LONG && \
+      p[0] == opt) { \
+    len -= CILEN_LONG; \
+    INCPTR(2, p); \
+    GETLONG(cilong, p); \
+    /* Check rejected value. */ \
+    if (cilong != val) { \
+      goto bad; \
+    } \
+    try.neg = 0; \
+    LCPDEBUG(LOG_INFO, ("lcp_rejci: long opt %d rejected\n", opt)); \
+  }
+#define REJCILQR(opt, neg, val) \
+  if (go->neg && \
+      len >= CILEN_LQR && \
+      p[1] == CILEN_LQR && \
+      p[0] == opt) { \
+    len -= CILEN_LQR; \
+    INCPTR(2, p); \
+    GETSHORT(cishort, p); \
+    GETLONG(cilong, p); \
+    /* Check rejected value. */ \
+    if (cishort != PPP_LQR || cilong != val) { \
+      goto bad; \
+    } \
+    try.neg = 0; \
+    LCPDEBUG(LOG_INFO, ("lcp_rejci: LQR opt %d rejected\n", opt)); \
+  }
+#define REJCICBCP(opt, neg, val) \
+  if (go->neg && \
+      len >= CILEN_CBCP && \
+      p[1] == CILEN_CBCP && \
+      p[0] == opt) { \
+    len -= CILEN_CBCP; \
+    INCPTR(2, p); \
+    GETCHAR(cichar, p); \
+    /* Check rejected value. */ \
+    if (cichar != val) { \
+      goto bad; \
+    } \
+    try.neg = 0; \
+    LCPDEBUG(LOG_INFO, ("lcp_rejci: Callback opt %d rejected\n", opt)); \
+  }
+  
+  REJCISHORT(CI_MRU, neg_mru, go->mru);
+  REJCILONG(CI_ASYNCMAP, neg_asyncmap, go->asyncmap);
+  REJCICHAP(CI_AUTHTYPE, neg_chap, PPP_CHAP, go->chap_mdtype);
+  if (!go->neg_chap) {
+    REJCISHORT(CI_AUTHTYPE, neg_upap, PPP_PAP);
+  }
+  REJCILQR(CI_QUALITY, neg_lqr, go->lqr_period);
+  REJCICBCP(CI_CALLBACK, neg_cbcp, CBCP_OPT);
+  REJCILONG(CI_MAGICNUMBER, neg_magicnumber, go->magicnumber);
+  REJCIVOID(CI_PCOMPRESSION, neg_pcompression);
+  REJCIVOID(CI_ACCOMPRESSION, neg_accompression);
+  
+  /*
+   * If there are any remaining CIs, then this packet is bad.
+   */
+  if (len != 0) {
+    goto bad;
+  }
+  /*
+   * Now we can update state.
+   */
+  if (f->state != LS_OPENED) {
+    *go = try;
+  }
+  return 1;
+  
+bad:
+  LCPDEBUG(LOG_WARNING, ("lcp_rejci: received bad Reject!\n"));
+  return 0;
+}
+
+
+/*
+ * lcp_reqci - Check the peer's requested CIs and send appropriate response.
+ *
+ * Returns: CONFACK, CONFNAK or CONFREJ and input packet modified
+ * appropriately.  If reject_if_disagree is non-zero, doesn't return
+ * CONFNAK; returns CONFREJ if it can't return CONFACK.
+ */
+static int
+lcp_reqci(fsm *f, 
+          u_char *inp,    /* Requested CIs */
+          int *lenp,      /* Length of requested CIs */
+          int reject_if_disagree)
+{
+  lcp_options *go = &lcp_gotoptions[f->unit];
+  lcp_options *ho = &lcp_hisoptions[f->unit];
+  lcp_options *ao = &lcp_allowoptions[f->unit];
+  u_char *cip, *next;         /* Pointer to current and next CIs */
+  int cilen, citype;          /* Parsed len, type */
+  u_char cichar;              /* Parsed char value */
+  u_short cishort;            /* Parsed short value */
+  u32_t cilong;               /* Parse long value */
+  int rc = CONFACK;           /* Final packet return code */
+  int orc;                    /* Individual option return code */
+  u_char *p;                  /* Pointer to next char to parse */
+  u_char *rejp;               /* Pointer to next char in reject frame */
+  u_char *nakp;               /* Pointer to next char in Nak frame */
+  int l = *lenp;              /* Length left */
+#if TRACELCP > 0
+  char traceBuf[80];
+  size_t traceNdx = 0;
+#endif
+
+  /*
+   * Reset all his options.
+   */
+  BZERO(ho, sizeof(*ho));
+
+  /*
+   * Process all his options.
+   */
+  next = inp;
+  nakp = nak_buffer;
+  rejp = inp;
+  while (l) {
+    orc = CONFACK;      /* Assume success */
+    cip = p = next;     /* Remember begining of CI */
+    if (l < 2 ||        /* Not enough data for CI header or */
+        p[1] < 2 ||     /*  CI length too small or */
+        p[1] > l) {     /*  CI length too big? */
+      LCPDEBUG(LOG_WARNING, ("lcp_reqci: bad CI length!\n"));
+      orc = CONFREJ;    /* Reject bad CI */
+      cilen = l;        /* Reject till end of packet */
+      l = 0;            /* Don't loop again */
+      citype = 0;
+      goto endswitch;
+    }
+    GETCHAR(citype, p); /* Parse CI type */
+    GETCHAR(cilen, p);  /* Parse CI length */
+    l -= cilen;         /* Adjust remaining length */
+    next += cilen;      /* Step to next CI */
+
+    switch (citype) {   /* Check CI type */
+      case CI_MRU:
+        if (!ao->neg_mru) {    /* Allow option? */
+          LCPDEBUG(LOG_INFO, ("lcp_reqci: Reject MRU - not allowed\n"));
+          orc = CONFREJ;    /* Reject CI */
+          break;
+        } else if (cilen != CILEN_SHORT) {  /* Check CI length */
+          LCPDEBUG(LOG_INFO, ("lcp_reqci: Reject MRU - bad length\n"));
+          orc = CONFREJ;    /* Reject CI */
+          break;
+        }
+        GETSHORT(cishort, p);  /* Parse MRU */
+
+        /*
+         * He must be able to receive at least our minimum.
+         * No need to check a maximum.  If he sends a large number,
+         * we'll just ignore it.
+         */
+        if (cishort < PPP_MINMRU) {
+          LCPDEBUG(LOG_INFO, ("lcp_reqci: Nak - MRU too small\n"));
+          orc = CONFNAK;    /* Nak CI */
+          PUTCHAR(CI_MRU, nakp);
+          PUTCHAR(CILEN_SHORT, nakp);
+          PUTSHORT(PPP_MINMRU, nakp);  /* Give him a hint */
+          break;
+        }
+        ho->neg_mru = 1;    /* Remember he sent MRU */
+        ho->mru = cishort;    /* And remember value */
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " MRU %d", cishort);
+        traceNdx = strlen(traceBuf);
+#endif
+        break;
+
+      case CI_ASYNCMAP:
+        if (!ao->neg_asyncmap) {
+          LCPDEBUG(LOG_INFO, ("lcp_reqci: Reject ASYNCMAP not allowed\n"));
+          orc = CONFREJ;
+          break;
+        } else if (cilen != CILEN_LONG) {
+          LCPDEBUG(LOG_INFO, ("lcp_reqci: Reject ASYNCMAP bad length\n"));
+          orc = CONFREJ;
+          break;
+        }
+        GETLONG(cilong, p);
+        
+        /*
+         * Asyncmap must have set at least the bits
+         * which are set in lcp_allowoptions[unit].asyncmap.
+         */
+        if ((ao->asyncmap & ~cilong) != 0) {
+          LCPDEBUG(LOG_INFO, ("lcp_reqci: Nak ASYNCMAP %lX missing %lX\n", 
+                    cilong, ao->asyncmap));
+          orc = CONFNAK;
+          PUTCHAR(CI_ASYNCMAP, nakp);
+          PUTCHAR(CILEN_LONG, nakp);
+          PUTLONG(ao->asyncmap | cilong, nakp);
+          break;
+        }
+        ho->neg_asyncmap = 1;
+        ho->asyncmap = cilong;
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " ASYNCMAP=%lX", cilong);
+        traceNdx = strlen(traceBuf);
+#endif
+        break;
+
+      case CI_AUTHTYPE:
+        if (cilen < CILEN_SHORT) {
+          LCPDEBUG(LOG_INFO, ("lcp_reqci: Reject AUTHTYPE missing arg\n"));
+          orc = CONFREJ;
+          break;
+        } else if (!(ao->neg_upap || ao->neg_chap)) {
+          /*
+           * Reject the option if we're not willing to authenticate.
+           */
+          LCPDEBUG(LOG_INFO, ("lcp_reqci: Reject AUTHTYPE not allowed\n"));
+          orc = CONFREJ;
+          break;
+        }
+        GETSHORT(cishort, p);
+        
+        /*
+         * Authtype must be UPAP or CHAP.
+         *
+         * Note: if both ao->neg_upap and ao->neg_chap are set,
+         * and the peer sends a Configure-Request with two
+         * authenticate-protocol requests, one for CHAP and one
+         * for UPAP, then we will reject the second request.
+         * Whether we end up doing CHAP or UPAP depends then on
+         * the ordering of the CIs in the peer's Configure-Request.
+         */
+        
+        if (cishort == PPP_PAP) {
+          if (ho->neg_chap) {  /* we've already accepted CHAP */
+            LCPDEBUG(LOG_WARNING, ("lcp_reqci: Reject AUTHTYPE PAP already accepted\n"));
+            orc = CONFREJ;
+            break;
+          } else if (cilen != CILEN_SHORT) {
+            LCPDEBUG(LOG_WARNING, ("lcp_reqci: Reject AUTHTYPE PAP bad len\n"));
+            orc = CONFREJ;
+            break;
+          }
+          if (!ao->neg_upap) {  /* we don't want to do PAP */
+            LCPDEBUG(LOG_WARNING, ("lcp_reqci: Nak AUTHTYPE PAP not allowed\n"));
+            orc = CONFNAK;  /* NAK it and suggest CHAP */
+            PUTCHAR(CI_AUTHTYPE, nakp);
+            PUTCHAR(CILEN_CHAP, nakp);
+            PUTSHORT(PPP_CHAP, nakp);
+            PUTCHAR(ao->chap_mdtype, nakp);
+            break;
+          }
+          ho->neg_upap = 1;
+#if TRACELCP > 0
+          snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " PAP (%X)", cishort);
+          traceNdx = strlen(traceBuf);
+#endif
+          break;
+        }
+        if (cishort == PPP_CHAP) {
+          if (ho->neg_upap) {  /* we've already accepted PAP */
+            LCPDEBUG(LOG_WARNING, ("lcp_reqci: Reject AUTHTYPE CHAP accepted PAP\n"));
+            orc = CONFREJ;
+            break;
+          } else if (cilen != CILEN_CHAP) {
+            LCPDEBUG(LOG_WARNING, ("lcp_reqci: Reject AUTHTYPE CHAP bad len\n"));
+            orc = CONFREJ;
+            break;
+          }
+          if (!ao->neg_chap) {  /* we don't want to do CHAP */
+            LCPDEBUG(LOG_WARNING, ("lcp_reqci: Nak AUTHTYPE CHAP not allowed\n"));
+            orc = CONFNAK;  /* NAK it and suggest PAP */
+            PUTCHAR(CI_AUTHTYPE, nakp);
+            PUTCHAR(CILEN_SHORT, nakp);
+            PUTSHORT(PPP_PAP, nakp);
+            break;
+          }
+          GETCHAR(cichar, p);  /* get digest type*/
+          if (cichar != CHAP_DIGEST_MD5
+#if MSCHAP_SUPPORT
+              && cichar != CHAP_MICROSOFT
+#endif
+          ) {
+            LCPDEBUG(LOG_WARNING, ("lcp_reqci: Nak AUTHTYPE CHAP digest=%d\n", (int)cichar));
+            orc = CONFNAK;
+            PUTCHAR(CI_AUTHTYPE, nakp);
+            PUTCHAR(CILEN_CHAP, nakp);
+            PUTSHORT(PPP_CHAP, nakp);
+            PUTCHAR(ao->chap_mdtype, nakp);
+            break;
+          }
+#if TRACELCP > 0
+          snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " CHAP %X,%d", cishort, (int)cichar);
+          traceNdx = strlen(traceBuf);
+#endif
+          ho->chap_mdtype = cichar; /* save md type */
+          ho->neg_chap = 1;
+          break;
+        }
+        
+        /*
+         * We don't recognize the protocol they're asking for.
+         * Nak it with something we're willing to do.
+         * (At this point we know ao->neg_upap || ao->neg_chap.)
+         */
+        orc = CONFNAK;
+        PUTCHAR(CI_AUTHTYPE, nakp);
+        if (ao->neg_chap) {
+          LCPDEBUG(LOG_WARNING, ("lcp_reqci: Nak AUTHTYPE %d req CHAP\n", cishort));
+          PUTCHAR(CILEN_CHAP, nakp);
+          PUTSHORT(PPP_CHAP, nakp);
+          PUTCHAR(ao->chap_mdtype, nakp);
+        } else {
+          LCPDEBUG(LOG_WARNING, ("lcp_reqci: Nak AUTHTYPE %d req PAP\n", cishort));
+          PUTCHAR(CILEN_SHORT, nakp);
+          PUTSHORT(PPP_PAP, nakp);
+        }
+        break;
+      
+      case CI_QUALITY:
+        GETSHORT(cishort, p);
+        GETLONG(cilong, p);
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " QUALITY (%x %x)", cishort, (unsigned int) cilong);
+        traceNdx = strlen(traceBuf);
+#endif
+
+        if (!ao->neg_lqr ||
+            cilen != CILEN_LQR) {
+          orc = CONFREJ;
+          break;
+        }
+        
+        /*
+         * Check the protocol and the reporting period.
+         * XXX When should we Nak this, and what with?
+         */
+        if (cishort != PPP_LQR) {
+          orc = CONFNAK;
+          PUTCHAR(CI_QUALITY, nakp);
+          PUTCHAR(CILEN_LQR, nakp);
+          PUTSHORT(PPP_LQR, nakp);
+          PUTLONG(ao->lqr_period, nakp);
+          break;
+        }
+        break;
+      
+      case CI_MAGICNUMBER:
+        if (!(ao->neg_magicnumber || go->neg_magicnumber) ||
+            cilen != CILEN_LONG) {
+          orc = CONFREJ;
+          break;
+        }
+        GETLONG(cilong, p);
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " MAGICNUMBER (%lX)", cilong);
+        traceNdx = strlen(traceBuf);
+#endif
+
+        /*
+         * He must have a different magic number.
+         */
+        if (go->neg_magicnumber &&
+            cilong == go->magicnumber) {
+          cilong = magic();  /* Don't put magic() inside macro! */
+          orc = CONFNAK;
+          PUTCHAR(CI_MAGICNUMBER, nakp);
+          PUTCHAR(CILEN_LONG, nakp);
+          PUTLONG(cilong, nakp);
+          break;
+        }
+        ho->neg_magicnumber = 1;
+        ho->magicnumber = cilong;
+        break;
+      
+      
+      case CI_PCOMPRESSION:
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " PCOMPRESSION");
+        traceNdx = strlen(traceBuf);
+#endif
+        if (!ao->neg_pcompression ||
+            cilen != CILEN_VOID) {
+          orc = CONFREJ;
+          break;
+        }
+        ho->neg_pcompression = 1;
+        break;
+      
+      case CI_ACCOMPRESSION:
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " ACCOMPRESSION");
+        traceNdx = strlen(traceBuf);
+#endif
+        if (!ao->neg_accompression ||
+            cilen != CILEN_VOID) {
+          orc = CONFREJ;
+          break;
+        }
+        ho->neg_accompression = 1;
+        break;
+      
+      case CI_MRRU:
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " CI_MRRU");
+        traceNdx = strlen(traceBuf);
+#endif
+        orc = CONFREJ;
+        break;
+      
+      case CI_SSNHF:
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " CI_SSNHF");
+        traceNdx = strlen(traceBuf);
+#endif
+        orc = CONFREJ;
+        break;
+      
+      case CI_EPDISC:
+#if TRACELCP > 0
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " CI_EPDISC");
+        traceNdx = strlen(traceBuf);
+#endif
+        orc = CONFREJ;
+        break;
+      
+      default:
+#if TRACELCP
+        snprintf(&traceBuf[traceNdx], sizeof(traceBuf), " unknown %d", citype);
+        traceNdx = strlen(traceBuf);
+#endif
+        orc = CONFREJ;
+        break;
+    }
+
+  endswitch:
+#if TRACELCP
+    if (traceNdx >= 80 - 32) {
+      LCPDEBUG(LOG_INFO, ("lcp_reqci: rcvd%s\n", traceBuf));
+      traceNdx = 0;
+    }
+#endif
+    if (orc == CONFACK && /* Good CI */
+        rc != CONFACK) {  /*  but prior CI wasnt? */
+      continue;           /* Don't send this one */
+    }
+
+    if (orc == CONFNAK) {     /* Nak this CI? */
+      if (reject_if_disagree  /* Getting fed up with sending NAKs? */
+          && citype != CI_MAGICNUMBER) {
+        orc = CONFREJ;        /* Get tough if so */
+      } else {
+        if (rc == CONFREJ) {  /* Rejecting prior CI? */
+          continue;           /* Don't send this one */
+        }
+        rc = CONFNAK;
+      }
+    }
+    if (orc == CONFREJ) {        /* Reject this CI */
+      rc = CONFREJ;
+      if (cip != rejp) {         /* Need to move rejected CI? */
+        BCOPY(cip, rejp, cilen); /* Move it */
+      }
+      INCPTR(cilen, rejp);       /* Update output pointer */
+    }
+  }
+
+  /*
+   * If we wanted to send additional NAKs (for unsent CIs), the
+   * code would go here.  The extra NAKs would go at *nakp.
+   * At present there are no cases where we want to ask the
+   * peer to negotiate an option.
+   */
+
+  switch (rc) {
+    case CONFACK:
+      *lenp = (int)(next - inp);
+      break;
+    case CONFNAK:
+      /*
+       * Copy the Nak'd options from the nak_buffer to the caller's buffer.
+       */
+      *lenp = (int)(nakp - nak_buffer);
+      BCOPY(nak_buffer, inp, *lenp);
+      break;
+    case CONFREJ:
+      *lenp = (int)(rejp - inp);
+      break;
+  }
+
+#if TRACELCP > 0
+  if (traceNdx > 0) {
+    LCPDEBUG(LOG_INFO, ("lcp_reqci: %s\n", traceBuf));
+  }
+#endif
+  LCPDEBUG(LOG_INFO, ("lcp_reqci: returning CONF%s.\n", CODENAME(rc)));
+  return (rc);      /* Return final code */
+}
+
+
+/*
+ * lcp_up - LCP has come UP.
+ */
+static void
+lcp_up(fsm *f)
+{
+  lcp_options *wo = &lcp_wantoptions[f->unit];
+  lcp_options *ho = &lcp_hisoptions[f->unit];
+  lcp_options *go = &lcp_gotoptions[f->unit];
+  lcp_options *ao = &lcp_allowoptions[f->unit];
+
+  if (!go->neg_magicnumber) {
+    go->magicnumber = 0;
+  }
+  if (!ho->neg_magicnumber) {
+    ho->magicnumber = 0;
+  }
+
+  /*
+   * Set our MTU to the smaller of the MTU we wanted and
+   * the MRU our peer wanted.  If we negotiated an MRU,
+   * set our MRU to the larger of value we wanted and
+   * the value we got in the negotiation.
+   */
+  ppp_send_config(f->unit, LWIP_MIN(ao->mru, (ho->neg_mru? ho->mru: PPP_MRU)),
+                 (ho->neg_asyncmap? ho->asyncmap: 0xffffffffl),
+                  ho->neg_pcompression, ho->neg_accompression);
+  /*
+   * If the asyncmap hasn't been negotiated, we really should
+   * set the receive asyncmap to ffffffff, but we set it to 0
+   * for backwards contemptibility.
+   */
+  ppp_recv_config(f->unit, (go->neg_mru? LWIP_MAX(wo->mru, go->mru): PPP_MRU),
+                 (go->neg_asyncmap? go->asyncmap: 0x00000000),
+                  go->neg_pcompression, go->neg_accompression);
+
+  if (ho->neg_mru) {
+    peer_mru[f->unit] = ho->mru;
+  }
+
+  lcp_echo_lowerup(f->unit); /* Enable echo messages */
+
+  link_established(f->unit); /* The link is up; authenticate now */
+}
+
+
+/*
+ * lcp_down - LCP has gone DOWN.
+ *
+ * Alert other protocols.
+ */
+static void
+lcp_down(fsm *f)
+{
+  lcp_options *go = &lcp_gotoptions[f->unit];
+
+  lcp_echo_lowerdown(f->unit);
+
+  link_down(f->unit);
+
+  ppp_send_config(f->unit, PPP_MRU, 0xffffffffl, 0, 0);
+  ppp_recv_config(f->unit, PPP_MRU,
+                  (go->neg_asyncmap? go->asyncmap: 0x00000000),
+                   go->neg_pcompression, go->neg_accompression);
+  peer_mru[f->unit] = PPP_MRU;
+}
+
+
+/*
+ * lcp_starting - LCP needs the lower layer up.
+ */
+static void
+lcp_starting(fsm *f)
+{
+  link_required(f->unit); /* lwip: currently does nothing */
+}
+
+
+/*
+ * lcp_finished - LCP has finished with the lower layer.
+ */
+static void
+lcp_finished(fsm *f)
+{
+  link_terminated(f->unit); /* we are finished with the link */
+}
+
+
+#if PPP_ADDITIONAL_CALLBACKS
+/*
+ * print_string - print a readable representation of a string using
+ * printer.
+ */
+static void
+print_string( char *p, int len, void (*printer) (void *, char *, ...), void *arg)
+{
+  int c;
+  
+  printer(arg, "\"");
+  for (; len > 0; --len) {
+    c = *p++;
+    if (' ' <= c && c <= '~') {
+        if (c == '\\' || c == '"') {
+          printer(arg, "\\");
+        }
+        printer(arg, "%c", c);
+    } else {
+      switch (c) {
+        case '\n':
+          printer(arg, "\\n");
+          break;
+        case '\r':
+          printer(arg, "\\r");
+          break;
+        case '\t':
+          printer(arg, "\\t");
+          break;
+        default:
+          printer(arg, "\\%.3o", c);
+        }
+    }
+  }
+  printer(arg, "\"");
+}
+
+
+/*
+ * lcp_printpkt - print the contents of an LCP packet.
+ */
+static char *lcp_codenames[] = {
+  "ConfReq", "ConfAck", "ConfNak", "ConfRej",
+  "TermReq", "TermAck", "CodeRej", "ProtRej",
+  "EchoReq", "EchoRep", "DiscReq"
+};
+
+static int
+lcp_printpkt( u_char *p, int plen, void (*printer) (void *, char *, ...), void *arg)
+{
+  int code, id, len, olen;
+  u_char *pstart, *optend;
+  u_short cishort;
+  u32_t cilong;
+
+  if (plen < HEADERLEN) {
+    return 0;
+  }
+  pstart = p;
+  GETCHAR(code, p);
+  GETCHAR(id, p);
+  GETSHORT(len, p);
+  if (len < HEADERLEN || len > plen) {
+    return 0;
+  }
+
+  if (code >= 1 && code <= sizeof(lcp_codenames) / sizeof(char *)) {
+    printer(arg, " %s", lcp_codenames[code-1]);
+  } else {
+    printer(arg, " code=0x%x", code);
+  }
+  printer(arg, " id=0x%x", id);
+  len -= HEADERLEN;
+  switch (code) {
+    case CONFREQ:
+    case CONFACK:
+    case CONFNAK:
+    case CONFREJ:
+      /* print option list */
+      while (len >= 2) {
+        GETCHAR(code, p);
+        GETCHAR(olen, p);
+        p -= 2;
+        if (olen < 2 || olen > len) {
+          break;
+        }
+        printer(arg, " <");
+        len -= olen;
+        optend = p + olen;
+        switch (code) {
+          case CI_MRU:
+            if (olen == CILEN_SHORT) {
+              p += 2;
+              GETSHORT(cishort, p);
+              printer(arg, "mru %d", cishort);
+            }
+            break;
+          case CI_ASYNCMAP:
+            if (olen == CILEN_LONG) {
+              p += 2;
+              GETLONG(cilong, p);
+              printer(arg, "asyncmap 0x%lx", cilong);
+            }
+            break;
+          case CI_AUTHTYPE:
+            if (olen >= CILEN_SHORT) {
+              p += 2;
+              printer(arg, "auth ");
+              GETSHORT(cishort, p);
+              switch (cishort) {
+                case PPP_PAP:
+                  printer(arg, "pap");
+                  break;
+                case PPP_CHAP:
+                  printer(arg, "chap");
+                  break;
+                default:
+                  printer(arg, "0x%x", cishort);
+              }
+            }
+            break;
+          case CI_QUALITY:
+            if (olen >= CILEN_SHORT) {
+              p += 2;
+              printer(arg, "quality ");
+              GETSHORT(cishort, p);
+              switch (cishort) {
+                case PPP_LQR:
+                  printer(arg, "lqr");
+                  break;
+                default:
+                  printer(arg, "0x%x", cishort);
+              }
+            }
+            break;
+          case CI_CALLBACK:
+            if (olen >= CILEN_CHAR) {
+              p += 2;
+              printer(arg, "callback ");
+              GETSHORT(cishort, p);
+              switch (cishort) {
+                case CBCP_OPT:
+                  printer(arg, "CBCP");
+                  break;
+                default:
+                  printer(arg, "0x%x", cishort);
+              }
+            }
+            break;
+          case CI_MAGICNUMBER:
+            if (olen == CILEN_LONG) {
+              p += 2;
+              GETLONG(cilong, p);
+              printer(arg, "magic 0x%x", cilong);
+            }
+            break;
+          case CI_PCOMPRESSION:
+            if (olen == CILEN_VOID) {
+              p += 2;
+              printer(arg, "pcomp");
+            }
+            break;
+          case CI_ACCOMPRESSION:
+            if (olen == CILEN_VOID) {
+              p += 2;
+              printer(arg, "accomp");
+            }
+            break;
+        }
+        while (p < optend) {
+          GETCHAR(code, p);
+          printer(arg, " %.2x", code);
+        }
+        printer(arg, ">");
+      }
+      break;
+    
+    case TERMACK:
+    case TERMREQ:
+      if (len > 0 && *p >= ' ' && *p < 0x7f) {
+        printer(arg, " ");
+        print_string((char*)p, len, printer, arg);
+        p += len;
+        len = 0;
+      }
+      break;
+    
+    case ECHOREQ:
+    case ECHOREP:
+    case DISCREQ:
+      if (len >= 4) {
+        GETLONG(cilong, p);
+        printer(arg, " magic=0x%x", cilong);
+        p += 4;
+        len -= 4;
+      }
+      break;
+  }
+
+  /* print the rest of the bytes in the packet */
+  for (; len > 0; --len) {
+    GETCHAR(code, p);
+    printer(arg, " %.2x", code);
+  }
+
+  return (int)(p - pstart);
+}
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+
+/*
+ * Time to shut down the link because there is nothing out there.
+ */
+static void
+LcpLinkFailure (fsm *f)
+{
+  if (f->state == LS_OPENED) {
+    LCPDEBUG(LOG_INFO, ("No response to %d echo-requests\n", lcp_echos_pending));
+    LCPDEBUG(LOG_NOTICE, ("Serial link appears to be disconnected.\n"));
+    lcp_close(f->unit, "Peer not responding");
+  }
+}
+
+/*
+ * Timer expired for the LCP echo requests from this process.
+ */
+static void
+LcpEchoCheck (fsm *f)
+{
+  LcpSendEchoRequest (f);
+
+  /*
+   * Start the timer for the next interval.
+   */
+  LWIP_ASSERT("lcp_echo_timer_running == 0", lcp_echo_timer_running == 0);
+
+  TIMEOUT (LcpEchoTimeout, f, lcp_echo_interval);
+  lcp_echo_timer_running = 1;
+}
+
+/*
+ * LcpEchoTimeout - Timer expired on the LCP echo
+ */
+static void
+LcpEchoTimeout (void *arg)
+{
+  if (lcp_echo_timer_running != 0) {
+    lcp_echo_timer_running = 0;
+    LcpEchoCheck ((fsm *) arg);
+  }
+}
+
+/*
+ * LcpEchoReply - LCP has received a reply to the echo
+ */
+static void
+lcp_received_echo_reply (fsm *f, int id, u_char *inp, int len)
+{
+  u32_t magic;
+
+  LWIP_UNUSED_ARG(id);
+
+  /* Check the magic number - don't count replies from ourselves. */
+  if (len < 4) {
+    LCPDEBUG(LOG_WARNING, ("lcp: received short Echo-Reply, length %d\n", len));
+    return;
+  }
+  GETLONG(magic, inp);
+  if (lcp_gotoptions[f->unit].neg_magicnumber && magic == lcp_gotoptions[f->unit].magicnumber) {
+    LCPDEBUG(LOG_WARNING, ("appear to have received our own echo-reply!\n"));
+    return;
+  }
+
+  /* Reset the number of outstanding echo frames */
+  lcp_echos_pending = 0;
+}
+
+/*
+ * LcpSendEchoRequest - Send an echo request frame to the peer
+ */
+static void
+LcpSendEchoRequest (fsm *f)
+{
+  u32_t lcp_magic;
+  u_char pkt[4], *pktp;
+
+  /*
+   * Detect the failure of the peer at this point.
+   */
+  if (lcp_echo_fails != 0) {
+    if (lcp_echos_pending >= lcp_echo_fails) {
+      LcpLinkFailure(f);
+      lcp_echos_pending = 0;
+    }
+  }
+
+  /*
+   * Make and send the echo request frame.
+   */
+  if (f->state == LS_OPENED) {
+    lcp_magic = lcp_gotoptions[f->unit].magicnumber;
+    pktp = pkt;
+    PUTLONG(lcp_magic, pktp);
+    fsm_sdata(f, ECHOREQ, (u_char)(lcp_echo_number++ & 0xFF), pkt, (int)(pktp - pkt));
+    ++lcp_echos_pending;
+  }
+}
+
+/*
+ * lcp_echo_lowerup - Start the timer for the LCP frame
+ */
+
+static void
+lcp_echo_lowerup (int unit)
+{
+  fsm *f = &lcp_fsm[unit];
+
+  /* Clear the parameters for generating echo frames */
+  lcp_echos_pending      = 0;
+  lcp_echo_number        = 0;
+  lcp_echo_timer_running = 0;
+
+  /* If a timeout interval is specified then start the timer */
+  if (lcp_echo_interval != 0) {
+    LcpEchoCheck (f);
+  }
+}
+
+/*
+ * lcp_echo_lowerdown - Stop the timer for the LCP frame
+ */
+
+static void
+lcp_echo_lowerdown (int unit)
+{
+  fsm *f = &lcp_fsm[unit];
+
+  if (lcp_echo_timer_running != 0) {
+    UNTIMEOUT (LcpEchoTimeout, f);
+    lcp_echo_timer_running = 0;
+  }
+}
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/lcp.h b/ext/lwip/src/netif/ppp/lcp.h
new file mode 100644
index 000000000..b9201eeb5
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/lcp.h
@@ -0,0 +1,151 @@
+/*****************************************************************************
+* lcp.h - Network Link Control Protocol header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-11-05 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
+*   Original derived from BSD codes.
+*****************************************************************************/
+/*
+ * lcp.h - Link Control Protocol definitions.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Id: lcp.h,v 1.4 2010/01/18 20:49:43 goldsimon Exp $
+ */
+
+#ifndef LCP_H
+#define LCP_H
+/*
+ * Options.
+ */
+#define CI_MRU           1  /* Maximum Receive Unit */
+#define CI_ASYNCMAP      2  /* Async Control Character Map */
+#define CI_AUTHTYPE      3  /* Authentication Type */
+#define CI_QUALITY       4  /* Quality Protocol */
+#define CI_MAGICNUMBER   5  /* Magic Number */
+#define CI_PCOMPRESSION  7  /* Protocol Field Compression */
+#define CI_ACCOMPRESSION 8  /* Address/Control Field Compression */
+#define CI_CALLBACK      13 /* callback */
+#define CI_MRRU          17 /* max reconstructed receive unit; multilink */
+#define CI_SSNHF         18 /* short sequence numbers for multilink */
+#define CI_EPDISC        19 /* endpoint discriminator */
+
+/*
+ * LCP-specific packet types (code numbers).
+ */
+#define PROTREJ          8  /* Protocol Reject */
+#define ECHOREQ          9  /* Echo Request */
+#define ECHOREP          10 /* Echo Reply */
+#define DISCREQ          11 /* Discard Request */
+#define CBCP_OPT         6  /* Use callback control protocol */
+
+/*
+ * The state of options is described by an lcp_options structure.
+ */
+typedef struct lcp_options {
+    u_int passive           : 1; /* Don't die if we don't get a response */
+    u_int silent            : 1; /* Wait for the other end to start first */
+    u_int restart           : 1; /* Restart vs. exit after close */
+    u_int neg_mru           : 1; /* Negotiate the MRU? */
+    u_int neg_asyncmap      : 1; /* Negotiate the async map? */
+    u_int neg_upap          : 1; /* Ask for UPAP authentication? */
+    u_int neg_chap          : 1; /* Ask for CHAP authentication? */
+    u_int neg_magicnumber   : 1; /* Ask for magic number? */
+    u_int neg_pcompression  : 1; /* HDLC Protocol Field Compression? */
+    u_int neg_accompression : 1; /* HDLC Address/Control Field Compression? */
+    u_int neg_lqr           : 1; /* Negotiate use of Link Quality Reports */
+    u_int neg_cbcp          : 1; /* Negotiate use of CBCP */
+#ifdef PPP_MULTILINK
+    u_int neg_mrru          : 1; /* Negotiate multilink MRRU */
+    u_int neg_ssnhf         : 1; /* Negotiate short sequence numbers */
+    u_int neg_endpoint      : 1; /* Negotiate endpoint discriminator */
+#endif
+    u_short mru;                 /* Value of MRU */
+#ifdef PPP_MULTILINK
+    u_short mrru;                /* Value of MRRU, and multilink enable */
+#endif
+    u_char chap_mdtype;          /* which MD type (hashing algorithm) */
+    u32_t asyncmap;              /* Value of async map */
+    u32_t magicnumber;
+    int numloops;                /* Number of loops during magic number neg. */
+    u32_t lqr_period;            /* Reporting period for LQR 1/100ths second */
+#ifdef PPP_MULTILINK
+    struct epdisc endpoint;      /* endpoint discriminator */
+#endif
+} lcp_options;
+
+/*
+ * Values for phase from BSD pppd.h based on RFC 1661.
+ */
+typedef enum {
+  PHASE_DEAD = 0,
+  PHASE_INITIALIZE,
+  PHASE_ESTABLISH,
+  PHASE_AUTHENTICATE,
+  PHASE_CALLBACK,
+  PHASE_NETWORK,
+  PHASE_TERMINATE
+} LinkPhase;
+
+
+
+extern LinkPhase lcp_phase[NUM_PPP]; /* Phase of link session (RFC 1661) */
+extern lcp_options lcp_wantoptions[];
+extern lcp_options lcp_gotoptions[];
+extern lcp_options lcp_allowoptions[];
+extern lcp_options lcp_hisoptions[];
+extern ext_accm xmit_accm[];
+
+
+void lcp_init     (int);
+void lcp_open     (int);
+void lcp_close    (int, char *);
+void lcp_lowerup  (int);
+void lcp_lowerdown(int);
+void lcp_sprotrej (int, u_char *, int); /* send protocol reject */
+
+extern struct protent lcp_protent;
+
+/* Default number of times we receive our magic number from the peer
+   before deciding the link is looped-back. */
+#define DEFLOOPBACKFAIL 10
+
+#endif /* LCP_H */
diff --git a/ext/lwip/src/netif/ppp/magic.c b/ext/lwip/src/netif/ppp/magic.c
new file mode 100644
index 000000000..3732a4241
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/magic.c
@@ -0,0 +1,80 @@
+/*****************************************************************************
+* magic.c - Network Random Number Generator program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 by Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-04 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original based on BSD magic.c.
+*****************************************************************************/
+/*
+ * magic.c - PPP Magic Number routines.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT
+
+#include "ppp_impl.h"
+#include "randm.h"
+#include "magic.h"
+
+
+/*
+ * magicInit - Initialize the magic number generator.
+ *
+ * Since we use another random number generator that has its own
+ * initialization, we do nothing here.
+ */
+void magicInit()
+{
+  return;
+}
+
+/*
+ * magic - Returns the next magic number.
+ */
+u32_t magic()
+{
+  return avRandom();
+}
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/magic.h b/ext/lwip/src/netif/ppp/magic.h
new file mode 100644
index 000000000..eba70d20b
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/magic.h
@@ -0,0 +1,63 @@
+/*****************************************************************************
+* magic.h - Network Random Number Generator header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-04 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
+*   Original derived from BSD codes.
+*****************************************************************************/
+/*
+ * magic.h - PPP Magic Number definitions.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Id: magic.h,v 1.3 2010/01/18 20:49:43 goldsimon Exp $
+ */
+
+#ifndef MAGIC_H
+#define MAGIC_H
+
+/* Initialize the magic number generator */
+void  magicInit(void);
+
+/* Returns the next magic number */
+u32_t magic(void);
+
+#endif /* MAGIC_H */
diff --git a/ext/lwip/src/netif/ppp/md5.c b/ext/lwip/src/netif/ppp/md5.c
new file mode 100644
index 000000000..dc3cc751b
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/md5.c
@@ -0,0 +1,320 @@
+/*
+ ***********************************************************************
+ ** md5.c -- the source code for MD5 routines                         **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 1/91 SRD,AJ,BSK,JT Reference C ver., 7/10 constant corr. **
+ ***********************************************************************
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#if CHAP_SUPPORT || MD5_SUPPORT
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "md5.h"
+
+#include <string.h>
+
+/*
+ ***********************************************************************
+ **  Message-digest routines:                                         **
+ **  To form the message digest for a message M                       **
+ **    (1) Initialize a context buffer mdContext using MD5Init        **
+ **    (2) Call MD5Update on mdContext and M                          **
+ **    (3) Call MD5Final on mdContext                                 **
+ **  The message digest is now in mdContext->digest[0...15]           **
+ ***********************************************************************
+ */
+
+/* forward declaration */
+static void Transform (u32_t *buf, u32_t *in);
+
+static unsigned char PADDING[64] = {
+  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+/* F, G, H and I are basic MD5 functions */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
+/* Rotation is separate from addition to prevent recomputation */
+#define FF(a, b, c, d, x, s, ac) \
+  {(a) += F ((b), (c), (d)) + (x) + (u32_t)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) \
+  {(a) += G ((b), (c), (d)) + (x) + (u32_t)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) \
+  {(a) += H ((b), (c), (d)) + (x) + (u32_t)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) \
+  {(a) += I ((b), (c), (d)) + (x) + (u32_t)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+
+#ifdef __STDC__
+#define UL(x) x##UL
+#else
+#ifdef WIN32
+#define UL(x) x##UL
+#else
+#define UL(x) x
+#endif
+#endif
+
+/* The routine MD5Init initializes the message-digest context
+   mdContext. All fields are set to zero.
+ */
+void
+MD5Init (MD5_CTX *mdContext)
+{
+  mdContext->i[0] = mdContext->i[1] = (u32_t)0;
+
+  /* Load magic initialization constants. */
+  mdContext->buf[0] = (u32_t)0x67452301UL;
+  mdContext->buf[1] = (u32_t)0xefcdab89UL;
+  mdContext->buf[2] = (u32_t)0x98badcfeUL;
+  mdContext->buf[3] = (u32_t)0x10325476UL;
+}
+
+/* The routine MD5Update updates the message-digest context to
+   account for the presence of each of the characters inBuf[0..inLen-1]
+   in the message whose digest is being computed.
+ */
+void
+MD5Update(MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
+{
+  u32_t in[16];
+  int mdi;
+  unsigned int i, ii;
+
+#if 0
+  PPPDEBUG(LOG_INFO, ("MD5Update: %u:%.*H\n", inLen, LWIP_MIN(inLen, 20) * 2, inBuf));
+  PPPDEBUG(LOG_INFO, ("MD5Update: %u:%s\n", inLen, inBuf));
+#endif
+  
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* update number of bits */
+  if ((mdContext->i[0] + ((u32_t)inLen << 3)) < mdContext->i[0]) {
+    mdContext->i[1]++;
+  }
+  mdContext->i[0] += ((u32_t)inLen << 3);
+  mdContext->i[1] += ((u32_t)inLen >> 29);
+
+  while (inLen--) {
+    /* add new character to buffer, increment mdi */
+    mdContext->in[mdi++] = *inBuf++;
+
+    /* transform if necessary */
+    if (mdi == 0x40) {
+      for (i = 0, ii = 0; i < 16; i++, ii += 4) {
+        in[i] = (((u32_t)mdContext->in[ii+3]) << 24) |
+                (((u32_t)mdContext->in[ii+2]) << 16) |
+                (((u32_t)mdContext->in[ii+1]) << 8)  |
+                ((u32_t)mdContext->in[ii]);
+      }
+      Transform (mdContext->buf, in);
+      mdi = 0;
+    }
+  }
+}
+
+/* The routine MD5Final terminates the message-digest computation and
+   ends with the desired message digest in mdContext->digest[0...15].
+ */
+void
+MD5Final (unsigned char hash[], MD5_CTX *mdContext)
+{
+  u32_t in[16];
+  int mdi;
+  unsigned int i, ii;
+  unsigned int padLen;
+
+  /* save number of bits */
+  in[14] = mdContext->i[0];
+  in[15] = mdContext->i[1];
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* pad out to 56 mod 64 */
+  padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
+  MD5Update (mdContext, PADDING, padLen);
+
+  /* append length in bits and transform */
+  for (i = 0, ii = 0; i < 14; i++, ii += 4) {
+    in[i] = (((u32_t)mdContext->in[ii+3]) << 24) |
+            (((u32_t)mdContext->in[ii+2]) << 16) |
+            (((u32_t)mdContext->in[ii+1]) << 8)  |
+            ((u32_t)mdContext->in[ii]);
+  }
+  Transform (mdContext->buf, in);
+
+  /* store buffer in digest */
+  for (i = 0, ii = 0; i < 4; i++, ii += 4) {
+    mdContext->digest[ii]   = (unsigned char)(mdContext->buf[i] & 0xFF);
+    mdContext->digest[ii+1] =
+      (unsigned char)((mdContext->buf[i] >> 8)  & 0xFF);
+    mdContext->digest[ii+2] =
+      (unsigned char)((mdContext->buf[i] >> 16) & 0xFF);
+    mdContext->digest[ii+3] =
+      (unsigned char)((mdContext->buf[i] >> 24) & 0xFF);
+  }
+  SMEMCPY(hash, mdContext->digest, 16);
+}
+
+/* Basic MD5 step. Transforms buf based on in.
+ */
+static void
+Transform (u32_t *buf, u32_t *in)
+{
+  u32_t a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+  /* Round 1 */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+  FF ( a, b, c, d, in[ 0], S11, UL(3614090360)); /* 1 */
+  FF ( d, a, b, c, in[ 1], S12, UL(3905402710)); /* 2 */
+  FF ( c, d, a, b, in[ 2], S13, UL( 606105819)); /* 3 */
+  FF ( b, c, d, a, in[ 3], S14, UL(3250441966)); /* 4 */
+  FF ( a, b, c, d, in[ 4], S11, UL(4118548399)); /* 5 */
+  FF ( d, a, b, c, in[ 5], S12, UL(1200080426)); /* 6 */
+  FF ( c, d, a, b, in[ 6], S13, UL(2821735955)); /* 7 */
+  FF ( b, c, d, a, in[ 7], S14, UL(4249261313)); /* 8 */
+  FF ( a, b, c, d, in[ 8], S11, UL(1770035416)); /* 9 */
+  FF ( d, a, b, c, in[ 9], S12, UL(2336552879)); /* 10 */
+  FF ( c, d, a, b, in[10], S13, UL(4294925233)); /* 11 */
+  FF ( b, c, d, a, in[11], S14, UL(2304563134)); /* 12 */
+  FF ( a, b, c, d, in[12], S11, UL(1804603682)); /* 13 */
+  FF ( d, a, b, c, in[13], S12, UL(4254626195)); /* 14 */
+  FF ( c, d, a, b, in[14], S13, UL(2792965006)); /* 15 */
+  FF ( b, c, d, a, in[15], S14, UL(1236535329)); /* 16 */
+
+  /* Round 2 */
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+  GG ( a, b, c, d, in[ 1], S21, UL(4129170786)); /* 17 */
+  GG ( d, a, b, c, in[ 6], S22, UL(3225465664)); /* 18 */
+  GG ( c, d, a, b, in[11], S23, UL( 643717713)); /* 19 */
+  GG ( b, c, d, a, in[ 0], S24, UL(3921069994)); /* 20 */
+  GG ( a, b, c, d, in[ 5], S21, UL(3593408605)); /* 21 */
+  GG ( d, a, b, c, in[10], S22, UL(  38016083)); /* 22 */
+  GG ( c, d, a, b, in[15], S23, UL(3634488961)); /* 23 */
+  GG ( b, c, d, a, in[ 4], S24, UL(3889429448)); /* 24 */
+  GG ( a, b, c, d, in[ 9], S21, UL( 568446438)); /* 25 */
+  GG ( d, a, b, c, in[14], S22, UL(3275163606)); /* 26 */
+  GG ( c, d, a, b, in[ 3], S23, UL(4107603335)); /* 27 */
+  GG ( b, c, d, a, in[ 8], S24, UL(1163531501)); /* 28 */
+  GG ( a, b, c, d, in[13], S21, UL(2850285829)); /* 29 */
+  GG ( d, a, b, c, in[ 2], S22, UL(4243563512)); /* 30 */
+  GG ( c, d, a, b, in[ 7], S23, UL(1735328473)); /* 31 */
+  GG ( b, c, d, a, in[12], S24, UL(2368359562)); /* 32 */
+
+  /* Round 3 */
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+  HH ( a, b, c, d, in[ 5], S31, UL(4294588738)); /* 33 */
+  HH ( d, a, b, c, in[ 8], S32, UL(2272392833)); /* 34 */
+  HH ( c, d, a, b, in[11], S33, UL(1839030562)); /* 35 */
+  HH ( b, c, d, a, in[14], S34, UL(4259657740)); /* 36 */
+  HH ( a, b, c, d, in[ 1], S31, UL(2763975236)); /* 37 */
+  HH ( d, a, b, c, in[ 4], S32, UL(1272893353)); /* 38 */
+  HH ( c, d, a, b, in[ 7], S33, UL(4139469664)); /* 39 */
+  HH ( b, c, d, a, in[10], S34, UL(3200236656)); /* 40 */
+  HH ( a, b, c, d, in[13], S31, UL( 681279174)); /* 41 */
+  HH ( d, a, b, c, in[ 0], S32, UL(3936430074)); /* 42 */
+  HH ( c, d, a, b, in[ 3], S33, UL(3572445317)); /* 43 */
+  HH ( b, c, d, a, in[ 6], S34, UL(  76029189)); /* 44 */
+  HH ( a, b, c, d, in[ 9], S31, UL(3654602809)); /* 45 */
+  HH ( d, a, b, c, in[12], S32, UL(3873151461)); /* 46 */
+  HH ( c, d, a, b, in[15], S33, UL( 530742520)); /* 47 */
+  HH ( b, c, d, a, in[ 2], S34, UL(3299628645)); /* 48 */
+
+  /* Round 4 */
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+  II ( a, b, c, d, in[ 0], S41, UL(4096336452)); /* 49 */
+  II ( d, a, b, c, in[ 7], S42, UL(1126891415)); /* 50 */
+  II ( c, d, a, b, in[14], S43, UL(2878612391)); /* 51 */
+  II ( b, c, d, a, in[ 5], S44, UL(4237533241)); /* 52 */
+  II ( a, b, c, d, in[12], S41, UL(1700485571)); /* 53 */
+  II ( d, a, b, c, in[ 3], S42, UL(2399980690)); /* 54 */
+  II ( c, d, a, b, in[10], S43, UL(4293915773)); /* 55 */
+  II ( b, c, d, a, in[ 1], S44, UL(2240044497)); /* 56 */
+  II ( a, b, c, d, in[ 8], S41, UL(1873313359)); /* 57 */
+  II ( d, a, b, c, in[15], S42, UL(4264355552)); /* 58 */
+  II ( c, d, a, b, in[ 6], S43, UL(2734768916)); /* 59 */
+  II ( b, c, d, a, in[13], S44, UL(1309151649)); /* 60 */
+  II ( a, b, c, d, in[ 4], S41, UL(4149444226)); /* 61 */
+  II ( d, a, b, c, in[11], S42, UL(3174756917)); /* 62 */
+  II ( c, d, a, b, in[ 2], S43, UL( 718787259)); /* 63 */
+  II ( b, c, d, a, in[ 9], S44, UL(3951481745)); /* 64 */
+
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
+}
+
+#endif /* CHAP_SUPPORT || MD5_SUPPORT */
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/md5.h b/ext/lwip/src/netif/ppp/md5.h
new file mode 100644
index 000000000..e129533f3
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/md5.h
@@ -0,0 +1,55 @@
+/*
+ ***********************************************************************
+ ** md5.h -- header file for implementation of MD5                    **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version               **
+ ** Revised (for MD5): RLR 4/27/91                                    **
+ **   -- G modified to have y&~z instead of y&z                       **
+ **   -- FF, GG, HH modified to add in last register done             **
+ **   -- Access pattern: round 2 works mod 5, round 3 works mod 3     **
+ **   -- distinct additive constant for each step                     **
+ **   -- round 4 added, working mod 7                                 **
+ ***********************************************************************
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+#ifndef MD5_H
+#define MD5_H
+
+/* Data structure for MD5 (Message-Digest) computation */
+typedef struct {
+  u32_t i[2];               /* number of _bits_ handled mod 2^64 */
+  u32_t buf[4];             /* scratch buffer */
+  unsigned char in[64];     /* input buffer */
+  unsigned char digest[16]; /* actual digest after MD5Final call */
+} MD5_CTX;
+
+void MD5Init  ( MD5_CTX *mdContext);
+void MD5Update( MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
+void MD5Final ( unsigned char hash[], MD5_CTX *mdContext);
+
+#endif /* MD5_H */
diff --git a/ext/lwip/src/netif/ppp/pap.c b/ext/lwip/src/netif/ppp/pap.c
new file mode 100644
index 000000000..5fb9f886c
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/pap.c
@@ -0,0 +1,628 @@
+/*****************************************************************************
+* pap.c - Network Password Authentication Protocol program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 by Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-12 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original.
+*****************************************************************************/
+/*
+ * upap.c - User/Password Authentication Protocol.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#if PAP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "auth.h"
+#include "pap.h"
+
+#include <string.h>
+
+#if 0 /* UNUSED */
+static bool hide_password = 1;
+
+/*
+ * Command-line options.
+ */
+static option_t pap_option_list[] = {
+    { "hide-password", o_bool, &hide_password,
+      "Don't output passwords to log", 1 },
+    { "show-password", o_bool, &hide_password,
+      "Show password string in debug log messages", 0 },
+    { "pap-restart", o_int, &upap[0].us_timeouttime,
+      "Set retransmit timeout for PAP" },
+    { "pap-max-authreq", o_int, &upap[0].us_maxtransmits,
+      "Set max number of transmissions for auth-reqs" },
+    { "pap-timeout", o_int, &upap[0].us_reqtimeout,
+      "Set time limit for peer PAP authentication" },
+    { NULL }
+};
+#endif
+
+/*
+ * Protocol entry points.
+ */
+static void upap_init      (int);
+static void upap_lowerup   (int);
+static void upap_lowerdown (int);
+static void upap_input     (int, u_char *, int);
+static void upap_protrej   (int);
+#if PPP_ADDITIONAL_CALLBACKS
+static int  upap_printpkt (u_char *, int, void (*)(void *, char *, ...), void *);
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+
+struct protent pap_protent = {
+  PPP_PAP,
+  upap_init,
+  upap_input,
+  upap_protrej,
+  upap_lowerup,
+  upap_lowerdown,
+  NULL,
+  NULL,
+#if PPP_ADDITIONAL_CALLBACKS
+  upap_printpkt,
+  NULL,
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+  1,
+  "PAP",
+#if PPP_ADDITIONAL_CALLBACKS
+  NULL,
+  NULL,
+  NULL
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+};
+
+upap_state upap[NUM_PPP]; /* UPAP state; one for each unit */
+
+static void upap_timeout   (void *);
+static void upap_reqtimeout(void *);
+static void upap_rauthreq  (upap_state *, u_char *, u_char, int);
+static void upap_rauthack  (upap_state *, u_char *, int, int);
+static void upap_rauthnak  (upap_state *, u_char *, int, int);
+static void upap_sauthreq  (upap_state *);
+static void upap_sresp     (upap_state *, u_char, u_char, char *, int);
+
+
+/*
+ * upap_init - Initialize a UPAP unit.
+ */
+static void
+upap_init(int unit)
+{
+  upap_state *u = &upap[unit];
+
+  UPAPDEBUG(LOG_INFO, ("upap_init: %d\n", unit));
+  u->us_unit         = unit;
+  u->us_user         = NULL;
+  u->us_userlen      = 0;
+  u->us_passwd       = NULL;
+  u->us_passwdlen    = 0;
+  u->us_clientstate  = UPAPCS_INITIAL;
+  u->us_serverstate  = UPAPSS_INITIAL;
+  u->us_id           = 0;
+  u->us_timeouttime  = UPAP_DEFTIMEOUT;
+  u->us_maxtransmits = 10;
+  u->us_reqtimeout   = UPAP_DEFREQTIME;
+}
+
+/*
+ * upap_authwithpeer - Authenticate us with our peer (start client).
+ *
+ * Set new state and send authenticate's.
+ */
+void
+upap_authwithpeer(int unit, char *user, char *password)
+{
+  upap_state *u = &upap[unit];
+
+  UPAPDEBUG(LOG_INFO, ("upap_authwithpeer: %d user=%s password=%s s=%d\n",
+             unit, user, password, u->us_clientstate));
+
+  /* Save the username and password we're given */
+  u->us_user = user;
+  u->us_userlen = (int)strlen(user);
+  u->us_passwd = password;
+  u->us_passwdlen = (int)strlen(password);
+
+  u->us_transmits = 0;
+
+  /* Lower layer up yet? */
+  if (u->us_clientstate == UPAPCS_INITIAL ||
+      u->us_clientstate == UPAPCS_PENDING) {
+    u->us_clientstate = UPAPCS_PENDING;
+    return;
+  }
+
+  upap_sauthreq(u);      /* Start protocol */
+}
+
+
+/*
+ * upap_authpeer - Authenticate our peer (start server).
+ *
+ * Set new state.
+ */
+void
+upap_authpeer(int unit)
+{
+  upap_state *u = &upap[unit];
+
+  /* Lower layer up yet? */
+  if (u->us_serverstate == UPAPSS_INITIAL ||
+      u->us_serverstate == UPAPSS_PENDING) {
+    u->us_serverstate = UPAPSS_PENDING;
+    return;
+  }
+
+  u->us_serverstate = UPAPSS_LISTEN;
+  if (u->us_reqtimeout > 0) {
+    TIMEOUT(upap_reqtimeout, u, u->us_reqtimeout);
+  }
+}
+
+/*
+ * upap_timeout - Retransmission timer for sending auth-reqs expired.
+ */
+static void
+upap_timeout(void *arg)
+{
+  upap_state *u = (upap_state *) arg;
+
+  UPAPDEBUG(LOG_INFO, ("upap_timeout: %d timeout %d expired s=%d\n", 
+        u->us_unit, u->us_timeouttime, u->us_clientstate));
+
+  if (u->us_clientstate != UPAPCS_AUTHREQ) {
+    UPAPDEBUG(LOG_INFO, ("upap_timeout: not in AUTHREQ state!\n"));
+    return;
+  }
+
+  if (u->us_transmits >= u->us_maxtransmits) {
+    /* give up in disgust */
+    UPAPDEBUG(LOG_ERR, ("No response to PAP authenticate-requests\n"));
+    u->us_clientstate = UPAPCS_BADAUTH;
+    auth_withpeer_fail(u->us_unit, PPP_PAP);
+    return;
+  }
+
+  upap_sauthreq(u);    /* Send Authenticate-Request and set upap timeout*/
+}
+
+
+/*
+ * upap_reqtimeout - Give up waiting for the peer to send an auth-req.
+ */
+static void
+upap_reqtimeout(void *arg)
+{
+  upap_state *u = (upap_state *) arg;
+
+  if (u->us_serverstate != UPAPSS_LISTEN) {
+    return; /* huh?? */
+  }
+
+  auth_peer_fail(u->us_unit, PPP_PAP);
+  u->us_serverstate = UPAPSS_BADAUTH;
+}
+
+
+/*
+ * upap_lowerup - The lower layer is up.
+ *
+ * Start authenticating if pending.
+ */
+static void
+upap_lowerup(int unit)
+{
+  upap_state *u = &upap[unit];
+
+  UPAPDEBUG(LOG_INFO, ("upap_lowerup: init %d clientstate s=%d\n", unit, u->us_clientstate));
+
+  if (u->us_clientstate == UPAPCS_INITIAL) {
+    u->us_clientstate = UPAPCS_CLOSED;
+  } else if (u->us_clientstate == UPAPCS_PENDING) {
+    upap_sauthreq(u);  /* send an auth-request */
+    /* now client state is UPAPCS__AUTHREQ */
+  }
+
+  if (u->us_serverstate == UPAPSS_INITIAL) {
+    u->us_serverstate = UPAPSS_CLOSED;
+  } else if (u->us_serverstate == UPAPSS_PENDING) {
+    u->us_serverstate = UPAPSS_LISTEN;
+    if (u->us_reqtimeout > 0) {
+      TIMEOUT(upap_reqtimeout, u, u->us_reqtimeout);
+    }
+  }
+}
+
+
+/*
+ * upap_lowerdown - The lower layer is down.
+ *
+ * Cancel all timeouts.
+ */
+static void
+upap_lowerdown(int unit)
+{
+  upap_state *u = &upap[unit];
+
+  UPAPDEBUG(LOG_INFO, ("upap_lowerdown: %d s=%d\n", unit, u->us_clientstate));
+
+  if (u->us_clientstate == UPAPCS_AUTHREQ) { /* Timeout pending? */
+    UNTIMEOUT(upap_timeout, u);    /* Cancel timeout */
+  }
+  if (u->us_serverstate == UPAPSS_LISTEN && u->us_reqtimeout > 0) {
+    UNTIMEOUT(upap_reqtimeout, u);
+  }
+
+  u->us_clientstate = UPAPCS_INITIAL;
+  u->us_serverstate = UPAPSS_INITIAL;
+}
+
+
+/*
+ * upap_protrej - Peer doesn't speak this protocol.
+ *
+ * This shouldn't happen.  In any case, pretend lower layer went down.
+ */
+static void
+upap_protrej(int unit)
+{
+  upap_state *u = &upap[unit];
+
+  if (u->us_clientstate == UPAPCS_AUTHREQ) {
+    UPAPDEBUG(LOG_ERR, ("PAP authentication failed due to protocol-reject\n"));
+    auth_withpeer_fail(unit, PPP_PAP);
+  }
+  if (u->us_serverstate == UPAPSS_LISTEN) {
+    UPAPDEBUG(LOG_ERR, ("PAP authentication of peer failed (protocol-reject)\n"));
+    auth_peer_fail(unit, PPP_PAP);
+  }
+  upap_lowerdown(unit);
+}
+
+
+/*
+ * upap_input - Input UPAP packet.
+ */
+static void
+upap_input(int unit, u_char *inpacket, int l)
+{
+  upap_state *u = &upap[unit];
+  u_char *inp;
+  u_char code, id;
+  int len;
+
+  /*
+   * Parse header (code, id and length).
+   * If packet too short, drop it.
+   */
+  inp = inpacket;
+  if (l < (int)UPAP_HEADERLEN) {
+    UPAPDEBUG(LOG_INFO, ("pap_input: rcvd short header.\n"));
+    return;
+  }
+  GETCHAR(code, inp);
+  GETCHAR(id, inp);
+  GETSHORT(len, inp);
+  if (len < (int)UPAP_HEADERLEN) {
+    UPAPDEBUG(LOG_INFO, ("pap_input: rcvd illegal length.\n"));
+    return;
+  }
+  if (len > l) {
+    UPAPDEBUG(LOG_INFO, ("pap_input: rcvd short packet.\n"));
+    return;
+  }
+  len -= UPAP_HEADERLEN;
+
+  /*
+   * Action depends on code.
+   */
+  switch (code) {
+    case UPAP_AUTHREQ:
+      upap_rauthreq(u, inp, id, len);
+      break;
+
+    case UPAP_AUTHACK:
+      upap_rauthack(u, inp, id, len);
+      break;
+
+    case UPAP_AUTHNAK:
+      upap_rauthnak(u, inp, id, len);
+      break;
+
+    default:        /* XXX Need code reject */
+      UPAPDEBUG(LOG_INFO, ("pap_input: UNHANDLED default: code: %d, id: %d, len: %d.\n", code, id, len));
+      break;
+  }
+}
+
+
+/*
+ * upap_rauth - Receive Authenticate.
+ */
+static void
+upap_rauthreq(upap_state *u, u_char *inp, u_char id, int len)
+{
+  u_char ruserlen, rpasswdlen;
+  char *ruser, *rpasswd;
+  u_char retcode;
+  char *msg;
+  int msglen;
+
+  UPAPDEBUG(LOG_INFO, ("pap_rauth: Rcvd id %d.\n", id));
+
+  if (u->us_serverstate < UPAPSS_LISTEN) {
+    return;
+  }
+
+  /*
+   * If we receive a duplicate authenticate-request, we are
+   * supposed to return the same status as for the first request.
+   */
+  if (u->us_serverstate == UPAPSS_OPEN) {
+    upap_sresp(u, UPAP_AUTHACK, id, "", 0);  /* return auth-ack */
+    return;
+  }
+  if (u->us_serverstate == UPAPSS_BADAUTH) {
+    upap_sresp(u, UPAP_AUTHNAK, id, "", 0);  /* return auth-nak */
+    return;
+  }
+
+  /*
+   * Parse user/passwd.
+   */
+  if (len < (int)sizeof (u_char)) {
+    UPAPDEBUG(LOG_INFO, ("pap_rauth: rcvd short packet.\n"));
+    return;
+  }
+  GETCHAR(ruserlen, inp);
+  len -= sizeof (u_char) + ruserlen + sizeof (u_char);
+  if (len < 0) {
+    UPAPDEBUG(LOG_INFO, ("pap_rauth: rcvd short packet.\n"));
+    return;
+  }
+  ruser = (char *) inp;
+  INCPTR(ruserlen, inp);
+  GETCHAR(rpasswdlen, inp);
+  if (len < rpasswdlen) {
+    UPAPDEBUG(LOG_INFO, ("pap_rauth: rcvd short packet.\n"));
+    return;
+  }
+  rpasswd = (char *) inp;
+
+  /*
+   * Check the username and password given.
+   */
+  retcode = check_passwd(u->us_unit, ruser, ruserlen, rpasswd, rpasswdlen, &msg, &msglen);
+  /* lwip: currently retcode is always UPAP_AUTHACK */
+  BZERO(rpasswd, rpasswdlen);
+
+  upap_sresp(u, retcode, id, msg, msglen);
+
+  if (retcode == UPAP_AUTHACK) {
+    u->us_serverstate = UPAPSS_OPEN;
+    auth_peer_success(u->us_unit, PPP_PAP, ruser, ruserlen);
+  } else {
+    u->us_serverstate = UPAPSS_BADAUTH;
+    auth_peer_fail(u->us_unit, PPP_PAP);
+  }
+
+  if (u->us_reqtimeout > 0) {
+    UNTIMEOUT(upap_reqtimeout, u);
+  }
+}
+
+
+/*
+ * upap_rauthack - Receive Authenticate-Ack.
+ */
+static void
+upap_rauthack(upap_state *u, u_char *inp, int id, int len)
+{
+  u_char msglen;
+  char *msg;
+
+  LWIP_UNUSED_ARG(id);
+
+  UPAPDEBUG(LOG_INFO, ("pap_rauthack: Rcvd id %d s=%d\n", id, u->us_clientstate));
+
+  if (u->us_clientstate != UPAPCS_AUTHREQ) { /* XXX */
+    UPAPDEBUG(LOG_INFO, ("pap_rauthack: us_clientstate != UPAPCS_AUTHREQ\n"));
+    return;
+  }
+
+  /*
+   * Parse message.
+   */
+  if (len < (int)sizeof (u_char)) {
+    UPAPDEBUG(LOG_INFO, ("pap_rauthack: ignoring missing msg-length.\n"));
+  } else {
+    GETCHAR(msglen, inp);
+    if (msglen > 0) {
+      len -= sizeof (u_char);
+      if (len < msglen) {
+        UPAPDEBUG(LOG_INFO, ("pap_rauthack: rcvd short packet.\n"));
+        return;
+      }
+      msg = (char *) inp;
+      PRINTMSG(msg, msglen);
+    }
+  }
+  UNTIMEOUT(upap_timeout, u);    /* Cancel timeout */
+  u->us_clientstate = UPAPCS_OPEN;
+
+  auth_withpeer_success(u->us_unit, PPP_PAP);
+}
+
+
+/*
+ * upap_rauthnak - Receive Authenticate-Nak.
+ */
+static void
+upap_rauthnak(upap_state *u, u_char *inp, int id, int len)
+{
+  u_char msglen;
+  char *msg;
+
+  LWIP_UNUSED_ARG(id);
+
+  UPAPDEBUG(LOG_INFO, ("pap_rauthnak: Rcvd id %d s=%d\n", id, u->us_clientstate));
+
+  if (u->us_clientstate != UPAPCS_AUTHREQ) { /* XXX */
+    return;
+  }
+
+  /*
+   * Parse message.
+   */
+  if (len < sizeof (u_char)) {
+    UPAPDEBUG(LOG_INFO, ("pap_rauthnak: ignoring missing msg-length.\n"));
+  } else {
+    GETCHAR(msglen, inp);
+    if(msglen > 0) {
+      len -= sizeof (u_char);
+      if (len < msglen) {
+        UPAPDEBUG(LOG_INFO, ("pap_rauthnak: rcvd short packet.\n"));
+        return;
+      }
+      msg = (char *) inp;
+      PRINTMSG(msg, msglen);
+    }
+  }
+
+  u->us_clientstate = UPAPCS_BADAUTH;
+
+  UPAPDEBUG(LOG_ERR, ("PAP authentication failed\n"));
+  auth_withpeer_fail(u->us_unit, PPP_PAP);
+}
+
+
+/*
+ * upap_sauthreq - Send an Authenticate-Request.
+ */
+static void
+upap_sauthreq(upap_state *u)
+{
+  u_char *outp;
+  int outlen;
+
+  outlen = UPAP_HEADERLEN + 2 * sizeof (u_char) 
+         + u->us_userlen + u->us_passwdlen;
+  outp = outpacket_buf[u->us_unit];
+
+  MAKEHEADER(outp, PPP_PAP);
+
+  PUTCHAR(UPAP_AUTHREQ, outp);
+  PUTCHAR(++u->us_id, outp);
+  PUTSHORT(outlen, outp);
+  PUTCHAR(u->us_userlen, outp);
+  BCOPY(u->us_user, outp, u->us_userlen);
+  INCPTR(u->us_userlen, outp);
+  PUTCHAR(u->us_passwdlen, outp);
+  BCOPY(u->us_passwd, outp, u->us_passwdlen);
+
+  pppWrite(u->us_unit, outpacket_buf[u->us_unit], outlen + PPP_HDRLEN);
+
+  UPAPDEBUG(LOG_INFO, ("pap_sauth: Sent id %d\n", u->us_id));
+
+  TIMEOUT(upap_timeout, u, u->us_timeouttime);
+  ++u->us_transmits;
+  u->us_clientstate = UPAPCS_AUTHREQ;
+}
+
+
+/*
+ * upap_sresp - Send a response (ack or nak).
+ */
+static void
+upap_sresp(upap_state *u, u_char code, u_char id, char *msg, int msglen)
+{
+  u_char *outp;
+  int outlen;
+
+  outlen = UPAP_HEADERLEN + sizeof (u_char) + msglen;
+  outp = outpacket_buf[u->us_unit];
+  MAKEHEADER(outp, PPP_PAP);
+
+  PUTCHAR(code, outp);
+  PUTCHAR(id, outp);
+  PUTSHORT(outlen, outp);
+  PUTCHAR(msglen, outp);
+  BCOPY(msg, outp, msglen);
+  pppWrite(u->us_unit, outpacket_buf[u->us_unit], outlen + PPP_HDRLEN);
+
+  UPAPDEBUG(LOG_INFO, ("pap_sresp: Sent code %d, id %d s=%d\n", code, id, u->us_clientstate));
+}
+
+#if PPP_ADDITIONAL_CALLBACKS
+static char *upap_codenames[] = {
+    "AuthReq", "AuthAck", "AuthNak"
+};
+
+/*
+ * upap_printpkt - print the contents of a PAP packet.
+ */
+static int upap_printpkt(
+  u_char *p,
+  int plen,
+  void (*printer) (void *, char *, ...),
+  void *arg
+)
+{
+  LWIP_UNUSED_ARG(p);
+  LWIP_UNUSED_ARG(plen);
+  LWIP_UNUSED_ARG(printer);
+  LWIP_UNUSED_ARG(arg);
+  return 0;
+}
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+
+#endif /* PAP_SUPPORT */
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/pap.h b/ext/lwip/src/netif/ppp/pap.h
new file mode 100644
index 000000000..c99a20401
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/pap.h
@@ -0,0 +1,118 @@
+/*****************************************************************************
+* pap.h -  PPP Password Authentication Protocol header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-12-04 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
+*   Original derived from BSD codes.
+*****************************************************************************/
+/*
+ * upap.h - User/Password Authentication Protocol definitions.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef PAP_H
+#define PAP_H
+
+#if PAP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+/*
+ * Packet header = Code, id, length.
+ */
+#define UPAP_HEADERLEN (sizeof (u_char) + sizeof (u_char) + sizeof (u_short))
+
+
+/*
+ * UPAP codes.
+ */
+#define UPAP_AUTHREQ 1 /* Authenticate-Request */
+#define UPAP_AUTHACK 2 /* Authenticate-Ack */
+#define UPAP_AUTHNAK 3 /* Authenticate-Nak */
+
+/*
+ * Each interface is described by upap structure.
+ */
+typedef struct upap_state {
+  int us_unit;           /* Interface unit number */
+  const char *us_user;   /* User */
+  int us_userlen;        /* User length */
+  const char *us_passwd; /* Password */
+  int us_passwdlen;      /* Password length */
+  int us_clientstate;    /* Client state */
+  int us_serverstate;    /* Server state */
+  u_char us_id;          /* Current id */
+  int us_timeouttime;    /* Timeout (seconds) for auth-req retrans. */
+  int us_transmits;      /* Number of auth-reqs sent */
+  int us_maxtransmits;   /* Maximum number of auth-reqs to send */
+  int us_reqtimeout;     /* Time to wait for auth-req from peer */
+} upap_state;
+
+/*
+ * Client states.
+ */
+#define UPAPCS_INITIAL 0 /* Connection down */
+#define UPAPCS_CLOSED  1 /* Connection up, haven't requested auth */
+#define UPAPCS_PENDING 2 /* Connection down, have requested auth */
+#define UPAPCS_AUTHREQ 3 /* We've sent an Authenticate-Request */
+#define UPAPCS_OPEN    4 /* We've received an Ack */
+#define UPAPCS_BADAUTH 5 /* We've received a Nak */
+
+/*
+ * Server states.
+ */
+#define UPAPSS_INITIAL 0 /* Connection down */
+#define UPAPSS_CLOSED  1 /* Connection up, haven't requested auth */
+#define UPAPSS_PENDING 2 /* Connection down, have requested auth */
+#define UPAPSS_LISTEN  3 /* Listening for an Authenticate */
+#define UPAPSS_OPEN    4 /* We've sent an Ack */
+#define UPAPSS_BADAUTH 5 /* We've sent a Nak */
+
+
+extern upap_state upap[];
+
+void upap_authwithpeer  (int, char *, char *);
+void upap_authpeer      (int);
+
+extern struct protent pap_protent;
+
+#endif /* PAP_SUPPORT */
+
+#endif /* PAP_H */
diff --git a/ext/lwip/src/netif/ppp/ppp.c b/ext/lwip/src/netif/ppp/ppp.c
new file mode 100644
index 000000000..8e8fae9f9
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/ppp.c
@@ -0,0 +1,2045 @@
+/*****************************************************************************
+* ppp.c - Network Point to Point Protocol program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 by Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-11-05 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original.
+*****************************************************************************/
+
+/*
+ * ppp_defs.h - PPP definitions.
+ *
+ * if_pppvar.h - private structures and declarations for PPP.
+ *
+ * Copyright (c) 1994 The Australian National University.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation is hereby granted, provided that the above copyright
+ * notice appears in all copies.  This software is provided without any
+ * warranty, express or implied. The Australian National University
+ * makes no representations about the suitability of this software for
+ * any purpose.
+ *
+ * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
+ * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+ * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
+ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
+ * OR MODIFICATIONS.
+ */
+
+/*
+ * if_ppp.h - Point-to-Point Protocol definitions.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "lwip/ip.h" /* for ip_input() */
+
+#include "pppdebug.h"
+
+#include "randm.h"
+#include "fsm.h"
+#if PAP_SUPPORT
+#include "pap.h"
+#endif /* PAP_SUPPORT */
+#if CHAP_SUPPORT
+#include "chap.h"
+#endif /* CHAP_SUPPORT */
+#include "ipcp.h"
+#include "lcp.h"
+#include "magic.h"
+#include "auth.h"
+#if VJ_SUPPORT
+#include "vj.h"
+#endif /* VJ_SUPPORT */
+#if PPPOE_SUPPORT
+#include "netif/ppp_oe.h"
+#endif /* PPPOE_SUPPORT */
+
+#include "lwip/tcpip.h"
+#include "lwip/api.h"
+#include "lwip/snmp.h"
+
+#include <string.h>
+
+/*************************/
+/*** LOCAL DEFINITIONS ***/
+/*************************/
+
+/** PPP_INPROC_MULTITHREADED==1 call pppInput using tcpip_callback().
+ * Set this to 0 if pppInProc is called inside tcpip_thread or with NO_SYS==1.
+ * Default is 1 for NO_SYS==0 (multithreaded) and 0 for NO_SYS==1 (single-threaded).
+ */
+#ifndef PPP_INPROC_MULTITHREADED
+#define PPP_INPROC_MULTITHREADED (NO_SYS==0)
+#endif
+
+/** PPP_INPROC_OWNTHREAD==1: start a dedicated RX thread per PPP session.
+ * Default is 0: call pppos_input() for received raw characters, charcater
+ * reception is up to the port */
+#ifndef PPP_INPROC_OWNTHREAD
+#define PPP_INPROC_OWNTHREAD      PPP_INPROC_MULTITHREADED
+#endif
+
+#if PPP_INPROC_OWNTHREAD && !PPP_INPROC_MULTITHREADED
+  #error "PPP_INPROC_OWNTHREAD needs PPP_INPROC_MULTITHREADED==1"
+#endif
+
+/*
+ * The basic PPP frame.
+ */
+#define PPP_ADDRESS(p)  (((u_char *)(p))[0])
+#define PPP_CONTROL(p)  (((u_char *)(p))[1])
+#define PPP_PROTOCOL(p) ((((u_char *)(p))[2] << 8) + ((u_char *)(p))[3])
+
+/* PPP packet parser states.  Current state indicates operation yet to be
+ * completed. */
+typedef enum {
+  PDIDLE = 0,  /* Idle state - waiting. */
+  PDSTART,     /* Process start flag. */
+  PDADDRESS,   /* Process address field. */
+  PDCONTROL,   /* Process control field. */
+  PDPROTOCOL1, /* Process protocol field 1. */
+  PDPROTOCOL2, /* Process protocol field 2. */
+  PDDATA       /* Process data byte. */
+} PPPDevStates;
+
+#define ESCAPE_P(accm, c) ((accm)[(c) >> 3] & pppACCMMask[c & 0x07])
+
+/************************/
+/*** LOCAL DATA TYPES ***/
+/************************/
+
+/** RX buffer size: this may be configured smaller! */
+#ifndef PPPOS_RX_BUFSIZE
+#define PPPOS_RX_BUFSIZE    (PPP_MRU + PPP_HDRLEN)
+#endif
+
+typedef struct PPPControlRx_s {
+  /** unit number / ppp descriptor */
+  int pd;
+  /** the rx file descriptor */
+  sio_fd_t fd;
+  /** receive buffer - encoded data is stored here */
+#if PPP_INPROC_OWNTHREAD
+  u_char rxbuf[PPPOS_RX_BUFSIZE];
+#endif /* PPP_INPROC_OWNTHREAD */
+
+  /* The input packet. */
+  struct pbuf *inHead, *inTail;
+
+#if PPPOS_SUPPORT
+  u16_t inProtocol;             /* The input protocol code. */
+  u16_t inFCS;                  /* Input Frame Check Sequence value. */
+#endif /* PPPOS_SUPPORT */
+  PPPDevStates inState;         /* The input process state. */
+  char inEscaped;               /* Escape next character. */
+  ext_accm inACCM;              /* Async-Ctl-Char-Map for input. */
+} PPPControlRx;
+
+/*
+ * PPP interface control block.
+ */
+typedef struct PPPControl_s {
+  PPPControlRx rx;
+  char openFlag;                /* True when in use. */
+#if PPPOE_SUPPORT
+  struct netif *ethif;
+  struct pppoe_softc *pppoe_sc;
+#endif /* PPPOE_SUPPORT */
+  int  if_up;                   /* True when the interface is up. */
+  int  errCode;                 /* Code indicating why interface is down. */
+#if PPPOS_SUPPORT
+  sio_fd_t fd;                  /* File device ID of port. */
+#endif /* PPPOS_SUPPORT */
+  u16_t mtu;                    /* Peer's mru */
+  int  pcomp;                   /* Does peer accept protocol compression? */
+  int  accomp;                  /* Does peer accept addr/ctl compression? */
+  u_long lastXMit;              /* Time of last transmission. */
+  ext_accm outACCM;             /* Async-Ctl-Char-Map for output. */
+#if PPPOS_SUPPORT && VJ_SUPPORT
+  int  vjEnabled;               /* Flag indicating VJ compression enabled. */
+  struct vjcompress vjComp;     /* Van Jacobson compression header. */
+#endif /* PPPOS_SUPPORT && VJ_SUPPORT */
+
+  struct netif netif;
+
+  struct ppp_addrs addrs;
+
+  void (*linkStatusCB)(void *ctx, int errCode, void *arg);
+  void *linkStatusCtx;
+
+} PPPControl;
+
+
+/*
+ * Ioctl definitions.
+ */
+
+struct npioctl {
+  int         protocol; /* PPP procotol, e.g. PPP_IP */
+  enum NPmode mode;
+};
+
+
+
+/***********************************/
+/*** LOCAL FUNCTION DECLARATIONS ***/
+/***********************************/
+#if PPPOS_SUPPORT
+#if PPP_INPROC_OWNTHREAD
+static void pppInputThread(void *arg);
+#endif /* PPP_INPROC_OWNTHREAD */
+static void pppDrop(PPPControlRx *pcrx);
+static void pppInProc(PPPControlRx *pcrx, u_char *s, int l);
+static void pppFreeCurrentInputPacket(PPPControlRx *pcrx);
+#endif /* PPPOS_SUPPORT */
+
+
+/******************************/
+/*** PUBLIC DATA STRUCTURES ***/
+/******************************/
+u_long subnetMask;
+
+static PPPControl pppControl[NUM_PPP]; /* The PPP interface control blocks. */
+
+/*
+ * PPP Data Link Layer "protocol" table.
+ * One entry per supported protocol.
+ * The last entry must be NULL.
+ */
+struct protent *ppp_protocols[] = {
+  &lcp_protent,
+#if PAP_SUPPORT
+  &pap_protent,
+#endif /* PAP_SUPPORT */
+#if CHAP_SUPPORT
+  &chap_protent,
+#endif /* CHAP_SUPPORT */
+#if CBCP_SUPPORT
+  &cbcp_protent,
+#endif /* CBCP_SUPPORT */
+  &ipcp_protent,
+#if CCP_SUPPORT
+  &ccp_protent,
+#endif /* CCP_SUPPORT */
+  NULL
+};
+
+
+/*
+ * Buffers for outgoing packets.  This must be accessed only from the appropriate
+ * PPP task so that it doesn't need to be protected to avoid collisions.
+ */
+u_char outpacket_buf[NUM_PPP][PPP_MRU+PPP_HDRLEN];
+
+
+/*****************************/
+/*** LOCAL DATA STRUCTURES ***/
+/*****************************/
+
+#if PPPOS_SUPPORT
+/*
+ * FCS lookup table as calculated by genfcstab.
+ * @todo: smaller, slower implementation for lower memory footprint?
+ */
+static const u_short fcstab[256] = {
+  0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
+  0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
+  0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
+  0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
+  0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
+  0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
+  0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
+  0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
+  0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
+  0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
+  0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
+  0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
+  0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
+  0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
+  0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
+  0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
+  0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
+  0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
+  0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
+  0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
+  0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
+  0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
+  0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
+  0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
+  0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
+  0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
+  0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
+  0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
+  0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
+  0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
+  0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
+  0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
+};
+
+/* PPP's Asynchronous-Control-Character-Map.  The mask array is used
+ * to select the specific bit for a character. */
+static u_char pppACCMMask[] = {
+  0x01,
+  0x02,
+  0x04,
+  0x08,
+  0x10,
+  0x20,
+  0x40,
+  0x80
+};
+
+#if PPP_INPROC_OWNTHREAD
+/** Wake up the task blocked in reading from serial line (if any) */
+static void
+pppRecvWakeup(int pd)
+{
+  PPPDEBUG(LOG_DEBUG, ("pppRecvWakeup: unit %d\n", pd));
+  if (pppControl[pd].openFlag != 0) {
+    sio_read_abort(pppControl[pd].fd);
+  }
+}
+#endif /* PPP_INPROC_OWNTHREAD */
+#endif /* PPPOS_SUPPORT */
+
+void
+pppLinkTerminated(int pd)
+{
+  PPPDEBUG(LOG_DEBUG, ("pppLinkTerminated: unit %d\n", pd));
+
+#if PPPOE_SUPPORT
+  if (pppControl[pd].ethif) {
+    pppoe_disconnect(pppControl[pd].pppoe_sc);
+  } else
+#endif /* PPPOE_SUPPORT */
+  {
+#if PPPOS_SUPPORT
+    PPPControl* pc;
+#if PPP_INPROC_OWNTHREAD
+    pppRecvWakeup(pd);
+#endif /* PPP_INPROC_OWNTHREAD */
+    pc = &pppControl[pd];
+
+    PPPDEBUG(LOG_DEBUG, ("pppLinkTerminated: unit %d: linkStatusCB=%p errCode=%d\n", pd, pc->linkStatusCB, pc->errCode));
+    if (pc->linkStatusCB) {
+      pc->linkStatusCB(pc->linkStatusCtx, pc->errCode ? pc->errCode : PPPERR_PROTOCOL, NULL);
+    }
+
+    pc->openFlag = 0;/**/
+#endif /* PPPOS_SUPPORT */
+  }
+  PPPDEBUG(LOG_DEBUG, ("pppLinkTerminated: finished.\n"));
+}
+
+void
+pppLinkDown(int pd)
+{
+  PPPDEBUG(LOG_DEBUG, ("pppLinkDown: unit %d\n", pd));
+
+#if PPPOE_SUPPORT
+  if (pppControl[pd].ethif) {
+    pppoe_disconnect(pppControl[pd].pppoe_sc);
+  } else
+#endif /* PPPOE_SUPPORT */
+  {
+#if PPPOS_SUPPORT && PPP_INPROC_OWNTHREAD
+    pppRecvWakeup(pd);
+#endif /* PPPOS_SUPPORT && PPP_INPROC_OWNTHREAD*/
+  }
+}
+
+/** Initiate LCP open request */
+static void
+pppStart(int pd)
+{
+  PPPDEBUG(LOG_DEBUG, ("pppStart: unit %d\n", pd));
+  lcp_lowerup(pd);
+  lcp_open(pd); /* Start protocol */
+  PPPDEBUG(LOG_DEBUG, ("pppStart: finished\n"));
+}
+
+/** LCP close request */
+static void
+pppStop(int pd)
+{
+  PPPDEBUG(LOG_DEBUG, ("pppStop: unit %d\n", pd));
+  lcp_close(pd, "User request");
+}
+
+/** Called when carrier/link is lost */
+static void
+pppHup(int pd)
+{
+  PPPDEBUG(LOG_DEBUG, ("pppHupCB: unit %d\n", pd));
+  lcp_lowerdown(pd);
+  link_terminated(pd);
+}
+
+/***********************************/
+/*** PUBLIC FUNCTION DEFINITIONS ***/
+/***********************************/
+/* Initialize the PPP subsystem. */
+
+struct ppp_settings ppp_settings;
+
+void
+pppInit(void)
+{
+  struct protent *protp;
+  int i, j;
+
+  memset(&ppp_settings, 0, sizeof(ppp_settings));
+  ppp_settings.usepeerdns = 1;
+  pppSetAuth(PPPAUTHTYPE_NONE, NULL, NULL);
+
+  magicInit();
+
+  subnetMask = PP_HTONL(0xffffff00UL);
+
+  for (i = 0; i < NUM_PPP; i++) {
+    /* Initialize each protocol to the standard option set. */
+    for (j = 0; (protp = ppp_protocols[j]) != NULL; ++j) {
+      (*protp->init)(i);
+    }
+  }
+}
+
+void
+pppSetAuth(enum pppAuthType authType, const char *user, const char *passwd)
+{
+  switch(authType) {
+    case PPPAUTHTYPE_NONE:
+    default:
+#ifdef LWIP_PPP_STRICT_PAP_REJECT
+      ppp_settings.refuse_pap = 1;
+#else  /* LWIP_PPP_STRICT_PAP_REJECT */
+      /* some providers request pap and accept an empty login/pw */
+      ppp_settings.refuse_pap = 0;
+#endif /* LWIP_PPP_STRICT_PAP_REJECT */
+      ppp_settings.refuse_chap = 1;
+      break;
+
+    case PPPAUTHTYPE_ANY:
+      /* Warning: Using PPPAUTHTYPE_ANY might have security consequences.
+       * RFC 1994 says:
+       *
+       * In practice, within or associated with each PPP server, there is a
+       * database which associates "user" names with authentication
+       * information ("secrets").  It is not anticipated that a particular
+       * named user would be authenticated by multiple methods.  This would
+       * make the user vulnerable to attacks which negotiate the least secure
+       * method from among a set (such as PAP rather than CHAP).  If the same
+       * secret was used, PAP would reveal the secret to be used later with
+       * CHAP.
+       *
+       * Instead, for each user name there should be an indication of exactly
+       * one method used to authenticate that user name.  If a user needs to
+       * make use of different authentication methods under different
+       * circumstances, then distinct user names SHOULD be employed, each of
+       * which identifies exactly one authentication method.
+       *
+       */
+      ppp_settings.refuse_pap = 0;
+      ppp_settings.refuse_chap = 0;
+      break;
+
+    case PPPAUTHTYPE_PAP:
+      ppp_settings.refuse_pap = 0;
+      ppp_settings.refuse_chap = 1;
+      break;
+
+    case PPPAUTHTYPE_CHAP:
+      ppp_settings.refuse_pap = 1;
+      ppp_settings.refuse_chap = 0;
+      break;
+  }
+
+  if(user) {
+    strncpy(ppp_settings.user, user, sizeof(ppp_settings.user)-1);
+    ppp_settings.user[sizeof(ppp_settings.user)-1] = '\0';
+  } else {
+    ppp_settings.user[0] = '\0';
+  }
+
+  if(passwd) {
+    strncpy(ppp_settings.passwd, passwd, sizeof(ppp_settings.passwd)-1);
+    ppp_settings.passwd[sizeof(ppp_settings.passwd)-1] = '\0';
+  } else {
+    ppp_settings.passwd[0] = '\0';
+  }
+}
+
+#if PPPOS_SUPPORT
+/** Open a new PPP connection using the given I/O device.
+ * This initializes the PPP control block but does not
+ * attempt to negotiate the LCP session.  If this port
+ * connects to a modem, the modem connection must be
+ * established before calling this.
+ * Return a new PPP connection descriptor on success or
+ * an error code (negative) on failure.
+ *
+ * pppOpen() is directly defined to this function.
+ */
+int
+pppOverSerialOpen(sio_fd_t fd, pppLinkStatusCB_fn linkStatusCB, void *linkStatusCtx)
+{
+  PPPControl *pc;
+  int pd;
+
+  if (linkStatusCB == NULL) {
+    /* PPP is single-threaded: without a callback,
+     * there is no way to know when the link is up. */
+    return PPPERR_PARAM;
+  }
+
+  /* Find a free PPP session descriptor. */
+  for (pd = 0; pd < NUM_PPP && pppControl[pd].openFlag != 0; pd++);
+
+  if (pd >= NUM_PPP) {
+    pd = PPPERR_OPEN;
+  } else {
+    pc = &pppControl[pd];
+    /* input pbuf left over from last session? */
+    pppFreeCurrentInputPacket(&pc->rx);
+    /* @todo: is this correct or do I overwrite something? */
+    memset(pc, 0, sizeof(PPPControl));
+    pc->rx.pd = pd;
+    pc->rx.fd = fd;
+
+    pc->openFlag = 1;
+    pc->fd = fd;
+
+#if VJ_SUPPORT
+    vj_compress_init(&pc->vjComp);
+#endif /* VJ_SUPPORT */
+
+    /* 
+     * Default the in and out accm so that escape and flag characters
+     * are always escaped. 
+     */
+    pc->rx.inACCM[15] = 0x60; /* no need to protect since RX is not running */
+    pc->outACCM[15] = 0x60;
+
+    pc->linkStatusCB = linkStatusCB;
+    pc->linkStatusCtx = linkStatusCtx;
+
+    /*
+     * Start the connection and handle incoming events (packet or timeout).
+     */
+    PPPDEBUG(LOG_INFO, ("pppOverSerialOpen: unit %d: Connecting\n", pd));
+    pppStart(pd);
+#if PPP_INPROC_OWNTHREAD
+    sys_thread_new(PPP_THREAD_NAME, pppInputThread, (void*)&pc->rx, PPP_THREAD_STACKSIZE, PPP_THREAD_PRIO);
+#endif /* PPP_INPROC_OWNTHREAD */
+  }
+
+  return pd;
+}
+#endif /* PPPOS_SUPPORT */
+
+#if PPPOE_SUPPORT
+static void pppOverEthernetLinkStatusCB(int pd, int up);
+
+void
+pppOverEthernetClose(int pd)
+{
+  PPPControl* pc = &pppControl[pd];
+
+  /* *TJL* There's no lcp_deinit */
+  lcp_close(pd, NULL);
+
+  pppoe_destroy(&pc->netif);
+}
+
+int pppOverEthernetOpen(struct netif *ethif, const char *service_name, const char *concentrator_name,
+                        pppLinkStatusCB_fn linkStatusCB, void *linkStatusCtx)
+{
+  PPPControl *pc;
+  int pd;
+
+  LWIP_UNUSED_ARG(service_name);
+  LWIP_UNUSED_ARG(concentrator_name);
+
+  if (linkStatusCB == NULL) {
+    /* PPP is single-threaded: without a callback,
+     * there is no way to know when the link is up. */
+    return PPPERR_PARAM;
+  }
+
+  /* Find a free PPP session descriptor. Critical region? */
+  for (pd = 0; pd < NUM_PPP && pppControl[pd].openFlag != 0; pd++);
+  if (pd >= NUM_PPP) {
+    pd = PPPERR_OPEN;
+  } else {
+    pc = &pppControl[pd];
+    memset(pc, 0, sizeof(PPPControl));
+    pc->openFlag = 1;
+    pc->ethif = ethif;
+
+    pc->linkStatusCB  = linkStatusCB;
+    pc->linkStatusCtx = linkStatusCtx;
+
+    lcp_wantoptions[pd].mru = PPPOE_MAXMTU;
+    lcp_wantoptions[pd].neg_asyncmap = 0;
+    lcp_wantoptions[pd].neg_pcompression = 0;
+    lcp_wantoptions[pd].neg_accompression = 0;
+
+    lcp_allowoptions[pd].mru = PPPOE_MAXMTU;
+    lcp_allowoptions[pd].neg_asyncmap = 0;
+    lcp_allowoptions[pd].neg_pcompression = 0;
+    lcp_allowoptions[pd].neg_accompression = 0;
+
+    if(pppoe_create(ethif, pd, pppOverEthernetLinkStatusCB, &pc->pppoe_sc) != ERR_OK) {
+      pc->openFlag = 0;
+      return PPPERR_OPEN;
+    }
+
+    pppoe_connect(pc->pppoe_sc);
+  }
+
+  return pd;
+}
+#endif /* PPPOE_SUPPORT */
+
+
+/* Close a PPP connection and release the descriptor. 
+ * Any outstanding packets in the queues are dropped.
+ * Return 0 on success, an error code on failure. */
+int
+pppClose(int pd)
+{
+  PPPControl *pc = &pppControl[pd];
+  int st = 0;
+
+  PPPDEBUG(LOG_DEBUG, ("pppClose() called\n"));
+
+  /* Disconnect */
+#if PPPOE_SUPPORT
+  if(pc->ethif) {
+    PPPDEBUG(LOG_DEBUG, ("pppClose: unit %d kill_link -> pppStop\n", pd));
+    pc->errCode = PPPERR_USER;
+    /* This will leave us at PHASE_DEAD. */
+    pppStop(pd);
+  } else
+#endif /* PPPOE_SUPPORT */
+  {
+#if PPPOS_SUPPORT
+    PPPDEBUG(LOG_DEBUG, ("pppClose: unit %d kill_link -> pppStop\n", pd));
+    pc->errCode = PPPERR_USER;
+    /* This will leave us at PHASE_DEAD. */
+    pppStop(pd);
+#if PPP_INPROC_OWNTHREAD
+    pppRecvWakeup(pd);
+#endif /* PPP_INPROC_OWNTHREAD */
+#endif /* PPPOS_SUPPORT */
+  }
+
+  return st;
+}
+
+/* This function is called when carrier is lost on the PPP channel. */
+void
+pppSigHUP(int pd)
+{
+  PPPDEBUG(LOG_DEBUG, ("pppSigHUP: unit %d sig_hup -> pppHupCB\n", pd));
+  pppHup(pd);
+}
+
+#if PPPOS_SUPPORT
+static void
+nPut(PPPControl *pc, struct pbuf *nb)
+{
+  struct pbuf *b;
+  int c;
+
+  for(b = nb; b != NULL; b = b->next) {
+    if((c = sio_write(pc->fd, b->payload, b->len)) != b->len) {
+      PPPDEBUG(LOG_WARNING,
+               ("PPP nPut: incomplete sio_write(fd:%"SZT_F", len:%d, c: 0x%"X8_F") c = %d\n", (size_t)pc->fd, b->len, c, c));
+      LINK_STATS_INC(link.err);
+      pc->lastXMit = 0; /* prepend PPP_FLAG to next packet */
+      snmp_inc_ifoutdiscards(&pc->netif);
+      pbuf_free(nb);
+      return;
+    }
+  }
+
+  snmp_add_ifoutoctets(&pc->netif, nb->tot_len);
+  snmp_inc_ifoutucastpkts(&pc->netif);
+  pbuf_free(nb);
+  LINK_STATS_INC(link.xmit);
+}
+
+/* 
+ * pppAppend - append given character to end of given pbuf.  If outACCM
+ * is not NULL and the character needs to be escaped, do so.
+ * If pbuf is full, append another.
+ * Return the current pbuf.
+ */
+static struct pbuf *
+pppAppend(u_char c, struct pbuf *nb, ext_accm *outACCM)
+{
+  struct pbuf *tb = nb;
+  
+  /* Make sure there is room for the character and an escape code.
+   * Sure we don't quite fill the buffer if the character doesn't
+   * get escaped but is one character worth complicating this? */
+  /* Note: We assume no packet header. */
+  if (nb && (PBUF_POOL_BUFSIZE - nb->len) < 2) {
+    tb = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
+    if (tb) {
+      nb->next = tb;
+    } else {
+      LINK_STATS_INC(link.memerr);
+    }
+    nb = tb;
+  }
+
+  if (nb) {
+    if (outACCM && ESCAPE_P(*outACCM, c)) {
+      *((u_char*)nb->payload + nb->len++) = PPP_ESCAPE;
+      *((u_char*)nb->payload + nb->len++) = c ^ PPP_TRANS;
+    } else {
+      *((u_char*)nb->payload + nb->len++) = c;
+    }
+  }
+
+  return tb;
+}
+#endif /* PPPOS_SUPPORT */
+
+#if PPPOE_SUPPORT
+static err_t
+pppifOutputOverEthernet(int pd, struct pbuf *p)
+{
+  PPPControl *pc = &pppControl[pd];
+  struct pbuf *pb;
+  u_short protocol = PPP_IP;
+  int i=0;
+  u16_t tot_len;
+
+  /* @todo: try to use pbuf_header() here! */
+  pb = pbuf_alloc(PBUF_LINK, PPPOE_HDRLEN + sizeof(protocol), PBUF_RAM);
+  if(!pb) {
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.proterr);
+    snmp_inc_ifoutdiscards(&pc->netif);
+    return ERR_MEM;
+  }
+
+  pbuf_header(pb, -(s16_t)PPPOE_HDRLEN);
+
+  pc->lastXMit = sys_jiffies();
+
+  if (!pc->pcomp || protocol > 0xFF) {
+    *((u_char*)pb->payload + i++) = (protocol >> 8) & 0xFF;
+  }
+  *((u_char*)pb->payload + i) = protocol & 0xFF;
+
+  pbuf_chain(pb, p);
+  tot_len = pb->tot_len;
+
+  if(pppoe_xmit(pc->pppoe_sc, pb) != ERR_OK) {
+    LINK_STATS_INC(link.err);
+    snmp_inc_ifoutdiscards(&pc->netif);
+    return PPPERR_DEVICE;
+  }
+
+  snmp_add_ifoutoctets(&pc->netif, tot_len);
+  snmp_inc_ifoutucastpkts(&pc->netif);
+  LINK_STATS_INC(link.xmit);
+  return ERR_OK;
+}
+#endif /* PPPOE_SUPPORT */
+
+/* Send a packet on the given connection. */
+static err_t
+pppifOutput(struct netif *netif, struct pbuf *pb, ip_addr_t *ipaddr)
+{
+  int pd = (int)(size_t)netif->state;
+  PPPControl *pc = &pppControl[pd];
+#if PPPOS_SUPPORT
+  u_short protocol = PPP_IP;
+  u_int fcsOut = PPP_INITFCS;
+  struct pbuf *headMB = NULL, *tailMB = NULL, *p;
+  u_char c;
+#endif /* PPPOS_SUPPORT */
+
+  LWIP_UNUSED_ARG(ipaddr);
+
+  /* Validate parameters. */
+  /* We let any protocol value go through - it can't hurt us
+   * and the peer will just drop it if it's not accepting it. */
+  if (pd < 0 || pd >= NUM_PPP || !pc->openFlag || !pb) {
+    PPPDEBUG(LOG_WARNING, ("pppifOutput[%d]: bad parms prot=%d pb=%p\n",
+              pd, PPP_IP, pb));
+    LINK_STATS_INC(link.opterr);
+    LINK_STATS_INC(link.drop);
+    snmp_inc_ifoutdiscards(netif);
+    return ERR_ARG;
+  }
+
+  /* Check that the link is up. */
+  if (lcp_phase[pd] == PHASE_DEAD) {
+    PPPDEBUG(LOG_ERR, ("pppifOutput[%d]: link not up\n", pd));
+    LINK_STATS_INC(link.rterr);
+    LINK_STATS_INC(link.drop);
+    snmp_inc_ifoutdiscards(netif);
+    return ERR_RTE;
+  }
+
+#if PPPOE_SUPPORT
+  if(pc->ethif) {
+    return pppifOutputOverEthernet(pd, pb);
+  }
+#endif /* PPPOE_SUPPORT */
+
+#if PPPOS_SUPPORT
+  /* Grab an output buffer. */
+  headMB = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
+  if (headMB == NULL) {
+    PPPDEBUG(LOG_WARNING, ("pppifOutput[%d]: first alloc fail\n", pd));
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.drop);
+    snmp_inc_ifoutdiscards(netif);
+    return ERR_MEM;
+  }
+
+#if VJ_SUPPORT
+  /* 
+   * Attempt Van Jacobson header compression if VJ is configured and
+   * this is an IP packet. 
+   */
+  if (protocol == PPP_IP && pc->vjEnabled) {
+    switch (vj_compress_tcp(&pc->vjComp, pb)) {
+      case TYPE_IP:
+        /* No change...
+           protocol = PPP_IP_PROTOCOL; */
+        break;
+      case TYPE_COMPRESSED_TCP:
+        protocol = PPP_VJC_COMP;
+        break;
+      case TYPE_UNCOMPRESSED_TCP:
+        protocol = PPP_VJC_UNCOMP;
+        break;
+      default:
+        PPPDEBUG(LOG_WARNING, ("pppifOutput[%d]: bad IP packet\n", pd));
+        LINK_STATS_INC(link.proterr);
+        LINK_STATS_INC(link.drop);
+        snmp_inc_ifoutdiscards(netif);
+        pbuf_free(headMB);
+        return ERR_VAL;
+    }
+  }
+#endif /* VJ_SUPPORT */
+
+  tailMB = headMB;
+
+  /* Build the PPP header. */
+  if ((sys_jiffies() - pc->lastXMit) >= PPP_MAXIDLEFLAG) {
+    tailMB = pppAppend(PPP_FLAG, tailMB, NULL);
+  }
+
+  pc->lastXMit = sys_jiffies();
+  if (!pc->accomp) {
+    fcsOut = PPP_FCS(fcsOut, PPP_ALLSTATIONS);
+    tailMB = pppAppend(PPP_ALLSTATIONS, tailMB, &pc->outACCM);
+    fcsOut = PPP_FCS(fcsOut, PPP_UI);
+    tailMB = pppAppend(PPP_UI, tailMB, &pc->outACCM);
+  }
+  if (!pc->pcomp || protocol > 0xFF) {
+    c = (protocol >> 8) & 0xFF;
+    fcsOut = PPP_FCS(fcsOut, c);
+    tailMB = pppAppend(c, tailMB, &pc->outACCM);
+  }
+  c = protocol & 0xFF;
+  fcsOut = PPP_FCS(fcsOut, c);
+  tailMB = pppAppend(c, tailMB, &pc->outACCM);
+
+  /* Load packet. */
+  for(p = pb; p; p = p->next) {
+    int n;
+    u_char *sPtr;
+
+    sPtr = (u_char*)p->payload;
+    n = p->len;
+    while (n-- > 0) {
+      c = *sPtr++;
+
+      /* Update FCS before checking for special characters. */
+      fcsOut = PPP_FCS(fcsOut, c);
+      
+      /* Copy to output buffer escaping special characters. */
+      tailMB = pppAppend(c, tailMB, &pc->outACCM);
+    }
+  }
+
+  /* Add FCS and trailing flag. */
+  c = ~fcsOut & 0xFF;
+  tailMB = pppAppend(c, tailMB, &pc->outACCM);
+  c = (~fcsOut >> 8) & 0xFF;
+  tailMB = pppAppend(c, tailMB, &pc->outACCM);
+  tailMB = pppAppend(PPP_FLAG, tailMB, NULL);
+
+  /* If we failed to complete the packet, throw it away. */
+  if (!tailMB) {
+    PPPDEBUG(LOG_WARNING,
+             ("pppifOutput[%d]: Alloc err - dropping proto=%d\n", 
+              pd, protocol));
+    pbuf_free(headMB);
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.drop);
+    snmp_inc_ifoutdiscards(netif);
+    return ERR_MEM;
+  }
+
+  /* Send it. */
+  PPPDEBUG(LOG_INFO, ("pppifOutput[%d]: proto=0x%"X16_F"\n", pd, protocol));
+
+  nPut(pc, headMB);
+#endif /* PPPOS_SUPPORT */
+
+  return ERR_OK;
+}
+
+/* Get and set parameters for the given connection.
+ * Return 0 on success, an error code on failure. */
+int
+pppIOCtl(int pd, int cmd, void *arg)
+{
+  PPPControl *pc = &pppControl[pd];
+  int st = 0;
+
+  if (pd < 0 || pd >= NUM_PPP) {
+    st = PPPERR_PARAM;
+  } else {
+    switch(cmd) {
+    case PPPCTLG_UPSTATUS:      /* Get the PPP up status. */
+      if (arg) {
+        *(int *)arg = (int)(pc->if_up);
+      } else {
+        st = PPPERR_PARAM;
+      }
+      break;
+    case PPPCTLS_ERRCODE:       /* Set the PPP error code. */
+      if (arg) {
+        pc->errCode = *(int *)arg;
+      } else {
+        st = PPPERR_PARAM;
+      }
+      break;
+    case PPPCTLG_ERRCODE:       /* Get the PPP error code. */
+      if (arg) {
+        *(int *)arg = (int)(pc->errCode);
+      } else {
+        st = PPPERR_PARAM;
+      }
+      break;
+#if PPPOS_SUPPORT
+    case PPPCTLG_FD:            /* Get the fd associated with the ppp */
+      if (arg) {
+        *(sio_fd_t *)arg = pc->fd;
+      } else {
+        st = PPPERR_PARAM;
+      }
+      break;
+#endif /* PPPOS_SUPPORT */
+    default:
+      st = PPPERR_PARAM;
+      break;
+    }
+  }
+
+  return st;
+}
+
+/*
+ * Return the Maximum Transmission Unit for the given PPP connection.
+ */
+u_short
+pppMTU(int pd)
+{
+  PPPControl *pc = &pppControl[pd];
+  u_short st;
+
+  /* Validate parameters. */
+  if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) {
+    st = 0;
+  } else {
+    st = pc->mtu;
+  }
+
+  return st;
+}
+
+#if PPPOE_SUPPORT
+int
+pppWriteOverEthernet(int pd, const u_char *s, int n)
+{
+  PPPControl *pc = &pppControl[pd];
+  struct pbuf *pb;
+
+  /* skip address & flags */
+  s += 2;
+  n -= 2;
+
+  LWIP_ASSERT("PPPOE_HDRLEN + n <= 0xffff", PPPOE_HDRLEN + n <= 0xffff);
+  pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HDRLEN + n), PBUF_RAM);
+  if(!pb) {
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.proterr);
+    snmp_inc_ifoutdiscards(&pc->netif);
+    return PPPERR_ALLOC;
+  }
+
+  pbuf_header(pb, -(s16_t)PPPOE_HDRLEN);
+
+  pc->lastXMit = sys_jiffies();
+
+  MEMCPY(pb->payload, s, n);
+
+  if(pppoe_xmit(pc->pppoe_sc, pb) != ERR_OK) {
+    LINK_STATS_INC(link.err);
+    snmp_inc_ifoutdiscards(&pc->netif);
+    return PPPERR_DEVICE;
+  }
+
+  snmp_add_ifoutoctets(&pc->netif, (u16_t)n);
+  snmp_inc_ifoutucastpkts(&pc->netif);
+  LINK_STATS_INC(link.xmit);
+  return PPPERR_NONE;
+}
+#endif /* PPPOE_SUPPORT */
+
+/*
+ * Write n characters to a ppp link.
+ *  RETURN: >= 0 Number of characters written
+ *           -1 Failed to write to device
+ */
+int
+pppWrite(int pd, const u_char *s, int n)
+{
+  PPPControl *pc = &pppControl[pd];
+#if PPPOS_SUPPORT
+  u_char c;
+  u_int fcsOut;
+  struct pbuf *headMB, *tailMB;
+#endif /* PPPOS_SUPPORT */
+
+#if PPPOE_SUPPORT
+  if(pc->ethif) {
+    return pppWriteOverEthernet(pd, s, n);
+  }
+#endif /* PPPOE_SUPPORT */
+
+#if PPPOS_SUPPORT
+  headMB = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
+  if (headMB == NULL) {
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.proterr);
+    snmp_inc_ifoutdiscards(&pc->netif);
+    return PPPERR_ALLOC;
+  }
+
+  tailMB = headMB;
+
+  /* If the link has been idle, we'll send a fresh flag character to
+   * flush any noise. */
+  if ((sys_jiffies() - pc->lastXMit) >= PPP_MAXIDLEFLAG) {
+    tailMB = pppAppend(PPP_FLAG, tailMB, NULL);
+  }
+  pc->lastXMit = sys_jiffies();
+
+  fcsOut = PPP_INITFCS;
+  /* Load output buffer. */
+  while (n-- > 0) {
+    c = *s++;
+
+    /* Update FCS before checking for special characters. */
+    fcsOut = PPP_FCS(fcsOut, c);
+
+    /* Copy to output buffer escaping special characters. */
+    tailMB = pppAppend(c, tailMB, &pc->outACCM);
+  }
+    
+  /* Add FCS and trailing flag. */
+  c = ~fcsOut & 0xFF;
+  tailMB = pppAppend(c, tailMB, &pc->outACCM);
+  c = (~fcsOut >> 8) & 0xFF;
+  tailMB = pppAppend(c, tailMB, &pc->outACCM);
+  tailMB = pppAppend(PPP_FLAG, tailMB, NULL);
+
+  /* If we failed to complete the packet, throw it away.
+   * Otherwise send it. */
+  if (!tailMB) {
+    PPPDEBUG(LOG_WARNING,
+             ("pppWrite[%d]: Alloc err - dropping pbuf len=%d\n", pd, headMB->len));
+           /*"pppWrite[%d]: Alloc err - dropping %d:%.*H", pd, headMB->len, LWIP_MIN(headMB->len * 2, 40), headMB->payload)); */
+    pbuf_free(headMB);
+    LINK_STATS_INC(link.memerr);
+    LINK_STATS_INC(link.proterr);
+    snmp_inc_ifoutdiscards(&pc->netif);
+    return PPPERR_ALLOC;
+  }
+
+  PPPDEBUG(LOG_INFO, ("pppWrite[%d]: len=%d\n", pd, headMB->len));
+                   /* "pppWrite[%d]: %d:%.*H", pd, headMB->len, LWIP_MIN(headMB->len * 2, 40), headMB->payload)); */
+  nPut(pc, headMB);
+#endif /* PPPOS_SUPPORT */
+
+  return PPPERR_NONE;
+}
+
+/*
+ * ppp_send_config - configure the transmit characteristics of
+ * the ppp interface.
+ */
+void
+ppp_send_config( int unit, u16_t mtu, u32_t asyncmap, int pcomp, int accomp)
+{
+  PPPControl *pc = &pppControl[unit];
+  int i;
+  
+  pc->mtu = mtu;
+  pc->pcomp = pcomp;
+  pc->accomp = accomp;
+  
+  /* Load the ACCM bits for the 32 control codes. */
+  for (i = 0; i < 32/8; i++) {
+    pc->outACCM[i] = (u_char)((asyncmap >> (8 * i)) & 0xFF);
+  }
+  PPPDEBUG(LOG_INFO, ("ppp_send_config[%d]: outACCM=%X %X %X %X\n",
+            unit,
+            pc->outACCM[0], pc->outACCM[1], pc->outACCM[2], pc->outACCM[3]));
+}
+
+
+/*
+ * ppp_set_xaccm - set the extended transmit ACCM for the interface.
+ */
+void
+ppp_set_xaccm(int unit, ext_accm *accm)
+{
+  SMEMCPY(pppControl[unit].outACCM, accm, sizeof(ext_accm));
+  PPPDEBUG(LOG_INFO, ("ppp_set_xaccm[%d]: outACCM=%X %X %X %X\n",
+            unit,
+            pppControl[unit].outACCM[0],
+            pppControl[unit].outACCM[1],
+            pppControl[unit].outACCM[2],
+            pppControl[unit].outACCM[3]));
+}
+
+
+/*
+ * ppp_recv_config - configure the receive-side characteristics of
+ * the ppp interface.
+ */
+void
+ppp_recv_config( int unit, int mru, u32_t asyncmap, int pcomp, int accomp)
+{
+  PPPControl *pc = &pppControl[unit];
+  int i;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  LWIP_UNUSED_ARG(accomp);
+  LWIP_UNUSED_ARG(pcomp);
+  LWIP_UNUSED_ARG(mru);
+
+  /* Load the ACCM bits for the 32 control codes. */
+  SYS_ARCH_PROTECT(lev);
+  for (i = 0; i < 32 / 8; i++) {
+    /* @todo: does this work? ext_accm has been modified from pppd! */
+    pc->rx.inACCM[i] = (u_char)(asyncmap >> (i * 8));
+  }
+  SYS_ARCH_UNPROTECT(lev);
+  PPPDEBUG(LOG_INFO, ("ppp_recv_config[%d]: inACCM=%X %X %X %X\n",
+            unit,
+            pc->rx.inACCM[0], pc->rx.inACCM[1], pc->rx.inACCM[2], pc->rx.inACCM[3]));
+}
+
+#if 0
+/*
+ * ccp_test - ask kernel whether a given compression method
+ * is acceptable for use.  Returns 1 if the method and parameters
+ * are OK, 0 if the method is known but the parameters are not OK
+ * (e.g. code size should be reduced), or -1 if the method is unknown.
+ */
+int
+ccp_test( int unit, int opt_len,  int for_transmit, u_char *opt_ptr)
+{
+  return 0; /* XXX Currently no compression. */
+}
+
+/*
+ * ccp_flags_set - inform kernel about the current state of CCP.
+ */
+void
+ccp_flags_set(int unit, int isopen, int isup)
+{
+  /* XXX */
+}
+
+/*
+ * ccp_fatal_error - returns 1 if decompression was disabled as a
+ * result of an error detected after decompression of a packet,
+ * 0 otherwise.  This is necessary because of patent nonsense.
+ */
+int
+ccp_fatal_error(int unit)
+{
+  /* XXX */
+  return 0;
+}
+#endif
+
+/*
+ * get_idle_time - return how long the link has been idle.
+ */
+int
+get_idle_time(int u, struct ppp_idle *ip)
+{
+  /* XXX */
+  LWIP_UNUSED_ARG(u);
+  LWIP_UNUSED_ARG(ip);
+
+  return 0;
+}
+
+
+/*
+ * Return user specified netmask, modified by any mask we might determine
+ * for address `addr' (in network byte order).
+ * Here we scan through the system's list of interfaces, looking for
+ * any non-point-to-point interfaces which might appear to be on the same
+ * network as `addr'.  If we find any, we OR in their netmask to the
+ * user-specified netmask.
+ */
+u32_t
+GetMask(u32_t addr)
+{
+  u32_t mask, nmask;
+
+  addr = htonl(addr);
+  if (IP_CLASSA(addr)) { /* determine network mask for address class */
+    nmask = IP_CLASSA_NET;
+  } else if (IP_CLASSB(addr)) {
+    nmask = IP_CLASSB_NET;
+  } else { 
+    nmask = IP_CLASSC_NET;
+  }
+
+  /* class D nets are disallowed by bad_ip_adrs */
+  mask = subnetMask | htonl(nmask);
+  
+  /* XXX
+   * Scan through the system's network interfaces.
+   * Get each netmask and OR them into our mask.
+   */
+
+  return mask;
+}
+
+/*
+ * sifvjcomp - config tcp header compression
+ */
+int
+sifvjcomp(int pd, int vjcomp, u8_t cidcomp, u8_t maxcid)
+{
+#if PPPOS_SUPPORT && VJ_SUPPORT
+  PPPControl *pc = &pppControl[pd];
+  
+  pc->vjEnabled = vjcomp;
+  pc->vjComp.compressSlot = cidcomp;
+  pc->vjComp.maxSlotIndex = maxcid;
+  PPPDEBUG(LOG_INFO, ("sifvjcomp: VJ compress enable=%d slot=%d max slot=%d\n",
+            vjcomp, cidcomp, maxcid));
+#else /* PPPOS_SUPPORT && VJ_SUPPORT */
+  LWIP_UNUSED_ARG(pd);
+  LWIP_UNUSED_ARG(vjcomp);
+  LWIP_UNUSED_ARG(cidcomp);
+  LWIP_UNUSED_ARG(maxcid);
+#endif /* PPPOS_SUPPORT && VJ_SUPPORT */
+
+  return 0;
+}
+
+/*
+ * pppifNetifInit - netif init callback
+ */
+static err_t
+pppifNetifInit(struct netif *netif)
+{
+  netif->name[0] = 'p';
+  netif->name[1] = 'p';
+  netif->output = pppifOutput;
+  netif->mtu = pppMTU((int)(size_t)netif->state);
+  netif->flags = NETIF_FLAG_POINTTOPOINT | NETIF_FLAG_LINK_UP;
+#if LWIP_NETIF_HOSTNAME
+  /* @todo: Initialize interface hostname */
+  /* netif_set_hostname(netif, "lwip"); */
+#endif /* LWIP_NETIF_HOSTNAME */
+  return ERR_OK;
+}
+
+
+/*
+ * sifup - Config the interface up and enable IP packets to pass.
+ */
+int
+sifup(int pd)
+{
+  PPPControl *pc = &pppControl[pd];
+  int st = 1;
+  
+  if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) {
+    st = 0;
+    PPPDEBUG(LOG_WARNING, ("sifup[%d]: bad parms\n", pd));
+  } else {
+    netif_remove(&pc->netif);
+    if (netif_add(&pc->netif, &pc->addrs.our_ipaddr, &pc->addrs.netmask,
+                  &pc->addrs.his_ipaddr, (void *)(size_t)pd, pppifNetifInit, ip_input)) {
+      netif_set_up(&pc->netif);
+      pc->if_up = 1;
+      pc->errCode = PPPERR_NONE;
+
+      PPPDEBUG(LOG_DEBUG, ("sifup: unit %d: linkStatusCB=%p errCode=%d\n", pd, pc->linkStatusCB, pc->errCode));
+      if (pc->linkStatusCB) {
+        pc->linkStatusCB(pc->linkStatusCtx, pc->errCode, &pc->addrs);
+      }
+    } else {
+      st = 0;
+      PPPDEBUG(LOG_ERR, ("sifup[%d]: netif_add failed\n", pd));
+    }
+  }
+
+  return st;
+}
+
+/*
+ * sifnpmode - Set the mode for handling packets for a given NP.
+ */
+int
+sifnpmode(int u, int proto, enum NPmode mode)
+{
+  LWIP_UNUSED_ARG(u);
+  LWIP_UNUSED_ARG(proto);
+  LWIP_UNUSED_ARG(mode);
+  return 0;
+}
+
+/*
+ * sifdown - Config the interface down and disable IP.
+ */
+int
+sifdown(int pd)
+{
+  PPPControl *pc = &pppControl[pd];
+  int st = 1;
+  
+  if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) {
+    st = 0;
+    PPPDEBUG(LOG_WARNING, ("sifdown[%d]: bad parms\n", pd));
+  } else {
+    pc->if_up = 0;
+    /* make sure the netif status callback is called */
+    netif_set_down(&pc->netif);
+    netif_remove(&pc->netif);
+    PPPDEBUG(LOG_DEBUG, ("sifdown: unit %d: linkStatusCB=%p errCode=%d\n", pd, pc->linkStatusCB, pc->errCode));
+    if (pc->linkStatusCB) {
+      pc->linkStatusCB(pc->linkStatusCtx, PPPERR_CONNECT, NULL);
+    }
+  }
+  return st;
+}
+
+/**
+ * sifaddr - Config the interface IP addresses and netmask.
+ * @param pd Interface unit ???
+ * @param o Our IP address ???
+ * @param h His IP address ???
+ * @param m IP subnet mask ???
+ * @param ns1 Primary DNS
+ * @param ns2 Secondary DNS
+ */
+int
+sifaddr( int pd, u32_t o, u32_t h, u32_t m, u32_t ns1, u32_t ns2)
+{
+  PPPControl *pc = &pppControl[pd];
+  int st = 1;
+  
+  if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) {
+    st = 0;
+    PPPDEBUG(LOG_WARNING, ("sifup[%d]: bad parms\n", pd));
+  } else {
+    SMEMCPY(&pc->addrs.our_ipaddr, &o, sizeof(o));
+    SMEMCPY(&pc->addrs.his_ipaddr, &h, sizeof(h));
+    SMEMCPY(&pc->addrs.netmask, &m, sizeof(m));
+    SMEMCPY(&pc->addrs.dns1, &ns1, sizeof(ns1));
+    SMEMCPY(&pc->addrs.dns2, &ns2, sizeof(ns2));
+  }
+  return st;
+}
+
+/**
+ * cifaddr - Clear the interface IP addresses, and delete routes
+ * through the interface if possible.
+ * @param pd Interface unit ???
+ * @param o Our IP address ???
+ * @param h IP broadcast address ???
+ */
+int
+cifaddr( int pd, u32_t o, u32_t h)
+{
+  PPPControl *pc = &pppControl[pd];
+  int st = 1;
+  
+  LWIP_UNUSED_ARG(o);
+  LWIP_UNUSED_ARG(h);
+  if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) {
+    st = 0;
+    PPPDEBUG(LOG_WARNING, ("sifup[%d]: bad parms\n", pd));
+  } else {
+    IP4_ADDR(&pc->addrs.our_ipaddr, 0,0,0,0);
+    IP4_ADDR(&pc->addrs.his_ipaddr, 0,0,0,0);
+    IP4_ADDR(&pc->addrs.netmask, 255,255,255,0);
+    IP4_ADDR(&pc->addrs.dns1, 0,0,0,0);
+    IP4_ADDR(&pc->addrs.dns2, 0,0,0,0);
+  }
+  return st;
+}
+
+/*
+ * sifdefaultroute - assign a default route through the address given.
+ */
+int
+sifdefaultroute(int pd, u32_t l, u32_t g)
+{
+  PPPControl *pc = &pppControl[pd];
+  int st = 1;
+
+  LWIP_UNUSED_ARG(l);
+  LWIP_UNUSED_ARG(g);
+
+  if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) {
+    st = 0;
+    PPPDEBUG(LOG_WARNING, ("sifup[%d]: bad parms\n", pd));
+  } else {
+    netif_set_default(&pc->netif);
+  }
+
+  /* TODO: check how PPP handled the netMask, previously not set by ipSetDefault */
+
+  return st;
+}
+
+/*
+ * cifdefaultroute - delete a default route through the address given.
+ */
+int
+cifdefaultroute(int pd, u32_t l, u32_t g)
+{
+  PPPControl *pc = &pppControl[pd];
+  int st = 1;
+
+  LWIP_UNUSED_ARG(l);
+  LWIP_UNUSED_ARG(g);
+
+  if (pd < 0 || pd >= NUM_PPP || !pc->openFlag) {
+    st = 0;
+    PPPDEBUG(LOG_WARNING, ("sifup[%d]: bad parms\n", pd));
+  } else {
+    netif_set_default(NULL);
+  }
+
+  return st;
+}
+
+/**********************************/
+/*** LOCAL FUNCTION DEFINITIONS ***/
+/**********************************/
+
+#if PPPOS_SUPPORT && PPP_INPROC_OWNTHREAD
+/* The main PPP process function.  This implements the state machine according
+ * to section 4 of RFC 1661: The Point-To-Point Protocol. */
+static void
+pppInputThread(void *arg)
+{
+  int count;
+  PPPControlRx *pcrx = arg;
+
+  while (lcp_phase[pcrx->pd] != PHASE_DEAD) {
+    count = sio_read(pcrx->fd, pcrx->rxbuf, PPPOS_RX_BUFSIZE);
+    if(count > 0) {
+      pppInProc(pcrx, pcrx->rxbuf, count);
+    } else {
+      /* nothing received, give other tasks a chance to run */
+      sys_msleep(1);
+    }
+  }
+}
+#endif /* PPPOS_SUPPORT && PPP_INPROC_OWNTHREAD */
+
+#if PPPOE_SUPPORT
+
+void
+pppOverEthernetInitFailed(int pd)
+{
+  PPPControl* pc;
+
+  pppHup(pd);
+  pppStop(pd);
+
+  pc = &pppControl[pd];
+  pppoe_destroy(&pc->netif);
+  pc->openFlag = 0;
+
+  if(pc->linkStatusCB) {
+    pc->linkStatusCB(pc->linkStatusCtx, pc->errCode ? pc->errCode : PPPERR_PROTOCOL, NULL);
+  }
+}
+
+static void
+pppOverEthernetLinkStatusCB(int pd, int up)
+{
+  if(up) {
+    PPPDEBUG(LOG_INFO, ("pppOverEthernetLinkStatusCB: unit %d: Connecting\n", pd));
+    pppStart(pd);
+  } else {
+    pppOverEthernetInitFailed(pd);
+  }
+}
+#endif /* PPPOE_SUPPORT */
+
+struct pbuf *
+pppSingleBuf(struct pbuf *p)
+{
+  struct pbuf *q, *b;
+  u_char *pl;
+
+  if(p->tot_len == p->len) {
+    return p;
+  }
+
+  q = pbuf_alloc(PBUF_RAW, p->tot_len, PBUF_RAM);
+  if(!q) {
+    PPPDEBUG(LOG_ERR,
+             ("pppSingleBuf: unable to alloc new buf (%d)\n", p->tot_len));
+    return p; /* live dangerously */
+  }
+
+  for(b = p, pl = q->payload; b != NULL; b = b->next) {
+    MEMCPY(pl, b->payload, b->len);
+    pl += b->len;
+  }
+
+  pbuf_free(p);
+
+  return q;
+}
+
+struct pppInputHeader {
+  int unit;
+  u16_t proto;
+};
+
+/*
+ * Pass the processed input packet to the appropriate handler.
+ * This function and all handlers run in the context of the tcpip_thread
+ */
+static void
+pppInput(void *arg)
+{
+  struct pbuf *nb = (struct pbuf *)arg;
+  u16_t protocol;
+  int pd;
+
+  pd = ((struct pppInputHeader *)nb->payload)->unit;
+  protocol = ((struct pppInputHeader *)nb->payload)->proto;
+    
+  if(pbuf_header(nb, -(int)sizeof(struct pppInputHeader))) {
+    LWIP_ASSERT("pbuf_header failed\n", 0);
+    goto drop;
+  }
+
+  LINK_STATS_INC(link.recv);
+  snmp_inc_ifinucastpkts(&pppControl[pd].netif);
+  snmp_add_ifinoctets(&pppControl[pd].netif, nb->tot_len);
+
+  /*
+   * Toss all non-LCP packets unless LCP is OPEN.
+   * Until we get past the authentication phase, toss all packets
+   * except LCP, LQR and authentication packets.
+   */
+  if((lcp_phase[pd] <= PHASE_AUTHENTICATE) && (protocol != PPP_LCP)) {
+    if(!((protocol == PPP_LQR) || (protocol == PPP_PAP) || (protocol == PPP_CHAP)) ||
+        (lcp_phase[pd] != PHASE_AUTHENTICATE)) {
+      PPPDEBUG(LOG_INFO, ("pppInput: discarding proto 0x%"X16_F" in phase %d\n", protocol, lcp_phase[pd]));
+      goto drop;
+    }
+  }
+
+  switch(protocol) {
+    case PPP_VJC_COMP:      /* VJ compressed TCP */
+#if PPPOS_SUPPORT && VJ_SUPPORT
+      PPPDEBUG(LOG_INFO, ("pppInput[%d]: vj_comp in pbuf len=%d\n", pd, nb->len));
+      /*
+       * Clip off the VJ header and prepend the rebuilt TCP/IP header and
+       * pass the result to IP.
+       */
+      if ((vj_uncompress_tcp(&nb, &pppControl[pd].vjComp) >= 0) && (pppControl[pd].netif.input)) {
+        pppControl[pd].netif.input(nb, &pppControl[pd].netif);
+        return;
+      }
+      /* Something's wrong so drop it. */
+      PPPDEBUG(LOG_WARNING, ("pppInput[%d]: Dropping VJ compressed\n", pd));
+#else  /* PPPOS_SUPPORT && VJ_SUPPORT */
+      /* No handler for this protocol so drop the packet. */
+      PPPDEBUG(LOG_INFO, ("pppInput[%d]: drop VJ Comp in %d:%s\n", pd, nb->len, nb->payload));
+#endif /* PPPOS_SUPPORT && VJ_SUPPORT */
+      break;
+
+    case PPP_VJC_UNCOMP:    /* VJ uncompressed TCP */
+#if PPPOS_SUPPORT && VJ_SUPPORT
+      PPPDEBUG(LOG_INFO, ("pppInput[%d]: vj_un in pbuf len=%d\n", pd, nb->len));
+      /*
+       * Process the TCP/IP header for VJ header compression and then pass
+       * the packet to IP.
+       */
+      if ((vj_uncompress_uncomp(nb, &pppControl[pd].vjComp) >= 0) && pppControl[pd].netif.input) {
+        pppControl[pd].netif.input(nb, &pppControl[pd].netif);
+        return;
+      }
+      /* Something's wrong so drop it. */
+      PPPDEBUG(LOG_WARNING, ("pppInput[%d]: Dropping VJ uncompressed\n", pd));
+#else  /* PPPOS_SUPPORT && VJ_SUPPORT */
+      /* No handler for this protocol so drop the packet. */
+      PPPDEBUG(LOG_INFO,
+               ("pppInput[%d]: drop VJ UnComp in %d:.*H\n", 
+                pd, nb->len, LWIP_MIN(nb->len * 2, 40), nb->payload));
+#endif /* PPPOS_SUPPORT && VJ_SUPPORT */
+      break;
+
+    case PPP_IP:            /* Internet Protocol */
+      PPPDEBUG(LOG_INFO, ("pppInput[%d]: ip in pbuf len=%d\n", pd, nb->len));
+      if (pppControl[pd].netif.input) {
+        pppControl[pd].netif.input(nb, &pppControl[pd].netif);
+        return;
+      }
+      break;
+
+    default: {
+      struct protent *protp;
+      int i;
+
+      /*
+       * Upcall the proper protocol input routine.
+       */
+      for (i = 0; (protp = ppp_protocols[i]) != NULL; ++i) {
+        if (protp->protocol == protocol && protp->enabled_flag) {
+          PPPDEBUG(LOG_INFO, ("pppInput[%d]: %s len=%d\n", pd, protp->name, nb->len));
+          nb = pppSingleBuf(nb);
+          (*protp->input)(pd, nb->payload, nb->len);
+          PPPDEBUG(LOG_DETAIL, ("pppInput[%d]: packet processed\n", pd));
+          goto out;
+        }
+      }
+
+      /* No handler for this protocol so reject the packet. */
+      PPPDEBUG(LOG_INFO, ("pppInput[%d]: rejecting unsupported proto 0x%"X16_F" len=%d\n", pd, protocol, nb->len));
+      if (pbuf_header(nb, sizeof(protocol))) {
+        LWIP_ASSERT("pbuf_header failed\n", 0);
+        goto drop;
+      }
+#if BYTE_ORDER == LITTLE_ENDIAN
+      protocol = htons(protocol);
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+      SMEMCPY(nb->payload, &protocol, sizeof(protocol));
+      lcp_sprotrej(pd, nb->payload, nb->len);
+    }
+    break;
+  }
+
+drop:
+  LINK_STATS_INC(link.drop);
+  snmp_inc_ifindiscards(&pppControl[pd].netif);
+
+out:
+  pbuf_free(nb);
+  return;
+}
+
+#if PPPOS_SUPPORT
+/*
+ * Drop the input packet.
+ */
+static void
+pppFreeCurrentInputPacket(PPPControlRx *pcrx)
+{
+  if (pcrx->inHead != NULL) {
+    if (pcrx->inTail && (pcrx->inTail != pcrx->inHead)) {
+      pbuf_free(pcrx->inTail);
+    }
+    pbuf_free(pcrx->inHead);
+    pcrx->inHead = NULL;
+  }
+  pcrx->inTail = NULL;
+}
+
+/*
+ * Drop the input packet and increase error counters.
+ */
+static void
+pppDrop(PPPControlRx *pcrx)
+{
+  if (pcrx->inHead != NULL) {
+#if 0
+    PPPDEBUG(LOG_INFO, ("pppDrop: %d:%.*H\n", pcrx->inHead->len, min(60, pcrx->inHead->len * 2), pcrx->inHead->payload));
+#endif
+    PPPDEBUG(LOG_INFO, ("pppDrop: pbuf len=%d, addr %p\n", pcrx->inHead->len, (void*)pcrx->inHead));
+  }
+  pppFreeCurrentInputPacket(pcrx);
+#if VJ_SUPPORT
+  vj_uncompress_err(&pppControl[pcrx->pd].vjComp);
+#endif /* VJ_SUPPORT */
+
+  LINK_STATS_INC(link.drop);
+  snmp_inc_ifindiscards(&pppControl[pcrx->pd].netif);
+}
+
+#if !PPP_INPROC_OWNTHREAD
+/** Pass received raw characters to PPPoS to be decoded. This function is
+ * thread-safe and can be called from a dedicated RX-thread or from a main-loop.
+ *
+ * @param pd PPP descriptor index, returned by pppOpen()
+ * @param data received data
+ * @param len length of received data
+ */
+void
+pppos_input(int pd, u_char* data, int len)
+{
+  pppInProc(&pppControl[pd].rx, data, len);
+}
+#endif
+
+/**
+ * Process a received octet string.
+ */
+static void
+pppInProc(PPPControlRx *pcrx, u_char *s, int l)
+{
+  struct pbuf *nextNBuf;
+  u_char curChar;
+  u_char escaped;
+  SYS_ARCH_DECL_PROTECT(lev);
+
+  PPPDEBUG(LOG_DEBUG, ("pppInProc[%d]: got %d bytes\n", pcrx->pd, l));
+  while (l-- > 0) {
+    curChar = *s++;
+
+    SYS_ARCH_PROTECT(lev);
+    escaped = ESCAPE_P(pcrx->inACCM, curChar);
+    SYS_ARCH_UNPROTECT(lev);
+    /* Handle special characters. */
+    if (escaped) {
+      /* Check for escape sequences. */
+      /* XXX Note that this does not handle an escaped 0x5d character which
+       * would appear as an escape character.  Since this is an ASCII ']'
+       * and there is no reason that I know of to escape it, I won't complicate
+       * the code to handle this case. GLL */
+      if (curChar == PPP_ESCAPE) {
+        pcrx->inEscaped = 1;
+      /* Check for the flag character. */
+      } else if (curChar == PPP_FLAG) {
+        /* If this is just an extra flag character, ignore it. */
+        if (pcrx->inState <= PDADDRESS) {
+          /* ignore it */;
+        /* If we haven't received the packet header, drop what has come in. */
+        } else if (pcrx->inState < PDDATA) {
+          PPPDEBUG(LOG_WARNING,
+                   ("pppInProc[%d]: Dropping incomplete packet %d\n", 
+                    pcrx->pd, pcrx->inState));
+          LINK_STATS_INC(link.lenerr);
+          pppDrop(pcrx);
+        /* If the fcs is invalid, drop the packet. */
+        } else if (pcrx->inFCS != PPP_GOODFCS) {
+          PPPDEBUG(LOG_INFO,
+                   ("pppInProc[%d]: Dropping bad fcs 0x%"X16_F" proto=0x%"X16_F"\n", 
+                    pcrx->pd, pcrx->inFCS, pcrx->inProtocol));
+          /* Note: If you get lots of these, check for UART frame errors or try different baud rate */
+          LINK_STATS_INC(link.chkerr);
+          pppDrop(pcrx);
+        /* Otherwise it's a good packet so pass it on. */
+        } else {
+          struct pbuf *inp;
+          /* Trim off the checksum. */
+          if(pcrx->inTail->len >= 2) {
+            pcrx->inTail->len -= 2;
+
+            pcrx->inTail->tot_len = pcrx->inTail->len;
+            if (pcrx->inTail != pcrx->inHead) {
+              pbuf_cat(pcrx->inHead, pcrx->inTail);
+            }
+          } else {
+            pcrx->inTail->tot_len = pcrx->inTail->len;
+            if (pcrx->inTail != pcrx->inHead) {
+              pbuf_cat(pcrx->inHead, pcrx->inTail);
+            }
+
+            pbuf_realloc(pcrx->inHead, pcrx->inHead->tot_len - 2);
+          }
+
+          /* Dispatch the packet thereby consuming it. */
+          inp = pcrx->inHead;
+          /* Packet consumed, release our references. */
+          pcrx->inHead = NULL;
+          pcrx->inTail = NULL;
+#if PPP_INPROC_MULTITHREADED
+          if(tcpip_callback_with_block(pppInput, inp, 0) != ERR_OK) {
+            PPPDEBUG(LOG_ERR, ("pppInProc[%d]: tcpip_callback() failed, dropping packet\n", pcrx->pd));
+            pbuf_free(inp);
+            LINK_STATS_INC(link.drop);
+            snmp_inc_ifindiscards(&pppControl[pcrx->pd].netif);
+          }
+#else /* PPP_INPROC_MULTITHREADED */
+          pppInput(inp);
+#endif /* PPP_INPROC_MULTITHREADED */
+        }
+
+        /* Prepare for a new packet. */
+        pcrx->inFCS = PPP_INITFCS;
+        pcrx->inState = PDADDRESS;
+        pcrx->inEscaped = 0;
+      /* Other characters are usually control characters that may have
+       * been inserted by the physical layer so here we just drop them. */
+      } else {
+        PPPDEBUG(LOG_WARNING,
+                 ("pppInProc[%d]: Dropping ACCM char <%d>\n", pcrx->pd, curChar));
+      }
+    /* Process other characters. */
+    } else {
+      /* Unencode escaped characters. */
+      if (pcrx->inEscaped) {
+        pcrx->inEscaped = 0;
+        curChar ^= PPP_TRANS;
+      }
+
+      /* Process character relative to current state. */
+      switch(pcrx->inState) {
+        case PDIDLE:                    /* Idle state - waiting. */
+          /* Drop the character if it's not 0xff
+           * we would have processed a flag character above. */
+          if (curChar != PPP_ALLSTATIONS) {
+            break;
+          }
+
+        /* Fall through */
+        case PDSTART:                   /* Process start flag. */
+          /* Prepare for a new packet. */
+          pcrx->inFCS = PPP_INITFCS;
+
+        /* Fall through */
+        case PDADDRESS:                 /* Process address field. */
+          if (curChar == PPP_ALLSTATIONS) {
+            pcrx->inState = PDCONTROL;
+            break;
+          }
+          /* Else assume compressed address and control fields so
+           * fall through to get the protocol... */
+        case PDCONTROL:                 /* Process control field. */
+          /* If we don't get a valid control code, restart. */
+          if (curChar == PPP_UI) {
+            pcrx->inState = PDPROTOCOL1;
+            break;
+          }
+#if 0
+          else {
+            PPPDEBUG(LOG_WARNING,
+                     ("pppInProc[%d]: Invalid control <%d>\n", pcrx->pd, curChar));
+            pcrx->inState = PDSTART;
+          }
+#endif
+        case PDPROTOCOL1:               /* Process protocol field 1. */
+          /* If the lower bit is set, this is the end of the protocol
+           * field. */
+          if (curChar & 1) {
+            pcrx->inProtocol = curChar;
+            pcrx->inState = PDDATA;
+          } else {
+            pcrx->inProtocol = (u_int)curChar << 8;
+            pcrx->inState = PDPROTOCOL2;
+          }
+          break;
+        case PDPROTOCOL2:               /* Process protocol field 2. */
+          pcrx->inProtocol |= curChar;
+          pcrx->inState = PDDATA;
+          break;
+        case PDDATA:                    /* Process data byte. */
+          /* Make space to receive processed data. */
+          if (pcrx->inTail == NULL || pcrx->inTail->len == PBUF_POOL_BUFSIZE) {
+            if (pcrx->inTail != NULL) {
+              pcrx->inTail->tot_len = pcrx->inTail->len;
+              if (pcrx->inTail != pcrx->inHead) {
+                pbuf_cat(pcrx->inHead, pcrx->inTail);
+                /* give up the inTail reference now */
+                pcrx->inTail = NULL;
+              }
+            }
+            /* If we haven't started a packet, we need a packet header. */
+            nextNBuf = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
+            if (nextNBuf == NULL) {
+              /* No free buffers.  Drop the input packet and let the
+               * higher layers deal with it.  Continue processing
+               * the received pbuf chain in case a new packet starts. */
+              PPPDEBUG(LOG_ERR, ("pppInProc[%d]: NO FREE MBUFS!\n", pcrx->pd));
+              LINK_STATS_INC(link.memerr);
+              pppDrop(pcrx);
+              pcrx->inState = PDSTART;  /* Wait for flag sequence. */
+              break;
+            }
+            if (pcrx->inHead == NULL) {
+              struct pppInputHeader *pih = nextNBuf->payload;
+
+              pih->unit = pcrx->pd;
+              pih->proto = pcrx->inProtocol;
+
+              nextNBuf->len += sizeof(*pih);
+
+              pcrx->inHead = nextNBuf;
+            }
+            pcrx->inTail = nextNBuf;
+          }
+          /* Load character into buffer. */
+          ((u_char*)pcrx->inTail->payload)[pcrx->inTail->len++] = curChar;
+          break;
+      }
+
+      /* update the frame check sequence number. */
+      pcrx->inFCS = PPP_FCS(pcrx->inFCS, curChar);
+    }
+  } /* while (l-- > 0), all bytes processed */
+
+  avRandomize();
+}
+#endif /* PPPOS_SUPPORT */
+
+#if PPPOE_SUPPORT
+void
+pppInProcOverEthernet(int pd, struct pbuf *pb)
+{
+  struct pppInputHeader *pih;
+  u16_t inProtocol;
+
+  if(pb->len < sizeof(inProtocol)) {
+    PPPDEBUG(LOG_ERR, ("pppInProcOverEthernet: too small for protocol field\n"));
+    goto drop;
+  }
+
+  inProtocol = (((u8_t *)pb->payload)[0] << 8) | ((u8_t*)pb->payload)[1];
+
+  /* make room for pppInputHeader - should not fail */
+  if (pbuf_header(pb, sizeof(*pih) - sizeof(inProtocol)) != 0) {
+    PPPDEBUG(LOG_ERR, ("pppInProcOverEthernet: could not allocate room for header\n"));
+    goto drop;
+  }
+
+  pih = pb->payload;
+
+  pih->unit = pd;
+  pih->proto = inProtocol;
+
+  /* Dispatch the packet thereby consuming it. */
+  pppInput(pb);
+  return;
+
+drop:
+  LINK_STATS_INC(link.drop);
+  snmp_inc_ifindiscards(&pppControl[pd].netif);
+  pbuf_free(pb);
+  return;
+}
+#endif /* PPPOE_SUPPORT */
+
+#if LWIP_NETIF_STATUS_CALLBACK
+/** Set the status callback of a PPP's netif
+ *
+ * @param pd The PPP descriptor returned by pppOpen()
+ * @param status_callback pointer to the status callback function
+ *
+ * @see netif_set_status_callback
+ */
+void
+ppp_set_netif_statuscallback(int pd, netif_status_callback_fn status_callback)
+{
+  netif_set_status_callback(&pppControl[pd].netif, status_callback); 
+}
+#endif /* LWIP_NETIF_STATUS_CALLBACK */
+
+#if LWIP_NETIF_LINK_CALLBACK
+/** Set the link callback of a PPP's netif
+ *
+ * @param pd The PPP descriptor returned by pppOpen()
+ * @param link_callback pointer to the link callback function
+ *
+ * @see netif_set_link_callback
+ */
+void
+ppp_set_netif_linkcallback(int pd, netif_status_callback_fn link_callback)
+{
+  netif_set_link_callback(&pppControl[pd].netif, link_callback); 
+}
+#endif /* LWIP_NETIF_LINK_CALLBACK */
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/ppp.h b/ext/lwip/src/netif/ppp/ppp.h
new file mode 100644
index 000000000..08d6e62d8
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/ppp.h
@@ -0,0 +1,201 @@
+/*****************************************************************************
+* ppp.h - Network Point to Point Protocol header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-11-05 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
+*   Original derived from BSD codes.
+*****************************************************************************/
+
+#ifndef PPP_H
+#define PPP_H
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "lwip/def.h"
+#include "lwip/sio.h"
+#include "lwip/stats.h"
+#include "lwip/mem.h"
+#include "lwip/netif.h"
+#include "lwip/sys.h"
+#include "lwip/timers.h"
+
+
+#ifndef __u_char_defined
+
+/* Type definitions for BSD code. */
+typedef unsigned long  u_long;
+typedef unsigned int   u_int;
+typedef unsigned short u_short;
+typedef unsigned char  u_char;
+
+#endif
+
+
+/*************************
+*** PUBLIC DEFINITIONS ***
+*************************/
+
+/* Error codes. */
+#define PPPERR_NONE      0 /* No error. */
+#define PPPERR_PARAM    -1 /* Invalid parameter. */
+#define PPPERR_OPEN     -2 /* Unable to open PPP session. */
+#define PPPERR_DEVICE   -3 /* Invalid I/O device for PPP. */
+#define PPPERR_ALLOC    -4 /* Unable to allocate resources. */
+#define PPPERR_USER     -5 /* User interrupt. */
+#define PPPERR_CONNECT  -6 /* Connection lost. */
+#define PPPERR_AUTHFAIL -7 /* Failed authentication challenge. */
+#define PPPERR_PROTOCOL -8 /* Failed to meet protocol. */
+
+/*
+ * PPP IOCTL commands.
+ */
+/*
+ * Get the up status - 0 for down, non-zero for up.  The argument must
+ * point to an int.
+ */
+#define PPPCTLG_UPSTATUS 100 /* Get the up status - 0 down else up */
+#define PPPCTLS_ERRCODE  101 /* Set the error code */
+#define PPPCTLG_ERRCODE  102 /* Get the error code */
+#define PPPCTLG_FD       103 /* Get the fd associated with the ppp */
+
+/************************
+*** PUBLIC DATA TYPES ***
+************************/
+
+struct ppp_addrs {
+  ip_addr_t our_ipaddr, his_ipaddr, netmask, dns1, dns2;
+};
+
+
+/***********************
+*** PUBLIC FUNCTIONS ***
+***********************/
+
+/* Initialize the PPP subsystem. */
+void pppInit(void);
+
+/* Warning: Using PPPAUTHTYPE_ANY might have security consequences.
+ * RFC 1994 says:
+ *
+ * In practice, within or associated with each PPP server, there is a
+ * database which associates "user" names with authentication
+ * information ("secrets").  It is not anticipated that a particular
+ * named user would be authenticated by multiple methods.  This would
+ * make the user vulnerable to attacks which negotiate the least secure
+ * method from among a set (such as PAP rather than CHAP).  If the same
+ * secret was used, PAP would reveal the secret to be used later with
+ * CHAP.
+ *
+ * Instead, for each user name there should be an indication of exactly
+ * one method used to authenticate that user name.  If a user needs to
+ * make use of different authentication methods under different
+ * circumstances, then distinct user names SHOULD be employed, each of
+ * which identifies exactly one authentication method.
+ *
+ */
+enum pppAuthType {
+    PPPAUTHTYPE_NONE,
+    PPPAUTHTYPE_ANY,
+    PPPAUTHTYPE_PAP,
+    PPPAUTHTYPE_CHAP
+};
+
+void pppSetAuth(enum pppAuthType authType, const char *user, const char *passwd);
+
+/* Link status callback function prototype */
+typedef void (*pppLinkStatusCB_fn)(void *ctx, int errCode, void *arg);
+
+#if PPPOS_SUPPORT
+/*
+ * Open a new PPP connection using the given serial I/O device.
+ * This initializes the PPP control block but does not
+ * attempt to negotiate the LCP session.
+ * Return a new PPP connection descriptor on success or
+ * an error code (negative) on failure. 
+ */
+int pppOverSerialOpen(sio_fd_t fd, pppLinkStatusCB_fn linkStatusCB, void *linkStatusCtx);
+#endif /* PPPOS_SUPPORT */
+
+#if PPPOE_SUPPORT
+/*
+ * Open a new PPP Over Ethernet (PPPOE) connection.
+ */
+int pppOverEthernetOpen(struct netif *ethif, const char *service_name, const char *concentrator_name,
+                        pppLinkStatusCB_fn linkStatusCB, void *linkStatusCtx);
+#endif /* PPPOE_SUPPORT */
+
+/* for source code compatibility */
+#define pppOpen(fd,cb,ls) pppOverSerialOpen(fd,cb,ls)
+
+/*
+ * Close a PPP connection and release the descriptor. 
+ * Any outstanding packets in the queues are dropped.
+ * Return 0 on success, an error code on failure. 
+ */
+int pppClose(int pd);
+
+/*
+ * Indicate to the PPP process that the line has disconnected.
+ */
+void pppSigHUP(int pd);
+
+/*
+ * Get and set parameters for the given connection.
+ * Return 0 on success, an error code on failure. 
+ */
+int  pppIOCtl(int pd, int cmd, void *arg);
+
+/*
+ * Return the Maximum Transmission Unit for the given PPP connection.
+ */
+u_short pppMTU(int pd);
+
+#if PPPOS_SUPPORT && !PPP_INPROC_OWNTHREAD
+/*
+ * PPP over Serial: this is the input function to be called for received data.
+ * If PPP_INPROC_OWNTHREAD==1, a seperate input thread using the blocking
+ * sio_read() is used, so this is deactivated.
+ */
+void pppos_input(int pd, u_char* data, int len);
+#endif /* PPPOS_SUPPORT && !PPP_INPROC_OWNTHREAD */
+
+
+#if LWIP_NETIF_STATUS_CALLBACK
+/* Set an lwIP-style status-callback for the selected PPP device */
+void ppp_set_netif_statuscallback(int pd, netif_status_callback_fn status_callback);
+#endif /* LWIP_NETIF_STATUS_CALLBACK */
+#if LWIP_NETIF_LINK_CALLBACK
+/* Set an lwIP-style link-callback for the selected PPP device */
+void ppp_set_netif_linkcallback(int pd, netif_status_callback_fn link_callback);
+#endif /* LWIP_NETIF_LINK_CALLBACK */
+
+#endif /* PPP_SUPPORT */
+
+#endif /* PPP_H */
diff --git a/ext/lwip/src/netif/ppp/ppp_impl.h b/ext/lwip/src/netif/ppp/ppp_impl.h
new file mode 100644
index 000000000..89aea60be
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/ppp_impl.h
@@ -0,0 +1,363 @@
+/*****************************************************************************
+* ppp.h - Network Point to Point Protocol header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1997 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 97-11-05 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
+*   Original derived from BSD codes.
+*****************************************************************************/
+
+#ifndef PPP_IMPL_H
+#define PPP_IMPL_H
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp.h"
+#include "lwip/def.h"
+#include "lwip/sio.h"
+#include "lwip/stats.h"
+#include "lwip/mem.h"
+#include "lwip/netif.h"
+#include "lwip/sys.h"
+#include "lwip/timers.h"
+
+/** Some defines for code we skip compared to the original pppd.
+ *  These are just here to minimise the use of the ugly "#if 0". */
+#define PPP_ADDITIONAL_CALLBACKS  0
+
+/** Some error checks to test for unsupported code */
+#if CBCP_SUPPORT
+#error "CBCP is not supported in lwIP PPP"
+#endif
+#if CCP_SUPPORT
+#error "CCP is not supported in lwIP PPP"
+#endif
+
+/*
+ * pppd.h - PPP daemon global declarations.
+ *
+ * Copyright (c) 1989 Carnegie Mellon University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Carnegie Mellon University.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+/*
+ * ppp_defs.h - PPP definitions.
+ *
+ * Copyright (c) 1994 The Australian National University.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation is hereby granted, provided that the above copyright
+ * notice appears in all copies.  This software is provided without any
+ * warranty, express or implied. The Australian National University
+ * makes no representations about the suitability of this software for
+ * any purpose.
+ *
+ * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
+ * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+ * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
+ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
+ * OR MODIFICATIONS.
+ */
+
+#define TIMEOUT(f, a, t)    do { sys_untimeout((f), (a)); sys_timeout((t)*1000, (f), (a)); } while(0)
+#define UNTIMEOUT(f, a)     sys_untimeout((f), (a))
+
+
+/*
+ * Constants and structures defined by the internet system,
+ * Per RFC 790, September 1981, and numerous additions.
+ */
+
+/*
+ * The basic PPP frame.
+ */
+#define PPP_HDRLEN      4       /* octets for standard ppp header */
+#define PPP_FCSLEN      2       /* octets for FCS */
+
+
+/*
+ * Significant octet values.
+ */
+#define PPP_ALLSTATIONS 0xff    /* All-Stations broadcast address */
+#define PPP_UI          0x03    /* Unnumbered Information */
+#define PPP_FLAG        0x7e    /* Flag Sequence */
+#define PPP_ESCAPE      0x7d    /* Asynchronous Control Escape */
+#define PPP_TRANS       0x20    /* Asynchronous transparency modifier */
+
+/*
+ * Protocol field values.
+ */
+#define PPP_IP          0x21    /* Internet Protocol */
+#define PPP_AT          0x29    /* AppleTalk Protocol */
+#define PPP_VJC_COMP    0x2d    /* VJ compressed TCP */
+#define PPP_VJC_UNCOMP  0x2f    /* VJ uncompressed TCP */
+#define PPP_COMP        0xfd    /* compressed packet */
+#define PPP_IPCP        0x8021  /* IP Control Protocol */
+#define PPP_ATCP        0x8029  /* AppleTalk Control Protocol */
+#define PPP_CCP         0x80fd  /* Compression Control Protocol */
+#define PPP_LCP         0xc021  /* Link Control Protocol */
+#define PPP_PAP         0xc023  /* Password Authentication Protocol */
+#define PPP_LQR         0xc025  /* Link Quality Report protocol */
+#define PPP_CHAP        0xc223  /* Cryptographic Handshake Auth. Protocol */
+#define PPP_CBCP        0xc029  /* Callback Control Protocol */
+
+/*
+ * Values for FCS calculations.
+ */
+#define PPP_INITFCS     0xffff  /* Initial FCS value */
+#define PPP_GOODFCS     0xf0b8  /* Good final FCS value */
+#define PPP_FCS(fcs, c) (((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff])
+
+/*
+ * Extended asyncmap - allows any character to be escaped.
+ */
+typedef u_char  ext_accm[32];
+
+/*
+ * What to do with network protocol (NP) packets.
+ */
+enum NPmode {
+  NPMODE_PASS,        /* pass the packet through */
+  NPMODE_DROP,        /* silently drop the packet */
+  NPMODE_ERROR,       /* return an error */
+  NPMODE_QUEUE        /* save it up for later. */
+};
+
+/*
+ * Inline versions of get/put char/short/long.
+ * Pointer is advanced; we assume that both arguments
+ * are lvalues and will already be in registers.
+ * cp MUST be u_char *.
+ */
+#define GETCHAR(c, cp) { \
+    (c) = *(cp)++; \
+}
+#define PUTCHAR(c, cp) { \
+    *(cp)++ = (u_char) (c); \
+}
+
+
+#define GETSHORT(s, cp) { \
+    (s) = *(cp); (cp)++; (s) <<= 8; \
+    (s) |= *(cp); (cp)++; \
+}
+#define PUTSHORT(s, cp) { \
+    *(cp)++ = (u_char) ((s) >> 8); \
+    *(cp)++ = (u_char) (s & 0xff); \
+}
+
+#define GETLONG(l, cp) { \
+    (l) = *(cp); (cp)++; (l) <<= 8; \
+    (l) |= *(cp); (cp)++; (l) <<= 8; \
+    (l) |= *(cp); (cp)++; (l) <<= 8; \
+    (l) |= *(cp); (cp)++; \
+}
+#define PUTLONG(l, cp) { \
+    *(cp)++ = (u_char) ((l) >> 24); \
+    *(cp)++ = (u_char) ((l) >> 16); \
+    *(cp)++ = (u_char) ((l) >> 8); \
+    *(cp)++ = (u_char) (l); \
+}
+
+
+#define INCPTR(n, cp)   ((cp) += (n))
+#define DECPTR(n, cp)   ((cp) -= (n))
+
+#define BCMP(s0, s1, l)     memcmp((u_char *)(s0), (u_char *)(s1), (l))
+#define BCOPY(s, d, l)      MEMCPY((d), (s), (l))
+#define BZERO(s, n)         memset(s, 0, n)
+
+#if PPP_DEBUG
+#define PRINTMSG(m, l)  { m[l] = '\0'; LWIP_DEBUGF(LOG_INFO, ("Remote message: %s\n", m)); }
+#else  /* PPP_DEBUG */
+#define PRINTMSG(m, l)
+#endif /* PPP_DEBUG */
+
+/*
+ * MAKEHEADER - Add PPP Header fields to a packet.
+ */
+#define MAKEHEADER(p, t) { \
+    PUTCHAR(PPP_ALLSTATIONS, p); \
+    PUTCHAR(PPP_UI, p); \
+    PUTSHORT(t, p); }
+
+/************************
+*** PUBLIC DATA TYPES ***
+************************/
+
+/*
+ * The following struct gives the addresses of procedures to call
+ * for a particular protocol.
+ */
+struct protent {
+    u_short protocol;       /* PPP protocol number */
+    /* Initialization procedure */
+    void (*init) (int unit);
+    /* Process a received packet */
+    void (*input) (int unit, u_char *pkt, int len);
+    /* Process a received protocol-reject */
+    void (*protrej) (int unit);
+    /* Lower layer has come up */
+    void (*lowerup) (int unit);
+    /* Lower layer has gone down */
+    void (*lowerdown) (int unit);
+    /* Open the protocol */
+    void (*open) (int unit);
+    /* Close the protocol */
+    void (*close) (int unit, char *reason);
+#if PPP_ADDITIONAL_CALLBACKS
+    /* Print a packet in readable form */
+    int  (*printpkt) (u_char *pkt, int len,
+              void (*printer) (void *, char *, ...),
+              void *arg);
+    /* Process a received data packet */
+    void (*datainput) (int unit, u_char *pkt, int len);
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+    int  enabled_flag;      /* 0 if protocol is disabled */
+    char *name;         /* Text name of protocol */
+#if PPP_ADDITIONAL_CALLBACKS
+    /* Check requested options, assign defaults */
+    void (*check_options) (u_long);
+    /* Configure interface for demand-dial */
+    int  (*demand_conf) (int unit);
+    /* Say whether to bring up link for this pkt */
+    int  (*active_pkt) (u_char *pkt, int len);
+#endif /* PPP_ADDITIONAL_CALLBACKS */
+};
+
+/*
+ * The following structure records the time in seconds since
+ * the last NP packet was sent or received.
+ */
+struct ppp_idle {
+  u_short xmit_idle;      /* seconds since last NP packet sent */
+  u_short recv_idle;      /* seconds since last NP packet received */
+};
+
+struct ppp_settings {
+
+  u_int  disable_defaultip : 1;       /* Don't use hostname for default IP addrs */
+  u_int  auth_required     : 1;       /* Peer is required to authenticate */
+  u_int  explicit_remote   : 1;       /* remote_name specified with remotename opt */
+  u_int  refuse_pap        : 1;       /* Don't wanna auth. ourselves with PAP */
+  u_int  refuse_chap       : 1;       /* Don't wanna auth. ourselves with CHAP */
+  u_int  usehostname       : 1;       /* Use hostname for our_name */
+  u_int  usepeerdns        : 1;       /* Ask peer for DNS adds */
+
+  u_short idle_time_limit;            /* Shut down link if idle for this long */
+  int  maxconnect;                    /* Maximum connect time (seconds) */
+
+  char user       [MAXNAMELEN   + 1]; /* Username for PAP */
+  char passwd     [MAXSECRETLEN + 1]; /* Password for PAP, secret for CHAP */
+  char our_name   [MAXNAMELEN   + 1]; /* Our name for authentication purposes */
+  char remote_name[MAXNAMELEN   + 1]; /* Peer's name for authentication */
+};
+
+/*****************************
+*** PUBLIC DATA STRUCTURES ***
+*****************************/
+
+/* Buffers for outgoing packets. */
+extern u_char outpacket_buf[NUM_PPP][PPP_MRU+PPP_HDRLEN];
+
+extern struct ppp_settings ppp_settings;
+
+extern struct protent *ppp_protocols[]; /* Table of pointers to supported protocols */
+
+
+/***********************
+*** PUBLIC FUNCTIONS ***
+***********************/
+
+/*
+ * Write n characters to a ppp link.
+ * RETURN: >= 0 Number of characters written, -1 Failed to write to device.
+ */
+int pppWrite(int pd, const u_char *s, int n);
+
+void pppInProcOverEthernet(int pd, struct pbuf *pb);
+
+struct pbuf *pppSingleBuf(struct pbuf *p);
+
+void pppLinkTerminated(int pd);
+
+void pppLinkDown(int pd);
+
+/* Configure i/f transmit parameters */
+void ppp_send_config (int, u16_t, u32_t, int, int);
+/* Set extended transmit ACCM */
+void ppp_set_xaccm (int, ext_accm *);
+/* Configure i/f receive parameters */
+void ppp_recv_config (int, int, u32_t, int, int);
+/* Find out how long link has been idle */
+int  get_idle_time (int, struct ppp_idle *);
+
+/* Configure VJ TCP header compression */
+int  sifvjcomp (int, int, u8_t, u8_t);
+/* Configure i/f down (for IP) */
+int  sifup (int);
+/* Set mode for handling packets for proto */
+int  sifnpmode (int u, int proto, enum NPmode mode);
+/* Configure i/f down (for IP) */
+int  sifdown (int);
+/* Configure IP addresses for i/f */
+int  sifaddr (int, u32_t, u32_t, u32_t, u32_t, u32_t);
+/* Reset i/f IP addresses */
+int  cifaddr (int, u32_t, u32_t);
+/* Create default route through i/f */
+int  sifdefaultroute (int, u32_t, u32_t);
+/* Delete default route through i/f */
+int  cifdefaultroute (int, u32_t, u32_t);
+
+/* Get appropriate netmask for address */
+u32_t GetMask (u32_t); 
+
+#endif /* PPP_SUPPORT */
+
+#endif /* PPP_IMPL_H */
diff --git a/ext/lwip/src/netif/ppp/ppp_oe.c b/ext/lwip/src/netif/ppp/ppp_oe.c
new file mode 100644
index 000000000..fdf52ae23
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/ppp_oe.c
@@ -0,0 +1,1132 @@
+/*****************************************************************************
+* ppp_oe.c - PPP Over Ethernet implementation for lwIP.
+*
+* Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 06-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+*****************************************************************************/
+
+
+
+/* based on NetBSD: if_pppoe.c,v 1.64 2006/01/31 23:50:15 martin Exp */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Martin Husemann <martin@NetBSD.org>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "lwip/opt.h"
+
+#if PPPOE_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "netif/ppp_oe.h"
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "lwip/timers.h"
+#include "lwip/memp.h"
+
+#include <string.h>
+#include <stdio.h>
+
+
+/* Add a 16 bit unsigned value to a buffer pointed to by PTR */
+#define PPPOE_ADD_16(PTR, VAL) \
+    *(PTR)++ = (u8_t)((VAL) / 256);    \
+    *(PTR)++ = (u8_t)((VAL) % 256)
+
+/* Add a complete PPPoE header to the buffer pointed to by PTR */
+#define PPPOE_ADD_HEADER(PTR, CODE, SESS, LEN)  \
+    *(PTR)++ = PPPOE_VERTYPE;  \
+    *(PTR)++ = (CODE);         \
+    PPPOE_ADD_16(PTR, SESS);   \
+    PPPOE_ADD_16(PTR, LEN)
+
+#define PPPOE_DISC_TIMEOUT (5*1000)  /* base for quick timeout calculation */
+#define PPPOE_SLOW_RETRY   (60*1000) /* persistent retry interval */
+#define PPPOE_DISC_MAXPADI  4        /* retry PADI four times (quickly) */
+#define PPPOE_DISC_MAXPADR  2        /* retry PADR twice */
+
+#ifdef PPPOE_SERVER
+#error "PPPOE_SERVER is not yet supported under lwIP!"
+/* from if_spppsubr.c */
+#define IFF_PASSIVE IFF_LINK0 /* wait passively for connection */
+#endif
+
+#ifndef PPPOE_ERRORSTRING_LEN
+#define PPPOE_ERRORSTRING_LEN     64
+#endif
+static char pppoe_error_tmp[PPPOE_ERRORSTRING_LEN];
+
+
+/* input routines */
+static void pppoe_dispatch_disc_pkt(struct netif *, struct pbuf *);
+
+/* management routines */
+static int pppoe_do_disconnect(struct pppoe_softc *);
+static void pppoe_abort_connect(struct pppoe_softc *);
+static void pppoe_clear_softc(struct pppoe_softc *, const char *);
+
+/* internal timeout handling */
+static void pppoe_timeout(void *);
+
+/* sending actual protocol controll packets */
+static err_t pppoe_send_padi(struct pppoe_softc *);
+static err_t pppoe_send_padr(struct pppoe_softc *);
+#ifdef PPPOE_SERVER
+static err_t pppoe_send_pado(struct pppoe_softc *);
+static err_t pppoe_send_pads(struct pppoe_softc *);
+#endif
+static err_t pppoe_send_padt(struct netif *, u_int, const u8_t *);
+
+/* internal helper functions */
+static struct pppoe_softc * pppoe_find_softc_by_session(u_int, struct netif *);
+static struct pppoe_softc * pppoe_find_softc_by_hunique(u8_t *, size_t, struct netif *);
+
+/** linked list of created pppoe interfaces */
+static struct pppoe_softc *pppoe_softc_list;
+
+err_t
+pppoe_create(struct netif *ethif, int pd, void (*linkStatusCB)(int pd, int up), struct pppoe_softc **scptr)
+{
+  struct pppoe_softc *sc;
+
+  sc = (struct pppoe_softc *)memp_malloc(MEMP_PPPOE_IF);
+  if (sc == NULL) {
+    *scptr = NULL;
+    return ERR_MEM;
+  }
+  memset(sc, 0, sizeof(struct pppoe_softc));
+
+  /* changed to real address later */
+  MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest));
+
+  sc->sc_pd = pd;
+  sc->sc_linkStatusCB = linkStatusCB;
+  sc->sc_ethif = ethif;
+
+  /* put the new interface at the head of the list */
+  sc->next = pppoe_softc_list;
+  pppoe_softc_list = sc;
+
+  *scptr = sc;
+
+  return ERR_OK;
+}
+
+err_t
+pppoe_destroy(struct netif *ifp)
+{
+  struct pppoe_softc *sc, *prev = NULL;
+
+  for (sc = pppoe_softc_list; sc != NULL; prev = sc, sc = sc->next) {
+    if (sc->sc_ethif == ifp) {
+      break;
+    }
+  }
+
+  if(!(sc && (sc->sc_ethif == ifp))) {
+    return ERR_IF;
+  }
+
+  sys_untimeout(pppoe_timeout, sc);
+  if (prev == NULL) {
+    /* remove sc from the head of the list */
+    pppoe_softc_list = sc->next;
+  } else {
+    /* remove sc from the list */
+    prev->next = sc->next;
+  }
+
+#ifdef PPPOE_TODO
+  if (sc->sc_concentrator_name) {
+    mem_free(sc->sc_concentrator_name);
+  }
+  if (sc->sc_service_name) {
+    mem_free(sc->sc_service_name);
+  }
+#endif /* PPPOE_TODO */
+  memp_free(MEMP_PPPOE_IF, sc);
+
+  return ERR_OK;
+}
+
+/*
+ * Find the interface handling the specified session.
+ * Note: O(number of sessions open), this is a client-side only, mean
+ * and lean implementation, so number of open sessions typically should
+ * be 1.
+ */
+static struct pppoe_softc *
+pppoe_find_softc_by_session(u_int session, struct netif *rcvif)
+{
+  struct pppoe_softc *sc;
+
+  if (session == 0) {
+    return NULL;
+  }
+
+  for (sc = pppoe_softc_list; sc != NULL; sc = sc->next) {
+    if (sc->sc_state == PPPOE_STATE_SESSION
+        && sc->sc_session == session) {
+      if (sc->sc_ethif == rcvif) {
+        return sc;
+      } else {
+        return NULL;
+      }
+    }
+  }
+  return NULL;
+}
+
+/* Check host unique token passed and return appropriate softc pointer,
+ * or NULL if token is bogus. */
+static struct pppoe_softc *
+pppoe_find_softc_by_hunique(u8_t *token, size_t len, struct netif *rcvif)
+{
+  struct pppoe_softc *sc, *t;
+
+  if (pppoe_softc_list == NULL) {
+    return NULL;
+  }
+
+  if (len != sizeof sc) {
+    return NULL;
+  }
+  MEMCPY(&t, token, len);
+
+  for (sc = pppoe_softc_list; sc != NULL; sc = sc->next) {
+    if (sc == t) {
+      break;
+    }
+  }
+
+  if (sc == NULL) {
+    PPPDEBUG(LOG_DEBUG, ("pppoe: alien host unique tag, no session found\n"));
+    return NULL;
+  }
+
+  /* should be safe to access *sc now */
+  if (sc->sc_state < PPPOE_STATE_PADI_SENT || sc->sc_state >= PPPOE_STATE_SESSION) {
+    printf("%c%c%"U16_F": host unique tag found, but it belongs to a connection in state %d\n",
+      sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, sc->sc_state);
+    return NULL;
+  }
+  if (sc->sc_ethif != rcvif) {
+    printf("%c%c%"U16_F": wrong interface, not accepting host unique\n",
+      sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num);
+    return NULL;
+  }
+  return sc;
+}
+
+static void
+pppoe_linkstatus_up(struct pppoe_softc *sc)
+{
+  sc->sc_linkStatusCB(sc->sc_pd, 1);
+}
+
+/* analyze and handle a single received packet while not in session state */
+static void
+pppoe_dispatch_disc_pkt(struct netif *netif, struct pbuf *pb)
+{
+  u16_t tag, len;
+  u16_t session, plen;
+  struct pppoe_softc *sc;
+  const char *err_msg;
+  char devname[6];
+  u8_t *ac_cookie;
+  u16_t ac_cookie_len;
+#ifdef PPPOE_SERVER
+  u8_t *hunique;
+  size_t hunique_len;
+#endif
+  struct pppoehdr *ph;
+  struct pppoetag pt;
+  int off, err, errortag;
+  struct eth_hdr *ethhdr;
+
+  pb = pppSingleBuf(pb);
+
+  strcpy(devname, "pppoe");  /* as long as we don't know which instance */
+  err_msg = NULL;
+  errortag = 0;
+  if (pb->len < sizeof(*ethhdr)) {
+    goto done;
+  }
+  ethhdr = (struct eth_hdr *)pb->payload;
+  off = sizeof(*ethhdr);
+
+  ac_cookie = NULL;
+  ac_cookie_len = 0;
+#ifdef PPPOE_SERVER
+  hunique = NULL;
+  hunique_len = 0;
+#endif
+  session = 0;
+  if (pb->len - off < PPPOE_HEADERLEN) {
+    printf("pppoe: packet too short: %d\n", pb->len);
+    goto done;
+  }
+
+  ph = (struct pppoehdr *) (ethhdr + 1);
+  if (ph->vertype != PPPOE_VERTYPE) {
+    printf("pppoe: unknown version/type packet: 0x%x\n", ph->vertype);
+    goto done;
+  }
+  session = ntohs(ph->session);
+  plen = ntohs(ph->plen);
+  off += sizeof(*ph);
+
+  if (plen + off > pb->len) {
+    printf("pppoe: packet content does not fit: data available = %d, packet size = %u\n",
+        pb->len - off, plen);
+    goto done;
+  }
+  if(pb->tot_len == pb->len) {
+    pb->tot_len = pb->len = (u16_t)off + plen; /* ignore trailing garbage */
+  }
+  tag = 0;
+  len = 0;
+  sc = NULL;
+  while (off + sizeof(pt) <= pb->len) {
+    MEMCPY(&pt, (u8_t*)pb->payload + off, sizeof(pt));
+    tag = ntohs(pt.tag);
+    len = ntohs(pt.len);
+    if (off + sizeof(pt) + len > pb->len) {
+      printf("pppoe: tag 0x%x len 0x%x is too long\n", tag, len);
+      goto done;
+    }
+    switch (tag) {
+      case PPPOE_TAG_EOL:
+        goto breakbreak;
+      case PPPOE_TAG_SNAME:
+        break;  /* ignored */
+      case PPPOE_TAG_ACNAME:
+        break;  /* ignored */
+      case PPPOE_TAG_HUNIQUE:
+        if (sc != NULL) {
+          break;
+        }
+#ifdef PPPOE_SERVER
+        hunique = (u8_t*)pb->payload + off + sizeof(pt);
+        hunique_len = len;
+#endif
+        sc = pppoe_find_softc_by_hunique((u8_t*)pb->payload + off + sizeof(pt), len, netif);
+        if (sc != NULL) {
+          snprintf(devname, sizeof(devname), "%c%c%"U16_F, sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num);
+        }
+        break;
+      case PPPOE_TAG_ACCOOKIE:
+        if (ac_cookie == NULL) {
+          ac_cookie = (u8_t*)pb->payload + off + sizeof(pt);
+          ac_cookie_len = len;
+        }
+        break;
+      case PPPOE_TAG_SNAME_ERR:
+        err_msg = "SERVICE NAME ERROR";
+        errortag = 1;
+        break;
+      case PPPOE_TAG_ACSYS_ERR:
+        err_msg = "AC SYSTEM ERROR";
+        errortag = 1;
+        break;
+      case PPPOE_TAG_GENERIC_ERR:
+        err_msg = "GENERIC ERROR";
+        errortag = 1;
+        break;
+    }
+    if (err_msg) {
+      if (errortag && len) {
+        u16_t error_len = LWIP_MIN(len, sizeof(pppoe_error_tmp)-1);
+        strncpy(pppoe_error_tmp, (char*)pb->payload + off + sizeof(pt), error_len);
+        pppoe_error_tmp[error_len-1] = '\0';
+        printf("%s: %s: %s\n", devname, err_msg, pppoe_error_tmp);
+      } else {
+        printf("%s: %s\n", devname, err_msg);
+      }
+      if (errortag) {
+        goto done;
+      }
+    }
+    off += sizeof(pt) + len;
+  }
+
+breakbreak:;
+  switch (ph->code) {
+    case PPPOE_CODE_PADI:
+#ifdef PPPOE_SERVER
+      /*
+       * got service name, concentrator name, and/or host unique.
+       * ignore if we have no interfaces with IFF_PASSIVE|IFF_UP.
+       */
+      if (LIST_EMPTY(&pppoe_softc_list)) {
+        goto done;
+      }
+      LIST_FOREACH(sc, &pppoe_softc_list, sc_list) {
+        if (!(sc->sc_sppp.pp_if.if_flags & IFF_UP)) {
+          continue;
+        }
+        if (!(sc->sc_sppp.pp_if.if_flags & IFF_PASSIVE)) {
+          continue;
+        }
+        if (sc->sc_state == PPPOE_STATE_INITIAL) {
+          break;
+        }
+      }
+      if (sc == NULL) {
+        /* printf("pppoe: free passive interface is not found\n"); */
+        goto done;
+      }
+      if (hunique) {
+        if (sc->sc_hunique) {
+          mem_free(sc->sc_hunique);
+        }
+        sc->sc_hunique = mem_malloc(hunique_len);
+        if (sc->sc_hunique == NULL) {
+          goto done;
+        }
+        sc->sc_hunique_len = hunique_len;
+        MEMCPY(sc->sc_hunique, hunique, hunique_len);
+      }
+      MEMCPY(&sc->sc_dest, eh->ether_shost, sizeof sc->sc_dest);
+      sc->sc_state = PPPOE_STATE_PADO_SENT;
+      pppoe_send_pado(sc);
+      break;
+#endif /* PPPOE_SERVER */
+    case PPPOE_CODE_PADR:
+#ifdef PPPOE_SERVER
+      /*
+       * get sc from ac_cookie if IFF_PASSIVE
+       */
+      if (ac_cookie == NULL) {
+        /* be quiet if there is not a single pppoe instance */
+        printf("pppoe: received PADR but not includes ac_cookie\n");
+        goto done;
+      }
+      sc = pppoe_find_softc_by_hunique(ac_cookie, ac_cookie_len, netif);
+      if (sc == NULL) {
+        /* be quiet if there is not a single pppoe instance */
+        if (!LIST_EMPTY(&pppoe_softc_list)) {
+          printf("pppoe: received PADR but could not find request for it\n");
+        }
+        goto done;
+      }
+      if (sc->sc_state != PPPOE_STATE_PADO_SENT) {
+        printf("%c%c%"U16_F": received unexpected PADR\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num);
+        goto done;
+      }
+      if (hunique) {
+        if (sc->sc_hunique) {
+          mem_free(sc->sc_hunique);
+        }
+        sc->sc_hunique = mem_malloc(hunique_len);
+        if (sc->sc_hunique == NULL) {
+          goto done;
+        }
+        sc->sc_hunique_len = hunique_len;
+        MEMCPY(sc->sc_hunique, hunique, hunique_len);
+      }
+      pppoe_send_pads(sc);
+      sc->sc_state = PPPOE_STATE_SESSION;
+      pppoe_linkstatus_up(sc); /* notify upper layers */
+      break;
+#else
+      /* ignore, we are no access concentrator */
+      goto done;
+#endif /* PPPOE_SERVER */
+    case PPPOE_CODE_PADO:
+      if (sc == NULL) {
+        /* be quiet if there is not a single pppoe instance */
+        if (pppoe_softc_list != NULL) {
+          printf("pppoe: received PADO but could not find request for it\n");
+        }
+        goto done;
+      }
+      if (sc->sc_state != PPPOE_STATE_PADI_SENT) {
+        printf("%c%c%"U16_F": received unexpected PADO\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num);
+        goto done;
+      }
+      if (ac_cookie) {
+        sc->sc_ac_cookie_len = ac_cookie_len;
+        MEMCPY(sc->sc_ac_cookie, ac_cookie, ac_cookie_len);
+      }
+      MEMCPY(&sc->sc_dest, ethhdr->src.addr, sizeof(sc->sc_dest.addr));
+      sys_untimeout(pppoe_timeout, sc);
+      sc->sc_padr_retried = 0;
+      sc->sc_state = PPPOE_STATE_PADR_SENT;
+      if ((err = pppoe_send_padr(sc)) != 0) {
+        PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to send PADR, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
+      }
+      sys_timeout(PPPOE_DISC_TIMEOUT * (1 + sc->sc_padr_retried), pppoe_timeout, sc);
+      break;
+    case PPPOE_CODE_PADS:
+      if (sc == NULL) {
+        goto done;
+      }
+      sc->sc_session = session;
+      sys_untimeout(pppoe_timeout, sc);
+      PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": session 0x%x connected\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, session));
+      sc->sc_state = PPPOE_STATE_SESSION;
+      pppoe_linkstatus_up(sc); /* notify upper layers */
+      break;
+    case PPPOE_CODE_PADT:
+      if (sc == NULL) {
+        goto done;
+      }
+      pppoe_clear_softc(sc, "received PADT");
+      break;
+    default:
+      if(sc) {
+        printf("%c%c%"U16_F": unknown code (0x%"X16_F") session = 0x%"X16_F"\n",
+            sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num,
+            (u16_t)ph->code, session);
+      } else {
+        printf("pppoe: unknown code (0x%"X16_F") session = 0x%"X16_F"\n", (u16_t)ph->code, session);
+      }
+      break;
+  }
+
+done:
+  pbuf_free(pb);
+  return;
+}
+
+void
+pppoe_disc_input(struct netif *netif, struct pbuf *p)
+{
+  /* avoid error messages if there is not a single pppoe instance */
+  if (pppoe_softc_list != NULL) {
+    pppoe_dispatch_disc_pkt(netif, p);
+  } else {
+    pbuf_free(p);
+  }
+}
+
+void
+pppoe_data_input(struct netif *netif, struct pbuf *pb)
+{
+  u16_t session, plen;
+  struct pppoe_softc *sc;
+  struct pppoehdr *ph;
+#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
+  u8_t shost[ETHER_ADDR_LEN];
+#endif
+
+#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
+  MEMCPY(shost, ((struct eth_hdr *)pb->payload)->src.addr, sizeof(shost));
+#endif
+  if (pbuf_header(pb, -(int)sizeof(struct eth_hdr)) != 0) {
+    /* bail out */
+    PPPDEBUG(LOG_ERR, ("pppoe_data_input: pbuf_header failed\n"));
+    LINK_STATS_INC(link.lenerr);
+    goto drop;
+  } 
+
+  pb = pppSingleBuf (pb);
+
+  if (pb->len <= PPPOE_HEADERLEN) {
+    printf("pppoe (data): dropping too short packet: %d bytes\n", pb->len);
+    goto drop;
+  }
+
+  if (pb->len < sizeof(*ph)) {
+    printf("pppoe_data_input: could not get PPPoE header\n");
+    goto drop;
+  }
+  ph = (struct pppoehdr *)pb->payload;
+
+  if (ph->vertype != PPPOE_VERTYPE) {
+    printf("pppoe (data): unknown version/type packet: 0x%x\n", ph->vertype);
+    goto drop;
+  }
+  if (ph->code != 0) {
+    goto drop;
+  }
+
+  session = ntohs(ph->session);
+  sc = pppoe_find_softc_by_session(session, netif);
+  if (sc == NULL) {
+#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
+    printf("pppoe: input for unknown session 0x%x, sending PADT\n", session);
+    pppoe_send_padt(netif, session, shost);
+#endif
+    goto drop;
+  }
+
+  plen = ntohs(ph->plen);
+
+  if (pbuf_header(pb, -(int)(PPPOE_HEADERLEN)) != 0) {
+    /* bail out */
+    PPPDEBUG(LOG_ERR, ("pppoe_data_input: pbuf_header PPPOE_HEADERLEN failed\n"));
+    LINK_STATS_INC(link.lenerr);
+    goto drop;
+  } 
+
+  PPPDEBUG(LOG_DEBUG, ("pppoe_data_input: %c%c%"U16_F": pkthdr.len=%d, pppoe.len=%d\n",
+        sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num,
+        pb->len, plen));
+
+  if (pb->len < plen) {
+    goto drop;
+  }
+
+  pppInProcOverEthernet(sc->sc_pd, pb);
+
+  return;
+
+drop:
+  pbuf_free(pb);
+}
+
+static err_t
+pppoe_output(struct pppoe_softc *sc, struct pbuf *pb)
+{
+  struct eth_hdr *ethhdr;
+  u16_t etype;
+  err_t res;
+
+  if (!sc->sc_ethif) {
+    pbuf_free(pb);
+    return ERR_IF;
+  }
+
+  ethhdr = (struct eth_hdr *)pb->payload;
+  etype = sc->sc_state == PPPOE_STATE_SESSION ? ETHTYPE_PPPOE : ETHTYPE_PPPOEDISC;
+  ethhdr->type = htons(etype);
+  MEMCPY(ethhdr->dest.addr, sc->sc_dest.addr, sizeof(ethhdr->dest.addr));
+  MEMCPY(ethhdr->src.addr, ((struct eth_addr *)sc->sc_ethif->hwaddr)->addr, sizeof(ethhdr->src.addr));
+
+  PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F" (%x) state=%d, session=0x%x output -> %02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F", len=%d\n",
+      sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, etype,
+      sc->sc_state, sc->sc_session,
+      sc->sc_dest.addr[0], sc->sc_dest.addr[1], sc->sc_dest.addr[2], sc->sc_dest.addr[3], sc->sc_dest.addr[4], sc->sc_dest.addr[5],
+      pb->tot_len));
+
+  res = sc->sc_ethif->linkoutput(sc->sc_ethif, pb);
+
+  pbuf_free(pb);
+
+  return res;
+}
+
+static err_t
+pppoe_send_padi(struct pppoe_softc *sc)
+{
+  struct pbuf *pb;
+  u8_t *p;
+  int len;
+#ifdef PPPOE_TODO
+  int l1 = 0, l2 = 0; /* XXX: gcc */
+#endif /* PPPOE_TODO */
+
+  if (sc->sc_state >PPPOE_STATE_PADI_SENT) {
+    PPPDEBUG(LOG_ERR, ("ERROR: pppoe_send_padi in state %d", sc->sc_state));
+  }
+
+  /* calculate length of frame (excluding ethernet header + pppoe header) */
+  len = 2 + 2 + 2 + 2 + sizeof sc;  /* service name tag is required, host unique is send too */
+#ifdef PPPOE_TODO
+  if (sc->sc_service_name != NULL) {
+    l1 = (int)strlen(sc->sc_service_name);
+    len += l1;
+  }
+  if (sc->sc_concentrator_name != NULL) {
+    l2 = (int)strlen(sc->sc_concentrator_name);
+    len += 2 + 2 + l2;
+  }
+#endif /* PPPOE_TODO */
+  LWIP_ASSERT("sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff",
+    sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff);
+
+  /* allocate a buffer */
+  pb = pbuf_alloc(PBUF_LINK, (u16_t)(sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len), PBUF_RAM);
+  if (!pb) {
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
+
+  p = (u8_t*)pb->payload + sizeof (struct eth_hdr);
+  /* fill in pkt */
+  PPPOE_ADD_HEADER(p, PPPOE_CODE_PADI, 0, (u16_t)len);
+  PPPOE_ADD_16(p, PPPOE_TAG_SNAME);
+#ifdef PPPOE_TODO
+  if (sc->sc_service_name != NULL) {
+    PPPOE_ADD_16(p, l1);
+    MEMCPY(p, sc->sc_service_name, l1);
+    p += l1;
+  } else
+#endif /* PPPOE_TODO */
+  {
+    PPPOE_ADD_16(p, 0);
+  }
+#ifdef PPPOE_TODO
+  if (sc->sc_concentrator_name != NULL) {
+    PPPOE_ADD_16(p, PPPOE_TAG_ACNAME);
+    PPPOE_ADD_16(p, l2);
+    MEMCPY(p, sc->sc_concentrator_name, l2);
+    p += l2;
+  }
+#endif /* PPPOE_TODO */
+  PPPOE_ADD_16(p, PPPOE_TAG_HUNIQUE);
+  PPPOE_ADD_16(p, sizeof(sc));
+  MEMCPY(p, &sc, sizeof sc);
+
+  /* send pkt */
+  return pppoe_output(sc, pb);
+}
+
+static void
+pppoe_timeout(void *arg)
+{
+  int retry_wait, err;
+  struct pppoe_softc *sc = (struct pppoe_softc*)arg;
+
+  PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": timeout\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
+
+  switch (sc->sc_state) {
+    case PPPOE_STATE_PADI_SENT:
+      /*
+       * We have two basic ways of retrying:
+       *  - Quick retry mode: try a few times in short sequence
+       *  - Slow retry mode: we already had a connection successfully
+       *    established and will try infinitely (without user
+       *    intervention)
+       * We only enter slow retry mode if IFF_LINK1 (aka autodial)
+       * is not set.
+       */
+
+      /* initialize for quick retry mode */
+      retry_wait = PPPOE_DISC_TIMEOUT * (1 + sc->sc_padi_retried);
+
+      sc->sc_padi_retried++;
+      if (sc->sc_padi_retried >= PPPOE_DISC_MAXPADI) {
+#if 0
+        if ((sc->sc_sppp.pp_if.if_flags & IFF_LINK1) == 0) {
+          /* slow retry mode */
+          retry_wait = PPPOE_SLOW_RETRY;
+        } else
+#endif
+        {
+          pppoe_abort_connect(sc);
+          return;
+        }
+      }
+      if ((err = pppoe_send_padi(sc)) != 0) {
+        sc->sc_padi_retried--;
+        PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to transmit PADI, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
+      }
+      sys_timeout(retry_wait, pppoe_timeout, sc);
+      break;
+
+    case PPPOE_STATE_PADR_SENT:
+      sc->sc_padr_retried++;
+      if (sc->sc_padr_retried >= PPPOE_DISC_MAXPADR) {
+        MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest));
+        sc->sc_state = PPPOE_STATE_PADI_SENT;
+        sc->sc_padr_retried = 0;
+        if ((err = pppoe_send_padi(sc)) != 0) {
+          PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to send PADI, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
+        }
+        sys_timeout(PPPOE_DISC_TIMEOUT * (1 + sc->sc_padi_retried), pppoe_timeout, sc);
+        return;
+      }
+      if ((err = pppoe_send_padr(sc)) != 0) {
+        sc->sc_padr_retried--;
+        PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to send PADR, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
+      }
+      sys_timeout(PPPOE_DISC_TIMEOUT * (1 + sc->sc_padr_retried), pppoe_timeout, sc);
+      break;
+    case PPPOE_STATE_CLOSING:
+      pppoe_do_disconnect(sc);
+      break;
+    default:
+      return;  /* all done, work in peace */
+  }
+}
+
+/* Start a connection (i.e. initiate discovery phase) */
+int
+pppoe_connect(struct pppoe_softc *sc)
+{
+  int err;
+
+  if (sc->sc_state != PPPOE_STATE_INITIAL) {
+    return EBUSY;
+  }
+
+#ifdef PPPOE_SERVER
+  /* wait PADI if IFF_PASSIVE */
+  if ((sc->sc_sppp.pp_if.if_flags & IFF_PASSIVE)) {
+    return 0;
+  }
+#endif
+  /* save state, in case we fail to send PADI */
+  sc->sc_state = PPPOE_STATE_PADI_SENT;
+  sc->sc_padr_retried = 0;
+  err = pppoe_send_padi(sc);
+  PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to send PADI, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
+  sys_timeout(PPPOE_DISC_TIMEOUT, pppoe_timeout, sc);
+  return err;
+}
+
+/* disconnect */
+void
+pppoe_disconnect(struct pppoe_softc *sc)
+{
+  if (sc->sc_state < PPPOE_STATE_SESSION) {
+    return;
+  }
+  /*
+   * Do not call pppoe_disconnect here, the upper layer state
+   * machine gets confused by this. We must return from this
+   * function and defer disconnecting to the timeout handler.
+   */
+  sc->sc_state = PPPOE_STATE_CLOSING;
+  sys_timeout(20, pppoe_timeout, sc);
+}
+
+static int
+pppoe_do_disconnect(struct pppoe_softc *sc)
+{
+  int err;
+
+  if (sc->sc_state < PPPOE_STATE_SESSION) {
+    err = EBUSY;
+  } else {
+    PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": disconnecting\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
+    err = pppoe_send_padt(sc->sc_ethif, sc->sc_session, (const u8_t *)&sc->sc_dest);
+  }
+
+  /* cleanup softc */
+  sc->sc_state = PPPOE_STATE_INITIAL;
+  MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest));
+  sc->sc_ac_cookie_len = 0;
+#ifdef PPPOE_SERVER
+  if (sc->sc_hunique) {
+    mem_free(sc->sc_hunique);
+    sc->sc_hunique = NULL;
+  }
+  sc->sc_hunique_len = 0;
+#endif
+  sc->sc_session = 0;
+
+  sc->sc_linkStatusCB(sc->sc_pd, 0); /* notify upper layers */
+
+  return err;
+}
+
+/* Connection attempt aborted */
+static void
+pppoe_abort_connect(struct pppoe_softc *sc)
+{
+  printf("%c%c%"U16_F": could not establish connection\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num);
+  sc->sc_state = PPPOE_STATE_CLOSING;
+
+  sc->sc_linkStatusCB(sc->sc_pd, 0); /* notify upper layers */
+
+  /* clear connection state */
+  MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest));
+  sc->sc_state = PPPOE_STATE_INITIAL;
+}
+
+/* Send a PADR packet */
+static err_t
+pppoe_send_padr(struct pppoe_softc *sc)
+{
+  struct pbuf *pb;
+  u8_t *p;
+  size_t len;
+#ifdef PPPOE_TODO
+  size_t l1 = 0; /* XXX: gcc */
+#endif /* PPPOE_TODO */
+
+  if (sc->sc_state != PPPOE_STATE_PADR_SENT) {
+    return ERR_CONN;
+  }
+
+  len = 2 + 2 + 2 + 2 + sizeof(sc);    /* service name, host unique */
+#ifdef PPPOE_TODO
+  if (sc->sc_service_name != NULL) {    /* service name tag maybe empty */
+    l1 = strlen(sc->sc_service_name);
+    len += l1;
+  }
+#endif /* PPPOE_TODO */
+  if (sc->sc_ac_cookie_len > 0) {
+    len += 2 + 2 + sc->sc_ac_cookie_len;  /* AC cookie */
+  }
+  LWIP_ASSERT("sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff",
+    sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff);
+  pb = pbuf_alloc(PBUF_LINK, (u16_t)(sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len), PBUF_RAM);
+  if (!pb) {
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
+  p = (u8_t*)pb->payload + sizeof (struct eth_hdr);
+  PPPOE_ADD_HEADER(p, PPPOE_CODE_PADR, 0, len);
+  PPPOE_ADD_16(p, PPPOE_TAG_SNAME);
+#ifdef PPPOE_TODO
+  if (sc->sc_service_name != NULL) {
+    PPPOE_ADD_16(p, l1);
+    MEMCPY(p, sc->sc_service_name, l1);
+    p += l1;
+  } else
+#endif /* PPPOE_TODO */
+  {
+    PPPOE_ADD_16(p, 0);
+  }
+  if (sc->sc_ac_cookie_len > 0) {
+    PPPOE_ADD_16(p, PPPOE_TAG_ACCOOKIE);
+    PPPOE_ADD_16(p, sc->sc_ac_cookie_len);
+    MEMCPY(p, sc->sc_ac_cookie, sc->sc_ac_cookie_len);
+    p += sc->sc_ac_cookie_len;
+  }
+  PPPOE_ADD_16(p, PPPOE_TAG_HUNIQUE);
+  PPPOE_ADD_16(p, sizeof(sc));
+  MEMCPY(p, &sc, sizeof sc);
+
+  return pppoe_output(sc, pb);
+}
+
+/* send a PADT packet */
+static err_t
+pppoe_send_padt(struct netif *outgoing_if, u_int session, const u8_t *dest)
+{
+  struct pbuf *pb;
+  struct eth_hdr *ethhdr;
+  err_t res;
+  u8_t *p;
+
+  pb = pbuf_alloc(PBUF_LINK, sizeof(struct eth_hdr) + PPPOE_HEADERLEN, PBUF_RAM);
+  if (!pb) {
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
+
+  ethhdr = (struct eth_hdr *)pb->payload;
+  ethhdr->type = PP_HTONS(ETHTYPE_PPPOEDISC);
+  MEMCPY(ethhdr->dest.addr, dest, sizeof(ethhdr->dest.addr));
+  MEMCPY(ethhdr->src.addr, ((struct eth_addr *)outgoing_if->hwaddr)->addr, sizeof(ethhdr->src.addr));
+
+  p = (u8_t*)(ethhdr + 1);
+  PPPOE_ADD_HEADER(p, PPPOE_CODE_PADT, session, 0);
+
+  res = outgoing_if->linkoutput(outgoing_if, pb);
+
+  pbuf_free(pb);
+
+  return res;
+}
+
+#ifdef PPPOE_SERVER
+static err_t
+pppoe_send_pado(struct pppoe_softc *sc)
+{
+  struct pbuf *pb;
+  u8_t *p;
+  size_t len;
+
+  if (sc->sc_state != PPPOE_STATE_PADO_SENT) {
+    return ERR_CONN;
+  }
+
+  /* calc length */
+  len = 0;
+  /* include ac_cookie */
+  len += 2 + 2 + sizeof(sc);
+  /* include hunique */
+  len += 2 + 2 + sc->sc_hunique_len;
+  pb = pbuf_alloc(PBUF_LINK, sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len, PBUF_RAM);
+  if (!pb) {
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
+  p = (u8_t*)pb->payload + sizeof (struct eth_hdr);
+  PPPOE_ADD_HEADER(p, PPPOE_CODE_PADO, 0, len);
+  PPPOE_ADD_16(p, PPPOE_TAG_ACCOOKIE);
+  PPPOE_ADD_16(p, sizeof(sc));
+  MEMCPY(p, &sc, sizeof(sc));
+  p += sizeof(sc);
+  PPPOE_ADD_16(p, PPPOE_TAG_HUNIQUE);
+  PPPOE_ADD_16(p, sc->sc_hunique_len);
+  MEMCPY(p, sc->sc_hunique, sc->sc_hunique_len);
+  return pppoe_output(sc, pb);
+}
+
+static err_t
+pppoe_send_pads(struct pppoe_softc *sc)
+{
+  struct pbuf *pb;
+  u8_t *p;
+  size_t len, l1 = 0;  /* XXX: gcc */
+
+  if (sc->sc_state != PPPOE_STATE_PADO_SENT) {
+    return ERR_CONN;
+  }
+
+  sc->sc_session = mono_time.tv_sec % 0xff + 1;
+  /* calc length */
+  len = 0;
+  /* include hunique */
+  len += 2 + 2 + 2 + 2 + sc->sc_hunique_len;  /* service name, host unique*/
+  if (sc->sc_service_name != NULL) {    /* service name tag maybe empty */
+    l1 = strlen(sc->sc_service_name);
+    len += l1;
+  }
+  pb = pbuf_alloc(PBUF_LINK, sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len, PBUF_RAM);
+  if (!pb) {
+    return ERR_MEM;
+  }
+  LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
+  p = (u8_t*)pb->payload + sizeof (struct eth_hdr);
+  PPPOE_ADD_HEADER(p, PPPOE_CODE_PADS, sc->sc_session, len);
+  PPPOE_ADD_16(p, PPPOE_TAG_SNAME);
+  if (sc->sc_service_name != NULL) {
+    PPPOE_ADD_16(p, l1);
+    MEMCPY(p, sc->sc_service_name, l1);
+    p += l1;
+  } else {
+    PPPOE_ADD_16(p, 0);
+  }
+  PPPOE_ADD_16(p, PPPOE_TAG_HUNIQUE);
+  PPPOE_ADD_16(p, sc->sc_hunique_len);
+  MEMCPY(p, sc->sc_hunique, sc->sc_hunique_len);
+  return pppoe_output(sc, pb);
+}
+#endif
+
+err_t
+pppoe_xmit(struct pppoe_softc *sc, struct pbuf *pb)
+{
+  u8_t *p;
+  size_t len;
+
+  /* are we ready to process data yet? */
+  if (sc->sc_state < PPPOE_STATE_SESSION) {
+    /*sppp_flush(&sc->sc_sppp.pp_if);*/
+    pbuf_free(pb);
+    return ERR_CONN;
+  }
+
+  len = pb->tot_len;
+
+  /* make room for Ethernet header - should not fail */
+  if (pbuf_header(pb, sizeof(struct eth_hdr) + PPPOE_HEADERLEN) != 0) {
+    /* bail out */
+    PPPDEBUG(LOG_ERR, ("pppoe: %c%c%"U16_F": pppoe_xmit: could not allocate room for header\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
+    LINK_STATS_INC(link.lenerr);
+    pbuf_free(pb);
+    return ERR_BUF;
+  } 
+
+  p = (u8_t*)pb->payload + sizeof(struct eth_hdr);
+  PPPOE_ADD_HEADER(p, 0, sc->sc_session, len);
+
+  return pppoe_output(sc, pb);
+}
+
+#if 0 /*def PFIL_HOOKS*/
+static int
+pppoe_ifattach_hook(void *arg, struct pbuf **mp, struct netif *ifp, int dir)
+{
+  struct pppoe_softc *sc;
+  int s;
+
+  if (mp != (struct pbuf **)PFIL_IFNET_DETACH) {
+    return 0;
+  }
+
+  LIST_FOREACH(sc, &pppoe_softc_list, sc_list) {
+    if (sc->sc_ethif != ifp) {
+      continue;
+    }
+    if (sc->sc_sppp.pp_if.if_flags & IFF_UP) {
+      sc->sc_sppp.pp_if.if_flags &= ~(IFF_UP|IFF_RUNNING);
+      printf("%c%c%"U16_F": ethernet interface detached, going down\n",
+          sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num);
+    }
+    sc->sc_ethif = NULL;
+    pppoe_clear_softc(sc, "ethernet interface detached");
+  }
+
+  return 0;
+}
+#endif
+
+static void
+pppoe_clear_softc(struct pppoe_softc *sc, const char *message)
+{
+  LWIP_UNUSED_ARG(message);
+
+  /* stop timer */
+  sys_untimeout(pppoe_timeout, sc);
+  PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": session 0x%x terminated, %s\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, sc->sc_session, message));
+
+  /* fix our state */
+  sc->sc_state = PPPOE_STATE_INITIAL;
+
+  /* notify upper layers */
+  sc->sc_linkStatusCB(sc->sc_pd, 0);
+
+  /* clean up softc */
+  MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest));
+  sc->sc_ac_cookie_len = 0;
+  sc->sc_session = 0;
+}
+
+#endif /* PPPOE_SUPPORT */
+
diff --git a/ext/lwip/src/netif/ppp/pppdebug.h b/ext/lwip/src/netif/ppp/pppdebug.h
new file mode 100644
index 000000000..81349971d
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/pppdebug.h
@@ -0,0 +1,73 @@
+/*****************************************************************************
+* pppdebug.h - System debugging utilities.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* portions Copyright (c) 1998 Global Election Systems Inc.
+* portions Copyright (c) 2001 by Cognizant Pty Ltd.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY (please don't use tabs!)
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 98-07-29 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Original.
+*
+*****************************************************************************
+*/
+#ifndef PPPDEBUG_H
+#define PPPDEBUG_H
+
+/* Trace levels. */
+#define LOG_CRITICAL  (PPP_DEBUG | LWIP_DBG_LEVEL_SEVERE)
+#define LOG_ERR       (PPP_DEBUG | LWIP_DBG_LEVEL_SEVERE)
+#define LOG_NOTICE    (PPP_DEBUG | LWIP_DBG_LEVEL_WARNING)
+#define LOG_WARNING   (PPP_DEBUG | LWIP_DBG_LEVEL_WARNING)
+#define LOG_INFO      (PPP_DEBUG)
+#define LOG_DETAIL    (PPP_DEBUG)
+#define LOG_DEBUG     (PPP_DEBUG)
+
+
+#define TRACELCP PPP_DEBUG
+
+#if PPP_DEBUG
+
+#define AUTHDEBUG(a, b) LWIP_DEBUGF(a, b)
+#define IPCPDEBUG(a, b) LWIP_DEBUGF(a, b)
+#define UPAPDEBUG(a, b) LWIP_DEBUGF(a, b)
+#define LCPDEBUG(a, b)  LWIP_DEBUGF(a, b)
+#define FSMDEBUG(a, b)  LWIP_DEBUGF(a, b)
+#define CHAPDEBUG(a, b) LWIP_DEBUGF(a, b)
+#define PPPDEBUG(a, b)  LWIP_DEBUGF(a, b)
+
+#else /* PPP_DEBUG */
+
+#define AUTHDEBUG(a, b)
+#define IPCPDEBUG(a, b)
+#define UPAPDEBUG(a, b)
+#define LCPDEBUG(a, b)
+#define FSMDEBUG(a, b)
+#define CHAPDEBUG(a, b)
+#define PPPDEBUG(a, b)
+
+#endif /* PPP_DEBUG */
+
+#endif /* PPPDEBUG_H */
diff --git a/ext/lwip/src/netif/ppp/randm.c b/ext/lwip/src/netif/ppp/randm.c
new file mode 100644
index 000000000..b736091fc
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/randm.c
@@ -0,0 +1,249 @@
+/*****************************************************************************
+* randm.c - Random number generator program file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* Copyright (c) 1998 by Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 98-06-03 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
+*   Extracted from avos.
+*****************************************************************************/
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "md5.h"
+#include "randm.h"
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include <string.h>
+
+#if MD5_SUPPORT /* this module depends on MD5 */
+#define RANDPOOLSZ 16   /* Bytes stored in the pool of randomness. */
+
+/*****************************/
+/*** LOCAL DATA STRUCTURES ***/
+/*****************************/
+static char randPool[RANDPOOLSZ];   /* Pool of randomness. */
+static long randCount = 0;      /* Pseudo-random incrementer */
+
+
+/***********************************/
+/*** PUBLIC FUNCTION DEFINITIONS ***/
+/***********************************/
+/*
+ * Initialize the random number generator.
+ *
+ * Since this is to be called on power up, we don't have much
+ *  system randomess to work with.  Here all we use is the
+ *  real-time clock.  We'll accumulate more randomness as soon
+ *  as things start happening.
+ */
+void
+avRandomInit()
+{
+  avChurnRand(NULL, 0);
+}
+
+/*
+ * Churn the randomness pool on a random event.  Call this early and often
+ *  on random and semi-random system events to build randomness in time for
+ *  usage.  For randomly timed events, pass a null pointer and a zero length
+ *  and this will use the system timer and other sources to add randomness.
+ *  If new random data is available, pass a pointer to that and it will be
+ *  included.
+ *
+ * Ref: Applied Cryptography 2nd Ed. by Bruce Schneier p. 427
+ */
+void
+avChurnRand(char *randData, u32_t randLen)
+{
+  MD5_CTX md5;
+
+  /* LWIP_DEBUGF(LOG_INFO, ("churnRand: %u@%P\n", randLen, randData)); */
+  MD5Init(&md5);
+  MD5Update(&md5, (u_char *)randPool, sizeof(randPool));
+  if (randData) {
+    MD5Update(&md5, (u_char *)randData, randLen);
+  } else {
+    struct {
+      /* INCLUDE fields for any system sources of randomness */
+      char foobar;
+    } sysData;
+
+    /* Load sysData fields here. */
+    MD5Update(&md5, (u_char *)&sysData, sizeof(sysData));
+  }
+  MD5Final((u_char *)randPool, &md5);
+/*  LWIP_DEBUGF(LOG_INFO, ("churnRand: -> 0\n")); */
+}
+
+/*
+ * Use the random pool to generate random data.  This degrades to pseudo
+ *  random when used faster than randomness is supplied using churnRand().
+ * Note: It's important that there be sufficient randomness in randPool
+ *  before this is called for otherwise the range of the result may be
+ *  narrow enough to make a search feasible.
+ *
+ * Ref: Applied Cryptography 2nd Ed. by Bruce Schneier p. 427
+ *
+ * XXX Why does he not just call churnRand() for each block?  Probably
+ *  so that you don't ever publish the seed which could possibly help
+ *  predict future values.
+ * XXX Why don't we preserve md5 between blocks and just update it with
+ *  randCount each time?  Probably there is a weakness but I wish that
+ *  it was documented.
+ */
+void
+avGenRand(char *buf, u32_t bufLen)
+{
+  MD5_CTX md5;
+  u_char tmp[16];
+  u32_t n;
+
+  while (bufLen > 0) {
+    n = LWIP_MIN(bufLen, RANDPOOLSZ);
+    MD5Init(&md5);
+    MD5Update(&md5, (u_char *)randPool, sizeof(randPool));
+    MD5Update(&md5, (u_char *)&randCount, sizeof(randCount));
+    MD5Final(tmp, &md5);
+    randCount++;
+    MEMCPY(buf, tmp, n);
+    buf += n;
+    bufLen -= n;
+  }
+}
+
+/*
+ * Return a new random number.
+ */
+u32_t
+avRandom()
+{
+  u32_t newRand;
+
+  avGenRand((char *)&newRand, sizeof(newRand));
+
+  return newRand;
+}
+
+#else /* MD5_SUPPORT */
+
+/*****************************/
+/*** LOCAL DATA STRUCTURES ***/
+/*****************************/
+static int  avRandomized = 0;       /* Set when truely randomized. */
+static u32_t avRandomSeed = 0;      /* Seed used for random number generation. */
+
+
+/***********************************/
+/*** PUBLIC FUNCTION DEFINITIONS ***/
+/***********************************/
+/*
+ * Initialize the random number generator.
+ *
+ * Here we attempt to compute a random number seed but even if
+ * it isn't random, we'll randomize it later.
+ *
+ * The current method uses the fields from the real time clock,
+ * the idle process counter, the millisecond counter, and the
+ * hardware timer tick counter.  When this is invoked
+ * in startup(), then the idle counter and timer values may
+ * repeat after each boot and the real time clock may not be
+ * operational.  Thus we call it again on the first random
+ * event.
+ */
+void
+avRandomInit()
+{
+#if 0
+  /* Get a pointer into the last 4 bytes of clockBuf. */
+  u32_t *lptr1 = (u32_t *)((char *)&clockBuf[3]);
+
+  /*
+   * Initialize our seed using the real-time clock, the idle
+   * counter, the millisecond timer, and the hardware timer
+   * tick counter.  The real-time clock and the hardware
+   * tick counter are the best sources of randomness but
+   * since the tick counter is only 16 bit (and truncated
+   * at that), the idle counter and millisecond timer
+   * (which may be small values) are added to help
+   * randomize the lower 16 bits of the seed.
+   */
+  readClk();
+  avRandomSeed += *(u32_t *)clockBuf + *lptr1 + OSIdleCtr
+           + ppp_mtime() + ((u32_t)TM1 << 16) + TM1;
+#else
+  avRandomSeed += sys_jiffies(); /* XXX */
+#endif
+
+  /* Initialize the Borland random number generator. */
+  srand((unsigned)avRandomSeed);
+}
+
+/*
+ * Randomize our random seed value.  Here we use the fact that
+ * this function is called at *truely random* times by the polling
+ * and network functions.  Here we only get 16 bits of new random
+ * value but we use the previous value to randomize the other 16
+ * bits.
+ */
+void
+avRandomize(void)
+{
+  static u32_t last_jiffies;
+
+  if (!avRandomized) {
+    avRandomized = !0;
+    avRandomInit();
+    /* The initialization function also updates the seed. */
+  } else {
+    /* avRandomSeed += (avRandomSeed << 16) + TM1; */
+    avRandomSeed += (sys_jiffies() - last_jiffies); /* XXX */
+  }
+  last_jiffies = sys_jiffies();
+}
+
+/*
+ * Return a new random number.
+ * Here we use the Borland rand() function to supply a pseudo random
+ * number which we make truely random by combining it with our own
+ * seed which is randomized by truely random events. 
+ * Thus the numbers will be truely random unless there have been no
+ * operator or network events in which case it will be pseudo random
+ * seeded by the real time clock.
+ */
+u32_t
+avRandom()
+{
+  return ((((u32_t)rand() << 16) + rand()) + avRandomSeed);
+}
+
+#endif /* MD5_SUPPORT */
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/randm.h b/ext/lwip/src/netif/ppp/randm.h
new file mode 100644
index 000000000..a0984b020
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/randm.h
@@ -0,0 +1,81 @@
+/*****************************************************************************
+* randm.h - Random number generator header file.
+*
+* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
+* Copyright (c) 1998 Global Election Systems Inc.
+*
+* The authors hereby grant permission to use, copy, modify, distribute,
+* and license this software and its documentation for any purpose, provided
+* that existing copyright notices are retained in all copies and that this
+* notice and the following disclaimer are included verbatim in any 
+* distributions. No written agreement, license, or royalty fee is required
+* for any of the authorized uses.
+*
+* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+******************************************************************************
+* REVISION HISTORY
+*
+* 03-01-01 Marc Boucher <marc@mbsi.ca>
+*   Ported to lwIP.
+* 98-05-29 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
+*   Extracted from avos.
+*****************************************************************************/
+
+#ifndef RANDM_H
+#define RANDM_H
+
+/***********************
+*** PUBLIC FUNCTIONS ***
+***********************/
+/*
+ * Initialize the random number generator.
+ */
+void avRandomInit(void);
+
+/*
+ * Churn the randomness pool on a random event.  Call this early and often
+ * on random and semi-random system events to build randomness in time for
+ * usage.  For randomly timed events, pass a null pointer and a zero length
+ * and this will use the system timer and other sources to add randomness.
+ * If new random data is available, pass a pointer to that and it will be
+ * included.
+ */
+void avChurnRand(char *randData, u32_t randLen);
+
+/*
+ * Randomize our random seed value.  To be called for truely random events
+ * such as user operations and network traffic.
+ */
+#if MD5_SUPPORT
+#define avRandomize() avChurnRand(NULL, 0)
+#else  /* MD5_SUPPORT */
+void avRandomize(void);
+#endif /* MD5_SUPPORT */
+
+/*
+ * Use the random pool to generate random data.  This degrades to pseudo
+ * random when used faster than randomness is supplied using churnRand().
+ * Thus it's important to make sure that the results of this are not
+ * published directly because one could predict the next result to at
+ * least some degree.  Also, it's important to get a good seed before
+ * the first use.
+ */
+void avGenRand(char *buf, u32_t bufLen);
+
+/*
+ * Return a new random number.
+ */
+u32_t avRandom(void);
+
+
+#endif /* RANDM_H */
diff --git a/ext/lwip/src/netif/ppp/vj.c b/ext/lwip/src/netif/ppp/vj.c
new file mode 100644
index 000000000..40fdad13d
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/vj.c
@@ -0,0 +1,652 @@
+/*
+ * Routines to compress and uncompess tcp packets (for transmission
+ * over low speed serial lines.
+ *
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
+ *   Initial distribution.
+ *
+ * Modified June 1993 by Paul Mackerras, paulus@cs.anu.edu.au,
+ * so that the entire packet being decompressed doesn't have
+ * to be in contiguous memory (just the compressed header).
+ *
+ * Modified March 1998 by Guy Lancaster, glanca@gesn.com,
+ * for a 16 bit processor.
+ */
+
+#include "lwip/opt.h"
+
+#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
+
+#include "ppp_impl.h"
+#include "pppdebug.h"
+
+#include "vj.h"
+
+#include <string.h>
+
+#if VJ_SUPPORT
+
+#if LINK_STATS
+#define INCR(counter) ++comp->stats.counter
+#else
+#define INCR(counter)
+#endif
+
+void
+vj_compress_init(struct vjcompress *comp)
+{
+  register u_char i;
+  register struct cstate *tstate = comp->tstate;
+  
+#if MAX_SLOTS == 0
+  memset((char *)comp, 0, sizeof(*comp));
+#endif
+  comp->maxSlotIndex = MAX_SLOTS - 1;
+  comp->compressSlot = 0;    /* Disable slot ID compression by default. */
+  for (i = MAX_SLOTS - 1; i > 0; --i) {
+    tstate[i].cs_id = i;
+    tstate[i].cs_next = &tstate[i - 1];
+  }
+  tstate[0].cs_next = &tstate[MAX_SLOTS - 1];
+  tstate[0].cs_id = 0;
+  comp->last_cs = &tstate[0];
+  comp->last_recv = 255;
+  comp->last_xmit = 255;
+  comp->flags = VJF_TOSS;
+}
+
+
+/* ENCODE encodes a number that is known to be non-zero.  ENCODEZ
+ * checks for zero (since zero has to be encoded in the long, 3 byte
+ * form).
+ */
+#define ENCODE(n) { \
+  if ((u_short)(n) >= 256) { \
+    *cp++ = 0; \
+    cp[1] = (u_char)(n); \
+    cp[0] = (u_char)((n) >> 8); \
+    cp += 2; \
+  } else { \
+    *cp++ = (u_char)(n); \
+  } \
+}
+#define ENCODEZ(n) { \
+  if ((u_short)(n) >= 256 || (u_short)(n) == 0) { \
+    *cp++ = 0; \
+    cp[1] = (u_char)(n); \
+    cp[0] = (u_char)((n) >> 8); \
+    cp += 2; \
+  } else { \
+    *cp++ = (u_char)(n); \
+  } \
+}
+
+#define DECODEL(f) { \
+  if (*cp == 0) {\
+    u32_t tmp = ntohl(f) + ((cp[1] << 8) | cp[2]); \
+    (f) = htonl(tmp); \
+    cp += 3; \
+  } else { \
+    u32_t tmp = ntohl(f) + (u32_t)*cp++; \
+    (f) = htonl(tmp); \
+  } \
+}
+
+#define DECODES(f) { \
+  if (*cp == 0) {\
+    u_short tmp = ntohs(f) + (((u_short)cp[1] << 8) | cp[2]); \
+    (f) = htons(tmp); \
+    cp += 3; \
+  } else { \
+    u_short tmp = ntohs(f) + (u_short)*cp++; \
+    (f) = htons(tmp); \
+  } \
+}
+
+#define DECODEU(f) { \
+  if (*cp == 0) {\
+    (f) = htons(((u_short)cp[1] << 8) | cp[2]); \
+    cp += 3; \
+  } else { \
+    (f) = htons((u_short)*cp++); \
+  } \
+}
+
+/*
+ * vj_compress_tcp - Attempt to do Van Jacobson header compression on a
+ * packet.  This assumes that nb and comp are not null and that the first
+ * buffer of the chain contains a valid IP header.
+ * Return the VJ type code indicating whether or not the packet was
+ * compressed.
+ */
+u_int
+vj_compress_tcp(struct vjcompress *comp, struct pbuf *pb)
+{
+  register struct ip_hdr *ip = (struct ip_hdr *)pb->payload;
+  register struct cstate *cs = comp->last_cs->cs_next;
+  register u_short hlen = IPH_HL(ip);
+  register struct tcp_hdr *oth;
+  register struct tcp_hdr *th;
+  register u_short deltaS, deltaA;
+  register u_long deltaL;
+  register u_int changes = 0;
+  u_char new_seq[16];
+  register u_char *cp = new_seq;
+
+  /*  
+   * Check that the packet is IP proto TCP.
+   */
+  if (IPH_PROTO(ip) != IP_PROTO_TCP) {
+    return (TYPE_IP);
+  }
+
+  /*
+   * Bail if this is an IP fragment or if the TCP packet isn't
+   * `compressible' (i.e., ACK isn't set or some other control bit is
+   * set).  
+   */
+  if ((IPH_OFFSET(ip) & PP_HTONS(0x3fff)) || pb->tot_len < 40) {
+    return (TYPE_IP);
+  }
+  th = (struct tcp_hdr *)&((long *)ip)[hlen];
+  if ((TCPH_FLAGS(th) & (TCP_SYN|TCP_FIN|TCP_RST|TCP_ACK)) != TCP_ACK) {
+    return (TYPE_IP);
+  }
+  /*
+   * Packet is compressible -- we're going to send either a
+   * COMPRESSED_TCP or UNCOMPRESSED_TCP packet.  Either way we need
+   * to locate (or create) the connection state.  Special case the
+   * most recently used connection since it's most likely to be used
+   * again & we don't have to do any reordering if it's used.
+   */
+  INCR(vjs_packets);
+  if (!ip_addr_cmp(&ip->src, &cs->cs_ip.src)
+      || !ip_addr_cmp(&ip->dest, &cs->cs_ip.dest)
+      || *(long *)th != ((long *)&cs->cs_ip)[IPH_HL(&cs->cs_ip)]) {
+    /*
+     * Wasn't the first -- search for it.
+     *
+     * States are kept in a circularly linked list with
+     * last_cs pointing to the end of the list.  The
+     * list is kept in lru order by moving a state to the
+     * head of the list whenever it is referenced.  Since
+     * the list is short and, empirically, the connection
+     * we want is almost always near the front, we locate
+     * states via linear search.  If we don't find a state
+     * for the datagram, the oldest state is (re-)used.
+     */
+    register struct cstate *lcs;
+    register struct cstate *lastcs = comp->last_cs;
+    
+    do {
+      lcs = cs; cs = cs->cs_next;
+      INCR(vjs_searches);
+      if (ip_addr_cmp(&ip->src, &cs->cs_ip.src)
+          && ip_addr_cmp(&ip->dest, &cs->cs_ip.dest)
+          && *(long *)th == ((long *)&cs->cs_ip)[IPH_HL(&cs->cs_ip)]) {
+        goto found;
+      }
+    } while (cs != lastcs);
+
+    /*
+     * Didn't find it -- re-use oldest cstate.  Send an
+     * uncompressed packet that tells the other side what
+     * connection number we're using for this conversation.
+     * Note that since the state list is circular, the oldest
+     * state points to the newest and we only need to set
+     * last_cs to update the lru linkage.
+     */
+    INCR(vjs_misses);
+    comp->last_cs = lcs;
+    hlen += TCPH_HDRLEN(th);
+    hlen <<= 2;
+    /* Check that the IP/TCP headers are contained in the first buffer. */
+    if (hlen > pb->len) {
+      return (TYPE_IP);
+    }
+    goto uncompressed;
+
+    found:
+    /*
+     * Found it -- move to the front on the connection list.
+     */
+    if (cs == lastcs) {
+      comp->last_cs = lcs;
+    } else {
+      lcs->cs_next = cs->cs_next;
+      cs->cs_next = lastcs->cs_next;
+      lastcs->cs_next = cs;
+    }
+  }
+
+  oth = (struct tcp_hdr *)&((long *)&cs->cs_ip)[hlen];
+  deltaS = hlen;
+  hlen += TCPH_HDRLEN(th);
+  hlen <<= 2;
+  /* Check that the IP/TCP headers are contained in the first buffer. */
+  if (hlen > pb->len) {
+    PPPDEBUG(LOG_INFO, ("vj_compress_tcp: header len %d spans buffers\n", hlen));
+    return (TYPE_IP);
+  }
+
+  /*
+   * Make sure that only what we expect to change changed. The first
+   * line of the `if' checks the IP protocol version, header length &
+   * type of service.  The 2nd line checks the "Don't fragment" bit.
+   * The 3rd line checks the time-to-live and protocol (the protocol
+   * check is unnecessary but costless).  The 4th line checks the TCP
+   * header length.  The 5th line checks IP options, if any.  The 6th
+   * line checks TCP options, if any.  If any of these things are
+   * different between the previous & current datagram, we send the
+   * current datagram `uncompressed'.
+   */
+  if (((u_short *)ip)[0] != ((u_short *)&cs->cs_ip)[0] 
+      || ((u_short *)ip)[3] != ((u_short *)&cs->cs_ip)[3] 
+      || ((u_short *)ip)[4] != ((u_short *)&cs->cs_ip)[4] 
+      || TCPH_HDRLEN(th) != TCPH_HDRLEN(oth) 
+      || (deltaS > 5 && BCMP(ip + 1, &cs->cs_ip + 1, (deltaS - 5) << 2)) 
+      || (TCPH_HDRLEN(th) > 5 && BCMP(th + 1, oth + 1, (TCPH_HDRLEN(th) - 5) << 2))) {
+    goto uncompressed;
+  }
+
+  /*
+   * Figure out which of the changing fields changed.  The
+   * receiver expects changes in the order: urgent, window,
+   * ack, seq (the order minimizes the number of temporaries
+   * needed in this section of code).
+   */
+  if (TCPH_FLAGS(th) & TCP_URG) {
+    deltaS = ntohs(th->urgp);
+    ENCODEZ(deltaS);
+    changes |= NEW_U;
+  } else if (th->urgp != oth->urgp) {
+    /* argh! URG not set but urp changed -- a sensible
+     * implementation should never do this but RFC793
+     * doesn't prohibit the change so we have to deal
+     * with it. */
+    goto uncompressed;
+  }
+
+  if ((deltaS = (u_short)(ntohs(th->wnd) - ntohs(oth->wnd))) != 0) {
+    ENCODE(deltaS);
+    changes |= NEW_W;
+  }
+
+  if ((deltaL = ntohl(th->ackno) - ntohl(oth->ackno)) != 0) {
+    if (deltaL > 0xffff) {
+      goto uncompressed;
+    }
+    deltaA = (u_short)deltaL;
+    ENCODE(deltaA);
+    changes |= NEW_A;
+  }
+
+  if ((deltaL = ntohl(th->seqno) - ntohl(oth->seqno)) != 0) {
+    if (deltaL > 0xffff) {
+      goto uncompressed;
+    }
+    deltaS = (u_short)deltaL;
+    ENCODE(deltaS);
+    changes |= NEW_S;
+  }
+
+  switch(changes) {
+  case 0:
+    /*
+     * Nothing changed. If this packet contains data and the
+     * last one didn't, this is probably a data packet following
+     * an ack (normal on an interactive connection) and we send
+     * it compressed.  Otherwise it's probably a retransmit,
+     * retransmitted ack or window probe.  Send it uncompressed
+     * in case the other side missed the compressed version.
+     */
+    if (IPH_LEN(ip) != IPH_LEN(&cs->cs_ip) &&
+      ntohs(IPH_LEN(&cs->cs_ip)) == hlen) {
+      break;
+    }
+
+  /* (fall through) */
+
+  case SPECIAL_I:
+  case SPECIAL_D:
+    /*
+     * actual changes match one of our special case encodings --
+     * send packet uncompressed.
+     */
+    goto uncompressed;
+
+  case NEW_S|NEW_A:
+    if (deltaS == deltaA && deltaS == ntohs(IPH_LEN(&cs->cs_ip)) - hlen) {
+      /* special case for echoed terminal traffic */
+      changes = SPECIAL_I;
+      cp = new_seq;
+    }
+    break;
+
+  case NEW_S:
+    if (deltaS == ntohs(IPH_LEN(&cs->cs_ip)) - hlen) {
+      /* special case for data xfer */
+      changes = SPECIAL_D;
+      cp = new_seq;
+    }
+    break;
+  }
+
+  deltaS = (u_short)(ntohs(IPH_ID(ip)) - ntohs(IPH_ID(&cs->cs_ip)));
+  if (deltaS != 1) {
+    ENCODEZ(deltaS);
+    changes |= NEW_I;
+  }
+  if (TCPH_FLAGS(th) & TCP_PSH) {
+    changes |= TCP_PUSH_BIT;
+  }
+  /*
+   * Grab the cksum before we overwrite it below.  Then update our
+   * state with this packet's header.
+   */
+  deltaA = ntohs(th->chksum);
+  BCOPY(ip, &cs->cs_ip, hlen);
+
+  /*
+   * We want to use the original packet as our compressed packet.
+   * (cp - new_seq) is the number of bytes we need for compressed
+   * sequence numbers.  In addition we need one byte for the change
+   * mask, one for the connection id and two for the tcp checksum.
+   * So, (cp - new_seq) + 4 bytes of header are needed.  hlen is how
+   * many bytes of the original packet to toss so subtract the two to
+   * get the new packet size.
+   */
+  deltaS = (u_short)(cp - new_seq);
+  if (!comp->compressSlot || comp->last_xmit != cs->cs_id) {
+    comp->last_xmit = cs->cs_id;
+    hlen -= deltaS + 4;
+    if(pbuf_header(pb, -hlen)){
+      /* Can we cope with this failing?  Just assert for now */
+      LWIP_ASSERT("pbuf_header failed\n", 0);
+    }
+    cp = (u_char *)pb->payload;
+    *cp++ = (u_char)(changes | NEW_C);
+    *cp++ = cs->cs_id;
+  } else {
+    hlen -= deltaS + 3;
+    if(pbuf_header(pb, -hlen)) {
+      /* Can we cope with this failing?  Just assert for now */
+      LWIP_ASSERT("pbuf_header failed\n", 0);
+    }
+    cp = (u_char *)pb->payload;
+    *cp++ = (u_char)changes;
+  }
+  *cp++ = (u_char)(deltaA >> 8);
+  *cp++ = (u_char)deltaA;
+  BCOPY(new_seq, cp, deltaS);
+  INCR(vjs_compressed);
+  return (TYPE_COMPRESSED_TCP);
+
+  /*
+   * Update connection state cs & send uncompressed packet (that is,
+   * a regular ip/tcp packet but with the 'conversation id' we hope
+   * to use on future compressed packets in the protocol field).
+   */
+uncompressed:
+  BCOPY(ip, &cs->cs_ip, hlen);
+  IPH_PROTO_SET(ip, cs->cs_id);
+  comp->last_xmit = cs->cs_id;
+  return (TYPE_UNCOMPRESSED_TCP);
+}
+
+/*
+ * Called when we may have missed a packet.
+ */
+void
+vj_uncompress_err(struct vjcompress *comp)
+{
+  comp->flags |= VJF_TOSS;
+  INCR(vjs_errorin);
+}
+
+/*
+ * "Uncompress" a packet of type TYPE_UNCOMPRESSED_TCP.
+ * Return 0 on success, -1 on failure.
+ */
+int
+vj_uncompress_uncomp(struct pbuf *nb, struct vjcompress *comp)
+{
+  register u_int hlen;
+  register struct cstate *cs;
+  register struct ip_hdr *ip;
+  
+  ip = (struct ip_hdr *)nb->payload;
+  hlen = IPH_HL(ip) << 2;
+  if (IPH_PROTO(ip) >= MAX_SLOTS
+      || hlen + sizeof(struct tcp_hdr) > nb->len
+      || (hlen += TCPH_HDRLEN(((struct tcp_hdr *)&((char *)ip)[hlen])) << 2)
+          > nb->len
+      || hlen > MAX_HDR) {
+    PPPDEBUG(LOG_INFO, ("vj_uncompress_uncomp: bad cid=%d, hlen=%d buflen=%d\n", 
+      IPH_PROTO(ip), hlen, nb->len));
+    comp->flags |= VJF_TOSS;
+    INCR(vjs_errorin);
+    return -1;
+  }
+  cs = &comp->rstate[comp->last_recv = IPH_PROTO(ip)];
+  comp->flags &=~ VJF_TOSS;
+  IPH_PROTO_SET(ip, IP_PROTO_TCP);
+  BCOPY(ip, &cs->cs_ip, hlen);
+  cs->cs_hlen = (u_short)hlen;
+  INCR(vjs_uncompressedin);
+  return 0;
+}
+
+/*
+ * Uncompress a packet of type TYPE_COMPRESSED_TCP.
+ * The packet is composed of a buffer chain and the first buffer
+ * must contain an accurate chain length.
+ * The first buffer must include the entire compressed TCP/IP header. 
+ * This procedure replaces the compressed header with the uncompressed
+ * header and returns the length of the VJ header.
+ */
+int
+vj_uncompress_tcp(struct pbuf **nb, struct vjcompress *comp)
+{
+  u_char *cp;
+  struct tcp_hdr *th;
+  struct cstate *cs;
+  u_short *bp;
+  struct pbuf *n0 = *nb;
+  u32_t tmp;
+  u_int vjlen, hlen, changes;
+
+  INCR(vjs_compressedin);
+  cp = (u_char *)n0->payload;
+  changes = *cp++;
+  if (changes & NEW_C) {
+    /* 
+     * Make sure the state index is in range, then grab the state.
+     * If we have a good state index, clear the 'discard' flag. 
+     */
+    if (*cp >= MAX_SLOTS) {
+      PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: bad cid=%d\n", *cp));
+      goto bad;
+    }
+
+    comp->flags &=~ VJF_TOSS;
+    comp->last_recv = *cp++;
+  } else {
+    /* 
+     * this packet has an implicit state index.  If we've
+     * had a line error since the last time we got an
+     * explicit state index, we have to toss the packet. 
+     */
+    if (comp->flags & VJF_TOSS) {
+      PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: tossing\n"));
+      INCR(vjs_tossed);
+      return (-1);
+    }
+  }
+  cs = &comp->rstate[comp->last_recv];
+  hlen = IPH_HL(&cs->cs_ip) << 2;
+  th = (struct tcp_hdr *)&((u_char *)&cs->cs_ip)[hlen];
+  th->chksum = htons((*cp << 8) | cp[1]);
+  cp += 2;
+  if (changes & TCP_PUSH_BIT) {
+    TCPH_SET_FLAG(th, TCP_PSH);
+  } else {
+    TCPH_UNSET_FLAG(th, TCP_PSH);
+  }
+
+  switch (changes & SPECIALS_MASK) {
+  case SPECIAL_I:
+    {
+      register u32_t i = ntohs(IPH_LEN(&cs->cs_ip)) - cs->cs_hlen;
+      /* some compilers can't nest inline assembler.. */
+      tmp = ntohl(th->ackno) + i;
+      th->ackno = htonl(tmp);
+      tmp = ntohl(th->seqno) + i;
+      th->seqno = htonl(tmp);
+    }
+    break;
+
+  case SPECIAL_D:
+    /* some compilers can't nest inline assembler.. */
+    tmp = ntohl(th->seqno) + ntohs(IPH_LEN(&cs->cs_ip)) - cs->cs_hlen;
+    th->seqno = htonl(tmp);
+    break;
+
+  default:
+    if (changes & NEW_U) {
+      TCPH_SET_FLAG(th, TCP_URG);
+      DECODEU(th->urgp);
+    } else {
+      TCPH_UNSET_FLAG(th, TCP_URG);
+    }
+    if (changes & NEW_W) {
+      DECODES(th->wnd);
+    }
+    if (changes & NEW_A) {
+      DECODEL(th->ackno);
+    }
+    if (changes & NEW_S) {
+      DECODEL(th->seqno);
+    }
+    break;
+  }
+  if (changes & NEW_I) {
+    DECODES(cs->cs_ip._id);
+  } else {
+    IPH_ID_SET(&cs->cs_ip, ntohs(IPH_ID(&cs->cs_ip)) + 1);
+    IPH_ID_SET(&cs->cs_ip, htons(IPH_ID(&cs->cs_ip)));
+  }
+
+  /*
+   * At this point, cp points to the first byte of data in the
+   * packet.  Fill in the IP total length and update the IP
+   * header checksum.
+   */
+  vjlen = (u_short)(cp - (u_char*)n0->payload);
+  if (n0->len < vjlen) {
+    /* 
+     * We must have dropped some characters (crc should detect
+     * this but the old slip framing won't) 
+     */
+    PPPDEBUG(LOG_INFO, ("vj_uncompress_tcp: head buffer %d too short %d\n", 
+          n0->len, vjlen));
+    goto bad;
+  }
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+  tmp = n0->tot_len - vjlen + cs->cs_hlen;
+  IPH_LEN_SET(&cs->cs_ip, htons((u_short)tmp));
+#else
+  IPH_LEN_SET(&cs->cs_ip, htons(n0->tot_len - vjlen + cs->cs_hlen));
+#endif
+
+  /* recompute the ip header checksum */
+  bp = (u_short *) &cs->cs_ip;
+  IPH_CHKSUM_SET(&cs->cs_ip, 0);
+  for (tmp = 0; hlen > 0; hlen -= 2) {
+    tmp += *bp++;
+  }
+  tmp = (tmp & 0xffff) + (tmp >> 16);
+  tmp = (tmp & 0xffff) + (tmp >> 16);
+  IPH_CHKSUM_SET(&cs->cs_ip,  (u_short)(~tmp));
+  
+  /* Remove the compressed header and prepend the uncompressed header. */
+  if(pbuf_header(n0, -((s16_t)(vjlen)))) {
+    /* Can we cope with this failing?  Just assert for now */
+    LWIP_ASSERT("pbuf_header failed\n", 0);
+    goto bad;
+  }
+
+  if(LWIP_MEM_ALIGN(n0->payload) != n0->payload) {
+    struct pbuf *np, *q;
+    u8_t *bufptr;
+
+    np = pbuf_alloc(PBUF_RAW, n0->len + cs->cs_hlen, PBUF_POOL);
+    if(!np) {
+      PPPDEBUG(LOG_WARNING, ("vj_uncompress_tcp: realign failed\n"));
+      goto bad;
+    }
+
+    if(pbuf_header(np, -cs->cs_hlen)) {
+      /* Can we cope with this failing?  Just assert for now */
+      LWIP_ASSERT("pbuf_header failed\n", 0);
+      goto bad;
+    }
+
+    bufptr = n0->payload;
+    for(q = np; q != NULL; q = q->next) {
+      MEMCPY(q->payload, bufptr, q->len);
+      bufptr += q->len;
+    }
+
+    if(n0->next) {
+      pbuf_chain(np, n0->next);
+      pbuf_dechain(n0);
+    }
+    pbuf_free(n0);
+    n0 = np;
+  }
+
+  if(pbuf_header(n0, cs->cs_hlen)) {
+    struct pbuf *np;
+
+    LWIP_ASSERT("vj_uncompress_tcp: cs->cs_hlen <= PBUF_POOL_BUFSIZE", cs->cs_hlen <= PBUF_POOL_BUFSIZE);
+    np = pbuf_alloc(PBUF_RAW, cs->cs_hlen, PBUF_POOL);
+    if(!np) {
+      PPPDEBUG(LOG_WARNING, ("vj_uncompress_tcp: prepend failed\n"));
+      goto bad;
+    }
+    pbuf_cat(np, n0);
+    n0 = np;
+  }
+  LWIP_ASSERT("n0->len >= cs->cs_hlen", n0->len >= cs->cs_hlen);
+  MEMCPY(n0->payload, &cs->cs_ip, cs->cs_hlen);
+
+  *nb = n0;
+
+  return vjlen;
+
+bad:
+  comp->flags |= VJF_TOSS;
+  INCR(vjs_errorin);
+  return (-1);
+}
+
+#endif /* VJ_SUPPORT */
+
+#endif /* PPP_SUPPORT */
diff --git a/ext/lwip/src/netif/ppp/vj.h b/ext/lwip/src/netif/ppp/vj.h
new file mode 100644
index 000000000..fad121364
--- /dev/null
+++ b/ext/lwip/src/netif/ppp/vj.h
@@ -0,0 +1,156 @@
+/*
+ * Definitions for tcp compression routines.
+ *
+ * $Id: vj.h,v 1.7 2010/02/22 17:52:09 goldsimon Exp $
+ *
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
+ * - Initial distribution.
+ */
+
+#ifndef VJ_H
+#define VJ_H
+
+#include "lwip/ip.h"
+#include "lwip/tcp_impl.h"
+
+#define MAX_SLOTS 16 /* must be > 2 and < 256 */
+#define MAX_HDR   128
+
+/*
+ * Compressed packet format:
+ *
+ * The first octet contains the packet type (top 3 bits), TCP
+ * 'push' bit, and flags that indicate which of the 4 TCP sequence
+ * numbers have changed (bottom 5 bits).  The next octet is a
+ * conversation number that associates a saved IP/TCP header with
+ * the compressed packet.  The next two octets are the TCP checksum
+ * from the original datagram.  The next 0 to 15 octets are
+ * sequence number changes, one change per bit set in the header
+ * (there may be no changes and there are two special cases where
+ * the receiver implicitly knows what changed -- see below).
+ * 
+ * There are 5 numbers which can change (they are always inserted
+ * in the following order): TCP urgent pointer, window,
+ * acknowlegement, sequence number and IP ID.  (The urgent pointer
+ * is different from the others in that its value is sent, not the
+ * change in value.)  Since typical use of SLIP links is biased
+ * toward small packets (see comments on MTU/MSS below), changes
+ * use a variable length coding with one octet for numbers in the
+ * range 1 - 255 and 3 octets (0, MSB, LSB) for numbers in the
+ * range 256 - 65535 or 0.  (If the change in sequence number or
+ * ack is more than 65535, an uncompressed packet is sent.)
+ */
+
+/*
+ * Packet types (must not conflict with IP protocol version)
+ *
+ * The top nibble of the first octet is the packet type.  There are
+ * three possible types: IP (not proto TCP or tcp with one of the
+ * control flags set); uncompressed TCP (a normal IP/TCP packet but
+ * with the 8-bit protocol field replaced by an 8-bit connection id --
+ * this type of packet syncs the sender & receiver); and compressed
+ * TCP (described above).
+ *
+ * LSB of 4-bit field is TCP "PUSH" bit (a worthless anachronism) and
+ * is logically part of the 4-bit "changes" field that follows.  Top
+ * three bits are actual packet type.  For backward compatibility
+ * and in the interest of conserving bits, numbers are chosen so the
+ * IP protocol version number (4) which normally appears in this nibble
+ * means "IP packet".
+ */
+
+/* packet types */
+#define TYPE_IP               0x40
+#define TYPE_UNCOMPRESSED_TCP 0x70
+#define TYPE_COMPRESSED_TCP   0x80
+#define TYPE_ERROR            0x00
+
+/* Bits in first octet of compressed packet */
+#define NEW_C 0x40 /* flag bits for what changed in a packet */
+#define NEW_I 0x20
+#define NEW_S 0x08
+#define NEW_A 0x04
+#define NEW_W 0x02
+#define NEW_U 0x01
+
+/* reserved, special-case values of above */
+#define SPECIAL_I (NEW_S|NEW_W|NEW_U) /* echoed interactive traffic */
+#define SPECIAL_D (NEW_S|NEW_A|NEW_W|NEW_U) /* unidirectional data */
+#define SPECIALS_MASK (NEW_S|NEW_A|NEW_W|NEW_U)
+
+#define TCP_PUSH_BIT 0x10
+
+
+/*
+ * "state" data for each active tcp conversation on the wire.  This is
+ * basically a copy of the entire IP/TCP header from the last packet
+ * we saw from the conversation together with a small identifier
+ * the transmit & receive ends of the line use to locate saved header.
+ */
+struct cstate {
+  struct cstate *cs_next; /* next most recently used state (xmit only) */
+  u_short cs_hlen;        /* size of hdr (receive only) */
+  u_char cs_id;           /* connection # associated with this state */
+  u_char cs_filler;
+  union {
+    char csu_hdr[MAX_HDR];
+    struct ip_hdr csu_ip;     /* ip/tcp hdr from most recent packet */
+  } vjcs_u;
+};
+#define cs_ip vjcs_u.csu_ip
+#define cs_hdr vjcs_u.csu_hdr
+
+
+struct vjstat {
+  unsigned long vjs_packets;        /* outbound packets */
+  unsigned long vjs_compressed;     /* outbound compressed packets */
+  unsigned long vjs_searches;       /* searches for connection state */
+  unsigned long vjs_misses;         /* times couldn't find conn. state */
+  unsigned long vjs_uncompressedin; /* inbound uncompressed packets */
+  unsigned long vjs_compressedin;   /* inbound compressed packets */
+  unsigned long vjs_errorin;        /* inbound unknown type packets */
+  unsigned long vjs_tossed;         /* inbound packets tossed because of error */
+};
+
+/*
+ * all the state data for one serial line (we need one of these per line).
+ */
+struct vjcompress {
+  struct cstate *last_cs;          /* most recently used tstate */
+  u_char last_recv;                /* last rcvd conn. id */
+  u_char last_xmit;                /* last sent conn. id */
+  u_short flags;
+  u_char maxSlotIndex;
+  u_char compressSlot;             /* Flag indicating OK to compress slot ID. */
+#if LINK_STATS
+  struct vjstat stats;
+#endif
+  struct cstate tstate[MAX_SLOTS]; /* xmit connection states */
+  struct cstate rstate[MAX_SLOTS]; /* receive connection states */
+};
+
+/* flag values */
+#define VJF_TOSS 1U /* tossing rcvd frames because of input err */
+
+extern void  vj_compress_init    (struct vjcompress *comp);
+extern u_int vj_compress_tcp     (struct vjcompress *comp, struct pbuf *pb);
+extern void  vj_uncompress_err   (struct vjcompress *comp);
+extern int   vj_uncompress_uncomp(struct pbuf *nb, struct vjcompress *comp);
+extern int   vj_uncompress_tcp   (struct pbuf **nb, struct vjcompress *comp);
+
+#endif /* VJ_H */
diff --git a/ext/lwip/src/netif/slipif.c b/ext/lwip/src/netif/slipif.c
new file mode 100644
index 000000000..277763090
--- /dev/null
+++ b/ext/lwip/src/netif/slipif.c
@@ -0,0 +1,510 @@
+/**
+ * @file
+ * SLIP Interface
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 3. Neither the name of the Institute nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ *
+ * This file is built upon the file: src/arch/rtxc/netif/sioslip.c
+ *
+ * Author: Magnus Ivarsson <magnus.ivarsson(at)volvo.com> 
+ *         Simon Goldschmidt
+ *
+ * Usage: This netif can be used in three ways:
+ *        1) For NO_SYS==0, an RX thread can be used which blocks on sio_read()
+ *           until data is received.
+ *        2) In your main loop, call slipif_poll() to check for new RX bytes,
+ *           completed packets are fed into netif->input().
+ *        3) Call slipif_received_byte[s]() from your serial RX ISR and
+ *           slipif_process_rxqueue() from your main loop. ISR level decodes
+ *           packets and puts completed packets on a queue which is fed into
+ *           the stack from the main loop (needs SYS_LIGHTWEIGHT_PROT for
+ *           pbuf_alloc to work on ISR level!).
+ *     
+ */
+
+/* 
+ * This is an arch independent SLIP netif. The specific serial hooks must be
+ * provided by another file. They are sio_open, sio_read/sio_tryread and sio_send
+ */
+
+#include "netif/slipif.h"
+#include "lwip/opt.h"
+
+#if LWIP_HAVE_SLIPIF
+
+#include "lwip/def.h"
+#include "lwip/pbuf.h"
+#include "lwip/stats.h"
+#include "lwip/snmp.h"
+#include "lwip/sio.h"
+#include "lwip/sys.h"
+
+#define SLIP_END     0xC0 /* 0300: start and end of every packet */
+#define SLIP_ESC     0xDB /* 0333: escape start (one byte escaped data follows) */
+#define SLIP_ESC_END 0xDC /* 0334: following escape: original byte is 0xC0 (END) */
+#define SLIP_ESC_ESC 0xDD /* 0335: following escape: original byte is 0xDB (ESC) */
+
+/** Maximum packet size that is received by this netif */
+#ifndef SLIP_MAX_SIZE
+#define SLIP_MAX_SIZE 1500
+#endif
+
+/** Define this to the interface speed for SNMP
+ * (sio_fd is the sio_fd_t returned by sio_open).
+ * The default value of zero means 'unknown'.
+ */
+#ifndef SLIP_SIO_SPEED
+#define SLIP_SIO_SPEED(sio_fd) 0
+#endif
+
+enum slipif_recv_state {
+    SLIP_RECV_NORMAL,
+    SLIP_RECV_ESCAPE,
+};
+
+struct slipif_priv {
+  sio_fd_t sd;
+  /* q is the whole pbuf chain for a packet, p is the current pbuf in the chain */
+  struct pbuf *p, *q;
+  u8_t state;
+  u16_t i, recved;
+#if SLIP_RX_FROM_ISR
+  struct pbuf *rxpackets;
+#endif
+};
+
+/**
+ * Send a pbuf doing the necessary SLIP encapsulation
+ *
+ * Uses the serial layer's sio_send()
+ *
+ * @param netif the lwip network interface structure for this slipif
+ * @param p the pbuf chaing packet to send
+ * @param ipaddr the ip address to send the packet to (not used for slipif)
+ * @return always returns ERR_OK since the serial layer does not provide return values
+ */
+err_t
+slipif_output(struct netif *netif, struct pbuf *p, ip_addr_t *ipaddr)
+{
+  struct slipif_priv *priv;
+  struct pbuf *q;
+  u16_t i;
+  u8_t c;
+
+  LWIP_ASSERT("netif != NULL", (netif != NULL));
+  LWIP_ASSERT("netif->state != NULL", (netif->state != NULL));
+  LWIP_ASSERT("p != NULL", (p != NULL));
+
+  LWIP_UNUSED_ARG(ipaddr);
+
+  LWIP_DEBUGF(SLIP_DEBUG, ("slipif_output(%"U16_F"): sending %"U16_F" bytes\n", (u16_t)netif->num, p->tot_len));
+  priv = netif->state;
+
+  /* Send pbuf out on the serial I/O device. */
+  /* Start with packet delimiter. */
+  sio_send(SLIP_END, priv->sd);
+
+  for (q = p; q != NULL; q = q->next) {
+    for (i = 0; i < q->len; i++) {
+      c = ((u8_t *)q->payload)[i];
+      switch (c) {
+      case SLIP_END:
+        /* need to escape this byte (0xC0 -> 0xDB, 0xDC) */
+        sio_send(SLIP_ESC, priv->sd);
+        sio_send(SLIP_ESC_END, priv->sd);
+        break;
+      case SLIP_ESC:
+        /* need to escape this byte (0xDB -> 0xDB, 0xDD) */
+        sio_send(SLIP_ESC, priv->sd);
+        sio_send(SLIP_ESC_ESC, priv->sd);
+        break;
+      default:
+        /* normal byte - no need for escaping */
+        sio_send(c, priv->sd);
+        break;
+      }
+    }
+  }
+  /* End with packet delimiter. */
+  sio_send(SLIP_END, priv->sd);
+  return ERR_OK;
+}
+
+/**
+ * Handle the incoming SLIP stream character by character
+ *
+ * @param netif the lwip network interface structure for this slipif
+ * @param c received character (multiple calls to this function will
+ *        return a complete packet, NULL is returned before - used for polling)
+ * @return The IP packet when SLIP_END is received
+ */
+static struct pbuf*
+slipif_rxbyte(struct netif *netif, u8_t c)
+{
+  struct slipif_priv *priv;
+  struct pbuf *t;
+
+  LWIP_ASSERT("netif != NULL", (netif != NULL));
+  LWIP_ASSERT("netif->state != NULL", (netif->state != NULL));
+
+  priv = netif->state;
+
+  switch (priv->state) {
+  case SLIP_RECV_NORMAL:
+    switch (c) {
+    case SLIP_END:
+      if (priv->recved > 0) {
+        /* Received whole packet. */
+        /* Trim the pbuf to the size of the received packet. */
+        pbuf_realloc(priv->q, priv->recved);
+
+        LINK_STATS_INC(link.recv);
+
+        LWIP_DEBUGF(SLIP_DEBUG, ("slipif: Got packet (%"U16_F" bytes)\n", priv->recved));
+        t = priv->q;
+        priv->p = priv->q = NULL;
+        priv->i = priv->recved = 0;
+        return t;
+      }
+      return NULL;
+    case SLIP_ESC:
+      priv->state = SLIP_RECV_ESCAPE;
+      return NULL;
+    } /* end switch (c) */
+    break;
+  case SLIP_RECV_ESCAPE:
+    /* un-escape END or ESC bytes, leave other bytes
+       (although that would be a protocol error) */
+    switch (c) {
+    case SLIP_ESC_END:
+      c = SLIP_END;
+      break;
+    case SLIP_ESC_ESC:
+      c = SLIP_ESC;
+      break;
+    }
+    priv->state = SLIP_RECV_NORMAL;
+    break;
+  } /* end switch (priv->state) */
+
+  /* byte received, packet not yet completely received */
+  if (priv->p == NULL) {
+    /* allocate a new pbuf */
+    LWIP_DEBUGF(SLIP_DEBUG, ("slipif_input: alloc\n"));
+    priv->p = pbuf_alloc(PBUF_LINK, (PBUF_POOL_BUFSIZE - PBUF_LINK_HLEN), PBUF_POOL);
+
+    if (priv->p == NULL) {
+      LINK_STATS_INC(link.drop);
+      LWIP_DEBUGF(SLIP_DEBUG, ("slipif_input: no new pbuf! (DROP)\n"));
+      /* don't process any further since we got no pbuf to receive to */
+      return NULL;
+    }
+
+    if (priv->q != NULL) {
+      /* 'chain' the pbuf to the existing chain */
+      pbuf_cat(priv->q, priv->p);
+    } else {
+      /* p is the first pbuf in the chain */
+      priv->q = priv->p;
+    }
+  }
+
+  /* this automatically drops bytes if > SLIP_MAX_SIZE */
+  if ((priv->p != NULL) && (priv->recved <= SLIP_MAX_SIZE)) {
+    ((u8_t *)priv->p->payload)[priv->i] = c;
+    priv->recved++;
+    priv->i++;
+    if (priv->i >= priv->p->len) {
+      /* on to the next pbuf */
+      priv->i = 0;
+      if (priv->p->next != NULL && priv->p->next->len > 0) {
+        /* p is a chain, on to the next in the chain */
+          priv->p = priv->p->next;
+      } else {
+        /* p is a single pbuf, set it to NULL so next time a new
+         * pbuf is allocated */
+          priv->p = NULL;
+      }
+    }
+  }
+  return NULL;
+}
+
+/** Like slipif_rxbyte, but passes completed packets to netif->input
+ *
+ * @param netif The lwip network interface structure for this slipif
+ * @param data received character
+ */
+static void
+slipif_rxbyte_input(struct netif *netif, u8_t c)
+{
+  struct pbuf *p;
+  p = slipif_rxbyte(netif, c);
+  if (p != NULL) {
+    if (netif->input(p, netif) != ERR_OK) {
+      pbuf_free(p);
+    }
+  }
+}
+
+#if SLIP_USE_RX_THREAD
+/**
+ * The SLIP input thread.
+ *
+ * Feed the IP layer with incoming packets
+ *
+ * @param nf the lwip network interface structure for this slipif
+ */
+static void
+slipif_loop_thread(void *nf)
+{
+  u8_t c;
+  struct netif *netif = (struct netif *)nf;
+  struct slipif_priv *priv = (struct slipif_priv *)netif->state;
+
+  while (1) {
+    if (sio_read(priv->sd, &c, 1) > 0) {
+      slipif_rxbyte_input(netif, c);
+    }
+  }
+}
+#endif /* SLIP_USE_RX_THREAD */
+
+/**
+ * SLIP netif initialization
+ *
+ * Call the arch specific sio_open and remember
+ * the opened device in the state field of the netif.
+ *
+ * @param netif the lwip network interface structure for this slipif
+ * @return ERR_OK if serial line could be opened,
+ *         ERR_MEM if no memory could be allocated,
+ *         ERR_IF is serial line couldn't be opened
+ *
+ * @note netif->num must contain the number of the serial port to open
+ *       (0 by default). If netif->state is != NULL, it is interpreted as an
+ *       u8_t pointer pointing to the serial port number instead of netif->num.
+ *
+ */
+err_t
+slipif_init(struct netif *netif)
+{
+  struct slipif_priv *priv;
+  u8_t sio_num;
+
+  LWIP_DEBUGF(SLIP_DEBUG, ("slipif_init: netif->num=%"U16_F"\n", (u16_t)netif->num));
+
+  /* Allocate private data */
+  priv = (struct slipif_priv *)mem_malloc(sizeof(struct slipif_priv));
+  if (!priv) {
+    return ERR_MEM;
+  }
+
+  netif->name[0] = 's';
+  netif->name[1] = 'l';
+  netif->output = slipif_output;
+  netif->mtu = SLIP_MAX_SIZE;
+  netif->flags |= NETIF_FLAG_POINTTOPOINT;
+
+  /* netif->state or netif->num contain the port number */
+  if (netif->state != NULL) {
+    sio_num = *(u8_t*)netif->state;
+  } else {
+    sio_num = netif->num;
+  }
+  /* Try to open the serial port. */
+  priv->sd = sio_open(sio_num);
+  if (!priv->sd) {
+    /* Opening the serial port failed. */
+    mem_free(priv);
+    return ERR_IF;
+  }
+
+  /* Initialize private data */
+  priv->p = NULL;
+  priv->q = NULL;
+  priv->state = SLIP_RECV_NORMAL;
+  priv->i = 0;
+  priv->recved = 0;
+#if SLIP_RX_FROM_ISR
+  priv->rxpackets = NULL;
+#endif
+
+  netif->state = priv;
+
+  /* initialize the snmp variables and counters inside the struct netif */
+  NETIF_INIT_SNMP(netif, snmp_ifType_slip, SLIP_SIO_SPEED(priv->sd));
+
+#if SLIP_USE_RX_THREAD
+  /* Create a thread to poll the serial line. */
+  sys_thread_new(SLIPIF_THREAD_NAME, slipif_loop_thread, netif,
+    SLIPIF_THREAD_STACKSIZE, SLIPIF_THREAD_PRIO);
+#endif /* SLIP_USE_RX_THREAD */
+  return ERR_OK;
+}
+
+/**
+ * Polls the serial device and feeds the IP layer with incoming packets.
+ *
+ * @param netif The lwip network interface structure for this slipif
+ */
+void
+slipif_poll(struct netif *netif)
+{
+  u8_t c;
+  struct slipif_priv *priv;
+
+  LWIP_ASSERT("netif != NULL", (netif != NULL));
+  LWIP_ASSERT("netif->state != NULL", (netif->state != NULL));
+
+  priv = (struct slipif_priv *)netif->state;
+
+  while (sio_tryread(priv->sd, &c, 1) > 0) {
+    slipif_rxbyte_input(netif, c);
+  }
+}
+
+#if SLIP_RX_FROM_ISR
+/**
+ * Feeds the IP layer with incoming packets that were receive
+ *
+ * @param netif The lwip network interface structure for this slipif
+ */
+void
+slipif_process_rxqueue(struct netif *netif)
+{
+  struct slipif_priv *priv;
+  SYS_ARCH_DECL_PROTECT(old_level);
+
+  LWIP_ASSERT("netif != NULL", (netif != NULL));
+  LWIP_ASSERT("netif->state != NULL", (netif->state != NULL));
+
+  priv = (struct slipif_priv *)netif->state;
+
+  SYS_ARCH_PROTECT(old_level);
+  while (priv->rxpackets != NULL) {
+    struct pbuf *p = priv->rxpackets;
+#if SLIP_RX_QUEUE
+    /* dequeue packet */
+    struct pbuf *q = p;
+    while ((q->len != q->tot_len) && (q->next != NULL)) {
+      q = q->next;
+    }
+    priv->rxpackets = q->next;
+    q->next = NULL;
+#else /* SLIP_RX_QUEUE */
+    priv->rxpackets = NULL;
+#endif /* SLIP_RX_QUEUE */
+    SYS_ARCH_UNPROTECT(old_level);
+    if (netif->input(p, netif) != ERR_OK) {
+      pbuf_free(p);
+    }
+    SYS_ARCH_PROTECT(old_level);
+  }
+}
+
+/** Like slipif_rxbyte, but queues completed packets.
+ *
+ * @param netif The lwip network interface structure for this slipif
+ * @param data Received serial byte
+ */
+static void
+slipif_rxbyte_enqueue(struct netif *netif, u8_t data)
+{
+  struct pbuf *p;
+  struct slipif_priv *priv = (struct slipif_priv *)netif->state;
+  SYS_ARCH_DECL_PROTECT(old_level);
+
+  p = slipif_rxbyte(netif, data);
+  if (p != NULL) {
+    SYS_ARCH_PROTECT(old_level);
+    if (priv->rxpackets != NULL) {
+#if SLIP_RX_QUEUE
+      /* queue multiple pbufs */
+      struct pbuf *q = p;
+      while(q->next != NULL) {
+        q = q->next;
+      }
+      q->next = p;
+    } else {
+#else /* SLIP_RX_QUEUE */
+      pbuf_free(priv->rxpackets);
+    }
+    {
+#endif /* SLIP_RX_QUEUE */
+      priv->rxpackets = p;
+    }
+    SYS_ARCH_UNPROTECT(old_level);
+  }
+}
+
+/**
+ * Process a received byte, completed packets are put on a queue that is
+ * fed into IP through slipif_process_rxqueue().
+ *
+ * This function can be called from ISR if SYS_LIGHTWEIGHT_PROT is enabled.
+ *
+ * @param netif The lwip network interface structure for this slipif
+ * @param data received character
+ */
+void
+slipif_received_byte(struct netif *netif, u8_t data)
+{
+  LWIP_ASSERT("netif != NULL", (netif != NULL));
+  LWIP_ASSERT("netif->state != NULL", (netif->state != NULL));
+  slipif_rxbyte_enqueue(netif, data);
+}
+
+/**
+ * Process multiple received byte, completed packets are put on a queue that is
+ * fed into IP through slipif_process_rxqueue().
+ *
+ * This function can be called from ISR if SYS_LIGHTWEIGHT_PROT is enabled.
+ *
+ * @param netif The lwip network interface structure for this slipif
+ * @param data received character
+ * @param len Number of received characters
+ */
+void
+slipif_received_bytes(struct netif *netif, u8_t *data, u8_t len)
+{
+  u8_t i;
+  u8_t *rxdata = data;
+  LWIP_ASSERT("netif != NULL", (netif != NULL));
+  LWIP_ASSERT("netif->state != NULL", (netif->state != NULL));
+
+  for (i = 0; i < len; i++, rxdata++) {
+    slipif_rxbyte_enqueue(netif, *rxdata);
+  }
+}
+#endif /* SLIP_RX_FROM_ISR */
+
+#endif /* LWIP_HAVE_SLIPIF */
diff --git a/ext/lwipopts.h b/ext/lwipopts.h
new file mode 100644
index 000000000..710534612
--- /dev/null
+++ b/ext/lwipopts.h
@@ -0,0 +1,475 @@
+/**
+ * @file
+ *
+ * lwIP Options Configuration
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#ifndef __LWIPOPTS_H__
+#define __LWIPOPTS_H__
+
+/*
+ * Include user defined options first. Anything not defined in these files
+ * will be set to standard values. Override anything you dont like!
+ */
+#include "lwip/debug.h"
+
+#define LWIP_CHKSUM_ALGORITHM 2
+
+#undef TCP_MSS
+#define TCP_MSS 1460
+
+/*
+The TCP window size can be adjusted by changing the define TCP_WND. However,
+do keep in mind that this should be at least twice the size of TCP_MSS (thus
+on ethernet, where TCP_MSS is 1460, it should be set to at least 2920). If
+memory allows it, set this as high as possible (16-bit, so 0xFFFF is the highest
+value), but keep in mind that for every active connection, the full window may
+have to be buffered until it is acknowledged by the remote side (although this
+buffer size can still be controlled by TCP_SND_BUF and TCP_SND_QUEUELEN). The
+reason for "twice" are both the nagle algorithm and delayed ACK from the
+remote peer.
+*/
+
+#define TCP_WND TCP_MSS*10 // max = 0xffff
+
+#define LWIP_NOASSERT 1
+#define TCP_LISTEN_BACKLOG   0
+
+/*------------------------------------------------------------------------------
+---------------------------------- Timers --------------------------------------
+------------------------------------------------------------------------------*/
+/*
+Be careful about setting this too small.  lwIP just counts the number
+of times its timer is called and uses this to control time sensitive
+operations (such as TCP retransmissions), rather than actually
+measuring time using something more accurate.  If you call the timer
+functions very frequently you may see things (such as retransmissions)
+happening sooner than they should.
+*/
+/* these are originally defined in tcp_impl.h */
+#ifndef TCP_TMR_INTERVAL
+/* The TCP timer interval in milliseconds. */
+#define TCP_TMR_INTERVAL       250
+#endif /* TCP_TMR_INTERVAL */
+
+#ifndef TCP_FAST_INTERVAL
+/* the fine grained timeout in milliseconds */
+#define TCP_FAST_INTERVAL      TCP_TMR_INTERVAL
+#endif /* TCP_FAST_INTERVAL */
+
+#ifndef TCP_SLOW_INTERVALs
+/* the coarse grained timeout in milliseconds */
+#define TCP_SLOW_INTERVAL      (2*TCP_TMR_INTERVAL)
+#endif /* TCP_SLOW_INTERVAL */
+
+
+/*------------------------------------------------------------------------------
+--------------------------- Platform specific locking -------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * SYS_LIGHTWEIGHT_PROT==1: if you want inter-task protection for certain
+ * critical regions during buffer allocation, deallocation and memory
+ * allocation and deallocation.
+ */
+#define SYS_LIGHTWEIGHT_PROT            0
+
+/**
+ * NO_SYS==1: Provides VERY minimal functionality. Otherwise,
+ * use lwIP facilities.
+ */
+
+/* set to 1 so we have no thread behaviour */
+#define NO_SYS                          1
+
+/* set to 1 so we can use our own timers */
+#define NO_SYS_NO_TIMERS                1
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- Memory options --------------------------------
+------------------------------------------------------------------------------*/
+
+
+
+/* Misc */
+#define MEM_LIBC_MALLOC 1
+#define MEMP_MEM_MALLOC 1
+
+
+
+/**
+ * MEM_ALIGNMENT: should be set to the alignment of the CPU
+ *    4 byte alignment -> #define MEM_ALIGNMENT 4
+ *    2 byte alignment -> #define MEM_ALIGNMENT 2
+ */
+#define MEM_ALIGNMENT                   1
+
+/**
+ * MEM_SIZE: the size of the heap memory. If the application will send
+ * a lot of data that needs to be copied, this should be set high.
+ */
+#define MEM_SIZE                        1024 * 1024 * 64
+#define TCP_SND_BUF                     1024 * 63
+//#define TCP_OVERSIZE                    TCP_MSS
+
+#define TCP_SND_QUEUELEN                1024
+
+/*------------------------------------------------------------------------------
+-------------------------------- Pbuf Options ----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * PBUF_LINK_HLEN: the number of bytes that should be allocated for a
+ * link level header. The default is 14, the standard value for
+ * Ethernet.
+ */
+#define PBUF_LINK_HLEN                  16
+
+/**
+ * PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. The default is
+ * designed to accomodate single full size TCP frame in one pbuf, including
+ * TCP_MSS, IP header, and link header.
+*
+ */
+#define PBUF_POOL_BUFSIZE               LWIP_MEM_ALIGN_SIZE(TCP_MSS+40+PBUF_LINK_HLEN)
+
+
+/*------------------------------------------------------------------------------
+-------------------------- Internal Memory Pool Sizes --------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * MEMP_NUM_PBUF: the number of memp struct pbufs (used for PBUF_ROM and PBUF_REF).
+ * If the application sends a lot of data out of ROM (or other static memory),
+ * this should be set high.
+ */
+#define MEMP_NUM_PBUF                   256
+
+/**
+ * MEMP_NUM_RAW_PCB: Number of raw connection PCBs
+ * (requires the LWIP_RAW option)
+ */
+#define MEMP_NUM_RAW_PCB                128
+
+/**
+ * MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
+ * per active UDP "connection".
+ * (requires the LWIP_UDP option)
+ */
+#define MEMP_NUM_UDP_PCB                4
+
+/**
+ * MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections.
+ * (requires the LWIP_TCP option)
+ */
+#define MEMP_NUM_TCP_PCB                128
+
+/**
+ * MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections.
+ * (requires the LWIP_TCP option)
+ */
+#define MEMP_NUM_TCP_PCB_LISTEN         128
+
+/**
+ * MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments.
+ * (requires the LWIP_TCP option)
+ */
+#define MEMP_NUM_TCP_SEG                1024
+
+/**
+ * MEMP_NUM_REASSDATA: the number of simultaneously IP packets queued for
+ * reassembly (whole packets, not fragments!)
+ */
+#define MEMP_NUM_REASSDATA              1
+
+/**
+ * MEMP_NUM_ARP_QUEUE: the number of simulateously queued outgoing
+ * packets (pbufs) that are waiting for an ARP request (to resolve
+ * their destination address) to finish.
+ * (requires the ARP_QUEUEING option)
+ */
+#define MEMP_NUM_ARP_QUEUE              2
+
+/**
+ * MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts.
+ * (requires NO_SYS==0)
+ */
+#define MEMP_NUM_SYS_TIMEOUT            3
+
+/**
+ * MEMP_NUM_NETBUF: the number of struct netbufs.
+ * (only needed if you use the sequential API, like api_lib.c)
+ */
+#define MEMP_NUM_NETBUF                 2
+
+/**
+ * MEMP_NUM_NETCONN: the number of struct netconns.
+ * (only needed if you use the sequential API, like api_lib.c)
+ */
+#define MEMP_NUM_NETCONN                4
+
+/**
+ * MEMP_NUM_TCPIP_MSG_API: the number of struct tcpip_msg, which are used
+ * for callback/timeout API communication.
+ * (only needed if you use tcpip.c)
+ */
+#define MEMP_NUM_TCPIP_MSG_API          8
+
+/**
+ * MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used
+ * for incoming packets.
+ * (only needed if you use tcpip.c)
+ */
+#define MEMP_NUM_TCPIP_MSG_INPKT        8
+
+/**
+ * PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
+ */
+#define PBUF_POOL_SIZE                  2048 /* was 32 */
+
+
+/*------------------------------------------------------------------------------
+----------------------------------- ARP options --------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_ARP==1: Enable ARP functionality.
+ */
+#define LWIP_ARP                        1
+
+
+/*------------------------------------------------------------------------------
+------------------------------------ IP options---------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * IP_FORWARD==1: Enables the ability to forward IP packets across network
+ * interfaces. If you are going to run lwIP on a device with only one network
+ * interface, define this to 0.
+ */
+#define IP_FORWARD                      0
+
+/**
+ * IP_OPTIONS: Defines the behavior for IP options.
+ *      IP_OPTIONS_ALLOWED==0: All packets with IP options are dropped.
+ *      IP_OPTIONS_ALLOWED==1: IP options are allowed (but not parsed).
+ */
+#define IP_OPTIONS_ALLOWED              1
+
+/**
+ * IP_REASSEMBLY==1: Reassemble incoming fragmented IP packets. Note that
+ * this option does not affect outgoing packet sizes, which can be controlled
+ * via IP_FRAG.
+ */
+#define IP_REASSEMBLY                   1
+
+/**
+ * IP_FRAG==1: Fragment outgoing IP packets if their size exceeds MTU. Note
+ * that this option does not affect incoming packet sizes, which can be
+ * controlled via IP_REASSEMBLY.
+ */
+#define IP_FRAG                         1
+
+/**
+ * IP_REASS_MAXAGE: Maximum time (in multiples of IP_TMR_INTERVAL - so seconds, normally)
+ * a fragmented IP packet waits for all fragments to arrive. If not all fragments arrived
+ * in this time, the whole packet is discarded.
+ */
+#define IP_REASS_MAXAGE                 3
+
+/**
+ * IP_REASS_MAX_PBUFS: Total maximum amount of pbufs waiting to be reassembled.
+ * Since the received pbufs are enqueued, be sure to configure
+ * PBUF_POOL_SIZE > IP_REASS_MAX_PBUFS so that the stack is still able to receive
+ * packets even if the maximum amount of fragments is enqueued for reassembly!
+ */
+#define IP_REASS_MAX_PBUFS              4
+
+/**
+ * IP_FRAG_USES_STATIC_BUF==1: Use a static MTU-sized buffer for IP
+ * fragmentation. Otherwise pbufs are allocated and reference the original
+    * packet data to be fragmented.
+*/
+#define IP_FRAG_USES_STATIC_BUF         0
+
+/**
+ * IP_DEFAULT_TTL: Default value for Time-To-Live used by transport layers.
+ */
+#define IP_DEFAULT_TTL                  255
+
+
+/*------------------------------------------------------------------------------
+------------------------------- ICMP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_ICMP==1: Enable ICMP module inside the IP stack.
+ * Be careful, disable that make your product non-compliant to RFC1122
+ */
+#define LWIP_ICMP                       1
+
+
+/*------------------------------------------------------------------------------
+------------------------------- RAW Options ------------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_RAW==1: Enable application layer to hook into the IP layer itself.
+ */
+#define LWIP_RAW                        1
+
+
+/*------------------------------------------------------------------------------
+------------------------------- DHCP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_DHCP==1: Enable DHCP module.
+ */
+#define LWIP_DHCP                       0
+
+
+/*------------------------------------------------------------------------------
+------------------------------ AUTOIP Options ----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_AUTOIP==1: Enable AUTOIP module.
+ */
+#define LWIP_AUTOIP                     0
+
+
+/*------------------------------------------------------------------------------
+------------------------------- SNMP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_SNMP==1: Turn on SNMP module. UDP must be available for SNMP
+ * transport.
+ */
+#define LWIP_SNMP                       0
+
+
+/*------------------------------------------------------------------------------
+------------------------------- IGMP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_IGMP==1: Turn on IGMP module.
+ */
+#define LWIP_IGMP                       0
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- DNS Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_DNS==1: Turn on DNS module. UDP must be available for DNS
+ * transport.
+ */
+#define LWIP_DNS                        0
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- UDP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_UDP==1: Turn on UDP.
+ */
+#define LWIP_UDP                        1
+
+
+/*------------------------------------------------------------------------------
+-------------------------------- TCP Options -----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_TCP==1: Turn on TCP.
+ */
+#define LWIP_TCP                        1
+
+#define LWIP_LISTEN_BACKLOG             0
+
+
+/*------------------------------------------------------------------------------
+--------------------------------- LOOPIF Options -------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_HAVE_LOOPIF==1: Support loop interface (127.0.0.1) and loopif.c
+ */
+#define LWIP_HAVE_LOOPIF                0
+
+
+/*------------------------------------------------------------------------------
+---------------------------- Sequential Layer Options --------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
+ */
+#define LWIP_NETCONN                    0
+
+
+/*------------------------------------------------------------------------------
+--------------------------------- Socket Options -------------------------------
+------------------------------------------------------------------------------*/
+/**
+ * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
+ */
+#define LWIP_SOCKET                     0
+
+
+/*------------------------------------------------------------------------------
+------------------------------ Statistics Options ------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * LWIP_STATS==1: Enable statistics collection in lwip_stats.
+ */
+#define LWIP_STATS                      0
+
+/*------------------------------------------------------------------------------
+--------------------------------- PPP Options ----------------------------------
+------------------------------------------------------------------------------*/
+
+/**
+ * PPP_SUPPORT==1: Enable PPP.
+ */
+#define PPP_SUPPORT                     0
+
+#endif /* __LWIPOPTS_H__ */
\ No newline at end of file
diff --git a/ext/lz4/lz4.c b/ext/lz4/lz4.c
new file mode 100644
index 000000000..08cf6b5cd
--- /dev/null
+++ b/ext/lz4/lz4.c
@@ -0,0 +1,1516 @@
+/*
+   LZ4 - Fast LZ compression algorithm
+   Copyright (C) 2011-2015, Yann Collet.
+
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
+
+       * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+       * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following disclaimer
+   in the documentation and/or other materials provided with the
+   distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   You can contact the author at :
+   - LZ4 source repository : https://github.com/Cyan4973/lz4
+   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
+*/
+
+
+/**************************************
+*  Tuning parameters
+**************************************/
+/*
+ * HEAPMODE :
+ * Select how default compression functions will allocate memory for their hash table,
+ * in memory stack (0:default, fastest), or in memory heap (1:requires malloc()).
+ */
+#define HEAPMODE 0
+
+/*
+ * ACCELERATION_DEFAULT :
+ * Select "acceleration" for LZ4_compress_fast() when parameter value <= 0
+ */
+#define ACCELERATION_DEFAULT 1
+
+
+/**************************************
+*  CPU Feature Detection
+**************************************/
+/*
+ * LZ4_FORCE_SW_BITCOUNT
+ * Define this parameter if your target system or compiler does not support hardware bit count
+ */
+#if defined(_MSC_VER) && defined(_WIN32_WCE)   /* Visual Studio for Windows CE does not support Hardware bit count */
+#  define LZ4_FORCE_SW_BITCOUNT
+#endif
+
+
+/**************************************
+*  Includes
+**************************************/
+#include "lz4.h"
+
+
+/**************************************
+*  Compiler Options
+**************************************/
+#ifdef _MSC_VER    /* Visual Studio */
+#  define FORCE_INLINE static __forceinline
+#  include <intrin.h>
+#  pragma warning(disable : 4127)        /* disable: C4127: conditional expression is constant */
+#  pragma warning(disable : 4293)        /* disable: C4293: too large shift (32-bits) */
+#else
+#  if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)   /* C99 */
+#    if defined(__GNUC__) || defined(__clang__)
+#      define FORCE_INLINE static inline __attribute__((always_inline))
+#    else
+#      define FORCE_INLINE static inline
+#    endif
+#  else
+#    define FORCE_INLINE static
+#  endif   /* __STDC_VERSION__ */
+#endif  /* _MSC_VER */
+
+/* LZ4_GCC_VERSION is defined into lz4.h */
+#if (LZ4_GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
+#  define expect(expr,value)    (__builtin_expect ((expr),(value)) )
+#else
+#  define expect(expr,value)    (expr)
+#endif
+
+#define likely(expr)     expect((expr) != 0, 1)
+#define unlikely(expr)   expect((expr) != 0, 0)
+
+
+/**************************************
+*  Memory routines
+**************************************/
+#include <stdlib.h>   /* malloc, calloc, free */
+#define ALLOCATOR(n,s) calloc(n,s)
+#define FREEMEM        free
+#include <string.h>   /* memset, memcpy */
+#define MEM_INIT       memset
+
+
+/**************************************
+*  Basic Types
+**************************************/
+#if defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)   /* C99 */
+# include <stdint.h>
+  typedef  uint8_t BYTE;
+  typedef uint16_t U16;
+  typedef uint32_t U32;
+  typedef  int32_t S32;
+  typedef uint64_t U64;
+#else
+  typedef unsigned char       BYTE;
+  typedef unsigned short      U16;
+  typedef unsigned int        U32;
+  typedef   signed int        S32;
+  typedef unsigned long long  U64;
+#endif
+
+
+/**************************************
+*  Reading and writing into memory
+**************************************/
+#define STEPSIZE sizeof(size_t)
+
+static unsigned LZ4_64bits(void) { return sizeof(void*)==8; }
+
+static unsigned LZ4_isLittleEndian(void)
+{
+    const union { U32 i; BYTE c[4]; } one = { 1 };   /* don't use static : performance detrimental  */
+    return one.c[0];
+}
+
+
+static U16 LZ4_read16(const void* memPtr)
+{
+    U16 val16;
+    memcpy(&val16, memPtr, 2);
+    return val16;
+}
+
+static U16 LZ4_readLE16(const void* memPtr)
+{
+    if (LZ4_isLittleEndian())
+    {
+        return LZ4_read16(memPtr);
+    }
+    else
+    {
+        const BYTE* p = (const BYTE*)memPtr;
+        return (U16)((U16)p[0] + (p[1]<<8));
+    }
+}
+
+static void LZ4_writeLE16(void* memPtr, U16 value)
+{
+    if (LZ4_isLittleEndian())
+    {
+        memcpy(memPtr, &value, 2);
+    }
+    else
+    {
+        BYTE* p = (BYTE*)memPtr;
+        p[0] = (BYTE) value;
+        p[1] = (BYTE)(value>>8);
+    }
+}
+
+static U32 LZ4_read32(const void* memPtr)
+{
+    U32 val32;
+    memcpy(&val32, memPtr, 4);
+    return val32;
+}
+
+static U64 LZ4_read64(const void* memPtr)
+{
+    U64 val64;
+    memcpy(&val64, memPtr, 8);
+    return val64;
+}
+
+static size_t LZ4_read_ARCH(const void* p)
+{
+    if (LZ4_64bits())
+        return (size_t)LZ4_read64(p);
+    else
+        return (size_t)LZ4_read32(p);
+}
+
+
+static void LZ4_copy4(void* dstPtr, const void* srcPtr) { memcpy(dstPtr, srcPtr, 4); }
+
+static void LZ4_copy8(void* dstPtr, const void* srcPtr) { memcpy(dstPtr, srcPtr, 8); }
+
+/* customized version of memcpy, which may overwrite up to 7 bytes beyond dstEnd */
+static void LZ4_wildCopy(void* dstPtr, const void* srcPtr, void* dstEnd)
+{
+    BYTE* d = (BYTE*)dstPtr;
+    const BYTE* s = (const BYTE*)srcPtr;
+    BYTE* e = (BYTE*)dstEnd;
+    do { LZ4_copy8(d,s); d+=8; s+=8; } while (d<e);
+}
+
+
+/**************************************
+*  Common Constants
+**************************************/
+#define MINMATCH 4
+
+#define COPYLENGTH 8
+#define LASTLITERALS 5
+#define MFLIMIT (COPYLENGTH+MINMATCH)
+static const int LZ4_minLength = (MFLIMIT+1);
+
+#define KB *(1 <<10)
+#define MB *(1 <<20)
+#define GB *(1U<<30)
+
+#define MAXD_LOG 16
+#define MAX_DISTANCE ((1 << MAXD_LOG) - 1)
+
+#define ML_BITS  4
+#define ML_MASK  ((1U<<ML_BITS)-1)
+#define RUN_BITS (8-ML_BITS)
+#define RUN_MASK ((1U<<RUN_BITS)-1)
+
+
+/**************************************
+*  Common Utils
+**************************************/
+#define LZ4_STATIC_ASSERT(c)    { enum { LZ4_static_assert = 1/(int)(!!(c)) }; }   /* use only *after* variable declarations */
+
+
+/**************************************
+*  Common functions
+**************************************/
+static unsigned LZ4_NbCommonBytes (register size_t val)
+{
+    if (LZ4_isLittleEndian())
+    {
+        if (LZ4_64bits())
+        {
+#       if defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            unsigned long r = 0;
+            _BitScanForward64( &r, (U64)val );
+            return (int)(r>>3);
+#       elif (defined(__clang__) || (LZ4_GCC_VERSION >= 304)) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            return (__builtin_ctzll((U64)val) >> 3);
+#       else
+            static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };
+            return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
+#       endif
+        }
+        else /* 32 bits */
+        {
+#       if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            unsigned long r;
+            _BitScanForward( &r, (U32)val );
+            return (int)(r>>3);
+#       elif (defined(__clang__) || (LZ4_GCC_VERSION >= 304)) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            return (__builtin_ctz((U32)val) >> 3);
+#       else
+            static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };
+            return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
+#       endif
+        }
+    }
+    else   /* Big Endian CPU */
+    {
+        if (LZ4_64bits())
+        {
+#       if defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            unsigned long r = 0;
+            _BitScanReverse64( &r, val );
+            return (unsigned)(r>>3);
+#       elif (defined(__clang__) || (LZ4_GCC_VERSION >= 304)) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            return (__builtin_clzll((U64)val) >> 3);
+#       else
+            unsigned r;
+            if (!(val>>32)) { r=4; } else { r=0; val>>=32; }
+            if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
+            r += (!val);
+            return r;
+#       endif
+        }
+        else /* 32 bits */
+        {
+#       if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            unsigned long r = 0;
+            _BitScanReverse( &r, (unsigned long)val );
+            return (unsigned)(r>>3);
+#       elif (defined(__clang__) || (LZ4_GCC_VERSION >= 304)) && !defined(LZ4_FORCE_SW_BITCOUNT)
+            return (__builtin_clz((U32)val) >> 3);
+#       else
+            unsigned r;
+            if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
+            r += (!val);
+            return r;
+#       endif
+        }
+    }
+}
+
+static unsigned LZ4_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* pInLimit)
+{
+    const BYTE* const pStart = pIn;
+
+    while (likely(pIn<pInLimit-(STEPSIZE-1)))
+    {
+        size_t diff = LZ4_read_ARCH(pMatch) ^ LZ4_read_ARCH(pIn);
+        if (!diff) { pIn+=STEPSIZE; pMatch+=STEPSIZE; continue; }
+        pIn += LZ4_NbCommonBytes(diff);
+        return (unsigned)(pIn - pStart);
+    }
+
+    if (LZ4_64bits()) if ((pIn<(pInLimit-3)) && (LZ4_read32(pMatch) == LZ4_read32(pIn))) { pIn+=4; pMatch+=4; }
+    if ((pIn<(pInLimit-1)) && (LZ4_read16(pMatch) == LZ4_read16(pIn))) { pIn+=2; pMatch+=2; }
+    if ((pIn<pInLimit) && (*pMatch == *pIn)) pIn++;
+    return (unsigned)(pIn - pStart);
+}
+
+
+#ifndef LZ4_COMMONDEFS_ONLY
+/**************************************
+*  Local Constants
+**************************************/
+#define LZ4_HASHLOG   (LZ4_MEMORY_USAGE-2)
+#define HASHTABLESIZE (1 << LZ4_MEMORY_USAGE)
+#define HASH_SIZE_U32 (1 << LZ4_HASHLOG)       /* required as macro for static allocation */
+
+static const int LZ4_64Klimit = ((64 KB) + (MFLIMIT-1));
+static const U32 LZ4_skipTrigger = 6;  /* Increase this value ==> compression run slower on incompressible data */
+
+
+/**************************************
+*  Local Structures and types
+**************************************/
+typedef struct {
+    U32 hashTable[HASH_SIZE_U32];
+    U32 currentOffset;
+    U32 initCheck;
+    const BYTE* dictionary;
+    BYTE* bufferStart;   /* obsolete, used for slideInputBuffer */
+    U32 dictSize;
+} LZ4_stream_t_internal;
+
+typedef enum { notLimited = 0, limitedOutput = 1 } limitedOutput_directive;
+typedef enum { byPtr, byU32, byU16 } tableType_t;
+
+typedef enum { noDict = 0, withPrefix64k, usingExtDict } dict_directive;
+typedef enum { noDictIssue = 0, dictSmall } dictIssue_directive;
+
+typedef enum { endOnOutputSize = 0, endOnInputSize = 1 } endCondition_directive;
+typedef enum { full = 0, partial = 1 } earlyEnd_directive;
+
+
+/**************************************
+*  Local Utils
+**************************************/
+int LZ4_versionNumber (void) { return LZ4_VERSION_NUMBER; }
+int LZ4_compressBound(int isize)  { return LZ4_COMPRESSBOUND(isize); }
+int LZ4_sizeofState() { return LZ4_STREAMSIZE; }
+
+
+
+/********************************
+*  Compression functions
+********************************/
+
+static U32 LZ4_hashSequence(U32 sequence, tableType_t const tableType)
+{
+    if (tableType == byU16)
+        return (((sequence) * 2654435761U) >> ((MINMATCH*8)-(LZ4_HASHLOG+1)));
+    else
+        return (((sequence) * 2654435761U) >> ((MINMATCH*8)-LZ4_HASHLOG));
+}
+
+static const U64 prime5bytes = 889523592379ULL;
+static U32 LZ4_hashSequence64(size_t sequence, tableType_t const tableType)
+{
+    const U32 hashLog = (tableType == byU16) ? LZ4_HASHLOG+1 : LZ4_HASHLOG;
+    const U32 hashMask = (1<<hashLog) - 1;
+    return ((sequence * prime5bytes) >> (40 - hashLog)) & hashMask;
+}
+
+static U32 LZ4_hashSequenceT(size_t sequence, tableType_t const tableType)
+{
+    if (LZ4_64bits())
+        return LZ4_hashSequence64(sequence, tableType);
+    return LZ4_hashSequence((U32)sequence, tableType);
+}
+
+static U32 LZ4_hashPosition(const void* p, tableType_t tableType) { return LZ4_hashSequenceT(LZ4_read_ARCH(p), tableType); }
+
+static void LZ4_putPositionOnHash(const BYTE* p, U32 h, void* tableBase, tableType_t const tableType, const BYTE* srcBase)
+{
+    switch (tableType)
+    {
+    case byPtr: { const BYTE** hashTable = (const BYTE**)tableBase; hashTable[h] = p; return; }
+    case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = (U32)(p-srcBase); return; }
+    case byU16: { U16* hashTable = (U16*) tableBase; hashTable[h] = (U16)(p-srcBase); return; }
+    }
+}
+
+static void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase)
+{
+    U32 h = LZ4_hashPosition(p, tableType);
+    LZ4_putPositionOnHash(p, h, tableBase, tableType, srcBase);
+}
+
+static const BYTE* LZ4_getPositionOnHash(U32 h, void* tableBase, tableType_t tableType, const BYTE* srcBase)
+{
+    if (tableType == byPtr) { const BYTE** hashTable = (const BYTE**) tableBase; return hashTable[h]; }
+    if (tableType == byU32) { U32* hashTable = (U32*) tableBase; return hashTable[h] + srcBase; }
+    { U16* hashTable = (U16*) tableBase; return hashTable[h] + srcBase; }   /* default, to ensure a return */
+}
+
+static const BYTE* LZ4_getPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase)
+{
+    U32 h = LZ4_hashPosition(p, tableType);
+    return LZ4_getPositionOnHash(h, tableBase, tableType, srcBase);
+}
+
+FORCE_INLINE int LZ4_compress_generic(
+                 void* const ctx,
+                 const char* const source,
+                 char* const dest,
+                 const int inputSize,
+                 const int maxOutputSize,
+                 const limitedOutput_directive outputLimited,
+                 const tableType_t tableType,
+                 const dict_directive dict,
+                 const dictIssue_directive dictIssue,
+                 const U32 acceleration)
+{
+    LZ4_stream_t_internal* const dictPtr = (LZ4_stream_t_internal*)ctx;
+
+    const BYTE* ip = (const BYTE*) source;
+    const BYTE* base;
+    const BYTE* lowLimit;
+    const BYTE* const lowRefLimit = ip - dictPtr->dictSize;
+    const BYTE* const dictionary = dictPtr->dictionary;
+    const BYTE* const dictEnd = dictionary + dictPtr->dictSize;
+    const size_t dictDelta = dictEnd - (const BYTE*)source;
+    const BYTE* anchor = (const BYTE*) source;
+    const BYTE* const iend = ip + inputSize;
+    const BYTE* const mflimit = iend - MFLIMIT;
+    const BYTE* const matchlimit = iend - LASTLITERALS;
+
+    BYTE* op = (BYTE*) dest;
+    BYTE* const olimit = op + maxOutputSize;
+
+    U32 forwardH;
+    size_t refDelta=0;
+
+    /* Init conditions */
+    if ((U32)inputSize > (U32)LZ4_MAX_INPUT_SIZE) return 0;   /* Unsupported input size, too large (or negative) */
+    switch(dict)
+    {
+    case noDict:
+    default:
+        base = (const BYTE*)source;
+        lowLimit = (const BYTE*)source;
+        break;
+    case withPrefix64k:
+        base = (const BYTE*)source - dictPtr->currentOffset;
+        lowLimit = (const BYTE*)source - dictPtr->dictSize;
+        break;
+    case usingExtDict:
+        base = (const BYTE*)source - dictPtr->currentOffset;
+        lowLimit = (const BYTE*)source;
+        break;
+    }
+    if ((tableType == byU16) && (inputSize>=LZ4_64Klimit)) return 0;   /* Size too large (not within 64K limit) */
+    if (inputSize<LZ4_minLength) goto _last_literals;                  /* Input too small, no compression (all literals) */
+
+    /* First Byte */
+    LZ4_putPosition(ip, ctx, tableType, base);
+    ip++; forwardH = LZ4_hashPosition(ip, tableType);
+
+    /* Main Loop */
+    for ( ; ; )
+    {
+        const BYTE* match;
+        BYTE* token;
+        {
+            const BYTE* forwardIp = ip;
+            unsigned step = 1;
+            unsigned searchMatchNb = acceleration << LZ4_skipTrigger;
+
+            /* Find a match */
+            do {
+                U32 h = forwardH;
+                ip = forwardIp;
+                forwardIp += step;
+                step = (searchMatchNb++ >> LZ4_skipTrigger);
+
+                if (unlikely(forwardIp > mflimit)) goto _last_literals;
+
+                match = LZ4_getPositionOnHash(h, ctx, tableType, base);
+                if (dict==usingExtDict)
+                {
+                    if (match<(const BYTE*)source)
+                    {
+                        refDelta = dictDelta;
+                        lowLimit = dictionary;
+                    }
+                    else
+                    {
+                        refDelta = 0;
+                        lowLimit = (const BYTE*)source;
+                    }
+                }
+                forwardH = LZ4_hashPosition(forwardIp, tableType);
+                LZ4_putPositionOnHash(ip, h, ctx, tableType, base);
+
+            } while ( ((dictIssue==dictSmall) ? (match < lowRefLimit) : 0)
+                || ((tableType==byU16) ? 0 : (match + MAX_DISTANCE < ip))
+                || (LZ4_read32(match+refDelta) != LZ4_read32(ip)) );
+        }
+
+        /* Catch up */
+        while ((ip>anchor) && (match+refDelta > lowLimit) && (unlikely(ip[-1]==match[refDelta-1]))) { ip--; match--; }
+
+        {
+            /* Encode Literal length */
+            unsigned litLength = (unsigned)(ip - anchor);
+            token = op++;
+            if ((outputLimited) && (unlikely(op + litLength + (2 + 1 + LASTLITERALS) + (litLength/255) > olimit)))
+                return 0;   /* Check output limit */
+            if (litLength>=RUN_MASK)
+            {
+                int len = (int)litLength-RUN_MASK;
+                *token=(RUN_MASK<<ML_BITS);
+                for(; len >= 255 ; len-=255) *op++ = 255;
+                *op++ = (BYTE)len;
+            }
+            else *token = (BYTE)(litLength<<ML_BITS);
+
+            /* Copy Literals */
+            LZ4_wildCopy(op, anchor, op+litLength);
+            op+=litLength;
+        }
+
+_next_match:
+        /* Encode Offset */
+        LZ4_writeLE16(op, (U16)(ip-match)); op+=2;
+
+        /* Encode MatchLength */
+        {
+            unsigned matchLength;
+
+            if ((dict==usingExtDict) && (lowLimit==dictionary))
+            {
+                const BYTE* limit;
+                match += refDelta;
+                limit = ip + (dictEnd-match);
+                if (limit > matchlimit) limit = matchlimit;
+                matchLength = LZ4_count(ip+MINMATCH, match+MINMATCH, limit);
+                ip += MINMATCH + matchLength;
+                if (ip==limit)
+                {
+                    unsigned more = LZ4_count(ip, (const BYTE*)source, matchlimit);
+                    matchLength += more;
+                    ip += more;
+                }
+            }
+            else
+            {
+                matchLength = LZ4_count(ip+MINMATCH, match+MINMATCH, matchlimit);
+                ip += MINMATCH + matchLength;
+            }
+
+            if ((outputLimited) && (unlikely(op + (1 + LASTLITERALS) + (matchLength>>8) > olimit)))
+                return 0;    /* Check output limit */
+            if (matchLength>=ML_MASK)
+            {
+                *token += ML_MASK;
+                matchLength -= ML_MASK;
+                for (; matchLength >= 510 ; matchLength-=510) { *op++ = 255; *op++ = 255; }
+                if (matchLength >= 255) { matchLength-=255; *op++ = 255; }
+                *op++ = (BYTE)matchLength;
+            }
+            else *token += (BYTE)(matchLength);
+        }
+
+        anchor = ip;
+
+        /* Test end of chunk */
+        if (ip > mflimit) break;
+
+        /* Fill table */
+        LZ4_putPosition(ip-2, ctx, tableType, base);
+
+        /* Test next position */
+        match = LZ4_getPosition(ip, ctx, tableType, base);
+        if (dict==usingExtDict)
+        {
+            if (match<(const BYTE*)source)
+            {
+                refDelta = dictDelta;
+                lowLimit = dictionary;
+            }
+            else
+            {
+                refDelta = 0;
+                lowLimit = (const BYTE*)source;
+            }
+        }
+        LZ4_putPosition(ip, ctx, tableType, base);
+        if ( ((dictIssue==dictSmall) ? (match>=lowRefLimit) : 1)
+            && (match+MAX_DISTANCE>=ip)
+            && (LZ4_read32(match+refDelta)==LZ4_read32(ip)) )
+        { token=op++; *token=0; goto _next_match; }
+
+        /* Prepare next loop */
+        forwardH = LZ4_hashPosition(++ip, tableType);
+    }
+
+_last_literals:
+    /* Encode Last Literals */
+    {
+        const size_t lastRun = (size_t)(iend - anchor);
+        if ((outputLimited) && ((op - (BYTE*)dest) + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > (U32)maxOutputSize))
+            return 0;   /* Check output limit */
+        if (lastRun >= RUN_MASK)
+        {
+            size_t accumulator = lastRun - RUN_MASK;
+            *op++ = RUN_MASK << ML_BITS;
+            for(; accumulator >= 255 ; accumulator-=255) *op++ = 255;
+            *op++ = (BYTE) accumulator;
+        }
+        else
+        {
+            *op++ = (BYTE)(lastRun<<ML_BITS);
+        }
+        memcpy(op, anchor, lastRun);
+        op += lastRun;
+    }
+
+    /* End */
+    return (int) (((char*)op)-dest);
+}
+
+
+int LZ4_compress_fast_extState(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
+{
+    LZ4_resetStream((LZ4_stream_t*)state);
+    if (acceleration < 1) acceleration = ACCELERATION_DEFAULT;
+
+    if (maxOutputSize >= LZ4_compressBound(inputSize))
+    {
+        if (inputSize < LZ4_64Klimit)
+            return LZ4_compress_generic(state, source, dest, inputSize, 0, notLimited, byU16,                        noDict, noDictIssue, acceleration);
+        else
+            return LZ4_compress_generic(state, source, dest, inputSize, 0, notLimited, LZ4_64bits() ? byU32 : byPtr, noDict, noDictIssue, acceleration);
+    }
+    else
+    {
+        if (inputSize < LZ4_64Klimit)
+            return LZ4_compress_generic(state, source, dest, inputSize, maxOutputSize, limitedOutput, byU16,                        noDict, noDictIssue, acceleration);
+        else
+            return LZ4_compress_generic(state, source, dest, inputSize, maxOutputSize, limitedOutput, LZ4_64bits() ? byU32 : byPtr, noDict, noDictIssue, acceleration);
+    }
+}
+
+
+int LZ4_compress_fast(const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
+{
+#if (HEAPMODE)
+    void* ctxPtr = ALLOCATOR(1, sizeof(LZ4_stream_t));   /* malloc-calloc always properly aligned */
+#else
+    LZ4_stream_t ctx;
+    void* ctxPtr = &ctx;
+#endif
+
+    int result = LZ4_compress_fast_extState(ctxPtr, source, dest, inputSize, maxOutputSize, acceleration);
+
+#if (HEAPMODE)
+    FREEMEM(ctxPtr);
+#endif
+    return result;
+}
+
+
+int LZ4_compress_default(const char* source, char* dest, int inputSize, int maxOutputSize)
+{
+    return LZ4_compress_fast(source, dest, inputSize, maxOutputSize, 1);
+}
+
+
+/* hidden debug function */
+/* strangely enough, gcc generates faster code when this function is uncommented, even if unused */
+int LZ4_compress_fast_force(const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
+{
+    LZ4_stream_t ctx;
+
+    LZ4_resetStream(&ctx);
+
+    if (inputSize < LZ4_64Klimit)
+        return LZ4_compress_generic(&ctx, source, dest, inputSize, maxOutputSize, limitedOutput, byU16,                        noDict, noDictIssue, acceleration);
+    else
+        return LZ4_compress_generic(&ctx, source, dest, inputSize, maxOutputSize, limitedOutput, LZ4_64bits() ? byU32 : byPtr, noDict, noDictIssue, acceleration);
+}
+
+
+/********************************
+*  destSize variant
+********************************/
+
+static int LZ4_compress_destSize_generic(
+                       void* const ctx,
+                 const char* const src,
+                       char* const dst,
+                       int*  const srcSizePtr,
+                 const int targetDstSize,
+                 const tableType_t tableType)
+{
+    const BYTE* ip = (const BYTE*) src;
+    const BYTE* base = (const BYTE*) src;
+    const BYTE* lowLimit = (const BYTE*) src;
+    const BYTE* anchor = ip;
+    const BYTE* const iend = ip + *srcSizePtr;
+    const BYTE* const mflimit = iend - MFLIMIT;
+    const BYTE* const matchlimit = iend - LASTLITERALS;
+
+    BYTE* op = (BYTE*) dst;
+    BYTE* const oend = op + targetDstSize;
+    BYTE* const oMaxLit = op + targetDstSize - 2 /* offset */ - 8 /* because 8+MINMATCH==MFLIMIT */ - 1 /* token */;
+    BYTE* const oMaxMatch = op + targetDstSize - (LASTLITERALS + 1 /* token */);
+    BYTE* const oMaxSeq = oMaxLit - 1 /* token */;
+
+    U32 forwardH;
+
+
+    /* Init conditions */
+    if (targetDstSize < 1) return 0;                                     /* Impossible to store anything */
+    if ((U32)*srcSizePtr > (U32)LZ4_MAX_INPUT_SIZE) return 0;            /* Unsupported input size, too large (or negative) */
+    if ((tableType == byU16) && (*srcSizePtr>=LZ4_64Klimit)) return 0;   /* Size too large (not within 64K limit) */
+    if (*srcSizePtr<LZ4_minLength) goto _last_literals;                  /* Input too small, no compression (all literals) */
+
+    /* First Byte */
+    *srcSizePtr = 0;
+    LZ4_putPosition(ip, ctx, tableType, base);
+    ip++; forwardH = LZ4_hashPosition(ip, tableType);
+
+    /* Main Loop */
+    for ( ; ; )
+    {
+        const BYTE* match;
+        BYTE* token;
+        {
+            const BYTE* forwardIp = ip;
+            unsigned step = 1;
+            unsigned searchMatchNb = 1 << LZ4_skipTrigger;
+
+            /* Find a match */
+            do {
+                U32 h = forwardH;
+                ip = forwardIp;
+                forwardIp += step;
+                step = (searchMatchNb++ >> LZ4_skipTrigger);
+
+                if (unlikely(forwardIp > mflimit))
+                    goto _last_literals;
+
+                match = LZ4_getPositionOnHash(h, ctx, tableType, base);
+                forwardH = LZ4_hashPosition(forwardIp, tableType);
+                LZ4_putPositionOnHash(ip, h, ctx, tableType, base);
+
+            } while ( ((tableType==byU16) ? 0 : (match + MAX_DISTANCE < ip))
+                || (LZ4_read32(match) != LZ4_read32(ip)) );
+        }
+
+        /* Catch up */
+        while ((ip>anchor) && (match > lowLimit) && (unlikely(ip[-1]==match[-1]))) { ip--; match--; }
+
+        {
+            /* Encode Literal length */
+            unsigned litLength = (unsigned)(ip - anchor);
+            token = op++;
+            if (op + ((litLength+240)/255) + litLength > oMaxLit)
+            {
+                /* Not enough space for a last match */
+                op--;
+                goto _last_literals;
+            }
+            if (litLength>=RUN_MASK)
+            {
+                unsigned len = litLength - RUN_MASK;
+                *token=(RUN_MASK<<ML_BITS);
+                for(; len >= 255 ; len-=255) *op++ = 255;
+                *op++ = (BYTE)len;
+            }
+            else *token = (BYTE)(litLength<<ML_BITS);
+
+            /* Copy Literals */
+            LZ4_wildCopy(op, anchor, op+litLength);
+            op += litLength;
+        }
+
+_next_match:
+        /* Encode Offset */
+        LZ4_writeLE16(op, (U16)(ip-match)); op+=2;
+
+        /* Encode MatchLength */
+        {
+            size_t matchLength;
+
+            matchLength = LZ4_count(ip+MINMATCH, match+MINMATCH, matchlimit);
+
+            if (op + ((matchLength+240)/255) > oMaxMatch)
+            {
+                /* Match description too long : reduce it */
+                matchLength = (15-1) + (oMaxMatch-op) * 255;
+            }
+            //printf("offset %5i, matchLength%5i \n", (int)(ip-match), matchLength + MINMATCH);
+            ip += MINMATCH + matchLength;
+
+            if (matchLength>=ML_MASK)
+            {
+                *token += ML_MASK;
+                matchLength -= ML_MASK;
+                while (matchLength >= 255) { matchLength-=255; *op++ = 255; }
+                *op++ = (BYTE)matchLength;
+            }
+            else *token += (BYTE)(matchLength);
+        }
+
+        anchor = ip;
+
+        /* Test end of block */
+        if (ip > mflimit) break;
+        if (op > oMaxSeq) break;
+
+        /* Fill table */
+        LZ4_putPosition(ip-2, ctx, tableType, base);
+
+        /* Test next position */
+        match = LZ4_getPosition(ip, ctx, tableType, base);
+        LZ4_putPosition(ip, ctx, tableType, base);
+        if ( (match+MAX_DISTANCE>=ip)
+            && (LZ4_read32(match)==LZ4_read32(ip)) )
+        { token=op++; *token=0; goto _next_match; }
+
+        /* Prepare next loop */
+        forwardH = LZ4_hashPosition(++ip, tableType);
+    }
+
+_last_literals:
+    /* Encode Last Literals */
+    {
+        size_t lastRunSize = (size_t)(iend - anchor);
+        if (op + 1 /* token */ + ((lastRunSize+240)/255) /* litLength */ + lastRunSize /* literals */ > oend)
+        {
+            /* adapt lastRunSize to fill 'dst' */
+            lastRunSize  = (oend-op) - 1;
+            lastRunSize -= (lastRunSize+240)/255;
+        }
+        ip = anchor + lastRunSize;
+
+        if (lastRunSize >= RUN_MASK)
+        {
+            size_t accumulator = lastRunSize - RUN_MASK;
+            *op++ = RUN_MASK << ML_BITS;
+            for(; accumulator >= 255 ; accumulator-=255) *op++ = 255;
+            *op++ = (BYTE) accumulator;
+        }
+        else
+        {
+            *op++ = (BYTE)(lastRunSize<<ML_BITS);
+        }
+        memcpy(op, anchor, lastRunSize);
+        op += lastRunSize;
+    }
+
+    /* End */
+    *srcSizePtr = (int) (((const char*)ip)-src);
+    return (int) (((char*)op)-dst);
+}
+
+
+static int LZ4_compress_destSize_extState (void* state, const char* src, char* dst, int* srcSizePtr, int targetDstSize)
+{
+    LZ4_resetStream((LZ4_stream_t*)state);
+
+    if (targetDstSize >= LZ4_compressBound(*srcSizePtr))   /* compression success is guaranteed */
+    {
+        return LZ4_compress_fast_extState(state, src, dst, *srcSizePtr, targetDstSize, 1);
+    }
+    else
+    {
+        if (*srcSizePtr < LZ4_64Klimit)
+            return LZ4_compress_destSize_generic(state, src, dst, srcSizePtr, targetDstSize, byU16);
+        else
+            return LZ4_compress_destSize_generic(state, src, dst, srcSizePtr, targetDstSize, LZ4_64bits() ? byU32 : byPtr);
+    }
+}
+
+
+int LZ4_compress_destSize(const char* src, char* dst, int* srcSizePtr, int targetDstSize)
+{
+#if (HEAPMODE)
+    void* ctx = ALLOCATOR(1, sizeof(LZ4_stream_t));   /* malloc-calloc always properly aligned */
+#else
+    LZ4_stream_t ctxBody;
+    void* ctx = &ctxBody;
+#endif
+
+    int result = LZ4_compress_destSize_extState(ctx, src, dst, srcSizePtr, targetDstSize);
+
+#if (HEAPMODE)
+    FREEMEM(ctx);
+#endif
+    return result;
+}
+
+
+
+/********************************
+*  Streaming functions
+********************************/
+
+LZ4_stream_t* LZ4_createStream(void)
+{
+    LZ4_stream_t* lz4s = (LZ4_stream_t*)ALLOCATOR(8, LZ4_STREAMSIZE_U64);
+    LZ4_STATIC_ASSERT(LZ4_STREAMSIZE >= sizeof(LZ4_stream_t_internal));    /* A compilation error here means LZ4_STREAMSIZE is not large enough */
+    LZ4_resetStream(lz4s);
+    return lz4s;
+}
+
+void LZ4_resetStream (LZ4_stream_t* LZ4_stream)
+{
+    MEM_INIT(LZ4_stream, 0, sizeof(LZ4_stream_t));
+}
+
+int LZ4_freeStream (LZ4_stream_t* LZ4_stream)
+{
+    FREEMEM(LZ4_stream);
+    return (0);
+}
+
+
+#define HASH_UNIT sizeof(size_t)
+int LZ4_loadDict (LZ4_stream_t* LZ4_dict, const char* dictionary, int dictSize)
+{
+    LZ4_stream_t_internal* dict = (LZ4_stream_t_internal*) LZ4_dict;
+    const BYTE* p = (const BYTE*)dictionary;
+    const BYTE* const dictEnd = p + dictSize;
+    const BYTE* base;
+
+    if ((dict->initCheck) || (dict->currentOffset > 1 GB))  /* Uninitialized structure, or reuse overflow */
+        LZ4_resetStream(LZ4_dict);
+
+    if (dictSize < (int)HASH_UNIT)
+    {
+        dict->dictionary = NULL;
+        dict->dictSize = 0;
+        return 0;
+    }
+
+    if ((dictEnd - p) > 64 KB) p = dictEnd - 64 KB;
+    dict->currentOffset += 64 KB;
+    base = p - dict->currentOffset;
+    dict->dictionary = p;
+    dict->dictSize = (U32)(dictEnd - p);
+    dict->currentOffset += dict->dictSize;
+
+    while (p <= dictEnd-HASH_UNIT)
+    {
+        LZ4_putPosition(p, dict->hashTable, byU32, base);
+        p+=3;
+    }
+
+    return dict->dictSize;
+}
+
+
+static void LZ4_renormDictT(LZ4_stream_t_internal* LZ4_dict, const BYTE* src)
+{
+    if ((LZ4_dict->currentOffset > 0x80000000) ||
+        ((size_t)LZ4_dict->currentOffset > (size_t)src))   /* address space overflow */
+    {
+        /* rescale hash table */
+        U32 delta = LZ4_dict->currentOffset - 64 KB;
+        const BYTE* dictEnd = LZ4_dict->dictionary + LZ4_dict->dictSize;
+        int i;
+        for (i=0; i<HASH_SIZE_U32; i++)
+        {
+            if (LZ4_dict->hashTable[i] < delta) LZ4_dict->hashTable[i]=0;
+            else LZ4_dict->hashTable[i] -= delta;
+        }
+        LZ4_dict->currentOffset = 64 KB;
+        if (LZ4_dict->dictSize > 64 KB) LZ4_dict->dictSize = 64 KB;
+        LZ4_dict->dictionary = dictEnd - LZ4_dict->dictSize;
+    }
+}
+
+
+int LZ4_compress_fast_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
+{
+    LZ4_stream_t_internal* streamPtr = (LZ4_stream_t_internal*)LZ4_stream;
+    const BYTE* const dictEnd = streamPtr->dictionary + streamPtr->dictSize;
+
+    const BYTE* smallest = (const BYTE*) source;
+    if (streamPtr->initCheck) return 0;   /* Uninitialized structure detected */
+    if ((streamPtr->dictSize>0) && (smallest>dictEnd)) smallest = dictEnd;
+    LZ4_renormDictT(streamPtr, smallest);
+    if (acceleration < 1) acceleration = ACCELERATION_DEFAULT;
+
+    /* Check overlapping input/dictionary space */
+    {
+        const BYTE* sourceEnd = (const BYTE*) source + inputSize;
+        if ((sourceEnd > streamPtr->dictionary) && (sourceEnd < dictEnd))
+        {
+            streamPtr->dictSize = (U32)(dictEnd - sourceEnd);
+            if (streamPtr->dictSize > 64 KB) streamPtr->dictSize = 64 KB;
+            if (streamPtr->dictSize < 4) streamPtr->dictSize = 0;
+            streamPtr->dictionary = dictEnd - streamPtr->dictSize;
+        }
+    }
+
+    /* prefix mode : source data follows dictionary */
+    if (dictEnd == (const BYTE*)source)
+    {
+        int result;
+        if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset))
+            result = LZ4_compress_generic(LZ4_stream, source, dest, inputSize, maxOutputSize, limitedOutput, byU32, withPrefix64k, dictSmall, acceleration);
+        else
+            result = LZ4_compress_generic(LZ4_stream, source, dest, inputSize, maxOutputSize, limitedOutput, byU32, withPrefix64k, noDictIssue, acceleration);
+        streamPtr->dictSize += (U32)inputSize;
+        streamPtr->currentOffset += (U32)inputSize;
+        return result;
+    }
+
+    /* external dictionary mode */
+    {
+        int result;
+        if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset))
+            result = LZ4_compress_generic(LZ4_stream, source, dest, inputSize, maxOutputSize, limitedOutput, byU32, usingExtDict, dictSmall, acceleration);
+        else
+            result = LZ4_compress_generic(LZ4_stream, source, dest, inputSize, maxOutputSize, limitedOutput, byU32, usingExtDict, noDictIssue, acceleration);
+        streamPtr->dictionary = (const BYTE*)source;
+        streamPtr->dictSize = (U32)inputSize;
+        streamPtr->currentOffset += (U32)inputSize;
+        return result;
+    }
+}
+
+
+/* Hidden debug function, to force external dictionary mode */
+int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_dict, const char* source, char* dest, int inputSize)
+{
+    LZ4_stream_t_internal* streamPtr = (LZ4_stream_t_internal*)LZ4_dict;
+    int result;
+    const BYTE* const dictEnd = streamPtr->dictionary + streamPtr->dictSize;
+
+    const BYTE* smallest = dictEnd;
+    if (smallest > (const BYTE*) source) smallest = (const BYTE*) source;
+    LZ4_renormDictT((LZ4_stream_t_internal*)LZ4_dict, smallest);
+
+    result = LZ4_compress_generic(LZ4_dict, source, dest, inputSize, 0, notLimited, byU32, usingExtDict, noDictIssue, 1);
+
+    streamPtr->dictionary = (const BYTE*)source;
+    streamPtr->dictSize = (U32)inputSize;
+    streamPtr->currentOffset += (U32)inputSize;
+
+    return result;
+}
+
+
+int LZ4_saveDict (LZ4_stream_t* LZ4_dict, char* safeBuffer, int dictSize)
+{
+    LZ4_stream_t_internal* dict = (LZ4_stream_t_internal*) LZ4_dict;
+    const BYTE* previousDictEnd = dict->dictionary + dict->dictSize;
+
+    if ((U32)dictSize > 64 KB) dictSize = 64 KB;   /* useless to define a dictionary > 64 KB */
+    if ((U32)dictSize > dict->dictSize) dictSize = dict->dictSize;
+
+    memmove(safeBuffer, previousDictEnd - dictSize, dictSize);
+
+    dict->dictionary = (const BYTE*)safeBuffer;
+    dict->dictSize = (U32)dictSize;
+
+    return dictSize;
+}
+
+
+
+/*******************************
+*  Decompression functions
+*******************************/
+/*
+ * This generic decompression function cover all use cases.
+ * It shall be instantiated several times, using different sets of directives
+ * Note that it is essential this generic function is really inlined,
+ * in order to remove useless branches during compilation optimization.
+ */
+FORCE_INLINE int LZ4_decompress_generic(
+                 const char* const source,
+                 char* const dest,
+                 int inputSize,
+                 int outputSize,         /* If endOnInput==endOnInputSize, this value is the max size of Output Buffer. */
+
+                 int endOnInput,         /* endOnOutputSize, endOnInputSize */
+                 int partialDecoding,    /* full, partial */
+                 int targetOutputSize,   /* only used if partialDecoding==partial */
+                 int dict,               /* noDict, withPrefix64k, usingExtDict */
+                 const BYTE* const lowPrefix,  /* == dest if dict == noDict */
+                 const BYTE* const dictStart,  /* only if dict==usingExtDict */
+                 const size_t dictSize         /* note : = 0 if noDict */
+                 )
+{
+    /* Local Variables */
+    const BYTE* ip = (const BYTE*) source;
+    const BYTE* const iend = ip + inputSize;
+
+    BYTE* op = (BYTE*) dest;
+    BYTE* const oend = op + outputSize;
+    BYTE* cpy;
+    BYTE* oexit = op + targetOutputSize;
+    const BYTE* const lowLimit = lowPrefix - dictSize;
+
+    const BYTE* const dictEnd = (const BYTE*)dictStart + dictSize;
+    const size_t dec32table[] = {4, 1, 2, 1, 4, 4, 4, 4};
+    const size_t dec64table[] = {0, 0, 0, (size_t)-1, 0, 1, 2, 3};
+
+    const int safeDecode = (endOnInput==endOnInputSize);
+    const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
+
+
+    /* Special cases */
+    if ((partialDecoding) && (oexit> oend-MFLIMIT)) oexit = oend-MFLIMIT;                         /* targetOutputSize too high => decode everything */
+    if ((endOnInput) && (unlikely(outputSize==0))) return ((inputSize==1) && (*ip==0)) ? 0 : -1;  /* Empty output buffer */
+    if ((!endOnInput) && (unlikely(outputSize==0))) return (*ip==0?1:-1);
+
+
+    /* Main Loop */
+    while (1)
+    {
+        unsigned token;
+        size_t length;
+        const BYTE* match;
+
+        /* get literal length */
+        token = *ip++;
+        if ((length=(token>>ML_BITS)) == RUN_MASK)
+        {
+            unsigned s;
+            do
+            {
+                s = *ip++;
+                length += s;
+            }
+            while (likely((endOnInput)?ip<iend-RUN_MASK:1) && (s==255));
+            if ((safeDecode) && unlikely((size_t)(op+length)<(size_t)(op))) goto _output_error;   /* overflow detection */
+            if ((safeDecode) && unlikely((size_t)(ip+length)<(size_t)(ip))) goto _output_error;   /* overflow detection */
+        }
+
+        /* copy literals */
+        cpy = op+length;
+        if (((endOnInput) && ((cpy>(partialDecoding?oexit:oend-MFLIMIT)) || (ip+length>iend-(2+1+LASTLITERALS))) )
+            || ((!endOnInput) && (cpy>oend-COPYLENGTH)))
+        {
+            if (partialDecoding)
+            {
+                if (cpy > oend) goto _output_error;                           /* Error : write attempt beyond end of output buffer */
+                if ((endOnInput) && (ip+length > iend)) goto _output_error;   /* Error : read attempt beyond end of input buffer */
+            }
+            else
+            {
+                if ((!endOnInput) && (cpy != oend)) goto _output_error;       /* Error : block decoding must stop exactly there */
+                if ((endOnInput) && ((ip+length != iend) || (cpy > oend))) goto _output_error;   /* Error : input must be consumed */
+            }
+            memcpy(op, ip, length);
+            ip += length;
+            op += length;
+            break;     /* Necessarily EOF, due to parsing restrictions */
+        }
+        LZ4_wildCopy(op, ip, cpy);
+        ip += length; op = cpy;
+
+        /* get offset */
+        match = cpy - LZ4_readLE16(ip); ip+=2;
+        if ((checkOffset) && (unlikely(match < lowLimit))) goto _output_error;   /* Error : offset outside destination buffer */
+
+        /* get matchlength */
+        length = token & ML_MASK;
+        if (length == ML_MASK)
+        {
+            unsigned s;
+            do
+            {
+                if ((endOnInput) && (ip > iend-LASTLITERALS)) goto _output_error;
+                s = *ip++;
+                length += s;
+            } while (s==255);
+            if ((safeDecode) && unlikely((size_t)(op+length)<(size_t)op)) goto _output_error;   /* overflow detection */
+        }
+        length += MINMATCH;
+
+        /* check external dictionary */
+        if ((dict==usingExtDict) && (match < lowPrefix))
+        {
+            if (unlikely(op+length > oend-LASTLITERALS)) goto _output_error;   /* doesn't respect parsing restriction */
+
+            if (length <= (size_t)(lowPrefix-match))
+            {
+                /* match can be copied as a single segment from external dictionary */
+                match = dictEnd - (lowPrefix-match);
+                memmove(op, match, length); op += length;
+            }
+            else
+            {
+                /* match encompass external dictionary and current segment */
+                size_t copySize = (size_t)(lowPrefix-match);
+                memcpy(op, dictEnd - copySize, copySize);
+                op += copySize;
+                copySize = length - copySize;
+                if (copySize > (size_t)(op-lowPrefix))   /* overlap within current segment */
+                {
+                    BYTE* const endOfMatch = op + copySize;
+                    const BYTE* copyFrom = lowPrefix;
+                    while (op < endOfMatch) *op++ = *copyFrom++;
+                }
+                else
+                {
+                    memcpy(op, lowPrefix, copySize);
+                    op += copySize;
+                }
+            }
+            continue;
+        }
+
+        /* copy repeated sequence */
+        cpy = op + length;
+        if (unlikely((op-match)<8))
+        {
+            const size_t dec64 = dec64table[op-match];
+            op[0] = match[0];
+            op[1] = match[1];
+            op[2] = match[2];
+            op[3] = match[3];
+            match += dec32table[op-match];
+            LZ4_copy4(op+4, match);
+            op += 8; match -= dec64;
+        } else { LZ4_copy8(op, match); op+=8; match+=8; }
+
+        if (unlikely(cpy>oend-12))
+        {
+            if (cpy > oend-LASTLITERALS) goto _output_error;    /* Error : last LASTLITERALS bytes must be literals */
+            if (op < oend-8)
+            {
+                LZ4_wildCopy(op, match, oend-8);
+                match += (oend-8) - op;
+                op = oend-8;
+            }
+            while (op<cpy) *op++ = *match++;
+        }
+        else
+            LZ4_wildCopy(op, match, cpy);
+        op=cpy;   /* correction */
+    }
+
+    /* end of decoding */
+    if (endOnInput)
+       return (int) (((char*)op)-dest);     /* Nb of output bytes decoded */
+    else
+       return (int) (((const char*)ip)-source);   /* Nb of input bytes read */
+
+    /* Overflow error detected */
+_output_error:
+    return (int) (-(((const char*)ip)-source))-1;
+}
+
+
+int LZ4_decompress_safe(const char* source, char* dest, int compressedSize, int maxDecompressedSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, full, 0, noDict, (BYTE*)dest, NULL, 0);
+}
+
+int LZ4_decompress_safe_partial(const char* source, char* dest, int compressedSize, int targetOutputSize, int maxDecompressedSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, partial, targetOutputSize, noDict, (BYTE*)dest, NULL, 0);
+}
+
+int LZ4_decompress_fast(const char* source, char* dest, int originalSize)
+{
+    return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, withPrefix64k, (BYTE*)(dest - 64 KB), NULL, 64 KB);
+}
+
+
+/* streaming decompression functions */
+
+typedef struct
+{
+    const BYTE* externalDict;
+    size_t extDictSize;
+    const BYTE* prefixEnd;
+    size_t prefixSize;
+} LZ4_streamDecode_t_internal;
+
+/*
+ * If you prefer dynamic allocation methods,
+ * LZ4_createStreamDecode()
+ * provides a pointer (void*) towards an initialized LZ4_streamDecode_t structure.
+ */
+LZ4_streamDecode_t* LZ4_createStreamDecode(void)
+{
+    LZ4_streamDecode_t* lz4s = (LZ4_streamDecode_t*) ALLOCATOR(1, sizeof(LZ4_streamDecode_t));
+    return lz4s;
+}
+
+int LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream)
+{
+    FREEMEM(LZ4_stream);
+    return 0;
+}
+
+/*
+ * LZ4_setStreamDecode
+ * Use this function to instruct where to find the dictionary
+ * This function is not necessary if previous data is still available where it was decoded.
+ * Loading a size of 0 is allowed (same effect as no dictionary).
+ * Return : 1 if OK, 0 if error
+ */
+int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize)
+{
+    LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
+    lz4sd->prefixSize = (size_t) dictSize;
+    lz4sd->prefixEnd = (const BYTE*) dictionary + dictSize;
+    lz4sd->externalDict = NULL;
+    lz4sd->extDictSize  = 0;
+    return 1;
+}
+
+/*
+*_continue() :
+    These decoding functions allow decompression of multiple blocks in "streaming" mode.
+    Previously decoded blocks must still be available at the memory position where they were decoded.
+    If it's not possible, save the relevant part of decoded data into a safe buffer,
+    and indicate where it stands using LZ4_setStreamDecode()
+*/
+int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxOutputSize)
+{
+    LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
+    int result;
+
+    if (lz4sd->prefixEnd == (BYTE*)dest)
+    {
+        result = LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
+                                        endOnInputSize, full, 0,
+                                        usingExtDict, lz4sd->prefixEnd - lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize += result;
+        lz4sd->prefixEnd  += result;
+    }
+    else
+    {
+        lz4sd->extDictSize = lz4sd->prefixSize;
+        lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize;
+        result = LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize,
+                                        endOnInputSize, full, 0,
+                                        usingExtDict, (BYTE*)dest, lz4sd->externalDict, lz4sd->extDictSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize = result;
+        lz4sd->prefixEnd  = (BYTE*)dest + result;
+    }
+
+    return result;
+}
+
+int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int originalSize)
+{
+    LZ4_streamDecode_t_internal* lz4sd = (LZ4_streamDecode_t_internal*) LZ4_streamDecode;
+    int result;
+
+    if (lz4sd->prefixEnd == (BYTE*)dest)
+    {
+        result = LZ4_decompress_generic(source, dest, 0, originalSize,
+                                        endOnOutputSize, full, 0,
+                                        usingExtDict, lz4sd->prefixEnd - lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize += originalSize;
+        lz4sd->prefixEnd  += originalSize;
+    }
+    else
+    {
+        lz4sd->extDictSize = lz4sd->prefixSize;
+        lz4sd->externalDict = (BYTE*)dest - lz4sd->extDictSize;
+        result = LZ4_decompress_generic(source, dest, 0, originalSize,
+                                        endOnOutputSize, full, 0,
+                                        usingExtDict, (BYTE*)dest, lz4sd->externalDict, lz4sd->extDictSize);
+        if (result <= 0) return result;
+        lz4sd->prefixSize = originalSize;
+        lz4sd->prefixEnd  = (BYTE*)dest + originalSize;
+    }
+
+    return result;
+}
+
+
+/*
+Advanced decoding functions :
+*_usingDict() :
+    These decoding functions work the same as "_continue" ones,
+    the dictionary must be explicitly provided within parameters
+*/
+
+FORCE_INLINE int LZ4_decompress_usingDict_generic(const char* source, char* dest, int compressedSize, int maxOutputSize, int safe, const char* dictStart, int dictSize)
+{
+    if (dictSize==0)
+        return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, (BYTE*)dest, NULL, 0);
+    if (dictStart+dictSize == dest)
+    {
+        if (dictSize >= (int)(64 KB - 1))
+            return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, withPrefix64k, (BYTE*)dest-64 KB, NULL, 0);
+        return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, noDict, (BYTE*)dest-dictSize, NULL, 0);
+    }
+    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, safe, full, 0, usingExtDict, (BYTE*)dest, (const BYTE*)dictStart, dictSize);
+}
+
+int LZ4_decompress_safe_usingDict(const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize)
+{
+    return LZ4_decompress_usingDict_generic(source, dest, compressedSize, maxOutputSize, 1, dictStart, dictSize);
+}
+
+int LZ4_decompress_fast_usingDict(const char* source, char* dest, int originalSize, const char* dictStart, int dictSize)
+{
+    return LZ4_decompress_usingDict_generic(source, dest, 0, originalSize, 0, dictStart, dictSize);
+}
+
+/* debug function */
+int LZ4_decompress_safe_forceExtDict(const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, usingExtDict, (BYTE*)dest, (const BYTE*)dictStart, dictSize);
+}
+
+
+/***************************************************
+*  Obsolete Functions
+***************************************************/
+/* obsolete compression functions */
+int LZ4_compress_limitedOutput(const char* source, char* dest, int inputSize, int maxOutputSize) { return LZ4_compress_default(source, dest, inputSize, maxOutputSize); }
+int LZ4_compress(const char* source, char* dest, int inputSize) { return LZ4_compress_default(source, dest, inputSize, LZ4_compressBound(inputSize)); }
+int LZ4_compress_limitedOutput_withState (void* state, const char* src, char* dst, int srcSize, int dstSize) { return LZ4_compress_fast_extState(state, src, dst, srcSize, dstSize, 1); }
+int LZ4_compress_withState (void* state, const char* src, char* dst, int srcSize) { return LZ4_compress_fast_extState(state, src, dst, srcSize, LZ4_compressBound(srcSize), 1); }
+int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_stream, const char* src, char* dst, int srcSize, int maxDstSize) { return LZ4_compress_fast_continue(LZ4_stream, src, dst, srcSize, maxDstSize, 1); }
+int LZ4_compress_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize) { return LZ4_compress_fast_continue(LZ4_stream, source, dest, inputSize, LZ4_compressBound(inputSize), 1); }
+
+/*
+These function names are deprecated and should no longer be used.
+They are only provided here for compatibility with older user programs.
+- LZ4_uncompress is totally equivalent to LZ4_decompress_fast
+- LZ4_uncompress_unknownOutputSize is totally equivalent to LZ4_decompress_safe
+*/
+int LZ4_uncompress (const char* source, char* dest, int outputSize) { return LZ4_decompress_fast(source, dest, outputSize); }
+int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize) { return LZ4_decompress_safe(source, dest, isize, maxOutputSize); }
+
+
+/* Obsolete Streaming functions */
+
+int LZ4_sizeofStreamState() { return LZ4_STREAMSIZE; }
+
+static void LZ4_init(LZ4_stream_t_internal* lz4ds, BYTE* base)
+{
+    MEM_INIT(lz4ds, 0, LZ4_STREAMSIZE);
+    lz4ds->bufferStart = base;
+}
+
+int LZ4_resetStreamState(void* state, char* inputBuffer)
+{
+    if ((((size_t)state) & 3) != 0) return 1;   /* Error : pointer is not aligned on 4-bytes boundary */
+    LZ4_init((LZ4_stream_t_internal*)state, (BYTE*)inputBuffer);
+    return 0;
+}
+
+void* LZ4_create (char* inputBuffer)
+{
+    void* lz4ds = ALLOCATOR(8, LZ4_STREAMSIZE_U64);
+    LZ4_init ((LZ4_stream_t_internal*)lz4ds, (BYTE*)inputBuffer);
+    return lz4ds;
+}
+
+char* LZ4_slideInputBuffer (void* LZ4_Data)
+{
+    LZ4_stream_t_internal* ctx = (LZ4_stream_t_internal*)LZ4_Data;
+    int dictSize = LZ4_saveDict((LZ4_stream_t*)LZ4_Data, (char*)ctx->bufferStart, 64 KB);
+    return (char*)(ctx->bufferStart + dictSize);
+}
+
+/* Obsolete streaming decompression functions */
+
+int LZ4_decompress_safe_withPrefix64k(const char* source, char* dest, int compressedSize, int maxOutputSize)
+{
+    return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, endOnInputSize, full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
+}
+
+int LZ4_decompress_fast_withPrefix64k(const char* source, char* dest, int originalSize)
+{
+    return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize, full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
+}
+
+#endif   /* LZ4_COMMONDEFS_ONLY */
+
diff --git a/ext/lz4/lz4.h b/ext/lz4/lz4.h
new file mode 100644
index 000000000..3e7400225
--- /dev/null
+++ b/ext/lz4/lz4.h
@@ -0,0 +1,360 @@
+/*
+   LZ4 - Fast LZ compression algorithm
+   Header File
+   Copyright (C) 2011-2015, Yann Collet.
+
+   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are
+   met:
+
+       * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+       * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following disclaimer
+   in the documentation and/or other materials provided with the
+   distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   You can contact the author at :
+   - LZ4 source repository : https://github.com/Cyan4973/lz4
+   - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
+*/
+#pragma once
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+/*
+ * lz4.h provides block compression functions, and gives full buffer control to programmer.
+ * If you need to generate inter-operable compressed data (respecting LZ4 frame specification),
+ * and can let the library handle its own memory, please use lz4frame.h instead.
+*/
+
+/**************************************
+*  Version
+**************************************/
+#define LZ4_VERSION_MAJOR    1    /* for breaking interface changes  */
+#define LZ4_VERSION_MINOR    7    /* for new (non-breaking) interface capabilities */
+#define LZ4_VERSION_RELEASE  1    /* for tweaks, bug-fixes, or development */
+#define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE)
+int LZ4_versionNumber (void);
+
+/**************************************
+*  Tuning parameter
+**************************************/
+/*
+ * LZ4_MEMORY_USAGE :
+ * Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; etc.)
+ * Increasing memory usage improves compression ratio
+ * Reduced memory usage can improve speed, due to cache effect
+ * Default value is 14, for 16KB, which nicely fits into Intel x86 L1 cache
+ */
+#define LZ4_MEMORY_USAGE 14
+
+
+/**************************************
+*  Simple Functions
+**************************************/
+
+int LZ4_compress_default(const char* source, char* dest, int sourceSize, int maxDestSize);
+int LZ4_decompress_safe (const char* source, char* dest, int compressedSize, int maxDecompressedSize);
+
+/*
+LZ4_compress_default() :
+    Compresses 'sourceSize' bytes from buffer 'source'
+    into already allocated 'dest' buffer of size 'maxDestSize'.
+    Compression is guaranteed to succeed if 'maxDestSize' >= LZ4_compressBound(sourceSize).
+    It also runs faster, so it's a recommended setting.
+    If the function cannot compress 'source' into a more limited 'dest' budget,
+    compression stops *immediately*, and the function result is zero.
+    As a consequence, 'dest' content is not valid.
+    This function never writes outside 'dest' buffer, nor read outside 'source' buffer.
+        sourceSize  : Max supported value is LZ4_MAX_INPUT_VALUE
+        maxDestSize : full or partial size of buffer 'dest' (which must be already allocated)
+        return : the number of bytes written into buffer 'dest' (necessarily <= maxOutputSize)
+              or 0 if compression fails
+
+LZ4_decompress_safe() :
+    compressedSize : is the precise full size of the compressed block.
+    maxDecompressedSize : is the size of destination buffer, which must be already allocated.
+    return : the number of bytes decompressed into destination buffer (necessarily <= maxDecompressedSize)
+             If destination buffer is not large enough, decoding will stop and output an error code (<0).
+             If the source stream is detected malformed, the function will stop decoding and return a negative result.
+             This function is protected against buffer overflow exploits, including malicious data packets.
+             It never writes outside output buffer, nor reads outside input buffer.
+*/
+
+
+/**************************************
+*  Advanced Functions
+**************************************/
+#define LZ4_MAX_INPUT_SIZE        0x7E000000   /* 2 113 929 216 bytes */
+#define LZ4_COMPRESSBOUND(isize)  ((unsigned)(isize) > (unsigned)LZ4_MAX_INPUT_SIZE ? 0 : (isize) + ((isize)/255) + 16)
+
+/*
+LZ4_compressBound() :
+    Provides the maximum size that LZ4 compression may output in a "worst case" scenario (input data not compressible)
+    This function is primarily useful for memory allocation purposes (destination buffer size).
+    Macro LZ4_COMPRESSBOUND() is also provided for compilation-time evaluation (stack memory allocation for example).
+    Note that LZ4_compress_default() compress faster when dest buffer size is >= LZ4_compressBound(srcSize)
+        inputSize  : max supported value is LZ4_MAX_INPUT_SIZE
+        return : maximum output size in a "worst case" scenario
+              or 0, if input size is too large ( > LZ4_MAX_INPUT_SIZE)
+*/
+int LZ4_compressBound(int inputSize);
+
+/*
+LZ4_compress_fast() :
+    Same as LZ4_compress_default(), but allows to select an "acceleration" factor.
+    The larger the acceleration value, the faster the algorithm, but also the lesser the compression.
+    It's a trade-off. It can be fine tuned, with each successive value providing roughly +~3% to speed.
+    An acceleration value of "1" is the same as regular LZ4_compress_default()
+    Values <= 0 will be replaced by ACCELERATION_DEFAULT (see lz4.c), which is 1.
+*/
+int LZ4_compress_fast (const char* source, char* dest, int sourceSize, int maxDestSize, int acceleration);
+
+
+/*
+LZ4_compress_fast_extState() :
+    Same compression function, just using an externally allocated memory space to store compression state.
+    Use LZ4_sizeofState() to know how much memory must be allocated,
+    and allocate it on 8-bytes boundaries (using malloc() typically).
+    Then, provide it as 'void* state' to compression function.
+*/
+int LZ4_sizeofState(void);
+int LZ4_compress_fast_extState (void* state, const char* source, char* dest, int inputSize, int maxDestSize, int acceleration);
+
+
+/*
+LZ4_compress_destSize() :
+    Reverse the logic, by compressing as much data as possible from 'source' buffer
+    into already allocated buffer 'dest' of size 'targetDestSize'.
+    This function either compresses the entire 'source' content into 'dest' if it's large enough,
+    or fill 'dest' buffer completely with as much data as possible from 'source'.
+        *sourceSizePtr : will be modified to indicate how many bytes where read from 'source' to fill 'dest'.
+                         New value is necessarily <= old value.
+        return : Nb bytes written into 'dest' (necessarily <= targetDestSize)
+              or 0 if compression fails
+*/
+int LZ4_compress_destSize (const char* source, char* dest, int* sourceSizePtr, int targetDestSize);
+
+
+/*
+LZ4_decompress_fast() :
+    originalSize : is the original and therefore uncompressed size
+    return : the number of bytes read from the source buffer (in other words, the compressed size)
+             If the source stream is detected malformed, the function will stop decoding and return a negative result.
+             Destination buffer must be already allocated. Its size must be a minimum of 'originalSize' bytes.
+    note : This function fully respect memory boundaries for properly formed compressed data.
+           It is a bit faster than LZ4_decompress_safe().
+           However, it does not provide any protection against intentionally modified data stream (malicious input).
+           Use this function in trusted environment only (data to decode comes from a trusted source).
+*/
+int LZ4_decompress_fast (const char* source, char* dest, int originalSize);
+
+/*
+LZ4_decompress_safe_partial() :
+    This function decompress a compressed block of size 'compressedSize' at position 'source'
+    into destination buffer 'dest' of size 'maxDecompressedSize'.
+    The function tries to stop decompressing operation as soon as 'targetOutputSize' has been reached,
+    reducing decompression time.
+    return : the number of bytes decoded in the destination buffer (necessarily <= maxDecompressedSize)
+       Note : this number can be < 'targetOutputSize' should the compressed block to decode be smaller.
+             Always control how many bytes were decoded.
+             If the source stream is detected malformed, the function will stop decoding and return a negative result.
+             This function never writes outside of output buffer, and never reads outside of input buffer. It is therefore protected against malicious data packets
+*/
+int LZ4_decompress_safe_partial (const char* source, char* dest, int compressedSize, int targetOutputSize, int maxDecompressedSize);
+
+
+/***********************************************
+*  Streaming Compression Functions
+***********************************************/
+#define LZ4_STREAMSIZE_U64 ((1 << (LZ4_MEMORY_USAGE-3)) + 4)
+#define LZ4_STREAMSIZE     (LZ4_STREAMSIZE_U64 * sizeof(long long))
+/*
+ * LZ4_stream_t
+ * information structure to track an LZ4 stream.
+ * important : init this structure content before first use !
+ * note : only allocated directly the structure if you are statically linking LZ4
+ *        If you are using liblz4 as a DLL, please use below construction methods instead.
+ */
+typedef struct { long long table[LZ4_STREAMSIZE_U64]; } LZ4_stream_t;
+
+/*
+ * LZ4_resetStream
+ * Use this function to init an allocated LZ4_stream_t structure
+ */
+void LZ4_resetStream (LZ4_stream_t* streamPtr);
+
+/*
+ * LZ4_createStream will allocate and initialize an LZ4_stream_t structure
+ * LZ4_freeStream releases its memory.
+ * In the context of a DLL (liblz4), please use these methods rather than the static struct.
+ * They are more future proof, in case of a change of LZ4_stream_t size.
+ */
+LZ4_stream_t* LZ4_createStream(void);
+int           LZ4_freeStream (LZ4_stream_t* streamPtr);
+
+/*
+ * LZ4_loadDict
+ * Use this function to load a static dictionary into LZ4_stream.
+ * Any previous data will be forgotten, only 'dictionary' will remain in memory.
+ * Loading a size of 0 is allowed.
+ * Return : dictionary size, in bytes (necessarily <= 64 KB)
+ */
+int LZ4_loadDict (LZ4_stream_t* streamPtr, const char* dictionary, int dictSize);
+
+/*
+ * LZ4_compress_fast_continue
+ * Compress buffer content 'src', using data from previously compressed blocks as dictionary to improve compression ratio.
+ * Important : Previous data blocks are assumed to still be present and unmodified !
+ * 'dst' buffer must be already allocated.
+ * If maxDstSize >= LZ4_compressBound(srcSize), compression is guaranteed to succeed, and runs faster.
+ * If not, and if compressed data cannot fit into 'dst' buffer size, compression stops, and function returns a zero.
+ */
+int LZ4_compress_fast_continue (LZ4_stream_t* streamPtr, const char* src, char* dst, int srcSize, int maxDstSize, int acceleration);
+
+/*
+ * LZ4_saveDict
+ * If previously compressed data block is not guaranteed to remain available at its memory location
+ * save it into a safer place (char* safeBuffer)
+ * Note : you don't need to call LZ4_loadDict() afterwards,
+ *        dictionary is immediately usable, you can therefore call LZ4_compress_fast_continue()
+ * Return : saved dictionary size in bytes (necessarily <= dictSize), or 0 if error
+ */
+int LZ4_saveDict (LZ4_stream_t* streamPtr, char* safeBuffer, int dictSize);
+
+
+/************************************************
+*  Streaming Decompression Functions
+************************************************/
+
+#define LZ4_STREAMDECODESIZE_U64  4
+#define LZ4_STREAMDECODESIZE     (LZ4_STREAMDECODESIZE_U64 * sizeof(unsigned long long))
+typedef struct { unsigned long long table[LZ4_STREAMDECODESIZE_U64]; } LZ4_streamDecode_t;
+/*
+ * LZ4_streamDecode_t
+ * information structure to track an LZ4 stream.
+ * init this structure content using LZ4_setStreamDecode or memset() before first use !
+ *
+ * In the context of a DLL (liblz4) please prefer usage of construction methods below.
+ * They are more future proof, in case of a change of LZ4_streamDecode_t size in the future.
+ * LZ4_createStreamDecode will allocate and initialize an LZ4_streamDecode_t structure
+ * LZ4_freeStreamDecode releases its memory.
+ */
+LZ4_streamDecode_t* LZ4_createStreamDecode(void);
+int                 LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream);
+
+/*
+ * LZ4_setStreamDecode
+ * Use this function to instruct where to find the dictionary.
+ * Setting a size of 0 is allowed (same effect as reset).
+ * Return : 1 if OK, 0 if error
+ */
+int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize);
+
+/*
+*_continue() :
+    These decoding functions allow decompression of multiple blocks in "streaming" mode.
+    Previously decoded blocks *must* remain available at the memory position where they were decoded (up to 64 KB)
+    In the case of a ring buffers, decoding buffer must be either :
+    - Exactly same size as encoding buffer, with same update rule (block boundaries at same positions)
+      In which case, the decoding & encoding ring buffer can have any size, including very small ones ( < 64 KB).
+    - Larger than encoding buffer, by a minimum of maxBlockSize more bytes.
+      maxBlockSize is implementation dependent. It's the maximum size you intend to compress into a single block.
+      In which case, encoding and decoding buffers do not need to be synchronized,
+      and encoding ring buffer can have any size, including small ones ( < 64 KB).
+    - _At least_ 64 KB + 8 bytes + maxBlockSize.
+      In which case, encoding and decoding buffers do not need to be synchronized,
+      and encoding ring buffer can have any size, including larger than decoding buffer.
+    Whenever these conditions are not possible, save the last 64KB of decoded data into a safe buffer,
+    and indicate where it is saved using LZ4_setStreamDecode()
+*/
+int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxDecompressedSize);
+int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int originalSize);
+
+
+/*
+Advanced decoding functions :
+*_usingDict() :
+    These decoding functions work the same as
+    a combination of LZ4_setStreamDecode() followed by LZ4_decompress_x_continue()
+    They are stand-alone. They don't need nor update an LZ4_streamDecode_t structure.
+*/
+int LZ4_decompress_safe_usingDict (const char* source, char* dest, int compressedSize, int maxDecompressedSize, const char* dictStart, int dictSize);
+int LZ4_decompress_fast_usingDict (const char* source, char* dest, int originalSize, const char* dictStart, int dictSize);
+
+
+
+/**************************************
+*  Obsolete Functions
+**************************************/
+/* Deprecate Warnings */
+/* Should these warnings messages be a problem,
+   it is generally possible to disable them,
+   with -Wno-deprecated-declarations for gcc
+   or _CRT_SECURE_NO_WARNINGS in Visual for example.
+   You can also define LZ4_DEPRECATE_WARNING_DEFBLOCK. */
+#ifndef LZ4_DEPRECATE_WARNING_DEFBLOCK
+#  define LZ4_DEPRECATE_WARNING_DEFBLOCK
+#  define LZ4_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#  if (LZ4_GCC_VERSION >= 405) || defined(__clang__)
+#    define LZ4_DEPRECATED(message) __attribute__((deprecated(message)))
+#  elif (LZ4_GCC_VERSION >= 301)
+#    define LZ4_DEPRECATED(message) __attribute__((deprecated))
+#  elif defined(_MSC_VER)
+#    define LZ4_DEPRECATED(message) __declspec(deprecated(message))
+#  else
+#    pragma message("WARNING: You need to implement LZ4_DEPRECATED for this compiler")
+#    define LZ4_DEPRECATED(message)
+#  endif
+#endif /* LZ4_DEPRECATE_WARNING_DEFBLOCK */
+
+/* Obsolete compression functions */
+/* These functions are planned to start generate warnings by r131 approximately */
+int LZ4_compress               (const char* source, char* dest, int sourceSize);
+int LZ4_compress_limitedOutput (const char* source, char* dest, int sourceSize, int maxOutputSize);
+int LZ4_compress_withState               (void* state, const char* source, char* dest, int inputSize);
+int LZ4_compress_limitedOutput_withState (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);
+int LZ4_compress_continue                (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize);
+int LZ4_compress_limitedOutput_continue  (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize, int maxOutputSize);
+
+/* Obsolete decompression functions */
+/* These function names are completely deprecated and must no longer be used.
+   They are only provided here for compatibility with older programs.
+    - LZ4_uncompress is the same as LZ4_decompress_fast
+    - LZ4_uncompress_unknownOutputSize is the same as LZ4_decompress_safe
+   These function prototypes are now disabled; uncomment them only if you really need them.
+   It is highly recommended to stop using these prototypes and migrate to maintained ones */
+/* int LZ4_uncompress (const char* source, char* dest, int outputSize); */
+/* int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize); */
+
+/* Obsolete streaming functions; use new streaming interface whenever possible */
+LZ4_DEPRECATED("use LZ4_createStream() instead") void* LZ4_create (char* inputBuffer);
+LZ4_DEPRECATED("use LZ4_createStream() instead") int   LZ4_sizeofStreamState(void);
+LZ4_DEPRECATED("use LZ4_resetStream() instead")  int   LZ4_resetStreamState(void* state, char* inputBuffer);
+LZ4_DEPRECATED("use LZ4_saveDict() instead")     char* LZ4_slideInputBuffer (void* state);
+
+/* Obsolete streaming decoding functions */
+LZ4_DEPRECATED("use LZ4_decompress_safe_usingDict() instead") int LZ4_decompress_safe_withPrefix64k (const char* src, char* dst, int compressedSize, int maxDstSize);
+LZ4_DEPRECATED("use LZ4_decompress_fast_usingDict() instead") int LZ4_decompress_fast_withPrefix64k (const char* src, char* dst, int originalSize);
+
+
+#if defined (__cplusplus)
+}
+#endif
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Info.plist b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Info.plist
new file mode 100644
index 000000000..c67923c7d
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Info.plist	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>15B42</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>ZeroTier One</string>
+	<key>CFBundleIconFile</key>
+	<string>ZeroTierIcon</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zerotier.ZeroTier-One</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>ZeroTier One</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>7B1005</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>15A278</string>
+	<key>DTSDKName</key>
+	<string>macosx10.11</string>
+	<key>DTXcode</key>
+	<string>0711</string>
+	<key>DTXcodeBuild</key>
+	<string>7B1005</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.7</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/MacOS/ZeroTier One b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/MacOS/ZeroTier One
new file mode 100755
index 000000000..8e38b861a
Binary files /dev/null and b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/MacOS/ZeroTier One differ
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/PkgInfo b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/PkgInfo
new file mode 100644
index 000000000..bd04210fb
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/PkgInfo	
@@ -0,0 +1 @@
+APPL????
\ No newline at end of file
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/ZeroTierIcon.icns b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/ZeroTierIcon.icns
new file mode 100644
index 000000000..17e60d587
Binary files /dev/null and b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/ZeroTierIcon.icns differ
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Credits.rtf b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Credits.rtf
new file mode 100644
index 000000000..6f388f662
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Credits.rtf	
@@ -0,0 +1,13 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\vieww9600\viewh8400\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+
+\f0\b\fs24 \cf0 (c)2011-2015 ZeroTier, Inc.\
+Licensed under the GNU GPLv3\
+\
+UI Wrapper MacGap (c) Twitter, Inc.\
+Licensed under the MIT License\
+http://macgap.com/\
+}
\ No newline at end of file
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/InfoPlist.strings b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/InfoPlist.strings
new file mode 100644
index 000000000..5e45963c3
Binary files /dev/null and b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/InfoPlist.strings differ
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/MainMenu.nib b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/MainMenu.nib
new file mode 100644
index 000000000..bac7faa79
Binary files /dev/null and b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/MainMenu.nib differ
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Window.nib b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Window.nib
new file mode 100644
index 000000000..e7b174a1c
Binary files /dev/null and b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Window.nib differ
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources
new file mode 100644
index 000000000..5e334db0c
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources	
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/ZeroTierIcon.icns</key>
+		<data>
+		430Gd+4+jnim7WxXEEugp6G+Tgk=
+		</data>
+		<key>Resources/en.lproj/Credits.rtf</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			ePttkAH2X1GJ6OL0UhDBAktxB3Y=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/en.lproj/InfoPlist.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			MiLKDDnrUKr4EmuvhS5VQwxHGK8=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/en.lproj/MainMenu.nib</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			8JZXf4/3df3LD+o74Y8WM0dV8io=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/en.lproj/Window.nib</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			aP0mIANPPnnTMmxYlELioz9ZO1I=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Resources/ZeroTierIcon.icns</key>
+		<data>
+		430Gd+4+jnim7WxXEEugp6G+Tgk=
+		</data>
+		<key>Resources/en.lproj/Credits.rtf</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			ePttkAH2X1GJ6OL0UhDBAktxB3Y=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/en.lproj/InfoPlist.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			MiLKDDnrUKr4EmuvhS5VQwxHGK8=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/en.lproj/MainMenu.nib</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			8JZXf4/3df3LD+o74Y8WM0dV8io=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/en.lproj/Window.nib</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			aP0mIANPPnnTMmxYlELioz9ZO1I=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/ext/mac-ui-macgap1-wrapper/src/LICENSE b/ext/mac-ui-macgap1-wrapper/src/LICENSE
new file mode 100644
index 000000000..c7fd4a4a5
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/LICENSE
@@ -0,0 +1,25 @@
+MacGap was ported from phonegap-mac, and is under the same license (MIT)
+
+The MIT License
+*****************
+
+Copyright (c) <2012> <Nitobi Software Inc., et. al., >
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ 
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..775c59641
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.pbxproj
@@ -0,0 +1,489 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1495814F15C15CCC00E1CFE5 /* Notice.m in Sources */ = {isa = PBXBuildFile; fileRef = 1495814E15C15CCC00E1CFE5 /* Notice.m */; };
+		6F169DA718CC332E005EDDF3 /* Command.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F169DA618CC332E005EDDF3 /* Command.m */; };
+		6F169DAA18CC35FD005EDDF3 /* CallbackDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F169DA918CC35FD005EDDF3 /* CallbackDelegate.m */; };
+		6F169DAC18CD8A4A005EDDF3 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F169DAB18CD8A4A005EDDF3 /* JavaScriptCore.framework */; };
+		6F169DB118CD906F005EDDF3 /* MenuItemProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F169DAE18CD906F005EDDF3 /* MenuItemProxy.m */; };
+		6F169DB218CD906F005EDDF3 /* MenuProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F169DB018CD906F005EDDF3 /* MenuProxy.m */; };
+		6FD672B618FE618E00C0DAAD /* UserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FD672B518FE618E00C0DAAD /* UserDefaults.m */; };
+		6FD6E4ED18C2D48C00DFFBE6 /* fonts.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FD6E4EC18C2D48C00DFFBE6 /* fonts.m */; };
+		88746BEE14CCA435001E160E /* JSEventHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 88746BED14CCA435001E160E /* JSEventHelper.m */; };
+		88C0646014BDE10A00E4BCE2 /* Window.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C0645F14BDE10A00E4BCE2 /* Window.m */; };
+		88C0646614BDEC5800E4BCE2 /* Window.xib in Resources */ = {isa = PBXBuildFile; fileRef = 88C0646414BDEC5800E4BCE2 /* Window.xib */; };
+		88C0646D14BDF6A600E4BCE2 /* WindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C0646C14BDF6A600E4BCE2 /* WindowController.m */; };
+		C14EFCA71B0986AF00894B5F /* ZeroTierIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = C14EFCA61B0986AF00894B5F /* ZeroTierIcon.icns */; };
+		C1C2B9911AFB0CF10060D7C2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C2B9901AFB0CF10060D7C2 /* Security.framework */; };
+		F2B80016179E0FC100B069A8 /* Clipboard.m in Sources */ = {isa = PBXBuildFile; fileRef = F2B80015179E0FC100B069A8 /* Clipboard.m */; };
+		FA32509D14BA813600BF0781 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA32509C14BA813600BF0781 /* WebKit.framework */; };
+		FA3250C314BA85E700BF0781 /* ContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250BC14BA85E700BF0781 /* ContentView.m */; };
+		FA3250C514BA85E700BF0781 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250BE14BA85E700BF0781 /* Utils.m */; };
+		FA3250C714BA85E700BF0781 /* WebViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250C014BA85E700BF0781 /* WebViewDelegate.m */; };
+		FA3250D314BA860800BF0781 /* App.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250C914BA860800BF0781 /* App.m */; };
+		FA3250D514BA860800BF0781 /* Dock.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250CB14BA860800BF0781 /* Dock.m */; };
+		FA3250D914BA860800BF0781 /* Path.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250CF14BA860800BF0781 /* Path.m */; };
+		FA3250DB14BA860800BF0781 /* Sound.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3250D114BA860800BF0781 /* Sound.m */; };
+		FA3F7742168F70790027B324 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA3F7741168F70780027B324 /* Cocoa.framework */; };
+		FAE451C914BA79C600190544 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = FAE451C714BA79C600190544 /* InfoPlist.strings */; };
+		FAE451CB14BA79C600190544 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE451CA14BA79C600190544 /* main.m */; };
+		FAE451CF14BA79C600190544 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = FAE451CD14BA79C600190544 /* Credits.rtf */; };
+		FAE451D214BA79C600190544 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE451D114BA79C600190544 /* AppDelegate.m */; };
+		FAE451D514BA79C600190544 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = FAE451D314BA79C600190544 /* MainMenu.xib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		FA3250DD14BA876F00BF0781 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1495814D15C15CCC00E1CFE5 /* Notice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notice.h; path = Classes/Commands/Notice.h; sourceTree = "<group>"; };
+		1495814E15C15CCC00E1CFE5 /* Notice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Notice.m; path = Classes/Commands/Notice.m; sourceTree = "<group>"; };
+		6F169DA518CC332E005EDDF3 /* Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Command.h; path = Classes/Commands/Command.h; sourceTree = "<group>"; };
+		6F169DA618CC332E005EDDF3 /* Command.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Command.m; path = Classes/Commands/Command.m; sourceTree = "<group>"; };
+		6F169DA818CC35FD005EDDF3 /* CallbackDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CallbackDelegate.h; path = Classes/CallbackDelegate.h; sourceTree = "<group>"; };
+		6F169DA918CC35FD005EDDF3 /* CallbackDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CallbackDelegate.m; path = Classes/CallbackDelegate.m; sourceTree = "<group>"; };
+		6F169DAB18CD8A4A005EDDF3 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		6F169DAD18CD906F005EDDF3 /* MenuItemProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MenuItemProxy.h; path = Classes/Commands/MenuItemProxy.h; sourceTree = "<group>"; };
+		6F169DAE18CD906F005EDDF3 /* MenuItemProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MenuItemProxy.m; path = Classes/Commands/MenuItemProxy.m; sourceTree = "<group>"; };
+		6F169DAF18CD906F005EDDF3 /* MenuProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MenuProxy.h; path = Classes/Commands/MenuProxy.h; sourceTree = "<group>"; };
+		6F169DB018CD906F005EDDF3 /* MenuProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MenuProxy.m; path = Classes/Commands/MenuProxy.m; sourceTree = "<group>"; };
+		6FD672B418FE618E00C0DAAD /* UserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UserDefaults.h; path = Classes/Commands/UserDefaults.h; sourceTree = "<group>"; };
+		6FD672B518FE618E00C0DAAD /* UserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UserDefaults.m; path = Classes/Commands/UserDefaults.m; sourceTree = "<group>"; };
+		6FD6E4EB18C2D48200DFFBE6 /* fonts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fonts.h; path = Classes/Commands/fonts.h; sourceTree = "<group>"; };
+		6FD6E4EC18C2D48C00DFFBE6 /* fonts.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = fonts.m; path = Classes/Commands/fonts.m; sourceTree = "<group>"; };
+		88746BEC14CCA435001E160E /* JSEventHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSEventHelper.h; path = Classes/JSEventHelper.h; sourceTree = "<group>"; };
+		88746BED14CCA435001E160E /* JSEventHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JSEventHelper.m; path = Classes/JSEventHelper.m; sourceTree = "<group>"; };
+		88C0645E14BDE10A00E4BCE2 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Window.h; path = Classes/Window.h; sourceTree = "<group>"; };
+		88C0645F14BDE10A00E4BCE2 /* Window.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Window.m; path = Classes/Window.m; sourceTree = "<group>"; };
+		88C0646514BDEC5800E4BCE2 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Window.xib; sourceTree = "<group>"; };
+		88C0646B14BDF6A600E4BCE2 /* WindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowController.h; sourceTree = "<group>"; };
+		88C0646C14BDF6A600E4BCE2 /* WindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WindowController.m; sourceTree = "<group>"; };
+		C14EFCA61B0986AF00894B5F /* ZeroTierIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = ZeroTierIcon.icns; path = ../../../../artwork/ZeroTierIcon.icns; sourceTree = "<group>"; };
+		C1C2B9901AFB0CF10060D7C2 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		F2B80014179E0FC100B069A8 /* Clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Clipboard.h; sourceTree = "<group>"; };
+		F2B80015179E0FC100B069A8 /* Clipboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Clipboard.m; sourceTree = "<group>"; };
+		FA32509C14BA813600BF0781 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		FA3250BA14BA85E700BF0781 /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Constants.h; path = Classes/Constants.h; sourceTree = "<group>"; };
+		FA3250BB14BA85E700BF0781 /* ContentView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ContentView.h; path = Classes/ContentView.h; sourceTree = "<group>"; };
+		FA3250BC14BA85E700BF0781 /* ContentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ContentView.m; path = Classes/ContentView.m; sourceTree = "<group>"; };
+		FA3250BD14BA85E700BF0781 /* Utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = Classes/Utils.h; sourceTree = "<group>"; };
+		FA3250BE14BA85E700BF0781 /* Utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = Classes/Utils.m; sourceTree = "<group>"; };
+		FA3250BF14BA85E700BF0781 /* WebViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebViewDelegate.h; path = Classes/WebViewDelegate.h; sourceTree = "<group>"; };
+		FA3250C014BA85E700BF0781 /* WebViewDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = WebViewDelegate.m; path = Classes/WebViewDelegate.m; sourceTree = "<group>"; };
+		FA3250C814BA860800BF0781 /* App.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = App.h; path = Classes/Commands/App.h; sourceTree = "<group>"; };
+		FA3250C914BA860800BF0781 /* App.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = App.m; path = Classes/Commands/App.m; sourceTree = "<group>"; };
+		FA3250CA14BA860800BF0781 /* Dock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Dock.h; path = Classes/Commands/Dock.h; sourceTree = "<group>"; };
+		FA3250CB14BA860800BF0781 /* Dock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = Dock.m; path = Classes/Commands/Dock.m; sourceTree = "<group>"; };
+		FA3250CE14BA860800BF0781 /* Path.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Path.h; path = Classes/Commands/Path.h; sourceTree = "<group>"; };
+		FA3250CF14BA860800BF0781 /* Path.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = Path.m; path = Classes/Commands/Path.m; sourceTree = "<group>"; };
+		FA3250D014BA860800BF0781 /* Sound.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Sound.h; path = Classes/Commands/Sound.h; sourceTree = "<group>"; };
+		FA3250D114BA860800BF0781 /* Sound.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = Sound.m; path = Classes/Commands/Sound.m; sourceTree = "<group>"; };
+		FA3F7741168F70780027B324 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
+		FAE451BA14BA79C600190544 /* ZeroTier One.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ZeroTier One.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		FAE451BE14BA79C600190544 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		FAE451C114BA79C600190544 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		FAE451C214BA79C600190544 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+		FAE451C314BA79C600190544 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		FAE451C614BA79C600190544 /* MacGap-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MacGap-Info.plist"; sourceTree = "<group>"; };
+		FAE451C814BA79C600190544 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		FAE451CA14BA79C600190544 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		FAE451CC14BA79C600190544 /* MacGap-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MacGap-Prefix.pch"; sourceTree = "<group>"; };
+		FAE451CE14BA79C600190544 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
+		FAE451D014BA79C600190544 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		FAE451D114BA79C600190544 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		FAE451D414BA79C600190544 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		FAE451B714BA79C600190544 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C1C2B9911AFB0CF10060D7C2 /* Security.framework in Frameworks */,
+				6F169DAC18CD8A4A005EDDF3 /* JavaScriptCore.framework in Frameworks */,
+				FA3F7742168F70790027B324 /* Cocoa.framework in Frameworks */,
+				FA32509D14BA813600BF0781 /* WebKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		FA3250E014BA87B800BF0781 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				FA3250E114BA87DD00BF0781 /* Commands */,
+				FA3250BA14BA85E700BF0781 /* Constants.h */,
+				6F169DA818CC35FD005EDDF3 /* CallbackDelegate.h */,
+				6F169DA918CC35FD005EDDF3 /* CallbackDelegate.m */,
+				FA3250BB14BA85E700BF0781 /* ContentView.h */,
+				FA3250BC14BA85E700BF0781 /* ContentView.m */,
+				FA3250BF14BA85E700BF0781 /* WebViewDelegate.h */,
+				FA3250C014BA85E700BF0781 /* WebViewDelegate.m */,
+				88C0646B14BDF6A600E4BCE2 /* WindowController.h */,
+				88C0646C14BDF6A600E4BCE2 /* WindowController.m */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		FA3250E114BA87DD00BF0781 /* Commands */ = {
+			isa = PBXGroup;
+			children = (
+				6F169DA518CC332E005EDDF3 /* Command.h */,
+				6F169DA618CC332E005EDDF3 /* Command.m */,
+				1495814D15C15CCC00E1CFE5 /* Notice.h */,
+				1495814E15C15CCC00E1CFE5 /* Notice.m */,
+				FA3250CA14BA860800BF0781 /* Dock.h */,
+				FA3250CB14BA860800BF0781 /* Dock.m */,
+				6FD6E4EB18C2D48200DFFBE6 /* fonts.h */,
+				6FD6E4EC18C2D48C00DFFBE6 /* fonts.m */,
+				FA3250BD14BA85E700BF0781 /* Utils.h */,
+				FA3250BE14BA85E700BF0781 /* Utils.m */,
+				6FD672B418FE618E00C0DAAD /* UserDefaults.h */,
+				6FD672B518FE618E00C0DAAD /* UserDefaults.m */,
+				FA3250CE14BA860800BF0781 /* Path.h */,
+				FA3250CF14BA860800BF0781 /* Path.m */,
+				FA3250D014BA860800BF0781 /* Sound.h */,
+				FA3250D114BA860800BF0781 /* Sound.m */,
+				FA3250C814BA860800BF0781 /* App.h */,
+				FA3250C914BA860800BF0781 /* App.m */,
+				6F169DAD18CD906F005EDDF3 /* MenuItemProxy.h */,
+				6F169DAE18CD906F005EDDF3 /* MenuItemProxy.m */,
+				6F169DAF18CD906F005EDDF3 /* MenuProxy.h */,
+				6F169DB018CD906F005EDDF3 /* MenuProxy.m */,
+				88C0645E14BDE10A00E4BCE2 /* Window.h */,
+				88C0645F14BDE10A00E4BCE2 /* Window.m */,
+				88746BEC14CCA435001E160E /* JSEventHelper.h */,
+				88746BED14CCA435001E160E /* JSEventHelper.m */,
+				F2B80014179E0FC100B069A8 /* Clipboard.h */,
+				F2B80015179E0FC100B069A8 /* Clipboard.m */,
+			);
+			name = Commands;
+			sourceTree = "<group>";
+		};
+		FAE451AF14BA79C600190544 = {
+			isa = PBXGroup;
+			children = (
+				FA3F7741168F70780027B324 /* Cocoa.framework */,
+				FAE451C414BA79C600190544 /* MacGap */,
+				FAE451BD14BA79C600190544 /* Frameworks */,
+				FAE451BB14BA79C600190544 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		FAE451BB14BA79C600190544 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				FAE451BA14BA79C600190544 /* ZeroTier One.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		FAE451BD14BA79C600190544 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				C1C2B9901AFB0CF10060D7C2 /* Security.framework */,
+				6F169DAB18CD8A4A005EDDF3 /* JavaScriptCore.framework */,
+				FA32509C14BA813600BF0781 /* WebKit.framework */,
+				FAE451BE14BA79C600190544 /* Cocoa.framework */,
+				FAE451C014BA79C600190544 /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		FAE451C014BA79C600190544 /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				FAE451C114BA79C600190544 /* AppKit.framework */,
+				FAE451C214BA79C600190544 /* CoreData.framework */,
+				FAE451C314BA79C600190544 /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		FAE451C414BA79C600190544 /* MacGap */ = {
+			isa = PBXGroup;
+			children = (
+				FA3250E014BA87B800BF0781 /* Classes */,
+				FAE451D014BA79C600190544 /* AppDelegate.h */,
+				FAE451D114BA79C600190544 /* AppDelegate.m */,
+				C14EFCA61B0986AF00894B5F /* ZeroTierIcon.icns */,
+				FAE451D314BA79C600190544 /* MainMenu.xib */,
+				88C0646414BDEC5800E4BCE2 /* Window.xib */,
+				FAE451C514BA79C600190544 /* Supporting Files */,
+			);
+			path = MacGap;
+			sourceTree = "<group>";
+		};
+		FAE451C514BA79C600190544 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				FAE451C614BA79C600190544 /* MacGap-Info.plist */,
+				FAE451C714BA79C600190544 /* InfoPlist.strings */,
+				FAE451CA14BA79C600190544 /* main.m */,
+				FAE451CC14BA79C600190544 /* MacGap-Prefix.pch */,
+				FAE451CD14BA79C600190544 /* Credits.rtf */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		FAE451B914BA79C600190544 /* MacGap */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = FAE451D814BA79C600190544 /* Build configuration list for PBXNativeTarget "MacGap" */;
+			buildPhases = (
+				FAE451B814BA79C600190544 /* Resources */,
+				FAE451B614BA79C600190544 /* Sources */,
+				FAE451B714BA79C600190544 /* Frameworks */,
+				FA3250DD14BA876F00BF0781 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = MacGap;
+			productName = MacGap;
+			productReference = FAE451BA14BA79C600190544 /* ZeroTier One.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		FAE451B114BA79C600190544 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0710;
+				ORGANIZATIONNAME = Twitter;
+			};
+			buildConfigurationList = FAE451B414BA79C600190544 /* Build configuration list for PBXProject "MacGap" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = FAE451AF14BA79C600190544;
+			productRefGroup = FAE451BB14BA79C600190544 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				FAE451B914BA79C600190544 /* MacGap */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		FAE451B814BA79C600190544 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C14EFCA71B0986AF00894B5F /* ZeroTierIcon.icns in Resources */,
+				FAE451C914BA79C600190544 /* InfoPlist.strings in Resources */,
+				FAE451CF14BA79C600190544 /* Credits.rtf in Resources */,
+				FAE451D514BA79C600190544 /* MainMenu.xib in Resources */,
+				88C0646614BDEC5800E4BCE2 /* Window.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		FAE451B614BA79C600190544 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6F169DAA18CC35FD005EDDF3 /* CallbackDelegate.m in Sources */,
+				FA3250D314BA860800BF0781 /* App.m in Sources */,
+				FA3250D514BA860800BF0781 /* Dock.m in Sources */,
+				FA3250D914BA860800BF0781 /* Path.m in Sources */,
+				FA3250DB14BA860800BF0781 /* Sound.m in Sources */,
+				FA3250C314BA85E700BF0781 /* ContentView.m in Sources */,
+				FA3250C514BA85E700BF0781 /* Utils.m in Sources */,
+				FA3250C714BA85E700BF0781 /* WebViewDelegate.m in Sources */,
+				FAE451CB14BA79C600190544 /* main.m in Sources */,
+				6F169DB118CD906F005EDDF3 /* MenuItemProxy.m in Sources */,
+				FAE451D214BA79C600190544 /* AppDelegate.m in Sources */,
+				6F169DA718CC332E005EDDF3 /* Command.m in Sources */,
+				6FD672B618FE618E00C0DAAD /* UserDefaults.m in Sources */,
+				88C0646014BDE10A00E4BCE2 /* Window.m in Sources */,
+				6F169DB218CD906F005EDDF3 /* MenuProxy.m in Sources */,
+				88C0646D14BDF6A600E4BCE2 /* WindowController.m in Sources */,
+				6FD6E4ED18C2D48C00DFFBE6 /* fonts.m in Sources */,
+				88746BEE14CCA435001E160E /* JSEventHelper.m in Sources */,
+				1495814F15C15CCC00E1CFE5 /* Notice.m in Sources */,
+				F2B80016179E0FC100B069A8 /* Clipboard.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		88C0646414BDEC5800E4BCE2 /* Window.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				88C0646514BDEC5800E4BCE2 /* en */,
+			);
+			name = Window.xib;
+			sourceTree = "<group>";
+		};
+		FAE451C714BA79C600190544 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				FAE451C814BA79C600190544 /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		FAE451CD14BA79C600190544 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				FAE451CE14BA79C600190544 /* en */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		FAE451D314BA79C600190544 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				FAE451D414BA79C600190544 /* en */,
+			);
+			name = MainMenu.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		FAE451D614BA79C600190544 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "ZeroTier One";
+				SDKROOT = "";
+			};
+			name = Debug;
+		};
+		FAE451D714BA79C600190544 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_NAME = "ZeroTier One";
+				SDKROOT = "";
+			};
+			name = Release;
+		};
+		FAE451D914BA79C600190544 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
+				CLANG_CXX_LIBRARY = "compiler-default";
+				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/MacGap\"",
+				);
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "MacGap/MacGap-Prefix.pch";
+				GCC_VERSION = "";
+				INFOPLIST_FILE = "MacGap/MacGap-Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.zerotier.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = "ZeroTier One";
+				SDKROOT = macosx;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Debug;
+		};
+		FAE451DA14BA79C600190544 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
+				CLANG_CXX_LIBRARY = "compiler-default";
+				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/MacGap\"",
+				);
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "MacGap/MacGap-Prefix.pch";
+				GCC_VERSION = "";
+				INFOPLIST_FILE = "MacGap/MacGap-Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.zerotier.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = "ZeroTier One";
+				SDKROOT = macosx;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		FAE451B414BA79C600190544 /* Build configuration list for PBXProject "MacGap" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FAE451D614BA79C600190544 /* Debug */,
+				FAE451D714BA79C600190544 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		FAE451D814BA79C600190544 /* Build configuration list for PBXNativeTarget "MacGap" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FAE451D914BA79C600190544 /* Debug */,
+				FAE451DA14BA79C600190544 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = FAE451B114BA79C600190544 /* Project object */;
+}
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 000000000..88f36fc7b
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:MacGap.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout
new file mode 100644
index 000000000..7fdde8531
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcshareddata/MacGap.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>4D486E78-E297-4CC3-AAAE-1A58EDAC87E6</string>
+	<key>IDESourceControlProjectName</key>
+	<string>MacGap</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>ABA3617E9F0148F844A82502F0D808DE6591AA97</key>
+		<string>http://adam.ierymenko@git.int.zerotier.com/zerotier/zerotierone</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>ABA3617E9F0148F844A82502F0D808DE6591AA97</key>
+		<string>../../../../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>http://adam.ierymenko@git.int.zerotier.com/zerotier/zerotierone</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>ABA3617E9F0148F844A82502F0D808DE6591AA97</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>ABA3617E9F0148F844A82502F0D808DE6591AA97</string>
+			<key>IDESourceControlWCCName</key>
+			<string>ZeroTierOne</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 000000000..20281812b
Binary files /dev/null and b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/Alex.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/api.xcuserdatad/WorkspaceSettings.xcsettings b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/api.xcuserdatad/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000..659c8766e
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/api.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+	<true/>
+	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/UserInterfaceState.xcuserstate b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 000000000..822ed3cb6
Binary files /dev/null and b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/WorkspaceSettings.xcsettings b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000..6ff33e603
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/liamks.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+	<true/>
+	<key>IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.h
new file mode 100644
index 000000000..bf7370b50
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.h
@@ -0,0 +1,18 @@
+//
+//  AppDelegate.h
+//  MacGap
+//
+//  Created by Alex MacCaw on 08/01/2012.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "Classes/ContentView.h"
+
+#import "WindowController.h"
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+
+@property (retain, nonatomic) WindowController *windowController;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.m
new file mode 100644
index 000000000..45923bb36
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/AppDelegate.m
@@ -0,0 +1,159 @@
+//
+//  AppDelegate.m
+//  MacGap
+//
+//  Created by Alex MacCaw on 08/01/2012.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "AppDelegate.h"
+#include <sys/stat.h>
+#include <sys/types.h>
+
+@implementation AppDelegate
+
+@synthesize windowController;
+
+- (void) applicationWillFinishLaunching:(NSNotification *)aNotification
+{
+}
+
+-(BOOL)applicationShouldHandleReopen:(NSApplication*)application
+                   hasVisibleWindows:(BOOL)visibleWindows{
+    if(!visibleWindows){
+        [self.windowController.window makeKeyAndOrderFront: nil];
+    }
+    return YES;
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication {
+    return YES;
+}
+
+- (void) applicationDidFinishLaunching:(NSNotification *)aNotification { 
+    char buf[16384],userAuthTokenPath[4096];
+    struct stat systemAuthTokenStat,userAuthTokenStat;
+
+    FILE *pf = fopen("/Library/Application Support/ZeroTier/One/zerotier-one.port","r");
+    long port = 9993; // default
+    if (pf) {
+        long n = fread(buf,1,sizeof(buf)-1,pf);
+        if (n > 0) {
+            buf[n] = (char)0;
+            port = strtol(buf,(char **)0,10);
+        }
+        fclose(pf);
+    }
+
+    char url[16384];
+    memset(url,0,sizeof(url));
+
+    const char *homeDir = getenv("HOME");
+    if (homeDir) {
+        snprintf(userAuthTokenPath,sizeof(userAuthTokenPath),"%s/Library/Application Support/ZeroTier/One/authtoken.secret",homeDir);
+
+        bool userAuthTokenOutOfDate = false;
+        memset(&systemAuthTokenStat,0,sizeof(systemAuthTokenStat));
+        memset(&userAuthTokenStat,0,sizeof(userAuthTokenStat));
+        if (stat("/Library/Application Support/ZeroTier/One/authtoken.secret",&systemAuthTokenStat) == 0) {
+            if (stat(userAuthTokenPath,&userAuthTokenStat) == 0) {
+                if (userAuthTokenStat.st_mtimespec.tv_sec < systemAuthTokenStat.st_mtimespec.tv_sec)
+                    userAuthTokenOutOfDate = true;
+            }
+        }
+
+        if (!userAuthTokenOutOfDate) {
+            pf = fopen(userAuthTokenPath,"r");
+            if (pf) {
+                long n = fread(buf,1,sizeof(buf)-1,pf);
+                if (n > 0) {
+                    buf[n] = (char)0;
+                    snprintf(url,sizeof(url),"http://127.0.0.1:%ld/index.html?authToken=%s",port,buf);
+                }
+                fclose(pf);
+            }
+        }
+    }
+
+    if (!url[0]) {
+        // Create authorization reference
+        OSStatus status;
+        AuthorizationRef authorizationRef;
+        
+        // AuthorizationCreate and pass NULL as the initial
+        // AuthorizationRights set so that the AuthorizationRef gets created
+        // successfully, and then later call AuthorizationCopyRights to
+        // determine or extend the allowable rights.
+        // http://developer.apple.com/qa/qa2001/qa1172.html
+        status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &authorizationRef);
+        if (status != errAuthorizationSuccess)
+        {
+            NSLog(@"Error Creating Initial Authorization: %d", status);
+            return;
+        }
+        
+        // kAuthorizationRightExecute == "system.privilege.admin"
+        AuthorizationItem right = {kAuthorizationRightExecute, 0, NULL, 0};
+        AuthorizationRights rights = {1, &right};
+        AuthorizationFlags flags = kAuthorizationFlagDefaults | kAuthorizationFlagInteractionAllowed |
+        kAuthorizationFlagPreAuthorize | kAuthorizationFlagExtendRights;
+        
+        // Call AuthorizationCopyRights to determine or extend the allowable rights.
+        status = AuthorizationCopyRights(authorizationRef, &rights, NULL, flags, NULL);
+        if (status != errAuthorizationSuccess)
+        {
+            NSLog(@"Copy Rights Unsuccessful: %d", status);
+            return;
+        }
+        
+        // use rm tool with -rf
+        char *tool = "/bin/cat";
+        char *args[] = {"/Library/Application Support/ZeroTier/One/authtoken.secret", NULL};
+        FILE *pipe = NULL;
+        
+        status = AuthorizationExecuteWithPrivileges(authorizationRef, tool, kAuthorizationFlagDefaults, args, &pipe);
+        if (status != errAuthorizationSuccess)
+        {
+            NSLog(@"Error: %d", status);
+        }
+        
+        if (pipe) {
+            long n = (long)fread(buf,1,sizeof(buf)-1,pipe);
+            if (n > 0) {
+                buf[n] = (char)0;
+                snprintf(url,sizeof(url),"http://127.0.0.1:%ld/index.html?authToken=%s",port,buf);
+
+                if (homeDir) {
+                    snprintf(userAuthTokenPath,sizeof(userAuthTokenPath),"%s/Library/Application Support/ZeroTier",homeDir);
+                    mkdir(userAuthTokenPath,0755);
+                    snprintf(userAuthTokenPath,sizeof(userAuthTokenPath),"%s/Library/Application Support/ZeroTier/One",homeDir);
+                    mkdir(userAuthTokenPath,0755);
+                    snprintf(userAuthTokenPath,sizeof(userAuthTokenPath),"%s/Library/Application Support/ZeroTier/One/authtoken.secret",homeDir);
+                    pf = fopen(userAuthTokenPath,"w");
+                    if (pf) {
+                        fwrite(buf,1,strlen(buf),pf);
+                        fclose(pf);
+                        chmod(userAuthTokenPath,0600);
+                    }
+                }
+            }
+            fclose(pipe);
+        }
+
+        // The only way to guarantee that a credential acquired when you
+        // request a right is not shared with other authorization instances is
+        // to destroy the credential.  To do so, call the AuthorizationFree
+        // function with the flag kAuthorizationFlagDestroyRights.
+        // http://developer.apple.com/documentation/Security/Conceptual/authorization_concepts/02authconcepts/chapter_2_section_7.html
+        status = AuthorizationFree(authorizationRef, kAuthorizationFlagDestroyRights);
+    }
+
+    NSString *urlStr = [[NSString alloc] initWithCString:url];
+    self.windowController = [[WindowController alloc] initWithURL: urlStr];
+    [self.windowController showWindow: [NSApplication sharedApplication].delegate];
+    self.windowController.contentView.webView.alphaValue = 1.0;
+    self.windowController.contentView.alphaValue = 1.0;
+    [self.windowController showWindow:self];
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.h
new file mode 100755
index 000000000..0f31ee417
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.h
@@ -0,0 +1,20 @@
+//
+//  CallbackDelegate.h
+//  MacGap
+//
+//  Created by Joe Hildebrand on 1/10/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "Command.h"
+
+@interface CallbackDelegate : Command {
+}
+
+@property JSObjectRef callback;
+
+- (id) initWithContext:(JSContextRef)aContext forCallback:(WebScriptObject*)aCallback;
+- (id) call;
+- (id) callWithParams:(id)firstOrNil, ... NS_REQUIRES_NIL_TERMINATION;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.m
new file mode 100755
index 000000000..5ce8fbe33
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/CallbackDelegate.m
@@ -0,0 +1,168 @@
+//
+//  CallbackDelegate.m
+//  MacGap
+//
+//  Created by Joe Hildebrand on 1/10/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "CallbackDelegate.h"
+#import <JavaScriptCore/JavaScript.h>
+
+@implementation CallbackDelegate
+
+@synthesize callback;
+
+- (id) initWithContext:(JSContextRef)aContext forCallback:(WebScriptObject*)aCallback
+{
+    if (!aCallback)
+        return nil;
+    if ([aCallback isKindOfClass:[WebUndefined class]])
+        return nil;
+    
+    self = [super initWithContext:aContext];
+    if (!self)
+        return nil;
+
+    callback = [aCallback JSObject];
+    JSValueProtect(context, callback);
+    return self;
+}
+
+- (void) dealloc
+{
+    if (callback)
+    {
+        JSValueUnprotect(context, callback);
+        callback = nil;
+    }
+}
+
+- (id) objectFromValue:(JSValueRef)val
+{
+    JSStringRef jstr;
+    NSString *rets;
+    
+    switch(JSValueGetType(context, val))
+    {
+        case kJSTypeUndefined:
+        case kJSTypeNull:
+            return nil;
+        case kJSTypeBoolean:
+            return [NSNumber numberWithBool:JSValueToBoolean(context, val)];
+        case kJSTypeNumber:
+            return [NSNumber numberWithDouble:JSValueToNumber(context, val, NULL)];
+        case kJSTypeString:
+            jstr = JSValueToStringCopy(context, val, NULL);
+            size_t sz = JSStringGetMaximumUTF8CStringSize(jstr);
+            char *buf = (char*)malloc(sz);
+            JSStringGetUTF8CString(jstr, buf, sz);
+            rets = [NSString stringWithUTF8String:buf];
+            free(buf);
+            return rets;
+        case kJSTypeObject:
+            // TODO: dictionary or something
+            return nil;
+        default:
+            NSAssert(false, @"Invalid JavaScript type");
+            return nil;
+    }
+}
+
+- (JSValueRef) valueFromObject:(id)obj
+{
+    JSValueRef val = nil;
+    if (!obj)
+    {
+        val = JSValueMakeNull(context);
+    }
+    else if ([obj isKindOfClass:[NSString class]])
+    {
+        JSStringRef jstr = JSStringCreateWithUTF8CString([obj UTF8String]);
+        val = JSValueMakeString(context, jstr); 
+        JSStringRelease(jstr);         
+    }
+    else if ([obj isKindOfClass:[NSNumber class]])
+    {
+        val = JSValueMakeNumber(context, [obj doubleValue]);
+    }
+    else if ([obj isKindOfClass:[NSDictionary class]])
+    {
+        JSObjectRef o = JSObjectMake(context, NULL, NULL);
+        for (NSString *key in obj) 
+        {
+            JSStringRef kstr = JSStringCreateWithUTF8CString([key UTF8String]);
+            JSValueRef v = [self valueFromObject:[obj objectForKey:key]];
+            
+            JSObjectSetProperty(context, o, kstr, v, kJSPropertyAttributeNone, NULL);
+            JSStringRelease(kstr);         
+        }
+        val = o;
+    }
+    else if ([obj isKindOfClass:[NSArray class]])
+    {
+        NSUInteger pcount = [obj count];
+        JSValueRef jsArgs[pcount];
+        NSUInteger i=0;
+        for (id v in obj)
+        {
+            jsArgs[i++] = [self valueFromObject:v];
+        }
+        val = JSObjectMakeArray(context, pcount, jsArgs, NULL);
+    }
+    else if ([obj isKindOfClass:[NSDate class]])
+    {
+        NSTimeInterval secs = [obj timeIntervalSince1970];
+        JSValueRef jsArgs[1];
+        // call the Date(milliseconds) constructor in JS
+        jsArgs[0] = JSValueMakeNumber(context, secs * 1000.0);
+        val = JSObjectMakeDate(context, 1, jsArgs, NULL);
+    }
+    else
+    {
+        NSLog(@"Warning: unknown object type for: %@", obj);
+        val = JSValueMakeUndefined(context);
+    }
+    return val;
+}
+
+- (id) call
+{
+    NSAssert(callback, @"Callback required");
+    if (!JSObjectIsFunction(context, callback))
+        return nil;
+    
+    JSValueRef jsArgs[0];
+    JSValueRef ret = JSObjectCallAsFunction(context, callback, NULL, 0, jsArgs, NULL);
+    return [self objectFromValue:ret];    
+}
+
+- (id) callWithParams:(id)firstOrNil, ...
+{
+    NSAssert(callback, @"Callback required");
+    if (!JSObjectIsFunction(context, callback))
+        return nil;
+    NSUInteger pcount = 0;
+    id p;
+    va_list args;
+    va_start(args, firstOrNil);
+    for (p=firstOrNil; p; p=va_arg(args, id))
+    {
+        pcount++;
+    }
+    va_end(args);
+    
+    JSValueRef jsArgs[pcount];
+    NSUInteger j = 0;
+    va_start(args, firstOrNil);
+    for (p=firstOrNil; p; p=va_arg(args, id))
+    {
+        jsArgs[j++] = [self valueFromObject:p];
+    }
+    va_end(args);
+    
+    JSValueRef ret = JSObjectCallAsFunction(context, callback, NULL, j, jsArgs, NULL);
+    return [self objectFromValue:ret];
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.h
new file mode 100644
index 000000000..f65ba61e1
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.h
@@ -0,0 +1,21 @@
+#import <Foundation/Foundation.h>
+
+#import "WindowController.h"
+
+@interface App : NSObject {
+
+}
+
+@property (nonatomic, retain) WebView *webView;
+
+- (id) initWithWebView:(WebView *)view;
+
+- (void) terminate;
+- (void) activate;
+- (void) hide;
+- (void) unhide;
+- (void) beep;
+- (void) bounce;
+- (void) setCustomUserAgent:(NSString *)userAgentString;
+- (NSNumber*) systemIdleTime;
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.m
new file mode 100644
index 000000000..6d47a17e1
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/App.m
@@ -0,0 +1,128 @@
+#import "App.h"
+
+#import "JSEventHelper.h"
+
+@implementation App
+
+@synthesize webView;
+
+- (id) initWithWebView:(WebView *) view{
+    self = [super init];
+    
+    if (self) {
+        self.webView = view;
+        [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self 
+                                                               selector: @selector(receiveSleepNotification:) 
+                                                                   name: NSWorkspaceWillSleepNotification object: NULL];
+        [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self 
+                                                               selector: @selector(receiveWakeNotification:) 
+                                                                   name: NSWorkspaceDidWakeNotification object: NULL];
+        [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: self
+                                                               selector: @selector(receiveActivateNotification:)
+                                                                   name: NSWorkspaceDidActivateApplicationNotification object: NULL];
+    }
+
+    return self;
+}
+
+- (void) terminate {
+    [NSApp terminate:nil];
+}
+
+- (void) activate {
+    [NSApp activateIgnoringOtherApps:YES];
+}
+
+- (void) hide {
+    [NSApp hide:nil];
+}
+
+- (void) unhide {
+    [NSApp unhide:nil];
+}
+
+- (void)beep {
+    NSBeep();
+}
+
+- (void) bounce {
+    [NSApp requestUserAttention:NSInformationalRequest];
+}
+
+- (void)setCustomUserAgent:(NSString *)userAgentString {
+    [self.webView setCustomUserAgent: userAgentString];
+}
+
+- (void) open:(NSString*)url {
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
+}
+
+- (void) launch:(NSString *)name {
+    [[NSWorkspace sharedWorkspace] launchApplication:name];
+}
+
+- (void)receiveSleepNotification:(NSNotification*)note{
+    [JSEventHelper triggerEvent:@"sleep" forWebView:self.webView];
+}
+
+- (void) receiveWakeNotification:(NSNotification*)note{
+    [JSEventHelper triggerEvent:@"wake" forWebView:self.webView];
+}
+
+- (void) receiveActivateNotification:(NSNotification*)notification{
+    NSDictionary* userInfo = [notification userInfo];
+    NSRunningApplication* runningApplication = [userInfo objectForKey:NSWorkspaceApplicationKey];
+    if (runningApplication) {
+        NSMutableDictionary* applicationDidGetFocusDict = [[NSMutableDictionary alloc] initWithCapacity:2];
+        [applicationDidGetFocusDict setObject:runningApplication.localizedName
+                                       forKey:@"localizedName"];
+        [applicationDidGetFocusDict setObject:[runningApplication.bundleURL absoluteString]
+                                       forKey:@"bundleURL"];
+        
+        [JSEventHelper triggerEvent:@"appActivated" withArgs:applicationDidGetFocusDict forWebView:self.webView];
+    }
+}
+
+
+
+
+/*
+ To get the elapsed time since the previous input event—keyboard, mouse, or tablet—specify kCGAnyInputEventType.
+ */
+- (NSNumber*)systemIdleTime {
+    CFTimeInterval timeSinceLastEvent = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateHIDSystemState, kCGAnyInputEventType);
+    
+    return [NSNumber numberWithDouble:timeSinceLastEvent];
+}
+
+
+
+
++ (NSString*) webScriptNameForSelector:(SEL)selector
+{
+	id	result = nil;
+	
+	if (selector == @selector(open:)) {
+		result = @"open";
+	} else if (selector == @selector(launch:)) {
+        result = @"launch";
+    } else if (selector == @selector(setCustomUserAgent:)) {
+        result = @"setCustomUserAgent";
+    } else if (selector == @selector(systemIdleTime)) {
+        result = @"systemIdleTime";
+    }
+
+    return result;
+}
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+    return NO;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return YES;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.h
new file mode 100755
index 000000000..65d6b6d48
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.h
@@ -0,0 +1,18 @@
+//
+//  Command.h
+//  MacGap
+//
+//  Created by Joe Hildebrand on 1/10/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Webkit/WebScriptObject.h>
+
+@interface Command : NSObject {
+    JSContextRef context;
+}
+
+- (id) initWithContext:(JSContextRef)aContext;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.m
new file mode 100755
index 000000000..39b85630a
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Command.m
@@ -0,0 +1,28 @@
+//
+//  Command.m
+//  MacGap
+//
+//  Created by Joe Hildebrand on 1/10/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "Command.h"
+#import <JavaScriptCore/JSContextRef.h>
+
+@implementation Command 
+
+- (id) initWithContext:(JSContextRef)aContext {
+    self = [super init];
+    if (!self)
+        return nil;
+    context = aContext;
+    JSGlobalContextRetain((JSGlobalContextRef)context);
+    return self;
+}
+
+- (void)dealloc
+{
+    if (context)
+        JSGlobalContextRelease((JSGlobalContextRef)context);
+}
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.h
new file mode 100644
index 000000000..b3c533d79
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.h
@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+@interface Dock : NSObject {
+    
+}
+- (void) setBadge:(NSString*)value;
+- (NSString *) badge;
+
+@property (readwrite, copy) NSString *badge;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.m
new file mode 100644
index 000000000..a4494d165
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Dock.m
@@ -0,0 +1,31 @@
+#import "Dock.h"
+
+@implementation Dock
+
+@synthesize badge;
+
+- (void) setBadge:(NSString *)value
+{
+    NSDockTile *tile = [[NSApplication sharedApplication] dockTile];
+    [tile setBadgeLabel:value];
+}
+
+- (NSString *) badge
+{
+    NSDockTile *tile = [[NSApplication sharedApplication] dockTile];
+    return [tile badgeLabel];
+}
+
+#pragma mark WebScripting Protocol
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+    return NO;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return NO;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.h
new file mode 100755
index 000000000..d765978fa
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.h
@@ -0,0 +1,31 @@
+//
+//  MenuItemProxy.h
+//  MacGap
+//
+//  Created by Joe Hildebrand on 1/15/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "Command.h"
+#import "CallbackDelegate.h"
+
+@class MenuProxy;
+
+@interface MenuItemProxy : Command {
+    NSMenuItem *item;
+    CallbackDelegate *callback;
+}
+
++ (MenuItemProxy*) proxyWithContext:(JSContextRef)aContext andMenuItem:(NSMenuItem*)anItem;
+
+- (MenuProxy*)addSubmenu;
+
+- (void) remove;
+- (void) setCallback:(WebScriptObject*)aCallback;
+- (void) setKey:(NSString*)keyCommand;
+- (void) setTitle:(NSString*)title;
+- (void) enable;
+- (void) disable;
+- (MenuProxy*)submenu;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.m
new file mode 100755
index 000000000..7b9702cc4
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuItemProxy.m
@@ -0,0 +1,150 @@
+//
+//  MenuItemProxy.m
+//  MacGap
+//
+//  Created by Joe Hildebrand on 1/15/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "MenuItemProxy.h"
+#import "MenuProxy.h"
+
+@implementation MenuItemProxy
+
+- (id) initWithContext:(JSContextRef)aContext andMenuItem:(NSMenuItem*)anItem
+{
+    NSAssert(anItem, @"anItem required");
+    self = [super initWithContext:aContext];
+    if (!self)
+        return nil;
+    item = anItem;
+    item.representedObject = self;
+
+    return self;
+}
+
++ (MenuItemProxy*) proxyWithContext:(JSContextRef)aContext andMenuItem:(NSMenuItem*)anItem
+{
+    MenuItemProxy *proxy = [anItem representedObject];
+    if (proxy)
+    {
+        NSLog(@"MIP Cache hit");
+        NSAssert([proxy class] == [MenuItemProxy class], @"Bad proxy");
+        return proxy;
+    }
+    return [[MenuItemProxy alloc] initWithContext:aContext andMenuItem:anItem];
+}
+
+- (NSString*) description
+{
+    return [item description];
+}
+
+- (MenuProxy*)addSubmenu
+{
+    NSMenu *s = [item submenu];
+    if (!s)
+    {
+        s = [[NSMenu alloc] initWithTitle:@"FFFFFFOOOOO"];
+        [item setSubmenu:s];
+    }
+    return [MenuProxy proxyWithContext:context andMenu:s];
+}
+
+- (void) remove
+{
+    NSMenu *menu = [item menu];
+    [menu removeItem:item];
+}
+
+- (void)callCallback:(id)sender
+{
+    [callback callWithParams:[sender title], nil];
+}
+
+- (void) setCallback:(WebScriptObject*)aCallback
+{
+    NSAssert(item, @"item required");
+    callback = [[CallbackDelegate alloc] initWithContext:context forCallback:aCallback];
+    [item setAction:@selector(callCallback:)];
+    [item setTarget:self];
+}
+
+- (void)setKey:(NSString*)keyCommand
+{
+    NSString *aKey = [MenuProxy getKeyFromString:keyCommand];
+    [item setKeyEquivalent:aKey];
+    
+    NSUInteger modifiers = [MenuProxy getModifiersFromString:keyCommand];
+    [item setKeyEquivalentModifierMask:modifiers];
+}
+
+- (void) setTitle:(NSString*)title
+{
+    [item setTitle:title];
+}
+
+- (MenuProxy*)submenu;
+{
+    // TODO: make this work as a property
+    NSMenu *s = [item submenu];
+    if (!s)
+        return nil;
+    return [MenuProxy proxyWithContext:context andMenu:s];
+}
+
+- (void) enable
+{
+    [item setEnabled:YES];
+}
+
+- (void) disable
+{
+    [item setEnabled:NO];
+}
+
+#pragma mark WebScripting protocol
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+    return [self webScriptNameForSelector:selector] == nil;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return YES;
+}
+
++ (NSString*) webScriptNameForSelector:(SEL)selector
+{
+	id	result = nil;
+	
+    if (selector == @selector(addSubmenu)) {
+		result = @"addSubmenu";
+	}
+	else if (selector == @selector(remove)) {
+		result = @"remove";
+	}
+	else if (selector == @selector(setCallback:)) {
+		result = @"setCallback";
+	}
+	else if (selector == @selector(setKey:)) {
+		result = @"setKey";
+	}
+	else if (selector == @selector(setTitle:)) {
+		result = @"setTitle";
+	}
+	else if (selector == @selector(submenu)) {
+		result = @"submenu";
+	}
+    else if (selector == @selector(enable)) {
+		result = @"enable";
+	}
+    else if (selector == @selector(disable)) {
+		result = @"disable";
+	}
+	
+	return result;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.h
new file mode 100755
index 000000000..afd6c6edb
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.h
@@ -0,0 +1,31 @@
+//
+//  MenuProxy.h
+//  MacGap
+//
+//  Created by Joe Hildebrand on 1/14/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "Command.h"
+
+@class MenuItemProxy;
+
+@interface MenuProxy : Command {
+    NSMenu *menu;
+}
+
++ (MenuProxy*)proxyWithContext:(JSContextRef)aContext andMenu:(NSMenu*)aMenu;
+
+- (MenuItemProxy*)addItemWithTitle:(NSString*)title
+                     keyEquivalent:(NSString*)aKey
+                          callback:(WebScriptObject*)aCallback
+                           atIndex:(NSInteger)index;
+
+- (MenuItemProxy*)addSeparator;
+- (MenuItemProxy*)itemForKey:(id)key;
+- (MenuProxy*)removeItem:(id)key;
+
++ (NSString*)getKeyFromString:(NSString*)keyCommand;
++ (NSUInteger*)getModifiersFromString:(NSString*)keyCommand;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.m
new file mode 100755
index 000000000..5bc10a763
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/MenuProxy.m
@@ -0,0 +1,233 @@
+//
+//  MenuProxy.m
+//  MacGap
+//
+//  Created by Joe Hildebrand on 1/14/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import <objc/runtime.h>
+#import <JavaScriptCore/JavaScript.h>
+
+#import "MenuProxy.h"
+#import "MenuItemProxy.h"
+
+static char REPRESENTED_OBJECT;
+
+@interface NSMenu (represented)
+@property (strong) id representedObject;
+@end
+
+@implementation NSMenu (represented)
+
+- (id) representedObject
+{
+    return objc_getAssociatedObject(self, &REPRESENTED_OBJECT);
+}
+
+- (void) setRepresentedObject:(id)representedObject
+{
+    objc_setAssociatedObject(self, 
+                             &REPRESENTED_OBJECT,
+                             representedObject, 
+                             OBJC_ASSOCIATION_RETAIN);
+}
+
+@end
+
+@implementation MenuProxy
+
+- (id) initWithContext:(JSContextRef)aContext andMenu:(NSMenu*)aMenu
+{
+    self = [super initWithContext:aContext];
+    if (!self)
+        return nil;
+    menu = aMenu;
+    menu.representedObject = self;
+    return self;
+}
+
++ (MenuProxy*)proxyWithContext:(JSContextRef)aContext andMenu:(NSMenu*)aMenu
+{
+    // singleton-ish.
+    MenuProxy *ret = [aMenu representedObject];
+    if (ret)
+    {
+        NSLog(@"MP cache hit");
+        return ret;
+    }
+    return [[MenuProxy alloc] initWithContext:aContext andMenu:aMenu];
+}
+
+- (void) dealloc
+{
+    menu.representedObject = nil;
+}
+
+- (NSString*) description
+{
+    return [menu description];
+}
+
+static BOOL isNullish(id o)
+{
+    if (!o)
+        return YES;
+    if ([o isKindOfClass:[WebUndefined class]])
+        return YES;
+    return NO;
+}
+
+- (MenuItemProxy*)addItemWithTitle:(NSString*)title
+                     keyEquivalent:(NSString*)keyCommand
+                          callback:(WebScriptObject*)aCallback
+                           atIndex:(NSInteger)index
+{
+    if (isNullish(title))
+        title = @"";
+    
+    NSString *aKey = [MenuProxy getKeyFromString:keyCommand];
+    NSMenuItem *item = nil;
+    
+    if(index) {
+        item = [menu insertItemWithTitle:title action:nil keyEquivalent:aKey atIndex:index ];
+    } else {
+        item = [menu addItemWithTitle:title action:nil keyEquivalent:aKey ];
+        
+    }
+    
+    // Set the modifiers.
+    NSUInteger modifiers = [MenuProxy getModifiersFromString:keyCommand];
+    [item setKeyEquivalentModifierMask:modifiers];
+   
+    if(!menu.supermenu) {
+        NSMenu *s = [[NSMenu alloc] initWithTitle:title];
+        [item setSubmenu:s];
+    }
+   
+    MenuItemProxy *mip = [MenuItemProxy proxyWithContext:context andMenuItem:item];
+    if (!isNullish(aCallback))
+        [mip setCallback:aCallback];
+    
+   
+    return mip;
+}
+
++ (NSString*)getKeyFromString:(NSString*)keyCommand {
+    if (isNullish(keyCommand))
+        keyCommand = @"";
+
+    // Obtain the key (if there are modifiers, it will be the last character).
+    NSString *aKey = @"";
+    if ([keyCommand length] > 0) {
+        aKey = [keyCommand substringFromIndex:[keyCommand length] - 1];
+    }
+
+    return aKey;
+}
+
++ (NSUInteger*)getModifiersFromString:(NSString*)keyCommand {
+    // aKeys may optionally specify one or more modifiers.
+    NSUInteger modifiers = 0;
+    
+    if ([keyCommand rangeOfString:@"caps"].location != NSNotFound) modifiers += NSAlphaShiftKeyMask;
+    if ([keyCommand rangeOfString:@"shift"].location != NSNotFound) modifiers += NSShiftKeyMask;
+    if ([keyCommand rangeOfString:@"cmd"].location != NSNotFound) modifiers += NSCommandKeyMask;
+    if ([keyCommand rangeOfString:@"ctrl"].location != NSNotFound) modifiers += NSControlKeyMask;
+    if ([keyCommand rangeOfString:@"opt"].location != NSNotFound) modifiers += NSAlternateKeyMask;
+    if ([keyCommand rangeOfString:@"alt"].location != NSNotFound) modifiers += NSAlternateKeyMask;
+
+    return modifiers;
+}
+
+- (MenuItemProxy*)addSeparator
+{
+    NSMenuItem *sep = [NSMenuItem separatorItem];
+    [menu addItem:sep];
+    return [MenuItemProxy proxyWithContext:context andMenuItem:sep];
+}
+
+- (MenuItemProxy*)itemForKey:(id)key
+{
+    if (isNullish(key))
+        return nil;
+    NSMenuItem *item = nil;
+    if ([key isKindOfClass:[NSNumber class]])
+    {
+        item = [menu itemAtIndex:[key intValue]];
+    }
+    else if ([key isKindOfClass:[NSString class]])
+    {
+        item = [menu itemWithTitle:key];
+        if (!item)
+        {
+            // Try again, with ... appended. e.g. "Save..."
+            item = [menu itemWithTitle:
+                    [key stringByAppendingString:@"\u2026"]];
+        }
+    }
+    if (!item)
+        return nil;
+
+    return [MenuItemProxy proxyWithContext:context andMenuItem:item];    
+}
+
+- (MenuProxy*)removeItem:(id)key
+{
+    if (isNullish(key))
+        return nil;
+    
+    NSMenuItem *item = nil;
+    if ([key isKindOfClass:[NSNumber class]])
+    {
+        item = [menu itemAtIndex:[key intValue]];
+    }
+    else if ([key isKindOfClass:[NSString class]])
+    {
+        item = [menu itemWithTitle:key];
+        if (!item)
+        {
+            // Try again, with ... appended. e.g. "Save..."
+            item = [menu itemWithTitle:
+                    [key stringByAppendingString:@"\u2026"]];
+        }
+    }
+    if (!item)
+        return nil;
+    
+    [menu removeItem:item];
+    return [MenuProxy proxyWithContext:context andMenu:menu];
+}
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+    return [self webScriptNameForSelector:selector] == nil;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return YES;
+}
+
++ (NSString*) webScriptNameForSelector:(SEL)selector
+{
+	id	result = nil;
+   
+    if (selector == @selector(addItemWithTitle:keyEquivalent:callback:atIndex:)) {
+		result = @"addItem";
+	}
+    else if (selector == @selector(addSeparator)) {
+        result = @"addSeparator";
+    }
+	else if (selector == @selector(itemForKey:)) {
+		result = @"getItem";
+	}
+    else if (selector == @selector(removeItem:)) {
+		result = @"removeMenu";
+	}
+   
+	return result;
+}
+
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.h
new file mode 100644
index 000000000..51077a434
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.h
@@ -0,0 +1,26 @@
+//
+//  Notice.h
+//  MacGap
+//
+//  Created by Christian Sullivan on 7/26/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "WindowController.h"
+
+#define APP_NOTICE_NOTIFICATION @"Notice"
+
+@interface Notice : NSObject <NSUserNotificationCenterDelegate> {
+    
+}
+
+@property (nonatomic, retain) WebView *webView;
+
+- (id) initWithWebView:(WebView *)view;
+- (void) notify:(NSDictionary*)message;
+- (void) close:(NSString*)notificationId;
++ (BOOL) available;
+
+@end
+
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.m
new file mode 100644
index 000000000..a4095f9f2
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Notice.m
@@ -0,0 +1,108 @@
+//
+//  Notice.m
+//  MacGap
+//
+//  Created by Christian Sullivan on 7/26/12.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "Notice.h"
+
+#import "JSEventHelper.h"
+
+@implementation Notice
+
+- (id) initWithWebView:(WebView*)view
+{
+    if(self = [super init]) {
+        self.webView = view;
+	    [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
+    }
+    return self;
+}
+
+- (void) notify:(NSDictionary *)message {
+    NSUserNotification *notification = [[NSUserNotification alloc] init];
+    [notification setTitle:[message valueForKey:@"title"]];
+    [notification setInformativeText:[message valueForKey:@"content"]];
+    [notification setDeliveryDate:[NSDate dateWithTimeInterval:0 sinceDate:[NSDate date]]];
+    BOOL playSound = true; // optional parameter, false only when {sound: false}
+    @try {
+        NSNumber *s = [message valueForKey:@"sound"];
+        if ([[s className] isEqual: @"__NSCFBoolean"]) {
+            playSound = [s boolValue];
+        }
+    }
+    @catch (NSException *exception) {
+    }
+    if (playSound) {
+        [notification setSoundName:NSUserNotificationDefaultSoundName];
+    }
+    NSString *id = @""; // optional, needed for close
+    @try {
+        id = [message valueForKey:@"id"];
+    }
+    @catch (NSException *exception) {
+    }
+    [notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:id, @"id", nil]];
+    NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
+    [center scheduleNotification:notification];
+}
+
+// close all notifications with id == notificationId or close all notifications if notificationId == "*"
+- (void) close:(NSString*)notificationId {
+    NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
+    for(NSUserNotification * deliveredNote in center.deliveredNotifications) {
+        if ([notificationId isEqualToString:@"*"] || [deliveredNote.userInfo[@"id"] isEqualToString:notificationId]) {
+            [center removeDeliveredNotification: deliveredNote];
+        }
+    }
+}
+
++ (BOOL) available {
+    if ([NSUserNotificationCenter respondsToSelector:@selector(defaultUserNotificationCenter)])
+        return YES;
+    
+    return NO;
+}
+
+- (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification
+{
+    NSString *notificationId = [notification.userInfo valueForKey:@"id"];
+    [JSEventHelper triggerEvent:@"macgap.notify.activated" forDetail:notificationId forWebView:self.webView];
+}
+
+#pragma mark WebScripting Protocol
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+    BOOL result = YES;
+    if (selector == @selector(notify:))
+        result = NO;
+    if (selector == @selector(close:))
+        result = NO;
+    
+    return result;
+}
+
++ (NSString*) webScriptNameForSelector:(SEL)selector
+{
+	id	result = nil;
+	
+	if (selector == @selector(notify:)) {
+		result = @"notify";
+	}
+	if (selector == @selector(close:)) {
+		result = @"close";
+	}
+	
+	return result;
+}
+
+// right now exclude all properties (eg keys)
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return YES;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.h
new file mode 100644
index 000000000..f931340d0
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.h
@@ -0,0 +1,21 @@
+#import <Foundation/Foundation.h>
+
+@interface Path : NSObject {
+    
+}
+
+- (NSString *) application;
+- (NSString *) resource;
+- (NSString *) documents;
+- (NSString *) library;
+- (NSString *) home;
+- (NSString *) temp;
+
+@property (readonly,copy) NSString* application;
+@property (readonly,copy) NSString* resource;
+@property (readonly,copy) NSString* documents;
+@property (readonly,copy) NSString* library;
+@property (readonly,copy) NSString* home;
+@property (readonly,copy) NSString* temp;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.m
new file mode 100644
index 000000000..8c54100f7
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Path.m
@@ -0,0 +1,53 @@
+#import "Path.h"
+
+@implementation Path
+
+@synthesize application;
+@synthesize resource;
+@synthesize documents;
+@synthesize library;
+@synthesize home;
+@synthesize temp;
+
+- (NSString *)application {
+    return [[NSBundle mainBundle] bundlePath];
+}
+
+- (NSString *)resource {
+    return [[NSBundle mainBundle] resourcePath];
+}
+
+- (NSString *)documents {
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    return [paths objectAtIndex:0];
+}
+
+- (NSString *)library {
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
+    NSLog( @"%@", paths );
+    return [paths objectAtIndex:0];
+}
+
+- (NSString *)home {
+    return NSHomeDirectory();
+}
+
+- (NSString *)temp {
+    return NSTemporaryDirectory();
+}
+
+#pragma mark WebScripting Protocol
+
+/* checks whether a selector is acceptable to be called from JavaScript */
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+    return NO;
+}
+
+// right now exclude all properties (eg keys)
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return NO;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.h
new file mode 100644
index 000000000..067076439
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.h
@@ -0,0 +1,17 @@
+#import <Cocoa/Cocoa.h>
+#import "Command.h"
+#import "CallbackDelegate.h"
+
+
+@interface Sound : Command {
+
+}
+
+// pending callbacks for sounds being played, to keep
+// ARC from freeing them too early
+@property (nonatomic, strong) NSMutableSet *pending;
+
+- (void) play:(NSString*)file onComplete:(WebScriptObject*)callback;
+- (void) playSystem:(NSString*)name onComplete:(WebScriptObject*)callback;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.m
new file mode 100644
index 000000000..9f4a44dbc
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/Sound.m
@@ -0,0 +1,97 @@
+#import "Sound.h"
+
+
+@interface PlayDelegate : CallbackDelegate <NSSoundDelegate> {
+}
+
+@property (nonatomic, weak) Sound *sound;
+
+- (id) initWithContext:(JSContextRef)aContext
+           forCallback:(WebScriptObject*)aCallback
+             withSound:(Sound*)aSound;
+@end
+
+@implementation PlayDelegate
+
+@synthesize sound;
+
+- (id) initWithContext:(JSContextRef)aContext
+           forCallback:(WebScriptObject*)aCallback
+             withSound:(Sound*)aSound
+{
+        self = [super initWithContext:aContext forCallback:aCallback];
+        if (!self)
+                return nil;
+        sound = aSound;
+        return self;
+}
+
+- (void)sound:(NSSound *)aSound didFinishPlaying:(BOOL)finishedPlaying {
+        [self callWithParams:[aSound name], nil];
+        [sound.pending removeObject:self];
+}
+
+@end
+
+@implementation Sound
+
+@synthesize pending;
+
+- (id) initWithContext:(JSContextRef)aContext {
+    self = [super initWithContext:aContext];
+    if (!self) {
+        return nil;
+    }
+    
+    pending = [NSMutableSet new];
+    return self;
+}
+
+- (void) playSound:(NSSound*)sound onComplete:(WebScriptObject*)callback {
+    if (callback != (id)[WebUndefined undefined]) {
+        PlayDelegate *d = [[PlayDelegate alloc] initWithContext:context
+                                                    forCallback:callback
+                                                      withSound:self];
+        [pending addObject:d];
+        [sound setDelegate:d];
+    }
+    [sound play];
+}
+
+- (void) play:(NSString*)file onComplete:(WebScriptObject*)callback {
+	NSURL* fileUrl  = [NSURL fileURLWithPath:[[Utils sharedInstance] pathForResource:file]];
+	DebugNSLog(@"Sound file:%@", [fileUrl description]);
+	
+	NSSound* sound = [[NSSound alloc] initWithContentsOfURL:fileUrl byReference:YES];
+    [self playSound:sound onComplete:callback];
+}
+
+- (void) playSystem:(NSString*)name onComplete:(WebScriptObject*)callback {
+    NSSound *systemSound = [NSSound soundNamed:name];
+    [self playSound:systemSound onComplete:callback];
+}
+
+#pragma mark WebScripting Protocol
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
+    return [self webScriptNameForSelector:selector] == nil;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name {
+	return YES;
+}
+
++ (NSString*) webScriptNameForSelector:(SEL)selector {
+    id	result = nil;
+
+    if (selector == @selector(play:onComplete:)) {
+            result = @"play";
+    }
+    else if (selector == @selector(playSystem:onComplete:)) {
+            result = @"playSystem";
+    }
+
+    return result;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.h
new file mode 100644
index 000000000..269191b39
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.h
@@ -0,0 +1,43 @@
+//
+//  UserDefaults.h
+//  MacGap
+//
+//  Created by Jeff Hanbury on 16/04/2014.
+//  Copyright (c) 2014 Twitter. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "WindowController.h"
+
+@interface UserDefaults : NSObject
+
+@property (nonatomic, retain) WebView *webView;
+
+- (id) initWithWebView:(WebView *)view;
+- (NSString*) getMyDefaults;
+- (NSDictionary*) myDefaultsDictionary;
+- (void) removeObjectForKey:(NSString*)key;
+- (NSArray*) getUserDefaultsKeys;
+
+- (NSString*) addPrefix:(NSString*)key;
+
+- (void) setString:(NSString*)key withValue:(NSString*)value;
+- (NSString*) getString:(NSString*)key;
+
+- (void) setInteger:(NSString*)key withValue:(NSString*)value;
+- (NSNumber*) getInteger:(NSString*)key;
+
+- (void) setBool:(NSString*)key withValue:(NSString*)value;
+- (NSNumber*) getBool:(NSString*)key;
+
+- (void) setFloat:(NSString*)key withValue:(NSString*)value;
+- (NSNumber*) getFloat:(NSString*)key;
+
+// Could also be implemented:
+//– setObject:forKey:
+//– setDouble:forKey:
+//– setURL:forKey:
+
+@end
+
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.m
new file mode 100644
index 000000000..485687108
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/UserDefaults.m
@@ -0,0 +1,211 @@
+//
+//  UserDefaults.m
+//  MacGap
+//
+//  Created by Jeff Hanbury on 16/04/2014.
+//  Copyright (c) 2014 Twitter. All rights reserved.
+//
+
+#import "UserDefaults.h"
+#import "JSEventHelper.h"
+
+@interface UserDefaults() {
+
+}
+
+-(void) setupNotificationCenter;
+
+@end
+
+
+@implementation UserDefaults
+
+- (id) initWithWebView:(WebView *) view{
+    self = [super init];
+    
+    if (self) {
+        self.webView = view;
+        [self setupNotificationCenter];
+    }
+    
+    return self;
+}
+
+
+-(void) setupNotificationCenter{
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(defaultsChanged:)
+                                                 name:NSUserDefaultsDidChangeNotification
+                                               object:nil];
+}
+
+- (void)defaultsChanged:(NSNotification *)notification {
+    NSDictionary* returnDict = [self myDefaultsDictionary];
+    [JSEventHelper triggerEvent:@"userDefaultsChanged" withArgs:returnDict forWebView:self.webView];
+}
+
+- (NSString*) getMyDefaults {
+    NSDictionary* myDefaults = [self myDefaultsDictionary];
+
+    return [[Utils sharedInstance] convertDictionaryToJSON:myDefaults];
+}
+
+- (NSDictionary*) myDefaultsDictionary {
+    NSString* prefix = [kWebScriptNamespace stringByAppendingString:@"_"];
+    NSMutableDictionary* returnDict = [[NSMutableDictionary alloc] init];
+
+    // Get the user defaults.
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    
+    // Build up a dictionary containing just the items beginning with our
+    // prefix.
+    for (NSString* key in [self getUserDefaultsKeys]) {
+        if ([key hasPrefix:prefix]) {
+            id val = [defaults valueForKey:key];
+            [returnDict setObject:val forKey:key];
+        }
+    }
+
+    return returnDict;
+}
+
+- (NSArray*) getUserDefaultsKeys {
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    return [[prefs dictionaryRepresentation] allKeys];
+}
+
+- (void) removeObjectForKey:(NSString*)key {
+    NSString* prefixedKey;
+    prefixedKey = [self addPrefix:key];
+
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:prefixedKey];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+// Check we have a standard prefix for JS-modified keys, for security purposes.
+// If not, add it. This stops JavaScript from ever being able to modify keys
+// it did not create.
+- (NSString*) addPrefix:(NSString*)key {
+    NSString* prefix;
+    prefix = [kWebScriptNamespace stringByAppendingString:@"_"];
+    
+    if (![key hasPrefix:prefix]) {
+        key = [prefix stringByAppendingString:key];
+    }
+    return key;
+}
+
+// String
+
+- (void) setString:(NSString*)key withValue:(NSString*)value {
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    NSString* prefixedKey;
+    prefixedKey = [self addPrefix:key];
+    [prefs setObject:value forKey:prefixedKey];
+}
+
+- (NSString*) getString:(NSString *)key {
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    return [prefs stringForKey:key];
+}
+
+// All the following must convert their type to NSNumber for JavaScript.
+
+// Integer
+
+- (void) setInteger:(NSString*)key withValue:(NSString*)value {
+    NSString* prefixedKey;
+    prefixedKey = [self addPrefix:key];
+
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    NSInteger myInt = [value intValue];
+    [prefs setInteger:myInt forKey:prefixedKey];
+}
+
+- (NSNumber*) getInteger:(NSString *)key {
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    return [NSNumber numberWithInteger:[prefs integerForKey:key]];
+}
+
+// Boolean
+
+- (void) setBool:(NSString*)key withValue:(NSString*)value {
+    NSString* prefixedKey;
+    prefixedKey = [self addPrefix:key];
+
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    BOOL myBool = [value boolValue];
+    [prefs setBool:myBool forKey:prefixedKey];
+}
+
+- (NSNumber*) getBool:(NSString *)key {
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    return [NSNumber numberWithBool:[prefs boolForKey:key]];
+}
+
+// Float
+
+- (void) setFloat:(NSString*)key withValue:(NSString*)value {
+    NSString* prefixedKey;
+    prefixedKey = [self addPrefix:key];
+
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    float myFloat = [value floatValue];
+    [prefs setFloat:myFloat forKey:prefixedKey];
+}
+
+- (NSNumber*) getFloat:(NSString *)key {
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    return [NSNumber numberWithFloat:[prefs floatForKey:key]];
+}
+
+
+#pragma mark WebScripting Protocol
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
+    return NO;
+}
+
++ (NSString*) webScriptNameForSelector:(SEL)selector {
+	id	result = nil;
+	
+	if (selector == @selector(getMyDefaults)) {
+		result = @"getMyDefaults";
+    }
+    
+	if (selector == @selector(removeObjectForKey:)) {
+		result = @"removeObjectForKey";
+    }
+    
+    else if (selector == @selector(setString:withValue:)) {
+		result = @"setString";
+    } else if (selector == @selector(getString:)) {
+        result = @"getString";
+    }
+    
+    else if (selector == @selector(setInteger:withValue:)) {
+		result = @"setInteger";
+    } else if (selector == @selector(getInteger:)) {
+        result = @"getInteger";
+    }
+    
+    else if (selector == @selector(setBool:withValue:)) {
+		result = @"setBool";
+    } else if (selector == @selector(getBool:)) {
+        result = @"getBool";
+    }
+
+    else if (selector == @selector(setFloat:withValue:)) {
+		result = @"setFloat";
+    } else if (selector == @selector(getFloat:)) {
+        result = @"getFloat";
+    }
+
+	return result;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name {
+	return NO;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.h
new file mode 100644
index 000000000..62c7b7e83
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.h
@@ -0,0 +1,9 @@
+@interface Fonts : NSObject {
+}
+
+- (NSArray*) availableFonts;
+- (NSArray*) availableFontFamilies;
+- (NSArray*) availableMembersOfFontFamily:(NSString*)fontFamily;
+- (CGFloat)  defaultLineHeightForFont:(NSString *)theFontName ofSize:(CGFloat)theFontSize;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.m
new file mode 100644
index 000000000..b17818a53
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Commands/fonts.m
@@ -0,0 +1,48 @@
+#import "fonts.h"
+
+@implementation Fonts
+
+
+- (NSArray*) availableFonts {
+    return [[NSFontManager sharedFontManager] availableFonts];
+}
+
+- (NSArray*) availableFontFamilies {
+    return [[NSFontManager sharedFontManager] availableFontFamilies];
+}
+
+- (NSArray*) availableMembersOfFontFamily:(NSString *)fontFamily {
+    return [[NSFontManager sharedFontManager] availableMembersOfFontFamily:fontFamily];
+}
+
+- (CGFloat) defaultLineHeightForFont:(NSString*)theFontName ofSize:(CGFloat)theFontSize {
+    NSFont *theFont = [NSFont fontWithName:theFontName size:theFontSize];
+    NSLayoutManager *lm = [[NSLayoutManager alloc] init];
+    
+    return [lm defaultLineHeightForFont:theFont];
+}
+
+
+#pragma mark WebScripting Protocol
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector {
+    return NO;
+}
+
++ (NSString*) webScriptNameForSelector:(SEL)selector {
+	id	result = nil;
+	
+	if (selector == @selector(availableMembersOfFontFamily:)) {
+		result = @"availableMembersOfFontFamily";
+    } else if (selector == @selector(defaultLineHeightForFont:ofSize:)) {
+        result = @"defaultLineHeightForFont";
+    }
+
+	return result;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name {
+	return NO;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Constants.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Constants.h
new file mode 100644
index 000000000..1fe59d6cc
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Constants.h
@@ -0,0 +1,7 @@
+// Application constants
+
+#define kStartPage @"http://127.0.0.1:9993/"
+
+#define kStartFolder @"."
+
+#define kWebScriptNamespace @"macgap"
\ No newline at end of file
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.h
new file mode 100644
index 000000000..65890a5ee
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.h
@@ -0,0 +1,15 @@
+#import <Cocoa/Cocoa.h>
+#import <WebKit/WebKit.h>
+
+@class WebViewDelegate;
+
+@interface ContentView : NSView {
+	IBOutlet WebView* webView;
+	WebViewDelegate* delegate;
+}
+
+@property (retain) WebView* webView;
+@property (retain) WebViewDelegate* delegate;
+@property (strong) IBOutlet NSMenu *mainMenu;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.m
new file mode 100644
index 000000000..6558a191f
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/ContentView.m
@@ -0,0 +1,68 @@
+#import "ContentView.h"
+#import "WebViewDelegate.h"
+#import "AppDelegate.h"
+#import "JSEventHelper.h"
+
+@interface WebPreferences (WebPreferencesPrivate)
+    - (void)_setLocalStorageDatabasePath:(NSString *)path;
+    - (void) setLocalStorageEnabled: (BOOL) localStorageEnabled;
+    - (void) setDatabasesEnabled:(BOOL)databasesEnabled;
+    - (void) setDeveloperExtrasEnabled:(BOOL)developerExtrasEnabled;
+    - (void) setWebGLEnabled:(BOOL)webGLEnabled;
+    - (void) setOfflineWebApplicationCacheEnabled:(BOOL)offlineWebApplicationCacheEnabled;
+@end
+
+@implementation ContentView
+
+@synthesize webView, delegate, mainMenu;
+
+- (void) awakeFromNib
+{
+    WebPreferences *webPrefs = [WebPreferences standardPreferences];
+    
+    NSString *cappBundleName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];    
+    NSString *applicationSupportFile = [@"~/Library/Application Support/" stringByExpandingTildeInPath];
+    NSString *savePath = [NSString pathWithComponents:[NSArray arrayWithObjects:applicationSupportFile, cappBundleName, @"LocalStorage", nil]];
+    [webPrefs _setLocalStorageDatabasePath:savePath];
+    [webPrefs setLocalStorageEnabled:YES];
+    [webPrefs setDatabasesEnabled:YES];
+    [webPrefs setDeveloperExtrasEnabled:[[NSUserDefaults standardUserDefaults] boolForKey: @"developer"]];
+    [webPrefs setOfflineWebApplicationCacheEnabled:YES];
+    [webPrefs setWebGLEnabled:YES];
+    
+    [self.webView setPreferences:webPrefs];
+    
+    NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage 
+                                          sharedHTTPCookieStorage]; 
+    [cookieStorage setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
+    
+    [self.webView setApplicationNameForUserAgent: @"MacGap"];
+    
+	self.delegate = [[WebViewDelegate alloc] initWithMenu:[NSApp mainMenu]];
+//	[self.webView setFrameLoadDelegate:self.delegate];
+//	[self.webView setUIDelegate:self.delegate];
+//	[self.webView setResourceLoadDelegate:self.delegate];
+//	[self.webView setDownloadDelegate:self.delegate];
+//	[self.webView setPolicyDelegate:self.delegate];
+    [self.webView setDrawsBackground:NO];
+    [self.webView setShouldCloseWithWindow:NO];
+    
+    [self.webView setGroupName:@"MacGap"];
+
+}
+
+- (void) windowResized:(NSNotification*)notification;
+{
+	NSWindow* window = (NSWindow*)notification.object;
+	NSSize size = [window frame].size;
+	
+	DebugNSLog(@"window width = %f, window height = %f", size.width, size.height);
+    
+    bool isFullScreen = (window.styleMask & NSFullScreenWindowMask) == NSFullScreenWindowMask;
+    int titleBarHeight = isFullScreen ? 0 : [[Utils sharedInstance] titleBarHeight:window];
+    
+	[self.webView setFrame:NSMakeRect(0, 0, size.width, size.height - titleBarHeight)];
+    [JSEventHelper triggerEvent:@"orientationchange" forWebView:self.webView];
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.h
new file mode 100644
index 000000000..401f3e396
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.h
@@ -0,0 +1,20 @@
+//
+//  Helper.h
+//  MacGap
+//
+//  Created by Liam Kaufman Simpkins on 12-01-22.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "WindowController.h"
+
+@interface JSEventHelper : NSObject
+
++ (void) triggerEvent:(NSString *)event forWebView:(WebView *)webView;
++ (void) triggerEvent:(NSString *)event withArgs:(NSDictionary *)args forWebView:(WebView *)webView;
++ (void) triggerEvent:(NSString *)event withArgs:(NSDictionary *)args forObject:(NSString *)objName forWebView:(WebView *)webView;
++ (void) triggerEvent:(NSString *)event forDetail:(NSString *)detail forWebView:(WebView *)webView;
++ (void) triggerEvent:(NSString *)event forDetail:(NSString *)detail forObject:(NSString *)objName forWebView:(WebView *)webView;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.m
new file mode 100644
index 000000000..65406b3c0
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/JSEventHelper.m
@@ -0,0 +1,41 @@
+//
+//  Helper.m
+//  MacGap
+//
+//  Created by Liam Kaufman Simpkins on 12-01-22.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import "JSEventHelper.h"
+
+@implementation JSEventHelper
+
++ (void) triggerEvent:(NSString *)event forWebView:(WebView *)webView {
+    [self triggerEvent:event withArgs:[NSMutableDictionary dictionary] forObject:@"document" forWebView:webView];
+}
+
++ (void) triggerEvent:(NSString *)event withArgs:(NSDictionary *)args forWebView:(WebView *)webView {
+    [self triggerEvent:event withArgs:args forObject:@"document" forWebView:webView];
+}
+
++ (void) triggerEvent:(NSString *)event withArgs:(NSDictionary *)args forObject:(NSString *)objName forWebView:(WebView *)webView {
+    
+    // Convert args Dictionary to JSON.
+    NSString* jsonString = [[Utils sharedInstance] convertDictionaryToJSON:args];
+    
+    // Create the event JavaScript and run it.
+    NSString * str = [NSString stringWithFormat:@"var e = document.createEvent('Events'); e.initEvent('%@', true, false);  e.data=%@; %@.dispatchEvent(e); ", event, jsonString, objName];
+    [webView stringByEvaluatingJavaScriptFromString:str];
+}
+
++ (void) triggerEvent:(NSString *)event forDetail:(NSString *)detail forWebView:(WebView *)webView {
+    [self triggerEvent:event forDetail:detail forObject:@"document" forWebView:webView];
+}
+
++ (void) triggerEvent:(NSString *)event forDetail:(NSString *)detail forObject:(NSString *)objName forWebView:(WebView *)webView {
+    NSString *detailEscaped = [detail stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+    NSString *str = [NSString stringWithFormat:@"var e = new CustomEvent('%@', { 'detail': decodeURIComponent(\"%@\") }); %@.dispatchEvent(e); ", event, detailEscaped, objName];
+    [webView stringByEvaluatingJavaScriptFromString:str];
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.h
new file mode 100644
index 000000000..f573d881a
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.h
@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+#import <Webkit/WebScriptObject.h>
+
+#define DEG_EPS 0.001
+#define fequal(a,b) (fabs((a) - (b)) < DEG_EPS)
+#define fequalzero(a) (fabs(a) < DEG_EPS)
+
+@class LoadingView;
+
+@interface Utils : NSObject {
+}
+
+- (float) titleBarHeight:(NSWindow*)aWindow;
+- (NSString*) pathForResource:(NSString*)resourcepath;
+- (NSString*) convertDictionaryToJSON:(NSDictionary*)dict;
+- (NSArray*) convertJSarrayToNSArray:(WebScriptObject*)jsArray;
+
++ (Utils*) sharedInstance;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.m
new file mode 100644
index 000000000..8d85c2949
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Utils.m
@@ -0,0 +1,93 @@
+#import "Utils.h"
+#import <Webkit/WebScriptObject.h>
+
+static Utils* sharedInstance = nil;
+
+@implementation Utils
+
+- (float) titleBarHeight:(NSWindow*)aWindow
+{
+    NSRect frame = [aWindow frame];
+    NSRect contentRect = [NSWindow contentRectForFrameRect: frame
+												 styleMask: NSTitledWindowMask];
+	
+    return (frame.size.height - contentRect.size.height);
+}
+
+- (NSString*) pathForResource:(NSString*)resourcepath
+{
+    NSBundle * mainBundle = [NSBundle mainBundle];
+    NSMutableArray *directoryParts = [NSMutableArray arrayWithArray:[resourcepath componentsSeparatedByString:@"/"]];
+    NSString       *filename       = [directoryParts lastObject];
+    [directoryParts removeLastObject];
+	
+    NSString *directoryStr = [NSString stringWithFormat:@"%@/%@", kStartFolder, [directoryParts componentsJoinedByString:@"/"]];
+    return [mainBundle pathForResource:filename
+								ofType:@""
+						   inDirectory:directoryStr];
+}
+
+- (NSString*) convertDictionaryToJSON:(NSDictionary*)dict {
+    // Convert defaults Dictionary to JSON.
+    NSError *error;
+    NSData *jsonData = [NSJSONSerialization
+                        dataWithJSONObject:dict
+                        options:NSJSONWritingPrettyPrinted // Pass 0 if you don't care about the readability of the generated string
+                        error:&error];
+    
+    NSString *jsonString;
+    if (! jsonData) {
+        NSLog(@"Got an error converting to JSON: %@", error);
+    }
+    else {
+        jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    }
+    
+    return jsonString;
+}
+
+// Convert JavaScript array (arrives as a WebScriptObject) into an NSArray of strings.
+- (NSArray*) convertJSarrayToNSArray:(WebScriptObject*)jsArray {
+    NSInteger count = [[jsArray valueForKey:@"length"] integerValue];
+    
+    NSMutableArray *args = [NSMutableArray array];
+    for (int i = 0; i < count; i++) {
+        NSString *item = [jsArray webScriptValueAtIndex:i];
+        if ([item isKindOfClass:[NSString class]]) {
+            [args addObject:item];
+        }
+    }
+    
+    return args;
+}
+
+#pragma mark -
+#pragma mark Singleton methods
+
++ (Utils*) sharedInstance
+{
+    @synchronized(self)
+    {
+        if (sharedInstance == nil){
+			sharedInstance = [[Utils alloc] init];
+		 }
+    }
+    return sharedInstance;
+}
+
++ (id) allocWithZone:(NSZone *)zone {
+    @synchronized(self) {
+        if (sharedInstance == nil) {
+            sharedInstance = [super allocWithZone:zone];
+            return sharedInstance;  // assignment and return on first allocation
+        }
+    }
+    return nil; // on subsequent allocation attempts return nil
+}
+
+- (id) copyWithZone:(NSZone *)zone
+{
+    return self;
+}
+
+@end
\ No newline at end of file
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.h
new file mode 100644
index 000000000..49c6da6b9
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.h
@@ -0,0 +1,49 @@
+#import <Cocoa/Cocoa.h>
+#import <WebKit/WebKit.h>
+
+@class Sound;
+@class Dock;
+@class Growl;
+@class Notice;
+@class Path;
+@class App;
+@class Window;
+@class Clipboard;
+@class Fonts;
+@class MenuProxy;
+@class UserDefaults;
+
+@class WindowController;
+
+@interface WebViewDelegate : NSObject {
+	Sound* sound;
+    Dock* dock;
+    Growl* growl;
+    Notice* notice;
+    Path* path;
+    App* app;
+    Window* window;
+    Clipboard* clipboard;
+    Fonts* fonts;
+    NSMenu *mainMenu;
+    UserDefaults* userDefaults;
+}
+
+
+
+@property (nonatomic, retain) Sound* sound;
+@property (nonatomic, retain) Dock* dock;
+@property (nonatomic, retain) Growl* growl;
+@property (nonatomic, retain) Notice* notice;
+@property (nonatomic, retain) Path* path;
+@property (nonatomic, retain) App* app;
+@property (nonatomic, retain) Window* window;
+@property (nonatomic, retain) Clipboard* clipboard;
+@property (nonatomic, retain) Fonts* fonts;
+@property (nonatomic, retain) MenuProxy* menu;
+@property (nonatomic, retain) UserDefaults* userDefaults;
+
+@property (nonatomic, retain) WindowController *requestedWindow;
+
+- (id) initWithMenu:(NSMenu*)menu;
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.m
new file mode 100644
index 000000000..505780183
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/WebViewDelegate.m
@@ -0,0 +1,206 @@
+#import "WebViewDelegate.h"
+#import "Sound.h"
+#import "Dock.h"
+#import "Notice.h"
+#import "Path.h"
+#import "App.h"
+#import "Window.h"
+#import "WindowController.h"
+#import "Clipboard.h"
+#import "Fonts.h"
+#import "MenuProxy.h"
+#import "UserDefaults.h"
+
+@implementation WebViewDelegate
+
+@synthesize sound;
+@synthesize dock;
+@synthesize growl;
+@synthesize notice;
+@synthesize path;
+@synthesize app;
+@synthesize window;
+@synthesize requestedWindow;
+@synthesize clipboard;
+@synthesize fonts;
+@synthesize menu;
+@synthesize userDefaults;
+
+- (id) initWithMenu:(NSMenu*)aMenu
+{
+    self = [super init];
+    if (!self)
+        return nil;
+    
+    mainMenu = aMenu;
+    return self;
+}
+
+- (void) webView:(WebView*)webView didClearWindowObject:(WebScriptObject*)windowScriptObject forFrame:(WebFrame *)frame
+{
+    JSContextRef context = [frame globalContext];
+    if (self.sound == nil) { self.sound = [[Sound alloc] initWithContext:context]; }
+	if (self.dock == nil) { self.dock = [Dock new]; }
+	if (self.path == nil) { self.path = [Path new]; }
+	if (self.clipboard == nil) { self.clipboard = [Clipboard new]; }
+	if (self.fonts == nil) { self.fonts = [Fonts new]; }
+
+    if (self.notice == nil && [Notice available] == YES) {
+       self.notice = [[Notice alloc] initWithWebView:webView];
+    }
+	
+    if (self.app == nil) { 
+        self.app = [[App alloc] initWithWebView:webView]; 
+    }
+    
+    if (self.window == nil) { 
+        self.window = [[Window alloc] initWithWebView:webView]; 
+    }
+    
+    if (self.menu == nil) {
+        self.menu = [MenuProxy proxyWithContext:context andMenu:mainMenu];
+    }
+    
+	if (self.userDefaults == nil) {
+        self.userDefaults = [[UserDefaults alloc] initWithWebView:webView];
+    }
+    
+    [windowScriptObject setValue:self forKey:kWebScriptNamespace];
+}
+
+
+- (void)webView:(WebView *)sender runOpenPanelForFileButtonWithResultListener:(id < WebOpenPanelResultListener >)resultListener allowMultipleFiles:(BOOL)allowMultipleFiles{
+   
+    NSOpenPanel * openDlg = [NSOpenPanel openPanel];
+    
+    [openDlg setCanChooseFiles:YES];
+    [openDlg setCanChooseDirectories:NO];
+    
+    [openDlg beginWithCompletionHandler:^(NSInteger result){
+        if (result == NSFileHandlingPanelOKButton) {
+            NSArray * files = [[openDlg URLs] valueForKey: @"relativePath"];
+            [resultListener chooseFilenames: files];
+        } else {
+            [resultListener cancel];
+        }
+    }];
+}
+
+- (void) webView:(WebView*)webView addMessageToConsole:(NSDictionary*)message
+{
+	if (![message isKindOfClass:[NSDictionary class]]) { 
+		return;
+	}
+	
+	NSLog(@"JavaScript console: %@:%@: %@", 
+		  [[message objectForKey:@"sourceURL"] lastPathComponent],	// could be nil
+		  [message objectForKey:@"lineNumber"],
+		  [message objectForKey:@"message"]);
+}
+
+- (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame
+{
+    NSAlert *alert = [[NSAlert alloc] init];
+    [alert addButtonWithTitle:@"OK"];
+    [alert setMessageText:message];
+    [alert setAlertStyle:NSWarningAlertStyle];
+    [alert runModal];
+}
+
+- (BOOL)webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame
+{
+    NSAlert *alert = [[NSAlert alloc] init];
+    [alert addButtonWithTitle:@"Yes"];
+    [alert addButtonWithTitle:@"No"];
+    [alert setMessageText:message];
+    [alert setAlertStyle:NSWarningAlertStyle];
+    
+    if ([alert runModal] == NSAlertFirstButtonReturn)
+        return YES;
+    else
+        return NO;
+}
+
+/*
+ By default the size of a database is set to 0 [1]. When a database is being created
+ it calls this delegate method to get an increase in quota size - or call an error.
+ PS this method is defined in WebUIDelegatePrivate and may make it difficult, but
+ not impossible [2], to get an app accepted into the mac app store.
+ 
+ Further reading:
+ [1] http://stackoverflow.com/questions/353808/implementing-a-webview-database-quota-delegate
+ [2] http://stackoverflow.com/questions/4527905/how-do-i-enable-local-storage-in-my-webkit-based-application/4608549#4608549
+ */
+- (void)webView:(WebView *)sender frame:(WebFrame *)frame exceededDatabaseQuotaForSecurityOrigin:(id) origin database:(NSString *)databaseIdentifier
+{
+    static const unsigned long long defaultQuota = 5 * 1024 * 1024;
+    if ([origin respondsToSelector: @selector(setQuota:)]) {
+        [origin performSelector:@selector(setQuota:) withObject:[NSNumber numberWithLongLong: defaultQuota]];
+    } else { 
+        NSLog(@"could not increase quota for %lld", defaultQuota); 
+    }
+}
+
+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems 
+{
+    NSMutableArray *webViewMenuItems = [defaultMenuItems mutableCopy];
+    
+    if (webViewMenuItems)
+    {
+        NSEnumerator *itemEnumerator = [defaultMenuItems objectEnumerator];
+        NSMenuItem *menuItem = nil;
+        while ((menuItem = [itemEnumerator nextObject]))
+        {
+            NSInteger tag = [menuItem tag];
+            
+            switch (tag)
+            {
+                case WebMenuItemTagOpenLinkInNewWindow:
+                case WebMenuItemTagDownloadLinkToDisk:
+                case WebMenuItemTagCopyLinkToClipboard:
+                case WebMenuItemTagOpenImageInNewWindow:
+                case WebMenuItemTagDownloadImageToDisk:
+                case WebMenuItemTagCopyImageToClipboard:
+                case WebMenuItemTagOpenFrameInNewWindow:
+                case WebMenuItemTagGoBack:
+                case WebMenuItemTagGoForward:
+                case WebMenuItemTagStop:
+                case WebMenuItemTagOpenWithDefaultApplication:
+                case WebMenuItemTagReload:
+                    [webViewMenuItems removeObjectIdenticalTo: menuItem];
+            }
+        }
+    }
+    
+    return webViewMenuItems;
+}
+
+- (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request{
+    requestedWindow = [[WindowController alloc] initWithRequest:request];
+    return requestedWindow.contentView.webView;    
+}
+
+- (void)webViewShow:(WebView *)sender{
+    [requestedWindow showWindow:sender];
+}
+
+- (void)webView:(WebView *)webView decidePolicyForNewWindowAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request newFrameName:(NSString *)frameName decisionListener:(id < WebPolicyDecisionListener >)listener
+{
+    [[NSWorkspace sharedWorkspace] openURL:[request URL]];
+    [listener ignore];
+}
+
+#pragma mark WebScripting protocol
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+	return YES;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return NO;
+}
+
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.h
new file mode 100644
index 000000000..f721376e0
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.h
@@ -0,0 +1,23 @@
+#import <Foundation/Foundation.h>
+
+#import "WindowController.h"
+
+@interface Window : NSObject{
+    CGRect _oldRestoreFrame;
+}
+
+@property (retain, nonatomic) WindowController *windowController;
+@property (nonatomic, retain) WebView *webView;
+
+- (id) initWithWebView:(WebView *)view;
+- (void) open:(NSDictionary *)properties;
+- (void) move:(NSDictionary *)properties;
+- (void) resize:(NSDictionary *) properties;
+- (Boolean) isMaximized;
+- (CGFloat) getX;
+- (CGFloat) getY;
+- (void) maximize;
+- (void) restore;
+- (void) toggleFullscreen;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.m
new file mode 100644
index 000000000..2444f62ea
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Classes/Window.m
@@ -0,0 +1,94 @@
+#import "Window.h"
+
+@implementation Window
+
+@synthesize windowController, webView;
+
+- (id) initWithWebView:(WebView*)view
+{
+    if(self = [super init]) {
+        self.webView = view;
+    }
+    return self;
+}
+
+- (void) open:(NSDictionary *)properties
+{
+    self.windowController = [[WindowController alloc] initWithURL:[properties valueForKey:@"url"]];
+    [self.windowController showWindow: [NSApplication sharedApplication].delegate];
+    [self.windowController.window makeKeyWindow];
+}
+
+- (void) minimize {
+    [[NSApp mainWindow] miniaturize:[NSApp mainWindow]];
+}
+
+- (void) toggleFullscreen {
+    [[NSApp mainWindow] toggleFullScreen:[NSApp mainWindow]];
+}
+
+- (void) maximize {
+    CGRect a = [NSApp mainWindow].frame;
+    _oldRestoreFrame = CGRectMake(a.origin.x, a.origin.y, a.size.width, a.size.height);
+    [[NSApp mainWindow] setFrame:[[NSScreen mainScreen] visibleFrame] display:YES];
+}
+
+- (Boolean) isMaximized {
+    NSRect a = [NSApp mainWindow].frame;
+    NSRect b = [[NSScreen mainScreen] visibleFrame];
+    return a.origin.x == b.origin.x && a.origin.y == b.origin.y && a.size.width == b.size.width && a.size.height == b.size.height;
+}
+
+- (CGFloat) getX {
+    NSRect frame = [self.webView window].frame;
+    return frame.origin.x;
+}
+
+- (CGFloat) getY {
+    NSRect frame = [self.webView window].frame;
+    return frame.origin.y;
+}
+
+- (void) move:(NSDictionary *)properties
+{
+    NSRect frame = [self.webView window].frame;
+    frame.origin.x = [[properties valueForKey:@"x"] doubleValue];
+    frame.origin.y = [[properties valueForKey:@"y"] doubleValue];
+    [[self.webView window] setFrame:frame display:YES];
+    
+}
+
+- (void) resize:(NSDictionary *) properties
+{
+    NSRect frame = [self.webView window].frame;
+    frame.size.width = [[properties valueForKey:@"width"] doubleValue];
+    frame.size.height = [[properties valueForKey:@"height"] doubleValue];
+    [[self.webView window] setFrame:frame display:YES];    
+}
+
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+    return NO;
+}
+
++ (NSString*) webScriptNameForSelector:(SEL)selector{
+	id	result = nil;
+	
+	if (selector == @selector(open:)) {
+		result = @"open";
+	}else if (selector == @selector(move:)){
+        result = @"move";
+    }else if (selector == @selector(resize:)){
+        result = @"resize";
+    }
+	
+	return result;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return YES;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.h
new file mode 100644
index 000000000..6c1a2f513
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.h
@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+
+@interface Clipboard : NSObject {
+    
+}
+
+- (void) copy:(NSString*)text;
+- (NSString *) paste;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.m
new file mode 100644
index 000000000..1c18dea38
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/Clipboard.m
@@ -0,0 +1,51 @@
+//
+//  clipboard.m
+//  MacGap
+//
+//  Created by David Zorychta on 2013-07-22.
+//  Copyright (c) 2013 Twitter. All rights reserved.
+//
+
+#import "Clipboard.h"
+
+@implementation Clipboard
+
+- (void) copy:(NSString*)text {
+    [[NSPasteboard generalPasteboard] clearContents];
+    [[NSPasteboard generalPasteboard] setString:text  forType:NSStringPboardType];
+}
+
+- (NSString *) paste {
+    NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
+    NSArray *classArray = [NSArray arrayWithObject:[NSString class]];
+    NSDictionary *options = [NSDictionary dictionary];
+    BOOL ok = [pasteboard canReadObjectForClasses:classArray options:options];
+    if (ok) {
+        NSArray *objectsToPaste = [pasteboard readObjectsForClasses:classArray options:options];
+        return (NSString *) [objectsToPaste objectAtIndex:0];
+    }
+    return @"";
+}
+
++ (NSString*) webScriptNameForSelector:(SEL)selector
+{
+	id	result = nil;
+	
+	if (selector == @selector(copy:)) {
+        result = @"copy";
+    }
+	
+	return result;
+}
+
++ (BOOL) isSelectorExcludedFromWebScript:(SEL)selector
+{
+    return NO;
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char*)name
+{
+	return YES;
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist b/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist
new file mode 100644
index 000000000..7f71ea229
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Info.plist
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>ZeroTier One</string>
+	<key>CFBundleIconFile</key>
+	<string>ZeroTierIcon</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>ZeroTier One</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+</dict>
+</plist>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Prefix.pch b/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Prefix.pch
new file mode 100644
index 000000000..ad05e8420
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/MacGap-Prefix.pch
@@ -0,0 +1,15 @@
+//
+// Prefix header for all source files of the 'MacGap' target in the 'MacGap' project
+//
+
+#ifdef __OBJC__
+    #ifdef _DEBUG
+    #define DebugNSLog(format, ...) NSLog(format, ## __VA_ARGS__)
+    #else
+    #define DebugNSLog(format, ...)
+    #endif
+
+    #import <Cocoa/Cocoa.h>
+    #import "Constants.h"
+    #import "Utils.h"
+#endif
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.h b/ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.h
new file mode 100644
index 000000000..72927effa
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.h
@@ -0,0 +1,13 @@
+#import <Cocoa/Cocoa.h>
+#import "ContentView.h"
+
+@interface WindowController : NSWindowController {
+    
+}
+
+- (id) initWithURL:(NSString *) url;
+- (id) initWithRequest: (NSURLRequest *)request;
+@property (retain) NSURL * url;
+@property (retain) IBOutlet ContentView *contentView;
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.m
new file mode 100644
index 000000000..2765a2e3c
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/WindowController.m
@@ -0,0 +1,54 @@
+#import "WindowController.h"
+
+
+@interface WindowController() {
+
+}
+
+-(void) notificationCenter;
+
+@end
+
+@implementation WindowController
+
+@synthesize  contentView, url;
+
+- (id) initWithURL:(NSString *) relativeURL{
+    self = [super initWithWindowNibName:@"Window"];
+    self.url = [NSURL URLWithString:relativeURL relativeToURL:[[NSBundle mainBundle] resourceURL]];
+    
+    [self.window setFrameAutosaveName:@"MacGapWindow"];
+    [self notificationCenter];
+
+    return self;
+}
+
+-(id) initWithRequest: (NSURLRequest *)request{
+    self = [super initWithWindowNibName:@"Window"];
+    [self notificationCenter];
+    [[self.contentView.webView mainFrame] loadRequest:request];
+    
+    return self;
+}
+
+-(void) notificationCenter{
+    [[NSNotificationCenter defaultCenter] addObserver:self.contentView 
+                                             selector:@selector(windowResized:) 
+                                                 name:NSWindowDidResizeNotification 
+                                               object:[self window]];   
+}
+
+- (void)windowDidLoad
+{
+    [super windowDidLoad];
+    
+    if (self.url != nil) {
+        [self.contentView.webView setMainFrameURL:[self.url absoluteString]];
+    }
+    
+    
+    // Implement this method to handle any initialization after your 
+    // window controller's window has been loaded from its nib file.
+}
+
+@end
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Credits.rtf b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Credits.rtf
new file mode 100644
index 000000000..6f388f662
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Credits.rtf
@@ -0,0 +1,13 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\vieww9600\viewh8400\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+
+\f0\b\fs24 \cf0 (c)2011-2015 ZeroTier, Inc.\
+Licensed under the GNU GPLv3\
+\
+UI Wrapper MacGap (c) Twitter, Inc.\
+Licensed under the MIT License\
+http://macgap.com/\
+}
\ No newline at end of file
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/InfoPlist.strings b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/InfoPlist.strings
new file mode 100644
index 000000000..477b28ff8
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib
new file mode 100644
index 000000000..dd67a86ae
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/MainMenu.xib
@@ -0,0 +1,3404 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">14D136</string>
+		<string key="IBDocument.InterfaceBuilderVersion">7702</string>
+		<string key="IBDocument.AppKitVersion">1347.57</string>
+		<string key="IBDocument.HIToolboxVersion">758.70</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">7702</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSCustomObject</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+			<object class="NSCustomObject" id="1021">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="1014">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1050">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="976324537">
+				<string key="NSClassName">AppDelegate</string>
+			</object>
+			<object class="NSMenu" id="649796088">
+				<string key="NSTitle">AMainMenu</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="694149608">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">ZeroTier One</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="35465992">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="110575045"/>
+						<object class="NSMenu" key="NSSubmenu" id="110575045">
+							<string key="NSTitle">ZeroTier One</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="238522557">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">About ZeroTier One</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="304266470">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="609285721">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Preferences…</string>
+									<string key="NSKeyEquiv">,</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="481834944">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1046388886">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Services</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="752062318"/>
+									<object class="NSMenu" key="NSSubmenu" id="752062318">
+										<string key="NSTitle">Services</string>
+										<array class="NSMutableArray" key="NSMenuItems"/>
+										<string key="NSName">_NSServicesMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="646227648">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="755159360">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Hide ZeroTier One</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="342932134">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Hide Others</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="908899353">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Show All</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1056857174">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="632727374">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Quit ZeroTier One</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="379814623">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">File</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="720053764"/>
+						<object class="NSMenu" key="NSSubmenu" id="720053764">
+							<string key="NSTitle">File</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="705341025">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">New</string>
+									<string key="NSKeyEquiv">n</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="722745758">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Open…</string>
+									<string key="NSKeyEquiv">o</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1025936716">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Open Recent</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="1065607017"/>
+									<object class="NSMenu" key="NSSubmenu" id="1065607017">
+										<string key="NSTitle">Open Recent</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="759406840">
+												<reference key="NSMenu" ref="1065607017"/>
+												<string key="NSTitle">Clear Menu</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</array>
+										<string key="NSName">_NSRecentDocumentsMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="425164168">
+									<reference key="NSMenu" ref="720053764"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="776162233">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Close</string>
+									<string key="NSKeyEquiv">w</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1023925487">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Save…</string>
+									<string key="NSKeyEquiv">s</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="579971712">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Revert to Saved</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1010469920">
+									<reference key="NSMenu" ref="720053764"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="294629803">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Page Setup...</string>
+									<string key="NSKeyEquiv">P</string>
+									<int key="NSKeyEquivModMask">1179648</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSToolTip"/>
+								</object>
+								<object class="NSMenuItem" id="49223823">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Print…</string>
+									<string key="NSKeyEquiv">p</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="952259628">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Edit</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="789758025"/>
+						<object class="NSMenu" key="NSSubmenu" id="789758025">
+							<string key="NSTitle">Edit</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="1058277027">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Undo</string>
+									<string key="NSKeyEquiv">z</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="790794224">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Redo</string>
+									<string key="NSKeyEquiv">Z</string>
+									<int key="NSKeyEquivModMask">1179648</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1040322652">
+									<reference key="NSMenu" ref="789758025"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="296257095">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Cut</string>
+									<string key="NSKeyEquiv">x</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="860595796">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Copy</string>
+									<string key="NSKeyEquiv">c</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="29853731">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Paste</string>
+									<string key="NSKeyEquiv">v</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="82994268">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Paste and Match Style</string>
+									<string key="NSKeyEquiv">V</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="437104165">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Delete</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="583158037">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Select All</string>
+									<string key="NSKeyEquiv">a</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="212016141">
+									<reference key="NSMenu" ref="789758025"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="892235320">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Find</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="963351320"/>
+									<object class="NSMenu" key="NSSubmenu" id="963351320">
+										<string key="NSTitle">Find</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="447796847">
+												<reference key="NSMenu" ref="963351320"/>
+												<string key="NSTitle">Find…</string>
+												<string key="NSKeyEquiv">f</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">1</int>
+											</object>
+											<object class="NSMenuItem" id="738670835">
+												<reference key="NSMenu" ref="963351320"/>
+												<string key="NSTitle">Find and Replace…</string>
+												<string key="NSKeyEquiv">f</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">12</int>
+											</object>
+											<object class="NSMenuItem" id="326711663">
+												<reference key="NSMenu" ref="963351320"/>
+												<string key="NSTitle">Find Next</string>
+												<string key="NSKeyEquiv">g</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">2</int>
+											</object>
+											<object class="NSMenuItem" id="270902937">
+												<reference key="NSMenu" ref="963351320"/>
+												<string key="NSTitle">Find Previous</string>
+												<string key="NSKeyEquiv">G</string>
+												<int key="NSKeyEquivModMask">1179648</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">3</int>
+											</object>
+											<object class="NSMenuItem" id="159080638">
+												<reference key="NSMenu" ref="963351320"/>
+												<string key="NSTitle">Use Selection for Find</string>
+												<string key="NSKeyEquiv">e</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">7</int>
+											</object>
+											<object class="NSMenuItem" id="88285865">
+												<reference key="NSMenu" ref="963351320"/>
+												<string key="NSTitle">Jump to Selection</string>
+												<string key="NSKeyEquiv">j</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="972420730">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Spelling and Grammar</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="769623530"/>
+									<object class="NSMenu" key="NSSubmenu" id="769623530">
+										<string key="NSTitle">Spelling and Grammar</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="679648819">
+												<reference key="NSMenu" ref="769623530"/>
+												<string key="NSTitle">Show Spelling and Grammar</string>
+												<string key="NSKeyEquiv">:</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="96193923">
+												<reference key="NSMenu" ref="769623530"/>
+												<string key="NSTitle">Check Document Now</string>
+												<string key="NSKeyEquiv">;</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="859480356">
+												<reference key="NSMenu" ref="769623530"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="948374510">
+												<reference key="NSMenu" ref="769623530"/>
+												<string key="NSTitle">Check Spelling While Typing</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="967646866">
+												<reference key="NSMenu" ref="769623530"/>
+												<string key="NSTitle">Check Grammar With Spelling</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="795346622">
+												<reference key="NSMenu" ref="769623530"/>
+												<string key="NSTitle">Correct Spelling Automatically</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="507821607">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Substitutions</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="698887838"/>
+									<object class="NSMenu" key="NSSubmenu" id="698887838">
+										<string key="NSTitle">Substitutions</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="65139061">
+												<reference key="NSMenu" ref="698887838"/>
+												<string key="NSTitle">Show Substitutions</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="19036812">
+												<reference key="NSMenu" ref="698887838"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="605118523">
+												<reference key="NSMenu" ref="698887838"/>
+												<string key="NSTitle">Smart Copy/Paste</string>
+												<string key="NSKeyEquiv">f</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">1</int>
+											</object>
+											<object class="NSMenuItem" id="197661976">
+												<reference key="NSMenu" ref="698887838"/>
+												<string key="NSTitle">Smart Quotes</string>
+												<string key="NSKeyEquiv">g</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">2</int>
+											</object>
+											<object class="NSMenuItem" id="672708820">
+												<reference key="NSMenu" ref="698887838"/>
+												<string key="NSTitle">Smart Dashes</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="708854459">
+												<reference key="NSMenu" ref="698887838"/>
+												<string key="NSTitle">Smart Links</string>
+												<string key="NSKeyEquiv">G</string>
+												<int key="NSKeyEquivModMask">1179648</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">3</int>
+											</object>
+											<object class="NSMenuItem" id="537092702">
+												<reference key="NSMenu" ref="698887838"/>
+												<string key="NSTitle">Text Replacement</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="288088188">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Transformations</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="579392910"/>
+									<object class="NSMenu" key="NSSubmenu" id="579392910">
+										<string key="NSTitle">Transformations</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="1060694897">
+												<reference key="NSMenu" ref="579392910"/>
+												<string key="NSTitle">Make Upper Case</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="879586729">
+												<reference key="NSMenu" ref="579392910"/>
+												<string key="NSTitle">Make Lower Case</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="56570060">
+												<reference key="NSMenu" ref="579392910"/>
+												<string key="NSTitle">Capitalize</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="676164635">
+									<reference key="NSMenu" ref="789758025"/>
+									<string key="NSTitle">Speech</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="785027613"/>
+									<object class="NSMenu" key="NSSubmenu" id="785027613">
+										<string key="NSTitle">Speech</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="731782645">
+												<reference key="NSMenu" ref="785027613"/>
+												<string key="NSTitle">Start Speaking</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="680220178">
+												<reference key="NSMenu" ref="785027613"/>
+												<string key="NSTitle">Stop Speaking</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</array>
+									</object>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="302598603">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Format</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="941447902"/>
+						<object class="NSMenu" key="NSSubmenu" id="941447902">
+							<string key="NSTitle">Format</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="792887677">
+									<reference key="NSMenu" ref="941447902"/>
+									<string key="NSTitle">Font</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="786677654"/>
+									<object class="NSMenu" key="NSSubmenu" id="786677654">
+										<string key="NSTitle">Font</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="159677712">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Show Fonts</string>
+												<string key="NSKeyEquiv">t</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="305399458">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Bold</string>
+												<string key="NSKeyEquiv">b</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">2</int>
+											</object>
+											<object class="NSMenuItem" id="814362025">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Italic</string>
+												<string key="NSKeyEquiv">i</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">1</int>
+											</object>
+											<object class="NSMenuItem" id="330926929">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Underline</string>
+												<string key="NSKeyEquiv">u</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="533507878">
+												<reference key="NSMenu" ref="786677654"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="158063935">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Bigger</string>
+												<string key="NSKeyEquiv">+</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">3</int>
+											</object>
+											<object class="NSMenuItem" id="885547335">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Smaller</string>
+												<string key="NSKeyEquiv">-</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">4</int>
+											</object>
+											<object class="NSMenuItem" id="901062459">
+												<reference key="NSMenu" ref="786677654"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="767671776">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Kern</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<string key="NSAction">submenuAction:</string>
+												<reference key="NSTarget" ref="175441468"/>
+												<object class="NSMenu" key="NSSubmenu" id="175441468">
+													<string key="NSTitle">Kern</string>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<object class="NSMenuItem" id="252969304">
+															<reference key="NSMenu" ref="175441468"/>
+															<string key="NSTitle">Use Default</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="766922938">
+															<reference key="NSMenu" ref="175441468"/>
+															<string key="NSTitle">Use None</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="677519740">
+															<reference key="NSMenu" ref="175441468"/>
+															<string key="NSTitle">Tighten</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="238351151">
+															<reference key="NSMenu" ref="175441468"/>
+															<string key="NSTitle">Loosen</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+													</array>
+												</object>
+											</object>
+											<object class="NSMenuItem" id="691570813">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Ligature</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<string key="NSAction">submenuAction:</string>
+												<reference key="NSTarget" ref="1058217995"/>
+												<object class="NSMenu" key="NSSubmenu" id="1058217995">
+													<string key="NSTitle">Ligature</string>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<object class="NSMenuItem" id="706297211">
+															<reference key="NSMenu" ref="1058217995"/>
+															<string key="NSTitle">Use Default</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="568384683">
+															<reference key="NSMenu" ref="1058217995"/>
+															<string key="NSTitle">Use None</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="663508465">
+															<reference key="NSMenu" ref="1058217995"/>
+															<string key="NSTitle">Use All</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+													</array>
+												</object>
+											</object>
+											<object class="NSMenuItem" id="769124883">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Baseline</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<string key="NSAction">submenuAction:</string>
+												<reference key="NSTarget" ref="18263474"/>
+												<object class="NSMenu" key="NSSubmenu" id="18263474">
+													<string key="NSTitle">Baseline</string>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<object class="NSMenuItem" id="257962622">
+															<reference key="NSMenu" ref="18263474"/>
+															<string key="NSTitle">Use Default</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="644725453">
+															<reference key="NSMenu" ref="18263474"/>
+															<string key="NSTitle">Superscript</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="1037576581">
+															<reference key="NSMenu" ref="18263474"/>
+															<string key="NSTitle">Subscript</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="941806246">
+															<reference key="NSMenu" ref="18263474"/>
+															<string key="NSTitle">Raise</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="1045724900">
+															<reference key="NSMenu" ref="18263474"/>
+															<string key="NSTitle">Lower</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+													</array>
+												</object>
+											</object>
+											<object class="NSMenuItem" id="739652853">
+												<reference key="NSMenu" ref="786677654"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="1012600125">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Show Colors</string>
+												<string key="NSKeyEquiv">C</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="214559597">
+												<reference key="NSMenu" ref="786677654"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="596732606">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Copy Style</string>
+												<string key="NSKeyEquiv">c</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="393423671">
+												<reference key="NSMenu" ref="786677654"/>
+												<string key="NSTitle">Paste Style</string>
+												<string key="NSKeyEquiv">v</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</array>
+										<string key="NSName">_NSFontMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="215659978">
+									<reference key="NSMenu" ref="941447902"/>
+									<string key="NSTitle">Text</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="446991534"/>
+									<object class="NSMenu" key="NSSubmenu" id="446991534">
+										<string key="NSTitle">Text</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="875092757">
+												<reference key="NSMenu" ref="446991534"/>
+												<string key="NSTitle">Align Left</string>
+												<string key="NSKeyEquiv">{</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="630155264">
+												<reference key="NSMenu" ref="446991534"/>
+												<string key="NSTitle">Center</string>
+												<string key="NSKeyEquiv">|</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="945678886">
+												<reference key="NSMenu" ref="446991534"/>
+												<string key="NSTitle">Justify</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="512868991">
+												<reference key="NSMenu" ref="446991534"/>
+												<string key="NSTitle">Align Right</string>
+												<string key="NSKeyEquiv">}</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="163117631">
+												<reference key="NSMenu" ref="446991534"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="31516759">
+												<reference key="NSMenu" ref="446991534"/>
+												<string key="NSTitle">Writing Direction</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<string key="NSAction">submenuAction:</string>
+												<reference key="NSTarget" ref="956096989"/>
+												<object class="NSMenu" key="NSSubmenu" id="956096989">
+													<string key="NSTitle">Writing Direction</string>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<object class="NSMenuItem" id="257099033">
+															<reference key="NSMenu" ref="956096989"/>
+															<bool key="NSIsDisabled">YES</bool>
+															<string key="NSTitle">Paragraph</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="551969625">
+															<reference key="NSMenu" ref="956096989"/>
+															<string type="base64-UTF8" key="NSTitle">CURlZmF1bHQ</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="249532473">
+															<reference key="NSMenu" ref="956096989"/>
+															<string type="base64-UTF8" key="NSTitle">CUxlZnQgdG8gUmlnaHQ</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="607364498">
+															<reference key="NSMenu" ref="956096989"/>
+															<string type="base64-UTF8" key="NSTitle">CVJpZ2h0IHRvIExlZnQ</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="508151438">
+															<reference key="NSMenu" ref="956096989"/>
+															<bool key="NSIsDisabled">YES</bool>
+															<bool key="NSIsSeparator">YES</bool>
+															<string key="NSTitle"/>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="981751889">
+															<reference key="NSMenu" ref="956096989"/>
+															<bool key="NSIsDisabled">YES</bool>
+															<string key="NSTitle">Selection</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="380031999">
+															<reference key="NSMenu" ref="956096989"/>
+															<string type="base64-UTF8" key="NSTitle">CURlZmF1bHQ</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="825984362">
+															<reference key="NSMenu" ref="956096989"/>
+															<string type="base64-UTF8" key="NSTitle">CUxlZnQgdG8gUmlnaHQ</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+														<object class="NSMenuItem" id="560145579">
+															<reference key="NSMenu" ref="956096989"/>
+															<string type="base64-UTF8" key="NSTitle">CVJpZ2h0IHRvIExlZnQ</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="35465992"/>
+															<reference key="NSMixedImage" ref="502551668"/>
+														</object>
+													</array>
+												</object>
+											</object>
+											<object class="NSMenuItem" id="908105787">
+												<reference key="NSMenu" ref="446991534"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="644046920">
+												<reference key="NSMenu" ref="446991534"/>
+												<string key="NSTitle">Show Ruler</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="231811626">
+												<reference key="NSMenu" ref="446991534"/>
+												<string key="NSTitle">Copy Ruler</string>
+												<string key="NSKeyEquiv">c</string>
+												<int key="NSKeyEquivModMask">1310720</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="883618387">
+												<reference key="NSMenu" ref="446991534"/>
+												<string key="NSTitle">Paste Ruler</string>
+												<string key="NSKeyEquiv">v</string>
+												<int key="NSKeyEquivModMask">1310720</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</array>
+									</object>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="586577488">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">View</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="466310130"/>
+						<object class="NSMenu" key="NSSubmenu" id="466310130">
+							<string key="NSTitle">View</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="102151532">
+									<reference key="NSMenu" ref="466310130"/>
+									<string key="NSTitle">Show Toolbar</string>
+									<string key="NSKeyEquiv">t</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="237841660">
+									<reference key="NSMenu" ref="466310130"/>
+									<string key="NSTitle">Customize Toolbar…</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="713487014">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Window</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="835318025"/>
+						<object class="NSMenu" key="NSSubmenu" id="835318025">
+							<string key="NSTitle">Window</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="1011231497">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Minimize</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="575023229">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Zoom</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="299356726">
+									<reference key="NSMenu" ref="835318025"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="625202149">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Bring All to Front</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="448692316">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Help</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="992780483"/>
+						<object class="NSMenu" key="NSSubmenu" id="992780483">
+							<string key="NSTitle">Help</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="105068016">
+									<reference key="NSMenu" ref="992780483"/>
+									<string key="NSTitle">ZeroTier One Help</string>
+									<string key="NSKeyEquiv">?</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+							<string key="NSName">_NSHelpMenu</string>
+						</object>
+					</object>
+				</array>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="632727374"/>
+					</object>
+					<int key="connectionID">449</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="238522557"/>
+					</object>
+					<int key="connectionID">142</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="976324537"/>
+					</object>
+					<int key="connectionID">547</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performMiniaturize:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1011231497"/>
+					</object>
+					<int key="connectionID">37</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">arrangeInFront:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="625202149"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">print:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="49223823"/>
+					</object>
+					<int key="connectionID">86</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">runPageLayout:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="294629803"/>
+					</object>
+					<int key="connectionID">87</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clearRecentDocuments:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="759406840"/>
+					</object>
+					<int key="connectionID">127</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClose:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="776162233"/>
+					</object>
+					<int key="connectionID">193</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleContinuousSpellChecking:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="948374510"/>
+					</object>
+					<int key="connectionID">222</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">undo:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1058277027"/>
+					</object>
+					<int key="connectionID">223</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copy:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="860595796"/>
+					</object>
+					<int key="connectionID">224</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">checkSpelling:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="96193923"/>
+					</object>
+					<int key="connectionID">225</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">paste:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="29853731"/>
+					</object>
+					<int key="connectionID">226</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">stopSpeaking:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="680220178"/>
+					</object>
+					<int key="connectionID">227</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cut:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="296257095"/>
+					</object>
+					<int key="connectionID">228</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showGuessPanel:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="679648819"/>
+					</object>
+					<int key="connectionID">230</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">redo:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="790794224"/>
+					</object>
+					<int key="connectionID">231</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectAll:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="583158037"/>
+					</object>
+					<int key="connectionID">232</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">startSpeaking:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="731782645"/>
+					</object>
+					<int key="connectionID">233</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">delete:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="437104165"/>
+					</object>
+					<int key="connectionID">235</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performZoom:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="575023229"/>
+					</object>
+					<int key="connectionID">240</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="447796847"/>
+					</object>
+					<int key="connectionID">241</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">centerSelectionInVisibleArea:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="88285865"/>
+					</object>
+					<int key="connectionID">245</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleGrammarChecking:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="967646866"/>
+					</object>
+					<int key="connectionID">347</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleSmartInsertDelete:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="605118523"/>
+					</object>
+					<int key="connectionID">355</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticQuoteSubstitution:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="197661976"/>
+					</object>
+					<int key="connectionID">356</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticLinkDetection:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="708854459"/>
+					</object>
+					<int key="connectionID">357</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">saveDocument:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1023925487"/>
+					</object>
+					<int key="connectionID">362</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">revertDocumentToSaved:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="579971712"/>
+					</object>
+					<int key="connectionID">364</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">runToolbarCustomizationPalette:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="237841660"/>
+					</object>
+					<int key="connectionID">365</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleToolbarShown:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="102151532"/>
+					</object>
+					<int key="connectionID">366</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="755159360"/>
+					</object>
+					<int key="connectionID">367</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="342932134"/>
+					</object>
+					<int key="connectionID">368</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="908899353"/>
+					</object>
+					<int key="connectionID">370</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">newDocument:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="705341025"/>
+					</object>
+					<int key="connectionID">373</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">openDocument:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="722745758"/>
+					</object>
+					<int key="connectionID">374</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">raiseBaseline:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="941806246"/>
+					</object>
+					<int key="connectionID">426</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">lowerBaseline:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1045724900"/>
+					</object>
+					<int key="connectionID">427</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copyFont:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="596732606"/>
+					</object>
+					<int key="connectionID">428</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">subscript:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1037576581"/>
+					</object>
+					<int key="connectionID">429</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">superscript:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="644725453"/>
+					</object>
+					<int key="connectionID">430</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">tightenKerning:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="677519740"/>
+					</object>
+					<int key="connectionID">431</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">underline:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="330926929"/>
+					</object>
+					<int key="connectionID">432</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontColorPanel:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1012600125"/>
+					</object>
+					<int key="connectionID">433</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">useAllLigatures:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="663508465"/>
+					</object>
+					<int key="connectionID">434</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">loosenKerning:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="238351151"/>
+					</object>
+					<int key="connectionID">435</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">pasteFont:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="393423671"/>
+					</object>
+					<int key="connectionID">436</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unscript:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="257962622"/>
+					</object>
+					<int key="connectionID">437</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">useStandardKerning:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="252969304"/>
+					</object>
+					<int key="connectionID">438</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">useStandardLigatures:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="706297211"/>
+					</object>
+					<int key="connectionID">439</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">turnOffLigatures:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="568384683"/>
+					</object>
+					<int key="connectionID">440</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">turnOffKerning:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="766922938"/>
+					</object>
+					<int key="connectionID">441</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticSpellingCorrection:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="795346622"/>
+					</object>
+					<int key="connectionID">456</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontSubstitutionsPanel:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="65139061"/>
+					</object>
+					<int key="connectionID">458</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticDashSubstitution:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="672708820"/>
+					</object>
+					<int key="connectionID">461</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticTextReplacement:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="537092702"/>
+					</object>
+					<int key="connectionID">463</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">uppercaseWord:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1060694897"/>
+					</object>
+					<int key="connectionID">464</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">capitalizeWord:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="56570060"/>
+					</object>
+					<int key="connectionID">467</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">lowercaseWord:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="879586729"/>
+					</object>
+					<int key="connectionID">468</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">pasteAsPlainText:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="82994268"/>
+					</object>
+					<int key="connectionID">486</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="326711663"/>
+					</object>
+					<int key="connectionID">487</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="270902937"/>
+					</object>
+					<int key="connectionID">488</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="159080638"/>
+					</object>
+					<int key="connectionID">489</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showHelp:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="105068016"/>
+					</object>
+					<int key="connectionID">493</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">alignCenter:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="630155264"/>
+					</object>
+					<int key="connectionID">518</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">pasteRuler:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="883618387"/>
+					</object>
+					<int key="connectionID">519</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleRuler:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="644046920"/>
+					</object>
+					<int key="connectionID">520</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">alignRight:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="512868991"/>
+					</object>
+					<int key="connectionID">521</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copyRuler:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="231811626"/>
+					</object>
+					<int key="connectionID">522</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">alignJustified:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="945678886"/>
+					</object>
+					<int key="connectionID">523</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">alignLeft:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="875092757"/>
+					</object>
+					<int key="connectionID">524</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeBaseWritingDirectionNatural:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="551969625"/>
+					</object>
+					<int key="connectionID">525</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeBaseWritingDirectionLeftToRight:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="249532473"/>
+					</object>
+					<int key="connectionID">526</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeBaseWritingDirectionRightToLeft:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="607364498"/>
+					</object>
+					<int key="connectionID">527</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeTextWritingDirectionNatural:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="380031999"/>
+					</object>
+					<int key="connectionID">528</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeTextWritingDirectionLeftToRight:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="825984362"/>
+					</object>
+					<int key="connectionID">529</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeTextWritingDirectionRightToLeft:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="560145579"/>
+					</object>
+					<int key="connectionID">530</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="738670835"/>
+					</object>
+					<int key="connectionID">535</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="649796088"/>
+						<reference key="destination" ref="1021"/>
+					</object>
+					<int key="connectionID">545</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1048"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1021"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1014"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1050"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="649796088"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="713487014"/>
+							<reference ref="694149608"/>
+							<reference ref="952259628"/>
+							<reference ref="379814623"/>
+							<reference ref="586577488"/>
+							<reference ref="302598603"/>
+							<reference ref="448692316"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="713487014"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="835318025"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="694149608"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="110575045"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">217</int>
+						<reference key="object" ref="952259628"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="789758025"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="379814623"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="720053764"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">81</int>
+						<reference key="object" ref="720053764"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1023925487"/>
+							<reference ref="49223823"/>
+							<reference ref="722745758"/>
+							<reference ref="705341025"/>
+							<reference ref="1025936716"/>
+							<reference ref="294629803"/>
+							<reference ref="776162233"/>
+							<reference ref="425164168"/>
+							<reference ref="579971712"/>
+							<reference ref="1010469920"/>
+						</array>
+						<reference key="parent" ref="379814623"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">75</int>
+						<reference key="object" ref="1023925487"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">78</int>
+						<reference key="object" ref="49223823"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">72</int>
+						<reference key="object" ref="722745758"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">82</int>
+						<reference key="object" ref="705341025"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">124</int>
+						<reference key="object" ref="1025936716"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1065607017"/>
+						</array>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">77</int>
+						<reference key="object" ref="294629803"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="776162233"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="425164168"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">112</int>
+						<reference key="object" ref="579971712"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="1010469920"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">125</int>
+						<reference key="object" ref="1065607017"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="759406840"/>
+						</array>
+						<reference key="parent" ref="1025936716"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">126</int>
+						<reference key="object" ref="759406840"/>
+						<reference key="parent" ref="1065607017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">205</int>
+						<reference key="object" ref="789758025"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="437104165"/>
+							<reference ref="583158037"/>
+							<reference ref="1058277027"/>
+							<reference ref="212016141"/>
+							<reference ref="296257095"/>
+							<reference ref="29853731"/>
+							<reference ref="860595796"/>
+							<reference ref="1040322652"/>
+							<reference ref="790794224"/>
+							<reference ref="892235320"/>
+							<reference ref="972420730"/>
+							<reference ref="676164635"/>
+							<reference ref="507821607"/>
+							<reference ref="288088188"/>
+							<reference ref="82994268"/>
+						</array>
+						<reference key="parent" ref="952259628"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">202</int>
+						<reference key="object" ref="437104165"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">198</int>
+						<reference key="object" ref="583158037"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">207</int>
+						<reference key="object" ref="1058277027"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">214</int>
+						<reference key="object" ref="212016141"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">199</int>
+						<reference key="object" ref="296257095"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
+						<reference key="object" ref="29853731"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">197</int>
+						<reference key="object" ref="860595796"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">206</int>
+						<reference key="object" ref="1040322652"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">215</int>
+						<reference key="object" ref="790794224"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">218</int>
+						<reference key="object" ref="892235320"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="963351320"/>
+						</array>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">216</int>
+						<reference key="object" ref="972420730"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="769623530"/>
+						</array>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">200</int>
+						<reference key="object" ref="769623530"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="948374510"/>
+							<reference ref="96193923"/>
+							<reference ref="679648819"/>
+							<reference ref="967646866"/>
+							<reference ref="859480356"/>
+							<reference ref="795346622"/>
+						</array>
+						<reference key="parent" ref="972420730"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">219</int>
+						<reference key="object" ref="948374510"/>
+						<reference key="parent" ref="769623530"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">201</int>
+						<reference key="object" ref="96193923"/>
+						<reference key="parent" ref="769623530"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="679648819"/>
+						<reference key="parent" ref="769623530"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">220</int>
+						<reference key="object" ref="963351320"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="270902937"/>
+							<reference ref="88285865"/>
+							<reference ref="159080638"/>
+							<reference ref="326711663"/>
+							<reference ref="447796847"/>
+							<reference ref="738670835"/>
+						</array>
+						<reference key="parent" ref="892235320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">213</int>
+						<reference key="object" ref="270902937"/>
+						<reference key="parent" ref="963351320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">210</int>
+						<reference key="object" ref="88285865"/>
+						<reference key="parent" ref="963351320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">221</int>
+						<reference key="object" ref="159080638"/>
+						<reference key="parent" ref="963351320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">208</int>
+						<reference key="object" ref="326711663"/>
+						<reference key="parent" ref="963351320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">209</int>
+						<reference key="object" ref="447796847"/>
+						<reference key="parent" ref="963351320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="110575045"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="238522557"/>
+							<reference ref="755159360"/>
+							<reference ref="908899353"/>
+							<reference ref="632727374"/>
+							<reference ref="646227648"/>
+							<reference ref="609285721"/>
+							<reference ref="481834944"/>
+							<reference ref="304266470"/>
+							<reference ref="1046388886"/>
+							<reference ref="1056857174"/>
+							<reference ref="342932134"/>
+						</array>
+						<reference key="parent" ref="694149608"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="238522557"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="755159360"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="908899353"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="632727374"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="646227648"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="609285721"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="481834944"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">236</int>
+						<reference key="object" ref="304266470"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="1046388886"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="752062318"/>
+						</array>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="1056857174"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="342932134"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="752062318"/>
+						<reference key="parent" ref="1046388886"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="835318025"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="299356726"/>
+							<reference ref="625202149"/>
+							<reference ref="575023229"/>
+							<reference ref="1011231497"/>
+						</array>
+						<reference key="parent" ref="713487014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="299356726"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="625202149"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">239</int>
+						<reference key="object" ref="575023229"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="1011231497"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">295</int>
+						<reference key="object" ref="586577488"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="466310130"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">296</int>
+						<reference key="object" ref="466310130"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="102151532"/>
+							<reference ref="237841660"/>
+						</array>
+						<reference key="parent" ref="586577488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">297</int>
+						<reference key="object" ref="102151532"/>
+						<reference key="parent" ref="466310130"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">298</int>
+						<reference key="object" ref="237841660"/>
+						<reference key="parent" ref="466310130"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">211</int>
+						<reference key="object" ref="676164635"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="785027613"/>
+						</array>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">212</int>
+						<reference key="object" ref="785027613"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="680220178"/>
+							<reference ref="731782645"/>
+						</array>
+						<reference key="parent" ref="676164635"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">195</int>
+						<reference key="object" ref="680220178"/>
+						<reference key="parent" ref="785027613"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">196</int>
+						<reference key="object" ref="731782645"/>
+						<reference key="parent" ref="785027613"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">346</int>
+						<reference key="object" ref="967646866"/>
+						<reference key="parent" ref="769623530"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">348</int>
+						<reference key="object" ref="507821607"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="698887838"/>
+						</array>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">349</int>
+						<reference key="object" ref="698887838"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="605118523"/>
+							<reference ref="197661976"/>
+							<reference ref="708854459"/>
+							<reference ref="65139061"/>
+							<reference ref="19036812"/>
+							<reference ref="672708820"/>
+							<reference ref="537092702"/>
+						</array>
+						<reference key="parent" ref="507821607"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">350</int>
+						<reference key="object" ref="605118523"/>
+						<reference key="parent" ref="698887838"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">351</int>
+						<reference key="object" ref="197661976"/>
+						<reference key="parent" ref="698887838"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">354</int>
+						<reference key="object" ref="708854459"/>
+						<reference key="parent" ref="698887838"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="302598603"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="941447902"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="941447902"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="792887677"/>
+							<reference ref="215659978"/>
+						</array>
+						<reference key="parent" ref="302598603"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">377</int>
+						<reference key="object" ref="792887677"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="786677654"/>
+						</array>
+						<reference key="parent" ref="941447902"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">388</int>
+						<reference key="object" ref="786677654"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="159677712"/>
+							<reference ref="305399458"/>
+							<reference ref="814362025"/>
+							<reference ref="330926929"/>
+							<reference ref="533507878"/>
+							<reference ref="158063935"/>
+							<reference ref="885547335"/>
+							<reference ref="901062459"/>
+							<reference ref="767671776"/>
+							<reference ref="691570813"/>
+							<reference ref="769124883"/>
+							<reference ref="739652853"/>
+							<reference ref="1012600125"/>
+							<reference ref="214559597"/>
+							<reference ref="596732606"/>
+							<reference ref="393423671"/>
+						</array>
+						<reference key="parent" ref="792887677"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">389</int>
+						<reference key="object" ref="159677712"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">390</int>
+						<reference key="object" ref="305399458"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">391</int>
+						<reference key="object" ref="814362025"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">392</int>
+						<reference key="object" ref="330926929"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">393</int>
+						<reference key="object" ref="533507878"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">394</int>
+						<reference key="object" ref="158063935"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">395</int>
+						<reference key="object" ref="885547335"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">396</int>
+						<reference key="object" ref="901062459"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">397</int>
+						<reference key="object" ref="767671776"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="175441468"/>
+						</array>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">398</int>
+						<reference key="object" ref="691570813"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1058217995"/>
+						</array>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">399</int>
+						<reference key="object" ref="769124883"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="18263474"/>
+						</array>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">400</int>
+						<reference key="object" ref="739652853"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">401</int>
+						<reference key="object" ref="1012600125"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">402</int>
+						<reference key="object" ref="214559597"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">403</int>
+						<reference key="object" ref="596732606"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">404</int>
+						<reference key="object" ref="393423671"/>
+						<reference key="parent" ref="786677654"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">405</int>
+						<reference key="object" ref="18263474"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="257962622"/>
+							<reference ref="644725453"/>
+							<reference ref="1037576581"/>
+							<reference ref="941806246"/>
+							<reference ref="1045724900"/>
+						</array>
+						<reference key="parent" ref="769124883"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">406</int>
+						<reference key="object" ref="257962622"/>
+						<reference key="parent" ref="18263474"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">407</int>
+						<reference key="object" ref="644725453"/>
+						<reference key="parent" ref="18263474"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">408</int>
+						<reference key="object" ref="1037576581"/>
+						<reference key="parent" ref="18263474"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">409</int>
+						<reference key="object" ref="941806246"/>
+						<reference key="parent" ref="18263474"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">410</int>
+						<reference key="object" ref="1045724900"/>
+						<reference key="parent" ref="18263474"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">411</int>
+						<reference key="object" ref="1058217995"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="706297211"/>
+							<reference ref="568384683"/>
+							<reference ref="663508465"/>
+						</array>
+						<reference key="parent" ref="691570813"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">412</int>
+						<reference key="object" ref="706297211"/>
+						<reference key="parent" ref="1058217995"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">413</int>
+						<reference key="object" ref="568384683"/>
+						<reference key="parent" ref="1058217995"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">414</int>
+						<reference key="object" ref="663508465"/>
+						<reference key="parent" ref="1058217995"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">415</int>
+						<reference key="object" ref="175441468"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="252969304"/>
+							<reference ref="766922938"/>
+							<reference ref="677519740"/>
+							<reference ref="238351151"/>
+						</array>
+						<reference key="parent" ref="767671776"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">416</int>
+						<reference key="object" ref="252969304"/>
+						<reference key="parent" ref="175441468"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">417</int>
+						<reference key="object" ref="766922938"/>
+						<reference key="parent" ref="175441468"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">418</int>
+						<reference key="object" ref="677519740"/>
+						<reference key="parent" ref="175441468"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">419</int>
+						<reference key="object" ref="238351151"/>
+						<reference key="parent" ref="175441468"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">450</int>
+						<reference key="object" ref="288088188"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="579392910"/>
+						</array>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">451</int>
+						<reference key="object" ref="579392910"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1060694897"/>
+							<reference ref="879586729"/>
+							<reference ref="56570060"/>
+						</array>
+						<reference key="parent" ref="288088188"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">452</int>
+						<reference key="object" ref="1060694897"/>
+						<reference key="parent" ref="579392910"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">453</int>
+						<reference key="object" ref="859480356"/>
+						<reference key="parent" ref="769623530"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">454</int>
+						<reference key="object" ref="795346622"/>
+						<reference key="parent" ref="769623530"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">457</int>
+						<reference key="object" ref="65139061"/>
+						<reference key="parent" ref="698887838"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">459</int>
+						<reference key="object" ref="19036812"/>
+						<reference key="parent" ref="698887838"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">460</int>
+						<reference key="object" ref="672708820"/>
+						<reference key="parent" ref="698887838"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">462</int>
+						<reference key="object" ref="537092702"/>
+						<reference key="parent" ref="698887838"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">465</int>
+						<reference key="object" ref="879586729"/>
+						<reference key="parent" ref="579392910"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">466</int>
+						<reference key="object" ref="56570060"/>
+						<reference key="parent" ref="579392910"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">485</int>
+						<reference key="object" ref="82994268"/>
+						<reference key="parent" ref="789758025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">490</int>
+						<reference key="object" ref="448692316"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="992780483"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">491</int>
+						<reference key="object" ref="992780483"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="105068016"/>
+						</array>
+						<reference key="parent" ref="448692316"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="105068016"/>
+						<reference key="parent" ref="992780483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">496</int>
+						<reference key="object" ref="215659978"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="446991534"/>
+						</array>
+						<reference key="parent" ref="941447902"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">497</int>
+						<reference key="object" ref="446991534"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="875092757"/>
+							<reference ref="630155264"/>
+							<reference ref="945678886"/>
+							<reference ref="512868991"/>
+							<reference ref="163117631"/>
+							<reference ref="31516759"/>
+							<reference ref="908105787"/>
+							<reference ref="644046920"/>
+							<reference ref="231811626"/>
+							<reference ref="883618387"/>
+						</array>
+						<reference key="parent" ref="215659978"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">498</int>
+						<reference key="object" ref="875092757"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">499</int>
+						<reference key="object" ref="630155264"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">500</int>
+						<reference key="object" ref="945678886"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">501</int>
+						<reference key="object" ref="512868991"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">502</int>
+						<reference key="object" ref="163117631"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">503</int>
+						<reference key="object" ref="31516759"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="956096989"/>
+						</array>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">504</int>
+						<reference key="object" ref="908105787"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">505</int>
+						<reference key="object" ref="644046920"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">506</int>
+						<reference key="object" ref="231811626"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">507</int>
+						<reference key="object" ref="883618387"/>
+						<reference key="parent" ref="446991534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">508</int>
+						<reference key="object" ref="956096989"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="257099033"/>
+							<reference ref="551969625"/>
+							<reference ref="249532473"/>
+							<reference ref="607364498"/>
+							<reference ref="508151438"/>
+							<reference ref="981751889"/>
+							<reference ref="380031999"/>
+							<reference ref="825984362"/>
+							<reference ref="560145579"/>
+						</array>
+						<reference key="parent" ref="31516759"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">509</int>
+						<reference key="object" ref="257099033"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">510</int>
+						<reference key="object" ref="551969625"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">511</int>
+						<reference key="object" ref="249532473"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">512</int>
+						<reference key="object" ref="607364498"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">513</int>
+						<reference key="object" ref="508151438"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">514</int>
+						<reference key="object" ref="981751889"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">515</int>
+						<reference key="object" ref="380031999"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">516</int>
+						<reference key="object" ref="825984362"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">517</int>
+						<reference key="object" ref="560145579"/>
+						<reference key="parent" ref="956096989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">534</int>
+						<reference key="object" ref="738670835"/>
+						<reference key="parent" ref="963351320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">546</int>
+						<reference key="object" ref="976324537"/>
+						<reference key="parent" ref="0"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="199.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="200.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="211.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="214.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="215.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="216.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="391.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="392.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="393.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="394.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="395.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="398.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="399.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="400.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="401.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="402.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="403.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="404.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="405.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="406.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="407.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="408.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="409.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="410.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="411.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="412.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="413.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="414.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="415.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="416.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="417.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="418.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="462.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="465.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="466.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="485.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="491.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="496.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="497.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="498.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="499.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="500.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="501.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="502.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="503.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="504.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="505.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="506.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="507.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="508.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="509.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="510.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="511.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="512.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="513.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="514.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="515.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="516.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="534.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="546.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">547</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">AppDelegate</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../MacGap/AppDelegate.h</string>
+					</object>
+				</object>
+			</array>
+			<array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSBrowser</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSControl</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSDocument</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="printDocument:">id</string>
+						<string key="revertDocumentToSaved:">id</string>
+						<string key="runPageLayout:">id</string>
+						<string key="saveDocument:">id</string>
+						<string key="saveDocumentAs:">id</string>
+						<string key="saveDocumentTo:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="printDocument:">
+							<string key="name">printDocument:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="revertDocumentToSaved:">
+							<string key="name">revertDocumentToSaved:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="runPageLayout:">
+							<string key="name">runPageLayout:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocument:">
+							<string key="name">saveDocument:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocumentAs:">
+							<string key="name">saveDocumentAs:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocumentTo:">
+							<string key="name">saveDocumentTo:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDocument.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSDocumentController</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="clearRecentDocuments:">id</string>
+						<string key="newDocument:">id</string>
+						<string key="openDocument:">id</string>
+						<string key="saveAllDocuments:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="clearRecentDocuments:">
+							<string key="name">clearRecentDocuments:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="newDocument:">
+							<string key="name">newDocument:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="openDocument:">
+							<string key="name">openDocument:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveAllDocuments:">
+							<string key="name">saveAllDocuments:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDocumentController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSFormatter</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMatrix</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenu</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenuItem</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMovieView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMovieView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSPopover</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPopover.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSResponder</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTableView</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSText</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSText.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextView</string>
+					<string key="superclassName">NSText</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTextView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSViewController</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">view</string>
+						<string key="NS.object.0">NSView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">view</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">view</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">WebView</string>
+					<string key="superclassName">NSView</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="goBack:">id</string>
+						<string key="goForward:">id</string>
+						<string key="makeTextLarger:">id</string>
+						<string key="makeTextSmaller:">id</string>
+						<string key="makeTextStandardSize:">id</string>
+						<string key="reload:">id</string>
+						<string key="reloadFromOrigin:">id</string>
+						<string key="stopLoading:">id</string>
+						<string key="takeStringURLFrom:">id</string>
+						<string key="toggleContinuousSpellChecking:">id</string>
+						<string key="toggleSmartInsertDelete:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="goBack:">
+							<string key="name">goBack:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="goForward:">
+							<string key="name">goForward:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="makeTextLarger:">
+							<string key="name">makeTextLarger:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="makeTextSmaller:">
+							<string key="name">makeTextSmaller:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="makeTextStandardSize:">
+							<string key="name">makeTextStandardSize:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="reload:">
+							<string key="name">reload:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="reloadFromOrigin:">
+							<string key="name">reloadFromOrigin:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="stopLoading:">
+							<string key="name">stopLoading:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="takeStringURLFrom:">
+							<string key="name">takeStringURLFrom:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="toggleContinuousSpellChecking:">
+							<string key="name">toggleContinuousSpellChecking:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="toggleSmartInsertDelete:">
+							<string key="name">toggleSmartInsertDelete:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebView.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="4600" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{12, 12}</string>
+			<string key="NSMenuMixedState">{10, 2}</string>
+		</dictionary>
+	</data>
+</archive>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib
new file mode 100644
index 000000000..fa70acaa5
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
+        <plugIn identifier="com.apple.WebKitIBPlugin" version="9060"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="WindowController">
+            <connections>
+                <outlet property="contentView" destination="2" id="23"/>
+                <outlet property="window" destination="1" id="25"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" animationBehavior="default" id="1">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <rect key="contentRect" x="575" y="564" width="500" height="500"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
+            <view key="contentView" id="2" customClass="ContentView">
+                <rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <webView id="5">
+                        <rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
+                        <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12">
+                            <nil key="identifier"/>
+                        </webPreferences>
+                    </webView>
+                </subviews>
+                <animations/>
+                <connections>
+                    <outlet property="webView" destination="5" id="19"/>
+                </connections>
+            </view>
+            <connections>
+                <binding destination="-2" name="title" keyPath="contentView.webView.mainFrameTitle" id="31"/>
+            </connections>
+        </window>
+    </objects>
+</document>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/main.m b/ext/mac-ui-macgap1-wrapper/src/MacGap/main.m
new file mode 100644
index 000000000..4ad50ad59
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/main.m
@@ -0,0 +1,14 @@
+//
+//  main.m
+//  MacGap
+//
+//  Created by Alex MacCaw on 08/01/2012.
+//  Copyright (c) 2012 Twitter. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, char *argv[])
+{
+    return NSApplicationMain(argc, (const char **)argv);
+}
diff --git a/ext/mac-ui-macgap1-wrapper/src/README.md b/ext/mac-ui-macgap1-wrapper/src/README.md
new file mode 100644
index 000000000..daf3eae9c
--- /dev/null
+++ b/ext/mac-ui-macgap1-wrapper/src/README.md
@@ -0,0 +1,6 @@
+Mac Web UI Wrapper
+======
+
+This is a modified version of MacGap1 which launches a WebKit view and accesses the local ZeroTier service at its web URL. It builds the URL from the authtoken.secret file in the system home (or the user home) and the zerotier-one.port file that ZeroTier creates to advertise its control port.
+
+It's based on the original MacGap1 source by Twitter, Inc. which is licensed under the MIT license.
diff --git a/ext/miniupnpc/CMakeLists.txt b/ext/miniupnpc/CMakeLists.txt
new file mode 100644
index 000000000..dacb1f692
--- /dev/null
+++ b/ext/miniupnpc/CMakeLists.txt
@@ -0,0 +1,178 @@
+cmake_minimum_required (VERSION 2.6)
+
+project (miniupnpc C)
+set (MINIUPNPC_VERSION 1.9)
+set (MINIUPNPC_API_VERSION 15)
+
+if (NOT CMAKE_BUILD_TYPE)
+  if (WIN32)
+    set (DEFAULT_BUILD_TYPE MinSizeRel)
+  else (WIN32)
+    set (DEFAULT_BUILD_TYPE RelWithDebInfo)
+  endif(WIN32)
+    set (CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE} CACHE STRING
+        "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
+        FORCE)
+endif()
+
+option (UPNPC_BUILD_STATIC "Build static library" TRUE)
+option (UPNPC_BUILD_SHARED "Build shared library" TRUE)
+if (NOT WIN32)
+  option (UPNPC_BUILD_TESTS "Build test executables" TRUE)
+endif (NOT WIN32)
+option (NO_GETADDRINFO "Define NO_GETADDRINFO" FALSE)
+
+mark_as_advanced (NO_GETADDRINFO)
+
+if (NO_GETADDRINFO)
+  add_definitions (-DNO_GETADDRINFO)
+endif (NO_GETADDRINFO)
+
+if (NOT WIN32)
+  add_definitions (-DMINIUPNPC_SET_SOCKET_TIMEOUT)
+  add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L)
+else (NOT WIN32)
+  add_definitions (-D_WIN32_WINNT=0x0501) # XP or higher for getnameinfo and friends
+endif (NOT WIN32)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  add_definitions (-D_DARWIN_C_SOURCE)
+endif ()
+
+# Set compiler specific build flags
+if (CMAKE_COMPILER_IS_GNUC)
+  # Set our own default flags at first run.
+  if (NOT CONFIGURED)
+
+    if (NOT CMAKE_SYSTEM_NAME STREQUAL "AmigaOS")
+      set (_PIC -fPIC)
+    endif (CMAKE_SYSTEM_NAME STREQUAL "AmigaOS")
+
+    set (CMAKE_C_FLAGS "${_PIC} -Wall $ENV{CFLAGS}" # CMAKE_C_FLAGS gets appended to the other C flags
+        CACHE STRING "Flags used by the C compiler during normal builds." FORCE)
+    set (CMAKE_C_FLAGS_DEBUG "-g -DDDEBUG"
+        CACHE STRING "Flags used by the C compiler during debug builds." FORCE)
+    set (CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG"
+        CACHE STRING "Flags used by the C compiler during release builds." FORCE)
+    set (CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG"
+        CACHE STRING "Flags used by the C compiler during release builds." FORCE)
+    set (CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG"
+        CACHE STRING "Flags used by the C compiler during release builds." FORCE)
+
+  endif (NOT CONFIGURED)
+endif ()
+
+configure_file (${CMAKE_SOURCE_DIR}/miniupnpcstrings.h.cmake ${CMAKE_BINARY_DIR}/miniupnpcstrings.h)
+include_directories (${CMAKE_BINARY_DIR})
+
+set (MINIUPNPC_SOURCES
+  igd_desc_parse.c
+  miniupnpc.c
+  minixml.c
+  minisoap.c
+  minissdpc.c
+  miniwget.c
+  upnpc.c
+  upnpcommands.c
+  upnpdev.c
+  upnpreplyparse.c
+  upnperrors.c
+  connecthostport.c
+  portlistingparse.c
+  receivedata.c
+)
+
+if (NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "AmigaOS")
+  set (MINIUPNPC_SOURCES ${MINIUPNPC_SOURCES} minissdpc.c)
+endif (NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "AmigaOS")
+
+if (WIN32)
+  set_source_files_properties (${MINIUPNPC_SOURCES} PROPERTIES
+                                                    COMPILE_DEFINITIONS "MINIUPNP_STATICLIB;MINIUPNP_EXPORTS"
+  )
+endif (WIN32)
+
+if (WIN32)
+  find_library (WINSOCK2_LIBRARY NAMES ws2_32 WS2_32 Ws2_32)
+  find_library (IPHLPAPI_LIBRARY NAMES iphlpapi)
+  set (LDLIBS ${WINSOCK2_LIBRARY} ${IPHLPAPI_LIBRARY} ${LDLIBS})
+#elseif (CMAKE_SYSTEM_NAME STREQUAL "Solaris")
+#  find_library (SOCKET_LIBRARY NAMES socket)
+#  find_library (NSL_LIBRARY NAMES nsl)
+#  find_library (RESOLV_LIBRARY NAMES resolv)
+#  set (LDLIBS ${SOCKET_LIBRARY} ${NSL_LIBRARY} ${RESOLV_LIBRARY} ${LDLIBS})
+endif (WIN32)
+
+if (NOT UPNPC_BUILD_STATIC AND NOT UPNPC_BUILD_SHARED)
+    message (FATAL "Both shared and static libraries are disabled!")
+endif (NOT UPNPC_BUILD_STATIC AND NOT UPNPC_BUILD_SHARED)
+
+if (UPNPC_BUILD_STATIC)
+  add_library (upnpc-static STATIC ${MINIUPNPC_SOURCES})
+  set_target_properties (upnpc-static PROPERTIES OUTPUT_NAME "miniupnpc")
+  target_link_libraries (upnpc-static ${LDLIBS})
+  set (UPNPC_INSTALL_TARGETS ${UPNPC_INSTALL_TARGETS} upnpc-static)
+  set (UPNPC_LIBRARY_TARGET upnpc-static)
+endif (UPNPC_BUILD_STATIC)
+
+if (UPNPC_BUILD_SHARED)
+  add_library (upnpc-shared SHARED ${MINIUPNPC_SOURCES})
+  set_target_properties (upnpc-shared PROPERTIES OUTPUT_NAME "miniupnpc")
+  set_target_properties (upnpc-shared PROPERTIES VERSION ${MINIUPNPC_VERSION})
+  set_target_properties (upnpc-shared PROPERTIES SOVERSION ${MINIUPNPC_API_VERSION})
+  target_link_libraries (upnpc-shared ${LDLIBS})
+  set (UPNPC_INSTALL_TARGETS ${UPNPC_INSTALL_TARGETS} upnpc-shared)
+  set (UPNPC_LIBRARY_TARGET upnpc-shared)
+endif (UPNPC_BUILD_SHARED)
+
+if (UPNPC_BUILD_TESTS)
+  add_executable (testminixml testminixml.c minixml.c igd_desc_parse.c)
+  target_link_libraries (testminixml ${LDLIBS})
+
+  add_executable (minixmlvalid minixmlvalid.c minixml.c)
+  target_link_libraries (minixmlvalid ${LDLIBS})
+
+  add_executable (testupnpreplyparse testupnpreplyparse.c
+                                     minixml.c upnpreplyparse.c)
+  target_link_libraries (testupnpreplyparse ${LDLIBS})
+
+  add_executable (testigddescparse testigddescparse.c
+                                   igd_desc_parse.c minixml.c miniupnpc.c miniwget.c minissdpc.c
+                                   upnpcommands.c upnpreplyparse.c minisoap.c connecthostport.c
+                                   portlistingparse.c receivedata.c
+  )
+  target_link_libraries (testigddescparse ${LDLIBS})
+
+  add_executable (testminiwget testminiwget.c
+                               miniwget.c miniupnpc.c minisoap.c upnpcommands.c minissdpc.c
+                               upnpreplyparse.c minixml.c igd_desc_parse.c connecthostport.c
+                               portlistingparse.c receivedata.c
+  )
+  target_link_libraries (testminiwget ${LDLIBS})
+
+# set (UPNPC_INSTALL_TARGETS ${UPNPC_INSTALL_TARGETS} testminixml minixmlvalid testupnpreplyparse testigddescparse testminiwget)
+endif (UPNPC_BUILD_TESTS)
+
+
+install (TARGETS ${UPNPC_INSTALL_TARGETS}
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib${LIB_SUFFIX}
+  ARCHIVE DESTINATION lib${LIB_SUFFIX}
+)
+install (FILES
+	miniupnpc.h
+  miniwget.h
+  upnpcommands.h
+  igd_desc_parse.h
+  upnpreplyparse.h
+  upnperrors.h
+  upnpdev.h
+  miniupnpctypes.h
+  portlistingparse.h
+  miniupnpc_declspec.h
+  DESTINATION include/miniupnpc
+)
+
+set (CONFIGURED YES CACHE INTERNAL "")
+
+# vim: ts=2:sw=2
diff --git a/ext/miniupnpc/Changelog.txt b/ext/miniupnpc/Changelog.txt
index 37562c6af..bef61f59e 100644
--- a/ext/miniupnpc/Changelog.txt
+++ b/ext/miniupnpc/Changelog.txt
@@ -1,30 +1,6 @@
-$Id: Changelog.txt,v 1.229 2017/12/12 11:26:25 nanard Exp $
+$Id: Changelog.txt,v 1.219 2015/10/26 17:05:06 nanard Exp $
 miniUPnP client Changelog.
 
-2017/12/11:
-  Fix buffer over run in minixml.c
-  Fix uninitialized variable access in upnpreplyparse.c
-
-2017/05/05:
-  Fix CVE-2017-8798   Thanks to tin/Team OSTStrom
-
-2016/11/11:
-  check strlen before memcmp in XML parsing portlistingparse.c
-  fix build under SOLARIS and CYGWIN
-
-2016/10/11:
-  Add python 3 compatibility to IGD test
-
-VERSION 2.0 : released 2016/04/19
-
-2016/01/24:
-  change miniwget to return HTTP status code
-  increments API_VERSION to 16
-
-2016/01/22:
-  Improve UPNPIGD_IsConnected() to check if WAN address is not private.
-  parse HTTP response status line in miniwget.c
-
 2015/10/26:
   snprintf() overflow check. check overflow in simpleUPnPcommand2()
 
diff --git a/ext/miniupnpc/LICENSE b/ext/miniupnpc/LICENSE
index 081673370..cb5a06044 100644
--- a/ext/miniupnpc/LICENSE
+++ b/ext/miniupnpc/LICENSE
@@ -1,5 +1,5 @@
 MiniUPnPc
-Copyright (c) 2005-2016, Thomas BERNARD
+Copyright (c) 2005-2015, Thomas BERNARD
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ext/miniupnpc/MANIFEST.in b/ext/miniupnpc/MANIFEST.in
new file mode 100644
index 000000000..54b86f95e
--- /dev/null
+++ b/ext/miniupnpc/MANIFEST.in
@@ -0,0 +1,5 @@
+include README
+include miniupnpcmodule.c
+include setup.py
+include *.h
+include libminiupnpc.a
diff --git a/ext/miniupnpc/Makefile b/ext/miniupnpc/Makefile
new file mode 100644
index 000000000..4a4f16126
--- /dev/null
+++ b/ext/miniupnpc/Makefile
@@ -0,0 +1,379 @@
+# $Id: Makefile,v 1.132 2015/10/26 16:59:54 nanard Exp $
+# MiniUPnP Project
+# http://miniupnp.free.fr/
+# http://miniupnp.tuxfamily.org/
+# https://github.com/miniupnp/miniupnp
+# (c) 2005-2015 Thomas Bernard
+# to install use :
+# $ make DESTDIR=/tmp/dummylocation install
+# or
+# $ INSTALLPREFIX=/usr/local make install
+# or
+# $ make install (default INSTALLPREFIX is /usr)
+OS = $(shell uname -s)
+VERSION = $(shell cat VERSION)
+
+ifeq ($(OS), Darwin)
+JARSUFFIX=mac
+LIBTOOL ?= $(shell which libtool)
+endif
+ifeq ($(OS), Linux)
+JARSUFFIX=linux
+endif
+ifneq (,$(findstring NT-5.1,$(OS)))
+JARSUFFIX=win32
+endif
+
+HAVE_IPV6 ?= yes
+export HAVE_IPV6
+
+CC ?= gcc
+#AR = gar
+#CFLAGS = -O -g -DDEBUG
+CFLAGS ?= -O
+CFLAGS += -Wall
+CFLAGS += -W -Wstrict-prototypes
+CFLAGS += -fno-common
+CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT
+CFLAGS += -DMINIUPNPC_GET_SRC_ADDR
+CFLAGS += -D_BSD_SOURCE
+CFLAGS += -D_DEFAULT_SOURCE
+ifneq ($(OS), FreeBSD)
+ifneq ($(OS), Darwin)
+#CFLAGS += -D_POSIX_C_SOURCE=200112L
+CFLAGS += -D_XOPEN_SOURCE=600
+endif
+endif
+#CFLAGS += -ansi
+# -DNO_GETADDRINFO
+INSTALL = install
+SH = /bin/sh
+JAVA = java
+# see http://code.google.com/p/jnaerator/
+#JNAERATOR = jnaerator-0.9.7.jar
+#JNAERATOR = jnaerator-0.9.8-shaded.jar
+#JNAERATORARGS = -library miniupnpc
+#JNAERATOR = jnaerator-0.10-shaded.jar
+#JNAERATOR = jnaerator-0.11-shaded.jar
+# https://repo1.maven.org/maven2/com/nativelibs4java/jnaerator/0.12/jnaerator-0.12-shaded.jar
+JNAERATOR = jnaerator-0.12-shaded.jar
+JNAERATORARGS = -mode StandaloneJar -runtime JNAerator -library miniupnpc
+#JNAERATORBASEURL = http://jnaerator.googlecode.com/files/
+JNAERATORBASEURL = https://repo1.maven.org/maven2/com/nativelibs4java/jnaerator/0.12
+
+ifeq (SunOS, $(OS))
+  LDFLAGS=-lsocket -lnsl -lresolv
+endif
+
+# APIVERSION is used to build SONAME
+APIVERSION = 15
+
+SRCS = igd_desc_parse.c miniupnpc.c minixml.c minisoap.c miniwget.c \
+       upnpc.c upnpcommands.c upnpreplyparse.c testminixml.c \
+       minixmlvalid.c testupnpreplyparse.c minissdpc.c \
+       upnperrors.c testigddescparse.c testminiwget.c \
+       connecthostport.c portlistingparse.c receivedata.c \
+       upnpdev.c testportlistingparse.c miniupnpcmodule.c \
+       minihttptestserver.c \
+       listdevices.c
+
+LIBOBJS = miniwget.o minixml.o igd_desc_parse.o minisoap.o \
+          miniupnpc.o upnpreplyparse.o upnpcommands.o upnperrors.o \
+          connecthostport.o portlistingparse.o receivedata.o upnpdev.o
+
+ifneq ($(OS), AmigaOS)
+CFLAGS := -fPIC $(CFLAGS)
+LIBOBJS := $(LIBOBJS) minissdpc.o
+endif
+
+OBJS = $(patsubst %.c,%.o,$(SRCS))
+
+# HEADERS to install
+HEADERS = miniupnpc.h miniwget.h upnpcommands.h igd_desc_parse.h \
+          upnpreplyparse.h upnperrors.h miniupnpctypes.h \
+          portlistingparse.h \
+          upnpdev.h \
+          miniupnpc_declspec.h
+
+# library names
+LIBRARY = libminiupnpc.a
+ifeq ($(OS), Darwin)
+  SHAREDLIBRARY = libminiupnpc.dylib
+  SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib
+  CFLAGS := -D_DARWIN_C_SOURCE $(CFLAGS)
+else
+ifeq ($(JARSUFFIX), win32)
+  SHAREDLIBRARY = miniupnpc.dll
+else
+  # Linux/BSD/etc.
+  SHAREDLIBRARY = libminiupnpc.so
+  SONAME = $(SHAREDLIBRARY).$(APIVERSION)
+endif
+endif
+
+EXECUTABLES = upnpc-static listdevices
+EXECUTABLES_ADDTESTS = testminixml minixmlvalid testupnpreplyparse \
+			  testigddescparse testminiwget testportlistingparse
+
+TESTMINIXMLOBJS = minixml.o igd_desc_parse.o testminixml.o
+
+TESTMINIWGETOBJS = miniwget.o testminiwget.o connecthostport.o receivedata.o
+
+TESTUPNPREPLYPARSE = testupnpreplyparse.o minixml.o upnpreplyparse.o
+
+TESTPORTLISTINGPARSE = testportlistingparse.o minixml.o portlistingparse.o
+
+TESTIGDDESCPARSE = testigddescparse.o igd_desc_parse.o minixml.o \
+                   miniupnpc.o miniwget.o upnpcommands.o upnpreplyparse.o \
+                   minisoap.o connecthostport.o receivedata.o \
+                   portlistingparse.o
+
+ifneq ($(OS), AmigaOS)
+EXECUTABLES := $(EXECUTABLES) upnpc-shared
+TESTMINIWGETOBJS := $(TESTMINIWGETOBJS) minissdpc.o
+TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o
+endif
+
+LIBDIR ?= lib
+# install directories
+INSTALLPREFIX ?= $(PREFIX)/usr
+INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
+INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
+INSTALLDIRBIN = $(INSTALLPREFIX)/bin
+INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
+
+FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
+ifneq ($(OS), AmigaOS)
+FILESTOINSTALL := $(FILESTOINSTALL) $(SHAREDLIBRARY)
+endif
+
+
+.PHONY:	install clean depend all check test everything \
+	installpythonmodule updateversion
+#	validateminixml validateminiwget
+
+all:	$(LIBRARY) $(EXECUTABLES)
+
+test:	check
+
+check:	validateminixml validateminiwget validateupnpreplyparse \
+	validateportlistingparse validateigddescparse
+
+everything:	all $(EXECUTABLES_ADDTESTS)
+
+pythonmodule:	$(LIBRARY) miniupnpcmodule.c setup.py
+	python setup.py build
+	touch $@
+
+installpythonmodule:	pythonmodule
+	python setup.py install
+
+pythonmodule3:	$(LIBRARY) miniupnpcmodule.c setup.py
+	python3 setup.py build
+	touch $@
+
+installpythonmodule3:	pythonmodule3
+	python3 setup.py install
+
+validateminixml:	minixmlvalid
+	@echo "minixml validation test"
+	./minixmlvalid
+	touch $@
+
+validateminiwget:	testminiwget minihttptestserver testminiwget.sh
+	@echo "miniwget validation test"
+	./testminiwget.sh
+	touch $@
+
+validateupnpreplyparse:	testupnpreplyparse testupnpreplyparse.sh
+	@echo "upnpreplyparse validation test"
+	./testupnpreplyparse.sh
+	touch $@
+
+validateportlistingparse:	testportlistingparse
+	@echo "portlistingparse validation test"
+	./testportlistingparse
+	touch $@
+
+validateigddescparse:	testigddescparse
+	@echo "igd desc parse validation test"
+	./testigddescparse testdesc/new_LiveBox_desc.xml testdesc/new_LiveBox_desc.values
+	./testigddescparse testdesc/linksys_WAG200G_desc.xml testdesc/linksys_WAG200G_desc.values
+	touch $@
+
+clean:
+	$(RM) $(LIBRARY) $(SHAREDLIBRARY) $(EXECUTABLES) $(OBJS) miniupnpcstrings.h
+	$(RM) $(EXECUTABLES_ADDTESTS)
+	# clean python stuff
+	$(RM) pythonmodule pythonmodule3
+	$(RM) validateminixml validateminiwget validateupnpreplyparse
+	$(RM) validateigddescparse
+	$(RM) minihttptestserver
+	$(RM) -r build/ dist/
+	#python setup.py clean
+	# clean jnaerator stuff
+	$(RM) _jnaerator.* java/miniupnpc_$(OS).jar
+
+distclean: clean
+	$(RM) $(JNAERATOR) java/*.jar java/*.class out.errors.txt
+
+updateversion:	miniupnpc.h
+	cp miniupnpc.h miniupnpc.h.bak
+	sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < miniupnpc.h.bak > miniupnpc.h
+
+install:	updateversion $(FILESTOINSTALL)
+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
+	$(INSTALL) -m 644 $(HEADERS) $(DESTDIR)$(INSTALLDIRINC)
+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRLIB)
+	$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
+ifneq ($(OS), AmigaOS)
+	$(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
+	ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
+endif
+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
+ifeq ($(OS), AmigaOS)
+	$(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
+else
+	$(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
+endif
+	$(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
+ifneq ($(OS), AmigaOS)
+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRMAN)/man3
+	$(INSTALL) -m 644 man3/miniupnpc.3 $(DESTDIR)$(INSTALLDIRMAN)/man3/miniupnpc.3
+ifeq ($(OS), Linux)
+	gzip -f $(DESTDIR)$(INSTALLDIRMAN)/man3/miniupnpc.3
+endif
+endif
+
+install-static:	updateversion $(FILESTOINSTALL)
+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
+	$(INSTALL) -m 644 $(HEADERS) $(DESTDIR)$(INSTALLDIRINC)
+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRLIB)
+	$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
+	$(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
+	$(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
+
+cleaninstall:
+	$(RM) -r $(DESTDIR)$(INSTALLDIRINC)
+	$(RM) $(DESTDIR)$(INSTALLDIRLIB)/$(LIBRARY)
+	$(RM) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
+
+depend:
+	makedepend -Y -- $(CFLAGS) -- $(SRCS) 2>/dev/null
+
+$(LIBRARY):	$(LIBOBJS)
+ifeq ($(OS), Darwin)
+	$(LIBTOOL) -static -o $@ $?
+else
+	$(AR) crs $@ $?
+endif
+
+$(SHAREDLIBRARY):	$(LIBOBJS)
+ifeq ($(OS), Darwin)
+#	$(CC) -dynamiclib $(LDFLAGS) -Wl,-install_name,$(SONAME) -o $@ $^
+	$(CC) -dynamiclib $(LDFLAGS) -Wl,-install_name,$(INSTALLDIRLIB)/$(SONAME) -o $@ $^
+else
+	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^
+endif
+
+upnpc-static:	upnpc.o $(LIBRARY)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS)
+
+upnpc-shared:	upnpc.o $(SHAREDLIBRARY)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS)
+
+listdevices:	listdevices.o $(LIBRARY)
+
+testminixml:	$(TESTMINIXMLOBJS)
+
+testminiwget:	$(TESTMINIWGETOBJS)
+
+minixmlvalid:	minixml.o minixmlvalid.o
+
+testupnpreplyparse:	$(TESTUPNPREPLYPARSE)
+
+testigddescparse:	$(TESTIGDDESCPARSE)
+
+testportlistingparse:	$(TESTPORTLISTINGPARSE)
+
+miniupnpcstrings.h:	miniupnpcstrings.h.in updateminiupnpcstrings.sh VERSION
+	$(SH) updateminiupnpcstrings.sh
+
+# ftp tool supplied with OpenBSD can download files from http.
+jnaerator-%.jar:
+	wget $(JNAERATORBASEURL)/$@ || \
+	curl -o $@ $(JNAERATORBASEURL)/$@ || \
+	ftp $(JNAERATORBASEURL)/$@
+
+jar: $(SHAREDLIBRARY)  $(JNAERATOR)
+	$(JAVA) -jar $(JNAERATOR) $(JNAERATORARGS) \
+	miniupnpc.h miniupnpc_declspec.h upnpcommands.h upnpreplyparse.h \
+	igd_desc_parse.h miniwget.h upnperrors.h $(SHAREDLIBRARY) \
+	-package fr.free.miniupnp -o . -jar java/miniupnpc_$(JARSUFFIX).jar -v
+
+mvn_install:
+	mvn install:install-file -Dfile=java/miniupnpc_$(JARSUFFIX).jar \
+	 -DgroupId=com.github \
+	 -DartifactId=miniupnp \
+	 -Dversion=$(VERSION) \
+	 -Dpackaging=jar \
+	 -Dclassifier=$(JARSUFFIX) \
+	 -DgeneratePom=true \
+	 -DcreateChecksum=true
+
+# make .deb packages
+deb: /usr/share/pyshared/stdeb all
+	(python setup.py --command-packages=stdeb.command bdist_deb)
+
+# install .deb packages
+ideb:
+	(sudo dpkg -i deb_dist/*.deb)
+
+/usr/share/pyshared/stdeb: /usr/share/doc/python-all-dev
+	(sudo apt-get install python-stdeb)
+
+/usr/share/doc/python-all-dev:
+	(sudo apt-get install python-all-dev)
+
+minihttptestserver:	minihttptestserver.o
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+igd_desc_parse.o: igd_desc_parse.h
+miniupnpc.o: miniupnpc.h miniupnpc_declspec.h igd_desc_parse.h upnpdev.h
+miniupnpc.o: minissdpc.h miniwget.h minisoap.h minixml.h upnpcommands.h
+miniupnpc.o: upnpreplyparse.h portlistingparse.h miniupnpctypes.h
+miniupnpc.o: connecthostport.h
+minixml.o: minixml.h
+minisoap.o: minisoap.h miniupnpcstrings.h
+miniwget.o: miniupnpcstrings.h miniwget.h miniupnpc_declspec.h
+miniwget.o: connecthostport.h receivedata.h
+upnpc.o: miniwget.h miniupnpc_declspec.h miniupnpc.h igd_desc_parse.h
+upnpc.o: upnpdev.h upnpcommands.h upnpreplyparse.h portlistingparse.h
+upnpc.o: miniupnpctypes.h upnperrors.h miniupnpcstrings.h
+upnpcommands.o: upnpcommands.h upnpreplyparse.h portlistingparse.h
+upnpcommands.o: miniupnpc_declspec.h miniupnpctypes.h miniupnpc.h
+upnpcommands.o: igd_desc_parse.h upnpdev.h
+upnpreplyparse.o: upnpreplyparse.h minixml.h
+testminixml.o: minixml.h igd_desc_parse.h
+minixmlvalid.o: minixml.h
+testupnpreplyparse.o: upnpreplyparse.h
+minissdpc.o: minissdpc.h miniupnpc_declspec.h upnpdev.h miniupnpc.h
+minissdpc.o: igd_desc_parse.h receivedata.h codelength.h
+upnperrors.o: upnperrors.h miniupnpc_declspec.h upnpcommands.h
+upnperrors.o: upnpreplyparse.h portlistingparse.h miniupnpctypes.h
+upnperrors.o: miniupnpc.h igd_desc_parse.h upnpdev.h
+testigddescparse.o: igd_desc_parse.h minixml.h miniupnpc.h
+testigddescparse.o: miniupnpc_declspec.h upnpdev.h
+testminiwget.o: miniwget.h miniupnpc_declspec.h
+connecthostport.o: connecthostport.h
+portlistingparse.o: portlistingparse.h miniupnpc_declspec.h miniupnpctypes.h
+portlistingparse.o: minixml.h
+receivedata.o: receivedata.h
+upnpdev.o: upnpdev.h miniupnpc_declspec.h
+testportlistingparse.o: portlistingparse.h miniupnpc_declspec.h
+testportlistingparse.o: miniupnpctypes.h
+miniupnpcmodule.o: miniupnpc.h miniupnpc_declspec.h igd_desc_parse.h
+miniupnpcmodule.o: upnpdev.h upnpcommands.h upnpreplyparse.h
+miniupnpcmodule.o: portlistingparse.h miniupnpctypes.h upnperrors.h
+listdevices.o: miniupnpc.h miniupnpc_declspec.h igd_desc_parse.h upnpdev.h
diff --git a/ext/miniupnpc/Makefile.mingw b/ext/miniupnpc/Makefile.mingw
new file mode 100644
index 000000000..6de325fe1
--- /dev/null
+++ b/ext/miniupnpc/Makefile.mingw
@@ -0,0 +1,98 @@
+# $Id: Makefile.mingw,v 1.22 2015/10/26 16:59:54 nanard Exp $
+# Miniupnp project.
+# http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+# (c) 2005-2015 Thomas Bernard
+# This Makefile is made for MinGW
+#
+CC ?= gcc
+#CFLAGS = -Wall -g -DDEBUG -D_WIN32_WINNT=0X501
+CFLAGS = -Wall -Os -DNDEBUG -D_WIN32_WINNT=0X501
+LDLIBS = -lws2_32 -liphlpapi
+# -lwsock32
+# -liphlpapi is needed for GetBestRoute() and GetIpAddrTable()
+PYTHON=\utils\python25\python
+OBJS=miniwget.o minixml.o igd_desc_parse.o minisoap.o \
+     minissdpc.o \
+     miniupnpc.o upnpreplyparse.o upnpcommands.o upnperrors.o \
+     connecthostport.o portlistingparse.o receivedata.o \
+     upnpdev.o
+OBJSDLL=$(addprefix dll/, $(OBJS))
+
+all:	init upnpc-static upnpc-shared testminixml libminiupnpc.a miniupnpc.dll
+
+init:
+	mkdir dll
+	echo init > init
+
+clean:
+	del upnpc testminixml *.o
+	del dll\*.o
+	del *.exe
+	del miniupnpc.dll
+	del libminiupnpc.a
+
+libminiupnpc.a:	$(OBJS)
+	$(AR) cr $@ $?
+
+pythonmodule:	libminiupnpc.a
+	$(PYTHON) setupmingw32.py build --compiler=mingw32
+	$(PYTHON) setupmingw32.py install --skip-build
+
+miniupnpc.dll:	libminiupnpc.a $(OBJSDLL)
+	dllwrap -k --driver-name gcc \
+	--def miniupnpc.def \
+	--output-def miniupnpc.dll.def \
+	--implib miniupnpc.lib -o $@ \
+	$(OBJSDLL) $(LDLIBS)
+
+miniupnpc.lib:	miniupnpc.dll
+#	echo $@ generated with $<
+
+dll/upnpc.o:	upnpc.o
+#	echo $@ generated with $<
+
+.c.o:
+	$(CC) $(CFLAGS) -DMINIUPNP_STATICLIB -c -o $@ $<
+	$(CC) $(CFLAGS) -DMINIUPNP_EXPORTS -c -o dll/$@ $<
+
+upnpc.o:	upnpc.c
+	$(CC) $(CFLAGS) -DMINIUPNP_STATICLIB -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o dll/$@ $<
+
+# --enable-stdcall-fixup
+upnpc-static:	upnpc.o libminiupnpc.a
+	$(CC) -o $@ $^ $(LDLIBS)
+
+upnpc-shared:	dll/upnpc.o miniupnpc.lib
+	$(CC) -o $@ $^ $(LDLIBS)
+
+wingenminiupnpcstrings:	wingenminiupnpcstrings.o
+
+wingenminiupnpcstrings.o:	wingenminiupnpcstrings.c
+
+miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings
+	wingenminiupnpcstrings $< $@
+
+minixml.o:	minixml.c minixml.h
+
+upnpc.o:	miniwget.h minisoap.h miniupnpc.h igd_desc_parse.h
+upnpc.o:	upnpreplyparse.h upnpcommands.h upnperrors.h miniupnpcstrings.h
+
+miniwget.o:	miniwget.c miniwget.h miniupnpcstrings.h connecthostport.h
+
+minisoap.o:	minisoap.c minisoap.h miniupnpcstrings.h
+
+miniupnpc.o:	miniupnpc.c miniupnpc.h minisoap.h miniwget.h minixml.h
+
+igd_desc_parse.o:	igd_desc_parse.c igd_desc_parse.h
+
+testminixml:	minixml.o igd_desc_parse.o testminixml.c
+
+upnpreplyparse.o:	upnpreplyparse.c upnpreplyparse.h minixml.h
+
+upnpcommands.o:	upnpcommands.c upnpcommands.h upnpreplyparse.h miniupnpc.h portlistingparse.h
+
+minissdpc.o:	minissdpc.c minissdpc.h receivedata.h
+
+upnpdev.o:	upnpdev.c upnpdev.h
+
diff --git a/ext/miniupnpc/README b/ext/miniupnpc/README
index 0d3b8054c..ab08de942 100644
--- a/ext/miniupnpc/README
+++ b/ext/miniupnpc/README
@@ -1,8 +1,9 @@
 Project: miniupnp
-Project web page: http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/
+Project web page: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
 github: https://github.com/miniupnp/miniupnp
+freecode: http://freecode.com/projects/miniupnp
 Author: Thomas Bernard
-Copyright (c) 2005-2017 Thomas Bernard
+Copyright (c) 2005-2014 Thomas Bernard
 This software is subject to the conditions detailed in the
 LICENSE file provided within this distribution.
 
@@ -31,7 +32,6 @@ To use the libminiupnpc in your application, link it with
 libminiupnpc.a (or .so) and use the following functions found in miniupnpc.h,
 upnpcommands.h and miniwget.h :
 - upnpDiscover()
-- UPNP_GetValidIGD()
 - miniwget()
 - parserootdesc()
 - GetUPNPUrls()
@@ -57,7 +57,5 @@ If you are using libminiupnpc in your application, please
 send me an email !
 
 For any question, you can use the web forum :
-https://miniupnp.tuxfamily.org/forum/
+http://miniupnp.tuxfamily.org/forum/
 
-Bugs should be reported on github :
-https://github.com/miniupnp/miniupnp/issues
diff --git a/ext/miniupnpc/VERSION b/ext/miniupnpc/VERSION
index cd5ac039d..2e0e38c63 100644
--- a/ext/miniupnpc/VERSION
+++ b/ext/miniupnpc/VERSION
@@ -1 +1 @@
-2.0
+1.9
diff --git a/ext/miniupnpc/apiversions.txt b/ext/miniupnpc/apiversions.txt
new file mode 100644
index 000000000..3e9ebef21
--- /dev/null
+++ b/ext/miniupnpc/apiversions.txt
@@ -0,0 +1,167 @@
+$Id: apiversions.txt,v 1.8 2015/10/08 16:15:47 nanard Exp $
+
+Differences in API between miniUPnPc versions
+
+API version 15
+  changed "sameport" argument of upnpDiscover() upnpDiscoverAll() upnpDiscoverDevice()
+    to "localport". When 0 or 1, behaviour is not changed, but it can take
+    any other value between 2 and 65535
+    Existing programs should be compatible
+  updated macro :
+    #define MINIUPNPC_API_VERSION  15
+
+API version 14
+miniupnpc.h
+  add ttl argument to upnpDiscover() upnpDiscoverAll() upnpDiscoverDevice()
+  upnpDiscoverDevices()
+  getDevicesFromMiniSSDPD() :
+    connectToMiniSSDPD() / disconnectFromMiniSSDPD()
+    requestDevicesFromMiniSSDPD() / receiveDevicesFromMiniSSDPD()
+  updated macro :
+    #define MINIUPNPC_API_VERSION  14
+
+API version 13
+miniupnpc.h:
+  add searchalltype param to upnpDiscoverDevices() function
+  updated macro :
+    #define MINIUPNPC_API_VERSION  13
+
+API version 12
+miniupnpc.h :
+  add upnpDiscoverAll() / upnpDiscoverDevice() / upnpDiscoverDevices()
+    functions
+  updated macros :
+    #define MINIUPNPC_API_VERSION  12
+
+API version 11
+
+upnpreplyparse.h / portlistingparse.h :
+  removed usage of sys/queue.h / bsdqueue.h
+
+miniupnpc.h:
+  updated macros :
+    #define MINIUPNPC_API_VERSION  11
+
+====================== miniUPnPc version 1.9 ======================
+API version 10
+
+upnpcommands.h:
+  added argument remoteHost to UPNP_GetSpecificPortMappingEntry()
+
+miniupnpc.h:
+  updated macros :
+    #define MINIUPNPC_VERSION      "1.9"
+    #define MINIUPNPC_API_VERSION  10
+
+====================== miniUPnPc version 1.8 ======================
+API version 9
+
+miniupnpc.h:
+  updated macros :
+    #define MINIUPNPC_VERSION      "1.8"
+    #define MINIUPNPC_API_VERSION  9
+  added "unsigned int scope_id;" to struct UPNPDev
+  added scope_id argument to GetUPNPUrls()
+
+
+
+====================== miniUPnPc version 1.7 ======================
+API version 8
+
+miniupnpc.h :
+  add new macros :
+    #define MINIUPNPC_VERSION      "1.7"
+    #define MINIUPNPC_API_VERSION  8
+  add rootdescURL to struct UPNPUrls
+
+
+
+====================== miniUPnPc version 1.6 ======================
+API version 8
+
+Adding support for IPv6.
+igd_desc_parse.h :
+  struct IGDdatas_service :
+    add char presentationurl[MINIUPNPC_URL_MAXSIZE];
+  struct IGDdatas :
+    add struct IGDdatas_service IPv6FC;
+miniupnpc.h :
+  new macros :
+    #define UPNPDISCOVER_SUCCESS (0)
+    #define UPNPDISCOVER_UNKNOWN_ERROR (-1)
+    #define UPNPDISCOVER_SOCKET_ERROR (-101)
+    #define UPNPDISCOVER_MEMORY_ERROR (-102)
+  simpleUPnPcommand() prototype changed (but is normaly not used by API users)
+  add arguments ipv6 and error to upnpDiscover() :
+     struct UPNPDev *
+     upnpDiscover(int delay, const char * multicastif,
+                  const char * minissdpdsock, int sameport,
+                  int ipv6,
+                  int * error);
+  add controlURL_6FC member to struct UPNPUrls :
+    struct UPNPUrls {
+       char * controlURL;
+       char * ipcondescURL;
+       char * controlURL_CIF;
+       char * controlURL_6FC;
+    };
+
+upnpcommands.h :
+  add leaseDuration argument to UPNP_AddPortMapping()
+  add desc, enabled and leaseDuration arguments to UPNP_GetSpecificPortMappingEntry()
+  add UPNP_GetListOfPortMappings() function (IGDv2)
+  add IGDv2 IPv6 related functions :
+    UPNP_GetFirewallStatus()
+    UPNP_GetOutboundPinholeTimeout()
+    UPNP_AddPinhole()
+    UPNP_UpdatePinhole()
+    UPNP_DeletePinhole()
+    UPNP_CheckPinholeWorking()
+    UPNP_GetPinholePackets()
+
+
+
+====================== miniUPnPc version 1.5 ======================
+API version 5
+
+new function :
+int UPNPIGD_IsConnected(struct UPNPUrls *, struct IGDdatas *);
+new macro in upnpcommands.h :
+#define UPNPCOMMAND_HTTP_ERROR
+
+====================== miniUPnPc version 1.4 ======================
+Same API as version 1.3
+
+====================== miniUPnPc version 1.3 ======================
+API version 4
+
+Use UNSIGNED_INTEGER type for
+UPNP_GetTotalBytesSent(), UPNP_GetTotalBytesReceived(),
+UPNP_GetTotalPacketsSent(), UPNP_GetTotalPacketsReceived()
+Add remoteHost argument to UPNP_AddPortMapping() and UPNP_DeletePortMapping()
+
+====================== miniUPnPc version 1.2 ======================
+API version 3
+
+added sameport argument to upnpDiscover()
+struct UPNPDev *
+upnpDiscover(int delay, const char * multicastif,
+             const char * minissdpdsock, int sameport);
+
+====================== miniUPnPc Version 1.1 ======================
+Same API as 1.0
+
+
+====================== miniUPnPc Version 1.0 ======================
+API version 2
+
+
+struct UPNPDev {
+      struct UPNPDev * pNext;
+      char * descURL;
+      char * st;
+      char buffer[2];
+};
+struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
+                              const char * minissdpdsock);
+
diff --git a/ext/miniupnpc/connecthostport.c b/ext/miniupnpc/connecthostport.c
index aed62c76e..854203e03 100644
--- a/ext/miniupnpc/connecthostport.c
+++ b/ext/miniupnpc/connecthostport.c
@@ -1,10 +1,12 @@
-/* $Id: connecthostport.c,v 1.17 2017/04/21 09:58:30 nanard Exp $ */
+/* $Id: connecthostport.c,v 1.15 2015/10/09 16:26:19 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
- * Copyright (c) 2010-2017 Thomas Bernard
+ * Copyright (c) 2010-2015 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution. */
 
+#define _CRT_SECURE_NO_WARNINGS
+
 /* use getaddrinfo() or gethostbyname()
  * uncomment the following line in order to use gethostbyname() */
 #ifdef NO_GETADDRINFO
@@ -36,13 +38,15 @@
 /* defining MINIUPNPC_IGNORE_EINTR enable the ignore of interruptions
  * during the connect() call */
 #define MINIUPNPC_IGNORE_EINTR
+#ifndef USE_GETHOSTBYNAME
 #include <sys/socket.h>
 #include <sys/select.h>
+#endif /* #ifndef USE_GETHOSTBYNAME */
 #endif /* #else _WIN32 */
 
 /* definition of PRINT_SOCKET_ERROR */
 #ifdef _WIN32
-#define PRINT_SOCKET_ERROR(x)    fprintf(stderr, "Socket error: %s, %d\n", x, WSAGetLastError());
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
 #else
 #define PRINT_SOCKET_ERROR(x) perror(x)
 #endif
@@ -98,13 +102,13 @@ int connecthostport(const char * host, unsigned short port,
 	timeout.tv_usec = 0;
 	if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
 	{
-		PRINT_SOCKET_ERROR("setsockopt SO_RCVTIMEO");
+		PRINT_SOCKET_ERROR("setsockopt");
 	}
 	timeout.tv_sec = 3;
 	timeout.tv_usec = 0;
 	if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
 	{
-		PRINT_SOCKET_ERROR("setsockopt SO_SNDTIMEO");
+		PRINT_SOCKET_ERROR("setsockopt");
 	}
 #endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
 	dest.sin_family = AF_INET;
diff --git a/ext/miniupnpc/external-ip.sh b/ext/miniupnpc/external-ip.sh
new file mode 100755
index 000000000..965d86b2a
--- /dev/null
+++ b/ext/miniupnpc/external-ip.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# $Id: external-ip.sh,v 1.1 2010/08/05 12:57:41 nanard Exp $
+# (c) 2010 Reuben Hawkins
+upnpc -s | grep ExternalIPAddress | sed 's/[^0-9\.]//g'
diff --git a/ext/miniupnpc/java/JavaBridgeTest.java b/ext/miniupnpc/java/JavaBridgeTest.java
new file mode 100644
index 000000000..c658c5990
--- /dev/null
+++ b/ext/miniupnpc/java/JavaBridgeTest.java
@@ -0,0 +1,97 @@
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+import fr.free.miniupnp.*;
+
+/**
+ *
+ * @author syuu
+ */
+public class JavaBridgeTest {
+    public static void main(String[] args) {
+        int UPNP_DELAY = 2000;
+        MiniupnpcLibrary miniupnpc = MiniupnpcLibrary.INSTANCE;
+        UPNPDev devlist = null;
+        UPNPUrls urls = new UPNPUrls();
+        IGDdatas data = new IGDdatas();
+        ByteBuffer lanaddr = ByteBuffer.allocate(16);
+        ByteBuffer intClient = ByteBuffer.allocate(16);
+        ByteBuffer intPort = ByteBuffer.allocate(6);
+        ByteBuffer desc = ByteBuffer.allocate(80);
+        ByteBuffer enabled = ByteBuffer.allocate(4);
+        ByteBuffer leaseDuration = ByteBuffer.allocate(16);
+        int ret;
+        int i;
+
+        if(args.length < 2) {
+            System.err.println("Usage : java [...] JavaBridgeTest port protocol");
+            System.out.println("  port is numeric, protocol is TCP or UDP");
+            return;
+        }
+
+        devlist = miniupnpc.upnpDiscover(UPNP_DELAY, (String) null, (String) null, 0, 0, (byte)2, IntBuffer.allocate(1));
+        if (devlist != null) {
+            System.out.println("List of UPNP devices found on the network :");
+            for (UPNPDev device = devlist; device != null; device = device.pNext) {
+                System.out.println("desc: " + device.descURL.getString(0) + " st: " + device.st.getString(0));
+            }
+            if ((i = miniupnpc.UPNP_GetValidIGD(devlist, urls, data, lanaddr, 16)) != 0) {
+                switch (i) {
+                    case 1:
+                        System.out.println("Found valid IGD : " + urls.controlURL.getString(0));
+                        break;
+                    case 2:
+                        System.out.println("Found a (not connected?) IGD : " + urls.controlURL.getString(0));
+                        System.out.println("Trying to continue anyway");
+                        break;
+                    case 3:
+                        System.out.println("UPnP device found. Is it an IGD ? : " + urls.controlURL.getString(0));
+                        System.out.println("Trying to continue anyway");
+                        break;
+                    default:
+                        System.out.println("Found device (igd ?) : " + urls.controlURL.getString(0));
+                        System.out.println("Trying to continue anyway");
+
+                }
+                System.out.println("Local LAN ip address : " + new String(lanaddr.array()));
+                ByteBuffer externalAddress = ByteBuffer.allocate(16);
+                miniupnpc.UPNP_GetExternalIPAddress(urls.controlURL.getString(0),
+                        new String(data.first.servicetype), externalAddress);
+                System.out.println("ExternalIPAddress = " + new String(externalAddress.array()));
+                ret = miniupnpc.UPNP_AddPortMapping(
+                        urls.controlURL.getString(0), // controlURL
+                        new String(data.first.servicetype), // servicetype
+                        args[0], // external Port
+                        args[0], // internal Port
+                        new String(lanaddr.array()), // internal client
+                        "added via miniupnpc/JAVA !", // description
+                        args[1], // protocol UDP or TCP
+                        null, // remote host (useless)
+                        "0"); // leaseDuration
+                if (ret != MiniupnpcLibrary.UPNPCOMMAND_SUCCESS)
+                    System.out.println("AddPortMapping() failed with code " + ret);
+                ret = miniupnpc.UPNP_GetSpecificPortMappingEntry(
+                        urls.controlURL.getString(0), new String(data.first.servicetype),
+                        args[0], args[1], null, intClient, intPort,
+                        desc, enabled, leaseDuration);
+                if (ret != MiniupnpcLibrary.UPNPCOMMAND_SUCCESS)
+                    System.out.println("GetSpecificPortMappingEntry() failed with code " + ret);
+                System.out.println("InternalIP:Port = " +
+                        new String(intClient.array()) + ":" + new String(intPort.array()) +
+                        " (" + new String(desc.array()) + ")");
+                ret = miniupnpc.UPNP_DeletePortMapping(
+                        urls.controlURL.getString(0),
+                        new String(data.first.servicetype),
+                        args[0], args[1], null);
+                if (ret != MiniupnpcLibrary.UPNPCOMMAND_SUCCESS)
+                    System.out.println("DelPortMapping() failed with code " + ret);
+                miniupnpc.FreeUPNPUrls(urls);
+            } else {
+                System.out.println("No valid UPNP Internet Gateway Device found.");
+            }
+            miniupnpc.freeUPNPDevlist(devlist);
+        } else {
+            System.out.println("No IGD UPnP Device found on the network !\n");
+        }
+    }
+}
diff --git a/ext/miniupnpc/java/testjava.bat b/ext/miniupnpc/java/testjava.bat
new file mode 100755
index 000000000..b836da149
--- /dev/null
+++ b/ext/miniupnpc/java/testjava.bat
@@ -0,0 +1,8 @@
+@echo off
+set JAVA=java
+set JAVAC=javac
+REM notice the semicolon for Windows.  Write once, run ... oh nevermind
+set CP=miniupnpc_win32.jar;.
+
+%JAVAC% -cp "%CP%" JavaBridgeTest.java || exit 1
+%JAVA% -cp "%CP%" JavaBridgeTest 12345 UDP || exit 1
diff --git a/ext/miniupnpc/java/testjava.sh b/ext/miniupnpc/java/testjava.sh
new file mode 100755
index 000000000..9880523a1
--- /dev/null
+++ b/ext/miniupnpc/java/testjava.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+JAVA=java
+JAVAC=javac
+CP=$(for i in *.jar; do echo -n $i:; done).
+
+$JAVAC -cp $CP JavaBridgeTest.java || exit 1
+$JAVA -cp $CP JavaBridgeTest 12345 UDP || exit 1
diff --git a/ext/miniupnpc/man3/miniupnpc.3 b/ext/miniupnpc/man3/miniupnpc.3
new file mode 100644
index 000000000..7b997d475
--- /dev/null
+++ b/ext/miniupnpc/man3/miniupnpc.3
@@ -0,0 +1,55 @@
+.TH MINIUPNPC 3
+.SH NAME
+miniupnpc \- UPnP client library
+.SH SYNOPSIS
+.SH DESCRIPTION
+The miniupnpc library implement the UPnP protocol defined
+to dialog with Internet Gateway Devices. It also has
+the ability to use data gathered by minissdpd(1) about
+UPnP devices up on the network in order to skip the
+long UPnP device discovery process.
+.PP
+At first, upnpDiscover(3) has to be used to discover UPnP IGD present
+on the network. Then UPNP_GetValidIGD(3) to select the right one.
+Alternatively, UPNP_GetIGDFromUrl(3) could be used to bypass discovery
+process if the root description url of the device to use is known.
+Then all the UPNP_* functions can be used, such as
+UPNP_GetConnectionTypeInfo(3), UPNP_AddPortMapping(3), etc...
+.SH "HEADER FILES"
+.IP miniupnpc.h
+That's the main header file for the miniupnpc library API.
+It contains all the functions and structures related to device discovery.
+.IP upnpcommands.h
+This header file contain the UPnP IGD methods that are accessible
+through the miniupnpc API. The name of the C functions are matching
+the UPnP methods names. ie: GetGenericPortMappingEntry is
+UPNP_GetGenericPortMappingEntry.
+.SH "API FUNCTIONS"
+.IP "struct UPNPDev * upnpDiscover(int delay, const char * multicastif, const char * minissdpdsock, int localport, int ipv6, int * error);"
+execute the discovery process.
+delay (in millisecond) is the maximum time for waiting any device response.
+If available, device list will be obtained from MiniSSDPd.
+Default path for minissdpd socket will be used if minissdpdsock argument is NULL.
+If multicastif is not NULL, it will be used instead of the default multicast interface for sending SSDP discover packets.
+If localport is set to UPNP_LOCAL_PORT_SAME(1) SSDP packets will be sent 
+from the source port 1900 (same as destination port), if set to 
+UPNP_LOCAL_PORT_ANY(0) system assign a source port, any other value will 
+be attempted as the source port.
+If ipv6 is not 0, IPv6 is used instead of IPv4 for the discovery process.
+.IP "void freeUPNPDevlist(struct UPNPDev * devlist);"
+free the list returned by upnpDiscover().
+.IP "int UPNP_GetValidIGD(struct UPNPDev * devlist, struct UPNPUrls * urls, struct IGDdatas * data, char * lanaddr, int lanaddrlen);"
+browse the list of device returned by upnpDiscover(), find
+a live UPnP internet gateway device and fill structures passed as arguments
+with data used for UPNP methods invokation.
+.IP "int UPNP_GetIGDFromUrl(const char * rootdescurl, struct UPNPUrls * urls, struct IGDdatas * data, char * lanaddr, int lanaddrlen);"
+permit to bypass the upnpDiscover() call if the xml root description
+URL of the UPnP IGD is known.
+Fill structures passed as arguments
+with data used for UPNP methods invokation.
+.IP "void GetUPNPUrls(struct UPNPUrls *, struct IGDdatas *, const char *);"
+.IP "void FreeUPNPUrls(struct UPNPUrls *);"
+
+.SH "SEE ALSO"
+minissdpd(1)
+.SH BUGS
diff --git a/ext/miniupnpc/mingw32make.bat b/ext/miniupnpc/mingw32make.bat
new file mode 100644
index 000000000..c5d3cc4ff
--- /dev/null
+++ b/ext/miniupnpc/mingw32make.bat
@@ -0,0 +1,8 @@
+@mingw32-make -f Makefile.mingw %1
+@if errorlevel 1 goto end
+@if not exist upnpc-static.exe goto end
+@strip upnpc-static.exe
+@upx --best upnpc-static.exe
+@strip upnpc-shared.exe
+@upx --best upnpc-shared.exe
+:end
diff --git a/ext/miniupnpc/minihttptestserver.c b/ext/miniupnpc/minihttptestserver.c
new file mode 100644
index 000000000..32e3cb78a
--- /dev/null
+++ b/ext/miniupnpc/minihttptestserver.c
@@ -0,0 +1,655 @@
+/* $Id: minihttptestserver.c,v 1.18 2015/07/15 12:41:15 nanard Exp $ */
+/* Project : miniUPnP
+ * Author : Thomas Bernard
+ * Copyright (c) 2011-2015 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <time.h>
+#include <errno.h>
+
+#define CRAP_LENGTH (2048)
+
+volatile sig_atomic_t quit = 0;
+volatile sig_atomic_t child_to_wait_for = 0;
+
+/**
+ * signal handler for SIGCHLD (child status has changed)
+ */
+void handle_signal_chld(int sig)
+{
+	(void)sig;
+	/* printf("handle_signal_chld(%d)\n", sig); */
+	++child_to_wait_for;
+}
+
+/**
+ * signal handler for SIGINT (CRTL C)
+ */
+void handle_signal_int(int sig)
+{
+	(void)sig;
+	/* printf("handle_signal_int(%d)\n", sig); */
+	quit = 1;
+}
+
+/**
+ * build a text/plain content of the specified length
+ */
+void build_content(char * p, int n)
+{
+	char line_buffer[80];
+	int k;
+	int i = 0;
+
+	while(n > 0) {
+		k = snprintf(line_buffer, sizeof(line_buffer),
+		             "%04d_ABCDEFGHIJKL_This_line_is_64_bytes_long_ABCDEFGHIJKL_%04d\r\n",
+		             i, i);
+		if(k != 64) {
+			fprintf(stderr, "snprintf() returned %d in build_content()\n", k);
+		}
+		++i;
+		if(n >= 64) {
+			memcpy(p, line_buffer, 64);
+			p += 64;
+			n -= 64;
+		} else {
+			memcpy(p, line_buffer, n);
+			p += n;
+			n = 0;
+		}
+	}
+}
+
+/**
+ * build crappy content
+ */
+void build_crap(char * p, int n)
+{
+	static const char crap[] = "_CRAP_\r\n";
+	int i;
+
+	while(n > 0) {
+		i = sizeof(crap) - 1;
+		if(i > n)
+			i = n;
+		memcpy(p, crap, i);
+		p += i;
+		n -= i;
+	}
+}
+
+/**
+ * build chunked response.
+ * return a malloc'ed buffer
+ */
+char * build_chunked_response(int content_length, int * response_len)
+{
+	char * response_buffer;
+	char * content_buffer;
+	int buffer_length;
+	int i, n;
+
+	/* allocate to have some margin */
+	buffer_length = 256 + content_length + (content_length >> 4);
+	response_buffer = malloc(buffer_length);
+	if(response_buffer == NULL)
+		return NULL;
+	*response_len = snprintf(response_buffer, buffer_length,
+	                         "HTTP/1.1 200 OK\r\n"
+	                         "Content-Type: text/plain\r\n"
+	                         "Transfer-Encoding: chunked\r\n"
+	                         "\r\n");
+
+	/* build the content */
+	content_buffer = malloc(content_length);
+	if(content_buffer == NULL) {
+		free(response_buffer);
+		return NULL;
+	}
+	build_content(content_buffer, content_length);
+
+	/* chunk it */
+	i = 0;
+	while(i < content_length) {
+		n = (rand() % 199) + 1;
+		if(i + n > content_length) {
+			n = content_length - i;
+		}
+		/* TODO : check buffer size ! */
+		*response_len += snprintf(response_buffer + *response_len,
+		                          buffer_length - *response_len,
+		                          "%x\r\n", n);
+		memcpy(response_buffer + *response_len, content_buffer + i, n);
+		*response_len += n;
+		i += n;
+		response_buffer[(*response_len)++] = '\r';
+		response_buffer[(*response_len)++] = '\n';
+	}
+	/* the last chunk : "0\r\n" a empty body and then
+	 * the final "\r\n" */
+	memcpy(response_buffer + *response_len, "0\r\n\r\n", 5);
+	*response_len += 5;
+	free(content_buffer);
+
+	printf("resp_length=%d buffer_length=%d content_length=%d\n",
+	       *response_len, buffer_length, content_length);
+	return response_buffer;
+}
+
+/* favicon.ico generator */
+#ifdef OLD_HEADER
+#define FAVICON_LENGTH (6 + 16 + 12 + 8 + 32 * 4)
+#else
+#define FAVICON_LENGTH (6 + 16 + 40 + 8 + 32 * 4)
+#endif
+void build_favicon_content(char * p, int n)
+{
+	int i;
+	if(n < FAVICON_LENGTH)
+		return;
+	/* header : 6 bytes */
+	*p++ = 0;
+	*p++ = 0;
+	*p++ = 1;	/* type : ICO */
+	*p++ = 0;
+	*p++ = 1;	/* number of images in file */
+	*p++ = 0;
+	/* image directory (1 entry) : 16 bytes */
+	*p++ = 16;	/* width */
+	*p++ = 16;	/* height */
+	*p++ = 2;	/* number of colors in the palette. 0 = no palette */
+	*p++ = 0;	/* reserved */
+	*p++ = 1;	/* color planes */
+	*p++ = 0;	/* " */
+	*p++ = 1;	/* bpp */
+	*p++ = 0;	/* " */
+#ifdef OLD_HEADER
+	*p++ = 12 + 8 + 32 * 4;	/* bmp size */
+#else
+	*p++ = 40 + 8 + 32 * 4;	/* bmp size */
+#endif
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 6 + 16;	/* bmp offset */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	/* BMP */
+#ifdef OLD_HEADER
+	/* BITMAPCOREHEADER */
+	*p++ = 12;	/* size of this header */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 16;	/* width */
+	*p++ = 0;	/* " */
+	*p++ = 16 * 2;	/* height x 2 ! */
+	*p++ = 0;	/* " */
+	*p++ = 1;	/* color planes */
+	*p++ = 0;	/* " */
+	*p++ = 1;	/* bpp */
+	*p++ = 0;	/* " */
+#else
+	/* BITMAPINFOHEADER */
+	*p++ = 40;	/* size of this header */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 16;	/* width */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 16 * 2;	/* height x 2 ! */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 0;	/* " */
+	*p++ = 1;	/* color planes */
+	*p++ = 0;	/* " */
+	*p++ = 1;	/* bpp */
+	*p++ = 0;	/* " */
+	/* compression method, image size, ppm x, ppm y */
+	/* colors in the palette ? */
+	/* important colors */
+	for(i = 4 * 6; i > 0; --i)
+		*p++ = 0;
+#endif
+	/* palette */
+	*p++ = 0;	/* b */
+	*p++ = 0;	/* g */
+	*p++ = 0;	/* r */
+	*p++ = 0;	/* reserved */
+	*p++ = 255;	/* b */
+	*p++ = 255;	/* g */
+	*p++ = 255;	/* r */
+	*p++ = 0;	/* reserved */
+	/* pixel data */
+	for(i = 16; i > 0; --i) {
+		if(i & 1) {
+			*p++ = 0125;
+			*p++ = 0125;
+		} else {
+			*p++ = 0252;
+			*p++ = 0252;
+		}
+		*p++ = 0;
+		*p++ = 0;
+	}
+	/* Opacity MASK */
+	for(i = 16 * 4; i > 0; --i) {
+		*p++ = 0;
+	}
+}
+
+enum modes {
+	MODE_INVALID, MODE_CHUNKED, MODE_ADDCRAP, MODE_NORMAL, MODE_FAVICON
+};
+
+const struct {
+	const enum modes mode;
+	const char * text;
+} modes_array[] = {
+	{MODE_CHUNKED, "chunked"},
+	{MODE_ADDCRAP, "addcrap"},
+	{MODE_NORMAL, "normal"},
+	{MODE_FAVICON, "favicon.ico"},
+	{MODE_INVALID, NULL}
+};
+
+/**
+ * write the response with random behaviour !
+ */
+void send_response(int c, const char * buffer, int len)
+{
+	int n;
+	while(len > 0) {
+		n = (rand() % 99) + 1;
+		if(n > len)
+			n = len;
+		n = write(c, buffer, n);
+		if(n < 0) {
+			if(errno != EINTR) {
+				perror("write");
+				return;
+			}
+			/* if errno == EINTR, try again */
+		} else {
+			len -= n;
+			buffer += n;
+		}
+		usleep(10000); /* 10ms */
+	}
+}
+
+/**
+ * handle the HTTP connection
+ */
+void handle_http_connection(int c)
+{
+	char request_buffer[2048];
+	int request_len = 0;
+	int headers_found = 0;
+	int n, i;
+	char request_method[16];
+	char request_uri[256];
+	char http_version[16];
+	char * p;
+	char * response_buffer;
+	int response_len;
+	enum modes mode;
+	int content_length = 16*1024;
+
+	/* read the request */
+	while(request_len < (int)sizeof(request_buffer) && !headers_found) {
+		n = read(c,
+		         request_buffer + request_len,
+		         sizeof(request_buffer) - request_len);
+		if(n < 0) {
+			if(errno == EINTR)
+				continue;
+			perror("read");
+			return;
+		} else if(n==0) {
+			/* remote host closed the connection */
+			break;
+		} else {
+			request_len += n;
+			for(i = 0; i < request_len - 3; i++) {
+				if(0 == memcmp(request_buffer + i, "\r\n\r\n", 4)) {
+					/* found the end of headers */
+					headers_found = 1;
+					break;
+				}
+			}
+		}
+	}
+	if(!headers_found) {
+		/* error */
+		printf("no HTTP header found in the request\n");
+		return;
+	}
+	printf("headers :\n%.*s", request_len, request_buffer);
+	/* the request have been received, now parse the request line */
+	p = request_buffer;
+	for(i = 0; i < (int)sizeof(request_method) - 1; i++) {
+		if(*p == ' ' || *p == '\r')
+			break;
+		request_method[i] = *p;
+		++p;
+	}
+	request_method[i] = '\0';
+	while(*p == ' ')
+		p++;
+	for(i = 0; i < (int)sizeof(request_uri) - 1; i++) {
+		if(*p == ' ' || *p == '\r')
+			break;
+		request_uri[i] = *p;
+		++p;
+	}
+	request_uri[i] = '\0';
+	while(*p == ' ')
+		p++;
+	for(i = 0; i < (int)sizeof(http_version) - 1; i++) {
+		if(*p == ' ' || *p == '\r')
+			break;
+		http_version[i] = *p;
+		++p;
+	}
+	http_version[i] = '\0';
+	printf("Method = %s, URI = %s, %s\n",
+	       request_method, request_uri, http_version);
+	/* check if the request method is allowed */
+	if(0 != strcmp(request_method, "GET")) {
+		const char response405[] = "HTTP/1.1 405 Method Not Allowed\r\n"
+		                           "Allow: GET\r\n\r\n";
+		const char * pc;
+		/* 405 Method Not Allowed */
+		/* The response MUST include an Allow header containing a list
+		 * of valid methods for the requested resource. */
+		n = sizeof(response405) - 1;
+		pc = response405;
+		while(n > 0) {
+			i = write(c, pc, n);
+			if(i<0) {
+				if(errno != EINTR) {
+					perror("write");
+					return;
+				}
+			} else {
+				n -= i;
+				pc += i;
+			}
+		}
+		return;
+	}
+
+	mode = MODE_INVALID;
+	/* use the request URI to know what to do */
+	for(i = 0; modes_array[i].mode != MODE_INVALID; i++) {
+		if(strstr(request_uri, modes_array[i].text)) {
+			mode = modes_array[i].mode; /* found */
+			break;
+		}
+	}
+
+	switch(mode) {
+	case MODE_CHUNKED:
+		response_buffer = build_chunked_response(content_length, &response_len);
+		break;
+	case MODE_ADDCRAP:
+		response_len = content_length+256;
+		response_buffer = malloc(response_len);
+		if(!response_buffer)
+			break;
+		n = snprintf(response_buffer, response_len,
+		             "HTTP/1.1 200 OK\r\n"
+		             "Server: minihttptestserver\r\n"
+		             "Content-Type: text/plain\r\n"
+		             "Content-Length: %d\r\n"
+		             "\r\n", content_length);
+		response_len = content_length+n+CRAP_LENGTH;
+		p = realloc(response_buffer, response_len);
+		if(p == NULL) {
+			/* error 500 */
+			free(response_buffer);
+			response_buffer = NULL;
+			break;
+		}
+		response_buffer = p;
+		build_content(response_buffer + n, content_length);
+		build_crap(response_buffer + n + content_length, CRAP_LENGTH);
+		break;
+	case MODE_FAVICON:
+		content_length = FAVICON_LENGTH;
+		response_len = content_length + 256;
+		response_buffer = malloc(response_len);
+		if(!response_buffer)
+			break;
+		n = snprintf(response_buffer, response_len,
+		             "HTTP/1.1 200 OK\r\n"
+		             "Server: minihttptestserver\r\n"
+		             "Content-Type: image/vnd.microsoft.icon\r\n"
+		             "Content-Length: %d\r\n"
+		             "\r\n", content_length);
+		/* image/x-icon */
+		build_favicon_content(response_buffer + n, content_length);
+		response_len = content_length + n;
+		break;
+	default:
+		response_len = content_length+256;
+		response_buffer = malloc(response_len);
+		if(!response_buffer)
+			break;
+		n = snprintf(response_buffer, response_len,
+		             "HTTP/1.1 200 OK\r\n"
+		             "Server: minihttptestserver\r\n"
+		             "Content-Type: text/plain\r\n"
+		             "\r\n");
+		response_len = content_length+n;
+		p = realloc(response_buffer, response_len);
+		if(p == NULL) {
+			/* Error 500 */
+			free(response_buffer);
+			response_buffer = NULL;
+			break;
+		}
+		response_buffer = p;
+		build_content(response_buffer + n, response_len - n);
+	}
+
+	if(response_buffer) {
+		send_response(c, response_buffer, response_len);
+		free(response_buffer);
+	} else {
+		/* Error 500 */
+	}
+}
+
+/**
+ */
+int main(int argc, char * * argv) {
+	int ipv6 = 0;
+	int s, c, i;
+	unsigned short port = 0;
+	struct sockaddr_storage server_addr;
+	socklen_t server_addrlen;
+	struct sockaddr_storage client_addr;
+	socklen_t client_addrlen;
+	pid_t pid;
+	int child = 0;
+	int status;
+	const char * expected_file_name = NULL;
+	struct sigaction sa;
+
+	for(i = 1; i < argc; i++) {
+		if(argv[i][0] == '-') {
+			switch(argv[i][1]) {
+			case '6':
+				ipv6 = 1;
+				break;
+			case 'e':
+				/* write expected file ! */
+				expected_file_name = argv[++i];
+				break;
+			case 'p':
+				/* port */
+				if(++i < argc) {
+					port = (unsigned short)atoi(argv[i]);
+				}
+				break;
+			default:
+				fprintf(stderr, "unknown command line switch '%s'\n", argv[i]);
+			}
+		} else {
+			fprintf(stderr, "unkown command line argument '%s'\n", argv[i]);
+		}
+	}
+
+	srand(time(NULL));
+
+	memset(&sa, 0, sizeof(struct sigaction));
+
+	/*signal(SIGCHLD, handle_signal_chld);*/
+	sa.sa_handler = handle_signal_chld;
+	if(sigaction(SIGCHLD, &sa, NULL) < 0) {
+		perror("sigaction");
+		return 1;
+	}
+	/*signal(SIGINT, handle_signal_int);*/
+	sa.sa_handler = handle_signal_int;
+	if(sigaction(SIGINT, &sa, NULL) < 0) {
+		perror("sigaction");
+		return 1;
+	}
+
+	s = socket(ipv6 ? AF_INET6 : AF_INET, SOCK_STREAM, 0);
+	if(s < 0) {
+		perror("socket");
+		return 1;
+	}
+	memset(&server_addr, 0, sizeof(struct sockaddr_storage));
+	memset(&client_addr, 0, sizeof(struct sockaddr_storage));
+	if(ipv6) {
+		struct sockaddr_in6 * addr = (struct sockaddr_in6 *)&server_addr;
+		addr->sin6_family = AF_INET6;
+		addr->sin6_port = htons(port);
+		addr->sin6_addr = in6addr_loopback;
+	} else {
+		struct sockaddr_in * addr = (struct sockaddr_in *)&server_addr;
+		addr->sin_family = AF_INET;
+		addr->sin_port = htons(port);
+		addr->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+	}
+	if(bind(s, (struct sockaddr *)&server_addr,
+	        ipv6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) < 0) {
+		perror("bind");
+		return 1;
+	}
+	if(listen(s, 5) < 0) {
+		perror("listen");
+	}
+	if(port == 0) {
+		server_addrlen = sizeof(struct sockaddr_storage);
+		if(getsockname(s, (struct sockaddr *)&server_addr, &server_addrlen) < 0) {
+			perror("getsockname");
+			return 1;
+		}
+		if(ipv6) {
+			struct sockaddr_in6 * addr = (struct sockaddr_in6 *)&server_addr;
+			port = ntohs(addr->sin6_port);
+		} else {
+			struct sockaddr_in * addr = (struct sockaddr_in *)&server_addr;
+			port = ntohs(addr->sin_port);
+		}
+		printf("Listening on port %hu\n", port);
+		fflush(stdout);
+	}
+
+	/* write expected file */
+	if(expected_file_name) {
+		FILE * f;
+		f = fopen(expected_file_name, "wb");
+		if(f) {
+			char * buffer;
+			buffer = malloc(16*1024);
+			if(buffer == NULL) {
+				fprintf(stderr, "memory allocation error\n");
+			} else {
+				build_content(buffer, 16*1024);
+				i = fwrite(buffer, 1, 16*1024, f);
+				if(i != 16*1024) {
+					fprintf(stderr, "error writing to file %s : %dbytes written (out of %d)\n", expected_file_name, i, 16*1024);
+				}
+				free(buffer);
+			}
+			fclose(f);
+		} else {
+			fprintf(stderr, "error opening file %s for writing\n", expected_file_name);
+		}
+	}
+
+	/* fork() loop */
+	while(!child && !quit) {
+		while(child_to_wait_for > 0) {
+			pid = wait(&status);
+			if(pid < 0) {
+				perror("wait");
+			} else {
+				printf("child(%d) terminated with status %d\n", pid, status);
+			}
+			--child_to_wait_for;
+		}
+		client_addrlen = sizeof(struct sockaddr_storage);
+		c = accept(s, (struct sockaddr *)&client_addr,
+		           &client_addrlen);
+		if(c < 0) {
+			if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
+				continue;
+			perror("accept");
+			return 1;
+		}
+		printf("accept...\n");
+		pid = fork();
+		if(pid < 0) {
+			perror("fork");
+			return 1;
+		} else if(pid == 0) {
+			/* child */
+			child = 1;
+			close(s);
+			s = -1;
+			handle_http_connection(c);
+		}
+		close(c);
+	}
+	if(s >= 0) {
+		close(s);
+		s = -1;
+	}
+	if(!child) {
+		while(child_to_wait_for > 0) {
+			pid = wait(&status);
+			if(pid < 0) {
+				perror("wait");
+			} else {
+				printf("child(%d) terminated with status %d\n", pid, status);
+			}
+			--child_to_wait_for;
+		}
+		printf("Bye...\n");
+	}
+	return 0;
+}
+
diff --git a/ext/miniupnpc/minisoap.c b/ext/miniupnpc/minisoap.c
index 11f4635ad..c685aac5b 100644
--- a/ext/miniupnpc/minisoap.c
+++ b/ext/miniupnpc/minisoap.c
@@ -1,4 +1,5 @@
-/* $Id: minisoap.c,v 1.25 2017/04/21 10:03:24 nanard Exp $ */
+#define _CRT_SECURE_NO_WARNINGS
+/* $Id: minisoap.c,v 1.24 2015/10/26 17:05:07 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
  * Copyright (c) 2005-2015 Thomas Bernard
@@ -19,18 +20,9 @@
 #include <sys/socket.h>
 #endif
 #include "minisoap.h"
-
 #ifdef _WIN32
-#undef OS_STRING
 #define OS_STRING "Win32"
-#define MINIUPNPC_VERSION_STRING "2.0"
-#define UPNP_VERSION_STRING "UPnP/1.1"
-#endif
-
-#ifdef __ANDROID__
-#undef OS_STRING
-#define OS_STRING "Android"
-#define MINIUPNPC_VERSION_STRING "2.0"
+#define MINIUPNPC_VERSION_STRING "1.9"
 #define UPNP_VERSION_STRING "UPnP/1.1"
 #endif
 
@@ -38,7 +30,7 @@
 #include <stdlib.h>
 
 #ifdef _WIN32
-#define PRINT_SOCKET_ERROR(x)    fprintf(stderr, "Socket error: %s, %d\n", x, WSAGetLastError());
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
 #else
 #define PRINT_SOCKET_ERROR(x) perror(x)
 #endif
@@ -132,5 +124,3 @@ int soapPostSubmit(int fd,
 #endif
 	return httpWrite(fd, body, bodysize, headerbuf, headerssize);
 }
-
-
diff --git a/ext/miniupnpc/minissdpc.c b/ext/miniupnpc/minissdpc.c
index 3479de8ec..a371d1610 100644
--- a/ext/miniupnpc/minissdpc.c
+++ b/ext/miniupnpc/minissdpc.c
@@ -1,9 +1,10 @@
-/* $Id: minissdpc.c,v 1.35 2017/11/02 15:34:36 nanard Exp $ */
-/* vim: tabstop=4 shiftwidth=4 noexpandtab
- * Project : miniupnp
+#define _CRT_SECURE_NO_WARNINGS
+
+/* $Id: minissdpc.c,v 1.30 2015/10/26 17:05:07 nanard Exp $ */
+/* Project : miniupnp
  * Web : http://miniupnp.free.fr/
  * Author : Thomas BERNARD
- * copyright (c) 2005-2017 Thomas Bernard
+ * copyright (c) 2005-2015 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENCE file. */
 /*#include <syslog.h>*/
@@ -11,9 +12,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#if defined (__NetBSD__)
-#include <net/if.h>
-#endif
 #if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
 #ifdef _WIN32
 #include <winsock2.h>
@@ -62,7 +60,7 @@ struct sockaddr_un {
 #endif
 
 #ifdef _WIN32
-#define PRINT_SOCKET_ERROR(x)    fprintf(stderr, "Socket error: %s, %d\n", x, WSAGetLastError());
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
 #else
 #define PRINT_SOCKET_ERROR(x) perror(x)
 #endif
@@ -71,13 +69,6 @@ struct sockaddr_un {
 #define HAS_IP_MREQN
 #endif
 
-#if !defined(HAS_IP_MREQN) && !defined(_WIN32)
-#include <sys/ioctl.h>
-#if defined(__sun)
-#include <sys/sockio.h>
-#endif
-#endif
-
 #if defined(HAS_IP_MREQN) && defined(NEED_STRUCT_IP_MREQN)
 /* Several versions of glibc don't define this structure,
  * define it here and compile with CFLAGS NEED_STRUCT_IP_MREQN */
@@ -172,7 +163,7 @@ connectToMiniSSDPD(const char * socketpath)
 {
 	int s;
 	struct sockaddr_un addr;
-#if defined(MINIUPNPC_SET_SOCKET_TIMEOUT) && !defined(__sun)
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
 	struct timeval timeout;
 #endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
 
@@ -183,25 +174,23 @@ connectToMiniSSDPD(const char * socketpath)
 		perror("socket(unix)");
 		return MINISSDPC_SOCKET_ERROR;
 	}
-#if defined(MINIUPNPC_SET_SOCKET_TIMEOUT) && !defined(__sun)
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
 	/* setting a 3 seconds timeout */
-	/* not supported for AF_UNIX sockets under Solaris */
 	timeout.tv_sec = 3;
 	timeout.tv_usec = 0;
 	if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
 	{
-		perror("setsockopt SO_RCVTIMEO unix");
+		perror("setsockopt");
 	}
 	timeout.tv_sec = 3;
 	timeout.tv_usec = 0;
 	if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
 	{
-		perror("setsockopt SO_SNDTIMEO unix");
+		perror("setsockopt");
 	}
 #endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
 	if(!socketpath)
 		socketpath = "/var/run/minissdpd.sock";
-	memset(&addr, 0, sizeof(addr));
 	addr.sun_family = AF_UNIX;
 	strncpy(addr.sun_path, socketpath, sizeof(addr.sun_path));
 	/* TODO : check if we need to handle the EINTR */
@@ -503,7 +492,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 	unsigned long _ttl = (unsigned long)ttl;
 #endif
 	int linklocal = 1;
-	int sentok;
 
 	if(error)
 		*error = MINISSDPC_UNKNOWN_ERROR;
@@ -614,27 +602,14 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 		return NULL;
 	}
 
-	if(ipv6) {
 #ifdef _WIN32
-		DWORD mcastHops = ttl;
-		if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (const char *)&mcastHops, sizeof(mcastHops)) < 0)
+	if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_TTL, (const char *)&_ttl, sizeof(_ttl)) < 0)
 #else  /* _WIN32 */
-		int mcastHops = ttl;
-		if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastHops, sizeof(mcastHops)) < 0)
+	if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0)
 #endif /* _WIN32 */
-		{
-			PRINT_SOCKET_ERROR("setsockopt(IPV6_MULTICAST_HOPS,...)");
-		}
-	} else {
-#ifdef _WIN32
-		if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_TTL, (const char *)&_ttl, sizeof(_ttl)) < 0)
-#else  /* _WIN32 */
-		if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0)
-#endif /* _WIN32 */
-		{
-			/* not a fatal error */
-			PRINT_SOCKET_ERROR("setsockopt(IP_MULTICAST_TTL,...)");
-		}
+	{
+		/* not a fatal error */
+		PRINT_SOCKET_ERROR("setsockopt(IP_MULTICAST_TTL,...)");
 	}
 
 	if(multicastif)
@@ -647,7 +622,7 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 			unsigned int ifindex = if_nametoindex(multicastif); /* eth0, etc. */
 			if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifindex, sizeof(ifindex)) < 0)
 			{
-				PRINT_SOCKET_ERROR("setsockopt IPV6_MULTICAST_IF");
+				PRINT_SOCKET_ERROR("setsockopt");
 			}
 #else
 #ifdef DEBUG
@@ -662,7 +637,7 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 				((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = mc_if.s_addr;
 				if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0)
 				{
-					PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF");
+					PRINT_SOCKET_ERROR("setsockopt");
 				}
 			} else {
 #ifdef HAS_IP_MREQN
@@ -672,27 +647,13 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 				reqn.imr_ifindex = if_nametoindex(multicastif);
 				if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&reqn, sizeof(reqn)) < 0)
 				{
-					PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF");
+					PRINT_SOCKET_ERROR("setsockopt");
 				}
-#elif !defined(_WIN32)
-				struct ifreq ifr;
-				int ifrlen = sizeof(ifr);
-				strncpy(ifr.ifr_name, multicastif, IFNAMSIZ);
-				ifr.ifr_name[IFNAMSIZ-1] = '\0';
-				if(ioctl(sudp, SIOCGIFADDR, &ifr, &ifrlen) < 0)
-				{
-					PRINT_SOCKET_ERROR("ioctl(...SIOCGIFADDR...)");
-				}
-				mc_if.s_addr = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr;
-				if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0)
-				{
-					PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF");
-				}
-#else /* _WIN32 */
+#else
 #ifdef DEBUG
 				printf("Setting of multicast interface not supported with interface name.\n");
 #endif
-#endif /* #ifdef HAS_IP_MREQN / !defined(_WIN32) */
+#endif
 			}
 		}
 	}
@@ -719,7 +680,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 	}
 	/* receiving SSDP response packet */
 	for(deviceIndex = 0; deviceTypes[deviceIndex]; deviceIndex++) {
-		sentok = 0;
 		/* sending the SSDP M-SEARCH packet */
 		n = snprintf(bufr, sizeof(bufr),
 		             MSearchMsgFmt,
@@ -763,8 +723,7 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 			if(error)
 				*error = MINISSDPC_SOCKET_ERROR;
 			PRINT_SOCKET_ERROR("sendto");
-		} else {
-			sentok = 1;
+			break;
 		}
 #else /* #ifdef NO_GETADDRINFO */
 		memset(&hints, 0, sizeof(hints));
@@ -796,20 +755,19 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 #endif
 				PRINT_SOCKET_ERROR("sendto");
 				continue;
-			} else {
-				sentok = 1;
 			}
 		}
 		freeaddrinfo(servinfo);
-		if(!sentok) {
+		if(n < 0) {
 			if(error)
 				*error = MINISSDPC_SOCKET_ERROR;
+			break;
 		}
 #endif /* #ifdef NO_GETADDRINFO */
 		/* Waiting for SSDP REPLY packet to M-SEARCH
 		 * if searchalltypes is set, enter the loop only
 		 * when the last deviceType is reached */
-		if((sentok && !searchalltypes) || !deviceTypes[deviceIndex + 1]) do {
+		if(!searchalltypes || !deviceTypes[deviceIndex + 1]) do {
 			n = receivedata(sudp, bufr, sizeof(bufr), delay, &scope_id);
 			if (n < 0) {
 				/* error */
diff --git a/ext/miniupnpc/miniupnpc.c b/ext/miniupnpc/miniupnpc.c
index 2dc5c95cd..566388818 100644
--- a/ext/miniupnpc/miniupnpc.c
+++ b/ext/miniupnpc/miniupnpc.c
@@ -1,9 +1,10 @@
-/* $Id: miniupnpc.c,v 1.149 2016/02/09 09:50:46 nanard Exp $ */
-/* vim: tabstop=4 shiftwidth=4 noexpandtab
- * Project : miniupnp
+#define _CRT_SECURE_NO_WARNINGS
+/* $Id: miniupnpc.c,v 1.141 2015/10/26 17:05:07 nanard Exp $ */
+/* vim: tabstop=4 shiftwidth=4 noexpandtab */
+/* Project : miniupnp
  * Web : http://miniupnp.free.fr/
  * Author : Thomas BERNARD
- * copyright (c) 2005-2016 Thomas Bernard
+ * copyright (c) 2005-2015 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENSE file. */
 #include <stdlib.h>
@@ -72,25 +73,6 @@
 #define SERVICEPREFIX "u"
 #define SERVICEPREFIX2 'u'
 
-/* check if an ip address is a private (LAN) address
- * see https://tools.ietf.org/html/rfc1918 */
-static int is_rfc1918addr(const char * addr)
-{
-	/* 192.168.0.0     -   192.168.255.255 (192.168/16 prefix) */
-	if(COMPARE(addr, "192.168."))
-		return 1;
-	/* 10.0.0.0        -   10.255.255.255  (10/8 prefix) */
-	if(COMPARE(addr, "10."))
-		return 1;
-	/* 172.16.0.0      -   172.31.255.255  (172.16/12 prefix) */
-	if(COMPARE(addr, "172.")) {
-		int i = atoi(addr + 4);
-		if((16 <= i) && (i <= 31))
-			return 1;
-	}
-	return 0;
-}
-
 /* root description parsing */
 MINIUPNP_LIBSPEC void parserootdesc(const char * buffer, int bufsize, struct IGDdatas * data)
 {
@@ -126,7 +108,6 @@ char * simpleUPnPcommand2(int s, const char * url, const char * service,
 	int soapbodylen;
 	char * buf;
 	int n;
-	int status_code;
 
 	*bufsize = 0;
 	snprintf(soapact, sizeof(soapact), "%s#%s", service, action);
@@ -230,15 +211,11 @@ char * simpleUPnPcommand2(int s, const char * url, const char * service,
 		return NULL;
 	}
 
-	buf = getHTTPResponse(s, bufsize, &status_code);
+	buf = getHTTPResponse(s, bufsize);
 #ifdef DEBUG
 	if(*bufsize > 0 && buf)
 	{
-		printf("HTTP %d SOAP Response :\n%.*s\n", status_code, *bufsize, buf);
-	}
-	else
-	{
-		printf("HTTP %d, empty SOAP response. size=%d\n", status_code, *bufsize);
+		printf("SOAP Response :\n%.*s\n", *bufsize, buf);
 	}
 #endif
 	closesocket(s);
@@ -550,7 +527,7 @@ UPNPIGD_IsConnected(struct UPNPUrls * urls, struct IGDdatas * data)
  *     3 = an UPnP device has been found but was not recognized as an IGD
  *
  * In any positive non zero return case, the urls and data structures
- * passed as parameters are set. Dont forget to call FreeUPNPUrls(urls) to
+ * passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to
  * free allocated memory.
  */
 MINIUPNP_LIBSPEC int
@@ -570,9 +547,6 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
 	int state = -1; /* state 1 : IGD connected. State 2 : IGD. State 3 : anything */
 	int n_igd = 0;
 	char extIpAddr[16];
-	char myLanAddr[40];
-	int status_code = -1;
-
 	if(!devlist)
 	{
 #ifdef DEBUG
@@ -595,8 +569,8 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
 		/* we should choose an internet gateway device.
 		 * with st == urn:schemas-upnp-org:device:InternetGatewayDevice:1 */
 		desc[i].xml = miniwget_getaddr(dev->descURL, &(desc[i].size),
-		                               myLanAddr, sizeof(myLanAddr),
-		                               dev->scope_id, &status_code);
+		                               lanaddr, lanaddrlen,
+		                               dev->scope_id);
 #ifdef DEBUG
 		if(!desc[i].xml)
 		{
@@ -613,8 +587,6 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
 			{
 				desc[i].is_igd = 1;
 				n_igd++;
-				if(lanaddr)
-					strncpy(lanaddr, myLanAddr, lanaddrlen);
 			}
 		}
 	}
@@ -630,25 +602,20 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
 				parserootdesc(desc[i].xml, desc[i].size, data);
 				if(desc[i].is_igd || state >= 3 )
 				{
-				  int is_connected;
-
 				  GetUPNPUrls(urls, data, dev->descURL, dev->scope_id);
 
 				  /* in state 2 and 3 we dont test if device is connected ! */
 				  if(state >= 2)
 				    goto free_and_return;
-				  is_connected = UPNPIGD_IsConnected(urls, data);
 #ifdef DEBUG
 				  printf("UPNPIGD_IsConnected(%s) = %d\n",
-				     urls->controlURL, is_connected);
+				     urls->controlURL,
+			         UPNPIGD_IsConnected(urls, data));
 #endif
 				  /* checks that status is connected AND there is a external IP address assigned */
-				  if(is_connected &&
-				     (UPNP_GetExternalIPAddress(urls->controlURL,  data->first.servicetype, extIpAddr) == 0)) {
-					if(!is_rfc1918addr(extIpAddr) && (extIpAddr[0] != '\0')
-					   && (0 != strcmp(extIpAddr, "0.0.0.0")))
-					  goto free_and_return;
-				  }
+				  if(UPNPIGD_IsConnected(urls, data)
+				     && (UPNP_GetExternalIPAddress(urls->controlURL,  data->first.servicetype, extIpAddr) == 0))
+					goto free_and_return;
 				  FreeUPNPUrls(urls);
 				  if(data->second.servicetype[0] != '\0') {
 #ifdef DEBUG
@@ -660,17 +627,14 @@ UPNP_GetValidIGD(struct UPNPDev * devlist,
 				    memcpy(&data->first, &data->second, sizeof(struct IGDdatas_service));
 				    memcpy(&data->second, &data->tmp, sizeof(struct IGDdatas_service));
 				    GetUPNPUrls(urls, data, dev->descURL, dev->scope_id);
-				    is_connected = UPNPIGD_IsConnected(urls, data);
 #ifdef DEBUG
 				    printf("UPNPIGD_IsConnected(%s) = %d\n",
-				       urls->controlURL, is_connected);
+				       urls->controlURL,
+			           UPNPIGD_IsConnected(urls, data));
 #endif
-				    if(is_connected &&
-				       (UPNP_GetExternalIPAddress(urls->controlURL,  data->first.servicetype, extIpAddr) == 0)) {
-					  if(!is_rfc1918addr(extIpAddr) && (extIpAddr[0] != '\0')
-					     && (0 != strcmp(extIpAddr, "0.0.0.0")))
-					    goto free_and_return;
-				    }
+				    if(UPNPIGD_IsConnected(urls, data)
+				       && (UPNP_GetExternalIPAddress(urls->controlURL,  data->first.servicetype, extIpAddr) == 0))
+					  goto free_and_return;
 				    FreeUPNPUrls(urls);
 				  }
 				}
@@ -704,9 +668,8 @@ UPNP_GetIGDFromUrl(const char * rootdescurl,
 {
 	char * descXML;
 	int descXMLsize = 0;
-
 	descXML = miniwget_getaddr(rootdescurl, &descXMLsize,
-	                           lanaddr, lanaddrlen, 0, NULL);
+	   	                       lanaddr, lanaddrlen, 0);
 	if(descXML) {
 		memset(data, 0, sizeof(struct IGDdatas));
 		memset(urls, 0, sizeof(struct UPNPUrls));
diff --git a/ext/miniupnpc/miniupnpc.h b/ext/miniupnpc/miniupnpc.h
index 4a805b11f..dfbfa01f2 100644
--- a/ext/miniupnpc/miniupnpc.h
+++ b/ext/miniupnpc/miniupnpc.h
@@ -1,8 +1,8 @@
-/* $Id: miniupnpc.h,v 1.50 2016/04/19 21:06:21 nanard Exp $ */
+/* $Id: miniupnpc.h,v 1.48 2015/10/08 16:19:40 nanard Exp $ */
 /* Project: miniupnp
  * http://miniupnp.free.fr/
  * Author: Thomas Bernard
- * Copyright (c) 2005-2016 Thomas Bernard
+ * Copyright (c) 2005-2015 Thomas Bernard
  * This software is subjects to the conditions detailed
  * in the LICENCE file provided within this distribution */
 #ifndef MINIUPNPC_H_INCLUDED
@@ -19,8 +19,8 @@
 #define UPNPDISCOVER_MEMORY_ERROR (-102)
 
 /* versions : */
-#define MINIUPNPC_VERSION	"2.0.20171212"
-#define MINIUPNPC_API_VERSION	16
+#define MINIUPNPC_VERSION	"1.9.20151026"
+#define MINIUPNPC_API_VERSION	15
 
 /* Source port:
    Using "1" as an alias for 1900 for backwards compatability
diff --git a/ext/miniupnpc/miniupnpcmodule.c b/ext/miniupnpc/miniupnpcmodule.c
index bbff07382..a5bdce44f 100644
--- a/ext/miniupnpc/miniupnpcmodule.c
+++ b/ext/miniupnpc/miniupnpcmodule.c
@@ -1,8 +1,8 @@
-/* $Id: miniupnpcmodule.c,v 1.31 2017/11/02 15:37:28 nanard Exp $*/
+/* $Id: miniupnpcmodule.c,v 1.29 2015/10/26 17:01:30 nanard Exp $*/
 /* Project : miniupnp
  * Author : Thomas BERNARD
  * website : http://miniupnp.tuxfamily.org/
- * copyright (c) 2007-2016 Thomas Bernard
+ * copyright (c) 2007-2014 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENCE file. */
 #include <Python.h>
@@ -12,10 +12,6 @@
 #include "upnpcommands.h"
 #include "upnperrors.h"
 
-#ifdef _WIN32
-#include <winsock2.h>
-#endif
-
 /* for compatibility with Python < 2.4 */
 #ifndef Py_RETURN_NONE
 #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
@@ -307,7 +303,7 @@ UPnP_addportmapping(UPnPObject *self, PyObject *args)
 	const char * remoteHost;
 	const char * leaseDuration = "0";
 	int r;
-	if (!PyArg_ParseTuple(args, "HssHzz", &ePort, &proto,
+	if (!PyArg_ParseTuple(args, "HssHss", &ePort, &proto,
 	                                     &host, &iPort, &desc, &remoteHost))
         return NULL;
 Py_BEGIN_ALLOW_THREADS
@@ -349,7 +345,7 @@ UPnP_addanyportmapping(UPnPObject *self, PyObject *args)
 	const char * remoteHost;
 	const char * leaseDuration = "0";
 	int r;
-	if (!PyArg_ParseTuple(args, "HssHzz", &ePort, &proto, &host, &iPort, &desc, &remoteHost))
+	if (!PyArg_ParseTuple(args, "HssHss", &ePort, &proto, &host, &iPort, &desc, &remoteHost))
         return NULL;
 Py_BEGIN_ALLOW_THREADS
 	sprintf(extPort, "%hu", ePort);
@@ -673,10 +669,6 @@ initminiupnpc(void)
     PyObject* m;
 
 #ifdef _WIN32
-    /* initialize Winsock. */
-    WSADATA wsaData;
-    int nResult = WSAStartup(MAKEWORD(2,2), &wsaData);
-
     UPnPType.tp_new = PyType_GenericNew;
 #endif
     if (PyType_Ready(&UPnPType) < 0)
diff --git a/ext/miniupnpc/miniupnpcstrings.h.cmake b/ext/miniupnpc/miniupnpcstrings.h.cmake
new file mode 100644
index 000000000..78c8fe9c5
--- /dev/null
+++ b/ext/miniupnpc/miniupnpcstrings.h.cmake
@@ -0,0 +1,15 @@
+#ifndef MINIUPNPCSTRINGS_H_INCLUDED
+#define MINIUPNPCSTRINGS_H_INCLUDED
+
+#define OS_STRING "${CMAKE_SYSTEM_NAME}"
+#define MINIUPNPC_VERSION_STRING "${MINIUPNPC_VERSION}"
+
+#if 0
+/* according to "UPnP Device Architecture 1.0" */
+#define UPNP_VERSION_STRING "UPnP/1.0"
+#else
+/* according to "UPnP Device Architecture 1.1" */
+#define UPNP_VERSION_STRING "UPnP/1.1"
+#endif
+
+#endif
diff --git a/ext/miniupnpc/miniwget.c b/ext/miniupnpc/miniwget.c
index 0c461734f..4b11ea9b8 100644
--- a/ext/miniupnpc/miniwget.c
+++ b/ext/miniupnpc/miniwget.c
@@ -1,8 +1,9 @@
-/* $Id: miniwget.c,v 1.77 2017/05/09 10:04:57 nanard Exp $ */
+#define _CRT_SECURE_NO_WARNINGS
+/* $Id: miniwget.c,v 1.72 2015/10/26 17:05:08 nanard Exp $ */
 /* Project : miniupnp
  * Website : http://miniupnp.free.fr/
  * Author : Thomas Bernard
- * Copyright (c) 2005-2017 Thomas Bernard
+ * Copyright (c) 2005-2015 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution. */
 
@@ -48,20 +49,12 @@
 #define MIN(x,y) (((x)<(y))?(x):(y))
 #endif /* MIN */
 
+
 #ifdef _WIN32
-#undef OS_STRING
 #define OS_STRING "Win32"
-#define MINIUPNPC_VERSION_STRING "2.0"
+#define MINIUPNPC_VERSION_STRING "1.9"
 #define UPNP_VERSION_STRING "UPnP/1.1"
 #endif
-
-#ifdef __ANDROID__
-#undef OS_STRING
-#define OS_STRING "Android"
-#define MINIUPNPC_VERSION_STRING "2.0"
-#define UPNP_VERSION_STRING "UPnP/1.1"
-#endif
-
 #include "miniwget.h"
 #include "connecthostport.h"
 #include "receivedata.h"
@@ -77,7 +70,7 @@
  * to the length parameter.
  */
 void *
-getHTTPResponse(int s, int * size, int * status_code)
+getHTTPResponse(int s, int * size)
 {
 	char buf[2048];
 	int n;
@@ -95,12 +88,7 @@ getHTTPResponse(int s, int * size, int * status_code)
 	unsigned int content_buf_used = 0;
 	char chunksize_buf[32];
 	unsigned int chunksize_buf_index;
-#ifdef DEBUG
-	char * reason_phrase = NULL;
-	int reason_phrase_len = 0;
-#endif
 
-	if(status_code) *status_code = -1;
 	header_buf = malloc(header_buf_len);
 	if(header_buf == NULL)
 	{
@@ -123,7 +111,7 @@ getHTTPResponse(int s, int * size, int * status_code)
 	chunksize_buf[0] = '\0';
 	chunksize_buf_index = 0;
 
-	while((n = receivedata(s, buf, sizeof(buf), 5000, NULL)) > 0)
+	while((n = receivedata(s, buf, 2048, 5000, NULL)) > 0)
 	{
 		if(endofheaders == 0)
 		{
@@ -172,7 +160,7 @@ getHTTPResponse(int s, int * size, int * status_code)
 				continue;
 			/* parse header lines */
 			for(i = 0; i < endofheaders - 1; i++) {
-				if(linestart > 0 && colon <= linestart && header_buf[i]==':')
+				if(colon <= linestart && header_buf[i]==':')
 				{
 					colon = i;
 					while(i < (endofheaders-1)
@@ -183,31 +171,7 @@ getHTTPResponse(int s, int * size, int * status_code)
 				/* detecting end of line */
 				else if(header_buf[i]=='\r' || header_buf[i]=='\n')
 				{
-					if(linestart == 0 && status_code)
-					{
-						/* Status line
-						 * HTTP-Version SP Status-Code SP Reason-Phrase CRLF */
-						int sp;
-						for(sp = 0; sp < i; sp++)
-							if(header_buf[sp] == ' ')
-							{
-								if(*status_code < 0)
-									*status_code = atoi(header_buf + sp + 1);
-								else
-								{
-#ifdef DEBUG
-									reason_phrase = header_buf + sp + 1;
-									reason_phrase_len = i - sp - 1;
-#endif
-									break;
-								}
-							}
-#ifdef DEBUG
-						printf("HTTP status code = %d, Reason phrase = %.*s\n",
-						       *status_code, reason_phrase_len, reason_phrase);
-#endif
-					}
-					else if(colon > linestart && valuestart > colon)
+					if(colon > linestart && valuestart > colon)
 					{
 #ifdef DEBUG
 						printf("header='%.*s', value='%.*s'\n",
@@ -296,12 +260,11 @@ getHTTPResponse(int s, int * size, int * status_code)
 							goto end_of_stream;
 						}
 					}
-					/* it is guaranteed that (n >= i) */
-					bytestocopy = (chunksize < (unsigned int)(n - i))?chunksize:(unsigned int)(n - i);
+					bytestocopy = ((int)chunksize < (n - i))?chunksize:(unsigned int)(n - i);
 					if((content_buf_used + bytestocopy) > content_buf_len)
 					{
 						char * tmp;
-						if((content_length >= 0) && ((unsigned int)content_length >= (content_buf_used + bytestocopy))) {
+						if(content_length >= (int)(content_buf_used + bytestocopy)) {
 							content_buf_len = content_length;
 						} else {
 							content_buf_len = content_buf_used + bytestocopy;
@@ -326,15 +289,14 @@ getHTTPResponse(int s, int * size, int * status_code)
 			{
 				/* not chunked */
 				if(content_length > 0
-				   && (content_buf_used + n) > (unsigned int)content_length) {
+				   && (int)(content_buf_used + n) > content_length) {
 					/* skipping additional bytes */
 					n = content_length - content_buf_used;
 				}
 				if(content_buf_used + n > content_buf_len)
 				{
 					char * tmp;
-					if(content_length >= 0
-					   && (unsigned int)content_length >= (content_buf_used + n)) {
+					if(content_length >= (int)(content_buf_used + n)) {
 						content_buf_len = content_length;
 					} else {
 						content_buf_len = content_buf_used + n;
@@ -354,7 +316,7 @@ getHTTPResponse(int s, int * size, int * status_code)
 			}
 		}
 		/* use the Content-Length header value if available */
-		if(content_length > 0 && content_buf_used >= (unsigned int)content_length)
+		if(content_length > 0 && (int)content_buf_used >= content_length)
 		{
 #ifdef DEBUG
 			printf("End of HTTP content\n");
@@ -380,8 +342,7 @@ static void *
 miniwget3(const char * host,
           unsigned short port, const char * path,
           int * size, char * addr_str, int addr_str_len,
-          const char * httpversion, unsigned int scope_id,
-          int * status_code)
+          const char * httpversion, unsigned int scope_id)
 {
 	char buf[2048];
     int s;
@@ -479,7 +440,7 @@ miniwget3(const char * host,
 			sent += n;
 		}
 	}
-	content = getHTTPResponse(s, size, status_code);
+	content = getHTTPResponse(s, size);
 	closesocket(s);
 	return content;
 }
@@ -488,20 +449,18 @@ miniwget3(const char * host,
  * Call miniwget3(); retry with HTTP/1.1 if 1.0 fails. */
 static void *
 miniwget2(const char * host,
-          unsigned short port, const char * path,
-          int * size, char * addr_str, int addr_str_len,
-          unsigned int scope_id, int * status_code)
+		  unsigned short port, const char * path,
+		  int * size, char * addr_str, int addr_str_len,
+          unsigned int scope_id)
 {
 	char * respbuffer;
 
 #if 1
 	respbuffer = miniwget3(host, port, path, size,
-	                       addr_str, addr_str_len, "1.1",
-	                       scope_id, status_code);
+	                       addr_str, addr_str_len, "1.1", scope_id);
 #else
 	respbuffer = miniwget3(host, port, path, size,
-	                       addr_str, addr_str_len, "1.0",
-	                       scope_id, status_code);
+	                       addr_str, addr_str_len, "1.0", scope_id);
 	if (*size == 0)
 	{
 #ifdef DEBUG
@@ -509,8 +468,7 @@ miniwget2(const char * host,
 #endif
 		free(respbuffer);
 		respbuffer = miniwget3(host, port, path, size,
-		                       addr_str, addr_str_len, "1.1",
-		                       scope_id, status_code);
+		                       addr_str, addr_str_len, "1.1", scope_id);
 	}
 #endif
 	return respbuffer;
@@ -635,8 +593,7 @@ parseURL(const char * url,
 }
 
 void *
-miniwget(const char * url, int * size,
-         unsigned int scope_id, int * status_code)
+miniwget(const char * url, int * size, unsigned int scope_id)
 {
 	unsigned short port;
 	char * path;
@@ -649,13 +606,12 @@ miniwget(const char * url, int * size,
 	printf("parsed url : hostname='%s' port=%hu path='%s' scope_id=%u\n",
 	       hostname, port, path, scope_id);
 #endif
-	return miniwget2(hostname, port, path, size, 0, 0, scope_id, status_code);
+	return miniwget2(hostname, port, path, size, 0, 0, scope_id);
 }
 
 void *
 miniwget_getaddr(const char * url, int * size,
-                 char * addr, int addrlen, unsigned int scope_id,
-                 int * status_code)
+                 char * addr, int addrlen, unsigned int scope_id)
 {
 	unsigned short port;
 	char * path;
@@ -670,6 +626,5 @@ miniwget_getaddr(const char * url, int * size,
 	printf("parsed url : hostname='%s' port=%hu path='%s' scope_id=%u\n",
 	       hostname, port, path, scope_id);
 #endif
-	return miniwget2(hostname, port, path, size, addr, addrlen, scope_id, status_code);
+	return miniwget2(hostname, port, path, size, addr, addrlen, scope_id);
 }
-
diff --git a/ext/miniupnpc/miniwget.h b/ext/miniupnpc/miniwget.h
index 0701494d0..d6db71a85 100644
--- a/ext/miniupnpc/miniwget.h
+++ b/ext/miniupnpc/miniwget.h
@@ -1,7 +1,7 @@
-/* $Id: miniwget.h,v 1.12 2016/01/24 17:24:36 nanard Exp $ */
+/* $Id: miniwget.h,v 1.10 2015/07/21 13:16:55 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
- * Copyright (c) 2005-2016 Thomas Bernard
+ * Copyright (c) 2005-2015 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
  * */
@@ -14,11 +14,11 @@
 extern "C" {
 #endif
 
-MINIUPNP_LIBSPEC void * getHTTPResponse(int s, int * size, int * status_code);
+MINIUPNP_LIBSPEC void * getHTTPResponse(int s, int * size);
 
-MINIUPNP_LIBSPEC void * miniwget(const char *, int *, unsigned int, int *);
+MINIUPNP_LIBSPEC void * miniwget(const char *, int *, unsigned int);
 
-MINIUPNP_LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int, unsigned int, int *);
+MINIUPNP_LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int, unsigned int);
 
 int parseURL(const char *, char *, unsigned short *, char * *, unsigned int *);
 
diff --git a/ext/miniupnpc/minixml.c b/ext/miniupnpc/minixml.c
index 935ec443e..5c79b3c9d 100644
--- a/ext/miniupnpc/minixml.c
+++ b/ext/miniupnpc/minixml.c
@@ -1,11 +1,11 @@
-/* $Id: minixml.c,v 1.12 2017/12/12 11:17:40 nanard Exp $ */
-/* vim: tabstop=4 shiftwidth=4 noexpandtab
- * minixml.c : the minimum size a xml parser can be ! */
+#define _CRT_SECURE_NO_WARNINGS
+/* $Id: minixml.c,v 1.11 2014/02/03 15:54:12 nanard Exp $ */
+/* minixml.c : the minimum size a xml parser can be ! */
 /* Project : miniupnp
  * webpage: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * Author : Thomas Bernard
 
-Copyright (c) 2005-2017, Thomas BERNARD
+Copyright (c) 2005-2014, Thomas BERNARD
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -162,8 +162,7 @@ static void parseelt(struct xmlparser * p)
 						if (p->xml >= p->xmlend)
 							return;
 					}
-					/* CDATA are at least 9 + 3 characters long : <![CDATA[ ]]> */
-					if((p->xmlend >= (p->xml + (9 + 3))) && (memcmp(p->xml, "<![CDATA[", 9) == 0))
+					if(memcmp(p->xml, "<![CDATA[", 9) == 0)
 					{
 						/* CDATA handling */
 						p->xml += 9;
diff --git a/ext/miniupnpc/minixmlvalid.c b/ext/miniupnpc/minixmlvalid.c
index dad148812..a86beba8b 100644
--- a/ext/miniupnpc/minixmlvalid.c
+++ b/ext/miniupnpc/minixmlvalid.c
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 /* $Id: minixmlvalid.c,v 1.7 2015/07/15 12:41:15 nanard Exp $ */
 /* MiniUPnP Project
  * http://miniupnp.tuxfamily.org/ or http://miniupnp.free.fr/
diff --git a/ext/miniupnpc/msvc/miniupnpc.sln b/ext/miniupnpc/msvc/miniupnpc.sln
new file mode 100644
index 000000000..b3da1919e
--- /dev/null
+++ b/ext/miniupnpc/msvc/miniupnpc.sln
@@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc", "miniupnpc.vcproj", "{D28CE435-CB33-4BAE-8A52-C6EF915956F5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upnpc-static", "upnpc-static.vcproj", "{469E1CF6-08A2-4B7B-A2AA-5BDB089857C1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D28CE435-CB33-4BAE-8A52-C6EF915956F5} = {D28CE435-CB33-4BAE-8A52-C6EF915956F5}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D28CE435-CB33-4BAE-8A52-C6EF915956F5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D28CE435-CB33-4BAE-8A52-C6EF915956F5}.Debug|Win32.Build.0 = Debug|Win32
+		{D28CE435-CB33-4BAE-8A52-C6EF915956F5}.Release|Win32.ActiveCfg = Release|Win32
+		{D28CE435-CB33-4BAE-8A52-C6EF915956F5}.Release|Win32.Build.0 = Release|Win32
+		{469E1CF6-08A2-4B7B-A2AA-5BDB089857C1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{469E1CF6-08A2-4B7B-A2AA-5BDB089857C1}.Debug|Win32.Build.0 = Debug|Win32
+		{469E1CF6-08A2-4B7B-A2AA-5BDB089857C1}.Release|Win32.ActiveCfg = Release|Win32
+		{469E1CF6-08A2-4B7B-A2AA-5BDB089857C1}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/ext/miniupnpc/msvc/miniupnpc.vcproj b/ext/miniupnpc/msvc/miniupnpc.vcproj
new file mode 100644
index 000000000..fb301e3b8
--- /dev/null
+++ b/ext/miniupnpc/msvc/miniupnpc.vcproj
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="miniupnpc"
+	ProjectGUID="{D28CE435-CB33-4BAE-8A52-C6EF915956F5}"
+	RootNamespace="miniupnpc"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;MINIUPNP_STATICLIB;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;MINIUPNP_STATICLIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Fichiers sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\connecthostport.c"
+				>
+			</File>
+			<File
+				RelativePath="..\igd_desc_parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\minisoap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\minissdpc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\miniupnpc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\miniwget.c"
+				>
+			</File>
+			<File
+				RelativePath="..\minixml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\portlistingparse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\receivedata.c"
+				>
+			</File>
+			<File
+				RelativePath="..\upnpcommands.c"
+				>
+			</File>
+			<File
+				RelativePath="..\upnpdev.c"
+				>
+			</File>
+			<File
+				RelativePath="..\upnperrors.c"
+				>
+			</File>
+			<File
+				RelativePath="..\upnpreplyparse.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Fichiers d&apos;en-t�te"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\connecthostport.h"
+				>
+			</File>
+			<File
+				RelativePath="..\declspec.h"
+				>
+			</File>
+			<File
+				RelativePath="..\igd_desc_parse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\minisoap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\minissdpc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\miniupnpc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\miniupnpcstrings.h"
+				>
+			</File>
+			<File
+				RelativePath="..\miniupnpctypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\miniwget.h"
+				>
+			</File>
+			<File
+				RelativePath="..\minixml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\portlistingparse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\receivedata.h"
+				>
+			</File>
+			<File
+				RelativePath="..\upnpcommands.h"
+				>
+			</File>
+			<File
+				RelativePath="..\upnpdev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\upnperrors.h"
+				>
+			</File>
+			<File
+				RelativePath="..\upnpreplyparse.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Fichiers de ressources"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ext/miniupnpc/msvc/upnpc-static.vcproj b/ext/miniupnpc/msvc/upnpc-static.vcproj
new file mode 100644
index 000000000..c88c9a6e9
--- /dev/null
+++ b/ext/miniupnpc/msvc/upnpc-static.vcproj
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="upnpc-static"
+	ProjectGUID="{469E1CF6-08A2-4B7B-A2AA-5BDB089857C1}"
+	RootNamespace="upnpcstatic"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;MINIUPNP_STATICLIB;DEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib IPHlpApi.Lib Debug\miniupnpc.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;MINIUPNP_STATICLIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib IPHlpApi.Lib Release\miniupnpc.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Fichiers sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\upnpc.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Fichiers d&apos;en-t�te"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Fichiers de ressources"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ext/miniupnpc/portlistingparse.c b/ext/miniupnpc/portlistingparse.c
index d1954f59f..0e0927803 100644
--- a/ext/miniupnpc/portlistingparse.c
+++ b/ext/miniupnpc/portlistingparse.c
@@ -1,7 +1,7 @@
-/* $Id: portlistingparse.c,v 1.10 2016/12/16 08:53:21 nanard Exp $ */
+/* $Id: portlistingparse.c,v 1.9 2015/07/15 12:41:13 nanard Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
- * (c) 2011-2016 Thomas Bernard
+ * (c) 2011-2015 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 #include <string.h>
@@ -55,7 +55,7 @@ startelt(void * d, const char * name, int l)
 	pdata->curelt = PortMappingEltNone;
 	for(i = 0; elements[i].str; i++)
 	{
-		if(strlen(elements[i].str) == (size_t)l && memcmp(name, elements[i].str, l) == 0)
+		if(memcmp(name, elements[i].str, l) == 0)
 		{
 			pdata->curelt = elements[i].code;
 			break;
diff --git a/ext/miniupnpc/pymoduletest.py b/ext/miniupnpc/pymoduletest.py
new file mode 100644
index 000000000..9fddd9c29
--- /dev/null
+++ b/ext/miniupnpc/pymoduletest.py
@@ -0,0 +1,88 @@
+#! /usr/bin/python
+# vim: tabstop=2 shiftwidth=2 expandtab
+# MiniUPnP project
+# Author : Thomas Bernard
+# This Sample code is public domain.
+# website : http://miniupnp.tuxfamily.org/
+
+# import the python miniupnpc module
+import miniupnpc
+import sys
+
+try:
+  import argparse
+  parser = argparse.ArgumentParser()
+  parser.add_argument('-m', '--multicastif')
+  parser.add_argument('-p', '--minissdpdsocket')
+  parser.add_argument('-d', '--discoverdelay', type=int, default=200)
+  parser.add_argument('-z', '--localport', type=int, default=0)
+  # create the object
+  u = miniupnpc.UPnP(**vars(parser.parse_args()))
+except:
+  print 'argparse not available'
+  i = 1
+  multicastif = None
+  minissdpdsocket = None
+  discoverdelay = 200
+  localport = 0
+  while i < len(sys.argv):
+    print sys.argv[i]
+    if sys.argv[i] == '-m' or sys.argv[i] == '--multicastif':
+      multicastif = sys.argv[i+1]
+    elif sys.argv[i] == '-p' or sys.argv[i] == '--minissdpdsocket':
+      minissdpdsocket = sys.argv[i+1]
+    elif sys.argv[i] == '-d' or sys.argv[i] == '--discoverdelay':
+      discoverdelay = int(sys.argv[i+1])
+    elif sys.argv[i] == '-z' or sys.argv[i] == '--localport':
+      localport = int(sys.argv[i+1])
+    else:
+      raise Exception('invalid argument %s' % sys.argv[i])
+    i += 2
+  # create the object
+  u = miniupnpc.UPnP(multicastif, minissdpdsocket, discoverdelay, localport)
+
+print 'inital(default) values :'
+print ' discoverdelay', u.discoverdelay
+print ' lanaddr', u.lanaddr
+print ' multicastif', u.multicastif
+print ' minissdpdsocket', u.minissdpdsocket
+#u.minissdpdsocket = '../minissdpd/minissdpd.sock'
+# discovery process, it usualy takes several seconds (2 seconds or more)
+print 'Discovering... delay=%ums' % u.discoverdelay
+print u.discover(), 'device(s) detected'
+# select an igd
+try:
+  u.selectigd()
+except Exception, e:
+  print 'Exception :', e
+  sys.exit(1)
+# display information about the IGD and the internet connection
+print 'local ip address :', u.lanaddr
+print 'external ip address :', u.externalipaddress()
+print u.statusinfo(), u.connectiontype()
+print 'total bytes : sent', u.totalbytesent(), 'received', u.totalbytereceived()
+print 'total packets : sent', u.totalpacketsent(), 'received', u.totalpacketreceived()
+
+#print u.addportmapping(64000, 'TCP',
+#                       '192.168.1.166', 63000, 'port mapping test', '')
+#print u.deleteportmapping(64000, 'TCP')
+
+port = 0
+proto = 'UDP'
+# list the redirections :
+i = 0
+while True:
+	p = u.getgenericportmapping(i)
+	if p==None:
+		break
+	print i, p
+	(port, proto, (ihost,iport), desc, c, d, e) = p
+	#print port, desc
+	i = i + 1
+
+print u.getspecificportmapping(port, proto)
+try:
+  print u.getportmappingnumberofentries()
+except Exception, e:
+  print 'GetPortMappingNumberOfEntries() is not supported :', e
+
diff --git a/ext/miniupnpc/receivedata.c b/ext/miniupnpc/receivedata.c
index 5dbd227b2..fb05e09db 100644
--- a/ext/miniupnpc/receivedata.c
+++ b/ext/miniupnpc/receivedata.c
@@ -1,4 +1,4 @@
-/* $Id: receivedata.c,v 1.8 2017/04/21 10:16:45 nanard Exp $ */
+/* $Id: receivedata.c,v 1.6 2014/11/13 13:51:52 nanard Exp $ */
 /* Project : miniupnp
  * Website : http://miniupnp.free.fr/
  * Author : Thomas Bernard
@@ -28,7 +28,7 @@
 #endif /* _WIN32 */
 
 #ifdef _WIN32
-#define PRINT_SOCKET_ERROR(x)    fprintf(stderr, "Socket error: %s, %d\n", x, WSAGetLastError());
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
 #else
 #define PRINT_SOCKET_ERROR(x) perror(x)
 #endif
@@ -40,7 +40,7 @@ receivedata(int socket,
             char * data, int length,
             int timeout, unsigned int * scope_id)
 {
-#ifdef MINIUPNPC_GET_SRC_ADDR
+#if MINIUPNPC_GET_SRC_ADDR
 	struct sockaddr_storage src_addr;
 	socklen_t src_addr_len = sizeof(src_addr);
 #endif	/* MINIUPNPC_GET_SRC_ADDR */
@@ -80,7 +80,7 @@ receivedata(int socket,
         return 0;
     }
 #endif	/* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */
-#ifdef MINIUPNPC_GET_SRC_ADDR
+#if MINIUPNPC_GET_SRC_ADDR
 	memset(&src_addr, 0, sizeof(src_addr));
 	n = recvfrom(socket, data, length, 0,
 	             (struct sockaddr *)&src_addr, &src_addr_len);
@@ -90,7 +90,7 @@ receivedata(int socket,
 	if(n<0) {
 		PRINT_SOCKET_ERROR("recv");
 	}
-#ifdef MINIUPNPC_GET_SRC_ADDR
+#if MINIUPNPC_GET_SRC_ADDR
 	if (src_addr.ss_family == AF_INET6) {
 		const struct sockaddr_in6 * src_addr6 = (struct sockaddr_in6 *)&src_addr;
 #ifdef DEBUG
diff --git a/ext/miniupnpc/setup.py b/ext/miniupnpc/setup.py
new file mode 100644
index 000000000..97e42bf18
--- /dev/null
+++ b/ext/miniupnpc/setup.py
@@ -0,0 +1,28 @@
+#! /usr/bin/python
+# vim: tabstop=8 shiftwidth=8 expandtab
+# $Id: setup.py,v 1.12 2015/10/26 17:03:17 nanard Exp $
+# the MiniUPnP Project (c) 2007-2014 Thomas Bernard
+# http://miniupnp.tuxfamily.org/ or http://miniupnp.free.fr/
+#
+# python script to build the miniupnpc module under unix
+#
+# replace libminiupnpc.a by libminiupnpc.so for shared library usage
+try:
+      from setuptools import setup, Extension
+except ImportError:
+      from distutils.core import setup, Extension
+from distutils import sysconfig
+sysconfig.get_config_vars()["OPT"] = ''
+sysconfig.get_config_vars()["CFLAGS"] = ''
+setup(name="miniupnpc",
+      version=open('VERSION').read().strip(),
+      author='Thomas BERNARD',
+      author_email='miniupnp@free.fr',
+      license=open('LICENSE').read(),
+      url='http://miniupnp.free.fr/',
+      description='miniUPnP client',
+      ext_modules=[
+         Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
+                   extra_objects=["libminiupnpc.a"])
+      ])
+
diff --git a/ext/miniupnpc/setupmingw32.py b/ext/miniupnpc/setupmingw32.py
new file mode 100644
index 000000000..43dfb465d
--- /dev/null
+++ b/ext/miniupnpc/setupmingw32.py
@@ -0,0 +1,28 @@
+#! /usr/bin/python
+# vim: tabstop=8 shiftwidth=8 expandtab
+# $Id: setupmingw32.py,v 1.10 2015/10/26 17:03:17 nanard Exp $
+# the MiniUPnP Project (c) 2007-2014 Thomas Bernard
+# http://miniupnp.tuxfamily.org/ or http://miniupnp.free.fr/
+#
+# python script to build the miniupnpc module under windows (using mingw32)
+#
+try:
+        from setuptools import setup, Extension
+except ImportError:
+        from distutils.core import setup, Extension
+from distutils import sysconfig
+sysconfig.get_config_vars()["OPT"] = ''
+sysconfig.get_config_vars()["CFLAGS"] = ''
+setup(name="miniupnpc",
+      version=open('VERSION').read().strip(),
+      author='Thomas BERNARD',
+      author_email='miniupnp@free.fr',
+      license=open('LICENSE').read(),
+      url='http://miniupnp.free.fr/',
+      description='miniUPnP client',
+      ext_modules=[
+         Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
+                   libraries=["ws2_32", "iphlpapi"],
+                   extra_objects=["libminiupnpc.a"])
+      ])
+
diff --git a/ext/miniupnpc/testdesc/linksys_WAG200G_desc.values b/ext/miniupnpc/testdesc/linksys_WAG200G_desc.values
new file mode 100644
index 000000000..cf4222187
--- /dev/null
+++ b/ext/miniupnpc/testdesc/linksys_WAG200G_desc.values
@@ -0,0 +1,14 @@
+# values for linksys_WAG200G_desc.xml
+
+CIF:
+ servicetype = urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1
+ controlurl = /upnp/control/WANCommonIFC1
+ eventsuburl = /upnp/event/WANCommonIFC1
+ scpdurl = /cmnicfg.xml
+
+first:
+ servicetype = urn:schemas-upnp-org:service:WANPPPConnection:1
+ controlurl = /upnp/control/WANPPPConn1
+ eventsuburl = /upnp/event/WANPPPConn1
+ scpdurl = /pppcfg.xml
+
diff --git a/ext/miniupnpc/testdesc/linksys_WAG200G_desc.xml b/ext/miniupnpc/testdesc/linksys_WAG200G_desc.xml
new file mode 100644
index 000000000..d428d73b0
--- /dev/null
+++ b/ext/miniupnpc/testdesc/linksys_WAG200G_desc.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<root xmlns="urn:schemas-upnp-org:device-1-0">
+<specVersion>
+<major>1</major>
+<minor>0</minor>
+</specVersion>
+<URLBase>http://192.168.1.1:49152</URLBase>
+<device>
+<deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType>
+<friendlyName>LINKSYS WAG200G Gateway</friendlyName>
+<manufacturer>LINKSYS</manufacturer>
+<manufacturerURL>http://www.linksys.com</manufacturerURL>
+<modelDescription>LINKSYS WAG200G Gateway</modelDescription>
+<modelName>Wireless-G ADSL Home Gateway</modelName>
+<modelNumber>WAG200G</modelNumber>
+<modelURL>http://www.linksys.com</modelURL>
+<serialNumber>123456789</serialNumber>
+<UDN>uuid:8ca2eb37-1dd2-11b2-86f1-001a709b5aa8</UDN>
+<UPC>WAG200G</UPC>
+<serviceList>
+<service>
+<serviceType>urn:schemas-upnp-org:service:Layer3Forwarding:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:L3Forwarding1</serviceId>
+<controlURL>/upnp/control/L3Forwarding1</controlURL>
+<eventSubURL>/upnp/event/L3Forwarding1</eventSubURL>
+<SCPDURL>/l3frwd.xml</SCPDURL>
+</service>
+</serviceList>
+<deviceList>
+<device>
+<deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType>
+<friendlyName>WANDevice</friendlyName>
+<manufacturer>LINKSYS</manufacturer>
+<manufacturerURL>http://www.linksys.com/</manufacturerURL>
+<modelDescription>Residential Gateway</modelDescription>
+<modelName>Internet Connection Sharing</modelName>
+<modelNumber>1</modelNumber>
+<modelURL>http://www.linksys.com/</modelURL>
+<serialNumber>0000001</serialNumber>
+<UDN>uuid:8ca2eb36-1dd2-11b2-86f1-001a709b5aa8</UDN>
+<UPC>WAG200G</UPC>
+<serviceList>
+<service>
+<serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:WANCommonIFC1</serviceId>
+<controlURL>/upnp/control/WANCommonIFC1</controlURL>
+<eventSubURL>/upnp/event/WANCommonIFC1</eventSubURL>
+<SCPDURL>/cmnicfg.xml</SCPDURL>
+</service>
+</serviceList>
+<deviceList>
+<device>
+<deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType>
+<friendlyName>WANConnectionDevice</friendlyName>
+<manufacturer>LINKSYS</manufacturer>
+<manufacturerURL>http://www.linksys.com/</manufacturerURL>
+<modelDescription>Residential Gateway</modelDescription>
+<modelName>Internet Connection Sharing</modelName>
+<modelNumber>1</modelNumber>
+<modelURL>http://www.linksys.com/</modelURL>
+<serialNumber>0000001</serialNumber>
+<UDN>uuid:8ca2eb37-1dd2-11b2-86f0-001a709b5aa8</UDN>
+<UPC>WAG200G</UPC>
+<serviceList>
+<service>
+<serviceType>urn:schemas-upnp-org:service:WANEthernetLinkConfig:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:WANEthLinkC1</serviceId>
+<controlURL>/upnp/control/WANEthLinkC1</controlURL>
+<eventSubURL>/upnp/event/WANEthLinkC1</eventSubURL>
+<SCPDURL>/wanelcfg.xml</SCPDURL>
+</service>
+<service>
+<serviceType>urn:schemas-upnp-org:service:WANPPPConnection:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:WANPPPConn1</serviceId>
+<controlURL>/upnp/control/WANPPPConn1</controlURL>
+<eventSubURL>/upnp/event/WANPPPConn1</eventSubURL>
+<SCPDURL>/pppcfg.xml</SCPDURL>
+</service>
+</serviceList>
+</device>
+</deviceList>
+</device>
+<device>
+<deviceType>urn:schemas-upnp-org:device:LANDevice:1</deviceType>
+<friendlyName>LANDevice</friendlyName>
+<manufacturer>LINKSYS</manufacturer>
+<manufacturerURL>http://www.linksys.com/</manufacturerURL>
+<modelDescription>Residential Gateway</modelDescription>
+<modelName>Residential Gateway</modelName>
+<modelNumber>1</modelNumber>
+<modelURL>http://www.linksys.com/</modelURL>
+<serialNumber>0000001</serialNumber>
+<UDN>uuid:8ca2eb36-1dd2-11b2-86f0-001a709b5aa
+8</UDN>
+<UPC>WAG200G</UPC>
+<serviceList>
+<service>
+<serviceType>urn:schemas-upnp-org:service:LANHostConfigManagement:1</serviceType>
+<serviceId>urn:upnp-org:serviceId:LANHostCfg1</serviceId>
+<controlURL>/upnp/control/LANHostCfg1</controlURL>
+<eventSubURL>/upnp/event/LANHostCfg1</eventSubURL>
+<SCPDURL>/lanhostc.xml</SCPDURL>
+</service>
+</serviceList>
+</device>
+</deviceList>
+<presentationURL>http://192.168.1.1/index.htm</presentationURL>
+</device>
+</root>
+
diff --git a/ext/miniupnpc/testdesc/new_LiveBox_desc.values b/ext/miniupnpc/testdesc/new_LiveBox_desc.values
new file mode 100644
index 000000000..c55552e58
--- /dev/null
+++ b/ext/miniupnpc/testdesc/new_LiveBox_desc.values
@@ -0,0 +1,20 @@
+# values for new_LiveBox_desc.xml
+
+CIF:
+ servicetype = urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1
+ controlurl = /87895a19/upnp/control/WANCommonIFC1
+ eventsuburl = /87895a19/upnp/control/WANCommonIFC1
+ scpdurl = /87895a19/gateicfgSCPD.xml
+
+first:
+ servicetype = urn:schemas-upnp-org:service:WANPPPConnection:2
+ controlurl = /87895a19/upnp/control/WANIPConn1
+ eventsuburl = /87895a19/upnp/control/WANIPConn1
+ scpdurl = /87895a19/gateconnSCPD_PPP.xml
+
+IPv6FC:
+ servicetype = urn:schemas-upnp-org:service:WANIPv6FirewallControl:1
+ controlurl = /87895a19/upnp/control/WANIPv6FwCtrl1
+ eventsuburl = /87895a19/upnp/control/WANIPv6FwCtrl1
+ scpdurl = /87895a19/wanipv6fwctrlSCPD.xml
+
diff --git a/ext/miniupnpc/testdesc/new_LiveBox_desc.xml b/ext/miniupnpc/testdesc/new_LiveBox_desc.xml
new file mode 100644
index 000000000..620eb55af
--- /dev/null
+++ b/ext/miniupnpc/testdesc/new_LiveBox_desc.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<root xmlns="urn:schemas-upnp-org:device-1-0">
+  <specVersion>
+    <major>1</major>
+    <minor>0</minor>
+  </specVersion>
+  <device>
+    <pnpx:X_hardwareId xmlns:pnpx="http://schemas.microsoft.com/windows/pnpx/2005/11">VEN_0129&amp;DEV_0000&amp;SUBSYS_03&amp;REV_250417</pnpx:X_hardwareId>
+    <pnpx:X_compatibleId xmlns:pnpx="http://schemas.microsoft.com/windows/pnpx/2005/11">GenericUmPass</pnpx:X_compatibleId>
+    <pnpx:X_deviceCategory xmlns:pnpx="http://schemas.microsoft.com/windows/pnpx/2005/11">NetworkInfrastructure.Gateway</pnpx:X_deviceCategory>
+    <df:X_deviceCategory xmlns:df="http://schemas.microsoft.com/windows/2008/09/devicefoundation">Network.Gateway</df:X_deviceCategory>
+    <deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:2</deviceType>
+    <friendlyName>Orange Livebox</friendlyName>
+    <manufacturer>Sagemcom</manufacturer>
+    <manufacturerURL>http://www.sagemcom.com/</manufacturerURL>
+    <modelName>Residential Livebox,(DSL,WAN Ethernet)</modelName>
+    <UDN>uuid:87895a19-50f9-3736-a87f-115c230155f8</UDN>
+    <modelDescription>Sagemcom,fr,SG30_sip-fr-4.28.35.1</modelDescription>
+    <modelNumber>3</modelNumber>
+    <serialNumber>LK14129DP441489</serialNumber>
+    <presentationURL>http://192.168.1.1</presentationURL>
+    <UPC></UPC>
+    <iconList>
+      <icon>
+        <mimetype>image/png</mimetype>
+        <width>16</width>
+        <height>16</height>
+        <depth>8</depth>
+        <url>/87895a19/ligd.png</url>
+      </icon>
+    </iconList>
+    <deviceList>
+      <device>
+        <deviceType>urn:schemas-upnp-org:device:WANDevice:2</deviceType>
+        <friendlyName>WANDevice</friendlyName>
+        <manufacturer>Sagemcom</manufacturer>
+        <manufacturerURL>http://www.sagemcom.com/</manufacturerURL>
+        <modelDescription>WAN Device on Sagemcom,fr,SG30_sip-fr-4.28.35.1</modelDescription>
+        <modelName>Residential Livebox,(DSL,WAN Ethernet)</modelName>
+        <modelNumber>3</modelNumber>
+        <modelURL>http://www.sagemcom.com/</modelURL>
+        <serialNumber>LK14129DP441489</serialNumber>
+        <presentationURL>http://192.168.1.1</presentationURL>
+        <UDN>uuid:e2397374-53d8-3fc6-8306-593ba1a34625</UDN>
+        <UPC></UPC>
+        <serviceList>
+          <service>
+            <serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType>
+            <serviceId>urn:upnp-org:serviceId:WANCommonIFC1</serviceId>
+            <controlURL>/87895a19/upnp/control/WANCommonIFC1</controlURL>
+            <eventSubURL>/87895a19/upnp/control/WANCommonIFC1</eventSubURL>
+            <SCPDURL>/87895a19/gateicfgSCPD.xml</SCPDURL>
+          </service>
+        </serviceList>
+        <deviceList>
+          <device>
+            <deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:2</deviceType>
+            <friendlyName>WANConnectionDevice</friendlyName>
+            <manufacturer>Sagemcom</manufacturer>
+            <manufacturerURL>http://www.sagemcom.com/</manufacturerURL>
+            <modelDescription>WanConnectionDevice on Sagemcom,fr,SG30_sip-fr-4.28.35.1</modelDescription>
+            <modelName>Residential Livebox,(DSL,WAN Ethernet)</modelName>
+            <modelNumber>3</modelNumber>
+            <modelURL>http://www.sagemcom.com/</modelURL>
+            <serialNumber>LK14129DP441489</serialNumber>
+            <presentationURL>http://192.168.1.1</presentationURL>
+            <UDN>uuid:44598a08-288e-32c9-8a4d-d3c008ede331</UDN>
+            <UPC></UPC>
+            <serviceList>
+              <service>
+                <serviceType>urn:schemas-upnp-org:service:WANPPPConnection:2</serviceType>
+                <serviceId>urn:upnp-org:serviceId:WANIPConn1</serviceId>
+                <controlURL>/87895a19/upnp/control/WANIPConn1</controlURL>
+                <eventSubURL>/87895a19/upnp/control/WANIPConn1</eventSubURL>
+                <SCPDURL>/87895a19/gateconnSCPD_PPP.xml</SCPDURL>
+              </service>
+             <service>
+                <serviceType>urn:schemas-upnp-org:service:WANIPv6FirewallControl:1</serviceType>
+                <serviceId>urn:upnp-org:serviceId:WANIPv6FwCtrl1</serviceId>
+                <controlURL>/87895a19/upnp/control/WANIPv6FwCtrl1</controlURL>
+                <eventSubURL>/87895a19/upnp/control/WANIPv6FwCtrl1</eventSubURL>
+                <SCPDURL>/87895a19/wanipv6fwctrlSCPD.xml</SCPDURL>
+              </service>
+            </serviceList>
+          </device>
+        </deviceList>
+      </device>
+    </deviceList>
+  </device>
+</root>
\ No newline at end of file
diff --git a/ext/miniupnpc/testigddescparse.c b/ext/miniupnpc/testigddescparse.c
new file mode 100644
index 000000000..c1907fd05
--- /dev/null
+++ b/ext/miniupnpc/testigddescparse.c
@@ -0,0 +1,187 @@
+/* $Id: testigddescparse.c,v 1.10 2015/08/06 09:55:24 nanard Exp $ */
+/* Project : miniupnp
+ * http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2008-2015 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "igd_desc_parse.h"
+#include "minixml.h"
+#include "miniupnpc.h"
+
+/* count number of differences */
+int compare_service(struct IGDdatas_service * s, FILE * f)
+{
+	int n = 0;
+	char line[1024];
+
+	while(fgets(line, sizeof(line), f)) {
+		char * value;
+		char * equal;
+		char * name;
+		char * parsedvalue;
+		int l;
+		l = strlen(line);
+		while((l > 0) && ((line[l-1] == '\r') || (line[l-1] == '\n') || (line[l-1] == ' ')))
+			line[--l] = '\0';
+		if(l == 0)
+			break;	/* end on blank line */
+		if(line[0] == '#')
+			continue;	/* skip comments */
+		equal = strchr(line, '=');
+		if(equal == NULL) {
+			fprintf(stderr, "Warning, line does not contain '=' : %s\n", line);
+			continue;
+		}
+		*equal = '\0';
+		name = line;
+		while(*name == ' ' || *name == '\t')
+			name++;
+		l = strlen(name);
+		while((l > 0) && (name[l-1] == ' ' || name[l-1] == '\t'))
+			name[--l] = '\0';
+		value = equal + 1;
+		while(*value == ' ' || *value == '\t')
+			value++;
+		if(strcmp(name, "controlurl") == 0)
+			parsedvalue = s->controlurl;
+		else if(strcmp(name, "eventsuburl") == 0)
+			parsedvalue = s->eventsuburl;
+		else if(strcmp(name, "scpdurl") == 0)
+			parsedvalue = s->scpdurl;
+		else if(strcmp(name, "servicetype") == 0)
+			parsedvalue = s->servicetype;
+		else {
+			fprintf(stderr, "unknown field '%s'\n", name);
+			continue;
+		}
+		if(0 != strcmp(parsedvalue, value)) {
+			fprintf(stderr, "difference : '%s' != '%s'\n", parsedvalue, value);
+			n++;
+		}
+	}
+	return n;
+}
+
+int compare_igd(struct IGDdatas * p, FILE * f)
+{
+	int n = 0;
+	char line[1024];
+	struct IGDdatas_service * s;
+
+	while(fgets(line, sizeof(line), f)) {
+		char * colon;
+		int l = (int)strlen(line);
+		while((l > 0) && (line[l-1] == '\r' || (line[l-1] == '\n')))
+			line[--l] = '\0';
+		if(l == 0 || line[0] == '#')
+			continue;	/* skip blank lines and comments */
+		colon = strchr(line, ':');
+		if(colon == NULL) {
+			fprintf(stderr, "Warning, no ':' : %s\n", line);
+			continue;
+		}
+		s = NULL;
+		*colon = '\0';
+		if(strcmp(line, "CIF") == 0)
+			s = &p->CIF;
+		else if(strcmp(line, "first") == 0)
+			s = &p->first;
+		else if(strcmp(line, "second") == 0)
+			s = &p->second;
+		else if(strcmp(line, "IPv6FC") == 0)
+			s = &p->IPv6FC;
+		else {
+			s = NULL;
+			fprintf(stderr, "*** unknown service '%s' ***\n", line);
+			n++;
+			continue;
+		}
+		n += compare_service(s, f);
+	}
+	if(n > 0)
+		fprintf(stderr, "*** %d difference%s ***\n", n, (n > 1) ? "s" : "");
+	return n;
+}
+
+int test_igd_desc_parse(char * buffer, int len, FILE * f)
+{
+	int n;
+	struct IGDdatas igd;
+	struct xmlparser parser;
+	struct UPNPUrls urls;
+
+	memset(&igd, 0, sizeof(struct IGDdatas));
+	memset(&parser, 0, sizeof(struct xmlparser));
+	parser.xmlstart = buffer;
+	parser.xmlsize = len;
+	parser.data = &igd;
+	parser.starteltfunc = IGDstartelt;
+	parser.endeltfunc = IGDendelt;
+	parser.datafunc = IGDdata;
+	parsexml(&parser);
+#ifdef DEBUG
+	printIGD(&igd);
+#endif /* DEBUG */
+	GetUPNPUrls(&urls, &igd, "http://fake/desc/url/file.xml", 0);
+	printf("ipcondescURL='%s'\n", urls.ipcondescURL);
+	printf("controlURL='%s'\n", urls.controlURL);
+	printf("controlURL_CIF='%s'\n", urls.controlURL_CIF);
+	n = f ? compare_igd(&igd, f) : 0;
+	FreeUPNPUrls(&urls);
+	return n;
+}
+
+int main(int argc, char * * argv)
+{
+	FILE * f;
+	char * buffer;
+	int len;
+	int r;
+	if(argc<2) {
+		fprintf(stderr, "Usage: %s file.xml [file.values]\n", argv[0]);
+		return 1;
+	}
+	f = fopen(argv[1], "r");
+	if(!f) {
+		fprintf(stderr, "Cannot open %s for reading.\n", argv[1]);
+		return 1;
+	}
+	fseek(f, 0, SEEK_END);
+	len = ftell(f);
+	fseek(f, 0, SEEK_SET);
+	buffer = malloc(len);
+	if(!buffer) {
+		fprintf(stderr, "Memory allocation error.\n");
+		fclose(f);
+		return 1;
+	}
+	r = (int)fread(buffer, 1, len, f);
+	if(r != len) {
+		fprintf(stderr, "Failed to read file %s. %d out of %d bytes.\n",
+		        argv[1], r, len);
+		fclose(f);
+		free(buffer);
+		return 1;
+	}
+	fclose(f);
+	f = NULL;
+	if(argc > 2) {
+		f = fopen(argv[2], "r");
+		if(!f) {
+			fprintf(stderr, "Cannot open %s for reading.\n", argv[2]);
+			free(buffer);
+			return 1;
+		}
+	}
+	r = test_igd_desc_parse(buffer, len, f);
+	free(buffer);
+	if(f)
+		fclose(f);
+	return r;
+}
+
diff --git a/ext/miniupnpc/testminiwget.c b/ext/miniupnpc/testminiwget.c
new file mode 100644
index 000000000..8ae90320e
--- /dev/null
+++ b/ext/miniupnpc/testminiwget.c
@@ -0,0 +1,53 @@
+/* $Id: testminiwget.c,v 1.4 2012/06/23 22:35:59 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2012 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#include <stdio.h>
+#include <stdlib.h>
+#include "miniwget.h"
+
+/**
+ * This program uses the miniwget / miniwget_getaddr function
+ * from miniwget.c in order to retreive a web ressource using
+ * a GET HTTP method, and store it in a file.
+ */
+int main(int argc, char * * argv)
+{
+	void * data;
+	int size, writtensize;
+	FILE *f;
+	char addr[64];
+
+	if(argc < 3) {
+		fprintf(stderr, "Usage:\t%s url file\n", argv[0]);
+		fprintf(stderr, "Example:\t%s http://www.google.com/ out.html\n", argv[0]);
+		return 1;
+	}
+	data = miniwget_getaddr(argv[1], &size, addr, sizeof(addr), 0);
+	if(!data) {
+		fprintf(stderr, "Error fetching %s\n", argv[1]);
+		return 1;
+	}
+	printf("local address : %s\n", addr);
+	printf("got %d bytes\n", size);
+	f = fopen(argv[2], "wb");
+	if(!f) {
+		fprintf(stderr, "Cannot open file %s for writing\n", argv[2]);
+		free(data);
+		return 1;
+	}
+	writtensize = fwrite(data, 1, size, f);
+	if(writtensize != size) {
+		fprintf(stderr, "Could only write %d bytes out of %d to %s\n",
+		        writtensize, size, argv[2]);
+	} else {
+		printf("%d bytes written to %s\n", writtensize, argv[2]);
+	}
+	fclose(f);
+	free(data);
+	return 0;
+}
+
diff --git a/ext/miniupnpc/testminiwget.sh b/ext/miniupnpc/testminiwget.sh
new file mode 100755
index 000000000..690b4056f
--- /dev/null
+++ b/ext/miniupnpc/testminiwget.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+# $Id: testminiwget.sh,v 1.13 2015/09/03 17:57:44 nanard Exp $
+# project miniupnp : http://miniupnp.free.fr/
+# (c) 2011-2015 Thomas Bernard
+#
+# test program for miniwget.c
+# is usually invoked by "make check"
+#
+# This test program :
+#  1 - launches a local HTTP server (minihttptestserver)
+#  2 - uses testminiwget to retreive data from this server
+#  3 - compares served and received data
+#  4 - kills the local HTTP server and exits
+#
+# The script was tested and works with ksh, bash
+# it should now also run with dash
+
+TMPD=`mktemp -d -t miniwgetXXXXXXXXXX`
+HTTPSERVEROUT="${TMPD}/httpserverout"
+EXPECTEDFILE="${TMPD}/expectedfile"
+DOWNLOADEDFILE="${TMPD}/downloadedfile"
+PORT=
+RET=0
+
+case "$HAVE_IPV6" in
+    n|no|0)
+        ADDR=localhost
+        SERVERARGS=""
+        ;;
+    *)
+        ADDR="[::1]"
+        SERVERARGS="-6"
+        ;;
+
+esac
+
+#make minihttptestserver
+#make testminiwget
+
+# launching the test HTTP server
+./minihttptestserver $SERVERARGS -e $EXPECTEDFILE > $HTTPSERVEROUT &
+SERVERPID=$!
+while [ -z "$PORT" ]; do
+	sleep 1
+	PORT=`cat $HTTPSERVEROUT | sed 's/Listening on port \([0-9]*\)/\1/' `
+done
+echo "Test HTTP server is listening on $PORT"
+
+URL1="http://$ADDR:$PORT/index.html"
+URL2="http://$ADDR:$PORT/chunked"
+URL3="http://$ADDR:$PORT/addcrap"
+
+echo "standard test ..."
+./testminiwget $URL1 "${DOWNLOADEDFILE}.1"
+if cmp $EXPECTEDFILE "${DOWNLOADEDFILE}.1" ; then
+	echo "ok"
+else
+	echo "standard test FAILED"
+	RET=1
+fi
+
+echo "chunked transfert encoding test ..."
+./testminiwget $URL2 "${DOWNLOADEDFILE}.2"
+if cmp $EXPECTEDFILE "${DOWNLOADEDFILE}.2" ; then
+	echo "ok"
+else
+	echo "chunked transfert encoding test FAILED"
+	RET=1
+fi
+
+echo "response too long test ..."
+./testminiwget $URL3 "${DOWNLOADEDFILE}.3"
+if cmp $EXPECTEDFILE "${DOWNLOADEDFILE}.3" ; then
+	echo "ok"
+else
+	echo "response too long test FAILED"
+	RET=1
+fi
+
+# kill the test HTTP server
+kill $SERVERPID
+wait $SERVERPID
+
+# remove temporary files (for success cases)
+if [ $RET -eq 0 ]; then
+	rm -f "${DOWNLOADEDFILE}.1"
+	rm -f "${DOWNLOADEDFILE}.2"
+	rm -f "${DOWNLOADEDFILE}.3"
+	rm -f $EXPECTEDFILE $HTTPSERVEROUT
+	rmdir ${TMPD}
+else
+	echo "at least one of the test FAILED"
+	echo "directory ${TMPD} is left intact"
+fi
+exit $RET
+
diff --git a/ext/miniupnpc/testminixml.c b/ext/miniupnpc/testminixml.c
new file mode 100644
index 000000000..57c4a85eb
--- /dev/null
+++ b/ext/miniupnpc/testminixml.c
@@ -0,0 +1,89 @@
+/* $Id: testminixml.c,v 1.10 2014/11/17 17:19:13 nanard Exp $
+ * MiniUPnP project
+ * Website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author : Thomas Bernard.
+ * Copyright (c) 2005-2014 Thomas Bernard
+ *
+ * testminixml.c
+ * test program for the "minixml" functions.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "minixml.h"
+#include "igd_desc_parse.h"
+
+/* ---------------------------------------------------------------------- */
+void printeltname1(void * d, const char * name, int l)
+{
+	int i;
+	(void)d;
+	printf("element ");
+	for(i=0;i<l;i++)
+		putchar(name[i]);
+}
+void printeltname2(void * d, const char * name, int l)
+{
+	int i;
+	(void)d;
+	putchar('/');
+	for(i=0;i<l;i++)
+		putchar(name[i]);
+	putchar('\n');
+}
+void printdata(void *d, const char * data, int l)
+{
+	int i;
+	(void)d;
+	printf("data : ");
+	for(i=0;i<l;i++)
+		putchar(data[i]);
+	putchar('\n');
+}
+
+void burptest(const char * buffer, int bufsize)
+{
+	struct IGDdatas data;
+	struct xmlparser parser;
+	/*objet IGDdatas */
+	memset(&data, 0, sizeof(struct IGDdatas));
+	/* objet xmlparser */
+	parser.xmlstart = buffer;
+	parser.xmlsize = bufsize;
+	parser.data = &data;
+	/*parser.starteltfunc = printeltname1;
+	parser.endeltfunc = printeltname2;
+	parser.datafunc = printdata; */
+	parser.starteltfunc = IGDstartelt;
+	parser.endeltfunc = IGDendelt;
+	parser.datafunc = IGDdata;
+	parsexml(&parser);
+#ifdef DEBUG
+	printIGD(&data);
+#endif /* DEBUG */
+}
+
+/* ----- main ---- */
+#define XML_MAX_SIZE (8192)
+int main(int argc, char * * argv)
+{
+	FILE * f;
+	char buffer[XML_MAX_SIZE];
+	int bufsize;
+	if(argc<2)
+	{
+		printf("usage:\t%s file.xml\n", argv[0]);
+		return 1;
+	}
+	f = fopen(argv[1], "r");
+	if(!f)
+	{
+		printf("cannot open file %s\n", argv[1]);
+		return 1;
+	}
+	bufsize = (int)fread(buffer, 1, XML_MAX_SIZE, f);
+	fclose(f);
+	burptest(buffer, bufsize);
+	return 0;
+}
+
diff --git a/ext/miniupnpc/testportlistingparse.c b/ext/miniupnpc/testportlistingparse.c
new file mode 100644
index 000000000..bd9247dca
--- /dev/null
+++ b/ext/miniupnpc/testportlistingparse.c
@@ -0,0 +1,151 @@
+/* $Id: testportlistingparse.c,v 1.2 2014/11/01 10:37:32 nanard Exp $ */
+/* Project : miniupnp
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author : Thomas Bernard
+ * Copyright (c) 2014 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+
+#include <string.h>
+#include <stdio.h>
+#include "portlistingparse.h"
+
+struct port_mapping {
+	unsigned int leasetime;
+	unsigned short externalport;
+	unsigned short internalport;
+	const char * remotehost;
+	const char * client;
+	const char * proto;
+	const char * desc;
+	unsigned char enabled;
+};
+
+/* return the number of differences */
+int test(const char * portListingXml, int portListingXmlLen,
+         const struct port_mapping * ref, int count)
+{
+	int i;
+	int r = 0;
+	struct PortMappingParserData data;
+	struct PortMapping * pm;
+
+	memset(&data, 0, sizeof(data));
+	ParsePortListing(portListingXml, portListingXmlLen, &data);
+	for(i = 0, pm = data.l_head;
+	    (pm != NULL) && (i < count);
+	    i++, pm = pm->l_next) {
+		printf("%2d %s %5hu->%s:%-5hu '%s' '%s' %u\n",
+		       i, pm->protocol, pm->externalPort, pm->internalClient,
+		       pm->internalPort,
+		       pm->description, pm->remoteHost,
+		       (unsigned)pm->leaseTime);
+		if(0 != strcmp(pm->protocol, ref[i].proto)) {
+			printf("protocol : '%s' != '%s'\n", pm->protocol, ref[i].proto);
+			r++;
+		}
+		if(pm->externalPort != ref[i].externalport) {
+			printf("externalPort : %hu != %hu\n",
+			       pm->externalPort, ref[i].externalport);
+			r++;
+		}
+		if(0 != strcmp(pm->internalClient, ref[i].client)) {
+			printf("client : '%s' != '%s'\n",
+			       pm->internalClient, ref[i].client);
+			r++;
+		}
+		if(pm->internalPort != ref[i].internalport) {
+			printf("internalPort : %hu != %hu\n",
+			       pm->internalPort, ref[i].internalport);
+			r++;
+		}
+		if(0 != strcmp(pm->description, ref[i].desc)) {
+			printf("description : '%s' != '%s'\n",
+			       pm->description, ref[i].desc);
+			r++;
+		}
+		if(0 != strcmp(pm->remoteHost, ref[i].remotehost)) {
+			printf("remoteHost : '%s' != '%s'\n",
+			       pm->remoteHost, ref[i].remotehost);
+			r++;
+		}
+		if((unsigned)pm->leaseTime != ref[i].leasetime) {
+			printf("leaseTime : %u != %u\n",
+			       (unsigned)pm->leaseTime, ref[i].leasetime);
+			r++;
+		}
+		if(pm->enabled != ref[i].enabled) {
+			printf("enabled : %d != %d\n",
+			       (int)pm->enabled, (int)ref[i].enabled);
+			r++;
+		}
+	}
+	if((i != count) || (pm != NULL)) {
+		printf("count mismatch : i=%d count=%d pm=%p\n", i, count, pm);
+		r++;
+	}
+	FreePortListing(&data);
+	return r;
+}
+
+const char test_document[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<p:PortMappingList xmlns:p=\"urn:schemas-upnp-org:gw:WANIPConnection\"\n"
+"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n"
+"xsi:schemaLocation=\"urn:schemas-upnp-org:gw:WANIPConnection "
+"http://www.upnp.org/schemas/gw/WANIPConnection-v2.xsd\">\n"
+" <p:PortMappingEntry>\n"
+"  <p:NewRemoteHost></p:NewRemoteHost>\n"
+"  <p:NewExternalPort>5002</p:NewExternalPort>\n"
+"  <p:NewProtocol>UDP</p:NewProtocol>\n"
+"  <p:NewInternalPort>4001</p:NewInternalPort>\n"
+"  <p:NewInternalClient>192.168.1.123</p:NewInternalClient>\n"
+"  <p:NewEnabled>1</p:NewEnabled>\n"
+"  <p:NewDescription>xxx</p:NewDescription>\n"
+"  <p:NewLeaseTime>0</p:NewLeaseTime>\n"
+" </p:PortMappingEntry>\n"
+" <p:PortMappingEntry>\n"
+"  <p:NewRemoteHost>202.233.2.1</p:NewRemoteHost>\n"
+"  <p:NewExternalPort>2345</p:NewExternalPort>\n"
+"  <p:NewProtocol>TCP</p:NewProtocol>\n"
+"  <p:NewInternalPort>2349</p:NewInternalPort>\n"
+"  <p:NewInternalClient>192.168.1.137</p:NewInternalClient>\n"
+"  <p:NewEnabled>1</p:NewEnabled>\n"
+"  <p:NewDescription>dooom</p:NewDescription>\n"
+"  <p:NewLeaseTime>346</p:NewLeaseTime>\n"
+" </p:PortMappingEntry>\n"
+" <p:PortMappingEntry>\n"
+"  <p:NewRemoteHost>134.231.2.11</p:NewRemoteHost>\n"
+"  <p:NewExternalPort>12345</p:NewExternalPort>\n"
+"  <p:NewProtocol>TCP</p:NewProtocol>\n"
+"  <p:NewInternalPort>12345</p:NewInternalPort>\n"
+"  <p:NewInternalClient>192.168.1.137</p:NewInternalClient>\n"
+"  <p:NewEnabled>1</p:NewEnabled>\n"
+"  <p:NewDescription>dooom A</p:NewDescription>\n"
+"  <p:NewLeaseTime>347</p:NewLeaseTime>\n"
+" </p:PortMappingEntry>\n"
+"</p:PortMappingList>";
+
+#define PORT_MAPPINGS_COUNT 3
+const struct port_mapping port_mappings[PORT_MAPPINGS_COUNT] = {
+{347, 12345, 12345, "134.231.2.11", "192.168.1.137", "TCP", "dooom A", 1},
+{346, 2345, 2349, "202.233.2.1", "192.168.1.137", "TCP", "dooom", 1},
+{0, 5002, 4001, "", "192.168.1.123", "UDP", "xxx", 1}
+};
+
+/* --- main --- */
+int main(void)
+{
+	int r;
+	r = test(test_document, sizeof(test_document) - 1,
+	         port_mappings, PORT_MAPPINGS_COUNT);
+	if(r == 0) {
+		printf("test of portlistingparse OK\n");
+		return 0;
+	} else {
+		printf("test FAILED (%d differences counted)\n", r);
+		return 1;
+	}
+}
+
diff --git a/ext/miniupnpc/testreplyparse/DeletePortMapping.namevalue b/ext/miniupnpc/testreplyparse/DeletePortMapping.namevalue
new file mode 100644
index 000000000..48ca0cccb
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/DeletePortMapping.namevalue
@@ -0,0 +1,3 @@
+NewRemoteHost=
+NewExternalPort=123
+NewProtocol=TCP
diff --git a/ext/miniupnpc/testreplyparse/DeletePortMapping.xml b/ext/miniupnpc/testreplyparse/DeletePortMapping.xml
new file mode 100644
index 000000000..a955c53fc
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/DeletePortMapping.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><s:Body><u:DeletePortMapping xmlns:u="urn:schemas-upnp-org:service:WANIPConnection:1"><NewRemoteHost></NewRemoteHost><NewExternalPort>123</NewExternalPort>
+<NewProtocol>TCP</NewProtocol></u:DeletePortMapping></s:Body>
+ 
+</s:Envelope>
+
diff --git a/ext/miniupnpc/testreplyparse/GetExternalIPAddress.namevalue b/ext/miniupnpc/testreplyparse/GetExternalIPAddress.namevalue
new file mode 100644
index 000000000..5aa75f882
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/GetExternalIPAddress.namevalue
@@ -0,0 +1,2 @@
+NewExternalIPAddress=1.2.3.4
+
diff --git a/ext/miniupnpc/testreplyparse/GetExternalIPAddress.xml b/ext/miniupnpc/testreplyparse/GetExternalIPAddress.xml
new file mode 100644
index 000000000..db7ec1f9c
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/GetExternalIPAddress.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?><s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><s:Body><u:GetExternalIPAddressResponse xmlns:u="urn:schemas-upnp-org:service:WANIPConnection:1"><NewExternalIPAddress>1.2.3.4</NewExternalIPAddress></u:GetExternalIPAddressResponse></s:Body></s:Envelope>
+
diff --git a/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.namevalue b/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.namevalue
new file mode 100644
index 000000000..26b169c35
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.namevalue
@@ -0,0 +1,3 @@
+NewProtocol=UDP
+NewExternalPort=12345
+NewRemoteHost=
diff --git a/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.xml b/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.xml
new file mode 100644
index 000000000..bbb540eac
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryReq.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><s:Body><u:GetSpecificPortMappingEntry xmlns:u="urn:schemas-upnp-org:service:WANIPConnection:1"><NewRemoteHost></NewRemoteHost><NewExternalPort>12345</NewExternalPort><NewProtocol>UDP</NewProtocol></u:GetSpecificPortMappingEntry></s:Body></s:Envelope>
+
diff --git a/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.namevalue b/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.namevalue
new file mode 100644
index 000000000..2189789b4
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.namevalue
@@ -0,0 +1,5 @@
+NewInternalPort=12345
+NewInternalClient=192.168.10.110
+NewEnabled=1
+NewPortMappingDescription=libminiupnpc
+NewLeaseDuration=0
diff --git a/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.xml b/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.xml
new file mode 100644
index 000000000..77e8d9c7c
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/GetSpecificPortMappingEntryResp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?><s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><s:Body><u:GetSpecificPortMappingEntryResponse xmlns:u="urn:schemas-upnp-org:service:WANIPConnection:1"><NewInternalPort>12345</NewInternalPort><NewInternalClient>192.168.10.110</NewInternalClient><NewEnabled>1</NewEnabled><NewPortMappingDescription>libminiupnpc</NewPortMappingDescription><NewLeaseDuration>0</NewLeaseDuration></u:GetSpecificPortMappingEntryResponse></s:Body></s:Envelope>
+
diff --git a/ext/miniupnpc/testreplyparse/SetDefaultConnectionService.namevalue b/ext/miniupnpc/testreplyparse/SetDefaultConnectionService.namevalue
new file mode 100644
index 000000000..f78c7e2ae
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/SetDefaultConnectionService.namevalue
@@ -0,0 +1 @@
+NewDefaultConnectionService=uuid:c6c05a33-f704-48df-9910-e099b3471d81:WANConnectionDevice:1,INVALID_SERVICE_ID
diff --git a/ext/miniupnpc/testreplyparse/SetDefaultConnectionService.xml b/ext/miniupnpc/testreplyparse/SetDefaultConnectionService.xml
new file mode 100644
index 000000000..ac04c07a9
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/SetDefaultConnectionService.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"><s:Body><u:SetDefaultConnectionService xmlns:u="urn:schemas-upnp-org:service:Layer3Forwarding:1"><NewDefaultConnectionService>uuid:c6c05a33-f704-48df-9910-e099b3471d81:WANConnectionDevice:1,INVALID_SERVICE_ID</NewDefaultConnectionService></u:SetDefaultConnectionService></s:Body></s:Envelope>
diff --git a/ext/miniupnpc/testreplyparse/readme.txt b/ext/miniupnpc/testreplyparse/readme.txt
new file mode 100644
index 000000000..3eb1f015f
--- /dev/null
+++ b/ext/miniupnpc/testreplyparse/readme.txt
@@ -0,0 +1,7 @@
+This directory contains files used for validation of upnpreplyparse.c code.
+
+Each .xml file to parse should give the results which are in the .namevalue
+file.
+
+A .namevalue file contain name=value lines.
+
diff --git a/ext/miniupnpc/testupnpigd.py b/ext/miniupnpc/testupnpigd.py
new file mode 100755
index 000000000..6d167a4ce
--- /dev/null
+++ b/ext/miniupnpc/testupnpigd.py
@@ -0,0 +1,84 @@
+#! /usr/bin/python
+# $Id: testupnpigd.py,v 1.4 2008/10/11 10:27:20 nanard Exp $
+# MiniUPnP project
+# Author : Thomas Bernard
+# This Sample code is public domain.
+# website : http://miniupnp.tuxfamily.org/
+
+# import the python miniupnpc module
+import miniupnpc
+import socket
+import BaseHTTPServer
+
+# function definition
+def list_redirections():
+	i = 0
+	while True:
+		p = u.getgenericportmapping(i)
+		if p==None:
+			break
+		print i, p
+		i = i + 1
+
+#define the handler class for HTTP connections
+class handler_class(BaseHTTPServer.BaseHTTPRequestHandler):
+	def do_GET(self):
+		self.send_response(200)
+		self.end_headers()
+		self.wfile.write("OK MON GARS")
+
+# create the object
+u = miniupnpc.UPnP()
+#print 'inital(default) values :'
+#print ' discoverdelay', u.discoverdelay
+#print ' lanaddr', u.lanaddr
+#print ' multicastif', u.multicastif
+#print ' minissdpdsocket', u.minissdpdsocket
+u.discoverdelay = 200;
+
+try:
+	print 'Discovering... delay=%ums' % u.discoverdelay
+	ndevices = u.discover()
+	print ndevices, 'device(s) detected'
+
+	# select an igd
+	u.selectigd()
+	# display information about the IGD and the internet connection
+	print 'local ip address :', u.lanaddr
+	externalipaddress = u.externalipaddress()
+	print 'external ip address :', externalipaddress
+	print u.statusinfo(), u.connectiontype()
+
+	#instanciate a HTTPd object. The port is assigned by the system.
+	httpd = BaseHTTPServer.HTTPServer((u.lanaddr, 0), handler_class)
+	eport = httpd.server_port
+
+	# find a free port for the redirection
+	r = u.getspecificportmapping(eport, 'TCP')
+	while r != None and eport < 65536:
+		eport = eport + 1
+		r = u.getspecificportmapping(eport, 'TCP')
+
+	print 'trying to redirect %s port %u TCP => %s port %u TCP' % (externalipaddress, eport, u.lanaddr, httpd.server_port)
+
+	b = u.addportmapping(eport, 'TCP', u.lanaddr, httpd.server_port,
+	                    'UPnP IGD Tester port %u' % eport, '')
+	if b:
+		print 'Success. Now waiting for some HTTP request on http://%s:%u' % (externalipaddress ,eport)
+		try:
+			httpd.handle_request()
+			httpd.server_close()
+		except KeyboardInterrupt, details:
+			print "CTRL-C exception!", details
+		b = u.deleteportmapping(eport, 'TCP')
+		if b:
+			print 'Successfully deleted port mapping'
+		else:
+			print 'Failed to remove port mapping'
+	else:
+		print 'Failed'
+
+	httpd.server_close()
+
+except Exception, e:
+	print 'Exception :', e
diff --git a/ext/miniupnpc/testupnpreplyparse.c b/ext/miniupnpc/testupnpreplyparse.c
new file mode 100644
index 000000000..7ba7131ea
--- /dev/null
+++ b/ext/miniupnpc/testupnpreplyparse.c
@@ -0,0 +1,96 @@
+/* $Id: testupnpreplyparse.c,v 1.4 2014/01/27 11:45:19 nanard Exp $ */
+/* MiniUPnP project
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * (c) 2006-2014 Thomas Bernard
+ * This software is subject to the conditions detailed
+ * in the LICENCE file provided within the distribution */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "upnpreplyparse.h"
+
+int
+test_parsing(const char * buf, int len, FILE * f)
+{
+	char line[1024];
+	struct NameValueParserData pdata;
+	int ok = 1;
+	ParseNameValue(buf, len, &pdata);
+	/* check result */
+	if(f != NULL)
+	{
+		while(fgets(line, sizeof(line), f))
+		{
+			char * value;
+			char * equal;
+			char * parsedvalue;
+			int l;
+			l = strlen(line);
+			while((l > 0) && ((line[l-1] == '\r') || (line[l-1] == '\n')))
+				line[--l] = '\0';
+			/* skip empty lines */
+			if(l == 0)
+				continue;
+			equal = strchr(line, '=');
+			if(equal == NULL)
+			{
+				fprintf(stderr, "Warning, line does not contain '=' : %s\n", line);
+				continue;
+			}
+			*equal = '\0';
+			value = equal + 1;
+			parsedvalue = GetValueFromNameValueList(&pdata, line);
+			if((parsedvalue == NULL) || (strcmp(parsedvalue, value) != 0))
+			{
+				fprintf(stderr, "Element <%s> : expecting value '%s', got '%s'\n",
+				        line, value, parsedvalue ? parsedvalue : "<null string>");
+				ok = 0;
+			}
+		}
+	}
+	ClearNameValueList(&pdata);
+	return ok;
+}
+
+int main(int argc, char * * argv)
+{
+	FILE * f;
+	char buffer[4096];
+	int l;
+	int ok;
+
+	if(argc<2)
+	{
+		fprintf(stderr, "Usage: %s file.xml [file.namevalues]\n", argv[0]);
+		return 1;
+	}
+	f = fopen(argv[1], "r");
+	if(!f)
+	{
+		fprintf(stderr, "Error : can not open file %s\n", argv[1]);
+		return 2;
+	}
+	l = fread(buffer, 1, sizeof(buffer)-1, f);
+	fclose(f);
+	f = NULL;
+	buffer[l] = '\0';
+	if(argc > 2)
+	{
+		f = fopen(argv[2], "r");
+		if(!f)
+		{
+			fprintf(stderr, "Error : can not open file %s\n", argv[2]);
+			return 2;
+		}
+	}
+#ifdef DEBUG
+	DisplayNameValueList(buffer, l);
+#endif
+	ok = test_parsing(buffer, l, f);
+	if(f)
+	{
+		fclose(f);
+	}
+	return ok ? 0 : 3;
+}
+
diff --git a/ext/miniupnpc/testupnpreplyparse.sh b/ext/miniupnpc/testupnpreplyparse.sh
new file mode 100755
index 000000000..992930b7b
--- /dev/null
+++ b/ext/miniupnpc/testupnpreplyparse.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+for f in testreplyparse/*.xml ; do
+	bf="`dirname $f`/`basename $f .xml`"
+	if ./testupnpreplyparse $f $bf.namevalue ; then
+		echo "$f : passed"
+	else
+		echo "$f : FAILED"
+		exit 1
+	fi
+done
+
+exit 0
+
diff --git a/ext/miniupnpc/upnpc.c b/ext/miniupnpc/upnpc.c
index e719ecec5..8bc552efe 100644
--- a/ext/miniupnpc/upnpc.c
+++ b/ext/miniupnpc/upnpc.c
@@ -1,7 +1,7 @@
-/* $Id: upnpc.c,v 1.117 2017/05/26 15:26:55 nanard Exp $ */
+/* $Id: upnpc.c,v 1.112 2015/10/08 16:15:48 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
- * Copyright (c) 2005-2017 Thomas Bernard
+ * Copyright (c) 2005-2015 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution. */
 
@@ -66,7 +66,7 @@ static void DisplayInfos(struct UPNPUrls * urls,
 	char connectionType[64];
 	char status[64];
 	char lastconnerr[64];
-	unsigned int uptime = 0;
+	unsigned int uptime;
 	unsigned int brUp, brDown;
 	time_t timenow, timestarted;
 	int r;
@@ -82,11 +82,9 @@ static void DisplayInfos(struct UPNPUrls * urls,
 	else
 		printf("Status : %s, uptime=%us, LastConnectionError : %s\n",
 		       status, uptime, lastconnerr);
-	if(uptime > 0) {
-		timenow = time(NULL);
-		timestarted = timenow - uptime;
-		printf("  Time started : %s", ctime(&timestarted));
-	}
+	timenow = time(NULL);
+	timestarted = timenow - uptime;
+	printf("  Time started : %s", ctime(&timestarted));
 	if(UPNP_GetLinkLayerMaxBitRates(urls->controlURL_CIF, data->CIF.servicetype,
 	                                &brDown, &brUp) != UPNPCOMMAND_SUCCESS) {
 		printf("GetLinkLayerMaxBitRates failed.\n");
@@ -242,7 +240,7 @@ static void NewListRedirections(struct UPNPUrls * urls,
  * 2 - get extenal ip address
  * 3 - Add port mapping
  * 4 - get this port mapping from the IGD */
-static int SetRedirectAndTest(struct UPNPUrls * urls,
+static void SetRedirectAndTest(struct UPNPUrls * urls,
 			       struct IGDdatas * data,
 			       const char * iaddr,
 			       const char * iport,
@@ -262,13 +260,13 @@ static int SetRedirectAndTest(struct UPNPUrls * urls,
 	if(!iaddr || !iport || !eport || !proto)
 	{
 		fprintf(stderr, "Wrong arguments\n");
-		return -1;
+		return;
 	}
 	proto = protofix(proto);
 	if(!proto)
 	{
 		fprintf(stderr, "invalid protocol\n");
-		return -1;
+		return;
 	}
 
 	r = UPNP_GetExternalIPAddress(urls->controlURL,
@@ -292,11 +290,9 @@ static int SetRedirectAndTest(struct UPNPUrls * urls,
 		r = UPNP_AddPortMapping(urls->controlURL, data->first.servicetype,
 					eport, iport, iaddr, description,
 					proto, 0, leaseDuration);
-		if(r!=UPNPCOMMAND_SUCCESS) {
+		if(r!=UPNPCOMMAND_SUCCESS)
 			printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",
 			       eport, iport, iaddr, r, strupnperror(r));
-			return -2;
-	}
 	}
 
 	r = UPNP_GetSpecificPortMappingEntry(urls->controlURL,
@@ -304,19 +300,17 @@ static int SetRedirectAndTest(struct UPNPUrls * urls,
 					     eport, proto, NULL/*remoteHost*/,
 					     intClient, intPort, NULL/*desc*/,
 					     NULL/*enabled*/, duration);
-	if(r!=UPNPCOMMAND_SUCCESS) {
+	if(r!=UPNPCOMMAND_SUCCESS)
 		printf("GetSpecificPortMappingEntry() failed with code %d (%s)\n",
 		       r, strupnperror(r));
-		return -2;
-	} else {
+	else {
 		printf("InternalIP:Port = %s:%s\n", intClient, intPort);
 		printf("external %s:%s %s is redirected to internal %s:%s (duration=%s)\n",
 		       externalIPAddress, eport, proto, intClient, intPort, duration);
 	}
-	return 0;
 }
 
-static int
+static void
 RemoveRedirect(struct UPNPUrls * urls,
                struct IGDdatas * data,
                const char * eport,
@@ -327,25 +321,19 @@ RemoveRedirect(struct UPNPUrls * urls,
 	if(!proto || !eport)
 	{
 		fprintf(stderr, "invalid arguments\n");
-		return -1;
+		return;
 	}
 	proto = protofix(proto);
 	if(!proto)
 	{
 		fprintf(stderr, "protocol invalid\n");
-		return -1;
+		return;
 	}
 	r = UPNP_DeletePortMapping(urls->controlURL, data->first.servicetype, eport, proto, remoteHost);
-	if(r!=UPNPCOMMAND_SUCCESS) {
-		printf("UPNP_DeletePortMapping() failed with code : %d\n", r);
-		return -2;
-	}else {
-		printf("UPNP_DeletePortMapping() returned : %d\n", r);
-	}
-	return 0;
+	printf("UPNP_DeletePortMapping() returned : %d\n", r);
 }
 
-static int
+static void
 RemoveRedirectRange(struct UPNPUrls * urls,
 		    struct IGDdatas * data,
 		    const char * ePortStart, char const * ePortEnd,
@@ -359,22 +347,16 @@ RemoveRedirectRange(struct UPNPUrls * urls,
 	if(!proto || !ePortStart || !ePortEnd)
 	{
 		fprintf(stderr, "invalid arguments\n");
-		return -1;
+		return;
 	}
 	proto = protofix(proto);
 	if(!proto)
 	{
 		fprintf(stderr, "protocol invalid\n");
-		return -1;
+		return;
 	}
 	r = UPNP_DeletePortMappingRange(urls->controlURL, data->first.servicetype, ePortStart, ePortEnd, proto, manage);
-	if(r!=UPNPCOMMAND_SUCCESS) {
-		printf("UPNP_DeletePortMappingRange() failed with code : %d\n", r);
-		return -2;
-	}else {
-		printf("UPNP_DeletePortMappingRange() returned : %d\n", r);
-	}
-	return 0;
+	printf("UPNP_DeletePortMappingRange() returned : %d\n", r);
 }
 
 /* IGD:2, functions for service WANIPv6FirewallControl:1 */
@@ -556,7 +538,7 @@ int main(int argc, char ** argv)
 	char ** commandargv = 0;
 	int commandargc = 0;
 	struct UPNPDev * devlist = 0;
-	char lanaddr[64] = "unset";	/* my ip address on the LAN */
+	char lanaddr[64];	/* my ip address on the LAN */
 	int i;
 	const char * rootdescurl = 0;
 	const char * multicastif = 0;
@@ -578,8 +560,8 @@ int main(int argc, char ** argv)
 	}
 #endif
     printf("upnpc : miniupnpc library test client, version %s.\n", MINIUPNPC_VERSION_STRING);
-	printf(" (c) 2005-2017 Thomas Bernard.\n");
-    printf("Go to http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/\n"
+	printf(" (c) 2005-2015 Thomas Bernard.\n");
+    printf("Go to http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/\n"
 	       "for more information.\n");
 	/* command line processing */
 	for(i=1; i<argc; i++)
@@ -727,33 +709,29 @@ int main(int argc, char ** argv)
 				NewListRedirections(&urls, &data);
 				break;
 			case 'a':
-				if (SetRedirectAndTest(&urls, &data,
+				SetRedirectAndTest(&urls, &data,
 						   commandargv[0], commandargv[1],
 						   commandargv[2], commandargv[3],
 						   (commandargc > 4)?commandargv[4]:"0",
-						   description, 0) < 0)
-					retcode = 2;
+						   description, 0);
 				break;
 			case 'd':
-				if (RemoveRedirect(&urls, &data, commandargv[0], commandargv[1],
-				               commandargc > 2 ? commandargv[2] : NULL) < 0)
-					retcode = 2;
+				RemoveRedirect(&urls, &data, commandargv[0], commandargv[1],
+				               commandargc > 2 ? commandargv[2] : NULL);
 				break;
 			case 'n':	/* aNy */
-				if (SetRedirectAndTest(&urls, &data,
+				SetRedirectAndTest(&urls, &data,
 						   commandargv[0], commandargv[1],
 						   commandargv[2], commandargv[3],
 						   (commandargc > 4)?commandargv[4]:"0",
-						   description, 1) < 0)
-					retcode = 2;
+						   description, 1);
 				break;
 			case 'N':
 				if (commandargc < 3)
 					fprintf(stderr, "too few arguments\n");
 
-				if (RemoveRedirectRange(&urls, &data, commandargv[0], commandargv[1], commandargv[2],
-						    commandargc > 3 ? commandargv[3] : NULL) < 0)
-					retcode = 2;
+				RemoveRedirectRange(&urls, &data, commandargv[0], commandargv[1], commandargv[2],
+						    commandargc > 3 ? commandargv[3] : NULL);
 				break;
 			case 's':
 				GetConnectionStatus(&urls, &data);
@@ -769,19 +747,17 @@ int main(int argc, char ** argv)
 						break;
 					} else if(is_int(commandargv[i+1])){
 						/* 2nd parameter is an integer : <port> <external_port> <protocol> */
-						if (SetRedirectAndTest(&urls, &data,
+						SetRedirectAndTest(&urls, &data,
 								   lanaddr, commandargv[i],
 								   commandargv[i+1], commandargv[i+2], "0",
-								   description, 0) < 0)
-							retcode = 2;
+								   description, 0);
 						i+=3;	/* 3 parameters parsed */
 					} else {
 						/* 2nd parameter not an integer : <port> <protocol> */
-						if (SetRedirectAndTest(&urls, &data,
+						SetRedirectAndTest(&urls, &data,
 								   lanaddr, commandargv[i],
 								   commandargv[i], commandargv[i+1], "0",
-								   description, 0) < 0)
-							retcode = 2;
+								   description, 0);
 						i+=2;	/* 2 parameters parsed */
 					}
 				}
diff --git a/ext/miniupnpc/upnpcommands.c b/ext/miniupnpc/upnpcommands.c
index d786e5338..660b5d9f2 100644
--- a/ext/miniupnpc/upnpcommands.c
+++ b/ext/miniupnpc/upnpcommands.c
@@ -1,8 +1,8 @@
-/* $Id: upnpcommands.c,v 1.48 2017/04/21 10:22:40 nanard Exp $ */
-/* vim: tabstop=4 shiftwidth=4 noexpandtab
- * Project : miniupnp
+#define _CRT_SECURE_NO_WARNINGS
+/* $Id: upnpcommands.c,v 1.46 2015/07/15 12:19:00 nanard Exp $ */
+/* Project : miniupnp
  * Author : Thomas Bernard
- * Copyright (c) 2005-2017 Thomas Bernard
+ * Copyright (c) 2005-2015 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
  * */
@@ -373,11 +373,10 @@ UPNP_AddPortMapping(const char * controlURL, const char * servicetype,
 	AddPortMappingArgs[6].val = desc?desc:"libminiupnpc";
 	AddPortMappingArgs[7].elt = "NewLeaseDuration";
 	AddPortMappingArgs[7].val = leaseDuration?leaseDuration:"0";
-	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
-	                           "AddPortMapping", AddPortMappingArgs,
-	                           &bufsize);
-	free(AddPortMappingArgs);
-	if(!buffer) {
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "AddPortMapping", AddPortMappingArgs,
+	                                &bufsize))) {
+		free(AddPortMappingArgs);
 		return UPNPCOMMAND_HTTP_ERROR;
 	}
 	/*DisplayNameValueList(buffer, bufsize);*/
@@ -394,6 +393,7 @@ UPNP_AddPortMapping(const char * controlURL, const char * servicetype,
 		ret = UPNPCOMMAND_SUCCESS;
 	}
 	ClearNameValueList(&pdata);
+	free(AddPortMappingArgs);
 	return ret;
 }
 
@@ -437,11 +437,10 @@ UPNP_AddAnyPortMapping(const char * controlURL, const char * servicetype,
 	AddPortMappingArgs[6].val = desc?desc:"libminiupnpc";
 	AddPortMappingArgs[7].elt = "NewLeaseDuration";
 	AddPortMappingArgs[7].val = leaseDuration?leaseDuration:"0";
-	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
-	                           "AddAnyPortMapping", AddPortMappingArgs,
-	                           &bufsize);
-	free(AddPortMappingArgs);
-	if(!buffer) {
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "AddAnyPortMapping", AddPortMappingArgs,
+	                                &bufsize))) {
+		free(AddPortMappingArgs);
 		return UPNPCOMMAND_HTTP_ERROR;
 	}
 	ParseNameValue(buffer, bufsize, &pdata);
@@ -463,6 +462,7 @@ UPNP_AddAnyPortMapping(const char * controlURL, const char * servicetype,
 		}
 	}
 	ClearNameValueList(&pdata);
+	free(AddPortMappingArgs);
 	return ret;
 }
 
@@ -491,11 +491,10 @@ UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
 	DeletePortMappingArgs[1].val = extPort;
 	DeletePortMappingArgs[2].elt = "NewProtocol";
 	DeletePortMappingArgs[2].val = proto;
-	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
-	                          "DeletePortMapping",
-	                          DeletePortMappingArgs, &bufsize);
-	free(DeletePortMappingArgs);
-	if(!buffer) {
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                               "DeletePortMapping",
+	                               DeletePortMappingArgs, &bufsize))) {
+		free(DeletePortMappingArgs);
 		return UPNPCOMMAND_HTTP_ERROR;
 	}
 	/*DisplayNameValueList(buffer, bufsize);*/
@@ -509,6 +508,7 @@ UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
 		ret = UPNPCOMMAND_SUCCESS;
 	}
 	ClearNameValueList(&pdata);
+	free(DeletePortMappingArgs);
 	return ret;
 }
 
@@ -540,11 +540,10 @@ UPNP_DeletePortMappingRange(const char * controlURL, const char * servicetype,
 	DeletePortMappingArgs[3].elt = "NewManage";
 	DeletePortMappingArgs[3].val = manage;
 
-	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
-	                           "DeletePortMappingRange",
-	                           DeletePortMappingArgs, &bufsize);
-	free(DeletePortMappingArgs);
-	if(!buffer) {
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "DeletePortMappingRange",
+	                                DeletePortMappingArgs, &bufsize))) {
+		free(DeletePortMappingArgs);
 		return UPNPCOMMAND_HTTP_ERROR;
 	}
 	ParseNameValue(buffer, bufsize, &pdata);
@@ -557,6 +556,7 @@ UPNP_DeletePortMappingRange(const char * controlURL, const char * servicetype,
 		ret = UPNPCOMMAND_SUCCESS;
 	}
 	ClearNameValueList(&pdata);
+	free(DeletePortMappingArgs);
 	return ret;
 }
 
@@ -588,11 +588,10 @@ UPNP_GetGenericPortMappingEntry(const char * controlURL,
 		return UPNPCOMMAND_MEM_ALLOC_ERROR;
 	GetPortMappingArgs[0].elt = "NewPortMappingIndex";
 	GetPortMappingArgs[0].val = index;
-	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
-	                           "GetGenericPortMappingEntry",
-	                           GetPortMappingArgs, &bufsize);
-	free(GetPortMappingArgs);
-	if(!buffer) {
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                               "GetGenericPortMappingEntry",
+	                               GetPortMappingArgs, &bufsize))) {
+		free(GetPortMappingArgs);
 		return UPNPCOMMAND_HTTP_ERROR;
 	}
 	ParseNameValue(buffer, bufsize, &pdata);
@@ -618,14 +617,14 @@ UPNP_GetGenericPortMappingEntry(const char * controlURL,
 		protocol[3] = '\0';
 	}
 	p = GetValueFromNameValueList(&pdata, "NewInternalClient");
-	if(p)
+	if(p && intClient)
 	{
 		strncpy(intClient, p, 16);
 		intClient[15] = '\0';
 		r = 0;
 	}
 	p = GetValueFromNameValueList(&pdata, "NewInternalPort");
-	if(p)
+	if(p && intPort)
 	{
 		strncpy(intPort, p, 6);
 		intPort[5] = '\0';
@@ -654,6 +653,7 @@ UPNP_GetGenericPortMappingEntry(const char * controlURL,
 		sscanf(p, "%d", &r);
 	}
 	ClearNameValueList(&pdata);
+	free(GetPortMappingArgs);
 	return r;
 }
 
@@ -729,11 +729,10 @@ UPNP_GetSpecificPortMappingEntry(const char * controlURL,
 	GetPortMappingArgs[1].val = extPort;
 	GetPortMappingArgs[2].elt = "NewProtocol";
 	GetPortMappingArgs[2].val = proto;
-	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
-	                           "GetSpecificPortMappingEntry",
-	                           GetPortMappingArgs, &bufsize);
-	free(GetPortMappingArgs);
-	if(!buffer) {
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetSpecificPortMappingEntry",
+	                                GetPortMappingArgs, &bufsize))) {
+		free(GetPortMappingArgs);
 		return UPNPCOMMAND_HTTP_ERROR;
 	}
 	/*DisplayNameValueList(buffer, bufsize);*/
@@ -781,6 +780,7 @@ UPNP_GetSpecificPortMappingEntry(const char * controlURL,
 	}
 
 	ClearNameValueList(&pdata);
+	free(GetPortMappingArgs);
 	return ret;
 }
 
@@ -825,13 +825,13 @@ UPNP_GetListOfPortMappings(const char * controlURL,
 	GetListOfPortMappingsArgs[4].elt = "NewNumberOfPorts";
 	GetListOfPortMappingsArgs[4].val = numberOfPorts?numberOfPorts:"1000";
 
-	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
-	                           "GetListOfPortMappings",
-	                           GetListOfPortMappingsArgs, &bufsize);
-	free(GetListOfPortMappingsArgs);
-	if(!buffer) {
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetListOfPortMappings",
+	                                GetListOfPortMappingsArgs, &bufsize))) {
+		free(GetListOfPortMappingsArgs);
 		return UPNPCOMMAND_HTTP_ERROR;
 	}
+	free(GetListOfPortMappingsArgs);
 
 	/*DisplayNameValueList(buffer, bufsize);*/
 	ParseNameValue(buffer, bufsize, &pdata);
@@ -955,7 +955,6 @@ UPNP_GetOutboundPinholeTimeout(const char * controlURL, const char * servicetype
 	GetOutboundPinholeTimeoutArgs[4].val = intClient;
 	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
 	                           "GetOutboundPinholeTimeout", GetOutboundPinholeTimeoutArgs, &bufsize);
-	free(GetOutboundPinholeTimeoutArgs);
 	if(!buffer)
 		return UPNPCOMMAND_HTTP_ERROR;
 	ParseNameValue(buffer, bufsize, &pdata);
@@ -974,6 +973,7 @@ UPNP_GetOutboundPinholeTimeout(const char * controlURL, const char * servicetype
 			*opTimeout = my_atoui(p);
 	}
 	ClearNameValueList(&pdata);
+	free(GetOutboundPinholeTimeoutArgs);
 	return ret;
 }
 
@@ -1032,7 +1032,6 @@ UPNP_AddPinhole(const char * controlURL, const char * servicetype,
 	AddPinholeArgs[5].val = leaseTime;
 	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
 	                           "AddPinhole", AddPinholeArgs, &bufsize);
-	free(AddPinholeArgs);
 	if(!buffer)
 		return UPNPCOMMAND_HTTP_ERROR;
 	ParseNameValue(buffer, bufsize, &pdata);
@@ -1055,6 +1054,7 @@ UPNP_AddPinhole(const char * controlURL, const char * servicetype,
 		ret = UPNPCOMMAND_SUCCESS;
 	}
 	ClearNameValueList(&pdata);
+	free(AddPinholeArgs);
 	return ret;
 }
 
@@ -1082,7 +1082,6 @@ UPNP_UpdatePinhole(const char * controlURL, const char * servicetype,
 	UpdatePinholeArgs[1].val = leaseTime;
 	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
 	                           "UpdatePinhole", UpdatePinholeArgs, &bufsize);
-	free(UpdatePinholeArgs);
 	if(!buffer)
 		return UPNPCOMMAND_HTTP_ERROR;
 	ParseNameValue(buffer, bufsize, &pdata);
@@ -1099,6 +1098,7 @@ UPNP_UpdatePinhole(const char * controlURL, const char * servicetype,
 		ret = UPNPCOMMAND_SUCCESS;
 	}
 	ClearNameValueList(&pdata);
+	free(UpdatePinholeArgs);
 	return ret;
 }
 
@@ -1123,7 +1123,6 @@ UPNP_DeletePinhole(const char * controlURL, const char * servicetype, const char
 	DeletePinholeArgs[0].val = uniqueID;
 	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
 	                           "DeletePinhole", DeletePinholeArgs, &bufsize);
-	free(DeletePinholeArgs);
 	if(!buffer)
 		return UPNPCOMMAND_HTTP_ERROR;
 	/*DisplayNameValueList(buffer, bufsize);*/
@@ -1140,6 +1139,7 @@ UPNP_DeletePinhole(const char * controlURL, const char * servicetype, const char
 		ret = UPNPCOMMAND_SUCCESS;
 	}
 	ClearNameValueList(&pdata);
+	free(DeletePinholeArgs);
 	return ret;
 }
 
@@ -1164,11 +1164,8 @@ UPNP_CheckPinholeWorking(const char * controlURL, const char * servicetype,
 	CheckPinholeWorkingArgs[0].val = uniqueID;
 	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
 	                           "CheckPinholeWorking", CheckPinholeWorkingArgs, &bufsize);
-	free(CheckPinholeWorkingArgs);
 	if(!buffer)
-	{
 		return UPNPCOMMAND_HTTP_ERROR;
-	}
 	ParseNameValue(buffer, bufsize, &pdata);
 	free(buffer); buffer = NULL;
 
@@ -1189,6 +1186,7 @@ UPNP_CheckPinholeWorking(const char * controlURL, const char * servicetype,
 	}
 
 	ClearNameValueList(&pdata);
+	free(CheckPinholeWorkingArgs);
 	return ret;
 }
 
@@ -1213,7 +1211,6 @@ UPNP_GetPinholePackets(const char * controlURL, const char * servicetype,
 	GetPinholePacketsArgs[0].val = uniqueID;
 	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
 	                           "GetPinholePackets", GetPinholePacketsArgs, &bufsize);
-	free(GetPinholePacketsArgs);
 	if(!buffer)
 		return UPNPCOMMAND_HTTP_ERROR;
 	ParseNameValue(buffer, bufsize, &pdata);
@@ -1234,6 +1231,7 @@ UPNP_GetPinholePackets(const char * controlURL, const char * servicetype,
 	}
 
 	ClearNameValueList(&pdata);
+	free(GetPinholePacketsArgs);
 	return ret;
 }
 
diff --git a/ext/miniupnpc/upnpreplyparse.c b/ext/miniupnpc/upnpreplyparse.c
index 5921349d3..88d77a66a 100644
--- a/ext/miniupnpc/upnpreplyparse.c
+++ b/ext/miniupnpc/upnpreplyparse.c
@@ -1,8 +1,8 @@
-/* $Id: upnpreplyparse.c,v 1.20 2017/12/12 11:26:25 nanard Exp $ */
-/* vim: tabstop=4 shiftwidth=4 noexpandtab
- * MiniUPnP project
+#define _CRT_SECURE_NO_WARNINGS
+/* $Id: upnpreplyparse.c,v 1.19 2015/07/15 10:29:11 nanard Exp $ */
+/* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
- * (c) 2006-2017 Thomas Bernard
+ * (c) 2006-2015 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
@@ -27,12 +27,12 @@ NameValueParserStartElt(void * d, const char * name, int l)
 }
 
 static void
-NameValueParserEndElt(void * d, const char * name, int namelen)
+NameValueParserEndElt(void * d, const char * name, int l)
 {
     struct NameValueParserData * data = (struct NameValueParserData *)d;
     struct NameValue * nv;
 	(void)name;
-	(void)namelen;
+	(void)l;
 	if(!data->topelt)
 		return;
 	if(strcmp(data->curelt, "NewPortListing") != 0)
@@ -105,7 +105,9 @@ ParseNameValue(const char * buffer, int bufsize,
                struct NameValueParserData * data)
 {
 	struct xmlparser parser;
-	memset(data, 0, sizeof(struct NameValueParserData));
+	data->l_head = NULL;
+	data->portListing = NULL;
+	data->portListingLength = 0;
 	/* init xmlparser object */
 	parser.xmlstart = buffer;
 	parser.xmlsize = bufsize;
diff --git a/ext/misc/linux-old-glibc-compat.c b/ext/misc/linux-old-glibc-compat.c
deleted file mode 100644
index 6d793a2d0..000000000
--- a/ext/misc/linux-old-glibc-compat.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void *__wrap_memcpy(void *dest,const void *src,size_t n)
-{
-  return memcpy(dest,src,n);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/ext/nlohmann/LICENSE.MIT b/ext/nlohmann/LICENSE.MIT
deleted file mode 100644
index 00599afe6..000000000
--- a/ext/nlohmann/LICENSE.MIT
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License 
-
-Copyright (c) 2013-2017 Niels Lohmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/ext/nlohmann/README.md b/ext/nlohmann/README.md
deleted file mode 100644
index f3bbf847c..000000000
--- a/ext/nlohmann/README.md
+++ /dev/null
@@ -1,1123 +0,0 @@
-[![JSON for Modern C++](https://raw.githubusercontent.com/nlohmann/json/master/doc/json.gif)](https://github.com/nlohmann/json/releases)
-
-[![Build Status](https://travis-ci.org/nlohmann/json.svg?branch=master)](https://travis-ci.org/nlohmann/json)
-[![Build Status](https://ci.appveyor.com/api/projects/status/1acb366xfyg3qybk/branch/develop?svg=true)](https://ci.appveyor.com/project/nlohmann/json)
-[![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3732b3327e34358a0e9d1fe9f661f08)](https://www.codacy.com/app/nlohmann/json?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nlohmann/json&amp;utm_campaign=Badge_Grade)
-[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/TarF5pPn9NtHQjhf)
-[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
-[![GitHub Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
-[![GitHub Issues](https://img.shields.io/github/issues/nlohmann/json.svg)](http://github.com/nlohmann/json/issues)
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/nlohmann/json.svg)](http://isitmaintained.com/project/nlohmann/json "Average time to resolve an issue")
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289)
-
-- [Design goals](#design-goals)
-- [Integration](#integration)
-- [Examples](#examples)
-  - [JSON as first-class data type](#json-as-first-class-data-type)
-  - [Serialization / Deserialization](#serialization--deserialization)
-  - [STL-like access](#stl-like-access)
-  - [Conversion from STL containers](#conversion-from-stl-containers)
-  - [JSON Pointer and JSON Patch](#json-pointer-and-json-patch)
-  - [JSON Merge Patch](#json-merge-patch)
-  - [Implicit conversions](#implicit-conversions)
-  - [Conversions to/from arbitrary types](#arbitrary-types-conversions)
-  - [Binary formats (CBOR, MessagePack, and UBJSON)](#binary-formats-cbor-messagepack-and-ubjson)
-- [Supported compilers](#supported-compilers)
-- [License](#license)
-- [Contact](#contact)
-- [Thanks](#thanks)
-- [Used third-party tools](#used-third-party-tools)
-- [Projects using JSON for Modern C++](#projects-using-json-for-modern-c)
-- [Notes](#notes)
-- [Execute unit tests](#execute-unit-tests)
-
-## Design goals
-
-There are myriads of [JSON](http://json.org) libraries out there, and each may even have its reason to exist. Our class had these design goals:
-
-- **Intuitive syntax**. In languages such as Python, JSON feels like a first class data type. We used all the operator magic of modern C++ to achieve the same feeling in your code. Check out the [examples below](#examples) and you'll know what I mean.
-
-- **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp). That's it. No library, no subproject, no dependencies, no complex build system. The class is written in vanilla C++11. All in all, everything should require no adjustment of your compiler flags or project settings.
-
-- **Serious testing**. Our class is heavily [unit-tested](https://github.com/nlohmann/json/tree/develop/test/src) and covers [100%](https://coveralls.io/r/nlohmann/json) of the code, including all exceptional behavior. Furthermore, we checked with [Valgrind](http://valgrind.org) and the [Clang Sanitizers](https://clang.llvm.org/docs/index.html) that there are no memory leaks. [Google OSS-Fuzz](https://github.com/google/oss-fuzz/tree/master/projects/json) additionally runs fuzz tests agains all parsers 24/7, effectively executing billions of tests so far. To maintain high quality, the project is following the [Core Infrastructure Initiative (CII) best practices](https://bestpractices.coreinfrastructure.org/projects/289).
-
-Other aspects were not so important to us:
-
-- **Memory efficiency**. Each JSON object has an overhead of one pointer (the maximal size of a union) and one enumeration element (1 byte). The default generalization uses the following C++ data types: `std::string` for strings, `int64_t`, `uint64_t` or `double` for numbers, `std::map` for objects, `std::vector` for arrays, and `bool` for Booleans. However, you can template the generalized class `basic_json` to your needs.
-
-- **Speed**. There are certainly [faster JSON libraries](https://github.com/miloyip/nativejson-benchmark#parsing-time) out there. However, if your goal is to speed up your development by adding JSON support with a single header, then this library is the way to go. If you know how to use a `std::vector` or `std::map`, you are already set.
-
-See the [contribution guidelines](https://github.com/nlohmann/json/blob/master/.github/CONTRIBUTING.md#please-dont) for more information.
-
-
-## Integration
-
-[`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is the single required file in `single_include/nlohmann` or [released here](https://github.com/nlohmann/json/releases). You need to add
-
-```cpp
-#include <nlohmann/json.hpp>
-
-// for convenience
-using json = nlohmann::json;
-```
-
-to the files you want to process JSON and set the necessary switches to enable C++11 (e.g., `-std=c++11` for GCC and Clang).
-
-You can further use file [`include/nlohmann/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/include/nlohmann/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`.
-
-### Package Managers
-
-:beer: If you are using OS X and [Homebrew](http://brew.sh), just type `brew tap nlohmann/json` and `brew install nlohmann_json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann_json --HEAD`.
-
-If you are using the [Meson Build System](http://mesonbuild.com), then you can wrap this repository as a subproject.
-
-If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add `jsonformoderncpp/x.y.z@vthiery/stable` to your `conanfile.py`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/vthiery/conan-jsonformoderncpp/issues) if you experience problems with the packages.
-
-If you are using [Spack](https://www.spack.io/) to manage your dependencies, you can use the `nlohmann_json` package. Please see the [spack project](https://github.com/spack/spack) for any issues regarding the packaging.
-
-If you are using [hunter](https://github.com/ruslo/hunter/) on your project for external dependencies, then you can use the [nlohmann_json package](https://docs.hunter.sh/en/latest/packages/pkg/nlohmann_json.html). Please see the hunter project for any issues regarding the packaging.
-
-If you are using [Buckaroo](https://buckaroo.pm), you can install this library's module with `buckaroo install nlohmann/json`. Please file issues [here](https://github.com/LoopPerfect/buckaroo-recipes/issues/new?title=nlohmann/nlohmann/json).
-
-If you are using [vcpkg](https://github.com/Microsoft/vcpkg/) on your project for external dependencies, then you can use the [nlohmann-json package](https://github.com/Microsoft/vcpkg/tree/master/ports/nlohmann-json). Please see the vcpkg project for any issues regarding the packaging.
-
-If you are using [cget](http://cget.readthedocs.io/en/latest/), you can install the latest development version with `cget install nlohmann/json`. A specific version can be installed with `cget install nlohmann/json@v3.1.0`. Also, the multiple header version can be installed by adding the `-DJSON_MultipleHeaders=ON` flag (i.e., `cget install nlohmann/json -DJSON_MultipleHeaders=ON`).
-
-If you are using [CocoaPods](https://cocoapods.org), you can use the library by adding pod `"nlohmann_json", '~>3.1.2'` to your podfile (see [an example](https://bitbucket.org/benman/nlohmann_json-cocoapod/src/master/)). Please file issues [here](https://bitbucket.org/benman/nlohmann_json-cocoapod/issues?status=new&status=open).
-
-## Examples
-
-Beside the examples below, you may want to check the [documentation](https://nlohmann.github.io/json/) where each function contains a separate code example (e.g., check out [`emplace()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5338e282d1d02bed389d852dd670d98d.html#a5338e282d1d02bed389d852dd670d98d)). All [example files](https://github.com/nlohmann/json/tree/develop/doc/examples) can be compiled and executed on their own (e.g., file [emplace.cpp](https://github.com/nlohmann/json/blob/develop/doc/examples/emplace.cpp)).
-
-### JSON as first-class data type
-
-Here are some examples to give you an idea how to use the class.
-
-Assume you want to create the JSON object
-
-```json
-{
-  "pi": 3.141,
-  "happy": true,
-  "name": "Niels",
-  "nothing": null,
-  "answer": {
-    "everything": 42
-  },
-  "list": [1, 0, 2],
-  "object": {
-    "currency": "USD",
-    "value": 42.99
-  }
-}
-```
-
-With this library, you could write:
-
-```cpp
-// create an empty structure (null)
-json j;
-
-// add a number that is stored as double (note the implicit conversion of j to an object)
-j["pi"] = 3.141;
-
-// add a Boolean that is stored as bool
-j["happy"] = true;
-
-// add a string that is stored as std::string
-j["name"] = "Niels";
-
-// add another null object by passing nullptr
-j["nothing"] = nullptr;
-
-// add an object inside the object
-j["answer"]["everything"] = 42;
-
-// add an array that is stored as std::vector (using an initializer list)
-j["list"] = { 1, 0, 2 };
-
-// add another object (using an initializer list of pairs)
-j["object"] = { {"currency", "USD"}, {"value", 42.99} };
-
-// instead, you could also write (which looks very similar to the JSON above)
-json j2 = {
-  {"pi", 3.141},
-  {"happy", true},
-  {"name", "Niels"},
-  {"nothing", nullptr},
-  {"answer", {
-    {"everything", 42}
-  }},
-  {"list", {1, 0, 2}},
-  {"object", {
-    {"currency", "USD"},
-    {"value", 42.99}
-  }}
-};
-```
-
-Note that in all these cases, you never need to "tell" the compiler which JSON value type you want to use. If you want to be explicit or express some edge cases, the functions [`json::array`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_aa80485befaffcadaa39965494e0b4d2e.html#aa80485befaffcadaa39965494e0b4d2e) and [`json::object`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_aa13f7c0615867542ce80337cbcf13ada.html#aa13f7c0615867542ce80337cbcf13ada) will help:
-
-```cpp
-// a way to express the empty array []
-json empty_array_explicit = json::array();
-
-// ways to express the empty object {}
-json empty_object_implicit = json({});
-json empty_object_explicit = json::object();
-
-// a way to express an _array_ of key/value pairs [["currency", "USD"], ["value", 42.99]]
-json array_not_object = json::array({ {"currency", "USD"}, {"value", 42.99} });
-```
-
-### Serialization / Deserialization
-
-#### To/from strings
-
-You can create a JSON value (deserialization) by appending `_json` to a string literal:
-
-```cpp
-// create object from string literal
-json j = "{ \"happy\": true, \"pi\": 3.141 }"_json;
-
-// or even nicer with a raw string literal
-auto j2 = R"(
-  {
-    "happy": true,
-    "pi": 3.141
-  }
-)"_json;
-```
-
-Note that without appending the `_json` suffix, the passed string literal is not parsed, but just used as JSON string value. That is, `json j = "{ \"happy\": true, \"pi\": 3.141 }"` would just store the string `"{ "happy": true, "pi": 3.141 }"` rather than parsing the actual object.
-
-The above example can also be expressed explicitly using [`json::parse()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_aa9676414f2e36383c4b181fe856aa3c0.html#aa9676414f2e36383c4b181fe856aa3c0):
-
-```cpp
-// parse explicitly
-auto j3 = json::parse("{ \"happy\": true, \"pi\": 3.141 }");
-```
-
-You can also get a string representation of a JSON value (serialize):
-
-```cpp
-// explicit conversion to string
-std::string s = j.dump();    // {\"happy\":true,\"pi\":3.141}
-
-// serialization with pretty printing
-// pass in the amount of spaces to indent
-std::cout << j.dump(4) << std::endl;
-// {
-//     "happy": true,
-//     "pi": 3.141
-// }
-```
-
-Note the difference between serialization and assignment:
-
-```cpp
-// store a string in a JSON value
-json j_string = "this is a string";
-
-// retrieve the string value (implicit JSON to std::string conversion)
-std::string cpp_string = j_string;
-// retrieve the string value (explicit JSON to std::string conversion)
-auto cpp_string2 = j_string.get<std::string>();
-
-// retrieve the serialized value (explicit JSON serialization)
-std::string serialized_string = j_string.dump();
-
-// output of original string
-std::cout << cpp_string << " == " << cpp_string2 << " == " << j_string.get<std::string>() << '\n';
-// output of serialized value
-std::cout << j_string << " == " << serialized_string << std::endl;
-```
-
-[`.dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5adea76fedba9898d404fef8598aa663.html#a5adea76fedba9898d404fef8598aa663) always returns the serialized value, and [`.get<std::string>()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a16f9445f7629f634221a42b967cdcd43.html#a16f9445f7629f634221a42b967cdcd43) returns the originally stored string value.
-
-Note the library only supports UTF-8. When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5adea76fedba9898d404fef8598aa663.html#a5adea76fedba9898d404fef8598aa663) may throw an exception.
-
-#### To/from streams (e.g. files, string streams)
-
-You can also use streams to serialize and deserialize:
-
-```cpp
-// deserialize from standard input
-json j;
-std::cin >> j;
-
-// serialize to standard output
-std::cout << j;
-
-// the setw manipulator was overloaded to set the indentation for pretty printing
-std::cout << std::setw(4) << j << std::endl;
-```
-
-These operators work for any subclasses of `std::istream` or `std::ostream`. Here is the same example with files:
-
-```cpp
-// read a JSON file
-std::ifstream i("file.json");
-json j;
-i >> j;
-
-// write prettified JSON to another file
-std::ofstream o("pretty.json");
-o << std::setw(4) << j << std::endl;
-```
-
-Please note that setting the exception bit for `failbit` is inappropriate for this use case. It will result in program termination due to the `noexcept` specifier in use.
-
-#### Read from iterator range
-
-You can also parse JSON from an iterator range; that is, from any container accessible by iterators whose content is stored as contiguous byte sequence, for instance a `std::vector<std::uint8_t>`:
-
-```cpp
-std::vector<std::uint8_t> v = {'t', 'r', 'u', 'e'};
-json j = json::parse(v.begin(), v.end());
-```
-
-You may leave the iterators for the range [begin, end):
-
-```cpp
-std::vector<std::uint8_t> v = {'t', 'r', 'u', 'e'};
-json j = json::parse(v);
-```
-
-#### SAX interface
-
-The library uses a SAX-like interface with the following functions:
-
-```cpp
-// called when null is parsed
-bool null();
-
-// called when a boolean is parsed; value is passed
-bool boolean(bool val);
-
-// called when a signed or unsigned integer number is parsed; value is passed
-bool number_integer(number_integer_t val);
-bool number_unsigned(number_unsigned_t val);
-
-// called when a floating-point number is parsed; value and original string is passed
-bool number_float(number_float_t val, const string_t& s);
-
-// called when a string is parsed; value is passed and can be safely moved away
-bool string(string_t& val);
-
-// called when an object or array begins or ends, resp. The number of elements is passed (or -1 if not known)
-bool start_object(std::size_t elements);
-bool end_object();
-bool start_array(std::size_t elements);
-bool end_array();
-// called when an object key is parsed; value is passed and can be safely moved away
-bool key(string_t& val);
-
-// called when a parse error occurs; byte position, the last token, and an exception is passed
-bool parse_error(std::size_t position, const std::string& last_token, const detail::exception& ex);
-```
-
-The return value of each function determines whether parsing should proceed.
-
-To implement your own SAX handler, proceed as follows:
-
-1. Implement the SAX interface in a class. You can use class `nlohmann::json_sax<json>` as base class, but you can also use any class where the functions described above are implemented and public.
-2. Create an object of your SAX interface class, e.g. `my_sax`.
-3. Call `bool json::sax_parse(input, &my_sax)`; where the first parameter can be any input like a string or an input stream and the second parameter is a pointer to your SAX interface.
-
-Note the `sax_parse` function only returns a `bool` indicating the result of the last executed SAX event. It does not return a  `json` value - it is up to you to decide what to do with the SAX events. Furthermore, no exceptions are thrown in case of a parse error - it is up to you what to do with the exception object passed to your `parse_error` implementation. Internally, the SAX interface is used for the DOM parser (class `json_sax_dom_parser`) as well as the acceptor (`json_sax_acceptor`), see file [`json_sax.hpp`](https://github.com/nlohmann/json/blob/develop/include/nlohmann/detail/input/json_sax.hpp).
-
-
-### STL-like access
-
-We designed the JSON class to behave just like an STL container. In fact, it satisfies the [**ReversibleContainer**](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) requirement.
-
-```cpp
-// create an array using push_back
-json j;
-j.push_back("foo");
-j.push_back(1);
-j.push_back(true);
-
-// also use emplace_back
-j.emplace_back(1.78);
-
-// iterate the array
-for (json::iterator it = j.begin(); it != j.end(); ++it) {
-  std::cout << *it << '\n';
-}
-
-// range-based for
-for (auto& element : j) {
-  std::cout << element << '\n';
-}
-
-// getter/setter
-const std::string tmp = j[0];
-j[1] = 42;
-bool foo = j.at(2);
-
-// comparison
-j == "[\"foo\", 1, true]"_json;  // true
-
-// other stuff
-j.size();     // 3 entries
-j.empty();    // false
-j.type();     // json::value_t::array
-j.clear();    // the array is empty again
-
-// convenience type checkers
-j.is_null();
-j.is_boolean();
-j.is_number();
-j.is_object();
-j.is_array();
-j.is_string();
-
-// create an object
-json o;
-o["foo"] = 23;
-o["bar"] = false;
-o["baz"] = 3.141;
-
-// also use emplace
-o.emplace("weather", "sunny");
-
-// special iterator member functions for objects
-for (json::iterator it = o.begin(); it != o.end(); ++it) {
-  std::cout << it.key() << " : " << it.value() << "\n";
-}
-
-// find an entry
-if (o.find("foo") != o.end()) {
-  // there is an entry with key "foo"
-}
-
-// or simpler using count()
-int foo_present = o.count("foo"); // 1
-int fob_present = o.count("fob"); // 0
-
-// delete an entry
-o.erase("foo");
-```
-
-
-### Conversion from STL containers
-
-Any sequence container (`std::array`, `std::vector`, `std::deque`, `std::forward_list`, `std::list`) whose values can be used to construct JSON values (e.g., integers, floating point numbers, Booleans, string types, or again STL containers described in this section) can be used to create a JSON array. The same holds for similar associative containers (`std::set`, `std::multiset`, `std::unordered_set`, `std::unordered_multiset`), but in these cases the order of the elements of the array depends on how the elements are ordered in the respective STL container.
-
-```cpp
-std::vector<int> c_vector {1, 2, 3, 4};
-json j_vec(c_vector);
-// [1, 2, 3, 4]
-
-std::deque<double> c_deque {1.2, 2.3, 3.4, 5.6};
-json j_deque(c_deque);
-// [1.2, 2.3, 3.4, 5.6]
-
-std::list<bool> c_list {true, true, false, true};
-json j_list(c_list);
-// [true, true, false, true]
-
-std::forward_list<int64_t> c_flist {12345678909876, 23456789098765, 34567890987654, 45678909876543};
-json j_flist(c_flist);
-// [12345678909876, 23456789098765, 34567890987654, 45678909876543]
-
-std::array<unsigned long, 4> c_array {{1, 2, 3, 4}};
-json j_array(c_array);
-// [1, 2, 3, 4]
-
-std::set<std::string> c_set {"one", "two", "three", "four", "one"};
-json j_set(c_set); // only one entry for "one" is used
-// ["four", "one", "three", "two"]
-
-std::unordered_set<std::string> c_uset {"one", "two", "three", "four", "one"};
-json j_uset(c_uset); // only one entry for "one" is used
-// maybe ["two", "three", "four", "one"]
-
-std::multiset<std::string> c_mset {"one", "two", "one", "four"};
-json j_mset(c_mset); // both entries for "one" are used
-// maybe ["one", "two", "one", "four"]
-
-std::unordered_multiset<std::string> c_umset {"one", "two", "one", "four"};
-json j_umset(c_umset); // both entries for "one" are used
-// maybe ["one", "two", "one", "four"]
-```
-
-Likewise, any associative key-value containers (`std::map`, `std::multimap`, `std::unordered_map`, `std::unordered_multimap`) whose keys can construct an `std::string` and whose values can be used to construct JSON values (see examples above) can be used to create a JSON object. Note that in case of multimaps only one key is used in the JSON object and the value depends on the internal order of the STL container.
-
-```cpp
-std::map<std::string, int> c_map { {"one", 1}, {"two", 2}, {"three", 3} };
-json j_map(c_map);
-// {"one": 1, "three": 3, "two": 2 }
-
-std::unordered_map<const char*, double> c_umap { {"one", 1.2}, {"two", 2.3}, {"three", 3.4} };
-json j_umap(c_umap);
-// {"one": 1.2, "two": 2.3, "three": 3.4}
-
-std::multimap<std::string, bool> c_mmap { {"one", true}, {"two", true}, {"three", false}, {"three", true} };
-json j_mmap(c_mmap); // only one entry for key "three" is used
-// maybe {"one": true, "two": true, "three": true}
-
-std::unordered_multimap<std::string, bool> c_ummap { {"one", true}, {"two", true}, {"three", false}, {"three", true} };
-json j_ummap(c_ummap); // only one entry for key "three" is used
-// maybe {"one": true, "two": true, "three": true}
-```
-
-### JSON Pointer and JSON Patch
-
-The library supports **JSON Pointer** ([RFC 6901](https://tools.ietf.org/html/rfc6901)) as alternative means to address structured values. On top of this, **JSON Patch** ([RFC 6902](https://tools.ietf.org/html/rfc6902)) allows to describe differences between two JSON values - effectively allowing patch and diff operations known from Unix.
-
-```cpp
-// a JSON value
-json j_original = R"({
-  "baz": ["one", "two", "three"],
-  "foo": "bar"
-})"_json;
-
-// access members with a JSON pointer (RFC 6901)
-j_original["/baz/1"_json_pointer];
-// "two"
-
-// a JSON patch (RFC 6902)
-json j_patch = R"([
-  { "op": "replace", "path": "/baz", "value": "boo" },
-  { "op": "add", "path": "/hello", "value": ["world"] },
-  { "op": "remove", "path": "/foo"}
-])"_json;
-
-// apply the patch
-json j_result = j_original.patch(j_patch);
-// {
-//    "baz": "boo",
-//    "hello": ["world"]
-// }
-
-// calculate a JSON patch from two JSON values
-json::diff(j_result, j_original);
-// [
-//   { "op":" replace", "path": "/baz", "value": ["one", "two", "three"] },
-//   { "op": "remove","path": "/hello" },
-//   { "op": "add", "path": "/foo", "value": "bar" }
-// ]
-```
-
-### JSON Merge Patch
-
-The library supports **JSON Merge Patch** ([RFC 7386](https://tools.ietf.org/html/rfc7386)) as a patch format. Instead of using JSON Pointer (see above) to specify values to be manipulated, it describes the changes using a syntax that closely mimics the document being modified.
-
-```cpp
-// a JSON value
-json j_document = R"({
-  "a": "b",
-  "c": {
-    "d": "e",
-    "f": "g"
-  }
-})"_json;
-
-// a patch
-json j_patch = R"({
-  "a":"z",
-  "c": {
-    "f": null
-  }
-})"_json;
-
-// apply the patch
-j_original.merge_patch(j_patch);
-// {
-//  "a": "z",
-//  "c": {
-//    "d": "e"
-//  }
-// }
-```
-
-### Implicit conversions
-
-The type of the JSON object is determined automatically by the expression to store. Likewise, the stored value is implicitly converted.
-
-```cpp
-// strings
-std::string s1 = "Hello, world!";
-json js = s1;
-std::string s2 = js;
-
-// Booleans
-bool b1 = true;
-json jb = b1;
-bool b2 = jb;
-
-// numbers
-int i = 42;
-json jn = i;
-double f = jn;
-
-// etc.
-```
-
-You can also explicitly ask for the value:
-
-```cpp
-std::string vs = js.get<std::string>();
-bool vb = jb.get<bool>();
-int vi = jn.get<int>();
-
-// etc.
-```
-
-Note that `char` types are not automatically converted to JSON strings, but to integer numbers. A conversion to a string must be specified explicitly:
-
-```cpp
-char ch = 'A';                       // ASCII value 65
-json j_default = ch;                 // stores integer number 65
-json j_string = std::string(1, ch);  // stores string "A"
-```
-
-### Arbitrary types conversions
-
-Every type can be serialized in JSON, not just STL containers and scalar types. Usually, you would do something along those lines:
-
-```cpp
-namespace ns {
-    // a simple struct to model a person
-    struct person {
-        std::string name;
-        std::string address;
-        int age;
-    };
-}
-
-ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
-
-// convert to JSON: copy each value into the JSON object
-json j;
-j["name"] = p.name;
-j["address"] = p.address;
-j["age"] = p.age;
-
-// ...
-
-// convert from JSON: copy each value from the JSON object
-ns::person p {
-    j["name"].get<std::string>(),
-    j["address"].get<std::string>(),
-    j["age"].get<int>()
-};
-```
-
-It works, but that's quite a lot of boilerplate... Fortunately, there's a better way:
-
-```cpp
-// create a person
-ns::person p {"Ned Flanders", "744 Evergreen Terrace", 60};
-
-// conversion: person -> json
-json j = p;
-
-std::cout << j << std::endl;
-// {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
-
-// conversion: json -> person
-ns::person p2 = j;
-
-// that's it
-assert(p == p2);
-```
-
-#### Basic usage
-
-To make this work with one of your types, you only need to provide two functions:
-
-```cpp
-using nlohmann::json;
-
-namespace ns {
-    void to_json(json& j, const person& p) {
-        j = json{{"name", p.name}, {"address", p.address}, {"age", p.age}};
-    }
-
-    void from_json(const json& j, person& p) {
-        p.name = j.at("name").get<std::string>();
-        p.address = j.at("address").get<std::string>();
-        p.age = j.at("age").get<int>();
-    }
-} // namespace ns
-```
-
-That's all! When calling the `json` constructor with your type, your custom `to_json` method will be automatically called.
-Likewise, when calling `get<your_type>()`, the `from_json` method will be called.
-
-Some important things:
-
-* Those methods **MUST** be in your type's namespace (which can be the global namespace), or the library will not be able to locate them (in this example, they are in namespace `ns`, where `person` is defined).
-* Those methods **MUST** be available (e.g., properly headers must be included) everywhere you use the implicit conversions. Look at [issue 1108](https://github.com/nlohmann/json/issues/1108) for errors that may occur otherwise.
-* When using `get<your_type>()`, `your_type` **MUST** be [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). (There is a way to bypass this requirement described later.)
-* In function `from_json`, use function [`at()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a93403e803947b86f4da2d1fb3345cf2c.html#a93403e803947b86f4da2d1fb3345cf2c) to access the object values rather than `operator[]`. In case a key does not exist, `at` throws an exception that you can handle, whereas `operator[]` exhibits undefined behavior.
-* In case your type contains several `operator=` definitions, code like `your_variable = your_json;` [may not compile](https://github.com/nlohmann/json/issues/667). You need to write `your_variable = your_json.get<decltype your_variable>();` instead.
-* You do not need to add serializers or deserializers for STL types like `std::vector`: the library already implements these.
-* Be careful with the definition order of the `from_json`/`to_json` functions: If a type `B` has a member of type `A`, you **MUST** define `to_json(A)` before `to_json(B)`. Look at [issue 561](https://github.com/nlohmann/json/issues/561) for more details.
-
-
-#### How do I convert third-party types?
-
-This requires a bit more advanced technique. But first, let's see how this conversion mechanism works:
-
-The library uses **JSON Serializers** to convert types to json.
-The default serializer for `nlohmann::json` is `nlohmann::adl_serializer` (ADL means [Argument-Dependent Lookup](https://en.cppreference.com/w/cpp/language/adl)).
-
-It is implemented like this (simplified):
-
-```cpp
-template <typename T>
-struct adl_serializer {
-    static void to_json(json& j, const T& value) {
-        // calls the "to_json" method in T's namespace
-    }
-
-    static void from_json(const json& j, T& value) {
-        // same thing, but with the "from_json" method
-    }
-};
-```
-
-This serializer works fine when you have control over the type's namespace. However, what about `boost::optional` or `std::filesystem::path` (C++17)? Hijacking the `boost` namespace is pretty bad, and it's illegal to add something other than template specializations to `std`...
-
-To solve this, you need to add a specialization of `adl_serializer` to the `nlohmann` namespace, here's an example:
-
-```cpp
-// partial specialization (full specialization works too)
-namespace nlohmann {
-    template <typename T>
-    struct adl_serializer<boost::optional<T>> {
-        static void to_json(json& j, const boost::optional<T>& opt) {
-            if (opt == boost::none) {
-                j = nullptr;
-            } else {
-              j = *opt; // this will call adl_serializer<T>::to_json which will
-                        // find the free function to_json in T's namespace!
-            }
-        }
-
-        static void from_json(const json& j, boost::optional<T>& opt) {
-            if (j.is_null()) {
-                opt = boost::none;
-            } else {
-                opt = j.get<T>(); // same as above, but with
-                                  // adl_serializer<T>::from_json
-            }
-        }
-    };
-}
-```
-
-#### How can I use `get()` for non-default constructible/non-copyable types?
-
-There is a way, if your type is [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible). You will need to specialize the `adl_serializer` as well, but with a special `from_json` overload:
-
-```cpp
-struct move_only_type {
-    move_only_type() = delete;
-    move_only_type(int ii): i(ii) {}
-    move_only_type(const move_only_type&) = delete;
-    move_only_type(move_only_type&&) = default;
-
-    int i;
-};
-
-namespace nlohmann {
-    template <>
-    struct adl_serializer<move_only_type> {
-        // note: the return type is no longer 'void', and the method only takes
-        // one argument
-        static move_only_type from_json(const json& j) {
-            return {j.get<int>()};
-        }
-
-        // Here's the catch! You must provide a to_json method! Otherwise you
-        // will not be able to convert move_only_type to json, since you fully
-        // specialized adl_serializer on that type
-        static void to_json(json& j, move_only_type t) {
-            j = t.i;
-        }
-    };
-}
-```
-
-#### Can I write my own serializer? (Advanced use)
-
-Yes. You might want to take a look at [`unit-udt.cpp`](https://github.com/nlohmann/json/blob/develop/test/src/unit-udt.cpp) in the test suite, to see a few examples.
-
-If you write your own serializer, you'll need to do a few things:
-
-- use a different `basic_json` alias than `nlohmann::json` (the last template parameter of `basic_json` is the `JSONSerializer`)
-- use your `basic_json` alias (or a template parameter) in all your `to_json`/`from_json` methods
-- use `nlohmann::to_json` and `nlohmann::from_json` when you need ADL
-
-Here is an example, without simplifications, that only accepts types with a size <= 32, and uses ADL.
-
-```cpp
-// You should use void as a second template argument
-// if you don't need compile-time checks on T
-template<typename T, typename SFINAE = typename std::enable_if<sizeof(T) <= 32>::type>
-struct less_than_32_serializer {
-    template <typename BasicJsonType>
-    static void to_json(BasicJsonType& j, T value) {
-        // we want to use ADL, and call the correct to_json overload
-        using nlohmann::to_json; // this method is called by adl_serializer,
-                                 // this is where the magic happens
-        to_json(j, value);
-    }
-
-    template <typename BasicJsonType>
-    static void from_json(const BasicJsonType& j, T& value) {
-        // same thing here
-        using nlohmann::from_json;
-        from_json(j, value);
-    }
-};
-```
-
-Be **very** careful when reimplementing your serializer, you can stack overflow if you don't pay attention:
-
-```cpp
-template <typename T, void>
-struct bad_serializer
-{
-    template <typename BasicJsonType>
-    static void to_json(BasicJsonType& j, const T& value) {
-      // this calls BasicJsonType::json_serializer<T>::to_json(j, value);
-      // if BasicJsonType::json_serializer == bad_serializer ... oops!
-      j = value;
-    }
-
-    template <typename BasicJsonType>
-    static void to_json(const BasicJsonType& j, T& value) {
-      // this calls BasicJsonType::json_serializer<T>::from_json(j, value);
-      // if BasicJsonType::json_serializer == bad_serializer ... oops!
-      value = j.template get<T>(); // oops!
-    }
-};
-```
-
-### Binary formats (CBOR, MessagePack, and UBJSON)
-
-Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports [CBOR](http://cbor.io) (Concise Binary Object Representation), [MessagePack](http://msgpack.org), and [UBJSON](http://ubjson.org) (Universal Binary JSON Specification) to efficiently encode JSON values to byte vectors and to decode such vectors.
-
-```cpp
-// create a JSON value
-json j = R"({"compact": true, "schema": 0})"_json;
-
-// serialize to CBOR
-std::vector<std::uint8_t> v_cbor = json::to_cbor(j);
-
-// 0xA2, 0x67, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x63, 0x74, 0xF5, 0x66, 0x73, 0x63, 0x68, 0x65, 0x6D, 0x61, 0x00
-
-// roundtrip
-json j_from_cbor = json::from_cbor(v_cbor);
-
-// serialize to MessagePack
-std::vector<std::uint8_t> v_msgpack = json::to_msgpack(j);
-
-// 0x82, 0xA7, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x63, 0x74, 0xC3, 0xA6, 0x73, 0x63, 0x68, 0x65, 0x6D, 0x61, 0x00
-
-// roundtrip
-json j_from_msgpack = json::from_msgpack(v_msgpack);
-
-// serialize to UBJSON
-std::vector<std::uint8_t> v_ubjson = json::to_ubjson(j);
-
-// 0x7B, 0x69, 0x07, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x63, 0x74, 0x54, 0x69, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6D, 0x61, 0x69, 0x00, 0x7D
-
-// roundtrip
-json j_from_ubjson = json::from_ubjson(v_ubjson);
-```
-
-
-## Supported compilers
-
-Though it's 2018 already, the support for C++11 is still a bit sparse. Currently, the following compilers are known to work:
-
-- GCC 4.9 - 8.2 (and possibly later)
-- Clang 3.4 - 6.1 (and possibly later)
-- Intel C++ Compiler 17.0.2 (and possibly later)
-- Microsoft Visual C++ 2015 / Build Tools 14.0.25123.0 (and possibly later)
-- Microsoft Visual C++ 2017 / Build Tools 15.5.180.51428 (and possibly later)
-
-I would be happy to learn about other compilers/versions.
-
-Please note:
-
-- GCC 4.8 does not work because of two bugs ([55817](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55817) and [57824](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57824)) in the C++11 support. Note there is a [pull request](https://github.com/nlohmann/json/pull/212) to fix some of the issues.
-- Android defaults to using very old compilers and C++ libraries. To fix this, add the following to your `Application.mk`. This will switch to the LLVM C++ library, the Clang compiler, and enable C++11 and other features disabled by default.
-
-    ```
-    APP_STL := c++_shared
-    NDK_TOOLCHAIN_VERSION := clang3.6
-    APP_CPPFLAGS += -frtti -fexceptions
-    ```
-
-    The code compiles successfully with [Android NDK](https://developer.android.com/ndk/index.html?hl=ml), Revision 9 - 11 (and possibly later) and [CrystaX's Android NDK](https://www.crystax.net/en/android/ndk) version 10.
-
-- For GCC running on MinGW or Android SDK, the error `'to_string' is not a member of 'std'` (or similarly, for `strtod`) may occur. Note this is not an issue with the code,  but rather with the compiler itself. On Android, see above to build with a newer environment.  For MinGW, please refer to [this site](http://tehsausage.com/mingw-to-string) and [this discussion](https://github.com/nlohmann/json/issues/136) for information on how to fix this bug. For Android NDK using `APP_STL := gnustl_static`, please refer to [this discussion](https://github.com/nlohmann/json/issues/219).
-
-- Unsupported versions of GCC and Clang are rejected by `#error` directives. This can be switched off by defining `JSON_SKIP_UNSUPPORTED_COMPILER_CHECK`. Note that you can expect no support in this case.
-
-The following compilers are currently used in continuous integration at [Travis](https://travis-ci.org/nlohmann/json) and [AppVeyor](https://ci.appveyor.com/project/nlohmann/json):
-
-| Compiler        | Operating System             | Version String |
-|-----------------|------------------------------|----------------|
-| GCC 4.9.4       | Ubuntu 14.04.1 LTS           | g++-4.9 (Ubuntu 4.9.4-2ubuntu1~14.04.1) 4.9.4 |
-| GCC 5.5.0       | Ubuntu 14.04.1 LTS           | g++-5 (Ubuntu 5.5.0-12ubuntu1~14.04) 5.5.0 20171010 |
-| GCC 6.4.0       | Ubuntu 14.04.1 LTS           | g++-6 (Ubuntu 6.4.0-17ubuntu1~14.04) 6.4.0 20180424 |
-| GCC 7.3.0       | Ubuntu 14.04.1 LTS           | g++-7 (Ubuntu 7.3.0-21ubuntu1~14.04) 7.3.0 |
-| GCC 7.3.0       | Windows Server 2012 R2 (x64) | g++ (x86_64-posix-seh-rev0, Built by MinGW-W64 project) 7.3.0 |
-| GCC 8.1.0       | Ubuntu 14.04.1 LTS           | g++-8 (Ubuntu 8.1.0-5ubuntu1~14.04) 8.1.0 |
-| Clang 3.5.0     | Ubuntu 14.04.1 LTS           | clang version 3.5.0-4ubuntu2~trusty2 (tags/RELEASE_350/final) (based on LLVM 3.5.0) |
-| Clang 3.6.2     | Ubuntu 14.04.1 LTS           | clang version 3.6.2-svn240577-1~exp1 (branches/release_36) (based on LLVM 3.6.2) |
-| Clang 3.7.1     | Ubuntu 14.04.1 LTS           | clang version 3.7.1-svn253571-1~exp1 (branches/release_37) (based on LLVM 3.7.1) |
-| Clang 3.8.0     | Ubuntu 14.04.1 LTS           | clang version 3.8.0-2ubuntu3~trusty5 (tags/RELEASE_380/final) |
-| Clang 3.9.1     | Ubuntu 14.04.1 LTS           | clang version 3.9.1-4ubuntu3~14.04.3 (tags/RELEASE_391/rc2) |
-| Clang 4.0.1     | Ubuntu 14.04.1 LTS           | clang version 4.0.1-svn305264-1~exp1 (branches/release_40) |
-| Clang 5.0.2     | Ubuntu 14.04.1 LTS           | clang version 5.0.2-svn328729-1~exp1~20180509123505.100 (branches/release_50) |
-| Clang 6.0.1     | Ubuntu 14.04.1 LTS           | clang version 6.0.1-svn334776-1~exp1~20180726133705.85 (branches/release_60) |
-| Clang Xcode 6.4 | OSX 10.10.5 | Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) |
-| Clang Xcode 7.3 | OSX 10.11.6 | Apple LLVM version 7.3.0 (clang-703.0.31) |
-| Clang Xcode 8.0 | OSX 10.11.6 | Apple LLVM version 8.0.0 (clang-800.0.38) |
-| Clang Xcode 8.1 | OSX 10.12.6 | Apple LLVM version 8.0.0 (clang-800.0.42.1) |
-| Clang Xcode 8.2 | OSX 10.12.6 | Apple LLVM version 8.0.0 (clang-800.0.42.1) |
-| Clang Xcode 8.3 | OSX 10.11.6 | Apple LLVM version 8.1.0 (clang-802.0.38) |
-| Clang Xcode 9.0 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.37) |
-| Clang Xcode 9.1 | OSX 10.12.6 | Apple LLVM version 9.0.0 (clang-900.0.38) |
-| Clang Xcode 9.2 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.1) |
-| Clang Xcode 9.3 | OSX 10.13.3 | Apple LLVM version 9.1.0 (clang-902.0.39.2) |
-| Visual Studio 14 2015 | Windows Server 2012 R2 (x64) | Microsoft (R) Build Engine version 14.0.25420.1, MSVC 19.0.24215.1 |
-| Visual Studio 2017 | Windows Server 2016 | Microsoft (R) Build Engine version 15.7.180.61344, MSVC 19.14.26433.0 |
-
-## License
-
-<img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
-
-The class is licensed under the [MIT License](http://opensource.org/licenses/MIT):
-
-Copyright &copy; 2013-2018 [Niels Lohmann](http://nlohmann.me)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-* * *
-
-The class contains the UTF-8 Decoder from Bjoern Hoehrmann which is licensed under the [MIT License](http://opensource.org/licenses/MIT) (see above). Copyright &copy; 2008-2009 [Björn Hoehrmann](http://bjoern.hoehrmann.de/) <bjoern@hoehrmann.de>
-
-The class contains a slightly modified version of the Grisu2 algorithm from Florian Loitsch which is licensed under the [MIT License](http://opensource.org/licenses/MIT) (see above). Copyright &copy; 2009 [Florian Loitsch](http://florian.loitsch.com/)
-
-## Contact
-
-If you have questions regarding the library, I would like to invite you to [open an issue at GitHub](https://github.com/nlohmann/json/issues/new). Please describe your request, problem, or question as detailed as possible, and also mention the version of the library you are using as well as the version of your compiler and operating system. Opening an issue at GitHub allows other users and contributors to this library to collaborate. For instance, I have little experience with MSVC, and most issues in this regard have been solved by a growing community. If you have a look at the [closed issues](https://github.com/nlohmann/json/issues?q=is%3Aissue+is%3Aclosed), you will see that we react quite timely in most cases.
-
-Only if your request would contain confidential information, please [send me an email](mailto:mail@nlohmann.me). For encrypted messages, please use [this key](https://keybase.io/nlohmann/pgp_keys.asc).
-
-## Security
-
-[Commits by Niels Lohmann](https://github.com/nlohmann/json/commits) and [releases](https://github.com/nlohmann/json/releases) are signed with this [PGP Key](https://keybase.io/nlohmann/pgp_keys.asc?fingerprint=797167ae41c0a6d9232e48457f3cea63ae251b69).
-
-## Thanks
-
-I deeply appreciate the help of the following people.
-
-![Contributors](https://raw.githubusercontent.com/nlohmann/json/develop/doc/avatars.png)
-
-- [Teemperor](https://github.com/Teemperor) implemented CMake support and lcov integration, realized escape and Unicode handling in the string parser, and fixed the JSON serialization.
-- [elliotgoodrich](https://github.com/elliotgoodrich) fixed an issue with double deletion in the iterator classes.
-- [kirkshoop](https://github.com/kirkshoop) made the iterators of the class composable to other libraries.
-- [wancw](https://github.com/wanwc) fixed a bug that hindered the class to compile with Clang.
-- Tomas Åblad found a bug in the iterator implementation.
-- [Joshua C. Randall](https://github.com/jrandall) fixed a bug in the floating-point serialization.
-- [Aaron Burghardt](https://github.com/aburgh) implemented code to parse streams incrementally. Furthermore, he greatly improved the parser class by allowing the definition of a filter function to discard undesired elements while parsing.
-- [Daniel Kopeček](https://github.com/dkopecek) fixed a bug in the compilation with GCC 5.0.
-- [Florian Weber](https://github.com/Florianjw) fixed a bug in and improved the performance of the comparison operators.
-- [Eric Cornelius](https://github.com/EricMCornelius) pointed out a bug in the handling with NaN and infinity values. He also improved the performance of the string escaping.
-- [易思龙](https://github.com/likebeta) implemented a conversion from anonymous enums.
-- [kepkin](https://github.com/kepkin) patiently pushed forward the support for Microsoft Visual studio.
-- [gregmarr](https://github.com/gregmarr) simplified the implementation of reverse iterators and helped with numerous hints and improvements. In particular, he pushed forward the implementation of user-defined types.
-- [Caio Luppi](https://github.com/caiovlp) fixed a bug in the Unicode handling.
-- [dariomt](https://github.com/dariomt) fixed some typos in the examples.
-- [Daniel Frey](https://github.com/d-frey) cleaned up some pointers and implemented exception-safe memory allocation.
-- [Colin Hirsch](https://github.com/ColinH) took care of a small namespace issue.
-- [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation.
-- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
-- [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support and implemented the `get_ref()` function to get a reference to stored values.
-- [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK.
-- [whackashoe](https://github.com/whackashoe) replaced a function that was marked as unsafe by Visual Studio.
-- [406345](https://github.com/406345) fixed two small warnings.
-- [Glen Fernandes](https://github.com/glenfe) noted a potential portability problem in the `has_mapped_type` function.
-- [Corbin Hughes](https://github.com/nibroc) fixed some typos in the contribution guidelines.
-- [twelsby](https://github.com/twelsby) fixed the array subscript operator, an issue that failed the MSVC build, and floating-point parsing/dumping. He further added support for unsigned integer numbers and implemented better roundtrip support for parsed numbers.
-- [Volker Diels-Grabsch](https://github.com/vog) fixed a link in the README file.
-- [msm-](https://github.com/msm-) added support for American Fuzzy Lop.
-- [Annihil](https://github.com/Annihil) fixed an example in the README file.
-- [Themercee](https://github.com/Themercee) noted a wrong URL in the README file.
-- [Lv Zheng](https://github.com/lv-zheng) fixed a namespace issue with `int64_t` and `uint64_t`.
-- [abc100m](https://github.com/abc100m) analyzed the issues with GCC 4.8 and proposed a [partial solution](https://github.com/nlohmann/json/pull/212).
-- [zewt](https://github.com/zewt) added useful notes to the README file about Android.
-- [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators and improved the integration via CMake.
-- [Chris Kitching](https://github.com/ChrisKitching) cleaned up the CMake files.
-- [Tom Needham](https://github.com/06needhamt) fixed a subtle bug with MSVC 2015 which was also proposed by [Michael K.](https://github.com/Epidal).
-- [Mário Feroldi](https://github.com/thelostt) fixed a small typo.
-- [duncanwerner](https://github.com/duncanwerner) found a really embarrassing performance regression in the 2.0.0 release.
-- [Damien](https://github.com/dtoma) fixed one of the last conversion warnings.
-- [Thomas Braun](https://github.com/t-b) fixed a warning in a test case.
-- [Théo DELRIEU](https://github.com/theodelrieu) patiently and constructively oversaw the long way toward [iterator-range parsing](https://github.com/nlohmann/json/issues/290). He also implemented the magic behind the serialization/deserialization of user-defined types and split the single header file into smaller chunks.
-- [Stefan](https://github.com/5tefan) fixed a minor issue in the documentation.
-- [Vasil Dimov](https://github.com/vasild) fixed the documentation regarding conversions from `std::multiset`.
-- [ChristophJud](https://github.com/ChristophJud) overworked the CMake files to ease project inclusion.
-- [Vladimir Petrigo](https://github.com/vpetrigo) made a SFINAE hack more readable and added Visual Studio 17 to the build matrix.
-- [Denis Andrejew](https://github.com/seeekr) fixed a grammar issue in the README file.
-- [Pierre-Antoine Lacaze](https://github.com/palacaze) found a subtle bug in the `dump()` function.
-- [TurpentineDistillery](https://github.com/TurpentineDistillery) pointed to [`std::locale::classic()`](https://en.cppreference.com/w/cpp/locale/locale/classic) to avoid too much locale joggling, found some nice performance improvements in the parser, improved the benchmarking code, and realized locale-independent number parsing and printing.
-- [cgzones](https://github.com/cgzones) had an idea how to fix the Coverity scan.
-- [Jared Grubb](https://github.com/jaredgrubb) silenced a nasty documentation warning.
-- [Yixin Zhang](https://github.com/qwename) fixed an integer overflow check.
-- [Bosswestfalen](https://github.com/Bosswestfalen) merged two iterator classes into a smaller one.
-- [Daniel599](https://github.com/Daniel599) helped to get Travis execute the tests with Clang's sanitizers.
-- [Jonathan Lee](https://github.com/vjon) fixed an example in the README file.
-- [gnzlbg](https://github.com/gnzlbg) supported the implementation of user-defined types.
-- [Alexej Harm](https://github.com/qis) helped to get the user-defined types working with Visual Studio.
-- [Jared Grubb](https://github.com/jaredgrubb) supported the implementation of user-defined types.
-- [EnricoBilla](https://github.com/EnricoBilla) noted a typo in an example.
-- [Martin Hořeňovský](https://github.com/horenmar) found a way for a 2x speedup for the compilation time of the test suite.
-- [ukhegg](https://github.com/ukhegg) found proposed an improvement for the examples section.
-- [rswanson-ihi](https://github.com/rswanson-ihi) noted a typo in the README.
-- [Mihai Stan](https://github.com/stanmihai4) fixed a bug in the comparison with `nullptr`s.
-- [Tushar Maheshwari](https://github.com/tusharpm) added [cotire](https://github.com/sakra/cotire) support to speed up the compilation.
-- [TedLyngmo](https://github.com/TedLyngmo) noted a typo in the README, removed unnecessary bit arithmetic, and fixed some `-Weffc++` warnings.
-- [Krzysztof Woś](https://github.com/krzysztofwos) made exceptions more visible.
-- [ftillier](https://github.com/ftillier) fixed a compiler warning.
-- [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped.
-- [Fytch](https://github.com/Fytch) found a bug in the documentation.
-- [Jay Sistar](https://github.com/Type1J) implemented a Meson build description.
-- [Henry Lee](https://github.com/HenryRLee) fixed a warning in ICC and improved the iterator implementation.
-- [Vincent Thiery](https://github.com/vthiery) maintains a package for the Conan package manager.
-- [Steffen](https://github.com/koemeet) fixed a potential issue with MSVC and `std::min`.
-- [Mike Tzou](https://github.com/Chocobo1) fixed some typos.
-- [amrcode](https://github.com/amrcode) noted a misleading documentation about comparison of floats.
-- [Oleg Endo](https://github.com/olegendo) reduced the memory consumption by replacing `<iostream>` with `<iosfwd>`.
-- [dan-42](https://github.com/dan-42) cleaned up the CMake files to simplify including/reusing of the library.
-- [Nikita Ofitserov](https://github.com/himikof) allowed for moving values from initializer lists.
-- [Greg Hurrell](https://github.com/wincent) fixed a typo.
-- [Dmitry Kukovinets](https://github.com/DmitryKuk) fixed a typo.
-- [kbthomp1](https://github.com/kbthomp1) fixed an issue related to the Intel OSX compiler.
-- [Markus Werle](https://github.com/daixtrose) fixed a typo.
-- [WebProdPP](https://github.com/WebProdPP) fixed a subtle error in a precondition check.
-- [Alex](https://github.com/leha-bot) noted an error in a code sample.
-- [Tom de Geus](https://github.com/tdegeus) reported some warnings with ICC and helped fixing them.
-- [Perry Kundert](https://github.com/pjkundert) simplified reading from input streams.
-- [Sonu Lohani](https://github.com/sonulohani) fixed a small compilation error.
-- [Jamie Seward](https://github.com/jseward) fixed all MSVC warnings.
-- [Nate Vargas](https://github.com/eld00d) added a Doxygen tag file.
-- [pvleuven](https://github.com/pvleuven) helped fixing a warning in ICC.
-- [Pavel](https://github.com/crea7or) helped fixing some warnings in MSVC.
-- [Jamie Seward](https://github.com/jseward) avoided unnecessary string copies in `find()` and `count()`.
-- [Mitja](https://github.com/Itja) fixed some typos.
-- [Jorrit Wronski](https://github.com/jowr) updated the Hunter package links.
-- [Matthias Möller](https://github.com/TinyTinni) added a `.natvis` for the MSVC debug view.
-- [bogemic](https://github.com/bogemic) fixed some C++17 deprecation warnings.
-- [Eren Okka](https://github.com/erengy) fixed some MSVC warnings.
-- [abolz](https://github.com/abolz) integrated the Grisu2 algorithm for proper floating-point formatting, allowing more roundtrip checks to succeed.
-- [Vadim Evard](https://github.com/Pipeliner) fixed a Markdown issue in the README.
-- [zerodefect](https://github.com/zerodefect) fixed a compiler warning.
-- [Kert](https://github.com/kaidokert) allowed to template the string type in the serialization and added the possibility to override the exceptional behavior.
-- [mark-99](https://github.com/mark-99) helped fixing an ICC error.
-- [Patrik Huber](https://github.com/patrikhuber) fixed links in the README file.
-- [johnfb](https://github.com/johnfb) found a bug in the implementation of CBOR's indefinite length strings.
-- [Paul Fultz II](https://github.com/pfultz2) added a note on the cget package manager.
-- [Wilson Lin](https://github.com/wla80) made the integration section of the README more concise.
-- [RalfBielig](https://github.com/ralfbielig) detected and fixed a memory leak in the parser callback.
-- [agrianius](https://github.com/agrianius) allowed to dump JSON to an alternative string type.
-- [Kevin Tonon](https://github.com/ktonon) overworked the C++11 compiler checks in CMake.
-- [Axel Huebl](https://github.com/ax3l) simplified a CMake check and added support for the [Spack package manager](https://spack.io).
-- [Carlos O'Ryan](https://github.com/coryan) fixed a typo.
-- [James Upjohn](https://github.com/jammehcow) fixed a version number in the compilers section.
-- [Chuck Atkins](https://github.com/chuckatkins) adjusted the CMake files to the CMake packaging guidelines
-- [Jan Schöppach](https://github.com/dns13) fixed a typo.
-- [martin-mfg](https://github.com/martin-mfg) fixed a typo.
-- [Matthias Möller](https://github.com/TinyTinni) removed the dependency from `std::stringstream`.
-- [agrianius](https://github.com/agrianius) added code to use alternative string implementations.
-- [Daniel599](https://github.com/Daniel599) allowed to use more algorithms with the `items()` function.
-- [Julius Rakow](https://github.com/jrakow) fixed the Meson include directory and fixed the links to [cppreference.com](cppreference.com).
-- [Sonu Lohani](https://github.com/sonulohani) fixed the compilation with MSVC 2015 in debug mode.
-- [grembo](https://github.com/grembo) fixed the test suite and re-enabled several test cases.
-- [Hyeon Kim](https://github.com/simnalamburt) introduced the macro `JSON_INTERNAL_CATCH` to control the exception handling inside the library.
-- [thyu](https://github.com/thyu) fixed a compiler warning.
-
-Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone.
-
-
-## Used third-party tools
-
-The library itself consists of a single header file licensed under the MIT license. However, it is built, tested, documented, and whatnot using a lot of third-party tools and services. Thanks a lot!
-
-- [**amalgamate.py - Amalgamate C source and header files**](https://github.com/edlund/amalgamate) to create a single header file
-- [**American fuzzy lop**](http://lcamtuf.coredump.cx/afl/) for fuzz testing
-- [**AppVeyor**](https://www.appveyor.com) for [continuous integration](https://ci.appveyor.com/project/nlohmann/json) on Windows
-- [**Artistic Style**](http://astyle.sourceforge.net) for automatic source code identation
-- [**Catch**](https://github.com/philsquared/Catch) for the unit tests
-- [**Clang**](http://clang.llvm.org) for compilation with code sanitizers
-- [**Cmake**](https://cmake.org) for build automation
-- [**Codacity**](https://www.codacy.com) for further [code analysis](https://www.codacy.com/app/nlohmann/json)
-- [**Coveralls**](https://coveralls.io) to measure [code coverage](https://coveralls.io/github/nlohmann/json)
-- [**Coverity Scan**](https://scan.coverity.com) for [static analysis](https://scan.coverity.com/projects/nlohmann-json)
-- [**cppcheck**](http://cppcheck.sourceforge.net) for static analysis
-- [**Doxygen**](http://www.stack.nl/~dimitri/doxygen/) to generate [documentation](https://nlohmann.github.io/json/)
-- [**git-update-ghpages**](https://github.com/rstacruz/git-update-ghpages) to upload the documentation to gh-pages
-- [**GitHub Changelog Generator**](https://github.com/skywinder/github-changelog-generator) to generate the [ChangeLog](https://github.com/nlohmann/json/blob/develop/ChangeLog.md)
-- [**Google Benchmark**](https://github.com/google/benchmark) to implement the benchmarks
-- [**libFuzzer**](http://llvm.org/docs/LibFuzzer.html) to implement fuzz testing for OSS-Fuzz
-- [**OSS-Fuzz**](https://github.com/google/oss-fuzz) for continuous fuzz testing of the library ([project repository](https://github.com/google/oss-fuzz/tree/master/projects/json))
-- [**Probot**](https://probot.github.io) for automating maintainer tasks such as closing stale issues, requesting missing information, or detecting toxic comments.
-- [**send_to_wandbox**](https://github.com/nlohmann/json/blob/develop/doc/scripts/send_to_wandbox.py) to send code examples to [Wandbox](http://melpon.org/wandbox)
-- [**Travis**](https://travis-ci.org) for [continuous integration](https://travis-ci.org/nlohmann/json) on Linux and macOS
-- [**Valgrind**](http://valgrind.org) to check for correct memory management
-- [**Wandbox**](http://melpon.org/wandbox) for [online examples](https://wandbox.org/permlink/TarF5pPn9NtHQjhf)
-
-
-## Projects using JSON for Modern C++
-
-The library is currently used in Apple macOS Sierra and iOS 10. I am not sure what they are using the library for, but I am happy that it runs on so many devices.
-
-
-## Notes
-
-- The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](https://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a2e26bd0b0168abb61f67ad5bcd5b9fa1.html#a2e26bd0b0168abb61f67ad5bcd5b9fa1) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a674de1ee73e6bf4843fc5dc1351fb726.html#a674de1ee73e6bf4843fc5dc1351fb726).
-- As the exact type of a number is not defined in the [JSON specification](http://rfc7159.net/rfc7159), this library tries to choose the best fitting C++ number type automatically. As a result, the type `double` may be used to store numbers which may yield [**floating-point exceptions**](https://github.com/nlohmann/json/issues/181) in certain rare situations if floating-point exceptions have been unmasked in the calling code. These exceptions are not caused by the library and need to be fixed in the calling code, such as by re-masking the exceptions prior to calling library functions.
-- The library supports **Unicode input** as follows:
-  - Only **UTF-8** encoded input is supported which is the default encoding for JSON according to [RFC 7159](http://rfc7159.net/rfc7159#rfc.section.8.1).
-  - Other encodings such as Latin-1, UTF-16, or UTF-32 are not supported and will yield parse or serialization errors.
-  - [Unicode noncharacters](http://www.unicode.org/faq/private_use.html#nonchar1) will not be replaced by the library.
-  - Invalid surrogates (e.g., incomplete pairs such as `\uDEAD`) will yield parse errors.
-  - The strings stored in the library are UTF-8 encoded. When using the default string type (`std::string`), note that its length/size functions return the number of stored bytes rather than the number of characters or glyphs.
-- The code can be compiled without C++ **runtime type identification** features; that is, you can use the `-fno-rtti` compiler flag.
-- **Exceptions** are used widely within the library. They can, however, be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION`. In this case, exceptions are replaced by an `abort()` call.
-- By default, the library does not preserve the **insertion order of object elements**. This is standards-compliant, as the [JSON standard](https://tools.ietf.org/html/rfc7159.html) defines objects as "an unordered collection of zero or more name/value pairs". If you do want to preserve the insertion order, you can specialize the object type with containers like [`tsl::ordered_map`](https://github.com/Tessil/ordered-map) ([integration](https://github.com/nlohmann/json/issues/546#issuecomment-304447518)) or [`nlohmann::fifo_map`](https://github.com/nlohmann/fifo_map) ([integration](https://github.com/nlohmann/json/issues/485#issuecomment-333652309)).
-
-
-## Execute unit tests
-
-To compile and run the tests, you need to execute
-
-```sh
-$ mkdir build
-$ cd build
-$ cmake ..
-$ cmake --build .
-$ ctest --output-on-failure
-```
-
-For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml).
diff --git a/ext/nlohmann/json.hpp b/ext/nlohmann/json.hpp
deleted file mode 100644
index 8959265da..000000000
--- a/ext/nlohmann/json.hpp
+++ /dev/null
@@ -1,26640 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.10.2
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#ifndef INCLUDE_NLOHMANN_JSON_HPP_
-#define INCLUDE_NLOHMANN_JSON_HPP_
-
-#define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 10
-#define NLOHMANN_JSON_VERSION_PATCH 2
-
-#include <algorithm> // all_of, find, for_each
-#include <cstddef> // nullptr_t, ptrdiff_t, size_t
-#include <functional> // hash, less
-#include <initializer_list> // initializer_list
-#ifndef JSON_NO_IO
-    #include <iosfwd> // istream, ostream
-#endif  // JSON_NO_IO
-#include <iterator> // random_access_iterator_tag
-#include <memory> // unique_ptr
-#include <numeric> // accumulate
-#include <string> // string, stoi, to_string
-#include <utility> // declval, forward, move, pair, swap
-#include <vector> // vector
-
-// #include <nlohmann/adl_serializer.hpp>
-
-
-#include <type_traits>
-#include <utility>
-
-// #include <nlohmann/detail/conversions/from_json.hpp>
-
-
-#include <algorithm> // transform
-#include <array> // array
-#include <forward_list> // forward_list
-#include <iterator> // inserter, front_inserter, end
-#include <map> // map
-#include <string> // string
-#include <tuple> // tuple, make_tuple
-#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
-#include <unordered_map> // unordered_map
-#include <utility> // pair, declval
-#include <valarray> // valarray
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-
-#include <exception> // exception
-#include <stdexcept> // runtime_error
-#include <string> // to_string
-#include <vector> // vector
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-#include <array> // array
-#include <cstddef> // size_t
-#include <cstdint> // uint8_t
-#include <string> // string
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////////////
-// JSON type enumeration //
-///////////////////////////
-
-/*!
-@brief the JSON type enumeration
-
-This enumeration collects the different JSON types. It is internally used to
-distinguish the stored values, and the functions @ref basic_json::is_null(),
-@ref basic_json::is_object(), @ref basic_json::is_array(),
-@ref basic_json::is_string(), @ref basic_json::is_boolean(),
-@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
-@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
-@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
-@ref basic_json::is_structured() rely on it.
-
-@note There are three enumeration entries (number_integer, number_unsigned, and
-number_float), because the library distinguishes these three types for numbers:
-@ref basic_json::number_unsigned_t is used for unsigned integers,
-@ref basic_json::number_integer_t is used for signed integers, and
-@ref basic_json::number_float_t is used for floating-point numbers or to
-approximate integers which do not fit in the limits of their respective type.
-
-@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
-value with the default value for a given type
-
-@since version 1.0.0
-*/
-enum class value_t : std::uint8_t
-{
-    null,             ///< null value
-    object,           ///< object (unordered set of name/value pairs)
-    array,            ///< array (ordered collection of values)
-    string,           ///< string value
-    boolean,          ///< boolean value
-    number_integer,   ///< number value (signed integer)
-    number_unsigned,  ///< number value (unsigned integer)
-    number_float,     ///< number value (floating-point)
-    binary,           ///< binary array (ordered collection of bytes)
-    discarded         ///< discarded by the parser callback function
-};
-
-/*!
-@brief comparison operator for JSON types
-
-Returns an ordering that is similar to Python:
-- order: null < boolean < number < object < array < string < binary
-- furthermore, each type is not smaller than itself
-- discarded values are not comparable
-- binary is represented as a b"" string in python and directly comparable to a
-  string; however, making a binary array directly comparable with a string would
-  be surprising behavior in a JSON file.
-
-@since version 1.0.0
-*/
-inline bool operator<(const value_t lhs, const value_t rhs) noexcept
-{
-    static constexpr std::array<std::uint8_t, 9> order = {{
-            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
-            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
-            6 /* binary */
-        }
-    };
-
-    const auto l_index = static_cast<std::size_t>(lhs);
-    const auto r_index = static_cast<std::size_t>(rhs);
-    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
-}
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/string_escape.hpp>
-
-
-#include <string>
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-#include <utility> // pair
-// #include <nlohmann/thirdparty/hedley/hedley.hpp>
-
-
-/* Hedley - https://nemequ.github.io/hedley
- * Created by Evan Nemerson <evan@nemerson.com>
- *
- * To the extent possible under law, the author(s) have dedicated all
- * copyright and related and neighboring rights to this software to
- * the public domain worldwide. This software is distributed without
- * any warranty.
- *
- * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
- * SPDX-License-Identifier: CC0-1.0
- */
-
-#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
-#if defined(JSON_HEDLEY_VERSION)
-    #undef JSON_HEDLEY_VERSION
-#endif
-#define JSON_HEDLEY_VERSION 15
-
-#if defined(JSON_HEDLEY_STRINGIFY_EX)
-    #undef JSON_HEDLEY_STRINGIFY_EX
-#endif
-#define JSON_HEDLEY_STRINGIFY_EX(x) #x
-
-#if defined(JSON_HEDLEY_STRINGIFY)
-    #undef JSON_HEDLEY_STRINGIFY
-#endif
-#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
-
-#if defined(JSON_HEDLEY_CONCAT_EX)
-    #undef JSON_HEDLEY_CONCAT_EX
-#endif
-#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
-
-#if defined(JSON_HEDLEY_CONCAT)
-    #undef JSON_HEDLEY_CONCAT
-#endif
-#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
-
-#if defined(JSON_HEDLEY_CONCAT3_EX)
-    #undef JSON_HEDLEY_CONCAT3_EX
-#endif
-#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
-
-#if defined(JSON_HEDLEY_CONCAT3)
-    #undef JSON_HEDLEY_CONCAT3
-#endif
-#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
-
-#if defined(JSON_HEDLEY_VERSION_ENCODE)
-    #undef JSON_HEDLEY_VERSION_ENCODE
-#endif
-#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
-    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
-    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
-    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
-
-#if defined(JSON_HEDLEY_GNUC_VERSION)
-    #undef JSON_HEDLEY_GNUC_VERSION
-#endif
-#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
-    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-#elif defined(__GNUC__)
-    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
-    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_GNUC_VERSION)
-    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_MSVC_VERSION)
-    #undef JSON_HEDLEY_MSVC_VERSION
-#endif
-#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
-#elif defined(_MSC_FULL_VER) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
-#elif defined(_MSC_VER) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
-    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
-#endif
-#if !defined(JSON_HEDLEY_MSVC_VERSION)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
-#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
-#else
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_VERSION)
-    #undef JSON_HEDLEY_INTEL_VERSION
-#endif
-#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL)
-    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
-#elif defined(__INTEL_COMPILER) && !defined(__ICL)
-    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
-    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_INTEL_VERSION)
-    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
-    #undef JSON_HEDLEY_INTEL_CL_VERSION
-#endif
-#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL)
-    #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK)
-    #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
-    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_PGI_VERSION)
-    #undef JSON_HEDLEY_PGI_VERSION
-#endif
-#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
-    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
-#endif
-
-#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
-    #undef JSON_HEDLEY_PGI_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_PGI_VERSION)
-    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_SUNPRO_VERSION)
-    #undef JSON_HEDLEY_SUNPRO_VERSION
-#endif
-#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
-#elif defined(__SUNPRO_C)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
-#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
-#elif defined(__SUNPRO_CC)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
-#endif
-
-#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
-    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_SUNPRO_VERSION)
-    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
-    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
-#endif
-#if defined(__EMSCRIPTEN__)
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
-#endif
-
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
-    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_ARM_VERSION)
-    #undef JSON_HEDLEY_ARM_VERSION
-#endif
-#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
-#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
-#endif
-
-#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
-    #undef JSON_HEDLEY_ARM_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_ARM_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_IBM_VERSION)
-    #undef JSON_HEDLEY_IBM_VERSION
-#endif
-#if defined(__ibmxl__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
-#elif defined(__xlC__) && defined(__xlC_ver__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
-#elif defined(__xlC__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
-#endif
-
-#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
-    #undef JSON_HEDLEY_IBM_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_IBM_VERSION)
-    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_VERSION)
-    #undef JSON_HEDLEY_TI_VERSION
-#endif
-#if \
-    defined(__TI_COMPILER_VERSION__) && \
-    ( \
-      defined(__TMS470__) || defined(__TI_ARM__) || \
-      defined(__MSP430__) || \
-      defined(__TMS320C2000__) \
-    )
-#if (__TI_COMPILER_VERSION__ >= 16000000)
-    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-#endif
-
-#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_VERSION)
-    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
-    #undef JSON_HEDLEY_TI_CL2000_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
-    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
-    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL430_VERSION)
-    #undef JSON_HEDLEY_TI_CL430_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
-    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL430_VERSION)
-    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
-    #undef JSON_HEDLEY_TI_ARMCL_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
-    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
-    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
-    #undef JSON_HEDLEY_TI_CL6X_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
-    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
-    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
-    #undef JSON_HEDLEY_TI_CL7X_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
-    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
-    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
-    #undef JSON_HEDLEY_TI_CLPRU_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
-    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
-    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_CRAY_VERSION)
-    #undef JSON_HEDLEY_CRAY_VERSION
-#endif
-#if defined(_CRAYC)
-    #if defined(_RELEASE_PATCHLEVEL)
-        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
-    #else
-        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
-    #endif
-#endif
-
-#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
-    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_CRAY_VERSION)
-    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_IAR_VERSION)
-    #undef JSON_HEDLEY_IAR_VERSION
-#endif
-#if defined(__IAR_SYSTEMS_ICC__)
-    #if __VER__ > 1000
-        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
-    #else
-        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0)
-    #endif
-#endif
-
-#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
-    #undef JSON_HEDLEY_IAR_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_IAR_VERSION)
-    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TINYC_VERSION)
-    #undef JSON_HEDLEY_TINYC_VERSION
-#endif
-#if defined(__TINYC__)
-    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
-#endif
-
-#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
-    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TINYC_VERSION)
-    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_DMC_VERSION)
-    #undef JSON_HEDLEY_DMC_VERSION
-#endif
-#if defined(__DMC__)
-    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
-#endif
-
-#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
-    #undef JSON_HEDLEY_DMC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_DMC_VERSION)
-    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_COMPCERT_VERSION)
-    #undef JSON_HEDLEY_COMPCERT_VERSION
-#endif
-#if defined(__COMPCERT_VERSION__)
-    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
-#endif
-
-#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
-    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_COMPCERT_VERSION)
-    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_PELLES_VERSION)
-    #undef JSON_HEDLEY_PELLES_VERSION
-#endif
-#if defined(__POCC__)
-    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
-    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_PELLES_VERSION)
-    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #undef JSON_HEDLEY_MCST_LCC_VERSION
-#endif
-#if defined(__LCC__) && defined(__LCC_MINOR__)
-    #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__)
-#endif
-
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK)
-    #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_VERSION)
-    #undef JSON_HEDLEY_GCC_VERSION
-#endif
-#if \
-    defined(JSON_HEDLEY_GNUC_VERSION) && \
-    !defined(__clang__) && \
-    !defined(JSON_HEDLEY_INTEL_VERSION) && \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_ARM_VERSION) && \
-    !defined(JSON_HEDLEY_CRAY_VERSION) && \
-    !defined(JSON_HEDLEY_TI_VERSION) && \
-    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
-    !defined(__COMPCERT__) && \
-    !defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
-#endif
-
-#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
-    #undef JSON_HEDLEY_GCC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_GCC_VERSION)
-    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_ATTRIBUTE
-#endif
-#if \
-  defined(__has_attribute) && \
-  ( \
-    (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \
-  )
-#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
-#else
-#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
-#endif
-#if \
-    defined(__has_cpp_attribute) && \
-    defined(__cplusplus) && \
-    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
-    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
-#endif
-#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
-#elif \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_IAR_VERSION) && \
-    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
-    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
-#else
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
-#endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
-    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
-#endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
-    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_BUILTIN)
-    #undef JSON_HEDLEY_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
-    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
-    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_FEATURE)
-    #undef JSON_HEDLEY_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
-    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
-    #undef JSON_HEDLEY_GCC_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_EXTENSION)
-    #undef JSON_HEDLEY_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
-    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
-    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_WARNING)
-    #undef JSON_HEDLEY_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
-    #undef JSON_HEDLEY_GNUC_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
-    #undef JSON_HEDLEY_GCC_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
-    defined(__clang__) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
-    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
-    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
-#else
-    #define JSON_HEDLEY_PRAGMA(value)
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
-    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
-#endif
-#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
-    #undef JSON_HEDLEY_DIAGNOSTIC_POP
-#endif
-#if defined(__clang__)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
-    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
-#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
-    #define JSON_HEDLEY_DIAGNOSTIC_POP
-#endif
-
-/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
-   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
-#endif
-#if defined(__cplusplus)
-#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
-#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
-#      if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions")
-#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#      else
-#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#      endif
-#    else
-#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#    endif
-#  endif
-#endif
-#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
-#endif
-
-#if defined(JSON_HEDLEY_CONST_CAST)
-    #undef JSON_HEDLEY_CONST_CAST
-#endif
-#if defined(__cplusplus)
-#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
-#elif \
-  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
-        JSON_HEDLEY_DIAGNOSTIC_PUSH \
-        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
-        ((T) (expr)); \
-        JSON_HEDLEY_DIAGNOSTIC_POP \
-    }))
-#else
-#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_REINTERPRET_CAST)
-    #undef JSON_HEDLEY_REINTERPRET_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
-#else
-    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_STATIC_CAST)
-    #undef JSON_HEDLEY_STATIC_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
-#else
-    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_CPP_CAST)
-    #undef JSON_HEDLEY_CPP_CAST
-#endif
-#if defined(__cplusplus)
-#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
-#    define JSON_HEDLEY_CPP_CAST(T, expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
-    ((T) (expr)) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
-#    define JSON_HEDLEY_CPP_CAST(T, expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("diag_suppress=Pe137") \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  else
-#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
-#  endif
-#else
-#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445")
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292))
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098")
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunused-function")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505))
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#endif
-
-#if defined(JSON_HEDLEY_DEPRECATED)
-    #undef JSON_HEDLEY_DEPRECATED
-#endif
-#if defined(JSON_HEDLEY_DEPRECATED_FOR)
-    #undef JSON_HEDLEY_DEPRECATED_FOR
-#endif
-#if \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
-#elif \
-    (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
-#elif defined(__cplusplus) && (__cplusplus >= 201402L)
-    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
-#else
-    #define JSON_HEDLEY_DEPRECATED(since)
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
-#endif
-
-#if defined(JSON_HEDLEY_UNAVAILABLE)
-    #undef JSON_HEDLEY_UNAVAILABLE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
-#else
-    #define JSON_HEDLEY_UNAVAILABLE(available_since)
-#endif
-
-#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
-    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
-#endif
-#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
-    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
-#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-#elif defined(_Check_return_) /* SAL */
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
-#else
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
-#endif
-
-#if defined(JSON_HEDLEY_SENTINEL)
-    #undef JSON_HEDLEY_SENTINEL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
-#else
-    #define JSON_HEDLEY_SENTINEL(position)
-#endif
-
-#if defined(JSON_HEDLEY_NO_RETURN)
-    #undef JSON_HEDLEY_NO_RETURN
-#endif
-#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_NO_RETURN __noreturn
-#elif \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-    #define JSON_HEDLEY_NO_RETURN _Noreturn
-#elif defined(__cplusplus) && (__cplusplus >= 201103L)
-    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
-#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
-    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
-    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
-#else
-    #define JSON_HEDLEY_NO_RETURN
-#endif
-
-#if defined(JSON_HEDLEY_NO_ESCAPE)
-    #undef JSON_HEDLEY_NO_ESCAPE
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
-    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
-#else
-    #define JSON_HEDLEY_NO_ESCAPE
-#endif
-
-#if defined(JSON_HEDLEY_UNREACHABLE)
-    #undef JSON_HEDLEY_UNREACHABLE
-#endif
-#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
-    #undef JSON_HEDLEY_UNREACHABLE_RETURN
-#endif
-#if defined(JSON_HEDLEY_ASSUME)
-    #undef JSON_HEDLEY_ASSUME
-#endif
-#if \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
-#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
-    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
-#elif \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
-    #if defined(__cplusplus)
-        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
-    #else
-        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
-    #endif
-#endif
-#if \
-    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
-#elif defined(JSON_HEDLEY_ASSUME)
-    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
-#endif
-#if !defined(JSON_HEDLEY_ASSUME)
-    #if defined(JSON_HEDLEY_UNREACHABLE)
-        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
-    #else
-        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
-    #endif
-#endif
-#if defined(JSON_HEDLEY_UNREACHABLE)
-    #if  \
-        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
-        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
-    #else
-        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
-    #endif
-#else
-    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
-#endif
-#if !defined(JSON_HEDLEY_UNREACHABLE)
-    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
-#endif
-
-JSON_HEDLEY_DIAGNOSTIC_PUSH
-#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
-    #pragma clang diagnostic ignored "-Wpedantic"
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
-    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#endif
-#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
-    #if defined(__clang__)
-        #pragma clang diagnostic ignored "-Wvariadic-macros"
-    #elif defined(JSON_HEDLEY_GCC_VERSION)
-        #pragma GCC diagnostic ignored "-Wvariadic-macros"
-    #endif
-#endif
-#if defined(JSON_HEDLEY_NON_NULL)
-    #undef JSON_HEDLEY_NON_NULL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
-    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
-#else
-    #define JSON_HEDLEY_NON_NULL(...)
-#endif
-JSON_HEDLEY_DIAGNOSTIC_POP
-
-#if defined(JSON_HEDLEY_PRINTF_FORMAT)
-    #undef JSON_HEDLEY_PRINTF_FORMAT
-#endif
-#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
-#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
-#else
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
-#endif
-
-#if defined(JSON_HEDLEY_CONSTEXPR)
-    #undef JSON_HEDLEY_CONSTEXPR
-#endif
-#if defined(__cplusplus)
-    #if __cplusplus >= 201103L
-        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
-    #endif
-#endif
-#if !defined(JSON_HEDLEY_CONSTEXPR)
-    #define JSON_HEDLEY_CONSTEXPR
-#endif
-
-#if defined(JSON_HEDLEY_PREDICT)
-    #undef JSON_HEDLEY_PREDICT
-#endif
-#if defined(JSON_HEDLEY_LIKELY)
-    #undef JSON_HEDLEY_LIKELY
-#endif
-#if defined(JSON_HEDLEY_UNLIKELY)
-    #undef JSON_HEDLEY_UNLIKELY
-#endif
-#if defined(JSON_HEDLEY_UNPREDICTABLE)
-    #undef JSON_HEDLEY_UNPREDICTABLE
-#endif
-#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
-    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
-#endif
-#if \
-  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
-#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
-#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
-#elif \
-  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
-  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
-    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
-    (__extension__ ({ \
-        double hedley_probability_ = (probability); \
-        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
-    }))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
-    (__extension__ ({ \
-        double hedley_probability_ = (probability); \
-        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
-    }))
-#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
-#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
-#else
-#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
-#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
-#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
-#endif
-#if !defined(JSON_HEDLEY_UNPREDICTABLE)
-    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
-#endif
-
-#if defined(JSON_HEDLEY_MALLOC)
-    #undef JSON_HEDLEY_MALLOC
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_MALLOC __declspec(restrict)
-#else
-    #define JSON_HEDLEY_MALLOC
-#endif
-
-#if defined(JSON_HEDLEY_PURE)
-    #undef JSON_HEDLEY_PURE
-#endif
-#if \
-  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PURE __attribute__((__pure__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
-#elif defined(__cplusplus) && \
-    ( \
-      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
-      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
-      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
-    )
-#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
-#else
-#  define JSON_HEDLEY_PURE
-#endif
-
-#if defined(JSON_HEDLEY_CONST)
-    #undef JSON_HEDLEY_CONST
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_CONST __attribute__((__const__))
-#elif \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
-#else
-    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
-#endif
-
-#if defined(JSON_HEDLEY_RESTRICT)
-    #undef JSON_HEDLEY_RESTRICT
-#endif
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
-    #define JSON_HEDLEY_RESTRICT restrict
-#elif \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
-    defined(__clang__) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_RESTRICT __restrict
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
-    #define JSON_HEDLEY_RESTRICT _Restrict
-#else
-    #define JSON_HEDLEY_RESTRICT
-#endif
-
-#if defined(JSON_HEDLEY_INLINE)
-    #undef JSON_HEDLEY_INLINE
-#endif
-#if \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
-    (defined(__cplusplus) && (__cplusplus >= 199711L))
-    #define JSON_HEDLEY_INLINE inline
-#elif \
-    defined(JSON_HEDLEY_GCC_VERSION) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
-    #define JSON_HEDLEY_INLINE __inline__
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_INLINE __inline
-#else
-    #define JSON_HEDLEY_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_ALWAYS_INLINE)
-    #undef JSON_HEDLEY_ALWAYS_INLINE
-#endif
-#if \
-  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-  JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
-#elif \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
-#elif defined(__cplusplus) && \
-    ( \
-      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
-    )
-#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
-#else
-#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_NEVER_INLINE)
-    #undef JSON_HEDLEY_NEVER_INLINE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
-#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
-    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
-    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
-#else
-    #define JSON_HEDLEY_NEVER_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_PRIVATE)
-    #undef JSON_HEDLEY_PRIVATE
-#endif
-#if defined(JSON_HEDLEY_PUBLIC)
-    #undef JSON_HEDLEY_PUBLIC
-#endif
-#if defined(JSON_HEDLEY_IMPORT)
-    #undef JSON_HEDLEY_IMPORT
-#endif
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  define JSON_HEDLEY_PRIVATE
-#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
-#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
-#else
-#  if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-    ( \
-      defined(__TI_EABI__) && \
-      ( \
-        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
-      ) \
-    ) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
-#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
-#  else
-#    define JSON_HEDLEY_PRIVATE
-#    define JSON_HEDLEY_PUBLIC
-#  endif
-#  define JSON_HEDLEY_IMPORT    extern
-#endif
-
-#if defined(JSON_HEDLEY_NO_THROW)
-    #undef JSON_HEDLEY_NO_THROW
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
-    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
-#else
-    #define JSON_HEDLEY_NO_THROW
-#endif
-
-#if defined(JSON_HEDLEY_FALL_THROUGH)
-    #undef JSON_HEDLEY_FALL_THROUGH
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
-    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
-    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
-#elif defined(__fallthrough) /* SAL */
-    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
-#else
-    #define JSON_HEDLEY_FALL_THROUGH
-#endif
-
-#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
-    #undef JSON_HEDLEY_RETURNS_NON_NULL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
-#elif defined(_Ret_notnull_) /* SAL */
-    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
-#else
-    #define JSON_HEDLEY_RETURNS_NON_NULL
-#endif
-
-#if defined(JSON_HEDLEY_ARRAY_PARAM)
-    #undef JSON_HEDLEY_ARRAY_PARAM
-#endif
-#if \
-    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
-    !defined(__STDC_NO_VLA__) && \
-    !defined(__cplusplus) && \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_TINYC_VERSION)
-    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
-#else
-    #define JSON_HEDLEY_ARRAY_PARAM(name)
-#endif
-
-#if defined(JSON_HEDLEY_IS_CONSTANT)
-    #undef JSON_HEDLEY_IS_CONSTANT
-#endif
-#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
-    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
-#endif
-/* JSON_HEDLEY_IS_CONSTEXPR_ is for
-   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
-#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
-    #undef JSON_HEDLEY_IS_CONSTEXPR_
-#endif
-#if \
-    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
-#endif
-#if !defined(__cplusplus)
-#  if \
-       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
-       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
-       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
-#if defined(__INTPTR_TYPE__)
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
-#else
-    #include <stdint.h>
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
-#endif
-#  elif \
-       ( \
-          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
-          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
-          !defined(JSON_HEDLEY_PGI_VERSION) && \
-          !defined(JSON_HEDLEY_IAR_VERSION)) || \
-       (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
-       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
-       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
-       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
-       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
-#if defined(__INTPTR_TYPE__)
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
-#else
-    #include <stdint.h>
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
-#endif
-#  elif \
-       defined(JSON_HEDLEY_GCC_VERSION) || \
-       defined(JSON_HEDLEY_INTEL_VERSION) || \
-       defined(JSON_HEDLEY_TINYC_VERSION) || \
-       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
-       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
-       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
-       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
-       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
-       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
-       defined(__clang__)
-#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
-        sizeof(void) != \
-        sizeof(*( \
-                  1 ? \
-                  ((void*) ((expr) * 0L) ) : \
-((struct { char v[sizeof(void) * 2]; } *) 1) \
-                ) \
-              ) \
-                                            )
-#  endif
-#endif
-#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
-    #if !defined(JSON_HEDLEY_IS_CONSTANT)
-        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
-    #endif
-    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
-#else
-    #if !defined(JSON_HEDLEY_IS_CONSTANT)
-        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
-    #endif
-    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
-#endif
-
-#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
-    #undef JSON_HEDLEY_BEGIN_C_DECLS
-#endif
-#if defined(JSON_HEDLEY_END_C_DECLS)
-    #undef JSON_HEDLEY_END_C_DECLS
-#endif
-#if defined(JSON_HEDLEY_C_DECL)
-    #undef JSON_HEDLEY_C_DECL
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
-    #define JSON_HEDLEY_END_C_DECLS }
-    #define JSON_HEDLEY_C_DECL extern "C"
-#else
-    #define JSON_HEDLEY_BEGIN_C_DECLS
-    #define JSON_HEDLEY_END_C_DECLS
-    #define JSON_HEDLEY_C_DECL
-#endif
-
-#if defined(JSON_HEDLEY_STATIC_ASSERT)
-    #undef JSON_HEDLEY_STATIC_ASSERT
-#endif
-#if \
-  !defined(__cplusplus) && ( \
-      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
-      (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
-      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
-      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-      defined(_Static_assert) \
-    )
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
-#elif \
-  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
-#else
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
-#endif
-
-#if defined(JSON_HEDLEY_NULL)
-    #undef JSON_HEDLEY_NULL
-#endif
-#if defined(__cplusplus)
-    #if __cplusplus >= 201103L
-        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
-    #elif defined(NULL)
-        #define JSON_HEDLEY_NULL NULL
-    #else
-        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
-    #endif
-#elif defined(NULL)
-    #define JSON_HEDLEY_NULL NULL
-#else
-    #define JSON_HEDLEY_NULL ((void*) 0)
-#endif
-
-#if defined(JSON_HEDLEY_MESSAGE)
-    #undef JSON_HEDLEY_MESSAGE
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-#  define JSON_HEDLEY_MESSAGE(msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
-    JSON_HEDLEY_PRAGMA(message msg) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#elif \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
-#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#else
-#  define JSON_HEDLEY_MESSAGE(msg)
-#endif
-
-#if defined(JSON_HEDLEY_WARNING)
-    #undef JSON_HEDLEY_WARNING
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-#  define JSON_HEDLEY_WARNING(msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
-    JSON_HEDLEY_PRAGMA(clang warning msg) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#elif \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
-  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
-#elif \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#else
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
-#endif
-
-#if defined(JSON_HEDLEY_REQUIRE)
-    #undef JSON_HEDLEY_REQUIRE
-#endif
-#if defined(JSON_HEDLEY_REQUIRE_MSG)
-    #undef JSON_HEDLEY_REQUIRE_MSG
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
-#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
-#    define JSON_HEDLEY_REQUIRE(expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
-    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
-    __attribute__((diagnose_if(!(expr), msg, "error"))) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  else
-#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
-#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
-#  endif
-#else
-#  define JSON_HEDLEY_REQUIRE(expr)
-#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
-#endif
-
-#if defined(JSON_HEDLEY_FLAGS)
-    #undef JSON_HEDLEY_FLAGS
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion"))
-    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
-#else
-    #define JSON_HEDLEY_FLAGS
-#endif
-
-#if defined(JSON_HEDLEY_FLAGS_CAST)
-    #undef JSON_HEDLEY_FLAGS_CAST
-#endif
-#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
-#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
-        JSON_HEDLEY_DIAGNOSTIC_PUSH \
-        _Pragma("warning(disable:188)") \
-        ((T) (expr)); \
-        JSON_HEDLEY_DIAGNOSTIC_POP \
-    }))
-#else
-#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
-#endif
-
-#if defined(JSON_HEDLEY_EMPTY_BASES)
-    #undef JSON_HEDLEY_EMPTY_BASES
-#endif
-#if \
-    (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
-#else
-    #define JSON_HEDLEY_EMPTY_BASES
-#endif
-
-/* Remaining macros are deprecated. */
-
-#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
-    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
-#endif
-#if defined(__clang__)
-    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
-#else
-    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
-    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
-#endif
-#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
-    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
-    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
-#endif
-#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
-    #undef JSON_HEDLEY_CLANG_HAS_WARNING
-#endif
-#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
-
-#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
-
-
-// This file contains all internal macro definitions
-// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
-
-// exclude unsupported compilers
-#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
-    #if defined(__clang__)
-        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
-            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #endif
-#endif
-
-// C++ language standard detection
-// if the user manually specified the used c++ version this is skipped
-#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
-    #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
-        #define JSON_HAS_CPP_20
-        #define JSON_HAS_CPP_17
-        #define JSON_HAS_CPP_14
-    #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-        #define JSON_HAS_CPP_17
-        #define JSON_HAS_CPP_14
-    #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-        #define JSON_HAS_CPP_14
-    #endif
-    // the cpp 11 flag is always specified because it is the minimal required version
-    #define JSON_HAS_CPP_11
-#endif
-
-// disable documentation warnings on clang
-#if defined(__clang__)
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wdocumentation"
-    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
-#endif
-
-// allow to disable exceptions
-#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
-    #define JSON_THROW(exception) throw exception
-    #define JSON_TRY try
-    #define JSON_CATCH(exception) catch(exception)
-    #define JSON_INTERNAL_CATCH(exception) catch(exception)
-#else
-    #include <cstdlib>
-    #define JSON_THROW(exception) std::abort()
-    #define JSON_TRY if(true)
-    #define JSON_CATCH(exception) if(false)
-    #define JSON_INTERNAL_CATCH(exception) if(false)
-#endif
-
-// override exception macros
-#if defined(JSON_THROW_USER)
-    #undef JSON_THROW
-    #define JSON_THROW JSON_THROW_USER
-#endif
-#if defined(JSON_TRY_USER)
-    #undef JSON_TRY
-    #define JSON_TRY JSON_TRY_USER
-#endif
-#if defined(JSON_CATCH_USER)
-    #undef JSON_CATCH
-    #define JSON_CATCH JSON_CATCH_USER
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
-#endif
-#if defined(JSON_INTERNAL_CATCH_USER)
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
-#endif
-
-// allow to override assert
-#if !defined(JSON_ASSERT)
-    #include <cassert> // assert
-    #define JSON_ASSERT(x) assert(x)
-#endif
-
-// allow to access some private functions (needed by the test suite)
-#if defined(JSON_TESTS_PRIVATE)
-    #define JSON_PRIVATE_UNLESS_TESTED public
-#else
-    #define JSON_PRIVATE_UNLESS_TESTED private
-#endif
-
-/*!
-@brief macro to briefly define a mapping between an enum and JSON
-@def NLOHMANN_JSON_SERIALIZE_ENUM
-@since version 3.4.0
-*/
-#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
-    template<typename BasicJsonType>                                                            \
-    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
-    {                                                                                           \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
-        auto it = std::find_if(std::begin(m), std::end(m),                                      \
-                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
-        {                                                                                       \
-            return ej_pair.first == e;                                                          \
-        });                                                                                     \
-        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
-    }                                                                                           \
-    template<typename BasicJsonType>                                                            \
-    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
-    {                                                                                           \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
-        auto it = std::find_if(std::begin(m), std::end(m),                                      \
-                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
-        {                                                                                       \
-            return ej_pair.second == j;                                                         \
-        });                                                                                     \
-        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
-    }
-
-// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
-// may be removed in the future once the class is split.
-
-#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
-    template<template<typename, typename, typename...> class ObjectType,   \
-             template<typename, typename...> class ArrayType,              \
-             class StringType, class BooleanType, class NumberIntegerType, \
-             class NumberUnsignedType, class NumberFloatType,              \
-             template<typename> class AllocatorType,                       \
-             template<typename, typename = void> class JSONSerializer,     \
-             class BinaryType>
-
-#define NLOHMANN_BASIC_JSON_TPL                                            \
-    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
-    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
-    AllocatorType, JSONSerializer, BinaryType>
-
-// Macros to simplify conversion from/to types
-
-#define NLOHMANN_JSON_EXPAND( x ) x
-#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
-#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
-        NLOHMANN_JSON_PASTE64, \
-        NLOHMANN_JSON_PASTE63, \
-        NLOHMANN_JSON_PASTE62, \
-        NLOHMANN_JSON_PASTE61, \
-        NLOHMANN_JSON_PASTE60, \
-        NLOHMANN_JSON_PASTE59, \
-        NLOHMANN_JSON_PASTE58, \
-        NLOHMANN_JSON_PASTE57, \
-        NLOHMANN_JSON_PASTE56, \
-        NLOHMANN_JSON_PASTE55, \
-        NLOHMANN_JSON_PASTE54, \
-        NLOHMANN_JSON_PASTE53, \
-        NLOHMANN_JSON_PASTE52, \
-        NLOHMANN_JSON_PASTE51, \
-        NLOHMANN_JSON_PASTE50, \
-        NLOHMANN_JSON_PASTE49, \
-        NLOHMANN_JSON_PASTE48, \
-        NLOHMANN_JSON_PASTE47, \
-        NLOHMANN_JSON_PASTE46, \
-        NLOHMANN_JSON_PASTE45, \
-        NLOHMANN_JSON_PASTE44, \
-        NLOHMANN_JSON_PASTE43, \
-        NLOHMANN_JSON_PASTE42, \
-        NLOHMANN_JSON_PASTE41, \
-        NLOHMANN_JSON_PASTE40, \
-        NLOHMANN_JSON_PASTE39, \
-        NLOHMANN_JSON_PASTE38, \
-        NLOHMANN_JSON_PASTE37, \
-        NLOHMANN_JSON_PASTE36, \
-        NLOHMANN_JSON_PASTE35, \
-        NLOHMANN_JSON_PASTE34, \
-        NLOHMANN_JSON_PASTE33, \
-        NLOHMANN_JSON_PASTE32, \
-        NLOHMANN_JSON_PASTE31, \
-        NLOHMANN_JSON_PASTE30, \
-        NLOHMANN_JSON_PASTE29, \
-        NLOHMANN_JSON_PASTE28, \
-        NLOHMANN_JSON_PASTE27, \
-        NLOHMANN_JSON_PASTE26, \
-        NLOHMANN_JSON_PASTE25, \
-        NLOHMANN_JSON_PASTE24, \
-        NLOHMANN_JSON_PASTE23, \
-        NLOHMANN_JSON_PASTE22, \
-        NLOHMANN_JSON_PASTE21, \
-        NLOHMANN_JSON_PASTE20, \
-        NLOHMANN_JSON_PASTE19, \
-        NLOHMANN_JSON_PASTE18, \
-        NLOHMANN_JSON_PASTE17, \
-        NLOHMANN_JSON_PASTE16, \
-        NLOHMANN_JSON_PASTE15, \
-        NLOHMANN_JSON_PASTE14, \
-        NLOHMANN_JSON_PASTE13, \
-        NLOHMANN_JSON_PASTE12, \
-        NLOHMANN_JSON_PASTE11, \
-        NLOHMANN_JSON_PASTE10, \
-        NLOHMANN_JSON_PASTE9, \
-        NLOHMANN_JSON_PASTE8, \
-        NLOHMANN_JSON_PASTE7, \
-        NLOHMANN_JSON_PASTE6, \
-        NLOHMANN_JSON_PASTE5, \
-        NLOHMANN_JSON_PASTE4, \
-        NLOHMANN_JSON_PASTE3, \
-        NLOHMANN_JSON_PASTE2, \
-        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
-#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
-#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
-#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
-#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
-#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
-#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
-#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
-#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
-#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
-#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
-#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
-#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
-#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
-#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
-#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
-#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
-#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
-#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
-#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
-#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
-#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
-#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
-#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
-#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
-#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
-#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
-#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
-#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
-#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
-#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
-#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
-#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
-#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
-#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
-#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
-#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
-#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
-#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
-#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
-#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
-#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
-#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
-#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
-#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
-#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
-#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
-#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
-#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
-#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
-#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
-#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
-#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
-#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
-#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
-#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
-#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
-#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
-#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
-#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
-#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
-#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
-#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
-#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
-
-#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
-#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
-
-/*!
-@brief macro
-@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
-@since version 3.9.0
-*/
-#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
-    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
-    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
-
-/*!
-@brief macro
-@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
-@since version 3.9.0
-*/
-#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
-    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
-    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
-
-#ifndef JSON_USE_IMPLICIT_CONVERSIONS
-    #define JSON_USE_IMPLICIT_CONVERSIONS 1
-#endif
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    #define JSON_EXPLICIT
-#else
-    #define JSON_EXPLICIT explicit
-#endif
-
-#ifndef JSON_DIAGNOSTICS
-    #define JSON_DIAGNOSTICS 0
-#endif
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-/*!
-@brief replace all occurrences of a substring by another string
-
-@param[in,out] s  the string to manipulate; changed so that all
-               occurrences of @a f are replaced with @a t
-@param[in]     f  the substring to replace with @a t
-@param[in]     t  the string to replace @a f
-
-@pre The search string @a f must not be empty. **This precondition is
-enforced with an assertion.**
-
-@since version 2.0.0
-*/
-inline void replace_substring(std::string& s, const std::string& f,
-                              const std::string& t)
-{
-    JSON_ASSERT(!f.empty());
-    for (auto pos = s.find(f);                // find first occurrence of f
-            pos != std::string::npos;         // make sure f was found
-            s.replace(pos, f.size(), t),      // replace with t, and
-            pos = s.find(f, pos + t.size()))  // find next occurrence of f
-    {}
-}
-
-/*!
- * @brief string escaping as described in RFC 6901 (Sect. 4)
- * @param[in] s string to escape
- * @return    escaped string
- *
- * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
- */
-inline std::string escape(std::string s)
-{
-    replace_substring(s, "~", "~0");
-    replace_substring(s, "/", "~1");
-    return s;
-}
-
-/*!
- * @brief string unescaping as described in RFC 6901 (Sect. 4)
- * @param[in] s string to unescape
- * @return    unescaped string
- *
- * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
- */
-static void unescape(std::string& s)
-{
-    replace_substring(s, "~1", "/");
-    replace_substring(s, "~0", "~");
-}
-
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/input/position_t.hpp>
-
-
-#include <cstddef> // size_t
-
-namespace nlohmann
-{
-namespace detail
-{
-/// struct to capture the start position of the current token
-struct position_t
-{
-    /// the total number of characters read
-    std::size_t chars_read_total = 0;
-    /// the number of characters read in the current line
-    std::size_t chars_read_current_line = 0;
-    /// the number of lines read
-    std::size_t lines_read = 0;
-
-    /// conversion to size_t to preserve SAX interface
-    constexpr operator size_t() const
-    {
-        return chars_read_total;
-    }
-};
-
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-////////////////
-// exceptions //
-////////////////
-
-/*!
-@brief general exception of the @ref basic_json class
-
-This class is an extension of `std::exception` objects with a member @a id for
-exception ids. It is used as the base class for all exceptions thrown by the
-@ref basic_json class. This class can hence be used as "wildcard" to catch
-exceptions.
-
-Subclasses:
-- @ref parse_error for exceptions indicating a parse error
-- @ref invalid_iterator for exceptions indicating errors with iterators
-- @ref type_error for exceptions indicating executing a member function with
-                  a wrong type
-- @ref out_of_range for exceptions indicating access out of the defined range
-- @ref other_error for exceptions indicating other library errors
-
-@internal
-@note To have nothrow-copy-constructible exceptions, we internally use
-      `std::runtime_error` which can cope with arbitrary-length error messages.
-      Intermediate strings are built with static functions and then passed to
-      the actual constructor.
-@endinternal
-
-@liveexample{The following code shows how arbitrary library exceptions can be
-caught.,exception}
-
-@since version 3.0.0
-*/
-class exception : public std::exception
-{
-  public:
-    /// returns the explanatory string
-    const char* what() const noexcept override
-    {
-        return m.what();
-    }
-
-    /// the id of the exception
-    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
-
-  protected:
-    JSON_HEDLEY_NON_NULL(3)
-    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
-
-    static std::string name(const std::string& ename, int id_)
-    {
-        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
-    }
-
-    template<typename BasicJsonType>
-    static std::string diagnostics(const BasicJsonType& leaf_element)
-    {
-#if JSON_DIAGNOSTICS
-        std::vector<std::string> tokens;
-        for (const auto* current = &leaf_element; current->m_parent != nullptr; current = current->m_parent)
-        {
-            switch (current->m_parent->type())
-            {
-                case value_t::array:
-                {
-                    for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
-                    {
-                        if (&current->m_parent->m_value.array->operator[](i) == current)
-                        {
-                            tokens.emplace_back(std::to_string(i));
-                            break;
-                        }
-                    }
-                    break;
-                }
-
-                case value_t::object:
-                {
-                    for (const auto& element : *current->m_parent->m_value.object)
-                    {
-                        if (&element.second == current)
-                        {
-                            tokens.emplace_back(element.first.c_str());
-                            break;
-                        }
-                    }
-                    break;
-                }
-
-                case value_t::null: // LCOV_EXCL_LINE
-                case value_t::string: // LCOV_EXCL_LINE
-                case value_t::boolean: // LCOV_EXCL_LINE
-                case value_t::number_integer: // LCOV_EXCL_LINE
-                case value_t::number_unsigned: // LCOV_EXCL_LINE
-                case value_t::number_float: // LCOV_EXCL_LINE
-                case value_t::binary: // LCOV_EXCL_LINE
-                case value_t::discarded: // LCOV_EXCL_LINE
-                default:   // LCOV_EXCL_LINE
-                    break; // LCOV_EXCL_LINE
-            }
-        }
-
-        if (tokens.empty())
-        {
-            return "";
-        }
-
-        return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
-                                     [](const std::string & a, const std::string & b)
-        {
-            return a + "/" + detail::escape(b);
-        }) + ") ";
-#else
-        static_cast<void>(leaf_element);
-        return "";
-#endif
-    }
-
-  private:
-    /// an exception object as storage for error messages
-    std::runtime_error m;
-};
-
-/*!
-@brief exception indicating a parse error
-
-This exception is thrown by the library when a parse error occurs. Parse errors
-can occur during the deserialization of JSON text, CBOR, MessagePack, as well
-as when using JSON Patch.
-
-Member @a byte holds the byte index of the last read character in the input
-file.
-
-Exceptions have ids 1xx.
-
-name / id                      | example message | description
------------------------------- | --------------- | -------------------------
-json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
-json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
-json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
-json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
-json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
-json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
-json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
-json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
-json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
-json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
-json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
-json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
-json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
-json.exception.parse_error.115 | parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A | A UBJSON high-precision number could not be parsed.
-
-@note For an input with n bytes, 1 is the index of the first character and n+1
-      is the index of the terminating null byte or the end of file. This also
-      holds true when reading a byte vector (CBOR or MessagePack).
-
-@liveexample{The following code shows how a `parse_error` exception can be
-caught.,parse_error}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class parse_error : public exception
-{
-  public:
-    /*!
-    @brief create a parse error exception
-    @param[in] id_       the id of the exception
-    @param[in] pos       the position where the error occurred (or with
-                         chars_read_total=0 if the position cannot be
-                         determined)
-    @param[in] what_arg  the explanatory string
-    @return parse_error object
-    */
-    template<typename BasicJsonType>
-    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        position_string(pos) + ": " + exception::diagnostics(context) + what_arg;
-        return parse_error(id_, pos.chars_read_total, w.c_str());
-    }
-
-    template<typename BasicJsonType>
-    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
-                        ": " + exception::diagnostics(context) + what_arg;
-        return parse_error(id_, byte_, w.c_str());
-    }
-
-    /*!
-    @brief byte index of the parse error
-
-    The byte index of the last read character in the input file.
-
-    @note For an input with n bytes, 1 is the index of the first character and
-          n+1 is the index of the terminating null byte or the end of file.
-          This also holds true when reading a byte vector (CBOR or MessagePack).
-    */
-    const std::size_t byte;
-
-  private:
-    parse_error(int id_, std::size_t byte_, const char* what_arg)
-        : exception(id_, what_arg), byte(byte_) {}
-
-    static std::string position_string(const position_t& pos)
-    {
-        return " at line " + std::to_string(pos.lines_read + 1) +
-               ", column " + std::to_string(pos.chars_read_current_line);
-    }
-};
-
-/*!
-@brief exception indicating errors with iterators
-
-This exception is thrown if iterators passed to a library function do not match
-the expected semantics.
-
-Exceptions have ids 2xx.
-
-name / id                           | example message | description
------------------------------------ | --------------- | -------------------------
-json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
-json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
-json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
-json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
-json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
-json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
-json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
-json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
-json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
-json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
-json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
-json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
-json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
-json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
-
-@liveexample{The following code shows how an `invalid_iterator` exception can be
-caught.,invalid_iterator}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class invalid_iterator : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg;
-        return invalid_iterator(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    invalid_iterator(int id_, const char* what_arg)
-        : exception(id_, what_arg) {}
-};
-
-/*!
-@brief exception indicating executing a member function with a wrong type
-
-This exception is thrown in case of a type error; that is, a library function is
-executed on a JSON value whose type does not match the expected semantics.
-
-Exceptions have ids 3xx.
-
-name / id                     | example message | description
------------------------------ | --------------- | -------------------------
-json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
-json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
-json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &.
-json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
-json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
-json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
-json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
-json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
-json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
-json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
-json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
-json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
-json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
-json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
-json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
-json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
-json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) |
-
-@liveexample{The following code shows how a `type_error` exception can be
-caught.,type_error}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class type_error : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg;
-        return type_error(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/*!
-@brief exception indicating access out of the defined range
-
-This exception is thrown in case a library function is called on an input
-parameter that exceeds the expected range, for instance in case of array
-indices or nonexisting object keys.
-
-Exceptions have ids 4xx.
-
-name / id                       | example message | description
-------------------------------- | --------------- | -------------------------
-json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
-json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
-json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
-json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
-json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
-json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
-json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. (until version 3.8.0) |
-json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
-json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
-
-@liveexample{The following code shows how an `out_of_range` exception can be
-caught.,out_of_range}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class out_of_range : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg;
-        return out_of_range(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/*!
-@brief exception indicating other library errors
-
-This exception is thrown in case of errors that cannot be classified with the
-other exception types.
-
-Exceptions have ids 5xx.
-
-name / id                      | example message | description
------------------------------- | --------------- | -------------------------
-json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-
-@liveexample{The following code shows how an `other_error` exception can be
-caught.,other_error}
-
-@since version 3.0.0
-*/
-class other_error : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg;
-        return other_error(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-
-#include <cstddef> // size_t
-#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
-#include <utility> // index_sequence, make_index_sequence, index_sequence_for
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-template<typename T>
-using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-#ifdef JSON_HAS_CPP_14
-
-// the following utilities are natively available in C++14
-using std::enable_if_t;
-using std::index_sequence;
-using std::make_index_sequence;
-using std::index_sequence_for;
-
-#else
-
-// alias templates to reduce boilerplate
-template<bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
-// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
-
-//// START OF CODE FROM GOOGLE ABSEIL
-
-// integer_sequence
-//
-// Class template representing a compile-time integer sequence. An instantiation
-// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
-// type through its template arguments (which is a common need when
-// working with C++11 variadic templates). `absl::integer_sequence` is designed
-// to be a drop-in replacement for C++14's `std::integer_sequence`.
-//
-// Example:
-//
-//   template< class T, T... Ints >
-//   void user_function(integer_sequence<T, Ints...>);
-//
-//   int main()
-//   {
-//     // user_function's `T` will be deduced to `int` and `Ints...`
-//     // will be deduced to `0, 1, 2, 3, 4`.
-//     user_function(make_integer_sequence<int, 5>());
-//   }
-template <typename T, T... Ints>
-struct integer_sequence
-{
-    using value_type = T;
-    static constexpr std::size_t size() noexcept
-    {
-        return sizeof...(Ints);
-    }
-};
-
-// index_sequence
-//
-// A helper template for an `integer_sequence` of `size_t`,
-// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
-// `std::index_sequence`.
-template <size_t... Ints>
-using index_sequence = integer_sequence<size_t, Ints...>;
-
-namespace utility_internal
-{
-
-template <typename Seq, size_t SeqSize, size_t Rem>
-struct Extend;
-
-// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
-{
-    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
-};
-
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
-{
-    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
-};
-
-// Recursion helper for 'make_integer_sequence<T, N>'.
-// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
-template <typename T, size_t N>
-struct Gen
-{
-    using type =
-        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
-};
-
-template <typename T>
-struct Gen<T, 0>
-{
-    using type = integer_sequence<T>;
-};
-
-}  // namespace utility_internal
-
-// Compile-time sequences of integers
-
-// make_integer_sequence
-//
-// This template alias is equivalent to
-// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
-// replacement for C++14's `std::make_integer_sequence`.
-template <typename T, T N>
-using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
-
-// make_index_sequence
-//
-// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
-// and is designed to be a drop-in replacement for C++14's
-// `std::make_index_sequence`.
-template <size_t N>
-using make_index_sequence = make_integer_sequence<size_t, N>;
-
-// index_sequence_for
-//
-// Converts a typename pack into an index sequence of the same length, and
-// is designed to be a drop-in replacement for C++14's
-// `std::index_sequence_for()`
-template <typename... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-//// END OF CODE FROM GOOGLE ABSEIL
-
-#endif
-
-// dispatch utility (taken from ranges-v3)
-template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
-template<> struct priority_tag<0> {};
-
-// taken from ranges-v3
-template<typename T>
-struct static_const
-{
-    static constexpr T value{};
-};
-
-template<typename T>
-constexpr T static_const<T>::value;
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/identity_tag.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-// dispatching helper struct
-template <class T> struct identity_tag {};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-#include <limits> // numeric_limits
-#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
-#include <utility> // declval
-#include <tuple> // tuple
-
-// #include <nlohmann/detail/iterators/iterator_traits.hpp>
-
-
-#include <iterator> // random_access_iterator_tag
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename ...Ts> struct make_void
-{
-    using type = void;
-};
-template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
-} // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename It, typename = void>
-struct iterator_types {};
-
-template<typename It>
-struct iterator_types <
-    It,
-    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
-    typename It::reference, typename It::iterator_category >>
-{
-    using difference_type = typename It::difference_type;
-    using value_type = typename It::value_type;
-    using pointer = typename It::pointer;
-    using reference = typename It::reference;
-    using iterator_category = typename It::iterator_category;
-};
-
-// This is required as some compilers implement std::iterator_traits in a way that
-// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
-template<typename T, typename = void>
-struct iterator_traits
-{
-};
-
-template<typename T>
-struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
-            : iterator_types<T>
-{
-};
-
-template<typename T>
-struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
-{
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = T;
-    using difference_type = ptrdiff_t;
-    using pointer = T*;
-    using reference = T&;
-};
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-
-#include <type_traits>
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-
-
-// https://en.cppreference.com/w/cpp/experimental/is_detected
-namespace nlohmann
-{
-namespace detail
-{
-struct nonesuch
-{
-    nonesuch() = delete;
-    ~nonesuch() = delete;
-    nonesuch(nonesuch const&) = delete;
-    nonesuch(nonesuch const&&) = delete;
-    void operator=(nonesuch const&) = delete;
-    void operator=(nonesuch&&) = delete;
-};
-
-template<class Default,
-         class AlwaysVoid,
-         template<class...> class Op,
-         class... Args>
-struct detector
-{
-    using value_t = std::false_type;
-    using type = Default;
-};
-
-template<class Default, template<class...> class Op, class... Args>
-struct detector<Default, void_t<Op<Args...>>, Op, Args...>
-{
-    using value_t = std::true_type;
-    using type = Op<Args...>;
-};
-
-template<template<class...> class Op, class... Args>
-using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
-
-template<template<class...> class Op, class... Args>
-struct is_detected_lazy : is_detected<Op, Args...> { };
-
-template<template<class...> class Op, class... Args>
-using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
-
-template<class Default, template<class...> class Op, class... Args>
-using detected_or = detector<Default, void, Op, Args...>;
-
-template<class Default, template<class...> class Op, class... Args>
-using detected_or_t = typename detected_or<Default, Op, Args...>::type;
-
-template<class Expected, template<class...> class Op, class... Args>
-using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
-
-template<class To, template<class...> class Op, class... Args>
-using is_detected_convertible =
-    std::is_convertible<detected_t<Op, Args...>, To>;
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/json_fwd.hpp>
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>>
-class basic_json;
-
-/*!
-@brief JSON Pointer
-
-A JSON pointer defines a string syntax for identifying a specific value
-within a JSON document. It can be used with functions `at` and
-`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
-
-@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
-
-@since version 2.0.0
-*/
-template<typename BasicJsonType>
-class json_pointer;
-
-/*!
-@brief default JSON class
-
-This type is the default specialization of the @ref basic_json class which
-uses the standard template types.
-
-@since version 1.0.0
-*/
-using json = basic_json<>;
-
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
-
-/*!
-@brief ordered JSON class
-
-This type preserves the insertion order of object keys.
-
-@since version 3.9.0
-*/
-using ordered_json = basic_json<nlohmann::ordered_map>;
-
-}  // namespace nlohmann
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-
-namespace nlohmann
-{
-/*!
-@brief detail namespace with internal helper functions
-
-This namespace collects functions that should not be exposed,
-implementations of some @ref basic_json methods, and meta-programming helpers.
-
-@since version 2.1.0
-*/
-namespace detail
-{
-/////////////
-// helpers //
-/////////////
-
-// Note to maintainers:
-//
-// Every trait in this file expects a non CV-qualified type.
-// The only exceptions are in the 'aliases for detected' section
-// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
-//
-// In this case, T has to be properly CV-qualified to constraint the function arguments
-// (e.g. to_json(BasicJsonType&, const T&))
-
-template<typename> struct is_basic_json : std::false_type {};
-
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
-
-//////////////////////
-// json_ref helpers //
-//////////////////////
-
-template<typename>
-class json_ref;
-
-template<typename>
-struct is_json_ref : std::false_type {};
-
-template<typename T>
-struct is_json_ref<json_ref<T>> : std::true_type {};
-
-//////////////////////////
-// aliases for detected //
-//////////////////////////
-
-template<typename T>
-using mapped_type_t = typename T::mapped_type;
-
-template<typename T>
-using key_type_t = typename T::key_type;
-
-template<typename T>
-using value_type_t = typename T::value_type;
-
-template<typename T>
-using difference_type_t = typename T::difference_type;
-
-template<typename T>
-using pointer_t = typename T::pointer;
-
-template<typename T>
-using reference_t = typename T::reference;
-
-template<typename T>
-using iterator_category_t = typename T::iterator_category;
-
-template<typename T>
-using iterator_t = typename T::iterator;
-
-template<typename T, typename... Args>
-using to_json_function = decltype(T::to_json(std::declval<Args>()...));
-
-template<typename T, typename... Args>
-using from_json_function = decltype(T::from_json(std::declval<Args>()...));
-
-template<typename T, typename U>
-using get_template_function = decltype(std::declval<T>().template get<U>());
-
-// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
-template<typename BasicJsonType, typename T, typename = void>
-struct has_from_json : std::false_type {};
-
-// trait checking if j.get<T> is valid
-// use this trait instead of std::is_constructible or std::is_convertible,
-// both rely on, or make use of implicit conversions, and thus fail when T
-// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
-template <typename BasicJsonType, typename T>
-struct is_getable
-{
-    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
-};
-
-template<typename BasicJsonType, typename T>
-struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<void, from_json_function, serializer,
-        const BasicJsonType&, T&>::value;
-};
-
-// This trait checks if JSONSerializer<T>::from_json(json const&) exists
-// this overload is used for non-default-constructible user-defined-types
-template<typename BasicJsonType, typename T, typename = void>
-struct has_non_default_from_json : std::false_type {};
-
-template<typename BasicJsonType, typename T>
-struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<T, from_json_function, serializer,
-        const BasicJsonType&>::value;
-};
-
-// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
-// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
-template<typename BasicJsonType, typename T, typename = void>
-struct has_to_json : std::false_type {};
-
-template<typename BasicJsonType, typename T>
-struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
-        T>::value;
-};
-
-
-///////////////////
-// is_ functions //
-///////////////////
-
-// https://en.cppreference.com/w/cpp/types/conjunction
-template<class...> struct conjunction : std::true_type { };
-template<class B1> struct conjunction<B1> : B1 { };
-template<class B1, class... Bn>
-struct conjunction<B1, Bn...>
-: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
-
-// https://en.cppreference.com/w/cpp/types/negation
-template<class B> struct negation : std::integral_constant < bool, !B::value > { };
-
-// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
-// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
-// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
-template <typename T>
-struct is_default_constructible : std::is_default_constructible<T> {};
-
-template <typename T1, typename T2>
-struct is_default_constructible<std::pair<T1, T2>>
-            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
-
-template <typename T1, typename T2>
-struct is_default_constructible<const std::pair<T1, T2>>
-            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
-
-template <typename... Ts>
-struct is_default_constructible<std::tuple<Ts...>>
-            : conjunction<is_default_constructible<Ts>...> {};
-
-template <typename... Ts>
-struct is_default_constructible<const std::tuple<Ts...>>
-            : conjunction<is_default_constructible<Ts>...> {};
-
-
-template <typename T, typename... Args>
-struct is_constructible : std::is_constructible<T, Args...> {};
-
-template <typename T1, typename T2>
-struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
-
-template <typename T1, typename T2>
-struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
-
-template <typename... Ts>
-struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
-
-template <typename... Ts>
-struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
-
-
-template<typename T, typename = void>
-struct is_iterator_traits : std::false_type {};
-
-template<typename T>
-struct is_iterator_traits<iterator_traits<T>>
-{
-  private:
-    using traits = iterator_traits<T>;
-
-  public:
-    static constexpr auto value =
-        is_detected<value_type_t, traits>::value &&
-        is_detected<difference_type_t, traits>::value &&
-        is_detected<pointer_t, traits>::value &&
-        is_detected<iterator_category_t, traits>::value &&
-        is_detected<reference_t, traits>::value;
-};
-
-// The following implementation of is_complete_type is taken from
-// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
-// and is written by Xiang Fan who agreed to using it in this library.
-
-template<typename T, typename = void>
-struct is_complete_type : std::false_type {};
-
-template<typename T>
-struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
-
-template<typename BasicJsonType, typename CompatibleObjectType,
-         typename = void>
-struct is_compatible_object_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type_impl <
-    BasicJsonType, CompatibleObjectType,
-    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
-    is_detected<key_type_t, CompatibleObjectType>::value >>
-{
-    using object_t = typename BasicJsonType::object_t;
-
-    // macOS's is_constructible does not play well with nonesuch...
-    static constexpr bool value =
-        is_constructible<typename object_t::key_type,
-        typename CompatibleObjectType::key_type>::value &&
-        is_constructible<typename object_t::mapped_type,
-        typename CompatibleObjectType::mapped_type>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type
-    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
-
-template<typename BasicJsonType, typename ConstructibleObjectType,
-         typename = void>
-struct is_constructible_object_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename ConstructibleObjectType>
-struct is_constructible_object_type_impl <
-    BasicJsonType, ConstructibleObjectType,
-    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
-    is_detected<key_type_t, ConstructibleObjectType>::value >>
-{
-    using object_t = typename BasicJsonType::object_t;
-
-    static constexpr bool value =
-        (is_default_constructible<ConstructibleObjectType>::value &&
-         (std::is_move_assignable<ConstructibleObjectType>::value ||
-          std::is_copy_assignable<ConstructibleObjectType>::value) &&
-         (is_constructible<typename ConstructibleObjectType::key_type,
-          typename object_t::key_type>::value &&
-          std::is_same <
-          typename object_t::mapped_type,
-          typename ConstructibleObjectType::mapped_type >::value)) ||
-        (has_from_json<BasicJsonType,
-         typename ConstructibleObjectType::mapped_type>::value ||
-         has_non_default_from_json <
-         BasicJsonType,
-         typename ConstructibleObjectType::mapped_type >::value);
-};
-
-template<typename BasicJsonType, typename ConstructibleObjectType>
-struct is_constructible_object_type
-    : is_constructible_object_type_impl<BasicJsonType,
-      ConstructibleObjectType> {};
-
-template<typename BasicJsonType, typename CompatibleStringType,
-         typename = void>
-struct is_compatible_string_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleStringType>
-struct is_compatible_string_type_impl <
-    BasicJsonType, CompatibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, CompatibleStringType>::value >>
-{
-    static constexpr auto value =
-        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
-};
-
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_compatible_string_type
-    : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
-
-template<typename BasicJsonType, typename ConstructibleStringType,
-         typename = void>
-struct is_constructible_string_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type_impl <
-    BasicJsonType, ConstructibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, ConstructibleStringType>::value >>
-{
-    static constexpr auto value =
-        is_constructible<ConstructibleStringType,
-        typename BasicJsonType::string_t>::value;
-};
-
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type
-    : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
-
-template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
-struct is_compatible_array_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type_impl <
-    BasicJsonType, CompatibleArrayType,
-    enable_if_t < is_detected<value_type_t, CompatibleArrayType>::value&&
-    is_detected<iterator_t, CompatibleArrayType>::value&&
-// This is needed because json_reverse_iterator has a ::iterator type...
-// Therefore it is detected as a CompatibleArrayType.
-// The real fix would be to have an Iterable concept.
-    !is_iterator_traits <
-    iterator_traits<CompatibleArrayType >>::value >>
-{
-    static constexpr bool value =
-        is_constructible<BasicJsonType,
-        typename CompatibleArrayType::value_type>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type
-    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
-struct is_constructible_array_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t<std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value >>
-            : std::true_type {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t < !std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value&&
-    is_default_constructible<ConstructibleArrayType>::value&&
-(std::is_move_assignable<ConstructibleArrayType>::value ||
- std::is_copy_assignable<ConstructibleArrayType>::value)&&
-is_detected<value_type_t, ConstructibleArrayType>::value&&
-is_detected<iterator_t, ConstructibleArrayType>::value&&
-is_complete_type <
-detected_t<value_type_t, ConstructibleArrayType >>::value >>
-{
-    static constexpr bool value =
-        // This is needed because json_reverse_iterator has a ::iterator type,
-        // furthermore, std::back_insert_iterator (and other iterators) have a
-        // base class `iterator`... Therefore it is detected as a
-        // ConstructibleArrayType. The real fix would be to have an Iterable
-        // concept.
-        !is_iterator_traits<iterator_traits<ConstructibleArrayType>>::value &&
-
-        (std::is_same<typename ConstructibleArrayType::value_type,
-         typename BasicJsonType::array_t::value_type>::value ||
-         has_from_json<BasicJsonType,
-         typename ConstructibleArrayType::value_type>::value ||
-         has_non_default_from_json <
-         BasicJsonType, typename ConstructibleArrayType::value_type >::value);
-};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type
-    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType,
-         typename = void>
-struct is_compatible_integer_type_impl : std::false_type {};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type_impl <
-    RealIntegerType, CompatibleNumberIntegerType,
-    enable_if_t < std::is_integral<RealIntegerType>::value&&
-    std::is_integral<CompatibleNumberIntegerType>::value&&
-    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
-{
-    // is there an assert somewhere on overflows?
-    using RealLimits = std::numeric_limits<RealIntegerType>;
-    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
-
-    static constexpr auto value =
-        is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value &&
-        CompatibleLimits::is_integer &&
-        RealLimits::is_signed == CompatibleLimits::is_signed;
-};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type
-    : is_compatible_integer_type_impl<RealIntegerType,
-      CompatibleNumberIntegerType> {};
-
-template<typename BasicJsonType, typename CompatibleType, typename = void>
-struct is_compatible_type_impl: std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type_impl <
-    BasicJsonType, CompatibleType,
-    enable_if_t<is_complete_type<CompatibleType>::value >>
-{
-    static constexpr bool value =
-        has_to_json<BasicJsonType, CompatibleType>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type
-    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
-
-template<typename T1, typename T2>
-struct is_constructible_tuple : std::false_type {};
-
-template<typename T1, typename... Args>
-struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
-
-// a naive helper to check if a type is an ordered_map (exploits the fact that
-// ordered_map inherits capacity() from std::vector)
-template <typename T>
-struct is_ordered_map
-{
-    using one = char;
-
-    struct two
-    {
-        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-    };
-
-    template <typename C> static one test( decltype(&C::capacity) ) ;
-    template <typename C> static two test(...);
-
-    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-};
-
-// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
-template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
-T conditional_static_cast(U value)
-{
-    return static_cast<T>(value);
-}
-
-template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
-T conditional_static_cast(U value)
-{
-    return value;
-}
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
-    {
-        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name()), j));
-    }
-    n = nullptr;
-}
-
-// overloads for basic_json template parameters
-template < typename BasicJsonType, typename ArithmeticType,
-           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
-                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-                         int > = 0 >
-void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-
-        case value_t::null:
-        case value_t::object:
-        case value_t::array:
-        case value_t::string:
-        case value_t::boolean:
-        case value_t::binary:
-        case value_t::discarded:
-        default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
-    }
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
-    {
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name()), j));
-    }
-    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
-    }
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template <
-    typename BasicJsonType, typename ConstructibleStringType,
-    enable_if_t <
-        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value&&
-        !std::is_same<typename BasicJsonType::string_t,
-                      ConstructibleStringType>::value,
-        int > = 0 >
-void from_json(const BasicJsonType& j, ConstructibleStringType& s)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
-    }
-
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType, typename EnumType,
-         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void from_json(const BasicJsonType& j, EnumType& e)
-{
-    typename std::underlying_type<EnumType>::type val;
-    get_arithmetic_value(j, val);
-    e = static_cast<EnumType>(val);
-}
-
-// forward_list doesn't have an insert method
-template<typename BasicJsonType, typename T, typename Allocator,
-         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-    l.clear();
-    std::transform(j.rbegin(), j.rend(),
-                   std::front_inserter(l), [](const BasicJsonType & i)
-    {
-        return i.template get<T>();
-    });
-}
-
-// valarray doesn't have an insert method
-template<typename BasicJsonType, typename T,
-         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::valarray<T>& l)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-    l.resize(j.size());
-    std::transform(j.begin(), j.end(), std::begin(l),
-                   [](const BasicJsonType & elem)
-    {
-        return elem.template get<T>();
-    });
-}
-
-template<typename BasicJsonType, typename T, std::size_t N>
-auto from_json(const BasicJsonType& j, T (&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
-    {
-        arr[i] = j.at(i).template get<T>();
-    }
-}
-
-template<typename BasicJsonType>
-void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
-{
-    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
-}
-
-template<typename BasicJsonType, typename T, std::size_t N>
-auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
-                          priority_tag<2> /*unused*/)
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
-    {
-        arr[i] = j.at(i).template get<T>();
-    }
-}
-
-template<typename BasicJsonType, typename ConstructibleArrayType,
-         enable_if_t<
-             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
-             int> = 0>
-auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
--> decltype(
-    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
-    j.template get<typename ConstructibleArrayType::value_type>(),
-    void())
-{
-    using std::end;
-
-    ConstructibleArrayType ret;
-    ret.reserve(j.size());
-    std::transform(j.begin(), j.end(),
-                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename ConstructibleArrayType::value_type>();
-    });
-    arr = std::move(ret);
-}
-
-template<typename BasicJsonType, typename ConstructibleArrayType,
-         enable_if_t<
-             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
-             int> = 0>
-void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
-                          priority_tag<0> /*unused*/)
-{
-    using std::end;
-
-    ConstructibleArrayType ret;
-    std::transform(
-        j.begin(), j.end(), std::inserter(ret, end(ret)),
-        [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename ConstructibleArrayType::value_type>();
-    });
-    arr = std::move(ret);
-}
-
-template < typename BasicJsonType, typename ConstructibleArrayType,
-           enable_if_t <
-               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
-               !is_basic_json<ConstructibleArrayType>::value,
-               int > = 0 >
-auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
--> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
-j.template get<typename ConstructibleArrayType::value_type>(),
-void())
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-
-    from_json_array_impl(j, arr, priority_tag<3> {});
-}
-
-template < typename BasicJsonType, typename T, std::size_t... Idx >
-std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
-        identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
-{
-    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
-}
-
-template < typename BasicJsonType, typename T, std::size_t N >
-auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
--> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-
-    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
-    {
-        JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name()), j));
-    }
-
-    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
-}
-
-template<typename BasicJsonType, typename ConstructibleObjectType,
-         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
-void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
-    {
-        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name()), j));
-    }
-
-    ConstructibleObjectType ret;
-    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
-    using value_type = typename ConstructibleObjectType::value_type;
-    std::transform(
-        inner_object->begin(), inner_object->end(),
-        std::inserter(ret, ret.begin()),
-        [](typename BasicJsonType::object_t::value_type const & p)
-    {
-        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
-    });
-    obj = std::move(ret);
-}
-
-// overload for arithmetic types, not chosen for basic_json template arguments
-// (BooleanType, etc..); note: Is it really necessary to provide explicit
-// overloads for boolean_t etc. in case of a custom BooleanType which is not
-// an arithmetic type?
-template < typename BasicJsonType, typename ArithmeticType,
-           enable_if_t <
-               std::is_arithmetic<ArithmeticType>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-               int > = 0 >
-void from_json(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-        case value_t::boolean:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
-            break;
-        }
-
-        case value_t::null:
-        case value_t::object:
-        case value_t::array:
-        case value_t::string:
-        case value_t::binary:
-        case value_t::discarded:
-        default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
-    }
-}
-
-template<typename BasicJsonType, typename... Args, std::size_t... Idx>
-std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
-{
-    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
-}
-
-template < typename BasicJsonType, class A1, class A2 >
-std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
-{
-    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
-            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
-}
-
-template<typename BasicJsonType, typename A1, typename A2>
-void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
-{
-    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
-}
-
-template<typename BasicJsonType, typename... Args>
-std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
-{
-    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
-}
-
-template<typename BasicJsonType, typename... Args>
-void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
-{
-    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
-}
-
-template<typename BasicJsonType, typename TupleRelated>
-auto from_json(BasicJsonType&& j, TupleRelated&& t)
--> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-
-    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
-}
-
-template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
-           typename = enable_if_t < !std::is_constructible <
-                                        typename BasicJsonType::string_t, Key >::value >>
-void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-    m.clear();
-    for (const auto& p : j)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
-    }
-}
-
-template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
-           typename = enable_if_t < !std::is_constructible <
-                                        typename BasicJsonType::string_t, Key >::value >>
-void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-    m.clear();
-    for (const auto& p : j)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
-    }
-}
-
-struct from_json_fn
-{
-    template<typename BasicJsonType, typename T>
-    auto operator()(const BasicJsonType& j, T&& val) const
-    noexcept(noexcept(from_json(j, std::forward<T>(val))))
-    -> decltype(from_json(j, std::forward<T>(val)))
-    {
-        return from_json(j, std::forward<T>(val));
-    }
-};
-}  // namespace detail
-
-/// namespace to hold default `from_json` function
-/// to see why this is required:
-/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
-{
-constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value; // NOLINT(misc-definitions-in-headers)
-} // namespace
-} // namespace nlohmann
-
-// #include <nlohmann/detail/conversions/to_json.hpp>
-
-
-#include <algorithm> // copy
-#include <iterator> // begin, end
-#include <string> // string
-#include <tuple> // tuple, get
-#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
-#include <utility> // move, forward, declval, pair
-#include <valarray> // valarray
-#include <vector> // vector
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
-
-#include <cstddef> // size_t
-#include <iterator> // input_iterator_tag
-#include <string> // string, to_string
-#include <tuple> // tuple_size, get, tuple_element
-#include <utility> // move
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename string_type>
-void int_to_string( string_type& target, std::size_t value )
-{
-    // For ADL
-    using std::to_string;
-    target = to_string(value);
-}
-template<typename IteratorType> class iteration_proxy_value
-{
-  public:
-    using difference_type = std::ptrdiff_t;
-    using value_type = iteration_proxy_value;
-    using pointer = value_type * ;
-    using reference = value_type & ;
-    using iterator_category = std::input_iterator_tag;
-    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
-
-  private:
-    /// the iterator
-    IteratorType anchor;
-    /// an index for arrays (used to create key names)
-    std::size_t array_index = 0;
-    /// last stringified array index
-    mutable std::size_t array_index_last = 0;
-    /// a string representation of the array index
-    mutable string_type array_index_str = "0";
-    /// an empty string (to return a reference for primitive values)
-    const string_type empty_str{};
-
-  public:
-    explicit iteration_proxy_value(IteratorType it) noexcept
-        : anchor(std::move(it))
-    {}
-
-    /// dereference operator (needed for range-based for)
-    iteration_proxy_value& operator*()
-    {
-        return *this;
-    }
-
-    /// increment operator (needed for range-based for)
-    iteration_proxy_value& operator++()
-    {
-        ++anchor;
-        ++array_index;
-
-        return *this;
-    }
-
-    /// equality operator (needed for InputIterator)
-    bool operator==(const iteration_proxy_value& o) const
-    {
-        return anchor == o.anchor;
-    }
-
-    /// inequality operator (needed for range-based for)
-    bool operator!=(const iteration_proxy_value& o) const
-    {
-        return anchor != o.anchor;
-    }
-
-    /// return key of the iterator
-    const string_type& key() const
-    {
-        JSON_ASSERT(anchor.m_object != nullptr);
-
-        switch (anchor.m_object->type())
-        {
-            // use integer array index as key
-            case value_t::array:
-            {
-                if (array_index != array_index_last)
-                {
-                    int_to_string( array_index_str, array_index );
-                    array_index_last = array_index;
-                }
-                return array_index_str;
-            }
-
-            // use key from the object
-            case value_t::object:
-                return anchor.key();
-
-            // use an empty key for all primitive types
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return empty_str;
-        }
-    }
-
-    /// return value of the iterator
-    typename IteratorType::reference value() const
-    {
-        return anchor.value();
-    }
-};
-
-/// proxy class for the items() function
-template<typename IteratorType> class iteration_proxy
-{
-  private:
-    /// the container to iterate
-    typename IteratorType::reference container;
-
-  public:
-    /// construct iteration proxy from a container
-    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
-        : container(cont) {}
-
-    /// return iterator begin (needed for range-based for)
-    iteration_proxy_value<IteratorType> begin() noexcept
-    {
-        return iteration_proxy_value<IteratorType>(container.begin());
-    }
-
-    /// return iterator end (needed for range-based for)
-    iteration_proxy_value<IteratorType> end() noexcept
-    {
-        return iteration_proxy_value<IteratorType>(container.end());
-    }
-};
-// Structured Bindings Support
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
-auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
-{
-    return i.key();
-}
-// Structured Bindings Support
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
-auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
-{
-    return i.value();
-}
-}  // namespace detail
-}  // namespace nlohmann
-
-// The Addition to the STD Namespace is required to add
-// Structured Bindings Support to the iteration_proxy_value class
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-namespace std
-{
-#if defined(__clang__)
-    // Fix: https://github.com/nlohmann/json/issues/1401
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wmismatched-tags"
-#endif
-template<typename IteratorType>
-class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
-            : public std::integral_constant<std::size_t, 2> {};
-
-template<std::size_t N, typename IteratorType>
-class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
-{
-  public:
-    using type = decltype(
-                     get<N>(std::declval <
-                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
-};
-#if defined(__clang__)
-    #pragma clang diagnostic pop
-#endif
-} // namespace std
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-//////////////////
-// constructors //
-//////////////////
-
-/*
- * Note all external_constructor<>::construct functions need to call
- * j.m_value.destroy(j.m_type) to avoid a memory leak in case j contains an
- * allocated value (e.g., a string). See bug issue
- * https://github.com/nlohmann/json/issues/2865 for more information.
- */
-
-template<value_t> struct external_constructor;
-
-template<>
-struct external_constructor<value_t::boolean>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::boolean;
-        j.m_value = b;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::string>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value = s;
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value = std::move(s);
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleStringType,
-               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
-                             int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleStringType& str)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::binary>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::binary;
-        j.m_value = typename BasicJsonType::binary_t(b);
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::binary;
-        j.m_value = typename BasicJsonType::binary_t(std::move(b));
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_float>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_float;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_unsigned>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_unsigned;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_integer>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_integer;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::array>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = arr;
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = std::move(arr);
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleArrayType,
-               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
-                             int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
-    {
-        using std::begin;
-        using std::end;
-
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->reserve(arr.size());
-        for (const bool x : arr)
-        {
-            j.m_value.array->push_back(x);
-            j.set_parent(j.m_value.array->back());
-        }
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename T,
-             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->resize(arr.size());
-        if (arr.size() > 0)
-        {
-            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
-        }
-        j.set_parents();
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::object>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value = obj;
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value = std::move(obj);
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleObjectType,
-               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
-    {
-        using std::begin;
-        using std::end;
-
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
-        j.set_parents();
-        j.assert_invariant();
-    }
-};
-
-/////////////
-// to_json //
-/////////////
-
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
-void to_json(BasicJsonType& j, T b) noexcept
-{
-    external_constructor<value_t::boolean>::construct(j, b);
-}
-
-template<typename BasicJsonType, typename CompatibleString,
-         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
-void to_json(BasicJsonType& j, const CompatibleString& s)
-{
-    external_constructor<value_t::string>::construct(j, s);
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
-{
-    external_constructor<value_t::string>::construct(j, std::move(s));
-}
-
-template<typename BasicJsonType, typename FloatType,
-         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
-void to_json(BasicJsonType& j, FloatType val) noexcept
-{
-    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
-}
-
-template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
-         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
-{
-    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
-}
-
-template<typename BasicJsonType, typename CompatibleNumberIntegerType,
-         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
-{
-    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
-}
-
-template<typename BasicJsonType, typename EnumType,
-         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void to_json(BasicJsonType& j, EnumType e) noexcept
-{
-    using underlying_type = typename std::underlying_type<EnumType>::type;
-    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const std::vector<bool>& e)
-{
-    external_constructor<value_t::array>::construct(j, e);
-}
-
-template < typename BasicJsonType, typename CompatibleArrayType,
-           enable_if_t < is_compatible_array_type<BasicJsonType,
-                         CompatibleArrayType>::value&&
-                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
-                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
-                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
-                         !is_basic_json<CompatibleArrayType>::value,
-                         int > = 0 >
-void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
-{
-    external_constructor<value_t::binary>::construct(j, bin);
-}
-
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-void to_json(BasicJsonType& j, const std::valarray<T>& arr)
-{
-    external_constructor<value_t::array>::construct(j, std::move(arr));
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
-{
-    external_constructor<value_t::array>::construct(j, std::move(arr));
-}
-
-template < typename BasicJsonType, typename CompatibleObjectType,
-           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
-void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
-{
-    external_constructor<value_t::object>::construct(j, obj);
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
-{
-    external_constructor<value_t::object>::construct(j, std::move(obj));
-}
-
-template <
-    typename BasicJsonType, typename T, std::size_t N,
-    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
-                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-                  int > = 0 >
-void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
-void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
-{
-    j = { p.first, p.second };
-}
-
-// for https://github.com/nlohmann/json/pull/1134
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
-void to_json(BasicJsonType& j, const T& b)
-{
-    j = { {b.key(), b.value()} };
-}
-
-template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
-{
-    j = { std::get<Idx>(t)... };
-}
-
-template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
-void to_json(BasicJsonType& j, const T& t)
-{
-    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
-}
-
-struct to_json_fn
-{
-    template<typename BasicJsonType, typename T>
-    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
-    -> decltype(to_json(j, std::forward<T>(val)), void())
-    {
-        return to_json(j, std::forward<T>(val));
-    }
-};
-}  // namespace detail
-
-/// namespace to hold default `to_json` function
-/// to see why this is required:
-/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
-{
-constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value; // NOLINT(misc-definitions-in-headers)
-} // namespace
-} // namespace nlohmann
-
-// #include <nlohmann/detail/meta/identity_tag.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-
-template<typename ValueType, typename>
-struct adl_serializer
-{
-    /*!
-    @brief convert a JSON value to any value type
-
-    This function is usually called by the `get()` function of the
-    @ref basic_json class (either explicit or via conversion operators).
-
-    @note This function is chosen for default-constructible value types.
-
-    @param[in] j        JSON value to read from
-    @param[in,out] val  value to write to
-    */
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
-        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
-    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
-    {
-        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
-    }
-
-    /*!
-    @brief convert a JSON value to any value type
-
-    This function is usually called by the `get()` function of the
-    @ref basic_json class (either explicit or via conversion operators).
-
-    @note This function is chosen for value types which are not default-constructible.
-
-    @param[in] j  JSON value to read from
-
-    @return copy of the JSON value, converted to @a ValueType
-    */
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto from_json(BasicJsonType && j) noexcept(
-    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
-    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
-    {
-        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
-    }
-
-    /*!
-    @brief convert any value type to a JSON value
-
-    This function is usually called by the constructors of the @ref basic_json
-    class.
-
-    @param[in,out] j  JSON value to write to
-    @param[in] val    value to read from
-    */
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
-        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
-    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
-    {
-        ::nlohmann::to_json(j, std::forward<TargetType>(val));
-    }
-};
-}  // namespace nlohmann
-
-// #include <nlohmann/byte_container_with_subtype.hpp>
-
-
-#include <cstdint> // uint8_t, uint64_t
-#include <tuple> // tie
-#include <utility> // move
-
-namespace nlohmann
-{
-
-/*!
-@brief an internal type for a backed binary type
-
-This type extends the template parameter @a BinaryType provided to `basic_json`
-with a subtype used by BSON and MessagePack. This type exists so that the user
-does not have to specify a type themselves with a specific naming scheme in
-order to override the binary type.
-
-@tparam BinaryType container to store bytes (`std::vector<std::uint8_t>` by
-                   default)
-
-@since version 3.8.0; changed type of subtypes to std::uint64_t in 3.10.0.
-*/
-template<typename BinaryType>
-class byte_container_with_subtype : public BinaryType
-{
-  public:
-    /// the type of the underlying container
-    using container_type = BinaryType;
-    /// the type of the subtype
-    using subtype_type = std::uint64_t;
-
-    byte_container_with_subtype() noexcept(noexcept(container_type()))
-        : container_type()
-    {}
-
-    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
-        : container_type(b)
-    {}
-
-    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
-        : container_type(std::move(b))
-    {}
-
-    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
-        : container_type(b)
-        , m_subtype(subtype_)
-        , m_has_subtype(true)
-    {}
-
-    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
-        : container_type(std::move(b))
-        , m_subtype(subtype_)
-        , m_has_subtype(true)
-    {}
-
-    bool operator==(const byte_container_with_subtype& rhs) const
-    {
-        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
-               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
-    }
-
-    bool operator!=(const byte_container_with_subtype& rhs) const
-    {
-        return !(rhs == *this);
-    }
-
-    /*!
-    @brief sets the binary subtype
-
-    Sets the binary subtype of the value, also flags a binary JSON value as
-    having a subtype, which has implications for serialization.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa see @ref subtype() -- return the binary subtype
-    @sa see @ref clear_subtype() -- clears the binary subtype
-    @sa see @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
-
-    @since version 3.8.0
-    */
-    void set_subtype(subtype_type subtype_) noexcept
-    {
-        m_subtype = subtype_;
-        m_has_subtype = true;
-    }
-
-    /*!
-    @brief return the binary subtype
-
-    Returns the numerical subtype of the value if it has a subtype. If it does
-    not have a subtype, this function will return subtype_type(-1) as a sentinel
-    value.
-
-    @return the numerical subtype of the binary value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa see @ref set_subtype() -- sets the binary subtype
-    @sa see @ref clear_subtype() -- clears the binary subtype
-    @sa see @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
-
-    @since version 3.8.0; fixed return value to properly return
-           subtype_type(-1) as documented in version 3.10.0
-    */
-    constexpr subtype_type subtype() const noexcept
-    {
-        return m_has_subtype ? m_subtype : subtype_type(-1);
-    }
-
-    /*!
-    @brief return whether the value has a subtype
-
-    @return whether the value has a subtype
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa see @ref subtype() -- return the binary subtype
-    @sa see @ref set_subtype() -- sets the binary subtype
-    @sa see @ref clear_subtype() -- clears the binary subtype
-
-    @since version 3.8.0
-    */
-    constexpr bool has_subtype() const noexcept
-    {
-        return m_has_subtype;
-    }
-
-    /*!
-    @brief clears the binary subtype
-
-    Clears the binary subtype and flags the value as not having a subtype, which
-    has implications for serialization; for instance MessagePack will prefer the
-    bin family over the ext family.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa see @ref subtype() -- return the binary subtype
-    @sa see @ref set_subtype() -- sets the binary subtype
-    @sa see @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
-
-    @since version 3.8.0
-    */
-    void clear_subtype() noexcept
-    {
-        m_subtype = 0;
-        m_has_subtype = false;
-    }
-
-  private:
-    subtype_type m_subtype = 0;
-    bool m_has_subtype = false;
-};
-
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/conversions/from_json.hpp>
-
-// #include <nlohmann/detail/conversions/to_json.hpp>
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/hash.hpp>
-
-
-#include <cstdint> // uint8_t
-#include <cstddef> // size_t
-#include <functional> // hash
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-// boost::hash_combine
-inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
-{
-    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
-    return seed;
-}
-
-/*!
-@brief hash a JSON value
-
-The hash function tries to rely on std::hash where possible. Furthermore, the
-type of the JSON value is taken into account to have different hash values for
-null, 0, 0U, and false, etc.
-
-@tparam BasicJsonType basic_json specialization
-@param j JSON value to hash
-@return hash value of j
-*/
-template<typename BasicJsonType>
-std::size_t hash(const BasicJsonType& j)
-{
-    using string_t = typename BasicJsonType::string_t;
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-
-    const auto type = static_cast<std::size_t>(j.type());
-    switch (j.type())
-    {
-        case BasicJsonType::value_t::null:
-        case BasicJsonType::value_t::discarded:
-        {
-            return combine(type, 0);
-        }
-
-        case BasicJsonType::value_t::object:
-        {
-            auto seed = combine(type, j.size());
-            for (const auto& element : j.items())
-            {
-                const auto h = std::hash<string_t> {}(element.key());
-                seed = combine(seed, h);
-                seed = combine(seed, hash(element.value()));
-            }
-            return seed;
-        }
-
-        case BasicJsonType::value_t::array:
-        {
-            auto seed = combine(type, j.size());
-            for (const auto& element : j)
-            {
-                seed = combine(seed, hash(element));
-            }
-            return seed;
-        }
-
-        case BasicJsonType::value_t::string:
-        {
-            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::boolean:
-        {
-            const auto h = std::hash<bool> {}(j.template get<bool>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_integer:
-        {
-            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_unsigned:
-        {
-            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_float:
-        {
-            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::binary:
-        {
-            auto seed = combine(type, j.get_binary().size());
-            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
-            seed = combine(seed, h);
-            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
-            for (const auto byte : j.get_binary())
-            {
-                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
-            }
-            return seed;
-        }
-
-        default:                   // LCOV_EXCL_LINE
-            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            return 0;              // LCOV_EXCL_LINE
-    }
-}
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/binary_reader.hpp>
-
-
-#include <algorithm> // generate_n
-#include <array> // array
-#include <cmath> // ldexp
-#include <cstddef> // size_t
-#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstdio> // snprintf
-#include <cstring> // memcpy
-#include <iterator> // back_inserter
-#include <limits> // numeric_limits
-#include <string> // char_traits, string
-#include <utility> // make_pair, move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-
-#include <array> // array
-#include <cstddef> // size_t
-#include <cstring> // strlen
-#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
-#include <memory> // shared_ptr, make_shared, addressof
-#include <numeric> // accumulate
-#include <string> // string, char_traits
-#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
-#include <utility> // pair, declval
-
-#ifndef JSON_NO_IO
-    #include <cstdio>   // FILE *
-    #include <istream>  // istream
-#endif                  // JSON_NO_IO
-
-// #include <nlohmann/detail/iterators/iterator_traits.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/// the supported input formats
-enum class input_format_t { json, cbor, msgpack, ubjson, bson };
-
-////////////////////
-// input adapters //
-////////////////////
-
-#ifndef JSON_NO_IO
-/*!
-Input adapter for stdio file access. This adapter read only 1 byte and do not use any
- buffer. This adapter is a very low level adapter.
-*/
-class file_input_adapter
-{
-  public:
-    using char_type = char;
-
-    JSON_HEDLEY_NON_NULL(2)
-    explicit file_input_adapter(std::FILE* f) noexcept
-        : m_file(f)
-    {}
-
-    // make class move-only
-    file_input_adapter(const file_input_adapter&) = delete;
-    file_input_adapter(file_input_adapter&&) noexcept = default;
-    file_input_adapter& operator=(const file_input_adapter&) = delete;
-    file_input_adapter& operator=(file_input_adapter&&) = delete;
-    ~file_input_adapter() = default;
-
-    std::char_traits<char>::int_type get_character() noexcept
-    {
-        return std::fgetc(m_file);
-    }
-
-  private:
-    /// the file pointer to read from
-    std::FILE* m_file;
-};
-
-
-/*!
-Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
-beginning of input. Does not support changing the underlying std::streambuf
-in mid-input. Maintains underlying std::istream and std::streambuf to support
-subsequent use of standard std::istream operations to process any input
-characters following those used in parsing the JSON input.  Clears the
-std::istream flags; any input errors (e.g., EOF) will be detected by the first
-subsequent call for input from the std::istream.
-*/
-class input_stream_adapter
-{
-  public:
-    using char_type = char;
-
-    ~input_stream_adapter()
-    {
-        // clear stream flags; we use underlying streambuf I/O, do not
-        // maintain ifstream flags, except eof
-        if (is != nullptr)
-        {
-            is->clear(is->rdstate() & std::ios::eofbit);
-        }
-    }
-
-    explicit input_stream_adapter(std::istream& i)
-        : is(&i), sb(i.rdbuf())
-    {}
-
-    // delete because of pointer members
-    input_stream_adapter(const input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
-
-    input_stream_adapter(input_stream_adapter&& rhs) noexcept
-        : is(rhs.is), sb(rhs.sb)
-    {
-        rhs.is = nullptr;
-        rhs.sb = nullptr;
-    }
-
-    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
-    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
-    // end up as the same value, eg. 0xFFFFFFFF.
-    std::char_traits<char>::int_type get_character()
-    {
-        auto res = sb->sbumpc();
-        // set eof manually, as we don't use the istream interface.
-        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
-        {
-            is->clear(is->rdstate() | std::ios::eofbit);
-        }
-        return res;
-    }
-
-  private:
-    /// the associated input stream
-    std::istream* is = nullptr;
-    std::streambuf* sb = nullptr;
-};
-#endif  // JSON_NO_IO
-
-// General-purpose iterator-based adapter. It might not be as fast as
-// theoretically possible for some containers, but it is extremely versatile.
-template<typename IteratorType>
-class iterator_input_adapter
-{
-  public:
-    using char_type = typename std::iterator_traits<IteratorType>::value_type;
-
-    iterator_input_adapter(IteratorType first, IteratorType last)
-        : current(std::move(first)), end(std::move(last))
-    {}
-
-    typename std::char_traits<char_type>::int_type get_character()
-    {
-        if (JSON_HEDLEY_LIKELY(current != end))
-        {
-            auto result = std::char_traits<char_type>::to_int_type(*current);
-            std::advance(current, 1);
-            return result;
-        }
-
-        return std::char_traits<char_type>::eof();
-    }
-
-  private:
-    IteratorType current;
-    IteratorType end;
-
-    template<typename BaseInputAdapter, size_t T>
-    friend struct wide_string_input_helper;
-
-    bool empty() const
-    {
-        return current == end;
-    }
-};
-
-
-template<typename BaseInputAdapter, size_t T>
-struct wide_string_input_helper;
-
-template<typename BaseInputAdapter>
-struct wide_string_input_helper<BaseInputAdapter, 4>
-{
-    // UTF-32
-    static void fill_buffer(BaseInputAdapter& input,
-                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
-                            size_t& utf8_bytes_index,
-                            size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (JSON_HEDLEY_UNLIKELY(input.empty()))
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const auto wc = input.get_character();
-
-            // UTF-32 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 2;
-            }
-            else if (wc <= 0xFFFF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 3;
-            }
-            else if (wc <= 0x10FFFF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 4;
-            }
-            else
-            {
-                // unknown character
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-        }
-    }
-};
-
-template<typename BaseInputAdapter>
-struct wide_string_input_helper<BaseInputAdapter, 2>
-{
-    // UTF-16
-    static void fill_buffer(BaseInputAdapter& input,
-                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
-                            size_t& utf8_bytes_index,
-                            size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (JSON_HEDLEY_UNLIKELY(input.empty()))
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const auto wc = input.get_character();
-
-            // UTF-16 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 2;
-            }
-            else if (0xD800 > wc || wc >= 0xE000)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 3;
-            }
-            else
-            {
-                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
-                {
-                    const auto wc2 = static_cast<unsigned int>(input.get_character());
-                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
-                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
-                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
-                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
-                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
-                    utf8_bytes_filled = 4;
-                }
-                else
-                {
-                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                    utf8_bytes_filled = 1;
-                }
-            }
-        }
-    }
-};
-
-// Wraps another input apdater to convert wide character types into individual bytes.
-template<typename BaseInputAdapter, typename WideCharType>
-class wide_string_input_adapter
-{
-  public:
-    using char_type = char;
-
-    wide_string_input_adapter(BaseInputAdapter base)
-        : base_adapter(base) {}
-
-    typename std::char_traits<char>::int_type get_character() noexcept
-    {
-        // check if buffer needs to be filled
-        if (utf8_bytes_index == utf8_bytes_filled)
-        {
-            fill_buffer<sizeof(WideCharType)>();
-
-            JSON_ASSERT(utf8_bytes_filled > 0);
-            JSON_ASSERT(utf8_bytes_index == 0);
-        }
-
-        // use buffer
-        JSON_ASSERT(utf8_bytes_filled > 0);
-        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
-        return utf8_bytes[utf8_bytes_index++];
-    }
-
-  private:
-    BaseInputAdapter base_adapter;
-
-    template<size_t T>
-    void fill_buffer()
-    {
-        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
-    }
-
-    /// a buffer for UTF-8 bytes
-    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
-
-    /// index to the utf8_codes array for the next valid byte
-    std::size_t utf8_bytes_index = 0;
-    /// number of valid bytes in the utf8_codes array
-    std::size_t utf8_bytes_filled = 0;
-};
-
-
-template<typename IteratorType, typename Enable = void>
-struct iterator_input_adapter_factory
-{
-    using iterator_type = IteratorType;
-    using char_type = typename std::iterator_traits<iterator_type>::value_type;
-    using adapter_type = iterator_input_adapter<iterator_type>;
-
-    static adapter_type create(IteratorType first, IteratorType last)
-    {
-        return adapter_type(std::move(first), std::move(last));
-    }
-};
-
-template<typename T>
-struct is_iterator_of_multibyte
-{
-    using value_type = typename std::iterator_traits<T>::value_type;
-    enum
-    {
-        value = sizeof(value_type) > 1
-    };
-};
-
-template<typename IteratorType>
-struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
-{
-    using iterator_type = IteratorType;
-    using char_type = typename std::iterator_traits<iterator_type>::value_type;
-    using base_adapter_type = iterator_input_adapter<iterator_type>;
-    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
-
-    static adapter_type create(IteratorType first, IteratorType last)
-    {
-        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
-    }
-};
-
-// General purpose iterator-based input
-template<typename IteratorType>
-typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
-{
-    using factory_type = iterator_input_adapter_factory<IteratorType>;
-    return factory_type::create(first, last);
-}
-
-// Convenience shorthand from container to iterator
-// Enables ADL on begin(container) and end(container)
-// Encloses the using declarations in namespace for not to leak them to outside scope
-
-namespace container_input_adapter_factory_impl
-{
-
-using std::begin;
-using std::end;
-
-template<typename ContainerType, typename Enable = void>
-struct container_input_adapter_factory {};
-
-template<typename ContainerType>
-struct container_input_adapter_factory< ContainerType,
-       void_t<decltype(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>()))>>
-       {
-           using adapter_type = decltype(input_adapter(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>())));
-
-           static adapter_type create(const ContainerType& container)
-{
-    return input_adapter(begin(container), end(container));
-}
-       };
-
-} // namespace container_input_adapter_factory_impl
-
-template<typename ContainerType>
-typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
-{
-    return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
-}
-
-#ifndef JSON_NO_IO
-// Special cases with fast paths
-inline file_input_adapter input_adapter(std::FILE* file)
-{
-    return file_input_adapter(file);
-}
-
-inline input_stream_adapter input_adapter(std::istream& stream)
-{
-    return input_stream_adapter(stream);
-}
-
-inline input_stream_adapter input_adapter(std::istream&& stream)
-{
-    return input_stream_adapter(stream);
-}
-#endif  // JSON_NO_IO
-
-using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
-
-// Null-delimited strings, and the like.
-template < typename CharT,
-           typename std::enable_if <
-               std::is_pointer<CharT>::value&&
-               !std::is_array<CharT>::value&&
-               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
-               sizeof(typename std::remove_pointer<CharT>::type) == 1,
-               int >::type = 0 >
-contiguous_bytes_input_adapter input_adapter(CharT b)
-{
-    auto length = std::strlen(reinterpret_cast<const char*>(b));
-    const auto* ptr = reinterpret_cast<const char*>(b);
-    return input_adapter(ptr, ptr + length);
-}
-
-template<typename T, std::size_t N>
-auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-{
-    return input_adapter(array, array + N);
-}
-
-// This class only handles inputs of input_buffer_adapter type.
-// It's required so that expressions like {ptr, len} can be implicitely casted
-// to the correct adapter.
-class span_input_adapter
-{
-  public:
-    template < typename CharT,
-               typename std::enable_if <
-                   std::is_pointer<CharT>::value&&
-                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
-                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
-                   int >::type = 0 >
-    span_input_adapter(CharT b, std::size_t l)
-        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
-
-    template<class IteratorType,
-             typename std::enable_if<
-                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
-                 int>::type = 0>
-    span_input_adapter(IteratorType first, IteratorType last)
-        : ia(input_adapter(first, last)) {}
-
-    contiguous_bytes_input_adapter&& get()
-    {
-        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
-    }
-
-  private:
-    contiguous_bytes_input_adapter ia;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/json_sax.hpp>
-
-
-#include <cstddef>
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-
-/*!
-@brief SAX interface
-
-This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
-Each function is called in different situations while the input is parsed. The
-boolean return value informs the parser whether to continue processing the
-input.
-*/
-template<typename BasicJsonType>
-struct json_sax
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    /*!
-    @brief a null value was read
-    @return whether parsing should proceed
-    */
-    virtual bool null() = 0;
-
-    /*!
-    @brief a boolean value was read
-    @param[in] val  boolean value
-    @return whether parsing should proceed
-    */
-    virtual bool boolean(bool val) = 0;
-
-    /*!
-    @brief an integer number was read
-    @param[in] val  integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_integer(number_integer_t val) = 0;
-
-    /*!
-    @brief an unsigned integer number was read
-    @param[in] val  unsigned integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_unsigned(number_unsigned_t val) = 0;
-
-    /*!
-    @brief an floating-point number was read
-    @param[in] val  floating-point value
-    @param[in] s    raw token value
-    @return whether parsing should proceed
-    */
-    virtual bool number_float(number_float_t val, const string_t& s) = 0;
-
-    /*!
-    @brief a string was read
-    @param[in] val  string value
-    @return whether parsing should proceed
-    @note It is safe to move the passed string.
-    */
-    virtual bool string(string_t& val) = 0;
-
-    /*!
-    @brief a binary string was read
-    @param[in] val  binary value
-    @return whether parsing should proceed
-    @note It is safe to move the passed binary.
-    */
-    virtual bool binary(binary_t& val) = 0;
-
-    /*!
-    @brief the beginning of an object was read
-    @param[in] elements  number of object elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_object(std::size_t elements) = 0;
-
-    /*!
-    @brief an object key was read
-    @param[in] val  object key
-    @return whether parsing should proceed
-    @note It is safe to move the passed string.
-    */
-    virtual bool key(string_t& val) = 0;
-
-    /*!
-    @brief the end of an object was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_object() = 0;
-
-    /*!
-    @brief the beginning of an array was read
-    @param[in] elements  number of array elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_array(std::size_t elements) = 0;
-
-    /*!
-    @brief the end of an array was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_array() = 0;
-
-    /*!
-    @brief a parse error occurred
-    @param[in] position    the position in the input where the error occurs
-    @param[in] last_token  the last read token
-    @param[in] ex          an exception object describing the error
-    @return whether parsing should proceed (must return false)
-    */
-    virtual bool parse_error(std::size_t position,
-                             const std::string& last_token,
-                             const detail::exception& ex) = 0;
-
-    json_sax() = default;
-    json_sax(const json_sax&) = default;
-    json_sax(json_sax&&) noexcept = default;
-    json_sax& operator=(const json_sax&) = default;
-    json_sax& operator=(json_sax&&) noexcept = default;
-    virtual ~json_sax() = default;
-};
-
-
-namespace detail
-{
-/*!
-@brief SAX implementation to create a JSON value from SAX events
-
-This class implements the @ref json_sax interface and processes the SAX events
-to create a JSON value which makes it basically a DOM parser. The structure or
-hierarchy of the JSON value is managed by the stack `ref_stack` which contains
-a pointer to the respective array or object for each recursion depth.
-
-After successful parsing, the value that is passed by reference to the
-constructor contains the parsed value.
-
-@tparam BasicJsonType  the JSON type
-*/
-template<typename BasicJsonType>
-class json_sax_dom_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    /*!
-    @param[in,out] r  reference to a JSON value that is manipulated while
-                       parsing
-    @param[in] allow_exceptions_  whether parse errors yield exceptions
-    */
-    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
-        : root(r), allow_exceptions(allow_exceptions_)
-    {}
-
-    // make class move-only
-    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~json_sax_dom_parser() = default;
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& /*unused*/)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool binary(binary_t& val)
-    {
-        handle_value(std::move(val));
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
-
-        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        // add null at given key and store the reference for later
-        object_element = &(ref_stack.back()->m_value.object->operator[](val));
-        return true;
-    }
-
-    bool end_object()
-    {
-        ref_stack.back()->set_parents();
-        ref_stack.pop_back();
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
-
-        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        ref_stack.back()->set_parents();
-        ref_stack.pop_back();
-        return true;
-    }
-
-    template<class Exception>
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const Exception& ex)
-    {
-        errored = true;
-        static_cast<void>(ex);
-        if (allow_exceptions)
-        {
-            JSON_THROW(ex);
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-    */
-    template<typename Value>
-    JSON_HEDLEY_RETURNS_NON_NULL
-    BasicJsonType* handle_value(Value&& v)
-    {
-        if (ref_stack.empty())
-        {
-            root = BasicJsonType(std::forward<Value>(v));
-            return &root;
-        }
-
-        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
-
-        if (ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
-            return &(ref_stack.back()->m_value.array->back());
-        }
-
-        JSON_ASSERT(ref_stack.back()->is_object());
-        JSON_ASSERT(object_element);
-        *object_element = BasicJsonType(std::forward<Value>(v));
-        return object_element;
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack {};
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-
-template<typename BasicJsonType>
-class json_sax_dom_callback_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using parser_callback_t = typename BasicJsonType::parser_callback_t;
-    using parse_event_t = typename BasicJsonType::parse_event_t;
-
-    json_sax_dom_callback_parser(BasicJsonType& r,
-                                 const parser_callback_t cb,
-                                 const bool allow_exceptions_ = true)
-        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
-    {
-        keep_stack.push_back(true);
-    }
-
-    // make class move-only
-    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~json_sax_dom_callback_parser() = default;
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& /*unused*/)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool binary(binary_t& val)
-    {
-        handle_value(std::move(val));
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        // check callback for object start
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::object, true);
-        ref_stack.push_back(val.second);
-
-        // check object limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        BasicJsonType k = BasicJsonType(val);
-
-        // check callback for key
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
-        key_keep_stack.push_back(keep);
-
-        // add discarded value at given key and store the reference for later
-        if (keep && ref_stack.back())
-        {
-            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
-        }
-
-        return true;
-    }
-
-    bool end_object()
-    {
-        if (ref_stack.back())
-        {
-            if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
-            {
-                // discard object
-                *ref_stack.back() = discarded;
-            }
-            else
-            {
-                ref_stack.back()->set_parents();
-            }
-        }
-
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(!keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
-        {
-            // remove discarded value
-            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
-            {
-                if (it->is_discarded())
-                {
-                    ref_stack.back()->erase(it);
-                    break;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::array, true);
-        ref_stack.push_back(val.second);
-
-        // check array limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        bool keep = true;
-
-        if (ref_stack.back())
-        {
-            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
-            if (keep)
-            {
-                ref_stack.back()->set_parents();
-            }
-            else
-            {
-                // discard array
-                *ref_stack.back() = discarded;
-            }
-        }
-
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(!keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        // remove discarded value
-        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->pop_back();
-        }
-
-        return true;
-    }
-
-    template<class Exception>
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const Exception& ex)
-    {
-        errored = true;
-        static_cast<void>(ex);
-        if (allow_exceptions)
-        {
-            JSON_THROW(ex);
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @param[in] v  value to add to the JSON value we build during parsing
-    @param[in] skip_callback  whether we should skip calling the callback
-               function; this is required after start_array() and
-               start_object() SAX events, because otherwise we would call the
-               callback function with an empty array or object, respectively.
-
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-
-    @return pair of boolean (whether value should be kept) and pointer (to the
-            passed value in the ref_stack hierarchy; nullptr if not kept)
-    */
-    template<typename Value>
-    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
-    {
-        JSON_ASSERT(!keep_stack.empty());
-
-        // do not handle this value if we know it would be added to a discarded
-        // container
-        if (!keep_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // create value
-        auto value = BasicJsonType(std::forward<Value>(v));
-
-        // check callback
-        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
-
-        // do not handle this value if we just learnt it shall be discarded
-        if (!keep)
-        {
-            return {false, nullptr};
-        }
-
-        if (ref_stack.empty())
-        {
-            root = std::move(value);
-            return {true, &root};
-        }
-
-        // skip this value if we already decided to skip the parent
-        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
-        if (!ref_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // we now only expect arrays and objects
-        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
-
-        // array
-        if (ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->emplace_back(std::move(value));
-            return {true, &(ref_stack.back()->m_value.array->back())};
-        }
-
-        // object
-        JSON_ASSERT(ref_stack.back()->is_object());
-        // check if we should store an element for the current key
-        JSON_ASSERT(!key_keep_stack.empty());
-        const bool store_element = key_keep_stack.back();
-        key_keep_stack.pop_back();
-
-        if (!store_element)
-        {
-            return {false, nullptr};
-        }
-
-        JSON_ASSERT(object_element);
-        *object_element = std::move(value);
-        return {true, object_element};
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack {};
-    /// stack to manage which values to keep
-    std::vector<bool> keep_stack {};
-    /// stack to manage which object keys to keep
-    std::vector<bool> key_keep_stack {};
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// callback function
-    const parser_callback_t callback = nullptr;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-    /// a discarded value for the callback
-    BasicJsonType discarded = BasicJsonType::value_t::discarded;
-};
-
-template<typename BasicJsonType>
-class json_sax_acceptor
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    bool null()
-    {
-        return true;
-    }
-
-    bool boolean(bool /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_integer(number_integer_t /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool string(string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool binary(binary_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool start_object(std::size_t /*unused*/ = std::size_t(-1))
-    {
-        return true;
-    }
-
-    bool key(string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool end_object()
-    {
-        return true;
-    }
-
-    bool start_array(std::size_t /*unused*/ = std::size_t(-1))
-    {
-        return true;
-    }
-
-    bool end_array()
-    {
-        return true;
-    }
-
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
-    {
-        return false;
-    }
-};
-}  // namespace detail
-
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-
-#include <array> // array
-#include <clocale> // localeconv
-#include <cstddef> // size_t
-#include <cstdio> // snprintf
-#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
-#include <initializer_list> // initializer_list
-#include <string> // char_traits, string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/position_t.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////
-// lexer //
-///////////
-
-template<typename BasicJsonType>
-class lexer_base
-{
-  public:
-    /// token types for the parser
-    enum class token_type
-    {
-        uninitialized,    ///< indicating the scanner is uninitialized
-        literal_true,     ///< the `true` literal
-        literal_false,    ///< the `false` literal
-        literal_null,     ///< the `null` literal
-        value_string,     ///< a string -- use get_string() for actual value
-        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
-        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
-        value_float,      ///< an floating point number -- use get_number_float() for actual value
-        begin_array,      ///< the character for array begin `[`
-        begin_object,     ///< the character for object begin `{`
-        end_array,        ///< the character for array end `]`
-        end_object,       ///< the character for object end `}`
-        name_separator,   ///< the name separator `:`
-        value_separator,  ///< the value separator `,`
-        parse_error,      ///< indicating a parse error
-        end_of_input,     ///< indicating the end of the input buffer
-        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
-    };
-
-    /// return name of values of type token_type (only used for errors)
-    JSON_HEDLEY_RETURNS_NON_NULL
-    JSON_HEDLEY_CONST
-    static const char* token_type_name(const token_type t) noexcept
-    {
-        switch (t)
-        {
-            case token_type::uninitialized:
-                return "<uninitialized>";
-            case token_type::literal_true:
-                return "true literal";
-            case token_type::literal_false:
-                return "false literal";
-            case token_type::literal_null:
-                return "null literal";
-            case token_type::value_string:
-                return "string literal";
-            case token_type::value_unsigned:
-            case token_type::value_integer:
-            case token_type::value_float:
-                return "number literal";
-            case token_type::begin_array:
-                return "'['";
-            case token_type::begin_object:
-                return "'{'";
-            case token_type::end_array:
-                return "']'";
-            case token_type::end_object:
-                return "'}'";
-            case token_type::name_separator:
-                return "':'";
-            case token_type::value_separator:
-                return "','";
-            case token_type::parse_error:
-                return "<parse error>";
-            case token_type::end_of_input:
-                return "end of input";
-            case token_type::literal_or_value:
-                return "'[', '{', or a literal";
-            // LCOV_EXCL_START
-            default: // catch non-enum values
-                return "unknown token";
-                // LCOV_EXCL_STOP
-        }
-    }
-};
-/*!
-@brief lexical analysis
-
-This class organizes the lexical analysis during JSON deserialization.
-*/
-template<typename BasicJsonType, typename InputAdapterType>
-class lexer : public lexer_base<BasicJsonType>
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
-
-  public:
-    using token_type = typename lexer_base<BasicJsonType>::token_type;
-
-    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
-        : ia(std::move(adapter))
-        , ignore_comments(ignore_comments_)
-        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
-    {}
-
-    // delete because of pointer members
-    lexer(const lexer&) = delete;
-    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~lexer() = default;
-
-  private:
-    /////////////////////
-    // locales
-    /////////////////////
-
-    /// return the locale-dependent decimal point
-    JSON_HEDLEY_PURE
-    static char get_decimal_point() noexcept
-    {
-        const auto* loc = localeconv();
-        JSON_ASSERT(loc != nullptr);
-        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
-    }
-
-    /////////////////////
-    // scan functions
-    /////////////////////
-
-    /*!
-    @brief get codepoint from 4 hex characters following `\u`
-
-    For input "\u c1 c2 c3 c4" the codepoint is:
-      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
-    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
-
-    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
-    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
-    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
-    between the ASCII value of the character and the desired integer value.
-
-    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
-            non-hex character)
-    */
-    int get_codepoint()
-    {
-        // this function only makes sense after reading `\u`
-        JSON_ASSERT(current == 'u');
-        int codepoint = 0;
-
-        const auto factors = { 12u, 8u, 4u, 0u };
-        for (const auto factor : factors)
-        {
-            get();
-
-            if (current >= '0' && current <= '9')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
-            }
-            else if (current >= 'A' && current <= 'F')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
-            }
-            else if (current >= 'a' && current <= 'f')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
-            }
-            else
-            {
-                return -1;
-            }
-        }
-
-        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
-        return codepoint;
-    }
-
-    /*!
-    @brief check if the next byte(s) are inside a given range
-
-    Adds the current byte and, for each passed range, reads a new byte and
-    checks if it is inside the range. If a violation was detected, set up an
-    error message and return false. Otherwise, return true.
-
-    @param[in] ranges  list of integers; interpreted as list of pairs of
-                       inclusive lower and upper bound, respectively
-
-    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
-         1, 2, or 3 pairs. This precondition is enforced by an assertion.
-
-    @return true if and only if no range violation was detected
-    */
-    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
-    {
-        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
-        add(current);
-
-        for (auto range = ranges.begin(); range != ranges.end(); ++range)
-        {
-            get();
-            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
-            {
-                add(current);
-            }
-            else
-            {
-                error_message = "invalid string: ill-formed UTF-8 byte";
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief scan a string literal
-
-    This function scans a string according to Sect. 7 of RFC 8259. While
-    scanning, bytes are escaped and copied into buffer token_buffer. Then the
-    function returns successfully, token_buffer is *not* null-terminated (as it
-    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
-    string.
-
-    @return token_type::value_string if string could be successfully scanned,
-            token_type::parse_error otherwise
-
-    @note In case of errors, variable error_message contains a textual
-          description.
-    */
-    token_type scan_string()
-    {
-        // reset token_buffer (ignore opening quote)
-        reset();
-
-        // we entered the function by reading an open quote
-        JSON_ASSERT(current == '\"');
-
-        while (true)
-        {
-            // get next character
-            switch (get())
-            {
-                // end of file while parsing string
-                case std::char_traits<char_type>::eof():
-                {
-                    error_message = "invalid string: missing closing quote";
-                    return token_type::parse_error;
-                }
-
-                // closing quote
-                case '\"':
-                {
-                    return token_type::value_string;
-                }
-
-                // escapes
-                case '\\':
-                {
-                    switch (get())
-                    {
-                        // quotation mark
-                        case '\"':
-                            add('\"');
-                            break;
-                        // reverse solidus
-                        case '\\':
-                            add('\\');
-                            break;
-                        // solidus
-                        case '/':
-                            add('/');
-                            break;
-                        // backspace
-                        case 'b':
-                            add('\b');
-                            break;
-                        // form feed
-                        case 'f':
-                            add('\f');
-                            break;
-                        // line feed
-                        case 'n':
-                            add('\n');
-                            break;
-                        // carriage return
-                        case 'r':
-                            add('\r');
-                            break;
-                        // tab
-                        case 't':
-                            add('\t');
-                            break;
-
-                        // unicode escapes
-                        case 'u':
-                        {
-                            const int codepoint1 = get_codepoint();
-                            int codepoint = codepoint1; // start with codepoint1
-
-                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
-                            {
-                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
-                                return token_type::parse_error;
-                            }
-
-                            // check if code point is a high surrogate
-                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
-                            {
-                                // expect next \uxxxx entry
-                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
-                                {
-                                    const int codepoint2 = get_codepoint();
-
-                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
-                                    {
-                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
-                                        return token_type::parse_error;
-                                    }
-
-                                    // check if codepoint2 is a low surrogate
-                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
-                                    {
-                                        // overwrite codepoint
-                                        codepoint = static_cast<int>(
-                                                        // high surrogate occupies the most significant 22 bits
-                                                        (static_cast<unsigned int>(codepoint1) << 10u)
-                                                        // low surrogate occupies the least significant 15 bits
-                                                        + static_cast<unsigned int>(codepoint2)
-                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                                                        // in the result so we have to subtract with:
-                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
-                                                        - 0x35FDC00u);
-                                    }
-                                    else
-                                    {
-                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
-                                        return token_type::parse_error;
-                                    }
-                                }
-                                else
-                                {
-                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
-                                    return token_type::parse_error;
-                                }
-                            }
-                            else
-                            {
-                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
-                                {
-                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
-                                    return token_type::parse_error;
-                                }
-                            }
-
-                            // result of the above calculation yields a proper codepoint
-                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
-
-                            // translate codepoint into bytes
-                            if (codepoint < 0x80)
-                            {
-                                // 1-byte characters: 0xxxxxxx (ASCII)
-                                add(static_cast<char_int_type>(codepoint));
-                            }
-                            else if (codepoint <= 0x7FF)
-                            {
-                                // 2-byte characters: 110xxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-                            else if (codepoint <= 0xFFFF)
-                            {
-                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-                            else
-                            {
-                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-
-                            break;
-                        }
-
-                        // other characters after escape
-                        default:
-                            error_message = "invalid string: forbidden character after backslash";
-                            return token_type::parse_error;
-                    }
-
-                    break;
-                }
-
-                // invalid control characters
-                case 0x00:
-                {
-                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
-                    return token_type::parse_error;
-                }
-
-                case 0x01:
-                {
-                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
-                    return token_type::parse_error;
-                }
-
-                case 0x02:
-                {
-                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
-                    return token_type::parse_error;
-                }
-
-                case 0x03:
-                {
-                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
-                    return token_type::parse_error;
-                }
-
-                case 0x04:
-                {
-                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
-                    return token_type::parse_error;
-                }
-
-                case 0x05:
-                {
-                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
-                    return token_type::parse_error;
-                }
-
-                case 0x06:
-                {
-                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
-                    return token_type::parse_error;
-                }
-
-                case 0x07:
-                {
-                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
-                    return token_type::parse_error;
-                }
-
-                case 0x08:
-                {
-                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
-                    return token_type::parse_error;
-                }
-
-                case 0x09:
-                {
-                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
-                    return token_type::parse_error;
-                }
-
-                case 0x0A:
-                {
-                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
-                    return token_type::parse_error;
-                }
-
-                case 0x0B:
-                {
-                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
-                    return token_type::parse_error;
-                }
-
-                case 0x0C:
-                {
-                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
-                    return token_type::parse_error;
-                }
-
-                case 0x0D:
-                {
-                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
-                    return token_type::parse_error;
-                }
-
-                case 0x0E:
-                {
-                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
-                    return token_type::parse_error;
-                }
-
-                case 0x0F:
-                {
-                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
-                    return token_type::parse_error;
-                }
-
-                case 0x10:
-                {
-                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
-                    return token_type::parse_error;
-                }
-
-                case 0x11:
-                {
-                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
-                    return token_type::parse_error;
-                }
-
-                case 0x12:
-                {
-                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
-                    return token_type::parse_error;
-                }
-
-                case 0x13:
-                {
-                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
-                    return token_type::parse_error;
-                }
-
-                case 0x14:
-                {
-                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
-                    return token_type::parse_error;
-                }
-
-                case 0x15:
-                {
-                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
-                    return token_type::parse_error;
-                }
-
-                case 0x16:
-                {
-                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
-                    return token_type::parse_error;
-                }
-
-                case 0x17:
-                {
-                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
-                    return token_type::parse_error;
-                }
-
-                case 0x18:
-                {
-                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
-                    return token_type::parse_error;
-                }
-
-                case 0x19:
-                {
-                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
-                    return token_type::parse_error;
-                }
-
-                case 0x1A:
-                {
-                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
-                    return token_type::parse_error;
-                }
-
-                case 0x1B:
-                {
-                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
-                    return token_type::parse_error;
-                }
-
-                case 0x1C:
-                {
-                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
-                    return token_type::parse_error;
-                }
-
-                case 0x1D:
-                {
-                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
-                    return token_type::parse_error;
-                }
-
-                case 0x1E:
-                {
-                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
-                    return token_type::parse_error;
-                }
-
-                case 0x1F:
-                {
-                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
-                    return token_type::parse_error;
-                }
-
-                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
-                case 0x20:
-                case 0x21:
-                case 0x23:
-                case 0x24:
-                case 0x25:
-                case 0x26:
-                case 0x27:
-                case 0x28:
-                case 0x29:
-                case 0x2A:
-                case 0x2B:
-                case 0x2C:
-                case 0x2D:
-                case 0x2E:
-                case 0x2F:
-                case 0x30:
-                case 0x31:
-                case 0x32:
-                case 0x33:
-                case 0x34:
-                case 0x35:
-                case 0x36:
-                case 0x37:
-                case 0x38:
-                case 0x39:
-                case 0x3A:
-                case 0x3B:
-                case 0x3C:
-                case 0x3D:
-                case 0x3E:
-                case 0x3F:
-                case 0x40:
-                case 0x41:
-                case 0x42:
-                case 0x43:
-                case 0x44:
-                case 0x45:
-                case 0x46:
-                case 0x47:
-                case 0x48:
-                case 0x49:
-                case 0x4A:
-                case 0x4B:
-                case 0x4C:
-                case 0x4D:
-                case 0x4E:
-                case 0x4F:
-                case 0x50:
-                case 0x51:
-                case 0x52:
-                case 0x53:
-                case 0x54:
-                case 0x55:
-                case 0x56:
-                case 0x57:
-                case 0x58:
-                case 0x59:
-                case 0x5A:
-                case 0x5B:
-                case 0x5D:
-                case 0x5E:
-                case 0x5F:
-                case 0x60:
-                case 0x61:
-                case 0x62:
-                case 0x63:
-                case 0x64:
-                case 0x65:
-                case 0x66:
-                case 0x67:
-                case 0x68:
-                case 0x69:
-                case 0x6A:
-                case 0x6B:
-                case 0x6C:
-                case 0x6D:
-                case 0x6E:
-                case 0x6F:
-                case 0x70:
-                case 0x71:
-                case 0x72:
-                case 0x73:
-                case 0x74:
-                case 0x75:
-                case 0x76:
-                case 0x77:
-                case 0x78:
-                case 0x79:
-                case 0x7A:
-                case 0x7B:
-                case 0x7C:
-                case 0x7D:
-                case 0x7E:
-                case 0x7F:
-                {
-                    add(current);
-                    break;
-                }
-
-                // U+0080..U+07FF: bytes C2..DF 80..BF
-                case 0xC2:
-                case 0xC3:
-                case 0xC4:
-                case 0xC5:
-                case 0xC6:
-                case 0xC7:
-                case 0xC8:
-                case 0xC9:
-                case 0xCA:
-                case 0xCB:
-                case 0xCC:
-                case 0xCD:
-                case 0xCE:
-                case 0xCF:
-                case 0xD0:
-                case 0xD1:
-                case 0xD2:
-                case 0xD3:
-                case 0xD4:
-                case 0xD5:
-                case 0xD6:
-                case 0xD7:
-                case 0xD8:
-                case 0xD9:
-                case 0xDA:
-                case 0xDB:
-                case 0xDC:
-                case 0xDD:
-                case 0xDE:
-                case 0xDF:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
-                case 0xE0:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
-                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
-                case 0xE1:
-                case 0xE2:
-                case 0xE3:
-                case 0xE4:
-                case 0xE5:
-                case 0xE6:
-                case 0xE7:
-                case 0xE8:
-                case 0xE9:
-                case 0xEA:
-                case 0xEB:
-                case 0xEC:
-                case 0xEE:
-                case 0xEF:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
-                case 0xED:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
-                case 0xF0:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
-                case 0xF1:
-                case 0xF2:
-                case 0xF3:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
-                case 0xF4:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // remaining bytes (80..C1 and F5..FF) are ill-formed
-                default:
-                {
-                    error_message = "invalid string: ill-formed UTF-8 byte";
-                    return token_type::parse_error;
-                }
-            }
-        }
-    }
-
-    /*!
-     * @brief scan a comment
-     * @return whether comment could be scanned successfully
-     */
-    bool scan_comment()
-    {
-        switch (get())
-        {
-            // single-line comments skip input until a newline or EOF is read
-            case '/':
-            {
-                while (true)
-                {
-                    switch (get())
-                    {
-                        case '\n':
-                        case '\r':
-                        case std::char_traits<char_type>::eof():
-                        case '\0':
-                            return true;
-
-                        default:
-                            break;
-                    }
-                }
-            }
-
-            // multi-line comments skip input until */ is read
-            case '*':
-            {
-                while (true)
-                {
-                    switch (get())
-                    {
-                        case std::char_traits<char_type>::eof():
-                        case '\0':
-                        {
-                            error_message = "invalid comment; missing closing '*/'";
-                            return false;
-                        }
-
-                        case '*':
-                        {
-                            switch (get())
-                            {
-                                case '/':
-                                    return true;
-
-                                default:
-                                {
-                                    unget();
-                                    continue;
-                                }
-                            }
-                        }
-
-                        default:
-                            continue;
-                    }
-                }
-            }
-
-            // unexpected character after reading '/'
-            default:
-            {
-                error_message = "invalid comment; expecting '/' or '*' after '/'";
-                return false;
-            }
-        }
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(float& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtof(str, endptr);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(double& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtod(str, endptr);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(long double& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtold(str, endptr);
-    }
-
-    /*!
-    @brief scan a number literal
-
-    This function scans a string according to Sect. 6 of RFC 8259.
-
-    The function is realized with a deterministic finite state machine derived
-    from the grammar described in RFC 8259. Starting in state "init", the
-    input is read and used to determined the next state. Only state "done"
-    accepts the number. State "error" is a trap state to model errors. In the
-    table below, "anything" means any character but the ones listed before.
-
-    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
-    ---------|----------|----------|----------|---------|---------|----------|-----------
-    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
-    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
-    zero     | done     | done     | exponent | done    | done    | decimal1 | done
-    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
-    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
-    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
-    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
-    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
-    any2     | any2     | any2     | done     | done    | done    | done     | done
-
-    The state machine is realized with one label per state (prefixed with
-    "scan_number_") and `goto` statements between them. The state machine
-    contains cycles, but any cycle can be left when EOF is read. Therefore,
-    the function is guaranteed to terminate.
-
-    During scanning, the read bytes are stored in token_buffer. This string is
-    then converted to a signed integer, an unsigned integer, or a
-    floating-point number.
-
-    @return token_type::value_unsigned, token_type::value_integer, or
-            token_type::value_float if number could be successfully scanned,
-            token_type::parse_error otherwise
-
-    @note The scanner is independent of the current locale. Internally, the
-          locale's decimal point is used instead of `.` to work with the
-          locale-dependent converters.
-    */
-    token_type scan_number()  // lgtm [cpp/use-of-goto]
-    {
-        // reset token_buffer to store the number's bytes
-        reset();
-
-        // the type of the parsed number; initially set to unsigned; will be
-        // changed if minus sign, decimal point or exponent is read
-        token_type number_type = token_type::value_unsigned;
-
-        // state (init): we just found out we need to scan a number
-        switch (current)
-        {
-            case '-':
-            {
-                add(current);
-                goto scan_number_minus;
-            }
-
-            case '0':
-            {
-                add(current);
-                goto scan_number_zero;
-            }
-
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            // all other characters are rejected outside scan_number()
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-scan_number_minus:
-        // state: we just parsed a leading minus sign
-        number_type = token_type::value_integer;
-        switch (get())
-        {
-            case '0':
-            {
-                add(current);
-                goto scan_number_zero;
-            }
-
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after '-'";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_zero:
-        // state: we just parse a zero (maybe with a leading minus sign)
-        switch (get())
-        {
-            case '.':
-            {
-                add(decimal_point_char);
-                goto scan_number_decimal1;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_any1:
-        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            case '.':
-            {
-                add(decimal_point_char);
-                goto scan_number_decimal1;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_decimal1:
-        // state: we just parsed a decimal point
-        number_type = token_type::value_float;
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_decimal2;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after '.'";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_decimal2:
-        // we just parsed at least one number after a decimal point
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_decimal2;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_exponent:
-        // we just parsed an exponent
-        number_type = token_type::value_float;
-        switch (get())
-        {
-            case '+':
-            case '-':
-            {
-                add(current);
-                goto scan_number_sign;
-            }
-
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-            {
-                error_message =
-                    "invalid number; expected '+', '-', or digit after exponent";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_sign:
-        // we just parsed an exponent sign
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after exponent sign";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_any2:
-        // we just parsed a number after the exponent or exponent sign
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_done:
-        // unget the character after the number (we only read it to know that
-        // we are done scanning a number)
-        unget();
-
-        char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        errno = 0;
-
-        // try to parse integers first and fall back to floats
-        if (number_type == token_type::value_unsigned)
-        {
-            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
-
-            // we checked the number format before
-            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-            if (errno == 0)
-            {
-                value_unsigned = static_cast<number_unsigned_t>(x);
-                if (value_unsigned == x)
-                {
-                    return token_type::value_unsigned;
-                }
-            }
-        }
-        else if (number_type == token_type::value_integer)
-        {
-            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
-
-            // we checked the number format before
-            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-            if (errno == 0)
-            {
-                value_integer = static_cast<number_integer_t>(x);
-                if (value_integer == x)
-                {
-                    return token_type::value_integer;
-                }
-            }
-        }
-
-        // this code is reached if we parse a floating-point number or if an
-        // integer conversion above failed
-        strtof(value_float, token_buffer.data(), &endptr);
-
-        // we checked the number format before
-        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-        return token_type::value_float;
-    }
-
-    /*!
-    @param[in] literal_text  the literal text to expect
-    @param[in] length        the length of the passed literal text
-    @param[in] return_type   the token type to return on success
-    */
-    JSON_HEDLEY_NON_NULL(2)
-    token_type scan_literal(const char_type* literal_text, const std::size_t length,
-                            token_type return_type)
-    {
-        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
-        for (std::size_t i = 1; i < length; ++i)
-        {
-            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
-            {
-                error_message = "invalid literal";
-                return token_type::parse_error;
-            }
-        }
-        return return_type;
-    }
-
-    /////////////////////
-    // input management
-    /////////////////////
-
-    /// reset token_buffer; current character is beginning of token
-    void reset() noexcept
-    {
-        token_buffer.clear();
-        token_string.clear();
-        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
-    }
-
-    /*
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a
-    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
-    for use in error messages.
-
-    @return character read from the input
-    */
-    char_int_type get()
-    {
-        ++position.chars_read_total;
-        ++position.chars_read_current_line;
-
-        if (next_unget)
-        {
-            // just reset the next_unget variable and work with current
-            next_unget = false;
-        }
-        else
-        {
-            current = ia.get_character();
-        }
-
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
-        {
-            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
-        }
-
-        if (current == '\n')
-        {
-            ++position.lines_read;
-            position.chars_read_current_line = 0;
-        }
-
-        return current;
-    }
-
-    /*!
-    @brief unget current character (read it again on next get)
-
-    We implement unget by setting variable next_unget to true. The input is not
-    changed - we just simulate ungetting by modifying chars_read_total,
-    chars_read_current_line, and token_string. The next call to get() will
-    behave as if the unget character is read again.
-    */
-    void unget()
-    {
-        next_unget = true;
-
-        --position.chars_read_total;
-
-        // in case we "unget" a newline, we have to also decrement the lines_read
-        if (position.chars_read_current_line == 0)
-        {
-            if (position.lines_read > 0)
-            {
-                --position.lines_read;
-            }
-        }
-        else
-        {
-            --position.chars_read_current_line;
-        }
-
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
-        {
-            JSON_ASSERT(!token_string.empty());
-            token_string.pop_back();
-        }
-    }
-
-    /// add a character to token_buffer
-    void add(char_int_type c)
-    {
-        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
-    }
-
-  public:
-    /////////////////////
-    // value getters
-    /////////////////////
-
-    /// return integer value
-    constexpr number_integer_t get_number_integer() const noexcept
-    {
-        return value_integer;
-    }
-
-    /// return unsigned integer value
-    constexpr number_unsigned_t get_number_unsigned() const noexcept
-    {
-        return value_unsigned;
-    }
-
-    /// return floating-point value
-    constexpr number_float_t get_number_float() const noexcept
-    {
-        return value_float;
-    }
-
-    /// return current string value (implicitly resets the token; useful only once)
-    string_t& get_string()
-    {
-        return token_buffer;
-    }
-
-    /////////////////////
-    // diagnostics
-    /////////////////////
-
-    /// return position of last read token
-    constexpr position_t get_position() const noexcept
-    {
-        return position;
-    }
-
-    /// return the last read token (for errors only).  Will never contain EOF
-    /// (an arbitrary value that is not a valid char value, often -1), because
-    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
-    std::string get_token_string() const
-    {
-        // escape control characters
-        std::string result;
-        for (const auto c : token_string)
-        {
-            if (static_cast<unsigned char>(c) <= '\x1F')
-            {
-                // escape control characters
-                std::array<char, 9> cs{{}};
-                (std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c)); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                result += cs.data();
-            }
-            else
-            {
-                // add character as is
-                result.push_back(static_cast<std::string::value_type>(c));
-            }
-        }
-
-        return result;
-    }
-
-    /// return syntax error message
-    JSON_HEDLEY_RETURNS_NON_NULL
-    constexpr const char* get_error_message() const noexcept
-    {
-        return error_message;
-    }
-
-    /////////////////////
-    // actual scanner
-    /////////////////////
-
-    /*!
-    @brief skip the UTF-8 byte order mark
-    @return true iff there is no BOM or the correct BOM has been skipped
-    */
-    bool skip_bom()
-    {
-        if (get() == 0xEF)
-        {
-            // check if we completely parse the BOM
-            return get() == 0xBB && get() == 0xBF;
-        }
-
-        // the first character is not the beginning of the BOM; unget it to
-        // process is later
-        unget();
-        return true;
-    }
-
-    void skip_whitespace()
-    {
-        do
-        {
-            get();
-        }
-        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
-    }
-
-    token_type scan()
-    {
-        // initially, skip the BOM
-        if (position.chars_read_total == 0 && !skip_bom())
-        {
-            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
-            return token_type::parse_error;
-        }
-
-        // read next character and ignore whitespace
-        skip_whitespace();
-
-        // ignore comments
-        while (ignore_comments && current == '/')
-        {
-            if (!scan_comment())
-            {
-                return token_type::parse_error;
-            }
-
-            // skip following whitespace
-            skip_whitespace();
-        }
-
-        switch (current)
-        {
-            // structural characters
-            case '[':
-                return token_type::begin_array;
-            case ']':
-                return token_type::end_array;
-            case '{':
-                return token_type::begin_object;
-            case '}':
-                return token_type::end_object;
-            case ':':
-                return token_type::name_separator;
-            case ',':
-                return token_type::value_separator;
-
-            // literals
-            case 't':
-            {
-                std::array<char_type, 4> true_literal = {{char_type('t'), char_type('r'), char_type('u'), char_type('e')}};
-                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
-            }
-            case 'f':
-            {
-                std::array<char_type, 5> false_literal = {{char_type('f'), char_type('a'), char_type('l'), char_type('s'), char_type('e')}};
-                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
-            }
-            case 'n':
-            {
-                std::array<char_type, 4> null_literal = {{char_type('n'), char_type('u'), char_type('l'), char_type('l')}};
-                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
-            }
-
-            // string
-            case '\"':
-                return scan_string();
-
-            // number
-            case '-':
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                return scan_number();
-
-            // end of input (the null byte is needed when parsing from
-            // string literals)
-            case '\0':
-            case std::char_traits<char_type>::eof():
-                return token_type::end_of_input;
-
-            // error
-            default:
-                error_message = "invalid literal";
-                return token_type::parse_error;
-        }
-    }
-
-  private:
-    /// input adapter
-    InputAdapterType ia;
-
-    /// whether comments should be ignored (true) or signaled as errors (false)
-    const bool ignore_comments = false;
-
-    /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
-
-    /// whether the next get() call should just return current
-    bool next_unget = false;
-
-    /// the start position of the current token
-    position_t position {};
-
-    /// raw input token string (for error messages)
-    std::vector<char_type> token_string {};
-
-    /// buffer for variable-length tokens (numbers, strings)
-    string_t token_buffer {};
-
-    /// a description of occurred lexer errors
-    const char* error_message = "";
-
-    // number values
-    number_integer_t value_integer = 0;
-    number_unsigned_t value_unsigned = 0;
-    number_float_t value_float = 0;
-
-    /// the decimal point
-    const char_int_type decimal_point_char = '.';
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-
-#include <cstdint> // size_t
-#include <utility> // declval
-#include <string> // string
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename T>
-using null_function_t = decltype(std::declval<T&>().null());
-
-template<typename T>
-using boolean_function_t =
-    decltype(std::declval<T&>().boolean(std::declval<bool>()));
-
-template<typename T, typename Integer>
-using number_integer_function_t =
-    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
-
-template<typename T, typename Unsigned>
-using number_unsigned_function_t =
-    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
-
-template<typename T, typename Float, typename String>
-using number_float_function_t = decltype(std::declval<T&>().number_float(
-                                    std::declval<Float>(), std::declval<const String&>()));
-
-template<typename T, typename String>
-using string_function_t =
-    decltype(std::declval<T&>().string(std::declval<String&>()));
-
-template<typename T, typename Binary>
-using binary_function_t =
-    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
-
-template<typename T>
-using start_object_function_t =
-    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
-
-template<typename T, typename String>
-using key_function_t =
-    decltype(std::declval<T&>().key(std::declval<String&>()));
-
-template<typename T>
-using end_object_function_t = decltype(std::declval<T&>().end_object());
-
-template<typename T>
-using start_array_function_t =
-    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
-
-template<typename T>
-using end_array_function_t = decltype(std::declval<T&>().end_array());
-
-template<typename T, typename Exception>
-using parse_error_function_t = decltype(std::declval<T&>().parse_error(
-        std::declval<std::size_t>(), std::declval<const std::string&>(),
-        std::declval<const Exception&>()));
-
-template<typename SAX, typename BasicJsonType>
-struct is_sax
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static constexpr bool value =
-        is_detected_exact<bool, null_function_t, SAX>::value &&
-        is_detected_exact<bool, boolean_function_t, SAX>::value &&
-        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
-        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
-        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
-        is_detected_exact<bool, start_object_function_t, SAX>::value &&
-        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, end_object_function_t, SAX>::value &&
-        is_detected_exact<bool, start_array_function_t, SAX>::value &&
-        is_detected_exact<bool, end_array_function_t, SAX>::value &&
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
-};
-
-template<typename SAX, typename BasicJsonType>
-struct is_sax_static_asserts
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
-                  "Missing/invalid function: bool null()");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value,
-        "Missing/invalid function: bool number_integer(number_integer_t)");
-    static_assert(
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value,
-        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
-    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
-                  number_float_t, string_t>::value,
-                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
-    static_assert(
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
-        "Missing/invalid function: bool string(string_t&)");
-    static_assert(
-        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
-        "Missing/invalid function: bool binary(binary_t&)");
-    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_object(std::size_t)");
-    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
-                  "Missing/invalid function: bool key(string_t&)");
-    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_object()");
-    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_array(std::size_t)");
-    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_array()");
-    static_assert(
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
-        "Missing/invalid function: bool parse_error(std::size_t, const "
-        "std::string&, const exception&)");
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-/// how to treat CBOR tags
-enum class cbor_tag_handler_t
-{
-    error,   ///< throw a parse_error exception in case of a tag
-    ignore,  ///< ignore tags
-    store    ///< store tags as binary type
-};
-
-/*!
-@brief determine system byte order
-
-@return true if and only if system's byte order is little endian
-
-@note from https://stackoverflow.com/a/1001328/266378
-*/
-static inline bool little_endianess(int num = 1) noexcept
-{
-    return *reinterpret_cast<char*>(&num) == 1;
-}
-
-
-///////////////////
-// binary reader //
-///////////////////
-
-/*!
-@brief deserialization of CBOR, MessagePack, and UBJSON values
-*/
-template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType>>
-class binary_reader
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using json_sax_t = SAX;
-    using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
-
-  public:
-    /*!
-    @brief create a binary reader
-
-    @param[in] adapter  input adapter to read from
-    */
-    explicit binary_reader(InputAdapterType&& adapter) noexcept : ia(std::move(adapter))
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-    }
-
-    // make class move-only
-    binary_reader(const binary_reader&) = delete;
-    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    binary_reader& operator=(const binary_reader&) = delete;
-    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~binary_reader() = default;
-
-    /*!
-    @param[in] format  the binary format to parse
-    @param[in] sax_    a SAX event processor
-    @param[in] strict  whether to expect the input to be consumed completed
-    @param[in] tag_handler  how to treat CBOR tags
-
-    @return whether parsing was successful
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    bool sax_parse(const input_format_t format,
-                   json_sax_t* sax_,
-                   const bool strict = true,
-                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        sax = sax_;
-        bool result = false;
-
-        switch (format)
-        {
-            case input_format_t::bson:
-                result = parse_bson_internal();
-                break;
-
-            case input_format_t::cbor:
-                result = parse_cbor_internal(true, tag_handler);
-                break;
-
-            case input_format_t::msgpack:
-                result = parse_msgpack_internal();
-                break;
-
-            case input_format_t::ubjson:
-                result = parse_ubjson_internal();
-                break;
-
-            case input_format_t::json: // LCOV_EXCL_LINE
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-        // strict mode: next byte must be EOF
-        if (result && strict)
-        {
-            if (format == input_format_t::ubjson)
-            {
-                get_ignore_noop();
-            }
-            else
-            {
-                get();
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
-            {
-                return sax->parse_error(chars_read, get_token_string(),
-                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"), BasicJsonType()));
-            }
-        }
-
-        return result;
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @brief Reads in a BSON-object and passes it to the SAX-parser.
-    @return whether a valid BSON-value was passed to the SAX parser
-    */
-    bool parse_bson_internal()
-    {
-        std::int32_t document_size{};
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
-        {
-            return false;
-        }
-
-        return sax->end_object();
-    }
-
-    /*!
-    @brief Parses a C-style string from the BSON input.
-    @param[in,out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @return `true` if the \x00-byte indicating the end of the string was
-             encountered before the EOF; false` indicates an unexpected EOF.
-    */
-    bool get_bson_cstr(string_t& result)
-    {
-        auto out = std::back_inserter(result);
-        while (true)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
-            {
-                return false;
-            }
-            if (current == 0x00)
-            {
-                return true;
-            }
-            *out++ = static_cast<typename string_t::value_type>(current);
-        }
-    }
-
-    /*!
-    @brief Parses a zero-terminated string of length @a len from the BSON
-           input.
-    @param[in] len  The length (including the zero-byte at the end) of the
-                    string to be read.
-    @param[in,out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @tparam NumberType The type of the length @a len
-    @pre len >= 1
-    @return `true` if the string was successfully parsed
-    */
-    template<typename NumberType>
-    bool get_bson_string(const NumberType len, string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(len < 1))
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"), BasicJsonType()));
-        }
-
-        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
-    }
-
-    /*!
-    @brief Parses a byte array input of length @a len from the BSON input.
-    @param[in] len  The length of the byte array to be read.
-    @param[in,out] result  A reference to the binary variable where the read
-                            array is to be stored.
-    @tparam NumberType The type of the length @a len
-    @pre len >= 0
-    @return `true` if the byte array was successfully parsed
-    */
-    template<typename NumberType>
-    bool get_bson_binary(const NumberType len, binary_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(len < 0))
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary"), BasicJsonType()));
-        }
-
-        // All BSON binary values have a subtype
-        std::uint8_t subtype{};
-        get_number<std::uint8_t>(input_format_t::bson, subtype);
-        result.set_subtype(subtype);
-
-        return get_binary(input_format_t::bson, len, result);
-    }
-
-    /*!
-    @brief Read a BSON document element of the given @a element_type.
-    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
-    @param[in] element_type_parse_position The position in the input stream,
-               where the `element_type` was read.
-    @warning Not all BSON element types are supported yet. An unsupported
-             @a element_type will give rise to a parse_error.114:
-             Unsupported BSON record type 0x...
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_internal(const char_int_type element_type,
-                                     const std::size_t element_type_parse_position)
-    {
-        switch (element_type)
-        {
-            case 0x01: // double
-            {
-                double number{};
-                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0x02: // string
-            {
-                std::int32_t len{};
-                string_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
-            }
-
-            case 0x03: // object
-            {
-                return parse_bson_internal();
-            }
-
-            case 0x04: // array
-            {
-                return parse_bson_array();
-            }
-
-            case 0x05: // binary
-            {
-                std::int32_t len{};
-                binary_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
-            }
-
-            case 0x08: // boolean
-            {
-                return sax->boolean(get() != 0);
-            }
-
-            case 0x0A: // null
-            {
-                return sax->null();
-            }
-
-            case 0x10: // int32
-            {
-                std::int32_t value{};
-                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
-            }
-
-            case 0x12: // int64
-            {
-                std::int64_t value{};
-                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
-            }
-
-            default: // anything else not supported (yet)
-            {
-                std::array<char, 3> cr{{}};
-                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type)); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data()), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief Read a BSON element list (as specified in the BSON-spec)
-
-    The same binary layout is used for objects and arrays, hence it must be
-    indicated with the argument @a is_array which one is expected
-    (true --> array, false --> object).
-
-    @param[in] is_array Determines if the element list being read is to be
-                        treated as an object (@a is_array == false), or as an
-                        array (@a is_array == true).
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_list(const bool is_array)
-    {
-        string_t key;
-
-        while (auto element_type = get())
-        {
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
-            {
-                return false;
-            }
-
-            const std::size_t element_type_parse_position = chars_read;
-            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
-            {
-                return false;
-            }
-
-            if (!is_array && !sax->key(key))
-            {
-                return false;
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
-            {
-                return false;
-            }
-
-            // get_bson_cstr only appends
-            key.clear();
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief Reads an array from the BSON input and passes it to the SAX-parser.
-    @return whether a valid BSON-array was passed to the SAX parser
-    */
-    bool parse_bson_array()
-    {
-        std::int32_t document_size{};
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
-        {
-            return false;
-        }
-
-        return sax->end_array();
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true) or whether the last read character should
-                         be considered instead (false)
-    @param[in] tag_handler how CBOR tags should be treated
-
-    @return whether a valid CBOR value was passed to the SAX parser
-    */
-    bool parse_cbor_internal(const bool get_char,
-                             const cbor_tag_handler_t tag_handler)
-    {
-        switch (get_char ? get() : current)
-        {
-            // EOF
-            case std::char_traits<char_type>::eof():
-                return unexpect_eof(input_format_t::cbor, "value");
-
-            // Integer 0x00..0x17 (0..23)
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            case 0x18: // Unsigned integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x19: // Unsigned integer (two-byte uint16_t follows)
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            // Negative integer -1-0x00..-1-0x17 (-1..-24)
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
-
-            case 0x38: // Negative integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
-                        - static_cast<number_integer_t>(number));
-            }
-
-            // Binary data (0x00..0x17 bytes follow)
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            case 0x58: // Binary data (one-byte uint8_t for n follows)
-            case 0x59: // Binary data (two-byte uint16_t for n follow)
-            case 0x5A: // Binary data (four-byte uint32_t for n follow)
-            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
-            case 0x5F: // Binary data (indefinite length)
-            {
-                binary_t b;
-                return get_cbor_binary(b) && sax->binary(b);
-            }
-
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                string_t s;
-                return get_cbor_string(s) && sax->string(s);
-            }
-
-            // array (0x00..0x17 data items follow)
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
-
-            case 0x98: // array (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x99: // array (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9A: // array (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9B: // array (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(detail::conditional_static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9F: // array (indefinite length)
-                return get_cbor_array(std::size_t(-1), tag_handler);
-
-            // map (0x00..0x17 pairs of data items follow)
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
-
-            case 0xB8: // map (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xB9: // map (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBA: // map (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBB: // map (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(detail::conditional_static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBF: // map (indefinite length)
-                return get_cbor_object(std::size_t(-1), tag_handler);
-
-            case 0xC6: // tagged item
-            case 0xC7:
-            case 0xC8:
-            case 0xC9:
-            case 0xCA:
-            case 0xCB:
-            case 0xCC:
-            case 0xCD:
-            case 0xCE:
-            case 0xCF:
-            case 0xD0:
-            case 0xD1:
-            case 0xD2:
-            case 0xD3:
-            case 0xD4:
-            case 0xD8: // tagged item (1 bytes follow)
-            case 0xD9: // tagged item (2 bytes follow)
-            case 0xDA: // tagged item (4 bytes follow)
-            case 0xDB: // tagged item (8 bytes follow)
-            {
-                switch (tag_handler)
-                {
-                    case cbor_tag_handler_t::error:
-                    {
-                        auto last_token = get_token_string();
-                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-                    }
-
-                    case cbor_tag_handler_t::ignore:
-                    {
-                        // ignore binary subtype
-                        switch (current)
-                        {
-                            case 0xD8:
-                            {
-                                std::uint8_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xD9:
-                            {
-                                std::uint16_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xDA:
-                            {
-                                std::uint32_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xDB:
-                            {
-                                std::uint64_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            default:
-                                break;
-                        }
-                        return parse_cbor_internal(true, tag_handler);
-                    }
-
-                    case cbor_tag_handler_t::store:
-                    {
-                        binary_t b;
-                        // use binary subtype and store in binary container
-                        switch (current)
-                        {
-                            case 0xD8:
-                            {
-                                std::uint8_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xD9:
-                            {
-                                std::uint16_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xDA:
-                            {
-                                std::uint32_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xDB:
-                            {
-                                std::uint64_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            default:
-                                return parse_cbor_internal(true, tag_handler);
-                        }
-                        get();
-                        return get_cbor_binary(b) && sax->binary(b);
-                    }
-
-                    default:                 // LCOV_EXCL_LINE
-                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-                        return false;        // LCOV_EXCL_LINE
-                }
-            }
-
-            case 0xF4: // false
-                return sax->boolean(false);
-
-            case 0xF5: // true
-                return sax->boolean(true);
-
-            case 0xF6: // null
-                return sax->null();
-
-            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
-            {
-                const auto byte1_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-                const auto byte2_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-
-                const auto byte1 = static_cast<unsigned char>(byte1_raw);
-                const auto byte2 = static_cast<unsigned char>(byte2_raw);
-
-                // code from RFC 7049, Appendix D, Figure 3:
-                // As half-precision floating-point numbers were only added
-                // to IEEE 754 in 2008, today's programming platforms often
-                // still only have limited support for them. It is very
-                // easy to include at least decoding support for them even
-                // without such support. An example of a small decoder for
-                // half-precision floating-point numbers in the C language
-                // is shown in Fig. 3.
-                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
-                const double val = [&half]
-                {
-                    const int exp = (half >> 10u) & 0x1Fu;
-                    const unsigned int mant = half & 0x3FFu;
-                    JSON_ASSERT(0 <= exp&& exp <= 32);
-                    JSON_ASSERT(mant <= 1024);
-                    switch (exp)
-                    {
-                        case 0:
-                            return std::ldexp(mant, -24);
-                        case 31:
-                            return (mant == 0)
-                            ? std::numeric_limits<double>::infinity()
-                            : std::numeric_limits<double>::quiet_NaN();
-                        default:
-                            return std::ldexp(mant + 1024, exp - 25);
-                    }
-                }();
-                return sax->number_float((half & 0x8000u) != 0
-                                         ? static_cast<number_float_t>(-val)
-                                         : static_cast<number_float_t>(val), "");
-            }
-
-            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
-            {
-                float number{};
-                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
-            {
-                double number{};
-                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            default: // anything else (0xFF is handled inside the other types)
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a CBOR string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-    Additionally, CBOR's strings with indefinite lengths are supported.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_cbor_string(string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            {
-                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    string_t chunk;
-                    if (!get_cbor_string(chunk))
-                    {
-                        return false;
-                    }
-                    result.append(chunk);
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a CBOR byte array
-
-    This function first reads starting bytes to determine the expected
-    byte array length and then copies this number of bytes into the byte array.
-    Additionally, CBOR's byte arrays with indefinite lengths are supported.
-
-    @param[out] result  created byte array
-
-    @return whether byte array creation completed
-    */
-    bool get_cbor_binary(binary_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // Binary data (0x00..0x17 bytes follow)
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            {
-                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0x58: // Binary data (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x59: // Binary data (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5A: // Binary data (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5F: // Binary data (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    binary_t chunk;
-                    if (!get_cbor_binary(chunk))
-                    {
-                        return false;
-                    }
-                    result.insert(result.end(), chunk.begin(), chunk.end());
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array or std::size_t(-1) for an
-                    array of indefinite size
-    @param[in] tag_handler how CBOR tags should be treated
-    @return whether array creation completed
-    */
-    bool get_cbor_array(const std::size_t len,
-                        const cbor_tag_handler_t tag_handler)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
-        {
-            return false;
-        }
-
-        if (len != std::size_t(-1))
-        {
-            for (std::size_t i = 0; i < len; ++i)
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                {
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            while (get() != 0xFF)
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
-                {
-                    return false;
-                }
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object or std::size_t(-1) for an
-                    object of indefinite size
-    @param[in] tag_handler how CBOR tags should be treated
-    @return whether object creation completed
-    */
-    bool get_cbor_object(const std::size_t len,
-                         const cbor_tag_handler_t tag_handler)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
-        {
-            return false;
-        }
-
-        if (len != 0)
-        {
-            string_t key;
-            if (len != std::size_t(-1))
-            {
-                for (std::size_t i = 0; i < len; ++i)
-                {
-                    get();
-                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-
-                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-            else
-            {
-                while (get() != 0xFF)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-
-                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    /*!
-    @return whether a valid MessagePack value was passed to the SAX parser
-    */
-    bool parse_msgpack_internal()
-    {
-        switch (get())
-        {
-            // EOF
-            case std::char_traits<char_type>::eof():
-                return unexpect_eof(input_format_t::msgpack, "value");
-
-            // positive fixint
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-            case 0x18:
-            case 0x19:
-            case 0x1A:
-            case 0x1B:
-            case 0x1C:
-            case 0x1D:
-            case 0x1E:
-            case 0x1F:
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-            case 0x38:
-            case 0x39:
-            case 0x3A:
-            case 0x3B:
-            case 0x3C:
-            case 0x3D:
-            case 0x3E:
-            case 0x3F:
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            case 0x58:
-            case 0x59:
-            case 0x5A:
-            case 0x5B:
-            case 0x5C:
-            case 0x5D:
-            case 0x5E:
-            case 0x5F:
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78:
-            case 0x79:
-            case 0x7A:
-            case 0x7B:
-            case 0x7C:
-            case 0x7D:
-            case 0x7E:
-            case 0x7F:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            // fixmap
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixarray
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-            case 0x98:
-            case 0x99:
-            case 0x9A:
-            case 0x9B:
-            case 0x9C:
-            case 0x9D:
-            case 0x9E:
-            case 0x9F:
-                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            case 0xD9: // str 8
-            case 0xDA: // str 16
-            case 0xDB: // str 32
-            {
-                string_t s;
-                return get_msgpack_string(s) && sax->string(s);
-            }
-
-            case 0xC0: // nil
-                return sax->null();
-
-            case 0xC2: // false
-                return sax->boolean(false);
-
-            case 0xC3: // true
-                return sax->boolean(true);
-
-            case 0xC4: // bin 8
-            case 0xC5: // bin 16
-            case 0xC6: // bin 32
-            case 0xC7: // ext 8
-            case 0xC8: // ext 16
-            case 0xC9: // ext 32
-            case 0xD4: // fixext 1
-            case 0xD5: // fixext 2
-            case 0xD6: // fixext 4
-            case 0xD7: // fixext 8
-            case 0xD8: // fixext 16
-            {
-                binary_t b;
-                return get_msgpack_binary(b) && sax->binary(b);
-            }
-
-            case 0xCA: // float 32
-            {
-                float number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCB: // float 64
-            {
-                double number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCC: // uint 8
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCD: // uint 16
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCE: // uint 32
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCF: // uint 64
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xD0: // int 8
-            {
-                std::int8_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD1: // int 16
-            {
-                std::int16_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD2: // int 32
-            {
-                std::int32_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD3: // int 64
-            {
-                std::int64_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xDC: // array 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDD: // array 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDE: // map 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xDF: // map 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            // negative fixint
-            case 0xE0:
-            case 0xE1:
-            case 0xE2:
-            case 0xE3:
-            case 0xE4:
-            case 0xE5:
-            case 0xE6:
-            case 0xE7:
-            case 0xE8:
-            case 0xE9:
-            case 0xEA:
-            case 0xEB:
-            case 0xEC:
-            case 0xED:
-            case 0xEE:
-            case 0xEF:
-            case 0xF0:
-            case 0xF1:
-            case 0xF2:
-            case 0xF3:
-            case 0xF4:
-            case 0xF5:
-            case 0xF6:
-            case 0xF7:
-            case 0xF8:
-            case 0xF9:
-            case 0xFA:
-            case 0xFB:
-            case 0xFC:
-            case 0xFD:
-            case 0xFE:
-            case 0xFF:
-                return sax->number_integer(static_cast<std::int8_t>(current));
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a MessagePack string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_msgpack_string(string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            {
-                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0xD9: // str 8
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDA: // str 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDB: // str 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a MessagePack byte array
-
-    This function first reads starting bytes to determine the expected
-    byte array length and then copies this number of bytes into a byte array.
-
-    @param[out] result  created byte array
-
-    @return whether byte array creation completed
-    */
-    bool get_msgpack_binary(binary_t& result)
-    {
-        // helper function to set the subtype
-        auto assign_and_return_true = [&result](std::int8_t subtype)
-        {
-            result.set_subtype(static_cast<std::uint8_t>(subtype));
-            return true;
-        };
-
-        switch (current)
-        {
-            case 0xC4: // bin 8
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC5: // bin 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC6: // bin 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC7: // ext 8
-            {
-                std::uint8_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xC8: // ext 16
-            {
-                std::uint16_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xC9: // ext 32
-            {
-                std::uint32_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD4: // fixext 1
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 1, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD5: // fixext 2
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 2, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD6: // fixext 4
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 4, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD7: // fixext 8
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 8, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD8: // fixext 16
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 16, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            default:           // LCOV_EXCL_LINE
-                return false;  // LCOV_EXCL_LINE
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array
-    @return whether array creation completed
-    */
-    bool get_msgpack_array(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
-        {
-            return false;
-        }
-
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
-            {
-                return false;
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object
-    @return whether object creation completed
-    */
-    bool get_msgpack_object(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
-            {
-                return false;
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
-            {
-                return false;
-            }
-            key.clear();
-        }
-
-        return sax->end_object();
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether a valid UBJSON value was passed to the SAX parser
-    */
-    bool parse_ubjson_internal(const bool get_char = true)
-    {
-        return get_ubjson_value(get_char ? get_ignore_noop() : current);
-    }
-
-    /*!
-    @brief reads a UBJSON string
-
-    This function is either called after reading the 'S' byte explicitly
-    indicating a string, or in case of an object key where the 'S' byte can be
-    left out.
-
-    @param[out] result   created string
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether string creation completed
-    */
-    bool get_ubjson_string(string_t& result, const bool get_char = true)
-    {
-        if (get_char)
-        {
-            get();  // TODO(niels): may we ignore N here?
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            case 'U':
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'i':
-            {
-                std::int8_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'I':
-            {
-                std::int16_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'l':
-            {
-                std::int32_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'L':
-            {
-                std::int64_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            default:
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"), BasicJsonType()));
-        }
-    }
-
-    /*!
-    @param[out] result  determined size
-    @return whether size determination completed
-    */
-    bool get_ubjson_size_value(std::size_t& result)
-    {
-        switch (get_ignore_noop())
-        {
-            case 'U':
-            {
-                std::uint8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'i':
-            {
-                std::int8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
-                return true;
-            }
-
-            case 'I':
-            {
-                std::int16_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'l':
-            {
-                std::int32_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'L':
-            {
-                std::int64_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief determine the type and size for a container
-
-    In the optimized UBJSON format, a type and a size can be provided to allow
-    for a more compact representation.
-
-    @param[out] result  pair of the size and the type
-
-    @return whether pair creation completed
-    */
-    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result)
-    {
-        result.first = string_t::npos; // size
-        result.second = 0; // type
-
-        get_ignore_noop();
-
-        if (current == '$')
-        {
-            result.second = get();  // must not ignore 'N', because 'N' maybe the type
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type")))
-            {
-                return false;
-            }
-
-            get_ignore_noop();
-            if (JSON_HEDLEY_UNLIKELY(current != '#'))
-            {
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
-                {
-                    return false;
-                }
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"), BasicJsonType()));
-            }
-
-            return get_ubjson_size_value(result.first);
-        }
-
-        if (current == '#')
-        {
-            return get_ubjson_size_value(result.first);
-        }
-
-        return true;
-    }
-
-    /*!
-    @param prefix  the previously read or set type prefix
-    @return whether value creation completed
-    */
-    bool get_ubjson_value(const char_int_type prefix)
-    {
-        switch (prefix)
-        {
-            case std::char_traits<char_type>::eof():  // EOF
-                return unexpect_eof(input_format_t::ubjson, "value");
-
-            case 'T':  // true
-                return sax->boolean(true);
-            case 'F':  // false
-                return sax->boolean(false);
-
-            case 'Z':  // null
-                return sax->null();
-
-            case 'U':
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number);
-            }
-
-            case 'i':
-            {
-                std::int8_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
-            }
-
-            case 'I':
-            {
-                std::int16_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
-            }
-
-            case 'l':
-            {
-                std::int32_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
-            }
-
-            case 'L':
-            {
-                std::int64_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
-            }
-
-            case 'd':
-            {
-                float number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'D':
-            {
-                double number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'H':
-            {
-                return get_ubjson_high_precision_number();
-            }
-
-            case 'C':  // char
-            {
-                get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char")))
-                {
-                    return false;
-                }
-                if (JSON_HEDLEY_UNLIKELY(current > 127))
-                {
-                    auto last_token = get_token_string();
-                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"), BasicJsonType()));
-                }
-                string_t s(1, static_cast<typename string_t::value_type>(current));
-                return sax->string(s);
-            }
-
-            case 'S':  // string
-            {
-                string_t s;
-                return get_ubjson_string(s) && sax->string(s);
-            }
-
-            case '[':  // array
-                return get_ubjson_array();
-
-            case '{':  // object
-                return get_ubjson_object();
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @return whether array creation completed
-    */
-    bool get_ubjson_array()
-    {
-        std::pair<std::size_t, char_int_type> size_and_type;
-        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        if (size_and_type.first != string_t::npos)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                if (size_and_type.second != 'N')
-                {
-                    for (std::size_t i = 0; i < size_and_type.first; ++i)
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
-            {
-                return false;
-            }
-
-            while (current != ']')
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @return whether object creation completed
-    */
-    bool get_ubjson_object()
-    {
-        std::pair<std::size_t, char_int_type> size_and_type;
-        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        string_t key;
-        if (size_and_type.first != string_t::npos)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-        }
-        else
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
-            {
-                return false;
-            }
-
-            while (current != '}')
-            {
-                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
-                {
-                    return false;
-                }
-                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-                key.clear();
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    // Note, no reader for UBJSON binary types is implemented because they do
-    // not exist
-
-    bool get_ubjson_high_precision_number()
-    {
-        // get size of following number string
-        std::size_t size{};
-        auto res = get_ubjson_size_value(size);
-        if (JSON_HEDLEY_UNLIKELY(!res))
-        {
-            return res;
-        }
-
-        // get number string
-        std::vector<char> number_vector;
-        for (std::size_t i = 0; i < size; ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number")))
-            {
-                return false;
-            }
-            number_vector.push_back(static_cast<char>(current));
-        }
-
-        // parse number string
-        using ia_type = decltype(detail::input_adapter(number_vector));
-        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
-        const auto result_number = number_lexer.scan();
-        const auto number_string = number_lexer.get_token_string();
-        const auto result_remainder = number_lexer.scan();
-
-        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
-
-        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
-        {
-            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
-        }
-
-        switch (result_number)
-        {
-            case token_type::value_integer:
-                return sax->number_integer(number_lexer.get_number_integer());
-            case token_type::value_unsigned:
-                return sax->number_unsigned(number_lexer.get_number_unsigned());
-            case token_type::value_float:
-                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
-            case token_type::uninitialized:
-            case token_type::literal_true:
-            case token_type::literal_false:
-            case token_type::literal_null:
-            case token_type::value_string:
-            case token_type::begin_array:
-            case token_type::begin_object:
-            case token_type::end_array:
-            case token_type::end_object:
-            case token_type::name_separator:
-            case token_type::value_separator:
-            case token_type::parse_error:
-            case token_type::end_of_input:
-            case token_type::literal_or_value:
-            default:
-                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
-        }
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*!
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a -'ve valued
-    `std::char_traits<char_type>::eof()` in that case.
-
-    @return character read from the input
-    */
-    char_int_type get()
-    {
-        ++chars_read;
-        return current = ia.get_character();
-    }
-
-    /*!
-    @return character read from the input after ignoring all 'N' entries
-    */
-    char_int_type get_ignore_noop()
-    {
-        do
-        {
-            get();
-        }
-        while (current == 'N');
-
-        return current;
-    }
-
-    /*
-    @brief read a number from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format   the current format (for diagnostics)
-    @param[out] result  number of type @a NumberType
-
-    @return whether conversion completed
-
-    @note This function needs to respect the system's endianess, because
-          bytes in CBOR, MessagePack, and UBJSON are stored in network order
-          (big endian) and therefore need reordering on little endian systems.
-    */
-    template<typename NumberType, bool InputIsLittleEndian = false>
-    bool get_number(const input_format_t format, NumberType& result)
-    {
-        // step 1: read input into array with system's byte order
-        std::array<std::uint8_t, sizeof(NumberType)> vec{};
-        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number")))
-            {
-                return false;
-            }
-
-            // reverse byte order prior to conversion if necessary
-            if (is_little_endian != InputIsLittleEndian)
-            {
-                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
-            }
-            else
-            {
-                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
-            }
-        }
-
-        // step 2: convert array into number of type T and return
-        std::memcpy(&result, vec.data(), sizeof(NumberType));
-        return true;
-    }
-
-    /*!
-    @brief create a string by reading characters from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format the current format (for diagnostics)
-    @param[in] len number of characters to read
-    @param[out] result string created by reading @a len bytes
-
-    @return whether string creation completed
-
-    @note We can not reserve @a len bytes for the result, because @a len
-          may be too large. Usually, @ref unexpect_eof() detects the end of
-          the input before we run out of string memory.
-    */
-    template<typename NumberType>
-    bool get_string(const input_format_t format,
-                    const NumberType len,
-                    string_t& result)
-    {
-        bool success = true;
-        for (NumberType i = 0; i < len; i++)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
-            {
-                success = false;
-                break;
-            }
-            result.push_back(static_cast<typename string_t::value_type>(current));
-        }
-        return success;
-    }
-
-    /*!
-    @brief create a byte array by reading bytes from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format the current format (for diagnostics)
-    @param[in] len number of bytes to read
-    @param[out] result byte array created by reading @a len bytes
-
-    @return whether byte array creation completed
-
-    @note We can not reserve @a len bytes for the result, because @a len
-          may be too large. Usually, @ref unexpect_eof() detects the end of
-          the input before we run out of memory.
-    */
-    template<typename NumberType>
-    bool get_binary(const input_format_t format,
-                    const NumberType len,
-                    binary_t& result)
-    {
-        bool success = true;
-        for (NumberType i = 0; i < len; i++)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
-            {
-                success = false;
-                break;
-            }
-            result.push_back(static_cast<std::uint8_t>(current));
-        }
-        return success;
-    }
-
-    /*!
-    @param[in] format   the current format (for diagnostics)
-    @param[in] context  further context information (for diagnostics)
-    @return whether the last read character is not EOF
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    bool unexpect_eof(const input_format_t format, const char* context) const
-    {
-        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
-        {
-            return sax->parse_error(chars_read, "<end of file>",
-                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), BasicJsonType()));
-        }
-        return true;
-    }
-
-    /*!
-    @return a string representation of the last read byte
-    */
-    std::string get_token_string() const
-    {
-        std::array<char, 3> cr{{}};
-        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current)); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        return std::string{cr.data()};
-    }
-
-    /*!
-    @param[in] format   the current format
-    @param[in] detail   a detailed error message
-    @param[in] context  further context information
-    @return a message string to use in the parse_error exceptions
-    */
-    std::string exception_message(const input_format_t format,
-                                  const std::string& detail,
-                                  const std::string& context) const
-    {
-        std::string error_msg = "syntax error while parsing ";
-
-        switch (format)
-        {
-            case input_format_t::cbor:
-                error_msg += "CBOR";
-                break;
-
-            case input_format_t::msgpack:
-                error_msg += "MessagePack";
-                break;
-
-            case input_format_t::ubjson:
-                error_msg += "UBJSON";
-                break;
-
-            case input_format_t::bson:
-                error_msg += "BSON";
-                break;
-
-            case input_format_t::json: // LCOV_EXCL_LINE
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-        return error_msg + " " + context + ": " + detail;
-    }
-
-  private:
-    /// input adapter
-    InputAdapterType ia;
-
-    /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
-
-    /// the number of characters read
-    std::size_t chars_read = 0;
-
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
-
-    /// the SAX parser
-    json_sax_t* sax = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-// #include <nlohmann/detail/input/parser.hpp>
-
-
-#include <cmath> // isfinite
-#include <cstdint> // uint8_t
-#include <functional> // function
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/json_sax.hpp>
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-////////////
-// parser //
-////////////
-
-enum class parse_event_t : std::uint8_t
-{
-    /// the parser read `{` and started to process a JSON object
-    object_start,
-    /// the parser read `}` and finished processing a JSON object
-    object_end,
-    /// the parser read `[` and started to process a JSON array
-    array_start,
-    /// the parser read `]` and finished processing a JSON array
-    array_end,
-    /// the parser read a key of a value in an object
-    key,
-    /// the parser finished reading a JSON value
-    value
-};
-
-template<typename BasicJsonType>
-using parser_callback_t =
-    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
-
-/*!
-@brief syntax analysis
-
-This class implements a recursive descent parser.
-*/
-template<typename BasicJsonType, typename InputAdapterType>
-class parser
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
-    using token_type = typename lexer_t::token_type;
-
-  public:
-    /// a parser reading from an input adapter
-    explicit parser(InputAdapterType&& adapter,
-                    const parser_callback_t<BasicJsonType> cb = nullptr,
-                    const bool allow_exceptions_ = true,
-                    const bool skip_comments = false)
-        : callback(cb)
-        , m_lexer(std::move(adapter), skip_comments)
-        , allow_exceptions(allow_exceptions_)
-    {
-        // read first token
-        get_token();
-    }
-
-    /*!
-    @brief public parser interface
-
-    @param[in] strict      whether to expect the last token to be EOF
-    @param[in,out] result  parsed JSON value
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-    */
-    void parse(const bool strict, BasicJsonType& result)
-    {
-        if (callback)
-        {
-            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
-            sax_parse_internal(&sdp);
-
-            // in strict mode, input must be completely read
-            if (strict && (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(),
-                                                    exception_message(token_type::end_of_input, "value"), BasicJsonType()));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-
-            // set top-level value to null if it was discarded by the callback
-            // function
-            if (result.is_discarded())
-            {
-                result = nullptr;
-            }
-        }
-        else
-        {
-            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
-            sax_parse_internal(&sdp);
-
-            // in strict mode, input must be completely read
-            if (strict && (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-        }
-
-        result.assert_invariant();
-    }
-
-    /*!
-    @brief public accept interface
-
-    @param[in] strict  whether to expect the last token to be EOF
-    @return whether the input is a proper JSON text
-    */
-    bool accept(const bool strict = true)
-    {
-        json_sax_acceptor<BasicJsonType> sax_acceptor;
-        return sax_parse(&sax_acceptor, strict);
-    }
-
-    template<typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    bool sax_parse(SAX* sax, const bool strict = true)
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-        const bool result = sax_parse_internal(sax);
-
-        // strict mode: next byte must be EOF
-        if (result && strict && (get_token() != token_type::end_of_input))
-        {
-            return sax->parse_error(m_lexer.get_position(),
-                                    m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
-        }
-
-        return result;
-    }
-
-  private:
-    template<typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    bool sax_parse_internal(SAX* sax)
-    {
-        // stack to remember the hierarchy of structured values we are parsing
-        // true = array; false = object
-        std::vector<bool> states;
-        // value to avoid a goto (see comment where set to true)
-        bool skip_to_state_evaluation = false;
-
-        while (true)
-        {
-            if (!skip_to_state_evaluation)
-            {
-                // invariant: get_token() was called before each iteration
-                switch (last_token)
-                {
-                    case token_type::begin_object:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing } -> we are done
-                        if (get_token() == token_type::end_object)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // parse key
-                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
-                        }
-                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-
-                        // parse separator (:)
-                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
-                        }
-
-                        // remember we are now inside an object
-                        states.push_back(false);
-
-                        // parse values
-                        get_token();
-                        continue;
-                    }
-
-                    case token_type::begin_array:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing ] -> we are done
-                        if (get_token() == token_type::end_array)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // remember we are now inside an array
-                        states.push_back(true);
-
-                        // parse values (no need to call get_token)
-                        continue;
-                    }
-
-                    case token_type::value_float:
-                    {
-                        const auto res = m_lexer.get_number_float();
-
-                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'", BasicJsonType()));
-                        }
-
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-
-                        break;
-                    }
-
-                    case token_type::literal_false:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::literal_null:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::literal_true:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_integer:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_string:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_unsigned:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::parse_error:
-                    {
-                        // using "uninitialized" to avoid "expected" message
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), BasicJsonType()));
-                    }
-
-                    case token_type::uninitialized:
-                    case token_type::end_array:
-                    case token_type::end_object:
-                    case token_type::name_separator:
-                    case token_type::value_separator:
-                    case token_type::end_of_input:
-                    case token_type::literal_or_value:
-                    default: // the last token was unexpected
-                    {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), BasicJsonType()));
-                    }
-                }
-            }
-            else
-            {
-                skip_to_state_evaluation = false;
-            }
-
-            // we reached this line after we successfully parsed a value
-            if (states.empty())
-            {
-                // empty stack: we reached the end of the hierarchy: done
-                return true;
-            }
-
-            if (states.back())  // array
-            {
-                // comma -> next value
-                if (get_token() == token_type::value_separator)
-                {
-                    // parse a new value
-                    get_token();
-                    continue;
-                }
-
-                // closing ]
-                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
-                    {
-                        return false;
-                    }
-
-                    // We are done with this array. Before we can parse a
-                    // new value, we need to evaluate the new state first.
-                    // By setting skip_to_state_evaluation to false, we
-                    // are effectively jumping to the beginning of this if.
-                    JSON_ASSERT(!states.empty());
-                    states.pop_back();
-                    skip_to_state_evaluation = true;
-                    continue;
-                }
-
-                return sax->parse_error(m_lexer.get_position(),
-                                        m_lexer.get_token_string(),
-                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), BasicJsonType()));
-            }
-
-            // states.back() is false -> object
-
-            // comma -> next value
-            if (get_token() == token_type::value_separator)
-            {
-                // parse key
-                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
-                {
-                    return sax->parse_error(m_lexer.get_position(),
-                                            m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
-                }
-
-                if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
-                {
-                    return false;
-                }
-
-                // parse separator (:)
-                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
-                {
-                    return sax->parse_error(m_lexer.get_position(),
-                                            m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
-                }
-
-                // parse values
-                get_token();
-                continue;
-            }
-
-            // closing }
-            if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
-            {
-                if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
-                {
-                    return false;
-                }
-
-                // We are done with this object. Before we can parse a
-                // new value, we need to evaluate the new state first.
-                // By setting skip_to_state_evaluation to false, we
-                // are effectively jumping to the beginning of this if.
-                JSON_ASSERT(!states.empty());
-                states.pop_back();
-                skip_to_state_evaluation = true;
-                continue;
-            }
-
-            return sax->parse_error(m_lexer.get_position(),
-                                    m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), BasicJsonType()));
-        }
-    }
-
-    /// get next token from lexer
-    token_type get_token()
-    {
-        return last_token = m_lexer.scan();
-    }
-
-    std::string exception_message(const token_type expected, const std::string& context)
-    {
-        std::string error_msg = "syntax error ";
-
-        if (!context.empty())
-        {
-            error_msg += "while parsing " + context + " ";
-        }
-
-        error_msg += "- ";
-
-        if (last_token == token_type::parse_error)
-        {
-            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
-                         m_lexer.get_token_string() + "'";
-        }
-        else
-        {
-            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
-        }
-
-        if (expected != token_type::uninitialized)
-        {
-            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
-        }
-
-        return error_msg;
-    }
-
-  private:
-    /// callback function
-    const parser_callback_t<BasicJsonType> callback = nullptr;
-    /// the type of the last read token
-    token_type last_token = token_type::uninitialized;
-    /// the lexer
-    lexer_t m_lexer;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/internal_iterator.hpp>
-
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-
-#include <cstddef> // ptrdiff_t
-#include <limits>  // numeric_limits
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/*
-@brief an iterator for primitive JSON types
-
-This class models an iterator for primitive JSON types (boolean, number,
-string). It's only purpose is to allow the iterator/const_iterator classes
-to "iterate" over primitive values. Internally, the iterator is modeled by
-a `difference_type` variable. Value begin_value (`0`) models the begin,
-end_value (`1`) models past the end.
-*/
-class primitive_iterator_t
-{
-  private:
-    using difference_type = std::ptrdiff_t;
-    static constexpr difference_type begin_value = 0;
-    static constexpr difference_type end_value = begin_value + 1;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /// iterator as signed integer type
-    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
-
-  public:
-    constexpr difference_type get_value() const noexcept
-    {
-        return m_it;
-    }
-
-    /// set iterator to a defined beginning
-    void set_begin() noexcept
-    {
-        m_it = begin_value;
-    }
-
-    /// set iterator to a defined past the end
-    void set_end() noexcept
-    {
-        m_it = end_value;
-    }
-
-    /// return whether the iterator can be dereferenced
-    constexpr bool is_begin() const noexcept
-    {
-        return m_it == begin_value;
-    }
-
-    /// return whether the iterator is at end
-    constexpr bool is_end() const noexcept
-    {
-        return m_it == end_value;
-    }
-
-    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it == rhs.m_it;
-    }
-
-    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it < rhs.m_it;
-    }
-
-    primitive_iterator_t operator+(difference_type n) noexcept
-    {
-        auto result = *this;
-        result += n;
-        return result;
-    }
-
-    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it - rhs.m_it;
-    }
-
-    primitive_iterator_t& operator++() noexcept
-    {
-        ++m_it;
-        return *this;
-    }
-
-    primitive_iterator_t const operator++(int) noexcept // NOLINT(readability-const-return-type)
-    {
-        auto result = *this;
-        ++m_it;
-        return result;
-    }
-
-    primitive_iterator_t& operator--() noexcept
-    {
-        --m_it;
-        return *this;
-    }
-
-    primitive_iterator_t const operator--(int) noexcept // NOLINT(readability-const-return-type)
-    {
-        auto result = *this;
-        --m_it;
-        return result;
-    }
-
-    primitive_iterator_t& operator+=(difference_type n) noexcept
-    {
-        m_it += n;
-        return *this;
-    }
-
-    primitive_iterator_t& operator-=(difference_type n) noexcept
-    {
-        m_it -= n;
-        return *this;
-    }
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/*!
-@brief an iterator value
-
-@note This structure could easily be a union, but MSVC currently does not allow
-unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
-*/
-template<typename BasicJsonType> struct internal_iterator
-{
-    /// iterator for JSON objects
-    typename BasicJsonType::object_t::iterator object_iterator {};
-    /// iterator for JSON arrays
-    typename BasicJsonType::array_t::iterator array_iterator {};
-    /// generic iterator for all other types
-    primitive_iterator_t primitive_iterator {};
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/iter_impl.hpp>
-
-
-#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
-#include <type_traits> // conditional, is_const, remove_const
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/iterators/internal_iterator.hpp>
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-// forward declare, to be able to friend it later on
-template<typename IteratorType> class iteration_proxy;
-template<typename IteratorType> class iteration_proxy_value;
-
-/*!
-@brief a template for a bidirectional iterator for the @ref basic_json class
-This class implements a both iterators (iterator and const_iterator) for the
-@ref basic_json class.
-@note An iterator is called *initialized* when a pointer to a JSON value has
-      been set (e.g., by a constructor or a copy assignment). If the iterator is
-      default-constructed, it is *uninitialized* and most methods are undefined.
-      **The library uses assertions to detect calls on uninitialized iterators.**
-@requirement The class satisfies the following concept requirements:
--
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
-  The iterator that can be moved can be moved in both directions (i.e.
-  incremented and decremented).
-@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
-       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
-*/
-template<typename BasicJsonType>
-class iter_impl
-{
-    /// the iterator with BasicJsonType of different const-ness
-    using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
-    /// allow basic_json to access private members
-    friend other_iter_impl;
-    friend BasicJsonType;
-    friend iteration_proxy<iter_impl>;
-    friend iteration_proxy_value<iter_impl>;
-
-    using object_t = typename BasicJsonType::object_t;
-    using array_t = typename BasicJsonType::array_t;
-    // make sure BasicJsonType is basic_json or const basic_json
-    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
-                  "iter_impl only accepts (const) basic_json");
-
-  public:
-
-    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
-    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
-    /// A user-defined iterator should provide publicly accessible typedefs named
-    /// iterator_category, value_type, difference_type, pointer, and reference.
-    /// Note that value_type is required to be non-const, even for constant iterators.
-    using iterator_category = std::bidirectional_iterator_tag;
-
-    /// the type of the values when the iterator is dereferenced
-    using value_type = typename BasicJsonType::value_type;
-    /// a type to represent differences between iterators
-    using difference_type = typename BasicJsonType::difference_type;
-    /// defines a pointer to the type iterated over (value_type)
-    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
-          typename BasicJsonType::const_pointer,
-          typename BasicJsonType::pointer>::type;
-    /// defines a reference to the type iterated over (value_type)
-    using reference =
-        typename std::conditional<std::is_const<BasicJsonType>::value,
-        typename BasicJsonType::const_reference,
-        typename BasicJsonType::reference>::type;
-
-    iter_impl() = default;
-    ~iter_impl() = default;
-    iter_impl(iter_impl&&) noexcept = default;
-    iter_impl& operator=(iter_impl&&) noexcept = default;
-
-    /*!
-    @brief constructor for a given JSON instance
-    @param[in] object  pointer to a JSON object for this iterator
-    @pre object != nullptr
-    @post The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    explicit iter_impl(pointer object) noexcept : m_object(object)
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = typename object_t::iterator();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = typename array_t::iterator();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator = primitive_iterator_t();
-                break;
-            }
-        }
-    }
-
-    /*!
-    @note The conventional copy constructor and copy assignment are implicitly
-          defined. Combined with the following converting constructor and
-          assignment, they support: (1) copy from iterator to iterator, (2)
-          copy from const iterator to const iterator, and (3) conversion from
-          iterator to const iterator. However conversion from const iterator
-          to iterator is not defined.
-    */
-
-    /*!
-    @brief const copy constructor
-    @param[in] other const iterator to copy from
-    @note This copy constructor had to be defined explicitly to circumvent a bug
-          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
-          information refer to: https://github.com/nlohmann/json/issues/1608
-    */
-    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it)
-    {}
-
-    /*!
-    @brief converting assignment
-    @param[in] other const iterator to copy from
-    @return const/non-const iterator
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
-    {
-        if (&other != this)
-        {
-            m_object = other.m_object;
-            m_it = other.m_it;
-        }
-        return *this;
-    }
-
-    /*!
-    @brief converting constructor
-    @param[in] other  non-const iterator to copy from
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it)
-    {}
-
-    /*!
-    @brief converting assignment
-    @param[in] other  non-const iterator to copy from
-    @return const/non-const iterator
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
-    {
-        m_object = other.m_object;
-        m_it = other.m_it;
-        return *this;
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief set the iterator to the first value
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    void set_begin() noexcept
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = m_object->m_value.object->begin();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = m_object->m_value.array->begin();
-                break;
-            }
-
-            case value_t::null:
-            {
-                // set to end so begin()==end() is true: null is empty
-                m_it.primitive_iterator.set_end();
-                break;
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator.set_begin();
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief set the iterator past the last value
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    void set_end() noexcept
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = m_object->m_value.object->end();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = m_object->m_value.array->end();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator.set_end();
-                break;
-            }
-        }
-    }
-
-  public:
-    /*!
-    @brief return a reference to the value pointed to by the iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator*() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
-                return m_it.object_iterator->second;
-            }
-
-            case value_t::array:
-            {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
-                return *m_it.array_iterator;
-            }
-
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
-                {
-                    return *m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief dereference the iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    pointer operator->() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
-                return &(m_it.object_iterator->second);
-            }
-
-            case value_t::array:
-            {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
-                return &*m_it.array_iterator;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
-                {
-                    return m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief post-increment (it++)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl const operator++(int) // NOLINT(readability-const-return-type)
-    {
-        auto result = *this;
-        ++(*this);
-        return result;
-    }
-
-    /*!
-    @brief pre-increment (++it)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator++()
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                std::advance(m_it.object_iterator, 1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, 1);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                ++m_it.primitive_iterator;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief post-decrement (it--)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl const operator--(int) // NOLINT(readability-const-return-type)
-    {
-        auto result = *this;
-        --(*this);
-        return result;
-    }
-
-    /*!
-    @brief pre-decrement (--it)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator--()
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                std::advance(m_it.object_iterator, -1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, -1);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                --m_it.primitive_iterator;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief comparison: equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
-    bool operator==(const IterImpl& other) const
-    {
-        // if objects are not the same, the comparison is undefined
-        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
-        }
-
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                return (m_it.object_iterator == other.m_it.object_iterator);
-
-            case value_t::array:
-                return (m_it.array_iterator == other.m_it.array_iterator);
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
-        }
-    }
-
-    /*!
-    @brief comparison: not equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
-    bool operator!=(const IterImpl& other) const
-    {
-        return !operator==(other);
-    }
-
-    /*!
-    @brief comparison: smaller
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator<(const iter_impl& other) const
-    {
-        // if objects are not the same, the comparison is undefined
-        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
-        }
-
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", *m_object));
-
-            case value_t::array:
-                return (m_it.array_iterator < other.m_it.array_iterator);
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
-        }
-    }
-
-    /*!
-    @brief comparison: less than or equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator<=(const iter_impl& other) const
-    {
-        return !other.operator < (*this);
-    }
-
-    /*!
-    @brief comparison: greater than
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator>(const iter_impl& other) const
-    {
-        return !operator<=(other);
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator>=(const iter_impl& other) const
-    {
-        return !operator<(other);
-    }
-
-    /*!
-    @brief add to iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator+=(difference_type i)
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, i);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator += i;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief subtract from iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator-=(difference_type i)
-    {
-        return operator+=(-i);
-    }
-
-    /*!
-    @brief add to iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator+(difference_type i) const
-    {
-        auto result = *this;
-        result += i;
-        return result;
-    }
-
-    /*!
-    @brief addition of distance and iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    friend iter_impl operator+(difference_type i, const iter_impl& it)
-    {
-        auto result = it;
-        result += i;
-        return result;
-    }
-
-    /*!
-    @brief subtract from iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator-(difference_type i) const
-    {
-        auto result = *this;
-        result -= i;
-        return result;
-    }
-
-    /*!
-    @brief return difference
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    difference_type operator-(const iter_impl& other) const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
-
-            case value_t::array:
-                return m_it.array_iterator - other.m_it.array_iterator;
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return m_it.primitive_iterator - other.m_it.primitive_iterator;
-        }
-    }
-
-    /*!
-    @brief access to successor
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator[](difference_type n) const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", *m_object));
-
-            case value_t::array:
-                return *std::next(m_it.array_iterator, n);
-
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
-                {
-                    return *m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief return the key of an object iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    const typename object_t::key_type& key() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
-        {
-            return m_it.object_iterator->first;
-        }
-
-        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", *m_object));
-    }
-
-    /*!
-    @brief return the value of an iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference value() const
-    {
-        return operator*();
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /// associated JSON instance
-    pointer m_object = nullptr;
-    /// the actual iterator of the associated instance
-    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
-};
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
-// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
-
-
-#include <cstddef> // ptrdiff_t
-#include <iterator> // reverse_iterator
-#include <utility> // declval
-
-namespace nlohmann
-{
-namespace detail
-{
-//////////////////////
-// reverse_iterator //
-//////////////////////
-
-/*!
-@brief a template for a reverse iterator class
-
-@tparam Base the base iterator type to reverse. Valid types are @ref
-iterator (to create @ref reverse_iterator) and @ref const_iterator (to
-create @ref const_reverse_iterator).
-
-@requirement The class satisfies the following concept requirements:
--
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
-  The iterator that can be moved can be moved in both directions (i.e.
-  incremented and decremented).
-- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
-  It is possible to write to the pointed-to element (only if @a Base is
-  @ref iterator).
-
-@since version 1.0.0
-*/
-template<typename Base>
-class json_reverse_iterator : public std::reverse_iterator<Base>
-{
-  public:
-    using difference_type = std::ptrdiff_t;
-    /// shortcut to the reverse iterator adapter
-    using base_iterator = std::reverse_iterator<Base>;
-    /// the reference type for the pointed-to element
-    using reference = typename Base::reference;
-
-    /// create reverse iterator from iterator
-    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
-        : base_iterator(it) {}
-
-    /// create reverse iterator from base class
-    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
-
-    /// post-increment (it++)
-    json_reverse_iterator const operator++(int) // NOLINT(readability-const-return-type)
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
-    }
-
-    /// pre-increment (++it)
-    json_reverse_iterator& operator++()
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
-    }
-
-    /// post-decrement (it--)
-    json_reverse_iterator const operator--(int) // NOLINT(readability-const-return-type)
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
-    }
-
-    /// pre-decrement (--it)
-    json_reverse_iterator& operator--()
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
-    }
-
-    /// add to iterator
-    json_reverse_iterator& operator+=(difference_type i)
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
-    }
-
-    /// add to iterator
-    json_reverse_iterator operator+(difference_type i) const
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
-    }
-
-    /// subtract from iterator
-    json_reverse_iterator operator-(difference_type i) const
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
-    }
-
-    /// return difference
-    difference_type operator-(const json_reverse_iterator& other) const
-    {
-        return base_iterator(*this) - base_iterator(other);
-    }
-
-    /// access to successor
-    reference operator[](difference_type n) const
-    {
-        return *(this->operator+(n));
-    }
-
-    /// return the key of an object iterator
-    auto key() const -> decltype(std::declval<Base>().key())
-    {
-        auto it = --this->base();
-        return it.key();
-    }
-
-    /// return the value of an iterator
-    reference value() const
-    {
-        auto it = --this->base();
-        return it.operator * ();
-    }
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-// #include <nlohmann/detail/json_pointer.hpp>
-
-
-#include <algorithm> // all_of
-#include <cctype> // isdigit
-#include <limits> // max
-#include <numeric> // accumulate
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/string_escape.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-template<typename BasicJsonType>
-class json_pointer
-{
-    // allow basic_json to access private members
-    NLOHMANN_BASIC_JSON_TPL_DECLARATION
-    friend class basic_json;
-
-  public:
-    /*!
-    @brief create JSON pointer
-
-    Create a JSON pointer according to the syntax described in
-    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
-
-    @param[in] s  string representing the JSON pointer; if omitted, the empty
-                  string is assumed which references the whole JSON value
-
-    @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
-                           not begin with a slash (`/`); see example below
-
-    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
-    not followed by `0` (representing `~`) or `1` (representing `/`); see
-    example below
-
-    @liveexample{The example shows the construction several valid JSON pointers
-    as well as the exceptional behavior.,json_pointer}
-
-    @since version 2.0.0
-    */
-    explicit json_pointer(const std::string& s = "")
-        : reference_tokens(split(s))
-    {}
-
-    /*!
-    @brief return a string representation of the JSON pointer
-
-    @invariant For each JSON pointer `ptr`, it holds:
-    @code {.cpp}
-    ptr == json_pointer(ptr.to_string());
-    @endcode
-
-    @return a string representation of the JSON pointer
-
-    @liveexample{The example shows the result of `to_string`.,json_pointer__to_string}
-
-    @since version 2.0.0
-    */
-    std::string to_string() const
-    {
-        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
-                               std::string{},
-                               [](const std::string & a, const std::string & b)
-        {
-            return a + "/" + detail::escape(b);
-        });
-    }
-
-    /// @copydoc to_string()
-    operator std::string() const
-    {
-        return to_string();
-    }
-
-    /*!
-    @brief append another JSON pointer at the end of this JSON pointer
-
-    @param[in] ptr  JSON pointer to append
-    @return JSON pointer with @a ptr appended
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa see @ref operator/=(std::string) to append a reference token
-    @sa see @ref operator/=(std::size_t) to append an array index
-    @sa see @ref operator/(const json_pointer&, const json_pointer&) for a binary operator
-
-    @since version 3.6.0
-    */
-    json_pointer& operator/=(const json_pointer& ptr)
-    {
-        reference_tokens.insert(reference_tokens.end(),
-                                ptr.reference_tokens.begin(),
-                                ptr.reference_tokens.end());
-        return *this;
-    }
-
-    /*!
-    @brief append an unescaped reference token at the end of this JSON pointer
-
-    @param[in] token  reference token to append
-    @return JSON pointer with @a token appended without escaping @a token
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Amortized constant.
-
-    @sa see @ref operator/=(const json_pointer&) to append a JSON pointer
-    @sa see @ref operator/=(std::size_t) to append an array index
-    @sa see @ref operator/(const json_pointer&, std::size_t) for a binary operator
-
-    @since version 3.6.0
-    */
-    json_pointer& operator/=(std::string token)
-    {
-        push_back(std::move(token));
-        return *this;
-    }
-
-    /*!
-    @brief append an array index at the end of this JSON pointer
-
-    @param[in] array_idx  array index to append
-    @return JSON pointer with @a array_idx appended
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Amortized constant.
-
-    @sa see @ref operator/=(const json_pointer&) to append a JSON pointer
-    @sa see @ref operator/=(std::string) to append a reference token
-    @sa see @ref operator/(const json_pointer&, std::string) for a binary operator
-
-    @since version 3.6.0
-    */
-    json_pointer& operator/=(std::size_t array_idx)
-    {
-        return *this /= std::to_string(array_idx);
-    }
-
-    /*!
-    @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
-
-    @param[in] lhs  JSON pointer
-    @param[in] rhs  JSON pointer
-    @return a new JSON pointer with @a rhs appended to @a lhs
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a lhs and @a rhs.
-
-    @sa see @ref operator/=(const json_pointer&) to append a JSON pointer
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& lhs,
-                                  const json_pointer& rhs)
-    {
-        return json_pointer(lhs) /= rhs;
-    }
-
-    /*!
-    @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
-
-    @param[in] ptr  JSON pointer
-    @param[in] token  reference token
-    @return a new JSON pointer with unescaped @a token appended to @a ptr
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa see @ref operator/=(std::string) to append a reference token
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& ptr, std::string token) // NOLINT(performance-unnecessary-value-param)
-    {
-        return json_pointer(ptr) /= std::move(token);
-    }
-
-    /*!
-    @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
-
-    @param[in] ptr  JSON pointer
-    @param[in] array_idx  array index
-    @return a new JSON pointer with @a array_idx appended to @a ptr
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa see @ref operator/=(std::size_t) to append an array index
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_idx)
-    {
-        return json_pointer(ptr) /= array_idx;
-    }
-
-    /*!
-    @brief returns the parent of this JSON pointer
-
-    @return parent of this JSON pointer; in case this JSON pointer is the root,
-            the root itself is returned
-
-    @complexity Linear in the length of the JSON pointer.
-
-    @liveexample{The example shows the result of `parent_pointer` for different
-    JSON Pointers.,json_pointer__parent_pointer}
-
-    @since version 3.6.0
-    */
-    json_pointer parent_pointer() const
-    {
-        if (empty())
-        {
-            return *this;
-        }
-
-        json_pointer res = *this;
-        res.pop_back();
-        return res;
-    }
-
-    /*!
-    @brief remove last reference token
-
-    @pre not `empty()`
-
-    @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back}
-
-    @complexity Constant.
-
-    @throw out_of_range.405 if JSON pointer has no parent
-
-    @since version 3.6.0
-    */
-    void pop_back()
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
-        }
-
-        reference_tokens.pop_back();
-    }
-
-    /*!
-    @brief return last reference token
-
-    @pre not `empty()`
-    @return last reference token
-
-    @liveexample{The example shows the usage of `back`.,json_pointer__back}
-
-    @complexity Constant.
-
-    @throw out_of_range.405 if JSON pointer has no parent
-
-    @since version 3.6.0
-    */
-    const std::string& back() const
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
-        }
-
-        return reference_tokens.back();
-    }
-
-    /*!
-    @brief append an unescaped token at the end of the reference pointer
-
-    @param[in] token  token to add
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows the result of `push_back` for different
-    JSON Pointers.,json_pointer__push_back}
-
-    @since version 3.6.0
-    */
-    void push_back(const std::string& token)
-    {
-        reference_tokens.push_back(token);
-    }
-
-    /// @copydoc push_back(const std::string&)
-    void push_back(std::string&& token)
-    {
-        reference_tokens.push_back(std::move(token));
-    }
-
-    /*!
-    @brief return whether pointer points to the root document
-
-    @return true iff the JSON pointer points to the root document
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example shows the result of `empty` for different JSON
-    Pointers.,json_pointer__empty}
-
-    @since version 3.6.0
-    */
-    bool empty() const noexcept
-    {
-        return reference_tokens.empty();
-    }
-
-  private:
-    /*!
-    @param[in] s  reference token to be converted into an array index
-
-    @return integer representation of @a s
-
-    @throw parse_error.106  if an array index begins with '0'
-    @throw parse_error.109  if an array index begins not with a digit
-    @throw out_of_range.404 if string @a s could not be converted to an integer
-    @throw out_of_range.410 if an array index exceeds size_type
-    */
-    static typename BasicJsonType::size_type array_index(const std::string& s)
-    {
-        using size_type = typename BasicJsonType::size_type;
-
-        // error condition (cf. RFC 6901, Sect. 4)
-        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
-        {
-            JSON_THROW(detail::parse_error::create(106, 0, "array index '" + s + "' must not begin with '0'", BasicJsonType()));
-        }
-
-        // error condition (cf. RFC 6901, Sect. 4)
-        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
-        {
-            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number", BasicJsonType()));
-        }
-
-        std::size_t processed_chars = 0;
-        unsigned long long res = 0;  // NOLINT(runtime/int)
-        JSON_TRY
-        {
-            res = std::stoull(s, &processed_chars);
-        }
-        JSON_CATCH(std::out_of_range&)
-        {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
-        }
-
-        // check if the string was completely read
-        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
-        {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
-        }
-
-        // only triggered on special platforms (like 32bit), see also
-        // https://github.com/nlohmann/json/pull/2203
-        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
-        {
-            JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type", BasicJsonType())); // LCOV_EXCL_LINE
-        }
-
-        return static_cast<size_type>(res);
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    json_pointer top() const
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
-        }
-
-        json_pointer result = *this;
-        result.reference_tokens = {reference_tokens[0]};
-        return result;
-    }
-
-  private:
-    /*!
-    @brief create and return a reference to the pointed to value
-
-    @complexity Linear in the number of reference tokens.
-
-    @throw parse_error.109 if array index is not a number
-    @throw type_error.313 if value cannot be unflattened
-    */
-    BasicJsonType& get_and_create(BasicJsonType& j) const
-    {
-        auto* result = &j;
-
-        // in case no reference tokens exist, return a reference to the JSON value
-        // j which will be overwritten by a primitive value
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (result->type())
-            {
-                case detail::value_t::null:
-                {
-                    if (reference_token == "0")
-                    {
-                        // start a new array if reference token is 0
-                        result = &result->operator[](0);
-                    }
-                    else
-                    {
-                        // start a new object otherwise
-                        result = &result->operator[](reference_token);
-                    }
-                    break;
-                }
-
-                case detail::value_t::object:
-                {
-                    // create an entry in the object
-                    result = &result->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    // create an entry in the array
-                    result = &result->operator[](array_index(reference_token));
-                    break;
-                }
-
-                /*
-                The following code is only reached if there exists a reference
-                token _and_ the current value is primitive. In this case, we have
-                an error situation, because primitive values may only occur as
-                single value; that is, with an empty list of reference tokens.
-                */
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", j));
-            }
-        }
-
-        return *result;
-    }
-
-    /*!
-    @brief return a reference to the pointed to value
-
-    @note This version does not throw if a value is not present, but tries to
-          create nested values instead. For instance, calling this function
-          with pointer `"/this/that"` on a null value is equivalent to calling
-          `operator[]("this").operator[]("that")` on that value, effectively
-          changing the null value to an object.
-
-    @param[in] ptr  a JSON value
-
-    @return reference to the JSON value pointed to by the JSON pointer
-
-    @complexity Linear in the length of the JSON pointer.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            // convert null values to arrays or objects before continuing
-            if (ptr->is_null())
-            {
-                // check if reference token is a number
-                const bool nums =
-                    std::all_of(reference_token.begin(), reference_token.end(),
-                                [](const unsigned char x)
-                {
-                    return std::isdigit(x);
-                });
-
-                // change value to array for numbers or "-" or to object otherwise
-                *ptr = (nums || reference_token == "-")
-                       ? detail::value_t::array
-                       : detail::value_t::object;
-            }
-
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // use unchecked object access
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (reference_token == "-")
-                    {
-                        // explicitly treat "-" as index beyond the end
-                        ptr = &ptr->operator[](ptr->m_value.array->size());
-                    }
-                    else
-                    {
-                        // convert array index to number; unchecked access
-                        ptr = &ptr->operator[](array_index(reference_token));
-                    }
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    BasicJsonType& get_checked(BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // note: at performs range check
-                    ptr = &ptr->at(reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range", *ptr));
-                    }
-
-                    // note: at performs range check
-                    ptr = &ptr->at(array_index(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @brief return a const reference to the pointed to value
-
-    @param[in] ptr  a JSON value
-
-    @return const reference to the JSON value pointed to by the JSON
-    pointer
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // use unchecked object access
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" cannot be used for const access
-                        JSON_THROW(detail::out_of_range::create(402, "array index '-' (" + std::to_string(ptr->m_value.array->size()) + ") is out of range", *ptr));
-                    }
-
-                    // use unchecked array access
-                    ptr = &ptr->operator[](array_index(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // note: at performs range check
-                    ptr = &ptr->at(reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range", *ptr));
-                    }
-
-                    // note: at performs range check
-                    ptr = &ptr->at(array_index(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    */
-    bool contains(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    if (!ptr->contains(reference_token))
-                    {
-                        // we did not find the key in the object
-                        return false;
-                    }
-
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
-                    {
-                        // invalid char
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
-                        {
-                            // first char should be between '1' and '9'
-                            return false;
-                        }
-                        for (std::size_t i = 1; i < reference_token.size(); i++)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
-                            {
-                                // other char should be between '0' and '9'
-                                return false;
-                            }
-                        }
-                    }
-
-                    const auto idx = array_index(reference_token);
-                    if (idx >= ptr->size())
-                    {
-                        // index out of range
-                        return false;
-                    }
-
-                    ptr = &ptr->operator[](idx);
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                {
-                    // we do not expect primitive values if there is still a
-                    // reference token to process
-                    return false;
-                }
-            }
-        }
-
-        // no reference token left means we found a primitive value
-        return true;
-    }
-
-    /*!
-    @brief split the string input to reference tokens
-
-    @note This function is only called by the json_pointer constructor.
-          All exceptions below are documented there.
-
-    @throw parse_error.107  if the pointer is not empty or begins with '/'
-    @throw parse_error.108  if character '~' is not followed by '0' or '1'
-    */
-    static std::vector<std::string> split(const std::string& reference_string)
-    {
-        std::vector<std::string> result;
-
-        // special case: empty reference string -> no reference tokens
-        if (reference_string.empty())
-        {
-            return result;
-        }
-
-        // check if nonempty reference string begins with slash
-        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
-        {
-            JSON_THROW(detail::parse_error::create(107, 1, "JSON pointer must be empty or begin with '/' - was: '" + reference_string + "'", BasicJsonType()));
-        }
-
-        // extract the reference tokens:
-        // - slash: position of the last read slash (or end of string)
-        // - start: position after the previous slash
-        for (
-            // search for the first slash after the first character
-            std::size_t slash = reference_string.find_first_of('/', 1),
-            // set the beginning of the first reference token
-            start = 1;
-            // we can stop if start == 0 (if slash == std::string::npos)
-            start != 0;
-            // set the beginning of the next reference token
-            // (will eventually be 0 if slash == std::string::npos)
-            start = (slash == std::string::npos) ? 0 : slash + 1,
-            // find next slash
-            slash = reference_string.find_first_of('/', start))
-        {
-            // use the text between the beginning of the reference token
-            // (start) and the last slash (slash).
-            auto reference_token = reference_string.substr(start, slash - start);
-
-            // check reference tokens are properly escaped
-            for (std::size_t pos = reference_token.find_first_of('~');
-                    pos != std::string::npos;
-                    pos = reference_token.find_first_of('~', pos + 1))
-            {
-                JSON_ASSERT(reference_token[pos] == '~');
-
-                // ~ must be followed by 0 or 1
-                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
-                                         (reference_token[pos + 1] != '0' &&
-                                          reference_token[pos + 1] != '1')))
-                {
-                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", BasicJsonType()));
-                }
-            }
-
-            // finally, store the reference token
-            detail::unescape(reference_token);
-            result.push_back(reference_token);
-        }
-
-        return result;
-    }
-
-  private:
-    /*!
-    @param[in] reference_string  the reference string to the current value
-    @param[in] value             the value to consider
-    @param[in,out] result        the result object to insert values to
-
-    @note Empty objects or arrays are flattened to `null`.
-    */
-    static void flatten(const std::string& reference_string,
-                        const BasicJsonType& value,
-                        BasicJsonType& result)
-    {
-        switch (value.type())
-        {
-            case detail::value_t::array:
-            {
-                if (value.m_value.array->empty())
-                {
-                    // flatten empty array as null
-                    result[reference_string] = nullptr;
-                }
-                else
-                {
-                    // iterate array and use index as reference string
-                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
-                    {
-                        flatten(reference_string + "/" + std::to_string(i),
-                                value.m_value.array->operator[](i), result);
-                    }
-                }
-                break;
-            }
-
-            case detail::value_t::object:
-            {
-                if (value.m_value.object->empty())
-                {
-                    // flatten empty object as null
-                    result[reference_string] = nullptr;
-                }
-                else
-                {
-                    // iterate object and use keys as reference string
-                    for (const auto& element : *value.m_value.object)
-                    {
-                        flatten(reference_string + "/" + detail::escape(element.first), element.second, result);
-                    }
-                }
-                break;
-            }
-
-            case detail::value_t::null:
-            case detail::value_t::string:
-            case detail::value_t::boolean:
-            case detail::value_t::number_integer:
-            case detail::value_t::number_unsigned:
-            case detail::value_t::number_float:
-            case detail::value_t::binary:
-            case detail::value_t::discarded:
-            default:
-            {
-                // add primitive value with its reference string
-                result[reference_string] = value;
-                break;
-            }
-        }
-    }
-
-    /*!
-    @param[in] value  flattened JSON
-
-    @return unflattened JSON
-
-    @throw parse_error.109 if array index is not a number
-    @throw type_error.314  if value is not an object
-    @throw type_error.315  if object values are not primitive
-    @throw type_error.313  if value cannot be unflattened
-    */
-    static BasicJsonType
-    unflatten(const BasicJsonType& value)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
-        {
-            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", value));
-        }
-
-        BasicJsonType result;
-
-        // iterate the JSON object values
-        for (const auto& element : *value.m_value.object)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
-            {
-                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", element.second));
-            }
-
-            // assign value to reference pointed to by JSON pointer; Note that if
-            // the JSON pointer is "" (i.e., points to the whole value), function
-            // get_and_create returns a reference to result itself. An assignment
-            // will then create a primitive value.
-            json_pointer(element.first).get_and_create(result) = element.second;
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief compares two JSON pointers for equality
-
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is equal to @a rhs
-
-    @complexity Linear in the length of the JSON pointer
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator==(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
-    {
-        return lhs.reference_tokens == rhs.reference_tokens;
-    }
-
-    /*!
-    @brief compares two JSON pointers for inequality
-
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is not equal @a rhs
-
-    @complexity Linear in the length of the JSON pointer
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator!=(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
-    {
-        return !(lhs == rhs);
-    }
-
-    /// the reference tokens
-    std::vector<std::string> reference_tokens;
-};
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/json_ref.hpp>
-
-
-#include <initializer_list>
-#include <utility>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename BasicJsonType>
-class json_ref
-{
-  public:
-    using value_type = BasicJsonType;
-
-    json_ref(value_type&& value)
-        : owned_value(std::move(value))
-    {}
-
-    json_ref(const value_type& value)
-        : value_ref(&value)
-    {}
-
-    json_ref(std::initializer_list<json_ref> init)
-        : owned_value(init)
-    {}
-
-    template <
-        class... Args,
-        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
-    json_ref(Args && ... args)
-        : owned_value(std::forward<Args>(args)...)
-    {}
-
-    // class should be movable only
-    json_ref(json_ref&&) noexcept = default;
-    json_ref(const json_ref&) = delete;
-    json_ref& operator=(const json_ref&) = delete;
-    json_ref& operator=(json_ref&&) = delete;
-    ~json_ref() = default;
-
-    value_type moved_or_copied() const
-    {
-        if (value_ref == nullptr)
-        {
-            return std::move(owned_value);
-        }
-        return *value_ref;
-    }
-
-    value_type const& operator*() const
-    {
-        return value_ref ? *value_ref : owned_value;
-    }
-
-    value_type const* operator->() const
-    {
-        return &** this;
-    }
-
-  private:
-    mutable value_type owned_value = nullptr;
-    value_type const* value_ref = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/string_escape.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/output/binary_writer.hpp>
-
-
-#include <algorithm> // reverse
-#include <array> // array
-#include <cmath> // isnan, isinf
-#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstring> // memcpy
-#include <limits> // numeric_limits
-#include <string> // string
-#include <utility> // move
-
-// #include <nlohmann/detail/input/binary_reader.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-
-#include <algorithm> // copy
-#include <cstddef> // size_t
-#include <iterator> // back_inserter
-#include <memory> // shared_ptr, make_shared
-#include <string> // basic_string
-#include <vector> // vector
-
-#ifndef JSON_NO_IO
-    #include <ios>      // streamsize
-    #include <ostream>  // basic_ostream
-#endif  // JSON_NO_IO
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/// abstract output adapter interface
-template<typename CharType> struct output_adapter_protocol
-{
-    virtual void write_character(CharType c) = 0;
-    virtual void write_characters(const CharType* s, std::size_t length) = 0;
-    virtual ~output_adapter_protocol() = default;
-
-    output_adapter_protocol() = default;
-    output_adapter_protocol(const output_adapter_protocol&) = default;
-    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
-    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
-    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
-};
-
-/// a type to simplify interfaces
-template<typename CharType>
-using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
-
-/// output adapter for byte vectors
-template<typename CharType>
-class output_vector_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_vector_adapter(std::vector<CharType>& vec) noexcept
-        : v(vec)
-    {}
-
-    void write_character(CharType c) override
-    {
-        v.push_back(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        std::copy(s, s + length, std::back_inserter(v));
-    }
-
-  private:
-    std::vector<CharType>& v;
-};
-
-#ifndef JSON_NO_IO
-/// output adapter for output streams
-template<typename CharType>
-class output_stream_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
-        : stream(s)
-    {}
-
-    void write_character(CharType c) override
-    {
-        stream.put(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        stream.write(s, static_cast<std::streamsize>(length));
-    }
-
-  private:
-    std::basic_ostream<CharType>& stream;
-};
-#endif  // JSON_NO_IO
-
-/// output adapter for basic_string
-template<typename CharType, typename StringType = std::basic_string<CharType>>
-class output_string_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_string_adapter(StringType& s) noexcept
-        : str(s)
-    {}
-
-    void write_character(CharType c) override
-    {
-        str.push_back(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        str.append(s, length);
-    }
-
-  private:
-    StringType& str;
-};
-
-template<typename CharType, typename StringType = std::basic_string<CharType>>
-class output_adapter
-{
-  public:
-    output_adapter(std::vector<CharType>& vec)
-        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
-
-#ifndef JSON_NO_IO
-    output_adapter(std::basic_ostream<CharType>& s)
-        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
-#endif  // JSON_NO_IO
-
-    output_adapter(StringType& s)
-        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
-
-    operator output_adapter_t<CharType>()
-    {
-        return oa;
-    }
-
-  private:
-    output_adapter_t<CharType> oa = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////
-// binary writer //
-///////////////////
-
-/*!
-@brief serialization to CBOR and MessagePack values
-*/
-template<typename BasicJsonType, typename CharType>
-class binary_writer
-{
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-
-  public:
-    /*!
-    @brief create a binary writer
-
-    @param[in] adapter  output adapter to write to
-    */
-    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
-    {
-        JSON_ASSERT(oa);
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
-    */
-    void write_bson(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::object:
-            {
-                write_bson_object(*j.m_value.object);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::array:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()), j));
-            }
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    */
-    void write_cbor(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                oa->write_character(to_char_type(0xF6));
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                oa->write_character(j.m_value.boolean
-                                    ? to_char_type(0xF5)
-                                    : to_char_type(0xF4));
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // CBOR does not differentiate between positive signed
-                    // integers and unsigned integers. Therefore, we used the
-                    // code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_integer <= 0x17)
-                    {
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x18));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x19));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x1A));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                    }
-                    else
-                    {
-                        oa->write_character(to_char_type(0x1B));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                    }
-                }
-                else
-                {
-                    // The conversions below encode the sign in the first
-                    // byte, and the value is converted to a positive number.
-                    const auto positive_number = -1 - j.m_value.number_integer;
-                    if (j.m_value.number_integer >= -24)
-                    {
-                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x38));
-                        write_number(static_cast<std::uint8_t>(positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x39));
-                        write_number(static_cast<std::uint16_t>(positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x3A));
-                        write_number(static_cast<std::uint32_t>(positive_number));
-                    }
-                    else
-                    {
-                        oa->write_character(to_char_type(0x3B));
-                        write_number(static_cast<std::uint64_t>(positive_number));
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x18));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x19));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x1A));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
-                }
-                else
-                {
-                    oa->write_character(to_char_type(0x1B));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                if (std::isnan(j.m_value.number_float))
-                {
-                    // NaN is 0xf97e00 in CBOR
-                    oa->write_character(to_char_type(0xF9));
-                    oa->write_character(to_char_type(0x7E));
-                    oa->write_character(to_char_type(0x00));
-                }
-                else if (std::isinf(j.m_value.number_float))
-                {
-                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
-                    oa->write_character(to_char_type(0xf9));
-                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
-                    oa->write_character(to_char_type(0x00));
-                }
-                else
-                {
-                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
-                }
-                break;
-            }
-
-            case value_t::string:
-            {
-                // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x60 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x78));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x79));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x7A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x7B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write the string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x80 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x98));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x99));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x9A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x9B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_cbor(el);
-                }
-                break;
-            }
-
-            case value_t::binary:
-            {
-                if (j.m_value.binary->has_subtype())
-                {
-                    if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xd8));
-                        write_number(static_cast<std::uint8_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xd9));
-                        write_number(static_cast<std::uint16_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xda));
-                        write_number(static_cast<std::uint32_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xdb));
-                        write_number(static_cast<std::uint64_t>(j.m_value.binary->subtype()));
-                    }
-                }
-
-                // step 1: write control byte and the binary array size
-                const auto N = j.m_value.binary->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x40 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x58));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x59));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x5A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x5B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                    N);
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0xA0 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xB8));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xB9));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xBA));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xBB));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_cbor(el.first);
-                    write_cbor(el.second);
-                }
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    */
-    void write_msgpack(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::null: // nil
-            {
-                oa->write_character(to_char_type(0xC0));
-                break;
-            }
-
-            case value_t::boolean: // true and false
-            {
-                oa->write_character(j.m_value.boolean
-                                    ? to_char_type(0xC3)
-                                    : to_char_type(0xC2));
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // MessagePack does not differentiate between positive
-                    // signed integers and unsigned integers. Therefore, we used
-                    // the code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_unsigned < 128)
-                    {
-                        // positive fixnum
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        // uint 8
-                        oa->write_character(to_char_type(0xCC));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        // uint 16
-                        oa->write_character(to_char_type(0xCD));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        // uint 32
-                        oa->write_character(to_char_type(0xCE));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                    {
-                        // uint 64
-                        oa->write_character(to_char_type(0xCF));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                    }
-                }
-                else
-                {
-                    if (j.m_value.number_integer >= -32)
-                    {
-                        // negative fixnum
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
-                    {
-                        // int 8
-                        oa->write_character(to_char_type(0xD0));
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
-                    {
-                        // int 16
-                        oa->write_character(to_char_type(0xD1));
-                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
-                    {
-                        // int 32
-                        oa->write_character(to_char_type(0xD2));
-                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
-                    {
-                        // int 64
-                        oa->write_character(to_char_type(0xD3));
-                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned < 128)
-                {
-                    // positive fixnum
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    // uint 8
-                    oa->write_character(to_char_type(0xCC));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // uint 16
-                    oa->write_character(to_char_type(0xCD));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // uint 32
-                    oa->write_character(to_char_type(0xCE));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    // uint 64
-                    oa->write_character(to_char_type(0xCF));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
-                break;
-            }
-
-            case value_t::string:
-            {
-                // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
-                if (N <= 31)
-                {
-                    // fixstr
-                    write_number(static_cast<std::uint8_t>(0xA0 | N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    // str 8
-                    oa->write_character(to_char_type(0xD9));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // str 16
-                    oa->write_character(to_char_type(0xDA));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // str 32
-                    oa->write_character(to_char_type(0xDB));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write the string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
-                if (N <= 15)
-                {
-                    // fixarray
-                    write_number(static_cast<std::uint8_t>(0x90 | N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // array 16
-                    oa->write_character(to_char_type(0xDC));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // array 32
-                    oa->write_character(to_char_type(0xDD));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_msgpack(el);
-                }
-                break;
-            }
-
-            case value_t::binary:
-            {
-                // step 0: determine if the binary type has a set subtype to
-                // determine whether or not to use the ext or fixext types
-                const bool use_ext = j.m_value.binary->has_subtype();
-
-                // step 1: write control byte and the byte string length
-                const auto N = j.m_value.binary->size();
-                if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    std::uint8_t output_type{};
-                    bool fixed = true;
-                    if (use_ext)
-                    {
-                        switch (N)
-                        {
-                            case 1:
-                                output_type = 0xD4; // fixext 1
-                                break;
-                            case 2:
-                                output_type = 0xD5; // fixext 2
-                                break;
-                            case 4:
-                                output_type = 0xD6; // fixext 4
-                                break;
-                            case 8:
-                                output_type = 0xD7; // fixext 8
-                                break;
-                            case 16:
-                                output_type = 0xD8; // fixext 16
-                                break;
-                            default:
-                                output_type = 0xC7; // ext 8
-                                fixed = false;
-                                break;
-                        }
-
-                    }
-                    else
-                    {
-                        output_type = 0xC4; // bin 8
-                        fixed = false;
-                    }
-
-                    oa->write_character(to_char_type(output_type));
-                    if (!fixed)
-                    {
-                        write_number(static_cast<std::uint8_t>(N));
-                    }
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC8 // ext 16
-                                               : 0xC5; // bin 16
-
-                    oa->write_character(to_char_type(output_type));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC9 // ext 32
-                                               : 0xC6; // bin 32
-
-                    oa->write_character(to_char_type(output_type));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 1.5: if this is an ext type, write the subtype
-                if (use_ext)
-                {
-                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
-                }
-
-                // step 2: write the byte string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                    N);
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
-                if (N <= 15)
-                {
-                    // fixmap
-                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // map 16
-                    oa->write_character(to_char_type(0xDE));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // map 32
-                    oa->write_character(to_char_type(0xDF));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_msgpack(el.first);
-                    write_msgpack(el.second);
-                }
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @param[in] use_count   whether to use '#' prefixes (optimized format)
-    @param[in] use_type    whether to use '$' prefixes (optimized format)
-    @param[in] add_prefix  whether prefixes need to be used for this value
-    */
-    void write_ubjson(const BasicJsonType& j, const bool use_count,
-                      const bool use_type, const bool add_prefix = true)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('Z'));
-                }
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(j.m_value.boolean
-                                        ? to_char_type('T')
-                                        : to_char_type('F'));
-                }
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
-                break;
-            }
-
-            case value_t::string:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('S'));
-                }
-                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('['));
-                }
-
-                bool prefix_required = true;
-                if (use_type && !j.m_value.array->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
-                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
-                    {
-                        return ubjson_prefix(v) == first_prefix;
-                    });
-
-                    if (same_prefix)
-                    {
-                        prefix_required = false;
-                        oa->write_character(to_char_type('$'));
-                        oa->write_character(first_prefix);
-                    }
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
-                }
-
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_ubjson(el, use_count, use_type, prefix_required);
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type(']'));
-                }
-
-                break;
-            }
-
-            case value_t::binary:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('['));
-                }
-
-                if (use_type && !j.m_value.binary->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    oa->write_character(to_char_type('$'));
-                    oa->write_character('U');
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true);
-                }
-
-                if (use_type)
-                {
-                    oa->write_characters(
-                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                        j.m_value.binary->size());
-                }
-                else
-                {
-                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
-                    {
-                        oa->write_character(to_char_type('U'));
-                        oa->write_character(j.m_value.binary->data()[i]);
-                    }
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type(']'));
-                }
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('{'));
-                }
-
-                bool prefix_required = true;
-                if (use_type && !j.m_value.object->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
-                    const bool same_prefix = std::all_of(j.begin(), j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
-                    {
-                        return ubjson_prefix(v) == first_prefix;
-                    });
-
-                    if (same_prefix)
-                    {
-                        prefix_required = false;
-                        oa->write_character(to_char_type('$'));
-                        oa->write_character(first_prefix);
-                    }
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
-                }
-
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_number_with_ubjson_prefix(el.first.size(), true);
-                    oa->write_characters(
-                        reinterpret_cast<const CharType*>(el.first.c_str()),
-                        el.first.size());
-                    write_ubjson(el.second, use_count, use_type, prefix_required);
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type('}'));
-                }
-
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @return The size of a BSON document entry header, including the id marker
-            and the entry name size (and its null-terminator).
-    */
-    static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j)
-    {
-        const auto it = name.find(static_cast<typename string_t::value_type>(0));
-        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
-        {
-            JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")", j));
-            static_cast<void>(j);
-        }
-
-        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
-    }
-
-    /*!
-    @brief Writes the given @a element_type and @a name to the output adapter
-    */
-    void write_bson_entry_header(const string_t& name,
-                                 const std::uint8_t element_type)
-    {
-        oa->write_character(to_char_type(element_type)); // boolean
-        oa->write_characters(
-            reinterpret_cast<const CharType*>(name.c_str()),
-            name.size() + 1u);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and boolean value @a value
-    */
-    void write_bson_boolean(const string_t& name,
-                            const bool value)
-    {
-        write_bson_entry_header(name, 0x08);
-        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and double value @a value
-    */
-    void write_bson_double(const string_t& name,
-                           const double value)
-    {
-        write_bson_entry_header(name, 0x01);
-        write_number<double, true>(value);
-    }
-
-    /*!
-    @return The size of the BSON-encoded string in @a value
-    */
-    static std::size_t calc_bson_string_size(const string_t& value)
-    {
-        return sizeof(std::int32_t) + value.size() + 1ul;
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and string value @a value
-    */
-    void write_bson_string(const string_t& name,
-                           const string_t& value)
-    {
-        write_bson_entry_header(name, 0x02);
-
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
-        oa->write_characters(
-            reinterpret_cast<const CharType*>(value.c_str()),
-            value.size() + 1);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and null value
-    */
-    void write_bson_null(const string_t& name)
-    {
-        write_bson_entry_header(name, 0x0A);
-    }
-
-    /*!
-    @return The size of the BSON-encoded integer @a value
-    */
-    static std::size_t calc_bson_integer_size(const std::int64_t value)
-    {
-        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
-               ? sizeof(std::int32_t)
-               : sizeof(std::int64_t);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and integer @a value
-    */
-    void write_bson_integer(const string_t& name,
-                            const std::int64_t value)
-    {
-        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
-        {
-            write_bson_entry_header(name, 0x10); // int32
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
-        }
-        else
-        {
-            write_bson_entry_header(name, 0x12); // int64
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
-        }
-    }
-
-    /*!
-    @return The size of the BSON-encoded unsigned integer in @a j
-    */
-    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
-    {
-        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-               ? sizeof(std::int32_t)
-               : sizeof(std::int64_t);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and unsigned @a value
-    */
-    void write_bson_unsigned(const string_t& name,
-                             const BasicJsonType& j)
-    {
-        if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-        {
-            write_bson_entry_header(name, 0x10 /* int32 */);
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(j.m_value.number_unsigned));
-        }
-        else if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-        {
-            write_bson_entry_header(name, 0x12 /* int64 */);
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(j.m_value.number_unsigned));
-        }
-        else
-        {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(j.m_value.number_unsigned) + " cannot be represented by BSON as it does not fit int64", j));
-        }
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and object @a value
-    */
-    void write_bson_object_entry(const string_t& name,
-                                 const typename BasicJsonType::object_t& value)
-    {
-        write_bson_entry_header(name, 0x03); // object
-        write_bson_object(value);
-    }
-
-    /*!
-    @return The size of the BSON-encoded array @a value
-    */
-    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
-    {
-        std::size_t array_index = 0ul;
-
-        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), std::size_t(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
-        {
-            return result + calc_bson_element_size(std::to_string(array_index++), el);
-        });
-
-        return sizeof(std::int32_t) + embedded_document_size + 1ul;
-    }
-
-    /*!
-    @return The size of the BSON-encoded binary array @a value
-    */
-    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
-    {
-        return sizeof(std::int32_t) + value.size() + 1ul;
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and array @a value
-    */
-    void write_bson_array(const string_t& name,
-                          const typename BasicJsonType::array_t& value)
-    {
-        write_bson_entry_header(name, 0x04); // array
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
-
-        std::size_t array_index = 0ul;
-
-        for (const auto& el : value)
-        {
-            write_bson_element(std::to_string(array_index++), el);
-        }
-
-        oa->write_character(to_char_type(0x00));
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and binary value @a value
-    */
-    void write_bson_binary(const string_t& name,
-                           const binary_t& value)
-    {
-        write_bson_entry_header(name, 0x05);
-
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size()));
-        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : std::uint8_t(0x00));
-
-        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
-    }
-
-    /*!
-    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
-    @return The calculated size for the BSON document entry for @a j with the given @a name.
-    */
-    static std::size_t calc_bson_element_size(const string_t& name,
-            const BasicJsonType& j)
-    {
-        const auto header_size = calc_bson_entry_header_size(name, j);
-        switch (j.type())
-        {
-            case value_t::object:
-                return header_size + calc_bson_object_size(*j.m_value.object);
-
-            case value_t::array:
-                return header_size + calc_bson_array_size(*j.m_value.array);
-
-            case value_t::binary:
-                return header_size + calc_bson_binary_size(*j.m_value.binary);
-
-            case value_t::boolean:
-                return header_size + 1ul;
-
-            case value_t::number_float:
-                return header_size + 8ul;
-
-            case value_t::number_integer:
-                return header_size + calc_bson_integer_size(j.m_value.number_integer);
-
-            case value_t::number_unsigned:
-                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
-
-            case value_t::string:
-                return header_size + calc_bson_string_size(*j.m_value.string);
-
-            case value_t::null:
-                return header_size + 0ul;
-
-            // LCOV_EXCL_START
-            case value_t::discarded:
-            default:
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
-                return 0ul;
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    /*!
-    @brief Serializes the JSON value @a j to BSON and associates it with the
-           key @a name.
-    @param name The name to associate with the JSON entity @a j within the
-                current BSON document
-    */
-    void write_bson_element(const string_t& name,
-                            const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::object:
-                return write_bson_object_entry(name, *j.m_value.object);
-
-            case value_t::array:
-                return write_bson_array(name, *j.m_value.array);
-
-            case value_t::binary:
-                return write_bson_binary(name, *j.m_value.binary);
-
-            case value_t::boolean:
-                return write_bson_boolean(name, j.m_value.boolean);
-
-            case value_t::number_float:
-                return write_bson_double(name, j.m_value.number_float);
-
-            case value_t::number_integer:
-                return write_bson_integer(name, j.m_value.number_integer);
-
-            case value_t::number_unsigned:
-                return write_bson_unsigned(name, j);
-
-            case value_t::string:
-                return write_bson_string(name, *j.m_value.string);
-
-            case value_t::null:
-                return write_bson_null(name);
-
-            // LCOV_EXCL_START
-            case value_t::discarded:
-            default:
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
-                return;
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    /*!
-    @brief Calculates the size of the BSON serialization of the given
-           JSON-object @a j.
-    @param[in] value  JSON value to serialize
-    @pre       value.type() == value_t::object
-    */
-    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
-    {
-        std::size_t document_size = std::accumulate(value.begin(), value.end(), std::size_t(0),
-                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
-        {
-            return result += calc_bson_element_size(el.first, el.second);
-        });
-
-        return sizeof(std::int32_t) + document_size + 1ul;
-    }
-
-    /*!
-    @param[in] value  JSON value to serialize
-    @pre       value.type() == value_t::object
-    */
-    void write_bson_object(const typename BasicJsonType::object_t& value)
-    {
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
-
-        for (const auto& el : value)
-        {
-            write_bson_element(el.first, el.second);
-        }
-
-        oa->write_character(to_char_type(0x00));
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
-    {
-        return to_char_type(0xFA);  // Single-Precision Float
-    }
-
-    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
-    {
-        return to_char_type(0xFB);  // Double-Precision Float
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
-    {
-        return to_char_type(0xCA);  // float 32
-    }
-
-    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
-    {
-        return to_char_type(0xCB);  // float 64
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    // UBJSON: write number (floating point)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_floating_point<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if (add_prefix)
-        {
-            oa->write_character(get_ubjson_float_prefix(n));
-        }
-        write_number(n);
-    }
-
-    // UBJSON: write number (unsigned integer)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_unsigned<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('i'));  // int8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('U'));  // uint8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('I'));  // int16
-            }
-            write_number(static_cast<std::int16_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('l'));  // int32
-            }
-            write_number(static_cast<std::int32_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('L'));  // int64
-            }
-            write_number(static_cast<std::int64_t>(n));
-        }
-        else
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('H'));  // high-precision number
-            }
-
-            const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true);
-            for (std::size_t i = 0; i < number.size(); ++i)
-            {
-                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
-            }
-        }
-    }
-
-    // UBJSON: write number (signed integer)
-    template < typename NumberType, typename std::enable_if <
-                   std::is_signed<NumberType>::value&&
-                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('i'));  // int8
-            }
-            write_number(static_cast<std::int8_t>(n));
-        }
-        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('U'));  // uint8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('I'));  // int16
-            }
-            write_number(static_cast<std::int16_t>(n));
-        }
-        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('l'));  // int32
-            }
-            write_number(static_cast<std::int32_t>(n));
-        }
-        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('L'));  // int64
-            }
-            write_number(static_cast<std::int64_t>(n));
-        }
-        // LCOV_EXCL_START
-        else
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('H'));  // high-precision number
-            }
-
-            const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true);
-            for (std::size_t i = 0; i < number.size(); ++i)
-            {
-                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
-            }
-        }
-        // LCOV_EXCL_STOP
-    }
-
-    /*!
-    @brief determine the type prefix of container values
-    */
-    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-                return 'Z';
-
-            case value_t::boolean:
-                return j.m_value.boolean ? 'T' : 'F';
-
-            case value_t::number_integer:
-            {
-                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
-                {
-                    return 'i';
-                }
-                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    return 'U';
-                }
-                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
-                {
-                    return 'I';
-                }
-                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
-                {
-                    return 'l';
-                }
-                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
-                {
-                    return 'L';
-                }
-                // anything else is treated as high-precision number
-                return 'H'; // LCOV_EXCL_LINE
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
-                {
-                    return 'i';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
-                {
-                    return 'U';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
-                {
-                    return 'I';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-                {
-                    return 'l';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-                {
-                    return 'L';
-                }
-                // anything else is treated as high-precision number
-                return 'H'; // LCOV_EXCL_LINE
-            }
-
-            case value_t::number_float:
-                return get_ubjson_float_prefix(j.m_value.number_float);
-
-            case value_t::string:
-                return 'S';
-
-            case value_t::array: // fallthrough
-            case value_t::binary:
-                return '[';
-
-            case value_t::object:
-                return '{';
-
-            case value_t::discarded:
-            default:  // discarded values
-                return 'N';
-        }
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
-    {
-        return 'd';  // float 32
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
-    {
-        return 'D';  // float 64
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*
-    @brief write a number to output input
-    @param[in] n number of type @a NumberType
-    @tparam NumberType the type of the number
-    @tparam OutputIsLittleEndian Set to true if output data is
-                                 required to be little endian
-
-    @note This function needs to respect the system's endianess, because bytes
-          in CBOR, MessagePack, and UBJSON are stored in network order (big
-          endian) and therefore need reordering on little endian systems.
-    */
-    template<typename NumberType, bool OutputIsLittleEndian = false>
-    void write_number(const NumberType n)
-    {
-        // step 1: write number to array of length NumberType
-        std::array<CharType, sizeof(NumberType)> vec{};
-        std::memcpy(vec.data(), &n, sizeof(NumberType));
-
-        // step 2: write array to output (with possible reordering)
-        if (is_little_endian != OutputIsLittleEndian)
-        {
-            // reverse byte order prior to conversion if necessary
-            std::reverse(vec.begin(), vec.end());
-        }
-
-        oa->write_characters(vec.data(), sizeof(NumberType));
-    }
-
-    void write_compact_float(const number_float_t n, detail::input_format_t format)
-    {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
-                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
-                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
-        {
-            oa->write_character(format == detail::input_format_t::cbor
-                                ? get_cbor_float_prefix(static_cast<float>(n))
-                                : get_msgpack_float_prefix(static_cast<float>(n)));
-            write_number(static_cast<float>(n));
-        }
-        else
-        {
-            oa->write_character(format == detail::input_format_t::cbor
-                                ? get_cbor_float_prefix(n)
-                                : get_msgpack_float_prefix(n));
-            write_number(n);
-        }
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-    }
-
-  public:
-    // The following to_char_type functions are implement the conversion
-    // between uint8_t and CharType. In case CharType is not unsigned,
-    // such a conversion is required to allow values greater than 128.
-    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
-    template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
-    static constexpr CharType to_char_type(std::uint8_t x) noexcept
-    {
-        return *reinterpret_cast<char*>(&x);
-    }
-
-    template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
-    static CharType to_char_type(std::uint8_t x) noexcept
-    {
-        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
-        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
-        CharType result;
-        std::memcpy(&result, &x, sizeof(x));
-        return result;
-    }
-
-    template<typename C = CharType,
-             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
-    static constexpr CharType to_char_type(std::uint8_t x) noexcept
-    {
-        return x;
-    }
-
-    template < typename InputCharType, typename C = CharType,
-               enable_if_t <
-                   std::is_signed<C>::value &&
-                   std::is_signed<char>::value &&
-                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
-                   > * = nullptr >
-    static constexpr CharType to_char_type(InputCharType x) noexcept
-    {
-        return x;
-    }
-
-  private:
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
-
-    /// the output
-    output_adapter_t<CharType> oa = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-// #include <nlohmann/detail/output/serializer.hpp>
-
-
-#include <algorithm> // reverse, remove, fill, find, none_of
-#include <array> // array
-#include <clocale> // localeconv, lconv
-#include <cmath> // labs, isfinite, isnan, signbit
-#include <cstddef> // size_t, ptrdiff_t
-#include <cstdint> // uint8_t
-#include <cstdio> // snprintf
-#include <limits> // numeric_limits
-#include <string> // string, char_traits
-#include <type_traits> // is_same
-#include <utility> // move
-
-// #include <nlohmann/detail/conversions/to_chars.hpp>
-
-
-#include <array> // array
-#include <cmath>   // signbit, isfinite
-#include <cstdint> // intN_t, uintN_t
-#include <cstring> // memcpy, memmove
-#include <limits> // numeric_limits
-#include <type_traits> // conditional
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-/*!
-@brief implements the Grisu2 algorithm for binary to decimal floating-point
-conversion.
-
-This implementation is a slightly modified version of the reference
-implementation which may be obtained from
-http://florian.loitsch.com/publications (bench.tar.gz).
-
-The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
-
-For a detailed description of the algorithm see:
-
-[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
-    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
-    Language Design and Implementation, PLDI 2010
-[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
-    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
-    Design and Implementation, PLDI 1996
-*/
-namespace dtoa_impl
-{
-
-template<typename Target, typename Source>
-Target reinterpret_bits(const Source source)
-{
-    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
-
-    Target target;
-    std::memcpy(&target, &source, sizeof(Source));
-    return target;
-}
-
-struct diyfp // f * 2^e
-{
-    static constexpr int kPrecision = 64; // = q
-
-    std::uint64_t f = 0;
-    int e = 0;
-
-    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
-
-    /*!
-    @brief returns x - y
-    @pre x.e == y.e and x.f >= y.f
-    */
-    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
-    {
-        JSON_ASSERT(x.e == y.e);
-        JSON_ASSERT(x.f >= y.f);
-
-        return {x.f - y.f, x.e};
-    }
-
-    /*!
-    @brief returns x * y
-    @note The result is rounded. (Only the upper q bits are returned.)
-    */
-    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
-    {
-        static_assert(kPrecision == 64, "internal error");
-
-        // Computes:
-        //  f = round((x.f * y.f) / 2^q)
-        //  e = x.e + y.e + q
-
-        // Emulate the 64-bit * 64-bit multiplication:
-        //
-        // p = u * v
-        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
-        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
-        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
-        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
-        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
-        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
-        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
-        //
-        // (Since Q might be larger than 2^32 - 1)
-        //
-        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
-        //
-        // (Q_hi + H does not overflow a 64-bit int)
-        //
-        //   = p_lo + 2^64 p_hi
-
-        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
-        const std::uint64_t u_hi = x.f >> 32u;
-        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
-        const std::uint64_t v_hi = y.f >> 32u;
-
-        const std::uint64_t p0 = u_lo * v_lo;
-        const std::uint64_t p1 = u_lo * v_hi;
-        const std::uint64_t p2 = u_hi * v_lo;
-        const std::uint64_t p3 = u_hi * v_hi;
-
-        const std::uint64_t p0_hi = p0 >> 32u;
-        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
-        const std::uint64_t p1_hi = p1 >> 32u;
-        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
-        const std::uint64_t p2_hi = p2 >> 32u;
-
-        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
-
-        // The full product might now be computed as
-        //
-        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
-        // p_lo = p0_lo + (Q << 32)
-        //
-        // But in this particular case here, the full p_lo is not required.
-        // Effectively we only need to add the highest bit in p_lo to p_hi (and
-        // Q_hi + 1 does not overflow).
-
-        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
-
-        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
-
-        return {h, x.e + y.e + 64};
-    }
-
-    /*!
-    @brief normalize x such that the significand is >= 2^(q-1)
-    @pre x.f != 0
-    */
-    static diyfp normalize(diyfp x) noexcept
-    {
-        JSON_ASSERT(x.f != 0);
-
-        while ((x.f >> 63u) == 0)
-        {
-            x.f <<= 1u;
-            x.e--;
-        }
-
-        return x;
-    }
-
-    /*!
-    @brief normalize x such that the result has the exponent E
-    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
-    */
-    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
-    {
-        const int delta = x.e - target_exponent;
-
-        JSON_ASSERT(delta >= 0);
-        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
-
-        return {x.f << delta, target_exponent};
-    }
-};
-
-struct boundaries
-{
-    diyfp w;
-    diyfp minus;
-    diyfp plus;
-};
-
-/*!
-Compute the (normalized) diyfp representing the input number 'value' and its
-boundaries.
-
-@pre value must be finite and positive
-*/
-template<typename FloatType>
-boundaries compute_boundaries(FloatType value)
-{
-    JSON_ASSERT(std::isfinite(value));
-    JSON_ASSERT(value > 0);
-
-    // Convert the IEEE representation into a diyfp.
-    //
-    // If v is denormal:
-    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
-    // If v is normalized:
-    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
-
-    static_assert(std::numeric_limits<FloatType>::is_iec559,
-                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
-
-    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
-    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
-    constexpr int      kMinExp    = 1 - kBias;
-    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
-
-    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
-
-    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
-    const std::uint64_t E = bits >> (kPrecision - 1);
-    const std::uint64_t F = bits & (kHiddenBit - 1);
-
-    const bool is_denormal = E == 0;
-    const diyfp v = is_denormal
-                    ? diyfp(F, kMinExp)
-                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
-
-    // Compute the boundaries m- and m+ of the floating-point value
-    // v = f * 2^e.
-    //
-    // Determine v- and v+, the floating-point predecessor and successor if v,
-    // respectively.
-    //
-    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
-    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
-    //
-    //      v+ = v + 2^e
-    //
-    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
-    // between m- and m+ round to v, regardless of how the input rounding
-    // algorithm breaks ties.
-    //
-    //      ---+-------------+-------------+-------------+-------------+---  (A)
-    //         v-            m-            v             m+            v+
-    //
-    //      -----------------+------+------+-------------+-------------+---  (B)
-    //                       v-     m-     v             m+            v+
-
-    const bool lower_boundary_is_closer = F == 0 && E > 1;
-    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
-    const diyfp m_minus = lower_boundary_is_closer
-                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
-                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
-
-    // Determine the normalized w+ = m+.
-    const diyfp w_plus = diyfp::normalize(m_plus);
-
-    // Determine w- = m- such that e_(w-) = e_(w+).
-    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
-
-    return {diyfp::normalize(v), w_minus, w_plus};
-}
-
-// Given normalized diyfp w, Grisu needs to find a (normalized) cached
-// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
-// within a certain range [alpha, gamma] (Definition 3.2 from [1])
-//
-//      alpha <= e = e_c + e_w + q <= gamma
-//
-// or
-//
-//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
-//                          <= f_c * f_w * 2^gamma
-//
-// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
-//
-//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
-//
-// or
-//
-//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
-//
-// The choice of (alpha,gamma) determines the size of the table and the form of
-// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
-// in practice:
-//
-// The idea is to cut the number c * w = f * 2^e into two parts, which can be
-// processed independently: An integral part p1, and a fractional part p2:
-//
-//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
-//              = (f div 2^-e) + (f mod 2^-e) * 2^e
-//              = p1 + p2 * 2^e
-//
-// The conversion of p1 into decimal form requires a series of divisions and
-// modulos by (a power of) 10. These operations are faster for 32-bit than for
-// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
-// achieved by choosing
-//
-//      -e >= 32   or   e <= -32 := gamma
-//
-// In order to convert the fractional part
-//
-//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
-//
-// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
-// d[-i] are extracted in order:
-//
-//      (10 * p2) div 2^-e = d[-1]
-//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
-//
-// The multiplication by 10 must not overflow. It is sufficient to choose
-//
-//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
-//
-// Since p2 = f mod 2^-e < 2^-e,
-//
-//      -e <= 60   or   e >= -60 := alpha
-
-constexpr int kAlpha = -60;
-constexpr int kGamma = -32;
-
-struct cached_power // c = f * 2^e ~= 10^k
-{
-    std::uint64_t f;
-    int e;
-    int k;
-};
-
-/*!
-For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
-power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
-satisfies (Definition 3.2 from [1])
-
-     alpha <= e_c + e + q <= gamma.
-*/
-inline cached_power get_cached_power_for_binary_exponent(int e)
-{
-    // Now
-    //
-    //      alpha <= e_c + e + q <= gamma                                    (1)
-    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
-    //
-    // and since the c's are normalized, 2^(q-1) <= f_c,
-    //
-    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
-    //      ==> 2^(alpha - e - 1) <= c
-    //
-    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
-    //
-    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
-    //        = ceil( (alpha - e - 1) * log_10(2) )
-    //
-    // From the paper:
-    // "In theory the result of the procedure could be wrong since c is rounded,
-    //  and the computation itself is approximated [...]. In practice, however,
-    //  this simple function is sufficient."
-    //
-    // For IEEE double precision floating-point numbers converted into
-    // normalized diyfp's w = f * 2^e, with q = 64,
-    //
-    //      e >= -1022      (min IEEE exponent)
-    //           -52        (p - 1)
-    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
-    //           -11        (normalize the diyfp)
-    //         = -1137
-    //
-    // and
-    //
-    //      e <= +1023      (max IEEE exponent)
-    //           -52        (p - 1)
-    //           -11        (normalize the diyfp)
-    //         = 960
-    //
-    // This binary exponent range [-1137,960] results in a decimal exponent
-    // range [-307,324]. One does not need to store a cached power for each
-    // k in this range. For each such k it suffices to find a cached power
-    // such that the exponent of the product lies in [alpha,gamma].
-    // This implies that the difference of the decimal exponents of adjacent
-    // table entries must be less than or equal to
-    //
-    //      floor( (gamma - alpha) * log_10(2) ) = 8.
-    //
-    // (A smaller distance gamma-alpha would require a larger table.)
-
-    // NB:
-    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
-
-    constexpr int kCachedPowersMinDecExp = -300;
-    constexpr int kCachedPowersDecStep = 8;
-
-    static constexpr std::array<cached_power, 79> kCachedPowers =
-    {
-        {
-            { 0xAB70FE17C79AC6CA, -1060, -300 },
-            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
-            { 0xBE5691EF416BD60C, -1007, -284 },
-            { 0x8DD01FAD907FFC3C,  -980, -276 },
-            { 0xD3515C2831559A83,  -954, -268 },
-            { 0x9D71AC8FADA6C9B5,  -927, -260 },
-            { 0xEA9C227723EE8BCB,  -901, -252 },
-            { 0xAECC49914078536D,  -874, -244 },
-            { 0x823C12795DB6CE57,  -847, -236 },
-            { 0xC21094364DFB5637,  -821, -228 },
-            { 0x9096EA6F3848984F,  -794, -220 },
-            { 0xD77485CB25823AC7,  -768, -212 },
-            { 0xA086CFCD97BF97F4,  -741, -204 },
-            { 0xEF340A98172AACE5,  -715, -196 },
-            { 0xB23867FB2A35B28E,  -688, -188 },
-            { 0x84C8D4DFD2C63F3B,  -661, -180 },
-            { 0xC5DD44271AD3CDBA,  -635, -172 },
-            { 0x936B9FCEBB25C996,  -608, -164 },
-            { 0xDBAC6C247D62A584,  -582, -156 },
-            { 0xA3AB66580D5FDAF6,  -555, -148 },
-            { 0xF3E2F893DEC3F126,  -529, -140 },
-            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
-            { 0x87625F056C7C4A8B,  -475, -124 },
-            { 0xC9BCFF6034C13053,  -449, -116 },
-            { 0x964E858C91BA2655,  -422, -108 },
-            { 0xDFF9772470297EBD,  -396, -100 },
-            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
-            { 0xF8A95FCF88747D94,  -343,  -84 },
-            { 0xB94470938FA89BCF,  -316,  -76 },
-            { 0x8A08F0F8BF0F156B,  -289,  -68 },
-            { 0xCDB02555653131B6,  -263,  -60 },
-            { 0x993FE2C6D07B7FAC,  -236,  -52 },
-            { 0xE45C10C42A2B3B06,  -210,  -44 },
-            { 0xAA242499697392D3,  -183,  -36 },
-            { 0xFD87B5F28300CA0E,  -157,  -28 },
-            { 0xBCE5086492111AEB,  -130,  -20 },
-            { 0x8CBCCC096F5088CC,  -103,  -12 },
-            { 0xD1B71758E219652C,   -77,   -4 },
-            { 0x9C40000000000000,   -50,    4 },
-            { 0xE8D4A51000000000,   -24,   12 },
-            { 0xAD78EBC5AC620000,     3,   20 },
-            { 0x813F3978F8940984,    30,   28 },
-            { 0xC097CE7BC90715B3,    56,   36 },
-            { 0x8F7E32CE7BEA5C70,    83,   44 },
-            { 0xD5D238A4ABE98068,   109,   52 },
-            { 0x9F4F2726179A2245,   136,   60 },
-            { 0xED63A231D4C4FB27,   162,   68 },
-            { 0xB0DE65388CC8ADA8,   189,   76 },
-            { 0x83C7088E1AAB65DB,   216,   84 },
-            { 0xC45D1DF942711D9A,   242,   92 },
-            { 0x924D692CA61BE758,   269,  100 },
-            { 0xDA01EE641A708DEA,   295,  108 },
-            { 0xA26DA3999AEF774A,   322,  116 },
-            { 0xF209787BB47D6B85,   348,  124 },
-            { 0xB454E4A179DD1877,   375,  132 },
-            { 0x865B86925B9BC5C2,   402,  140 },
-            { 0xC83553C5C8965D3D,   428,  148 },
-            { 0x952AB45CFA97A0B3,   455,  156 },
-            { 0xDE469FBD99A05FE3,   481,  164 },
-            { 0xA59BC234DB398C25,   508,  172 },
-            { 0xF6C69A72A3989F5C,   534,  180 },
-            { 0xB7DCBF5354E9BECE,   561,  188 },
-            { 0x88FCF317F22241E2,   588,  196 },
-            { 0xCC20CE9BD35C78A5,   614,  204 },
-            { 0x98165AF37B2153DF,   641,  212 },
-            { 0xE2A0B5DC971F303A,   667,  220 },
-            { 0xA8D9D1535CE3B396,   694,  228 },
-            { 0xFB9B7CD9A4A7443C,   720,  236 },
-            { 0xBB764C4CA7A44410,   747,  244 },
-            { 0x8BAB8EEFB6409C1A,   774,  252 },
-            { 0xD01FEF10A657842C,   800,  260 },
-            { 0x9B10A4E5E9913129,   827,  268 },
-            { 0xE7109BFBA19C0C9D,   853,  276 },
-            { 0xAC2820D9623BF429,   880,  284 },
-            { 0x80444B5E7AA7CF85,   907,  292 },
-            { 0xBF21E44003ACDD2D,   933,  300 },
-            { 0x8E679C2F5E44FF8F,   960,  308 },
-            { 0xD433179D9C8CB841,   986,  316 },
-            { 0x9E19DB92B4E31BA9,  1013,  324 },
-        }
-    };
-
-    // This computation gives exactly the same results for k as
-    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
-    // for |e| <= 1500, but doesn't require floating-point operations.
-    // NB: log_10(2) ~= 78913 / 2^18
-    JSON_ASSERT(e >= -1500);
-    JSON_ASSERT(e <=  1500);
-    const int f = kAlpha - e - 1;
-    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
-
-    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
-    JSON_ASSERT(index >= 0);
-    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
-
-    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
-    JSON_ASSERT(kAlpha <= cached.e + e + 64);
-    JSON_ASSERT(kGamma >= cached.e + e + 64);
-
-    return cached;
-}
-
-/*!
-For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
-For n == 0, returns 1 and sets pow10 := 1.
-*/
-inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
-{
-    // LCOV_EXCL_START
-    if (n >= 1000000000)
-    {
-        pow10 = 1000000000;
-        return 10;
-    }
-    // LCOV_EXCL_STOP
-    if (n >= 100000000)
-    {
-        pow10 = 100000000;
-        return  9;
-    }
-    if (n >= 10000000)
-    {
-        pow10 = 10000000;
-        return  8;
-    }
-    if (n >= 1000000)
-    {
-        pow10 = 1000000;
-        return  7;
-    }
-    if (n >= 100000)
-    {
-        pow10 = 100000;
-        return  6;
-    }
-    if (n >= 10000)
-    {
-        pow10 = 10000;
-        return  5;
-    }
-    if (n >= 1000)
-    {
-        pow10 = 1000;
-        return  4;
-    }
-    if (n >= 100)
-    {
-        pow10 = 100;
-        return  3;
-    }
-    if (n >= 10)
-    {
-        pow10 = 10;
-        return  2;
-    }
-
-    pow10 = 1;
-    return 1;
-}
-
-inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
-                         std::uint64_t rest, std::uint64_t ten_k)
-{
-    JSON_ASSERT(len >= 1);
-    JSON_ASSERT(dist <= delta);
-    JSON_ASSERT(rest <= delta);
-    JSON_ASSERT(ten_k > 0);
-
-    //               <--------------------------- delta ---->
-    //                                  <---- dist --------->
-    // --------------[------------------+-------------------]--------------
-    //               M-                 w                   M+
-    //
-    //                                  ten_k
-    //                                <------>
-    //                                       <---- rest ---->
-    // --------------[------------------+----+--------------]--------------
-    //                                  w    V
-    //                                       = buf * 10^k
-    //
-    // ten_k represents a unit-in-the-last-place in the decimal representation
-    // stored in buf.
-    // Decrement buf by ten_k while this takes buf closer to w.
-
-    // The tests are written in this order to avoid overflow in unsigned
-    // integer arithmetic.
-
-    while (rest < dist
-            && delta - rest >= ten_k
-            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
-    {
-        JSON_ASSERT(buf[len - 1] != '0');
-        buf[len - 1]--;
-        rest += ten_k;
-    }
-}
-
-/*!
-Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
-M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
-*/
-inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
-                             diyfp M_minus, diyfp w, diyfp M_plus)
-{
-    static_assert(kAlpha >= -60, "internal error");
-    static_assert(kGamma <= -32, "internal error");
-
-    // Generates the digits (and the exponent) of a decimal floating-point
-    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
-    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
-    //
-    //               <--------------------------- delta ---->
-    //                                  <---- dist --------->
-    // --------------[------------------+-------------------]--------------
-    //               M-                 w                   M+
-    //
-    // Grisu2 generates the digits of M+ from left to right and stops as soon as
-    // V is in [M-,M+].
-
-    JSON_ASSERT(M_plus.e >= kAlpha);
-    JSON_ASSERT(M_plus.e <= kGamma);
-
-    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
-    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
-
-    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
-    //
-    //      M+ = f * 2^e
-    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
-    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
-    //         = p1 + p2 * 2^e
-
-    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
-
-    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
-    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
-
-    // 1)
-    //
-    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
-
-    JSON_ASSERT(p1 > 0);
-
-    std::uint32_t pow10{};
-    const int k = find_largest_pow10(p1, pow10);
-
-    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
-    //
-    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
-    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
-    //
-    //      M+ = p1                                             + p2 * 2^e
-    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
-    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
-    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
-    //
-    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
-    //
-    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
-    //
-    // but stop as soon as
-    //
-    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
-
-    int n = k;
-    while (n > 0)
-    {
-        // Invariants:
-        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
-        //      pow10 = 10^(n-1) <= p1 < 10^n
-        //
-        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
-        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
-        //
-        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
-        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
-        //
-        JSON_ASSERT(d <= 9);
-        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
-        //
-        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
-        //
-        p1 = r;
-        n--;
-        //
-        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
-        //      pow10 = 10^n
-        //
-
-        // Now check if enough digits have been generated.
-        // Compute
-        //
-        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
-        //
-        // Note:
-        // Since rest and delta share the same exponent e, it suffices to
-        // compare the significands.
-        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
-        if (rest <= delta)
-        {
-            // V = buffer * 10^n, with M- <= V <= M+.
-
-            decimal_exponent += n;
-
-            // We may now just stop. But instead look if the buffer could be
-            // decremented to bring V closer to w.
-            //
-            // pow10 = 10^n is now 1 ulp in the decimal representation V.
-            // The rounding procedure works with diyfp's with an implicit
-            // exponent of e.
-            //
-            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
-            //
-            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
-            grisu2_round(buffer, length, dist, delta, rest, ten_n);
-
-            return;
-        }
-
-        pow10 /= 10;
-        //
-        //      pow10 = 10^(n-1) <= p1 < 10^n
-        // Invariants restored.
-    }
-
-    // 2)
-    //
-    // The digits of the integral part have been generated:
-    //
-    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
-    //         = buffer            + p2 * 2^e
-    //
-    // Now generate the digits of the fractional part p2 * 2^e.
-    //
-    // Note:
-    // No decimal point is generated: the exponent is adjusted instead.
-    //
-    // p2 actually represents the fraction
-    //
-    //      p2 * 2^e
-    //          = p2 / 2^-e
-    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
-    //
-    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
-    //
-    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
-    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
-    //
-    // using
-    //
-    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
-    //                = (                   d) * 2^-e + (                   r)
-    //
-    // or
-    //      10^m * p2 * 2^e = d + r * 2^e
-    //
-    // i.e.
-    //
-    //      M+ = buffer + p2 * 2^e
-    //         = buffer + 10^-m * (d + r * 2^e)
-    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
-    //
-    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
-
-    JSON_ASSERT(p2 > delta);
-
-    int m = 0;
-    for (;;)
-    {
-        // Invariant:
-        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
-        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
-        //
-        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
-        p2 *= 10;
-        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
-        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
-        //
-        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
-        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
-        //
-        JSON_ASSERT(d <= 9);
-        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
-        //
-        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
-        //
-        p2 = r;
-        m++;
-        //
-        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
-        // Invariant restored.
-
-        // Check if enough digits have been generated.
-        //
-        //      10^-m * p2 * 2^e <= delta * 2^e
-        //              p2 * 2^e <= 10^m * delta * 2^e
-        //                    p2 <= 10^m * delta
-        delta *= 10;
-        dist  *= 10;
-        if (p2 <= delta)
-        {
-            break;
-        }
-    }
-
-    // V = buffer * 10^-m, with M- <= V <= M+.
-
-    decimal_exponent -= m;
-
-    // 1 ulp in the decimal representation is now 10^-m.
-    // Since delta and dist are now scaled by 10^m, we need to do the
-    // same with ulp in order to keep the units in sync.
-    //
-    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
-    //
-    const std::uint64_t ten_m = one.f;
-    grisu2_round(buffer, length, dist, delta, p2, ten_m);
-
-    // By construction this algorithm generates the shortest possible decimal
-    // number (Loitsch, Theorem 6.2) which rounds back to w.
-    // For an input number of precision p, at least
-    //
-    //      N = 1 + ceil(p * log_10(2))
-    //
-    // decimal digits are sufficient to identify all binary floating-point
-    // numbers (Matula, "In-and-Out conversions").
-    // This implies that the algorithm does not produce more than N decimal
-    // digits.
-    //
-    //      N = 17 for p = 53 (IEEE double precision)
-    //      N = 9  for p = 24 (IEEE single precision)
-}
-
-/*!
-v = buf * 10^decimal_exponent
-len is the length of the buffer (number of decimal digits)
-The buffer must be large enough, i.e. >= max_digits10.
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline void grisu2(char* buf, int& len, int& decimal_exponent,
-                   diyfp m_minus, diyfp v, diyfp m_plus)
-{
-    JSON_ASSERT(m_plus.e == m_minus.e);
-    JSON_ASSERT(m_plus.e == v.e);
-
-    //  --------(-----------------------+-----------------------)--------    (A)
-    //          m-                      v                       m+
-    //
-    //  --------------------(-----------+-----------------------)--------    (B)
-    //                      m-          v                       m+
-    //
-    // First scale v (and m- and m+) such that the exponent is in the range
-    // [alpha, gamma].
-
-    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
-
-    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
-
-    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
-    const diyfp w       = diyfp::mul(v,       c_minus_k);
-    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
-    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
-
-    //  ----(---+---)---------------(---+---)---------------(---+---)----
-    //          w-                      w                       w+
-    //          = c*m-                  = c*v                   = c*m+
-    //
-    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
-    // w+ are now off by a small amount.
-    // In fact:
-    //
-    //      w - v * 10^k < 1 ulp
-    //
-    // To account for this inaccuracy, add resp. subtract 1 ulp.
-    //
-    //  --------+---[---------------(---+---)---------------]---+--------
-    //          w-  M-                  w                   M+  w+
-    //
-    // Now any number in [M-, M+] (bounds included) will round to w when input,
-    // regardless of how the input rounding algorithm breaks ties.
-    //
-    // And digit_gen generates the shortest possible such number in [M-, M+].
-    // Note that this does not mean that Grisu2 always generates the shortest
-    // possible number in the interval (m-, m+).
-    const diyfp M_minus(w_minus.f + 1, w_minus.e);
-    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
-
-    decimal_exponent = -cached.k; // = -(-k) = k
-
-    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
-}
-
-/*!
-v = buf * 10^decimal_exponent
-len is the length of the buffer (number of decimal digits)
-The buffer must be large enough, i.e. >= max_digits10.
-*/
-template<typename FloatType>
-JSON_HEDLEY_NON_NULL(1)
-void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
-{
-    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
-                  "internal error: not enough precision");
-
-    JSON_ASSERT(std::isfinite(value));
-    JSON_ASSERT(value > 0);
-
-    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
-    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
-    // decimal representations are not exactly "short".
-    //
-    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
-    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
-    // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
-    // does.
-    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
-    // representation using the corresponding std::from_chars function recovers value exactly". That
-    // indicates that single precision floating-point numbers should be recovered using
-    // 'std::strtof'.
-    //
-    // NB: If the neighbors are computed for single-precision numbers, there is a single float
-    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
-    //     value is off by 1 ulp.
-#if 0
-    const boundaries w = compute_boundaries(static_cast<double>(value));
-#else
-    const boundaries w = compute_boundaries(value);
-#endif
-
-    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
-}
-
-/*!
-@brief appends a decimal representation of e to buf
-@return a pointer to the element following the exponent.
-@pre -1000 < e < 1000
-*/
-JSON_HEDLEY_NON_NULL(1)
-JSON_HEDLEY_RETURNS_NON_NULL
-inline char* append_exponent(char* buf, int e)
-{
-    JSON_ASSERT(e > -1000);
-    JSON_ASSERT(e <  1000);
-
-    if (e < 0)
-    {
-        e = -e;
-        *buf++ = '-';
-    }
-    else
-    {
-        *buf++ = '+';
-    }
-
-    auto k = static_cast<std::uint32_t>(e);
-    if (k < 10)
-    {
-        // Always print at least two digits in the exponent.
-        // This is for compatibility with printf("%g").
-        *buf++ = '0';
-        *buf++ = static_cast<char>('0' + k);
-    }
-    else if (k < 100)
-    {
-        *buf++ = static_cast<char>('0' + k / 10);
-        k %= 10;
-        *buf++ = static_cast<char>('0' + k);
-    }
-    else
-    {
-        *buf++ = static_cast<char>('0' + k / 100);
-        k %= 100;
-        *buf++ = static_cast<char>('0' + k / 10);
-        k %= 10;
-        *buf++ = static_cast<char>('0' + k);
-    }
-
-    return buf;
-}
-
-/*!
-@brief prettify v = buf * 10^decimal_exponent
-
-If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
-notation. Otherwise it will be printed in exponential notation.
-
-@pre min_exp < 0
-@pre max_exp > 0
-*/
-JSON_HEDLEY_NON_NULL(1)
-JSON_HEDLEY_RETURNS_NON_NULL
-inline char* format_buffer(char* buf, int len, int decimal_exponent,
-                           int min_exp, int max_exp)
-{
-    JSON_ASSERT(min_exp < 0);
-    JSON_ASSERT(max_exp > 0);
-
-    const int k = len;
-    const int n = len + decimal_exponent;
-
-    // v = buf * 10^(n-k)
-    // k is the length of the buffer (number of decimal digits)
-    // n is the position of the decimal point relative to the start of the buffer.
-
-    if (k <= n && n <= max_exp)
-    {
-        // digits[000]
-        // len <= max_exp + 2
-
-        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
-        // Make it look like a floating-point number (#362, #378)
-        buf[n + 0] = '.';
-        buf[n + 1] = '0';
-        return buf + (static_cast<size_t>(n) + 2);
-    }
-
-    if (0 < n && n <= max_exp)
-    {
-        // dig.its
-        // len <= max_digits10 + 1
-
-        JSON_ASSERT(k > n);
-
-        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
-        buf[n] = '.';
-        return buf + (static_cast<size_t>(k) + 1U);
-    }
-
-    if (min_exp < n && n <= 0)
-    {
-        // 0.[000]digits
-        // len <= 2 + (-min_exp - 1) + max_digits10
-
-        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
-        buf[0] = '0';
-        buf[1] = '.';
-        std::memset(buf + 2, '0', static_cast<size_t>(-n));
-        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
-    }
-
-    if (k == 1)
-    {
-        // dE+123
-        // len <= 1 + 5
-
-        buf += 1;
-    }
-    else
-    {
-        // d.igitsE+123
-        // len <= max_digits10 + 1 + 5
-
-        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
-        buf[1] = '.';
-        buf += 1 + static_cast<size_t>(k);
-    }
-
-    *buf++ = 'e';
-    return append_exponent(buf, n - 1);
-}
-
-} // namespace dtoa_impl
-
-/*!
-@brief generates a decimal representation of the floating-point number value in [first, last).
-
-The format of the resulting decimal representation is similar to printf's %g
-format. Returns an iterator pointing past-the-end of the decimal representation.
-
-@note The input number must be finite, i.e. NaN's and Inf's are not supported.
-@note The buffer must be large enough.
-@note The result is NOT null-terminated.
-*/
-template<typename FloatType>
-JSON_HEDLEY_NON_NULL(1, 2)
-JSON_HEDLEY_RETURNS_NON_NULL
-char* to_chars(char* first, const char* last, FloatType value)
-{
-    static_cast<void>(last); // maybe unused - fix warning
-    JSON_ASSERT(std::isfinite(value));
-
-    // Use signbit(value) instead of (value < 0) since signbit works for -0.
-    if (std::signbit(value))
-    {
-        value = -value;
-        *first++ = '-';
-    }
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-    if (value == 0) // +-0
-    {
-        *first++ = '0';
-        // Make it look like a floating-point number (#362, #378)
-        *first++ = '.';
-        *first++ = '0';
-        return first;
-    }
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
-
-    // Compute v = buffer * 10^decimal_exponent.
-    // The decimal digits are stored in the buffer, which needs to be interpreted
-    // as an unsigned decimal integer.
-    // len is the length of the buffer, i.e. the number of decimal digits.
-    int len = 0;
-    int decimal_exponent = 0;
-    dtoa_impl::grisu2(first, len, decimal_exponent, value);
-
-    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
-
-    // Format the buffer like printf("%.*g", prec, value)
-    constexpr int kMinExp = -4;
-    // Use digits10 here to increase compatibility with version 2.
-    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
-
-    JSON_ASSERT(last - first >= kMaxExp + 2);
-    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
-    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
-
-    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
-}
-
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/output/binary_writer.hpp>
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////
-// serialization //
-///////////////////
-
-/// how to treat decoding errors
-enum class error_handler_t
-{
-    strict,  ///< throw a type_error exception in case of invalid UTF-8
-    replace, ///< replace invalid UTF-8 sequences with U+FFFD
-    ignore   ///< ignore invalid UTF-8 sequences
-};
-
-template<typename BasicJsonType>
-class serializer
-{
-    using string_t = typename BasicJsonType::string_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using binary_char_t = typename BasicJsonType::binary_t::value_type;
-    static constexpr std::uint8_t UTF8_ACCEPT = 0;
-    static constexpr std::uint8_t UTF8_REJECT = 1;
-
-  public:
-    /*!
-    @param[in] s  output stream to serialize to
-    @param[in] ichar  indentation character to use
-    @param[in] error_handler_  how to react on decoding errors
-    */
-    serializer(output_adapter_t<char> s, const char ichar,
-               error_handler_t error_handler_ = error_handler_t::strict)
-        : o(std::move(s))
-        , loc(std::localeconv())
-        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
-        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
-        , indent_char(ichar)
-        , indent_string(512, indent_char)
-        , error_handler(error_handler_)
-    {}
-
-    // delete because of pointer members
-    serializer(const serializer&) = delete;
-    serializer& operator=(const serializer&) = delete;
-    serializer(serializer&&) = delete;
-    serializer& operator=(serializer&&) = delete;
-    ~serializer() = default;
-
-    /*!
-    @brief internal implementation of the serialization function
-
-    This function is called by the public member function dump and organizes
-    the serialization internally. The indentation level is propagated as
-    additional parameter. In case of arrays and objects, the function is
-    called recursively.
-
-    - strings and object keys are escaped using `escape_string()`
-    - integer numbers are converted implicitly via `operator<<`
-    - floating-point numbers are converted to a string using `"%g"` format
-    - binary values are serialized as objects containing the subtype and the
-      byte array
-
-    @param[in] val               value to serialize
-    @param[in] pretty_print      whether the output shall be pretty-printed
-    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
-    in the output are escaped with `\uXXXX` sequences, and the result consists
-    of ASCII characters only.
-    @param[in] indent_step       the indent level
-    @param[in] current_indent    the current indent level (only used internally)
-    */
-    void dump(const BasicJsonType& val,
-              const bool pretty_print,
-              const bool ensure_ascii,
-              const unsigned int indent_step,
-              const unsigned int current_indent = 0)
-    {
-        switch (val.m_type)
-        {
-            case value_t::object:
-            {
-                if (val.m_value.object->empty())
-                {
-                    o->write_characters("{}", 2);
-                    return;
-                }
-
-                if (pretty_print)
-                {
-                    o->write_characters("{\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
-                    {
-                        o->write_characters(indent_string.c_str(), new_indent);
-                        o->write_character('\"');
-                        dump_escaped(i->first, ensure_ascii);
-                        o->write_characters("\": ", 3);
-                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
-                        o->write_characters(",\n", 2);
-                    }
-
-                    // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
-                    o->write_characters(indent_string.c_str(), new_indent);
-                    o->write_character('\"');
-                    dump_escaped(i->first, ensure_ascii);
-                    o->write_characters("\": ", 3);
-                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
-
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character('}');
-                }
-                else
-                {
-                    o->write_character('{');
-
-                    // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
-                    {
-                        o->write_character('\"');
-                        dump_escaped(i->first, ensure_ascii);
-                        o->write_characters("\":", 2);
-                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
-                        o->write_character(',');
-                    }
-
-                    // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
-                    o->write_character('\"');
-                    dump_escaped(i->first, ensure_ascii);
-                    o->write_characters("\":", 2);
-                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
-
-                    o->write_character('}');
-                }
-
-                return;
-            }
-
-            case value_t::array:
-            {
-                if (val.m_value.array->empty())
-                {
-                    o->write_characters("[]", 2);
-                    return;
-                }
-
-                if (pretty_print)
-                {
-                    o->write_characters("[\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
-                    {
-                        o->write_characters(indent_string.c_str(), new_indent);
-                        dump(*i, true, ensure_ascii, indent_step, new_indent);
-                        o->write_characters(",\n", 2);
-                    }
-
-                    // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
-                    o->write_characters(indent_string.c_str(), new_indent);
-                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
-
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character(']');
-                }
-                else
-                {
-                    o->write_character('[');
-
-                    // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
-                    {
-                        dump(*i, false, ensure_ascii, indent_step, current_indent);
-                        o->write_character(',');
-                    }
-
-                    // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
-                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
-
-                    o->write_character(']');
-                }
-
-                return;
-            }
-
-            case value_t::string:
-            {
-                o->write_character('\"');
-                dump_escaped(*val.m_value.string, ensure_ascii);
-                o->write_character('\"');
-                return;
-            }
-
-            case value_t::binary:
-            {
-                if (pretty_print)
-                {
-                    o->write_characters("{\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    o->write_characters(indent_string.c_str(), new_indent);
-
-                    o->write_characters("\"bytes\": [", 10);
-
-                    if (!val.m_value.binary->empty())
-                    {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
-                        {
-                            dump_integer(*i);
-                            o->write_characters(", ", 2);
-                        }
-                        dump_integer(val.m_value.binary->back());
-                    }
-
-                    o->write_characters("],\n", 3);
-                    o->write_characters(indent_string.c_str(), new_indent);
-
-                    o->write_characters("\"subtype\": ", 11);
-                    if (val.m_value.binary->has_subtype())
-                    {
-                        dump_integer(val.m_value.binary->subtype());
-                    }
-                    else
-                    {
-                        o->write_characters("null", 4);
-                    }
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character('}');
-                }
-                else
-                {
-                    o->write_characters("{\"bytes\":[", 10);
-
-                    if (!val.m_value.binary->empty())
-                    {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
-                        {
-                            dump_integer(*i);
-                            o->write_character(',');
-                        }
-                        dump_integer(val.m_value.binary->back());
-                    }
-
-                    o->write_characters("],\"subtype\":", 12);
-                    if (val.m_value.binary->has_subtype())
-                    {
-                        dump_integer(val.m_value.binary->subtype());
-                        o->write_character('}');
-                    }
-                    else
-                    {
-                        o->write_characters("null}", 5);
-                    }
-                }
-                return;
-            }
-
-            case value_t::boolean:
-            {
-                if (val.m_value.boolean)
-                {
-                    o->write_characters("true", 4);
-                }
-                else
-                {
-                    o->write_characters("false", 5);
-                }
-                return;
-            }
-
-            case value_t::number_integer:
-            {
-                dump_integer(val.m_value.number_integer);
-                return;
-            }
-
-            case value_t::number_unsigned:
-            {
-                dump_integer(val.m_value.number_unsigned);
-                return;
-            }
-
-            case value_t::number_float:
-            {
-                dump_float(val.m_value.number_float);
-                return;
-            }
-
-            case value_t::discarded:
-            {
-                o->write_characters("<discarded>", 11);
-                return;
-            }
-
-            case value_t::null:
-            {
-                o->write_characters("null", 4);
-                return;
-            }
-
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief dump escaped string
-
-    Escape a string by replacing certain special characters by a sequence of an
-    escape character (backslash) and another character and other control
-    characters by a sequence of "\u" followed by a four-digit hex
-    representation. The escaped string is written to output stream @a o.
-
-    @param[in] s  the string to escape
-    @param[in] ensure_ascii  whether to escape non-ASCII characters with
-                             \uXXXX sequences
-
-    @complexity Linear in the length of string @a s.
-    */
-    void dump_escaped(const string_t& s, const bool ensure_ascii)
-    {
-        std::uint32_t codepoint{};
-        std::uint8_t state = UTF8_ACCEPT;
-        std::size_t bytes = 0;  // number of bytes written to string_buffer
-
-        // number of bytes written at the point of the last valid byte
-        std::size_t bytes_after_last_accept = 0;
-        std::size_t undumped_chars = 0;
-
-        for (std::size_t i = 0; i < s.size(); ++i)
-        {
-            const auto byte = static_cast<std::uint8_t>(s[i]);
-
-            switch (decode(state, codepoint, byte))
-            {
-                case UTF8_ACCEPT:  // decode found a new code point
-                {
-                    switch (codepoint)
-                    {
-                        case 0x08: // backspace
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'b';
-                            break;
-                        }
-
-                        case 0x09: // horizontal tab
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 't';
-                            break;
-                        }
-
-                        case 0x0A: // newline
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'n';
-                            break;
-                        }
-
-                        case 0x0C: // formfeed
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'f';
-                            break;
-                        }
-
-                        case 0x0D: // carriage return
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'r';
-                            break;
-                        }
-
-                        case 0x22: // quotation mark
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = '\"';
-                            break;
-                        }
-
-                        case 0x5C: // reverse solidus
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = '\\';
-                            break;
-                        }
-
-                        default:
-                        {
-                            // escape control characters (0x00..0x1F) or, if
-                            // ensure_ascii parameter is used, non-ASCII characters
-                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
-                            {
-                                if (codepoint <= 0xFFFF)
-                                {
-                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                                    (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
-                                                    static_cast<std::uint16_t>(codepoint));
-                                    bytes += 6;
-                                }
-                                else
-                                {
-                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                                    (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
-                                                    static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
-                                                    static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
-                                    bytes += 12;
-                                }
-                            }
-                            else
-                            {
-                                // copy byte to buffer (all previous bytes
-                                // been copied have in default case above)
-                                string_buffer[bytes++] = s[i];
-                            }
-                            break;
-                        }
-                    }
-
-                    // write buffer and reset index; there must be 13 bytes
-                    // left, as this is the maximal number of bytes to be
-                    // written ("\uxxxx\uxxxx\0") for one code point
-                    if (string_buffer.size() - bytes < 13)
-                    {
-                        o->write_characters(string_buffer.data(), bytes);
-                        bytes = 0;
-                    }
-
-                    // remember the byte position of this accept
-                    bytes_after_last_accept = bytes;
-                    undumped_chars = 0;
-                    break;
-                }
-
-                case UTF8_REJECT:  // decode found invalid UTF-8 byte
-                {
-                    switch (error_handler)
-                    {
-                        case error_handler_t::strict:
-                        {
-                            std::string sn(9, '\0');
-                            // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                            (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
-                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn, BasicJsonType()));
-                        }
-
-                        case error_handler_t::ignore:
-                        case error_handler_t::replace:
-                        {
-                            // in case we saw this character the first time, we
-                            // would like to read it again, because the byte
-                            // may be OK for itself, but just not OK for the
-                            // previous sequence
-                            if (undumped_chars > 0)
-                            {
-                                --i;
-                            }
-
-                            // reset length buffer to the last accepted index;
-                            // thus removing/ignoring the invalid characters
-                            bytes = bytes_after_last_accept;
-
-                            if (error_handler == error_handler_t::replace)
-                            {
-                                // add a replacement character
-                                if (ensure_ascii)
-                                {
-                                    string_buffer[bytes++] = '\\';
-                                    string_buffer[bytes++] = 'u';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'd';
-                                }
-                                else
-                                {
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
-                                }
-
-                                // write buffer and reset index; there must be 13 bytes
-                                // left, as this is the maximal number of bytes to be
-                                // written ("\uxxxx\uxxxx\0") for one code point
-                                if (string_buffer.size() - bytes < 13)
-                                {
-                                    o->write_characters(string_buffer.data(), bytes);
-                                    bytes = 0;
-                                }
-
-                                bytes_after_last_accept = bytes;
-                            }
-
-                            undumped_chars = 0;
-
-                            // continue processing the string
-                            state = UTF8_ACCEPT;
-                            break;
-                        }
-
-                        default:            // LCOV_EXCL_LINE
-                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-
-                default:  // decode found yet incomplete multi-byte code point
-                {
-                    if (!ensure_ascii)
-                    {
-                        // code point will not be escaped - copy byte to buffer
-                        string_buffer[bytes++] = s[i];
-                    }
-                    ++undumped_chars;
-                    break;
-                }
-            }
-        }
-
-        // we finished processing the string
-        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
-        {
-            // write buffer
-            if (bytes > 0)
-            {
-                o->write_characters(string_buffer.data(), bytes);
-            }
-        }
-        else
-        {
-            // we finish reading, but do not accept: string was incomplete
-            switch (error_handler)
-            {
-                case error_handler_t::strict:
-                {
-                    std::string sn(9, '\0');
-                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                    (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
-                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn, BasicJsonType()));
-                }
-
-                case error_handler_t::ignore:
-                {
-                    // write all accepted bytes
-                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
-                    break;
-                }
-
-                case error_handler_t::replace:
-                {
-                    // write all accepted bytes
-                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
-                    // add a replacement character
-                    if (ensure_ascii)
-                    {
-                        o->write_characters("\\ufffd", 6);
-                    }
-                    else
-                    {
-                        o->write_characters("\xEF\xBF\xBD", 3);
-                    }
-                    break;
-                }
-
-                default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            }
-        }
-    }
-
-  private:
-    /*!
-    @brief count digits
-
-    Count the number of decimal (base 10) digits for an input unsigned integer.
-
-    @param[in] x  unsigned integer number to count its digits
-    @return    number of decimal digits
-    */
-    inline unsigned int count_digits(number_unsigned_t x) noexcept
-    {
-        unsigned int n_digits = 1;
-        for (;;)
-        {
-            if (x < 10)
-            {
-                return n_digits;
-            }
-            if (x < 100)
-            {
-                return n_digits + 1;
-            }
-            if (x < 1000)
-            {
-                return n_digits + 2;
-            }
-            if (x < 10000)
-            {
-                return n_digits + 3;
-            }
-            x = x / 10000u;
-            n_digits += 4;
-        }
-    }
-
-    /*!
-    @brief dump an integer
-
-    Dump a given integer to output stream @a o. Works internally with
-    @a number_buffer.
-
-    @param[in] x  integer number (signed or unsigned) to dump
-    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
-    */
-    template < typename NumberType, detail::enable_if_t <
-                   std::is_integral<NumberType>::value ||
-                   std::is_same<NumberType, number_unsigned_t>::value ||
-                   std::is_same<NumberType, number_integer_t>::value ||
-                   std::is_same<NumberType, binary_char_t>::value,
-                   int > = 0 >
-    void dump_integer(NumberType x)
-    {
-        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
-        {
-            {
-                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
-                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
-                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
-                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
-                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
-                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
-                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
-                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
-                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
-                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
-            }
-        };
-
-        // special case for "0"
-        if (x == 0)
-        {
-            o->write_character('0');
-            return;
-        }
-
-        // use a pointer to fill the buffer
-        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-
-        const bool is_negative = std::is_signed<NumberType>::value && !(x >= 0); // see issue #755
-        number_unsigned_t abs_value;
-
-        unsigned int n_chars{};
-
-        if (is_negative)
-        {
-            *buffer_ptr = '-';
-            abs_value = remove_sign(static_cast<number_integer_t>(x));
-
-            // account one more byte for the minus sign
-            n_chars = 1 + count_digits(abs_value);
-        }
-        else
-        {
-            abs_value = static_cast<number_unsigned_t>(x);
-            n_chars = count_digits(abs_value);
-        }
-
-        // spare 1 byte for '\0'
-        JSON_ASSERT(n_chars < number_buffer.size() - 1);
-
-        // jump to the end to generate the string from backward
-        // so we later avoid reversing the result
-        buffer_ptr += n_chars;
-
-        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
-        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
-        while (abs_value >= 100)
-        {
-            const auto digits_index = static_cast<unsigned>((abs_value % 100));
-            abs_value /= 100;
-            *(--buffer_ptr) = digits_to_99[digits_index][1];
-            *(--buffer_ptr) = digits_to_99[digits_index][0];
-        }
-
-        if (abs_value >= 10)
-        {
-            const auto digits_index = static_cast<unsigned>(abs_value);
-            *(--buffer_ptr) = digits_to_99[digits_index][1];
-            *(--buffer_ptr) = digits_to_99[digits_index][0];
-        }
-        else
-        {
-            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
-        }
-
-        o->write_characters(number_buffer.data(), n_chars);
-    }
-
-    /*!
-    @brief dump a floating-point number
-
-    Dump a given floating-point number to output stream @a o. Works internally
-    with @a number_buffer.
-
-    @param[in] x  floating-point number to dump
-    */
-    void dump_float(number_float_t x)
-    {
-        // NaN / inf
-        if (!std::isfinite(x))
-        {
-            o->write_characters("null", 4);
-            return;
-        }
-
-        // If number_float_t is an IEEE-754 single or double precision number,
-        // use the Grisu2 algorithm to produce short numbers which are
-        // guaranteed to round-trip, using strtof and strtod, resp.
-        //
-        // NB: The test below works if <long double> == <double>.
-        static constexpr bool is_ieee_single_or_double
-            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
-              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
-
-        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
-    }
-
-    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
-    {
-        auto* begin = number_buffer.data();
-        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
-
-        o->write_characters(begin, static_cast<size_t>(end - begin));
-    }
-
-    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
-    {
-        // get number of digits for a float -> text -> float round-trip
-        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
-
-        // the actual conversion
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
-
-        // negative value indicates an error
-        JSON_ASSERT(len > 0);
-        // check if buffer was large enough
-        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
-
-        // erase thousands separator
-        if (thousands_sep != '\0')
-        {
-            auto* const end = std::remove(number_buffer.begin(),
-                                          number_buffer.begin() + len, thousands_sep);
-            std::fill(end, number_buffer.end(), '\0');
-            JSON_ASSERT((end - number_buffer.begin()) <= len);
-            len = (end - number_buffer.begin());
-        }
-
-        // convert decimal point to '.'
-        if (decimal_point != '\0' && decimal_point != '.')
-        {
-            auto* const dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
-            if (dec_pos != number_buffer.end())
-            {
-                *dec_pos = '.';
-            }
-        }
-
-        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
-
-        // determine if need to append ".0"
-        const bool value_is_int_like =
-            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
-                         [](char c)
-        {
-            return c == '.' || c == 'e';
-        });
-
-        if (value_is_int_like)
-        {
-            o->write_characters(".0", 2);
-        }
-    }
-
-    /*!
-    @brief check whether a string is UTF-8 encoded
-
-    The function checks each byte of a string whether it is UTF-8 encoded. The
-    result of the check is stored in the @a state parameter. The function must
-    be called initially with state 0 (accept). State 1 means the string must
-    be rejected, because the current byte is not allowed. If the string is
-    completely processed, but the state is non-zero, the string ended
-    prematurely; that is, the last byte indicated more bytes should have
-    followed.
-
-    @param[in,out] state  the state of the decoding
-    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
-    @param[in] byte       next byte to decode
-    @return               new state
-
-    @note The function has been edited: a std::array is used.
-
-    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-    */
-    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
-    {
-        static const std::array<std::uint8_t, 400> utf8d =
-        {
-            {
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
-                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
-                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
-                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
-                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
-                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
-                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
-                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
-                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
-            }
-        };
-
-        JSON_ASSERT(byte < utf8d.size());
-        const std::uint8_t type = utf8d[byte];
-
-        codep = (state != UTF8_ACCEPT)
-                ? (byte & 0x3fu) | (codep << 6u)
-                : (0xFFu >> type) & (byte);
-
-        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
-        JSON_ASSERT(index < 400);
-        state = utf8d[index];
-        return state;
-    }
-
-    /*
-     * Overload to make the compiler happy while it is instantiating
-     * dump_integer for number_unsigned_t.
-     * Must never be called.
-     */
-    number_unsigned_t remove_sign(number_unsigned_t x)
-    {
-        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        return x; // LCOV_EXCL_LINE
-    }
-
-    /*
-     * Helper function for dump_integer
-     *
-     * This function takes a negative signed integer and returns its absolute
-     * value as unsigned integer. The plus/minus shuffling is necessary as we can
-     * not directly remove the sign of an arbitrary signed integer as the
-     * absolute values of INT_MIN and INT_MAX are usually not the same. See
-     * #1708 for details.
-     */
-    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
-    {
-        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
-        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
-    }
-
-  private:
-    /// the output of the serializer
-    output_adapter_t<char> o = nullptr;
-
-    /// a (hopefully) large enough character buffer
-    std::array<char, 64> number_buffer{{}};
-
-    /// the locale
-    const std::lconv* loc = nullptr;
-    /// the locale's thousand separator character
-    const char thousands_sep = '\0';
-    /// the locale's decimal point character
-    const char decimal_point = '\0';
-
-    /// string buffer
-    std::array<char, 512> string_buffer{{}};
-
-    /// the indentation character
-    const char indent_char;
-    /// the indentation string
-    string_t indent_string;
-
-    /// error_handler how to react on decoding errors
-    const error_handler_t error_handler;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/value_t.hpp>
-
-// #include <nlohmann/json_fwd.hpp>
-
-// #include <nlohmann/ordered_map.hpp>
-
-
-#include <functional> // less
-#include <initializer_list> // initializer_list
-#include <iterator> // input_iterator_tag, iterator_traits
-#include <memory> // allocator
-#include <stdexcept> // for out_of_range
-#include <type_traits> // enable_if, is_convertible
-#include <utility> // pair
-#include <vector> // vector
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-
-/// ordered_map: a minimal map-like container that preserves insertion order
-/// for use within nlohmann::basic_json<ordered_map>
-template <class Key, class T, class IgnoredLess = std::less<Key>,
-          class Allocator = std::allocator<std::pair<const Key, T>>>
-                  struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
-{
-    using key_type = Key;
-    using mapped_type = T;
-    using Container = std::vector<std::pair<const Key, T>, Allocator>;
-    using typename Container::iterator;
-    using typename Container::const_iterator;
-    using typename Container::size_type;
-    using typename Container::value_type;
-
-    // Explicit constructors instead of `using Container::Container`
-    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
-    ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {}
-    template <class It>
-    ordered_map(It first, It last, const Allocator& alloc = Allocator())
-        : Container{first, last, alloc} {}
-    ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
-        : Container{init, alloc} {}
-
-    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return {it, false};
-            }
-        }
-        Container::emplace_back(key, t);
-        return {--this->end(), true};
-    }
-
-    T& operator[](const Key& key)
-    {
-        return emplace(key, T{}).first->second;
-    }
-
-    const T& operator[](const Key& key) const
-    {
-        return at(key);
-    }
-
-    T& at(const Key& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return it->second;
-            }
-        }
-
-        JSON_THROW(std::out_of_range("key not found"));
-    }
-
-    const T& at(const Key& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return it->second;
-            }
-        }
-
-        JSON_THROW(std::out_of_range("key not found"));
-    }
-
-    size_type erase(const Key& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                // Since we cannot move const Keys, re-construct them in place
-                for (auto next = it; ++next != this->end(); ++it)
-                {
-                    it->~value_type(); // Destroy but keep allocation
-                    new (&*it) value_type{std::move(*next)};
-                }
-                Container::pop_back();
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    iterator erase(iterator pos)
-    {
-        auto it = pos;
-
-        // Since we cannot move const Keys, re-construct them in place
-        for (auto next = it; ++next != this->end(); ++it)
-        {
-            it->~value_type(); // Destroy but keep allocation
-            new (&*it) value_type{std::move(*next)};
-        }
-        Container::pop_back();
-        return pos;
-    }
-
-    size_type count(const Key& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    iterator find(const Key& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return it;
-            }
-        }
-        return Container::end();
-    }
-
-    const_iterator find(const Key& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return it;
-            }
-        }
-        return Container::end();
-    }
-
-    std::pair<iterator, bool> insert( value_type&& value )
-    {
-        return emplace(value.first, std::move(value.second));
-    }
-
-    std::pair<iterator, bool> insert( const value_type& value )
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == value.first)
-            {
-                return {it, false};
-            }
-        }
-        Container::push_back(value);
-        return {--this->end(), true};
-    }
-
-    template<typename InputIt>
-    using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
-            std::input_iterator_tag>::value>::type;
-
-    template<typename InputIt, typename = require_input_iter<InputIt>>
-    void insert(InputIt first, InputIt last)
-    {
-        for (auto it = first; it != last; ++it)
-        {
-            insert(*it);
-        }
-    }
-};
-
-}  // namespace nlohmann
-
-
-#if defined(JSON_HAS_CPP_17)
-    #include <string_view>
-#endif
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-
-/*!
-@brief a class to store JSON values
-
-@tparam ObjectType type for JSON objects (`std::map` by default; will be used
-in @ref object_t)
-@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
-in @ref array_t)
-@tparam StringType type for JSON strings and object keys (`std::string` by
-default; will be used in @ref string_t)
-@tparam BooleanType type for JSON booleans (`bool` by default; will be used
-in @ref boolean_t)
-@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
-default; will be used in @ref number_integer_t)
-@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
-`uint64_t` by default; will be used in @ref number_unsigned_t)
-@tparam NumberFloatType type for JSON floating-point numbers (`double` by
-default; will be used in @ref number_float_t)
-@tparam BinaryType type for packed binary data for compatibility with binary
-serialization formats (`std::vector<std::uint8_t>` by default; will be used in
-@ref binary_t)
-@tparam AllocatorType type of the allocator to use (`std::allocator` by
-default)
-@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
-and `from_json()` (@ref adl_serializer by default)
-
-@requirement The class satisfies the following concept requirements:
-- Basic
- - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
-   JSON values can be default constructed. The result will be a JSON null
-   value.
- - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
-   A JSON value can be constructed from an rvalue argument.
- - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
-   A JSON value can be copy-constructed from an lvalue expression.
- - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
-   A JSON value van be assigned from an rvalue argument.
- - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
-   A JSON value can be copy-assigned from an lvalue expression.
- - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
-   JSON values can be destructed.
-- Layout
- - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
-   JSON values have
-   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
-   All non-static data members are private and standard layout types, the
-   class has no virtual functions or (virtual) base classes.
-- Library-wide
- - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
-   JSON values can be compared with `==`, see @ref
-   operator==(const_reference,const_reference).
- - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
-   JSON values can be compared with `<`, see @ref
-   operator<(const_reference,const_reference).
- - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
-   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
-   other compatible types, using unqualified function call @ref swap().
- - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
-   JSON values can be compared against `std::nullptr_t` objects which are used
-   to model the `null` value.
-- Container
- - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
-   JSON values can be used like STL containers and provide iterator access.
- - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
-   JSON values can be used like STL containers and provide reverse iterator
-   access.
-
-@invariant The member variables @a m_value and @a m_type have the following
-relationship:
-- If `m_type == value_t::object`, then `m_value.object != nullptr`.
-- If `m_type == value_t::array`, then `m_value.array != nullptr`.
-- If `m_type == value_t::string`, then `m_value.string != nullptr`.
-The invariants are checked by member function assert_invariant().
-
-@internal
-@note ObjectType trick from https://stackoverflow.com/a/9860911
-@endinternal
-
-@see [RFC 8259: The JavaScript Object Notation (JSON) Data Interchange
-Format](https://tools.ietf.org/html/rfc8259)
-
-@since version 1.0.0
-
-@nosubgrouping
-*/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
-{
-  private:
-    template<detail::value_t> friend struct detail::external_constructor;
-    friend ::nlohmann::json_pointer<basic_json>;
-
-    template<typename BasicJsonType, typename InputType>
-    friend class ::nlohmann::detail::parser;
-    friend ::nlohmann::detail::serializer<basic_json>;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::iter_impl;
-    template<typename BasicJsonType, typename CharType>
-    friend class ::nlohmann::detail::binary_writer;
-    template<typename BasicJsonType, typename InputType, typename SAX>
-    friend class ::nlohmann::detail::binary_reader;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_parser;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
-    friend class ::nlohmann::detail::exception;
-
-    /// workaround type for MSVC
-    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    // convenience aliases for types residing in namespace detail;
-    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
-
-    template<typename InputAdapterType>
-    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
-        InputAdapterType adapter,
-        detail::parser_callback_t<basic_json>cb = nullptr,
-        const bool allow_exceptions = true,
-        const bool ignore_comments = false
-                                 )
-    {
-        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
-                std::move(cb), allow_exceptions, ignore_comments);
-    }
-
-  private:
-    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
-    template<typename BasicJsonType>
-    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
-    template<typename BasicJsonType>
-    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
-    template<typename Iterator>
-    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
-    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
-
-    template<typename CharType>
-    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
-
-    template<typename InputType>
-    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
-    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    using serializer = ::nlohmann::detail::serializer<basic_json>;
-
-  public:
-    using value_t = detail::value_t;
-    /// JSON Pointer, see @ref nlohmann::json_pointer
-    using json_pointer = ::nlohmann::json_pointer<basic_json>;
-    template<typename T, typename SFINAE>
-    using json_serializer = JSONSerializer<T, SFINAE>;
-    /// how to treat decoding errors
-    using error_handler_t = detail::error_handler_t;
-    /// how to treat CBOR tags
-    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
-    /// helper type for initializer lists of basic_json values
-    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
-
-    using input_format_t = detail::input_format_t;
-    /// SAX interface type, see @ref nlohmann::json_sax
-    using json_sax_t = json_sax<basic_json>;
-
-    ////////////////
-    // exceptions //
-    ////////////////
-
-    /// @name exceptions
-    /// Classes to implement user-defined exceptions.
-    /// @{
-
-    /// @copydoc detail::exception
-    using exception = detail::exception;
-    /// @copydoc detail::parse_error
-    using parse_error = detail::parse_error;
-    /// @copydoc detail::invalid_iterator
-    using invalid_iterator = detail::invalid_iterator;
-    /// @copydoc detail::type_error
-    using type_error = detail::type_error;
-    /// @copydoc detail::out_of_range
-    using out_of_range = detail::out_of_range;
-    /// @copydoc detail::other_error
-    using other_error = detail::other_error;
-
-    /// @}
-
-
-    /////////////////////
-    // container types //
-    /////////////////////
-
-    /// @name container types
-    /// The canonic container types to use @ref basic_json like any other STL
-    /// container.
-    /// @{
-
-    /// the type of elements in a basic_json container
-    using value_type = basic_json;
-
-    /// the type of an element reference
-    using reference = value_type&;
-    /// the type of an element const reference
-    using const_reference = const value_type&;
-
-    /// a type to represent differences between iterators
-    using difference_type = std::ptrdiff_t;
-    /// a type to represent container sizes
-    using size_type = std::size_t;
-
-    /// the allocator type
-    using allocator_type = AllocatorType<basic_json>;
-
-    /// the type of an element pointer
-    using pointer = typename std::allocator_traits<allocator_type>::pointer;
-    /// the type of an element const pointer
-    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
-
-    /// an iterator for a basic_json container
-    using iterator = iter_impl<basic_json>;
-    /// a const iterator for a basic_json container
-    using const_iterator = iter_impl<const basic_json>;
-    /// a reverse iterator for a basic_json container
-    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
-    /// a const reverse iterator for a basic_json container
-    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
-
-    /// @}
-
-
-    /*!
-    @brief returns the allocator associated with the container
-    */
-    static allocator_type get_allocator()
-    {
-        return allocator_type();
-    }
-
-    /*!
-    @brief returns version information on the library
-
-    This function returns a JSON object with information about the library,
-    including the version number and information on the platform and compiler.
-
-    @return JSON object holding version information
-    key         | description
-    ----------- | ---------------
-    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
-    `copyright` | The copyright line for the library as string.
-    `name`      | The name of the library as string.
-    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
-    `url`       | The URL of the project as string.
-    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
-
-    @liveexample{The following code shows an example output of the `meta()`
-    function.,meta}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @complexity Constant.
-
-    @since 2.1.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json meta()
-    {
-        basic_json result;
-
-        result["copyright"] = "(C) 2013-2021 Niels Lohmann";
-        result["name"] = "JSON for Modern C++";
-        result["url"] = "https://github.com/nlohmann/json";
-        result["version"]["string"] =
-            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
-        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
-        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
-        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
-
-#ifdef _WIN32
-        result["platform"] = "win32";
-#elif defined __linux__
-        result["platform"] = "linux";
-#elif defined __APPLE__
-        result["platform"] = "apple";
-#elif defined __unix__
-        result["platform"] = "unix";
-#else
-        result["platform"] = "unknown";
-#endif
-
-#if defined(__ICC) || defined(__INTEL_COMPILER)
-        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
-#elif defined(__clang__)
-        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
-#elif defined(__GNUC__) || defined(__GNUG__)
-        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
-#elif defined(__HP_cc) || defined(__HP_aCC)
-        result["compiler"] = "hp"
-#elif defined(__IBMCPP__)
-        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
-#elif defined(_MSC_VER)
-        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
-#elif defined(__PGI)
-        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
-#elif defined(__SUNPRO_CC)
-        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
-#else
-        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
-#endif
-
-#ifdef __cplusplus
-        result["compiler"]["c++"] = std::to_string(__cplusplus);
-#else
-        result["compiler"]["c++"] = "unknown";
-#endif
-        return result;
-    }
-
-
-    ///////////////////////////
-    // JSON value data types //
-    ///////////////////////////
-
-    /// @name JSON value data types
-    /// The data types to store a JSON value. These types are derived from
-    /// the template arguments passed to class @ref basic_json.
-    /// @{
-
-#if defined(JSON_HAS_CPP_14)
-    // Use transparent comparator if possible, combined with perfect forwarding
-    // on find() and count() calls prevents unnecessary string construction.
-    using object_comparator_t = std::less<>;
-#else
-    using object_comparator_t = std::less<StringType>;
-#endif
-
-    /*!
-    @brief a type for an object
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON objects as follows:
-    > An object is an unordered collection of zero or more name/value pairs,
-    > where a name is a string and a value is a string, number, boolean, null,
-    > object, or array.
-
-    To store objects in C++, a type is defined by the template parameters
-    described below.
-
-    @tparam ObjectType  the container to store objects (e.g., `std::map` or
-    `std::unordered_map`)
-    @tparam StringType the type of the keys or names (e.g., `std::string`).
-    The comparison function `std::less<StringType>` is used to order elements
-    inside the container.
-    @tparam AllocatorType the allocator to use for objects (e.g.,
-    `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ObjectType (`std::map`), @a StringType
-    (`std::string`), and @a AllocatorType (`std::allocator`), the default
-    value for @a object_t is:
-
-    @code {.cpp}
-    std::map<
-      std::string, // key_type
-      basic_json, // value_type
-      std::less<std::string>, // key_compare
-      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
-    >
-    @endcode
-
-    #### Behavior
-
-    The choice of @a object_t influences the behavior of the JSON class. With
-    the default type, objects have the following behavior:
-
-    - When all names are unique, objects will be interoperable in the sense
-      that all software implementations receiving that object will agree on
-      the name-value mappings.
-    - When the names within an object are not unique, it is unspecified which
-      one of the values for a given key will be chosen. For instance,
-      `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
-      `{"key": 2}`.
-    - Internally, name/value pairs are stored in lexicographical order of the
-      names. Objects will also be serialized (see @ref dump) in this order.
-      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
-      and serialized as `{"a": 2, "b": 1}`.
-    - When comparing objects, the order of the name/value pairs is irrelevant.
-      This makes objects interoperable in the sense that they will not be
-      affected by these differences. For instance, `{"b": 1, "a": 2}` and
-      `{"a": 2, "b": 1}` will be treated as equal.
-
-    #### Limits
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the object's limit of nesting is not explicitly constrained.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON object.
-
-    #### Storage
-
-    Objects are stored as pointers in a @ref basic_json type. That is, for any
-    access to object values, a pointer of type `object_t*` must be
-    dereferenced.
-
-    @sa see @ref array_t -- type for an array value
-
-    @since version 1.0.0
-
-    @note The order name/value pairs are added to the object is *not*
-    preserved by the library. Therefore, iterating an object may return
-    name/value pairs in a different order than they were originally stored. In
-    fact, keys will be traversed in alphabetical order as `std::map` with
-    `std::less` is used by default. Please note this behavior conforms to [RFC
-    8259](https://tools.ietf.org/html/rfc8259), because any order implements the
-    specified "unordered" nature of JSON objects.
-    */
-    using object_t = ObjectType<StringType,
-          basic_json,
-          object_comparator_t,
-          AllocatorType<std::pair<const StringType,
-          basic_json>>>;
-
-    /*!
-    @brief a type for an array
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON arrays as follows:
-    > An array is an ordered sequence of zero or more values.
-
-    To store objects in C++, a type is defined by the template parameters
-    explained below.
-
-    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
-    `std::list`)
-    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ArrayType (`std::vector`) and @a
-    AllocatorType (`std::allocator`), the default value for @a array_t is:
-
-    @code {.cpp}
-    std::vector<
-      basic_json, // value_type
-      std::allocator<basic_json> // allocator_type
-    >
-    @endcode
-
-    #### Limits
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the array's limit of nesting is not explicitly constrained.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON array.
-
-    #### Storage
-
-    Arrays are stored as pointers in a @ref basic_json type. That is, for any
-    access to array values, a pointer of type `array_t*` must be dereferenced.
-
-    @sa see @ref object_t -- type for an object value
-
-    @since version 1.0.0
-    */
-    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
-
-    /*!
-    @brief a type for a string
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON strings as follows:
-    > A string is a sequence of zero or more Unicode characters.
-
-    To store objects in C++, a type is defined by the template parameter
-    described below. Unicode values are split by the JSON class into
-    byte-sized characters during deserialization.
-
-    @tparam StringType  the container to store strings (e.g., `std::string`).
-    Note this container is used for keys/names in objects, see @ref object_t.
-
-    #### Default type
-
-    With the default values for @a StringType (`std::string`), the default
-    value for @a string_t is:
-
-    @code {.cpp}
-    std::string
-    @endcode
-
-    #### Encoding
-
-    Strings are stored in UTF-8 encoding. Therefore, functions like
-    `std::string::size()` or `std::string::length()` return the number of
-    bytes in the string rather than the number of characters or glyphs.
-
-    #### String comparison
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) states:
-    > Software implementations are typically required to test names of object
-    > members for equality. Implementations that transform the textual
-    > representation into sequences of Unicode code units and then perform the
-    > comparison numerically, code unit by code unit, are interoperable in the
-    > sense that implementations will agree in all cases on equality or
-    > inequality of two strings. For example, implementations that compare
-    > strings with escaped characters unconverted may incorrectly find that
-    > `"a\\b"` and `"a\u005Cb"` are not equal.
-
-    This implementation is interoperable as it does compare strings code unit
-    by code unit.
-
-    #### Storage
-
-    String values are stored as pointers in a @ref basic_json type. That is,
-    for any access to string values, a pointer of type `string_t*` must be
-    dereferenced.
-
-    @since version 1.0.0
-    */
-    using string_t = StringType;
-
-    /*!
-    @brief a type for a boolean
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) implicitly describes a boolean as a
-    type which differentiates the two literals `true` and `false`.
-
-    To store objects in C++, a type is defined by the template parameter @a
-    BooleanType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a BooleanType (`bool`), the default value for
-    @a boolean_t is:
-
-    @code {.cpp}
-    bool
-    @endcode
-
-    #### Storage
-
-    Boolean values are stored directly inside a @ref basic_json type.
-
-    @since version 1.0.0
-    */
-    using boolean_t = BooleanType;
-
-    /*!
-    @brief a type for a number (integer)
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store integer numbers in C++, a type is defined by the template
-    parameter @a NumberIntegerType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberIntegerType (`int64_t`), the default
-    value for @a number_integer_t is:
-
-    @code {.cpp}
-    int64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
-    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
-    that are out of range will yield over/underflow when used in a
-    constructor. During deserialization, too large or small integer numbers
-    will be automatically be stored as @ref number_unsigned_t or @ref
-    number_float_t.
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange of the exactly supported range [INT64_MIN,
-    INT64_MAX], this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa see @ref number_float_t -- type for number values (floating-point)
-
-    @sa see @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
-    using number_integer_t = NumberIntegerType;
-
-    /*!
-    @brief a type for a number (unsigned)
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store unsigned integer numbers in C++, a type is defined by the
-    template parameter @a NumberUnsignedType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberUnsignedType (`uint64_t`), the
-    default value for @a number_unsigned_t is:
-
-    @code {.cpp}
-    uint64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
-    number that can be stored is `0`. Integer numbers that are out of range
-    will yield over/underflow when used in a constructor. During
-    deserialization, too large or small integer numbers will be automatically
-    be stored as @ref number_integer_t or @ref number_float_t.
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange (when considered in conjunction with the
-    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
-    this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa see @ref number_float_t -- type for number values (floating-point)
-    @sa see @ref number_integer_t -- type for number values (integer)
-
-    @since version 2.0.0
-    */
-    using number_unsigned_t = NumberUnsignedType;
-
-    /*!
-    @brief a type for a number (floating-point)
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store floating-point numbers in C++, a type is defined by the template
-    parameter @a NumberFloatType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberFloatType (`double`), the default
-    value for @a number_float_t is:
-
-    @code {.cpp}
-    double
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in floating-point literals will be ignored. Internally,
-      the value will be stored as decimal number. For instance, the C++
-      floating-point literal `01.2` will be serialized to `1.2`. During
-      deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 8259](https://tools.ietf.org/html/rfc8259) states:
-    > This specification allows implementations to set limits on the range and
-    > precision of numbers accepted. Since software that implements IEEE
-    > 754-2008 binary64 (double precision) numbers is generally available and
-    > widely used, good interoperability can be achieved by implementations
-    > that expect no more precision or range than these provide, in the sense
-    > that implementations will approximate JSON numbers within the expected
-    > precision.
-
-    This implementation does exactly follow this approach, as it uses double
-    precision floating-point numbers. Note values smaller than
-    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
-    will be stored as NaN internally and be serialized to `null`.
-
-    #### Storage
-
-    Floating-point number values are stored directly inside a @ref basic_json
-    type.
-
-    @sa see @ref number_integer_t -- type for number values (integer)
-
-    @sa see @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
-    using number_float_t = NumberFloatType;
-
-    /*!
-    @brief a type for a packed binary type
-
-    This type is a type designed to carry binary data that appears in various
-    serialized formats, such as CBOR's Major Type 2, MessagePack's bin, and
-    BSON's generic binary subtype. This type is NOT a part of standard JSON and
-    exists solely for compatibility with these binary types. As such, it is
-    simply defined as an ordered sequence of zero or more byte values.
-
-    Additionally, as an implementation detail, the subtype of the binary data is
-    carried around as a `std::uint8_t`, which is compatible with both of the
-    binary data formats that use binary subtyping, (though the specific
-    numbering is incompatible with each other, and it is up to the user to
-    translate between them).
-
-    [CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type
-    as:
-    > Major type 2: a byte string. The string's length in bytes is represented
-    > following the rules for positive integers (major type 0).
-
-    [MessagePack's documentation on the bin type
-    family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family)
-    describes this type as:
-    > Bin format family stores an byte array in 2, 3, or 5 bytes of extra bytes
-    > in addition to the size of the byte array.
-
-    [BSON's specifications](http://bsonspec.org/spec.html) describe several
-    binary types; however, this type is intended to represent the generic binary
-    type which has the description:
-    > Generic binary subtype - This is the most commonly used binary subtype and
-    > should be the 'default' for drivers and tools.
-
-    None of these impose any limitations on the internal representation other
-    than the basic unit of storage be some type of array whose parts are
-    decomposable into bytes.
-
-    The default representation of this binary format is a
-    `std::vector<std::uint8_t>`, which is a very common way to represent a byte
-    array in modern C++.
-
-    #### Default type
-
-    The default values for @a BinaryType is `std::vector<std::uint8_t>`
-
-    #### Storage
-
-    Binary Arrays are stored as pointers in a @ref basic_json type. That is,
-    for any access to array values, a pointer of the type `binary_t*` must be
-    dereferenced.
-
-    #### Notes on subtypes
-
-    - CBOR
-       - Binary values are represented as byte strings. Subtypes are serialized
-         as tagged values.
-    - MessagePack
-       - If a subtype is given and the binary array contains exactly 1, 2, 4, 8,
-         or 16 elements, the fixext family (fixext1, fixext2, fixext4, fixext8)
-         is used. For other sizes, the ext family (ext8, ext16, ext32) is used.
-         The subtype is then added as singed 8-bit integer.
-       - If no subtype is given, the bin family (bin8, bin16, bin32) is used.
-    - BSON
-       - If a subtype is given, it is used and added as unsigned 8-bit integer.
-       - If no subtype is given, the generic binary subtype 0x00 is used.
-
-    @sa see @ref binary -- create a binary array
-
-    @since version 3.8.0
-    */
-    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
-    /// @}
-
-  private:
-
-    /// helper for exception-safe object creation
-    template<typename T, typename... Args>
-    JSON_HEDLEY_RETURNS_NON_NULL
-    static T* create(Args&& ... args)
-    {
-        AllocatorType<T> alloc;
-        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
-
-        auto deleter = [&](T * obj)
-        {
-            AllocatorTraits::deallocate(alloc, obj, 1);
-        };
-        std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
-        AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
-        JSON_ASSERT(obj != nullptr);
-        return obj.release();
-    }
-
-    ////////////////////////
-    // JSON value storage //
-    ////////////////////////
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief a JSON value
-
-    The actual storage for a JSON value of the @ref basic_json class. This
-    union combines the different storage types for the JSON value types
-    defined in @ref value_t.
-
-    JSON type | value_t type    | used type
-    --------- | --------------- | ------------------------
-    object    | object          | pointer to @ref object_t
-    array     | array           | pointer to @ref array_t
-    string    | string          | pointer to @ref string_t
-    boolean   | boolean         | @ref boolean_t
-    number    | number_integer  | @ref number_integer_t
-    number    | number_unsigned | @ref number_unsigned_t
-    number    | number_float    | @ref number_float_t
-    binary    | binary          | pointer to @ref binary_t
-    null      | null            | *no value is stored*
-
-    @note Variable-length types (objects, arrays, and strings) are stored as
-    pointers. The size of the union should not exceed 64 bits if the default
-    value types are used.
-
-    @since version 1.0.0
-    */
-    union json_value
-    {
-        /// object (stored with pointer to save storage)
-        object_t* object;
-        /// array (stored with pointer to save storage)
-        array_t* array;
-        /// string (stored with pointer to save storage)
-        string_t* string;
-        /// binary (stored with pointer to save storage)
-        binary_t* binary;
-        /// boolean
-        boolean_t boolean;
-        /// number (integer)
-        number_integer_t number_integer;
-        /// number (unsigned integer)
-        number_unsigned_t number_unsigned;
-        /// number (floating-point)
-        number_float_t number_float;
-
-        /// default constructor (for null values)
-        json_value() = default;
-        /// constructor for booleans
-        json_value(boolean_t v) noexcept : boolean(v) {}
-        /// constructor for numbers (integer)
-        json_value(number_integer_t v) noexcept : number_integer(v) {}
-        /// constructor for numbers (unsigned)
-        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
-        /// constructor for numbers (floating-point)
-        json_value(number_float_t v) noexcept : number_float(v) {}
-        /// constructor for empty values of a given type
-        json_value(value_t t)
-        {
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    object = create<object_t>();
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    array = create<array_t>();
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    string = create<string_t>("");
-                    break;
-                }
-
-                case value_t::binary:
-                {
-                    binary = create<binary_t>();
-                    break;
-                }
-
-                case value_t::boolean:
-                {
-                    boolean = boolean_t(false);
-                    break;
-                }
-
-                case value_t::number_integer:
-                {
-                    number_integer = number_integer_t(0);
-                    break;
-                }
-
-                case value_t::number_unsigned:
-                {
-                    number_unsigned = number_unsigned_t(0);
-                    break;
-                }
-
-                case value_t::number_float:
-                {
-                    number_float = number_float_t(0.0);
-                    break;
-                }
-
-                case value_t::null:
-                {
-                    object = nullptr;  // silence warning, see #821
-                    break;
-                }
-
-                case value_t::discarded:
-                default:
-                {
-                    object = nullptr;  // silence warning, see #821
-                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
-                    {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.2", basic_json())); // LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-            }
-        }
-
-        /// constructor for strings
-        json_value(const string_t& value)
-        {
-            string = create<string_t>(value);
-        }
-
-        /// constructor for rvalue strings
-        json_value(string_t&& value)
-        {
-            string = create<string_t>(std::move(value));
-        }
-
-        /// constructor for objects
-        json_value(const object_t& value)
-        {
-            object = create<object_t>(value);
-        }
-
-        /// constructor for rvalue objects
-        json_value(object_t&& value)
-        {
-            object = create<object_t>(std::move(value));
-        }
-
-        /// constructor for arrays
-        json_value(const array_t& value)
-        {
-            array = create<array_t>(value);
-        }
-
-        /// constructor for rvalue arrays
-        json_value(array_t&& value)
-        {
-            array = create<array_t>(std::move(value));
-        }
-
-        /// constructor for binary arrays
-        json_value(const typename binary_t::container_type& value)
-        {
-            binary = create<binary_t>(value);
-        }
-
-        /// constructor for rvalue binary arrays
-        json_value(typename binary_t::container_type&& value)
-        {
-            binary = create<binary_t>(std::move(value));
-        }
-
-        /// constructor for binary arrays (internal type)
-        json_value(const binary_t& value)
-        {
-            binary = create<binary_t>(value);
-        }
-
-        /// constructor for rvalue binary arrays (internal type)
-        json_value(binary_t&& value)
-        {
-            binary = create<binary_t>(std::move(value));
-        }
-
-        void destroy(value_t t)
-        {
-            if (t == value_t::array || t == value_t::object)
-            {
-                // flatten the current json_value to a heap-allocated stack
-                std::vector<basic_json> stack;
-
-                // move the top-level items to stack
-                if (t == value_t::array)
-                {
-                    stack.reserve(array->size());
-                    std::move(array->begin(), array->end(), std::back_inserter(stack));
-                }
-                else
-                {
-                    stack.reserve(object->size());
-                    for (auto&& it : *object)
-                    {
-                        stack.push_back(std::move(it.second));
-                    }
-                }
-
-                while (!stack.empty())
-                {
-                    // move the last item to local variable to be processed
-                    basic_json current_item(std::move(stack.back()));
-                    stack.pop_back();
-
-                    // if current_item is array/object, move
-                    // its children to the stack to be processed later
-                    if (current_item.is_array())
-                    {
-                        std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(), std::back_inserter(stack));
-
-                        current_item.m_value.array->clear();
-                    }
-                    else if (current_item.is_object())
-                    {
-                        for (auto&& it : *current_item.m_value.object)
-                        {
-                            stack.push_back(std::move(it.second));
-                        }
-
-                        current_item.m_value.object->clear();
-                    }
-
-                    // it's now safe that current_item get destructed
-                    // since it doesn't have any children
-                }
-            }
-
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    AllocatorType<object_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    AllocatorType<array_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
-                    break;
-                }
-
-                case value_t::binary:
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
-                    break;
-                }
-
-                case value_t::null:
-                case value_t::boolean:
-                case value_t::number_integer:
-                case value_t::number_unsigned:
-                case value_t::number_float:
-                case value_t::discarded:
-                default:
-                {
-                    break;
-                }
-            }
-        }
-    };
-
-  private:
-    /*!
-    @brief checks the class invariants
-
-    This function asserts the class invariants. It needs to be called at the
-    end of every constructor to make sure that created objects respect the
-    invariant. Furthermore, it has to be called each time the type of a JSON
-    value is changed, because the invariant expresses a relationship between
-    @a m_type and @a m_value.
-
-    Furthermore, the parent relation is checked for arrays and objects: If
-    @a check_parents true and the value is an array or object, then the
-    container's elements must have the current value as parent.
-
-    @param[in] check_parents  whether the parent relation should be checked.
-               The value is true by default and should only be set to false
-               during destruction of objects when the invariant does not
-               need to hold.
-    */
-    void assert_invariant(bool check_parents = true) const noexcept
-    {
-        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
-        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
-        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
-        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
-
-#if JSON_DIAGNOSTICS
-        JSON_TRY
-        {
-            // cppcheck-suppress assertWithSideEffect
-            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
-            {
-                return j.m_parent == this;
-            }));
-        }
-        JSON_CATCH(...) {} // LCOV_EXCL_LINE
-#endif
-        static_cast<void>(check_parents);
-    }
-
-    void set_parents()
-    {
-#if JSON_DIAGNOSTICS
-        switch (m_type)
-        {
-            case value_t::array:
-            {
-                for (auto& element : *m_value.array)
-                {
-                    element.m_parent = this;
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                for (auto& element : *m_value.object)
-                {
-                    element.second.m_parent = this;
-                }
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                break;
-        }
-#endif
-    }
-
-    iterator set_parents(iterator it, typename iterator::difference_type count)
-    {
-#if JSON_DIAGNOSTICS
-        for (typename iterator::difference_type i = 0; i < count; ++i)
-        {
-            (it + i)->m_parent = this;
-        }
-#else
-        static_cast<void>(count);
-#endif
-        return it;
-    }
-
-    reference set_parent(reference j, std::size_t old_capacity = std::size_t(-1))
-    {
-#if JSON_DIAGNOSTICS
-        if (old_capacity != std::size_t(-1))
-        {
-            // see https://github.com/nlohmann/json/issues/2838
-            JSON_ASSERT(type() == value_t::array);
-            if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
-            {
-                // capacity has changed: update all parents
-                set_parents();
-                return j;
-            }
-        }
-
-        // ordered_json uses a vector internally, so pointers could have
-        // been invalidated; see https://github.com/nlohmann/json/issues/2962
-#ifdef JSON_HEDLEY_MSVC_VERSION
-#pragma warning(push )
-#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
-#endif
-        if (detail::is_ordered_map<object_t>::value)
-        {
-            set_parents();
-            return j;
-        }
-#ifdef JSON_HEDLEY_MSVC_VERSION
-#pragma warning( pop )
-#endif
-
-        j.m_parent = this;
-#else
-        static_cast<void>(j);
-        static_cast<void>(old_capacity);
-#endif
-        return j;
-    }
-
-  public:
-    //////////////////////////
-    // JSON parser callback //
-    //////////////////////////
-
-    /*!
-    @brief parser event types
-
-    The parser callback distinguishes the following events:
-    - `object_start`: the parser read `{` and started to process a JSON object
-    - `key`: the parser read a key of a value in an object
-    - `object_end`: the parser read `}` and finished processing a JSON object
-    - `array_start`: the parser read `[` and started to process a JSON array
-    - `array_end`: the parser read `]` and finished processing a JSON array
-    - `value`: the parser finished reading a JSON value
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    @sa see @ref parser_callback_t for more information and examples
-    */
-    using parse_event_t = detail::parse_event_t;
-
-    /*!
-    @brief per-element parser callback type
-
-    With a parser callback function, the result of parsing a JSON text can be
-    influenced. When passed to @ref parse, it is called on certain events
-    (passed as @ref parse_event_t via parameter @a event) with a set recursion
-    depth @a depth and context JSON value @a parsed. The return value of the
-    callback function is a boolean indicating whether the element that emitted
-    the callback shall be kept or not.
-
-    We distinguish six scenarios (determined by the event type) in which the
-    callback function can be called. The following table describes the values
-    of the parameters @a depth, @a event, and @a parsed.
-
-    parameter @a event | description | parameter @a depth | parameter @a parsed
-    ------------------ | ----------- | ------------------ | -------------------
-    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
-    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
-    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
-    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
-    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
-    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    Discarding a value (i.e., returning `false`) has different effects
-    depending on the context in which function was called:
-
-    - Discarded values in structured types are skipped. That is, the parser
-      will behave as if the discarded value was never read.
-    - In case a value outside a structured type is skipped, it is replaced
-      with `null`. This case happens if the top-level element is skipped.
-
-    @param[in] depth  the depth of the recursion during parsing
-
-    @param[in] event  an event of type parse_event_t indicating the context in
-    the callback function has been called
-
-    @param[in,out] parsed  the current intermediate parse result; note that
-    writing to this value has no effect for parse_event_t::key events
-
-    @return Whether the JSON value which called the function during parsing
-    should be kept (`true`) or not (`false`). In the latter case, it is either
-    skipped completely or replaced by an empty discarded object.
-
-    @sa see @ref parse for examples
-
-    @since version 1.0.0
-    */
-    using parser_callback_t = detail::parser_callback_t<basic_json>;
-
-    //////////////////
-    // constructors //
-    //////////////////
-
-    /// @name constructors and destructors
-    /// Constructors of class @ref basic_json, copy/move constructor, copy
-    /// assignment, static functions creating objects, and the destructor.
-    /// @{
-
-    /*!
-    @brief create an empty value with a given type
-
-    Create an empty JSON value with a given type. The value will be default
-    initialized with an empty value which depends on the type:
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    object      | `{}`
-    array       | `[]`
-    binary      | empty array
-
-    @param[in] v  the type of the value to create
-
-    @complexity Constant.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows the constructor for different @ref
-    value_t values,basic_json__value_t}
-
-    @sa see @ref clear() -- restores the postcondition of this constructor
-
-    @since version 1.0.0
-    */
-    basic_json(const value_t v)
-        : m_type(v), m_value(v)
-    {
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a null object
-
-    Create a `null` JSON value. It either takes a null pointer as parameter
-    (explicitly creating `null`) or no parameter (implicitly creating `null`).
-    The passed null pointer itself is not read -- it is only used to choose
-    the right constructor.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @liveexample{The following code shows the constructor with and without a
-    null pointer parameter.,basic_json__nullptr_t}
-
-    @since version 1.0.0
-    */
-    basic_json(std::nullptr_t = nullptr) noexcept
-        : basic_json(value_t::null)
-    {
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a JSON value
-
-    This is a "catch all" constructor for all compatible JSON types; that is,
-    types for which a `to_json()` method exists. The constructor forwards the
-    parameter @a val to that method (to `json_serializer<U>::to_json` method
-    with `U = uncvref_t<CompatibleType>`, to be exact).
-
-    Template type @a CompatibleType includes, but is not limited to, the
-    following types:
-    - **arrays**: @ref array_t and all kinds of compatible containers such as
-      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
-      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
-      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
-      which a @ref basic_json value can be constructed.
-    - **objects**: @ref object_t and all kinds of compatible associative
-      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
-      and `std::unordered_multimap` with a `key_type` compatible to
-      @ref string_t and a `value_type` from which a @ref basic_json value can
-      be constructed.
-    - **strings**: @ref string_t, string literals, and all compatible string
-      containers can be used.
-    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
-      @ref number_float_t, and all convertible number types such as `int`,
-      `size_t`, `int64_t`, `float` or `double` can be used.
-    - **boolean**: @ref boolean_t / `bool` can be used.
-    - **binary**: @ref binary_t / `std::vector<std::uint8_t>` may be used,
-      unfortunately because string literals cannot be distinguished from binary
-      character arrays by the C++ type system, all types compatible with `const
-      char*` will be directed to the string constructor instead.  This is both
-      for backwards compatibility, and due to the fact that a binary type is not
-      a standard JSON type.
-
-    See the examples below.
-
-    @tparam CompatibleType a type such that:
-    - @a CompatibleType is not derived from `std::istream`,
-    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
-         constructors),
-    - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
-    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
-         @ref json_pointer, @ref iterator, etc ...)
-    - `json_serializer<U>` has a `to_json(basic_json_t&, CompatibleType&&)` method
-
-    @tparam U = `uncvref_t<CompatibleType>`
-
-    @param[in] val the value to be forwarded to the respective constructor
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @exceptionsafety Depends on the called constructor. For types directly
-    supported by the library (i.e., all types for which no `to_json()` function
-    was provided), strong guarantee holds: if an exception is thrown, there are
-    no changes to any JSON value.
-
-    @liveexample{The following code shows the constructor with several
-    compatible types.,basic_json__CompatibleType}
-
-    @since version 2.1.0
-    */
-    template < typename CompatibleType,
-               typename U = detail::uncvref_t<CompatibleType>,
-               detail::enable_if_t <
-                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
-    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
-                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
-                                           std::forward<CompatibleType>(val))))
-    {
-        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
-        set_parents();
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a JSON value from an existing one
-
-    This is a constructor for existing @ref basic_json types.
-    It does not hijack copy/move constructors, since the parameter has different
-    template arguments than the current ones.
-
-    The constructor tries to convert the internal @ref m_value of the parameter.
-
-    @tparam BasicJsonType a type such that:
-    - @a BasicJsonType is a @ref basic_json type.
-    - @a BasicJsonType has different template arguments than @ref basic_json_t.
-
-    @param[in] val the @ref basic_json value to be converted.
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @exceptionsafety Depends on the called constructor. For types directly
-    supported by the library (i.e., all types for which no `to_json()` function
-    was provided), strong guarantee holds: if an exception is thrown, there are
-    no changes to any JSON value.
-
-    @since version 3.2.0
-    */
-    template < typename BasicJsonType,
-               detail::enable_if_t <
-                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
-    basic_json(const BasicJsonType& val)
-    {
-        using other_boolean_t = typename BasicJsonType::boolean_t;
-        using other_number_float_t = typename BasicJsonType::number_float_t;
-        using other_number_integer_t = typename BasicJsonType::number_integer_t;
-        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-        using other_string_t = typename BasicJsonType::string_t;
-        using other_object_t = typename BasicJsonType::object_t;
-        using other_array_t = typename BasicJsonType::array_t;
-        using other_binary_t = typename BasicJsonType::binary_t;
-
-        switch (val.type())
-        {
-            case value_t::boolean:
-                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
-                break;
-            case value_t::number_float:
-                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
-                break;
-            case value_t::number_integer:
-                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
-                break;
-            case value_t::number_unsigned:
-                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
-                break;
-            case value_t::string:
-                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
-                break;
-            case value_t::object:
-                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
-                break;
-            case value_t::array:
-                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
-                break;
-            case value_t::binary:
-                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
-                break;
-            case value_t::null:
-                *this = nullptr;
-                break;
-            case value_t::discarded:
-                m_type = value_t::discarded;
-                break;
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-        set_parents();
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a container (array or object) from an initializer list
-
-    Creates a JSON value of type array or object from the passed initializer
-    list @a init. In case @a type_deduction is `true` (default), the type of
-    the JSON value to be created is deducted from the initializer list @a init
-    according to the following rules:
-
-    1. If the list is empty, an empty JSON object value `{}` is created.
-    2. If the list consists of pairs whose first element is a string, a JSON
-       object value is created where the first elements of the pairs are
-       treated as keys and the second elements are as values.
-    3. In all other cases, an array is created.
-
-    The rules aim to create the best fit between a C++ initializer list and
-    JSON values. The rationale is as follows:
-
-    1. The empty initializer list is written as `{}` which is exactly an empty
-       JSON object.
-    2. C++ has no way of describing mapped types other than to list a list of
-       pairs. As JSON requires that keys must be of type string, rule 2 is the
-       weakest constraint one can pose on initializer lists to interpret them
-       as an object.
-    3. In all other cases, the initializer list could not be interpreted as
-       JSON object type, so interpreting it as JSON array type is safe.
-
-    With the rules described above, the following JSON values cannot be
-    expressed by an initializer list:
-
-    - the empty array (`[]`): use @ref array(initializer_list_t)
-      with an empty initializer list in this case
-    - arrays whose elements satisfy rule 2: use @ref
-      array(initializer_list_t) with the same initializer list
-      in this case
-
-    @note When used without parentheses around an empty initializer list, @ref
-    basic_json() is called instead of this function, yielding the JSON null
-    value.
-
-    @param[in] init  initializer list with JSON values
-
-    @param[in] type_deduction internal parameter; when set to `true`, the type
-    of the JSON value is deducted from the initializer list @a init; when set
-    to `false`, the type provided via @a manual_type is forced. This mode is
-    used by the functions @ref array(initializer_list_t) and
-    @ref object(initializer_list_t).
-
-    @param[in] manual_type internal parameter; when @a type_deduction is set
-    to `false`, the created JSON value will use the provided type (only @ref
-    value_t::array and @ref value_t::object are valid); when @a type_deduction
-    is set to `true`, this parameter has no effect
-
-    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
-    `value_t::object`, but @a init contains an element which is not a pair
-    whose first element is a string. In this case, the constructor could not
-    create an object. If @a type_deduction would have be `true`, an array
-    would have been created. See @ref object(initializer_list_t)
-    for an example.
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The example below shows how JSON values are created from
-    initializer lists.,basic_json__list_init_t}
-
-    @sa see @ref array(initializer_list_t) -- create a JSON array
-    value from an initializer list
-    @sa see @ref object(initializer_list_t) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    basic_json(initializer_list_t init,
-               bool type_deduction = true,
-               value_t manual_type = value_t::array)
-    {
-        // check if each element is an array with two elements whose first
-        // element is a string
-        bool is_an_object = std::all_of(init.begin(), init.end(),
-                                        [](const detail::json_ref<basic_json>& element_ref)
-        {
-            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
-        });
-
-        // adjust type if type deduction is not wanted
-        if (!type_deduction)
-        {
-            // if array is wanted, do not create an object though possible
-            if (manual_type == value_t::array)
-            {
-                is_an_object = false;
-            }
-
-            // if object is wanted but impossible, throw an exception
-            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
-            {
-                JSON_THROW(type_error::create(301, "cannot create object from initializer list", basic_json()));
-            }
-        }
-
-        if (is_an_object)
-        {
-            // the initializer list is a list of pairs -> create object
-            m_type = value_t::object;
-            m_value = value_t::object;
-
-            for (auto& element_ref : init)
-            {
-                auto element = element_ref.moved_or_copied();
-                m_value.object->emplace(
-                    std::move(*((*element.m_value.array)[0].m_value.string)),
-                    std::move((*element.m_value.array)[1]));
-            }
-        }
-        else
-        {
-            // the initializer list describes an array -> create array
-            m_type = value_t::array;
-            m_value.array = create<array_t>(init.begin(), init.end());
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /*!
-    @brief explicitly create a binary array (without subtype)
-
-    Creates a JSON binary array value from a given binary container. Binary
-    values are part of various binary formats, such as CBOR, MessagePack, and
-    BSON. This constructor is used to create a value for serialization to those
-    formats.
-
-    @note Note, this function exists because of the difficulty in correctly
-    specifying the correct template overload in the standard value ctor, as both
-    JSON arrays and JSON binary arrays are backed with some form of a
-    `std::vector`. Because JSON binary arrays are a non-standard extension it
-    was decided that it would be best to prevent automatic initialization of a
-    binary array type, for backwards compatibility and so it does not happen on
-    accident.
-
-    @param[in] init container containing bytes to use as binary type
-
-    @return JSON binary array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @since version 3.8.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(const typename binary_t::container_type& init)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = init;
-        return res;
-    }
-
-    /*!
-    @brief explicitly create a binary array (with subtype)
-
-    Creates a JSON binary array value from a given binary container. Binary
-    values are part of various binary formats, such as CBOR, MessagePack, and
-    BSON. This constructor is used to create a value for serialization to those
-    formats.
-
-    @note Note, this function exists because of the difficulty in correctly
-    specifying the correct template overload in the standard value ctor, as both
-    JSON arrays and JSON binary arrays are backed with some form of a
-    `std::vector`. Because JSON binary arrays are a non-standard extension it
-    was decided that it would be best to prevent automatic initialization of a
-    binary array type, for backwards compatibility and so it does not happen on
-    accident.
-
-    @param[in] init container containing bytes to use as binary type
-    @param[in] subtype subtype to use in MessagePack and BSON
-
-    @return JSON binary array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @since version 3.8.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(init, subtype);
-        return res;
-    }
-
-    /// @copydoc binary(const typename binary_t::container_type&)
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(typename binary_t::container_type&& init)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = std::move(init);
-        return res;
-    }
-
-    /// @copydoc binary(const typename binary_t::container_type&, typename binary_t::subtype_type)
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(std::move(init), subtype);
-        return res;
-    }
-
-    /*!
-    @brief explicitly create an array from an initializer list
-
-    Creates a JSON array value from a given initializer list. That is, given a
-    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
-    initializer list is empty, the empty array `[]` is created.
-
-    @note This function is only needed to express two edge cases that cannot
-    be realized with the initializer list constructor (@ref
-    basic_json(initializer_list_t, bool, value_t)). These cases
-    are:
-    1. creating an array whose elements are all pairs whose first element is a
-    string -- in this case, the initializer list constructor would create an
-    object, taking the first elements as keys
-    2. creating an empty array -- passing the empty initializer list to the
-    initializer list constructor yields an empty object
-
-    @param[in] init  initializer list with JSON values to create an array from
-    (optional)
-
-    @return JSON array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows an example for the `array`
-    function.,array}
-
-    @sa see @ref basic_json(initializer_list_t, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa see @ref object(initializer_list_t) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json array(initializer_list_t init = {})
-    {
-        return basic_json(init, false, value_t::array);
-    }
-
-    /*!
-    @brief explicitly create an object from an initializer list
-
-    Creates a JSON object value from a given initializer list. The initializer
-    lists elements must be pairs, and their first elements must be strings. If
-    the initializer list is empty, the empty object `{}` is created.
-
-    @note This function is only added for symmetry reasons. In contrast to the
-    related function @ref array(initializer_list_t), there are
-    no cases which can only be expressed by this function. That is, any
-    initializer list @a init can also be passed to the initializer list
-    constructor @ref basic_json(initializer_list_t, bool, value_t).
-
-    @param[in] init  initializer list to create an object from (optional)
-
-    @return JSON object value
-
-    @throw type_error.301 if @a init is not a list of pairs whose first
-    elements are strings. In this case, no object can be created. When such a
-    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
-    an array would have been created from the passed initializer list @a init.
-    See example below.
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows an example for the `object`
-    function.,object}
-
-    @sa see @ref basic_json(initializer_list_t, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa see @ref array(initializer_list_t) -- create a JSON array
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json object(initializer_list_t init = {})
-    {
-        return basic_json(init, false, value_t::object);
-    }
-
-    /*!
-    @brief construct an array with count copies of given value
-
-    Constructs a JSON array value by creating @a cnt copies of a passed value.
-    In case @a cnt is `0`, an empty array is created.
-
-    @param[in] cnt  the number of JSON copies of @a val to create
-    @param[in] val  the JSON value to copy
-
-    @post `std::distance(begin(),end()) == cnt` holds.
-
-    @complexity Linear in @a cnt.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows examples for the @ref
-    basic_json(size_type\, const basic_json&)
-    constructor.,basic_json__size_type_basic_json}
-
-    @since version 1.0.0
-    */
-    basic_json(size_type cnt, const basic_json& val)
-        : m_type(value_t::array)
-    {
-        m_value.array = create<array_t>(cnt, val);
-        set_parents();
-        assert_invariant();
-    }
-
-    /*!
-    @brief construct a JSON container given an iterator range
-
-    Constructs the JSON value with the contents of the range `[first, last)`.
-    The semantics depends on the different types a JSON value can have:
-    - In case of a null type, invalid_iterator.206 is thrown.
-    - In case of other primitive types (number, boolean, or string), @a first
-      must be `begin()` and @a last must be `end()`. In this case, the value is
-      copied. Otherwise, invalid_iterator.204 is thrown.
-    - In case of structured types (array, object), the constructor behaves as
-      similar versions for `std::vector` or `std::map`; that is, a JSON array
-      or object is constructed from the values in the range.
-
-    @tparam InputIT an input iterator type (@ref iterator or @ref
-    const_iterator)
-
-    @param[in] first begin of the range to copy from (included)
-    @param[in] last end of the range to copy from (excluded)
-
-    @pre Iterators @a first and @a last must be initialized. **This
-         precondition is enforced with an assertion (see warning).** If
-         assertions are switched off, a violation of this precondition yields
-         undefined behavior.
-
-    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
-         checked efficiently. Only certain edge cases are detected; see the
-         description of the exceptions below. A violation of this precondition
-         yields undefined behavior.
-
-    @warning A precondition is enforced with a runtime assertion that will
-             result in calling `std::abort` if this precondition is not met.
-             Assertions can be disabled by defining `NDEBUG` at compile time.
-             See https://en.cppreference.com/w/cpp/error/assert for more
-             information.
-
-    @throw invalid_iterator.201 if iterators @a first and @a last are not
-    compatible (i.e., do not belong to the same JSON value). In this case,
-    the range `[first, last)` is undefined.
-    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
-    primitive type (number, boolean, or string), but @a first does not point
-    to the first element any more. In this case, the range `[first, last)` is
-    undefined. See example code below.
-    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
-    null value. In this case, the range `[first, last)` is undefined.
-
-    @complexity Linear in distance between @a first and @a last.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The example below shows several ways to create JSON values by
-    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
-
-    @since version 1.0.0
-    */
-    template < class InputIT, typename std::enable_if <
-                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
-                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
-    basic_json(InputIT first, InputIT last)
-    {
-        JSON_ASSERT(first.m_object != nullptr);
-        JSON_ASSERT(last.m_object != nullptr);
-
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", basic_json()));
-        }
-
-        // copy type from first iterator
-        m_type = first.m_object->m_type;
-
-        // check if iterator range is complete for primitive values
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
-                                         || !last.m_it.primitive_iterator.is_end()))
-                {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *first.m_object));
-                }
-                break;
-            }
-
-            case value_t::null:
-            case value_t::object:
-            case value_t::array:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                break;
-        }
-
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = first.m_object->m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = first.m_object->m_value.number_float;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = first.m_object->m_value.boolean;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *first.m_object->m_value.string;
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object = create<object_t>(first.m_it.object_iterator,
-                                                  last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array = create<array_t>(first.m_it.array_iterator,
-                                                last.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value = *first.m_object->m_value.binary;
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " + std::string(first.m_object->type_name()), *first.m_object));
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-
-    ///////////////////////////////////////
-    // other constructors and destructor //
-    ///////////////////////////////////////
-
-    template<typename JsonRef,
-             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
-                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
-    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
-
-    /*!
-    @brief copy constructor
-
-    Creates a copy of a given JSON value.
-
-    @param[in] other  the JSON value to copy
-
-    @post `*this == other`
-
-    @complexity Linear in the size of @a other.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-    - As postcondition, it holds: `other == basic_json(other)`.
-
-    @liveexample{The following code shows an example for the copy
-    constructor.,basic_json__basic_json}
-
-    @since version 1.0.0
-    */
-    basic_json(const basic_json& other)
-        : m_type(other.m_type)
-    {
-        // check of passed value is valid
-        other.assert_invariant();
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                m_value = *other.m_value.object;
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value = *other.m_value.array;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *other.m_value.string;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value = other.m_value.boolean;
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                m_value = other.m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value = other.m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value = other.m_value.number_float;
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value = *other.m_value.binary;
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                break;
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /*!
-    @brief move constructor
-
-    Move constructor. Constructs a JSON value with the contents of the given
-    value @a other using move semantics. It "steals" the resources from @a
-    other and leaves it as JSON null value.
-
-    @param[in,out] other  value to move to this object
-
-    @post `*this` has the same value as @a other before the call.
-    @post @a other is a JSON null value.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @requirement This function helps `basic_json` satisfying the
-    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
-    requirements.
-
-    @liveexample{The code below shows the move constructor explicitly called
-    via std::move.,basic_json__moveconstructor}
-
-    @since version 1.0.0
-    */
-    basic_json(basic_json&& other) noexcept
-        : m_type(std::move(other.m_type)),
-          m_value(std::move(other.m_value))
-    {
-        // check that passed value is valid
-        other.assert_invariant(false);
-
-        // invalidate payload
-        other.m_type = value_t::null;
-        other.m_value = {};
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /*!
-    @brief copy assignment
-
-    Copy assignment operator. Copies a JSON value via the "copy and swap"
-    strategy: It is expressed in terms of the copy constructor, destructor,
-    and the `swap()` member function.
-
-    @param[in] other  value to copy from
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-
-    @liveexample{The code below shows and example for the copy assignment. It
-    creates a copy of value `a` which is then swapped with `b`. Finally\, the
-    copy of `a` (which is the null value after the swap) is
-    destroyed.,basic_json__copyassignment}
-
-    @since version 1.0.0
-    */
-    basic_json& operator=(basic_json other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        // check that passed value is valid
-        other.assert_invariant();
-
-        using std::swap;
-        swap(m_type, other.m_type);
-        swap(m_value, other.m_value);
-
-        set_parents();
-        assert_invariant();
-        return *this;
-    }
-
-    /*!
-    @brief destructor
-
-    Destroys the JSON value and frees all allocated memory.
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-    - All stored elements are destroyed and all memory is freed.
-
-    @since version 1.0.0
-    */
-    ~basic_json() noexcept
-    {
-        assert_invariant(false);
-        m_value.destroy(m_type);
-    }
-
-    /// @}
-
-  public:
-    ///////////////////////
-    // object inspection //
-    ///////////////////////
-
-    /// @name object inspection
-    /// Functions to inspect the type of a JSON value.
-    /// @{
-
-    /*!
-    @brief serialization
-
-    Serialization function for JSON values. The function tries to mimic
-    Python's `json.dumps()` function, and currently supports its @a indent
-    and @a ensure_ascii parameters.
-
-    @param[in] indent If indent is nonnegative, then array elements and object
-    members will be pretty-printed with that indent level. An indent level of
-    `0` will only insert newlines. `-1` (the default) selects the most compact
-    representation.
-    @param[in] indent_char The character to use for indentation if @a indent is
-    greater than `0`. The default is ` ` (space).
-    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
-    in the output are escaped with `\uXXXX` sequences, and the result consists
-    of ASCII characters only.
-    @param[in] error_handler  how to react on decoding errors; there are three
-    possible values: `strict` (throws and exception in case a decoding error
-    occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
-    and `ignore` (ignore invalid UTF-8 sequences during serialization; all
-    bytes are copied to the output unchanged).
-
-    @return string containing the serialization of the JSON value
-
-    @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded and @a error_handler is set to strict
-
-    @note Binary values are serialized as object containing two keys:
-      - "bytes": an array of bytes as integers
-      - "subtype": the subtype as integer or "null" if the binary has no subtype
-
-    @complexity Linear.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @liveexample{The following example shows the effect of different @a indent\,
-    @a indent_char\, and @a ensure_ascii parameters to the result of the
-    serialization.,dump}
-
-    @see https://docs.python.org/2/library/json.html#json.dump
-
-    @since version 1.0.0; indentation character @a indent_char, option
-           @a ensure_ascii and exceptions added in version 3.0.0; error
-           handlers added in version 3.4.0; serialization of binary values added
-           in version 3.8.0.
-    */
-    string_t dump(const int indent = -1,
-                  const char indent_char = ' ',
-                  const bool ensure_ascii = false,
-                  const error_handler_t error_handler = error_handler_t::strict) const
-    {
-        string_t result;
-        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
-
-        if (indent >= 0)
-        {
-            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
-        }
-        else
-        {
-            s.dump(*this, false, ensure_ascii, 0);
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief return the type of the JSON value (explicit)
-
-    Return the type of the JSON value as a value from the @ref value_t
-    enumeration.
-
-    @return the type of the JSON value
-            Value type                | return value
-            ------------------------- | -------------------------
-            null                      | value_t::null
-            boolean                   | value_t::boolean
-            string                    | value_t::string
-            number (integer)          | value_t::number_integer
-            number (unsigned integer) | value_t::number_unsigned
-            number (floating-point)   | value_t::number_float
-            object                    | value_t::object
-            array                     | value_t::array
-            binary                    | value_t::binary
-            discarded                 | value_t::discarded
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `type()` for all JSON
-    types.,type}
-
-    @sa see @ref operator value_t() -- return the type of the JSON value (implicit)
-    @sa see @ref type_name() -- return the type as string
-
-    @since version 1.0.0
-    */
-    constexpr value_t type() const noexcept
-    {
-        return m_type;
-    }
-
-    /*!
-    @brief return whether type is primitive
-
-    This function returns true if and only if the JSON type is primitive
-    (string, number, boolean, or null).
-
-    @return `true` if type is primitive (string, number, boolean, or null),
-    `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_primitive()` for all JSON
-    types.,is_primitive}
-
-    @sa see @ref is_structured() -- returns whether JSON value is structured
-    @sa see @ref is_null() -- returns whether JSON value is `null`
-    @sa see @ref is_string() -- returns whether JSON value is a string
-    @sa see @ref is_boolean() -- returns whether JSON value is a boolean
-    @sa see @ref is_number() -- returns whether JSON value is a number
-    @sa see @ref is_binary() -- returns whether JSON value is a binary array
-
-    @since version 1.0.0
-    */
-    constexpr bool is_primitive() const noexcept
-    {
-        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
-    }
-
-    /*!
-    @brief return whether type is structured
-
-    This function returns true if and only if the JSON type is structured
-    (array or object).
-
-    @return `true` if type is structured (array or object), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_structured()` for all JSON
-    types.,is_structured}
-
-    @sa see @ref is_primitive() -- returns whether value is primitive
-    @sa see @ref is_array() -- returns whether value is an array
-    @sa see @ref is_object() -- returns whether value is an object
-
-    @since version 1.0.0
-    */
-    constexpr bool is_structured() const noexcept
-    {
-        return is_array() || is_object();
-    }
-
-    /*!
-    @brief return whether value is null
-
-    This function returns true if and only if the JSON value is null.
-
-    @return `true` if type is null, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_null()` for all JSON
-    types.,is_null}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_null() const noexcept
-    {
-        return m_type == value_t::null;
-    }
-
-    /*!
-    @brief return whether value is a boolean
-
-    This function returns true if and only if the JSON value is a boolean.
-
-    @return `true` if type is boolean, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_boolean()` for all JSON
-    types.,is_boolean}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_boolean() const noexcept
-    {
-        return m_type == value_t::boolean;
-    }
-
-    /*!
-    @brief return whether value is a number
-
-    This function returns true if and only if the JSON value is a number. This
-    includes both integer (signed and unsigned) and floating-point values.
-
-    @return `true` if type is number (regardless whether integer, unsigned
-    integer or floating-type), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number()` for all JSON
-    types.,is_number}
-
-    @sa see @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa see @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa see @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number() const noexcept
-    {
-        return is_number_integer() || is_number_float();
-    }
-
-    /*!
-    @brief return whether value is an integer number
-
-    This function returns true if and only if the JSON value is a signed or
-    unsigned integer number. This excludes floating-point values.
-
-    @return `true` if type is an integer or unsigned integer number, `false`
-    otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_integer()` for all
-    JSON types.,is_number_integer}
-
-    @sa see @ref is_number() -- check if value is a number
-    @sa see @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa see @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number_integer() const noexcept
-    {
-        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
-    }
-
-    /*!
-    @brief return whether value is an unsigned integer number
-
-    This function returns true if and only if the JSON value is an unsigned
-    integer number. This excludes floating-point and signed integer values.
-
-    @return `true` if type is an unsigned integer number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_unsigned()` for all
-    JSON types.,is_number_unsigned}
-
-    @sa see @ref is_number() -- check if value is a number
-    @sa see @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa see @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 2.0.0
-    */
-    constexpr bool is_number_unsigned() const noexcept
-    {
-        return m_type == value_t::number_unsigned;
-    }
-
-    /*!
-    @brief return whether value is a floating-point number
-
-    This function returns true if and only if the JSON value is a
-    floating-point number. This excludes signed and unsigned integer values.
-
-    @return `true` if type is a floating-point number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_float()` for all
-    JSON types.,is_number_float}
-
-    @sa see @ref is_number() -- check if value is number
-    @sa see @ref is_number_integer() -- check if value is an integer number
-    @sa see @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number_float() const noexcept
-    {
-        return m_type == value_t::number_float;
-    }
-
-    /*!
-    @brief return whether value is an object
-
-    This function returns true if and only if the JSON value is an object.
-
-    @return `true` if type is object, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_object()` for all JSON
-    types.,is_object}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_object() const noexcept
-    {
-        return m_type == value_t::object;
-    }
-
-    /*!
-    @brief return whether value is an array
-
-    This function returns true if and only if the JSON value is an array.
-
-    @return `true` if type is array, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_array()` for all JSON
-    types.,is_array}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_array() const noexcept
-    {
-        return m_type == value_t::array;
-    }
-
-    /*!
-    @brief return whether value is a string
-
-    This function returns true if and only if the JSON value is a string.
-
-    @return `true` if type is string, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_string()` for all JSON
-    types.,is_string}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_string() const noexcept
-    {
-        return m_type == value_t::string;
-    }
-
-    /*!
-    @brief return whether value is a binary array
-
-    This function returns true if and only if the JSON value is a binary array.
-
-    @return `true` if type is binary array, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_binary()` for all JSON
-    types.,is_binary}
-
-    @since version 3.8.0
-    */
-    constexpr bool is_binary() const noexcept
-    {
-        return m_type == value_t::binary;
-    }
-
-    /*!
-    @brief return whether value is discarded
-
-    This function returns true if and only if the JSON value was discarded
-    during parsing with a callback function (see @ref parser_callback_t).
-
-    @note This function will always be `false` for JSON values after parsing.
-    That is, discarded values can only occur during parsing, but will be
-    removed when inside a structured value or replaced by null in other cases.
-
-    @return `true` if type is discarded, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_discarded()` for all JSON
-    types.,is_discarded}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_discarded() const noexcept
-    {
-        return m_type == value_t::discarded;
-    }
-
-    /*!
-    @brief return the type of the JSON value (implicit)
-
-    Implicitly return the type of the JSON value as a value from the @ref
-    value_t enumeration.
-
-    @return the type of the JSON value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies the @ref value_t operator for
-    all JSON types.,operator__value_t}
-
-    @sa see @ref type() -- return the type of the JSON value (explicit)
-    @sa see @ref type_name() -- return the type as string
-
-    @since version 1.0.0
-    */
-    constexpr operator value_t() const noexcept
-    {
-        return m_type;
-    }
-
-    /// @}
-
-  private:
-    //////////////////
-    // value access //
-    //////////////////
-
-    /// get a boolean (explicit)
-    boolean_t get_impl(boolean_t* /*unused*/) const
-    {
-        if (JSON_HEDLEY_LIKELY(is_boolean()))
-        {
-            return m_value.boolean;
-        }
-
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name()), *this));
-    }
-
-    /// get a pointer to the value (object)
-    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (object)
-    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /// get a pointer to the value (binary)
-    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
-    {
-        return is_binary() ? m_value.binary : nullptr;
-    }
-
-    /// get a pointer to the value (binary)
-    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
-    {
-        return is_binary() ? m_value.binary : nullptr;
-    }
-
-    /*!
-    @brief helper function to implement get_ref()
-
-    This function helps to implement get_ref() without code duplication for
-    const and non-const overloads
-
-    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
-
-    @throw type_error.303 if ReferenceType does not match underlying value
-    type of the current JSON
-    */
-    template<typename ReferenceType, typename ThisType>
-    static ReferenceType get_ref_impl(ThisType& obj)
-    {
-        // delegate the call to get_ptr<>()
-        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
-
-        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
-        {
-            return *ptr;
-        }
-
-        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name()), obj));
-    }
-
-  public:
-    /// @name value access
-    /// Direct access to the stored value of a JSON value.
-    /// @{
-
-    /*!
-    @brief get a pointer value (implicit)
-
-    Implicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning Writing data to the pointee of the result yields an undefined
-    state.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
-    assertion.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get_ptr}
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-    /*!
-    @brief get a pointer value (implicit)
-    @copydoc get_ptr()
-    */
-    template < typename PointerType, typename std::enable_if <
-                   std::is_pointer<PointerType>::value&&
-                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
-    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-  private:
-    /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType ret;
-    JSONSerializer<ValueType>::from_json(*this, ret);
-    return ret;
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
-    - @ref json_serializer<ValueType> does not have a `from_json()` method of
-      the form `ValueType from_json(const basic_json&)`
-
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get__ValueType_const}
-
-    @since version 2.1.0
-    */
-    template < typename ValueType,
-               detail::enable_if_t <
-                   detail::is_default_constructible<ValueType>::value&&
-                   detail::has_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
-    {
-        ValueType ret{};
-        JSONSerializer<ValueType>::from_json(*this, ret);
-        return ret;
-    }
-
-    /*!
-    @brief get a value (explicit); special case
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    return JSONSerializer<ValueType>::from_json(*this);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json and
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `ValueType from_json(const basic_json&)`
-
-    @note If @ref json_serializer<ValueType> has both overloads of
-    `from_json()`, this one is chosen.
-
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @since version 2.1.0
-    */
-    template < typename ValueType,
-               detail::enable_if_t <
-                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
-    {
-        return JSONSerializer<ValueType>::from_json(*this);
-    }
-
-    /*!
-    @brief get special-case overload
-
-    This overloads converts the current @ref basic_json in a different
-    @ref basic_json type
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this, converted into @a BasicJsonType
-
-    @complexity Depending on the implementation of the called `from_json()`
-                method.
-
-    @since version 3.2.0
-    */
-    template < typename BasicJsonType,
-               detail::enable_if_t <
-                   detail::is_basic_json<BasicJsonType>::value,
-                   int > = 0 >
-    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get special-case overload
-
-    This overloads avoids a lot of template boilerplate, it can be seen as the
-    identity method
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this
-
-    @complexity Constant.
-
-    @since version 2.1.0
-    */
-    template<typename BasicJsonType,
-             detail::enable_if_t<
-                 std::is_same<BasicJsonType, basic_json_t>::value,
-                 int> = 0>
-    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-    @copydoc get()
-    */
-    template<typename PointerType,
-             detail::enable_if_t<
-                 std::is_pointer<PointerType>::value,
-                 int> = 0>
-    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
-    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-  public:
-    /*!
-    @brief get a (pointer) value (explicit)
-
-    Performs explicit type conversion between the JSON value and a compatible value if required.
-
-    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
-    No copies are made.
-
-    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
-    from the current @ref basic_json.
-
-    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
-    method.
-
-    @tparam ValueTypeCV the provided value type
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @tparam ValueType if necessary
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
-
-    @since version 2.1.0
-    */
-    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
-#if defined(JSON_HAS_CPP_14)
-    constexpr
-#endif
-    auto get() const noexcept(
-    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
-    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
-    {
-        // we cannot static_assert on ValueTypeCV being non-const, because
-        // there is support for get<const basic_json_t>(), which is why we
-        // still need the uncvref
-        static_assert(!std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        return get_impl<ValueType>(detail::priority_tag<4> {});
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-
-    Explicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning The pointer becomes invalid if the underlying JSON object
-    changes.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get__PointerType}
-
-    @sa see @ref get_ptr() for explicit pointer-member access
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-    /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value.
-    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType v;
-    JSONSerializer<ValueType>::from_json(*this, v);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
-
-    @tparam ValueType the input parameter type.
-
-    @return the input parameter, allowing chaining calls.
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get_to}
-
-    @since version 3.3.0
-    */
-    template < typename ValueType,
-               detail::enable_if_t <
-                   !detail::is_basic_json<ValueType>::value&&
-                   detail::has_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType & get_to(ValueType& v) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<ValueType>::from_json(*this, v);
-        return v;
-    }
-
-    // specialization to allow to call get_to with a basic_json value
-    // see https://github.com/nlohmann/json/issues/2175
-    template<typename ValueType,
-             detail::enable_if_t <
-                 detail::is_basic_json<ValueType>::value,
-                 int> = 0>
-    ValueType & get_to(ValueType& v) const
-    {
-        v = *this;
-        return v;
-    }
-
-    template <
-        typename T, std::size_t N,
-        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-        detail::enable_if_t <
-            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
-    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-    noexcept(noexcept(JSONSerializer<Array>::from_json(
-                          std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<Array>::from_json(*this, v);
-        return v;
-    }
-
-    /*!
-    @brief get a reference value (implicit)
-
-    Implicit reference access to the internally stored JSON value. No copies
-    are made.
-
-    @warning Writing data to the referee of the result yields an undefined
-    state.
-
-    @tparam ReferenceType reference type; must be a reference to @ref array_t,
-    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
-    @ref number_float_t. Enforced by static assertion.
-
-    @return reference to the internally stored JSON value if the requested
-    reference type @a ReferenceType fits to the JSON value; throws
-    type_error.303 otherwise
-
-    @throw type_error.303 in case passed type @a ReferenceType is incompatible
-    with the stored JSON value; see example below
-
-    @complexity Constant.
-
-    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
-
-    @since version 1.1.0
-    */
-    template<typename ReferenceType, typename std::enable_if<
-                 std::is_reference<ReferenceType>::value, int>::type = 0>
-    ReferenceType get_ref()
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /*!
-    @brief get a reference value (implicit)
-    @copydoc get_ref()
-    */
-    template < typename ReferenceType, typename std::enable_if <
-                   std::is_reference<ReferenceType>::value&&
-                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
-    ReferenceType get_ref() const
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /*!
-    @brief get a value (implicit)
-
-    Implicit type conversion between the JSON value and a compatible value.
-    The call is realized by calling @ref get() const.
-
-    @tparam ValueType non-pointer type compatible to the JSON value, for
-    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
-    `std::vector` types for JSON arrays. The character type of @ref string_t
-    as well as an initializer list of this type is excluded to avoid
-    ambiguities as these types implicitly convert to `std::string`.
-
-    @return copy of the JSON value, converted to type @a ValueType
-
-    @throw type_error.302 in case passed type @a ValueType is incompatible
-    to the JSON value type (e.g., the JSON value is of type boolean, but a
-    string is requested); see example below
-
-    @complexity Linear in the size of the JSON value.
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,operator__ValueType}
-
-    @since version 1.0.0
-    */
-    template < typename ValueType, typename std::enable_if <
-                   detail::conjunction <
-                       detail::negation<std::is_pointer<ValueType>>,
-                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
-                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
-                                        detail::negation<detail::is_basic_json<ValueType>>,
-                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
-
-#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
-                                                detail::negation<std::is_same<ValueType, std::string_view>>,
-#endif
-                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
-                                                >::value, int >::type = 0 >
-                                        JSON_EXPLICIT operator ValueType() const
-    {
-        // delegate the call to get<>() const
-        return get<ValueType>();
-    }
-
-    /*!
-    @return reference to the binary value
-
-    @throw type_error.302 if the value is not binary
-
-    @sa see @ref is_binary() to check if the value is binary
-
-    @since version 3.8.0
-    */
-    binary_t& get_binary()
-    {
-        if (!is_binary())
-        {
-            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
-        }
-
-        return *get_ptr<binary_t*>();
-    }
-
-    /// @copydoc get_binary()
-    const binary_t& get_binary() const
-    {
-        if (!is_binary())
-        {
-            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
-        }
-
-        return *get_ptr<const binary_t*>();
-    }
-
-    /// @}
-
-
-    ////////////////////
-    // element access //
-    ////////////////////
-
-    /// @name element access
-    /// Access to the JSON value.
-    /// @{
-
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a reference to the element at specified location @a idx, with
-    bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw type_error.304 if the JSON value is not an array; in this case,
-    calling `at` with an index makes no sense. See example below.
-    @throw out_of_range.401 if the index @a idx is out of range of the array;
-    that is, `idx >= size()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `at()`. It also demonstrates the different exceptions that
-    can be thrown.,at__size_type}
-    */
-    reference at(size_type idx)
-    {
-        // at only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            JSON_TRY
-            {
-                return set_parent(m_value.array->at(idx));
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a const reference to the element at specified location @a idx,
-    with bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw type_error.304 if the JSON value is not an array; in this case,
-    calling `at` with an index makes no sense. See example below.
-    @throw out_of_range.401 if the index @a idx is out of range of the array;
-    that is, `idx >= size()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how array elements can be read using
-    `at()`. It also demonstrates the different exceptions that can be thrown.,
-    at__size_type_const}
-    */
-    const_reference at(size_type idx) const
-    {
-        // at only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            JSON_TRY
-            {
-                return m_value.array->at(idx);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a reference to the element at with specified key @a key, with
-    bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.304 if the JSON value is not an object; in this case,
-    calling `at` with a key makes no sense. See example below.
-    @throw out_of_range.403 if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Logarithmic in the size of the container.
-
-    @sa see @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa see @ref value() for access by value with a default value
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how object elements can be read and
-    written using `at()`. It also demonstrates the different exceptions that
-    can be thrown.,at__object_t_key_type}
-    */
-    reference at(const typename object_t::key_type& key)
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_TRY
-            {
-                return set_parent(m_value.object->at(key));
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a const reference to the element at with specified key @a key,
-    with bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @throw type_error.304 if the JSON value is not an object; in this case,
-    calling `at` with a key makes no sense. See example below.
-    @throw out_of_range.403 if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Logarithmic in the size of the container.
-
-    @sa see @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa see @ref value() for access by value with a default value
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how object elements can be read using
-    `at()`. It also demonstrates the different exceptions that can be thrown.,
-    at__object_t_key_type_const}
-    */
-    const_reference at(const typename object_t::key_type& key) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_TRY
-            {
-                return m_value.object->at(key);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /*!
-    @brief access specified array element
-
-    Returns a reference to the element at specified location @a idx.
-
-    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
-    then the array is silently filled up with `null` values to make `idx` a
-    valid reference to the last stored element.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw type_error.305 if the JSON value is not an array or null; in that
-    cases, using the [] operator with an index makes no sense.
-
-    @complexity Constant if @a idx is in the range of the array. Otherwise
-    linear in `idx - size()`.
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `[]` operator. Note the addition of `null`
-    values.,operatorarray__size_type}
-
-    @since version 1.0.0
-    */
-    reference operator[](size_type idx)
-    {
-        // implicitly convert null value to an empty array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value.array = create<array_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // fill up array with null values if given idx is outside range
-            if (idx >= m_value.array->size())
-            {
-#if JSON_DIAGNOSTICS
-                // remember array size before resizing
-                const auto previous_size = m_value.array->size();
-#endif
-                m_value.array->resize(idx + 1);
-
-#if JSON_DIAGNOSTICS
-                // set parent for values added above
-                set_parents(begin() + static_cast<typename iterator::difference_type>(previous_size), static_cast<typename iterator::difference_type>(idx + 1 - previous_size));
-#endif
-            }
-
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief access specified array element
-
-    Returns a const reference to the element at specified location @a idx.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw type_error.305 if the JSON value is not an array; in that case,
-    using the [] operator with an index makes no sense.
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how array elements can be read using
-    the `[]` operator.,operatorarray__size_type_const}
-
-    @since version 1.0.0
-    */
-    const_reference operator[](size_type idx) const
-    {
-        // const operator[] only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.305 if the JSON value is not an object or null; in that
-    cases, using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa see @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa see @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    reference operator[](const typename object_t::key_type& key)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return set_parent(m_value.object->operator[](key));
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw type_error.305 if the JSON value is not an object; in that case,
-    using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa see @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa see @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    const_reference operator[](const typename object_t::key_type& key) const
-    {
-        // const operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.305 if the JSON value is not an object or null; in that
-    cases, using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa see @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa see @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
-    template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
-    reference operator[](T* key)
-    {
-        // implicitly convert null to object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return set_parent(m_value.object->operator[](key));
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw type_error.305 if the JSON value is not an object; in that case,
-    using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa see @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa see @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
-    template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
-    const_reference operator[](T* key) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief access specified object element with default value
-
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
-
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(key);
-    } catch(out_of_range) {
-        return default_value;
-    }
-    @endcode
-
-    @note Unlike @ref at(const typename object_t::key_type&), this function
-    does not throw if the given key @a key was not found.
-
-    @note Unlike @ref operator[](const typename object_t::key_type& key), this
-    function does not implicitly add an element to the position defined by @a
-    key. This function is furthermore also applicable to const objects.
-
-    @param[in] key  key of the element to access
-    @param[in] default_value  the value to return if @a key is not found
-
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
-
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
-
-    @throw type_error.302 if @a default_value does not match the type of the
-    value at @a key
-    @throw type_error.306 if the JSON value is not an object; in that case,
-    using `value()` with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value}
-
-    @sa see @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa see @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-
-    @since version 1.0.0
-    */
-    // using std::is_convertible in a std::enable_if will fail when using explicit conversions
-    template < class ValueType, typename std::enable_if <
-                   detail::is_getable<basic_json_t, ValueType>::value
-                   && !std::is_same<value_t, ValueType>::value, int >::type = 0 >
-    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if key is found, return value and given default value otherwise
-            const auto it = find(key);
-            if (it != end())
-            {
-                return it->template get<ValueType>();
-            }
-
-            return default_value;
-        }
-
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
-    */
-    string_t value(const typename object_t::key_type& key, const char* default_value) const
-    {
-        return value(key, string_t(default_value));
-    }
-
-    /*!
-    @brief access specified object element via JSON Pointer with default value
-
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
-
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(ptr);
-    } catch(out_of_range) {
-        return default_value;
-    }
-    @endcode
-
-    @note Unlike @ref at(const json_pointer&), this function does not throw
-    if the given key @a key was not found.
-
-    @param[in] ptr  a JSON pointer to the element to access
-    @param[in] default_value  the value to return if @a ptr found no value
-
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
-
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
-
-    @throw type_error.302 if @a default_value does not match the type of the
-    value at @a ptr
-    @throw type_error.306 if the JSON value is not an object; in that case,
-    using `value()` with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value_ptr}
-
-    @sa see @ref operator[](const json_pointer&) for unchecked access by reference
-
-    @since version 2.0.2
-    */
-    template<class ValueType, typename std::enable_if<
-                 detail::is_getable<basic_json_t, ValueType>::value, int>::type = 0>
-    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if pointer resolves a value, return it or use default value
-            JSON_TRY
-            {
-                return ptr.get_checked(this).template get<ValueType>();
-            }
-            JSON_INTERNAL_CATCH (out_of_range&)
-            {
-                return default_value;
-            }
-        }
-
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const json_pointer&, ValueType) const
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    string_t value(const json_pointer& ptr, const char* default_value) const
-    {
-        return value(ptr, string_t(default_value));
-    }
-
-    /*!
-    @brief access the first element
-
-    Returns a reference to the first element in the container. For a JSON
-    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
-
-    @return In case of a structured type (array or object), a reference to the
-    first element is returned. In case of number, string, boolean, or binary
-    values, a reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
-
-    @throw invalid_iterator.214 when called on `null` value
-
-    @liveexample{The following code shows an example for `front()`.,front}
-
-    @sa see @ref back() -- access the last element
-
-    @since version 1.0.0
-    */
-    reference front()
-    {
-        return *begin();
-    }
-
-    /*!
-    @copydoc basic_json::front()
-    */
-    const_reference front() const
-    {
-        return *cbegin();
-    }
-
-    /*!
-    @brief access the last element
-
-    Returns a reference to the last element in the container. For a JSON
-    container `c`, the expression `c.back()` is equivalent to
-    @code {.cpp}
-    auto tmp = c.end();
-    --tmp;
-    return *tmp;
-    @endcode
-
-    @return In case of a structured type (array or object), a reference to the
-    last element is returned. In case of number, string, boolean, or binary
-    values, a reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
-
-    @throw invalid_iterator.214 when called on a `null` value. See example
-    below.
-
-    @liveexample{The following code shows an example for `back()`.,back}
-
-    @sa see @ref front() -- access the first element
-
-    @since version 1.0.0
-    */
-    reference back()
-    {
-        auto tmp = end();
-        --tmp;
-        return *tmp;
-    }
-
-    /*!
-    @copydoc basic_json::back()
-    */
-    const_reference back() const
-    {
-        auto tmp = cend();
-        --tmp;
-        return *tmp;
-    }
-
-    /*!
-    @brief remove element given an iterator
-
-    Removes the element specified by iterator @a pos. The iterator @a pos must
-    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
-    but is not dereferenceable) cannot be used as a value for @a pos.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] pos iterator to the element to remove
-    @return Iterator following the last removed element. If the iterator @a
-    pos refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw type_error.307 if called on a `null` value; example: `"cannot use
-    erase() with null"`
-    @throw invalid_iterator.202 if called on an iterator which does not belong
-    to the current JSON value; example: `"iterator does not fit current
-    value"`
-    @throw invalid_iterator.205 if called on a primitive type with invalid
-    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
-    out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: amortized constant
-    - arrays: linear in distance between @a pos and the end of the container
-    - strings and binary: linear in the length of the member
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType}
-
-    @sa see @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa see @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa see @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template < class IteratorType, typename std::enable_if <
-                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
-               = 0 >
-    IteratorType erase(IteratorType pos)
-    {
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            case value_t::binary:
-            {
-                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
-                {
-                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", *this));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-                else if (is_binary())
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief remove elements given an iterator range
-
-    Removes the element specified by the range `[first; last)`. The iterator
-    @a first does not need to be dereferenceable if `first == last`: erasing
-    an empty range is a no-op.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] first iterator to the beginning of the range to remove
-    @param[in] last iterator past the end of the range to remove
-    @return Iterator following the last removed element. If the iterator @a
-    second refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw type_error.307 if called on a `null` value; example: `"cannot use
-    erase() with null"`
-    @throw invalid_iterator.203 if called on iterators which does not belong
-    to the current JSON value; example: `"iterators do not fit current value"`
-    @throw invalid_iterator.204 if called on a primitive type with invalid
-    iterators (i.e., if `first != begin()` and `last != end()`); example:
-    `"iterators out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: `log(size()) + std::distance(first, last)`
-    - arrays: linear in the distance between @a first and @a last, plus linear
-      in the distance between @a last and end of the container
-    - strings and binary: linear in the length of the member
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType_IteratorType}
-
-    @sa see @ref erase(IteratorType) -- removes the element at a given position
-    @sa see @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa see @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template < class IteratorType, typename std::enable_if <
-                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
-               = 0 >
-    IteratorType erase(IteratorType first, IteratorType last)
-    {
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", *this));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            case value_t::binary:
-            {
-                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
-                                       || !last.m_it.primitive_iterator.is_end()))
-                {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *this));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-                else if (is_binary())
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
-                                              last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
-                                             last.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief remove element from a JSON object given a key
-
-    Removes elements from a JSON object with the key value @a key.
-
-    @param[in] key value of the elements to remove
-
-    @return Number of elements removed. If @a ObjectType is the default
-    `std::map` type, the return value will always be `0` (@a key was not
-    found) or `1` (@a key was found).
-
-    @post References and iterators to the erased elements are invalidated.
-    Other references and iterators are not affected.
-
-    @throw type_error.307 when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-
-    @complexity `log(size()) + count(key)`
-
-    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
-
-    @sa see @ref erase(IteratorType) -- removes the element at a given position
-    @sa see @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa see @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    size_type erase(const typename object_t::key_type& key)
-    {
-        // this erase only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return m_value.object->erase(key);
-        }
-
-        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief remove element from a JSON array given an index
-
-    Removes element from a JSON array at the index @a idx.
-
-    @param[in] idx index of the element to remove
-
-    @throw type_error.307 when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
-    is out of range"`
-
-    @complexity Linear in distance between @a idx and the end of the container.
-
-    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
-
-    @sa see @ref erase(IteratorType) -- removes the element at a given position
-    @sa see @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa see @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-
-    @since version 1.0.0
-    */
-    void erase(const size_type idx)
-    {
-        // this erase only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
-            {
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
-            }
-
-            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
-        }
-        else
-        {
-            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @}
-
-
-    ////////////
-    // lookup //
-    ////////////
-
-    /// @name lookup
-    /// @{
-
-    /*!
-    @brief find an element in a JSON object
-
-    Finds an element in a JSON object with key equivalent to @a key. If the
-    element is not found or the JSON value is not an object, end() is
-    returned.
-
-    @note This method always returns @ref end() when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value of the element to search for.
-
-    @return Iterator to an element with key equivalent to @a key. If no such
-    element is found or the JSON value is not an object, past-the-end (see
-    @ref end()) iterator is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The example shows how `find()` is used.,find__key_type}
-
-    @sa see @ref contains(KeyT&&) const -- checks whether a key exists
-
-    @since version 1.0.0
-    */
-    template<typename KeyT>
-    iterator find(KeyT&& key)
-    {
-        auto result = end();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief find an element in a JSON object
-    @copydoc find(KeyT&&)
-    */
-    template<typename KeyT>
-    const_iterator find(KeyT&& key) const
-    {
-        auto result = cend();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief returns the number of occurrences of a key in a JSON object
-
-    Returns the number of elements with key @a key. If ObjectType is the
-    default `std::map` type, the return value will always be `0` (@a key was
-    not found) or `1` (@a key was found).
-
-    @note This method always returns `0` when executed on a JSON type that is
-          not an object.
-
-    @param[in] key key value of the element to count
-
-    @return Number of elements with key @a key. If the JSON value is not an
-    object, the return value will be `0`.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The example shows how `count()` is used.,count}
-
-    @since version 1.0.0
-    */
-    template<typename KeyT>
-    size_type count(KeyT&& key) const
-    {
-        // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
-    }
-
-    /*!
-    @brief check the existence of an element in a JSON object
-
-    Check whether an element exists in a JSON object with key equivalent to
-    @a key. If the element is not found or the JSON value is not an object,
-    false is returned.
-
-    @note This method always returns false when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value to check its existence.
-
-    @return true if an element with specified @a key exists. If no such
-    element with such key is found or the JSON value is not an object,
-    false is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The following code shows an example for `contains()`.,contains}
-
-    @sa see @ref find(KeyT&&) -- returns an iterator to an object element
-    @sa see @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer
-
-    @since version 3.6.0
-    */
-    template < typename KeyT, typename std::enable_if <
-                   !std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int >::type = 0 >
-    bool contains(KeyT && key) const
-    {
-        return is_object() && m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
-    }
-
-    /*!
-    @brief check the existence of an element in a JSON object given a JSON pointer
-
-    Check whether the given JSON pointer @a ptr can be resolved in the current
-    JSON value.
-
-    @note This method can be executed on any JSON value type.
-
-    @param[in] ptr JSON pointer to check its existence.
-
-    @return true if the JSON pointer can be resolved to a stored value, false
-    otherwise.
-
-    @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The following code shows an example for `contains()`.,contains_json_pointer}
-
-    @sa see @ref contains(KeyT &&) const -- checks the existence of a key
-
-    @since version 3.7.0
-    */
-    bool contains(const json_pointer& ptr) const
-    {
-        return ptr.contains(this);
-    }
-
-    /// @}
-
-
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /// @name iterators
-    /// @{
-
-    /*!
-    @brief returns an iterator to the first element
-
-    Returns an iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `begin()`.,begin}
-
-    @sa see @ref cbegin() -- returns a const iterator to the beginning
-    @sa see @ref end() -- returns an iterator to the end
-    @sa see @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
-    iterator begin() noexcept
-    {
-        iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /*!
-    @copydoc basic_json::cbegin()
-    */
-    const_iterator begin() const noexcept
-    {
-        return cbegin();
-    }
-
-    /*!
-    @brief returns a const iterator to the first element
-
-    Returns a const iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
-
-    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
-
-    @sa see @ref begin() -- returns an iterator to the beginning
-    @sa see @ref end() -- returns an iterator to the end
-    @sa see @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
-    const_iterator cbegin() const noexcept
-    {
-        const_iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /*!
-    @brief returns an iterator to one past the last element
-
-    Returns an iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `end()`.,end}
-
-    @sa see @ref cend() -- returns a const iterator to the end
-    @sa see @ref begin() -- returns an iterator to the beginning
-    @sa see @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
-    iterator end() noexcept
-    {
-        iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /*!
-    @copydoc basic_json::cend()
-    */
-    const_iterator end() const noexcept
-    {
-        return cend();
-    }
-
-    /*!
-    @brief returns a const iterator to one past the last element
-
-    Returns a const iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
-
-    @liveexample{The following code shows an example for `cend()`.,cend}
-
-    @sa see @ref end() -- returns an iterator to the end
-    @sa see @ref begin() -- returns an iterator to the beginning
-    @sa see @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
-    const_iterator cend() const noexcept
-    {
-        const_iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /*!
-    @brief returns an iterator to the reverse-beginning
-
-    Returns an iterator to the reverse-beginning; that is, the last element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(end())`.
-
-    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
-
-    @sa see @ref crbegin() -- returns a const reverse iterator to the beginning
-    @sa see @ref rend() -- returns a reverse iterator to the end
-    @sa see @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
-    reverse_iterator rbegin() noexcept
-    {
-        return reverse_iterator(end());
-    }
-
-    /*!
-    @copydoc basic_json::crbegin()
-    */
-    const_reverse_iterator rbegin() const noexcept
-    {
-        return crbegin();
-    }
-
-    /*!
-    @brief returns an iterator to the reverse-end
-
-    Returns an iterator to the reverse-end; that is, one before the first
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(begin())`.
-
-    @liveexample{The following code shows an example for `rend()`.,rend}
-
-    @sa see @ref crend() -- returns a const reverse iterator to the end
-    @sa see @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa see @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
-    reverse_iterator rend() noexcept
-    {
-        return reverse_iterator(begin());
-    }
-
-    /*!
-    @copydoc basic_json::crend()
-    */
-    const_reverse_iterator rend() const noexcept
-    {
-        return crend();
-    }
-
-    /*!
-    @brief returns a const reverse iterator to the last element
-
-    Returns a const iterator to the reverse-beginning; that is, the last
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
-
-    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
-
-    @sa see @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa see @ref rend() -- returns a reverse iterator to the end
-    @sa see @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
-    const_reverse_iterator crbegin() const noexcept
-    {
-        return const_reverse_iterator(cend());
-    }
-
-    /*!
-    @brief returns a const reverse iterator to one before the first
-
-    Returns a const reverse iterator to the reverse-end; that is, one before
-    the first element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
-
-    @liveexample{The following code shows an example for `crend()`.,crend}
-
-    @sa see @ref rend() -- returns a reverse iterator to the end
-    @sa see @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa see @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
-    const_reverse_iterator crend() const noexcept
-    {
-        return const_reverse_iterator(cbegin());
-    }
-
-  public:
-    /*!
-    @brief wrapper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    For loop without iterator_wrapper:
-
-    @code{cpp}
-    for (auto it = j_object.begin(); it != j_object.end(); ++it)
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    Range-based for loop without iterator proxy:
-
-    @code{cpp}
-    for (auto it : j_object)
-    {
-        // "it" is of type json::reference and has no key() member
-        std::cout << "value: " << it << '\n';
-    }
-    @endcode
-
-    Range-based for loop with iterator proxy:
-
-    @code{cpp}
-    for (auto it : json::iterator_wrapper(j_object))
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    @note When iterating over an array, `key()` will return the index of the
-          element as string (see example).
-
-    @param[in] ref  reference to a JSON value
-    @return iteration proxy object wrapping @a ref with an interface to use in
-            range-based for loops
-
-    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @note The name of this function is not yet final and may change in the
-    future.
-
-    @deprecated This stream operator is deprecated and will be removed in
-                future 4.0.0 of the library. Please use @ref items() instead;
-                that is, replace `json::iterator_wrapper(j)` with `j.items()`.
-    */
-    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
-    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /*!
-    @copydoc iterator_wrapper(reference)
-    */
-    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
-    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /*!
-    @brief helper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    For loop without `items()` function:
-
-    @code{cpp}
-    for (auto it = j_object.begin(); it != j_object.end(); ++it)
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    Range-based for loop without `items()` function:
-
-    @code{cpp}
-    for (auto it : j_object)
-    {
-        // "it" is of type json::reference and has no key() member
-        std::cout << "value: " << it << '\n';
-    }
-    @endcode
-
-    Range-based for loop with `items()` function:
-
-    @code{cpp}
-    for (auto& el : j_object.items())
-    {
-        std::cout << "key: " << el.key() << ", value:" << el.value() << '\n';
-    }
-    @endcode
-
-    The `items()` function also allows to use
-    [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
-    (C++17):
-
-    @code{cpp}
-    for (auto& [key, val] : j_object.items())
-    {
-        std::cout << "key: " << key << ", value:" << val << '\n';
-    }
-    @endcode
-
-    @note When iterating over an array, `key()` will return the index of the
-          element as string (see example). For primitive types (e.g., numbers),
-          `key()` returns an empty string.
-
-    @warning Using `items()` on temporary objects is dangerous. Make sure the
-             object's lifetime exeeds the iteration. See
-             <https://github.com/nlohmann/json/issues/2040> for more
-             information.
-
-    @return iteration proxy object wrapping @a ref with an interface to use in
-            range-based for loops
-
-    @liveexample{The following code shows how the function is used.,items}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 3.1.0, structured bindings support since 3.5.0.
-    */
-    iteration_proxy<iterator> items() noexcept
-    {
-        return iteration_proxy<iterator>(*this);
-    }
-
-    /*!
-    @copydoc items()
-    */
-    iteration_proxy<const_iterator> items() const noexcept
-    {
-        return iteration_proxy<const_iterator>(*this);
-    }
-
-    /// @}
-
-
-    //////////////
-    // capacity //
-    //////////////
-
-    /// @name capacity
-    /// @{
-
-    /*!
-    @brief checks whether the container is empty.
-
-    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `true`
-            boolean     | `false`
-            string      | `false`
-            number      | `false`
-            binary      | `false`
-            object      | result of function `object_t::empty()`
-            array       | result of function `array_t::empty()`
-
-    @liveexample{The following code uses `empty()` to check if a JSON
-    object contains any elements.,empty}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `empty()` functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @note This function does not return whether a string stored as JSON value
-    is empty - it returns whether the JSON container itself is empty which is
-    false in the case of a string.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `begin() == end()`.
-
-    @sa see @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
-    bool empty() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return true;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::empty()
-                return m_value.array->empty();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::empty()
-                return m_value.object->empty();
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types are nonempty
-                return false;
-            }
-        }
-    }
-
-    /*!
-    @brief returns the number of elements
-
-    Returns the number of elements in a JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0`
-            boolean     | `1`
-            string      | `1`
-            number      | `1`
-            binary      | `1`
-            object      | result of function object_t::size()
-            array       | result of function array_t::size()
-
-    @liveexample{The following code calls `size()` on the different value
-    types.,size}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their size() functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @note This function does not return the length of a string stored as JSON
-    value - it returns the number of elements in the JSON value which is 1 in
-    the case of a string.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `std::distance(begin(), end())`.
-
-    @sa see @ref empty() -- checks whether the container is empty
-    @sa see @ref max_size() -- returns the maximal number of elements
-
-    @since version 1.0.0
-    */
-    size_type size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return 0;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::size()
-                return m_value.array->size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::size()
-                return m_value.object->size();
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types have size 1
-                return 1;
-            }
-        }
-    }
-
-    /*!
-    @brief returns the maximum possible number of elements
-
-    Returns the maximum number of elements a JSON value is able to hold due to
-    system or library implementation limitations, i.e. `std::distance(begin(),
-    end())` for the JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0` (same as `size()`)
-            boolean     | `1` (same as `size()`)
-            string      | `1` (same as `size()`)
-            number      | `1` (same as `size()`)
-            binary      | `1` (same as `size()`)
-            object      | result of function `object_t::max_size()`
-            array       | result of function `array_t::max_size()`
-
-    @liveexample{The following code calls `max_size()` on the different value
-    types. Note the output is implementation specific.,max_size}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `max_size()` functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of returning `b.size()` where `b` is the largest
-      possible JSON value.
-
-    @sa see @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
-    size_type max_size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::array:
-            {
-                // delegate call to array_t::max_size()
-                return m_value.array->max_size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::max_size()
-                return m_value.object->max_size();
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types have max_size() == size()
-                return size();
-            }
-        }
-    }
-
-    /// @}
-
-
-    ///////////////
-    // modifiers //
-    ///////////////
-
-    /// @name modifiers
-    /// @{
-
-    /*!
-    @brief clears the contents
-
-    Clears the content of a JSON value and resets it to the default value as
-    if @ref basic_json(value_t) would have been called with the current value
-    type from @ref type():
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    binary      | An empty byte vector
-    object      | `{}`
-    array       | `[]`
-
-    @post Has the same effect as calling
-    @code {.cpp}
-    *this = basic_json(type());
-    @endcode
-
-    @liveexample{The example below shows the effect of `clear()` to different
-    JSON types.,clear}
-
-    @complexity Linear in the size of the JSON value.
-
-    @iterators All iterators, pointers and references related to this container
-               are invalidated.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @sa see @ref basic_json(value_t) -- constructor that creates an object with the
-        same value than calling `clear()`
-
-    @since version 1.0.0
-    */
-    void clear() noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = 0;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = 0;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = 0.0;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = false;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value.string->clear();
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value.binary->clear();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array->clear();
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object->clear();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @brief add an object to an array
-
-    Appends the given element @a val to the end of the JSON value. If the
-    function is called on a JSON null value, an empty array is created before
-    appending @a val.
-
-    @param[in] val the value to add to the JSON array
-
-    @throw type_error.308 when called on a type other than JSON array or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON array. Note how the `null` value was silently
-    converted to a JSON array.,push_back}
-
-    @since version 1.0.0
-    */
-    void push_back(basic_json&& val)
-    {
-        // push_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (move semantics)
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->push_back(std::move(val));
-        set_parent(m_value.array->back(), old_capacity);
-        // if val is moved from, basic_json move constructor marks it null so we do not call the destructor
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    reference operator+=(basic_json&& val)
-    {
-        push_back(std::move(val));
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    void push_back(const basic_json& val)
-    {
-        // push_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->push_back(val);
-        set_parent(m_value.array->back(), old_capacity);
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    reference operator+=(const basic_json& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an object
-
-    Inserts the given element @a val to the JSON object. If the function is
-    called on a JSON null value, an empty object is created before inserting
-    @a val.
-
-    @param[in] val the value to add to the JSON object
-
-    @throw type_error.308 when called on a type other than JSON object or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON object. Note how the `null` value was silently
-    converted to a JSON object.,push_back__object_t__value}
-
-    @since version 1.0.0
-    */
-    void push_back(const typename object_t::value_type& val)
-    {
-        // push_back only works for null objects or objects
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to object
-        auto res = m_value.object->insert(val);
-        set_parent(res.first->second);
-    }
-
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(const typename object_t::value_type&)
-    */
-    reference operator+=(const typename object_t::value_type& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an object
-
-    This function allows to use `push_back` with an initializer list. In case
-
-    1. the current value is an object,
-    2. the initializer list @a init contains only two elements, and
-    3. the first element of @a init is a string,
-
-    @a init is converted into an object element and added using
-    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
-    is converted to a JSON value and added using @ref push_back(basic_json&&).
-
-    @param[in] init  an initializer list
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @note This function is required to resolve an ambiguous overload error,
-          because pairs like `{"key", "value"}` can be both interpreted as
-          `object_t::value_type` or `std::initializer_list<basic_json>`, see
-          https://github.com/nlohmann/json/issues/235 for more information.
-
-    @liveexample{The example shows how initializer lists are treated as
-    objects when possible.,push_back__initializer_list}
-    */
-    void push_back(initializer_list_t init)
-    {
-        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
-        {
-            basic_json&& key = init.begin()->moved_or_copied();
-            push_back(typename object_t::value_type(
-                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
-        }
-        else
-        {
-            push_back(basic_json(init));
-        }
-    }
-
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(initializer_list_t)
-    */
-    reference operator+=(initializer_list_t init)
-    {
-        push_back(init);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an array
-
-    Creates a JSON value from the passed parameters @a args to the end of the
-    JSON value. If the function is called on a JSON null value, an empty array
-    is created before appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return reference to the inserted element
-
-    @throw type_error.311 when called on a type other than JSON array or
-    null; example: `"cannot use emplace_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` can be used to add
-    elements to a JSON array. Note how the `null` value was silently converted
-    to a JSON array.,emplace_back}
-
-    @since version 2.0.8, returns reference since 3.7.0
-    */
-    template<class... Args>
-    reference emplace_back(Args&& ... args)
-    {
-        // emplace_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->emplace_back(std::forward<Args>(args)...);
-        return set_parent(m_value.array->back(), old_capacity);
-    }
-
-    /*!
-    @brief add an object to an object if key does not exist
-
-    Inserts a new element into a JSON object constructed in-place with the
-    given @a args if there is no element with the key in the container. If the
-    function is called on a JSON null value, an empty object is created before
-    appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return a pair consisting of an iterator to the inserted element, or the
-            already-existing element if no insertion happened, and a bool
-            denoting whether the insertion took place.
-
-    @throw type_error.311 when called on a type other than JSON object or
-    null; example: `"cannot use emplace() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `emplace()` can be used to add elements
-    to a JSON object. Note how the `null` value was silently converted to a
-    JSON object. Further note how no value is added if there was already one
-    value stored with the same key.,emplace}
-
-    @since version 2.0.8
-    */
-    template<class... Args>
-    std::pair<iterator, bool> emplace(Args&& ... args)
-    {
-        // emplace only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
-        {
-            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        auto res = m_value.object->emplace(std::forward<Args>(args)...);
-        set_parent(res.first->second);
-
-        // create result iterator and set iterator to the result of emplace
-        auto it = begin();
-        it.m_it.object_iterator = res.first;
-
-        // return pair of iterator and boolean
-        return {it, res.second};
-    }
-
-    /// Helper for insertion of an iterator
-    /// @note: This uses std::distance to support GCC 4.8,
-    ///        see https://github.com/nlohmann/json/pull/1257
-    template<typename... Args>
-    iterator insert_iterator(const_iterator pos, Args&& ... args)
-    {
-        iterator result(this);
-        JSON_ASSERT(m_value.array != nullptr);
-
-        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
-        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
-        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
-
-        // This could have been written as:
-        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
-        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
-
-        set_parents();
-        return result;
-    }
-
-    /*!
-    @brief inserts element
-
-    Inserts element @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] val element to insert
-    @return iterator pointing to the inserted @a val.
-
-    @throw type_error.309 if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @complexity Constant plus linear in the distance between @a pos and end of
-    the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // check if iterator pos fits to this JSON value
-            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-            {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-            }
-
-            // insert to array and return iterator
-            return insert_iterator(pos, val);
-        }
-
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief inserts element
-    @copydoc insert(const_iterator, const basic_json&)
-    */
-    iterator insert(const_iterator pos, basic_json&& val)
-    {
-        return insert(pos, val);
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts @a cnt copies of @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] cnt number of copies of @a val to insert
-    @param[in] val element to insert
-    @return iterator pointing to the first element inserted, or @a pos if
-    `cnt==0`
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @complexity Linear in @a cnt plus linear in the distance between @a pos
-    and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__count}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // check if iterator pos fits to this JSON value
-            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-            {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-            }
-
-            // insert to array and return iterator
-            return insert_iterator(pos, cnt, val);
-        }
-
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)` before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-    @throw invalid_iterator.211 if @a first or @a last are iterators into
-    container for which insert is called; example: `"passed iterators may not
-    belong to container"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `first==last`
-
-    @complexity Linear in `std::distance(first, last)` plus linear in the
-    distance between @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_UNLIKELY(!is_array()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
-        {
-            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", *this));
-        }
-
-        // insert to array and return iterator
-        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from initializer list @a ilist before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] ilist initializer list to insert the values from
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `ilist` is empty
-
-    @complexity Linear in `ilist.size()` plus linear in the distance between
-    @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__ilist}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, initializer_list_t ilist)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_UNLIKELY(!is_array()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-        }
-
-        // insert to array and return iterator
-        return insert_iterator(pos, ilist.begin(), ilist.end());
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)`.
-
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.309 if called on JSON values other than objects; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
-    point to an object; example: `"iterators first and last must point to
-    objects"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-
-    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
-    of elements to insert.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range_object}
-
-    @since version 3.0.0
-    */
-    void insert(const_iterator first, const_iterator last)
-    {
-        // insert only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this));
-        }
-
-        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
-    }
-
-    /*!
-    @brief updates a JSON object from another object, overwriting existing keys
-
-    Inserts all values from JSON object @a j and overwrites existing keys.
-
-    @param[in] j  JSON object to read values from
-
-    @throw type_error.312 if called on JSON values other than objects; example:
-    `"cannot use update() with string"`
-
-    @complexity O(N*log(size() + N)), where N is the number of elements to
-                insert.
-
-    @liveexample{The example shows how `update()` is used.,update}
-
-    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
-
-    @since version 3.0.0
-    */
-    void update(const_reference j)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this));
-        }
-        if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name()), *this));
-        }
-
-        for (auto it = j.cbegin(); it != j.cend(); ++it)
-        {
-            m_value.object->operator[](it.key()) = it.value();
-        }
-    }
-
-    /*!
-    @brief updates a JSON object from another object, overwriting existing keys
-
-    Inserts all values from from range `[first, last)` and overwrites existing
-    keys.
-
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.312 if called on JSON values other than objects; example:
-    `"cannot use update() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
-    point to an object; example: `"iterators first and last must point to
-    objects"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-
-    @complexity O(N*log(size() + N)), where N is the number of elements to
-                insert.
-
-    @liveexample{The example shows how `update()` is used__range.,update}
-
-    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
-
-    @since version 3.0.0
-    */
-    void update(const_iterator first, const_iterator last)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()
-                                 || !last.m_object->is_object()))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this));
-        }
-
-        for (auto it = first; it != last; ++it)
-        {
-            m_value.object->operator[](it.key()) = it.value();
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of the JSON value with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other JSON value to exchange the contents with
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how JSON values can be swapped with
-    `swap()`.,swap__reference}
-
-    @since version 1.0.0
-    */
-    void swap(reference other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
-
-        set_parents();
-        other.set_parents();
-        assert_invariant();
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of the JSON value from @a left with those of @a right. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated. implemented as a friend function callable via ADL.
-
-    @param[in,out] left JSON value to exchange the contents with
-    @param[in,out] right JSON value to exchange the contents with
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how JSON values can be swapped with
-    `swap()`.,swap__reference}
-
-    @since version 1.0.0
-    */
-    friend void swap(reference left, reference right) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        left.swap(right);
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON array with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other array to exchange the contents with
-
-    @throw type_error.310 when JSON value is not an array; example: `"cannot
-    use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how arrays can be swapped with
-    `swap()`.,swap__array_t}
-
-    @since version 1.0.0
-    */
-    void swap(array_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            std::swap(*(m_value.array), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON object with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other object to exchange the contents with
-
-    @throw type_error.310 when JSON value is not an object; example:
-    `"cannot use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how objects can be swapped with
-    `swap()`.,swap__object_t}
-
-    @since version 1.0.0
-    */
-    void swap(object_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            std::swap(*(m_value.object), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON string with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other string to exchange the contents with
-
-    @throw type_error.310 when JSON value is not a string; example: `"cannot
-    use swap() with boolean"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how strings can be swapped with
-    `swap()`.,swap__string_t}
-
-    @since version 1.0.0
-    */
-    void swap(string_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_string()))
-        {
-            std::swap(*(m_value.string), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON string with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other binary to exchange the contents with
-
-    @throw type_error.310 when JSON value is not a string; example: `"cannot
-    use swap() with boolean"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how strings can be swapped with
-    `swap()`.,swap__binary_t}
-
-    @since version 3.8.0
-    */
-    void swap(binary_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_binary()))
-        {
-            std::swap(*(m_value.binary), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @copydoc swap(binary_t&)
-    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_binary()))
-        {
-            std::swap(*(m_value.binary), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @}
-
-  public:
-    //////////////////////////////////////////
-    // lexicographical comparison operators //
-    //////////////////////////////////////////
-
-    /// @name lexicographical comparison operators
-    /// @{
-
-    /*!
-    @brief comparison: equal
-
-    Compares two JSON values for equality according to the following rules:
-    - Two JSON values are equal if (1) they are from the same type and (2)
-      their stored values are the same according to their respective
-      `operator==`.
-    - Integer and floating-point numbers are automatically converted before
-      comparison. Note that two NaN values are always treated as unequal.
-    - Two JSON null values are equal.
-
-    @note Floating-point inside JSON values numbers are compared with
-    `json::number_float_t::operator==` which is `double::operator==` by
-    default. To compare floating-point while respecting an epsilon, an alternative
-    [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39)
-    could be used, for instance
-    @code {.cpp}
-    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
-    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
-    {
-        return std::abs(a - b) <= epsilon;
-    }
-    @endcode
-    Or you can self-defined operator equal function like this:
-    @code {.cpp}
-    bool my_equal(const_reference lhs, const_reference rhs) {
-    const auto lhs_type lhs.type();
-    const auto rhs_type rhs.type();
-    if (lhs_type == rhs_type) {
-        switch(lhs_type)
-            // self_defined case
-            case value_t::number_float:
-                return std::abs(lhs - rhs) <= std::numeric_limits<float>::epsilon();
-            // other cases remain the same with the original
-            ...
-    }
-    ...
-    }
-    @endcode
-
-    @note NaN values never compare equal to themselves or to other NaN values.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are equal
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @complexity Linear.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__equal}
-
-    @since version 1.0.0
-    */
-    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
-    {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    return *lhs.m_value.array == *rhs.m_value.array;
-
-                case value_t::object:
-                    return *lhs.m_value.object == *rhs.m_value.object;
-
-                case value_t::null:
-                    return true;
-
-                case value_t::string:
-                    return *lhs.m_value.string == *rhs.m_value.string;
-
-                case value_t::boolean:
-                    return lhs.m_value.boolean == rhs.m_value.boolean;
-
-                case value_t::number_integer:
-                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
-
-                case value_t::number_unsigned:
-                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
-
-                case value_t::number_float:
-                    return lhs.m_value.number_float == rhs.m_value.number_float;
-
-                case value_t::binary:
-                    return *lhs.m_value.binary == *rhs.m_value.binary;
-
-                case value_t::discarded:
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-
-        return false;
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-    }
-
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs == basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) == rhs;
-    }
-
-    /*!
-    @brief comparison: not equal
-
-    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are not equal
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__notequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return !(lhs == rhs);
-    }
-
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs != basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) != rhs;
-    }
-
-    /*!
-    @brief comparison: less than
-
-    Compares whether one JSON value @a lhs is less than another JSON value @a
-    rhs according to the following rules:
-    - If @a lhs and @a rhs have the same type, the values are compared using
-      the default `<` operator.
-    - Integer and floating-point numbers are automatically converted before
-      comparison
-    - In case @a lhs and @a rhs have different types, the values are ignored
-      and the order of the types is considered, see
-      @ref operator<(const value_t, const value_t).
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__less}
-
-    @since version 1.0.0
-    */
-    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
-    {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    // note parentheses are necessary, see
-                    // https://github.com/nlohmann/json/issues/1530
-                    return (*lhs.m_value.array) < (*rhs.m_value.array);
-
-                case value_t::object:
-                    return (*lhs.m_value.object) < (*rhs.m_value.object);
-
-                case value_t::null:
-                    return false;
-
-                case value_t::string:
-                    return (*lhs.m_value.string) < (*rhs.m_value.string);
-
-                case value_t::boolean:
-                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
-
-                case value_t::number_integer:
-                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
-
-                case value_t::number_unsigned:
-                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
-
-                case value_t::number_float:
-                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
-
-                case value_t::binary:
-                    return (*lhs.m_value.binary) < (*rhs.m_value.binary);
-
-                case value_t::discarded:
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
-        }
-
-        // We only reach this line if we cannot compare values. In that case,
-        // we compare types. Note we have to call the operator explicitly,
-        // because MSVC has problems otherwise.
-        return operator<(lhs_type, rhs_type);
-    }
-
-    /*!
-    @brief comparison: less than
-    @copydoc operator<(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs < basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: less than
-    @copydoc operator<(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) < rhs;
-    }
-
-    /*!
-    @brief comparison: less than or equal
-
-    Compares whether one JSON value @a lhs is less than or equal to another
-    JSON value by calculating `not (rhs < lhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than or equal to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greater}
-
-    @since version 1.0.0
-    */
-    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return !(rhs < lhs);
-    }
-
-    /*!
-    @brief comparison: less than or equal
-    @copydoc operator<=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs <= basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: less than or equal
-    @copydoc operator<=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) <= rhs;
-    }
-
-    /*!
-    @brief comparison: greater than
-
-    Compares whether one JSON value @a lhs is greater than another
-    JSON value by calculating `not (lhs <= rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__lessequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
-    {
-        return !(lhs <= rhs);
-    }
-
-    /*!
-    @brief comparison: greater than
-    @copydoc operator>(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs > basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: greater than
-    @copydoc operator>(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) > rhs;
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-
-    Compares whether one JSON value @a lhs is greater than or equal to another
-    JSON value by calculating `not (lhs < rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than or equal to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greaterequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return !(lhs < rhs);
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-    @copydoc operator>=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs >= basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-    @copydoc operator>=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) >= rhs;
-    }
-
-    /// @}
-
-    ///////////////////
-    // serialization //
-    ///////////////////
-
-    /// @name serialization
-    /// @{
-#ifndef JSON_NO_IO
-    /*!
-    @brief serialize to stream
-
-    Serialize the given JSON value @a j to the output stream @a o. The JSON
-    value will be serialized using the @ref dump member function.
-
-    - The indentation of the output can be controlled with the member variable
-      `width` of the output stream @a o. For instance, using the manipulator
-      `std::setw(4)` on @a o sets the indentation level to `4` and the
-      serialization result is the same as calling `dump(4)`.
-
-    - The indentation character can be controlled with the member variable
-      `fill` of the output stream @a o. For instance, the manipulator
-      `std::setfill('\\t')` sets indentation to use a tab character rather than
-      the default space character.
-
-    @param[in,out] o  stream to serialize to
-    @param[in] j  JSON value to serialize
-
-    @return the stream @a o
-
-    @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded
-
-    @complexity Linear.
-
-    @liveexample{The example below shows the serialization with different
-    parameters to `width` to adjust the indentation level.,operator_serialize}
-
-    @since version 1.0.0; indentation character added in version 3.0.0
-    */
-    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
-    {
-        // read width member and use it as indentation parameter if nonzero
-        const bool pretty_print = o.width() > 0;
-        const auto indentation = pretty_print ? o.width() : 0;
-
-        // reset width to 0 for subsequent calls to this stream
-        o.width(0);
-
-        // do the actual serialization
-        serializer s(detail::output_adapter<char>(o), o.fill());
-        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
-        return o;
-    }
-
-    /*!
-    @brief serialize to stream
-    @deprecated This stream operator is deprecated and will be removed in
-                future 4.0.0 of the library. Please use
-                @ref operator<<(std::ostream&, const basic_json&)
-                instead; that is, replace calls like `j >> o;` with `o << j;`.
-    @since version 1.0.0; deprecated since version 3.0.0
-    */
-    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
-    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
-    {
-        return o << j;
-    }
-#endif  // JSON_NO_IO
-    /// @}
-
-
-    /////////////////////
-    // deserialization //
-    /////////////////////
-
-    /// @name deserialization
-    /// @{
-
-    /*!
-    @brief deserialize from a compatible input
-
-    @tparam InputType A compatible input, for instance
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i  input to read from
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb or reading from the input @a i has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from an array.,parse__array__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__string__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__istream__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
-
-    @since version 2.0.3 (contiguous containers); version 3.9.0 allowed to
-    ignore comments.
-    */
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json parse(InputType&& i,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    /*!
-    @brief deserialize from a pair of character iterators
-
-    The value_type of the iterator must be a integral type with size of 1, 2 or
-    4 bytes, which will be interpreted respectively as UTF-8, UTF-16 and UTF-32.
-
-    @param[in] first iterator to start of character range
-    @param[in] last  iterator to end of character range
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-    */
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json parse(IteratorType first,
-                            IteratorType last,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
-    static basic_json parse(detail::span_input_adapter&& i,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    /*!
-    @brief check if the input is valid JSON
-
-    Unlike the @ref parse(InputType&&, const parser_callback_t,const bool)
-    function, this function neither throws an exception in case of invalid JSON
-    input (i.e., a parse error) nor creates diagnostic information.
-
-    @tparam InputType A compatible input, for instance
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i input to read from
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return Whether the input read from @a i is valid JSON.
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `accept()` function reading
-    from a string.,accept__string}
-    */
-    template<typename InputType>
-    static bool accept(InputType&& i,
-                       const bool ignore_comments = false)
-    {
-        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
-    }
-
-    template<typename IteratorType>
-    static bool accept(IteratorType first, IteratorType last,
-                       const bool ignore_comments = false)
-    {
-        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
-    static bool accept(detail::span_input_adapter&& i,
-                       const bool ignore_comments = false)
-    {
-        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
-    }
-
-    /*!
-    @brief generate SAX events
-
-    The SAX event lister must follow the interface of @ref json_sax.
-
-    This function reads from a compatible input. Examples are:
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i  input to read from
-    @param[in,out] sax  SAX event listener
-    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
-    @param[in] strict  whether the input has to be consumed completely
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default); only applies to the JSON file format.
-
-    @return return value of the last processed SAX event
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
-    a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `sax_parse()` function
-    reading from string and processing the events with a user-defined SAX
-    event consumer.,sax_parse}
-
-    @since version 3.2.0
-    */
-    template <typename InputType, typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    static bool sax_parse(InputType&& i, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        return format == input_format_t::json
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
-    }
-
-    template<class IteratorType, class SAX>
-    JSON_HEDLEY_NON_NULL(3)
-    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        return format == input_format_t::json
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
-    }
-
-    template <typename SAX>
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
-    JSON_HEDLEY_NON_NULL(2)
-    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = i.get();
-        return format == input_format_t::json
-               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
-    }
-#ifndef JSON_NO_IO
-    /*!
-    @brief deserialize from stream
-    @deprecated This stream operator is deprecated and will be removed in
-                version 4.0.0 of the library. Please use
-                @ref operator>>(std::istream&, basic_json&)
-                instead; that is, replace calls like `j << i;` with `i >> j;`.
-    @since version 1.0.0; deprecated since version 3.0.0
-    */
-    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
-    friend std::istream& operator<<(basic_json& j, std::istream& i)
-    {
-        return operator>>(i, j);
-    }
-
-    /*!
-    @brief deserialize from stream
-
-    Deserializes an input stream to a JSON value.
-
-    @param[in,out] i  input stream to read a serialized JSON value from
-    @param[in,out] j  JSON value to write the deserialized input to
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below shows how a JSON value is constructed by
-    reading a serialization from a stream.,operator_deserialize}
-
-    @sa parse(std::istream&, const parser_callback_t) for a variant with a
-    parser callback function to filter values while parsing
-
-    @since version 1.0.0
-    */
-    friend std::istream& operator>>(std::istream& i, basic_json& j)
-    {
-        parser(detail::input_adapter(i)).parse(false, j);
-        return i;
-    }
-#endif  // JSON_NO_IO
-    /// @}
-
-    ///////////////////////////
-    // convenience functions //
-    ///////////////////////////
-
-    /*!
-    @brief return the type as string
-
-    Returns the type name as string to be used in error messages - usually to
-    indicate that a function was called on a wrong JSON type.
-
-    @return a string representation of a the @a m_type member:
-            Value type  | return value
-            ----------- | -------------
-            null        | `"null"`
-            boolean     | `"boolean"`
-            string      | `"string"`
-            number      | `"number"` (for all number types)
-            object      | `"object"`
-            array       | `"array"`
-            binary      | `"binary"`
-            discarded   | `"discarded"`
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @complexity Constant.
-
-    @liveexample{The following code exemplifies `type_name()` for all JSON
-    types.,type_name}
-
-    @sa see @ref type() -- return the type of the JSON value
-    @sa see @ref operator value_t() -- return the type of the JSON value (implicit)
-
-    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
-    since 3.0.0
-    */
-    JSON_HEDLEY_RETURNS_NON_NULL
-    const char* type_name() const noexcept
-    {
-        {
-            switch (m_type)
-            {
-                case value_t::null:
-                    return "null";
-                case value_t::object:
-                    return "object";
-                case value_t::array:
-                    return "array";
-                case value_t::string:
-                    return "string";
-                case value_t::boolean:
-                    return "boolean";
-                case value_t::binary:
-                    return "binary";
-                case value_t::discarded:
-                    return "discarded";
-                case value_t::number_integer:
-                case value_t::number_unsigned:
-                case value_t::number_float:
-                default:
-                    return "number";
-            }
-        }
-    }
-
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    //////////////////////
-    // member variables //
-    //////////////////////
-
-    /// the type of the current element
-    value_t m_type = value_t::null;
-
-    /// the value of the current element
-    json_value m_value = {};
-
-#if JSON_DIAGNOSTICS
-    /// a pointer to a parent value (for debugging purposes)
-    basic_json* m_parent = nullptr;
-#endif
-
-    //////////////////////////////////////////
-    // binary serialization/deserialization //
-    //////////////////////////////////////////
-
-    /// @name binary serialization/deserialization support
-    /// @{
-
-  public:
-    /*!
-    @brief create a CBOR serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
-    Binary Object Representation) serialization format. CBOR is a binary
-    serialization format which aims to be more compact than JSON itself, yet
-    more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    CBOR types according to the CBOR specification (RFC 7049):
-
-    JSON value type | value/range                                | CBOR type                          | first byte
-    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
-    null            | `null`                                     | Null                               | 0xF6
-    boolean         | `true`                                     | True                               | 0xF5
-    boolean         | `false`                                    | False                              | 0xF4
-    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
-    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
-    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
-    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
-    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
-    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
-    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
-    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_float    | *any value representable by a float*       | Single-Precision Float             | 0xFA
-    number_float    | *any value NOT representable by a float*   | Double-Precision Float             | 0xFB
-    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
-    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
-    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
-    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
-    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
-    array           | *size*: 0..23                              | array                              | 0x80..0x97
-    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
-    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
-    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
-    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
-    object          | *size*: 0..23                              | map                                | 0xA0..0xB7
-    object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
-    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
-    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
-    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
-    binary          | *size*: 0..23                              | byte string                        | 0x40..0x57
-    binary          | *size*: 23..255                            | byte string (1 byte follow)        | 0x58
-    binary          | *size*: 256..65535                         | byte string (2 bytes follow)       | 0x59
-    binary          | *size*: 65536..4294967295                  | byte string (4 bytes follow)       | 0x5A
-    binary          | *size*: 4294967296..18446744073709551615   | byte string (8 bytes follow)       | 0x5B
-
-    Binary values with subtype are mapped to tagged values (0xD8..0xDB)
-    depending on the subtype, followed by a byte string, see "binary" cells
-    in the table above.
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a CBOR value.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @note The following CBOR types are not used in the conversion:
-          - UTF-8 strings terminated by "break" (0x7F)
-          - arrays terminated by "break" (0x9F)
-          - maps terminated by "break" (0xBF)
-          - byte strings terminated by "break" (0x5F)
-          - date/time (0xC0..0xC1)
-          - bignum (0xC2..0xC3)
-          - decimal fraction (0xC4)
-          - bigfloat (0xC5)
-          - expected conversions (0xD5..0xD7)
-          - simple values (0xE0..0xF3, 0xF8)
-          - undefined (0xF7)
-          - half-precision floats (0xF9)
-          - break (0xFF)
-
-    @param[in] j  JSON value to serialize
-    @return CBOR serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in CBOR format.,to_cbor}
-
-    @sa http://cbor.io
-    @sa see @ref from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) for the
-        analogous deserialization
-    @sa see @ref to_msgpack(const basic_json&) for the related MessagePack format
-    @sa see @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-
-    @since version 2.0.9; compact representation of floating-point numbers
-           since version 3.8.0
-    */
-    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_cbor(j, result);
-        return result;
-    }
-
-    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_cbor(j);
-    }
-
-    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_cbor(j);
-    }
-
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the MessagePack
-    serialization format. MessagePack is a binary serialization format which
-    aims to be more compact than JSON itself, yet more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    MessagePack types according to the MessagePack specification:
-
-    JSON value type | value/range                       | MessagePack type | first byte
-    --------------- | --------------------------------- | ---------------- | ----------
-    null            | `null`                            | nil              | 0xC0
-    boolean         | `true`                            | true             | 0xC3
-    boolean         | `false`                           | false            | 0xC2
-    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
-    number_integer  | -2147483648..-32769               | int32            | 0xD2
-    number_integer  | -32768..-129                      | int16            | 0xD1
-    number_integer  | -128..-33                         | int8             | 0xD0
-    number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
-    number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
-    number_integer  | 128..255                          | uint 8           | 0xCC
-    number_integer  | 256..65535                        | uint 16          | 0xCD
-    number_integer  | 65536..4294967295                 | uint 32          | 0xCE
-    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
-    number_unsigned | 128..255                          | uint 8           | 0xCC
-    number_unsigned | 256..65535                        | uint 16          | 0xCD
-    number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
-    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_float    | *any value representable by a float*     | float 32 | 0xCA
-    number_float    | *any value NOT representable by a float* | float 64 | 0xCB
-    string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
-    string          | *length*: 32..255                 | str 8            | 0xD9
-    string          | *length*: 256..65535              | str 16           | 0xDA
-    string          | *length*: 65536..4294967295       | str 32           | 0xDB
-    array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
-    array           | *size*: 16..65535                 | array 16         | 0xDC
-    array           | *size*: 65536..4294967295         | array 32         | 0xDD
-    object          | *size*: 0..15                     | fix map          | 0x80..0x8F
-    object          | *size*: 16..65535                 | map 16           | 0xDE
-    object          | *size*: 65536..4294967295         | map 32           | 0xDF
-    binary          | *size*: 0..255                    | bin 8            | 0xC4
-    binary          | *size*: 256..65535                | bin 16           | 0xC5
-    binary          | *size*: 65536..4294967295         | bin 32           | 0xC6
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a MessagePack value.
-
-    @note The following values can **not** be converted to a MessagePack value:
-          - strings with more than 4294967295 bytes
-          - byte strings with more than 4294967295 bytes
-          - arrays with more than 4294967295 elements
-          - objects with more than 4294967295 elements
-
-    @note Any MessagePack output created @ref to_msgpack can be successfully
-          parsed by @ref from_msgpack.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in MessagePack format.,to_msgpack}
-
-    @sa http://msgpack.org
-    @sa see @ref from_msgpack for the analogous deserialization
-    @sa see @ref to_cbor(const basic_json& for the related CBOR format
-    @sa see @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-
-    @since version 2.0.9
-    */
-    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_msgpack(j, result);
-        return result;
-    }
-
-    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_msgpack(j);
-    }
-
-    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_msgpack(j);
-    }
-
-    /*!
-    @brief create a UBJSON serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the UBJSON
-    (Universal Binary JSON) serialization format. UBJSON aims to be more compact
-    than JSON itself, yet more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    UBJSON types according to the UBJSON specification:
-
-    JSON value type | value/range                       | UBJSON type | marker
-    --------------- | --------------------------------- | ----------- | ------
-    null            | `null`                            | null        | `Z`
-    boolean         | `true`                            | true        | `T`
-    boolean         | `false`                           | false       | `F`
-    number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
-    number_integer  | -2147483648..-32769               | int32       | `l`
-    number_integer  | -32768..-129                      | int16       | `I`
-    number_integer  | -128..127                         | int8        | `i`
-    number_integer  | 128..255                          | uint8       | `U`
-    number_integer  | 256..32767                        | int16       | `I`
-    number_integer  | 32768..2147483647                 | int32       | `l`
-    number_integer  | 2147483648..9223372036854775807   | int64       | `L`
-    number_unsigned | 0..127                            | int8        | `i`
-    number_unsigned | 128..255                          | uint8       | `U`
-    number_unsigned | 256..32767                        | int16       | `I`
-    number_unsigned | 32768..2147483647                 | int32       | `l`
-    number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
-    number_unsigned | 2147483649..18446744073709551615  | high-precision | `H`
-    number_float    | *any value*                       | float64     | `D`
-    string          | *with shortest length indicator*  | string      | `S`
-    array           | *see notes on optimized format*   | array       | `[`
-    object          | *see notes on optimized format*   | map         | `{`
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a UBJSON value.
-
-    @note The following values can **not** be converted to a UBJSON value:
-          - strings with more than 9223372036854775807 bytes (theoretical)
-
-    @note The following markers are not used in the conversion:
-          - `Z`: no-op values are not created.
-          - `C`: single-byte strings are serialized with `S` markers.
-
-    @note Any UBJSON output created @ref to_ubjson can be successfully parsed
-          by @ref from_ubjson.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @note The optimized formats for containers are supported: Parameter
-          @a use_size adds size information to the beginning of a container and
-          removes the closing marker. Parameter @a use_type further checks
-          whether all elements of a container have the same type and adds the
-          type marker to the beginning of the container. The @a use_type
-          parameter must only be used together with @a use_size = true. Note
-          that @a use_size = true alone may result in larger representations -
-          the benefit of this parameter is that the receiving side is
-          immediately informed on the number of elements of the container.
-
-    @note If the JSON data contains the binary type, the value stored is a list
-          of integers, as suggested by the UBJSON documentation.  In particular,
-          this means that serialization and the deserialization of a JSON
-          containing binary values into UBJSON and back will result in a
-          different JSON object.
-
-    @param[in] j  JSON value to serialize
-    @param[in] use_size  whether to add size annotations to container types
-    @param[in] use_type  whether to add type annotations to container types
-                         (must be combined with @a use_size = true)
-    @return UBJSON serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in UBJSON format.,to_ubjson}
-
-    @sa http://ubjson.org
-    @sa see @ref from_ubjson(InputType&&, const bool, const bool) for the
-        analogous deserialization
-    @sa see @ref to_cbor(const basic_json& for the related CBOR format
-    @sa see @ref to_msgpack(const basic_json&) for the related MessagePack format
-
-    @since version 3.1.0
-    */
-    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
-            const bool use_size = false,
-            const bool use_type = false)
-    {
-        std::vector<std::uint8_t> result;
-        to_ubjson(j, result, use_size, use_type);
-        return result;
-    }
-
-    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
-    }
-
-    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
-    }
-
-
-    /*!
-    @brief Serializes the given JSON object `j` to BSON and returns a vector
-           containing the corresponding BSON-representation.
-
-    BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are
-    stored as a single entity (a so-called document).
-
-    The library uses the following mapping from JSON values types to BSON types:
-
-    JSON value type | value/range                       | BSON type   | marker
-    --------------- | --------------------------------- | ----------- | ------
-    null            | `null`                            | null        | 0x0A
-    boolean         | `true`, `false`                   | boolean     | 0x08
-    number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
-    number_integer  | -2147483648..2147483647           | int32       | 0x10
-    number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
-    number_unsigned | 0..2147483647                     | int32       | 0x10
-    number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
-    number_unsigned | 9223372036854775808..18446744073709551615| --   | --
-    number_float    | *any value*                       | double      | 0x01
-    string          | *any value*                       | string      | 0x02
-    array           | *any value*                       | document    | 0x04
-    object          | *any value*                       | document    | 0x03
-    binary          | *any value*                       | binary      | 0x05
-
-    @warning The mapping is **incomplete**, since only JSON-objects (and things
-    contained therein) can be serialized to BSON.
-    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
-    and the keys may not contain U+0000, since they are serialized a
-    zero-terminated c-strings.
-
-    @throw out_of_range.407  if `j.is_number_unsigned() && j.get<std::uint64_t>() > 9223372036854775807`
-    @throw out_of_range.409  if a key in `j` contains a NULL (U+0000)
-    @throw type_error.317    if `!j.is_object()`
-
-    @pre The input `j` is required to be an object: `j.is_object() == true`.
-
-    @note Any BSON output created via @ref to_bson can be successfully parsed
-          by @ref from_bson.
-
-    @param[in] j  JSON value to serialize
-    @return BSON serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in BSON format.,to_bson}
-
-    @sa http://bsonspec.org/spec.html
-    @sa see @ref from_bson(detail::input_adapter&&, const bool strict) for the
-        analogous deserialization
-    @sa see @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-    @sa see @ref to_cbor(const basic_json&) for the related CBOR format
-    @sa see @ref to_msgpack(const basic_json&) for the related MessagePack format
-    */
-    static std::vector<std::uint8_t> to_bson(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_bson(j, result);
-        return result;
-    }
-
-    /*!
-    @brief Serializes the given JSON object `j` to BSON and forwards the
-           corresponding BSON-representation to the given output_adapter `o`.
-    @param j The JSON object to convert to BSON.
-    @param o The output adapter that receives the binary BSON representation.
-    @pre The input `j` shall be an object: `j.is_object() == true`
-    @sa see @ref to_bson(const basic_json&)
-    */
-    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_bson(j);
-    }
-
-    /*!
-    @copydoc to_bson(const basic_json&, detail::output_adapter<std::uint8_t>)
-    */
-    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_bson(j);
-    }
-
-
-    /*!
-    @brief create a JSON value from an input in CBOR format
-
-    Deserializes a given input @a i to a JSON value using the CBOR (Concise
-    Binary Object Representation) serialization format.
-
-    The library maps CBOR types to JSON value types as follows:
-
-    CBOR type              | JSON value type | first byte
-    ---------------------- | --------------- | ----------
-    Integer                | number_unsigned | 0x00..0x17
-    Unsigned integer       | number_unsigned | 0x18
-    Unsigned integer       | number_unsigned | 0x19
-    Unsigned integer       | number_unsigned | 0x1A
-    Unsigned integer       | number_unsigned | 0x1B
-    Negative integer       | number_integer  | 0x20..0x37
-    Negative integer       | number_integer  | 0x38
-    Negative integer       | number_integer  | 0x39
-    Negative integer       | number_integer  | 0x3A
-    Negative integer       | number_integer  | 0x3B
-    Byte string            | binary          | 0x40..0x57
-    Byte string            | binary          | 0x58
-    Byte string            | binary          | 0x59
-    Byte string            | binary          | 0x5A
-    Byte string            | binary          | 0x5B
-    UTF-8 string           | string          | 0x60..0x77
-    UTF-8 string           | string          | 0x78
-    UTF-8 string           | string          | 0x79
-    UTF-8 string           | string          | 0x7A
-    UTF-8 string           | string          | 0x7B
-    UTF-8 string           | string          | 0x7F
-    array                  | array           | 0x80..0x97
-    array                  | array           | 0x98
-    array                  | array           | 0x99
-    array                  | array           | 0x9A
-    array                  | array           | 0x9B
-    array                  | array           | 0x9F
-    map                    | object          | 0xA0..0xB7
-    map                    | object          | 0xB8
-    map                    | object          | 0xB9
-    map                    | object          | 0xBA
-    map                    | object          | 0xBB
-    map                    | object          | 0xBF
-    False                  | `false`         | 0xF4
-    True                   | `true`          | 0xF5
-    Null                   | `null`          | 0xF6
-    Half-Precision Float   | number_float    | 0xF9
-    Single-Precision Float | number_float    | 0xFA
-    Double-Precision Float | number_float    | 0xFB
-
-    @warning The mapping is **incomplete** in the sense that not all CBOR
-             types can be converted to a JSON value. The following CBOR types
-             are not supported and will yield parse errors (parse_error.112):
-             - date/time (0xC0..0xC1)
-             - bignum (0xC2..0xC3)
-             - decimal fraction (0xC4)
-             - bigfloat (0xC5)
-             - expected conversions (0xD5..0xD7)
-             - simple values (0xE0..0xF3, 0xF8)
-             - undefined (0xF7)
-
-    @warning CBOR allows map keys of any type, whereas JSON only allows
-             strings as keys in object values. Therefore, CBOR maps with keys
-             other than UTF-8 strings are rejected (parse_error.113).
-
-    @note Any CBOR output created @ref to_cbor can be successfully parsed by
-          @ref from_cbor.
-
-    @param[in] i  an input in CBOR format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] tag_handler how to treat CBOR tags (optional, error by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if unsupported features from CBOR were
-    used in the given input @a v or if the input is not valid CBOR
-    @throw parse_error.113 if a string was expected as map key, but not found
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in CBOR
-    format to a JSON value.,from_cbor}
-
-    @sa http://cbor.io
-    @sa see @ref to_cbor(const basic_json&) for the analogous serialization
-    @sa see @ref from_msgpack(InputType&&, const bool, const bool) for the
-        related MessagePack format
-    @sa see @ref from_ubjson(InputType&&, const bool, const bool) for the
-        related UBJSON format
-
-    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
-           consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0; added @a tag_handler parameter since 3.9.0.
-    */
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_cbor(InputType&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @copydoc from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t)
-    */
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_cbor(IteratorType first, IteratorType last,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
-    static basic_json from_cbor(const T* ptr, std::size_t len,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
-    }
-
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
-    static basic_json from_cbor(detail::span_input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @brief create a JSON value from an input in MessagePack format
-
-    Deserializes a given input @a i to a JSON value using the MessagePack
-    serialization format.
-
-    The library maps MessagePack types to JSON value types as follows:
-
-    MessagePack type | JSON value type | first byte
-    ---------------- | --------------- | ----------
-    positive fixint  | number_unsigned | 0x00..0x7F
-    fixmap           | object          | 0x80..0x8F
-    fixarray         | array           | 0x90..0x9F
-    fixstr           | string          | 0xA0..0xBF
-    nil              | `null`          | 0xC0
-    false            | `false`         | 0xC2
-    true             | `true`          | 0xC3
-    float 32         | number_float    | 0xCA
-    float 64         | number_float    | 0xCB
-    uint 8           | number_unsigned | 0xCC
-    uint 16          | number_unsigned | 0xCD
-    uint 32          | number_unsigned | 0xCE
-    uint 64          | number_unsigned | 0xCF
-    int 8            | number_integer  | 0xD0
-    int 16           | number_integer  | 0xD1
-    int 32           | number_integer  | 0xD2
-    int 64           | number_integer  | 0xD3
-    str 8            | string          | 0xD9
-    str 16           | string          | 0xDA
-    str 32           | string          | 0xDB
-    array 16         | array           | 0xDC
-    array 32         | array           | 0xDD
-    map 16           | object          | 0xDE
-    map 32           | object          | 0xDF
-    bin 8            | binary          | 0xC4
-    bin 16           | binary          | 0xC5
-    bin 32           | binary          | 0xC6
-    ext 8            | binary          | 0xC7
-    ext 16           | binary          | 0xC8
-    ext 32           | binary          | 0xC9
-    fixext 1         | binary          | 0xD4
-    fixext 2         | binary          | 0xD5
-    fixext 4         | binary          | 0xD6
-    fixext 8         | binary          | 0xD7
-    fixext 16        | binary          | 0xD8
-    negative fixint  | number_integer  | 0xE0-0xFF
-
-    @note Any MessagePack output created @ref to_msgpack can be successfully
-          parsed by @ref from_msgpack.
-
-    @param[in] i  an input in MessagePack format convertible to an input
-                  adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if unsupported features from MessagePack were
-    used in the given input @a i or if the input is not valid MessagePack
-    @throw parse_error.113 if a string was expected as map key, but not found
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    MessagePack format to a JSON value.,from_msgpack}
-
-    @sa http://msgpack.org
-    @sa see @ref to_msgpack(const basic_json&) for the analogous serialization
-    @sa see @ref from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa see @ref from_ubjson(InputType&&, const bool, const bool) for
-        the related UBJSON format
-    @sa see @ref from_bson(InputType&&, const bool, const bool) for
-        the related BSON format
-
-    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
-           consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0
-    */
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_msgpack(InputType&& i,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @copydoc from_msgpack(InputType&&, const bool, const bool)
-    */
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_msgpack(IteratorType first, IteratorType last,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
-    static basic_json from_msgpack(const T* ptr, std::size_t len,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
-    static basic_json from_msgpack(detail::span_input_adapter&& i,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-
-    /*!
-    @brief create a JSON value from an input in UBJSON format
-
-    Deserializes a given input @a i to a JSON value using the UBJSON (Universal
-    Binary JSON) serialization format.
-
-    The library maps UBJSON types to JSON value types as follows:
-
-    UBJSON type | JSON value type                         | marker
-    ----------- | --------------------------------------- | ------
-    no-op       | *no value, next value is read*          | `N`
-    null        | `null`                                  | `Z`
-    false       | `false`                                 | `F`
-    true        | `true`                                  | `T`
-    float32     | number_float                            | `d`
-    float64     | number_float                            | `D`
-    uint8       | number_unsigned                         | `U`
-    int8        | number_integer                          | `i`
-    int16       | number_integer                          | `I`
-    int32       | number_integer                          | `l`
-    int64       | number_integer                          | `L`
-    high-precision number | number_integer, number_unsigned, or number_float - depends on number string | 'H'
-    string      | string                                  | `S`
-    char        | string                                  | `C`
-    array       | array (optimized values are supported)  | `[`
-    object      | object (optimized values are supported) | `{`
-
-    @note The mapping is **complete** in the sense that any UBJSON value can
-          be converted to a JSON value.
-
-    @param[in] i  an input in UBJSON format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if a parse error occurs
-    @throw parse_error.113 if a string could not be parsed successfully
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    UBJSON format to a JSON value.,from_ubjson}
-
-    @sa http://ubjson.org
-    @sa see @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             analogous serialization
-    @sa see @ref from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa see @ref from_msgpack(InputType&&, const bool, const bool) for
-        the related MessagePack format
-    @sa see @ref from_bson(InputType&&, const bool, const bool) for
-        the related BSON format
-
-    @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
-    */
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_ubjson(InputType&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @copydoc from_ubjson(InputType&&, const bool, const bool)
-    */
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_ubjson(IteratorType first, IteratorType last,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
-    static basic_json from_ubjson(const T* ptr, std::size_t len,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
-    static basic_json from_ubjson(detail::span_input_adapter&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-
-    /*!
-    @brief Create a JSON value from an input in BSON format
-
-    Deserializes a given input @a i to a JSON value using the BSON (Binary JSON)
-    serialization format.
-
-    The library maps BSON record types to JSON value types as follows:
-
-    BSON type       | BSON marker byte | JSON value type
-    --------------- | ---------------- | ---------------------------
-    double          | 0x01             | number_float
-    string          | 0x02             | string
-    document        | 0x03             | object
-    array           | 0x04             | array
-    binary          | 0x05             | binary
-    undefined       | 0x06             | still unsupported
-    ObjectId        | 0x07             | still unsupported
-    boolean         | 0x08             | boolean
-    UTC Date-Time   | 0x09             | still unsupported
-    null            | 0x0A             | null
-    Regular Expr.   | 0x0B             | still unsupported
-    DB Pointer      | 0x0C             | still unsupported
-    JavaScript Code | 0x0D             | still unsupported
-    Symbol          | 0x0E             | still unsupported
-    JavaScript Code | 0x0F             | still unsupported
-    int32           | 0x10             | number_integer
-    Timestamp       | 0x11             | still unsupported
-    128-bit decimal float | 0x13       | still unsupported
-    Max Key         | 0x7F             | still unsupported
-    Min Key         | 0xFF             | still unsupported
-
-    @warning The mapping is **incomplete**. The unsupported mappings
-             are indicated in the table above.
-
-    @param[in] i  an input in BSON format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.114 if an unsupported BSON record type is encountered
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    BSON format to a JSON value.,from_bson}
-
-    @sa http://bsonspec.org/spec.html
-    @sa see @ref to_bson(const basic_json&) for the analogous serialization
-    @sa see @ref from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa see @ref from_msgpack(InputType&&, const bool, const bool) for
-        the related MessagePack format
-    @sa see @ref from_ubjson(InputType&&, const bool, const bool) for the
-        related UBJSON format
-    */
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bson(InputType&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @copydoc from_bson(InputType&&, const bool, const bool)
-    */
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bson(IteratorType first, IteratorType last,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
-    static basic_json from_bson(const T* ptr, std::size_t len,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        return from_bson(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
-    static basic_json from_bson(detail::span_input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-    /// @}
-
-    //////////////////////////
-    // JSON Pointer support //
-    //////////////////////////
-
-    /// @name JSON Pointer functions
-    /// @{
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. Similar to @ref operator[](const typename
-    object_t::key_type&), `null` values are created in arrays and objects if
-    necessary.
-
-    In particular:
-    - If the JSON pointer points to an object key that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned.
-    - If the JSON pointer points to an array index that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned. All indices between the current maximum and the given
-      index are also filled with `null`.
-    - The special value `-` is treated as a synonym for the index past the
-      end.
-
-    @param[in] ptr  a JSON pointer
-
-    @return reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
-
-    @since version 2.0.0
-    */
-    reference operator[](const json_pointer& ptr)
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. The function does not change the JSON
-    value; no `null` values are created. In particular, the special value
-    `-` yields an exception.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return const reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
-
-    @since version 2.0.0
-    */
-    const_reference operator[](const json_pointer& ptr) const
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a reference to the element at with specified JSON pointer @a ptr,
-    with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
-    begins with '0'. See example below.
-
-    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
-    is not a number. See example below.
-
-    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
-    is out of range. See example below.
-
-    @throw out_of_range.402 if the array index '-' is used in the passed JSON
-    pointer @a ptr. As `at` provides checked access (and no elements are
-    implicitly inserted), the index '-' is always invalid. See example below.
-
-    @throw out_of_range.403 if the JSON pointer describes a key of an object
-    which cannot be found. See example below.
-
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
-    See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 2.0.0
-
-    @liveexample{The behavior is shown in the example.,at_json_pointer}
-    */
-    reference at(const json_pointer& ptr)
-    {
-        return ptr.get_checked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a const reference to the element at with specified JSON pointer @a
-    ptr, with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
-    begins with '0'. See example below.
-
-    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
-    is not a number. See example below.
-
-    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
-    is out of range. See example below.
-
-    @throw out_of_range.402 if the array index '-' is used in the passed JSON
-    pointer @a ptr. As `at` provides checked access (and no elements are
-    implicitly inserted), the index '-' is always invalid. See example below.
-
-    @throw out_of_range.403 if the JSON pointer describes a key of an object
-    which cannot be found. See example below.
-
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
-    See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 2.0.0
-
-    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
-    */
-    const_reference at(const json_pointer& ptr) const
-    {
-        return ptr.get_checked(this);
-    }
-
-    /*!
-    @brief return flattened JSON value
-
-    The function creates a JSON object whose keys are JSON pointers (see [RFC
-    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
-    primitive. The original JSON value can be restored using the @ref
-    unflatten() function.
-
-    @return an object that maps JSON pointers to primitive values
-
-    @note Empty objects and arrays are flattened to `null` and will not be
-          reconstructed correctly by the @ref unflatten() function.
-
-    @complexity Linear in the size the JSON value.
-
-    @liveexample{The following code shows how a JSON object is flattened to an
-    object whose keys consist of JSON pointers.,flatten}
-
-    @sa see @ref unflatten() for the reverse function
-
-    @since version 2.0.0
-    */
-    basic_json flatten() const
-    {
-        basic_json result(value_t::object);
-        json_pointer::flatten("", *this, result);
-        return result;
-    }
-
-    /*!
-    @brief unflatten a previously flattened JSON value
-
-    The function restores the arbitrary nesting of a JSON value that has been
-    flattened before using the @ref flatten() function. The JSON value must
-    meet certain constraints:
-    1. The value must be an object.
-    2. The keys must be JSON pointers (see
-       [RFC 6901](https://tools.ietf.org/html/rfc6901))
-    3. The mapped values must be primitive JSON types.
-
-    @return the original JSON from a flattened version
-
-    @note Empty objects and arrays are flattened by @ref flatten() to `null`
-          values and can not unflattened to their original type. Apart from
-          this example, for a JSON value `j`, the following is always true:
-          `j == j.flatten().unflatten()`.
-
-    @complexity Linear in the size the JSON value.
-
-    @throw type_error.314  if value is not an object
-    @throw type_error.315  if object values are not primitive
-
-    @liveexample{The following code shows how a flattened JSON object is
-    unflattened into the original nested JSON object.,unflatten}
-
-    @sa see @ref flatten() for the reverse function
-
-    @since version 2.0.0
-    */
-    basic_json unflatten() const
-    {
-        return json_pointer::unflatten(*this);
-    }
-
-    /// @}
-
-    //////////////////////////
-    // JSON Patch functions //
-    //////////////////////////
-
-    /// @name JSON Patch functions
-    /// @{
-
-    /*!
-    @brief applies a JSON patch
-
-    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
-    expressing a sequence of operations to apply to a JSON) document. With
-    this function, a JSON Patch is applied to the current JSON value by
-    executing all operations from the patch.
-
-    @param[in] json_patch  JSON patch document
-    @return patched document
-
-    @note The application of a patch is atomic: Either all operations succeed
-          and the patched document is returned or an exception is thrown. In
-          any case, the original value is not changed: the patch is applied
-          to a copy of the value.
-
-    @throw parse_error.104 if the JSON patch does not consist of an array of
-    objects
-
-    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
-    attributes are missing); example: `"operation add must have member path"`
-
-    @throw out_of_range.401 if an array index is out of range.
-
-    @throw out_of_range.403 if a JSON pointer inside the patch could not be
-    resolved successfully in the current JSON value; example: `"key baz not
-    found"`
-
-    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
-    "move")
-
-    @throw other_error.501 if "test" operation was unsuccessful
-
-    @complexity Linear in the size of the JSON value and the length of the
-    JSON patch. As usually only a fraction of the JSON value is affected by
-    the patch, the complexity can usually be neglected.
-
-    @liveexample{The following code shows how a JSON patch is applied to a
-    value.,patch}
-
-    @sa see @ref diff -- create a JSON patch by comparing two JSON values
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
-
-    @since version 2.0.0
-    */
-    basic_json patch(const basic_json& json_patch) const
-    {
-        // make a working copy to apply the patch to
-        basic_json result = *this;
-
-        // the valid JSON Patch operations
-        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
-
-        const auto get_op = [](const std::string & op)
-        {
-            if (op == "add")
-            {
-                return patch_operations::add;
-            }
-            if (op == "remove")
-            {
-                return patch_operations::remove;
-            }
-            if (op == "replace")
-            {
-                return patch_operations::replace;
-            }
-            if (op == "move")
-            {
-                return patch_operations::move;
-            }
-            if (op == "copy")
-            {
-                return patch_operations::copy;
-            }
-            if (op == "test")
-            {
-                return patch_operations::test;
-            }
-
-            return patch_operations::invalid;
-        };
-
-        // wrapper for "add" operation; add value at ptr
-        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
-        {
-            // adding to the root of the target document means replacing it
-            if (ptr.empty())
-            {
-                result = val;
-                return;
-            }
-
-            // make sure the top element of the pointer exists
-            json_pointer top_pointer = ptr.top();
-            if (top_pointer != ptr)
-            {
-                result.at(top_pointer);
-            }
-
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.back();
-            ptr.pop_back();
-            basic_json& parent = result[ptr];
-
-            switch (parent.m_type)
-            {
-                case value_t::null:
-                case value_t::object:
-                {
-                    // use operator[] to add value
-                    parent[last_path] = val;
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    if (last_path == "-")
-                    {
-                        // special case: append to back
-                        parent.push_back(val);
-                    }
-                    else
-                    {
-                        const auto idx = json_pointer::array_index(last_path);
-                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
-                        {
-                            // avoid undefined behavior
-                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", parent));
-                        }
-
-                        // default case: insert add offset
-                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
-                    }
-                    break;
-                }
-
-                // if there exists a parent it cannot be primitive
-                case value_t::string: // LCOV_EXCL_LINE
-                case value_t::boolean: // LCOV_EXCL_LINE
-                case value_t::number_integer: // LCOV_EXCL_LINE
-                case value_t::number_unsigned: // LCOV_EXCL_LINE
-                case value_t::number_float: // LCOV_EXCL_LINE
-                case value_t::binary: // LCOV_EXCL_LINE
-                case value_t::discarded: // LCOV_EXCL_LINE
-                default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            }
-        };
-
-        // wrapper for "remove" operation; remove value at ptr
-        const auto operation_remove = [this, &result](json_pointer & ptr)
-        {
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.back();
-            ptr.pop_back();
-            basic_json& parent = result.at(ptr);
-
-            // remove child
-            if (parent.is_object())
-            {
-                // perform range check
-                auto it = parent.find(last_path);
-                if (JSON_HEDLEY_LIKELY(it != parent.end()))
-                {
-                    parent.erase(it);
-                }
-                else
-                {
-                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found", *this));
-                }
-            }
-            else if (parent.is_array())
-            {
-                // note erase performs range check
-                parent.erase(json_pointer::array_index(last_path));
-            }
-        };
-
-        // type check: top level value must be an array
-        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
-        {
-            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", json_patch));
-        }
-
-        // iterate and apply the operations
-        for (const auto& val : json_patch)
-        {
-            // wrapper to get a value for an operation
-            const auto get_value = [&val](const std::string & op,
-                                          const std::string & member,
-                                          bool string_type) -> basic_json &
-            {
-                // find value
-                auto it = val.m_value.object->find(member);
-
-                // context-sensitive error message
-                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
-
-                // check if desired value is present
-                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
-                {
-                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'", val));
-                }
-
-                // check if result is of type string
-                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
-                {
-                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'", val));
-                }
-
-                // no error: return value
-                return it->second;
-            };
-
-            // type check: every element of the array must be an object
-            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
-            {
-                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", val));
-            }
-
-            // collect mandatory members
-            const auto op = get_value("op", "op", true).template get<std::string>();
-            const auto path = get_value(op, "path", true).template get<std::string>();
-            json_pointer ptr(path);
-
-            switch (get_op(op))
-            {
-                case patch_operations::add:
-                {
-                    operation_add(ptr, get_value("add", "value", false));
-                    break;
-                }
-
-                case patch_operations::remove:
-                {
-                    operation_remove(ptr);
-                    break;
-                }
-
-                case patch_operations::replace:
-                {
-                    // the "path" location must exist - use at()
-                    result.at(ptr) = get_value("replace", "value", false);
-                    break;
-                }
-
-                case patch_operations::move:
-                {
-                    const auto from_path = get_value("move", "from", true).template get<std::string>();
-                    json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The move operation is functionally identical to a
-                    // "remove" operation on the "from" location, followed
-                    // immediately by an "add" operation at the target
-                    // location with the value that was just removed.
-                    operation_remove(from_ptr);
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::copy:
-                {
-                    const auto from_path = get_value("copy", "from", true).template get<std::string>();
-                    const json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The copy is functionally identical to an "add"
-                    // operation at the target location using the value
-                    // specified in the "from" member.
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::test:
-                {
-                    bool success = false;
-                    JSON_TRY
-                    {
-                        // check if "value" matches the one at "path"
-                        // the "path" location must exist - use at()
-                        success = (result.at(ptr) == get_value("test", "value", false));
-                    }
-                    JSON_INTERNAL_CATCH (out_of_range&)
-                    {
-                        // ignore out of range errors: success remains false
-                    }
-
-                    // throw an exception if test fails
-                    if (JSON_HEDLEY_UNLIKELY(!success))
-                    {
-                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump(), val));
-                    }
-
-                    break;
-                }
-
-                case patch_operations::invalid:
-                default:
-                {
-                    // op must be "add", "remove", "replace", "move", "copy", or
-                    // "test"
-                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid", val));
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief creates a diff as a JSON patch
-
-    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
-    be changed into the value @a target by calling @ref patch function.
-
-    @invariant For two JSON values @a source and @a target, the following code
-    yields always `true`:
-    @code {.cpp}
-    source.patch(diff(source, target)) == target;
-    @endcode
-
-    @note Currently, only `remove`, `add`, and `replace` operations are
-          generated.
-
-    @param[in] source  JSON value to compare from
-    @param[in] target  JSON value to compare against
-    @param[in] path    helper value to create JSON pointers
-
-    @return a JSON patch to convert the @a source to @a target
-
-    @complexity Linear in the lengths of @a source and @a target.
-
-    @liveexample{The following code shows how a JSON patch is created as a
-    diff for two JSON values.,diff}
-
-    @sa see @ref patch -- apply a JSON patch
-    @sa see @ref merge_patch -- apply a JSON Merge Patch
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-
-    @since version 2.0.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json diff(const basic_json& source, const basic_json& target,
-                           const std::string& path = "")
-    {
-        // the patch
-        basic_json result(value_t::array);
-
-        // if the values are the same, return empty patch
-        if (source == target)
-        {
-            return result;
-        }
-
-        if (source.type() != target.type())
-        {
-            // different types: replace value
-            result.push_back(
-            {
-                {"op", "replace"}, {"path", path}, {"value", target}
-            });
-            return result;
-        }
-
-        switch (source.type())
-        {
-            case value_t::array:
-            {
-                // first pass: traverse common elements
-                std::size_t i = 0;
-                while (i < source.size() && i < target.size())
-                {
-                    // recursive call to compare array values at index i
-                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
-                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                    ++i;
-                }
-
-                // i now reached the end of at least one array
-                // in a second pass, traverse the remaining elements
-
-                // remove my remaining elements
-                const auto end_index = static_cast<difference_type>(result.size());
-                while (i < source.size())
-                {
-                    // add operations in reverse order to avoid invalid
-                    // indices
-                    result.insert(result.begin() + end_index, object(
-                    {
-                        {"op", "remove"},
-                        {"path", path + "/" + std::to_string(i)}
-                    }));
-                    ++i;
-                }
-
-                // add other remaining elements
-                while (i < target.size())
-                {
-                    result.push_back(
-                    {
-                        {"op", "add"},
-                        {"path", path + "/-"},
-                        {"value", target[i]}
-                    });
-                    ++i;
-                }
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // first pass: traverse this object's elements
-                for (auto it = source.cbegin(); it != source.cend(); ++it)
-                {
-                    // escape the key name to be used in a JSON patch
-                    const auto path_key = path + "/" + detail::escape(it.key());
-
-                    if (target.find(it.key()) != target.end())
-                    {
-                        // recursive call to compare object values at key it
-                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
-                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                    }
-                    else
-                    {
-                        // found a key that is not in o -> remove it
-                        result.push_back(object(
-                        {
-                            {"op", "remove"}, {"path", path_key}
-                        }));
-                    }
-                }
-
-                // second pass: traverse other object's elements
-                for (auto it = target.cbegin(); it != target.cend(); ++it)
-                {
-                    if (source.find(it.key()) == source.end())
-                    {
-                        // found a key that is not in this -> add it
-                        const auto path_key = path + "/" + detail::escape(it.key());
-                        result.push_back(
-                        {
-                            {"op", "add"}, {"path", path_key},
-                            {"value", it.value()}
-                        });
-                    }
-                }
-
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // both primitive type: replace value
-                result.push_back(
-                {
-                    {"op", "replace"}, {"path", path}, {"value", target}
-                });
-                break;
-            }
-        }
-
-        return result;
-    }
-
-    /// @}
-
-    ////////////////////////////////
-    // JSON Merge Patch functions //
-    ////////////////////////////////
-
-    /// @name JSON Merge Patch functions
-    /// @{
-
-    /*!
-    @brief applies a JSON Merge Patch
-
-    The merge patch format is primarily intended for use with the HTTP PATCH
-    method as a means of describing a set of modifications to a target
-    resource's content. This function applies a merge patch to the current
-    JSON value.
-
-    The function implements the following algorithm from Section 2 of
-    [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
-
-    ```
-    define MergePatch(Target, Patch):
-      if Patch is an Object:
-        if Target is not an Object:
-          Target = {} // Ignore the contents and set it to an empty Object
-        for each Name/Value pair in Patch:
-          if Value is null:
-            if Name exists in Target:
-              remove the Name/Value pair from Target
-          else:
-            Target[Name] = MergePatch(Target[Name], Value)
-        return Target
-      else:
-        return Patch
-    ```
-
-    Thereby, `Target` is the current object; that is, the patch is applied to
-    the current value.
-
-    @param[in] apply_patch  the patch to apply
-
-    @complexity Linear in the lengths of @a patch.
-
-    @liveexample{The following code shows how a JSON Merge Patch is applied to
-    a JSON document.,merge_patch}
-
-    @sa see @ref patch -- apply a JSON patch
-    @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
-
-    @since version 3.0.0
-    */
-    void merge_patch(const basic_json& apply_patch)
-    {
-        if (apply_patch.is_object())
-        {
-            if (!is_object())
-            {
-                *this = object();
-            }
-            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
-            {
-                if (it.value().is_null())
-                {
-                    erase(it.key());
-                }
-                else
-                {
-                    operator[](it.key()).merge_patch(it.value());
-                }
-            }
-        }
-        else
-        {
-            *this = apply_patch;
-        }
-    }
-
-    /// @}
-};
-
-/*!
-@brief user-defined to_string function for JSON values
-
-This function implements a user-defined to_string  for JSON objects.
-
-@param[in] j  a JSON object
-@return a std::string object
-*/
-
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
-{
-    return j.dump();
-}
-} // namespace nlohmann
-
-///////////////////////
-// nonmember support //
-///////////////////////
-
-// specialization of std::swap, and std::hash
-namespace std
-{
-
-/// hash value for JSON objects
-template<>
-struct hash<nlohmann::json>
-{
-    /*!
-    @brief return a hash value for a JSON object
-
-    @since version 1.0.0
-    */
-    std::size_t operator()(const nlohmann::json& j) const
-    {
-        return nlohmann::detail::hash(j);
-    }
-};
-
-/// specialization for std::less<value_t>
-/// @note: do not remove the space after '<',
-///        see https://github.com/nlohmann/json/pull/679
-template<>
-struct less<::nlohmann::detail::value_t>
-{
-    /*!
-    @brief compare two value_t enum values
-    @since version 3.0.0
-    */
-    bool operator()(nlohmann::detail::value_t lhs,
-                    nlohmann::detail::value_t rhs) const noexcept
-    {
-        return nlohmann::detail::operator<(lhs, rhs);
-    }
-};
-
-// C++20 prohibit function specialization in the std namespace.
-#ifndef JSON_HAS_CPP_20
-
-/*!
-@brief exchanges the values of two JSON objects
-
-@since version 1.0.0
-*/
-template<>
-inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name)
-    is_nothrow_move_constructible<nlohmann::json>::value&&  // NOLINT(misc-redundant-expression)
-    is_nothrow_move_assignable<nlohmann::json>::value
-                              )
-{
-    j1.swap(j2);
-}
-
-#endif
-
-} // namespace std
-
-/*!
-@brief user-defined string literal for JSON values
-
-This operator implements a user-defined string literal for JSON objects. It
-can be used by adding `"_json"` to a string literal and returns a JSON object
-if no parse error occurred.
-
-@param[in] s  a string representation of a JSON object
-@param[in] n  the length of string @a s
-@return a JSON object
-
-@since version 1.0.0
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json operator "" _json(const char* s, std::size_t n)
-{
-    return nlohmann::json::parse(s, s + n);
-}
-
-/*!
-@brief user-defined string literal for JSON pointer
-
-This operator implements a user-defined string literal for JSON Pointers. It
-can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
-object if no parse error occurred.
-
-@param[in] s  a string representation of a JSON Pointer
-@param[in] n  the length of string @a s
-@return a JSON pointer object
-
-@since version 2.0.0
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-{
-    return nlohmann::json::json_pointer(std::string(s, n));
-}
-
-// #include <nlohmann/detail/macro_unscope.hpp>
-
-
-// restore clang diagnostic settings
-#if defined(__clang__)
-    #pragma clang diagnostic pop
-#endif
-
-// clean up
-#undef JSON_ASSERT
-#undef JSON_INTERNAL_CATCH
-#undef JSON_CATCH
-#undef JSON_THROW
-#undef JSON_TRY
-#undef JSON_PRIVATE_UNLESS_TESTED
-#undef JSON_HAS_CPP_11
-#undef JSON_HAS_CPP_14
-#undef JSON_HAS_CPP_17
-#undef JSON_HAS_CPP_20
-#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
-#undef NLOHMANN_BASIC_JSON_TPL
-#undef JSON_EXPLICIT
-
-// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
-
-
-#undef JSON_HEDLEY_ALWAYS_INLINE
-#undef JSON_HEDLEY_ARM_VERSION
-#undef JSON_HEDLEY_ARM_VERSION_CHECK
-#undef JSON_HEDLEY_ARRAY_PARAM
-#undef JSON_HEDLEY_ASSUME
-#undef JSON_HEDLEY_BEGIN_C_DECLS
-#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
-#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
-#undef JSON_HEDLEY_CLANG_HAS_FEATURE
-#undef JSON_HEDLEY_CLANG_HAS_WARNING
-#undef JSON_HEDLEY_COMPCERT_VERSION
-#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
-#undef JSON_HEDLEY_CONCAT
-#undef JSON_HEDLEY_CONCAT3
-#undef JSON_HEDLEY_CONCAT3_EX
-#undef JSON_HEDLEY_CONCAT_EX
-#undef JSON_HEDLEY_CONST
-#undef JSON_HEDLEY_CONSTEXPR
-#undef JSON_HEDLEY_CONST_CAST
-#undef JSON_HEDLEY_CPP_CAST
-#undef JSON_HEDLEY_CRAY_VERSION
-#undef JSON_HEDLEY_CRAY_VERSION_CHECK
-#undef JSON_HEDLEY_C_DECL
-#undef JSON_HEDLEY_DEPRECATED
-#undef JSON_HEDLEY_DEPRECATED_FOR
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#undef JSON_HEDLEY_DIAGNOSTIC_POP
-#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
-#undef JSON_HEDLEY_DMC_VERSION
-#undef JSON_HEDLEY_DMC_VERSION_CHECK
-#undef JSON_HEDLEY_EMPTY_BASES
-#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
-#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
-#undef JSON_HEDLEY_END_C_DECLS
-#undef JSON_HEDLEY_FLAGS
-#undef JSON_HEDLEY_FLAGS_CAST
-#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_BUILTIN
-#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_EXTENSION
-#undef JSON_HEDLEY_GCC_HAS_FEATURE
-#undef JSON_HEDLEY_GCC_HAS_WARNING
-#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
-#undef JSON_HEDLEY_GCC_VERSION
-#undef JSON_HEDLEY_GCC_VERSION_CHECK
-#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
-#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
-#undef JSON_HEDLEY_GNUC_HAS_FEATURE
-#undef JSON_HEDLEY_GNUC_HAS_WARNING
-#undef JSON_HEDLEY_GNUC_VERSION
-#undef JSON_HEDLEY_GNUC_VERSION_CHECK
-#undef JSON_HEDLEY_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_BUILTIN
-#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
-#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_EXTENSION
-#undef JSON_HEDLEY_HAS_FEATURE
-#undef JSON_HEDLEY_HAS_WARNING
-#undef JSON_HEDLEY_IAR_VERSION
-#undef JSON_HEDLEY_IAR_VERSION_CHECK
-#undef JSON_HEDLEY_IBM_VERSION
-#undef JSON_HEDLEY_IBM_VERSION_CHECK
-#undef JSON_HEDLEY_IMPORT
-#undef JSON_HEDLEY_INLINE
-#undef JSON_HEDLEY_INTEL_CL_VERSION
-#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
-#undef JSON_HEDLEY_INTEL_VERSION
-#undef JSON_HEDLEY_INTEL_VERSION_CHECK
-#undef JSON_HEDLEY_IS_CONSTANT
-#undef JSON_HEDLEY_IS_CONSTEXPR_
-#undef JSON_HEDLEY_LIKELY
-#undef JSON_HEDLEY_MALLOC
-#undef JSON_HEDLEY_MCST_LCC_VERSION
-#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
-#undef JSON_HEDLEY_MESSAGE
-#undef JSON_HEDLEY_MSVC_VERSION
-#undef JSON_HEDLEY_MSVC_VERSION_CHECK
-#undef JSON_HEDLEY_NEVER_INLINE
-#undef JSON_HEDLEY_NON_NULL
-#undef JSON_HEDLEY_NO_ESCAPE
-#undef JSON_HEDLEY_NO_RETURN
-#undef JSON_HEDLEY_NO_THROW
-#undef JSON_HEDLEY_NULL
-#undef JSON_HEDLEY_PELLES_VERSION
-#undef JSON_HEDLEY_PELLES_VERSION_CHECK
-#undef JSON_HEDLEY_PGI_VERSION
-#undef JSON_HEDLEY_PGI_VERSION_CHECK
-#undef JSON_HEDLEY_PREDICT
-#undef JSON_HEDLEY_PRINTF_FORMAT
-#undef JSON_HEDLEY_PRIVATE
-#undef JSON_HEDLEY_PUBLIC
-#undef JSON_HEDLEY_PURE
-#undef JSON_HEDLEY_REINTERPRET_CAST
-#undef JSON_HEDLEY_REQUIRE
-#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
-#undef JSON_HEDLEY_REQUIRE_MSG
-#undef JSON_HEDLEY_RESTRICT
-#undef JSON_HEDLEY_RETURNS_NON_NULL
-#undef JSON_HEDLEY_SENTINEL
-#undef JSON_HEDLEY_STATIC_ASSERT
-#undef JSON_HEDLEY_STATIC_CAST
-#undef JSON_HEDLEY_STRINGIFY
-#undef JSON_HEDLEY_STRINGIFY_EX
-#undef JSON_HEDLEY_SUNPRO_VERSION
-#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
-#undef JSON_HEDLEY_TINYC_VERSION
-#undef JSON_HEDLEY_TINYC_VERSION_CHECK
-#undef JSON_HEDLEY_TI_ARMCL_VERSION
-#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL2000_VERSION
-#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL430_VERSION
-#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL6X_VERSION
-#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL7X_VERSION
-#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CLPRU_VERSION
-#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
-#undef JSON_HEDLEY_TI_VERSION
-#undef JSON_HEDLEY_TI_VERSION_CHECK
-#undef JSON_HEDLEY_UNAVAILABLE
-#undef JSON_HEDLEY_UNLIKELY
-#undef JSON_HEDLEY_UNPREDICTABLE
-#undef JSON_HEDLEY_UNREACHABLE
-#undef JSON_HEDLEY_UNREACHABLE_RETURN
-#undef JSON_HEDLEY_VERSION
-#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
-#undef JSON_HEDLEY_VERSION_DECODE_MINOR
-#undef JSON_HEDLEY_VERSION_DECODE_REVISION
-#undef JSON_HEDLEY_VERSION_ENCODE
-#undef JSON_HEDLEY_WARNING
-#undef JSON_HEDLEY_WARN_UNUSED_RESULT
-#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
-#undef JSON_HEDLEY_FALL_THROUGH
-
-
-
-#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/ext/opentelemetry-cpp-1.21.0/.bazelignore b/ext/opentelemetry-cpp-1.21.0/.bazelignore
deleted file mode 100644
index 56306fc4b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.bazelignore
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party
-tools
-out
diff --git a/ext/opentelemetry-cpp-1.21.0/.bazelrc b/ext/opentelemetry-cpp-1.21.0/.bazelrc
deleted file mode 100644
index 57cd0a2fa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.bazelrc
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# bazel configurations for running tests under sanitizers.
-# Based on https://github.com/bazelment/trunk/blob/master/tools/bazel.rc
-
-# Enable automatic configs based on platform
-common --enable_platform_specific_config
-
-# Make globs that don't match anything fail
-common --incompatible_disallow_empty_glob
-
-# Needed by gRPC to build on some platforms.
-build --copt -DGRPC_BAZEL_BUILD
-
-# Workaround abseil libraries missing symbols
-build:windows --dynamic_mode=off
-
-# Set minimum supported C++ version
-build:macos --host_cxxopt=-std=c++14 --cxxopt=-std=c++14
-build:linux --host_cxxopt=-std=c++14 --cxxopt=-std=c++14
-build:windows --host_cxxopt=/std:c++14 --cxxopt=/std:c++14
-
-# --config=asan : Address Sanitizer.
-common:asan --copt -DADDRESS_SANITIZER
-common:asan --copt -fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,null,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound
-common:asan --copt -fsanitize-address-use-after-scope
-common:asan --copt -fno-sanitize-recover=all
-common:asan --linkopt -fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,null,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound
-common:asan --linkopt -fsanitize-address-use-after-scope
-common:asan --linkopt -fno-sanitize-recover=all
-common:asan --cc_output_directory_tag=asan
-
-# --config=tsan : Thread Sanitizer.
-common:tsan --copt -fsanitize=thread
-common:tsan --copt -DTHREAD_SANITIZER
-common:tsan --linkopt -fsanitize=thread
-common:tsan --cc_output_directory_tag=tsan
-# This is needed to address false positive problem with abseil.The same setting as gRPC
-# https://github.com/google/sanitizers/issues/953
-common:tsan --test_env=TSAN_OPTIONS=report_atomic_races=0
diff --git a/ext/opentelemetry-cpp-1.21.0/.bazelversion b/ext/opentelemetry-cpp-1.21.0/.bazelversion
deleted file mode 100644
index 21c8c7b46..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.bazelversion
+++ /dev/null
@@ -1 +0,0 @@
-7.1.1
diff --git a/ext/opentelemetry-cpp-1.21.0/.clang-format b/ext/opentelemetry-cpp-1.21.0/.clang-format
deleted file mode 100644
index 1b5d0d488..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.clang-format
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# See Clang docs: http://clang.llvm.org/docs/ClangFormatStyleOptions.html
-BasedOnStyle: Chromium
-
-# Allow double brackets such as std::vector<std::vector<int>>.
-Standard: Cpp11
-
-# Indent 2 spaces at a time.
-IndentWidth: 2
-
-# Keep lines under 100 columns long.
-ColumnLimit: 100
-
-# Always break before braces
-BreakBeforeBraces: Custom
-BraceWrapping:
-#  TODO(lujc) wait for clang-format-9 support in Chromium tools
-#  AfterCaseLabel: true
-  AfterClass: true
-  AfterControlStatement: true
-  AfterEnum: true
-  AfterFunction: true
-  AfterNamespace: true
-  AfterStruct: true
-  AfterUnion: true
-  BeforeCatch: true
-  BeforeElse: true
-  IndentBraces: false
-  SplitEmptyFunction: false
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: false
-
-  # Keeps extern "C" blocks unindented.
-  AfterExternBlock: false
-
-# Indent case labels.
-IndentCaseLabels: true
-
-# Right-align pointers and references
-PointerAlignment: Right
-
-# ANGLE likes to align things as much as possible.
-AlignOperands: true
-AlignConsecutiveAssignments: true
-
-# Use 2 space negative offset for access modifiers
-AccessModifierOffset: -2
-
-# TODO(jmadill): Decide if we want this on. Doesn't have an "all or none" mode.
-AllowShortCaseLabelsOnASingleLine: false
-
-# Useful for spacing out functions in classes
-KeepEmptyLinesAtTheStartOfBlocks: true
-
-# Indent nested PP directives.
-IndentPPDirectives: AfterHash
-
-# Include blocks style
-IncludeBlocks: Preserve
-
-AttributeMacros:
-  - OPENTELEMETRY_UNLIKELY
-  - OPENTELEMETRY_LIKELY
-  - OPENTELEMETRY_MAYBE_UNUSED
-  - OPENTELEMETRY_DEPRECATED
-  - OPENTELEMETRY_API_SINGLETON
-  - OPENTELEMETRY_LOCAL_SYMBOL
-  - OPENTELEMETRY_EXPORT
-  - OPENTELEMETRY_SANITIZER_NO_MEMORY
-  - OPENTELEMETRY_SANITIZER_NO_THREAD
-  - OPENTELEMETRY_SANITIZER_NO_ADDRESS
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/.clang-tidy b/ext/opentelemetry-cpp-1.21.0/.clang-tidy
deleted file mode 100644
index db61b810c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.clang-tidy
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-Checks: >
-  -*,
-  performance-*,
-  portability-*,
-  abseil-*,
-  -abseil-string-find-str-contains,
-  bugprone-*,
-  -bugprone-easily-swappable-parameters,
-  -bugprone-implicit-widening-of-multiplication-result,
-  -bugprone-inc-dec-in-conditions,
-  -bugprone-narrowing-conversions,
-  -bugprone-unchecked-optional-access,
-  -bugprone-unhandled-exception-at-new,
-  -bugprone-unused-local-non-trivial-variable,
-  google-*,
-  -google-build-using-namespace,
-  -google-default-arguments,
-  -google-explicit-constructor,
-  -google-readability-avoid-underscore-in-googletest-name,
-  -google-readability-braces-around-statements,
-  -google-readability-namespace-comments,
-  -google-readability-todo,
-  -google-runtime-references,
-  misc-*,
-  -misc-const-correctness,
-  -misc-include-cleaner,
-  -misc-non-private-member-variables-in-classes,
-  -misc-unused-alias-decls,
-  -misc-use-anonymous-namespace,
-  cppcoreguidelines-*,
-  -cppcoreguidelines-owning-memory,
-  -cppcoreguidelines-avoid-do-while,
-  -cppcoreguidelines-avoid-c-arrays,
-  -cppcoreguidelines-avoid-magic-numbers,
-  -cppcoreguidelines-init-variables,
-  -cppcoreguidelines-macro-usage,
-  -cppcoreguidelines-non-private-member-variables-in-classes,
-  -cppcoreguidelines-avoid-non-const-global-variables,
-  -cppcoreguidelines-pro-*
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/.cmake-format.py b/ext/opentelemetry-cpp-1.21.0/.cmake-format.py
deleted file mode 100644
index d232ac8eb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.cmake-format.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# If comment markup is enabled, don't reflow the first comment block in
-# eachlistfile. Use this to preserve formatting of your
-# copyright/licensestatements.
-first_comment_is_literal = True
diff --git a/ext/opentelemetry-cpp-1.21.0/.copyright-ignore b/ext/opentelemetry-cpp-1.21.0/.copyright-ignore
deleted file mode 100644
index 81c51bcd5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.copyright-ignore
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Ignore the following directories
-
-./.git/*
-./.github/*
-./third_party/benchmark/*
-./third_party/boost/*
-./third_party/googletest/*
-./third_party/ms-gsl/*
-./third_party/nlohmann-json/*
-./third_party/opentelemetry-proto/*
-./third_party/prometheus-cpp/*
-./tools/vcpkg/*
-./tools/ports/*
-
-# Third party code
-
-./api/include/opentelemetry/nostd/internal/absl/*
-./exporters/jaeger/thrift-gen/*
-./exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h
-
-# Doc
-
-./docs/*
-
-## Ignore the following files patterns
-
-*.md
-*.rst
-*.png
-*.log
-*.patch
-*.json
-*.nuspec
-*.pem
-
-# Packaging
-*/CONTROL
-
-# LICENSE files
-*/LICENSE
-
-# Ignore the following misc files
-
-./.bazelignore
-./.bazelversion
-./docker/.gitignore
-.markdownlintignore
-./ci/toc.yml
-./ci/valgrind-suppressions
diff --git a/ext/opentelemetry-cpp-1.21.0/.devcontainer/Dockerfile.conan b/ext/opentelemetry-cpp-1.21.0/.devcontainer/Dockerfile.conan
deleted file mode 100644
index 05f6ae27f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.devcontainer/Dockerfile.conan
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02
-
-RUN apt update && apt install -y \
-	build-essential \
-	ca-certificates \
-	wget \
-	cmake \
-	git \
-	sudo \
-	nano \
-	pkg-config \
-	ninja-build \
-	clang-format \
-	clang-tidy \
-	autoconf \
-	automake \
-	libtool \
-	python3-pip
-
-RUN pip install "conan==2.15.1" --break-system-packages
-
-ARG USER_UID=1000
-ARG USER_GID=1000
-ARG USER_NAME=devuser
-ENV USER_NAME=devuser
-ENV USER_UID=${USER_UID}
-ENV USER_GID=${USER_GID}
-ENV INSTALL_PACKAGES=
-ENV IS_CONTAINER_BUILD=true
-
-COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
-RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
-USER devuser
-
-RUN conan profile detect --force	
-
-ARG CONAN_FILE=conanfile_stable.txt
-ARG CONAN_BUILD_TYPE=Debug
-ARG CXX_STANDARD=17
-WORKDIR /home/devuser/conan
-COPY ./install/conan/ .
-
-RUN conan install ./${CONAN_FILE} --build=missing -s build_type=${CONAN_BUILD_TYPE}
-ENV CMAKE_TOOLCHAIN_FILE=/home/devuser/conan/build/${CONAN_BUILD_TYPE}/generators/conan_toolchain.cmake
-ENV CXX_STANDARD=${CXX_STANDARD}
-ENV BUILD_TYPE=${CONAN_BUILD_TYPE}
-ENV CONAN_FILE=${CONAN_FILE}
-
-WORKDIR  /workspaces/opentelemetry-cpp
-
-ENTRYPOINT []
-
-CMD ["/bin/bash"]
diff --git a/ext/opentelemetry-cpp-1.21.0/.devcontainer/Dockerfile.dev b/ext/opentelemetry-cpp-1.21.0/.devcontainer/Dockerfile.dev
deleted file mode 100644
index c0eea6d32..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.devcontainer/Dockerfile.dev
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-FROM otel/cpp_format_tools
-
-ARG USER_UID=1000
-ARG USER_GID=1000
-ARG INSTALL_PACKAGES=
-
-ARG CXX_STANDARD=17
-ARG CMAKE_VERSION=3.31.6
-ARG ABSEIL_CPP_VERSION=20230125.3
-ARG PROTOBUF_VERSION=23.3
-ARG GRPC_VERSION=v1.55.0
-
-ENV CXX_STANDARD=${CXX_STANDARD}
-ENV CMAKE_VERSION=${CMAKE_VERSION}
-ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
-ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
-ENV GRPC_VERSION=${GRPC_VERSION}
-
-COPY ci /opt/ci
-
-RUN apt update && apt install -y wget \
-	ninja-build \
-	libcurl4-openssl-dev \
-	clang-tidy \
-	shellcheck
-
-RUN cd /opt/ci && bash setup_cmake.sh
-RUN cd /opt/ci && bash setup_ci_environment.sh
-RUN cd /opt && bash ci/setup_googletest.sh \
-    && bash ci/install_abseil.sh \
-    && bash ci/install_protobuf.sh \
-    && bash ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
-
-ADD https://github.com/bazelbuild/bazelisk/releases/download/v1.22.1/bazelisk-linux-amd64 /usr/local/bin
-	
-RUN git config --global core.autocrlf input \
-	&& chmod +x /usr/local/bin/bazelisk-linux-amd64
-
-ENV INSTALL_PACKAGES=${INSTALL_PACKAGES}
-ENV USER_NAME=devuser
-ENV USER_UID=${USER_UID}
-ENV USER_GID=${USER_GID}
-ENV IS_CONTAINER_BUILD=true
-
-COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
-RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
-RUN apt install -y npm && npm install -g markdownlint-cli@0.44.0
-
-USER devuser
-
-WORKDIR  /workspaces/opentelemetry-cpp
-
-ENTRYPOINT []
-
-CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/.devcontainer/README.md b/ext/opentelemetry-cpp-1.21.0/.devcontainer/README.md
deleted file mode 100644
index bea6f8c4d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.devcontainer/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Customizing Your Dev Container
-
-Customize your dev container using build arguments (for direct Docker builds) or
-environment variables (for evaluation in `devcontainer.json`).
-
-* **CMake version:**
-  The version of cmake to install. (Default: 3.31.6)
-  * Docker ARG:
-   `CMAKE_VERSION`
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_CMAKE_VERSION`
-
-* **CXX standard:**
-  This is the C++ standard to build from (eg: 17, 20, ...). (Default: 17)
-  * Docker ARG:
-   `CXX_STANDARD`
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_CXX_STANDARD`
-
-* **abseil-cpp version:**
-  This is the version of abseil-cpp that will be used to build protobuf, gRPC,
-  and opentelemetry-cpp.
-  * Docker ARG:
-   `ABSEIL_CPP_VERSION`
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_ABSEIL_CPP_VERSION`
-
-* **Protobuf version:**
-  * Docker ARG:
-   `PROTOBUF_VERSION`
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION`
-
-* **gRPC version:**
-  * Docker ARG:
-   `GRPC_VERSION`
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_GRPC_VERSION`
-
-* **User ID (UID):**
-  User ID (Default: `1000`)
-  * Docker ARG:
-   `USER_UID`
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_USER_UID`
-
-* **Group ID (GID):**
-  User group ID (Default: `1000`)
-  * Docker ARG:
-   `USER_GID`
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_USER_GID`
-
-* **Install Packages:**
-  These are the additional packages that will be installed via `apt install` in the devcontainer. This is a space separated list.
-  * Docker ARG:
-   `INSTALL_PACKAGES`  (Default: ``)
-  * Host Environment Variable:
-   `OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES` (Default: ``)
-
-## Examples
-
-* `docker build --build-arg CXX_STANDARD="20" --build-arg INSTALL_PACKAGES="nano gitk"...`
-* `export OTEL_CPP_DEVCONTAINER_CXX_STANDARD=20`
-* `export OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES="nano gitk"`
diff --git a/ext/opentelemetry-cpp-1.21.0/.devcontainer/customize_container.sh b/ext/opentelemetry-cpp-1.21.0/.devcontainer/customize_container.sh
deleted file mode 100755
index ba9614e67..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.devcontainer/customize_container.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -eu
-
-if [[ $IS_CONTAINER_BUILD != "true" ]]; then
-     echo "This script should only run inside a Docker container."
-     exit 1
-fi
-
-if [[ -n "$INSTALL_PACKAGES" ]]; then
-    packages=($INSTALL_PACKAGES)
-    for package in "${packages[@]}"; do
-        apt install -y "$package"
-    done
-fi
-
-if [[ $(id "$USER_NAME" 2>/dev/null) ]]; then
-    echo "User '$USER_NAME' already exists. Removing it."
-    userdel -rf "$USER_NAME"
-elif [[ $(id -u "$USER_UID" 2>/dev/null) ]]; then
-    OTHER_USER=$(getent passwd "$USER_UID" | cut -d: -f1)
-    echo "User '$OTHER_USER' exists with UID $USER_UID. Removing it."
-    userdel -rf "$OTHER_USER"
-fi
-
-if [[ ! $(getent group "$USER_GID" 2>/dev/null) ]]; then
-    echo "Group '$USER_GID' does not exist. Adding it."
-    groupadd -g "$USER_GID" "$USER_NAME"
-fi
-
-useradd -m -u "$USER_UID" -g "$USER_GID" -s /bin/bash "$USER_NAME"
-echo "Created user '$USER_NAME' (UID: $USER_UID, GID: $USER_GID)."
-
-echo "$USER_NAME ALL=(ALL) NOPASSWD:ALL" | tee /etc/sudoers.d/"$USER_NAME"
-
-echo "User and group setup complete."
diff --git a/ext/opentelemetry-cpp-1.21.0/.devcontainer/devcontainer.json b/ext/opentelemetry-cpp-1.21.0/.devcontainer/devcontainer.json
deleted file mode 100644
index 808712242..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/javascript-node
-{
-	"name": "opentelemetry-cpp",
-	"build": {
-		"context": "..",
-		"dockerfile": "Dockerfile.dev",
-		"args": {
-			"USER_UID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_UID:1000}",
-			"USER_GID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_GID:1000}",
-			"INSTALL_PACKAGES": "${localEnv:OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES:}",
-			"CMAKE_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_CMAKE_VERSION:3.31.6}",
-			"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}",
-			"GRPC_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_GRPC_VERSION:v1.55.0}",
-			"PROTOBUF_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION:23.3}",
-			"ABSEIL_CPP_VERSION":"${localEnv:OTEL_CPP_DEVCONTAINER_ABSEIL_CPP_VERSION:20230125.3}"
-		}
-	},
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cpptools",
-				"ms-azuretools.vscode-docker",
-				"ms-vscode.cpptools-extension-pack"
-			],
-			"settings": {
-				"terminal.integrated.shell.linux": "/bin/bash",
-			}
-		}
-	},
-
-	"remoteUser": "devuser"
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/.gitattributes b/ext/opentelemetry-cpp-1.21.0/.gitattributes
deleted file mode 100644
index ca2467b47..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.gitattributes
+++ /dev/null
@@ -1,47 +0,0 @@
-##### Source code #####
-
-## C++ and C source files
-*.c                     text eol=lf diff=cpp
-*.h                     text eol=lf diff=cpp
-*.cc                    text eol=lf diff=cpp
-*.cpp                   text eol=lf diff=cpp
-*.cxx                   text eol=lf diff=cpp
-*.hpp                   text eol=lf diff=cpp
-
-## Python scripts
-*.py                    text eol=lf diff=python
-
-## Perl scripts/libraries/modules
-*.perl                  text eol=lf diff=perl
-*.pl                    text eol=lf diff=perl
-*.pm                    text eol=lf diff=perl
-
-## Shell scripts
-*.sh                    text eol=lf
-*.bash                  text eol=lf
-
-## Windows batch and PowerShell scripts
-*.bat                   text eol=crlf
-*.cmd                   text eol=crlf
-*.ps1                   text eol=crlf
-
-##### Other file types #####
-
-## Text files and documentation
-*.txt                   text
-README*                 text
-INSTALL*                text
-LICENSE*                text
-
-## Non-text documentation
-*.html                  text diff=html
-*.pdf                   binary
-*.rtf                   binary
-
-## git files
-.gitignore              text eol=lf
-.gitattributes          text eol=lf
-
-## bazel files
-WORKSPACE               text eol=lf
-BUILD                   text eol=lf
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/.codecov.yaml b/ext/opentelemetry-cpp-1.21.0/.github/.codecov.yaml
deleted file mode 100644
index 1b9921ac4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/.codecov.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-codecov:
-  require_ci_to_pass: false
-  max_report_age: off
-
-coverage:
-  precision: 2
-  round: up
-  range: "80...100"
-  status:
-    project:
-      default:
-        informational: true
-        target: auto
-        threshold: 10%
-    patch: false
-
-parsers:
-  gcov:
-    branch_detection:
-      conditional: yes
-      loop: yes
-      method: no
-      macro: no
-
-comment:
-  layout: "reach,diff,flags,tree"
-  behavior: default
-  require_changes: false
-
-# Relative file path fixing.
-# CI file paths must match Git file paths.
-# This fix removes the "/home/runner/" prefix
-# to coverage report file paths.
-fixes:
-  - "/home/runner/::"
-
-ignore:
-  - "docs/**/*"
-  - "docker/**/*"
-  - "examples/**/*"
-  - "bazel/**/*"
-  - "cmake/**/*"
-  - "buildscripts/**/*"
-  - "third_party/**/*"
-  - "test_common/**/*"
-  - "tools/**/*"
-  - ".vscode/**/*"
-  - ".github/**/*"
-  - "**/test/**/*"
-  - "**.md"
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/CODEOWNERS b/ext/opentelemetry-cpp-1.21.0/.github/CODEOWNERS
deleted file mode 100644
index 7a40cd0b0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/CODEOWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-# Code owners file.
-# This file controls who is tagged for review for any given pull request.
-
-# For ETW exporter
-exporters/etw/*  @reyang @maxgolov @lalitb @ThomsonTan @open-telemetry/cpp-approvers
-
-# For anything not explicitly taken by someone else:
-*       @open-telemetry/cpp-approvers
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/ISSUE_TEMPLATE/bug_report.md b/ext/opentelemetry-cpp-1.21.0/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index e0bb4cca2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Bug Report
-about: Create a report to help us improve
-labels: bug
----
-
-**Describe your environment** Describe any aspect of your environment relevant to the problem, including your platform, build system, version numbers of installed dependencies, etc. If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on main branch.
-
-**Steps to reproduce**
-Describe exactly how to reproduce the error. Include a code sample if applicable.
-
-**What is the expected behavior?**
-What did you expect to see?
-
-**What is the actual behavior?**
-What did you see instead?
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/ISSUE_TEMPLATE/feature_request.md b/ext/opentelemetry-cpp-1.21.0/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 973549ab2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for this project
-labels: feature-request
----
-
-Before opening a feature request against this repo, consider whether the feature should/could be implemented in the [other OpenTelemetry client libraries](https://github.com/open-telemetry/). If so, please [open an issue on opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification/issues/new) first.
-
-**Is your feature request related to a problem?**
-If so, provide a concise description of the problem.
-
-**Describe the solution you'd like**
-What do you want to happen instead? What is the expected behavior?
-
-**Describe alternatives you've considered**
-Which alternative solutions or features have you considered?
-
-**Additional context**
-Add any other context about the feature request here.
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/dependabot.yml b/ext/opentelemetry-cpp-1.21.0/.github/dependabot.yml
deleted file mode 100644
index 5cfb4cb89..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/dependabot.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    labels:
-      - "GHA"
-
-  - package-ecosystem: "devcontainers"
-    directory: "/"
-    schedule:
-     interval: daily
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/pull_request_template.md b/ext/opentelemetry-cpp-1.21.0/.github/pull_request_template.md
deleted file mode 100644
index e54760323..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/pull_request_template.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Fixes # (issue)
-
-## Changes
-
-Please provide a brief description of the changes here.
-
-For significant contributions please make sure you have completed the following items:
-
-* [ ] `CHANGELOG.md` updated for non-trivial changes
-* [ ] Unit tests have been added
-* [ ] Changes in public API reviewed
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/repository-settings.md b/ext/opentelemetry-cpp-1.21.0/.github/repository-settings.md
deleted file mode 100644
index fa86d02cf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/repository-settings.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Process
-
-This file documents local admin changes for opentelemetry-cpp,
-per the community process: https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md
-
-Please note that the EasyCLA check **MUST** stay **REQUIRED**,
-it should never be disabled or bypassed, at the risk of tainting the repository.
-
-# Guidelines
-
-The best is to open a PR first that describes the change,
-so it can be discussed during review (maybe it is not needed,
-maybe there is an alternate solution, ...).
-
-The PR must add a log entry in this file, detailing:
-
-* the date the change is implemented
-* what is changed exactly (which setting)
-* a short rationale
-
-Admin changes are then applied only when the PR is merged.
-
-If for some reason a change is implemented in emergency,
-before a PR can be discussed and merged,
-a PR should still be prepared and pushed after the fact to
-describe the settings changed.
-
-# Log of local changes
-
-## 2023-11-03
-
-Created log file `.github/repository-settings.md`, since admin permissions are now granted to maintainers.
-
-See https://github.com/open-telemetry/community/issues/1727
-
-No setting changed.
-
-
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/benchmark.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/benchmark.yml
deleted file mode 100644
index eaad6b280..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/benchmark.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: OpenTelemetry-cpp benchmarks
-on:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: write
-  deployments: write
-
-jobs:
-  benchmark:
-    name: Run OpenTelemetry-cpp benchmarks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-      - name: Mount Bazel Cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        env:
-          cache-name: bazel_cache
-        with:
-          path: /home/runner/.cache/bazel
-          key: bazel_benchmark
-      - name: setup
-        run: |
-          sudo ./ci/setup_ci_environment.sh
-          sudo ./ci/install_bazelisk.sh
-      - name: Run benchmark
-        id: run_benchmarks
-        run: |
-          ./ci/do_ci.sh bazel.benchmark
-          mkdir -p benchmarks
-          mv api-benchmark_result.json benchmarks
-          mv sdk-benchmark_result.json benchmarks
-          mv exporters-benchmark_result.json benchmarks
-      - uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 # main March 2025
-        with:
-          name: benchmark_results
-          path: benchmarks
-  store_benchmark:
-    needs: benchmark
-    strategy:
-      matrix:
-        components: ["api", "sdk", "exporters"]
-    name: Store benchmark result
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # main March 2025
-        with:
-          name: benchmark_results
-          path: benchmarks
-      - name: Print json files
-        id: print_json
-        run: |
-          cat benchmarks/*
-      - name: Push benchmark result
-        uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
-        with:
-          name: OpenTelemetry-cpp ${{ matrix.components }} Benchmark
-          tool: 'googlecpp'
-          output-file-path: benchmarks/${{ matrix.components }}-benchmark_result.json
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          auto-push: true
-          # Show alert with commit comment on detecting possible performance regression
-          alert-threshold: '200%'
-          comment-on-alert: true
-          fail-on-alert: false
-          gh-pages-branch: gh-pages
-          benchmark-data-dir-path: benchmarks
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/ci.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/ci.yml
deleted file mode 100644
index bc585fc26..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/ci.yml
+++ /dev/null
@@ -1,1247 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-permissions:
-  contents: read
-
-jobs:
-
-# Commented 2024-11-06, lack of workers in github causes CI failures
-#  arm64_test:
-#    name: CMake test arm64 (with modern protobuf,grpc and abseil)
-#    runs-on: actuated-arm64-4cpu-16gb
-#    steps:
-#    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-#      with:
-#        submodules: 'recursive'
-#    - name: setup
-#      env:
-#        PROTOBUF_VERSION: '23.3'
-#        ABSEIL_CPP_VERSION: '20230125.3'
-#        CXX_STANDARD: '14'
-#        CC: /usr/bin/gcc-10
-#        CXX: /usr/bin/g++-10
-#      run: |
-#        sudo -E ./ci/setup_gcc10.sh
-#        sudo -E ./ci/setup_ci_environment.sh
-#        sudo -E ./ci/setup_cmake.sh
-#        sudo -E ./ci/setup_googletest.sh
-#        sudo -E ./ci/install_abseil.sh
-#        sudo -E ./ci/install_protobuf.sh
-
-  cmake_test:
-    name: CMake test (prometheus, elasticsearch, zipkin)
-    runs-on: ubuntu-22.04
-    env:
-      CXX_STANDARD: '17'
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run cmake tests
-      run: |
-        ./ci/do_ci.sh cmake.test
-
-  cmake_fetch_content_test:
-    name: CMake FetchContent usage with opentelemetry-cpp
-    runs-on: ubuntu-24.04
-    env:
-      CXX_STANDARD: '17'
-      BUILD_TYPE: 'Debug'
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: Install abseil, protobuf, and grpc with apt
-      run: |
-        sudo -E apt-get update
-        sudo -E apt-get install -y libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
-    - name: run fetch content cmake test
-      run: |
-        ./ci/do_ci.sh cmake.fetch_content.test
-
-  cmake_gcc_maintainer_sync_test:
-    name: CMake gcc 14 (maintainer mode, sync)
-    runs-on: ubuntu-24.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/gcc-14
-        CXX: /usr/bin/g++-14
-        PROTOBUF_VERSION: 21.12
-      run: |
-        sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-        sudo -E ./ci/install_protobuf.sh
-    - name: setup grpc
-      run: |
-        sudo ./ci/setup_grpc.sh
-    - name: run cmake gcc (maintainer mode, sync)
-      env:
-        CC: /usr/bin/gcc-14
-        CXX: /usr/bin/g++-14
-      run: |
-        ./ci/do_ci.sh cmake.maintainer.sync.test
-    - name: generate test cert
-      env:
-        CFSSL_VERSION: 1.6.3
-      run: |
-        sudo -E ./tools/setup-cfssl.sh
-        (cd ./functional/cert; ./generate_cert.sh)
-    - name: run func test
-      run: |
-        (cd ./functional/otlp; ./run_test.sh)
-
-  cmake_gcc_maintainer_async_test:
-    name: CMake gcc 14 (maintainer mode, async)
-    runs-on: ubuntu-24.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/gcc-14
-        CXX: /usr/bin/g++-14
-        PROTOBUF_VERSION: 21.12
-      run: |
-        sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-        sudo -E ./ci/install_protobuf.sh
-    - name: setup grpc
-      run: |
-        sudo ./ci/setup_grpc.sh
-    - name: run cmake gcc (maintainer mode, async)
-      env:
-        CC: /usr/bin/gcc-14
-        CXX: /usr/bin/g++-14
-      run: |
-        ./ci/do_ci.sh cmake.maintainer.async.test
-    - name: generate test cert
-      env:
-        CFSSL_VERSION: 1.6.3
-      run: |
-        sudo -E ./tools/setup-cfssl.sh
-        (cd ./functional/cert; ./generate_cert.sh)
-    - name: run func test
-      run: |
-        (cd ./functional/otlp; ./run_test.sh)
-
-  cmake_clang_maintainer_sync_test:
-    name: CMake clang 18 (maintainer mode, sync)
-    runs-on: ubuntu-24.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/clang-18
-        CXX: /usr/bin/clang++-18
-        PROTOBUF_VERSION: 21.12
-      run: |
-        sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-        sudo -E ./ci/install_protobuf.sh
-    - name: setup grpc
-      run: |
-        sudo ./ci/setup_grpc.sh
-    - name: run cmake clang (maintainer mode, sync)
-      env:
-        CC: /usr/bin/clang-18
-        CXX: /usr/bin/clang++-18
-      run: |
-        ./ci/do_ci.sh cmake.maintainer.sync.test
-    - name: generate test cert
-      env:
-        CFSSL_VERSION: 1.6.3
-      run: |
-        sudo -E ./tools/setup-cfssl.sh
-        (cd ./functional/cert; ./generate_cert.sh)
-    - name: run func test
-      run: |
-        (cd ./functional/otlp; ./run_test.sh)
-
-  cmake_clang_maintainer_async_test:
-    name: CMake clang 18 (maintainer mode, async)
-    runs-on: ubuntu-24.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/clang-18
-        CXX: /usr/bin/clang++-18
-        PROTOBUF_VERSION: 21.12
-      run: |
-        sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-        sudo -E ./ci/install_protobuf.sh
-    - name: setup grpc
-      run: |
-        sudo ./ci/setup_grpc.sh
-    - name: run cmake clang (maintainer mode, async)
-      env:
-        CC: /usr/bin/clang-18
-        CXX: /usr/bin/clang++-18
-      run: |
-        ./ci/do_ci.sh cmake.maintainer.async.test
-    - name: generate test cert
-      env:
-        CFSSL_VERSION: 1.6.3
-      run: |
-        sudo -E ./tools/setup-cfssl.sh
-        (cd ./functional/cert; ./generate_cert.sh)
-    - name: run func test
-      run: |
-        (cd ./functional/otlp; ./run_test.sh)
-
-  cmake_clang_maintainer_abiv2_test:
-    name: CMake clang 18 (maintainer mode, abiv2)
-    runs-on: ubuntu-24.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/clang-18
-        CXX: /usr/bin/clang++-18
-        PROTOBUF_VERSION: 21.12
-      run: |
-        sudo apt remove needrestart #refer: https://github.com/actions/runner-images/issues/9937
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-        sudo -E ./ci/install_protobuf.sh
-    - name: setup grpc
-      run: |
-        sudo ./ci/setup_grpc.sh
-    - name: run cmake clang (maintainer mode, abiv2)
-      env:
-        CC: /usr/bin/clang-18
-        CXX: /usr/bin/clang++-18
-      run: |
-        ./ci/do_ci.sh cmake.maintainer.abiv2.test
-    - name: generate test cert
-      env:
-        CFSSL_VERSION: 1.6.3
-      run: |
-        sudo -E ./tools/setup-cfssl.sh
-        (cd ./functional/cert; ./generate_cert.sh)
-    - name: run func test
-      run: |
-        (cd ./functional/otlp; ./run_test.sh)
-
-  cmake_msvc_maintainer_test:
-    name: CMake msvc (maintainer mode)
-    runs-on: windows-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        ./ci/setup_cmake.ps1
-        ./ci/setup_windows_ci_environment.ps1
-    - name: run tests
-      run: ./ci/do_ci.ps1 cmake.maintainer.test
-
-  cmake_msvc_maintainer_test_stl_cxx20:
-    name: CMake msvc (maintainer mode) with C++20
-    runs-on: windows-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        ./ci/setup_cmake.ps1
-        ./ci/setup_windows_ci_environment.ps1
-    - name: run tests
-      env:
-        CXX_STANDARD: '20'
-      run: ./ci/do_ci.ps1 cmake.maintainer.cxx20.stl.test
-
-  cmake_msvc_maintainer_abiv2_test:
-    name: CMake msvc (maintainer mode, abiv2)
-    runs-on: windows-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        ./ci/setup_cmake.ps1
-        ./ci/setup_windows_ci_environment.ps1
-    - name: run tests
-      env:
-        CXX_STANDARD: '20'
-      run: ./ci/do_ci.ps1 cmake.maintainer.abiv2.test
-
-  cmake_with_async_export_test:
-    name: CMake test (without otlp-exporter and with async export)
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/gcc-12
-        CXX: /usr/bin/g++-12
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run cmake tests (without otlp-exporter)
-      env:
-        CC: /usr/bin/gcc-12
-        CXX: /usr/bin/g++-12
-      run: |
-        ./ci/do_ci.sh cmake.with_async_export.test
-
-  cmake_opentracing_shim_test:
-    name: CMake test (with opentracing-shim)
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run cmake tests (enable opentracing-shim)
-      run: ./ci/do_ci.sh cmake.opentracing_shim.test
-
-  cmake_test_cxx14_gcc:
-    name: CMake C++14 test(GCC)
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run tests (enable stl)
-      env:
-        CXX_STANDARD: '14'
-      run: ./ci/do_ci.sh cmake.c++14.stl.test
-
-  cmake_test_cxx17_gcc:
-    name: CMake C++17 test(GCC)
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run tests (enable stl)
-      env:
-        CXX_STANDARD: '17'
-      run: ./ci/do_ci.sh cmake.c++17.stl.test
-
-  cmake_test_cxx20_gcc:
-    name: CMake C++20 test(GCC)
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run tests
-      env:
-        CXX_STANDARD: '20'
-      run: ./ci/do_ci.sh cmake.c++20.test
-    - name: run tests (enable stl)
-      env:
-        CXX_STANDARD: '20'
-      run: ./ci/do_ci.sh cmake.c++20.stl.test
-
-  cmake_test_cxx20_clang:
-    name: CMake C++20 test(Clang with libc++)
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/clang
-        CXX: /usr/bin/clang++
-        CXXFLAGS: "-stdlib=libc++"
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run tests
-      env:
-        CC: /usr/bin/clang
-        CXX: /usr/bin/clang++
-        CXXFLAGS: "-stdlib=libc++"
-        CXX_STANDARD: '20'
-      run: ./ci/do_ci.sh cmake.c++20.test
-    - name: run tests (enable stl)
-      env:
-        CC: /usr/bin/clang
-        CXX: /usr/bin/clang++
-        CXXFLAGS: "-stdlib=libc++"
-        CXX_STANDARD: '20'
-      run: ./ci/do_ci.sh cmake.c++20.stl.test
-
-  cmake_test_cxx23_gcc:
-    name: CMake C++23 test(GCC)
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run tests
-      env:
-        CXX_STANDARD: '23'
-      run: ./ci/do_ci.sh cmake.c++23.test
-    - name: run tests (enable stl)
-      env:
-        CXX_STANDARD: '23'
-      run: ./ci/do_ci.sh cmake.c++23.stl.test
-
-  cmake_test_cxx23_clang:
-    name: CMake C++23 test(Clang with libc++)
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/clang
-        CXX: /usr/bin/clang++
-        CXXFLAGS: "-stdlib=libc++"
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run tests
-      env:
-        CC: /usr/bin/clang
-        CXX: /usr/bin/clang++
-        CXXFLAGS: "-stdlib=libc++"
-        CXX_STANDARD: '23'
-      run: ./ci/do_ci.sh cmake.c++23.test
-    - name: run tests (enable stl)
-      env:
-        CC: /usr/bin/clang
-        CXX: /usr/bin/clang++
-        CXXFLAGS: "-stdlib=libc++"
-        CXX_STANDARD: '23'
-      run: ./ci/do_ci.sh cmake.c++23.stl.test
-
-  cmake_otprotocol_test:
-    name: CMake test (with otlp-exporter)
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run otlp exporter tests
-      run: |
-        sudo ./ci/setup_grpc.sh
-        ./ci/do_ci.sh cmake.exporter.otprotocol.test
-    - name: generate test cert
-      env:
-        CFSSL_VERSION: 1.6.3
-      run: |
-        sudo -E ./tools/setup-cfssl.sh
-        (cd ./functional/cert; ./generate_cert.sh)
-    - name: run func test
-      run: |
-        (cd ./functional/otlp; ./run_test.sh)
-
-  cmake_modern_protobuf_grpc_with_abseil_test:
-    name: CMake test (with modern protobuf,grpc and abseil)
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        PROTOBUF_VERSION: '23.3'
-        ABSEIL_CPP_VERSION: '20230125.3'
-        CXX_STANDARD: '14'
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-        sudo -E ./ci/install_abseil.sh
-        sudo -E ./ci/install_protobuf.sh
-    - name: run otlp exporter tests
-      env:
-        CXX_STANDARD: '14'
-      run: |
-        sudo -E ./ci/setup_grpc.sh -m -p protobuf -p abseil-cpp
-        ./ci/do_ci.sh cmake.exporter.otprotocol.test
-
-  cmake_do_not_install_test:
-    name: CMake do not install test (with otlp-exporter)
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run otlp exporter tests
-      run: |
-        sudo ./ci/setup_grpc.sh
-        ./ci/do_ci.sh cmake.do_not_install.test
-
-  cmake_otprotocol_shared_libs_with_static_grpc_test:
-    name: CMake test (build shared libraries with otlp-exporter and static gRPC)
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run otlp exporter tests
-      run: |
-        sudo ./ci/setup_grpc.sh -T
-        ./ci/do_ci.sh cmake.exporter.otprotocol.shared_libs.with_static_grpc.test
-
-  plugin_test:
-    name: Plugin -> CMake
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/gcc-12
-        CXX: /usr/bin/g++-12
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run tests
-      env:
-        CC: /usr/bin/gcc-12
-        CXX: /usr/bin/g++-12
-      run: ./ci/do_ci.sh cmake.test_example_plugin
-
-  bazel_test:
-    name: Bazel
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_test
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.test
-
-  bazel_no_bzlmod_test:
-    name: Bazel without bzlmod
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_test
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.no_bzlmod.test
-
-  bazel_test_async:
-    name: Bazel with async export
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_test
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.with_async_export.test
-
-  bazel_valgrind:
-    name: Bazel valgrind
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_valgrind
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.valgrind
-
-  bazel_noexcept:
-    name: Bazel noexcept
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_noexcept
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.noexcept
-
-  bazel_nortti:
-    name: Bazel nortti
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_nortti
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.nortti
-
-  bazel_asan:
-    name: Bazel asan config
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_asan
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.asan
-
-  bazel_tsan:
-    name: Bazel tsan config
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_tsan
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/setup_cmake.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.tsan
-
-  bazel_osx:
-    name: Bazel on MacOS
-    runs-on: macos-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /Users/runner/.cache/bazel
-        key: bazel_osx
-    - name: run tests
-      run: ./ci/do_ci.sh bazel.macos.test
-
-  benchmark:
-    name: Benchmark
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Mount Bazel Cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      env:
-        cache-name: bazel_cache
-      with:
-        path: /home/runner/.cache/bazel
-        key: bazel_benchmark
-    - name: setup
-      run: |
-        sudo ./ci/setup_ci_environment.sh
-        sudo ./ci/install_bazelisk.sh
-    - name: run tests
-      run: |
-        env BENCHMARK_DIR=/benchmark
-        ./ci/do_ci.sh benchmark
-    - name: Upload benchmark results
-      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-      with:
-        name: benchmark_reports
-        path: /home/runner/benchmark
-
-  format:
-    name: Format
-    runs-on: ubuntu-24.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: setup
-      run: sudo apt remove needrestart && sudo ./ci/install_format_tools.sh #refer: https://github.com/actions/runner-images/issues/9937
-    - name: run tests
-      run: ./ci/do_ci.sh format
-
-  copyright:
-    name: Copyright
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: check copyright
-      run: ./tools/check_copyright.sh
-
-  windows:
-    name: CMake -> exporter proto
-    runs-on: windows-2019
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        ./ci/setup_cmake.ps1
-        ./ci/setup_windows_ci_environment.ps1
-        ./ci/install_windows_protobuf.ps1
-    - name: run cmake test
-      run: ./ci/do_ci.ps1 cmake.test
-    - name: run otprotocol test
-      run: ./ci/do_ci.ps1 cmake.exporter.otprotocol.test
-
-  windows-build-dll:
-    name: CMake -> exporter proto (Build as DLL)
-    runs-on: windows-2019
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        ./ci/setup_cmake.ps1
-        ./ci/setup_windows_ci_environment.ps1
-        ./ci/install_windows_protobuf.ps1
-    - name: run cmake test (DLL build)
-      run: ./ci/do_ci.ps1 cmake.dll.test
-    - name: run cmake cxx20 test (DLL build)
-      run: ./ci/do_ci.ps1 cmake.dll.cxx20.test
-    - name: run otprotocol test (DLL build)
-      run: ./ci/do_ci.ps1 cmake.exporter.otprotocol.dll.test
-
-  windows_with_async_export:
-    name: CMake (With async export) -> exporter proto
-    runs-on: windows-2019
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        ./ci/setup_cmake.ps1
-        ./ci/setup_windows_ci_environment.ps1
-        ./ci/install_windows_protobuf.ps1
-    - name: run cmake test
-      run: ./ci/do_ci.ps1 cmake.with_async_export.test
-    - name: run otprotocol test
-      run: ./ci/do_ci.ps1 cmake.exporter.otprotocol.with_async_export.test
-
-  windows_bazel:
-    name: Bazel Windows
-    runs-on: windows-2019
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        ./ci/install_windows_bazelisk.ps1
-    - name: run tests
-      run: ./ci/do_ci.ps1 bazel.build
-
-  windows_plugin_test:
-    name: Plugin -> CMake Windows
-    runs-on: windows-2019
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      run: |
-        ./ci/setup_cmake.ps1
-        ./ci/setup_windows_ci_environment.ps1
-    - name: run tests
-      run: ./ci/do_ci.ps1 cmake.test_example_plugin
-
-  code_coverage:
-    name: Code coverage
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: setup
-      env:
-        CC: /usr/bin/gcc-10
-        CXX: /usr/bin/g++-10
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: run tests and generate report
-      env:
-        CC: /usr/bin/gcc-10
-        CXX: /usr/bin/g++-10
-      run: ./ci/do_ci.sh code.coverage
-    - name: upload report
-      uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
-      with:
-        files: /home/runner/build/coverage.info
-
-  markdown-lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - name: check out code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-    - name: install markdownlint-cli
-      run: sudo npm install -g markdownlint-cli@0.44.0
-
-    - name: run markdownlint
-      run: markdownlint .
-
-  shellcheck:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - name: check out code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: install shellcheck
-      run: sudo apt install --assume-yes shellcheck
-    - name: run shellcheck
-      run: find . -name \*.sh | xargs shellcheck --severity=error
-
-  misspell:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - name: check out code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: install misspell
-      run: |
-        curl -L -o ./install-misspell.sh https://git.io/misspell
-        sh ./install-misspell.sh
-    - name: run misspell
-      run: ./bin/misspell -error .
-
-  docfx_check:
-    name: DocFX check
-    runs-on: windows-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: install docfx
-      run: choco install docfx -y --version=2.58.5
-    - name: run ./ci/docfx.cmd
-      shell: cmd
-      run: ./ci/docfx.cmd
-
-  w3c_trace_context_compliance_v1:
-    name: W3C Distributed Tracing Validation V1
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Checkout open-telemetry/opentelemetry-cpp
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-      - name: setup
-        env:
-          CC: /usr/bin/gcc-12
-          CXX: /usr/bin/g++-12
-        run: |
-          sudo -E ./ci/setup_ci_environment.sh
-          sudo -E ./ci/setup_cmake.sh
-          sudo -E ./ci/setup_googletest.sh
-      - name: run w3c trace-context test server (background)
-        env:
-          CXX_STANDARD: '14'
-        run: |
-          ./ci/do_ci.sh cmake.w3c.trace-context.build-server
-          cd $HOME/build/ext/test/w3c_tracecontext_http_test_server
-          ./w3c_tracecontext_http_test_server &
-      - name: Checkout w3c/trace-context repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          repository: w3c/trace-context
-          path: trace-context
-      - name: install dependencies
-        run: |
-          sudo apt update && sudo apt install python3-pip
-          sudo pip3 install aiohttp==3.11.18
-      - name: run w3c trace-context test suite
-        env:
-          SPEC_LEVEL: 1
-        run:
-          |
-          python ${GITHUB_WORKSPACE}/trace-context/test/test.py http://localhost:30000/test TraceContextTest AdvancedTest
-          curl http://localhost:30000/stop
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/clang-tidy.yaml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/clang-tidy.yaml
deleted file mode 100644
index aec027f64..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/clang-tidy.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-name: clang-tidy
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-permissions:
-  contents: read
-
-jobs:
-  clang-tidy:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: recursive
-
-      - name: Setup Environment
-        env:
-          PROTOBUF_VERSION: '23.3'
-          ABSEIL_CPP_VERSION: '20230125.3'
-          CXX_STANDARD: '14'
-        run: |
-          sudo apt update -y
-          sudo apt install -y --no-install-recommends --no-install-suggests \
-          build-essential \
-          iwyu \
-          cmake \
-          libssl-dev \
-          libcurl4-openssl-dev \
-          libprotobuf-dev \
-          protobuf-compiler \
-          libgmock-dev \
-          libgtest-dev \
-          libbenchmark-dev
-
-          if ! command -v clang-tidy &> /dev/null; then
-            echo "clang-tidy could not be found"
-            exit 1
-          fi
-          echo "Using clang-tidy version: $(clang-tidy --version)"
-          echo "clang-tidy installed at: $(which clang-tidy)"
-
-
-      - name: Prepare CMake
-        env:
-          CC: clang
-          CXX: clang++
-        run: |
-          echo "Running cmake..."
-          cmake -B build \
-            -DCMAKE_CXX_STANDARD=14 \
-            -DWITH_STL=CXX14 \
-            -DWITH_OTLP_HTTP=ON \
-            -DWITH_OTLP_FILE=ON \
-            -DWITH_PROMETHEUS=ON \
-            -DWITH_ZIPKIN=ON \
-            -DWITH_ELASTICSEARCH=ON \
-            -DWITH_OTLP_HTTP_COMPRESSION=ON \
-            -DWITH_EXAMPLES=ON \
-            -DWITH_EXAMPLES_HTTP=ON \
-            -DBUILD_W3CTRACECONTEXT_TEST=ON \
-            -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-            -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-
-      - name: Run clang-tidy
-        run: |
-          cmake --build build --target opentelemetry_proto
-          jq -r .[].file build/compile_commands.json | grep -vE '/(generated|third_party)/' | xargs -P $(nproc) -n 1 clang-tidy --quiet -p build 2>&1 | tee -a clang-tidy.log
-
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: Logs (clang-tidy)
-          path: ./clang-tidy.log
-
-      - name: Count warnings
-        run: |
-          COUNT=$(grep -c "warning:" clang-tidy.log)
-          echo "clang-tidy reported ${COUNT} warning(s)"
-
-# TODO: include WITH_OTLP_GRPC flags.
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/cmake_install.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/cmake_install.yml
deleted file mode 100644
index c62d7def8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/cmake_install.yml
+++ /dev/null
@@ -1,372 +0,0 @@
-name: CMake Install Tests
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-permissions:
-  contents: read
-
-jobs:
-  windows_2022_vcpkg_submodule:
-    name: Windows 2022 vcpkg submodule versions cxx17 (static libs - dll)
-    runs-on: windows-2022
-    env:
-      # Set to the latest version of cmake 3.x
-      CMAKE_VERSION: '3.31.6'
-      # cxx17 is the default for windows-2022
-      CXX_STANDARD: '17'
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-      - name: Build dependencies with vcpkg submodule
-        run: |
-          ./ci/setup_cmake.ps1
-          ./ci/setup_windows_ci_environment.ps1
-      - name: Run Tests
-        run: ./ci/do_ci.ps1 cmake.install.test
-      - name: Run DLL Tests
-        run: ./ci/do_ci.ps1 cmake.dll.install.test
-
-  windows_2019_vcpkg_submodule_min_cmake:
-    name: Windows 2019 vcpkg submodule versions minimum cmake cxx14 (static libs)
-    runs-on: windows-2019
-    env:
-      # cmake 3.15 is the minimum for windows builds (See https://github.com/open-telemetry/opentelemetry-cpp/pull/3349#discussion_r2030319430)
-      CMAKE_VERSION: '3.15.0'
-      # cxx14 is the default for windows-2019
-      CXX_STANDARD: '14'
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-      - name: Build dependencies with vcpkg submodule
-        run: |
-          ./ci/setup_cmake.ps1
-          ./ci/setup_windows_ci_environment.ps1
-      - name: Run Tests
-        run: ./ci/do_ci.ps1 cmake.install.test
-
-  ubuntu_2404_system_packages:
-    name: Ubuntu 24.04 apt packages cxx17 (static libs - shared libs)
-    runs-on: ubuntu-24.04
-    env:
-      INSTALL_TEST_DIR: '/home/runner/install_test'
-      # CMake 3.28 is apt package version for Ubuntu 24.04
-      CMAKE_VERSION: '3.28.3'
-      # cxx17 is the default for Ubuntu 24.04
-      CXX_STANDARD: '17'
-      BUILD_TYPE: 'Debug'
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Install libcurl, zlib, nlohmann-json with apt
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: Install abseil, protobuf, and grpc with apt
-      run: |
-        sudo -E apt-get update
-        sudo -E apt-get install -y libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
-    - name: Run Tests (static libs)
-      env:
-        BUILD_SHARED_LIBS: 'OFF'
-      run: ./ci/do_ci.sh cmake.install.test
-    - name: Run Tests (shared libs)
-      env:
-        BUILD_SHARED_LIBS: 'ON'
-      run: ./ci/do_ci.sh cmake.install.test
-
-  ubuntu_2404_latest:
-    name: Ubuntu 24.04 latest versions cxx20 (static libs)
-    runs-on: ubuntu-24.04
-    env:
-      INSTALL_TEST_DIR: '/home/runner/install_test'
-      # Set to the latest version of cmake 3.x
-      CMAKE_VERSION: '3.31.6'
-      # Set to the latest cxx standard supported by opentelemetry-cpp
-      CXX_STANDARD: '20'
-      # Versions below set to the latest version available
-      # The abseil and protobuf versions are taken from
-      # the grpc submodules at the GRPC_VERSION tag
-      GOOGLETEST_VERSION: '1.16.0'
-      ABSEIL_CPP_VERSION: '20240722.1'
-      PROTOBUF_VERSION: '29.0'
-      GRPC_VERSION: 'v1.71.0'
-      BUILD_TYPE: 'Debug'
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Install gtest, libcurl, zlib, nlohmann-json with apt
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: Build abseil, protobuf, and grpc with ci scripts
-      run: |
-        sudo -E ./ci/install_abseil.sh
-        sudo -E ./ci/install_protobuf.sh
-        sudo -E ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
-    - name: Run Tests (static libs)
-      env:
-        BUILD_SHARED_LIBS: 'OFF'
-      run: ./ci/do_ci.sh cmake.install.test
-
-  ubuntu_2204_stable:
-    name: Ubuntu 22.04 stable versions cxx17 (static libs - shared libs)
-    runs-on: ubuntu-22.04
-    env:
-      INSTALL_TEST_DIR: '/home/runner/install_test'
-      # CMake 3.22 is the apt package version for Ubuntu 22.04
-      CMAKE_VERSION: '3.22.0'
-      CXX_STANDARD: '17'
-      # These are stable versions tested in the main ci workflow
-      # and defaults in the devcontainer
-      GOOGLETEST_VERSION: '1.14.0'
-      ABSEIL_CPP_VERSION: '20230125.3'
-      PROTOBUF_VERSION: '23.3'
-      GRPC_VERSION: 'v1.55.0'
-      BUILD_TYPE: 'Debug'
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Install gtest, libcurl, zlib, nlohmann-json with apt
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: Build abseil, protobuf, and grpc with ci scripts
-      run: |
-        sudo -E ./ci/install_abseil.sh
-        sudo -E ./ci/install_protobuf.sh
-        sudo -E ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
-    - name: Run Tests (static libs)
-      env:
-        BUILD_SHARED_LIBS: 'OFF'
-      run: ./ci/do_ci.sh cmake.install.test
-    - name: Run Tests (shared libs)
-      env:
-        BUILD_SHARED_LIBS: 'ON'
-      run: ./ci/do_ci.sh cmake.install.test
-
-  ubuntu_2204_minimum:
-    name: Ubuntu 22.04 minimum versions cxx14 (static libs - shared libs)
-    runs-on: ubuntu-22.04
-    env:
-      INSTALL_TEST_DIR: '/home/runner/install_test'
-      # Set to the current minimum version of cmake
-      CMAKE_VERSION: '3.14.0'
-      # cxx14 is the default for Ubuntu 22.04
-      CXX_STANDARD: '14'
-      # This is the apt package version of googletest for Ubuntu 22.04
-      GOOGLETEST_VERSION: '1.11.0'
-      # These are minimum versions tested in the main ci workflow
-      ABSEIL_CPP_VERSION: '20220623.2'
-      PROTOBUF_VERSION: '21.12'
-      GRPC_VERSION: 'v1.49.2'
-      BUILD_TYPE: 'Debug'
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Install gtest, libcurl, zlib, nlohmann-json with apt
-      run: |
-        sudo -E ./ci/setup_ci_environment.sh
-        sudo -E ./ci/setup_cmake.sh
-        sudo -E ./ci/setup_googletest.sh
-    - name: Build abseil, protobuf, and grpc with ci scripts
-      run: |
-        sudo -E ./ci/install_abseil.sh
-        sudo -E ./ci/install_protobuf.sh
-        sudo -E ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
-    - name: Run Tests (static libs)
-      env:
-          BUILD_SHARED_LIBS: 'OFF'
-      run: ./ci/do_ci.sh cmake.install.test
-    - name: Run Tests (shared libs)
-      env:
-          BUILD_SHARED_LIBS: 'ON'
-      run: ./ci/do_ci.sh cmake.install.test
-
-  ubuntu_2404_conan_stable:
-    name: Ubuntu 24.04 conan stable versions cxx17 (static libs - shared libs - opentracing shim)
-    runs-on: ubuntu-24.04
-    env:
-      INSTALL_TEST_DIR: '/home/runner/install_test'
-       # CMake 3.28 is apt package version for Ubuntu 24.04
-      CMAKE_VERSION: '3.28.3'
-      CXX_STANDARD: '17'
-      CMAKE_TOOLCHAIN_FILE: /home/runner/conan/build/Debug/generators/conan_toolchain.cmake
-      BUILD_TYPE: 'Debug'
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-      - name: Install Conan
-        run: |
-          python3 -m pip install pip==25.0.1
-          pip install "conan==2.15.1"
-          conan profile detect --force
-      - name: Install or build all dependencies with Conan
-        run: |
-          sudo -E ./ci/setup_cmake.sh
-          conan install install/conan/conanfile_stable.txt --build=missing -of /home/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
-      - name: Run Tests (static libs)
-        env:
-          BUILD_SHARED_LIBS: 'OFF'
-        run: ./ci/do_ci.sh cmake.install.test
-      - name: Run Tests (shared libs)
-        env:
-          BUILD_SHARED_LIBS: 'ON'
-        run: ./ci/do_ci.sh cmake.install.test
-      - name: verify pkgconfig packages
-        run: |
-          export PKG_CONFIG_PATH=$INSTALL_TEST_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
-          ./ci/verify_packages.sh
-      - name: Run OpenTracing Shim Test
-        run: ./ci/do_ci.sh cmake.opentracing_shim.install.test
-
-  ubuntu_2404_conan_latest:
-    name: Ubuntu 24.04 conan latest versions cxx17 (static libs)
-    runs-on: ubuntu-24.04
-    env:
-      INSTALL_TEST_DIR: '/home/runner/install_test'
-      # Set to the latest version of cmake 3.x
-      CMAKE_VERSION: '3.31.6'
-      CXX_STANDARD: '17'
-      CMAKE_TOOLCHAIN_FILE: /home/runner/conan/build/Debug/generators/conan_toolchain.cmake
-      BUILD_TYPE: 'Debug'
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-      - name: Install Conan
-        run: |
-          python3 -m pip install pip==25.0.1
-          pip install "conan==2.15.1"
-          conan profile detect --force
-      - name: Install or build all dependencies with Conan
-        run: |
-          sudo -E ./ci/setup_cmake.sh
-          conan install install/conan/conanfile_latest.txt --build=missing -of /home/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
-      - name: Run Tests (static libs)
-        env:
-          BUILD_SHARED_LIBS: 'OFF'
-        run: ./ci/do_ci.sh cmake.install.test
-      - name: verify pkgconfig packages
-        run: |
-          export PKG_CONFIG_PATH=$INSTALL_TEST_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
-          ./ci/verify_packages.sh
-
-  macos_14_conan_stable:
-    name: macOS 14 conan stable versions cxx17 (static libs)
-    runs-on: macos-14
-    env:
-      INSTALL_TEST_DIR: '/Users/runner/install_test'
-      CMAKE_VERSION: '3.28.3'
-      CXX_STANDARD: '17'
-      CMAKE_TOOLCHAIN_FILE: '/Users/runner/conan/build/Debug/generators/conan_toolchain.cmake'
-      BUILD_TYPE: 'Debug'
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Install Conan and tools
-      run: |
-        brew install conan autoconf automake libtool coreutils
-        ./ci/setup_cmake_macos.sh
-        conan profile detect --force
-    - name: Install or build all dependencies with Conan
-      run: conan install install/conan/conanfile_stable.txt --build=missing -of /Users/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD}
-    - name: Run Tests (static libs)
-      env:
-        BUILD_SHARED_LIBS: 'OFF'
-      run: ./ci/do_ci.sh cmake.install.test
-
-  macos_14_brew_packages:
-    name: macOS 14 brew latest versions cxx17 (static libs)
-    runs-on: macos-14
-    env:
-      INSTALL_TEST_DIR: '/Users/runner/install_test'
-      # Set to the latest version of cmake 3.x
-      CMAKE_VERSION: '3.31.6'
-      CXX_STANDARD: '17'
-      BUILD_TYPE: 'Debug'
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        submodules: 'recursive'
-    - name: Install Dependencies with Homebrew
-      run: |
-        ./ci/setup_cmake_macos.sh
-        brew install coreutils
-        brew install googletest
-        brew install google-benchmark
-        brew install zlib
-        brew install abseil
-        brew install protobuf
-        brew install grpc
-        brew install nlohmann-json
-        brew install prometheus-cpp
-    - name: Run Tests (static libs)
-      env:
-        BUILD_SHARED_LIBS: 'OFF'
-      run: ./ci/do_ci.sh cmake.install.test
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/codeql-analysis.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 9d2fe02d7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [main]
-
-permissions:
-  contents: read
-
-jobs:
-  CodeQL-Build:
-    permissions:
-      actions: read  # for github/codeql-action/init to get workflow details
-      contents: read  # for actions/checkout to fetch code
-      security-events: write  # for github/codeql-action/autobuild to send a status report
-    runs-on: ubuntu-latest
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-         submodules: 'recursive'
-    - name: Remove Third_party Modules from Code Scan
-      run: |
-        rm -rf third_party
-    - name: Setup
-      env:
-        CC: /usr/bin/gcc-12
-        CXX: /usr/bin/g++-12
-        GOOGLETEST_VERSION: 1.12.1
-      run: |
-        sudo -E ./ci/setup_googletest.sh
-        sudo -E ./ci/setup_ci_environment.sh
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
-      with:
-       languages: cpp
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/cppcheck.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/cppcheck.yml
deleted file mode 100644
index 53057354b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/cppcheck.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-name: cppcheck
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-permissions:
-  contents: read
-
-jobs:
-  cppcheck:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-
-      - name: Set up dependencies
-        run: |
-          sudo apt update -y
-          sudo apt install -y cppcheck
-
-      - name: Run cppcheck
-        run: |
-          cppcheck --version | tee cppcheck.log
-          cppcheck \
-            --force \
-            --enable=warning,performance,portability \
-            --inline-suppr \
-            --suppress=unknownMacro:exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h \
-            --language=c++ \
-            --std=c++14 \
-            -I api/include \
-            -I exporters/elasticsearch/include \
-            -I exporters/etw/include \
-            -I exporters/memory/include \
-            -I exporters/ostream/include \
-            -I exporters/otlp/include \
-            -I exporters/prometheus/include \
-            -I exporters/zipkin/include \
-            -I ext/include \
-            -I opentracing-shim/include \
-            -I sdk/include \
-            -i build \
-            -i test \
-            -i third_party \
-            -j $(nproc) \
-            . 2>&1 | tee --append cppcheck.log
-
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: success() || failure()
-        with:
-          name: Logs (cppcheck)
-          path: ./cppcheck.log
-
-      - name: Count warnings
-        run: |
-          set +e
-          readonly WARNING_COUNT=`grep -c -E "\[.+\]" cppcheck.log`
-          echo "cppcheck reported ${WARNING_COUNT} warning(s)"
-          # Acceptable limit, to decrease over time down to 0
-          readonly WARNING_LIMIT=10
-          # FAIL the build if WARNING_COUNT > WARNING_LIMIT
-          if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then
-            exit 1
-          # WARN in annotations if WARNING_COUNT > 0
-          elif [ $WARNING_COUNT -gt 0 ] ; then
-            echo "::warning::cppcheck reported ${WARNING_COUNT} warning(s)"
-          fi
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/dependencies_image.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/dependencies_image.yml
deleted file mode 100644
index 3163dd8ca..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/dependencies_image.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: 'OpenTelemetry-cpp dependencies image'
-on:
-  schedule:
-    - cron: "0 3 * * 6"
-
-permissions:
-  contents: read
-
-jobs:
-  docker_image:
-    name: Docker Image
-    runs-on: ubuntu-latest
-    timeout-minutes: 300
-    steps:
-    - name: Harden the runner (Audit all outbound calls)
-      uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-      with:
-        egress-policy: audit
-
-    -
-      name: checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    -
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
-    -
-      name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-    -
-      name: Build Image
-      uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-      with:
-        builder: ${{ steps.buildx.outputs.name }}
-        context: ci/
-        file: ./docker/Dockerfile
-        build-args: BASE_IMAGE=ubuntu:latest
-        platforms: linux/amd64
-        # platforms: linux/amd64,linux/arm64
-        push: false
-        tags: otel-cpp-deps
-        load: true
-    -
-      name: Save Image
-      run: |
-        docker images
-        docker save -o /opt/otel-cpp-deps-debian.tar otel-cpp-deps
-    -
-      name: Upload Image
-      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-      with:
-        name: otel-cpp-deps
-        path: /opt/otel-cpp-deps-debian.tar
-        retention-days: 14
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/fossa.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/fossa.yml
deleted file mode 100644
index 8b90aa167..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/fossa.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: FOSSA scanning
-
-on:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: read
-
-jobs:
-  fossa:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
-        with:
-          api-key: ${{secrets.FOSSA_API_KEY}}
-          team: OpenTelemetry
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/iwyu.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/iwyu.yml
deleted file mode 100644
index 42881ec6b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/iwyu.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-name: include-what-you-use
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-permissions:
-  contents: read
-
-jobs:
-  iwyu:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-
-      - name: setup dependencies
-        run: |
-          sudo apt update -y
-          sudo apt install -y --no-install-recommends --no-install-suggests \
-            build-essential \
-            iwyu \
-            ninja-build \
-            libssl-dev \
-            libcurl4-openssl-dev \
-            libprotobuf-dev \
-            protobuf-compiler \
-            libgmock-dev \
-            libgtest-dev \
-            libbenchmark-dev
-          sudo ./ci/setup_cmake.sh
-
-
-      - name: setup grpc
-        run: |
-          sudo ./ci/setup_grpc.sh
-
-      - name: Prepare CMake
-        run: |
-          TOPDIR=`pwd`
-          mkdir build && cd build
-          CC="clang" CXX="clang++" cmake \
-            -DCMAKE_CXX_STANDARD=14 \
-            -DWITH_STL=CXX14 \
-            -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;" \
-            -DBUILD_TESTING=ON \
-            -DBUILD_W3CTRACECONTEXT_TEST=ON \
-            -DWITH_OTLP_GRPC=ON \
-            -DWITH_OTLP_HTTP=ON \
-            -DWITH_OTLP_FILE=ON \
-            -DWITH_OPENTRACING=ON \
-            -DWITH_OTLP_HTTP_COMPRESSION=ON \
-            -DWITH_THREAD_INSTRUMENTATION=ON \
-            -DWITH_ZIPKIN=ON \
-            -DWITH_PROMETHEUS=ON \
-            ..
-
-      - name: iwyu_tool
-        run: |
-          cd build
-          make -k 2>&1 | tee -a iwyu.log
-
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: success() || failure()
-        with:
-          name: Logs (include-what-you-use)
-          path: ./build/*.log
-
-      - name: count warnings
-        run: |
-          set +e
-          cd build
-          readonly WARNING_COUNT=`grep -c "include-what-you-use reported diagnostics:" iwyu.log`
-          echo "include-what-you-use reported ${WARNING_COUNT} warning(s)"
-          # Acceptable limit, to decrease over time down to 0
-          readonly WARNING_LIMIT=0
-          # FAIL the build if WARNING_COUNT > WARNING_LIMIT
-          if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then
-            exit 1
-          # WARN in annotations if WARNING_COUNT > 0
-          elif [ $WARNING_COUNT -gt 0 ] ; then
-            echo "::warning::include-what-you-use reported ${WARNING_COUNT} warning(s)"
-          fi
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/ossf-scorecard.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/ossf-scorecard.yml
deleted file mode 100644
index 4ecbe8bf8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/ossf-scorecard.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: OSSF Scorecard
-
-on:
-  push:
-    branches:
-      - main
-  schedule:
-    - cron: "56 23 * * 6" # once a week
-  workflow_dispatch:
-
-permissions: read-all
-
-jobs:
-  analysis:
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed for Code scanning upload
-      security-events: write
-      # Needed for GitHub OIDC token if publish_results is true
-      id-token: write
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-
-      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable
-      # uploads of run results in SARIF format to the repository Actions tab.
-      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard (optional).
-      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
-        with:
-          sarif_file: results.sarif
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/project_management_comment.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/project_management_comment.yml
deleted file mode 100644
index 6e64cf0aa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/project_management_comment.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-name: Add comment
-on:
-  issues:
-    types:
-      - labeled
-permissions:
-  contents: read
-
-jobs:
-  add-comment:
-    if: github.event.label.name == 'help wanted'
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - name: Add comment
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
-        with:
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            This issue is available for anyone to work on. **Make sure to reference this issue in your pull request.**
-            :sparkles: Thank you for your contribution! :sparkles:
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/project_management_issue_open.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/project_management_issue_open.yml
deleted file mode 100644
index 14750d1a6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/project_management_issue_open.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: OpenTelemetry-cpp project
-on:
-  issues:
-    types:
-      - reopened
-      - opened
-permissions:
-  contents: read
-
-jobs:
-  label_issues:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ["needs-triage"]
-            })
diff --git a/ext/opentelemetry-cpp-1.21.0/.github/workflows/stale.yml b/ext/opentelemetry-cpp-1.21.0/.github/workflows/stale.yml
deleted file mode 100644
index 931403638..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.github/workflows/stale.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: "Mark stale issues"
-on:
-  schedule:
-    - cron: "30 1 * * *"
-
-permissions:
-  contents: read
-
-jobs:
-  stale:
-    permissions:
-      issues: write  # for actions/stale to close stale issues
-      pull-requests: write  # for actions/stale to close stale PRs
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
-        with:
-          stale-issue-message: "This issue was marked as stale due to lack of activity."
-          days-before-issue-stale: 60
-          days-before-close: -1
-          exempt-issue-labels: "do-not-stale"
diff --git a/ext/opentelemetry-cpp-1.21.0/.gitignore b/ext/opentelemetry-cpp-1.21.0/.gitignore
deleted file mode 100644
index 580df5ac3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.gitignore
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Ref. https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-*.pdb
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# Bazel files
-MODULE.bazel.lock
-/bazel-*
-
-# Mac
-.DS_Store
-
-# Output directories
-/out
-/out.*
-# Indicator that the tools were deployed
-.buildtools
-
-# Temporary Bazel directories
-/bazel-*
-/plugin
-/build
-
-tags
-.cache/clangd/*
-
-# Temporary dir used when generating semconv
-buildscripts/semantic-convention/tmp-semconv/
-
-# Generated cert keys in functional tests
-functional/cert/ca.csr
-functional/cert/ca.pem
-functional/cert/ca-key.pem
-functional/cert/client_cert.csr
-functional/cert/client_cert.pem
-functional/cert/client_cert-key.pem
-functional/cert/server_cert.csr
-functional/cert/server_cert.pem
-functional/cert/server_cert-key.pem
-functional/cert/ca_b.csr
-functional/cert/ca_b.pem
-functional/cert/ca_b-key.pem
-functional/cert/client_cert_b.csr
-functional/cert/client_cert_b.pem
-functional/cert/client_cert_b-key.pem
-functional/cert/server_cert_b.csr
-functional/cert/server_cert_b.pem
-functional/cert/server_cert_b-key.pem
-functional/cert/unreadable.pem
-
-localinstall
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/.gitmodules b/ext/opentelemetry-cpp-1.21.0/.gitmodules
deleted file mode 100644
index 88a78e5f9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.gitmodules
+++ /dev/null
@@ -1,39 +0,0 @@
-[submodule "third_party/prometheus-cpp"]
-path = third_party/prometheus-cpp
-url = https://github.com/jupp0r/prometheus-cpp
-branch = master
-
-[submodule "tools/vcpkg"]
-path = tools/vcpkg
-url = https://github.com/Microsoft/vcpkg
-branch = master
-
-[submodule "third_party/ms-gsl"]
-path = third_party/ms-gsl
-url = https://github.com/microsoft/GSL
-branch = main
-
-[submodule "third_party/googletest"]
-path = third_party/googletest
-url = https://github.com/google/googletest
-branch = main
-
-[submodule "third_party/benchmark"]
-path = third_party/benchmark
-url = https://github.com/google/benchmark
-branch = main
-
-[submodule "third_party/opentelemetry-proto"]
-path = third_party/opentelemetry-proto
-url = https://github.com/open-telemetry/opentelemetry-proto
-branch = main
-
-[submodule "third_party/nlohmann-json"]
-path = third_party/nlohmann-json
-url = https://github.com/nlohmann/json
-branch = master
-
-[submodule "third_party/opentracing-cpp"]
-path = third_party/opentracing-cpp
-url = https://github.com/opentracing/opentracing-cpp.git
-branch = master
diff --git a/ext/opentelemetry-cpp-1.21.0/.iwyu.imp b/ext/opentelemetry-cpp-1.21.0/.iwyu.imp
deleted file mode 100644
index 123e72f32..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.iwyu.imp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# include-what-you-use mapping file
-
-[
-  # Work around for C++ STL
-  { "include": ["<bits/chrono.h>", "private", "<chrono>", "public"] },
-  { "include": ["<bits/std_abs.h>", "private", "<cstdlib>", "public"] },
-  { "include": ["<ext/alloc_traits.h>", "private", "<memory>", "public"] },
-  { "include": ["<bits/types/struct_tm.h>", "private", "<time.h>", "public"] },
-  { "include": ["<bits/types/struct_FILE.h>", "private", "<stdio.h>", "public"] },
-
-  # Local opentelemetry-cpp style
-
-  # We prefer to include <gtest/gtest.h> for simplicity
-  { "include": ["<gtest/gtest-message.h>", "private", "<gtest/gtest.h>", "public"] },
-  { "include": ["<gtest/gtest-test-part.h>", "private", "<gtest/gtest.h>", "public"] },
-  { "include": ["<gtest/gtest-param-test.h>", "private", "<gtest/gtest.h>", "public"] },
-  { "include": ["<gtest/gtest_pred_impl.h>", "private", "<gtest/gtest.h>", "public"] },
-  { "include": ["<gtest/gtest-typed-test.h>", "private", "<gtest/gtest.h>", "public"] },
-  { "include": ["<gtest/gtest-assertion-result.h>", "private", "<gtest/gtest.h>", "public"] },
-
-  # We prefer to include <gmock/gmock.h> for simplicity
-  { "include": ["<gmock/gmock-function-mocker.h>", "private", "<gmock/gmock.h>", "public"] },
-  { "include": ["<gmock/gmock-spec-builders.h>", "private", "<gmock/gmock.h>", "public"] },
-
-  # We prefer to include <curl/curl.h> for simplicity
-  { "include": ["<curl/system.h>", "private", "<curl/curl.h>", "public"] },
-]
-
diff --git a/ext/opentelemetry-cpp-1.21.0/.markdownlint.json b/ext/opentelemetry-cpp-1.21.0/.markdownlint.json
deleted file mode 100644
index 48c2ae2a3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.markdownlint.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "default": true,
-    "MD013":
-    {
-        "code_blocks": false,
-        "tables": false
-    }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/.markdownlintignore b/ext/opentelemetry-cpp-1.21.0/.markdownlintignore
deleted file mode 100644
index f0cec48db..000000000
--- a/ext/opentelemetry-cpp-1.21.0/.markdownlintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party/**
-tools/**
-examples/otlp/README.md
diff --git a/ext/opentelemetry-cpp-1.21.0/CHANGELOG.md b/ext/opentelemetry-cpp-1.21.0/CHANGELOG.md
deleted file mode 100644
index 30c94679e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/CHANGELOG.md
+++ /dev/null
@@ -1,2816 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## Guideline to update the version
-
-Increment the:
-
-* MAJOR version when you make incompatible API/ABI changes,
-* MINOR version when you add functionality in a backwards compatible manner, and
-* PATCH version when you make backwards compatible bug fixes.
-
-## [Unreleased]
-
-## [1.21 2025-05-28]
-
-* [BUILD] Remove WITH_ABSEIL
-  [#3318](https://github.com/open-telemetry/opentelemetry-cpp/pull/3318)
-
-* [INSTALL] Add CMake components to the opentelemetry-cpp package
-  [#3320](https://github.com/open-telemetry/opentelemetry-cpp/pull/3220)
-
-* [CI] Harden GitHub Actions
-  [#3338](https://github.com/open-telemetry/opentelemetry-cpp/pull/3338)
-
-* [StepSecurity] Harden GibHub Actions, part 2
-  [#3340](https://github.com/open-telemetry/opentelemetry-cpp/pull/3340)
-
-* Bump github/codeql-action from 3.28.12 to 3.28.13
-  [#3341](https://github.com/open-telemetry/opentelemetry-cpp/pull/3341)
-
-* [DEVCONTAINER] expose cmake version setting as docker arg and environment variable
-  [#3347](https://github.com/open-telemetry/opentelemetry-cpp/pull/3347)
-
-* [CI] disable bzip2 in conan builds
-  [#3352](https://github.com/open-telemetry/opentelemetry-cpp/pull/3352)
-
-* [SEMANTIC CONVENTIONS] Upgrade semantic conventions to 1.32.0
-  [#3351](https://github.com/open-telemetry/opentelemetry-cpp/pull/3351)
-
-* Bump github/codeql-action from 3.28.13 to 3.28.15
-  [#3353](https://github.com/open-telemetry/opentelemetry-cpp/pull/3353)
-
-* [CMAKE] bump cmake minimum required version to 3.14
-  [#3349](https://github.com/open-telemetry/opentelemetry-cpp/pull/3349)
-
-* Bump codecov/codecov-action from 5.4.0 to 5.4.2
-  [#3362](https://github.com/open-telemetry/opentelemetry-cpp/pull/3362)
-
-* [DOC] Fix documentation tags in logger API
-  [#3371](https://github.com/open-telemetry/opentelemetry-cpp/pull/3371)
-
-* [CI] fix artifacts download/upload
-  [#3369](https://github.com/open-telemetry/opentelemetry-cpp/pull/3369)
-
-* [API] Add Enabled method to Tracer
-  [#3357](https://github.com/open-telemetry/opentelemetry-cpp/pull/3357)
-
-* [BUILD] Fixes warnings of ciso646 in C++17
-  [#3360](https://github.com/open-telemetry/opentelemetry-cpp/pull/3360)
-
-* Bump github/codeql-action from 3.28.15 to 3.28.16
-  [#3377](https://github.com/open-telemetry/opentelemetry-cpp/pull/3377)
-
-* Bump step-security/harden-runner from 2.11.1 to 2.12.0
-  [#3373](https://github.com/open-telemetry/opentelemetry-cpp/pull/3373)
-
-* Bump docker/build-push-action from 6.15.0 to 6.16.0
-  [#3382](https://github.com/open-telemetry/opentelemetry-cpp/pull/3382)
-
-* Bump actions/download-artifact from 4.2.1 to 4.3.0
-  [#3381](https://github.com/open-telemetry/opentelemetry-cpp/pull/3381)
-
-* [CI] Harden Github actions - pinned-dependencies (part -1)
-  [#3380](https://github.com/open-telemetry/opentelemetry-cpp/pull/3380)
-
-* [StepSecurity] ci: Harden GitHub Actions
-  [#3378](https://github.com/open-telemetry/opentelemetry-cpp/pull/3378)
-
-* [SDK] Base2 exponential histogram aggregation
-  [#3346](https://github.com/open-telemetry/opentelemetry-cpp/pull/3346)
-
-* [StepSecurity] ci: Harden GitHub Actions
-  [#3379](https://github.com/open-telemetry/opentelemetry-cpp/pull/3379)
-
-* [BUILD] Fixes glibc++ 5 checking
-  [#3355](https://github.com/open-telemetry/opentelemetry-cpp/pull/3355)
-
-* [TEST] Add stress test for histogram metric for multiple threads validation
-  [#3388](https://github.com/open-telemetry/opentelemetry-cpp/pull/3388)
-
-* Bump github/codeql-action from 3.28.16 to 3.28.17
-  [#3389](https://github.com/open-telemetry/opentelemetry-cpp/pull/3389)
-
-* [SDK] Optimize PeriodicExportingMetricReader Thread Usage
-  [#3383](https://github.com/open-telemetry/opentelemetry-cpp/pull/3383)
-
-* [Metrics SDK] Use nostd::function_ref in AttributesHashMap
-  [#3393](https://github.com/open-telemetry/opentelemetry-cpp/pull/3393)
-
-* [SDK] support aggregation of identical instruments
-  [#3358](https://github.com/open-telemetry/opentelemetry-cpp/pull/3358)
-
-* [BUILD] Fixes unused var
-  [#3397](https://github.com/open-telemetry/opentelemetry-cpp/pull/3397)
-
-* [INSTALL] Unify cmake install functions and dynamically set component dependencies
-  [#3368](https://github.com/open-telemetry/opentelemetry-cpp/pull/3368)
-
-* [BUILD] Upgrade nlohmann_json to 3.12.0
-  [#3406](https://github.com/open-telemetry/opentelemetry-cpp/pull/3406)
-
-* [BUILD] Upgrade opentelemetry-proto to 1.6.0
-  [#3407](https://github.com/open-telemetry/opentelemetry-cpp/pull/3407)
-
-* [CMAKE] add generated protobuf headers to the opentelemetry_proto target
-  [#3400](https://github.com/open-telemetry/opentelemetry-cpp/pull/3400)
-
-* [MERGE] Fix accidental rollback of nlohmann-json submodule
-  [#3415](https://github.com/open-telemetry/opentelemetry-cpp/pull/3415)
-
-* Bump fossas/fossa-action from 1.6.0 to 1.7.0
-  [#3414](https://github.com/open-telemetry/opentelemetry-cpp/pull/3414)
-
-* Bump docker/build-push-action from 6.16.0 to 6.17.0
-  [#3420](https://github.com/open-telemetry/opentelemetry-cpp/pull/3420)
-
-* Bump codecov/codecov-action from 5.4.2 to 5.4.3
-  [#3419](https://github.com/open-telemetry/opentelemetry-cpp/pull/3419)
-
-* [SEMANTIC CONVENTIONS] Upgrade semantic conventions to 1.33
-  [#3416](https://github.com/open-telemetry/opentelemetry-cpp/pull/3416)
-
-* [DOCS] update the INSTALL guide on cmake components
-  [#3422](https://github.com/open-telemetry/opentelemetry-cpp/pull/3422)
-
-* Bump github/codeql-action from 3.28.17 to 3.28.18
-  [#3423](https://github.com/open-telemetry/opentelemetry-cpp/pull/3423)
-
-* [CMAKE] update cmake files in examples directory
-  [#3421](https://github.com/open-telemetry/opentelemetry-cpp/pull/3421)
-
-* [SDK] Fix Base2ExponentialHistogramAggregation Merge with empty buckets
-  [#3425](https://github.com/open-telemetry/opentelemetry-cpp/pull/3425)
-
-* [SDK] Fix MetricProducer interface
-  [#3413](https://github.com/open-telemetry/opentelemetry-cpp/pull/3413)
-
-* [CMAKE] remove global include_directories usage and rely on target properties
-  [#3426](https://github.com/open-telemetry/opentelemetry-cpp/pull/3426)
-
-* [BUILD] remove unused WITH_CURL build flag
-  [#3429](https://github.com/open-telemetry/opentelemetry-cpp/pull/3429)
-
-* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.34.0
-  [#3428](https://github.com/open-telemetry/opentelemetry-cpp/pull/3428)
-
-* [EXPORTER] ostream log exporter, fix memory ownership issues
-  [#3417](https://github.com/open-telemetry/opentelemetry-cpp/pull/3417)
-
-* [TEST] add all components to the cmake fetch content test
-  [#3433](https://github.com/open-telemetry/opentelemetry-cpp/pull/3433)
-
-* [BUILD] Error out when building DLL without MSVC
-  [#3438](https://github.com/open-telemetry/opentelemetry-cpp/pull/3438)
-
-* [BUILD] Add missing CMake keyword for target_link_libraries
-  [#3442](https://github.com/open-telemetry/opentelemetry-cpp/pull/3442)
-
-* [CMAKE] Remove third-party version mismatch warning
-  [#3432](https://github.com/open-telemetry/opentelemetry-cpp/pull/3432)
-
-* Bump docker/build-push-action from 6.17.0 to 6.18.0
-  [#3446](https://github.com/open-telemetry/opentelemetry-cpp/pull/3446)
-
-* [SEMANTIC CONVENTIONS] Fix comment style to preserve markup.
-  [#3444](https://github.com/open-telemetry/opentelemetry-cpp/pull/3444)
-
-* [EXPORTER] support unix sockets in grpc client
-  [#3410](https://github.com/open-telemetry/opentelemetry-cpp/pull/3410)
-
-* [BUILD] Propagate INTERFACE_COMPILE_DEFINITIONS from API through common_foo_library
-  [#3440](https://github.com/open-telemetry/opentelemetry-cpp/pull/3440)
-
-New Features:
-
-* [SDK] Base2 exponential histogram aggregation
-  [#3346](https://github.com/open-telemetry/opentelemetry-cpp/pull/3346)
-
-  * Add base2 exponential histogram aggregation. Includes a new aggregation type,
-    ostream exporter, and otlp/grpc exporter. Updated histogram aggregation and
-    benchmark tests.
-
-Important changes:
-
-* [EXPORTER] ostream log exporter, fixed memory ownership issues
-  [#3417](https://github.com/open-telemetry/opentelemetry-cpp/pull/3417)
-
-  * In the SDK, the following classes implementation has changed:
-
-    * opentelemetry::sdk::logs::ReadableLogRecord
-    * opentelemetry::sdk::logs::ReadWriteLogRecord
-
-  * An application implementing a custom log record exporter,
-    that reuses these classes from the opentelemetry-cpp SDK,
-    will need code adjustments, in particular for methods:
-
-    * GetBody()
-    * GetAttributes()
-
-  * Applications not using these SDK classes directly are not affected.
-
-* [BUILD] Remove WITH_ABSEIL
-  [#3318](https://github.com/open-telemetry/opentelemetry-cpp/pull/3318)
-
-  * The build option `WITH_ABSEIL` is no longer used, and opentelemetry-cpp
-    will no longer use any release of abseil provided externally,
-    for its own use.
-
-  * Instead, opentelemetry-cpp will only use an internal abseil version.
-
-  * This change resolves long standing binary integrity issues,
-    that occurred in the past when mixing several versions of abseil
-    in the build.
-
-## [1.20 2025-04-01]
-
-* [BUILD] Update opentelemetry-proto version
-  [#3254](https://github.com/open-telemetry/opentelemetry-cpp/pull/3254)
-
-* [BUILD] Build break with CURL 7.29.0
-  [#3255](https://github.com/open-telemetry/opentelemetry-cpp/pull/3255)
-
-* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.30.0
-  [#3258](https://github.com/open-telemetry/opentelemetry-cpp/pull/3258)
-
-* [SDK] Add tracer scope configurator
-  [#3137](https://github.com/open-telemetry/opentelemetry-cpp/pull/3137)
-
-* [DOC] Add document and example for sharing gRPC Client
-  [#3260](https://github.com/open-telemetry/opentelemetry-cpp/pull/3260)
-
-* [SDK] Fix BatchLogRecordProcessor to instrument shutdown
-  [#3262](https://github.com/open-telemetry/opentelemetry-cpp/pull/3262)
-
-* [SDK] Support OTEL_SDK_DISABLED environment variable
-  [#3245](https://github.com/open-telemetry/opentelemetry-cpp/pull/3245)
-
-* [CI] OTLP in Windows builds
-  [#3263](https://github.com/open-telemetry/opentelemetry-cpp/pull/3263)
-
-* [BUILD] Fixes compatibility of type_traits
-  [#3274](https://github.com/open-telemetry/opentelemetry-cpp/pull/3274)
-
-* [BUILD] Fix compilation with Regex being disabled
-  [#3276](https://github.com/open-telemetry/opentelemetry-cpp/pull/3276)
-
-* [EXPORTER] Support exporting event_name using OTLP Exporter
-  [#3277](https://github.com/open-telemetry/opentelemetry-cpp/pull/3277)
-
-* [CI] Add FOSSA scanning workflow
-  [#3279](https://github.com/open-telemetry/opentelemetry-cpp/pull/3279)
-
-* [BUILD] Adding typecast without whom c++latest build fails
-  [#3281](https://github.com/open-telemetry/opentelemetry-cpp/pull/3281)
-
-* [ADMIN] Add FOSSA badges
-  [#3280](https://github.com/open-telemetry/opentelemetry-cpp/pull/3280)
-
-* [BUILD] Fix compiling problems with abiv2 and MSVC
-  [#3284](https://github.com/open-telemetry/opentelemetry-cpp/pull/3284)
-
-* [BUILD] Enable old behavior of CMP0092
-  [#3269](https://github.com/open-telemetry/opentelemetry-cpp/pull/3269)
-
-* [SDK] Add meter scope configurator
-  [#3268](https://github.com/open-telemetry/opentelemetry-cpp/pull/3268)
-
-* [DEVCONTAINER] Support customization and run as non-root user
-  [#3270](https://github.com/open-telemetry/opentelemetry-cpp/pull/3270)
-
-* [ETW] Add configuration to export 64-bit integer as timestamp
-  [#3286](https://github.com/open-telemetry/opentelemetry-cpp/pull/3286)
-
-* [API] Deprecate event logger
-  [#3285](https://github.com/open-telemetry/opentelemetry-cpp/pull/3285)
-
-* [BUILD] Add link directory to support curl 8.12
-  [#3272](https://github.com/open-telemetry/opentelemetry-cpp/pull/3272)
-
-* [API] Change the param-pack unpacking order to start from left to right
-  [#3296](https://github.com/open-telemetry/opentelemetry-cpp/pull/3296)
-
-* [SDK] Implement spec: MetricFilter
-  [#3235](https://github.com/open-telemetry/opentelemetry-cpp/pull/3235)
-
-* [SEMANTIC CONVENTIONS] Upgrade semantic conventions to 1.31.0
-  [#3297](https://github.com/open-telemetry/opentelemetry-cpp/pull/3297)
-
-* [SDK] Add logger scope configurator
-  [#3282](https://github.com/open-telemetry/opentelemetry-cpp/pull/3282)
-
-* [EXAMPLE] fix buffer overrun in the gRPC sample project
-  [#3304](https://github.com/open-telemetry/opentelemetry-cpp/pull/3304)
-
-* [CI] Bump fossas/fossa-action from 1.5.0 to 1.6.0
-  [#3305](https://github.com/open-telemetry/opentelemetry-cpp/pull/3305)
-
-* [TEST] fix segfault in singleton test with cmake on macos-latest
-  [#3316](https://github.com/open-telemetry/opentelemetry-cpp/pull/3316)
-
-* [TEST] fix test failure with elasticsearch exporter on cxx20
-  [#3308](https://github.com/open-telemetry/opentelemetry-cpp/pull/3308)
-
-* [TEST] otlp grpc exporter retry test fix
-  [#3311](https://github.com/open-telemetry/opentelemetry-cpp/pull/3311)
-
-* [SDK] Use OPENTELEMETRY_EXPORT and static local variables
-  [#3314](https://github.com/open-telemetry/opentelemetry-cpp/pull/3314)
-
-* [BUILD] Fix elasticsearch exporter json compatibility
-  [#3313](https://github.com/open-telemetry/opentelemetry-cpp/pull/3313)
-
-* [BUILD] Fix missing exported definition for OTLP file exporter and forceflush
-  [#3319](https://github.com/open-telemetry/opentelemetry-cpp/pull/3319)
-
-* [BUILD] Remove gRPC header including in OtlpGrpcClientFactory
-  [#3321](https://github.com/open-telemetry/opentelemetry-cpp/pull/3321)
-
-* [ADMIN] Add Pranav Sharma in cpp-approvers
-  [#3323](https://github.com/open-telemetry/opentelemetry-cpp/pull/3323)
-
-* [DEVCONTAINER] fix grpc install
-  [#3325](https://github.com/open-telemetry/opentelemetry-cpp/pull/3325)
-
-* [ADMIN] Add dbarker to approvers
-  [#3331](https://github.com/open-telemetry/opentelemetry-cpp/pull/3331)
-
-* [CI] Upgrade CI to ubuntu 22.04
-  [#3330](https://github.com/open-telemetry/opentelemetry-cpp/pull/3330)
-
-* [CI] Add ossf-scorecard scanning workflow
-  [#3332](https://github.com/open-telemetry/opentelemetry-cpp/pull/3332)
-
-* [CI] pin cmake in ci and devcontainer
-  [#3336](https://github.com/open-telemetry/opentelemetry-cpp/pull/3336)
-
-* [METRICS SDK] Fix hash collision in MetricAttributes
-  [#3322](https://github.com/open-telemetry/opentelemetry-cpp/pull/3322)
-
-Important changes:
-
-* [SDK] Support OTEL_SDK_DISABLED environment variable
-  [#3245](https://github.com/open-telemetry/opentelemetry-cpp/pull/3245)
-
-  * The SDK now exposes the following new methods:
-
-    * opentelemetry::sdk::trace::Provider::SetTracerProvider()
-    * opentelemetry::sdk::metrics::Provider::SetMeterProvider()
-    * opentelemetry::sdk::logs::Provider::SetLoggerProvider()
-
-  * These methods do support the `OTEL_SDK_DISABLED` environment variable,
-    unlike the corresponding existing API Provider classes.
-
-  * Applications are encouraged to migrate from the API to the SDK
-    `Provider` classes, to benefit from this feature.
-
-  * All the example code has been updated to reflect the new usage.
-
-## [1.19 2025-01-22]
-
-* [PROMETHEUS_EXPORTER] Fix default for emitting otel_scope attributes
-  [#3171](https://github.com/open-telemetry/opentelemetry-cpp/pull/3171)
-
-* [Code health] Include what you use cleanup, part 5
-  [#3140](https://github.com/open-telemetry/opentelemetry-cpp/pull/3140)
-
-* [BUILD] Upgrade cmake
-  [#3167](https://github.com/open-telemetry/opentelemetry-cpp/pull/3167)
-
-* [SHIM] Fix string_view mappings between OT and OTel
-  [#3181](https://github.com/open-telemetry/opentelemetry-cpp/pull/3181)
-
-* [EXPORTER] Refactor ElasticSearchRecordable
-  [#3164](https://github.com/open-telemetry/opentelemetry-cpp/pull/3164)
-
-* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.29.0
-  [#3182](https://github.com/open-telemetry/opentelemetry-cpp/pull/3182)
-
-* [BUILD] Fix cross-compilation with protoc
-  [#3186](https://github.com/open-telemetry/opentelemetry-cpp/pull/3186)
-
-* [Code health] Perform cppcheck cleanup
-  [#3150](https://github.com/open-telemetry/opentelemetry-cpp/pull/3150)
-
-* [EXPORTER] add instrumentation scope attributes
-  to otlp proto messages for traces and metrics
-  [#3185](https://github.com/open-telemetry/opentelemetry-cpp/pull/3185)
-
-* [SDK] Tracer provider shutdown blocks in-definitively
-  [#3191](https://github.com/open-telemetry/opentelemetry-cpp/pull/3191)
-
-* [SEMANTIC CONVENTIONS] Upgrade to weaver 0.11.0
-  [#3194](https://github.com/open-telemetry/opentelemetry-cpp/pull/3194)
-
-* [DOC] Update existing maintaining dependencies doc
-  [#3195](https://github.com/open-telemetry/opentelemetry-cpp/pull/3195)
-
-* [TEST] Change is_called_ and got_response_ to use atomic
-  [#3204](https://github.com/open-telemetry/opentelemetry-cpp/pull/3204)
-
-* [SEMANTIC CONVENTIONS] update links to openmetrics to reference the v1.0.0 release
-  [#3205](https://github.com/open-telemetry/opentelemetry-cpp/pull/3205)
-
-* [CI] Fix CI on ubuntu-latest
-  [#3207](https://github.com/open-telemetry/opentelemetry-cpp/pull/3207)
-
-* [BUILD] Build break using protoc 3.14
-  [#3211](https://github.com/open-telemetry/opentelemetry-cpp/pull/3211)
-
-* [TEST] Build the singleton test on windows
-  [#3183](https://github.com/open-telemetry/opentelemetry-cpp/pull/3183)
-
-* [BUILD] Add cxx feature detections
-  [#3203](https://github.com/open-telemetry/opentelemetry-cpp/pull/3203)
-
-* [SDK] Do not frequently create and destroy http client threads
-  [#3198](https://github.com/open-telemetry/opentelemetry-cpp/pull/3198)
-
-* [EXPORTER] Optimize OTLP HTTP compression
-  [#3178](https://github.com/open-telemetry/opentelemetry-cpp/pull/3178)
-
-* [SDK] Fix include instrumentation scope attributes in equal method
-  [#3214](https://github.com/open-telemetry/opentelemetry-cpp/pull/3214)
-
-* Upgrade to opentelemetry-proto 1.5.0
-  [#3210](https://github.com/open-telemetry/opentelemetry-cpp/pull/3210)
-
-* [TEST] Added support for SELINUX in functional tests
-  [#3212](https://github.com/open-telemetry/opentelemetry-cpp/pull/3212)
-
-* [EDITORIAL] fix changelog entry for PR 3185
-  [#3217](https://github.com/open-telemetry/opentelemetry-cpp/pull/3217)
-
-* [TEST] Functional tests for OTLP/gRPC with mutual TLS
-  [#3227](https://github.com/open-telemetry/opentelemetry-cpp/pull/3227)
-
-* [SEMCONV] Metrics are incorrectly prefixed with 'metric'
-  [#3228](https://github.com/open-telemetry/opentelemetry-cpp/pull/3228)
-
-* [BUILD] Add OTLP/file exporter for dll and examples
-  [#3231](https://github.com/open-telemetry/opentelemetry-cpp/pull/3231)
-
-* [Code Health] Include what you use, part 6
-  [#3216](https://github.com/open-telemetry/opentelemetry-cpp/pull/3216)
-
-* [CI] Spurious test failures
-  [#3233](https://github.com/open-telemetry/opentelemetry-cpp/pull/3233)
-
-* [BUILD] Fix error ‘uint8_t’ does not name a type with gcc-15
-  [#3240](https://github.com/open-telemetry/opentelemetry-cpp/pull/3240)
-
-* [EXPORTER] fix throw in OtlpGrpcMetricExporter with shared grpc client
-  [#3243](https://github.com/open-telemetry/opentelemetry-cpp/pull/3243)
-
-* [SDK] Better control of threads executed by opentelemetry-cpp
-  [#3175](https://github.com/open-telemetry/opentelemetry-cpp/pull/3175)
-
-* [Code Health] Include what you use, part 7
-  [#3238](https://github.com/open-telemetry/opentelemetry-cpp/pull/3238)
-
-* [SDK] Fix lifetime of GlobalLogHandler
-  [#3221](https://github.com/open-telemetry/opentelemetry-cpp/pull/3221)
-
-* [MAINTAINER] Add devcontainer
-  [#3123](https://github.com/open-telemetry/opentelemetry-cpp/pull/3123)
-
-* [SDK] enable deriving from ResourceDetector to create a Resource
-  [#3247](https://github.com/open-telemetry/opentelemetry-cpp/pull/3247)
-
-* [EXPORTER] Support handling retry-able errors for OTLP/HTTP
-  [#3223](https://github.com/open-telemetry/opentelemetry-cpp/pull/3223)
-
-* [CI] Add GRPC in maintainer CI
-  [#3248](https://github.com/open-telemetry/opentelemetry-cpp/pull/3248)
-
-* [EXPORTER] Support handling retry-able errors for OTLP/gRPC
-  [#3219](https://github.com/open-telemetry/opentelemetry-cpp/pull/3219)
-
-* [SDK] Optimize Metric Processing for Single Collector with Delta Temporality
-  [#3236](https://github.com/open-telemetry/opentelemetry-cpp/pull/3236)
-
-New features:
-
-* [SDK] Better control of threads executed by opentelemetry-cpp
-  [#3175](https://github.com/open-telemetry/opentelemetry-cpp/pull/3175)
-
-  * This feature provides a way for applications,
-    when configuring the SDK and exporters,
-    to participate in the execution path
-    of internal opentelemetry-cpp threads.
-
-  * The opentelemetry-cpp library provides the following:
-
-    * a new ThreadInstrumentation interface,
-    * new runtime options structures, to optionally configure the SDK:
-      * BatchSpanProcessorRuntimeOptions
-      * PeriodicExportingMetricReaderRuntimeOptions
-      * BatchLogRecordProcessorRuntimeOptions
-    * new runtime options structures,
-      to optionally configure the OTLP HTTP exporters:
-      * OtlpHttpExporterRuntimeOptions
-      * OtlpHttpMetricExporterRuntimeOptions
-      * OtlpHttpLogRecordExporterRuntimeOptions
-    * new ThreadInstrumentation parameters,
-      to optionally configure the CURL HttpClient
-    * new runtime options structures,
-      to optionally configure the OTLP FILE exporters:
-      * OtlpFileExporterRuntimeOptions
-      * OtlpFileMetricExporterRuntimeOptions
-      * OtlpFileLogRecordExporterRuntimeOptions
-    * new runtime options structure,
-      to optionally configure the OTLP FILE client:
-      * OtlpFileClientRuntimeOptions
-
-  * Using the optional runtime options structures,
-    an application can subclass the ThreadInstrumentation interface,
-    and be notified of specific events of interest during the execution
-    of an internal opentelemetry-cpp thread.
-
-  * This allows an application to call, for example:
-
-    * pthread_setaffinity_np(), for better performances,
-    * setns(), to control the network namespace used by HTTP CURL connections
-    * pthread_setname_np(), for better observability from the operating system
-    * many more specific apis, as needed
-
-  * See the documentation for ThreadInstrumentation for details.
-
-  * A new example program, example_otlp_instrumented_http,
-    shows how to use the feature,
-    and add application logic in the thread execution code path.
-
-  * Note that this feature is experimental,
-    protected by a WITH_THREAD_INSTRUMENTATION_PREVIEW
-    flag in CMake. Various runtime options structures,
-    as well as the thread instrumentation interface,
-    may change without notice before this feature is declared stable.
-
-* [EXPORTER] Support handling retry-able errors for OTLP/HTTP
-  [#3223](https://github.com/open-telemetry/opentelemetry-cpp/pull/3223)
-
-  * This feature is experimental,
-    protected by a WITH_OTLP_RETRY_PREVIEW
-    flag in CMake.
-
-* [EXPORTER] Support handling retry-able errors for OTLP/gRPC
-  [#3219](https://github.com/open-telemetry/opentelemetry-cpp/pull/3219)
-
-  * This feature is experimental,
-    protected by a WITH_OTLP_RETRY_PREVIEW
-    flag in CMake.
-
-## [1.18 2024-11-25]
-
-* [EXPORTER] Fix crash in ElasticsearchLogRecordExporter
-  [#3082](https://github.com/open-telemetry/opentelemetry-cpp/pull/3082)
-
-* [BUILD] Avoid buggy warning with gcc <= 8
-  [#3087](https://github.com/open-telemetry/opentelemetry-cpp/pull/3087)
-
-* [API] Jaeger Propagator should not be deprecated
-  [#3086](https://github.com/open-telemetry/opentelemetry-cpp/pull/3086)
-
-* Update bzlmod version
-  [#3093](https://github.com/open-telemetry/opentelemetry-cpp/pull/3093)
-
-* [BUILD] Remove std::make_unique
-  [#3098](https://github.com/open-telemetry/opentelemetry-cpp/pull/3098)
-
-* [BUILD] Fix compiling problems for gcc 4.8
-  [#3100](https://github.com/open-telemetry/opentelemetry-cpp/pull/3100)
-
-* [TEST] Fix linking order and gmock linking
-  [#3106](https://github.com/open-telemetry/opentelemetry-cpp/pull/3106)
-
-* [EXPORTER] Add config options to prometheus exporter
-  [#3104](https://github.com/open-telemetry/opentelemetry-cpp/pull/3104)
-
-* [BUILD] Add a CMake option to disable shared libs
-  [#3095](https://github.com/open-telemetry/opentelemetry-cpp/pull/3095)
-
-* [EXPORTER] Remove out of date ETW exporter doc
-  [#3103](https://github.com/open-telemetry/opentelemetry-cpp/pull/3103)
-
-* [EXPORTER] Add logging for async gRPC errors
-  [#3108](https://github.com/open-telemetry/opentelemetry-cpp/pull/3108)
-
-* [BUILD] Remove aligned_storage from nostd
-  [#3112](https://github.com/open-telemetry/opentelemetry-cpp/pull/3112)
-
-* [EXPORTER] Elastic Search exporter follow ECS guidelines
-  [#3107](https://github.com/open-telemetry/opentelemetry-cpp/pull/3107)
-
-* [INSTALL] Resolve dependencies in opentelemetry-cpp-config.cmake
-  [#3094](https://github.com/open-telemetry/opentelemetry-cpp/pull/3094)
-
-* [API] Add synchronous gauge
-  [#3029](https://github.com/open-telemetry/opentelemetry-cpp/pull/3029)
-
-* [BUILD] allow building with -DWITH_OTLP_HTTP_COMPRESSION=OFF without zlib
-  [#3120](https://github.com/open-telemetry/opentelemetry-cpp/pull/3120)
-
-* [CI] Comment the arm64 CI
-  [#3125](https://github.com/open-telemetry/opentelemetry-cpp/pull/3125)
-
-* [API] Comply with W3C Trace Context
-  [#3115](https://github.com/open-telemetry/opentelemetry-cpp/pull/3115)
-
-* [EXPORTER] bump prometheus to v1.3.0
-  [#3122](https://github.com/open-telemetry/opentelemetry-cpp/pull/3122)
-
-* [EXPORTER] Log SSL Connection Information
-  [#3113](https://github.com/open-telemetry/opentelemetry-cpp/pull/3113)
-
-* [BUILD] Improve how to handle yield() in ARM
-  [#3129](https://github.com/open-telemetry/opentelemetry-cpp/pull/3129)
-
-* [BUILD] Fix -Wmissing-template-arg-list-after-template-kw warning
-  [#3133](https://github.com/open-telemetry/opentelemetry-cpp/pull/3133)
-
-* [EXPORTER]: Elasticsearch exporter put log resource in root instead of under 'resources'
-  [#3131](https://github.com/open-telemetry/opentelemetry-cpp/pull/3131)
-
-* [TEST] Rename w3c_tracecontext_test to w3c_tracecontext_http_test_server
-  [#3132](https://github.com/open-telemetry/opentelemetry-cpp/pull/3132)
-
-* [BUILD] Patches for building on AIX
-  [#3127](https://github.com/open-telemetry/opentelemetry-cpp/pull/3127)
-
-* [SEMANTIC CONVENTIONS] Migration to weaver
-  [#3105](https://github.com/open-telemetry/opentelemetry-cpp/pull/3105)
-
-* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.28.0
-  [#3139](https://github.com/open-telemetry/opentelemetry-cpp/pull/3139)
-
-* [EXPORTER] handling of invalid ports in UrlParser
-  [#3142](https://github.com/open-telemetry/opentelemetry-cpp/pull/3142)
-
-* [CI] speed up clang-tidy workflow
-  [#3148](https://github.com/open-telemetry/opentelemetry-cpp/pull/3148)
-
-* [EXPORTER] Allow to share gRPC clients between OTLP exporters
-  [#3041](https://github.com/open-telemetry/opentelemetry-cpp/pull/3041)
-
-* Bump codecov/codecov-action from 4 to 5
-  [#3143](https://github.com/open-telemetry/opentelemetry-cpp/pull/3143)
-
-* [CI] Add cppcheck in the build
-  [#3151](https://github.com/open-telemetry/opentelemetry-cpp/pull/3151)
-
-* [BUILD] Fix error message
-  [#3152](https://github.com/open-telemetry/opentelemetry-cpp/pull/3152)
-
-* [EXPORTER] fix clang-tidy warnings in UrlParser
-  [#3146](https://github.com/open-telemetry/opentelemetry-cpp/pull/3146)
-
-* [EXPORTER] Upgrade to opentelemetry-proto 1.4.0
-  [#3157](https://github.com/open-telemetry/opentelemetry-cpp/pull/3157)
-
-* [TEST] refactor UrlParser tests to use value-paramterized tests
-  [#3153](https://github.com/open-telemetry/opentelemetry-cpp/pull/3153)
-
-* [TEST] add a test for ElasticSearchRecordable
-  [#3154](https://github.com/open-telemetry/opentelemetry-cpp/pull/3154)
-
-* [BUILD] Fix missing dependency on protoc compiler
-  [#3159](https://github.com/open-telemetry/opentelemetry-cpp/pull/3159)
-
-* [bazel] Update prometheus-cpp in MODULE.bazel
-  [#3162](https://github.com/open-telemetry/opentelemetry-cpp/pull/3162)
-
-* [bazel] Enable --incompatible_disallow_empty_glob
-  [#2642](https://github.com/open-telemetry/opentelemetry-cpp/pull/2642)
-
-* [INSTALL] Fix cmake/opentelemetry-cpp-config.cmake.in
-  [#3165](https://github.com/open-telemetry/opentelemetry-cpp/pull/3165)
-
-* [BUILD] Do not set OTELCPP_PROTO_PATH in the CMake cache
-  [#3160](https://github.com/open-telemetry/opentelemetry-cpp/pull/3160)
-
-* [BUILD] Fix build for esp32
-  [#3155](https://github.com/open-telemetry/opentelemetry-cpp/pull/3155)
-
-* [bazel] Update opentelemetry-proto in MODULE.bazel
-  [#3163](https://github.com/open-telemetry/opentelemetry-cpp/pull/3163)
-
-Important changes:
-
-* [API] Jaeger Propagator should not be deprecated
-  [#3086](https://github.com/open-telemetry/opentelemetry-cpp/pull/3086)
-
-  * Deprecation of the Jaeger propagator, as announced on 2023-01-31
-    in version 1.8.2, is now reverted.
-  * This deprecation turned out to be not justified,
-    as the Jaeger propagator can be used without the (now removed)
-    Jaeger exporter.
-
-* [EXPORTER] Change log resources location for ElasticsearchLogRecordExporter
-  [#3119](https://github.com/open-telemetry/opentelemetry-cpp/pull/3131)
-
-  * Moved from `root/resources` to `root`
-
-* [SEMANTIC CONVENTIONS] Migration to weaver
-  [#3105](https://github.com/open-telemetry/opentelemetry-cpp/pull/3105)
-
-  * `semantic_convention.h` header files are deprecated,
-    replaced by `semconv/xxx_attributes.h` header files,
-    for each `xxx` semantic attribute group.
-  * See file DEPRECATED.md for details.
-
-Deprecations:
-
-* This release contains deprecations, see file DEPRECATED.md for details.
-
-## [1.17 2024-10-07]
-
-* [CI] Add a clang-tidy build
-  [#3001](https://github.com/open-telemetry/opentelemetry-cpp/pull/3001)
-
-* [BUILD] Upgrade to opentelemetry-proto 1.3.2
-  [#2991](https://github.com/open-telemetry/opentelemetry-cpp/pull/2991)
-
-* [REMOVAL] Remove build option `WITH_DEPRECATED_SDK_FACTORY`
-  [#2717](https://github.com/open-telemetry/opentelemetry-cpp/pull/2717)
-
-* [EXPORTER] ForceFlush before canceling the running requests on shutdown
-  [#2727](https://github.com/open-telemetry/opentelemetry-cpp/pull/2727)
-
-* [SDK] Fix crash in PeriodicExportingMetricReader
-  [#2983](https://github.com/open-telemetry/opentelemetry-cpp/pull/2983)
-
-* [SDK] Fix memory leak in TlsRandomNumberGenerator() constructor
-  [#2661](https://github.com/open-telemetry/opentelemetry-cpp/pull/2661)
-
-* [EXPORTER] Ignore exception when create thread in OTLP file exporter
-  [#3012](https://github.com/open-telemetry/opentelemetry-cpp/pull/3012)
-
-* [BUILD] Update the version in MODULE.bazel
-  [#3015](https://github.com/open-telemetry/opentelemetry-cpp/pull/3015)
-
-* [BUILD] Fix build without vcpkg on Windows when gRPC is disabled
-  [#3016](https://github.com/open-telemetry/opentelemetry-cpp/pull/3016)
-
-* [BUILD] Add abi_version_no bazel flag
-  [#3020](https://github.com/open-telemetry/opentelemetry-cpp/pull/3020)
-
-* [Code health] Expand iwyu coverage to include unit tests
-  [#3022](https://github.com/open-telemetry/opentelemetry-cpp/pull/3022)
-
-* [BUILD] Version opentelemetry_proto/proto_grpc shared libraries
-  [#2992](https://github.com/open-telemetry/opentelemetry-cpp/pull/2992)
-
-* [SEMANTIC CONVENTIONS] Upgrade semantic conventions to 1.27.0
-  [#3023](https://github.com/open-telemetry/opentelemetry-cpp/pull/3023)
-
-* [SDK] Support empty histogram buckets
-  [#3027](https://github.com/open-telemetry/opentelemetry-cpp/pull/3027)
-
-* [TEST] Fix sync problems in OTLP File exporter tests
-  [#3031](https://github.com/open-telemetry/opentelemetry-cpp/pull/3031)
-
-* [SDK] PeriodicExportingMetricReader: future is never set, blocks until timeout
-  [#3030](https://github.com/open-telemetry/opentelemetry-cpp/pull/3030)
-
-* [Code Health] Clang Tidy cleanup, Part 2
-  [#3038](https://github.com/open-telemetry/opentelemetry-cpp/pull/3038)
-
-* [Code Health] include-what-you-use cleanup, part 3
-  [#3004](https://github.com/open-telemetry/opentelemetry-cpp/pull/3004)
-
-* [SDK] Fix overflow in timeout logic
-  [#3046](https://github.com/open-telemetry/opentelemetry-cpp/pull/3046)
-
-* [TEST] Add missing tests to Bazel build
-  [#3045](https://github.com/open-telemetry/opentelemetry-cpp/pull/3045)
-
-* [TEST] update collector tests with debug exporter
-  [#3050](https://github.com/open-telemetry/opentelemetry-cpp/pull/3050)
-
-* [EXAMPLE] update collector example with debug exporter
-  [#3049](https://github.com/open-telemetry/opentelemetry-cpp/pull/3049)
-
-* [TEST] update references to logging exporter
-  [#3053](https://github.com/open-telemetry/opentelemetry-cpp/pull/3053)
-
-* [EXAMPLE] Clean the tracer initialization in OStream example
-  [#3051](https://github.com/open-telemetry/opentelemetry-cpp/pull/3051)
-
-* [EXPORTER] Fix the format of SpanLink for ETW
-  [#3054](https://github.com/open-telemetry/opentelemetry-cpp/pull/3054)
-
-* [EXPORTER] Add in-memory metric exporter
-  [#3043](https://github.com/open-telemetry/opentelemetry-cpp/pull/3043)
-
-* [Code Health] include-what-you-use cleanup, part 4
-  [#3040](https://github.com/open-telemetry/opentelemetry-cpp/pull/3040)
-
-* [BUILD] add loongarch info
-  [#3052](https://github.com/open-telemetry/opentelemetry-cpp/pull/3052)
-
-* [CI] Update otel-collector version
-  [#3067](https://github.com/open-telemetry/opentelemetry-cpp/pull/3067)
-
-* [SDK] Update MetricProducer interface to match spec
-  [#3044](https://github.com/open-telemetry/opentelemetry-cpp/pull/3044)
-
-* [EXPORTER] Fix URL in ES exporter, fix ipv6 supporting for http client
-  [#3081](https://github.com/open-telemetry/opentelemetry-cpp/pull/3081)
-
-* [EXPORTER] Add HttpHeaders in ElasticsearchLogRecordExporter
-  [#3083](https://github.com/open-telemetry/opentelemetry-cpp/pull/3083)
-
-Breaking changes:
-
-* [REMOVAL] Remove build option `WITH_DEPRECATED_SDK_FACTORY`
-  [#2717](https://github.com/open-telemetry/opentelemetry-cpp/pull/2717)
-
-  * As announced in opentelemetry-cpp previous release 1.16.0,
-    CMake option `WITH_DEPRECATED_SDK_FACTORY` was temporary,
-    and to be removed by the next release.
-  * This option is now removed.
-  * Code configuring the SDK must be adjusted, as previously described:
-
-    * [API/SDK] Provider cleanup
-      [#2664](https://github.com/open-telemetry/opentelemetry-cpp/pull/2664)
-
-    * Before this fix:
-      * SDK factory methods such as:
-        * opentelemetry::sdk::trace::TracerProviderFactory::Create()
-        * opentelemetry::sdk::metrics::MeterProviderFactory::Create()
-        * opentelemetry::sdk::logs::LoggerProviderFactory::Create()
-        * opentelemetry::sdk::logs::EventLoggerProviderFactory::Create()
-
-        returned an API object (opentelemetry::trace::TracerProvider)
-          to the caller.
-
-    * After this fix, these methods return an SDK level object
-      (opentelemetry::sdk::trace::TracerProvider) to the caller.
-    * Returning an SDK object is necessary for the application to
-      cleanup and invoke SDK level methods, such as ForceFlush(),
-      on a provider.
-    * The application code that configures the SDK, by calling
-      the various provider factories, may need adjustment.
-    * All the examples have been updated, and in particular no
-      longer perform static_cast do convert an API object to an SDK object.
-      Please refer to examples for guidance on how to adjust.
-
-## [1.16.1 2024-07-17]
-
-* [BUILD] Add bazel missing BUILD file
-  [#2720](https://github.com/open-telemetry/opentelemetry-cpp/pull/2720)
-
-* [SDK] Added reserve for spans array in BatchSpanProcessor.
-  [#2724](https://github.com/open-telemetry/opentelemetry-cpp/pull/2724)
-
-* [DOC] Update "Using triplets" section in building-with-vcpkg documentation.
-  [#2726](https://github.com/open-telemetry/opentelemetry-cpp/pull/2726)
-
-* [DOC] Remove comment for unused LoggerProvider initialization params
-  [#2972](https://github.com/open-telemetry/opentelemetry-cpp/pull/2972)
-
-* [SECURITY] Remove OTLP HTTP support for TLS 1.0 and TLS 1.1,
-  require TLS 1.2 or better
-  [#2722](https://github.com/open-telemetry/opentelemetry-cpp/pull/2722)
-
-* [TEST] Fix opentelemetry-collector bind address
-  [#2989](https://github.com/open-telemetry/opentelemetry-cpp/pull/2989)
-
-* [EXPORTER] Fix references in AttributeValueVisitor
-  [#2985](https://github.com/open-telemetry/opentelemetry-cpp/pull/2985)
-
-* [Code health] include-what-you-use cleanup, part 2
-  [#2704](https://github.com/open-telemetry/opentelemetry-cpp/pull/2704)
-
-* [Code Health] clang-tidy cleanup, part 1
-  [#2990](https://github.com/open-telemetry/opentelemetry-cpp/pull/2990)
-
-* [CI] Build failures with ABSEIL 20240116 and CMAKE 3.30
-  [#3002](https://github.com/open-telemetry/opentelemetry-cpp/pull/3002)
-
-* [CI] Enable bzlmod
-  [#2995](https://github.com/open-telemetry/opentelemetry-cpp/pull/2995)
-
-* [Metrics SDK] Fix hash calculation for nostd::string
-  [#2999](https://github.com/open-telemetry/opentelemetry-cpp/pull/2999)
-
-Breaking changes:
-
-* [SECURITY] Remove OTLP HTTP support for TLS 1.0 and TLS 1.1,
-  require TLS 1.2 or better
-  [#2722](https://github.com/open-telemetry/opentelemetry-cpp/pull/2722)
-  * The OTLP HTTP exporter no longer accept options like:
-    * min_TLS = 1.0
-    * min_TLS = 1.1
-    * max_TLS = 1.0
-    * max_TLS = 1.1
-  * When connecting to an OTLP HTTP endpoint, using `https`,
-    the connection will require TLS 1.2 by default,
-    unless min_TLS is set to 1.3
-  * Plain `http` connections (insecure) are not affected.
-
-## [1.16.0] 2024-06-21
-
-* [BUILD] Upgrade bazel abseil from 20220623.1 to 20230802.2
-  [#2650](https://github.com/open-telemetry/opentelemetry-cpp/pull/2650)
-* [BUILD] Use nostd::enable_if_t instead of std::enable_if_t
-  [#2648](https://github.com/open-telemetry/opentelemetry-cpp/pull/2648)
-* [EXEMPLAR] Update ExemplarFilter and ExemplarReservoir for spec
-  [#2372](https://github.com/open-telemetry/opentelemetry-cpp/pull/2372)
-* [BUILD] Link CoreFoundation on apple systems
-  [#2655](https://github.com/open-telemetry/opentelemetry-cpp/pull/2655)
-* [SDK] Avoid missing conditional variable update and simplify atomic bool
-  [#2553](https://github.com/open-telemetry/opentelemetry-cpp/pull/2553)
-* [BUILD] Build break in OLTP_FILE tests
-  [#2659](https://github.com/open-telemetry/opentelemetry-cpp/pull/2659)
-* [EXPORTER] General cleanup for is_shutdown flags in exporters.
-  [#2663](https://github.com/open-telemetry/opentelemetry-cpp/pull/2663)
-* [CI] Upgrade Maintainers CI to ubuntu-24.04
-  [#2670](https://github.com/open-telemetry/opentelemetry-cpp/pull/2670)
-* [BUILD] Upgrade to opentelemetry-proto 1.3.1
-  [#2669](https://github.com/open-telemetry/opentelemetry-cpp/pull/2669)
-* [API] Return NoopLogRecord from NoopLogger
-  [#2668](https://github.com/open-telemetry/opentelemetry-cpp/pull/2668)
-* [BUILD] Remove the hard-coded separator in tracestate
-  [#2672](https://github.com/open-telemetry/opentelemetry-cpp/pull/2672)
-* [SDK] Fix forceflush may wait for ever
-  [#2584](https://github.com/open-telemetry/opentelemetry-cpp/pull/2584)
-* [API] DO not allow unsafe Logger::EmitLogRecord
-  [#2673](https://github.com/open-telemetry/opentelemetry-cpp/pull/2673)
-* [BUILD] Read default proto version from third_party_release
-  [#2677](https://github.com/open-telemetry/opentelemetry-cpp/pull/2677)
-* [CI] include-what-you-use
-  [#2629](https://github.com/open-telemetry/opentelemetry-cpp/pull/2629)
-* [CI] Upgrade to clang-format 18
-  [#2684](https://github.com/open-telemetry/opentelemetry-cpp/pull/2684)
-* [CI] Fix CI failures on Ubuntu 24.04
-  [#2686](https://github.com/open-telemetry/opentelemetry-cpp/pull/2686)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.26.0
-  [#2687](https://github.com/open-telemetry/opentelemetry-cpp/pull/2687)
-* [API/SDK] Provider cleanup
-  [#2664](https://github.com/open-telemetry/opentelemetry-cpp/pull/2664)
-* [ETW] Add table name mapping for Logs other than the default Log table
-  [#2691](https://github.com/open-telemetry/opentelemetry-cpp/pull/2691)
-* [CI] Remove benchmark overlay for vcpkg
-  [#2695](https://github.com/open-telemetry/opentelemetry-cpp/pull/2695)
-* [BUILD] Remove the incorrect set of CMAKE_MSVC_RUNTIME_LIBRARY for vcpkg
-  [#2696](https://github.com/open-telemetry/opentelemetry-cpp/pull/2696)
-* [BUILD] CMakeLists.txt: Enable CMAKE_MSVC_RUNTIME_LIBRARY support
-  [#2652](https://github.com/open-telemetry/opentelemetry-cpp/pull/2652)
-* [EXPORTER] OTLP file: use thread-safe file/io
-  [#2675](https://github.com/open-telemetry/opentelemetry-cpp/pull/2675)
-* [bazel] Bump version and deps
-  [#2679](https://github.com/open-telemetry/opentelemetry-cpp/pull/2679)
-* [BUILD] Add support for bzlmod
-  [#2608](https://github.com/open-telemetry/opentelemetry-cpp/pull/2608)
-* [BUILD] Fix Import Abseil-cpp
-  [#2701](https://github.com/open-telemetry/opentelemetry-cpp/pull/2701)
-* [Code health] include-what-you-use cleanup
-  [#2692](https://github.com/open-telemetry/opentelemetry-cpp/pull/2692)
-* [BUILD] Restore Bazel flag removed from public API
-  [#2702](https://github.com/open-telemetry/opentelemetry-cpp/pull/2702)
-* [DOC] Fix typo tace_id -> trace_id in logger.h
-  [#2703](https://github.com/open-telemetry/opentelemetry-cpp/pull/2703)
-* Bump docker/build-push-action from 5 to 6
-  [#2705](https://github.com/open-telemetry/opentelemetry-cpp/pull/2705)
-* [CI] Enable ARM64 build in CI
-  [#2699](https://github.com/open-telemetry/opentelemetry-cpp/pull/2699)
-* [Code health] Remove Unicode Text from Source files
-  [#2707](https://github.com/open-telemetry/opentelemetry-cpp/pull/2707)
-* [BUILD] Add option WITH_OTLP_GRPC_SSL_MTLS_PREVIEW
-  [#2714](https://github.com/open-telemetry/opentelemetry-cpp/pull/2714)
-* [EXPORTER] All 2xx return codes should be considered successful.
-  [#2712](https://github.com/open-telemetry/opentelemetry-cpp/pull/2712)
-
-Important changes:
-
-* [API/SDK] Provider cleanup
-  [#2664](https://github.com/open-telemetry/opentelemetry-cpp/pull/2664)
-  * Before this fix:
-    * The API class `opentelemetry::trace::Tracer` exposed methods such
-      as `ForceFlush()`, `ForceFlushWithMicroseconds()`, `Close()`
-      and `CloseWithMicroseconds()`.
-    * These methods are meant to be used when configuring the SDK,
-      and should not be part of the API. Exposing them was an oversight.
-    * Two of these methods are virtual, and therefore part of the ABI.
-  * After this fix:
-    * In `OPENTELEMETRY_ABI_VERSION_NO 1`, nothing is changed,
-      because removing this code would break the ABI.
-    * In `OPENTELEMETRY_ABI_VERSION_NO 2`, these methods are moved
-      from the API to the SDK. This is a breaking change for ABI version 2,
-      which is still experimental.
-  * In all cases, instrumenting an application should not
-    invoke flush or close on a tracer, do not use these methods.
-
-Breaking changes:
-
-* [API/SDK] Provider cleanup
-  [#2664](https://github.com/open-telemetry/opentelemetry-cpp/pull/2664)
-  * Before this fix:
-    * SDK factory methods such as:
-      * opentelemetry::sdk::trace::TracerProviderFactory::Create()
-      * opentelemetry::sdk::metrics::MeterProviderFactory::Create()
-      * opentelemetry::sdk::logs::LoggerProviderFactory::Create()
-      * opentelemetry::sdk::logs::EventLoggerProviderFactory::Create()
-      returned an API object (opentelemetry::trace::TracerProvider)
-      to the caller.
-  * After this fix, these methods return an SDK level object
-    (opentelemetry::sdk::trace::TracerProvider) to the caller.
-  * Returning an SDK object is necessary for the application to
-    cleanup and invoke SDK level methods, such as ForceFlush(),
-    on a provider.
-  * The application code that configures the SDK, by calling
-    the various provider factories, may need adjustment.
-  * All the examples have been updated, and in particular no
-    longer perform static_cast do convert an API object to an SDK object.
-    Please refer to examples for guidance on how to adjust.
-  * If adjusting application code is impractical,
-    an alternate and temporary solution is to build with option
-    WITH_DEPRECATED_SDK_FACTORY=ON in CMake.
-  * Option WITH_DEPRECATED_SDK_FACTORY=ON will allow to build code
-    without application changes, posponing changes for later.
-  * WITH_DEPRECATED_SDK_FACTORY=ON is temporary, only to provide
-    an easier migration path. Expect this flag to be removed,
-    as early as by the next release.
-
-Notes on experimental features:
-
-* [#2372](https://github.com/open-telemetry/opentelemetry-cpp/issues/2372)
-  introduced `MeterProvider::SetExemplar()` which accepts en
-  `ExemplarFilterType` enumeration with `kAlwaysOff`, `kAlwaysOn` and
-  `kTraceBased`.
-
-## [1.15.0] 2024-04-21
-
-* [EXPORTER] Change OTLP HTTP content_type default to binary
-  [#2564](https://github.com/open-telemetry/opentelemetry-cpp/pull/2564)
-* [DOC] Fix OTLP documentation: Default endpoint is wrong for OTLP/HTTP
-  [#2560](https://github.com/open-telemetry/opentelemetry-cpp/pull/2560)
-* [BUILD] Fix old style cast warning
-  [#2567](https://github.com/open-telemetry/opentelemetry-cpp/pull/2567)
-* [EXPORTER] Gzip compression support for OTLP/HTTP and OTLP/gRPC exporter
-  [#2530](https://github.com/open-telemetry/opentelemetry-cpp/pull/2530)
-* [BUILD] update vcpkg submodule to 2024.02.14
-  [#2575](https://github.com/open-telemetry/opentelemetry-cpp/pull/2575)
-* [SDK] Support for OTEL_SERVICE_NAME
-  [#2577](https://github.com/open-telemetry/opentelemetry-cpp/pull/2577)
-* [EXPORTER] Support URL-encoded values for `OTEL_EXPORTER_OTLP_HEADERS`
-  [#2579](https://github.com/open-telemetry/opentelemetry-cpp/pull/2579)
-* [BUILD] CMake cleanup for message()
-  [#2582](https://github.com/open-telemetry/opentelemetry-cpp/pull/2582)
-* [BUILD] Bump CMake minimum required version to 3.9
-  [#2581](https://github.com/open-telemetry/opentelemetry-cpp/pull/2581)
-* [BUILD] Provide LIKELY / UNLIKELY macros
-  [#2580](https://github.com/open-telemetry/opentelemetry-cpp/pull/2580)
-* [EXPORTER] OTLP: Fix missing ResourceMetrics SchemaURL
-  [#2587](https://github.com/open-telemetry/opentelemetry-cpp/pull/2587)
-* [ETW] cleanup include path
-  [#2594](https://github.com/open-telemetry/opentelemetry-cpp/pull/2594)
-* Upgrade to googletest 1.14.0
-  [#2596](https://github.com/open-telemetry/opentelemetry-cpp/pull/2596)
-* Upgrade to nlohmann_json 3.11.3
-  [#2595](https://github.com/open-telemetry/opentelemetry-cpp/pull/2595)
-* [BAZEL] Move -std=c++14 to .bazelrc
-  [#2600](https://github.com/open-telemetry/opentelemetry-cpp/pull/2600)
-* [BAZEL] Fix -std=c++14 warning on Windows
-  [#2601](https://github.com/open-telemetry/opentelemetry-cpp/pull/2601)
-* Upgrade to benchmark 1.8.3
-  [#2597](https://github.com/open-telemetry/opentelemetry-cpp/pull/2597)
-* Upgrade to prometheus 1.2.4
-  [#2598](https://github.com/open-telemetry/opentelemetry-cpp/pull/2598)
-* [DOC] Fix typo: Asynchronouse -> Asynchronous in meter.h
-  [#2604](https://github.com/open-telemetry/opentelemetry-cpp/pull/2604)
-* [BUILD] Do not link prometheus-cpp::util when it doesn't exist
-  [#2606](https://github.com/open-telemetry/opentelemetry-cpp/pull/2606)
-* [SDK] Remove unused variable
-  [#2609](https://github.com/open-telemetry/opentelemetry-cpp/pull/2609)
-* [METRICS SDK] Remove extra OfferMeasurement call
-  in SyncMetricsStorage::OfferMeasurement
-  [#2610](https://github.com/open-telemetry/opentelemetry-cpp/pull/2610)
-* [MISC] Use set -e on all shell scripts and pass shellcheck --severity=error
-  [#2616](https://github.com/open-telemetry/opentelemetry-cpp/pull/2616)
-* [CI] Add shellcheck --severity=error as a CI step
-  [#2618](https://github.com/open-telemetry/opentelemetry-cpp/pull/2618)
-* [CI] Upgrade to abseil 20240116.1 (CMake only)
-  [#2599](https://github.com/open-telemetry/opentelemetry-cpp/pull/2599)
-* [CI] Benchmark, provide units with --benchmark_min_time
-  [#2621](https://github.com/open-telemetry/opentelemetry-cpp/pull/2621)
-* [EXPORTER] OTLP file exporter
-  [#2540](https://github.com/open-telemetry/opentelemetry-cpp/pull/2540)
-* [CI] Use platform CMake
-  [#2627](https://github.com/open-telemetry/opentelemetry-cpp/pull/2627)
-* [PROTO] Upgrade to opentelemetry-proto 1.2.0
-  [#2631](https://github.com/open-telemetry/opentelemetry-cpp/pull/2631)
-* [SDK] DefaultLogHandler to print errors to std::cerr, add LogLevel::None
-  [#2622](https://github.com/open-telemetry/opentelemetry-cpp/pull/2622)
-* [SEMANTIC CONVENTIONS] Upgrade to semantic convention 1.25.0
-  [#2633](https://github.com/open-telemetry/opentelemetry-cpp/pull/2633)
-* [DOC] Add readme and examples for OTLP FILE exporters.
-  [#2638](https://github.com/open-telemetry/opentelemetry-cpp/pull/2638)
-* [SEMANTIC CONVENTIONS] Rework on semantic conventions 1.25.0
-  [#2640](https://github.com/open-telemetry/opentelemetry-cpp/pull/2640)
-* [DOC] Update INSTALL.md
-  [#2592](https://github.com/open-telemetry/opentelemetry-cpp/pull/2592)
-
-Important changes:
-
-* [EXPORTER] Gzip compression support for OTLP/HTTP and OTLP/gRPC exporter
-  [#2530](https://github.com/open-telemetry/opentelemetry-cpp/pull/2530)
-  * In the `OtlpHttpExporterOptions` and `OtlpGrpcExporterOptions`, a new
-    field called compression has been introduced. This field can be set
-    to "gzip” to enable gzip compression.
-  * The CMake option `WITH_OTLP_HTTP_COMPRESSION` is introduced to enable
-    gzip compression support for the OTLP HTTP Exporter and includes a
-    dependency on zlib.
-* [SDK] Change OTLP HTTP content_type default to binary
-  [#2558](https://github.com/open-telemetry/opentelemetry-cpp/pull/2558)
-* [CI] Use platform CMake
-  [#2627](https://github.com/open-telemetry/opentelemetry-cpp/pull/2627)
-  * The `CI` in github no longer install a different version of `cmake`.
-  * It now always use the `cmake` provided by the platform.
-  * As part of this change, the script `ci/setup_cmake.sh` was renamed
-    to `ci/setup_googletest.sh`, for clarity, now that this script
-    only installs googletest.
-* [SDK] DefaultLogHandler to print to std::cerr, add LogLevel::None
-  [#2622](https://github.com/open-telemetry/opentelemetry-cpp/pull/2622)
-  * Change DefaultLogHandler output
-    * Before, the default internal logger, DefaultLogHandler,
-      used to print to std::cout.
-    * Now, DefaultLogHandler prints errors and warnings to std::cerr,
-      as expected, while printing info and debug messages to std::cout.
-    * Applications that expected to find the opentelemetry-cpp internal
-      error log in std::cout may need adjustments, either by looking
-      at std::cerr instead, or by using a custom log handler.
-  * Additional LogLevel::None
-    * LogLevel::None is a new supported log level, which does not print
-      any message.
-    * Custom log handlers may need to implement a new case, to avoid
-      compiler warnings.
-    * Numbering of log levels like OTEL_INTERNAL_LOG_LEVEL_ERROR
-      has changed, which requires to rebuild, as the SDK ABI differs.
-
-## [1.14.2] 2024-02-27
-
-* [SDK] Fix observable attributes drop
-   [#2557](https://github.com/open-telemetry/opentelemetry-cpp/pull/2557)
-
-## [1.14.1] 2024-02-23
-
-* [SDK] Restore Recordable API compatibility with versions < 1.14.0
-  [#2547](https://github.com/open-telemetry/opentelemetry-cpp/pull/2547)
-* [DOC] Add missing CHANGELOG.
-  [#2549](https://github.com/open-telemetry/opentelemetry-cpp/pull/2549)
-* [EXPORTER] Error when grpc endpoint is empty
-  [#2507](https://github.com/open-telemetry/opentelemetry-cpp/pull/2507)
-* [DOC] Fix typo in benchmarks.rst
-  [#2542](https://github.com/open-telemetry/opentelemetry-cpp/pull/2542)
-
-Important changes:
-
-* [SDK] Restore Recordable API compatibility with versions < 1.14.0
-  [#2547](https://github.com/open-telemetry/opentelemetry-cpp/pull/2547)
-  * For third party _extending_ the SDK, release 1.14.0 introduced
-    an API breaking change compared to 1.13.0
-  * This fix restores API (but not ABI) compatibility of
-    release 1.14.1 with release 1.13.0.
-  * This allows to build a third party exporter with no source code changes,
-    for both releases 1.14.1 and 1.13.0.
-
-## [1.14.0] 2024-02-16
-
-* [BUILD] Add DLL build CI pipeline with CXX20
-  [#2465](https://github.com/open-telemetry/opentelemetry-cpp/pull/2465)
-* [EXPORTER] Set `is_monotonic` flag for Observable Counters
-  [#2478](https://github.com/open-telemetry/opentelemetry-cpp/pull/2478)
-* [PROTO] Upgrade to opentelemetry-proto v1.1.0
-  [#2488](https://github.com/open-telemetry/opentelemetry-cpp/pull/2488)
-* [BUILD] Introduce CXX 20 CI pipeline for MSVC/Windows
-  [#2450](https://github.com/open-telemetry/opentelemetry-cpp/pull/2450)
-* [API] Propagation: fix for hex conversion to binary for odd hex strings
-  [#2533](https://github.com/open-telemetry/opentelemetry-cpp/pull/2533)
-* [DOC] Fix calendar link
-  [#2532](https://github.com/open-telemetry/opentelemetry-cpp/pull/2532)
-* [ETW EXPORTER] Remove namespace using in ETW exporter which affects global
-  namespace
-  [#2531](https://github.com/open-telemetry/opentelemetry-cpp/pull/2531)
-* [BUILD] Don't invoke vcpkg from this repo with CMAKE_TOOLCHAIN_FILE set
-  [#2527](https://github.com/open-telemetry/opentelemetry-cpp/pull/2527)
-* [EXPORTER] Async exporting for otlp grpc
-  [#2407](https://github.com/open-telemetry/opentelemetry-cpp/pull/2407)
-* [METRICS SDK] Fix attribute filtering for synchronous instruments.
-  [#2472](https://github.com/open-telemetry/opentelemetry-cpp/pull/2472)
-* [BUILD] Better handling of OPENTELEMETRY_STL_VERSION under Bazel.
-  [#2503](https://github.com/open-telemetry/opentelemetry-cpp/pull/2503)
-* [DOC] Fixes CI markdown error MD055 - Table pipe style
-  [#2517](https://github.com/open-telemetry/opentelemetry-cpp/pull/2517)
-* [API] Propagators: do not overwrite the active span with a default invalid
-  span [#2511](https://github.com/open-telemetry/opentelemetry-cpp/pull/2511)
-* [BUILD] Updated the recorded vcpkg submodule version
-  [#2513](https://github.com/open-telemetry/opentelemetry-cpp/pull/2513)
-* [BUILD] Remove unnecessary usage/includes of nostd/type_traits
-  [#2509](https://github.com/open-telemetry/opentelemetry-cpp/pull/2509)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.24.0
-  [#2461](https://github.com/open-telemetry/opentelemetry-cpp/pull/2461)
-* [EXAMPLES] Improve readme of Metrics example
-  [#2510](https://github.com/open-telemetry/opentelemetry-cpp/pull/2510)
-* [BUILD] Clang-15 warning about `__has_trivial_destructor`
-  [#2502](https://github.com/open-telemetry/opentelemetry-cpp/pull/2502)
-* [BUILD] Fix multiple assignment operators for SpinLockMutex
-  [#2501](https://github.com/open-telemetry/opentelemetry-cpp/pull/2501)
-* [BUILD] Alternative way of exporting symbols (generating .def file)
-  [#2476](https://github.com/open-telemetry/opentelemetry-cpp/pull/2476)
-* [CI] Make cmake.c++20*.test actually use C++20 and add cmake.c++23*.test
-  [#2496](https://github.com/open-telemetry/opentelemetry-cpp/pull/2496)
-* [DOCUMENTATION] Add api reference documentation for logs
-  [#2497](https://github.com/open-telemetry/opentelemetry-cpp/pull/2497)
-* [BUILD] Fix variable shadow
-  [#2498](https://github.com/open-telemetry/opentelemetry-cpp/pull/2498)
-* [BUILD] Fix checks on __cplusplus under MSVC, do not assume /Zc
-  [#2493](https://github.com/open-telemetry/opentelemetry-cpp/pull/2493)
-* [EXAMPLES] Use logs API instead of logs bridge API in the example
-  [#2494](https://github.com/open-telemetry/opentelemetry-cpp/pull/2494)
-* [EXPORTER] Fix forward protocol encoding for ETW exporter
-  [#2473](https://github.com/open-telemetry/opentelemetry-cpp/pull/2473)
-* [BUILD] Skip patch alias target
-  [#2457](https://github.com/open-telemetry/opentelemetry-cpp/pull/2457)
-* [EXPORTER] Rename populate_otel_scope to without_otel_scope
-  [#2479](https://github.com/open-telemetry/opentelemetry-cpp/pull/2479)
-* [EXPORTER SDK] Additional fixes after NOMINMAX removal on Windows
-  [#2475](https://github.com/open-telemetry/opentelemetry-cpp/pull/2475)
-* [EXPORTER] Do not use regex in `CleanUpString` because some implementations of
-  STL may crash.
-  [#2464](https://github.com/open-telemetry/opentelemetry-cpp/pull/2464)
-* [EXPORTER] Fix Aggregation type detection in OTLP Exporter
-  [#2467](https://github.com/open-telemetry/opentelemetry-cpp/pull/2467)
-* [EXPORTER] Add option to disable Prometheus otel_scope_name and
-  otel_scope_version attributes
-  [#2451](https://github.com/open-telemetry/opentelemetry-cpp/pull/2451)
-* [SEMANTIC CONVENTIONS] Code generation script fails on SELINUX
-  [#2455](https://github.com/open-telemetry/opentelemetry-cpp/pull/2455)
-* [BUILD] Fix removing of NOMINMAX on Windows
-  [#2449](https://github.com/open-telemetry/opentelemetry-cpp/pull/2449)
-* [BUILD] Accept path list in OPENTELEMETRY_EXTERNAL_COMPONENT_PATH
-  [#2439](https://github.com/open-telemetry/opentelemetry-cpp/pull/2439)
-* [BUILD] Remove gmock from GTEST_BOTH_LIBRARIES
-  [#2437](https://github.com/open-telemetry/opentelemetry-cpp/pull/2437)
-* [REMOVAL] Remove option WITH_OTLP_HTTP_SSL_PREVIEW
-  [#2435](https://github.com/open-telemetry/opentelemetry-cpp/pull/2435)
-
-Important changes:
-
-Breaking changes:
-
-* [REMOVAL] Remove option WITH_OTLP_HTTP_SSL_PREVIEW
-  [#2435](https://github.com/open-telemetry/opentelemetry-cpp/pull/2435)
-  * CMake options `WITH_OTLP_HTTP_SSL_PREVIEW` and
-    `WITH_OTLP_HTTP_SSL_TLS_PREVIEW` are removed. Building opentelemetry-cpp
-    without SSL support is no longer possible.
-
-* [PROTO] Upgrade to opentelemetry-proto v1.1.0
-  [#2488](https://github.com/open-telemetry/opentelemetry-cpp/pull/2488)
-  * Class `opentelemetry::sdk::trace::Recordable` has a new virtual method,
-    `SetTraceFlags()`.
-  * This is an incompatible change for the SDK Recordable API and ABI.
-  * Applications _configuring_ the SDK are not affected.
-  * Third parties providing SDK _extensions_ are affected,
-    and must provide a `SetTraceFlags()` implementation,
-    starting with opentelemetry-cpp 1.14.0.
-
-## [1.13.0] 2023-12-06
-
-* [BUILD] Remove WITH_REMOVE_METER_PREVIEW, use WITH_ABI_VERSION_2 instead
-  [#2370](https://github.com/open-telemetry/opentelemetry-cpp/pull/2370)
-* [SDK] Metrics ObservableRegistry Cleanup
-  [#2376](https://github.com/open-telemetry/opentelemetry-cpp/pull/2376)
-* [BUILD] Make WITH_OTLP_HTTP_SSL_PREVIEW mainstream
-  [#2378](https://github.com/open-telemetry/opentelemetry-cpp/pull/2378)
-* [SDK] Creating DoubleUpDownCounter with no matching view
-  [#2379](https://github.com/open-telemetry/opentelemetry-cpp/pull/2379)
-* [API] Add InstrumentationScope attributes in TracerProvider::GetTracer()
-  [#2371](https://github.com/open-telemetry/opentelemetry-cpp/pull/2371)
-* [BUILD] DLL export interface for Metrics
-  [#2344](https://github.com/open-telemetry/opentelemetry-cpp/pull/2344)
-* [BUILD] enum CanonicalCode names too generic... conflict with old C defines
-  [#2385](https://github.com/open-telemetry/opentelemetry-cpp/pull/2385)
-* [BUILD] Fix cpack broken package version
-  [#2386](https://github.com/open-telemetry/opentelemetry-cpp/pull/2386)
-* [API] Add a new AddLink() operation to Span
-  [#2380](https://github.com/open-telemetry/opentelemetry-cpp/pull/2380)
-* [opentracing-shim] Add check for sampled context
-  [#2390](https://github.com/open-telemetry/opentelemetry-cpp/pull/2390)
-* [BUILD] Fix exported definitions when building DLL with STL
-  [#2387](https://github.com/open-telemetry/opentelemetry-cpp/pull/2387)
-* [BUILD] Add missing includes to runtime_context_test
-  [#2395](https://github.com/open-telemetry/opentelemetry-cpp/pull/2395)
-* [ADMIN] Add file .github/repository-settings.md
-  [#2392](https://github.com/open-telemetry/opentelemetry-cpp/pull/2392)
-* [SDK] Fix GetLogger with empty library name
-  [#2398](https://github.com/open-telemetry/opentelemetry-cpp/pull/2398)
-* [TEST] Fix compiling problem and removed -DENABLE_TEST
-  [#2401](https://github.com/open-telemetry/opentelemetry-cpp/pull/2401)
-* [BUILD] Check windows options are not passed to non-Windows build
-  [#2399](https://github.com/open-telemetry/opentelemetry-cpp/pull/2399)
-* [EXPORTER] Rework OTLP/HTTP and OTLP/GRPC exporter options
-  [#2388](https://github.com/open-telemetry/opentelemetry-cpp/pull/2388)
-* [Build] Update vcpkg to latest release
-  [#2412](https://github.com/open-telemetry/opentelemetry-cpp/pull/2412)
-* [SDK] Cardinality limits for metrics streams
-  (Sync Instruments + Delta Temporality)
-  [#2255](https://github.com/open-telemetry/opentelemetry-cpp/pull/2255)
-* [EXPORTER] Prometheus: Add unit to names, convert to word
-  [#2213](https://github.com/open-telemetry/opentelemetry-cpp/pull/2213)
-* [Metrics] Make context optional for histogram instruments in Metrics SDK
-  [#2416](https://github.com/open-telemetry/opentelemetry-cpp/pull/2416)
-* [BUILD] Fix references to trace namespace to be fully qualified
-  [#2422](https://github.com/open-telemetry/opentelemetry-cpp/pull/2422)
-* [BUILD] Bump third_party/googletest to same version as bazel
-  [#2421](https://github.com/open-telemetry/opentelemetry-cpp/pull/2421)
-* [BUILD] Remove defining NOMINMAX from api
-  [#2420](https://github.com/open-telemetry/opentelemetry-cpp/pull/2420)
-* [BUILD] 'uint8_t' not declared in this scope with gcc 13.2.1
-  [#2423](https://github.com/open-telemetry/opentelemetry-cpp/pull/2423)
-* [BUILD] Improve the handling of OPENTELEMETRY_HAVE_WORKING_REGEX
-  [#2430](https://github.com/open-telemetry/opentelemetry-cpp/pull/2430)
-* [SEMANTIC CONVENTION] Upgrade to semconv 1.23.1
-  [#2428](https://github.com/open-telemetry/opentelemetry-cpp/pull/2428)
-* [BUILD] Use fully qualified references to trace/common namespace
-  [#2424](https://github.com/open-telemetry/opentelemetry-cpp/pull/2424)
-* [API] Create root span with active span
-  [#2427](https://github.com/open-telemetry/opentelemetry-cpp/pull/2427)
-* [REMOVAL] Remove ZPAGES
-  [#2433](https://github.com/open-telemetry/opentelemetry-cpp/pull/2433)
-
-Important changes:
-
-* [API] Add InstrumentationScope attributes in TracerProvider::GetTracer()
-  [#2371](https://github.com/open-telemetry/opentelemetry-cpp/pull/2371)
-  * TracerProvider::GetTracer() now accepts InstrumentationScope attributes.
-  * Because this is an `ABI` breaking change, the fix is only available
-    with the `CMake` option `WITH_ABI_VERSION_2=ON`.
-  * When building with `CMake` option `WITH_ABI_VERSION_1=ON` (by default)
-    the `ABI` is unchanged, and the fix is not available.
-
-* [API] Add a new AddLink() operation to Span
-  [#2380](https://github.com/open-telemetry/opentelemetry-cpp/pull/2380)
-  * New `API` Span::AddLink() adds a single link to a span.
-  * New `API` Span::AddLinks() adds multiple links to a span.
-  * Because this is an `ABI` breaking change, the fix is only available
-    with the `CMake` option `WITH_ABI_VERSION_2=ON`.
-  * When building with `CMake` option `WITH_ABI_VERSION_1=ON` (by default)
-    the `ABI` is unchanged, and the fix is not available.
-
-* [BUILD] Make WITH_OTLP_HTTP_SSL_PREVIEW mainstream
-  [#2378](https://github.com/open-telemetry/opentelemetry-cpp/pull/2378)
-  * The experimental `CMake` option `WITH_OTLP_HTTP_SSL_PREVIEW`
-    is now promoted to stable. The default is changed to `ON`.
-  * The experimental `CMake` option `WITH_OTLP_HTTP_SSL_TLS_PREVIEW`
-    is now promoted to stable. The default is changed to `ON`.
-  * These build options are scheduled to be removed by the next release,
-    building without SSL/TLS will no longer be possible.
-
-* [EXPORTER] Rework OTLP/HTTP and OTLP/GRPC exporter options
-  [#2388](https://github.com/open-telemetry/opentelemetry-cpp/pull/2388)
-  * `OtlpGrpcMetricExporterOptions` used to honor `_TRACES_`
-    environment variables, instead of `_METRICS_` environment variables.
-  * The implementation of `OtlpGrpcMetricExporterOptions` is now fixed.
-  * Please check configuration variables,
-    to make sure `_METRICS_` variables are set as expected.
-
-Breaking changes:
-
-* [BUILD] Remove WITH_REMOVE_METER_PREVIEW, use WITH_ABI_VERSION_2 instead
-  [#2370](https://github.com/open-telemetry/opentelemetry-cpp/pull/2370)
-  * The experimental `CMake` option `WITH_REMOVE_METER_PREVIEW` is removed,
-    use option `WITH_ABI_VERSION_2` instead.
-
-* [BUILD] enum CanonicalCode names too generic... conflict with old C defines
-  [#2385](https://github.com/open-telemetry/opentelemetry-cpp/pull/2385)
-  * Header file `opentelemetry/trace/canonical_code.h` is unused,
-    and is now removed.
-  * This header should not be included directly in an application.
-    If this is the case, please remove any remaining include directives.
-
-* [BUILD] Fix exported definitions when building DLL with STL
-  [#2387](https://github.com/open-telemetry/opentelemetry-cpp/pull/2387)
-  * The MeterSelector, MeterSelectorFactory, InstrumentSelector,
-    and InstrumentSelectorFactory APIs now use const std::string&
-    instead of nostd::string_view for name, version and schema to
-    maintain a single export definition for DLL.
-
-* [EXPORTER] Rework OTLP/HTTP and OTLP/GRPC exporter options
-  [#2388](https://github.com/open-telemetry/opentelemetry-cpp/pull/2388)
-  * `OtlpGrpcLogRecordExporter` incorrectly used `OtlpGrpcExporterOptions`,
-    which are options for traces and not logs.
-  * This created a bug: the `OtlpGrpcLogRecordExporter` honors `_TRACES_`
-    environment variables, instead of `_LOGS_` environment variables.
-  * `OtlpGrpcLogRecordExporter` is changed to use
-    `OtlpGrpcLogRecordExporterOptions` instead, fixing the bug.
-  * User code that initializes the SDK with a GRPC Log exporter,
-    and uses exporter options, should adjust to replace
-    `OtlpGrpcExporterOptions` with `OtlpGrpcLogRecordExporterOptions`.
-  * Please check configuration variables,
-    to make sure `_LOGS_` variables are set as expected.
-
-* [REMOVAL] Remove ZPAGES
-  [#2433](https://github.com/open-telemetry/opentelemetry-cpp/pull/2433)
-  * As announced in release 1.12.0,
-    the deprecated ZPAGES exporter is now removed.
-
-## [1.12.0] 2023-10-16
-
-* [BUILD] Support `pkg-config`
-  [#2269](https://github.com/open-telemetry/opentelemetry-cpp/pull/2269)
-* [CI] Do not automatically close stale issues
-  [#2277](https://github.com/open-telemetry/opentelemetry-cpp/pull/2277)
-* [CI] Benchmark workflow fails, C++14 required to build grpc
-  [#2278](https://github.com/open-telemetry/opentelemetry-cpp/pull/2278)
-* [SDK] Increase metric name maximum length from 63 to 255 characters
-  [#2284](https://github.com/open-telemetry/opentelemetry-cpp/pull/2284)
-* [SEMANTIC CONVENTION] Deprecated semconv (in the spec)
-  not deprecated (in C++)
-  [#2285](https://github.com/open-telemetry/opentelemetry-cpp/pull/2285)
-* [SDK] Remove unused member variables from SyncMetricStorage
-  [#2294](https://github.com/open-telemetry/opentelemetry-cpp/pull/2294)
-* [DEPRECATION] Deprecate ZPAGES
-  [#2291](https://github.com/open-telemetry/opentelemetry-cpp/pull/2291)
-* [API] Deliver ABI breaking changes
-  [#2222](https://github.com/open-telemetry/opentelemetry-cpp/pull/2222)
-* [SDK] Allow metric instrument names to contain / characters
-  [#2310](https://github.com/open-telemetry/opentelemetry-cpp/pull/2310)
-* [SDK] Fix Observable Counters/UpDownCounters
-  [#2298](https://github.com/open-telemetry/opentelemetry-cpp/pull/2298)
-* [SDK] Add exemplar reservoir to async metric storage
-  [#2319](https://github.com/open-telemetry/opentelemetry-cpp/pull/2319)
-* [TEST] Fix lifetime issues in prometheus test utils
-  [#2322](https://github.com/open-telemetry/opentelemetry-cpp/pull/2322)
-* [EXPORTER] Prometheus: Remove explicit timestamps from metric points
-  [#2324](https://github.com/open-telemetry/opentelemetry-cpp/pull/2324)
-* [EXPORTER] Prometheus: Handle attribute key collisions from sanitation
-  [#2326](https://github.com/open-telemetry/opentelemetry-cpp/pull/2326)
-* [EXPORTER] Prometheus cleanup, test with TranslateToPrometheus
-  [#2329](https://github.com/open-telemetry/opentelemetry-cpp/pull/2329)
-* [SDK] Fix log message in Meter::RegisterSyncMetricStorage
-  [#2325](https://github.com/open-telemetry/opentelemetry-cpp/pull/2325)
-* [DOC] Simplify the project status section
-  [#2332](https://github.com/open-telemetry/opentelemetry-cpp/pull/2332)
-* [EXPORTER] Prometheus: Sanitize labels according to spec
-  [#2330](https://github.com/open-telemetry/opentelemetry-cpp/pull/2330)
-* [SDK] Fix deadlock when shuting down http client
-  [#2337](https://github.com/open-telemetry/opentelemetry-cpp/pull/2337)
-* [Exporter] Group spans by resource and instrumentation scope
-  in OTLP export requests
-  [#2335](https://github.com/open-telemetry/opentelemetry-cpp/pull/2335)
-* [BUILD] Need fine-grained HAVE_CPP_STDLIB
-  [#2304](https://github.com/open-telemetry/opentelemetry-cpp/pull/2304)
-* [API] Add InstrumentationScope attributes in MeterProvider::GetMeter()
-  [#2224](https://github.com/open-telemetry/opentelemetry-cpp/pull/2224)
-* [REMOVAL] Drop C++11 support
-  [#2342](https://github.com/open-telemetry/opentelemetry-cpp/pull/2342)
-* [EXPORTER] prometheus: add otel_scope_name and otel_scope_version labels
-  [#2293](https://github.com/open-telemetry/opentelemetry-cpp/pull/2293)
-* [EXPORTER] Export resource for prometheus
-  [#2301](https://github.com/open-telemetry/opentelemetry-cpp/pull/2301)
-* [BUILD] error: read-only reference ‘value’ used as ‘asm’ output
-  [#2354](https://github.com/open-telemetry/opentelemetry-cpp/pull/2354)
-* [BUILD] Build break with external CMake nlohman_json package
-  [#2353](https://github.com/open-telemetry/opentelemetry-cpp/pull/2353)
-* [BUILD] Upgrade libcurl to version 8.4.0
-  [#2358](https://github.com/open-telemetry/opentelemetry-cpp/pull/2358)
-* [BUILD] Fix opentracing-shim when added in super project
-  [#2356](https://github.com/open-telemetry/opentelemetry-cpp/pull/2356)
-* [BUILD] Fix protoc searching with non-imported protobuf::protoc target
-  [#2362](https://github.com/open-telemetry/opentelemetry-cpp/pull/2362)
-* [BUILD] Support to use different cmake package CONFIG of dependencies
-  [#2263](https://github.com/open-telemetry/opentelemetry-cpp/pull/2263)
-* [SEMANTIC CONVENTION] Upgrade to semconv 1.22.0
-  [#2368](https://github.com/open-telemetry/opentelemetry-cpp/pull/2368)
-
-Important changes:
-
-* [API] Add InstrumentationScope attributes in MeterProvider::GetMeter()
-  [#2224](https://github.com/open-telemetry/opentelemetry-cpp/pull/2224)
-  * MeterProvider::GetMeter() now accepts InstrumentationScope attributes.
-  * Because this is an `ABI` breaking change, the fix is only available
-    with the `CMake` option `WITH_ABI_VERSION_2=ON`.
-  * When building with `CMake` option `WITH_ABI_VERSION_1=ON` (by default)
-    the `ABI` is unchanged, and the fix is not available.
-
-Breaking changes:
-
-* [BUILD] Need fine-grained HAVE_CPP_STDLIB
-  [#2304](https://github.com/open-telemetry/opentelemetry-cpp/pull/2304)
-  * In `CMAKE`, the boolean option `WITH_STL` as changed to an option
-    that accepts the values `OFF`, `ON`, `CXX11`, `CXX14`, `CXX17`,
-    `CXX20` and `CXX23`.
-  * Applications makefiles that did not set WITH_STL need to use
-    `WITH_STL=OFF` instead (this is the default).
-  * Applications makefiles that did set WITH_STL need to use
-    `WITH_STL=ON` instead, or may choose to pick a specific value.
-  * In the `API` header files, the preprocessor symbol `HAVE_CPP_STDLIB`
-    is no longer used.
-  * Applications that did set `HAVE_CPP_STDLIB` before, need to set
-    `OPENTELEMETRY_STL_VERSION=<version>` instead, to build with a
-    specific STL version (2011, 2014, 2017, 2020, 2023).
-  * The opentelemetry-cpp makefile no longer sets
-    CMAKE_CXX_STANDARD by itself.
-    Instead, the CMAKE_CXX_STANDARD and/or compiler options -stdc++ used
-    by the caller are honored.
-  * Applications that set neither CMAKE_CXX_STANDARD nor -stdc++
-    options may need to provide a C++ standard in their makefiles.
-
-* [REMOVAL] Drop C++11 support
-  [#2342](https://github.com/open-telemetry/opentelemetry-cpp/pull/2342)
-  * Building with C++11 is no longer supported.
-
-Deprecations:
-
-* [DEPRECATION] Deprecate ZPAGES
-  [#2291](https://github.com/open-telemetry/opentelemetry-cpp/pull/2291)
-
-## [1.11.0] 2023-08-21
-
-* [BUILD] Fix more cases for symbol name for 32-bit win32 DLL build
-  [#2264](https://github.com/open-telemetry/opentelemetry-cpp/pull/2264)
-* [BUILD] added public link of `opentelemetry_proto_grpc` against gRPC lib (only
-  if gRPC library is shared)
-  [#2268](https://github.com/open-telemetry/opentelemetry-cpp/pull/2268)
-* [CI] use ubuntu-latest for tsan CI
-  [#2267](https://github.com/open-telemetry/opentelemetry-cpp/pull/2267)
-* [SDK] Fixing an apparent logging macro bug
-  [#2265](https://github.com/open-telemetry/opentelemetry-cpp/pull/2265)
-* [BUILD] Support protobuf 3.22 or upper
-  [#2163](https://github.com/open-telemetry/opentelemetry-cpp/pull/2163)
-* [BUILD] Remove extra includes
-  [#2252](https://github.com/open-telemetry/opentelemetry-cpp/pull/2252)
-* [LOGS API SDK] Mark logs signal as stable API/SDK
-  [#2229](https://github.com/open-telemetry/opentelemetry-cpp/pull/2229)
-* [SEMANTIC CONVENTIONS] Upgrade to 1.21.0
-  [#2248](https://github.com/open-telemetry/opentelemetry-cpp/pull/2248)
-* [SDK] Valgrind errors on std::atomic variables
-  [#2244](https://github.com/open-telemetry/opentelemetry-cpp/pull/2244)
-* [BUILD] Fix compile with clang 16 and libc++
-  [#2242](https://github.com/open-telemetry/opentelemetry-cpp/pull/2242)
-* [Metrics SDK] Add unit to Instrument selection criteria
-  [#2236](https://github.com/open-telemetry/opentelemetry-cpp/pull/2236)
-* [SDK] Add OStreamLogRecordExporterFactory
-  [#2240](https://github.com/open-telemetry/opentelemetry-cpp/pull/2240)
-* [SDK] Add support for LowMemory metrics temporality
-  [#2234](https://github.com/open-telemetry/opentelemetry-cpp/pull/2234)
-* [CI] Misc build scripts cleanup
-  [#2232](https://github.com/open-telemetry/opentelemetry-cpp/pull/2232)
-* [CI] Upgrade GoogleTest version from 1.12.1 to 1.13.0
-  [#2114](https://github.com/open-telemetry/opentelemetry-cpp/pull/2114)
-* [BUILD] include cstdint
-  [#2230](https://github.com/open-telemetry/opentelemetry-cpp/pull/2230)
-* [EXPORTER] Support protobuf 3.22 or upper
-  [#2163](https://github.com/open-telemetry/opentelemetry-cpp/pull/2163)
-* [SDK] Mark logs signal as stable API/SDK
-  [#2229](https://github.com/open-telemetry/opentelemetry-cpp/pull/2229)
-
-Breaking changes:
-
-* [SDK] Add unit to Instrument selection criteria
-  [#2236](https://github.com/open-telemetry/opentelemetry-cpp/pull/2236)
-  * The `View` constructor and `ViewFactory::Create` method now takes a
-   `unit` criteria as optional third argument.
-  * Please adjust SDK configuration code accordingly.
-
-## [1.10.0] 2023-07-11
-
-* [REMOVAL] Remove the jaeger exporter
-  [#2031](https://github.com/open-telemetry/opentelemetry-cpp/pull/2031)
-
-* [CI] Add a C++11 build
-  [#2152](https://github.com/open-telemetry/opentelemetry-cpp/pull/2152)
-
-* [CI] Add Include what you use
-  [#2214](https://github.com/open-telemetry/opentelemetry-cpp/pull/2214)
-
-* [CI] opentelemetry-cpp project CI
-  [#2071](https://github.com/open-telemetry/opentelemetry-cpp/pull/2071)
-
-* [CI] Do not tag pull_request with the "need-triage" label
-  [#2228](https://github.com/open-telemetry/opentelemetry-cpp/pull/2228)
-
-* [BUILD] Fixing CMake to build GTest on Windows
-  [#1887](https://github.com/open-telemetry/opentelemetry-cpp/pull/1887)
-
-* [BUILD] Remove option WITH_OTLP
-  [#2161](https://github.com/open-telemetry/opentelemetry-cpp/pull/2161)
-
-* [BUILD] Link to opentelemetry_logs even without OTLP
-  [#2177](https://github.com/open-telemetry/opentelemetry-cpp/pull/2177)
-
-* [BUILD] Avoid dependency on protobuf from the OTLP HTTP metrics exporter header
-  [#2179](https://github.com/open-telemetry/opentelemetry-cpp/pull/2179)
-
-* [BUILD] Add ctime header to metrics_exporter.cc
-  [#2187](https://github.com/open-telemetry/opentelemetry-cpp/pull/2187)
-
-* [BUILD] Fix the exported symbol name for 32-bit win32 DLL
-  [#2190](https://github.com/open-telemetry/opentelemetry-cpp/pull/2190)
-
-* [BUILD] Upgrade to opentelemetry-proto 0.20.0
-  [#2195](https://github.com/open-telemetry/opentelemetry-cpp/pull/2195)
-
-* [BUILD] SDK Header files cleanup, use forward declarations
-  [#2182](https://github.com/open-telemetry/opentelemetry-cpp/pull/2182)
-
-* [BUILD] Enable building otel-cpp extensions from main repo
-  [#1937](https://github.com/open-telemetry/opentelemetry-cpp/pull/1937)
-
-* [BUILD] Fix if check on environment variable and add CMake variable
-  [#2207](https://github.com/open-telemetry/opentelemetry-cpp/pull/2207)
-
-* [BUILD] Add `OPENTELEMETRY_CPP_FOUND` into cmake CONFIG file
-  [#2215](https://github.com/open-telemetry/opentelemetry-cpp/pull/2215)
-
-* [BUILD] Upgrade opentelemetry-proto to 1.0.0
-  [#2216](https://github.com/open-telemetry/opentelemetry-cpp/pull/2216)
-
-* [BUILD] Include nostd/string_view which is used in severity.h
-  [#2219](https://github.com/open-telemetry/opentelemetry-cpp/pull/2219)
-
-* [TEST] Expand api singleton test to cover explicit dlopen()
-  [#2164](https://github.com/open-telemetry/opentelemetry-cpp/pull/2164)
-
-* [API] Remove include_trace_context
-  [#2194](https://github.com/open-telemetry/opentelemetry-cpp/pull/2194)
-
-* [API] Remove Meters
-  [#2205](https://github.com/open-telemetry/opentelemetry-cpp/pull/2205)
-
-* [SDK] Add AdaptingCircularBufferCounter for exponential histograms
-  [#2158](https://github.com/open-telemetry/opentelemetry-cpp/pull/2158)
-
-* [SDK] Add base2 exponential histogram indexer
-  [#2173](https://github.com/open-telemetry/opentelemetry-cpp/pull/2173)
-
-* [SDK] Simplify SDK version
-  [#2180](https://github.com/open-telemetry/opentelemetry-cpp/pull/2180)
-
-* [SDK] Add benchmark for base2 exponential histogram indexer
-  [#2181](https://github.com/open-telemetry/opentelemetry-cpp/pull/2181)
-
-* [SDK] Provide builders to avoid exposing Metrics SDK internals
-  [#2189](https://github.com/open-telemetry/opentelemetry-cpp/pull/2189)
-
-* [SDK] MeterProvider should own MeterContext, not share it
-  [#2218](https://github.com/open-telemetry/opentelemetry-cpp/pull/2218)
-
-* [SDK] TracerProvider should own TracerContext, not share it
-  [#2221](https://github.com/open-telemetry/opentelemetry-cpp/pull/2221)
-
-* [EXPORTER] Change OTLP Json field name to camelCase
-  [#2162](https://github.com/open-telemetry/opentelemetry-cpp/pull/2162)
-
-* [EXPORTER] Support empty arrays in `OtlpRecordable` attributes
-  [#2166](https://github.com/open-telemetry/opentelemetry-cpp/pull/2166)
-
-* [EXPORTER] set is_monotonic only for instrument type kCounter
-  [#2171](https://github.com/open-telemetry/opentelemetry-cpp/pull/2171)
-
-* [EXPORTER] Fixed HTTP CURL for 32bits platforms
-  [#2178](https://github.com/open-telemetry/opentelemetry-cpp/pull/2178)
-
-* [EXPORTER] Fix OTLP HTTP exporting in sync mode
-  [#2193](https://github.com/open-telemetry/opentelemetry-cpp/pull/2193)
-
-* [EXPORTER] Prometheus exporter sanitizes invalid characters
-  [#1934](https://github.com/open-telemetry/opentelemetry-cpp/pull/1934)
-
-* [EXPORTER] Prometheus: Error on ingesting samples
-  with different value but same timestamp
-  [#2200](https://github.com/open-telemetry/opentelemetry-cpp/pull/2200)
-
-* [EXPORTER] OTLP GRPC mTLS support
-  [#2120](https://github.com/open-telemetry/opentelemetry-cpp/pull/2120)
-
-* [DOC] Small fix for Histogram documentation
-  [#2156](https://github.com/open-telemetry/opentelemetry-cpp/pull/2156)
-
-* [DOC] Move Reiley Yang to emeritus
-  [#2198](https://github.com/open-telemetry/opentelemetry-cpp/pull/2198)
-
-Important changes:
-
-* [API] Remove Meters
-  [#2205](https://github.com/open-telemetry/opentelemetry-cpp/pull/2205)
-  * The CMake option `WITH_REMOVE_METER_PREVIEW` was added.
-  * This option is experimental, and may change in the future.
-  * Enabling it is an ABI breaking change.
-
-Breaking changes:
-
-* [REMOVAL] Remove the jaeger exporter
-  [#2031](https://github.com/open-telemetry/opentelemetry-cpp/pull/2031)
-  * The CMake `WITH_JAEGER` option has been removed
-  * Please remove usage of `WITH_JAEGER` from user scripts and makefiles.
-
-* [SDK] MeterProvider should own MeterContext, not share it
-  [#2218](https://github.com/open-telemetry/opentelemetry-cpp/pull/2218)
-  * The `MeterProvider` constructor now takes a `unique_ptr` on
-    `MeterContext`, instead of a `shared_ptr`.
-  * Please adjust SDK configuration code accordingly.
-
-* [SDK] TracerProvider should own TracerContext, not share it
-  [#2221](https://github.com/open-telemetry/opentelemetry-cpp/pull/2221)
-  * The `TracerProvider` constructor now takes a `unique_ptr` on
-    `TracerContext`, instead of a `shared_ptr`.
-  * The `LoggerProvider` constructor now takes a `unique_ptr` on
-    `LoggerContext`, instead of a `shared_ptr`.
-  * Please adjust SDK configuration code accordingly.
-
-## [1.9.1] 2023-05-26
-
-* [DEPRECATION] Drop C++11 support
-  [#2146](https://github.com/open-telemetry/opentelemetry-cpp/pull/2146)
-
-* [CI] Upgrade Bazel and Bazelisk version
-  [#2118](https://github.com/open-telemetry/opentelemetry-cpp/pull/2118)
-* [CI] Upgrade Google Benchmark version from 1.6.0 to 1.7.1
-  [#2116](https://github.com/open-telemetry/opentelemetry-cpp/pull/2116)
-* [CI] Upgrade Nlohmann JSON library version from 3.10.5 to 3.11.2
-  [#2115](https://github.com/open-telemetry/opentelemetry-cpp/pull/2115)
-
-* [BUILD] Missed include
-  [#2143](https://github.com/open-telemetry/opentelemetry-cpp/pull/2143)
-* [BUILD] Add opentelemetry_proto_grpc and allow build shared
-  opentelemetry_proto and opentelemetry_proto_grpc on non-Windows platform.
-  [#2097](https://github.com/open-telemetry/opentelemetry-cpp/pull/2097)
-* [BUILD] Warning cleanup, single character wrapped by std::string
-  [#2137](https://github.com/open-telemetry/opentelemetry-cpp/pull/2137)
-* [BUILD] Add missing target dependencies
-  [#2128](https://github.com/open-telemetry/opentelemetry-cpp/pull/2128)
-* [BUILD] Fix if JSON library already added another CMake target
-  [#2126](https://github.com/open-telemetry/opentelemetry-cpp/pull/2126)
-* [BUILD] shared libraries with version suffix, along with the symbolic link
-  [#2109](https://github.com/open-telemetry/opentelemetry-cpp/pull/2109)
-* [BUILD] Show warning message if WITH_OTLP is enabled
-  [#2112](https://github.com/open-telemetry/opentelemetry-cpp/pull/2112)
-* [BUILD] Add missing STL header.
-  [#2107](https://github.com/open-telemetry/opentelemetry-cpp/pull/2107)
-* [BUILD] Build break with old curl, macro CURL_VERSION_BITS unknown
-  [#2102](https://github.com/open-telemetry/opentelemetry-cpp/pull/2102)
-* [BUILD] Transitive dependency issue with the otlp http exporter
-  [#2154](https://github.com/open-telemetry/opentelemetry-cpp/pull/2154)
-
-* [TEST] Add unit test for log body implicit conversions.
-  [#2136](https://github.com/open-telemetry/opentelemetry-cpp/pull/2136)
-* [TEST] Add event id to logger benchmark method
-  [#2133](https://github.com/open-telemetry/opentelemetry-cpp/pull/2133)
-
-* [API] Fix inclusion header files and use forward declaration
-  [#2124](https://github.com/open-telemetry/opentelemetry-cpp/pull/2124)
-* [API] Add user facing Logging API and Benchmarks
-  [#2094](https://github.com/open-telemetry/opentelemetry-cpp/pull/2094)
-
-* [SDK] SDK support for the new OTel log
-  [#2123](https://github.com/open-telemetry/opentelemetry-cpp/pull/2123)
-
-* [EXPORTER] Fixed HTTP session cleanup on shutdown
-  [#2111](https://github.com/open-telemetry/opentelemetry-cpp/pull/2111)
-* [EXPORTER] Delegate all API calls of gRPC into
-  opentelemetry_exporter_otlp_grpc_client,
-  and make it contains all symbols needed.
-  [#2005](https://github.com/open-telemetry/opentelemetry-cpp/pull/2005)
-
-* [DOC] Add Marc as maintainer.
-  [#2027](https://github.com/open-telemetry/opentelemetry-cpp/pull/2027)
-
-Breaking changes:
-
-* Add opentelemetry_proto_grpc and move gRPC sources into it.
-  [#2097](https://github.com/open-telemetry/opentelemetry-cpp/pull/2097)
-  * There will be no breaking changes for users who only use OTLP exporters and
-    do not directly use opentelemetry-cpp::proto. However, it is important to
-    note that `opentelemetry-cpp::proto` no longer contains generated gRPC codes
-    , and all components that depend on these gRPC codes should also link to
-    `opentelemetry-cpp::proto_grpc`.
-
-Deprecations:
-
-* The Jaeger Exporter is deprecated, see [DEPRECATED](./DEPRECATED.md) for details.
-* C++11 support is to end, C++14 will be supported instead,
-  see [DEPRECATED](./DEPRECATED.md) for details.
-
-## [1.9.0] 2023-04-12
-
-* [CI] Make build environment parallel (Windows)
-  [#2080](https://github.com/open-telemetry/opentelemetry-cpp/pull/2080)
-* [CI] Make build environment parallel (Linux)
-  [#2076](https://github.com/open-telemetry/opentelemetry-cpp/pull/2076)
-* [CI] Remove separate run of metrics ostream example
-  [#2030](https://github.com/open-telemetry/opentelemetry-cpp/pull/2030)
-
-* [BUILD] Include directory path added for Zipkin exporter example
-  [#2069](https://github.com/open-telemetry/opentelemetry-cpp/pull/2069)
-* [BUILD] Ignore more warning in generated protobuf files
-  [#2067](https://github.com/open-telemetry/opentelemetry-cpp/pull/2067)
-* [BUILD] Clean warnings in ETW exporters
-  [#2063](https://github.com/open-telemetry/opentelemetry-cpp/pull/2063)
-* [BUILD] Fix default value of OPENTELEMETRY_INSTALL_default
-  [#2062](https://github.com/open-telemetry/opentelemetry-cpp/pull/2062)
-
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.20.0
-  [#2088](https://github.com/open-telemetry/opentelemetry-cpp/pull/2088)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.19.0
-  [#2017](https://github.com/open-telemetry/opentelemetry-cpp/pull/2017)
-
-* [API] Checking indices before dereference in string utils
-  [#2040](https://github.com/open-telemetry/opentelemetry-cpp/pull/2040)
-* [API] Export factory class of log provider
-  [#2041](https://github.com/open-telemetry/opentelemetry-cpp/pull/2041)
-
-* [SDK] Implement Forceflush for Periodic Metric Reader
-  [#2064](https://github.com/open-telemetry/opentelemetry-cpp/pull/2064)
-* [SDK] Add `ForceFlush` for all `LogRecordExporter` and `SpanExporter`
-  [#2000](https://github.com/open-telemetry/opentelemetry-cpp/pull/2000)
-* [SDK] Fix schema URL precedence bug in `Resource::Merge`
-  [#2036](https://github.com/open-telemetry/opentelemetry-cpp/pull/2036)
-* [SDK] Use sdk_start_ts for MetricData start_ts for instruments having
-  cumulative aggregation temporality.
-  [#2086](https://github.com/open-telemetry/opentelemetry-cpp/pull/2086)
-
-* [EXPORTER] Add OTLP HTTP SSL support
-  [#1793](https://github.com/open-telemetry/opentelemetry-cpp/pull/1793)
-* [EXPORTER] GRPC endpoint scheme should take precedence over OTEL_EXPORTER_OTLP_TRACES_INSECURE
-  [#2060](https://github.com/open-telemetry/opentelemetry-cpp/pull/2060)
-
-* [EXAMPLES] Remove unused 'alerting' section from prometheus.yml in examples
-  [#2055](https://github.com/open-telemetry/opentelemetry-cpp/pull/2055)
-* [EXAMPLES] Fix view names in Prometheus example
-  [#2034](https://github.com/open-telemetry/opentelemetry-cpp/pull/2034)
-
-* [DOC] Fix some docs typo
-  [#2057](https://github.com/open-telemetry/opentelemetry-cpp/pull/2057)
-* [DOC] Update OpenTracing shim README.md
-  [#2028](https://github.com/open-telemetry/opentelemetry-cpp/pull/2028)
-* [DOC] INSTALL doc clarifications
-  [#2078](https://github.com/open-telemetry/opentelemetry-cpp/pull/2078)
-
-Important changes:
-
-* [EXPORTER] GRPC endpoint scheme should take precedence over OTEL_EXPORTER_OTLP_TRACES_INSECURE
-  [#2060](https://github.com/open-telemetry/opentelemetry-cpp/pull/2060)
-  * The logic to decide whether or not an OTLP GRPC exporter uses SSL has
-    changed to comply with the specification:
-    * Before this change, the following settings were evaluated, in order:
-      * OTEL_EXPORTER_OTLP_TRACES_INSECURE (starting with 1.8.3)
-      * OTEL_EXPORTER_OTLP_INSECURE (starting with 1.8.3)
-      * OTEL_EXPORTER_OTLP_TRACES_SSL_ENABLE
-      * OTEL_EXPORTER_OTLP_SSL_ENABLE
-    * With this change, the following settings are evaluated, in order:
-      * The GRPC endpoint scheme, if provided:
-        * "https" imply with SSL,
-        * "http" imply without ssl.
-      * OTEL_EXPORTER_OTLP_TRACES_INSECURE
-      * OTEL_EXPORTER_OTLP_INSECURE
-      * OTEL_EXPORTER_OTLP_TRACES_SSL_ENABLE
-      * OTEL_EXPORTER_OTLP_SSL_ENABLE
-    * As a result, a behavior change for GRPC SSL is possible,
-      because the endpoint scheme now takes precedence.
-      Please verify configuration settings for the GRPC endpoint.
-* [SDK] Add `ForceFlush` for all `LogRecordExporter` and `SpanExporter`
-  [#2000](https://github.com/open-telemetry/opentelemetry-cpp/pull/2000)
-  * `LogRecordExporter` and `SpanExporter` add a new virtual function
-    `ForceFlush`, and if users implement any customized `LogRecordExporter` and
-    `SpanExporter`, they should also implement this function.
-    There should be no impact if users only use factory to create exporters.
-
-Deprecations:
-
-* The Jaeger Exporter is deprecated, see [DEPRECATED](./DEPRECATED.md) for details.
-
-## [1.8.3] 2023-03-06
-
-* Provide version major/minor/patch macros
-  [#2014](https://github.com/open-telemetry/opentelemetry-cpp/pull/2014)
-* [BUILD] Add `OPENTELEMETRY_INSTALL` to allow user to skip install targets.
-  [#2022](https://github.com/open-telemetry/opentelemetry-cpp/pull/2022)
-* [SDK] Rename the global SDK version variables to avoid naming clash
-  [#2011](https://github.com/open-telemetry/opentelemetry-cpp/pull/2011)
-* [BUILD] Fix typo in CMakeLists.txt
-  [#2010](https://github.com/open-telemetry/opentelemetry-cpp/pull/2010)
-* [EXPORTER] fix Prometheus test iterator iterator increment
-  [#2006](https://github.com/open-telemetry/opentelemetry-cpp/pull/2006)
-* [SDK]Add attributes for InstrumentationScope
-  [#2004](https://github.com/open-telemetry/opentelemetry-cpp/pull/2004)
-* [METRICS SDK] Performance improvement in measurement processing
-  [#1993](https://github.com/open-telemetry/opentelemetry-cpp/pull/1993)
-* [EXAMPLE] Add example for logs ostream exporter
-  [#1992](https://github.com/open-telemetry/opentelemetry-cpp/pull/1992)
-* [ETW Exporter] Support serialize span/log attributes into JSON
-  [#1991](https://github.com/open-telemetry/opentelemetry-cpp/pull/1991)
-* [ETW Exporter]Do not overwrite ParentId when setting attribute on Span
-  [#1989](https://github.com/open-telemetry/opentelemetry-cpp/pull/1989)
-* Upgrade prometheus-cpp to v1.1.0
-  [#1954](https://github.com/open-telemetry/opentelemetry-cpp/pull/1954)
-* Convert Prometheus Exporter to Pull MetricReader
-  [#1953](https://github.com/open-telemetry/opentelemetry-cpp/pull/1953)
-* [DOCS] Add alpine packages to INSTALL.md
-  [#1957](https://github.com/open-telemetry/opentelemetry-cpp/pull/1957)
-* [METRICS SDK] Add benchmark tests for Sum Aggregation.
-  [#1948](https://github.com/open-telemetry/opentelemetry-cpp/pull/1948)
-* [BUILD] Build OpenTelemetry SDK and exporters into DLL
-  [#1932](https://github.com/open-telemetry/opentelemetry-cpp/pull/1932)
-* [CI] Enforce copyright check in CI
-  [#1965](https://github.com/open-telemetry/opentelemetry-cpp/pull/1965)
-* [BUILD] Fix typo GENENV -> GETENV
-  [#1972](https://github.com/open-telemetry/opentelemetry-cpp/pull/1972)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.18.0
-  [#1974](https://github.com/open-telemetry/opentelemetry-cpp/pull/1974)
-* [EXT] Fix thread-safety when shutdown.
-  [#1977](https://github.com/open-telemetry/opentelemetry-cpp/pull/1977)
-* [SDK] Fix missing ObservedTimestamp.
-  [#1985](https://github.com/open-telemetry/opentelemetry-cpp/pull/1985)
-* [METRICS SDK] fix variable names
-  [#1987](https://github.com/open-telemetry/opentelemetry-cpp/pull/1987)
-* [EXPORTER] Fix Prometheus server crash on listening to already used port
-  [#1986](https://github.com/open-telemetry/opentelemetry-cpp/pull/1986)
-* [EXPORTER] Boolean environment variables not parsed per the spec
-  [#1982](https://github.com/open-telemetry/opentelemetry-cpp/pull/1982)
-* [EXPORTER] Opentracing shim
-  [#1909](https://github.com/open-telemetry/opentelemetry-cpp/pull/1909)
-
-## [1.8.2] 2023-01-31
-
-* Remove redundant macro check in nostd::shared_ptr [#1939](https://github.com/open-telemetry/opentelemetry-cpp/pull/1939)
-* Fix typo in packages.cmake causing incorrect nuget package versions [#1936](https://github.com/open-telemetry/opentelemetry-cpp/pull/1936)
-* [METRICS] Custom Aggregation support [#1899](https://github.com/open-telemetry/opentelemetry-cpp/pull/1899)
-* Small fix in INSTALL.md for enabling building package. [#1930](https://github.com/open-telemetry/opentelemetry-cpp/pull/1930)
-* [METRICS] Fix warning for misconfiguration of PeriodicExportingMetricReader [#1929](https://github.com/open-telemetry/opentelemetry-cpp/pull/1929)
-* Make macros.h available for all source files via version.h [#1918](https://github.com/open-telemetry/opentelemetry-cpp/pull/1918)
-* [METRICS] Histogram Aggregation: Fix bucket detection logic,
- performance improvements, and benchmark tests [#1869](https://github.com/open-telemetry/opentelemetry-cpp/pull/1869)
-* Remove unused namespace alias for nostd [#1914](https://github.com/open-telemetry/opentelemetry-cpp/pull/1914)
-* [METRICS] Update meter.h [#1907](https://github.com/open-telemetry/opentelemetry-cpp/pull/1907)
-* sdk::resource::Resource::Merge should be const [#1905](https://github.com/open-telemetry/opentelemetry-cpp/pull/1905)
-* [METRICS] Collect and Export metric data before
- PeriodicMetricReader shutdown. [#1860](https://github.com/open-telemetry/opentelemetry-cpp/pull/1860)
-* [ETW EXPORTER] Add Virtual destructor for TailSampler, Update Maintainer
- mode warnings for MSVC [#1897](https://github.com/open-telemetry/opentelemetry-cpp/pull/1897)
-* Fix #1867 Orderly shutdown in examples [#1868](https://github.com/open-telemetry/opentelemetry-cpp/pull/1868)
-* [METRICS] minor metrics handling optimizations [#1890](https://github.com/open-telemetry/opentelemetry-cpp/pull/1890)
-* fix SpinLockMutex for Intel Compiler [#1885](https://github.com/open-telemetry/opentelemetry-cpp/pull/1885)
-* [LOGS] Change BatchLogRecordProcessorFactory::Create to static method [#1876](https://github.com/open-telemetry/opentelemetry-cpp/pull/1876)
-* Enable generating deb, rpm, NuGet, tgz, zip package through cmake build [#1662](https://github.com/open-telemetry/opentelemetry-cpp/pull/1662)
-* Updated clone command in INSTALL.md [#1818](https://github.com/open-telemetry/opentelemetry-cpp/pull/1818)
-* Small cleanup to remove old metrics design docs [#1855](https://github.com/open-telemetry/opentelemetry-cpp/pull/1855)
-* [BUILD] Fix build error with older version of VS2017 compiler. [1857](https://github.com/open-telemetry/opentelemetry-cpp/pull/1857)
-* [EXPORTERS] Enable setting Span endtime for ETW exporter [#1846](https://github.com/open-telemetry/opentelemetry-cpp/pull/1846)
-* [REMOVAL] Remove deprecated experimental semantic conventions [#1743](https://github.com/open-telemetry/opentelemetry-cpp/pull/1743)
-* [EXPORTERS] Fix console debug logs for otlp exporters. [#1848](https://github.com/open-telemetry/opentelemetry-cpp/pull/1848)
-* [LOGS] Add `include_trace_context` and `EventLogger` [#1884](https://github.com/open-telemetry/opentelemetry-cpp/pull/1884)
-* [METRICS] Change BatchLogRecordProcessorFactory::Create to static method
-* [BUILD] Fix OTELCPP_MAINTAINER_MODE [#1844](https://github.com/open-telemetry/opentelemetry-cpp/pull/1844)
-* [BUILD] Fix compatibility when using clang and libc++, upgrade GTest and
-  cmake when using C++20 [#1852](https://github.com/open-telemetry/opentelemetry-cpp/pull/1852)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.16.0
-  [#1854](https://github.com/open-telemetry/opentelemetry-cpp/pull/1854)
-* [SDK] BatchSpanProcessor now logs a warning when dropping a span because the
-  queue is full
-  [1871](https://github.com/open-telemetry/opentelemetry-cpp/pull/1871)
-* [BUILD] Migrate from @bazel_tools//platforms to [Bazel Platforms](https://github.com/bazelbuild/platforms)
-  to enable Bazel 6.0.0 compatibility [#1873](https://github.com/open-telemetry/opentelemetry-cpp/pull/1873)
-* [BUILD] Cleanup CMake makefiles for nlohmann_json
-  [#1912](https://github.com/open-telemetry/opentelemetry-cpp/pull/1912)
-* [BUILD] Cleanup CMake makefiles for CURL usage
-  [#1916](https://github.com/open-telemetry/opentelemetry-cpp/pull/1916)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.17.0
-  [#1927](https://github.com/open-telemetry/opentelemetry-cpp/pull/1927)
-* [MAINTAINER DOC] Define and document a deprecation process,
-  [DEPRECATION] Deprecate the Jaeger exporter,
-  implemented by [#1923](https://github.com/open-telemetry/opentelemetry-cpp/pull/1923)
-* [BUILD] OTLP HTTP Exporter has build warnings in maintainer mode
-  [#1943](https://github.com/open-telemetry/opentelemetry-cpp/pull/1943)
-
-Deprecations:
-
-* [MAINTAINER DOC] Define and document a deprecation process,
-  [#1923](https://github.com/open-telemetry/opentelemetry-cpp/pull/1923)
-  * A new file, [DEPRECATED](./DEPRECATED.md) list all the code currently
-    deprecated.
-  * A new [deprecation process](./docs/deprecation-process.md) details the plan to
-    deprecate and later remove code.
-* [DEPRECATION] Deprecate the Jaeger exporter
-  [#1923](https://github.com/open-telemetry/opentelemetry-cpp/pull/1923)
-  * The Jaeger Exporter is deprecated, see [DEPRECATED](./DEPRECATED.md) for details.
-
-Important changes:
-
-* [BUILD] Cleanup CMake makefiles for CURL usage
-  [#1916](https://github.com/open-telemetry/opentelemetry-cpp/pull/1916)
-  * CMake option `WITH_OTLP_HTTP`
-    * Before this change, the CMake option `WITH_OTLP_HTTP` was unpredictable,
-      sometime set to ON and sometime set to OFF by default,
-      depending on whether a CURL package was found or not.
-      The option `WITH_OTLP_HTTP` was sometime not displayed in the ccmake
-      UI, making it impossible to even discover there is an option of that name.
-    * With this change, CMake option `WITH_OTLP_HTTP` is always OFF by
-      default. WITH_OTLP_HTTP MUST be set to ON explicitly to build the
-      OTLP HTTP exporter. The option is always visible in the ccmake UI.
-  * CMake option `BUILD_W3CTRACECONTEXT_TEST`
-    * Before this change, the W3C trace context tests were built, or
-      not, in an unpredictable way, depending on the presence, or not, of a
-      CURL package. In particular, the build could ignore the W3C trace
-      context tests even when BUILD_W3CTRACECONTEXT_TEST=ON.
-    * With this change, option BUILD_W3CTRACECONTEXT_TEST is honored.
-  * HTTP client/server examples
-    * Before this change, the HTTP client/server examples were built, or
-      not, in an unpredictable way, depending on the presence, or not, of a
-      CURL package.
-    * With this change, a new option `WITH_EXAMPLES_HTTP` is used to
-      build the HTTP client/server examples.
-
-## [1.8.1] 2022-12-04
-
-* [ETW Exporter] Tail based sampling support [#1780](https://github.com/open-telemetry/opentelemetry-cpp/pull/1780)
-* [EXPORTERS] fix typo [affecting otlp exported histogram metrics max uint] [#1827](https://github.com/open-telemetry/opentelemetry-cpp/pull/1827)
-* [EXPORTERS] fix enum-compare-switch warning [#1833](https://github.com/open-telemetry/opentelemetry-cpp/pull/1833)
-* [METRICS] Change default temporality as "Cumulative" for OTLP metrics
-exporters [#1828](https://github.com/open-telemetry/opentelemetry-cpp/pull/1828)
-* [BUILD] Moved otlp_grpc_utils.cc to opentelemetry_exporter_otlp_grpc_client.
-[#1829](https://github.com/open-telemetry/opentelemetry-cpp/pull/1829)
-* Fix type mismatch when move nostd::shared_ptr [#1815](https://github.com/open-telemetry/opentelemetry-cpp/pull/1815)
-* [BUILD] Fix Prometheus target name [#1820](https://github.com/open-telemetry/opentelemetry-cpp/pull/1820)
-* Clean unused docker files [#1817](https://github.com/open-telemetry/opentelemetry-cpp/pull/1817)
-* [BUILD] Fix default bazel build [#1816](https://github.com/open-telemetry/opentelemetry-cpp/pull/1816)
-* [BUILD] move client::nosend under test_common [#1811](https://github.com/open-telemetry/opentelemetry-cpp/pull/1811)
-* [BUILD] Fix opentelemetry-proto file exists check [#1824](https://github.com/open-telemetry/opentelemetry-cpp/pull/1824)
-
-## [1.8.0] 2022-11-27
-
-* [DOC] Update Metrics status in README.md [#1722](https://github.com/open-telemetry/opentelemetry-cpp/pull/1722)
-* [DOC] Remove misleading comments about ABI compatibility for nostd::span [#1731](https://github.com/open-telemetry/opentelemetry-cpp/pull/1731)
-* [BUILD] Bump abseil-cpp for cmake CI [#1807](https://github.com/open-telemetry/opentelemetry-cpp/pull/1807)
-* [Exporter] Add status code to OTLP grpc trace log [#1792](https://github.com/open-telemetry/opentelemetry-cpp/pull/1792)
-* [Exporter] add fix for prometheus exporter build [#1795](https://github.com/open-telemetry/opentelemetry-cpp/pull/1795)
-* [BUILD] Add option WITH_BENCHMARK to disable building benchmarks [#1794](https://github.com/open-telemetry/opentelemetry-cpp/pull/1794)
-* [BUILD] Fix CI benchmark [#1799](https://github.com/open-telemetry/opentelemetry-cpp/pull/1799)
-* [BUILD] bump to gRPC v1.48.1 for bazel CIs [#1786](https://github.com/open-telemetry/opentelemetry-cpp/pull/1786)
-* [BUILD] Fix CI build [#1798](https://github.com/open-telemetry/opentelemetry-cpp/pull/1798)
-* [BUILD] Fix clang-format in CI [#1796](https://github.com/open-telemetry/opentelemetry-cpp/pull/1796)
-* Fix session lock of OtlpHttpClient [#1760](https://github.com/open-telemetry/opentelemetry-cpp/pull/1760)
-* [Metrics SDK] Add MeterContext::ForEachMeter() method to process callbacks on
- Meter in thread-safe manner [#1783](https://github.com/open-telemetry/opentelemetry-cpp/pull/1783)
-* [DOC] Document that clang-format version 10.0 is used. [#1782](https://github.com/open-telemetry/opentelemetry-cpp/pull/1782)
-* [BUILD] Upgrade bazel build to use abseil-cpp-20220623.1 [#1779](https://github.com/open-telemetry/opentelemetry-cpp/pull/1779)
-* Fix GlobalLogHandler singleton creation order [#1767](https://github.com/open-telemetry/opentelemetry-cpp/pull/1767)
-* [Metrics SDK] Change Prometheus CMake target name [#1765](https://github.com/open-telemetry/opentelemetry-cpp/pull/1765)
-* [DOC] Cleanup INSTALL.md [#1757](https://github.com/open-telemetry/opentelemetry-cpp/pull/1757)
-* [DOC] Format config options in OTLP exporter readme [#1748](https://github.com/open-telemetry/opentelemetry-cpp/pull/1748)
-* [DOC] Cleanup ENABLE_METRICS_PREVIEW [#1745](https://github.com/open-telemetry/opentelemetry-cpp/pull/1745)
-* [Build] Multiple CURL packages leads to invalid build (#1738) [#1739](https://github.com/open-telemetry/opentelemetry-cpp/pull/1739)
-* [Metrics SDK] Cleanup ENABLE_METRICS_PREVIEW [#1735](https://github.com/open-telemetry/opentelemetry-cpp/pull/1735)
-* [Logs SDK] LogProcessor, LogExporter class name [#1736](https://github.com/open-telemetry/opentelemetry-cpp/pull/1736)
-* [Metrics SDK] Cleanup of old _metric api/sdk [#1734](https://github.com/open-telemetry/opentelemetry-cpp/pull/1734)
-* [ETW Exporter] Fix span timestamp(s) precision to nanoseconds [#1726](https://github.com/open-telemetry/opentelemetry-cpp/pull/1726)
-* [LOGS SDK] Rename LogProcessor and LogExporter to LogRecordProcessor and LogRecordExporter
-  [#1727](https://github.com/open-telemetry/opentelemetry-cpp/pull/1727)
-* [METRICS SDK] - Remove old metrics from Github CI
-  [#1733](https://github.com/open-telemetry/opentelemetry-cpp/pull/1733)
-* [BUILD] Add CMake OTELCPP_PROTO_PATH [#1730](https://github.com/open-telemetry/opentelemetry-cpp/pull/1730)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.15.0
-  [#1761](https://github.com/open-telemetry/opentelemetry-cpp/pull/1761)
-* [LOGS SDK] New LogRecord and logs::Recordable implementations.
-  [#1766](https://github.com/open-telemetry/opentelemetry-cpp/pull/1766)
-
-Deprecation notes:
-
-* [Deprecation] Deprecate experimental semantic conventions
-  [#1744](https://github.com/open-telemetry/opentelemetry-cpp/pull/1744)
-  * The file
-    `api/include/opentelemetry/trace/experimental_semantic_conventions.h`
-    is deprecated, and will be removed in a future release.
-    Use file
-    `api/include/opentelemetry/trace/semantic_conventions.h`
-    instead.
-
-  * The file
-    `sdk/include/opentelemetry/sdk/resource/experimental_semantic_conventions.h`
-    is deprecated, and will be removed in a future release.
-    Use file
-    `sdk/include/opentelemetry/sdk/resource/semantic_conventions.h`
-    instead.
-
-  * The function, declared in the global namespace
-    `uint32_t hashCode(const char *str, uint32_t h = 0)`
-    is deprecated, and will be removed in a future release.
-    No replacement will be provided.
-    Note that function `opentelemetry::utils::hashCode`,
-    declared in the ETW exporter, is not affected by this deprecation.
-
-Breaking changes:
-
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.15.0
-  [#1761](https://github.com/open-telemetry/opentelemetry-cpp/pull/1761)
-  * Naming of semantic conventions has changed from uppercase constants,
-    like `SemanticConventions::SERVICE_NAME`,
-    to camel case, like `SemanticConventions::kServiceName`.
-    This is necessary to avoid collisions with macros in general,
-    which breaks the build on some platforms.
-  * Semantic conventions are flagged as experimental,
-    which is why this change is done in this release.
-
-## [1.7.0] 2022-10-28
-
-* [METRICS SDK] Validate Instrument meta data (name, unit, description) [#1713](https://github.com/open-telemetry/opentelemetry-cpp/pull/1713)
-* [DOCS] Document libthrift 0.12.0 doesn't work with Jaeger exporter [#1714](https://github.com/open-telemetry/opentelemetry-cpp/pull/1714)
-* [Metrics SDK] Add Monotonic Property to Sum Aggregation, and
-unit tests for Up Down Counter [#1675](https://github.com/open-telemetry/opentelemetry-cpp/pull/1675)
-* [Metrics SDK] Move Metrics Exemplar processing behind feature flag [#1710](https://github.com/open-telemetry/opentelemetry-cpp/pull/1710)
-* [Metrics API/SDK] Change Meter API/SDK to return nostd::unique_ptr
- for Sync Instruments [#1707](https://github.com/open-telemetry/opentelemetry-cpp/pull/1707)
-which includes breaking change in the Metrics api and sdk.
-* [BUILD] Add e2e test to asan & tsan CI [#1670](https://github.com/open-telemetry/opentelemetry-cpp/pull/1670)
-* [BUILD] Add otlp-grpc example bazel [#1708](https://github.com/open-telemetry/opentelemetry-cpp/pull/1708)
-* [TRACE SDK] Fix debug log of OTLP HTTP exporter and ES log exporter [#1703](https://github.com/open-telemetry/opentelemetry-cpp/pull/1703)
-* [METRICS SDK] Fix a potential precision loss on integer in
-ReservoirCellIndexFor [#1696](https://github.com/open-telemetry/opentelemetry-cpp/pull/1696)
-* [METRICS SDK] Fix Histogram crash [#1685](https://github.com/open-telemetry/opentelemetry-cpp/pull/1685)
-* [METRICS SDK] Fix:1676 Segfault when short export period is used for metrics [#1682](https://github.com/open-telemetry/opentelemetry-cpp/pull/1682)
-* [METRICS SDK] Add timeout support to MeterContext::ForceFlush [#1673](https://github.com/open-telemetry/opentelemetry-cpp/pull/1673)
-* [DOCS] - Minor updates to OStream Metrics exporter documentation [#1679](https://github.com/open-telemetry/opentelemetry-cpp/pull/1679)
-* [DOCS] Fix:#1575 API Documentation for Metrics SDK and API [#1678](https://github.com/open-telemetry/opentelemetry-cpp/pull/1678)
-* [BUILD] Fixed compiler warnings [#1677](https://github.com/open-telemetry/opentelemetry-cpp/pull/1677)
-* [METRICS SDK] Fix threading issue between Meter::RegisterSyncMetricStorage
- and Meter::Collect [#1666](https://github.com/open-telemetry/opentelemetry-cpp/pull/1666)
-* [METRICS SDK] Fix data race on MeterContext::meters_ [#1668](https://github.com/open-telemetry/opentelemetry-cpp/pull/1668)
-* [METRICS SDK] Fix observable Gauge metrics generation [#1651](https://github.com/open-telemetry/opentelemetry-cpp/pull/1651)
-* [BUILD] Detect ARCH=sparc in CMake [#1660](https://github.com/open-telemetry/opentelemetry-cpp/pull/1660)
-* [SDK] Add user agent for OTLP http/grpc client [#1657](https://github.com/open-telemetry/opentelemetry-cpp/pull/1657)
-* [BUILD] Fix clang and gcc warnings [#1658](https://github.com/open-telemetry/opentelemetry-cpp/pull/1658)
-* [Metrics SDK] Add Metrics ExemplarFilter and ExemplarReservoir [#1584](https://github.com/open-telemetry/opentelemetry-cpp/pull/1584)
-* [LOGS SDK] Rename OnReceive to OnEmit [#1652](https://github.com/open-telemetry/opentelemetry-cpp/pull/1652)
-* [METRICS SDK] Fix Observable Gauge does not reflect updated values,
-and send the old value always [#1641](https://github.com/open-telemetry/opentelemetry-cpp/pull/1641)
-* [Metrics SDK] Change boundary type to double for Explicit Bucket Histogram Aggregation,
-and change default bucket range [#1626](https://github.com/open-telemetry/opentelemetry-cpp/pull/1626)
-* [METRICS SDK] Fix occasional Segfault with LongCounter instrument [#1638](https://github.com/open-telemetry/opentelemetry-cpp/pull/1638)
-* [BUILD] Bump vcpk to 2022.08.15 [#1633](https://github.com/open-telemetry/opentelemetry-cpp/pull/1633)
-* [BUILD] Bump gRPC to v1.48.1 for CMake Linux CI [#1608](https://github.com/open-telemetry/opentelemetry-cpp/pull/1608)
-* [Metrics] Switch to explicit 64 bit integers [#1686](https://github.com/open-telemetry/opentelemetry-cpp/pull/1686)
-  which includes breaking change in the Metrics api and sdk.
-* [Metrics SDK] Add support for Pull Metric Exporter [#1701](https://github.com/open-telemetry/opentelemetry-cpp/pull/1701)
-  which includes breaking change in the Metrics api.
-* [BUILD] Add CMake OTELCPP_MAINTAINER_MODE [#1650](https://github.com/open-telemetry/opentelemetry-cpp/pull/1650)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.14.0 [#1697](https://github.com/open-telemetry/opentelemetry-cpp/pull/1697)
-
-Notes:
-
-Metrics API/SDK GA release includes PRs [#1686](https://github.com/open-telemetry/opentelemetry-cpp/pull/1686),
-[#1701](https://github.com/open-telemetry/opentelemetry-cpp/pull/1701), and
-[#1707](https://github.com/open-telemetry/opentelemetry-cpp/pull/1707)
-with breaking changes in the Metrics API and SDK.
-
-## [1.6.1] 2022-09-22
-
-* [BUILD] Upgrade opentelemetry-proto to v0.19.0 [#1579](https://github.com/open-telemetry/opentelemetry-cpp/pull/1579)
-* [METRICS EXPORTER] Add `OtlpGrpcMetricExporterFactory` and `OtlpHttpMetricExporterFactory`.
-  [#1606](https://github.com/open-telemetry/opentelemetry-cpp/pull/1606)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.13.0 [#1624](https://github.com/open-telemetry/opentelemetry-cpp/pull/1624)
-* [BUILD] Fixes span creation benchmark issue. [#1622](https://github.com/open-telemetry/opentelemetry-cpp/pull/1622)
-* [BUILD] Fix more build warnings (#1616) [#1620](https://github.com/open-telemetry/opentelemetry-cpp/pull/1620)
-* [SDK gRPC]: Fix out-of-bounds access of string_view in GrpcClientCarrier in
-      the example
-      [#1619](https://github.com/open-telemetry/opentelemetry-cpp/pull/1619)
-* [EXPORTER ETW] Add Trace flags in SpanContext [#1618](https://github.com/open-telemetry/opentelemetry-cpp/pull/1618)
-* [SDK] resource sdk: Update Resource::Merge function docs [#1615](https://github.com/open-telemetry/opentelemetry-cpp/pull/1615)
-* [BUILD] Fix build warnings [#1613](https://github.com/open-telemetry/opentelemetry-cpp/pull/1613)
-* [API BUILD] Fix header only api singletons (#1520) [#1604](https://github.com/open-telemetry/opentelemetry-cpp/pull/1604)
-* [METRICS SDK] Fix default value of
-  `OtlpHttpMetricExporterOptions::aggregation_temporality`.
-  [#1601](https://github.com/open-telemetry/opentelemetry-cpp/pull/1601)
-* [METRICS EXAMPLE] Example for OTLP gRPC exporter for Metrics. [#1598](https://github.com/open-telemetry/opentelemetry-cpp/pull/1598)
-* [SDK] Fix `LoggerContext::Shutdown` and tsan of `OtlpHttpClient` [#1592](https://github.com/open-telemetry/opentelemetry-cpp/pull/1592)
-* [METRICS SDK] Fix 1585 - Multiple cumulative metric collections without
-  measurement recording.
-  [#1586](https://github.com/open-telemetry/opentelemetry-cpp/pull/1586)
-* [BUILD] metrics warnings [#1583](https://github.com/open-telemetry/opentelemetry-cpp/pull/1583)
-* [METRICS SDK] Fix ObservableInstrument::RemoveCallback [#1582](https://github.com/open-telemetry/opentelemetry-cpp/pull/1582)
-* [SDK] Add error log when getting a http error code [#1581](https://github.com/open-telemetry/opentelemetry-cpp/pull/1581)
-* [EXPORTER] ETW Exporter - Add support for Sampler and ID Generator [#1547](https://github.com/open-telemetry/opentelemetry-cpp/pull/1547)
-
-Notes:
-
-While [OpenTelemetry semantic
-convention](https://github.com/open-telemetry/opentelemetry-specification/tree/main/semantic_conventions)
-is still in experimental state, PR
-[#1624](https://github.com/open-telemetry/opentelemetry-cpp/pull/1624) upgraded
-it from 1.12.0 to 1.13.0 which **MAY** break the instrumentation library. Please
-update the semantic convention in instrumentation library is needed.
-
-## [1.6.0] 2022-08-15
-
-* [METRICS SDK] Calling Observable Instruments callback during metrics
-  collection
-  [#1554](https://github.com/open-telemetry/opentelemetry-cpp/pull/1554)
-* [METRICS CI] Add CI jobs for new and deprecated metrics [#1531](https://github.com/open-telemetry/opentelemetry-cpp/pull/1531)
-* [METRICS BUILD] Fix metrics asan and tsan CI [#1562](https://github.com/open-telemetry/opentelemetry-cpp/pull/1562)
-* [METRICS SDK] remove throw check from metrics  with noexcept [#1560](https://github.com/open-telemetry/opentelemetry-cpp/pull/1560)
-* [METRICS SDK] fix metrics race condition [#1552](https://github.com/open-telemetry/opentelemetry-cpp/pull/1552)
-* [METRICS SDK] Fix metrics context circular reference [#1535](https://github.com/open-telemetry/opentelemetry-cpp/pull/1535)
-* [METRICS EXPORTER] Improve scope/instrument names in metrics ostream exporter [#1544](https://github.com/open-telemetry/opentelemetry-cpp/pull/1544)
-* [METRICS BUILD] fix IWYU error in instruments.h [#1555](https://github.com/open-telemetry/opentelemetry-cpp/pull/1555)
-* [EXPORTER] Prometheus exporter support Gauge Type [#1553](https://github.com/open-telemetry/opentelemetry-cpp/pull/1553)
-* [METRICS SDK] Fix default Metric view name [#1515](https://github.com/open-telemetry/opentelemetry-cpp/pull/1515)
-* [SDK] Fix infinitely waiting when shutdown with more than one running http
-  sessions.
-  [#1549](https://github.com/open-telemetry/opentelemetry-cpp/pull/1549)
-* [METRICS SDK] Fix OTLP gRPC Metrics env variables [#1543](https://github.com/open-telemetry/opentelemetry-cpp/pull/1543)
-* [METRICS SDK] Metric aggregation temporality controls  [#1541](https://github.com/open-telemetry/opentelemetry-cpp/pull/1541)
-* [METRICS SDK] Histogram min/max support [#1540](https://github.com/open-telemetry/opentelemetry-cpp/pull/1540)
-* [METRICS EXPORTER] ostream exporter should print out resource attributes [#1523](https://github.com/open-telemetry/opentelemetry-cpp/pull/1523)
-* [METRICS SDK] Support multiple async callbacks [#1495](https://github.com/open-telemetry/opentelemetry-cpp/pull/1495)
-* [BUILD] Fix code scanning alert [#1530](https://github.com/open-telemetry/opentelemetry-cpp/pull/1530)
-* [BUILD] Fix several compiling/linking errors [#1539](https://github.com/open-telemetry/opentelemetry-cpp/pull/1539)
-* [TRACE SDK] Add SpanData getter for Span Recordable [#1508](https://github.com/open-telemetry/opentelemetry-cpp/pull/1508)
-* [LOG SDK] Fix log sdk builder (#1486) [#1524](https://github.com/open-telemetry/opentelemetry-cpp/pull/1524)
-* [METRICS SDK] Add configuration options for Aggregation creation [#1513](https://github.com/open-telemetry/opentelemetry-cpp/pull/1513)
-* [METRICS TEST] Fix metrics unit test memory leack [#1533](https://github.com/open-telemetry/opentelemetry-cpp/pull/1533)
-* [LOG SDK] Add log sdk builders (#1486) [#1524](https://github.com/open-telemetry/opentelemetry-cpp/pull/1524)
-
-## [1.5.0] 2022-07-29
-
-* [EXPORTER BUILD] Add resources to dep list of prometheus exporter test [#1527](https://github.com/open-telemetry/opentelemetry-cpp/pull/1527)
-* [BUILD] Don't require applications using jaeger exporter to know about libcurl
-  [#1518](https://github.com/open-telemetry/opentelemetry-cpp/pull/1518)
-* [EXPORTER] Inline print_value() in ostream exporter [#1512](https://github.com/open-telemetry/opentelemetry-cpp/pull/1512)
-* [SDK] fix: urlPaser will incorrect parsing url like `http://abc.com/xxx@xxx/a/b`
-  [#1511](https://github.com/open-telemetry/opentelemetry-cpp/pull/1511)
-* [SDK] Rename `InstrumentationLibrary` to `InstrumentationScope` [#1507](https://github.com/open-telemetry/opentelemetry-cpp/pull/1507)
-* [BUILD] Try to build nlohmann-json only it's depended. [#1505](https://github.com/open-telemetry/opentelemetry-cpp/pull/1505)
-* [EXPORTER BUILD] Link opentelemetry_api to ETW exporter test [#1503](https://github.com/open-telemetry/opentelemetry-cpp/pull/1503)
-* [SDK] Add automatically semantic conventions from the spec (#873) [#1497](https://github.com/open-telemetry/opentelemetry-cpp/pull/1497)
-* [SDK] Use template class for in-memory data. [#1496](https://github.com/open-telemetry/opentelemetry-cpp/pull/1496)
-* [SDK] fix compiler warnings [#1499](https://github.com/open-telemetry/opentelemetry-cpp/pull/1499)
-* [TRACE SDK] Add trace sdk builders (#1393) [#1471](https://github.com/open-telemetry/opentelemetry-cpp/pull/1471)
-* [METRICS BUILD] Enable bazel build for metrics proto files [#1489](https://github.com/open-telemetry/opentelemetry-cpp/pull/1489)
-* [METRICS EXPORTER] Add metrics OTLP/HTTP exporter [#1487](https://github.com/open-telemetry/opentelemetry-cpp/pull/1487)
-* [EXPORTER] fix otlp grpc exporter naming [#1488](https://github.com/open-telemetry/opentelemetry-cpp/pull/1488)
-* [BUILD] Remove `--config Debug` when installing. [#1480](https://github.com/open-telemetry/opentelemetry-cpp/pull/1480)
-* [EXPORTER] Fix endpoint in otlp grpc exporter [#1474](https://github.com/open-telemetry/opentelemetry-cpp/pull/1474)
-* [EXAMPLE] Fix memory ownership of InMemorySpanExporter (#1473) [#1471](https://github.com/open-telemetry/opentelemetry-cpp/pull/1471)
-* [EXPORTER TESTS] Prometheus unit test [#1461](https://github.com/open-telemetry/opentelemetry-cpp/pull/1461)
-* [DOCS] Update docs to use relative code links. [#1447](https://github.com/open-telemetry/opentelemetry-cpp/pull/1447)
-* [SDK] Remove reference to deprecated InstrumentationLibrary in OTLP [#1469](https://github.com/open-telemetry/opentelemetry-cpp/pull/1469)
-* [SDK] Fix trace kIsSampled flag set incorrectly [#1465](https://github.com/open-telemetry/opentelemetry-cpp/pull/1465)
-* [METRICS EXPORTER] OTLP gRPC Metrics Exporter [#1454](https://github.com/open-telemetry/opentelemetry-cpp/pull/1454)
-* [EXPORTER] fix prometheus exporter failure type [#1460](https://github.com/open-telemetry/opentelemetry-cpp/pull/1460)
-* [SDK] Fix build warnings about missing aggregates. [#1368](https://github.com/open-telemetry/opentelemetry-cpp/pull/1368)
-* [EXT] `curl::HttpClient` use `curl_multi_handle` instead of creating a thread
-  for every request and it's able to reuse connections now. ([#1317](https://github.com/open-telemetry/opentelemetry-cpp/pull/1317))
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.12.0 [#873](https://github.com/open-telemetry/opentelemetry-cpp/pull/873)
-
-## [1.4.1] 2022-06-19
-
-* [METRICS SDK] Fix variables inizialization [#1430](https://github.com/open-telemetry/opentelemetry-cpp/pull/1430)
-* [DOCS] Fixed broken link to OpenTelemetry.io (#1445) [#1446](https://github.com/open-telemetry/opentelemetry-cpp/pull/1446)
-* [BUILD] Upgrade nlohmann_json to 3.10.5 (#1438) [#1441](https://github.com/open-telemetry/opentelemetry-cpp/pull/1441)
-* [METRICS SDK] fix histogram [#1440](https://github.com/open-telemetry/opentelemetry-cpp/pull/1440)
-* [DOCS] Fix GettingStarted documentation for Jaeger HTTP exporter (#1347) [#1439](https://github.com/open-telemetry/opentelemetry-cpp/pull/1439)
-* [BUILD] install sdk-config.h [#1419](https://github.com/open-telemetry/opentelemetry-cpp/pull/1419)
-* [EXAMPLE] Log current timestamp instead of epoch time [#1434](https://github.com/open-telemetry/opentelemetry-cpp/pull/1434)
-* [METRICS SDK] Add attributes/dimensions to metrics ostream exporter [#1400](https://github.com/open-telemetry/opentelemetry-cpp/pull/1400)
-* [SDK] Fix global log handle symbols when using dlopen [#1420](https://github.com/open-telemetry/opentelemetry-cpp/pull/1420)
-* [METRICS] Only record non-negative / finite / Non-NAN histogram values([#1427](https://github.com/open-telemetry/opentelemetry-cpp/pull/1427))
-* [ETW EXPORTER] Fix ETW log exporter header inclusion [#1426](https://github.com/open-telemetry/opentelemetry-cpp/pull/1426)
-* [ETW EXPORTER] Copy string_view passed to ETW exporter in PropertyVariant [#1425](https://github.com/open-telemetry/opentelemetry-cpp/pull/1425)
-* [METRICS API/SDK] Pass state to async callback function. [#1408](https://github.com/open-telemetry/opentelemetry-cpp/pull/1408)
-* [BUILD] fix nlohmann_json's (third party) include dir [#1415](https://github.com/open-telemetry/opentelemetry-cpp/pull/1415)
-* [SDK] fix: WaitOnSocket select error when sockfd above FD_SETSIZE [#1410](https://github.com/open-telemetry/opentelemetry-cpp/pull/1410)
-* [SDK] fix OTEL_INTERNAL_LOG_INFO [#1407](https://github.com/open-telemetry/opentelemetry-cpp/pull/1407)
-* [DOCS] Document Getting Started with Prometheus and Grafana [#1396](https://github.com/open-telemetry/opentelemetry-cpp/pull/1396)
-
-## [1.4.0] 2022-05-17
-
-* [API SDK] Upgrade proto to v0.17.0, update log data model ([#1383](https://github.com/open-telemetry/opentelemetry-cpp/pull/1383))
-* [BUILD] Alpine image ([#1382](https://github.com/open-telemetry/opentelemetry-cpp/pull/1382))
-* [LOGS SDK] Get span_id from context when Logger::Log received invalid span_id
-  ([#1398](https://github.com/open-telemetry/opentelemetry-cpp/pull/1398))
-* [METRICS SDK] Connect async storage with async instruments ([#1388](https://github.com/open-telemetry/opentelemetry-cpp/pull/1388))
-* [DOCS] Getting started document using ostream exporter ([#1394](https://github.com/open-telemetry/opentelemetry-cpp/pull/1394))
-* [BUILD] Fix missing link to nlohmann_json ([#1390](https://github.com/open-telemetry/opentelemetry-cpp/pull/1390))
-* [SDK] Fix sharing resource in batched exported spans ([#1386](https://github.com/open-telemetry/opentelemetry-cpp/pull/1386))
-* [PROTOCOL \& LOGS] Upgrade proto to v0.17.0, update log data model ([#1383](https://github.com/open-telemetry/opentelemetry-cpp/pull/1383))
-* [METRICS SDK] Remove un-necessary files. ([#1379](https://github.com/open-telemetry/opentelemetry-cpp/pull/1379))
-* [EXPORTER] Prometheus exporter meters and instrument name ([#1378](https://github.com/open-telemetry/opentelemetry-cpp/pull/1378))
-* [API] Add noexcept/const qualifier at missing places for Trace API. ([#1374](https://github.com/open-telemetry/opentelemetry-cpp/pull/1374))
-* [SDK] Fix empty tracestate header propagation ([#1373](https://github.com/open-telemetry/opentelemetry-cpp/pull/1373))
-* [METRICS SDK] Reuse temporal metric storage for sync storage ([#1369](https://github.com/open-telemetry/opentelemetry-cpp/pull/1369))
-* [SDK] Fix baggage propagation for empty/invalid baggage context ([#1367](https://github.com/open-telemetry/opentelemetry-cpp/pull/1367))
-* [BUILD] Export opentelemetry_otlp_recordable ([#1365](https://github.com/open-telemetry/opentelemetry-cpp/pull/1365))
-* [TESTS] Disable test on prometheus-cpp which not need ([#1363](https://github.com/open-telemetry/opentelemetry-cpp/pull/1363))
-* [METRICS] Fix class member initialization order ([#1360](https://github.com/open-telemetry/opentelemetry-cpp/pull/1360))
-* [METRICS SDK] Simplify SDK Configuration: Use View with default aggregation if
-  no matching View is configured
-  ([#1358](https://github.com/open-telemetry/opentelemetry-cpp/pull/1358))
-* [BUILD] Add missing include guard ([#1357](https://github.com/open-telemetry/opentelemetry-cpp/pull/1357))
-* [ETW EXPORTER] Fix scalar delete against array ([#1356](https://github.com/open-telemetry/opentelemetry-cpp/pull/1356))
-* [ETW EXPORTER] Conditional include for codecvt header ([#1355](https://github.com/open-telemetry/opentelemetry-cpp/pull/1355))
-* [BUILD] Use latest TraceLoggingDynamic.h ([#1354](https://github.com/open-telemetry/opentelemetry-cpp/pull/1354))
-* [SDK] Add explicit type cast in baggage UrlDecode ([#1353](https://github.com/open-telemetry/opentelemetry-cpp/pull/1353))
-* [METRICS SDK] Remove exporter registration to meter provider ([#1350](https://github.com/open-telemetry/opentelemetry-cpp/pull/1350))
-* [METRICS SDK] Fix output time in metrics OStream exporter ([#1346](https://github.com/open-telemetry/opentelemetry-cpp/pull/1346))
-* [BUILD] ostream metrics cmake ([#1344](https://github.com/open-telemetry/opentelemetry-cpp/pull/1344))
-* [BUILD] Link `opentelemetry_ext` with `opentelemetry_api` ([#1336](https://github.com/open-telemetry/opentelemetry-cpp/pull/1336))
-* [METRICS SDK] Enable metric collection for Async Instruments - Delta and
-  Cumulative
-  ([#1334](https://github.com/open-telemetry/opentelemetry-cpp/pull/1334))
-* [BUILD] Dependencies image as artifact ([#1333](https://github.com/open-telemetry/opentelemetry-cpp/pull/1333))
-* [EXAMPLE] Prometheus example ([#1332](https://github.com/open-telemetry/opentelemetry-cpp/pull/1332))
-* [METRICS EXPORTER] Prometheus exporter ([#1331](https://github.com/open-telemetry/opentelemetry-cpp/pull/1331))
-* [METRICS] Metrics histogram example ([#1330](https://github.com/open-telemetry/opentelemetry-cpp/pull/1330))
-* [TESTS] Replace deprecated googletest API ([#1327](https://github.com/open-telemetry/opentelemetry-cpp/pull/1327))
-* [BUILD] Fix Ninja path ([#1326](https://github.com/open-telemetry/opentelemetry-cpp/pull/1326))
-* [API] Update yield logic for ARM processor ([#1325](https://github.com/open-telemetry/opentelemetry-cpp/pull/1325))
-* [BUILD] Fix metrics compiler warnings ([#1328](https://github.com/open-telemetry/opentelemetry-cpp/pull/1328))
-* [METRICS SDK] Implement Merge and Diff operation for Histogram Aggregation ([#1303](https://github.com/open-telemetry/opentelemetry-cpp/pull/1303))
-
-Notes:
-
-While opentelemetry-cpp Logs are still in experimental stage,
-[#1383](https://github.com/open-telemetry/opentelemetry-cpp/pull/1383) updated
-opentelemetry-proto to 0.17.0, which includes some breaking change in the
-protocol, like
-[this](https://github.com/open-telemetry/opentelemetry-proto/pull/373). This
-makes `name` parameter for our log API unnecessary. However, this parameter is
-marked deprecated instead of being removed in this release, and it will be
-removed in future release.
-
-## [1.3.0] 2022-04-11
-
-* [ETW EXPORTER] ETW provider handle cleanup ([#1322](https://github.com/open-telemetry/opentelemetry-cpp/pull/1322))
-* [BUILD] Move public definitions into `opentelemetry_api`. ([#1314](https://github.com/open-telemetry/opentelemetry-cpp/pull/1314))
-* [METRICS] OStream example ([#1312](https://github.com/open-telemetry/opentelemetry-cpp/pull/1312))
-* [BUILD] Rename `http_client_curl` to `opentelemetry_http_client_curl` ([#1301](https://github.com/open-telemetry/opentelemetry-cpp/pull/1301))
-* [METRICS SDK] Add InstrumentationInfo and Resource to the metrics data to be
-  exported.
-  ([#1299](https://github.com/open-telemetry/opentelemetry-cpp/pull/1299))
-* [TESTS] Add building test without RTTI ([#1294](https://github.com/open-telemetry/opentelemetry-cpp/pull/1294))
-* [METRICS SDK] Implement periodic exporting metric reader ([#1286](https://github.com/open-telemetry/opentelemetry-cpp/pull/1286))
-* [SDK] Bugfix: span SetAttribute crash ([#1283](https://github.com/open-telemetry/opentelemetry-cpp/pull/1283))
-* [BUG] Remove implicitly deleted default constructor ([#1267](https://github.com/open-telemetry/opentelemetry-cpp/pull/1267))
-* [METRICS SDK] Synchronous Metric collection (Delta , Cumulative) ([#1265](https://github.com/open-telemetry/opentelemetry-cpp/pull/1265))
-* [METRICS SDK] Metrics exemplar round 1 ([#1264](https://github.com/open-telemetry/opentelemetry-cpp/pull/1264))
-* [EXPORTER] Fix: use CURLOPT_TIMEOUT_MS to config OtlpHttpExporter's timeout
-  instead of CURLOPT_TIMEOUT
-  ([#1261](https://github.com/open-telemetry/opentelemetry-cpp/pull/1261))
-* [EXPORTER] Jaeger Exporter - Populate Span Links ([#1251](https://github.com/open-telemetry/opentelemetry-cpp/pull/1251))
-* [SDK] Reorder the destructor of members in LoggerProvider and TracerProvider ([#1245](https://github.com/open-telemetry/opentelemetry-cpp/pull/1245))
-* [METRICS SDK] Enable metric collection from MetricReader ([#1241](https://github.com/open-telemetry/opentelemetry-cpp/pull/1241))
-* [METRICS SDK] Asynchronous Aggregation storage ([#1232](https://github.com/open-telemetry/opentelemetry-cpp/pull/1232))
-* [METRICS SDK] Synchronous Instruments - Aggregation Storage(s) creation for
-  configured views
-  ([#1219](https://github.com/open-telemetry/opentelemetry-cpp/pull/1219))
-* [BUILD] Added s390x arch into CMake build. ([#1216](https://github.com/open-telemetry/opentelemetry-cpp/pull/1216))
-* [API] Allow extension of the lifetime of ContextStorage. ([#1214](https://github.com/open-telemetry/opentelemetry-cpp/pull/1214))
-* [METRICS SDK] Add Aggregation storage ([#1213](https://github.com/open-telemetry/opentelemetry-cpp/pull/1213))
-* [TESTS] Fix ostream_log_test Mac ([#1208](https://github.com/open-telemetry/opentelemetry-cpp/pull/1208))
-* [BUILD] Update grpc to v1.43.2 to support VS2022/MSVC 19.30 and bazel 5.0 ([#1207](https://github.com/open-telemetry/opentelemetry-cpp/pull/1207))
-* [DOCS] Benchmark documentation ([#1205](https://github.com/open-telemetry/opentelemetry-cpp/pull/1205))
-* [DOCS] Fix errors in SDK documentation ([#1201](https://github.com/open-telemetry/opentelemetry-cpp/pull/1201))
-* [METRICS EXPORTER] Ostream metric exporter ([#1196](https://github.com/open-telemetry/opentelemetry-cpp/pull/1196))
-* [Metrics SDK] Filtering metrics attributes ([#1191](https://github.com/open-telemetry/opentelemetry-cpp/pull/1191))
-* [Metrics SDK] Sync and Async Instruments SDK ([#1184](https://github.com/open-telemetry/opentelemetry-cpp/pull/1184))
-* [Metrics SDK] Add Aggregation as part of metrics SDK. ([#1178](https://github.com/open-telemetry/opentelemetry-cpp/pull/1178))
-* [BUILD] Cmake: thrift requires boost headers, include them as
-  Boost_INCLUDE_DIRS
-  ([#1100](https://github.com/open-telemetry/opentelemetry-cpp/pull/1100))
-
-Notes:
-
-[#1301](https://github.com/open-telemetry/opentelemetry-cpp/pull/1301) added
-`opentelemetry_` as prefix to http_client_curl library for resolving potential
-naming conflict, this could break existing cmake build if http_client_curl is
-listed as explicit dependency in user's cmake file.
-
-## [1.2.0] 2022-01-31
-
-* [CI] Continuous benchmark tests as part of the CI ([#1174](https://github.com/open-telemetry/opentelemetry-cpp/pull/1174))
-* [API] Allow to use external abseil for bazel targets ([#1172](https://github.com/open-telemetry/opentelemetry-cpp/pull/1172))
-* [EXPORTER] Importing gsl::span if std::span is not available ([#1167](https://github.com/open-telemetry/opentelemetry-cpp/pull/1167))
-* [EXPORTER] Synchronized calls to Exporter::Export & Shutdown ([#1164](https://github.com/open-telemetry/opentelemetry-cpp/pull/1164))
-* [EXPORTER] OTLP http exporter block thread  ([#1163](https://github.com/open-telemetry/opentelemetry-cpp/pull/1163))
-* [TESTS] Jaeger: ThriftSender unit test ([#1162](https://github.com/open-telemetry/opentelemetry-cpp/pull/1162))
-* [EXPORTER] InMemorySpanExporter shutdown fix ([#1161](https://github.com/open-telemetry/opentelemetry-cpp/pull/1161))
-* [EXPORTER] Fix leak in Jaeger exporter ([#1160](https://github.com/open-telemetry/opentelemetry-cpp/pull/1160))
-* [TESTS] ZipkinExporter unit-tests ([#1155](https://github.com/open-telemetry/opentelemetry-cpp/pull/1155))
-* [SDK] Logger: propagating resources through LoggerProvider ([#1154](https://github.com/open-telemetry/opentelemetry-cpp/pull/1154))
-* [SDK] Logger: support for instrumentation library ([#1149](https://github.com/open-telemetry/opentelemetry-cpp/pull/1149))
-* [SDK] Add log level for internal log of sdk ([#1147](https://github.com/open-telemetry/opentelemetry-cpp/pull/1147))
-* [METRICS] Metrics SDK: View API ([#1110](https://github.com/open-telemetry/opentelemetry-cpp/pull/1110))
-
-Notes on experimental features:
-
-[#1149](https://github.com/open-telemetry/opentelemetry-cpp/pull/1149) and
-[#1154](https://github.com/open-telemetry/opentelemetry-cpp/pull/1154) from
-above CHANGELOG introduced API changes which are not backward compatible with
-previous logs, please update API package to this release if
-`ENABLE_LOGS_PREVIEW` is turned on (it is turned off by default).
-
-## [1.1.1] 2021-12-20
-
-* [SDK] Rename OTEL_CPP_GET_ATTR macro, and define it using fully qualified attr
-  function
-  ([#1140](https://github.com/open-telemetry/opentelemetry-cpp/pull/1140))
-* [SDK] Default resource attributes and attributes in OTEL_RESOURCE_ATTRIBUTES
-  are missing when using Otlp*LogExporter
-  ([#1082](https://github.com/open-telemetry/opentelemetry-cpp/pull/1082))
-* [METRICS] Add Meter and MeterProvider in the SDK
-  ([#1078](https://github.com/open-telemetry/opentelemetry-cpp/pull/1078))
-* [EXPORTER] ZipkinExporter shutdown
-  ([#1153](https://github.com/open-telemetry/opentelemetry-cpp/pull/1153))
-* [EXPORTER] Jaeger exporter shutdown
-  ([#1150](https://github.com/open-telemetry/opentelemetry-cpp/pull/1150))
-* [EXPORTER] Bugfix: `jaeger::TUDPTransport::write` crash when `getaddrinfo`
-  returns error
-  ([#1116](https://github.com/open-telemetry/opentelemetry-cpp/pull/1116))
-* [EXPORTER] Bugfix: Jaeger exporter: extend supported attributes types
-  ([#1106](https://github.com/open-telemetry/opentelemetry-cpp/pull/1106))
-* [EXPORTER] Fix otlp generates null span ids
-  ([#1113](https://github.com/open-telemetry/opentelemetry-cpp/pull/1113))
-* [EXPORTER] Jaeger bazel (Linux only)
-  ([#1077](https://github.com/open-telemetry/opentelemetry-cpp/pull/1077))
-* [DOCS] Add note on DLL support
-  ([#1137](https://github.com/open-telemetry/opentelemetry-cpp/pull/1137))
-* [DOCS] Improve the instructions for Bazel build
-  ([#1136](https://github.com/open-telemetry/opentelemetry-cpp/pull/1136))
-* [DOCS] Document dependencies
-  ([#1119](https://github.com/open-telemetry/opentelemetry-cpp/pull/1119))
-* [DOCS] Dockerfile for quick demo/troubleshooting purpose
-  ([#905](https://github.com/open-telemetry/opentelemetry-cpp/pull/905))
-* [TESTS] Fix data race in BM_ThreadYieldSpinLockThrashing
-  ([#1099](https://github.com/open-telemetry/opentelemetry-cpp/pull/1099))
-* [EXAMPLE] Otlp gRPC log example
-  ([#1083](https://github.com/open-telemetry/opentelemetry-cpp/pull/1083))
-* [BUILD] C++20 not Building with VS2019
-  ([#1144](https://github.com/open-telemetry/opentelemetry-cpp/pull/1144))
-* [BUILD] Mark tags to bazel
-  targets([#1075](https://github.com/open-telemetry/opentelemetry-cpp/pull/1075))
-
-## [1.1.0] 2021-11-19
-
-* [BUILD] build release tarball when nlohmann-json not installed
-  ([#1074](https://github.com/open-telemetry/opentelemetry-cpp/pull/1074))
-* [SDK] Bugfix: regex is neither working on GCC 4.9.x
-  ([#1069](https://github.com/open-telemetry/opentelemetry-cpp/pull/1069))
-* [SDK] Improvement: span_id should not break strict aliasing.
-  ([#1068](https://github.com/open-telemetry/opentelemetry-cpp/pull/1068))
-* [EXAMPLE] OTLP HTTP log example
-  ([#1062](https://github.com/open-telemetry/opentelemetry-cpp/pull/1062))
-* [SDK] OTLP gRPC log export should fail after shutdown
-  ([#1064](https://github.com/open-telemetry/opentelemetry-cpp/pull/1064))
-* [BUILD] Building otlp exporter from the release tarball
-  ([#1056](https://github.com/open-telemetry/opentelemetry-cpp/pull/1056))
-* [METRICS] Move old metrics implementation to different directory, and rename
-  targets to \_deprecated
-  ([#1053](https://github.com/open-telemetry/opentelemetry-cpp/pull/1053))
-* [EXPORTER] Add OTLP/gRPC Log Exporter
-  ([#1048](https://github.com/open-telemetry/opentelemetry-cpp/pull/1048))
-* [EXPORTER] Prometheus Exporter
-  ([#1031](https://github.com/open-telemetry/opentelemetry-cpp/pull/1031))
-* [EXPORTER] Add OTLP/HTTP Log Exporter
-  ([#1030](https://github.com/open-telemetry/opentelemetry-cpp/pull/1030))
-* [SDK] fix: issue 368- consistent namespace scope resolution
-  ([#1008](https://github.com/open-telemetry/opentelemetry-cpp/pull/1008))
-
-## [1.0.1] 2021-10-21
-
-* [EXPORTER] Exports span attributes to ETW
-  ([#1021](https://github.com/open-telemetry/opentelemetry-cpp/pull/1021))
-* [BUILD] cmake: add FindThrift.cmake find module method for thrift
-  ([#1020](https://github.com/open-telemetry/opentelemetry-cpp/pull/1020))
-* [BUILD] Fix nlohmann_json package dependency
-  ([#1017](https://github.com/open-telemetry/opentelemetry-cpp/pull/1017))
-* [EXPORTER] Change OTLP/HTTP default port from 4317 to 4318
-  ([#1018](https://github.com/open-telemetry/opentelemetry-cpp/pull/1018))
-* [EXPORTER] ETW Log Exporter
-  ([#1006](https://github.com/open-telemetry/opentelemetry-cpp/pull/1006))
-* [API] Adding new Logger:log() method
-  ([#1005](https://github.com/open-telemetry/opentelemetry-cpp/pull/1005))
-* [EXPORTER] Remove scheme from OTLP endpoint before passing to gRPC
-  ([#988](https://github.com/open-telemetry/opentelemetry-cpp/pull/988))
-* [BUILD] Update opentelemetry-proto for bazel build to 0.9.0
-  ([#984](https://github.com/open-telemetry/opentelemetry-cpp/pull/984))
-* [BUILD] Cross compling grpc_cpp_plugin not found bug
-  ([#982](https://github.com/open-telemetry/opentelemetry-cpp/pull/982))
-* [EXPORTER] Support environment variables for both `OtlpGrpcExporter` and
-  `OtlpHttpExporter`
-  ([#983](https://github.com/open-telemetry/opentelemetry-cpp/pull/983))
-* [API/SDK] Add schema_url support to both Resource and InstrumentationLibrary
-  ([#979](https://github.com/open-telemetry/opentelemetry-cpp/pull/979))
-* [BUILD] Fix build issue where _memcpy_ was not declared in scope
-  ([#985](https://github.com/open-telemetry/opentelemetry-cpp/issues/985))
-
-## [1.0.0] 2021-09-16
-
-### API
-
-* Document DefaultSpan, remove DefaultTracer
-  ([#959](https://github.com/open-telemetry/opentelemetry-cpp/pull/959))
-* Separate baggage<->Context api from Baggage Propagator
-  ([#963](https://github.com/open-telemetry/opentelemetry-cpp/pull/963))
-* Remove unused public API to_span_ptr
-  ([#964](https://github.com/open-telemetry/opentelemetry-cpp/pull/964))
-* :collision: Make span context management public
-  ([#967](https://github.com/open-telemetry/opentelemetry-cpp/pull/967))
-* Support determining parent span from Context while creating new Span
-  ([#969](https://github.com/open-telemetry/opentelemetry-cpp/pull/969))
-* :collision: Traces: Add note on experimental semantic convention
-  implementation, prefix semantics headers with experimental tag
-  ([#970](https://github.com/open-telemetry/opentelemetry-cpp/pull/970))
-* Increment OPENTELEMETRY_ABI_VERSION_NO to 1
-  ([#980](https://github.com/open-telemetry/opentelemetry-cpp/pull/980))
-
-### SDK
-
-* Clean up `GetEnvironmentVariable` and remove unused variable under `NO_GETENV`
-  ([#976](https://github.com/open-telemetry/opentelemetry-cpp/pull/976))
-* :collision: Resources: Add note on experimental semantic convention
-  implementation, prefix semantics headers with experimental tag
-  ([#970](https://github.com/open-telemetry/opentelemetry-cpp/pull/970))
-
-### OTLP Exporter
-
-* :bug: Ignore status description if status code is not Error
-  ([#962](https://github.com/open-telemetry/opentelemetry-cpp/pull/962))
-* :collision: Make Otlp exporter configuration environment variables
-  specs-compliant
-  ([#974](https://github.com/open-telemetry/opentelemetry-cpp/pull/974))
-
-### Zipkin Exporter
-
-* :bug: Don't set parentId in case parentId is empty
-  ([#943](https://github.com/open-telemetry/opentelemetry-cpp/pull/943))
-* :rocket: Extend zipkin exporter with ability to provide headers
-  ([#951](https://github.com/open-telemetry/opentelemetry-cpp/pull/951))
-
-### DOCS
-
-* :book: Add getting-started documentation for SDK:
-  ([#942](https://github.com/open-telemetry/opentelemetry-cpp/pull/942))
-* :book: Remove unnecessary spaces and spelling of gRPC in README
-  ([#965](https://github.com/open-telemetry/opentelemetry-cpp/pull/965))
-
-### BUILD
-
-* Disable bazel build for gcc 4.8, upgrade versions for grpc(v1.39.1) and
-  bazel(4.2.0), document bazel support
-  ([#953](https://github.com/open-telemetry/opentelemetry-cpp/pull/953))
-* Move CMake config template to cmake folder
-  ([#958](https://github.com/open-telemetry/opentelemetry-cpp/pull/958))
-* Enable CMake to search the new package variable `<PackageName>_ROOT`
-  ([#975](https://github.com/open-telemetry/opentelemetry-cpp/pull/975))
-* :bug: Do not override CMAKE_CXX_STANDARD
-  ([#977](https://github.com/open-telemetry/opentelemetry-cpp/pull/977))
-
-### :construction: Experiemental Features (Will change in future)
-
-* Semantic Conventions for traces - As the specs is still experimental, the
-  implementation will change in future.
-* Semantic Convention for resource - As the specs is still experimental, the
-  implementation will change in future.
-* Logs and Metrics API & SDK - These are not compliant, and are behind feature
-  flag. Not recommended to use for now.
-
-## [1.0.0-rc4] 2021-08-04
-
-* [EXPORTER] `BREAKING CHANGE` Fix default HTTP port for OTLP HTTP Exporter
-  ([#939](https://github.com/open-telemetry/opentelemetry-cpp/pull/939))
-* [API] Fix timeout calculation for Tracer::Flush() and Tracer::Close()
-  ([#937](https://github.com/open-telemetry/opentelemetry-cpp/pull/937))
-* [API] Fix for Stack::Resize that new_capacity is not assigned to capacity_
-  ([#934](https://github.com/open-telemetry/opentelemetry-cpp/pull/934))
-* [SDK] Fix race condition in circular buffer simulation test
-  ([#931](https://github.com/open-telemetry/opentelemetry-cpp/pull/931))
-* [EXPORTER] Fix error logging in Jaeger Exporter
-  ([#930](https://github.com/open-telemetry/opentelemetry-cpp/pull/930))
-* [BUILD] Use latest grpc version (v1.39.0) for cmake build of otlp exporter
-  ([#927](https://github.com/open-telemetry/opentelemetry-cpp/pull/927))
-* [EXPORTER] Add Jaeger Thrift HTTP exporter
-  ([#926](https://github.com/open-telemetry/opentelemetry-cpp/pull/926))
-* [SDK] Move env-var read logic to common dir, and optional reading of env-var
-  ([#924](https://github.com/open-telemetry/opentelemetry-cpp/pull/924))
-* [EXPORTER] Remove recordable header from CMake install rules for exporters
-  ([#923](https://github.com/open-telemetry/opentelemetry-cpp/pull/923))
-* [EXPORTER] `BREAKING CHANGE` Rename Recordable to JaegerRecordable in Jaeger
-  exporter
-  ([#919](https://github.com/open-telemetry/opentelemetry-cpp/pull/919))
-* [EXPORTER] `BREAKING CHANGE` Rename Jaeger exporter target
-  ([#918](https://github.com/open-telemetry/opentelemetry-cpp/pull/918))
-* [EXPORTER] Add Zipkin exporter example
-  ([#917](https://github.com/open-telemetry/opentelemetry-cpp/pull/917))
-* [EXPORTER] Bazel build for Zipkin exorter
-  ([#916](https://github.com/open-telemetry/opentelemetry-cpp/pull/916))
-* [BUILD] Allow to use local GSL
-  ([#915](https://github.com/open-telemetry/opentelemetry-cpp/pull/915))
-* [DOCS] Document vcpkg toolchain configuration
-  ([#913](https://github.com/open-telemetry/opentelemetry-cpp/pull/913))
-* [SDK] Fix for resource deletion after tracer provider shutdown
-  ([#911](https://github.com/open-telemetry/opentelemetry-cpp/pull/911))
-* [BUILD] Add bazel build for grpc example
-  ([#910](https://github.com/open-telemetry/opentelemetry-cpp/pull/910))
-* [EXPORTER] Add resource and instrumentation library support for
-  OStreamSpanExporter
-  ([#906](https://github.com/open-telemetry/opentelemetry-cpp/pull/906))
-* [API] Adding semantic-convention attributes for trace
-  ([#868](https://github.com/open-telemetry/opentelemetry-cpp/pull/868))
-
-## [1.0.0-rc3] 2021-07-12
-
-* [DOCS] Add doxygen reference docs for SDK
-  ([#902](https://github.com/open-telemetry/opentelemetry-cpp/pull/902))
-* [EXPORTER] Jaeger Exporter - Populate resource attributes into process tags in
-  Jaeger ([#897](https://github.com/open-telemetry/opentelemetry-cpp/pull/897))
-* [EXPORTER] Zipkin Exporter - Report Event timestamp into microseconds
-  ([#896](https://github.com/open-telemetry/opentelemetry-cpp/pull/896))
-* [EXPORTER] Jaeger Exporter - Handle span events
-  ([#895](https://github.com/open-telemetry/opentelemetry-cpp/pull/895))
-* [DOCS] Fix API docs for Scope object
-  ([#894](https://github.com/open-telemetry/opentelemetry-cpp/pull/894))
-* [BUILD] Fix Linking error for libcurl on some macOS environments
-  ([#893](https://github.com/open-telemetry/opentelemetry-cpp/pull/893))
-* [API] Context cleanup from Runtime Storage
-  ([#885](https://github.com/open-telemetry/opentelemetry-cpp/pull/885))
-* [DOCS] Document strategy to avoid conflict between two different versions of
-  Abseil ([#883](https://github.com/open-telemetry/opentelemetry-cpp/pull/883/))
-* [EXPORTER] ETW Exporter - Document example for ETW Exporter
-  ([#882](https://github.com/open-telemetry/opentelemetry-cpp/pull/882))
-* [SDK] Create Span with Valid spanId and traceId irrespective of Sampling
-  decision
-  ([#879](https://github.com/open-telemetry/opentelemetry-cpp/pull/879))
-* [EXPORTER] Jaeger Exporter - Rename bswap macros to avoid clash on some
-  systems ([#876](https://github.com/open-telemetry/opentelemetry-cpp/pull/876))
-* [API] Add Semantics Conventions attributes for Resources
-  ([#872](https://github.com/open-telemetry/opentelemetry-cpp/pull/872))
-* [BUILD] Use nlohmann-json from submodules if not already installed
-  ([#870](https://github.com/open-telemetry/opentelemetry-cpp/pull/870))
-
-## [1.0.0-rc2] 2021-06-18
-
-* [EXPORTER] Jaeger Exporter - Support for Instrumentation Library
-  ([#864](https://github.com/open-telemetry/opentelemetry-cpp/pull/864))
-* [TESTS] Adding benchmark tests for baggage api
-  ([#861](https://github.com/open-telemetry/opentelemetry-cpp/pull/861))
-* [BUILD] Fix for GCC9/C++20 Support for using STL for modern C++ features
-  ([#860](https://github.com/open-telemetry/opentelemetry-cpp/pull/860))
-* [TESTS] Adding benchmark tests for span create api
-  ([#856](https://github.com/open-telemetry/opentelemetry-cpp/pull/856))
-* [BUILD] Fix for using Abseil library for modern C++ features
-  ([#850](https://github.com/open-telemetry/opentelemetry-cpp/pull/850))
-* [BUILD] Fix issues with win32/x86 compilation
-  ([#847](https://github.com/open-telemetry/opentelemetry-cpp/pull/847))
-* [DOCS] Document OSS dependencies and their licenses
-  ([#844](https://github.com/open-telemetry/opentelemetry-cpp/pull/844))
-* [BUILD] Various fixes to build with Visual Studio 2015
-  ([#840](https://github.com/open-telemetry/opentelemetry-cpp/pull/840))
-* [INSTRUMENTATION] HTTPClient: Change support for full URL argument
-  ([#833](https://github.com/open-telemetry/opentelemetry-cpp/pull/833))
-* [EXPORTER] Jaeger Exporter - fix endianness of Jaeger IDs for transmission
-  ([#832](https://github.com/open-telemetry/opentelemetry-cpp/pull/832))
-* [INSTRUMENTATION] fix protobuf compilation warning in gRPC example
-  ([#830](https://github.com/open-telemetry/opentelemetry-cpp/pull/830))
-* [EXPORTER] `BREAKING CHANGE` - Add OTLP/HTTP+JSON Protocol exporter; Rename
-  `OtlpExporter` to `OtlpGrpcExporter`
-  ([#810](https://github.com/open-telemetry/opentelemetry-cpp/pull/810))
-
-## [1.0.0-rc1] 2021-06-04
-
-* [BUILD] Enable Jaeger exporter build in Windows
-  ([#815](https://github.com/open-telemetry/opentelemetry-cpp/pull/815))
-* [DOCS] Versioning doc update to clarify release and versioning policy
-  ([#811](https://github.com/open-telemetry/opentelemetry-cpp/pull/811))
-* [LOGS] Move Logging implementation under feature-flag
-  ([#807](https://github.com/open-telemetry/opentelemetry-cpp/pull/807))
-* [BUILD] Filter metric headers files from `opentelemetry-api` and
-  `opentelemetry-sdk` targets if metrics feature-flag is disabled
-  ([#806](https://github.com/open-telemetry/opentelemetry-cpp/pull/806))
-* [BUILD] Fix install rule for ostream exporter, Jaeger, ETW, ElasticSearch
-  ([#805](Fix install rule for header files of ostream exporter))
-* [API/SDK] Switch from mpark::variant to absl::variant as default
-  ([#771](https://github.com/open-telemetry/opentelemetry-cpp/pull/771))
-* [API/SDK] Support `const char *` as acceptable data type for attributes and
-  resources
-  ([#771](https://github.com/open-telemetry/opentelemetry-cpp/pull/771))
-* [EXAMPLE] gRPC instrumentation example with context propagation
-  ([#729](https://github.com/open-telemetry/opentelemetry-cpp/pull/729))
-
-## [0.7.0] 2021-05-26
-
-* [METRICS] Move metrics api/sdk under preview feature flag
-  ([#745](https://github.com/open-telemetry/opentelemetry-cpp/pull/745))
-* [DOCS] Add instructions to build using Bazel
-  ([#747](https://github.com/open-telemetry/opentelemetry-cpp/pull/747))
-* [DOCS] Update copyright headers
-  ([#754](https://github.com/open-telemetry/opentelemetry-cpp/pull/754))
-* [EXPORTER] Populate resource to OTLP proto data
-  ([#758](https://github.com/open-telemetry/opentelemetry-cpp/pull/758))
-* [CI] Add CodeQL security scan CI workflow
-  ([#770](https://github.com/open-telemetry/opentelemetry-cpp/pull/770))
-* [BUILD] Enable building API only CMake Project
-  ([#778](https://github.com/open-telemetry/opentelemetry-cpp/pull/778))
-* [SDK] Fix for sampling of root span
-  ([#784](https://github.com/open-telemetry/opentelemetry-cpp/pull/784))
-* [CI] Add Jaeger exporter to CMake CI build
-  ([#786](https://github.com/open-telemetry/opentelemetry-cpp/pull/786))
-* [API] `BREAKING CHANGE` - Tracer::WithActiveSpan() to return Scope object
-  intead of unique_ptr
-  ([#788](https://github.com/open-telemetry/opentelemetry-cpp/pull/788))
-* [DOCS] Add docs for nested spans and context propagation in readthedocs
-  ([#792](https://github.com/open-telemetry/opentelemetry-cpp/pull/792))
-* [CI] Output verbose error for failed unit-test in CI
-  ([#796](https://github.com/open-telemetry/opentelemetry-cpp/pull/796))
-
-## [0.6.0] 2021-05-11
-
-* [EXPORTER] Add Jaeger exporter
-  ([#534](https://github.com/open-telemetry/opentelemetry-cpp/pull/534))
-* [SDK] Support multiple processors
-  ([#692](https://github.com/open-telemetry/opentelemetry-cpp/pull/692))
-* [SDK] Add instrumentation library and multiple tracer support
-  ([#693](https://github.com/open-telemetry/opentelemetry-cpp/pull/693))
-* [SDK] Resource integration with Exporters
-  ([#706](https://github.com/open-telemetry/opentelemetry-cpp/pull/706))
-* [EXAMPLE] Enhance existing http example with propagation
-  ([#727](https://github.com/open-telemetry/opentelemetry-cpp/pull/727))
-
-## [0.5.0] 2021-04-26
-
-* [SDK] Support custom span-id and trace-id generator
-  ([#681](https://github.com/open-telemetry/opentelemetry-cpp/pull/681))
-* [SDK] Add SpanContext (and TraceState) to Recordable
-  ([#667](https://github.com/open-telemetry/opentelemetry-cpp/pull/667))
-* [SDK] Global Propagator
-  ([#668](https://github.com/open-telemetry/opentelemetry-cpp/pull/668))
-* [SDK] Create SharedContext for updating span pipeline
-  ([#650](https://github.com/open-telemetry/opentelemetry-cpp/pull/650))
-* [API] Baggage implementation
-  ([#676](https://github.com/open-telemetry/opentelemetry-cpp/pull/676))
-* [API] Move class from opentelemetry::core namespace to opentelemetry::common
-  namespace
-  ([#686](https://github.com/open-telemetry/opentelemetry-cpp/pull/686))
-
-## [0.4.0] 2021-04-12
-
-* [EXPORTER] ETW Exporter enhancements
-  ([#519](https://github.com/open-telemetry/opentelemetry-cpp/pull/519))
-* [EXPORTER] Read Zipkin endpoint from environment variable.
-  ([#624](https://github.com/open-telemetry/opentelemetry-cpp/pull/624))
-* [EXPORTER] Split Zpages webserver hosting from Exporter
-  ([#626](https://github.com/open-telemetry/opentelemetry-cpp/pull/626))
-* [EXPORTER] ETW Exporter Usage Instructions
-  ([#628](https://github.com/open-telemetry/opentelemetry-cpp/pull/628))
-* [INSTRUMENTATION] HTTP Client/Server Instrumentation example
-  ([#632](https://github.com/open-telemetry/opentelemetry-cpp/pull/632))
-* [EXPORTER] Enable tls authentication for otlp grpc exporter ([#635](Enable tls
-  authentication for otlp grpc exporter))
-* [API] Refactoring trace_state to reuse common functionality in baggage
-  ([#638](https://github.com/open-telemetry/opentelemetry-cpp/pull/638/files))
-
-## [0.3.0] 2021-03-19
-
-* [EXPORTER] Added Zipkin Exporter.
-  ([#471](https://github.com/open-telemetry/opentelemetry-cpp/pull/471))
-* [API] Added Jaeger propagator.
-  ([#599](https://github.com/open-telemetry/opentelemetry-cpp/pull/599))
-* [PROPAGATOR] Added Composite Propagator
-  ([#597](https://github.com/open-telemetry/opentelemetry-cpp/pull/597))
-* [API] Propagate traceflag from parent
-  ([#603](https://github.com/open-telemetry/opentelemetry-cpp/pull/603))
-* [DOCS] Add sphinx support for api doc generation
-  ([595](https://github.com/open-telemetry/opentelemetry-cpp/pull/595))
-* [SDK] Add service.name if missing in Resource
-  ([#616](https://github.com/open-telemetry/opentelemetry-cpp/pull/616))
-
-## [0.2.0] 2021-03-02
-
-* [SDK] Added `ForceFlush` to `TracerProvider`.
-  ([#588](https://github.com/open-telemetry/opentelemetry-cpp/pull/588)).
-* [SDK] Added Resource API.
-  ([#502](https://github.com/open-telemetry/opentelemetry-cpp/pull/502))
-* [API] Modified TraceState support for w3c trace context as per specs.
-* [SDK] TraceState implementation as per spec
-  ([#551](https://github.com/open-telemetry/opentelemetry-cpp/pull/551))
-* [API] Added B3 Propagator.
-  ([#523](https://github.com/open-telemetry/opentelemetry-cpp/pull/523))
-* [Exporter] Added ETW Exporter.
-  ([#376](https://github.com/open-telemetry/opentelemetry-cpp/pull/376))
-* [CI] Enable cache for Bazel for faster builds.
-  ([#505](https://github.com/open-telemetry/opentelemetry-cpp/pull/505))
-
-## [0.0.1] 2020-12-16
-
-### Added
-
-* Trace API and SDK experimental
-* OTLP Exporter
-
-### Changed
-
-### Removed
diff --git a/ext/opentelemetry-cpp-1.21.0/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/CMakeLists.txt
deleted file mode 100644
index 4e65f0493..000000000
--- a/ext/opentelemetry-cpp-1.21.0/CMakeLists.txt
+++ /dev/null
@@ -1,927 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-
-# See https://cmake.org/cmake/help/latest/policy/CMP0074.html required by
-# certain version of zlib which CURL depends on.
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12")
-  cmake_policy(SET CMP0074 NEW)
-endif()
-
-# Allow to use normal variable for option()
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13")
-  cmake_policy(SET CMP0077 NEW)
-endif()
-
-# Prefer CMAKE_MSVC_RUNTIME_LIBRARY if possible
-if(POLICY CMP0091)
-  cmake_policy(SET CMP0091 NEW)
-endif()
-
-if(POLICY CMP0092)
-  # https://cmake.org/cmake/help/latest/policy/CMP0092.html#policy:CMP0092 Make
-  # sure the /W3 is not removed from CMAKE_CXX_FLAGS since CMake 3.15
-  cmake_policy(SET CMP0092 OLD)
-endif()
-
-# MSVC RTTI flag /GR should not be not added to CMAKE_CXX_FLAGS by default. @see
-# https://cmake.org/cmake/help/latest/policy/CMP0117.html
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0")
-  cmake_policy(SET CMP0117 NEW)
-endif()
-
-project(opentelemetry-cpp)
-
-# Mark variables as used so cmake doesn't complain about them
-mark_as_advanced(CMAKE_TOOLCHAIN_FILE)
-
-# Note: CMAKE_FIND_PACKAGE_PREFER_CONFIG requires cmake 3.15. Prefer cmake
-# CONFIG search mode to find dependencies. This is important to properly find
-# protobuf versions 3.22.0 and above due to the abseil-cpp dependency.
-set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-
-# Don't use customized cmake modules if vcpkg is used to resolve dependence.
-if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-  list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
-endif()
-
-if(EXISTS "${CMAKE_SOURCE_DIR}/third_party_release")
-  file(STRINGS "${CMAKE_SOURCE_DIR}/third_party_release" third_party_tags)
-  foreach(third_party ${third_party_tags})
-    string(REGEX REPLACE "^[ ]+" "" third_party ${third_party})
-    string(REGEX MATCH "^[^=]+" third_party_name ${third_party})
-    string(REPLACE "${third_party_name}=" "" third_party_tag ${third_party})
-    set(${third_party_name} "${third_party_tag}")
-  endforeach()
-endif()
-
-if(DEFINED ENV{ARCH})
-  # Architecture may be specified via ARCH environment variable
-  set(ARCH $ENV{ARCH})
-else()
-  # Autodetection logic that populates ARCH variable
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-    # Windows may report AMD64 even if target is 32-bit
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      set(ARCH x64)
-    elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-      set(ARCH x86)
-    endif()
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
-    # Windows may report x86 even if target is 64-bit
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      set(ARCH x64)
-    elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-      set(ARCH x86)
-    endif()
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc")
-    # AIX will report the processor as 'powerpc' even if building in 64-bit mode
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      set(ARCH ppc64)
-    else()
-      set(ARCH ppc32)
-    endif()
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES
-         "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
-    set(ARCH arm64)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
-    set(ARCH arm)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
-    set(ARCH ppc64le)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-    set(ARCH ppc64)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(mips.*|MIPS.*)")
-    set(ARCH mips)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(riscv.*|RISCV.*)")
-    set(ARCH riscv)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(s390x.*|S390X.*)")
-    set(ARCH s390x)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(sparc.*|SPARC.*)")
-    set(ARCH sparc)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(loongarch.*|LOONGARCH.*)")
-    set(ARCH loongarch)
-  else()
-    message(
-      FATAL_ERROR
-        "opentelemetry-cpp: unrecognized target processor ${CMAKE_SYSTEM_PROCESSOR} configuration!"
-    )
-  endif()
-endif()
-message(STATUS "Building for architecture ARCH=${ARCH}")
-
-# Autodetect vcpkg toolchain
-if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-  set(CMAKE_TOOLCHAIN_FILE
-      "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
-      CACHE STRING "")
-endif()
-
-if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
-  include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
-endif()
-
-option(WITH_ABI_VERSION_1 "ABI version 1" ON)
-option(WITH_ABI_VERSION_2 "EXPERIMENTAL: ABI version 2 preview" OFF)
-
-file(READ "${CMAKE_CURRENT_LIST_DIR}/api/include/opentelemetry/version.h"
-     OPENTELEMETRY_CPP_HEADER_VERSION_H)
-
-#
-# We do not want to have WITH_ABI_VERSION = "1" or "2", and instead prefer two
-# distinct flags, WITH_ABI_VERSION_1 and WITH_ABI_VERSION_2.
-#
-# This allows:
-#
-# * to have a specific option description for each ABI
-# * to mark experimental/stable/deprecated on flags, for clarity
-# * to search for exact abi usage move easily, discouraging:
-#
-#   * cmake -DWITH_ABI_VERSION=${ARG}
-#
-# While not supported, having distinct WITH_ABI_VERSION_1 and WITH_ABI_VERSION_2
-# flags also opens the possibility to support multiple ABI concurrently, should
-# that become necessary.
-#
-if(WITH_ABI_VERSION_1 AND WITH_ABI_VERSION_2)
-  #
-  # Only one ABI is supported in a build.
-  #
-  message(
-    FATAL_ERROR "Set either WITH_ABI_VERSION_1 or WITH_ABI_VERSION_2, not both")
-endif()
-
-if(WITH_ABI_VERSION_2)
-  set(OPENTELEMETRY_ABI_VERSION_NO "2")
-elseif(WITH_ABI_VERSION_1)
-  set(OPENTELEMETRY_ABI_VERSION_NO "1")
-else()
-  if(OPENTELEMETRY_CPP_HEADER_VERSION_H MATCHES
-     "OPENTELEMETRY_ABI_VERSION_NO[ \t\r\n]+\"?([0-9]+)\"?")
-    math(EXPR OPENTELEMETRY_ABI_VERSION_NO ${CMAKE_MATCH_1})
-  else()
-    message(
-      FATAL_ERROR
-        "OPENTELEMETRY_ABI_VERSION_NO not found on ${CMAKE_CURRENT_LIST_DIR}/api/include/opentelemetry/version.h"
-    )
-  endif()
-endif()
-
-message(STATUS "OPENTELEMETRY_ABI_VERSION_NO=${OPENTELEMETRY_ABI_VERSION_NO}")
-
-if(OPENTELEMETRY_CPP_HEADER_VERSION_H MATCHES
-   "OPENTELEMETRY_VERSION[ \t\r\n]+\"?([^\"]+)\"?")
-  set(OPENTELEMETRY_VERSION ${CMAKE_MATCH_1})
-else()
-  message(
-    FATAL_ERROR
-      "OPENTELEMETRY_VERSION not found on ${CMAKE_CURRENT_LIST_DIR}/api/include/opentelemetry/version.h"
-  )
-endif()
-
-message(STATUS "OPENTELEMETRY_VERSION=${OPENTELEMETRY_VERSION}")
-
-option(WITH_NO_DEPRECATED_CODE "Do not include deprecated code" OFF)
-
-set(WITH_STL
-    "OFF"
-    CACHE STRING "Which version of the Standard Library for C++ to use")
-
-option(WITH_GSL
-       "Whether to use Guidelines Support Library for C++ latest features" OFF)
-
-set(OPENTELEMETRY_INSTALL_default ON)
-if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-  set(OPENTELEMETRY_INSTALL_default OFF)
-endif()
-option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets"
-       ${OPENTELEMETRY_INSTALL_default})
-
-include("${PROJECT_SOURCE_DIR}/cmake/tools.cmake")
-
-if(NOT WITH_STL STREQUAL "OFF")
-  # These definitions are needed for test projects that do not link against
-  # opentelemetry-api library directly. We ensure that variant implementation
-  # (absl::variant or std::variant) in variant unit test code is consistent with
-  # the global project build definitions. Optimize for speed to reduce the hops
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    if(CMAKE_BUILD_TYPE MATCHES Debug)
-      # Turn off optimizations for DEBUG
-      set(MSVC_CXX_OPT_FLAG "/Od")
-    else()
-      string(REGEX MATCH "\/O" result ${CMAKE_CXX_FLAGS})
-      if(NOT ${result} MATCHES "\/O")
-        set(MSVC_CXX_OPT_FLAG "/O2")
-      endif()
-    endif()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MSVC_CXX_OPT_FLAG}")
-  endif()
-endif()
-
-option(WITH_OTLP_RETRY_PREVIEW
-       "Whether to enable experimental retry functionality" OFF)
-
-option(WITH_OTLP_GRPC_SSL_MTLS_PREVIEW
-       "Whether to enable mTLS support fro gRPC" OFF)
-
-option(WITH_OTLP_GRPC "Whether to include the OTLP gRPC exporter in the SDK"
-       OFF)
-
-option(WITH_OTLP_HTTP "Whether to include the OTLP http exporter in the SDK"
-       OFF)
-
-option(WITH_OTLP_FILE "Whether to include the OTLP file exporter in the SDK"
-       OFF)
-
-option(
-  WITH_OTLP_HTTP_COMPRESSION
-  "Whether to include gzip compression for the OTLP http exporter in the SDK"
-  OFF)
-
-option(WITH_CURL_LOGGING "Whether to enable select CURL verbosity in OTel logs"
-       OFF)
-
-option(WITH_ZIPKIN "Whether to include the Zipkin exporter in the SDK" OFF)
-
-option(WITH_PROMETHEUS "Whether to include the Prometheus Client in the SDK"
-       OFF)
-
-option(WITH_ELASTICSEARCH
-       "Whether to include the Elasticsearch Client in the SDK" OFF)
-
-option(WITH_NO_GETENV "Whether the platform supports environment variables" OFF)
-
-option(BUILD_TESTING "Whether to enable tests" ON)
-
-option(WITH_BENCHMARK "Whether to build benchmark program" ON)
-
-option(BUILD_W3CTRACECONTEXT_TEST "Whether to build w3c trace context" OFF)
-
-option(OTELCPP_MAINTAINER_MODE "Build in maintainer mode (-Wall -Werror)" OFF)
-
-option(WITH_OPENTRACING "Whether to include the Opentracing shim" OFF)
-
-option(OTELCPP_VERSIONED_LIBS "Whether to generate the versioned shared libs"
-       OFF)
-
-#
-# This option is experimental, subject to change in the spec:
-#
-# * https://github.com/open-telemetry/opentelemetry-specification/issues/2232
-#
-option(WITH_REMOVE_METER_PREVIEW
-       "EXPERIMENTAL, ABI BREAKING: Allow to remove a meter" OFF)
-
-if(OTELCPP_VERSIONED_LIBS AND NOT BUILD_SHARED_LIBS)
-  message(FATAL_ERROR "OTELCPP_VERSIONED_LIBS=ON requires BUILD_SHARED_LIBS=ON")
-endif()
-
-if(WIN32)
-  option(WITH_ETW "Whether to include the ETW Exporter in the SDK" ON)
-else()
-  if(DEFINED (WITH_ETW))
-    message(FATAL_ERROR "WITH_ETW is only supported on Windows")
-  endif()
-endif(WIN32)
-
-# Do not convert deprecated message to error
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
-  add_compile_options(-Wno-error=deprecated-declarations)
-endif()
-
-option(
-  WITH_API_ONLY
-  "Only build the API (use as a header-only library). Overrides WITH_EXAMPLES and all options to enable exporters"
-  OFF)
-option(WITH_EXAMPLES "Whether to build examples" ON)
-
-# This requires CURL, OFF by default.
-option(
-  WITH_EXAMPLES_HTTP
-  "Whether to build http client/server examples. Requires WITH_EXAMPLES and CURL"
-  OFF)
-
-option(WITH_FUNC_TESTS "Whether to build functional tests" ON)
-
-option(WITH_ASYNC_EXPORT_PREVIEW "Whether to enable async export" OFF)
-
-# Exemplar specs status is experimental, so behind feature flag by default
-option(WITH_METRICS_EXEMPLAR_PREVIEW
-       "Whether to enable exemplar within metrics" OFF)
-
-# Experimental, so behind feature flag by default
-option(WITH_THREAD_INSTRUMENTATION_PREVIEW
-       "Whether to enable thread instrumentation" OFF)
-
-option(OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS
-       "Whether to build test libraries that are always linked as shared libs"
-       OFF)
-
-#
-# Verify options dependencies
-#
-
-if(WITH_EXAMPLES_HTTP AND NOT WITH_EXAMPLES)
-  message(FATAL_ERROR "WITH_EXAMPLES_HTTP=ON requires WITH_EXAMPLES=ON")
-endif()
-
-find_package(Threads)
-
-function(install_windows_deps)
-  # Bootstrap vcpkg from CMake and auto-install deps in case if we are missing
-  # deps on Windows. Respect the target architecture variable.
-  set(VCPKG_TARGET_ARCHITECTURE
-      ${ARCH}
-      PARENT_SCOPE)
-  message(STATUS "Installing build tools and dependencies...")
-  set(ENV{ARCH} ${ARCH})
-  execute_process(
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/setup-buildtools.cmd)
-  set(CMAKE_TOOLCHAIN_FILE
-      ${CMAKE_CURRENT_SOURCE_DIR}/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
-      CACHE FILEPATH "")
-  message(
-    STATUS
-      "Make sure that vcpkg.cmake is set as the CMAKE_TOOLCHAIN_FILE at the START of the cmake build process!
-    Can be command-line arg (cmake -DCMAKE_TOOLCHAIN_FILE=...) or set in your editor of choice."
-  )
-
-endfunction()
-
-function(set_target_version target_name)
-  if(OTELCPP_VERSIONED_LIBS)
-    set_target_properties(
-      ${target_name} PROPERTIES VERSION ${OPENTELEMETRY_VERSION}
-                                SOVERSION ${OPENTELEMETRY_ABI_VERSION_NO})
-  endif()
-endfunction()
-
-if(MSVC)
-  # Options for Visual C++ compiler: /Zc:__cplusplus - report an updated value
-  # for recent C++ language standards. Without this option MSVC returns the
-  # value of __cplusplus="199711L"
-  if(MSVC_VERSION GREATER 1900)
-    # __cplusplus flag is not supported by Visual Studio 2015
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
-  endif()
-endif()
-
-# include GNUInstallDirs before include cmake/opentelemetry-proto.cmake because
-# opentelemetry-proto installs targets to the location variables defined in
-# GNUInstallDirs.
-include(GNUInstallDirs)
-
-if(WITH_PROMETHEUS)
-  find_package(prometheus-cpp CONFIG QUIET)
-  if(NOT prometheus-cpp_FOUND)
-    message(STATUS "Trying to use local prometheus-cpp from submodule")
-    if(EXISTS ${PROJECT_SOURCE_DIR}/third_party/prometheus-cpp/.git)
-      set(SAVED_ENABLE_TESTING ${ENABLE_TESTING})
-      set(SAVED_CMAKE_CXX_CLANG_TIDY ${CMAKE_CXX_CLANG_TIDY})
-      set(SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE
-          ${CMAKE_CXX_INCLUDE_WHAT_YOU_USE})
-      set(ENABLE_TESTING OFF)
-      set(CMAKE_CXX_CLANG_TIDY "")
-      set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "")
-      add_subdirectory(third_party/prometheus-cpp)
-      set(ENABLE_TESTING ${SAVED_ENABLE_TESTING})
-      set(CMAKE_CXX_CLANG_TIDY ${SAVED_CMAKE_CXX_CLANG_TIDY})
-      set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE
-          ${SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE})
-
-      # Get the version of the prometheus-cpp submodule
-      find_package(Git QUIET)
-      if(Git_FOUND)
-        execute_process(
-          COMMAND ${GIT_EXECUTABLE} describe --tags --always
-          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/third_party/prometheus-cpp
-          OUTPUT_VARIABLE prometheus-cpp_VERSION
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
-        string(REGEX REPLACE "^v" "" prometheus-cpp_VERSION
-                             "${prometheus-cpp_VERSION}")
-      endif()
-
-      message(
-        STATUS
-          "Using local prometheus-cpp from submodule. Version = ${prometheus-cpp_VERSION}"
-      )
-    else()
-      message(
-        FATAL_ERROR
-          "\nprometheus-cpp package was not found. Please either provide it manually or clone with submodules. "
-          "To initialize, fetch and checkout any nested submodules, you can use the following command:\n"
-          "git submodule update --init --recursive")
-    endif()
-  else()
-    message(STATUS "Using external prometheus-cpp")
-  endif()
-endif()
-
-if(WITH_OTLP_GRPC
-   OR WITH_OTLP_HTTP
-   OR WITH_OTLP_FILE)
-
-  # Including the CMakeFindDependencyMacro resolves an error from
-  # gRPCConfig.cmake on some grpc versions. See
-  # https://github.com/grpc/grpc/pull/33361 for more details.
-  include(CMakeFindDependencyMacro)
-
-  # Protobuf 3.22+ depends on abseil-cpp and must be found using the cmake
-  # find_package CONFIG search mode. The following attempts to find Protobuf
-  # using the CONFIG mode first, and if not found, falls back to the MODULE
-  # mode. See https://gitlab.kitware.com/cmake/cmake/-/issues/24321 for more
-  # details.
-  find_package(Protobuf CONFIG)
-  if(NOT Protobuf_FOUND)
-    find_package(Protobuf MODULE)
-    if(Protobuf_FOUND AND Protobuf_VERSION VERSION_GREATER_EQUAL "3.22.0")
-      message(
-        WARNING
-          "Found Protobuf version ${Protobuf_VERSION} using MODULE mode. "
-          "Linking errors may occur. Protobuf 3.22+ depends on abseil-cpp "
-          "and should be found using the CONFIG mode.")
-    endif()
-  endif()
-
-  if(WITH_OTLP_GRPC)
-    find_package(gRPC CONFIG)
-  endif()
-  if((NOT Protobuf_FOUND) OR (WITH_OTLP_GRPC AND NOT gRPC_FOUND))
-    if(WIN32 AND (NOT DEFINED CMAKE_TOOLCHAIN_FILE))
-      install_windows_deps()
-    endif()
-
-    if(WIN32 AND (NOT DEFINED CMAKE_TOOLCHAIN_FILE))
-      message(FATAL_ERROR "Windows dependency installation failed!")
-    endif()
-    if(WIN32)
-      include(${CMAKE_TOOLCHAIN_FILE})
-    endif()
-
-    if(NOT Protobuf_FOUND)
-      find_package(Protobuf CONFIG REQUIRED)
-    endif()
-    if(NOT gRPC_FOUND AND WITH_OTLP_GRPC)
-      find_package(gRPC CONFIG)
-    endif()
-    if(WIN32)
-      # Always use x64 protoc.exe
-      if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-        set(Protobuf_PROTOC_EXECUTABLE
-            ${CMAKE_CURRENT_SOURCE_DIR}/tools/vcpkg/packages/protobuf_x64-windows/tools/protobuf/protoc.exe
-        )
-      endif()
-    endif()
-  endif()
-  # Latest Protobuf imported targets and without legacy module support
-  if(TARGET protobuf::protoc)
-    if(CMAKE_CROSSCOMPILING AND Protobuf_PROTOC_EXECUTABLE)
-      set(PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
-    else()
-      project_build_tools_get_imported_location(PROTOBUF_PROTOC_EXECUTABLE
-                                                protobuf::protoc)
-      # If protobuf::protoc is not a imported target, then we use the target
-      # directly for fallback
-      if(NOT PROTOBUF_PROTOC_EXECUTABLE)
-        set(PROTOBUF_PROTOC_EXECUTABLE protobuf::protoc)
-      endif()
-    endif()
-  elseif(Protobuf_PROTOC_EXECUTABLE)
-    # Some versions of FindProtobuf.cmake uses mixed case instead of uppercase
-    set(PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
-  endif()
-  include(CMakeDependentOption)
-
-  message(STATUS "PROTOBUF_PROTOC_EXECUTABLE=${PROTOBUF_PROTOC_EXECUTABLE}")
-  set(SAVED_CMAKE_CXX_CLANG_TIDY ${CMAKE_CXX_CLANG_TIDY})
-  set(CMAKE_CXX_CLANG_TIDY "")
-  include(cmake/opentelemetry-proto.cmake)
-  set(CMAKE_CXX_CLANG_TIDY ${SAVED_CMAKE_CXX_CLANG_TIDY})
-endif()
-
-#
-# Do we need HTTP CLIENT CURL ?
-#
-
-if(WITH_OTLP_HTTP
-   OR WITH_ELASTICSEARCH
-   OR WITH_ZIPKIN
-   OR BUILD_W3CTRACECONTEXT_TEST
-   OR WITH_EXAMPLES_HTTP)
-  set(WITH_HTTP_CLIENT_CURL ON)
-else()
-  set(WITH_HTTP_CLIENT_CURL OFF)
-endif()
-
-#
-# Do we need CURL ?
-#
-
-if((NOT WITH_API_ONLY) AND WITH_HTTP_CLIENT_CURL)
-  # No specific version required.
-  find_package(CURL REQUIRED)
-  # Set the CURL_VERSION from the legacy CURL_VERSION_STRING Required for CMake
-  # versions below 4.0
-  if(NOT DEFINED CURL_VERSION AND DEFINED CURL_VERSION_STRING)
-    set(CURL_VERSION ${CURL_VERSION_STRING})
-  endif()
-endif()
-
-#
-# Do we need ZLIB ?
-#
-
-if((NOT WITH_API_ONLY)
-   AND WITH_HTTP_CLIENT_CURL
-   AND WITH_OTLP_HTTP_COMPRESSION)
-  # No specific version required.
-  find_package(ZLIB REQUIRED)
-  # Set the ZLIB_VERSION from the legacy ZLIB_VERSION_STRING Required for CMake
-  # versions below 3.26
-  if(NOT DEFINED ZLIB_VERSION AND DEFINED ZLIB_VERSION_STRING)
-    set(ZLIB_VERSION ${ZLIB_VERSION_STRING})
-  endif()
-endif()
-
-#
-# Do we need NLOHMANN_JSON ?
-#
-
-if(WITH_ELASTICSEARCH
-   OR WITH_ZIPKIN
-   OR WITH_OTLP_HTTP
-   OR WITH_OTLP_FILE
-   OR BUILD_W3CTRACECONTEXT_TEST
-   OR WITH_ETW)
-  set(USE_NLOHMANN_JSON ON)
-else()
-  set(USE_NLOHMANN_JSON OFF)
-endif()
-
-if((NOT WITH_API_ONLY) AND USE_NLOHMANN_JSON)
-  include(cmake/nlohmann-json.cmake)
-endif()
-
-if(OTELCPP_MAINTAINER_MODE)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    message(STATUS "Building with gcc in maintainer mode.")
-
-    add_compile_options(-Wall)
-    add_compile_options(-Werror)
-    add_compile_options(-Wextra)
-
-    # Tested with GCC 9.4 on github.
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9.4)
-      message(STATUS "Building with additional warnings for gcc.")
-
-      # Relaxed warnings
-
-      # Enforced warnings
-
-      # C++ options only
-      add_compile_options($<$<STREQUAL:$<COMPILE_LANGUAGE>,CXX>:-Wextra-semi>)
-      add_compile_options(
-        $<$<STREQUAL:$<COMPILE_LANGUAGE>,CXX>:-Woverloaded-virtual>)
-      add_compile_options(
-        $<$<STREQUAL:$<COMPILE_LANGUAGE>,CXX>:-Wsuggest-override>)
-      add_compile_options(
-        $<$<STREQUAL:$<COMPILE_LANGUAGE>,CXX>:-Wold-style-cast>)
-
-      # C and C++
-      add_compile_options(-Wcast-qual)
-      add_compile_options(-Wformat-security)
-      add_compile_options(-Wlogical-op)
-      add_compile_options(-Wmissing-include-dirs)
-      add_compile_options(-Wstringop-truncation)
-      add_compile_options(-Wundef)
-      add_compile_options(-Wvla)
-    endif()
-  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    message(STATUS "Building with clang in maintainer mode.")
-
-    add_compile_options(-Wall)
-    add_compile_options(-Werror)
-    add_compile_options(-Wextra)
-
-    # Tested with Clang 11.0 on github.
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0)
-      message(STATUS "Building with additional warnings for clang.")
-
-      # Relaxed warnings
-      add_compile_options(-Wno-error=unused-private-field)
-
-      # Enforced warnings
-      add_compile_options(-Wcast-qual)
-      add_compile_options(-Wconditional-uninitialized)
-      add_compile_options(-Wextra-semi)
-      add_compile_options(-Wformat-security)
-      add_compile_options(-Wheader-hygiene)
-      add_compile_options(-Winconsistent-missing-destructor-override)
-      add_compile_options(-Winconsistent-missing-override)
-      add_compile_options(-Wnewline-eof)
-      add_compile_options(-Wnon-virtual-dtor)
-      add_compile_options(-Woverloaded-virtual)
-      add_compile_options(-Wrange-loop-analysis)
-      add_compile_options(-Wundef)
-      add_compile_options(-Wundefined-reinterpret-cast)
-      add_compile_options(-Wvla)
-      add_compile_options(-Wold-style-cast)
-    endif()
-  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    message(STATUS "Building with msvc in maintainer mode.")
-
-    add_compile_options(/WX)
-    add_compile_options(/W4)
-
-    # Relaxed warnings
-    add_compile_options(/wd4100)
-    add_compile_options(/wd4125)
-    add_compile_options(/wd4566)
-    add_compile_options(/wd4127)
-    add_compile_options(/wd4512)
-    add_compile_options(/wd4267)
-    add_compile_options(/wd4996)
-
-    # Enforced warnings
-    add_compile_options(/we4265) # 'class': class has virtual functions, but
-                                 # destructor is not virtual
-    add_compile_options(/we5204) # A class with virtual functions has
-                                 # non-virtual trivial destructor.
-
-  elseif()
-    message(FATAL_ERROR "Building with unknown compiler in maintainer mode.")
-  endif()
-endif(OTELCPP_MAINTAINER_MODE)
-
-list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}")
-
-include(CTest)
-if(BUILD_TESTING)
-  if(EXISTS ${CMAKE_BINARY_DIR}/lib/libgtest.a)
-    # Prefer GTest from build tree. GTest is not always working with
-    # CMAKE_PREFIX_PATH
-    set(GTEST_INCLUDE_DIRS
-        ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googlemock/include)
-    if(TARGET gtest)
-      set(GTEST_BOTH_LIBRARIES gtest gtest_main)
-    else()
-      set(GTEST_BOTH_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libgtest.a
-                               ${CMAKE_BINARY_DIR}/lib/libgtest_main.a)
-    endif()
-  elseif(WIN32)
-    # Make sure we are always bootsrapped with vcpkg on Windows
-    find_package(GTest)
-    if(NOT (GTEST_FOUND OR GTest_FOUND))
-      if(DEFINED CMAKE_TOOLCHAIN_FILE)
-        message(
-          FATAL_ERROR
-            "Pleaes install GTest with the CMAKE_TOOLCHAIN_FILE at ${CMAKE_TOOLCHAIN_FILE}"
-        )
-      else()
-        install_windows_deps()
-        include(${CMAKE_TOOLCHAIN_FILE})
-        find_package(GTest REQUIRED)
-      endif()
-    endif()
-  else()
-    # Prefer GTest installed by OS distro, brew or vcpkg package manager
-    find_package(GTest REQUIRED)
-  endif()
-  if(NOT GTEST_BOTH_LIBRARIES)
-    # New GTest package names
-    if(TARGET GTest::gtest)
-      set(GTEST_BOTH_LIBRARIES GTest::gtest GTest::gtest_main)
-    elseif(TARGET GTest::GTest)
-      set(GTEST_BOTH_LIBRARIES GTest::GTest GTest::Main)
-    endif()
-  endif()
-  if(GTEST_INCLUDE_DIRS)
-    include_directories(SYSTEM ${GTEST_INCLUDE_DIRS})
-  endif()
-  message(STATUS "GTEST_INCLUDE_DIRS   = ${GTEST_INCLUDE_DIRS}")
-  message(STATUS "GTEST_BOTH_LIBRARIES = ${GTEST_BOTH_LIBRARIES}")
-
-  # Try to find gmock
-  if(NOT GMOCK_LIB AND TARGET GTest::gmock)
-    set(GMOCK_LIB GTest::gmock)
-  elseif(MSVC)
-    # Explicitly specify that we consume GTest from shared library. The rest of
-    # code logic below determines whether we link Release or Debug flavor of the
-    # library. These flavors have different prefix on Windows, gmock and gmockd
-    # respectively.
-    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
-    if(GMOCK_LIB)
-      # unset GMOCK_LIB to force find_library to redo the lookup, as the cached
-      # entry could cause linking to incorrect flavor of gmock and leading to
-      # runtime error.
-      unset(GMOCK_LIB CACHE)
-    endif()
-  endif()
-  if(NOT GMOCK_LIB)
-    if(MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-      find_library(GMOCK_LIB gmockd PATH_SUFFIXES lib)
-    else()
-      find_library(GMOCK_LIB gmock PATH_SUFFIXES lib)
-    endif()
-    # Reset GMOCK_LIB if it was not found, or some target may link
-    # GMOCK_LIB-NOTFOUND
-    if(NOT GMOCK_LIB)
-      unset(GMOCK_LIB)
-      unset(GMOCK_LIB CACHE)
-    endif()
-  endif()
-
-  enable_testing()
-  if(WITH_BENCHMARK)
-    # Benchmark respects the CMAKE_PREFIX_PATH
-    find_package(benchmark CONFIG REQUIRED)
-  endif()
-endif()
-
-# Record build config and versions
-message(STATUS "---------------------------------------------")
-message(STATUS "build settings")
-message(STATUS "---------------------------------------------")
-message(STATUS "OpenTelemetry: ${OPENTELEMETRY_VERSION}")
-message(STATUS "OpenTelemetry ABI: ${OPENTELEMETRY_ABI_VERSION_NO}")
-message(STATUS "ARCH: ${ARCH}")
-message(STATUS "CXX: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
-message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-message(STATUS "CXXFLAGS: ${CMAKE_CXX_FLAGS}")
-message(STATUS "CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
-message(STATUS "CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE}")
-message(STATUS "BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
-
-message(STATUS "---------------------------------------------")
-message(STATUS "opentelemetry-cpp build options")
-message(STATUS "---------------------------------------------")
-message(STATUS "WITH_API_ONLY: ${WITH_API_ONLY}")
-message(STATUS "WITH_NO_DEPRECATED_CODE: ${WITH_NO_DEPRECATED_CODE}")
-message(STATUS "WITH_ABI_VERSION_1: ${WITH_ABI_VERSION_1}")
-message(STATUS "WITH_ABI_VERSION_2: ${WITH_ABI_VERSION_2}")
-message(STATUS "OTELCPP_VERSIONED_LIBS: ${OTELCPP_VERSIONED_LIBS}")
-message(STATUS "OTELCPP_MAINTAINER_MODE: ${OTELCPP_MAINTAINER_MODE}")
-message(STATUS "WITH_STL: ${WITH_STL}")
-message(STATUS "WITH_GSL: ${WITH_GSL}")
-message(STATUS "WITH_NO_GETENV: ${WITH_NO_GETENV}")
-
-message(STATUS "---------------------------------------------")
-message(STATUS "opentelemetry-cpp cmake component options")
-message(STATUS "---------------------------------------------")
-message(STATUS "WITH_OTLP_GRPC: ${WITH_OTLP_GRPC}")
-message(STATUS "WITH_OTLP_HTTP: ${WITH_OTLP_HTTP}")
-message(STATUS "WITH_OTLP_FILE: ${WITH_OTLP_FILE}")
-message(STATUS "WITH_HTTP_CLIENT_CURL: ${WITH_HTTP_CLIENT_CURL}")
-message(STATUS "WITH_ZIPKIN: ${WITH_ZIPKIN}")
-message(STATUS "WITH_PROMETHEUS: ${WITH_PROMETHEUS}")
-message(STATUS "WITH_ELASTICSEARCH: ${WITH_ELASTICSEARCH}")
-message(STATUS "WITH_OPENTRACING: ${WITH_OPENTRACING}")
-message(STATUS "WITH_ETW: ${WITH_ETW}")
-message(STATUS "OPENTELEMETRY_BUILD_DLL: ${OPENTELEMETRY_BUILD_DLL}")
-
-message(STATUS "---------------------------------------------")
-message(STATUS "feature preview options")
-message(STATUS "---------------------------------------------")
-message(STATUS "WITH_ASYNC_EXPORT_PREVIEW: ${WITH_ASYNC_EXPORT_PREVIEW}")
-message(
-  STATUS
-    "WITH_THREAD_INSTRUMENTATION_PREVIEW: ${WITH_THREAD_INSTRUMENTATION_PREVIEW}"
-)
-message(
-  STATUS "WITH_METRICS_EXEMPLAR_PREVIEW: ${WITH_METRICS_EXEMPLAR_PREVIEW}")
-message(STATUS "WITH_REMOVE_METER_PREVIEW: ${WITH_REMOVE_METER_PREVIEW}")
-message(
-  STATUS "WITH_OTLP_GRPC_SSL_MTLS_PREVIEW: ${WITH_OTLP_GRPC_SSL_MTLS_PREVIEW}")
-message(STATUS "WITH_OTLP_RETRY_PREVIEW: ${WITH_OTLP_RETRY_PREVIEW}")
-message(STATUS "---------------------------------------------")
-message(STATUS "third-party options")
-message(STATUS "---------------------------------------------")
-message(STATUS "WITH_NLOHMANN_JSON: ${USE_NLOHMANN_JSON}")
-message(STATUS "WITH_CURL_LOGGING: ${WITH_CURL_LOGGING}")
-message(STATUS "WITH_OTLP_HTTP_COMPRESSION: ${WITH_OTLP_HTTP_COMPRESSION}")
-message(STATUS "---------------------------------------------")
-message(STATUS "examples and test options")
-message(STATUS "---------------------------------------------")
-message(STATUS "WITH_BENCHMARK: ${WITH_BENCHMARK}")
-message(STATUS "WITH_EXAMPLES: ${WITH_EXAMPLES}")
-message(STATUS "WITH_EXAMPLES_HTTP: ${WITH_EXAMPLES_HTTP}")
-message(STATUS "WITH_FUNC_TESTS: ${WITH_FUNC_TESTS}")
-message(STATUS "BUILD_W3CTRACECONTEXT_TEST: ${BUILD_W3CTRACECONTEXT_TEST}")
-message(STATUS "BUILD_TESTING: ${BUILD_TESTING}")
-message(STATUS "---------------------------------------------")
-message(STATUS "versions")
-message(STATUS "---------------------------------------------")
-message(STATUS "CMake: ${CMAKE_VERSION}")
-message(STATUS "GTest: ${GTest_VERSION}")
-message(STATUS "benchmark: ${benchmark_VERSION}")
-if(WITH_GSL)
-  message(STATUS "GSL: ${GSL_VERSION}")
-endif()
-if(absl_FOUND)
-  message(STATUS "Abseil: ${absl_VERSION}")
-endif()
-if(Protobuf_FOUND)
-  message(STATUS "Protobuf: ${Protobuf_VERSION}")
-endif()
-if(gRPC_FOUND)
-  message(STATUS "gRPC: ${gRPC_VERSION}")
-endif()
-if(CURL_FOUND)
-  message(STATUS "CURL: ${CURL_VERSION}")
-endif()
-if(ZLIB_FOUND)
-  message(STATUS "ZLIB: ${ZLIB_VERSION}")
-endif()
-if(USE_NLOHMANN_JSON)
-  message(STATUS "nlohmann-json: ${nlohmann_json_VERSION}")
-endif()
-if(prometheus-cpp_FOUND)
-  message(STATUS "prometheus-cpp: ${prometheus-cpp_VERSION}")
-endif()
-message(STATUS "---------------------------------------------")
-
-include("${PROJECT_SOURCE_DIR}/cmake/otel-install-functions.cmake")
-
-include(CMakePackageConfigHelpers)
-
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  if(NOT WIN32)
-    message(FATAL_ERROR "Build DLL is only supported on Windows!")
-  endif()
-  if(NOT MSVC)
-    message(WARNING "Build DLL is supposed to work with MSVC!")
-  endif()
-  if(WITH_STL)
-    message(
-      WARNING "Build DLL with C++ STL could cause binary incompatibility!")
-  endif()
-  add_definitions(-DOPENTELEMETRY_BUILD_EXPORT_DLL)
-endif()
-
-add_subdirectory(api)
-
-if(WITH_OPENTRACING)
-  find_package(OpenTracing CONFIG QUIET)
-  if(NOT OpenTracing_FOUND)
-    set(OPENTRACING_DIR "third_party/opentracing-cpp")
-    message(STATUS "Trying to use local ${OPENTRACING_DIR} from submodule")
-    if(EXISTS "${PROJECT_SOURCE_DIR}/${OPENTRACING_DIR}/.git")
-      set(SAVED_BUILD_TESTING ${BUILD_TESTING})
-      set(BUILD_TESTING OFF)
-      set(SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE
-          ${CMAKE_CXX_INCLUDE_WHAT_YOU_USE})
-      set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "")
-      add_subdirectory(${OPENTRACING_DIR})
-      set(BUILD_TESTING ${SAVED_BUILD_TESTING})
-      set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE
-          ${SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE})
-    else()
-      message(
-        FATAL_ERROR
-          "\nopentracing-cpp package was not found. Please either provide it manually or clone with submodules. "
-          "To initialize, fetch and checkout any nested submodules, you can use the following command:\n"
-          "git submodule update --init --recursive")
-    endif()
-  else()
-    message(STATUS "Using external opentracing-cpp")
-  endif()
-  add_subdirectory(opentracing-shim)
-endif()
-
-if(NOT WITH_API_ONLY)
-  set(BUILD_TESTING ${BUILD_TESTING})
-
-  add_subdirectory(sdk)
-  add_subdirectory(ext)
-  add_subdirectory(exporters)
-
-  if(BUILD_TESTING)
-    add_subdirectory(test_common)
-  endif()
-  if(WITH_EXAMPLES)
-    add_subdirectory(examples)
-  endif()
-  if(WITH_FUNC_TESTS)
-    add_subdirectory(functional)
-  endif()
-endif()
-
-include(cmake/opentelemetry-build-external-component.cmake)
-include(cmake/patch-imported-config.cmake)
-
-if(OPENTELEMETRY_INSTALL)
-  # Install the cmake config and version files
-  otel_install_cmake_config()
-
-  # Install the components and associated files
-  otel_install_components()
-
-  # Install the thirdparty dependency definition file
-  otel_install_thirdparty_definitions()
-
-  if(BUILD_PACKAGE)
-    include(cmake/package.cmake)
-    include(CPack)
-  endif()
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/CMakeSettings.json b/ext/opentelemetry-cpp-1.21.0/CMakeSettings.json
deleted file mode 100644
index 02d068a3a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/CMakeSettings.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-  "configurations": [
-    {
-      "name": "nostd-x64-Debug",
-      "generator": "Ninja",
-      "configurationType": "Debug",
-        "inheritEnvironments": [
-          "msvc_x64_x64"
-        ],
-      "buildRoot": "${projectDir}\\out\\vs2019\\${name}",
-      "installRoot": "${projectDir}\\out\\vs2019\\${name}\\install",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "variables": [
-        {
-          "name": "WITH_OTLP_GRPC",
-          "value": "True",
-          "type": "BOOL"
-        },
-        {
-          "name": "WITH_EXAMPLES",
-          "value": "true",
-          "type": "BOOL"
-        }
-      ]
-    },
-    {
-      "name": "nostd-x64-Release",
-      "generator": "Ninja",
-      "configurationType": "Release",
-        "inheritEnvironments": [
-          "msvc_x64_x64"
-        ],
-      "buildRoot": "${projectDir}\\out\\vs2019\\${name}",
-      "installRoot": "${projectDir}\\out\\vs2019\\${name}\\install",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "cmakeToolchain": "",
-      "variables": [
-        {
-          "name": "WITH_OTLP_GRPC",
-          "value": "True",
-          "type": "BOOL"
-        },
-        {
-          "name": "WITH_EXAMPLES",
-          "value": "true",
-          "type": "BOOL"
-        }
-      ]
-    },
-    {
-      "name": "stdlib-x64-Debug",
-      "generator": "Ninja",
-      "configurationType": "Debug",
-      "inheritEnvironments": [
-        "msvc_x64_x64"
-      ],
-      "buildRoot": "${projectDir}\\out\\vs2019\\${name}",
-      "installRoot": "${projectDir}\\out\\vs2019\\${name}\\install",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "variables": [
-        {
-          "name": "WITH_STL",
-          "value": "True",
-          "type": "BOOL"
-        },
-        {
-          "name": "WITH_OTLP_GRPC",
-          "value": "True",
-          "type": "BOOL"
-        },
-        {
-          "name": "WITH_EXAMPLES",
-          "value": "true",
-          "type": "BOOL"
-        },
-        {
-          "name": "WITH_PROMETHEUS",
-          "value": "True",
-          "type": "BOOL"
-        }
-      ]
-    },
-    {
-      "name": "stdlib-x64-Release",
-      "generator": "Ninja",
-      "configurationType": "Release",
-      "inheritEnvironments": [
-        "msvc_x64_x64"
-      ],
-      "buildRoot": "${projectDir}\\out\\vs2019\\${name}",
-      "installRoot": "${projectDir}\\out\\vs2019\\${name}\\install",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "cmakeToolchain": "",
-      "variables": [
-        {
-          "name": "WITH_STL",
-          "value": "True",
-          "type": "BOOL"
-        },
-        {
-          "name": "WITH_OTLP_GRPC",
-          "value": "True",
-          "type": "BOOL"
-        },
-        {
-          "name": "WITH_EXAMPLES",
-          "value": "true",
-          "type": "BOOL"
-        },
-        {
-          "name": "WITH_PROMETHEUS",
-          "value": "True",
-          "type": "BOOL"
-        }
-      ]
-    }
-  ]
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/CODE_OF_CONDUCT.md b/ext/opentelemetry-cpp-1.21.0/CODE_OF_CONDUCT.md
deleted file mode 100644
index fee94ae58..000000000
--- a/ext/opentelemetry-cpp-1.21.0/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenTelemetry Community Code of Conduct
-
-OpenTelemetry follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
diff --git a/ext/opentelemetry-cpp-1.21.0/CONTRIBUTING.md b/ext/opentelemetry-cpp-1.21.0/CONTRIBUTING.md
deleted file mode 100644
index fda99e097..000000000
--- a/ext/opentelemetry-cpp-1.21.0/CONTRIBUTING.md
+++ /dev/null
@@ -1,322 +0,0 @@
-# Contributing to opentelemetry-cpp
-
-The OpenTelemetry C/C++ special interest group (SIG) meets regularly. See the
-OpenTelemetry [community](https://github.com/open-telemetry/community#cc-sdk)
-repo for information on this and other language SIGs.
-
-See the [public meeting
-notes](https://docs.google.com/document/d/1i1E4-_y4uJ083lCutKGDhkpi3n4_e774SBLi9hPLocw/edit)
-for a summary description of past meetings. To request edit access, join the
-meeting or get in touch on
-[Slack](https://cloud-native.slack.com/archives/C01N3AT62SJ).
-
-See the [community membership
-document](https://github.com/open-telemetry/community/blob/main/community-membership.md)
-on how to become a
-[**Member**](https://github.com/open-telemetry/community/blob/main/community-membership.md#member),
-[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
-and
-[**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
-
-## Development
-
-OpenTelemetry C++ uses the [Google naming
-convention](https://google.github.io/styleguide/cppguide.html#Naming).
-
-Code is formatted automatically and enforced by CI.
-
-### Build and Run Code Examples
-
-Note: these instructions apply to examples configured with Bazel, see
-example-specific documentation for other build automation tools.
-
-Install the latest bazel version by following the steps listed
-[here](https://docs.bazel.build/versions/master/install.html).
-
-Select an example of interest from the [examples
-folder](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/examples).
-Inside each example directory is a `BUILD` file containing instructions for
-Bazel. Find the binary name of your example by inspecting the contents of this
-`BUILD` file.
-
-Build the example from the root of the opentelemetry-cpp directory using Bazel.
-Replace `<binary name>` with the identifier found in the previous step:
-
-```sh
-bazel build //examples/<example directory name>:<binary name>
-```
-
-Run the resulting executable to see telemetry from the application as it calls
-the instrumented library: </li>
-
-```sh
-bazel-bin/examples/<example directory name>/<binary name>
-```
-
-For instance, building and running the `simple` example can be done as follows:
-
-```sh
-bazel build //examples/simple:example_simple
-bazel-bin/examples/simple/example_simple
-```
-
-### DevContainer Setup for Project
-
-This guide provides instructions on how to set up and use the development
-container (`devcontainer`) environment to streamline testing and development
-for this project. With the DevContainer, you can work in a consistent environment
-configured with all the necessary dependencies and tools.
-
-#### Prerequisites
-
-Before getting started, ensure you have the following installed:
-
-* **Docker**: DevContainers require Docker for containerization.
-* **Visual Studio Code (VSCode)** with the **Remote - Containers** extension.
-
-#### Getting Started
-
-* **Open the Project in DevContainer**:
-
-   Open the project in VSCode. When prompted to "Reopen in Container," select
-   this option. If you’re not prompted, you can manually open the container by
-   selecting **Remote-Containers: Reopen in Container** from the command palette
-   (`F1` or `Ctrl+Shift+P`).
-
-* **Container Setup**:
-
-   The DevContainer environment will automatically build based on the configuration
-   files provided (e.g., `.devcontainer/devcontainer.json`). This setup will install
-   required dependencies, tools, and environment variables needed for the project.
-
-* **Container Customization**:
-   See `.devcontainer/README.md` for devcontainer configuration options.
-
-#### Available Commands
-
-Once inside the DevContainer, you can use the following commands to run tests
-and CI workflows.
-
-##### 1. Run Tests with Bazelisk
-
-To run tests with Bazelisk using specific compilation options, use:
-
-```bash
-bazelisk-linux-amd64 test --copt=-DENABLE_LOGS_PREVIEW
---test_output=errors --cache_test_results=no --copt=-DENABLE_TEST //exporters/otlp/...
-```
-
-###### Command Breakdown
-
-* `--copt=-DENABLE_LOGS_PREVIEW`: Enables preview logs.
-* `--test_output=errors`: Shows only the errors in the test output.
-* `--cache_test_results=no`: Forces Bazel to re-run tests without caching.
-* `--copt=-DENABLE_TEST`: Enables testing capabilities for the target code.
-* `//exporters/otlp/...`: Specifies the test target path.
-
-##### 2. Run CI Script
-
-You can also run the CI script provided to perform testing with the
-following command as an
-example:
-
-```bash
-bash ci/do_ci.sh cmake.exporter.otprotocol.test
-```
-
-This command initiates the CI pipeline, executing tests specifically for the
-**cmake.exporter.otprotocol** module.
-
-#### Troubleshooting
-
-If you encounter issues:
-
-* **Rebuild the DevContainer**: From the command palette, run
-  **Remote-Containers: Rebuild Container** to reinitialize the environment.
-* **Check Bazelisk and CI Script Logs**: Inspect logs for any configuration or
-  dependency issues.
-
-#### Additional Notes
-
-* You can adjust compiler options (`--copt`) as needed to test additional flags
-  or enable/disable specific features.
-* The test results will be displayed in the terminal within the DevContainer for
-  easy debugging.
-
-#### Resources
-
-* **Bazelisk Documentation**: [https://github.com/bazelbuild/bazelisk](https://github.com/bazelbuild/bazelisk)
-* **VSCode DevContainer Documentation**: [https://code.visualstudio.com/docs/remote/containers](https://code.visualstudio.com/docs/remote/containers)
-
-### Docker Development Image
-
-The `.devcontainer/Dockerfile.dev`
-dockerfile can be built directly with the following command.
-
-```sh
- docker build -t opentelemetry-cpp-dev -f ./.devcontainer/Dockerfile.dev .
-```
-
-You can customize the image using build arguments
- to match permissions with the host user.
-
-```sh
- docker build -t opentelemetry-cpp-dev \
-  --build-arg USER_UID="$(id -u)" \
-  --build-arg USER_GID="$(id -g)" \
-  -f ./.devcontainer/Dockerfile.dev .
-
-```
-
-Run an interactive bash session binding your host
- opentelemetry-cpp directory to the container's workspace:
-
-```sh
-docker run -it -v "$PWD:/workspaces/opentelemetry-cpp" opentelemetry-cpp-dev bash
-```
-
-## Pull Requests
-
-### How to Send Pull Requests
-
-Everyone is welcome to contribute code to `opentelemetry-cpp` via GitHub pull
-requests (PRs).
-
-To create a new PR, fork the project in GitHub and clone the upstream repo:
-
-```sh
-git clone --recursive https://github.com/open-telemetry/opentelemetry-cpp.git
-```
-
-Add your fork as a remote:
-
-```sh
-git remote add fork https://github.com/YOUR_GITHUB_USERNAME/opentelemetry-cpp.git
-```
-
-If you haven't, make sure you are loading the submodules required to build
-OpenTelemetry
-
-```sh
-git submodule init
-git submodule update
-```
-
-The source code is automatically formatted using clang-format.
-
-The output can vary between versions, so make sure to install `clang-format`
-version `10.0`, and have `clang-format-10` in your execution path,
-so that the helper script `tools/format.sh` can find it.
-
-Check out a new branch, make modifications and push the branch to your fork:
-
-```sh
-git checkout -b feature
-# edit files
-tools/format.sh
-git commit
-git push fork feature
-```
-
-If you made changes to the Markdown documents (`*.md` files), install the latest
-[`markdownlint-cli`](https://github.com/igorshubovych/markdownlint-cli) and run:
-
-```sh
-markdownlint .
-```
-
-If you modified shell scripts (`*.sh` files), install `shellcheck` and run:
-
-```sh
-shellcheck --severity=error <path to shell script>.sh
-```
-
-Open a pull request against the main `opentelemetry-cpp` repo.
-
-To run tests locally, please read the [CI instructions](ci/README.md).
-
-### How to Receive Comments
-
-* If the PR is not ready for review, please put `[WIP]` in the title, tag it as
-  `work-in-progress`, or mark it as
-  [`draft`](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
-* Make sure [CLA](https://identity.linuxfoundation.org/projects/cncf) is signed
-  and CI is clear.
-* For non-trivial changes, please update the [CHANGELOG](./CHANGELOG.md).
-
-### How to Get PRs Merged
-
-A PR is considered to be **ready to merge** when:
-
-* It has received two approvals with at least one approval from
-  [Approver](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
-  /
-  [Maintainer](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
-  (at different company).
-* A pull request opened by an Approver / Maintainer can be merged with only one
-  approval from  Approver / Maintainer (at different company).
-* Major feedback items/points are resolved.
-* It has been open for review for at least one working day. This gives people
-  reasonable time to review.
-* Trivial changes (typo, cosmetic, doc, etc.) don't have to wait for one day.
-* Urgent fixes can take exceptions as long as it has been actively communicated.
-
-Any Maintainer can merge the PR once it is **ready to merge**. Maintainer can
-make conscious judgement to merge pull requests which have not strictly met
-above mentioned requirements.
-
-If a PR has been stuck (e.g. there are lots of debates and people couldn't agree
-on each other), the owner should try to get people aligned by:
-
-* Consolidating the perspectives and putting a summary in the PR. It is
-  recommended to add a link into the PR description, which points to a comment
-  with a summary in the PR conversation
-* Stepping back to see if it makes sense to narrow down the scope of the PR or
-  split it up.
-
-If none of the above worked and the PR has been stuck for more than 2 weeks, the
-owner should bring it to the OpenTelemetry C++ SIG meeting. See
-[README.md](README.md#contributing) for the meeting link.
-
-## Design Choices
-
-As with other OpenTelemetry clients, opentelemetry-cpp follows the
-[opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification).
-
-It's especially valuable to read through the [library
-guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/library-guidelines.md).
-
-## Useful Resources
-
-Hi! If you’re looking at this document, these resources will provide you the
-knowledge to get started as a newcomer to the OpenTelemetry project. They will
-help you understand the OpenTelemetry Project, its components, and specifically
-the C++ repository.
-
-### Reading Resources
-
-* Medium
-  [article](https://medium.com/opentelemetry/how-to-start-contributing-to-opentelemetry-b23991ad91f4)
-  (October 2019) on how to start contributing to the OpenTelemetry project.
-* Medium
-  [article](https://medium.com/opentelemetry/opentelemetry-beyond-getting-started-5ac43cd0fe26)
-  (January 2020) describing the overarching goals and use cases for
-  OpenTelemetry.
-
-### Relevant Documentation
-
-* [OpenTelemetry
-  Specification](https://github.com/open-telemetry/opentelemetry-specification)
-* The OpenTelemetry Specification describes the requirements and expectations
-  of for all OpenTelemetry implementations.
-
-* Read through the OpenTelemetry C++ documentation
-* The
-    [API](https://opentelemetry-cpp.readthedocs.io/en/latest/api/api.html)
-    and
-    [SDK](https://opentelemetry-cpp.readthedocs.io/en/latest/sdk/sdk.html)
-    documentation provides a lot of information on what the classes and their
-    functions are used for.
-
-Please contribute! You’re welcome to add more information if you come across any
-helpful resources.
diff --git a/ext/opentelemetry-cpp-1.21.0/DEPRECATED.md b/ext/opentelemetry-cpp-1.21.0/DEPRECATED.md
deleted file mode 100644
index ec97f420f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/DEPRECATED.md
+++ /dev/null
@@ -1,139 +0,0 @@
-# Deprecated
-
-This document lists all the items currently deprecated in opentelemetry-cpp.
-
-Deprecated items will be removed in the future.
-
-## Guidelines
-
-### Maintainer guidelines
-
-See the [deprecation-process](./docs/deprecation-process.md)
-
-## [TEMPLATE]
-
-### New Deprecation Title (Template)
-
-#### Announcement (Template)
-
-#### Motivation (Template)
-
-#### Scope (Template)
-
-#### Mitigation (Template)
-
-#### Planned removal (Template)
-
-## [Platforms]
-
-N/A
-
-## [Compilers]
-
-N/A
-
-## [Third party dependencies]
-
-N/A
-
-## [Build tools]
-
-N/A
-
-## [Build scripts]
-
-N/A
-
-## [opentelemetry-cpp API]
-
-N/A
-
-## [opentelemetry-cpp SDK]
-
-N/A
-
-## [opentelemetry-cpp Exporter]
-
-N/A
-
-## [Documentation]
-
-N/A
-
-## Semantic conventions
-
-### Header files "semantic_conventions.h"
-
-#### Announcement (semantic_conventions.h)
-
-Deprecation is announced as part of the migration to weaver:
-
-* `Version:` release following opentelemetry-cpp 1.17.0
-* `Date:` Nov 9, 2024
-* `PR:` [PR 3105](https://github.com/open-telemetry/opentelemetry-cpp/pull/3105)
-
-#### Motivation (semantic_conventions.h)
-
-The header files for semantic conventions are generated automatically.
-The tooling to generate these files is changing:
-
-* before, the build-tool repository was used
-* now, the weaver repository is used
-
-Changes in tooling allows to generate code that is better organized,
-with dedicated header files per group of semantic conventions,
-instead of a single header file for everything.
-
-#### Scope (semantic_conventions.h)
-
-The following files:
-
-* `api/include/opentelemetry/trace/semantic_conventions.h`
-* `sdk/include/opentelemetry/sdk/resource/semantic_conventions.h`
-
-are now deprecated.
-
-They correspond to semantic conventions v1.27.0,
-and will no longer be maintained up to date.
-
-These files will be removed in the future.
-
-#### Mitigation (semantic_conventions.h)
-
-Two things have changed:
-
-* the header file to use
-* the symbol name to use.
-
-Before, the semantic convention for `url.full` was:
-
-* declared in file `semantic_conventions.h`
-* declared as symbol `SemanticConventions::kUrlFull`
-
-Now, the `url.full` convention, which is part or the `url` group, is:
-
-* declared in file `semconv/url_attributes.h`
-* declared as symbol `semconv::url::kUrlFull`
-
-Application code that uses semantic conventions must be adjusted
-accordingly.
-
-In addition, semantic conventions that are not marked as stable
-are generated in a different header file, placed under directory
-`incubating`, to better separate stable and non stable code.
-
-For example, file `semconv/incubating/url_attributes.h`
-defines `semconv::url::kUrlDomain`,
-which is not marked as stable in semconv v1.27.0
-
-#### Planned removal (semantic_conventions.h)
-
-The following files:
-
-* `api/include/opentelemetry/trace/semantic_conventions.h`
-* `sdk/include/opentelemetry/sdk/resource/semantic_conventions.h`
-
-will be removed.
-
-The removal date is planned for July 1, 2025.
-This allows more than six months for applications to adjust.
diff --git a/ext/opentelemetry-cpp-1.21.0/INSTALL.md b/ext/opentelemetry-cpp-1.21.0/INSTALL.md
deleted file mode 100644
index 296a61c44..000000000
--- a/ext/opentelemetry-cpp-1.21.0/INSTALL.md
+++ /dev/null
@@ -1,452 +0,0 @@
-# Building opentelemetry-cpp
-
-[CMake](https://cmake.org/) and [Bazel](https://bazel.build) are the official
-build systems for opentelemetry-cpp.
-
-## Dependencies
-
-You can link OpenTelemetry C++ SDK with libraries provided in
-[dependencies.md](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/docs/dependencies.md)
-(complete list of libraries with versions used in our CI can be found
-[here](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/third_party_release)).
-
-## Build instructions using CMake
-
-### Prerequisites for CMake build
-
-- A supported platform (e.g. Windows, macOS or Linux). Refer to [Platforms
-  Supported](./README.md#supported-development-platforms) for more information.
-- A compatible C++ compiler supporting at least C++14. Major compilers are
-  supported. Refer to [Supported Compilers](./README.md#supported-c-versions)
-  for more information.
-- [Git](https://git-scm.com/) for fetching opentelemetry-cpp source code from
-  repository. To install Git, consult the [Set up
-  Git](https://help.github.com/articles/set-up-git/) guide on GitHub.
-- [CMake](https://cmake.org/) for building opentelemetry-cpp API, SDK with their
-  unittests. The minimum CMake version is 3.14.
-  CMake 3.15+ is recommended on Windows due to known CI test failures with 3.14.
-  To install CMake,
-  consult the [Installing CMake](https://cmake.org/install/) guide.
-- [GoogleTest](https://github.com/google/googletest) framework to build and run
-  the unittests. Refer to
-  [third_party_release](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/third_party_release#L5)
-  for version of GoogleTest used in CI. To install GoogleTest, consult the
-  [GoogleTest Build
-  Instructions](https://github.com/google/googletest/blob/master/googletest/README.md#generic-build-instructions).
-- [Google Benchmark](https://github.com/google/benchmark) framework to build and
-  run benchmark tests. Refer to
-  [third_party_release](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/third_party_release#L4)
-  for version of Benchmark used in CI. To install Benchmark, consult the
-  [GoogleBenchmark Build
-  Instructions](https://github.com/google/benchmark#installation).
-- Apart from above core requirements, the Exporters and Propagators have their
-  build dependencies.
-
-### Building dependencies for the OTLP exporters
-
-The opentelemetry-cpp OTLP exporters depend on Protobuf and gRPC
- (in the case of the otlp grpc exporters).
-Protobuf (since version 3.22.0) and gRPC depend on Abseil.
-For cmake builds, it is best practice to build and install Abseil
-, Protobuf, and gPRC as independent packages -
-configuring cmake for Protobuf and gRPC to build against
- the installed packages instead of using their submodule option.
-
-If building and installing Protobuf and gRPC manually with cmake the
- recommended approach is:
-
-1. Choose the desired tag version of grpc. Find the compatible versions of abseil
- and protobuf by inspecting the submodules of grpc at that tag.
-2. Build and install the required version of abseil
-3. Build and install the required version of protobuf
-    - Set the cmake option of Protobuf to build against the installed
-     package of Abseil (`protobuf_ABSL_PROVIDER=package`)
-4. Build and install the required version of grpc
-    - Set the cmake option of grpc to build against the installed packages
-     of Abseil and Protobuf (cmake options - `gRPC_ABSL_PROVIDER=package` and `gRPC_PROTOBUF_PROVIDER=package`)
-
-### Building as standalone CMake Project
-
-1. Getting the opentelemetry-cpp source with its submodules:
-
-   ```console
-   # Change to the directory where you want to create the code repository
-   $ cd ~
-   $ mkdir source && cd source && git clone --recurse-submodules https://github.com/open-telemetry/opentelemetry-cpp
-   Cloning into 'opentelemetry-cpp'...
-   ...
-   Resolving deltas: 100% (3225/3225), done.
-   $
-   ```
-
-2. Navigate to the repository cloned above, and create the `CMake` build
-   configuration.
-
-   ```console
-   $ cd opentelemetry-cpp
-   $ mkdir build && cd build && cmake ..
-   -- The C compiler identification is GNU 9.3.0
-   -- The CXX compiler identification is GNU 9.3.0
-   ...
-   -- Configuring done
-   -- Generating done
-   -- Build files have been written to: /home/<user>/source/opentelemetry-cpp/build
-   $
-   ```
-
-   Some of the available cmake build variables we can use during cmake
-   configuration:
-
-   - `-DCMAKE_POSITION_INDEPENDENT_CODE=ON` : Please note that with default
-     configuration, the code is compiled without `-fpic` option, so it is not
-     suitable for inclusion in shared libraries. To enable the code for
-     inclusion in shared libraries, this variable is used.
-   - `-DBUILD_SHARED_LIBS=ON` : To build shared libraries for the targets.
-      Please refer to note [below](#building-shared-libs-for-windows) for
-      Windows DLL support.
-   - `-DWITH_OTLP_GRPC=ON` : To enable building OTLP GRPC exporter.
-   - `-DWITH_OTLP_HTTP=ON` : To enable building OTLP HTTP exporter.
-   - `-DWITH_PROMETHEUS=ON` : To enable building prometheus exporter.
-   - `-DOPENTELEMETRY_INSTALL=ON`: To install `otel-cpp` library needed
-      for external code linking.
-
-3. Once the build configuration is created, build the CMake targets - this
-   includes building SDKs and unittests for API and SDK. Note that since API is
-   header only library, no separate build is triggered for it.
-
-   ```console
-   $ cmake --build . --target all
-   Scanning dependencies of target timestamp_test
-   [  0%] Building CXX object api/test/core/CMakeFiles/timestamp_test.dir/timestamp_test.cc.o
-   [  1%] Linking CXX executable timestamp_test
-   ...
-   Scanning dependencies of target w3c_tracecontext_test
-   [ 99%] Building CXX object ext/test/w3c_tracecontext_test/CMakeFiles/w3c_tracecontext_test.dir/main.cc.o
-   [100%] Linking CXX executable w3c_tracecontext_test
-   [100%] Built target w3c_tracecontext_test
-   $
-   ```
-
-4. Once CMake tests are built, run them with `ctest` command
-
-   ```console
-   $ ctest
-   Test project /tmp/opentelemetry-cpp/build
-        Start   1: trace.SystemTimestampTest.Construction
-   ...
-        Start 380: ext.http.urlparser.UrlParserTests.BasicTests
-   ...
-   100% tests passed, 0 tests failed out of 380
-   $
-   ```
-
-5. Optionally install the header files for API, and generated targets and header
-   files for SDK at custom/default install location.
-
-   ```console
-   $ cmake --install . --prefix /<install-root>/
-   -- Installing: /<install-root>/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config.cmake
-   -- Installing: /<install-root>/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config-version.cmake
-   ...
-   $
-   ```
-
-### Incorporating into an external CMake Project
-
-There are two approaches to incoporate `opentelemetry-cpp` into
- an external CMake project:
-
-1. Build and install `opentelemetry-cpp` then use `find_package`
- to import its targets
-
-   ```cmake
-   # Find all installed components and link all imported targets
-   find_package(opentelemetry-cpp CONFIG REQUIRED)
-   ...
-   target_include_directories(foo PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS})
-   target_link_libraries(foo PRIVATE ${OPENTELEMETRY_CPP_LIBRARIES})
-   ```
-
-   ```cmake
-   # Find a specific component and link its imported target(s)
-   find_package(opentelemetry-cpp CONFIG REQUIRED COMPONENTS api)
-   ...
-   target_link_libraries(foo PRIVATE opentelemetry-cpp::api)
-   ```
-
-2. Use CMake's [FetchContent](https://cmake.org/cmake/help/latest/module/FetchContent.html)
- module to fetch and build `opentelemetry-cpp` then make its targets available
-
-   ```cmake
-   # Fetch from an existing clone and build
-   include(FetchContent)
-   FetchContent_Declare(opentelemetry-cpp SOURCE_DIR "<path/to/opentelemetry-cpp>")
-   FetchContent_MakeAvailable(opentelemetry-cpp)
-   ...
-   target_link_libraries(foo PRIVATE opentelemetry-cpp::api)
-   ```
-
-   ```cmake
-   # Clone and build opentelemetry-cpp from a git tag
-   include(FetchContent)
-   FetchContent_Declare(
-   opentelemetry-cpp
-   GIT_REPOSITORY https://github.com/open-telemetry/opentelemetry-cpp.git
-   GIT_TAG        v1.20.0)
-   FetchContent_MakeAvailable(opentelemetry-cpp)
-   ...
-   target_link_libraries(foo PRIVATE opentelemetry-cpp::api)
-   ```
-
-In both cases the project's built or imported CMake targets will be
- available in the `opentelemetry-cpp` namespace (ie: `opentelemetry-cpp::api`)
-
-#### Using opentelemetry-cpp package components
-
-> **Note:** `opentelemetry-cpp` CMake package components were introduced in `v1.21.0`
-
-The `opentelemetry-cpp` package supports using the `COMPONENTS` argument to
-`find_package`. The following example illustrates using this feature to include
-and link the `api` header only target to an instrumented `foo_lib` while only including
-and linking the `sdk` and `otlp_grpc_exporter` targets to the `foo_app`.
-
-```cmake
-# foo_lib/CMakeLists.txt
-find_package(opentelemetry-cpp CONFIG REQUIRED COMPONENTS api)
-add_library(foo_lib foo.cpp)
-target_link_libraries(foo_lib PRIVATE opentelemetry-cpp::api)
-```
-
-```cmake
-# foo_app/CMakeLists.txt
-find_package(opentelemetry-cpp CONFIG REQUIRED COMPONENTS api sdk exporters_otlp_grpc)
-add_executable(foo_app main.cpp)
-target_link_libraries(foo_app PRIVATE foo_lib opentelemetry-cpp::api opentelemetry-cpp::trace opentelemetry-cpp::otlp_grpc_exporter )
-```
-
-The following table provides the mapping between components and targets. Components
-and targets available in the installation depends on the opentelemetry-cpp package
-build configuration.
-
-> **Note:** components `exporters_elasticsearch` and `exporters_etw`
- may be moved out of the core package and to `opentelemetry-cpp-contrib`
-  in a future release
-
-| Component                  | Targets                                                                                          |
-|----------------------------|--------------------------------------------------------------------------------------------------|
-| **api**                    | opentelemetry-cpp::api                                                                           |
-| **sdk**                    | opentelemetry-cpp::sdk                                                                           |
-|                            | opentelemetry-cpp::version                                                                       |
-|                            | opentelemetry-cpp::common                                                                        |
-|                            | opentelemetry-cpp::resources                                                                     |
-|                            | opentelemetry-cpp::trace                                                                         |
-|                            | opentelemetry-cpp::metrics                                                                       |
-|                            | opentelemetry-cpp::logs                                                                          |
-| **ext_common**             | opentelemetry-cpp::ext                                                                           |
-| **ext_http_curl**          | opentelemetry-cpp::http_client_curl                                                              |
-| **ext_dll**                | opentelemetry-cpp::opentelemetry_cpp                                                             |
-| **exporters_in_memory**    | opentelemetry-cpp::in_memory_span_exporter                                                       |
-|                            | opentelemetry-cpp::in_memory_metric_exporter                                                     |
-| **exporters_ostream**      | opentelemetry-cpp::ostream_log_record_exporter                                                   |
-|                            | opentelemetry-cpp::ostream_metrics_exporter                                                      |
-|                            | opentelemetry-cpp::ostream_span_exporter                                                         |
-| **exporters_otlp_common**  | opentelemetry-cpp::proto                                                                         |
-|                            | opentelemetry-cpp::otlp_recordable                                                               |
-| **exporters_otlp_file**    | opentelemetry-cpp::otlp_file_client                                                              |
-|                            | opentelemetry-cpp::otlp_file_exporter                                                            |
-|                            | opentelemetry-cpp::otlp_file_log_record_exporter                                                 |
-|                            | opentelemetry-cpp::otlp_file_metric_exporter                                                     |
-| **exporters_otlp_grpc**    | opentelemetry-cpp::proto_grpc                                                                    |
-|                            | opentelemetry-cpp::otlp_grpc_client                                                              |
-|                            | opentelemetry-cpp::otlp_grpc_exporter                                                            |
-|                            | opentelemetry-cpp::otlp_grpc_log_record_exporter                                                 |
-|                            | opentelemetry-cpp::otlp_grpc_metrics_exporter                                                    |
-| **exporters_otlp_http**    | opentelemetry-cpp::otlp_http_client                                                              |
-|                            | opentelemetry-cpp::otlp_http_exporter                                                            |
-|                            | opentelemetry-cpp::otlp_http_log_record_exporter                                                 |
-|                            | opentelemetry-cpp::otlp_http_metric_exporter                                                     |
-| **exporters_prometheus**   | opentelemetry-cpp::prometheus_exporter                                                           |
-| **exporters_elasticsearch**| opentelemetry-cpp::elasticsearch_log_record_exporter                                             |
-| **exporters_etw**          | opentelemetry-cpp::etw_exporter                                                                  |
-| **exporters_zipkin**       | opentelemetry-cpp::zipkin_trace_exporter                                                         |
-| **shims_opentracing**      | opentelemetry-cpp::opentracing_shim                                                              |
-
-## Build instructions using Bazel
-
-NOTE: Experimental, and not supported for all the components. Make sure the
-[GoogleTest](https://github.com/google/googletest) installation may fail if
-there is a different version of googletest already installed in system-defined
-path.
-
-### Prerequisites for Bazel build
-
-- A supported platform (e.g. Windows, macOS or Linux). Refer to [Platforms
-Supported](./README.md#supported-development-platforms) for more information.
-- A compatible C++ compiler supporting at least C++14. Major compilers are
-supported. Refer to [Supported Compilers](./README.md#supported-c-versions) for
-more information.
-- [Git](https://git-scm.com/) for fetching opentelemetry-cpp source code from
-repository. To install Git, consult the [Set up
-Git](https://help.github.com/articles/set-up-git/) guide on GitHub.
-- [Bazel](https://www.bazel.build/) for building opentelemetry-cpp API, SDK with
-their unittests. We use 3.7.2 in our build system.
-
-To install Bazel, consult the [Installing
-Bazel](https://docs.bazel.build/versions/3.7.0/install.html) guide.
-
-### Building as standalone Bazel Project
-
-1. Getting the opentelemetry-cpp source:
-
-   ```console
-   # Change to the directory where you want to create the code repository
-   $ cd ~
-   $ mkdir source && cd source
-   $ git clone https://github.com/open-telemetry/opentelemetry-cpp
-   Cloning into 'opentelemetry-cpp'...
-   ...
-   Resolving deltas: 100% (3225/3225), done.
-   $
-   ```
-
-2. Navigate to the repository cloned above, download the dependencies and build
-   the source code:
-
-   ```console
-   $ cd opentelemetry-cpp
-   $ bazel build //...
-   bazel build -- //... -//exporters/otlp/... -//exporters/prometheus/...
-   Extracting Bazel installation...
-   Starting local Bazel server and connecting to it...
-   INFO: Analyzed 121 targets (98 packages loaded, 3815 targets configured).
-   INFO: Found 121 targets...
-   INFO: From Compiling sdk/src/trace/tracer_context.cc:
-   ...
-
-   ```
-
-3. Once Bazel tests are built, run them with `bazel test //...` command
-
-   ```console
-   $ bazel test //...
-   ..
-   $
-   ```
-
-4. The build artifacts will be located under `bazel-bin`
-
-### Incorporating into an existing Bazel Project
-
-- WORKSPACE file:
-
-```console
-http_archive(
-    name = "io_opentelemetry_cpp",
-    sha256 = "<sha256>",
-    strip_prefix = "opentelemetry-cpp-1.0.1",
-    urls = [
-        "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.0.1.tar.gz"
-    ],
-)
-
-# Load OpenTelemetry dependencies after load.
-load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")
-
-opentelemetry_cpp_deps()
-
-# (required after v1.8.0) Load extra dependencies required for OpenTelemetry
-load("@io_opentelemetry_cpp//bazel:extra_deps.bzl", "opentelemetry_extra_deps")
-
-opentelemetry_extra_deps()
-
-# Load gRPC dependencies after load.
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
-grpc_deps()
-
-# Load extra gRPC dependencies due to https://github.com/grpc/grpc/issues/20511
-load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
-
-grpc_extra_deps()
-
-```
-
-- Component level BUILD file:
-
-```console
-cc_library(
-   name = "<name>"
-   ...
-   deps = [
-      "@io_opentelemetry_cpp//api",
-      "@io_opentelemetry_cpp//exporters/otlp:otlp_exporter",
-      "@io_opentelemetry_cpp//sdk/src/trace",
-      ...
-   ],
-   ...
-)
-```
-
-## Building shared libs for Windows
-
-Windows DLL build is supported under **preview**. Please check the
-[doc](./docs/build-as-dll.md) for more details.
-
-## Generating binary packages
-
-OpenTelemetry C++ supports generating platform specific binary packages from CMake
-configuration. The packages generated through this mayn't be production ready,
-and user may have to customize it further before using it as distribution.
-
-- Linux : deb, rpm, tgz
-- MacOS : tgz
-- Windows : NuGet, zip
-
-This requires platform specific package generators already installed. The package
-generation can subsequently be enabled by using BUILD_PACKAGE option during cmake
-configuration
-
-   ```console
-   $ cd opentelemetry-cpp
-   $ mkdir build && cd build && cmake -DBUILD_PACKAGE=ON ..
-
-   -- Package name: opentelemetry-cpp-1.8.1-ubuntu-20.04-x86_64.deb
-   -- Configuring done
-   -- Generating done
-   ...
-   $
-   ```
-
-Once build is complete as specified in [standalone build section](#building-as-standalone-cmake-project),
-the package can be generated as below.
-
-   ```console
-   $ cpack -C debug
-   CPack: Create package using DEB
-   ...
-   CPack: - package: /home/<user>/opentelemetry-cpp/build/opentelemetry-cpp-1.8.1-ubuntu-20.04-x86_64.deb generated.
-   $
-   ```
-
-## Using Package Managers
-
-If you are using [Conan](https://www.conan.io/) to manage your dependencies, add
-[`opentelemetry-cpp/x.y.z`](https://conan.io/center/opentelemetry-cpp) to your
-`conanfile`'s requires, where `x.y.z` is the release version you want to use.
-Please file issues [here](https://github.com/conan-io/conan-center-index/issues)
-if you experience problems with the packages.
-
-If you are using [vcpkg](https://github.com/Microsoft/vcpkg/) on your project
-for external dependencies, then you can install the [opentelemetry-cpp
-package](https://github.com/microsoft/vcpkg/tree/master/ports/opentelemetry-cpp)
-with `vcpkg install opentelemetry-cpp` and follow the then displayed
-descriptions. Please see the vcpkg project for any issues regarding the
-packaging.
-
-If you are using [alpine linux](https://www.alpinelinux.org/) you can install
-the [opentelemetry-cpp packages](https://pkgs.alpinelinux.org/packages?name=opentelemetry-cpp-*)
-with `apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/testing opentelemetry-cpp-dev`.
-
-Please note, these packages are not officially provided and maintained by
-OpenTelemetry C++ project, and are just listed here to consolidate all such
-efforts for ease of developers.
diff --git a/ext/opentelemetry-cpp-1.21.0/LICENSE b/ext/opentelemetry-cpp-1.21.0/LICENSE
deleted file mode 100644
index 261eeb9e9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/ext/opentelemetry-cpp-1.21.0/MODULE.bazel b/ext/opentelemetry-cpp-1.21.0/MODULE.bazel
deleted file mode 100644
index 59d844090..000000000
--- a/ext/opentelemetry-cpp-1.21.0/MODULE.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-module(
-    name = "opentelemetry-cpp",
-    version = "1.21.0",
-    compatibility_level = 0,
-    repo_name = "io_opentelemetry_cpp",
-)
-
-bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl")
-bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "curl", version = "8.8.0")
-bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc")
-bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "github_nlohmann_json")
-bazel_dep(name = "opentelemetry-proto", version = "1.6.0", repo_name = "com_github_opentelemetry_proto")
-bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
-bazel_dep(name = "platforms", version = "0.0.8")
-bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")
-bazel_dep(name = "protobuf", version = "26.0", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
-bazel_dep(name = "zlib", version = "1.3.1.bcr.1")
-
-bazel_dep(name = "google_benchmark", version = "1.8.3", dev_dependency = True, repo_name = "com_github_google_benchmark")
-bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True, repo_name = "com_google_googletest")
diff --git a/ext/opentelemetry-cpp-1.21.0/README.md b/ext/opentelemetry-cpp-1.21.0/README.md
deleted file mode 100644
index 01645aa8c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/README.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# OpenTelemetry C++
-
-[![Slack](https://img.shields.io/badge/slack-@cncf/otel/cpp-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C01N3AT62SJ)
-[![codecov.io](https://codecov.io/gh/open-telemetry/opentelemetry-cpp/branch/main/graphs/badge.svg?)](https://codecov.io/gh/open-telemetry/opentelemetry-cpp/)
-[![Build
-Status](https://github.com/open-telemetry/opentelemetry-cpp/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/open-telemetry/opentelemetry-cpp/actions)
-[![Release](https://img.shields.io/github/v/release/open-telemetry/opentelemetry-cpp?include_prereleases&style=)](https://github.com/open-telemetry/opentelemetry-cpp/releases/)
-[![FOSSA License Status](https://app.fossa.com/api/projects/custom%2B162%2Fgithub.com%2Fopen-telemetry%2Fopentelemetry-cpp.svg?type=shield&issueType=license)](https://app.fossa.com/projects/custom%2B162%2Fgithub.com%2Fopen-telemetry%2Fopentelemetry-cpp?ref=badge_shield&issueType=license)
-[![FOSSA Security Status](https://app.fossa.com/api/projects/custom%2B162%2Fgithub.com%2Fopen-telemetry%2Fopentelemetry-cpp.svg?type=shield&issueType=security)](https://app.fossa.com/projects/custom%2B162%2Fgithub.com%2Fopen-telemetry%2Fopentelemetry-cpp?ref=badge_shield&issueType=security)
-
-The C++ [OpenTelemetry](https://opentelemetry.io/) client.
-
-## Project Status
-
-**Stable** across all 3 signals i.e. `Logs`, `Metrics`, and `Traces`.
-
-See [Spec Compliance
-Matrix](https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix.md)
-to understand which portions of the specification has been implemented in this
-repo.
-
-## Supported C++ Versions
-
-Code shipped from this repository generally supports the following versions of
-C++ standards:
-
-* ISO/IEC 14882:2014 (C++14)
-* ISO/IEC 14882:2017 (C++17)
-* ISO/IEC 14882:2020 (C++20)
-
-Any exceptions to this are noted in the individual `README.md` files.
-
-Please note that supporting the [C Programming
-Language](https://en.wikipedia.org/wiki/C_(programming_language)) is not a goal
-of the current project.
-
-## Supported Development Platforms
-
- Our CI pipeline builds and tests on following `x86-64` platforms:
-
-| Platform                                                            |   Build type  |
-|---------------------------------------------------------------------|---------------|
-| ubuntu-22.04 (GCC 10, GCC 12, Clang 14)                             | CMake, Bazel  |
-| ubuntu-20.04 (GCC 9.4.0 - default compiler)                         | CMake, Bazel  |
-| ubuntu-20.04 (GCC 9.4.0 with -std=c++14/17/20 flags)                | CMake, Bazel  |
-| macOS 12.7 (Xcode 14.2)                                             | Bazel         |
-| Windows Server 2019 (Visual Studio Enterprise 2019)                 | CMake, Bazel  |
-| Windows Server 2022 (Visual Studio Enterprise 2022)                 | CMake         |
-
-In general, the code shipped from this repository should build on all platforms
-having C++ compiler with [supported C++ standards](#supported-c-versions).
-
-## Dependencies
-
-Please refer to [Dependencies.md](docs/dependencies.md) for OSS Dependencies and
-license requirements.
-
-## Installation
-
-Please refer to [INSTALL.md](./INSTALL.md).
-
-## Getting Started
-
-As an application owner or the library author, you can find the getting started
-guide and reference documentation on
-[opentelemetry-cpp.readthedocs.io](https://opentelemetry-cpp.readthedocs.io/en/latest/)
-
-The `examples/simple` directory contains a minimal program demonstrating how to
-instrument a small library using a simple `processor` and console `exporter`,
-along with build files for CMake and Bazel.
-
-## Contributing
-
-See [CONTRIBUTING.md](CONTRIBUTING.md)
-
-We meet weekly, and the time of the meeting alternates between Monday at 13:00
-PT and Wednesday at 9:00 PT. The meeting is subject to change depending on
-contributors' availability. Check the [OpenTelemetry community
-calendar](https://github.com/open-telemetry/community#calendar)
-for specific dates and Zoom meeting links.
-
-Meeting notes are available as a public [Google
-doc](https://docs.google.com/document/d/1i1E4-_y4uJ083lCutKGDhkpi3n4_e774SBLi9hPLocw/edit?usp=sharing).
-For edit access, get in touch on
-[Slack](https://cloud-native.slack.com/archives/C01N3AT62SJ).
-
-[Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
-([@open-telemetry/cpp-maintainers](https://github.com/orgs/open-telemetry/teams/cpp-maintainers)):
-
-* [Ehsan Saei](https://github.com/esigo)
-* [Lalit Kumar Bhasin](https://github.com/lalitb), Microsoft
-* [Marc Alff](https://github.com/marcalff), Oracle
-* [Tom Tan](https://github.com/ThomsonTan), Microsoft
-
-[Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
-([@open-telemetry/cpp-approvers](https://github.com/orgs/open-telemetry/teams/cpp-approvers)):
-
-* [Doug Barker](https://github.com/dbarker)
-* [Josh Suereth](https://github.com/jsuereth), Google
-* [Pranav Sharma](https://github.com/psx95), Google
-* [WenTao Ou](https://github.com/owent), Tencent
-
-[Emeritus
-Maintainer/Approver/Triager](https://github.com/open-telemetry/community/blob/main/community-membership.md#emeritus-maintainerapprovertriager):
-
-* [Alolita Sharma](https://github.com/alolita)
-* [Emil Mikulic](https://github.com/g-easy)
-* [Jodee Varney](https://github.com/jodeev)
-* [Johannes Tax](https://github.com/pyohannes)
-* [Max Golovanov](https://github.com/maxgolov)
-* [Reiley Yang](https://github.com/reyang)
-* [Ryan Burn](https://github.com/rnburn)
-
-### Thanks to all the people who have contributed
-
-[![contributors](https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-cpp)](https://github.com/open-telemetry/opentelemetry-cpp/graphs/contributors)
-
-## Release Schedule
-
-See the [release
-notes](https://github.com/open-telemetry/opentelemetry-cpp/releases) for
-existing releases.
-
-See the [project
-milestones](https://github.com/open-telemetry/opentelemetry-cpp/milestones) for
-details on upcoming releases. The dates and features described in issues and
-milestones are estimates, and subject to change.
diff --git a/ext/opentelemetry-cpp-1.21.0/RELEASING.md b/ext/opentelemetry-cpp-1.21.0/RELEASING.md
deleted file mode 100644
index 852332e82..000000000
--- a/ext/opentelemetry-cpp-1.21.0/RELEASING.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Release Process
-
-## Pre Release
-
-1: Upgrade to latest [dependencies](docs/maintaining-dependencies.md)
-if required.
-
-2: Make sure all relevant changes for this release are included under
-`Unreleased` section in `CHANGELOG.md` and are in language that non-contributors
-to the project can understand.
-
-3: Run the pre-release script. It creates a branch `pre_release_<new-tag>` and
-updates `CHANGELOG.md` with the `<new-tag>`:
-
-```sh
-./buildscripts/pre_release.sh -t <new-tag>
-```
-
-4: Verify that CHANGELOG.md is updated properly:
-
-```sh
-git diff main
-```
-
-5: Push the changes to upstream and create a Pull Request on GitHub. Be sure to
-include the curated changes from the [Changelog](./CHANGELOG.md) in the
-description.
-
-## Tag
-
-Once the above Pull Request has been approved and merged it is time to tag the
-merged commit.
-
-***IMPORTANT***: It is critical you use the same tag that you used in the
-Pre-Release step! Failure to do so will leave things in a broken state.
-
-1: Note down the commit hash of the master branch after above PR request is
-merged: `<commit-hash>`
-
-```sh
-git show -s --format=%H
-```
-
-2: Create a github tag on this commit hash:
-
-```sh
-git tag -a "<new-tag>" -s -m "Version <new-tag>" "<commit-hash>"
-```
-
-3: Push tag to upstream remote
-
-```sh
-git push upstream
-```
-
-## Versioning
-
-Once tag is created, it's time to use that tag for Runtime Versioning
-
-1: Create a new brach for updating version information in
-`./sdk/src/version.cc`.
-
-```sh
-git checkout -b update_version_${tag} master
-```
-
-2: Run the pre-commit script to update the version:
-
-```sh
-./buildscripts/pre-commit
-```
-
-3: Check if any changes made since last release broke ABI compatibility. If yes,
-update `OPENTELEMETRY_ABI_VERSION_NO` in
-[version.h](api/include/opentelemetry/version.h).
-
-4: Push the changes to upstream and create a Pull Request on GitHub.
-
-5: Once changes are merged, move the tag created earlier to the new commit hash
-from step 4.
-
-```sh
-git tag -f <previous-tag> <new-commit-hash>
-git push --tags --force
-```
-
-## Release
-
-Finally create a Release for the new `<new-tag>` on GitHub. The release body
-should include all the release notes from the Changelog for this release.
-
-## Post Release
-
-Update the OpenTelemetry.io document
-[here](https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/instrumentation/cpp)
-by sending a Pull Request.
diff --git a/ext/opentelemetry-cpp-1.21.0/Versioning.md b/ext/opentelemetry-cpp-1.21.0/Versioning.md
deleted file mode 100644
index b6cbe490e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/Versioning.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Versioning
-
-This document describes the versioning policy for this repository.
-
-## Goals
-
-### API and SDK Compatibility
-
-Once the API for a given signal (spans, logs, metrics, baggage) has been
-officially released, that API module will function with any SDK that has the
-same MAJOR version and equal or greater MINOR or PATCH version. For example,
-application compiled with API v1.1 is compatible with SDK v1.1.2, v1.2.0, etc.
-
-For example, libraries that are instrumented with `opentelemetry 1.0.1` will
-function in applications using `opentelemetry 1.11.33` or `opentelemetry 1.3.4`,
-buy may not work in applications using `opentelemetry 2.0.0`.
-
-### ABI Stability
-
-Refer to the [ABI Policy](./docs/abi-policy.md) for more details. To summarise:
-
-* The API is header only, and uses ABI compliant interfaces. However, ABI
-  stability is not guaranteed for SDK.
-* In case of ABI breaking changes, a new `inline namespace` version will be
-  introduced, and the existing linked applications can continue using the older
-  version unless they relink with newer version.
-
-## Release Policy
-
-* Release versions will follow [SemVer 2.0](https://semver.org/).
-* Only a single source package containing the API, SDK, and exporters which are
-  required by the specification would be released. All these components are
-  always versioned and released together. For example, any changes in one of the
-  exporter would result in version update of the entire source package even
-  though there is no changes in API, SDK and other exporters.
-* Experimental releases: New (unstable) telemetry signals and features will be
-  introduced behind feature flag protected by a preprocessor macro.
-
-  ```cpp
-  #ifdef FEATURE_FLAG
-    <metrics api/sdk definitions>
-  #endif
-  ```
-
-  As we deliver the package in source form, and the user is responsible to build
-  it for their platform, the user must be aware of these feature flags
-  (documented in the [CHANGELOG.md](CHANGELOG.md) file). The user must enable
-  them explicitly through their build system (CMake, Bazel or others) to use any
-  preview features.
-
-  The guidelines in creating feature flag would be:
-
-  * Naming:
-    * `ENABLE_<SIGNAL>_PREVIEW` : For experimental release of signal api/sdks
-      eg, `METRICS_PREVIEW`, `LOGS_PREVIEW`,
-    * `ENABLE_<SIGNAL>_<FEATURE_NAME>_PREVIEW` : For experimental release for
-      any feature within stable signal. For example, `TRACING_JAEGER_PREVIEW` to
-      release the experimental Jaeger exporter for tracing.
-  * Cleanup: It is good practice to keep feature-flags as shortlived as
-    possible. And, also important to keep the number of them low. They should be
-    used such that it is easy to remove/cleanup them once the experimental
-    feature is stable.
-
-* New signals will be stabilized via a **minor version bump**, and are not
-  allowed to break existing stable interfaces. Feature flags will be removed
-  once we have a stable implementation for the signal.
-
-* As an exception, small experimental features in otherwise stable
-  signals/components mayn't necessarily be released under feature flag. These
-  would be flagged as experimental by adding a `NOTE` in it's header file -
-  either at the beginning of file, or as the comment for the experimental API
-  methods. Also, if the complete header is experimental, it would be prefixed as
-  `experimental_`. As an example, the semantic conventions for trace signal is
-  experimental at the time of the writing and is within
-  `experimental_semantic_conventions.h`
-
-* Code under the "*::detail" namespace implements internal details, and is NOT
-  part of public interface. Also, any API not documented in the [public
-  documentation](https://opentelemetry-cpp.readthedocs.io/en/latest/) is NOT
-  part of the public interface.
-
-* GitHub releases will be made for all released versions.
-
-## Example Versioning Lifecycle
-
-Purely for illustration purposes, not intended to represent actual releases:
-
-* v0.0.1 release:
-  * Contains experimental API and SDK of trace (without feature flag)
-  * No API and SDK of logging and metrics available
-* v1.0.0-rc1 release:
-  * Pre-release, no API/ABI guarantees, but more stable than alpha/beta.
-  * Contains pre-release API and SDK of trace, baggage and resource
-  * experimental metrics and logging API/SDK behind feature flag
-* v1.0.0: ( with traces )
-  * Contains stable API and SDK of trace, baggage and resource
-  * experimental metrics and logging API/SDK behind feature flag
-* v1.5.0 release (with metrics)
-  * Contains stable API and SDK of metrics, trace, baggage, resource.
-  * experimental logging API/SDK behind feature flag
-* v1.10.0 release (with logging)
-  * Contains stable API and SDK of logging, metrics, trace, baggage, resource.
-
-### Before moving to version 1.0.0
-
-* Major version zero (0.y.z) is for initial development. Anything MAY change at
-  any time. The public API SHOULD NOT be considered stable.
diff --git a/ext/opentelemetry-cpp-1.21.0/WORKSPACE b/ext/opentelemetry-cpp-1.21.0/WORKSPACE
deleted file mode 100644
index a52788ece..000000000
--- a/ext/opentelemetry-cpp-1.21.0/WORKSPACE
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-workspace(name = "io_opentelemetry_cpp")
-
-# Load our direct dependencies.
-load("//bazel:repository.bzl", "opentelemetry_cpp_deps")
-
-opentelemetry_cpp_deps()
-
-load("//bazel:extra_deps.bzl", "opentelemetry_extra_deps")
-
-opentelemetry_extra_deps()
-
-# Load gRPC dependencies after load.
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
-grpc_deps()
-
-# Load extra gRPC dependencies due to https://github.com/grpc/grpc/issues/20511
-load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
-
-grpc_extra_deps()
diff --git a/ext/opentelemetry-cpp-1.21.0/WORKSPACE.bzlmod b/ext/opentelemetry-cpp-1.21.0/WORKSPACE.bzlmod
deleted file mode 100644
index 0db1b0462..000000000
--- a/ext/opentelemetry-cpp-1.21.0/WORKSPACE.bzlmod
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Disables the default WORKSPACE when using bzlmod
diff --git a/ext/opentelemetry-cpp-1.21.0/api/BUILD b/ext/opentelemetry-cpp-1.21.0/api/BUILD
deleted file mode 100644
index fb3139356..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/BUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "int_flag", "string_flag")
-
-package(default_visibility = ["//visibility:public"])
-
-CPP_STDLIBS = [
-    "none",
-    "best",
-    "2014",
-    "2017",
-    "2020",
-    "2023",
-]
-
-string_flag(
-    name = "with_cxx_stdlib",
-    build_setting_default = "best",
-    values = CPP_STDLIBS,
-)
-
-cc_library(
-    name = "api",
-    hdrs = glob(["include/**/*.h"]),
-    defines = select({
-        ":set_cxx_stdlib_none": [],
-        ### automatic selection
-        ":set_cxx_stdlib_best": ["OPENTELEMETRY_STL_VERSION=(__cplusplus/100)"],
-        # See https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus
-        ":set_cxx_stdlib_best_and_msvc": ["OPENTELEMETRY_STL_VERSION=(_MSVC_LANG/100)"],
-        ### manual selection
-        ":set_cxx_stdlib_2014": ["OPENTELEMETRY_STL_VERSION=2014"],
-        ":set_cxx_stdlib_2017": ["OPENTELEMETRY_STL_VERSION=2017"],
-        ":set_cxx_stdlib_2020": ["OPENTELEMETRY_STL_VERSION=2020"],
-        ":set_cxx_stdlib_2023": ["OPENTELEMETRY_STL_VERSION=2023"],
-        "//conditions:default": [],
-    }) + select({
-        ":abi_version_no_1": ["OPENTELEMETRY_ABI_VERSION_NO=1"],
-        ":abi_version_no_2": ["OPENTELEMETRY_ABI_VERSION_NO=2"],
-    }),
-    strip_include_prefix = "include",
-    tags = ["api"],
-    deps = [
-        "@com_google_absl//absl/base",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:variant",
-    ],
-)
-
-[config_setting(
-    name = "set_cxx_stdlib_%s" % v,
-    flag_values = {":with_cxx_stdlib": v},
-) for v in CPP_STDLIBS]
-
-config_setting(
-    name = "set_cxx_stdlib_best_and_msvc",
-    constraint_values = ["@bazel_tools//tools/cpp:msvc"],
-    flag_values = {":with_cxx_stdlib": "best"},
-)
-
-bool_flag(
-    name = "with_abseil",
-    build_setting_default = False,
-    deprecation = "The value of this flag is ignored. Bazel builds always depend on Abseil for its pre-adopted `std::` types. You should remove this flag from your build command.",
-)
-
-int_flag(
-    name = "abi_version_no",
-    build_setting_default = 1,
-)
-
-config_setting(
-    name = "abi_version_no_1",
-    flag_values = {":abi_version_no": "1"},
-)
-
-config_setting(
-    name = "abi_version_no_2",
-    flag_values = {":abi_version_no": "2"},
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/CMakeLists.txt
deleted file mode 100644
index 0707464b3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/CMakeLists.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_api INTERFACE)
-target_include_directories(
-  opentelemetry_api
-  INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-            "$<INSTALL_INTERFACE:include>")
-
-set_target_properties(opentelemetry_api PROPERTIES EXPORT_NAME api)
-
-otel_add_component(
-  COMPONENT
-  api
-  TARGETS
-  opentelemetry_api
-  FILES_DIRECTORY
-  "include/opentelemetry"
-  FILES_DESTINATION
-  "include"
-  FILES_MATCHING
-  PATTERN
-  "*.h")
-
-if(OPENTELEMETRY_INSTALL)
-  unset(TARGET_DEPS)
-endif()
-
-if(BUILD_TESTING)
-  add_subdirectory(test)
-endif()
-
-if(WITH_NO_DEPRECATED_CODE)
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE OPENTELEMETRY_NO_DEPRECATED_CODE)
-endif()
-
-if(WITH_STL STREQUAL "OFF")
-  message(STATUS "Building WITH_STL=OFF")
-elseif(WITH_STL STREQUAL "CXX11")
-  message(STATUS "Building WITH_STL=CXX11")
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE OPENTELEMETRY_STL_VERSION=2011)
-elseif(WITH_STL STREQUAL "CXX14")
-  message(STATUS "Building WITH_STL=CXX14")
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE OPENTELEMETRY_STL_VERSION=2014)
-elseif(WITH_STL STREQUAL "CXX17")
-  message(STATUS "Building WITH_STL=CXX17")
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE OPENTELEMETRY_STL_VERSION=2017)
-elseif(WITH_STL STREQUAL "CXX20")
-  message(STATUS "Building WITH_STL=CXX20")
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE OPENTELEMETRY_STL_VERSION=2020)
-elseif(WITH_STL STREQUAL "CXX23")
-  message(STATUS "Building WITH_STL=CXX23")
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE OPENTELEMETRY_STL_VERSION=2023)
-elseif(WITH_STL STREQUAL "ON")
-  message(STATUS "Building WITH_STL=ON")
-  # "ON" corresponds to "CXX23" at this time.
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE OPENTELEMETRY_STL_VERSION=2023)
-else()
-  message(
-    FATAL_ERROR "WITH_STL must be ON, OFF, CXX11, CXX14, CXX17, CXX20 or CXX23")
-endif()
-
-if(WITH_GSL)
-  target_compile_definitions(opentelemetry_api INTERFACE HAVE_GSL)
-
-  # Guidelines Support Library path. Used if we are not on not get C++20.
-  #
-  find_package(Microsoft.GSL QUIET)
-  if(TARGET Microsoft.GSL::GSL)
-    target_link_libraries(opentelemetry_api INTERFACE Microsoft.GSL::GSL)
-    list(APPEND TARGET_DEPS "gsl")
-  else()
-    set(GSL_DIR third_party/ms-gsl)
-    target_include_directories(
-      opentelemetry_api INTERFACE "$<BUILD_INTERFACE:${GSL_DIR}/include>")
-  endif()
-endif()
-
-if(WITH_NO_GETENV)
-  target_compile_definitions(opentelemetry_api INTERFACE NO_GETENV)
-endif()
-
-if(WIN32)
-  if(WITH_ETW)
-    target_compile_definitions(opentelemetry_api INTERFACE HAVE_MSGPACK)
-  endif()
-endif()
-
-if(WITH_ASYNC_EXPORT_PREVIEW)
-  target_compile_definitions(opentelemetry_api INTERFACE ENABLE_ASYNC_EXPORT)
-endif()
-
-target_compile_definitions(
-  opentelemetry_api
-  INTERFACE OPENTELEMETRY_ABI_VERSION_NO=${OPENTELEMETRY_ABI_VERSION_NO})
-
-if(WITH_OTLP_RETRY_PREVIEW)
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE ENABLE_OTLP_RETRY_PREVIEW)
-endif()
-
-if(WITH_OTLP_GRPC_SSL_MTLS_PREVIEW)
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW)
-endif()
-
-if(WITH_METRICS_EXEMPLAR_PREVIEW)
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE ENABLE_METRICS_EXEMPLAR_PREVIEW)
-endif()
-
-if(WITH_THREAD_INSTRUMENTATION_PREVIEW)
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE ENABLE_THREAD_INSTRUMENTATION_PREVIEW)
-endif()
-
-if(WITH_OTLP_HTTP_COMPRESSION)
-  target_compile_definitions(opentelemetry_api
-                             INTERFACE ENABLE_OTLP_COMPRESSION_PREVIEW)
-endif()
-
-if(APPLE)
-  target_link_libraries(opentelemetry_api INTERFACE "-framework CoreFoundation")
-endif()
-
-include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
-
-if(OPENTELEMETRY_INSTALL)
-  opentelemetry_add_pkgconfig(
-    api "OpenTelemetry API"
-    "A header-only library to support instrumentation with OpenTelemetry."
-    "${TARGET_DEPS}")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/baggage.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/baggage.h
deleted file mode 100644
index 6c799cda2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/baggage.h
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cctype>
-
-#include "opentelemetry/common/kv_properties.h"
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace baggage
-{
-
-class OPENTELEMETRY_EXPORT Baggage
-{
-public:
-  static constexpr size_t kMaxKeyValuePairs = 180;
-  static constexpr size_t kMaxKeyValueSize  = 4096;
-  static constexpr size_t kMaxSize          = 8192;
-  static constexpr char kKeyValueSeparator  = '=';
-  static constexpr char kMembersSeparator   = ',';
-  static constexpr char kMetadataSeparator  = ';';
-
-  Baggage() noexcept : kv_properties_(new common::KeyValueProperties()) {}
-  Baggage(size_t size) noexcept : kv_properties_(new common::KeyValueProperties(size)) {}
-
-  template <class T>
-  Baggage(const T &keys_and_values) noexcept
-      : kv_properties_(new common::KeyValueProperties(keys_and_values))
-  {}
-
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<Baggage> GetDefault()
-  {
-    static nostd::shared_ptr<Baggage> baggage{new Baggage()};
-    return baggage;
-  }
-
-  /* Get value for key in the baggage
-     @returns true if key is found, false otherwise
-  */
-  bool GetValue(nostd::string_view key, std::string &value) const noexcept
-  {
-    return kv_properties_->GetValue(key, value);
-  }
-
-  /* Returns shared_ptr of new baggage object which contains new key-value pair. If key or value is
-     invalid, copy of current baggage is returned
-  */
-  nostd::shared_ptr<Baggage> Set(const nostd::string_view &key,
-                                 const nostd::string_view &value) noexcept
-  {
-
-    nostd::shared_ptr<Baggage> baggage(new Baggage(kv_properties_->Size() + 1));
-    const bool valid_kv = IsValidKey(key) && IsValidValue(value);
-
-    if (valid_kv)
-    {
-      baggage->kv_properties_->AddEntry(key, value);
-    }
-
-    // add rest of the fields.
-    kv_properties_->GetAllEntries(
-        [&baggage, &key, &valid_kv](nostd::string_view e_key, nostd::string_view e_value) {
-          // if key or value was not valid, add all the entries. Add only remaining entries
-          // otherwise.
-          if (!valid_kv || key != e_key)
-          {
-            baggage->kv_properties_->AddEntry(e_key, e_value);
-          }
-
-          return true;
-        });
-
-    return baggage;
-  }
-
-  // @return all key-values entries by repeatedly invoking the function reference passed as argument
-  // for each entry
-  bool GetAllEntries(
-      nostd::function_ref<bool(nostd::string_view, nostd::string_view)> callback) const noexcept
-  {
-    return kv_properties_->GetAllEntries(callback);
-  }
-
-  // delete key from the baggage if it exists. Returns shared_ptr of new baggage object.
-  // if key does not exist, copy of current baggage is returned.
-  // Validity of key is not checked as invalid keys should never be populated in baggage in the
-  // first place.
-  nostd::shared_ptr<Baggage> Delete(nostd::string_view key) noexcept
-  {
-    // keeping size of baggage same as key might not be found in it
-    nostd::shared_ptr<Baggage> baggage(new Baggage(kv_properties_->Size()));
-    kv_properties_->GetAllEntries(
-        [&baggage, &key](nostd::string_view e_key, nostd::string_view e_value) {
-          if (key != e_key)
-            baggage->kv_properties_->AddEntry(e_key, e_value);
-          return true;
-        });
-    return baggage;
-  }
-
-  // Returns shared_ptr of baggage after extracting key-value pairs from header
-  static nostd::shared_ptr<Baggage> FromHeader(nostd::string_view header) noexcept
-  {
-    if (header.size() > kMaxSize)
-    {
-      // header size exceeds maximum threshold, return empty baggage
-      return GetDefault();
-    }
-
-    common::KeyValueStringTokenizer kv_str_tokenizer(header);
-    size_t cnt = kv_str_tokenizer.NumTokens();  // upper bound on number of kv pairs
-    if (cnt > kMaxKeyValuePairs)
-    {
-      cnt = kMaxKeyValuePairs;
-    }
-
-    nostd::shared_ptr<Baggage> baggage(new Baggage(cnt));
-    bool kv_valid;
-    nostd::string_view key, value;
-
-    while (kv_str_tokenizer.next(kv_valid, key, value) && baggage->kv_properties_->Size() < cnt)
-    {
-      if (!kv_valid || (key.size() + value.size() > kMaxKeyValueSize))
-      {
-        // if kv pair is not valid, skip it
-        continue;
-      }
-
-      // NOTE : metadata is kept as part of value only as it does not have any semantic meaning.
-      // but, we need to extract it (else Decode on value will return error)
-      nostd::string_view metadata;
-      auto metadata_separator = value.find(kMetadataSeparator);
-      if (metadata_separator != std::string::npos)
-      {
-        metadata = value.substr(metadata_separator);
-        value    = value.substr(0, metadata_separator);
-      }
-
-      bool err       = 0;
-      auto key_str   = UrlDecode(common::StringUtil::Trim(key), err);
-      auto value_str = UrlDecode(common::StringUtil::Trim(value), err);
-
-      if (err == false && IsValidKey(key_str) && IsValidValue(value_str))
-      {
-        if (!metadata.empty())
-        {
-          value_str.append(metadata.data(), metadata.size());
-        }
-        baggage->kv_properties_->AddEntry(key_str, value_str);
-      }
-    }
-
-    return baggage;
-  }
-
-  // Creates string from baggage object.
-  std::string ToHeader() const noexcept
-  {
-    std::string header_s;
-    bool first = true;
-    kv_properties_->GetAllEntries([&](nostd::string_view key, nostd::string_view value) {
-      if (!first)
-      {
-        header_s.push_back(kMembersSeparator);
-      }
-      else
-      {
-        first = false;
-      }
-      header_s.append(UrlEncode(key));
-      header_s.push_back(kKeyValueSeparator);
-
-      // extracting metadata from value. We do not encode metadata
-      auto metadata_separator = value.find(kMetadataSeparator);
-      if (metadata_separator != std::string::npos)
-      {
-        header_s.append(UrlEncode(value.substr(0, metadata_separator)));
-        auto metadata = value.substr(metadata_separator);
-        header_s.append(std::string(metadata.data(), metadata.size()));
-      }
-      else
-      {
-        header_s.append(UrlEncode(value));
-      }
-      return true;
-    });
-    return header_s;
-  }
-
-private:
-  static bool IsPrintableString(nostd::string_view str)
-  {
-    for (const auto ch : str)
-    {
-      if (ch < ' ' || ch > '~')
-      {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  static bool IsValidKey(nostd::string_view key) { return key.size() && IsPrintableString(key); }
-
-  static bool IsValidValue(nostd::string_view value) { return IsPrintableString(value); }
-
-  // Uri encode key value pairs before injecting into header
-  // Implementation inspired from : https://golang.org/src/net/url/url.go?s=7851:7884#L264
-  static std::string UrlEncode(nostd::string_view str)
-  {
-    auto to_hex = [](char c) -> char {
-      static const char *hex = "0123456789ABCDEF";
-      return hex[c & 15];
-    };
-
-    std::string ret;
-
-    for (auto c : str)
-    {
-      if (std::isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
-      {
-        ret.push_back(c);
-      }
-      else if (c == ' ')
-      {
-        ret.push_back('+');
-      }
-      else
-      {
-        ret.push_back('%');
-        ret.push_back(to_hex(c >> 4));
-        ret.push_back(to_hex(c & 15));
-      }
-    }
-
-    return ret;
-  }
-
-  // Uri decode key value pairs after extracting from header
-  static std::string UrlDecode(nostd::string_view str, bool &err)
-  {
-    auto IsHex = [](char c) {
-      return std::isdigit(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
-    };
-
-    auto from_hex = [](char c) -> char {
-      // c - '0' produces integer type which could trigger error/warning when casting to char,
-      // but the cast is safe here.
-      return static_cast<char>(std::isdigit(c) ? c - '0' : std::toupper(c) - 'A' + 10);
-    };
-
-    std::string ret;
-
-    for (size_t i = 0; i < str.size(); i++)
-    {
-      if (str[i] == '%')
-      {
-        if (i + 2 >= str.size() || !IsHex(str[i + 1]) || !IsHex(str[i + 2]))
-        {
-          err = 1;
-          return "";
-        }
-        ret.push_back(from_hex(str[i + 1]) << 4 | from_hex(str[i + 2]));
-        i += 2;
-      }
-      else if (str[i] == '+')
-      {
-        ret.push_back(' ');
-      }
-      else if (std::isalnum(str[i]) || str[i] == '-' || str[i] == '_' || str[i] == '.' ||
-               str[i] == '~')
-      {
-        ret.push_back(str[i]);
-      }
-      else
-      {
-        err = 1;
-        return "";
-      }
-    }
-
-    return ret;
-  }
-
-private:
-  // Store entries in a C-style array to avoid using std::array or std::vector.
-  nostd::unique_ptr<common::KeyValueProperties> kv_properties_;
-};
-
-}  // namespace baggage
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/baggage_context.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/baggage_context.h
deleted file mode 100644
index a0016353b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/baggage_context.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace baggage
-{
-
-static const std::string kBaggageHeader = "baggage";
-
-inline nostd::shared_ptr<Baggage> GetBaggage(const context::Context &context) noexcept
-{
-  context::ContextValue context_value = context.GetValue(kBaggageHeader);
-  if (nostd::holds_alternative<nostd::shared_ptr<Baggage>>(context_value))
-  {
-    return nostd::get<nostd::shared_ptr<Baggage>>(context_value);
-  }
-  static nostd::shared_ptr<Baggage> empty_baggage{new Baggage()};
-  return empty_baggage;
-}
-
-inline context::Context SetBaggage(context::Context &context,
-                                   const nostd::shared_ptr<Baggage> &baggage) noexcept
-{
-  return context.SetValue(kBaggageHeader, baggage);
-}
-
-}  // namespace baggage
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/propagation/baggage_propagator.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/propagation/baggage_propagator.h
deleted file mode 100644
index d75409ed6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/baggage/propagation/baggage_propagator.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/baggage/baggage_context.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace baggage
-{
-namespace propagation
-{
-
-class BaggagePropagator : public context::propagation::TextMapPropagator
-{
-public:
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    auto baggage = baggage::GetBaggage(context);
-    auto header  = baggage->ToHeader();
-    if (header.size())
-    {
-      carrier.Set(kBaggageHeader, header);
-    }
-  }
-
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    nostd::string_view baggage_str = carrier.Get(baggage::kBaggageHeader);
-    auto baggage                   = baggage::Baggage::FromHeader(baggage_str);
-
-    if (baggage->ToHeader().size())
-    {
-      return baggage::SetBaggage(context, baggage);
-    }
-    else
-    {
-      return context;
-    }
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return callback(kBaggageHeader);
-  }
-};
-}  // namespace propagation
-}  // namespace baggage
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/attribute_value.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/attribute_value.h
deleted file mode 100644
index af4cc83d4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/attribute_value.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-/// OpenTelemetry signals can be enriched by adding attributes. The
-/// \c AttributeValue type is defined as a variant of all attribute value
-/// types the OpenTelemetry C++ API supports.
-///
-/// The following attribute value types are supported by the OpenTelemetry
-/// specification:
-///  - Primitive types: string, boolean, double precision floating point
-///    (IEEE 754-1985) or signed 64 bit integer.
-///  - Homogenous arrays of primitive type values.
-///
-/// \warning
-/// \parblock The OpenTelemetry C++ API currently supports several attribute
-/// value types that are not covered by the OpenTelemetry specification:
-///  - \c uint64_t
-///  - \c nostd::span<const uint64_t>
-///  - \c nostd::span<uint8_t>
-///
-/// Those types are reserved for future use and currently should not be
-/// used. There are no guarantees around how those values are handled by
-/// exporters.
-/// \endparblock
-using AttributeValue =
-    nostd::variant<bool,
-                   int32_t,
-                   int64_t,
-                   uint32_t,
-                   double,
-                   const char *,
-                   nostd::string_view,
-                   nostd::span<const bool>,
-                   nostd::span<const int32_t>,
-                   nostd::span<const int64_t>,
-                   nostd::span<const uint32_t>,
-                   nostd::span<const double>,
-                   nostd::span<const nostd::string_view>,
-                   // Not currently supported by the specification, but reserved for future use.
-                   // Added to provide support for all primitive C++ types.
-                   uint64_t,
-                   // Not currently supported by the specification, but reserved for future use.
-                   // Added to provide support for all primitive C++ types.
-                   nostd::span<const uint64_t>,
-                   // Not currently supported by the specification, but reserved for future use.
-                   // See https://github.com/open-telemetry/opentelemetry-specification/issues/780
-                   nostd::span<const uint8_t>>;
-
-enum AttributeType
-{
-  kTypeBool,
-  kTypeInt,
-  kTypeInt64,
-  kTypeUInt,
-  kTypeDouble,
-  kTypeCString,
-  kTypeString,
-  kTypeSpanBool,
-  kTypeSpanInt,
-  kTypeSpanInt64,
-  kTypeSpanUInt,
-  kTypeSpanDouble,
-  kTypeSpanString,
-  kTypeUInt64,
-  kTypeSpanUInt64,
-  kTypeSpanByte
-};
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/key_value_iterable.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/key_value_iterable.h
deleted file mode 100644
index 9d43e1571..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/key_value_iterable.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-/**
- * Supports internal iteration over a collection of key-value pairs.
- */
-class KeyValueIterable
-{
-public:
-  virtual ~KeyValueIterable() = default;
-
-  /**
-   * Iterate over key-value pairs
-   * @param callback a callback to invoke for each key-value. If the callback returns false,
-   * the iteration is aborted.
-   * @return true if every key-value pair was iterated over
-   */
-  virtual bool ForEachKeyValue(nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>
-                                   callback) const noexcept = 0;
-
-  /**
-   * @return the number of key-value pairs
-   */
-  virtual size_t size() const noexcept = 0;
-};
-
-/**
- * Supports internal iteration over a collection of key-value pairs.
- */
-class NoopKeyValueIterable : public KeyValueIterable
-{
-public:
-  ~NoopKeyValueIterable() override = default;
-
-  /**
-   * Iterate over key-value pairs
-   * @param callback a callback to invoke for each key-value. If the callback returns false,
-   * the iteration is aborted.
-   * @return true if every key-value pair was iterated over
-   */
-  bool ForEachKeyValue(
-      nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>) const noexcept override
-  {
-    return true;
-  }
-
-  /**
-   * @return the number of key-value pairs
-   */
-  size_t size() const noexcept override { return 0; }
-};
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/key_value_iterable_view.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/key_value_iterable_view.h
deleted file mode 100644
index e22fb6f06..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/key_value_iterable_view.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <initializer_list>
-#include <iterator>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-// NOTE - code within `detail` namespace implements internal details, and not part
-// of the public interface.
-namespace detail
-{
-inline void take_key_value(nostd::string_view, common::AttributeValue) {}
-
-template <class T>
-auto is_key_value_iterable_impl(T iterable)
-    -> decltype(take_key_value(std::begin(iterable)->first, std::begin(iterable)->second),
-                nostd::size(iterable),
-                std::true_type{});
-
-std::false_type is_key_value_iterable_impl(...);
-
-template <class T>
-struct is_key_value_iterable
-{
-  static const bool value = decltype(detail::is_key_value_iterable_impl(std::declval<T>()))::value;
-};
-}  // namespace detail
-
-/**
- * @brief Container for key-value pairs that can transform every value in it to one of types
- * listed in common::AttributeValue. It may contain value types that are not directly map'able
- * to primitive value types. In that case the `ForEachKeyValue` method acts as a transform to
- * convert the value type to one listed under AtributeValue (bool, int32_t, int64_t, uint32_t,
- * uint64_t, double, nostd::string_view, or arrays of primite types). For example, if UUID,
- * GUID, or UTF-16 string type is passed as one of values stored inside this container, the
- * container itself may provide a custom implementation of `ForEachKeyValue` to transform the
- * 'non-standard' type to one of the standard types.
- */
-template <class T>
-class KeyValueIterableView final : public KeyValueIterable
-{
-
-public:
-  explicit KeyValueIterableView(const T &container) noexcept : container_{&container} {}
-
-  // KeyValueIterable
-  bool ForEachKeyValue(nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>
-                           callback) const noexcept override
-  {
-    auto iter = std::begin(*container_);
-    auto last = std::end(*container_);
-    for (; iter != last; ++iter)
-    {
-      if (!callback(iter->first, iter->second))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  size_t size() const noexcept override { return nostd::size(*container_); }
-
-private:
-  const T *container_;
-};
-
-template <class T, nostd::enable_if_t<detail::is_key_value_iterable<T>::value> * = nullptr>
-KeyValueIterableView<T> MakeKeyValueIterableView(const T &container) noexcept
-{
-  return KeyValueIterableView<T>(container);
-}
-
-/**
- * Utility function to help to make a attribute view from initializer_list
- *
- * @param attributes
- * @return nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
- */
-inline static nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
-MakeAttributes(std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                   attributes) noexcept
-{
-  return nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-      attributes.begin(), attributes.end()};
-}
-
-/**
- * Utility function to help to make a attribute view from a span
- *
- * @param attributes
- * @return nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
- */
-inline static nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
-MakeAttributes(
-    nostd::span<const std::pair<nostd::string_view, common::AttributeValue>> attributes) noexcept
-{
-  return attributes;
-}
-
-/**
- * Utility function to help to make a attribute view from a KeyValueIterable
- *
- * @param attributes
- * @return common::KeyValueIterable
- */
-inline static const common::KeyValueIterable &MakeAttributes(
-    const common::KeyValueIterable &attributes) noexcept
-{
-  return attributes;
-}
-
-/**
- * Utility function to help to make a attribute view from a key-value iterable object
- *
- * @param attributes
- * @return nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
- */
-template <
-    class ArgumentType,
-    nostd::enable_if_t<common::detail::is_key_value_iterable<ArgumentType>::value> * = nullptr>
-inline static common::KeyValueIterableView<ArgumentType> MakeAttributes(
-    const ArgumentType &arg) noexcept
-{
-  return common::KeyValueIterableView<ArgumentType>(arg);
-}
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/kv_properties.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/kv_properties.h
deleted file mode 100644
index b5accab40..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/kv_properties.h
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/string_util.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-#include <cstring>
-#include <string>
-#include <type_traits>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-
-// Constructor parameter for KeyValueStringTokenizer
-struct KeyValueStringTokenizerOptions
-{
-  char member_separator     = ',';
-  char key_value_separator  = '=';
-  bool ignore_empty_members = true;
-};
-
-// Tokenizer for key-value headers
-class KeyValueStringTokenizer
-{
-public:
-  KeyValueStringTokenizer(
-      nostd::string_view str,
-      const KeyValueStringTokenizerOptions &opts = KeyValueStringTokenizerOptions()) noexcept
-      : str_(str), opts_(opts), index_(0)
-  {}
-
-  static nostd::string_view GetDefaultKeyOrValue()
-  {
-    static std::string default_str = "";
-    return default_str;
-  }
-
-  // Returns next key value in the string header
-  // @param valid_kv : if the found kv pair is valid or not
-  // @param key : key in kv pair
-  // @param key : value in kv pair
-  // @returns true if next kv pair was found, false otherwise.
-  bool next(bool &valid_kv, nostd::string_view &key, nostd::string_view &value) noexcept
-  {
-    valid_kv = true;
-    while (index_ < str_.size())
-    {
-      bool is_empty_pair = false;
-      size_t end         = str_.find(opts_.member_separator, index_);
-      if (end == std::string::npos)
-      {
-        end = str_.size() - 1;
-      }
-      else if (end == index_)  // empty pair. do not update end
-      {
-        is_empty_pair = true;
-      }
-      else
-      {
-        end--;
-      }
-
-      auto list_member = StringUtil::Trim(str_, index_, end);
-      if (list_member.size() == 0 || is_empty_pair)
-      {
-        // empty list member
-        index_ = end + 2 - is_empty_pair;
-        if (opts_.ignore_empty_members)
-        {
-          continue;
-        }
-
-        valid_kv = true;
-        key      = GetDefaultKeyOrValue();
-        value    = GetDefaultKeyOrValue();
-        return true;
-      }
-
-      auto key_end_pos = list_member.find(opts_.key_value_separator);
-      if (key_end_pos == std::string::npos)
-      {
-        // invalid member
-        valid_kv = false;
-      }
-      else
-      {
-        key   = list_member.substr(0, key_end_pos);
-        value = list_member.substr(key_end_pos + 1);
-      }
-
-      index_ = end + 2;
-
-      return true;
-    }
-
-    // no more entries remaining
-    return false;
-  }
-
-  // Returns total number of tokens in header string
-  size_t NumTokens() const noexcept
-  {
-    size_t cnt = 0, begin = 0;
-    while (begin < str_.size())
-    {
-      ++cnt;
-      size_t end = str_.find(opts_.member_separator, begin);
-      if (end == std::string::npos)
-      {
-        break;
-      }
-
-      begin = end + 1;
-    }
-
-    return cnt;
-  }
-
-  // Resets the iterator
-  void reset() noexcept { index_ = 0; }
-
-private:
-  nostd::string_view str_;
-  KeyValueStringTokenizerOptions opts_;
-  size_t index_;
-};
-
-// Class to store fixed size array of key-value pairs of string type
-class KeyValueProperties
-{
-  // Class to store key-value pairs of string types
-public:
-  class Entry
-  {
-  public:
-    Entry() : key_(nullptr), value_(nullptr) {}
-
-    // Copy constructor
-    Entry(const Entry &copy)
-    {
-      key_   = CopyStringToPointer(copy.key_.get());
-      value_ = CopyStringToPointer(copy.value_.get());
-    }
-
-    // Copy assignment operator
-    Entry &operator=(Entry &other)
-    {
-      key_   = CopyStringToPointer(other.key_.get());
-      value_ = CopyStringToPointer(other.value_.get());
-      return *this;
-    }
-
-    // Move contructor and assignment operator
-    Entry(Entry &&other)            = default;
-    Entry &operator=(Entry &&other) = default;
-
-    // Creates an Entry for a given key-value pair.
-    Entry(nostd::string_view key, nostd::string_view value)
-    {
-      key_   = CopyStringToPointer(key);
-      value_ = CopyStringToPointer(value);
-    }
-
-    // Gets the key associated with this entry.
-    nostd::string_view GetKey() const noexcept { return key_.get(); }
-
-    // Gets the value associated with this entry.
-    nostd::string_view GetValue() const noexcept { return value_.get(); }
-
-    // Sets the value for this entry. This overrides the previous value.
-    void SetValue(nostd::string_view value) noexcept { value_ = CopyStringToPointer(value); }
-
-  private:
-    // Store key and value as raw char pointers to avoid using std::string.
-    nostd::unique_ptr<const char[]> key_;
-    nostd::unique_ptr<const char[]> value_;
-
-    // Copies string into a buffer and returns a unique_ptr to the buffer.
-    // This is a workaround for the fact that memcpy doesn't accept a const destination.
-    nostd::unique_ptr<const char[]> CopyStringToPointer(nostd::string_view str)
-    {
-      char *temp = new char[str.size() + 1];
-      memcpy(temp, str.data(), str.size());
-      temp[str.size()] = '\0';
-      return nostd::unique_ptr<const char[]>(temp);
-    }
-  };
-
-  // Maintain the number of entries in entries_.
-  size_t num_entries_;
-
-  // Max size of allocated array
-  size_t max_num_entries_;
-
-  // Store entries in a C-style array to avoid using std::array or std::vector.
-  nostd::unique_ptr<Entry[]> entries_;
-
-public:
-  // Create Key-value list of given size
-  // @param size : Size of list.
-  KeyValueProperties(size_t size) noexcept
-      : num_entries_(0), max_num_entries_(size), entries_(new Entry[size])
-  {}
-
-  // Create Empty Key-Value list
-  KeyValueProperties() noexcept : num_entries_(0), max_num_entries_(0), entries_(nullptr) {}
-
-  template <class T, class = typename std::enable_if<detail::is_key_value_iterable<T>::value>::type>
-  KeyValueProperties(const T &keys_and_values) noexcept
-      : num_entries_(0),
-        max_num_entries_(keys_and_values.size()),
-        entries_(new Entry[max_num_entries_])
-  {
-    for (auto &e : keys_and_values)
-    {
-      Entry entry(e.first, e.second);
-      (entries_.get())[num_entries_++] = std::move(entry);
-    }
-  }
-
-  // Adds new kv pair into kv properties
-  void AddEntry(nostd::string_view key, nostd::string_view value) noexcept
-  {
-    if (num_entries_ < max_num_entries_)
-    {
-      Entry entry(key, value);
-      (entries_.get())[num_entries_++] = std::move(entry);
-    }
-  }
-
-  // Returns all kv pair entries
-  bool GetAllEntries(
-      nostd::function_ref<bool(nostd::string_view, nostd::string_view)> callback) const noexcept
-  {
-    for (size_t i = 0; i < num_entries_; i++)
-    {
-      auto &entry = (entries_.get())[i];
-      if (!callback(entry.GetKey(), entry.GetValue()))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  // Return value for key if exists, return false otherwise
-  bool GetValue(nostd::string_view key, std::string &value) const noexcept
-  {
-    for (size_t i = 0; i < num_entries_; i++)
-    {
-      auto &entry = (entries_.get())[i];
-      if (entry.GetKey() == key)
-      {
-        const auto &entry_value = entry.GetValue();
-        value                   = std::string(entry_value.data(), entry_value.size());
-        return true;
-      }
-    }
-    return false;
-  }
-
-  size_t Size() const noexcept { return num_entries_; }
-};
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/macros.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/macros.h
deleted file mode 100644
index 71d12a57b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/macros.h
+++ /dev/null
@@ -1,523 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-/*
-   OPENTELEMETRY_HAVE_BUILTIN&OPENTELEMETRY_HAVE_FEATURE
-
-   Checks whether the compiler supports a Clang Feature Checking Macro, and if
-   so, checks whether it supports the provided builtin function "x" where x
-   is one of the functions noted in
-   https://clang.llvm.org/docs/LanguageExtensions.html
-
-   Note: Use this macro to avoid an extra level of #ifdef __has_builtin check.
-   http://releases.llvm.org/3.3/tools/clang/docs/LanguageExtensions.html
-*/
-#if !defined(OPENTELEMETRY_HAVE_BUILTIN)
-#  ifdef __has_builtin
-#    define OPENTELEMETRY_HAVE_BUILTIN(x) __has_builtin(x)
-#  else
-#    define OPENTELEMETRY_HAVE_BUILTIN(x) 0
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_FEATURE)
-#  ifdef __has_feature
-#    define OPENTELEMETRY_HAVE_FEATURE(f) __has_feature(f)
-#  else
-#    define OPENTELEMETRY_HAVE_FEATURE(f) 0
-#  endif
-#endif
-
-/*
-   has feature
-
-   OPENTELEMETRY_HAVE_ATTRIBUTE
-
-   A function-like feature checking macro that is a wrapper around
-   `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
-   nonzero constant integer if the attribute is supported or 0 if not.
-
-   It evaluates to zero if `__has_attribute` is not defined by the compiler.
-
-   GCC: https://gcc.gnu.org/gcc-5/changes.html
-   Clang: https://clang.llvm.org/docs/LanguageExtensions.html
-*/
-#if !defined(OPENTELEMETRY_HAVE_ATTRIBUTE)
-#  ifdef __has_attribute
-#    define OPENTELEMETRY_HAVE_ATTRIBUTE(x) __has_attribute(x)
-#  else
-#    define OPENTELEMETRY_HAVE_ATTRIBUTE(x) 0
-#  endif
-#endif
-
-/*
-   OPENTELEMETRY_HAVE_CPP_ATTRIBUTE
-
-   A function-like feature checking macro that accepts C++11 style attributes.
-   It's a wrapper around `__has_cpp_attribute`, defined by ISO C++ SD-6
-   (https://en.cppreference.com/w/cpp/experimental/feature_test). If we don't
-   find `__has_cpp_attribute`, will evaluate to 0.
-*/
-#if !defined(OPENTELEMETRY_HAVE_CPP_ATTRIBUTE)
-#  if defined(__cplusplus) && defined(__has_cpp_attribute)
-// NOTE: requiring __cplusplus above should not be necessary, but
-// works around https://bugs.llvm.org/show_bug.cgi?id=23435.
-#    define OPENTELEMETRY_HAVE_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#  else
-#    define OPENTELEMETRY_HAVE_CPP_ATTRIBUTE(x) 0
-#  endif
-#endif
-
-/*
-   Expected usage pattern:
-
-   if OPENTELEMETRY_LIKELY_CONDITION (ptr != nullptr)
-   {
-     do_something_likely();
-   } else {
-     do_something_unlikely();
-   }
-
-   This pattern works with gcc/clang and __builtin_expect(),
-   as well as with C++20.
-   It is unclear if __builtin_expect() will be deprecated
-   in favor of C++20 [[likely]] or not.
-
-   OPENTELEMETRY_LIKELY_CONDITION is preferred over OPENTELEMETRY_LIKELY,
-   to be revisited when C++20 is required.
-*/
-
-#if !defined(OPENTELEMETRY_LIKELY_CONDITION) && defined(__cplusplus)
-// Only use likely with C++20
-#  if __cplusplus >= 202002L
-// GCC 9 has likely attribute but do not support declare it at the beginning of statement
-#    if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
-#      if __has_cpp_attribute(likely)
-#        define OPENTELEMETRY_LIKELY_CONDITION(C) (C) [[likely]]
-#      endif
-#    endif
-#  endif
-#endif
-#if !defined(OPENTELEMETRY_LIKELY_CONDITION) && (defined(__clang__) || defined(__GNUC__))
-// Only use if supported by the compiler
-#  define OPENTELEMETRY_LIKELY_CONDITION(C) (__builtin_expect(!!(C), true))
-#endif
-#ifndef OPENTELEMETRY_LIKELY_CONDITION
-// Do not use likely annotations
-#  define OPENTELEMETRY_LIKELY_CONDITION(C) (C)
-#endif
-
-#if !defined(OPENTELEMETRY_UNLIKELY_CONDITION) && defined(__cplusplus)
-// Only use unlikely with C++20
-#  if __cplusplus >= 202002L
-// GCC 9 has unlikely attribute but do not support declare it at the beginning of statement
-#    if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
-#      if __has_cpp_attribute(unlikely)
-#        define OPENTELEMETRY_UNLIKELY_CONDITION(C) (C) [[unlikely]]
-#      endif
-#    endif
-#  endif
-#endif
-#if !defined(OPENTELEMETRY_UNLIKELY_CONDITION) && (defined(__clang__) || defined(__GNUC__))
-// Only use if supported by the compiler
-#  define OPENTELEMETRY_UNLIKELY_CONDITION(C) (__builtin_expect(!!(C), false))
-#endif
-#ifndef OPENTELEMETRY_UNLIKELY_CONDITION
-// Do not use unlikely annotations
-#  define OPENTELEMETRY_UNLIKELY_CONDITION(C) (C)
-#endif
-
-/*
-   Expected usage pattern:
-
-   if (ptr != nullptr)
-   OPENTELEMETRY_LIKELY
-   {
-     do_something_likely();
-   } else {
-     do_something_unlikely();
-   }
-
-   This pattern works starting with C++20.
-   See https://en.cppreference.com/w/cpp/language/attributes/likely
-
-   Please use OPENTELEMETRY_LIKELY_CONDITION instead for now.
-*/
-
-#if !defined(OPENTELEMETRY_LIKELY) && defined(__cplusplus)
-// Only use likely with C++20
-#  if __cplusplus >= 202002L
-// GCC 9 has likely attribute but do not support declare it at the beginning of statement
-#    if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
-#      if __has_cpp_attribute(likely)
-#        define OPENTELEMETRY_LIKELY [[likely]]
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifndef OPENTELEMETRY_LIKELY
-#  define OPENTELEMETRY_LIKELY
-#endif
-
-#if !defined(OPENTELEMETRY_UNLIKELY) && defined(__cplusplus)
-// Only use unlikely with C++20
-#  if __cplusplus >= 202002L
-// GCC 9 has unlikely attribute but do not support declare it at the beginning of statement
-#    if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
-#      if __has_cpp_attribute(unlikely)
-#        define OPENTELEMETRY_UNLIKELY [[unlikely]]
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifndef OPENTELEMETRY_UNLIKELY
-#  define OPENTELEMETRY_UNLIKELY
-#endif
-
-/// \brief Declare variable as maybe unused
-/// usage:
-///   OPENTELEMETRY_MAYBE_UNUSED int a;
-///   class OPENTELEMETRY_MAYBE_UNUSED a;
-///   OPENTELEMETRY_MAYBE_UNUSED int a();
-///
-#if defined(__cplusplus) && __cplusplus >= 201703L
-#  define OPENTELEMETRY_MAYBE_UNUSED [[maybe_unused]]
-#elif defined(__clang__)
-#  define OPENTELEMETRY_MAYBE_UNUSED __attribute__((unused))
-#elif defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
-#  define OPENTELEMETRY_MAYBE_UNUSED __attribute__((unused))
-#elif (defined(_MSC_VER) && _MSC_VER >= 1910) && (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-#  define OPENTELEMETRY_MAYBE_UNUSED [[maybe_unused]]
-#else
-#  define OPENTELEMETRY_MAYBE_UNUSED
-#endif
-
-#ifndef OPENTELEMETRY_RTTI_ENABLED
-#  if defined(__clang__)
-#    if __has_feature(cxx_rtti)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  elif defined(__GNUG__)
-#    if defined(__GXX_RTTI)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  elif defined(_MSC_VER)
-#    if defined(_CPPRTTI)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  endif
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201402L
-#  define OPENTELEMETRY_DEPRECATED [[deprecated]]
-#elif defined(__clang__)
-#  define OPENTELEMETRY_DEPRECATED __attribute__((deprecated))
-#elif defined(__GNUC__)
-#  define OPENTELEMETRY_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#  if _MSC_VER >= 1910 && defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
-#    define OPENTELEMETRY_DEPRECATED [[deprecated]]
-#  else
-#    define OPENTELEMETRY_DEPRECATED __declspec(deprecated)
-#  endif
-#else
-#  define OPENTELEMETRY_DEPRECATED
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201402L
-#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) [[deprecated(msg)]]
-#elif defined(__clang__)
-#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __attribute__((deprecated(msg)))
-#elif defined(__GNUC__)
-#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __attribute__((deprecated(msg)))
-#elif defined(_MSC_VER)
-#  if _MSC_VER >= 1910 && defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
-#    define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) [[deprecated(msg)]]
-#  else
-#    define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __declspec(deprecated(msg))
-#  endif
-#else
-#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg)
-#endif
-
-// Regex support
-#if (__GNUC__ == 4 && (__GNUC_MINOR__ == 8 || __GNUC_MINOR__ == 9))
-#  define OPENTELEMETRY_HAVE_WORKING_REGEX 0
-#else
-#  define OPENTELEMETRY_HAVE_WORKING_REGEX 1
-#endif
-
-/* clang-format off */
-
-/**
-  @page HEADER_ONLY_SINGLETON Header only singleton.
-
-  @section ELF_SINGLETON
-
-  For clang and gcc, the desired coding pattern is as follows.
-
-  @verbatim
-  class Foo
-  {
-    // (a)
-    __attribute__((visibility("default")))
-    // (b)
-    T& get_singleton()
-    {
-      // (c)
-      static T singleton;
-      return singleton;
-    }
-  };
-  @endverbatim
-
-  (a) is needed when the code is build with
-  @code -fvisibility="hidden" @endcode
-  to ensure that all instances of (b) are visible to the linker.
-
-  What is duplicated in the binary is @em code, in (b).
-
-  The linker will make sure only one instance
-  of all the (b) methods is used.
-
-  (c) is a singleton implemented inside a method.
-
-  This is very desirable, because:
-
-  - the C++ compiler guarantees that construction
-    of the variable (c) is thread safe.
-
-  - constructors for (c) singletons are executed in code path order,
-    or not at all if the singleton is never used.
-
-  @section OTHER_SINGLETON
-
-  For other platforms, header only singletons are not supported at this
-point.
-
-  @section CODING_PATTERN
-
-  The coding pattern to use in the source code is as follows
-
-  @verbatim
-  class Foo
-  {
-    OPENTELEMETRY_API_SINGLETON
-    T& get_singleton()
-    {
-      static T singleton;
-      return singleton;
-    }
-  };
-  @endverbatim
-*/
-
-/* clang-format on */
-
-#if defined(__clang__)
-
-#  define OPENTELEMETRY_API_SINGLETON __attribute__((visibility("default")))
-#  define OPENTELEMETRY_LOCAL_SYMBOL __attribute__((visibility("hidden")))
-
-#elif defined(__GNUC__)
-
-#  define OPENTELEMETRY_API_SINGLETON __attribute__((visibility("default")))
-#  define OPENTELEMETRY_LOCAL_SYMBOL __attribute__((visibility("hidden")))
-
-#else
-
-/* Add support for other compilers here. */
-
-#  define OPENTELEMETRY_API_SINGLETON
-#  define OPENTELEMETRY_LOCAL_SYMBOL
-
-#endif
-
-//
-// Atomic wrappers based on compiler intrinsics for memory read/write.
-// The tailing number is read/write length in bits.
-//
-// N.B. Compiler intrinsic is used because the usage of C++ standard library is restricted in the
-// OpenTelemetry C++ API.
-//
-#if defined(__GNUC__)
-
-#  define OPENTELEMETRY_ATOMIC_READ_8(ptr) __atomic_load_n(ptr, __ATOMIC_SEQ_CST)
-#  define OPENTELEMETRY_ATOMIC_WRITE_8(ptr, value) __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST)
-
-#elif defined(_MSC_VER)
-
-#  include <intrin.h>
-
-#  define OPENTELEMETRY_ATOMIC_READ_8(ptr) \
-    static_cast<uint8_t>(_InterlockedCompareExchange8(reinterpret_cast<char *>(ptr), 0, 0))
-#  define OPENTELEMETRY_ATOMIC_WRITE_8(ptr, value) \
-    _InterlockedExchange8(reinterpret_cast<char *>(ptr), static_cast<char>(value))
-
-#else
-#  error port atomics read/write for the current platform
-#endif
-
-/* clang-format on */
-//
-// The if/elif order matters here. If both OPENTELEMETRY_BUILD_IMPORT_DLL and
-// OPENTELEMETRY_BUILD_EXPORT_DLL are defined, the former takes precedence.
-//
-// TODO: consider define OPENTELEMETRY_EXPORT for cygwin/gcc, see below link.
-// https://gcc.gnu.org/wiki/Visibility#How_to_use_the_new_C.2B-.2B-_visibility_support
-//
-#if defined(_MSC_VER) && defined(OPENTELEMETRY_BUILD_IMPORT_DLL)
-
-#  define OPENTELEMETRY_EXPORT __declspec(dllimport)
-
-#elif defined(_MSC_VER) && defined(OPENTELEMETRY_BUILD_EXPORT_DLL)
-
-#  define OPENTELEMETRY_EXPORT __declspec(dllexport)
-
-#else
-
-//
-// build OpenTelemetry as static library or not on Windows.
-//
-#  define OPENTELEMETRY_EXPORT
-
-#endif
-
-// OPENTELEMETRY_HAVE_EXCEPTIONS
-//
-// Checks whether the compiler both supports and enables exceptions. Many
-// compilers support a "no exceptions" mode that disables exceptions.
-//
-// Generally, when OPENTELEMETRY_HAVE_EXCEPTIONS is not defined:
-//
-// * Code using `throw` and `try` may not compile.
-// * The `noexcept` specifier will still compile and behave as normal.
-// * The `noexcept` operator may still return `false`.
-//
-// For further details, consult the compiler's documentation.
-#ifndef OPENTELEMETRY_HAVE_EXCEPTIONS
-#  if defined(__clang__) && ((__clang_major__ * 100) + __clang_minor__) < 306
-// Clang < 3.6
-// http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html#the-exceptions-macro
-#    if defined(__EXCEPTIONS) && OPENTELEMETRY_HAVE_FEATURE(cxx_exceptions)
-#      define OPENTELEMETRY_HAVE_EXCEPTIONS 1
-#    endif  // defined(__EXCEPTIONS) && OPENTELEMETRY_HAVE_FEATURE(cxx_exceptions)
-#  elif OPENTELEMETRY_HAVE_FEATURE(cxx_exceptions)
-#    define OPENTELEMETRY_HAVE_EXCEPTIONS 1
-// Handle remaining special cases and default to exceptions being supported.
-#  elif !(defined(__GNUC__) && !defined(__EXCEPTIONS) && !defined(__cpp_exceptions)) && \
-      !(defined(_MSC_VER) && !defined(_CPPUNWIND))
-#    define OPENTELEMETRY_HAVE_EXCEPTIONS 1
-#  endif
-#endif
-#ifndef OPENTELEMETRY_HAVE_EXCEPTIONS
-#  define OPENTELEMETRY_HAVE_EXCEPTIONS 0
-#endif
-
-/*
-   OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND indicates that a resource owned by a function
-   parameter or implicit object parameter is retained by the return value of the
-   annotated function (or, for a parameter of a constructor, in the value of the
-   constructed object). This attribute causes warnings to be produced if a
-   temporary object does not live long enough.
-
-   When applied to a reference parameter, the referenced object is assumed to be
-   retained by the return value of the function. When applied to a non-reference
-   parameter (for example, a pointer or a class type), all temporaries
-   referenced by the parameter are assumed to be retained by the return value of
-   the function.
-
-   See also the upstream documentation:
-   https://clang.llvm.org/docs/AttributeReference.html#lifetimebound
-*/
-#ifndef OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND
-#  if OPENTELEMETRY_HAVE_CPP_ATTRIBUTE(clang::lifetimebound)
-#    define OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND [[clang::lifetimebound]]
-#  elif OPENTELEMETRY_HAVE_ATTRIBUTE(lifetimebound)
-#    define OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND __attribute__((lifetimebound))
-#  else
-#    define OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND
-#  endif
-#endif
-
-// OPENTELEMETRY_HAVE_MEMORY_SANITIZER
-//
-// MemorySanitizer (MSan) is a detector of uninitialized reads. It consists of
-// a compiler instrumentation module and a run-time library.
-#ifndef OPENTELEMETRY_HAVE_MEMORY_SANITIZER
-#  if !defined(__native_client__) && OPENTELEMETRY_HAVE_FEATURE(memory_sanitizer)
-#    define OPENTELEMETRY_HAVE_MEMORY_SANITIZER 1
-#  else
-#    define OPENTELEMETRY_HAVE_MEMORY_SANITIZER 0
-#  endif
-#endif
-
-#if OPENTELEMETRY_HAVE_MEMORY_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize_memory)
-#  define OPENTELEMETRY_SANITIZER_NO_MEMORY \
-    __attribute__((no_sanitize_memory))  // __attribute__((no_sanitize("memory")))
-#else
-#  define OPENTELEMETRY_SANITIZER_NO_MEMORY
-#endif
-
-// OPENTELEMETRY_HAVE_THREAD_SANITIZER
-//
-// ThreadSanitizer (TSan) is a fast data race detector.
-#ifndef OPENTELEMETRY_HAVE_THREAD_SANITIZER
-#  if defined(__SANITIZE_THREAD__)
-#    define OPENTELEMETRY_HAVE_THREAD_SANITIZER 1
-#  elif OPENTELEMETRY_HAVE_FEATURE(thread_sanitizer)
-#    define OPENTELEMETRY_HAVE_THREAD_SANITIZER 1
-#  else
-#    define OPENTELEMETRY_HAVE_THREAD_SANITIZER 0
-#  endif
-#endif
-
-#if OPENTELEMETRY_HAVE_THREAD_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize_thread)
-#  define OPENTELEMETRY_SANITIZER_NO_THREAD \
-    __attribute__((no_sanitize_thread))  // __attribute__((no_sanitize("thread")))
-#else
-#  define OPENTELEMETRY_SANITIZER_NO_THREAD
-#endif
-
-// OPENTELEMETRY_HAVE_ADDRESS_SANITIZER
-//
-// AddressSanitizer (ASan) is a fast memory error detector.
-#ifndef OPENTELEMETRY_HAVE_ADDRESS_SANITIZER
-#  if defined(__SANITIZE_ADDRESS__)
-#    define OPENTELEMETRY_HAVE_ADDRESS_SANITIZER 1
-#  elif OPENTELEMETRY_HAVE_FEATURE(address_sanitizer)
-#    define OPENTELEMETRY_HAVE_ADDRESS_SANITIZER 1
-#  else
-#    define OPENTELEMETRY_HAVE_ADDRESS_SANITIZER 0
-#  endif
-#endif
-
-// OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER
-//
-// Hardware-Assisted AddressSanitizer (or HWASAN) is even faster than asan
-// memory error detector which can use CPU features like ARM TBI, Intel LAM or
-// AMD UAI.
-#ifndef OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER
-#  if defined(__SANITIZE_HWADDRESS__)
-#    define OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER 1
-#  elif OPENTELEMETRY_HAVE_FEATURE(hwaddress_sanitizer)
-#    define OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER 1
-#  else
-#    define OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER 0
-#  endif
-#endif
-
-#if OPENTELEMETRY_HAVE_ADDRESS_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize_address)
-#  define OPENTELEMETRY_SANITIZER_NO_ADDRESS \
-    __attribute__((no_sanitize_address))  // __attribute__((no_sanitize("address")))
-#elif OPENTELEMETRY_HAVE_ADDRESS_SANITIZER && defined(_MSC_VER) && _MSC_VER >= 1928
-#  define OPENTELEMETRY_SANITIZER_NO_ADDRESS __declspec(no_sanitize_address)
-#elif OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize)
-#  define OPENTELEMETRY_SANITIZER_NO_ADDRESS __attribute__((no_sanitize("hwaddress")))
-#else
-#  define OPENTELEMETRY_SANITIZER_NO_ADDRESS
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/spin_lock_mutex.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/spin_lock_mutex.h
deleted file mode 100644
index 7031fa4d2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/spin_lock_mutex.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <thread>
-
-#include "opentelemetry/version.h"
-
-#if defined(_MSC_VER)
-#  define _WINSOCKAPI_  // stops including winsock.h
-#  include <windows.h>
-#elif defined(__i386__) || defined(__x86_64__)
-#  if defined(__clang__)
-#    include <emmintrin.h>
-#  elif defined(__INTEL_COMPILER)
-#    include <immintrin.h>
-#  endif
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-
-constexpr int SPINLOCK_FAST_ITERATIONS = 100;
-constexpr int SPINLOCK_SLEEP_MS        = 1;
-
-/**
- * A Mutex which uses atomic flags and spin-locks instead of halting threads.
- *
- * This mutex uses an incremental back-off strategy with the following phases:
- * 1. A tight spin-lock loop (pending: using hardware PAUSE/YIELD instructions)
- * 2. A loop where the current thread yields control after checking the lock.
- * 3. Issuing a thread-sleep call before starting back in phase 1.
- *
- * This is meant to give a good balance of perofrmance and CPU consumption in
- * practice.
- *
- * This mutex uses an incremental back-off strategy with the following phases:
- * 1. A tight spin-lock loop (pending: using hardware PAUSE/YIELD instructions)
- * 2. A loop where the current thread yields control after checking the lock.
- * 3. Issuing a thread-sleep call before starting back in phase 1.
- *
- * This is meant to give a good balance of perofrmance and CPU consumption in
- * practice.
- *
- * This class implements the `BasicLockable` specification:
- * https://en.cppreference.com/w/cpp/named_req/BasicLockable
- */
-class SpinLockMutex
-{
-public:
-  SpinLockMutex() noexcept {}
-  ~SpinLockMutex() noexcept                       = default;
-  SpinLockMutex(const SpinLockMutex &)            = delete;
-  SpinLockMutex &operator=(const SpinLockMutex &) = delete;
-
-  static inline void fast_yield() noexcept
-  {
-// Issue a Pause/Yield instruction while spinning.
-#if defined(_MSC_VER)
-    YieldProcessor();
-#elif defined(__i386__) || defined(__x86_64__)
-#  if defined(__clang__) || defined(__INTEL_COMPILER)
-    _mm_pause();
-#  else
-    __builtin_ia32_pause();
-#  endif
-#elif defined(__armel__) || defined(__ARMEL__)
-    asm volatile("nop" ::: "memory");
-#elif defined(__arm__) || defined(__aarch64__)  // arm big endian / arm64
-    __asm__ __volatile__("yield" ::: "memory");
-#else
-    // TODO: Issue PAGE/YIELD on other architectures.
-#endif
-  }
-
-  /**
-   * Attempts to lock the mutex.  Return immediately with `true` (success) or `false` (failure).
-   */
-  bool try_lock() noexcept
-  {
-    return !flag_.load(std::memory_order_relaxed) &&
-           !flag_.exchange(true, std::memory_order_acquire);
-  }
-
-  /**
-   * Blocks until a lock can be obtained for the current thread.
-   *
-   * This mutex will spin the current CPU waiting for the lock to be available.  This can have
-   * decent performance in scenarios where there is low lock contention and lock-holders achieve
-   * their work quickly.  It degrades in scenarios where locked tasks take a long time.
-   */
-  void lock() noexcept
-  {
-    for (;;)
-    {
-      // Try once
-      if (!flag_.exchange(true, std::memory_order_acquire))
-      {
-        return;
-      }
-      // Spin-Fast (goal ~10ns)
-      for (std::size_t i = 0; i < SPINLOCK_FAST_ITERATIONS; ++i)
-      {
-        if (try_lock())
-        {
-          return;
-        }
-        fast_yield();
-      }
-      // Yield then try again (goal ~100ns)
-      std::this_thread::yield();
-      if (try_lock())
-      {
-        return;
-      }
-      // Sleep and then start the whole process again. (goal ~1000ns)
-      std::this_thread::sleep_for(std::chrono::milliseconds(SPINLOCK_SLEEP_MS));
-    }
-    return;
-  }
-  /** Releases the lock held by the execution agent. Throws no exceptions. */
-  void unlock() noexcept { flag_.store(false, std::memory_order_release); }
-
-private:
-  std::atomic<bool> flag_{false};
-};
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/string_util.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/string_util.h
deleted file mode 100644
index 273a65272..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/string_util.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-
-class StringUtil
-{
-public:
-  static nostd::string_view Trim(nostd::string_view str, size_t left, size_t right) noexcept
-  {
-    while (left <= right && isspace(str[left]))
-    {
-      left++;
-    }
-    while (left <= right && isspace(str[right]))
-    {
-      right--;
-    }
-    return str.substr(left, 1 + right - left);
-  }
-
-  static nostd::string_view Trim(nostd::string_view str) noexcept
-  {
-    if (str.empty())
-    {
-      return str;
-    }
-
-    return Trim(str, 0, str.size() - 1);
-  }
-};
-
-}  // namespace common
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/timestamp.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/timestamp.h
deleted file mode 100644
index f7c79b8b5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/common/timestamp.h
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstdint>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-/**
- * @brief A timepoint relative to the system clock epoch.
- *
- * This is used for marking the beginning and end of an operation.
- */
-class SystemTimestamp
-{
-public:
-  /**
-   * @brief Initializes a system timestamp pointing to the start of the epoch.
-   */
-  SystemTimestamp() noexcept : nanos_since_epoch_{0} {}
-
-  /**
-   * @brief Initializes a system timestamp from a duration.
-   *
-   * @param time_since_epoch Time elapsed since the beginning of the epoch.
-   */
-  template <class Rep, class Period>
-  explicit SystemTimestamp(const std::chrono::duration<Rep, Period> &time_since_epoch) noexcept
-      : nanos_since_epoch_{static_cast<int64_t>(
-            std::chrono::duration_cast<std::chrono::nanoseconds>(time_since_epoch).count())}
-  {}
-
-  /**
-   * @brief Initializes a system timestamp based on a point in time.
-   *
-   * @param time_point A point in time.
-   */
-  /*implicit*/ SystemTimestamp(const std::chrono::system_clock::time_point &time_point) noexcept
-      : SystemTimestamp{time_point.time_since_epoch()}
-  {}
-
-  /**
-   * @brief Returns a time point for the time stamp.
-   *
-   * @return A time point corresponding to the time stamp.
-   */
-  operator std::chrono::system_clock::time_point() const noexcept
-  {
-    return std::chrono::system_clock::time_point{
-        std::chrono::duration_cast<std::chrono::system_clock::duration>(
-            std::chrono::nanoseconds{nanos_since_epoch_})};
-  }
-
-  /**
-   * @brief Returns the nanoseconds since the beginning of the epoch.
-   *
-   * @return Elapsed nanoseconds since the beginning of the epoch for this timestamp.
-   */
-  std::chrono::nanoseconds time_since_epoch() const noexcept
-  {
-    return std::chrono::nanoseconds{nanos_since_epoch_};
-  }
-
-  /**
-   * @brief Compare two steady time stamps.
-   *
-   * @return true if the two time stamps are equal.
-   */
-  bool operator==(const SystemTimestamp &other) const noexcept
-  {
-    return nanos_since_epoch_ == other.nanos_since_epoch_;
-  }
-
-  /**
-   * @brief Compare two steady time stamps for inequality.
-   *
-   * @return true if the two time stamps are not equal.
-   */
-  bool operator!=(const SystemTimestamp &other) const noexcept
-  {
-    return nanos_since_epoch_ != other.nanos_since_epoch_;
-  }
-
-private:
-  int64_t nanos_since_epoch_;
-};
-
-/**
- * @brief A timepoint relative to the monotonic clock epoch
- *
- * This is used for calculating the duration of an operation.
- */
-class SteadyTimestamp
-{
-public:
-  /**
-   * @brief Initializes a monotonic timestamp pointing to the start of the epoch.
-   */
-  SteadyTimestamp() noexcept : nanos_since_epoch_{0} {}
-
-  /**
-   * @brief Initializes a monotonic timestamp from a duration.
-   *
-   * @param time_since_epoch Time elapsed since the beginning of the epoch.
-   */
-  template <class Rep, class Period>
-  explicit SteadyTimestamp(const std::chrono::duration<Rep, Period> &time_since_epoch) noexcept
-      : nanos_since_epoch_{static_cast<int64_t>(
-            std::chrono::duration_cast<std::chrono::nanoseconds>(time_since_epoch).count())}
-  {}
-
-  /**
-   * @brief Initializes a monotonic timestamp based on a point in time.
-   *
-   * @param time_point A point in time.
-   */
-  /*implicit*/ SteadyTimestamp(const std::chrono::steady_clock::time_point &time_point) noexcept
-      : SteadyTimestamp{time_point.time_since_epoch()}
-  {}
-
-  /**
-   * @brief Returns a time point for the time stamp.
-   *
-   * @return A time point corresponding to the time stamp.
-   */
-  operator std::chrono::steady_clock::time_point() const noexcept
-  {
-    return std::chrono::steady_clock::time_point{
-        std::chrono::duration_cast<std::chrono::steady_clock::duration>(
-            std::chrono::nanoseconds{nanos_since_epoch_})};
-  }
-
-  /**
-   * @brief Returns the nanoseconds since the beginning of the epoch.
-   *
-   * @return Elapsed nanoseconds since the beginning of the epoch for this timestamp.
-   */
-  std::chrono::nanoseconds time_since_epoch() const noexcept
-  {
-    return std::chrono::nanoseconds{nanos_since_epoch_};
-  }
-
-  /**
-   * @brief Compare two steady time stamps.
-   *
-   * @return true if the two time stamps are equal.
-   */
-  bool operator==(const SteadyTimestamp &other) const noexcept
-  {
-    return nanos_since_epoch_ == other.nanos_since_epoch_;
-  }
-
-  /**
-   * @brief Compare two steady time stamps for inequality.
-   *
-   * @return true if the two time stamps are not equal.
-   */
-  bool operator!=(const SteadyTimestamp &other) const noexcept
-  {
-    return nanos_since_epoch_ != other.nanos_since_epoch_;
-  }
-
-private:
-  int64_t nanos_since_epoch_;
-};
-
-class DurationUtil
-{
-public:
-  template <class Rep, class Period>
-  static std::chrono::duration<Rep, Period> AdjustWaitForTimeout(
-      std::chrono::duration<Rep, Period> timeout,
-      std::chrono::duration<Rep, Period> indefinite_value) noexcept
-  {
-    // Do not call now() when this duration is max value, now() may have a expensive cost.
-    if (timeout == (std::chrono::duration<Rep, Period>::max)())
-    {
-      return indefinite_value;
-    }
-
-    // std::future<T>::wait_for, std::this_thread::sleep_for, and std::condition_variable::wait_for
-    // may use steady_clock or system_clock.We need make sure now() + timeout do not overflow.
-    auto max_timeout = std::chrono::duration_cast<std::chrono::duration<Rep, Period>>(
-        (std::chrono::steady_clock::time_point::max)() - std::chrono::steady_clock::now());
-    if (timeout >= max_timeout)
-    {
-      return indefinite_value;
-    }
-    max_timeout = std::chrono::duration_cast<std::chrono::duration<Rep, Period>>(
-        (std::chrono::system_clock::time_point::max)() - std::chrono::system_clock::now());
-    if (timeout >= max_timeout)
-    {
-      return indefinite_value;
-    }
-
-    return timeout;
-  }
-};
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/config.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/config.h
deleted file mode 100644
index cb52f3b5d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>  // IWYU pragma: keep
-
-#if defined(OPENTELEMETRY_ABI_VERSION_NO) && OPENTELEMETRY_ABI_VERSION_NO >= 2
-#  error \
-      "opentelemetry/config.h is removed in ABI version 2 and later. Please use opentelemetry/version.h instead."
-#else
-#  if defined(__clang__) || defined(__GNUC__)
-#    pragma GCC warning \
-        "opentelemetry/config.h is deprecated. Please use opentelemetry/version.h instead."
-#  elif defined(_MSC_VER)
-#    pragma message( \
-        "[WARNING]: opentelemetry/config.h is deprecated. Please use opentelemetry/version.h instead.")
-#  endif
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/context.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/context.h
deleted file mode 100644
index 924036efa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/context.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstring>
-#include <utility>
-
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-
-// The context class provides a context identifier. Is built as a linked list
-// of DataList nodes and each context holds a shared_ptr to a place within
-// the list that determines which keys and values it has access to. All that
-// come before and none that come after.
-class Context
-{
-
-public:
-  Context() = default;
-  // Creates a context object from a map of keys and identifiers, this will
-  // hold a shared_ptr to the head of the DataList linked list
-  template <class T>
-  Context(const T &keys_and_values) noexcept
-      : head_{nostd::shared_ptr<DataList>{new DataList(keys_and_values)}}
-  {}
-
-  // Creates a context object from a key and value, this will
-  // hold a shared_ptr to the head of the DataList linked list
-  Context(nostd::string_view key, ContextValue value) noexcept
-      : head_{nostd::shared_ptr<DataList>{new DataList(key, value)}}
-  {}
-
-  // Accepts a new iterable and then returns a new context that
-  // contains the new key and value data. It attaches the
-  // exisiting list to the end of the new list.
-  template <class T>
-  Context SetValues(T &values) noexcept
-  {
-    Context context                  = Context(values);
-    nostd::shared_ptr<DataList> last = context.head_;
-    while (last->next_ != nullptr)
-    {
-      last = last->next_;
-    }
-    last->next_ = head_;
-    return context;
-  }
-
-  // Accepts a new iterable and then returns a new context that
-  // contains the new key and value data. It attaches the
-  // exisiting list to the end of the new list.
-  Context SetValue(nostd::string_view key, ContextValue value) noexcept
-  {
-    Context context      = Context(key, value);
-    context.head_->next_ = head_;
-    return context;
-  }
-
-  // Returns the value associated with the passed in key.
-  context::ContextValue GetValue(const nostd::string_view key) const noexcept
-  {
-    for (DataList *data = head_.get(); data != nullptr; data = data->next_.get())
-    {
-      if (key.size() == data->key_length_)
-      {
-        if (std::memcmp(key.data(), data->key_, data->key_length_) == 0)
-        {
-          return data->value_;
-        }
-      }
-    }
-    return ContextValue{};
-  }
-
-  // Checks for key and returns true if found
-  bool HasKey(const nostd::string_view key) const noexcept
-  {
-    return !nostd::holds_alternative<nostd::monostate>(GetValue(key));
-  }
-
-  bool operator==(const Context &other) const noexcept { return (head_ == other.head_); }
-
-private:
-  // A linked list to contain the keys and values of this context node
-  struct DataList
-  {
-    char *key_ = nullptr;
-
-    nostd::shared_ptr<DataList> next_{nullptr};
-
-    size_t key_length_ = 0UL;
-
-    ContextValue value_;
-
-    DataList() = default;
-
-    // Builds a data list off of a key and value iterable and returns the head
-    template <class T>
-    DataList(const T &keys_and_vals)
-    {
-      bool first = true;
-      auto *node = this;
-      for (auto &iter : keys_and_vals)
-      {
-        if (first)
-        {
-          *node = DataList(iter.first, iter.second);
-          first = false;
-        }
-        else
-        {
-          node->next_ = nostd::shared_ptr<DataList>(new DataList(iter.first, iter.second));
-          node        = node->next_.get();
-        }
-      }
-    }
-
-    // Builds a data list with just a key and value, so it will just be the head
-    // and returns that head.
-    DataList(nostd::string_view key, const ContextValue &value)
-    {
-      key_        = new char[key.size()];
-      key_length_ = key.size();
-      std::memcpy(key_, key.data(), key.size() * sizeof(char));
-      next_  = nostd::shared_ptr<DataList>{nullptr};
-      value_ = value;
-    }
-
-    DataList(const DataList &other)
-        : key_(new char[other.key_length_]),
-          next_(other.next_),
-          key_length_(other.key_length_),
-          value_(other.value_)
-    {
-      std::memcpy(key_, other.key_, other.key_length_ * sizeof(char));
-    }
-
-    DataList &operator=(DataList &&other) noexcept
-    {
-      key_length_ = other.key_length_;
-      value_      = std::move(other.value_);
-      next_       = std::move(other.next_);
-
-      key_       = other.key_;
-      other.key_ = nullptr;
-
-      return *this;
-    }
-
-    ~DataList()
-    {
-      if (key_ != nullptr)
-      {
-        delete[] key_;
-      }
-    }
-  };
-
-  // Head of the list which holds the keys and values of this context
-  nostd::shared_ptr<DataList> head_;
-};
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/context_value.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/context_value.h
deleted file mode 100644
index 27bd40fb0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/context_value.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace baggage
-{
-class Baggage;
-}  // namespace baggage
-
-namespace trace
-{
-class Span;
-class SpanContext;
-}  // namespace trace
-
-namespace context
-{
-using ContextValue = nostd::variant<nostd::monostate,
-                                    bool,
-                                    int64_t,
-                                    uint64_t,
-                                    double,
-                                    nostd::shared_ptr<trace::Span>,
-                                    nostd::shared_ptr<trace::SpanContext>,
-                                    nostd::shared_ptr<baggage::Baggage>>;
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/composite_propagator.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/composite_propagator.h
deleted file mode 100644
index f7afe23bf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/composite_propagator.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-namespace propagation
-{
-
-class CompositePropagator : public TextMapPropagator
-{
-public:
-  CompositePropagator(std::vector<std::unique_ptr<TextMapPropagator>> propagators)
-      : propagators_(std::move(propagators))
-  {}
-
-  /**
-   * Run each of the configured propagators with the given context and carrier.
-   * Propagators are run in the order they are configured, so if multiple
-   * propagators write the same carrier key, the propagator later in the list
-   * will "win".
-   *
-   * @param carrier Carrier into which context will be injected
-   * @param context Context to inject
-   *
-   */
-
-  void Inject(TextMapCarrier &carrier, const context::Context &context) noexcept override
-  {
-    for (auto &p : propagators_)
-    {
-      p->Inject(carrier, context);
-    }
-  }
-
-  /**
-   * Run each of the configured propagators with the given context and carrier.
-   * Propagators are run in the order they are configured, so if multiple
-   * propagators write the same context key, the propagator later in the list
-   * will "win".
-   *
-   * @param carrier Carrier from which to extract context
-   * @param context Context to add values to
-   */
-  context::Context Extract(const TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    auto first = true;
-    context::Context tmp_context;
-    for (auto &p : propagators_)
-    {
-      if (first)
-      {
-        tmp_context = p->Extract(carrier, context);
-        first       = false;
-      }
-      else
-      {
-        tmp_context = p->Extract(carrier, tmp_context);
-      }
-    }
-    return propagators_.size() ? tmp_context : context;
-  }
-
-  /**
-   * Invoke callback with  fields set to carrier by `inject` method for all the
-   * configured propagators
-   * Returns true if all invocation return true
-   */
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    bool status = true;
-    for (auto &p : propagators_)
-    {
-      status = status && p->Fields(callback);
-    }
-    return status;
-  }
-
-private:
-  std::vector<std::unique_ptr<TextMapPropagator>> propagators_;
-};
-}  // namespace propagation
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/global_propagator.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/global_propagator.h
deleted file mode 100644
index 85293202f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/global_propagator.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/context/propagation/noop_propagator.h"
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-namespace propagation
-{
-
-class TextMapPropagator;
-
-/* Stores the singleton TextMapPropagator */
-
-class OPENTELEMETRY_EXPORT GlobalTextMapPropagator
-{
-public:
-  static nostd::shared_ptr<TextMapPropagator> GetGlobalPropagator() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<TextMapPropagator>(GetPropagator());
-  }
-
-  static void SetGlobalPropagator(const nostd::shared_ptr<TextMapPropagator> &prop) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetPropagator() = prop;
-  }
-
-private:
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<TextMapPropagator> &GetPropagator() noexcept
-  {
-    static nostd::shared_ptr<TextMapPropagator> propagator(new NoOpPropagator());
-    return propagator;
-  }
-
-  OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
-  {
-    static common::SpinLockMutex lock;
-    return lock;
-  }
-};
-
-}  // namespace propagation
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/noop_propagator.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/noop_propagator.h
deleted file mode 100644
index 4e1b30c17..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/noop_propagator.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-namespace propagation
-{
-
-/**
- * No-op implementation TextMapPropagator
- */
-class NoOpPropagator : public TextMapPropagator
-{
-public:
-  /** Noop extract function does nothing and returns the input context */
-  context::Context Extract(const TextMapCarrier & /*carrier*/,
-                           context::Context &context) noexcept override
-  {
-    return context;
-  }
-
-  /** Noop inject function does nothing */
-  void Inject(TextMapCarrier & /*carrier*/,
-              const context::Context & /* context */) noexcept override
-  {}
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> /* callback */) const noexcept override
-  {
-    return true;
-  }
-};
-}  // namespace propagation
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/text_map_propagator.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/text_map_propagator.h
deleted file mode 100644
index 21bc29361..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/propagation/text_map_propagator.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-namespace propagation
-{
-
-// TextMapCarrier is the storage medium used by TextMapPropagator.
-class TextMapCarrier
-{
-public:
-  // returns the value associated with the passed key.
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept = 0;
-
-  // stores the key-value pair.
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept = 0;
-
-  /* list of all the keys in the carrier.
-   By default, it returns true without invoking callback */
-  virtual bool Keys(nostd::function_ref<bool(nostd::string_view)> /* callback */) const noexcept
-  {
-    return true;
-  }
-  virtual ~TextMapCarrier() = default;
-};
-
-// The TextMapPropagator class provides an interface that enables extracting and injecting
-// context into carriers that travel in-band across process boundaries. HTTP frameworks and clients
-// can integrate with TextMapPropagator by providing the object containing the
-// headers, and a getter and setter function for the extraction and
-// injection of values, respectively.
-
-class TextMapPropagator
-{
-public:
-  // Returns the context that is stored in the carrier with the TextMapCarrier as extractor.
-  virtual context::Context Extract(const TextMapCarrier &carrier,
-                                   context::Context &context) noexcept = 0;
-
-  // Sets the context for carrier with self defined rules.
-  virtual void Inject(TextMapCarrier &carrier, const context::Context &context) noexcept = 0;
-
-  // Gets the fields set in the carrier by the `inject` method
-  virtual bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept = 0;
-
-  virtual ~TextMapPropagator() = default;
-};
-}  // namespace propagation
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/runtime_context.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/runtime_context.h
deleted file mode 100644
index e3f88254c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/context/runtime_context.h
+++ /dev/null
@@ -1,340 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <algorithm>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-// The Token object provides is returned when attaching objects to the
-// RuntimeContext object and is associated with a context object, and
-// can be provided to the RuntimeContext Detach method to remove the
-// associated context from the RuntimeContext.
-class Token
-{
-public:
-  bool operator==(const Context &other) const noexcept { return context_ == other; }
-
-  ~Token() noexcept;
-
-private:
-  friend class RuntimeContextStorage;
-
-  // A constructor that sets the token's Context object to the
-  // one that was passed in.
-  Token(const Context &context) : context_(context) {}
-
-  const Context context_;
-};
-
-/**
- * RuntimeContextStorage is used by RuntimeContext to store Context frames.
- *
- * Custom context management strategies can be implemented by deriving from
- * this class and passing an initialized RuntimeContextStorage object to
- * RuntimeContext::SetRuntimeContextStorage.
- */
-class OPENTELEMETRY_EXPORT RuntimeContextStorage
-{
-public:
-  /**
-   * Return the current context.
-   * @return the current context
-   */
-  virtual Context GetCurrent() noexcept = 0;
-
-  /**
-   * Set the current context.
-   * @param the new current context
-   * @return a token for the new current context. This never returns a nullptr.
-   */
-  virtual nostd::unique_ptr<Token> Attach(const Context &context) noexcept = 0;
-
-  /**
-   * Detach the context related to the given token.
-   * @param token a token related to a context
-   * @return true if the context could be detached
-   */
-  virtual bool Detach(Token &token) noexcept = 0;
-
-  virtual ~RuntimeContextStorage() {}
-
-protected:
-  nostd::unique_ptr<Token> CreateToken(const Context &context) noexcept
-  {
-    return nostd::unique_ptr<Token>(new Token(context));
-  }
-};
-
-/**
- * Construct and return the default RuntimeContextStorage
- * @return a ThreadLocalContextStorage
- */
-static RuntimeContextStorage *GetDefaultStorage() noexcept;
-
-// Provides a wrapper for propagating the context object globally.
-//
-// By default, a thread-local runtime context storage is used.
-class OPENTELEMETRY_EXPORT RuntimeContext
-{
-public:
-  // Return the current context.
-  static Context GetCurrent() noexcept { return GetRuntimeContextStorage()->GetCurrent(); }
-
-  // Sets the current 'Context' object. Returns a token
-  // that can be used to reset to the previous Context.
-  static nostd::unique_ptr<Token> Attach(const Context &context) noexcept
-  {
-    return GetRuntimeContextStorage()->Attach(context);
-  }
-
-  // Resets the context to a previous value stored in the
-  // passed in token. Returns true if successful, false otherwise
-  static bool Detach(Token &token) noexcept { return GetRuntimeContextStorage()->Detach(token); }
-
-  // Sets the Key and Value into the passed in context or if a context is not
-  // passed in, the RuntimeContext.
-  // Should be used to SetValues to the current RuntimeContext, is essentially
-  // equivalent to RuntimeContext::GetCurrent().SetValue(key,value). Keep in
-  // mind that the current RuntimeContext will not be changed, and the new
-  // context will be returned.
-  static Context SetValue(nostd::string_view key,
-                          const ContextValue &value,
-                          Context *context = nullptr) noexcept
-  {
-    Context temp_context;
-    if (context == nullptr)
-    {
-      temp_context = GetCurrent();
-    }
-    else
-    {
-      temp_context = *context;
-    }
-    return temp_context.SetValue(key, value);
-  }
-
-  // Returns the value associated with the passed in key and either the
-  // passed in context* or the runtime context if a context is not passed in.
-  // Should be used to get values from the current RuntimeContext, is
-  // essentially equivalent to RuntimeContext::GetCurrent().GetValue(key).
-  static ContextValue GetValue(nostd::string_view key, Context *context = nullptr) noexcept
-  {
-    Context temp_context;
-    if (context == nullptr)
-    {
-      temp_context = GetCurrent();
-    }
-    else
-    {
-      temp_context = *context;
-    }
-    return temp_context.GetValue(key);
-  }
-
-  /**
-   * Provide a custom runtime context storage.
-   *
-   * This provides a possibility to override the default thread-local runtime
-   * context storage. This has to be set before any spans are created by the
-   * application, otherwise the behavior is undefined.
-   *
-   * @param storage a custom runtime context storage
-   */
-  static void SetRuntimeContextStorage(
-      const nostd::shared_ptr<RuntimeContextStorage> &storage) noexcept
-  {
-    GetStorage() = storage;
-  }
-
-  /**
-   * Provide a pointer to const runtime context storage.
-   *
-   * The returned pointer can only be used for extending the lifetime of the runtime context
-   * storage.
-   *
-   */
-  static nostd::shared_ptr<const RuntimeContextStorage> GetConstRuntimeContextStorage() noexcept
-  {
-    return GetRuntimeContextStorage();
-  }
-
-private:
-  static nostd::shared_ptr<RuntimeContextStorage> GetRuntimeContextStorage() noexcept
-  {
-    return GetStorage();
-  }
-
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<RuntimeContextStorage> &GetStorage() noexcept
-  {
-    static nostd::shared_ptr<RuntimeContextStorage> context(GetDefaultStorage());
-    return context;
-  }
-};
-
-inline Token::~Token() noexcept
-{
-  context::RuntimeContext::Detach(*this);
-}
-
-// The ThreadLocalContextStorage class is a derived class from
-// RuntimeContextStorage and provides a wrapper for propagating context through
-// cpp thread locally. This file must be included to use the RuntimeContext
-// class if another implementation has not been registered.
-class ThreadLocalContextStorage : public RuntimeContextStorage
-{
-public:
-  ThreadLocalContextStorage() noexcept = default;
-
-  // Return the current context.
-  Context GetCurrent() noexcept override { return GetStack().Top(); }
-
-  // Resets the context to the value previous to the passed in token. This will
-  // also detach all child contexts of the passed in token.
-  // Returns true if successful, false otherwise.
-  bool Detach(Token &token) noexcept override
-  {
-    // In most cases, the context to be detached is on the top of the stack.
-    if (token == GetStack().Top())
-    {
-      GetStack().Pop();
-      return true;
-    }
-
-    if (!GetStack().Contains(token))
-    {
-      return false;
-    }
-
-    while (!(token == GetStack().Top()))
-    {
-      GetStack().Pop();
-    }
-
-    GetStack().Pop();
-
-    return true;
-  }
-
-  // Sets the current 'Context' object. Returns a token
-  // that can be used to reset to the previous Context.
-  nostd::unique_ptr<Token> Attach(const Context &context) noexcept override
-  {
-    GetStack().Push(context);
-    return CreateToken(context);
-  }
-
-private:
-  // A nested class to store the attached contexts in a stack.
-  class Stack
-  {
-    friend class ThreadLocalContextStorage;
-
-    Stack() noexcept : size_(0), capacity_(0), base_(nullptr) {}
-
-    // Pops the top Context off the stack.
-    void Pop() noexcept
-    {
-      if (size_ == 0)
-      {
-        return;
-      }
-      // Store empty Context before decrementing `size`, to ensure
-      // the shared_ptr object (if stored in prev context object ) are released.
-      // The stack is not resized, and the unused memory would be reutilised
-      // for subsequent context storage.
-      base_[size_ - 1] = Context();
-      size_ -= 1;
-    }
-
-    bool Contains(const Token &token) const noexcept
-    {
-      for (size_t pos = size_; pos > 0; --pos)
-      {
-        if (token == base_[pos - 1])
-        {
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    // Returns the Context at the top of the stack.
-    Context Top() const noexcept
-    {
-      if (size_ == 0)
-      {
-        return Context();
-      }
-      return base_[size_ - 1];
-    }
-
-    // Pushes the passed in context pointer to the top of the stack
-    // and resizes if necessary.
-    void Push(const Context &context) noexcept
-    {
-      size_++;
-      if (size_ > capacity_)
-      {
-        Resize(size_ * 2);
-      }
-      base_[size_ - 1] = context;
-    }
-
-    // Reallocates the storage array to the pass in new capacity size.
-    void Resize(size_t new_capacity) noexcept
-    {
-      size_t old_size = size_ - 1;
-      if (new_capacity == 0)
-      {
-        new_capacity = 2;
-      }
-      Context *temp = new Context[new_capacity];
-      if (base_ != nullptr)
-      {
-        // vs2015 does not like this construct considering it unsafe:
-        // - std::copy(base_, base_ + old_size, temp);
-        // Ref.
-        // https://stackoverflow.com/questions/12270224/xutility2227-warning-c4996-std-copy-impl
-        for (size_t i = 0; i < (std::min)(old_size, new_capacity); i++)
-        {
-          temp[i] = base_[i];
-        }
-        delete[] base_;
-      }
-      base_     = temp;
-      capacity_ = new_capacity;
-    }
-
-    ~Stack() noexcept { delete[] base_; }
-
-    size_t size_;
-    size_t capacity_;
-    Context *base_;
-  };
-
-  OPENTELEMETRY_API_SINGLETON Stack &GetStack()
-  {
-    static thread_local Stack stack_ = Stack();
-    return stack_;
-  }
-};
-
-static RuntimeContextStorage *GetDefaultStorage() noexcept
-{
-  return new ThreadLocalContextStorage();
-}
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/detail/preprocessor.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/detail/preprocessor.h
deleted file mode 100644
index acdf02eb0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/detail/preprocessor.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// NOTE - code within detail namespace implements internal details, and not part
-// of the public interface.
-
-#pragma once
-
-#define OPENTELEMETRY_STRINGIFY(S) OPENTELEMETRY_STRINGIFY_(S)
-#define OPENTELEMETRY_STRINGIFY_(S) #S
-
-#define OPENTELEMETRY_CONCAT(A, B) OPENTELEMETRY_CONCAT_(A, B)
-#define OPENTELEMETRY_CONCAT_(A, B) A##B
-
-// Import the C++20 feature-test macros
-#ifdef __has_include
-#  if __has_include(<version>)
-#    include <version>
-#  endif
-#elif defined(_MSC_VER) && ((defined(__cplusplus) && __cplusplus >= 202002L) || \
-                            (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L))
-#  if _MSC_VER >= 1922
-#    include <version>
-#  endif
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_id.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_id.h
deleted file mode 100644
index 65306ef79..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_id.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-/**
- * EventId class which acts the Id of the event with an optional name.
- */
-class EventId
-{
-public:
-  EventId(int64_t id, nostd::string_view name) noexcept
-      : id_{id}, name_{nostd::unique_ptr<char[]>{new char[name.length() + 1]}}
-  {
-    std::copy(name.begin(), name.end(), name_.get());
-    name_.get()[name.length()] = 0;
-  }
-
-  EventId(int64_t id) noexcept : id_{id}, name_{nullptr} {}
-
-public:
-  int64_t id_;
-  nostd::unique_ptr<char[]> name_;
-};
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_logger.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_logger.h
deleted file mode 100644
index bcc103562..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_logger.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_type_traits.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-/**
- * Handles event log record creation.
- **/
-class OPENTELEMETRY_DEPRECATED EventLogger
-{
-public:
-  virtual ~EventLogger() = default;
-
-  /* Returns the name of the logger */
-  virtual const nostd::string_view GetName() noexcept = 0;
-
-  /* Returns the delegate logger of this event logger */
-  virtual nostd::shared_ptr<Logger> GetDelegateLogger() noexcept = 0;
-
-  /**
-   * Emit a event Log Record object
-   *
-   * @param event_name Event name
-   * @param log_record Log record
-   */
-  virtual void EmitEvent(nostd::string_view event_name,
-                         nostd::unique_ptr<LogRecord> &&log_record) noexcept = 0;
-
-  /**
-   * Emit a event Log Record object with arguments
-   *
-   * @param event_name Event name
-   * @tparam args Arguments which can be used to set data of log record by type.
-   *  Severity                                -> severity, severity_text
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,tace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> tace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void EmitEvent(nostd::string_view event_name, ArgumentType &&...args)
-  {
-    nostd::shared_ptr<Logger> delegate_logger = GetDelegateLogger();
-    if (!delegate_logger)
-    {
-      return;
-    }
-    nostd::unique_ptr<LogRecord> log_record = delegate_logger->CreateLogRecord();
-
-    IgnoreTraitResult(detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::Set(
-        log_record.get(), std::forward<ArgumentType>(args))...);
-
-    EmitEvent(event_name, std::move(log_record));
-  }
-
-private:
-  template <class... ValueType>
-  void IgnoreTraitResult(ValueType &&...)
-  {}
-};
-#endif
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_logger_provider.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_logger_provider.h
deleted file mode 100644
index 9eea0ca23..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/event_logger_provider.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-class EventLogger;
-class Logger;
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-/**
- * Creates new EventLogger instances.
- */
-class OPENTELEMETRY_DEPRECATED EventLoggerProvider
-{
-public:
-  virtual ~EventLoggerProvider() = default;
-
-  /**
-   * Creates a named EventLogger instance.
-   *
-   */
-
-  virtual nostd::shared_ptr<EventLogger> CreateEventLogger(
-      nostd::shared_ptr<Logger> delegate_logger,
-      nostd::string_view event_domain) noexcept = 0;
-};
-#endif
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/log_record.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/log_record.h
deleted file mode 100644
index 81dec568e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/log_record.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-class SpanId;
-class TraceId;
-class TraceFlags;
-}  // namespace trace
-
-namespace logs
-{
-
-enum class Severity : uint8_t;
-
-/**
- * Maintains a representation of a log in a format that can be processed by a recorder.
- *
- * This class is thread-compatible.
- */
-class LogRecord
-{
-public:
-  virtual ~LogRecord() = default;
-
-  /**
-   * Set the timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  virtual void SetTimestamp(common::SystemTimestamp timestamp) noexcept = 0;
-
-  /**
-   * Set the observed timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  virtual void SetObservedTimestamp(common::SystemTimestamp timestamp) noexcept = 0;
-
-  /**
-   * Set the severity for this log.
-   * @param severity the severity of the event
-   */
-  virtual void SetSeverity(logs::Severity severity) noexcept = 0;
-
-  /**
-   * Set body field for this log.
-   * @param message the body to set
-   */
-  virtual void SetBody(const common::AttributeValue &message) noexcept = 0;
-
-  /**
-   * Set an attribute of a log.
-   * @param key the name of the attribute
-   * @param value the attribute value
-   */
-  virtual void SetAttribute(nostd::string_view key,
-                            const common::AttributeValue &value) noexcept = 0;
-
-  /**
-   * Set the Event Id.
-   * @param id The event id to set
-   * @param name Optional event name to set
-   */
-  // TODO: mark this as pure virtual once all exporters have been updated
-  virtual void SetEventId(int64_t id, nostd::string_view name = {}) noexcept = 0;
-
-  /**
-   * Set the trace id for this log.
-   * @param trace_id the trace id to set
-   */
-  virtual void SetTraceId(const trace::TraceId &trace_id) noexcept = 0;
-
-  /**
-   * Set the span id for this log.
-   * @param span_id the span id to set
-   */
-  virtual void SetSpanId(const trace::SpanId &span_id) noexcept = 0;
-
-  /**
-   * Inject trace_flags for this log.
-   * @param trace_flags the trace flags to set
-   */
-  virtual void SetTraceFlags(const trace::TraceFlags &trace_flags) noexcept = 0;
-};
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger.h
deleted file mode 100644
index 52f403b0a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger.h
+++ /dev/null
@@ -1,492 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/logs/logger_type_traits.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class KeyValueIterable;
-}  // namespace common
-
-namespace logs
-{
-
-class EventId;
-class LogRecord;
-
-/**
- * Handles log record creation.
- **/
-class Logger
-{
-public:
-  virtual ~Logger() = default;
-
-  /* Returns the name of the logger */
-  virtual const nostd::string_view GetName() noexcept = 0;
-
-  /**
-   * Create a Log Record object
-   *
-   * @return nostd::unique_ptr<LogRecord>
-   */
-  virtual nostd::unique_ptr<LogRecord> CreateLogRecord() noexcept = 0;
-
-  /**
-   * Emit a Log Record object
-   *
-   * @param log_record Log record
-   */
-  virtual void EmitLogRecord(nostd::unique_ptr<LogRecord> &&log_record) noexcept = 0;
-
-  /**
-   * Emit a Log Record object with arguments
-   *
-   * @param log_record Log record
-   * @param args Arguments which can be used to set data of log record by type.
-   *  Severity                                -> severity, severity_text
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void EmitLogRecord(nostd::unique_ptr<LogRecord> &&log_record, ArgumentType &&...args)
-  {
-    if (!log_record)
-    {
-      return;
-    }
-
-    //
-    // Keep the parameter pack unpacking order from left to right because left
-    // ones are usually more important like severity and event_id than the
-    // attributes. The left to right unpack order could pass the more important
-    // data to processors to avoid caching and memory allocating.
-    //
-#if __cplusplus <= 201402L
-    // C++14 does not support fold expressions for parameter pack expansion.
-    int dummy[] = {(detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::Set(
-                        log_record.get(), std::forward<ArgumentType>(args)),
-                    0)...};
-    IgnoreTraitResult(dummy);
-#else
-    IgnoreTraitResult((detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::Set(
-                           log_record.get(), std::forward<ArgumentType>(args)),
-                       ...));
-#endif
-
-    EmitLogRecord(std::move(log_record));
-  }
-
-  /**
-   * Emit a Log Record object with arguments
-   *
-   * @param args Arguments which can be used to set data of log record by type.
-   *  Severity                                -> severity, severity_text
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void EmitLogRecord(ArgumentType &&...args)
-  {
-    nostd::unique_ptr<LogRecord> log_record = CreateLogRecord();
-
-    EmitLogRecord(std::move(log_record), std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of trace.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Trace(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kTrace, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of debug.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Debug(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kDebug, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of info.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Info(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kInfo, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of warn.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Warn(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kWarn, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of error.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Error(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kError, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of fatal.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Fatal(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kFatal, std::forward<ArgumentType>(args)...);
-  }
-
-  //
-  // OpenTelemetry C++ user-facing Logs API
-  //
-
-  inline bool Enabled(Severity severity, const EventId &event_id) const noexcept
-  {
-    if OPENTELEMETRY_LIKELY_CONDITION (!Enabled(severity))
-    {
-      return false;
-    }
-    return EnabledImplementation(severity, event_id);
-  }
-
-  inline bool Enabled(Severity severity, int64_t event_id) const noexcept
-  {
-    if OPENTELEMETRY_LIKELY_CONDITION (!Enabled(severity))
-    {
-      return false;
-    }
-    return EnabledImplementation(severity, event_id);
-  }
-
-  inline bool Enabled(Severity severity) const noexcept
-  {
-    return static_cast<uint8_t>(severity) >= OPENTELEMETRY_ATOMIC_READ_8(&minimum_severity_);
-  }
-
-  /**
-   * Log an event
-   *
-   * @severity severity of the log
-   * @event_id event identifier of the log
-   * @format an utf-8 string following https://messagetemplates.org/
-   * @attributes key value pairs of the log
-   */
-  virtual void Log(Severity severity,
-                   const EventId &event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->EmitLogRecord(severity, event_id, format, attributes);
-  }
-
-  virtual void Log(Severity severity,
-                   int64_t event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->EmitLogRecord(severity, EventId{event_id}, format, attributes);
-  }
-
-  virtual void Log(Severity severity,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->EmitLogRecord(severity, format, attributes);
-  }
-
-  virtual void Log(Severity severity, nostd::string_view message) noexcept
-  {
-    this->EmitLogRecord(severity, message);
-  }
-
-  // Convenient wrappers based on virtual methods Log().
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#field-severitynumber
-
-  inline void Trace(const EventId &event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kTrace, event_id, format, attributes);
-  }
-
-  inline void Trace(int64_t event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kTrace, EventId{event_id}, format, attributes);
-  }
-
-  inline void Trace(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kTrace, format, attributes);
-  }
-
-  inline void Trace(nostd::string_view message) noexcept { this->Log(Severity::kTrace, message); }
-
-  inline void Debug(const EventId &event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kDebug, event_id, format, attributes);
-  }
-
-  inline void Debug(int64_t event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kDebug, EventId{event_id}, format, attributes);
-  }
-
-  inline void Debug(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kDebug, format, attributes);
-  }
-
-  inline void Debug(nostd::string_view message) noexcept { this->Log(Severity::kDebug, message); }
-
-  inline void Info(const EventId &event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kInfo, event_id, format, attributes);
-  }
-
-  inline void Info(int64_t event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kInfo, EventId{event_id}, format, attributes);
-  }
-
-  inline void Info(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kInfo, format, attributes);
-  }
-
-  inline void Info(nostd::string_view message) noexcept { this->Log(Severity::kInfo, message); }
-
-  inline void Warn(const EventId &event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kWarn, event_id, format, attributes);
-  }
-
-  inline void Warn(int64_t event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kWarn, EventId{event_id}, format, attributes);
-  }
-
-  inline void Warn(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kWarn, format, attributes);
-  }
-
-  inline void Warn(nostd::string_view message) noexcept { this->Log(Severity::kWarn, message); }
-
-  inline void Error(const EventId &event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kError, event_id, format, attributes);
-  }
-
-  inline void Error(int64_t event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kError, EventId{event_id}, format, attributes);
-  }
-
-  inline void Error(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kError, format, attributes);
-  }
-
-  inline void Error(nostd::string_view message) noexcept { this->Log(Severity::kError, message); }
-
-  inline void Fatal(const EventId &event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kFatal, event_id, format, attributes);
-  }
-
-  inline void Fatal(int64_t event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kFatal, EventId{event_id}, format, attributes);
-  }
-
-  inline void Fatal(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kFatal, format, attributes);
-  }
-
-  inline void Fatal(nostd::string_view message) noexcept { this->Log(Severity::kFatal, message); }
-
-  //
-  // End of OpenTelemetry C++ user-facing Log API.
-  //
-
-protected:
-  // TODO: discuss with community about naming for internal methods.
-  virtual bool EnabledImplementation(Severity /*severity*/,
-                                     const EventId & /*event_id*/) const noexcept
-  {
-    return false;
-  }
-
-  virtual bool EnabledImplementation(Severity /*severity*/, int64_t /*event_id*/) const noexcept
-  {
-    return false;
-  }
-
-  void SetMinimumSeverity(uint8_t severity_or_max) noexcept
-  {
-    OPENTELEMETRY_ATOMIC_WRITE_8(&minimum_severity_, severity_or_max);
-  }
-
-private:
-  template <class... ValueType>
-  void IgnoreTraitResult(ValueType &&...)
-  {}
-
-  //
-  // minimum_severity_ can be updated concurrently by multiple threads/cores, so race condition on
-  // read/write should be handled. And std::atomic can not be used here because it is not ABI
-  // compatible for OpenTelemetry C++ API.
-  //
-  mutable uint8_t minimum_severity_{kMaxSeverity};
-};
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger_provider.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger_provider.h
deleted file mode 100644
index ab1493c5c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger_provider.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-class Logger;
-
-/**
- * Creates new Logger instances.
- */
-class OPENTELEMETRY_EXPORT LoggerProvider
-{
-public:
-  virtual ~LoggerProvider() = default;
-
-  /**
-   * Gets or creates a named Logger instance.
-   *
-   * Optionally a version can be passed to create a named and versioned Logger
-   * instance.
-   *
-   * Optionally a configuration file name can be passed to create a configuration for
-   * the Logger instance.
-   *
-   */
-
-  virtual nostd::shared_ptr<Logger> GetLogger(
-      nostd::string_view logger_name,
-      nostd::string_view library_name            = "",
-      nostd::string_view library_version         = "",
-      nostd::string_view schema_url              = "",
-      const common::KeyValueIterable &attributes = common::NoopKeyValueIterable()) = 0;
-
-  nostd::shared_ptr<Logger> GetLogger(
-      nostd::string_view logger_name,
-      nostd::string_view library_name,
-      nostd::string_view library_version,
-      nostd::string_view schema_url,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes)
-  {
-    return GetLogger(logger_name, library_name, library_version, schema_url,
-                     nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                         attributes.begin(), attributes.end()});
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
-                                      nostd::string_view library_name,
-                                      nostd::string_view library_version,
-                                      nostd::string_view schema_url,
-                                      const T &attributes)
-  {
-    return GetLogger(logger_name, library_name, library_version, schema_url,
-                     common::KeyValueIterableView<T>(attributes));
-  }
-};
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger_type_traits.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger_type_traits.h
deleted file mode 100644
index d88a6ffbd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/logger_type_traits.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <type_traits>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/event_id.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-namespace detail
-{
-template <class ValueType>
-struct LogRecordSetterTrait;
-
-template <>
-struct LogRecordSetterTrait<Severity>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetSeverity(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<EventId>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetEventId(arg.id_, nostd::string_view{arg.name_.get()});
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<trace::SpanContext>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetSpanId(arg.span_id());
-    log_record->SetTraceId(arg.trace_id());
-    log_record->SetTraceFlags(arg.trace_flags());
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<trace::SpanId>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetSpanId(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<trace::TraceId>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetTraceId(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<trace::TraceFlags>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetTraceFlags(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<common::SystemTimestamp>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetTimestamp(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<std::chrono::system_clock::time_point>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetTimestamp(common::SystemTimestamp(std::forward<ArgumentType>(arg)));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<common::KeyValueIterable>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    arg.ForEachKeyValue(
-        [&log_record](nostd::string_view key, common::AttributeValue value) noexcept {
-          log_record->SetAttribute(key, value);
-          return true;
-        });
-
-    return log_record;
-  }
-};
-
-template <class ValueType>
-struct LogRecordSetterTrait
-{
-  static_assert(!std::is_same<nostd::unique_ptr<LogRecord>, ValueType>::value &&
-                    !std::is_same<std::unique_ptr<LogRecord>, ValueType>::value,
-                "unique_ptr<LogRecord> is not allowed, please use std::move()");
-
-  template <class ArgumentType,
-            nostd::enable_if_t<std::is_convertible<ArgumentType, nostd::string_view>::value ||
-                                   std::is_convertible<ArgumentType, common::AttributeValue>::value,
-                               void> * = nullptr>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetBody(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-
-  template <class ArgumentType,
-            nostd::enable_if_t<std::is_base_of<common::KeyValueIterable, ArgumentType>::value, bool>
-                * = nullptr>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    return LogRecordSetterTrait<common::KeyValueIterable>::Set(log_record,
-                                                               std::forward<ArgumentType>(arg));
-  }
-
-  template <class ArgumentType,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<ArgumentType>::value, int> * =
-                nullptr>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    for (auto &argv : arg)
-    {
-      log_record->SetAttribute(argv.first, argv.second);
-    }
-
-    return log_record;
-  }
-};
-
-template <class ValueType, class... ArgumentType>
-struct LogRecordHasType;
-
-template <class ValueType>
-struct LogRecordHasType<ValueType> : public std::false_type
-{};
-
-template <class ValueType, class TargetType, class... ArgumentType>
-struct LogRecordHasType<ValueType, TargetType, ArgumentType...>
-    : public std::conditional<std::is_same<ValueType, TargetType>::value,
-                              std::true_type,
-                              LogRecordHasType<ValueType, ArgumentType...>>::type
-{};
-
-}  // namespace detail
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/noop.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/noop.h
deleted file mode 100644
index 24312f061..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/noop.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// Please refer to provider.h for documentation on how to obtain a Logger object.
-//
-// This file is part of the internal implementation of OpenTelemetry. Nothing in this file should be
-// used directly. Please refer to logger.h for documentation on these interfaces.
-
-#include "opentelemetry/logs/event_logger.h"
-#include "opentelemetry/logs/event_logger_provider.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class KeyValueIterable;
-}  // namespace common
-
-namespace logs
-{
-/**
- * No-op implementation of Logger. This class should not be used directly. It should only be
- * instantiated using a LoggerProvider's GetLogger() call.
- */
-class NoopLogger final : public Logger
-{
-public:
-  const nostd::string_view GetName() noexcept override { return "noop logger"; }
-
-  nostd::unique_ptr<LogRecord> CreateLogRecord() noexcept override
-  {
-    /*
-     * Do not return memory shared between threads,
-     * a `new` + `delete` for each noop record can not be avoided,
-     * due to the semantic of unique_ptr.
-     */
-    return nostd::unique_ptr<LogRecord>(new NoopLogRecord());
-  }
-
-  using Logger::EmitLogRecord;
-
-  void EmitLogRecord(nostd::unique_ptr<LogRecord> &&) noexcept override {}
-
-private:
-  class NoopLogRecord : public LogRecord
-  {
-  public:
-    NoopLogRecord()           = default;
-    ~NoopLogRecord() override = default;
-
-    void SetTimestamp(common::SystemTimestamp /* timestamp */) noexcept override {}
-    void SetObservedTimestamp(common::SystemTimestamp /* timestamp */) noexcept override {}
-    void SetSeverity(logs::Severity /* severity */) noexcept override {}
-    void SetBody(const common::AttributeValue & /* message */) noexcept override {}
-    void SetAttribute(nostd::string_view /* key */,
-                      const common::AttributeValue & /* value */) noexcept override
-    {}
-    void SetEventId(int64_t /* id */, nostd::string_view /* name */) noexcept override {}
-    void SetTraceId(const trace::TraceId & /* trace_id */) noexcept override {}
-    void SetSpanId(const trace::SpanId & /* span_id */) noexcept override {}
-    void SetTraceFlags(const trace::TraceFlags & /* trace_flags */) noexcept override {}
-  };
-};
-
-/**
- * No-op implementation of a LoggerProvider.
- */
-class NoopLoggerProvider final : public LoggerProvider
-{
-public:
-  NoopLoggerProvider() : logger_{nostd::shared_ptr<NoopLogger>(new NoopLogger())} {}
-
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view /* logger_name */,
-                                      nostd::string_view /* library_name */,
-                                      nostd::string_view /* library_version */,
-                                      nostd::string_view /* schema_url */,
-                                      const common::KeyValueIterable & /* attributes */) override
-  {
-    return logger_;
-  }
-
-private:
-  nostd::shared_ptr<Logger> logger_;
-};
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-class NoopEventLogger final : public EventLogger
-{
-public:
-  NoopEventLogger() : logger_{nostd::shared_ptr<NoopLogger>(new NoopLogger())} {}
-
-  const nostd::string_view GetName() noexcept override { return "noop event logger"; }
-
-  nostd::shared_ptr<Logger> GetDelegateLogger() noexcept override { return logger_; }
-
-  void EmitEvent(nostd::string_view, nostd::unique_ptr<LogRecord> &&) noexcept override {}
-
-private:
-  nostd::shared_ptr<Logger> logger_;
-};
-
-/**
- * No-op implementation of a EventLoggerProvider.
- */
-class NoopEventLoggerProvider final : public EventLoggerProvider
-{
-public:
-  NoopEventLoggerProvider() : event_logger_{nostd::shared_ptr<EventLogger>(new NoopEventLogger())}
-  {}
-
-  nostd::shared_ptr<EventLogger> CreateEventLogger(
-      nostd::shared_ptr<Logger> /*delegate_logger*/,
-      nostd::string_view /*event_domain*/) noexcept override
-  {
-    return event_logger_;
-  }
-
-private:
-  nostd::shared_ptr<EventLogger> event_logger_;
-};
-#endif
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/provider.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/provider.h
deleted file mode 100644
index 0c1b4deea..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/provider.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/logs/noop.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-class EventLoggerProvider;
-#endif
-class LoggerProvider;
-
-/**
- * Stores the singleton global LoggerProvider.
- */
-class OPENTELEMETRY_EXPORT Provider
-{
-public:
-  /**
-   * Returns the singleton LoggerProvider.
-   *
-   * By default, a no-op LoggerProvider is returned. This will never return a
-   * nullptr LoggerProvider.
-   */
-  static nostd::shared_ptr<LoggerProvider> GetLoggerProvider() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<LoggerProvider>(GetProvider());
-  }
-
-  /**
-   * Changes the singleton LoggerProvider.
-   */
-  static void SetLoggerProvider(const nostd::shared_ptr<LoggerProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetProvider() = tp;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-  /**
-   * Returns the singleton EventLoggerProvider.
-   *
-   * By default, a no-op EventLoggerProvider is returned. This will never return a
-   * nullptr EventLoggerProvider.
-   */
-  OPENTELEMETRY_DEPRECATED static nostd::shared_ptr<EventLoggerProvider>
-  GetEventLoggerProvider() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<EventLoggerProvider>(GetEventProvider());
-  }
-
-  /**
-   * Changes the singleton EventLoggerProvider.
-   */
-  OPENTELEMETRY_DEPRECATED static void SetEventLoggerProvider(
-      const nostd::shared_ptr<EventLoggerProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetEventProvider() = tp;
-  }
-#endif
-
-private:
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<LoggerProvider> &GetProvider() noexcept
-  {
-    static nostd::shared_ptr<LoggerProvider> provider(new NoopLoggerProvider);
-    return provider;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-  OPENTELEMETRY_DEPRECATED
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<EventLoggerProvider> &
-  GetEventProvider() noexcept
-  {
-    static nostd::shared_ptr<EventLoggerProvider> provider(new NoopEventLoggerProvider);
-    return provider;
-  }
-#endif
-
-  OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
-  {
-    static common::SpinLockMutex lock;
-    return lock;
-  }
-};
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/severity.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/severity.h
deleted file mode 100644
index f4d961615..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/logs/severity.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-/**
- * Severity Levels assigned to log events, based on Log Data Model,
- * with the addition of kInvalid (mapped to a severity number of 0).
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#field-severitynumber
- */
-enum class Severity : uint8_t
-{
-  kInvalid = 0,
-  kTrace   = 1,
-  kTrace2  = 2,
-  kTrace3  = 3,
-  kTrace4  = 4,
-  kDebug   = 5,
-  kDebug2  = 6,
-  kDebug3  = 7,
-  kDebug4  = 8,
-  kInfo    = 9,
-  kInfo2   = 10,
-  kInfo3   = 11,
-  kInfo4   = 12,
-  kWarn    = 13,
-  kWarn2   = 14,
-  kWarn3   = 15,
-  kWarn4   = 16,
-  kError   = 17,
-  kError2  = 18,
-  kError3  = 19,
-  kError4  = 20,
-  kFatal   = 21,
-  kFatal2  = 22,
-  kFatal3  = 23,
-  kFatal4  = 24
-};
-
-const uint8_t kMaxSeverity = 255;
-
-/**
- * Mapping of the severity enum above, to a severity text string (in all caps).
- * This severity text can be printed out by exporters. Capital letters follow the
- * spec naming convention.
- *
- * Included to follow the specification's recommendation to print both
- * severity number and text in each log record.
- */
-const nostd::string_view SeverityNumToText[25] = {
-    "INVALID", "TRACE",  "TRACE2", "TRACE3", "TRACE4", "DEBUG",  "DEBUG2", "DEBUG3", "DEBUG4",
-    "INFO",    "INFO2",  "INFO3",  "INFO4",  "WARN",   "WARN2",  "WARN3",  "WARN4",  "ERROR",
-    "ERROR2",  "ERROR3", "ERROR4", "FATAL",  "FATAL2", "FATAL3", "FATAL4"};
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/async_instruments.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/async_instruments.h
deleted file mode 100644
index f73eb2f51..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/async_instruments.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-using ObservableCallbackPtr = void (*)(ObserverResult, void *);
-
-class ObservableInstrument
-{
-public:
-  ObservableInstrument()          = default;
-  virtual ~ObservableInstrument() = default;
-
-  /**
-   * Sets up a function that will be called whenever a metric collection is initiated.
-   */
-  virtual void AddCallback(ObservableCallbackPtr, void *state) noexcept = 0;
-
-  /**
-   * Remove a function that was configured to be called whenever a metric collection is initiated.
-   */
-  virtual void RemoveCallback(ObservableCallbackPtr, void *state) noexcept = 0;
-};
-
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/meter.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/meter.h
deleted file mode 100644
index 59cfb8782..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/meter.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-template <typename T>
-class Counter;
-
-template <typename T>
-class Histogram;
-
-template <typename T>
-class UpDownCounter;
-
-template <typename T>
-class Gauge;
-
-class ObservableInstrument;
-
-/**
- * Handles instrument creation and provides a facility for batch recording.
- *
- * This class provides methods to create new metric instruments, record a
- * batch of values to a specified set of instruments, and collect
- * measurements from all instruments.
- *
- */
-class Meter
-{
-public:
-  virtual ~Meter() = default;
-
-  /**
-   * Creates a Counter with the passed characteristics and returns a unique_ptr to that Counter.
-   *
-   * @param name the name of the new Counter.
-   * @param description a brief description of what the Counter is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   * @return a shared pointer to the created Counter.
-   */
-
-  virtual nostd::unique_ptr<Counter<uint64_t>> CreateUInt64Counter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::unique_ptr<Counter<double>> CreateDoubleCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  /**
-   * Creates a Asynchronous (Observable) counter with the passed characteristics and returns a
-   * shared_ptr to that Observable Counter
-   *
-   * @param name the name of the new Observable Counter.
-   * @param description a brief description of what the Observable Counter is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   */
-  virtual nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  /**
-   * Creates a Histogram with the passed characteristics and returns a unique_ptr to that Histogram.
-   *
-   * @param name the name of the new Histogram.
-   * @param description a brief description of what the Histogram is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   * @return a shared pointer to the created Histogram.
-   */
-  virtual nostd::unique_ptr<Histogram<uint64_t>> CreateUInt64Histogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::unique_ptr<Histogram<double>> CreateDoubleHistogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * Creates a Gauge with the passed characteristics and returns a unique_ptr to that Gauge.
-   *
-   * @param name the name of the new Gauge.
-   * @param description a brief description of what the Gauge is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   * @return a unique pointer to the created Gauge.
-   */
-
-  virtual nostd::unique_ptr<Gauge<int64_t>> CreateInt64Gauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::unique_ptr<Gauge<double>> CreateDoubleGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-#endif
-
-  /**
-   * Creates a Asynchronous (Observable) Gauge with the passed characteristics and returns a
-   * shared_ptr to that Observable Gauge
-   *
-   * @param name the name of the new Observable Gauge.
-   * @param description a brief description of what the Observable Gauge is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   */
-  virtual nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  /**
-   * Creates an UpDownCounter with the passed characteristics and returns a unique_ptr to that
-   * UpDownCounter.
-   *
-   * @param name the name of the new UpDownCounter.
-   * @param description a brief description of what the UpDownCounter is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   * @return a shared pointer to the created UpDownCounter.
-   */
-  virtual nostd::unique_ptr<UpDownCounter<int64_t>> CreateInt64UpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::unique_ptr<UpDownCounter<double>> CreateDoubleUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  /**
-   * Creates a Asynchronous (Observable) UpDownCounter with the passed characteristics and returns
-   * a shared_ptr to that Observable UpDownCounter
-   *
-   * @param name the name of the new Observable UpDownCounter.
-   * @param description a brief description of what the Observable UpDownCounter is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   */
-  virtual nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-};
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/meter_provider.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/meter_provider.h
deleted file mode 100644
index fca960bb8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/meter_provider.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-class Meter;
-
-/**
- * Creates new Meter instances.
- */
-class MeterProvider
-{
-public:
-  virtual ~MeterProvider() = default;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Gets or creates a named Meter instance (ABI).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes (optional, may be nullptr)
-   */
-  virtual nostd::shared_ptr<Meter> GetMeter(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      const common::KeyValueIterable *attributes) noexcept = 0;
-
-  /**
-   * Gets or creates a named Meter instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version, optional
-   * @param[in] schema_url Instrumentation scope schema URL, optional
-   */
-  nostd::shared_ptr<Meter> GetMeter(nostd::string_view name,
-                                    nostd::string_view version    = "",
-                                    nostd::string_view schema_url = "")
-  {
-    return GetMeter(name, version, schema_url, nullptr);
-  }
-
-  /**
-   * Gets or creates a named Meter instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes
-   */
-  nostd::shared_ptr<Meter> GetMeter(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes)
-  {
-    /* Build a container from std::initializer_list. */
-    nostd::span<const std::pair<nostd::string_view, common::AttributeValue>> attributes_span{
-        attributes.begin(), attributes.end()};
-
-    /* Build a view on the container. */
-    common::KeyValueIterableView<
-        nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>>
-        iterable_attributes{attributes_span};
-
-    /* Add attributes using the view. */
-    return GetMeter(name, version, schema_url, &iterable_attributes);
-  }
-
-  /**
-   * Gets or creates a named Meter instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes container
-   */
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Meter> GetMeter(nostd::string_view name,
-                                    nostd::string_view version,
-                                    nostd::string_view schema_url,
-                                    const T &attributes)
-  {
-    /* Build a view on the container. */
-    common::KeyValueIterableView<T> iterable_attributes(attributes);
-
-    /* Add attributes using the view. */
-    return GetMeter(name, version, schema_url, &iterable_attributes);
-  }
-
-#else
-  /**
-   * Gets or creates a named Meter instance (ABI)
-   *
-   * @since ABI_VERSION 1
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version, optional
-   * @param[in] schema_url Instrumentation scope schema URL, optional
-   */
-  virtual nostd::shared_ptr<Meter> GetMeter(nostd::string_view name,
-                                            nostd::string_view version    = "",
-                                            nostd::string_view schema_url = "") noexcept = 0;
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * Remove a named Meter instance (ABI).
-   *
-   * This API is experimental, see
-   * https://github.com/open-telemetry/opentelemetry-specification/issues/2232
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version, optional
-   * @param[in] schema_url Instrumentation scope schema URL, optional
-   */
-  virtual void RemoveMeter(nostd::string_view name,
-                           nostd::string_view version    = "",
-                           nostd::string_view schema_url = "") noexcept = 0;
-#endif
-};
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/noop.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/noop.h
deleted file mode 100644
index 1d508b938..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/noop.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-template <class T>
-class NoopCounter : public Counter<T>
-{
-public:
-  NoopCounter(nostd::string_view /* name */,
-              nostd::string_view /* description */,
-              nostd::string_view /* unit */) noexcept
-  {}
-  void Add(T /* value */) noexcept override {}
-  void Add(T /* value */, const context::Context & /* context */) noexcept override {}
-  void Add(T /* value */, const common::KeyValueIterable & /* attributes */) noexcept override {}
-  void Add(T /* value */,
-           const common::KeyValueIterable & /* attributes */,
-           const context::Context & /* context */) noexcept override
-  {}
-};
-
-template <class T>
-class NoopHistogram : public Histogram<T>
-{
-public:
-  NoopHistogram(nostd::string_view /* name */,
-                nostd::string_view /* description */,
-                nostd::string_view /* unit */) noexcept
-  {}
-  void Record(T /* value */, const context::Context & /* context */) noexcept override {}
-  void Record(T /* value */,
-              const common::KeyValueIterable & /* attributes */,
-              const context::Context & /* context */) noexcept override
-  {}
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void Record(T /*value*/,
-              const opentelemetry::common::KeyValueIterable & /*attributes*/) noexcept override
-  {}
-
-  void Record(T /*value*/) noexcept override {}
-#endif
-};
-
-template <class T>
-class NoopUpDownCounter : public UpDownCounter<T>
-{
-public:
-  NoopUpDownCounter(nostd::string_view /* name */,
-                    nostd::string_view /* description */,
-                    nostd::string_view /* unit */) noexcept
-  {}
-  ~NoopUpDownCounter() override = default;
-  void Add(T /* value */) noexcept override {}
-  void Add(T /* value */, const context::Context & /* context */) noexcept override {}
-  void Add(T /* value */, const common::KeyValueIterable & /* attributes */) noexcept override {}
-  void Add(T /* value */,
-           const common::KeyValueIterable & /* attributes */,
-           const context::Context & /* context */) noexcept override
-  {}
-};
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-template <class T>
-class NoopGauge : public Gauge<T>
-{
-public:
-  NoopGauge(nostd::string_view /* name */,
-            nostd::string_view /* description */,
-            nostd::string_view /* unit */) noexcept
-  {}
-  ~NoopGauge() override = default;
-  void Record(T /* value */) noexcept override {}
-  void Record(T /* value */, const context::Context & /* context */) noexcept override {}
-  void Record(T /* value */, const common::KeyValueIterable & /* attributes */) noexcept override {}
-  void Record(T /* value */,
-              const common::KeyValueIterable & /* attributes */,
-              const context::Context & /* context */) noexcept override
-  {}
-};
-#endif
-
-class NoopObservableInstrument : public ObservableInstrument
-{
-public:
-  NoopObservableInstrument(nostd::string_view /* name */,
-                           nostd::string_view /* description */,
-                           nostd::string_view /* unit */) noexcept
-  {}
-
-  void AddCallback(ObservableCallbackPtr, void * /* state */) noexcept override {}
-  void RemoveCallback(ObservableCallbackPtr, void * /* state */) noexcept override {}
-};
-
-/**
- * No-op implementation of Meter.
- */
-class NoopMeter final : public Meter
-{
-public:
-  nostd::unique_ptr<Counter<uint64_t>> CreateUInt64Counter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<Counter<uint64_t>>{new NoopCounter<uint64_t>(name, description, unit)};
-  }
-
-  nostd::unique_ptr<Counter<double>> CreateDoubleCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<Counter<double>>{new NoopCounter<double>(name, description, unit)};
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::unique_ptr<Histogram<uint64_t>> CreateUInt64Histogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<Histogram<uint64_t>>{
-        new NoopHistogram<uint64_t>(name, description, unit)};
-  }
-
-  nostd::unique_ptr<Histogram<double>> CreateDoubleHistogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<Histogram<double>>{new NoopHistogram<double>(name, description, unit)};
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::unique_ptr<Gauge<int64_t>> CreateInt64Gauge(nostd::string_view name,
-                                                     nostd::string_view description = "",
-                                                     nostd::string_view unit = "") noexcept override
-  {
-    return nostd::unique_ptr<Gauge<int64_t>>{new NoopGauge<int64_t>(name, description, unit)};
-  }
-
-  nostd::unique_ptr<Gauge<double>> CreateDoubleGauge(nostd::string_view name,
-                                                     nostd::string_view description = "",
-                                                     nostd::string_view unit = "") noexcept override
-  {
-    return nostd::unique_ptr<Gauge<double>>{new NoopGauge<double>(name, description, unit)};
-  }
-#endif
-
-  nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::unique_ptr<UpDownCounter<int64_t>> CreateInt64UpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<UpDownCounter<int64_t>>{
-        new NoopUpDownCounter<int64_t>(name, description, unit)};
-  }
-
-  nostd::unique_ptr<UpDownCounter<double>> CreateDoubleUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<UpDownCounter<double>>{
-        new NoopUpDownCounter<double>(name, description, unit)};
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-};
-
-/**
- * No-op implementation of a MeterProvider.
- */
-class NoopMeterProvider final : public MeterProvider
-{
-public:
-  NoopMeterProvider() : meter_{nostd::shared_ptr<Meter>(new NoopMeter)} {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<Meter> GetMeter(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */,
-      const common::KeyValueIterable * /* attributes */) noexcept override
-  {
-    return meter_;
-  }
-#else
-  nostd::shared_ptr<Meter> GetMeter(nostd::string_view /* name */,
-                                    nostd::string_view /* version */,
-                                    nostd::string_view /* schema_url */) noexcept override
-  {
-    return meter_;
-  }
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void RemoveMeter(nostd::string_view /* name */,
-                   nostd::string_view /* version */,
-                   nostd::string_view /* schema_url */) noexcept override
-  {}
-#endif
-
-private:
-  nostd::shared_ptr<Meter> meter_;
-};
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/observer_result.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/observer_result.h
deleted file mode 100644
index 56c42bc20..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/observer_result.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-/**
- * ObserverResultT class is necessary for the callback recording asynchronous
- * instrument use.
- */
-template <class T>
-class ObserverResultT
-{
-
-public:
-  virtual ~ObserverResultT() = default;
-
-  virtual void Observe(T value) noexcept = 0;
-
-  virtual void Observe(T value, const common::KeyValueIterable &attributes) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Observe(T value, const U &attributes) noexcept
-  {
-    this->Observe(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  void Observe(T value,
-               std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                   attributes) noexcept
-  {
-    this->Observe(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                             attributes.begin(), attributes.end()});
-  }
-};
-
-using ObserverResult = nostd::variant<nostd::shared_ptr<ObserverResultT<int64_t>>,
-                                      nostd::shared_ptr<ObserverResultT<double>>>;
-
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/provider.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/provider.h
deleted file mode 100644
index 20a606a77..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/provider.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/noop.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-/**
- * Stores the singleton global MeterProvider.
- */
-class Provider
-{
-public:
-  /**
-   * Returns the singleton MeterProvider.
-   *
-   * By default, a no-op MeterProvider is returned. This will never return a
-   * nullptr MeterProvider.
-   */
-  static nostd::shared_ptr<MeterProvider> GetMeterProvider() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<MeterProvider>(GetProvider());
-  }
-
-  /**
-   * Changes the singleton MeterProvider.
-   */
-  static void SetMeterProvider(const nostd::shared_ptr<MeterProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetProvider() = tp;
-  }
-
-private:
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<MeterProvider> &GetProvider() noexcept
-  {
-    static nostd::shared_ptr<MeterProvider> provider(new NoopMeterProvider);
-    return provider;
-  }
-
-  OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
-  {
-    static common::SpinLockMutex lock;
-    return lock;
-  }
-};
-
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/sync_instruments.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/sync_instruments.h
deleted file mode 100644
index 9eaec3352..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/metrics/sync_instruments.h
+++ /dev/null
@@ -1,328 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-class SynchronousInstrument
-{
-public:
-  SynchronousInstrument()          = default;
-  virtual ~SynchronousInstrument() = default;
-};
-
-/* A Counter instrument that adds values. */
-template <class T>
-class Counter : public SynchronousInstrument
-{
-
-public:
-  /**
-   * Record a value
-   *
-   * @param value The increment amount. MUST be non-negative.
-   */
-  virtual void Add(T value) noexcept = 0;
-
-  /**
-   * Record a value
-   *
-   * @param value The increment amount. MUST be non-negative.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Add(T value, const context::Context &context) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The increment amount. MUST be non-negative.
-   * @param attributes A set of attributes to associate with the value.
-   */
-
-  virtual void Add(T value, const common::KeyValueIterable &attributes) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The increment amount. MUST be non-negative.
-   * @param attributes A set of attributes to associate with the value.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Add(T value,
-                   const common::KeyValueIterable &attributes,
-                   const context::Context &context) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Add(T value, const U &attributes) noexcept
-  {
-    this->Add(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Add(T value, const U &attributes, const context::Context &context) noexcept
-  {
-    this->Add(value, common::KeyValueIterableView<U>{attributes}, context);
-  }
-
-  void Add(T value,
-           std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-               attributes) noexcept
-  {
-    this->Add(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                         attributes.begin(), attributes.end()});
-  }
-
-  void Add(T value,
-           std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-           const context::Context &context) noexcept
-  {
-    this->Add(value,
-              nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                  attributes.begin(), attributes.end()},
-              context);
-  }
-};
-
-/** A histogram instrument that records values. */
-
-template <class T>
-class Histogram : public SynchronousInstrument
-{
-public:
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * @since ABI_VERSION 2
-   * Records a value.
-   *
-   * @param value The measurement value. MUST be non-negative.
-   */
-  virtual void Record(T value) noexcept = 0;
-
-  /**
-   * @since ABI_VERSION 2
-   * Records a value with a set of attributes.
-   *
-   * @param value The measurement value. MUST be non-negative.
-   * @param attribute A set of attributes to associate with the value.
-   */
-  virtual void Record(T value, const common::KeyValueIterable &attribute) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Record(T value, const U &attributes) noexcept
-  {
-    this->Record(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  void Record(T value,
-              std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                  attributes) noexcept
-  {
-    this->Record(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                            attributes.begin(), attributes.end()});
-  }
-#endif
-
-  /**
-   * Records a value.
-   *
-   * @param value The measurement value. MUST be non-negative.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Record(T value, const context::Context &context) noexcept = 0;
-
-  /**
-   * Records a value with a set of attributes.
-   *
-   * @param value The measurement value. MUST be non-negative.
-   * @param attributes A set of attributes to associate with the value..
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Record(T value,
-                      const common::KeyValueIterable &attributes,
-                      const context::Context &context) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Record(T value, const U &attributes, const context::Context &context) noexcept
-  {
-    this->Record(value, common::KeyValueIterableView<U>{attributes}, context);
-  }
-
-  void Record(
-      T value,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      const context::Context &context) noexcept
-  {
-    this->Record(value,
-                 nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                     attributes.begin(), attributes.end()},
-                 context);
-  }
-};
-
-/** An up-down-counter instrument that adds or reduce values. */
-
-template <class T>
-class UpDownCounter : public SynchronousInstrument
-{
-public:
-  /**
-   * Record a value.
-   *
-   * @param value The increment amount. May be positive, negative or zero.
-   */
-  virtual void Add(T value) noexcept = 0;
-
-  /**
-   * Record a value.
-   *
-   * @param value The increment amount. May be positive, negative or zero.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Add(T value, const context::Context &context) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The increment amount. May be positive, negative or zero.
-   * @param attributes A set of attributes to associate with the count.
-   */
-  virtual void Add(T value, const common::KeyValueIterable &attributes) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The increment amount. May be positive, negative or zero.
-   * @param attributes A set of attributes to associate with the count.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Add(T value,
-                   const common::KeyValueIterable &attributes,
-                   const context::Context &context) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Add(T value, const U &attributes) noexcept
-  {
-    this->Add(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Add(T value, const U &attributes, const context::Context &context) noexcept
-  {
-    this->Add(value, common::KeyValueIterableView<U>{attributes}, context);
-  }
-
-  void Add(T value,
-           std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-               attributes) noexcept
-  {
-    this->Add(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                         attributes.begin(), attributes.end()});
-  }
-
-  void Add(T value,
-           std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-           const context::Context &context) noexcept
-  {
-    this->Add(value,
-              nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                  attributes.begin(), attributes.end()},
-              context);
-  }
-};
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-/* A Gauge instrument that records values. */
-template <class T>
-class Gauge : public SynchronousInstrument
-{
-
-public:
-  /**
-   * Record a value
-   *
-   * @param value The measurement value. May be positive, negative or zero.
-   */
-  virtual void Record(T value) noexcept = 0;
-
-  /**
-   * Record a value
-   *
-   * @param value The measurement value. May be positive, negative or zero.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Record(T value, const context::Context &context) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The measurement value. May be positive, negative or zero.
-   * @param attributes A set of attributes to associate with the value.
-   */
-
-  virtual void Record(T value, const common::KeyValueIterable &attributes) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The measurement value. May be positive, negative or zero.
-   * @param attributes A set of attributes to associate with the value.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Record(T value,
-                      const common::KeyValueIterable &attributes,
-                      const context::Context &context) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Record(T value, const U &attributes) noexcept
-  {
-    this->Record(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Record(T value, const U &attributes, const context::Context &context) noexcept
-  {
-    this->Record(value, common::KeyValueIterableView<U>{attributes}, context);
-  }
-
-  void Record(T value,
-              std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                  attributes) noexcept
-  {
-    this->Record(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                            attributes.begin(), attributes.end()});
-  }
-
-  void Record(
-      T value,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      const context::Context &context) noexcept
-  {
-    this->Record(value,
-                 nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                     attributes.begin(), attributes.end()},
-                 context);
-  }
-};
-#endif
-
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/all.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/all.h
deleted file mode 100644
index deaf3ac6f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/all.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <bool... Bs>
-using all = std::is_same<integer_sequence<bool, true, Bs...>, integer_sequence<bool, Bs..., true>>;
-
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/decay.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/decay.h
deleted file mode 100644
index a6cb11124..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/decay.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <class T>
-using decay_t = typename std::decay<T>::type;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/dependent_type.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/dependent_type.h
deleted file mode 100644
index 5bba09ff8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/dependent_type.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <typename T, bool>
-struct dependent_type : T
-{};
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/functional.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/functional.h
deleted file mode 100644
index 0da58dd18..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/functional.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <utility>
-
-#include "opentelemetry/version.h"
-
-#define OPENTELEMETRY_RETURN(...)                        \
-  noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) \
-  {                                                      \
-    return __VA_ARGS__;                                  \
-  }
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-struct equal_to
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) == std::forward<Rhs>(rhs))
-};
-
-struct not_equal_to
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) != std::forward<Rhs>(rhs))
-};
-
-struct less
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) < std::forward<Rhs>(rhs))
-};
-
-struct greater
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) > std::forward<Rhs>(rhs))
-};
-
-struct less_equal
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) <= std::forward<Rhs>(rhs))
-};
-
-struct greater_equal
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) >= std::forward<Rhs>(rhs))
-};
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-
-#undef OPENTELEMETRY_RETURN
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/invoke.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/invoke.h
deleted file mode 100644
index 55a943ed1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/invoke.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-#include <utility>
-
-#include "opentelemetry/nostd/detail/decay.h"
-#include "opentelemetry/nostd/detail/void.h"
-#include "opentelemetry/version.h"
-
-#define OPENTELEMETRY_RETURN(...)                        \
-  noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) \
-  {                                                      \
-    return __VA_ARGS__;                                  \
-  }
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-
-template <typename T>
-struct is_reference_wrapper : std::false_type
-{};
-
-template <typename T>
-struct is_reference_wrapper<std::reference_wrapper<T>> : std::true_type
-{};
-
-template <bool, int>
-struct Invoke;
-
-template <>
-struct Invoke<true /* pmf */, 0 /* is_base_of */>
-{
-  template <typename R, typename T, typename Arg, typename... Args>
-  inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
-      OPENTELEMETRY_RETURN((std::forward<Arg>(arg).*pmf)(std::forward<Args>(args)...))
-};
-
-template <>
-struct Invoke<true /* pmf */, 1 /* is_reference_wrapper */>
-{
-  template <typename R, typename T, typename Arg, typename... Args>
-  inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
-      OPENTELEMETRY_RETURN((std::forward<Arg>(arg).get().*pmf)(std::forward<Args>(args)...))
-};
-
-template <>
-struct Invoke<true /* pmf */, 2 /* otherwise */>
-{
-  template <typename R, typename T, typename Arg, typename... Args>
-  inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
-      OPENTELEMETRY_RETURN(((*std::forward<Arg>(arg)).*pmf)(std::forward<Args>(args)...))
-};
-
-template <>
-struct Invoke<false /* pmo */, 0 /* is_base_of */>
-{
-  template <typename R, typename T, typename Arg>
-  inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-      OPENTELEMETRY_RETURN(std::forward<Arg>(arg).*pmo)
-};
-
-template <>
-struct Invoke<false /* pmo */, 1 /* is_reference_wrapper */>
-{
-  template <typename R, typename T, typename Arg>
-  inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-      OPENTELEMETRY_RETURN(std::forward<Arg>(arg).get().*pmo)
-};
-
-template <>
-struct Invoke<false /* pmo */, 2 /* otherwise */>
-{
-  template <typename R, typename T, typename Arg>
-  inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-      OPENTELEMETRY_RETURN((*std::forward<Arg>(arg)).*pmo)
-};
-
-template <typename R, typename T, typename Arg, typename... Args>
-inline constexpr auto invoke_impl(R T::*f, Arg &&arg, Args &&...args) OPENTELEMETRY_RETURN(
-    Invoke<std::is_function<R>::value,
-           (std::is_base_of<T, decay_t<Arg>>::value     ? 0
-            : is_reference_wrapper<decay_t<Arg>>::value ? 1
-                                                        : 2)>::invoke(f,
-                                                                      std::forward<Arg>(arg),
-                                                                      std::forward<Args>(args)...))
-
-#ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable : 4100)
-#endif
-    template <typename F, typename... Args>
-    inline constexpr auto invoke_impl(F &&f, Args &&...args)
-        OPENTELEMETRY_RETURN(std::forward<F>(f)(std::forward<Args>(args)...))
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-}  // namespace detail
-
-/* clang-format off */
-template <typename F, typename... Args>
-inline constexpr auto invoke(F &&f, Args &&... args)
-    OPENTELEMETRY_RETURN(detail::invoke_impl(std::forward<F>(f), std::forward<Args>(args)...))
-
-namespace detail
-/* clang-format on */
-{
-
-  template <typename Void, typename, typename...>
-  struct invoke_result
-  {};
-
-  template <typename F, typename... Args>
-  struct invoke_result<void_t<decltype(nostd::invoke(std::declval<F>(), std::declval<Args>()...))>,
-                       F, Args...>
-  {
-    using type = decltype(nostd::invoke(std::declval<F>(), std::declval<Args>()...));
-  };
-
-}  // namespace detail
-
-template <typename F, typename... Args>
-using invoke_result = detail::invoke_result<void, F, Args...>;
-
-template <typename F, typename... Args>
-using invoke_result_t = typename invoke_result<F, Args...>::type;
-
-namespace detail
-{
-
-template <typename Void, typename, typename...>
-struct is_invocable : std::false_type
-{};
-
-template <typename F, typename... Args>
-struct is_invocable<void_t<invoke_result_t<F, Args...>>, F, Args...> : std::true_type
-{};
-
-template <typename Void, typename, typename, typename...>
-struct is_invocable_r : std::false_type
-{};
-
-template <typename R, typename F, typename... Args>
-struct is_invocable_r<void_t<invoke_result_t<F, Args...>>, R, F, Args...>
-    : std::is_convertible<invoke_result_t<F, Args...>, R>
-{};
-
-}  // namespace detail
-
-template <typename F, typename... Args>
-using is_invocable = detail::is_invocable<void, F, Args...>;
-
-template <typename R, typename F, typename... Args>
-using is_invocable_r = detail::is_invocable_r<void, R, F, Args...>;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-
-#undef OPENTELEMETRY_RETURN
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/trait.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/trait.h
deleted file mode 100644
index 8f76fdec8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/trait.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-enum class Trait
-{
-  TriviallyAvailable,
-  Available,
-  Unavailable
-};
-
-template <typename T,
-          template <typename>
-          class IsTriviallyAvailable,
-          template <typename>
-          class IsAvailable>
-inline constexpr Trait trait()
-{
-  return IsTriviallyAvailable<T>::value ? Trait::TriviallyAvailable
-         : IsAvailable<T>::value        ? Trait::Available
-                                        : Trait::Unavailable;
-}
-
-inline constexpr Trait common_trait_impl(Trait result)
-{
-  return result;
-}
-
-template <typename... Traits>
-inline constexpr Trait common_trait_impl(Trait result, Trait t, Traits... ts)
-{
-  return static_cast<int>(t) > static_cast<int>(result) ? common_trait_impl(t, ts...)
-                                                        : common_trait_impl(result, ts...);
-}
-
-template <typename... Traits>
-inline constexpr Trait common_trait(Traits... ts)
-{
-  return common_trait_impl(Trait::TriviallyAvailable, ts...);
-}
-
-template <typename... Ts>
-struct traits
-{
-  static constexpr Trait copy_constructible_trait =
-      common_trait(trait<Ts, is_trivially_copy_constructible, std::is_copy_constructible>()...);
-
-  static constexpr Trait move_constructible_trait =
-      common_trait(trait<Ts, is_trivially_move_constructible, std::is_move_constructible>()...);
-
-  static constexpr Trait copy_assignable_trait =
-      common_trait(copy_constructible_trait,
-                   trait<Ts, is_trivially_copy_assignable, std::is_copy_assignable>()...);
-
-  static constexpr Trait move_assignable_trait =
-      common_trait(move_constructible_trait,
-                   trait<Ts, is_trivially_move_assignable, std::is_move_assignable>()...);
-
-  static constexpr Trait destructible_trait =
-      common_trait(trait<Ts, std::is_trivially_destructible, std::is_destructible>()...);
-};
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/type_pack_element.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/type_pack_element.h
deleted file mode 100644
index 280d24e94..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/type_pack_element.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstddef>
-#include <type_traits>
-
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <std::size_t N>
-using size_constant = std::integral_constant<std::size_t, N>;
-
-template <std::size_t I, typename T>
-struct indexed_type : size_constant<I>
-{
-  using type = T;
-};
-
-template <std::size_t I, typename... Ts>
-struct type_pack_element_impl
-{
-private:
-  template <typename>
-  struct set;
-
-  template <std::size_t... Is>
-  struct set<index_sequence<Is...>> : indexed_type<Is, Ts>...
-  {};
-
-  template <typename T>
-  inline static std::enable_if<true, T> impl(indexed_type<I, T>);
-
-  inline static std::enable_if<false> impl(...);
-
-public:
-  using type = decltype(impl(set<index_sequence_for<Ts...>>{}));
-};
-
-template <std::size_t I, typename... Ts>
-using type_pack_element = typename type_pack_element_impl<I, Ts...>::type;
-
-template <std::size_t I, typename... Ts>
-using type_pack_element_t = typename type_pack_element<I, Ts...>::type;
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/valueless.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/valueless.h
deleted file mode 100644
index 3b2ca7f7c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/valueless.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-struct valueless_t
-{};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_alternative.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_alternative.h
deleted file mode 100644
index cc0da9c8c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_alternative.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/nostd/detail/type_pack_element.h"
-#include "opentelemetry/nostd/detail/variant_fwd.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <std::size_t I, typename T>
-struct variant_alternative;
-
-template <std::size_t I, typename T>
-using variant_alternative_t = typename variant_alternative<I, T>::type;
-
-template <std::size_t I, typename T>
-struct variant_alternative<I, const T> : std::add_const<variant_alternative_t<I, T>>
-{};
-
-template <std::size_t I, typename T>
-struct variant_alternative<I, volatile T> : std::add_volatile<variant_alternative_t<I, T>>
-{};
-
-template <std::size_t I, typename T>
-struct variant_alternative<I, const volatile T> : std::add_cv<variant_alternative_t<I, T>>
-{};
-
-template <std::size_t I, typename... Ts>
-struct variant_alternative<I, variant<Ts...>>
-{
-  static_assert(I < sizeof...(Ts), "index out of bounds in `std::variant_alternative<>`");
-  using type = detail::type_pack_element_t<I, Ts...>;
-};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_fwd.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_fwd.h
deleted file mode 100644
index 6bae9659e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_fwd.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <typename... Ts>
-class variant;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_size.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_size.h
deleted file mode 100644
index d8986a222..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/variant_size.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/nostd/detail/variant_fwd.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <typename T>
-struct variant_size;
-
-template <typename T>
-struct variant_size<const T> : variant_size<T>
-{};
-
-template <typename T>
-struct variant_size<volatile T> : variant_size<T>
-{};
-
-template <typename T>
-struct variant_size<const volatile T> : variant_size<T>
-{};
-
-template <typename... Ts>
-struct variant_size<variant<Ts...>> : std::integral_constant<size_t, sizeof...(Ts)>
-{};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/void.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/void.h
deleted file mode 100644
index 1b4c3b4f7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/detail/void.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <class...>
-struct voider
-{
-  using type = void;
-};
-}  // namespace detail
-
-/**
- * Back port of std::void_t
- *
- * Note: voider workaround is required for gcc-4.8 to make SFINAE work
- */
-template <class... Tx>
-using void_t = typename detail::voider<Tx...>::type;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/function_ref.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/function_ref.h
deleted file mode 100644
index 6f0c2dd33..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/function_ref.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <iosfwd>
-#include <memory>  // IWYU pragma: keep
-#include <type_traits>
-#include <utility>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <class Sig>
-class function_ref;  // IWYU pragma: keep
-
-/**
- * Non-owning function reference that can be used as a more performant
- * replacement for std::function when ownership sematics aren't needed.
- *
- * See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0792r0.html
- *
- * Based off of https://stackoverflow.com/a/39087660/4447365
- */
-template <class R, class... Args>
-class function_ref<R(Args...)>
-{
-  void *callable_                = nullptr;
-  R (*invoker_)(void *, Args...) = nullptr;
-
-  template <class F>
-  using FunctionPointer = decltype(std::addressof(std::declval<F &>()));
-
-  template <class F>
-  void BindTo(F &f) noexcept
-  {
-    callable_ = static_cast<void *>(std::addressof(f));
-    invoker_  = [](void *callable, Args... args) -> R {
-      return (*static_cast<FunctionPointer<F>>(callable))(std::forward<Args>(args)...);
-    };
-  }
-
-  template <class R_in, class... Args_in>
-  void BindTo(R_in (*f)(Args_in...)) noexcept
-  {
-    using F = decltype(f);
-    if (f == nullptr)
-    {
-      return BindTo(nullptr);
-    }
-    callable_ = reinterpret_cast<void *>(f);
-    invoker_  = [](void *callable, Args... args) -> R {
-      return (F(callable))(std::forward<Args>(args)...);
-    };
-  }
-
-  void BindTo(std::nullptr_t) noexcept
-  {
-    callable_ = nullptr;
-    invoker_  = nullptr;
-  }
-
-public:
-  template <
-      class F,
-      typename std::enable_if<!std::is_same<function_ref, typename std::decay<F>::type>::value,
-                              int>::type = 0,
-      typename std::enable_if<
-#if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && (_MSVC_LANG > 201402))
-          // std::result_of deprecated in C++17, removed in C++20
-          std::is_convertible<typename std::invoke_result<F, Args...>::type, R>::value,
-#else
-          // std::result_of since C++11
-          std::is_convertible<typename std::result_of<F &(Args...)>::type, R>::value,
-#endif
-          int>::type = 0>
-  function_ref(F &&f)
-  {
-    BindTo(f);  // not forward
-  }
-
-  function_ref(std::nullptr_t) {}
-
-  function_ref(const function_ref &) noexcept = default;
-  function_ref(function_ref &&) noexcept      = default;
-
-  R operator()(Args... args) const { return invoker_(callable_, std::forward<Args>(args)...); }
-
-  explicit operator bool() const { return invoker_; }
-};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/.clang-format b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/.clang-format
deleted file mode 100644
index 001170f7e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/.clang-format
+++ /dev/null
@@ -1,3 +0,0 @@
-# Disable formatting for Google Abseil library snapshot
-DisableFormat: true
-SortIncludes: false
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/README.md b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/README.md
deleted file mode 100644
index 5dd661971..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Notes on Abseil Variant implementation
-
-This is a snapshot of Abseil Variant
-`absl::OTABSL_OPTION_NAMESPACE_NAME::variant` from Abseil `v2020-03-03#8`.
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/attributes.h
deleted file mode 100644
index 72901a84c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/attributes.h
+++ /dev/null
@@ -1,621 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This header file defines macros for declaring attributes for functions,
-// types, and variables.
-//
-// These macros are used within Abseil and allow the compiler to optimize, where
-// applicable, certain function calls.
-//
-// This file is used for both C and C++!
-//
-// Most macros here are exposing GCC or Clang features, and are stubbed out for
-// other compilers.
-//
-// GCC attributes documentation:
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Function-Attributes.html
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Variable-Attributes.html
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Type-Attributes.html
-//
-// Most attributes in this file are already supported by GCC 4.7. However, some
-// of them are not supported in older version of Clang. Thus, we check
-// `__has_attribute()` first. If the check fails, we check if we are on GCC and
-// assume the attribute exists on GCC (which is verified on GCC 4.7).
-//
-// -----------------------------------------------------------------------------
-// Sanitizer Attributes
-// -----------------------------------------------------------------------------
-//
-// Sanitizer-related attributes are not "defined" in this file (and indeed
-// are not defined as such in any file). To utilize the following
-// sanitizer-related attributes within your builds, define the following macros
-// within your build using a `-D` flag, along with the given value for
-// `-fsanitize`:
-//
-//   * `ADDRESS_SANITIZER` + `-fsanitize=address` (Clang, GCC 4.8)
-//   * `MEMORY_SANITIZER` + `-fsanitize=memory` (Clang-only)
-//   * `THREAD_SANITIZER + `-fsanitize=thread` (Clang, GCC 4.8+)
-//   * `UNDEFINED_BEHAVIOR_SANITIZER` + `-fsanitize=undefined` (Clang, GCC 4.9+)
-//   * `CONTROL_FLOW_INTEGRITY` + -fsanitize=cfi (Clang-only)
-//
-// Example:
-//
-//   // Enable branches in the Abseil code that are tagged for ASan:
-//   $ bazel build --copt=-DADDRESS_SANITIZER --copt=-fsanitize=address
-//     --linkopt=-fsanitize=address *target*
-//
-// Since these macro names are only supported by GCC and Clang, we only check
-// for `__GNUC__` (GCC or Clang) and the above macros.
-#ifndef OTABSL_BASE_ATTRIBUTES_H_
-#define OTABSL_BASE_ATTRIBUTES_H_
-
-// OTABSL_HAVE_ATTRIBUTE
-//
-// A function-like feature checking macro that is a wrapper around
-// `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
-// nonzero constant integer if the attribute is supported or 0 if not.
-//
-// It evaluates to zero if `__has_attribute` is not defined by the compiler.
-//
-// GCC: https://gcc.gnu.org/gcc-5/changes.html
-// Clang: https://clang.llvm.org/docs/LanguageExtensions.html
-#ifdef __has_attribute
-#define OTABSL_HAVE_ATTRIBUTE(x) __has_attribute(x)
-#else
-#define OTABSL_HAVE_ATTRIBUTE(x) 0
-#endif
-
-// OTABSL_HAVE_CPP_ATTRIBUTE
-//
-// A function-like feature checking macro that accepts C++11 style attributes.
-// It's a wrapper around `__has_cpp_attribute`, defined by ISO C++ SD-6
-// (https://en.cppreference.com/w/cpp/experimental/feature_test). If we don't
-// find `__has_cpp_attribute`, will evaluate to 0.
-#if defined(__cplusplus) && defined(__has_cpp_attribute)
-// NOTE: requiring __cplusplus above should not be necessary, but
-// works around https://bugs.llvm.org/show_bug.cgi?id=23435.
-#define OTABSL_HAVE_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-#define OTABSL_HAVE_CPP_ATTRIBUTE(x) 0
-#endif
-
-// -----------------------------------------------------------------------------
-// Function Attributes
-// -----------------------------------------------------------------------------
-//
-// GCC: https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
-// Clang: https://clang.llvm.org/docs/AttributeReference.html
-
-// OTABSL_PRINTF_ATTRIBUTE
-// OTABSL_SCANF_ATTRIBUTE
-//
-// Tells the compiler to perform `printf` format string checking if the
-// compiler supports it; see the 'format' attribute in
-// <https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Function-Attributes.html>.
-//
-// Note: As the GCC manual states, "[s]ince non-static C++ methods
-// have an implicit 'this' argument, the arguments of such methods
-// should be counted from two, not one."
-#if OTABSL_HAVE_ATTRIBUTE(format) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_PRINTF_ATTRIBUTE(string_index, first_to_check) \
-  __attribute__((__format__(__printf__, string_index, first_to_check)))
-#define OTABSL_SCANF_ATTRIBUTE(string_index, first_to_check) \
-  __attribute__((__format__(__scanf__, string_index, first_to_check)))
-#else
-#define OTABSL_PRINTF_ATTRIBUTE(string_index, first_to_check)
-#define OTABSL_SCANF_ATTRIBUTE(string_index, first_to_check)
-#endif
-
-// OTABSL_ATTRIBUTE_ALWAYS_INLINE
-// OTABSL_ATTRIBUTE_NOINLINE
-//
-// Forces functions to either inline or not inline. Introduced in gcc 3.1.
-#if OTABSL_HAVE_ATTRIBUTE(always_inline) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_ALWAYS_INLINE __attribute__((always_inline))
-#define OTABSL_HAVE_ATTRIBUTE_ALWAYS_INLINE 1
-#else
-#define OTABSL_ATTRIBUTE_ALWAYS_INLINE
-#endif
-
-#if OTABSL_HAVE_ATTRIBUTE(noinline) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_NOINLINE __attribute__((noinline))
-#define OTABSL_HAVE_ATTRIBUTE_NOINLINE 1
-#else
-#define OTABSL_ATTRIBUTE_NOINLINE
-#endif
-
-// OTABSL_ATTRIBUTE_NO_TAIL_CALL
-//
-// Prevents the compiler from optimizing away stack frames for functions which
-// end in a call to another function.
-#if OTABSL_HAVE_ATTRIBUTE(disable_tail_calls)
-#define OTABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 1
-#define OTABSL_ATTRIBUTE_NO_TAIL_CALL __attribute__((disable_tail_calls))
-#elif defined(__GNUC__) && !defined(__clang__)
-#define OTABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 1
-#define OTABSL_ATTRIBUTE_NO_TAIL_CALL \
-  __attribute__((optimize("no-optimize-sibling-calls")))
-#else
-#define OTABSL_ATTRIBUTE_NO_TAIL_CALL
-#define OTABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 0
-#endif
-
-// OTABSL_ATTRIBUTE_WEAK
-//
-// Tags a function as weak for the purposes of compilation and linking.
-// Weak attributes currently do not work properly in LLVM's Windows backend,
-// so disable them there. See https://bugs.llvm.org/show_bug.cgi?id=37598
-// for further information.
-// The MinGW compiler doesn't complain about the weak attribute until the link
-// step, presumably because Windows doesn't use ELF binaries.
-#if (OTABSL_HAVE_ATTRIBUTE(weak) ||                   \
-     (defined(__GNUC__) && !defined(__clang__))) && \
-    !(defined(__llvm__) && defined(_WIN32)) && !defined(__MINGW32__)
-#undef OTABSL_ATTRIBUTE_WEAK
-#define OTABSL_ATTRIBUTE_WEAK __attribute__((weak))
-#define OTABSL_HAVE_ATTRIBUTE_WEAK 1
-#else
-#define OTABSL_ATTRIBUTE_WEAK
-#define OTABSL_HAVE_ATTRIBUTE_WEAK 0
-#endif
-
-// OTABSL_ATTRIBUTE_NONNULL
-//
-// Tells the compiler either (a) that a particular function parameter
-// should be a non-null pointer, or (b) that all pointer arguments should
-// be non-null.
-//
-// Note: As the GCC manual states, "[s]ince non-static C++ methods
-// have an implicit 'this' argument, the arguments of such methods
-// should be counted from two, not one."
-//
-// Args are indexed starting at 1.
-//
-// For non-static class member functions, the implicit `this` argument
-// is arg 1, and the first explicit argument is arg 2. For static class member
-// functions, there is no implicit `this`, and the first explicit argument is
-// arg 1.
-//
-// Example:
-//
-//   /* arg_a cannot be null, but arg_b can */
-//   void Function(void* arg_a, void* arg_b) OTABSL_ATTRIBUTE_NONNULL(1);
-//
-//   class C {
-//     /* arg_a cannot be null, but arg_b can */
-//     void Method(void* arg_a, void* arg_b) OTABSL_ATTRIBUTE_NONNULL(2);
-//
-//     /* arg_a cannot be null, but arg_b can */
-//     static void StaticMethod(void* arg_a, void* arg_b)
-//     OTABSL_ATTRIBUTE_NONNULL(1);
-//   };
-//
-// If no arguments are provided, then all pointer arguments should be non-null.
-//
-//  /* No pointer arguments may be null. */
-//  void Function(void* arg_a, void* arg_b, int arg_c) OTABSL_ATTRIBUTE_NONNULL();
-//
-// NOTE: The GCC nonnull attribute actually accepts a list of arguments, but
-// OTABSL_ATTRIBUTE_NONNULL does not.
-#if OTABSL_HAVE_ATTRIBUTE(nonnull) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_NONNULL(arg_index) __attribute__((nonnull(arg_index)))
-#else
-#define OTABSL_ATTRIBUTE_NONNULL(...)
-#endif
-
-// OTABSL_ATTRIBUTE_NORETURN
-//
-// Tells the compiler that a given function never returns.
-#if OTABSL_HAVE_ATTRIBUTE(noreturn) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_NORETURN __attribute__((noreturn))
-#elif defined(_MSC_VER)
-#define OTABSL_ATTRIBUTE_NORETURN __declspec(noreturn)
-#else
-#define OTABSL_ATTRIBUTE_NORETURN
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS
-//
-// Tells the AddressSanitizer (or other memory testing tools) to ignore a given
-// function. Useful for cases when a function reads random locations on stack,
-// calls _exit from a cloned subprocess, deliberately accesses buffer
-// out of bounds or does other scary things with memory.
-// NOTE: GCC supports AddressSanitizer(asan) since 4.8.
-// https://gcc.gnu.org/gcc-4.8/changes.html
-#if defined(__GNUC__)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_MEMORY
-//
-// Tells the  MemorySanitizer to relax the handling of a given function. All
-// "Use of uninitialized value" warnings from such functions will be suppressed,
-// and all values loaded from memory will be considered fully initialized.
-// This attribute is similar to the ADDRESS_SANITIZER attribute above, but deals
-// with initialized-ness rather than addressability issues.
-// NOTE: MemorySanitizer(msan) is supported by Clang but not GCC.
-#if defined(__clang__)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_MEMORY __attribute__((no_sanitize_memory))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_MEMORY
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_THREAD
-//
-// Tells the ThreadSanitizer to not instrument a given function.
-// NOTE: GCC supports ThreadSanitizer(tsan) since 4.8.
-// https://gcc.gnu.org/gcc-4.8/changes.html
-#if defined(__GNUC__)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_THREAD __attribute__((no_sanitize_thread))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_THREAD
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED
-//
-// Tells the UndefinedSanitizer to ignore a given function. Useful for cases
-// where certain behavior (eg. division by zero) is being used intentionally.
-// NOTE: GCC supports UndefinedBehaviorSanitizer(ubsan) since 4.9.
-// https://gcc.gnu.org/gcc-4.9/changes.html
-#if defined(__GNUC__) && \
-    (defined(UNDEFINED_BEHAVIOR_SANITIZER) || defined(ADDRESS_SANITIZER))
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED \
-  __attribute__((no_sanitize("undefined")))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_CFI
-//
-// Tells the ControlFlowIntegrity sanitizer to not instrument a given function.
-// See https://clang.llvm.org/docs/ControlFlowIntegrity.html for details.
-#if defined(__GNUC__) && defined(CONTROL_FLOW_INTEGRITY)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_CFI __attribute__((no_sanitize("cfi")))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_CFI
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK
-//
-// Tells the SafeStack to not instrument a given function.
-// See https://clang.llvm.org/docs/SafeStack.html for details.
-#if defined(__GNUC__) && defined(SAFESTACK_SANITIZER)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK \
-  __attribute__((no_sanitize("safe-stack")))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK
-#endif
-
-// OTABSL_ATTRIBUTE_RETURNS_NONNULL
-//
-// Tells the compiler that a particular function never returns a null pointer.
-#if OTABSL_HAVE_ATTRIBUTE(returns_nonnull) || \
-    (defined(__GNUC__) && \
-     (__GNUC__ > 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && \
-     !defined(__clang__))
-#define OTABSL_ATTRIBUTE_RETURNS_NONNULL __attribute__((returns_nonnull))
-#else
-#define OTABSL_ATTRIBUTE_RETURNS_NONNULL
-#endif
-
-// OTABSL_HAVE_ATTRIBUTE_SECTION
-//
-// Indicates whether labeled sections are supported. Weak symbol support is
-// a prerequisite. Labeled sections are not supported on Darwin/iOS.
-#ifdef OTABSL_HAVE_ATTRIBUTE_SECTION
-#error OTABSL_HAVE_ATTRIBUTE_SECTION cannot be directly set
-#elif (OTABSL_HAVE_ATTRIBUTE(section) ||                \
-       (defined(__GNUC__) && !defined(__clang__))) && \
-    !defined(__APPLE__) && OTABSL_HAVE_ATTRIBUTE_WEAK
-#define OTABSL_HAVE_ATTRIBUTE_SECTION 1
-
-// OTABSL_ATTRIBUTE_SECTION
-//
-// Tells the compiler/linker to put a given function into a section and define
-// `__start_ ## name` and `__stop_ ## name` symbols to bracket the section.
-// This functionality is supported by GNU linker.  Any function annotated with
-// `OTABSL_ATTRIBUTE_SECTION` must not be inlined, or it will be placed into
-// whatever section its caller is placed into.
-//
-#ifndef OTABSL_ATTRIBUTE_SECTION
-#define OTABSL_ATTRIBUTE_SECTION(name) \
-  __attribute__((section(#name))) __attribute__((noinline))
-#endif
-
-
-// OTABSL_ATTRIBUTE_SECTION_VARIABLE
-//
-// Tells the compiler/linker to put a given variable into a section and define
-// `__start_ ## name` and `__stop_ ## name` symbols to bracket the section.
-// This functionality is supported by GNU linker.
-#ifndef OTABSL_ATTRIBUTE_SECTION_VARIABLE
-#define OTABSL_ATTRIBUTE_SECTION_VARIABLE(name) __attribute__((section(#name)))
-#endif
-
-// OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS
-//
-// A weak section declaration to be used as a global declaration
-// for OTABSL_ATTRIBUTE_SECTION_START|STOP(name) to compile and link
-// even without functions with OTABSL_ATTRIBUTE_SECTION(name).
-// OTABSL_DEFINE_ATTRIBUTE_SECTION should be in the exactly one file; it's
-// a no-op on ELF but not on Mach-O.
-//
-#ifndef OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS
-#define OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name) \
-  extern char __start_##name[] OTABSL_ATTRIBUTE_WEAK;    \
-  extern char __stop_##name[] OTABSL_ATTRIBUTE_WEAK
-#endif
-#ifndef OTABSL_DEFINE_ATTRIBUTE_SECTION_VARS
-#define OTABSL_INIT_ATTRIBUTE_SECTION_VARS(name)
-#define OTABSL_DEFINE_ATTRIBUTE_SECTION_VARS(name)
-#endif
-
-// OTABSL_ATTRIBUTE_SECTION_START
-//
-// Returns `void*` pointers to start/end of a section of code with
-// functions having OTABSL_ATTRIBUTE_SECTION(name).
-// Returns 0 if no such functions exist.
-// One must OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name) for this to compile and
-// link.
-//
-#define OTABSL_ATTRIBUTE_SECTION_START(name) \
-  (reinterpret_cast<void *>(__start_##name))
-#define OTABSL_ATTRIBUTE_SECTION_STOP(name) \
-  (reinterpret_cast<void *>(__stop_##name))
-
-#else  // !OTABSL_HAVE_ATTRIBUTE_SECTION
-
-#define OTABSL_HAVE_ATTRIBUTE_SECTION 0
-
-// provide dummy definitions
-#define OTABSL_ATTRIBUTE_SECTION(name)
-#define OTABSL_ATTRIBUTE_SECTION_VARIABLE(name)
-#define OTABSL_INIT_ATTRIBUTE_SECTION_VARS(name)
-#define OTABSL_DEFINE_ATTRIBUTE_SECTION_VARS(name)
-#define OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name)
-#define OTABSL_ATTRIBUTE_SECTION_START(name) (reinterpret_cast<void *>(0))
-#define OTABSL_ATTRIBUTE_SECTION_STOP(name) (reinterpret_cast<void *>(0))
-
-#endif  // OTABSL_ATTRIBUTE_SECTION
-
-// OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-//
-// Support for aligning the stack on 32-bit x86.
-#if OTABSL_HAVE_ATTRIBUTE(force_align_arg_pointer) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#if defined(__i386__)
-#define OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC \
-  __attribute__((force_align_arg_pointer))
-#define OTABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#elif defined(__x86_64__)
-#define OTABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (1)
-#define OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#else  // !__i386__ && !__x86_64
-#define OTABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#define OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#endif  // __i386__
-#else
-#define OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#define OTABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#endif
-
-// OTABSL_MUST_USE_RESULT
-//
-// Tells the compiler to warn about unused results.
-//
-// When annotating a function, it must appear as the first part of the
-// declaration or definition. The compiler will warn if the return value from
-// such a function is unused:
-//
-//   OTABSL_MUST_USE_RESULT Sprocket* AllocateSprocket();
-//   AllocateSprocket();  // Triggers a warning.
-//
-// When annotating a class, it is equivalent to annotating every function which
-// returns an instance.
-//
-//   class OTABSL_MUST_USE_RESULT Sprocket {};
-//   Sprocket();  // Triggers a warning.
-//
-//   Sprocket MakeSprocket();
-//   MakeSprocket();  // Triggers a warning.
-//
-// Note that references and pointers are not instances:
-//
-//   Sprocket* SprocketPointer();
-//   SprocketPointer();  // Does *not* trigger a warning.
-//
-// OTABSL_MUST_USE_RESULT allows using cast-to-void to suppress the unused result
-// warning. For that, warn_unused_result is used only for clang but not for gcc.
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425
-//
-// Note: past advice was to place the macro after the argument list.
-#if OTABSL_HAVE_ATTRIBUTE(nodiscard)
-#define OTABSL_MUST_USE_RESULT [[nodiscard]]
-#elif defined(__clang__) && OTABSL_HAVE_ATTRIBUTE(warn_unused_result)
-#define OTABSL_MUST_USE_RESULT __attribute__((warn_unused_result))
-#else
-#define OTABSL_MUST_USE_RESULT
-#endif
-
-// OTABSL_ATTRIBUTE_HOT, OTABSL_ATTRIBUTE_COLD
-//
-// Tells GCC that a function is hot or cold. GCC can use this information to
-// improve static analysis, i.e. a conditional branch to a cold function
-// is likely to be not-taken.
-// This annotation is used for function declarations.
-//
-// Example:
-//
-//   int foo() OTABSL_ATTRIBUTE_HOT;
-#if OTABSL_HAVE_ATTRIBUTE(hot) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_HOT __attribute__((hot))
-#else
-#define OTABSL_ATTRIBUTE_HOT
-#endif
-
-#if OTABSL_HAVE_ATTRIBUTE(cold) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_COLD __attribute__((cold))
-#else
-#define OTABSL_ATTRIBUTE_COLD
-#endif
-
-// OTABSL_XRAY_ALWAYS_INSTRUMENT, OTABSL_XRAY_NEVER_INSTRUMENT, OTABSL_XRAY_LOG_ARGS
-//
-// We define the OTABSL_XRAY_ALWAYS_INSTRUMENT and OTABSL_XRAY_NEVER_INSTRUMENT
-// macro used as an attribute to mark functions that must always or never be
-// instrumented by XRay. Currently, this is only supported in Clang/LLVM.
-//
-// For reference on the LLVM XRay instrumentation, see
-// http://llvm.org/docs/XRay.html.
-//
-// A function with the XRAY_ALWAYS_INSTRUMENT macro attribute in its declaration
-// will always get the XRay instrumentation sleds. These sleds may introduce
-// some binary size and runtime overhead and must be used sparingly.
-//
-// These attributes only take effect when the following conditions are met:
-//
-//   * The file/target is built in at least C++11 mode, with a Clang compiler
-//     that supports XRay attributes.
-//   * The file/target is built with the -fxray-instrument flag set for the
-//     Clang/LLVM compiler.
-//   * The function is defined in the translation unit (the compiler honors the
-//     attribute in either the definition or the declaration, and must match).
-//
-// There are cases when, even when building with XRay instrumentation, users
-// might want to control specifically which functions are instrumented for a
-// particular build using special-case lists provided to the compiler. These
-// special case lists are provided to Clang via the
-// -fxray-always-instrument=... and -fxray-never-instrument=... flags. The
-// attributes in source take precedence over these special-case lists.
-//
-// To disable the XRay attributes at build-time, users may define
-// OTABSL_NO_XRAY_ATTRIBUTES. Do NOT define OTABSL_NO_XRAY_ATTRIBUTES on specific
-// packages/targets, as this may lead to conflicting definitions of functions at
-// link-time.
-//
-#if OTABSL_HAVE_CPP_ATTRIBUTE(clang::xray_always_instrument) && \
-    !defined(OTABSL_NO_XRAY_ATTRIBUTES)
-#define OTABSL_XRAY_ALWAYS_INSTRUMENT [[clang::xray_always_instrument]]
-#define OTABSL_XRAY_NEVER_INSTRUMENT [[clang::xray_never_instrument]]
-#if OTABSL_HAVE_CPP_ATTRIBUTE(clang::xray_log_args)
-#define OTABSL_XRAY_LOG_ARGS(N) \
-    [[clang::xray_always_instrument, clang::xray_log_args(N)]]
-#else
-#define OTABSL_XRAY_LOG_ARGS(N) [[clang::xray_always_instrument]]
-#endif
-#else
-#define OTABSL_XRAY_ALWAYS_INSTRUMENT
-#define OTABSL_XRAY_NEVER_INSTRUMENT
-#define OTABSL_XRAY_LOG_ARGS(N)
-#endif
-
-// OTABSL_ATTRIBUTE_REINITIALIZES
-//
-// Indicates that a member function reinitializes the entire object to a known
-// state, independent of the previous state of the object.
-//
-// The clang-tidy check bugprone-use-after-move allows member functions marked
-// with this attribute to be called on objects that have been moved from;
-// without the attribute, this would result in a use-after-move warning.
-#if OTABSL_HAVE_CPP_ATTRIBUTE(clang::reinitializes)
-#define OTABSL_ATTRIBUTE_REINITIALIZES [[clang::reinitializes]]
-#else
-#define OTABSL_ATTRIBUTE_REINITIALIZES
-#endif
-
-// -----------------------------------------------------------------------------
-// Variable Attributes
-// -----------------------------------------------------------------------------
-
-// OTABSL_ATTRIBUTE_UNUSED
-//
-// Prevents the compiler from complaining about variables that appear unused.
-#if OTABSL_HAVE_ATTRIBUTE(unused) || (defined(__GNUC__) && !defined(__clang__))
-#undef OTABSL_ATTRIBUTE_UNUSED
-#define OTABSL_ATTRIBUTE_UNUSED __attribute__((__unused__))
-#else
-#define OTABSL_ATTRIBUTE_UNUSED
-#endif
-
-// OTABSL_ATTRIBUTE_INITIAL_EXEC
-//
-// Tells the compiler to use "initial-exec" mode for a thread-local variable.
-// See http://people.redhat.com/drepper/tls.pdf for the gory details.
-#if OTABSL_HAVE_ATTRIBUTE(tls_model) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_INITIAL_EXEC __attribute__((tls_model("initial-exec")))
-#else
-#define OTABSL_ATTRIBUTE_INITIAL_EXEC
-#endif
-
-// OTABSL_ATTRIBUTE_PACKED
-//
-// Instructs the compiler not to use natural alignment for a tagged data
-// structure, but instead to reduce its alignment to 1. This attribute can
-// either be applied to members of a structure or to a structure in its
-// entirety. Applying this attribute (judiciously) to a structure in its
-// entirety to optimize the memory footprint of very commonly-used structs is
-// fine. Do not apply this attribute to a structure in its entirety if the
-// purpose is to control the offsets of the members in the structure. Instead,
-// apply this attribute only to structure members that need it.
-//
-// When applying OTABSL_ATTRIBUTE_PACKED only to specific structure members the
-// natural alignment of structure members not annotated is preserved. Aligned
-// member accesses are faster than non-aligned member accesses even if the
-// targeted microprocessor supports non-aligned accesses.
-#if OTABSL_HAVE_ATTRIBUTE(packed) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_PACKED __attribute__((__packed__))
-#else
-#define OTABSL_ATTRIBUTE_PACKED
-#endif
-
-// OTABSL_ATTRIBUTE_FUNC_ALIGN
-//
-// Tells the compiler to align the function start at least to certain
-// alignment boundary
-#if OTABSL_HAVE_ATTRIBUTE(aligned) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_FUNC_ALIGN(bytes) __attribute__((aligned(bytes)))
-#else
-#define OTABSL_ATTRIBUTE_FUNC_ALIGN(bytes)
-#endif
-
-// OTABSL_CONST_INIT
-//
-// A variable declaration annotated with the `OTABSL_CONST_INIT` attribute will
-// not compile (on supported platforms) unless the variable has a constant
-// initializer. This is useful for variables with static and thread storage
-// duration, because it guarantees that they will not suffer from the so-called
-// "static init order fiasco".  Prefer to put this attribute on the most visible
-// declaration of the variable, if there's more than one, because code that
-// accesses the variable can then use the attribute for optimization.
-//
-// Example:
-//
-//   class MyClass {
-//    public:
-//     OTABSL_CONST_INIT static MyType my_var;
-//   };
-//
-//   MyType MyClass::my_var = MakeMyType(...);
-//
-// Note that this attribute is redundant if the variable is declared constexpr.
-#if OTABSL_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
-#define OTABSL_CONST_INIT [[clang::require_constant_initialization]]
-#else
-#define OTABSL_CONST_INIT
-#endif  // OTABSL_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
-
-#endif  // OTABSL_BASE_ATTRIBUTES_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/config.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/config.h
deleted file mode 100644
index e0836b9b3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/config.h
+++ /dev/null
@@ -1,671 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: config.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines a set of macros for checking the presence of
-// important compiler and platform features. Such macros can be used to
-// produce portable code by parameterizing compilation based on the presence or
-// lack of a given feature.
-//
-// We define a "feature" as some interface we wish to program to: for example,
-// a library function or system call. A value of `1` indicates support for
-// that feature; any other value indicates the feature support is undefined.
-//
-// Example:
-//
-// Suppose a programmer wants to write a program that uses the 'mmap()' system
-// call. The Abseil macro for that feature (`OTABSL_HAVE_MMAP`) allows you to
-// selectively include the `mmap.h` header and bracket code using that feature
-// in the macro:
-//
-//   #include "absl/base/config.h"
-//
-//   #ifdef OTABSL_HAVE_MMAP
-//   #include "sys/mman.h"
-//   #endif  //OTABSL_HAVE_MMAP
-//
-//   ...
-//   #ifdef OTABSL_HAVE_MMAP
-//   void *ptr = mmap(...);
-//   ...
-//   #endif  // OTABSL_HAVE_MMAP
-
-#ifndef OTABSL_BASE_CONFIG_H_
-#define OTABSL_BASE_CONFIG_H_
-
-// Included for the __GLIBC__ macro (or similar macros on other systems).
-#include <limits.h>
-
-#ifdef __cplusplus
-// Included for __GLIBCXX__, _LIBCPP_VERSION
-#include <cstddef>
-#endif  // __cplusplus
-
-#if defined(__APPLE__)
-// Included for TARGET_OS_IPHONE, __IPHONE_OS_VERSION_MIN_REQUIRED,
-// __IPHONE_8_0.
-#include <Availability.h>
-#include <TargetConditionals.h>
-#endif
-
-#include "options.h"
-#include "policy_checks.h"
-
-// Helper macro to convert a CPP variable to a string literal.
-#define OTABSL_INTERNAL_DO_TOKEN_STR(x) #x
-#define OTABSL_INTERNAL_TOKEN_STR(x) OTABSL_INTERNAL_DO_TOKEN_STR(x)
-
-// -----------------------------------------------------------------------------
-// Abseil namespace annotations
-// -----------------------------------------------------------------------------
-
-// OTABSL_NAMESPACE_BEGIN/OTABSL_NAMESPACE_END
-//
-// An annotation placed at the beginning/end of each `namespace absl` scope.
-// This is used to inject an inline namespace.
-//
-// The proper way to write Abseil code in the `absl` namespace is:
-//
-// namespace absl {
-// OTABSL_NAMESPACE_BEGIN
-//
-// void Foo();  // absl::OTABSL_OPTION_NAMESPACE_NAME::Foo().
-//
-// OTABSL_NAMESPACE_END
-// }  // namespace absl
-//
-// Users of Abseil should not use these macros, because users of Abseil should
-// not write `namespace absl {` in their own code for any reason.  (Abseil does
-// not support forward declarations of its own types, nor does it support
-// user-provided specialization of Abseil templates.  Code that violates these
-// rules may be broken without warning.)
-#if !defined(OTABSL_OPTION_NAMESPACE_NAME)
-#error options.h is misconfigured.
-#endif
-
-// Check that OTABSL_OPTION_NAMESPACE_NAME is neither "head" nor ""
-#if defined(__cplusplus)
-
-#define OTABSL_INTERNAL_INLINE_NAMESPACE_STR \
-  OTABSL_INTERNAL_TOKEN_STR(OTABSL_OPTION_NAMESPACE_NAME)
-
-static_assert(OTABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != '\0',
-              "options.h misconfigured: OTABSL_OPTION_NAMESPACE_NAME must "
-              "not be empty.");
-static_assert(OTABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
-                  OTABSL_INTERNAL_INLINE_NAMESPACE_STR[1] != 'e' ||
-                  OTABSL_INTERNAL_INLINE_NAMESPACE_STR[2] != 'a' ||
-                  OTABSL_INTERNAL_INLINE_NAMESPACE_STR[3] != 'd' ||
-                  OTABSL_INTERNAL_INLINE_NAMESPACE_STR[4] != '\0',
-              "options.h misconfigured: OTABSL_OPTION_NAMESPACE_NAME must "
-              "be changed to a new, unique identifier name.");
-
-#endif
-
-
-#define OTABSL_NAMESPACE_BEGIN namespace OTABSL_OPTION_NAMESPACE_NAME {
-#define OTABSL_NAMESPACE_END }
-
-// -----------------------------------------------------------------------------
-// Compiler Feature Checks
-// -----------------------------------------------------------------------------
-
-// OTABSL_HAVE_BUILTIN()
-//
-// Checks whether the compiler supports a Clang Feature Checking Macro, and if
-// so, checks whether it supports the provided builtin function "x" where x
-// is one of the functions noted in
-// https://clang.llvm.org/docs/LanguageExtensions.html
-//
-// Note: Use this macro to avoid an extra level of #ifdef __has_builtin check.
-// http://releases.llvm.org/3.3/tools/clang/docs/LanguageExtensions.html
-#ifdef __has_builtin
-#define OTABSL_HAVE_BUILTIN(x) __has_builtin(x)
-#else
-#define OTABSL_HAVE_BUILTIN(x) 0
-#endif
-
-#if defined(__is_identifier)
-#define OTABSL_INTERNAL_HAS_KEYWORD(x) !(__is_identifier(x))
-#else
-#define OTABSL_INTERNAL_HAS_KEYWORD(x) 0
-#endif
-
-// OTABSL_HAVE_TLS is defined to 1 when __thread should be supported.
-// We assume __thread is supported on Linux when compiled with Clang or compiled
-// against libstdc++ with _GLIBCXX_HAVE_TLS defined.
-#ifdef OTABSL_HAVE_TLS
-#error OTABSL_HAVE_TLS cannot be directly set
-#elif defined(__linux__) && (defined(__clang__) || defined(_GLIBCXX_HAVE_TLS))
-#define OTABSL_HAVE_TLS 1
-#endif
-
-// OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-//
-// Checks whether `std::is_trivially_destructible<T>` is supported.
-//
-// Notes: All supported compilers using libc++ support this feature, as does
-// gcc >= 4.8.1 using libstdc++, and Visual Studio.
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-#error OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE cannot be directly set
-#elif defined(_LIBCPP_VERSION) ||                                        \
-    (defined(__clang__) && __clang_major__ >= 15) ||                     \
-    (!defined(__clang__) && defined(__GNUC__) && defined(__GLIBCXX__) && \
-     (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) ||        \
-    defined(_MSC_VER)
-#define OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE 1
-#endif
-
-// OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-//
-// Checks whether `std::is_trivially_default_constructible<T>` and
-// `std::is_trivially_copy_constructible<T>` are supported.
-
-// OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-//
-// Checks whether `std::is_trivially_copy_assignable<T>` is supported.
-
-// Notes: Clang with libc++ supports these features, as does gcc >= 5.1 with
-// either libc++ or libstdc++, and Visual Studio (but not NVCC).
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
-#error OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE cannot be directly set
-#elif defined(OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE)
-#error OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE cannot directly set
-#elif (defined(__clang__) && defined(_LIBCPP_VERSION)) ||        \
-    (defined(__clang__) && __clang_major__ >= 15) ||             \
-    (!defined(__clang__) && defined(__GNUC__) &&                 \
-     (__GNUC__ > 7 || (__GNUC__ == 7 && __GNUC_MINOR__ >= 4)) && \
-     (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) ||      \
-    (defined(_MSC_VER) && !defined(__NVCC__))
-#define OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE 1
-#define OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1
-#endif
-
-// OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE
-//
-// Checks whether `std::is_trivially_copyable<T>` is supported.
-//
-// Notes: Clang 15+ with libc++ supports these features, GCC hasn't been tested.
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE)
-#error OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE cannot be directly set
-#elif defined(__clang__) && (__clang_major__ >= 15)
-#define OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE 1
-#endif
-
-// OTABSL_HAVE_SOURCE_LOCATION_CURRENT
-//
-// Indicates whether `absl::OTABSL_OPTION_NAMESPACE_NAME::SourceLocation::current()` will return useful
-// information in some contexts.
-#ifndef OTABSL_HAVE_SOURCE_LOCATION_CURRENT
-#if OTABSL_INTERNAL_HAS_KEYWORD(__builtin_LINE) && \
-    OTABSL_INTERNAL_HAS_KEYWORD(__builtin_FILE)
-#define OTABSL_HAVE_SOURCE_LOCATION_CURRENT 1
-#endif
-#endif
-
-// OTABSL_HAVE_THREAD_LOCAL
-//
-// Checks whether C++11's `thread_local` storage duration specifier is
-// supported.
-#ifdef OTABSL_HAVE_THREAD_LOCAL
-#error OTABSL_HAVE_THREAD_LOCAL cannot be directly set
-#elif defined(__APPLE__)
-// Notes:
-// * Xcode's clang did not support `thread_local` until version 8, and
-//   even then not for all iOS < 9.0.
-// * Xcode 9.3 started disallowing `thread_local` for 32-bit iOS simulator
-//   targeting iOS 9.x.
-// * Xcode 10 moves the deployment target check for iOS < 9.0 to link time
-//   making __has_feature unreliable there.
-//
-// Otherwise, `__has_feature` is only supported by Clang so it has be inside
-// `defined(__APPLE__)` check.
-#if __has_feature(cxx_thread_local) && \
-    !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
-#define OTABSL_HAVE_THREAD_LOCAL 1
-#endif
-#else  // !defined(__APPLE__)
-#define OTABSL_HAVE_THREAD_LOCAL 1
-#endif
-
-// There are platforms for which TLS should not be used even though the compiler
-// makes it seem like it's supported (Android NDK < r12b for example).
-// This is primarily because of linker problems and toolchain misconfiguration:
-// Abseil does not intend to support this indefinitely. Currently, the newest
-// toolchain that we intend to support that requires this behavior is the
-// r11 NDK - allowing for a 5 year support window on that means this option
-// is likely to be removed around June of 2021.
-// TLS isn't supported until NDK r12b per
-// https://developer.android.com/ndk/downloads/revision_history.html
-// Since NDK r16, `__NDK_MAJOR__` and `__NDK_MINOR__` are defined in
-// <android/ndk-version.h>. For NDK < r16, users should define these macros,
-// e.g. `-D__NDK_MAJOR__=11 -D__NKD_MINOR__=0` for NDK r11.
-#if defined(__ANDROID__) && defined(__clang__)
-#if __has_include(<android/ndk-version.h>)
-#include <android/ndk-version.h>
-#endif  // __has_include(<android/ndk-version.h>)
-#if defined(__ANDROID__) && defined(__clang__) && defined(__NDK_MAJOR__) && \
-    defined(__NDK_MINOR__) &&                                               \
-    ((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))
-#undef OTABSL_HAVE_TLS
-#undef OTABSL_HAVE_THREAD_LOCAL
-#endif
-#endif  // defined(__ANDROID__) && defined(__clang__)
-
-// Emscripten doesn't yet support `thread_local` or `__thread`.
-// https://github.com/emscripten-core/emscripten/issues/3502
-#if defined(__EMSCRIPTEN__)
-#undef OTABSL_HAVE_TLS
-#undef OTABSL_HAVE_THREAD_LOCAL
-#endif  // defined(__EMSCRIPTEN__)
-
-// OTABSL_HAVE_INTRINSIC_INT128
-//
-// Checks whether the __int128 compiler extension for a 128-bit integral type is
-// supported.
-//
-// Note: __SIZEOF_INT128__ is defined by Clang and GCC when __int128 is
-// supported, but we avoid using it in certain cases:
-// * On Clang:
-//   * Building using Clang for Windows, where the Clang runtime library has
-//     128-bit support only on LP64 architectures, but Windows is LLP64.
-// * On Nvidia's nvcc:
-//   * nvcc also defines __GNUC__ and __SIZEOF_INT128__, but not all versions
-//     actually support __int128.
-#ifdef OTABSL_HAVE_INTRINSIC_INT128
-#error OTABSL_HAVE_INTRINSIC_INT128 cannot be directly set
-#elif defined(__SIZEOF_INT128__)
-#if (defined(__clang__) && !defined(_WIN32)) || \
-    (defined(__CUDACC__) && __CUDACC_VER_MAJOR__ >= 9) ||                \
-    (defined(__GNUC__) && !defined(__clang__) && !defined(__CUDACC__))
-#define OTABSL_HAVE_INTRINSIC_INT128 1
-#elif defined(__CUDACC__)
-// __CUDACC_VER__ is a full version number before CUDA 9, and is defined to a
-// string explaining that it has been removed starting with CUDA 9. We use
-// nested #ifs because there is no short-circuiting in the preprocessor.
-// NOTE: `__CUDACC__` could be undefined while `__CUDACC_VER__` is defined.
-#if __CUDACC_VER__ >= 70000
-#define OTABSL_HAVE_INTRINSIC_INT128 1
-#endif  // __CUDACC_VER__ >= 70000
-#endif  // defined(__CUDACC__)
-#endif  // OTABSL_HAVE_INTRINSIC_INT128
-
-// OTABSL_HAVE_EXCEPTIONS
-//
-// Checks whether the compiler both supports and enables exceptions. Many
-// compilers support a "no exceptions" mode that disables exceptions.
-//
-// Generally, when OTABSL_HAVE_EXCEPTIONS is not defined:
-//
-// * Code using `throw` and `try` may not compile.
-// * The `noexcept` specifier will still compile and behave as normal.
-// * The `noexcept` operator may still return `false`.
-//
-// For further details, consult the compiler's documentation.
-#ifdef OTABSL_HAVE_EXCEPTIONS
-#error OTABSL_HAVE_EXCEPTIONS cannot be directly set.
-
-#elif defined(__clang__)
-
-#if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
-// Clang >= 3.6
-#if __has_feature(cxx_exceptions)
-#define OTABSL_HAVE_EXCEPTIONS 1
-#endif  // __has_feature(cxx_exceptions)
-#else
-// Clang < 3.6
-// http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html#the-exceptions-macro
-#if defined(__EXCEPTIONS) && __has_feature(cxx_exceptions)
-#define OTABSL_HAVE_EXCEPTIONS 1
-#endif  // defined(__EXCEPTIONS) && __has_feature(cxx_exceptions)
-#endif  // __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
-
-// Handle remaining special cases and default to exceptions being supported.
-#elif !(defined(__GNUC__) && (__GNUC__ < 5) && !defined(__EXCEPTIONS)) &&    \
-    !(defined(__GNUC__) && (__GNUC__ >= 5) && !defined(__cpp_exceptions)) && \
-    !(defined(_MSC_VER) && !defined(_CPPUNWIND))
-#define OTABSL_HAVE_EXCEPTIONS 1
-#endif
-
-// -----------------------------------------------------------------------------
-// Platform Feature Checks
-// -----------------------------------------------------------------------------
-
-// Currently supported operating systems and associated preprocessor
-// symbols:
-//
-//   Linux and Linux-derived           __linux__
-//   Android                           __ANDROID__ (implies __linux__)
-//   Linux (non-Android)               __linux__ && !__ANDROID__
-//   Darwin (macOS and iOS)            __APPLE__
-//   Akaros (http://akaros.org)        __ros__
-//   Windows                           _WIN32
-//   NaCL                              __native_client__
-//   AsmJS                             __asmjs__
-//   WebAssembly                       __wasm__
-//   Fuchsia                           __Fuchsia__
-//
-// Note that since Android defines both __ANDROID__ and __linux__, one
-// may probe for either Linux or Android by simply testing for __linux__.
-
-// OTABSL_HAVE_MMAP
-//
-// Checks whether the platform has an mmap(2) implementation as defined in
-// POSIX.1-2001.
-#ifdef OTABSL_HAVE_MMAP
-#error OTABSL_HAVE_MMAP cannot be directly set
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||   \
-    defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \
-    defined(__wasm__) || defined(__Fuchsia__) || defined(__sun) || \
-    defined(__ASYLO__)
-#define OTABSL_HAVE_MMAP 1
-#endif
-
-// OTABSL_HAVE_PTHREAD_GETSCHEDPARAM
-//
-// Checks whether the platform implements the pthread_(get|set)schedparam(3)
-// functions as defined in POSIX.1-2001.
-#ifdef OTABSL_HAVE_PTHREAD_GETSCHEDPARAM
-#error OTABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
-    defined(__ros__)
-#define OTABSL_HAVE_PTHREAD_GETSCHEDPARAM 1
-#endif
-
-// OTABSL_HAVE_SCHED_YIELD
-//
-// Checks whether the platform implements sched_yield(2) as defined in
-// POSIX.1-2001.
-#ifdef OTABSL_HAVE_SCHED_YIELD
-#error OTABSL_HAVE_SCHED_YIELD cannot be directly set
-#elif defined(__linux__) || defined(__ros__) || defined(__native_client__)
-#define OTABSL_HAVE_SCHED_YIELD 1
-#endif
-
-// OTABSL_HAVE_SEMAPHORE_H
-//
-// Checks whether the platform supports the <semaphore.h> header and sem_init(3)
-// family of functions as standardized in POSIX.1-2001.
-//
-// Note: While Apple provides <semaphore.h> for both iOS and macOS, it is
-// explicitly deprecated and will cause build failures if enabled for those
-// platforms.  We side-step the issue by not defining it here for Apple
-// platforms.
-#ifdef OTABSL_HAVE_SEMAPHORE_H
-#error OTABSL_HAVE_SEMAPHORE_H cannot be directly set
-#elif defined(__linux__) || defined(__ros__)
-#define OTABSL_HAVE_SEMAPHORE_H 1
-#endif
-
-// OTABSL_HAVE_ALARM
-//
-// Checks whether the platform supports the <signal.h> header and alarm(2)
-// function as standardized in POSIX.1-2001.
-#ifdef OTABSL_HAVE_ALARM
-#error OTABSL_HAVE_ALARM cannot be directly set
-#elif defined(__GOOGLE_GRTE_VERSION__)
-// feature tests for Google's GRTE
-#define OTABSL_HAVE_ALARM 1
-#elif defined(__GLIBC__)
-// feature test for glibc
-#define OTABSL_HAVE_ALARM 1
-#elif defined(_MSC_VER)
-// feature tests for Microsoft's library
-#elif defined(__MINGW32__)
-// mingw32 doesn't provide alarm(2):
-// https://osdn.net/projects/mingw/scm/git/mingw-org-wsl/blobs/5.2-trunk/mingwrt/include/unistd.h
-// mingw-w64 provides a no-op implementation:
-// https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-crt/misc/alarm.c
-#elif defined(__EMSCRIPTEN__)
-// emscripten doesn't support signals
-#elif defined(__Fuchsia__)
-// Signals don't exist on fuchsia.
-#elif defined(__native_client__)
-#else
-// other standard libraries
-#define OTABSL_HAVE_ALARM 1
-#endif
-
-// OTABSL_IS_LITTLE_ENDIAN
-// OTABSL_IS_BIG_ENDIAN
-//
-// Checks the endianness of the platform.
-//
-// Notes: uses the built in endian macros provided by GCC (since 4.6) and
-// Clang (since 3.2); see
-// https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html.
-// Otherwise, if _WIN32, assume little endian. Otherwise, bail with an error.
-#if defined(OTABSL_IS_BIG_ENDIAN)
-#error "OTABSL_IS_BIG_ENDIAN cannot be directly set."
-#endif
-#if defined(OTABSL_IS_LITTLE_ENDIAN)
-#error "OTABSL_IS_LITTLE_ENDIAN cannot be directly set."
-#endif
-
-#if (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-     __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define OTABSL_IS_LITTLE_ENDIAN 1
-#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
-    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define OTABSL_IS_BIG_ENDIAN 1
-#elif defined(_WIN32)
-#define OTABSL_IS_LITTLE_ENDIAN 1
-#else
-#error "absl endian detection needs to be set up for your compiler"
-#endif
-
-// macOS 10.13 and iOS 10.11 don't let you use <any>, <optional>, or <variant>
-// even though the headers exist and are publicly noted to work.  See
-// https://github.com/abseil/abseil-cpp/issues/207 and
-// https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
-// libc++ spells out the availability requirements in the file
-// llvm-project/libcxx/include/__config via the #define
-// _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS.
-#if defined(__APPLE__) && defined(_LIBCPP_VERSION) && \
-  ((defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
-   __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101400) || \
-  (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && \
-   __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 120000) || \
-  (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && \
-   __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 120000) || \
-  (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && \
-   __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 50000))
-#define OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1
-#else
-#define OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0
-#endif
-
-// OTABSL_HAVE_STD_ANY
-//
-// Checks whether C++17 std::any is available by checking whether <any> exists.
-#ifdef OTABSL_HAVE_STD_ANY
-#error "OTABSL_HAVE_STD_ANY cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<any>) && __cplusplus >= 201703L && \
-    !OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
-#define OTABSL_HAVE_STD_ANY 1
-#endif
-#endif
-
-// OTABSL_HAVE_STD_OPTIONAL
-//
-// Checks whether C++17 std::optional is available.
-#ifdef OTABSL_HAVE_STD_OPTIONAL
-#error "OTABSL_HAVE_STD_OPTIONAL cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L && \
-    !OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
-#define OTABSL_HAVE_STD_OPTIONAL 1
-#endif
-#endif
-
-// OTABSL_HAVE_STD_VARIANT
-//
-// Checks whether C++17 std::variant is available.
-#ifdef OTABSL_HAVE_STD_VARIANT
-#error "OTABSL_HAVE_STD_VARIANT cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<variant>) && __cplusplus >= 201703L && \
-    !OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
-#define OTABSL_HAVE_STD_VARIANT 1
-#endif
-#endif
-
-// OTABSL_HAVE_STD_STRING_VIEW
-//
-// Checks whether C++17 std::string_view is available.
-#ifdef OTABSL_HAVE_STD_STRING_VIEW
-#error "OTABSL_HAVE_STD_STRING_VIEW cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<string_view>) && __cplusplus >= 201703L
-#define OTABSL_HAVE_STD_STRING_VIEW 1
-#endif
-#endif
-
-// For MSVC, `__has_include` is supported in VS 2017 15.3, which is later than
-// the support for <optional>, <any>, <string_view>, <variant>. So we use
-// _MSC_VER to check whether we have VS 2017 RTM (when <optional>, <any>,
-// <string_view>, <variant> is implemented) or higher. Also, `__cplusplus` is
-// not correctly set by MSVC, so we use `_MSVC_LANG` to check the language
-// version.
-// TODO(zhangxy): fix tests before enabling aliasing for `std::any`.
-#if defined(_MSC_VER) && _MSC_VER >= 1910 && \
-    ((defined(_MSVC_LANG) && _MSVC_LANG > 201402) || __cplusplus > 201402)
-// #define OTABSL_HAVE_STD_ANY 1
-#define OTABSL_HAVE_STD_OPTIONAL 1
-#define OTABSL_HAVE_STD_VARIANT 1
-#define OTABSL_HAVE_STD_STRING_VIEW 1
-#endif
-
-// OTABSL_USES_STD_ANY
-//
-// Indicates whether absl::OTABSL_OPTION_NAMESPACE_NAME::any is an alias for std::any.
-#if !defined(OTABSL_OPTION_USE_STD_ANY)
-#error options.h is misconfigured.
-#elif OTABSL_OPTION_USE_STD_ANY == 0 || \
-    (OTABSL_OPTION_USE_STD_ANY == 2 && !defined(OTABSL_HAVE_STD_ANY))
-#undef OTABSL_USES_STD_ANY
-#elif OTABSL_OPTION_USE_STD_ANY == 1 || \
-    (OTABSL_OPTION_USE_STD_ANY == 2 && defined(OTABSL_HAVE_STD_ANY))
-#define OTABSL_USES_STD_ANY 1
-#else
-#error options.h is misconfigured.
-#endif
-
-// OTABSL_USES_STD_OPTIONAL
-//
-// Indicates whether absl::OTABSL_OPTION_NAMESPACE_NAME::optional is an alias for std::optional.
-#if !defined(OTABSL_OPTION_USE_STD_OPTIONAL)
-#error options.h is misconfigured.
-#elif OTABSL_OPTION_USE_STD_OPTIONAL == 0 || \
-    (OTABSL_OPTION_USE_STD_OPTIONAL == 2 && !defined(OTABSL_HAVE_STD_OPTIONAL))
-#undef OTABSL_USES_STD_OPTIONAL
-#elif OTABSL_OPTION_USE_STD_OPTIONAL == 1 || \
-    (OTABSL_OPTION_USE_STD_OPTIONAL == 2 && defined(OTABSL_HAVE_STD_OPTIONAL))
-#define OTABSL_USES_STD_OPTIONAL 1
-#else
-#error options.h is misconfigured.
-#endif
-
-// OTABSL_USES_STD_VARIANT
-//
-// Indicates whether absl::OTABSL_OPTION_NAMESPACE_NAME::variant is an alias for std::variant.
-#if !defined(OTABSL_OPTION_USE_STD_VARIANT)
-#error options.h is misconfigured.
-#elif OTABSL_OPTION_USE_STD_VARIANT == 0 || \
-    (OTABSL_OPTION_USE_STD_VARIANT == 2 && !defined(OTABSL_HAVE_STD_VARIANT))
-#undef OTABSL_USES_STD_VARIANT
-#elif OTABSL_OPTION_USE_STD_VARIANT == 1 || \
-    (OTABSL_OPTION_USE_STD_VARIANT == 2 && defined(OTABSL_HAVE_STD_VARIANT))
-#define OTABSL_USES_STD_VARIANT 1
-#else
-#error options.h is misconfigured.
-#endif
-
-// OTABSL_USES_STD_STRING_VIEW
-//
-// Indicates whether absl::OTABSL_OPTION_NAMESPACE_NAME::string_view is an alias for std::string_view.
-#if !defined(OTABSL_OPTION_USE_STD_STRING_VIEW)
-#error options.h is misconfigured.
-#elif OTABSL_OPTION_USE_STD_STRING_VIEW == 0 || \
-    (OTABSL_OPTION_USE_STD_STRING_VIEW == 2 &&  \
-     !defined(OTABSL_HAVE_STD_STRING_VIEW))
-#undef OTABSL_USES_STD_STRING_VIEW
-#elif OTABSL_OPTION_USE_STD_STRING_VIEW == 1 || \
-    (OTABSL_OPTION_USE_STD_STRING_VIEW == 2 &&  \
-     defined(OTABSL_HAVE_STD_STRING_VIEW))
-#define OTABSL_USES_STD_STRING_VIEW 1
-#else
-#error options.h is misconfigured.
-#endif
-
-// In debug mode, MSVC 2017's std::variant throws a EXCEPTION_ACCESS_VIOLATION
-// SEH exception from emplace for variant<SomeStruct> when constructing the
-// struct can throw. This defeats some of variant_test and
-// variant_exception_safety_test.
-#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_DEBUG)
-#define OTABSL_INTERNAL_MSVC_2017_DBG_MODE
-#endif
-
-// OTABSL_INTERNAL_MANGLED_NS
-// OTABSL_INTERNAL_MANGLED_BACKREFERENCE
-//
-// Internal macros for building up mangled names in our internal fork of CCTZ.
-// This implementation detail is only needed and provided for the MSVC build.
-//
-// These macros both expand to string literals.  OTABSL_INTERNAL_MANGLED_NS is
-// the mangled spelling of the `absl` namespace, and
-// OTABSL_INTERNAL_MANGLED_BACKREFERENCE is a back-reference integer representing
-// the proper count to skip past the CCTZ fork namespace names.  (This number
-// is one larger when there is an inline namespace name to skip.)
-#if defined(_MSC_VER)
-#define OTABSL_INTERNAL_MANGLED_NS \
-  OTABSL_INTERNAL_TOKEN_STR(OTABSL_OPTION_NAMESPACE_NAME) "@absl"
-#define OTABSL_INTERNAL_MANGLED_BACKREFERENCE "6"
-#endif
-
-#undef OTABSL_INTERNAL_HAS_KEYWORD
-
-// OTABSL_DLL
-//
-// When building Abseil as a DLL, this macro expands to `__declspec(dllexport)`
-// so we can annotate symbols appropriately as being exported. When used in
-// headers consuming a DLL, this macro expands to `__declspec(dllimport)` so
-// that consumers know the symbol is defined inside the DLL. In all other cases,
-// the macro expands to nothing.
-#if defined(_MSC_VER)
-#if defined(OTABSL_BUILD_DLL)
-#define OTABSL_DLL __declspec(dllexport)
-#elif 1
-#define OTABSL_DLL __declspec(dllimport)
-#else
-#define OTABSL_DLL
-#endif
-#else
-#define OTABSL_DLL
-#endif  // defined(_MSC_VER)
-
-#endif  // OTABSL_BASE_CONFIG_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/identity.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/identity.h
deleted file mode 100644
index 4afba3179..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/identity.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef OTABSL_BASE_INTERNAL_IDENTITY_H_
-#define OTABSL_BASE_INTERNAL_IDENTITY_H_
-
-#include "../config.h"
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace internal {
-
-template <typename T>
-struct identity {
-  typedef T type;
-};
-
-template <typename T>
-using identity_t = typename identity<T>::type;
-
-}  // namespace internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_BASE_INTERNAL_IDENTITY_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/inline_variable.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/inline_variable.h
deleted file mode 100644
index dd66e9f22..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/inline_variable.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef OTABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
-#define OTABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
-
-#include <type_traits>
-
-#include "identity.h"
-
-// File:
-//   This file define a macro that allows the creation of or emulation of C++17
-//   inline variables based on whether or not the feature is supported.
-
-////////////////////////////////////////////////////////////////////////////////
-// Macro: OTABSL_INTERNAL_INLINE_CONSTEXPR(type, name, init)
-//
-// Description:
-//   Expands to the equivalent of an inline constexpr instance of the specified
-//   `type` and `name`, initialized to the value `init`. If the compiler being
-//   used is detected as supporting actual inline variables as a language
-//   feature, then the macro expands to an actual inline variable definition.
-//
-// Requires:
-//   `type` is a type that is usable in an extern variable declaration.
-//
-// Requires: `name` is a valid identifier
-//
-// Requires:
-//   `init` is an expression that can be used in the following definition:
-//     constexpr type name = init;
-//
-// Usage:
-//
-//   // Equivalent to: `inline constexpr size_t variant_npos = -1;`
-//   OTABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, -1);
-//
-// Differences in implementation:
-//   For a direct, language-level inline variable, decltype(name) will be the
-//   type that was specified along with const qualification, whereas for
-//   emulated inline variables, decltype(name) may be different (in practice
-//   it will likely be a reference type).
-////////////////////////////////////////////////////////////////////////////////
-
-#ifdef __cpp_inline_variables
-
-// Clang's -Wmissing-variable-declarations option erroneously warned that
-// inline constexpr objects need to be pre-declared. This has now been fixed,
-// but we will need to support this workaround for people building with older
-// versions of clang.
-//
-// Bug: https://bugs.llvm.org/show_bug.cgi?id=35862
-//
-// Note:
-//   identity_t is used here so that the const and name are in the
-//   appropriate place for pointer types, reference types, function pointer
-//   types, etc..
-#if defined(__clang__)
-#define OTABSL_INTERNAL_EXTERN_DECL(type, name) \
-  extern const ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<type> name;
-#else  // Otherwise, just define the macro to do nothing.
-#define OTABSL_INTERNAL_EXTERN_DECL(type, name)
-#endif  // defined(__clang__)
-
-// See above comment at top of file for details.
-#define OTABSL_INTERNAL_INLINE_CONSTEXPR(type, name, init) \
-  OTABSL_INTERNAL_EXTERN_DECL(type, name)                  \
-  inline constexpr ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<type> name = init
-
-#else
-
-// See above comment at top of file for details.
-//
-// Note:
-//   identity_t is used here so that the const and name are in the
-//   appropriate place for pointer types, reference types, function pointer
-//   types, etc..
-#define OTABSL_INTERNAL_INLINE_CONSTEXPR(var_type, name, init)                  \
-  template <class /*AbslInternalDummy*/ = void>                               \
-  struct AbslInternalInlineVariableHolder##name {                             \
-    static constexpr ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<var_type> kInstance = init; \
-  };                                                                          \
-                                                                              \
-  template <class AbslInternalDummy>                                          \
-  constexpr ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<var_type>                            \
-      AbslInternalInlineVariableHolder##name<AbslInternalDummy>::kInstance;   \
-                                                                              \
-  static constexpr const ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<var_type>&              \
-      name = /* NOLINT */                                                     \
-      AbslInternalInlineVariableHolder##name<>::kInstance;                    \
-  static_assert(sizeof(void (*)(decltype(name))) != 0,                        \
-                "Silence unused variable warnings.")
-
-#endif  // __cpp_inline_variables
-
-#endif  // OTABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/invoke.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/invoke.h
deleted file mode 100644
index c37f43cfc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/internal/invoke.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(f, args...) is an implementation of
-// INVOKE(f, args...) from section [func.require] of the C++ standard.
-//
-// [func.require]
-// Define INVOKE (f, t1, t2, ..., tN) as follows:
-// 1. (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
-//    and t1 is an object of type T or a reference to an object of type T or a
-//    reference to an object of a type derived from T;
-// 2. ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
-//    class T and t1 is not one of the types described in the previous item;
-// 3. t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
-//    an object of type T or a reference to an object of type T or a reference
-//    to an object of a type derived from T;
-// 4. (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
-//    is not one of the types described in the previous item;
-// 5. f(t1, t2, ..., tN) in all other cases.
-//
-// The implementation is SFINAE-friendly: substitution failure within Invoke()
-// isn't an error.
-
-#ifndef OTABSL_BASE_INTERNAL_INVOKE_H_
-#define OTABSL_BASE_INTERNAL_INVOKE_H_
-
-#include <algorithm>
-#include <type_traits>
-#include <utility>
-
-#include "../../meta/type_traits.h"
-
-// The following code is internal implementation detail.  See the comment at the
-// top of this file for the API documentation.
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace base_internal {
-
-// The five classes below each implement one of the clauses from the definition
-// of INVOKE. The inner class template Accept<F, Args...> checks whether the
-// clause is applicable; static function template Invoke(f, args...) does the
-// invocation.
-//
-// By separating the clause selection logic from invocation we make sure that
-// Invoke() does exactly what the standard says.
-
-template <typename Derived>
-struct StrippedAccept {
-  template <typename... Args>
-  struct Accept : Derived::template AcceptImpl<typename std::remove_cv<
-                      typename std::remove_reference<Args>::type>::type...> {};
-};
-
-// (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
-// and t1 is an object of type T or a reference to an object of type T or a
-// reference to an object of a type derived from T.
-struct MemFunAndRef : StrippedAccept<MemFunAndRef> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename MemFunType, typename C, typename Obj, typename... Args>
-  struct AcceptImpl<MemFunType C::*, Obj, Args...>
-      : std::integral_constant<bool, std::is_base_of<C, Obj>::value &&
-                                         absl::OTABSL_OPTION_NAMESPACE_NAME::is_function<MemFunType>::value> {
-  };
-
-  template <typename MemFun, typename Obj, typename... Args>
-  static decltype((std::declval<Obj>().*
-                   std::declval<MemFun>())(std::declval<Args>()...))
-  Invoke(MemFun&& mem_fun, Obj&& obj, Args&&... args) {
-    return (std::forward<Obj>(obj).*
-            std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
-  }
-};
-
-// ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
-// class T and t1 is not one of the types described in the previous item.
-struct MemFunAndPtr : StrippedAccept<MemFunAndPtr> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename MemFunType, typename C, typename Ptr, typename... Args>
-  struct AcceptImpl<MemFunType C::*, Ptr, Args...>
-      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value &&
-                                         absl::OTABSL_OPTION_NAMESPACE_NAME::is_function<MemFunType>::value> {
-  };
-
-  template <typename MemFun, typename Ptr, typename... Args>
-  static decltype(((*std::declval<Ptr>()).*
-                   std::declval<MemFun>())(std::declval<Args>()...))
-  Invoke(MemFun&& mem_fun, Ptr&& ptr, Args&&... args) {
-    return ((*std::forward<Ptr>(ptr)).*
-            std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
-  }
-};
-
-// t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
-// an object of type T or a reference to an object of type T or a reference
-// to an object of a type derived from T.
-struct DataMemAndRef : StrippedAccept<DataMemAndRef> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename R, typename C, typename Obj>
-  struct AcceptImpl<R C::*, Obj>
-      : std::integral_constant<bool, std::is_base_of<C, Obj>::value &&
-                                         !absl::OTABSL_OPTION_NAMESPACE_NAME::is_function<R>::value> {};
-
-  template <typename DataMem, typename Ref>
-  static decltype(std::declval<Ref>().*std::declval<DataMem>()) Invoke(
-      DataMem&& data_mem, Ref&& ref) {
-    return std::forward<Ref>(ref).*std::forward<DataMem>(data_mem);
-  }
-};
-
-// (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
-// is not one of the types described in the previous item.
-struct DataMemAndPtr : StrippedAccept<DataMemAndPtr> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename R, typename C, typename Ptr>
-  struct AcceptImpl<R C::*, Ptr>
-      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value &&
-                                         !absl::OTABSL_OPTION_NAMESPACE_NAME::is_function<R>::value> {};
-
-  template <typename DataMem, typename Ptr>
-  static decltype((*std::declval<Ptr>()).*std::declval<DataMem>()) Invoke(
-      DataMem&& data_mem, Ptr&& ptr) {
-    return (*std::forward<Ptr>(ptr)).*std::forward<DataMem>(data_mem);
-  }
-};
-
-// f(t1, t2, ..., tN) in all other cases.
-struct Callable {
-  // Callable doesn't have Accept because it's the last clause that gets picked
-  // when none of the previous clauses are applicable.
-  template <typename F, typename... Args>
-  static decltype(std::declval<F>()(std::declval<Args>()...)) Invoke(
-      F&& f, Args&&... args) {
-    return std::forward<F>(f)(std::forward<Args>(args)...);
-  }
-};
-
-// Resolves to the first matching clause.
-template <typename... Args>
-struct Invoker {
-  typedef typename std::conditional<
-      MemFunAndRef::Accept<Args...>::value, MemFunAndRef,
-      typename std::conditional<
-          MemFunAndPtr::Accept<Args...>::value, MemFunAndPtr,
-          typename std::conditional<
-              DataMemAndRef::Accept<Args...>::value, DataMemAndRef,
-              typename std::conditional<DataMemAndPtr::Accept<Args...>::value,
-                                        DataMemAndPtr, Callable>::type>::type>::
-          type>::type type;
-};
-
-// The result type of Invoke<F, Args...>.
-template <typename F, typename... Args>
-using InvokeT = decltype(Invoker<F, Args...>::type::Invoke(
-    std::declval<F>(), std::declval<Args>()...));
-
-// Invoke(f, args...) is an implementation of INVOKE(f, args...) from section
-// [func.require] of the C++ standard.
-template <typename F, typename... Args>
-InvokeT<F, Args...> Invoke(F&& f, Args&&... args) {
-  return Invoker<F, Args...>::type::Invoke(std::forward<F>(f),
-                                           std::forward<Args>(args)...);
-}
-
-}  // namespace base_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_BASE_INTERNAL_INVOKE_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/macros.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/macros.h
deleted file mode 100644
index 707c375ed..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/macros.h
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: macros.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines the set of language macros used within Abseil code.
-// For the set of macros used to determine supported compilers and platforms,
-// see absl/base/config.h instead.
-//
-// This code is compiled directly on many platforms, including client
-// platforms like Windows, Mac, and embedded systems.  Before making
-// any changes here, make sure that you're not breaking any platforms.
-
-#ifndef OTABSL_BASE_MACROS_H_
-#define OTABSL_BASE_MACROS_H_
-
-#include <cassert>
-#include <cstddef>
-
-#include "attributes.h"
-#include "optimization.h"
-#include "port.h"
-
-// OTABSL_ARRAYSIZE()
-//
-// Returns the number of elements in an array as a compile-time constant, which
-// can be used in defining new arrays. If you use this macro on a pointer by
-// mistake, you will get a compile-time error.
-#define OTABSL_ARRAYSIZE(array) \
-  (sizeof(::absl::OTABSL_OPTION_NAMESPACE_NAME::macros_internal::ArraySizeHelper(array)))
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace macros_internal {
-// Note: this internal template function declaration is used by OTABSL_ARRAYSIZE.
-// The function doesn't need a definition, as we only use its type.
-template <typename T, size_t N>
-auto ArraySizeHelper(const T (&array)[N]) -> char (&)[N];
-}  // namespace macros_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-// kLinkerInitialized
-//
-// An enum used only as a constructor argument to indicate that a variable has
-// static storage duration, and that the constructor should do nothing to its
-// state. Use of this macro indicates to the reader that it is legal to
-// declare a static instance of the class, provided the constructor is given
-// the absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::kLinkerInitialized argument.
-//
-// Normally, it is unsafe to declare a static variable that has a constructor or
-// a destructor because invocation order is undefined. However, if the type can
-// be zero-initialized (which the loader does for static variables) into a valid
-// state and the type's destructor does not affect storage, then a constructor
-// for static initialization can be declared.
-//
-// Example:
-//       // Declaration
-//       explicit MyClass(absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal:LinkerInitialized x) {}
-//
-//       // Invocation
-//       static MyClass my_global(absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::kLinkerInitialized);
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace base_internal {
-enum LinkerInitialized {
-  kLinkerInitialized = 0,
-};
-}  // namespace base_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-// OTABSL_FALLTHROUGH_INTENDED
-//
-// Annotates implicit fall-through between switch labels, allowing a case to
-// indicate intentional fallthrough and turn off warnings about any lack of a
-// `break` statement. The OTABSL_FALLTHROUGH_INTENDED macro should be followed by
-// a semicolon and can be used in most places where `break` can, provided that
-// no statements exist between it and the next switch label.
-//
-// Example:
-//
-//  switch (x) {
-//    case 40:
-//    case 41:
-//      if (truth_is_out_there) {
-//        ++x;
-//        OTABSL_FALLTHROUGH_INTENDED;  // Use instead of/along with annotations
-//                                    // in comments
-//      } else {
-//        return x;
-//      }
-//    case 42:
-//      ...
-//
-// Notes: when compiled with clang in C++11 mode, the OTABSL_FALLTHROUGH_INTENDED
-// macro is expanded to the [[clang::fallthrough]] attribute, which is analysed
-// when  performing switch labels fall-through diagnostic
-// (`-Wimplicit-fallthrough`). See clang documentation on language extensions
-// for details:
-// https://clang.llvm.org/docs/AttributeReference.html#fallthrough-clang-fallthrough
-//
-// When used with unsupported compilers, the OTABSL_FALLTHROUGH_INTENDED macro
-// has no effect on diagnostics. In any case this macro has no effect on runtime
-// behavior and performance of code.
-#ifdef OTABSL_FALLTHROUGH_INTENDED
-#error "OTABSL_FALLTHROUGH_INTENDED should not be defined."
-#endif
-
-// TODO(zhangxy): Use c++17 standard [[fallthrough]] macro, when supported.
-#if defined(__clang__) && defined(__has_warning)
-#if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
-#define OTABSL_FALLTHROUGH_INTENDED [[clang::fallthrough]]
-#endif
-#elif defined(__GNUC__) && __GNUC__ >= 7
-#define OTABSL_FALLTHROUGH_INTENDED [[gnu::fallthrough]]
-#endif
-
-#ifndef OTABSL_FALLTHROUGH_INTENDED
-#define OTABSL_FALLTHROUGH_INTENDED \
-  do {                            \
-  } while (0)
-#endif
-
-// OTABSL_DEPRECATED()
-//
-// Marks a deprecated class, struct, enum, function, method and variable
-// declarations. The macro argument is used as a custom diagnostic message (e.g.
-// suggestion of a better alternative).
-//
-// Examples:
-//
-//   class OTABSL_DEPRECATED("Use Bar instead") Foo {...};
-//
-//   OTABSL_DEPRECATED("Use Baz() instead") void Bar() {...}
-//
-//   template <typename T>
-//   OTABSL_DEPRECATED("Use DoThat() instead")
-//   void DoThis();
-//
-// Every usage of a deprecated entity will trigger a warning when compiled with
-// clang's `-Wdeprecated-declarations` option. This option is turned off by
-// default, but the warnings will be reported by clang-tidy.
-#if defined(__clang__) && __cplusplus >= 201103L
-#define OTABSL_DEPRECATED(message) __attribute__((deprecated(message)))
-#endif
-
-#ifndef OTABSL_DEPRECATED
-#define OTABSL_DEPRECATED(message)
-#endif
-
-// OTABSL_BAD_CALL_IF()
-//
-// Used on a function overload to trap bad calls: any call that matches the
-// overload will cause a compile-time error. This macro uses a clang-specific
-// "enable_if" attribute, as described at
-// https://clang.llvm.org/docs/AttributeReference.html#enable-if
-//
-// Overloads which use this macro should be bracketed by
-// `#ifdef OTABSL_BAD_CALL_IF`.
-//
-// Example:
-//
-//   int isdigit(int c);
-//   #ifdef OTABSL_BAD_CALL_IF
-//   int isdigit(int c)
-//     OTABSL_BAD_CALL_IF(c <= -1 || c > 255,
-//                       "'c' must have the value of an unsigned char or EOF");
-//   #endif // OTABSL_BAD_CALL_IF
-#if OTABSL_HAVE_ATTRIBUTE(enable_if)
-#define OTABSL_BAD_CALL_IF(expr, msg) \
-  __attribute__((enable_if(expr, "Bad call trap"), unavailable(msg)))
-#endif
-
-// OTABSL_ASSERT()
-//
-// In C++11, `assert` can't be used portably within constexpr functions.
-// OTABSL_ASSERT functions as a runtime assert but works in C++11 constexpr
-// functions.  Example:
-//
-// constexpr double Divide(double a, double b) {
-//   return OTABSL_ASSERT(b != 0), a / b;
-// }
-//
-// This macro is inspired by
-// https://akrzemi1.wordpress.com/2017/05/18/asserts-in-constexpr-functions/
-#if defined(NDEBUG)
-#define OTABSL_ASSERT(expr) \
-  (false ? static_cast<void>(expr) : static_cast<void>(0))
-#else
-#define OTABSL_ASSERT(expr)                           \
-  (OTABSL_PREDICT_TRUE((expr)) ? static_cast<void>(0) \
-                             : [] { assert(false && #expr); }())  // NOLINT
-#endif
-
-#ifdef OTABSL_HAVE_EXCEPTIONS
-#define OTABSL_INTERNAL_TRY try
-#define OTABSL_INTERNAL_CATCH_ANY catch (...)
-#define OTABSL_INTERNAL_RETHROW do { throw; } while (false)
-#else  // OTABSL_HAVE_EXCEPTIONS
-#define OTABSL_INTERNAL_TRY if (true)
-#define OTABSL_INTERNAL_CATCH_ANY else if (false)
-#define OTABSL_INTERNAL_RETHROW do {} while (false)
-#endif  // OTABSL_HAVE_EXCEPTIONS
-
-#endif  // OTABSL_BASE_MACROS_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/optimization.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/optimization.h
deleted file mode 100644
index 69713654a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/optimization.h
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: optimization.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines portable macros for performance optimization.
-
-#ifndef OTABSL_BASE_OPTIMIZATION_H_
-#define OTABSL_BASE_OPTIMIZATION_H_
-
-#include "config.h"
-
-// OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION
-//
-// Instructs the compiler to avoid optimizing tail-call recursion. Use of this
-// macro is useful when you wish to preserve the existing function order within
-// a stack trace for logging, debugging, or profiling purposes.
-//
-// Example:
-//
-//   int f() {
-//     int result = g();
-//     OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION();
-//     return result;
-//   }
-#if defined(__pnacl__)
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() if (volatile int x = 0) { (void)x; }
-#elif defined(__clang__)
-// Clang will not tail call given inline volatile assembly.
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
-#elif defined(__GNUC__)
-// GCC will not tail call given inline volatile assembly.
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
-#elif defined(_MSC_VER)
-#include <intrin.h>
-// The __nop() intrinsic blocks the optimisation.
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __nop()
-#else
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() if (volatile int x = 0) { (void)x; }
-#endif
-
-// OTABSL_CACHELINE_SIZE
-//
-// Explicitly defines the size of the L1 cache for purposes of alignment.
-// Setting the cacheline size allows you to specify that certain objects be
-// aligned on a cacheline boundary with `OTABSL_CACHELINE_ALIGNED` declarations.
-// (See below.)
-//
-// NOTE: this macro should be replaced with the following C++17 features, when
-// those are generally available:
-//
-//   * `std::hardware_constructive_interference_size`
-//   * `std::hardware_destructive_interference_size`
-//
-// See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0154r1.html
-// for more information.
-#if defined(__GNUC__)
-// Cache line alignment
-#if defined(__i386__) || defined(__x86_64__)
-#define OTABSL_CACHELINE_SIZE 64
-#elif defined(__powerpc64__)
-#define OTABSL_CACHELINE_SIZE 128
-#elif defined(__aarch64__)
-// We would need to read special register ctr_el0 to find out L1 dcache size.
-// This value is a good estimate based on a real aarch64 machine.
-#define OTABSL_CACHELINE_SIZE 64
-#elif defined(__arm__)
-// Cache line sizes for ARM: These values are not strictly correct since
-// cache line sizes depend on implementations, not architectures.  There
-// are even implementations with cache line sizes configurable at boot
-// time.
-#if defined(__ARM_ARCH_5T__)
-#define OTABSL_CACHELINE_SIZE 32
-#elif defined(__ARM_ARCH_7A__)
-#define OTABSL_CACHELINE_SIZE 64
-#endif
-#endif
-
-#ifndef OTABSL_CACHELINE_SIZE
-// A reasonable default guess.  Note that overestimates tend to waste more
-// space, while underestimates tend to waste more time.
-#define OTABSL_CACHELINE_SIZE 64
-#endif
-
-// OTABSL_CACHELINE_ALIGNED
-//
-// Indicates that the declared object be cache aligned using
-// `OTABSL_CACHELINE_SIZE` (see above). Cacheline aligning objects allows you to
-// load a set of related objects in the L1 cache for performance improvements.
-// Cacheline aligning objects properly allows constructive memory sharing and
-// prevents destructive (or "false") memory sharing.
-//
-// NOTE: this macro should be replaced with usage of `alignas()` using
-// `std::hardware_constructive_interference_size` and/or
-// `std::hardware_destructive_interference_size` when available within C++17.
-//
-// See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0154r1.html
-// for more information.
-//
-// On some compilers, `OTABSL_CACHELINE_ALIGNED` expands to an `__attribute__`
-// or `__declspec` attribute. For compilers where this is not known to work,
-// the macro expands to nothing.
-//
-// No further guarantees are made here. The result of applying the macro
-// to variables and types is always implementation-defined.
-//
-// WARNING: It is easy to use this attribute incorrectly, even to the point
-// of causing bugs that are difficult to diagnose, crash, etc. It does not
-// of itself guarantee that objects are aligned to a cache line.
-//
-// NOTE: Some compilers are picky about the locations of annotations such as
-// this attribute, so prefer to put it at the beginning of your declaration.
-// For example,
-//
-//   OTABSL_CACHELINE_ALIGNED static Foo* foo = ...
-//
-//   class OTABSL_CACHELINE_ALIGNED Bar { ...
-//
-// Recommendations:
-//
-// 1) Consult compiler documentation; this comment is not kept in sync as
-//    toolchains evolve.
-// 2) Verify your use has the intended effect. This often requires inspecting
-//    the generated machine code.
-// 3) Prefer applying this attribute to individual variables. Avoid
-//    applying it to types. This tends to localize the effect.
-#define OTABSL_CACHELINE_ALIGNED __attribute__((aligned(OTABSL_CACHELINE_SIZE)))
-#elif defined(_MSC_VER)
-#define OTABSL_CACHELINE_SIZE 64
-#define OTABSL_CACHELINE_ALIGNED __declspec(align(OTABSL_CACHELINE_SIZE))
-#else
-#define OTABSL_CACHELINE_SIZE 64
-#define OTABSL_CACHELINE_ALIGNED
-#endif
-
-// OTABSL_PREDICT_TRUE, OTABSL_PREDICT_FALSE
-//
-// Enables the compiler to prioritize compilation using static analysis for
-// likely paths within a boolean branch.
-//
-// Example:
-//
-//   if (OTABSL_PREDICT_TRUE(expression)) {
-//     return result;                        // Faster if more likely
-//   } else {
-//     return 0;
-//   }
-//
-// Compilers can use the information that a certain branch is not likely to be
-// taken (for instance, a CHECK failure) to optimize for the common case in
-// the absence of better information (ie. compiling gcc with `-fprofile-arcs`).
-//
-// Recommendation: Modern CPUs dynamically predict branch execution paths,
-// typically with accuracy greater than 97%. As a result, annotating every
-// branch in a codebase is likely counterproductive; however, annotating
-// specific branches that are both hot and consistently mispredicted is likely
-// to yield performance improvements.
-#if OTABSL_HAVE_BUILTIN(__builtin_expect) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_PREDICT_FALSE(x) (__builtin_expect(x, 0))
-#define OTABSL_PREDICT_TRUE(x) (__builtin_expect(false || (x), true))
-#else
-#define OTABSL_PREDICT_FALSE(x) (x)
-#define OTABSL_PREDICT_TRUE(x) (x)
-#endif
-
-#endif  // OTABSL_BASE_OPTIMIZATION_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/options.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/options.h
deleted file mode 100644
index c4b00a3d3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/options.h
+++ /dev/null
@@ -1,216 +0,0 @@
-#ifndef OTABSL_BASE_OPTIONS_H_
-#define OTABSL_BASE_OPTIONS_H_
-
-// Copyright 2019 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: options.h
-// -----------------------------------------------------------------------------
-//
-// This file contains Abseil configuration options for setting specific
-// implementations instead of letting Abseil determine which implementation to
-// use at compile-time. Setting these options may be useful for package or build
-// managers who wish to guarantee ABI stability within binary builds (which are
-// otherwise difficult to enforce).
-//
-// *** IMPORTANT NOTICE FOR PACKAGE MANAGERS:  It is important that
-// maintainers of package managers who wish to package Abseil read and
-// understand this file! ***
-//
-// Abseil contains a number of possible configuration endpoints, based on
-// parameters such as the detected platform, language version, or command-line
-// flags used to invoke the underlying binary. As is the case with all
-// libraries, binaries which contain Abseil code must ensure that separate
-// packages use the same compiled copy of Abseil to avoid a diamond dependency
-// problem, which can occur if two packages built with different Abseil
-// configuration settings are linked together. Diamond dependency problems in
-// C++ may manifest as violations to the One Definition Rule (ODR) (resulting in
-// linker errors), or undefined behavior (resulting in crashes).
-//
-// Diamond dependency problems can be avoided if all packages utilize the same
-// exact version of Abseil. Building from source code with the same compilation
-// parameters is the easiest way to avoid such dependency problems. However, for
-// package managers who cannot control such compilation parameters, we are
-// providing the file to allow you to inject ABI (Application Binary Interface)
-// stability across builds. Settings options in this file will neither change
-// API nor ABI, providing a stable copy of Abseil between packages.
-//
-// Care must be taken to keep options within these configurations isolated
-// from any other dynamic settings, such as command-line flags which could alter
-// these options. This file is provided specifically to help build and package
-// managers provide a stable copy of Abseil within their libraries and binaries;
-// other developers should not have need to alter the contents of this file.
-//
-// -----------------------------------------------------------------------------
-// Usage
-// -----------------------------------------------------------------------------
-//
-// For any particular package release, set the appropriate definitions within
-// this file to whatever value makes the most sense for your package(s). Note
-// that, by default, most of these options, at the moment, affect the
-// implementation of types; future options may affect other implementation
-// details.
-//
-// NOTE: the defaults within this file all assume that Abseil can select the
-// proper Abseil implementation at compile-time, which will not be sufficient
-// to guarantee ABI stability to package managers.
-
-// Include a standard library header to allow configuration based on the
-// standard library in use.
-// Using C++20 feature-test macros when possible, otherwise fall back to
-// ciso646/iso646.h.There are warnings when including ciso646 in C++17 mode
-#ifdef __has_include
-#  if __has_include(<version>)
-#    include <version>
-#  endif
-#elif defined(_MSC_VER) && \
-    ((defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L))
-#  if _MSC_VER >= 1922
-#    include <version>
-#  endif
-#else
-#  if defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wcpp"
-#  elif defined(__clang__) || defined(__apple_build_version__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wcpp"
-#  endif
-#  include <ciso646>
-#  if defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
-#      pragma GCC diagnostic pop
-#  elif defined(__clang__) || defined(__apple_build_version__)
-#    pragma clang diagnostic pop
-#  endif
-#endif
-
-// -----------------------------------------------------------------------------
-// Type Compatibility Options
-// -----------------------------------------------------------------------------
-//
-// OTABSL_OPTION_USE_STD_ANY
-//
-// This option controls whether absl::OTABSL_OPTION_NAMESPACE_NAME::any is implemented as an alias to
-// std::any, or as an independent implementation.
-//
-// A value of 0 means to use Abseil's implementation.  This requires only C++11
-// support, and is expected to work on every toolchain we support.
-//
-// A value of 1 means to use an alias to std::any.  This requires that all code
-// using Abseil is built in C++17 mode or later.
-//
-// A value of 2 means to detect the C++ version being used to compile Abseil,
-// and use an alias only if a working std::any is available.  This option is
-// useful when you are building your entire program, including all of its
-// dependencies, from source.  It should not be used otherwise -- for example,
-// if you are distributing Abseil in a binary package manager -- since in
-// mode 2, absl::OTABSL_OPTION_NAMESPACE_NAME::any will name a different type, with a different mangled name
-// and binary layout, depending on the compiler flags passed by the end user.
-// For more info, see https://abseil.io/about/design/dropin-types.
-//
-// User code should not inspect this macro.  To check in the preprocessor if
-// absl::OTABSL_OPTION_NAMESPACE_NAME::any is a typedef of std::any, use the feature macro OTABSL_USES_STD_ANY.
-
-#define OTABSL_OPTION_USE_STD_ANY 0
-
-
-// OTABSL_OPTION_USE_STD_OPTIONAL
-//
-// This option controls whether absl::OTABSL_OPTION_NAMESPACE_NAME::optional is implemented as an alias to
-// std::optional, or as an independent implementation.
-//
-// A value of 0 means to use Abseil's implementation.  This requires only C++11
-// support, and is expected to work on every toolchain we support.
-//
-// A value of 1 means to use an alias to std::optional.  This requires that all
-// code using Abseil is built in C++17 mode or later.
-//
-// A value of 2 means to detect the C++ version being used to compile Abseil,
-// and use an alias only if a working std::optional is available.  This option
-// is useful when you are building your program from source.  It should not be
-// used otherwise -- for example, if you are distributing Abseil in a binary
-// package manager -- since in mode 2, absl::OTABSL_OPTION_NAMESPACE_NAME::optional will name a different
-// type, with a different mangled name and binary layout, depending on the
-// compiler flags passed by the end user.  For more info, see
-// https://abseil.io/about/design/dropin-types.
-
-// User code should not inspect this macro.  To check in the preprocessor if
-// absl::OTABSL_OPTION_NAMESPACE_NAME::optional is a typedef of std::optional, use the feature macro
-// OTABSL_USES_STD_OPTIONAL.
-
-#define OTABSL_OPTION_USE_STD_OPTIONAL 0
-
-
-// OTABSL_OPTION_USE_STD_STRING_VIEW
-//
-// This option controls whether absl::OTABSL_OPTION_NAMESPACE_NAME::string_view is implemented as an alias to
-// std::string_view, or as an independent implementation.
-//
-// A value of 0 means to use Abseil's implementation.  This requires only C++11
-// support, and is expected to work on every toolchain we support.
-//
-// A value of 1 means to use an alias to std::string_view.  This requires that
-// all code using Abseil is built in C++17 mode or later.
-//
-// A value of 2 means to detect the C++ version being used to compile Abseil,
-// and use an alias only if a working std::string_view is available.  This
-// option is useful when you are building your program from source.  It should
-// not be used otherwise -- for example, if you are distributing Abseil in a
-// binary package manager -- since in mode 2, absl::OTABSL_OPTION_NAMESPACE_NAME::string_view will name a
-// different type, with a different mangled name and binary layout, depending on
-// the compiler flags passed by the end user.  For more info, see
-// https://abseil.io/about/design/dropin-types.
-//
-// User code should not inspect this macro.  To check in the preprocessor if
-// absl::OTABSL_OPTION_NAMESPACE_NAME::string_view is a typedef of std::string_view, use the feature macro
-// OTABSL_USES_STD_STRING_VIEW.
-
-#define OTABSL_OPTION_USE_STD_STRING_VIEW 0
-
-// OTABSL_OPTION_USE_STD_VARIANT
-//
-// This option controls whether absl::OTABSL_OPTION_NAMESPACE_NAME::variant is implemented as an alias to
-// std::variant, or as an independent implementation.
-//
-// A value of 0 means to use Abseil's implementation.  This requires only C++11
-// support, and is expected to work on every toolchain we support.
-//
-// A value of 1 means to use an alias to std::variant.  This requires that all
-// code using Abseil is built in C++17 mode or later.
-//
-// A value of 2 means to detect the C++ version being used to compile Abseil,
-// and use an alias only if a working std::variant is available.  This option
-// is useful when you are building your program from source.  It should not be
-// used otherwise -- for example, if you are distributing Abseil in a binary
-// package manager -- since in mode 2, absl::OTABSL_OPTION_NAMESPACE_NAME::variant will name a different
-// type, with a different mangled name and binary layout, depending on the
-// compiler flags passed by the end user.  For more info, see
-// https://abseil.io/about/design/dropin-types.
-//
-// User code should not inspect this macro.  To check in the preprocessor if
-// absl::OTABSL_OPTION_NAMESPACE_NAME::variant is a typedef of std::variant, use the feature macro
-// OTABSL_USES_STD_VARIANT.
-
-#define OTABSL_OPTION_USE_STD_VARIANT 0
-
-
-// OTABSL_OPTION_NAMESPACE_NAME
-//
-// All codes in otabsl are under OTABSL_OPTION_NAMESPACE_NAME, we do not use inline namespace to avoid
-// conlict with external Abseil.
-
-#define OTABSL_OPTION_NAMESPACE_NAME otel_v1
-
-#endif  // OTABSL_BASE_OPTIONS_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/policy_checks.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/policy_checks.h
deleted file mode 100644
index f86c264fc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/policy_checks.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: policy_checks.h
-// -----------------------------------------------------------------------------
-//
-// This header enforces a minimum set of policies at build time, such as the
-// supported compiler and library versions. Unsupported configurations are
-// reported with `#error`. This enforcement is best effort, so successfully
-// compiling this header does not guarantee a supported configuration.
-
-#ifndef OTABSL_BASE_POLICY_CHECKS_H_
-#define OTABSL_BASE_POLICY_CHECKS_H_
-
-// Included for the __GLIBC_PREREQ macro used below.
-#include <limits.h>
-
-// Included for the _STLPORT_VERSION macro used below.
-#if defined(__cplusplus)
-#include <cstddef>
-#endif
-
-// -----------------------------------------------------------------------------
-// Operating System Check
-// -----------------------------------------------------------------------------
-
-#if defined(__CYGWIN__)
-#error "Cygwin is not supported."
-#endif
-
-// -----------------------------------------------------------------------------
-// Compiler Check
-// -----------------------------------------------------------------------------
-
-#if 0 /* FIXME: MG */
-// We support MSVC++ 14.0 update 2 and later.
-// This minimum will go up.
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER < 190023918 && !defined(__clang__)
-#error "This package requires Visual Studio 2015 Update 2 or higher."
-#endif
-#endif
-
-// We support gcc 4.7 and later.
-// This minimum will go up.
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
-#error "This package requires gcc 4.7 or higher."
-#endif
-#endif
-
-// We support Apple Xcode clang 4.2.1 (version 421.11.65) and later.
-// This corresponds to Apple Xcode version 4.5.
-// This minimum will go up.
-#if defined(__apple_build_version__) && __apple_build_version__ < 4211165
-#error "This package requires __apple_build_version__ of 4211165 or higher."
-#endif
-
-// -----------------------------------------------------------------------------
-// C++ Version Check
-// -----------------------------------------------------------------------------
-
-// Enforce C++11 as the minimum.
-#if defined(_MSVC_LANG)
-#if _MSVC_LANG < 201103L
-#error "C++ versions less than C++11 are not supported."
-#endif  // _MSVC_LANG < 201103L
-#elif defined(__cplusplus)
-#if __cplusplus < 201103L
-#error "C++ versions less than C++11 are not supported."
-#endif  // __cplusplus < 201103L
-#endif
-
-// -----------------------------------------------------------------------------
-// Standard Library Check
-// -----------------------------------------------------------------------------
-
-#if defined(_STLPORT_VERSION)
-#error "STLPort is not supported."
-#endif
-
-// -----------------------------------------------------------------------------
-// `char` Size Check
-// -----------------------------------------------------------------------------
-
-// Abseil currently assumes CHAR_BIT == 8. If you would like to use Abseil on a
-// platform where this is not the case, please provide us with the details about
-// your platform so we can consider relaxing this requirement.
-#if CHAR_BIT != 8
-#error "Abseil assumes CHAR_BIT == 8."
-#endif
-
-// -----------------------------------------------------------------------------
-// `int` Size Check
-// -----------------------------------------------------------------------------
-
-// Abseil currently assumes that an int is 4 bytes. If you would like to use
-// Abseil on a platform where this is not the case, please provide us with the
-// details about your platform so we can consider relaxing this requirement.
-#if INT_MAX < 2147483647
-#error "Abseil assumes that int is at least 4 bytes. "
-#endif
-
-#endif  // OTABSL_BASE_POLICY_CHECKS_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/port.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/port.h
deleted file mode 100644
index aaba551b5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/base/port.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This files is a forwarding header for other headers containing various
-// portability macros and functions.
-// This file is used for both C and C++!
-
-#ifndef OTABSL_BASE_PORT_H_
-#define OTABSL_BASE_PORT_H_
-
-#include "attributes.h"
-#include "config.h"
-#include "optimization.h"
-
-#endif  // OTABSL_BASE_PORT_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/meta/type_traits.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/meta/type_traits.h
deleted file mode 100644
index dbd034887..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/meta/type_traits.h
+++ /dev/null
@@ -1,779 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// type_traits.h
-// -----------------------------------------------------------------------------
-//
-// This file contains C++11-compatible versions of standard <type_traits> API
-// functions for determining the characteristics of types. Such traits can
-// support type inference, classification, and transformation, as well as
-// make it easier to write templates based on generic type behavior.
-//
-// See https://en.cppreference.com/w/cpp/header/type_traits
-//
-// WARNING: use of many of the constructs in this header will count as "complex
-// template metaprogramming", so before proceeding, please carefully consider
-// https://google.github.io/styleguide/cppguide.html#Template_metaprogramming
-//
-// WARNING: using template metaprogramming to detect or depend on API
-// features is brittle and not guaranteed. Neither the standard library nor
-// Abseil provides any guarantee that APIs are stable in the face of template
-// metaprogramming. Use with caution.
-#ifndef OTABSL_META_TYPE_TRAITS_H_
-#define OTABSL_META_TYPE_TRAITS_H_
-
-#include <stddef.h>
-#include <functional>
-#include <type_traits>
-
-#include "../base/config.h"
-
-// MSVC constructibility traits do not detect destructor properties and so our
-// implementations should not use them as a source-of-truth.
-#if defined(_MSC_VER) && !defined(__clang__) && !defined(__GNUC__)
-#define OTABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION 1
-#endif
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-// Defined and documented later on in this file.
-template <typename T>
-struct is_trivially_destructible;
-
-// Defined and documented later on in this file.
-template <typename T>
-struct is_trivially_move_assignable;
-
-namespace type_traits_internal {
-
-// Silence MSVC warnings about the destructor being defined as deleted.
-#if defined(_MSC_VER) && !defined(__GNUC__)
-#pragma warning(push)
-#pragma warning(disable : 4624)
-#endif  // defined(_MSC_VER) && !defined(__GNUC__)
-
-template <class T>
-union SingleMemberUnion {
-  T t;
-};
-
-// Restore the state of the destructor warning that was silenced above.
-#if defined(_MSC_VER) && !defined(__GNUC__)
-#pragma warning(pop)
-#endif  // defined(_MSC_VER) && !defined(__GNUC__)
-
-template <class T>
-struct IsTriviallyMoveConstructibleObject
-    : std::integral_constant<
-          bool, std::is_move_constructible<
-                    type_traits_internal::SingleMemberUnion<T>>::value &&
-                    absl::OTABSL_OPTION_NAMESPACE_NAME::is_trivially_destructible<T>::value> {};
-
-template <class T>
-struct IsTriviallyCopyConstructibleObject
-    : std::integral_constant<
-          bool, std::is_copy_constructible<
-                    type_traits_internal::SingleMemberUnion<T>>::value &&
-                    absl::OTABSL_OPTION_NAMESPACE_NAME::is_trivially_destructible<T>::value> {};
-
-template <class T>
-struct IsTriviallyMoveAssignableReference : std::false_type {};
-
-template <class T>
-struct IsTriviallyMoveAssignableReference<T&>
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::is_trivially_move_assignable<T>::type {};
-
-template <class T>
-struct IsTriviallyMoveAssignableReference<T&&>
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::is_trivially_move_assignable<T>::type {};
-
-template <typename... Ts>
-struct VoidTImpl {
-  using type = void;
-};
-
-////////////////////////////////
-// Library Fundamentals V2 TS //
-////////////////////////////////
-
-// NOTE: The `is_detected` family of templates here differ from the library
-// fundamentals specification in that for library fundamentals, `Op<Args...>` is
-// evaluated as soon as the type `is_detected<Op, Args...>` undergoes
-// substitution, regardless of whether or not the `::value` is accessed. That
-// is inconsistent with all other standard traits and prevents lazy evaluation
-// in larger contexts (such as if the `is_detected` check is a trailing argument
-// of a `conjunction`. This implementation opts to instead be lazy in the same
-// way that the standard traits are (this "defect" of the detection idiom
-// specifications has been reported).
-
-template <class Enabler, template <class...> class Op, class... Args>
-struct is_detected_impl {
-  using type = std::false_type;
-};
-
-template <template <class...> class Op, class... Args>
-struct is_detected_impl<typename VoidTImpl<Op<Args...>>::type, Op, Args...> {
-  using type = std::true_type;
-};
-
-template <template <class...> class Op, class... Args>
-struct is_detected : is_detected_impl<void, Op, Args...>::type {};
-
-template <class Enabler, class To, template <class...> class Op, class... Args>
-struct is_detected_convertible_impl {
-  using type = std::false_type;
-};
-
-template <class To, template <class...> class Op, class... Args>
-struct is_detected_convertible_impl<
-    typename std::enable_if<std::is_convertible<Op<Args...>, To>::value>::type,
-    To, Op, Args...> {
-  using type = std::true_type;
-};
-
-template <class To, template <class...> class Op, class... Args>
-struct is_detected_convertible
-    : is_detected_convertible_impl<void, To, Op, Args...>::type {};
-
-template <typename T>
-using IsCopyAssignableImpl =
-    decltype(std::declval<T&>() = std::declval<const T&>());
-
-template <typename T>
-using IsMoveAssignableImpl = decltype(std::declval<T&>() = std::declval<T&&>());
-
-}  // namespace type_traits_internal
-
-// MSVC 19.10 and higher have a regression that causes our workarounds to fail, but their
-// std forms now appear to be compliant.
-#if defined(_MSC_VER) && !defined(__clang__) && (_MSC_VER >= 1910)
-
-template <typename T>
-using is_copy_assignable = std::is_copy_assignable<T>;
-
-template <typename T>
-using is_move_assignable = std::is_move_assignable<T>;
-
-#else
-
-template <typename T>
-struct is_copy_assignable : type_traits_internal::is_detected<
-                                type_traits_internal::IsCopyAssignableImpl, T> {
-};
-
-template <typename T>
-struct is_move_assignable : type_traits_internal::is_detected<
-                                type_traits_internal::IsMoveAssignableImpl, T> {
-};
-
-#endif
-
-// void_t()
-//
-// Ignores the type of any its arguments and returns `void`. In general, this
-// metafunction allows you to create a general case that maps to `void` while
-// allowing specializations that map to specific types.
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::void_t` metafunction.
-//
-// NOTE: `absl::OTABSL_OPTION_NAMESPACE_NAME::void_t` does not use the standard-specified implementation so
-// that it can remain compatible with gcc < 5.1. This can introduce slightly
-// different behavior, such as when ordering partial specializations.
-template <typename... Ts>
-using void_t = typename type_traits_internal::VoidTImpl<Ts...>::type;
-
-// conjunction
-//
-// Performs a compile-time logical AND operation on the passed types (which
-// must have  `::value` members convertible to `bool`. Short-circuits if it
-// encounters any `false` members (and does not compare the `::value` members
-// of any remaining arguments).
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::conjunction` metafunction.
-template <typename... Ts>
-struct conjunction;
-
-template <typename T, typename... Ts>
-struct conjunction<T, Ts...>
-    : std::conditional<T::value, conjunction<Ts...>, T>::type {};
-
-template <typename T>
-struct conjunction<T> : T {};
-
-template <>
-struct conjunction<> : std::true_type {};
-
-// disjunction
-//
-// Performs a compile-time logical OR operation on the passed types (which
-// must have  `::value` members convertible to `bool`. Short-circuits if it
-// encounters any `true` members (and does not compare the `::value` members
-// of any remaining arguments).
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::disjunction` metafunction.
-template <typename... Ts>
-struct disjunction;
-
-template <typename T, typename... Ts>
-struct disjunction<T, Ts...> :
-      std::conditional<T::value, T, disjunction<Ts...>>::type {};
-
-template <typename T>
-struct disjunction<T> : T {};
-
-template <>
-struct disjunction<> : std::false_type {};
-
-// negation
-//
-// Performs a compile-time logical NOT operation on the passed type (which
-// must have  `::value` members convertible to `bool`.
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::negation` metafunction.
-template <typename T>
-struct negation : std::integral_constant<bool, !T::value> {};
-
-// is_function()
-//
-// Determines whether the passed type `T` is a function type.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_function()` metafunction for platforms that have incomplete C++11
-// support (such as libstdc++ 4.x).
-//
-// This metafunction works because appending `const` to a type does nothing to
-// function types and reference types (and forms a const-qualified type
-// otherwise).
-template <typename T>
-struct is_function
-    : std::integral_constant<
-          bool, !(std::is_reference<T>::value ||
-                  std::is_const<typename std::add_const<T>::type>::value)> {};
-
-// is_trivially_destructible()
-//
-// Determines whether the passed type `T` is trivially destructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_destructible()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: the extensions (__has_trivial_xxx) are implemented in gcc (version >=
-// 4.3) and clang. Since we are supporting libstdc++ > 4.7, they should always
-// be present. These  extensions are documented at
-// https://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html#Type-Traits.
-template <typename T>
-struct is_trivially_destructible
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-    : std::is_trivially_destructible<T> {
-#else
-    : std::integral_constant<bool, __has_trivial_destructor(T) &&
-                                   std::is_destructible<T>::value> {
-#endif
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
- private:
-  static constexpr bool compliant = std::is_trivially_destructible<T>::value ==
-                                    is_trivially_destructible::value;
-  static_assert(compliant || std::is_trivially_destructible<T>::value,
-                "Not compliant with std::is_trivially_destructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_destructible<T>::value,
-                "Not compliant with std::is_trivially_destructible; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-};
-
-// is_trivially_default_constructible()
-//
-// Determines whether the passed type `T` is trivially default constructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_default_constructible()` metafunction for platforms that
-// have incomplete C++11 support (such as libstdc++ 4.x). On any platforms that
-// do fully support C++11, we check whether this yields the same result as the
-// std implementation.
-//
-// NOTE: according to the C++ standard, Section: 20.15.4.3 [meta.unary.prop]
-// "The predicate condition for a template specialization is_constructible<T,
-// Args...> shall be satisfied if and only if the following variable
-// definition would be well-formed for some invented variable t:
-//
-// T t(declval<Args>()...);
-//
-// is_trivially_constructible<T, Args...> additionally requires that the
-// variable definition does not call any operation that is not trivial.
-// For the purposes of this check, the call to std::declval is considered
-// trivial."
-//
-// Notes from https://en.cppreference.com/w/cpp/types/is_constructible:
-// In many implementations, is_nothrow_constructible also checks if the
-// destructor throws because it is effectively noexcept(T(arg)). Same
-// applies to is_trivially_constructible, which, in these implementations, also
-// requires that the destructor is trivial.
-// GCC bug 51452: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51452
-// LWG issue 2116: http://cplusplus.github.io/LWG/lwg-active.html#2116.
-//
-// "T obj();" need to be well-formed and not call any nontrivial operation.
-// Nontrivially destructible types will cause the expression to be nontrivial.
-template <typename T>
-struct is_trivially_default_constructible
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
-    : std::is_trivially_default_constructible<T> {
-#else
-    : std::integral_constant<bool, __has_trivial_constructor(T) &&
-                                   std::is_default_constructible<T>::value &&
-                                   is_trivially_destructible<T>::value> {
-#endif
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
-    !defined(                                            \
-        OTABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
- private:
-  static constexpr bool compliant =
-      std::is_trivially_default_constructible<T>::value ==
-      is_trivially_default_constructible::value;
-  static_assert(compliant || std::is_trivially_default_constructible<T>::value,
-                "Not compliant with std::is_trivially_default_constructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_default_constructible<T>::value,
-                "Not compliant with std::is_trivially_default_constructible; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-};
-
-// is_trivially_move_constructible()
-//
-// Determines whether the passed type `T` is trivially move constructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_move_constructible()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `T obj(declval<T>());` needs to be well-formed and not call any
-// nontrivial operation.  Nontrivially destructible types will cause the
-// expression to be nontrivial.
-template <typename T>
-struct is_trivially_move_constructible
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
-    : std::is_trivially_move_constructible<T> {
-#else
-    : std::conditional<
-          std::is_object<T>::value && !std::is_array<T>::value,
-          type_traits_internal::IsTriviallyMoveConstructibleObject<T>,
-          std::is_reference<T>>::type::type {
-#endif
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
-    !defined(                                            \
-        OTABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
- private:
-  static constexpr bool compliant =
-      std::is_trivially_move_constructible<T>::value ==
-      is_trivially_move_constructible::value;
-  static_assert(compliant || std::is_trivially_move_constructible<T>::value,
-                "Not compliant with std::is_trivially_move_constructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_move_constructible<T>::value,
-                "Not compliant with std::is_trivially_move_constructible; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-};
-
-// is_trivially_copy_constructible()
-//
-// Determines whether the passed type `T` is trivially copy constructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_copy_constructible()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `T obj(declval<const T&>());` needs to be well-formed and not call any
-// nontrivial operation.  Nontrivially destructible types will cause the
-// expression to be nontrivial.
-template <typename T>
-struct is_trivially_copy_constructible
-    : std::conditional<
-          std::is_object<T>::value && !std::is_array<T>::value,
-          type_traits_internal::IsTriviallyCopyConstructibleObject<T>,
-          std::is_lvalue_reference<T>>::type::type {
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
-    !defined(                                            \
-        OTABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
- private:
-  static constexpr bool compliant =
-      std::is_trivially_copy_constructible<T>::value ==
-      is_trivially_copy_constructible::value;
-  static_assert(compliant || std::is_trivially_copy_constructible<T>::value,
-                "Not compliant with std::is_trivially_copy_constructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_copy_constructible<T>::value,
-                "Not compliant with std::is_trivially_copy_constructible; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-};
-
-// is_trivially_move_assignable()
-//
-// Determines whether the passed type `T` is trivially move assignable.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_move_assignable()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `is_assignable<T, U>::value` is `true` if the expression
-// `declval<T>() = declval<U>()` is well-formed when treated as an unevaluated
-// operand. `is_trivially_assignable<T, U>` requires the assignment to call no
-// operation that is not trivial. `is_trivially_copy_assignable<T>` is simply
-// `is_trivially_assignable<T&, T>`.
-template <typename T>
-struct is_trivially_move_assignable
-    : std::conditional<
-          std::is_object<T>::value && !std::is_array<T>::value &&
-              std::is_move_assignable<T>::value,
-          std::is_move_assignable<type_traits_internal::SingleMemberUnion<T>>,
-          type_traits_internal::IsTriviallyMoveAssignableReference<T>>::type::
-          type {
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
- private:
-  static constexpr bool compliant =
-      std::is_trivially_move_assignable<T>::value ==
-      is_trivially_move_assignable::value;
-  static_assert(compliant || std::is_trivially_move_assignable<T>::value,
-                "Not compliant with std::is_trivially_move_assignable; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_move_assignable<T>::value,
-                "Not compliant with std::is_trivially_move_assignable; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-};
-
-// is_trivially_copy_assignable()
-//
-// Determines whether the passed type `T` is trivially copy assignable.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_copy_assignable()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `is_assignable<T, U>::value` is `true` if the expression
-// `declval<T>() = declval<U>()` is well-formed when treated as an unevaluated
-// operand. `is_trivially_assignable<T, U>` requires the assignment to call no
-// operation that is not trivial. `is_trivially_copy_assignable<T>` is simply
-// `is_trivially_assignable<T&, const T&>`.
-template <typename T>
-struct is_trivially_copy_assignable
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-    : std::is_trivially_copy_assignable<T> {
-#else
-    : std::integral_constant<
-          bool, __has_trivial_assign(typename std::remove_reference<T>::type) &&
-                    absl::OTABSL_OPTION_NAMESPACE_NAME::is_copy_assignable<T>::value> {
-#endif
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
- private:
-  static constexpr bool compliant =
-      std::is_trivially_copy_assignable<T>::value ==
-      is_trivially_copy_assignable::value;
-  static_assert(compliant || std::is_trivially_copy_assignable<T>::value,
-                "Not compliant with std::is_trivially_copy_assignable; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_copy_assignable<T>::value,
-                "Not compliant with std::is_trivially_copy_assignable; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-};
-
-namespace type_traits_internal {
-// is_trivially_copyable()
-//
-// Determines whether the passed type `T` is trivially copyable.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_copyable()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). We use the C++17 definition
-// of TriviallyCopyable.
-//
-// NOTE: `is_trivially_copyable<T>::value` is `true` if all of T's copy/move
-// constructors/assignment operators are trivial or deleted, T has at least
-// one non-deleted copy/move constructor/assignment operator, and T is trivially
-// destructible. Arrays of trivially copyable types are trivially copyable.
-//
-// We expose this metafunction only for internal use within absl.
-
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE)
-template <typename T>
-struct is_trivially_copyable : std::is_trivially_copyable<T> {};
-#else
-template <typename T>
-class is_trivially_copyable_impl {
-  using ExtentsRemoved = typename std::remove_all_extents<T>::type;
-  static constexpr bool kIsCopyOrMoveConstructible =
-      std::is_copy_constructible<ExtentsRemoved>::value ||
-      std::is_move_constructible<ExtentsRemoved>::value;
-  static constexpr bool kIsCopyOrMoveAssignable =
-      absl::OTABSL_OPTION_NAMESPACE_NAME::is_copy_assignable<ExtentsRemoved>::value ||
-      absl::OTABSL_OPTION_NAMESPACE_NAME::is_move_assignable<ExtentsRemoved>::value;
-
- public:
-  static constexpr bool kValue =
-      (__has_trivial_copy(ExtentsRemoved) || !kIsCopyOrMoveConstructible) &&
-      (__has_trivial_assign(ExtentsRemoved) || !kIsCopyOrMoveAssignable) &&
-      (kIsCopyOrMoveConstructible || kIsCopyOrMoveAssignable) &&
-      is_trivially_destructible<ExtentsRemoved>::value &&
-      // We need to check for this explicitly because otherwise we'll say
-      // references are trivial copyable when compiled by MSVC.
-      !std::is_reference<ExtentsRemoved>::value;
-};
-
-template <typename T>
-struct is_trivially_copyable
-    : std::integral_constant<
-          bool, type_traits_internal::is_trivially_copyable_impl<T>::kValue> {};
-#endif
-}  // namespace type_traits_internal
-
-// -----------------------------------------------------------------------------
-// C++14 "_t" trait aliases
-// -----------------------------------------------------------------------------
-
-template <typename T>
-using remove_cv_t = typename std::remove_cv<T>::type;
-
-template <typename T>
-using remove_const_t = typename std::remove_const<T>::type;
-
-template <typename T>
-using remove_volatile_t = typename std::remove_volatile<T>::type;
-
-template <typename T>
-using add_cv_t = typename std::add_cv<T>::type;
-
-template <typename T>
-using add_const_t = typename std::add_const<T>::type;
-
-template <typename T>
-using add_volatile_t = typename std::add_volatile<T>::type;
-
-template <typename T>
-using remove_reference_t = typename std::remove_reference<T>::type;
-
-template <typename T>
-using add_lvalue_reference_t = typename std::add_lvalue_reference<T>::type;
-
-template <typename T>
-using add_rvalue_reference_t = typename std::add_rvalue_reference<T>::type;
-
-template <typename T>
-using remove_pointer_t = typename std::remove_pointer<T>::type;
-
-template <typename T>
-using add_pointer_t = typename std::add_pointer<T>::type;
-
-template <typename T>
-using make_signed_t = typename std::make_signed<T>::type;
-
-template <typename T>
-using make_unsigned_t = typename std::make_unsigned<T>::type;
-
-template <typename T>
-using remove_extent_t = typename std::remove_extent<T>::type;
-
-template <typename T>
-using remove_all_extents_t = typename std::remove_all_extents<T>::type;
-
-template <typename T>
-using decay_t = typename std::decay<T>::type;
-
-template <bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-template <bool B, typename T, typename F>
-using conditional_t = typename std::conditional<B, T, F>::type;
-
-template <typename... T>
-using common_type_t = typename std::common_type<T...>::type;
-
-template <typename T>
-using underlying_type_t = typename std::underlying_type<T>::type;
-
-namespace type_traits_internal {
-
-#if (!defined(_MSVC_LANG) && (__cplusplus >= 201703L)) || \
-    (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L))
-// std::result_of is deprecated (C++17) or removed (C++20)
-template<typename> struct result_of;
-template<typename F, typename... Args>
-struct result_of<F(Args...)> : std::invoke_result<F, Args...> {};
-#else
-template<typename F> using result_of = std::result_of<F>;
-#endif
-
-}  // namespace type_traits_internal
-
-template<typename F>
-using result_of_t = typename type_traits_internal::result_of<F>::type;
-
-namespace type_traits_internal {
-// In MSVC we can't probe std::hash or stdext::hash because it triggers a
-// static_assert instead of failing substitution. Libc++ prior to 4.0
-// also used a static_assert.
-//
-#if defined(_MSC_VER) || (defined(_LIBCPP_VERSION) && \
-                          _LIBCPP_VERSION < 4000 && _LIBCPP_STD_VER > 11)
-#define OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_ 0
-#else
-#define OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_ 1
-#endif
-
-#if !OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
-template <typename Key, typename = size_t>
-struct IsHashable : std::true_type {};
-#else   // OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
-template <typename Key, typename = void>
-struct IsHashable : std::false_type {};
-
-template <typename Key>
-struct IsHashable<
-    Key,
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<std::is_convertible<
-        decltype(std::declval<std::hash<Key>&>()(std::declval<Key const&>())),
-        std::size_t>::value>> : std::true_type {};
-#endif  // !OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
-
-struct AssertHashEnabledHelper {
- private:
-  static void Sink(...) {}
-  struct NAT {};
-
-  template <class Key>
-  static auto GetReturnType(int)
-      -> decltype(std::declval<std::hash<Key>>()(std::declval<Key const&>()));
-  template <class Key>
-  static NAT GetReturnType(...);
-
-  template <class Key>
-  static std::nullptr_t DoIt() {
-    static_assert(IsHashable<Key>::value,
-                  "std::hash<Key> does not provide a call operator");
-    static_assert(
-        std::is_default_constructible<std::hash<Key>>::value,
-        "std::hash<Key> must be default constructible when it is enabled");
-    static_assert(
-        std::is_copy_constructible<std::hash<Key>>::value,
-        "std::hash<Key> must be copy constructible when it is enabled");
-    static_assert(absl::OTABSL_OPTION_NAMESPACE_NAME::is_copy_assignable<std::hash<Key>>::value,
-                  "std::hash<Key> must be copy assignable when it is enabled");
-    // is_destructible is unchecked as it's implied by each of the
-    // is_constructible checks.
-    using ReturnType = decltype(GetReturnType<Key>(0));
-    static_assert(std::is_same<ReturnType, NAT>::value ||
-                      std::is_same<ReturnType, size_t>::value,
-                  "std::hash<Key> must return size_t");
-    return nullptr;
-  }
-
-  template <class... Ts>
-  friend void AssertHashEnabled();
-};
-
-template <class... Ts>
-inline void AssertHashEnabled() {
-  using Helper = AssertHashEnabledHelper;
-  Helper::Sink(Helper::DoIt<Ts>()...);
-}
-
-}  // namespace type_traits_internal
-
-// An internal namespace that is required to implement the C++17 swap traits.
-// It is not further nested in type_traits_internal to avoid long symbol names.
-namespace swap_internal {
-
-// Necessary for the traits.
-using std::swap;
-
-// This declaration prevents global `swap` and `absl::OTABSL_OPTION_NAMESPACE_NAME::swap` overloads from being
-// considered unless ADL picks them up.
-void swap();
-
-template <class T>
-using IsSwappableImpl = decltype(swap(std::declval<T&>(), std::declval<T&>()));
-
-// NOTE: This dance with the default template parameter is for MSVC.
-template <class T,
-          class IsNoexcept = std::integral_constant<
-              bool, noexcept(swap(std::declval<T&>(), std::declval<T&>()))>>
-using IsNothrowSwappableImpl = typename std::enable_if<IsNoexcept::value>::type;
-
-// IsSwappable
-//
-// Determines whether the standard swap idiom is a valid expression for
-// arguments of type `T`.
-template <class T>
-struct IsSwappable
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::type_traits_internal::is_detected<IsSwappableImpl, T> {};
-
-// IsNothrowSwappable
-//
-// Determines whether the standard swap idiom is a valid expression for
-// arguments of type `T` and is noexcept.
-template <class T>
-struct IsNothrowSwappable
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::type_traits_internal::is_detected<IsNothrowSwappableImpl, T> {};
-
-// Swap()
-//
-// Performs the swap idiom from a namespace where valid candidates may only be
-// found in `std` or via ADL.
-template <class T, absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<IsSwappable<T>::value, int> = 0>
-void Swap(T& lhs, T& rhs) noexcept(IsNothrowSwappable<T>::value) {
-  swap(lhs, rhs);
-}
-
-// StdSwapIsUnconstrained
-//
-// Some standard library implementations are broken in that they do not
-// constrain `std::swap`. This will effectively tell us if we are dealing with
-// one of those implementations.
-using StdSwapIsUnconstrained = IsSwappable<void()>;
-
-}  // namespace swap_internal
-
-namespace type_traits_internal {
-
-// Make the swap-related traits/function accessible from this namespace.
-using swap_internal::IsNothrowSwappable;
-using swap_internal::IsSwappable;
-using swap_internal::Swap;
-using swap_internal::StdSwapIsUnconstrained;
-
-}  // namespace type_traits_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_META_TYPE_TRAITS_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/bad_variant_access.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/bad_variant_access.h
deleted file mode 100644
index 89fe750db..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/bad_variant_access.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2018 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// bad_variant_access.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines the `absl::OTABSL_OPTION_NAMESPACE_NAME::bad_variant_access` type.
-
-#ifndef OTABSL_TYPES_BAD_VARIANT_ACCESS_H_
-#define OTABSL_TYPES_BAD_VARIANT_ACCESS_H_
-
-#include <stdexcept>
-
-#include "../base/config.h"
-
-#ifdef OTABSL_USES_STD_VARIANT
-
-#include <variant>
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-using std::bad_variant_access;
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#else  // OTABSL_USES_STD_VARIANT
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-// -----------------------------------------------------------------------------
-// bad_variant_access
-// -----------------------------------------------------------------------------
-//
-// An `absl::OTABSL_OPTION_NAMESPACE_NAME::bad_variant_access` type is an exception type that is thrown in
-// the following cases:
-//
-//   * Calling `absl::OTABSL_OPTION_NAMESPACE_NAME::get(absl::OTABSL_OPTION_NAMESPACE_NAME::variant) with an index or type that does not
-//     match the currently selected alternative type
-//   * Calling `absl::OTABSL_OPTION_NAMESPACE_NAME::visit on an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` that is in the
-//     `variant::valueless_by_exception` state.
-//
-// Example:
-//
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string> v;
-//   v = 1;
-//   try {
-//     absl::OTABSL_OPTION_NAMESPACE_NAME::get<std::string>(v);
-//   } catch(const absl::OTABSL_OPTION_NAMESPACE_NAME::bad_variant_access& e) {
-//     std::cout << "Bad variant access: " << e.what() << '\n';
-//   }
-class bad_variant_access : public std::exception {
- public:
-  bad_variant_access() noexcept = default;
-  ~bad_variant_access() override;
-  const char* what() const noexcept override;
-};
-
-namespace variant_internal {
-#ifdef THROW_BAD_VARIANT_ACCESS
-// Header-only implementation with static throw implementation.
-// No need to link against Abseil library.
-[[noreturn]] static inline void ThrowBadVariantAccess()
-{
-  THROW_BAD_VARIANT_ACCESS;
-}
-//[[noreturn]] static inline void Rethrow()
-//{
-//  THROW_BAD_VARIANT_ACCESS; // Unused!
-//};
-#else
-// Original implementation requires linking Abseil library!
-[[noreturn]] void ThrowBadVariantAccess();
-[[noreturn]] void Rethrow();
-#endif
-}  // namespace variant_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_USES_STD_VARIANT
-
-#endif  // OTABSL_TYPES_BAD_VARIANT_ACCESS_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h
deleted file mode 100644
index 43e7285b2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h
+++ /dev/null
@@ -1,1649 +0,0 @@
-// Copyright 2018 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Implementation details of absl/types/variant.h, pulled into a
-// separate file to avoid cluttering the top of the API header with
-// implementation details.
-
-#ifndef OTABSL_TYPES_variant_internal_H_
-#define OTABSL_TYPES_variant_internal_H_
-
-#include <cassert>
-#include <cstddef>
-#include <cstdlib>
-#include <memory>
-#include <stdexcept>
-#include <tuple>
-#include <type_traits>
-
-#include "../../base/config.h"
-#include "../../base/internal/identity.h"
-#include "../../base/internal/inline_variable.h"
-#include "../../base/internal/invoke.h"
-#include "../../base/macros.h"
-#include "../../base/optimization.h"
-#include "../../meta/type_traits.h"
-#include "../../types/bad_variant_access.h"
-#include "../../utility/utility.h"
-
-#if !defined(OTABSL_USES_STD_VARIANT)
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-template <class... Types>
-class variant;
-
-OTABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, -1);
-
-template <class T>
-struct variant_size;
-
-template <std::size_t I, class T>
-struct variant_alternative;
-
-namespace variant_internal {
-
-// NOTE: See specializations below for details.
-template <std::size_t I, class T>
-struct VariantAlternativeSfinae {};
-
-// Requires: I < variant_size_v<T>.
-//
-// Value: The Ith type of Types...
-template <std::size_t I, class T0, class... Tn>
-struct VariantAlternativeSfinae<I, variant<T0, Tn...>>
-    : VariantAlternativeSfinae<I - 1, variant<Tn...>> {};
-
-// Value: T0
-template <class T0, class... Ts>
-struct VariantAlternativeSfinae<0, variant<T0, Ts...>> {
-  using type = T0;
-};
-
-template <std::size_t I, class T>
-using VariantAlternativeSfinaeT = typename VariantAlternativeSfinae<I, T>::type;
-
-// NOTE: Requires T to be a reference type.
-template <class T, class U>
-struct GiveQualsTo;
-
-template <class T, class U>
-struct GiveQualsTo<T&, U> {
-  using type = U&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<T&&, U> {
-  using type = U&&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<const T&, U> {
-  using type = const U&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<const T&&, U> {
-  using type = const U&&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<volatile T&, U> {
-  using type = volatile U&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<volatile T&&, U> {
-  using type = volatile U&&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<volatile const T&, U> {
-  using type = volatile const U&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<volatile const T&&, U> {
-  using type = volatile const U&&;
-};
-
-template <class T, class U>
-using GiveQualsToT = typename GiveQualsTo<T, U>::type;
-
-// Convenience alias, since size_t integral_constant is used a lot in this file.
-template <std::size_t I>
-using SizeT = std::integral_constant<std::size_t, I>;
-
-using NPos = SizeT<variant_npos>;
-
-template <class Variant, class T, class = void>
-struct IndexOfConstructedType {};
-
-template <std::size_t I, class Variant>
-struct VariantAccessResultImpl;
-
-template <std::size_t I, template <class...> class Variantemplate, class... T>
-struct VariantAccessResultImpl<I, Variantemplate<T...>&> {
-  using type = typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type&;
-};
-
-template <std::size_t I, template <class...> class Variantemplate, class... T>
-struct VariantAccessResultImpl<I, const Variantemplate<T...>&> {
-  using type =
-      const typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type&;
-};
-
-template <std::size_t I, template <class...> class Variantemplate, class... T>
-struct VariantAccessResultImpl<I, Variantemplate<T...>&&> {
-  using type = typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type&&;
-};
-
-template <std::size_t I, template <class...> class Variantemplate, class... T>
-struct VariantAccessResultImpl<I, const Variantemplate<T...>&&> {
-  using type =
-      const typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type&&;
-};
-
-template <std::size_t I, class Variant>
-using VariantAccessResult =
-    typename VariantAccessResultImpl<I, Variant&&>::type;
-
-// NOTE: This is used instead of std::array to reduce instantiation overhead.
-template <class T, std::size_t Size>
-struct SimpleArray {
-  static_assert(Size != 0, "");
-  T value[Size];
-};
-
-template <class T>
-struct AccessedType {
-  using type = T;
-};
-
-template <class T>
-using AccessedTypeT = typename AccessedType<T>::type;
-
-template <class T, std::size_t Size>
-struct AccessedType<SimpleArray<T, Size>> {
-  using type = AccessedTypeT<T>;
-};
-
-template <class T>
-constexpr T AccessSimpleArray(const T& value) {
-  return value;
-}
-
-template <class T, std::size_t Size, class... SizeT>
-constexpr AccessedTypeT<T> AccessSimpleArray(const SimpleArray<T, Size>& table,
-                                             std::size_t head_index,
-                                             SizeT... tail_indices) {
-  return AccessSimpleArray(table.value[head_index], tail_indices...);
-}
-
-// Note: Intentionally is an alias.
-template <class T>
-using AlwaysZero = SizeT<0>;
-
-template <class Op, class... Vs>
-struct VisitIndicesResultImpl {
-  using type = absl::OTABSL_OPTION_NAMESPACE_NAME::result_of_t<Op(AlwaysZero<Vs>...)>;
-};
-
-template <class Op, class... Vs>
-using VisitIndicesResultT = typename VisitIndicesResultImpl<Op, Vs...>::type;
-
-template <class ReturnType, class FunctionObject, class EndIndices,
-          class BoundIndices>
-struct MakeVisitationMatrix;
-
-template <class ReturnType, class FunctionObject, std::size_t... Indices>
-constexpr ReturnType call_with_indices(FunctionObject&& function) {
-  static_assert(
-      std::is_same<ReturnType, decltype(std::declval<FunctionObject>()(
-                                   SizeT<Indices>()...))>::value,
-      "Not all visitation overloads have the same return type.");
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::forward<FunctionObject>(function)(SizeT<Indices>()...);
-}
-
-template <class ReturnType, class FunctionObject, std::size_t... BoundIndices>
-struct MakeVisitationMatrix<ReturnType, FunctionObject, index_sequence<>,
-                            index_sequence<BoundIndices...>> {
-  using ResultType = ReturnType (*)(FunctionObject&&);
-  // cppcheck-suppress [duplInheritedMember]
-  static constexpr ResultType Run() {
-    return &call_with_indices<ReturnType, FunctionObject,
-                              (BoundIndices - 1)...>;
-  }
-};
-
-template <typename Is, std::size_t J>
-struct AppendToIndexSequence;
-
-template <typename Is, std::size_t J>
-using AppendToIndexSequenceT = typename AppendToIndexSequence<Is, J>::type;
-
-template <std::size_t... Is, std::size_t J>
-struct AppendToIndexSequence<index_sequence<Is...>, J> {
-  using type = index_sequence<Is..., J>;
-};
-
-template <class ReturnType, class FunctionObject, class EndIndices,
-          class CurrIndices, class BoundIndices>
-struct MakeVisitationMatrixImpl;
-
-template <class ReturnType, class FunctionObject, class EndIndices,
-          std::size_t... CurrIndices, class BoundIndices>
-struct MakeVisitationMatrixImpl<ReturnType, FunctionObject, EndIndices,
-                                index_sequence<CurrIndices...>, BoundIndices> {
-  using ResultType = SimpleArray<
-      typename MakeVisitationMatrix<ReturnType, FunctionObject, EndIndices,
-                                    index_sequence<>>::ResultType,
-      sizeof...(CurrIndices)>;
-
-  static constexpr ResultType Run() {
-    return {{MakeVisitationMatrix<
-        ReturnType, FunctionObject, EndIndices,
-        AppendToIndexSequenceT<BoundIndices, CurrIndices>>::Run()...}};
-  }
-};
-
-template <class ReturnType, class FunctionObject, std::size_t HeadEndIndex,
-          std::size_t... TailEndIndices, std::size_t... BoundIndices>
-struct MakeVisitationMatrix<ReturnType, FunctionObject,
-                            index_sequence<HeadEndIndex, TailEndIndices...>,
-                            index_sequence<BoundIndices...>>
-    : MakeVisitationMatrixImpl<ReturnType, FunctionObject,
-                               index_sequence<TailEndIndices...>,
-                               absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<HeadEndIndex>,
-                               index_sequence<BoundIndices...>> {};
-
-struct UnreachableSwitchCase {
-  template <class Op>
-  [[noreturn]] static VisitIndicesResultT<Op, std::size_t> Run(
-      Op&& /*ignored*/) {
-#if OTABSL_HAVE_BUILTIN(__builtin_unreachable) || \
-    (defined(__GNUC__) && !defined(__clang__))
-    __builtin_unreachable();
-#elif defined(_MSC_VER)
-    __assume(false);
-#else
-    // Try to use assert of false being identified as an unreachable intrinsic.
-    // NOTE: We use assert directly to increase chances of exploiting an assume
-    //       intrinsic.
-    assert(false);  // NOLINT
-
-    // Hack to silence potential no return warning -- cause an infinite loop.
-    return Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-#endif  // Checks for __builtin_unreachable
-  }
-};
-
-template <class Op, std::size_t I>
-struct ReachableSwitchCase {
-  static VisitIndicesResultT<Op, std::size_t> Run(Op&& op) {
-    return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op), SizeT<I>());
-  }
-};
-
-// The number 33 is just a guess at a reasonable maximum to our switch. It is
-// not based on any analysis. The reason it is a power of 2 plus 1 instead of a
-// power of 2 is because the number was picked to correspond to a power of 2
-// amount of "normal" alternatives, plus one for the possibility of the user
-// providing "monostate" in addition to the more natural alternatives.
-OTABSL_INTERNAL_INLINE_CONSTEXPR(std::size_t, MaxUnrolledVisitCases, 33);
-
-// Note: The default-definition is for unreachable cases.
-template <bool IsReachable>
-struct PickCaseImpl {
-  template <class Op, std::size_t I>
-  using Apply = UnreachableSwitchCase;
-};
-
-template <>
-struct PickCaseImpl</*IsReachable =*/true> {
-  template <class Op, std::size_t I>
-  using Apply = ReachableSwitchCase<Op, I>;
-};
-
-// Note: This form of dance with template aliases is to make sure that we
-//       instantiate a number of templates proportional to the number of variant
-//       alternatives rather than a number of templates proportional to our
-//       maximum unrolled amount of visitation cases (aliases are effectively
-//       "free" whereas other template instantiations are costly).
-template <class Op, std::size_t I, std::size_t EndIndex>
-using PickCase = typename PickCaseImpl<(I < EndIndex)>::template Apply<Op, I>;
-
-template <class ReturnType>
-[[noreturn]] ReturnType TypedThrowBadVariantAccess() {
-  absl::OTABSL_OPTION_NAMESPACE_NAME::variant_internal::ThrowBadVariantAccess();
-}
-
-// Given N variant sizes, determine the number of cases there would need to be
-// in a single switch-statement that would cover every possibility in the
-// corresponding N-ary visit operation.
-template <std::size_t... NumAlternatives>
-struct NumCasesOfSwitch;
-
-template <std::size_t HeadNumAlternatives, std::size_t... TailNumAlternatives>
-struct NumCasesOfSwitch<HeadNumAlternatives, TailNumAlternatives...> {
-  static constexpr std::size_t value =
-      (HeadNumAlternatives + 1) *
-      NumCasesOfSwitch<TailNumAlternatives...>::value;
-};
-
-template <>
-struct NumCasesOfSwitch<> {
-  static constexpr std::size_t value = 1;
-};
-
-// A switch statement optimizes better than the table of function pointers.
-template <std::size_t EndIndex>
-struct VisitIndicesSwitch {
-  static_assert(EndIndex <= MaxUnrolledVisitCases,
-                "Maximum unrolled switch size exceeded.");
-
-  template <class Op>
-  static VisitIndicesResultT<Op, std::size_t> Run(Op&& op, std::size_t i) {
-    switch (i) {
-      case 0:
-        return PickCase<Op, 0, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 1:
-        return PickCase<Op, 1, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 2:
-        return PickCase<Op, 2, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 3:
-        return PickCase<Op, 3, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 4:
-        return PickCase<Op, 4, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 5:
-        return PickCase<Op, 5, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 6:
-        return PickCase<Op, 6, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 7:
-        return PickCase<Op, 7, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 8:
-        return PickCase<Op, 8, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 9:
-        return PickCase<Op, 9, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 10:
-        return PickCase<Op, 10, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 11:
-        return PickCase<Op, 11, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 12:
-        return PickCase<Op, 12, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 13:
-        return PickCase<Op, 13, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 14:
-        return PickCase<Op, 14, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 15:
-        return PickCase<Op, 15, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 16:
-        return PickCase<Op, 16, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 17:
-        return PickCase<Op, 17, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 18:
-        return PickCase<Op, 18, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 19:
-        return PickCase<Op, 19, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 20:
-        return PickCase<Op, 20, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 21:
-        return PickCase<Op, 21, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 22:
-        return PickCase<Op, 22, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 23:
-        return PickCase<Op, 23, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 24:
-        return PickCase<Op, 24, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 25:
-        return PickCase<Op, 25, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 26:
-        return PickCase<Op, 26, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 27:
-        return PickCase<Op, 27, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 28:
-        return PickCase<Op, 28, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 29:
-        return PickCase<Op, 29, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 30:
-        return PickCase<Op, 30, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 31:
-        return PickCase<Op, 31, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 32:
-        return PickCase<Op, 32, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      default:
-        OTABSL_ASSERT(i == variant_npos);
-        return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op), NPos());
-    }
-  }
-};
-
-template <std::size_t... EndIndices>
-struct VisitIndicesFallback {
-  template <class Op, class... SizeT>
-  static VisitIndicesResultT<Op, SizeT...> Run(Op&& op, SizeT... indices) {
-    return AccessSimpleArray(
-        MakeVisitationMatrix<VisitIndicesResultT<Op, SizeT...>, Op,
-                             index_sequence<(EndIndices + 1)...>,
-                             index_sequence<>>::Run(),
-        (indices + 1)...)(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-  }
-};
-
-// Take an N-dimensional series of indices and convert them into a single index
-// without loss of information. The purpose of this is to be able to convert an
-// N-ary visit operation into a single switch statement.
-template <std::size_t...>
-struct FlattenIndices;
-
-template <std::size_t HeadSize, std::size_t... TailSize>
-struct FlattenIndices<HeadSize, TailSize...> {
-  template<class... SizeType>
-  static constexpr std::size_t Run(std::size_t head, SizeType... tail) {
-    return head + HeadSize * FlattenIndices<TailSize...>::Run(tail...);
-  }
-};
-
-template <>
-struct FlattenIndices<> {
-  static constexpr std::size_t Run() { return 0; }
-};
-
-// Take a single "flattened" index (flattened by FlattenIndices) and determine
-// the value of the index of one of the logically represented dimensions.
-template <std::size_t I, std::size_t IndexToGet, std::size_t HeadSize,
-          std::size_t... TailSize>
-struct UnflattenIndex {
-  static constexpr std::size_t value =
-      UnflattenIndex<I / HeadSize, IndexToGet - 1, TailSize...>::value;
-};
-
-template <std::size_t I, std::size_t HeadSize, std::size_t... TailSize>
-struct UnflattenIndex<I, 0, HeadSize, TailSize...> {
-  static constexpr std::size_t value = (I % HeadSize);
-};
-
-// The backend for converting an N-ary visit operation into a unary visit.
-template <class IndexSequence, std::size_t... EndIndices>
-struct VisitIndicesVariadicImpl;
-
-template <std::size_t... N, std::size_t... EndIndices>
-struct VisitIndicesVariadicImpl<absl::OTABSL_OPTION_NAMESPACE_NAME::index_sequence<N...>, EndIndices...> {
-  // A type that can take an N-ary function object and converts it to a unary
-  // function object that takes a single, flattened index, and "unflattens" it
-  // into its individual dimensions when forwarding to the wrapped object.
-  template <class Op>
-  struct FlattenedOp {
-    template <std::size_t I>
-    VisitIndicesResultT<Op, decltype(EndIndices)...> operator()(
-        SizeT<I> /*index*/) && {
-      return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(
-          absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op),
-          SizeT<UnflattenIndex<I, N, (EndIndices + 1)...>::value -
-                std::size_t{1}>()...);
-    }
-
-    Op&& op;
-  };
-
-  template <class Op, class... SizeType>
-  static VisitIndicesResultT<Op, decltype(EndIndices)...> Run(
-      Op&& op, SizeType... i) {
-    return VisitIndicesSwitch<NumCasesOfSwitch<EndIndices...>::value>::Run(
-        FlattenedOp<Op>{absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op)},
-        FlattenIndices<(EndIndices + std::size_t{1})...>::Run(
-            (i + std::size_t{1})...));
-  }
-};
-
-template <std::size_t... EndIndices>
-struct VisitIndicesVariadic
-    : VisitIndicesVariadicImpl<absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<sizeof...(EndIndices)>,
-                               EndIndices...> {};
-
-// This implementation will flatten N-ary visit operations into a single switch
-// statement when the number of cases would be less than our maximum specified
-// switch-statement size.
-// TODO(calabrese)
-//   Based on benchmarks, determine whether the function table approach actually
-//   does optimize better than a chain of switch statements and possibly update
-//   the implementation accordingly. Also consider increasing the maximum switch
-//   size.
-template <std::size_t... EndIndices>
-struct VisitIndices
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<(NumCasesOfSwitch<EndIndices...>::value <=
-                           MaxUnrolledVisitCases),
-                          VisitIndicesVariadic<EndIndices...>,
-                          VisitIndicesFallback<EndIndices...>> {};
-
-template <std::size_t EndIndex>
-struct VisitIndices<EndIndex>
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<(EndIndex <= MaxUnrolledVisitCases),
-                          VisitIndicesSwitch<EndIndex>,
-                          VisitIndicesFallback<EndIndex>> {};
-
-// Suppress bogus warning on MSVC: MSVC complains that the `reinterpret_cast`
-// below is returning the address of a temporary or local object.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4172)
-#endif  // _MSC_VER
-
-// TODO(calabrese) std::launder
-// TODO(calabrese) constexpr
-// NOTE: DO NOT REMOVE the `inline` keyword as it is necessary to work around a
-// MSVC bug. See https://github.com/abseil/abseil-cpp/issues/129 for details.
-template <class Self, std::size_t I>
-inline VariantAccessResult<I, Self> AccessUnion(Self&& self, SizeT<I> /*i*/) {
-  return reinterpret_cast<VariantAccessResult<I, Self>>(self);
-}
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif  // _MSC_VER
-
-template <class T>
-void DeducedDestroy(T& self) {  // NOLINT
-  self.~T();
-}
-
-// NOTE: This type exists as a single entity for variant and its bases to
-// befriend. It contains helper functionality that manipulates the state of the
-// variant, such as the implementation of things like assignment and emplace
-// operations.
-struct VariantCoreAccess {
-  template <class VariantType>
-  static typename VariantType::Variant& Derived(VariantType& self) {  // NOLINT
-    return static_cast<typename VariantType::Variant&>(self);
-  }
-
-  template <class VariantType>
-  static const typename VariantType::Variant& Derived(
-      const VariantType& self) {  // NOLINT
-    return static_cast<const typename VariantType::Variant&>(self);
-  }
-
-  template <class VariantType>
-  static void Destroy(VariantType& self) {  // NOLINT
-    Derived(self).destroy();
-    self.index_ = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos;
-  }
-
-  template <class Variant>
-  static void SetIndex(Variant& self, std::size_t i) {  // NOLINT
-    self.index_ = i;
-  }
-
-  template <class Variant>
-  static void InitFrom(Variant& self, Variant&& other) {  // NOLINT
-    VisitIndices<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size<Variant>::value>::Run(
-        InitFromVisitor<Variant, Variant&&>{&self,
-                                            std::forward<Variant>(other)},
-        other.index());
-    self.index_ = other.index();
-  }
-
-  // Access a variant alternative, assuming the index is correct.
-  template <std::size_t I, class Variant>
-  static VariantAccessResult<I, Variant> Access(Variant&& self) {
-    // This cast instead of invocation of AccessUnion with an rvalue is a
-    // workaround for msvc. Without this there is a runtime failure when dealing
-    // with rvalues.
-    // TODO(calabrese) Reduce test case and find a simpler workaround.
-    return static_cast<VariantAccessResult<I, Variant>>(
-        variant_internal::AccessUnion(self.state_, SizeT<I>()));
-  }
-
-  // Access a variant alternative, throwing if the index is incorrect.
-  template <std::size_t I, class Variant>
-  static VariantAccessResult<I, Variant> CheckedAccess(Variant&& self) {
-    if (OTABSL_PREDICT_FALSE(self.index_ != I)) {
-      TypedThrowBadVariantAccess<VariantAccessResult<I, Variant>>();
-    }
-
-    return Access<I>(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Variant>(self));
-  }
-
-  // The implementation of the move-assignment operation for a variant.
-  template <class VType>
-  struct MoveAssignVisitor {
-    using DerivedType = typename VType::Variant;
-    template <std::size_t NewIndex>
-    void operator()(SizeT<NewIndex> /*new_i*/) const {
-      if (left->index_ == NewIndex) {
-        Access<NewIndex>(*left) = std::move(Access<NewIndex>(*right));
-      } else {
-        Derived(*left).template emplace<NewIndex>(
-            std::move(Access<NewIndex>(*right)));
-      }
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*new_i*/) const {
-      Destroy(*left);
-    }
-
-    VType* left;
-    VType* right;
-  };
-
-  template <class VType>
-  static MoveAssignVisitor<VType> MakeMoveAssignVisitor(VType* left,
-                                                        VType* other) {
-    return {left, other};
-  }
-
-  // The implementation of the assignment operation for a variant.
-  template <class VType>
-  struct CopyAssignVisitor {
-    using DerivedType = typename VType::Variant;
-    template <std::size_t NewIndex>
-    void operator()(SizeT<NewIndex> /*new_i*/) const {
-      using New =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex, DerivedType>::type;
-
-      if (left->index_ == NewIndex) {
-        Access<NewIndex>(*left) = Access<NewIndex>(*right);
-      } else if (std::is_nothrow_copy_constructible<New>::value ||
-                 !std::is_nothrow_move_constructible<New>::value) {
-        Derived(*left).template emplace<NewIndex>(Access<NewIndex>(*right));
-      } else {
-        Derived(*left) = DerivedType(Derived(*right));
-      }
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*new_i*/) const {
-      Destroy(*left);
-    }
-
-    VType* left;
-    const VType* right;
-  };
-
-  template <class VType>
-  static CopyAssignVisitor<VType> MakeCopyAssignVisitor(VType* left,
-                                                        const VType& other) {
-    return {left, &other};
-  }
-
-  // The implementation of conversion-assignment operations for variant.
-  template <class Left, class QualifiedNew>
-  struct ConversionAssignVisitor {
-    using NewIndex =
-        variant_internal::IndexOfConstructedType<Left, QualifiedNew>;
-
-    void operator()(SizeT<NewIndex::value> /*old_i*/
-                    ) const {
-      Access<NewIndex::value>(*left) = absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedNew>(other);
-    }
-
-    template <std::size_t OldIndex>
-    void operator()(SizeT<OldIndex> /*old_i*/
-                    ) const {
-      using New =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex::value, Left>::type;
-      if (std::is_nothrow_constructible<New, QualifiedNew>::value ||
-          !std::is_nothrow_move_constructible<New>::value) {
-        left->template emplace<NewIndex::value>(
-            absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedNew>(other));
-      } else {
-        // the standard says "equivalent to
-        // operator=(variant(std::forward<T>(t)))", but we use `emplace` here
-        // because the variant's move assignment operator could be deleted.
-        left->template emplace<NewIndex::value>(
-            New(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedNew>(other)));
-      }
-    }
-
-    Left* left;
-    QualifiedNew&& other;
-  };
-
-  template <class Left, class QualifiedNew>
-  static ConversionAssignVisitor<Left, QualifiedNew>
-  MakeConversionAssignVisitor(Left* left, QualifiedNew&& qual) {
-    return {left, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedNew>(qual)};
-  }
-
-  // Backend for operations for `emplace()` which destructs `*self` then
-  // construct a new alternative with `Args...`.
-  template <std::size_t NewIndex, class Self, class... Args>
-  static typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex, Self>::type& Replace(
-      Self* self, Args&&... args) {
-    Destroy(*self);
-    using New = typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex, Self>::type;
-    // cppcheck-suppress [legacyUninitvar]
-    New* const result = ::new (static_cast<void*>(&self->state_))
-        New(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-    self->index_ = NewIndex;
-    return *result;
-  }
-
-  template <class LeftVariant, class QualifiedRightVariant>
-  struct InitFromVisitor {
-    template <std::size_t NewIndex>
-    void operator()(SizeT<NewIndex> /*new_i*/) const {
-      using Alternative =
-          typename variant_alternative<NewIndex, LeftVariant>::type;
-      ::new (static_cast<void*>(&left->state_)) Alternative(
-          Access<NewIndex>(std::forward<QualifiedRightVariant>(right)));
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*new_i*/) const {
-      // This space intentionally left blank.
-    }
-    LeftVariant* left;
-    QualifiedRightVariant&& right;
-  };
-};
-
-template <class Expected, class... T>
-struct IndexOfImpl;
-
-template <class Expected>
-struct IndexOfImpl<Expected> {
-  using IndexFromEnd = SizeT<0>;
-  using MatchedIndexFromEnd = IndexFromEnd;
-  using MultipleMatches = std::false_type;
-};
-
-template <class Expected, class Head, class... Tail>
-struct IndexOfImpl<Expected, Head, Tail...> : IndexOfImpl<Expected, Tail...> {
-  using IndexFromEnd =
-      SizeT<IndexOfImpl<Expected, Tail...>::IndexFromEnd::value + 1>;
-};
-
-template <class Expected, class... Tail>
-struct IndexOfImpl<Expected, Expected, Tail...>
-    : IndexOfImpl<Expected, Tail...> {
-  using IndexFromEnd =
-      SizeT<IndexOfImpl<Expected, Tail...>::IndexFromEnd::value + 1>;
-  using MatchedIndexFromEnd = IndexFromEnd;
-  using MultipleMatches = std::integral_constant<
-      bool, IndexOfImpl<Expected, Tail...>::MatchedIndexFromEnd::value != 0>;
-};
-
-template <class Expected, class... Types>
-struct IndexOfMeta {
-  using Results = IndexOfImpl<Expected, Types...>;
-  static_assert(!Results::MultipleMatches::value,
-                "Attempted to access a variant by specifying a type that "
-                "matches more than one alternative.");
-  static_assert(Results::MatchedIndexFromEnd::value != 0,
-                "Attempted to access a variant by specifying a type that does "
-                "not match any alternative.");
-  using type = SizeT<sizeof...(Types) - Results::MatchedIndexFromEnd::value>;
-};
-
-template <class Expected, class... Types>
-using IndexOf = typename IndexOfMeta<Expected, Types...>::type;
-
-template <class Variant, class T, std::size_t CurrIndex>
-struct UnambiguousIndexOfImpl;
-
-// Terminating case encountered once we've checked all of the alternatives
-template <class T, std::size_t CurrIndex>
-struct UnambiguousIndexOfImpl<variant<>, T, CurrIndex> : SizeT<CurrIndex> {};
-
-// Case where T is not Head
-template <class Head, class... Tail, class T, std::size_t CurrIndex>
-struct UnambiguousIndexOfImpl<variant<Head, Tail...>, T, CurrIndex>
-    : UnambiguousIndexOfImpl<variant<Tail...>, T, CurrIndex + 1>::type {};
-
-// Case where T is Head
-template <class Head, class... Tail, std::size_t CurrIndex>
-struct UnambiguousIndexOfImpl<variant<Head, Tail...>, Head, CurrIndex>
-    : SizeT<UnambiguousIndexOfImpl<variant<Tail...>, Head, 0>::value ==
-                    sizeof...(Tail)
-                ? CurrIndex
-                : CurrIndex + sizeof...(Tail) + 1> {};
-
-template <class Variant, class T>
-struct UnambiguousIndexOf;
-
-struct NoMatch {
-  struct type {};
-};
-
-template <class... Alts, class T>
-struct UnambiguousIndexOf<variant<Alts...>, T>
-    : std::conditional<UnambiguousIndexOfImpl<variant<Alts...>, T, 0>::value !=
-                           sizeof...(Alts),
-                       UnambiguousIndexOfImpl<variant<Alts...>, T, 0>,
-                       NoMatch>::type::type {};
-
-template <class T, std::size_t /*Dummy*/>
-using UnambiguousTypeOfImpl = T;
-
-template <class Variant, class T>
-using UnambiguousTypeOfT =
-    UnambiguousTypeOfImpl<T, UnambiguousIndexOf<Variant, T>::value>;
-
-template <class H, class... T>
-class VariantStateBase;
-
-// This is an implementation of the "imaginary function" that is described in
-// [variant.ctor]
-// It is used in order to determine which alternative to construct during
-// initialization from some type T.
-template <class Variant, std::size_t I = 0>
-struct ImaginaryFun;
-
-template <std::size_t I>
-struct ImaginaryFun<variant<>, I> {
-  static void Run() = delete;
-};
-
-template <class H, class... T, std::size_t I>
-struct ImaginaryFun<variant<H, T...>, I> : ImaginaryFun<variant<T...>, I + 1> {
-  using ImaginaryFun<variant<T...>, I + 1>::Run;
-
-  // NOTE: const& and && are used instead of by-value due to lack of guaranteed
-  // move elision of C++17. This may have other minor differences, but tests
-  // pass.
-  static SizeT<I> Run(const H&, SizeT<I>);
-  static SizeT<I> Run(H&&, SizeT<I>);
-};
-
-// The following metafunctions are used in constructor and assignment
-// constraints.
-template <class Self, class T>
-struct IsNeitherSelfNorInPlace : std::true_type {};
-
-template <class Self>
-struct IsNeitherSelfNorInPlace<Self, Self> : std::false_type {};
-
-template <class Self, class T>
-struct IsNeitherSelfNorInPlace<Self, in_place_type_t<T>> : std::false_type {};
-
-template <class Self, std::size_t I>
-struct IsNeitherSelfNorInPlace<Self, in_place_index_t<I>> : std::false_type {};
-
-template <class Variant, class T, class = void>
-struct ConversionIsPossibleImpl : std::false_type {};
-
-template <class Variant, class T>
-struct ConversionIsPossibleImpl<
-    Variant, T,
-    void_t<decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {}))>>
-    : std::true_type {};
-
-template <class Variant, class T>
-struct ConversionIsPossible : ConversionIsPossibleImpl<Variant, T>::type {};
-
-template <class Variant, class T>
-struct IndexOfConstructedType<
-    Variant, T,
-    void_t<decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {}))>>
-    : decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {})) {};
-
-template <std::size_t... Is>
-struct ContainsVariantNPos
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::negation<std::is_same<  // NOLINT
-          absl::OTABSL_OPTION_NAMESPACE_NAME::integer_sequence<bool, 0 <= Is...>,
-          absl::OTABSL_OPTION_NAMESPACE_NAME::integer_sequence<bool, Is != absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos...>>> {};
-
-template <class Op, class... QualifiedVariants>
-using RawVisitResult =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::result_of_t<Op(VariantAccessResult<0, QualifiedVariants>...)>;
-
-// NOTE: The spec requires that all return-paths yield the same type and is not
-// SFINAE-friendly, so we can deduce the return type by examining the first
-// result. If it's not callable, then we get an error, but are compliant and
-// fast to compile.
-// TODO(calabrese) Possibly rewrite in a way that yields better compile errors
-// at the cost of longer compile-times.
-template <class Op, class... QualifiedVariants>
-struct VisitResultImpl {
-  using type =
-      absl::OTABSL_OPTION_NAMESPACE_NAME::result_of_t<Op(VariantAccessResult<0, QualifiedVariants>...)>;
-};
-
-// Done in two steps intentionally so that we don't cause substitution to fail.
-template <class Op, class... QualifiedVariants>
-using VisitResult = typename VisitResultImpl<Op, QualifiedVariants...>::type;
-
-template <class Op, class... QualifiedVariants>
-struct PerformVisitation {
-  using ReturnType = VisitResult<Op, QualifiedVariants...>;
-
-  template <std::size_t... Is>
-  constexpr ReturnType operator()(SizeT<Is>... indices) const {
-    return Run(typename ContainsVariantNPos<Is...>::type{},
-               absl::OTABSL_OPTION_NAMESPACE_NAME::index_sequence_for<QualifiedVariants...>(), indices...);
-  }
-
-  template <std::size_t... TupIs, std::size_t... Is>
-  constexpr ReturnType Run(std::false_type /*has_valueless*/,
-                           index_sequence<TupIs...>, SizeT<Is>...) const {
-    static_assert(
-        std::is_same<ReturnType,
-                     absl::OTABSL_OPTION_NAMESPACE_NAME::result_of_t<Op(VariantAccessResult<
-                                          Is, QualifiedVariants>...)>>::value,
-        "All visitation overloads must have the same return type.");
-    return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(
-        absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op),
-        VariantCoreAccess::Access<Is>(
-            absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedVariants>(std::get<TupIs>(variant_tup)))...);
-  }
-
-  template <std::size_t... TupIs, std::size_t... Is>
-  [[noreturn]] ReturnType Run(std::true_type /*has_valueless*/,
-                              index_sequence<TupIs...>, SizeT<Is>...) const {
-    absl::OTABSL_OPTION_NAMESPACE_NAME::variant_internal::ThrowBadVariantAccess();
-  }
-
-  // TODO(calabrese) Avoid using a tuple, which causes lots of instantiations
-  // Attempts using lambda variadic captures fail on current GCC.
-  std::tuple<QualifiedVariants&&...> variant_tup;
-  Op&& op;
-};
-
-template <class... T>
-union Union;
-
-// We want to allow for variant<> to be trivial. For that, we need the default
-// constructor to be trivial, which means we can't define it ourselves.
-// Instead, we use a non-default constructor that takes NoopConstructorTag
-// that doesn't affect the triviality of the types.
-struct NoopConstructorTag {};
-
-template <std::size_t I>
-struct EmplaceTag {};
-
-template <>
-union Union<> {
-  constexpr explicit Union(NoopConstructorTag) noexcept {}
-};
-
-// Suppress bogus warning on MSVC: MSVC complains that Union<T...> has a defined
-// deleted destructor from the `std::is_destructible` check below.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4624)
-#endif  // _MSC_VER
-
-template <class Head, class... Tail>
-union Union<Head, Tail...> {
-  using TailUnion = Union<Tail...>;
-
-  explicit constexpr Union(NoopConstructorTag /*tag*/) noexcept
-      : tail(NoopConstructorTag()) {}
-
-  template <class... P>
-  explicit constexpr Union(EmplaceTag<0>, P&&... args)
-      : head(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...) {}
-
-  template <std::size_t I, class... P>
-  explicit constexpr Union(EmplaceTag<I>, P&&... args)
-      : tail(EmplaceTag<I - 1>{}, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...) {}
-
-  Head head;
-  TailUnion tail;
-};
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif  // _MSC_VER
-
-// TODO(calabrese) Just contain a Union in this union (certain configs fail).
-template <class... T>
-union DestructibleUnionImpl;
-
-template <>
-union DestructibleUnionImpl<> {
-  constexpr explicit DestructibleUnionImpl(NoopConstructorTag) noexcept {}
-};
-
-template <class Head, class... Tail>
-union DestructibleUnionImpl<Head, Tail...> {
-  using TailUnion = DestructibleUnionImpl<Tail...>;
-
-  explicit constexpr DestructibleUnionImpl(NoopConstructorTag /*tag*/) noexcept
-      : tail(NoopConstructorTag()) {}
-
-  template <class... P>
-  explicit constexpr DestructibleUnionImpl(EmplaceTag<0>, P&&... args)
-      : head(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...) {}
-
-  template <std::size_t I, class... P>
-  explicit constexpr DestructibleUnionImpl(EmplaceTag<I>, P&&... args)
-      : tail(EmplaceTag<I - 1>{}, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...) {}
-
-  ~DestructibleUnionImpl() {}
-
-  Head head;
-  TailUnion tail;
-};
-
-// This union type is destructible even if one or more T are not trivially
-// destructible. In the case that all T are trivially destructible, then so is
-// this resultant type.
-template <class... T>
-using DestructibleUnion =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<std::is_destructible<Union<T...>>::value, Union<T...>,
-                        DestructibleUnionImpl<T...>>;
-
-// Deepest base, containing the actual union and the discriminator
-template <class H, class... T>
-class VariantStateBase {
- protected:
-  using Variant = variant<H, T...>;
-
-  template <class LazyH = H,
-            class ConstructibleH = absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<
-                std::is_default_constructible<LazyH>::value, LazyH>>
-  constexpr VariantStateBase() noexcept(
-      std::is_nothrow_default_constructible<ConstructibleH>::value)
-      : state_(EmplaceTag<0>()), index_(0) {}
-
-  template <std::size_t I, class... P>
-  explicit constexpr VariantStateBase(EmplaceTag<I> tag, P&&... args)
-      : state_(tag, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...), index_(I) {}
-
-  explicit constexpr VariantStateBase(NoopConstructorTag)
-      : state_(NoopConstructorTag()), index_(variant_npos) {}
-
-  void destroy() {}  // Does nothing (shadowed in child if non-trivial)
-
-  DestructibleUnion<H, T...> state_;
-  std::size_t index_;
-};
-
-using absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity;
-
-// OverloadSet::Overload() is a unary function which is overloaded to
-// take any of the element types of the variant, by reference-to-const.
-// The return type of the overload on T is identity<T>, so that you
-// can statically determine which overload was called.
-//
-// Overload() is not defined, so it can only be called in unevaluated
-// contexts.
-template <typename... Ts>
-struct OverloadSet;
-
-template <typename T, typename... Ts>
-struct OverloadSet<T, Ts...> : OverloadSet<Ts...> {
-  using Base = OverloadSet<Ts...>;
-  static identity<T> Overload(const T&);
-  using Base::Overload;
-};
-
-template <>
-struct OverloadSet<> {
-  // For any case not handled above.
-  static void Overload(...);
-};
-
-template <class T>
-using LessThanResult = decltype(std::declval<T>() < std::declval<T>());
-
-template <class T>
-using GreaterThanResult = decltype(std::declval<T>() > std::declval<T>());
-
-template <class T>
-using LessThanOrEqualResult = decltype(std::declval<T>() <= std::declval<T>());
-
-template <class T>
-using GreaterThanOrEqualResult =
-    decltype(std::declval<T>() >= std::declval<T>());
-
-template <class T>
-using EqualResult = decltype(std::declval<T>() == std::declval<T>());
-
-template <class T>
-using NotEqualResult = decltype(std::declval<T>() != std::declval<T>());
-
-using type_traits_internal::is_detected_convertible;
-
-template <class... T>
-using RequireAllHaveEqualT = absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<bool, EqualResult, T>...>::value,
-    bool>;
-
-template <class... T>
-using RequireAllHaveNotEqualT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, NotEqualResult, T>...>::value,
-                      bool>;
-
-template <class... T>
-using RequireAllHaveLessThanT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, LessThanResult, T>...>::value,
-                      bool>;
-
-template <class... T>
-using RequireAllHaveLessThanOrEqualT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, LessThanOrEqualResult, T>...>::value,
-                      bool>;
-
-template <class... T>
-using RequireAllHaveGreaterThanOrEqualT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, GreaterThanOrEqualResult, T>...>::value,
-                      bool>;
-
-template <class... T>
-using RequireAllHaveGreaterThanT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, GreaterThanResult, T>...>::value,
-                      bool>;
-
-// Helper template containing implementations details of variant that can't go
-// in the private section. For convenience, this takes the variant type as a
-// single template parameter.
-template <typename T>
-struct VariantHelper;
-
-template <typename... Ts>
-struct VariantHelper<variant<Ts...>> {
-  // Type metafunction which returns the element type selected if
-  // OverloadSet::Overload() is well-formed when called with argument type U.
-  template <typename U>
-  using BestMatch = decltype(
-      variant_internal::OverloadSet<Ts...>::Overload(std::declval<U>()));
-
-  // Type metafunction which returns true if OverloadSet::Overload() is
-  // well-formed when called with argument type U.
-  // CanAccept can't be just an alias because there is a MSVC bug on parameter
-  // pack expansion involving decltype.
-  template <typename U>
-  struct CanAccept :
-      std::integral_constant<bool, !std::is_void<BestMatch<U>>::value> {};
-
-  // Type metafunction which returns true if Other is an instantiation of
-  // variant, and variants's converting constructor from Other will be
-  // well-formed. We will use this to remove constructors that would be
-  // ill-formed from the overload set.
-  template <typename Other>
-  struct CanConvertFrom;
-
-  template <typename... Us>
-  struct CanConvertFrom<variant<Us...>>
-      : public absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<CanAccept<Us>...> {};
-};
-
-// A type with nontrivial copy ctor and trivial move ctor.
-struct TrivialMoveOnly {
-  TrivialMoveOnly(TrivialMoveOnly&&) = default;
-};
-
-// Trait class to detect whether a type is trivially move constructible.
-// A union's defaulted copy/move constructor is deleted if any variant member's
-// copy/move constructor is nontrivial.
-template <typename T>
-struct IsTriviallyMoveConstructible:
-  std::is_move_constructible<Union<T, TrivialMoveOnly>> {};
-
-// To guarantee triviality of all special-member functions that can be trivial,
-// we use a chain of conditional bases for each one.
-// The order of inheritance of bases from child to base are logically:
-//
-// variant
-// VariantCopyAssignBase
-// VariantMoveAssignBase
-// VariantCopyBase
-// VariantMoveBase
-// VariantStateBaseDestructor
-// VariantStateBase
-//
-// Note that there is a separate branch at each base that is dependent on
-// whether or not that corresponding special-member-function can be trivial in
-// the resultant variant type.
-
-template <class... T>
-class VariantStateBaseDestructorNontrivial;
-
-template <class... T>
-class VariantMoveBaseNontrivial;
-
-template <class... T>
-class VariantCopyBaseNontrivial;
-
-template <class... T>
-class VariantMoveAssignBaseNontrivial;
-
-template <class... T>
-class VariantCopyAssignBaseNontrivial;
-
-// Base that is dependent on whether or not the destructor can be trivial.
-template <class... T>
-using VariantStateBaseDestructor =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<std::is_destructible<Union<T...>>::value,
-                        VariantStateBase<T...>,
-                        VariantStateBaseDestructorNontrivial<T...>>;
-
-// Base that is dependent on whether or not the move-constructor can be
-// implicitly generated by the compiler (trivial or deleted).
-// Previously we were using `std::is_move_constructible<Union<T...>>` to check
-// whether all Ts have trivial move constructor, but it ran into a GCC bug:
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84866
-// So we have to use a different approach (i.e. `HasTrivialMoveConstructor`) to
-// work around the bug.
-template <class... T>
-using VariantMoveBase = absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::disjunction<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::negation<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_move_constructible<T>...>>,
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<IsTriviallyMoveConstructible<T>...>>::value,
-    VariantStateBaseDestructor<T...>, VariantMoveBaseNontrivial<T...>>;
-
-// Base that is dependent on whether or not the copy-constructor can be trivial.
-template <class... T>
-using VariantCopyBase = absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::disjunction<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::negation<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_copy_constructible<T>...>>,
-        std::is_copy_constructible<Union<T...>>>::value,
-    VariantMoveBase<T...>, VariantCopyBaseNontrivial<T...>>;
-
-// Base that is dependent on whether or not the move-assign can be trivial.
-template <class... T>
-using VariantMoveAssignBase = absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::disjunction<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<absl::OTABSL_OPTION_NAMESPACE_NAME::is_move_assignable<Union<T...>>,
-                          std::is_move_constructible<Union<T...>>,
-                          std::is_destructible<Union<T...>>>,
-        absl::OTABSL_OPTION_NAMESPACE_NAME::negation<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_move_constructible<T>...,
-                                         // Note: We're not qualifying this with
-                                         // absl::OTABSL_OPTION_NAMESPACE_NAME:: because it doesn't compile
-                                         // under MSVC.
-                                         is_move_assignable<T>...>>>::value,
-    VariantCopyBase<T...>, VariantMoveAssignBaseNontrivial<T...>>;
-
-// Base that is dependent on whether or not the copy-assign can be trivial.
-template <class... T>
-using VariantCopyAssignBase = absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::disjunction<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<absl::OTABSL_OPTION_NAMESPACE_NAME::is_copy_assignable<Union<T...>>,
-                          std::is_copy_constructible<Union<T...>>,
-                          std::is_destructible<Union<T...>>>,
-        absl::OTABSL_OPTION_NAMESPACE_NAME::negation<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_copy_constructible<T>...,
-                                         // Note: We're not qualifying this with
-                                         // absl::OTABSL_OPTION_NAMESPACE_NAME:: because it doesn't compile
-                                         // under MSVC.
-                                         is_copy_assignable<T>...>>>::value,
-    VariantMoveAssignBase<T...>, VariantCopyAssignBaseNontrivial<T...>>;
-
-template <class... T>
-using VariantBase = VariantCopyAssignBase<T...>;
-
-template <class... T>
-class VariantStateBaseDestructorNontrivial : protected VariantStateBase<T...> {
- private:
-  using Base = VariantStateBase<T...>;
-
- protected:
-  using Base::Base;
-
-  VariantStateBaseDestructorNontrivial() = default;
-  VariantStateBaseDestructorNontrivial(VariantStateBaseDestructorNontrivial&&) =
-      default;
-  VariantStateBaseDestructorNontrivial(
-      const VariantStateBaseDestructorNontrivial&) = default;
-  VariantStateBaseDestructorNontrivial& operator=(
-      VariantStateBaseDestructorNontrivial&&) = default;
-  VariantStateBaseDestructorNontrivial& operator=(
-      const VariantStateBaseDestructorNontrivial&) = default;
-
-  struct Destroyer {
-    template <std::size_t I>
-    void operator()(SizeT<I> i) const {
-      using Alternative =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type;
-      variant_internal::AccessUnion(self->state_, i).~Alternative();
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*i*/) const {
-      // This space intentionally left blank
-    }
-
-    VariantStateBaseDestructorNontrivial* self;
-  };
-
-  // cppcheck-suppress [duplInheritedMember]
-  void destroy() { VisitIndices<sizeof...(T)>::Run(Destroyer{this}, index_); }
-
-  ~VariantStateBaseDestructorNontrivial() { destroy(); }
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-template <class... T>
-class VariantMoveBaseNontrivial : protected VariantStateBaseDestructor<T...> {
- private:
-  using Base = VariantStateBaseDestructor<T...>;
-
- protected:
-  using Base::Base;
-
-  struct Construct {
-    template <std::size_t I>
-    void operator()(SizeT<I> i) const {
-      using Alternative =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type;
-      ::new (static_cast<void*>(&self->state_)) Alternative(
-          variant_internal::AccessUnion(absl::OTABSL_OPTION_NAMESPACE_NAME::move(other->state_), i));
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*i*/) const {}
-
-    VariantMoveBaseNontrivial* self;
-    VariantMoveBaseNontrivial* other;
-  };
-
-  VariantMoveBaseNontrivial() = default;
-  VariantMoveBaseNontrivial(VariantMoveBaseNontrivial&& other) noexcept(
-      absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_nothrow_move_constructible<T>...>::value)
-      : Base(NoopConstructorTag()) {
-    VisitIndices<sizeof...(T)>::Run(Construct{this, &other}, other.index_);
-    index_ = other.index_;
-  }
-
-  VariantMoveBaseNontrivial(VariantMoveBaseNontrivial const&) = default;
-
-  VariantMoveBaseNontrivial& operator=(VariantMoveBaseNontrivial&&) = default;
-  VariantMoveBaseNontrivial& operator=(VariantMoveBaseNontrivial const&) =
-      default;
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-template <class... T>
-class VariantCopyBaseNontrivial : protected VariantMoveBase<T...> {
- private:
-  using Base = VariantMoveBase<T...>;
-
- protected:
-  using Base::Base;
-
-  VariantCopyBaseNontrivial() = default;
-  VariantCopyBaseNontrivial(VariantCopyBaseNontrivial&&) = default;
-
-  struct Construct {
-    template <std::size_t I>
-    void operator()(SizeT<I> i) const {
-      using Alternative =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type;
-      ::new (static_cast<void*>(&self->state_))
-          Alternative(variant_internal::AccessUnion(other->state_, i));
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*i*/) const {}
-
-    VariantCopyBaseNontrivial* self;
-    const VariantCopyBaseNontrivial* other;
-  };
-
-  VariantCopyBaseNontrivial(VariantCopyBaseNontrivial const& other)
-      : Base(NoopConstructorTag()) {
-    VisitIndices<sizeof...(T)>::Run(Construct{this, &other}, other.index_);
-    index_ = other.index_;
-  }
-
-  VariantCopyBaseNontrivial& operator=(VariantCopyBaseNontrivial&&) = default;
-  VariantCopyBaseNontrivial& operator=(VariantCopyBaseNontrivial const&) =
-      default;
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-template <class... T>
-class VariantMoveAssignBaseNontrivial : protected VariantCopyBase<T...> {
-  friend struct VariantCoreAccess;
-
- private:
-  using Base = VariantCopyBase<T...>;
-
- protected:
-  using Base::Base;
-
-  VariantMoveAssignBaseNontrivial() = default;
-  VariantMoveAssignBaseNontrivial(VariantMoveAssignBaseNontrivial&&) = default;
-  VariantMoveAssignBaseNontrivial(const VariantMoveAssignBaseNontrivial&) =
-      default;
-  VariantMoveAssignBaseNontrivial& operator=(
-      VariantMoveAssignBaseNontrivial const&) = default;
-
-    VariantMoveAssignBaseNontrivial&
-    operator=(VariantMoveAssignBaseNontrivial&& other) noexcept(
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_nothrow_move_constructible<T>...,
-                          std::is_nothrow_move_assignable<T>...>::value) {
-      VisitIndices<sizeof...(T)>::Run(
-          VariantCoreAccess::MakeMoveAssignVisitor(this, &other), other.index_);
-      return *this;
-    }
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-template <class... T>
-class VariantCopyAssignBaseNontrivial : protected VariantMoveAssignBase<T...> {
-  friend struct VariantCoreAccess;
-
- private:
-  using Base = VariantMoveAssignBase<T...>;
-
- protected:
-  using Base::Base;
-
-  VariantCopyAssignBaseNontrivial() = default;
-  VariantCopyAssignBaseNontrivial(VariantCopyAssignBaseNontrivial&&) = default;
-  VariantCopyAssignBaseNontrivial(const VariantCopyAssignBaseNontrivial&) =
-      default;
-  VariantCopyAssignBaseNontrivial& operator=(
-      VariantCopyAssignBaseNontrivial&&) = default;
-
-    VariantCopyAssignBaseNontrivial& operator=(
-        const VariantCopyAssignBaseNontrivial& other) {
-      VisitIndices<sizeof...(T)>::Run(
-          VariantCoreAccess::MakeCopyAssignVisitor(this, other), other.index_);
-      return *this;
-    }
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-////////////////////////////////////////
-// Visitors for Comparison Operations //
-////////////////////////////////////////
-
-template <class... Types>
-struct EqualsOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return true;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) == VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct NotEqualsOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return false;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) != VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct LessThanOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return false;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) < VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct GreaterThanOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return false;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) > VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct LessThanOrEqualsOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return true;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) <= VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct GreaterThanOrEqualsOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return true;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) >= VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-// Precondition: v.index() == w.index();
-template <class... Types>
-struct SwapSameIndex {
-  variant<Types...>* v;
-  variant<Types...>* w;
-  template <std::size_t I>
-  void operator()(SizeT<I>) const {
-    type_traits_internal::Swap(VariantCoreAccess::Access<I>(*v),
-                               VariantCoreAccess::Access<I>(*w));
-  }
-
-  void operator()(SizeT<variant_npos>) const {}
-};
-
-// TODO(calabrese) do this from a different namespace for proper adl usage
-template <class... Types>
-struct Swap {
-  variant<Types...>* v;
-  variant<Types...>* w;
-
-  void generic_swap() const {
-    variant<Types...> tmp(std::move(*w));
-    VariantCoreAccess::Destroy(*w);
-    VariantCoreAccess::InitFrom(*w, std::move(*v));
-    VariantCoreAccess::Destroy(*v);
-    VariantCoreAccess::InitFrom(*v, std::move(tmp));
-  }
-
-  void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*w_i*/) const {
-    if (!v->valueless_by_exception()) {
-      generic_swap();
-    }
-  }
-
-  template <std::size_t Wi>
-  void operator()(SizeT<Wi> /*w_i*/) {
-    if (v->index() == Wi) {
-      VisitIndices<sizeof...(Types)>::Run(SwapSameIndex<Types...>{v, w}, Wi);
-    } else {
-      generic_swap();
-    }
-  }
-};
-
-template <typename Variant, typename = void, typename... Ts>
-struct VariantHashBase {
-  VariantHashBase() = delete;
-  VariantHashBase(const VariantHashBase&) = delete;
-  VariantHashBase(VariantHashBase&&) = delete;
-  VariantHashBase& operator=(const VariantHashBase&) = delete;
-  VariantHashBase& operator=(VariantHashBase&&) = delete;
-};
-
-struct VariantHashVisitor {
-  template <typename T>
-  size_t operator()(const T& t) {
-    return std::hash<T>{}(t);
-  }
-};
-
-template <typename Variant, typename... Ts>
-struct VariantHashBase<Variant,
-                       absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<
-                           type_traits_internal::IsHashable<Ts>...>::value>,
-                       Ts...> {
-  using argument_type = Variant;
-  using result_type = size_t;
-  size_t operator()(const Variant& var) const {
-    type_traits_internal::AssertHashEnabled<Ts...>();
-    if (var.valueless_by_exception()) {
-      return 239799884;
-    }
-    size_t result = VisitIndices<variant_size<Variant>::value>::Run(
-        PerformVisitation<VariantHashVisitor, const Variant&>{
-            std::forward_as_tuple(var), VariantHashVisitor{}},
-        var.index());
-    // Combine the index and the hash result in order to distinguish
-    // std::variant<int, int> holding the same value as different alternative.
-    return result ^ var.index();
-  }
-};
-
-}  // namespace variant_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // !defined(OTABSL_USES_STD_VARIANT)
-#endif  // OTABSL_TYPES_variant_internal_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/variant.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/variant.h
deleted file mode 100644
index cbce326c2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/types/variant.h
+++ /dev/null
@@ -1,866 +0,0 @@
-// Copyright 2018 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// variant.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` type for holding a type-safe
-// value of some prescribed set of types (noted as alternative types), and
-// associated functions for managing variants.
-//
-// The `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` type is a form of type-safe union. An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`
-// should always hold a value of one of its alternative types (except in the
-// "valueless by exception state" -- see below). A default-constructed
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` will hold the value of its first alternative type, provided
-// it is default-constructible.
-//
-// In exceptional cases due to error, an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` can hold no
-// value (known as a "valueless by exception" state), though this is not the
-// norm.
-//
-// As with `absl::OTABSL_OPTION_NAMESPACE_NAME::optional`, an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` -- when it holds a value --
-// allocates a value of that type directly within the `variant` itself; it
-// cannot hold a reference, array, or the type `void`; it can, however, hold a
-// pointer to externally managed memory.
-//
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` is a C++11 compatible version of the C++17 `std::variant`
-// abstraction and is designed to be a drop-in replacement for code compliant
-// with C++17.
-
-#ifndef OTABSL_TYPES_VARIANT_H_
-#define OTABSL_TYPES_VARIANT_H_
-
-#include "../base/config.h"
-#include "../utility/utility.h"
-
-#ifdef OTABSL_USES_STD_VARIANT
-
-#include <variant>  // IWYU pragma: export
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-using std::bad_variant_access;
-using std::get;
-using std::get_if;
-using std::holds_alternative;
-using std::monostate;
-using std::variant;
-using std::variant_alternative;
-using std::variant_alternative_t;
-using std::variant_npos;
-using std::variant_size;
-using std::variant_size_v;
-using std::visit;
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#else  // OTABSL_USES_STD_VARIANT
-
-#include <functional>
-#include <new>
-#include <type_traits>
-#include <utility>
-
-#include "../base/macros.h"
-#include "../base/port.h"
-#include "../meta/type_traits.h"
-#include "../types/internal/variant.h"
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-// -----------------------------------------------------------------------------
-// absl::OTABSL_OPTION_NAMESPACE_NAME::variant
-// -----------------------------------------------------------------------------
-//
-// An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` type is a form of type-safe union. An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` --
-// except in exceptional cases -- always holds a value of one of its alternative
-// types.
-//
-// Example:
-//
-//   // Construct a variant that holds either an integer or a std::string and
-//   // assign it to a std::string.
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string> v = std::string("abc");
-//
-//   // A default-constructed variant will hold a value-initialized value of
-//   // the first alternative type.
-//   auto a = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>();   // Holds an int of value '0'.
-//
-//   // variants are assignable.
-//
-//   // copy assignment
-//   auto v1 = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>("abc");
-//   auto v2 = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>(10);
-//   v2 = v1;  // copy assign
-//
-//   // move assignment
-//   auto v1 = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>("abc");
-//   v1 = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>(10);
-//
-//   // assignment through type conversion
-//   a = 128;         // variant contains int
-//   a = "128";       // variant contains std::string
-//
-// An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` holding a value of one of its alternative types `T` holds
-// an allocation of `T` directly within the variant itself. An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`
-// is not allowed to allocate additional storage, such as dynamic memory, to
-// allocate the contained value. The contained value shall be allocated in a
-// region of the variant storage suitably aligned for all alternative types.
-template <typename... Ts>
-class variant;
-
-// swap()
-//
-// Swaps two `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` values. This function is equivalent to `v.swap(w)`
-// where `v` and `w` are `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` types.
-//
-// Note that this function requires all alternative types to be both swappable
-// and move-constructible, because any two variants may refer to either the same
-// type (in which case, they will be swapped) or to two different types (in
-// which case the values will need to be moved).
-//
-template <
-    typename... Ts,
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_move_constructible<Ts>...,
-                          type_traits_internal::IsSwappable<Ts>...>::value,
-        int> = 0>
-void swap(variant<Ts...>& v, variant<Ts...>& w) noexcept(noexcept(v.swap(w))) {
-  v.swap(w);
-}
-
-// variant_size
-//
-// Returns the number of alternative types available for a given `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`
-// type as a compile-time constant expression. As this is a class template, it
-// is not generally useful for accessing the number of alternative types of
-// any given `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` instance.
-//
-// Example:
-//
-//   auto a = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>;
-//   constexpr int num_types =
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>>();
-//
-//   // You can also use the member constant `value`.
-//   constexpr int num_types =
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>>::value;
-//
-//   // `absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size` is more valuable for use in generic code:
-//   template <typename Variant>
-//   constexpr bool IsVariantMultivalue() {
-//       return absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size<Variant>() > 1;
-//   }
-//
-// Note that the set of cv-qualified specializations of `variant_size` are
-// provided to ensure that those specializations compile (especially when passed
-// within template logic).
-template <class T>
-struct variant_size;
-
-template <class... Ts>
-struct variant_size<variant<Ts...>>
-    : std::integral_constant<std::size_t, sizeof...(Ts)> {};
-
-// Specialization of `variant_size` for const qualified variants.
-template <class T>
-struct variant_size<const T> : variant_size<T>::type {};
-
-// Specialization of `variant_size` for volatile qualified variants.
-template <class T>
-struct variant_size<volatile T> : variant_size<T>::type {};
-
-// Specialization of `variant_size` for const volatile qualified variants.
-template <class T>
-struct variant_size<const volatile T> : variant_size<T>::type {};
-
-// variant_alternative
-//
-// Returns the alternative type for a given `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` at the passed
-// index value as a compile-time constant expression. As this is a class
-// template resulting in a type, it is not useful for access of the run-time
-// value of any given `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` variable.
-//
-// Example:
-//
-//   // The type of the 0th alternative is "int".
-//   using alternative_type_0
-//     = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<0, absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>>::type;
-//
-//   static_assert(std::is_same<alternative_type_0, int>::value, "");
-//
-//   // `absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative` is more valuable for use in generic code:
-//   template <typename Variant>
-//   constexpr bool IsFirstElementTrivial() {
-//       return std::is_trivial_v<variant_alternative<0, Variant>::type>;
-//   }
-//
-// Note that the set of cv-qualified specializations of `variant_alternative`
-// are provided to ensure that those specializations compile (especially when
-// passed within template logic).
-template <std::size_t I, class T>
-struct variant_alternative;
-
-template <std::size_t I, class... Types>
-struct variant_alternative<I, variant<Types...>> {
-  using type =
-      variant_internal::VariantAlternativeSfinaeT<I, variant<Types...>>;
-};
-
-// Specialization of `variant_alternative` for const qualified variants.
-template <std::size_t I, class T>
-struct variant_alternative<I, const T> {
-  using type = const typename variant_alternative<I, T>::type;
-};
-
-// Specialization of `variant_alternative` for volatile qualified variants.
-template <std::size_t I, class T>
-struct variant_alternative<I, volatile T> {
-  using type = volatile typename variant_alternative<I, T>::type;
-};
-
-// Specialization of `variant_alternative` for const volatile qualified
-// variants.
-template <std::size_t I, class T>
-struct variant_alternative<I, const volatile T> {
-  using type = const volatile typename variant_alternative<I, T>::type;
-};
-
-// Template type alias for variant_alternative<I, T>::type.
-//
-// Example:
-//
-//   using alternative_type_0
-//     = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<0, absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>>;
-//   static_assert(std::is_same<alternative_type_0, int>::value, "");
-template <std::size_t I, class T>
-using variant_alternative_t = typename variant_alternative<I, T>::type;
-
-// holds_alternative()
-//
-// Checks whether the given variant currently holds a given alternative type,
-// returning `true` if so.
-//
-// Example:
-//
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string> foo = 42;
-//   if (absl::OTABSL_OPTION_NAMESPACE_NAME::holds_alternative<int>(foo)) {
-//       std::cout << "The variant holds an integer";
-//   }
-template <class T, class... Types>
-constexpr bool holds_alternative(const variant<Types...>& v) noexcept {
-  static_assert(
-      variant_internal::UnambiguousIndexOfImpl<variant<Types...>, T,
-                                               0>::value != sizeof...(Types),
-      "The type T must occur exactly once in Types...");
-  return v.index() ==
-         variant_internal::UnambiguousIndexOf<variant<Types...>, T>::value;
-}
-
-// get()
-//
-// Returns a reference to the value currently within a given variant, using
-// either a unique alternative type amongst the variant's set of alternative
-// types, or the variant's index value. Attempting to get a variant's value
-// using a type that is not unique within the variant's set of alternative types
-// is a compile-time error. If the index of the alternative being specified is
-// different from the index of the alternative that is currently stored, throws
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::bad_variant_access`.
-//
-// Example:
-//
-//   auto a = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>;
-//
-//   // Get the value by type (if unique).
-//   int i = absl::OTABSL_OPTION_NAMESPACE_NAME::get<int>(a);
-//
-//   auto b = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, int>;
-//
-//   // Getting the value by a type that is not unique is ill-formed.
-//   int j = absl::OTABSL_OPTION_NAMESPACE_NAME::get<int>(b);     // Compile Error!
-//
-//   // Getting value by index not ambiguous and allowed.
-//   int k = absl::OTABSL_OPTION_NAMESPACE_NAME::get<1>(b);
-
-// Overload for getting a variant's lvalue by type.
-template <class T, class... Types>
-constexpr T& get(variant<Types...>& v) {  // NOLINT
-  return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(v);
-}
-
-// Overload for getting a variant's rvalue by type.
-// Note: `absl::OTABSL_OPTION_NAMESPACE_NAME::move()` is required to allow use of constexpr in C++11.
-template <class T, class... Types>
-constexpr T&& get(variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(absl::OTABSL_OPTION_NAMESPACE_NAME::move(v));
-}
-
-// Overload for getting a variant's const lvalue by type.
-template <class T, class... Types>
-constexpr const T& get(const variant<Types...>& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(v);
-}
-
-// Overload for getting a variant's const rvalue by type.
-// Note: `absl::OTABSL_OPTION_NAMESPACE_NAME::move()` is required to allow use of constexpr in C++11.
-template <class T, class... Types>
-constexpr const T&& get(const variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(absl::OTABSL_OPTION_NAMESPACE_NAME::move(v));
-}
-
-// Overload for getting a variant's lvalue by index.
-template <std::size_t I, class... Types>
-constexpr variant_alternative_t<I, variant<Types...>>& get(
-    variant<Types...>& v) {  // NOLINT
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(v);
-}
-
-// Overload for getting a variant's rvalue by index.
-// Note: `absl::OTABSL_OPTION_NAMESPACE_NAME::move()` is required to allow use of constexpr in C++11.
-template <std::size_t I, class... Types>
-constexpr variant_alternative_t<I, variant<Types...>>&& get(
-    variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(absl::OTABSL_OPTION_NAMESPACE_NAME::move(v));
-}
-
-// Overload for getting a variant's const lvalue by index.
-template <std::size_t I, class... Types>
-constexpr const variant_alternative_t<I, variant<Types...>>& get(
-    const variant<Types...>& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(v);
-}
-
-// Overload for getting a variant's const rvalue by index.
-// Note: `absl::OTABSL_OPTION_NAMESPACE_NAME::move()` is required to allow use of constexpr in C++11.
-template <std::size_t I, class... Types>
-constexpr const variant_alternative_t<I, variant<Types...>>&& get(
-    const variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(absl::OTABSL_OPTION_NAMESPACE_NAME::move(v));
-}
-
-// get_if()
-//
-// Returns a pointer to the value currently stored within a given variant, if
-// present, using either a unique alternative type amongst the variant's set of
-// alternative types, or the variant's index value. If such a value does not
-// exist, returns `nullptr`.
-//
-// As with `get`, attempting to get a variant's value using a type that is not
-// unique within the variant's set of alternative types is a compile-time error.
-
-// Overload for getting a pointer to the value stored in the given variant by
-// index.
-template <std::size_t I, class... Types>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::add_pointer_t<variant_alternative_t<I, variant<Types...>>>
-get_if(variant<Types...>* v) noexcept {
-  return (v != nullptr && v->index() == I)
-             ? std::addressof(
-                   variant_internal::VariantCoreAccess::Access<I>(*v))
-             : nullptr;
-}
-
-// Overload for getting a pointer to the const value stored in the given
-// variant by index.
-template <std::size_t I, class... Types>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::add_pointer_t<const variant_alternative_t<I, variant<Types...>>>
-get_if(const variant<Types...>* v) noexcept {
-  return (v != nullptr && v->index() == I)
-             ? std::addressof(
-                   variant_internal::VariantCoreAccess::Access<I>(*v))
-             : nullptr;
-}
-
-// Overload for getting a pointer to the value stored in the given variant by
-// type.
-template <class T, class... Types>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::add_pointer_t<T> get_if(variant<Types...>* v) noexcept {
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::get_if<variant_internal::IndexOf<T, Types...>::value>(v);
-}
-
-// Overload for getting a pointer to the const value stored in the given variant
-// by type.
-template <class T, class... Types>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::add_pointer_t<const T> get_if(
-    const variant<Types...>* v) noexcept {
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::get_if<variant_internal::IndexOf<T, Types...>::value>(v);
-}
-
-// visit()
-//
-// Calls a provided functor on a given set of variants. `absl::OTABSL_OPTION_NAMESPACE_NAME::visit()` is
-// commonly used to conditionally inspect the state of a given variant (or set
-// of variants).
-//
-// The functor must return the same type when called with any of the variants'
-// alternatives.
-//
-// Example:
-//
-//   // Define a visitor functor
-//   struct GetVariant {
-//       template<typename T>
-//       void operator()(const T& i) const {
-//         std::cout << "The variant's value is: " << i;
-//       }
-//   };
-//
-//   // Declare our variant, and call `absl::OTABSL_OPTION_NAMESPACE_NAME::visit()` on it.
-//   // Note that `GetVariant()` returns void in either case.
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string> foo = std::string("foo");
-//   GetVariant visitor;
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::visit(visitor, foo);  // Prints `The variant's value is: foo'
-template <typename Visitor, typename... Variants>
-variant_internal::VisitResult<Visitor, Variants...> visit(Visitor&& vis,
-                                                          Variants&&... vars) {
-  return variant_internal::
-      VisitIndices<variant_size<absl::OTABSL_OPTION_NAMESPACE_NAME::decay_t<Variants> >::value...>::Run(
-          variant_internal::PerformVisitation<Visitor, Variants...>{
-              std::forward_as_tuple(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Variants>(vars)...),
-              absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Visitor>(vis)},
-          vars.index()...);
-}
-
-// monostate
-//
-// The monostate class serves as a first alternative type for a variant for
-// which the first variant type is otherwise not default-constructible.
-struct monostate {};
-
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::monostate` Relational Operators
-
-constexpr bool operator<(monostate, monostate) noexcept { return false; }
-constexpr bool operator>(monostate, monostate) noexcept { return false; }
-constexpr bool operator<=(monostate, monostate) noexcept { return true; }
-constexpr bool operator>=(monostate, monostate) noexcept { return true; }
-constexpr bool operator==(monostate, monostate) noexcept { return true; }
-constexpr bool operator!=(monostate, monostate) noexcept { return false; }
-
-
-//------------------------------------------------------------------------------
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` Template Definition
-//------------------------------------------------------------------------------
-template <typename T0, typename... Tn>
-class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
-  static_assert(absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_object<T0>,
-                                  std::is_object<Tn>...>::value,
-                "Attempted to instantiate a variant containing a non-object "
-                "type.");
-  // Intentionally not qualifying `negation` with `absl::OTABSL_OPTION_NAMESPACE_NAME::` to work around a bug
-  // in MSVC 2015 with inline namespace and variadic template.
-  static_assert(absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<negation<std::is_array<T0> >,
-                                  negation<std::is_array<Tn> >...>::value,
-                "Attempted to instantiate a variant containing an array type.");
-  static_assert(absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_nothrow_destructible<T0>,
-                                  std::is_nothrow_destructible<Tn>...>::value,
-                "Attempted to instantiate a variant containing a non-nothrow "
-                "destructible type.");
-
-  friend struct variant_internal::VariantCoreAccess;
-
- private:
-  using Base = variant_internal::VariantBase<T0, Tn...>;
-
- public:
-  // Constructors
-
-  // Constructs a variant holding a default-initialized value of the first
-  // alternative type.
-  constexpr variant() /*noexcept(see 111above)*/ = default;
-
-  // Copy constructor, standard semantics
-  variant(const variant& other) = default;
-
-  // Move constructor, standard semantics
-  variant(variant&& other) /*noexcept(see above)*/ = default;
-
-  // Constructs a variant of an alternative type specified by overload
-  // resolution of the provided forwarding arguments through
-  // direct-initialization.
-  //
-  // Note: If the selected constructor is a constexpr constructor, this
-  // constructor shall be a constexpr constructor.
-  //
-  // NOTE: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0608r1.html
-  // has been voted passed the design phase in the C++ standard meeting in Mar
-  // 2018. It will be implemented and integrated into `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`.
-  template <
-      class T,
-      std::size_t I = std::enable_if<
-          variant_internal::IsNeitherSelfNorInPlace<variant,
-                                                    absl::OTABSL_OPTION_NAMESPACE_NAME::decay_t<T>>::value,
-          variant_internal::IndexOfConstructedType<variant, T>>::type::value,
-      class Tj = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>,
-      absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<std::is_constructible<Tj, T>::value>* =
-          nullptr>
-  constexpr variant(T&& t) noexcept(std::is_nothrow_constructible<Tj, T>::value)
-      : Base(variant_internal::EmplaceTag<I>(), absl::OTABSL_OPTION_NAMESPACE_NAME::forward<T>(t)) {}
-
-  // Constructs a variant of an alternative type from the arguments through
-  // direct-initialization.
-  //
-  // Note: If the selected constructor is a constexpr constructor, this
-  // constructor shall be a constexpr constructor.
-  template <class T, class... Args,
-            typename std::enable_if<std::is_constructible<
-                variant_internal::UnambiguousTypeOfT<variant, T>,
-                Args...>::value>::type* = nullptr>
-  constexpr explicit variant(in_place_type_t<T>, Args&&... args)
-      : Base(variant_internal::EmplaceTag<
-                 variant_internal::UnambiguousIndexOf<variant, T>::value>(),
-             absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...) {}
-
-  // Constructs a variant of an alternative type from an initializer list
-  // and other arguments through direct-initialization.
-  //
-  // Note: If the selected constructor is a constexpr constructor, this
-  // constructor shall be a constexpr constructor.
-  template <class T, class U, class... Args,
-            typename std::enable_if<std::is_constructible<
-                variant_internal::UnambiguousTypeOfT<variant, T>,
-                std::initializer_list<U>&, Args...>::value>::type* = nullptr>
-  constexpr explicit variant(in_place_type_t<T>, std::initializer_list<U> il,
-                             Args&&... args)
-      : Base(variant_internal::EmplaceTag<
-                 variant_internal::UnambiguousIndexOf<variant, T>::value>(),
-             il, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...) {}
-
-  // Constructs a variant of an alternative type from a provided index,
-  // through value-initialization using the provided forwarded arguments.
-  template <std::size_t I, class... Args,
-            typename std::enable_if<std::is_constructible<
-                variant_internal::VariantAlternativeSfinaeT<I, variant>,
-                Args...>::value>::type* = nullptr>
-  constexpr explicit variant(in_place_index_t<I>, Args&&... args)
-      : Base(variant_internal::EmplaceTag<I>(), absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...) {}
-
-  // Constructs a variant of an alternative type from a provided index,
-  // through value-initialization of an initializer list and the provided
-  // forwarded arguments.
-  template <std::size_t I, class U, class... Args,
-            typename std::enable_if<std::is_constructible<
-                variant_internal::VariantAlternativeSfinaeT<I, variant>,
-                std::initializer_list<U>&, Args...>::value>::type* = nullptr>
-  constexpr explicit variant(in_place_index_t<I>, std::initializer_list<U> il,
-                             Args&&... args)
-      : Base(variant_internal::EmplaceTag<I>(), il,
-             absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...) {}
-
-  // Destructors
-
-  // Destroys the variant's currently contained value, provided that
-  // `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false.
-  ~variant() = default;
-
-  // Assignment Operators
-
-  // Copy assignment operator
-  variant& operator=(const variant& other) = default;
-
-  // Move assignment operator
-  variant& operator=(variant&& other) /*noexcept(see above)*/ = default;
-
-  // Converting assignment operator
-  //
-  // NOTE: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0608r1.html
-  // has been voted passed the design phase in the C++ standard meeting in Mar
-  // 2018. It will be implemented and integrated into `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`.
-  template <
-      class T,
-      std::size_t I = std::enable_if<
-          !std::is_same<absl::OTABSL_OPTION_NAMESPACE_NAME::decay_t<T>, variant>::value,
-          variant_internal::IndexOfConstructedType<variant, T>>::type::value,
-      class Tj = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>,
-      typename std::enable_if<std::is_assignable<Tj&, T>::value &&
-                              std::is_constructible<Tj, T>::value>::type* =
-          nullptr>
-  variant& operator=(T&& t) noexcept(
-      std::is_nothrow_assignable<Tj&, T>::value&&
-          std::is_nothrow_constructible<Tj, T>::value) {
-    variant_internal::VisitIndices<sizeof...(Tn) + 1>::Run(
-        variant_internal::VariantCoreAccess::MakeConversionAssignVisitor(
-            this, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<T>(t)),
-        index());
-
-    return *this;
-  }
-
-
-  // emplace() Functions
-
-  // Constructs a value of the given alternative type T within the variant. The
-  // existing value of the variant is destroyed first (provided that
-  // `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false). Requires that T is unambiguous
-  // in the variant.
-  //
-  // Example:
-  //
-  //   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<std::vector<int>, int, std::string> v;
-  //   v.emplace<int>(99);
-  //   v.emplace<std::string>("abc");
-  template <
-      class T, class... Args,
-      typename std::enable_if<std::is_constructible<
-          absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<
-              variant_internal::UnambiguousIndexOf<variant, T>::value, variant>,
-          Args...>::value>::type* = nullptr>
-  T& emplace(Args&&... args) {
-    return variant_internal::VariantCoreAccess::Replace<
-        variant_internal::UnambiguousIndexOf<variant, T>::value>(
-        this, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-  }
-
-  // Constructs a value of the given alternative type T within the variant using
-  // an initializer list. The existing value of the variant is destroyed first
-  // (provided that `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false). Requires that T
-  // is unambiguous in the variant.
-  //
-  // Example:
-  //
-  //   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<std::vector<int>, int, std::string> v;
-  //   v.emplace<std::vector<int>>({0, 1, 2});
-  template <
-      class T, class U, class... Args,
-      typename std::enable_if<std::is_constructible<
-          absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<
-              variant_internal::UnambiguousIndexOf<variant, T>::value, variant>,
-          std::initializer_list<U>&, Args...>::value>::type* = nullptr>
-  T& emplace(std::initializer_list<U> il, Args&&... args) {
-    return variant_internal::VariantCoreAccess::Replace<
-        variant_internal::UnambiguousIndexOf<variant, T>::value>(
-        this, il, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-  }
-
-  // Destroys the current value of the variant (provided that
-  // `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false) and constructs a new value at
-  // the given index.
-  //
-  // Example:
-  //
-  //   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<std::vector<int>, int, int> v;
-  //   v.emplace<1>(99);
-  //   v.emplace<2>(98);
-  //   v.emplace<int>(99);  // Won't compile. 'int' isn't a unique type.
-  template <std::size_t I, class... Args,
-            typename std::enable_if<
-                std::is_constructible<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>,
-                                      Args...>::value>::type* = nullptr>
-  absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>& emplace(Args&&... args) {
-    return variant_internal::VariantCoreAccess::Replace<I>(
-        this, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-  }
-
-  // Destroys the current value of the variant (provided that
-  // `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false) and constructs a new value at
-  // the given index using an initializer list and the provided arguments.
-  //
-  // Example:
-  //
-  //   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<std::vector<int>, int, int> v;
-  //   v.emplace<0>({0, 1, 2});
-  template <std::size_t I, class U, class... Args,
-            typename std::enable_if<std::is_constructible<
-                absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>,
-                std::initializer_list<U>&, Args...>::value>::type* = nullptr>
-  absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>& emplace(std::initializer_list<U> il,
-                                                   Args&&... args) {
-    return variant_internal::VariantCoreAccess::Replace<I>(
-        this, il, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-  }
-
-  // variant::valueless_by_exception()
-  //
-  // Returns false if and only if the variant currently holds a valid value.
-  constexpr bool valueless_by_exception() const noexcept {
-    return this->index_ == absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos;
-  }
-
-  // variant::index()
-  //
-  // Returns the index value of the variant's currently selected alternative
-  // type.
-  constexpr std::size_t index() const noexcept { return this->index_; }
-
-  // variant::swap()
-  //
-  // Swaps the values of two variant objects.
-  //
-  void swap(variant& rhs) noexcept(
-      absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<
-          std::is_nothrow_move_constructible<T0>,
-          std::is_nothrow_move_constructible<Tn>...,
-          type_traits_internal::IsNothrowSwappable<T0>,
-          type_traits_internal::IsNothrowSwappable<Tn>...>::value) {
-    return variant_internal::VisitIndices<sizeof...(Tn) + 1>::Run(
-        variant_internal::Swap<T0, Tn...>{this, &rhs}, rhs.index());
-  }
-};
-
-// We need a valid declaration of variant<> for SFINAE and overload resolution
-// to work properly above, but we don't need a full declaration since this type
-// will never be constructed. This declaration, though incomplete, suffices.
-template <>
-class variant<>;
-
-//------------------------------------------------------------------------------
-// Relational Operators
-//------------------------------------------------------------------------------
-//
-// If neither operand is in the `variant::valueless_by_exception` state:
-//
-//   * If the index of both variants is the same, the relational operator
-//     returns the result of the corresponding relational operator for the
-//     corresponding alternative type.
-//   * If the index of both variants is not the same, the relational operator
-//     returns the result of that operation applied to the value of the left
-//     operand's index and the value of the right operand's index.
-//   * If at least one operand is in the valueless_by_exception state:
-//     - A variant in the valueless_by_exception state is only considered equal
-//       to another variant in the valueless_by_exception state.
-//     - If exactly one operand is in the valueless_by_exception state, the
-//       variant in the valueless_by_exception state is less than the variant
-//       that is not in the valueless_by_exception state.
-//
-// Note: The value 1 is added to each index in the relational comparisons such
-// that the index corresponding to the valueless_by_exception state wraps around
-// to 0 (the lowest value for the index type), and the remaining indices stay in
-// the same relative order.
-
-// Equal-to operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveEqualT<Types...> operator==(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() == b.index()) &&
-         variant_internal::VisitIndices<sizeof...(Types)>::Run(
-             variant_internal::EqualsOp<Types...>{&a, &b}, a.index());
-}
-
-// Not equal operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveNotEqualT<Types...> operator!=(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index()) ||
-         variant_internal::VisitIndices<sizeof...(Types)>::Run(
-             variant_internal::NotEqualsOp<Types...>{&a, &b}, a.index());
-}
-
-// Less-than operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveLessThanT<Types...> operator<(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index())
-             ? (a.index() + 1) < (b.index() + 1)
-             : variant_internal::VisitIndices<sizeof...(Types)>::Run(
-                   variant_internal::LessThanOp<Types...>{&a, &b}, a.index());
-}
-
-// Greater-than operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveGreaterThanT<Types...> operator>(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index())
-             ? (a.index() + 1) > (b.index() + 1)
-             : variant_internal::VisitIndices<sizeof...(Types)>::Run(
-                   variant_internal::GreaterThanOp<Types...>{&a, &b},
-                   a.index());
-}
-
-// Less-than or equal-to operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveLessThanOrEqualT<Types...> operator<=(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index())
-             ? (a.index() + 1) < (b.index() + 1)
-             : variant_internal::VisitIndices<sizeof...(Types)>::Run(
-                   variant_internal::LessThanOrEqualsOp<Types...>{&a, &b},
-                   a.index());
-}
-
-// Greater-than or equal-to operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveGreaterThanOrEqualT<Types...>
-operator>=(const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index())
-             ? (a.index() + 1) > (b.index() + 1)
-             : variant_internal::VisitIndices<sizeof...(Types)>::Run(
-                   variant_internal::GreaterThanOrEqualsOp<Types...>{&a, &b},
-                   a.index());
-}
-
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-namespace std {
-
-// hash()
-template <>  // NOLINT
-struct hash<absl::OTABSL_OPTION_NAMESPACE_NAME::monostate> {
-  std::size_t operator()(absl::OTABSL_OPTION_NAMESPACE_NAME::monostate) const { return 0; }
-};
-
-template <class... T>  // NOLINT
-struct hash<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<T...>>
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::variant_internal::VariantHashBase<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<T...>, void,
-                                              absl::OTABSL_OPTION_NAMESPACE_NAME::remove_const_t<T>...> {};
-
-}  // namespace std
-
-#endif  // OTABSL_USES_STD_VARIANT
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace variant_internal {
-
-// Helper visitor for converting a variant<Ts...>` into another type (mostly
-// variant) that can be constructed from any type.
-template <typename To>
-struct ConversionVisitor {
-  template <typename T>
-  To operator()(T&& v) const {
-    return To(std::forward<T>(v));
-  }
-};
-
-}  // namespace variant_internal
-
-// ConvertVariantTo()
-//
-// Helper functions to convert an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` to a variant of another set of
-// types, provided that the alternative type of the new variant type can be
-// converted from any type in the source variant.
-//
-// Example:
-//
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<name1, name2, float> InternalReq(const Req&);
-//
-//   // name1 and name2 are convertible to name
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<name, float> ExternalReq(const Req& req) {
-//     return absl::OTABSL_OPTION_NAMESPACE_NAME::ConvertVariantTo<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<name, float>>(
-//              InternalReq(req));
-//   }
-template <typename To, typename Variant>
-To ConvertVariantTo(Variant&& variant) {
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::visit(variant_internal::ConversionVisitor<To>{},
-                     std::forward<Variant>(variant));
-}
-
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_TYPES_VARIANT_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/utility/utility.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/utility/utility.h
deleted file mode 100644
index 62580cc5a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/internal/absl/utility/utility.h
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This header file contains C++11 versions of standard <utility> header
-// abstractions available within C++14 and C++17, and are designed to be drop-in
-// replacement for code compliant with C++14 and C++17.
-//
-// The following abstractions are defined:
-//
-//   * integer_sequence<T, Ints...>  == std::integer_sequence<T, Ints...>
-//   * index_sequence<Ints...>       == std::index_sequence<Ints...>
-//   * make_integer_sequence<T, N>   == std::make_integer_sequence<T, N>
-//   * make_index_sequence<N>        == std::make_index_sequence<N>
-//   * index_sequence_for<Ts...>     == std::index_sequence_for<Ts...>
-//   * apply<Functor, Tuple>         == std::apply<Functor, Tuple>
-//   * exchange<T>                   == std::exchange<T>
-//   * make_from_tuple<T>            == std::make_from_tuple<T>
-//
-// This header file also provides the tag types `in_place_t`, `in_place_type_t`,
-// and `in_place_index_t`, as well as the constant `in_place`, and
-// `constexpr` `std::move()` and `std::forward()` implementations in C++11.
-//
-// References:
-//
-//  https://en.cppreference.com/w/cpp/utility/integer_sequence
-//  https://en.cppreference.com/w/cpp/utility/apply
-//  http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html
-
-#ifndef OTABSL_UTILITY_UTILITY_H_
-#define OTABSL_UTILITY_UTILITY_H_
-
-#include <cstddef>
-#include <cstdlib>
-#include <tuple>
-#include <utility>
-
-#include "../base/config.h"
-#include "../base/internal/inline_variable.h"
-#include "../base/internal/invoke.h"
-#include "../meta/type_traits.h"
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-// integer_sequence
-//
-// Class template representing a compile-time integer sequence. An instantiation
-// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
-// type through its template arguments (which is a common need when
-// working with C++11 variadic templates). `absl::OTABSL_OPTION_NAMESPACE_NAME::integer_sequence` is designed
-// to be a drop-in replacement for C++14's `std::integer_sequence`.
-//
-// Example:
-//
-//   template< class T, T... Ints >
-//   void user_function(integer_sequence<T, Ints...>);
-//
-//   int main()
-//   {
-//     // user_function's `T` will be deduced to `int` and `Ints...`
-//     // will be deduced to `0, 1, 2, 3, 4`.
-//     user_function(make_integer_sequence<int, 5>());
-//   }
-template <typename T, T... Ints>
-struct integer_sequence {
-  using value_type = T;
-  static constexpr size_t size() noexcept { return sizeof...(Ints); }
-};
-
-// index_sequence
-//
-// A helper template for an `integer_sequence` of `size_t`,
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::index_sequence` is designed to be a drop-in replacement for C++14's
-// `std::index_sequence`.
-template <size_t... Ints>
-using index_sequence = integer_sequence<size_t, Ints...>;
-
-namespace utility_internal {
-
-template <typename Seq, size_t SeqSize, size_t Rem>
-struct Extend;
-
-// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 0> {
-  using type = integer_sequence<T, Ints..., (Ints + SeqSize)...>;
-};
-
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 1> {
-  using type = integer_sequence<T, Ints..., (Ints + SeqSize)..., 2 * SeqSize>;
-};
-
-// Recursion helper for 'make_integer_sequence<T, N>'.
-// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
-template <typename T, size_t N>
-struct Gen {
-  using type =
-      typename Extend<typename Gen<T, N / 2>::type, N / 2, N % 2>::type;
-};
-
-template <typename T>
-struct Gen<T, 0> {
-  using type = integer_sequence<T>;
-};
-
-template <typename T>
-struct InPlaceTypeTag {
-  explicit InPlaceTypeTag() = delete;
-  InPlaceTypeTag(const InPlaceTypeTag&) = delete;
-  InPlaceTypeTag& operator=(const InPlaceTypeTag&) = delete;
-};
-
-template <size_t I>
-struct InPlaceIndexTag {
-  explicit InPlaceIndexTag() = delete;
-  InPlaceIndexTag(const InPlaceIndexTag&) = delete;
-  InPlaceIndexTag& operator=(const InPlaceIndexTag&) = delete;
-};
-
-}  // namespace utility_internal
-
-// Compile-time sequences of integers
-
-// make_integer_sequence
-//
-// This template alias is equivalent to
-// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
-// replacement for C++14's `std::make_integer_sequence`.
-template <typename T, T N>
-using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
-
-// make_index_sequence
-//
-// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
-// and is designed to be a drop-in replacement for C++14's
-// `std::make_index_sequence`.
-template <size_t N>
-using make_index_sequence = make_integer_sequence<size_t, N>;
-
-// index_sequence_for
-//
-// Converts a typename pack into an index sequence of the same length, and
-// is designed to be a drop-in replacement for C++14's
-// `std::index_sequence_for()`
-template <typename... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-// Tag types
-
-#ifdef OTABSL_USES_STD_OPTIONAL
-
-using std::in_place_t;
-using std::in_place;
-
-#else  // OTABSL_USES_STD_OPTIONAL
-
-// in_place_t
-//
-// Tag type used to specify in-place construction, such as with
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::optional`, designed to be a drop-in replacement for C++17's
-// `std::in_place_t`.
-struct in_place_t {};
-
-OTABSL_INTERNAL_INLINE_CONSTEXPR(in_place_t, in_place, {});
-
-#endif  // OTABSL_USES_STD_OPTIONAL
-
-#if defined(OTABSL_USES_STD_ANY) || defined(OTABSL_USES_STD_VARIANT)
-using std::in_place_type;
-using std::in_place_type_t;
-#else
-
-// in_place_type_t
-//
-// Tag type used for in-place construction when the type to construct needs to
-// be specified, such as with `absl::OTABSL_OPTION_NAMESPACE_NAME::any`, designed to be a drop-in replacement
-// for C++17's `std::in_place_type_t`.
-template <typename T>
-using in_place_type_t = void (*)(utility_internal::InPlaceTypeTag<T>);
-
-template <typename T>
-void in_place_type(utility_internal::InPlaceTypeTag<T>) {}
-#endif  // OTABSL_USES_STD_ANY || OTABSL_USES_STD_VARIANT
-
-#ifdef OTABSL_USES_STD_VARIANT
-using std::in_place_index;
-using std::in_place_index_t;
-#else
-
-// in_place_index_t
-//
-// Tag type used for in-place construction when the type to construct needs to
-// be specified, such as with `absl::OTABSL_OPTION_NAMESPACE_NAME::any`, designed to be a drop-in replacement
-// for C++17's `std::in_place_index_t`.
-template <size_t I>
-using in_place_index_t = void (*)(utility_internal::InPlaceIndexTag<I>);
-
-template <size_t I>
-void in_place_index(utility_internal::InPlaceIndexTag<I>) {}
-#endif  // OTABSL_USES_STD_VARIANT
-
-// Constexpr move and forward
-
-// move()
-//
-// A constexpr version of `std::move()`, designed to be a drop-in replacement
-// for C++14's `std::move()`.
-template <typename T>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::remove_reference_t<T>&& move(T&& t) noexcept {
-  return static_cast<absl::OTABSL_OPTION_NAMESPACE_NAME::remove_reference_t<T>&&>(t);
-}
-
-// forward()
-//
-// A constexpr version of `std::forward()`, designed to be a drop-in replacement
-// for C++14's `std::forward()`.
-template <typename T>
-constexpr T&& forward(
-    absl::OTABSL_OPTION_NAMESPACE_NAME::remove_reference_t<T>& t) noexcept {  // NOLINT(runtime/references)
-  return static_cast<T&&>(t);
-}
-
-namespace utility_internal {
-// Helper method for expanding tuple into a called method.
-template <typename Functor, typename Tuple, std::size_t... Indexes>
-auto apply_helper(Functor&& functor, Tuple&& t, index_sequence<Indexes...>)
-    -> decltype(absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(
-        absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Functor>(functor),
-        std::get<Indexes>(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Tuple>(t))...)) {
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(
-      absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Functor>(functor),
-      std::get<Indexes>(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Tuple>(t))...);
-}
-
-}  // namespace utility_internal
-
-// apply
-//
-// Invokes a Callable using elements of a tuple as its arguments.
-// Each element of the tuple corresponds to an argument of the call (in order).
-// Both the Callable argument and the tuple argument are perfect-forwarded.
-// For member-function Callables, the first tuple element acts as the `this`
-// pointer. `absl::OTABSL_OPTION_NAMESPACE_NAME::apply` is designed to be a drop-in replacement for C++17's
-// `std::apply`. Unlike C++17's `std::apply`, this is not currently `constexpr`.
-//
-// Example:
-//
-//   class Foo {
-//    public:
-//     void Bar(int);
-//   };
-//   void user_function1(int, std::string);
-//   void user_function2(std::unique_ptr<Foo>);
-//   auto user_lambda = [](int, int) {};
-//
-//   int main()
-//   {
-//       std::tuple<int, std::string> tuple1(42, "bar");
-//       // Invokes the first user function on int, std::string.
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::apply(&user_function1, tuple1);
-//
-//       std::tuple<std::unique_ptr<Foo>> tuple2(absl::OTABSL_OPTION_NAMESPACE_NAME::make_unique<Foo>());
-//       // Invokes the user function that takes ownership of the unique
-//       // pointer.
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::apply(&user_function2, std::move(tuple2));
-//
-//       auto foo = absl::OTABSL_OPTION_NAMESPACE_NAME::make_unique<Foo>();
-//       std::tuple<Foo*, int> tuple3(foo.get(), 42);
-//       // Invokes the method Bar on foo with one argument, 42.
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::apply(&Foo::Bar, tuple3);
-//
-//       std::tuple<int, int> tuple4(8, 9);
-//       // Invokes a lambda.
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::apply(user_lambda, tuple4);
-//   }
-template <typename Functor, typename Tuple>
-auto apply(Functor&& functor, Tuple&& t)
-    -> decltype(utility_internal::apply_helper(
-        absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Functor>(functor), absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Tuple>(t),
-        absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<std::tuple_size<
-            typename std::remove_reference<Tuple>::type>::value>{})) {
-  return utility_internal::apply_helper(
-      absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Functor>(functor), absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Tuple>(t),
-      absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<std::tuple_size<
-          typename std::remove_reference<Tuple>::type>::value>{});
-}
-
-// exchange
-//
-// Replaces the value of `obj` with `new_value` and returns the old value of
-// `obj`.  `absl::OTABSL_OPTION_NAMESPACE_NAME::exchange` is designed to be a drop-in replacement for C++14's
-// `std::exchange`.
-//
-// Example:
-//
-//   Foo& operator=(Foo&& other) {
-//     ptr1_ = absl::OTABSL_OPTION_NAMESPACE_NAME::exchange(other.ptr1_, nullptr);
-//     int1_ = absl::OTABSL_OPTION_NAMESPACE_NAME::exchange(other.int1_, -1);
-//     return *this;
-//   }
-template <typename T, typename U = T>
-T exchange(T& obj, U&& new_value) {
-  T old_value = absl::OTABSL_OPTION_NAMESPACE_NAME::move(obj);
-  obj = absl::OTABSL_OPTION_NAMESPACE_NAME::forward<U>(new_value);
-  return old_value;
-}
-
-namespace utility_internal {
-template <typename T, typename Tuple, size_t... I>
-T make_from_tuple_impl(Tuple&& tup, absl::OTABSL_OPTION_NAMESPACE_NAME::index_sequence<I...>) {
-  return T(std::get<I>(std::forward<Tuple>(tup))...);
-}
-}  // namespace utility_internal
-
-// make_from_tuple
-//
-// Given the template parameter type `T` and a tuple of arguments
-// `std::tuple(arg0, arg1, ..., argN)` constructs an object of type `T` as if by
-// calling `T(arg0, arg1, ..., argN)`.
-//
-// Example:
-//
-//   std::tuple<const char*, size_t> args("hello world", 5);
-//   auto s = absl::OTABSL_OPTION_NAMESPACE_NAME::make_from_tuple<std::string>(args);
-//   assert(s == "hello");
-//
-template <typename T, typename Tuple>
-constexpr T make_from_tuple(Tuple&& tup) {
-  return utility_internal::make_from_tuple_impl<T>(
-      std::forward<Tuple>(tup),
-      absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<
-          std::tuple_size<absl::OTABSL_OPTION_NAMESPACE_NAME::decay_t<Tuple>>::value>{});
-}
-
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_UTILITY_UTILITY_H_
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/shared_ptr.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/shared_ptr.h
deleted file mode 100644
index 681c4eb37..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/shared_ptr.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2011
-#    include "opentelemetry/std/shared_ptr.h"
-#    define OPENTELEMETRY_HAVE_STD_SHARED_PTR
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_SHARED_PTR)
-#  include <cstdlib>
-#  include <memory>
-#  include <utility>
-
-#  include "opentelemetry/nostd/unique_ptr.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-/**
- * Provide a type-erased version of std::shared_ptr that has ABI stability.
- */
-template <class T>
-class shared_ptr
-{
-public:
-  using element_type = T;
-  using pointer      = element_type *;
-
-private:
-  static constexpr size_t kMaxSize   = 32;
-  static constexpr size_t kAlignment = 8;
-
-  struct alignas(kAlignment) PlacementBuffer
-  {
-    char data[kMaxSize]{};
-  };
-
-  class shared_ptr_wrapper
-  {
-  public:
-    shared_ptr_wrapper() noexcept = default;
-
-    shared_ptr_wrapper(std::shared_ptr<T> &&ptr) noexcept : ptr_{std::move(ptr)} {}
-
-    virtual ~shared_ptr_wrapper() {}
-
-    virtual void CopyTo(PlacementBuffer &buffer) const noexcept
-    {
-      new (buffer.data) shared_ptr_wrapper{*this};
-    }
-
-    virtual void MoveTo(PlacementBuffer &buffer) noexcept
-    {
-      new (buffer.data) shared_ptr_wrapper{std::move(this->ptr_)};
-    }
-
-    template <class U,
-              typename std::enable_if<std::is_convertible<pointer, U *>::value>::type * = nullptr>
-    void MoveTo(typename shared_ptr<U>::PlacementBuffer &buffer) noexcept
-    {
-      using other_shared_ptr_wrapper = typename shared_ptr<U>::shared_ptr_wrapper;
-      new (buffer.data) other_shared_ptr_wrapper{std::move(this->ptr_)};
-    }
-
-    virtual pointer Get() const noexcept { return ptr_.get(); }
-
-    virtual void Reset() noexcept { ptr_.reset(); }
-
-  private:
-    std::shared_ptr<T> ptr_;
-  };
-
-  static_assert(sizeof(shared_ptr_wrapper) <= kMaxSize, "Placement buffer is too small");
-  static_assert(alignof(shared_ptr_wrapper) <= kAlignment, "Placement buffer not properly aligned");
-
-public:
-  shared_ptr() noexcept { new (buffer_.data) shared_ptr_wrapper{}; }
-
-  explicit shared_ptr(pointer ptr)
-  {
-    std::shared_ptr<T> ptr_(ptr);
-    new (buffer_.data) shared_ptr_wrapper{std::move(ptr_)};
-  }
-
-  shared_ptr(std::shared_ptr<T> ptr) noexcept
-  {
-    new (buffer_.data) shared_ptr_wrapper{std::move(ptr)};
-  }
-
-  shared_ptr(shared_ptr &&other) noexcept { other.wrapper().MoveTo(buffer_); }
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  shared_ptr(shared_ptr<U> &&other) noexcept
-  {
-    other.wrapper().template MoveTo<T>(buffer_);
-  }
-
-  shared_ptr(const shared_ptr &other) noexcept { other.wrapper().CopyTo(buffer_); }
-
-  shared_ptr(unique_ptr<T> &&other) noexcept
-  {
-    std::shared_ptr<T> ptr_(other.release());
-    new (buffer_.data) shared_ptr_wrapper{std::move(ptr_)};
-  }
-
-  shared_ptr(std::unique_ptr<T> &&other) noexcept
-  {
-    std::shared_ptr<T> ptr_(other.release());
-    new (buffer_.data) shared_ptr_wrapper{std::move(ptr_)};
-  }
-
-  ~shared_ptr() { wrapper().~shared_ptr_wrapper(); }
-
-  shared_ptr &operator=(shared_ptr &&other) noexcept
-  {
-    wrapper().~shared_ptr_wrapper();
-    other.wrapper().MoveTo(buffer_);
-    return *this;
-  }
-
-  shared_ptr &operator=(std::nullptr_t) noexcept
-  {
-    wrapper().Reset();
-    return *this;
-  }
-
-  shared_ptr &operator=(const shared_ptr &other) noexcept
-  {
-    wrapper().~shared_ptr_wrapper();
-    other.wrapper().CopyTo(buffer_);
-    return *this;
-  }
-
-  element_type &operator*() const noexcept { return *wrapper().Get(); }
-
-  pointer operator->() const noexcept { return wrapper().Get(); }
-
-  operator bool() const noexcept { return wrapper().Get() != nullptr; }
-
-  pointer get() const noexcept { return wrapper().Get(); }
-
-  void swap(shared_ptr<T> &other) noexcept
-  {
-    shared_ptr<T> tmp{std::move(other)};
-
-    wrapper().MoveTo(other.buffer_);
-    tmp.wrapper().MoveTo(buffer_);
-  }
-
-  template <typename U>
-  friend class shared_ptr;
-
-private:
-  PlacementBuffer buffer_;
-
-  shared_ptr_wrapper &wrapper() noexcept
-  {
-    return *reinterpret_cast<shared_ptr_wrapper *>(buffer_.data);
-  }
-
-  const shared_ptr_wrapper &wrapper() const noexcept
-  {
-    return *reinterpret_cast<const shared_ptr_wrapper *>(buffer_.data);
-  }
-};
-
-template <class T1, class T2>
-bool operator!=(const shared_ptr<T1> &lhs, const shared_ptr<T2> &rhs) noexcept
-{
-  return lhs.get() != rhs.get();
-}
-
-template <class T1, class T2>
-bool operator==(const shared_ptr<T1> &lhs, const shared_ptr<T2> &rhs) noexcept
-{
-  return lhs.get() == rhs.get();
-}
-
-template <class T>
-inline bool operator==(const shared_ptr<T> &lhs, std::nullptr_t) noexcept
-{
-  return lhs.get() == nullptr;
-}
-
-template <class T>
-inline bool operator==(std::nullptr_t, const shared_ptr<T> &rhs) noexcept
-{
-  return nullptr == rhs.get();
-}
-
-template <class T>
-inline bool operator!=(const shared_ptr<T> &lhs, std::nullptr_t) noexcept
-{
-  return lhs.get() != nullptr;
-}
-
-template <class T>
-inline bool operator!=(std::nullptr_t, const shared_ptr<T> &rhs) noexcept
-{
-  return nullptr != rhs.get();
-}
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_HAVE_STD_SHARED_PTR */
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/span.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/span.h
deleted file mode 100644
index da0f385cf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/span.h
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// Try to use either `std::span` or `gsl::span`
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2020
-#    include <array>
-#    include <cstddef>
-#    include <iterator>
-#    include <type_traits>
-
-/**
- * @brief Clang 14.0.0 with libc++ do not support implicitly construct a span
- * for a range. We just use our fallback version.
- *
- */
-#    if !defined(OPENTELEMETRY_OPTION_USE_STD_SPAN) && defined(_LIBCPP_VERSION)
-#      if _LIBCPP_VERSION <= 14000
-#        define OPENTELEMETRY_OPTION_USE_STD_SPAN 0
-#      endif
-#    endif
-#    ifndef OPENTELEMETRY_OPTION_USE_STD_SPAN
-#      define OPENTELEMETRY_OPTION_USE_STD_SPAN 1
-#    endif
-#    if OPENTELEMETRY_OPTION_USE_STD_SPAN
-#      include "opentelemetry/std/span.h"
-#    endif
-#  endif /* OPENTELEMETRY_STL_VERSION >= 2020 */
-#endif   /* OPENTELEMETRY_STL_VERSION */
-
-// Fallback to `nostd::span` if necessary
-#if !defined(OPENTELEMETRY_HAVE_SPAN)
-#  include <array>
-#  include <cassert>
-#  include <cstddef>
-#  include <exception>
-#  include <iterator>
-#  include <type_traits>
-
-#  include "opentelemetry/nostd/utility.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-constexpr size_t dynamic_extent = static_cast<size_t>(-1);
-
-template <class T, size_t Extent = dynamic_extent>
-class span;
-
-namespace detail
-{
-/**
- * Helper class to resolve overloaded constructors
- */
-template <class T>
-struct is_specialized_span_convertible : std::false_type
-{};
-
-template <class T, size_t N>
-struct is_specialized_span_convertible<std::array<T, N>> : std::true_type
-{};
-
-template <class T, size_t N>
-struct is_specialized_span_convertible<T[N]> : std::true_type
-{};
-
-template <class T, size_t Extent>
-struct is_specialized_span_convertible<span<T, Extent>> : std::true_type
-{};
-}  // namespace detail
-
-/**
- * Back port of std::span.
- *
- * See https://en.cppreference.com/w/cpp/container/span for interface documentation.
- *
- * Note: This provides a subset of the methods available on std::span.
- *
- * Note: The std::span API specifies error cases to have undefined behavior, so this implementation
- * chooses to terminate or assert rather than throw exceptions.
- */
-template <class T, size_t Extent>
-class span
-{
-public:
-  static constexpr size_t extent = Extent;
-
-  // This arcane code is how we make default-construction result in an SFINAE error
-  // with C++11 when Extent != 0 as specified by the std::span API.
-  //
-  // See https://stackoverflow.com/a/10309720/4447365
-  template <bool B = Extent == 0, typename std::enable_if<B>::type * = nullptr>
-  span() noexcept : data_{nullptr}
-  {}
-
-  span(T *data, size_t count) noexcept : data_{data}
-  {
-    if (count != Extent)
-    {
-      std::terminate();
-    }
-  }
-
-  span(T *first, T *last) noexcept : data_{first}
-  {
-    if (std::distance(first, last) != Extent)
-    {
-      std::terminate();
-    }
-  }
-
-  template <size_t N, typename std::enable_if<Extent == N>::type * = nullptr>
-  span(T (&array)[N]) noexcept : data_{array}
-  {}
-
-  template <size_t N, typename std::enable_if<Extent == N>::type * = nullptr>
-  span(std::array<T, N> &array) noexcept : data_{array.data()}
-  {}
-
-  template <size_t N, typename std::enable_if<Extent == N>::type * = nullptr>
-  span(const std::array<T, N> &array) noexcept : data_{array.data()}
-  {}
-
-  template <
-      class C,
-      typename std::enable_if<!detail::is_specialized_span_convertible<C>::value &&
-                              std::is_convertible<typename std::remove_pointer<decltype(nostd::data(
-                                                      std::declval<C &>()))>::type (*)[],
-                                                  T (*)[]>::value &&
-                              std::is_convertible<decltype(nostd::size(std::declval<const C &>())),
-                                                  size_t>::value>::type * = nullptr>
-  span(C &c) noexcept(noexcept(nostd::data(c), nostd::size(c))) : data_{nostd::data(c)}
-  {
-    if (nostd::size(c) != Extent)
-    {
-      std::terminate();
-    }
-  }
-
-  template <
-      class C,
-      typename std::enable_if<!detail::is_specialized_span_convertible<C>::value &&
-                              std::is_convertible<typename std::remove_pointer<decltype(nostd::data(
-                                                      std::declval<const C &>()))>::type (*)[],
-                                                  T (*)[]>::value &&
-                              std::is_convertible<decltype(nostd::size(std::declval<const C &>())),
-                                                  size_t>::value>::type * = nullptr>
-  span(const C &c) noexcept(noexcept(nostd::data(c), nostd::size(c))) : data_{nostd::data(c)}
-  {
-    if (nostd::size(c) != Extent)
-    {
-      std::terminate();
-    }
-  }
-
-  template <class U,
-            size_t N,
-            typename std::enable_if<N == Extent &&
-                                    std::is_convertible<U (*)[], T (*)[]>::value>::type * = nullptr>
-  span(const span<U, N> &other) noexcept : data_{other.data()}
-  {}
-
-  span(const span &) noexcept = default;
-
-  span &operator=(const span &) noexcept = default;
-
-  bool empty() const noexcept { return Extent == 0; }
-
-  T *data() const noexcept { return data_; }
-
-  size_t size() const noexcept { return Extent; }
-
-  T &operator[](size_t index) const noexcept
-  {
-    assert(index < Extent);
-    return data_[index];
-  }
-
-  T *begin() const noexcept { return data_; }
-
-  T *end() const noexcept { return data_ + Extent; }
-
-private:
-  T *data_;
-};
-
-template <class T>
-class span<T, dynamic_extent>
-{
-public:
-  static constexpr size_t extent = dynamic_extent;
-
-  span() noexcept : extent_{0}, data_{nullptr} {}
-
-  span(T *data, size_t count) noexcept : extent_{count}, data_{data} {}
-
-  span(T *first, T *last) noexcept
-      : extent_{static_cast<size_t>(std::distance(first, last))}, data_{first}
-  {
-    assert(first <= last);
-  }
-
-  template <size_t N>
-  span(T (&array)[N]) noexcept : extent_{N}, data_{array}
-  {}
-
-  template <size_t N>
-  span(std::array<T, N> &array) noexcept : extent_{N}, data_{array.data()}
-  {}
-
-  template <size_t N>
-  span(const std::array<T, N> &array) noexcept : extent_{N}, data_{array.data()}
-  {}
-
-  template <
-      class C,
-      typename std::enable_if<!detail::is_specialized_span_convertible<C>::value &&
-                              std::is_convertible<typename std::remove_pointer<decltype(nostd::data(
-                                                      std::declval<C &>()))>::type (*)[],
-                                                  T (*)[]>::value &&
-                              std::is_convertible<decltype(nostd::size(std::declval<const C &>())),
-                                                  size_t>::value>::type * = nullptr>
-  span(C &c) noexcept(noexcept(nostd::data(c), nostd::size(c)))
-      : extent_{nostd::size(c)}, data_{nostd::data(c)}
-  {}
-
-  template <
-      class C,
-      typename std::enable_if<!detail::is_specialized_span_convertible<C>::value &&
-                              std::is_convertible<typename std::remove_pointer<decltype(nostd::data(
-                                                      std::declval<const C &>()))>::type (*)[],
-                                                  T (*)[]>::value &&
-                              std::is_convertible<decltype(nostd::size(std::declval<const C &>())),
-                                                  size_t>::value>::type * = nullptr>
-  span(const C &c) noexcept(noexcept(nostd::data(c), nostd::size(c)))
-      : extent_{nostd::size(c)}, data_{nostd::data(c)}
-  {}
-
-  template <class U,
-            size_t N,
-            typename std::enable_if<std::is_convertible<U (*)[], T (*)[]>::value>::type * = nullptr>
-  span(const span<U, N> &other) noexcept : extent_{other.size()}, data_{other.data()}
-  {}
-
-  span(const span &) noexcept = default;
-
-  span &operator=(const span &) noexcept = default;
-
-  bool empty() const noexcept { return extent_ == 0; }
-
-  T *data() const noexcept { return data_; }
-
-  size_t size() const noexcept { return extent_; }
-
-  T &operator[](size_t index) const noexcept
-  {
-    assert(index < extent_);
-    return data_[index];
-  }
-
-  T *begin() const noexcept { return data_; }
-
-  T *end() const noexcept { return data_ + extent_; }
-
-private:
-  size_t extent_;
-  T *data_;
-};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/string_view.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/string_view.h
deleted file mode 100644
index f0e5bd9e2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/string_view.h
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2017
-#    include "opentelemetry/std/string_view.h"
-#    define OPENTELEMETRY_HAVE_STD_STRING_VIEW
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_STRING_VIEW)
-#  include <algorithm>
-#  include <cstring>
-#  include <functional>
-#  include <ostream>
-#  include <stdexcept>
-#  include <string>
-#  include <type_traits>
-#  include <utility>
-
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-
-using Traits = std::char_traits<char>;
-
-/**
- * Back port of std::string_view to work with pre-cpp-17 compilers.
- *
- * Note: This provides a subset of the methods available on std::string_view but
- * tries to be as compatible as possible with the std::string_view interface.
- */
-class string_view
-{
-public:
-  typedef std::size_t size_type;
-
-  static constexpr size_type npos = static_cast<size_type>(-1);
-
-  string_view() noexcept : length_(0), data_(nullptr) {}
-
-  string_view(const char *str) noexcept : length_(std::strlen(str)), data_(str) {}
-
-  string_view(const std::basic_string<char> &str OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND) noexcept
-      : length_(str.length()), data_(str.c_str())
-  {}
-
-  string_view(const char *str, size_type len) noexcept : length_(len), data_(str) {}
-
-  explicit operator std::string() const { return {data_, length_}; }
-
-  const char *data() const noexcept { return data_; }
-
-  bool empty() const noexcept { return length_ == 0; }
-
-  size_type length() const noexcept { return length_; }
-
-  size_type size() const noexcept { return length_; }
-
-  const char *begin() const noexcept { return data(); }
-
-  const char *end() const noexcept { return data() + length(); }
-
-  const char &operator[](size_type i) { return *(data() + i); }
-
-  string_view substr(size_type pos, size_type n = npos) const
-  {
-    if (pos > length_)
-    {
-#  if __EXCEPTIONS
-      throw std::out_of_range{"opentelemetry::nostd::string_view"};
-#  else
-      std::terminate();
-#  endif
-    }
-    n = (std::min)(n, length_ - pos);
-    return string_view(data_ + pos, n);
-  }
-
-  int compare(string_view v) const noexcept
-  {
-    size_type len = (std::min)(size(), v.size());
-    int result    = Traits::compare(data(), v.data(), len);
-    if (result == 0)
-      result = size() == v.size() ? 0 : (size() < v.size() ? -1 : 1);
-    return result;
-  }
-
-  int compare(size_type pos1, size_type count1, string_view v) const
-  {
-    return substr(pos1, count1).compare(v);
-  }
-
-  int compare(size_type pos1,
-              size_type count1,
-              string_view v,
-              size_type pos2,
-              size_type count2) const
-  {
-    return substr(pos1, count1).compare(v.substr(pos2, count2));
-  }
-
-  int compare(const char *s) const { return compare(string_view(s)); }
-
-  int compare(size_type pos1, size_type count1, const char *s) const
-  {
-    return substr(pos1, count1).compare(string_view(s));
-  }
-
-  int compare(size_type pos1, size_type count1, const char *s, size_type count2) const
-  {
-    return substr(pos1, count1).compare(string_view(s, count2));
-  }
-
-  size_type find(char ch, size_type pos = 0) const noexcept
-  {
-    size_type res = npos;
-    if (pos < length())
-    {
-      auto found = Traits::find(data() + pos, length() - pos, ch);
-      if (found)
-      {
-        res = found - data();
-      }
-    }
-    return res;
-  }
-
-  bool operator<(const string_view v) const noexcept { return compare(v) < 0; }
-
-  bool operator>(const string_view v) const noexcept { return compare(v) > 0; }
-
-private:
-  // Note: uses the same binary layout as libstdc++'s std::string_view
-  // See
-  // https://github.com/gcc-mirror/gcc/blob/e0c554e4da7310df83bb1dcc7b8e6c4c9c5a2a4f/libstdc%2B%2B-v3/include/std/string_view#L466-L467
-  size_type length_;
-  const char *data_;
-};
-
-inline bool operator==(string_view lhs, string_view rhs) noexcept
-{
-  return lhs.length() == rhs.length() &&
-#  if defined(_MSC_VER)
-#    if _MSC_VER >= 1900 && _MSC_VER <= 1911
-         // Avoid SCL error in Visual Studio 2015, VS2017 update 1 to update 4
-         (std::memcmp(lhs.data(), rhs.data(), lhs.length()) == 0);
-#    else
-         std::equal(lhs.data(), lhs.data() + lhs.length(), rhs.data());
-#    endif
-#  else
-         std::equal(lhs.data(), lhs.data() + lhs.length(), rhs.data());
-#  endif
-}
-
-inline bool operator==(string_view lhs, const std::string &rhs) noexcept
-{
-  return lhs == string_view(rhs);
-}
-
-inline bool operator==(const std::string &lhs, string_view rhs) noexcept
-{
-  return string_view(lhs) == rhs;
-}
-
-inline bool operator==(string_view lhs, const char *rhs) noexcept
-{
-  return lhs == string_view(rhs);
-}
-
-inline bool operator==(const char *lhs, string_view rhs) noexcept
-{
-  return string_view(lhs) == rhs;
-}
-
-inline bool operator!=(string_view lhs, string_view rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(string_view lhs, const std::string &rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const std::string &lhs, string_view rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(string_view lhs, const char *rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const char *lhs, string_view rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline std::ostream &operator<<(std::ostream &os, string_view s)
-{
-  return os.write(s.data(), static_cast<std::streamsize>(s.length()));
-}
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-
-namespace std
-{
-template <>
-struct hash<OPENTELEMETRY_NAMESPACE::nostd::string_view>
-{
-  std::size_t operator()(const OPENTELEMETRY_NAMESPACE::nostd::string_view &k) const
-  {
-    // TODO: for C++17 that has native support for std::basic_string_view it would
-    // be more performance-efficient to provide a zero-copy hash.
-    auto s = std::string(k.data(), k.size());
-    return std::hash<std::string>{}(s);
-  }
-};
-}  // namespace std
-#endif /* OPENTELEMETRY_HAVE_STD_STRING_VIEW */
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/type_traits.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/type_traits.h
deleted file mode 100644
index a797c1ea0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/type_traits.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2011
-#    include "opentelemetry/std/type_traits.h"
-#    define OPENTELEMETRY_HAVE_STD_TYPE_TRAITS
-#  endif
-#endif
-
-#include <type_traits>
-
-#if !defined(OPENTELEMETRY_HAVE_STD_TYPE_TRAITS)
-#  include <array>
-
-#  include "opentelemetry/nostd/detail/void.h"  // IWYU pragma: export
-#  include "opentelemetry/version.h"
-#endif
-
-#if !defined(__GLIBCXX__) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7) || \
-    (defined(__GLIBCXX__) && __GLIBCXX__ >= 20150422)  // >= libstdc++-5
-#  define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-/**
- * Back port of std::add_pointer_t
- */
-template <class T>
-using add_pointer_t = typename std::add_pointer<T>::type;
-
-/**
- * Back port of std::enable_if_t
- */
-template <bool B, class T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-/**
- * Back port of std::remove_const_t
- */
-template <typename T>
-using remove_const_t = typename std::remove_const<T>::type;
-
-/**
- * Back port of std::remove_reference_t
- */
-template <typename T>
-using remove_reference_t = typename std::remove_reference<T>::type;
-
-/**
- * Back port of std::remove_cvref_t
- */
-template <typename T>
-using remove_cvref_t = typename std::remove_cv<remove_reference_t<T>>::type;
-
-/**
- * Back port of std::remove_all_extents
- */
-template <typename T>
-struct remove_all_extents
-{
-  using type = T;
-};
-
-template <typename T, std::size_t N>
-struct remove_all_extents<std::array<T, N>> : remove_all_extents<T>
-{};
-
-/**
- * Back port of std::remove_all_extents_t
- */
-template <typename T>
-using remove_all_extents_t = typename remove_all_extents<T>::type;
-
-#if defined(OPENTELEMETRY_STL_VERSION) && OPENTELEMETRY_STL_VERSION >= 2017
-using std::is_nothrow_swappable;
-using std::is_swappable;
-#else
-/**
- * Back port of std::is_swappable
- */
-namespace detail
-{
-namespace swappable
-{
-
-using std::swap;
-
-template <typename T>
-struct is_swappable
-{
-private:
-  template <typename U, typename = decltype(swap(std::declval<U &>(), std::declval<U &>()))>
-  inline static std::true_type test(int);
-
-  template <typename U>
-  inline static std::false_type test(...);
-
-public:
-  static constexpr bool value = decltype(test<T>(0))::value;
-};
-
-}  // namespace swappable
-}  // namespace detail
-
-using detail::swappable::is_swappable;
-
-/**
- * Back port of std::is_swappable
- */
-namespace detail
-{
-namespace swappable
-{
-template <bool IsSwappable, typename T>
-struct is_nothrow_swappable
-{
-  static constexpr bool value = noexcept(swap(std::declval<T &>(), std::declval<T &>()));
-};
-
-template <typename T>
-struct is_nothrow_swappable<false, T> : std::false_type
-{};
-}  // namespace swappable
-}  // namespace detail
-template <typename T>
-using is_nothrow_swappable = detail::swappable::is_nothrow_swappable<is_swappable<T>::value, T>;
-#endif
-
-/**
- * Back port of
- *  std::is_trivialy_copy_constructible
- *  std::is_trivialy_move_constructible
- *  std::is_trivialy_copy_assignable
- *  std::is_trivialy_move_assignable
- */
-#ifdef OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
-using std::is_trivially_copy_assignable;
-using std::is_trivially_copy_constructible;
-using std::is_trivially_move_assignable;
-using std::is_trivially_move_constructible;
-#else
-template <typename T>
-struct is_trivially_copy_constructible
-{
-  static constexpr bool value = std::is_copy_constructible<T>::value && __has_trivial_copy(T);
-};
-
-template <typename T>
-struct is_trivially_move_constructible
-{
-  static constexpr bool value = __is_trivial(T);
-};
-
-template <typename T>
-struct is_trivially_copy_assignable
-{
-  static constexpr bool value = std::is_copy_assignable<T>::value && __has_trivial_assign(T);
-};
-
-template <typename T>
-struct is_trivially_move_assignable
-{
-  static constexpr bool value = __is_trivial(T);
-};
-#endif
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/unique_ptr.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/unique_ptr.h
deleted file mode 100644
index b3f5e6199..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/unique_ptr.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2011
-#    include "opentelemetry/std/unique_ptr.h"
-#    define OPENTELEMETRY_HAVE_STD_UNIQUE_PTR
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_UNIQUE_PTR)
-#  include <cstddef>
-#  include <memory>
-#  include <type_traits>
-#  include <utility>
-
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <class T>
-struct unique_ptr_element_type
-{
-  using type = T;
-};
-
-template <class T>
-struct unique_ptr_element_type<T[]>
-{
-  using type = T;
-};
-}  // namespace detail
-
-/**
- * Provide a simplified port of std::unique_ptr that has ABI stability.
- *
- * Note: This implementation doesn't allow for a custom deleter.
- */
-template <class T>
-class unique_ptr
-{
-public:
-  using element_type = typename detail::unique_ptr_element_type<T>::type;
-  using pointer      = element_type *;
-
-  unique_ptr() noexcept : ptr_{nullptr} {}
-
-  unique_ptr(std::nullptr_t) noexcept : ptr_{nullptr} {}
-
-  explicit unique_ptr(pointer ptr) noexcept : ptr_{ptr} {}
-
-  unique_ptr(unique_ptr &&other) noexcept : ptr_{other.release()} {}
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  unique_ptr(unique_ptr<U> &&other) noexcept : ptr_{other.release()}
-  {}
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  unique_ptr(std::unique_ptr<U> &&other) noexcept : ptr_{other.release()}
-  {}
-
-  ~unique_ptr() { reset(); }
-
-  unique_ptr &operator=(unique_ptr &&other) noexcept
-  {
-    reset(other.release());
-    return *this;
-  }
-
-  unique_ptr &operator=(std::nullptr_t) noexcept
-  {
-    reset();
-    return *this;
-  }
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  unique_ptr &operator=(unique_ptr<U> &&other) noexcept
-  {
-    reset(other.release());
-    return *this;
-  }
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  unique_ptr &operator=(std::unique_ptr<U> &&other) noexcept
-  {
-    reset(other.release());
-    return *this;
-  }
-
-  operator std::unique_ptr<T>() && noexcept { return std::unique_ptr<T>{release()}; }
-
-  operator bool() const noexcept { return ptr_ != nullptr; }
-
-  element_type &operator*() const noexcept { return *ptr_; }
-
-  pointer operator->() const noexcept { return get(); }
-
-  pointer get() const noexcept { return ptr_; }
-
-  void reset(pointer ptr = nullptr) noexcept
-  {
-    if (ptr_ != nullptr)
-    {
-      this->delete_ptr();
-    }
-    ptr_ = ptr;
-  }
-
-  pointer release() noexcept
-  {
-    auto result = ptr_;
-    ptr_        = nullptr;
-    return result;
-  }
-
-  void swap(unique_ptr &other) noexcept { std::swap(ptr_, other.ptr_); }
-
-private:
-  pointer ptr_;
-
-  void delete_ptr() noexcept
-  {
-    if (std::is_array<T>::value)
-    {
-      delete[] ptr_;
-    }
-    else
-    {
-      delete ptr_;
-    }
-  }
-};
-
-template <class T1, class T2>
-bool operator==(const unique_ptr<T1> &lhs, const unique_ptr<T2> &rhs) noexcept
-{
-  return lhs.get() == rhs.get();
-}
-
-template <class T>
-bool operator==(const unique_ptr<T> &lhs, std::nullptr_t) noexcept
-{
-  return lhs.get() == nullptr;
-}
-
-template <class T>
-bool operator==(std::nullptr_t, const unique_ptr<T> &rhs) noexcept
-{
-  return nullptr == rhs.get();
-}
-
-template <class T1, class T2>
-bool operator!=(const unique_ptr<T1> &lhs, const unique_ptr<T2> &rhs) noexcept
-{
-  return lhs.get() != rhs.get();
-}
-
-template <class T>
-bool operator!=(const unique_ptr<T> &lhs, std::nullptr_t) noexcept
-{
-  return lhs.get() != nullptr;
-}
-
-template <class T>
-bool operator!=(std::nullptr_t, const unique_ptr<T> &rhs) noexcept
-{
-  return nullptr != rhs.get();
-}
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_HAVE_STD_UNIQUE_PTR */
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/utility.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/utility.h
deleted file mode 100644
index de4f47e4c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/utility.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2014
-#    include "opentelemetry/std/utility.h"
-#    define OPENTELEMETRY_HAVE_STD_UTILITY
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_UTILITY)
-#  include <cstddef>
-#  include <initializer_list>
-#  include <type_traits>
-
-#  include "opentelemetry/nostd/detail/decay.h"   // IWYU pragma: export
-#  include "opentelemetry/nostd/detail/invoke.h"  // IWYU pragma: export
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-/**
- * Back port of std::data
- *
- * See https://en.cppreference.com/w/cpp/iterator/data
- */
-template <class C>
-auto data(C &c) noexcept(noexcept(c.data())) -> decltype(c.data())
-{
-  return c.data();
-}
-
-template <class C>
-auto data(const C &c) noexcept(noexcept(c.data())) -> decltype(c.data())
-{
-  return c.data();
-}
-
-template <class T, size_t N>
-T *data(T (&array)[N]) noexcept
-{
-  return array;
-}
-
-template <class E>
-const E *data(std::initializer_list<E> list) noexcept
-{
-  return list.begin();
-}
-
-/**
- * Back port of std::size
- *
- * See https://en.cppreference.com/w/cpp/iterator/size
- */
-template <class C>
-auto size(const C &c) noexcept(noexcept(c.size())) -> decltype(c.size())
-{
-  return c.size();
-}
-
-template <class T, size_t N>
-size_t size(T (& /* array */)[N]) noexcept
-{
-  return N;
-}
-
-/**
- * Back port of std::bool_constant
- */
-template <bool B>
-using bool_constant = std::integral_constant<bool, B>;
-
-/**
- * Back port of std::integer_sequence
- */
-template <typename T, T... Is>
-struct integer_sequence
-{
-  using value_type = T;
-  static constexpr std::size_t size() noexcept { return sizeof...(Is); }
-};
-
-/**
- * Back port of std::index_sequence
- */
-template <std::size_t... Is>
-using index_sequence = integer_sequence<std::size_t, Is...>;
-
-/**
- * Back port of std::make_index_sequence
- */
-namespace detail
-{
-template <class, size_t>
-struct index_sequence_push_back
-{};
-
-template <size_t... Indexes, size_t I>
-struct index_sequence_push_back<index_sequence<Indexes...>, I>
-{
-  using type = index_sequence<Indexes..., I>;
-};
-
-template <class T, size_t I>
-using index_sequence_push_back_t = typename index_sequence_push_back<T, I>::type;
-
-template <size_t N>
-struct make_index_sequence_impl
-{
-  using type = index_sequence_push_back_t<typename make_index_sequence_impl<N - 1>::type, N - 1>;
-};
-
-template <>
-struct make_index_sequence_impl<0>
-{
-  using type = index_sequence<>;
-};
-}  // namespace detail
-
-template <size_t N>
-using make_index_sequence = typename detail::make_index_sequence_impl<N>::type;
-
-/**
- * Back port of std::index_sequence_for
- */
-template <class... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-/**
- * Back port of std::in_place_t
- */
-struct in_place_t
-{
-  explicit in_place_t() = default;
-};
-
-/**
- * Back port of std::in_place_index_t
- */
-template <std::size_t I>
-struct in_place_index_t
-{
-  explicit in_place_index_t() = default;
-};
-
-/**
- * Back port of std::in_place_type_t
- */
-template <typename T>
-struct in_place_type_t
-{
-  explicit in_place_type_t() = default;
-};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_HAVE_STD_UTILITY */
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/variant.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/variant.h
deleted file mode 100644
index 4abac7766..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/nostd/variant.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2017
-#    include "opentelemetry/std/variant.h"
-#    define OPENTELEMETRY_HAVE_STD_VARIANT
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_VARIANT)
-
-// We use a LOCAL snapshot of Abseil that is known to compile with Visual Studio 2015.
-// Header-only. Without compiling the actual Abseil binary. As Abseil moves on to new
-// toolchains, it may drop support for Visual Studio 2015 in future versions.
-
-#  if defined(__EXCEPTIONS)
-#    include <exception>
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-
-class bad_variant_access : public std::exception
-{
-public:
-  virtual const char *what() const noexcept override { return "bad_variant_access"; }
-};
-
-[[noreturn]] inline void throw_bad_variant_access()
-{
-  throw bad_variant_access{};
-}
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#    define THROW_BAD_VARIANT_ACCESS opentelemetry::nostd::throw_bad_variant_access()
-#  else
-#    define THROW_BAD_VARIANT_ACCESS std::terminate()
-#  endif
-
-#  ifdef _MSC_VER
-// Abseil variant implementation contains some benign non-impacting warnings
-// that should be suppressed if compiling with Visual Studio 2017 and above.
-#    pragma warning(push)
-#    pragma warning(disable : 4245)  // conversion from int to const unsigned _int64
-#    pragma warning(disable : 4127)  // conditional expression is constant
-#  endif
-
-#  include "opentelemetry/nostd/internal/absl/base/options.h"
-
-namespace absl
-{
-namespace OTABSL_OPTION_NAMESPACE_NAME
-{
-template <class T>
-struct variant_size;
-template <typename... Ts>
-class variant;
-}  // namespace OTABSL_OPTION_NAMESPACE_NAME
-}  // namespace absl
-
-#  include "opentelemetry/nostd/internal/absl/types/variant.h"
-
-#  ifdef _MSC_VER
-#    pragma warning(pop)
-#  endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-using absl::OTABSL_OPTION_NAMESPACE_NAME::get;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::get_if;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::holds_alternative;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::monostate;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::variant;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::visit;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-
-#endif /* OPENTELEMETRY_HAVE_STD_VARIANT */
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_library_handle.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_library_handle.h
deleted file mode 100644
index 9ffe076ad..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_library_handle.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-/**
- * Manage the ownership of a dynamically loaded library.
- */
-class DynamicLibraryHandle
-{
-public:
-  virtual ~DynamicLibraryHandle() = default;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h
deleted file mode 100644
index 83522c56e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_load_unix.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <dlfcn.h>
-#include <algorithm>
-#include <memory>
-
-#include "opentelemetry/plugin/detail/dynamic_library_handle.h"
-#include "opentelemetry/plugin/detail/loader_info.h"
-#include "opentelemetry/plugin/detail/utility.h"
-#include "opentelemetry/plugin/factory.h"
-#include "opentelemetry/plugin/hook.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-class DynamicLibraryHandleUnix final : public DynamicLibraryHandle
-{
-public:
-  explicit DynamicLibraryHandleUnix(void *handle) noexcept : handle_{handle} {}
-
-  ~DynamicLibraryHandleUnix() override { ::dlclose(handle_); }
-
-private:
-  void *handle_;
-};
-
-inline std::unique_ptr<Factory> LoadFactory(const char *plugin, std::string &error_message) noexcept
-{
-  dlerror();  // Clear any existing error.
-
-  auto handle = ::dlopen(plugin, RTLD_NOW | RTLD_LOCAL);
-  if (handle == nullptr)
-  {
-    detail::CopyErrorMessage(dlerror(), error_message);
-    return nullptr;
-  }
-
-  std::shared_ptr<DynamicLibraryHandle> library_handle{new (std::nothrow)
-                                                           DynamicLibraryHandleUnix{handle}};
-  if (library_handle == nullptr)
-  {
-    return nullptr;
-  }
-
-  auto make_factory_impl =
-      reinterpret_cast<OpenTelemetryHook *>(::dlsym(handle, "OpenTelemetryMakeFactoryImpl"));
-  if (make_factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage(dlerror(), error_message);
-    return nullptr;
-  }
-  if (*make_factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage("Invalid plugin hook", error_message);
-    return nullptr;
-  }
-  LoaderInfo loader_info;
-  nostd::unique_ptr<char[]> plugin_error_message;
-  auto factory_impl = (**make_factory_impl)(loader_info, plugin_error_message);
-  if (factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage(plugin_error_message.get(), error_message);
-    return nullptr;
-  }
-  return std::unique_ptr<Factory>{new (std::nothrow)
-                                      Factory{std::move(library_handle), std::move(factory_impl)}};
-}
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h
deleted file mode 100644
index 5ed283375..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/dynamic_load_windows.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/plugin/detail/dynamic_library_handle.h"
-#include "opentelemetry/plugin/detail/loader_info.h"
-#include "opentelemetry/plugin/detail/utility.h"
-#include "opentelemetry/plugin/factory.h"
-#include "opentelemetry/plugin/hook.h"
-#include "opentelemetry/version.h"
-
-#include <Windows.h>
-
-#include <WinBase.h>
-#include <errhandlingapi.h>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-namespace detail
-{
-inline void GetLastErrorMessage(std::string &error_message) noexcept
-{
-  auto error_code = ::GetLastError();
-  // See https://stackoverflow.com/a/455533/4447365
-  LPTSTR error_text = nullptr;
-  auto size         = ::FormatMessage(
-      FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS,
-      nullptr, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-      reinterpret_cast<LPTSTR>(&error_text), 0, nullptr);
-  if (size == 0)
-  {
-    return;
-  }
-  CopyErrorMessage(error_text, error_message);
-  ::LocalFree(error_text);
-}
-}  // namespace detail
-
-class DynamicLibraryHandleWindows final : public DynamicLibraryHandle
-{
-public:
-  explicit DynamicLibraryHandleWindows(HINSTANCE handle) : handle_{handle} {}
-
-  ~DynamicLibraryHandleWindows() override { ::FreeLibrary(handle_); }
-
-private:
-  HINSTANCE handle_;
-};
-
-inline std::unique_ptr<Factory> LoadFactory(const char *plugin, std::string &error_message) noexcept
-{
-  auto handle = ::LoadLibrary(plugin);
-  if (handle == nullptr)
-  {
-    detail::GetLastErrorMessage(error_message);
-    return nullptr;
-  }
-
-  std::shared_ptr<DynamicLibraryHandle> library_handle{new (std::nothrow)
-                                                           DynamicLibraryHandleWindows{handle}};
-  if (library_handle == nullptr)
-  {
-    detail::CopyErrorMessage("Allocation failure", error_message);
-    return nullptr;
-  }
-
-  auto make_factory_impl = reinterpret_cast<OpenTelemetryHook *>(
-      ::GetProcAddress(handle, "OpenTelemetryMakeFactoryImpl"));
-  if (make_factory_impl == nullptr)
-  {
-    detail::GetLastErrorMessage(error_message);
-    return nullptr;
-  }
-  if (*make_factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage("Invalid plugin hook", error_message);
-    return nullptr;
-  }
-
-  LoaderInfo loader_info;
-  nostd::unique_ptr<char[]> plugin_error_message;
-  auto factory_impl = (**make_factory_impl)(loader_info, plugin_error_message);
-  if (factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage(plugin_error_message.get(), error_message);
-    return nullptr;
-  }
-  return std::unique_ptr<Factory>{new (std::nothrow)
-                                      Factory{std::move(library_handle), std::move(factory_impl)}};
-}
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/loader_info.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/loader_info.h
deleted file mode 100644
index ca8c9f0a1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/loader_info.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-/**
- * LoaderInfo describes the versioning of the loader.
- *
- * Plugins can check against this information and properly error out if they were built against an
- * incompatible OpenTelemetry API.
- */
-struct LoaderInfo
-{
-  nostd::string_view opentelemetry_version     = OPENTELEMETRY_VERSION;
-  nostd::string_view opentelemetry_abi_version = OPENTELEMETRY_ABI_VERSION;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/tracer_handle.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/tracer_handle.h
deleted file mode 100644
index 46b128106..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/tracer_handle.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-class Tracer;
-}  // namespace trace
-
-namespace plugin
-{
-/**
- * Manage the ownership of a dynamically loaded tracer.
- */
-class TracerHandle
-{
-public:
-  virtual ~TracerHandle() = default;
-
-  virtual trace::Tracer &tracer() const noexcept = 0;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/utility.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/utility.h
deleted file mode 100644
index 8007f285d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/detail/utility.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if __EXCEPTIONS
-#  include <new>
-#endif  // __EXCEPTIONS
-
-#include <string>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-namespace detail
-{
-inline void CopyErrorMessage(const char *source, std::string &destination) noexcept
-#if __EXCEPTIONS
-try
-#endif
-{
-  if (source == nullptr)
-  {
-    return;
-  }
-  destination.assign(source);
-}
-#if __EXCEPTIONS
-catch (const std::bad_alloc &)
-{}
-#endif
-}  // namespace detail
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/dynamic_load.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/dynamic_load.h
deleted file mode 100644
index 2da271355..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/dynamic_load.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/plugin/factory.h"
-#include "opentelemetry/version.h"
-
-#ifdef _WIN32
-#  include "opentelemetry/plugin/detail/dynamic_load_windows.h"  // IWYU pragma: export
-#else
-#  include "opentelemetry/plugin/detail/dynamic_load_unix.h"  // IWYU pragma: export
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-
-/**
- * Load an OpenTelemetry implementation as a plugin.
- * @param plugin the path to the plugin to load
- * @param error_message on failure this is set to an error message
- * @return a Factory that can be used to create OpenTelemetry objects or nullptr on failure.
- */
-std::unique_ptr<Factory> LoadFactory(const char *plugin, std::string &error_message) noexcept;
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/factory.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/factory.h
deleted file mode 100644
index d9df30e48..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/plugin/detail/utility.h"  // IWYU pragma: export
-#include "opentelemetry/plugin/tracer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-/**
- * Factory creates OpenTelemetry objects from configuration strings.
- */
-class Factory final
-{
-public:
-  class FactoryImpl
-  {
-  public:
-    virtual ~FactoryImpl() {}
-
-    virtual nostd::unique_ptr<TracerHandle> MakeTracerHandle(
-        nostd::string_view tracer_config,
-        nostd::unique_ptr<char[]> &error_message) const noexcept = 0;
-  };
-
-  Factory(std::shared_ptr<DynamicLibraryHandle> library_handle,
-          std::unique_ptr<FactoryImpl> &&factory_impl) noexcept
-      : library_handle_{std::move(library_handle)}, factory_impl_{std::move(factory_impl)}
-  {}
-
-  /**
-   * Construct a tracer from a configuration string.
-   * @param tracer_config a representation of the tracer's config as a string.
-   * @param error_message on failure this will contain an error message.
-   * @return a Tracer on success or nullptr on failure.
-   */
-  std::shared_ptr<trace::Tracer> MakeTracer(nostd::string_view tracer_config,
-                                            std::string &error_message) const noexcept
-  {
-    nostd::unique_ptr<char[]> plugin_error_message;
-    auto tracer_handle = factory_impl_->MakeTracerHandle(tracer_config, plugin_error_message);
-    if (tracer_handle == nullptr)
-    {
-      detail::CopyErrorMessage(plugin_error_message.get(), error_message);
-      return nullptr;
-    }
-    return std::shared_ptr<trace::Tracer>{new (std::nothrow)
-                                              Tracer{library_handle_, std::move(tracer_handle)}};
-  }
-
-private:
-  // Note: The order is important here.
-  //
-  // It's undefined behavior to close the library while a loaded FactoryImpl is still active.
-  std::shared_ptr<DynamicLibraryHandle> library_handle_;
-  std::unique_ptr<FactoryImpl> factory_impl_;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/hook.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/hook.h
deleted file mode 100644
index 9b18e2a6a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/hook.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-#ifdef _WIN32
-
-/**
- * Cross-platform helper macro to declare the symbol used to load an OpenTelemetry implementation
- * as a plugin.
- *
- * Note: The symbols use weak linkage so as to support using an OpenTelemetry both as a regular
- * library and a dynamically loaded plugin. The weak linkage allows for multiple implementations to
- * be linked in without getting multiple definition errors.
- */
-#  define OPENTELEMETRY_DEFINE_PLUGIN_HOOK(X)                                   \
-    extern "C" {                                                                \
-    extern __declspec(dllexport) opentelemetry::plugin::OpenTelemetryHook const \
-        OpenTelemetryMakeFactoryImpl;                                           \
-                                                                                \
-    __declspec(selectany) opentelemetry::plugin::OpenTelemetryHook const        \
-        OpenTelemetryMakeFactoryImpl = X;                                       \
-    }  // extern "C"
-
-#else
-
-#  define OPENTELEMETRY_DEFINE_PLUGIN_HOOK(X)                                                      \
-    extern "C" {                                                                                   \
-    __attribute((                                                                                  \
-        weak)) extern opentelemetry::plugin::OpenTelemetryHook const OpenTelemetryMakeFactoryImpl; \
-                                                                                                   \
-    opentelemetry::plugin::OpenTelemetryHook const OpenTelemetryMakeFactoryImpl = X;               \
-    }  // extern "C"
-
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-
-struct LoaderInfo;
-class FactoryImpl;
-
-using OpenTelemetryHook =
-    nostd::unique_ptr<Factory::FactoryImpl> (*)(const LoaderInfo &loader_info,
-                                                nostd::unique_ptr<char[]> &error_message);
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/tracer.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/tracer.h
deleted file mode 100644
index 99d1fc4c2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/plugin/tracer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/plugin/detail/tracer_handle.h"  // IWYU pragma: export
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-
-class DynamicLibraryHandle;
-
-class Span final : public trace::Span
-{
-public:
-  Span(std::shared_ptr<trace::Tracer> &&tracer, const nostd::shared_ptr<trace::Span> &span) noexcept
-      : tracer_{std::move(tracer)}, span_{span}
-  {}
-
-  // trace::Span
-  void SetAttribute(nostd::string_view name, const common::AttributeValue &value) noexcept override
-  {
-    span_->SetAttribute(name, value);
-  }
-
-  void AddEvent(nostd::string_view name) noexcept override { span_->AddEvent(name); }
-
-  void AddEvent(nostd::string_view name, common::SystemTimestamp timestamp) noexcept override
-  {
-    span_->AddEvent(name, timestamp);
-  }
-
-  void AddEvent(nostd::string_view name,
-                const common::KeyValueIterable &attributes) noexcept override
-  {
-    span_->AddEvent(name, attributes);
-  }
-
-  void AddEvent(nostd::string_view name,
-                common::SystemTimestamp timestamp,
-                const common::KeyValueIterable &attributes) noexcept override
-  {
-    span_->AddEvent(name, timestamp, attributes);
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void AddLink(const trace::SpanContext &target,
-               const common::KeyValueIterable &attrs) noexcept override
-  {
-    span_->AddLink(target, attrs);
-  }
-
-  void AddLinks(const trace::SpanContextKeyValueIterable &links) noexcept override
-  {
-    span_->AddLinks(links);
-  }
-#endif
-
-  void SetStatus(trace::StatusCode code, nostd::string_view description) noexcept override
-  {
-    span_->SetStatus(code, description);
-  }
-
-  void UpdateName(nostd::string_view name) noexcept override { span_->UpdateName(name); }
-
-  void End(const trace::EndSpanOptions &options = {}) noexcept override { span_->End(options); }
-
-  bool IsRecording() const noexcept override { return span_->IsRecording(); }
-
-  trace::SpanContext GetContext() const noexcept override { return span_->GetContext(); }
-
-private:
-  std::shared_ptr<trace::Tracer> tracer_;
-  nostd::shared_ptr<trace::Span> span_;
-};
-
-class Tracer final : public trace::Tracer, public std::enable_shared_from_this<Tracer>
-{
-public:
-  Tracer(std::shared_ptr<DynamicLibraryHandle> library_handle,
-         std::unique_ptr<TracerHandle> &&tracer_handle) noexcept
-      : library_handle_{std::move(library_handle)}, tracer_handle_{std::move(tracer_handle)}
-  {
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    UpdateEnabled(true);
-#endif
-  }
-
-  // trace::Tracer
-  nostd::shared_ptr<trace::Span> StartSpan(
-      nostd::string_view name,
-      const common::KeyValueIterable &attributes,
-      const trace::SpanContextKeyValueIterable &links,
-      const trace::StartSpanOptions &options = {}) noexcept override
-  {
-    auto span = tracer_handle_->tracer().StartSpan(name, attributes, links, options);
-    if (span == nullptr)
-    {
-      return nostd::shared_ptr<trace::Span>(nullptr);
-    }
-    return nostd::shared_ptr<trace::Span>{new (std::nothrow) Span{this->shared_from_this(), span}};
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-
-  void ForceFlushWithMicroseconds(uint64_t timeout) noexcept override
-  {
-    tracer_handle_->tracer().ForceFlushWithMicroseconds(timeout);
-  }
-
-  void CloseWithMicroseconds(uint64_t timeout) noexcept override
-  {
-    tracer_handle_->tracer().CloseWithMicroseconds(timeout);
-  }
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-private:
-  // Note: The order is important here.
-  //
-  // It's undefined behavior to close the library while a loaded tracer is still active.
-  std::shared_ptr<DynamicLibraryHandle> library_handle_;
-  std::unique_ptr<TracerHandle> tracer_handle_;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/azure_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/azure_metrics.h
deleted file mode 100644
index 63f4556b0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/azure_metrics.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace azure
-{
-
-/**
- * Number of active client instances
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricAzureCosmosdbClientActiveInstanceCount =
-    "azure.cosmosdb.client.active_instance.count";
-static constexpr const char *descrMetricAzureCosmosdbClientActiveInstanceCount =
-    "Number of active client instances";
-static constexpr const char *unitMetricAzureCosmosdbClientActiveInstanceCount = "{instance}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricAzureCosmosdbClientActiveInstanceCount,
-                                         descrMetricAzureCosmosdbClientActiveInstanceCount,
-                                         unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricAzureCosmosdbClientActiveInstanceCount,
-                                          descrMetricAzureCosmosdbClientActiveInstanceCount,
-                                          unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricAzureCosmosdbClientActiveInstanceCount,
-      descrMetricAzureCosmosdbClientActiveInstanceCount,
-      unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricAzureCosmosdbClientActiveInstanceCount,
-      descrMetricAzureCosmosdbClientActiveInstanceCount,
-      unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-/**
- * <a href="https://learn.microsoft.com/azure/cosmos-db/request-units">Request units</a> consumed by
- * the operation <p> histogram
- */
-static constexpr const char *kMetricAzureCosmosdbClientOperationRequestCharge =
-    "azure.cosmosdb.client.operation.request_charge";
-static constexpr const char *descrMetricAzureCosmosdbClientOperationRequestCharge =
-    "[Request units](https://learn.microsoft.com/azure/cosmos-db/request-units) consumed by the "
-    "operation";
-static constexpr const char *unitMetricAzureCosmosdbClientOperationRequestCharge = "{request_unit}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricAzureCosmosdbClientOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricAzureCosmosdbClientOperationRequestCharge,
-                                      descrMetricAzureCosmosdbClientOperationRequestCharge,
-                                      unitMetricAzureCosmosdbClientOperationRequestCharge);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricAzureCosmosdbClientOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricAzureCosmosdbClientOperationRequestCharge,
-                                      descrMetricAzureCosmosdbClientOperationRequestCharge,
-                                      unitMetricAzureCosmosdbClientOperationRequestCharge);
-}
-
-}  // namespace azure
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/cicd_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/cicd_metrics.h
deleted file mode 100644
index 993c2636f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/cicd_metrics.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cicd
-{
-
-/**
- * The number of pipeline runs currently active in the system by state.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricCicdPipelineRunActive = "cicd.pipeline.run.active";
-static constexpr const char *descrMetricCicdPipelineRunActive =
-    "The number of pipeline runs currently active in the system by state.";
-static constexpr const char *unitMetricCicdPipelineRunActive = "{run}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricCicdPipelineRunActive,
-                                         descrMetricCicdPipelineRunActive,
-                                         unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricCicdPipelineRunActive,
-                                          descrMetricCicdPipelineRunActive,
-                                          unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricCicdPipelineRunActive,
-                                                   descrMetricCicdPipelineRunActive,
-                                                   unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricCicdPipelineRunActive,
-                                                    descrMetricCicdPipelineRunActive,
-                                                    unitMetricCicdPipelineRunActive);
-}
-
-/**
- * Duration of a pipeline run grouped by pipeline, state and result.
- * <p>
- * histogram
- */
-static constexpr const char *kMetricCicdPipelineRunDuration = "cicd.pipeline.run.duration";
-static constexpr const char *descrMetricCicdPipelineRunDuration =
-    "Duration of a pipeline run grouped by pipeline, state and result.";
-static constexpr const char *unitMetricCicdPipelineRunDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricCicdPipelineRunDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricCicdPipelineRunDuration,
-                                      descrMetricCicdPipelineRunDuration,
-                                      unitMetricCicdPipelineRunDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricCicdPipelineRunDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricCicdPipelineRunDuration,
-                                      descrMetricCicdPipelineRunDuration,
-                                      unitMetricCicdPipelineRunDuration);
-}
-
-/**
- * The number of errors encountered in pipeline runs (eg. compile, test failures).
- * <p>
- * There might be errors in a pipeline run that are non fatal (eg. they are suppressed) or in a
- * parallel stage multiple stages could have a fatal error. This means that this error count might
- * not be the same as the count of metric @code cicd.pipeline.run.duration @endcode with run result
- * @code failure @endcode. <p> counter
- */
-static constexpr const char *kMetricCicdPipelineRunErrors = "cicd.pipeline.run.errors";
-static constexpr const char *descrMetricCicdPipelineRunErrors =
-    "The number of errors encountered in pipeline runs (eg. compile, test failures).";
-static constexpr const char *unitMetricCicdPipelineRunErrors = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCicdPipelineRunErrors, descrMetricCicdPipelineRunErrors,
-                                    unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCicdPipelineRunErrors, descrMetricCicdPipelineRunErrors,
-                                    unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCicdPipelineRunErrors,
-                                             descrMetricCicdPipelineRunErrors,
-                                             unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCicdPipelineRunErrors,
-                                              descrMetricCicdPipelineRunErrors,
-                                              unitMetricCicdPipelineRunErrors);
-}
-
-/**
- * The number of errors in a component of the CICD system (eg. controller, scheduler, agent).
- * <p>
- * Errors in pipeline run execution are explicitly excluded. Ie a test failure is not counted in
- * this metric. <p> counter
- */
-static constexpr const char *kMetricCicdSystemErrors = "cicd.system.errors";
-static constexpr const char *descrMetricCicdSystemErrors =
-    "The number of errors in a component of the CICD system (eg. controller, scheduler, agent).";
-static constexpr const char *unitMetricCicdSystemErrors = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricCicdSystemErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                    unitMetricCicdSystemErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricCicdSystemErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                    unitMetricCicdSystemErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdSystemErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                             unitMetricCicdSystemErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdSystemErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                              unitMetricCicdSystemErrors);
-}
-
-/**
- * The number of workers on the CICD system by state.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricCicdWorkerCount = "cicd.worker.count";
-static constexpr const char *descrMetricCicdWorkerCount =
-    "The number of workers on the CICD system by state.";
-static constexpr const char *unitMetricCicdWorkerCount = "{count}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricCicdWorkerCount, descrMetricCicdWorkerCount,
-                                         unitMetricCicdWorkerCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricCicdWorkerCount, descrMetricCicdWorkerCount,
-                                          unitMetricCicdWorkerCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricCicdWorkerCount, descrMetricCicdWorkerCount, unitMetricCicdWorkerCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricCicdWorkerCount, descrMetricCicdWorkerCount, unitMetricCicdWorkerCount);
-}
-
-}  // namespace cicd
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/client_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/client_attributes.h
deleted file mode 100644
index 7f944176d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/client_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace client
-{
-
-/**
-  Client address - domain name if available without reverse DNS lookup; otherwise, IP address or
-  Unix domain socket name. <p> When observed from the server side, and when communicating through an
-  intermediary, @code client.address @endcode SHOULD represent the client address behind any
-  intermediaries,  for example proxies, if it's available.
- */
-static constexpr const char *kClientAddress = "client.address";
-
-/**
-  Client port number.
-  <p>
-  When observed from the server side, and when communicating through an intermediary, @code
-  client.port @endcode SHOULD represent the client port behind any intermediaries,  for example
-  proxies, if it's available.
- */
-static constexpr const char *kClientPort = "client.port";
-
-}  // namespace client
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/code_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/code_attributes.h
deleted file mode 100644
index cec6ae554..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/code_attributes.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace code
-{
-
-/**
-  The column number in @code code.file.path @endcode best representing the operation. It SHOULD
-  point within the code unit named in @code code.function.name @endcode. This attribute MUST NOT be
-  used on the Profile signal since the data is already captured in 'message Line'. This constraint
-  is imposed to prevent redundancy and maintain data integrity.
- */
-static constexpr const char *kCodeColumnNumber = "code.column.number";
-
-/**
-  The source code file name that identifies the code unit as uniquely as possible (preferably an
-  absolute file path). This attribute MUST NOT be used on the Profile signal since the data is
-  already captured in 'message Function'. This constraint is imposed to prevent redundancy and
-  maintain data integrity.
- */
-static constexpr const char *kCodeFilePath = "code.file.path";
-
-/**
-  The method or function fully-qualified name without arguments. The value should fit the natural
-  representation of the language runtime, which is also likely the same used within @code
-  code.stacktrace @endcode attribute value. This attribute MUST NOT be used on the Profile signal
-  since the data is already captured in 'message Function'. This constraint is imposed to prevent
-  redundancy and maintain data integrity. <p> Values and format depends on each language runtime,
-  thus it is impossible to provide an exhaustive list of examples. The values are usually the same
-  (or prefixes of) the ones found in native stack trace representation stored in
-  @code code.stacktrace @endcode without information on arguments.
-  <p>
-  Examples:
-  <ul>
-    <li>Java method: @code com.example.MyHttpService.serveRequest @endcode</li>
-    <li>Java anonymous class method: @code com.mycompany.Main$1.myMethod @endcode</li>
-    <li>Java lambda method: @code com.mycompany.Main$$Lambda/0x0000748ae4149c00.myMethod
-  @endcode</li> <li>PHP function: @code GuzzleHttp\Client::transfer @endcode</li> <li>Go function:
-  @code github.com/my/repo/pkg.foo.func5 @endcode</li> <li>Elixir: @code OpenTelemetry.Ctx.new
-  @endcode</li> <li>Erlang: @code opentelemetry_ctx:new @endcode</li> <li>Rust: @code
-  playground::my_module::my_cool_func @endcode</li> <li>C function: @code fopen @endcode</li>
-  </ul>
- */
-static constexpr const char *kCodeFunctionName = "code.function.name";
-
-/**
-  The line number in @code code.file.path @endcode best representing the operation. It SHOULD point
-  within the code unit named in @code code.function.name @endcode. This attribute MUST NOT be used
-  on the Profile signal since the data is already captured in 'message Line'. This constraint is
-  imposed to prevent redundancy and maintain data integrity.
- */
-static constexpr const char *kCodeLineNumber = "code.line.number";
-
-/**
-  A stacktrace as a string in the natural representation for the language runtime. The
-  representation is identical to <a
-  href="/docs/exceptions/exceptions-spans.md#stacktrace-representation">@code exception.stacktrace
-  @endcode</a>. This attribute MUST NOT be used on the Profile signal since the data is already
-  captured in 'message Location'. This constraint is imposed to prevent redundancy and maintain data
-  integrity.
- */
-static constexpr const char *kCodeStacktrace = "code.stacktrace";
-
-}  // namespace code
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/container_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/container_metrics.h
deleted file mode 100644
index d3fef8b91..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/container_metrics.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace container
-{
-
-/**
- * Total CPU time consumed
- * <p>
- * Total CPU time consumed by the specific container on all available CPU cores
- * <p>
- * counter
- */
-static constexpr const char *kMetricContainerCpuTime     = "container.cpu.time";
-static constexpr const char *descrMetricContainerCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricContainerCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                    unitMetricContainerCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                    unitMetricContainerCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                             unitMetricContainerCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                              unitMetricContainerCpuTime);
-}
-
-/**
- * Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
- * <p>
- * CPU usage of the specific container on all available CPU cores, averaged over the sample window
- * <p>
- * gauge
- */
-static constexpr const char *kMetricContainerCpuUsage = "container.cpu.usage";
-static constexpr const char *descrMetricContainerCpuUsage =
-    "Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricContainerCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricContainerCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                 unitMetricContainerCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricContainerCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                  unitMetricContainerCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                           unitMetricContainerCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                            unitMetricContainerCpuUsage);
-}
-
-/**
- * Disk bytes for the container.
- * <p>
- * The total number of bytes read/written successfully (aggregated from all disks).
- * <p>
- * counter
- */
-static constexpr const char *kMetricContainerDiskIo     = "container.disk.io";
-static constexpr const char *descrMetricContainerDiskIo = "Disk bytes for the container.";
-static constexpr const char *unitMetricContainerDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                    unitMetricContainerDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                    unitMetricContainerDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerDiskIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                             unitMetricContainerDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerDiskIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                              unitMetricContainerDiskIo);
-}
-
-/**
- * Memory usage of the container.
- * <p>
- * Memory usage of the container.
- * <p>
- * counter
- */
-static constexpr const char *kMetricContainerMemoryUsage     = "container.memory.usage";
-static constexpr const char *descrMetricContainerMemoryUsage = "Memory usage of the container.";
-static constexpr const char *unitMetricContainerMemoryUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage,
-                                    unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage,
-                                    unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
-}
-
-/**
- * Network bytes for the container.
- * <p>
- * The number of bytes sent/received on all network interfaces by the container.
- * <p>
- * counter
- */
-static constexpr const char *kMetricContainerNetworkIo     = "container.network.io";
-static constexpr const char *descrMetricContainerNetworkIo = "Network bytes for the container.";
-static constexpr const char *unitMetricContainerNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerNetworkIo, descrMetricContainerNetworkIo,
-                                    unitMetricContainerNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerNetworkIo, descrMetricContainerNetworkIo,
-                                    unitMetricContainerNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricContainerNetworkIo, descrMetricContainerNetworkIo, unitMetricContainerNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricContainerNetworkIo, descrMetricContainerNetworkIo, unitMetricContainerNetworkIo);
-}
-
-/**
- * The time the container has been running
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricContainerUptime     = "container.uptime";
-static constexpr const char *descrMetricContainerUptime = "The time the container has been running";
-static constexpr const char *unitMetricContainerUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricContainerUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                 unitMetricContainerUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricContainerUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                  unitMetricContainerUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerUptime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                           unitMetricContainerUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerUptime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                            unitMetricContainerUptime);
-}
-
-}  // namespace container
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/cpu_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/cpu_metrics.h
deleted file mode 100644
index f9e6de5eb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/cpu_metrics.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpu
-{
-
-/**
- * Operating frequency of the logical CPU in Hertz.
- * <p>
- * gauge
- */
-static constexpr const char *kMetricCpuFrequency = "cpu.frequency";
-static constexpr const char *descrMetricCpuFrequency =
-    "Operating frequency of the logical CPU in Hertz.";
-static constexpr const char *unitMetricCpuFrequency = "Hz";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                 unitMetricCpuFrequency);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                  unitMetricCpuFrequency);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                           unitMetricCpuFrequency);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                            unitMetricCpuFrequency);
-}
-
-/**
- * Seconds each logical CPU spent on each mode
- * <p>
- * counter
- */
-static constexpr const char *kMetricCpuTime     = "cpu.time";
-static constexpr const char *descrMetricCpuTime = "Seconds each logical CPU spent on each mode";
-static constexpr const char *unitMetricCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCpuTime, descrMetricCpuTime,
-                                              unitMetricCpuTime);
-}
-
-/**
- * For each logical CPU, the utilization is calculated as the change in cumulative CPU time
- * (cpu.time) over a measurement interval, divided by the elapsed time. <p> gauge
- */
-static constexpr const char *kMetricCpuUtilization = "cpu.utilization";
-static constexpr const char *descrMetricCpuUtilization =
-    "For each logical CPU, the utilization is calculated as the change in cumulative CPU time "
-    "(cpu.time) over a measurement interval, divided by the elapsed time.";
-static constexpr const char *unitMetricCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                 unitMetricCpuUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                  unitMetricCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                           unitMetricCpuUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                            unitMetricCpuUtilization);
-}
-
-}  // namespace cpu
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/db_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/db_attributes.h
deleted file mode 100644
index 0e6e51c51..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/db_attributes.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace db
-{
-
-/**
-  The name of a collection (table, container) within the database.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  The collection name SHOULD NOT be extracted from @code db.query.text @endcode,
-  when the database system supports query text with multiple collections
-  in non-batch operations.
-  <p>
-  For batch operations, if the individual operations are known to have the same
-  collection name then that collection name SHOULD be used.
- */
-static constexpr const char *kDbCollectionName = "db.collection.name";
-
-/**
-  The name of the database, fully qualified within the server address and port.
-  <p>
-  If a database system has multiple namespace components, they SHOULD be concatenated from the most
-  general to the most specific namespace component, using @code | @endcode as a separator between
-  the components. Any missing components (and their associated separators) SHOULD be omitted.
-  Semantic conventions for individual database systems SHOULD document what @code db.namespace
-  @endcode means in the context of that system. It is RECOMMENDED to capture the value as provided
-  by the application without attempting to do any case normalization.
- */
-static constexpr const char *kDbNamespace = "db.namespace";
-
-/**
-  The number of queries included in a batch operation.
-  <p>
-  Operations are only considered batches when they contain two or more operations, and so @code
-  db.operation.batch.size @endcode SHOULD never be @code 1 @endcode.
- */
-static constexpr const char *kDbOperationBatchSize = "db.operation.batch.size";
-
-/**
-  The name of the operation or command being executed.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  The operation name SHOULD NOT be extracted from @code db.query.text @endcode,
-  when the database system supports query text with multiple operations
-  in non-batch operations.
-  <p>
-  If spaces can occur in the operation name, multiple consecutive spaces
-  SHOULD be normalized to a single space.
-  <p>
-  For batch operations, if the individual operations are known to have the same operation name
-  then that operation name SHOULD be used prepended by @code BATCH  @endcode,
-  otherwise @code db.operation.name @endcode SHOULD be @code BATCH @endcode or some other database
-  system specific term if more applicable.
- */
-static constexpr const char *kDbOperationName = "db.operation.name";
-
-/**
-  Low cardinality summary of a database query.
-  <p>
-  The query summary describes a class of database queries and is useful
-  as a grouping key, especially when analyzing telemetry for database
-  calls involving complex queries.
-  <p>
-  Summary may be available to the instrumentation through
-  instrumentation hooks or other means. If it is not available, instrumentations
-  that support query parsing SHOULD generate a summary following
-  <a href="/docs/database/database-spans.md#generating-a-summary-of-the-query">Generating query
-  summary</a> section.
- */
-static constexpr const char *kDbQuerySummary = "db.query.summary";
-
-/**
-  The database query being executed.
-  <p>
-  For sanitization see <a
-  href="/docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of @code
-  db.query.text @endcode</a>. For batch operations, if the individual operations are known to have
-  the same query text then that query text SHOULD be used, otherwise all of the individual query
-  texts SHOULD be concatenated with separator @code ;  @endcode or some other database system
-  specific separator if more applicable. Parameterized query text SHOULD NOT be sanitized. Even
-  though parameterized query text can potentially have sensitive data, by using a parameterized
-  query the user is giving a strong signal that any sensitive data will be passed as parameter
-  values, and the benefit to observability of capturing the static part of the query text by default
-  outweighs the risk.
- */
-static constexpr const char *kDbQueryText = "db.query.text";
-
-/**
-  Database response status code.
-  <p>
-  The status code returned by the database. Usually it represents an error code, but may also
-  represent partial success, warning, or differentiate between various types of successful outcomes.
-  Semantic conventions for individual database systems SHOULD document what @code
-  db.response.status_code @endcode means in the context of that system.
- */
-static constexpr const char *kDbResponseStatusCode = "db.response.status_code";
-
-/**
-  The name of a stored procedure within the database.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  For batch operations, if the individual operations are known to have the same
-  stored procedure name then that stored procedure name SHOULD be used.
- */
-static constexpr const char *kDbStoredProcedureName = "db.stored_procedure.name";
-
-/**
-  The database management system (DBMS) product as identified by the client instrumentation.
-  <p>
-  The actual DBMS may differ from the one identified by the client. For example, when using
-  PostgreSQL client libraries to connect to a CockroachDB, the @code db.system.name @endcode is set
-  to @code postgresql @endcode based on the instrumentation's best knowledge.
- */
-static constexpr const char *kDbSystemName = "db.system.name";
-
-namespace DbSystemNameValues
-{
-/**
-  Some other SQL database. Fallback only.
- */
-static constexpr const char *kOtherSql = "other_sql";
-
-/**
-  <a href="https://documentation.softwareag.com/?pf=adabas">Adabas (Adaptable Database System)</a>
- */
-static constexpr const char *kSoftwareagAdabas = "softwareag.adabas";
-
-/**
-  <a href="https://www.actian.com/databases/ingres/">Actian Ingres</a>
- */
-static constexpr const char *kActianIngres = "actian.ingres";
-
-/**
-  <a href="https://aws.amazon.com/pm/dynamodb/">Amazon DynamoDB</a>
- */
-static constexpr const char *kAwsDynamodb = "aws.dynamodb";
-
-/**
-  <a href="https://aws.amazon.com/redshift/">Amazon Redshift</a>
- */
-static constexpr const char *kAwsRedshift = "aws.redshift";
-
-/**
-  <a href="https://learn.microsoft.com/azure/cosmos-db">Azure Cosmos DB</a>
- */
-static constexpr const char *kAzureCosmosdb = "azure.cosmosdb";
-
-/**
-  <a href="https://www.intersystems.com/products/cache/">InterSystems Caché</a>
- */
-static constexpr const char *kIntersystemsCache = "intersystems.cache";
-
-/**
-  <a href="https://cassandra.apache.org/">Apache Cassandra</a>
- */
-static constexpr const char *kCassandra = "cassandra";
-
-/**
-  <a href="https://clickhouse.com/">ClickHouse</a>
- */
-static constexpr const char *kClickhouse = "clickhouse";
-
-/**
-  <a href="https://www.cockroachlabs.com/">CockroachDB</a>
- */
-static constexpr const char *kCockroachdb = "cockroachdb";
-
-/**
-  <a href="https://www.couchbase.com/">Couchbase</a>
- */
-static constexpr const char *kCouchbase = "couchbase";
-
-/**
-  <a href="https://couchdb.apache.org/">Apache CouchDB</a>
- */
-static constexpr const char *kCouchdb = "couchdb";
-
-/**
-  <a href="https://db.apache.org/derby/">Apache Derby</a>
- */
-static constexpr const char *kDerby = "derby";
-
-/**
-  <a href="https://www.elastic.co/elasticsearch">Elasticsearch</a>
- */
-static constexpr const char *kElasticsearch = "elasticsearch";
-
-/**
-  <a href="https://www.firebirdsql.org/">Firebird</a>
- */
-static constexpr const char *kFirebirdsql = "firebirdsql";
-
-/**
-  <a href="https://cloud.google.com/spanner">Google Cloud Spanner</a>
- */
-static constexpr const char *kGcpSpanner = "gcp.spanner";
-
-/**
-  <a href="https://geode.apache.org/">Apache Geode</a>
- */
-static constexpr const char *kGeode = "geode";
-
-/**
-  <a href="https://h2database.com/">H2 Database</a>
- */
-static constexpr const char *kH2database = "h2database";
-
-/**
-  <a href="https://hbase.apache.org/">Apache HBase</a>
- */
-static constexpr const char *kHbase = "hbase";
-
-/**
-  <a href="https://hive.apache.org/">Apache Hive</a>
- */
-static constexpr const char *kHive = "hive";
-
-/**
-  <a href="https://hsqldb.org/">HyperSQL Database</a>
- */
-static constexpr const char *kHsqldb = "hsqldb";
-
-/**
-  <a href="https://www.ibm.com/db2">IBM Db2</a>
- */
-static constexpr const char *kIbmDb2 = "ibm.db2";
-
-/**
-  <a href="https://www.ibm.com/products/informix">IBM Informix</a>
- */
-static constexpr const char *kIbmInformix = "ibm.informix";
-
-/**
-  <a href="https://www.ibm.com/products/netezza">IBM Netezza</a>
- */
-static constexpr const char *kIbmNetezza = "ibm.netezza";
-
-/**
-  <a href="https://www.influxdata.com/">InfluxDB</a>
- */
-static constexpr const char *kInfluxdb = "influxdb";
-
-/**
-  <a href="https://www.instantdb.com/">Instant</a>
- */
-static constexpr const char *kInstantdb = "instantdb";
-
-/**
-  <a href="https://mariadb.org/">MariaDB</a>
- */
-static constexpr const char *kMariadb = "mariadb";
-
-/**
-  <a href="https://memcached.org/">Memcached</a>
- */
-static constexpr const char *kMemcached = "memcached";
-
-/**
-  <a href="https://www.mongodb.com/">MongoDB</a>
- */
-static constexpr const char *kMongodb = "mongodb";
-
-/**
-  <a href="https://www.microsoft.com/sql-server">Microsoft SQL Server</a>
- */
-static constexpr const char *kMicrosoftSqlServer = "microsoft.sql_server";
-
-/**
-  <a href="https://www.mysql.com/">MySQL</a>
- */
-static constexpr const char *kMysql = "mysql";
-
-/**
-  <a href="https://neo4j.com/">Neo4j</a>
- */
-static constexpr const char *kNeo4j = "neo4j";
-
-/**
-  <a href="https://opensearch.org/">OpenSearch</a>
- */
-static constexpr const char *kOpensearch = "opensearch";
-
-/**
-  <a href="https://www.oracle.com/database/">Oracle Database</a>
- */
-static constexpr const char *kOracleDb = "oracle.db";
-
-/**
-  <a href="https://www.postgresql.org/">PostgreSQL</a>
- */
-static constexpr const char *kPostgresql = "postgresql";
-
-/**
-  <a href="https://redis.io/">Redis</a>
- */
-static constexpr const char *kRedis = "redis";
-
-/**
-  <a href="https://www.sap.com/products/technology-platform/hana/what-is-sap-hana.html">SAP HANA</a>
- */
-static constexpr const char *kSapHana = "sap.hana";
-
-/**
-  <a href="https://maxdb.sap.com/">SAP MaxDB</a>
- */
-static constexpr const char *kSapMaxdb = "sap.maxdb";
-
-/**
-  <a href="https://www.sqlite.org/">SQLite</a>
- */
-static constexpr const char *kSqlite = "sqlite";
-
-/**
-  <a href="https://www.teradata.com/">Teradata</a>
- */
-static constexpr const char *kTeradata = "teradata";
-
-/**
-  <a href="https://trino.io/">Trino</a>
- */
-static constexpr const char *kTrino = "trino";
-
-}  // namespace DbSystemNameValues
-
-}  // namespace db
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/db_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/db_metrics.h
deleted file mode 100644
index 5748dc4cb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/db_metrics.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace db
-{
-
-/**
-  Duration of database client operations.
-  <p>
-  Batch operations SHOULD be recorded as a single operation.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientOperationDuration = "db.client.operation.duration";
-static constexpr const char *descrMetricDbClientOperationDuration =
-    "Duration of database client operations.";
-static constexpr const char *unitMetricDbClientOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientOperationDuration,
-                                      descrMetricDbClientOperationDuration,
-                                      unitMetricDbClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientOperationDuration,
-                                      descrMetricDbClientOperationDuration,
-                                      unitMetricDbClientOperationDuration);
-}
-
-}  // namespace db
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/dns_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/dns_metrics.h
deleted file mode 100644
index 019fea674..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/dns_metrics.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace dns
-{
-
-/**
- * Measures the time taken to perform a DNS lookup.
- * <p>
- * histogram
- */
-static constexpr const char *kMetricDnsLookupDuration = "dns.lookup.duration";
-static constexpr const char *descrMetricDnsLookupDuration =
-    "Measures the time taken to perform a DNS lookup.";
-static constexpr const char *unitMetricDnsLookupDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDnsLookupDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDnsLookupDuration, descrMetricDnsLookupDuration,
-                                      unitMetricDnsLookupDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricDnsLookupDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDnsLookupDuration, descrMetricDnsLookupDuration,
-                                      unitMetricDnsLookupDuration);
-}
-
-}  // namespace dns
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/error_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/error_attributes.h
deleted file mode 100644
index e0ef3c925..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/error_attributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace error
-{
-
-/**
-  Describes a class of error the operation ended with.
-  <p>
-  The @code error.type @endcode SHOULD be predictable, and SHOULD have low cardinality.
-  <p>
-  When @code error.type @endcode is set to a type (e.g., an exception type), its
-  canonical class name identifying the type within the artifact SHOULD be used.
-  <p>
-  Instrumentations SHOULD document the list of errors they report.
-  <p>
-  The cardinality of @code error.type @endcode within one instrumentation library SHOULD be low.
-  Telemetry consumers that aggregate data from multiple instrumentation libraries and applications
-  should be prepared for @code error.type @endcode to have high cardinality at query time when no
-  additional filters are applied.
-  <p>
-  If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
-  @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
-  status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
-  error.type @endcode to capture all errors, regardless of whether they are defined within the
-  domain-specific set or not.</li>
-  </ul>
- */
-static constexpr const char *kErrorType = "error.type";
-
-namespace ErrorTypeValues
-{
-/**
-  A fallback error value to be used when the instrumentation doesn't define a custom value.
- */
-static constexpr const char *kOther = "_OTHER";
-
-}  // namespace ErrorTypeValues
-
-}  // namespace error
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/exception_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/exception_attributes.h
deleted file mode 100644
index 8947d711f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/exception_attributes.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace exception
-{
-
-/**
-  Indicates that the exception is escaping the scope of the span.
-
-  @deprecated
-  {"note": "It's no longer recommended to record exceptions that are handled and do not escape the
-  scope of a span.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped";
-
-/**
-  The exception message.
- */
-static constexpr const char *kExceptionMessage = "exception.message";
-
-/**
-  A stacktrace as a string in the natural representation for the language runtime. The
-  representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kExceptionStacktrace = "exception.stacktrace";
-
-/**
-  The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the
-  exception should be preferred over the static type in languages that support it.
- */
-static constexpr const char *kExceptionType = "exception.type";
-
-}  // namespace exception
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/faas_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/faas_metrics.h
deleted file mode 100644
index 72109d887..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/faas_metrics.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace faas
-{
-
-/**
- * Number of invocation cold starts
- * <p>
- * counter
- */
-static constexpr const char *kMetricFaasColdstarts     = "faas.coldstarts";
-static constexpr const char *descrMetricFaasColdstarts = "Number of invocation cold starts";
-static constexpr const char *unitMetricFaasColdstarts  = "{coldstart}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                    unitMetricFaasColdstarts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                    unitMetricFaasColdstarts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                             unitMetricFaasColdstarts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricFaasColdstarts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                              unitMetricFaasColdstarts);
-}
-
-/**
- * Distribution of CPU usage per invocation
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasCpuUsage     = "faas.cpu_usage";
-static constexpr const char *descrMetricFaasCpuUsage = "Distribution of CPU usage per invocation";
-static constexpr const char *unitMetricFaasCpuUsage  = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
-                                      unitMetricFaasCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
-                                      unitMetricFaasCpuUsage);
-}
-
-/**
- * Number of invocation errors
- * <p>
- * counter
- */
-static constexpr const char *kMetricFaasErrors     = "faas.errors";
-static constexpr const char *descrMetricFaasErrors = "Number of invocation errors";
-static constexpr const char *unitMetricFaasErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasErrors, descrMetricFaasErrors, unitMetricFaasErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasErrors, descrMetricFaasErrors, unitMetricFaasErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasErrors, descrMetricFaasErrors,
-                                             unitMetricFaasErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasErrors, descrMetricFaasErrors,
-                                              unitMetricFaasErrors);
-}
-
-/**
- * Measures the duration of the function's initialization, such as a cold start
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasInitDuration = "faas.init_duration";
-static constexpr const char *descrMetricFaasInitDuration =
-    "Measures the duration of the function's initialization, such as a cold start";
-static constexpr const char *unitMetricFaasInitDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasInitDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
-                                      unitMetricFaasInitDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasInitDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
-                                      unitMetricFaasInitDuration);
-}
-
-/**
- * Number of successful invocations
- * <p>
- * counter
- */
-static constexpr const char *kMetricFaasInvocations     = "faas.invocations";
-static constexpr const char *descrMetricFaasInvocations = "Number of successful invocations";
-static constexpr const char *unitMetricFaasInvocations  = "{invocation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasInvocations(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                    unitMetricFaasInvocations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasInvocations(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                    unitMetricFaasInvocations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricFaasInvocations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                             unitMetricFaasInvocations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricFaasInvocations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                              unitMetricFaasInvocations);
-}
-
-/**
- * Measures the duration of the function's logic execution
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasInvokeDuration = "faas.invoke_duration";
-static constexpr const char *descrMetricFaasInvokeDuration =
-    "Measures the duration of the function's logic execution";
-static constexpr const char *unitMetricFaasInvokeDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricFaasInvokeDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration,
-                                      unitMetricFaasInvokeDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricFaasInvokeDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration,
-                                      unitMetricFaasInvokeDuration);
-}
-
-/**
- * Distribution of max memory usage per invocation
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasMemUsage = "faas.mem_usage";
-static constexpr const char *descrMetricFaasMemUsage =
-    "Distribution of max memory usage per invocation";
-static constexpr const char *unitMetricFaasMemUsage = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasMemUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
-                                      unitMetricFaasMemUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasMemUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
-                                      unitMetricFaasMemUsage);
-}
-
-/**
- * Distribution of net I/O usage per invocation
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasNetIo     = "faas.net_io";
-static constexpr const char *descrMetricFaasNetIo = "Distribution of net I/O usage per invocation";
-static constexpr const char *unitMetricFaasNetIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasNetIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasNetIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
-}
-
-/**
- * Number of invocation timeouts
- * <p>
- * counter
- */
-static constexpr const char *kMetricFaasTimeouts     = "faas.timeouts";
-static constexpr const char *descrMetricFaasTimeouts = "Number of invocation timeouts";
-static constexpr const char *unitMetricFaasTimeouts  = "{timeout}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                    unitMetricFaasTimeouts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                    unitMetricFaasTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                             unitMetricFaasTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                              unitMetricFaasTimeouts);
-}
-
-}  // namespace faas
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/gen_ai_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/gen_ai_metrics.h
deleted file mode 100644
index 437ba4af4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/gen_ai_metrics.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace gen_ai
-{
-
-/**
- * GenAI operation duration
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiClientOperationDuration =
-    "gen_ai.client.operation.duration";
-static constexpr const char *descrMetricGenAiClientOperationDuration = "GenAI operation duration";
-static constexpr const char *unitMetricGenAiClientOperationDuration  = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiClientOperationDuration,
-                                      descrMetricGenAiClientOperationDuration,
-                                      unitMetricGenAiClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiClientOperationDuration,
-                                      descrMetricGenAiClientOperationDuration,
-                                      unitMetricGenAiClientOperationDuration);
-}
-
-/**
- * Measures number of input and output tokens used
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiClientTokenUsage = "gen_ai.client.token.usage";
-static constexpr const char *descrMetricGenAiClientTokenUsage =
-    "Measures number of input and output tokens used";
-static constexpr const char *unitMetricGenAiClientTokenUsage = "{token}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiClientTokenUsage(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiClientTokenUsage,
-                                      descrMetricGenAiClientTokenUsage,
-                                      unitMetricGenAiClientTokenUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiClientTokenUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiClientTokenUsage,
-                                      descrMetricGenAiClientTokenUsage,
-                                      unitMetricGenAiClientTokenUsage);
-}
-
-/**
- * Generative AI server request duration such as time-to-last byte or last output token
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiServerRequestDuration = "gen_ai.server.request.duration";
-static constexpr const char *descrMetricGenAiServerRequestDuration =
-    "Generative AI server request duration such as time-to-last byte or last output token";
-static constexpr const char *unitMetricGenAiServerRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerRequestDuration,
-                                      descrMetricGenAiServerRequestDuration,
-                                      unitMetricGenAiServerRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerRequestDuration,
-                                      descrMetricGenAiServerRequestDuration,
-                                      unitMetricGenAiServerRequestDuration);
-}
-
-/**
- * Time per output token generated after the first token for successful responses
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiServerTimePerOutputToken =
-    "gen_ai.server.time_per_output_token";
-static constexpr const char *descrMetricGenAiServerTimePerOutputToken =
-    "Time per output token generated after the first token for successful responses";
-static constexpr const char *unitMetricGenAiServerTimePerOutputToken = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerTimePerOutputToken(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerTimePerOutputToken,
-                                      descrMetricGenAiServerTimePerOutputToken,
-                                      unitMetricGenAiServerTimePerOutputToken);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerTimePerOutputToken(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerTimePerOutputToken,
-                                      descrMetricGenAiServerTimePerOutputToken,
-                                      unitMetricGenAiServerTimePerOutputToken);
-}
-
-/**
- * Time to generate first token for successful responses
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiServerTimeToFirstToken =
-    "gen_ai.server.time_to_first_token";
-static constexpr const char *descrMetricGenAiServerTimeToFirstToken =
-    "Time to generate first token for successful responses";
-static constexpr const char *unitMetricGenAiServerTimeToFirstToken = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerTimeToFirstToken(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerTimeToFirstToken,
-                                      descrMetricGenAiServerTimeToFirstToken,
-                                      unitMetricGenAiServerTimeToFirstToken);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerTimeToFirstToken(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerTimeToFirstToken,
-                                      descrMetricGenAiServerTimeToFirstToken,
-                                      unitMetricGenAiServerTimeToFirstToken);
-}
-
-}  // namespace gen_ai
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/http_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/http_attributes.h
deleted file mode 100644
index 85e5244b0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/http_attributes.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace http
-{
-
-/**
-  HTTP request headers, @code <key> @endcode being the normalized HTTP Header name (lowercase), the
-  value being the header values. <p> Instrumentations SHOULD require an explicit configuration of
-  which headers are to be captured. Including all request headers can be a security risk - explicit
-  configuration helps avoid leaking sensitive information. <p> The @code User-Agent @endcode header
-  is already captured in the @code user_agent.original @endcode attribute. Users MAY explicitly
-  configure instrumentations to capture them even though it is not recommended. <p> The attribute
-  value MUST consist of either multiple header values as an array of strings or a single-item array
-  containing a possibly comma-concatenated string, depending on the way the HTTP library provides
-  access to headers. <p> Examples: <ul> <li>A header @code Content-Type: application/json @endcode
-  SHOULD be recorded as the @code http.request.header.content-type @endcode attribute with value
-  @code ["application/json"] @endcode.</li> <li>A header @code X-Forwarded-For: 1.2.3.4, 1.2.3.5
-  @endcode SHOULD be recorded as the @code http.request.header.x-forwarded-for @endcode attribute
-  with value @code ["1.2.3.4", "1.2.3.5"] @endcode or @code ["1.2.3.4, 1.2.3.5"] @endcode depending
-  on the HTTP library.</li>
-  </ul>
- */
-static constexpr const char *kHttpRequestHeader = "http.request.header";
-
-/**
-  HTTP request method.
-  <p>
-  HTTP request method value SHOULD be "known" to the instrumentation.
-  By default, this convention defines "known" methods as the ones listed in <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-  defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>. <p> If the HTTP
-  request method is not known to instrumentation, it MUST set the @code http.request.method @endcode
-  attribute to @code _OTHER @endcode. <p> If the HTTP instrumentation could end up converting valid
-  HTTP request methods to @code _OTHER @endcode, then it MUST provide a way to override the list of
-  known HTTP methods. If this override is done via environment variable, then the environment
-  variable MUST be named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list
-  of case-sensitive known HTTP methods (this list MUST be a full override of the default known
-  method, it is not a list of known methods in addition to the defaults). <p> HTTP method names are
-  case-sensitive and @code http.request.method @endcode attribute value MUST match a known HTTP
-  method name exactly. Instrumentations for specific web frameworks that consider HTTP methods to be
-  case insensitive, SHOULD populate a canonical equivalent. Tracing instrumentations that do so,
-  MUST also set @code http.request.method_original @endcode to the original value.
- */
-static constexpr const char *kHttpRequestMethod = "http.request.method";
-
-/**
-  Original HTTP method sent by the client in the request line.
- */
-static constexpr const char *kHttpRequestMethodOriginal = "http.request.method_original";
-
-/**
-  The ordinal number of request resending attempt (for any reason, including redirects).
-  <p>
-  The resend count SHOULD be updated each time an HTTP request gets resent by the client, regardless
-  of what was the cause of the resending (e.g. redirection, authorization failure, 503 Server
-  Unavailable, network issues, or any other).
- */
-static constexpr const char *kHttpRequestResendCount = "http.request.resend_count";
-
-/**
-  HTTP response headers, @code <key> @endcode being the normalized HTTP Header name (lowercase), the
-  value being the header values. <p> Instrumentations SHOULD require an explicit configuration of
-  which headers are to be captured. Including all response headers can be a security risk - explicit
-  configuration helps avoid leaking sensitive information. <p> Users MAY explicitly configure
-  instrumentations to capture them even though it is not recommended. <p> The attribute value MUST
-  consist of either multiple header values as an array of strings or a single-item array containing
-  a possibly comma-concatenated string, depending on the way the HTTP library provides access to
-  headers. <p> Examples: <ul> <li>A header @code Content-Type: application/json @endcode header
-  SHOULD be recorded as the @code http.request.response.content-type @endcode attribute with value
-  @code ["application/json"] @endcode.</li> <li>A header @code My-custom-header: abc, def @endcode
-  header SHOULD be recorded as the @code http.response.header.my-custom-header @endcode attribute
-  with value @code ["abc", "def"] @endcode or @code ["abc, def"] @endcode depending on the HTTP
-  library.</li>
-  </ul>
- */
-static constexpr const char *kHttpResponseHeader = "http.response.header";
-
-/**
-  <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>.
- */
-static constexpr const char *kHttpResponseStatusCode = "http.response.status_code";
-
-/**
-  The matched route, that is, the path template in the format used by the respective server
-  framework. <p> MUST NOT be populated when this is not supported by the HTTP server framework as
-  the route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD
-  include the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if
-  there is one.
- */
-static constexpr const char *kHttpRoute = "http.route";
-
-namespace HttpRequestMethodValues
-{
-/**
-  CONNECT method.
- */
-static constexpr const char *kConnect = "CONNECT";
-
-/**
-  DELETE method.
- */
-static constexpr const char *kDelete = "DELETE";
-
-/**
-  GET method.
- */
-static constexpr const char *kGet = "GET";
-
-/**
-  HEAD method.
- */
-static constexpr const char *kHead = "HEAD";
-
-/**
-  OPTIONS method.
- */
-static constexpr const char *kOptions = "OPTIONS";
-
-/**
-  PATCH method.
- */
-static constexpr const char *kPatch = "PATCH";
-
-/**
-  POST method.
- */
-static constexpr const char *kPost = "POST";
-
-/**
-  PUT method.
- */
-static constexpr const char *kPut = "PUT";
-
-/**
-  TRACE method.
- */
-static constexpr const char *kTrace = "TRACE";
-
-/**
-  Any HTTP method that the instrumentation has no prior knowledge of.
- */
-static constexpr const char *kOther = "_OTHER";
-
-}  // namespace HttpRequestMethodValues
-
-}  // namespace http
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/http_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/http_metrics.h
deleted file mode 100644
index f480fb4c2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/http_metrics.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace http
-{
-
-/**
-  Duration of HTTP client requests.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpClientRequestDuration = "http.client.request.duration";
-static constexpr const char *descrMetricHttpClientRequestDuration =
-    "Duration of HTTP client requests.";
-static constexpr const char *unitMetricHttpClientRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientRequestDuration,
-                                      descrMetricHttpClientRequestDuration,
-                                      unitMetricHttpClientRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientRequestDuration,
-                                      descrMetricHttpClientRequestDuration,
-                                      unitMetricHttpClientRequestDuration);
-}
-
-/**
-  Duration of HTTP server requests.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpServerRequestDuration = "http.server.request.duration";
-static constexpr const char *descrMetricHttpServerRequestDuration =
-    "Duration of HTTP server requests.";
-static constexpr const char *unitMetricHttpServerRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpServerRequestDuration,
-                                      descrMetricHttpServerRequestDuration,
-                                      unitMetricHttpServerRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpServerRequestDuration,
-                                      descrMetricHttpServerRequestDuration,
-                                      unitMetricHttpServerRequestDuration);
-}
-
-}  // namespace http
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/hw_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/hw_metrics.h
deleted file mode 100644
index 225b939e8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/hw_metrics.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace hw
-{
-
-/**
- * Energy consumed by the component
- * <p>
- * counter
- */
-static constexpr const char *kMetricHwEnergy     = "hw.energy";
-static constexpr const char *descrMetricHwEnergy = "Energy consumed by the component";
-static constexpr const char *unitMetricHwEnergy  = "J";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwEnergy, descrMetricHwEnergy, unitMetricHwEnergy);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwEnergy, descrMetricHwEnergy, unitMetricHwEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwEnergy, descrMetricHwEnergy,
-                                             unitMetricHwEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwEnergy, descrMetricHwEnergy,
-                                              unitMetricHwEnergy);
-}
-
-/**
- * Number of errors encountered by the component
- * <p>
- * counter
- */
-static constexpr const char *kMetricHwErrors     = "hw.errors";
-static constexpr const char *descrMetricHwErrors = "Number of errors encountered by the component";
-static constexpr const char *unitMetricHwErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwErrors, descrMetricHwErrors, unitMetricHwErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwErrors, descrMetricHwErrors, unitMetricHwErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwErrors, descrMetricHwErrors,
-                                             unitMetricHwErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwErrors, descrMetricHwErrors,
-                                              unitMetricHwErrors);
-}
-
-/**
- * Ambient (external) temperature of the physical host
- * <p>
- * gauge
- */
-static constexpr const char *kMetricHwHostAmbientTemperature = "hw.host.ambient_temperature";
-static constexpr const char *descrMetricHwHostAmbientTemperature =
-    "Ambient (external) temperature of the physical host";
-static constexpr const char *unitMetricHwHostAmbientTemperature = "Cel";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostAmbientTemperature,
-                                 descrMetricHwHostAmbientTemperature,
-                                 unitMetricHwHostAmbientTemperature);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostAmbientTemperature,
-                                  descrMetricHwHostAmbientTemperature,
-                                  unitMetricHwHostAmbientTemperature);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwHostAmbientTemperature,
-                                           descrMetricHwHostAmbientTemperature,
-                                           unitMetricHwHostAmbientTemperature);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwHostAmbientTemperature,
-                                            descrMetricHwHostAmbientTemperature,
-                                            unitMetricHwHostAmbientTemperature);
-}
-
-/**
- * Total energy consumed by the entire physical host, in joules
- * <p>
- * The overall energy usage of a host MUST be reported using the specific @code hw.host.energy
- * @endcode and @code hw.host.power @endcode metrics <strong>only</strong>, instead of the generic
- * @code hw.energy @endcode and @code hw.power @endcode described in the previous section, to
- * prevent summing up overlapping values. <p> counter
- */
-static constexpr const char *kMetricHwHostEnergy = "hw.host.energy";
-static constexpr const char *descrMetricHwHostEnergy =
-    "Total energy consumed by the entire physical host, in joules";
-static constexpr const char *unitMetricHwHostEnergy = "J";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                    unitMetricHwHostEnergy);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                    unitMetricHwHostEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                             unitMetricHwHostEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                              unitMetricHwHostEnergy);
-}
-
-/**
- * By how many degrees Celsius the temperature of the physical host can be increased, before
- * reaching a warning threshold on one of the internal sensors <p> gauge
- */
-static constexpr const char *kMetricHwHostHeatingMargin = "hw.host.heating_margin";
-static constexpr const char *descrMetricHwHostHeatingMargin =
-    "By how many degrees Celsius the temperature of the physical host can be increased, before reaching a warning threshold on one of the internal sensors
-    ";
-    static constexpr const char *unitMetricHwHostHeatingMargin = "Cel";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwHostHeatingMargin(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin,
-                                 unitMetricHwHostHeatingMargin);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwHostHeatingMargin(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin,
-                                  unitMetricHwHostHeatingMargin);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHwHostHeatingMargin(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin, unitMetricHwHostHeatingMargin);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHwHostHeatingMargin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin, unitMetricHwHostHeatingMargin);
-}
-
-/**
- * Instantaneous power consumed by the entire physical host in Watts (@code hw.host.energy @endcode
- * is preferred) <p> The overall energy usage of a host MUST be reported using the specific @code
- * hw.host.energy @endcode and @code hw.host.power @endcode metrics <strong>only</strong>, instead
- * of the generic @code hw.energy @endcode and @code hw.power @endcode described in the previous
- * section, to prevent summing up overlapping values. <p> gauge
- */
-static constexpr const char *kMetricHwHostPower = "hw.host.power";
-static constexpr const char *descrMetricHwHostPower =
-    "Instantaneous power consumed by the entire physical host in Watts (`hw.host.energy` is preferred)
-    ";
-    static constexpr const char *unitMetricHwHostPower = "W";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostPower, descrMetricHwHostPower, unitMetricHwHostPower);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                  unitMetricHwHostPower);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                           unitMetricHwHostPower);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                            unitMetricHwHostPower);
-}
-
-/**
- * Instantaneous power consumed by the component
- * <p>
- * It is recommended to report @code hw.energy @endcode instead of @code hw.power @endcode when
- * possible. <p> gauge
- */
-static constexpr const char *kMetricHwPower     = "hw.power";
-static constexpr const char *descrMetricHwPower = "Instantaneous power consumed by the component";
-static constexpr const char *unitMetricHwPower  = "W";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-/**
- * Operational status: @code 1 @endcode (true) or @code 0 @endcode (false) for each of the possible
- * states <p>
- * @code hw.status @endcode is currently specified as an <em>UpDownCounter</em> but would ideally be
- * represented using a <a
- * href="https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#stateset"><em>StateSet</em>
- * as defined in OpenMetrics</a>. This semantic convention will be updated once <em>StateSet</em> is
- * specified in OpenTelemetry. This planned change is not expected to have any consequence on the
- * way users query their timeseries backend to retrieve the values of @code hw.status @endcode over
- * time. <p> updowncounter
- */
-static constexpr const char *kMetricHwStatus = "hw.status";
-static constexpr const char *descrMetricHwStatus =
-    "Operational status: `1` (true) or `0` (false) for each of the possible states";
-static constexpr const char *unitMetricHwStatus = "1";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHwStatus, descrMetricHwStatus, unitMetricHwStatus);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHwStatus, descrMetricHwStatus, unitMetricHwStatus);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHwStatus, descrMetricHwStatus,
-                                                   unitMetricHwStatus);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHwStatus, descrMetricHwStatus,
-                                                    unitMetricHwStatus);
-}
-
-}  // namespace hw
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/app_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/app_attributes.h
deleted file mode 100644
index fdbad251b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/app_attributes.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace app
-{
-
-/**
-  A unique identifier representing the installation of an application on a specific device
-  <p>
-  Its value SHOULD persist across launches of the same application installation, including through
-  application upgrades. It SHOULD change if the application is uninstalled or if all applications of
-  the vendor are uninstalled. Additionally, users might be able to reset this value (e.g. by
-  clearing application data). If an app is installed multiple times on the same device (e.g. in
-  different accounts on Android), each @code app.installation.id @endcode SHOULD have a different
-  value. If multiple OpenTelemetry SDKs are used within the same application, they SHOULD use the
-  same value for @code app.installation.id @endcode. Hardware IDs (e.g. serial number, IMEI, MAC
-  address) MUST NOT be used as the @code app.installation.id @endcode. <p> For iOS, this value
-  SHOULD be equal to the <a
-  href="https://developer.apple.com/documentation/uikit/uidevice/identifierforvendor">vendor
-  identifier</a>. <p> For Android, examples of @code app.installation.id @endcode implementations
-  include: <ul> <li><a
-  href="https://firebase.google.com/docs/projects/manage-installations">Firebase Installation
-  ID</a>.</li> <li>A globally unique UUID which is persisted across sessions in your
-  application.</li> <li><a href="https://developer.android.com/identity/app-set-id">App set
-  ID</a>.</li> <li><a
-  href="https://developer.android.com/reference/android/provider/Settings.Secure#ANDROID_ID">@code
-  Settings.getString(Settings.Secure.ANDROID_ID) @endcode</a>.</li>
-  </ul>
-  <p>
-  More information about Android identifier best practices can be found <a
-  href="https://developer.android.com/training/articles/user-data-ids">here</a>.
- */
-static constexpr const char *kAppInstallationId = "app.installation.id";
-
-/**
-  The x (horizontal) coordinate of a screen coordinate, in screen pixels.
- */
-static constexpr const char *kAppScreenCoordinateX = "app.screen.coordinate.x";
-
-/**
-  The y (vertical) component of a screen coordinate, in screen pixels.
- */
-static constexpr const char *kAppScreenCoordinateY = "app.screen.coordinate.y";
-
-/**
-  An identifier that uniquely differentiates this widget from other widgets in the same application.
-  <p>
-  A widget is an application component, typically an on-screen visual GUI element.
- */
-static constexpr const char *kAppWidgetId = "app.widget.id";
-
-/**
-  The name of an application widget.
-  <p>
-  A widget is an application component, typically an on-screen visual GUI element.
- */
-static constexpr const char *kAppWidgetName = "app.widget.name";
-
-}  // namespace app
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/artifact_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/artifact_attributes.h
deleted file mode 100644
index 09e000ba3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/artifact_attributes.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace artifact
-{
-
-/**
-  The provenance filename of the built attestation which directly relates to the build artifact
-  filename. This filename SHOULD accompany the artifact at publish time. See the <a
-  href="https://slsa.dev/spec/v1.0/distributing-provenance#relationship-between-artifacts-and-attestations">SLSA
-  Relationship</a> specification for more information.
- */
-static constexpr const char *kArtifactAttestationFilename = "artifact.attestation.filename";
-
-/**
-  The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
-  glossary)</a>, of the built attestation. Some envelopes in the <a
-  href="https://github.com/in-toto/attestation/tree/main/spec">software attestation space</a> also
-  refer to this as the <strong>digest</strong>.
- */
-static constexpr const char *kArtifactAttestationHash = "artifact.attestation.hash";
-
-/**
-  The id of the build <a href="https://slsa.dev/attestation-model">software attestation</a>.
- */
-static constexpr const char *kArtifactAttestationId = "artifact.attestation.id";
-
-/**
-  The human readable file name of the artifact, typically generated during build and release
-  processes. Often includes the package name and version in the file name. <p> This file name can
-  also act as the <a href="https://slsa.dev/spec/v1.0/terminology#package-model">Package Name</a> in
-  cases where the package ecosystem maps accordingly. Additionally, the artifact <a
-  href="https://slsa.dev/spec/v1.0/terminology#software-supply-chain">can be published</a> for
-  others, but that is not a guarantee.
- */
-static constexpr const char *kArtifactFilename = "artifact.filename";
-
-/**
-  The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
-  glossary)</a>, often found in checksum.txt on a release of the artifact and used to verify package
-  integrity. <p> The specific algorithm used to create the cryptographic hash value is not defined.
-  In situations where an artifact has multiple cryptographic hashes, it is up to the implementer to
-  choose which hash value to set here; this should be the most secure hash algorithm that is
-  suitable for the situation and consistent with the corresponding attestation. The implementer can
-  then provide the other hash values through an additional set of attribute extensions as they deem
-  necessary.
- */
-static constexpr const char *kArtifactHash = "artifact.hash";
-
-/**
-  The <a href="https://github.com/package-url/purl-spec">Package URL</a> of the <a
-  href="https://slsa.dev/spec/v1.0/terminology#package-model">package artifact</a> provides a
-  standard way to identify and locate the packaged artifact.
- */
-static constexpr const char *kArtifactPurl = "artifact.purl";
-
-/**
-  The version of the artifact.
- */
-static constexpr const char *kArtifactVersion = "artifact.version";
-
-}  // namespace artifact
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/aws_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/aws_attributes.h
deleted file mode 100644
index 2abf1b762..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/aws_attributes.h
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace aws
-{
-
-/**
-  The unique identifier of the AWS Bedrock Guardrail. A <a
-  href="https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails.html">guardrail</a> helps
-  safeguard and prevent unwanted behavior from model responses or user messages.
- */
-static constexpr const char *kAwsBedrockGuardrailId = "aws.bedrock.guardrail.id";
-
-/**
-  The unique identifier of the AWS Bedrock Knowledge base. A <a
-  href="https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base.html">knowledge base</a>
-  is a bank of information that can be queried by models to generate more relevant responses and
-  augment prompts.
- */
-static constexpr const char *kAwsBedrockKnowledgeBaseId = "aws.bedrock.knowledge_base.id";
-
-/**
-  The JSON-serialized value of each item in the @code AttributeDefinitions @endcode request field.
- */
-static constexpr const char *kAwsDynamodbAttributeDefinitions =
-    "aws.dynamodb.attribute_definitions";
-
-/**
-  The value of the @code AttributesToGet @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbAttributesToGet = "aws.dynamodb.attributes_to_get";
-
-/**
-  The value of the @code ConsistentRead @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbConsistentRead = "aws.dynamodb.consistent_read";
-
-/**
-  The JSON-serialized value of each item in the @code ConsumedCapacity @endcode response field.
- */
-static constexpr const char *kAwsDynamodbConsumedCapacity = "aws.dynamodb.consumed_capacity";
-
-/**
-  The value of the @code Count @endcode response parameter.
- */
-static constexpr const char *kAwsDynamodbCount = "aws.dynamodb.count";
-
-/**
-  The value of the @code ExclusiveStartTableName @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbExclusiveStartTable = "aws.dynamodb.exclusive_start_table";
-
-/**
-  The JSON-serialized value of each item in the @code GlobalSecondaryIndexUpdates @endcode request
-  field.
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexUpdates =
-    "aws.dynamodb.global_secondary_index_updates";
-
-/**
-  The JSON-serialized value of each item of the @code GlobalSecondaryIndexes @endcode request field
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexes =
-    "aws.dynamodb.global_secondary_indexes";
-
-/**
-  The value of the @code IndexName @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbIndexName = "aws.dynamodb.index_name";
-
-/**
-  The JSON-serialized value of the @code ItemCollectionMetrics @endcode response field.
- */
-static constexpr const char *kAwsDynamodbItemCollectionMetrics =
-    "aws.dynamodb.item_collection_metrics";
-
-/**
-  The value of the @code Limit @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbLimit = "aws.dynamodb.limit";
-
-/**
-  The JSON-serialized value of each item of the @code LocalSecondaryIndexes @endcode request field.
- */
-static constexpr const char *kAwsDynamodbLocalSecondaryIndexes =
-    "aws.dynamodb.local_secondary_indexes";
-
-/**
-  The value of the @code ProjectionExpression @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbProjection = "aws.dynamodb.projection";
-
-/**
-  The value of the @code ProvisionedThroughput.ReadCapacityUnits @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedReadCapacity =
-    "aws.dynamodb.provisioned_read_capacity";
-
-/**
-  The value of the @code ProvisionedThroughput.WriteCapacityUnits @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedWriteCapacity =
-    "aws.dynamodb.provisioned_write_capacity";
-
-/**
-  The value of the @code ScanIndexForward @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbScanForward = "aws.dynamodb.scan_forward";
-
-/**
-  The value of the @code ScannedCount @endcode response parameter.
- */
-static constexpr const char *kAwsDynamodbScannedCount = "aws.dynamodb.scanned_count";
-
-/**
-  The value of the @code Segment @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbSegment = "aws.dynamodb.segment";
-
-/**
-  The value of the @code Select @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbSelect = "aws.dynamodb.select";
-
-/**
-  The number of items in the @code TableNames @endcode response parameter.
- */
-static constexpr const char *kAwsDynamodbTableCount = "aws.dynamodb.table_count";
-
-/**
-  The keys in the @code RequestItems @endcode object field.
- */
-static constexpr const char *kAwsDynamodbTableNames = "aws.dynamodb.table_names";
-
-/**
-  The value of the @code TotalSegments @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbTotalSegments = "aws.dynamodb.total_segments";
-
-/**
-  The ARN of an <a
-  href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html">ECS cluster</a>.
- */
-static constexpr const char *kAwsEcsClusterArn = "aws.ecs.cluster.arn";
-
-/**
-  The Amazon Resource Name (ARN) of an <a
-  href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html">ECS
-  container instance</a>.
- */
-static constexpr const char *kAwsEcsContainerArn = "aws.ecs.container.arn";
-
-/**
-  The <a href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html">launch
-  type</a> for an ECS task.
- */
-static constexpr const char *kAwsEcsLaunchtype = "aws.ecs.launchtype";
-
-/**
-  The ARN of a running <a
-  href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids">ECS
-  task</a>.
- */
-static constexpr const char *kAwsEcsTaskArn = "aws.ecs.task.arn";
-
-/**
-  The family name of the <a
-  href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html">ECS task
-  definition</a> used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskFamily = "aws.ecs.task.family";
-
-/**
-  The ID of a running ECS task. The ID MUST be extracted from @code task.arn @endcode.
- */
-static constexpr const char *kAwsEcsTaskId = "aws.ecs.task.id";
-
-/**
-  The revision for the task definition used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskRevision = "aws.ecs.task.revision";
-
-/**
-  The ARN of an EKS cluster.
- */
-static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn";
-
-/**
-  The AWS extended request ID as returned in the response header @code x-amz-id-2 @endcode.
- */
-static constexpr const char *kAwsExtendedRequestId = "aws.extended_request_id";
-
-/**
-  The name of the AWS Kinesis <a
-  href="https://docs.aws.amazon.com/streams/latest/dev/introduction.html">stream</a> the request
-  refers to. Corresponds to the @code --stream-name @endcode parameter of the Kinesis <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/kinesis/describe-stream.html">describe-stream</a>
-  operation.
- */
-static constexpr const char *kAwsKinesisStreamName = "aws.kinesis.stream_name";
-
-/**
-  The full invoked ARN as provided on the @code Context @endcode passed to the function (@code
-  Lambda-Runtime-Invoked-Function-Arn @endcode header on the @code /runtime/invocation/next @endcode
-  applicable). <p> This may be different from @code cloud.resource_id @endcode if an alias is
-  involved.
- */
-static constexpr const char *kAwsLambdaInvokedArn = "aws.lambda.invoked_arn";
-
-/**
-  The UUID of the <a
-  href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html">AWS
-  Lambda EvenSource Mapping</a>. An event source is mapped to a lambda function. It's contents are
-  read by Lambda and used to trigger a function. This isn't available in the lambda execution
-  context or the lambda runtime environtment. This is going to be populated by the AWS SDK for each
-  language when that UUID is present. Some of these operations are Create/Delete/Get/List/Update
-  EventSourceMapping.
- */
-static constexpr const char *kAwsLambdaResourceMappingId = "aws.lambda.resource_mapping.id";
-
-/**
-  The Amazon Resource Name(s) (ARN) of the AWS log group(s).
-  <p>
-  See the <a
-  href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
-  group ARN format documentation</a>.
- */
-static constexpr const char *kAwsLogGroupArns = "aws.log.group.arns";
-
-/**
-  The name(s) of the AWS log group(s) an application is writing to.
-  <p>
-  Multiple log groups must be supported for cases like multi-container applications, where a single
-  application has sidecar containers, and each write to their own log group.
- */
-static constexpr const char *kAwsLogGroupNames = "aws.log.group.names";
-
-/**
-  The ARN(s) of the AWS log stream(s).
-  <p>
-  See the <a
-  href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
-  stream ARN format documentation</a>. One log group can contain several log streams, so these ARNs
-  necessarily identify both a log group and a log stream.
- */
-static constexpr const char *kAwsLogStreamArns = "aws.log.stream.arns";
-
-/**
-  The name(s) of the AWS log stream(s) an application is writing to.
- */
-static constexpr const char *kAwsLogStreamNames = "aws.log.stream.names";
-
-/**
-  The AWS request ID as returned in the response headers @code x-amzn-requestid @endcode, @code
-  x-amzn-request-id @endcode or @code x-amz-request-id @endcode.
- */
-static constexpr const char *kAwsRequestId = "aws.request_id";
-
-/**
-  The S3 bucket name the request refers to. Corresponds to the @code --bucket @endcode parameter of
-  the <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a>
-  operations. <p> The @code bucket @endcode attribute is applicable to all S3 operations that
-  reference a bucket, i.e. that require the bucket name as a mandatory parameter. This applies to
-  almost all S3 operations except @code list-buckets @endcode.
- */
-static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
-
-/**
-  The source object (in the form @code bucket @endcode/@code key @endcode) for the copy operation.
-  <p>
-  The @code copy_source @endcode attribute applies to S3 copy operations and corresponds to the
-  @code --copy-source @endcode parameter of the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
-  operation within the S3 API</a>. This applies in particular to the following operations: <ul>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
-  </ul>
- */
-static constexpr const char *kAwsS3CopySource = "aws.s3.copy_source";
-
-/**
-  The delete request container that specifies the objects to be deleted.
-  <p>
-  The @code delete @endcode attribute is only applicable to the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a>
-  operation. The @code delete @endcode attribute corresponds to the @code --delete @endcode
-  parameter of the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-objects.html">delete-objects
-  operation within the S3 API</a>.
- */
-static constexpr const char *kAwsS3Delete = "aws.s3.delete";
-
-/**
-  The S3 object key the request refers to. Corresponds to the @code --key @endcode parameter of the
-  <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
-  <p>
-  The @code key @endcode attribute is applicable to all object-related S3 operations, i.e. that
-  require the object key as a mandatory parameter. This applies in particular to the following
-  operations: <ul> <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/get-object.html">get-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/head-object.html">head-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/put-object.html">put-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html">restore-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/select-object-content.html">select-object-content</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/create-multipart-upload.html">create-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
-  </ul>
- */
-static constexpr const char *kAwsS3Key = "aws.s3.key";
-
-/**
-  The part number of the part being uploaded in a multipart-upload operation. This is a positive
-  integer between 1 and 10,000. <p> The @code part_number @endcode attribute is only applicable to
-  the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a> and
-  <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a>
-  operations. The @code part_number @endcode attribute corresponds to the @code --part-number
-  @endcode parameter of the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part
-  operation within the S3 API</a>.
- */
-static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
-
-/**
-  Upload ID that identifies the multipart upload.
-  <p>
-  The @code upload_id @endcode attribute applies to S3 multipart-upload operations and corresponds
-  to the @code --upload-id @endcode parameter of the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
-  operations. This applies in particular to the following operations: <ul> <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
-  </ul>
- */
-static constexpr const char *kAwsS3UploadId = "aws.s3.upload_id";
-
-/**
-  The ARN of the Secret stored in the Secrets Mangger
- */
-static constexpr const char *kAwsSecretsmanagerSecretArn = "aws.secretsmanager.secret.arn";
-
-/**
-  The ARN of the AWS SNS Topic. An Amazon SNS <a
-  href="https://docs.aws.amazon.com/sns/latest/dg/sns-create-topic.html">topic</a> is a logical
-  access point that acts as a communication channel.
- */
-static constexpr const char *kAwsSnsTopicArn = "aws.sns.topic.arn";
-
-/**
-  The URL of the AWS SQS Queue. It's a unique identifier for a queue in Amazon Simple Queue Service
-  (SQS) and is used to access the queue and perform actions on it.
- */
-static constexpr const char *kAwsSqsQueueUrl = "aws.sqs.queue.url";
-
-/**
-  The ARN of the AWS Step Functions Activity.
- */
-static constexpr const char *kAwsStepFunctionsActivityArn = "aws.step_functions.activity.arn";
-
-/**
-  The ARN of the AWS Step Functions State Machine.
- */
-static constexpr const char *kAwsStepFunctionsStateMachineArn =
-    "aws.step_functions.state_machine.arn";
-
-namespace AwsEcsLaunchtypeValues
-{
-/**
-  none
- */
-static constexpr const char *kEc2 = "ec2";
-
-/**
-  none
- */
-static constexpr const char *kFargate = "fargate";
-
-}  // namespace AwsEcsLaunchtypeValues
-
-}  // namespace aws
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/az_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/az_attributes.h
deleted file mode 100644
index e396476f9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/az_attributes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace az
-{
-
-/**
-  <a
-  href="https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers">Azure
-  Resource Provider Namespace</a> as recognized by the client.
- */
-static constexpr const char *kAzNamespace = "az.namespace";
-
-/**
-  The unique identifier of the service request. It's generated by the Azure service and returned
-  with the response.
- */
-static constexpr const char *kAzServiceRequestId = "az.service_request_id";
-
-}  // namespace az
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/azure_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/azure_attributes.h
deleted file mode 100644
index 421f3e65d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/azure_attributes.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace azure
-{
-
-/**
-  The unique identifier of the client instance.
- */
-static constexpr const char *kAzureClientId = "azure.client.id";
-
-/**
-  Cosmos client connection mode.
- */
-static constexpr const char *kAzureCosmosdbConnectionMode = "azure.cosmosdb.connection.mode";
-
-/**
-  Account or request <a
-  href="https://learn.microsoft.com/azure/cosmos-db/consistency-levels">consistency level</a>.
- */
-static constexpr const char *kAzureCosmosdbConsistencyLevel = "azure.cosmosdb.consistency.level";
-
-/**
-  List of regions contacted during operation in the order that they were contacted. If there is more
-  than one region listed, it indicates that the operation was performed on multiple regions i.e.
-  cross-regional call. <p> Region name matches the format of @code displayName @endcode in <a
-  href="https://learn.microsoft.com/rest/api/subscription/subscriptions/list-locations?view=rest-subscription-2021-10-01&tabs=HTTP#location">Azure
-  Location API</a>
- */
-static constexpr const char *kAzureCosmosdbOperationContactedRegions =
-    "azure.cosmosdb.operation.contacted_regions";
-
-/**
-  The number of request units consumed by the operation.
- */
-static constexpr const char *kAzureCosmosdbOperationRequestCharge =
-    "azure.cosmosdb.operation.request_charge";
-
-/**
-  Request payload size in bytes.
- */
-static constexpr const char *kAzureCosmosdbRequestBodySize = "azure.cosmosdb.request.body.size";
-
-/**
-  Cosmos DB sub status code.
- */
-static constexpr const char *kAzureCosmosdbResponseSubStatusCode =
-    "azure.cosmosdb.response.sub_status_code";
-
-namespace AzureCosmosdbConnectionModeValues
-{
-/**
-  Gateway (HTTP) connection.
- */
-static constexpr const char *kGateway = "gateway";
-
-/**
-  Direct connection.
- */
-static constexpr const char *kDirect = "direct";
-
-}  // namespace AzureCosmosdbConnectionModeValues
-
-namespace AzureCosmosdbConsistencyLevelValues
-{
-/**
-  none
- */
-static constexpr const char *kStrong = "Strong";
-
-/**
-  none
- */
-static constexpr const char *kBoundedStaleness = "BoundedStaleness";
-
-/**
-  none
- */
-static constexpr const char *kSession = "Session";
-
-/**
-  none
- */
-static constexpr const char *kEventual = "Eventual";
-
-/**
-  none
- */
-static constexpr const char *kConsistentPrefix = "ConsistentPrefix";
-
-}  // namespace AzureCosmosdbConsistencyLevelValues
-
-}  // namespace azure
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/azure_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/azure_metrics.h
deleted file mode 100644
index fb60c3ce5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/azure_metrics.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace azure
-{
-
-/**
-  Number of active client instances
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricAzureCosmosdbClientActiveInstanceCount =
-    "azure.cosmosdb.client.active_instance.count";
-static constexpr const char *descrMetricAzureCosmosdbClientActiveInstanceCount =
-    "Number of active client instances";
-static constexpr const char *unitMetricAzureCosmosdbClientActiveInstanceCount = "{instance}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricAzureCosmosdbClientActiveInstanceCount,
-                                         descrMetricAzureCosmosdbClientActiveInstanceCount,
-                                         unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricAzureCosmosdbClientActiveInstanceCount,
-                                          descrMetricAzureCosmosdbClientActiveInstanceCount,
-                                          unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricAzureCosmosdbClientActiveInstanceCount,
-      descrMetricAzureCosmosdbClientActiveInstanceCount,
-      unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricAzureCosmosdbClientActiveInstanceCount,
-      descrMetricAzureCosmosdbClientActiveInstanceCount,
-      unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-/**
-  <a href="https://learn.microsoft.com/azure/cosmos-db/request-units">Request units</a> consumed by
-  the operation <p> histogram
- */
-static constexpr const char *kMetricAzureCosmosdbClientOperationRequestCharge =
-    "azure.cosmosdb.client.operation.request_charge";
-static constexpr const char *descrMetricAzureCosmosdbClientOperationRequestCharge =
-    "[Request units](https://learn.microsoft.com/azure/cosmos-db/request-units) consumed by the "
-    "operation";
-static constexpr const char *unitMetricAzureCosmosdbClientOperationRequestCharge = "{request_unit}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricAzureCosmosdbClientOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricAzureCosmosdbClientOperationRequestCharge,
-                                      descrMetricAzureCosmosdbClientOperationRequestCharge,
-                                      unitMetricAzureCosmosdbClientOperationRequestCharge);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricAzureCosmosdbClientOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricAzureCosmosdbClientOperationRequestCharge,
-                                      descrMetricAzureCosmosdbClientOperationRequestCharge,
-                                      unitMetricAzureCosmosdbClientOperationRequestCharge);
-}
-
-}  // namespace azure
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/browser_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/browser_attributes.h
deleted file mode 100644
index e166ed495..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/browser_attributes.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace browser
-{
-
-/**
-  Array of brand name and version separated by a space
-  <p>
-  This value is intended to be taken from the <a
-  href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> (@code
-  navigator.userAgentData.brands @endcode).
- */
-static constexpr const char *kBrowserBrands = "browser.brands";
-
-/**
-  Preferred language of the user using the browser
-  <p>
-  This value is intended to be taken from the Navigator API @code navigator.language @endcode.
- */
-static constexpr const char *kBrowserLanguage = "browser.language";
-
-/**
-  A boolean that is true if the browser is running on a mobile device
-  <p>
-  This value is intended to be taken from the <a
-  href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> (@code
-  navigator.userAgentData.mobile @endcode). If unavailable, this attribute SHOULD be left unset.
- */
-static constexpr const char *kBrowserMobile = "browser.mobile";
-
-/**
-  The platform on which the browser is running
-  <p>
-  This value is intended to be taken from the <a
-  href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> (@code
-  navigator.userAgentData.platform @endcode). If unavailable, the legacy @code navigator.platform
-  @endcode API SHOULD NOT be used instead and this attribute SHOULD be left unset in order for the
-  values to be consistent. The list of possible values is defined in the <a
-  href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-platform">W3C User-Agent Client Hints
-  specification</a>. Note that some (but not all) of these values can overlap with values in the <a
-  href="./os.md">@code os.type @endcode and @code os.name @endcode attributes</a>. However, for
-  consistency, the values in the @code browser.platform @endcode attribute should capture the exact
-  value that the user agent provides.
- */
-static constexpr const char *kBrowserPlatform = "browser.platform";
-
-}  // namespace browser
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cassandra_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cassandra_attributes.h
deleted file mode 100644
index 88a71ba5d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cassandra_attributes.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cassandra
-{
-
-/**
-  The consistency level of the query. Based on consistency values from <a
-  href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
- */
-static constexpr const char *kCassandraConsistencyLevel = "cassandra.consistency.level";
-
-/**
-  The data center of the coordinating node for a query.
- */
-static constexpr const char *kCassandraCoordinatorDc = "cassandra.coordinator.dc";
-
-/**
-  The ID of the coordinating node for a query.
- */
-static constexpr const char *kCassandraCoordinatorId = "cassandra.coordinator.id";
-
-/**
-  The fetch size used for paging, i.e. how many rows will be returned at once.
- */
-static constexpr const char *kCassandraPageSize = "cassandra.page.size";
-
-/**
-  Whether or not the query is idempotent.
- */
-static constexpr const char *kCassandraQueryIdempotent = "cassandra.query.idempotent";
-
-/**
-  The number of times a query was speculatively executed. Not set or @code 0 @endcode if the query
-  was not executed speculatively.
- */
-static constexpr const char *kCassandraSpeculativeExecutionCount =
-    "cassandra.speculative_execution.count";
-
-namespace CassandraConsistencyLevelValues
-{
-/**
-  none
- */
-static constexpr const char *kAll = "all";
-
-/**
-  none
- */
-static constexpr const char *kEachQuorum = "each_quorum";
-
-/**
-  none
- */
-static constexpr const char *kQuorum = "quorum";
-
-/**
-  none
- */
-static constexpr const char *kLocalQuorum = "local_quorum";
-
-/**
-  none
- */
-static constexpr const char *kOne = "one";
-
-/**
-  none
- */
-static constexpr const char *kTwo = "two";
-
-/**
-  none
- */
-static constexpr const char *kThree = "three";
-
-/**
-  none
- */
-static constexpr const char *kLocalOne = "local_one";
-
-/**
-  none
- */
-static constexpr const char *kAny = "any";
-
-/**
-  none
- */
-static constexpr const char *kSerial = "serial";
-
-/**
-  none
- */
-static constexpr const char *kLocalSerial = "local_serial";
-
-}  // namespace CassandraConsistencyLevelValues
-
-}  // namespace cassandra
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cicd_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cicd_attributes.h
deleted file mode 100644
index a9555a2d2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cicd_attributes.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cicd
-{
-
-/**
-  The kind of action a pipeline run is performing.
- */
-static constexpr const char *kCicdPipelineActionName = "cicd.pipeline.action.name";
-
-/**
-  The human readable name of the pipeline within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineName = "cicd.pipeline.name";
-
-/**
-  The result of a pipeline run.
- */
-static constexpr const char *kCicdPipelineResult = "cicd.pipeline.result";
-
-/**
-  The unique identifier of a pipeline run within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineRunId = "cicd.pipeline.run.id";
-
-/**
-  The pipeline run goes through these states during its lifecycle.
- */
-static constexpr const char *kCicdPipelineRunState = "cicd.pipeline.run.state";
-
-/**
-  The <a href="https://wikipedia.org/wiki/URL">URL</a> of the pipeline run, providing the complete
-  address in order to locate and identify the pipeline run.
- */
-static constexpr const char *kCicdPipelineRunUrlFull = "cicd.pipeline.run.url.full";
-
-/**
-  The human readable name of a task within a pipeline. Task here most closely aligns with a <a
-  href="https://wikipedia.org/wiki/Pipeline_(computing)">computing process</a> in a pipeline. Other
-  terms for tasks include commands, steps, and procedures.
- */
-static constexpr const char *kCicdPipelineTaskName = "cicd.pipeline.task.name";
-
-/**
-  The unique identifier of a task run within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskRunId = "cicd.pipeline.task.run.id";
-
-/**
-  The result of a task run.
- */
-static constexpr const char *kCicdPipelineTaskRunResult = "cicd.pipeline.task.run.result";
-
-/**
-  The <a href="https://wikipedia.org/wiki/URL">URL</a> of the pipeline task run, providing the
-  complete address in order to locate and identify the pipeline task run.
- */
-static constexpr const char *kCicdPipelineTaskRunUrlFull = "cicd.pipeline.task.run.url.full";
-
-/**
-  The type of the task within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskType = "cicd.pipeline.task.type";
-
-/**
-  The name of a component of the CICD system.
- */
-static constexpr const char *kCicdSystemComponent = "cicd.system.component";
-
-/**
-  The unique identifier of a worker within a CICD system.
- */
-static constexpr const char *kCicdWorkerId = "cicd.worker.id";
-
-/**
-  The name of a worker within a CICD system.
- */
-static constexpr const char *kCicdWorkerName = "cicd.worker.name";
-
-/**
-  The state of a CICD worker / agent.
- */
-static constexpr const char *kCicdWorkerState = "cicd.worker.state";
-
-/**
-  The <a href="https://wikipedia.org/wiki/URL">URL</a> of the worker, providing the complete address
-  in order to locate and identify the worker.
- */
-static constexpr const char *kCicdWorkerUrlFull = "cicd.worker.url.full";
-
-namespace CicdPipelineActionNameValues
-{
-/**
-  The pipeline run is executing a build.
- */
-static constexpr const char *kBuild = "BUILD";
-
-/**
-  The pipeline run is executing.
- */
-static constexpr const char *kRun = "RUN";
-
-/**
-  The pipeline run is executing a sync.
- */
-static constexpr const char *kSync = "SYNC";
-
-}  // namespace CicdPipelineActionNameValues
-
-namespace CicdPipelineResultValues
-{
-/**
-  The pipeline run finished successfully.
- */
-static constexpr const char *kSuccess = "success";
-
-/**
-  The pipeline run did not finish successfully, eg. due to a compile error or a failing test. Such
-  failures are usually detected by non-zero exit codes of the tools executed in the pipeline run.
- */
-static constexpr const char *kFailure = "failure";
-
-/**
-  The pipeline run failed due to an error in the CICD system, eg. due to the worker being killed.
- */
-static constexpr const char *kError = "error";
-
-/**
-  A timeout caused the pipeline run to be interrupted.
- */
-static constexpr const char *kTimeout = "timeout";
-
-/**
-  The pipeline run was cancelled, eg. by a user manually cancelling the pipeline run.
- */
-static constexpr const char *kCancellation = "cancellation";
-
-/**
-  The pipeline run was skipped, eg. due to a precondition not being met.
- */
-static constexpr const char *kSkip = "skip";
-
-}  // namespace CicdPipelineResultValues
-
-namespace CicdPipelineRunStateValues
-{
-/**
-  The run pending state spans from the event triggering the pipeline run until the execution of the
-  run starts (eg. time spent in a queue, provisioning agents, creating run resources).
- */
-static constexpr const char *kPending = "pending";
-
-/**
-  The executing state spans the execution of any run tasks (eg. build, test).
- */
-static constexpr const char *kExecuting = "executing";
-
-/**
-  The finalizing state spans from when the run has finished executing (eg. cleanup of run
-  resources).
- */
-static constexpr const char *kFinalizing = "finalizing";
-
-}  // namespace CicdPipelineRunStateValues
-
-namespace CicdPipelineTaskRunResultValues
-{
-/**
-  The task run finished successfully.
- */
-static constexpr const char *kSuccess = "success";
-
-/**
-  The task run did not finish successfully, eg. due to a compile error or a failing test. Such
-  failures are usually detected by non-zero exit codes of the tools executed in the task run.
- */
-static constexpr const char *kFailure = "failure";
-
-/**
-  The task run failed due to an error in the CICD system, eg. due to the worker being killed.
- */
-static constexpr const char *kError = "error";
-
-/**
-  A timeout caused the task run to be interrupted.
- */
-static constexpr const char *kTimeout = "timeout";
-
-/**
-  The task run was cancelled, eg. by a user manually cancelling the task run.
- */
-static constexpr const char *kCancellation = "cancellation";
-
-/**
-  The task run was skipped, eg. due to a precondition not being met.
- */
-static constexpr const char *kSkip = "skip";
-
-}  // namespace CicdPipelineTaskRunResultValues
-
-namespace CicdPipelineTaskTypeValues
-{
-/**
-  build
- */
-static constexpr const char *kBuild = "build";
-
-/**
-  test
- */
-static constexpr const char *kTest = "test";
-
-/**
-  deploy
- */
-static constexpr const char *kDeploy = "deploy";
-
-}  // namespace CicdPipelineTaskTypeValues
-
-namespace CicdWorkerStateValues
-{
-/**
-  The worker is not performing work for the CICD system. It is available to the CICD system to
-  perform work on (online / idle).
- */
-static constexpr const char *kAvailable = "available";
-
-/**
-  The worker is performing work for the CICD system.
- */
-static constexpr const char *kBusy = "busy";
-
-/**
-  The worker is not available to the CICD system (disconnected / down).
- */
-static constexpr const char *kOffline = "offline";
-
-}  // namespace CicdWorkerStateValues
-
-}  // namespace cicd
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cicd_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cicd_metrics.h
deleted file mode 100644
index 18752b53a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cicd_metrics.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cicd
-{
-
-/**
-  The number of pipeline runs currently active in the system by state.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricCicdPipelineRunActive = "cicd.pipeline.run.active";
-static constexpr const char *descrMetricCicdPipelineRunActive =
-    "The number of pipeline runs currently active in the system by state.";
-static constexpr const char *unitMetricCicdPipelineRunActive = "{run}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricCicdPipelineRunActive,
-                                         descrMetricCicdPipelineRunActive,
-                                         unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricCicdPipelineRunActive,
-                                          descrMetricCicdPipelineRunActive,
-                                          unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricCicdPipelineRunActive,
-                                                   descrMetricCicdPipelineRunActive,
-                                                   unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricCicdPipelineRunActive,
-                                                    descrMetricCicdPipelineRunActive,
-                                                    unitMetricCicdPipelineRunActive);
-}
-
-/**
-  Duration of a pipeline run grouped by pipeline, state and result.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricCicdPipelineRunDuration = "cicd.pipeline.run.duration";
-static constexpr const char *descrMetricCicdPipelineRunDuration =
-    "Duration of a pipeline run grouped by pipeline, state and result.";
-static constexpr const char *unitMetricCicdPipelineRunDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricCicdPipelineRunDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricCicdPipelineRunDuration,
-                                      descrMetricCicdPipelineRunDuration,
-                                      unitMetricCicdPipelineRunDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricCicdPipelineRunDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricCicdPipelineRunDuration,
-                                      descrMetricCicdPipelineRunDuration,
-                                      unitMetricCicdPipelineRunDuration);
-}
-
-/**
-  The number of errors encountered in pipeline runs (eg. compile, test failures).
-  <p>
-  There might be errors in a pipeline run that are non fatal (eg. they are suppressed) or in a
-  parallel stage multiple stages could have a fatal error. This means that this error count might
-  not be the same as the count of metric @code cicd.pipeline.run.duration @endcode with run result
-  @code failure @endcode. <p> counter
- */
-static constexpr const char *kMetricCicdPipelineRunErrors = "cicd.pipeline.run.errors";
-static constexpr const char *descrMetricCicdPipelineRunErrors =
-    "The number of errors encountered in pipeline runs (eg. compile, test failures).";
-static constexpr const char *unitMetricCicdPipelineRunErrors = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCicdPipelineRunErrors, descrMetricCicdPipelineRunErrors,
-                                    unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCicdPipelineRunErrors, descrMetricCicdPipelineRunErrors,
-                                    unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCicdPipelineRunErrors,
-                                             descrMetricCicdPipelineRunErrors,
-                                             unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCicdPipelineRunErrors,
-                                              descrMetricCicdPipelineRunErrors,
-                                              unitMetricCicdPipelineRunErrors);
-}
-
-/**
-  The number of errors in a component of the CICD system (eg. controller, scheduler, agent).
-  <p>
-  Errors in pipeline run execution are explicitly excluded. Ie a test failure is not counted in this
-  metric. <p> counter
- */
-static constexpr const char *kMetricCicdSystemErrors = "cicd.system.errors";
-static constexpr const char *descrMetricCicdSystemErrors =
-    "The number of errors in a component of the CICD system (eg. controller, scheduler, agent).";
-static constexpr const char *unitMetricCicdSystemErrors = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricCicdSystemErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                    unitMetricCicdSystemErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricCicdSystemErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                    unitMetricCicdSystemErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdSystemErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                             unitMetricCicdSystemErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdSystemErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                              unitMetricCicdSystemErrors);
-}
-
-/**
-  The number of workers on the CICD system by state.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricCicdWorkerCount = "cicd.worker.count";
-static constexpr const char *descrMetricCicdWorkerCount =
-    "The number of workers on the CICD system by state.";
-static constexpr const char *unitMetricCicdWorkerCount = "{count}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricCicdWorkerCount, descrMetricCicdWorkerCount,
-                                         unitMetricCicdWorkerCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricCicdWorkerCount, descrMetricCicdWorkerCount,
-                                          unitMetricCicdWorkerCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricCicdWorkerCount, descrMetricCicdWorkerCount, unitMetricCicdWorkerCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricCicdWorkerCount, descrMetricCicdWorkerCount, unitMetricCicdWorkerCount);
-}
-
-}  // namespace cicd
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/client_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/client_attributes.h
deleted file mode 100644
index 7f944176d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/client_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace client
-{
-
-/**
-  Client address - domain name if available without reverse DNS lookup; otherwise, IP address or
-  Unix domain socket name. <p> When observed from the server side, and when communicating through an
-  intermediary, @code client.address @endcode SHOULD represent the client address behind any
-  intermediaries,  for example proxies, if it's available.
- */
-static constexpr const char *kClientAddress = "client.address";
-
-/**
-  Client port number.
-  <p>
-  When observed from the server side, and when communicating through an intermediary, @code
-  client.port @endcode SHOULD represent the client port behind any intermediaries,  for example
-  proxies, if it's available.
- */
-static constexpr const char *kClientPort = "client.port";
-
-}  // namespace client
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloud_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloud_attributes.h
deleted file mode 100644
index f00c204a5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloud_attributes.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cloud
-{
-
-/**
-  The cloud account ID the resource is assigned to.
- */
-static constexpr const char *kCloudAccountId = "cloud.account.id";
-
-/**
-  Cloud regions often have multiple, isolated locations known as zones to increase availability.
-  Availability zone represents the zone where the resource is running. <p> Availability zones are
-  called "zones" on Alibaba Cloud and Google Cloud.
- */
-static constexpr const char *kCloudAvailabilityZone = "cloud.availability_zone";
-
-/**
-  The cloud platform in use.
-  <p>
-  The prefix of the service SHOULD match the one specified in @code cloud.provider @endcode.
- */
-static constexpr const char *kCloudPlatform = "cloud.platform";
-
-/**
-  Name of the cloud provider.
- */
-static constexpr const char *kCloudProvider = "cloud.provider";
-
-/**
-  The geographical region within a cloud provider. When associated with a resource, this attribute
-  specifies the region where the resource operates. When calling services or APIs deployed on a
-  cloud, this attribute identifies the region where the called destination is deployed. <p> Refer to
-  your provider's docs to see the available regions, for example <a
-  href="https://www.alibabacloud.com/help/doc-detail/40654.htm">Alibaba Cloud regions</a>, <a
-  href="https://aws.amazon.com/about-aws/global-infrastructure/regions_az/">AWS regions</a>, <a
-  href="https://azure.microsoft.com/global-infrastructure/geographies/">Azure regions</a>, <a
-  href="https://cloud.google.com/about/locations">Google Cloud regions</a>, or <a
-  href="https://www.tencentcloud.com/document/product/213/6091">Tencent Cloud regions</a>.
- */
-static constexpr const char *kCloudRegion = "cloud.region";
-
-/**
-  Cloud provider-specific native identifier of the monitored cloud resource (e.g. an <a
-  href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a> on AWS,
-  a <a href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">fully qualified
-  resource ID</a> on Azure, a <a href="https://google.aip.dev/122#full-resource-names">full resource
-  name</a> on GCP) <p> On some cloud providers, it may not be possible to determine the full ID at
-  startup, so it may be necessary to set @code cloud.resource_id @endcode as a span attribute
-  instead. <p> The exact value to use for @code cloud.resource_id @endcode depends on the cloud
-  provider. The following well-known definitions MUST be used if you set this attribute and they
-  apply: <ul> <li><strong>AWS Lambda:</strong> The function <a
-  href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take
-  care not to use the "invoked ARN" directly but replace any <a
-  href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a>
-  with the resolved function version, as the same runtime instance may be invocable with
-  multiple different aliases.</li>
-    <li><strong>GCP:</strong> The <a
-  href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a></li>
-    <li><strong>Azure:</strong> The <a
-  href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
-  ID</a> of the invoked function, <em>not</em> the function app, having the form
-  @code
-  /subscriptions/<SUBSCRIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC>
-  @endcode. This means that a span attribute MUST be used, as an Azure function app can host
-  multiple functions that would usually share a TracerProvider.</li>
-  </ul>
- */
-static constexpr const char *kCloudResourceId = "cloud.resource_id";
-
-namespace CloudPlatformValues
-{
-/**
-  Alibaba Cloud Elastic Compute Service
- */
-static constexpr const char *kAlibabaCloudEcs = "alibaba_cloud_ecs";
-
-/**
-  Alibaba Cloud Function Compute
- */
-static constexpr const char *kAlibabaCloudFc = "alibaba_cloud_fc";
-
-/**
-  Red Hat OpenShift on Alibaba Cloud
- */
-static constexpr const char *kAlibabaCloudOpenshift = "alibaba_cloud_openshift";
-
-/**
-  AWS Elastic Compute Cloud
- */
-static constexpr const char *kAwsEc2 = "aws_ec2";
-
-/**
-  AWS Elastic Container Service
- */
-static constexpr const char *kAwsEcs = "aws_ecs";
-
-/**
-  AWS Elastic Kubernetes Service
- */
-static constexpr const char *kAwsEks = "aws_eks";
-
-/**
-  AWS Lambda
- */
-static constexpr const char *kAwsLambda = "aws_lambda";
-
-/**
-  AWS Elastic Beanstalk
- */
-static constexpr const char *kAwsElasticBeanstalk = "aws_elastic_beanstalk";
-
-/**
-  AWS App Runner
- */
-static constexpr const char *kAwsAppRunner = "aws_app_runner";
-
-/**
-  Red Hat OpenShift on AWS (ROSA)
- */
-static constexpr const char *kAwsOpenshift = "aws_openshift";
-
-/**
-  Azure Virtual Machines
- */
-static constexpr const char *kAzureVm = "azure_vm";
-
-/**
-  Azure Container Apps
- */
-static constexpr const char *kAzureContainerApps = "azure_container_apps";
-
-/**
-  Azure Container Instances
- */
-static constexpr const char *kAzureContainerInstances = "azure_container_instances";
-
-/**
-  Azure Kubernetes Service
- */
-static constexpr const char *kAzureAks = "azure_aks";
-
-/**
-  Azure Functions
- */
-static constexpr const char *kAzureFunctions = "azure_functions";
-
-/**
-  Azure App Service
- */
-static constexpr const char *kAzureAppService = "azure_app_service";
-
-/**
-  Azure Red Hat OpenShift
- */
-static constexpr const char *kAzureOpenshift = "azure_openshift";
-
-/**
-  Google Bare Metal Solution (BMS)
- */
-static constexpr const char *kGcpBareMetalSolution = "gcp_bare_metal_solution";
-
-/**
-  Google Cloud Compute Engine (GCE)
- */
-static constexpr const char *kGcpComputeEngine = "gcp_compute_engine";
-
-/**
-  Google Cloud Run
- */
-static constexpr const char *kGcpCloudRun = "gcp_cloud_run";
-
-/**
-  Google Cloud Kubernetes Engine (GKE)
- */
-static constexpr const char *kGcpKubernetesEngine = "gcp_kubernetes_engine";
-
-/**
-  Google Cloud Functions (GCF)
- */
-static constexpr const char *kGcpCloudFunctions = "gcp_cloud_functions";
-
-/**
-  Google Cloud App Engine (GAE)
- */
-static constexpr const char *kGcpAppEngine = "gcp_app_engine";
-
-/**
-  Red Hat OpenShift on Google Cloud
- */
-static constexpr const char *kGcpOpenshift = "gcp_openshift";
-
-/**
-  Red Hat OpenShift on IBM Cloud
- */
-static constexpr const char *kIbmCloudOpenshift = "ibm_cloud_openshift";
-
-/**
-  Compute on Oracle Cloud Infrastructure (OCI)
- */
-static constexpr const char *kOracleCloudCompute = "oracle_cloud_compute";
-
-/**
-  Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI)
- */
-static constexpr const char *kOracleCloudOke = "oracle_cloud_oke";
-
-/**
-  Tencent Cloud Cloud Virtual Machine (CVM)
- */
-static constexpr const char *kTencentCloudCvm = "tencent_cloud_cvm";
-
-/**
-  Tencent Cloud Elastic Kubernetes Service (EKS)
- */
-static constexpr const char *kTencentCloudEks = "tencent_cloud_eks";
-
-/**
-  Tencent Cloud Serverless Cloud Function (SCF)
- */
-static constexpr const char *kTencentCloudScf = "tencent_cloud_scf";
-
-}  // namespace CloudPlatformValues
-
-namespace CloudProviderValues
-{
-/**
-  Alibaba Cloud
- */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-
-/**
-  Amazon Web Services
- */
-static constexpr const char *kAws = "aws";
-
-/**
-  Microsoft Azure
- */
-static constexpr const char *kAzure = "azure";
-
-/**
-  Google Cloud Platform
- */
-static constexpr const char *kGcp = "gcp";
-
-/**
-  Heroku Platform as a Service
- */
-static constexpr const char *kHeroku = "heroku";
-
-/**
-  IBM Cloud
- */
-static constexpr const char *kIbmCloud = "ibm_cloud";
-
-/**
-  Oracle Cloud Infrastructure (OCI)
- */
-static constexpr const char *kOracleCloud = "oracle_cloud";
-
-/**
-  Tencent Cloud
- */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-
-}  // namespace CloudProviderValues
-
-}  // namespace cloud
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloudevents_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloudevents_attributes.h
deleted file mode 100644
index 539653c48..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloudevents_attributes.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cloudevents
-{
-
-/**
-  The <a href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id">event_id</a>
-  uniquely identifies the event.
- */
-static constexpr const char *kCloudeventsEventId = "cloudevents.event_id";
-
-/**
-  The <a
-  href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#source-1">source</a>
-  identifies the context in which an event happened.
- */
-static constexpr const char *kCloudeventsEventSource = "cloudevents.event_source";
-
-/**
-  The <a
-  href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#specversion">version of
-  the CloudEvents specification</a> which the event uses.
- */
-static constexpr const char *kCloudeventsEventSpecVersion = "cloudevents.event_spec_version";
-
-/**
-  The <a
-  href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#subject">subject</a> of
-  the event in the context of the event producer (identified by source).
- */
-static constexpr const char *kCloudeventsEventSubject = "cloudevents.event_subject";
-
-/**
-  The <a
-  href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type">event_type</a>
-  contains a value describing the type of event related to the originating occurrence.
- */
-static constexpr const char *kCloudeventsEventType = "cloudevents.event_type";
-
-}  // namespace cloudevents
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloudfoundry_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloudfoundry_attributes.h
deleted file mode 100644
index 58dc50d69..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cloudfoundry_attributes.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cloudfoundry
-{
-
-/**
-  The guid of the application.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.application_id @endcode. This is the same value as
-  reported by @code cf app <app-name> --guid @endcode.
- */
-static constexpr const char *kCloudfoundryAppId = "cloudfoundry.app.id";
-
-/**
-  The index of the application instance. 0 when just one instance is active.
-  <p>
-  CloudFoundry defines the @code instance_id @endcode in the <a
-  href="https://github.com/cloudfoundry/loggregator-api#v2-envelope">Loggregator v2 envelope</a>. It
-  is used for logs and metrics emitted by CloudFoundry. It is supposed to contain the application
-  instance index for applications deployed on the runtime. <p> Application instrumentation should
-  use the value from environment variable @code CF_INSTANCE_INDEX @endcode.
- */
-static constexpr const char *kCloudfoundryAppInstanceId = "cloudfoundry.app.instance.id";
-
-/**
-  The name of the application.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.application_name @endcode. This is the same value
-  as reported by @code cf apps @endcode.
- */
-static constexpr const char *kCloudfoundryAppName = "cloudfoundry.app.name";
-
-/**
-  The guid of the CloudFoundry org the application is running in.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.org_id @endcode. This is the same value as
-  reported by @code cf org <org-name> --guid @endcode.
- */
-static constexpr const char *kCloudfoundryOrgId = "cloudfoundry.org.id";
-
-/**
-  The name of the CloudFoundry organization the app is running in.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.org_name @endcode. This is the same value as
-  reported by @code cf orgs @endcode.
- */
-static constexpr const char *kCloudfoundryOrgName = "cloudfoundry.org.name";
-
-/**
-  The UID identifying the process.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.process_id @endcode. It is supposed to be equal to
-  @code VCAP_APPLICATION.app_id @endcode for applications deployed to the runtime.
-  For system components, this could be the actual PID.
- */
-static constexpr const char *kCloudfoundryProcessId = "cloudfoundry.process.id";
-
-/**
-  The type of process.
-  <p>
-  CloudFoundry applications can consist of multiple jobs. Usually the
-  main process will be of type @code web @endcode. There can be additional background
-  tasks or side-cars with different process types.
- */
-static constexpr const char *kCloudfoundryProcessType = "cloudfoundry.process.type";
-
-/**
-  The guid of the CloudFoundry space the application is running in.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.space_id @endcode. This is the same value as
-  reported by @code cf space <space-name> --guid @endcode.
- */
-static constexpr const char *kCloudfoundrySpaceId = "cloudfoundry.space.id";
-
-/**
-  The name of the CloudFoundry space the application is running in.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.space_name @endcode. This is the same value as
-  reported by @code cf spaces @endcode.
- */
-static constexpr const char *kCloudfoundrySpaceName = "cloudfoundry.space.name";
-
-/**
-  A guid or another name describing the event source.
-  <p>
-  CloudFoundry defines the @code source_id @endcode in the <a
-  href="https://github.com/cloudfoundry/loggregator-api#v2-envelope">Loggregator v2 envelope</a>. It
-  is used for logs and metrics emitted by CloudFoundry. It is supposed to contain the component
-  name, e.g. "gorouter", for CloudFoundry components. <p> When system components are instrumented,
-  values from the <a href="https://bosh.io/docs/jobs/#properties-spec">Bosh spec</a> should be used.
-  The @code system.id @endcode should be set to
-  @code spec.deployment/spec.name @endcode.
- */
-static constexpr const char *kCloudfoundrySystemId = "cloudfoundry.system.id";
-
-/**
-  A guid describing the concrete instance of the event source.
-  <p>
-  CloudFoundry defines the @code instance_id @endcode in the <a
-  href="https://github.com/cloudfoundry/loggregator-api#v2-envelope">Loggregator v2 envelope</a>. It
-  is used for logs and metrics emitted by CloudFoundry. It is supposed to contain the vm id for
-  CloudFoundry components. <p> When system components are instrumented, values from the <a
-  href="https://bosh.io/docs/jobs/#properties-spec">Bosh spec</a> should be used. The @code
-  system.instance.id @endcode should be set to @code spec.id @endcode.
- */
-static constexpr const char *kCloudfoundrySystemInstanceId = "cloudfoundry.system.instance.id";
-
-}  // namespace cloudfoundry
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/code_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/code_attributes.h
deleted file mode 100644
index 58b7a12bc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/code_attributes.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace code
-{
-
-/**
-  Deprecated, use @code code.column.number @endcode
-
-  @deprecated
-  {"note": "Replaced by @code code.column.number @endcode.", "reason": "renamed", "renamed_to":
-  "code.column.number"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeColumn = "code.column";
-
-/**
-  The column number in @code code.file.path @endcode best representing the operation. It SHOULD
-  point within the code unit named in @code code.function.name @endcode. This attribute MUST NOT be
-  used on the Profile signal since the data is already captured in 'message Line'. This constraint
-  is imposed to prevent redundancy and maintain data integrity.
- */
-static constexpr const char *kCodeColumnNumber = "code.column.number";
-
-/**
-  The source code file name that identifies the code unit as uniquely as possible (preferably an
-  absolute file path). This attribute MUST NOT be used on the Profile signal since the data is
-  already captured in 'message Function'. This constraint is imposed to prevent redundancy and
-  maintain data integrity.
- */
-static constexpr const char *kCodeFilePath = "code.file.path";
-
-/**
-  Deprecated, use @code code.file.path @endcode instead
-
-  @deprecated
-  {"note": "Replaced by @code code.file.path @endcode.", "reason": "renamed", "renamed_to":
-  "code.file.path"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeFilepath = "code.filepath";
-
-/**
-  Deprecated, use @code code.function.name @endcode instead
-
-  @deprecated
-  {"note": "Value should be included in @code code.function.name @endcode which is expected to be a
-  fully-qualified name.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeFunction = "code.function";
-
-/**
-  The method or function fully-qualified name without arguments. The value should fit the natural
-  representation of the language runtime, which is also likely the same used within @code
-  code.stacktrace @endcode attribute value. This attribute MUST NOT be used on the Profile signal
-  since the data is already captured in 'message Function'. This constraint is imposed to prevent
-  redundancy and maintain data integrity. <p> Values and format depends on each language runtime,
-  thus it is impossible to provide an exhaustive list of examples. The values are usually the same
-  (or prefixes of) the ones found in native stack trace representation stored in
-  @code code.stacktrace @endcode without information on arguments.
-  <p>
-  Examples:
-  <ul>
-    <li>Java method: @code com.example.MyHttpService.serveRequest @endcode</li>
-    <li>Java anonymous class method: @code com.mycompany.Main$1.myMethod @endcode</li>
-    <li>Java lambda method: @code com.mycompany.Main$$Lambda/0x0000748ae4149c00.myMethod
-  @endcode</li> <li>PHP function: @code GuzzleHttp\Client::transfer @endcode</li> <li>Go function:
-  @code github.com/my/repo/pkg.foo.func5 @endcode</li> <li>Elixir: @code OpenTelemetry.Ctx.new
-  @endcode</li> <li>Erlang: @code opentelemetry_ctx:new @endcode</li> <li>Rust: @code
-  playground::my_module::my_cool_func @endcode</li> <li>C function: @code fopen @endcode</li>
-  </ul>
- */
-static constexpr const char *kCodeFunctionName = "code.function.name";
-
-/**
-  The line number in @code code.file.path @endcode best representing the operation. It SHOULD point
-  within the code unit named in @code code.function.name @endcode. This attribute MUST NOT be used
-  on the Profile signal since the data is already captured in 'message Line'. This constraint is
-  imposed to prevent redundancy and maintain data integrity.
- */
-static constexpr const char *kCodeLineNumber = "code.line.number";
-
-/**
-  Deprecated, use @code code.line.number @endcode instead
-
-  @deprecated
-  {"note": "Replaced by @code code.line.number @endcode.", "reason": "renamed", "renamed_to":
-  "code.line.number"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeLineno = "code.lineno";
-
-/**
-  Deprecated, namespace is now included into @code code.function.name @endcode
-
-  @deprecated
-  {"note": "Value should be included in @code code.function.name @endcode which is expected to be a
-  fully-qualified name.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeNamespace = "code.namespace";
-
-/**
-  A stacktrace as a string in the natural representation for the language runtime. The
-  representation is identical to <a
-  href="/docs/exceptions/exceptions-spans.md#stacktrace-representation">@code exception.stacktrace
-  @endcode</a>. This attribute MUST NOT be used on the Profile signal since the data is already
-  captured in 'message Location'. This constraint is imposed to prevent redundancy and maintain data
-  integrity.
- */
-static constexpr const char *kCodeStacktrace = "code.stacktrace";
-
-}  // namespace code
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/container_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/container_attributes.h
deleted file mode 100644
index 92213a1e6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/container_attributes.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace container
-{
-
-/**
-  The command used to run the container (i.e. the command name).
-  <p>
-  If using embedded credentials or sensitive data, it is recommended to remove them to prevent
-  potential leakage.
- */
-static constexpr const char *kContainerCommand = "container.command";
-
-/**
-  All the command arguments (including the command/executable itself) run by the container.
- */
-static constexpr const char *kContainerCommandArgs = "container.command_args";
-
-/**
-  The full command run by the container as a single string representing the full command.
- */
-static constexpr const char *kContainerCommandLine = "container.command_line";
-
-/**
-  Deprecated, use @code cpu.mode @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
-
-/**
-  The name of the CSI (<a href="https://github.com/container-storage-interface/spec">Container
-  Storage Interface</a>) plugin used by the volume. <p> This can sometimes be referred to as a
-  "driver" in CSI implementations. This should represent the @code name @endcode field of the
-  GetPluginInfo RPC.
- */
-static constexpr const char *kContainerCsiPluginName = "container.csi.plugin.name";
-
-/**
-  The unique volume ID returned by the CSI (<a
-  href="https://github.com/container-storage-interface/spec">Container Storage Interface</a>)
-  plugin. <p> This can sometimes be referred to as a "volume handle" in CSI implementations. This
-  should represent the @code Volume.volume_id @endcode field in CSI spec.
- */
-static constexpr const char *kContainerCsiVolumeId = "container.csi.volume.id";
-
-/**
-  Container ID. Usually a UUID, as for example used to <a
-  href="https://docs.docker.com/engine/containers/run/#container-identification">identify Docker
-  containers</a>. The UUID might be abbreviated.
- */
-static constexpr const char *kContainerId = "container.id";
-
-/**
-  Runtime specific image identifier. Usually a hash algorithm followed by a UUID.
-  <p>
-  Docker defines a sha256 of the image id; @code container.image.id @endcode corresponds to the
-  @code Image @endcode field from the Docker container inspect <a
-  href="https://docs.docker.com/engine/api/v1.43/#tag/Container/operation/ContainerInspect">API</a>
-  endpoint. K8s defines a link to the container registry repository with digest @code "imageID":
-  "registry.azurecr.io
-  /namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"
-  @endcode. The ID is assigned by the container runtime and can vary in different environments.
-  Consider using @code oci.manifest.digest @endcode if it is important to identify the same image in
-  different environments/runtimes.
- */
-static constexpr const char *kContainerImageId = "container.image.id";
-
-/**
-  Name of the image the container was built on.
- */
-static constexpr const char *kContainerImageName = "container.image.name";
-
-/**
-  Repo digests of the container image as provided by the container runtime.
-  <p>
-  <a href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker</a>
-  and <a
-  href="https://github.com/kubernetes/cri-api/blob/c75ef5b473bbe2d0a4fc92f82235efd665ea8e9f/pkg/apis/runtime/v1/api.proto#L1237-L1238">CRI</a>
-  report those under the @code RepoDigests @endcode field.
- */
-static constexpr const char *kContainerImageRepoDigests = "container.image.repo_digests";
-
-/**
-  Container image tags. An example can be found in <a
-  href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker Image
-  Inspect</a>. Should be only the @code <tag> @endcode section of the full name for example from
-  @code registry.example.com/my-org/my-image:<tag> @endcode.
- */
-static constexpr const char *kContainerImageTags = "container.image.tags";
-
-/**
-  Container labels, @code <key> @endcode being the label name, the value being the label value.
-  <p>
-  For example, a docker container label @code app @endcode with value @code nginx @endcode SHOULD be
-  recorded as the @code container.label.app @endcode attribute with value @code "nginx" @endcode.
- */
-static constexpr const char *kContainerLabel = "container.label";
-
-/**
-  Deprecated, use @code container.label @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code container.label @endcode.", "reason": "renamed", "renamed_to":
-  "container.label"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerLabels = "container.labels";
-
-/**
-  Container name used by container runtime.
- */
-static constexpr const char *kContainerName = "container.name";
-
-/**
-  The container runtime managing this container.
- */
-static constexpr const char *kContainerRuntime = "container.runtime";
-
-namespace ContainerCpuStateValues
-{
-/**
-  When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode
-  (Windows).
- */
-static constexpr const char *kUser = "user";
-
-/**
-  When CPU is used by the system (host OS)
- */
-static constexpr const char *kSystem = "system";
-
-/**
-  When tasks of the cgroup are in kernel mode (Linux). When all container processes are in kernel
-  mode (Windows).
- */
-static constexpr const char *kKernel = "kernel";
-
-}  // namespace ContainerCpuStateValues
-
-}  // namespace container
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/container_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/container_metrics.h
deleted file mode 100644
index 69853e777..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/container_metrics.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace container
-{
-
-/**
-  Total CPU time consumed
-  <p>
-  Total CPU time consumed by the specific container on all available CPU cores
-  <p>
-  counter
- */
-static constexpr const char *kMetricContainerCpuTime     = "container.cpu.time";
-static constexpr const char *descrMetricContainerCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricContainerCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                    unitMetricContainerCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                    unitMetricContainerCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                             unitMetricContainerCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                              unitMetricContainerCpuTime);
-}
-
-/**
-  Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
-  <p>
-  CPU usage of the specific container on all available CPU cores, averaged over the sample window
-  <p>
-  gauge
- */
-static constexpr const char *kMetricContainerCpuUsage = "container.cpu.usage";
-static constexpr const char *descrMetricContainerCpuUsage =
-    "Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricContainerCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricContainerCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                 unitMetricContainerCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricContainerCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                  unitMetricContainerCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                           unitMetricContainerCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                            unitMetricContainerCpuUsage);
-}
-
-/**
-  Disk bytes for the container.
-  <p>
-  The total number of bytes read/written successfully (aggregated from all disks).
-  <p>
-  counter
- */
-static constexpr const char *kMetricContainerDiskIo     = "container.disk.io";
-static constexpr const char *descrMetricContainerDiskIo = "Disk bytes for the container.";
-static constexpr const char *unitMetricContainerDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                    unitMetricContainerDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                    unitMetricContainerDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerDiskIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                             unitMetricContainerDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerDiskIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                              unitMetricContainerDiskIo);
-}
-
-/**
-  Memory usage of the container.
-  <p>
-  Memory usage of the container.
-  <p>
-  counter
- */
-static constexpr const char *kMetricContainerMemoryUsage     = "container.memory.usage";
-static constexpr const char *descrMetricContainerMemoryUsage = "Memory usage of the container.";
-static constexpr const char *unitMetricContainerMemoryUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage,
-                                    unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage,
-                                    unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
-}
-
-/**
-  Network bytes for the container.
-  <p>
-  The number of bytes sent/received on all network interfaces by the container.
-  <p>
-  counter
- */
-static constexpr const char *kMetricContainerNetworkIo     = "container.network.io";
-static constexpr const char *descrMetricContainerNetworkIo = "Network bytes for the container.";
-static constexpr const char *unitMetricContainerNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerNetworkIo, descrMetricContainerNetworkIo,
-                                    unitMetricContainerNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerNetworkIo, descrMetricContainerNetworkIo,
-                                    unitMetricContainerNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricContainerNetworkIo, descrMetricContainerNetworkIo, unitMetricContainerNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricContainerNetworkIo, descrMetricContainerNetworkIo, unitMetricContainerNetworkIo);
-}
-
-/**
-  The time the container has been running
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricContainerUptime     = "container.uptime";
-static constexpr const char *descrMetricContainerUptime = "The time the container has been running";
-static constexpr const char *unitMetricContainerUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricContainerUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                 unitMetricContainerUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricContainerUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                  unitMetricContainerUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerUptime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                           unitMetricContainerUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerUptime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                            unitMetricContainerUptime);
-}
-
-}  // namespace container
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpu_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpu_attributes.h
deleted file mode 100644
index c3c3ef58a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpu_attributes.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpu
-{
-
-/**
-  The logical CPU number [0..n-1]
- */
-static constexpr const char *kCpuLogicalNumber = "cpu.logical_number";
-
-/**
-  The mode of the CPU
- */
-static constexpr const char *kCpuMode = "cpu.mode";
-
-namespace CpuModeValues
-{
-/**
-  none
- */
-static constexpr const char *kUser = "user";
-
-/**
-  none
- */
-static constexpr const char *kSystem = "system";
-
-/**
-  none
- */
-static constexpr const char *kNice = "nice";
-
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kIowait = "iowait";
-
-/**
-  none
- */
-static constexpr const char *kInterrupt = "interrupt";
-
-/**
-  none
- */
-static constexpr const char *kSteal = "steal";
-
-/**
-  none
- */
-static constexpr const char *kKernel = "kernel";
-
-}  // namespace CpuModeValues
-
-}  // namespace cpu
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpu_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpu_metrics.h
deleted file mode 100644
index e82f7e2fc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpu_metrics.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpu
-{
-
-/**
-  Operating frequency of the logical CPU in Hertz.
-  <p>
-  gauge
- */
-static constexpr const char *kMetricCpuFrequency = "cpu.frequency";
-static constexpr const char *descrMetricCpuFrequency =
-    "Operating frequency of the logical CPU in Hertz.";
-static constexpr const char *unitMetricCpuFrequency = "Hz";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                 unitMetricCpuFrequency);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                  unitMetricCpuFrequency);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                           unitMetricCpuFrequency);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                            unitMetricCpuFrequency);
-}
-
-/**
-  Seconds each logical CPU spent on each mode
-  <p>
-  counter
- */
-static constexpr const char *kMetricCpuTime     = "cpu.time";
-static constexpr const char *descrMetricCpuTime = "Seconds each logical CPU spent on each mode";
-static constexpr const char *unitMetricCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCpuTime, descrMetricCpuTime,
-                                              unitMetricCpuTime);
-}
-
-/**
-  For each logical CPU, the utilization is calculated as the change in cumulative CPU time
-  (cpu.time) over a measurement interval, divided by the elapsed time. <p> gauge
- */
-static constexpr const char *kMetricCpuUtilization = "cpu.utilization";
-static constexpr const char *descrMetricCpuUtilization =
-    "For each logical CPU, the utilization is calculated as the change in cumulative CPU time "
-    "(cpu.time) over a measurement interval, divided by the elapsed time.";
-static constexpr const char *unitMetricCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                 unitMetricCpuUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                  unitMetricCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                           unitMetricCpuUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                            unitMetricCpuUtilization);
-}
-
-}  // namespace cpu
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpython_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpython_attributes.h
deleted file mode 100644
index e02e67bac..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpython_attributes.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpython
-{
-
-/**
-  Value of the garbage collector collection generation.
- */
-static constexpr const char *kCpythonGcGeneration = "cpython.gc.generation";
-
-namespace CpythonGcGenerationValues
-{
-/**
-  Generation 0
- */
-static constexpr int kGeneration0 = 0;
-
-/**
-  Generation 1
- */
-static constexpr int kGeneration1 = 1;
-
-/**
-  Generation 2
- */
-static constexpr int kGeneration2 = 2;
-
-}  // namespace CpythonGcGenerationValues
-
-}  // namespace cpython
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpython_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpython_metrics.h
deleted file mode 100644
index 3125b388e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/cpython_metrics.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpython
-{
-
-/**
-  The total number of objects collected inside a generation since interpreter start.
-  <p>
-  This metric reports data from <a
-  href="https://docs.python.org/3/library/gc.html#gc.get_stats">@code gc.stats() @endcode</a>. <p>
-  counter
- */
-static constexpr const char *kMetricCpythonGcCollectedObjects = "cpython.gc.collected_objects";
-static constexpr const char *descrMetricCpythonGcCollectedObjects =
-    "The total number of objects collected inside a generation since interpreter start.";
-static constexpr const char *unitMetricCpythonGcCollectedObjects = "{object}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCpythonGcCollectedObjects(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpythonGcCollectedObjects,
-                                    descrMetricCpythonGcCollectedObjects,
-                                    unitMetricCpythonGcCollectedObjects);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCpythonGcCollectedObjects(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpythonGcCollectedObjects,
-                                    descrMetricCpythonGcCollectedObjects,
-                                    unitMetricCpythonGcCollectedObjects);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCpythonGcCollectedObjects(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCpythonGcCollectedObjects,
-                                             descrMetricCpythonGcCollectedObjects,
-                                             unitMetricCpythonGcCollectedObjects);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpythonGcCollectedObjects(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCpythonGcCollectedObjects,
-                                              descrMetricCpythonGcCollectedObjects,
-                                              unitMetricCpythonGcCollectedObjects);
-}
-
-/**
-  The number of times a generation was collected since interpreter start.
-  <p>
-  This metric reports data from <a
-  href="https://docs.python.org/3/library/gc.html#gc.get_stats">@code gc.stats() @endcode</a>. <p>
-  counter
- */
-static constexpr const char *kMetricCpythonGcCollections = "cpython.gc.collections";
-static constexpr const char *descrMetricCpythonGcCollections =
-    "The number of times a generation was collected since interpreter start.";
-static constexpr const char *unitMetricCpythonGcCollections = "{collection}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCpythonGcCollections(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpythonGcCollections, descrMetricCpythonGcCollections,
-                                    unitMetricCpythonGcCollections);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCpythonGcCollections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpythonGcCollections, descrMetricCpythonGcCollections,
-                                    unitMetricCpythonGcCollections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCpythonGcCollections(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricCpythonGcCollections, descrMetricCpythonGcCollections, unitMetricCpythonGcCollections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpythonGcCollections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricCpythonGcCollections, descrMetricCpythonGcCollections, unitMetricCpythonGcCollections);
-}
-
-/**
-  The total number of objects which were found to be uncollectable inside a generation since
-  interpreter start. <p> This metric reports data from <a
-  href="https://docs.python.org/3/library/gc.html#gc.get_stats">@code gc.stats() @endcode</a>. <p>
-  counter
- */
-static constexpr const char *kMetricCpythonGcUncollectableObjects =
-    "cpython.gc.uncollectable_objects";
-static constexpr const char *descrMetricCpythonGcUncollectableObjects =
-    "The total number of objects which were found to be uncollectable inside a generation since "
-    "interpreter start.";
-static constexpr const char *unitMetricCpythonGcUncollectableObjects = "{object}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCpythonGcUncollectableObjects(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpythonGcUncollectableObjects,
-                                    descrMetricCpythonGcUncollectableObjects,
-                                    unitMetricCpythonGcUncollectableObjects);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCpythonGcUncollectableObjects(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpythonGcUncollectableObjects,
-                                    descrMetricCpythonGcUncollectableObjects,
-                                    unitMetricCpythonGcUncollectableObjects);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCpythonGcUncollectableObjects(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCpythonGcUncollectableObjects,
-                                             descrMetricCpythonGcUncollectableObjects,
-                                             unitMetricCpythonGcUncollectableObjects);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpythonGcUncollectableObjects(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCpythonGcUncollectableObjects,
-                                              descrMetricCpythonGcUncollectableObjects,
-                                              unitMetricCpythonGcUncollectableObjects);
-}
-
-}  // namespace cpython
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/db_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/db_attributes.h
deleted file mode 100644
index c0c44276b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/db_attributes.h
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace db
-{
-
-/**
-  Deprecated, use @code cassandra.consistency.level @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.consistency.level @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.consistency.level"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraConsistencyLevel =
-    "db.cassandra.consistency_level";
-
-/**
-  Deprecated, use @code cassandra.coordinator.dc @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.coordinator.dc @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.coordinator.dc"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraCoordinatorDc =
-    "db.cassandra.coordinator.dc";
-
-/**
-  Deprecated, use @code cassandra.coordinator.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.coordinator.id @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.coordinator.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraCoordinatorId =
-    "db.cassandra.coordinator.id";
-
-/**
-  Deprecated, use @code cassandra.query.idempotent @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.query.idempotent @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.query.idempotent"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraIdempotence =
-    "db.cassandra.idempotence";
-
-/**
-  Deprecated, use @code cassandra.page.size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.page.size @endcode.", "reason": "renamed", "renamed_to":
-  "cassandra.page.size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraPageSize =
-    "db.cassandra.page_size";
-
-/**
-  Deprecated, use @code cassandra.speculative_execution.count @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.speculative_execution.count @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.speculative_execution.count"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraSpeculativeExecutionCount =
-    "db.cassandra.speculative_execution_count";
-
-/**
-  Deprecated, use @code db.collection.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.collection.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.collection.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraTable = "db.cassandra.table";
-
-/**
-  The name of the connection pool; unique within the instrumented application. In case the
-  connection pool implementation doesn't provide a name, instrumentation SHOULD use a combination of
-  parameters that would make the name unique, for example, combining attributes @code server.address
-  @endcode, @code server.port @endcode, and @code db.namespace @endcode, formatted as @code
-  server.address:server.port/db.namespace @endcode. Instrumentations that generate connection pool
-  name following different patterns SHOULD document it.
- */
-static constexpr const char *kDbClientConnectionPoolName = "db.client.connection.pool.name";
-
-/**
-  The state of a connection in the pool
- */
-static constexpr const char *kDbClientConnectionState = "db.client.connection.state";
-
-/**
-  Deprecated, use @code db.client.connection.pool.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.pool.name @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.pool.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsPoolName =
-    "db.client.connections.pool.name";
-
-/**
-  Deprecated, use @code db.client.connection.state @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.state @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.state"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsState =
-    "db.client.connections.state";
-
-/**
-  The name of a collection (table, container) within the database.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  The collection name SHOULD NOT be extracted from @code db.query.text @endcode,
-  when the database system supports query text with multiple collections
-  in non-batch operations.
-  <p>
-  For batch operations, if the individual operations are known to have the same
-  collection name then that collection name SHOULD be used.
- */
-static constexpr const char *kDbCollectionName = "db.collection.name";
-
-/**
-  Deprecated, use @code server.address @endcode, @code server.port @endcode attributes instead.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode and @code server.port @endcode.\n", "reason":
-  "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbConnectionString = "db.connection_string";
-
-/**
-  Deprecated, use @code azure.client.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.client.id @endcode.", "reason": "renamed", "renamed_to":
-  "azure.client.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbClientId = "db.cosmosdb.client_id";
-
-/**
-  Deprecated, use @code azure.cosmosdb.connection.mode @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.connection.mode @endcode.", "reason": "renamed",
-  "renamed_to": "azure.cosmosdb.connection.mode"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbConnectionMode =
-    "db.cosmosdb.connection_mode";
-
-/**
-  Deprecated, use @code cosmosdb.consistency.level @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.consistency.level @endcode.", "reason": "renamed",
-  "renamed_to": "azure.cosmosdb.consistency.level"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbConsistencyLevel =
-    "db.cosmosdb.consistency_level";
-
-/**
-  Deprecated, use @code db.collection.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.collection.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.collection.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbContainer =
-    "db.cosmosdb.container";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbOperationType =
-    "db.cosmosdb.operation_type";
-
-/**
-  Deprecated, use @code azure.cosmosdb.operation.contacted_regions @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.operation.contacted_regions @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.operation.contacted_regions"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRegionsContacted =
-    "db.cosmosdb.regions_contacted";
-
-/**
-  Deprecated, use @code azure.cosmosdb.operation.request_charge @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.operation.request_charge @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.operation.request_charge"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRequestCharge =
-    "db.cosmosdb.request_charge";
-
-/**
-  Deprecated, use @code azure.cosmosdb.request.body.size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.request.body.size @endcode.", "reason": "renamed",
-  "renamed_to": "azure.cosmosdb.request.body.size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRequestContentLength =
-    "db.cosmosdb.request_content_length";
-
-/**
-  Deprecated, use @code db.response.status_code @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.response.status_code @endcode.", "reason": "renamed", "renamed_to":
-  "db.response.status_code"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbStatusCode =
-    "db.cosmosdb.status_code";
-
-/**
-  Deprecated, use @code azure.cosmosdb.response.sub_status_code @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.response.sub_status_code @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.response.sub_status_code"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbSubStatusCode =
-    "db.cosmosdb.sub_status_code";
-
-/**
-  Deprecated, use @code db.namespace @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.namespace @endcode.", "reason": "renamed", "renamed_to":
-  "db.namespace"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchClusterName =
-    "db.elasticsearch.cluster.name";
-
-/**
-  Deprecated, use @code elasticsearch.node.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code elasticsearch.node.name @endcode.", "reason": "renamed", "renamed_to":
-  "elasticsearch.node.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchNodeName =
-    "db.elasticsearch.node.name";
-
-/**
-  Deprecated, use @code db.operation.parameter @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.operation.parameter @endcode.", "reason": "renamed", "renamed_to":
-  "db.operation.parameter"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchPathParts =
-    "db.elasticsearch.path_parts";
-
-/**
-  Deprecated, no general replacement at this time. For Elasticsearch, use @code
-  db.elasticsearch.node.name @endcode instead.
-
-  @deprecated
-  {"note": "Removed, no general replacement at this time. For Elasticsearch, use @code
-  db.elasticsearch.node.name @endcode instead.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbInstanceId = "db.instance.id";
-
-/**
-  Removed, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbJdbcDriverClassname =
-    "db.jdbc.driver_classname";
-
-/**
-  Deprecated, use @code db.collection.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.collection.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.collection.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMongodbCollection =
-    "db.mongodb.collection";
-
-/**
-  Deprecated, SQL Server instance is now populated as a part of @code db.namespace @endcode
-  attribute.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMssqlInstanceName =
-    "db.mssql.instance_name";
-
-/**
-  Deprecated, use @code db.namespace @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.namespace @endcode.", "reason": "renamed", "renamed_to":
-  "db.namespace"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbName = "db.name";
-
-/**
-  The name of the database, fully qualified within the server address and port.
-  <p>
-  If a database system has multiple namespace components, they SHOULD be concatenated from the most
-  general to the most specific namespace component, using @code | @endcode as a separator between
-  the components. Any missing components (and their associated separators) SHOULD be omitted.
-  Semantic conventions for individual database systems SHOULD document what @code db.namespace
-  @endcode means in the context of that system. It is RECOMMENDED to capture the value as provided
-  by the application without attempting to do any case normalization.
- */
-static constexpr const char *kDbNamespace = "db.namespace";
-
-/**
-  Deprecated, use @code db.operation.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.operation.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.operation.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbOperation = "db.operation";
-
-/**
-  The number of queries included in a batch operation.
-  <p>
-  Operations are only considered batches when they contain two or more operations, and so @code
-  db.operation.batch.size @endcode SHOULD never be @code 1 @endcode.
- */
-static constexpr const char *kDbOperationBatchSize = "db.operation.batch.size";
-
-/**
-  The name of the operation or command being executed.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  The operation name SHOULD NOT be extracted from @code db.query.text @endcode,
-  when the database system supports query text with multiple operations
-  in non-batch operations.
-  <p>
-  If spaces can occur in the operation name, multiple consecutive spaces
-  SHOULD be normalized to a single space.
-  <p>
-  For batch operations, if the individual operations are known to have the same operation name
-  then that operation name SHOULD be used prepended by @code BATCH  @endcode,
-  otherwise @code db.operation.name @endcode SHOULD be @code BATCH @endcode or some other database
-  system specific term if more applicable.
- */
-static constexpr const char *kDbOperationName = "db.operation.name";
-
-/**
-  A database operation parameter, with @code <key> @endcode being the parameter name, and the
-  attribute value being a string representation of the parameter value. <p> For example, a
-  client-side maximum number of rows to read from the database MAY be recorded as the @code
-  db.operation.parameter.max_rows @endcode attribute. <p>
-  @code db.query.text @endcode parameters SHOULD be captured using @code db.query.parameter.<key>
-  @endcode instead of @code db.operation.parameter.<key> @endcode.
- */
-static constexpr const char *kDbOperationParameter = "db.operation.parameter";
-
-/**
-  A database query parameter, with @code <key> @endcode being the parameter name, and the attribute
-  value being a string representation of the parameter value. <p> If a query parameter has no name
-  and instead is referenced only by index, then @code <key> @endcode SHOULD be the 0-based index.
-  <p>
-  @code db.query.parameter.<key> @endcode SHOULD match
-  up with the parameterized placeholders present in @code db.query.text @endcode.
-  <p>
-  @code db.query.parameter.<key> @endcode SHOULD NOT be captured on batch operations.
-  <p>
-  Examples:
-  <ul>
-    <li>For a query @code SELECT * FROM users where username =  %s @endcode with the parameter @code
-  "jdoe" @endcode, the attribute @code db.query.parameter.0 @endcode SHOULD be set to @code "jdoe"
-  @endcode.</li> <li>For a query @code "SELECT * FROM users WHERE username = %(username)s; @endcode
-  with parameter
-  @code username = "jdoe" @endcode, the attribute @code db.query.parameter.username @endcode SHOULD
-  be set to @code "jdoe" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kDbQueryParameter = "db.query.parameter";
-
-/**
-  Low cardinality summary of a database query.
-  <p>
-  The query summary describes a class of database queries and is useful
-  as a grouping key, especially when analyzing telemetry for database
-  calls involving complex queries.
-  <p>
-  Summary may be available to the instrumentation through
-  instrumentation hooks or other means. If it is not available, instrumentations
-  that support query parsing SHOULD generate a summary following
-  <a href="/docs/database/database-spans.md#generating-a-summary-of-the-query">Generating query
-  summary</a> section.
- */
-static constexpr const char *kDbQuerySummary = "db.query.summary";
-
-/**
-  The database query being executed.
-  <p>
-  For sanitization see <a
-  href="/docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of @code
-  db.query.text @endcode</a>. For batch operations, if the individual operations are known to have
-  the same query text then that query text SHOULD be used, otherwise all of the individual query
-  texts SHOULD be concatenated with separator @code ;  @endcode or some other database system
-  specific separator if more applicable. Parameterized query text SHOULD NOT be sanitized. Even
-  though parameterized query text can potentially have sensitive data, by using a parameterized
-  query the user is giving a strong signal that any sensitive data will be passed as parameter
-  values, and the benefit to observability of capturing the static part of the query text by default
-  outweighs the risk.
- */
-static constexpr const char *kDbQueryText = "db.query.text";
-
-/**
-  Deprecated, use @code db.namespace @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.namespace @endcode.", "reason": "renamed", "renamed_to":
-  "db.namespace"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
-    "db.redis.database_index";
-
-/**
-  Number of rows returned by the operation.
- */
-static constexpr const char *kDbResponseReturnedRows = "db.response.returned_rows";
-
-/**
-  Database response status code.
-  <p>
-  The status code returned by the database. Usually it represents an error code, but may also
-  represent partial success, warning, or differentiate between various types of successful outcomes.
-  Semantic conventions for individual database systems SHOULD document what @code
-  db.response.status_code @endcode means in the context of that system.
- */
-static constexpr const char *kDbResponseStatusCode = "db.response.status_code";
-
-/**
-  Deprecated, use @code db.collection.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.collection.name @endcode, but only if not extracting the value from
-  @code db.query.text @endcode.", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSqlTable = "db.sql.table";
-
-/**
-  The database statement being executed.
-
-  @deprecated
-  {"note": "Replaced by @code db.query.text @endcode.", "reason": "renamed", "renamed_to":
-  "db.query.text"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbStatement = "db.statement";
-
-/**
-  The name of a stored procedure within the database.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  For batch operations, if the individual operations are known to have the same
-  stored procedure name then that stored procedure name SHOULD be used.
- */
-static constexpr const char *kDbStoredProcedureName = "db.stored_procedure.name";
-
-/**
-  Deprecated, use @code db.system.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.system.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.system.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSystem = "db.system";
-
-/**
-  The database management system (DBMS) product as identified by the client instrumentation.
-  <p>
-  The actual DBMS may differ from the one identified by the client. For example, when using
-  PostgreSQL client libraries to connect to a CockroachDB, the @code db.system.name @endcode is set
-  to @code postgresql @endcode based on the instrumentation's best knowledge.
- */
-static constexpr const char *kDbSystemName = "db.system.name";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbUser = "db.user";
-
-namespace DbCassandraConsistencyLevelValues
-{
-/**
-  none
- */
-static constexpr const char *kAll = "all";
-
-/**
-  none
- */
-static constexpr const char *kEachQuorum = "each_quorum";
-
-/**
-  none
- */
-static constexpr const char *kQuorum = "quorum";
-
-/**
-  none
- */
-static constexpr const char *kLocalQuorum = "local_quorum";
-
-/**
-  none
- */
-static constexpr const char *kOne = "one";
-
-/**
-  none
- */
-static constexpr const char *kTwo = "two";
-
-/**
-  none
- */
-static constexpr const char *kThree = "three";
-
-/**
-  none
- */
-static constexpr const char *kLocalOne = "local_one";
-
-/**
-  none
- */
-static constexpr const char *kAny = "any";
-
-/**
-  none
- */
-static constexpr const char *kSerial = "serial";
-
-/**
-  none
- */
-static constexpr const char *kLocalSerial = "local_serial";
-
-}  // namespace DbCassandraConsistencyLevelValues
-
-namespace DbClientConnectionStateValues
-{
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-}  // namespace DbClientConnectionStateValues
-
-namespace DbClientConnectionsStateValues
-{
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-}  // namespace DbClientConnectionsStateValues
-
-namespace DbCosmosdbConnectionModeValues
-{
-/**
-  Gateway (HTTP) connection.
- */
-static constexpr const char *kGateway = "gateway";
-
-/**
-  Direct connection.
- */
-static constexpr const char *kDirect = "direct";
-
-}  // namespace DbCosmosdbConnectionModeValues
-
-namespace DbCosmosdbConsistencyLevelValues
-{
-/**
-  none
- */
-static constexpr const char *kStrong = "Strong";
-
-/**
-  none
- */
-static constexpr const char *kBoundedStaleness = "BoundedStaleness";
-
-/**
-  none
- */
-static constexpr const char *kSession = "Session";
-
-/**
-  none
- */
-static constexpr const char *kEventual = "Eventual";
-
-/**
-  none
- */
-static constexpr const char *kConsistentPrefix = "ConsistentPrefix";
-
-}  // namespace DbCosmosdbConsistencyLevelValues
-
-namespace DbCosmosdbOperationTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kBatch = "batch";
-
-/**
-  none
- */
-static constexpr const char *kCreate = "create";
-
-/**
-  none
- */
-static constexpr const char *kDelete = "delete";
-
-/**
-  none
- */
-static constexpr const char *kExecute = "execute";
-
-/**
-  none
- */
-static constexpr const char *kExecuteJavascript = "execute_javascript";
-
-/**
-  none
- */
-static constexpr const char *kInvalid = "invalid";
-
-/**
-  none
- */
-static constexpr const char *kHead = "head";
-
-/**
-  none
- */
-static constexpr const char *kHeadFeed = "head_feed";
-
-/**
-  none
- */
-static constexpr const char *kPatch = "patch";
-
-/**
-  none
- */
-static constexpr const char *kQuery = "query";
-
-/**
-  none
- */
-static constexpr const char *kQueryPlan = "query_plan";
-
-/**
-  none
- */
-static constexpr const char *kRead = "read";
-
-/**
-  none
- */
-static constexpr const char *kReadFeed = "read_feed";
-
-/**
-  none
- */
-static constexpr const char *kReplace = "replace";
-
-/**
-  none
- */
-static constexpr const char *kUpsert = "upsert";
-
-}  // namespace DbCosmosdbOperationTypeValues
-
-namespace DbSystemValues
-{
-/**
-  Some other SQL database. Fallback only. See notes.
- */
-static constexpr const char *kOtherSql = "other_sql";
-
-/**
-  Adabas (Adaptable Database System)
- */
-static constexpr const char *kAdabas = "adabas";
-
-/**
-  Deprecated, use @code intersystems_cache @endcode instead.
- */
-static constexpr const char *kCache = "cache";
-
-/**
-  InterSystems Caché
- */
-static constexpr const char *kIntersystemsCache = "intersystems_cache";
-
-/**
-  Apache Cassandra
- */
-static constexpr const char *kCassandra = "cassandra";
-
-/**
-  ClickHouse
- */
-static constexpr const char *kClickhouse = "clickhouse";
-
-/**
-  Deprecated, use @code other_sql @endcode instead.
- */
-static constexpr const char *kCloudscape = "cloudscape";
-
-/**
-  CockroachDB
- */
-static constexpr const char *kCockroachdb = "cockroachdb";
-
-/**
-  Deprecated, no replacement at this time.
- */
-static constexpr const char *kColdfusion = "coldfusion";
-
-/**
-  Microsoft Azure Cosmos DB
- */
-static constexpr const char *kCosmosdb = "cosmosdb";
-
-/**
-  Couchbase
- */
-static constexpr const char *kCouchbase = "couchbase";
-
-/**
-  CouchDB
- */
-static constexpr const char *kCouchdb = "couchdb";
-
-/**
-  IBM Db2
- */
-static constexpr const char *kDb2 = "db2";
-
-/**
-  Apache Derby
- */
-static constexpr const char *kDerby = "derby";
-
-/**
-  Amazon DynamoDB
- */
-static constexpr const char *kDynamodb = "dynamodb";
-
-/**
-  EnterpriseDB
- */
-static constexpr const char *kEdb = "edb";
-
-/**
-  Elasticsearch
- */
-static constexpr const char *kElasticsearch = "elasticsearch";
-
-/**
-  FileMaker
- */
-static constexpr const char *kFilemaker = "filemaker";
-
-/**
-  Firebird
- */
-static constexpr const char *kFirebird = "firebird";
-
-/**
-  Deprecated, use @code other_sql @endcode instead.
- */
-static constexpr const char *kFirstsql = "firstsql";
-
-/**
-  Apache Geode
- */
-static constexpr const char *kGeode = "geode";
-
-/**
-  H2
- */
-static constexpr const char *kH2 = "h2";
-
-/**
-  SAP HANA
- */
-static constexpr const char *kHanadb = "hanadb";
-
-/**
-  Apache HBase
- */
-static constexpr const char *kHbase = "hbase";
-
-/**
-  Apache Hive
- */
-static constexpr const char *kHive = "hive";
-
-/**
-  HyperSQL DataBase
- */
-static constexpr const char *kHsqldb = "hsqldb";
-
-/**
-  InfluxDB
- */
-static constexpr const char *kInfluxdb = "influxdb";
-
-/**
-  Informix
- */
-static constexpr const char *kInformix = "informix";
-
-/**
-  Ingres
- */
-static constexpr const char *kIngres = "ingres";
-
-/**
-  InstantDB
- */
-static constexpr const char *kInstantdb = "instantdb";
-
-/**
-  InterBase
- */
-static constexpr const char *kInterbase = "interbase";
-
-/**
-  MariaDB
- */
-static constexpr const char *kMariadb = "mariadb";
-
-/**
-  SAP MaxDB
- */
-static constexpr const char *kMaxdb = "maxdb";
-
-/**
-  Memcached
- */
-static constexpr const char *kMemcached = "memcached";
-
-/**
-  MongoDB
- */
-static constexpr const char *kMongodb = "mongodb";
-
-/**
-  Microsoft SQL Server
- */
-static constexpr const char *kMssql = "mssql";
-
-/**
-  Deprecated, Microsoft SQL Server Compact is discontinued.
- */
-static constexpr const char *kMssqlcompact = "mssqlcompact";
-
-/**
-  MySQL
- */
-static constexpr const char *kMysql = "mysql";
-
-/**
-  Neo4j
- */
-static constexpr const char *kNeo4j = "neo4j";
-
-/**
-  Netezza
- */
-static constexpr const char *kNetezza = "netezza";
-
-/**
-  OpenSearch
- */
-static constexpr const char *kOpensearch = "opensearch";
-
-/**
-  Oracle Database
- */
-static constexpr const char *kOracle = "oracle";
-
-/**
-  Pervasive PSQL
- */
-static constexpr const char *kPervasive = "pervasive";
-
-/**
-  PointBase
- */
-static constexpr const char *kPointbase = "pointbase";
-
-/**
-  PostgreSQL
- */
-static constexpr const char *kPostgresql = "postgresql";
-
-/**
-  Progress Database
- */
-static constexpr const char *kProgress = "progress";
-
-/**
-  Redis
- */
-static constexpr const char *kRedis = "redis";
-
-/**
-  Amazon Redshift
- */
-static constexpr const char *kRedshift = "redshift";
-
-/**
-  Cloud Spanner
- */
-static constexpr const char *kSpanner = "spanner";
-
-/**
-  SQLite
- */
-static constexpr const char *kSqlite = "sqlite";
-
-/**
-  Sybase
- */
-static constexpr const char *kSybase = "sybase";
-
-/**
-  Teradata
- */
-static constexpr const char *kTeradata = "teradata";
-
-/**
-  Trino
- */
-static constexpr const char *kTrino = "trino";
-
-/**
-  Vertica
- */
-static constexpr const char *kVertica = "vertica";
-
-}  // namespace DbSystemValues
-
-namespace DbSystemNameValues
-{
-/**
-  Some other SQL database. Fallback only.
- */
-static constexpr const char *kOtherSql = "other_sql";
-
-/**
-  <a href="https://documentation.softwareag.com/?pf=adabas">Adabas (Adaptable Database System)</a>
- */
-static constexpr const char *kSoftwareagAdabas = "softwareag.adabas";
-
-/**
-  <a href="https://www.actian.com/databases/ingres/">Actian Ingres</a>
- */
-static constexpr const char *kActianIngres = "actian.ingres";
-
-/**
-  <a href="https://aws.amazon.com/pm/dynamodb/">Amazon DynamoDB</a>
- */
-static constexpr const char *kAwsDynamodb = "aws.dynamodb";
-
-/**
-  <a href="https://aws.amazon.com/redshift/">Amazon Redshift</a>
- */
-static constexpr const char *kAwsRedshift = "aws.redshift";
-
-/**
-  <a href="https://learn.microsoft.com/azure/cosmos-db">Azure Cosmos DB</a>
- */
-static constexpr const char *kAzureCosmosdb = "azure.cosmosdb";
-
-/**
-  <a href="https://www.intersystems.com/products/cache/">InterSystems Caché</a>
- */
-static constexpr const char *kIntersystemsCache = "intersystems.cache";
-
-/**
-  <a href="https://cassandra.apache.org/">Apache Cassandra</a>
- */
-static constexpr const char *kCassandra = "cassandra";
-
-/**
-  <a href="https://clickhouse.com/">ClickHouse</a>
- */
-static constexpr const char *kClickhouse = "clickhouse";
-
-/**
-  <a href="https://www.cockroachlabs.com/">CockroachDB</a>
- */
-static constexpr const char *kCockroachdb = "cockroachdb";
-
-/**
-  <a href="https://www.couchbase.com/">Couchbase</a>
- */
-static constexpr const char *kCouchbase = "couchbase";
-
-/**
-  <a href="https://couchdb.apache.org/">Apache CouchDB</a>
- */
-static constexpr const char *kCouchdb = "couchdb";
-
-/**
-  <a href="https://db.apache.org/derby/">Apache Derby</a>
- */
-static constexpr const char *kDerby = "derby";
-
-/**
-  <a href="https://www.elastic.co/elasticsearch">Elasticsearch</a>
- */
-static constexpr const char *kElasticsearch = "elasticsearch";
-
-/**
-  <a href="https://www.firebirdsql.org/">Firebird</a>
- */
-static constexpr const char *kFirebirdsql = "firebirdsql";
-
-/**
-  <a href="https://cloud.google.com/spanner">Google Cloud Spanner</a>
- */
-static constexpr const char *kGcpSpanner = "gcp.spanner";
-
-/**
-  <a href="https://geode.apache.org/">Apache Geode</a>
- */
-static constexpr const char *kGeode = "geode";
-
-/**
-  <a href="https://h2database.com/">H2 Database</a>
- */
-static constexpr const char *kH2database = "h2database";
-
-/**
-  <a href="https://hbase.apache.org/">Apache HBase</a>
- */
-static constexpr const char *kHbase = "hbase";
-
-/**
-  <a href="https://hive.apache.org/">Apache Hive</a>
- */
-static constexpr const char *kHive = "hive";
-
-/**
-  <a href="https://hsqldb.org/">HyperSQL Database</a>
- */
-static constexpr const char *kHsqldb = "hsqldb";
-
-/**
-  <a href="https://www.ibm.com/db2">IBM Db2</a>
- */
-static constexpr const char *kIbmDb2 = "ibm.db2";
-
-/**
-  <a href="https://www.ibm.com/products/informix">IBM Informix</a>
- */
-static constexpr const char *kIbmInformix = "ibm.informix";
-
-/**
-  <a href="https://www.ibm.com/products/netezza">IBM Netezza</a>
- */
-static constexpr const char *kIbmNetezza = "ibm.netezza";
-
-/**
-  <a href="https://www.influxdata.com/">InfluxDB</a>
- */
-static constexpr const char *kInfluxdb = "influxdb";
-
-/**
-  <a href="https://www.instantdb.com/">Instant</a>
- */
-static constexpr const char *kInstantdb = "instantdb";
-
-/**
-  <a href="https://mariadb.org/">MariaDB</a>
- */
-static constexpr const char *kMariadb = "mariadb";
-
-/**
-  <a href="https://memcached.org/">Memcached</a>
- */
-static constexpr const char *kMemcached = "memcached";
-
-/**
-  <a href="https://www.mongodb.com/">MongoDB</a>
- */
-static constexpr const char *kMongodb = "mongodb";
-
-/**
-  <a href="https://www.microsoft.com/sql-server">Microsoft SQL Server</a>
- */
-static constexpr const char *kMicrosoftSqlServer = "microsoft.sql_server";
-
-/**
-  <a href="https://www.mysql.com/">MySQL</a>
- */
-static constexpr const char *kMysql = "mysql";
-
-/**
-  <a href="https://neo4j.com/">Neo4j</a>
- */
-static constexpr const char *kNeo4j = "neo4j";
-
-/**
-  <a href="https://opensearch.org/">OpenSearch</a>
- */
-static constexpr const char *kOpensearch = "opensearch";
-
-/**
-  <a href="https://www.oracle.com/database/">Oracle Database</a>
- */
-static constexpr const char *kOracleDb = "oracle.db";
-
-/**
-  <a href="https://www.postgresql.org/">PostgreSQL</a>
- */
-static constexpr const char *kPostgresql = "postgresql";
-
-/**
-  <a href="https://redis.io/">Redis</a>
- */
-static constexpr const char *kRedis = "redis";
-
-/**
-  <a href="https://www.sap.com/products/technology-platform/hana/what-is-sap-hana.html">SAP HANA</a>
- */
-static constexpr const char *kSapHana = "sap.hana";
-
-/**
-  <a href="https://maxdb.sap.com/">SAP MaxDB</a>
- */
-static constexpr const char *kSapMaxdb = "sap.maxdb";
-
-/**
-  <a href="https://www.sqlite.org/">SQLite</a>
- */
-static constexpr const char *kSqlite = "sqlite";
-
-/**
-  <a href="https://www.teradata.com/">Teradata</a>
- */
-static constexpr const char *kTeradata = "teradata";
-
-/**
-  <a href="https://trino.io/">Trino</a>
- */
-static constexpr const char *kTrino = "trino";
-
-}  // namespace DbSystemNameValues
-
-}  // namespace db
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/db_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/db_metrics.h
deleted file mode 100644
index 8b74c62bc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/db_metrics.h
+++ /dev/null
@@ -1,861 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace db
-{
-
-/**
-  The number of connections that are currently in state described by the @code state @endcode
-  attribute <p> updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionCount = "db.client.connection.count";
-static constexpr const char *descrMetricDbClientConnectionCount =
-    "The number of connections that are currently in state described by the `state` attribute";
-static constexpr const char *unitMetricDbClientConnectionCount = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionCount,
-                                         descrMetricDbClientConnectionCount,
-                                         unitMetricDbClientConnectionCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionCount,
-                                          descrMetricDbClientConnectionCount,
-                                          unitMetricDbClientConnectionCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionCount,
-                                                   descrMetricDbClientConnectionCount,
-                                                   unitMetricDbClientConnectionCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionCount,
-                                                    descrMetricDbClientConnectionCount,
-                                                    unitMetricDbClientConnectionCount);
-}
-
-/**
-  The time it took to create a new connection
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientConnectionCreateTime =
-    "db.client.connection.create_time";
-static constexpr const char *descrMetricDbClientConnectionCreateTime =
-    "The time it took to create a new connection";
-static constexpr const char *unitMetricDbClientConnectionCreateTime = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionCreateTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionCreateTime,
-                                      descrMetricDbClientConnectionCreateTime,
-                                      unitMetricDbClientConnectionCreateTime);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionCreateTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionCreateTime,
-                                      descrMetricDbClientConnectionCreateTime,
-                                      unitMetricDbClientConnectionCreateTime);
-}
-
-/**
-  The maximum number of idle open connections allowed
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionIdleMax = "db.client.connection.idle.max";
-static constexpr const char *descrMetricDbClientConnectionIdleMax =
-    "The maximum number of idle open connections allowed";
-static constexpr const char *unitMetricDbClientConnectionIdleMax = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionIdleMax,
-                                         descrMetricDbClientConnectionIdleMax,
-                                         unitMetricDbClientConnectionIdleMax);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionIdleMax,
-                                          descrMetricDbClientConnectionIdleMax,
-                                          unitMetricDbClientConnectionIdleMax);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionIdleMax,
-                                                   descrMetricDbClientConnectionIdleMax,
-                                                   unitMetricDbClientConnectionIdleMax);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionIdleMax,
-                                                    descrMetricDbClientConnectionIdleMax,
-                                                    unitMetricDbClientConnectionIdleMax);
-}
-
-/**
-  The minimum number of idle open connections allowed
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionIdleMin = "db.client.connection.idle.min";
-static constexpr const char *descrMetricDbClientConnectionIdleMin =
-    "The minimum number of idle open connections allowed";
-static constexpr const char *unitMetricDbClientConnectionIdleMin = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionIdleMin,
-                                         descrMetricDbClientConnectionIdleMin,
-                                         unitMetricDbClientConnectionIdleMin);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionIdleMin,
-                                          descrMetricDbClientConnectionIdleMin,
-                                          unitMetricDbClientConnectionIdleMin);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionIdleMin,
-                                                   descrMetricDbClientConnectionIdleMin,
-                                                   unitMetricDbClientConnectionIdleMin);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionIdleMin,
-                                                    descrMetricDbClientConnectionIdleMin,
-                                                    unitMetricDbClientConnectionIdleMin);
-}
-
-/**
-  The maximum number of open connections allowed
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionMax = "db.client.connection.max";
-static constexpr const char *descrMetricDbClientConnectionMax =
-    "The maximum number of open connections allowed";
-static constexpr const char *unitMetricDbClientConnectionMax = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionMax,
-                                         descrMetricDbClientConnectionMax,
-                                         unitMetricDbClientConnectionMax);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionMax,
-                                          descrMetricDbClientConnectionMax,
-                                          unitMetricDbClientConnectionMax);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionMax,
-                                                   descrMetricDbClientConnectionMax,
-                                                   unitMetricDbClientConnectionMax);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionMax,
-                                                    descrMetricDbClientConnectionMax,
-                                                    unitMetricDbClientConnectionMax);
-}
-
-/**
-  The number of current pending requests for an open connection
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionPendingRequests =
-    "db.client.connection.pending_requests";
-static constexpr const char *descrMetricDbClientConnectionPendingRequests =
-    "The number of current pending requests for an open connection";
-static constexpr const char *unitMetricDbClientConnectionPendingRequests = "{request}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionPendingRequests,
-                                         descrMetricDbClientConnectionPendingRequests,
-                                         unitMetricDbClientConnectionPendingRequests);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionPendingRequests,
-                                          descrMetricDbClientConnectionPendingRequests,
-                                          unitMetricDbClientConnectionPendingRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionPendingRequests,
-                                                   descrMetricDbClientConnectionPendingRequests,
-                                                   unitMetricDbClientConnectionPendingRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionPendingRequests,
-                                                    descrMetricDbClientConnectionPendingRequests,
-                                                    unitMetricDbClientConnectionPendingRequests);
-}
-
-/**
-  The number of connection timeouts that have occurred trying to obtain a connection from the pool
-  <p>
-  counter
- */
-static constexpr const char *kMetricDbClientConnectionTimeouts = "db.client.connection.timeouts";
-static constexpr const char *descrMetricDbClientConnectionTimeouts =
-    "The number of connection timeouts that have occurred trying to obtain a connection from the "
-    "pool";
-static constexpr const char *unitMetricDbClientConnectionTimeouts = "{timeout}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricDbClientConnectionTimeouts,
-                                    descrMetricDbClientConnectionTimeouts,
-                                    unitMetricDbClientConnectionTimeouts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricDbClientConnectionTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricDbClientConnectionTimeouts,
-                                    descrMetricDbClientConnectionTimeouts,
-                                    unitMetricDbClientConnectionTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricDbClientConnectionTimeouts,
-                                             descrMetricDbClientConnectionTimeouts,
-                                             unitMetricDbClientConnectionTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricDbClientConnectionTimeouts,
-                                              descrMetricDbClientConnectionTimeouts,
-                                              unitMetricDbClientConnectionTimeouts);
-}
-
-/**
-  The time between borrowing a connection and returning it to the pool
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientConnectionUseTime = "db.client.connection.use_time";
-static constexpr const char *descrMetricDbClientConnectionUseTime =
-    "The time between borrowing a connection and returning it to the pool";
-static constexpr const char *unitMetricDbClientConnectionUseTime = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionUseTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionUseTime,
-                                      descrMetricDbClientConnectionUseTime,
-                                      unitMetricDbClientConnectionUseTime);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionUseTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionUseTime,
-                                      descrMetricDbClientConnectionUseTime,
-                                      unitMetricDbClientConnectionUseTime);
-}
-
-/**
-  The time it took to obtain an open connection from the pool
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientConnectionWaitTime = "db.client.connection.wait_time";
-static constexpr const char *descrMetricDbClientConnectionWaitTime =
-    "The time it took to obtain an open connection from the pool";
-static constexpr const char *unitMetricDbClientConnectionWaitTime = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionWaitTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionWaitTime,
-                                      descrMetricDbClientConnectionWaitTime,
-                                      unitMetricDbClientConnectionWaitTime);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionWaitTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionWaitTime,
-                                      descrMetricDbClientConnectionWaitTime,
-                                      unitMetricDbClientConnectionWaitTime);
-}
-
-/**
-  Deprecated, use @code db.client.connection.create_time @endcode instead. Note: the unit also
-  changed from @code ms @endcode to @code s @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.create_time @endcode with unit @code s
-  @endcode.", "reason": "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsCreateTime =
-    "db.client.connections.create_time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsCreateTime =
-    "Deprecated, use `db.client.connection.create_time` instead. Note: the unit also changed from "
-    "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsCreateTime =
-    "ms";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionsCreateTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionsCreateTime,
-                                      descrMetricDbClientConnectionsCreateTime,
-                                      unitMetricDbClientConnectionsCreateTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionsCreateTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionsCreateTime,
-                                      descrMetricDbClientConnectionsCreateTime,
-                                      unitMetricDbClientConnectionsCreateTime);
-}
-
-/**
-  Deprecated, use @code db.client.connection.idle.max @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.idle.max @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.idle.max"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsIdleMax =
-    "db.client.connections.idle.max";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsIdleMax =
-    "Deprecated, use `db.client.connection.idle.max` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsIdleMax =
-    "{connection}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsIdleMax,
-                                         descrMetricDbClientConnectionsIdleMax,
-                                         unitMetricDbClientConnectionsIdleMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsIdleMax,
-                                          descrMetricDbClientConnectionsIdleMax,
-                                          unitMetricDbClientConnectionsIdleMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsIdleMax,
-                                                   descrMetricDbClientConnectionsIdleMax,
-                                                   unitMetricDbClientConnectionsIdleMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsIdleMax,
-                                                    descrMetricDbClientConnectionsIdleMax,
-                                                    unitMetricDbClientConnectionsIdleMax);
-}
-
-/**
-  Deprecated, use @code db.client.connection.idle.min @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.idle.min @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.idle.min"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsIdleMin =
-    "db.client.connections.idle.min";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsIdleMin =
-    "Deprecated, use `db.client.connection.idle.min` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsIdleMin =
-    "{connection}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsIdleMin,
-                                         descrMetricDbClientConnectionsIdleMin,
-                                         unitMetricDbClientConnectionsIdleMin);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsIdleMin,
-                                          descrMetricDbClientConnectionsIdleMin,
-                                          unitMetricDbClientConnectionsIdleMin);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsIdleMin,
-                                                   descrMetricDbClientConnectionsIdleMin,
-                                                   unitMetricDbClientConnectionsIdleMin);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsIdleMin,
-                                                    descrMetricDbClientConnectionsIdleMin,
-                                                    unitMetricDbClientConnectionsIdleMin);
-}
-
-/**
-  Deprecated, use @code db.client.connection.max @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.max @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.max"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsMax =
-    "db.client.connections.max";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsMax =
-    "Deprecated, use `db.client.connection.max` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsMax =
-    "{connection}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsMax,
-                                         descrMetricDbClientConnectionsMax,
-                                         unitMetricDbClientConnectionsMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsMax,
-                                          descrMetricDbClientConnectionsMax,
-                                          unitMetricDbClientConnectionsMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsMax,
-                                                   descrMetricDbClientConnectionsMax,
-                                                   unitMetricDbClientConnectionsMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsMax,
-                                                    descrMetricDbClientConnectionsMax,
-                                                    unitMetricDbClientConnectionsMax);
-}
-
-/**
-  Deprecated, use @code db.client.connection.pending_requests @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.pending_requests @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.pending_requests"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsPendingRequests =
-    "db.client.connections.pending_requests";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricDbClientConnectionsPendingRequests =
-        "Deprecated, use `db.client.connection.pending_requests` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsPendingRequests =
-    "{request}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsPendingRequests,
-                                         descrMetricDbClientConnectionsPendingRequests,
-                                         unitMetricDbClientConnectionsPendingRequests);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsPendingRequests,
-                                          descrMetricDbClientConnectionsPendingRequests,
-                                          unitMetricDbClientConnectionsPendingRequests);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsPendingRequests,
-                                                   descrMetricDbClientConnectionsPendingRequests,
-                                                   unitMetricDbClientConnectionsPendingRequests);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsPendingRequests,
-                                                    descrMetricDbClientConnectionsPendingRequests,
-                                                    unitMetricDbClientConnectionsPendingRequests);
-}
-
-/**
-  Deprecated, use @code db.client.connection.timeouts @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.timeouts @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.timeouts"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsTimeouts =
-    "db.client.connections.timeouts";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsTimeouts =
-    "Deprecated, use `db.client.connection.timeouts` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsTimeouts =
-    "{timeout}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionsTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricDbClientConnectionsTimeouts,
-                                    descrMetricDbClientConnectionsTimeouts,
-                                    unitMetricDbClientConnectionsTimeouts);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricDbClientConnectionsTimeouts,
-                                    descrMetricDbClientConnectionsTimeouts,
-                                    unitMetricDbClientConnectionsTimeouts);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricDbClientConnectionsTimeouts,
-                                             descrMetricDbClientConnectionsTimeouts,
-                                             unitMetricDbClientConnectionsTimeouts);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricDbClientConnectionsTimeouts,
-                                              descrMetricDbClientConnectionsTimeouts,
-                                              unitMetricDbClientConnectionsTimeouts);
-}
-
-/**
-  Deprecated, use @code db.client.connection.count @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.count @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.count"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsUsage =
-    "db.client.connections.usage";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsUsage =
-    "Deprecated, use `db.client.connection.count` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsUsage =
-    "{connection}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsUsage,
-                                         descrMetricDbClientConnectionsUsage,
-                                         unitMetricDbClientConnectionsUsage);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsUsage,
-                                          descrMetricDbClientConnectionsUsage,
-                                          unitMetricDbClientConnectionsUsage);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsUsage,
-                                                   descrMetricDbClientConnectionsUsage,
-                                                   unitMetricDbClientConnectionsUsage);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsUsage,
-                                                    descrMetricDbClientConnectionsUsage,
-                                                    unitMetricDbClientConnectionsUsage);
-}
-
-/**
-  Deprecated, use @code db.client.connection.use_time @endcode instead. Note: the unit also changed
-  from @code ms @endcode to @code s @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.use_time @endcode with unit @code s @endcode.",
-  "reason": "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsUseTime =
-    "db.client.connections.use_time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsUseTime =
-    "Deprecated, use `db.client.connection.use_time` instead. Note: the unit also changed from "
-    "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsUseTime = "ms";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionsUseTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionsUseTime,
-                                      descrMetricDbClientConnectionsUseTime,
-                                      unitMetricDbClientConnectionsUseTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionsUseTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionsUseTime,
-                                      descrMetricDbClientConnectionsUseTime,
-                                      unitMetricDbClientConnectionsUseTime);
-}
-
-/**
-  Deprecated, use @code db.client.connection.wait_time @endcode instead. Note: the unit also changed
-  from @code ms @endcode to @code s @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.wait_time @endcode with unit @code s @endcode.",
-  "reason": "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsWaitTime =
-    "db.client.connections.wait_time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsWaitTime =
-    "Deprecated, use `db.client.connection.wait_time` instead. Note: the unit also changed from "
-    "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsWaitTime = "ms";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionsWaitTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionsWaitTime,
-                                      descrMetricDbClientConnectionsWaitTime,
-                                      unitMetricDbClientConnectionsWaitTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionsWaitTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionsWaitTime,
-                                      descrMetricDbClientConnectionsWaitTime,
-                                      unitMetricDbClientConnectionsWaitTime);
-}
-
-/**
-  Deprecated, use @code azure.cosmosdb.client.active_instance.count @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.client.active_instance.count @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.client.active_instance.count"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientCosmosdbActiveInstanceCount =
-    "db.client.cosmosdb.active_instance.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricDbClientCosmosdbActiveInstanceCount =
-        "Deprecated, use `azure.cosmosdb.client.active_instance.count` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricDbClientCosmosdbActiveInstanceCount = "{instance}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
-                                         descrMetricDbClientCosmosdbActiveInstanceCount,
-                                         unitMetricDbClientCosmosdbActiveInstanceCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
-                                          descrMetricDbClientCosmosdbActiveInstanceCount,
-                                          unitMetricDbClientCosmosdbActiveInstanceCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
-                                                   descrMetricDbClientCosmosdbActiveInstanceCount,
-                                                   unitMetricDbClientCosmosdbActiveInstanceCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
-                                                    descrMetricDbClientCosmosdbActiveInstanceCount,
-                                                    unitMetricDbClientCosmosdbActiveInstanceCount);
-}
-
-/**
-  Deprecated, use @code azure.cosmosdb.client.operation.request_charge @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.client.operation.request_charge @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.client.operation.request_charge"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *kMetricDbClientCosmosdbOperationRequestCharge = "db.client.cosmosdb.operation.request_charge";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricDbClientCosmosdbOperationRequestCharge =
-        "Deprecated, use `azure.cosmosdb.client.operation.request_charge` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricDbClientCosmosdbOperationRequestCharge = "{request_unit}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientCosmosdbOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientCosmosdbOperationRequestCharge,
-                                      descrMetricDbClientCosmosdbOperationRequestCharge,
-                                      unitMetricDbClientCosmosdbOperationRequestCharge);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientCosmosdbOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientCosmosdbOperationRequestCharge,
-                                      descrMetricDbClientCosmosdbOperationRequestCharge,
-                                      unitMetricDbClientCosmosdbOperationRequestCharge);
-}
-
-/**
-  Duration of database client operations.
-  <p>
-  Batch operations SHOULD be recorded as a single operation.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientOperationDuration = "db.client.operation.duration";
-static constexpr const char *descrMetricDbClientOperationDuration =
-    "Duration of database client operations.";
-static constexpr const char *unitMetricDbClientOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientOperationDuration,
-                                      descrMetricDbClientOperationDuration,
-                                      unitMetricDbClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientOperationDuration,
-                                      descrMetricDbClientOperationDuration,
-                                      unitMetricDbClientOperationDuration);
-}
-
-/**
-  The actual number of records returned by the database operation.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientResponseReturnedRows =
-    "db.client.response.returned_rows";
-static constexpr const char *descrMetricDbClientResponseReturnedRows =
-    "The actual number of records returned by the database operation.";
-static constexpr const char *unitMetricDbClientResponseReturnedRows = "{row}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientResponseReturnedRows(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientResponseReturnedRows,
-                                      descrMetricDbClientResponseReturnedRows,
-                                      unitMetricDbClientResponseReturnedRows);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientResponseReturnedRows(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientResponseReturnedRows,
-                                      descrMetricDbClientResponseReturnedRows,
-                                      unitMetricDbClientResponseReturnedRows);
-}
-
-}  // namespace db
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/deployment_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/deployment_attributes.h
deleted file mode 100644
index 33209ebbf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/deployment_attributes.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace deployment
-{
-
-/**
-  'Deprecated, use @code deployment.environment.name @endcode instead.'
-
-  @deprecated
-  {"note": "Replaced by @code deployment.environment.name @endcode.", "reason": "renamed",
-  "renamed_to": "deployment.environment.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment =
-    "deployment.environment";
-
-/**
-  Name of the <a href="https://wikipedia.org/wiki/Deployment_environment">deployment environment</a>
-  (aka deployment tier). <p>
-  @code deployment.environment.name @endcode does not affect the uniqueness constraints defined
-  through the @code service.namespace @endcode, @code service.name @endcode and @code
-  service.instance.id @endcode resource attributes. This implies that resources carrying the
-  following attribute combinations MUST be considered to be identifying the same service: <ul>
-    <li>@code service.name=frontend @endcode, @code deployment.environment.name=production
-  @endcode</li> <li>@code service.name=frontend @endcode, @code deployment.environment.name=staging
-  @endcode.</li>
-  </ul>
- */
-static constexpr const char *kDeploymentEnvironmentName = "deployment.environment.name";
-
-/**
-  The id of the deployment.
- */
-static constexpr const char *kDeploymentId = "deployment.id";
-
-/**
-  The name of the deployment.
- */
-static constexpr const char *kDeploymentName = "deployment.name";
-
-/**
-  The status of the deployment.
- */
-static constexpr const char *kDeploymentStatus = "deployment.status";
-
-namespace DeploymentStatusValues
-{
-/**
-  failed
- */
-static constexpr const char *kFailed = "failed";
-
-/**
-  succeeded
- */
-static constexpr const char *kSucceeded = "succeeded";
-
-}  // namespace DeploymentStatusValues
-
-}  // namespace deployment
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/destination_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/destination_attributes.h
deleted file mode 100644
index e4f01b357..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/destination_attributes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace destination
-{
-
-/**
-  Destination address - domain name if available without reverse DNS lookup; otherwise, IP address
-  or Unix domain socket name. <p> When observed from the source side, and when communicating through
-  an intermediary, @code destination.address @endcode SHOULD represent the destination address
-  behind any intermediaries, for example proxies, if it's available.
- */
-static constexpr const char *kDestinationAddress = "destination.address";
-
-/**
-  Destination port number
- */
-static constexpr const char *kDestinationPort = "destination.port";
-
-}  // namespace destination
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/device_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/device_attributes.h
deleted file mode 100644
index f69856ee4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/device_attributes.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace device
-{
-
-/**
-  A unique identifier representing the device
-  <p>
-  Its value SHOULD be identical for all apps on a device and it SHOULD NOT change if an app is
-  uninstalled and re-installed. However, it might be resettable by the user for all apps on a
-  device. Hardware IDs (e.g. vendor-specific serial number, IMEI or MAC address) MAY be used as
-  values. <p> More information about Android identifier best practices can be found <a
-  href="https://developer.android.com/training/articles/user-data-ids">here</a>. <blockquote>
-  [!WARNING]
-  <p>
-  This attribute may contain sensitive (PII) information. Caution should be taken when storing
-  personal data or anything which can identify a user. GDPR and data protection laws may apply,
-  ensure you do your own due diligence.
-  <p>
-  Due to these reasons, this identifier is not recommended for consumer applications and will likely
-  result in rejection from both Google Play and App Store. However, it may be appropriate for
-  specific enterprise scenarios, such as kiosk devices or enterprise-managed devices, with
-  appropriate compliance clearance. Any instrumentation providing this identifier MUST implement it
-  as an opt-in feature. <p> See <a href="/docs/registry/attributes/app.md#app-installation-id">@code
-  app.installation.id @endcode</a> for a more privacy-preserving alternative.</blockquote>
- */
-static constexpr const char *kDeviceId = "device.id";
-
-/**
-  The name of the device manufacturer
-  <p>
-  The Android OS provides this field via <a
-  href="https://developer.android.com/reference/android/os/Build#MANUFACTURER">Build</a>. iOS apps
-  SHOULD hardcode the value @code Apple @endcode.
- */
-static constexpr const char *kDeviceManufacturer = "device.manufacturer";
-
-/**
-  The model identifier for the device
-  <p>
-  It's recommended this value represents a machine-readable version of the model identifier rather
-  than the market or consumer-friendly name of the device.
- */
-static constexpr const char *kDeviceModelIdentifier = "device.model.identifier";
-
-/**
-  The marketing name for the device model
-  <p>
-  It's recommended this value represents a human-readable version of the device model rather than a
-  machine-readable alternative.
- */
-static constexpr const char *kDeviceModelName = "device.model.name";
-
-}  // namespace device
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/disk_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/disk_attributes.h
deleted file mode 100644
index c2504d75f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/disk_attributes.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace disk
-{
-
-/**
-  The disk IO operation direction.
- */
-static constexpr const char *kDiskIoDirection = "disk.io.direction";
-
-namespace DiskIoDirectionValues
-{
-/**
-  none
- */
-static constexpr const char *kRead = "read";
-
-/**
-  none
- */
-static constexpr const char *kWrite = "write";
-
-}  // namespace DiskIoDirectionValues
-
-}  // namespace disk
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/dns_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/dns_attributes.h
deleted file mode 100644
index 030828ab9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/dns_attributes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace dns
-{
-
-/**
-  The name being queried.
-  <p>
-  If the name field contains non-printable characters (below 32 or above 126), those characters
-  should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should be
-  escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n
-  respectively.
- */
-static constexpr const char *kDnsQuestionName = "dns.question.name";
-
-}  // namespace dns
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/dns_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/dns_metrics.h
deleted file mode 100644
index 11a9d4ba8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/dns_metrics.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace dns
-{
-
-/**
-  Measures the time taken to perform a DNS lookup.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDnsLookupDuration = "dns.lookup.duration";
-static constexpr const char *descrMetricDnsLookupDuration =
-    "Measures the time taken to perform a DNS lookup.";
-static constexpr const char *unitMetricDnsLookupDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDnsLookupDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDnsLookupDuration, descrMetricDnsLookupDuration,
-                                      unitMetricDnsLookupDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricDnsLookupDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDnsLookupDuration, descrMetricDnsLookupDuration,
-                                      unitMetricDnsLookupDuration);
-}
-
-}  // namespace dns
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/elasticsearch_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/elasticsearch_attributes.h
deleted file mode 100644
index e0c9c5a22..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/elasticsearch_attributes.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace elasticsearch
-{
-
-/**
-  Represents the human-readable identifier of the node/instance to which a request was routed.
- */
-static constexpr const char *kElasticsearchNodeName = "elasticsearch.node.name";
-
-}  // namespace elasticsearch
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/enduser_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/enduser_attributes.h
deleted file mode 100644
index 9120aa2c0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/enduser_attributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace enduser
-{
-
-/**
-  Unique identifier of an end user in the system. It maybe a username, email address, or other
-  identifier. <p> Unique identifier of an end user in the system. <blockquote>
-  [!Warning]
-  This field contains sensitive (PII) information.</blockquote>
- */
-static constexpr const char *kEnduserId = "enduser.id";
-
-/**
-  Pseudonymous identifier of an end user. This identifier should be a random value that is not
-  directly linked or associated with the end user's actual identity. <p> Pseudonymous identifier of
-  an end user. <blockquote>
-  [!Warning]
-  This field contains sensitive (linkable PII) information.</blockquote>
- */
-static constexpr const char *kEnduserPseudoId = "enduser.pseudo.id";
-
-/**
-  Deprecated, use @code user.roles @endcode instead.
-
-  @deprecated
-  {"note": "Use @code user.roles @endcode attribute instead.", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope";
-
-}  // namespace enduser
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/error_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/error_attributes.h
deleted file mode 100644
index 439ae7bb1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/error_attributes.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace error
-{
-
-/**
-  A message providing more detail about an error in human-readable form.
-  <p>
-  @code error.message @endcode should provide additional context and detail about an error.
-  It is NOT RECOMMENDED to duplicate the value of @code error.type @endcode in @code error.message
-  @endcode. It is also NOT RECOMMENDED to duplicate the value of @code exception.message @endcode in
-  @code error.message @endcode. <p>
-  @code error.message @endcode is NOT RECOMMENDED for metrics or spans due to its unbounded
-  cardinality and overlap with span status.
- */
-static constexpr const char *kErrorMessage = "error.message";
-
-/**
-  Describes a class of error the operation ended with.
-  <p>
-  The @code error.type @endcode SHOULD be predictable, and SHOULD have low cardinality.
-  <p>
-  When @code error.type @endcode is set to a type (e.g., an exception type), its
-  canonical class name identifying the type within the artifact SHOULD be used.
-  <p>
-  Instrumentations SHOULD document the list of errors they report.
-  <p>
-  The cardinality of @code error.type @endcode within one instrumentation library SHOULD be low.
-  Telemetry consumers that aggregate data from multiple instrumentation libraries and applications
-  should be prepared for @code error.type @endcode to have high cardinality at query time when no
-  additional filters are applied.
-  <p>
-  If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
-  @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
-  status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
-  error.type @endcode to capture all errors, regardless of whether they are defined within the
-  domain-specific set or not.</li>
-  </ul>
- */
-static constexpr const char *kErrorType = "error.type";
-
-namespace ErrorTypeValues
-{
-/**
-  A fallback error value to be used when the instrumentation doesn't define a custom value.
- */
-static constexpr const char *kOther = "_OTHER";
-
-}  // namespace ErrorTypeValues
-
-}  // namespace error
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/event_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/event_attributes.h
deleted file mode 100644
index de4d30a57..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/event_attributes.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace event
-{
-
-/**
-  Identifies the class / type of event.
-
-  @deprecated
-  {"note": "Replaced by EventName top-level field on the LogRecord.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEventName = "event.name";
-
-}  // namespace event
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/exception_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/exception_attributes.h
deleted file mode 100644
index 8947d711f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/exception_attributes.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace exception
-{
-
-/**
-  Indicates that the exception is escaping the scope of the span.
-
-  @deprecated
-  {"note": "It's no longer recommended to record exceptions that are handled and do not escape the
-  scope of a span.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped";
-
-/**
-  The exception message.
- */
-static constexpr const char *kExceptionMessage = "exception.message";
-
-/**
-  A stacktrace as a string in the natural representation for the language runtime. The
-  representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kExceptionStacktrace = "exception.stacktrace";
-
-/**
-  The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the
-  exception should be preferred over the static type in languages that support it.
- */
-static constexpr const char *kExceptionType = "exception.type";
-
-}  // namespace exception
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/faas_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/faas_attributes.h
deleted file mode 100644
index 9f9690824..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/faas_attributes.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace faas
-{
-
-/**
-  A boolean that is true if the serverless function is executed for the first time (aka cold-start).
- */
-static constexpr const char *kFaasColdstart = "faas.coldstart";
-
-/**
-  A string containing the schedule period as <a
-  href="https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm">Cron
-  Expression</a>.
- */
-static constexpr const char *kFaasCron = "faas.cron";
-
-/**
-  The name of the source on which the triggering operation was performed. For example, in Cloud
-  Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name.
- */
-static constexpr const char *kFaasDocumentCollection = "faas.document.collection";
-
-/**
-  The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the
-  name of the file, and in Cosmos DB the table name.
- */
-static constexpr const char *kFaasDocumentName = "faas.document.name";
-
-/**
-  Describes the type of the operation that was performed on the data.
- */
-static constexpr const char *kFaasDocumentOperation = "faas.document.operation";
-
-/**
-  A string containing the time when the data was accessed in the <a
-  href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
-  href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasDocumentTime = "faas.document.time";
-
-/**
-  The execution environment ID as a string, that will be potentially reused for other invocations to
-  the same function/function version. <ul> <li><strong>AWS Lambda:</strong> Use the (full) log
-  stream name.</li>
-  </ul>
- */
-static constexpr const char *kFaasInstance = "faas.instance";
-
-/**
-  The invocation ID of the current function invocation.
- */
-static constexpr const char *kFaasInvocationId = "faas.invocation_id";
-
-/**
-  The name of the invoked function.
-  <p>
-  SHOULD be equal to the @code faas.name @endcode resource attribute of the invoked function.
- */
-static constexpr const char *kFaasInvokedName = "faas.invoked_name";
-
-/**
-  The cloud provider of the invoked function.
-  <p>
-  SHOULD be equal to the @code cloud.provider @endcode resource attribute of the invoked function.
- */
-static constexpr const char *kFaasInvokedProvider = "faas.invoked_provider";
-
-/**
-  The cloud region of the invoked function.
-  <p>
-  SHOULD be equal to the @code cloud.region @endcode resource attribute of the invoked function.
- */
-static constexpr const char *kFaasInvokedRegion = "faas.invoked_region";
-
-/**
-  The amount of memory available to the serverless function converted to Bytes.
-  <p>
-  It's recommended to set this attribute since e.g. too little memory can easily stop a Java AWS
-  Lambda function from working correctly. On AWS Lambda, the environment variable @code
-  AWS_LAMBDA_FUNCTION_MEMORY_SIZE @endcode provides this information (which must be multiplied by
-  1,048,576).
- */
-static constexpr const char *kFaasMaxMemory = "faas.max_memory";
-
-/**
-  The name of the single function that this runtime instance executes.
-  <p>
-  This is the name of the function as configured/deployed on the FaaS
-  platform and is usually different from the name of the callback
-  function (which may be stored in the
-  <a href="/docs/general/attributes.md#source-code-attributes">@code code.namespace @endcode/@code
-  code.function.name @endcode</a> span attributes). <p> For some cloud providers, the above
-  definition is ambiguous. The following definition of function name MUST be used for this attribute
-  (and consequently the span name) for the listed cloud providers/products:
-  <ul>
-    <li><strong>Azure:</strong>  The full name @code <FUNCAPP>/<FUNC> @endcode, i.e., function app
-  name followed by a forward slash followed by the function name (this form can also be seen in the
-  resource JSON for the function). This means that a span attribute MUST be used, as an Azure
-  function app can host multiple functions that would usually share a TracerProvider (see also the
-  @code cloud.resource_id @endcode attribute).</li>
-  </ul>
- */
-static constexpr const char *kFaasName = "faas.name";
-
-/**
-  A string containing the function invocation time in the <a
-  href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
-  href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasTime = "faas.time";
-
-/**
-  Type of the trigger which caused this function invocation.
- */
-static constexpr const char *kFaasTrigger = "faas.trigger";
-
-/**
-  The immutable version of the function being executed.
-  <p>
-  Depending on the cloud provider and platform, use:
-  <ul>
-    <li><strong>AWS Lambda:</strong> The <a
-  href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function
-  version</a> (an integer represented as a decimal string).</li> <li><strong>Google Cloud Run
-  (Services):</strong> The <a
-  href="https://cloud.google.com/run/docs/managing/revisions">revision</a> (i.e., the function name
-  plus the revision suffix).</li> <li><strong>Google Cloud Functions:</strong> The value of the <a
-  href="https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically">@code
-  K_REVISION @endcode environment variable</a>.</li> <li><strong>Azure Functions:</strong> Not
-  applicable. Do not set this attribute.</li>
-  </ul>
- */
-static constexpr const char *kFaasVersion = "faas.version";
-
-namespace FaasDocumentOperationValues
-{
-/**
-  When a new object is created.
- */
-static constexpr const char *kInsert = "insert";
-
-/**
-  When an object is modified.
- */
-static constexpr const char *kEdit = "edit";
-
-/**
-  When an object is deleted.
- */
-static constexpr const char *kDelete = "delete";
-
-}  // namespace FaasDocumentOperationValues
-
-namespace FaasInvokedProviderValues
-{
-/**
-  Alibaba Cloud
- */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-
-/**
-  Amazon Web Services
- */
-static constexpr const char *kAws = "aws";
-
-/**
-  Microsoft Azure
- */
-static constexpr const char *kAzure = "azure";
-
-/**
-  Google Cloud Platform
- */
-static constexpr const char *kGcp = "gcp";
-
-/**
-  Tencent Cloud
- */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-
-}  // namespace FaasInvokedProviderValues
-
-namespace FaasTriggerValues
-{
-/**
-  A response to some data source operation such as a database or filesystem read/write
- */
-static constexpr const char *kDatasource = "datasource";
-
-/**
-  To provide an answer to an inbound HTTP request
- */
-static constexpr const char *kHttp = "http";
-
-/**
-  A function is set to be executed when messages are sent to a messaging system
- */
-static constexpr const char *kPubsub = "pubsub";
-
-/**
-  A function is scheduled to be executed regularly
- */
-static constexpr const char *kTimer = "timer";
-
-/**
-  If none of the others apply
- */
-static constexpr const char *kOther = "other";
-
-}  // namespace FaasTriggerValues
-
-}  // namespace faas
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/faas_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/faas_metrics.h
deleted file mode 100644
index 99888cde9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/faas_metrics.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace faas
-{
-
-/**
-  Number of invocation cold starts
-  <p>
-  counter
- */
-static constexpr const char *kMetricFaasColdstarts     = "faas.coldstarts";
-static constexpr const char *descrMetricFaasColdstarts = "Number of invocation cold starts";
-static constexpr const char *unitMetricFaasColdstarts  = "{coldstart}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                    unitMetricFaasColdstarts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                    unitMetricFaasColdstarts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                             unitMetricFaasColdstarts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricFaasColdstarts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                              unitMetricFaasColdstarts);
-}
-
-/**
-  Distribution of CPU usage per invocation
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasCpuUsage     = "faas.cpu_usage";
-static constexpr const char *descrMetricFaasCpuUsage = "Distribution of CPU usage per invocation";
-static constexpr const char *unitMetricFaasCpuUsage  = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
-                                      unitMetricFaasCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
-                                      unitMetricFaasCpuUsage);
-}
-
-/**
-  Number of invocation errors
-  <p>
-  counter
- */
-static constexpr const char *kMetricFaasErrors     = "faas.errors";
-static constexpr const char *descrMetricFaasErrors = "Number of invocation errors";
-static constexpr const char *unitMetricFaasErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasErrors, descrMetricFaasErrors, unitMetricFaasErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasErrors, descrMetricFaasErrors, unitMetricFaasErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasErrors, descrMetricFaasErrors,
-                                             unitMetricFaasErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasErrors, descrMetricFaasErrors,
-                                              unitMetricFaasErrors);
-}
-
-/**
-  Measures the duration of the function's initialization, such as a cold start
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasInitDuration = "faas.init_duration";
-static constexpr const char *descrMetricFaasInitDuration =
-    "Measures the duration of the function's initialization, such as a cold start";
-static constexpr const char *unitMetricFaasInitDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasInitDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
-                                      unitMetricFaasInitDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasInitDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
-                                      unitMetricFaasInitDuration);
-}
-
-/**
-  Number of successful invocations
-  <p>
-  counter
- */
-static constexpr const char *kMetricFaasInvocations     = "faas.invocations";
-static constexpr const char *descrMetricFaasInvocations = "Number of successful invocations";
-static constexpr const char *unitMetricFaasInvocations  = "{invocation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasInvocations(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                    unitMetricFaasInvocations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasInvocations(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                    unitMetricFaasInvocations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricFaasInvocations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                             unitMetricFaasInvocations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricFaasInvocations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                              unitMetricFaasInvocations);
-}
-
-/**
-  Measures the duration of the function's logic execution
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasInvokeDuration = "faas.invoke_duration";
-static constexpr const char *descrMetricFaasInvokeDuration =
-    "Measures the duration of the function's logic execution";
-static constexpr const char *unitMetricFaasInvokeDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricFaasInvokeDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration,
-                                      unitMetricFaasInvokeDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricFaasInvokeDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration,
-                                      unitMetricFaasInvokeDuration);
-}
-
-/**
-  Distribution of max memory usage per invocation
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasMemUsage = "faas.mem_usage";
-static constexpr const char *descrMetricFaasMemUsage =
-    "Distribution of max memory usage per invocation";
-static constexpr const char *unitMetricFaasMemUsage = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasMemUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
-                                      unitMetricFaasMemUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasMemUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
-                                      unitMetricFaasMemUsage);
-}
-
-/**
-  Distribution of net I/O usage per invocation
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasNetIo     = "faas.net_io";
-static constexpr const char *descrMetricFaasNetIo = "Distribution of net I/O usage per invocation";
-static constexpr const char *unitMetricFaasNetIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasNetIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasNetIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
-}
-
-/**
-  Number of invocation timeouts
-  <p>
-  counter
- */
-static constexpr const char *kMetricFaasTimeouts     = "faas.timeouts";
-static constexpr const char *descrMetricFaasTimeouts = "Number of invocation timeouts";
-static constexpr const char *unitMetricFaasTimeouts  = "{timeout}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                    unitMetricFaasTimeouts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                    unitMetricFaasTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                             unitMetricFaasTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                              unitMetricFaasTimeouts);
-}
-
-}  // namespace faas
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/feature_flag_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/feature_flag_attributes.h
deleted file mode 100644
index f80c0ad4c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/feature_flag_attributes.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace feature_flag
-{
-
-/**
-  The unique identifier for the flag evaluation context. For example, the targeting key.
- */
-static constexpr const char *kFeatureFlagContextId = "feature_flag.context.id";
-
-/**
-  Deprecated, use @code error.message @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code error.message @endcode.", "reason": "renamed", "renamed_to":
-  "error.message"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagEvaluationErrorMessage =
-    "feature_flag.evaluation.error.message";
-
-/**
-  Deprecated, use @code feature_flag.result.reason @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code feature_flag.result.reason @endcode.", "reason": "renamed",
-  "renamed_to": "feature_flag.result.reason"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagEvaluationReason =
-    "feature_flag.evaluation.reason";
-
-/**
-  The lookup key of the feature flag.
- */
-static constexpr const char *kFeatureFlagKey = "feature_flag.key";
-
-/**
-  Identifies the feature flag provider.
- */
-static constexpr const char *kFeatureFlagProviderName = "feature_flag.provider.name";
-
-/**
-  The reason code which shows how a feature flag value was determined.
- */
-static constexpr const char *kFeatureFlagResultReason = "feature_flag.result.reason";
-
-/**
-  The evaluated value of the feature flag.
-  <p>
-  With some feature flag providers, feature flag results can be quite large or contain private or
-  sensitive details. Because of this, @code feature_flag.result.variant @endcode is often the
-  preferred attribute if it is available. <p> It may be desirable to redact or otherwise limit the
-  size and scope of @code feature_flag.result.value @endcode if possible. Because the evaluated flag
-  value is unstructured and may be any type, it is left to the instrumentation author to determine
-  how best to achieve this.
- */
-static constexpr const char *kFeatureFlagResultValue = "feature_flag.result.value";
-
-/**
-  A semantic identifier for an evaluated flag value.
-  <p>
-  A semantic identifier, commonly referred to as a variant, provides a means
-  for referring to a value without including the value itself. This can
-  provide additional context for understanding the meaning behind a value.
-  For example, the variant @code red @endcode maybe be used for the value @code #c05543 @endcode.
- */
-static constexpr const char *kFeatureFlagResultVariant = "feature_flag.result.variant";
-
-/**
-  The identifier of the <a href="https://openfeature.dev/specification/glossary/#flag-set">flag
-  set</a> to which the feature flag belongs.
- */
-static constexpr const char *kFeatureFlagSetId = "feature_flag.set.id";
-
-/**
-  Deprecated, use @code feature_flag.result.variant @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code feature_flag.result.variant @endcode.", "reason": "renamed",
-  "renamed_to": "feature_flag.result.variant"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagVariant = "feature_flag.variant";
-
-/**
-  The version of the ruleset used during the evaluation. This may be any stable value which uniquely
-  identifies the ruleset.
- */
-static constexpr const char *kFeatureFlagVersion = "feature_flag.version";
-
-namespace FeatureFlagEvaluationReasonValues
-{
-/**
-  The resolved value is static (no dynamic evaluation).
- */
-static constexpr const char *kStatic = "static";
-
-/**
-  The resolved value fell back to a pre-configured value (no dynamic evaluation occurred or dynamic
-  evaluation yielded no result).
- */
-static constexpr const char *kDefault = "default";
-
-/**
-  The resolved value was the result of a dynamic evaluation, such as a rule or specific
-  user-targeting.
- */
-static constexpr const char *kTargetingMatch = "targeting_match";
-
-/**
-  The resolved value was the result of pseudorandom assignment.
- */
-static constexpr const char *kSplit = "split";
-
-/**
-  The resolved value was retrieved from cache.
- */
-static constexpr const char *kCached = "cached";
-
-/**
-  The resolved value was the result of the flag being disabled in the management system.
- */
-static constexpr const char *kDisabled = "disabled";
-
-/**
-  The reason for the resolved value could not be determined.
- */
-static constexpr const char *kUnknown = "unknown";
-
-/**
-  The resolved value is non-authoritative or possibly out of date
- */
-static constexpr const char *kStale = "stale";
-
-/**
-  The resolved value was the result of an error.
- */
-static constexpr const char *kError = "error";
-
-}  // namespace FeatureFlagEvaluationReasonValues
-
-namespace FeatureFlagResultReasonValues
-{
-/**
-  The resolved value is static (no dynamic evaluation).
- */
-static constexpr const char *kStatic = "static";
-
-/**
-  The resolved value fell back to a pre-configured value (no dynamic evaluation occurred or dynamic
-  evaluation yielded no result).
- */
-static constexpr const char *kDefault = "default";
-
-/**
-  The resolved value was the result of a dynamic evaluation, such as a rule or specific
-  user-targeting.
- */
-static constexpr const char *kTargetingMatch = "targeting_match";
-
-/**
-  The resolved value was the result of pseudorandom assignment.
- */
-static constexpr const char *kSplit = "split";
-
-/**
-  The resolved value was retrieved from cache.
- */
-static constexpr const char *kCached = "cached";
-
-/**
-  The resolved value was the result of the flag being disabled in the management system.
- */
-static constexpr const char *kDisabled = "disabled";
-
-/**
-  The reason for the resolved value could not be determined.
- */
-static constexpr const char *kUnknown = "unknown";
-
-/**
-  The resolved value is non-authoritative or possibly out of date
- */
-static constexpr const char *kStale = "stale";
-
-/**
-  The resolved value was the result of an error.
- */
-static constexpr const char *kError = "error";
-
-}  // namespace FeatureFlagResultReasonValues
-
-}  // namespace feature_flag
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/file_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/file_attributes.h
deleted file mode 100644
index 09d1b2c90..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/file_attributes.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace file
-{
-
-/**
-  Time when the file was last accessed, in ISO 8601 format.
-  <p>
-  This attribute might not be supported by some file systems — NFS, FAT32, in embedded OS, etc.
- */
-static constexpr const char *kFileAccessed = "file.accessed";
-
-/**
-  Array of file attributes.
-  <p>
-  Attributes names depend on the OS or file system. Here’s a non-exhaustive list of values expected
-  for this attribute: @code archive @endcode, @code compressed @endcode, @code directory @endcode,
-  @code encrypted @endcode, @code execute @endcode, @code hidden @endcode, @code immutable @endcode,
-  @code journaled @endcode, @code read @endcode, @code readonly @endcode, @code symbolic link
-  @endcode, @code system @endcode, @code temporary @endcode, @code write @endcode.
- */
-static constexpr const char *kFileAttributes = "file.attributes";
-
-/**
-  Time when the file attributes or metadata was last changed, in ISO 8601 format.
-  <p>
-  @code file.changed @endcode captures the time when any of the file's properties or attributes
-  (including the content) are changed, while @code file.modified @endcode captures the timestamp
-  when the file content is modified.
- */
-static constexpr const char *kFileChanged = "file.changed";
-
-/**
-  Time when the file was created, in ISO 8601 format.
-  <p>
-  This attribute might not be supported by some file systems — NFS, FAT32, in embedded OS, etc.
- */
-static constexpr const char *kFileCreated = "file.created";
-
-/**
-  Directory where the file is located. It should include the drive letter, when appropriate.
- */
-static constexpr const char *kFileDirectory = "file.directory";
-
-/**
-  File extension, excluding the leading dot.
-  <p>
-  When the file name has multiple extensions (example.tar.gz), only the last one should be captured
-  ("gz", not "tar.gz").
- */
-static constexpr const char *kFileExtension = "file.extension";
-
-/**
-  Name of the fork. A fork is additional data associated with a filesystem object.
-  <p>
-  On Linux, a resource fork is used to store additional data with a filesystem object. A file always
-  has at least one fork for the data portion, and additional forks may exist. On NTFS, this is
-  analogous to an Alternate Data Stream (ADS), and the default data stream for a file is just called
-  $DATA. Zone.Identifier is commonly used by Windows to track contents downloaded from the Internet.
-  An ADS is typically of the form: C:\path\to\filename.extension:some_fork_name, and some_fork_name
-  is the value that should populate @code fork_name @endcode. @code filename.extension @endcode
-  should populate @code file.name @endcode, and @code extension @endcode should populate @code
-  file.extension @endcode. The full path, @code file.path @endcode, will include the fork name.
- */
-static constexpr const char *kFileForkName = "file.fork_name";
-
-/**
-  Primary Group ID (GID) of the file.
- */
-static constexpr const char *kFileGroupId = "file.group.id";
-
-/**
-  Primary group name of the file.
- */
-static constexpr const char *kFileGroupName = "file.group.name";
-
-/**
-  Inode representing the file in the filesystem.
- */
-static constexpr const char *kFileInode = "file.inode";
-
-/**
-  Mode of the file in octal representation.
- */
-static constexpr const char *kFileMode = "file.mode";
-
-/**
-  Time when the file content was last modified, in ISO 8601 format.
- */
-static constexpr const char *kFileModified = "file.modified";
-
-/**
-  Name of the file including the extension, without the directory.
- */
-static constexpr const char *kFileName = "file.name";
-
-/**
-  The user ID (UID) or security identifier (SID) of the file owner.
- */
-static constexpr const char *kFileOwnerId = "file.owner.id";
-
-/**
-  Username of the file owner.
- */
-static constexpr const char *kFileOwnerName = "file.owner.name";
-
-/**
-  Full path to the file, including the file name. It should include the drive letter, when
-  appropriate.
- */
-static constexpr const char *kFilePath = "file.path";
-
-/**
-  File size in bytes.
- */
-static constexpr const char *kFileSize = "file.size";
-
-/**
-  Path to the target of a symbolic link.
-  <p>
-  This attribute is only applicable to symbolic links.
- */
-static constexpr const char *kFileSymbolicLinkTargetPath = "file.symbolic_link.target_path";
-
-}  // namespace file
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gcp_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gcp_attributes.h
deleted file mode 100644
index 7be353eb7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gcp_attributes.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace gcp
-{
-
-/**
-  The container within GCP where the AppHub application is defined.
- */
-static constexpr const char *kGcpApphubApplicationContainer = "gcp.apphub.application.container";
-
-/**
-  The name of the application as configured in AppHub.
- */
-static constexpr const char *kGcpApphubApplicationId = "gcp.apphub.application.id";
-
-/**
-  The GCP zone or region where the application is defined.
- */
-static constexpr const char *kGcpApphubApplicationLocation = "gcp.apphub.application.location";
-
-/**
-  Criticality of a service indicates its importance to the business.
-  <p>
-  <a href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type">See AppHub type
-  enum</a>
- */
-static constexpr const char *kGcpApphubServiceCriticalityType =
-    "gcp.apphub.service.criticality_type";
-
-/**
-  Environment of a service is the stage of a software lifecycle.
-  <p>
-  <a href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type_1">See AppHub
-  environment type</a>
- */
-static constexpr const char *kGcpApphubServiceEnvironmentType =
-    "gcp.apphub.service.environment_type";
-
-/**
-  The name of the service as configured in AppHub.
- */
-static constexpr const char *kGcpApphubServiceId = "gcp.apphub.service.id";
-
-/**
-  Criticality of a workload indicates its importance to the business.
-  <p>
-  <a href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type">See AppHub type
-  enum</a>
- */
-static constexpr const char *kGcpApphubWorkloadCriticalityType =
-    "gcp.apphub.workload.criticality_type";
-
-/**
-  Environment of a workload is the stage of a software lifecycle.
-  <p>
-  <a href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type_1">See AppHub
-  environment type</a>
- */
-static constexpr const char *kGcpApphubWorkloadEnvironmentType =
-    "gcp.apphub.workload.environment_type";
-
-/**
-  The name of the workload as configured in AppHub.
- */
-static constexpr const char *kGcpApphubWorkloadId = "gcp.apphub.workload.id";
-
-/**
-  Identifies the Google Cloud service for which the official client library is intended.
-  <p>
-  Intended to be a stable identifier for Google Cloud client libraries that is uniform across
-  implementation languages. The value should be derived from the canonical service domain for the
-  service; for example, 'foo.googleapis.com' should result in a value of 'foo'.
- */
-static constexpr const char *kGcpClientService = "gcp.client.service";
-
-/**
-  The name of the Cloud Run <a
-  href="https://cloud.google.com/run/docs/managing/job-executions">execution</a> being run for the
-  Job, as set by the <a
-  href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">@code
-  CLOUD_RUN_EXECUTION @endcode</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobExecution = "gcp.cloud_run.job.execution";
-
-/**
-  The index for a task within an execution as provided by the <a
-  href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">@code
-  CLOUD_RUN_TASK_INDEX @endcode</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobTaskIndex = "gcp.cloud_run.job.task_index";
-
-/**
-  The hostname of a GCE instance. This is the full value of the default or <a
-  href="https://cloud.google.com/compute/docs/instances/custom-hostname-vm">custom hostname</a>.
- */
-static constexpr const char *kGcpGceInstanceHostname = "gcp.gce.instance.hostname";
-
-/**
-  The instance name of a GCE instance. This is the value provided by @code host.name @endcode, the
-  visible name of the instance in the Cloud Console UI, and the prefix for the default hostname of
-  the instance as defined by the <a
-  href="https://cloud.google.com/compute/docs/internal-dns#instance-fully-qualified-domain-names">default
-  internal DNS name</a>.
- */
-static constexpr const char *kGcpGceInstanceName = "gcp.gce.instance.name";
-
-namespace GcpApphubServiceCriticalityTypeValues
-{
-/**
-  Mission critical service.
- */
-static constexpr const char *kMissionCritical = "MISSION_CRITICAL";
-
-/**
-  High impact.
- */
-static constexpr const char *kHigh = "HIGH";
-
-/**
-  Medium impact.
- */
-static constexpr const char *kMedium = "MEDIUM";
-
-/**
-  Low impact.
- */
-static constexpr const char *kLow = "LOW";
-
-}  // namespace GcpApphubServiceCriticalityTypeValues
-
-namespace GcpApphubServiceEnvironmentTypeValues
-{
-/**
-  Production environment.
- */
-static constexpr const char *kProduction = "PRODUCTION";
-
-/**
-  Staging environment.
- */
-static constexpr const char *kStaging = "STAGING";
-
-/**
-  Test environment.
- */
-static constexpr const char *kTest = "TEST";
-
-/**
-  Development environment.
- */
-static constexpr const char *kDevelopment = "DEVELOPMENT";
-
-}  // namespace GcpApphubServiceEnvironmentTypeValues
-
-namespace GcpApphubWorkloadCriticalityTypeValues
-{
-/**
-  Mission critical service.
- */
-static constexpr const char *kMissionCritical = "MISSION_CRITICAL";
-
-/**
-  High impact.
- */
-static constexpr const char *kHigh = "HIGH";
-
-/**
-  Medium impact.
- */
-static constexpr const char *kMedium = "MEDIUM";
-
-/**
-  Low impact.
- */
-static constexpr const char *kLow = "LOW";
-
-}  // namespace GcpApphubWorkloadCriticalityTypeValues
-
-namespace GcpApphubWorkloadEnvironmentTypeValues
-{
-/**
-  Production environment.
- */
-static constexpr const char *kProduction = "PRODUCTION";
-
-/**
-  Staging environment.
- */
-static constexpr const char *kStaging = "STAGING";
-
-/**
-  Test environment.
- */
-static constexpr const char *kTest = "TEST";
-
-/**
-  Development environment.
- */
-static constexpr const char *kDevelopment = "DEVELOPMENT";
-
-}  // namespace GcpApphubWorkloadEnvironmentTypeValues
-
-}  // namespace gcp
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
deleted file mode 100644
index 32ece010a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace gen_ai
-{
-
-/**
-  Free-form description of the GenAI agent provided by the application.
- */
-static constexpr const char *kGenAiAgentDescription = "gen_ai.agent.description";
-
-/**
-  The unique identifier of the GenAI agent.
- */
-static constexpr const char *kGenAiAgentId = "gen_ai.agent.id";
-
-/**
-  Human-readable name of the GenAI agent provided by the application.
- */
-static constexpr const char *kGenAiAgentName = "gen_ai.agent.name";
-
-/**
-  Deprecated, use Event API to report completions contents.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiCompletion = "gen_ai.completion";
-
-/**
-  The unique identifier for a conversation (session, thread), used to store and correlate messages
-  within this conversation.
- */
-static constexpr const char *kGenAiConversationId = "gen_ai.conversation.id";
-
-/**
-  The data source identifier.
-  <p>
-  Data sources are used by AI agents and RAG applications to store grounding data. A data source may
-  be an external database, object store, document collection, website, or any other storage system
-  used by the GenAI agent or application. The @code gen_ai.data_source.id @endcode SHOULD match the
-  identifier used by the GenAI system rather than a name specific to the external storage, such as a
-  database or object store. Semantic conventions referencing @code gen_ai.data_source.id @endcode
-  MAY also leverage additional attributes, such as @code db.* @endcode, to further identify and
-  describe the data source.
- */
-static constexpr const char *kGenAiDataSourceId = "gen_ai.data_source.id";
-
-/**
-  Deprecated, use @code gen_ai.output.type @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code gen_ai.output.type @endcode.", "reason": "renamed", "renamed_to":
-  "gen_ai.output.type"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiOpenaiRequestResponseFormat =
-    "gen_ai.openai.request.response_format";
-
-/**
-  Deprecated, use @code gen_ai.request.seed @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code gen_ai.request.seed @endcode.", "reason": "renamed", "renamed_to":
-  "gen_ai.request.seed"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiOpenaiRequestSeed =
-    "gen_ai.openai.request.seed";
-
-/**
-  The service tier requested. May be a specific tier, default, or auto.
- */
-static constexpr const char *kGenAiOpenaiRequestServiceTier = "gen_ai.openai.request.service_tier";
-
-/**
-  The service tier used for the response.
- */
-static constexpr const char *kGenAiOpenaiResponseServiceTier =
-    "gen_ai.openai.response.service_tier";
-
-/**
-  A fingerprint to track any eventual change in the Generative AI environment.
- */
-static constexpr const char *kGenAiOpenaiResponseSystemFingerprint =
-    "gen_ai.openai.response.system_fingerprint";
-
-/**
-  The name of the operation being performed.
-  <p>
-  If one of the predefined values applies, but specific system uses a different name it's
-  RECOMMENDED to document it in the semantic conventions for specific GenAI system and use
-  system-specific name in the instrumentation. If a different name is not documented,
-  instrumentation libraries SHOULD use applicable predefined value.
- */
-static constexpr const char *kGenAiOperationName = "gen_ai.operation.name";
-
-/**
-  Represents the content type requested by the client.
-  <p>
-  This attribute SHOULD be used when the client requests output of a specific type. The model may
-  return zero or more outputs of this type. This attribute specifies the output modality and not the
-  actual output format. For example, if an image is requested, the actual output could be a URL
-  pointing to an image file. Additional output format details may be recorded in the future in the
-  @code gen_ai.output.{type}.* @endcode attributes.
- */
-static constexpr const char *kGenAiOutputType = "gen_ai.output.type";
-
-/**
-  Deprecated, use Event API to report prompt contents.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiPrompt = "gen_ai.prompt";
-
-/**
-  The target number of candidate completions to return.
- */
-static constexpr const char *kGenAiRequestChoiceCount = "gen_ai.request.choice.count";
-
-/**
-  The encoding formats requested in an embeddings operation, if specified.
-  <p>
-  In some GenAI systems the encoding formats are called embedding types. Also, some GenAI systems
-  only accept a single format per request.
- */
-static constexpr const char *kGenAiRequestEncodingFormats = "gen_ai.request.encoding_formats";
-
-/**
-  The frequency penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestFrequencyPenalty = "gen_ai.request.frequency_penalty";
-
-/**
-  The maximum number of tokens the model generates for a request.
- */
-static constexpr const char *kGenAiRequestMaxTokens = "gen_ai.request.max_tokens";
-
-/**
-  The name of the GenAI model a request is being made to.
- */
-static constexpr const char *kGenAiRequestModel = "gen_ai.request.model";
-
-/**
-  The presence penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestPresencePenalty = "gen_ai.request.presence_penalty";
-
-/**
-  Requests with same seed value more likely to return same result.
- */
-static constexpr const char *kGenAiRequestSeed = "gen_ai.request.seed";
-
-/**
-  List of sequences that the model will use to stop generating further tokens.
- */
-static constexpr const char *kGenAiRequestStopSequences = "gen_ai.request.stop_sequences";
-
-/**
-  The temperature setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTemperature = "gen_ai.request.temperature";
-
-/**
-  The top_k sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopK = "gen_ai.request.top_k";
-
-/**
-  The top_p sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopP = "gen_ai.request.top_p";
-
-/**
-  Array of reasons the model stopped generating tokens, corresponding to each generation received.
- */
-static constexpr const char *kGenAiResponseFinishReasons = "gen_ai.response.finish_reasons";
-
-/**
-  The unique identifier for the completion.
- */
-static constexpr const char *kGenAiResponseId = "gen_ai.response.id";
-
-/**
-  The name of the model that generated the response.
- */
-static constexpr const char *kGenAiResponseModel = "gen_ai.response.model";
-
-/**
-  The Generative AI product as identified by the client or server instrumentation.
-  <p>
-  The @code gen_ai.system @endcode describes a family of GenAI models with specific model identified
-  by @code gen_ai.request.model @endcode and @code gen_ai.response.model @endcode attributes.
-  <p>
-  The actual GenAI product may differ from the one identified by the client.
-  Multiple systems, including Azure OpenAI and Gemini, are accessible by OpenAI client
-  libraries. In such cases, the @code gen_ai.system @endcode is set to @code openai @endcode based
-  on the instrumentation's best knowledge, instead of the actual system. The @code server.address
-  @endcode attribute may help identify the actual system in use for @code openai @endcode. <p> For
-  custom model, a custom friendly name SHOULD be used. If none of these options apply, the @code
-  gen_ai.system @endcode SHOULD be set to @code _OTHER @endcode.
- */
-static constexpr const char *kGenAiSystem = "gen_ai.system";
-
-/**
-  The type of token being counted.
- */
-static constexpr const char *kGenAiTokenType = "gen_ai.token.type";
-
-/**
-  The tool call identifier.
- */
-static constexpr const char *kGenAiToolCallId = "gen_ai.tool.call.id";
-
-/**
-  The tool description.
- */
-static constexpr const char *kGenAiToolDescription = "gen_ai.tool.description";
-
-/**
-  Name of the tool utilized by the agent.
- */
-static constexpr const char *kGenAiToolName = "gen_ai.tool.name";
-
-/**
-  Type of the tool utilized by the agent
-  <p>
-  Extension: A tool executed on the agent-side to directly call external APIs, bridging the gap
-  between the agent and real-world systems. Agent-side operations involve actions that are performed
-  by the agent on the server or within the agent's controlled environment. Function: A tool executed
-  on the client-side, where the agent generates parameters for a predefined function, and the client
-  executes the logic. Client-side operations are actions taken on the user's end or within the
-  client application. Datastore: A tool used by the agent to access and query structured or
-  unstructured external data for retrieval-augmented tasks or knowledge updates.
- */
-static constexpr const char *kGenAiToolType = "gen_ai.tool.type";
-
-/**
-  Deprecated, use @code gen_ai.usage.output_tokens @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code gen_ai.usage.output_tokens @endcode.", "reason": "renamed",
-  "renamed_to": "gen_ai.usage.output_tokens"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens =
-    "gen_ai.usage.completion_tokens";
-
-/**
-  The number of tokens used in the GenAI input (prompt).
- */
-static constexpr const char *kGenAiUsageInputTokens = "gen_ai.usage.input_tokens";
-
-/**
-  The number of tokens used in the GenAI response (completion).
- */
-static constexpr const char *kGenAiUsageOutputTokens = "gen_ai.usage.output_tokens";
-
-/**
-  Deprecated, use @code gen_ai.usage.input_tokens @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code gen_ai.usage.input_tokens @endcode.", "reason": "renamed",
-  "renamed_to": "gen_ai.usage.input_tokens"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens =
-    "gen_ai.usage.prompt_tokens";
-
-namespace GenAiOpenaiRequestResponseFormatValues
-{
-/**
-  Text response format
- */
-static constexpr const char *kText = "text";
-
-/**
-  JSON object response format
- */
-static constexpr const char *kJsonObject = "json_object";
-
-/**
-  JSON schema response format
- */
-static constexpr const char *kJsonSchema = "json_schema";
-
-}  // namespace GenAiOpenaiRequestResponseFormatValues
-
-namespace GenAiOpenaiRequestServiceTierValues
-{
-/**
-  The system will utilize scale tier credits until they are exhausted.
- */
-static constexpr const char *kAuto = "auto";
-
-/**
-  The system will utilize the default scale tier.
- */
-static constexpr const char *kDefault = "default";
-
-}  // namespace GenAiOpenaiRequestServiceTierValues
-
-namespace GenAiOperationNameValues
-{
-/**
-  Chat completion operation such as <a
-  href="https://platform.openai.com/docs/api-reference/chat">OpenAI Chat API</a>
- */
-static constexpr const char *kChat = "chat";
-
-/**
-  Multimodal content generation operation such as <a
-  href="https://ai.google.dev/api/generate-content">Gemini Generate Content</a>
- */
-static constexpr const char *kGenerateContent = "generate_content";
-
-/**
-  Text completions operation such as <a
-  href="https://platform.openai.com/docs/api-reference/completions">OpenAI Completions API
-  (Legacy)</a>
- */
-static constexpr const char *kTextCompletion = "text_completion";
-
-/**
-  Embeddings operation such as <a
-  href="https://platform.openai.com/docs/api-reference/embeddings/create">OpenAI Create embeddings
-  API</a>
- */
-static constexpr const char *kEmbeddings = "embeddings";
-
-/**
-  Create GenAI agent
- */
-static constexpr const char *kCreateAgent = "create_agent";
-
-/**
-  Invoke GenAI agent
- */
-static constexpr const char *kInvokeAgent = "invoke_agent";
-
-/**
-  Execute a tool
- */
-static constexpr const char *kExecuteTool = "execute_tool";
-
-}  // namespace GenAiOperationNameValues
-
-namespace GenAiOutputTypeValues
-{
-/**
-  Plain text
- */
-static constexpr const char *kText = "text";
-
-/**
-  JSON object with known or unknown schema
- */
-static constexpr const char *kJson = "json";
-
-/**
-  Image
- */
-static constexpr const char *kImage = "image";
-
-/**
-  Speech
- */
-static constexpr const char *kSpeech = "speech";
-
-}  // namespace GenAiOutputTypeValues
-
-namespace GenAiSystemValues
-{
-/**
-  OpenAI
- */
-static constexpr const char *kOpenai = "openai";
-
-/**
-  Any Google generative AI endpoint
- */
-static constexpr const char *kGcpGenAi = "gcp.gen_ai";
-
-/**
-  Vertex AI
- */
-static constexpr const char *kGcpVertexAi = "gcp.vertex_ai";
-
-/**
-  Gemini
- */
-static constexpr const char *kGcpGemini = "gcp.gemini";
-
-/**
-  Vertex AI
- */
-static constexpr const char *kVertexAi = "vertex_ai";
-
-/**
-  Gemini
- */
-static constexpr const char *kGemini = "gemini";
-
-/**
-  Anthropic
- */
-static constexpr const char *kAnthropic = "anthropic";
-
-/**
-  Cohere
- */
-static constexpr const char *kCohere = "cohere";
-
-/**
-  Azure AI Inference
- */
-static constexpr const char *kAzAiInference = "az.ai.inference";
-
-/**
-  Azure OpenAI
- */
-static constexpr const char *kAzAiOpenai = "az.ai.openai";
-
-/**
-  IBM Watsonx AI
- */
-static constexpr const char *kIbmWatsonxAi = "ibm.watsonx.ai";
-
-/**
-  AWS Bedrock
- */
-static constexpr const char *kAwsBedrock = "aws.bedrock";
-
-/**
-  Perplexity
- */
-static constexpr const char *kPerplexity = "perplexity";
-
-/**
-  xAI
- */
-static constexpr const char *kXai = "xai";
-
-/**
-  DeepSeek
- */
-static constexpr const char *kDeepseek = "deepseek";
-
-/**
-  Groq
- */
-static constexpr const char *kGroq = "groq";
-
-/**
-  Mistral AI
- */
-static constexpr const char *kMistralAi = "mistral_ai";
-
-}  // namespace GenAiSystemValues
-
-namespace GenAiTokenTypeValues
-{
-/**
-  Input tokens (prompt, input, etc.)
- */
-static constexpr const char *kInput = "input";
-
-/**
-  Output tokens (completion, response, etc.)
- */
-static constexpr const char *kCompletion = "output";
-
-/**
-  Output tokens (completion, response, etc.)
- */
-static constexpr const char *kOutput = "output";
-
-}  // namespace GenAiTokenTypeValues
-
-}  // namespace gen_ai
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gen_ai_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gen_ai_metrics.h
deleted file mode 100644
index 2cd11bd54..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/gen_ai_metrics.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace gen_ai
-{
-
-/**
-  GenAI operation duration
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiClientOperationDuration =
-    "gen_ai.client.operation.duration";
-static constexpr const char *descrMetricGenAiClientOperationDuration = "GenAI operation duration";
-static constexpr const char *unitMetricGenAiClientOperationDuration  = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiClientOperationDuration,
-                                      descrMetricGenAiClientOperationDuration,
-                                      unitMetricGenAiClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiClientOperationDuration,
-                                      descrMetricGenAiClientOperationDuration,
-                                      unitMetricGenAiClientOperationDuration);
-}
-
-/**
-  Measures number of input and output tokens used
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiClientTokenUsage = "gen_ai.client.token.usage";
-static constexpr const char *descrMetricGenAiClientTokenUsage =
-    "Measures number of input and output tokens used";
-static constexpr const char *unitMetricGenAiClientTokenUsage = "{token}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiClientTokenUsage(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiClientTokenUsage,
-                                      descrMetricGenAiClientTokenUsage,
-                                      unitMetricGenAiClientTokenUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiClientTokenUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiClientTokenUsage,
-                                      descrMetricGenAiClientTokenUsage,
-                                      unitMetricGenAiClientTokenUsage);
-}
-
-/**
-  Generative AI server request duration such as time-to-last byte or last output token
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiServerRequestDuration = "gen_ai.server.request.duration";
-static constexpr const char *descrMetricGenAiServerRequestDuration =
-    "Generative AI server request duration such as time-to-last byte or last output token";
-static constexpr const char *unitMetricGenAiServerRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerRequestDuration,
-                                      descrMetricGenAiServerRequestDuration,
-                                      unitMetricGenAiServerRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerRequestDuration,
-                                      descrMetricGenAiServerRequestDuration,
-                                      unitMetricGenAiServerRequestDuration);
-}
-
-/**
-  Time per output token generated after the first token for successful responses
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiServerTimePerOutputToken =
-    "gen_ai.server.time_per_output_token";
-static constexpr const char *descrMetricGenAiServerTimePerOutputToken =
-    "Time per output token generated after the first token for successful responses";
-static constexpr const char *unitMetricGenAiServerTimePerOutputToken = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerTimePerOutputToken(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerTimePerOutputToken,
-                                      descrMetricGenAiServerTimePerOutputToken,
-                                      unitMetricGenAiServerTimePerOutputToken);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerTimePerOutputToken(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerTimePerOutputToken,
-                                      descrMetricGenAiServerTimePerOutputToken,
-                                      unitMetricGenAiServerTimePerOutputToken);
-}
-
-/**
-  Time to generate first token for successful responses
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiServerTimeToFirstToken =
-    "gen_ai.server.time_to_first_token";
-static constexpr const char *descrMetricGenAiServerTimeToFirstToken =
-    "Time to generate first token for successful responses";
-static constexpr const char *unitMetricGenAiServerTimeToFirstToken = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerTimeToFirstToken(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerTimeToFirstToken,
-                                      descrMetricGenAiServerTimeToFirstToken,
-                                      unitMetricGenAiServerTimeToFirstToken);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerTimeToFirstToken(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerTimeToFirstToken,
-                                      descrMetricGenAiServerTimeToFirstToken,
-                                      unitMetricGenAiServerTimeToFirstToken);
-}
-
-}  // namespace gen_ai
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/geo_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/geo_attributes.h
deleted file mode 100644
index 9f19fcc9e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/geo_attributes.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace geo
-{
-
-/**
-  Two-letter code representing continent’s name.
- */
-static constexpr const char *kGeoContinentCode = "geo.continent.code";
-
-/**
-  Two-letter ISO Country Code (<a href="https://wikipedia.org/wiki/ISO_3166-1#Codes">ISO 3166-1
-  alpha2</a>).
- */
-static constexpr const char *kGeoCountryIsoCode = "geo.country.iso_code";
-
-/**
-  Locality name. Represents the name of a city, town, village, or similar populated place.
- */
-static constexpr const char *kGeoLocalityName = "geo.locality.name";
-
-/**
-  Latitude of the geo location in <a
-  href="https://wikipedia.org/wiki/World_Geodetic_System#WGS84">WGS84</a>.
- */
-static constexpr const char *kGeoLocationLat = "geo.location.lat";
-
-/**
-  Longitude of the geo location in <a
-  href="https://wikipedia.org/wiki/World_Geodetic_System#WGS84">WGS84</a>.
- */
-static constexpr const char *kGeoLocationLon = "geo.location.lon";
-
-/**
-  Postal code associated with the location. Values appropriate for this field may also be known as a
-  postcode or ZIP code and will vary widely from country to country.
- */
-static constexpr const char *kGeoPostalCode = "geo.postal_code";
-
-/**
-  Region ISO code (<a href="https://wikipedia.org/wiki/ISO_3166-2">ISO 3166-2</a>).
- */
-static constexpr const char *kGeoRegionIsoCode = "geo.region.iso_code";
-
-namespace GeoContinentCodeValues
-{
-/**
-  Africa
- */
-static constexpr const char *kAf = "AF";
-
-/**
-  Antarctica
- */
-static constexpr const char *kAn = "AN";
-
-/**
-  Asia
- */
-static constexpr const char *kAs = "AS";
-
-/**
-  Europe
- */
-static constexpr const char *kEu = "EU";
-
-/**
-  North America
- */
-static constexpr const char *kNa = "NA";
-
-/**
-  Oceania
- */
-static constexpr const char *kOc = "OC";
-
-/**
-  South America
- */
-static constexpr const char *kSa = "SA";
-
-}  // namespace GeoContinentCodeValues
-
-}  // namespace geo
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/graphql_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/graphql_attributes.h
deleted file mode 100644
index d442704dd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/graphql_attributes.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace graphql
-{
-
-/**
-  The GraphQL document being executed.
-  <p>
-  The value may be sanitized to exclude sensitive information.
- */
-static constexpr const char *kGraphqlDocument = "graphql.document";
-
-/**
-  The name of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationName = "graphql.operation.name";
-
-/**
-  The type of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationType = "graphql.operation.type";
-
-namespace GraphqlOperationTypeValues
-{
-/**
-  GraphQL query
- */
-static constexpr const char *kQuery = "query";
-
-/**
-  GraphQL mutation
- */
-static constexpr const char *kMutation = "mutation";
-
-/**
-  GraphQL subscription
- */
-static constexpr const char *kSubscription = "subscription";
-
-}  // namespace GraphqlOperationTypeValues
-
-}  // namespace graphql
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/heroku_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/heroku_attributes.h
deleted file mode 100644
index 4bba1ec2c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/heroku_attributes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace heroku
-{
-
-/**
-  Unique identifier for the application
- */
-static constexpr const char *kHerokuAppId = "heroku.app.id";
-
-/**
-  Commit hash for the current release
- */
-static constexpr const char *kHerokuReleaseCommit = "heroku.release.commit";
-
-/**
-  Time and date the release was created
- */
-static constexpr const char *kHerokuReleaseCreationTimestamp = "heroku.release.creation_timestamp";
-
-}  // namespace heroku
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/host_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/host_attributes.h
deleted file mode 100644
index 5d1ca93e2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/host_attributes.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace host
-{
-
-/**
-  The CPU architecture the host system is running on.
- */
-static constexpr const char *kHostArch = "host.arch";
-
-/**
-  The amount of level 2 memory cache available to the processor (in Bytes).
- */
-static constexpr const char *kHostCpuCacheL2Size = "host.cpu.cache.l2.size";
-
-/**
-  Family or generation of the CPU.
- */
-static constexpr const char *kHostCpuFamily = "host.cpu.family";
-
-/**
-  Model identifier. It provides more granular information about the CPU, distinguishing it from
-  other CPUs within the same family.
- */
-static constexpr const char *kHostCpuModelId = "host.cpu.model.id";
-
-/**
-  Model designation of the processor.
- */
-static constexpr const char *kHostCpuModelName = "host.cpu.model.name";
-
-/**
-  Stepping or core revisions.
- */
-static constexpr const char *kHostCpuStepping = "host.cpu.stepping";
-
-/**
-  Processor manufacturer identifier. A maximum 12-character string.
-  <p>
-  <a href="https://wiki.osdev.org/CPUID">CPUID</a> command returns the vendor ID string in EBX, EDX
-  and ECX registers. Writing these to memory in this order results in a 12-character string.
- */
-static constexpr const char *kHostCpuVendorId = "host.cpu.vendor.id";
-
-/**
-  Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For
-  non-containerized systems, this should be the @code machine-id @endcode. See the table below for
-  the sources to use to determine the @code machine-id @endcode based on operating system.
- */
-static constexpr const char *kHostId = "host.id";
-
-/**
-  VM image ID or host OS image ID. For Cloud, this value is from the provider.
- */
-static constexpr const char *kHostImageId = "host.image.id";
-
-/**
-  Name of the VM image or OS install the host was instantiated from.
- */
-static constexpr const char *kHostImageName = "host.image.name";
-
-/**
-  The version string of the VM image or host OS as defined in <a
-  href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kHostImageVersion = "host.image.version";
-
-/**
-  Available IP addresses of the host, excluding loopback interfaces.
-  <p>
-  IPv4 Addresses MUST be specified in dotted-quad notation. IPv6 addresses MUST be specified in the
-  <a href="https://www.rfc-editor.org/rfc/rfc5952.html">RFC 5952</a> format.
- */
-static constexpr const char *kHostIp = "host.ip";
-
-/**
-  Available MAC addresses of the host, excluding loopback interfaces.
-  <p>
-  MAC Addresses MUST be represented in <a
-  href="https://standards.ieee.org/wp-content/uploads/import/documents/tutorials/eui.pdf">IEEE RA
-  hexadecimal form</a>: as hyphen-separated octets in uppercase hexadecimal form from most to least
-  significant.
- */
-static constexpr const char *kHostMac = "host.mac";
-
-/**
-  Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully
-  qualified hostname, or another name specified by the user.
- */
-static constexpr const char *kHostName = "host.name";
-
-/**
-  Type of host. For Cloud, this must be the machine type.
- */
-static constexpr const char *kHostType = "host.type";
-
-namespace HostArchValues
-{
-/**
-  AMD64
- */
-static constexpr const char *kAmd64 = "amd64";
-
-/**
-  ARM32
- */
-static constexpr const char *kArm32 = "arm32";
-
-/**
-  ARM64
- */
-static constexpr const char *kArm64 = "arm64";
-
-/**
-  Itanium
- */
-static constexpr const char *kIa64 = "ia64";
-
-/**
-  32-bit PowerPC
- */
-static constexpr const char *kPpc32 = "ppc32";
-
-/**
-  64-bit PowerPC
- */
-static constexpr const char *kPpc64 = "ppc64";
-
-/**
-  IBM z/Architecture
- */
-static constexpr const char *kS390x = "s390x";
-
-/**
-  32-bit x86
- */
-static constexpr const char *kX86 = "x86";
-
-}  // namespace HostArchValues
-
-}  // namespace host
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/http_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/http_attributes.h
deleted file mode 100644
index c9c42ad6e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/http_attributes.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace http
-{
-
-/**
-  Deprecated, use @code client.address @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code client.address @endcode.", "reason": "renamed", "renamed_to":
-  "client.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip";
-
-/**
-  State of the HTTP connection in the HTTP connection pool.
- */
-static constexpr const char *kHttpConnectionState = "http.connection.state";
-
-/**
-  Deprecated, use @code network.protocol.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "renamed", "renamed_to":
-  "network.protocol.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
-
-/**
-  Deprecated, use one of @code server.address @endcode, @code client.address @endcode or @code
-  http.request.header.host @endcode instead, depending on the usage.
-
-  @deprecated
-  {"note": "Replaced by one of @code server.address @endcode, @code client.address @endcode or @code
-  http.request.header.host @endcode, depending on the usage.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host";
-
-/**
-  Deprecated, use @code http.request.method @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.request.method @endcode.", "reason": "renamed", "renamed_to":
-  "http.request.method"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method";
-
-/**
-  The size of the request payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpRequestBodySize = "http.request.body.size";
-
-/**
-  HTTP request headers, @code <key> @endcode being the normalized HTTP Header name (lowercase), the
-  value being the header values. <p> Instrumentations SHOULD require an explicit configuration of
-  which headers are to be captured. Including all request headers can be a security risk - explicit
-  configuration helps avoid leaking sensitive information. <p> The @code User-Agent @endcode header
-  is already captured in the @code user_agent.original @endcode attribute. Users MAY explicitly
-  configure instrumentations to capture them even though it is not recommended. <p> The attribute
-  value MUST consist of either multiple header values as an array of strings or a single-item array
-  containing a possibly comma-concatenated string, depending on the way the HTTP library provides
-  access to headers. <p> Examples: <ul> <li>A header @code Content-Type: application/json @endcode
-  SHOULD be recorded as the @code http.request.header.content-type @endcode attribute with value
-  @code ["application/json"] @endcode.</li> <li>A header @code X-Forwarded-For: 1.2.3.4, 1.2.3.5
-  @endcode SHOULD be recorded as the @code http.request.header.x-forwarded-for @endcode attribute
-  with value @code ["1.2.3.4", "1.2.3.5"] @endcode or @code ["1.2.3.4, 1.2.3.5"] @endcode depending
-  on the HTTP library.</li>
-  </ul>
- */
-static constexpr const char *kHttpRequestHeader = "http.request.header";
-
-/**
-  HTTP request method.
-  <p>
-  HTTP request method value SHOULD be "known" to the instrumentation.
-  By default, this convention defines "known" methods as the ones listed in <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-  defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>. <p> If the HTTP
-  request method is not known to instrumentation, it MUST set the @code http.request.method @endcode
-  attribute to @code _OTHER @endcode. <p> If the HTTP instrumentation could end up converting valid
-  HTTP request methods to @code _OTHER @endcode, then it MUST provide a way to override the list of
-  known HTTP methods. If this override is done via environment variable, then the environment
-  variable MUST be named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list
-  of case-sensitive known HTTP methods (this list MUST be a full override of the default known
-  method, it is not a list of known methods in addition to the defaults). <p> HTTP method names are
-  case-sensitive and @code http.request.method @endcode attribute value MUST match a known HTTP
-  method name exactly. Instrumentations for specific web frameworks that consider HTTP methods to be
-  case insensitive, SHOULD populate a canonical equivalent. Tracing instrumentations that do so,
-  MUST also set @code http.request.method_original @endcode to the original value.
- */
-static constexpr const char *kHttpRequestMethod = "http.request.method";
-
-/**
-  Original HTTP method sent by the client in the request line.
- */
-static constexpr const char *kHttpRequestMethodOriginal = "http.request.method_original";
-
-/**
-  The ordinal number of request resending attempt (for any reason, including redirects).
-  <p>
-  The resend count SHOULD be updated each time an HTTP request gets resent by the client, regardless
-  of what was the cause of the resending (e.g. redirection, authorization failure, 503 Server
-  Unavailable, network issues, or any other).
- */
-static constexpr const char *kHttpRequestResendCount = "http.request.resend_count";
-
-/**
-  The total size of the request in bytes. This should be the total number of bytes sent over the
-  wire, including the request line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and request
-  body if any.
- */
-static constexpr const char *kHttpRequestSize = "http.request.size";
-
-/**
-  Deprecated, use @code http.request.header.content-length @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.request.header.content-length @endcode.", "reason":
-  "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength =
-    "http.request_content_length";
-
-/**
-  Deprecated, use @code http.request.body.size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.request.body.size @endcode.", "reason": "renamed", "renamed_to":
-  "http.request.body.size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed =
-    "http.request_content_length_uncompressed";
-
-/**
-  The size of the response payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpResponseBodySize = "http.response.body.size";
-
-/**
-  HTTP response headers, @code <key> @endcode being the normalized HTTP Header name (lowercase), the
-  value being the header values. <p> Instrumentations SHOULD require an explicit configuration of
-  which headers are to be captured. Including all response headers can be a security risk - explicit
-  configuration helps avoid leaking sensitive information. <p> Users MAY explicitly configure
-  instrumentations to capture them even though it is not recommended. <p> The attribute value MUST
-  consist of either multiple header values as an array of strings or a single-item array containing
-  a possibly comma-concatenated string, depending on the way the HTTP library provides access to
-  headers. <p> Examples: <ul> <li>A header @code Content-Type: application/json @endcode header
-  SHOULD be recorded as the @code http.request.response.content-type @endcode attribute with value
-  @code ["application/json"] @endcode.</li> <li>A header @code My-custom-header: abc, def @endcode
-  header SHOULD be recorded as the @code http.response.header.my-custom-header @endcode attribute
-  with value @code ["abc", "def"] @endcode or @code ["abc, def"] @endcode depending on the HTTP
-  library.</li>
-  </ul>
- */
-static constexpr const char *kHttpResponseHeader = "http.response.header";
-
-/**
-  The total size of the response in bytes. This should be the total number of bytes sent over the
-  wire, including the status line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and response
-  body and trailers if any.
- */
-static constexpr const char *kHttpResponseSize = "http.response.size";
-
-/**
-  <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>.
- */
-static constexpr const char *kHttpResponseStatusCode = "http.response.status_code";
-
-/**
-  Deprecated, use @code http.response.header.content-length @endcode instead.
-
-  @deprecated
-  {"note": "hp.response.header.content-length", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength =
-    "http.response_content_length";
-
-/**
-  Deprecated, use @code http.response.body.size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.response.body.size @endcode.", "reason": "renamed", "renamed_to":
-  "http.response.body.size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed =
-    "http.response_content_length_uncompressed";
-
-/**
-  The matched route, that is, the path template in the format used by the respective server
-  framework. <p> MUST NOT be populated when this is not supported by the HTTP server framework as
-  the route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD
-  include the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if
-  there is one.
- */
-static constexpr const char *kHttpRoute = "http.route";
-
-/**
-  Deprecated, use @code url.scheme @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code url.scheme @endcode.", "reason": "renamed", "renamed_to":
-  "url.scheme"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme";
-
-/**
-  Deprecated, use @code server.address @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to":
-  "server.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name";
-
-/**
-  Deprecated, use @code http.response.status_code @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.response.status_code @endcode.", "reason": "renamed",
-  "renamed_to": "http.response.status_code"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code";
-
-/**
-  Deprecated, use @code url.path @endcode and @code url.query @endcode instead.
-
-  @deprecated
-  {"note": "Split to @code url.path @endcode and @code url.query @endcode.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target";
-
-/**
-  Deprecated, use @code url.full @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code url.full @endcode.", "reason": "renamed", "renamed_to": "url.full"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url";
-
-/**
-  Deprecated, use @code user_agent.original @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code user_agent.original @endcode.", "reason": "renamed", "renamed_to":
-  "user_agent.original"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent";
-
-namespace HttpConnectionStateValues
-{
-/**
-  active state.
- */
-static constexpr const char *kActive = "active";
-
-/**
-  idle state.
- */
-static constexpr const char *kIdle = "idle";
-
-}  // namespace HttpConnectionStateValues
-
-namespace HttpFlavorValues
-{
-/**
-  HTTP/1.0
- */
-static constexpr const char *kHttp10 = "1.0";
-
-/**
-  HTTP/1.1
- */
-static constexpr const char *kHttp11 = "1.1";
-
-/**
-  HTTP/2
- */
-static constexpr const char *kHttp20 = "2.0";
-
-/**
-  HTTP/3
- */
-static constexpr const char *kHttp30 = "3.0";
-
-/**
-  SPDY protocol.
- */
-static constexpr const char *kSpdy = "SPDY";
-
-/**
-  QUIC protocol.
- */
-static constexpr const char *kQuic = "QUIC";
-
-}  // namespace HttpFlavorValues
-
-namespace HttpRequestMethodValues
-{
-/**
-  CONNECT method.
- */
-static constexpr const char *kConnect = "CONNECT";
-
-/**
-  DELETE method.
- */
-static constexpr const char *kDelete = "DELETE";
-
-/**
-  GET method.
- */
-static constexpr const char *kGet = "GET";
-
-/**
-  HEAD method.
- */
-static constexpr const char *kHead = "HEAD";
-
-/**
-  OPTIONS method.
- */
-static constexpr const char *kOptions = "OPTIONS";
-
-/**
-  PATCH method.
- */
-static constexpr const char *kPatch = "PATCH";
-
-/**
-  POST method.
- */
-static constexpr const char *kPost = "POST";
-
-/**
-  PUT method.
- */
-static constexpr const char *kPut = "PUT";
-
-/**
-  TRACE method.
- */
-static constexpr const char *kTrace = "TRACE";
-
-/**
-  Any HTTP method that the instrumentation has no prior knowledge of.
- */
-static constexpr const char *kOther = "_OTHER";
-
-}  // namespace HttpRequestMethodValues
-
-}  // namespace http
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/http_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/http_metrics.h
deleted file mode 100644
index 5c725ae19..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/http_metrics.h
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace http
-{
-
-/**
-  Number of active HTTP requests.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricHttpClientActiveRequests = "http.client.active_requests";
-static constexpr const char *descrMetricHttpClientActiveRequests =
-    "Number of active HTTP requests.";
-static constexpr const char *unitMetricHttpClientActiveRequests = "{request}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricHttpClientActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHttpClientActiveRequests,
-                                         descrMetricHttpClientActiveRequests,
-                                         unitMetricHttpClientActiveRequests);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricHttpClientActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHttpClientActiveRequests,
-                                          descrMetricHttpClientActiveRequests,
-                                          unitMetricHttpClientActiveRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHttpClientActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHttpClientActiveRequests,
-                                                   descrMetricHttpClientActiveRequests,
-                                                   unitMetricHttpClientActiveRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHttpClientActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHttpClientActiveRequests,
-                                                    descrMetricHttpClientActiveRequests,
-                                                    unitMetricHttpClientActiveRequests);
-}
-
-/**
-  The duration of the successfully established outbound HTTP connections.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpClientConnectionDuration =
-    "http.client.connection.duration";
-static constexpr const char *descrMetricHttpClientConnectionDuration =
-    "The duration of the successfully established outbound HTTP connections.";
-static constexpr const char *unitMetricHttpClientConnectionDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientConnectionDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientConnectionDuration,
-                                      descrMetricHttpClientConnectionDuration,
-                                      unitMetricHttpClientConnectionDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientConnectionDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientConnectionDuration,
-                                      descrMetricHttpClientConnectionDuration,
-                                      unitMetricHttpClientConnectionDuration);
-}
-
-/**
-  Number of outbound HTTP connections that are currently active or idle on the client.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricHttpClientOpenConnections = "http.client.open_connections";
-static constexpr const char *descrMetricHttpClientOpenConnections =
-    "Number of outbound HTTP connections that are currently active or idle on the client.";
-static constexpr const char *unitMetricHttpClientOpenConnections = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricHttpClientOpenConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHttpClientOpenConnections,
-                                         descrMetricHttpClientOpenConnections,
-                                         unitMetricHttpClientOpenConnections);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricHttpClientOpenConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHttpClientOpenConnections,
-                                          descrMetricHttpClientOpenConnections,
-                                          unitMetricHttpClientOpenConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHttpClientOpenConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHttpClientOpenConnections,
-                                                   descrMetricHttpClientOpenConnections,
-                                                   unitMetricHttpClientOpenConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHttpClientOpenConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHttpClientOpenConnections,
-                                                    descrMetricHttpClientOpenConnections,
-                                                    unitMetricHttpClientOpenConnections);
-}
-
-/**
-  Size of HTTP client request bodies.
-  <p>
-  The size of the request payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size. <p> histogram
- */
-static constexpr const char *kMetricHttpClientRequestBodySize = "http.client.request.body.size";
-static constexpr const char *descrMetricHttpClientRequestBodySize =
-    "Size of HTTP client request bodies.";
-static constexpr const char *unitMetricHttpClientRequestBodySize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientRequestBodySize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientRequestBodySize,
-                                      descrMetricHttpClientRequestBodySize,
-                                      unitMetricHttpClientRequestBodySize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientRequestBodySize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientRequestBodySize,
-                                      descrMetricHttpClientRequestBodySize,
-                                      unitMetricHttpClientRequestBodySize);
-}
-
-/**
-  Duration of HTTP client requests.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpClientRequestDuration = "http.client.request.duration";
-static constexpr const char *descrMetricHttpClientRequestDuration =
-    "Duration of HTTP client requests.";
-static constexpr const char *unitMetricHttpClientRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientRequestDuration,
-                                      descrMetricHttpClientRequestDuration,
-                                      unitMetricHttpClientRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientRequestDuration,
-                                      descrMetricHttpClientRequestDuration,
-                                      unitMetricHttpClientRequestDuration);
-}
-
-/**
-  Size of HTTP client response bodies.
-  <p>
-  The size of the response payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size. <p> histogram
- */
-static constexpr const char *kMetricHttpClientResponseBodySize = "http.client.response.body.size";
-static constexpr const char *descrMetricHttpClientResponseBodySize =
-    "Size of HTTP client response bodies.";
-static constexpr const char *unitMetricHttpClientResponseBodySize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientResponseBodySize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientResponseBodySize,
-                                      descrMetricHttpClientResponseBodySize,
-                                      unitMetricHttpClientResponseBodySize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientResponseBodySize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientResponseBodySize,
-                                      descrMetricHttpClientResponseBodySize,
-                                      unitMetricHttpClientResponseBodySize);
-}
-
-/**
-  Number of active HTTP server requests.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricHttpServerActiveRequests = "http.server.active_requests";
-static constexpr const char *descrMetricHttpServerActiveRequests =
-    "Number of active HTTP server requests.";
-static constexpr const char *unitMetricHttpServerActiveRequests = "{request}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricHttpServerActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHttpServerActiveRequests,
-                                         descrMetricHttpServerActiveRequests,
-                                         unitMetricHttpServerActiveRequests);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricHttpServerActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHttpServerActiveRequests,
-                                          descrMetricHttpServerActiveRequests,
-                                          unitMetricHttpServerActiveRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHttpServerActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHttpServerActiveRequests,
-                                                   descrMetricHttpServerActiveRequests,
-                                                   unitMetricHttpServerActiveRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHttpServerActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHttpServerActiveRequests,
-                                                    descrMetricHttpServerActiveRequests,
-                                                    unitMetricHttpServerActiveRequests);
-}
-
-/**
-  Size of HTTP server request bodies.
-  <p>
-  The size of the request payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size. <p> histogram
- */
-static constexpr const char *kMetricHttpServerRequestBodySize = "http.server.request.body.size";
-static constexpr const char *descrMetricHttpServerRequestBodySize =
-    "Size of HTTP server request bodies.";
-static constexpr const char *unitMetricHttpServerRequestBodySize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpServerRequestBodySize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpServerRequestBodySize,
-                                      descrMetricHttpServerRequestBodySize,
-                                      unitMetricHttpServerRequestBodySize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpServerRequestBodySize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpServerRequestBodySize,
-                                      descrMetricHttpServerRequestBodySize,
-                                      unitMetricHttpServerRequestBodySize);
-}
-
-/**
-  Duration of HTTP server requests.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpServerRequestDuration = "http.server.request.duration";
-static constexpr const char *descrMetricHttpServerRequestDuration =
-    "Duration of HTTP server requests.";
-static constexpr const char *unitMetricHttpServerRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpServerRequestDuration,
-                                      descrMetricHttpServerRequestDuration,
-                                      unitMetricHttpServerRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpServerRequestDuration,
-                                      descrMetricHttpServerRequestDuration,
-                                      unitMetricHttpServerRequestDuration);
-}
-
-/**
-  Size of HTTP server response bodies.
-  <p>
-  The size of the response payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size. <p> histogram
- */
-static constexpr const char *kMetricHttpServerResponseBodySize = "http.server.response.body.size";
-static constexpr const char *descrMetricHttpServerResponseBodySize =
-    "Size of HTTP server response bodies.";
-static constexpr const char *unitMetricHttpServerResponseBodySize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpServerResponseBodySize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpServerResponseBodySize,
-                                      descrMetricHttpServerResponseBodySize,
-                                      unitMetricHttpServerResponseBodySize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpServerResponseBodySize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpServerResponseBodySize,
-                                      descrMetricHttpServerResponseBodySize,
-                                      unitMetricHttpServerResponseBodySize);
-}
-
-}  // namespace http
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/hw_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/hw_attributes.h
deleted file mode 100644
index 04c8a7638..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/hw_attributes.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace hw
-{
-
-/**
-  An identifier for the hardware component, unique within the monitored host
- */
-static constexpr const char *kHwId = "hw.id";
-
-/**
-  An easily-recognizable name for the hardware component
- */
-static constexpr const char *kHwName = "hw.name";
-
-/**
-  Unique identifier of the parent component (typically the @code hw.id @endcode attribute of the
-  enclosure, or disk controller)
- */
-static constexpr const char *kHwParent = "hw.parent";
-
-/**
-  The current state of the component
- */
-static constexpr const char *kHwState = "hw.state";
-
-/**
-  Type of the component
-  <p>
-  Describes the category of the hardware component for which @code hw.state @endcode is being
-  reported. For example, @code hw.type=temperature @endcode along with @code hw.state=degraded
-  @endcode would indicate that the temperature of the hardware component has been reported as @code
-  degraded @endcode.
- */
-static constexpr const char *kHwType = "hw.type";
-
-namespace HwStateValues
-{
-/**
-  Ok
- */
-static constexpr const char *kOk = "ok";
-
-/**
-  Degraded
- */
-static constexpr const char *kDegraded = "degraded";
-
-/**
-  Failed
- */
-static constexpr const char *kFailed = "failed";
-
-}  // namespace HwStateValues
-
-namespace HwTypeValues
-{
-/**
-  Battery
- */
-static constexpr const char *kBattery = "battery";
-
-/**
-  CPU
- */
-static constexpr const char *kCpu = "cpu";
-
-/**
-  Disk controller
- */
-static constexpr const char *kDiskController = "disk_controller";
-
-/**
-  Enclosure
- */
-static constexpr const char *kEnclosure = "enclosure";
-
-/**
-  Fan
- */
-static constexpr const char *kFan = "fan";
-
-/**
-  GPU
- */
-static constexpr const char *kGpu = "gpu";
-
-/**
-  Logical disk
- */
-static constexpr const char *kLogicalDisk = "logical_disk";
-
-/**
-  Memory
- */
-static constexpr const char *kMemory = "memory";
-
-/**
-  Network
- */
-static constexpr const char *kNetwork = "network";
-
-/**
-  Physical disk
- */
-static constexpr const char *kPhysicalDisk = "physical_disk";
-
-/**
-  Power supply
- */
-static constexpr const char *kPowerSupply = "power_supply";
-
-/**
-  Tape drive
- */
-static constexpr const char *kTapeDrive = "tape_drive";
-
-/**
-  Temperature
- */
-static constexpr const char *kTemperature = "temperature";
-
-/**
-  Voltage
- */
-static constexpr const char *kVoltage = "voltage";
-
-}  // namespace HwTypeValues
-
-}  // namespace hw
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/hw_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/hw_metrics.h
deleted file mode 100644
index e73e9edeb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/hw_metrics.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace hw
-{
-
-/**
-  Energy consumed by the component
-  <p>
-  counter
- */
-static constexpr const char *kMetricHwEnergy     = "hw.energy";
-static constexpr const char *descrMetricHwEnergy = "Energy consumed by the component";
-static constexpr const char *unitMetricHwEnergy  = "J";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwEnergy, descrMetricHwEnergy, unitMetricHwEnergy);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwEnergy, descrMetricHwEnergy, unitMetricHwEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwEnergy, descrMetricHwEnergy,
-                                             unitMetricHwEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwEnergy, descrMetricHwEnergy,
-                                              unitMetricHwEnergy);
-}
-
-/**
-  Number of errors encountered by the component
-  <p>
-  counter
- */
-static constexpr const char *kMetricHwErrors     = "hw.errors";
-static constexpr const char *descrMetricHwErrors = "Number of errors encountered by the component";
-static constexpr const char *unitMetricHwErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwErrors, descrMetricHwErrors, unitMetricHwErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwErrors, descrMetricHwErrors, unitMetricHwErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwErrors, descrMetricHwErrors,
-                                             unitMetricHwErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwErrors, descrMetricHwErrors,
-                                              unitMetricHwErrors);
-}
-
-/**
-  Ambient (external) temperature of the physical host
-  <p>
-  gauge
- */
-static constexpr const char *kMetricHwHostAmbientTemperature = "hw.host.ambient_temperature";
-static constexpr const char *descrMetricHwHostAmbientTemperature =
-    "Ambient (external) temperature of the physical host";
-static constexpr const char *unitMetricHwHostAmbientTemperature = "Cel";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostAmbientTemperature,
-                                 descrMetricHwHostAmbientTemperature,
-                                 unitMetricHwHostAmbientTemperature);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostAmbientTemperature,
-                                  descrMetricHwHostAmbientTemperature,
-                                  unitMetricHwHostAmbientTemperature);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwHostAmbientTemperature,
-                                           descrMetricHwHostAmbientTemperature,
-                                           unitMetricHwHostAmbientTemperature);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwHostAmbientTemperature,
-                                            descrMetricHwHostAmbientTemperature,
-                                            unitMetricHwHostAmbientTemperature);
-}
-
-/**
-  Total energy consumed by the entire physical host, in joules
-  <p>
-  The overall energy usage of a host MUST be reported using the specific @code hw.host.energy
-  @endcode and @code hw.host.power @endcode metrics <strong>only</strong>, instead of the generic
-  @code hw.energy @endcode and @code hw.power @endcode described in the previous section, to prevent
-  summing up overlapping values. <p> counter
- */
-static constexpr const char *kMetricHwHostEnergy = "hw.host.energy";
-static constexpr const char *descrMetricHwHostEnergy =
-    "Total energy consumed by the entire physical host, in joules";
-static constexpr const char *unitMetricHwHostEnergy = "J";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                    unitMetricHwHostEnergy);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                    unitMetricHwHostEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                             unitMetricHwHostEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                              unitMetricHwHostEnergy);
-}
-
-/**
-  By how many degrees Celsius the temperature of the physical host can be increased, before reaching
-  a warning threshold on one of the internal sensors <p> gauge
- */
-static constexpr const char *kMetricHwHostHeatingMargin = "hw.host.heating_margin";
-static constexpr const char *descrMetricHwHostHeatingMargin =
-    "By how many degrees Celsius the temperature of the physical host can be increased, before reaching a warning threshold on one of the internal sensors
-    ";
-    static constexpr const char *unitMetricHwHostHeatingMargin = "Cel";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwHostHeatingMargin(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin,
-                                 unitMetricHwHostHeatingMargin);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwHostHeatingMargin(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin,
-                                  unitMetricHwHostHeatingMargin);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHwHostHeatingMargin(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin, unitMetricHwHostHeatingMargin);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHwHostHeatingMargin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin, unitMetricHwHostHeatingMargin);
-}
-
-/**
-  Instantaneous power consumed by the entire physical host in Watts (@code hw.host.energy @endcode
-  is preferred) <p> The overall energy usage of a host MUST be reported using the specific @code
-  hw.host.energy @endcode and @code hw.host.power @endcode metrics <strong>only</strong>, instead of
-  the generic @code hw.energy @endcode and @code hw.power @endcode described in the previous
-  section, to prevent summing up overlapping values. <p> gauge
- */
-static constexpr const char *kMetricHwHostPower = "hw.host.power";
-static constexpr const char *descrMetricHwHostPower =
-    "Instantaneous power consumed by the entire physical host in Watts (`hw.host.energy` is preferred)
-    ";
-    static constexpr const char *unitMetricHwHostPower = "W";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostPower, descrMetricHwHostPower, unitMetricHwHostPower);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                  unitMetricHwHostPower);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                           unitMetricHwHostPower);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                            unitMetricHwHostPower);
-}
-
-/**
-  Instantaneous power consumed by the component
-  <p>
-  It is recommended to report @code hw.energy @endcode instead of @code hw.power @endcode when
-  possible. <p> gauge
- */
-static constexpr const char *kMetricHwPower     = "hw.power";
-static constexpr const char *descrMetricHwPower = "Instantaneous power consumed by the component";
-static constexpr const char *unitMetricHwPower  = "W";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-/**
-  Operational status: @code 1 @endcode (true) or @code 0 @endcode (false) for each of the possible
-  states <p>
-  @code hw.status @endcode is currently specified as an <em>UpDownCounter</em> but would ideally be
-  represented using a <a
-  href="https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#stateset"><em>StateSet</em>
-  as defined in OpenMetrics</a>. This semantic convention will be updated once <em>StateSet</em> is
-  specified in OpenTelemetry. This planned change is not expected to have any consequence on the way
-  users query their timeseries backend to retrieve the values of @code hw.status @endcode over time.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricHwStatus = "hw.status";
-static constexpr const char *descrMetricHwStatus =
-    "Operational status: `1` (true) or `0` (false) for each of the possible states";
-static constexpr const char *unitMetricHwStatus = "1";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHwStatus, descrMetricHwStatus, unitMetricHwStatus);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHwStatus, descrMetricHwStatus, unitMetricHwStatus);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHwStatus, descrMetricHwStatus,
-                                                   unitMetricHwStatus);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHwStatus, descrMetricHwStatus,
-                                                    unitMetricHwStatus);
-}
-
-}  // namespace hw
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/k8s_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/k8s_attributes.h
deleted file mode 100644
index 05f406498..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/k8s_attributes.h
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace k8s
-{
-
-/**
-  The name of the cluster.
- */
-static constexpr const char *kK8sClusterName = "k8s.cluster.name";
-
-/**
-  A pseudo-ID for the cluster, set to the UID of the @code kube-system @endcode namespace.
-  <p>
-  K8s doesn't have support for obtaining a cluster ID. If this is ever
-  added, we will recommend collecting the @code k8s.cluster.uid @endcode through the
-  official APIs. In the meantime, we are able to use the @code uid @endcode of the
-  @code kube-system @endcode namespace as a proxy for cluster ID. Read on for the
-  rationale.
-  <p>
-  Every object created in a K8s cluster is assigned a distinct UID. The
-  @code kube-system @endcode namespace is used by Kubernetes itself and will exist
-  for the lifetime of the cluster. Using the @code uid @endcode of the @code kube-system @endcode
-  namespace is a reasonable proxy for the K8s ClusterID as it will only
-  change if the cluster is rebuilt. Furthermore, Kubernetes UIDs are
-  UUIDs as standardized by
-  <a href="https://www.itu.int/ITU-T/studygroups/com17/oid.html">ISO/IEC 9834-8 and ITU-T X.667</a>.
-  Which states:
-  <blockquote>
-  If generated according to one of the mechanisms defined in Rec.
-  ITU-T X.667 | ISO/IEC 9834-8, a UUID is either guaranteed to be
-  different from all other UUIDs generated before 3603 A.D., or is
-  extremely likely to be different (depending on the mechanism chosen).</blockquote>
-  <p>
-  Therefore, UIDs between clusters should be extremely unlikely to
-  conflict.
- */
-static constexpr const char *kK8sClusterUid = "k8s.cluster.uid";
-
-/**
-  The name of the Container from Pod specification, must be unique within a Pod. Container runtime
-  usually uses different globally unique name (@code container.name @endcode).
- */
-static constexpr const char *kK8sContainerName = "k8s.container.name";
-
-/**
-  Number of times the container was restarted. This attribute can be used to identify a particular
-  container (running or stopped) within a container spec.
- */
-static constexpr const char *kK8sContainerRestartCount = "k8s.container.restart_count";
-
-/**
-  Last terminated reason of the Container.
- */
-static constexpr const char *kK8sContainerStatusLastTerminatedReason =
-    "k8s.container.status.last_terminated_reason";
-
-/**
-  The cronjob annotation placed on the CronJob, the @code <key> @endcode being the annotation name,
-  the value being the annotation value. <p> Examples: <ul> <li>An annotation @code retries @endcode
-  with value @code 4 @endcode SHOULD be recorded as the
-  @code k8s.cronjob.annotation.retries @endcode attribute with value @code "4" @endcode.</li>
-    <li>An annotation @code data @endcode with empty string value SHOULD be recorded as
-  the @code k8s.cronjob.annotation.data @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sCronjobAnnotation = "k8s.cronjob.annotation";
-
-/**
-  The label placed on the CronJob, the @code <key> @endcode being the label name, the value being
-  the label value. <p> Examples: <ul> <li>A label @code type @endcode with value @code weekly
-  @endcode SHOULD be recorded as the
-  @code k8s.cronjob.label.type @endcode attribute with value @code "weekly" @endcode.</li>
-    <li>A label @code automated @endcode with empty string value SHOULD be recorded as
-  the @code k8s.cronjob.label.automated @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sCronjobLabel = "k8s.cronjob.label";
-
-/**
-  The name of the CronJob.
- */
-static constexpr const char *kK8sCronjobName = "k8s.cronjob.name";
-
-/**
-  The UID of the CronJob.
- */
-static constexpr const char *kK8sCronjobUid = "k8s.cronjob.uid";
-
-/**
-  The annotation key-value pairs placed on the DaemonSet.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sDaemonsetAnnotation = "k8s.daemonset.annotation";
-
-/**
-  The label key-value pairs placed on the DaemonSet.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sDaemonsetLabel = "k8s.daemonset.label";
-
-/**
-  The name of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetName = "k8s.daemonset.name";
-
-/**
-  The UID of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetUid = "k8s.daemonset.uid";
-
-/**
-  The annotation key-value pairs placed on the Deployment.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sDeploymentAnnotation = "k8s.deployment.annotation";
-
-/**
-  The label key-value pairs placed on the Deployment.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sDeploymentLabel = "k8s.deployment.label";
-
-/**
-  The name of the Deployment.
- */
-static constexpr const char *kK8sDeploymentName = "k8s.deployment.name";
-
-/**
-  The UID of the Deployment.
- */
-static constexpr const char *kK8sDeploymentUid = "k8s.deployment.uid";
-
-/**
-  The name of the horizontal pod autoscaler.
- */
-static constexpr const char *kK8sHpaName = "k8s.hpa.name";
-
-/**
-  The UID of the horizontal pod autoscaler.
- */
-static constexpr const char *kK8sHpaUid = "k8s.hpa.uid";
-
-/**
-  The annotation key-value pairs placed on the Job.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sJobAnnotation = "k8s.job.annotation";
-
-/**
-  The label key-value pairs placed on the Job.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sJobLabel = "k8s.job.label";
-
-/**
-  The name of the Job.
- */
-static constexpr const char *kK8sJobName = "k8s.job.name";
-
-/**
-  The UID of the Job.
- */
-static constexpr const char *kK8sJobUid = "k8s.job.uid";
-
-/**
-  The annotation key-value pairs placed on the Namespace.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sNamespaceAnnotation = "k8s.namespace.annotation";
-
-/**
-  The label key-value pairs placed on the Namespace.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sNamespaceLabel = "k8s.namespace.label";
-
-/**
-  The name of the namespace that the pod is running in.
- */
-static constexpr const char *kK8sNamespaceName = "k8s.namespace.name";
-
-/**
-  The phase of the K8s namespace.
-  <p>
-  This attribute aligns with the @code phase @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#namespacestatus-v1-core">K8s
-  NamespaceStatus</a>
- */
-static constexpr const char *kK8sNamespacePhase = "k8s.namespace.phase";
-
-/**
-  The annotation placed on the Node, the @code <key> @endcode being the annotation name, the value
-  being the annotation value, even if the value is empty. <p> Examples: <ul> <li>An annotation @code
-  node.alpha.kubernetes.io/ttl @endcode with value @code 0 @endcode SHOULD be recorded as the @code
-  k8s.node.annotation.node.alpha.kubernetes.io/ttl @endcode attribute with value @code "0"
-  @endcode.</li> <li>An annotation @code data @endcode with empty string value SHOULD be recorded as
-  the @code k8s.node.annotation.data @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sNodeAnnotation = "k8s.node.annotation";
-
-/**
-  The label placed on the Node, the @code <key> @endcode being the label name, the value being the
-  label value, even if the value is empty. <p> Examples: <ul> <li>A label @code kubernetes.io/arch
-  @endcode with value @code arm64 @endcode SHOULD be recorded as the @code
-  k8s.node.label.kubernetes.io/arch @endcode attribute with value @code "arm64" @endcode.</li> <li>A
-  label @code data @endcode with empty string value SHOULD be recorded as the @code
-  k8s.node.label.data @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sNodeLabel = "k8s.node.label";
-
-/**
-  The name of the Node.
- */
-static constexpr const char *kK8sNodeName = "k8s.node.name";
-
-/**
-  The UID of the Node.
- */
-static constexpr const char *kK8sNodeUid = "k8s.node.uid";
-
-/**
-  The annotation placed on the Pod, the @code <key> @endcode being the annotation name, the value
-  being the annotation value. <p> Examples: <ul> <li>An annotation @code
-  kubernetes.io/enforce-mountable-secrets @endcode with value @code true @endcode SHOULD be recorded
-  as the @code k8s.pod.annotation.kubernetes.io/enforce-mountable-secrets @endcode attribute with
-  value @code "true" @endcode.</li> <li>An annotation @code mycompany.io/arch @endcode with value
-  @code x64 @endcode SHOULD be recorded as the @code k8s.pod.annotation.mycompany.io/arch @endcode
-  attribute with value @code "x64" @endcode.</li> <li>An annotation @code data @endcode with empty
-  string value SHOULD be recorded as the @code k8s.pod.annotation.data @endcode attribute with value
-  @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sPodAnnotation = "k8s.pod.annotation";
-
-/**
-  The label placed on the Pod, the @code <key> @endcode being the label name, the value being the
-  label value. <p> Examples: <ul> <li>A label @code app @endcode with value @code my-app @endcode
-  SHOULD be recorded as the @code k8s.pod.label.app @endcode attribute with value @code "my-app"
-  @endcode.</li> <li>A label @code mycompany.io/arch @endcode with value @code x64 @endcode SHOULD
-  be recorded as the @code k8s.pod.label.mycompany.io/arch @endcode attribute with value @code "x64"
-  @endcode.</li> <li>A label @code data @endcode with empty string value SHOULD be recorded as the
-  @code k8s.pod.label.data @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sPodLabel = "k8s.pod.label";
-
-/**
-  Deprecated, use @code k8s.pod.label @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code k8s.pod.label @endcode.", "reason": "renamed", "renamed_to":
-  "k8s.pod.label"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kK8sPodLabels = "k8s.pod.labels";
-
-/**
-  The name of the Pod.
- */
-static constexpr const char *kK8sPodName = "k8s.pod.name";
-
-/**
-  The UID of the Pod.
- */
-static constexpr const char *kK8sPodUid = "k8s.pod.uid";
-
-/**
-  The annotation key-value pairs placed on the ReplicaSet.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sReplicasetAnnotation = "k8s.replicaset.annotation";
-
-/**
-  The label key-value pairs placed on the ReplicaSet.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sReplicasetLabel = "k8s.replicaset.label";
-
-/**
-  The name of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetName = "k8s.replicaset.name";
-
-/**
-  The UID of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetUid = "k8s.replicaset.uid";
-
-/**
-  The name of the replication controller.
- */
-static constexpr const char *kK8sReplicationcontrollerName = "k8s.replicationcontroller.name";
-
-/**
-  The UID of the replication controller.
- */
-static constexpr const char *kK8sReplicationcontrollerUid = "k8s.replicationcontroller.uid";
-
-/**
-  The name of the resource quota.
- */
-static constexpr const char *kK8sResourcequotaName = "k8s.resourcequota.name";
-
-/**
-  The UID of the resource quota.
- */
-static constexpr const char *kK8sResourcequotaUid = "k8s.resourcequota.uid";
-
-/**
-  The annotation key-value pairs placed on the StatefulSet.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sStatefulsetAnnotation = "k8s.statefulset.annotation";
-
-/**
-  The label key-value pairs placed on the StatefulSet.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sStatefulsetLabel = "k8s.statefulset.label";
-
-/**
-  The name of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetName = "k8s.statefulset.name";
-
-/**
-  The UID of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetUid = "k8s.statefulset.uid";
-
-/**
-  The name of the K8s volume.
- */
-static constexpr const char *kK8sVolumeName = "k8s.volume.name";
-
-/**
-  The type of the K8s volume.
- */
-static constexpr const char *kK8sVolumeType = "k8s.volume.type";
-
-namespace K8sNamespacePhaseValues
-{
-/**
-  Active namespace phase as described by <a
-  href="https://pkg.go.dev/k8s.io/api@v0.31.3/core/v1#NamespacePhase">K8s API</a>
- */
-static constexpr const char *kActive = "active";
-
-/**
-  Terminating namespace phase as described by <a
-  href="https://pkg.go.dev/k8s.io/api@v0.31.3/core/v1#NamespacePhase">K8s API</a>
- */
-static constexpr const char *kTerminating = "terminating";
-
-}  // namespace K8sNamespacePhaseValues
-
-namespace K8sVolumeTypeValues
-{
-/**
-  A <a
-  href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#persistentvolumeclaim">persistentVolumeClaim</a>
-  volume
- */
-static constexpr const char *kPersistentVolumeClaim = "persistentVolumeClaim";
-
-/**
-  A <a
-  href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#configmap">configMap</a>
-  volume
- */
-static constexpr const char *kConfigMap = "configMap";
-
-/**
-  A <a
-  href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#downwardapi">downwardAPI</a>
-  volume
- */
-static constexpr const char *kDownwardApi = "downwardAPI";
-
-/**
-  An <a href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#emptydir">emptyDir</a>
-  volume
- */
-static constexpr const char *kEmptyDir = "emptyDir";
-
-/**
-  A <a href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#secret">secret</a>
-  volume
- */
-static constexpr const char *kSecret = "secret";
-
-/**
-  A <a href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#local">local</a> volume
- */
-static constexpr const char *kLocal = "local";
-
-}  // namespace K8sVolumeTypeValues
-
-}  // namespace k8s
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/k8s_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/k8s_metrics.h
deleted file mode 100644
index 3a5f25b27..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/k8s_metrics.h
+++ /dev/null
@@ -1,1723 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace k8s
-{
-
-/**
-  The number of actively running jobs for a cronjob
-  <p>
-  This metric aligns with the @code active @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch">K8s
-  CronJobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#cronjob">@code k8s.cronjob @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sCronjobActiveJobs = "k8s.cronjob.active_jobs";
-static constexpr const char *descrMetricK8sCronjobActiveJobs =
-    "The number of actively running jobs for a cronjob";
-static constexpr const char *unitMetricK8sCronjobActiveJobs = "{job}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-/**
-  Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod
-  <p>
-  This metric aligns with the @code currentNumberScheduled @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
-  DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetCurrentScheduledNodes =
-    "k8s.daemonset.current_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetCurrentScheduledNodes =
-    "Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod";
-static constexpr const char *unitMetricK8sDaemonsetCurrentScheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                         descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                         unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                          descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                          unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                                   descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                                   unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                                    descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                                    unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-/**
-  Number of nodes that should be running the daemon pod (including nodes currently running the
-  daemon pod) <p> This metric aligns with the @code desiredNumberScheduled @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
-  DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetDesiredScheduledNodes =
-    "k8s.daemonset.desired_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetDesiredScheduledNodes =
-    "Number of nodes that should be running the daemon pod (including nodes currently running the "
-    "daemon pod)";
-static constexpr const char *unitMetricK8sDaemonsetDesiredScheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                         descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                         unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                          descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                          unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                                   descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                                   unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                                    descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                                    unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-/**
-  Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod
-  <p>
-  This metric aligns with the @code numberMisscheduled @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
-  DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetMisscheduledNodes =
-    "k8s.daemonset.misscheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetMisscheduledNodes =
-    "Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod";
-static constexpr const char *unitMetricK8sDaemonsetMisscheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                         descrMetricK8sDaemonsetMisscheduledNodes,
-                                         unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                          descrMetricK8sDaemonsetMisscheduledNodes,
-                                          unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                                   descrMetricK8sDaemonsetMisscheduledNodes,
-                                                   unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                                    descrMetricK8sDaemonsetMisscheduledNodes,
-                                                    unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-/**
-  Number of nodes that should be running the daemon pod and have one or more of the daemon pod
-  running and ready <p> This metric aligns with the @code numberReady @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
-  DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetReadyNodes = "k8s.daemonset.ready_nodes";
-static constexpr const char *descrMetricK8sDaemonsetReadyNodes =
-    "Number of nodes that should be running the daemon pod and have one or more of the daemon pod "
-    "running and ready";
-static constexpr const char *unitMetricK8sDaemonsetReadyNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                         descrMetricK8sDaemonsetReadyNodes,
-                                         unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                          descrMetricK8sDaemonsetReadyNodes,
-                                          unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                   descrMetricK8sDaemonsetReadyNodes,
-                                                   unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                    descrMetricK8sDaemonsetReadyNodes,
-                                                    unitMetricK8sDaemonsetReadyNodes);
-}
-
-/**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  deployment <p> This metric aligns with the @code availableReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentstatus-v1-apps">K8s
-  DeploymentStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#deployment">@code k8s.deployment @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDeploymentAvailablePods = "k8s.deployment.available_pods";
-static constexpr const char *descrMetricK8sDeploymentAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "deployment";
-static constexpr const char *unitMetricK8sDeploymentAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                         descrMetricK8sDeploymentAvailablePods,
-                                         unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                          descrMetricK8sDeploymentAvailablePods,
-                                          unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                   descrMetricK8sDeploymentAvailablePods,
-                                                   unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                    descrMetricK8sDeploymentAvailablePods,
-                                                    unitMetricK8sDeploymentAvailablePods);
-}
-
-/**
-  Number of desired replica pods in this deployment
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentspec-v1-apps">K8s
-  DeploymentSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#deployment">@code k8s.deployment @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDeploymentDesiredPods = "k8s.deployment.desired_pods";
-static constexpr const char *descrMetricK8sDeploymentDesiredPods =
-    "Number of desired replica pods in this deployment";
-static constexpr const char *unitMetricK8sDeploymentDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                         descrMetricK8sDeploymentDesiredPods,
-                                         unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                          descrMetricK8sDeploymentDesiredPods,
-                                          unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                   descrMetricK8sDeploymentDesiredPods,
-                                                   unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                    descrMetricK8sDeploymentDesiredPods,
-                                                    unitMetricK8sDeploymentDesiredPods);
-}
-
-/**
-  Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the
-  autoscaler <p> This metric aligns with the @code currentReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
-  HorizontalPodAutoscalerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sHpaCurrentPods = "k8s.hpa.current_pods";
-static constexpr const char *descrMetricK8sHpaCurrentPods =
-    "Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the "
-    "autoscaler";
-static constexpr const char *unitMetricK8sHpaCurrentPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                         unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                          unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
-}
-
-/**
-  Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated by
-  the autoscaler <p> This metric aligns with the @code desiredReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
-  HorizontalPodAutoscalerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sHpaDesiredPods = "k8s.hpa.desired_pods";
-static constexpr const char *descrMetricK8sHpaDesiredPods =
-    "Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated "
-    "by the autoscaler";
-static constexpr const char *unitMetricK8sHpaDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                         unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                          unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
-}
-
-/**
-  The upper limit for the number of replica pods to which the autoscaler can scale up
-  <p>
-  This metric aligns with the @code maxReplicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
-  HorizontalPodAutoscalerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sHpaMaxPods = "k8s.hpa.max_pods";
-static constexpr const char *descrMetricK8sHpaMaxPods =
-    "The upper limit for the number of replica pods to which the autoscaler can scale up";
-static constexpr const char *unitMetricK8sHpaMaxPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                         unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                          unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                                   unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                                    unitMetricK8sHpaMaxPods);
-}
-
-/**
-  The lower limit for the number of replica pods to which the autoscaler can scale down
-  <p>
-  This metric aligns with the @code minReplicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
-  HorizontalPodAutoscalerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sHpaMinPods = "k8s.hpa.min_pods";
-static constexpr const char *descrMetricK8sHpaMinPods =
-    "The lower limit for the number of replica pods to which the autoscaler can scale down";
-static constexpr const char *unitMetricK8sHpaMinPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                         unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                          unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                                   unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                                    unitMetricK8sHpaMinPods);
-}
-
-/**
-  The number of pending and actively running pods for a job
-  <p>
-  This metric aligns with the @code active @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
-  JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobActivePods = "k8s.job.active_pods";
-static constexpr const char *descrMetricK8sJobActivePods =
-    "The number of pending and actively running pods for a job";
-static constexpr const char *unitMetricK8sJobActivePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                         unitMetricK8sJobActivePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                          unitMetricK8sJobActivePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
-}
-
-/**
-  The desired number of successfully finished pods the job should be run with
-  <p>
-  This metric aligns with the @code completions @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
-  JobSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobDesiredSuccessfulPods = "k8s.job.desired_successful_pods";
-static constexpr const char *descrMetricK8sJobDesiredSuccessfulPods =
-    "The desired number of successfully finished pods the job should be run with";
-static constexpr const char *unitMetricK8sJobDesiredSuccessfulPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                         descrMetricK8sJobDesiredSuccessfulPods,
-                                         unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                          descrMetricK8sJobDesiredSuccessfulPods,
-                                          unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                                   descrMetricK8sJobDesiredSuccessfulPods,
-                                                   unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                                    descrMetricK8sJobDesiredSuccessfulPods,
-                                                    unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-/**
-  The number of pods which reached phase Failed for a job
-  <p>
-  This metric aligns with the @code failed @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
-  JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobFailedPods = "k8s.job.failed_pods";
-static constexpr const char *descrMetricK8sJobFailedPods =
-    "The number of pods which reached phase Failed for a job";
-static constexpr const char *unitMetricK8sJobFailedPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
-                                         unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
-                                          unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
-}
-
-/**
-  The max desired number of pods the job should run at any given time
-  <p>
-  This metric aligns with the @code parallelism @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
-  JobSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobMaxParallelPods = "k8s.job.max_parallel_pods";
-static constexpr const char *descrMetricK8sJobMaxParallelPods =
-    "The max desired number of pods the job should run at any given time";
-static constexpr const char *unitMetricK8sJobMaxParallelPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobMaxParallelPods,
-                                         descrMetricK8sJobMaxParallelPods,
-                                         unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                          descrMetricK8sJobMaxParallelPods,
-                                          unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                   descrMetricK8sJobMaxParallelPods,
-                                                   unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                    descrMetricK8sJobMaxParallelPods,
-                                                    unitMetricK8sJobMaxParallelPods);
-}
-
-/**
-  The number of pods which reached phase Succeeded for a job
-  <p>
-  This metric aligns with the @code succeeded @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
-  JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobSuccessfulPods = "k8s.job.successful_pods";
-static constexpr const char *descrMetricK8sJobSuccessfulPods =
-    "The number of pods which reached phase Succeeded for a job";
-static constexpr const char *unitMetricK8sJobSuccessfulPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-/**
-  Describes number of K8s namespaces that are currently in a given phase.
-  <p>
-  This metric SHOULD, at a minimum, be reported against a
-  <a href="../resource/k8s.md#namespace">@code k8s.namespace @endcode</a> resource.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sNamespacePhase = "k8s.namespace.phase";
-static constexpr const char *descrMetricK8sNamespacePhase =
-    "Describes number of K8s namespaces that are currently in a given phase.";
-static constexpr const char *unitMetricK8sNamespacePhase = "{namespace}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase,
-                                         unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase,
-                                          unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase, unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase, unitMetricK8sNamespacePhase);
-}
-
-/**
-  Total CPU time consumed
-  <p>
-  Total CPU time consumed by the specific Node on all available CPU cores
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sNodeCpuTime     = "k8s.node.cpu.time";
-static constexpr const char *descrMetricK8sNodeCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricK8sNodeCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                    unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                    unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                             unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                              unitMetricK8sNodeCpuTime);
-}
-
-/**
-  Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
-  <p>
-  CPU usage of the specific Node on all available CPU cores, averaged over the sample window
-  <p>
-  gauge
- */
-static constexpr const char *kMetricK8sNodeCpuUsage = "k8s.node.cpu.usage";
-static constexpr const char *descrMetricK8sNodeCpuUsage =
-    "Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricK8sNodeCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                 unitMetricK8sNodeCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                  unitMetricK8sNodeCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                           unitMetricK8sNodeCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                            unitMetricK8sNodeCpuUsage);
-}
-
-/**
-  Memory usage of the Node
-  <p>
-  Total memory usage of the Node
-  <p>
-  gauge
- */
-static constexpr const char *kMetricK8sNodeMemoryUsage     = "k8s.node.memory.usage";
-static constexpr const char *descrMetricK8sNodeMemoryUsage = "Memory usage of the Node";
-static constexpr const char *unitMetricK8sNodeMemoryUsage  = "By";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                 unitMetricK8sNodeMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                  unitMetricK8sNodeMemoryUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                           unitMetricK8sNodeMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage, unitMetricK8sNodeMemoryUsage);
-}
-
-/**
-  Node network errors
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sNodeNetworkErrors     = "k8s.node.network.errors";
-static constexpr const char *descrMetricK8sNodeNetworkErrors = "Node network errors";
-static constexpr const char *unitMetricK8sNodeNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors,
-                                    unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors,
-                                    unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors, unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors, unitMetricK8sNodeNetworkErrors);
-}
-
-/**
-  Network bytes for the Node
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sNodeNetworkIo     = "k8s.node.network.io";
-static constexpr const char *descrMetricK8sNodeNetworkIo = "Network bytes for the Node";
-static constexpr const char *unitMetricK8sNodeNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sNodeNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                    unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sNodeNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                    unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                             unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                              unitMetricK8sNodeNetworkIo);
-}
-
-/**
-  The time the Node has been running
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricK8sNodeUptime     = "k8s.node.uptime";
-static constexpr const char *descrMetricK8sNodeUptime = "The time the Node has been running";
-static constexpr const char *unitMetricK8sNodeUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                 unitMetricK8sNodeUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                  unitMetricK8sNodeUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                           unitMetricK8sNodeUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                            unitMetricK8sNodeUptime);
-}
-
-/**
-  Total CPU time consumed
-  <p>
-  Total CPU time consumed by the specific Pod on all available CPU cores
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sPodCpuTime     = "k8s.pod.cpu.time";
-static constexpr const char *descrMetricK8sPodCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricK8sPodCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                    unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                    unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                             unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                              unitMetricK8sPodCpuTime);
-}
-
-/**
-  Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
-  <p>
-  CPU usage of the specific Pod on all available CPU cores, averaged over the sample window
-  <p>
-  gauge
- */
-static constexpr const char *kMetricK8sPodCpuUsage = "k8s.pod.cpu.usage";
-static constexpr const char *descrMetricK8sPodCpuUsage =
-    "Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricK8sPodCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                 unitMetricK8sPodCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                  unitMetricK8sPodCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                           unitMetricK8sPodCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                            unitMetricK8sPodCpuUsage);
-}
-
-/**
-  Memory usage of the Pod
-  <p>
-  Total memory usage of the Pod
-  <p>
-  gauge
- */
-static constexpr const char *kMetricK8sPodMemoryUsage     = "k8s.pod.memory.usage";
-static constexpr const char *descrMetricK8sPodMemoryUsage = "Memory usage of the Pod";
-static constexpr const char *unitMetricK8sPodMemoryUsage  = "By";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                 unitMetricK8sPodMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                  unitMetricK8sPodMemoryUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                           unitMetricK8sPodMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                            unitMetricK8sPodMemoryUsage);
-}
-
-/**
-  Pod network errors
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sPodNetworkErrors     = "k8s.pod.network.errors";
-static constexpr const char *descrMetricK8sPodNetworkErrors = "Pod network errors";
-static constexpr const char *unitMetricK8sPodNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors,
-                                    unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodNetworkErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors,
-                                    unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors, unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors, unitMetricK8sPodNetworkErrors);
-}
-
-/**
-  Network bytes for the Pod
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sPodNetworkIo     = "k8s.pod.network.io";
-static constexpr const char *descrMetricK8sPodNetworkIo = "Network bytes for the Pod";
-static constexpr const char *unitMetricK8sPodNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sPodNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                    unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                    unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                             unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                              unitMetricK8sPodNetworkIo);
-}
-
-/**
-  The time the Pod has been running
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricK8sPodUptime     = "k8s.pod.uptime";
-static constexpr const char *descrMetricK8sPodUptime = "The time the Pod has been running";
-static constexpr const char *unitMetricK8sPodUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                 unitMetricK8sPodUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                  unitMetricK8sPodUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                           unitMetricK8sPodUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                            unitMetricK8sPodUptime);
-}
-
-/**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  replicaset <p> This metric aligns with the @code availableReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetstatus-v1-apps">K8s
-  ReplicaSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#replicaset">@code k8s.replicaset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicasetAvailablePods = "k8s.replicaset.available_pods";
-static constexpr const char *descrMetricK8sReplicasetAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replicaset";
-static constexpr const char *unitMetricK8sReplicasetAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                         descrMetricK8sReplicasetAvailablePods,
-                                         unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                          descrMetricK8sReplicasetAvailablePods,
-                                          unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                                   descrMetricK8sReplicasetAvailablePods,
-                                                   unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                                    descrMetricK8sReplicasetAvailablePods,
-                                                    unitMetricK8sReplicasetAvailablePods);
-}
-
-/**
-  Number of desired replica pods in this replicaset
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetspec-v1-apps">K8s
-  ReplicaSetSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#replicaset">@code k8s.replicaset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicasetDesiredPods = "k8s.replicaset.desired_pods";
-static constexpr const char *descrMetricK8sReplicasetDesiredPods =
-    "Number of desired replica pods in this replicaset";
-static constexpr const char *unitMetricK8sReplicasetDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                         descrMetricK8sReplicasetDesiredPods,
-                                         unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                          descrMetricK8sReplicasetDesiredPods,
-                                          unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                   descrMetricK8sReplicasetDesiredPods,
-                                                   unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                    descrMetricK8sReplicasetDesiredPods,
-                                                    unitMetricK8sReplicasetDesiredPods);
-}
-
-/**
-  Deprecated, use @code k8s.replicationcontroller.available_pods @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code k8s.replicationcontroller.available_pods @endcode.", "reason":
-  "renamed", "renamed_to": "k8s.replicationcontroller.available_pods"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerAvailablePods =
-    "k8s.replication_controller.available_pods";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricK8sReplicationControllerAvailablePods =
-        "Deprecated, use `k8s.replicationcontroller.available_pods` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricK8sReplicationControllerAvailablePods = "{pod}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                         descrMetricK8sReplicationControllerAvailablePods,
-                                         unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                          descrMetricK8sReplicationControllerAvailablePods,
-                                          unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                                   descrMetricK8sReplicationControllerAvailablePods,
-                                                   unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sReplicationControllerAvailablePods,
-      descrMetricK8sReplicationControllerAvailablePods,
-      unitMetricK8sReplicationControllerAvailablePods);
-}
-
-/**
-  Deprecated, use @code k8s.replicationcontroller.desired_pods @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code k8s.replicationcontroller.desired_pods @endcode.", "reason":
-  "renamed", "renamed_to": "k8s.replicationcontroller.desired_pods"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerDesiredPods =
-    "k8s.replication_controller.desired_pods";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricK8sReplicationControllerDesiredPods =
-        "Deprecated, use `k8s.replicationcontroller.desired_pods` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricK8sReplicationControllerDesiredPods = "{pod}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                         descrMetricK8sReplicationControllerDesiredPods,
-                                         unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                          descrMetricK8sReplicationControllerDesiredPods,
-                                          unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                                   descrMetricK8sReplicationControllerDesiredPods,
-                                                   unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                                    descrMetricK8sReplicationControllerDesiredPods,
-                                                    unitMetricK8sReplicationControllerDesiredPods);
-}
-
-/**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  replication controller <p> This metric aligns with the @code availableReplicas @endcode field of
-  the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core">K8s
-  ReplicationControllerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
-  resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicationcontrollerAvailablePods =
-    "k8s.replicationcontroller.available_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replication controller";
-static constexpr const char *unitMetricK8sReplicationcontrollerAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                         descrMetricK8sReplicationcontrollerAvailablePods,
-                                         unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                          descrMetricK8sReplicationcontrollerAvailablePods,
-                                          unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                                   descrMetricK8sReplicationcontrollerAvailablePods,
-                                                   unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sReplicationcontrollerAvailablePods,
-      descrMetricK8sReplicationcontrollerAvailablePods,
-      unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-/**
-  Number of desired replica pods in this replication controller
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core">K8s
-  ReplicationControllerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
-  resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicationcontrollerDesiredPods =
-    "k8s.replicationcontroller.desired_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerDesiredPods =
-    "Number of desired replica pods in this replication controller";
-static constexpr const char *unitMetricK8sReplicationcontrollerDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                         descrMetricK8sReplicationcontrollerDesiredPods,
-                                         unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                          descrMetricK8sReplicationcontrollerDesiredPods,
-                                          unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                                   descrMetricK8sReplicationcontrollerDesiredPods,
-                                                   unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                                    descrMetricK8sReplicationcontrollerDesiredPods,
-                                                    unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-/**
-  The number of replica pods created by the statefulset controller from the statefulset version
-  indicated by currentRevision <p> This metric aligns with the @code currentReplicas @endcode field
-  of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
-  StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetCurrentPods = "k8s.statefulset.current_pods";
-static constexpr const char *descrMetricK8sStatefulsetCurrentPods =
-    "The number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by currentRevision";
-static constexpr const char *unitMetricK8sStatefulsetCurrentPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                         descrMetricK8sStatefulsetCurrentPods,
-                                         unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                          descrMetricK8sStatefulsetCurrentPods,
-                                          unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                                   descrMetricK8sStatefulsetCurrentPods,
-                                                   unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                                    descrMetricK8sStatefulsetCurrentPods,
-                                                    unitMetricK8sStatefulsetCurrentPods);
-}
-
-/**
-  Number of desired replica pods in this statefulset
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetspec-v1-apps">K8s
-  StatefulSetSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetDesiredPods = "k8s.statefulset.desired_pods";
-static constexpr const char *descrMetricK8sStatefulsetDesiredPods =
-    "Number of desired replica pods in this statefulset";
-static constexpr const char *unitMetricK8sStatefulsetDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                         descrMetricK8sStatefulsetDesiredPods,
-                                         unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                          descrMetricK8sStatefulsetDesiredPods,
-                                          unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                                   descrMetricK8sStatefulsetDesiredPods,
-                                                   unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                                    descrMetricK8sStatefulsetDesiredPods,
-                                                    unitMetricK8sStatefulsetDesiredPods);
-}
-
-/**
-  The number of replica pods created for this statefulset with a Ready Condition
-  <p>
-  This metric aligns with the @code readyReplicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
-  StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetReadyPods = "k8s.statefulset.ready_pods";
-static constexpr const char *descrMetricK8sStatefulsetReadyPods =
-    "The number of replica pods created for this statefulset with a Ready Condition";
-static constexpr const char *unitMetricK8sStatefulsetReadyPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                         descrMetricK8sStatefulsetReadyPods,
-                                         unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                          descrMetricK8sStatefulsetReadyPods,
-                                          unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                                   descrMetricK8sStatefulsetReadyPods,
-                                                   unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                                    descrMetricK8sStatefulsetReadyPods,
-                                                    unitMetricK8sStatefulsetReadyPods);
-}
-
-/**
-  Number of replica pods created by the statefulset controller from the statefulset version
-  indicated by updateRevision <p> This metric aligns with the @code updatedReplicas @endcode field
-  of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
-  StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetUpdatedPods = "k8s.statefulset.updated_pods";
-static constexpr const char *descrMetricK8sStatefulsetUpdatedPods =
-    "Number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by updateRevision";
-static constexpr const char *unitMetricK8sStatefulsetUpdatedPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                         descrMetricK8sStatefulsetUpdatedPods,
-                                         unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                          descrMetricK8sStatefulsetUpdatedPods,
-                                          unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                                   descrMetricK8sStatefulsetUpdatedPods,
-                                                   unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                                    descrMetricK8sStatefulsetUpdatedPods,
-                                                    unitMetricK8sStatefulsetUpdatedPods);
-}
-
-}  // namespace k8s
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/linux_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/linux_attributes.h
deleted file mode 100644
index c3f90337a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/linux_attributes.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace linux
-{
-
-/**
-  The Linux Slab memory state
- */
-static constexpr const char *kLinuxMemorySlabState = "linux.memory.slab.state";
-
-namespace LinuxMemorySlabStateValues
-{
-/**
-  none
- */
-static constexpr const char *kReclaimable = "reclaimable";
-
-/**
-  none
- */
-static constexpr const char *kUnreclaimable = "unreclaimable";
-
-}  // namespace LinuxMemorySlabStateValues
-
-}  // namespace linux
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/log_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/log_attributes.h
deleted file mode 100644
index 7655a4008..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/log_attributes.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace log
-{
-
-/**
-  The basename of the file.
- */
-static constexpr const char *kLogFileName = "log.file.name";
-
-/**
-  The basename of the file, with symlinks resolved.
- */
-static constexpr const char *kLogFileNameResolved = "log.file.name_resolved";
-
-/**
-  The full path to the file.
- */
-static constexpr const char *kLogFilePath = "log.file.path";
-
-/**
-  The full path to the file, with symlinks resolved.
- */
-static constexpr const char *kLogFilePathResolved = "log.file.path_resolved";
-
-/**
-  The stream associated with the log. See below for a list of well-known values.
- */
-static constexpr const char *kLogIostream = "log.iostream";
-
-/**
-  The complete original Log Record.
-  <p>
-  This value MAY be added when processing a Log Record which was originally transmitted as a string
-  or equivalent data type AND the Body field of the Log Record does not contain the same value.
-  (e.g. a syslog or a log record read from a file.)
- */
-static constexpr const char *kLogRecordOriginal = "log.record.original";
-
-/**
-  A unique identifier for the Log Record.
-  <p>
-  If an id is provided, other log records with the same id will be considered duplicates and can be
-  removed safely. This means, that two distinguishable log records MUST have different values. The
-  id MAY be an <a href="https://github.com/ulid/spec">Universally Unique Lexicographically Sortable
-  Identifier (ULID)</a>, but other identifiers (e.g. UUID) may be used as needed.
- */
-static constexpr const char *kLogRecordUid = "log.record.uid";
-
-namespace LogIostreamValues
-{
-/**
-  Logs from stdout stream
- */
-static constexpr const char *kStdout = "stdout";
-
-/**
-  Events from stderr stream
- */
-static constexpr const char *kStderr = "stderr";
-
-}  // namespace LogIostreamValues
-
-}  // namespace log
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/message_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/message_attributes.h
deleted file mode 100644
index 05941248c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/message_attributes.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace message
-{
-
-/**
-  Deprecated, use @code rpc.message.compressed_size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code rpc.message.compressed_size @endcode.", "reason": "renamed",
-  "renamed_to": "rpc.message.compressed_size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize =
-    "message.compressed_size";
-
-/**
-  Deprecated, use @code rpc.message.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code rpc.message.id @endcode.", "reason": "renamed", "renamed_to":
-  "rpc.message.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id";
-
-/**
-  Deprecated, use @code rpc.message.type @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code rpc.message.type @endcode.", "reason": "renamed", "renamed_to":
-  "rpc.message.type"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type";
-
-/**
-  Deprecated, use @code rpc.message.uncompressed_size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code rpc.message.uncompressed_size @endcode.", "reason": "renamed",
-  "renamed_to": "rpc.message.uncompressed_size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize =
-    "message.uncompressed_size";
-
-namespace MessageTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kSent = "SENT";
-
-/**
-  none
- */
-static constexpr const char *kReceived = "RECEIVED";
-
-}  // namespace MessageTypeValues
-
-}  // namespace message
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/messaging_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/messaging_attributes.h
deleted file mode 100644
index f036c3654..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/messaging_attributes.h
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace messaging
-{
-
-/**
-  The number of messages sent, received, or processed in the scope of the batching operation.
-  <p>
-  Instrumentations SHOULD NOT set @code messaging.batch.message_count @endcode on spans that operate
-  with a single message. When a messaging client library supports both batch and single-message API
-  for the same operation, instrumentations SHOULD use @code messaging.batch.message_count @endcode
-  for batching APIs and SHOULD NOT use it for single-message APIs.
- */
-static constexpr const char *kMessagingBatchMessageCount = "messaging.batch.message_count";
-
-/**
-  A unique identifier for the client that consumes or produces a message.
- */
-static constexpr const char *kMessagingClientId = "messaging.client.id";
-
-/**
-  The name of the consumer group with which a consumer is associated.
-  <p>
-  Semantic conventions for individual messaging systems SHOULD document whether @code
-  messaging.consumer.group.name @endcode is applicable and what it means in the context of that
-  system.
- */
-static constexpr const char *kMessagingConsumerGroupName = "messaging.consumer.group.name";
-
-/**
-  A boolean that is true if the message destination is anonymous (could be unnamed or have
-  auto-generated name).
- */
-static constexpr const char *kMessagingDestinationAnonymous = "messaging.destination.anonymous";
-
-/**
-  The message destination name
-  <p>
-  Destination name SHOULD uniquely identify a specific queue, topic or other entity within the
-  broker. If the broker doesn't have such notion, the destination name SHOULD uniquely identify the
-  broker.
- */
-static constexpr const char *kMessagingDestinationName = "messaging.destination.name";
-
-/**
-  The identifier of the partition messages are sent to or received from, unique within the @code
-  messaging.destination.name @endcode.
- */
-static constexpr const char *kMessagingDestinationPartitionId =
-    "messaging.destination.partition.id";
-
-/**
-  The name of the destination subscription from which a message is consumed.
-  <p>
-  Semantic conventions for individual messaging systems SHOULD document whether @code
-  messaging.destination.subscription.name @endcode is applicable and what it means in the context of
-  that system.
- */
-static constexpr const char *kMessagingDestinationSubscriptionName =
-    "messaging.destination.subscription.name";
-
-/**
-  Low cardinality representation of the messaging destination name
-  <p>
-  Destination names could be constructed from templates. An example would be a destination name
-  involving a user name or product id. Although the destination name in this case is of high
-  cardinality, the underlying template is of low cardinality and can be effectively used for
-  grouping and aggregation.
- */
-static constexpr const char *kMessagingDestinationTemplate = "messaging.destination.template";
-
-/**
-  A boolean that is true if the message destination is temporary and might not exist anymore after
-  messages are processed.
- */
-static constexpr const char *kMessagingDestinationTemporary = "messaging.destination.temporary";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed. No replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous =
-    "messaging.destination_publish.anonymous";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed. No replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName =
-    "messaging.destination_publish.name";
-
-/**
-  Deprecated, use @code messaging.consumer.group.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.consumer.group.name @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.consumer.group.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup =
-    "messaging.eventhubs.consumer.group";
-
-/**
-  The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingEventhubsMessageEnqueuedTime =
-    "messaging.eventhubs.message.enqueued_time";
-
-/**
-  The ack deadline in seconds set for the modify ack deadline request.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckDeadline =
-    "messaging.gcp_pubsub.message.ack_deadline";
-
-/**
-  The ack id for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckId =
-    "messaging.gcp_pubsub.message.ack_id";
-
-/**
-  The delivery attempt for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageDeliveryAttempt =
-    "messaging.gcp_pubsub.message.delivery_attempt";
-
-/**
-  The ordering key for a given message. If the attribute is not present, the message does not have
-  an ordering key.
- */
-static constexpr const char *kMessagingGcpPubsubMessageOrderingKey =
-    "messaging.gcp_pubsub.message.ordering_key";
-
-/**
-  Deprecated, use @code messaging.consumer.group.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.consumer.group.name @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.consumer.group.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup =
-    "messaging.kafka.consumer.group";
-
-/**
-  Deprecated, use @code messaging.destination.partition.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.destination.partition.id @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.destination.partition.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
-    "messaging.kafka.destination.partition";
-
-/**
-  Message keys in Kafka are used for grouping alike messages to ensure they're processed on the same
-  partition. They differ from @code messaging.message.id @endcode in that they're not unique. If the
-  key is @code null @endcode, the attribute MUST NOT be set. <p> If the key type is not string, it's
-  string representation has to be supplied for the attribute. If the key has no unambiguous,
-  canonical string form, don't include its value.
- */
-static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.message.key";
-
-/**
-  Deprecated, use @code messaging.kafka.offset @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.kafka.offset @endcode.", "reason": "renamed", "renamed_to":
-  "messaging.kafka.offset"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset =
-    "messaging.kafka.message.offset";
-
-/**
-  A boolean that is true if the message is a tombstone.
- */
-static constexpr const char *kMessagingKafkaMessageTombstone = "messaging.kafka.message.tombstone";
-
-/**
-  The offset of a record in the corresponding Kafka partition.
- */
-static constexpr const char *kMessagingKafkaOffset = "messaging.kafka.offset";
-
-/**
-  The size of the message body in bytes.
-  <p>
-  This can refer to both the compressed or uncompressed body size. If both sizes are known, the
-  uncompressed body size should be used.
- */
-static constexpr const char *kMessagingMessageBodySize = "messaging.message.body.size";
-
-/**
-  The conversation ID identifying the conversation to which the message belongs, represented as a
-  string. Sometimes called "Correlation ID".
- */
-static constexpr const char *kMessagingMessageConversationId = "messaging.message.conversation_id";
-
-/**
-  The size of the message body and metadata in bytes.
-  <p>
-  This can refer to both the compressed or uncompressed size. If both sizes are known, the
-  uncompressed size should be used.
- */
-static constexpr const char *kMessagingMessageEnvelopeSize = "messaging.message.envelope.size";
-
-/**
-  A value used by the messaging system as an identifier for the message, represented as a string.
- */
-static constexpr const char *kMessagingMessageId = "messaging.message.id";
-
-/**
-  Deprecated, use @code messaging.operation.type @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.operation.type @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.operation.type"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation";
-
-/**
-  The system-specific name of the messaging operation.
- */
-static constexpr const char *kMessagingOperationName = "messaging.operation.name";
-
-/**
-  A string identifying the type of the messaging operation.
-  <p>
-  If a custom value is used, it MUST be of low cardinality.
- */
-static constexpr const char *kMessagingOperationType = "messaging.operation.type";
-
-/**
-  RabbitMQ message routing key.
- */
-static constexpr const char *kMessagingRabbitmqDestinationRoutingKey =
-    "messaging.rabbitmq.destination.routing_key";
-
-/**
-  RabbitMQ message delivery tag
- */
-static constexpr const char *kMessagingRabbitmqMessageDeliveryTag =
-    "messaging.rabbitmq.message.delivery_tag";
-
-/**
-  Deprecated, use @code messaging.consumer.group.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.consumer.group.name @endcode on the consumer spans. No
-  replacement for producer spans.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup =
-    "messaging.rocketmq.client_group";
-
-/**
-  Model of message consumption. This only applies to consumer spans.
- */
-static constexpr const char *kMessagingRocketmqConsumptionModel =
-    "messaging.rocketmq.consumption_model";
-
-/**
-  The delay time level for delay message, which determines the message delay time.
- */
-static constexpr const char *kMessagingRocketmqMessageDelayTimeLevel =
-    "messaging.rocketmq.message.delay_time_level";
-
-/**
-  The timestamp in milliseconds that the delay message is expected to be delivered to consumer.
- */
-static constexpr const char *kMessagingRocketmqMessageDeliveryTimestamp =
-    "messaging.rocketmq.message.delivery_timestamp";
-
-/**
-  It is essential for FIFO message. Messages that belong to the same message group are always
-  processed one by one within the same consumer group.
- */
-static constexpr const char *kMessagingRocketmqMessageGroup = "messaging.rocketmq.message.group";
-
-/**
-  Key(s) of message, another way to mark message besides message id.
- */
-static constexpr const char *kMessagingRocketmqMessageKeys = "messaging.rocketmq.message.keys";
-
-/**
-  The secondary classifier of message besides topic.
- */
-static constexpr const char *kMessagingRocketmqMessageTag = "messaging.rocketmq.message.tag";
-
-/**
-  Type of message.
- */
-static constexpr const char *kMessagingRocketmqMessageType = "messaging.rocketmq.message.type";
-
-/**
-  Namespace of RocketMQ resources, resources in different namespaces are individual.
- */
-static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.namespace";
-
-/**
-  Deprecated, use @code messaging.destination.subscription.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.destination.subscription.name @endcode.", "reason":
-  "renamed", "renamed_to": "messaging.destination.subscription.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *kMessagingServicebusDestinationSubscriptionName =
-        "messaging.servicebus.destination.subscription_name";
-
-/**
-  Describes the <a
-  href="https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock">settlement
-  type</a>.
- */
-static constexpr const char *kMessagingServicebusDispositionStatus =
-    "messaging.servicebus.disposition_status";
-
-/**
-  Number of deliveries that have been attempted for this message.
- */
-static constexpr const char *kMessagingServicebusMessageDeliveryCount =
-    "messaging.servicebus.message.delivery_count";
-
-/**
-  The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingServicebusMessageEnqueuedTime =
-    "messaging.servicebus.message.enqueued_time";
-
-/**
-  The messaging system as identified by the client instrumentation.
-  <p>
-  The actual messaging system may differ from the one known by the client. For example, when using
-  Kafka client libraries to communicate with Azure Event Hubs, the @code messaging.system @endcode
-  is set to @code kafka @endcode based on the instrumentation's best knowledge.
- */
-static constexpr const char *kMessagingSystem = "messaging.system";
-
-namespace MessagingOperationTypeValues
-{
-/**
-  A message is created. "Create" spans always refer to a single message and are used to provide a
-  unique creation context for messages in batch sending scenarios.
- */
-static constexpr const char *kCreate = "create";
-
-/**
-  One or more messages are provided for sending to an intermediary. If a single message is sent, the
-  context of the "Send" span can be used as the creation context and no "Create" span needs to be
-  created.
- */
-static constexpr const char *kSend = "send";
-
-/**
-  One or more messages are requested by a consumer. This operation refers to pull-based scenarios,
-  where consumers explicitly call methods of messaging SDKs to receive messages.
- */
-static constexpr const char *kReceive = "receive";
-
-/**
-  One or more messages are processed by a consumer.
- */
-static constexpr const char *kProcess = "process";
-
-/**
-  One or more messages are settled.
- */
-static constexpr const char *kSettle = "settle";
-
-/**
-  Deprecated. Use @code process @endcode instead.
- */
-static constexpr const char *kDeliver = "deliver";
-
-/**
-  Deprecated. Use @code send @endcode instead.
- */
-static constexpr const char *kPublish = "publish";
-
-}  // namespace MessagingOperationTypeValues
-
-namespace MessagingRocketmqConsumptionModelValues
-{
-/**
-  Clustering consumption model
- */
-static constexpr const char *kClustering = "clustering";
-
-/**
-  Broadcasting consumption model
- */
-static constexpr const char *kBroadcasting = "broadcasting";
-
-}  // namespace MessagingRocketmqConsumptionModelValues
-
-namespace MessagingRocketmqMessageTypeValues
-{
-/**
-  Normal message
- */
-static constexpr const char *kNormal = "normal";
-
-/**
-  FIFO message
- */
-static constexpr const char *kFifo = "fifo";
-
-/**
-  Delay message
- */
-static constexpr const char *kDelay = "delay";
-
-/**
-  Transaction message
- */
-static constexpr const char *kTransaction = "transaction";
-
-}  // namespace MessagingRocketmqMessageTypeValues
-
-namespace MessagingServicebusDispositionStatusValues
-{
-/**
-  Message is completed
- */
-static constexpr const char *kComplete = "complete";
-
-/**
-  Message is abandoned
- */
-static constexpr const char *kAbandon = "abandon";
-
-/**
-  Message is sent to dead letter queue
- */
-static constexpr const char *kDeadLetter = "dead_letter";
-
-/**
-  Message is deferred
- */
-static constexpr const char *kDefer = "defer";
-
-}  // namespace MessagingServicebusDispositionStatusValues
-
-namespace MessagingSystemValues
-{
-/**
-  Apache ActiveMQ
- */
-static constexpr const char *kActivemq = "activemq";
-
-/**
-  Amazon Simple Queue Service (SQS)
- */
-static constexpr const char *kAwsSqs = "aws_sqs";
-
-/**
-  Azure Event Grid
- */
-static constexpr const char *kEventgrid = "eventgrid";
-
-/**
-  Azure Event Hubs
- */
-static constexpr const char *kEventhubs = "eventhubs";
-
-/**
-  Azure Service Bus
- */
-static constexpr const char *kServicebus = "servicebus";
-
-/**
-  Google Cloud Pub/Sub
- */
-static constexpr const char *kGcpPubsub = "gcp_pubsub";
-
-/**
-  Java Message Service
- */
-static constexpr const char *kJms = "jms";
-
-/**
-  Apache Kafka
- */
-static constexpr const char *kKafka = "kafka";
-
-/**
-  RabbitMQ
- */
-static constexpr const char *kRabbitmq = "rabbitmq";
-
-/**
-  Apache RocketMQ
- */
-static constexpr const char *kRocketmq = "rocketmq";
-
-/**
-  Apache Pulsar
- */
-static constexpr const char *kPulsar = "pulsar";
-
-}  // namespace MessagingSystemValues
-
-}  // namespace messaging
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/messaging_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/messaging_metrics.h
deleted file mode 100644
index e9bdcf32e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/messaging_metrics.h
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace messaging
-{
-
-/**
-  Number of messages that were delivered to the application.
-  <p>
-  Records the number of messages pulled from the broker or number of messages dispatched to the
-  application in push-based scenarios. The metric SHOULD be reported once per message delivery. For
-  example, if receiving and processing operations are both instrumented for a single message
-  delivery, this counter is incremented when the message is received and not reported when it is
-  processed. <p> counter
- */
-static constexpr const char *kMetricMessagingClientConsumedMessages =
-    "messaging.client.consumed.messages";
-static constexpr const char *descrMetricMessagingClientConsumedMessages =
-    "Number of messages that were delivered to the application.";
-static constexpr const char *unitMetricMessagingClientConsumedMessages = "{message}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientConsumedMessages,
-                                    descrMetricMessagingClientConsumedMessages,
-                                    unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientConsumedMessages,
-                                    descrMetricMessagingClientConsumedMessages,
-                                    unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientConsumedMessages,
-                                             descrMetricMessagingClientConsumedMessages,
-                                             unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientConsumedMessages,
-                                              descrMetricMessagingClientConsumedMessages,
-                                              unitMetricMessagingClientConsumedMessages);
-}
-
-/**
-  Duration of messaging operation initiated by a producer or consumer client.
-  <p>
-  This metric SHOULD NOT be used to report processing duration - processing duration is reported in
-  @code messaging.process.duration @endcode metric. <p> histogram
- */
-static constexpr const char *kMetricMessagingClientOperationDuration =
-    "messaging.client.operation.duration";
-static constexpr const char *descrMetricMessagingClientOperationDuration =
-    "Duration of messaging operation initiated by a producer or consumer client.";
-static constexpr const char *unitMetricMessagingClientOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingClientOperationDuration,
-                                      descrMetricMessagingClientOperationDuration,
-                                      unitMetricMessagingClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingClientOperationDuration,
-                                      descrMetricMessagingClientOperationDuration,
-                                      unitMetricMessagingClientOperationDuration);
-}
-
-/**
-  Deprecated. Use @code messaging.client.sent.messages @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.sent.messages"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingClientPublishedMessages =
-    "messaging.client.published.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingClientPublishedMessages =
-    "Deprecated. Use `messaging.client.sent.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingClientPublishedMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientPublishedMessages,
-                                    descrMetricMessagingClientPublishedMessages,
-                                    unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientPublishedMessages,
-                                    descrMetricMessagingClientPublishedMessages,
-                                    unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientPublishedMessages,
-                                             descrMetricMessagingClientPublishedMessages,
-                                             unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientPublishedMessages,
-                                              descrMetricMessagingClientPublishedMessages,
-                                              unitMetricMessagingClientPublishedMessages);
-}
-
-/**
-  Number of messages producer attempted to send to the broker.
-  <p>
-  This metric MUST NOT count messages that were created but haven't yet been sent.
-  <p>
-  counter
- */
-static constexpr const char *kMetricMessagingClientSentMessages = "messaging.client.sent.messages";
-static constexpr const char *descrMetricMessagingClientSentMessages =
-    "Number of messages producer attempted to send to the broker.";
-static constexpr const char *unitMetricMessagingClientSentMessages = "{message}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientSentMessages,
-                                    descrMetricMessagingClientSentMessages,
-                                    unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientSentMessages,
-                                    descrMetricMessagingClientSentMessages,
-                                    unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientSentMessages,
-                                             descrMetricMessagingClientSentMessages,
-                                             unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientSentMessages,
-                                              descrMetricMessagingClientSentMessages,
-                                              unitMetricMessagingClientSentMessages);
-}
-
-/**
-  Duration of processing operation.
-  <p>
-  This metric MUST be reported for operations with @code messaging.operation.type @endcode that
-  matches @code process @endcode. <p> histogram
- */
-static constexpr const char *kMetricMessagingProcessDuration = "messaging.process.duration";
-static constexpr const char *descrMetricMessagingProcessDuration =
-    "Duration of processing operation.";
-static constexpr const char *unitMetricMessagingProcessDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingProcessDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingProcessDuration,
-                                      descrMetricMessagingProcessDuration,
-                                      unitMetricMessagingProcessDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingProcessDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingProcessDuration,
-                                      descrMetricMessagingProcessDuration,
-                                      unitMetricMessagingProcessDuration);
-}
-
-/**
-  Deprecated. Use @code messaging.client.consumed.messages @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.consumed.messages"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingProcessMessages =
-    "messaging.process.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingProcessMessages =
-    "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingProcessMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingProcessMessages,
-                                    descrMetricMessagingProcessMessages,
-                                    unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingProcessMessages,
-                                    descrMetricMessagingProcessMessages,
-                                    unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingProcessMessages,
-                                             descrMetricMessagingProcessMessages,
-                                             unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingProcessMessages,
-                                              descrMetricMessagingProcessMessages,
-                                              unitMetricMessagingProcessMessages);
-}
-
-/**
-  Deprecated. Use @code messaging.client.operation.duration @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.operation.duration"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishDuration =
-    "messaging.publish.duration";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishDuration =
-    "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishDuration = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingPublishDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingPublishDuration,
-                                      descrMetricMessagingPublishDuration,
-                                      unitMetricMessagingPublishDuration);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingPublishDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingPublishDuration,
-                                      descrMetricMessagingPublishDuration,
-                                      unitMetricMessagingPublishDuration);
-}
-
-/**
-  Deprecated. Use @code messaging.client.sent.messages @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.sent.messages"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishMessages =
-    "messaging.publish.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishMessages =
-    "Deprecated. Use `messaging.client.sent.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingPublishMessages,
-                                    descrMetricMessagingPublishMessages,
-                                    unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingPublishMessages,
-                                    descrMetricMessagingPublishMessages,
-                                    unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingPublishMessages,
-                                             descrMetricMessagingPublishMessages,
-                                             unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingPublishMessages,
-                                              descrMetricMessagingPublishMessages,
-                                              unitMetricMessagingPublishMessages);
-}
-
-/**
-  Deprecated. Use @code messaging.client.operation.duration @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.operation.duration"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveDuration =
-    "messaging.receive.duration";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveDuration =
-    "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveDuration = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingReceiveDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingReceiveDuration,
-                                      descrMetricMessagingReceiveDuration,
-                                      unitMetricMessagingReceiveDuration);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingReceiveDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingReceiveDuration,
-                                      descrMetricMessagingReceiveDuration,
-                                      unitMetricMessagingReceiveDuration);
-}
-
-/**
-  Deprecated. Use @code messaging.client.consumed.messages @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.consumed.messages"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveMessages =
-    "messaging.receive.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveMessages =
-    "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingReceiveMessages,
-                                    descrMetricMessagingReceiveMessages,
-                                    unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingReceiveMessages,
-                                    descrMetricMessagingReceiveMessages,
-                                    unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingReceiveMessages,
-                                             descrMetricMessagingReceiveMessages,
-                                             unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingReceiveMessages,
-                                              descrMetricMessagingReceiveMessages,
-                                              unitMetricMessagingReceiveMessages);
-}
-
-}  // namespace messaging
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/net_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/net_attributes.h
deleted file mode 100644
index 951217616..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/net_attributes.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace net
-{
-
-/**
-  Deprecated, use @code network.local.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.local.address @endcode.", "reason": "renamed", "renamed_to":
-  "network.local.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip";
-
-/**
-  Deprecated, use @code server.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to":
-  "server.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name";
-
-/**
-  Deprecated, use @code server.port @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code server.port @endcode.", "reason": "renamed", "renamed_to":
-  "server.port"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port";
-
-/**
-  Deprecated, use @code network.peer.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.peer.address @endcode.", "reason": "renamed", "renamed_to":
-  "network.peer.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip";
-
-/**
-  Deprecated, use @code server.address @endcode on client spans and @code client.address @endcode on
-  server spans.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode on client spans and @code client.address
-  @endcode on server spans.", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerName = "net.peer.name";
-
-/**
-  Deprecated, use @code server.port @endcode on client spans and @code client.port @endcode on
-  server spans.
-
-  @deprecated
-  {"note": "Replaced by @code server.port @endcode on client spans and @code client.port @endcode on
-  server spans.", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.port";
-
-/**
-  Deprecated, use @code network.protocol.name @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "renamed", "renamed_to":
-  "network.protocol.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name";
-
-/**
-  Deprecated, use @code network.protocol.version @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.protocol.version @endcode.", "reason": "renamed",
-  "renamed_to": "network.protocol.version"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version";
-
-/**
-  Deprecated, use @code network.transport @endcode and @code network.type @endcode.
-
-  @deprecated
-  {"note": "Split to @code network.transport @endcode and @code network.type @endcode.", "reason":
-  "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock.family";
-
-/**
-  Deprecated, use @code network.local.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.local.address @endcode.", "reason": "renamed", "renamed_to":
-  "network.local.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
-
-/**
-  Deprecated, use @code network.local.port @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.local.port @endcode.", "reason": "renamed", "renamed_to":
-  "network.local.port"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port";
-
-/**
-  Deprecated, use @code network.peer.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.peer.address @endcode.", "reason": "renamed", "renamed_to":
-  "network.peer.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed. No replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
-
-/**
-  Deprecated, use @code network.peer.port @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.peer.port @endcode.", "reason": "renamed", "renamed_to":
-  "network.peer.port"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
-
-/**
-  Deprecated, use @code network.transport @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.transport @endcode.", "reason": "renamed", "renamed_to":
-  "network.transport"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport";
-
-namespace NetSockFamilyValues
-{
-/**
-  IPv4 address
- */
-static constexpr const char *kInet = "inet";
-
-/**
-  IPv6 address
- */
-static constexpr const char *kInet6 = "inet6";
-
-/**
-  Unix domain socket path
- */
-static constexpr const char *kUnix = "unix";
-
-}  // namespace NetSockFamilyValues
-
-namespace NetTransportValues
-{
-/**
-  none
- */
-static constexpr const char *kIpTcp = "ip_tcp";
-
-/**
-  none
- */
-static constexpr const char *kIpUdp = "ip_udp";
-
-/**
-  Named or anonymous pipe.
- */
-static constexpr const char *kPipe = "pipe";
-
-/**
-  In-process communication.
- */
-static constexpr const char *kInproc = "inproc";
-
-/**
-  Something else (non IP-based).
- */
-static constexpr const char *kOther = "other";
-
-}  // namespace NetTransportValues
-
-}  // namespace net
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/network_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/network_attributes.h
deleted file mode 100644
index 7b8404b2c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/network_attributes.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace network
-{
-
-/**
-  The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network.
- */
-static constexpr const char *kNetworkCarrierIcc = "network.carrier.icc";
-
-/**
-  The mobile carrier country code.
- */
-static constexpr const char *kNetworkCarrierMcc = "network.carrier.mcc";
-
-/**
-  The mobile carrier network code.
- */
-static constexpr const char *kNetworkCarrierMnc = "network.carrier.mnc";
-
-/**
-  The name of the mobile carrier.
- */
-static constexpr const char *kNetworkCarrierName = "network.carrier.name";
-
-/**
-  The state of network connection
-  <p>
-  Connection states are defined as part of the <a
-  href="https://datatracker.ietf.org/doc/html/rfc9293#section-3.3.2">rfc9293</a>
- */
-static constexpr const char *kNetworkConnectionState = "network.connection.state";
-
-/**
-  This describes more details regarding the connection.type. It may be the type of cell technology
-  connection, but it could be used for describing details about a wifi connection.
- */
-static constexpr const char *kNetworkConnectionSubtype = "network.connection.subtype";
-
-/**
-  The internet connection type.
- */
-static constexpr const char *kNetworkConnectionType = "network.connection.type";
-
-/**
-  The network interface name.
- */
-static constexpr const char *kNetworkInterfaceName = "network.interface.name";
-
-/**
-  The network IO operation direction.
- */
-static constexpr const char *kNetworkIoDirection = "network.io.direction";
-
-/**
-  Local address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkLocalAddress = "network.local.address";
-
-/**
-  Local port number of the network connection.
- */
-static constexpr const char *kNetworkLocalPort = "network.local.port";
-
-/**
-  Peer address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkPeerAddress = "network.peer.address";
-
-/**
-  Peer port number of the network connection.
- */
-static constexpr const char *kNetworkPeerPort = "network.peer.port";
-
-/**
-  <a href="https://wikipedia.org/wiki/Application_layer">OSI application layer</a> or non-OSI
-  equivalent. <p> The value SHOULD be normalized to lowercase.
- */
-static constexpr const char *kNetworkProtocolName = "network.protocol.name";
-
-/**
-  The actual version of the protocol used for network communication.
-  <p>
-  If protocol version is subject to negotiation (for example using <a
-  href="https://www.rfc-editor.org/rfc/rfc7301.html">ALPN</a>), this attribute SHOULD be set to the
-  negotiated version. If the actual protocol version is not known, this attribute SHOULD NOT be set.
- */
-static constexpr const char *kNetworkProtocolVersion = "network.protocol.version";
-
-/**
-  <a href="https://wikipedia.org/wiki/Transport_layer">OSI transport layer</a> or <a
-  href="https://wikipedia.org/wiki/Inter-process_communication">inter-process communication
-  method</a>. <p> The value SHOULD be normalized to lowercase. <p> Consider always setting the
-  transport when setting a port number, since a port number is ambiguous without knowing the
-  transport. For example different processes could be listening on TCP port 12345 and UDP port
-  12345.
- */
-static constexpr const char *kNetworkTransport = "network.transport";
-
-/**
-  <a href="https://wikipedia.org/wiki/Network_layer">OSI network layer</a> or non-OSI equivalent.
-  <p>
-  The value SHOULD be normalized to lowercase.
- */
-static constexpr const char *kNetworkType = "network.type";
-
-namespace NetworkConnectionStateValues
-{
-/**
-  none
- */
-static constexpr const char *kClosed = "closed";
-
-/**
-  none
- */
-static constexpr const char *kCloseWait = "close_wait";
-
-/**
-  none
- */
-static constexpr const char *kClosing = "closing";
-
-/**
-  none
- */
-static constexpr const char *kEstablished = "established";
-
-/**
-  none
- */
-static constexpr const char *kFinWait1 = "fin_wait_1";
-
-/**
-  none
- */
-static constexpr const char *kFinWait2 = "fin_wait_2";
-
-/**
-  none
- */
-static constexpr const char *kLastAck = "last_ack";
-
-/**
-  none
- */
-static constexpr const char *kListen = "listen";
-
-/**
-  none
- */
-static constexpr const char *kSynReceived = "syn_received";
-
-/**
-  none
- */
-static constexpr const char *kSynSent = "syn_sent";
-
-/**
-  none
- */
-static constexpr const char *kTimeWait = "time_wait";
-
-}  // namespace NetworkConnectionStateValues
-
-namespace NetworkConnectionSubtypeValues
-{
-/**
-  GPRS
- */
-static constexpr const char *kGprs = "gprs";
-
-/**
-  EDGE
- */
-static constexpr const char *kEdge = "edge";
-
-/**
-  UMTS
- */
-static constexpr const char *kUmts = "umts";
-
-/**
-  CDMA
- */
-static constexpr const char *kCdma = "cdma";
-
-/**
-  EVDO Rel. 0
- */
-static constexpr const char *kEvdo0 = "evdo_0";
-
-/**
-  EVDO Rev. A
- */
-static constexpr const char *kEvdoA = "evdo_a";
-
-/**
-  CDMA2000 1XRTT
- */
-static constexpr const char *kCdma20001xrtt = "cdma2000_1xrtt";
-
-/**
-  HSDPA
- */
-static constexpr const char *kHsdpa = "hsdpa";
-
-/**
-  HSUPA
- */
-static constexpr const char *kHsupa = "hsupa";
-
-/**
-  HSPA
- */
-static constexpr const char *kHspa = "hspa";
-
-/**
-  IDEN
- */
-static constexpr const char *kIden = "iden";
-
-/**
-  EVDO Rev. B
- */
-static constexpr const char *kEvdoB = "evdo_b";
-
-/**
-  LTE
- */
-static constexpr const char *kLte = "lte";
-
-/**
-  EHRPD
- */
-static constexpr const char *kEhrpd = "ehrpd";
-
-/**
-  HSPAP
- */
-static constexpr const char *kHspap = "hspap";
-
-/**
-  GSM
- */
-static constexpr const char *kGsm = "gsm";
-
-/**
-  TD-SCDMA
- */
-static constexpr const char *kTdScdma = "td_scdma";
-
-/**
-  IWLAN
- */
-static constexpr const char *kIwlan = "iwlan";
-
-/**
-  5G NR (New Radio)
- */
-static constexpr const char *kNr = "nr";
-
-/**
-  5G NRNSA (New Radio Non-Standalone)
- */
-static constexpr const char *kNrnsa = "nrnsa";
-
-/**
-  LTE CA
- */
-static constexpr const char *kLteCa = "lte_ca";
-
-}  // namespace NetworkConnectionSubtypeValues
-
-namespace NetworkConnectionTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kWifi = "wifi";
-
-/**
-  none
- */
-static constexpr const char *kWired = "wired";
-
-/**
-  none
- */
-static constexpr const char *kCell = "cell";
-
-/**
-  none
- */
-static constexpr const char *kUnavailable = "unavailable";
-
-/**
-  none
- */
-static constexpr const char *kUnknown = "unknown";
-
-}  // namespace NetworkConnectionTypeValues
-
-namespace NetworkIoDirectionValues
-{
-/**
-  none
- */
-static constexpr const char *kTransmit = "transmit";
-
-/**
-  none
- */
-static constexpr const char *kReceive = "receive";
-
-}  // namespace NetworkIoDirectionValues
-
-namespace NetworkTransportValues
-{
-/**
-  TCP
- */
-static constexpr const char *kTcp = "tcp";
-
-/**
-  UDP
- */
-static constexpr const char *kUdp = "udp";
-
-/**
-  Named or anonymous pipe.
- */
-static constexpr const char *kPipe = "pipe";
-
-/**
-  Unix domain socket
- */
-static constexpr const char *kUnix = "unix";
-
-/**
-  QUIC
- */
-static constexpr const char *kQuic = "quic";
-
-}  // namespace NetworkTransportValues
-
-namespace NetworkTypeValues
-{
-/**
-  IPv4
- */
-static constexpr const char *kIpv4 = "ipv4";
-
-/**
-  IPv6
- */
-static constexpr const char *kIpv6 = "ipv6";
-
-}  // namespace NetworkTypeValues
-
-}  // namespace network
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/oci_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/oci_attributes.h
deleted file mode 100644
index 431b84607..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/oci_attributes.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace oci
-{
-
-/**
-  The digest of the OCI image manifest. For container images specifically is the digest by which the
-  container image is known. <p> Follows <a
-  href="https://github.com/opencontainers/image-spec/blob/main/manifest.md">OCI Image Manifest
-  Specification</a>, and specifically the <a
-  href="https://github.com/opencontainers/image-spec/blob/main/descriptor.md#digests">Digest
-  property</a>. An example can be found in <a
-  href="https://github.com/opencontainers/image-spec/blob/main/manifest.md#example-image-manifest">Example
-  Image Manifest</a>.
- */
-static constexpr const char *kOciManifestDigest = "oci.manifest.digest";
-
-}  // namespace oci
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/opentracing_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/opentracing_attributes.h
deleted file mode 100644
index fba932be4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/opentracing_attributes.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace opentracing
-{
-
-/**
-  Parent-child Reference type
-  <p>
-  The causal relationship between a child Span and a parent Span.
- */
-static constexpr const char *kOpentracingRefType = "opentracing.ref_type";
-
-namespace OpentracingRefTypeValues
-{
-/**
-  The parent Span depends on the child Span in some capacity
- */
-static constexpr const char *kChildOf = "child_of";
-
-/**
-  The parent Span doesn't depend in any way on the result of the child Span
- */
-static constexpr const char *kFollowsFrom = "follows_from";
-
-}  // namespace OpentracingRefTypeValues
-
-}  // namespace opentracing
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/os_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/os_attributes.h
deleted file mode 100644
index 69dded814..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/os_attributes.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace os
-{
-
-/**
-  Unique identifier for a particular build or compilation of the operating system.
- */
-static constexpr const char *kOsBuildId = "os.build_id";
-
-/**
-  Human readable (not intended to be parsed) OS version information, like e.g. reported by @code ver
-  @endcode or @code lsb_release -a @endcode commands.
- */
-static constexpr const char *kOsDescription = "os.description";
-
-/**
-  Human readable operating system name.
- */
-static constexpr const char *kOsName = "os.name";
-
-/**
-  The operating system type.
- */
-static constexpr const char *kOsType = "os.type";
-
-/**
-  The version string of the operating system as defined in <a
-  href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kOsVersion = "os.version";
-
-namespace OsTypeValues
-{
-/**
-  Microsoft Windows
- */
-static constexpr const char *kWindows = "windows";
-
-/**
-  Linux
- */
-static constexpr const char *kLinux = "linux";
-
-/**
-  Apple Darwin
- */
-static constexpr const char *kDarwin = "darwin";
-
-/**
-  FreeBSD
- */
-static constexpr const char *kFreebsd = "freebsd";
-
-/**
-  NetBSD
- */
-static constexpr const char *kNetbsd = "netbsd";
-
-/**
-  OpenBSD
- */
-static constexpr const char *kOpenbsd = "openbsd";
-
-/**
-  DragonFly BSD
- */
-static constexpr const char *kDragonflybsd = "dragonflybsd";
-
-/**
-  HP-UX (Hewlett Packard Unix)
- */
-static constexpr const char *kHpux = "hpux";
-
-/**
-  AIX (Advanced Interactive eXecutive)
- */
-static constexpr const char *kAix = "aix";
-
-/**
-  SunOS, Oracle Solaris
- */
-static constexpr const char *kSolaris = "solaris";
-
-/**
-  IBM z/OS
- */
-static constexpr const char *kZOs = "z_os";
-
-}  // namespace OsTypeValues
-
-}  // namespace os
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/otel_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/otel_attributes.h
deleted file mode 100644
index df1f165b8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/otel_attributes.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace otel
-{
-
-/**
-  A name uniquely identifying the instance of the OpenTelemetry component within its containing SDK
-  instance. <p> Implementations SHOULD ensure a low cardinality for this attribute, even across
-  application or SDK restarts. E.g. implementations MUST NOT use UUIDs as values for this attribute.
-  <p>
-  Implementations MAY achieve these goals by following a @code
-  <otel.component.type>/<instance-counter> @endcode pattern, e.g. @code batching_span_processor/0
-  @endcode. Hereby @code otel.component.type @endcode refers to the corresponding attribute value of
-  the component. <p> The value of @code instance-counter @endcode MAY be automatically assigned by
-  the component and uniqueness within the enclosing SDK instance MUST be guaranteed. For example,
-  @code <instance-counter> @endcode MAY be implemented by using a monotonically increasing counter
-  (starting with @code 0 @endcode), which is incremented every time an instance of the given
-  component type is started. <p> With this implementation, for example the first Batching Span
-  Processor would have @code batching_span_processor/0 @endcode as @code otel.component.name
-  @endcode, the second one @code batching_span_processor/1 @endcode and so on. These values will
-  therefore be reused in the case of an application restart.
- */
-static constexpr const char *kOtelComponentName = "otel.component.name";
-
-/**
-  A name identifying the type of the OpenTelemetry component.
-  <p>
-  If none of the standardized values apply, implementations SHOULD use the language-defined name of
-  the type. E.g. for Java the fully qualified classname SHOULD be used in this case.
- */
-static constexpr const char *kOtelComponentType = "otel.component.type";
-
-/**
-  Deprecated. Use the @code otel.scope.name @endcode attribute
-
-  @deprecated
-  {"note": "Replaced by @code otel.scope.name @endcode.", "reason": "renamed", "renamed_to":
-  "otel.scope.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name";
-
-/**
-  Deprecated. Use the @code otel.scope.version @endcode attribute.
-
-  @deprecated
-  {"note": "Replaced by @code otel.scope.version @endcode.", "reason": "renamed", "renamed_to":
-  "otel.scope.version"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version";
-
-/**
-  The name of the instrumentation scope - (@code InstrumentationScope.Name @endcode in OTLP).
- */
-static constexpr const char *kOtelScopeName = "otel.scope.name";
-
-/**
-  The version of the instrumentation scope - (@code InstrumentationScope.Version @endcode in OTLP).
- */
-static constexpr const char *kOtelScopeVersion = "otel.scope.version";
-
-/**
-  The result value of the sampler for this span
- */
-static constexpr const char *kOtelSpanSamplingResult = "otel.span.sampling_result";
-
-/**
-  Name of the code, either "OK" or "ERROR". MUST NOT be set if the status code is UNSET.
- */
-static constexpr const char *kOtelStatusCode = "otel.status_code";
-
-/**
-  Description of the Status if it has a value, otherwise not set.
- */
-static constexpr const char *kOtelStatusDescription = "otel.status_description";
-
-namespace OtelComponentTypeValues
-{
-/**
-  The builtin SDK batching span processor
- */
-static constexpr const char *kBatchingSpanProcessor = "batching_span_processor";
-
-/**
-  The builtin SDK simple span processor
- */
-static constexpr const char *kSimpleSpanProcessor = "simple_span_processor";
-
-/**
-  The builtin SDK batching log record processor
- */
-static constexpr const char *kBatchingLogProcessor = "batching_log_processor";
-
-/**
-  The builtin SDK simple log record processor
- */
-static constexpr const char *kSimpleLogProcessor = "simple_log_processor";
-
-/**
-  OTLP span exporter over gRPC with protobuf serialization
- */
-static constexpr const char *kOtlpGrpcSpanExporter = "otlp_grpc_span_exporter";
-
-/**
-  OTLP span exporter over HTTP with protobuf serialization
- */
-static constexpr const char *kOtlpHttpSpanExporter = "otlp_http_span_exporter";
-
-/**
-  OTLP span exporter over HTTP with JSON serialization
- */
-static constexpr const char *kOtlpHttpJsonSpanExporter = "otlp_http_json_span_exporter";
-
-/**
-  OTLP log record exporter over gRPC with protobuf serialization
- */
-static constexpr const char *kOtlpGrpcLogExporter = "otlp_grpc_log_exporter";
-
-/**
-  OTLP log record exporter over HTTP with protobuf serialization
- */
-static constexpr const char *kOtlpHttpLogExporter = "otlp_http_log_exporter";
-
-/**
-  OTLP log record exporter over HTTP with JSON serialization
- */
-static constexpr const char *kOtlpHttpJsonLogExporter = "otlp_http_json_log_exporter";
-
-/**
-  The builtin SDK periodically exporting metric reader
- */
-static constexpr const char *kPeriodicMetricReader = "periodic_metric_reader";
-
-/**
-  OTLP metric exporter over gRPC with protobuf serialization
- */
-static constexpr const char *kOtlpGrpcMetricExporter = "otlp_grpc_metric_exporter";
-
-/**
-  OTLP metric exporter over HTTP with protobuf serialization
- */
-static constexpr const char *kOtlpHttpMetricExporter = "otlp_http_metric_exporter";
-
-/**
-  OTLP metric exporter over HTTP with JSON serialization
- */
-static constexpr const char *kOtlpHttpJsonMetricExporter = "otlp_http_json_metric_exporter";
-
-}  // namespace OtelComponentTypeValues
-
-namespace OtelSpanSamplingResultValues
-{
-/**
-  The span is not sampled and not recording
- */
-static constexpr const char *kDrop = "DROP";
-
-/**
-  The span is not sampled, but recording
- */
-static constexpr const char *kRecordOnly = "RECORD_ONLY";
-
-/**
-  The span is sampled and recording
- */
-static constexpr const char *kRecordAndSample = "RECORD_AND_SAMPLE";
-
-}  // namespace OtelSpanSamplingResultValues
-
-namespace OtelStatusCodeValues
-{
-/**
-  The operation has been validated by an Application developer or Operator to have completed
-  successfully.
- */
-static constexpr const char *kOk = "OK";
-
-/**
-  The operation contains an error.
- */
-static constexpr const char *kError = "ERROR";
-
-}  // namespace OtelStatusCodeValues
-
-}  // namespace otel
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/otel_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/otel_metrics.h
deleted file mode 100644
index a02b814c0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/otel_metrics.h
+++ /dev/null
@@ -1,976 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace otel
-{
-
-/**
-  The number of log records for which the export has finished, either successful or failed
-  <p>
-  For successful exports, @code error.type @endcode MUST NOT be set. For failed exports, @code
-  error.type @endcode MUST contain the failure cause. For exporters with partial success semantics
-  (e.g. OTLP with @code rejected_log_records @endcode), rejected log records MUST count as failed
-  and only non-rejected log records count as success. If no rejection reason is available, @code
-  rejected @endcode SHOULD be used as value for @code error.type @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkExporterLogExported = "otel.sdk.exporter.log.exported";
-static constexpr const char *descrMetricOtelSdkExporterLogExported =
-    "The number of log records for which the export has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkExporterLogExported = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterLogExported(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkExporterLogExported,
-                                    descrMetricOtelSdkExporterLogExported,
-                                    unitMetricOtelSdkExporterLogExported);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkExporterLogExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkExporterLogExported,
-                                    descrMetricOtelSdkExporterLogExported,
-                                    unitMetricOtelSdkExporterLogExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterLogExported(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkExporterLogExported,
-                                             descrMetricOtelSdkExporterLogExported,
-                                             unitMetricOtelSdkExporterLogExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterLogExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkExporterLogExported,
-                                              descrMetricOtelSdkExporterLogExported,
-                                              unitMetricOtelSdkExporterLogExported);
-}
-
-/**
-  The number of log records which were passed to the exporter, but that have not been exported yet
-  (neither successful, nor failed) <p> For successful exports, @code error.type @endcode MUST NOT be
-  set. For failed exports, @code error.type @endcode MUST contain the failure cause. <p>
-  updowncounter
- */
-static constexpr const char *kMetricOtelSdkExporterLogInflight = "otel.sdk.exporter.log.inflight";
-static constexpr const char *descrMetricOtelSdkExporterLogInflight =
-    "The number of log records which were passed to the exporter, but that have not been exported "
-    "yet (neither successful, nor failed)";
-static constexpr const char *unitMetricOtelSdkExporterLogInflight = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterLogInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterLogInflight,
-                                         descrMetricOtelSdkExporterLogInflight,
-                                         unitMetricOtelSdkExporterLogInflight);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterLogInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterLogInflight,
-                                          descrMetricOtelSdkExporterLogInflight,
-                                          unitMetricOtelSdkExporterLogInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterLogInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterLogInflight,
-                                                   descrMetricOtelSdkExporterLogInflight,
-                                                   unitMetricOtelSdkExporterLogInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterLogInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterLogInflight,
-                                                    descrMetricOtelSdkExporterLogInflight,
-                                                    unitMetricOtelSdkExporterLogInflight);
-}
-
-/**
-  The number of metric data points for which the export has finished, either successful or failed
-  <p>
-  For successful exports, @code error.type @endcode MUST NOT be set. For failed exports, @code
-  error.type @endcode MUST contain the failure cause. For exporters with partial success semantics
-  (e.g. OTLP with @code rejected_data_points @endcode), rejected data points MUST count as failed
-  and only non-rejected data points count as success. If no rejection reason is available, @code
-  rejected @endcode SHOULD be used as value for @code error.type @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkExporterMetricDataPointExported =
-    "otel.sdk.exporter.metric_data_point.exported";
-static constexpr const char *descrMetricOtelSdkExporterMetricDataPointExported =
-    "The number of metric data points for which the export has finished, either successful or "
-    "failed";
-static constexpr const char *unitMetricOtelSdkExporterMetricDataPointExported = "{data_point}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterMetricDataPointExported(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkExporterMetricDataPointExported,
-                                    descrMetricOtelSdkExporterMetricDataPointExported,
-                                    unitMetricOtelSdkExporterMetricDataPointExported);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkExporterMetricDataPointExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkExporterMetricDataPointExported,
-                                    descrMetricOtelSdkExporterMetricDataPointExported,
-                                    unitMetricOtelSdkExporterMetricDataPointExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterMetricDataPointExported(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkExporterMetricDataPointExported,
-                                             descrMetricOtelSdkExporterMetricDataPointExported,
-                                             unitMetricOtelSdkExporterMetricDataPointExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterMetricDataPointExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkExporterMetricDataPointExported,
-                                              descrMetricOtelSdkExporterMetricDataPointExported,
-                                              unitMetricOtelSdkExporterMetricDataPointExported);
-}
-
-/**
-  The number of metric data points which were passed to the exporter, but that have not been
-  exported yet (neither successful, nor failed) <p> For successful exports, @code error.type
-  @endcode MUST NOT be set. For failed exports, @code error.type @endcode MUST contain the failure
-  cause. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkExporterMetricDataPointInflight =
-    "otel.sdk.exporter.metric_data_point.inflight";
-static constexpr const char *descrMetricOtelSdkExporterMetricDataPointInflight =
-    "The number of metric data points which were passed to the exporter, but that have not been "
-    "exported yet (neither successful, nor failed)";
-static constexpr const char *unitMetricOtelSdkExporterMetricDataPointInflight = "{data_point}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterMetricDataPointInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterMetricDataPointInflight,
-                                         descrMetricOtelSdkExporterMetricDataPointInflight,
-                                         unitMetricOtelSdkExporterMetricDataPointInflight);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterMetricDataPointInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterMetricDataPointInflight,
-                                          descrMetricOtelSdkExporterMetricDataPointInflight,
-                                          unitMetricOtelSdkExporterMetricDataPointInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterMetricDataPointInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricOtelSdkExporterMetricDataPointInflight,
-      descrMetricOtelSdkExporterMetricDataPointInflight,
-      unitMetricOtelSdkExporterMetricDataPointInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterMetricDataPointInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricOtelSdkExporterMetricDataPointInflight,
-      descrMetricOtelSdkExporterMetricDataPointInflight,
-      unitMetricOtelSdkExporterMetricDataPointInflight);
-}
-
-/**
-  The duration of exporting a batch of telemetry records.
-  <p>
-  This metric defines successful operations using the full success definitions for <a
-  href="https://github.com/open-telemetry/opentelemetry-proto/blob/v1.5.0/docs/specification.md#full-success-1">http</a>
-  and <a
-  href="https://github.com/open-telemetry/opentelemetry-proto/blob/v1.5.0/docs/specification.md#full-success">grpc</a>.
-  Anything else is defined as an unsuccessful operation. For successful operations, @code error.type
-  @endcode MUST NOT be set. For unsuccessful export operations, @code error.type @endcode MUST
-  contain a relevant failure cause. <p> histogram
- */
-static constexpr const char *kMetricOtelSdkExporterOperationDuration =
-    "otel.sdk.exporter.operation.duration";
-static constexpr const char *descrMetricOtelSdkExporterOperationDuration =
-    "The duration of exporting a batch of telemetry records.";
-static constexpr const char *unitMetricOtelSdkExporterOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricOtelSdkExporterOperationDuration,
-                                      descrMetricOtelSdkExporterOperationDuration,
-                                      unitMetricOtelSdkExporterOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricOtelSdkExporterOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricOtelSdkExporterOperationDuration,
-                                      descrMetricOtelSdkExporterOperationDuration,
-                                      unitMetricOtelSdkExporterOperationDuration);
-}
-
-/**
-  The number of spans for which the export has finished, either successful or failed
-  <p>
-  For successful exports, @code error.type @endcode MUST NOT be set. For failed exports, @code
-  error.type @endcode MUST contain the failure cause. For exporters with partial success semantics
-  (e.g. OTLP with @code rejected_spans @endcode), rejected spans MUST count as failed and only
-  non-rejected spans count as success. If no rejection reason is available, @code rejected @endcode
-  SHOULD be used as value for @code error.type @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkExporterSpanExported = "otel.sdk.exporter.span.exported";
-static constexpr const char *descrMetricOtelSdkExporterSpanExported =
-    "The number of spans for which the export has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkExporterSpanExported = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanExported(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkExporterSpanExported,
-                                    descrMetricOtelSdkExporterSpanExported,
-                                    unitMetricOtelSdkExporterSpanExported);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkExporterSpanExported,
-                                    descrMetricOtelSdkExporterSpanExported,
-                                    unitMetricOtelSdkExporterSpanExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanExported(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkExporterSpanExported,
-                                             descrMetricOtelSdkExporterSpanExported,
-                                             unitMetricOtelSdkExporterSpanExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkExporterSpanExported,
-                                              descrMetricOtelSdkExporterSpanExported,
-                                              unitMetricOtelSdkExporterSpanExported);
-}
-
-/**
-  Deprecated, use @code otel.sdk.exporter.span.exported @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.exporter.span.exported @endcode.", "reason": "renamed",
-  "renamed_to": "otel.sdk.exporter.span.exported"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkExporterSpanExportedCount =
-    "otel.sdk.exporter.span.exported.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricOtelSdkExporterSpanExportedCount =
-    "Deprecated, use `otel.sdk.exporter.span.exported` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkExporterSpanExportedCount =
-    "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                         descrMetricOtelSdkExporterSpanExportedCount,
-                                         unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                          descrMetricOtelSdkExporterSpanExportedCount,
-                                          unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                                   descrMetricOtelSdkExporterSpanExportedCount,
-                                                   unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                                    descrMetricOtelSdkExporterSpanExportedCount,
-                                                    unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-/**
-  The number of spans which were passed to the exporter, but that have not been exported yet
-  (neither successful, nor failed) <p> For successful exports, @code error.type @endcode MUST NOT be
-  set. For failed exports, @code error.type @endcode MUST contain the failure cause. <p>
-  updowncounter
- */
-static constexpr const char *kMetricOtelSdkExporterSpanInflight = "otel.sdk.exporter.span.inflight";
-static constexpr const char *descrMetricOtelSdkExporterSpanInflight =
-    "The number of spans which were passed to the exporter, but that have not been exported yet "
-    "(neither successful, nor failed)";
-static constexpr const char *unitMetricOtelSdkExporterSpanInflight = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterSpanInflight,
-                                         descrMetricOtelSdkExporterSpanInflight,
-                                         unitMetricOtelSdkExporterSpanInflight);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterSpanInflight,
-                                          descrMetricOtelSdkExporterSpanInflight,
-                                          unitMetricOtelSdkExporterSpanInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterSpanInflight,
-                                                   descrMetricOtelSdkExporterSpanInflight,
-                                                   unitMetricOtelSdkExporterSpanInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterSpanInflight,
-                                                    descrMetricOtelSdkExporterSpanInflight,
-                                                    unitMetricOtelSdkExporterSpanInflight);
-}
-
-/**
-  Deprecated, use @code otel.sdk.exporter.span.inflight @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.exporter.span.inflight @endcode.", "reason": "renamed",
-  "renamed_to": "otel.sdk.exporter.span.inflight"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkExporterSpanInflightCount =
-    "otel.sdk.exporter.span.inflight.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricOtelSdkExporterSpanInflightCount =
-    "Deprecated, use `otel.sdk.exporter.span.inflight` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkExporterSpanInflightCount =
-    "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                         descrMetricOtelSdkExporterSpanInflightCount,
-                                         unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                          descrMetricOtelSdkExporterSpanInflightCount,
-                                          unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                                   descrMetricOtelSdkExporterSpanInflightCount,
-                                                   unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                                    descrMetricOtelSdkExporterSpanInflightCount,
-                                                    unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-/**
-  The number of logs submitted to enabled SDK Loggers
-  <p>
-  counter
- */
-static constexpr const char *kMetricOtelSdkLogCreated = "otel.sdk.log.created";
-static constexpr const char *descrMetricOtelSdkLogCreated =
-    "The number of logs submitted to enabled SDK Loggers";
-static constexpr const char *unitMetricOtelSdkLogCreated = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricOtelSdkLogCreated(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkLogCreated, descrMetricOtelSdkLogCreated,
-                                    unitMetricOtelSdkLogCreated);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricOtelSdkLogCreated(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkLogCreated, descrMetricOtelSdkLogCreated,
-                                    unitMetricOtelSdkLogCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkLogCreated(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkLogCreated, descrMetricOtelSdkLogCreated,
-                                             unitMetricOtelSdkLogCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkLogCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricOtelSdkLogCreated, descrMetricOtelSdkLogCreated, unitMetricOtelSdkLogCreated);
-}
-
-/**
-  The duration of the collect operation of the metric reader.
-  <p>
-  For successful collections, @code error.type @endcode MUST NOT be set. For failed collections,
-  @code error.type @endcode SHOULD contain the failure cause. It can happen that metrics collection
-  is successful for some MetricProducers, while others fail. In that case @code error.type @endcode
-  SHOULD be set to any of the failure causes. <p> histogram
- */
-static constexpr const char *kMetricOtelSdkMetricReaderCollectionDuration =
-    "otel.sdk.metric_reader.collection.duration";
-static constexpr const char *descrMetricOtelSdkMetricReaderCollectionDuration =
-    "The duration of the collect operation of the metric reader.";
-static constexpr const char *unitMetricOtelSdkMetricReaderCollectionDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricOtelSdkMetricReaderCollectionDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricOtelSdkMetricReaderCollectionDuration,
-                                      descrMetricOtelSdkMetricReaderCollectionDuration,
-                                      unitMetricOtelSdkMetricReaderCollectionDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricOtelSdkMetricReaderCollectionDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricOtelSdkMetricReaderCollectionDuration,
-                                      descrMetricOtelSdkMetricReaderCollectionDuration,
-                                      unitMetricOtelSdkMetricReaderCollectionDuration);
-}
-
-/**
-  The number of log records for which the processing has finished, either successful or failed
-  <p>
-  For successful processing, @code error.type @endcode MUST NOT be set. For failed processing, @code
-  error.type @endcode MUST contain the failure cause. For the SDK Simple and Batching Log Record
-  Processor a log record is considered to be processed already when it has been submitted to the
-  exporter, not when the corresponding export call has finished. <p> counter
- */
-static constexpr const char *kMetricOtelSdkProcessorLogProcessed =
-    "otel.sdk.processor.log.processed";
-static constexpr const char *descrMetricOtelSdkProcessorLogProcessed =
-    "The number of log records for which the processing has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkProcessorLogProcessed = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkProcessorLogProcessed(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkProcessorLogProcessed,
-                                    descrMetricOtelSdkProcessorLogProcessed,
-                                    unitMetricOtelSdkProcessorLogProcessed);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorLogProcessed(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkProcessorLogProcessed,
-                                    descrMetricOtelSdkProcessorLogProcessed,
-                                    unitMetricOtelSdkProcessorLogProcessed);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorLogProcessed(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkProcessorLogProcessed,
-                                             descrMetricOtelSdkProcessorLogProcessed,
-                                             unitMetricOtelSdkProcessorLogProcessed);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorLogProcessed(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkProcessorLogProcessed,
-                                              descrMetricOtelSdkProcessorLogProcessed,
-                                              unitMetricOtelSdkProcessorLogProcessed);
-}
-
-/**
-  The maximum number of log records the queue of a given instance of an SDK Log Record processor can
-  hold <p> Only applies to Log Record processors which use a queue, e.g. the SDK Batching Log Record
-  Processor. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorLogQueueCapacity =
-    "otel.sdk.processor.log.queue.capacity";
-static constexpr const char *descrMetricOtelSdkProcessorLogQueueCapacity =
-    "The maximum number of log records the queue of a given instance of an SDK Log Record "
-    "processor can hold";
-static constexpr const char *unitMetricOtelSdkProcessorLogQueueCapacity = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorLogQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorLogQueueCapacity,
-                                         descrMetricOtelSdkProcessorLogQueueCapacity,
-                                         unitMetricOtelSdkProcessorLogQueueCapacity);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorLogQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorLogQueueCapacity,
-                                          descrMetricOtelSdkProcessorLogQueueCapacity,
-                                          unitMetricOtelSdkProcessorLogQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorLogQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorLogQueueCapacity,
-                                                   descrMetricOtelSdkProcessorLogQueueCapacity,
-                                                   unitMetricOtelSdkProcessorLogQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorLogQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorLogQueueCapacity,
-                                                    descrMetricOtelSdkProcessorLogQueueCapacity,
-                                                    unitMetricOtelSdkProcessorLogQueueCapacity);
-}
-
-/**
-  The number of log records in the queue of a given instance of an SDK log processor
-  <p>
-  Only applies to log record processors which use a queue, e.g. the SDK Batching Log Record
-  Processor. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorLogQueueSize =
-    "otel.sdk.processor.log.queue.size";
-static constexpr const char *descrMetricOtelSdkProcessorLogQueueSize =
-    "The number of log records in the queue of a given instance of an SDK log processor";
-static constexpr const char *unitMetricOtelSdkProcessorLogQueueSize = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorLogQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorLogQueueSize,
-                                         descrMetricOtelSdkProcessorLogQueueSize,
-                                         unitMetricOtelSdkProcessorLogQueueSize);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorLogQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorLogQueueSize,
-                                          descrMetricOtelSdkProcessorLogQueueSize,
-                                          unitMetricOtelSdkProcessorLogQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorLogQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorLogQueueSize,
-                                                   descrMetricOtelSdkProcessorLogQueueSize,
-                                                   unitMetricOtelSdkProcessorLogQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorLogQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorLogQueueSize,
-                                                    descrMetricOtelSdkProcessorLogQueueSize,
-                                                    unitMetricOtelSdkProcessorLogQueueSize);
-}
-
-/**
-  The number of spans for which the processing has finished, either successful or failed
-  <p>
-  For successful processing, @code error.type @endcode MUST NOT be set. For failed processing, @code
-  error.type @endcode MUST contain the failure cause. For the SDK Simple and Batching Span Processor
-  a span is considered to be processed already when it has been submitted to the exporter, not when
-  the corresponding export call has finished. <p> counter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanProcessed =
-    "otel.sdk.processor.span.processed";
-static constexpr const char *descrMetricOtelSdkProcessorSpanProcessed =
-    "The number of spans for which the processing has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkProcessorSpanProcessed = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkProcessorSpanProcessed,
-                                    descrMetricOtelSdkProcessorSpanProcessed,
-                                    unitMetricOtelSdkProcessorSpanProcessed);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkProcessorSpanProcessed,
-                                    descrMetricOtelSdkProcessorSpanProcessed,
-                                    unitMetricOtelSdkProcessorSpanProcessed);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkProcessorSpanProcessed,
-                                             descrMetricOtelSdkProcessorSpanProcessed,
-                                             unitMetricOtelSdkProcessorSpanProcessed);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkProcessorSpanProcessed,
-                                              descrMetricOtelSdkProcessorSpanProcessed,
-                                              unitMetricOtelSdkProcessorSpanProcessed);
-}
-
-/**
-  Deprecated, use @code otel.sdk.processor.span.processed @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.processor.span.processed @endcode.", "reason": "renamed",
-  "renamed_to": "otel.sdk.processor.span.processed"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkProcessorSpanProcessedCount =
-    "otel.sdk.processor.span.processed.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricOtelSdkProcessorSpanProcessedCount =
-        "Deprecated, use `otel.sdk.processor.span.processed` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkProcessorSpanProcessedCount =
-    "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                         descrMetricOtelSdkProcessorSpanProcessedCount,
-                                         unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                          descrMetricOtelSdkProcessorSpanProcessedCount,
-                                          unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                                   descrMetricOtelSdkProcessorSpanProcessedCount,
-                                                   unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                                    descrMetricOtelSdkProcessorSpanProcessedCount,
-                                                    unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-/**
-  The maximum number of spans the queue of a given instance of an SDK span processor can hold
-  <p>
-  Only applies to span processors which use a queue, e.g. the SDK Batching Span Processor.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanQueueCapacity =
-    "otel.sdk.processor.span.queue.capacity";
-static constexpr const char *descrMetricOtelSdkProcessorSpanQueueCapacity =
-    "The maximum number of spans the queue of a given instance of an SDK span processor can hold";
-static constexpr const char *unitMetricOtelSdkProcessorSpanQueueCapacity = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                         descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                         unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                          descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                          unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                                   descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                                   unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                                    descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                                    unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-/**
-  The number of spans in the queue of a given instance of an SDK span processor
-  <p>
-  Only applies to span processors which use a queue, e.g. the SDK Batching Span Processor.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanQueueSize =
-    "otel.sdk.processor.span.queue.size";
-static constexpr const char *descrMetricOtelSdkProcessorSpanQueueSize =
-    "The number of spans in the queue of a given instance of an SDK span processor";
-static constexpr const char *unitMetricOtelSdkProcessorSpanQueueSize = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                         descrMetricOtelSdkProcessorSpanQueueSize,
-                                         unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                          descrMetricOtelSdkProcessorSpanQueueSize,
-                                          unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                                   descrMetricOtelSdkProcessorSpanQueueSize,
-                                                   unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                                    descrMetricOtelSdkProcessorSpanQueueSize,
-                                                    unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-/**
-  The number of created spans for which the end operation was called
-  <p>
-  For spans with @code recording=true @endcode: Implementations MUST record both @code
-  otel.sdk.span.live @endcode and @code otel.sdk.span.ended @endcode. For spans with @code
-  recording=false @endcode: If implementations decide to record this metric, they MUST also record
-  @code otel.sdk.span.live @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkSpanEnded = "otel.sdk.span.ended";
-static constexpr const char *descrMetricOtelSdkSpanEnded =
-    "The number of created spans for which the end operation was called";
-static constexpr const char *unitMetricOtelSdkSpanEnded = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricOtelSdkSpanEnded(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkSpanEnded, descrMetricOtelSdkSpanEnded,
-                                    unitMetricOtelSdkSpanEnded);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricOtelSdkSpanEnded(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkSpanEnded, descrMetricOtelSdkSpanEnded,
-                                    unitMetricOtelSdkSpanEnded);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanEnded(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkSpanEnded, descrMetricOtelSdkSpanEnded,
-                                             unitMetricOtelSdkSpanEnded);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanEnded(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkSpanEnded, descrMetricOtelSdkSpanEnded,
-                                              unitMetricOtelSdkSpanEnded);
-}
-
-/**
-  Deprecated, use @code otel.sdk.span.ended @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.span.ended @endcode.", "reason": "renamed", "renamed_to":
-  "otel.sdk.span.ended"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkSpanEndedCount =
-    "otel.sdk.span.ended.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricOtelSdkSpanEndedCount =
-    "Deprecated, use `otel.sdk.span.ended` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkSpanEndedCount = "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkSpanEndedCount, descrMetricOtelSdkSpanEndedCount,
-                                    unitMetricOtelSdkSpanEndedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkSpanEndedCount, descrMetricOtelSdkSpanEndedCount,
-                                    unitMetricOtelSdkSpanEndedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkSpanEndedCount,
-                                             descrMetricOtelSdkSpanEndedCount,
-                                             unitMetricOtelSdkSpanEndedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkSpanEndedCount,
-                                              descrMetricOtelSdkSpanEndedCount,
-                                              unitMetricOtelSdkSpanEndedCount);
-}
-
-/**
-  The number of created spans for which the end operation has not been called yet
-  <p>
-  For spans with @code recording=true @endcode: Implementations MUST record both @code
-  otel.sdk.span.live @endcode and @code otel.sdk.span.ended @endcode. For spans with @code
-  recording=false @endcode: If implementations decide to record this metric, they MUST also record
-  @code otel.sdk.span.ended @endcode. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkSpanLive = "otel.sdk.span.live";
-static constexpr const char *descrMetricOtelSdkSpanLive =
-    "The number of created spans for which the end operation has not been called yet";
-static constexpr const char *unitMetricOtelSdkSpanLive = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkSpanLive(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkSpanLive, descrMetricOtelSdkSpanLive,
-                                         unitMetricOtelSdkSpanLive);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkSpanLive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkSpanLive, descrMetricOtelSdkSpanLive,
-                                          unitMetricOtelSdkSpanLive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanLive(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricOtelSdkSpanLive, descrMetricOtelSdkSpanLive, unitMetricOtelSdkSpanLive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanLive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricOtelSdkSpanLive, descrMetricOtelSdkSpanLive, unitMetricOtelSdkSpanLive);
-}
-
-/**
-  Deprecated, use @code otel.sdk.span.live @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.span.live @endcode.", "reason": "renamed", "renamed_to":
-  "otel.sdk.span.live"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkSpanLiveCount =
-    "otel.sdk.span.live.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricOtelSdkSpanLiveCount =
-    "Deprecated, use `otel.sdk.span.live` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkSpanLiveCount = "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-}  // namespace otel
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/other_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/other_attributes.h
deleted file mode 100644
index ab0939606..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/other_attributes.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace other
-{
-
-/**
-  Deprecated, use @code db.client.connection.state @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.state @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.state"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state";
-
-namespace StateValues
-{
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-}  // namespace StateValues
-
-}  // namespace other
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/peer_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/peer_attributes.h
deleted file mode 100644
index acc6621d2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/peer_attributes.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace peer
-{
-
-/**
-  The <a href="/docs/resource/README.md#service">@code service.name @endcode</a> of the remote
-  service. SHOULD be equal to the actual @code service.name @endcode resource attribute of the
-  remote service if any.
- */
-static constexpr const char *kPeerService = "peer.service";
-
-}  // namespace peer
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/pool_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/pool_attributes.h
deleted file mode 100644
index f2ecb1246..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/pool_attributes.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace pool
-{
-
-/**
-  Deprecated, use @code db.client.connection.pool.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.pool.name @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.pool.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name";
-
-}  // namespace pool
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/process_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/process_attributes.h
deleted file mode 100644
index 7cee8fc70..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/process_attributes.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace process
-{
-
-/**
-  Length of the process.command_args array
-  <p>
-  This field can be useful for querying or performing bucket analysis on how many arguments were
-  provided to start a process. More arguments may be an indication of suspicious activity.
- */
-static constexpr const char *kProcessArgsCount = "process.args_count";
-
-/**
-  The command used to launch the process (i.e. the command name). On Linux based systems, can be set
-  to the zeroth string in @code proc/[pid]/cmdline @endcode. On Windows, can be set to the first
-  parameter extracted from @code GetCommandLineW @endcode.
- */
-static constexpr const char *kProcessCommand = "process.command";
-
-/**
-  All the command arguments (including the command/executable itself) as received by the process. On
-  Linux-based systems (and some other Unixoid systems supporting procfs), can be set according to
-  the list of null-delimited strings extracted from @code proc/[pid]/cmdline @endcode. For
-  libc-based executables, this would be the full argv vector passed to @code main @endcode. SHOULD
-  NOT be collected by default unless there is sanitization that excludes sensitive data.
- */
-static constexpr const char *kProcessCommandArgs = "process.command_args";
-
-/**
-  The full command used to launch the process as a single string representing the full command. On
-  Windows, can be set to the result of @code GetCommandLineW @endcode. Do not set this if you have
-  to assemble it just for monitoring; use @code process.command_args @endcode instead. SHOULD NOT be
-  collected by default unless there is sanitization that excludes sensitive data.
- */
-static constexpr const char *kProcessCommandLine = "process.command_line";
-
-/**
-  Specifies whether the context switches for this data point were voluntary or involuntary.
- */
-static constexpr const char *kProcessContextSwitchType = "process.context_switch_type";
-
-/**
-  Deprecated, use @code cpu.mode @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state";
-
-/**
-  The date and time the process was created, in ISO 8601 format.
- */
-static constexpr const char *kProcessCreationTime = "process.creation.time";
-
-/**
-  Process environment variables, <key> being the environment variable name, the value being the
-  environment variable value. <p> Examples: <ul> <li>an environment variable @code USER @endcode
-  with value @code "ubuntu" @endcode SHOULD be recorded as the @code
-  process.environment_variable.USER @endcode attribute with value @code "ubuntu" @endcode.</li>
-    <li>an environment variable @code PATH @endcode with value @code "/usr/local/bin:/usr/bin"
-  @endcode SHOULD be recorded as the @code process.environment_variable.PATH @endcode attribute with
-  value @code "/usr/local/bin:/usr/bin" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kProcessEnvironmentVariable = "process.environment_variable";
-
-/**
-  The GNU build ID as found in the @code .note.gnu.build-id @endcode ELF section (hex string).
- */
-static constexpr const char *kProcessExecutableBuildIdGnu = "process.executable.build_id.gnu";
-
-/**
-  The Go build ID as retrieved by @code go tool buildid <go executable> @endcode.
- */
-static constexpr const char *kProcessExecutableBuildIdGo = "process.executable.build_id.go";
-
-/**
-  Profiling specific build ID for executables. See the OTel specification for Profiles for more
-  information.
- */
-static constexpr const char *kProcessExecutableBuildIdHtlhash =
-    "process.executable.build_id.htlhash";
-
-/**
-  "Deprecated, use @code process.executable.build_id.htlhash @endcode instead."
-
-  @deprecated
-  {"note": "Replaced by @code process.executable.build_id.htlhash @endcode.", "reason": "renamed",
-  "renamed_to": "process.executable.build_id.htlhash"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessExecutableBuildIdProfiling =
-    "process.executable.build_id.profiling";
-
-/**
-  The name of the process executable. On Linux based systems, this SHOULD be set to the base name of
-  the target of @code /proc/[pid]/exe @endcode. On Windows, this SHOULD be set to the base name of
-  @code GetProcessImageFileNameW @endcode.
- */
-static constexpr const char *kProcessExecutableName = "process.executable.name";
-
-/**
-  The full path to the process executable. On Linux based systems, can be set to the target of @code
-  proc/[pid]/exe @endcode. On Windows, can be set to the result of @code GetProcessImageFileNameW
-  @endcode.
- */
-static constexpr const char *kProcessExecutablePath = "process.executable.path";
-
-/**
-  The exit code of the process.
- */
-static constexpr const char *kProcessExitCode = "process.exit.code";
-
-/**
-  The date and time the process exited, in ISO 8601 format.
- */
-static constexpr const char *kProcessExitTime = "process.exit.time";
-
-/**
-  The PID of the process's group leader. This is also the process group ID (PGID) of the process.
- */
-static constexpr const char *kProcessGroupLeaderPid = "process.group_leader.pid";
-
-/**
-  Whether the process is connected to an interactive shell.
- */
-static constexpr const char *kProcessInteractive = "process.interactive";
-
-/**
-  The control group associated with the process.
-  <p>
-  Control groups (cgroups) are a kernel feature used to organize and manage process resources. This
-  attribute provides the path(s) to the cgroup(s) associated with the process, which should match
-  the contents of the <a
-  href="https://man7.org/linux/man-pages/man7/cgroups.7.html">/proc/[PID]/cgroup</a> file.
- */
-static constexpr const char *kProcessLinuxCgroup = "process.linux.cgroup";
-
-/**
-  The username of the user that owns the process.
- */
-static constexpr const char *kProcessOwner = "process.owner";
-
-/**
-  The type of page fault for this data point. Type @code major @endcode is for major/hard page
-  faults, and @code minor @endcode is for minor/soft page faults.
- */
-static constexpr const char *kProcessPagingFaultType = "process.paging.fault_type";
-
-/**
-  Parent Process identifier (PPID).
- */
-static constexpr const char *kProcessParentPid = "process.parent_pid";
-
-/**
-  Process identifier (PID).
- */
-static constexpr const char *kProcessPid = "process.pid";
-
-/**
-  The real user ID (RUID) of the process.
- */
-static constexpr const char *kProcessRealUserId = "process.real_user.id";
-
-/**
-  The username of the real user of the process.
- */
-static constexpr const char *kProcessRealUserName = "process.real_user.name";
-
-/**
-  An additional description about the runtime of the process, for example a specific vendor
-  customization of the runtime environment.
- */
-static constexpr const char *kProcessRuntimeDescription = "process.runtime.description";
-
-/**
-  The name of the runtime of this process.
- */
-static constexpr const char *kProcessRuntimeName = "process.runtime.name";
-
-/**
-  The version of the runtime of this process, as returned by the runtime without modification.
- */
-static constexpr const char *kProcessRuntimeVersion = "process.runtime.version";
-
-/**
-  The saved user ID (SUID) of the process.
- */
-static constexpr const char *kProcessSavedUserId = "process.saved_user.id";
-
-/**
-  The username of the saved user.
- */
-static constexpr const char *kProcessSavedUserName = "process.saved_user.name";
-
-/**
-  The PID of the process's session leader. This is also the session ID (SID) of the process.
- */
-static constexpr const char *kProcessSessionLeaderPid = "process.session_leader.pid";
-
-/**
-  Process title (proctitle)
-  <p>
-  In many Unix-like systems, process title (proctitle), is the string that represents the name or
-  command line of a running process, displayed by system monitoring tools like ps, top, and htop.
- */
-static constexpr const char *kProcessTitle = "process.title";
-
-/**
-  The effective user ID (EUID) of the process.
- */
-static constexpr const char *kProcessUserId = "process.user.id";
-
-/**
-  The username of the effective user of the process.
- */
-static constexpr const char *kProcessUserName = "process.user.name";
-
-/**
-  Virtual process identifier.
-  <p>
-  The process ID within a PID namespace. This is not necessarily unique across all processes on the
-  host but it is unique within the process namespace that the process exists within.
- */
-static constexpr const char *kProcessVpid = "process.vpid";
-
-/**
-  The working directory of the process.
- */
-static constexpr const char *kProcessWorkingDirectory = "process.working_directory";
-
-namespace ProcessContextSwitchTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kVoluntary = "voluntary";
-
-/**
-  none
- */
-static constexpr const char *kInvoluntary = "involuntary";
-
-}  // namespace ProcessContextSwitchTypeValues
-
-namespace ProcessCpuStateValues
-{
-/**
-  none
- */
-static constexpr const char *kSystem = "system";
-
-/**
-  none
- */
-static constexpr const char *kUser = "user";
-
-/**
-  none
- */
-static constexpr const char *kWait = "wait";
-
-}  // namespace ProcessCpuStateValues
-
-namespace ProcessPagingFaultTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kMajor = "major";
-
-/**
-  none
- */
-static constexpr const char *kMinor = "minor";
-
-}  // namespace ProcessPagingFaultTypeValues
-
-}  // namespace process
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/process_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/process_metrics.h
deleted file mode 100644
index 0f1a783f7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/process_metrics.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace process
-{
-
-/**
-  Number of times the process has been context switched.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessContextSwitches = "process.context_switches";
-static constexpr const char *descrMetricProcessContextSwitches =
-    "Number of times the process has been context switched.";
-static constexpr const char *unitMetricProcessContextSwitches = "{context_switch}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessContextSwitches,
-                                    descrMetricProcessContextSwitches,
-                                    unitMetricProcessContextSwitches);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessContextSwitches,
-                                    descrMetricProcessContextSwitches,
-                                    unitMetricProcessContextSwitches);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessContextSwitches,
-                                             descrMetricProcessContextSwitches,
-                                             unitMetricProcessContextSwitches);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessContextSwitches,
-                                              descrMetricProcessContextSwitches,
-                                              unitMetricProcessContextSwitches);
-}
-
-/**
-  Total CPU seconds broken down by different states.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessCpuTime = "process.cpu.time";
-static constexpr const char *descrMetricProcessCpuTime =
-    "Total CPU seconds broken down by different states.";
-static constexpr const char *unitMetricProcessCpuTime = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                    unitMetricProcessCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                    unitMetricProcessCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                             unitMetricProcessCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                              unitMetricProcessCpuTime);
-}
-
-/**
-  Difference in process.cpu.time since the last measurement, divided by the elapsed time and number
-  of CPUs available to the process. <p> gauge
- */
-static constexpr const char *kMetricProcessCpuUtilization = "process.cpu.utilization";
-static constexpr const char *descrMetricProcessCpuUtilization =
-    "Difference in process.cpu.time since the last measurement, divided by the elapsed time and "
-    "number of CPUs available to the process.";
-static constexpr const char *unitMetricProcessCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricProcessCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricProcessCpuUtilization, descrMetricProcessCpuUtilization,
-                                 unitMetricProcessCpuUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricProcessCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricProcessCpuUtilization, descrMetricProcessCpuUtilization,
-                                  unitMetricProcessCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricProcessCpuUtilization,
-                                           descrMetricProcessCpuUtilization,
-                                           unitMetricProcessCpuUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricProcessCpuUtilization,
-                                            descrMetricProcessCpuUtilization,
-                                            unitMetricProcessCpuUtilization);
-}
-
-/**
-  Disk bytes transferred.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessDiskIo     = "process.disk.io";
-static constexpr const char *descrMetricProcessDiskIo = "Disk bytes transferred.";
-static constexpr const char *unitMetricProcessDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                    unitMetricProcessDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                    unitMetricProcessDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                             unitMetricProcessDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                              unitMetricProcessDiskIo);
-}
-
-/**
-  The amount of physical memory in use.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricProcessMemoryUsage = "process.memory.usage";
-static constexpr const char *descrMetricProcessMemoryUsage =
-    "The amount of physical memory in use.";
-static constexpr const char *unitMetricProcessMemoryUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage,
-                                         unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage,
-                                          unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage, unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage, unitMetricProcessMemoryUsage);
-}
-
-/**
-  The amount of committed virtual memory.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricProcessMemoryVirtual = "process.memory.virtual";
-static constexpr const char *descrMetricProcessMemoryVirtual =
-    "The amount of committed virtual memory.";
-static constexpr const char *unitMetricProcessMemoryVirtual = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-/**
-  Network bytes transferred.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessNetworkIo     = "process.network.io";
-static constexpr const char *descrMetricProcessNetworkIo = "Network bytes transferred.";
-static constexpr const char *unitMetricProcessNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                    unitMetricProcessNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                    unitMetricProcessNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                             unitMetricProcessNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                              unitMetricProcessNetworkIo);
-}
-
-/**
-  Number of file descriptors in use by the process.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricProcessOpenFileDescriptorCount =
-    "process.open_file_descriptor.count";
-static constexpr const char *descrMetricProcessOpenFileDescriptorCount =
-    "Number of file descriptors in use by the process.";
-static constexpr const char *unitMetricProcessOpenFileDescriptorCount = "{file_descriptor}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                         descrMetricProcessOpenFileDescriptorCount,
-                                         unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                          descrMetricProcessOpenFileDescriptorCount,
-                                          unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                                   descrMetricProcessOpenFileDescriptorCount,
-                                                   unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                                    descrMetricProcessOpenFileDescriptorCount,
-                                                    unitMetricProcessOpenFileDescriptorCount);
-}
-
-/**
-  Number of page faults the process has made.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessPagingFaults = "process.paging.faults";
-static constexpr const char *descrMetricProcessPagingFaults =
-    "Number of page faults the process has made.";
-static constexpr const char *unitMetricProcessPagingFaults = "{fault}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessPagingFaults, descrMetricProcessPagingFaults,
-                                    unitMetricProcessPagingFaults);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessPagingFaults, descrMetricProcessPagingFaults,
-                                    unitMetricProcessPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricProcessPagingFaults, descrMetricProcessPagingFaults, unitMetricProcessPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricProcessPagingFaults, descrMetricProcessPagingFaults, unitMetricProcessPagingFaults);
-}
-
-/**
-  Process threads count.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricProcessThreadCount     = "process.thread.count";
-static constexpr const char *descrMetricProcessThreadCount = "Process threads count.";
-static constexpr const char *unitMetricProcessThreadCount  = "{thread}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessThreadCount, descrMetricProcessThreadCount,
-                                         unitMetricProcessThreadCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessThreadCount, descrMetricProcessThreadCount,
-                                          unitMetricProcessThreadCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
-}
-
-/**
-  The time the process has been running.
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricProcessUptime     = "process.uptime";
-static constexpr const char *descrMetricProcessUptime = "The time the process has been running.";
-static constexpr const char *unitMetricProcessUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                 unitMetricProcessUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                  unitMetricProcessUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                           unitMetricProcessUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                            unitMetricProcessUptime);
-}
-
-}  // namespace process
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/profile_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/profile_attributes.h
deleted file mode 100644
index 0e022c433..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/profile_attributes.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace profile
-{
-
-/**
-  Describes the interpreter or compiler of a single frame.
- */
-static constexpr const char *kProfileFrameType = "profile.frame.type";
-
-namespace ProfileFrameTypeValues
-{
-/**
-  <a href="https://wikipedia.org/wiki/.NET">.NET</a>
- */
-static constexpr const char *kDotnet = "dotnet";
-
-/**
-  <a href="https://wikipedia.org/wiki/Java_virtual_machine">JVM</a>
- */
-static constexpr const char *kJvm = "jvm";
-
-/**
-  <a href="https://wikipedia.org/wiki/Kernel_(operating_system)">Kernel</a>
- */
-static constexpr const char *kKernel = "kernel";
-
-/**
-  Can be one of but not limited to <a
-  href="https://wikipedia.org/wiki/C_(programming_language)">C</a>, <a
-  href="https://wikipedia.org/wiki/C%2B%2B">C++</a>, <a
-  href="https://wikipedia.org/wiki/Go_(programming_language)">Go</a> or <a
-  href="https://wikipedia.org/wiki/Rust_(programming_language)">Rust</a>. If possible, a more
-  precise value MUST be used.
- */
-static constexpr const char *kNative = "native";
-
-/**
-  <a href="https://wikipedia.org/wiki/Perl">Perl</a>
- */
-static constexpr const char *kPerl = "perl";
-
-/**
-  <a href="https://wikipedia.org/wiki/PHP">PHP</a>
- */
-static constexpr const char *kPhp = "php";
-
-/**
-  <a href="https://wikipedia.org/wiki/Python_(programming_language)">Python</a>
- */
-static constexpr const char *kCpython = "cpython";
-
-/**
-  <a href="https://wikipedia.org/wiki/Ruby_(programming_language)">Ruby</a>
- */
-static constexpr const char *kRuby = "ruby";
-
-/**
-  <a href="https://wikipedia.org/wiki/V8_(JavaScript_engine)">V8JS</a>
- */
-static constexpr const char *kV8js = "v8js";
-
-/**
-  <a href="https://en.wikipedia.org/wiki/BEAM_(Erlang_virtual_machine)">Erlang</a>
- */
-static constexpr const char *kBeam = "beam";
-
-/**
-  <a href="https://wikipedia.org/wiki/Go_(programming_language)">Go</a>,
- */
-static constexpr const char *kGo = "go";
-
-/**
-  <a href="https://wikipedia.org/wiki/Rust_(programming_language)">Rust</a>
- */
-static constexpr const char *kRust = "rust";
-
-}  // namespace ProfileFrameTypeValues
-
-}  // namespace profile
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/rpc_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/rpc_attributes.h
deleted file mode 100644
index daf36ce67..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/rpc_attributes.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace rpc
-{
-
-/**
-  The <a href="https://connectrpc.com//docs/protocol/#error-codes">error codes</a> of the Connect
-  request. Error codes are always string values.
- */
-static constexpr const char *kRpcConnectRpcErrorCode = "rpc.connect_rpc.error_code";
-
-/**
-  Connect request metadata, @code <key> @endcode being the normalized Connect Metadata key
-  (lowercase), the value being the metadata values. <p> Instrumentations SHOULD require an explicit
-  configuration of which metadata values are to be captured. Including all request metadata values
-  can be a security risk - explicit configuration helps avoid leaking sensitive information. <p> For
-  example, a property @code my-custom-key @endcode with value @code ["1.2.3.4", "1.2.3.5"] @endcode
-  SHOULD be recorded as the @code rpc.connect_rpc.request.metadata.my-custom-key @endcode attribute
-  with value @code ["1.2.3.4", "1.2.3.5"] @endcode
- */
-static constexpr const char *kRpcConnectRpcRequestMetadata = "rpc.connect_rpc.request.metadata";
-
-/**
-  Connect response metadata, @code <key> @endcode being the normalized Connect Metadata key
-  (lowercase), the value being the metadata values. <p> Instrumentations SHOULD require an explicit
-  configuration of which metadata values are to be captured. Including all response metadata values
-  can be a security risk - explicit configuration helps avoid leaking sensitive information. <p> For
-  example, a property @code my-custom-key @endcode with value @code "attribute_value" @endcode
-  SHOULD be recorded as the @code rpc.connect_rpc.response.metadata.my-custom-key @endcode attribute
-  with value @code ["attribute_value"] @endcode
- */
-static constexpr const char *kRpcConnectRpcResponseMetadata = "rpc.connect_rpc.response.metadata";
-
-/**
-  gRPC request metadata, @code <key> @endcode being the normalized gRPC Metadata key (lowercase),
-  the value being the metadata values. <p> Instrumentations SHOULD require an explicit configuration
-  of which metadata values are to be captured. Including all request metadata values can be a
-  security risk - explicit configuration helps avoid leaking sensitive information. <p> For example,
-  a property @code my-custom-key @endcode with value @code ["1.2.3.4", "1.2.3.5"] @endcode SHOULD be
-  recorded as
-  @code rpc.grpc.request.metadata.my-custom-key @endcode attribute with value @code ["1.2.3.4",
-  "1.2.3.5"] @endcode
- */
-static constexpr const char *kRpcGrpcRequestMetadata = "rpc.grpc.request.metadata";
-
-/**
-  gRPC response metadata, @code <key> @endcode being the normalized gRPC Metadata key (lowercase),
-  the value being the metadata values. <p> Instrumentations SHOULD require an explicit configuration
-  of which metadata values are to be captured. Including all response metadata values can be a
-  security risk - explicit configuration helps avoid leaking sensitive information. <p> For example,
-  a property @code my-custom-key @endcode with value @code ["attribute_value"] @endcode SHOULD be
-  recorded as the @code rpc.grpc.response.metadata.my-custom-key @endcode attribute with value @code
-  ["attribute_value"] @endcode
- */
-static constexpr const char *kRpcGrpcResponseMetadata = "rpc.grpc.response.metadata";
-
-/**
-  The <a href="https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md">numeric status code</a>
-  of the gRPC request.
- */
-static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
-
-/**
-  @code error.code @endcode property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
-
-/**
-  @code error.message @endcode property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
-
-/**
-  @code id @endcode property of request or response. Since protocol allows id to be int, string,
-  @code null @endcode or missing (for notifications), value is expected to be cast to string for
-  simplicity. Use empty string in case of @code null @endcode value. Omit entirely if this is a
-  notification.
- */
-static constexpr const char *kRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
-
-/**
-  Protocol version as in @code jsonrpc @endcode property of request/response. Since JSON-RPC 1.0
-  doesn't specify this, the value can be omitted.
- */
-static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
-
-/**
-  Compressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageCompressedSize = "rpc.message.compressed_size";
-
-/**
-  MUST be calculated as two different counters starting from @code 1 @endcode one for sent messages
-  and one for received message. <p> This way we guarantee that the values will be consistent between
-  different implementations.
- */
-static constexpr const char *kRpcMessageId = "rpc.message.id";
-
-/**
-  Whether this is a received or sent message.
- */
-static constexpr const char *kRpcMessageType = "rpc.message.type";
-
-/**
-  Uncompressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageUncompressedSize = "rpc.message.uncompressed_size";
-
-/**
-  The name of the (logical) method being called, must be equal to the $method part in the span name.
-  <p>
-  This is the logical name of the method from the RPC interface perspective, which can be different
-  from the name of any implementing method/function. The @code code.function.name @endcode attribute
-  may be used to store the latter (e.g., method actually executing the call on the server side, RPC
-  client stub method on the client side).
- */
-static constexpr const char *kRpcMethod = "rpc.method";
-
-/**
-  The full (logical) name of the service being called, including its package name, if applicable.
-  <p>
-  This is the logical name of the service from the RPC interface perspective, which can be different
-  from the name of any implementing class. The @code code.namespace @endcode attribute may be used
-  to store the latter (despite the attribute name, it may include a class name; e.g., class with
-  method actually executing the call on the server side, RPC client stub class on the client side).
- */
-static constexpr const char *kRpcService = "rpc.service";
-
-/**
-  A string identifying the remoting system. See below for a list of well-known identifiers.
- */
-static constexpr const char *kRpcSystem = "rpc.system";
-
-namespace RpcConnectRpcErrorCodeValues
-{
-/**
-  none
- */
-static constexpr const char *kCancelled = "cancelled";
-
-/**
-  none
- */
-static constexpr const char *kUnknown = "unknown";
-
-/**
-  none
- */
-static constexpr const char *kInvalidArgument = "invalid_argument";
-
-/**
-  none
- */
-static constexpr const char *kDeadlineExceeded = "deadline_exceeded";
-
-/**
-  none
- */
-static constexpr const char *kNotFound = "not_found";
-
-/**
-  none
- */
-static constexpr const char *kAlreadyExists = "already_exists";
-
-/**
-  none
- */
-static constexpr const char *kPermissionDenied = "permission_denied";
-
-/**
-  none
- */
-static constexpr const char *kResourceExhausted = "resource_exhausted";
-
-/**
-  none
- */
-static constexpr const char *kFailedPrecondition = "failed_precondition";
-
-/**
-  none
- */
-static constexpr const char *kAborted = "aborted";
-
-/**
-  none
- */
-static constexpr const char *kOutOfRange = "out_of_range";
-
-/**
-  none
- */
-static constexpr const char *kUnimplemented = "unimplemented";
-
-/**
-  none
- */
-static constexpr const char *kInternal = "internal";
-
-/**
-  none
- */
-static constexpr const char *kUnavailable = "unavailable";
-
-/**
-  none
- */
-static constexpr const char *kDataLoss = "data_loss";
-
-/**
-  none
- */
-static constexpr const char *kUnauthenticated = "unauthenticated";
-
-}  // namespace RpcConnectRpcErrorCodeValues
-
-namespace RpcGrpcStatusCodeValues
-{
-/**
-  OK
- */
-static constexpr int kOk = 0;
-
-/**
-  CANCELLED
- */
-static constexpr int kCancelled = 1;
-
-/**
-  UNKNOWN
- */
-static constexpr int kUnknown = 2;
-
-/**
-  INVALID_ARGUMENT
- */
-static constexpr int kInvalidArgument = 3;
-
-/**
-  DEADLINE_EXCEEDED
- */
-static constexpr int kDeadlineExceeded = 4;
-
-/**
-  NOT_FOUND
- */
-static constexpr int kNotFound = 5;
-
-/**
-  ALREADY_EXISTS
- */
-static constexpr int kAlreadyExists = 6;
-
-/**
-  PERMISSION_DENIED
- */
-static constexpr int kPermissionDenied = 7;
-
-/**
-  RESOURCE_EXHAUSTED
- */
-static constexpr int kResourceExhausted = 8;
-
-/**
-  FAILED_PRECONDITION
- */
-static constexpr int kFailedPrecondition = 9;
-
-/**
-  ABORTED
- */
-static constexpr int kAborted = 10;
-
-/**
-  OUT_OF_RANGE
- */
-static constexpr int kOutOfRange = 11;
-
-/**
-  UNIMPLEMENTED
- */
-static constexpr int kUnimplemented = 12;
-
-/**
-  INTERNAL
- */
-static constexpr int kInternal = 13;
-
-/**
-  UNAVAILABLE
- */
-static constexpr int kUnavailable = 14;
-
-/**
-  DATA_LOSS
- */
-static constexpr int kDataLoss = 15;
-
-/**
-  UNAUTHENTICATED
- */
-static constexpr int kUnauthenticated = 16;
-
-}  // namespace RpcGrpcStatusCodeValues
-
-namespace RpcMessageTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kSent = "SENT";
-
-/**
-  none
- */
-static constexpr const char *kReceived = "RECEIVED";
-
-}  // namespace RpcMessageTypeValues
-
-namespace RpcSystemValues
-{
-/**
-  gRPC
- */
-static constexpr const char *kGrpc = "grpc";
-
-/**
-  Java RMI
- */
-static constexpr const char *kJavaRmi = "java_rmi";
-
-/**
-  .NET WCF
- */
-static constexpr const char *kDotnetWcf = "dotnet_wcf";
-
-/**
-  Apache Dubbo
- */
-static constexpr const char *kApacheDubbo = "apache_dubbo";
-
-/**
-  Connect RPC
- */
-static constexpr const char *kConnectRpc = "connect_rpc";
-
-}  // namespace RpcSystemValues
-
-}  // namespace rpc
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/rpc_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/rpc_metrics.h
deleted file mode 100644
index a337142ef..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/rpc_metrics.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace rpc
-{
-
-/**
-  Measures the duration of outbound RPC.
-  <p>
-  While streaming RPCs may record this metric as start-of-batch
-  to end-of-batch, it's hard to interpret in practice.
-  <p>
-  <strong>Streaming</strong>: N/A.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientDuration = "rpc.client.duration";
-static constexpr const char *descrMetricRpcClientDuration =
-    "Measures the duration of outbound RPC.";
-static constexpr const char *unitMetricRpcClientDuration = "ms";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
-                                      unitMetricRpcClientDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcClientDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
-                                      unitMetricRpcClientDuration);
-}
-
-/**
-  Measures the size of RPC request messages (uncompressed).
-  <p>
-  <strong>Streaming</strong>: Recorded per message in a streaming batch
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientRequestSize = "rpc.client.request.size";
-static constexpr const char *descrMetricRpcClientRequestSize =
-    "Measures the size of RPC request messages (uncompressed).";
-static constexpr const char *unitMetricRpcClientRequestSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientRequestSize, descrMetricRpcClientRequestSize,
-                                      unitMetricRpcClientRequestSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientRequestSize, descrMetricRpcClientRequestSize,
-                                      unitMetricRpcClientRequestSize);
-}
-
-/**
-  Measures the number of messages received per RPC.
-  <p>
-  Should be 1 for all non-streaming RPCs.
-  <p>
-  <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientRequestsPerRpc = "rpc.client.requests_per_rpc";
-static constexpr const char *descrMetricRpcClientRequestsPerRpc =
-    "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcClientRequestsPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientRequestsPerRpc,
-                                      descrMetricRpcClientRequestsPerRpc,
-                                      unitMetricRpcClientRequestsPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientRequestsPerRpc,
-                                      descrMetricRpcClientRequestsPerRpc,
-                                      unitMetricRpcClientRequestsPerRpc);
-}
-
-/**
-  Measures the size of RPC response messages (uncompressed).
-  <p>
-  <strong>Streaming</strong>: Recorded per response in a streaming batch
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientResponseSize = "rpc.client.response.size";
-static constexpr const char *descrMetricRpcClientResponseSize =
-    "Measures the size of RPC response messages (uncompressed).";
-static constexpr const char *unitMetricRpcClientResponseSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientResponseSize,
-                                      descrMetricRpcClientResponseSize,
-                                      unitMetricRpcClientResponseSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientResponseSize,
-                                      descrMetricRpcClientResponseSize,
-                                      unitMetricRpcClientResponseSize);
-}
-
-/**
-  Measures the number of messages sent per RPC.
-  <p>
-  Should be 1 for all non-streaming RPCs.
-  <p>
-  <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientResponsesPerRpc = "rpc.client.responses_per_rpc";
-static constexpr const char *descrMetricRpcClientResponsesPerRpc =
-    "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcClientResponsesPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientResponsesPerRpc,
-                                      descrMetricRpcClientResponsesPerRpc,
-                                      unitMetricRpcClientResponsesPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientResponsesPerRpc,
-                                      descrMetricRpcClientResponsesPerRpc,
-                                      unitMetricRpcClientResponsesPerRpc);
-}
-
-/**
-  Measures the duration of inbound RPC.
-  <p>
-  While streaming RPCs may record this metric as start-of-batch
-  to end-of-batch, it's hard to interpret in practice.
-  <p>
-  <strong>Streaming</strong>: N/A.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerDuration     = "rpc.server.duration";
-static constexpr const char *descrMetricRpcServerDuration = "Measures the duration of inbound RPC.";
-static constexpr const char *unitMetricRpcServerDuration  = "ms";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
-                                      unitMetricRpcServerDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcServerDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
-                                      unitMetricRpcServerDuration);
-}
-
-/**
-  Measures the size of RPC request messages (uncompressed).
-  <p>
-  <strong>Streaming</strong>: Recorded per message in a streaming batch
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerRequestSize = "rpc.server.request.size";
-static constexpr const char *descrMetricRpcServerRequestSize =
-    "Measures the size of RPC request messages (uncompressed).";
-static constexpr const char *unitMetricRpcServerRequestSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerRequestSize, descrMetricRpcServerRequestSize,
-                                      unitMetricRpcServerRequestSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerRequestSize, descrMetricRpcServerRequestSize,
-                                      unitMetricRpcServerRequestSize);
-}
-
-/**
-  Measures the number of messages received per RPC.
-  <p>
-  Should be 1 for all non-streaming RPCs.
-  <p>
-  <strong>Streaming</strong> : This metric is required for server and client streaming RPCs
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerRequestsPerRpc = "rpc.server.requests_per_rpc";
-static constexpr const char *descrMetricRpcServerRequestsPerRpc =
-    "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcServerRequestsPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerRequestsPerRpc,
-                                      descrMetricRpcServerRequestsPerRpc,
-                                      unitMetricRpcServerRequestsPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerRequestsPerRpc,
-                                      descrMetricRpcServerRequestsPerRpc,
-                                      unitMetricRpcServerRequestsPerRpc);
-}
-
-/**
-  Measures the size of RPC response messages (uncompressed).
-  <p>
-  <strong>Streaming</strong>: Recorded per response in a streaming batch
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerResponseSize = "rpc.server.response.size";
-static constexpr const char *descrMetricRpcServerResponseSize =
-    "Measures the size of RPC response messages (uncompressed).";
-static constexpr const char *unitMetricRpcServerResponseSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerResponseSize,
-                                      descrMetricRpcServerResponseSize,
-                                      unitMetricRpcServerResponseSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerResponseSize,
-                                      descrMetricRpcServerResponseSize,
-                                      unitMetricRpcServerResponseSize);
-}
-
-/**
-  Measures the number of messages sent per RPC.
-  <p>
-  Should be 1 for all non-streaming RPCs.
-  <p>
-  <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerResponsesPerRpc = "rpc.server.responses_per_rpc";
-static constexpr const char *descrMetricRpcServerResponsesPerRpc =
-    "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcServerResponsesPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerResponsesPerRpc,
-                                      descrMetricRpcServerResponsesPerRpc,
-                                      unitMetricRpcServerResponsesPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerResponsesPerRpc,
-                                      descrMetricRpcServerResponsesPerRpc,
-                                      unitMetricRpcServerResponsesPerRpc);
-}
-
-}  // namespace rpc
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/security_rule_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/security_rule_attributes.h
deleted file mode 100644
index c010ebc0b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/security_rule_attributes.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace security_rule
-{
-
-/**
-  A categorization value keyword used by the entity using the rule for detection of this event
- */
-static constexpr const char *kSecurityRuleCategory = "security_rule.category";
-
-/**
-  The description of the rule generating the event.
- */
-static constexpr const char *kSecurityRuleDescription = "security_rule.description";
-
-/**
-  Name of the license under which the rule used to generate this event is made available.
- */
-static constexpr const char *kSecurityRuleLicense = "security_rule.license";
-
-/**
-  The name of the rule or signature generating the event.
- */
-static constexpr const char *kSecurityRuleName = "security_rule.name";
-
-/**
-  Reference URL to additional information about the rule used to generate this event.
-  <p>
-  The URL can point to the vendor’s documentation about the rule. If that’s not available, it can
-  also be a link to a more general page describing this type of alert.
- */
-static constexpr const char *kSecurityRuleReference = "security_rule.reference";
-
-/**
-  Name of the ruleset, policy, group, or parent category in which the rule used to generate this
-  event is a member.
- */
-static constexpr const char *kSecurityRuleRulesetName = "security_rule.ruleset.name";
-
-/**
-  A rule ID that is unique within the scope of a set or group of agents, observers, or other
-  entities using the rule for detection of this event.
- */
-static constexpr const char *kSecurityRuleUuid = "security_rule.uuid";
-
-/**
-  The version / revision of the rule being used for analysis.
- */
-static constexpr const char *kSecurityRuleVersion = "security_rule.version";
-
-}  // namespace security_rule
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/server_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/server_attributes.h
deleted file mode 100644
index 2d307614b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/server_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace server
-{
-
-/**
-  Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain
-  socket name. <p> When observed from the client side, and when communicating through an
-  intermediary, @code server.address @endcode SHOULD represent the server address behind any
-  intermediaries, for example proxies, if it's available.
- */
-static constexpr const char *kServerAddress = "server.address";
-
-/**
-  Server port number.
-  <p>
-  When observed from the client side, and when communicating through an intermediary, @code
-  server.port @endcode SHOULD represent the server port behind any intermediaries, for example
-  proxies, if it's available.
- */
-static constexpr const char *kServerPort = "server.port";
-
-}  // namespace server
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/service_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/service_attributes.h
deleted file mode 100644
index 3cc3f8940..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/service_attributes.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace service
-{
-
-/**
-  The string ID of the service instance.
-  <p>
-  MUST be unique for each instance of the same @code service.namespace,service.name @endcode pair
-  (in other words
-  @code service.namespace,service.name,service.instance.id @endcode triplet MUST be globally
-  unique). The ID helps to distinguish instances of the same service that exist at the same time
-  (e.g. instances of a horizontally scaled service). <p> Implementations, such as SDKs, are
-  recommended to generate a random Version 1 or Version 4 <a
-  href="https://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a> UUID, but are free to use an inherent
-  unique ID as the source of this value if stability is desirable. In that case, the ID SHOULD be
-  used as source of a UUID Version 5 and SHOULD use the following UUID as the namespace: @code
-  4d63009a-8d0f-11ee-aad7-4c796ed8e320 @endcode. <p> UUIDs are typically recommended, as only an
-  opaque value for the purposes of identifying a service instance is needed. Similar to what can be
-  seen in the man page for the <a
-  href="https://www.freedesktop.org/software/systemd/man/latest/machine-id.html">@code
-  /etc/machine-id @endcode</a> file, the underlying data, such as pod name and namespace should be
-  treated as confidential, being the user's choice to expose it or not via another resource
-  attribute. <p> For applications running behind an application server (like unicorn), we do not
-  recommend using one identifier for all processes participating in the application. Instead, it's
-  recommended each division (e.g. a worker thread in unicorn) to have its own instance.id. <p> It's
-  not recommended for a Collector to set @code service.instance.id @endcode if it can't
-  unambiguously determine the service instance that is generating that telemetry. For instance,
-  creating an UUID based on @code pod.name @endcode will likely be wrong, as the Collector might not
-  know from which container within that pod the telemetry originated. However, Collectors can set
-  the @code service.instance.id @endcode if they can unambiguously determine the service instance
-  for that telemetry. This is typically the case for scraping receivers, as they know the target
-  address and port.
- */
-static constexpr const char *kServiceInstanceId = "service.instance.id";
-
-/**
-  Logical name of the service.
-  <p>
-  MUST be the same for all instances of horizontally scaled services. If the value was not
-  specified, SDKs MUST fallback to @code unknown_service: @endcode concatenated with <a
-  href="process.md">@code process.executable.name @endcode</a>, e.g. @code unknown_service:bash
-  @endcode. If @code process.executable.name @endcode is not available, the value MUST be set to
-  @code unknown_service @endcode.
- */
-static constexpr const char *kServiceName = "service.name";
-
-/**
-  A namespace for @code service.name @endcode.
-  <p>
-  A string value having a meaning that helps to distinguish a group of services, for example the
-  team name that owns a group of services. @code service.name @endcode is expected to be unique
-  within the same namespace. If @code service.namespace @endcode is not specified in the Resource
-  then @code service.name @endcode is expected to be unique for all services that have no explicit
-  namespace defined (so the empty/unspecified namespace is simply one more valid namespace).
-  Zero-length namespace string is assumed equal to unspecified namespace.
- */
-static constexpr const char *kServiceNamespace = "service.namespace";
-
-/**
-  The version string of the service API or implementation. The format is not defined by these
-  conventions.
- */
-static constexpr const char *kServiceVersion = "service.version";
-
-}  // namespace service
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/session_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/session_attributes.h
deleted file mode 100644
index 06c23d8ce..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/session_attributes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace session
-{
-
-/**
-  A unique id to identify a session.
- */
-static constexpr const char *kSessionId = "session.id";
-
-/**
-  The previous @code session.id @endcode for this user, when known.
- */
-static constexpr const char *kSessionPreviousId = "session.previous_id";
-
-}  // namespace session
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/source_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/source_attributes.h
deleted file mode 100644
index ae52b27bc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/source_attributes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace source
-{
-
-/**
-  Source address - domain name if available without reverse DNS lookup; otherwise, IP address or
-  Unix domain socket name. <p> When observed from the destination side, and when communicating
-  through an intermediary, @code source.address @endcode SHOULD represent the source address behind
-  any intermediaries, for example proxies, if it's available.
- */
-static constexpr const char *kSourceAddress = "source.address";
-
-/**
-  Source port number
- */
-static constexpr const char *kSourcePort = "source.port";
-
-}  // namespace source
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/system_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/system_attributes.h
deleted file mode 100644
index 917d507b3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/system_attributes.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace system
-{
-
-/**
-  Deprecated, use @code cpu.logical_number @endcode instead.
- */
-static constexpr const char *kSystemCpuLogicalNumber = "system.cpu.logical_number";
-
-/**
-  Deprecated, use @code cpu.mode @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state";
-
-/**
-  The device identifier
- */
-static constexpr const char *kSystemDevice = "system.device";
-
-/**
-  The filesystem mode
- */
-static constexpr const char *kSystemFilesystemMode = "system.filesystem.mode";
-
-/**
-  The filesystem mount path
- */
-static constexpr const char *kSystemFilesystemMountpoint = "system.filesystem.mountpoint";
-
-/**
-  The filesystem state
- */
-static constexpr const char *kSystemFilesystemState = "system.filesystem.state";
-
-/**
-  The filesystem type
- */
-static constexpr const char *kSystemFilesystemType = "system.filesystem.type";
-
-/**
-  The memory state
- */
-static constexpr const char *kSystemMemoryState = "system.memory.state";
-
-/**
-  Deprecated, use @code network.connection.state @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code network.connection.state @endcode.", "reason": "renamed",
-  "renamed_to": "network.connection.state"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemNetworkState = "system.network.state";
-
-/**
-  The paging access direction
- */
-static constexpr const char *kSystemPagingDirection = "system.paging.direction";
-
-/**
-  The memory paging state
- */
-static constexpr const char *kSystemPagingState = "system.paging.state";
-
-/**
-  The memory paging type
- */
-static constexpr const char *kSystemPagingType = "system.paging.type";
-
-/**
-  The process state, e.g., <a
-  href="https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES">Linux Process State
-  Codes</a>
- */
-static constexpr const char *kSystemProcessStatus = "system.process.status";
-
-/**
-  Deprecated, use @code system.process.status @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code system.process.status @endcode.", "reason": "renamed", "renamed_to":
-  "system.process.status"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
-    "system.processes.status";
-
-namespace SystemCpuStateValues
-{
-/**
-  none
- */
-static constexpr const char *kUser = "user";
-
-/**
-  none
- */
-static constexpr const char *kSystem = "system";
-
-/**
-  none
- */
-static constexpr const char *kNice = "nice";
-
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kIowait = "iowait";
-
-/**
-  none
- */
-static constexpr const char *kInterrupt = "interrupt";
-
-/**
-  none
- */
-static constexpr const char *kSteal = "steal";
-
-}  // namespace SystemCpuStateValues
-
-namespace SystemFilesystemStateValues
-{
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-/**
-  none
- */
-static constexpr const char *kFree = "free";
-
-/**
-  none
- */
-static constexpr const char *kReserved = "reserved";
-
-}  // namespace SystemFilesystemStateValues
-
-namespace SystemFilesystemTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kFat32 = "fat32";
-
-/**
-  none
- */
-static constexpr const char *kExfat = "exfat";
-
-/**
-  none
- */
-static constexpr const char *kNtfs = "ntfs";
-
-/**
-  none
- */
-static constexpr const char *kRefs = "refs";
-
-/**
-  none
- */
-static constexpr const char *kHfsplus = "hfsplus";
-
-/**
-  none
- */
-static constexpr const char *kExt4 = "ext4";
-
-}  // namespace SystemFilesystemTypeValues
-
-namespace SystemMemoryStateValues
-{
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-/**
-  none
- */
-static constexpr const char *kFree = "free";
-
-/**
-  none
- */
-static constexpr const char *kShared = "shared";
-
-/**
-  none
- */
-static constexpr const char *kBuffers = "buffers";
-
-/**
-  none
- */
-static constexpr const char *kCached = "cached";
-
-}  // namespace SystemMemoryStateValues
-
-namespace SystemNetworkStateValues
-{
-/**
-  none
- */
-static constexpr const char *kClose = "close";
-
-/**
-  none
- */
-static constexpr const char *kCloseWait = "close_wait";
-
-/**
-  none
- */
-static constexpr const char *kClosing = "closing";
-
-/**
-  none
- */
-static constexpr const char *kDelete = "delete";
-
-/**
-  none
- */
-static constexpr const char *kEstablished = "established";
-
-/**
-  none
- */
-static constexpr const char *kFinWait1 = "fin_wait_1";
-
-/**
-  none
- */
-static constexpr const char *kFinWait2 = "fin_wait_2";
-
-/**
-  none
- */
-static constexpr const char *kLastAck = "last_ack";
-
-/**
-  none
- */
-static constexpr const char *kListen = "listen";
-
-/**
-  none
- */
-static constexpr const char *kSynRecv = "syn_recv";
-
-/**
-  none
- */
-static constexpr const char *kSynSent = "syn_sent";
-
-/**
-  none
- */
-static constexpr const char *kTimeWait = "time_wait";
-
-}  // namespace SystemNetworkStateValues
-
-namespace SystemPagingDirectionValues
-{
-/**
-  none
- */
-static constexpr const char *kIn = "in";
-
-/**
-  none
- */
-static constexpr const char *kOut = "out";
-
-}  // namespace SystemPagingDirectionValues
-
-namespace SystemPagingStateValues
-{
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-/**
-  none
- */
-static constexpr const char *kFree = "free";
-
-}  // namespace SystemPagingStateValues
-
-namespace SystemPagingTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kMajor = "major";
-
-/**
-  none
- */
-static constexpr const char *kMinor = "minor";
-
-}  // namespace SystemPagingTypeValues
-
-namespace SystemProcessStatusValues
-{
-/**
-  none
- */
-static constexpr const char *kRunning = "running";
-
-/**
-  none
- */
-static constexpr const char *kSleeping = "sleeping";
-
-/**
-  none
- */
-static constexpr const char *kStopped = "stopped";
-
-/**
-  none
- */
-static constexpr const char *kDefunct = "defunct";
-
-}  // namespace SystemProcessStatusValues
-
-namespace SystemProcessesStatusValues
-{
-/**
-  none
- */
-static constexpr const char *kRunning = "running";
-
-/**
-  none
- */
-static constexpr const char *kSleeping = "sleeping";
-
-/**
-  none
- */
-static constexpr const char *kStopped = "stopped";
-
-/**
-  none
- */
-static constexpr const char *kDefunct = "defunct";
-
-}  // namespace SystemProcessesStatusValues
-
-}  // namespace system
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/system_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/system_metrics.h
deleted file mode 100644
index a6e01ea75..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/system_metrics.h
+++ /dev/null
@@ -1,1338 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace system
-{
-
-/**
-  Deprecated. Use @code cpu.frequency @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.frequency @endcode.", "reason": "renamed", "renamed_to":
-  "cpu.frequency"} <p> gauge
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuFrequency =
-    "system.cpu.frequency";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuFrequency =
-    "Deprecated. Use `cpu.frequency` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuFrequency = "{Hz}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                 unitMetricSystemCpuFrequency);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                  unitMetricSystemCpuFrequency);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                           unitMetricSystemCpuFrequency);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency, unitMetricSystemCpuFrequency);
-}
-
-/**
-  Reports the number of logical (virtual) processor cores created by the operating system to manage
-  multitasking <p> Calculated by multiplying the number of sockets by the number of cores per
-  socket, and then by the number of threads per core <p> updowncounter
- */
-static constexpr const char *kMetricSystemCpuLogicalCount = "system.cpu.logical.count";
-static constexpr const char *descrMetricSystemCpuLogicalCount =
-    "Reports the number of logical (virtual) processor cores created by the operating system to "
-    "manage multitasking";
-static constexpr const char *unitMetricSystemCpuLogicalCount = "{cpu}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemCpuLogicalCount,
-                                         descrMetricSystemCpuLogicalCount,
-                                         unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemCpuLogicalCount,
-                                          descrMetricSystemCpuLogicalCount,
-                                          unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemCpuLogicalCount,
-                                                   descrMetricSystemCpuLogicalCount,
-                                                   unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemCpuLogicalCount,
-                                                    descrMetricSystemCpuLogicalCount,
-                                                    unitMetricSystemCpuLogicalCount);
-}
-
-/**
-  Reports the number of actual physical processor cores on the hardware
-  <p>
-  Calculated by multiplying the number of sockets by the number of cores per socket
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemCpuPhysicalCount = "system.cpu.physical.count";
-static constexpr const char *descrMetricSystemCpuPhysicalCount =
-    "Reports the number of actual physical processor cores on the hardware";
-static constexpr const char *unitMetricSystemCpuPhysicalCount = "{cpu}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemCpuPhysicalCount,
-                                         descrMetricSystemCpuPhysicalCount,
-                                         unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                          descrMetricSystemCpuPhysicalCount,
-                                          unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                                   descrMetricSystemCpuPhysicalCount,
-                                                   unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                                    descrMetricSystemCpuPhysicalCount,
-                                                    unitMetricSystemCpuPhysicalCount);
-}
-
-/**
-  Deprecated. Use @code cpu.time @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.time @endcode.", "reason": "renamed", "renamed_to": "cpu.time"}
-  <p>
-  counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuTime = "system.cpu.time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuTime =
-    "Deprecated. Use `cpu.time` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuTime = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                    unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                    unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                             unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                              unitMetricSystemCpuTime);
-}
-
-/**
-  Deprecated. Use @code cpu.utilization @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.utilization @endcode.", "reason": "renamed", "renamed_to":
-  "cpu.utilization"} <p> gauge
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuUtilization =
-    "system.cpu.utilization";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuUtilization =
-    "Deprecated. Use `cpu.utilization` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization,
-                                 unitMetricSystemCpuUtilization);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization,
-                                  unitMetricSystemCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization, unitMetricSystemCpuUtilization);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization, unitMetricSystemCpuUtilization);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemDiskIo     = "system.disk.io";
-static constexpr const char *descrMetricSystemDiskIo = "";
-static constexpr const char *unitMetricSystemDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                    unitMetricSystemDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                    unitMetricSystemDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                             unitMetricSystemDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                              unitMetricSystemDiskIo);
-}
-
-/**
-  Time disk spent activated
-  <p>
-  The real elapsed time ("wall clock") used in the I/O path (time from operations running in
-  parallel are not counted). Measured as: <ul> <li>Linux: Field 13 from <a
-  href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
-    <li>Windows: The complement of
-  <a
-  href="https://learn.microsoft.com/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained">"Disk%
-  Idle Time"</a> performance counter: @code uptime * (100 - "Disk\% Idle Time") / 100 @endcode</li>
-  </ul>
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemDiskIoTime     = "system.disk.io_time";
-static constexpr const char *descrMetricSystemDiskIoTime = "Time disk spent activated";
-static constexpr const char *unitMetricSystemDiskIoTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIoTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                    unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskIoTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                    unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskIoTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                             unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskIoTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                              unitMetricSystemDiskIoTime);
-}
-
-/**
-  The total storage capacity of the disk
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemDiskLimit     = "system.disk.limit";
-static constexpr const char *descrMetricSystemDiskLimit = "The total storage capacity of the disk";
-static constexpr const char *unitMetricSystemDiskLimit  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemDiskLimit, descrMetricSystemDiskLimit,
-                                         unitMetricSystemDiskLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemDiskLimit, descrMetricSystemDiskLimit,
-                                          unitMetricSystemDiskLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemDiskLimit, descrMetricSystemDiskLimit, unitMetricSystemDiskLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemDiskLimit, descrMetricSystemDiskLimit, unitMetricSystemDiskLimit);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemDiskMerged     = "system.disk.merged";
-static constexpr const char *descrMetricSystemDiskMerged = "";
-static constexpr const char *unitMetricSystemDiskMerged  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskMerged(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                    unitMetricSystemDiskMerged);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskMerged(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                    unitMetricSystemDiskMerged);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskMerged(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                             unitMetricSystemDiskMerged);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskMerged(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                              unitMetricSystemDiskMerged);
-}
-
-/**
-  Sum of the time each operation took to complete
-  <p>
-  Because it is the sum of time each request took, parallel-issued requests each contribute to make
-  the count grow. Measured as: <ul> <li>Linux: Fields 7 & 11 from <a
-  href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
-    <li>Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter
-  (similar for Writes)</li>
-  </ul>
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemDiskOperationTime = "system.disk.operation_time";
-static constexpr const char *descrMetricSystemDiskOperationTime =
-    "Sum of the time each operation took to complete";
-static constexpr const char *unitMetricSystemDiskOperationTime = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskOperationTime,
-                                    descrMetricSystemDiskOperationTime,
-                                    unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskOperationTime,
-                                    descrMetricSystemDiskOperationTime,
-                                    unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskOperationTime,
-                                             descrMetricSystemDiskOperationTime,
-                                             unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskOperationTime,
-                                              descrMetricSystemDiskOperationTime,
-                                              unitMetricSystemDiskOperationTime);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemDiskOperations     = "system.disk.operations";
-static constexpr const char *descrMetricSystemDiskOperations = "";
-static constexpr const char *unitMetricSystemDiskOperations  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskOperations, descrMetricSystemDiskOperations,
-                                    unitMetricSystemDiskOperations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskOperations, descrMetricSystemDiskOperations,
-                                    unitMetricSystemDiskOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemDiskOperations, descrMetricSystemDiskOperations, unitMetricSystemDiskOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemDiskOperations, descrMetricSystemDiskOperations, unitMetricSystemDiskOperations);
-}
-
-/**
-  The total storage capacity of the filesystem
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemFilesystemLimit = "system.filesystem.limit";
-static constexpr const char *descrMetricSystemFilesystemLimit =
-    "The total storage capacity of the filesystem";
-static constexpr const char *unitMetricSystemFilesystemLimit = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemFilesystemLimit,
-                                         descrMetricSystemFilesystemLimit,
-                                         unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemFilesystemLimit,
-                                          descrMetricSystemFilesystemLimit,
-                                          unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemFilesystemLimit,
-                                                   descrMetricSystemFilesystemLimit,
-                                                   unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemFilesystemLimit,
-                                                    descrMetricSystemFilesystemLimit,
-                                                    unitMetricSystemFilesystemLimit);
-}
-
-/**
-  Reports a filesystem's space usage across different states.
-  <p>
-  The sum of all @code system.filesystem.usage @endcode values over the different @code
-  system.filesystem.state @endcode attributes SHOULD equal the total storage capacity of the
-  filesystem, that is @code system.filesystem.limit @endcode. <p> updowncounter
- */
-static constexpr const char *kMetricSystemFilesystemUsage = "system.filesystem.usage";
-static constexpr const char *descrMetricSystemFilesystemUsage =
-    "Reports a filesystem's space usage across different states.";
-static constexpr const char *unitMetricSystemFilesystemUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemFilesystemUsage,
-                                         descrMetricSystemFilesystemUsage,
-                                         unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemFilesystemUsage,
-                                          descrMetricSystemFilesystemUsage,
-                                          unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemFilesystemUsage,
-                                                   descrMetricSystemFilesystemUsage,
-                                                   unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemFilesystemUsage,
-                                                    descrMetricSystemFilesystemUsage,
-                                                    unitMetricSystemFilesystemUsage);
-}
-
-/**
-  gauge
- */
-static constexpr const char *kMetricSystemFilesystemUtilization = "system.filesystem.utilization";
-static constexpr const char *descrMetricSystemFilesystemUtilization = "";
-static constexpr const char *unitMetricSystemFilesystemUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemFilesystemUtilization,
-                                 descrMetricSystemFilesystemUtilization,
-                                 unitMetricSystemFilesystemUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemFilesystemUtilization,
-                                  descrMetricSystemFilesystemUtilization,
-                                  unitMetricSystemFilesystemUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemFilesystemUtilization,
-                                           descrMetricSystemFilesystemUtilization,
-                                           unitMetricSystemFilesystemUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemFilesystemUtilization,
-                                            descrMetricSystemFilesystemUtilization,
-                                            unitMetricSystemFilesystemUtilization);
-}
-
-/**
-  An estimate of how much memory is available for starting new applications, without causing
-  swapping <p> This is an alternative to @code system.memory.usage @endcode metric with @code
-  state=free @endcode. Linux starting from 3.14 exports "available" memory. It takes "free" memory
-  as a baseline, and then factors in kernel-specific values. This is supposed to be more accurate
-  than just "free" memory. For reference, see the calculations <a
-  href="https://superuser.com/a/980821">here</a>. See also @code MemAvailable @endcode in <a
-  href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemoryAvailable = "system.linux.memory.available";
-static constexpr const char *descrMetricSystemLinuxMemoryAvailable =
-    "An estimate of how much memory is available for starting new applications, without causing "
-    "swapping";
-static constexpr const char *unitMetricSystemLinuxMemoryAvailable = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                         descrMetricSystemLinuxMemoryAvailable,
-                                         unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                          descrMetricSystemLinuxMemoryAvailable,
-                                          unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                   descrMetricSystemLinuxMemoryAvailable,
-                                                   unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                    descrMetricSystemLinuxMemoryAvailable,
-                                                    unitMetricSystemLinuxMemoryAvailable);
-}
-
-/**
-  Reports the memory used by the Linux kernel for managing caches of frequently used objects.
-  <p>
-  The sum over the @code reclaimable @endcode and @code unreclaimable @endcode state values in @code
-  linux.memory.slab.usage @endcode SHOULD be equal to the total slab memory available on the system.
-  Note that the total slab memory is not constant and may vary over time.
-  See also the <a
-  href="https://blogs.oracle.com/linux/post/understanding-linux-kernel-memory-statistics">Slab
-  allocator</a> and @code Slab @endcode in <a
-  href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemorySlabUsage = "system.linux.memory.slab.usage";
-static constexpr const char *descrMetricSystemLinuxMemorySlabUsage =
-    "Reports the memory used by the Linux kernel for managing caches of frequently used objects.";
-static constexpr const char *unitMetricSystemLinuxMemorySlabUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                         descrMetricSystemLinuxMemorySlabUsage,
-                                         unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                          descrMetricSystemLinuxMemorySlabUsage,
-                                          unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                   descrMetricSystemLinuxMemorySlabUsage,
-                                                   unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                    descrMetricSystemLinuxMemorySlabUsage,
-                                                    unitMetricSystemLinuxMemorySlabUsage);
-}
-
-/**
-  Total memory available in the system.
-  <p>
-  Its value SHOULD equal the sum of @code system.memory.state @endcode over all states.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemMemoryLimit     = "system.memory.limit";
-static constexpr const char *descrMetricSystemMemoryLimit = "Total memory available in the system.";
-static constexpr const char *unitMetricSystemMemoryLimit  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit,
-                                         unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit,
-                                          unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
-}
-
-/**
-  Shared memory used (mostly by tmpfs).
-  <p>
-  Equivalent of @code shared @endcode from <a
-  href="https://man7.org/linux/man-pages/man1/free.1.html">@code free @endcode command</a> or
-  @code Shmem @endcode from <a href="https://man7.org/linux/man-pages/man5/proc.5.html">@code
-  /proc/meminfo @endcode</a>" <p> updowncounter
- */
-static constexpr const char *kMetricSystemMemoryShared = "system.memory.shared";
-static constexpr const char *descrMetricSystemMemoryShared =
-    "Shared memory used (mostly by tmpfs).";
-static constexpr const char *unitMetricSystemMemoryShared = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryShared, descrMetricSystemMemoryShared,
-                                         unitMetricSystemMemoryShared);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryShared, descrMetricSystemMemoryShared,
-                                          unitMetricSystemMemoryShared);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryShared, descrMetricSystemMemoryShared, unitMetricSystemMemoryShared);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryShared, descrMetricSystemMemoryShared, unitMetricSystemMemoryShared);
-}
-
-/**
-  Reports memory in use by state.
-  <p>
-  The sum over all @code system.memory.state @endcode values SHOULD equal the total memory
-  available on the system, that is @code system.memory.limit @endcode.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemMemoryUsage     = "system.memory.usage";
-static constexpr const char *descrMetricSystemMemoryUsage = "Reports memory in use by state.";
-static constexpr const char *unitMetricSystemMemoryUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage,
-                                         unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage,
-                                          unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage, unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage, unitMetricSystemMemoryUsage);
-}
-
-/**
-  gauge
- */
-static constexpr const char *kMetricSystemMemoryUtilization     = "system.memory.utilization";
-static constexpr const char *descrMetricSystemMemoryUtilization = "";
-static constexpr const char *unitMetricSystemMemoryUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemMemoryUtilization, descrMetricSystemMemoryUtilization,
-                                 unitMetricSystemMemoryUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemMemoryUtilization,
-                                  descrMetricSystemMemoryUtilization,
-                                  unitMetricSystemMemoryUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemMemoryUtilization,
-                                           descrMetricSystemMemoryUtilization,
-                                           unitMetricSystemMemoryUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemMemoryUtilization,
-                                            descrMetricSystemMemoryUtilization,
-                                            unitMetricSystemMemoryUtilization);
-}
-
-/**
-  updowncounter
- */
-static constexpr const char *kMetricSystemNetworkConnections     = "system.network.connections";
-static constexpr const char *descrMetricSystemNetworkConnections = "";
-static constexpr const char *unitMetricSystemNetworkConnections  = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemNetworkConnections,
-                                         descrMetricSystemNetworkConnections,
-                                         unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemNetworkConnections,
-                                          descrMetricSystemNetworkConnections,
-                                          unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemNetworkConnections,
-                                                   descrMetricSystemNetworkConnections,
-                                                   unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemNetworkConnections,
-                                                    descrMetricSystemNetworkConnections,
-                                                    unitMetricSystemNetworkConnections);
-}
-
-/**
-  Count of packets that are dropped or discarded even though there was no error
-  <p>
-  Measured as:
-  <ul>
-    <li>Linux: the @code drop @endcode column in @code /proc/dev/net @endcode (<a
-  href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
-    <li>Windows: <a
-  href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
-  InDiscards @endcode/@code OutDiscards @endcode</a> from <a
-  href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
-  GetIfEntry2 @endcode</a></li>
-  </ul>
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemNetworkDropped = "system.network.dropped";
-static constexpr const char *descrMetricSystemNetworkDropped =
-    "Count of packets that are dropped or discarded even though there was no error";
-static constexpr const char *unitMetricSystemNetworkDropped = "{packet}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
-                                    unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
-                                    unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
-}
-
-/**
-  Count of network errors detected
-  <p>
-  Measured as:
-  <ul>
-    <li>Linux: the @code errs @endcode column in @code /proc/dev/net @endcode (<a
-  href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>).</li>
-    <li>Windows: <a
-  href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
-  InErrors @endcode/@code OutErrors @endcode</a> from <a
-  href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
-  GetIfEntry2 @endcode</a>.</li>
-  </ul>
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemNetworkErrors     = "system.network.errors";
-static constexpr const char *descrMetricSystemNetworkErrors = "Count of network errors detected";
-static constexpr const char *unitMetricSystemNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors,
-                                    unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemNetworkErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors,
-                                    unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors, unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors, unitMetricSystemNetworkErrors);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemNetworkIo     = "system.network.io";
-static constexpr const char *descrMetricSystemNetworkIo = "";
-static constexpr const char *unitMetricSystemNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                    unitMetricSystemNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                    unitMetricSystemNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                             unitMetricSystemNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                              unitMetricSystemNetworkIo);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemNetworkPackets     = "system.network.packets";
-static constexpr const char *descrMetricSystemNetworkPackets = "";
-static constexpr const char *unitMetricSystemNetworkPackets  = "{packet}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
-                                    unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
-                                    unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemPagingFaults     = "system.paging.faults";
-static constexpr const char *descrMetricSystemPagingFaults = "";
-static constexpr const char *unitMetricSystemPagingFaults  = "{fault}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemPagingFaults, descrMetricSystemPagingFaults,
-                                    unitMetricSystemPagingFaults);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemPagingFaults, descrMetricSystemPagingFaults,
-                                    unitMetricSystemPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemPagingFaults, descrMetricSystemPagingFaults, unitMetricSystemPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemPagingFaults, descrMetricSystemPagingFaults, unitMetricSystemPagingFaults);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemPagingOperations     = "system.paging.operations";
-static constexpr const char *descrMetricSystemPagingOperations = "";
-static constexpr const char *unitMetricSystemPagingOperations  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemPagingOperations,
-                                    descrMetricSystemPagingOperations,
-                                    unitMetricSystemPagingOperations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemPagingOperations,
-                                    descrMetricSystemPagingOperations,
-                                    unitMetricSystemPagingOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemPagingOperations,
-                                             descrMetricSystemPagingOperations,
-                                             unitMetricSystemPagingOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemPagingOperations,
-                                              descrMetricSystemPagingOperations,
-                                              unitMetricSystemPagingOperations);
-}
-
-/**
-  Unix swap or windows pagefile usage
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemPagingUsage     = "system.paging.usage";
-static constexpr const char *descrMetricSystemPagingUsage = "Unix swap or windows pagefile usage";
-static constexpr const char *unitMetricSystemPagingUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemPagingUsage, descrMetricSystemPagingUsage,
-                                         unitMetricSystemPagingUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemPagingUsage, descrMetricSystemPagingUsage,
-                                          unitMetricSystemPagingUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemPagingUsage, descrMetricSystemPagingUsage, unitMetricSystemPagingUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemPagingUsage, descrMetricSystemPagingUsage, unitMetricSystemPagingUsage);
-}
-
-/**
-  gauge
- */
-static constexpr const char *kMetricSystemPagingUtilization     = "system.paging.utilization";
-static constexpr const char *descrMetricSystemPagingUtilization = "";
-static constexpr const char *unitMetricSystemPagingUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemPagingUtilization, descrMetricSystemPagingUtilization,
-                                 unitMetricSystemPagingUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemPagingUtilization,
-                                  descrMetricSystemPagingUtilization,
-                                  unitMetricSystemPagingUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemPagingUtilization,
-                                           descrMetricSystemPagingUtilization,
-                                           unitMetricSystemPagingUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemPagingUtilization,
-                                            descrMetricSystemPagingUtilization,
-                                            unitMetricSystemPagingUtilization);
-}
-
-/**
-  Total number of processes in each state
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemProcessCount = "system.process.count";
-static constexpr const char *descrMetricSystemProcessCount =
-    "Total number of processes in each state";
-static constexpr const char *unitMetricSystemProcessCount = "{process}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemProcessCount, descrMetricSystemProcessCount,
-                                         unitMetricSystemProcessCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemProcessCount, descrMetricSystemProcessCount,
-                                          unitMetricSystemProcessCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemProcessCount, descrMetricSystemProcessCount, unitMetricSystemProcessCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemProcessCount, descrMetricSystemProcessCount, unitMetricSystemProcessCount);
-}
-
-/**
-  Total number of processes created over uptime of the host
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemProcessCreated = "system.process.created";
-static constexpr const char *descrMetricSystemProcessCreated =
-    "Total number of processes created over uptime of the host";
-static constexpr const char *unitMetricSystemProcessCreated = "{process}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemProcessCreated, descrMetricSystemProcessCreated,
-                                    unitMetricSystemProcessCreated);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemProcessCreated, descrMetricSystemProcessCreated,
-                                    unitMetricSystemProcessCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemProcessCreated, descrMetricSystemProcessCreated, unitMetricSystemProcessCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemProcessCreated, descrMetricSystemProcessCreated, unitMetricSystemProcessCreated);
-}
-
-/**
-  The time the system has been running
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricSystemUptime     = "system.uptime";
-static constexpr const char *descrMetricSystemUptime = "The time the system has been running";
-static constexpr const char *unitMetricSystemUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                 unitMetricSystemUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                  unitMetricSystemUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                           unitMetricSystemUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                            unitMetricSystemUptime);
-}
-
-}  // namespace system
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/telemetry_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/telemetry_attributes.h
deleted file mode 100644
index 7a34acefe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/telemetry_attributes.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace telemetry
-{
-
-/**
-  The name of the auto instrumentation agent or distribution, if used.
-  <p>
-  Official auto instrumentation agents and distributions SHOULD set the @code telemetry.distro.name
-  @endcode attribute to a string starting with @code opentelemetry- @endcode, e.g. @code
-  opentelemetry-java-instrumentation @endcode.
- */
-static constexpr const char *kTelemetryDistroName = "telemetry.distro.name";
-
-/**
-  The version string of the auto instrumentation agent or distribution, if used.
- */
-static constexpr const char *kTelemetryDistroVersion = "telemetry.distro.version";
-
-/**
-  The language of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
-
-/**
-  The name of the telemetry SDK as defined above.
-  <p>
-  The OpenTelemetry SDK MUST set the @code telemetry.sdk.name @endcode attribute to @code
-  opentelemetry @endcode. If another SDK, like a fork or a vendor-provided implementation, is used,
-  this SDK MUST set the
-  @code telemetry.sdk.name @endcode attribute to the fully-qualified class or module name of this
-  SDK's main entry point or another suitable identifier depending on the language. The identifier
-  @code opentelemetry @endcode is reserved and MUST NOT be used in this case. All custom identifiers
-  SHOULD be stable across different versions of an implementation.
- */
-static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
-
-/**
-  The version string of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
-
-namespace TelemetrySdkLanguageValues
-{
-/**
-  none
- */
-static constexpr const char *kCpp = "cpp";
-
-/**
-  none
- */
-static constexpr const char *kDotnet = "dotnet";
-
-/**
-  none
- */
-static constexpr const char *kErlang = "erlang";
-
-/**
-  none
- */
-static constexpr const char *kGo = "go";
-
-/**
-  none
- */
-static constexpr const char *kJava = "java";
-
-/**
-  none
- */
-static constexpr const char *kNodejs = "nodejs";
-
-/**
-  none
- */
-static constexpr const char *kPhp = "php";
-
-/**
-  none
- */
-static constexpr const char *kPython = "python";
-
-/**
-  none
- */
-static constexpr const char *kRuby = "ruby";
-
-/**
-  none
- */
-static constexpr const char *kRust = "rust";
-
-/**
-  none
- */
-static constexpr const char *kSwift = "swift";
-
-/**
-  none
- */
-static constexpr const char *kWebjs = "webjs";
-
-}  // namespace TelemetrySdkLanguageValues
-
-}  // namespace telemetry
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/test_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/test_attributes.h
deleted file mode 100644
index ede4e2348..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/test_attributes.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace test
-{
-
-/**
-  The fully qualified human readable name of the <a href="https://wikipedia.org/wiki/Test_case">test
-  case</a>.
- */
-static constexpr const char *kTestCaseName = "test.case.name";
-
-/**
-  The status of the actual test case result from test execution.
- */
-static constexpr const char *kTestCaseResultStatus = "test.case.result.status";
-
-/**
-  The human readable name of a <a href="https://wikipedia.org/wiki/Test_suite">test suite</a>.
- */
-static constexpr const char *kTestSuiteName = "test.suite.name";
-
-/**
-  The status of the test suite run.
- */
-static constexpr const char *kTestSuiteRunStatus = "test.suite.run.status";
-
-namespace TestCaseResultStatusValues
-{
-/**
-  pass
- */
-static constexpr const char *kPass = "pass";
-
-/**
-  fail
- */
-static constexpr const char *kFail = "fail";
-
-}  // namespace TestCaseResultStatusValues
-
-namespace TestSuiteRunStatusValues
-{
-/**
-  success
- */
-static constexpr const char *kSuccess = "success";
-
-/**
-  failure
- */
-static constexpr const char *kFailure = "failure";
-
-/**
-  skipped
- */
-static constexpr const char *kSkipped = "skipped";
-
-/**
-  aborted
- */
-static constexpr const char *kAborted = "aborted";
-
-/**
-  timed_out
- */
-static constexpr const char *kTimedOut = "timed_out";
-
-/**
-  in_progress
- */
-static constexpr const char *kInProgress = "in_progress";
-
-}  // namespace TestSuiteRunStatusValues
-
-}  // namespace test
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/thread_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/thread_attributes.h
deleted file mode 100644
index 2d0c29065..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/thread_attributes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace thread
-{
-
-/**
-  Current "managed" thread ID (as opposed to OS thread ID).
- */
-static constexpr const char *kThreadId = "thread.id";
-
-/**
-  Current thread name.
- */
-static constexpr const char *kThreadName = "thread.name";
-
-}  // namespace thread
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/tls_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/tls_attributes.h
deleted file mode 100644
index 0deee289d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/tls_attributes.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace tls
-{
-
-/**
-  String indicating the <a
-  href="https://datatracker.ietf.org/doc/html/rfc5246#appendix-A.5">cipher</a> used during the
-  current connection. <p> The values allowed for @code tls.cipher @endcode MUST be one of the @code
-  Descriptions @endcode of the <a
-  href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#table-tls-parameters-4">registered
-  TLS Cipher Suits</a>.
- */
-static constexpr const char *kTlsCipher = "tls.cipher";
-
-/**
-  PEM-encoded stand-alone certificate offered by the client. This is usually mutually-exclusive of
-  @code client.certificate_chain @endcode since this value also exists in that list.
- */
-static constexpr const char *kTlsClientCertificate = "tls.client.certificate";
-
-/**
-  Array of PEM-encoded certificates that make up the certificate chain offered by the client. This
-  is usually mutually-exclusive of @code client.certificate @endcode since that value should be the
-  first certificate in the chain.
- */
-static constexpr const char *kTlsClientCertificateChain = "tls.client.certificate_chain";
-
-/**
-  Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
-  client. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsClientHashMd5 = "tls.client.hash.md5";
-
-/**
-  Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by the
-  client. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsClientHashSha1 = "tls.client.hash.sha1";
-
-/**
-  Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
-  the client. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsClientHashSha256 = "tls.client.hash.sha256";
-
-/**
-  Distinguished name of <a
-  href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
-  the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientIssuer = "tls.client.issuer";
-
-/**
-  A hash that identifies clients based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsClientJa3 = "tls.client.ja3";
-
-/**
-  Date/Time indicating when client certificate is no longer considered valid.
- */
-static constexpr const char *kTlsClientNotAfter = "tls.client.not_after";
-
-/**
-  Date/Time indicating when client certificate is first considered valid.
- */
-static constexpr const char *kTlsClientNotBefore = "tls.client.not_before";
-
-/**
-  Deprecated, use @code server.address @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to":
-  "server.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName =
-    "tls.client.server_name";
-
-/**
-  Distinguished name of subject of the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientSubject = "tls.client.subject";
-
-/**
-  Array of ciphers offered by the client during the client hello.
- */
-static constexpr const char *kTlsClientSupportedCiphers = "tls.client.supported_ciphers";
-
-/**
-  String indicating the curve used for the given cipher, when applicable
- */
-static constexpr const char *kTlsCurve = "tls.curve";
-
-/**
-  Boolean flag indicating if the TLS negotiation was successful and transitioned to an encrypted
-  tunnel.
- */
-static constexpr const char *kTlsEstablished = "tls.established";
-
-/**
-  String indicating the protocol being tunneled. Per the values in the <a
-  href="https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids">IANA
-  registry</a>, this string should be lower case.
- */
-static constexpr const char *kTlsNextProtocol = "tls.next_protocol";
-
-/**
-  Normalized lowercase protocol name parsed from original string of the negotiated <a
-  href="https://docs.openssl.org/1.1.1/man3/SSL_get_version/#return-values">SSL/TLS protocol
-  version</a>
- */
-static constexpr const char *kTlsProtocolName = "tls.protocol.name";
-
-/**
-  Numeric part of the version parsed from the original string of the negotiated <a
-  href="https://docs.openssl.org/1.1.1/man3/SSL_get_version/#return-values">SSL/TLS protocol
-  version</a>
- */
-static constexpr const char *kTlsProtocolVersion = "tls.protocol.version";
-
-/**
-  Boolean flag indicating if this TLS connection was resumed from an existing TLS negotiation.
- */
-static constexpr const char *kTlsResumed = "tls.resumed";
-
-/**
-  PEM-encoded stand-alone certificate offered by the server. This is usually mutually-exclusive of
-  @code server.certificate_chain @endcode since this value also exists in that list.
- */
-static constexpr const char *kTlsServerCertificate = "tls.server.certificate";
-
-/**
-  Array of PEM-encoded certificates that make up the certificate chain offered by the server. This
-  is usually mutually-exclusive of @code server.certificate @endcode since that value should be the
-  first certificate in the chain.
- */
-static constexpr const char *kTlsServerCertificateChain = "tls.server.certificate_chain";
-
-/**
-  Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
-  server. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsServerHashMd5 = "tls.server.hash.md5";
-
-/**
-  Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by the
-  server. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsServerHashSha1 = "tls.server.hash.sha1";
-
-/**
-  Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
-  the server. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsServerHashSha256 = "tls.server.hash.sha256";
-
-/**
-  Distinguished name of <a
-  href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
-  the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsServerIssuer = "tls.server.issuer";
-
-/**
-  A hash that identifies servers based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsServerJa3s = "tls.server.ja3s";
-
-/**
-  Date/Time indicating when server certificate is no longer considered valid.
- */
-static constexpr const char *kTlsServerNotAfter = "tls.server.not_after";
-
-/**
-  Date/Time indicating when server certificate is first considered valid.
- */
-static constexpr const char *kTlsServerNotBefore = "tls.server.not_before";
-
-/**
-  Distinguished name of subject of the x.509 certificate presented by the server.
- */
-static constexpr const char *kTlsServerSubject = "tls.server.subject";
-
-namespace TlsProtocolNameValues
-{
-/**
-  none
- */
-static constexpr const char *kSsl = "ssl";
-
-/**
-  none
- */
-static constexpr const char *kTls = "tls";
-
-}  // namespace TlsProtocolNameValues
-
-}  // namespace tls
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/url_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/url_attributes.h
deleted file mode 100644
index ed307e66c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/url_attributes.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace url
-{
-
-/**
-  Domain extracted from the @code url.full @endcode, such as "opentelemetry.io".
-  <p>
-  In some cases a URL may refer to an IP and/or port directly, without a domain name. In this case,
-  the IP address would go to the domain field. If the URL contains a <a
-  href="https://www.rfc-editor.org/rfc/rfc2732#section-2">literal IPv6 address</a> enclosed by @code
-  [ @endcode and @code ] @endcode, the @code [ @endcode and @code ] @endcode characters should also
-  be captured in the domain field.
- */
-static constexpr const char *kUrlDomain = "url.domain";
-
-/**
-  The file extension extracted from the @code url.full @endcode, excluding the leading dot.
-  <p>
-  The file extension is only set if it exists, as not every url has a file extension. When the file
-  name has multiple extensions @code example.tar.gz @endcode, only the last one should be captured
-  @code gz @endcode, not @code tar.gz @endcode.
- */
-static constexpr const char *kUrlExtension = "url.extension";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component
- */
-static constexpr const char *kUrlFragment = "url.fragment";
-
-/**
-  Absolute URL describing a network resource according to <a
-  href="https://www.rfc-editor.org/rfc/rfc3986">RFC3986</a> <p> For network calls, URL usually has
-  @code scheme://host[:port][path][?query][#fragment] @endcode format, where the fragment is not
-  transmitted over HTTP, but if it is known, it SHOULD be included nevertheless. <p>
-  @code url.full @endcode MUST NOT contain credentials passed via URL in form of @code
-  https://username:password@www.example.com/ @endcode. In such case username and password SHOULD be
-  redacted and attribute's value SHOULD be @code https://REDACTED:REDACTED@www.example.com/
-  @endcode. <p>
-  @code url.full @endcode SHOULD capture the absolute URL when it is available (or can be
-  reconstructed). <p> Sensitive content provided in @code url.full @endcode SHOULD be scrubbed when
-  instrumentations can identify it. <p>
-
-  Query string values for the following keys SHOULD be redacted by default and replaced by the
-  value @code REDACTED @endcode:
-  <ul>
-    <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  AWSAccessKeyId @endcode</a></li> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  Signature @endcode</a></li> <li><a
-  href="https://learn.microsoft.com/azure/storage/common/storage-sas-overview#sas-token">@code sig
-  @endcode</a></li> <li><a
-  href="https://cloud.google.com/storage/docs/access-control/signed-urls">@code X-Goog-Signature
-  @endcode</a></li>
-  </ul>
-  <p>
-  This list is subject to change over time.
-  <p>
-  When a query string value is redacted, the query string key SHOULD still be preserved, e.g.
-  @code https://www.example.com/path?color=blue&sig=REDACTED @endcode.
- */
-static constexpr const char *kUrlFull = "url.full";
-
-/**
-  Unmodified original URL as seen in the event source.
-  <p>
-  In network monitoring, the observed URL may be a full URL, whereas in access logs, the URL is
-  often just represented as a path. This field is meant to represent the URL as it was observed,
-  complete or not.
-  @code url.original @endcode might contain credentials passed via URL in form of @code
-  https://username:password@www.example.com/ @endcode. In such case password and username SHOULD NOT
-  be redacted and attribute's value SHOULD remain the same.
- */
-static constexpr const char *kUrlOriginal = "url.original";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.3">URI path</a> component
-  <p>
-  Sensitive content provided in @code url.path @endcode SHOULD be scrubbed when instrumentations can
-  identify it.
- */
-static constexpr const char *kUrlPath = "url.path";
-
-/**
-  Port extracted from the @code url.full @endcode
- */
-static constexpr const char *kUrlPort = "url.port";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.4">URI query</a> component
-  <p>
-  Sensitive content provided in @code url.query @endcode SHOULD be scrubbed when instrumentations
-  can identify it. <p>
-
-  Query string values for the following keys SHOULD be redacted by default and replaced by the value
-  @code REDACTED @endcode: <ul> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  AWSAccessKeyId @endcode</a></li> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  Signature @endcode</a></li> <li><a
-  href="https://learn.microsoft.com/azure/storage/common/storage-sas-overview#sas-token">@code sig
-  @endcode</a></li> <li><a
-  href="https://cloud.google.com/storage/docs/access-control/signed-urls">@code X-Goog-Signature
-  @endcode</a></li>
-  </ul>
-  <p>
-  This list is subject to change over time.
-  <p>
-  When a query string value is redacted, the query string key SHOULD still be preserved, e.g.
-  @code q=OpenTelemetry&sig=REDACTED @endcode.
- */
-static constexpr const char *kUrlQuery = "url.query";
-
-/**
-  The highest registered url domain, stripped of the subdomain.
-  <p>
-  This value can be determined precisely with the <a href="https://publicsuffix.org/">public suffix
-  list</a>. For example, the registered domain for @code foo.example.com @endcode is @code
-  example.com @endcode. Trying to approximate this by simply taking the last two labels will not
-  work well for TLDs such as @code co.uk @endcode.
- */
-static constexpr const char *kUrlRegisteredDomain = "url.registered_domain";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
-  identifying the used protocol.
- */
-static constexpr const char *kUrlScheme = "url.scheme";
-
-/**
-  The subdomain portion of a fully qualified domain name includes all of the names except the host
-  name under the registered_domain. In a partially qualified domain, or if the qualification level
-  of the full name cannot be determined, subdomain contains all of the names below the registered
-  domain. <p> The subdomain portion of @code www.east.mydomain.co.uk @endcode is @code east
-  @endcode. If the domain has multiple levels of subdomain, such as @code sub2.sub1.example.com
-  @endcode, the subdomain field should contain @code sub2.sub1 @endcode, with no trailing period.
- */
-static constexpr const char *kUrlSubdomain = "url.subdomain";
-
-/**
-  The low-cardinality template of an <a
-  href="https://www.rfc-editor.org/rfc/rfc3986#section-4.2">absolute path reference</a>.
- */
-static constexpr const char *kUrlTemplate = "url.template";
-
-/**
-  The effective top level domain (eTLD), also known as the domain suffix, is the last part of the
-  domain name. For example, the top level domain for example.com is @code com @endcode. <p> This
-  value can be determined precisely with the <a href="https://publicsuffix.org/">public suffix
-  list</a>.
- */
-static constexpr const char *kUrlTopLevelDomain = "url.top_level_domain";
-
-}  // namespace url
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/user_agent_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/user_agent_attributes.h
deleted file mode 100644
index f3c59a691..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/user_agent_attributes.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace user_agent
-{
-
-/**
-  Name of the user-agent extracted from original. Usually refers to the browser's name.
-  <p>
-  <a href="https://www.whatsmyua.info">Example</a> of extracting browser's name from original
-  string. In the case of using a user-agent for non-browser products, such as microservices with
-  multiple names/versions inside the @code user_agent.original @endcode, the most significant name
-  SHOULD be selected. In such a scenario it should align with @code user_agent.version @endcode
- */
-static constexpr const char *kUserAgentName = "user_agent.name";
-
-/**
-  Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
-  User-Agent</a> header sent by the client.
- */
-static constexpr const char *kUserAgentOriginal = "user_agent.original";
-
-/**
-  Human readable operating system name.
-  <p>
-  For mapping user agent strings to OS names, libraries such as <a
-  href="https://github.com/ua-parser">ua-parser</a> can be utilized.
- */
-static constexpr const char *kUserAgentOsName = "user_agent.os.name";
-
-/**
-  The version string of the operating system as defined in <a
-  href="/docs/resource/README.md#version-attributes">Version Attributes</a>. <p> For mapping user
-  agent strings to OS versions, libraries such as <a
-  href="https://github.com/ua-parser">ua-parser</a> can be utilized.
- */
-static constexpr const char *kUserAgentOsVersion = "user_agent.os.version";
-
-/**
-  Specifies the category of synthetic traffic, such as tests or bots.
-  <p>
-  This attribute MAY be derived from the contents of the @code user_agent.original @endcode
-  attribute. Components that populate the attribute are responsible for determining what they
-  consider to be synthetic bot or test traffic. This attribute can either be set for
-  self-identification purposes, or on telemetry detected to be generated as a result of a synthetic
-  request. This attribute is useful for distinguishing between genuine client traffic and synthetic
-  traffic generated by bots or tests.
- */
-static constexpr const char *kUserAgentSyntheticType = "user_agent.synthetic.type";
-
-/**
-  Version of the user-agent extracted from original. Usually refers to the browser's version
-  <p>
-  <a href="https://www.whatsmyua.info">Example</a> of extracting browser's version from original
-  string. In the case of using a user-agent for non-browser products, such as microservices with
-  multiple names/versions inside the @code user_agent.original @endcode, the most significant
-  version SHOULD be selected. In such a scenario it should align with @code user_agent.name @endcode
- */
-static constexpr const char *kUserAgentVersion = "user_agent.version";
-
-namespace UserAgentSyntheticTypeValues
-{
-/**
-  Bot source.
- */
-static constexpr const char *kBot = "bot";
-
-/**
-  Synthetic test source.
- */
-static constexpr const char *kTest = "test";
-
-}  // namespace UserAgentSyntheticTypeValues
-
-}  // namespace user_agent
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/user_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/user_attributes.h
deleted file mode 100644
index c1cc752bd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/user_attributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace user
-{
-
-/**
-  User email address.
- */
-static constexpr const char *kUserEmail = "user.email";
-
-/**
-  User's full name
- */
-static constexpr const char *kUserFullName = "user.full_name";
-
-/**
-  Unique user hash to correlate information for a user in anonymized form.
-  <p>
-  Useful if @code user.id @endcode or @code user.name @endcode contain confidential information and
-  cannot be used.
- */
-static constexpr const char *kUserHash = "user.hash";
-
-/**
-  Unique identifier of the user.
- */
-static constexpr const char *kUserId = "user.id";
-
-/**
-  Short name or login/username of the user.
- */
-static constexpr const char *kUserName = "user.name";
-
-/**
-  Array of user roles at the time of the event.
- */
-static constexpr const char *kUserRoles = "user.roles";
-
-}  // namespace user
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/vcs_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/vcs_attributes.h
deleted file mode 100644
index 5a0f31952..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/vcs_attributes.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace vcs
-{
-
-/**
-  The ID of the change (pull request/merge request/changelist) if applicable. This is usually a
-  unique (within repository) identifier generated by the VCS system.
- */
-static constexpr const char *kVcsChangeId = "vcs.change.id";
-
-/**
-  The state of the change (pull request/merge request/changelist).
- */
-static constexpr const char *kVcsChangeState = "vcs.change.state";
-
-/**
-  The human readable title of the change (pull request/merge request/changelist). This title is
-  often a brief summary of the change and may get merged in to a ref as the commit summary.
- */
-static constexpr const char *kVcsChangeTitle = "vcs.change.title";
-
-/**
-  The type of line change being measured on a branch or change.
- */
-static constexpr const char *kVcsLineChangeType = "vcs.line_change.type";
-
-/**
-  The group owner within the version control system.
- */
-static constexpr const char *kVcsOwnerName = "vcs.owner.name";
-
-/**
-  The name of the version control system provider.
- */
-static constexpr const char *kVcsProviderName = "vcs.provider.name";
-
-/**
-  The name of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> such as
-  <strong>branch</strong> or <strong>tag</strong> in the repository. <p>
-  @code base @endcode refers to the starting point of a change. For example, @code main @endcode
-  would be the base reference of type branch if you've created a new
-  reference of type branch from it and created new commits.
- */
-static constexpr const char *kVcsRefBaseName = "vcs.ref.base.name";
-
-/**
-  The revision, literally <a href="https://www.merriam-webster.com/dictionary/revision">revised
-  version</a>, The revision most often refers to a commit object in Git, or a revision number in
-  SVN. <p>
-  @code base @endcode refers to the starting point of a change. For example, @code main @endcode
-  would be the base reference of type branch if you've created a new
-  reference of type branch from it and created new commits. The
-  revision can be a full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash
-  value (see glossary)</a>, of the recorded change to a ref within a repository pointing to a commit
-  <a href="https://git-scm.com/docs/git-commit">commit</a> object. It does not necessarily have to
-  be a hash; it can simply define a <a
-  href="https://svnbook.red-bean.com/en/1.7/svn.tour.revs.specifiers.html">revision number</a> which
-  is an integer that is monotonically increasing. In cases where it is identical to the @code
-  ref.base.name @endcode, it SHOULD still be included. It is up to the implementer to decide which
-  value to set as the revision based on the VCS system and situational context.
- */
-static constexpr const char *kVcsRefBaseRevision = "vcs.ref.base.revision";
-
-/**
-  The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
-  repository. <p>
-  @code base @endcode refers to the starting point of a change. For example, @code main @endcode
-  would be the base reference of type branch if you've created a new
-  reference of type branch from it and created new commits.
- */
-static constexpr const char *kVcsRefBaseType = "vcs.ref.base.type";
-
-/**
-  The name of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> such as
-  <strong>branch</strong> or <strong>tag</strong> in the repository. <p>
-  @code head @endcode refers to where you are right now; the current reference at a
-  given time.
- */
-static constexpr const char *kVcsRefHeadName = "vcs.ref.head.name";
-
-/**
-  The revision, literally <a href="https://www.merriam-webster.com/dictionary/revision">revised
-  version</a>, The revision most often refers to a commit object in Git, or a revision number in
-  SVN. <p>
-  @code head @endcode refers to where you are right now; the current reference at a
-  given time.The revision can be a full <a
-  href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see glossary)</a>,
-  of the recorded change to a ref within a repository pointing to a
-  commit <a href="https://git-scm.com/docs/git-commit">commit</a> object. It does
-  not necessarily have to be a hash; it can simply define a <a
-  href="https://svnbook.red-bean.com/en/1.7/svn.tour.revs.specifiers.html">revision number</a> which
-  is an integer that is monotonically increasing. In cases where it is identical to the @code
-  ref.head.name @endcode, it SHOULD still be included. It is up to the implementer to decide which
-  value to set as the revision based on the VCS system and situational context.
- */
-static constexpr const char *kVcsRefHeadRevision = "vcs.ref.head.revision";
-
-/**
-  The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
-  repository. <p>
-  @code head @endcode refers to where you are right now; the current reference at a
-  given time.
- */
-static constexpr const char *kVcsRefHeadType = "vcs.ref.head.type";
-
-/**
-  The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
-  repository.
- */
-static constexpr const char *kVcsRefType = "vcs.ref.type";
-
-/**
-  Deprecated, use @code vcs.change.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.change.id @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.change.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeId =
-    "vcs.repository.change.id";
-
-/**
-  Deprecated, use @code vcs.change.title @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.change.title @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.change.title"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeTitle =
-    "vcs.repository.change.title";
-
-/**
-  The human readable name of the repository. It SHOULD NOT include any additional identifier like
-  Group/SubGroup in GitLab or organization in GitHub. <p> Due to it only being the name, it can
-  clash with forks of the same repository if collecting telemetry across multiple orgs or groups in
-  the same backends.
- */
-static constexpr const char *kVcsRepositoryName = "vcs.repository.name";
-
-/**
-  Deprecated, use @code vcs.ref.head.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.ref.head.name @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.ref.head.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefName =
-    "vcs.repository.ref.name";
-
-/**
-  Deprecated, use @code vcs.ref.head.revision @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.ref.head.revision @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.ref.head.revision"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefRevision =
-    "vcs.repository.ref.revision";
-
-/**
-  Deprecated, use @code vcs.ref.head.type @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.ref.head.type @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.ref.head.type"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefType =
-    "vcs.repository.ref.type";
-
-/**
-  The <a
-  href="https://support.google.com/webmasters/answer/10347851?hl=en#:~:text=A%20canonical%20URL%20is%20the,Google%20chooses%20one%20as%20canonical.">canonical
-  URL</a> of the repository providing the complete HTTP(S) address in order to locate and identify
-  the repository through a browser. <p> In Git Version Control Systems, the canonical URL SHOULD NOT
-  include the @code .git @endcode extension.
- */
-static constexpr const char *kVcsRepositoryUrlFull = "vcs.repository.url.full";
-
-/**
-  The type of revision comparison.
- */
-static constexpr const char *kVcsRevisionDeltaDirection = "vcs.revision_delta.direction";
-
-namespace VcsChangeStateValues
-{
-/**
-  Open means the change is currently active and under review. It hasn't been merged into the target
-  branch yet, and it's still possible to make changes or add comments.
- */
-static constexpr const char *kOpen = "open";
-
-/**
-  WIP (work-in-progress, draft) means the change is still in progress and not yet ready for a full
-  review. It might still undergo significant changes.
- */
-static constexpr const char *kWip = "wip";
-
-/**
-  Closed means the merge request has been closed without merging. This can happen for various
-  reasons, such as the changes being deemed unnecessary, the issue being resolved in another way, or
-  the author deciding to withdraw the request.
- */
-static constexpr const char *kClosed = "closed";
-
-/**
-  Merged indicates that the change has been successfully integrated into the target codebase.
- */
-static constexpr const char *kMerged = "merged";
-
-}  // namespace VcsChangeStateValues
-
-namespace VcsLineChangeTypeValues
-{
-/**
-  How many lines were added.
- */
-static constexpr const char *kAdded = "added";
-
-/**
-  How many lines were removed.
- */
-static constexpr const char *kRemoved = "removed";
-
-}  // namespace VcsLineChangeTypeValues
-
-namespace VcsProviderNameValues
-{
-/**
-  <a href="https://github.com">GitHub</a>
- */
-static constexpr const char *kGithub = "github";
-
-/**
-  <a href="https://gitlab.com">GitLab</a>
- */
-static constexpr const char *kGitlab = "gitlab";
-
-/**
-  Deprecated, use @code gitea @endcode instead.
- */
-static constexpr const char *kGittea = "gittea";
-
-/**
-  <a href="https://gitea.io">Gitea</a>
- */
-static constexpr const char *kGitea = "gitea";
-
-/**
-  <a href="https://bitbucket.org">Bitbucket</a>
- */
-static constexpr const char *kBitbucket = "bitbucket";
-
-}  // namespace VcsProviderNameValues
-
-namespace VcsRefBaseTypeValues
-{
-/**
-  <a
-  href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch">branch</a>
- */
-static constexpr const char *kBranch = "branch";
-
-/**
-  <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag">tag</a>
- */
-static constexpr const char *kTag = "tag";
-
-}  // namespace VcsRefBaseTypeValues
-
-namespace VcsRefHeadTypeValues
-{
-/**
-  <a
-  href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch">branch</a>
- */
-static constexpr const char *kBranch = "branch";
-
-/**
-  <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag">tag</a>
- */
-static constexpr const char *kTag = "tag";
-
-}  // namespace VcsRefHeadTypeValues
-
-namespace VcsRefTypeValues
-{
-/**
-  <a
-  href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch">branch</a>
- */
-static constexpr const char *kBranch = "branch";
-
-/**
-  <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag">tag</a>
- */
-static constexpr const char *kTag = "tag";
-
-}  // namespace VcsRefTypeValues
-
-namespace VcsRepositoryRefTypeValues
-{
-/**
-  <a
-  href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch">branch</a>
- */
-static constexpr const char *kBranch = "branch";
-
-/**
-  <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag">tag</a>
- */
-static constexpr const char *kTag = "tag";
-
-}  // namespace VcsRepositoryRefTypeValues
-
-namespace VcsRevisionDeltaDirectionValues
-{
-/**
-  How many revisions the change is behind the target ref.
- */
-static constexpr const char *kBehind = "behind";
-
-/**
-  How many revisions the change is ahead of the target ref.
- */
-static constexpr const char *kAhead = "ahead";
-
-}  // namespace VcsRevisionDeltaDirectionValues
-
-}  // namespace vcs
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/vcs_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/vcs_metrics.h
deleted file mode 100644
index c38dce26a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/vcs_metrics.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace vcs
-{
-
-/**
-  The number of changes (pull requests/merge requests/changelists) in a repository, categorized by
-  their state (e.g. open or merged) <p> updowncounter
- */
-static constexpr const char *kMetricVcsChangeCount = "vcs.change.count";
-static constexpr const char *descrMetricVcsChangeCount =
-    "The number of changes (pull requests/merge requests/changelists) in a repository, categorized "
-    "by their state (e.g. open or merged)";
-static constexpr const char *unitMetricVcsChangeCount = "{change}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                         unitMetricVcsChangeCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                          unitMetricVcsChangeCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsChangeCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                                   unitMetricVcsChangeCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricVcsChangeCount, descrMetricVcsChangeCount, unitMetricVcsChangeCount);
-}
-
-/**
-  The time duration a change (pull request/merge request/changelist) has been in a given state.
-  <p>
-  gauge
- */
-static constexpr const char *kMetricVcsChangeDuration = "vcs.change.duration";
-static constexpr const char *descrMetricVcsChangeDuration =
-    "The time duration a change (pull request/merge request/changelist) has been in a given state.";
-static constexpr const char *unitMetricVcsChangeDuration = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsChangeDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                 unitMetricVcsChangeDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsChangeDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                  unitMetricVcsChangeDuration);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeDuration(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                           unitMetricVcsChangeDuration);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                            unitMetricVcsChangeDuration);
-}
-
-/**
-  The amount of time since its creation it took a change (pull request/merge request/changelist) to
-  get the first approval. <p> gauge
- */
-static constexpr const char *kMetricVcsChangeTimeToApproval = "vcs.change.time_to_approval";
-static constexpr const char *descrMetricVcsChangeTimeToApproval =
-    "The amount of time since its creation it took a change (pull request/merge "
-    "request/changelist) to get the first approval.";
-static constexpr const char *unitMetricVcsChangeTimeToApproval = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeTimeToApproval, descrMetricVcsChangeTimeToApproval,
-                                 unitMetricVcsChangeTimeToApproval);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeTimeToApproval,
-                                  descrMetricVcsChangeTimeToApproval,
-                                  unitMetricVcsChangeTimeToApproval);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsChangeTimeToApproval,
-                                           descrMetricVcsChangeTimeToApproval,
-                                           unitMetricVcsChangeTimeToApproval);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsChangeTimeToApproval,
-                                            descrMetricVcsChangeTimeToApproval,
-                                            unitMetricVcsChangeTimeToApproval);
-}
-
-/**
-  The amount of time since its creation it took a change (pull request/merge request/changelist) to
-  get merged into the target(base) ref. <p> gauge
- */
-static constexpr const char *kMetricVcsChangeTimeToMerge = "vcs.change.time_to_merge";
-static constexpr const char *descrMetricVcsChangeTimeToMerge =
-    "The amount of time since its creation it took a change (pull request/merge "
-    "request/changelist) to get merged into the target(base) ref.";
-static constexpr const char *unitMetricVcsChangeTimeToMerge = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsChangeTimeToMerge(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge,
-                                 unitMetricVcsChangeTimeToMerge);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsChangeTimeToMerge(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge,
-                                  unitMetricVcsChangeTimeToMerge);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeTimeToMerge(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge, unitMetricVcsChangeTimeToMerge);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeTimeToMerge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge, unitMetricVcsChangeTimeToMerge);
-}
-
-/**
-  The number of unique contributors to a repository
-  <p>
-  gauge
- */
-static constexpr const char *kMetricVcsContributorCount = "vcs.contributor.count";
-static constexpr const char *descrMetricVcsContributorCount =
-    "The number of unique contributors to a repository";
-static constexpr const char *unitMetricVcsContributorCount = "{contributor}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsContributorCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsContributorCount, descrMetricVcsContributorCount,
-                                 unitMetricVcsContributorCount);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsContributorCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsContributorCount, descrMetricVcsContributorCount,
-                                  unitMetricVcsContributorCount);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsContributorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsContributorCount, descrMetricVcsContributorCount, unitMetricVcsContributorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsContributorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsContributorCount, descrMetricVcsContributorCount, unitMetricVcsContributorCount);
-}
-
-/**
-  The number of refs of type branch or tag in a repository.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricVcsRefCount = "vcs.ref.count";
-static constexpr const char *descrMetricVcsRefCount =
-    "The number of refs of type branch or tag in a repository.";
-static constexpr const char *unitMetricVcsRefCount = "{ref}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                         unitMetricVcsRefCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                          unitMetricVcsRefCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                                   unitMetricVcsRefCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                                    unitMetricVcsRefCount);
-}
-
-/**
-  The number of lines added/removed in a ref (branch) relative to the ref from the @code
-  vcs.ref.base.name @endcode attribute. <p> This metric should be reported for each @code
-  vcs.line_change.type @endcode value. For example if a ref added 3 lines and removed 2 lines,
-  instrumentation SHOULD report two measurements: 3 and 2 (both positive numbers).
-  If number of lines added/removed should be calculated from the start of time, then @code
-  vcs.ref.base.name @endcode SHOULD be set to an empty string. <p> gauge
- */
-static constexpr const char *kMetricVcsRefLinesDelta = "vcs.ref.lines_delta";
-static constexpr const char *descrMetricVcsRefLinesDelta =
-    "The number of lines added/removed in a ref (branch) relative to the ref from the "
-    "`vcs.ref.base.name` attribute.";
-static constexpr const char *unitMetricVcsRefLinesDelta = "{line}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefLinesDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                 unitMetricVcsRefLinesDelta);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefLinesDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                  unitMetricVcsRefLinesDelta);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRefLinesDelta(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                           unitMetricVcsRefLinesDelta);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRefLinesDelta(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                            unitMetricVcsRefLinesDelta);
-}
-
-/**
-  The number of revisions (commits) a ref (branch) is ahead/behind the branch from the @code
-  vcs.ref.base.name @endcode attribute <p> This metric should be reported for each @code
-  vcs.revision_delta.direction @endcode value. For example if branch @code a @endcode is 3 commits
-  behind and 2 commits ahead of @code trunk @endcode, instrumentation SHOULD report two
-  measurements: 3 and 2 (both positive numbers) and @code vcs.ref.base.name @endcode is set to @code
-  trunk @endcode. <p> gauge
- */
-static constexpr const char *kMetricVcsRefRevisionsDelta = "vcs.ref.revisions_delta";
-static constexpr const char *descrMetricVcsRefRevisionsDelta =
-    "The number of revisions (commits) a ref (branch) is ahead/behind the branch from the "
-    "`vcs.ref.base.name` attribute";
-static constexpr const char *unitMetricVcsRefRevisionsDelta = "{revision}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefRevisionsDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta,
-                                 unitMetricVcsRefRevisionsDelta);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefRevisionsDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta,
-                                  unitMetricVcsRefRevisionsDelta);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRefRevisionsDelta(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta, unitMetricVcsRefRevisionsDelta);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRefRevisionsDelta(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta, unitMetricVcsRefRevisionsDelta);
-}
-
-/**
-  Time a ref (branch) created from the default branch (trunk) has existed. The @code ref.type
-  @endcode attribute will always be @code branch @endcode <p> gauge
- */
-static constexpr const char *kMetricVcsRefTime = "vcs.ref.time";
-static constexpr const char *descrMetricVcsRefTime =
-    "Time a ref (branch) created from the default branch (trunk) has existed. The `ref.type` "
-    "attribute will always be `branch`";
-static constexpr const char *unitMetricVcsRefTime = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefTime, descrMetricVcsRefTime, unitMetricVcsRefTime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefTime, descrMetricVcsRefTime, unitMetricVcsRefTime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsRefTime, descrMetricVcsRefTime,
-                                           unitMetricVcsRefTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsRefTime, descrMetricVcsRefTime,
-                                            unitMetricVcsRefTime);
-}
-
-/**
-  The number of repositories in an organization.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricVcsRepositoryCount = "vcs.repository.count";
-static constexpr const char *descrMetricVcsRepositoryCount =
-    "The number of repositories in an organization.";
-static constexpr const char *unitMetricVcsRepositoryCount = "{repository}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount,
-                                         unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount,
-                                          unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount, unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount, unitMetricVcsRepositoryCount);
-}
-
-}  // namespace vcs
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/webengine_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/webengine_attributes.h
deleted file mode 100644
index 920890f76..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/incubating/webengine_attributes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace webengine
-{
-
-/**
-  Additional description of the web engine (e.g. detailed version and edition information).
- */
-static constexpr const char *kWebengineDescription = "webengine.description";
-
-/**
-  The name of the web engine.
- */
-static constexpr const char *kWebengineName = "webengine.name";
-
-/**
-  The version of the web engine.
- */
-static constexpr const char *kWebengineVersion = "webengine.version";
-
-}  // namespace webengine
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/k8s_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/k8s_metrics.h
deleted file mode 100644
index 0c2a18ea2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/k8s_metrics.h
+++ /dev/null
@@ -1,1735 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace k8s
-{
-
-/**
- * The number of actively running jobs for a cronjob
- * <p>
- * This metric aligns with the @code active @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch">K8s
- * CronJobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#cronjob">@code k8s.cronjob @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sCronjobActiveJobs = "k8s.cronjob.active_jobs";
-static constexpr const char *descrMetricK8sCronjobActiveJobs =
-    "The number of actively running jobs for a cronjob";
-static constexpr const char *unitMetricK8sCronjobActiveJobs = "{job}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-/**
- * Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod
- * <p>
- * This metric aligns with the @code currentNumberScheduled @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
- * DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetCurrentScheduledNodes =
-    "k8s.daemonset.current_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetCurrentScheduledNodes =
-    "Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod";
-static constexpr const char *unitMetricK8sDaemonsetCurrentScheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                         descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                         unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                          descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                          unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                                   descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                                   unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                                    descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                                    unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-/**
- * Number of nodes that should be running the daemon pod (including nodes currently running the
- * daemon pod) <p> This metric aligns with the @code desiredNumberScheduled @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
- * DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetDesiredScheduledNodes =
-    "k8s.daemonset.desired_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetDesiredScheduledNodes =
-    "Number of nodes that should be running the daemon pod (including nodes currently running the "
-    "daemon pod)";
-static constexpr const char *unitMetricK8sDaemonsetDesiredScheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                         descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                         unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                          descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                          unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                                   descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                                   unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                                    descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                                    unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-/**
- * Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod
- * <p>
- * This metric aligns with the @code numberMisscheduled @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
- * DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetMisscheduledNodes =
-    "k8s.daemonset.misscheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetMisscheduledNodes =
-    "Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod";
-static constexpr const char *unitMetricK8sDaemonsetMisscheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                         descrMetricK8sDaemonsetMisscheduledNodes,
-                                         unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                          descrMetricK8sDaemonsetMisscheduledNodes,
-                                          unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                                   descrMetricK8sDaemonsetMisscheduledNodes,
-                                                   unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                                    descrMetricK8sDaemonsetMisscheduledNodes,
-                                                    unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-/**
- * Number of nodes that should be running the daemon pod and have one or more of the daemon pod
- * running and ready <p> This metric aligns with the @code numberReady @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
- * DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetReadyNodes = "k8s.daemonset.ready_nodes";
-static constexpr const char *descrMetricK8sDaemonsetReadyNodes =
-    "Number of nodes that should be running the daemon pod and have one or more of the daemon pod "
-    "running and ready";
-static constexpr const char *unitMetricK8sDaemonsetReadyNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                         descrMetricK8sDaemonsetReadyNodes,
-                                         unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                          descrMetricK8sDaemonsetReadyNodes,
-                                          unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                   descrMetricK8sDaemonsetReadyNodes,
-                                                   unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                    descrMetricK8sDaemonsetReadyNodes,
-                                                    unitMetricK8sDaemonsetReadyNodes);
-}
-
-/**
- * Total number of available replica pods (ready for at least minReadySeconds) targeted by this
- * deployment <p> This metric aligns with the @code availableReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentstatus-v1-apps">K8s
- * DeploymentStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#deployment">@code k8s.deployment @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sDeploymentAvailablePods = "k8s.deployment.available_pods";
-static constexpr const char *descrMetricK8sDeploymentAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "deployment";
-static constexpr const char *unitMetricK8sDeploymentAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                         descrMetricK8sDeploymentAvailablePods,
-                                         unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                          descrMetricK8sDeploymentAvailablePods,
-                                          unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                   descrMetricK8sDeploymentAvailablePods,
-                                                   unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                    descrMetricK8sDeploymentAvailablePods,
-                                                    unitMetricK8sDeploymentAvailablePods);
-}
-
-/**
- * Number of desired replica pods in this deployment
- * <p>
- * This metric aligns with the @code replicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentspec-v1-apps">K8s
- * DeploymentSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#deployment">@code k8s.deployment @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sDeploymentDesiredPods = "k8s.deployment.desired_pods";
-static constexpr const char *descrMetricK8sDeploymentDesiredPods =
-    "Number of desired replica pods in this deployment";
-static constexpr const char *unitMetricK8sDeploymentDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                         descrMetricK8sDeploymentDesiredPods,
-                                         unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                          descrMetricK8sDeploymentDesiredPods,
-                                          unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                   descrMetricK8sDeploymentDesiredPods,
-                                                   unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                    descrMetricK8sDeploymentDesiredPods,
-                                                    unitMetricK8sDeploymentDesiredPods);
-}
-
-/**
- * Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the
- * autoscaler <p> This metric aligns with the @code currentReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
- * HorizontalPodAutoscalerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sHpaCurrentPods = "k8s.hpa.current_pods";
-static constexpr const char *descrMetricK8sHpaCurrentPods =
-    "Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the "
-    "autoscaler";
-static constexpr const char *unitMetricK8sHpaCurrentPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                         unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                          unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
-}
-
-/**
- * Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated by
- * the autoscaler <p> This metric aligns with the @code desiredReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
- * HorizontalPodAutoscalerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sHpaDesiredPods = "k8s.hpa.desired_pods";
-static constexpr const char *descrMetricK8sHpaDesiredPods =
-    "Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated "
-    "by the autoscaler";
-static constexpr const char *unitMetricK8sHpaDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                         unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                          unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
-}
-
-/**
- * The upper limit for the number of replica pods to which the autoscaler can scale up
- * <p>
- * This metric aligns with the @code maxReplicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
- * HorizontalPodAutoscalerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sHpaMaxPods = "k8s.hpa.max_pods";
-static constexpr const char *descrMetricK8sHpaMaxPods =
-    "The upper limit for the number of replica pods to which the autoscaler can scale up";
-static constexpr const char *unitMetricK8sHpaMaxPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                         unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                          unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                                   unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                                    unitMetricK8sHpaMaxPods);
-}
-
-/**
- * The lower limit for the number of replica pods to which the autoscaler can scale down
- * <p>
- * This metric aligns with the @code minReplicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
- * HorizontalPodAutoscalerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sHpaMinPods = "k8s.hpa.min_pods";
-static constexpr const char *descrMetricK8sHpaMinPods =
-    "The lower limit for the number of replica pods to which the autoscaler can scale down";
-static constexpr const char *unitMetricK8sHpaMinPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                         unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                          unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                                   unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                                    unitMetricK8sHpaMinPods);
-}
-
-/**
- * The number of pending and actively running pods for a job
- * <p>
- * This metric aligns with the @code active @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
- * JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobActivePods = "k8s.job.active_pods";
-static constexpr const char *descrMetricK8sJobActivePods =
-    "The number of pending and actively running pods for a job";
-static constexpr const char *unitMetricK8sJobActivePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                         unitMetricK8sJobActivePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                          unitMetricK8sJobActivePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
-}
-
-/**
- * The desired number of successfully finished pods the job should be run with
- * <p>
- * This metric aligns with the @code completions @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
- * JobSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobDesiredSuccessfulPods = "k8s.job.desired_successful_pods";
-static constexpr const char *descrMetricK8sJobDesiredSuccessfulPods =
-    "The desired number of successfully finished pods the job should be run with";
-static constexpr const char *unitMetricK8sJobDesiredSuccessfulPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                         descrMetricK8sJobDesiredSuccessfulPods,
-                                         unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                          descrMetricK8sJobDesiredSuccessfulPods,
-                                          unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                                   descrMetricK8sJobDesiredSuccessfulPods,
-                                                   unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                                    descrMetricK8sJobDesiredSuccessfulPods,
-                                                    unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-/**
- * The number of pods which reached phase Failed for a job
- * <p>
- * This metric aligns with the @code failed @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
- * JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobFailedPods = "k8s.job.failed_pods";
-static constexpr const char *descrMetricK8sJobFailedPods =
-    "The number of pods which reached phase Failed for a job";
-static constexpr const char *unitMetricK8sJobFailedPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
-                                         unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
-                                          unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
-}
-
-/**
- * The max desired number of pods the job should run at any given time
- * <p>
- * This metric aligns with the @code parallelism @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
- * JobSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobMaxParallelPods = "k8s.job.max_parallel_pods";
-static constexpr const char *descrMetricK8sJobMaxParallelPods =
-    "The max desired number of pods the job should run at any given time";
-static constexpr const char *unitMetricK8sJobMaxParallelPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobMaxParallelPods,
-                                         descrMetricK8sJobMaxParallelPods,
-                                         unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                          descrMetricK8sJobMaxParallelPods,
-                                          unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                   descrMetricK8sJobMaxParallelPods,
-                                                   unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                    descrMetricK8sJobMaxParallelPods,
-                                                    unitMetricK8sJobMaxParallelPods);
-}
-
-/**
- * The number of pods which reached phase Succeeded for a job
- * <p>
- * This metric aligns with the @code succeeded @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
- * JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobSuccessfulPods = "k8s.job.successful_pods";
-static constexpr const char *descrMetricK8sJobSuccessfulPods =
-    "The number of pods which reached phase Succeeded for a job";
-static constexpr const char *unitMetricK8sJobSuccessfulPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-/**
- * Describes number of K8s namespaces that are currently in a given phase.
- * <p>
- * This metric SHOULD, at a minimum, be reported against a
- * <a href="../resource/k8s.md#namespace">@code k8s.namespace @endcode</a> resource.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sNamespacePhase = "k8s.namespace.phase";
-static constexpr const char *descrMetricK8sNamespacePhase =
-    "Describes number of K8s namespaces that are currently in a given phase.";
-static constexpr const char *unitMetricK8sNamespacePhase = "{namespace}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase,
-                                         unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase,
-                                          unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase, unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase, unitMetricK8sNamespacePhase);
-}
-
-/**
- * Total CPU time consumed
- * <p>
- * Total CPU time consumed by the specific Node on all available CPU cores
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sNodeCpuTime     = "k8s.node.cpu.time";
-static constexpr const char *descrMetricK8sNodeCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricK8sNodeCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                    unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                    unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                             unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                              unitMetricK8sNodeCpuTime);
-}
-
-/**
- * Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
- * <p>
- * CPU usage of the specific Node on all available CPU cores, averaged over the sample window
- * <p>
- * gauge
- */
-static constexpr const char *kMetricK8sNodeCpuUsage = "k8s.node.cpu.usage";
-static constexpr const char *descrMetricK8sNodeCpuUsage =
-    "Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricK8sNodeCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                 unitMetricK8sNodeCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                  unitMetricK8sNodeCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                           unitMetricK8sNodeCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                            unitMetricK8sNodeCpuUsage);
-}
-
-/**
- * Memory usage of the Node
- * <p>
- * Total memory usage of the Node
- * <p>
- * gauge
- */
-static constexpr const char *kMetricK8sNodeMemoryUsage     = "k8s.node.memory.usage";
-static constexpr const char *descrMetricK8sNodeMemoryUsage = "Memory usage of the Node";
-static constexpr const char *unitMetricK8sNodeMemoryUsage  = "By";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                 unitMetricK8sNodeMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                  unitMetricK8sNodeMemoryUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                           unitMetricK8sNodeMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage, unitMetricK8sNodeMemoryUsage);
-}
-
-/**
- * Node network errors
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sNodeNetworkErrors     = "k8s.node.network.errors";
-static constexpr const char *descrMetricK8sNodeNetworkErrors = "Node network errors";
-static constexpr const char *unitMetricK8sNodeNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors,
-                                    unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors,
-                                    unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors, unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors, unitMetricK8sNodeNetworkErrors);
-}
-
-/**
- * Network bytes for the Node
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sNodeNetworkIo     = "k8s.node.network.io";
-static constexpr const char *descrMetricK8sNodeNetworkIo = "Network bytes for the Node";
-static constexpr const char *unitMetricK8sNodeNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sNodeNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                    unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sNodeNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                    unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                             unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                              unitMetricK8sNodeNetworkIo);
-}
-
-/**
- * The time the Node has been running
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricK8sNodeUptime     = "k8s.node.uptime";
-static constexpr const char *descrMetricK8sNodeUptime = "The time the Node has been running";
-static constexpr const char *unitMetricK8sNodeUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                 unitMetricK8sNodeUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                  unitMetricK8sNodeUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                           unitMetricK8sNodeUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                            unitMetricK8sNodeUptime);
-}
-
-/**
- * Total CPU time consumed
- * <p>
- * Total CPU time consumed by the specific Pod on all available CPU cores
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sPodCpuTime     = "k8s.pod.cpu.time";
-static constexpr const char *descrMetricK8sPodCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricK8sPodCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                    unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                    unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                             unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                              unitMetricK8sPodCpuTime);
-}
-
-/**
- * Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
- * <p>
- * CPU usage of the specific Pod on all available CPU cores, averaged over the sample window
- * <p>
- * gauge
- */
-static constexpr const char *kMetricK8sPodCpuUsage = "k8s.pod.cpu.usage";
-static constexpr const char *descrMetricK8sPodCpuUsage =
-    "Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricK8sPodCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                 unitMetricK8sPodCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                  unitMetricK8sPodCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                           unitMetricK8sPodCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                            unitMetricK8sPodCpuUsage);
-}
-
-/**
- * Memory usage of the Pod
- * <p>
- * Total memory usage of the Pod
- * <p>
- * gauge
- */
-static constexpr const char *kMetricK8sPodMemoryUsage     = "k8s.pod.memory.usage";
-static constexpr const char *descrMetricK8sPodMemoryUsage = "Memory usage of the Pod";
-static constexpr const char *unitMetricK8sPodMemoryUsage  = "By";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                 unitMetricK8sPodMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                  unitMetricK8sPodMemoryUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                           unitMetricK8sPodMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                            unitMetricK8sPodMemoryUsage);
-}
-
-/**
- * Pod network errors
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sPodNetworkErrors     = "k8s.pod.network.errors";
-static constexpr const char *descrMetricK8sPodNetworkErrors = "Pod network errors";
-static constexpr const char *unitMetricK8sPodNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors,
-                                    unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodNetworkErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors,
-                                    unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors, unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors, unitMetricK8sPodNetworkErrors);
-}
-
-/**
- * Network bytes for the Pod
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sPodNetworkIo     = "k8s.pod.network.io";
-static constexpr const char *descrMetricK8sPodNetworkIo = "Network bytes for the Pod";
-static constexpr const char *unitMetricK8sPodNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sPodNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                    unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                    unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                             unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                              unitMetricK8sPodNetworkIo);
-}
-
-/**
- * The time the Pod has been running
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricK8sPodUptime     = "k8s.pod.uptime";
-static constexpr const char *descrMetricK8sPodUptime = "The time the Pod has been running";
-static constexpr const char *unitMetricK8sPodUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                 unitMetricK8sPodUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                  unitMetricK8sPodUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                           unitMetricK8sPodUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                            unitMetricK8sPodUptime);
-}
-
-/**
- * Total number of available replica pods (ready for at least minReadySeconds) targeted by this
- * replicaset <p> This metric aligns with the @code availableReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetstatus-v1-apps">K8s
- * ReplicaSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicaset">@code k8s.replicaset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sReplicasetAvailablePods = "k8s.replicaset.available_pods";
-static constexpr const char *descrMetricK8sReplicasetAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replicaset";
-static constexpr const char *unitMetricK8sReplicasetAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                         descrMetricK8sReplicasetAvailablePods,
-                                         unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                          descrMetricK8sReplicasetAvailablePods,
-                                          unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                                   descrMetricK8sReplicasetAvailablePods,
-                                                   unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                                    descrMetricK8sReplicasetAvailablePods,
-                                                    unitMetricK8sReplicasetAvailablePods);
-}
-
-/**
- * Number of desired replica pods in this replicaset
- * <p>
- * This metric aligns with the @code replicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetspec-v1-apps">K8s
- * ReplicaSetSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicaset">@code k8s.replicaset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sReplicasetDesiredPods = "k8s.replicaset.desired_pods";
-static constexpr const char *descrMetricK8sReplicasetDesiredPods =
-    "Number of desired replica pods in this replicaset";
-static constexpr const char *unitMetricK8sReplicasetDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                         descrMetricK8sReplicasetDesiredPods,
-                                         unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                          descrMetricK8sReplicasetDesiredPods,
-                                          unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                   descrMetricK8sReplicasetDesiredPods,
-                                                   unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                    descrMetricK8sReplicasetDesiredPods,
-                                                    unitMetricK8sReplicasetDesiredPods);
-}
-
-/**
- * Deprecated, use @code k8s.replicationcontroller.available_pods @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code k8s.replicationcontroller.available_pods @endcode.", "reason":
- * "uncategorized"} <p> This metric aligns with the @code availableReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core">K8s
- * ReplicationControllerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
- * resource. <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerAvailablePods =
-    "k8s.replication_controller.available_pods";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricK8sReplicationControllerAvailablePods =
-        "Deprecated, use `k8s.replicationcontroller.available_pods` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricK8sReplicationControllerAvailablePods = "{pod}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                         descrMetricK8sReplicationControllerAvailablePods,
-                                         unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                          descrMetricK8sReplicationControllerAvailablePods,
-                                          unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                                   descrMetricK8sReplicationControllerAvailablePods,
-                                                   unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sReplicationControllerAvailablePods,
-      descrMetricK8sReplicationControllerAvailablePods,
-      unitMetricK8sReplicationControllerAvailablePods);
-}
-
-/**
- * Deprecated, use @code k8s.replicationcontroller.desired_pods @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code k8s.replicationcontroller.desired_pods @endcode.", "reason":
- * "uncategorized"} <p> This metric aligns with the @code replicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core">K8s
- * ReplicationControllerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
- * resource. <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerDesiredPods =
-    "k8s.replication_controller.desired_pods";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricK8sReplicationControllerDesiredPods =
-        "Deprecated, use `k8s.replicationcontroller.desired_pods` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricK8sReplicationControllerDesiredPods = "{pod}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                         descrMetricK8sReplicationControllerDesiredPods,
-                                         unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                          descrMetricK8sReplicationControllerDesiredPods,
-                                          unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                                   descrMetricK8sReplicationControllerDesiredPods,
-                                                   unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                                    descrMetricK8sReplicationControllerDesiredPods,
-                                                    unitMetricK8sReplicationControllerDesiredPods);
-}
-
-/**
- * Total number of available replica pods (ready for at least minReadySeconds) targeted by this
- * replication controller <p> This metric aligns with the @code availableReplicas @endcode field of
- * the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core">K8s
- * ReplicationControllerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
- * resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicationcontrollerAvailablePods =
-    "k8s.replicationcontroller.available_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replication controller";
-static constexpr const char *unitMetricK8sReplicationcontrollerAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                         descrMetricK8sReplicationcontrollerAvailablePods,
-                                         unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                          descrMetricK8sReplicationcontrollerAvailablePods,
-                                          unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                                   descrMetricK8sReplicationcontrollerAvailablePods,
-                                                   unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sReplicationcontrollerAvailablePods,
-      descrMetricK8sReplicationcontrollerAvailablePods,
-      unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-/**
- * Number of desired replica pods in this replication controller
- * <p>
- * This metric aligns with the @code replicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core">K8s
- * ReplicationControllerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
- * resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicationcontrollerDesiredPods =
-    "k8s.replicationcontroller.desired_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerDesiredPods =
-    "Number of desired replica pods in this replication controller";
-static constexpr const char *unitMetricK8sReplicationcontrollerDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                         descrMetricK8sReplicationcontrollerDesiredPods,
-                                         unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                          descrMetricK8sReplicationcontrollerDesiredPods,
-                                          unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                                   descrMetricK8sReplicationcontrollerDesiredPods,
-                                                   unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                                    descrMetricK8sReplicationcontrollerDesiredPods,
-                                                    unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-/**
- * The number of replica pods created by the statefulset controller from the statefulset version
- * indicated by currentRevision <p> This metric aligns with the @code currentReplicas @endcode field
- * of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
- * StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetCurrentPods = "k8s.statefulset.current_pods";
-static constexpr const char *descrMetricK8sStatefulsetCurrentPods =
-    "The number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by currentRevision";
-static constexpr const char *unitMetricK8sStatefulsetCurrentPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                         descrMetricK8sStatefulsetCurrentPods,
-                                         unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                          descrMetricK8sStatefulsetCurrentPods,
-                                          unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                                   descrMetricK8sStatefulsetCurrentPods,
-                                                   unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                                    descrMetricK8sStatefulsetCurrentPods,
-                                                    unitMetricK8sStatefulsetCurrentPods);
-}
-
-/**
- * Number of desired replica pods in this statefulset
- * <p>
- * This metric aligns with the @code replicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetspec-v1-apps">K8s
- * StatefulSetSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetDesiredPods = "k8s.statefulset.desired_pods";
-static constexpr const char *descrMetricK8sStatefulsetDesiredPods =
-    "Number of desired replica pods in this statefulset";
-static constexpr const char *unitMetricK8sStatefulsetDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                         descrMetricK8sStatefulsetDesiredPods,
-                                         unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                          descrMetricK8sStatefulsetDesiredPods,
-                                          unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                                   descrMetricK8sStatefulsetDesiredPods,
-                                                   unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                                    descrMetricK8sStatefulsetDesiredPods,
-                                                    unitMetricK8sStatefulsetDesiredPods);
-}
-
-/**
- * The number of replica pods created for this statefulset with a Ready Condition
- * <p>
- * This metric aligns with the @code readyReplicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
- * StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetReadyPods = "k8s.statefulset.ready_pods";
-static constexpr const char *descrMetricK8sStatefulsetReadyPods =
-    "The number of replica pods created for this statefulset with a Ready Condition";
-static constexpr const char *unitMetricK8sStatefulsetReadyPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                         descrMetricK8sStatefulsetReadyPods,
-                                         unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                          descrMetricK8sStatefulsetReadyPods,
-                                          unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                                   descrMetricK8sStatefulsetReadyPods,
-                                                   unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                                    descrMetricK8sStatefulsetReadyPods,
-                                                    unitMetricK8sStatefulsetReadyPods);
-}
-
-/**
- * Number of replica pods created by the statefulset controller from the statefulset version
- * indicated by updateRevision <p> This metric aligns with the @code updatedReplicas @endcode field
- * of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
- * StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetUpdatedPods = "k8s.statefulset.updated_pods";
-static constexpr const char *descrMetricK8sStatefulsetUpdatedPods =
-    "Number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by updateRevision";
-static constexpr const char *unitMetricK8sStatefulsetUpdatedPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                         descrMetricK8sStatefulsetUpdatedPods,
-                                         unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                          descrMetricK8sStatefulsetUpdatedPods,
-                                          unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                                   descrMetricK8sStatefulsetUpdatedPods,
-                                                   unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                                    descrMetricK8sStatefulsetUpdatedPods,
-                                                    unitMetricK8sStatefulsetUpdatedPods);
-}
-
-}  // namespace k8s
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/messaging_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/messaging_metrics.h
deleted file mode 100644
index 91cb19f72..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/messaging_metrics.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace messaging
-{
-
-/**
- * Number of messages that were delivered to the application.
- * <p>
- * Records the number of messages pulled from the broker or number of messages dispatched to the
- * application in push-based scenarios. The metric SHOULD be reported once per message delivery. For
- * example, if receiving and processing operations are both instrumented for a single message
- * delivery, this counter is incremented when the message is received and not reported when it is
- * processed. <p> counter
- */
-static constexpr const char *kMetricMessagingClientConsumedMessages =
-    "messaging.client.consumed.messages";
-static constexpr const char *descrMetricMessagingClientConsumedMessages =
-    "Number of messages that were delivered to the application.";
-static constexpr const char *unitMetricMessagingClientConsumedMessages = "{message}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientConsumedMessages,
-                                    descrMetricMessagingClientConsumedMessages,
-                                    unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientConsumedMessages,
-                                    descrMetricMessagingClientConsumedMessages,
-                                    unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientConsumedMessages,
-                                             descrMetricMessagingClientConsumedMessages,
-                                             unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientConsumedMessages,
-                                              descrMetricMessagingClientConsumedMessages,
-                                              unitMetricMessagingClientConsumedMessages);
-}
-
-/**
- * Duration of messaging operation initiated by a producer or consumer client.
- * <p>
- * This metric SHOULD NOT be used to report processing duration - processing duration is reported in
- * @code messaging.process.duration @endcode metric. <p> histogram
- */
-static constexpr const char *kMetricMessagingClientOperationDuration =
-    "messaging.client.operation.duration";
-static constexpr const char *descrMetricMessagingClientOperationDuration =
-    "Duration of messaging operation initiated by a producer or consumer client.";
-static constexpr const char *unitMetricMessagingClientOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingClientOperationDuration,
-                                      descrMetricMessagingClientOperationDuration,
-                                      unitMetricMessagingClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingClientOperationDuration,
-                                      descrMetricMessagingClientOperationDuration,
-                                      unitMetricMessagingClientOperationDuration);
-}
-
-/**
- * Deprecated. Use @code messaging.client.sent.messages @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "uncategorized"}
- * <p>
- * counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingClientPublishedMessages =
-    "messaging.client.published.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingClientPublishedMessages =
-    "Deprecated. Use `messaging.client.sent.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingClientPublishedMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientPublishedMessages,
-                                    descrMetricMessagingClientPublishedMessages,
-                                    unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientPublishedMessages,
-                                    descrMetricMessagingClientPublishedMessages,
-                                    unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientPublishedMessages,
-                                             descrMetricMessagingClientPublishedMessages,
-                                             unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientPublishedMessages,
-                                              descrMetricMessagingClientPublishedMessages,
-                                              unitMetricMessagingClientPublishedMessages);
-}
-
-/**
- * Number of messages producer attempted to send to the broker.
- * <p>
- * This metric MUST NOT count messages that were created but haven't yet been sent.
- * <p>
- * counter
- */
-static constexpr const char *kMetricMessagingClientSentMessages = "messaging.client.sent.messages";
-static constexpr const char *descrMetricMessagingClientSentMessages =
-    "Number of messages producer attempted to send to the broker.";
-static constexpr const char *unitMetricMessagingClientSentMessages = "{message}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientSentMessages,
-                                    descrMetricMessagingClientSentMessages,
-                                    unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientSentMessages,
-                                    descrMetricMessagingClientSentMessages,
-                                    unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientSentMessages,
-                                             descrMetricMessagingClientSentMessages,
-                                             unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientSentMessages,
-                                              descrMetricMessagingClientSentMessages,
-                                              unitMetricMessagingClientSentMessages);
-}
-
-/**
- * Duration of processing operation.
- * <p>
- * This metric MUST be reported for operations with @code messaging.operation.type @endcode that
- * matches @code process @endcode. <p> histogram
- */
-static constexpr const char *kMetricMessagingProcessDuration = "messaging.process.duration";
-static constexpr const char *descrMetricMessagingProcessDuration =
-    "Duration of processing operation.";
-static constexpr const char *unitMetricMessagingProcessDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingProcessDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingProcessDuration,
-                                      descrMetricMessagingProcessDuration,
-                                      unitMetricMessagingProcessDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingProcessDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingProcessDuration,
-                                      descrMetricMessagingProcessDuration,
-                                      unitMetricMessagingProcessDuration);
-}
-
-/**
- * Deprecated. Use @code messaging.client.consumed.messages @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason":
- * "uncategorized"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingProcessMessages =
-    "messaging.process.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingProcessMessages =
-    "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingProcessMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingProcessMessages,
-                                    descrMetricMessagingProcessMessages,
-                                    unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingProcessMessages,
-                                    descrMetricMessagingProcessMessages,
-                                    unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingProcessMessages,
-                                             descrMetricMessagingProcessMessages,
-                                             unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingProcessMessages,
-                                              descrMetricMessagingProcessMessages,
-                                              unitMetricMessagingProcessMessages);
-}
-
-/**
- * Deprecated. Use @code messaging.client.operation.duration @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason":
- * "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishDuration =
-    "messaging.publish.duration";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishDuration =
-    "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishDuration = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingPublishDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingPublishDuration,
-                                      descrMetricMessagingPublishDuration,
-                                      unitMetricMessagingPublishDuration);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingPublishDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingPublishDuration,
-                                      descrMetricMessagingPublishDuration,
-                                      unitMetricMessagingPublishDuration);
-}
-
-/**
- * Deprecated. Use @code messaging.client.produced.messages @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.produced.messages @endcode.", "reason":
- * "uncategorized"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishMessages =
-    "messaging.publish.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishMessages =
-    "Deprecated. Use `messaging.client.produced.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingPublishMessages,
-                                    descrMetricMessagingPublishMessages,
-                                    unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingPublishMessages,
-                                    descrMetricMessagingPublishMessages,
-                                    unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingPublishMessages,
-                                             descrMetricMessagingPublishMessages,
-                                             unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingPublishMessages,
-                                              descrMetricMessagingPublishMessages,
-                                              unitMetricMessagingPublishMessages);
-}
-
-/**
- * Deprecated. Use @code messaging.client.operation.duration @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason":
- * "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveDuration =
-    "messaging.receive.duration";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveDuration =
-    "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveDuration = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingReceiveDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingReceiveDuration,
-                                      descrMetricMessagingReceiveDuration,
-                                      unitMetricMessagingReceiveDuration);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingReceiveDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingReceiveDuration,
-                                      descrMetricMessagingReceiveDuration,
-                                      unitMetricMessagingReceiveDuration);
-}
-
-/**
- * Deprecated. Use @code messaging.client.consumed.messages @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason":
- * "uncategorized"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveMessages =
-    "messaging.receive.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveMessages =
-    "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingReceiveMessages,
-                                    descrMetricMessagingReceiveMessages,
-                                    unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingReceiveMessages,
-                                    descrMetricMessagingReceiveMessages,
-                                    unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingReceiveMessages,
-                                             descrMetricMessagingReceiveMessages,
-                                             unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingReceiveMessages,
-                                              descrMetricMessagingReceiveMessages,
-                                              unitMetricMessagingReceiveMessages);
-}
-
-}  // namespace messaging
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/network_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/network_attributes.h
deleted file mode 100644
index 54ba378f2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/network_attributes.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace network
-{
-
-/**
-  Local address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkLocalAddress = "network.local.address";
-
-/**
-  Local port number of the network connection.
- */
-static constexpr const char *kNetworkLocalPort = "network.local.port";
-
-/**
-  Peer address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkPeerAddress = "network.peer.address";
-
-/**
-  Peer port number of the network connection.
- */
-static constexpr const char *kNetworkPeerPort = "network.peer.port";
-
-/**
-  <a href="https://wikipedia.org/wiki/Application_layer">OSI application layer</a> or non-OSI
-  equivalent. <p> The value SHOULD be normalized to lowercase.
- */
-static constexpr const char *kNetworkProtocolName = "network.protocol.name";
-
-/**
-  The actual version of the protocol used for network communication.
-  <p>
-  If protocol version is subject to negotiation (for example using <a
-  href="https://www.rfc-editor.org/rfc/rfc7301.html">ALPN</a>), this attribute SHOULD be set to the
-  negotiated version. If the actual protocol version is not known, this attribute SHOULD NOT be set.
- */
-static constexpr const char *kNetworkProtocolVersion = "network.protocol.version";
-
-/**
-  <a href="https://wikipedia.org/wiki/Transport_layer">OSI transport layer</a> or <a
-  href="https://wikipedia.org/wiki/Inter-process_communication">inter-process communication
-  method</a>. <p> The value SHOULD be normalized to lowercase. <p> Consider always setting the
-  transport when setting a port number, since a port number is ambiguous without knowing the
-  transport. For example different processes could be listening on TCP port 12345 and UDP port
-  12345.
- */
-static constexpr const char *kNetworkTransport = "network.transport";
-
-/**
-  <a href="https://wikipedia.org/wiki/Network_layer">OSI network layer</a> or non-OSI equivalent.
-  <p>
-  The value SHOULD be normalized to lowercase.
- */
-static constexpr const char *kNetworkType = "network.type";
-
-namespace NetworkTransportValues
-{
-/**
-  TCP
- */
-static constexpr const char *kTcp = "tcp";
-
-/**
-  UDP
- */
-static constexpr const char *kUdp = "udp";
-
-/**
-  Named or anonymous pipe.
- */
-static constexpr const char *kPipe = "pipe";
-
-/**
-  Unix domain socket
- */
-static constexpr const char *kUnix = "unix";
-
-/**
-  QUIC
- */
-static constexpr const char *kQuic = "quic";
-
-}  // namespace NetworkTransportValues
-
-namespace NetworkTypeValues
-{
-/**
-  IPv4
- */
-static constexpr const char *kIpv4 = "ipv4";
-
-/**
-  IPv6
- */
-static constexpr const char *kIpv6 = "ipv6";
-
-}  // namespace NetworkTypeValues
-
-}  // namespace network
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/otel_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/otel_attributes.h
deleted file mode 100644
index a82d72553..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/otel_attributes.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace otel
-{
-
-/**
-  The name of the instrumentation scope - (@code InstrumentationScope.Name @endcode in OTLP).
- */
-static constexpr const char *kOtelScopeName = "otel.scope.name";
-
-/**
-  The version of the instrumentation scope - (@code InstrumentationScope.Version @endcode in OTLP).
- */
-static constexpr const char *kOtelScopeVersion = "otel.scope.version";
-
-/**
-  Name of the code, either "OK" or "ERROR". MUST NOT be set if the status code is UNSET.
- */
-static constexpr const char *kOtelStatusCode = "otel.status_code";
-
-/**
-  Description of the Status if it has a value, otherwise not set.
- */
-static constexpr const char *kOtelStatusDescription = "otel.status_description";
-
-namespace OtelStatusCodeValues
-{
-/**
-  The operation has been validated by an Application developer or Operator to have completed
-  successfully.
- */
-static constexpr const char *kOk = "OK";
-
-/**
-  The operation contains an error.
- */
-static constexpr const char *kError = "ERROR";
-
-}  // namespace OtelStatusCodeValues
-
-}  // namespace otel
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/otel_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/otel_metrics.h
deleted file mode 100644
index 0308a324b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/otel_metrics.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace otel
-{
-
-/**
- * The number of spans for which the export has finished, either successful or failed
- * <p>
- * For successful exports, @code error.type @endcode MUST NOT be set. For failed exports, @code
- * error.type @endcode must contain the failure cause. For exporters with partial success semantics
- * (e.g. OTLP with @code rejected_spans @endcode), rejected spans must count as failed and only
- * non-rejected spans count as success. If no rejection reason is available, @code rejected @endcode
- * SHOULD be used as value for @code error.type @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkExporterSpanExportedCount =
-    "otel.sdk.exporter.span.exported.count";
-static constexpr const char *descrMetricOtelSdkExporterSpanExportedCount =
-    "The number of spans for which the export has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkExporterSpanExportedCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkExporterSpanExportedCount,
-                                    descrMetricOtelSdkExporterSpanExportedCount,
-                                    unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                    descrMetricOtelSdkExporterSpanExportedCount,
-                                    unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                             descrMetricOtelSdkExporterSpanExportedCount,
-                                             unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                              descrMetricOtelSdkExporterSpanExportedCount,
-                                              unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-/**
- * The number of spans which were passed to the exporter, but that have not been exported yet
- * (neither successful, nor failed) <p> For successful exports, @code error.type @endcode MUST NOT
- * be set. For failed exports, @code error.type @endcode must contain the failure cause. <p>
- * updowncounter
- */
-static constexpr const char *kMetricOtelSdkExporterSpanInflightCount =
-    "otel.sdk.exporter.span.inflight.count";
-static constexpr const char *descrMetricOtelSdkExporterSpanInflightCount =
-    "The number of spans which were passed to the exporter, but that have not been exported yet "
-    "(neither successful, nor failed)";
-static constexpr const char *unitMetricOtelSdkExporterSpanInflightCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                         descrMetricOtelSdkExporterSpanInflightCount,
-                                         unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                          descrMetricOtelSdkExporterSpanInflightCount,
-                                          unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                                   descrMetricOtelSdkExporterSpanInflightCount,
-                                                   unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                                    descrMetricOtelSdkExporterSpanInflightCount,
-                                                    unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-/**
- * The number of spans for which the processing has finished, either successful or failed
- * <p>
- * For successful processing, @code error.type @endcode MUST NOT be set. For failed processing,
- * @code error.type @endcode must contain the failure cause. For the SDK Simple and Batching Span
- * Processor a span is considered to be processed already when it has been submitted to the
- * exporter, not when the corresponding export call has finished. <p> counter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanProcessedCount =
-    "otel.sdk.processor.span.processed.count";
-static constexpr const char *descrMetricOtelSdkProcessorSpanProcessedCount =
-    "The number of spans for which the processing has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkProcessorSpanProcessedCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                    descrMetricOtelSdkProcessorSpanProcessedCount,
-                                    unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                    descrMetricOtelSdkProcessorSpanProcessedCount,
-                                    unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                             descrMetricOtelSdkProcessorSpanProcessedCount,
-                                             unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                              descrMetricOtelSdkProcessorSpanProcessedCount,
-                                              unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-/**
- * The maximum number of spans the queue of a given instance of an SDK span processor can hold
- * <p>
- * Only applies to span processors which use a queue, e.g. the SDK Batching Span Processor.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanQueueCapacity =
-    "otel.sdk.processor.span.queue.capacity";
-static constexpr const char *descrMetricOtelSdkProcessorSpanQueueCapacity =
-    "The maximum number of spans the queue of a given instance of an SDK span processor can hold";
-static constexpr const char *unitMetricOtelSdkProcessorSpanQueueCapacity = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                         descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                         unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                          descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                          unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                                   descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                                   unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                                    descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                                    unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-/**
- * The number of spans in the queue of a given instance of an SDK span processor
- * <p>
- * Only applies to span processors which use a queue, e.g. the SDK Batching Span Processor.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanQueueSize =
-    "otel.sdk.processor.span.queue.size";
-static constexpr const char *descrMetricOtelSdkProcessorSpanQueueSize =
-    "The number of spans in the queue of a given instance of an SDK span processor";
-static constexpr const char *unitMetricOtelSdkProcessorSpanQueueSize = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                         descrMetricOtelSdkProcessorSpanQueueSize,
-                                         unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                          descrMetricOtelSdkProcessorSpanQueueSize,
-                                          unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                                   descrMetricOtelSdkProcessorSpanQueueSize,
-                                                   unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                                    descrMetricOtelSdkProcessorSpanQueueSize,
-                                                    unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-/**
- * The number of created spans for which the end operation was called
- * <p>
- * For spans with @code recording=true @endcode: Implementations MUST record both @code
- * otel.sdk.span.live.count @endcode and @code otel.sdk.span.ended.count @endcode. For spans with
- * @code recording=false @endcode: If implementations decide to record this metric, they MUST also
- * record @code otel.sdk.span.live.count @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkSpanEndedCount = "otel.sdk.span.ended.count";
-static constexpr const char *descrMetricOtelSdkSpanEndedCount =
-    "The number of created spans for which the end operation was called";
-static constexpr const char *unitMetricOtelSdkSpanEndedCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkSpanEndedCount, descrMetricOtelSdkSpanEndedCount,
-                                    unitMetricOtelSdkSpanEndedCount);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkSpanEndedCount, descrMetricOtelSdkSpanEndedCount,
-                                    unitMetricOtelSdkSpanEndedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkSpanEndedCount,
-                                             descrMetricOtelSdkSpanEndedCount,
-                                             unitMetricOtelSdkSpanEndedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkSpanEndedCount,
-                                              descrMetricOtelSdkSpanEndedCount,
-                                              unitMetricOtelSdkSpanEndedCount);
-}
-
-/**
- * The number of created spans for which the end operation has not been called yet
- * <p>
- * For spans with @code recording=true @endcode: Implementations MUST record both @code
- * otel.sdk.span.live.count @endcode and @code otel.sdk.span.ended.count @endcode. For spans with
- * @code recording=false @endcode: If implementations decide to record this metric, they MUST also
- * record @code otel.sdk.span.ended.count @endcode. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkSpanLiveCount = "otel.sdk.span.live.count";
-static constexpr const char *descrMetricOtelSdkSpanLiveCount =
-    "The number of created spans for which the end operation has not been called yet";
-static constexpr const char *unitMetricOtelSdkSpanLiveCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-}  // namespace otel
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/process_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/process_metrics.h
deleted file mode 100644
index d76db55c9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/process_metrics.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace process
-{
-
-/**
- * Number of times the process has been context switched.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessContextSwitches = "process.context_switches";
-static constexpr const char *descrMetricProcessContextSwitches =
-    "Number of times the process has been context switched.";
-static constexpr const char *unitMetricProcessContextSwitches = "{context_switch}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessContextSwitches,
-                                    descrMetricProcessContextSwitches,
-                                    unitMetricProcessContextSwitches);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessContextSwitches,
-                                    descrMetricProcessContextSwitches,
-                                    unitMetricProcessContextSwitches);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessContextSwitches,
-                                             descrMetricProcessContextSwitches,
-                                             unitMetricProcessContextSwitches);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessContextSwitches,
-                                              descrMetricProcessContextSwitches,
-                                              unitMetricProcessContextSwitches);
-}
-
-/**
- * Total CPU seconds broken down by different states.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessCpuTime = "process.cpu.time";
-static constexpr const char *descrMetricProcessCpuTime =
-    "Total CPU seconds broken down by different states.";
-static constexpr const char *unitMetricProcessCpuTime = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                    unitMetricProcessCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                    unitMetricProcessCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                             unitMetricProcessCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                              unitMetricProcessCpuTime);
-}
-
-/**
- * Difference in process.cpu.time since the last measurement, divided by the elapsed time and number
- * of CPUs available to the process. <p> gauge
- */
-static constexpr const char *kMetricProcessCpuUtilization = "process.cpu.utilization";
-static constexpr const char *descrMetricProcessCpuUtilization =
-    "Difference in process.cpu.time since the last measurement, divided by the elapsed time and "
-    "number of CPUs available to the process.";
-static constexpr const char *unitMetricProcessCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricProcessCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricProcessCpuUtilization, descrMetricProcessCpuUtilization,
-                                 unitMetricProcessCpuUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricProcessCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricProcessCpuUtilization, descrMetricProcessCpuUtilization,
-                                  unitMetricProcessCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricProcessCpuUtilization,
-                                           descrMetricProcessCpuUtilization,
-                                           unitMetricProcessCpuUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricProcessCpuUtilization,
-                                            descrMetricProcessCpuUtilization,
-                                            unitMetricProcessCpuUtilization);
-}
-
-/**
- * Disk bytes transferred.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessDiskIo     = "process.disk.io";
-static constexpr const char *descrMetricProcessDiskIo = "Disk bytes transferred.";
-static constexpr const char *unitMetricProcessDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                    unitMetricProcessDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                    unitMetricProcessDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                             unitMetricProcessDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                              unitMetricProcessDiskIo);
-}
-
-/**
- * The amount of physical memory in use.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricProcessMemoryUsage = "process.memory.usage";
-static constexpr const char *descrMetricProcessMemoryUsage =
-    "The amount of physical memory in use.";
-static constexpr const char *unitMetricProcessMemoryUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage,
-                                         unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage,
-                                          unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage, unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage, unitMetricProcessMemoryUsage);
-}
-
-/**
- * The amount of committed virtual memory.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricProcessMemoryVirtual = "process.memory.virtual";
-static constexpr const char *descrMetricProcessMemoryVirtual =
-    "The amount of committed virtual memory.";
-static constexpr const char *unitMetricProcessMemoryVirtual = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-/**
- * Network bytes transferred.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessNetworkIo     = "process.network.io";
-static constexpr const char *descrMetricProcessNetworkIo = "Network bytes transferred.";
-static constexpr const char *unitMetricProcessNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                    unitMetricProcessNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                    unitMetricProcessNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                             unitMetricProcessNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                              unitMetricProcessNetworkIo);
-}
-
-/**
- * Number of file descriptors in use by the process.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricProcessOpenFileDescriptorCount =
-    "process.open_file_descriptor.count";
-static constexpr const char *descrMetricProcessOpenFileDescriptorCount =
-    "Number of file descriptors in use by the process.";
-static constexpr const char *unitMetricProcessOpenFileDescriptorCount = "{file_descriptor}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                         descrMetricProcessOpenFileDescriptorCount,
-                                         unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                          descrMetricProcessOpenFileDescriptorCount,
-                                          unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                                   descrMetricProcessOpenFileDescriptorCount,
-                                                   unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                                    descrMetricProcessOpenFileDescriptorCount,
-                                                    unitMetricProcessOpenFileDescriptorCount);
-}
-
-/**
- * Number of page faults the process has made.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessPagingFaults = "process.paging.faults";
-static constexpr const char *descrMetricProcessPagingFaults =
-    "Number of page faults the process has made.";
-static constexpr const char *unitMetricProcessPagingFaults = "{fault}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessPagingFaults, descrMetricProcessPagingFaults,
-                                    unitMetricProcessPagingFaults);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessPagingFaults, descrMetricProcessPagingFaults,
-                                    unitMetricProcessPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricProcessPagingFaults, descrMetricProcessPagingFaults, unitMetricProcessPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricProcessPagingFaults, descrMetricProcessPagingFaults, unitMetricProcessPagingFaults);
-}
-
-/**
- * Process threads count.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricProcessThreadCount     = "process.thread.count";
-static constexpr const char *descrMetricProcessThreadCount = "Process threads count.";
-static constexpr const char *unitMetricProcessThreadCount  = "{thread}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessThreadCount, descrMetricProcessThreadCount,
-                                         unitMetricProcessThreadCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessThreadCount, descrMetricProcessThreadCount,
-                                          unitMetricProcessThreadCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
-}
-
-/**
- * The time the process has been running.
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricProcessUptime     = "process.uptime";
-static constexpr const char *descrMetricProcessUptime = "The time the process has been running.";
-static constexpr const char *unitMetricProcessUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                 unitMetricProcessUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                  unitMetricProcessUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                           unitMetricProcessUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                            unitMetricProcessUptime);
-}
-
-}  // namespace process
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/rpc_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/rpc_metrics.h
deleted file mode 100644
index 4996ebf85..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/rpc_metrics.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace rpc
-{
-
-/**
- * Measures the duration of outbound RPC.
- * <p>
- * While streaming RPCs may record this metric as start-of-batch
- * to end-of-batch, it's hard to interpret in practice.
- * <p>
- * <strong>Streaming</strong>: N/A.
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientDuration = "rpc.client.duration";
-static constexpr const char *descrMetricRpcClientDuration =
-    "Measures the duration of outbound RPC.";
-static constexpr const char *unitMetricRpcClientDuration = "ms";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
-                                      unitMetricRpcClientDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcClientDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
-                                      unitMetricRpcClientDuration);
-}
-
-/**
- * Measures the size of RPC request messages (uncompressed).
- * <p>
- * <strong>Streaming</strong>: Recorded per message in a streaming batch
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientRequestSize = "rpc.client.request.size";
-static constexpr const char *descrMetricRpcClientRequestSize =
-    "Measures the size of RPC request messages (uncompressed).";
-static constexpr const char *unitMetricRpcClientRequestSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientRequestSize, descrMetricRpcClientRequestSize,
-                                      unitMetricRpcClientRequestSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientRequestSize, descrMetricRpcClientRequestSize,
-                                      unitMetricRpcClientRequestSize);
-}
-
-/**
- * Measures the number of messages received per RPC.
- * <p>
- * Should be 1 for all non-streaming RPCs.
- * <p>
- * <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientRequestsPerRpc = "rpc.client.requests_per_rpc";
-static constexpr const char *descrMetricRpcClientRequestsPerRpc =
-    "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcClientRequestsPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientRequestsPerRpc,
-                                      descrMetricRpcClientRequestsPerRpc,
-                                      unitMetricRpcClientRequestsPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientRequestsPerRpc,
-                                      descrMetricRpcClientRequestsPerRpc,
-                                      unitMetricRpcClientRequestsPerRpc);
-}
-
-/**
- * Measures the size of RPC response messages (uncompressed).
- * <p>
- * <strong>Streaming</strong>: Recorded per response in a streaming batch
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientResponseSize = "rpc.client.response.size";
-static constexpr const char *descrMetricRpcClientResponseSize =
-    "Measures the size of RPC response messages (uncompressed).";
-static constexpr const char *unitMetricRpcClientResponseSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientResponseSize,
-                                      descrMetricRpcClientResponseSize,
-                                      unitMetricRpcClientResponseSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientResponseSize,
-                                      descrMetricRpcClientResponseSize,
-                                      unitMetricRpcClientResponseSize);
-}
-
-/**
- * Measures the number of messages sent per RPC.
- * <p>
- * Should be 1 for all non-streaming RPCs.
- * <p>
- * <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientResponsesPerRpc = "rpc.client.responses_per_rpc";
-static constexpr const char *descrMetricRpcClientResponsesPerRpc =
-    "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcClientResponsesPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientResponsesPerRpc,
-                                      descrMetricRpcClientResponsesPerRpc,
-                                      unitMetricRpcClientResponsesPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientResponsesPerRpc,
-                                      descrMetricRpcClientResponsesPerRpc,
-                                      unitMetricRpcClientResponsesPerRpc);
-}
-
-/**
- * Measures the duration of inbound RPC.
- * <p>
- * While streaming RPCs may record this metric as start-of-batch
- * to end-of-batch, it's hard to interpret in practice.
- * <p>
- * <strong>Streaming</strong>: N/A.
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerDuration     = "rpc.server.duration";
-static constexpr const char *descrMetricRpcServerDuration = "Measures the duration of inbound RPC.";
-static constexpr const char *unitMetricRpcServerDuration  = "ms";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
-                                      unitMetricRpcServerDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcServerDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
-                                      unitMetricRpcServerDuration);
-}
-
-/**
- * Measures the size of RPC request messages (uncompressed).
- * <p>
- * <strong>Streaming</strong>: Recorded per message in a streaming batch
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerRequestSize = "rpc.server.request.size";
-static constexpr const char *descrMetricRpcServerRequestSize =
-    "Measures the size of RPC request messages (uncompressed).";
-static constexpr const char *unitMetricRpcServerRequestSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerRequestSize, descrMetricRpcServerRequestSize,
-                                      unitMetricRpcServerRequestSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerRequestSize, descrMetricRpcServerRequestSize,
-                                      unitMetricRpcServerRequestSize);
-}
-
-/**
- * Measures the number of messages received per RPC.
- * <p>
- * Should be 1 for all non-streaming RPCs.
- * <p>
- * <strong>Streaming</strong> : This metric is required for server and client streaming RPCs
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerRequestsPerRpc = "rpc.server.requests_per_rpc";
-static constexpr const char *descrMetricRpcServerRequestsPerRpc =
-    "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcServerRequestsPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerRequestsPerRpc,
-                                      descrMetricRpcServerRequestsPerRpc,
-                                      unitMetricRpcServerRequestsPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerRequestsPerRpc,
-                                      descrMetricRpcServerRequestsPerRpc,
-                                      unitMetricRpcServerRequestsPerRpc);
-}
-
-/**
- * Measures the size of RPC response messages (uncompressed).
- * <p>
- * <strong>Streaming</strong>: Recorded per response in a streaming batch
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerResponseSize = "rpc.server.response.size";
-static constexpr const char *descrMetricRpcServerResponseSize =
-    "Measures the size of RPC response messages (uncompressed).";
-static constexpr const char *unitMetricRpcServerResponseSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerResponseSize,
-                                      descrMetricRpcServerResponseSize,
-                                      unitMetricRpcServerResponseSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerResponseSize,
-                                      descrMetricRpcServerResponseSize,
-                                      unitMetricRpcServerResponseSize);
-}
-
-/**
- * Measures the number of messages sent per RPC.
- * <p>
- * Should be 1 for all non-streaming RPCs.
- * <p>
- * <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerResponsesPerRpc = "rpc.server.responses_per_rpc";
-static constexpr const char *descrMetricRpcServerResponsesPerRpc =
-    "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcServerResponsesPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerResponsesPerRpc,
-                                      descrMetricRpcServerResponsesPerRpc,
-                                      unitMetricRpcServerResponsesPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerResponsesPerRpc,
-                                      descrMetricRpcServerResponsesPerRpc,
-                                      unitMetricRpcServerResponsesPerRpc);
-}
-
-}  // namespace rpc
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/schema_url.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/schema_url.h
deleted file mode 100644
index bc36ae235..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/schema_url.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/schema_url-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-/**
- * The URL of the OpenTelemetry schema for these keys and values.
- */
-static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.34.0";
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/server_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/server_attributes.h
deleted file mode 100644
index 2d307614b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/server_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace server
-{
-
-/**
-  Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain
-  socket name. <p> When observed from the client side, and when communicating through an
-  intermediary, @code server.address @endcode SHOULD represent the server address behind any
-  intermediaries, for example proxies, if it's available.
- */
-static constexpr const char *kServerAddress = "server.address";
-
-/**
-  Server port number.
-  <p>
-  When observed from the client side, and when communicating through an intermediary, @code
-  server.port @endcode SHOULD represent the server port behind any intermediaries, for example
-  proxies, if it's available.
- */
-static constexpr const char *kServerPort = "server.port";
-
-}  // namespace server
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/service_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/service_attributes.h
deleted file mode 100644
index 1f335ca26..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/service_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace service
-{
-
-/**
-  Logical name of the service.
-  <p>
-  MUST be the same for all instances of horizontally scaled services. If the value was not
-  specified, SDKs MUST fallback to @code unknown_service: @endcode concatenated with <a
-  href="process.md">@code process.executable.name @endcode</a>, e.g. @code unknown_service:bash
-  @endcode. If @code process.executable.name @endcode is not available, the value MUST be set to
-  @code unknown_service @endcode.
- */
-static constexpr const char *kServiceName = "service.name";
-
-/**
-  The version string of the service API or implementation. The format is not defined by these
-  conventions.
- */
-static constexpr const char *kServiceVersion = "service.version";
-
-}  // namespace service
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/system_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/system_metrics.h
deleted file mode 100644
index a985dac90..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/system_metrics.h
+++ /dev/null
@@ -1,1339 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace system
-{
-
-/**
- * Deprecated. Use @code cpu.frequency @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code cpu.frequency @endcode.", "reason": "uncategorized"}
- * <p>
- * gauge
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuFrequency =
-    "system.cpu.frequency";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuFrequency =
-    "Deprecated. Use `cpu.frequency` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuFrequency = "{Hz}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                 unitMetricSystemCpuFrequency);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                  unitMetricSystemCpuFrequency);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                           unitMetricSystemCpuFrequency);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency, unitMetricSystemCpuFrequency);
-}
-
-/**
- * Reports the number of logical (virtual) processor cores created by the operating system to manage
- * multitasking <p> Calculated by multiplying the number of sockets by the number of cores per
- * socket, and then by the number of threads per core <p> updowncounter
- */
-static constexpr const char *kMetricSystemCpuLogicalCount = "system.cpu.logical.count";
-static constexpr const char *descrMetricSystemCpuLogicalCount =
-    "Reports the number of logical (virtual) processor cores created by the operating system to "
-    "manage multitasking";
-static constexpr const char *unitMetricSystemCpuLogicalCount = "{cpu}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemCpuLogicalCount,
-                                         descrMetricSystemCpuLogicalCount,
-                                         unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemCpuLogicalCount,
-                                          descrMetricSystemCpuLogicalCount,
-                                          unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemCpuLogicalCount,
-                                                   descrMetricSystemCpuLogicalCount,
-                                                   unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemCpuLogicalCount,
-                                                    descrMetricSystemCpuLogicalCount,
-                                                    unitMetricSystemCpuLogicalCount);
-}
-
-/**
- * Reports the number of actual physical processor cores on the hardware
- * <p>
- * Calculated by multiplying the number of sockets by the number of cores per socket
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemCpuPhysicalCount = "system.cpu.physical.count";
-static constexpr const char *descrMetricSystemCpuPhysicalCount =
-    "Reports the number of actual physical processor cores on the hardware";
-static constexpr const char *unitMetricSystemCpuPhysicalCount = "{cpu}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemCpuPhysicalCount,
-                                         descrMetricSystemCpuPhysicalCount,
-                                         unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                          descrMetricSystemCpuPhysicalCount,
-                                          unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                                   descrMetricSystemCpuPhysicalCount,
-                                                   unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                                    descrMetricSystemCpuPhysicalCount,
-                                                    unitMetricSystemCpuPhysicalCount);
-}
-
-/**
- * Deprecated. Use @code cpu.time @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code cpu.time @endcode.", "reason": "uncategorized"}
- * <p>
- * counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuTime = "system.cpu.time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuTime =
-    "Deprecated. Use `cpu.time` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuTime = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                    unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                    unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                             unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                              unitMetricSystemCpuTime);
-}
-
-/**
- * Deprecated. Use @code cpu.utilization @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code cpu.utilization @endcode.", "reason": "uncategorized"}
- * <p>
- * gauge
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuUtilization =
-    "system.cpu.utilization";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuUtilization =
-    "Deprecated. Use `cpu.utilization` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization,
-                                 unitMetricSystemCpuUtilization);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization,
-                                  unitMetricSystemCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization, unitMetricSystemCpuUtilization);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization, unitMetricSystemCpuUtilization);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemDiskIo     = "system.disk.io";
-static constexpr const char *descrMetricSystemDiskIo = "";
-static constexpr const char *unitMetricSystemDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                    unitMetricSystemDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                    unitMetricSystemDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                             unitMetricSystemDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                              unitMetricSystemDiskIo);
-}
-
-/**
- * Time disk spent activated
- * <p>
- * The real elapsed time ("wall clock") used in the I/O path (time from operations running in
- * parallel are not counted). Measured as: <ul> <li>Linux: Field 13 from <a
- * href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
- *   <li>Windows: The complement of
- * <a
- * href="https://learn.microsoft.com/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained">"Disk%
- * Idle Time"</a> performance counter: @code uptime * (100 - "Disk\% Idle Time") / 100 @endcode</li>
- * </ul>
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemDiskIoTime     = "system.disk.io_time";
-static constexpr const char *descrMetricSystemDiskIoTime = "Time disk spent activated";
-static constexpr const char *unitMetricSystemDiskIoTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIoTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                    unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskIoTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                    unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskIoTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                             unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskIoTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                              unitMetricSystemDiskIoTime);
-}
-
-/**
- * The total storage capacity of the disk
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemDiskLimit     = "system.disk.limit";
-static constexpr const char *descrMetricSystemDiskLimit = "The total storage capacity of the disk";
-static constexpr const char *unitMetricSystemDiskLimit  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemDiskLimit, descrMetricSystemDiskLimit,
-                                         unitMetricSystemDiskLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemDiskLimit, descrMetricSystemDiskLimit,
-                                          unitMetricSystemDiskLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemDiskLimit, descrMetricSystemDiskLimit, unitMetricSystemDiskLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemDiskLimit, descrMetricSystemDiskLimit, unitMetricSystemDiskLimit);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemDiskMerged     = "system.disk.merged";
-static constexpr const char *descrMetricSystemDiskMerged = "";
-static constexpr const char *unitMetricSystemDiskMerged  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskMerged(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                    unitMetricSystemDiskMerged);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskMerged(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                    unitMetricSystemDiskMerged);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskMerged(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                             unitMetricSystemDiskMerged);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskMerged(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                              unitMetricSystemDiskMerged);
-}
-
-/**
- * Sum of the time each operation took to complete
- * <p>
- * Because it is the sum of time each request took, parallel-issued requests each contribute to make
- * the count grow. Measured as: <ul> <li>Linux: Fields 7 & 11 from <a
- * href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
- *   <li>Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter
- * (similar for Writes)</li>
- * </ul>
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemDiskOperationTime = "system.disk.operation_time";
-static constexpr const char *descrMetricSystemDiskOperationTime =
-    "Sum of the time each operation took to complete";
-static constexpr const char *unitMetricSystemDiskOperationTime = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskOperationTime,
-                                    descrMetricSystemDiskOperationTime,
-                                    unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskOperationTime,
-                                    descrMetricSystemDiskOperationTime,
-                                    unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskOperationTime,
-                                             descrMetricSystemDiskOperationTime,
-                                             unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskOperationTime,
-                                              descrMetricSystemDiskOperationTime,
-                                              unitMetricSystemDiskOperationTime);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemDiskOperations     = "system.disk.operations";
-static constexpr const char *descrMetricSystemDiskOperations = "";
-static constexpr const char *unitMetricSystemDiskOperations  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskOperations, descrMetricSystemDiskOperations,
-                                    unitMetricSystemDiskOperations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskOperations, descrMetricSystemDiskOperations,
-                                    unitMetricSystemDiskOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemDiskOperations, descrMetricSystemDiskOperations, unitMetricSystemDiskOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemDiskOperations, descrMetricSystemDiskOperations, unitMetricSystemDiskOperations);
-}
-
-/**
- * The total storage capacity of the filesystem
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemFilesystemLimit = "system.filesystem.limit";
-static constexpr const char *descrMetricSystemFilesystemLimit =
-    "The total storage capacity of the filesystem";
-static constexpr const char *unitMetricSystemFilesystemLimit = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemFilesystemLimit,
-                                         descrMetricSystemFilesystemLimit,
-                                         unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemFilesystemLimit,
-                                          descrMetricSystemFilesystemLimit,
-                                          unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemFilesystemLimit,
-                                                   descrMetricSystemFilesystemLimit,
-                                                   unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemFilesystemLimit,
-                                                    descrMetricSystemFilesystemLimit,
-                                                    unitMetricSystemFilesystemLimit);
-}
-
-/**
- * Reports a filesystem's space usage across different states.
- * <p>
- * The sum of all @code system.filesystem.usage @endcode values over the different @code
- * system.filesystem.state @endcode attributes SHOULD equal the total storage capacity of the
- * filesystem, that is @code system.filesystem.limit @endcode. <p> updowncounter
- */
-static constexpr const char *kMetricSystemFilesystemUsage = "system.filesystem.usage";
-static constexpr const char *descrMetricSystemFilesystemUsage =
-    "Reports a filesystem's space usage across different states.";
-static constexpr const char *unitMetricSystemFilesystemUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemFilesystemUsage,
-                                         descrMetricSystemFilesystemUsage,
-                                         unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemFilesystemUsage,
-                                          descrMetricSystemFilesystemUsage,
-                                          unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemFilesystemUsage,
-                                                   descrMetricSystemFilesystemUsage,
-                                                   unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemFilesystemUsage,
-                                                    descrMetricSystemFilesystemUsage,
-                                                    unitMetricSystemFilesystemUsage);
-}
-
-/**
- * gauge
- */
-static constexpr const char *kMetricSystemFilesystemUtilization = "system.filesystem.utilization";
-static constexpr const char *descrMetricSystemFilesystemUtilization = "";
-static constexpr const char *unitMetricSystemFilesystemUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemFilesystemUtilization,
-                                 descrMetricSystemFilesystemUtilization,
-                                 unitMetricSystemFilesystemUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemFilesystemUtilization,
-                                  descrMetricSystemFilesystemUtilization,
-                                  unitMetricSystemFilesystemUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemFilesystemUtilization,
-                                           descrMetricSystemFilesystemUtilization,
-                                           unitMetricSystemFilesystemUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemFilesystemUtilization,
-                                            descrMetricSystemFilesystemUtilization,
-                                            unitMetricSystemFilesystemUtilization);
-}
-
-/**
- * An estimate of how much memory is available for starting new applications, without causing
- * swapping <p> This is an alternative to @code system.memory.usage @endcode metric with @code
- * state=free @endcode. Linux starting from 3.14 exports "available" memory. It takes "free" memory
- * as a baseline, and then factors in kernel-specific values. This is supposed to be more accurate
- * than just "free" memory. For reference, see the calculations <a
- * href="https://superuser.com/a/980821">here</a>. See also @code MemAvailable @endcode in <a
- * href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemoryAvailable = "system.linux.memory.available";
-static constexpr const char *descrMetricSystemLinuxMemoryAvailable =
-    "An estimate of how much memory is available for starting new applications, without causing "
-    "swapping";
-static constexpr const char *unitMetricSystemLinuxMemoryAvailable = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                         descrMetricSystemLinuxMemoryAvailable,
-                                         unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                          descrMetricSystemLinuxMemoryAvailable,
-                                          unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                   descrMetricSystemLinuxMemoryAvailable,
-                                                   unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                    descrMetricSystemLinuxMemoryAvailable,
-                                                    unitMetricSystemLinuxMemoryAvailable);
-}
-
-/**
- * Reports the memory used by the Linux kernel for managing caches of frequently used objects.
- * <p>
- * The sum over the @code reclaimable @endcode and @code unreclaimable @endcode state values in
- * @code linux.memory.slab.usage @endcode SHOULD be equal to the total slab memory available on the
- * system. Note that the total slab memory is not constant and may vary over time. See also the <a
- * href="https://blogs.oracle.com/linux/post/understanding-linux-kernel-memory-statistics">Slab
- * allocator</a> and @code Slab @endcode in <a
- * href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemorySlabUsage = "system.linux.memory.slab.usage";
-static constexpr const char *descrMetricSystemLinuxMemorySlabUsage =
-    "Reports the memory used by the Linux kernel for managing caches of frequently used objects.";
-static constexpr const char *unitMetricSystemLinuxMemorySlabUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                         descrMetricSystemLinuxMemorySlabUsage,
-                                         unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                          descrMetricSystemLinuxMemorySlabUsage,
-                                          unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                   descrMetricSystemLinuxMemorySlabUsage,
-                                                   unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                    descrMetricSystemLinuxMemorySlabUsage,
-                                                    unitMetricSystemLinuxMemorySlabUsage);
-}
-
-/**
- * Total memory available in the system.
- * <p>
- * Its value SHOULD equal the sum of @code system.memory.state @endcode over all states.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemMemoryLimit     = "system.memory.limit";
-static constexpr const char *descrMetricSystemMemoryLimit = "Total memory available in the system.";
-static constexpr const char *unitMetricSystemMemoryLimit  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit,
-                                         unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit,
-                                          unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
-}
-
-/**
- * Shared memory used (mostly by tmpfs).
- * <p>
- * Equivalent of @code shared @endcode from <a
- * href="https://man7.org/linux/man-pages/man1/free.1.html">@code free @endcode command</a> or
- * @code Shmem @endcode from <a href="https://man7.org/linux/man-pages/man5/proc.5.html">@code
- * /proc/meminfo @endcode</a>" <p> updowncounter
- */
-static constexpr const char *kMetricSystemMemoryShared = "system.memory.shared";
-static constexpr const char *descrMetricSystemMemoryShared =
-    "Shared memory used (mostly by tmpfs).";
-static constexpr const char *unitMetricSystemMemoryShared = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryShared, descrMetricSystemMemoryShared,
-                                         unitMetricSystemMemoryShared);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryShared, descrMetricSystemMemoryShared,
-                                          unitMetricSystemMemoryShared);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryShared, descrMetricSystemMemoryShared, unitMetricSystemMemoryShared);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryShared, descrMetricSystemMemoryShared, unitMetricSystemMemoryShared);
-}
-
-/**
- * Reports memory in use by state.
- * <p>
- * The sum over all @code system.memory.state @endcode values SHOULD equal the total memory
- * available on the system, that is @code system.memory.limit @endcode.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemMemoryUsage     = "system.memory.usage";
-static constexpr const char *descrMetricSystemMemoryUsage = "Reports memory in use by state.";
-static constexpr const char *unitMetricSystemMemoryUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage,
-                                         unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage,
-                                          unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage, unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage, unitMetricSystemMemoryUsage);
-}
-
-/**
- * gauge
- */
-static constexpr const char *kMetricSystemMemoryUtilization     = "system.memory.utilization";
-static constexpr const char *descrMetricSystemMemoryUtilization = "";
-static constexpr const char *unitMetricSystemMemoryUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemMemoryUtilization, descrMetricSystemMemoryUtilization,
-                                 unitMetricSystemMemoryUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemMemoryUtilization,
-                                  descrMetricSystemMemoryUtilization,
-                                  unitMetricSystemMemoryUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemMemoryUtilization,
-                                           descrMetricSystemMemoryUtilization,
-                                           unitMetricSystemMemoryUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemMemoryUtilization,
-                                            descrMetricSystemMemoryUtilization,
-                                            unitMetricSystemMemoryUtilization);
-}
-
-/**
- * updowncounter
- */
-static constexpr const char *kMetricSystemNetworkConnections     = "system.network.connections";
-static constexpr const char *descrMetricSystemNetworkConnections = "";
-static constexpr const char *unitMetricSystemNetworkConnections  = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemNetworkConnections,
-                                         descrMetricSystemNetworkConnections,
-                                         unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemNetworkConnections,
-                                          descrMetricSystemNetworkConnections,
-                                          unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemNetworkConnections,
-                                                   descrMetricSystemNetworkConnections,
-                                                   unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemNetworkConnections,
-                                                    descrMetricSystemNetworkConnections,
-                                                    unitMetricSystemNetworkConnections);
-}
-
-/**
- * Count of packets that are dropped or discarded even though there was no error
- * <p>
- * Measured as:
- * <ul>
- *   <li>Linux: the @code drop @endcode column in @code /proc/dev/net @endcode (<a
- * href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
- *   <li>Windows: <a
- * href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
- * InDiscards @endcode/@code OutDiscards @endcode</a> from <a
- * href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
- * GetIfEntry2 @endcode</a></li>
- * </ul>
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemNetworkDropped = "system.network.dropped";
-static constexpr const char *descrMetricSystemNetworkDropped =
-    "Count of packets that are dropped or discarded even though there was no error";
-static constexpr const char *unitMetricSystemNetworkDropped = "{packet}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
-                                    unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
-                                    unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
-}
-
-/**
- * Count of network errors detected
- * <p>
- * Measured as:
- * <ul>
- *   <li>Linux: the @code errs @endcode column in @code /proc/dev/net @endcode (<a
- * href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>).</li>
- *   <li>Windows: <a
- * href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
- * InErrors @endcode/@code OutErrors @endcode</a> from <a
- * href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
- * GetIfEntry2 @endcode</a>.</li>
- * </ul>
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemNetworkErrors     = "system.network.errors";
-static constexpr const char *descrMetricSystemNetworkErrors = "Count of network errors detected";
-static constexpr const char *unitMetricSystemNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors,
-                                    unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemNetworkErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors,
-                                    unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors, unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors, unitMetricSystemNetworkErrors);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemNetworkIo     = "system.network.io";
-static constexpr const char *descrMetricSystemNetworkIo = "";
-static constexpr const char *unitMetricSystemNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                    unitMetricSystemNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                    unitMetricSystemNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                             unitMetricSystemNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                              unitMetricSystemNetworkIo);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemNetworkPackets     = "system.network.packets";
-static constexpr const char *descrMetricSystemNetworkPackets = "";
-static constexpr const char *unitMetricSystemNetworkPackets  = "{packet}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
-                                    unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
-                                    unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemPagingFaults     = "system.paging.faults";
-static constexpr const char *descrMetricSystemPagingFaults = "";
-static constexpr const char *unitMetricSystemPagingFaults  = "{fault}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemPagingFaults, descrMetricSystemPagingFaults,
-                                    unitMetricSystemPagingFaults);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemPagingFaults, descrMetricSystemPagingFaults,
-                                    unitMetricSystemPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemPagingFaults, descrMetricSystemPagingFaults, unitMetricSystemPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemPagingFaults, descrMetricSystemPagingFaults, unitMetricSystemPagingFaults);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemPagingOperations     = "system.paging.operations";
-static constexpr const char *descrMetricSystemPagingOperations = "";
-static constexpr const char *unitMetricSystemPagingOperations  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemPagingOperations,
-                                    descrMetricSystemPagingOperations,
-                                    unitMetricSystemPagingOperations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemPagingOperations,
-                                    descrMetricSystemPagingOperations,
-                                    unitMetricSystemPagingOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemPagingOperations,
-                                             descrMetricSystemPagingOperations,
-                                             unitMetricSystemPagingOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemPagingOperations,
-                                              descrMetricSystemPagingOperations,
-                                              unitMetricSystemPagingOperations);
-}
-
-/**
- * Unix swap or windows pagefile usage
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemPagingUsage     = "system.paging.usage";
-static constexpr const char *descrMetricSystemPagingUsage = "Unix swap or windows pagefile usage";
-static constexpr const char *unitMetricSystemPagingUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemPagingUsage, descrMetricSystemPagingUsage,
-                                         unitMetricSystemPagingUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemPagingUsage, descrMetricSystemPagingUsage,
-                                          unitMetricSystemPagingUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemPagingUsage, descrMetricSystemPagingUsage, unitMetricSystemPagingUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemPagingUsage, descrMetricSystemPagingUsage, unitMetricSystemPagingUsage);
-}
-
-/**
- * gauge
- */
-static constexpr const char *kMetricSystemPagingUtilization     = "system.paging.utilization";
-static constexpr const char *descrMetricSystemPagingUtilization = "";
-static constexpr const char *unitMetricSystemPagingUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemPagingUtilization, descrMetricSystemPagingUtilization,
-                                 unitMetricSystemPagingUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemPagingUtilization,
-                                  descrMetricSystemPagingUtilization,
-                                  unitMetricSystemPagingUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemPagingUtilization,
-                                           descrMetricSystemPagingUtilization,
-                                           unitMetricSystemPagingUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemPagingUtilization,
-                                            descrMetricSystemPagingUtilization,
-                                            unitMetricSystemPagingUtilization);
-}
-
-/**
- * Total number of processes in each state
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemProcessCount = "system.process.count";
-static constexpr const char *descrMetricSystemProcessCount =
-    "Total number of processes in each state";
-static constexpr const char *unitMetricSystemProcessCount = "{process}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemProcessCount, descrMetricSystemProcessCount,
-                                         unitMetricSystemProcessCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemProcessCount, descrMetricSystemProcessCount,
-                                          unitMetricSystemProcessCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemProcessCount, descrMetricSystemProcessCount, unitMetricSystemProcessCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemProcessCount, descrMetricSystemProcessCount, unitMetricSystemProcessCount);
-}
-
-/**
- * Total number of processes created over uptime of the host
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemProcessCreated = "system.process.created";
-static constexpr const char *descrMetricSystemProcessCreated =
-    "Total number of processes created over uptime of the host";
-static constexpr const char *unitMetricSystemProcessCreated = "{process}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemProcessCreated, descrMetricSystemProcessCreated,
-                                    unitMetricSystemProcessCreated);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemProcessCreated, descrMetricSystemProcessCreated,
-                                    unitMetricSystemProcessCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemProcessCreated, descrMetricSystemProcessCreated, unitMetricSystemProcessCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemProcessCreated, descrMetricSystemProcessCreated, unitMetricSystemProcessCreated);
-}
-
-/**
- * The time the system has been running
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricSystemUptime     = "system.uptime";
-static constexpr const char *descrMetricSystemUptime = "The time the system has been running";
-static constexpr const char *unitMetricSystemUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                 unitMetricSystemUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                  unitMetricSystemUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                           unitMetricSystemUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                            unitMetricSystemUptime);
-}
-
-}  // namespace system
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/telemetry_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/telemetry_attributes.h
deleted file mode 100644
index 1722398dd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/telemetry_attributes.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace telemetry
-{
-
-/**
-  The language of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
-
-/**
-  The name of the telemetry SDK as defined above.
-  <p>
-  The OpenTelemetry SDK MUST set the @code telemetry.sdk.name @endcode attribute to @code
-  opentelemetry @endcode. If another SDK, like a fork or a vendor-provided implementation, is used,
-  this SDK MUST set the
-  @code telemetry.sdk.name @endcode attribute to the fully-qualified class or module name of this
-  SDK's main entry point or another suitable identifier depending on the language. The identifier
-  @code opentelemetry @endcode is reserved and MUST NOT be used in this case. All custom identifiers
-  SHOULD be stable across different versions of an implementation.
- */
-static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
-
-/**
-  The version string of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
-
-namespace TelemetrySdkLanguageValues
-{
-/**
-  none
- */
-static constexpr const char *kCpp = "cpp";
-
-/**
-  none
- */
-static constexpr const char *kDotnet = "dotnet";
-
-/**
-  none
- */
-static constexpr const char *kErlang = "erlang";
-
-/**
-  none
- */
-static constexpr const char *kGo = "go";
-
-/**
-  none
- */
-static constexpr const char *kJava = "java";
-
-/**
-  none
- */
-static constexpr const char *kNodejs = "nodejs";
-
-/**
-  none
- */
-static constexpr const char *kPhp = "php";
-
-/**
-  none
- */
-static constexpr const char *kPython = "python";
-
-/**
-  none
- */
-static constexpr const char *kRuby = "ruby";
-
-/**
-  none
- */
-static constexpr const char *kRust = "rust";
-
-/**
-  none
- */
-static constexpr const char *kSwift = "swift";
-
-/**
-  none
- */
-static constexpr const char *kWebjs = "webjs";
-
-}  // namespace TelemetrySdkLanguageValues
-
-}  // namespace telemetry
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/url_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/url_attributes.h
deleted file mode 100644
index 316b60e9a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/url_attributes.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace url
-{
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component
- */
-static constexpr const char *kUrlFragment = "url.fragment";
-
-/**
-  Absolute URL describing a network resource according to <a
-  href="https://www.rfc-editor.org/rfc/rfc3986">RFC3986</a> <p> For network calls, URL usually has
-  @code scheme://host[:port][path][?query][#fragment] @endcode format, where the fragment is not
-  transmitted over HTTP, but if it is known, it SHOULD be included nevertheless. <p>
-  @code url.full @endcode MUST NOT contain credentials passed via URL in form of @code
-  https://username:password@www.example.com/ @endcode. In such case username and password SHOULD be
-  redacted and attribute's value SHOULD be @code https://REDACTED:REDACTED@www.example.com/
-  @endcode. <p>
-  @code url.full @endcode SHOULD capture the absolute URL when it is available (or can be
-  reconstructed). <p> Sensitive content provided in @code url.full @endcode SHOULD be scrubbed when
-  instrumentations can identify it. <p>
-
-  Query string values for the following keys SHOULD be redacted by default and replaced by the
-  value @code REDACTED @endcode:
-  <ul>
-    <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  AWSAccessKeyId @endcode</a></li> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  Signature @endcode</a></li> <li><a
-  href="https://learn.microsoft.com/azure/storage/common/storage-sas-overview#sas-token">@code sig
-  @endcode</a></li> <li><a
-  href="https://cloud.google.com/storage/docs/access-control/signed-urls">@code X-Goog-Signature
-  @endcode</a></li>
-  </ul>
-  <p>
-  This list is subject to change over time.
-  <p>
-  When a query string value is redacted, the query string key SHOULD still be preserved, e.g.
-  @code https://www.example.com/path?color=blue&sig=REDACTED @endcode.
- */
-static constexpr const char *kUrlFull = "url.full";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.3">URI path</a> component
-  <p>
-  Sensitive content provided in @code url.path @endcode SHOULD be scrubbed when instrumentations can
-  identify it.
- */
-static constexpr const char *kUrlPath = "url.path";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.4">URI query</a> component
-  <p>
-  Sensitive content provided in @code url.query @endcode SHOULD be scrubbed when instrumentations
-  can identify it. <p>
-
-  Query string values for the following keys SHOULD be redacted by default and replaced by the value
-  @code REDACTED @endcode: <ul> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  AWSAccessKeyId @endcode</a></li> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  Signature @endcode</a></li> <li><a
-  href="https://learn.microsoft.com/azure/storage/common/storage-sas-overview#sas-token">@code sig
-  @endcode</a></li> <li><a
-  href="https://cloud.google.com/storage/docs/access-control/signed-urls">@code X-Goog-Signature
-  @endcode</a></li>
-  </ul>
-  <p>
-  This list is subject to change over time.
-  <p>
-  When a query string value is redacted, the query string key SHOULD still be preserved, e.g.
-  @code q=OpenTelemetry&sig=REDACTED @endcode.
- */
-static constexpr const char *kUrlQuery = "url.query";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
-  identifying the used protocol.
- */
-static constexpr const char *kUrlScheme = "url.scheme";
-
-}  // namespace url
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/user_agent_attributes.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/user_agent_attributes.h
deleted file mode 100644
index c738d0c6e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/user_agent_attributes.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace user_agent
-{
-
-/**
-  Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
-  User-Agent</a> header sent by the client.
- */
-static constexpr const char *kUserAgentOriginal = "user_agent.original";
-
-}  // namespace user_agent
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/vcs_metrics.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/vcs_metrics.h
deleted file mode 100644
index 1f2885b8f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/semconv/vcs_metrics.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace vcs
-{
-
-/**
- * The number of changes (pull requests/merge requests/changelists) in a repository, categorized by
- * their state (e.g. open or merged) <p> updowncounter
- */
-static constexpr const char *kMetricVcsChangeCount = "vcs.change.count";
-static constexpr const char *descrMetricVcsChangeCount =
-    "The number of changes (pull requests/merge requests/changelists) in a repository, categorized "
-    "by their state (e.g. open or merged)";
-static constexpr const char *unitMetricVcsChangeCount = "{change}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                         unitMetricVcsChangeCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                          unitMetricVcsChangeCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsChangeCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                                   unitMetricVcsChangeCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricVcsChangeCount, descrMetricVcsChangeCount, unitMetricVcsChangeCount);
-}
-
-/**
- * The time duration a change (pull request/merge request/changelist) has been in a given state.
- * <p>
- * gauge
- */
-static constexpr const char *kMetricVcsChangeDuration = "vcs.change.duration";
-static constexpr const char *descrMetricVcsChangeDuration =
-    "The time duration a change (pull request/merge request/changelist) has been in a given state.";
-static constexpr const char *unitMetricVcsChangeDuration = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsChangeDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                 unitMetricVcsChangeDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsChangeDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                  unitMetricVcsChangeDuration);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeDuration(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                           unitMetricVcsChangeDuration);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                            unitMetricVcsChangeDuration);
-}
-
-/**
- * The amount of time since its creation it took a change (pull request/merge request/changelist) to
- * get the first approval. <p> gauge
- */
-static constexpr const char *kMetricVcsChangeTimeToApproval = "vcs.change.time_to_approval";
-static constexpr const char *descrMetricVcsChangeTimeToApproval =
-    "The amount of time since its creation it took a change (pull request/merge "
-    "request/changelist) to get the first approval.";
-static constexpr const char *unitMetricVcsChangeTimeToApproval = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeTimeToApproval, descrMetricVcsChangeTimeToApproval,
-                                 unitMetricVcsChangeTimeToApproval);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeTimeToApproval,
-                                  descrMetricVcsChangeTimeToApproval,
-                                  unitMetricVcsChangeTimeToApproval);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsChangeTimeToApproval,
-                                           descrMetricVcsChangeTimeToApproval,
-                                           unitMetricVcsChangeTimeToApproval);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsChangeTimeToApproval,
-                                            descrMetricVcsChangeTimeToApproval,
-                                            unitMetricVcsChangeTimeToApproval);
-}
-
-/**
- * The amount of time since its creation it took a change (pull request/merge request/changelist) to
- * get merged into the target(base) ref. <p> gauge
- */
-static constexpr const char *kMetricVcsChangeTimeToMerge = "vcs.change.time_to_merge";
-static constexpr const char *descrMetricVcsChangeTimeToMerge =
-    "The amount of time since its creation it took a change (pull request/merge "
-    "request/changelist) to get merged into the target(base) ref.";
-static constexpr const char *unitMetricVcsChangeTimeToMerge = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsChangeTimeToMerge(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge,
-                                 unitMetricVcsChangeTimeToMerge);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsChangeTimeToMerge(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge,
-                                  unitMetricVcsChangeTimeToMerge);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeTimeToMerge(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge, unitMetricVcsChangeTimeToMerge);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeTimeToMerge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge, unitMetricVcsChangeTimeToMerge);
-}
-
-/**
- * The number of unique contributors to a repository
- * <p>
- * gauge
- */
-static constexpr const char *kMetricVcsContributorCount = "vcs.contributor.count";
-static constexpr const char *descrMetricVcsContributorCount =
-    "The number of unique contributors to a repository";
-static constexpr const char *unitMetricVcsContributorCount = "{contributor}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsContributorCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsContributorCount, descrMetricVcsContributorCount,
-                                 unitMetricVcsContributorCount);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsContributorCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsContributorCount, descrMetricVcsContributorCount,
-                                  unitMetricVcsContributorCount);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsContributorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsContributorCount, descrMetricVcsContributorCount, unitMetricVcsContributorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsContributorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsContributorCount, descrMetricVcsContributorCount, unitMetricVcsContributorCount);
-}
-
-/**
- * The number of refs of type branch or tag in a repository.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricVcsRefCount = "vcs.ref.count";
-static constexpr const char *descrMetricVcsRefCount =
-    "The number of refs of type branch or tag in a repository.";
-static constexpr const char *unitMetricVcsRefCount = "{ref}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                         unitMetricVcsRefCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                          unitMetricVcsRefCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                                   unitMetricVcsRefCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                                    unitMetricVcsRefCount);
-}
-
-/**
- * The number of lines added/removed in a ref (branch) relative to the ref from the @code
- * vcs.ref.base.name @endcode attribute. <p> This metric should be reported for each @code
- * vcs.line_change.type @endcode value. For example if a ref added 3 lines and removed 2 lines,
- * instrumentation SHOULD report two measurements: 3 and 2 (both positive numbers).
- * If number of lines added/removed should be calculated from the start of time, then @code
- * vcs.ref.base.name @endcode SHOULD be set to an empty string. <p> gauge
- */
-static constexpr const char *kMetricVcsRefLinesDelta = "vcs.ref.lines_delta";
-static constexpr const char *descrMetricVcsRefLinesDelta =
-    "The number of lines added/removed in a ref (branch) relative to the ref from the "
-    "`vcs.ref.base.name` attribute.";
-static constexpr const char *unitMetricVcsRefLinesDelta = "{line}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefLinesDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                 unitMetricVcsRefLinesDelta);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefLinesDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                  unitMetricVcsRefLinesDelta);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRefLinesDelta(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                           unitMetricVcsRefLinesDelta);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRefLinesDelta(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                            unitMetricVcsRefLinesDelta);
-}
-
-/**
- * The number of revisions (commits) a ref (branch) is ahead/behind the branch from the @code
- * vcs.ref.base.name @endcode attribute <p> This metric should be reported for each @code
- * vcs.revision_delta.direction @endcode value. For example if branch @code a @endcode is 3 commits
- * behind and 2 commits ahead of @code trunk @endcode, instrumentation SHOULD report two
- * measurements: 3 and 2 (both positive numbers) and @code vcs.ref.base.name @endcode is set to
- * @code trunk @endcode. <p> gauge
- */
-static constexpr const char *kMetricVcsRefRevisionsDelta = "vcs.ref.revisions_delta";
-static constexpr const char *descrMetricVcsRefRevisionsDelta =
-    "The number of revisions (commits) a ref (branch) is ahead/behind the branch from the "
-    "`vcs.ref.base.name` attribute";
-static constexpr const char *unitMetricVcsRefRevisionsDelta = "{revision}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefRevisionsDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta,
-                                 unitMetricVcsRefRevisionsDelta);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefRevisionsDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta,
-                                  unitMetricVcsRefRevisionsDelta);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRefRevisionsDelta(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta, unitMetricVcsRefRevisionsDelta);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRefRevisionsDelta(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta, unitMetricVcsRefRevisionsDelta);
-}
-
-/**
- * Time a ref (branch) created from the default branch (trunk) has existed. The @code ref.type
- * @endcode attribute will always be @code branch @endcode <p> gauge
- */
-static constexpr const char *kMetricVcsRefTime = "vcs.ref.time";
-static constexpr const char *descrMetricVcsRefTime =
-    "Time a ref (branch) created from the default branch (trunk) has existed. The `ref.type` "
-    "attribute will always be `branch`";
-static constexpr const char *unitMetricVcsRefTime = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefTime, descrMetricVcsRefTime, unitMetricVcsRefTime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefTime, descrMetricVcsRefTime, unitMetricVcsRefTime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsRefTime, descrMetricVcsRefTime,
-                                           unitMetricVcsRefTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsRefTime, descrMetricVcsRefTime,
-                                            unitMetricVcsRefTime);
-}
-
-/**
- * The number of repositories in an organization.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricVcsRepositoryCount = "vcs.repository.count";
-static constexpr const char *descrMetricVcsRepositoryCount =
-    "The number of repositories in an organization.";
-static constexpr const char *unitMetricVcsRepositoryCount = "{repository}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount,
-                                         unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount,
-                                          unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount, unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount, unitMetricVcsRepositoryCount);
-}
-
-}  // namespace vcs
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/shared_ptr.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/shared_ptr.h
deleted file mode 100644
index 8b855b08c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/shared_ptr.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/shared_ptr.h"
-
-#include <memory>  // IWYU pragma: export
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-
-// nostd::shared_ptr<T...>
-template <class... _Types>
-using shared_ptr = std::shared_ptr<_Types...>;
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/span.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/span.h
deleted file mode 100644
index 5d20e0227..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/span.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/span.h"
-
-#include "opentelemetry/version.h"
-
-// Standard library implementation requires at least C++17 compiler.
-// Older C++14 compilers may provide support for __has_include as a
-// conforming extension.
-#if defined __has_include
-#  if __has_include(<version>)  // Check for __cpp_{feature}
-#    include <version>
-#    if defined(__cpp_lib_span) && __cplusplus > 201703L
-#      define OPENTELEMETRY_HAVE_SPAN
-#    endif
-#  endif
-#  if !defined(OPENTELEMETRY_HAVE_SPAN)
-#    // Check for Visual Studio span
-#    if defined(_MSVC_LANG) && _HAS_CXX20
-#      define OPENTELEMETRY_HAVE_SPAN
-#    endif
-#    // Check for other compiler span implementation
-#    if !defined(_MSVC_LANG) && __has_include(<span>) && __cplusplus > 201703L
-// This works as long as compiler standard is set to C++20
-#      define OPENTELEMETRY_HAVE_SPAN
-#    endif
-#  endif
-#  if !__has_include(<gsl/gsl>)
-#    undef HAVE_GSL
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_SPAN)
-#  if defined(HAVE_GSL)
-#    include <type_traits>
-// Guidelines Support Library provides an implementation of std::span
-#    include <gsl/gsl>
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-using gsl::dynamic_extent;
-template <class ElementType, std::size_t Extent = gsl::dynamic_extent>
-using span = gsl::span<ElementType, Extent>;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#    define OPENTELEMETRY_HAVE_SPAN
-#  else
-// No `gsl::span`, no `std::span`, fallback to `nostd::span`
-#  endif
-
-#else  // OPENTELEMETRY_HAVE_SPAN
-// Using std::span (https://wg21.link/P0122R7) from Standard Library available in C++20 :
-// - GCC libstdc++ 10+
-// - Clang libc++ 7
-// - MSVC Standard Library 19.26*
-// - Apple Clang 10.0.0*
-#  include <limits>
-#  include <span>
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-constexpr std::size_t dynamic_extent = (std::numeric_limits<std::size_t>::max)();
-
-template <class ElementType, std::size_t Extent = nostd::dynamic_extent>
-using span = std::span<ElementType, Extent>;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif  // if OPENTELEMETRY_HAVE_SPAN
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/string_view.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/string_view.h
deleted file mode 100644
index d0f0c0812..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/string_view.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/string_view.h"
-
-#include <string_view>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-
-// nostd::string_view
-using string_view = std::string_view;
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/type_traits.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/type_traits.h
deleted file mode 100644
index 2d75f49fd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/type_traits.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/type_traits.h"
-
-#include <type_traits>  // IWYU pragma: keep
-
-#include "opentelemetry/version.h"  // IWYU pragma: keep
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/unique_ptr.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/unique_ptr.h
deleted file mode 100644
index 4b25b7c38..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/unique_ptr.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/unique_ptr.h"
-
-#include <memory>  // IWYU pragma: export
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-
-// nostd::unique_ptr<T...>
-template <class... _Types>
-using unique_ptr = std::unique_ptr<_Types...>;
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/utility.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/utility.h
deleted file mode 100644
index d1f5614d7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/utility.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/utility.h"
-
-#include <cstddef>
-#include <utility>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-
-//
-// Backport of std::data
-//
-// See https://en.cppreference.com/w/cpp/iterator/data
-//
-template <class C>
-auto data(C &c) noexcept(noexcept(c.data())) -> decltype(c.data())
-{
-  return c.data();
-}
-
-template <class C>
-auto data(const C &c) noexcept(noexcept(c.data())) -> decltype(c.data())
-{
-  return c.data();
-}
-
-template <class T, std::size_t N>
-T *data(T (&array)[N]) noexcept
-{
-  return array;
-}
-
-template <class E>
-const E *data(std::initializer_list<E> list) noexcept
-{
-  return list.begin();
-}
-
-//
-// Backport of std::size
-//
-// See https://en.cppreference.com/w/cpp/iterator/size
-//
-template <class C>
-auto size(const C &c) noexcept(noexcept(c.size())) -> decltype(c.size())
-{
-  return c.size();
-}
-
-template <class T, std::size_t N>
-std::size_t size(T (& /* array */)[N]) noexcept
-{
-  return N;
-}
-
-template <std::size_t N>
-using make_index_sequence = std::make_index_sequence<N>;
-
-template <std::size_t... Ints>
-using index_sequence = std::index_sequence<Ints...>;
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/variant.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/variant.h
deleted file mode 100644
index 58bc510c5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/std/variant.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/variant.h"
-
-#include "opentelemetry/version.h"
-
-#include <cstddef>
-#include <memory>
-#include <utility>
-#include <variant>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-using std::get_if;
-using std::monostate;
-using std::variant_alternative_t;
-
-// nostd::variant<...>
-template <class... _Types>
-using variant = std::variant<_Types...>;
-
-template <class... _Types>
-using variant_size = std::variant_size<_Types...>;
-
-using monostate = std::monostate;
-
-#if defined(__APPLE__) && defined(_LIBCPP_USE_AVAILABILITY_APPLE)
-// Apple Platforms provide std::bad_variant_access only in newer versions of OS.
-// To keep API compatible with any version of OS - we are providing our own
-// implementation of nostd::bad_variant_access exception.
-#  if __EXCEPTIONS
-
-// nostd::bad_variant_access
-class bad_variant_access : public std::exception
-{
-public:
-  virtual const char *what() const noexcept override { return "bad_variant_access"; }
-};
-
-[[noreturn]] inline void throw_bad_variant_access()
-{
-  throw bad_variant_access{};
-}
-#  endif
-
-#  if __EXCEPTIONS
-#    define THROW_BAD_VARIANT_ACCESS throw_bad_variant_access()
-#  else
-#    define THROW_BAD_VARIANT_ACCESS std::terminate()
-#  endif
-
-//
-// nostd::get<...> for Apple Clang
-//
-template <typename T, class... Types>
-constexpr auto get_type = [](auto &&t) constexpr -> decltype(auto) {
-  auto v      = t;
-  auto result = std::get_if<T>(&v);  // TODO: optimize with std::forward(t) if t is not rvalue
-  if (result)
-  {
-    return *result;
-  }
-  THROW_BAD_VARIANT_ACCESS;
-  return *result;
-};
-
-template <std::size_t I, class... Types>
-constexpr auto get_index = [](auto &&t) constexpr -> decltype(auto) {
-  auto v      = t;
-  auto result = std::get_if<I>(&v);  // TODO: optimize with std::forward(t) if t is not rvalue
-  if (result)
-  {
-    return *result;
-  }
-  THROW_BAD_VARIANT_ACCESS;
-  return *result;
-};
-
-template <std::size_t I, class... Types>
-constexpr std::variant_alternative_t<I, std::variant<Types...>> &get(std::variant<Types...> &v)
-{
-  return get_index<I, Types...>(v);
-};
-
-template <std::size_t I, class... Types>
-constexpr std::variant_alternative_t<I, std::variant<Types...>> &&get(std::variant<Types...> &&v)
-{
-  return get_index<I, Types...>(std::forward<decltype(v)>(v));
-};
-
-template <std::size_t I, class... Types>
-constexpr const std::variant_alternative_t<I, std::variant<Types...>> &get(
-    const std::variant<Types...> &v)
-{
-  return get_index<I, Types...>(v);
-};
-
-template <std::size_t I, class... Types>
-constexpr const std::variant_alternative_t<I, std::variant<Types...>> &&get(
-    const std::variant<Types...> &&v)
-{
-  return get_index<I, Types...>(std::forward<decltype(v)>(v));
-};
-
-template <class T, class... Types>
-constexpr T &get(std::variant<Types...> &v)
-{
-  return get_type<T, Types...>(v);
-};
-
-template <class T, class... Types>
-constexpr T /*&&*/ get(std::variant<Types...> &&v)
-{
-  return get_type<T, Types...>(v);
-};
-
-template <class T, class... Types>
-constexpr const T &get(const std::variant<Types...> &v)
-{
-  return get_type<T, Types...>(v);
-};
-
-template <class T, class... Types>
-constexpr const T &&get(const std::variant<Types...> &&v)
-{
-  return get_type<T, Types...>(std::forward<decltype(v)>(v));
-};
-
-template <class _Callable, class... _Variants>
-constexpr auto visit(_Callable &&_Obj, _Variants &&..._Args)
-{
-  // Ref:
-  // https://stackoverflow.com/questions/52310835/xcode-10-call-to-unavailable-function-stdvisit
-  return std::__variant_detail::__visitation::__variant::__visit_value(_Obj, _Args...);
-};
-
-#else
-using std::bad_variant_access;
-
-template <std::size_t I, class... Types>
-constexpr std::variant_alternative_t<I, std::variant<Types...>> &get(std::variant<Types...> &v)
-{
-  return std::get<I, Types...>(v);
-}
-
-template <std::size_t I, class... Types>
-constexpr std::variant_alternative_t<I, std::variant<Types...>> &&get(std::variant<Types...> &&v)
-{
-  return std::get<I, Types...>(std::forward<decltype(v)>(v));
-}
-
-template <std::size_t I, class... Types>
-constexpr const std::variant_alternative_t<I, std::variant<Types...>> &get(
-    const std::variant<Types...> &v)
-{
-  return std::get<I, Types...>(v);
-}
-
-template <std::size_t I, class... Types>
-constexpr const std::variant_alternative_t<I, std::variant<Types...>> &&get(
-    const std::variant<Types...> &&v)
-{
-  return std::get<I, Types...>(std::forward<decltype(v)>(v));
-}
-
-template <class T, class... Types>
-constexpr T &get(std::variant<Types...> &v)
-{
-  return std::get<T, Types...>(v);
-}
-
-template <class T, class... Types>
-constexpr T &&get(std::variant<Types...> &&v)
-{
-  return std::get<T, Types...>(std::forward<decltype(v)>(v));
-}
-
-template <class T, class... Types>
-constexpr const T &get(const std::variant<Types...> &v)
-{
-  return std::get<T, Types...>(v);
-}
-
-template <class T, class... Types>
-constexpr const T &&get(const std::variant<Types...> &&v)
-{
-  return std::get<T, Types...>(std::forward<decltype(v)>(v));
-}
-
-template <class _Callable, class... _Variants>
-constexpr auto visit(_Callable &&_Obj, _Variants &&..._Args)
-{
-  return std::visit<_Callable, _Variants...>(static_cast<_Callable &&>(_Obj),
-                                             static_cast<_Variants &&>(_Args)...);
-}
-
-#endif
-
-/*
-# if _HAS_CXX20
-template <class _Ret, class _Callable, class... _Variants>
-constexpr _Ret visit(_Callable &&_Obj, _Variants &&... _Args)
-{
-  return std::visit<_Ret, _Callable, _Variants...>(
-      static_cast<_Callable &&>(_Obj),
-      static_cast<_Variants &&>(_Args)...);
-};
-# endif
-*/
-
-// nostd::holds_alternative
-template <std::size_t I, typename... Ts>
-inline constexpr bool holds_alternative(const variant<Ts...> &v) noexcept
-{
-  return v.index() == I;
-}
-
-template <typename T, typename... Ts>
-inline constexpr bool holds_alternative(const variant<Ts...> &v) noexcept
-{
-  return std::holds_alternative<T, Ts...>(v);
-}
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/context.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/context.h
deleted file mode 100644
index 08b1e327c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/context.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-// Get Span from explicit context
-inline nostd::shared_ptr<Span> GetSpan(const context::Context &context) noexcept
-{
-  context::ContextValue span = context.GetValue(kSpanKey);
-  if (nostd::holds_alternative<nostd::shared_ptr<Span>>(span))
-  {
-    return nostd::get<nostd::shared_ptr<Span>>(span);
-  }
-  return nostd::shared_ptr<Span>(new DefaultSpan(SpanContext::GetInvalid()));
-}
-
-inline bool IsRootSpan(const context::Context &context) noexcept
-{
-  context::ContextValue is_root_span = context.GetValue(kIsRootSpanKey);
-  if (nostd::holds_alternative<bool>(is_root_span))
-  {
-    return nostd::get<bool>(is_root_span);
-  }
-  return false;
-}
-
-// Set Span into explicit context
-inline context::Context SetSpan(context::Context &context,
-                                const nostd::shared_ptr<Span> &span) noexcept
-{
-  return context.SetValue(kSpanKey, span);
-}
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/default_span.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/default_span.h
deleted file mode 100644
index 1677a32ea..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/default_span.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * DefaultSpan provides a non-operational Span that propagates
- * the tracer context by wrapping it inside the Span object.
- */
-
-class DefaultSpan : public Span
-{
-public:
-  // Returns an invalid span.
-  static DefaultSpan GetInvalid() { return DefaultSpan(SpanContext::GetInvalid()); }
-
-  trace::SpanContext GetContext() const noexcept override { return span_context_; }
-
-  bool IsRecording() const noexcept override { return false; }
-
-  void SetAttribute(nostd::string_view /* key */,
-                    const common::AttributeValue & /* value */) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /* name */) noexcept override {}
-
-  void AddEvent(nostd::string_view /* name */,
-                common::SystemTimestamp /* timestamp */) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /* name */,
-                const common::KeyValueIterable & /* attributes */) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /* name */,
-                common::SystemTimestamp /* timestamp */,
-                const common::KeyValueIterable & /* attributes */) noexcept override
-  {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void AddLink(const SpanContext & /* target */,
-               const common::KeyValueIterable & /* attrs */) noexcept override
-  {}
-
-  void AddLinks(const SpanContextKeyValueIterable & /* links */) noexcept override {}
-#endif
-
-  void SetStatus(StatusCode /* status */, nostd::string_view /* description */) noexcept override {}
-
-  void UpdateName(nostd::string_view /* name */) noexcept override {}
-
-  void End(const EndSpanOptions & /* options */) noexcept override {}
-
-  nostd::string_view ToString() const noexcept { return "DefaultSpan"; }
-
-  DefaultSpan(SpanContext span_context) noexcept : span_context_(std::move(span_context)) {}
-
-  // movable and copiable
-  DefaultSpan(DefaultSpan &&spn) noexcept : Span(), span_context_(spn.GetContext()) {}
-  DefaultSpan(const DefaultSpan &spn) noexcept : Span(), span_context_(spn.GetContext()) {}
-
-private:
-  SpanContext span_context_;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/noop.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/noop.h
deleted file mode 100644
index 14e7c9c33..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/noop.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-// Please refer to provider.h for documentation on how to obtain a Tracer object.
-//
-// This file is part of the internal implementation of OpenTelemetry. Nothing in this file should be
-// used directly. Please refer to span.h and tracer.h for documentation on these interfaces.
-
-#include <stdint.h>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-namespace trace_api = opentelemetry::trace;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-/**
- * No-op implementation of Span. This class should not be used directly.
- */
-class OPENTELEMETRY_EXPORT NoopSpan final : public Span
-{
-public:
-  explicit NoopSpan(const std::shared_ptr<Tracer> &tracer) noexcept
-      : tracer_{tracer}, span_context_{new SpanContext(false, false)}
-  {}
-
-  explicit NoopSpan(const std::shared_ptr<Tracer> &tracer,
-                    nostd::unique_ptr<SpanContext> span_context) noexcept
-      : tracer_{tracer}, span_context_{std::move(span_context)}
-  {}
-
-  void SetAttribute(nostd::string_view /*key*/,
-                    const common::AttributeValue & /*value*/) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /*name*/) noexcept override {}
-
-  void AddEvent(nostd::string_view /*name*/,
-                common::SystemTimestamp /*timestamp*/) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /* name */,
-                const common::KeyValueIterable & /* attributes */) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /*name*/,
-                common::SystemTimestamp /*timestamp*/,
-                const common::KeyValueIterable & /*attributes*/) noexcept override
-  {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void AddLink(const SpanContext & /* target */,
-               const common::KeyValueIterable & /* attrs */) noexcept override
-  {}
-
-  void AddLinks(const SpanContextKeyValueIterable & /* links */) noexcept override {}
-#endif
-
-  void SetStatus(StatusCode /*code*/, nostd::string_view /*description*/) noexcept override {}
-
-  void UpdateName(nostd::string_view /*name*/) noexcept override {}
-
-  void End(const EndSpanOptions & /*options*/) noexcept override {}
-
-  bool IsRecording() const noexcept override { return false; }
-
-  SpanContext GetContext() const noexcept override { return *span_context_.get(); }
-
-private:
-  std::shared_ptr<Tracer> tracer_;
-  nostd::unique_ptr<SpanContext> span_context_;
-};
-
-/**
- * No-op implementation of Tracer.
- */
-class OPENTELEMETRY_EXPORT NoopTracer final : public Tracer,
-                                              public std::enable_shared_from_this<NoopTracer>
-{
-public:
-  // Tracer
-  NoopTracer()
-  {
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    UpdateEnabled(false);
-#endif
-  }
-
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view /*name*/,
-                                    const common::KeyValueIterable & /*attributes*/,
-                                    const SpanContextKeyValueIterable & /*links*/,
-                                    const StartSpanOptions & /*options*/) noexcept override
-  {
-    // Don't allocate a no-op span for every StartSpan call, but use a static
-    // singleton for this case.
-    static nostd::shared_ptr<trace::Span> noop_span(new trace::NoopSpan{this->shared_from_this()});
-
-    return noop_span;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-
-  void ForceFlushWithMicroseconds(uint64_t /*timeout*/) noexcept override {}
-
-  void CloseWithMicroseconds(uint64_t /*timeout*/) noexcept override {}
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-};
-
-/**
- * No-op implementation of a TracerProvider.
- */
-class OPENTELEMETRY_EXPORT NoopTracerProvider final : public trace::TracerProvider
-{
-public:
-  NoopTracerProvider() noexcept
-      : tracer_{nostd::shared_ptr<trace::NoopTracer>(new trace::NoopTracer)}
-  {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<trace::Tracer> GetTracer(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */,
-      const common::KeyValueIterable * /* attributes */) noexcept override
-  {
-    return tracer_;
-  }
-#else
-  nostd::shared_ptr<trace::Tracer> GetTracer(nostd::string_view /* name */,
-                                             nostd::string_view /* version */,
-                                             nostd::string_view /* schema_url */) noexcept override
-  {
-    return tracer_;
-  }
-#endif
-
-private:
-  nostd::shared_ptr<trace::Tracer> tracer_;
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/b3_propagator.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/b3_propagator.h
deleted file mode 100644
index a13d2f076..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/b3_propagator.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <array>
-
-#include "detail/hex.h"
-#include "detail/string.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-
-static const nostd::string_view kB3CombinedHeader = "b3";
-
-static const nostd::string_view kB3TraceIdHeader = "X-B3-TraceId";
-static const nostd::string_view kB3SpanIdHeader  = "X-B3-SpanId";
-static const nostd::string_view kB3SampledHeader = "X-B3-Sampled";
-
-/*
-     B3, single header:
-                   b3: 80f198ee56343ba864fe8b2a57d3eff7-e457b5a2e4d86bd1-1-05e3ac9a4f6e3b90
-                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^ ^ ^^^^^^^^^^^^^^^^
-                       0          TraceId            31 33  SpanId    48 | 52 ParentSpanId 68
-                                                                        50 Debug flag
-     Multiheader version:                                           X-B3-Sampled
-                             X-B3-TraceId                X-B3-SpanId    X-B3-ParentSpanId (ignored)
-*/
-
-static const int kTraceIdHexStrLength = 32;
-static const int kSpanIdHexStrLength  = 16;
-
-// The B3PropagatorExtractor class provides an interface that enables extracting context from
-// headers of HTTP requests. HTTP frameworks and clients can integrate with B3Propagator by
-// providing the object containing the headers, and a getter function for the extraction. Based on:
-// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/context/api-propagators.md#b3-extract
-
-class B3PropagatorExtractor : public context::propagation::TextMapPropagator
-{
-public:
-  // Returns the context that is stored in the HTTP header carrier.
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    SpanContext span_context = ExtractImpl(carrier);
-    nostd::shared_ptr<Span> sp{new DefaultSpan(span_context)};
-    if (span_context.IsValid())
-    {
-      return trace::SetSpan(context, sp);
-    }
-    else
-    {
-      return context;
-    }
-  }
-
-  static TraceId TraceIdFromHex(nostd::string_view trace_id)
-  {
-    uint8_t buf[kTraceIdHexStrLength / 2];
-    detail::HexToBinary(trace_id, buf, sizeof(buf));
-    return TraceId(buf);
-  }
-
-  static SpanId SpanIdFromHex(nostd::string_view span_id)
-  {
-    uint8_t buf[kSpanIdHexStrLength / 2];
-    detail::HexToBinary(span_id, buf, sizeof(buf));
-    return SpanId(buf);
-  }
-
-  static TraceFlags TraceFlagsFromHex(nostd::string_view trace_flags)
-  {
-    if (trace_flags.length() != 1 || (trace_flags[0] != '1' && trace_flags[0] != 'd'))
-    {  // check for invalid length of flags and treat 'd' as sampled
-      return TraceFlags(0);
-    }
-    return TraceFlags(TraceFlags::kIsSampled);
-  }
-
-private:
-  static SpanContext ExtractImpl(const context::propagation::TextMapCarrier &carrier)
-  {
-    nostd::string_view trace_id_hex;
-    nostd::string_view span_id_hex;
-    nostd::string_view trace_flags_hex;
-
-    // first let's try a single-header variant
-    auto singleB3Header = carrier.Get(kB3CombinedHeader);
-    if (!singleB3Header.empty())
-    {
-      std::array<nostd::string_view, 3> fields{};
-      // https://github.com/openzipkin/b3-propagation/blob/master/RATIONALE.md
-      if (detail::SplitString(singleB3Header, '-', fields.data(), 3) < 2)
-      {
-        return SpanContext::GetInvalid();
-      }
-
-      trace_id_hex    = fields[0];
-      span_id_hex     = fields[1];
-      trace_flags_hex = fields[2];
-    }
-    else
-    {
-      trace_id_hex    = carrier.Get(kB3TraceIdHeader);
-      span_id_hex     = carrier.Get(kB3SpanIdHeader);
-      trace_flags_hex = carrier.Get(kB3SampledHeader);
-    }
-
-    if (!detail::IsValidHex(trace_id_hex) || !detail::IsValidHex(span_id_hex))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    TraceId trace_id = TraceIdFromHex(trace_id_hex);
-    SpanId span_id   = SpanIdFromHex(span_id_hex);
-
-    if (!trace_id.IsValid() || !span_id.IsValid())
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    return SpanContext(trace_id, span_id, TraceFlagsFromHex(trace_flags_hex), true);
-  }
-};
-
-// The B3Propagator class provides interface that enables extracting and injecting context into
-// single header of HTTP Request.
-class B3Propagator : public B3PropagatorExtractor
-{
-public:
-  // Sets the context for a HTTP header carrier with self defined rules.
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    SpanContext span_context = trace::GetSpan(context)->GetContext();
-    if (!span_context.IsValid())
-    {
-      return;
-    }
-
-    char trace_identity[kTraceIdHexStrLength + kSpanIdHexStrLength + 3];
-    static_assert(sizeof(trace_identity) == 51, "b3 trace identity buffer size mismatch");
-    span_context.trace_id().ToLowerBase16(nostd::span<char, 2 * TraceId::kSize>{
-        &trace_identity[0], static_cast<std::size_t>(kTraceIdHexStrLength)});
-    trace_identity[kTraceIdHexStrLength] = '-';
-    span_context.span_id().ToLowerBase16(nostd::span<char, 2 * SpanId::kSize>{
-        &trace_identity[kTraceIdHexStrLength + 1], static_cast<std::size_t>(kSpanIdHexStrLength)});
-    trace_identity[kTraceIdHexStrLength + kSpanIdHexStrLength + 1] = '-';
-    trace_identity[kTraceIdHexStrLength + kSpanIdHexStrLength + 2] =
-        span_context.trace_flags().IsSampled() ? '1' : '0';
-
-    carrier.Set(kB3CombinedHeader, nostd::string_view(trace_identity, sizeof(trace_identity)));
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return callback(kB3CombinedHeader);
-  }
-};
-
-class B3PropagatorMultiHeader : public B3PropagatorExtractor
-{
-public:
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    SpanContext span_context = GetSpan(context)->GetContext();
-    if (!span_context.IsValid())
-    {
-      return;
-    }
-    char trace_id[32];
-    TraceId(span_context.trace_id()).ToLowerBase16(trace_id);
-    char span_id[16];
-    SpanId(span_context.span_id()).ToLowerBase16(span_id);
-    char trace_flags[2];
-    TraceFlags(span_context.trace_flags()).ToLowerBase16(trace_flags);
-    carrier.Set(kB3TraceIdHeader, nostd::string_view(trace_id, sizeof(trace_id)));
-    carrier.Set(kB3SpanIdHeader, nostd::string_view(span_id, sizeof(span_id)));
-    carrier.Set(kB3SampledHeader, nostd::string_view(trace_flags + 1, 1));
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return callback(kB3TraceIdHeader) && callback(kB3SpanIdHeader) && callback(kB3SampledHeader);
-  }
-};
-
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/detail/hex.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/detail/hex.h
deleted file mode 100644
index 3bf66e84b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/detail/hex.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-#include <cstdint>
-#include <cstring>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-// NOTE - code within `detail` namespace implements internal details, and not part
-// of the public interface.
-namespace detail
-{
-
-constexpr int8_t kHexDigits[256] = {
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-};
-
-inline int8_t HexToInt(char c)
-{
-  return kHexDigits[uint8_t(c)];
-}
-
-inline bool IsValidHex(nostd::string_view s)
-{
-  return std::all_of(s.begin(), s.end(), [](char c) { return HexToInt(c) != -1; });
-}
-
-/**
- * Converts a hexadecimal to binary format if the hex string will fit the buffer.
- * Smaller hex strings are left padded with zeroes.
- */
-inline bool HexToBinary(nostd::string_view hex, uint8_t *buffer, size_t buffer_size)
-{
-  std::memset(buffer, 0, buffer_size);
-
-  if (hex.size() > buffer_size * 2)
-  {
-    return false;
-  }
-
-  int64_t hex_size     = int64_t(hex.size());
-  int64_t buffer_pos   = int64_t(buffer_size) - (hex_size + 1) / 2;
-  int64_t last_hex_pos = hex_size - 1;
-
-  bool is_hex_size_odd = (hex_size % 2) == 1;
-  int64_t i            = 0;
-
-  if (is_hex_size_odd)
-  {
-    buffer[buffer_pos++] = HexToInt(hex[i++]);
-  }
-
-  for (; i < last_hex_pos; i += 2)
-  {
-    buffer[buffer_pos++] = (HexToInt(hex[i]) << 4) | HexToInt(hex[i + 1]);
-  }
-
-  return true;
-}
-
-}  // namespace detail
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/detail/string.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/detail/string.h
deleted file mode 100644
index de4699952..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/detail/string.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-// NOTE - code within `detail` namespace implements internal details, and not part
-// of the public interface.
-namespace detail
-{
-
-/**
- * Splits a string by separator, up to given buffer count words.
- * Returns the amount of words the input was split into.
- */
-inline size_t SplitString(nostd::string_view s,
-                          char separator,
-                          nostd::string_view *results,
-                          size_t count)
-{
-  if (count == 0)
-  {
-    return count;
-  }
-
-  size_t filled      = 0;
-  size_t token_start = 0;
-  for (size_t i = 0; i < s.size(); i++)
-  {
-    if (s[i] != separator)
-    {
-      continue;
-    }
-
-    results[filled++] = s.substr(token_start, i - token_start);
-
-    if (filled == count)
-    {
-      return count;
-    }
-
-    token_start = i + 1;
-  }
-
-  if (filled < count)
-  {
-    results[filled++] = s.substr(token_start);
-  }
-
-  return filled;
-}
-
-}  // namespace detail
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/http_trace_context.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/http_trace_context.h
deleted file mode 100644
index 81d4c308e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/http_trace_context.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <array>
-
-#include "detail/hex.h"
-#include "detail/string.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-static const nostd::string_view kTraceParent = "traceparent";
-static const nostd::string_view kTraceState  = "tracestate";
-static const size_t kVersionSize             = 2;
-static const size_t kTraceIdSize             = 32;
-static const size_t kSpanIdSize              = 16;
-static const size_t kTraceFlagsSize          = 2;
-static const size_t kTraceParentSize         = 55;
-
-// The HttpTraceContext provides methods to extract and inject
-// context into headers of HTTP requests with traces.
-// Example:
-//    HttpTraceContext().Inject(carrier, context);
-//    HttpTraceContext().Extract(carrier, context);
-
-class HttpTraceContext : public context::propagation::TextMapPropagator
-{
-public:
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    SpanContext span_context = trace::GetSpan(context)->GetContext();
-    if (!span_context.IsValid())
-    {
-      return;
-    }
-    InjectImpl(carrier, span_context);
-  }
-
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    SpanContext span_context = ExtractImpl(carrier);
-    nostd::shared_ptr<Span> sp{new DefaultSpan(span_context)};
-    if (span_context.IsValid())
-    {
-      return trace::SetSpan(context, sp);
-    }
-    else
-    {
-      return context;
-    }
-  }
-
-  static TraceId TraceIdFromHex(nostd::string_view trace_id)
-  {
-    uint8_t buf[kTraceIdSize / 2];
-    detail::HexToBinary(trace_id, buf, sizeof(buf));
-    return TraceId(buf);
-  }
-
-  static SpanId SpanIdFromHex(nostd::string_view span_id)
-  {
-    uint8_t buf[kSpanIdSize / 2];
-    detail::HexToBinary(span_id, buf, sizeof(buf));
-    return SpanId(buf);
-  }
-
-  static TraceFlags TraceFlagsFromHex(nostd::string_view trace_flags)
-  {
-    uint8_t flags;
-    detail::HexToBinary(trace_flags, &flags, sizeof(flags));
-    return TraceFlags(flags);
-  }
-
-private:
-  static constexpr uint8_t kInvalidVersion        = 0xFF;
-  static constexpr uint8_t kDefaultAssumedVersion = 0x00;
-
-  static void InjectImpl(context::propagation::TextMapCarrier &carrier,
-                         const SpanContext &span_context)
-  {
-    char trace_parent[kTraceParentSize];
-    trace_parent[0] = '0';
-    trace_parent[1] = '0';
-    trace_parent[2] = '-';
-    span_context.trace_id().ToLowerBase16(
-        nostd::span<char, 2 * TraceId::kSize>{&trace_parent[3], kTraceIdSize});
-    trace_parent[kTraceIdSize + 3] = '-';
-    span_context.span_id().ToLowerBase16(
-        nostd::span<char, 2 * SpanId::kSize>{&trace_parent[kTraceIdSize + 4], kSpanIdSize});
-    trace_parent[kTraceIdSize + kSpanIdSize + 4] = '-';
-    span_context.trace_flags().ToLowerBase16(
-        nostd::span<char, 2>{&trace_parent[kTraceIdSize + kSpanIdSize + 5], 2});
-
-    carrier.Set(kTraceParent, nostd::string_view(trace_parent, sizeof(trace_parent)));
-    const auto trace_state = span_context.trace_state()->ToHeader();
-    if (!trace_state.empty())
-    {
-      carrier.Set(kTraceState, trace_state);
-    }
-  }
-
-  static SpanContext ExtractContextFromTraceHeaders(nostd::string_view trace_parent,
-                                                    nostd::string_view trace_state)
-  {
-    std::array<nostd::string_view, 4> fields{};
-    if (detail::SplitString(trace_parent, '-', fields.data(), 4) != 4)
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    nostd::string_view version_hex     = fields[0];
-    nostd::string_view trace_id_hex    = fields[1];
-    nostd::string_view span_id_hex     = fields[2];
-    nostd::string_view trace_flags_hex = fields[3];
-
-    if (version_hex.size() != kVersionSize || trace_id_hex.size() != kTraceIdSize ||
-        span_id_hex.size() != kSpanIdSize || trace_flags_hex.size() != kTraceFlagsSize)
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    if (!detail::IsValidHex(version_hex) || !detail::IsValidHex(trace_id_hex) ||
-        !detail::IsValidHex(span_id_hex) || !detail::IsValidHex(trace_flags_hex))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    // hex is valid, convert it to binary
-    uint8_t version_binary;
-    detail::HexToBinary(version_hex, &version_binary, sizeof(version_binary));
-    if (version_binary == kInvalidVersion)
-    {
-      // invalid version encountered
-      return SpanContext::GetInvalid();
-    }
-
-    // See https://www.w3.org/TR/trace-context/#versioning-of-traceparent
-    if (version_binary > kDefaultAssumedVersion)
-    {
-      // higher than default version detected
-      if (trace_parent.size() < kTraceParentSize)
-      {
-        return SpanContext::GetInvalid();
-      }
-    }
-    else
-    {
-      // version is either lower or same as the default version
-      if (trace_parent.size() != kTraceParentSize)
-      {
-        return SpanContext::GetInvalid();
-      }
-    }
-
-    TraceId trace_id = TraceIdFromHex(trace_id_hex);
-    SpanId span_id   = SpanIdFromHex(span_id_hex);
-
-    if (!trace_id.IsValid() || !span_id.IsValid())
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    return SpanContext(trace_id, span_id, TraceFlagsFromHex(trace_flags_hex), true,
-                       trace::TraceState::FromHeader(trace_state));
-  }
-
-  static SpanContext ExtractImpl(const context::propagation::TextMapCarrier &carrier)
-  {
-    // Get trace_parent after trimming the leading and trailing whitespaces
-    nostd::string_view trace_parent = common::StringUtil::Trim(carrier.Get(kTraceParent));
-    nostd::string_view trace_state  = carrier.Get(kTraceState);
-    if (trace_parent == "")
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    return ExtractContextFromTraceHeaders(trace_parent, trace_state);
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return (callback(kTraceParent) && callback(kTraceState));
-  }
-};
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/jaeger.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/jaeger.h
deleted file mode 100644
index 45a937091..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/propagation/jaeger.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "detail/hex.h"
-#include "detail/string.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-
-static const nostd::string_view kJaegerTraceHeader = "uber-trace-id";
-
-class JaegerPropagator : public context::propagation::TextMapPropagator
-{
-public:
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    SpanContext span_context = trace::GetSpan(context)->GetContext();
-    if (!span_context.IsValid())
-    {
-      return;
-    }
-
-    const size_t trace_id_length = 32;
-    const size_t span_id_length  = 16;
-
-    // trace-id(32):span-id(16):0:debug(2)
-    char trace_identity[trace_id_length + span_id_length + 6];
-    span_context.trace_id().ToLowerBase16(
-        nostd::span<char, 2 * TraceId::kSize>{&trace_identity[0], trace_id_length});
-    trace_identity[trace_id_length] = ':';
-    span_context.span_id().ToLowerBase16(
-        nostd::span<char, 2 * SpanId::kSize>{&trace_identity[trace_id_length + 1], span_id_length});
-    trace_identity[trace_id_length + span_id_length + 1] = ':';
-    trace_identity[trace_id_length + span_id_length + 2] = '0';
-    trace_identity[trace_id_length + span_id_length + 3] = ':';
-    trace_identity[trace_id_length + span_id_length + 4] = '0';
-    trace_identity[trace_id_length + span_id_length + 5] = span_context.IsSampled() ? '1' : '0';
-
-    carrier.Set(kJaegerTraceHeader, nostd::string_view(trace_identity, sizeof(trace_identity)));
-  }
-
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    SpanContext span_context = ExtractImpl(carrier);
-    nostd::shared_ptr<Span> sp{new DefaultSpan(span_context)};
-    if (span_context.IsValid())
-    {
-      return trace::SetSpan(context, sp);
-    }
-    else
-    {
-      return context;
-    }
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return callback(kJaegerTraceHeader);
-  }
-
-private:
-  static constexpr uint8_t kIsSampled = 0x01;
-
-  static TraceFlags GetTraceFlags(uint8_t jaeger_flags)
-  {
-    uint8_t sampled = jaeger_flags & kIsSampled;
-    return TraceFlags(sampled);
-  }
-
-  static SpanContext ExtractImpl(const context::propagation::TextMapCarrier &carrier)
-  {
-    nostd::string_view trace_identity = carrier.Get(kJaegerTraceHeader);
-
-    const size_t trace_field_count = 4;
-    nostd::string_view trace_fields[trace_field_count];
-
-    if (detail::SplitString(trace_identity, ':', trace_fields, trace_field_count) !=
-        trace_field_count)
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    nostd::string_view trace_id_hex = trace_fields[0];
-    nostd::string_view span_id_hex  = trace_fields[1];
-    nostd::string_view flags_hex    = trace_fields[3];
-
-    if (!detail::IsValidHex(trace_id_hex) || !detail::IsValidHex(span_id_hex) ||
-        !detail::IsValidHex(flags_hex))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    uint8_t trace_id[16];
-    if (!detail::HexToBinary(trace_id_hex, trace_id, sizeof(trace_id)))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    uint8_t span_id[8];
-    if (!detail::HexToBinary(span_id_hex, span_id, sizeof(span_id)))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    uint8_t flags;
-    if (!detail::HexToBinary(flags_hex, &flags, sizeof(flags)))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    return SpanContext(TraceId(trace_id), SpanId(span_id), GetTraceFlags(flags), true);
-  }
-};
-
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/provider.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/provider.h
deleted file mode 100644
index 7e22dc69f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/provider.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * Stores the singleton global TracerProvider.
- */
-class OPENTELEMETRY_EXPORT Provider
-{
-public:
-  /**
-   * Returns the singleton TracerProvider.
-   *
-   * By default, a no-op TracerProvider is returned. This will never return a
-   * nullptr TracerProvider.
-   */
-  static nostd::shared_ptr<TracerProvider> GetTracerProvider() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<TracerProvider>(GetProvider());
-  }
-
-  /**
-   * Changes the singleton TracerProvider.
-   */
-  static void SetTracerProvider(const nostd::shared_ptr<TracerProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetProvider() = tp;
-  }
-
-private:
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<TracerProvider> &GetProvider() noexcept
-  {
-    static nostd::shared_ptr<TracerProvider> provider(new NoopTracerProvider);
-    return provider;
-  }
-
-  OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
-  {
-    static common::SpinLockMutex lock;
-    return lock;
-  }
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/scope.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/scope.h
deleted file mode 100644
index 20c415cc7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/scope.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * Controls how long a span is active.
- *
- * On creation of the Scope object, the given span is set to the currently
- * active span. On destruction, the given span is ended and the previously
- * active span will be the currently active span again.
- */
-class Scope final
-{
-public:
-  /**
-   * Initialize a new scope.
-   * @param span the given span will be set as the currently active span.
-   */
-  Scope(const nostd::shared_ptr<Span> &span) noexcept
-      : token_(context::RuntimeContext::Attach(
-            context::RuntimeContext::GetCurrent().SetValue(kSpanKey, span)))
-  {}
-
-private:
-  nostd::unique_ptr<context::Token> token_;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/semantic_conventions.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/semantic_conventions.h
deleted file mode 100644
index 2f043dcf5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/semantic_conventions.h
+++ /dev/null
@@ -1,5111 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This file is DEPRECATED, and no longer updated.
- * See file DEPRECATED.md for details.
- */
-
-#ifdef OPENTELEMETRY_NO_DEPRECATED_CODE
-#  error "header <trace/semantic_conventions.h> is deprecated."
-#endif
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-namespace SemanticConventions
-{
-/**
- * The URL of the OpenTelemetry schema for these keys and values.
- */
-static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.27.0";
-
-/**
- * Uniquely identifies the framework API revision offered by a version ({@code os.version}) of the
- * android operating system. More information can be found <a
- * href="https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels">here</a>.
- */
-static constexpr const char *kAndroidOsApiLevel = "android.os.api_level";
-
-/**
- * The provenance filename of the built attestation which directly relates to the build artifact
- * filename. This filename SHOULD accompany the artifact at publish time. See the <a
- * href="https://slsa.dev/spec/v1.0/distributing-provenance#relationship-between-artifacts-and-attestations">SLSA
- * Relationship</a> specification for more information.
- */
-static constexpr const char *kArtifactAttestationFilename = "artifact.attestation.filename";
-
-/**
- * The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
- * glossary)</a>, of the built attestation. Some envelopes in the software attestation space also
- * refer to this as the <a
- * href="https://github.com/in-toto/attestation/blob/main/spec/README.md#in-toto-attestation-framework-spec">digest</a>.
- */
-static constexpr const char *kArtifactAttestationHash = "artifact.attestation.hash";
-
-/**
- * The id of the build <a href="https://slsa.dev/attestation-model">software attestation</a>.
- */
-static constexpr const char *kArtifactAttestationId = "artifact.attestation.id";
-
-/**
- * The human readable file name of the artifact, typically generated during build and release
-processes. Often includes the package name and version in the file name.
- *
- * <p>Notes:
-  <ul> <li>This file name can also act as the <a
-href="https://slsa.dev/spec/v1.0/terminology#package-model">Package Name</a> in cases where the
-package ecosystem maps accordingly. Additionally, the artifact <a
-href="https://slsa.dev/spec/v1.0/terminology#software-supply-chain">can be published</a> for others,
-but that is not a guarantee.</li> </ul>
- */
-static constexpr const char *kArtifactFilename = "artifact.filename";
-
-/**
- * The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
-glossary)</a>, often found in checksum.txt on a release of the artifact and used to verify package
-integrity.
- *
- * <p>Notes:
-  <ul> <li>The specific algorithm used to create the cryptographic hash value is
-not defined. In situations where an artifact has multiple
-cryptographic hashes, it is up to the implementer to choose which
-hash value to set here; this should be the most secure hash algorithm
-that is suitable for the situation and consistent with the
-corresponding attestation. The implementer can then provide the other
-hash values through an additional set of attribute extensions as they
-deem necessary.</li> </ul>
- */
-static constexpr const char *kArtifactHash = "artifact.hash";
-
-/**
- * The <a href="https://github.com/package-url/purl-spec">Package URL</a> of the <a
- * href="https://slsa.dev/spec/v1.0/terminology#package-model">package artifact</a> provides a
- * standard way to identify and locate the packaged artifact.
- */
-static constexpr const char *kArtifactPurl = "artifact.purl";
-
-/**
- * The version of the artifact.
- */
-static constexpr const char *kArtifactVersion = "artifact.version";
-
-/**
- * Rate-limiting result, shows whether the lease was acquired or contains a rejection reason
- */
-static constexpr const char *kAspnetcoreRateLimitingResult = "aspnetcore.rate_limiting.result";
-
-/**
- * Full type name of the <a
- * href="https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.diagnostics.iexceptionhandler">{@code
- * IExceptionHandler}</a> implementation that handled the exception.
- */
-static constexpr const char *kAspnetcoreDiagnosticsHandlerType =
-    "aspnetcore.diagnostics.handler.type";
-
-/**
- * ASP.NET Core exception middleware handling result
- */
-static constexpr const char *kAspnetcoreDiagnosticsExceptionResult =
-    "aspnetcore.diagnostics.exception.result";
-
-/**
- * Rate limiting policy name.
- */
-static constexpr const char *kAspnetcoreRateLimitingPolicy = "aspnetcore.rate_limiting.policy";
-
-/**
- * Flag indicating if request was handled by the application pipeline.
- */
-static constexpr const char *kAspnetcoreRequestIsUnhandled = "aspnetcore.request.is_unhandled";
-
-/**
- * A value that indicates whether the matched route is a fallback route.
- */
-static constexpr const char *kAspnetcoreRoutingIsFallback = "aspnetcore.routing.is_fallback";
-
-/**
- * Match result - success or failure
- */
-static constexpr const char *kAspnetcoreRoutingMatchStatus = "aspnetcore.routing.match_status";
-
-/**
- * The AWS request ID as returned in the response headers {@code x-amz-request-id} or {@code
- * x-amz-requestid}.
- */
-static constexpr const char *kAwsRequestId = "aws.request_id";
-
-/**
- * The JSON-serialized value of each item in the {@code AttributeDefinitions} request field.
- */
-static constexpr const char *kAwsDynamodbAttributeDefinitions =
-    "aws.dynamodb.attribute_definitions";
-
-/**
- * The value of the {@code AttributesToGet} request parameter.
- */
-static constexpr const char *kAwsDynamodbAttributesToGet = "aws.dynamodb.attributes_to_get";
-
-/**
- * The value of the {@code ConsistentRead} request parameter.
- */
-static constexpr const char *kAwsDynamodbConsistentRead = "aws.dynamodb.consistent_read";
-
-/**
- * The JSON-serialized value of each item in the {@code ConsumedCapacity} response field.
- */
-static constexpr const char *kAwsDynamodbConsumedCapacity = "aws.dynamodb.consumed_capacity";
-
-/**
- * The value of the {@code Count} response parameter.
- */
-static constexpr const char *kAwsDynamodbCount = "aws.dynamodb.count";
-
-/**
- * The value of the {@code ExclusiveStartTableName} request parameter.
- */
-static constexpr const char *kAwsDynamodbExclusiveStartTable = "aws.dynamodb.exclusive_start_table";
-
-/**
- * The JSON-serialized value of each item in the {@code GlobalSecondaryIndexUpdates} request field.
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexUpdates =
-    "aws.dynamodb.global_secondary_index_updates";
-
-/**
- * The JSON-serialized value of each item of the {@code GlobalSecondaryIndexes} request field
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexes =
-    "aws.dynamodb.global_secondary_indexes";
-
-/**
- * The value of the {@code IndexName} request parameter.
- */
-static constexpr const char *kAwsDynamodbIndexName = "aws.dynamodb.index_name";
-
-/**
- * The JSON-serialized value of the {@code ItemCollectionMetrics} response field.
- */
-static constexpr const char *kAwsDynamodbItemCollectionMetrics =
-    "aws.dynamodb.item_collection_metrics";
-
-/**
- * The value of the {@code Limit} request parameter.
- */
-static constexpr const char *kAwsDynamodbLimit = "aws.dynamodb.limit";
-
-/**
- * The JSON-serialized value of each item of the {@code LocalSecondaryIndexes} request field.
- */
-static constexpr const char *kAwsDynamodbLocalSecondaryIndexes =
-    "aws.dynamodb.local_secondary_indexes";
-
-/**
- * The value of the {@code ProjectionExpression} request parameter.
- */
-static constexpr const char *kAwsDynamodbProjection = "aws.dynamodb.projection";
-
-/**
- * The value of the {@code ProvisionedThroughput.ReadCapacityUnits} request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedReadCapacity =
-    "aws.dynamodb.provisioned_read_capacity";
-
-/**
- * The value of the {@code ProvisionedThroughput.WriteCapacityUnits} request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedWriteCapacity =
-    "aws.dynamodb.provisioned_write_capacity";
-
-/**
- * The value of the {@code ScanIndexForward} request parameter.
- */
-static constexpr const char *kAwsDynamodbScanForward = "aws.dynamodb.scan_forward";
-
-/**
- * The value of the {@code ScannedCount} response parameter.
- */
-static constexpr const char *kAwsDynamodbScannedCount = "aws.dynamodb.scanned_count";
-
-/**
- * The value of the {@code Segment} request parameter.
- */
-static constexpr const char *kAwsDynamodbSegment = "aws.dynamodb.segment";
-
-/**
- * The value of the {@code Select} request parameter.
- */
-static constexpr const char *kAwsDynamodbSelect = "aws.dynamodb.select";
-
-/**
- * The number of items in the {@code TableNames} response parameter.
- */
-static constexpr const char *kAwsDynamodbTableCount = "aws.dynamodb.table_count";
-
-/**
- * The keys in the {@code RequestItems} object field.
- */
-static constexpr const char *kAwsDynamodbTableNames = "aws.dynamodb.table_names";
-
-/**
- * The value of the {@code TotalSegments} request parameter.
- */
-static constexpr const char *kAwsDynamodbTotalSegments = "aws.dynamodb.total_segments";
-
-/**
- * The ID of a running ECS task. The ID MUST be extracted from {@code task.arn}.
- */
-static constexpr const char *kAwsEcsTaskId = "aws.ecs.task.id";
-
-/**
- * The ARN of an <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html">ECS cluster</a>.
- */
-static constexpr const char *kAwsEcsClusterArn = "aws.ecs.cluster.arn";
-
-/**
- * The Amazon Resource Name (ARN) of an <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html">ECS
- * container instance</a>.
- */
-static constexpr const char *kAwsEcsContainerArn = "aws.ecs.container.arn";
-
-/**
- * The <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html">launch
- * type</a> for an ECS task.
- */
-static constexpr const char *kAwsEcsLaunchtype = "aws.ecs.launchtype";
-
-/**
- * The ARN of a running <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids">ECS
- * task</a>.
- */
-static constexpr const char *kAwsEcsTaskArn = "aws.ecs.task.arn";
-
-/**
- * The family name of the <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html">ECS task
- * definition</a> used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskFamily = "aws.ecs.task.family";
-
-/**
- * The revision for the task definition used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskRevision = "aws.ecs.task.revision";
-
-/**
- * The ARN of an EKS cluster.
- */
-static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn";
-
-/**
- * The Amazon Resource Name(s) (ARN) of the AWS log group(s).
- *
- * <p>Notes:
-  <ul> <li>See the <a
- href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
- group ARN format documentation</a>.</li> </ul>
- */
-static constexpr const char *kAwsLogGroupArns = "aws.log.group.arns";
-
-/**
- * The name(s) of the AWS log group(s) an application is writing to.
- *
- * <p>Notes:
-  <ul> <li>Multiple log groups must be supported for cases like multi-container applications, where
- a single application has sidecar containers, and each write to their own log group.</li> </ul>
- */
-static constexpr const char *kAwsLogGroupNames = "aws.log.group.names";
-
-/**
- * The ARN(s) of the AWS log stream(s).
- *
- * <p>Notes:
-  <ul> <li>See the <a
- href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
- stream ARN format documentation</a>. One log group can contain several log streams, so these ARNs
- necessarily identify both a log group and a log stream.</li> </ul>
- */
-static constexpr const char *kAwsLogStreamArns = "aws.log.stream.arns";
-
-/**
- * The name(s) of the AWS log stream(s) an application is writing to.
- */
-static constexpr const char *kAwsLogStreamNames = "aws.log.stream.names";
-
-/**
- * The full invoked ARN as provided on the {@code Context} passed to the function ({@code
- Lambda-Runtime-Invoked-Function-Arn} header on the {@code /runtime/invocation/next} applicable).
- *
- * <p>Notes:
-  <ul> <li>This may be different from {@code cloud.resource_id} if an alias is involved.</li> </ul>
- */
-static constexpr const char *kAwsLambdaInvokedArn = "aws.lambda.invoked_arn";
-
-/**
- * The S3 bucket name the request refers to. Corresponds to the {@code --bucket} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
- *
- * <p>Notes:
-  <ul> <li>The {@code bucket} attribute is applicable to all S3 operations that reference a bucket,
-i.e. that require the bucket name as a mandatory parameter. This applies to almost all S3 operations
-except {@code list-buckets}.</li> </ul>
- */
-static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
-
-/**
- * The source object (in the form {@code bucket}/{@code key}) for the copy operation.
- *
- * <p>Notes:
-  <ul> <li>The {@code copy_source} attribute applies to S3 copy operations and corresponds to the
-{@code --copy-source} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object operation
-within the S3 API</a>. This applies in particular to the following operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3CopySource = "aws.s3.copy_source";
-
-/**
- * The delete request container that specifies the objects to be deleted.
- *
- * <p>Notes:
-  <ul> <li>The {@code delete} attribute is only applicable to the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a>
-operation. The {@code delete} attribute corresponds to the {@code --delete} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-objects.html">delete-objects
-operation within the S3 API</a>.</li> </ul>
- */
-static constexpr const char *kAwsS3Delete = "aws.s3.delete";
-
-/**
- * The S3 object key the request refers to. Corresponds to the {@code --key} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
- *
- * <p>Notes:
-  <ul> <li>The {@code key} attribute is applicable to all object-related S3 operations, i.e. that
-require the object key as a mandatory parameter. This applies in particular to the following
-operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/get-object.html">get-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/head-object.html">head-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/put-object.html">put-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html">restore-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/select-object-content.html">select-object-content</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/create-multipart-upload.html">create-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3Key = "aws.s3.key";
-
-/**
- * The part number of the part being uploaded in a multipart-upload operation. This is a positive
-integer between 1 and 10,000.
- *
- * <p>Notes:
-  <ul> <li>The {@code part_number} attribute is only applicable to the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a> and
-<a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a>
-operations. The {@code part_number} attribute corresponds to the {@code --part-number} parameter of
-the <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part
-operation within the S3 API</a>.</li> </ul>
- */
-static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
-
-/**
- * Upload ID that identifies the multipart upload.
- *
- * <p>Notes:
-  <ul> <li>The {@code upload_id} attribute applies to S3 multipart-upload operations and corresponds
-to the {@code --upload-id} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
-operations. This applies in particular to the following operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3UploadId = "aws.s3.upload_id";
-
-/**
- * The unique identifier of the service request. It's generated by the Azure service and returned
- * with the response.
- */
-static constexpr const char *kAzServiceRequestId = "az.service_request_id";
-
-/**
- * Array of brand name and version separated by a space
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
- href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
- navigator.userAgentData.brands}).</li> </ul>
- */
-static constexpr const char *kBrowserBrands = "browser.brands";
-
-/**
- * Preferred language of the user using the browser
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the Navigator API {@code
- navigator.language}.</li> </ul>
- */
-static constexpr const char *kBrowserLanguage = "browser.language";
-
-/**
- * A boolean that is true if the browser is running on a mobile device
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
- href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
- navigator.userAgentData.mobile}). If unavailable, this attribute SHOULD be left unset.</li> </ul>
- */
-static constexpr const char *kBrowserMobile = "browser.mobile";
-
-/**
- * The platform on which the browser is running
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
-href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
-navigator.userAgentData.platform}). If unavailable, the legacy {@code navigator.platform} API SHOULD
-NOT be used instead and this attribute SHOULD be left unset in order for the values to be
-consistent. The list of possible values is defined in the <a
-href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-platform">W3C User-Agent Client Hints
-specification</a>. Note that some (but not all) of these values can overlap with values in the <a
-href="./os.md">{@code os.type} and {@code os.name} attributes</a>. However, for consistency, the
-values in the {@code browser.platform} attribute should capture the exact value that the user agent
-provides.</li> </ul>
- */
-static constexpr const char *kBrowserPlatform = "browser.platform";
-
-/**
- * The human readable name of the pipeline within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineName = "cicd.pipeline.name";
-
-/**
- * The unique identifier of a pipeline run within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineRunId = "cicd.pipeline.run.id";
-
-/**
- * The human readable name of a task within a pipeline. Task here most closely aligns with a <a
- * href="https://en.wikipedia.org/wiki/Pipeline_(computing)">computing process</a> in a pipeline.
- * Other terms for tasks include commands, steps, and procedures.
- */
-static constexpr const char *kCicdPipelineTaskName = "cicd.pipeline.task.name";
-
-/**
- * The unique identifier of a task run within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskRunId = "cicd.pipeline.task.run.id";
-
-/**
- * The <a href="https://en.wikipedia.org/wiki/URL">URL</a> of the pipeline run providing the
- * complete address in order to locate and identify the pipeline run.
- */
-static constexpr const char *kCicdPipelineTaskRunUrlFull = "cicd.pipeline.task.run.url.full";
-
-/**
- * The type of the task within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskType = "cicd.pipeline.task.type";
-
-/**
- * Client address - domain name if available without reverse DNS lookup; otherwise, IP address or
- Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the server side, and when communicating through an intermediary,
- {@code client.address} SHOULD represent the client address behind any intermediaries,  for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kClientAddress = "client.address";
-
-/**
- * Client port number.
- *
- * <p>Notes:
-  <ul> <li>When observed from the server side, and when communicating through an intermediary,
- {@code client.port} SHOULD represent the client port behind any intermediaries,  for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kClientPort = "client.port";
-
-/**
- * The cloud account ID the resource is assigned to.
- */
-static constexpr const char *kCloudAccountId = "cloud.account.id";
-
-/**
- * Cloud regions often have multiple, isolated locations known as zones to increase availability.
- Availability zone represents the zone where the resource is running.
- *
- * <p>Notes:
-  <ul> <li>Availability zones are called &quot;zones&quot; on Alibaba Cloud and Google Cloud.</li>
- </ul>
- */
-static constexpr const char *kCloudAvailabilityZone = "cloud.availability_zone";
-
-/**
- * The cloud platform in use.
- *
- * <p>Notes:
-  <ul> <li>The prefix of the service SHOULD match the one specified in {@code cloud.provider}.</li>
- </ul>
- */
-static constexpr const char *kCloudPlatform = "cloud.platform";
-
-/**
- * Name of the cloud provider.
- */
-static constexpr const char *kCloudProvider = "cloud.provider";
-
-/**
- * The geographical region the resource is running.
- *
- * <p>Notes:
-  <ul> <li>Refer to your provider's docs to see the available regions, for example <a
- href="https://www.alibabacloud.com/help/doc-detail/40654.htm">Alibaba Cloud regions</a>, <a
- href="https://aws.amazon.com/about-aws/global-infrastructure/regions_az/">AWS regions</a>, <a
- href="https://azure.microsoft.com/global-infrastructure/geographies/">Azure regions</a>, <a
- href="https://cloud.google.com/about/locations">Google Cloud regions</a>, or <a
- href="https://www.tencentcloud.com/document/product/213/6091">Tencent Cloud regions</a>.</li> </ul>
- */
-static constexpr const char *kCloudRegion = "cloud.region";
-
-/**
- * Cloud provider-specific native identifier of the monitored cloud resource (e.g. an <a
-href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a> on AWS, a
-<a href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">fully qualified
-resource ID</a> on Azure, a <a
-href="https://cloud.google.com/apis/design/resource_names#full_resource_name">full resource name</a>
-on GCP)
- *
- * <p>Notes:
-  <ul> <li>On some cloud providers, it may not be possible to determine the full ID at startup,
-so it may be necessary to set {@code cloud.resource_id} as a span attribute instead.</li><li>The
-exact value to use for {@code cloud.resource_id} depends on the cloud provider. The following
-well-known definitions MUST be used if you set this attribute and they apply:</li><li><strong>AWS
-Lambda:</strong> The function <a
-href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take care
-not to use the &quot;invoked ARN&quot; directly but replace any <a
-href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a> with
-the resolved function version, as the same runtime instance may be invocable with multiple different
-aliases.</li> <li><strong>GCP:</strong> The <a
-href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a></li>
-<li><strong>Azure:</strong> The <a
-href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
-ID</a> of the invoked function, <em>not</em> the function app, having the form
-{@code
-/subscriptions/<SUBSCIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC>}.
-This means that a span attribute MUST be used, as an Azure function app can host multiple functions
-that would usually share a TracerProvider.</li>
- </ul>
- */
-static constexpr const char *kCloudResourceId = "cloud.resource_id";
-
-/**
- * The <a href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id">event_id</a>
- * uniquely identifies the event.
- */
-static constexpr const char *kCloudeventsEventId = "cloudevents.event_id";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#source-1">source</a>
- * identifies the context in which an event happened.
- */
-static constexpr const char *kCloudeventsEventSource = "cloudevents.event_source";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#specversion">version of
- * the CloudEvents specification</a> which the event uses.
- */
-static constexpr const char *kCloudeventsEventSpecVersion = "cloudevents.event_spec_version";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#subject">subject</a> of
- * the event in the context of the event producer (identified by source).
- */
-static constexpr const char *kCloudeventsEventSubject = "cloudevents.event_subject";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type">event_type</a>
- * contains a value describing the type of event related to the originating occurrence.
- */
-static constexpr const char *kCloudeventsEventType = "cloudevents.event_type";
-
-/**
- * The column number in {@code code.filepath} best representing the operation. It SHOULD point
- * within the code unit named in {@code code.function}.
- */
-static constexpr const char *kCodeColumn = "code.column";
-
-/**
- * The source code file name that identifies the code unit as uniquely as possible (preferably an
- * absolute file path).
- */
-static constexpr const char *kCodeFilepath = "code.filepath";
-
-/**
- * The method or function name, or equivalent (usually rightmost part of the code unit's name).
- */
-static constexpr const char *kCodeFunction = "code.function";
-
-/**
- * The line number in {@code code.filepath} best representing the operation. It SHOULD point within
- * the code unit named in {@code code.function}.
- */
-static constexpr const char *kCodeLineno = "code.lineno";
-
-/**
- * The &quot;namespace&quot; within which {@code code.function} is defined. Usually the qualified
- * class or module name, such that {@code code.namespace} + some separator + {@code code.function}
- * form a unique identifier for the code unit.
- */
-static constexpr const char *kCodeNamespace = "code.namespace";
-
-/**
- * A stacktrace as a string in the natural representation for the language runtime. The
- * representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kCodeStacktrace = "code.stacktrace";
-
-/**
- * The command used to run the container (i.e. the command name).
- *
- * <p>Notes:
-  <ul> <li>If using embedded credentials or sensitive data, it is recommended to remove them to
- prevent potential leakage.</li> </ul>
- */
-static constexpr const char *kContainerCommand = "container.command";
-
-/**
- * All the command arguments (including the command/executable itself) run by the container. [2]
- */
-static constexpr const char *kContainerCommandArgs = "container.command_args";
-
-/**
- * The full command run by the container as a single string representing the full command. [2]
- */
-static constexpr const char *kContainerCommandLine = "container.command_line";
-
-/**
- * Container ID. Usually a UUID, as for example used to <a
- * href="https://docs.docker.com/engine/reference/run/#container-identification">identify Docker
- * containers</a>. The UUID might be abbreviated.
- */
-static constexpr const char *kContainerId = "container.id";
-
-/**
- * Runtime specific image identifier. Usually a hash algorithm followed by a UUID.
- *
- * <p>Notes:
-  <ul> <li>Docker defines a sha256 of the image id; {@code container.image.id} corresponds to the
-{@code Image} field from the Docker container inspect <a
-href="https://docs.docker.com/engine/api/v1.43/#tag/Container/operation/ContainerInspect">API</a>
-endpoint. K8s defines a link to the container registry repository with digest {@code "imageID":
-"registry.azurecr.io
-/namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"}.
-The ID is assigned by the container runtime and can vary in different environments. Consider using
-{@code oci.manifest.digest} if it is important to identify the same image in different
-environments/runtimes.</li> </ul>
- */
-static constexpr const char *kContainerImageId = "container.image.id";
-
-/**
- * Name of the image the container was built on.
- */
-static constexpr const char *kContainerImageName = "container.image.name";
-
-/**
- * Repo digests of the container image as provided by the container runtime.
- *
- * <p>Notes:
-  <ul> <li><a
- href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker</a> and <a
- href="https://github.com/kubernetes/cri-api/blob/c75ef5b473bbe2d0a4fc92f82235efd665ea8e9f/pkg/apis/runtime/v1/api.proto#L1237-L1238">CRI</a>
- report those under the {@code RepoDigests} field.</li> </ul>
- */
-static constexpr const char *kContainerImageRepoDigests = "container.image.repo_digests";
-
-/**
- * Container image tags. An example can be found in <a
- * href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker Image
- * Inspect</a>. Should be only the {@code <tag>} section of the full name for example from {@code
- * registry.example.com/my-org/my-image:<tag>}.
- */
-static constexpr const char *kContainerImageTags = "container.image.tags";
-
-/**
- * Container name used by container runtime.
- */
-static constexpr const char *kContainerName = "container.name";
-
-/**
- * The container runtime managing this container.
- */
-static constexpr const char *kContainerRuntime = "container.runtime";
-
-/**
- * The mode of the CPU
- */
-static constexpr const char *kCpuMode = "cpu.mode";
-
-/**
- * The name of the connection pool; unique within the instrumented application. In case the
- * connection pool implementation doesn't provide a name, instrumentation SHOULD use a combination
- * of parameters that would make the name unique, for example, combining attributes {@code
- * server.address}, {@code server.port}, and {@code db.namespace}, formatted as {@code
- * server.address:server.port/db.namespace}. Instrumentations that generate connection pool name
- * following different patterns SHOULD document it.
- */
-static constexpr const char *kDbClientConnectionPoolName = "db.client.connection.pool.name";
-
-/**
- * The state of a connection in the pool
- */
-static constexpr const char *kDbClientConnectionState = "db.client.connection.state";
-
-/**
- * The name of a collection (table, container) within the database.
- *
- * <p>Notes:
-  <ul> <li>It is RECOMMENDED to capture the value as provided by the application without attempting
-to do any case normalization. If the collection name is parsed from the query text, it SHOULD be the
-first collection name found in the query and it SHOULD match the value provided in the query text
-including any schema and database name prefix. For batch operations, if the individual operations
-are known to have the same collection name then that collection name SHOULD be used, otherwise
-{@code db.collection.name} SHOULD NOT be captured.</li> </ul>
- */
-static constexpr const char *kDbCollectionName = "db.collection.name";
-
-/**
- * The name of the database, fully qualified within the server address and port.
- *
- * <p>Notes:
-  <ul> <li>If a database system has multiple namespace components, they SHOULD be concatenated
-(potentially using database system specific conventions) from most general to most specific
-namespace component, and more specific namespaces SHOULD NOT be captured without the more general
-namespaces, to ensure that &quot;startswith&quot; queries for the more general namespaces will be
-valid. Semantic conventions for individual database systems SHOULD document what {@code
-db.namespace} means in the context of that system. It is RECOMMENDED to capture the value as
-provided by the application without attempting to do any case normalization.</li> </ul>
- */
-static constexpr const char *kDbNamespace = "db.namespace";
-
-/**
- * The number of queries included in a <a
- href="/docs/database/database-spans.md#batch-operations">batch operation</a>.
- *
- * <p>Notes:
-  <ul> <li>Operations are only considered batches when they contain two or more operations, and so
- {@code db.operation.batch.size} SHOULD never be {@code 1}.</li> </ul>
- */
-static constexpr const char *kDbOperationBatchSize = "db.operation.batch.size";
-
-/**
- * The name of the operation or command being executed.
- *
- * <p>Notes:
-  <ul> <li>It is RECOMMENDED to capture the value as provided by the application without attempting
-to do any case normalization. If the operation name is parsed from the query text, it SHOULD be the
-first operation name found in the query. For batch operations, if the individual operations are
-known to have the same operation name then that operation name SHOULD be used prepended by {@code
-BATCH}, otherwise {@code db.operation.name} SHOULD be {@code BATCH} or some other database system
-specific term if more applicable.</li> </ul>
- */
-static constexpr const char *kDbOperationName = "db.operation.name";
-
-/**
- * The database query being executed.
- *
- * <p>Notes:
-  <ul> <li>For sanitization see <a
-href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of {@code
-db.query.text}</a>. For batch operations, if the individual operations are known to have the same
-query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD
-be concatenated with separator {@code ;} or some other database system specific separator if more
-applicable. Even though parameterized query text can potentially have sensitive data, by using a
-parameterized query the user is giving a strong signal that any sensitive data will be passed as
-parameter values, and the benefit to observability of capturing the static part of the query text by
-default outweighs the risk.</li> </ul>
- */
-static constexpr const char *kDbQueryText = "db.query.text";
-
-/**
- * The database management system (DBMS) product as identified by the client instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The actual DBMS may differ from the one identified by the client. For example, when using
- PostgreSQL client libraries to connect to a CockroachDB, the {@code db.system} is set to {@code
- postgresql} based on the instrumentation's best knowledge.</li> </ul>
- */
-static constexpr const char *kDbSystem = "db.system";
-
-/**
- * The consistency level of the query. Based on consistency values from <a
- * href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
- */
-static constexpr const char *kDbCassandraConsistencyLevel = "db.cassandra.consistency_level";
-
-/**
- * The data center of the coordinating node for a query.
- */
-static constexpr const char *kDbCassandraCoordinatorDc = "db.cassandra.coordinator.dc";
-
-/**
- * The ID of the coordinating node for a query.
- */
-static constexpr const char *kDbCassandraCoordinatorId = "db.cassandra.coordinator.id";
-
-/**
- * Whether or not the query is idempotent.
- */
-static constexpr const char *kDbCassandraIdempotence = "db.cassandra.idempotence";
-
-/**
- * The fetch size used for paging, i.e. how many rows will be returned at once.
- */
-static constexpr const char *kDbCassandraPageSize = "db.cassandra.page_size";
-
-/**
- * The number of times a query was speculatively executed. Not set or {@code 0} if the query was not
- * executed speculatively.
- */
-static constexpr const char *kDbCassandraSpeculativeExecutionCount =
-    "db.cassandra.speculative_execution_count";
-
-/**
- * Unique Cosmos client instance id.
- */
-static constexpr const char *kDbCosmosdbClientId = "db.cosmosdb.client_id";
-
-/**
- * Cosmos client connection mode.
- */
-static constexpr const char *kDbCosmosdbConnectionMode = "db.cosmosdb.connection_mode";
-
-/**
- * CosmosDB Operation Type.
- */
-static constexpr const char *kDbCosmosdbOperationType = "db.cosmosdb.operation_type";
-
-/**
- * RU consumed for that operation
- */
-static constexpr const char *kDbCosmosdbRequestCharge = "db.cosmosdb.request_charge";
-
-/**
- * Request payload size in bytes
- */
-static constexpr const char *kDbCosmosdbRequestContentLength = "db.cosmosdb.request_content_length";
-
-/**
- * Cosmos DB status code.
- */
-static constexpr const char *kDbCosmosdbStatusCode = "db.cosmosdb.status_code";
-
-/**
- * Cosmos DB sub status code.
- */
-static constexpr const char *kDbCosmosdbSubStatusCode = "db.cosmosdb.sub_status_code";
-
-/**
- * Represents the human-readable identifier of the node/instance to which a request was routed.
- */
-static constexpr const char *kDbElasticsearchNodeName = "db.elasticsearch.node.name";
-
-/**
- * Name of the <a href="https://wikipedia.org/wiki/Deployment_environment">deployment
-environment</a> (aka deployment tier).
- *
- * <p>Notes:
-  <ul> <li>{@code deployment.environment.name} does not affect the uniqueness constraints defined
-through the {@code service.namespace}, {@code service.name} and {@code service.instance.id} resource
-attributes. This implies that resources carrying the following attribute combinations MUST be
-considered to be identifying the same service:</li><li>{@code service.name=frontend}, {@code
-deployment.environment.name=production}</li> <li>{@code service.name=frontend}, {@code
-deployment.environment.name=staging}.</li>
- </ul>
- */
-static constexpr const char *kDeploymentEnvironmentName = "deployment.environment.name";
-
-/**
- * The id of the deployment.
- */
-static constexpr const char *kDeploymentId = "deployment.id";
-
-/**
- * The name of the deployment.
- */
-static constexpr const char *kDeploymentName = "deployment.name";
-
-/**
- * The status of the deployment.
- */
-static constexpr const char *kDeploymentStatus = "deployment.status";
-
-/**
- * Deprecated use the {@code device.app.lifecycle} event definition including {@code android.state}
- as a payload field instead.
- *
- * <p>Notes:
-  <ul> <li>The Android lifecycle states are defined in <a
- href="https://developer.android.com/guide/components/activities/activity-lifecycle#lc">Activity
- lifecycle callbacks</a>, and from which the {@code OS identifiers} are derived.</li> </ul>
- */
-static constexpr const char *kAndroidState = "android.state";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraTable = "db.cassandra.table";
-
-/**
- * Deprecated, use {@code server.address}, {@code server.port} attributes instead.
- *
- * @deprecated Deprecated, use `server.address`, `server.port` attributes instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbConnectionString = "db.connection_string";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbContainer =
-    "db.cosmosdb.container";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchClusterName =
-    "db.elasticsearch.cluster.name";
-
-/**
- * Deprecated, no general replacement at this time. For Elasticsearch, use {@code
- * db.elasticsearch.node.name} instead.
- *
- * @deprecated Deprecated, no general replacement at this time. For Elasticsearch, use
- * `db.elasticsearch.node.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbInstanceId = "db.instance.id";
-
-/**
- * Removed, no replacement at this time.
- *
- * @deprecated Removed, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbJdbcDriverClassname =
-    "db.jdbc.driver_classname";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMongodbCollection =
-    "db.mongodb.collection";
-
-/**
- * Deprecated, SQL Server instance is now populated as a part of {@code db.namespace} attribute.
- *
- * @deprecated Deprecated, SQL Server instance is now populated as a part of `db.namespace`
- * attribute.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMssqlInstanceName =
-    "db.mssql.instance_name";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbName = "db.name";
-
-/**
- * Deprecated, use {@code db.operation.name} instead.
- *
- * @deprecated Deprecated, use `db.operation.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbOperation = "db.operation";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
-    "db.redis.database_index";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSqlTable = "db.sql.table";
-
-/**
- * The database statement being executed.
- *
- * @deprecated The database statement being executed.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbStatement = "db.statement";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbUser = "db.user";
-
-/**
- * Deprecated, use {@code db.client.connection.pool.name} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsPoolName =
-    "db.client.connections.pool.name";
-
-/**
- * Deprecated, use {@code db.client.connection.state} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.state` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsState =
-    "db.client.connections.state";
-
-/**
- * Deprecated, use {@code db.client.connection.pool.name} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name";
-
-/**
- * Deprecated, use {@code db.client.connection.state} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.state` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state";
-
-/**
- * 'Deprecated, use {@code deployment.environment.name} instead.'
- *
- * @deprecated 'Deprecated, use `deployment.environment.name` instead.'.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment =
-    "deployment.environment";
-
-/**
- * Deprecated, use {@code user.id} instead.
- *
- * @deprecated Deprecated, use `user.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserId = "enduser.id";
-
-/**
- * Deprecated, use {@code user.roles} instead.
- *
- * @deprecated Deprecated, use `user.roles` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope";
-
-/**
- * Deprecated, use {@code gen_ai.usage.output_tokens} instead.
- *
- * @deprecated Deprecated, use `gen_ai.usage.output_tokens` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens =
-    "gen_ai.usage.completion_tokens";
-
-/**
- * Deprecated, use {@code gen_ai.usage.input_tokens} instead.
- *
- * @deprecated Deprecated, use `gen_ai.usage.input_tokens` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens =
-    "gen_ai.usage.prompt_tokens";
-
-/**
- * Deprecated, use {@code client.address} instead.
- *
- * @deprecated Deprecated, use `client.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip";
-
-/**
- * Deprecated, use {@code network.protocol.name} instead.
- *
- * @deprecated Deprecated, use `network.protocol.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
-
-/**
- * Deprecated, use one of {@code server.address}, {@code client.address} or {@code
- * http.request.header.host} instead, depending on the usage.
- *
- * @deprecated Deprecated, use one of `server.address`, `client.address` or
- * `http.request.header.host` instead, depending on the usage.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host";
-
-/**
- * Deprecated, use {@code http.request.method} instead.
- *
- * @deprecated Deprecated, use `http.request.method` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method";
-
-/**
- * Deprecated, use {@code http.request.header.content-length} instead.
- *
- * @deprecated Deprecated, use `http.request.header.content-length` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength =
-    "http.request_content_length";
-
-/**
- * Deprecated, use {@code http.request.body.size} instead.
- *
- * @deprecated Deprecated, use `http.request.body.size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed =
-    "http.request_content_length_uncompressed";
-
-/**
- * Deprecated, use {@code http.response.header.content-length} instead.
- *
- * @deprecated Deprecated, use `http.response.header.content-length` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength =
-    "http.response_content_length";
-
-/**
- * Deprecated, use {@code http.response.body.size} instead.
- *
- * @deprecated Deprecated, use `http.response.body.size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed =
-    "http.response_content_length_uncompressed";
-
-/**
- * Deprecated, use {@code url.scheme} instead.
- *
- * @deprecated Deprecated, use `url.scheme` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme";
-
-/**
- * Deprecated, use {@code server.address} instead.
- *
- * @deprecated Deprecated, use `server.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name";
-
-/**
- * Deprecated, use {@code http.response.status_code} instead.
- *
- * @deprecated Deprecated, use `http.response.status_code` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code";
-
-/**
- * Deprecated, use {@code url.path} and {@code url.query} instead.
- *
- * @deprecated Deprecated, use `url.path` and `url.query` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target";
-
-/**
- * Deprecated, use {@code url.full} instead.
- *
- * @deprecated Deprecated, use `url.full` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url";
-
-/**
- * Deprecated, use {@code user_agent.original} instead.
- *
- * @deprecated Deprecated, use `user_agent.original` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent";
-
-/**
- * Deprecated use the {@code device.app.lifecycle} event definition including {@code ios.state} as a
- payload field instead.
- *
- * <p>Notes:
-  <ul> <li>The iOS lifecycle states are defined in the <a
- href="https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902">UIApplicationDelegate
- documentation</a>, and from which the {@code OS terminology} column values are derived.</li> </ul>
- *
- * @deprecated Deprecated use the `device.app.lifecycle` event definition including `ios.state` as a
- payload field instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kIosState = "ios.state";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous =
-    "messaging.destination_publish.anonymous";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName =
-    "messaging.destination_publish.name";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup =
-    "messaging.eventhubs.consumer.group";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup =
-    "messaging.kafka.consumer.group";
-
-/**
- * Deprecated, use {@code messaging.destination.partition.id} instead.
- *
- * @deprecated Deprecated, use `messaging.destination.partition.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
-    "messaging.kafka.destination.partition";
-
-/**
- * Deprecated, use {@code messaging.kafka.offset} instead.
- *
- * @deprecated Deprecated, use `messaging.kafka.offset` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset =
-    "messaging.kafka.message.offset";
-
-/**
- * Deprecated, use {@code messaging.operation.type} instead.
- *
- * @deprecated Deprecated, use `messaging.operation.type` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup =
-    "messaging.rocketmq.client_group";
-
-/**
- * Deprecated, use {@code messaging.servicebus.destination.subscription_name} instead.
- *
- * @deprecated Deprecated, use `messaging.servicebus.destination.subscription_name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *kMessagingServicebusDestinationSubscriptionName =
-        "messaging.servicebus.destination.subscription_name";
-
-/**
- * Deprecated, use {@code network.local.address}.
- *
- * @deprecated Deprecated, use `network.local.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip";
-
-/**
- * Deprecated, use {@code server.address}.
- *
- * @deprecated Deprecated, use `server.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name";
-
-/**
- * Deprecated, use {@code server.port}.
- *
- * @deprecated Deprecated, use `server.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port";
-
-/**
- * Deprecated, use {@code network.peer.address}.
- *
- * @deprecated Deprecated, use `network.peer.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip";
-
-/**
- * Deprecated, use {@code server.address} on client spans and {@code client.address} on server
- * spans.
- *
- * @deprecated Deprecated, use `server.address` on client spans and `client.address` on server
- * spans.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerName = "net.peer.name";
-
-/**
- * Deprecated, use {@code server.port} on client spans and {@code client.port} on server spans.
- *
- * @deprecated Deprecated, use `server.port` on client spans and `client.port` on server spans.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.port";
-
-/**
- * Deprecated, use {@code network.protocol.name}.
- *
- * @deprecated Deprecated, use `network.protocol.name`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name";
-
-/**
- * Deprecated, use {@code network.protocol.version}.
- *
- * @deprecated Deprecated, use `network.protocol.version`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version";
-
-/**
- * Deprecated, use {@code network.transport} and {@code network.type}.
- *
- * @deprecated Deprecated, use `network.transport` and `network.type`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock.family";
-
-/**
- * Deprecated, use {@code network.local.address}.
- *
- * @deprecated Deprecated, use `network.local.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
-
-/**
- * Deprecated, use {@code network.local.port}.
- *
- * @deprecated Deprecated, use `network.local.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port";
-
-/**
- * Deprecated, use {@code network.peer.address}.
- *
- * @deprecated Deprecated, use `network.peer.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
-
-/**
- * Deprecated, use {@code network.peer.port}.
- *
- * @deprecated Deprecated, use `network.peer.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
-
-/**
- * Deprecated, use {@code network.transport}.
- *
- * @deprecated Deprecated, use `network.transport`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport";
-
-/**
- *
- *
- * @deprecated .
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name";
-
-/**
- *
- *
- * @deprecated .
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state";
-
-/**
- * Deprecated, use {@code rpc.message.compressed_size} instead.
- *
- * @deprecated Deprecated, use `rpc.message.compressed_size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize =
-    "message.compressed_size";
-
-/**
- * Deprecated, use {@code rpc.message.id} instead.
- *
- * @deprecated Deprecated, use `rpc.message.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id";
-
-/**
- * Deprecated, use {@code rpc.message.type} instead.
- *
- * @deprecated Deprecated, use `rpc.message.type` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type";
-
-/**
- * Deprecated, use {@code rpc.message.uncompressed_size} instead.
- *
- * @deprecated Deprecated, use `rpc.message.uncompressed_size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize =
-    "message.uncompressed_size";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state";
-
-/**
- * Deprecated, use {@code system.process.status} instead.
- *
- * @deprecated Deprecated, use `system.process.status` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
-    "system.processes.status";
-
-/**
- * Deprecated, use {@code server.address} instead.
- *
- * @deprecated Deprecated, use `server.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName =
-    "tls.client.server_name";
-
-/**
- * Destination address - domain name if available without reverse DNS lookup; otherwise, IP address
- or Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the source side, and when communicating through an intermediary,
- {@code destination.address} SHOULD represent the destination address behind any intermediaries, for
- example proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kDestinationAddress = "destination.address";
-
-/**
- * Destination port number
- */
-static constexpr const char *kDestinationPort = "destination.port";
-
-/**
- * A unique identifier representing the device
- *
- * <p>Notes:
-  <ul> <li>The device identifier MUST only be defined using the values outlined below. This value is
- not an advertising identifier and MUST NOT be used as such. On iOS (Swift or Objective-C), this
- value MUST be equal to the <a
- href="https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor">vendor
- identifier</a>. On Android (Java or Kotlin), this value MUST be equal to the Firebase Installation
- ID or a globally unique UUID which is persisted across sessions in your application. More
- information can be found <a
- href="https://developer.android.com/training/articles/user-data-ids">here</a> on best practices and
- exact implementation details. Caution should be taken when storing personal data or anything which
- can identify a user. GDPR and data protection laws may apply, ensure you do your own due
- diligence.</li> </ul>
- */
-static constexpr const char *kDeviceId = "device.id";
-
-/**
- * The name of the device manufacturer
- *
- * <p>Notes:
-  <ul> <li>The Android OS provides this field via <a
- href="https://developer.android.com/reference/android/os/Build#MANUFACTURER">Build</a>. iOS apps
- SHOULD hardcode the value {@code Apple}.</li> </ul>
- */
-static constexpr const char *kDeviceManufacturer = "device.manufacturer";
-
-/**
- * The model identifier for the device
- *
- * <p>Notes:
-  <ul> <li>It's recommended this value represents a machine-readable version of the model identifier
- rather than the market or consumer-friendly name of the device.</li> </ul>
- */
-static constexpr const char *kDeviceModelIdentifier = "device.model.identifier";
-
-/**
- * The marketing name for the device model
- *
- * <p>Notes:
-  <ul> <li>It's recommended this value represents a human-readable version of the device model
- rather than a machine-readable alternative.</li> </ul>
- */
-static constexpr const char *kDeviceModelName = "device.model.name";
-
-/**
- * The disk IO operation direction.
- */
-static constexpr const char *kDiskIoDirection = "disk.io.direction";
-
-/**
- * The name being queried.
- *
- * <p>Notes:
-  <ul> <li>If the name field contains non-printable characters (below 32 or above 126), those
- characters should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should
- be escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n
- respectively.</li> </ul>
- */
-static constexpr const char *kDnsQuestionName = "dns.question.name";
-
-/**
- * Describes a class of error the operation ended with.
- *
- * <p>Notes:
-  <ul> <li>The {@code error.type} SHOULD be predictable, and SHOULD have low
-cardinality.</li><li>When {@code error.type} is set to a type (e.g., an exception type), its
-canonical class name identifying the type within the artifact SHOULD be
-used.</li><li>Instrumentations SHOULD document the list of errors they report.</li><li>The
-cardinality of {@code error.type} within one instrumentation library SHOULD be low. Telemetry
-consumers that aggregate data from multiple instrumentation libraries and applications should be
-prepared for {@code error.type} to have high cardinality at query time when no additional filters
-are applied.</li><li>If the operation has completed successfully, instrumentations SHOULD NOT set
-{@code error.type}.</li><li>If a specific domain defines its own set of error identifiers (such as
-HTTP or gRPC status codes), it's RECOMMENDED to:</li><li>Use a domain-specific attribute</li>
-<li>Set {@code error.type} to capture all errors, regardless of whether they are defined within the
-domain-specific set or not.</li>
- </ul>
- */
-static constexpr const char *kErrorType = "error.type";
-
-/**
- * Identifies the class / type of event.
- *
- * <p>Notes:
-  <ul> <li>Event names are subject to the same rules as <a
- href="/docs/general/attribute-naming.md">attribute names</a>. Notably, event names are namespaced
- to avoid collisions and provide a clean separation of semantics for events in separate domains like
- browser, mobile, and kubernetes.</li> </ul>
- */
-static constexpr const char *kEventName = "event.name";
-
-/**
- * SHOULD be set to true if the exception event is recorded at a point where it is known that the
-exception is escaping the scope of the span.
- *
- * <p>Notes:
-  <ul> <li>An exception is considered to have escaped (or left) the scope of a span,
-if that span is ended while the exception is still logically &quot;in flight&quot;.
-This may be actually &quot;in flight&quot; in some languages (e.g. if the exception
-is passed to a Context manager's {@code __exit__} method in Python) but will
-usually be caught at the point of recording the exception in most languages.</li><li>It is usually
-not possible to determine at the point where an exception is thrown whether it will escape the scope
-of a span. However, it is trivial to know that an exception will escape, if one checks for an active
-exception just before ending the span, as done in the <a
-href="https://opentelemetry.io/docs/specs/semconv/exceptions/exceptions-spans/#recording-an-exception">example
-for recording span exceptions</a>.</li><li>It follows that an exception may still escape the scope
-of the span even if the {@code exception.escaped} attribute was not set or set to false, since the
-event might have been recorded at a time where it was not clear whether the exception will
-escape.</li> </ul>
- */
-static constexpr const char *kExceptionEscaped = "exception.escaped";
-
-/**
- * The exception message.
- */
-static constexpr const char *kExceptionMessage = "exception.message";
-
-/**
- * A stacktrace as a string in the natural representation for the language runtime. The
- * representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kExceptionStacktrace = "exception.stacktrace";
-
-/**
- * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of
- * the exception should be preferred over the static type in languages that support it.
- */
-static constexpr const char *kExceptionType = "exception.type";
-
-/**
- * A boolean that is true if the serverless function is executed for the first time (aka
- * cold-start).
- */
-static constexpr const char *kFaasColdstart = "faas.coldstart";
-
-/**
- * A string containing the schedule period as <a
- * href="https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm">Cron
- * Expression</a>.
- */
-static constexpr const char *kFaasCron = "faas.cron";
-
-/**
- * The name of the source on which the triggering operation was performed. For example, in Cloud
- * Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name.
- */
-static constexpr const char *kFaasDocumentCollection = "faas.document.collection";
-
-/**
- * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the
- * name of the file, and in Cosmos DB the table name.
- */
-static constexpr const char *kFaasDocumentName = "faas.document.name";
-
-/**
- * Describes the type of the operation that was performed on the data.
- */
-static constexpr const char *kFaasDocumentOperation = "faas.document.operation";
-
-/**
- * A string containing the time when the data was accessed in the <a
- * href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
- * href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasDocumentTime = "faas.document.time";
-
-/**
- * The execution environment ID as a string, that will be potentially reused for other invocations
- to the same function/function version.
- *
- * <p>Notes:
-  <ul> <li><strong>AWS Lambda:</strong> Use the (full) log stream name.</li>
- </ul>
- */
-static constexpr const char *kFaasInstance = "faas.instance";
-
-/**
- * The invocation ID of the current function invocation.
- */
-static constexpr const char *kFaasInvocationId = "faas.invocation_id";
-
-/**
- * The name of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code faas.name} resource attribute of the invoked function.</li>
- </ul>
- */
-static constexpr const char *kFaasInvokedName = "faas.invoked_name";
-
-/**
- * The cloud provider of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code cloud.provider} resource attribute of the invoked
- function.</li> </ul>
- */
-static constexpr const char *kFaasInvokedProvider = "faas.invoked_provider";
-
-/**
- * The cloud region of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code cloud.region} resource attribute of the invoked
- function.</li> </ul>
- */
-static constexpr const char *kFaasInvokedRegion = "faas.invoked_region";
-
-/**
- * The amount of memory available to the serverless function converted to Bytes.
- *
- * <p>Notes:
-  <ul> <li>It's recommended to set this attribute since e.g. too little memory can easily stop a
- Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable {@code
- AWS_LAMBDA_FUNCTION_MEMORY_SIZE} provides this information (which must be multiplied by
- 1,048,576).</li> </ul>
- */
-static constexpr const char *kFaasMaxMemory = "faas.max_memory";
-
-/**
- * The name of the single function that this runtime instance executes.
- *
- * <p>Notes:
-  <ul> <li>This is the name of the function as configured/deployed on the FaaS
-platform and is usually different from the name of the callback
-function (which may be stored in the
-<a href="/docs/general/attributes.md#source-code-attributes">{@code code.namespace}/{@code
-code.function}</a> span attributes).</li><li>For some cloud providers, the above definition is
-ambiguous. The following definition of function name MUST be used for this attribute (and
-consequently the span name) for the listed cloud providers/products:</li><li><strong>Azure:</strong>
-The full name {@code <FUNCAPP>/<FUNC>}, i.e., function app name followed by a forward slash followed
-by the function name (this form can also be seen in the resource JSON for the function). This means
-that a span attribute MUST be used, as an Azure function app can host multiple functions that would
-usually share a TracerProvider (see also the {@code cloud.resource_id} attribute).</li>
- </ul>
- */
-static constexpr const char *kFaasName = "faas.name";
-
-/**
- * A string containing the function invocation time in the <a
- * href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
- * href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasTime = "faas.time";
-
-/**
- * Type of the trigger which caused this function invocation.
- */
-static constexpr const char *kFaasTrigger = "faas.trigger";
-
-/**
- * The immutable version of the function being executed.
- *
- * <p>Notes:
-  <ul> <li>Depending on the cloud provider and platform, use:</li><li><strong>AWS Lambda:</strong>
-The <a href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function
-version</a> (an integer represented as a decimal string).</li> <li><strong>Google Cloud Run
-(Services):</strong> The <a href="https://cloud.google.com/run/docs/managing/revisions">revision</a>
-(i.e., the function name plus the revision suffix).</li>
-<li><strong>Google Cloud Functions:</strong> The value of the
-<a
-href="https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically">{@code
-K_REVISION} environment variable</a>.</li> <li><strong>Azure Functions:</strong> Not applicable. Do
-not set this attribute.</li>
- </ul>
- */
-static constexpr const char *kFaasVersion = "faas.version";
-
-/**
- * The unique identifier of the feature flag.
- */
-static constexpr const char *kFeatureFlagKey = "feature_flag.key";
-
-/**
- * The name of the service provider that performs the flag evaluation.
- */
-static constexpr const char *kFeatureFlagProviderName = "feature_flag.provider_name";
-
-/**
- * SHOULD be a semantic identifier for a value. If one is unavailable, a stringified version of the
-value can be used.
- *
- * <p>Notes:
-  <ul> <li>A semantic identifier, commonly referred to as a variant, provides a means
-for referring to a value without including the value itself. This can
-provide additional context for understanding the meaning behind a value.
-For example, the variant {@code red} maybe be used for the value {@code #c05543}.</li><li>A
-stringified version of the value can be used in situations where a semantic identifier is
-unavailable. String representation of the value should be determined by the implementer.</li> </ul>
- */
-static constexpr const char *kFeatureFlagVariant = "feature_flag.variant";
-
-/**
- * Directory where the file is located. It should include the drive letter, when appropriate.
- */
-static constexpr const char *kFileDirectory = "file.directory";
-
-/**
- * File extension, excluding the leading dot.
- *
- * <p>Notes:
-  <ul> <li>When the file name has multiple extensions (example.tar.gz), only the last one should be
- captured (&quot;gz&quot;, not &quot;tar.gz&quot;).</li> </ul>
- */
-static constexpr const char *kFileExtension = "file.extension";
-
-/**
- * Name of the file including the extension, without the directory.
- */
-static constexpr const char *kFileName = "file.name";
-
-/**
- * Full path to the file, including the file name. It should include the drive letter, when
- * appropriate.
- */
-static constexpr const char *kFilePath = "file.path";
-
-/**
- * File size in bytes.
- */
-static constexpr const char *kFileSize = "file.size";
-
-/**
- * Identifies the Google Cloud service for which the official client library is intended.
- *
- * <p>Notes:
-  <ul> <li>Intended to be a stable identifier for Google Cloud client libraries that is uniform
- across implementation languages. The value should be derived from the canonical service domain for
- the service; for example, 'foo.googleapis.com' should result in a value of 'foo'.</li> </ul>
- */
-static constexpr const char *kGcpClientService = "gcp.client.service";
-
-/**
- * The name of the Cloud Run <a
- * href="https://cloud.google.com/run/docs/managing/job-executions">execution</a> being run for the
- * Job, as set by the <a
- * href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">{@code
- * CLOUD_RUN_EXECUTION}</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobExecution = "gcp.cloud_run.job.execution";
-
-/**
- * The index for a task within an execution as provided by the <a
- * href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">{@code
- * CLOUD_RUN_TASK_INDEX}</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobTaskIndex = "gcp.cloud_run.job.task_index";
-
-/**
- * The hostname of a GCE instance. This is the full value of the default or <a
- * href="https://cloud.google.com/compute/docs/instances/custom-hostname-vm">custom hostname</a>.
- */
-static constexpr const char *kGcpGceInstanceHostname = "gcp.gce.instance.hostname";
-
-/**
- * The instance name of a GCE instance. This is the value provided by {@code host.name}, the visible
- * name of the instance in the Cloud Console UI, and the prefix for the default hostname of the
- * instance as defined by the <a
- * href="https://cloud.google.com/compute/docs/internal-dns#instance-fully-qualified-domain-names">default
- * internal DNS name</a>.
- */
-static constexpr const char *kGcpGceInstanceName = "gcp.gce.instance.name";
-
-/**
- * The full response received from the GenAI model.
- *
- * <p>Notes:
-  <ul> <li>It's RECOMMENDED to format completions as JSON string matching <a
- href="https://platform.openai.com/docs/guides/text-generation">OpenAI messages format</a></li>
- </ul>
- */
-static constexpr const char *kGenAiCompletion = "gen_ai.completion";
-
-/**
- * The name of the operation being performed.
- *
- * <p>Notes:
-  <ul> <li>If one of the predefined values applies, but specific system uses a different name it's
- RECOMMENDED to document it in the semantic conventions for specific GenAI system and use
- system-specific name in the instrumentation. If a different name is not documented, instrumentation
- libraries SHOULD use applicable predefined value.</li> </ul>
- */
-static constexpr const char *kGenAiOperationName = "gen_ai.operation.name";
-
-/**
- * The full prompt sent to the GenAI model.
- *
- * <p>Notes:
-  <ul> <li>It's RECOMMENDED to format prompts as JSON string matching <a
- href="https://platform.openai.com/docs/guides/text-generation">OpenAI messages format</a></li>
- </ul>
- */
-static constexpr const char *kGenAiPrompt = "gen_ai.prompt";
-
-/**
- * The frequency penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestFrequencyPenalty = "gen_ai.request.frequency_penalty";
-
-/**
- * The maximum number of tokens the model generates for a request.
- */
-static constexpr const char *kGenAiRequestMaxTokens = "gen_ai.request.max_tokens";
-
-/**
- * The name of the GenAI model a request is being made to.
- */
-static constexpr const char *kGenAiRequestModel = "gen_ai.request.model";
-
-/**
- * The presence penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestPresencePenalty = "gen_ai.request.presence_penalty";
-
-/**
- * List of sequences that the model will use to stop generating further tokens.
- */
-static constexpr const char *kGenAiRequestStopSequences = "gen_ai.request.stop_sequences";
-
-/**
- * The temperature setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTemperature = "gen_ai.request.temperature";
-
-/**
- * The top_k sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopK = "gen_ai.request.top_k";
-
-/**
- * The top_p sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopP = "gen_ai.request.top_p";
-
-/**
- * Array of reasons the model stopped generating tokens, corresponding to each generation received.
- */
-static constexpr const char *kGenAiResponseFinishReasons = "gen_ai.response.finish_reasons";
-
-/**
- * The unique identifier for the completion.
- */
-static constexpr const char *kGenAiResponseId = "gen_ai.response.id";
-
-/**
- * The name of the model that generated the response.
- */
-static constexpr const char *kGenAiResponseModel = "gen_ai.response.model";
-
-/**
- * The Generative AI product as identified by the client or server instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The {@code gen_ai.system} describes a family of GenAI models with specific model
-identified by {@code gen_ai.request.model} and {@code gen_ai.response.model} attributes.</li><li>The
-actual GenAI product may differ from the one identified by the client. For example, when using
-OpenAI client libraries to communicate with Mistral, the {@code gen_ai.system} is set to {@code
-openai} based on the instrumentation's best knowledge.</li><li>For custom model, a custom friendly
-name SHOULD be used. If none of these options apply, the {@code gen_ai.system} SHOULD be set to
-{@code _OTHER}.</li> </ul>
- */
-static constexpr const char *kGenAiSystem = "gen_ai.system";
-
-/**
- * The type of token being counted.
- */
-static constexpr const char *kGenAiTokenType = "gen_ai.token.type";
-
-/**
- * The number of tokens used in the GenAI input (prompt).
- */
-static constexpr const char *kGenAiUsageInputTokens = "gen_ai.usage.input_tokens";
-
-/**
- * The number of tokens used in the GenAI response (completion).
- */
-static constexpr const char *kGenAiUsageOutputTokens = "gen_ai.usage.output_tokens";
-
-/**
- * The type of memory.
- */
-static constexpr const char *kGoMemoryType = "go.memory.type";
-
-/**
- * The GraphQL document being executed.
- *
- * <p>Notes:
-  <ul> <li>The value may be sanitized to exclude sensitive information.</li> </ul>
- */
-static constexpr const char *kGraphqlDocument = "graphql.document";
-
-/**
- * The name of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationName = "graphql.operation.name";
-
-/**
- * The type of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationType = "graphql.operation.type";
-
-/**
- * Unique identifier for the application
- */
-static constexpr const char *kHerokuAppId = "heroku.app.id";
-
-/**
- * Commit hash for the current release
- */
-static constexpr const char *kHerokuReleaseCommit = "heroku.release.commit";
-
-/**
- * Time and date the release was created
- */
-static constexpr const char *kHerokuReleaseCreationTimestamp = "heroku.release.creation_timestamp";
-
-/**
- * The CPU architecture the host system is running on.
- */
-static constexpr const char *kHostArch = "host.arch";
-
-/**
- * The amount of level 2 memory cache available to the processor (in Bytes).
- */
-static constexpr const char *kHostCpuCacheL2Size = "host.cpu.cache.l2.size";
-
-/**
- * Family or generation of the CPU.
- */
-static constexpr const char *kHostCpuFamily = "host.cpu.family";
-
-/**
- * Model identifier. It provides more granular information about the CPU, distinguishing it from
- * other CPUs within the same family.
- */
-static constexpr const char *kHostCpuModelId = "host.cpu.model.id";
-
-/**
- * Model designation of the processor.
- */
-static constexpr const char *kHostCpuModelName = "host.cpu.model.name";
-
-/**
- * Stepping or core revisions.
- */
-static constexpr const char *kHostCpuStepping = "host.cpu.stepping";
-
-/**
- * Processor manufacturer identifier. A maximum 12-character string.
- *
- * <p>Notes:
-  <ul> <li><a href="https://wiki.osdev.org/CPUID">CPUID</a> command returns the vendor ID string in
- EBX, EDX and ECX registers. Writing these to memory in this order results in a 12-character
- string.</li> </ul>
- */
-static constexpr const char *kHostCpuVendorId = "host.cpu.vendor.id";
-
-/**
- * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For
- * non-containerized systems, this should be the {@code machine-id}. See the table below for the
- * sources to use to determine the {@code machine-id} based on operating system.
- */
-static constexpr const char *kHostId = "host.id";
-
-/**
- * VM image ID or host OS image ID. For Cloud, this value is from the provider.
- */
-static constexpr const char *kHostImageId = "host.image.id";
-
-/**
- * Name of the VM image or OS install the host was instantiated from.
- */
-static constexpr const char *kHostImageName = "host.image.name";
-
-/**
- * The version string of the VM image or host OS as defined in <a
- * href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kHostImageVersion = "host.image.version";
-
-/**
- * Available IP addresses of the host, excluding loopback interfaces.
- *
- * <p>Notes:
-  <ul> <li>IPv4 Addresses MUST be specified in dotted-quad notation. IPv6 addresses MUST be
- specified in the <a href="https://www.rfc-editor.org/rfc/rfc5952.html">RFC 5952</a> format.</li>
- </ul>
- */
-static constexpr const char *kHostIp = "host.ip";
-
-/**
- * Available MAC addresses of the host, excluding loopback interfaces.
- *
- * <p>Notes:
-  <ul> <li>MAC Addresses MUST be represented in <a
- href="https://standards.ieee.org/wp-content/uploads/import/documents/tutorials/eui.pdf">IEEE RA
- hexadecimal form</a>: as hyphen-separated octets in uppercase hexadecimal form from most to least
- significant.</li> </ul>
- */
-static constexpr const char *kHostMac = "host.mac";
-
-/**
- * Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully
- * qualified hostname, or another name specified by the user.
- */
-static constexpr const char *kHostName = "host.name";
-
-/**
- * Type of host. For Cloud, this must be the machine type.
- */
-static constexpr const char *kHostType = "host.type";
-
-/**
- * State of the HTTP connection in the HTTP connection pool.
- */
-static constexpr const char *kHttpConnectionState = "http.connection.state";
-
-/**
- * The size of the request payload body in bytes. This is the number of bytes transferred excluding
- * headers and is often, but not always, present as the <a
- * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
- * header. For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpRequestBodySize = "http.request.body.size";
-
-/**
- * HTTP request method.
- *
- * <p>Notes:
-  <ul> <li>HTTP request method value SHOULD be &quot;known&quot; to the instrumentation.
-By default, this convention defines &quot;known&quot; methods as the ones listed in <a
-href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>.</li><li>If the HTTP
-request method is not known to instrumentation, it MUST set the {@code http.request.method}
-attribute to {@code _OTHER}.</li><li>If the HTTP instrumentation could end up converting valid HTTP
-request methods to {@code _OTHER}, then it MUST provide a way to override the list of known HTTP
-methods. If this override is done via environment variable, then the environment variable MUST be
-named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list of case-sensitive
-known HTTP methods (this list MUST be a full override of the default known method, it is not a list
-of known methods in addition to the defaults).</li><li>HTTP method names are case-sensitive and
-{@code http.request.method} attribute value MUST match a known HTTP method name exactly.
-Instrumentations for specific web frameworks that consider HTTP methods to be case insensitive,
-SHOULD populate a canonical equivalent. Tracing instrumentations that do so, MUST also set {@code
-http.request.method_original} to the original value.</li> </ul>
- */
-static constexpr const char *kHttpRequestMethod = "http.request.method";
-
-/**
- * Original HTTP method sent by the client in the request line.
- */
-static constexpr const char *kHttpRequestMethodOriginal = "http.request.method_original";
-
-/**
- * The ordinal number of request resending attempt (for any reason, including redirects).
- *
- * <p>Notes:
-  <ul> <li>The resend count SHOULD be updated each time an HTTP request gets resent by the client,
- regardless of what was the cause of the resending (e.g. redirection, authorization failure, 503
- Server Unavailable, network issues, or any other).</li> </ul>
- */
-static constexpr const char *kHttpRequestResendCount = "http.request.resend_count";
-
-/**
- * The total size of the request in bytes. This should be the total number of bytes sent over the
- * wire, including the request line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and request
- * body if any.
- */
-static constexpr const char *kHttpRequestSize = "http.request.size";
-
-/**
- * The size of the response payload body in bytes. This is the number of bytes transferred excluding
- * headers and is often, but not always, present as the <a
- * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
- * header. For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpResponseBodySize = "http.response.body.size";
-
-/**
- * The total size of the response in bytes. This should be the total number of bytes sent over the
- * wire, including the status line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and response
- * body and trailers if any.
- */
-static constexpr const char *kHttpResponseSize = "http.response.size";
-
-/**
- * <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>.
- */
-static constexpr const char *kHttpResponseStatusCode = "http.response.status_code";
-
-/**
- * The matched route, that is, the path template in the format used by the respective server
-framework.
- *
- * <p>Notes:
-  <ul> <li>MUST NOT be populated when this is not supported by the HTTP server framework as the
-route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD include
-the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if there is
-one.</li> </ul>
- */
-static constexpr const char *kHttpRoute = "http.route";
-
-/**
- * Name of the buffer pool.
- *
- * <p>Notes:
-  <ul> <li>Pool names are generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/BufferPoolMXBean.html#getName()">BufferPoolMXBean#getName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmBufferPoolName = "jvm.buffer.pool.name";
-
-/**
- * Name of the garbage collector action.
- *
- * <p>Notes:
-  <ul> <li>Garbage collector action is generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcAction()">GarbageCollectionNotificationInfo#getGcAction()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmGcAction = "jvm.gc.action";
-
-/**
- * Name of the garbage collector.
- *
- * <p>Notes:
-  <ul> <li>Garbage collector name is generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcName()">GarbageCollectionNotificationInfo#getGcName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmGcName = "jvm.gc.name";
-
-/**
- * Name of the memory pool.
- *
- * <p>Notes:
-  <ul> <li>Pool names are generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmMemoryPoolName = "jvm.memory.pool.name";
-
-/**
- * The type of memory.
- */
-static constexpr const char *kJvmMemoryType = "jvm.memory.type";
-
-/**
- * Whether the thread is daemon or not.
- */
-static constexpr const char *kJvmThreadDaemon = "jvm.thread.daemon";
-
-/**
- * State of the thread.
- */
-static constexpr const char *kJvmThreadState = "jvm.thread.state";
-
-/**
- * The name of the cluster.
- */
-static constexpr const char *kK8sClusterName = "k8s.cluster.name";
-
-/**
- * A pseudo-ID for the cluster, set to the UID of the {@code kube-system} namespace.
- *
- * <p>Notes:
-  <ul> <li>K8s doesn't have support for obtaining a cluster ID. If this is ever
-added, we will recommend collecting the {@code k8s.cluster.uid} through the
-official APIs. In the meantime, we are able to use the {@code uid} of the
-{@code kube-system} namespace as a proxy for cluster ID. Read on for the
-rationale.</li><li>Every object created in a K8s cluster is assigned a distinct UID. The
-{@code kube-system} namespace is used by Kubernetes itself and will exist
-for the lifetime of the cluster. Using the {@code uid} of the {@code kube-system}
-namespace is a reasonable proxy for the K8s ClusterID as it will only
-change if the cluster is rebuilt. Furthermore, Kubernetes UIDs are
-UUIDs as standardized by
-<a href="https://www.itu.int/ITU-T/studygroups/com17/oid.html">ISO/IEC 9834-8 and ITU-T X.667</a>.
-Which states:</li><blockquote>
-<li>If generated according to one of the mechanisms defined in Rec.</li></blockquote>
-<li>ITU-T X.667 | ISO/IEC 9834-8, a UUID is either guaranteed to be
-  different from all other UUIDs generated before 3603 A.D., or is
-  extremely likely to be different (depending on the mechanism chosen).</li><li>Therefore, UIDs
-between clusters should be extremely unlikely to conflict.</li> </ul>
- */
-static constexpr const char *kK8sClusterUid = "k8s.cluster.uid";
-
-/**
- * The name of the Container from Pod specification, must be unique within a Pod. Container runtime
- * usually uses different globally unique name ({@code container.name}).
- */
-static constexpr const char *kK8sContainerName = "k8s.container.name";
-
-/**
- * Number of times the container was restarted. This attribute can be used to identify a particular
- * container (running or stopped) within a container spec.
- */
-static constexpr const char *kK8sContainerRestartCount = "k8s.container.restart_count";
-
-/**
- * Last terminated reason of the Container.
- */
-static constexpr const char *kK8sContainerStatusLastTerminatedReason =
-    "k8s.container.status.last_terminated_reason";
-
-/**
- * The name of the CronJob.
- */
-static constexpr const char *kK8sCronjobName = "k8s.cronjob.name";
-
-/**
- * The UID of the CronJob.
- */
-static constexpr const char *kK8sCronjobUid = "k8s.cronjob.uid";
-
-/**
- * The name of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetName = "k8s.daemonset.name";
-
-/**
- * The UID of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetUid = "k8s.daemonset.uid";
-
-/**
- * The name of the Deployment.
- */
-static constexpr const char *kK8sDeploymentName = "k8s.deployment.name";
-
-/**
- * The UID of the Deployment.
- */
-static constexpr const char *kK8sDeploymentUid = "k8s.deployment.uid";
-
-/**
- * The name of the Job.
- */
-static constexpr const char *kK8sJobName = "k8s.job.name";
-
-/**
- * The UID of the Job.
- */
-static constexpr const char *kK8sJobUid = "k8s.job.uid";
-
-/**
- * The name of the namespace that the pod is running in.
- */
-static constexpr const char *kK8sNamespaceName = "k8s.namespace.name";
-
-/**
- * The name of the Node.
- */
-static constexpr const char *kK8sNodeName = "k8s.node.name";
-
-/**
- * The UID of the Node.
- */
-static constexpr const char *kK8sNodeUid = "k8s.node.uid";
-
-/**
- * The name of the Pod.
- */
-static constexpr const char *kK8sPodName = "k8s.pod.name";
-
-/**
- * The UID of the Pod.
- */
-static constexpr const char *kK8sPodUid = "k8s.pod.uid";
-
-/**
- * The name of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetName = "k8s.replicaset.name";
-
-/**
- * The UID of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetUid = "k8s.replicaset.uid";
-
-/**
- * The name of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetName = "k8s.statefulset.name";
-
-/**
- * The UID of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetUid = "k8s.statefulset.uid";
-
-/**
- * The Linux Slab memory state
- */
-static constexpr const char *kLinuxMemorySlabState = "linux.memory.slab.state";
-
-/**
- * The stream associated with the log. See below for a list of well-known values.
- */
-static constexpr const char *kLogIostream = "log.iostream";
-
-/**
- * The basename of the file.
- */
-static constexpr const char *kLogFileName = "log.file.name";
-
-/**
- * The basename of the file, with symlinks resolved.
- */
-static constexpr const char *kLogFileNameResolved = "log.file.name_resolved";
-
-/**
- * The full path to the file.
- */
-static constexpr const char *kLogFilePath = "log.file.path";
-
-/**
- * The full path to the file, with symlinks resolved.
- */
-static constexpr const char *kLogFilePathResolved = "log.file.path_resolved";
-
-/**
- * The complete orignal Log Record.
- *
- * <p>Notes:
-  <ul> <li>This value MAY be added when processing a Log Record which was originally transmitted as
- a string or equivalent data type AND the Body field of the Log Record does not contain the same
- value. (e.g. a syslog or a log record read from a file.)</li> </ul>
- */
-static constexpr const char *kLogRecordOriginal = "log.record.original";
-
-/**
- * A unique identifier for the Log Record.
- *
- * <p>Notes:
-  <ul> <li>If an id is provided, other log records with the same id will be considered duplicates
-and can be removed safely. This means, that two distinguishable log records MUST have different
-values. The id MAY be an <a href="https://github.com/ulid/spec">Universally Unique Lexicographically
-Sortable Identifier (ULID)</a>, but other identifiers (e.g. UUID) may be used as needed.</li> </ul>
- */
-static constexpr const char *kLogRecordUid = "log.record.uid";
-
-/**
- * The number of messages sent, received, or processed in the scope of the batching operation.
- *
- * <p>Notes:
-  <ul> <li>Instrumentations SHOULD NOT set {@code messaging.batch.message_count} on spans that
- operate with a single message. When a messaging client library supports both batch and
- single-message API for the same operation, instrumentations SHOULD use {@code
- messaging.batch.message_count} for batching APIs and SHOULD NOT use it for single-message
- APIs.</li> </ul>
- */
-static constexpr const char *kMessagingBatchMessageCount = "messaging.batch.message_count";
-
-/**
- * A unique identifier for the client that consumes or produces a message.
- */
-static constexpr const char *kMessagingClientId = "messaging.client.id";
-
-/**
- * The name of the consumer group with which a consumer is associated.
- *
- * <p>Notes:
-  <ul> <li>Semantic conventions for individual messaging systems SHOULD document whether {@code
- messaging.consumer.group.name} is applicable and what it means in the context of that system.</li>
- </ul>
- */
-static constexpr const char *kMessagingConsumerGroupName = "messaging.consumer.group.name";
-
-/**
- * A boolean that is true if the message destination is anonymous (could be unnamed or have
- * auto-generated name).
- */
-static constexpr const char *kMessagingDestinationAnonymous = "messaging.destination.anonymous";
-
-/**
- * The message destination name
- *
- * <p>Notes:
-  <ul> <li>Destination name SHOULD uniquely identify a specific queue, topic or other entity within
-the broker. If the broker doesn't have such notion, the destination name SHOULD uniquely identify
-the broker.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationName = "messaging.destination.name";
-
-/**
- * The identifier of the partition messages are sent to or received from, unique within the {@code
- * messaging.destination.name}.
- */
-static constexpr const char *kMessagingDestinationPartitionId =
-    "messaging.destination.partition.id";
-
-/**
- * The name of the destination subscription from which a message is consumed.
- *
- * <p>Notes:
-  <ul> <li>Semantic conventions for individual messaging systems SHOULD document whether {@code
- messaging.destination.subscription.name} is applicable and what it means in the context of that
- system.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationSubscriptionName =
-    "messaging.destination.subscription.name";
-
-/**
- * Low cardinality representation of the messaging destination name
- *
- * <p>Notes:
-  <ul> <li>Destination names could be constructed from templates. An example would be a destination
- name involving a user name or product id. Although the destination name in this case is of high
- cardinality, the underlying template is of low cardinality and can be effectively used for grouping
- and aggregation.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationTemplate = "messaging.destination.template";
-
-/**
- * A boolean that is true if the message destination is temporary and might not exist anymore after
- * messages are processed.
- */
-static constexpr const char *kMessagingDestinationTemporary = "messaging.destination.temporary";
-
-/**
- * The size of the message body in bytes.
- *
- * <p>Notes:
-  <ul> <li>This can refer to both the compressed or uncompressed body size. If both sizes are known,
-the uncompressed body size should be used.</li> </ul>
- */
-static constexpr const char *kMessagingMessageBodySize = "messaging.message.body.size";
-
-/**
- * The conversation ID identifying the conversation to which the message belongs, represented as a
- * string. Sometimes called &quot;Correlation ID&quot;.
- */
-static constexpr const char *kMessagingMessageConversationId = "messaging.message.conversation_id";
-
-/**
- * The size of the message body and metadata in bytes.
- *
- * <p>Notes:
-  <ul> <li>This can refer to both the compressed or uncompressed size. If both sizes are known, the
-uncompressed size should be used.</li> </ul>
- */
-static constexpr const char *kMessagingMessageEnvelopeSize = "messaging.message.envelope.size";
-
-/**
- * A value used by the messaging system as an identifier for the message, represented as a string.
- */
-static constexpr const char *kMessagingMessageId = "messaging.message.id";
-
-/**
- * The system-specific name of the messaging operation.
- */
-static constexpr const char *kMessagingOperationName = "messaging.operation.name";
-
-/**
- * A string identifying the type of the messaging operation.
- *
- * <p>Notes:
-  <ul> <li>If a custom value is used, it MUST be of low cardinality.</li> </ul>
- */
-static constexpr const char *kMessagingOperationType = "messaging.operation.type";
-
-/**
- * The messaging system as identified by the client instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The actual messaging system may differ from the one known by the client. For example,
- when using Kafka client libraries to communicate with Azure Event Hubs, the {@code
- messaging.system} is set to {@code kafka} based on the instrumentation's best knowledge.</li> </ul>
- */
-static constexpr const char *kMessagingSystem = "messaging.system";
-
-/**
- * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the
- same partition. They differ from {@code messaging.message.id} in that they're not unique. If the
- key is {@code null}, the attribute MUST NOT be set.
- *
- * <p>Notes:
-  <ul> <li>If the key type is not string, it's string representation has to be supplied for the
- attribute. If the key has no unambiguous, canonical string form, don't include its value.</li>
- </ul>
- */
-static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.message.key";
-
-/**
- * A boolean that is true if the message is a tombstone.
- */
-static constexpr const char *kMessagingKafkaMessageTombstone = "messaging.kafka.message.tombstone";
-
-/**
- * The offset of a record in the corresponding Kafka partition.
- */
-static constexpr const char *kMessagingKafkaOffset = "messaging.kafka.offset";
-
-/**
- * RabbitMQ message routing key.
- */
-static constexpr const char *kMessagingRabbitmqDestinationRoutingKey =
-    "messaging.rabbitmq.destination.routing_key";
-
-/**
- * RabbitMQ message delivery tag
- */
-static constexpr const char *kMessagingRabbitmqMessageDeliveryTag =
-    "messaging.rabbitmq.message.delivery_tag";
-
-/**
- * Model of message consumption. This only applies to consumer spans.
- */
-static constexpr const char *kMessagingRocketmqConsumptionModel =
-    "messaging.rocketmq.consumption_model";
-
-/**
- * The delay time level for delay message, which determines the message delay time.
- */
-static constexpr const char *kMessagingRocketmqMessageDelayTimeLevel =
-    "messaging.rocketmq.message.delay_time_level";
-
-/**
- * The timestamp in milliseconds that the delay message is expected to be delivered to consumer.
- */
-static constexpr const char *kMessagingRocketmqMessageDeliveryTimestamp =
-    "messaging.rocketmq.message.delivery_timestamp";
-
-/**
- * It is essential for FIFO message. Messages that belong to the same message group are always
- * processed one by one within the same consumer group.
- */
-static constexpr const char *kMessagingRocketmqMessageGroup = "messaging.rocketmq.message.group";
-
-/**
- * Key(s) of message, another way to mark message besides message id.
- */
-static constexpr const char *kMessagingRocketmqMessageKeys = "messaging.rocketmq.message.keys";
-
-/**
- * The secondary classifier of message besides topic.
- */
-static constexpr const char *kMessagingRocketmqMessageTag = "messaging.rocketmq.message.tag";
-
-/**
- * Type of message.
- */
-static constexpr const char *kMessagingRocketmqMessageType = "messaging.rocketmq.message.type";
-
-/**
- * Namespace of RocketMQ resources, resources in different namespaces are individual.
- */
-static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.namespace";
-
-/**
- * The ack deadline in seconds set for the modify ack deadline request.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckDeadline =
-    "messaging.gcp_pubsub.message.ack_deadline";
-
-/**
- * The ack id for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckId =
-    "messaging.gcp_pubsub.message.ack_id";
-
-/**
- * The delivery attempt for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageDeliveryAttempt =
-    "messaging.gcp_pubsub.message.delivery_attempt";
-
-/**
- * The ordering key for a given message. If the attribute is not present, the message does not have
- * an ordering key.
- */
-static constexpr const char *kMessagingGcpPubsubMessageOrderingKey =
-    "messaging.gcp_pubsub.message.ordering_key";
-
-/**
- * Describes the <a
- * href="https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock">settlement
- * type</a>.
- */
-static constexpr const char *kMessagingServicebusDispositionStatus =
-    "messaging.servicebus.disposition_status";
-
-/**
- * Number of deliveries that have been attempted for this message.
- */
-static constexpr const char *kMessagingServicebusMessageDeliveryCount =
-    "messaging.servicebus.message.delivery_count";
-
-/**
- * The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingServicebusMessageEnqueuedTime =
-    "messaging.servicebus.message.enqueued_time";
-
-/**
- * The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingEventhubsMessageEnqueuedTime =
-    "messaging.eventhubs.message.enqueued_time";
-
-/**
- * The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network.
- */
-static constexpr const char *kNetworkCarrierIcc = "network.carrier.icc";
-
-/**
- * The mobile carrier country code.
- */
-static constexpr const char *kNetworkCarrierMcc = "network.carrier.mcc";
-
-/**
- * The mobile carrier network code.
- */
-static constexpr const char *kNetworkCarrierMnc = "network.carrier.mnc";
-
-/**
- * The name of the mobile carrier.
- */
-static constexpr const char *kNetworkCarrierName = "network.carrier.name";
-
-/**
- * This describes more details regarding the connection.type. It may be the type of cell technology
- * connection, but it could be used for describing details about a wifi connection.
- */
-static constexpr const char *kNetworkConnectionSubtype = "network.connection.subtype";
-
-/**
- * The internet connection type.
- */
-static constexpr const char *kNetworkConnectionType = "network.connection.type";
-
-/**
- * The network IO operation direction.
- */
-static constexpr const char *kNetworkIoDirection = "network.io.direction";
-
-/**
- * Local address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkLocalAddress = "network.local.address";
-
-/**
- * Local port number of the network connection.
- */
-static constexpr const char *kNetworkLocalPort = "network.local.port";
-
-/**
- * Peer address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkPeerAddress = "network.peer.address";
-
-/**
- * Peer port number of the network connection.
- */
-static constexpr const char *kNetworkPeerPort = "network.peer.port";
-
-/**
- * <a href="https://osi-model.com/application-layer/">OSI application layer</a> or non-OSI
- equivalent.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li> </ul>
- */
-static constexpr const char *kNetworkProtocolName = "network.protocol.name";
-
-/**
- * The actual version of the protocol used for network communication.
- *
- * <p>Notes:
-  <ul> <li>If protocol version is subject to negotiation (for example using <a
- href="https://www.rfc-editor.org/rfc/rfc7301.html">ALPN</a>), this attribute SHOULD be set to the
- negotiated version. If the actual protocol version is not known, this attribute SHOULD NOT be
- set.</li> </ul>
- */
-static constexpr const char *kNetworkProtocolVersion = "network.protocol.version";
-
-/**
- * <a href="https://osi-model.com/transport-layer/">OSI transport layer</a> or <a
-href="https://wikipedia.org/wiki/Inter-process_communication">inter-process communication
-method</a>.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li><li>Consider always setting the
-transport when setting a port number, since a port number is ambiguous without knowing the
-transport. For example different processes could be listening on TCP port 12345 and UDP port
-12345.</li> </ul>
- */
-static constexpr const char *kNetworkTransport = "network.transport";
-
-/**
- * <a href="https://osi-model.com/network-layer/">OSI network layer</a> or non-OSI equivalent.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li> </ul>
- */
-static constexpr const char *kNetworkType = "network.type";
-
-/**
- * The digest of the OCI image manifest. For container images specifically is the digest by which
-the container image is known.
- *
- * <p>Notes:
-  <ul> <li>Follows <a href="https://github.com/opencontainers/image-spec/blob/main/manifest.md">OCI
-Image Manifest Specification</a>, and specifically the <a
-href="https://github.com/opencontainers/image-spec/blob/main/descriptor.md#digests">Digest
-property</a>. An example can be found in <a
-href="https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest">Example Image
-Manifest</a>.</li> </ul>
- */
-static constexpr const char *kOciManifestDigest = "oci.manifest.digest";
-
-/**
- * Parent-child Reference type
- *
- * <p>Notes:
-  <ul> <li>The causal relationship between a child Span and a parent Span.</li> </ul>
- */
-static constexpr const char *kOpentracingRefType = "opentracing.ref_type";
-
-/**
- * Unique identifier for a particular build or compilation of the operating system.
- */
-static constexpr const char *kOsBuildId = "os.build_id";
-
-/**
- * Human readable (not intended to be parsed) OS version information, like e.g. reported by {@code
- * ver} or {@code lsb_release -a} commands.
- */
-static constexpr const char *kOsDescription = "os.description";
-
-/**
- * Human readable operating system name.
- */
-static constexpr const char *kOsName = "os.name";
-
-/**
- * The operating system type.
- */
-static constexpr const char *kOsType = "os.type";
-
-/**
- * The version string of the operating system as defined in <a
- * href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kOsVersion = "os.version";
-
-/**
- * Name of the code, either &quot;OK&quot; or &quot;ERROR&quot;. MUST NOT be set if the status code
- * is UNSET.
- */
-static constexpr const char *kOtelStatusCode = "otel.status_code";
-
-/**
- * Description of the Status if it has a value, otherwise not set.
- */
-static constexpr const char *kOtelStatusDescription = "otel.status_description";
-
-/**
- * The name of the instrumentation scope - ({@code InstrumentationScope.Name} in OTLP).
- */
-static constexpr const char *kOtelScopeName = "otel.scope.name";
-
-/**
- * The version of the instrumentation scope - ({@code InstrumentationScope.Version} in OTLP).
- */
-static constexpr const char *kOtelScopeVersion = "otel.scope.version";
-
-/**
- * The <a href="/docs/resource/README.md#service">{@code service.name}</a> of the remote service.
- * SHOULD be equal to the actual {@code service.name} resource attribute of the remote service if
- * any.
- */
-static constexpr const char *kPeerService = "peer.service";
-
-/**
- * The command used to launch the process (i.e. the command name). On Linux based systems, can be
- * set to the zeroth string in {@code proc/[pid]/cmdline}. On Windows, can be set to the first
- * parameter extracted from {@code GetCommandLineW}.
- */
-static constexpr const char *kProcessCommand = "process.command";
-
-/**
- * All the command arguments (including the command/executable itself) as received by the process.
- * On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according
- * to the list of null-delimited strings extracted from {@code proc/[pid]/cmdline}. For libc-based
- * executables, this would be the full argv vector passed to {@code main}.
- */
-static constexpr const char *kProcessCommandArgs = "process.command_args";
-
-/**
- * The full command used to launch the process as a single string representing the full command. On
- * Windows, can be set to the result of {@code GetCommandLineW}. Do not set this if you have to
- * assemble it just for monitoring; use {@code process.command_args} instead.
- */
-static constexpr const char *kProcessCommandLine = "process.command_line";
-
-/**
- * Specifies whether the context switches for this data point were voluntary or involuntary.
- */
-static constexpr const char *kProcessContextSwitchType = "process.context_switch_type";
-
-/**
- * The date and time the process was created, in ISO 8601 format.
- */
-static constexpr const char *kProcessCreationTime = "process.creation.time";
-
-/**
- * The name of the process executable. On Linux based systems, can be set to the {@code Name} in
- * {@code proc/[pid]/status}. On Windows, can be set to the base name of {@code
- * GetProcessImageFileNameW}.
- */
-static constexpr const char *kProcessExecutableName = "process.executable.name";
-
-/**
- * The full path to the process executable. On Linux based systems, can be set to the target of
- * {@code proc/[pid]/exe}. On Windows, can be set to the result of {@code GetProcessImageFileNameW}.
- */
-static constexpr const char *kProcessExecutablePath = "process.executable.path";
-
-/**
- * The exit code of the process.
- */
-static constexpr const char *kProcessExitCode = "process.exit.code";
-
-/**
- * The date and time the process exited, in ISO 8601 format.
- */
-static constexpr const char *kProcessExitTime = "process.exit.time";
-
-/**
- * The PID of the process's group leader. This is also the process group ID (PGID) of the process.
- */
-static constexpr const char *kProcessGroupLeaderPid = "process.group_leader.pid";
-
-/**
- * Whether the process is connected to an interactive shell.
- */
-static constexpr const char *kProcessInteractive = "process.interactive";
-
-/**
- * The username of the user that owns the process.
- */
-static constexpr const char *kProcessOwner = "process.owner";
-
-/**
- * The type of page fault for this data point. Type {@code major} is for major/hard page faults, and
- * {@code minor} is for minor/soft page faults.
- */
-static constexpr const char *kProcessPagingFaultType = "process.paging.fault_type";
-
-/**
- * Parent Process identifier (PPID).
- */
-static constexpr const char *kProcessParentPid = "process.parent_pid";
-
-/**
- * Process identifier (PID).
- */
-static constexpr const char *kProcessPid = "process.pid";
-
-/**
- * The real user ID (RUID) of the process.
- */
-static constexpr const char *kProcessRealUserId = "process.real_user.id";
-
-/**
- * The username of the real user of the process.
- */
-static constexpr const char *kProcessRealUserName = "process.real_user.name";
-
-/**
- * An additional description about the runtime of the process, for example a specific vendor
- * customization of the runtime environment.
- */
-static constexpr const char *kProcessRuntimeDescription = "process.runtime.description";
-
-/**
- * The name of the runtime of this process.
- */
-static constexpr const char *kProcessRuntimeName = "process.runtime.name";
-
-/**
- * The version of the runtime of this process, as returned by the runtime without modification.
- */
-static constexpr const char *kProcessRuntimeVersion = "process.runtime.version";
-
-/**
- * The saved user ID (SUID) of the process.
- */
-static constexpr const char *kProcessSavedUserId = "process.saved_user.id";
-
-/**
- * The username of the saved user.
- */
-static constexpr const char *kProcessSavedUserName = "process.saved_user.name";
-
-/**
- * The PID of the process's session leader. This is also the session ID (SID) of the process.
- */
-static constexpr const char *kProcessSessionLeaderPid = "process.session_leader.pid";
-
-/**
- * The effective user ID (EUID) of the process.
- */
-static constexpr const char *kProcessUserId = "process.user.id";
-
-/**
- * The username of the effective user of the process.
- */
-static constexpr const char *kProcessUserName = "process.user.name";
-
-/**
- * Virtual process identifier.
- *
- * <p>Notes:
-  <ul> <li>The process ID within a PID namespace. This is not necessarily unique across all
- processes on the host but it is unique within the process namespace that the process exists
- within.</li> </ul>
- */
-static constexpr const char *kProcessVpid = "process.vpid";
-
-/**
- * The <a href="https://connect.build/docs/protocol/#error-codes">error codes</a> of the Connect
- * request. Error codes are always string values.
- */
-static constexpr const char *kRpcConnectRpcErrorCode = "rpc.connect_rpc.error_code";
-
-/**
- * The <a href="https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md">numeric status
- * code</a> of the gRPC request.
- */
-static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
-
-/**
- * {@code error.code} property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
-
-/**
- * {@code error.message} property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
-
-/**
- * {@code id} property of request or response. Since protocol allows id to be int, string, {@code
- * null} or missing (for notifications), value is expected to be cast to string for simplicity. Use
- * empty string in case of {@code null} value. Omit entirely if this is a notification.
- */
-static constexpr const char *kRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
-
-/**
- * Protocol version as in {@code jsonrpc} property of request/response. Since JSON-RPC 1.0 doesn't
- * specify this, the value can be omitted.
- */
-static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
-
-/**
- * Compressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageCompressedSize = "rpc.message.compressed_size";
-
-/**
- * MUST be calculated as two different counters starting from {@code 1} one for sent messages and
- one for received message.
- *
- * <p>Notes:
-  <ul> <li>This way we guarantee that the values will be consistent between different
- implementations.</li> </ul>
- */
-static constexpr const char *kRpcMessageId = "rpc.message.id";
-
-/**
- * Whether this is a received or sent message.
- */
-static constexpr const char *kRpcMessageType = "rpc.message.type";
-
-/**
- * Uncompressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageUncompressedSize = "rpc.message.uncompressed_size";
-
-/**
- * The name of the (logical) method being called, must be equal to the $method part in the span
- name.
- *
- * <p>Notes:
-  <ul> <li>This is the logical name of the method from the RPC interface perspective, which can be
- different from the name of any implementing method/function. The {@code code.function} attribute
- may be used to store the latter (e.g., method actually executing the call on the server side, RPC
- client stub method on the client side).</li> </ul>
- */
-static constexpr const char *kRpcMethod = "rpc.method";
-
-/**
- * The full (logical) name of the service being called, including its package name, if applicable.
- *
- * <p>Notes:
-  <ul> <li>This is the logical name of the service from the RPC interface perspective, which can be
- different from the name of any implementing class. The {@code code.namespace} attribute may be used
- to store the latter (despite the attribute name, it may include a class name; e.g., class with
- method actually executing the call on the server side, RPC client stub class on the client
- side).</li> </ul>
- */
-static constexpr const char *kRpcService = "rpc.service";
-
-/**
- * A string identifying the remoting system. See below for a list of well-known identifiers.
- */
-static constexpr const char *kRpcSystem = "rpc.system";
-
-/**
- * Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain
- socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the client side, and when communicating through an intermediary,
- {@code server.address} SHOULD represent the server address behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kServerAddress = "server.address";
-
-/**
- * Server port number.
- *
- * <p>Notes:
-  <ul> <li>When observed from the client side, and when communicating through an intermediary,
- {@code server.port} SHOULD represent the server port behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kServerPort = "server.port";
-
-/**
- * The string ID of the service instance.
- *
- * <p>Notes:
-  <ul> <li>MUST be unique for each instance of the same {@code service.namespace,service.name} pair
-(in other words
-{@code service.namespace,service.name,service.instance.id} triplet MUST be globally unique). The ID
-helps to distinguish instances of the same service that exist at the same time (e.g. instances of a
-horizontally scaled service).</li><li>Implementations, such as SDKs, are recommended to generate a
-random Version 1 or Version 4 <a href="https://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a> UUID, but
-are free to use an inherent unique ID as the source of this value if stability is desirable. In that
-case, the ID SHOULD be used as source of a UUID Version 5 and SHOULD use the following UUID as the
-namespace: {@code 4d63009a-8d0f-11ee-aad7-4c796ed8e320}.</li><li>UUIDs are typically recommended, as
-only an opaque value for the purposes of identifying a service instance is needed. Similar to what
-can be seen in the man page for the <a
-href="https://www.freedesktop.org/software/systemd/man/machine-id.html">{@code /etc/machine-id}</a>
-file, the underlying data, such as pod name and namespace should be treated as confidential, being
-the user's choice to expose it or not via another resource attribute.</li><li>For applications
-running behind an application server (like unicorn), we do not recommend using one identifier for
-all processes participating in the application. Instead, it's recommended each division (e.g. a
-worker thread in unicorn) to have its own instance.id.</li><li>It's not recommended for a Collector
-to set {@code service.instance.id} if it can't unambiguously determine the service instance that is
-generating that telemetry. For instance, creating an UUID based on {@code pod.name} will likely be
-wrong, as the Collector might not know from which container within that pod the telemetry
-originated. However, Collectors can set the {@code service.instance.id} if they can unambiguously
-determine the service instance for that telemetry. This is typically the case for scraping
-receivers, as they know the target address and port.</li> </ul>
- */
-static constexpr const char *kServiceInstanceId = "service.instance.id";
-
-/**
- * Logical name of the service.
- *
- * <p>Notes:
-  <ul> <li>MUST be the same for all instances of horizontally scaled services. If the value was not
- specified, SDKs MUST fallback to {@code unknown_service:} concatenated with <a
- href="process.md">{@code process.executable.name}</a>, e.g. {@code unknown_service:bash}. If {@code
- process.executable.name} is not available, the value MUST be set to {@code unknown_service}.</li>
- </ul>
- */
-static constexpr const char *kServiceName = "service.name";
-
-/**
- * A namespace for {@code service.name}.
- *
- * <p>Notes:
-  <ul> <li>A string value having a meaning that helps to distinguish a group of services, for
- example the team name that owns a group of services. {@code service.name} is expected to be unique
- within the same namespace. If {@code service.namespace} is not specified in the Resource then
- {@code service.name} is expected to be unique for all services that have no explicit namespace
- defined (so the empty/unspecified namespace is simply one more valid namespace). Zero-length
- namespace string is assumed equal to unspecified namespace.</li> </ul>
- */
-static constexpr const char *kServiceNamespace = "service.namespace";
-
-/**
- * The version string of the service API or implementation. The format is not defined by these
- * conventions.
- */
-static constexpr const char *kServiceVersion = "service.version";
-
-/**
- * A unique id to identify a session.
- */
-static constexpr const char *kSessionId = "session.id";
-
-/**
- * The previous {@code session.id} for this user, when known.
- */
-static constexpr const char *kSessionPreviousId = "session.previous_id";
-
-/**
- * SignalR HTTP connection closure status.
- */
-static constexpr const char *kSignalrConnectionStatus = "signalr.connection.status";
-
-/**
- * <a
- * href="https://github.com/dotnet/aspnetcore/blob/main/src/SignalR/docs/specs/TransportProtocols.md">SignalR
- * transport type</a>
- */
-static constexpr const char *kSignalrTransport = "signalr.transport";
-
-/**
- * Source address - domain name if available without reverse DNS lookup; otherwise, IP address or
- Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the destination side, and when communicating through an intermediary,
- {@code source.address} SHOULD represent the source address behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kSourceAddress = "source.address";
-
-/**
- * Source port number
- */
-static constexpr const char *kSourcePort = "source.port";
-
-/**
- * The device identifier
- */
-static constexpr const char *kSystemDevice = "system.device";
-
-/**
- * The logical CPU number [0..n-1]
- */
-static constexpr const char *kSystemCpuLogicalNumber = "system.cpu.logical_number";
-
-/**
- * The memory state
- */
-static constexpr const char *kSystemMemoryState = "system.memory.state";
-
-/**
- * The paging access direction
- */
-static constexpr const char *kSystemPagingDirection = "system.paging.direction";
-
-/**
- * The memory paging state
- */
-static constexpr const char *kSystemPagingState = "system.paging.state";
-
-/**
- * The memory paging type
- */
-static constexpr const char *kSystemPagingType = "system.paging.type";
-
-/**
- * The filesystem mode
- */
-static constexpr const char *kSystemFilesystemMode = "system.filesystem.mode";
-
-/**
- * The filesystem mount path
- */
-static constexpr const char *kSystemFilesystemMountpoint = "system.filesystem.mountpoint";
-
-/**
- * The filesystem state
- */
-static constexpr const char *kSystemFilesystemState = "system.filesystem.state";
-
-/**
- * The filesystem type
- */
-static constexpr const char *kSystemFilesystemType = "system.filesystem.type";
-
-/**
- * A stateless protocol MUST NOT set this attribute
- */
-static constexpr const char *kSystemNetworkState = "system.network.state";
-
-/**
- * The process state, e.g., <a
- * href="https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES">Linux Process State
- * Codes</a>
- */
-static constexpr const char *kSystemProcessStatus = "system.process.status";
-
-/**
- * The language of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
-
-/**
- * The name of the telemetry SDK as defined above.
- *
- * <p>Notes:
-  <ul> <li>The OpenTelemetry SDK MUST set the {@code telemetry.sdk.name} attribute to {@code
-opentelemetry}. If another SDK, like a fork or a vendor-provided implementation, is used, this SDK
-MUST set the
-{@code telemetry.sdk.name} attribute to the fully-qualified class or module name of this SDK's main
-entry point or another suitable identifier depending on the language. The identifier {@code
-opentelemetry} is reserved and MUST NOT be used in this case. All custom identifiers SHOULD be
-stable across different versions of an implementation.</li> </ul>
- */
-static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
-
-/**
- * The version string of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
-
-/**
- * The name of the auto instrumentation agent or distribution, if used.
- *
- * <p>Notes:
-  <ul> <li>Official auto instrumentation agents and distributions SHOULD set the {@code
-telemetry.distro.name} attribute to a string starting with {@code opentelemetry-}, e.g. {@code
-opentelemetry-java-instrumentation}.</li> </ul>
- */
-static constexpr const char *kTelemetryDistroName = "telemetry.distro.name";
-
-/**
- * The version string of the auto instrumentation agent or distribution, if used.
- */
-static constexpr const char *kTelemetryDistroVersion = "telemetry.distro.version";
-
-/**
- * The fully qualified human readable name of the <a
- * href="https://en.wikipedia.org/wiki/Test_case">test case</a>.
- */
-static constexpr const char *kTestCaseName = "test.case.name";
-
-/**
- * The status of the actual test case result from test execution.
- */
-static constexpr const char *kTestCaseResultStatus = "test.case.result.status";
-
-/**
- * The human readable name of a <a href="https://en.wikipedia.org/wiki/Test_suite">test suite</a>.
- */
-static constexpr const char *kTestSuiteName = "test.suite.name";
-
-/**
- * The status of the test suite run.
- */
-static constexpr const char *kTestSuiteRunStatus = "test.suite.run.status";
-
-/**
- * Current &quot;managed&quot; thread ID (as opposed to OS thread ID).
- */
-static constexpr const char *kThreadId = "thread.id";
-
-/**
- * Current thread name.
- */
-static constexpr const char *kThreadName = "thread.name";
-
-/**
- * String indicating the <a
- href="https://datatracker.ietf.org/doc/html/rfc5246#appendix-A.5">cipher</a> used during the
- current connection.
- *
- * <p>Notes:
-  <ul> <li>The values allowed for {@code tls.cipher} MUST be one of the {@code Descriptions} of the
- <a
- href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#table-tls-parameters-4">registered
- TLS Cipher Suits</a>.</li> </ul>
- */
-static constexpr const char *kTlsCipher = "tls.cipher";
-
-/**
- * PEM-encoded stand-alone certificate offered by the client. This is usually mutually-exclusive of
- * {@code client.certificate_chain} since this value also exists in that list.
- */
-static constexpr const char *kTlsClientCertificate = "tls.client.certificate";
-
-/**
- * Array of PEM-encoded certificates that make up the certificate chain offered by the client. This
- * is usually mutually-exclusive of {@code client.certificate} since that value should be the first
- * certificate in the chain.
- */
-static constexpr const char *kTlsClientCertificateChain = "tls.client.certificate_chain";
-
-/**
- * Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
- * client. For consistency with other hash values, this value should be formatted as an uppercase
- * hash.
- */
-static constexpr const char *kTlsClientHashMd5 = "tls.client.hash.md5";
-
-/**
- * Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by
- * the client. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsClientHashSha1 = "tls.client.hash.sha1";
-
-/**
- * Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
- * the client. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsClientHashSha256 = "tls.client.hash.sha256";
-
-/**
- * Distinguished name of <a
- * href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
- * the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientIssuer = "tls.client.issuer";
-
-/**
- * A hash that identifies clients based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsClientJa3 = "tls.client.ja3";
-
-/**
- * Date/Time indicating when client certificate is no longer considered valid.
- */
-static constexpr const char *kTlsClientNotAfter = "tls.client.not_after";
-
-/**
- * Date/Time indicating when client certificate is first considered valid.
- */
-static constexpr const char *kTlsClientNotBefore = "tls.client.not_before";
-
-/**
- * Distinguished name of subject of the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientSubject = "tls.client.subject";
-
-/**
- * Array of ciphers offered by the client during the client hello.
- */
-static constexpr const char *kTlsClientSupportedCiphers = "tls.client.supported_ciphers";
-
-/**
- * String indicating the curve used for the given cipher, when applicable
- */
-static constexpr const char *kTlsCurve = "tls.curve";
-
-/**
- * Boolean flag indicating if the TLS negotiation was successful and transitioned to an encrypted
- * tunnel.
- */
-static constexpr const char *kTlsEstablished = "tls.established";
-
-/**
- * String indicating the protocol being tunneled. Per the values in the <a
- * href="https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids">IANA
- * registry</a>, this string should be lower case.
- */
-static constexpr const char *kTlsNextProtocol = "tls.next_protocol";
-
-/**
- * Normalized lowercase protocol name parsed from original string of the negotiated <a
- * href="https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES">SSL/TLS
- * protocol version</a>
- */
-static constexpr const char *kTlsProtocolName = "tls.protocol.name";
-
-/**
- * Numeric part of the version parsed from the original string of the negotiated <a
- * href="https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES">SSL/TLS
- * protocol version</a>
- */
-static constexpr const char *kTlsProtocolVersion = "tls.protocol.version";
-
-/**
- * Boolean flag indicating if this TLS connection was resumed from an existing TLS negotiation.
- */
-static constexpr const char *kTlsResumed = "tls.resumed";
-
-/**
- * PEM-encoded stand-alone certificate offered by the server. This is usually mutually-exclusive of
- * {@code server.certificate_chain} since this value also exists in that list.
- */
-static constexpr const char *kTlsServerCertificate = "tls.server.certificate";
-
-/**
- * Array of PEM-encoded certificates that make up the certificate chain offered by the server. This
- * is usually mutually-exclusive of {@code server.certificate} since that value should be the first
- * certificate in the chain.
- */
-static constexpr const char *kTlsServerCertificateChain = "tls.server.certificate_chain";
-
-/**
- * Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
- * server. For consistency with other hash values, this value should be formatted as an uppercase
- * hash.
- */
-static constexpr const char *kTlsServerHashMd5 = "tls.server.hash.md5";
-
-/**
- * Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by
- * the server. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsServerHashSha1 = "tls.server.hash.sha1";
-
-/**
- * Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
- * the server. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsServerHashSha256 = "tls.server.hash.sha256";
-
-/**
- * Distinguished name of <a
- * href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
- * the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsServerIssuer = "tls.server.issuer";
-
-/**
- * A hash that identifies servers based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsServerJa3s = "tls.server.ja3s";
-
-/**
- * Date/Time indicating when server certificate is no longer considered valid.
- */
-static constexpr const char *kTlsServerNotAfter = "tls.server.not_after";
-
-/**
- * Date/Time indicating when server certificate is first considered valid.
- */
-static constexpr const char *kTlsServerNotBefore = "tls.server.not_before";
-
-/**
- * Distinguished name of subject of the x.509 certificate presented by the server.
- */
-static constexpr const char *kTlsServerSubject = "tls.server.subject";
-
-/**
- * Domain extracted from the {@code url.full}, such as &quot;opentelemetry.io&quot;.
- *
- * <p>Notes:
-  <ul> <li>In some cases a URL may refer to an IP and/or port directly, without a domain name. In
- this case, the IP address would go to the domain field. If the URL contains a <a
- href="https://www.rfc-editor.org/rfc/rfc2732#section-2">literal IPv6 address</a> enclosed by {@code
- [} and {@code ]}, the {@code [} and {@code ]} characters should also be captured in the domain
- field.</li> </ul>
- */
-static constexpr const char *kUrlDomain = "url.domain";
-
-/**
- * The file extension extracted from the {@code url.full}, excluding the leading dot.
- *
- * <p>Notes:
-  <ul> <li>The file extension is only set if it exists, as not every url has a file extension. When
- the file name has multiple extensions {@code example.tar.gz}, only the last one should be captured
- {@code gz}, not {@code tar.gz}.</li> </ul>
- */
-static constexpr const char *kUrlExtension = "url.extension";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component
- */
-static constexpr const char *kUrlFragment = "url.fragment";
-
-/**
- * Absolute URL describing a network resource according to <a
-href="https://www.rfc-editor.org/rfc/rfc3986">RFC3986</a>
- *
- * <p>Notes:
-  <ul> <li>For network calls, URL usually has {@code scheme://host[:port][path][?query][#fragment]}
-format, where the fragment is not transmitted over HTTP, but if it is known, it SHOULD be included
-nevertheless.
-{@code url.full} MUST NOT contain credentials passed via URL in form of {@code
-https://username:password@www.example.com/}. In such case username and password SHOULD be redacted
-and attribute's value SHOULD be {@code https://REDACTED:REDACTED@www.example.com/}.
-{@code url.full} SHOULD capture the absolute URL when it is available (or can be reconstructed).
-Sensitive content provided in {@code url.full} SHOULD be scrubbed when instrumentations can identify
-it.</li> </ul>
- */
-static constexpr const char *kUrlFull = "url.full";
-
-/**
- * Unmodified original URL as seen in the event source.
- *
- * <p>Notes:
-  <ul> <li>In network monitoring, the observed URL may be a full URL, whereas in access logs, the
-URL is often just represented as a path. This field is meant to represent the URL as it was
-observed, complete or not.
-{@code url.original} might contain credentials passed via URL in form of {@code
-https://username:password@www.example.com/}. In such case password and username SHOULD NOT be
-redacted and attribute's value SHOULD remain the same.</li> </ul>
- */
-static constexpr const char *kUrlOriginal = "url.original";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.3">URI path</a> component
- *
- * <p>Notes:
-  <ul> <li>Sensitive content provided in {@code url.path} SHOULD be scrubbed when instrumentations
- can identify it.</li> </ul>
- */
-static constexpr const char *kUrlPath = "url.path";
-
-/**
- * Port extracted from the {@code url.full}
- */
-static constexpr const char *kUrlPort = "url.port";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.4">URI query</a> component
- *
- * <p>Notes:
-  <ul> <li>Sensitive content provided in {@code url.query} SHOULD be scrubbed when instrumentations
- can identify it.</li> </ul>
- */
-static constexpr const char *kUrlQuery = "url.query";
-
-/**
- * The highest registered url domain, stripped of the subdomain.
- *
- * <p>Notes:
-  <ul> <li>This value can be determined precisely with the <a href="http://publicsuffix.org">public
- suffix list</a>. For example, the registered domain for {@code foo.example.com} is {@code
- example.com}. Trying to approximate this by simply taking the last two labels will not work well
- for TLDs such as {@code co.uk}.</li> </ul>
- */
-static constexpr const char *kUrlRegisteredDomain = "url.registered_domain";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
- * identifying the used protocol.
- */
-static constexpr const char *kUrlScheme = "url.scheme";
-
-/**
- * The subdomain portion of a fully qualified domain name includes all of the names except the host
- name under the registered_domain. In a partially qualified domain, or if the qualification level of
- the full name cannot be determined, subdomain contains all of the names below the registered
- domain.
- *
- * <p>Notes:
-  <ul> <li>The subdomain portion of {@code www.east.mydomain.co.uk} is {@code east}. If the domain
- has multiple levels of subdomain, such as {@code sub2.sub1.example.com}, the subdomain field should
- contain {@code sub2.sub1}, with no trailing period.</li> </ul>
- */
-static constexpr const char *kUrlSubdomain = "url.subdomain";
-
-/**
- * The low-cardinality template of an <a
- * href="https://www.rfc-editor.org/rfc/rfc3986#section-4.2">absolute path reference</a>.
- */
-static constexpr const char *kUrlTemplate = "url.template";
-
-/**
- * The effective top level domain (eTLD), also known as the domain suffix, is the last part of the
- domain name. For example, the top level domain for example.com is {@code com}.
- *
- * <p>Notes:
-  <ul> <li>This value can be determined precisely with the <a href="http://publicsuffix.org">public
- suffix list</a>.</li> </ul>
- */
-static constexpr const char *kUrlTopLevelDomain = "url.top_level_domain";
-
-/**
- * Name of the user-agent extracted from original. Usually refers to the browser's name.
- *
- * <p>Notes:
-  <ul> <li><a href="https://www.whatsmyua.info">Example</a> of extracting browser's name from
- original string. In the case of using a user-agent for non-browser products, such as microservices
- with multiple names/versions inside the {@code user_agent.original}, the most significant name
- SHOULD be selected. In such a scenario it should align with {@code user_agent.version}</li> </ul>
- */
-static constexpr const char *kUserAgentName = "user_agent.name";
-
-/**
- * Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
- * User-Agent</a> header sent by the client.
- */
-static constexpr const char *kUserAgentOriginal = "user_agent.original";
-
-/**
- * Version of the user-agent extracted from original. Usually refers to the browser's version
- *
- * <p>Notes:
-  <ul> <li><a href="https://www.whatsmyua.info">Example</a> of extracting browser's version from
- original string. In the case of using a user-agent for non-browser products, such as microservices
- with multiple names/versions inside the {@code user_agent.original}, the most significant version
- SHOULD be selected. In such a scenario it should align with {@code user_agent.name}</li> </ul>
- */
-static constexpr const char *kUserAgentVersion = "user_agent.version";
-
-/**
- * User email address.
- */
-static constexpr const char *kUserEmail = "user.email";
-
-/**
- * User's full name
- */
-static constexpr const char *kUserFullName = "user.full_name";
-
-/**
- * Unique user hash to correlate information for a user in anonymized form.
- *
- * <p>Notes:
-  <ul> <li>Useful if {@code user.id} or {@code user.name} contain confidential information and
- cannot be used.</li> </ul>
- */
-static constexpr const char *kUserHash = "user.hash";
-
-/**
- * Unique identifier of the user.
- */
-static constexpr const char *kUserId = "user.id";
-
-/**
- * Short name or login/username of the user.
- */
-static constexpr const char *kUserName = "user.name";
-
-/**
- * Array of user roles at the time of the event.
- */
-static constexpr const char *kUserRoles = "user.roles";
-
-/**
- * The type of garbage collection.
- */
-static constexpr const char *kV8jsGcType = "v8js.gc.type";
-
-/**
- * The name of the space type of heap memory.
- *
- * <p>Notes:
-  <ul> <li>Value can be retrieved from value {@code space_name} of <a
- href="https://nodejs.org/api/v8.html#v8getheapspacestatistics">{@code
- v8.getHeapSpaceStatistics()}</a></li> </ul>
- */
-static constexpr const char *kV8jsHeapSpaceName = "v8js.heap.space.name";
-
-/**
- * The ID of the change (pull request/merge request) if applicable. This is usually a unique (within
- * repository) identifier generated by the VCS system.
- */
-static constexpr const char *kVcsRepositoryChangeId = "vcs.repository.change.id";
-
-/**
- * The human readable title of the change (pull request/merge request). This title is often a brief
- * summary of the change and may get merged in to a ref as the commit summary.
- */
-static constexpr const char *kVcsRepositoryChangeTitle = "vcs.repository.change.title";
-
-/**
- * The name of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> such as
- * <strong>branch</strong> or <strong>tag</strong> in the repository.
- */
-static constexpr const char *kVcsRepositoryRefName = "vcs.repository.ref.name";
-
-/**
- * The revision, literally <a href="https://www.merriam-webster.com/dictionary/revision">revised
-version</a>, The revision most often refers to a commit object in Git, or a revision number in SVN.
- *
- * <p>Notes:
-  <ul> <li>The revision can be a full <a
-href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see glossary)</a>, of
-the recorded change to a ref within a repository pointing to a commit <a
-href="https://git-scm.com/docs/git-commit">commit</a> object. It does not necessarily have to be a
-hash; it can simply define a <a
-href="https://svnbook.red-bean.com/en/1.7/svn.tour.revs.specifiers.html">revision number</a> which
-is an integer that is monotonically increasing. In cases where it is identical to the {@code
-ref.name}, it SHOULD still be included. It is up to the implementer to decide which value to set as
-the revision based on the VCS system and situational context.</li> </ul>
- */
-static constexpr const char *kVcsRepositoryRefRevision = "vcs.repository.ref.revision";
-
-/**
- * The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
- * repository.
- */
-static constexpr const char *kVcsRepositoryRefType = "vcs.repository.ref.type";
-
-/**
- * The <a href="https://en.wikipedia.org/wiki/URL">URL</a> of the repository providing the complete
- * address in order to locate and identify the repository.
- */
-static constexpr const char *kVcsRepositoryUrlFull = "vcs.repository.url.full";
-
-/**
- * Additional description of the web engine (e.g. detailed version and edition information).
- */
-static constexpr const char *kWebengineDescription = "webengine.description";
-
-/**
- * The name of the web engine.
- */
-static constexpr const char *kWebengineName = "webengine.name";
-
-/**
- * The version of the web engine.
- */
-static constexpr const char *kWebengineVersion = "webengine.version";
-
-// Enum definitions
-namespace AspnetcoreRateLimitingResultValues
-{
-/** Lease was acquired. */
-static constexpr const char *kAcquired = "acquired";
-/** Lease request was rejected by the endpoint limiter. */
-static constexpr const char *kEndpointLimiter = "endpoint_limiter";
-/** Lease request was rejected by the global limiter. */
-static constexpr const char *kGlobalLimiter = "global_limiter";
-/** Lease request was canceled. */
-static constexpr const char *kRequestCanceled = "request_canceled";
-}  // namespace AspnetcoreRateLimitingResultValues
-
-namespace AspnetcoreDiagnosticsExceptionResultValues
-{
-/** Exception was handled by the exception handling middleware. */
-static constexpr const char *kHandled = "handled";
-/** Exception was not handled by the exception handling middleware. */
-static constexpr const char *kUnhandled = "unhandled";
-/** Exception handling was skipped because the response had started. */
-static constexpr const char *kSkipped = "skipped";
-/** Exception handling didn&#39;t run because the request was aborted. */
-static constexpr const char *kAborted = "aborted";
-}  // namespace AspnetcoreDiagnosticsExceptionResultValues
-
-namespace AspnetcoreRoutingMatchStatusValues
-{
-/** Match succeeded. */
-static constexpr const char *kSuccess = "success";
-/** Match failed. */
-static constexpr const char *kFailure = "failure";
-}  // namespace AspnetcoreRoutingMatchStatusValues
-
-namespace AwsEcsLaunchtypeValues
-{
-/** ec2. */
-static constexpr const char *kEc2 = "ec2";
-/** fargate. */
-static constexpr const char *kFargate = "fargate";
-}  // namespace AwsEcsLaunchtypeValues
-
-namespace CicdPipelineTaskTypeValues
-{
-/** build. */
-static constexpr const char *kBuild = "build";
-/** test. */
-static constexpr const char *kTest = "test";
-/** deploy. */
-static constexpr const char *kDeploy = "deploy";
-}  // namespace CicdPipelineTaskTypeValues
-
-namespace CloudPlatformValues
-{
-/** Alibaba Cloud Elastic Compute Service. */
-static constexpr const char *kAlibabaCloudEcs = "alibaba_cloud_ecs";
-/** Alibaba Cloud Function Compute. */
-static constexpr const char *kAlibabaCloudFc = "alibaba_cloud_fc";
-/** Red Hat OpenShift on Alibaba Cloud. */
-static constexpr const char *kAlibabaCloudOpenshift = "alibaba_cloud_openshift";
-/** AWS Elastic Compute Cloud. */
-static constexpr const char *kAwsEc2 = "aws_ec2";
-/** AWS Elastic Container Service. */
-static constexpr const char *kAwsEcs = "aws_ecs";
-/** AWS Elastic Kubernetes Service. */
-static constexpr const char *kAwsEks = "aws_eks";
-/** AWS Lambda. */
-static constexpr const char *kAwsLambda = "aws_lambda";
-/** AWS Elastic Beanstalk. */
-static constexpr const char *kAwsElasticBeanstalk = "aws_elastic_beanstalk";
-/** AWS App Runner. */
-static constexpr const char *kAwsAppRunner = "aws_app_runner";
-/** Red Hat OpenShift on AWS (ROSA). */
-static constexpr const char *kAwsOpenshift = "aws_openshift";
-/** Azure Virtual Machines. */
-static constexpr const char *kAzureVm = "azure_vm";
-/** Azure Container Apps. */
-static constexpr const char *kAzureContainerApps = "azure_container_apps";
-/** Azure Container Instances. */
-static constexpr const char *kAzureContainerInstances = "azure_container_instances";
-/** Azure Kubernetes Service. */
-static constexpr const char *kAzureAks = "azure_aks";
-/** Azure Functions. */
-static constexpr const char *kAzureFunctions = "azure_functions";
-/** Azure App Service. */
-static constexpr const char *kAzureAppService = "azure_app_service";
-/** Azure Red Hat OpenShift. */
-static constexpr const char *kAzureOpenshift = "azure_openshift";
-/** Google Bare Metal Solution (BMS). */
-static constexpr const char *kGcpBareMetalSolution = "gcp_bare_metal_solution";
-/** Google Cloud Compute Engine (GCE). */
-static constexpr const char *kGcpComputeEngine = "gcp_compute_engine";
-/** Google Cloud Run. */
-static constexpr const char *kGcpCloudRun = "gcp_cloud_run";
-/** Google Cloud Kubernetes Engine (GKE). */
-static constexpr const char *kGcpKubernetesEngine = "gcp_kubernetes_engine";
-/** Google Cloud Functions (GCF). */
-static constexpr const char *kGcpCloudFunctions = "gcp_cloud_functions";
-/** Google Cloud App Engine (GAE). */
-static constexpr const char *kGcpAppEngine = "gcp_app_engine";
-/** Red Hat OpenShift on Google Cloud. */
-static constexpr const char *kGcpOpenshift = "gcp_openshift";
-/** Red Hat OpenShift on IBM Cloud. */
-static constexpr const char *kIbmCloudOpenshift = "ibm_cloud_openshift";
-/** Tencent Cloud Cloud Virtual Machine (CVM). */
-static constexpr const char *kTencentCloudCvm = "tencent_cloud_cvm";
-/** Tencent Cloud Elastic Kubernetes Service (EKS). */
-static constexpr const char *kTencentCloudEks = "tencent_cloud_eks";
-/** Tencent Cloud Serverless Cloud Function (SCF). */
-static constexpr const char *kTencentCloudScf = "tencent_cloud_scf";
-}  // namespace CloudPlatformValues
-
-namespace CloudProviderValues
-{
-/** Alibaba Cloud. */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-/** Amazon Web Services. */
-static constexpr const char *kAws = "aws";
-/** Microsoft Azure. */
-static constexpr const char *kAzure = "azure";
-/** Google Cloud Platform. */
-static constexpr const char *kGcp = "gcp";
-/** Heroku Platform as a Service. */
-static constexpr const char *kHeroku = "heroku";
-/** IBM Cloud. */
-static constexpr const char *kIbmCloud = "ibm_cloud";
-/** Tencent Cloud. */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-}  // namespace CloudProviderValues
-
-namespace CpuModeValues
-{
-/** user. */
-static constexpr const char *kUser = "user";
-/** system. */
-static constexpr const char *kSystem = "system";
-/** nice. */
-static constexpr const char *kNice = "nice";
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** iowait. */
-static constexpr const char *kIowait = "iowait";
-/** interrupt. */
-static constexpr const char *kInterrupt = "interrupt";
-/** steal. */
-static constexpr const char *kSteal = "steal";
-/** kernel. */
-static constexpr const char *kKernel = "kernel";
-}  // namespace CpuModeValues
-
-namespace DbClientConnectionStateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace DbClientConnectionStateValues
-
-namespace DbSystemValues
-{
-/** Some other SQL database. Fallback only. See notes. */
-static constexpr const char *kOtherSql = "other_sql";
-/** Adabas (Adaptable Database System). */
-static constexpr const char *kAdabas = "adabas";
-/** Deprecated, use `intersystems_cache` instead. */
-static constexpr const char *kCache = "cache";
-/** InterSystems Caché. */
-static constexpr const char *kIntersystemsCache = "intersystems_cache";
-/** Apache Cassandra. */
-static constexpr const char *kCassandra = "cassandra";
-/** ClickHouse. */
-static constexpr const char *kClickhouse = "clickhouse";
-/** Deprecated, use `other_sql` instead. */
-static constexpr const char *kCloudscape = "cloudscape";
-/** CockroachDB. */
-static constexpr const char *kCockroachdb = "cockroachdb";
-/** Deprecated, no replacement at this time. */
-static constexpr const char *kColdfusion = "coldfusion";
-/** Microsoft Azure Cosmos DB. */
-static constexpr const char *kCosmosdb = "cosmosdb";
-/** Couchbase. */
-static constexpr const char *kCouchbase = "couchbase";
-/** CouchDB. */
-static constexpr const char *kCouchdb = "couchdb";
-/** IBM Db2. */
-static constexpr const char *kDb2 = "db2";
-/** Apache Derby. */
-static constexpr const char *kDerby = "derby";
-/** Amazon DynamoDB. */
-static constexpr const char *kDynamodb = "dynamodb";
-/** EnterpriseDB. */
-static constexpr const char *kEdb = "edb";
-/** Elasticsearch. */
-static constexpr const char *kElasticsearch = "elasticsearch";
-/** FileMaker. */
-static constexpr const char *kFilemaker = "filemaker";
-/** Firebird. */
-static constexpr const char *kFirebird = "firebird";
-/** Deprecated, use `other_sql` instead. */
-static constexpr const char *kFirstsql = "firstsql";
-/** Apache Geode. */
-static constexpr const char *kGeode = "geode";
-/** H2. */
-static constexpr const char *kH2 = "h2";
-/** SAP HANA. */
-static constexpr const char *kHanadb = "hanadb";
-/** Apache HBase. */
-static constexpr const char *kHbase = "hbase";
-/** Apache Hive. */
-static constexpr const char *kHive = "hive";
-/** HyperSQL DataBase. */
-static constexpr const char *kHsqldb = "hsqldb";
-/** InfluxDB. */
-static constexpr const char *kInfluxdb = "influxdb";
-/** Informix. */
-static constexpr const char *kInformix = "informix";
-/** Ingres. */
-static constexpr const char *kIngres = "ingres";
-/** InstantDB. */
-static constexpr const char *kInstantdb = "instantdb";
-/** InterBase. */
-static constexpr const char *kInterbase = "interbase";
-/** MariaDB. */
-static constexpr const char *kMariadb = "mariadb";
-/** SAP MaxDB. */
-static constexpr const char *kMaxdb = "maxdb";
-/** Memcached. */
-static constexpr const char *kMemcached = "memcached";
-/** MongoDB. */
-static constexpr const char *kMongodb = "mongodb";
-/** Microsoft SQL Server. */
-static constexpr const char *kMssql = "mssql";
-/** Deprecated, Microsoft SQL Server Compact is discontinued. */
-static constexpr const char *kMssqlcompact = "mssqlcompact";
-/** MySQL. */
-static constexpr const char *kMysql = "mysql";
-/** Neo4j. */
-static constexpr const char *kNeo4j = "neo4j";
-/** Netezza. */
-static constexpr const char *kNetezza = "netezza";
-/** OpenSearch. */
-static constexpr const char *kOpensearch = "opensearch";
-/** Oracle Database. */
-static constexpr const char *kOracle = "oracle";
-/** Pervasive PSQL. */
-static constexpr const char *kPervasive = "pervasive";
-/** PointBase. */
-static constexpr const char *kPointbase = "pointbase";
-/** PostgreSQL. */
-static constexpr const char *kPostgresql = "postgresql";
-/** Progress Database. */
-static constexpr const char *kProgress = "progress";
-/** Redis. */
-static constexpr const char *kRedis = "redis";
-/** Amazon Redshift. */
-static constexpr const char *kRedshift = "redshift";
-/** Cloud Spanner. */
-static constexpr const char *kSpanner = "spanner";
-/** SQLite. */
-static constexpr const char *kSqlite = "sqlite";
-/** Sybase. */
-static constexpr const char *kSybase = "sybase";
-/** Teradata. */
-static constexpr const char *kTeradata = "teradata";
-/** Trino. */
-static constexpr const char *kTrino = "trino";
-/** Vertica. */
-static constexpr const char *kVertica = "vertica";
-}  // namespace DbSystemValues
-
-namespace DbCassandraConsistencyLevelValues
-{
-/** all. */
-static constexpr const char *kAll = "all";
-/** each_quorum. */
-static constexpr const char *kEachQuorum = "each_quorum";
-/** quorum. */
-static constexpr const char *kQuorum = "quorum";
-/** local_quorum. */
-static constexpr const char *kLocalQuorum = "local_quorum";
-/** one. */
-static constexpr const char *kOne = "one";
-/** two. */
-static constexpr const char *kTwo = "two";
-/** three. */
-static constexpr const char *kThree = "three";
-/** local_one. */
-static constexpr const char *kLocalOne = "local_one";
-/** any. */
-static constexpr const char *kAny = "any";
-/** serial. */
-static constexpr const char *kSerial = "serial";
-/** local_serial. */
-static constexpr const char *kLocalSerial = "local_serial";
-}  // namespace DbCassandraConsistencyLevelValues
-
-namespace DbCosmosdbConnectionModeValues
-{
-/** Gateway (HTTP) connections mode. */
-static constexpr const char *kGateway = "gateway";
-/** Direct connection. */
-static constexpr const char *kDirect = "direct";
-}  // namespace DbCosmosdbConnectionModeValues
-
-namespace DbCosmosdbOperationTypeValues
-{
-/** invalid. */
-static constexpr const char *kInvalid = "Invalid";
-/** create. */
-static constexpr const char *kCreate = "Create";
-/** patch. */
-static constexpr const char *kPatch = "Patch";
-/** read. */
-static constexpr const char *kRead = "Read";
-/** read_feed. */
-static constexpr const char *kReadFeed = "ReadFeed";
-/** delete. */
-static constexpr const char *kDelete = "Delete";
-/** replace. */
-static constexpr const char *kReplace = "Replace";
-/** execute. */
-static constexpr const char *kExecute = "Execute";
-/** query. */
-static constexpr const char *kQuery = "Query";
-/** head. */
-static constexpr const char *kHead = "Head";
-/** head_feed. */
-static constexpr const char *kHeadFeed = "HeadFeed";
-/** upsert. */
-static constexpr const char *kUpsert = "Upsert";
-/** batch. */
-static constexpr const char *kBatch = "Batch";
-/** query_plan. */
-static constexpr const char *kQueryPlan = "QueryPlan";
-/** execute_javascript. */
-static constexpr const char *kExecuteJavascript = "ExecuteJavaScript";
-}  // namespace DbCosmosdbOperationTypeValues
-
-namespace DeploymentStatusValues
-{
-/** failed. */
-static constexpr const char *kFailed = "failed";
-/** succeeded. */
-static constexpr const char *kSucceeded = "succeeded";
-}  // namespace DeploymentStatusValues
-
-namespace AndroidStateValues
-{
-/** Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has
- * been called in the app for the first time. */
-static constexpr const char *kCreated = "created";
-/** Any time after Activity.onPause() or, if the app has no Activity, Context.stopService() has been
- * called when the app was in the foreground state. */
-static constexpr const char *kBackground = "background";
-/** Any time after Activity.onResume() or, if the app has no Activity, Context.startService() has
- * been called when the app was in either the created or background states. */
-static constexpr const char *kForeground = "foreground";
-}  // namespace AndroidStateValues
-
-namespace ContainerCpuStateValues
-{
-/** When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode
- * (Windows). */
-static constexpr const char *kUser = "user";
-/** When CPU is used by the system (host OS). */
-static constexpr const char *kSystem = "system";
-/** When tasks of the cgroup are in kernel mode (Linux). When all container processes are in kernel
- * mode (Windows). */
-static constexpr const char *kKernel = "kernel";
-}  // namespace ContainerCpuStateValues
-
-namespace DbClientConnectionsStateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace DbClientConnectionsStateValues
-
-namespace StateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace StateValues
-
-namespace HttpFlavorValues
-{
-/** HTTP/1.0. */
-static constexpr const char *kHttp10 = "1.0";
-/** HTTP/1.1. */
-static constexpr const char *kHttp11 = "1.1";
-/** HTTP/2. */
-static constexpr const char *kHttp20 = "2.0";
-/** HTTP/3. */
-static constexpr const char *kHttp30 = "3.0";
-/** SPDY protocol. */
-static constexpr const char *kSpdy = "SPDY";
-/** QUIC protocol. */
-static constexpr const char *kQuic = "QUIC";
-}  // namespace HttpFlavorValues
-
-namespace IosStateValues
-{
-/** The app has become `active`. Associated with UIKit notification `applicationDidBecomeActive`. */
-static constexpr const char *kActive = "active";
-/** The app is now `inactive`. Associated with UIKit notification `applicationWillResignActive`. */
-static constexpr const char *kInactive = "inactive";
-/** The app is now in the background. This value is associated with UIKit notification
- * `applicationDidEnterBackground`. */
-static constexpr const char *kBackground = "background";
-/** The app is now in the foreground. This value is associated with UIKit notification
- * `applicationWillEnterForeground`. */
-static constexpr const char *kForeground = "foreground";
-/** The app is about to terminate. Associated with UIKit notification `applicationWillTerminate`. */
-static constexpr const char *kTerminate = "terminate";
-}  // namespace IosStateValues
-
-namespace NetSockFamilyValues
-{
-/** IPv4 address. */
-static constexpr const char *kInet = "inet";
-/** IPv6 address. */
-static constexpr const char *kInet6 = "inet6";
-/** Unix domain socket path. */
-static constexpr const char *kUnix = "unix";
-}  // namespace NetSockFamilyValues
-
-namespace NetTransportValues
-{
-/** ip_tcp. */
-static constexpr const char *kIpTcp = "ip_tcp";
-/** ip_udp. */
-static constexpr const char *kIpUdp = "ip_udp";
-/** Named or anonymous pipe. */
-static constexpr const char *kPipe = "pipe";
-/** In-process communication. */
-static constexpr const char *kInproc = "inproc";
-/** Something else (non IP-based). */
-static constexpr const char *kOther = "other";
-}  // namespace NetTransportValues
-
-namespace ProcessCpuStateValues
-{
-/** system. */
-static constexpr const char *kSystem = "system";
-/** user. */
-static constexpr const char *kUser = "user";
-/** wait. */
-static constexpr const char *kWait = "wait";
-}  // namespace ProcessCpuStateValues
-
-namespace MessageTypeValues
-{
-/** sent. */
-static constexpr const char *kSent = "SENT";
-/** received. */
-static constexpr const char *kReceived = "RECEIVED";
-}  // namespace MessageTypeValues
-
-namespace SystemCpuStateValues
-{
-/** user. */
-static constexpr const char *kUser = "user";
-/** system. */
-static constexpr const char *kSystem = "system";
-/** nice. */
-static constexpr const char *kNice = "nice";
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** iowait. */
-static constexpr const char *kIowait = "iowait";
-/** interrupt. */
-static constexpr const char *kInterrupt = "interrupt";
-/** steal. */
-static constexpr const char *kSteal = "steal";
-}  // namespace SystemCpuStateValues
-
-namespace SystemProcessesStatusValues
-{
-/** running. */
-static constexpr const char *kRunning = "running";
-/** sleeping. */
-static constexpr const char *kSleeping = "sleeping";
-/** stopped. */
-static constexpr const char *kStopped = "stopped";
-/** defunct. */
-static constexpr const char *kDefunct = "defunct";
-}  // namespace SystemProcessesStatusValues
-
-namespace DiskIoDirectionValues
-{
-/** read. */
-static constexpr const char *kRead = "read";
-/** write. */
-static constexpr const char *kWrite = "write";
-}  // namespace DiskIoDirectionValues
-
-namespace ErrorTypeValues
-{
-/** A fallback error value to be used when the instrumentation doesn&#39;t define a custom value. */
-static constexpr const char *kOther = "_OTHER";
-}  // namespace ErrorTypeValues
-
-namespace FaasDocumentOperationValues
-{
-/** When a new object is created. */
-static constexpr const char *kInsert = "insert";
-/** When an object is modified. */
-static constexpr const char *kEdit = "edit";
-/** When an object is deleted. */
-static constexpr const char *kDelete = "delete";
-}  // namespace FaasDocumentOperationValues
-
-namespace FaasInvokedProviderValues
-{
-/** Alibaba Cloud. */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-/** Amazon Web Services. */
-static constexpr const char *kAws = "aws";
-/** Microsoft Azure. */
-static constexpr const char *kAzure = "azure";
-/** Google Cloud Platform. */
-static constexpr const char *kGcp = "gcp";
-/** Tencent Cloud. */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-}  // namespace FaasInvokedProviderValues
-
-namespace FaasTriggerValues
-{
-/** A response to some data source operation such as a database or filesystem read/write. */
-static constexpr const char *kDatasource = "datasource";
-/** To provide an answer to an inbound HTTP request. */
-static constexpr const char *kHttp = "http";
-/** A function is set to be executed when messages are sent to a messaging system. */
-static constexpr const char *kPubsub = "pubsub";
-/** A function is scheduled to be executed regularly. */
-static constexpr const char *kTimer = "timer";
-/** If none of the others apply. */
-static constexpr const char *kOther = "other";
-}  // namespace FaasTriggerValues
-
-namespace GenAiOperationNameValues
-{
-/** Chat completion operation such as [OpenAI Chat
- * API](https://platform.openai.com/docs/api-reference/chat). */
-static constexpr const char *kChat = "chat";
-/** Text completions operation such as [OpenAI Completions API
- * (Legacy)](https://platform.openai.com/docs/api-reference/completions). */
-static constexpr const char *kTextCompletion = "text_completion";
-}  // namespace GenAiOperationNameValues
-
-namespace GenAiSystemValues
-{
-/** OpenAI. */
-static constexpr const char *kOpenai = "openai";
-/** Vertex AI. */
-static constexpr const char *kVertexAi = "vertex_ai";
-/** Anthropic. */
-static constexpr const char *kAnthropic = "anthropic";
-/** Cohere. */
-static constexpr const char *kCohere = "cohere";
-}  // namespace GenAiSystemValues
-
-namespace GenAiTokenTypeValues
-{
-/** Input tokens (prompt, input, etc.). */
-static constexpr const char *kInput = "input";
-/** Output tokens (completion, response, etc.). */
-static constexpr const char *kCompletion = "output";
-}  // namespace GenAiTokenTypeValues
-
-namespace GoMemoryTypeValues
-{
-/** Memory allocated from the heap that is reserved for stack space, whether or not it is currently
- * in-use. */
-static constexpr const char *kStack = "stack";
-/** Memory used by the Go runtime, excluding other categories of memory usage described in this
- * enumeration. */
-static constexpr const char *kOther = "other";
-}  // namespace GoMemoryTypeValues
-
-namespace GraphqlOperationTypeValues
-{
-/** GraphQL query. */
-static constexpr const char *kQuery = "query";
-/** GraphQL mutation. */
-static constexpr const char *kMutation = "mutation";
-/** GraphQL subscription. */
-static constexpr const char *kSubscription = "subscription";
-}  // namespace GraphqlOperationTypeValues
-
-namespace HostArchValues
-{
-/** AMD64. */
-static constexpr const char *kAmd64 = "amd64";
-/** ARM32. */
-static constexpr const char *kArm32 = "arm32";
-/** ARM64. */
-static constexpr const char *kArm64 = "arm64";
-/** Itanium. */
-static constexpr const char *kIa64 = "ia64";
-/** 32-bit PowerPC. */
-static constexpr const char *kPpc32 = "ppc32";
-/** 64-bit PowerPC. */
-static constexpr const char *kPpc64 = "ppc64";
-/** IBM z/Architecture. */
-static constexpr const char *kS390x = "s390x";
-/** 32-bit x86. */
-static constexpr const char *kX86 = "x86";
-}  // namespace HostArchValues
-
-namespace HttpConnectionStateValues
-{
-/** active state. */
-static constexpr const char *kActive = "active";
-/** idle state. */
-static constexpr const char *kIdle = "idle";
-}  // namespace HttpConnectionStateValues
-
-namespace HttpRequestMethodValues
-{
-/** CONNECT method. */
-static constexpr const char *kConnect = "CONNECT";
-/** DELETE method. */
-static constexpr const char *kDelete = "DELETE";
-/** GET method. */
-static constexpr const char *kGet = "GET";
-/** HEAD method. */
-static constexpr const char *kHead = "HEAD";
-/** OPTIONS method. */
-static constexpr const char *kOptions = "OPTIONS";
-/** PATCH method. */
-static constexpr const char *kPatch = "PATCH";
-/** POST method. */
-static constexpr const char *kPost = "POST";
-/** PUT method. */
-static constexpr const char *kPut = "PUT";
-/** TRACE method. */
-static constexpr const char *kTrace = "TRACE";
-/** Any HTTP method that the instrumentation has no prior knowledge of. */
-static constexpr const char *kOther = "_OTHER";
-}  // namespace HttpRequestMethodValues
-
-namespace JvmMemoryTypeValues
-{
-/** Heap memory. */
-static constexpr const char *kHeap = "heap";
-/** Non-heap memory. */
-static constexpr const char *kNonHeap = "non_heap";
-}  // namespace JvmMemoryTypeValues
-
-namespace JvmThreadStateValues
-{
-/** A thread that has not yet started is in this state. */
-static constexpr const char *kNew = "new";
-/** A thread executing in the Java virtual machine is in this state. */
-static constexpr const char *kRunnable = "runnable";
-/** A thread that is blocked waiting for a monitor lock is in this state. */
-static constexpr const char *kBlocked = "blocked";
-/** A thread that is waiting indefinitely for another thread to perform a particular action is in
- * this state. */
-static constexpr const char *kWaiting = "waiting";
-/** A thread that is waiting for another thread to perform an action for up to a specified waiting
- * time is in this state. */
-static constexpr const char *kTimedWaiting = "timed_waiting";
-/** A thread that has exited is in this state. */
-static constexpr const char *kTerminated = "terminated";
-}  // namespace JvmThreadStateValues
-
-namespace LinuxMemorySlabStateValues
-{
-/** reclaimable. */
-static constexpr const char *kReclaimable = "reclaimable";
-/** unreclaimable. */
-static constexpr const char *kUnreclaimable = "unreclaimable";
-}  // namespace LinuxMemorySlabStateValues
-
-namespace LogIostreamValues
-{
-/** Logs from stdout stream. */
-static constexpr const char *kStdout = "stdout";
-/** Events from stderr stream. */
-static constexpr const char *kStderr = "stderr";
-}  // namespace LogIostreamValues
-
-namespace MessagingOperationTypeValues
-{
-/** One or more messages are provided for publishing to an intermediary. If a single message is
- * published, the context of the &#34;Publish&#34; span can be used as the creation context and no
- * &#34;Create&#34; span needs to be created. */
-static constexpr const char *kPublish = "publish";
-/** A message is created. &#34;Create&#34; spans always refer to a single message and are used to
- * provide a unique creation context for messages in batch publishing scenarios. */
-static constexpr const char *kCreate = "create";
-/** One or more messages are requested by a consumer. This operation refers to pull-based scenarios,
- * where consumers explicitly call methods of messaging SDKs to receive messages. */
-static constexpr const char *kReceive = "receive";
-/** One or more messages are processed by a consumer. */
-static constexpr const char *kProcess = "process";
-/** One or more messages are settled. */
-static constexpr const char *kSettle = "settle";
-/** Deprecated. Use `process` instead. */
-static constexpr const char *kDeliver = "deliver";
-}  // namespace MessagingOperationTypeValues
-
-namespace MessagingSystemValues
-{
-/** Apache ActiveMQ. */
-static constexpr const char *kActivemq = "activemq";
-/** Amazon Simple Queue Service (SQS). */
-static constexpr const char *kAwsSqs = "aws_sqs";
-/** Azure Event Grid. */
-static constexpr const char *kEventgrid = "eventgrid";
-/** Azure Event Hubs. */
-static constexpr const char *kEventhubs = "eventhubs";
-/** Azure Service Bus. */
-static constexpr const char *kServicebus = "servicebus";
-/** Google Cloud Pub/Sub. */
-static constexpr const char *kGcpPubsub = "gcp_pubsub";
-/** Java Message Service. */
-static constexpr const char *kJms = "jms";
-/** Apache Kafka. */
-static constexpr const char *kKafka = "kafka";
-/** RabbitMQ. */
-static constexpr const char *kRabbitmq = "rabbitmq";
-/** Apache RocketMQ. */
-static constexpr const char *kRocketmq = "rocketmq";
-/** Apache Pulsar. */
-static constexpr const char *kPulsar = "pulsar";
-}  // namespace MessagingSystemValues
-
-namespace MessagingRocketmqConsumptionModelValues
-{
-/** Clustering consumption model. */
-static constexpr const char *kClustering = "clustering";
-/** Broadcasting consumption model. */
-static constexpr const char *kBroadcasting = "broadcasting";
-}  // namespace MessagingRocketmqConsumptionModelValues
-
-namespace MessagingRocketmqMessageTypeValues
-{
-/** Normal message. */
-static constexpr const char *kNormal = "normal";
-/** FIFO message. */
-static constexpr const char *kFifo = "fifo";
-/** Delay message. */
-static constexpr const char *kDelay = "delay";
-/** Transaction message. */
-static constexpr const char *kTransaction = "transaction";
-}  // namespace MessagingRocketmqMessageTypeValues
-
-namespace MessagingServicebusDispositionStatusValues
-{
-/** Message is completed. */
-static constexpr const char *kComplete = "complete";
-/** Message is abandoned. */
-static constexpr const char *kAbandon = "abandon";
-/** Message is sent to dead letter queue. */
-static constexpr const char *kDeadLetter = "dead_letter";
-/** Message is deferred. */
-static constexpr const char *kDefer = "defer";
-}  // namespace MessagingServicebusDispositionStatusValues
-
-namespace NetworkConnectionSubtypeValues
-{
-/** GPRS. */
-static constexpr const char *kGprs = "gprs";
-/** EDGE. */
-static constexpr const char *kEdge = "edge";
-/** UMTS. */
-static constexpr const char *kUmts = "umts";
-/** CDMA. */
-static constexpr const char *kCdma = "cdma";
-/** EVDO Rel. 0. */
-static constexpr const char *kEvdo0 = "evdo_0";
-/** EVDO Rev. A. */
-static constexpr const char *kEvdoA = "evdo_a";
-/** CDMA2000 1XRTT. */
-static constexpr const char *kCdma20001xrtt = "cdma2000_1xrtt";
-/** HSDPA. */
-static constexpr const char *kHsdpa = "hsdpa";
-/** HSUPA. */
-static constexpr const char *kHsupa = "hsupa";
-/** HSPA. */
-static constexpr const char *kHspa = "hspa";
-/** IDEN. */
-static constexpr const char *kIden = "iden";
-/** EVDO Rev. B. */
-static constexpr const char *kEvdoB = "evdo_b";
-/** LTE. */
-static constexpr const char *kLte = "lte";
-/** EHRPD. */
-static constexpr const char *kEhrpd = "ehrpd";
-/** HSPAP. */
-static constexpr const char *kHspap = "hspap";
-/** GSM. */
-static constexpr const char *kGsm = "gsm";
-/** TD-SCDMA. */
-static constexpr const char *kTdScdma = "td_scdma";
-/** IWLAN. */
-static constexpr const char *kIwlan = "iwlan";
-/** 5G NR (New Radio). */
-static constexpr const char *kNr = "nr";
-/** 5G NRNSA (New Radio Non-Standalone). */
-static constexpr const char *kNrnsa = "nrnsa";
-/** LTE CA. */
-static constexpr const char *kLteCa = "lte_ca";
-}  // namespace NetworkConnectionSubtypeValues
-
-namespace NetworkConnectionTypeValues
-{
-/** wifi. */
-static constexpr const char *kWifi = "wifi";
-/** wired. */
-static constexpr const char *kWired = "wired";
-/** cell. */
-static constexpr const char *kCell = "cell";
-/** unavailable. */
-static constexpr const char *kUnavailable = "unavailable";
-/** unknown. */
-static constexpr const char *kUnknown = "unknown";
-}  // namespace NetworkConnectionTypeValues
-
-namespace NetworkIoDirectionValues
-{
-/** transmit. */
-static constexpr const char *kTransmit = "transmit";
-/** receive. */
-static constexpr const char *kReceive = "receive";
-}  // namespace NetworkIoDirectionValues
-
-namespace NetworkTransportValues
-{
-/** TCP. */
-static constexpr const char *kTcp = "tcp";
-/** UDP. */
-static constexpr const char *kUdp = "udp";
-/** Named or anonymous pipe. */
-static constexpr const char *kPipe = "pipe";
-/** Unix domain socket. */
-static constexpr const char *kUnix = "unix";
-/** QUIC. */
-static constexpr const char *kQuic = "quic";
-}  // namespace NetworkTransportValues
-
-namespace NetworkTypeValues
-{
-/** IPv4. */
-static constexpr const char *kIpv4 = "ipv4";
-/** IPv6. */
-static constexpr const char *kIpv6 = "ipv6";
-}  // namespace NetworkTypeValues
-
-namespace OpentracingRefTypeValues
-{
-/** The parent Span depends on the child Span in some capacity. */
-static constexpr const char *kChildOf = "child_of";
-/** The parent Span doesn&#39;t depend in any way on the result of the child Span. */
-static constexpr const char *kFollowsFrom = "follows_from";
-}  // namespace OpentracingRefTypeValues
-
-namespace OsTypeValues
-{
-/** Microsoft Windows. */
-static constexpr const char *kWindows = "windows";
-/** Linux. */
-static constexpr const char *kLinux = "linux";
-/** Apple Darwin. */
-static constexpr const char *kDarwin = "darwin";
-/** FreeBSD. */
-static constexpr const char *kFreebsd = "freebsd";
-/** NetBSD. */
-static constexpr const char *kNetbsd = "netbsd";
-/** OpenBSD. */
-static constexpr const char *kOpenbsd = "openbsd";
-/** DragonFly BSD. */
-static constexpr const char *kDragonflybsd = "dragonflybsd";
-/** HP-UX (Hewlett Packard Unix). */
-static constexpr const char *kHpux = "hpux";
-/** AIX (Advanced Interactive eXecutive). */
-static constexpr const char *kAix = "aix";
-/** SunOS, Oracle Solaris. */
-static constexpr const char *kSolaris = "solaris";
-/** IBM z/OS. */
-static constexpr const char *kZOs = "z_os";
-}  // namespace OsTypeValues
-
-namespace OtelStatusCodeValues
-{
-/** The operation has been validated by an Application developer or Operator to have completed
- * successfully. */
-static constexpr const char *kOk = "OK";
-/** The operation contains an error. */
-static constexpr const char *kError = "ERROR";
-}  // namespace OtelStatusCodeValues
-
-namespace ProcessContextSwitchTypeValues
-{
-/** voluntary. */
-static constexpr const char *kVoluntary = "voluntary";
-/** involuntary. */
-static constexpr const char *kInvoluntary = "involuntary";
-}  // namespace ProcessContextSwitchTypeValues
-
-namespace ProcessPagingFaultTypeValues
-{
-/** major. */
-static constexpr const char *kMajor = "major";
-/** minor. */
-static constexpr const char *kMinor = "minor";
-}  // namespace ProcessPagingFaultTypeValues
-
-namespace RpcConnectRpcErrorCodeValues
-{
-/** cancelled. */
-static constexpr const char *kCancelled = "cancelled";
-/** unknown. */
-static constexpr const char *kUnknown = "unknown";
-/** invalid_argument. */
-static constexpr const char *kInvalidArgument = "invalid_argument";
-/** deadline_exceeded. */
-static constexpr const char *kDeadlineExceeded = "deadline_exceeded";
-/** not_found. */
-static constexpr const char *kNotFound = "not_found";
-/** already_exists. */
-static constexpr const char *kAlreadyExists = "already_exists";
-/** permission_denied. */
-static constexpr const char *kPermissionDenied = "permission_denied";
-/** resource_exhausted. */
-static constexpr const char *kResourceExhausted = "resource_exhausted";
-/** failed_precondition. */
-static constexpr const char *kFailedPrecondition = "failed_precondition";
-/** aborted. */
-static constexpr const char *kAborted = "aborted";
-/** out_of_range. */
-static constexpr const char *kOutOfRange = "out_of_range";
-/** unimplemented. */
-static constexpr const char *kUnimplemented = "unimplemented";
-/** internal. */
-static constexpr const char *kInternal = "internal";
-/** unavailable. */
-static constexpr const char *kUnavailable = "unavailable";
-/** data_loss. */
-static constexpr const char *kDataLoss = "data_loss";
-/** unauthenticated. */
-static constexpr const char *kUnauthenticated = "unauthenticated";
-}  // namespace RpcConnectRpcErrorCodeValues
-
-namespace RpcGrpcStatusCodeValues
-{
-/** OK. */
-static constexpr const int kOk = 0;
-/** CANCELLED. */
-static constexpr const int kCancelled = 1;
-/** UNKNOWN. */
-static constexpr const int kUnknown = 2;
-/** INVALID_ARGUMENT. */
-static constexpr const int kInvalidArgument = 3;
-/** DEADLINE_EXCEEDED. */
-static constexpr const int kDeadlineExceeded = 4;
-/** NOT_FOUND. */
-static constexpr const int kNotFound = 5;
-/** ALREADY_EXISTS. */
-static constexpr const int kAlreadyExists = 6;
-/** PERMISSION_DENIED. */
-static constexpr const int kPermissionDenied = 7;
-/** RESOURCE_EXHAUSTED. */
-static constexpr const int kResourceExhausted = 8;
-/** FAILED_PRECONDITION. */
-static constexpr const int kFailedPrecondition = 9;
-/** ABORTED. */
-static constexpr const int kAborted = 10;
-/** OUT_OF_RANGE. */
-static constexpr const int kOutOfRange = 11;
-/** UNIMPLEMENTED. */
-static constexpr const int kUnimplemented = 12;
-/** INTERNAL. */
-static constexpr const int kInternal = 13;
-/** UNAVAILABLE. */
-static constexpr const int kUnavailable = 14;
-/** DATA_LOSS. */
-static constexpr const int kDataLoss = 15;
-/** UNAUTHENTICATED. */
-static constexpr const int kUnauthenticated = 16;
-}  // namespace RpcGrpcStatusCodeValues
-
-namespace RpcMessageTypeValues
-{
-/** sent. */
-static constexpr const char *kSent = "SENT";
-/** received. */
-static constexpr const char *kReceived = "RECEIVED";
-}  // namespace RpcMessageTypeValues
-
-namespace RpcSystemValues
-{
-/** gRPC. */
-static constexpr const char *kGrpc = "grpc";
-/** Java RMI. */
-static constexpr const char *kJavaRmi = "java_rmi";
-/** .NET WCF. */
-static constexpr const char *kDotnetWcf = "dotnet_wcf";
-/** Apache Dubbo. */
-static constexpr const char *kApacheDubbo = "apache_dubbo";
-/** Connect RPC. */
-static constexpr const char *kConnectRpc = "connect_rpc";
-}  // namespace RpcSystemValues
-
-namespace SignalrConnectionStatusValues
-{
-/** The connection was closed normally. */
-static constexpr const char *kNormalClosure = "normal_closure";
-/** The connection was closed due to a timeout. */
-static constexpr const char *kTimeout = "timeout";
-/** The connection was closed because the app is shutting down. */
-static constexpr const char *kAppShutdown = "app_shutdown";
-}  // namespace SignalrConnectionStatusValues
-
-namespace SignalrTransportValues
-{
-/** ServerSentEvents protocol. */
-static constexpr const char *kServerSentEvents = "server_sent_events";
-/** LongPolling protocol. */
-static constexpr const char *kLongPolling = "long_polling";
-/** WebSockets protocol. */
-static constexpr const char *kWebSockets = "web_sockets";
-}  // namespace SignalrTransportValues
-
-namespace SystemMemoryStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-/** shared. */
-static constexpr const char *kShared = "shared";
-/** buffers. */
-static constexpr const char *kBuffers = "buffers";
-/** cached. */
-static constexpr const char *kCached = "cached";
-}  // namespace SystemMemoryStateValues
-
-namespace SystemPagingDirectionValues
-{
-/** in. */
-static constexpr const char *kIn = "in";
-/** out. */
-static constexpr const char *kOut = "out";
-}  // namespace SystemPagingDirectionValues
-
-namespace SystemPagingStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-}  // namespace SystemPagingStateValues
-
-namespace SystemPagingTypeValues
-{
-/** major. */
-static constexpr const char *kMajor = "major";
-/** minor. */
-static constexpr const char *kMinor = "minor";
-}  // namespace SystemPagingTypeValues
-
-namespace SystemFilesystemStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-/** reserved. */
-static constexpr const char *kReserved = "reserved";
-}  // namespace SystemFilesystemStateValues
-
-namespace SystemFilesystemTypeValues
-{
-/** fat32. */
-static constexpr const char *kFat32 = "fat32";
-/** exfat. */
-static constexpr const char *kExfat = "exfat";
-/** ntfs. */
-static constexpr const char *kNtfs = "ntfs";
-/** refs. */
-static constexpr const char *kRefs = "refs";
-/** hfsplus. */
-static constexpr const char *kHfsplus = "hfsplus";
-/** ext4. */
-static constexpr const char *kExt4 = "ext4";
-}  // namespace SystemFilesystemTypeValues
-
-namespace SystemNetworkStateValues
-{
-/** close. */
-static constexpr const char *kClose = "close";
-/** close_wait. */
-static constexpr const char *kCloseWait = "close_wait";
-/** closing. */
-static constexpr const char *kClosing = "closing";
-/** delete. */
-static constexpr const char *kDelete = "delete";
-/** established. */
-static constexpr const char *kEstablished = "established";
-/** fin_wait_1. */
-static constexpr const char *kFinWait1 = "fin_wait_1";
-/** fin_wait_2. */
-static constexpr const char *kFinWait2 = "fin_wait_2";
-/** last_ack. */
-static constexpr const char *kLastAck = "last_ack";
-/** listen. */
-static constexpr const char *kListen = "listen";
-/** syn_recv. */
-static constexpr const char *kSynRecv = "syn_recv";
-/** syn_sent. */
-static constexpr const char *kSynSent = "syn_sent";
-/** time_wait. */
-static constexpr const char *kTimeWait = "time_wait";
-}  // namespace SystemNetworkStateValues
-
-namespace SystemProcessStatusValues
-{
-/** running. */
-static constexpr const char *kRunning = "running";
-/** sleeping. */
-static constexpr const char *kSleeping = "sleeping";
-/** stopped. */
-static constexpr const char *kStopped = "stopped";
-/** defunct. */
-static constexpr const char *kDefunct = "defunct";
-}  // namespace SystemProcessStatusValues
-
-namespace TelemetrySdkLanguageValues
-{
-/** cpp. */
-static constexpr const char *kCpp = "cpp";
-/** dotnet. */
-static constexpr const char *kDotnet = "dotnet";
-/** erlang. */
-static constexpr const char *kErlang = "erlang";
-/** go. */
-static constexpr const char *kGo = "go";
-/** java. */
-static constexpr const char *kJava = "java";
-/** nodejs. */
-static constexpr const char *kNodejs = "nodejs";
-/** php. */
-static constexpr const char *kPhp = "php";
-/** python. */
-static constexpr const char *kPython = "python";
-/** ruby. */
-static constexpr const char *kRuby = "ruby";
-/** rust. */
-static constexpr const char *kRust = "rust";
-/** swift. */
-static constexpr const char *kSwift = "swift";
-/** webjs. */
-static constexpr const char *kWebjs = "webjs";
-}  // namespace TelemetrySdkLanguageValues
-
-namespace TestCaseResultStatusValues
-{
-/** pass. */
-static constexpr const char *kPass = "pass";
-/** fail. */
-static constexpr const char *kFail = "fail";
-}  // namespace TestCaseResultStatusValues
-
-namespace TestSuiteRunStatusValues
-{
-/** success. */
-static constexpr const char *kSuccess = "success";
-/** failure. */
-static constexpr const char *kFailure = "failure";
-/** skipped. */
-static constexpr const char *kSkipped = "skipped";
-/** aborted. */
-static constexpr const char *kAborted = "aborted";
-/** timed_out. */
-static constexpr const char *kTimedOut = "timed_out";
-/** in_progress. */
-static constexpr const char *kInProgress = "in_progress";
-}  // namespace TestSuiteRunStatusValues
-
-namespace TlsProtocolNameValues
-{
-/** ssl. */
-static constexpr const char *kSsl = "ssl";
-/** tls. */
-static constexpr const char *kTls = "tls";
-}  // namespace TlsProtocolNameValues
-
-namespace V8jsGcTypeValues
-{
-/** Major (Mark Sweep Compact). */
-static constexpr const char *kMajor = "major";
-/** Minor (Scavenge). */
-static constexpr const char *kMinor = "minor";
-/** Incremental (Incremental Marking). */
-static constexpr const char *kIncremental = "incremental";
-/** Weak Callbacks (Process Weak Callbacks). */
-static constexpr const char *kWeakcb = "weakcb";
-}  // namespace V8jsGcTypeValues
-
-namespace V8jsHeapSpaceNameValues
-{
-/** New memory space. */
-static constexpr const char *kNewSpace = "new_space";
-/** Old memory space. */
-static constexpr const char *kOldSpace = "old_space";
-/** Code memory space. */
-static constexpr const char *kCodeSpace = "code_space";
-/** Map memory space. */
-static constexpr const char *kMapSpace = "map_space";
-/** Large object memory space. */
-static constexpr const char *kLargeObjectSpace = "large_object_space";
-}  // namespace V8jsHeapSpaceNameValues
-
-namespace VcsRepositoryRefTypeValues
-{
-/** [branch](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch). */
-static constexpr const char *kBranch = "branch";
-/** [tag](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag). */
-static constexpr const char *kTag = "tag";
-}  // namespace VcsRepositoryRefTypeValues
-
-}  // namespace SemanticConventions
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span.h
deleted file mode 100644
index f26e38e4e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span.h
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_metadata.h"
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-class Tracer;
-
-/**
- * A Span represents a single operation within a Trace.
- *
- * Span attributes can be provided:
- * - at span creation time, using Tracer::StartSpan(),
- * - during the span lifetime, using Span::SetAttribute()
- *
- * Please note that head samplers,
- * in the SDK (@ref opentelemetry::sdk::trace::Sampler),
- * can only make sampling decisions based on data known
- * at span creation time.
- *
- * When attributes are known early, adding attributes
- * with @ref opentelemetry::trace::Tracer::StartSpan() is preferable.
- *
- * Attributes added or changed with Span::SetAttribute()
- * can not change a sampler decision.
- *
- * Likewise, links can be provided:
- * - at span creation time, using Tracer::StartSpan(),
- * - during the span lifetime, using Span::AddLink() or Span::AddLinks().
- *
- * When links are known early, adding links
- * with @ref opentelemetry::trace::Tracer::StartSpan() is preferable.
- *
- * Links added with Span::AddLink() or Span::AddLinks()
- * can not change a sampler decision.
- */
-class Span
-{
-public:
-  // Note that Spans should be created using the Tracer class. Please refer to
-  // tracer.h for documentation.
-  Span() = default;
-
-  // The Span destructor End()s the Span, if it hasn't been ended already.
-  virtual ~Span() = default;
-
-  // Not copiable or movable.
-  Span(const Span &)            = delete;
-  Span(Span &&)                 = delete;
-  Span &operator=(const Span &) = delete;
-  Span &operator=(Span &&)      = delete;
-
-  /**
-   * Sets an attribute on the Span (ABI).
-   *
-   * If the Span previously contained a mapping for the key,
-   * the old value is replaced.
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   */
-  virtual void SetAttribute(nostd::string_view key,
-                            const common::AttributeValue &value) noexcept = 0;
-
-  // Adds an event to the Span.
-  virtual void AddEvent(nostd::string_view name) noexcept = 0;
-
-  // Adds an event to the Span, with a custom timestamp.
-  virtual void AddEvent(nostd::string_view name, common::SystemTimestamp timestamp) noexcept = 0;
-
-  // Adds an event to the Span, with a custom timestamp, and attributes.
-  virtual void AddEvent(nostd::string_view name,
-                        common::SystemTimestamp timestamp,
-                        const common::KeyValueIterable &attributes) noexcept = 0;
-
-  virtual void AddEvent(nostd::string_view name,
-                        const common::KeyValueIterable &attributes) noexcept
-  {
-    this->AddEvent(name, std::chrono::system_clock::now(), attributes);
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  void AddEvent(nostd::string_view name,
-                common::SystemTimestamp timestamp,
-                const T &attributes) noexcept
-  {
-    this->AddEvent(name, timestamp, common::KeyValueIterableView<T>{attributes});
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  void AddEvent(nostd::string_view name, const T &attributes) noexcept
-  {
-    this->AddEvent(name, common::KeyValueIterableView<T>{attributes});
-  }
-
-  void AddEvent(nostd::string_view name,
-                common::SystemTimestamp timestamp,
-                std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                    attributes) noexcept
-  {
-    this->AddEvent(name, timestamp,
-                   nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                       attributes.begin(), attributes.end()});
-  }
-
-  void AddEvent(nostd::string_view name,
-                std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                    attributes) noexcept
-  {
-    this->AddEvent(name, std::chrono::system_clock::now(),
-                   nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                       attributes.begin(), attributes.end()});
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Add link (ABI).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  virtual void AddLink(const SpanContext &target,
-                       const common::KeyValueIterable &attrs) noexcept = 0;
-
-  /**
-   * Add links (ABI).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  virtual void AddLinks(const SpanContextKeyValueIterable &links) noexcept = 0;
-
-  /**
-   * Add link (API helper).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void AddLink(const SpanContext &target, const U &attrs)
-  {
-    common::KeyValueIterableView<U> view(attrs);
-    this->AddLink(target, view);
-  }
-
-  /**
-   * Add link (API helper).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  void AddLink(const SpanContext &target,
-               std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attrs)
-  {
-    /* Build a container from std::initializer_list. */
-    nostd::span<const std::pair<nostd::string_view, common::AttributeValue>> container{
-        attrs.begin(), attrs.end()};
-
-    /* Build a view on the container. */
-    common::KeyValueIterableView<
-        nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>>
-        view(container);
-
-    return this->AddLink(target, view);
-  }
-
-  /**
-   * Add links (API helper).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  template <class U, nostd::enable_if_t<detail::is_span_context_kv_iterable<U>::value> * = nullptr>
-  void AddLinks(const U &links)
-  {
-    SpanContextKeyValueIterableView<U> view(links);
-    this->AddLinks(view);
-  }
-
-  /**
-   * Add links (API helper).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  void AddLinks(
-      std::initializer_list<
-          std::pair<SpanContext,
-                    std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>
-          links)
-  {
-    /* Build a container from std::initializer_list. */
-    nostd::span<const std::pair<
-        SpanContext, std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>
-        container{links.begin(), links.end()};
-
-    /* Build a view on the container. */
-    SpanContextKeyValueIterableView<nostd::span<const std::pair<
-        SpanContext, std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>>
-        view(container);
-
-    return this->AddLinks(view);
-  }
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-  // Sets the status of the span. The default status is Unset. Only the value of
-  // the last call will be
-  // recorded, and implementations are free to ignore previous calls.
-  virtual void SetStatus(StatusCode code, nostd::string_view description = "") noexcept = 0;
-
-  // Updates the name of the Span. If used, this will override the name provided
-  // during creation.
-  virtual void UpdateName(nostd::string_view name) noexcept = 0;
-
-  /**
-   * Mark the end of the Span.
-   * Only the timing of the first End call for a given Span will be recorded,
-   * and implementations are free to ignore all further calls.
-   * @param options can be used to manually define span properties like the end
-   * timestamp
-   */
-  virtual void End(const trace::EndSpanOptions &options = {}) noexcept = 0;
-
-  virtual trace::SpanContext GetContext() const noexcept = 0;
-
-  // Returns true if this Span is recording tracing events (e.g. SetAttribute,
-  // AddEvent).
-  virtual bool IsRecording() const noexcept = 0;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context.h
deleted file mode 100644
index a1948231b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-
-#include <utility>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-/* SpanContext contains the state that must propagate to child Spans and across
- * process boundaries. It contains TraceId and SpanId, TraceFlags, TraceState
- * and whether it was propagated from a remote parent.
- */
-class SpanContext final
-{
-public:
-  /* A temporary constructor for an invalid SpanContext.
-   * Trace id and span id are set to invalid (all zeros).
-   *
-   * @param sampled_flag a required parameter specifying if child spans should be
-   * sampled
-   * @param is_remote true if this context was propagated from a remote parent.
-   */
-  SpanContext(bool sampled_flag, bool is_remote) noexcept
-      : trace_id_(),
-        span_id_(),
-        trace_flags_(trace::TraceFlags(static_cast<uint8_t>(sampled_flag))),
-        is_remote_(is_remote),
-        trace_state_(TraceState::GetDefault())
-  {}
-
-  SpanContext(TraceId trace_id,
-              SpanId span_id,
-              TraceFlags trace_flags,
-              bool is_remote,
-              nostd::shared_ptr<TraceState> trace_state = TraceState::GetDefault()) noexcept
-      : trace_id_(trace_id),
-        span_id_(span_id),
-        trace_flags_(trace_flags),
-        is_remote_(is_remote),
-        trace_state_(std::move(trace_state))
-  {}
-
-  SpanContext(const SpanContext &ctx) = default;
-
-  // @returns whether this context is valid
-  bool IsValid() const noexcept { return trace_id_.IsValid() && span_id_.IsValid(); }
-
-  // @returns the trace_flags associated with this span_context
-  const trace::TraceFlags &trace_flags() const noexcept { return trace_flags_; }
-
-  // @returns the trace_id associated with this span_context
-  const trace::TraceId &trace_id() const noexcept { return trace_id_; }
-
-  // @returns the span_id associated with this span_context
-  const trace::SpanId &span_id() const noexcept { return span_id_; }
-
-  // @returns the trace_state associated with this span_context
-  const nostd::shared_ptr<trace::TraceState> &trace_state() const noexcept { return trace_state_; }
-
-  /*
-   * @param that SpanContext for comparing.
-   * @return true if `that` equals the current SpanContext.
-   * N.B. trace_state is ignored for the comparison.
-   */
-  bool operator==(const SpanContext &that) const noexcept
-  {
-    return trace_id() == that.trace_id() && span_id() == that.span_id() &&
-           trace_flags() == that.trace_flags();
-  }
-
-  SpanContext &operator=(const SpanContext &ctx) = default;
-
-  bool IsRemote() const noexcept { return is_remote_; }
-
-  static SpanContext GetInvalid() noexcept { return SpanContext(false, false); }
-
-  bool IsSampled() const noexcept { return trace_flags_.IsSampled(); }
-
-private:
-  trace::TraceId trace_id_;
-  trace::SpanId span_id_;
-  trace::TraceFlags trace_flags_;
-  bool is_remote_;
-  nostd::shared_ptr<trace::TraceState> trace_state_;
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context_kv_iterable.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context_kv_iterable.h
deleted file mode 100644
index aed347427..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context_kv_iterable.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-/**
- * Supports internal iteration over a collection of SpanContext/key-value pairs.
- */
-class SpanContextKeyValueIterable
-{
-public:
-  virtual ~SpanContextKeyValueIterable() = default;
-
-  /**
-   * Iterate over SpanContext/key-value pairs
-   * @param callback a callback to invoke for each key-value for each SpanContext.
-   * If the callback returns false, the iteration is aborted.
-   * @return true if every SpanContext/key-value pair was iterated over
-   */
-  virtual bool ForEachKeyValue(
-      nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)> callback)
-      const noexcept = 0;
-  /**
-   * @return the number of key-value pairs
-   */
-  virtual size_t size() const noexcept = 0;
-};
-
-/**
- * @brief Null Span context that does not carry any information.
- */
-class NullSpanContext : public SpanContextKeyValueIterable
-{
-public:
-  bool ForEachKeyValue(nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)>
-                       /* callback */) const noexcept override
-  {
-    return true;
-  }
-
-  size_t size() const noexcept override { return 0; }
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context_kv_iterable_view.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context_kv_iterable_view.h
deleted file mode 100644
index 8c4584dc2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_context_kv_iterable_view.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <iterator>
-#include <type_traits>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-// NOTE - code within `detail` namespace implements internal details, and not part
-// of the public interface.
-namespace detail
-{
-template <class T>
-inline void take_span_context_kv(SpanContext, opentelemetry::common::KeyValueIterableView<T>)
-{}
-
-template <class T, nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-inline void take_span_context_kv(SpanContext, T &)
-{}
-
-inline void take_span_context_kv(
-    SpanContext,
-    std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>)
-{}
-
-template <class T>
-auto is_span_context_kv_iterable_impl(T iterable)
-    -> decltype(take_span_context_kv(std::begin(iterable)->first, std::begin(iterable)->second),
-                nostd::size(iterable),
-                std::true_type{});
-
-std::false_type is_span_context_kv_iterable_impl(...);
-
-template <class T>
-struct is_span_context_kv_iterable
-{
-  static const bool value =
-      decltype(detail::is_span_context_kv_iterable_impl(std::declval<T>()))::value;
-};
-}  // namespace detail
-
-template <class T>
-class SpanContextKeyValueIterableView final : public SpanContextKeyValueIterable
-{
-  static_assert(detail::is_span_context_kv_iterable<T>::value,
-                "Must be a context/key-value iterable");
-
-public:
-  explicit SpanContextKeyValueIterableView(const T &links) noexcept : container_{&links} {}
-
-  bool ForEachKeyValue(nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)>
-                           callback) const noexcept override
-  {
-    auto iter = std::begin(*container_);
-    auto last = std::end(*container_);
-    for (; iter != last; ++iter)
-    {
-      if (!this->do_callback(iter->first, iter->second, callback))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  size_t size() const noexcept override { return nostd::size(*container_); }
-
-private:
-  const T *container_;
-
-  bool do_callback(SpanContext span_context,
-                   const common::KeyValueIterable &attributes,
-                   nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)>
-                       callback) const noexcept
-  {
-    if (!callback(span_context, attributes))
-    {
-      return false;
-    }
-    return true;
-  }
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  bool do_callback(SpanContext span_context,
-                   const U &attributes,
-                   nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)>
-                       callback) const noexcept
-  {
-    return do_callback(span_context, common::KeyValueIterableView<U>(attributes), callback);
-  }
-
-  bool do_callback(
-      SpanContext span_context,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)> callback)
-      const noexcept
-  {
-    return do_callback(span_context,
-                       nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                           attributes.begin(), attributes.end()},
-                       callback);
-  }
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_id.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_id.h
deleted file mode 100644
index 19511040d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_id.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-#include <cstring>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-class SpanId final
-{
-public:
-  // The size in bytes of the SpanId.
-  static constexpr int kSize = 8;
-
-  // An invalid SpanId (all zeros).
-  SpanId() noexcept : rep_{0} {}
-
-  // Creates a SpanId with the given ID.
-  explicit SpanId(nostd::span<const uint8_t, kSize> id) noexcept { memcpy(rep_, id.data(), kSize); }
-
-  // Populates the buffer with the lowercase base16 representation of the ID.
-  void ToLowerBase16(nostd::span<char, 2 * kSize> buffer) const noexcept
-  {
-    constexpr char kHex[] = "0123456789abcdef";
-    for (int i = 0; i < kSize; ++i)
-    {
-      buffer[i * 2 + 0] = kHex[(rep_[i] >> 4) & 0xF];
-      buffer[i * 2 + 1] = kHex[(rep_[i] >> 0) & 0xF];
-    }
-  }
-
-  // Returns a nostd::span of the ID.
-  nostd::span<const uint8_t, kSize> Id() const noexcept
-  {
-    return nostd::span<const uint8_t, kSize>(rep_);
-  }
-
-  bool operator==(const SpanId &that) const noexcept { return memcmp(rep_, that.rep_, kSize) == 0; }
-
-  bool operator!=(const SpanId &that) const noexcept { return !(*this == that); }
-
-  // Returns false if the SpanId is all zeros.
-  bool IsValid() const noexcept
-  {
-    static constexpr uint8_t kEmptyRep[kSize] = {0};
-    return memcmp(rep_, kEmptyRep, kSize) != 0;
-  }
-
-  // Copies the opaque SpanId data to dest.
-  void CopyBytesTo(nostd::span<uint8_t, kSize> dest) const noexcept
-  {
-    memcpy(dest.data(), rep_, kSize);
-  }
-
-private:
-  uint8_t rep_[kSize];
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_metadata.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_metadata.h
deleted file mode 100644
index d2d6a9f85..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_metadata.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-enum class SpanKind
-{
-  kInternal,
-  kServer,
-  kClient,
-  kProducer,
-  kConsumer,
-};
-
-// The key identifies the active span in the current context.
-constexpr char kSpanKey[]       = "active_span";
-constexpr char kIsRootSpanKey[] = "is_root_span";
-
-// StatusCode - Represents the canonical set of status codes of a finished Span.
-enum class StatusCode
-{
-  kUnset,  // default status
-  kOk,     // Operation has completed successfully.
-  kError   // The operation contains an error
-};
-
-/**
- * EndSpanOptions provides options to set properties of a Span when it is
- * ended.
- */
-struct EndSpanOptions
-{
-  // Optionally sets the end time of a Span.
-  common::SteadyTimestamp end_steady_time;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_startoptions.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_startoptions.h
deleted file mode 100644
index 8a2165b0f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/span_startoptions.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * StartSpanOptions provides options to set properties of a Span at the time of
- * its creation
- */
-struct StartSpanOptions
-{
-  // Optionally sets the start time of a Span.
-  //
-  // If the start time of a Span is set, timestamps from both the system clock
-  // and steady clock must be provided.
-  //
-  // Timestamps from the steady clock can be used to most accurately measure a
-  // Span's duration, while timestamps from the system clock can be used to most
-  // accurately place a Span's
-  // time point relative to other Spans collected across a distributed system.
-  common::SystemTimestamp start_system_time;
-  common::SteadyTimestamp start_steady_time;
-
-  // Explicitly set the parent of a Span.
-  //
-  // The `parent` field is designed to establish  parent-child relationships
-  // in tracing spans. It can be set to either a `SpanContext` or a
-  // `context::Context` object.
-  //
-  // - When set to valid `SpanContext`, it directly assigns a specific Span as the parent
-  // of the newly created Span.
-  //
-  // - Alternatively, setting the `parent` field to a `context::Context` allows for
-  // more nuanced parent identification:
-  //   1. If the `Context` contains a Span object, this Span is treated as the parent.
-  //   2. If the `Context` contains the boolean flag `is_root_span` set to `true`,
-  //      it indicates that the new Span should be treated as a root Span, i.e., it
-  //      does not have a parent Span.
-  //   Example Usage:
-  //   ```cpp
-  //   trace_api::StartSpanOptions options;
-  //   opentelemetry::context::Context root;
-  //   root                    = root.SetValue(kIsRootSpanKey, true);
-  //   options.parent = root;
-  //   auto root_span = tracer->StartSpan("span root", options);
-  //  ```
-  //
-  // - If the `parent` field is not set, the newly created Span will inherit the
-  // parent of the currently active Span (if any) in the current context.
-  //
-  nostd::variant<SpanContext, context::Context> parent = SpanContext::GetInvalid();
-
-  // TODO:
-  // SpanContext remote_parent;
-  // Links
-  SpanKind kind = SpanKind::kInternal;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_flags.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_flags.h
deleted file mode 100644
index 0ad9dc136..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_flags.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-// TraceFlags represents options for a Trace. These options are propagated to all child Spans
-// and determine features such as whether a Span should be traced. TraceFlags
-// are implemented as a bitmask.
-class TraceFlags final
-{
-public:
-  static constexpr uint8_t kIsSampled = 1;
-  static constexpr uint8_t kIsRandom  = 2;
-
-  /**
-   * Valid flags in W3C Trace Context version 1.
-   * See https://www.w3.org/TR/trace-context-1/#trace-flags
-   */
-  static constexpr uint8_t kAllW3CTraceContext1Flags = kIsSampled;
-
-  /**
-   * Valid flags in W3C Trace Context version 2.
-   * See https://www.w3.org/TR/trace-context-1/#trace-flags
-   */
-  static constexpr uint8_t kAllW3CTraceContext2Flags = kIsSampled | kIsRandom;
-
-  TraceFlags() noexcept : rep_{0} {}
-
-  explicit TraceFlags(uint8_t flags) noexcept : rep_(flags) {}
-
-  bool IsSampled() const noexcept { return rep_ & kIsSampled; }
-
-  bool IsRandom() const noexcept { return rep_ & kIsRandom; }
-
-  // Populates the buffer with the lowercase base16 representation of the flags.
-  void ToLowerBase16(nostd::span<char, 2> buffer) const noexcept
-  {
-    constexpr char kHex[] = "0123456789ABCDEF";
-    buffer[0]             = kHex[(rep_ >> 4) & 0xF];
-    buffer[1]             = kHex[(rep_ >> 0) & 0xF];
-  }
-
-  uint8_t flags() const noexcept { return rep_; }
-
-  bool operator==(const TraceFlags &that) const noexcept { return rep_ == that.rep_; }
-
-  bool operator!=(const TraceFlags &that) const noexcept { return !(*this == that); }
-
-  // Copies the TraceFlags to dest.
-  void CopyBytesTo(nostd::span<uint8_t, 1> dest) const noexcept { dest[0] = rep_; }
-
-private:
-  uint8_t rep_;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_id.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_id.h
deleted file mode 100644
index 3a262c7a6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_id.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-#include <cstring>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-// TraceId represents an opaque 128-bit trace identifier. The trace identifier
-// remains constant across the trace. A valid trace identifier is a 16-byte array with at
-// least one non-zero byte.
-class TraceId final
-{
-public:
-  // The size in bytes of the TraceId.
-  static constexpr int kSize = 16;
-
-  // An invalid TraceId (all zeros).
-  TraceId() noexcept : rep_{0} {}
-
-  // Creates a TraceId with the given ID.
-  explicit TraceId(nostd::span<const uint8_t, kSize> id) noexcept
-  {
-    memcpy(rep_, id.data(), kSize);
-  }
-
-  // Populates the buffer with the lowercase base16 representation of the ID.
-  void ToLowerBase16(nostd::span<char, 2 * kSize> buffer) const noexcept
-  {
-    constexpr char kHex[] = "0123456789abcdef";
-    for (int i = 0; i < kSize; ++i)
-    {
-      buffer[i * 2 + 0] = kHex[(rep_[i] >> 4) & 0xF];
-      buffer[i * 2 + 1] = kHex[(rep_[i] >> 0) & 0xF];
-    }
-  }
-
-  // Returns a nostd::span of the ID.
-  nostd::span<const uint8_t, kSize> Id() const noexcept
-  {
-    return nostd::span<const uint8_t, kSize>(rep_);
-  }
-
-  bool operator==(const TraceId &that) const noexcept
-  {
-    return memcmp(rep_, that.rep_, kSize) == 0;
-  }
-
-  bool operator!=(const TraceId &that) const noexcept { return !(*this == that); }
-
-  // Returns false if the TraceId is all zeros.
-  bool IsValid() const noexcept { return *this != TraceId(); }
-
-  // Copies the opaque TraceId data to dest.
-  void CopyBytesTo(nostd::span<uint8_t, kSize> dest) const noexcept
-  {
-    memcpy(dest.data(), rep_, kSize);
-  }
-
-private:
-  uint8_t rep_[kSize];
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_state.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_state.h
deleted file mode 100644
index df7a0e0fe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/trace_state.h
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <ctype.h>
-#include <cstddef>
-#include <string>
-#include <vector>
-
-#include "opentelemetry/common/kv_properties.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-#  include <regex>
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * TraceState carries tracing-system specific context in a list of key-value pairs. TraceState
- * allows different vendors to propagate additional information and inter-operate with their legacy
- * id formats.
- *
- * For more information, see the W3C Trace Context specification:
- * https://www.w3.org/TR/trace-context
- */
-class OPENTELEMETRY_EXPORT TraceState
-{
-public:
-  static constexpr int kKeyMaxSize         = 256;
-  static constexpr int kValueMaxSize       = 256;
-  static constexpr int kMaxKeyValuePairs   = 32;
-  static constexpr auto kKeyValueSeparator = '=';
-  static constexpr auto kMembersSeparator  = ',';
-
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<TraceState> GetDefault()
-  {
-    static nostd::shared_ptr<TraceState> ts{new TraceState()};
-    return ts;
-  }
-
-  /**
-   * Returns shared_ptr to a newly created TraceState parsed from the header provided.
-   * @param header Encoding of the tracestate header defined by
-   * the W3C Trace Context specification https://www.w3.org/TR/trace-context/
-   * @return TraceState A new TraceState instance or DEFAULT
-   */
-  static nostd::shared_ptr<TraceState> FromHeader(nostd::string_view header) noexcept
-  {
-
-    common::KeyValueStringTokenizer kv_str_tokenizer(header);
-    size_t cnt = kv_str_tokenizer.NumTokens();  // upper bound on number of kv pairs
-    if (cnt > kMaxKeyValuePairs)
-    {
-      // trace state should be discarded if count exceeds
-      return GetDefault();
-    }
-
-    nostd::shared_ptr<TraceState> ts(new TraceState(cnt));
-    bool kv_valid;
-    nostd::string_view key, value;
-    while (kv_str_tokenizer.next(kv_valid, key, value) && ts->kv_properties_->Size() < cnt)
-    {
-      if (kv_valid == false)
-      {
-        return GetDefault();
-      }
-
-      if (!IsValidKey(key) || !IsValidValue(value))
-      {
-        // invalid header. return empty TraceState
-        ts->kv_properties_.reset(new common::KeyValueProperties());
-        break;
-      }
-
-      ts->kv_properties_->AddEntry(key, value);
-    }
-
-    return ts;
-  }
-
-  /**
-   * Creates a w3c tracestate header from TraceState object
-   */
-  std::string ToHeader() const noexcept
-  {
-    std::string header_s;
-    bool first = true;
-    kv_properties_->GetAllEntries(
-        [&header_s, &first](nostd::string_view key, nostd::string_view value) noexcept {
-          if (!first)
-          {
-            header_s.append(1, kMembersSeparator);
-          }
-          else
-          {
-            first = false;
-          }
-          header_s.append(std::string(key.data(), key.size()));
-          header_s.append(1, kKeyValueSeparator);
-          header_s.append(std::string(value.data(), value.size()));
-          return true;
-        });
-    return header_s;
-  }
-
-  /**
-   *  Returns `value` associated with `key` passed as argument
-   *  Returns empty string if key is invalid  or not found
-   */
-  bool Get(nostd::string_view key, std::string &value) const noexcept
-  {
-    if (!IsValidKey(key))
-    {
-      return false;
-    }
-
-    return kv_properties_->GetValue(key, value);
-  }
-
-  /**
-   * Returns shared_ptr of `new` TraceState object with following mutations applied to the existing
-   * instance: Update Key value: The updated value must be moved to beginning of List Add : The new
-   * key-value pair SHOULD be added to beginning of List
-   *
-   * If the provided key-value pair is invalid, or results in transtate that violates the
-   * tracecontext specification, empty TraceState instance will be returned.
-   *
-   * If the existing object has maximum list members, it's copy is returned.
-   */
-  nostd::shared_ptr<TraceState> Set(const nostd::string_view &key,
-                                    const nostd::string_view &value) noexcept
-  {
-    auto curr_size = kv_properties_->Size();
-    if (!IsValidKey(key) || !IsValidValue(value))
-    {
-      // max size reached or invalid key/value. Returning empty TraceState
-      return TraceState::GetDefault();
-    }
-    auto allocate_size = curr_size;
-    if (curr_size < kMaxKeyValuePairs)
-    {
-      allocate_size += 1;
-    }
-    nostd::shared_ptr<TraceState> ts(new TraceState(allocate_size));
-    if (curr_size < kMaxKeyValuePairs)
-    {
-      // add new field first
-      ts->kv_properties_->AddEntry(key, value);
-    }
-    // add rest of the fields.
-    kv_properties_->GetAllEntries([&ts](nostd::string_view key, nostd::string_view value) {
-      ts->kv_properties_->AddEntry(key, value);
-      return true;
-    });
-    return ts;
-  }
-
-  /**
-   * Returns shared_ptr to a `new` TraceState object after removing the attribute with given key (
-   * if present )
-   * @returns empty TraceState object if key is invalid
-   * @returns copy of original TraceState object if key is not present (??)
-   */
-  nostd::shared_ptr<TraceState> Delete(const nostd::string_view &key) noexcept
-  {
-    if (!IsValidKey(key))
-    {
-      return TraceState::GetDefault();
-    }
-    auto curr_size     = kv_properties_->Size();
-    auto allocate_size = curr_size;
-    std::string unused;
-    if (kv_properties_->GetValue(key, unused))
-    {
-      allocate_size -= 1;
-    }
-    nostd::shared_ptr<TraceState> ts(new TraceState(allocate_size));
-    kv_properties_->GetAllEntries(
-        [&ts, &key](nostd::string_view e_key, nostd::string_view e_value) {
-          if (key != e_key)
-            ts->kv_properties_->AddEntry(e_key, e_value);
-          return true;
-        });
-    return ts;
-  }
-
-  // Returns true if there are no keys, false otherwise.
-  bool Empty() const noexcept { return kv_properties_->Size() == 0; }
-
-  // @return all key-values entris by repeatedly invoking the function reference passed as argument
-  // for each entry
-  bool GetAllEntries(
-      nostd::function_ref<bool(nostd::string_view, nostd::string_view)> callback) const noexcept
-  {
-    return kv_properties_->GetAllEntries(callback);
-  }
-  /** Returns whether key is a valid key. See https://www.w3.org/TR/trace-context/#key
-   * Identifiers MUST begin with a lowercase letter or a digit, and can only contain
-   * lowercase letters (a-z), digits (0-9), underscores (_), dashes (-), asterisks (*),
-   * and forward slashes (/).
-   * For multi-tenant vendor scenarios, an at sign (@) can be used to prefix the vendor name.
-   *
-   */
-  static bool IsValidKey(nostd::string_view key)
-  {
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-    return IsValidKeyRegEx(key);
-#else
-    return IsValidKeyNonRegEx(key);
-#endif
-  }
-
-  /** Returns whether value is a valid value. See https://www.w3.org/TR/trace-context/#value
-   * The value is an opaque string containing up to 256 printable ASCII (RFC0020)
-   *  characters ((i.e., the range 0x20 to 0x7E) except comma , and equal =)
-   */
-  static bool IsValidValue(nostd::string_view value)
-  {
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-    return IsValidValueRegEx(value);
-#else
-    return IsValidValueNonRegEx(value);
-#endif
-  }
-
-private:
-  TraceState() : kv_properties_(new common::KeyValueProperties()) {}
-  TraceState(size_t size) : kv_properties_(new common::KeyValueProperties(size)) {}
-
-  static nostd::string_view TrimString(nostd::string_view str, size_t left, size_t right)
-  {
-    while (str[static_cast<std::size_t>(right)] == ' ' && left < right)
-    {
-      right--;
-    }
-    while (str[static_cast<std::size_t>(left)] == ' ' && left < right)
-    {
-      left++;
-    }
-    return str.substr(left, right - left + 1);
-  }
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  static bool IsValidKeyRegEx(nostd::string_view key)
-  {
-    static std::regex reg_key("^[a-z0-9][a-z0-9*_\\-/]{0,255}$");
-    static std::regex reg_key_multitenant(
-        "^[a-z0-9][a-z0-9*_\\-/]{0,240}(@)[a-z0-9][a-z0-9*_\\-/]{0,13}$");
-    std::string key_s(key.data(), key.size());
-    if (std::regex_match(key_s, reg_key) || std::regex_match(key_s, reg_key_multitenant))
-    {
-      return true;
-    }
-    return false;
-  }
-
-  static bool IsValidValueRegEx(nostd::string_view value)
-  {
-    // Hex 0x20 to 0x2B, 0x2D to 0x3C, 0x3E to 0x7E
-    static std::regex reg_value(
-        "^[\\x20-\\x2B\\x2D-\\x3C\\x3E-\\x7E]{0,255}[\\x21-\\x2B\\x2D-\\x3C\\x3E-\\x7E]$");
-    // Need to benchmark without regex, as a string object is created here.
-    return std::regex_match(std::string(value.data(), value.size()), reg_value);
-  }
-#else
-  static bool IsValidKeyNonRegEx(nostd::string_view key)
-  {
-    if (key.empty() || key.size() > kKeyMaxSize || !IsLowerCaseAlphaOrDigit(key[0]))
-    {
-      return false;
-    }
-
-    int ats = 0;
-
-    for (const char c : key)
-    {
-      if (!IsLowerCaseAlphaOrDigit(c) && c != '_' && c != '-' && c != '@' && c != '*' && c != '/')
-      {
-        return false;
-      }
-      if ((c == '@') && (++ats > 1))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  static bool IsValidValueNonRegEx(nostd::string_view value)
-  {
-    if (value.empty() || value.size() > kValueMaxSize)
-    {
-      return false;
-    }
-
-    for (const char c : value)
-    {
-      if (c < ' ' || c > '~' || c == ',' || c == '=')
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-#endif
-
-  static bool IsLowerCaseAlphaOrDigit(char c) { return isdigit(c) || islower(c); }
-
-private:
-  // Store entries in a C-style array to avoid using std::array or std::vector.
-  nostd::unique_ptr<common::KeyValueProperties> kv_properties_;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/tracer.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/tracer.h
deleted file mode 100644
index ab0984352..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/tracer.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-/**
- * Handles span creation and in-process context propagation.
- *
- * This class provides methods for manipulating the context, creating spans, and controlling spans'
- * lifecycles.
- */
-class Tracer
-{
-public:
-  virtual ~Tracer() = default;
-  /**
-   * Starts a span.
-   *
-   * Optionally sets attributes at Span creation from the given key/value pairs.
-   *
-   * Attributes will be processed in order, previous attributes with the same
-   * key will be overwritten.
-   */
-  virtual nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                            const common::KeyValueIterable &attributes,
-                                            const SpanContextKeyValueIterable &links,
-                                            const StartSpanOptions &options = {}) noexcept = 0;
-
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                    const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name, {}, {}, options);
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                    const T &attributes,
-                                    const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name, attributes, {}, options);
-  }
-
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                    const common::KeyValueIterable &attributes,
-                                    const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name, attributes, NullSpanContext(), options);
-  }
-
-  template <class T,
-            class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr,
-            nostd::enable_if_t<detail::is_span_context_kv_iterable<U>::value>   * = nullptr>
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                    const T &attributes,
-                                    const U &links,
-                                    const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name, common::KeyValueIterableView<T>(attributes),
-                           SpanContextKeyValueIterableView<U>(links), options);
-  }
-
-  nostd::shared_ptr<Span> StartSpan(
-      nostd::string_view name,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      const StartSpanOptions &options = {}) noexcept
-  {
-
-    return this->StartSpan(name, attributes, {}, options);
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Span> StartSpan(
-      nostd::string_view name,
-      const T &attributes,
-      std::initializer_list<
-          std::pair<SpanContext,
-                    std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>
-          links,
-      const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(
-        name, attributes,
-        nostd::span<const std::pair<SpanContext, std::initializer_list<std::pair<
-                                                     nostd::string_view, common::AttributeValue>>>>{
-            links.begin(), links.end()},
-        options);
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Span> StartSpan(
-      nostd::string_view name,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      const T &links,
-      const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name,
-                           nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                               attributes.begin(), attributes.end()},
-                           links, options);
-  }
-
-  nostd::shared_ptr<Span> StartSpan(
-      nostd::string_view name,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      std::initializer_list<
-          std::pair<SpanContext,
-                    std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>
-          links,
-      const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(
-        name,
-        nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{attributes.begin(),
-                                                                                 attributes.end()},
-        nostd::span<const std::pair<SpanContext, std::initializer_list<std::pair<
-                                                     nostd::string_view, common::AttributeValue>>>>{
-            links.begin(), links.end()},
-        options);
-  }
-
-  /**
-   * Set the active span. The span will remain active until the returned Scope
-   * object is destroyed.
-   * @param span the span that should be set as the new active span.
-   * @return a Scope that controls how long the span will be active.
-   */
-  static Scope WithActiveSpan(nostd::shared_ptr<Span> &span) noexcept { return Scope{span}; }
-
-  /**
-   * Get the currently active span.
-   * @return the currently active span, or an invalid default span if no span
-   * is active.
-   */
-  static nostd::shared_ptr<Span> GetCurrentSpan() noexcept
-  {
-    context::ContextValue active_span = context::RuntimeContext::GetValue(kSpanKey);
-    if (nostd::holds_alternative<nostd::shared_ptr<Span>>(active_span))
-    {
-      return nostd::get<nostd::shared_ptr<Span>>(active_span);
-    }
-    else
-    {
-      return nostd::shared_ptr<Span>(new DefaultSpan(SpanContext::GetInvalid()));
-    }
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * Reports if the tracer is enabled or not. A disabled tracer will not create spans.
-   *
-   * The instrumentation authors should call this method before creating a spans to
-   * potentially avoid performing computationally expensive operations for disabled tracers.
-   *
-   * @since ABI_VERSION 2
-   */
-  bool Enabled() const noexcept { return OPENTELEMETRY_ATOMIC_READ_8(&this->enabled_) != 0; }
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-
-  /*
-   * The following is removed from the API in ABI version 2.
-   * It belongs to the SDK.
-   */
-
-  /**
-   * Force any buffered spans to flush.
-   * @param timeout to complete the flush
-   */
-  template <class Rep, class Period>
-  void ForceFlush(std::chrono::duration<Rep, Period> timeout) noexcept
-  {
-    this->ForceFlushWithMicroseconds(static_cast<uint64_t>(
-        std::chrono::duration_cast<std::chrono::microseconds>(timeout).count()));
-  }
-
-  virtual void ForceFlushWithMicroseconds(uint64_t timeout) noexcept = 0;
-
-  /**
-   * ForceFlush any buffered spans and stop reporting spans.
-   * @param timeout to complete the flush
-   */
-  template <class Rep, class Period>
-  void Close(std::chrono::duration<Rep, Period> timeout) noexcept
-  {
-    this->CloseWithMicroseconds(static_cast<uint64_t>(
-        std::chrono::duration_cast<std::chrono::microseconds>(timeout).count()));
-  }
-
-  virtual void CloseWithMicroseconds(uint64_t timeout) noexcept = 0;
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-protected:
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Updates the enabled state of the tracer. Calling this method will affect the result of the
-   * subsequent calls to {@code opentelemetry::v2::trace::Tracer::Enabled()}.
-   *
-   * This method should be used by SDK implementations to indicate the tracer's updated state
-   * whenever a tracer transitions from enabled to disabled state and vice versa.
-   *
-   * @param enabled The new state of the tracer. False would indicate that the tracer is no longer
-   * enabled and will not produce as
-   *
-   * @since ABI_VERSION 2
-   */
-  void UpdateEnabled(const bool enabled) noexcept
-  {
-    OPENTELEMETRY_ATOMIC_WRITE_8(&this->enabled_, enabled);
-  }
-#endif
-
-private:
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  // Variable to support implementation of Enabled method introduced in ABI V2.
-  // Mutable allows enabled_ to be used as 'bool *' (instead of 'const bool *'), with the
-  // OPENTELEMETRY_ATOMIC_READ_8 macro's internal casts when used from a const function.
-  // std::atomic can not be used here because it is not ABI compatible for OpenTelemetry C++ API.
-  mutable bool enabled_ = true;
-#endif
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/tracer_provider.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/tracer_provider.h
deleted file mode 100644
index 059298d39..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/trace/tracer_provider.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-class Tracer;
-
-/**
- * Creates new Tracer instances.
- */
-class OPENTELEMETRY_EXPORT TracerProvider
-{
-public:
-  virtual ~TracerProvider() = default;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Gets or creates a named Tracer instance (ABI).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Tracer instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes (optional, may be nullptr)
-   */
-  virtual nostd::shared_ptr<Tracer> GetTracer(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      const common::KeyValueIterable *attributes) noexcept = 0;
-
-  /**
-   * Gets or creates a named Tracer instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Tracer instrumentation scope
-   * @param[in] version Instrumentation scope version, optional
-   * @param[in] schema_url Instrumentation scope schema URL, optional
-   */
-  nostd::shared_ptr<Tracer> GetTracer(nostd::string_view name,
-                                      nostd::string_view version    = "",
-                                      nostd::string_view schema_url = "")
-  {
-    return GetTracer(name, version, schema_url, nullptr);
-  }
-
-  /**
-   * Gets or creates a named Tracer instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Tracer instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes
-   */
-  nostd::shared_ptr<Tracer> GetTracer(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes)
-  {
-    /* Build a container from std::initializer_list. */
-    nostd::span<const std::pair<nostd::string_view, common::AttributeValue>> attributes_span{
-        attributes.begin(), attributes.end()};
-
-    /* Build a view on the container. */
-    common::KeyValueIterableView<
-        nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>>
-        iterable_attributes{attributes_span};
-
-    /* Add attributes using the view. */
-    return GetTracer(name, version, schema_url, &iterable_attributes);
-  }
-
-  /**
-   * Gets or creates a named Tracer instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Tracer instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes container
-   */
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Tracer> GetTracer(nostd::string_view name,
-                                      nostd::string_view version,
-                                      nostd::string_view schema_url,
-                                      const T &attributes)
-  {
-    /* Build a view on the container. */
-    common::KeyValueIterableView<T> iterable_attributes(attributes);
-
-    /* Add attributes using the view. */
-    return GetTracer(name, version, schema_url, &iterable_attributes);
-  }
-
-#else
-
-  /**
-   * Gets or creates a named tracer instance.
-   *
-   * Optionally a version can be passed to create a named and versioned tracer
-   * instance.
-   */
-  virtual nostd::shared_ptr<Tracer> GetTracer(nostd::string_view name,
-                                              nostd::string_view version    = "",
-                                              nostd::string_view schema_url = "") noexcept = 0;
-#endif
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/version.h b/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/version.h
deleted file mode 100644
index 0efd4334f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/include/opentelemetry/version.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"  // IWYU pragma: export
-#include "opentelemetry/detail/preprocessor.h"
-
-#ifndef OPENTELEMETRY_ABI_VERSION_NO
-#  define OPENTELEMETRY_ABI_VERSION_NO 1
-#endif
-
-#define OPENTELEMETRY_VERSION "1.21.0"
-#define OPENTELEMETRY_VERSION_MAJOR 1
-#define OPENTELEMETRY_VERSION_MINOR 21
-#define OPENTELEMETRY_VERSION_PATCH 0
-
-#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
-
-// clang-format off
-#define OPENTELEMETRY_BEGIN_NAMESPACE \
-  namespace opentelemetry { inline namespace OPENTELEMETRY_CONCAT(v, OPENTELEMETRY_ABI_VERSION_NO) {
-
-#define OPENTELEMETRY_END_NAMESPACE \
-  }}
-
-#define OPENTELEMETRY_NAMESPACE opentelemetry :: OPENTELEMETRY_CONCAT(v, OPENTELEMETRY_ABI_VERSION_NO)
-
-// clang-format on
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/CMakeLists.txt
deleted file mode 100644
index 66eeee209..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(core)
-add_subdirectory(context)
-add_subdirectory(plugin)
-add_subdirectory(nostd)
-add_subdirectory(trace)
-add_subdirectory(metrics)
-add_subdirectory(logs)
-add_subdirectory(common)
-add_subdirectory(baggage)
-
-if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
-  add_subdirectory(singleton)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/baggage/BUILD
deleted file mode 100644
index a3783a63c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "baggage_test",
-    srcs = [
-        "baggage_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "baggage_benchmark",
-    srcs = ["baggage_benchmark.cc"],
-    tags = [
-        "api",
-        "benchmark",
-        "test",
-    ],
-    deps = ["//api"],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/baggage/CMakeLists.txt
deleted file mode 100644
index 0b0fee52a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include(GoogleTest)
-
-foreach(testname baggage_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX baggage.
-    TEST_LIST ${testname})
-endforeach()
-
-if(WITH_BENCHMARK)
-  add_executable(baggage_benchmark baggage_benchmark.cc)
-  target_link_libraries(baggage_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-endif()
-add_subdirectory(propagation)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/baggage_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/api/test/baggage/baggage_benchmark.cc
deleted file mode 100644
index 59d1fec3d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/baggage_benchmark.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <stddef.h>
-#include <string>
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-
-using namespace opentelemetry::baggage;
-namespace nostd = opentelemetry::nostd;
-
-namespace
-{
-
-const size_t kNumEntries = 10;
-
-std::string header_with_custom_entries(size_t num_entries)
-{
-  std::string header;
-  for (size_t i = 0; i < num_entries; i++)
-  {
-    std::string key   = "ADecentlyLargekey" + std::to_string(i);
-    std::string value = "ADecentlyLargeValue" + std::to_string(i);
-    header.append(key).append("=").append(value);
-    if (i != num_entries - 1)
-    {
-      header += ",";
-    }
-  }
-  return header;
-}
-
-void BM_CreateBaggageFromTenEntries(benchmark::State &state)
-{
-  std::string header = header_with_custom_entries(kNumEntries);
-  while (state.KeepRunning())
-  {
-    auto baggage = Baggage::FromHeader(header);
-  }
-}
-BENCHMARK(BM_CreateBaggageFromTenEntries);
-
-void BM_ExtractBaggageHavingTenEntries(benchmark::State &state)
-{
-  auto baggage = Baggage::FromHeader(header_with_custom_entries(kNumEntries));
-  while (state.KeepRunning())
-  {
-    baggage->GetAllEntries(
-        [](nostd::string_view /* key */, nostd::string_view /* value */) { return true; });
-  }
-}
-BENCHMARK(BM_ExtractBaggageHavingTenEntries);
-
-void BM_CreateBaggageFrom180Entries(benchmark::State &state)
-{
-  std::string header = header_with_custom_entries(Baggage::kMaxKeyValuePairs);
-  while (state.KeepRunning())
-  {
-    auto baggage = Baggage::FromHeader(header);
-  }
-}
-BENCHMARK(BM_CreateBaggageFrom180Entries);
-
-void BM_ExtractBaggageWith180Entries(benchmark::State &state)
-{
-  auto baggage = Baggage::FromHeader(header_with_custom_entries(Baggage::kMaxKeyValuePairs));
-  while (state.KeepRunning())
-  {
-    baggage->GetAllEntries(
-        [](nostd::string_view /* key */, nostd::string_view /* value */) { return true; });
-  }
-}
-BENCHMARK(BM_ExtractBaggageWith180Entries);
-
-void BM_SetValueBaggageWithTenEntries(benchmark::State &state)
-{
-  auto baggage = Baggage::FromHeader(
-      header_with_custom_entries(kNumEntries - 1));  // 9 entries, and add one new
-  while (state.KeepRunning())
-  {
-    auto new_baggage = baggage->Set("new_key", "new_value");
-  }
-}
-BENCHMARK(BM_SetValueBaggageWithTenEntries);
-
-void BM_SetValueBaggageWith180Entries(benchmark::State &state)
-{
-  auto baggage = Baggage::FromHeader(header_with_custom_entries(
-      Baggage::kMaxKeyValuePairs - 1));  // keep 179 entries, and add one new
-  while (state.KeepRunning())
-  {
-    auto new_baggage = baggage->Set("new_key", "new_value");
-  }
-}
-BENCHMARK(BM_SetValueBaggageWith180Entries);
-
-void BM_BaggageToHeaderTenEntries(benchmark::State &state)
-{
-  auto baggage = Baggage::FromHeader(header_with_custom_entries(kNumEntries));
-  while (state.KeepRunning())
-  {
-    auto new_baggage = baggage->ToHeader();
-  }
-}
-BENCHMARK(BM_BaggageToHeaderTenEntries);
-
-void BM_BaggageToHeader180Entries(benchmark::State &state)
-{
-  auto baggage = Baggage::FromHeader(header_with_custom_entries(Baggage::kMaxKeyValuePairs));
-  while (state.KeepRunning())
-  {
-    auto new_baggage = baggage->ToHeader();
-  }
-}
-BENCHMARK(BM_BaggageToHeader180Entries);
-}  // namespace
-
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/baggage_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/baggage/baggage_test.cc
deleted file mode 100644
index 526c81302..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/baggage_test.cc
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <assert.h>
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <string>
-#include <vector>
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/common/kv_properties.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-
-using namespace opentelemetry::baggage;
-
-std::string header_with_custom_entries(size_t num_entries)
-{
-  std::string header;
-  for (size_t i = 0; i < num_entries; i++)
-  {
-    std::string key   = "key" + std::to_string(i);
-    std::string value = "value" + std::to_string(i);
-    header.append(key).append("=").append(value);
-    if (i != num_entries - 1)
-    {
-      header += ",";
-    }
-  }
-  return header;
-}
-
-std::string header_with_custom_size(size_t key_value_size, size_t num_entries)
-{
-  std::string header = "";
-  for (size_t i = 0; i < num_entries; i++)
-  {
-    std::string str = std::to_string(i + 1);
-    str += "=";
-    assert(key_value_size > str.size());
-    for (size_t j = str.size(); j < key_value_size; j++)
-    {
-      str += "a";
-    }
-
-    header += str + ',';
-  }
-
-  header.pop_back();
-  return header;
-}
-
-TEST(BaggageTest, ValidateExtractHeader)
-{
-  auto invalid_key_value_size_header = header_with_custom_size(Baggage::kMaxKeyValueSize + 5, 1);
-
-  struct
-  {
-    const char *input;
-    std::vector<const char *> keys;
-    std::vector<const char *> values;
-  } testcases[] = {
-      {"k1=v1", {"k1"}, {"v1"}},
-      {"k1=V1,K2=v2;metadata,k3=v3",
-       {"k1", "K2", "k3"},
-       {"V1", "v2;metadata", "v3"}},  // metadata is part of value
-      {",k1 =v1,k2=v2 ; metadata,",
-       {"k1", "k2"},
-       {"v1", "v2; metadata"}},  // key and value are trimmed
-      {"1a-2f%40foo=bar%251,a%2A%2Ffoo-_%2Fbar=bar+4",
-       {"1a-2f@foo", "a*/foo-_/bar"},
-       {"bar%1", "bar 4"}},                                       // decoding is done properly
-      {"k1=v1,invalidmember,k2=v2", {"k1", "k2"}, {"v1", "v2"}},  // invalid member is skipped
-      {",", {}, {}},
-      {",=,", {}, {}},
-      {"", {}, {}},
-      {"k1=%5zv", {}, {}},  // invalid hex : invalid second digit
-      {"k1=%5", {}, {}},    // invalid hex : missing two digits
-      {"k%z2=v1", {}, {}},  // invalid hex : invalid first digit
-      {"k%00=v1", {}, {}},  // key not valid
-      {"k=v%7f", {}, {}},   // value not valid
-      {invalid_key_value_size_header.data(), {}, {}}};
-  for (auto &testcase : testcases)
-  {
-    auto baggage = Baggage::FromHeader(testcase.input);
-    size_t index = 0;
-    baggage->GetAllEntries([&testcase, &index](opentelemetry::nostd::string_view key,
-                                               opentelemetry::nostd::string_view value) {
-      EXPECT_EQ(key, testcase.keys[index]);
-      EXPECT_EQ(value, testcase.values[index]);
-      index++;
-      return true;
-    });
-  }
-
-  // For header with maximum threshold pairs, no pair is dropped
-  auto max_pairs_header = header_with_custom_entries(Baggage::kMaxKeyValuePairs);
-  EXPECT_EQ(Baggage::FromHeader(max_pairs_header.data())->ToHeader(), max_pairs_header.data());
-
-  // Entries beyond threshold are dropped
-  auto baggage = Baggage::FromHeader(header_with_custom_entries(Baggage::kMaxKeyValuePairs + 1));
-  auto header  = baggage->ToHeader();
-  opentelemetry::common::KeyValueStringTokenizer kv_str_tokenizer(header);
-  int expected_tokens = Baggage::kMaxKeyValuePairs;
-  EXPECT_EQ(kv_str_tokenizer.NumTokens(), expected_tokens);
-
-  // For header with total size more than threshold, baggage is empty
-  int num_pairs_with_max_size = Baggage::kMaxSize / Baggage::kMaxKeyValueSize;
-  auto invalid_total_size_header =
-      header_with_custom_size(Baggage::kMaxKeyValueSize, num_pairs_with_max_size + 1);
-  EXPECT_EQ(Baggage::FromHeader(invalid_total_size_header.data())->ToHeader(), "");
-}
-
-TEST(BaggageTest, ValidateInjectHeader)
-{
-  struct
-  {
-    std::vector<const char *> keys;
-    std::vector<const char *> values;
-    const char *header;
-  } testcases[] = {{{"k1"}, {"v1"}, "k1=v1"},
-                   {{"k3", "k2", "k1"}, {"", "v2", "v1"}, "k1=v1,k2=v2,k3="},  // empty value
-                   {{"1a-2f@foo", "a*/foo-_/bar"},
-                    {"bar%1", "bar 4"},
-                    "a%2A%2Ffoo-_%2Fbar=bar+4,1a-2f%40foo=bar%251"},  // encoding is done properly
-                   {{"foo 1"},
-                    {"bar 1;  metadata ; ;;"},
-                    "foo+1=bar+1;  metadata ; ;;"}};  // metadata is added without encoding
-
-  for (auto &testcase : testcases)
-  {
-    opentelemetry::nostd::shared_ptr<Baggage> baggage(new Baggage{});
-    for (size_t i = 0; i < testcase.keys.size(); i++)
-    {
-      baggage = baggage->Set(testcase.keys[i], testcase.values[i]);
-    }
-    EXPECT_EQ(baggage->ToHeader(), testcase.header);
-  }
-}
-
-TEST(BaggageTest, BaggageGet)
-{
-  auto header  = header_with_custom_entries(Baggage::kMaxKeyValuePairs);
-  auto baggage = Baggage::FromHeader(header);
-
-  std::string value;
-  EXPECT_TRUE(baggage->GetValue("key0", value));
-  EXPECT_EQ(value, "value0");
-  EXPECT_TRUE(baggage->GetValue("key16", value));
-  EXPECT_EQ(value, "value16");
-
-  EXPECT_TRUE(baggage->GetValue("key31", value));
-  EXPECT_EQ(value, "value31");
-
-  EXPECT_FALSE(baggage->GetValue("key181", value));
-}
-
-TEST(BaggageTest, BaggageSet)
-{
-  std::string header = "k1=v1,k2=v2";
-  auto baggage       = Baggage::FromHeader(header);
-
-  std::string value;
-  baggage = baggage->Set("k3", "v3");
-  EXPECT_TRUE(baggage->GetValue("k3", value));
-  EXPECT_EQ(value, "v3");
-
-  baggage = baggage->Set("k3", "v3_1");  // key should be updated with the latest value
-  EXPECT_TRUE(baggage->GetValue("k3", value));
-  EXPECT_EQ(value, "v3_1");
-
-  header  = header_with_custom_entries(Baggage::kMaxKeyValuePairs);
-  baggage = Baggage::FromHeader(header);
-  baggage = baggage->Set("key0", "0");  // updating on max list should work
-  EXPECT_TRUE(baggage->GetValue("key0", value));
-  EXPECT_EQ(value, "0");
-
-  header  = "k1=v1,k2=v2";
-  baggage = Baggage::FromHeader(header);
-  baggage = baggage->Set("", "n_v1");  // adding invalid key, should return copy of same baggage
-  EXPECT_EQ(baggage->ToHeader(), header);
-
-  header  = "k1=v1,k2=v2";
-  baggage = Baggage::FromHeader(header);
-  baggage = baggage->Set("k1", "\x1A");  // adding invalid value, should return copy of same baggage
-  EXPECT_EQ(baggage->ToHeader(), header);
-}
-
-TEST(BaggageTest, BaggageRemove)
-{
-  auto header  = header_with_custom_entries(Baggage::kMaxKeyValuePairs);
-  auto baggage = Baggage::FromHeader(header);
-  std::string value;
-
-  // existing key is removed
-  EXPECT_TRUE(baggage->GetValue("key0", value));
-  auto new_baggage = baggage->Delete("key0");
-  EXPECT_FALSE(new_baggage->GetValue("key0", value));
-
-  // trying Delete on non existent key
-  EXPECT_FALSE(baggage->GetValue("key181", value));
-  auto new_baggage_2 = baggage->Delete("key181");
-  EXPECT_FALSE(new_baggage_2->GetValue("key181", value));
-}
-
-TEST(BaggageTest, BaggageGetAll)
-{
-  std::string baggage_header                          = "k1=v1,k2=v2,k3=v3";
-  auto baggage                                        = Baggage::FromHeader(baggage_header);
-  const int kNumPairs                                 = 3;
-  opentelemetry::nostd::string_view keys[kNumPairs]   = {"k1", "k2", "k3"};
-  opentelemetry::nostd::string_view values[kNumPairs] = {"v1", "v2", "v3"};
-  size_t index                                        = 0;
-  baggage->GetAllEntries([&keys, &values, &index](opentelemetry::nostd::string_view key,
-                                                  opentelemetry::nostd::string_view value) {
-    EXPECT_EQ(key, keys[index]);
-    EXPECT_EQ(value, values[index]);
-    index++;
-    return true;
-  });
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/BUILD
deleted file mode 100644
index 2b820ed3c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "baggage_propagator_test",
-    srcs = [
-        "baggage_propagator_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/CMakeLists.txt
deleted file mode 100644
index b4142ead8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(testname baggage_propagator_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX baggage.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/baggage_propagator_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/baggage_propagator_test.cc
deleted file mode 100644
index 9aa21ae3f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/baggage/propagation/baggage_propagator_test.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <initializer_list>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/baggage/baggage_context.h"
-#include "opentelemetry/baggage/propagation/baggage_propagator.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::baggage::propagation;
-
-class BaggageCarrierTest : public context::propagation::TextMapCarrier
-{
-public:
-  BaggageCarrierTest() = default;
-  nostd::string_view Get(nostd::string_view key) const noexcept override
-  {
-    auto it = headers_.find(std::string(key));
-    if (it != headers_.end())
-    {
-      return nostd::string_view(it->second);
-    }
-    return "";
-  }
-  void Set(nostd::string_view key, nostd::string_view value) noexcept override
-  {
-    headers_[std::string(key)] = std::string(value);
-  }
-
-  std::map<std::string, std::string> headers_;
-};
-
-static BaggagePropagator format;
-
-TEST(BaggagePropagatorTest, ExtractNoBaggageHeader)
-{
-  BaggageCarrierTest carrier;
-  carrier.headers_      = {};
-  context::Context ctx1 = context::Context{};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-  auto ctx2_baggage     = baggage::GetBaggage(ctx2);
-  EXPECT_EQ(ctx2_baggage->ToHeader(), "");
-}
-
-TEST(BaggagePropagatorTest, ExtractAndInjectBaggage)
-{
-  // create header string for baggage larger than allowed size (kMaxKeyValueSize)
-  std::string very_large_baggage_header =
-      std::string(baggage::Baggage::kMaxKeyValueSize / 2 + 1, 'k') + "=" +
-      std::string(baggage::Baggage::kMaxKeyValueSize / 2 + 1, 'v');
-
-  std::map<std::string, std::string> baggages = {
-      {"key1=val1,key2=val2", "key1=val1,key2=val2"},                // valid header
-      {"key1 =   val1,  key2 =val2   ", "key1=val1,key2=val2"},      // valid header with spaces
-      {"key1=val1,key2=val2;prop=1", "key1=val1,key2=val2;prop=1"},  // valid header with properties
-      {"key%2C1=val1,key2=val2%2Cval3",
-       "key%2C1=val1,key2=val2%2Cval3"},                      // valid header with url escape
-      {"key1=val1,key2=val2,a,val3", "key1=val1,key2=val2"},  // valid header with invalid value
-      {"key1=,key2=val2", "key1=,key2=val2"},                 // valid header with empty value
-      {"invalid_header", ""},                                 // invalid header
-      {very_large_baggage_header, ""}};  // baggage header larger than allowed size.
-
-  for (const auto &baggage : baggages)
-  {
-    BaggageCarrierTest carrier1;
-    carrier1.headers_[baggage::kBaggageHeader.data()] = baggage.first;
-    context::Context ctx1                             = context::Context{};
-    context::Context ctx2                             = format.Extract(carrier1, ctx1);
-
-    BaggageCarrierTest carrier2;
-    format.Inject(carrier2, ctx2);
-    EXPECT_EQ(carrier2.headers_[baggage::kBaggageHeader.data()], baggage.second);
-
-    std::vector<std::string> fields;
-    format.Fields([&fields](nostd::string_view field) {
-      fields.push_back(field.data());
-      return true;
-    });
-    EXPECT_EQ(fields.size(), 1);
-    EXPECT_EQ(fields[0], baggage::kBaggageHeader.data());
-  }
-}
-
-TEST(BaggagePropagatorTest, InjectEmptyHeader)
-{
-  // Test Missing baggage from context
-  BaggageCarrierTest carrier;
-  context::Context ctx = context::Context{};
-  format.Inject(carrier, ctx);
-  EXPECT_EQ(carrier.headers_.find(baggage::kBaggageHeader), carrier.headers_.end());
-
-  {
-    // Test empty baggage in context
-    BaggageCarrierTest carrier1;
-    carrier1.headers_[baggage::kBaggageHeader.data()] = "";
-    context::Context ctx1                             = context::Context{};
-    context::Context ctx2                             = format.Extract(carrier1, ctx1);
-    format.Inject(carrier, ctx2);
-    EXPECT_EQ(carrier.headers_.find(baggage::kBaggageHeader), carrier.headers_.end());
-  }
-  {
-    // Invalid baggage in context
-    BaggageCarrierTest carrier1;
-    carrier1.headers_[baggage::kBaggageHeader.data()] = "InvalidBaggageData";
-    context::Context ctx1                             = context::Context{};
-    context::Context ctx2                             = format.Extract(carrier1, ctx1);
-
-    format.Inject(carrier, ctx2);
-    EXPECT_EQ(carrier.headers_.find(baggage::kBaggageHeader), carrier.headers_.end());
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/common/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/common/BUILD
deleted file mode 100644
index 5ea2d5d57..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/common/BUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-otel_cc_benchmark(
-    name = "spinlock_benchmark",
-    srcs = ["spinlock_benchmark.cc"],
-    tags = [
-        "api",
-        "benchmark",
-        "test",
-    ],
-    deps = ["//api"],
-)
-
-cc_test(
-    name = "kv_properties_test",
-    srcs = [
-        "kv_properties_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "string_util_test",
-    srcs = [
-        "string_util_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/common/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/common/CMakeLists.txt
deleted file mode 100644
index 8d77dcdfa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/common/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include(GoogleTest)
-
-foreach(testname kv_properties_test string_util_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX common.
-    TEST_LIST ${testname})
-endforeach()
-
-if(WITH_BENCHMARK)
-  add_executable(spinlock_benchmark spinlock_benchmark.cc)
-  target_link_libraries(spinlock_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/common/kv_properties_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/common/kv_properties_test.cc
deleted file mode 100644
index 8815214e4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/common/kv_properties_test.cc
+++ /dev/null
@@ -1,238 +0,0 @@
-
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <opentelemetry/common/kv_properties.h>
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-
-// ------------------------- Entry class tests ---------------------------------
-
-using namespace opentelemetry;
-using opentelemetry::common::KeyValueProperties;
-// Test constructor that takes a key-value pair
-TEST(EntryTest, KeyValueConstruction)
-{
-  opentelemetry::nostd::string_view key = "test_key";
-  opentelemetry::nostd::string_view val = "test_value";
-  KeyValueProperties::Entry e(key, val);
-
-  EXPECT_EQ(key.size(), e.GetKey().size());
-  EXPECT_EQ(key, e.GetKey());
-
-  EXPECT_EQ(val.size(), e.GetValue().size());
-  EXPECT_EQ(val, e.GetValue());
-}
-
-// Test copy constructor
-TEST(EntryTest, Copy)
-{
-  KeyValueProperties::Entry e("test_key", "test_value");
-  const KeyValueProperties::Entry &copy(e);
-  EXPECT_EQ(copy.GetKey(), e.GetKey());
-  EXPECT_EQ(copy.GetValue(), e.GetValue());
-}
-
-// Test assignment operator
-TEST(EntryTest, Assignment)
-{
-  KeyValueProperties::Entry e("test_key", "test_value");
-  KeyValueProperties::Entry empty;
-  empty = e;
-  EXPECT_EQ(empty.GetKey(), e.GetKey());
-  EXPECT_EQ(empty.GetValue(), e.GetValue());
-}
-
-TEST(EntryTest, SetValue)
-{
-  KeyValueProperties::Entry e("test_key", "test_value");
-  opentelemetry::nostd::string_view new_val = "new_value";
-  e.SetValue(new_val);
-
-  EXPECT_EQ(new_val.size(), e.GetValue().size());
-  EXPECT_EQ(new_val, e.GetValue());
-}
-
-// ------------------------- KeyValueStringTokenizer tests ---------------------------------
-
-using opentelemetry::common::KeyValueStringTokenizer;
-using opentelemetry::common::KeyValueStringTokenizerOptions;
-
-TEST(KVStringTokenizer, SinglePair)
-{
-  bool valid_kv;
-  nostd::string_view key, value;
-  opentelemetry::nostd::string_view str = "k1=v1";
-  KeyValueStringTokenizerOptions opts;
-  KeyValueStringTokenizer tk(str, opts);
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-  EXPECT_TRUE(valid_kv);
-  EXPECT_EQ(key, "k1");
-  EXPECT_EQ(value, "v1");
-  EXPECT_FALSE(tk.next(valid_kv, key, value));
-}
-
-TEST(KVStringTokenizer, AcceptEmptyEntries)
-{
-  bool valid_kv;
-  nostd::string_view key, value;
-  opentelemetry::nostd::string_view str = ":k1=v1::k2=v2: ";
-  KeyValueStringTokenizerOptions opts;
-  opts.member_separator     = ':';
-  opts.ignore_empty_members = false;
-
-  KeyValueStringTokenizer tk(str, opts);
-  EXPECT_TRUE(tk.next(valid_kv, key, value));  // empty pair
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-  EXPECT_TRUE(valid_kv);
-  EXPECT_EQ(key, "k1");
-  EXPECT_EQ(value, "v1");
-  EXPECT_TRUE(tk.next(valid_kv, key, value));  // empty pair
-  EXPECT_EQ(key, "");
-  EXPECT_EQ(value, "");
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-  EXPECT_TRUE(tk.next(valid_kv, key, value));  // empty pair
-  EXPECT_FALSE(tk.next(valid_kv, key, value));
-}
-
-TEST(KVStringTokenizer, ValidPairsWithEmptyEntries)
-{
-  opentelemetry::nostd::string_view str = "k1:v1===k2:v2==";
-  bool valid_kv;
-  nostd::string_view key, value;
-  KeyValueStringTokenizerOptions opts;
-  opts.member_separator    = '=';
-  opts.key_value_separator = ':';
-
-  KeyValueStringTokenizer tk(str, opts);
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-  EXPECT_TRUE(valid_kv);
-  EXPECT_EQ(key, "k1");
-  EXPECT_EQ(value, "v1");
-
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-  EXPECT_TRUE(valid_kv);
-  EXPECT_EQ(key, "k2");
-  EXPECT_EQ(value, "v2");
-
-  EXPECT_FALSE(tk.next(valid_kv, key, value));
-}
-
-TEST(KVStringTokenizer, InvalidPairs)
-{
-  opentelemetry::nostd::string_view str = "k1=v1,invalid  ,,  k2=v2   ,invalid";
-  KeyValueStringTokenizer tk(str);
-  bool valid_kv;
-  nostd::string_view key, value;
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-
-  EXPECT_TRUE(valid_kv);
-  EXPECT_EQ(key, "k1");
-  EXPECT_EQ(value, "v1");
-
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-  EXPECT_FALSE(valid_kv);
-
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-  EXPECT_TRUE(valid_kv);
-  EXPECT_EQ(key, "k2");
-  EXPECT_EQ(value, "v2");
-
-  EXPECT_TRUE(tk.next(valid_kv, key, value));
-  EXPECT_FALSE(valid_kv);
-
-  EXPECT_FALSE(tk.next(valid_kv, key, value));
-}
-
-TEST(KVStringTokenizer, NumTokens)
-{
-  struct
-  {
-    const char *input;
-    size_t expected;
-  } testcases[] = {{"k1=v1", 1},
-                   {" ", 1},
-                   {"k1=v1,k2=v2,k3=v3", 3},
-                   {"k1=v1,", 1},
-                   {"k1=v1,k2=v2,invalidmember", 3},
-                   {"", 0}};
-  for (auto &testcase : testcases)
-  {
-    KeyValueStringTokenizer tk(testcase.input);
-    EXPECT_EQ(tk.NumTokens(), testcase.expected);
-  }
-}
-
-//------------------------- KeyValueProperties tests ---------------------------------
-
-TEST(KeyValueProperties, PopulateKVIterableContainer)
-{
-  std::vector<std::pair<std::string, std::string>> kv_pairs = {{"k1", "v1"}, {"k2", "v2"}};
-
-  auto kv_properties = KeyValueProperties(kv_pairs);
-  EXPECT_EQ(kv_properties.Size(), 2);
-
-  std::string value;
-  bool present = kv_properties.GetValue("k1", value);
-  EXPECT_TRUE(present);
-  EXPECT_EQ(value, "v1");
-
-  present = kv_properties.GetValue("k2", value);
-  EXPECT_TRUE(present);
-  EXPECT_EQ(value, "v2");
-}
-
-TEST(KeyValueProperties, AddEntry)
-{
-  auto kv_properties = KeyValueProperties(1);
-  kv_properties.AddEntry("k1", "v1");
-  std::string value;
-  bool present = kv_properties.GetValue("k1", value);
-  EXPECT_TRUE(present);
-  EXPECT_EQ(value, "v1");
-
-  kv_properties.AddEntry("k2", "v2");  // entry will not be added as max size reached.
-  EXPECT_EQ(kv_properties.Size(), 1);
-  present = kv_properties.GetValue("k2", value);
-  EXPECT_FALSE(present);
-}
-
-TEST(KeyValueProperties, GetValue)
-{
-  auto kv_properties = KeyValueProperties(1);
-  kv_properties.AddEntry("k1", "v1");
-  std::string value;
-  bool present = kv_properties.GetValue("k1", value);
-  EXPECT_TRUE(present);
-  EXPECT_EQ(value, "v1");
-
-  present = kv_properties.GetValue("k3", value);
-  EXPECT_FALSE(present);
-}
-
-TEST(KeyValueProperties, GetAllEntries)
-{
-  std::vector<std::pair<std::string, std::string>> kv_pairs = {
-      {"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
-  const size_t kNumPairs                              = 3;
-  opentelemetry::nostd::string_view keys[kNumPairs]   = {"k1", "k2", "k3"};
-  opentelemetry::nostd::string_view values[kNumPairs] = {"v1", "v2", "v3"};
-  auto kv_properties                                  = KeyValueProperties(kv_pairs);
-
-  size_t index = 0;
-  kv_properties.GetAllEntries(
-      [&keys, &values, &index](nostd::string_view key, nostd::string_view value) {
-        EXPECT_EQ(key, keys[index]);
-        EXPECT_EQ(value, values[index]);
-        index++;
-        return true;
-      });
-
-  EXPECT_EQ(index, kNumPairs);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/common/spinlock_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/api/test/common/spinlock_benchmark.cc
deleted file mode 100644
index dc63d66ef..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/common/spinlock_benchmark.cc
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <algorithm>
-#include <atomic>
-#include <cstdint>
-#include <thread>
-#include <vector>
-
-#if defined(__i386__) || defined(__x86_64__)
-#  if defined(__clang__) || defined(__INTEL_COMPILER)
-#    include <emmintrin.h>  // for _mm_pause
-#  endif
-#endif
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/common/spin_lock_mutex.h"
-
-namespace
-{
-using opentelemetry::common::SpinLockMutex;
-
-constexpr int TightLoopLocks = 10000;
-
-// Runs a thrash-test where we spin up N threads, each of which will
-// attempt to lock-mutate-unlock a total of `TightLoopLocks` times.
-//
-// lock: A lambda denoting how to lock.   Accepts a reference to `SpinLockType`.
-// unlock: A lambda denoting how to unlock.   Accepts a reference to `SpinLockType`.
-template <typename SpinLockType, typename LockF, typename UnlockF>
-inline void SpinThrash(benchmark::State &s, SpinLockType &spinlock, LockF lock, UnlockF unlock)
-{
-  auto num_threads = s.range(0);
-  // Value we will increment, fighting over a spinlock.
-  // The contention is meant to be brief, as close to our expected
-  // use cases of "updating pointers" or "pushing an event onto a buffer".
-  std::int64_t value OPENTELEMETRY_MAYBE_UNUSED = 0;
-
-  std::vector<std::thread> threads;
-  threads.reserve(num_threads);
-
-  // Timing loop
-  for (auto _ : s)
-  {
-    for (auto i = 0; i < num_threads; i++)
-    {
-      threads.emplace_back([&] {
-        // Increment value once each time the lock is acquired.  Spin a few times
-        // to ensure maximum thread contention.
-        for (int i = 0; i < TightLoopLocks; i++)
-        {
-          lock(spinlock);
-          value++;
-          unlock(spinlock);
-        }
-      });
-    }
-    // Join threads
-    for (auto &thread : threads)
-      thread.join();
-    threads.clear();
-  }
-}
-
-// Benchmark of full spin-lock implementation.
-static void BM_SpinLockThrashing(benchmark::State &s)
-{
-  SpinLockMutex spinlock;
-  SpinThrash(s, spinlock, [](SpinLockMutex &m) { m.lock(); }, [](SpinLockMutex &m) { m.unlock(); });
-}
-
-// Naive `while(try_lock()) {}` implementation of lock.
-static void BM_NaiveSpinLockThrashing(benchmark::State &s)
-{
-  SpinLockMutex spinlock;
-  SpinThrash(
-      s, spinlock,
-      [](SpinLockMutex &m) {
-        while (!m.try_lock())
-        {
-          // Left this comment to keep the same format on old and new versions of clang-format
-        }
-      },
-      [](SpinLockMutex &m) { m.unlock(); });
-}
-
-// Simple `while(try_lock()) { yield-processor }`
-static void BM_ProcYieldSpinLockThrashing(benchmark::State &s)
-{
-  SpinLockMutex spinlock;
-  SpinThrash<SpinLockMutex>(
-      s, spinlock,
-      [](SpinLockMutex &m) {
-        while (!m.try_lock())
-        {
-#if defined(_MSC_VER)
-          YieldProcessor();
-#elif defined(__i386__) || defined(__x86_64__)
-#  if defined(__clang__) || defined(__INTEL_COMPILER)
-          _mm_pause();
-#  else
-          __builtin_ia32_pause();
-#  endif
-#elif defined(__armel__) || defined(__ARMEL__)
-          asm volatile("nop" ::: "memory");
-#elif defined(__arm__) || defined(__aarch64__)  // arm big endian / arm64
-          __asm__ __volatile__("yield" ::: "memory");
-#endif
-        }
-      },
-      [](SpinLockMutex &m) { m.unlock(); });
-}
-
-// SpinLock thrashing with thread::yield().
-static void BM_ThreadYieldSpinLockThrashing(benchmark::State &s)
-{
-#if defined(__cpp_lib_atomic_value_initialization) && \
-    __cpp_lib_atomic_value_initialization >= 201911L
-  std::atomic_flag mutex{};
-#else
-  std::atomic_flag mutex = ATOMIC_FLAG_INIT;
-#endif
-  SpinThrash<std::atomic_flag>(
-      s, mutex,
-      [](std::atomic_flag &l) {
-        uint32_t try_count = 0;
-        while (l.test_and_set(std::memory_order_acq_rel))
-        {
-          ++try_count;
-          if (try_count % 32)
-          {
-            std::this_thread::yield();
-          }
-        }
-        std::this_thread::yield();
-      },
-      [](std::atomic_flag &l) { l.clear(std::memory_order_release); });
-}
-
-// Run the benchmarks at 2x thread/core and measure the amount of time to thrash around.
-BENCHMARK(BM_SpinLockThrashing)
-    ->RangeMultiplier(2)
-    ->Range(1, std::thread::hardware_concurrency())
-    ->MeasureProcessCPUTime()
-    ->UseRealTime()
-    ->Unit(benchmark::kMillisecond);
-BENCHMARK(BM_ProcYieldSpinLockThrashing)
-    ->RangeMultiplier(2)
-    ->Range(1, std::thread::hardware_concurrency())
-    ->MeasureProcessCPUTime()
-    ->UseRealTime()
-    ->Unit(benchmark::kMillisecond);
-BENCHMARK(BM_NaiveSpinLockThrashing)
-    ->RangeMultiplier(2)
-    ->Range(1, std::thread::hardware_concurrency())
-    ->MeasureProcessCPUTime()
-    ->UseRealTime()
-    ->Unit(benchmark::kMillisecond);
-BENCHMARK(BM_ThreadYieldSpinLockThrashing)
-    ->RangeMultiplier(2)
-    ->Range(1, std::thread::hardware_concurrency())
-    ->MeasureProcessCPUTime()
-    ->UseRealTime()
-    ->Unit(benchmark::kMillisecond);
-
-}  // namespace
-
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/common/string_util_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/common/string_util_test.cc
deleted file mode 100644
index 874660776..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/common/string_util_test.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string.h>
-
-#include <opentelemetry/common/string_util.h>
-
-// ------------------------- StringUtil class tests ---------------------------------
-
-using opentelemetry::common::StringUtil;
-
-TEST(StringUtilTest, TrimStringWithIndex)
-{
-  struct
-  {
-    const char *input;
-    const char *expected;
-  } testcases[] = {{"k1=v1", "k1=v1"},     {"k1=v1,k2=v2, k3=v3", "k1=v1,k2=v2, k3=v3"},
-                   {"   k1=v1", "k1=v1"},  {"k1=v1   ", "k1=v1"},
-                   {"   k1=v1 ", "k1=v1"}, {"  ", ""}};
-  for (auto &testcase : testcases)
-  {
-    EXPECT_EQ(StringUtil::Trim(testcase.input, 0, strlen(testcase.input) - 1), testcase.expected);
-  }
-}
-
-TEST(StringUtilTest, TrimString)
-{
-  struct
-  {
-    const char *input;
-    const char *expected;
-  } testcases[] = {{"k1=v1", "k1=v1"},
-                   {"k1=v1,k2=v2, k3=v3", "k1=v1,k2=v2, k3=v3"},
-                   {"   k1=v1", "k1=v1"},
-                   {"k1=v1   ", "k1=v1"},
-                   {"k1=v1\t", "k1=v1"},
-                   {"\t k1=v1 \t", "k1=v1"},
-                   {"\t\t k1=v1\t  ", "k1=v1"},
-                   {"\t\t k1=v1\t  ,k2=v2", "k1=v1\t  ,k2=v2"},
-                   {"   k1=v1 ", "k1=v1"},
-                   {" ", ""},
-                   {"", ""},
-                   {"\n_some string_\t", "_some string_"}};
-
-  for (auto &testcase : testcases)
-  {
-    EXPECT_EQ(StringUtil::Trim(testcase.input), testcase.expected);
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/context/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/context/BUILD
deleted file mode 100644
index 64b2cb750..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/context/BUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "context_test",
-    srcs = [
-        "context_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "runtime_context_test",
-    srcs = [
-        "runtime_context_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/context/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/context/CMakeLists.txt
deleted file mode 100644
index 25ce51bc2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/context/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(propagation)
-
-include(GoogleTest)
-
-foreach(testname context_test runtime_context_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX context.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/context/context_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/context/context_test.cc
deleted file mode 100644
index a33816c9e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/context/context_test.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <map>
-#include <string>
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-
-using namespace opentelemetry;
-
-// Tests that the context constructor accepts an std::map.
-TEST(ContextTest, ContextIterableAcceptsMap)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  context::Context test_context                         = context::Context(map_test);
-}
-
-// Tests that the GetValue method returns the expected value.
-TEST(ContextTest, ContextGetValueReturnsExpectedValue)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)},
-                                                           {"foo_key", static_cast<int64_t>(456)}};
-  const context::Context test_context                   = context::Context(map_test);
-  EXPECT_EQ(nostd::get<int64_t>(test_context.GetValue("test_key")), 123);
-  EXPECT_EQ(nostd::get<int64_t>(test_context.GetValue("foo_key")), 456);
-}
-
-// Tests that the SetValues method accepts an std::map.
-TEST(ContextTest, ContextSetValuesAcceptsMap)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  std::map<std::string, context::ContextValue> map_test_write = {
-      {"foo_key", static_cast<int64_t>(456)}};
-
-  context::Context test_context = context::Context(map_test);
-  context::Context foo_context  = test_context.SetValues(map_test_write);
-
-  EXPECT_EQ(nostd::get<int64_t>(foo_context.GetValue("test_key")), 123);
-  EXPECT_EQ(nostd::get<int64_t>(foo_context.GetValue("foo_key")), 456);
-}
-
-// Tests that the SetValues method accepts a nostd::string_view and
-// context::ContextValue.
-TEST(ContextTest, ContextSetValuesAcceptsStringViewContextValue)
-{
-  nostd::string_view string_view_test      = "string_view";
-  context::ContextValue context_value_test = static_cast<int64_t>(123);
-
-  context::Context test_context = context::Context(string_view_test, context_value_test);
-  context::Context foo_context  = test_context.SetValue(string_view_test, context_value_test);
-
-  EXPECT_EQ(nostd::get<int64_t>(foo_context.GetValue(string_view_test)), 123);
-}
-
-// Tests that the original context does not change when a value is
-// written to it.
-TEST(ContextTest, ContextImmutability)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-
-  context::Context context_test = context::Context(map_test);
-  context::Context context_foo  = context_test.SetValue("foo_key", static_cast<int64_t>(456));
-
-  EXPECT_FALSE(nostd::holds_alternative<int64_t>(context_test.GetValue("foo_key")));
-}
-
-// Tests that writing the same to a context overwrites the original value.
-TEST(ContextTest, ContextKeyOverwrite)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-
-  context::Context context_test = context::Context(map_test);
-  context::Context context_foo  = context_test.SetValue("test_key", static_cast<int64_t>(456));
-
-  EXPECT_EQ(nostd::get<int64_t>(context_foo.GetValue("test_key")), 456);
-}
-
-// Tests that the new Context Objects inherits the keys and values
-// of the original context object.
-TEST(ContextTest, ContextInheritance)
-{
-  using M = std::map<std::string, context::ContextValue>;
-
-  M m1 = {{"test_key", static_cast<int64_t>(123)}, {"foo_key", static_cast<int64_t>(321)}};
-  M m2 = {{"other_key", static_cast<int64_t>(789)}, {"another_key", static_cast<int64_t>(987)}};
-
-  context::Context test_context = context::Context(m1);
-  context::Context foo_context  = test_context.SetValues(m2);
-
-  EXPECT_EQ(nostd::get<int64_t>(foo_context.GetValue("test_key")), 123);
-  EXPECT_EQ(nostd::get<int64_t>(foo_context.GetValue("foo_key")), 321);
-  EXPECT_EQ(nostd::get<int64_t>(foo_context.GetValue("other_key")), 789);
-  EXPECT_EQ(nostd::get<int64_t>(foo_context.GetValue("another_key")), 987);
-
-  EXPECT_TRUE(nostd::holds_alternative<nostd::monostate>(test_context.GetValue("other_key")));
-  EXPECT_TRUE(nostd::holds_alternative<nostd::monostate>(test_context.GetValue("another_key")));
-}
-
-// Tests that copying a context copies the key value pairs as expected.
-TEST(ContextTest, ContextCopyOperator)
-{
-  std::map<std::string, context::ContextValue> test_map = {
-      {"test_key", static_cast<int64_t>(123)},
-      {"foo_key", static_cast<int64_t>(456)},
-      {"other_key", static_cast<int64_t>(789)}};
-
-  context::Context test_context          = context::Context(test_map);
-  const context::Context &copied_context = test_context;
-
-  EXPECT_EQ(nostd::get<int64_t>(copied_context.GetValue("test_key")), 123);
-  EXPECT_EQ(nostd::get<int64_t>(copied_context.GetValue("foo_key")), 456);
-  EXPECT_EQ(nostd::get<int64_t>(copied_context.GetValue("other_key")), 789);
-}
-
-// Tests that the Context accepts an empty map.
-TEST(ContextTest, ContextEmptyMap)
-{
-  std::map<std::string, context::ContextValue> map_test = {};
-  context::Context test_context                         = context::Context(map_test);
-}
-
-// Tests that if a key exists within a context has key will return true
-// false if not.
-TEST(ContextTest, ContextHasKey)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  const context::Context context_test                   = context::Context(map_test);
-  EXPECT_TRUE(context_test.HasKey("test_key"));
-  EXPECT_FALSE(context_test.HasKey("foo_key"));
-}
-
-// Tests that a copied context returns true when compared
-TEST(ContextTest, ContextCopyCompare)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  context::Context context_test                         = context::Context(map_test);
-  const context::Context &copied_test                   = context_test;
-  EXPECT_TRUE(context_test == copied_test);
-}
-
-// Tests that two differently constructed contexts return false when compared
-TEST(ContextTest, ContextDiffCompare)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  std::map<std::string, context::ContextValue> map_foo  = {{"foo_key", static_cast<int64_t>(123)}};
-  context::Context context_test                         = context::Context(map_test);
-  context::Context foo_test                             = context::Context(map_foo);
-  EXPECT_FALSE(context_test == foo_test);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/BUILD
deleted file mode 100644
index d62d67649..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "composite_propagator_test",
-    srcs = [
-        "composite_propagator_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/CMakeLists.txt
deleted file mode 100644
index 844aa123f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(testname composite_propagator_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX trace.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/composite_propagator_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/composite_propagator_test.cc
deleted file mode 100644
index 05e0baf84..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/context/propagation/composite_propagator_test.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/propagation/composite_propagator.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/propagation/b3_propagator.h"
-#include "opentelemetry/trace/propagation/http_trace_context.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-
-using namespace opentelemetry;
-
-template <typename T>
-static std::string Hex(const T &id_item)
-{
-  char buf[T::kSize * 2];
-  id_item.ToLowerBase16(buf);
-  return std::string(buf, sizeof(buf));
-}
-
-class TextMapCarrierTest : public context::propagation::TextMapCarrier
-{
-public:
-  nostd::string_view Get(nostd::string_view key) const noexcept override
-  {
-    auto it = headers_.find(std::string(key));
-    if (it != headers_.end())
-    {
-      return nostd::string_view(it->second);
-    }
-    return "";
-  }
-  void Set(nostd::string_view key, nostd::string_view value) noexcept override
-  {
-    headers_[std::string(key)] = std::string(value);
-  }
-
-  std::map<std::string, std::string> headers_;
-};
-
-class CompositePropagatorTest : public ::testing::Test
-{
-
-public:
-  CompositePropagatorTest()
-  {
-    std::vector<std::unique_ptr<context::propagation::TextMapPropagator>> propogator_list = {};
-    std::unique_ptr<context::propagation::TextMapPropagator> w3c_propogator(
-        new trace::propagation::HttpTraceContext());
-    std::unique_ptr<context::propagation::TextMapPropagator> b3_propogator(
-        new trace::propagation::B3Propagator());
-    propogator_list.push_back(std::move(w3c_propogator));
-    propogator_list.push_back(std::move(b3_propogator));
-
-    composite_propagator_ =
-        new context::propagation::CompositePropagator(std::move(propogator_list));
-  }
-
-  ~CompositePropagatorTest() override { delete composite_propagator_; }
-
-protected:
-  context::propagation::CompositePropagator *composite_propagator_;
-};
-
-TEST_F(CompositePropagatorTest, Extract)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_ = {
-      {"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"},
-      {"b3", "80f198ee56343ba864fe8b2a57d3eff7-e457b5a2e4d86bd1-1-05e3ac9a4f6e3b90"}};
-  context::Context ctx1 = context::Context{};
-
-  context::Context ctx2 = composite_propagator_->Extract(carrier, ctx1);
-
-  auto ctx2_span = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_TRUE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-
-  auto span = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  // confirm last propagator in composite propagator list (B3 here) wins for same key
-  // ("active_span" here).
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "80f198ee56343ba864fe8b2a57d3eff7");
-  EXPECT_EQ(Hex(span->GetContext().span_id()), "e457b5a2e4d86bd1");
-  EXPECT_EQ(span->GetContext().IsSampled(), true);
-  EXPECT_EQ(span->GetContext().IsRemote(), true);
-
-  // Now check that last propagator does not win if there is no header for it
-  carrier.headers_ = {{"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-00"}};
-  ctx1             = context::Context{};
-
-  ctx2 = composite_propagator_->Extract(carrier, ctx1);
-
-  ctx2_span = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_TRUE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-
-  span = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  // Here the first propagator (W3C) wins
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "4bf92f3577b34da6a3ce929d0e0e4736");
-  EXPECT_EQ(Hex(span->GetContext().span_id()), "0102030405060708");
-  EXPECT_EQ(span->GetContext().IsSampled(), false);
-  EXPECT_EQ(span->GetContext().IsRemote(), true);
-}
-
-TEST_F(CompositePropagatorTest, Inject)
-{
-  TextMapCarrierTest carrier;
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  trace::SpanContext span_context{trace::TraceId{buf_trace}, trace::SpanId{buf_span},
-                                  trace::TraceFlags{true}, false};
-  nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan{span_context}};
-
-  // Set `sp` as the currently active span, which must be used by `Inject`.
-  trace::Scope scoped_span{sp};
-
-  composite_propagator_->Inject(carrier, context::RuntimeContext::GetCurrent());
-  EXPECT_EQ(carrier.headers_["traceparent"],
-            "00-0102030405060708090a0b0c0d0e0f10-0102030405060708-01");
-  EXPECT_EQ(carrier.headers_["b3"], "0102030405060708090a0b0c0d0e0f10-0102030405060708-1");
-
-  std::vector<std::string> fields;
-  composite_propagator_->Fields([&fields](nostd::string_view field) {
-    fields.push_back(field.data());
-    return true;
-  });
-  EXPECT_EQ(fields.size(), 3);
-  EXPECT_EQ(fields[0], trace::propagation::kTraceParent);
-  EXPECT_EQ(fields[1], trace::propagation::kTraceState);
-  EXPECT_EQ(fields[2], trace::propagation::kB3CombinedHeader);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/context/runtime_context_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/context/runtime_context_test.cc
deleted file mode 100644
index cc8220817..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/context/runtime_context_test.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-
-using namespace opentelemetry;
-
-// Tests that GetCurrent returns the current context
-TEST(RuntimeContextTest, GetCurrent)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  context::Context test_context                         = context::Context(map_test);
-  auto old_context = context::RuntimeContext::Attach(test_context);
-  EXPECT_EQ(context::RuntimeContext::GetCurrent(), test_context);
-}
-
-// Tests that detach resets the context to the previous context
-TEST(RuntimeContextTest, Detach)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  context::Context test_context                         = context::Context(map_test);
-  context::Context foo_context                          = context::Context(map_test);
-
-  auto test_context_token = context::RuntimeContext::Attach(test_context);
-  auto foo_context_token  = context::RuntimeContext::Attach(foo_context);
-
-  foo_context_token.reset();
-  EXPECT_EQ(context::RuntimeContext::GetCurrent(), test_context);
-  test_context_token.reset();
-}
-
-// Tests that detach returns false when the wrong context is provided
-TEST(RuntimeContextTest, DetachWrongContext)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  context::Context test_context                         = context::Context(map_test);
-  auto test_context_token = context::RuntimeContext::Attach(test_context);
-  EXPECT_TRUE(context::RuntimeContext::Detach(*test_context_token));
-  EXPECT_FALSE(context::RuntimeContext::Detach(*test_context_token));
-}
-
-// Tests that the ThreadLocalContext can handle three attached contexts
-TEST(RuntimeContextTest, ThreeAttachDetach)
-{
-  std::map<std::string, context::ContextValue> map_test = {{"test_key", static_cast<int64_t>(123)}};
-  context::Context test_context                         = context::Context(map_test);
-  context::Context foo_context                          = context::Context(map_test);
-  context::Context other_context                        = context::Context(map_test);
-  auto test_context_token  = context::RuntimeContext::Attach(test_context);
-  auto foo_context_token   = context::RuntimeContext::Attach(foo_context);
-  auto other_context_token = context::RuntimeContext::Attach(other_context);
-
-  EXPECT_TRUE(context::RuntimeContext::Detach(*other_context_token));
-  EXPECT_TRUE(context::RuntimeContext::Detach(*foo_context_token));
-  EXPECT_TRUE(context::RuntimeContext::Detach(*test_context_token));
-}
-
-// Tests that SetValue returns a context with the passed in data and the
-// RuntimeContext data when a context is not passed into the
-// RuntimeContext::SetValue method.
-TEST(RuntimeContextTest, SetValueRuntimeContext)
-{
-  context::Context foo_context = context::Context("foo_key", static_cast<int64_t>(596));
-  auto old_context_token       = context::RuntimeContext::Attach(foo_context);
-  context::Context test_context =
-      context::RuntimeContext::SetValue("test_key", static_cast<int64_t>(123));
-  EXPECT_EQ(nostd::get<int64_t>(test_context.GetValue("test_key")), 123);
-  EXPECT_EQ(nostd::get<int64_t>(test_context.GetValue("foo_key")), 596);
-}
-
-// Tests that SetValue returns a context with the passed in data and the
-// passed in context data when a context* is passed into the
-// RuntimeContext::SetValue method.
-TEST(RuntimeContextTest, SetValueOtherContext)
-{
-  context::Context foo_context = context::Context("foo_key", static_cast<int64_t>(596));
-  context::Context test_context =
-      context::RuntimeContext::SetValue("test_key", static_cast<int64_t>(123), &foo_context);
-  EXPECT_EQ(nostd::get<int64_t>(test_context.GetValue("test_key")), 123);
-  EXPECT_EQ(nostd::get<int64_t>(test_context.GetValue("foo_key")), 596);
-}
-
-// Tests that SetValue returns the ContextValue associated with the
-// passed in string and the current Runtime Context
-TEST(RuntimeContextTest, GetValueRuntimeContext)
-{
-  context::Context foo_context = context::Context("foo_key", static_cast<int64_t>(596));
-  auto old_context_token       = context::RuntimeContext::Attach(foo_context);
-  EXPECT_EQ(nostd::get<int64_t>(context::RuntimeContext::GetValue("foo_key")), 596);
-}
-
-// Tests that SetValue returns the ContextValue associated with the
-// passed in string and the passed in context
-TEST(RuntimeContextTest, GetValueOtherContext)
-{
-  context::Context foo_context = context::Context("foo_key", static_cast<int64_t>(596));
-  EXPECT_EQ(nostd::get<int64_t>(context::RuntimeContext::GetValue("foo_key", &foo_context)), 596);
-}
-
-// Test that any possible order of context detaching doesn't mess up the stack.
-TEST(RuntimeContextTest, DetachOutOfOrder)
-{
-  std::vector<size_t> indices;
-  indices.push_back(0);
-  indices.push_back(1);
-  indices.push_back(2);
-  indices.push_back(3);
-
-  std::vector<context::Context> contexts;
-  contexts.reserve(indices.size());
-  for (auto i : indices)
-  {
-    contexts.push_back(context::Context("index", static_cast<int64_t>(i)));
-  }
-
-  do
-  {
-    std::vector<nostd::unique_ptr<context::Token>> tokens;
-
-    tokens.reserve(contexts.size());
-    for (auto &c : contexts)
-    {
-      tokens.push_back(context::RuntimeContext::Attach(c));
-    }
-
-    for (size_t i : indices)
-    {
-      auto token = std::move(tokens.at(i));
-      context::RuntimeContext::Detach(*token);
-    }
-
-    EXPECT_EQ(context::RuntimeContext::GetCurrent(), context::Context());
-
-  } while (std::next_permutation(indices.begin(), indices.end()));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/core/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/core/BUILD
deleted file mode 100644
index 38c65e6d3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/core/BUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_test(
-    name = "timestamp_test",
-    srcs = [
-        "timestamp_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "version_test",
-    srcs = [
-        "version_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/core/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/core/CMakeLists.txt
deleted file mode 100644
index 7123f9a70..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/core/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include(GoogleTest)
-
-add_executable(timestamp_test timestamp_test.cc)
-target_link_libraries(timestamp_test ${GTEST_BOTH_LIBRARIES}
-                      ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-gtest_add_tests(
-  TARGET timestamp_test
-  TEST_PREFIX trace.
-  TEST_LIST timestamp_test)
-
-add_executable(version_test version_test.cc)
-target_link_libraries(version_test ${GTEST_BOTH_LIBRARIES}
-                      ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-gtest_add_tests(
-  TARGET version_test
-  TEST_PREFIX version.
-  TEST_LIST version_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/core/timestamp_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/core/timestamp_test.cc
deleted file mode 100644
index f75cb0457..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/core/timestamp_test.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdlib.h>
-#include <chrono>
-#include <string>
-
-#include "opentelemetry/common/timestamp.h"
-
-using opentelemetry::common::SteadyTimestamp;
-using opentelemetry::common::SystemTimestamp;
-
-template <class Timestamp>
-static bool AreNearlyEqual(const Timestamp &t1, const Timestamp &t2) noexcept
-{
-  return std::abs(std::chrono::duration_cast<std::chrono::nanoseconds>(t2 - t1).count()) < 2;
-}
-
-TEST(SystemTimestampTest, Construction)
-{
-  auto now_system = std::chrono::system_clock::now();
-
-  SystemTimestamp t1;
-  EXPECT_EQ(t1.time_since_epoch(), std::chrono::nanoseconds{0});
-
-  SystemTimestamp t2{now_system};
-  EXPECT_TRUE(AreNearlyEqual(now_system, static_cast<std::chrono::system_clock::time_point>(t2)));
-  EXPECT_EQ(std::chrono::duration_cast<std::chrono::nanoseconds>(now_system.time_since_epoch()),
-            t2.time_since_epoch());
-}
-
-TEST(SystemTimestampTest, Comparison)
-{
-  SystemTimestamp t1;
-  SystemTimestamp t2;
-  SystemTimestamp t3{std::chrono::nanoseconds{2}};
-
-  EXPECT_EQ(t1, t1);
-  EXPECT_EQ(t1, t2);
-  EXPECT_EQ(t2, t1);
-  EXPECT_NE(t1, t3);
-  EXPECT_NE(t3, t1);
-}
-
-TEST(SteadyTimestampTest, Construction)
-{
-  auto now_steady = std::chrono::steady_clock::now();
-
-  SteadyTimestamp t1;
-  EXPECT_EQ(t1.time_since_epoch(), std::chrono::nanoseconds{0});
-
-  SteadyTimestamp t2{now_steady};
-  EXPECT_TRUE(AreNearlyEqual(now_steady, static_cast<std::chrono::steady_clock::time_point>(t2)));
-  EXPECT_EQ(std::chrono::duration_cast<std::chrono::nanoseconds>(now_steady.time_since_epoch()),
-            t2.time_since_epoch());
-}
-
-TEST(SteadyTimestampTest, Comparison)
-{
-  SteadyTimestamp t1;
-  SteadyTimestamp t2;
-  SteadyTimestamp t3{std::chrono::nanoseconds{2}};
-
-  EXPECT_EQ(t1, t1);
-  EXPECT_EQ(t1, t2);
-  EXPECT_EQ(t2, t1);
-  EXPECT_NE(t1, t3);
-  EXPECT_NE(t3, t1);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/core/version_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/core/version_test.cc
deleted file mode 100644
index 1ceb68602..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/core/version_test.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdio.h>
-#include <string>
-
-#include "opentelemetry/version.h"
-
-TEST(VersionTest, Consistency)
-{
-  char expected[10];
-  snprintf(expected, sizeof(expected), "%d.%d.%d", OPENTELEMETRY_VERSION_MAJOR,
-           OPENTELEMETRY_VERSION_MINOR, OPENTELEMETRY_VERSION_PATCH);
-
-  std::string actual = OPENTELEMETRY_VERSION;
-  EXPECT_EQ(actual, expected);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/logs/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/logs/BUILD
deleted file mode 100644
index 521620a20..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/logs/BUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "provider_test",
-    srcs = [
-        "provider_test.cc",
-    ],
-    tags = [
-        "api",
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "logger_test",
-    srcs = [
-        "logger_test.cc",
-    ],
-    tags = [
-        "api",
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/logs/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/logs/CMakeLists.txt
deleted file mode 100644
index 3d1278274..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/logs/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(testname provider_test logger_test)
-  add_executable(logs_api_${testname} "${testname}.cc")
-  target_link_libraries(logs_api_${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET logs_api_${testname}
-    TEST_PREFIX logs.
-    TEST_LIST logs_api_${testname})
-endforeach()
-
-if(WITH_BENCHMARK)
-  add_executable(logger_benchmark logger_benchmark.cc)
-  target_link_libraries(logger_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/logs/logger_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/api/test/logs/logger_benchmark.cc
deleted file mode 100644
index 114620caf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/logs/logger_benchmark.cc
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <stdint.h>
-#include <algorithm>
-#include <condition_variable>
-#include <cstddef>
-#include <functional>
-#include <mutex>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/logs/event_id.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-
-using opentelemetry::logs::EventId;
-using opentelemetry::logs::Provider;
-using opentelemetry::logs::Severity;
-
-namespace
-{
-
-constexpr int64_t kMaxIterations = 1000000000;
-
-class Barrier
-{
-public:
-  explicit Barrier(std::size_t iCount) : mThreshold(iCount), mCount(iCount) {}
-
-  void Wait()
-  {
-    std::unique_lock<std::mutex> lLock{mMutex};
-    auto lGen = mGeneration;
-    if (!--mCount)
-    {
-      mGeneration++;
-      mCount = mThreshold;
-      mCond.notify_all();
-    }
-    else
-    {
-      mCond.wait(lLock, [this, lGen] { return lGen != mGeneration; });
-    }
-  }
-
-private:
-  std::mutex mMutex;
-  std::condition_variable mCond;
-  std::size_t mThreshold;
-  std::size_t mCount;
-  std::size_t mGeneration{0};
-};
-
-static void ThreadRoutine(Barrier &barrier,
-                          benchmark::State &state,
-                          int thread_id,
-                          const std::function<void()> &func)
-{
-  barrier.Wait();
-
-  if (thread_id == 0)
-  {
-    state.ResumeTiming();
-  }
-
-  barrier.Wait();
-
-  func();
-
-  if (thread_id == 0)
-  {
-    state.PauseTiming();
-  }
-
-  barrier.Wait();
-}
-
-void MultiThreadRunner(benchmark::State &state, const std::function<void()> &func)
-{
-  uint32_t num_threads = std::thread::hardware_concurrency();
-
-  Barrier barrier(num_threads);
-
-  std::vector<std::thread> threads;
-
-  threads.reserve(num_threads);
-  for (uint32_t i = 0; i < num_threads; i++)
-  {
-    threads.emplace_back(ThreadRoutine, std::ref(barrier), std::ref(state), i, func);
-  }
-
-  for (auto &thread : threads)
-  {
-    thread.join();
-  }
-}
-
-static void BM_UnstructuredLog(benchmark::State &state)
-{
-  auto lp     = Provider::GetLoggerProvider();
-  auto logger = lp->GetLogger("UnstructuredLog");
-
-  for (auto _ : state)
-  {
-    state.PauseTiming();
-
-    MultiThreadRunner(state, [&logger]() {
-      for (int64_t i = 0; i < kMaxIterations; i++)
-      {
-        logger->Trace("This is a simple unstructured log message");
-      }
-    });
-
-    state.ResumeTiming();
-  }
-}
-BENCHMARK(BM_UnstructuredLog);
-
-static void BM_StructuredLogWithTwoAttributes(benchmark::State &state)
-{
-  auto lp     = Provider::GetLoggerProvider();
-  auto logger = lp->GetLogger("StructuredLog");
-
-  for (auto _ : state)
-  {
-    state.PauseTiming();
-
-    MultiThreadRunner(state, [&logger]() {
-      for (int64_t i = 0; i < kMaxIterations; i++)
-      {
-        logger->Trace(
-            "This is a simple structured log message from {process_id}:{thread_id}",
-            opentelemetry::common::MakeAttributes({{"process_id", 12347}, {"thread_id", 12348}}));
-      }
-    });
-
-    state.ResumeTiming();
-  }
-}
-BENCHMARK(BM_StructuredLogWithTwoAttributes);
-
-static void BM_StructuredLogWithEventIdAndTwoAttributes(benchmark::State &state)
-{
-  auto lp     = Provider::GetLoggerProvider();
-  auto logger = lp->GetLogger("StructuredLogWithEventId");
-
-  for (auto _ : state)
-  {
-    state.PauseTiming();
-
-    MultiThreadRunner(state, [&logger]() {
-      for (int64_t i = 0; i < kMaxIterations; i++)
-      {
-        logger->Trace(
-            0x12345678, "This is a simple structured log message from {process_id}:{thread_id}",
-            opentelemetry::common::MakeAttributes({{"process_id", 12347}, {"thread_id", 12348}}));
-      }
-    });
-
-    state.ResumeTiming();
-  }
-}
-BENCHMARK(BM_StructuredLogWithEventIdAndTwoAttributes);
-
-static void BM_StructuredLogWithEventIdStructAndTwoAttributes(benchmark::State &state)
-{
-  auto lp     = Provider::GetLoggerProvider();
-  auto logger = lp->GetLogger("StructuredLogWithEventId");
-
-  const EventId function_name_event_id{0x12345678, "Company.Component.SubComponent.FunctionName"};
-
-  for (auto _ : state)
-  {
-    state.PauseTiming();
-
-    MultiThreadRunner(state, [&logger, &function_name_event_id]() {
-      for (int64_t i = 0; i < kMaxIterations; i++)
-      {
-        logger->Trace(
-            function_name_event_id,
-            "Simulate function enter trace message from {process_id}:{thread_id}",
-            opentelemetry::common::MakeAttributes({{"process_id", 12347}, {"thread_id", 12348}}));
-      }
-    });
-
-    state.ResumeTiming();
-  }
-}
-BENCHMARK(BM_StructuredLogWithEventIdStructAndTwoAttributes);
-
-static void BM_EnabledOnSeverityReturnFalse(benchmark::State &state)
-{
-  auto lp     = Provider::GetLoggerProvider();
-  auto logger = lp->GetLogger("UnstructuredLogWithEnabledReturnFalse");
-
-  for (auto _ : state)
-  {
-    state.PauseTiming();
-
-    MultiThreadRunner(state, [&logger]() {
-      for (int64_t i = 0; i < kMaxIterations; i++)
-      {
-        if (logger->Enabled(Severity::kTrace))
-        {
-          logger->Trace("This log line would not be called");
-        }
-      }
-    });
-
-    state.ResumeTiming();
-  }
-}
-BENCHMARK(BM_EnabledOnSeverityReturnFalse);
-
-static void BM_EnabledOnSeverityAndEventIdReturnFalse(benchmark::State &state)
-{
-  auto lp     = Provider::GetLoggerProvider();
-  auto logger = lp->GetLogger("UnstructuredLogWithEnabledReturnFalse");
-
-  for (auto _ : state)
-  {
-    state.PauseTiming();
-
-    MultiThreadRunner(state, [&logger]() {
-      for (int64_t i = 0; i < kMaxIterations; i++)
-      {
-        if (logger->Enabled(Severity::kTrace, 0x12345678))
-        {
-          logger->Trace("This log line would not be called");
-        }
-      }
-    });
-
-    state.ResumeTiming();
-  }
-}
-BENCHMARK(BM_EnabledOnSeverityAndEventIdReturnFalse);
-
-}  // namespace
-
-int main(int argc, char **argv)
-{
-  benchmark::Initialize(&argc, argv);
-  benchmark::RunSpecifiedBenchmarks();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/logs/logger_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/logs/logger_test.cc
deleted file mode 100644
index 626570530..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/logs/logger_test.cc
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/logs/event_id.h"
-#include "opentelemetry/logs/event_logger.h"
-#include "opentelemetry/logs/event_logger_provider.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-
-using opentelemetry::logs::EventId;
-using opentelemetry::logs::Logger;
-using opentelemetry::logs::LoggerProvider;
-using opentelemetry::logs::Provider;
-using opentelemetry::logs::Severity;
-using opentelemetry::nostd::shared_ptr;
-using opentelemetry::nostd::string_view;
-namespace common = opentelemetry::common;
-namespace nostd  = opentelemetry::nostd;
-namespace trace  = opentelemetry::trace;
-
-// Check that the default logger is a noop logger instance
-TEST(Logger, GetLoggerDefault)
-{
-  auto lp = Provider::GetLoggerProvider();
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = lp->GetLogger("TestLogger", "opentelelemtry_library", "", schema_url);
-  EXPECT_NE(nullptr, logger);
-  auto name = logger->GetName();
-  EXPECT_EQ(name, "noop logger");
-  auto record = logger->CreateLogRecord();
-  EXPECT_NE(nullptr, record);
-}
-
-// Test the two additional overloads for GetLogger()
-TEST(Logger, GetNoopLoggerNameWithArgs)
-{
-  auto lp = Provider::GetLoggerProvider();
-
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  lp->GetLogger("NoopLoggerWithArgs", "opentelelemtry_library", "", schema_url);
-
-  lp->GetLogger("NoopLoggerWithOptions", "opentelelemtry_library", "", schema_url);
-}
-
-// Test the EmitLogRecord() overloads
-TEST(Logger, LogMethodOverloads)
-{
-  auto lp = Provider::GetLoggerProvider();
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = lp->GetLogger("TestLogger", "opentelelemtry_library", "", schema_url);
-
-  EventId trace_event_id{0x1, "TraceEventId"};
-  EventId debug_event_id{0x2, "DebugEventId"};
-  EventId info_event_id{0x3, "InfoEventId"};
-  EventId warn_event_id{0x4, "WarnEventId"};
-  EventId error_event_id{0x5, "ErrorEventId"};
-  EventId fatal_event_id{0x6, "FatalEventId"};
-
-  // Create a map to test the logs with
-  std::map<std::string, std::string> m = {{"key1", "value1"}};
-
-  // EmitLogRecord overloads
-  logger->EmitLogRecord(Severity::kTrace, "Test log message");
-  logger->EmitLogRecord(Severity::kInfo, "Test log message");
-  logger->EmitLogRecord(Severity::kDebug, m);
-  logger->EmitLogRecord(Severity::kWarn, "Logging a map", m);
-  logger->EmitLogRecord(Severity::kError,
-                        opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->EmitLogRecord(Severity::kFatal, "Logging an initializer list",
-                        opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->EmitLogRecord(Severity::kDebug, opentelemetry::common::MakeAttributes(m));
-  logger->EmitLogRecord(Severity::kDebug,
-                        common::KeyValueIterableView<std::map<std::string, std::string>>(m));
-  std::pair<nostd::string_view, common::AttributeValue> array[] = {{"key1", "value1"}};
-  logger->EmitLogRecord(Severity::kDebug, opentelemetry::common::MakeAttributes(array));
-  std::vector<std::pair<std::string, std::string>> vec = {{"key1", "value1"}};
-  logger->EmitLogRecord(Severity::kDebug, opentelemetry::common::MakeAttributes(vec));
-
-  // Severity methods
-  logger->Trace("Test log message");
-  logger->Trace("Test log message", m);
-  logger->Trace("Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Trace(m);
-  logger->Trace(opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Trace(trace_event_id, "Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Trace(trace_event_id.id_, "Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-
-  logger->Debug("Test log message");
-  logger->Debug("Test log message", m);
-  logger->Debug("Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Debug(m);
-  logger->Debug(opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Debug(debug_event_id, "Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Debug(debug_event_id.id_, "Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-
-  logger->Info("Test log message");
-  logger->Info("Test log message", m);
-  logger->Info("Test log message",
-               opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Info(m);
-  logger->Info(opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Info(info_event_id, "Test log message",
-               opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Info(info_event_id.id_, "Test log message",
-               opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-
-  logger->Warn("Test log message");
-  logger->Warn("Test log message", m);
-  logger->Warn("Test log message",
-               opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Warn(m);
-  logger->Warn(opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Warn(warn_event_id, "Test log message",
-               opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Warn(warn_event_id.id_, "Test log message",
-               opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-
-  logger->Error("Test log message");
-  logger->Error("Test log message", m);
-  logger->Error("Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Error(m);
-  logger->Error(opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Error(error_event_id, "Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Error(error_event_id.id_, "Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-
-  logger->Fatal("Test log message");
-  logger->Fatal("Test log message", m);
-  logger->Fatal("Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Fatal(m);
-  logger->Fatal(opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Fatal(fatal_event_id, "Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  logger->Fatal(fatal_event_id.id_, "Test log message",
-                opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-TEST(Logger, EventLogMethodOverloads)
-{
-  auto lp = Provider::GetLoggerProvider();
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = lp->GetLogger("TestLogger", "opentelelemtry_library", "", schema_url);
-
-  auto elp          = Provider::GetEventLoggerProvider();
-  auto event_logger = elp->CreateEventLogger(logger, "otel-cpp.test");
-
-  std::map<std::string, std::string> m = {{"key1", "value1"}};
-
-  event_logger->EmitEvent("event name", Severity::kTrace, "Test log message");
-  event_logger->EmitEvent("event name", Severity::kInfo, "Test log message");
-  event_logger->EmitEvent("event name", Severity::kDebug, m);
-  event_logger->EmitEvent("event name", Severity::kWarn, "Logging a map", m);
-  event_logger->EmitEvent(
-      "event name", Severity::kError,
-      opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  event_logger->EmitEvent(
-      "event name", Severity::kFatal, "Logging an initializer list",
-      opentelemetry::common::MakeAttributes({{"key1", "value 1"}, {"key2", 2}}));
-  event_logger->EmitEvent("event name", Severity::kDebug, opentelemetry::common::MakeAttributes(m));
-  event_logger->EmitEvent("event name", Severity::kDebug,
-                          common::KeyValueIterableView<std::map<std::string, std::string>>(m));
-  std::pair<nostd::string_view, common::AttributeValue> array[] = {{"key1", "value1"}};
-  event_logger->EmitEvent("event name", Severity::kDebug,
-                          opentelemetry::common::MakeAttributes(array));
-  std::vector<std::pair<std::string, std::string>> vec = {{"key1", "value1"}};
-  event_logger->EmitEvent("event name", Severity::kDebug,
-                          opentelemetry::common::MakeAttributes(vec));
-}
-#endif
-
-// Define a basic Logger class
-class TestLogger : public Logger
-{
-  const nostd::string_view GetName() noexcept override { return "test logger"; }
-
-  nostd::unique_ptr<opentelemetry::logs::LogRecord> CreateLogRecord() noexcept override
-  {
-    return nullptr;
-  }
-
-  using Logger::EmitLogRecord;
-
-  void EmitLogRecord(nostd::unique_ptr<opentelemetry::logs::LogRecord> &&) noexcept override {}
-};
-
-// Define a basic LoggerProvider class that returns an instance of the logger class defined above
-class TestProvider : public LoggerProvider
-{
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view /* logger_name */,
-                                      nostd::string_view /* library_name */,
-                                      nostd::string_view /* library_version */,
-                                      nostd::string_view /* schema_url */,
-                                      const common::KeyValueIterable & /* attributes */) override
-  {
-    return nostd::shared_ptr<Logger>(new TestLogger());
-  }
-};
-
-TEST(Logger, PushLoggerImplementation)
-{
-  // Push the new loggerprovider class into the global singleton
-  auto test_provider = shared_ptr<LoggerProvider>(new TestProvider());
-  Provider::SetLoggerProvider(test_provider);
-
-  auto lp = Provider::GetLoggerProvider();
-
-  // Check that the implementation was pushed by calling TestLogger's GetName()
-  nostd::string_view schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = lp->GetLogger("TestLogger", "opentelelemtry_library", "", schema_url);
-  ASSERT_EQ("test logger", logger->GetName());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/logs/provider_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/logs/provider_test.cc
deleted file mode 100644
index 4a2dd2325..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/logs/provider_test.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/logs/event_logger.h"  // IWYU pragma: keep
-#include "opentelemetry/logs/event_logger_provider.h"
-#include "opentelemetry/logs/logger.h"  // IWYU pragma: keep
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-using opentelemetry::logs::EventLogger;
-using opentelemetry::logs::EventLoggerProvider;
-#endif
-using opentelemetry::logs::Logger;
-using opentelemetry::logs::LoggerProvider;
-using opentelemetry::logs::Provider;
-using opentelemetry::nostd::shared_ptr;
-namespace nostd = opentelemetry::nostd;
-
-class TestProvider : public LoggerProvider
-{
-  nostd::shared_ptr<Logger> GetLogger(
-      nostd::string_view /* logger_name */,
-      nostd::string_view /* library_name */,
-      nostd::string_view /* library_version */,
-      nostd::string_view /* schema_url */,
-      const opentelemetry::common::KeyValueIterable & /* attributes */) override
-  {
-    return shared_ptr<Logger>(nullptr);
-  }
-};
-
-TEST(Provider, GetLoggerProviderDefault)
-{
-  auto tf = Provider::GetLoggerProvider();
-  EXPECT_NE(nullptr, tf);
-}
-
-TEST(Provider, SetLoggerProvider)
-{
-  auto tf = shared_ptr<LoggerProvider>(new TestProvider());
-  Provider::SetLoggerProvider(tf);
-  ASSERT_EQ(tf, Provider::GetLoggerProvider());
-}
-
-TEST(Provider, MultipleLoggerProviders)
-{
-  auto tf = shared_ptr<LoggerProvider>(new TestProvider());
-  Provider::SetLoggerProvider(tf);
-  auto tf2 = shared_ptr<LoggerProvider>(new TestProvider());
-  Provider::SetLoggerProvider(tf2);
-
-  ASSERT_NE(Provider::GetLoggerProvider(), tf);
-}
-
-TEST(Provider, GetLogger)
-{
-  auto tf = shared_ptr<LoggerProvider>(new TestProvider());
-  // tests GetLogger(name, version, schema)
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-  auto logger = tf->GetLogger("logger1", "opentelelemtry_library", "", schema_url);
-  EXPECT_EQ(nullptr, logger);
-
-  // tests GetLogger(name, arguments)
-
-  auto logger2 = tf->GetLogger("logger2", "opentelelemtry_library", "", schema_url);
-  EXPECT_EQ(nullptr, logger2);
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-class TestEventLoggerProvider : public EventLoggerProvider
-{
-public:
-  nostd::shared_ptr<EventLogger> CreateEventLogger(
-      nostd::shared_ptr<Logger> /*delegate_logger*/,
-      nostd::string_view /*event_domain*/) noexcept override
-  {
-    return nostd::shared_ptr<EventLogger>(nullptr);
-  }
-};
-
-TEST(Provider, GetEventLoggerProviderDefault)
-{
-  auto tf = Provider::GetEventLoggerProvider();
-  EXPECT_NE(nullptr, tf);
-}
-
-TEST(Provider, SetEventLoggerProvider)
-{
-  auto tf = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
-  Provider::SetEventLoggerProvider(tf);
-  ASSERT_EQ(tf, Provider::GetEventLoggerProvider());
-}
-
-TEST(Provider, MultipleEventLoggerProviders)
-{
-  auto tf = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
-  Provider::SetEventLoggerProvider(tf);
-  auto tf2 = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
-  Provider::SetEventLoggerProvider(tf2);
-
-  ASSERT_NE(Provider::GetEventLoggerProvider(), tf);
-}
-
-TEST(Provider, CreateEventLogger)
-{
-  auto tf     = nostd::shared_ptr<TestEventLoggerProvider>(new TestEventLoggerProvider());
-  auto logger = tf->CreateEventLogger(nostd::shared_ptr<Logger>(nullptr), "domain");
-
-  EXPECT_EQ(nullptr, logger);
-}
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/metrics/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/metrics/BUILD
deleted file mode 100644
index 86e20033b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/metrics/BUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "noop_sync_instrument_test",
-    srcs = [
-        "noop_sync_instrument_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "meter_provider_test",
-    srcs = [
-        "meter_provider_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/metrics/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/metrics/CMakeLists.txt
deleted file mode 100644
index c63af9a7a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/metrics/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(testname meter_provider_test noop_sync_instrument_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX metrics_new.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/metrics/meter_provider_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/metrics/meter_provider_test.cc
deleted file mode 100644
index 639f0e8f4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/metrics/meter_provider_test.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/noop.h"
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-
-using opentelemetry::metrics::MeterProvider;
-using opentelemetry::metrics::NoopMeterProvider;
-using opentelemetry::metrics::Provider;
-
-TEST(Provider, GetMeterProviderDefault)
-{
-  auto tf = Provider::GetMeterProvider();
-  EXPECT_NE(nullptr, tf);
-}
-
-TEST(Provider, SetMeterProvider)
-{
-  auto tf = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
-  Provider::SetMeterProvider(tf);
-  ASSERT_EQ(tf, Provider::GetMeterProvider());
-}
-
-TEST(Provider, MultipleMeterProviders)
-{
-  auto tf = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
-  Provider::SetMeterProvider(tf);
-  auto tf2 = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
-  Provider::SetMeterProvider(tf2);
-
-  ASSERT_NE(Provider::GetMeterProvider(), tf);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/metrics/noop_sync_instrument_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/metrics/noop_sync_instrument_test.cc
deleted file mode 100644
index 384c2ae41..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/metrics/noop_sync_instrument_test.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/noop.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/string_view.h"
-
-TEST(Counter, Add)
-{
-  std::shared_ptr<opentelemetry::metrics::Counter<uint64_t>> counter{
-      new opentelemetry::metrics::NoopCounter<uint64_t>("test", "none", "unitless")};
-
-  std::map<std::string, std::string> labels = {{"k1", "v1"}};
-  counter->Add(10, labels);
-  counter->Add(10, labels, opentelemetry::context::Context{});
-  counter->Add(2);
-  counter->Add(2, opentelemetry::context::Context{});
-  counter->Add(10, {{"k1", "1"}, {"k2", 2}});
-  counter->Add(10, {{"k1", "1"}, {"k2", 2}}, opentelemetry::context::Context{});
-}
-
-TEST(histogram, Record)
-{
-  std::shared_ptr<opentelemetry::metrics::Histogram<uint64_t>> histogram{
-      new opentelemetry::metrics::NoopHistogram<uint64_t>("test", "none", "unitless")};
-
-  std::map<std::string, std::string> labels = {{"k1", "v1"}};
-  histogram->Record(10, labels, opentelemetry::context::Context{});
-  histogram->Record(2, opentelemetry::context::Context{});
-
-  histogram->Record(10, {{"k1", "1"}, {"k2", 2}}, opentelemetry::context::Context{});
-}
-
-TEST(UpDownCountr, Record)
-{
-  std::shared_ptr<opentelemetry::metrics::UpDownCounter<int64_t>> counter{
-      new opentelemetry::metrics::NoopUpDownCounter<int64_t>("test", "none", "unitless")};
-
-  std::map<std::string, std::string> labels = {{"k1", "v1"}};
-  counter->Add(10, labels);
-  counter->Add(10, labels, opentelemetry::context::Context{});
-  counter->Add(2);
-  counter->Add(2, opentelemetry::context::Context{});
-  counter->Add(10, {{"k1", "1"}, {"k2", 2}});
-  counter->Add(10, {{"k1", "1"}, {"k2", 2}}, opentelemetry::context::Context{});
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/BUILD
deleted file mode 100644
index 4f2b1d31f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/BUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_test(
-    name = "function_ref_test",
-    srcs = [
-        "function_ref_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "string_view_test",
-    srcs = [
-        "string_view_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "variant_test",
-    srcs = [
-        "variant_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "unique_ptr_test",
-    srcs = [
-        "unique_ptr_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "utility_test",
-    srcs = [
-        "utility_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "span_test",
-    srcs = [
-        "span_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "shared_ptr_test",
-    srcs = [
-        "shared_ptr_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/CMakeLists.txt
deleted file mode 100644
index ee774261e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include(GoogleTest)
-
-foreach(
-  testname
-  function_ref_test
-  string_view_test
-  unique_ptr_test
-  utility_test
-  span_test
-  shared_ptr_test
-  variant_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX nostd.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/function_ref_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/function_ref_test.cc
deleted file mode 100644
index 460561e76..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/function_ref_test.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-
-#include "opentelemetry/nostd/function_ref.h"
-
-using namespace opentelemetry::nostd;
-
-int Call(function_ref<int()> f)
-{
-  return f();
-}
-
-int Return3()
-{
-  return 3;
-}
-
-TEST(FunctionRefTest, Call)
-{
-  int x = 9;
-
-  auto f = [&] { return x; };
-  EXPECT_EQ(Call(f), 9);
-
-  EXPECT_EQ(Call(Return3), 3);
-}
-
-TEST(FunctionRefTest, BoolConversion)
-{
-  auto f = [] { return 0; };
-  function_ref<int()> fref1{nullptr};
-  function_ref<int()> fref2{f};
-  EXPECT_TRUE(!static_cast<bool>(fref1));
-  EXPECT_TRUE(static_cast<bool>(fref2));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/shared_ptr_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/shared_ptr_test.cc
deleted file mode 100644
index cd82398fb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/shared_ptr_test.cc
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <algorithm>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-
-using opentelemetry::nostd::shared_ptr;
-
-class A
-{
-public:
-  explicit A(bool &destructed) noexcept : destructed_{destructed} { destructed_ = false; }
-
-  ~A() { destructed_ = true; }
-
-private:
-  bool &destructed_;
-};
-
-class B
-{
-public:
-  int f() const { return 123; }
-};
-
-class C
-{
-public:
-  virtual ~C() {}
-};
-
-class D : public C
-{
-public:
-  ~D() override {}
-};
-
-TEST(SharedPtrTest, DefaultConstruction)
-{
-  shared_ptr<int> ptr1;
-  EXPECT_EQ(ptr1.get(), nullptr);
-
-  shared_ptr<int> ptr2{nullptr};
-  EXPECT_EQ(ptr2.get(), nullptr);
-}
-
-TEST(SharedPtrTest, ExplicitConstruction)
-{
-  auto c = new C();
-  shared_ptr<C> ptr1{c};
-  EXPECT_EQ(ptr1.get(), c);
-
-  auto d = new D();
-  shared_ptr<C> ptr2{d};
-  EXPECT_EQ(ptr2.get(), d);
-}
-
-TEST(SharedPtrTest, MoveConstruction)
-{
-  auto value = new int{123};
-  shared_ptr<int> ptr1{value};
-  shared_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
-  EXPECT_EQ(ptr2.get(), value);
-}
-
-TEST(SharedPtrTest, MoveConstructionFromDifferentType)
-{
-  auto value = new int{123};
-  shared_ptr<int> ptr1{value};
-  shared_ptr<const int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
-  EXPECT_EQ(ptr2.get(), value);
-}
-
-TEST(SharedPtrTest, MoveConstructionFromStdSharedPtr)
-{
-  auto value = new int{123};
-  std::shared_ptr<int> ptr1{value};
-  shared_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
-  EXPECT_EQ(ptr2.get(), value);
-}
-
-TEST(SharedPtrTest, Destruction)
-{
-  bool was_destructed;
-  shared_ptr<A>{new A{was_destructed}};  // NOLINT
-  EXPECT_TRUE(was_destructed);
-}
-
-TEST(SharedPtrTest, Assignment)
-{
-  auto value = new int{123};
-  shared_ptr<int> ptr1;
-
-  ptr1 = shared_ptr<int>(value);
-  EXPECT_EQ(ptr1.get(), value);
-
-  ptr1 = nullptr;
-  EXPECT_EQ(ptr1.get(), nullptr);
-
-  auto value2                = new int{234};
-  const shared_ptr<int> ptr2 = shared_ptr<int>(value2);
-  ptr1                       = ptr2;
-  EXPECT_EQ(ptr1.get(), value2);
-
-  auto value3 = new int{345};
-  std::shared_ptr<int> ptr3(value3);
-  ptr1 = ptr3;
-  EXPECT_EQ(ptr1.get(), value3);
-}
-
-TEST(SharedPtrTest, BoolConversionOpertor)
-{
-  auto value = new int{123};
-  shared_ptr<int> ptr1{value};
-
-  EXPECT_TRUE(ptr1);
-  EXPECT_FALSE(shared_ptr<int>{});
-}
-
-TEST(SharedPtrTest, PointerOperators)
-{
-  auto value = new int{123};
-  shared_ptr<int> ptr1{value};
-
-  EXPECT_EQ(&*ptr1, value);
-  EXPECT_EQ(shared_ptr<B> { new B } -> f(), 123);
-}
-
-TEST(SharedPtrTest, Swap)
-{
-  auto value1 = new int{123};
-  shared_ptr<int> ptr1{value1};
-
-  auto value2 = new int{456};
-  shared_ptr<int> ptr2{value2};
-  ptr1.swap(ptr2);
-
-  EXPECT_EQ(ptr1.get(), value2);
-  EXPECT_EQ(ptr2.get(), value1);
-}
-
-TEST(SharedPtrTest, Comparison)
-{
-  shared_ptr<int> ptr1{new int{123}};
-  shared_ptr<int> ptr2{new int{456}};
-  shared_ptr<int> ptr3{};
-
-  EXPECT_EQ(ptr1, ptr1);
-  EXPECT_NE(ptr1, ptr2);
-
-  EXPECT_NE(ptr1, nullptr);
-  EXPECT_NE(nullptr, ptr1);
-
-  EXPECT_EQ(ptr3, nullptr);
-  EXPECT_EQ(nullptr, ptr3);
-}
-
-static void SharedPtrTest_Sort(size_t size = 10)
-{
-  std::vector<shared_ptr<const int>> nums;
-
-  for (int i = static_cast<int>(size); i > 0; i--)
-  {
-    nums.push_back(shared_ptr<int>(new int(i)));
-  }
-
-  auto nums2 = nums;
-
-  std::sort(nums.begin(), nums.end(),
-            [](const shared_ptr<const int> &a, const shared_ptr<const int> &b) { return *a < *b; });
-
-  EXPECT_NE(nums, nums2);
-
-  std::reverse(nums2.begin(), nums2.end());
-
-  EXPECT_EQ(nums, nums2);
-}
-
-TEST(SharedPtrTest, Sort)
-{
-  SharedPtrTest_Sort();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/span_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/span_test.cc
deleted file mode 100644
index cac3d5cb5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/span_test.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <algorithm>
-#include <array>
-#include <iterator>
-#include <list>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include "opentelemetry/nostd/span.h"
-
-using opentelemetry::nostd::span;
-
-TEST(SpanTest, DefaultConstruction)
-{
-  span<int> s1;
-  EXPECT_EQ(s1.data(), nullptr);
-  EXPECT_EQ(s1.size(), 0);
-  EXPECT_TRUE(s1.empty());
-
-  span<int, 0> s2;
-  EXPECT_EQ(s2.data(), nullptr);
-  EXPECT_EQ(s2.size(), 0);
-  EXPECT_TRUE(s2.empty());
-
-  EXPECT_FALSE((std::is_default_constructible<span<int, 1>>::value));
-}
-
-TEST(SpanTest, Assignment)
-{
-  std::array<int, 3> array1 = {1, 2, 3};
-  std::array<int, 3> array2 = {1, 2, 3};
-  span<int> s1{array1.data(), array1.size()};
-  span<int, 3> s2{array1.data(), array1.size()};
-
-  span<int> s3;
-  s3 = s1;
-  EXPECT_EQ(s3.data(), array1.data());
-  EXPECT_EQ(s3.size(), array1.size());
-
-  span<int, 3> s4{array2};
-  s4 = s2;
-  EXPECT_EQ(s4.data(), array1.data());
-  EXPECT_EQ(s4.size(), array1.size());
-}
-
-TEST(SpanTest, PointerCountConstruction)
-{
-  std::array<int, 3> array = {1, 2, 3};
-
-  span<int> s1{array.data(), array.size()};
-  EXPECT_EQ(s1.data(), array.data());
-  EXPECT_EQ(s1.size(), array.size());
-
-  span<int, 3> s2{array.data(), array.size()};
-  EXPECT_EQ(s2.data(), array.data());
-  EXPECT_EQ(s2.size(), array.size());
-}
-
-TEST(SpanTest, RangeConstruction)
-{
-  int array[] = {1, 2, 3};
-
-  span<int> s1{std::begin(array), std::end(array)};
-  EXPECT_EQ(s1.data(), array);
-  EXPECT_EQ(s1.size(), 3);
-
-  span<int, 3> s2{std::begin(array), std::end(array)};
-  EXPECT_EQ(s2.data(), array);
-  EXPECT_EQ(s2.size(), 3);
-}
-
-TEST(SpanTest, ArrayConstruction)
-{
-  int array1[]              = {1, 2, 3};
-  std::array<int, 3> array2 = {1, 2, 3};
-
-  span<int> s1{array1};
-  EXPECT_EQ(s1.data(), array1);
-  EXPECT_EQ(s1.size(), 3);
-
-  span<int> s2{array2};
-  EXPECT_EQ(s2.data(), array2.data());
-  EXPECT_EQ(s2.size(), array2.size());
-
-  span<int, 3> s3{array1};
-  EXPECT_EQ(s3.data(), array1);
-  EXPECT_EQ(s3.size(), 3);
-
-  span<int, 3> s4{array2};
-  EXPECT_EQ(s4.data(), array2.data());
-  EXPECT_EQ(s4.size(), array2.size());
-
-  EXPECT_FALSE((std::is_constructible<span<int, 2>, int(&)[3]>::value));
-}
-
-TEST(SpanTest, ContainerConstruction)
-{
-  std::vector<int> v = {1, 2, 3};
-
-  span<int> s1{v};
-  EXPECT_EQ(s1.data(), v.data());
-  EXPECT_EQ(s1.size(), v.size());
-
-  span<int, 3> s2{v.data(), 3};
-
-  EXPECT_EQ(s2.data(), v.data());
-  EXPECT_EQ(s2.size(), v.size());
-
-  EXPECT_FALSE((std::is_constructible<span<int>, std::vector<double>>::value));
-  EXPECT_FALSE((std::is_constructible<span<int>, std::list<int>>::value));
-}
-
-TEST(SpanTest, OtherSpanConstruction)
-{
-  std::array<int, 3> array = {1, 2, 3};
-  span<int> s1{array.data(), array.size()};
-  span<int, 3> s2{array.data(), array.size()};
-
-  span<int> s3{s1};
-  EXPECT_EQ(s3.data(), array.data());
-  EXPECT_EQ(s3.size(), array.size());
-
-  span<int> s4{s2};
-  EXPECT_EQ(s4.data(), array.data());
-  EXPECT_EQ(s4.size(), array.size());
-
-  span<const int> s5{s1};
-  EXPECT_EQ(s5.data(), array.data());
-  EXPECT_EQ(s5.size(), array.size());
-
-  EXPECT_FALSE((std::is_constructible<span<int>, span<const int>>::value));
-  EXPECT_FALSE((std::is_constructible<span<int>, span<double>>::value));
-
-  span<int, 3> s6{s2};
-  EXPECT_EQ(s6.data(), array.data());
-  EXPECT_EQ(s6.size(), array.size());
-
-  span<const int, 3> s7{s2};
-  EXPECT_EQ(s7.data(), array.data());
-  EXPECT_EQ(s7.size(), array.size());
-
-  EXPECT_FALSE((std::is_constructible<span<int, 3>, span<int, 4>>::value));
-  EXPECT_FALSE((std::is_constructible<span<int, 3>, span<double, 3>>::value));
-}
-
-TEST(SpanTest, BracketOperator)
-{
-  std::array<int, 2> array = {1, 2};
-
-  span<int> s1{array.data(), array.size()};
-  EXPECT_EQ(s1[0], 1);
-  EXPECT_EQ(s1[1], 2);
-
-  span<int, 2> s2{array.data(), array.size()};
-  EXPECT_EQ(s2[0], 1);
-  EXPECT_EQ(s2[1], 2);
-}
-
-TEST(SpanTest, Iteration)
-{
-  std::array<int, 3> array = {1, 2, 3};
-
-  span<int> s1{array.data(), array.size()};
-  EXPECT_EQ(std::distance(s1.begin(), s1.end()), static_cast<ptrdiff_t>(array.size()));
-  EXPECT_TRUE(std::equal(s1.begin(), s1.end(), array.begin()));
-
-  span<int, 3> s2{array.data(), array.size()};
-  EXPECT_EQ(std::distance(s2.begin(), s2.end()), static_cast<ptrdiff_t>(array.size()));
-  EXPECT_TRUE(std::equal(s2.begin(), s2.end(), array.begin()));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/string_view_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/string_view_test.cc
deleted file mode 100644
index f32da62b4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/string_view_test.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstring>
-#include <map>
-#include <stdexcept>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/nostd/string_view.h"
-
-using opentelemetry::nostd::string_view;
-
-TEST(StringViewTest, DefaultConstruction)
-{
-  string_view ref;
-  EXPECT_EQ(ref.data(), nullptr);
-  EXPECT_EQ(ref.length(), 0);
-}
-
-TEST(StringViewTest, CStringInitialization)
-{
-  const char *val = "hello world";
-
-  string_view ref(val);
-
-  EXPECT_EQ(ref.data(), val);
-  EXPECT_EQ(ref.length(), std::strlen(val));
-}
-
-TEST(StringViewTest, StdStringInitialization)
-{
-  const std::string val = "hello world";
-
-  string_view ref(val);
-
-  EXPECT_EQ(ref.data(), val.data());
-  EXPECT_EQ(ref.length(), val.size());
-}
-
-TEST(StringViewTest, Copy)
-{
-  const std::string val = "hello world";
-
-  string_view ref(val);
-  string_view cpy(ref);
-
-  EXPECT_EQ(cpy.data(), val);
-  EXPECT_EQ(cpy.length(), val.length());
-  EXPECT_EQ(cpy, val);
-}
-
-TEST(StringViewTest, Accessor)
-{
-  string_view s = "abc123";
-  EXPECT_EQ(s.data(), &s[0]);
-  EXPECT_EQ(s.data() + 1, &s[1]);
-}
-
-TEST(StringViewTest, ExplicitStdStringConversion)
-{
-  std::string s = static_cast<std::string>(string_view{"abc"});
-  EXPECT_EQ(s, "abc");
-}
-
-TEST(StringViewTest, SubstrPortion)
-{
-  string_view s = "abc123";
-  EXPECT_EQ("123", s.substr(3));
-  EXPECT_EQ("12", s.substr(3, 2));
-}
-
-TEST(StringViewTest, SubstrOutOfRange)
-{
-  string_view s = "abc123";
-#if __EXCEPTIONS || (defined(OPENTELEMETRY_STL_VERSION) && (OPENTELEMETRY_STL_VERSION >= 2017))
-  EXPECT_THROW((void)s.substr(10), std::out_of_range);
-#else
-  EXPECT_DEATH({ s.substr(10); }, "");
-#endif
-}
-
-TEST(StringViewTest, FindSingleCharacter)
-{
-  string_view s = "abc";
-
-  // starting from 0-th position (default)
-  EXPECT_EQ(s.find('a'), 0);
-  EXPECT_EQ(s.find('b'), 1);
-  EXPECT_EQ(s.find('c'), 2);
-  EXPECT_EQ(s.find('d'), -1);  // FIXME: string_view:npos - problem with linker
-
-  // starting from given index
-  EXPECT_EQ(s.find('a', 1), -1);
-  EXPECT_EQ(s.find('b', 1), 1);
-
-  // out of index
-  EXPECT_EQ(s.find('a', 10), -1);
-}
-
-TEST(StringViewTest, Compare)
-{
-  string_view s1 = "aaa";
-  string_view s2 = "bbb";
-  string_view s3 = "aaa";
-
-  // Equals
-  EXPECT_EQ(s1, s3);
-  EXPECT_EQ(s1, s1);
-
-  // Less then
-  EXPECT_LT(s1, s2);
-
-  // Greater then
-  EXPECT_GT(s2, s1);
-}
-
-TEST(StringViewTest, MapKeyOrdering)
-{
-  std::map<string_view, size_t> m = {{"bbb", 2}, {"aaa", 1}, {"ccc", 3}};
-  size_t i                        = 1;
-  for (const auto &kv : m)
-  {
-    EXPECT_EQ(kv.second, i);
-    i++;
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/unique_ptr_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/unique_ptr_test.cc
deleted file mode 100644
index 5e448402b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/unique_ptr_test.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "opentelemetry/nostd/unique_ptr.h"
-
-using opentelemetry::nostd::unique_ptr;
-
-class A
-{
-public:
-  explicit A(bool &destructed) noexcept : destructed_{destructed} { destructed_ = false; }
-
-  ~A() { destructed_ = true; }
-
-private:
-  bool &destructed_;
-};
-
-class B
-{
-public:
-  int f() const { return 123; }
-};
-
-TEST(UniquePtrTest, DefaultConstruction)
-{
-  unique_ptr<int> ptr1;
-  EXPECT_EQ(ptr1.get(), nullptr);
-
-  unique_ptr<int> ptr2{nullptr};
-  EXPECT_EQ(ptr2.get(), nullptr);
-}
-
-TEST(UniquePtrTest, ExplicitConstruction)
-{
-  auto value = new int{123};
-  unique_ptr<int> ptr1{value};
-  EXPECT_EQ(ptr1.get(), value);
-
-  auto array = new int[5];
-  unique_ptr<int[]> ptr2{array};
-  EXPECT_EQ(ptr2.get(), array);
-}
-
-TEST(UniquePtrTest, MoveConstruction)
-{
-  auto value = new int{123};
-  unique_ptr<int> ptr1{value};
-  unique_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
-  EXPECT_EQ(ptr2.get(), value);
-}
-
-TEST(UniquePtrTest, MoveConstructionFromDifferentType)
-{
-  auto value = new int{123};
-  unique_ptr<int> ptr1{value};
-  unique_ptr<const int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
-  EXPECT_EQ(ptr2.get(), value);
-}
-
-TEST(UniquePtrTest, MoveConstructionFromStdUniquePtr)
-{
-  auto value = new int{123};
-  std::unique_ptr<int> ptr1{value};
-  unique_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
-  EXPECT_EQ(ptr2.get(), value);
-}
-
-TEST(UniquePtrTest, Destruction)
-{
-  bool was_destructed;
-  unique_ptr<A>{new A{was_destructed}};  // NOLINT
-  EXPECT_TRUE(was_destructed);
-}
-
-TEST(UniquePtrTest, StdUniquePtrConversionOperator)
-{
-  auto value = new int{123};
-  unique_ptr<int> ptr1{value};
-  std::unique_ptr<int> ptr2{std::move(ptr1)};
-  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
-  EXPECT_EQ(ptr2.get(), value);
-
-  value = new int{456};
-  ptr1  = unique_ptr<int>{value};
-  ptr2  = std::move(ptr1);
-  EXPECT_EQ(ptr1.get(), nullptr);  // NOLINT
-  EXPECT_EQ(ptr2.get(), value);
-
-  ptr2 = nullptr;
-  EXPECT_EQ(ptr2.get(), nullptr);
-
-  EXPECT_TRUE((std::is_assignable<std::unique_ptr<int>, unique_ptr<int> &&>::value));
-  EXPECT_FALSE((std::is_assignable<std::unique_ptr<int>, unique_ptr<int> &>::value));
-}
-
-TEST(UniquePtrTest, BoolConversionOpertor)
-{
-  auto value = new int{123};
-  unique_ptr<int> ptr1{value};
-
-  EXPECT_TRUE(ptr1);
-  EXPECT_FALSE(unique_ptr<int>{});
-}
-
-TEST(UniquePtrTest, PointerOperators)
-{
-  auto value = new int{123};
-  unique_ptr<int> ptr1{value};
-
-  EXPECT_EQ(&*ptr1, value);
-  EXPECT_EQ(unique_ptr<B> { new B } -> f(), 123);
-}
-
-TEST(UniquePtrTest, Reset)
-{
-  bool was_destructed1;
-  unique_ptr<A> ptr{new A{was_destructed1}};
-  bool was_destructed2 = true;
-  ptr.reset(new A{was_destructed2});
-  EXPECT_TRUE(was_destructed1);
-  EXPECT_FALSE(was_destructed2);
-  ptr.reset();
-  EXPECT_TRUE(was_destructed2);
-}
-
-TEST(UniquePtrTest, Release)
-{
-  auto value = new int{123};
-  unique_ptr<int> ptr{value};
-  EXPECT_EQ(ptr.release(), value);
-  EXPECT_EQ(ptr.get(), nullptr);
-  delete value;
-}
-
-TEST(UniquePtrTest, Swap)
-{
-  auto value1 = new int{123};
-  unique_ptr<int> ptr1{value1};
-
-  auto value2 = new int{456};
-  unique_ptr<int> ptr2{value2};
-  ptr1.swap(ptr2);
-
-  EXPECT_EQ(ptr1.get(), value2);
-  EXPECT_EQ(ptr2.get(), value1);
-}
-
-TEST(UniquePtrTest, Comparison)
-{
-  unique_ptr<int> ptr1{new int{123}};
-  unique_ptr<int> ptr2{new int{456}};
-  unique_ptr<int> ptr3{};
-
-  EXPECT_EQ(ptr1, ptr1);
-  EXPECT_NE(ptr1, ptr2);
-
-  EXPECT_NE(ptr1, nullptr);
-  EXPECT_NE(nullptr, ptr1);
-
-  EXPECT_EQ(ptr3, nullptr);
-  EXPECT_EQ(nullptr, ptr3);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/utility_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/utility_test.cc
deleted file mode 100644
index 720cbbaa5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/utility_test.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <initializer_list>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <vector>
-
-#include "opentelemetry/nostd/utility.h"
-
-namespace nostd = opentelemetry::nostd;
-
-template <class T>
-auto IsDataCallable(const T &t) -> decltype(nostd::data(t), std::true_type{});
-
-std::false_type IsDataCallable(...);
-
-template <class T>
-auto IsSizeCallable(const T &t) -> decltype(nostd::size(t), std::true_type{});
-
-std::false_type IsSizeCallable(...);
-
-TEST(UtilityTest, Data)
-{
-  std::vector<int> v = {1, 2, 3};
-  int array[3]       = {1, 2, 3};
-  std::initializer_list<int> list{1, 2, 3};
-  int x       = 0;
-  std::ignore = x;
-
-  EXPECT_EQ(nostd::data(v), v.data());
-  EXPECT_EQ(nostd::data(array), array);
-  EXPECT_EQ(nostd::data(list), list.begin());
-  EXPECT_FALSE(decltype(IsDataCallable(x)){});
-}
-
-TEST(UtilityTest, Size)
-{
-  std::vector<int> v = {1, 2, 3};
-  int array[3]       = {1, 2, 3};
-  int x              = 0;
-  std::ignore        = x;
-
-  EXPECT_EQ(nostd::size(v), v.size());
-  EXPECT_EQ(nostd::size(array), 3);
-
-  EXPECT_FALSE(decltype(IsSizeCallable(x)){});
-}
-
-TEST(UtilityTest, MakeIndexSequence)
-{
-  EXPECT_TRUE((std::is_same<nostd::make_index_sequence<0>, nostd::index_sequence<>>::value));
-  EXPECT_TRUE((std::is_same<nostd::make_index_sequence<1>, nostd::index_sequence<0>>::value));
-  EXPECT_TRUE((std::is_same<nostd::make_index_sequence<2>, nostd::index_sequence<0, 1>>::value));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/variant_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/nostd/variant_test.cc
deleted file mode 100644
index 11d9fe297..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/nostd/variant_test.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/variant.h"
-
-#include <gtest/gtest.h>
-#include <string>
-
-namespace nostd = opentelemetry::nostd;
-
-class DestroyCounter
-{
-public:
-  explicit DestroyCounter(int *count) : count_{count} {}
-  ~DestroyCounter() { ++*count_; }
-
-private:
-  int *count_;
-};
-
-TEST(VariantSizeTest, GetVariantSize)
-{
-  EXPECT_EQ(nostd::variant_size<nostd::variant<>>::value, 0);
-  EXPECT_EQ(nostd::variant_size<nostd::variant<int>>::value, 1);
-  EXPECT_EQ((nostd::variant_size<nostd::variant<int, double>>::value), 2);
-}
-
-#if 0  // Disable this test for now. It does not compile with Visual Studio 2015.
-TEST(VariantAlternativeTest, GetVariantSize)
-{
-  EXPECT_TRUE((std::is_same<nostd::variant_alternative_t<0, nostd::variant<int>>, int>::value));
-  EXPECT_TRUE(
-      (std::is_same<nostd::variant_alternative_t<1, nostd::variant<int, double>>, double>::value));
-  EXPECT_TRUE((std::is_same<nostd::variant_alternative_t<1, const nostd::variant<int, double>>,
-                            const double>::value));
-}
-#endif
-
-TEST(VariantTest, Get)
-{
-  nostd::variant<int, float> v, w;
-  v = 12;
-  EXPECT_EQ(nostd::get<int>(v), 12);
-  EXPECT_EQ(nostd::get<0>(v), 12);
-  w = v;
-  EXPECT_EQ(nostd::get<int>(w), 12);
-  EXPECT_EQ(*nostd::get_if<int>(&v), 12);
-  EXPECT_EQ(nostd::get_if<float>(&v), nullptr);
-#if __EXCEPTIONS || (defined(OPENTELEMETRY_STL_VERSION) && (OPENTELEMETRY_STL_VERSION >= 2017))
-  EXPECT_THROW(nostd::get<float>(w), nostd::bad_variant_access);
-#else
-  EXPECT_DEATH({ nostd::get<float>(w); }, "");
-#endif
-}
-
-TEST(VariantTest, Comparison)
-{
-  nostd::variant<int, float> v, w;
-  EXPECT_TRUE(v == w);
-  EXPECT_FALSE(v != w);
-  v = 3.0f;
-  EXPECT_TRUE(v != w);
-  EXPECT_FALSE(v == w);
-  v = 2;
-  w = 3;
-  EXPECT_TRUE(v != w);
-  EXPECT_FALSE(v == w);
-  EXPECT_TRUE(v < w);
-  EXPECT_FALSE(v > w);
-}
-
-TEST(VariantTest, Visit)
-{
-  nostd::variant<int, float> v;
-  struct
-  {
-    int operator()(int) { return 0; }
-    int operator()(float) { return 1; }
-  } a;
-  EXPECT_EQ(nostd::visit(a, v), 0);
-  v = 2.0f;
-  EXPECT_EQ(nostd::visit(a, v), 1);
-}
-
-TEST(VariantTest, Destructor)
-{
-  nostd::variant<int, DestroyCounter> v;
-  int destroy_count = 0;
-  v                 = DestroyCounter{&destroy_count};
-  destroy_count     = 0;
-  v                 = 1;
-  EXPECT_EQ(destroy_count, 1);
-  {
-    nostd::variant<int, DestroyCounter> w;
-    w             = DestroyCounter{&destroy_count};
-    destroy_count = 0;
-  }
-  EXPECT_EQ(destroy_count, 1);
-}
-
-TEST(VariantTest, Conversion)
-{
-  nostd::variant<std::string> x("abc");
-  x = "def";
-  EXPECT_EQ(nostd::get<std::string>(x), "def");
-
-  nostd::variant<std::string, void const *> y("abc");
-  EXPECT_TRUE(nostd::holds_alternative<void const *>(y));
-  y = std::string{"xyz"};
-  EXPECT_TRUE(nostd::holds_alternative<std::string>(y));
-}
-
-TEST(VariantTest, Construction)
-{
-  nostd::variant<bool, const char *, std::string> v{"abc"};
-  EXPECT_EQ(v.index(), 1);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/plugin/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/plugin/BUILD
deleted file mode 100644
index f20143ff7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/plugin/BUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_test(
-    name = "dynamic_load_test",
-    srcs = [
-        "dynamic_load_test.cc",
-    ],
-    linkopts = [
-        "-ldl",
-    ],
-    tags = [
-        "api",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/plugin/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/plugin/CMakeLists.txt
deleted file mode 100644
index 8930928f1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include(GoogleTest)
-
-add_executable(dynamic_load_test dynamic_load_test.cc)
-target_link_libraries(dynamic_load_test ${GTEST_BOTH_LIBRARIES}
-                      ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-target_link_libraries(dynamic_load_test ${CMAKE_DL_LIBS})
-gtest_add_tests(
-  TARGET dynamic_load_test
-  TEST_PREFIX plugin.
-  TEST_LIST dynamic_load_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/plugin/dynamic_load_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/plugin/dynamic_load_test.cc
deleted file mode 100644
index b8db5cada..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/plugin/dynamic_load_test.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-
-#include "opentelemetry/plugin/dynamic_load.h"
-#include "opentelemetry/plugin/factory.h"
-
-TEST(LoadFactoryTest, FailureTest)
-{
-  std::string error_message;
-  auto factory = opentelemetry::plugin::LoadFactory("no-such-plugin", error_message);
-  EXPECT_EQ(factory, nullptr);
-  EXPECT_FALSE(error_message.empty());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/BUILD
deleted file mode 100644
index eae9f6b8c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/BUILD
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# gcc and clang, assumed to be used on this platform
-DEFAULT_NOWIN_COPTS = [
-    "-fvisibility=default",
-]
-
-# gcc and clang, assumed to be used on this platform
-HIDDEN_NOWIN_COPTS = [
-    "-fvisibility=hidden",
-]
-
-cc_library(
-    name = "component_a",
-    srcs = [
-        "component_a.cc",
-    ],
-    hdrs = [
-        "component_a.h",
-    ],
-    linkstatic = True,
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-    ],
-)
-
-cc_library(
-    name = "component_b",
-    srcs = [
-        "component_b.cc",
-    ],
-    hdrs = [
-        "component_b.h",
-    ],
-    linkstatic = True,
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-    ],
-)
-
-cc_library(
-    name = "component_c",
-    srcs = [
-        "component_c.cc",
-    ],
-    hdrs = [
-        "component_c.h",
-    ],
-    copts = DEFAULT_NOWIN_COPTS,
-    linkstatic = False,
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-    ],
-)
-
-cc_library(
-    name = "component_d",
-    srcs = [
-        "component_d.cc",
-    ],
-    hdrs = [
-        "component_d.h",
-    ],
-    copts = HIDDEN_NOWIN_COPTS,
-    linkstatic = False,
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-    ],
-)
-
-cc_library(
-    name = "component_e",
-    srcs = [
-        "component_e.cc",
-    ],
-    hdrs = [
-        "component_e.h",
-    ],
-    copts = DEFAULT_NOWIN_COPTS,
-    linkstatic = False,
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-    ],
-)
-
-cc_library(
-    name = "component_f",
-    srcs = [
-        "component_f.cc",
-    ],
-    hdrs = [
-        "component_f.h",
-    ],
-    copts = HIDDEN_NOWIN_COPTS,
-    linkstatic = False,
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-    ],
-)
-
-# no cc_shared_library in bazel 4.2
-cc_binary(
-    name = "component_g",
-    srcs = [
-        "component_g.cc",
-    ],
-    copts = DEFAULT_NOWIN_COPTS,
-    linkshared = True,
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-    ],
-)
-
-# no cc_shared_library in bazel 4.2
-cc_binary(
-    name = "component_h",
-    srcs = [
-        "component_h.cc",
-    ],
-    copts = HIDDEN_NOWIN_COPTS,
-    linkshared = True,
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-    ],
-)
-
-#
-# To build this test alone:
-# - bazel build //api/test/singleton:singleton_test
-# - bazel build //api/test/singleton:component_g
-# - bazel build //api/test/singleton:component_h
-#
-# Note that singleton_test does not depend on
-# component_g and component_h, on purpose.
-#
-# To run this test:
-# bazel test //api/test/singleton:singleton_test
-#
-
-cc_test(
-    name = "singleton_test",
-    srcs = [
-        "singleton_test.cc",
-    ],
-    defines = ["BAZEL_BUILD"],
-    linkopts = [
-        "-ldl",
-    ],
-    linkstatic = False,
-    tags = [
-        "api",
-        "test",
-    ],
-    target_compatible_with = select({
-        "//bazel:windows": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "component_a",
-        "component_b",
-        "component_c",
-        "component_d",
-        "component_e",
-        "component_f",
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/CMakeLists.txt
deleted file mode 100644
index 7c30d6e57..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include(GoogleTest)
-
-add_library(component_a STATIC component_a.cc)
-target_link_libraries(component_a opentelemetry_api)
-
-add_library(component_b STATIC component_b.cc)
-target_link_libraries(component_b opentelemetry_api)
-
-add_library(component_c SHARED component_c.cc)
-set_target_properties(component_c PROPERTIES CXX_VISIBILITY_PRESET default)
-target_link_libraries(component_c opentelemetry_api)
-
-add_library(component_d SHARED component_d.cc)
-set_target_properties(component_d PROPERTIES CXX_VISIBILITY_PRESET hidden)
-target_link_libraries(component_d opentelemetry_api)
-
-add_library(component_e SHARED component_e.cc)
-set_target_properties(component_e PROPERTIES CXX_VISIBILITY_PRESET default)
-target_link_libraries(component_e opentelemetry_api)
-
-add_library(component_f SHARED component_f.cc)
-set_target_properties(component_f PROPERTIES CXX_VISIBILITY_PRESET hidden)
-target_link_libraries(component_f opentelemetry_api)
-
-add_library(component_g SHARED component_g.cc)
-set_target_properties(component_g PROPERTIES CXX_VISIBILITY_PRESET default)
-target_link_libraries(component_g opentelemetry_api)
-
-add_library(component_h SHARED component_h.cc)
-set_target_properties(component_h PROPERTIES CXX_VISIBILITY_PRESET hidden)
-target_link_libraries(component_h opentelemetry_api)
-
-add_executable(singleton_test singleton_test.cc)
-
-# Not linking with component_g and component_h on purpose
-target_link_libraries(
-  singleton_test
-  component_a
-  component_b
-  component_c
-  component_d
-  component_e
-  component_f
-  ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${CMAKE_DL_LIBS}
-  opentelemetry_api)
-
-gtest_add_tests(
-  TARGET singleton_test
-  TEST_PREFIX singleton.
-  TEST_LIST singleton_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_a.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_a.cc
deleted file mode 100644
index ee87be85b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_a.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#include "component_a.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-static nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("A", "10.1");
-}
-
-static void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("A::f1"));
-}
-
-static void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("A::f2"));
-
-  f1();
-  f1();
-}
-
-void do_something_in_a()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("A::library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_a.h b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_a.h
deleted file mode 100644
index 2e06edf9c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_a.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-void do_something_in_a();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_b.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_b.cc
deleted file mode 100644
index cc4283c6c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_b.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#include "component_b.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-static nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("B", "20.2");
-}
-
-static void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("B::f1"));
-}
-
-static void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("B::f2"));
-
-  f1();
-  f1();
-}
-
-void do_something_in_b()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("B::library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_b.h b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_b.h
deleted file mode 100644
index 2e526e21d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_b.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-void do_something_in_b();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_c.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_c.cc
deleted file mode 100644
index 601aae97b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_c.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#define BUILD_COMPONENT_C
-
-#include "component_c.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-static nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("C", "30.3");
-}
-
-static void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("C::f1"));
-}
-
-static void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("C::f2"));
-
-  f1();
-  f1();
-}
-
-void do_something_in_c()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("C::library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_c.h b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_c.h
deleted file mode 100644
index 11b8c9622..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_c.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#if defined(_MSC_VER)
-// component_c is a DLL
-
-#  ifdef BUILD_COMPONENT_C
-__declspec(dllexport)
-#  else
-__declspec(dllimport)
-#  endif
-
-#endif
-
-    void do_something_in_c();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_d.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_d.cc
deleted file mode 100644
index a6428aa72..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_d.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#define BUILD_COMPONENT_D
-
-#include "component_d.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-static nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("D", "40.4");
-}
-
-static void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("D::f1"));
-}
-
-static void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("D::f2"));
-
-  f1();
-  f1();
-}
-
-void do_something_in_d()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("D::library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_d.h b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_d.h
deleted file mode 100644
index 1090014c2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_d.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Make the entry point visible, loaded dynamically
-
-#if defined(_MSC_VER)
-// component_d is a DLL
-
-#  ifdef BUILD_COMPONENT_D
-__declspec(dllexport)
-#  else
-__declspec(dllimport)
-#  endif
-
-#else
-// component_d is a shared library (*.so)
-// component_d is compiled with visibility("hidden"),
-__attribute__((visibility("default")))
-#endif
-
-    void do_something_in_d();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_e.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_e.cc
deleted file mode 100644
index 450d052f5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_e.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#define BUILD_COMPONENT_E
-
-#include "component_e.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-static nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("E", "50.5");
-}
-
-static void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("E::f1"));
-}
-
-static void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("E::f2"));
-
-  f1();
-  f1();
-}
-
-void do_something_in_e()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("E::library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_e.h b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_e.h
deleted file mode 100644
index 223a1f3a8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_e.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#if defined(_MSC_VER)
-// component_e is a DLL
-
-#  ifdef BUILD_COMPONENT_E
-__declspec(dllexport)
-#  else
-__declspec(dllimport)
-#  endif
-
-#endif
-
-    void do_something_in_e();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_f.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_f.cc
deleted file mode 100644
index 6a65e932d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_f.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#define BUILD_COMPONENT_F
-
-#include "component_f.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-static nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("F", "60.6");
-}
-
-static void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("F::f1"));
-}
-
-static void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("F::f2"));
-
-  f1();
-  f1();
-}
-
-void do_something_in_f()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("F::library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_f.h b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_f.h
deleted file mode 100644
index 80334de5a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_f.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Make the entry point visible, loaded dynamically
-
-#if defined(_MSC_VER)
-// component_f is a DLL
-
-#  ifdef BUILD_COMPONENT_F
-__declspec(dllexport)
-#  else
-__declspec(dllimport)
-#  endif
-
-#else
-// component_f is a shared library (*.so)
-// component_f is compiled with visibility("hidden"),
-__attribute__((visibility("default")))
-#endif
-
-    void do_something_in_f();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_g.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_g.cc
deleted file mode 100644
index 8f09bac98..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_g.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-static nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("G", "70.7");
-}
-
-static void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("G::f1"));
-}
-
-static void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("G::f2"));
-
-  f1();
-  f1();
-}
-
-extern "C"
-
-#if defined(_MSC_VER)
-    // component_g is a DLL
-    __declspec(dllexport)
-#endif
-
-    void
-    do_something_in_g()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("G::library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_h.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_h.cc
deleted file mode 100644
index 5c762b5d9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/component_h.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-static nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("H", "80.8");
-}
-
-static void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("H::f1"));
-}
-
-static void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("H::f2"));
-
-  f1();
-  f1();
-}
-
-extern "C"
-
-#if defined(_MSC_VER)
-    // component_h is a DLL
-
-    __declspec(dllexport)
-
-#else
-    // component_h is a shared library (*.so)
-    // component_h is compiled with visibility("hidden"),
-    __attribute__((visibility("default")))
-#endif
-
-    void
-    do_something_in_h()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("H::library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/singleton_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/singleton/singleton_test.cc
deleted file mode 100644
index 1616f6bc8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/singleton/singleton_test.cc
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-
-#ifdef _WIN32
-#  include <windows.h>
-#else
-#  include <dlfcn.h>
-#endif
-
-#include "component_a.h"
-#include "component_b.h"
-#include "component_c.h"
-#include "component_d.h"
-#include "component_e.h"
-#include "component_f.h"
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-using namespace opentelemetry;
-
-void do_something()
-{
-  do_something_in_a();
-  do_something_in_b();
-  do_something_in_c();
-  do_something_in_d();
-  do_something_in_e();
-  do_something_in_f();
-
-  /*
-    See https://github.com/bazelbuild/bazel/issues/4218
-
-    There is no way to set LD_LIBRARY_PATH in bazel,
-    for dlopen() to find the library.
-
-    Verified manually that dlopen("/full/path/to/libcomponent_g.so") works,
-    and that the test passes in this case.
-  */
-
-#ifndef BAZEL_BUILD
-  /* Call do_something_in_g() */
-
-#  ifdef _WIN32
-  HMODULE component_g = LoadLibraryA("component_g.dll");
-#  elif defined(__APPLE__)
-  void *component_g = dlopen("libcomponent_g.dylib", RTLD_NOW);
-#  else
-  void *component_g = dlopen("libcomponent_g.so", RTLD_NOW);
-#  endif
-
-  EXPECT_NE(component_g, nullptr);
-
-#  ifdef _WIN32
-  auto *func_g = reinterpret_cast<void (*)()>(GetProcAddress(component_g, "do_something_in_g"));
-#  else
-  auto *func_g = reinterpret_cast<void (*)()>(dlsym(component_g, "do_something_in_g"));
-#  endif
-
-  EXPECT_NE(func_g, nullptr);
-
-  (*func_g)();
-
-#  ifdef _WIN32
-  FreeLibrary(component_g);
-#  else
-  dlclose(component_g);
-#  endif
-
-  /* Call do_something_in_h() */
-
-#  ifdef _WIN32
-  HMODULE component_h = LoadLibraryA("component_h.dll");
-#  elif defined(__APPLE__)
-  void *component_h = dlopen("libcomponent_h.dylib", RTLD_NOW);
-#  else
-  void *component_h = dlopen("libcomponent_h.so", RTLD_NOW);
-#  endif
-
-  EXPECT_NE(component_h, nullptr);
-
-#  ifdef _WIN32
-  auto *func_h = reinterpret_cast<void (*)()>(GetProcAddress(component_h, "do_something_in_h"));
-#  else
-  auto *func_h = reinterpret_cast<void (*)()>(dlsym(component_h, "do_something_in_h"));
-#  endif
-
-  EXPECT_NE(func_h, nullptr);
-
-  (*func_h)();
-
-#  ifdef _WIN32
-  FreeLibrary(component_h);
-#  else
-  dlclose(component_h);
-#  endif
-
-#endif /* BAZEL_BUILD */
-}
-
-int span_a_lib_count   = 0;
-int span_a_f1_count    = 0;
-int span_a_f2_count    = 0;
-int span_b_lib_count   = 0;
-int span_b_f1_count    = 0;
-int span_b_f2_count    = 0;
-int span_c_lib_count   = 0;
-int span_c_f1_count    = 0;
-int span_c_f2_count    = 0;
-int span_d_lib_count   = 0;
-int span_d_f1_count    = 0;
-int span_d_f2_count    = 0;
-int span_e_lib_count   = 0;
-int span_e_f1_count    = 0;
-int span_e_f2_count    = 0;
-int span_f_lib_count   = 0;
-int span_f_f1_count    = 0;
-int span_f_f2_count    = 0;
-int span_g_lib_count   = 0;
-int span_g_f1_count    = 0;
-int span_g_f2_count    = 0;
-int span_h_lib_count   = 0;
-int span_h_f1_count    = 0;
-int span_h_f2_count    = 0;
-int unknown_span_count = 0;
-
-void reset_counts()
-{
-  span_a_lib_count   = 0;
-  span_a_f1_count    = 0;
-  span_a_f2_count    = 0;
-  span_b_lib_count   = 0;
-  span_b_f1_count    = 0;
-  span_b_f2_count    = 0;
-  span_c_lib_count   = 0;
-  span_c_f1_count    = 0;
-  span_c_f2_count    = 0;
-  span_d_lib_count   = 0;
-  span_d_f1_count    = 0;
-  span_d_f2_count    = 0;
-  span_e_lib_count   = 0;
-  span_e_f1_count    = 0;
-  span_e_f2_count    = 0;
-  span_f_lib_count   = 0;
-  span_f_f1_count    = 0;
-  span_f_f2_count    = 0;
-  span_g_lib_count   = 0;
-  span_g_f1_count    = 0;
-  span_g_f2_count    = 0;
-  span_h_lib_count   = 0;
-  span_h_f1_count    = 0;
-  span_h_f2_count    = 0;
-  unknown_span_count = 0;
-}
-
-class MyTracer : public trace::Tracer
-{
-public:
-  MyTracer()
-  {
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    UpdateEnabled(true);
-#endif
-  }
-
-  nostd::shared_ptr<trace::Span> StartSpan(
-      nostd::string_view name,
-      const common::KeyValueIterable & /* attributes */,
-      const trace::SpanContextKeyValueIterable & /* links */,
-      const trace::StartSpanOptions & /* options */) noexcept override
-  {
-    nostd::shared_ptr<trace::Span> result(new trace::DefaultSpan(trace::SpanContext::GetInvalid()));
-
-    /*
-      Unit test code, no need to be fancy.
-    */
-
-    if (name == "A::library")
-    {
-      span_a_lib_count++;
-    }
-    else if (name == "A::f1")
-    {
-      span_a_f1_count++;
-    }
-    else if (name == "A::f2")
-    {
-      span_a_f2_count++;
-    }
-    else if (name == "B::library")
-    {
-      span_b_lib_count++;
-    }
-    else if (name == "B::f1")
-    {
-      span_b_f1_count++;
-    }
-    else if (name == "B::f2")
-    {
-      span_b_f2_count++;
-    }
-    else if (name == "C::library")
-    {
-      span_c_lib_count++;
-    }
-    else if (name == "C::f1")
-    {
-      span_c_f1_count++;
-    }
-    else if (name == "C::f2")
-    {
-      span_c_f2_count++;
-    }
-    else if (name == "D::library")
-    {
-      span_d_lib_count++;
-    }
-    else if (name == "D::f1")
-    {
-      span_d_f1_count++;
-    }
-    else if (name == "D::f2")
-    {
-      span_d_f2_count++;
-    }
-    else if (name == "E::library")
-    {
-      span_e_lib_count++;
-    }
-    else if (name == "E::f1")
-    {
-      span_e_f1_count++;
-    }
-    else if (name == "E::f2")
-    {
-      span_e_f2_count++;
-    }
-    else if (name == "F::library")
-    {
-      span_f_lib_count++;
-    }
-    else if (name == "F::f1")
-    {
-      span_f_f1_count++;
-    }
-    else if (name == "F::f2")
-    {
-      span_f_f2_count++;
-    }
-    else if (name == "G::library")
-    {
-      span_g_lib_count++;
-    }
-    else if (name == "G::f1")
-    {
-      span_g_f1_count++;
-    }
-    else if (name == "G::f2")
-    {
-      span_g_f2_count++;
-    }
-    else if (name == "H::library")
-    {
-      span_h_lib_count++;
-    }
-    else if (name == "H::f1")
-    {
-      span_h_f1_count++;
-    }
-    else if (name == "H::f2")
-    {
-      span_h_f2_count++;
-    }
-    else
-    {
-      unknown_span_count++;
-    }
-
-    return result;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-
-  void ForceFlushWithMicroseconds(uint64_t /* timeout */) noexcept override {}
-
-  void CloseWithMicroseconds(uint64_t /* timeout */) noexcept override {}
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-};
-
-class MyTracerProvider : public trace::TracerProvider
-{
-public:
-  static std::shared_ptr<trace::TracerProvider> Create()
-  {
-    std::shared_ptr<trace::TracerProvider> result(new MyTracerProvider());
-    return result;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<trace::Tracer> GetTracer(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */,
-      const common::KeyValueIterable * /* attributes */) noexcept override
-  {
-    nostd::shared_ptr<trace::Tracer> result(new MyTracer());
-    return result;
-  }
-#else
-  nostd::shared_ptr<trace::Tracer> GetTracer(nostd::string_view /* name */,
-                                             nostd::string_view /* version */,
-                                             nostd::string_view /* schema_url */) noexcept override
-  {
-    nostd::shared_ptr<trace::Tracer> result(new MyTracer());
-    return result;
-  }
-#endif
-};
-
-void setup_otel()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider = MyTracerProvider::Create();
-
-  // The whole point of this test is to make sure
-  // that the API singleton behind SetTracerProvider()
-  // works for all components, static and dynamic.
-
-  // Set the global tracer provider
-  trace_api::Provider::SetTracerProvider(provider);
-}
-
-void cleanup_otel()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider(
-      new opentelemetry::trace::NoopTracerProvider());
-
-  // Set the global tracer provider
-  trace_api::Provider::SetTracerProvider(provider);
-}
-
-// TODO: Remove once windows api singletons are supported.
-// See https://github.com/open-telemetry/opentelemetry-cpp/issues/2534
-#ifdef _WIN32
-#  define RUN_FAILING_WINDOWS_TEST 0
-#else
-#  define RUN_FAILING_WINDOWS_TEST 1
-#endif
-
-TEST(SingletonTest, Uniqueness)
-{
-  do_something();
-
-  EXPECT_EQ(span_a_lib_count, 0);
-  EXPECT_EQ(span_a_f1_count, 0);
-  EXPECT_EQ(span_a_f2_count, 0);
-  EXPECT_EQ(span_b_lib_count, 0);
-  EXPECT_EQ(span_b_f1_count, 0);
-  EXPECT_EQ(span_b_f2_count, 0);
-  EXPECT_EQ(span_c_lib_count, 0);
-  EXPECT_EQ(span_c_f1_count, 0);
-  EXPECT_EQ(span_c_f2_count, 0);
-  EXPECT_EQ(span_d_lib_count, 0);
-  EXPECT_EQ(span_d_f1_count, 0);
-  EXPECT_EQ(span_d_f2_count, 0);
-  EXPECT_EQ(span_e_lib_count, 0);
-  EXPECT_EQ(span_e_f1_count, 0);
-  EXPECT_EQ(span_e_f2_count, 0);
-  EXPECT_EQ(span_f_lib_count, 0);
-  EXPECT_EQ(span_f_f1_count, 0);
-  EXPECT_EQ(span_f_f2_count, 0);
-  EXPECT_EQ(span_g_lib_count, 0);
-  EXPECT_EQ(span_g_f1_count, 0);
-  EXPECT_EQ(span_g_f2_count, 0);
-  EXPECT_EQ(span_h_lib_count, 0);
-  EXPECT_EQ(span_h_f1_count, 0);
-  EXPECT_EQ(span_h_f2_count, 0);
-  EXPECT_EQ(unknown_span_count, 0);
-
-  reset_counts();
-  setup_otel();
-
-  do_something();
-
-  EXPECT_EQ(span_a_lib_count, 1);
-  EXPECT_EQ(span_a_f1_count, 2);
-  EXPECT_EQ(span_a_f2_count, 1);
-  EXPECT_EQ(span_b_lib_count, 1);
-  EXPECT_EQ(span_b_f1_count, 2);
-  EXPECT_EQ(span_b_f2_count, 1);
-
-#if RUN_FAILING_WINDOWS_TEST
-  EXPECT_EQ(span_c_lib_count, 1);  // Fails with shared libraries on Windows
-  EXPECT_EQ(span_c_f1_count, 2);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_c_f2_count, 1);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_d_lib_count, 1);  // Fails with shared libraries on Windows
-  EXPECT_EQ(span_d_f1_count, 2);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_d_f2_count, 1);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_e_lib_count, 1);  // Fails with shared libraries on Windows
-  EXPECT_EQ(span_e_f1_count, 2);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_e_f2_count, 1);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_f_lib_count, 1);  // Fails with shared libraries on Windows
-  EXPECT_EQ(span_f_f1_count, 2);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_f_f2_count, 1);   // Fails with shared libraries on Windows
-#endif
-
-#ifndef BAZEL_BUILD
-#  if RUN_FAILING_WINDOWS_TEST
-  EXPECT_EQ(span_g_lib_count, 1);  // Fails with shared libraries on Windows
-  EXPECT_EQ(span_g_f1_count, 2);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_g_f2_count, 1);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_h_lib_count, 1);  // Fails with shared libraries on Windows
-  EXPECT_EQ(span_h_f1_count, 2);   // Fails with shared libraries on Windows
-  EXPECT_EQ(span_h_f2_count, 1);   // Fails with shared libraries on Windows
-#  endif
-#endif
-
-  EXPECT_EQ(unknown_span_count, 0);
-
-  reset_counts();
-  cleanup_otel();
-
-  do_something();
-
-  EXPECT_EQ(span_a_lib_count, 0);
-  EXPECT_EQ(span_a_f1_count, 0);
-  EXPECT_EQ(span_a_f2_count, 0);
-  EXPECT_EQ(span_b_lib_count, 0);
-  EXPECT_EQ(span_b_f1_count, 0);
-  EXPECT_EQ(span_b_f2_count, 0);
-  EXPECT_EQ(span_c_lib_count, 0);
-  EXPECT_EQ(span_c_f1_count, 0);
-  EXPECT_EQ(span_c_f2_count, 0);
-  EXPECT_EQ(span_d_lib_count, 0);
-  EXPECT_EQ(span_d_f1_count, 0);
-  EXPECT_EQ(span_d_f2_count, 0);
-  EXPECT_EQ(span_e_lib_count, 0);
-  EXPECT_EQ(span_e_f1_count, 0);
-  EXPECT_EQ(span_e_f2_count, 0);
-  EXPECT_EQ(span_f_lib_count, 0);
-  EXPECT_EQ(span_f_f1_count, 0);
-  EXPECT_EQ(span_f_f2_count, 0);
-  EXPECT_EQ(span_g_lib_count, 0);
-  EXPECT_EQ(span_g_f1_count, 0);
-  EXPECT_EQ(span_g_f2_count, 0);
-  EXPECT_EQ(span_h_lib_count, 0);
-  EXPECT_EQ(span_h_f1_count, 0);
-  EXPECT_EQ(span_h_f2_count, 0);
-  EXPECT_EQ(unknown_span_count, 0);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/trace/BUILD
deleted file mode 100644
index d23308459..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/BUILD
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "default_span_test",
-    srcs = [
-        "default_span_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "noop_test",
-    srcs = [
-        "noop_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "key_value_iterable_view_test",
-    srcs = [
-        "key_value_iterable_view_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "span_id_benchmark",
-    srcs = ["span_id_benchmark.cc"],
-    tags = [
-        "api",
-        "benchmark",
-        "test",
-        "trace",
-    ],
-    deps = ["//api"],
-)
-
-otel_cc_benchmark(
-    name = "span_benchmark",
-    srcs = ["span_benchmark.cc"],
-    tags = [
-        "api",
-        "benchmark",
-        "test",
-        "trace",
-    ],
-    deps = ["//api"],
-)
-
-cc_test(
-    name = "provider_test",
-    srcs = [
-        "provider_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "span_id_test",
-    srcs = [
-        "span_id_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "trace_flags_test",
-    srcs = [
-        "trace_flags_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "trace_id_test",
-    srcs = [
-        "trace_id_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "span_context_test",
-    srcs = [
-        "span_context_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "trace_state_test",
-    srcs = [
-        "trace_state_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "scope_test",
-    srcs = [
-        "scope_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "tracer_test",
-    srcs = [
-        "tracer_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/trace/CMakeLists.txt
deleted file mode 100644
index 34b49db84..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(propagation)
-
-foreach(
-  testname
-  key_value_iterable_view_test
-  provider_test
-  span_id_test
-  trace_id_test
-  trace_flags_test
-  span_context_test
-  scope_test
-  noop_test
-  trace_state_test
-  tracer_test)
-  add_executable(api_${testname} "${testname}.cc")
-  target_link_libraries(api_${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET api_${testname}
-    TEST_PREFIX trace.
-    TEST_LIST api_${testname})
-endforeach()
-
-if(WITH_BENCHMARK)
-  add_executable(span_id_benchmark span_id_benchmark.cc)
-  target_link_libraries(span_id_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  add_executable(span_benchmark span_benchmark.cc)
-  target_link_libraries(span_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/default_span_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/default_span_test.cc
deleted file mode 100644
index 377a0a858..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/default_span_test.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/span_context.h"
-
-#include <cstring>
-#include <string>
-
-#include <gtest/gtest.h>
-
-namespace
-{
-
-using opentelemetry::trace::DefaultSpan;
-using opentelemetry::trace::SpanContext;
-
-TEST(DefaultSpanTest, GetContext)
-{
-  SpanContext span_context = SpanContext(false, false);
-  DefaultSpan sp           = DefaultSpan(span_context);
-  EXPECT_EQ(span_context, sp.GetContext());
-}
-}  // namespace
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/key_value_iterable_view_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/key_value_iterable_view_test.cc
deleted file mode 100644
index bb4a903bf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/key_value_iterable_view_test.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-
-using namespace opentelemetry;
-
-static int TakeKeyValues(const common::KeyValueIterable &iterable)
-{
-  std::map<std::string, common::AttributeValue> result;
-  int count = 0;
-  iterable.ForEachKeyValue(
-      [&](nostd::string_view /* key */, common::AttributeValue /* value */) noexcept {
-        ++count;
-        return true;
-      });
-  return count;
-}
-
-template <class T, nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-static int TakeKeyValues(const T &iterable)
-{
-  return TakeKeyValues(common::KeyValueIterableView<T>{iterable});
-}
-
-TEST(KeyValueIterableViewTest, is_key_value_iterable)
-{
-  using M1 = std::map<std::string, std::string>;
-  EXPECT_TRUE(bool{common::detail::is_key_value_iterable<M1>::value});
-
-  using M2 = std::map<std::string, int>;
-  EXPECT_TRUE(bool{common::detail::is_key_value_iterable<M2>::value});
-
-  using M3 = std::map<std::string, common::AttributeValue>;
-  EXPECT_TRUE(bool{common::detail::is_key_value_iterable<M3>::value});
-
-  struct A
-  {};
-  using M4 = std::map<std::string, A>;
-  EXPECT_FALSE(bool{common::detail::is_key_value_iterable<M4>::value});
-}
-
-TEST(KeyValueIterableViewTest, ForEachKeyValue)
-{
-  std::map<std::string, std::string> m1 = {{"abc", "123"}, {"xyz", "456"}};
-  EXPECT_EQ(TakeKeyValues(m1), 2);
-
-  std::vector<std::pair<std::string, int>> v1 = {{"abc", 123}, {"xyz", 456}};
-  EXPECT_EQ(TakeKeyValues(v1), 2);
-}
-
-TEST(KeyValueIterableViewTest, ForEachKeyValueWithExit)
-{
-  using M = std::map<std::string, std::string>;
-  M m1    = {{"abc", "123"}, {"xyz", "456"}};
-  common::KeyValueIterableView<M> iterable{m1};
-  int count = 0;
-  auto exit = iterable.ForEachKeyValue(
-      [&count](nostd::string_view /*key*/, common::AttributeValue /*value*/) noexcept {
-        ++count;
-        return false;
-      });
-  EXPECT_EQ(count, 1);
-  EXPECT_FALSE(exit);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/noop_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/noop_test.cc
deleted file mode 100644
index 0a4a3294a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/noop_test.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <initializer_list>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer.h"
-
-namespace trace_api = opentelemetry::trace;
-namespace nonstd    = opentelemetry::nostd;
-namespace common    = opentelemetry::common;
-
-TEST(NoopTest, UseNoopTracers)
-{
-  std::shared_ptr<trace_api::Tracer> tracer{new trace_api::NoopTracer{}};
-  auto s1 = tracer->StartSpan("abc");
-
-  std::map<std::string, std::string> attributes1;
-  s1->AddEvent("abc", attributes1);
-
-  std::vector<std::pair<std::string, int>> attributes2;
-  s1->AddEvent("abc", attributes2);
-
-  s1->AddEvent("abc", {{"a", 1}, {"b", "2"}, {"c", 3.0}});
-
-  std::vector<std::pair<std::string, std::vector<int>>> attributes3;
-  s1->AddEvent("abc", attributes3);
-
-  s1->SetAttribute("abc", 4);
-
-  s1->AddEvent("abc");  // add Empty
-
-  EXPECT_EQ(s1->IsRecording(), false);
-
-  s1->SetStatus(trace_api::StatusCode::kUnset, "span unset");
-
-  s1->UpdateName("test_name");
-
-  common::SystemTimestamp t1;
-  s1->AddEvent("test_time_stamp", t1);
-
-  s1->GetContext();
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-TEST(NoopTest, UseNoopTracersAbiv2)
-{
-  std::shared_ptr<trace_api::Tracer> tracer{new trace_api::NoopTracer{}};
-  auto s1 = tracer->StartSpan("abc");
-
-  EXPECT_EQ(s1->IsRecording(), false);
-
-  trace_api::SpanContext target(false, false);
-  s1->AddLink(target, {{"noop1", 1}});
-
-  s1->AddLinks({{trace_api::SpanContext(false, false), {{"noop2", 2}}}});
-
-  EXPECT_FALSE(tracer->Enabled());
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */
-
-TEST(NoopTest, StartSpan)
-{
-  std::shared_ptr<trace_api::Tracer> tracer{new trace_api::NoopTracer{}};
-
-  std::map<std::string, std::string> attrs = {{"a", "3"}};
-  std::vector<std::pair<trace_api::SpanContext, std::map<std::string, std::string>>> links = {
-      {trace_api::SpanContext(false, false), attrs}};
-  auto s1 = tracer->StartSpan("abc", attrs, links);
-
-  auto s2 =
-      tracer->StartSpan("efg", {{"a", 3}}, {{trace_api::SpanContext(false, false), {{"b", 4}}}});
-}
-
-TEST(NoopTest, CreateSpanValidSpanContext)
-{
-  // Create valid spancontext for NoopSpan
-
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  auto trace_id                 = trace_api::TraceId{buf_trace};
-  auto span_id                  = trace_api::SpanId{buf_span};
-  auto span_context             = nonstd::unique_ptr<trace_api::SpanContext>(
-      new trace_api::SpanContext{trace_id, span_id, trace_api::TraceFlags{true}, false});
-  std::shared_ptr<trace_api::Tracer> tracer{new trace_api::NoopTracer{}};
-  auto s1 =
-      nonstd::shared_ptr<trace_api::Span>(new trace_api::NoopSpan(tracer, std::move(span_context)));
-  auto stored_span_context = s1->GetContext();
-  EXPECT_EQ(stored_span_context.span_id(), span_id);
-  EXPECT_EQ(stored_span_context.trace_id(), trace_id);
-
-  s1->AddEvent("even1");  // noop
-  s1->End();              // noop
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/BUILD
deleted file mode 100644
index 8e9718e80..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/BUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "http_text_format_test",
-    srcs = [
-        "http_text_format_test.cc",
-        "util.h",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "b3_propagation_test",
-    srcs = [
-        "b3_propagation_test.cc",
-        "util.h",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "jaeger_propagation_test",
-    srcs = [
-        "jaeger_propagation_test.cc",
-        "util.h",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/CMakeLists.txt
deleted file mode 100644
index f55c73816..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(detail)
-
-foreach(testname http_text_format_test b3_propagation_test
-                 jaeger_propagation_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX trace.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/b3_propagation_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/b3_propagation_test.cc
deleted file mode 100644
index f34dad12a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/b3_propagation_test.cc
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <map>
-#include <string>
-#include <utility>
-#include "util.h"
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/propagation/b3_propagator.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-
-using namespace opentelemetry;
-
-class TextMapCarrierTest : public context::propagation::TextMapCarrier
-{
-public:
-  nostd::string_view Get(nostd::string_view key) const noexcept override
-  {
-    auto it = headers_.find(std::string(key));
-    if (it != headers_.end())
-    {
-      return nostd::string_view(it->second);
-    }
-    return "";
-  }
-  void Set(nostd::string_view key, nostd::string_view value) noexcept override
-  {
-    headers_[std::string(key)] = std::string(value);
-  }
-
-  std::map<std::string, std::string> headers_;
-};
-
-using MapB3Context = trace::propagation::B3Propagator;
-
-static MapB3Context format = MapB3Context();
-
-using MapB3ContextMultiHeader = trace::propagation::B3PropagatorMultiHeader;
-
-static MapB3ContextMultiHeader formatMultiHeader = MapB3ContextMultiHeader();
-
-TEST(B3PropagationTest, TraceFlagsBufferGeneration)
-{
-  EXPECT_EQ(MapB3Context::TraceFlagsFromHex("0"), trace::TraceFlags());
-  EXPECT_EQ(MapB3Context::TraceFlagsFromHex("1"), trace::TraceFlags(trace::TraceFlags::kIsSampled));
-}
-
-TEST(B3PropagationTest, PropagateInvalidContext)
-{
-  // Do not propagate invalid trace context.
-  TextMapCarrierTest carrier;
-  context::Context ctx{
-      trace::kSpanKey,
-      nostd::shared_ptr<trace::Span>(new trace::DefaultSpan(trace::SpanContext::GetInvalid()))};
-  format.Inject(carrier, ctx);
-  EXPECT_TRUE(carrier.headers_.count("b3") == 0);
-}
-
-TEST(B3PropagationTest, ExtractInvalidContext)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_      = {{"b3", "00000000000000000000000000000000-0000000000000000-0"}};
-  context::Context ctx1 = context::Context{};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-  auto ctx2_span        = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_FALSE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-}
-
-TEST(B3PropagationTest, DoNotOverwriteContextWithInvalidSpan)
-{
-  TextMapCarrierTest carrier;
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  trace::SpanContext span_context{trace::TraceId{buf_trace}, trace::SpanId{buf_span},
-                                  trace::TraceFlags{true}, false};
-  nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan{span_context}};
-
-  // Make sure this invalid span does not overwrite the active span context
-  carrier.headers_ = {{"b3", "00000000000000000000000000000000-0000000000000000-0"}};
-  context::Context ctx1{trace::kSpanKey, sp};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-  auto ctx2_span        = ctx2.GetValue(trace::kSpanKey);
-  auto span             = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "0102030405060708090a0b0c0d0e0f10");
-}
-
-TEST(B3PropagationTest, DoNotExtractWithInvalidHex)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_      = {{"b3", "0000000zzz0000000000000000000000-0000000zzz000000-1"}};
-  context::Context ctx1 = context::Context{};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-  auto ctx2_span        = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_FALSE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-}
-
-TEST(B3PropagationTest, SetRemoteSpan)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_ = {
-      {"b3", "80f198ee56343ba864fe8b2a57d3eff7-e457b5a2e4d86bd1-1-05e3ac9a4f6e3b90"}};
-  context::Context ctx1 = context::Context{};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-
-  auto ctx2_span = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_TRUE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-
-  auto span = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "80f198ee56343ba864fe8b2a57d3eff7");
-  EXPECT_EQ(Hex(span->GetContext().span_id()), "e457b5a2e4d86bd1");
-  EXPECT_EQ(span->GetContext().IsSampled(), true);
-  EXPECT_EQ(span->GetContext().IsRemote(), true);
-}
-
-TEST(B3PropagationTest, SetRemoteSpan_TraceIdShort)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_      = {{"b3", "80f198ee56343ba8-e457b5a2e4d86bd1-1-05e3ac9a4f6e3b90"}};
-  context::Context ctx1 = context::Context{};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-
-  auto ctx2_span = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_TRUE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-
-  auto span = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "000000000000000080f198ee56343ba8");
-  EXPECT_EQ(Hex(span->GetContext().span_id()), "e457b5a2e4d86bd1");
-  EXPECT_EQ(span->GetContext().IsSampled(), true);
-  EXPECT_EQ(span->GetContext().IsRemote(), true);
-}
-
-TEST(B3PropagationTest, SetRemoteSpan_SingleHeaderNoFlags)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_      = {{"b3", "80f198ee56343ba864fe8b2a57d3eff7-e457b5a2e4d86bd1"}};
-  context::Context ctx1 = context::Context{};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-
-  auto ctx2_span = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_TRUE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-
-  auto span = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "80f198ee56343ba864fe8b2a57d3eff7");
-  EXPECT_EQ(Hex(span->GetContext().span_id()), "e457b5a2e4d86bd1");
-  EXPECT_EQ(span->GetContext().IsSampled(), false);
-  EXPECT_EQ(span->GetContext().IsRemote(), true);
-}
-
-TEST(B3PropagationTest, SetRemoteSpanMultiHeader)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_      = {{"X-B3-TraceId", "80f198ee56343ba864fe8b2a57d3eff7"},
-                           {"X-B3-SpanId", "e457b5a2e4d86bd1"},
-                           {"X-B3-Sampled", "1"}};
-  context::Context ctx1 = context::Context{};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-
-  auto ctx2_span = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_TRUE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-
-  auto span = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "80f198ee56343ba864fe8b2a57d3eff7");
-  EXPECT_EQ(Hex(span->GetContext().span_id()), "e457b5a2e4d86bd1");
-  EXPECT_EQ(span->GetContext().IsSampled(), true);
-  EXPECT_EQ(span->GetContext().IsRemote(), true);
-}
-
-TEST(B3PropagationTest, GetCurrentSpan)
-{
-  TextMapCarrierTest carrier;
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  trace::SpanContext span_context{trace::TraceId{buf_trace}, trace::SpanId{buf_span},
-                                  trace::TraceFlags{true}, false};
-  nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan{span_context}};
-
-  // Set `sp` as the currently active span, which must be used by `Inject`.
-  trace::Scope scoped_span{sp};
-
-  format.Inject(carrier, context::RuntimeContext::GetCurrent());
-  EXPECT_EQ(carrier.headers_["b3"], "0102030405060708090a0b0c0d0e0f10-0102030405060708-1");
-}
-
-TEST(B3PropagationTest, GetCurrentSpanMultiHeader)
-{
-  TextMapCarrierTest carrier;
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  trace::SpanContext span_context{trace::TraceId{buf_trace}, trace::SpanId{buf_span},
-                                  trace::TraceFlags{true}, false};
-  nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan{span_context}};
-
-  // Set `sp` as the currently active span, which must be used by `Inject`.
-  trace::Scope scoped_span{sp};
-
-  formatMultiHeader.Inject(carrier, context::RuntimeContext::GetCurrent());
-  EXPECT_EQ(carrier.headers_["X-B3-TraceId"], "0102030405060708090a0b0c0d0e0f10");
-  EXPECT_EQ(carrier.headers_["X-B3-SpanId"], "0102030405060708");
-  EXPECT_EQ(carrier.headers_["X-B3-Sampled"], "1");
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/BUILD b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/BUILD
deleted file mode 100644
index 322c89293..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/BUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "hex_test",
-    srcs = [
-        "hex_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "string_test",
-    srcs = [
-        "string_test.cc",
-    ],
-    tags = [
-        "api",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/CMakeLists.txt
deleted file mode 100644
index c70478efa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(testname hex_test string_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX trace.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/hex_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/hex_test.cc
deleted file mode 100644
index 0b45725b4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/hex_test.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <string>
-
-#include "opentelemetry/trace/propagation/detail/hex.h"
-
-using namespace opentelemetry;
-
-TEST(HexTest, ConvertOddLength)
-{
-  const int kLength        = 16;
-  std::string trace_id_hex = "78cfcfec62ae9e9";
-  uint8_t trace_id[kLength];
-  trace::propagation::detail::HexToBinary(trace_id_hex, trace_id, sizeof(trace_id));
-
-  const uint8_t expected_trace_id[kLength] = {0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0,
-                                              0x7, 0x8c, 0xfc, 0xfe, 0xc6, 0x2a, 0xe9, 0xe9};
-
-  for (int i = 0; i < kLength; ++i)
-  {
-    EXPECT_EQ(trace_id[i], expected_trace_id[i]);
-  }
-}
-
-TEST(HexTest, ConvertEvenLength)
-{
-  const int kLength        = 16;
-  std::string trace_id_hex = "078cfcfec62ae9e9";
-  uint8_t trace_id[kLength];
-  trace::propagation::detail::HexToBinary(trace_id_hex, trace_id, sizeof(trace_id));
-
-  const uint8_t expected_trace_id[kLength] = {0x0, 0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0,
-                                              0x7, 0x8c, 0xfc, 0xfe, 0xc6, 0x2a, 0xe9, 0xe9};
-
-  for (int i = 0; i < kLength; ++i)
-  {
-    EXPECT_EQ(trace_id[i], expected_trace_id[i]);
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/string_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/string_test.cc
deleted file mode 100644
index 184434b52..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/detail/string_test.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <ostream>
-#include <vector>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/propagation/detail/string.h"
-
-using namespace opentelemetry;
-
-namespace
-{
-
-struct SplitStringTestData
-{
-  opentelemetry::nostd::string_view input;
-  char separator;
-  size_t max_count;
-  size_t expected_number_strings;
-
-  // When googletest registers parameterized tests, it uses this method to format the parameters.
-  // The default implementation prints hex dump of all bytes in the object. If there is any padding
-  // in these bytes, valgrind reports this as a warning - "Use of uninitialized bytes".
-  // See https://github.com/google/googletest/issues/3805.
-  friend void PrintTo(const SplitStringTestData &data, std::ostream *os)
-  {
-    *os << "(" << data.input << "," << data.separator << "," << data.max_count << ","
-        << data.expected_number_strings << ")";
-  }
-};
-
-const SplitStringTestData split_string_test_cases[] = {
-    {"foo,bar,baz", ',', 4, 3},
-    {"foo,bar,baz,foobar", ',', 4, 4},
-    {"foo,bar,baz,foobar", '.', 4, 1},
-    {"foo,bar,baz,", ',', 4, 4},
-    {"foo,bar,baz,", ',', 2, 2},
-    {"foo ,bar, baz ", ',', 4, 3},
-    {"foo ,bar, baz ", ',', 4, 3},
-    {"00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01", '-', 4, 4},
-};
-}  // namespace
-
-// Test fixture
-class SplitStringTestFixture : public ::testing::TestWithParam<SplitStringTestData>
-{};
-
-TEST_P(SplitStringTestFixture, SplitsAsExpected)
-{
-  const SplitStringTestData test_param = GetParam();
-  std::vector<opentelemetry::nostd::string_view> fields(test_param.expected_number_strings);
-  size_t got_splits_num = opentelemetry::trace::propagation::detail::SplitString(
-      test_param.input, test_param.separator, fields.data(), test_param.max_count);
-
-  // Assert on the output
-  EXPECT_EQ(got_splits_num, test_param.expected_number_strings);
-}
-
-INSTANTIATE_TEST_SUITE_P(SplitStringTestCases,
-                         SplitStringTestFixture,
-                         ::testing::ValuesIn(split_string_test_cases));
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/http_text_format_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/http_text_format_test.cc
deleted file mode 100644
index da198ac84..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/http_text_format_test.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-#include "util.h"
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/propagation/global_propagator.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/propagation/http_trace_context.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-
-using namespace opentelemetry;
-
-class TextMapCarrierTest : public context::propagation::TextMapCarrier
-{
-public:
-  nostd::string_view Get(nostd::string_view key) const noexcept override
-  {
-    auto it = headers_.find(std::string(key));
-    if (it != headers_.end())
-    {
-      return nostd::string_view(it->second);
-    }
-    return "";
-  }
-  void Set(nostd::string_view key, nostd::string_view value) noexcept override
-  {
-    headers_[std::string(key)] = std::string(value);
-  }
-
-  std::map<std::string, std::string> headers_;
-};
-
-using MapHttpTraceContext = trace::propagation::HttpTraceContext;
-
-static MapHttpTraceContext format = MapHttpTraceContext();
-
-TEST(TextMapPropagatorTest, TraceFlagsBufferGeneration)
-{
-  EXPECT_EQ(MapHttpTraceContext::TraceFlagsFromHex("00"), trace::TraceFlags());
-}
-
-TEST(TextMapPropagatorTest, NoSendEmptyTraceState)
-{
-  // If the trace state is empty, do not set the header.
-  TextMapCarrierTest carrier;
-  carrier.headers_ = {{"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"}};
-  context::Context ctx1 = context::Context{
-      trace::kSpanKey,
-      nostd::shared_ptr<trace::Span>(new trace::DefaultSpan(trace::SpanContext::GetInvalid()))};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-  TextMapCarrierTest carrier2;
-  format.Inject(carrier2, ctx2);
-  EXPECT_TRUE(carrier2.headers_.count("traceparent") > 0);
-  EXPECT_FALSE(carrier2.headers_.count("tracestate") > 0);
-}
-
-TEST(TextMapPropagatorTest, PropogateTraceState)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_ = {{"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"},
-                      {"tracestate", "congo=t61rcWkgMzE"}};
-  context::Context ctx1 = context::Context{
-      trace::kSpanKey,
-      nostd::shared_ptr<trace::Span>(new trace::DefaultSpan(trace::SpanContext::GetInvalid()))};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-
-  TextMapCarrierTest carrier2;
-  format.Inject(carrier2, ctx2);
-
-  EXPECT_TRUE(carrier2.headers_.count("traceparent") > 0);
-  EXPECT_TRUE(carrier2.headers_.count("tracestate") > 0);
-  EXPECT_EQ(carrier2.headers_["tracestate"], "congo=t61rcWkgMzE");
-}
-
-TEST(TextMapPropagatorTest, PropagateInvalidContext)
-{
-  // Do not propagate invalid trace context.
-  TextMapCarrierTest carrier;
-  context::Context ctx{
-      trace::kSpanKey,
-      nostd::shared_ptr<trace::Span>(new trace::DefaultSpan(trace::SpanContext::GetInvalid()))};
-  format.Inject(carrier, ctx);
-  EXPECT_TRUE(carrier.headers_.count("traceparent") == 0);
-  EXPECT_TRUE(carrier.headers_.count("tracestate") == 0);
-}
-
-TEST(TextMapPropagatorTest, SetRemoteSpan)
-{
-  TextMapCarrierTest carrier;
-  carrier.headers_ = {{"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"}};
-  context::Context ctx1 = context::Context{};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-
-  auto ctx2_span = ctx2.GetValue(trace::kSpanKey);
-  EXPECT_TRUE(nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(ctx2_span));
-
-  auto span = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "4bf92f3577b34da6a3ce929d0e0e4736");
-  EXPECT_EQ(Hex(span->GetContext().span_id()), "0102030405060708");
-  EXPECT_EQ(span->GetContext().IsSampled(), true);
-  EXPECT_EQ(span->GetContext().IsRemote(), true);
-}
-
-TEST(TextMapPropagatorTest, DoNotOverwriteContextWithInvalidSpan)
-{
-  TextMapCarrierTest carrier;
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  trace::SpanContext span_context{trace::TraceId{buf_trace}, trace::SpanId{buf_span},
-                                  trace::TraceFlags{true}, false};
-  nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan{span_context}};
-
-  // Make sure this invalid span does not overwrite the active span context
-  carrier.headers_ = {{"traceparent", "00-FOO92f3577b34da6a3ce929d0e0e4736-010BAR0405060708-01"}};
-  context::Context ctx1{trace::kSpanKey, sp};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-  auto ctx2_span        = ctx2.GetValue(trace::kSpanKey);
-  auto span             = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "0102030405060708090a0b0c0d0e0f10");
-}
-
-TEST(TextMapPropagatorTest, GetCurrentSpan)
-{
-  TextMapCarrierTest carrier;
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-
-  auto trace_state = trace::TraceState::FromHeader("congo=t61rcWkgMzE");
-  trace::SpanContext span_context{trace::TraceId{buf_trace}, trace::SpanId{buf_span},
-                                  trace::TraceFlags{true}, false, trace_state};
-  nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan{span_context}};
-
-  // Set `sp` as the currently active span, which must be used by `Inject`.
-  trace::Scope scoped_span{sp};
-
-  format.Inject(carrier, context::RuntimeContext::GetCurrent());
-  EXPECT_EQ(carrier.headers_["traceparent"],
-            "00-0102030405060708090a0b0c0d0e0f10-0102030405060708-01");
-  EXPECT_EQ(carrier.headers_["tracestate"], "congo=t61rcWkgMzE");
-}
-
-TEST(TextMapPropagatorTest, InvalidIdentitiesAreNotExtracted)
-{
-  TextMapCarrierTest carrier;
-  std::vector<std::string> traces = {
-      "ff-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01",
-      "00-0af7651916cd43dd8448eb211c80319c1-b9c7c989f97918e1-01",
-      "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e11-01",
-      "0-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01",
-      "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-0",
-      "00-0af7651916cd43dd8448eb211c8031-b9c7c989f97918e1-01",
-      "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97-01",
-      "00-1-1-00",
-      "00--b9c7c989f97918e1-01",
-      "00-0af7651916cd43dd8448eb211c80319c1--01",
-      "",
-      "---",
-  };
-
-  for (auto &trace : traces)
-  {
-    carrier.headers_      = {{"traceparent", trace}};
-    context::Context ctx1 = context::Context{};
-    context::Context ctx2 = format.Extract(carrier, ctx1);
-
-    auto span = trace::GetSpan(ctx2)->GetContext();
-    EXPECT_FALSE(span.IsValid());
-  }
-}
-
-TEST(GlobalTextMapPropagator, NoOpPropagator)
-{
-
-  auto propagator = context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-  TextMapCarrierTest carrier;
-
-  carrier.headers_ = {{"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"},
-                      {"tracestate", "congo=t61rcWkgMzE"}};
-  context::Context ctx1 = context::Context{
-      trace::kSpanKey,
-      nostd::shared_ptr<trace::Span>(new trace::DefaultSpan(trace::SpanContext::GetInvalid()))};
-  context::Context ctx2 = propagator->Extract(carrier, ctx1);
-
-  TextMapCarrierTest carrier2;
-  propagator->Inject(carrier2, ctx2);
-
-  EXPECT_TRUE(carrier2.headers_.count("tracestate") == 0);
-  EXPECT_TRUE(carrier2.headers_.count("traceparent") == 0);
-}
-
-TEST(GlobalPropagator, SetAndGet)
-{
-
-  auto trace_state_value = "congo=t61rcWkgMzE";
-  context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
-      nostd::shared_ptr<context::propagation::TextMapPropagator>(new MapHttpTraceContext()));
-
-  auto propagator = context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-
-  TextMapCarrierTest carrier;
-  carrier.headers_ = {{"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"},
-                      {"tracestate", trace_state_value}};
-  context::Context ctx1 = context::Context{
-      trace::kSpanKey,
-      nostd::shared_ptr<trace::Span>(new trace::DefaultSpan(trace::SpanContext::GetInvalid()))};
-  context::Context ctx2 = propagator->Extract(carrier, ctx1);
-
-  TextMapCarrierTest carrier2;
-  propagator->Inject(carrier2, ctx2);
-
-  EXPECT_TRUE(carrier.headers_.count("traceparent") > 0);
-  EXPECT_TRUE(carrier.headers_.count("tracestate") > 0);
-  EXPECT_EQ(carrier.headers_["tracestate"], trace_state_value);
-
-  std::vector<std::string> fields;
-  propagator->Fields([&fields](nostd::string_view field) {
-    fields.push_back(field.data());
-    return true;
-  });
-  EXPECT_EQ(fields.size(), 2);
-  EXPECT_EQ(fields[0], trace::propagation::kTraceParent);
-  EXPECT_EQ(fields[1], trace::propagation::kTraceState);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/jaeger_propagation_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/jaeger_propagation_test.cc
deleted file mode 100644
index c8d40f7a6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/jaeger_propagation_test.cc
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-#include "util.h"
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/propagation/jaeger.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-
-using namespace opentelemetry;
-
-class TextMapCarrierTest : public context::propagation::TextMapCarrier
-{
-public:
-  nostd::string_view Get(nostd::string_view key) const noexcept override
-  {
-    auto it = headers_.find(std::string(key));
-    if (it != headers_.end())
-    {
-      return nostd::string_view(it->second);
-    }
-    return "";
-  }
-  void Set(nostd::string_view key, nostd::string_view value) noexcept override
-  {
-    headers_[std::string(key)] = std::string(value);
-  }
-
-  std::map<std::string, std::string> headers_;
-};
-
-using Propagator = trace::propagation::JaegerPropagator;
-
-static Propagator format = Propagator();
-
-TEST(JaegerPropagatorTest, ExtractValidSpans)
-{
-  struct TestTrace
-  {
-    std::string trace_state;
-    std::string expected_trace_id;
-    std::string expected_span_id;
-    bool sampled;
-  };
-
-  std::vector<TestTrace> traces = {
-      {
-          "4bf92f3577b34da6a3ce929d0e0e4736:0102030405060708:0:00",
-          "4bf92f3577b34da6a3ce929d0e0e4736",
-          "0102030405060708",
-          false,
-      },
-      {
-          "4bf92f3577b34da6a3ce929d0e0e4736:0102030405060708:0:ff",
-          "4bf92f3577b34da6a3ce929d0e0e4736",
-          "0102030405060708",
-          true,
-      },
-      {
-          "4bf92f3577b34da6a3ce929d0e0e4736:0102030405060708:0:f",
-          "4bf92f3577b34da6a3ce929d0e0e4736",
-          "0102030405060708",
-          true,
-      },
-      {
-          "a3ce929d0e0e4736:0102030405060708:0:00",
-          "0000000000000000a3ce929d0e0e4736",
-          "0102030405060708",
-          false,
-      },
-      {
-          "A3CE929D0E0E4736:ABCDEFABCDEF1234:0:01",
-          "0000000000000000a3ce929d0e0e4736",
-          "abcdefabcdef1234",
-          true,
-      },
-      {
-          "ff:ABCDEFABCDEF1234:0:0",
-          "000000000000000000000000000000ff",
-          "abcdefabcdef1234",
-          false,
-      },
-      {
-          "4bf92f3577b34da6a3ce929d0e0e4736:0102030405060708:0102030405060708:00",
-          "4bf92f3577b34da6a3ce929d0e0e4736",
-          "0102030405060708",
-          false,
-      },
-
-  };
-
-  for (TestTrace &test_trace : traces)
-  {
-    TextMapCarrierTest carrier;
-    carrier.headers_      = {{"uber-trace-id", test_trace.trace_state}};
-    context::Context ctx1 = context::Context{};
-    context::Context ctx2 = format.Extract(carrier, ctx1);
-
-    auto span = trace::GetSpan(ctx2)->GetContext();
-    EXPECT_TRUE(span.IsValid());
-
-    EXPECT_EQ(Hex(span.trace_id()), test_trace.expected_trace_id);
-    EXPECT_EQ(Hex(span.span_id()), test_trace.expected_span_id);
-    EXPECT_EQ(span.IsSampled(), test_trace.sampled);
-    EXPECT_EQ(span.IsRemote(), true);
-  }
-}
-
-TEST(JaegerPropagatorTest, ExctractInvalidSpans)
-{
-  TextMapCarrierTest carrier;
-  std::vector<std::string> traces = {
-      "4bf92f3577b34da6a3ce929d0e0e47344:0102030405060708:0:00",  // too long trace id
-      "4bf92f3577b34da6a3ce929d0e0e4734:01020304050607089:0:00",  // too long span id
-      "4bf92f3577b34da6x3ce929d0y0e4734:01020304050607089:0:00",  // invalid trace id character
-      "4bf92f3577b34da6a3ce929d0e0e4734:01020304g50607089:0:00",  // invalid span id character
-      "4bf92f3577b34da6a3ce929d0e0e4734::0:00",
-      "",
-      "::::",
-      "0:0:0:0",
-      ":abcdef12:0:0",
-  };
-
-  for (auto &trace : traces)
-  {
-    carrier.headers_      = {{"uber-trace-id", trace}};
-    context::Context ctx1 = context::Context{};
-    context::Context ctx2 = format.Extract(carrier, ctx1);
-
-    auto span = trace::GetSpan(ctx2)->GetContext();
-    EXPECT_FALSE(span.IsValid());
-  }
-}
-
-TEST(JaegerPropagatorTest, DoNotOverwriteContextWithInvalidSpan)
-{
-  TextMapCarrierTest carrier;
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  trace::SpanContext span_context{trace::TraceId{buf_trace}, trace::SpanId{buf_span},
-                                  trace::TraceFlags{true}, false};
-  nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan{span_context}};
-
-  // Make sure this invalid span does not overwrite the active span context
-  carrier.headers_ = {{"uber-trace-id", "foo:bar:0:00"}};
-  context::Context ctx1{trace::kSpanKey, sp};
-  context::Context ctx2 = format.Extract(carrier, ctx1);
-  auto ctx2_span        = ctx2.GetValue(trace::kSpanKey);
-  auto span             = nostd::get<nostd::shared_ptr<trace::Span>>(ctx2_span);
-
-  EXPECT_EQ(Hex(span->GetContext().trace_id()), "0102030405060708090a0b0c0d0e0f10");
-}
-
-TEST(JaegerPropagatorTest, InjectsContext)
-{
-  TextMapCarrierTest carrier;
-  constexpr uint8_t buf_span[]  = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t buf_trace[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  trace::SpanContext span_context{trace::TraceId{buf_trace}, trace::SpanId{buf_span},
-                                  trace::TraceFlags{true}, false};
-  nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan{span_context}};
-  trace::Scope scoped_span{sp};
-
-  format.Inject(carrier, context::RuntimeContext::GetCurrent());
-  EXPECT_EQ(carrier.headers_["uber-trace-id"],
-            "0102030405060708090a0b0c0d0e0f10:0102030405060708:0:01");
-
-  std::vector<std::string> fields;
-  format.Fields([&fields](nostd::string_view field) {
-    fields.push_back(field.data());
-    return true;
-  });
-  EXPECT_EQ(fields.size(), 1);
-  EXPECT_EQ(fields[0], opentelemetry::trace::propagation::kJaegerTraceHeader);
-}
-
-TEST(JaegerPropagatorTest, DoNotInjectInvalidContext)
-{
-  TextMapCarrierTest carrier;
-  context::Context ctx{
-      trace::kSpanKey,
-      nostd::shared_ptr<trace::Span>(new trace::DefaultSpan(trace::SpanContext::GetInvalid()))};
-  format.Inject(carrier, ctx);
-  EXPECT_TRUE(carrier.headers_.count("uber-trace-id") == 0);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/util.h b/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/util.h
deleted file mode 100644
index ae234d92e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/propagation/util.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-
-template <typename T>
-static std::string Hex(const T &id_item)
-{
-  char buf[T::kSize * 2];
-  id_item.ToLowerBase16(buf);
-  return std::string(buf, sizeof(buf));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/provider_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/provider_test.cc
deleted file mode 100644
index d8736f9cb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/provider_test.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-using opentelemetry::trace::Provider;
-using opentelemetry::trace::Tracer;
-using opentelemetry::trace::TracerProvider;
-
-namespace nostd = opentelemetry::nostd;
-
-class TestProvider : public TracerProvider
-{
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<Tracer> GetTracer(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */,
-      const opentelemetry::common::KeyValueIterable * /* attributes */) noexcept override
-  {
-    return nostd::shared_ptr<Tracer>(nullptr);
-  }
-#else
-  nostd::shared_ptr<Tracer> GetTracer(nostd::string_view /* name */,
-                                      nostd::string_view /* version */,
-                                      nostd::string_view /* schema_url */) noexcept override
-  {
-    return nostd::shared_ptr<Tracer>(nullptr);
-  }
-#endif
-};
-
-TEST(Provider, GetTracerProviderDefault)
-{
-  auto tf = Provider::GetTracerProvider();
-  EXPECT_NE(nullptr, tf);
-}
-
-TEST(Provider, SetTracerProvider)
-{
-  auto tf = nostd::shared_ptr<TracerProvider>(new TestProvider());
-  Provider::SetTracerProvider(tf);
-  ASSERT_EQ(tf, Provider::GetTracerProvider());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/scope_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/scope_test.cc
deleted file mode 100644
index 51550394e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/scope_test.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_metadata.h"
-
-using opentelemetry::trace::kSpanKey;
-using opentelemetry::trace::NoopSpan;
-using opentelemetry::trace::Scope;
-using opentelemetry::trace::Span;
-namespace nostd   = opentelemetry::nostd;
-namespace context = opentelemetry::context;
-
-TEST(ScopeTest, Construct)
-{
-  nostd::shared_ptr<Span> span(new NoopSpan(nullptr));
-  Scope scope(span);
-
-  context::ContextValue active_span_value = context::RuntimeContext::GetValue(kSpanKey);
-  ASSERT_TRUE(nostd::holds_alternative<nostd::shared_ptr<Span>>(active_span_value));
-
-  auto active_span = nostd::get<nostd::shared_ptr<Span>>(active_span_value);
-  ASSERT_EQ(active_span, span);
-}
-
-TEST(ScopeTest, Destruct)
-{
-  nostd::shared_ptr<Span> span(new NoopSpan(nullptr));
-  Scope scope(span);
-
-  {
-    nostd::shared_ptr<Span> span_nested(new NoopSpan(nullptr));
-    Scope scope_nested(span_nested);
-
-    context::ContextValue active_span_value = context::RuntimeContext::GetValue(kSpanKey);
-    ASSERT_TRUE(nostd::holds_alternative<nostd::shared_ptr<Span>>(active_span_value));
-
-    auto active_span = nostd::get<nostd::shared_ptr<Span>>(active_span_value);
-    ASSERT_EQ(active_span, span_nested);
-  }
-
-  context::ContextValue active_span_value = context::RuntimeContext::GetValue(kSpanKey);
-  ASSERT_TRUE(nostd::holds_alternative<nostd::shared_ptr<Span>>(active_span_value));
-
-  auto active_span = nostd::get<nostd::shared_ptr<Span>>(active_span_value);
-  ASSERT_EQ(active_span, span);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_benchmark.cc
deleted file mode 100644
index c60a7c807..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_benchmark.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <cstdint>
-
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer.h"
-
-using opentelemetry::trace::SpanContext;
-namespace trace_api = opentelemetry::trace;
-namespace nostd     = opentelemetry::nostd;
-namespace context   = opentelemetry::context;
-
-namespace
-{
-
-std::shared_ptr<trace_api::Tracer> initTracer()
-{
-  return std::shared_ptr<trace_api::Tracer>(new trace_api::NoopTracer());
-}
-
-// Test to measure performance for span creation
-void BM_SpanCreation(benchmark::State &state)
-{
-  auto tracer = initTracer();
-  while (state.KeepRunning())
-  {
-    auto span = tracer->StartSpan("span");
-    span->End();
-  }
-}
-BENCHMARK(BM_SpanCreation);
-
-// Test to measure performance for single span creation with scope
-void BM_SpanCreationWithScope(benchmark::State &state)
-{
-  auto tracer = initTracer();
-  while (state.KeepRunning())
-  {
-    auto span  = tracer->StartSpan("span");
-    auto scope = tracer->WithActiveSpan(span);
-    span->End();
-  }
-}
-BENCHMARK(BM_SpanCreationWithScope);
-
-// Test to measure performance for nested span creation with scope
-void BM_NestedSpanCreationWithScope(benchmark::State &state)
-{
-  auto tracer = initTracer();
-  while (state.KeepRunning())
-  {
-    auto o_span  = tracer->StartSpan("outer");
-    auto o_scope = tracer->WithActiveSpan(o_span);
-    {
-      auto i_span  = tracer->StartSpan("inner");
-      auto i_scope = tracer->WithActiveSpan(i_span);
-      {
-        auto im_span  = tracer->StartSpan("innermost");
-        auto im_scope = tracer->WithActiveSpan(im_span);
-        im_span->End();
-      }
-      i_span->End();
-    }
-    o_span->End();
-  }
-}
-
-BENCHMARK(BM_NestedSpanCreationWithScope);
-
-// Test to measure performance for nested span creation with manual span context management
-void BM_SpanCreationWithManualSpanContextPropagation(benchmark::State &state)
-{
-  auto tracer              = initTracer();
-  constexpr uint8_t buf1[] = {1, 2, 3, 4, 5, 6, 7, 8};
-  trace_api::SpanId span_id(buf1);
-  constexpr uint8_t buf2[] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1};
-  trace_api::TraceId trace_id(buf2);
-
-  while (state.KeepRunning())
-  {
-    auto outer_span = nostd::shared_ptr<trace_api::Span>(
-        new trace_api::DefaultSpan(SpanContext(trace_id, span_id, trace_api::TraceFlags(), false)));
-    trace_api::StartSpanOptions options;
-    options.parent          = outer_span->GetContext();
-    auto inner_span         = tracer->StartSpan("inner", options);
-    auto inner_span_context = inner_span->GetContext();
-    options.parent          = inner_span_context;
-    auto innermost_span     = tracer->StartSpan("innermost", options);
-    innermost_span->End();
-    inner_span->End();
-  }
-}
-BENCHMARK(BM_SpanCreationWithManualSpanContextPropagation);
-
-// Test to measure performance for nested span creation with context propagation
-void BM_SpanCreationWitContextPropagation(benchmark::State &state)
-{
-  auto tracer              = initTracer();
-  constexpr uint8_t buf1[] = {1, 2, 3, 4, 5, 6, 7, 8};
-  trace_api::SpanId span_id(buf1);
-  constexpr uint8_t buf2[] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1};
-  trace_api::TraceId trace_id(buf2);
-
-  while (state.KeepRunning())
-  {
-    auto current_ctx        = context::RuntimeContext::GetCurrent();
-    auto outer_span_context = SpanContext(trace_id, span_id, trace_api::TraceFlags(), false);
-    auto outer_span =
-        nostd::shared_ptr<trace_api::Span>(new trace_api::DefaultSpan(outer_span_context));
-    trace_api::SetSpan(current_ctx, outer_span);
-    auto inner_child = tracer->StartSpan("inner");
-    auto inner_scope = tracer->WithActiveSpan(inner_child);
-    {
-      auto innermost_child = tracer->StartSpan("innermost");
-      auto innermost_scope = tracer->WithActiveSpan(innermost_child);
-      innermost_child->End();
-    }
-    inner_child->End();
-  }
-}
-BENCHMARK(BM_SpanCreationWitContextPropagation);
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_context_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_context_test.cc
deleted file mode 100644
index 531475b4c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_context_test.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-
-#include <gtest/gtest.h>
-#include <string>
-
-using opentelemetry::trace::SpanContext;
-namespace trace_api = opentelemetry::trace;
-
-TEST(SpanContextTest, IsSampled)
-{
-  SpanContext s1(true, true);
-
-  ASSERT_EQ(s1.IsSampled(), true);
-
-  SpanContext s2(false, true);
-
-  ASSERT_EQ(s2.IsSampled(), false);
-}
-
-TEST(SpanContextTest, IsRemote)
-{
-  SpanContext s1(true, true);
-
-  ASSERT_EQ(s1.IsRemote(), true);
-
-  SpanContext s2(true, false);
-
-  ASSERT_EQ(s2.IsRemote(), false);
-}
-
-TEST(SpanContextTest, TraceFlags)
-{
-  SpanContext s1(true, true);
-
-  ASSERT_EQ(s1.trace_flags().flags(), 1);
-
-  SpanContext s2(false, true);
-
-  ASSERT_EQ(s2.trace_flags().flags(), 0);
-}
-
-// Test that SpanContext is invalid
-TEST(SpanContextTest, Invalid)
-{
-  SpanContext s1 = SpanContext::GetInvalid();
-  EXPECT_FALSE(s1.IsValid());
-
-  // Test that trace id and span id are invalid
-  EXPECT_EQ(s1.trace_id(), trace_api::TraceId());
-  EXPECT_EQ(s1.span_id(), trace_api::SpanId());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_id_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_id_benchmark.cc
deleted file mode 100644
index 236fa3ac7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_id_benchmark.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <cstdint>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/trace/span_id.h"
-
-namespace
-{
-using opentelemetry::trace::SpanId;
-constexpr uint8_t bytes[] = {1, 2, 3, 4, 5, 6, 7, 8};
-
-void BM_SpanIdDefaultConstructor(benchmark::State &state)
-{
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(SpanId());
-  }
-}
-BENCHMARK(BM_SpanIdDefaultConstructor);
-
-void BM_SpanIdConstructor(benchmark::State &state)
-{
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(SpanId(bytes));
-  }
-}
-BENCHMARK(BM_SpanIdConstructor);
-
-void BM_SpanIdToLowerBase16(benchmark::State &state)
-{
-  SpanId id(bytes);
-  char buf[SpanId::kSize * 2];
-  while (state.KeepRunning())
-  {
-    id.ToLowerBase16(buf);
-    benchmark::DoNotOptimize(buf);
-  }
-}
-BENCHMARK(BM_SpanIdToLowerBase16);
-
-void BM_SpanIdIsValid(benchmark::State &state)
-{
-  SpanId id(bytes);
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(id.IsValid());
-  }
-}
-BENCHMARK(BM_SpanIdIsValid);
-
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_id_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_id_test.cc
deleted file mode 100644
index 6d7722a1e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/span_id_test.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/trace/span_id.h"
-
-#include <gtest/gtest.h>
-#include <cstring>
-#include <string>
-
-namespace
-{
-
-using opentelemetry::trace::SpanId;
-
-std::string Hex(const opentelemetry::trace::SpanId &span)
-{
-  char buf[16];
-  span.ToLowerBase16(buf);
-  return std::string(buf, sizeof(buf));
-}
-
-TEST(SpanIdTest, DefaultConstruction)
-{
-  SpanId id;
-  EXPECT_FALSE(id.IsValid());
-  EXPECT_EQ("0000000000000000", Hex(id));
-}
-
-TEST(SpanIdTest, ValidId)
-{
-  constexpr uint8_t buf[] = {1, 2, 3, 4, 5, 6, 7, 8};
-  SpanId id(buf);
-  EXPECT_TRUE(id.IsValid());
-  EXPECT_EQ("0102030405060708", Hex(id));
-  EXPECT_NE(SpanId(), id);
-  EXPECT_EQ(SpanId(buf), id);
-}
-
-TEST(SpanIdTest, LowercaseBase16)
-{
-  constexpr uint8_t buf[] = {1, 2, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
-  SpanId id(buf);
-  EXPECT_TRUE(id.IsValid());
-  EXPECT_EQ("0102aabbccddeeff", Hex(id));
-  EXPECT_NE(SpanId(), id);
-  EXPECT_EQ(SpanId(buf), id);
-}
-
-TEST(SpanIdTest, CopyBytesTo)
-{
-  constexpr uint8_t src[] = {1, 2, 3, 4, 5, 6, 7, 8};
-  SpanId id(src);
-  uint8_t buf[8];
-  id.CopyBytesTo(buf);
-  EXPECT_TRUE(memcmp(src, buf, 8) == 0);
-}
-}  // namespace
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_flags_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_flags_test.cc
deleted file mode 100644
index adf8affa8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_flags_test.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <string>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/trace/trace_flags.h"
-
-namespace
-{
-
-using opentelemetry::trace::TraceFlags;
-
-std::string Hex(const TraceFlags &flags)
-{
-  char buf[2];
-  flags.ToLowerBase16(buf);
-  return std::string(buf, sizeof(buf));
-}
-
-TEST(TraceFlagsTest, DefaultConstruction)
-{
-  TraceFlags flags;
-  EXPECT_FALSE(flags.IsSampled());
-  EXPECT_EQ(0, flags.flags());
-  EXPECT_EQ("00", Hex(flags));
-}
-
-TEST(TraceFlagsTest, Sampled)
-{
-  TraceFlags flags{TraceFlags::kIsSampled};
-  EXPECT_TRUE(flags.IsSampled());
-  EXPECT_EQ(1, flags.flags());
-  EXPECT_EQ("01", Hex(flags));
-
-  uint8_t buf[1];
-  flags.CopyBytesTo(buf);
-  EXPECT_EQ(1, buf[0]);
-}
-
-}  // namespace
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_id_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_id_test.cc
deleted file mode 100644
index f903bfe9e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_id_test.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/trace/trace_id.h"
-
-#include <cstring>
-#include <string>
-
-#include <gtest/gtest.h>
-
-namespace
-{
-
-using opentelemetry::trace::TraceId;
-
-std::string Hex(const opentelemetry::trace::TraceId &trace)
-{
-  char buf[32];
-  trace.ToLowerBase16(buf);
-  return std::string(buf, sizeof(buf));
-}
-
-TEST(TraceIdTest, DefaultConstruction)
-{
-  TraceId id;
-  EXPECT_FALSE(id.IsValid());
-  EXPECT_EQ("00000000000000000000000000000000", Hex(id));
-}
-
-TEST(TraceIdTest, ValidId)
-{
-  constexpr uint8_t buf[] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1};
-  TraceId id(buf);
-  EXPECT_TRUE(id.IsValid());
-  EXPECT_EQ("01020304050607080807060504030201", Hex(id));
-  EXPECT_NE(TraceId(), id);
-  EXPECT_EQ(TraceId(buf), id);
-}
-
-TEST(TraceIdTest, LowercaseBase16)
-{
-  constexpr uint8_t buf[] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
-  TraceId id(buf);
-  EXPECT_TRUE(id.IsValid());
-  EXPECT_EQ("01020304050607080807aabbccddeeff", Hex(id));
-  EXPECT_NE(TraceId(), id);
-  EXPECT_EQ(TraceId(buf), id);
-}
-
-TEST(TraceIdTest, CopyBytesTo)
-{
-  constexpr uint8_t src[] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1};
-  TraceId id(src);
-  uint8_t buf[TraceId::kSize];
-  id.CopyBytesTo(buf);
-  EXPECT_TRUE(memcmp(src, buf, sizeof(buf)) == 0);
-}
-}  // namespace
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_state_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_state_test.cc
deleted file mode 100644
index 6613d9270..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/trace_state_test.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <string>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/trace_state.h"
-
-namespace
-{
-
-using opentelemetry::trace::TraceState;
-namespace nostd = opentelemetry::nostd;
-
-// Random string of length 257. Used for testing strings with max length 256.
-const char *kLongString =
-    "4aekid3he76zgytjavudqqeltyvu5zqio2lx7d92dlxlf0z4883irvxuwelsq27sx1mlrjg3r7ad3jeq09rjppyd9veorg"
-    "2nmihy4vilabfts8bsxruih0urusmjnglzl3iwpjinmo835dbojcrd73p56nw80v4xxrkye59ytmu5v84ysfa24d58ovv9"
-    "w1n54n0mhhf4z0mpv6oudywrp9vfoks6lrvxv3uihvbi2ihazf237kvt1nbsjn3kdvfdb";
-
-// -------------------------- TraceState class tests ---------------------------
-
-std::string create_ts_return_header(const std::string &header)
-{
-  auto ts = TraceState::FromHeader(header);
-  return ts->ToHeader();
-}
-
-std::string header_with_max_members()
-{
-  std::string header = "";
-  auto max_members   = TraceState::kMaxKeyValuePairs;
-  for (int i = 0; i < max_members; i++)
-  {
-    std::string key   = "key" + std::to_string(i);
-    std::string value = "value" + std::to_string(i);
-    header.append(key).append("=").append(value);
-    if (i != max_members - 1)
-    {
-      header += ",";
-    }
-  }
-  return header;
-}
-
-TEST(TraceStateTest, ValidateHeaderParsing)
-{
-  auto max_trace_state_header = header_with_max_members();
-
-  struct
-  {
-    const char *input;
-    const char *expected;
-  } testcases[] = {{"k1=v1", "k1=v1"},
-                   {"K1=V1", ""},
-                   {"k1=v1,k2=v2,k3=v3", "k1=v1,k2=v2,k3=v3"},
-                   {"k1=v1,k2=v2,,", "k1=v1,k2=v2"},
-                   {"k1=v1,k2=v2,invalidmember", ""},
-                   {"1a-2f@foo=bar1,a*/foo-_/bar=bar4", "1a-2f@foo=bar1,a*/foo-_/bar=bar4"},
-                   {"1a-2f@foo=bar1,*/foo-_/bar=bar4", ""},
-                   {",k1=v1", "k1=v1"},
-                   {",", ""},
-                   {",=,", ""},
-                   {"", ""},
-                   {max_trace_state_header.data(), max_trace_state_header.data()}};
-  for (auto &testcase : testcases)
-  {
-    EXPECT_EQ(create_ts_return_header(testcase.input), testcase.expected);
-  }
-}
-
-TEST(TraceStateTest, TraceStateGet)
-{
-
-  std::string trace_state_header = header_with_max_members();
-  auto ts                        = TraceState::FromHeader(trace_state_header);
-
-  std::string value;
-  EXPECT_TRUE(ts->Get("key0", value));
-  EXPECT_EQ(value, "value0");
-  EXPECT_TRUE(ts->Get("key16", value));
-  EXPECT_EQ(value, "value16");
-  EXPECT_TRUE(ts->Get("key31", value));
-  EXPECT_EQ(value, "value31");
-  EXPECT_FALSE(ts->Get("key32", value));
-}
-
-TEST(TraceStateTest, TraceStateSet)
-{
-  std::string trace_state_header = "k1=v1,k2=v2";
-  auto ts1                       = TraceState::FromHeader(trace_state_header);
-  auto ts1_new                   = ts1->Set("k3", "v3");
-  EXPECT_EQ(ts1_new->ToHeader(), "k3=v3,k1=v1,k2=v2");
-
-  trace_state_header = header_with_max_members();
-  auto ts2           = TraceState::FromHeader(trace_state_header);
-  auto ts2_new =
-      ts2->Set("n_k1", "n_v1");  // adding to max list, should return copy of existing list
-  EXPECT_EQ(ts2_new->ToHeader(), trace_state_header);
-
-  trace_state_header = "k1=v1,k2=v2";
-  auto ts3           = TraceState::FromHeader(trace_state_header);
-  auto ts3_new       = ts3->Set("*n_k1", "n_v1");  // adding invalid key, should return empty
-  EXPECT_EQ(ts3_new->ToHeader(), "");
-}
-
-TEST(TraceStateTest, TraceStateDelete)
-{
-  std::string trace_state_header = "k1=v1,k2=v2,k3=v3";
-  auto ts1                       = TraceState::FromHeader(trace_state_header);
-  auto ts1_new                   = ts1->Delete(std::string("k1"));
-  EXPECT_EQ(ts1_new->ToHeader(), "k2=v2,k3=v3");
-
-  trace_state_header = "k1=v1";  // single list member
-  auto ts2           = TraceState::FromHeader(trace_state_header);
-  auto ts2_new       = ts2->Delete(std::string("k1"));
-  EXPECT_EQ(ts2_new->ToHeader(), "");
-
-  trace_state_header = "k1=v1";  // single list member, delete invalid entry
-  auto ts3           = TraceState::FromHeader(trace_state_header);
-  auto ts3_new       = ts3->Delete(std::string("InvalidKey"));
-  EXPECT_EQ(ts3_new->ToHeader(), "");
-}
-
-TEST(TraceStateTest, Empty)
-{
-  std::string trace_state_header = "";
-  auto ts                        = TraceState::FromHeader(trace_state_header);
-  EXPECT_TRUE(ts->Empty());
-
-  trace_state_header = "k1=v1,k2=v2";
-  auto ts1           = TraceState::FromHeader(trace_state_header);
-  EXPECT_FALSE(ts1->Empty());
-}
-
-TEST(TraceStateTest, GetAllEntries)
-{
-  std::string trace_state_header       = "k1=v1,k2=v2,k3=v3";
-  auto ts1                             = TraceState::FromHeader(trace_state_header);
-  const int kNumPairs                  = 3;
-  nostd::string_view keys[kNumPairs]   = {"k1", "k2", "k3"};
-  nostd::string_view values[kNumPairs] = {"v1", "v2", "v3"};
-  size_t index                         = 0;
-  ts1->GetAllEntries([&keys, &values, &index](nostd::string_view key, nostd::string_view value) {
-    EXPECT_EQ(key, keys[index]);
-    EXPECT_EQ(value, values[index]);
-    index++;
-    return true;
-  });
-}
-
-TEST(TraceStateTest, IsValidKey)
-{
-  EXPECT_TRUE(TraceState::IsValidKey("valid-key23/*"));
-  EXPECT_FALSE(TraceState::IsValidKey("Invalid_key"));
-  EXPECT_FALSE(TraceState::IsValidKey("invalid$Key&"));
-  EXPECT_FALSE(TraceState::IsValidKey(""));
-  EXPECT_FALSE(TraceState::IsValidKey(kLongString));
-}
-
-TEST(TraceStateTest, IsValidValue)
-{
-  EXPECT_TRUE(TraceState::IsValidValue("valid-val$%&~"));
-  EXPECT_FALSE(TraceState::IsValidValue("\tinvalid"));
-  EXPECT_FALSE(TraceState::IsValidValue("invalid="));
-  EXPECT_FALSE(TraceState::IsValidValue("invalid,val"));
-  EXPECT_FALSE(TraceState::IsValidValue(""));
-  EXPECT_FALSE(TraceState::IsValidValue(kLongString));
-}
-
-// Tests that keys and values don't depend on null terminators
-TEST(TraceStateTest, MemorySafe)
-{
-  std::string trace_state_header       = "";
-  auto ts                              = TraceState::FromHeader(trace_state_header);
-  const int kNumPairs                  = 3;
-  nostd::string_view key_string        = "test_key_1test_key_2test_key_3";
-  nostd::string_view val_string        = "test_val_1test_val_2test_val_3";
-  nostd::string_view keys[kNumPairs]   = {key_string.substr(0, 10), key_string.substr(10, 10),
-                                          key_string.substr(20, 10)};
-  nostd::string_view values[kNumPairs] = {val_string.substr(0, 10), val_string.substr(10, 10),
-                                          val_string.substr(20, 10)};
-
-  auto ts1     = ts->Set(keys[2], values[2]);
-  auto ts2     = ts1->Set(keys[1], values[1]);
-  auto ts3     = ts2->Set(keys[0], values[0]);
-  size_t index = 0;
-
-  ts3->GetAllEntries([&keys, &values, &index](nostd::string_view key, nostd::string_view value) {
-    EXPECT_EQ(key, keys[index]);
-    EXPECT_EQ(value, values[index]);
-    index++;
-    return true;
-  });
-}
-}  // namespace
diff --git a/ext/opentelemetry-cpp-1.21.0/api/test/trace/tracer_test.cc b/ext/opentelemetry-cpp-1.21.0/api/test/trace/tracer_test.cc
deleted file mode 100644
index 9b780e0f1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/api/test/trace/tracer_test.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/tracer.h"
-
-namespace trace_api = opentelemetry::trace;
-namespace nostd     = opentelemetry::nostd;
-namespace context   = opentelemetry::context;
-
-TEST(TracerTest, GetCurrentSpan)
-{
-  std::unique_ptr<trace_api::Tracer> tracer(new trace_api::NoopTracer());
-  nostd::shared_ptr<trace_api::Span> span_first(new trace_api::NoopSpan(nullptr));
-  nostd::shared_ptr<trace_api::Span> span_second(new trace_api::NoopSpan(nullptr));
-
-  auto current = tracer->GetCurrentSpan();
-  ASSERT_FALSE(current->GetContext().IsValid());
-
-  {
-    auto scope_first = tracer->WithActiveSpan(span_first);
-    current          = tracer->GetCurrentSpan();
-    ASSERT_EQ(current, span_first);
-
-    {
-      auto scope_second = tracer->WithActiveSpan(span_second);
-      current           = tracer->GetCurrentSpan();
-      ASSERT_EQ(current, span_second);
-    }
-    current = tracer->GetCurrentSpan();
-    ASSERT_EQ(current, span_first);
-  }
-
-  current = tracer->GetCurrentSpan();
-  ASSERT_FALSE(current->GetContext().IsValid());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/BUILD b/ext/opentelemetry-cpp-1.21.0/bazel/BUILD
deleted file mode 100644
index 2ea900857..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//:__subpackages__"])
-
-config_setting(
-    name = "windows",
-    constraint_values = ["@platforms//os:windows"],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/curl.BUILD b/ext/opentelemetry-cpp-1.21.0/bazel/curl.BUILD
deleted file mode 100644
index f0418a62d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/curl.BUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Builds CURL from a distribution.
-
-load("@io_opentelemetry_cpp//bazel:curl.bzl", "CURL_COPTS")
-
-package(features = ["no_copts_tokenization"])
-
-config_setting(
-    name = "windows",
-    constraint_values = [
-        "@platforms//os:windows",
-    ],
-    visibility = ["//visibility:private"],
-)
-
-config_setting(
-    name = "osx",
-    constraint_values = [
-        "@platforms//os:osx",
-    ],
-    visibility = ["//visibility:private"],
-)
-
-cc_library(
-    name = "curl",
-    srcs = glob([
-        "lib/**/*.c",
-    ]),
-    hdrs = glob([
-        "include/curl/*.h",
-        "lib/**/*.h",
-    ]),
-    copts = CURL_COPTS + [
-        "-DOS=\"os\"",
-    ],
-    defines = ["CURL_STATICLIB"],
-    includes = [
-        "include/",
-        "lib/",
-    ],
-    linkopts = select({
-        "//:windows": [
-            "-DEFAULTLIB:ws2_32.lib",
-            "-DEFAULTLIB:advapi32.lib",
-            "-DEFAULTLIB:crypt32.lib",
-            "-DEFAULTLIB:Normaliz.lib",
-        ],
-        "//:osx": [
-            "-framework SystemConfiguration",
-            "-lpthread",
-        ],
-        "//conditions:default": [
-            "-lpthread",
-        ],
-    }),
-    visibility = ["//visibility:public"],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/curl.bzl b/ext/opentelemetry-cpp-1.21.0/bazel/curl.bzl
deleted file mode 100644
index 681fa1a85..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/curl.bzl
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Compiler options for building libcurl.
-
-BASE_CURL_COPTS = [
-    # Disable everything else except HTTP protocol.
-    "-DHTTP_ONLY=1",
-    "-DENABLE_IPV6=1",
-    "-DGETHOSTNAME_TYPE_ARG2=size_t",
-    "-DGETSERVBYPORT_R_ARGS=6",
-    "-DGETSERVBYPORT_R_BUFSIZE=4096",
-    "-DHAVE_ALARM=1",
-    "-DHAVE_ALLOCA_H=1",
-    "-DHAVE_ARPA_INET_H=1",
-    "-DHAVE_ARPA_TFTP_H=1",
-    "-DHAVE_ASSERT_H=1",
-    "-DHAVE_BASENAME=1",
-    "-DHAVE_BOOL_T=1",
-    "-DHAVE_CLOCK_GETTIME_MONOTONIC=1",
-    "-DHAVE_CONNECT=1",
-    "-DHAVE_DLFCN_H=1",
-    "-DHAVE_ENGINE_LOAD_BUILTIN_ENGINES=1",
-    "-DHAVE_ERRNO_H=1",
-    "-DHAVE_FCNTL=1",
-    "-DHAVE_FCNTL_H=1",
-    "-DHAVE_FCNTL_O_NONBLOCK=1",
-    "-DHAVE_FDOPEN=1",
-    "-DHAVE_FREEADDRINFO=1",
-    "-DHAVE_FREEIFADDRS=1",
-    "-DHAVE_FSETXATTR=1",
-    "-DHAVE_FSETXATTR_5=1",
-    "-DHAVE_FTRUNCATE=1",
-    "-DHAVE_GAI_STRERROR=1",
-    "-DHAVE_GETADDRINFO=1",
-    "-DHAVE_GETADDRINFO_THREADSAFE=1",
-    "-DHAVE_GETEUID=1",
-    "-DHAVE_GETHOSTBYADDR=1",
-    "-DHAVE_GETHOSTBYADDR_R=1",
-    "-DHAVE_GETHOSTBYADDR_R_8=1",
-    "-DHAVE_GETHOSTBYNAME=1",
-    "-DHAVE_GETHOSTBYNAME_R=1",
-    "-DHAVE_GETHOSTBYNAME_R_6=1",
-    "-DHAVE_GETHOSTNAME=1",
-    "-DHAVE_GETIFADDRS=1",
-    "-DHAVE_GETNAMEINFO=1",
-    "-DHAVE_GETPPID=1",
-    "-DHAVE_GETPWUID=1",
-    "-DHAVE_GETPWUID_R=1",
-    "-DHAVE_GETRLIMIT=1",
-    "-DHAVE_GETSERVBYPORT_R=1",
-    "-DHAVE_GETTIMEOFDAY=1",
-    "-DHAVE_GMTIME_R=1",
-    "-DHAVE_IFADDRS_H=1",
-    "-DHAVE_IF_NAMETOINDEX=1",
-    "-DHAVE_INET_NTOP=1",
-    "-DHAVE_INET_PTON=1",
-    "-DHAVE_INTTYPES_H=1",
-    "-DHAVE_IOCTL=1",
-    "-DHAVE_IOCTL_FIONBIO=1",
-    "-DHAVE_IOCTL_SIOCGIFADDR=1",
-    "-DHAVE_LIBGEN_H=1",
-    "-DHAVE_LL=1",
-    "-DHAVE_LOCALE_H=1",
-    "-DHAVE_LOCALTIME_R=1",
-    "-DHAVE_LONGLONG=1",
-    "-DHAVE_MALLOC_H=1",
-    "-DHAVE_MEMORY_H=1",
-    "-DHAVE_NETDB_H=1",
-    "-DHAVE_NETINET_IN_H=1",
-    "-DHAVE_NETINET_TCP_H=1",
-    "-DHAVE_NET_IF_H=1",
-    "-DHAVE_PIPE=1",
-    "-DHAVE_POLL=1",
-    "-DHAVE_POLL_FINE=1",
-    "-DHAVE_POLL_H=1",
-    "-DHAVE_POSIX_STRERROR_R=1",
-    "-DHAVE_PTHREAD_H=1",
-    "-DHAVE_PWD_H=1",
-    "-DHAVE_RECV=1",
-    "-DHAVE_SELECT=1",
-    "-DHAVE_SEND=1",
-    "-DHAVE_SETJMP_H=1",
-    "-DHAVE_SETLOCALE=1",
-    "-DHAVE_SETRLIMIT=1",
-    "-DHAVE_SETSOCKOPT=1",
-    "-DHAVE_SGTTY_H=1",
-    "-DHAVE_SIGACTION=1",
-    "-DHAVE_SIGINTERRUPT=1",
-    "-DHAVE_SIGNAL=1",
-    "-DHAVE_SIGNAL_H=1",
-    "-DHAVE_SIGSETJMP=1",
-    "-DHAVE_SIG_ATOMIC_T=1",
-    "-DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID=1",
-    "-DHAVE_SOCKET=1",
-    "-DHAVE_SOCKETPAIR=1",
-    "-DHAVE_STDBOOL_H=1",
-    "-DHAVE_STDINT_H=1",
-    "-DHAVE_STDIO_H=1",
-    "-DHAVE_STDLIB_H=1",
-    "-DHAVE_STRCASECMP=1",
-    "-DHAVE_STRDUP=1",
-    "-DHAVE_STRERROR_R=1",
-    "-DHAVE_STRINGS_H=1",
-    "-DHAVE_STRING_H=1",
-    "-DHAVE_STRNCASECMP=1",
-    "-DHAVE_STRSTR=1",
-    "-DHAVE_STRTOK_R=1",
-    "-DHAVE_STRTOLL=1",
-    "-DHAVE_STRUCT_SOCKADDR_STORAGE=1",
-    "-DHAVE_STRUCT_TIMEVAL=1",
-    "-DHAVE_SYS_IOCTL_H=1",
-    "-DHAVE_SYS_PARAM_H=1",
-    "-DHAVE_SYS_POLL_H=1",
-    "-DHAVE_SYS_RESOURCE_H=1",
-    "-DHAVE_SYS_SELECT_H=1",
-    "-DHAVE_SYS_SOCKET_H=1",
-    "-DHAVE_SYS_STAT_H=1",
-    "-DHAVE_SYS_TIME_H=1",
-    "-DHAVE_SYS_TYPES_H=1",
-    "-DHAVE_SYS_UIO_H=1",
-    "-DHAVE_SYS_UN_H=1",
-    "-DHAVE_SYS_WAIT_H=1",
-    "-DHAVE_SYS_XATTR_H=1",
-    "-DHAVE_TERMIOS_H=1",
-    "-DHAVE_TERMIO_H=1",
-    "-DHAVE_TIME_H=1",
-    "-DHAVE_UNISTD_H=1",
-    "-DHAVE_UTIME=1",
-    "-DHAVE_UTIMES=1",
-    "-DHAVE_UTIME_H=1",
-    "-DHAVE_VARIADIC_MACROS_C99=1",
-    "-DHAVE_VARIADIC_MACROS_GCC=1",
-    "-DHAVE_WRITABLE_ARGV=1",
-    "-DHAVE_WRITEV=1",
-    "-DRECV_TYPE_ARG1=int",
-    "-DRECV_TYPE_ARG2=void*",
-    "-DRECV_TYPE_ARG3=size_t",
-    "-DRECV_TYPE_ARG4=int",
-    "-DRECV_TYPE_RETV=ssize_t",
-    "-DRETSIGTYPE=void",
-    "-DSELECT_QUAL_ARG5=",
-    "-DSELECT_TYPE_ARG1=int",
-    "-DSELECT_TYPE_ARG234=fd_set*",
-    "-DSELECT_TYPE_RETV=int",
-    "-DSEND_QUAL_ARG2=const",
-    "-DSEND_TYPE_ARG1=int",
-    "-DSEND_TYPE_ARG2=void*",
-    "-DSEND_TYPE_ARG3=size_t",
-    "-DSEND_TYPE_ARG4=int",
-    "-DSEND_TYPE_RETV=ssize_t",
-    "-DSIZEOF_CURL_OFF_T=8",
-    "-DSIZEOF_INT=4",
-    "-DSIZEOF_LONG=8",
-    "-DSIZEOF_OFF_T=8",
-    "-DSIZEOF_SHORT=2",
-    "-DSIZEOF_SIZE_T=8",
-    "-DSIZEOF_TIME_T=8",
-    "-DSTDC_HEADERS=1",
-    "-DSTRERROR_R_TYPE_ARG3=size_t",
-    "-DTIME_WITH_SYS_TIME=1",
-    "-DUSE_THREADS_POSIX=1",
-    "-DUSE_UNIX_SOCKETS=1",
-
-    # Extra defines needed by curl
-    "-DBUILDING_LIBCURL",
-    "-DCURL_HIDDEN_SYMBOLS",
-]
-
-LINUX_CURL_COPTS = [
-    "-DHAVE_LINUX_TCP_H=1",
-    "-DHAVE_MSG_NOSIGNAL=1",
-]
-
-CURL_COPTS = select({
-    "//:windows": [
-        # Disable everything else except HTTP protocol.
-        "/DHTTP_ONLY=1",
-        "/DCURL_STATICLIB",
-        "/DWIN32",
-        "/DBUILDING_LIBCURL",
-        "/DUSE_WIN32_IDN",
-        "/DWANT_IDN_PROTOTYPES",
-        "/DUSE_IPV6",
-        "/DUSE_WINDOWS_SSPI",
-        "/DUSE_SCHANNEL",
-    ],
-    "//:osx": BASE_CURL_COPTS,
-    "//conditions:default": BASE_CURL_COPTS + LINUX_CURL_COPTS,
-})
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/extra_deps.bzl b/ext/opentelemetry-cpp-1.21.0/bazel/extra_deps.bzl
deleted file mode 100644
index f68bc0f19..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/extra_deps.bzl
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Load prometheus C++ dependencies.
-
-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
-load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories")
-load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
-
-def opentelemetry_extra_deps():
-    prometheus_cpp_repositories()
-    bazel_skylib_workspace()
-    rules_foreign_cc_dependencies()
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/nlohmann_json.BUILD b/ext/opentelemetry-cpp-1.21.0/bazel/nlohmann_json.BUILD
deleted file mode 100644
index df45444c0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/nlohmann_json.BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-licenses(["notice"])  # 3-Clause BSD
-
-exports_files(["LICENSE.MIT"])
-
-cc_library(
-    name = "json",
-    hdrs = glob([
-        "include/**/*.hpp",
-    ]),
-    includes = ["include"],
-    visibility = ["//visibility:public"],
-    alwayslink = 1,
-)
-
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/opentelemetry_proto.BUILD b/ext/opentelemetry-cpp-1.21.0/bazel/opentelemetry_proto.BUILD
deleted file mode 100644
index 88cc56fdf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/opentelemetry_proto.BUILD
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
-
-proto_library(
-    name = "common_proto",
-    srcs = [
-        "opentelemetry/proto/common/v1/common.proto",
-    ],
-)
-
-cc_proto_library(
-    name = "common_proto_cc",
-    deps = [":common_proto"],
-)
-
-proto_library(
-    name = "resource_proto",
-    srcs = [
-        "opentelemetry/proto/resource/v1/resource.proto",
-    ],
-    deps = [
-        ":common_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "resource_proto_cc",
-    deps = [":resource_proto"],
-)
-
-proto_library(
-    name = "trace_proto",
-    srcs = [
-        "opentelemetry/proto/trace/v1/trace.proto",
-    ],
-    deps = [
-        ":common_proto",
-        ":resource_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "trace_proto_cc",
-    deps = [":trace_proto"],
-)
-
-proto_library(
-    name = "trace_service_proto",
-    srcs = [
-        "opentelemetry/proto/collector/trace/v1/trace_service.proto",
-    ],
-    deps = [
-        ":trace_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "trace_service_proto_cc",
-    deps = [":trace_service_proto"],
-)
-
-cc_grpc_library(
-    name = "trace_service_grpc_cc",
-    srcs = [":trace_service_proto"],
-    generate_mocks = True,
-    grpc_only = True,
-    deps = [":trace_service_proto_cc"],
-)
-
-proto_library(
-    name = "logs_proto",
-    srcs = [
-        "opentelemetry/proto/logs/v1/logs.proto",
-    ],
-    deps = [
-        ":common_proto",
-        ":resource_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "logs_proto_cc",
-    deps = [":logs_proto"],
-)
-
-proto_library(
-    name = "logs_service_proto",
-    srcs = [
-        "opentelemetry/proto/collector/logs/v1/logs_service.proto",
-    ],
-    deps = [
-        ":logs_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "logs_service_proto_cc",
-    deps = [":logs_service_proto"],
-)
-
-cc_grpc_library(
-    name = "logs_service_grpc_cc",
-    srcs = [":logs_service_proto"],
-    generate_mocks = True,
-    grpc_only = True,
-    deps = [":logs_service_proto_cc"],
-)
-
-proto_library(
-    name = "metrics_proto",
-    srcs = [
-        "opentelemetry/proto/metrics/v1/metrics.proto",
-    ],
-    deps = [
-        ":common_proto",
-        ":resource_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "metrics_proto_cc",
-    deps = [":metrics_proto"],
-)
-
-proto_library(
-    name = "metrics_service_proto",
-    srcs = [
-        "opentelemetry/proto/collector/metrics/v1/metrics_service.proto",
-    ],
-    deps = [
-        ":metrics_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "metrics_service_proto_cc",
-    deps = [":metrics_service_proto"],
-)
-
-cc_grpc_library(
-    name = "metrics_service_grpc_cc",
-    srcs = [":metrics_service_proto"],
-    generate_mocks = True,
-    grpc_only = True,
-    deps = [":metrics_service_proto_cc"],
-)
-
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/otel_cc_benchmark.bzl b/ext/opentelemetry-cpp-1.21.0/bazel/otel_cc_benchmark.bzl
deleted file mode 100644
index cb181f83c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/otel_cc_benchmark.bzl
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-def otel_cc_benchmark(name, srcs, deps, tags = [""]):
-    """
-    Creates targets for the benchmark and related targets.
-
-    Example:
-
-      otel_cc_benchmark(
-          name = "foo_benchmark",
-          srcs = ["foo_benchmark.cc"],
-          deps = ["//bar"],
-      )
-
-    Creates:
-
-      :foo_benchmark           (the benchmark binary)
-      :foo_benchmark_result    (results from running the benchmark)
-      :foo_benchmark_smoketest (a fast test that runs a single iteration)
-    """
-
-    # This is the benchmark as a binary, it can be run manually, and is used
-    # to generate the _result below.
-    native.cc_binary(
-        name = name,
-        srcs = srcs,
-        deps = deps + ["@com_github_google_benchmark//:benchmark"],
-        tags = tags + ["manual"],
-        defines = ["BAZEL_BUILD"],
-    )
-
-    # The result of running the benchmark, captured into a text file.
-    native.genrule(
-        name = name + "_result",
-        outs = [name + "_result.json"],
-        tools = [":" + name],
-        tags = tags + ["benchmark_result", "manual"],
-        testonly = True,
-        cmd = "$(location :" + name + (") --benchmark_format=json --benchmark_color=false --benchmark_min_time=.1s &> $@"),
-    )
-
-    # This is run as part of "bazel test ..." to smoke-test benchmarks. It's
-    # meant to complete quickly rather than get accurate results.
-    native.cc_test(
-        name = name + "_smoketest",
-        srcs = srcs,
-        deps = deps + ["@com_github_google_benchmark//:benchmark"],
-        args = ["--benchmark_min_time=1x"],
-        tags = tags + ["benchmark"],
-        defines = ["BAZEL_BUILD"],
-    )
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/repository.bzl b/ext/opentelemetry-cpp-1.21.0/bazel/repository.bzl
deleted file mode 100644
index 065633170..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/repository.bzl
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-
-#
-# MAINTAINER
-#
-# This file is used for the Bazel build.
-#
-# When changing (add, upgrade, remove) dependencies
-# please update:
-# - the CMake build, see file
-#   <root>/third_party_release
-# - git submodule, see command
-#   git submodule status
-#
-
-def opentelemetry_cpp_deps():
-    """Loads dependencies need to compile the opentelemetry-cpp library."""
-
-    # Google Benchmark library.
-    # Only needed for benchmarks, not to build the OpenTelemetry library.
-    maybe(
-        http_archive,
-        name = "com_github_google_benchmark",
-        sha256 = "6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce",
-        strip_prefix = "benchmark-1.8.3",
-        urls = [
-            "https://github.com/google/benchmark/archive/v1.8.3.tar.gz",
-        ],
-    )
-
-    # GoogleTest framework.
-    # Only needed for tests, not to build the OpenTelemetry library.
-    maybe(
-        http_archive,
-        name = "com_google_googletest",
-        sha256 = "8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7",
-        strip_prefix = "googletest-1.14.0",
-        urls = [
-            "https://github.com/google/googletest/archive/v1.14.0.tar.gz",
-        ],
-    )
-
-    # Load abseil dependency(optional)
-    maybe(
-        http_archive,
-        name = "com_google_absl",
-        sha256 = "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc",
-        strip_prefix = "abseil-cpp-20240116.2",
-        urls = [
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20240116.2.tar.gz",
-        ],
-    )
-
-    # gRPC transitively depends on apple_support and rules_apple at older
-    # versions. Bazel 7.x requires newer versions of these rules. By loading
-    # them before grpc, these newer versions are preferrred.
-    maybe(
-        http_archive,
-        name = "build_bazel_apple_support",
-        sha256 = "c4bb2b7367c484382300aee75be598b92f847896fb31bbd22f3a2346adf66a80",
-        url = "https://github.com/bazelbuild/apple_support/releases/download/1.15.1/apple_support.1.15.1.tar.gz",
-    )
-
-    maybe(
-        http_archive,
-        name = "build_bazel_rules_apple",
-        sha256 = "b4df908ec14868369021182ab191dbd1f40830c9b300650d5dc389e0b9266c8d",
-        url = "https://github.com/bazelbuild/rules_apple/releases/download/3.5.1/rules_apple.3.5.1.tar.gz",
-    )
-
-    # Load gRPC dependency
-    maybe(
-        http_archive,
-        name = "com_github_grpc_grpc",
-        sha256 = "f40bde4ce2f31760f65dc49a2f50876f59077026494e67dccf23992548b1b04f",
-        strip_prefix = "grpc-1.62.0",
-        urls = [
-            "https://github.com/grpc/grpc/archive/refs/tags/v1.62.0.tar.gz",
-        ],
-    )
-
-    # OTLP Protocol definition
-    maybe(
-        http_archive,
-        name = "com_github_opentelemetry_proto",
-        build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
-        sha256 = "92682778affe8d00cd36f68308b49295db34fce379bef0a781c50837eccbc3c0",
-        strip_prefix = "opentelemetry-proto-1.6.0",
-        urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.6.0.tar.gz",
-        ],
-    )
-
-    # JSON library
-    maybe(
-        http_archive,
-        name = "github_nlohmann_json",
-        build_file = "@io_opentelemetry_cpp//bazel:nlohmann_json.BUILD",
-        sha256 = "b8cb0ef2dd7f57f18933997c9934bb1fa962594f701cd5a8d3c2c80541559372",
-        urls = [
-            "https://github.com/nlohmann/json/releases/download/v3.12.0/include.zip",
-        ],
-    )
-
-    # C++ Prometheus Client library.
-    maybe(
-        http_archive,
-        name = "com_github_jupp0r_prometheus_cpp",
-        sha256 = "ac6e958405a29fbbea9db70b00fa3c420e16ad32e1baf941ab233ba031dd72ee",
-        strip_prefix = "prometheus-cpp-1.3.0",
-        urls = [
-            "https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.3.0.tar.gz",
-        ],
-    )
-
-    # bazel platforms
-    maybe(
-        http_archive,
-        name = "platforms",
-        sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
-        ],
-    )
-
-    # libcurl (optional)
-    maybe(
-        http_archive,
-        name = "curl",
-        build_file = "@io_opentelemetry_cpp//bazel:curl.BUILD",
-        sha256 = "816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f1a9e427",
-        strip_prefix = "curl-8.4.0",
-        urls = [
-            "https://curl.haxx.se/download/curl-8.4.0.tar.gz",
-            "https://github.com/curl/curl/releases/download/curl-8_4_0/curl-8.4.0.tar.gz",
-        ],
-    )
-
-    # rules foreign cc
-    maybe(
-        http_archive,
-        name = "rules_foreign_cc",
-        sha256 = "69023642d5781c68911beda769f91fcbc8ca48711db935a75da7f6536b65047f",
-        strip_prefix = "rules_foreign_cc-0.6.0",
-        url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.6.0.tar.gz",
-    )
-
-    # bazel skylib
-    maybe(
-        http_archive,
-        name = "bazel_skylib",
-        sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
-        urls = [
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
-        ],
-    )
-
-    # Opentracing
-    maybe(
-        http_archive,
-        name = "com_github_opentracing",
-        sha256 = "5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3",
-        strip_prefix = "opentracing-cpp-1.6.0",
-        urls = [
-            "https://github.com/opentracing/opentracing-cpp/archive/refs/tags/v1.6.0.tar.gz",
-        ],
-    )
-
-    # Zlib (optional)
-    maybe(
-        http_archive,
-        name = "zlib",
-        build_file = "@io_opentelemetry_cpp//bazel:zlib.BUILD",
-        sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98",
-        strip_prefix = "zlib-1.2.13",
-        urls = [
-            "https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.xz",
-            "https://zlib.net/zlib-1.2.13.tar.xz",
-        ],
-    )
diff --git a/ext/opentelemetry-cpp-1.21.0/bazel/zlib.BUILD b/ext/opentelemetry-cpp-1.21.0/bazel/zlib.BUILD
deleted file mode 100644
index 676de88f2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/bazel/zlib.BUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Builds ZLIB from a distribution.
-# Copied from https://github.com/protocolbuffers/protobuf/blob/master/third_party/zlib.BUILD
-
-licenses(["notice"])  # BSD/MIT-like license (for zlib)
-
-exports_files(["zlib.BUILD"])
-
-_ZLIB_HEADERS = [
-    "crc32.h",
-    "deflate.h",
-    "gzguts.h",
-    "inffast.h",
-    "inffixed.h",
-    "inflate.h",
-    "inftrees.h",
-    "trees.h",
-    "zconf.h",
-    "zlib.h",
-    "zutil.h",
-]
-
-_ZLIB_PREFIXED_HEADERS = ["zlib/include/" + hdr for hdr in _ZLIB_HEADERS]
-
-# In order to limit the damage from the `includes` propagation
-# via `:zlib`, copy the public headers to a subdirectory and
-# expose those.
-genrule(
-    name = "copy_public_headers",
-    srcs = _ZLIB_HEADERS,
-    outs = _ZLIB_PREFIXED_HEADERS,
-    cmd_bash = "cp $(SRCS) $(@D)/zlib/include/",
-    cmd_bat = " && ".join(
-        ["@copy /Y $(location %s) $(@D)\\zlib\\include\\  >NUL" %
-         s for s in _ZLIB_HEADERS],
-    ),
-)
-
-cc_library(
-    name = "zlib",
-    srcs = [
-        "adler32.c",
-        "compress.c",
-        "crc32.c",
-        "deflate.c",
-        "gzclose.c",
-        "gzlib.c",
-        "gzread.c",
-        "gzwrite.c",
-        "infback.c",
-        "inffast.c",
-        "inflate.c",
-        "inftrees.c",
-        "trees.c",
-        "uncompr.c",
-        "zutil.c",
-        # Include the un-prefixed headers in srcs to work
-        # around the fact that zlib isn't consistent in its
-        # choice of <> or "" delimiter when including itself.
-    ] + _ZLIB_HEADERS,
-    hdrs = _ZLIB_PREFIXED_HEADERS,
-    copts = select({
-        "@platforms//os:windows": [],
-        "//conditions:default": [
-            "-Wno-deprecated-non-prototype",
-            "-Wno-unused-variable",
-            "-Wno-implicit-function-declaration",
-        ],
-    }),
-    includes = ["zlib/include/"],
-    visibility = ["//visibility:public"],
-)
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/buildscripts/pre-commit b/ext/opentelemetry-cpp-1.21.0/buildscripts/pre-commit
deleted file mode 100755
index c21f363b5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/buildscripts/pre-commit
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -eo pipefail
-
-if [[ ! -w "$(pwd)/sdk/src/version/version.cc"  && ! -w "$(pwd)/api/include/opentelemetry/version.h" ]]; then
-    echo "Error: Version file(s) are not writable. Check permissions and try again."
-    exit 1
-fi
-
-# format: "v<MAJOR>.<MINOR>.<PATCH>-<PRERELEASE>+<BUILDMETADATA>-<NUMBER_OF_NEW_COMMITS>-g<LAST_COMMIT_HASH>"
-semver_regex="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-([0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*))?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?-([0-9]+)-g([0-9|a-z]+)$"
-git_tag=$(git describe --tags --long 2>/dev/null) || true
-if [[ ! -z $git_tag ]] && [[ $git_tag =~ $semver_regex ]]; then
-    major="${BASH_REMATCH[1]}"
-    minor="${BASH_REMATCH[2]}"
-    patch="${BASH_REMATCH[3]}"
-    pre_release="${BASH_REMATCH[5]}" #optional
-    build_metadata="${BASH_REMATCH[7]}" #optional
-    count_new_commits="${BASH_REMATCH[9]}"
-    latest_commit_hash="${BASH_REMATCH[10]}"
-    if [[ -z ${major} ]] || [[ -z ${minor} ]] || [[ -z ${patch} ]] || [[ -z ${count_new_commits} ]] || [[ -z ${latest_commit_hash} ]]; then
-        echo "Error: Incorrect tag format received. Exiting.."
-        exit 1
-    fi
-else
-    major=0 && minor=0 && patch=0 && pre_release="" && build_metadata="" && count_new_commits=0
-    latest_commit_hash="$(git rev-parse --short HEAD)"
-fi
-: ${pre_release:="NONE"} # use default string if not defined
-: ${build_metadata:="NONE"} # use default string if not defined
-latest_commit_hash=$(git rev-parse ${latest_commit_hash}) # get full hash from short
-
-if [[ -z ${latest_commit_hash} ]]; then
-    echo "Error: Incorrect short hash received. Exiting.."
-    exit 1
-fi
-
-short_version="${major}.${minor}.${patch}"
-full_version="${short_version}-${pre_release}-${build_metadata}"
-
-# Update api version.h
-sed -i "/^\#define OPENTELEMETRY_VERSION /c\#define OPENTELEMETRY_VERSION \"${short_version}\""  "$(pwd)/api/include/opentelemetry/version.h"
-sed -i "/^\#define OPENTELEMETRY_VERSION_MAJOR /c\#define OPENTELEMETRY_VERSION_MAJOR ${major}"  "$(pwd)/api/include/opentelemetry/version.h"
-sed -i "/^\#define OPENTELEMETRY_VERSION_MINOR /c\#define OPENTELEMETRY_VERSION_MINOR ${minor}"  "$(pwd)/api/include/opentelemetry/version.h"
-sed -i "/^\#define OPENTELEMETRY_VERSION_PATCH /c\#define OPENTELEMETRY_VERSION_PATCH ${patch}"  "$(pwd)/api/include/opentelemetry/version.h"
-git add "$(pwd)/api/include/opentelemetry/version.h"
-
-# Update sdk version.cc
-cat > "$(pwd)/sdk/src/version/version.cc" <<END
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Please DONOT touch this file.
-// Any changes done here would be overwritten by pre-commit git hook
-
-#include "opentelemetry/sdk/version/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace version
-{
-const int major_version    = ${major};
-const int minor_version    = ${minor};
-const int patch_version    = ${patch};
-const char *pre_release    = "${pre_release}";
-const char *build_metadata = "${build_metadata}";
-const char *short_version  = "${short_version}";
-const char *full_version   = "${full_version}";
-const char *build_date     = "$(date -u)";
-}  // namespace version
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-END
-git add "$(pwd)/sdk/src/version/version.cc"
-
-# Update documentation version
-sed -i "/^release =/crelease = \"${short_version}\""  "$(pwd)/docs/public/conf.py"
-git add "$(pwd)/docs/public/conf.py"
diff --git a/ext/opentelemetry-cpp-1.21.0/buildscripts/pre-merge-commit b/ext/opentelemetry-cpp-1.21.0/buildscripts/pre-merge-commit
deleted file mode 120000
index f1342a283..000000000
--- a/ext/opentelemetry-cpp-1.21.0/buildscripts/pre-merge-commit
+++ /dev/null
@@ -1 +0,0 @@
-./pre-commit
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/buildscripts/pre_release.sh b/ext/opentelemetry-cpp-1.21.0/buildscripts/pre_release.sh
deleted file mode 100755
index cf281152d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/buildscripts/pre_release.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-usage() { echo "Usage: $0 -t <tag>" 1>&2; exit 1; }
-
-while getopts ":t:" o; do
-    case "${o}" in
-        t)
-            tag=${OPTARG}
-            ;;
-        *)
-            usage
-            ;;
-    esac
-done
-if [ ! -z "${t}" ]; then
-    usage
-fi
-
-#validate tag
-semver_regex="^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?$"
-if [[ ${tag} =~ ${semver_regex} ]]; then
-    echo "${tag} is valid semver tag"
-else
-    echo "Error: ${tag} is not a valid semver tag. Exiting"
-    exit 1
-fi
-
-#ensure tag doesn't exits
-if [[ $(git tag --list ${tag}) ]]; then
-   echo "Error: Tag ${tag} already exists. Exiting"
-   exit 1
-fi
-
-if ! git diff --quiet; then \
-	echo "Error: Working tree is not clean, can't proceed with the release process\n"
-	git status
-	git diff
-	exit 1
-fi
-
-# check changelog exists
-changelog_file="./CHANGELOG.md"
-if [ ! -f $changelog_file ]; then
-    echo "Error: $changelog_file doesn't exist. Ensure that you are running this script from repo root directory "
-    exit 1
-fi
-
-if ! grep -q "^\#\# \[Unreleased\]$" "$changelog_file" ; then
-    echo "Error: $changelog_file doesn't contain Unreleased information. Please update the file with changes and run this script again."
-    exit 1
-fi
-
-git checkout -b pre_release_${tag} main
-if [ $? -ne 0 ]; then
-    echo "Error: Cannot create release branch. Ensure you have sufficient permissions to repo and try again."
-    exit 1
-fi
-
-# update CHANGELOG.md
-date=$(date '+%Y-%m-%d')
-sed  -i "/\#\# \[Unreleased\]/a\\ \n\#\# \[${tag}\] ${date}"  $changelog_file
-if [ $? -ne 0 ]; then
-    echo "Error: Cannot update CHANGELOG.md file. Update it manually, create the ${tag} and push changes to upstream"
-    exit 1
-fi
-
-git add CHANGELOG.md
-git commit -m "Prepare for releasing ${tag}"
-
-echo "Now validate the changes using git diff main, create the ${tag} and push changes to upstream"
-echo
diff --git a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/generate.sh b/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/generate.sh
deleted file mode 100755
index 703e4bccb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/generate.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# Adapted from:
-# opentelemetry-java/buildscripts/semantic-convention/generate.sh
-# for opentelemetry-cpp
-#
-set -e
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOT_DIR="${SCRIPT_DIR}/../../"
-
-# freeze the spec & generator tools versions to make the generation reproducible
-
-# repository: https://github.com/open-telemetry/semantic-conventions
-SEMCONV_VERSION=1.34.0
-
-# repository: https://github.com/open-telemetry/weaver
-WEAVER_VERSION=0.15.0
-
-SEMCONV_VERSION_TAG=v$SEMCONV_VERSION
-WEAVER_VERSION_TAG=v$WEAVER_VERSION
-SCHEMA_URL="https://opentelemetry.io/schemas/${SEMCONV_VERSION}"
-INCUBATING_DIR=incubating
-
-cd ${SCRIPT_DIR}
-
-rm -rf semantic-conventions || true
-mkdir semantic-conventions
-cd semantic-conventions
-
-git init
-git remote add origin https://github.com/open-telemetry/semantic-conventions.git
-git fetch origin "$SEMCONV_VERSION_TAG"
-git reset --hard FETCH_HEAD
-cd ${SCRIPT_DIR}
-
-# SELINUX
-# https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label
-
-USE_MOUNT_OPTION=""
-
-if [ -x "$(command -v getenforce)" ]; then
-  SELINUXSTATUS=$(getenforce);
-  if [ "${SELINUXSTATUS}" == "Enforcing" ]; then
-    echo "Detected SELINUX"
-    USE_MOUNT_OPTION=":z"
-  fi;
-fi
-
-# DOCKER
-# ======
-#
-# docker is a root container
-#
-# MY_UID=$(id -u)
-# MY_GID=$(id -g)
-# docker --user ${MY_UID}:${MY_GID}
-#
-# PODMAN
-# ======
-#
-# podman is a rootless container
-# docker is an alias to podman
-#
-# docker --user 0:0
-
-MY_UID=$(id -u)
-MY_GID=$(id -g)
-
-if [ -x "$(command -v docker)" ]; then
-  PODMANSTATUS=$(docker -v | grep -c podman);
-  if [ "${PODMANSTATUS}" -ge "1" ]; then
-    echo "Detected PODMAN"
-    # podman is a rootless container.
-    # Execute the docker image as root,
-    # to avoid creating files as weaver:weaver in the container,
-    # so files end up created as the local user:group outside the container.
-    MY_UID="0"
-    MY_GID="0"
-    # Possible alternate solution: --userns=keep-id
-  fi;
-fi
-
-generate() {
-  TARGET=$1
-  OUTPUT=$2
-  FILTER=$3
-  docker run --rm --user ${MY_UID}:${MY_GID} \
-    -v ${SCRIPT_DIR}/semantic-conventions/model:/source${USE_MOUNT_OPTION} \
-    -v ${SCRIPT_DIR}/templates:/templates${USE_MOUNT_OPTION} \
-    -v ${ROOT_DIR}/tmpgen/:/output${USE_MOUNT_OPTION} \
-    otel/weaver:$WEAVER_VERSION_TAG \
-    registry \
-    generate \
-    --registry=/source \
-    --templates=/templates \
-    ${TARGET} \
-    /output/${TARGET} \
-    --param output=${OUTPUT} \
-    --param filter=${FILTER} \
-    --param schema_url=${SCHEMA_URL}
-}
-
-# stable attributes and metrics
-mkdir -p ${ROOT_DIR}/tmpgen
-generate "./" "./" "stable"
-
-mkdir -p ${ROOT_DIR}/tmpgen/${INCUBATING_DIR}
-generate "./" "./${INCUBATING_DIR}/" "any"
-
-cp -r ${ROOT_DIR}/tmpgen/*.h \
-      ${ROOT_DIR}/api/include/opentelemetry/semconv/
-
-cp -r ${ROOT_DIR}/tmpgen/${INCUBATING_DIR}/*.h \
-      ${ROOT_DIR}/api/include/opentelemetry/semconv/incubating
-
diff --git a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/schema_url-h.j2 b/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/schema_url-h.j2
deleted file mode 100644
index 3b80927ed..000000000
--- a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/schema_url-h.j2
+++ /dev/null
@@ -1,48 +0,0 @@
-{#
-  Copyright The OpenTelemetry Authors
-  SPDX-License-Identifier: Apache-2.0
-
-  This file is:
-  - a Jinja template,
-  - used to generate semantic conventions,
-  - using weaver.
-
-  For doc on the template syntax:
-  https://jinja.palletsprojects.com/en/3.0.x/
-
-  For doc on the semantic conventions:
-  https://github.com/open-telemetry/semantic-conventions
-
-  For doc on weaver:
-  https://github.com/open-telemetry/weaver
-#}
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/schema_url-h.j2
- */
-{# ========================================================================== #}
-
-{{ template.set_file_name("schema_url.h") }}
-
-{# ========================================================================== #}
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-/**
- * The URL of the OpenTelemetry schema for these keys and values.
- */
-static constexpr const char *kSchemaUrl = {{ params.schema_url | print_member_value }};
-}
-OPENTELEMETRY_END_NAMESPACE
-
diff --git a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2 b/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
deleted file mode 100644
index 5e5b4eac7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
+++ /dev/null
@@ -1,132 +0,0 @@
-{#
-  Copyright The OpenTelemetry Authors
-  SPDX-License-Identifier: Apache-2.0
-
-  This file is:
-  - a Jinja template,
-  - used to generate semantic conventions,
-  - using weaver.
-
-  For doc on the template syntax:
-  https://jinja.palletsprojects.com/en/3.0.x/
-
-  For doc on the semantic conventions:
-  https://github.com/open-telemetry/semantic-conventions
-
-  For doc on weaver:
-  https://github.com/open-telemetry/weaver
-#}
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-{# ========================================================================== #}
-{#
-    DESIGN NOTES:
-    - Use the debug flag to dump the semantic convention data
-      in the generated output, to inspect it.
-#}
-{# ========================================================================== #}
-
-{% set debug = false %}
-
-{% set file_name = ctx.output + (ctx.root_namespace | snake_case) ~ "_attributes.h" %}
-{{ template.set_file_name(file_name) }}
-
-{% set attributes = ctx.attributes | list %}
-{% set enum_attributes = attributes | select("enum") | rejectattr("name", "in", ctx.excluded_attributes) | list %}
-
-{% macro attribute_namespace(ctx) %}
-{{ ctx.root_namespace | snake_case }}
-{% endmacro %}
-
-{% macro attribute_name(attribute) %}
-k{{ attribute.name | pascal_case }}
-{% endmacro %}
-
-{% macro attribute_type(attribute) %}
-{{ attribute.type | enum_type | map_text("cpp_types") }}
-{% endmacro %}
-
-{% macro enum_namespace_name(attribute) %}
-{{ attribute.name | pascal_case ~ "Values"}}
-{% endmacro %}
-
-{% macro enum_name(member) %}
-k{{ member.id | pascal_case }}
-{% endmacro %}
-
-{% set cpp_attribute_namespace = attribute_namespace(ctx) %}
-
-{# ========================================================================== #}
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace {{ cpp_attribute_namespace -}}
-{
-
-{% for attribute in attributes %}
-    {% if debug %}
-// DEBUG: {{ attribute }}
-    {% endif %}
-    {% set cpp_attr_name = attribute_name(attribute) %}
-    {% set excluded = attribute.name in ctx.excluded_attributes %}
-    {% if excluded %}
-#if 0
-// Excluded attribute:
-    {% endif %}
-    {% if attribute is deprecated %}
-{{ [attribute.brief, "\n", "@deprecated", attribute.deprecated, "\n", attribute.note] | comment(ident=2) }}
-OPENTELEMETRY_DEPRECATED
-    {% else %}
-{{ [attribute.brief, "\n", attribute.note] | comment(ident=2) }}
-    {% endif %}
-static constexpr const char *{{cpp_attr_name}} = "{{attribute.name}}";
-    {% if excluded %}
-#endif
-    {% endif %}
-
-{% endfor %}
-
-{% for attribute in enum_attributes %}
-    {% set class_name = attribute.name | pascal_case ~ "Values" %}
-    {% set cpp_enum_name = enum_namespace_name(attribute) %}
-    {% set cpp_enum_type = attribute_type(attribute) %}
-    {% if debug %}
-// DEBUG: {{ attribute }}
-    {% endif %}
-namespace {{cpp_enum_name -}}
-{
-    {% for member in attribute.type.members %}
-        {% set member_name = enum_name(member) %}
-        {% if debug %}
-// DEBUG: {{ member }}
-        {% endif %}
-        {% if member is deprecated %}
-{{ [member.brief, "\n", "@deprecated", member.deprecated] | comment(ident=2) }}
-OPENTELEMETRY_DEPRECATED
-        {% else %}
-{{ member.brief | comment(ident=2) }}
-        {% endif %}
-static constexpr {{ cpp_enum_type }} {{ member_name }} = {{ member.value | print_member_value }};
-
-    {% endfor %}
-}
-
-{% endfor %}
-
-}
-}
-OPENTELEMETRY_END_NAMESPACE
-
diff --git a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2 b/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
deleted file mode 100644
index 93cd65a6e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
+++ /dev/null
@@ -1,228 +0,0 @@
-{#
-  Copyright The OpenTelemetry Authors
-  SPDX-License-Identifier: Apache-2.0
-
-  This file is:
-  - a Jinja template,
-  - used to generate semantic conventions,
-  - using weaver.
-
-  For doc on the template syntax:
-  https://jinja.palletsprojects.com/en/3.0.x/
-
-  For doc on the semantic conventions:
-  https://github.com/open-telemetry/semantic-conventions
-
-  For doc on weaver:
-  https://github.com/open-telemetry/weaver
-#}
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-{# ========================================================================== #}
-{#
-    DESIGN NOTES:
-    - Use the debug flag to dump the semantic convention data
-      in the generated output, to inspect it.
-    - Some instruments are not supported in the SDK.
-      For these, we do not generate the code.
-#}
-{# ========================================================================== #}
-
-{% set debug = false %}
-
-{% set file_name = ctx.output + (ctx.root_namespace | snake_case) ~ "_metrics.h" %}
-{{ template.set_file_name(file_name) }}
-
-{% set metrics = ctx.metrics | list %}
-
-{% macro metric_namespace(ctx) %}
-{{ ctx.root_namespace | snake_case }}
-{% endmacro %}
-
-{% macro func_metric_name(metric) %}
-{{ metric.id | pascal_case }}
-{% endmacro %}
-
-{% macro var_metric_name(metric) %}
-k{{ metric.id | pascal_case }}
-{% endmacro %}
-
-{% macro descr_metric_name(metric) %}
-descr{{ metric.id | pascal_case }}
-{% endmacro %}
-
-{% macro unit_metric_name(metric) %}
-unit{{ metric.id | pascal_case }}
-{% endmacro %}
-
-{% macro sync_instrument_min_abi_version(metric) %}
-{{ metric.instrument | map_text("cpp_sync_min_abi_version") | trim }}
-{% endmacro %}
-
-{% macro sync_instrument_int64_type(metric) %}
-{{ metric.instrument | map_text("cpp_sync_instrument_to_int64_type") | trim }}
-{% endmacro %}
-
-{% macro sync_instrument_double_type(metric) %}
-{{ metric.instrument | map_text("cpp_sync_instrument_to_double_type") | trim }}
-{% endmacro %}
-
-{% macro sync_instrument_int64_factory(metric) %}
-{{ metric.instrument | map_text("cpp_sync_instrument_to_int64_factory") }}
-{% endmacro %}
-
-{% macro sync_instrument_double_factory(metric) %}
-{{ metric.instrument | map_text("cpp_sync_instrument_to_double_factory") }}
-{% endmacro %}
-
-{% macro async_instrument_min_abi_version(metric) %}
-{{ metric.instrument | map_text("cpp_async_min_abi_version") | trim }}
-{% endmacro %}
-
-{% macro async_instrument_type(metric) %}
-{{ metric.instrument | map_text("cpp_async_instrument_to_type") }}
-{% endmacro %}
-
-{% macro async_instrument_int64_factory(metric) %}
-{{ metric.instrument | map_text("cpp_async_instrument_to_int64_factory") }}
-{% endmacro %}
-
-{% macro async_instrument_double_factory(metric) %}
-{{ metric.instrument | map_text("cpp_async_instrument_to_double_factory") }}
-{% endmacro %}
-
-{% set cpp_metric_namespace = metric_namespace(ctx) %}
-
-{# ========================================================================== #}
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace {{ cpp_metric_namespace -}}
-{
-
-{% for metric in ctx.metrics %}
-    {% if debug %}
-// DEBUG: {{ metric }}
-    {% endif %}
-    {% set f_metric_name = func_metric_name(metric) %}
-    {% set v_metric_name = var_metric_name(metric) %}
-    {% set descr = descr_metric_name(metric) %}
-    {% set unit = unit_metric_name(metric) %}
-    {% set sync_min_abi_version = (sync_instrument_min_abi_version(metric)) %}
-    {% set async_min_abi_version = (async_instrument_min_abi_version(metric)) %}
-    {% set sync_int64_type = sync_instrument_int64_type(metric) %}
-    {% set sync_double_type = sync_instrument_double_type(metric) %}
-    {% set async_type = async_instrument_type(metric) %}
-    {% set sync_int64_factory = sync_instrument_int64_factory(metric) %}
-    {% set sync_double_factory = sync_instrument_double_factory(metric) %}
-    {% set async_int64_factory = async_instrument_int64_factory(metric) %}
-    {% set async_double_factory = async_instrument_double_factory(metric) %}
-    {% set excluded = metric.id in ctx.excluded_attributes %}
-    {% if excluded %}
-#if 0
-// Excluded metric:
-    {% endif %}
-    {% if metric is deprecated %}
-{{ [metric.brief, "\n", "@deprecated", metric.deprecated, "\n", metric.note, "\n", metric.instrument] | comment(ident=2) }}
-OPENTELEMETRY_DEPRECATED
-    {% else %}
-{{ [metric.brief, "\n", metric.note, "\n", metric.instrument] | comment(ident=2) }}
-    {% endif %}
-static constexpr const char *{{v_metric_name}} = "{{metric.metric_name}}";
-    {% if metric is deprecated %}
-OPENTELEMETRY_DEPRECATED
-    {% endif %}
-static constexpr const char *{{descr}} = "{{metric.brief}}";
-    {% if metric is deprecated %}
-OPENTELEMETRY_DEPRECATED
-    {% endif %}
-static constexpr const char *{{unit}} = "{{metric.unit}}";
-
-    {% if sync_min_abi_version|trim != "0" %}
-        {% if sync_min_abi_version|trim != "1" %}
-#if OPENTELEMETRY_ABI_VERSION_NO >= {{sync_min_abi_version}}
-        {% endif %}
-        {% if metric is deprecated %}
-OPENTELEMETRY_DEPRECATED
-        {% endif %}
-static inline nostd::unique_ptr<{{sync_int64_type-}}>
-CreateSyncInt64{{f_metric_name-}}(metrics::Meter *meter)
-{
-  return meter->{{sync_int64_factory}}(
-    {{v_metric_name}},
-    {{descr}},
-    {{unit}});
-}
-
-        {% if metric is deprecated %}
-OPENTELEMETRY_DEPRECATED
-        {% endif %}
-static inline nostd::unique_ptr<{{sync_double_type-}}>
-CreateSyncDouble{{f_metric_name-}}(metrics::Meter *meter)
-{
-  return meter->{{sync_double_factory}}(
-    {{v_metric_name}},
-    {{descr}},
-    {{unit}});
-}
-        {% if sync_min_abi_version|trim != "1" %}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-        {% endif %}
-    {% endif %}
-
-    {% if async_min_abi_version|trim != "0" %}
-        {% if async_min_abi_version|trim != "1" %}
-#if OPENTELEMETRY_ABI_VERSION_NO >= {{async_min_abi_version}}
-        {% endif %}
-        {% if metric is deprecated %}
-OPENTELEMETRY_DEPRECATED
-        {% endif %}
-static inline nostd::shared_ptr<{{async_type-}}>
-CreateAsyncInt64{{f_metric_name-}}(metrics::Meter *meter)
-{
-  return meter->{{async_int64_factory}}(
-    {{v_metric_name}},
-    {{descr}},
-    {{unit}});
-}
-
-        {% if metric is deprecated %}
-OPENTELEMETRY_DEPRECATED
-        {% endif %}
-static inline nostd::shared_ptr<{{async_type-}}>
-CreateAsyncDouble{{f_metric_name-}}(metrics::Meter *meter)
-{
-  return meter->{{async_double_factory}}(
-    {{v_metric_name}},
-    {{descr}},
-    {{unit}});
-}
-        {% if async_min_abi_version|trim != "1" %}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-        {% endif %}
-    {% endif %}
-
-    {% if excluded %}
-#endif /* 0 */
-    {% endif %}
-
-{% endfor %}
-
-}
-}
-OPENTELEMETRY_END_NAMESPACE
-
diff --git a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/weaver.yaml b/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/weaver.yaml
deleted file mode 100644
index 135c73e70..000000000
--- a/ext/opentelemetry-cpp-1.21.0/buildscripts/semantic-convention/templates/registry/weaver.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# This file is the main file for weaver,
-# used to generate semantic conventions,
-# for opentelemetry-cpp.
-#
-# For doc on weaver:
-# https://github.com/open-telemetry/weaver
-#
-# For doc on the semantic conventions:
-# https://github.com/open-telemetry/semantic-conventions
-#
-
-params:
-  # excluded namespaces will not be generated
-  excluded_namespaces: [ios, aspnetcore, signalr, android, dotnet, jvm, kestrel, v8js, veightjs, go, nodejs]
-
-  # excluded attributes will be commented out in the generated code
-  # this behavior is fully controlled by jinja templates
-  excluded_attributes: ["messaging.client_id"]
-
-  stable_package_name: opentelemetry.semconv
-
-  # "https://opentelemetry.io/schemas/<SEMCONV_VERSION_TAG>"
-  # this is provided from the command line
-  schema_url: ""
-
-templates:
-  - pattern: schema_url-h.j2
-    filter: .
-    application_mode: single
-  - pattern: semantic_attributes-h.j2
-    filter: >
-      semconv_grouped_attributes({
-        "exclude_root_namespace": $excluded_namespaces,
-        "stable_only": if $filter == "stable" then true else false end,
-      })
-      | map({
-          root_namespace: .root_namespace,
-          attributes: .attributes,
-          output: $output,
-          stable_package_name: $stable_package_name + ".attributes",
-          filter: $filter,
-          excluded_attributes: $excluded_attributes[]
-      })
-    application_mode: each
-  - pattern: semantic_metrics-h.j2
-    filter: >
-      semconv_grouped_metrics({
-        "exclude_root_namespace": $excluded_namespaces,
-        "stable_only": if $filter == "stable" then true else false end,
-      })
-      | map({
-        root_namespace: .root_namespace,
-        metrics: .metrics,
-        output: $output,
-        stable_package_name: $stable_package_name + ".metrics",
-        filter: $filter
-      })
-    application_mode: each
-
-text_maps:
-  cpp_types:
-    int: int
-    double: double
-    boolean: bool
-    string: const char *
-    string[]: const char *[]
-    template[string]: const char *
-    template[string[]]: const char *[]
-
-  # Minimum ABI_VERSION to support the feature:
-  # 0 - not supported
-  # 1 - supported in all versions
-  # 2 - supported in ABI_VERSION >= 2
-  cpp_sync_min_abi_version:
-    counter: 1
-    histogram: 1
-    updowncounter: 1
-    gauge: 2
-
-  cpp_sync_instrument_to_int64_type:
-    counter: metrics::Counter<uint64_t>
-    histogram: metrics::Histogram<uint64_t>
-    updowncounter: metrics::UpDownCounter<int64_t>
-    gauge: metrics::Gauge<int64_t>
-
-  cpp_sync_instrument_to_double_type:
-    counter: metrics::Counter<double>
-    histogram: metrics::Histogram<double>
-    updowncounter: metrics::UpDownCounter<double>
-    gauge: metrics::Gauge<double>
-
-  cpp_sync_instrument_to_int64_factory:
-    counter: CreateUInt64Counter
-    histogram: CreateUInt64Histogram
-    updowncounter: CreateInt64UpDownCounter
-    gauge: CreateInt64Gauge
-
-  cpp_sync_instrument_to_double_factory:
-    counter: CreateDoubleCounter
-    histogram: CreateDoubleHistogram
-    updowncounter: CreateDoubleUpDownCounter
-    gauge: CreateDoubleGauge
-
-  # Minimum ABI_VERSION to support the feature:
-  # 0 - not supported
-  # 1 - supported in all versions
-  # 2 - supported in ABI_VERSION >= 2
-  cpp_async_min_abi_version:
-    counter: 1
-    histogram: 0
-    updowncounter: 1
-    gauge: 1
-
-  cpp_async_instrument_to_type:
-    counter: metrics::ObservableInstrument
-    histogram: UNSUPPORTED
-    updowncounter: metrics::ObservableInstrument
-    gauge: metrics::ObservableInstrument
-
-  cpp_async_instrument_to_int64_factory:
-    counter: CreateInt64ObservableCounter
-    histogram: UNSUPPORTED
-    updowncounter: CreateInt64ObservableUpDownCounter
-    gauge: CreateInt64ObservableGauge
-
-  cpp_async_instrument_to_double_factory:
-    counter: CreateDoubleObservableCounter
-    histogram: UNSUPPORTED
-    updowncounter: CreateDoubleObservableUpDownCounter
-    gauge: CreateDoubleObservableGauge
-
-
-comment_formats:
-  cpp:
-    format: html
-    header: "/**"
-    prefix: "  "
-    footer: " */"
-    indent_type: Space
-    trim: true
-    remove_trailing_dots: false
-    enforce_trailing_dots: false
-    old_style_paragraph: true
-    omit_closing_li: false
-    inline_code_snippet: "@code {{code}} @endcode"
-    block_code_snippet: "@verbatim {{code}} @endverbatim"
-default_comment_format: cpp
-
-whitespace_control:
-  trim_blocks: true
-  lstrip_blocks: true
-  keep_trailing_newline: true
-
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/README.md b/ext/opentelemetry-cpp-1.21.0/ci/README.md
deleted file mode 100644
index 39d9a19ac..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Building and running tests as a developer
-
-CI tests can be run on docker by invoking the script `./ci/run_docker.sh
-./ci/do_ci.sh {TARGET}`or inside
-[devcontainer](../CONTRIBUTING.md#devcontainer-setup-for-project)
-by invoking the script
-`./ci/do_ci.sh {TARGET}` where the targets are:
-
-* `cmake.test`: build cmake targets and run tests.
-* `cmake.maintainer.test`: build with cmake and test, in maintainer mode.
-* `cmake.legacy.test`: build cmake targets with gcc 4.8 and run tests.
-* `cmake.c++20.test`: build cmake targets with the C++20 standard and run tests.
-* `cmake.test_example_plugin`: build and test an example OpenTelemetry plugin.
-* `cmake.exporter.otprotocol.test`: build and test the otprotocol exporter
-* `bazel.test`: build bazel targets and run tests.
-* `bazel.legacy.test`: build bazel targets and run tests for the targets meant
-  to work with older compilers.
-* `bazel.noexcept`: build bazel targets and run tests with exceptions disabled.
-* `bazel.nortti`: build bazel targets and run tests with runtime type
-  identification disabled.
-* `bazel.asan`: build bazel targets and run tests with AddressSanitizer.
-* `bazel.tsan`: build bazel targets and run tests with ThreadSanitizer.
-* `bazel.valgrind`: build bazel targets and run tests under the valgrind memory
-  checker.
-* `benchmark`: run all benchmarks.
-* `format`: use `tools/format.sh` to enforce text formatting.
-* `third_party.tags`: store third_party release tags.
-* `code.coverage`: build cmake targets with CXX option `--coverage` and run
-  tests.
-
-Additionally, `./ci/run_docker.sh` can be invoked with no arguments to get a
-docker shell where tests can be run manually.
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/do_ci.ps1 b/ext/opentelemetry-cpp-1.21.0/ci/do_ci.ps1
deleted file mode 100644
index 87aa73b6f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/do_ci.ps1
+++ /dev/null
@@ -1,562 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-$ErrorActionPreference = "Stop";
-trap { $host.SetShouldExit(1) }
-
-$action = $args[0]
-
-$nproc = (Get-ComputerInfo).CsNumberOfLogicalProcessors
-
-$SRC_DIR = (Get-Item -Path ".\").FullName
-
-# Workaround https://github.com/bazelbuild/bazel/issues/18683
-$BAZEL_STARTUP_OPTIONS = "--output_base=C:\O"
-$BAZEL_OPTIONS = "--copt=-DENABLE_ASYNC_EXPORT --compilation_mode=dbg"
-$BAZEL_TEST_OPTIONS = "$BAZEL_OPTIONS --test_output=errors"
-
-if (!(test-path build)) {
-  mkdir build
-}
-$BUILD_DIR = Join-Path "$SRC_DIR" "build"
-
-if (!(test-path install_test)) {
-  mkdir install_test
-}
-$INSTALL_TEST_DIR = Join-Path "$SRC_DIR" "install_test"
-
-if (!(test-path plugin)) {
-  mkdir plugin
-}
-$PLUGIN_DIR = Join-Path "$SRC_DIR" "plugin"
-
-$VCPKG_DIR = Join-Path "$SRC_DIR" "tools/vcpkg"
-
-$Env:CTEST_OUTPUT_ON_FAILURE = "1"
-
-switch ($action) {
-  "bazel.build" {
-    bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS --action_env=VCPKG_DIR=$VCPKG_DIR --deleted_packages=opentracing-shim -- //...
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.dll.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      -DOPENTELEMETRY_BUILD_DLL=1 `
-     "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    $env:PATH = "$BUILD_DIR\ext\src\dll\Debug;$env:PATH"
-    examples\simple\Debug\example_simple.exe
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    examples\metrics_simple\Debug\metrics_ostream_example.exe
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    examples\logs_simple\Debug\example_logs_simple.exe
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.dll.cxx20.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DCMAKE_CXX_STANDARD=20 `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      -DOPENTELEMETRY_BUILD_DLL=1 `
-     "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    $env:PATH = "$BUILD_DIR\ext\src\dll\Debug;$env:PATH"
-    examples\simple\Debug\example_simple.exe
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    examples\metrics_simple\Debug\metrics_ostream_example.exe
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    examples\logs_simple\Debug\example_logs_simple.exe
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.maintainer.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DWITH_OTLP_GRPC=ON `
-      -DWITH_OTLP_HTTP=ON `
-      -DWITH_OTLP_RETRY_PREVIEW=ON `
-      -DOTELCPP_MAINTAINER_MODE=ON `
-      -DWITH_NO_DEPRECATED_CODE=ON `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.maintainer.cxx20.stl.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DWITH_STL=CXX20 `
-      -DCMAKE_CXX_STANDARD=20 `
-      -DWITH_OTLP_GRPC=ON `
-      -DWITH_OTLP_HTTP=ON `
-      -DWITH_OTLP_RETRY_PREVIEW=ON `
-      -DOTELCPP_MAINTAINER_MODE=ON `
-      -DWITH_NO_DEPRECATED_CODE=ON `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.maintainer.abiv2.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DWITH_OTLP_GRPC=ON `
-      -DWITH_OTLP_HTTP=ON `
-      -DWITH_OTLP_RETRY_PREVIEW=ON `
-      -DOTELCPP_MAINTAINER_MODE=ON `
-      -DWITH_NO_DEPRECATED_CODE=ON `
-      -DWITH_ABI_VERSION_1=OFF `
-      -DWITH_ABI_VERSION_2=ON `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.with_async_export.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      -DWITH_ASYNC_EXPORT_PREVIEW=ON `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.exporter.otprotocol.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      -DWITH_OTLP_GRPC=ON `
-      -DWITH_OTLP_HTTP=ON `
-      -DWITH_OTLP_RETRY_PREVIEW=ON `
-      -DWITH_OTPROTCOL=ON `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.exporter.otprotocol.dll.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      -DOPENTELEMETRY_BUILD_DLL=1 `
-      -DWITH_OTPROTCOL=ON `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.exporter.otprotocol.with_async_export.test" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      -DWITH_ASYNC_EXPORT_PREVIEW=ON `
-      -DWITH_OTPROTCOL=ON `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.build_example_plugin" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      -DWITH_ASYNC_EXPORT_PREVIEW=ON `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cp examples/plugin/plugin/Debug/example_plugin.dll ${PLUGIN_DIR}
-  }
-  "cmake.test_example_plugin" {
-    cd "$BUILD_DIR"
-    cmake $SRC_DIR `
-      -DVCPKG_TARGET_TRIPLET=x64-windows `
-      -DWITH_ASYNC_EXPORT_PREVIEW=ON `
-      "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-    cp examples/plugin/plugin/Debug/example_plugin.dll ${PLUGIN_DIR}
-    $config = New-TemporaryFile
-    examples/plugin/load/Debug/load_plugin_example.exe ${PLUGIN_DIR}/example_plugin.dll $config
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-  }
-  "cmake.install.test" {
-    Remove-Item -Recurse -Force "$BUILD_DIR\*"
-    Remove-Item -Recurse -Force "$INSTALL_TEST_DIR\*"
-    cd "$BUILD_DIR"
-
-    if (Test-Path Env:\CXX_STANDARD) {
-        $CXX_STANDARD = [int](Get-Item Env:\CXX_STANDARD).Value
-    } else {
-        $CXX_STANDARD = 14
-    }
-    if (-not $CXX_STANDARD) {
-        $CXX_STANDARD = 14
-    }
-    Write-Host "Using CXX_STANDARD: $CXX_STANDARD"
-      
-    $CMAKE_OPTIONS = @(
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD",
-    "-DCMAKE_CXX_STANDARD_REQUIRED=ON",
-    "-DCMAKE_CXX_EXTENSIONS=OFF",
-    "-DVCPKG_TARGET_TRIPLET=x64-windows",
-    "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    )
-
-    cmake $SRC_DIR `
-      $CMAKE_OPTIONS `
-      "-DCMAKE_INSTALL_PREFIX=$INSTALL_TEST_DIR" `
-      -DWITH_ABI_VERSION_1=OFF `
-      -DWITH_ABI_VERSION_2=ON `
-      -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON `
-      -DWITH_METRICS_EXEMPLAR_PREVIEW=ON `
-      -DWITH_ASYNC_EXPORT_PREVIEW=ON `
-      -DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON `
-      -DWITH_OTLP_RETRY_PREVIEW=ON `
-      -DWITH_OTLP_GRPC=ON `
-      -DWITH_OTLP_HTTP=ON `
-      -DWITH_OTLP_FILE=ON `
-      -DWITH_OTLP_HTTP_COMPRESSION=ON `
-      -DWITH_HTTP_CLIENT_CURL=ON `
-      -DWITH_PROMETHEUS=ON `
-      -DWITH_ZIPKIN=ON `
-      -DWITH_ELASTICSEARCH=ON `
-      -DWITH_ETW=ON `
-      -DWITH_EXAMPLES=ON `
-      -DWITH_EXAMPLES_HTTP=ON `
-      -DBUILD_W3CTRACECONTEXT_TEST=ON `
-      -DOPENTELEMETRY_INSTALL=ON
-
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    cmake --build . --target install
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    $env:PATH = "$INSTALL_TEST_DIR\bin;$env:PATH"
-
-    $CMAKE_OPTIONS_STRING = $CMAKE_OPTIONS -join " "
-   
-    $EXPECTED_COMPONENTS = @(
-      "api",
-      "sdk",
-      "ext_common",
-      "ext_http_curl",
-      "exporters_in_memory",
-      "exporters_ostream",
-      "exporters_otlp_common",
-      "exporters_otlp_file",
-      "exporters_otlp_grpc",
-      "exporters_otlp_http",
-      "exporters_prometheus",
-      "exporters_elasticsearch",
-      "exporters_zipkin",
-      "exporters_etw"
-    )
-    $EXPECTED_COMPONENTS_STRING = $EXPECTED_COMPONENTS -join ";"
-
-    mkdir "$BUILD_DIR\install_test"
-    cd "$BUILD_DIR\install_test"
-
-    cmake $CMAKE_OPTIONS `
-          "-DCMAKE_PREFIX_PATH=$INSTALL_TEST_DIR" `
-          "-DINSTALL_TEST_CMAKE_OPTIONS=$CMAKE_OPTIONS_STRING" `
-          "-DINSTALL_TEST_COMPONENTS=$EXPECTED_COMPONENTS_STRING" `
-          -S "$SRC_DIR\install\test\cmake"
-          
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    ctest -C Debug --output-on-failure
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    exit 0
-  }
-  "cmake.dll.install.test" {
-    cd "$BUILD_DIR"
-    Remove-Item -Recurse -Force "$BUILD_DIR\*"
-    Remove-Item -Recurse -Force "$INSTALL_TEST_DIR\*"
-
-    $CMAKE_OPTIONS = @(
-    "-DCMAKE_CXX_STANDARD=17",
-    "-DVCPKG_TARGET_TRIPLET=x64-windows",
-    "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
-    )
-
-    cmake $SRC_DIR `
-      $CMAKE_OPTIONS `
-      "-DCMAKE_INSTALL_PREFIX=$INSTALL_TEST_DIR" `
-      -DOPENTELEMETRY_BUILD_DLL=1 `
-      -DWITH_ABI_VERSION_1=ON `
-      -DWITH_ABI_VERSION_2=OFF `
-      -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON `
-      -DWITH_METRICS_EXEMPLAR_PREVIEW=ON `
-      -DWITH_ASYNC_EXPORT_PREVIEW=ON `
-      -DWITH_ETW=ON `
-      -DOPENTELEMETRY_INSTALL=ON `
-      -DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=OFF `
-      -DWITH_OTLP_RETRY_PREVIEW=OFF `
-      -DWITH_OTLP_GRPC=OFF `
-      -DWITH_OTLP_HTTP=OFF `
-      -DWITH_OTLP_FILE=OFF `
-      -DWITH_OTLP_HTTP_COMPRESSION=OFF `
-      -DWITH_HTTP_CLIENT_CURL=OFF `
-      -DWITH_PROMETHEUS=OFF `
-      -DWITH_ZIPKIN=OFF `
-      -DWITH_ELASTICSEARCH=OFF `
-      -DWITH_EXAMPLES=OFF `
-
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    cmake --build . -j $nproc
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    ctest -C Debug
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    cmake --build . --target install
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    $env:PATH = "$INSTALL_TEST_DIR\bin;$env:PATH"
-
-    echo "$env:PATH" 
-
-    $CMAKE_OPTIONS_STRING = $CMAKE_OPTIONS -join " "
-
-    $EXPECTED_COMPONENTS = @(
-      "api",
-      "sdk",
-      "ext_common",
-      "exporters_in_memory",
-      "exporters_ostream",
-      "exporters_etw",
-      "ext_dll" 
-    )
-    $EXPECTED_COMPONENTS_STRING = $EXPECTED_COMPONENTS -join ";"
-
-    mkdir "$BUILD_DIR\install_test"
-    cd "$BUILD_DIR\install_test"
-
-    cmake $CMAKE_OPTIONS `
-          "-DCMAKE_PREFIX_PATH=$INSTALL_TEST_DIR" `
-          "-DINSTALL_TEST_CMAKE_OPTIONS=$CMAKE_OPTIONS_STRING" `
-          "-DINSTALL_TEST_COMPONENTS=$EXPECTED_COMPONENTS_STRING" `
-          -S "$SRC_DIR\install\test\cmake"
-          
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    ctest -C Debug --output-on-failure
-    $exit = $LASTEXITCODE
-    if ($exit -ne 0) {
-      exit $exit
-    }
-
-    exit 0
-  }
-  default {
-    echo "unknown action: $action"
-    exit 1
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/do_ci.sh b/ext/opentelemetry-cpp-1.21.0/ci/do_ci.sh
deleted file mode 100755
index 10b4f9821..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/do_ci.sh
+++ /dev/null
@@ -1,688 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-function install_prometheus_cpp_client
-{
-  pushd third_party/prometheus-cpp
-  git submodule update --recursive --init
-  [[ -d _build ]] && rm -rf ./_build
-  mkdir _build && cd _build
-  cmake .. -DBUILD_SHARED_LIBS=ON -DUSE_THIRDPARTY_LIBRARIES=ON
-  make -j $(nproc)
-  sudo make install
-  popd
-}
-
-function run_benchmarks
-{
-  docker run -d --rm -it -p 4317:4317 -p 4318:4318 -v \
-    $(pwd)/examples/otlp:/cfg otel/opentelemetry-collector:0.109.0 \
-    --config=/cfg/opentelemetry-collector-config/config.dev.yaml
-
-  [ -z "${BENCHMARK_DIR}" ] && export BENCHMARK_DIR=$HOME/benchmark
-  mkdir -p $BENCHMARK_DIR
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC -c opt -- \
-    $(bazel query 'attr("tags", "benchmark_result", ...)')
-  echo ""
-  echo "Benchmark results in $BENCHMARK_DIR:"
-  (
-    cd bazel-bin
-    find . -name \*_result.json -exec bash -c \
-      'echo "$@" && mkdir -p "$BENCHMARK_DIR/$(dirname "$@")" && \
-       cp "$@" "$BENCHMARK_DIR/$@" && chmod +w "$BENCHMARK_DIR/$@"' _ {} \;
-  )
-
-  # collect benchmark results into one array
-  pushd $BENCHMARK_DIR
-  components=(api sdk exporters)
-  for component in "${components[@]}"
-  do
-    out=$component-benchmark_result.json
-    find ./$component -type f -name "*_result.json" -exec cat {} \; > $component_tmp_bench.json
-    # Print each result in CI logs, so it can be inspected.
-    echo "BENCHMARK result (begin)"
-    cat $component_tmp_bench.json
-    echo "BENCHMARK result (end)"
-    cat $component_tmp_bench.json | docker run -i --rm itchyny/gojq:0.12.6 -s \
-      '.[0].benchmarks = ([.[].benchmarks] | add) |
-      if .[0].benchmarks == null then null else .[0] end' > $BENCHMARK_DIR/$out
-  done
-
-  mv *benchmark_result.json ${SRC_DIR}
-  popd
-  docker kill $(docker ps -q)
-}
-
-[ -z "${SRC_DIR}" ] && export SRC_DIR="`pwd`"
-[ -z "${BUILD_DIR}" ] && export BUILD_DIR=$HOME/build
-mkdir -p "${BUILD_DIR}"
-[ -z "${PLUGIN_DIR}" ] && export PLUGIN_DIR=$HOME/plugin
-mkdir -p "${PLUGIN_DIR}"
-[ -z "${INSTALL_TEST_DIR}" ] && export INSTALL_TEST_DIR=$HOME/install_test
-mkdir -p "${INSTALL_TEST_DIR}"
-
-MAKE_COMMAND="make -k -j \$(nproc)"
-
-echo "make command: ${MAKE_COMMAND}"
-
-BAZEL_OPTIONS_DEFAULT="--copt=-DENABLE_METRICS_EXEMPLAR_PREVIEW"
-BAZEL_OPTIONS="$BAZEL_OPTIONS_DEFAULT"
-
-BAZEL_TEST_OPTIONS="$BAZEL_OPTIONS --test_output=errors"
-
-BAZEL_OPTIONS_ASYNC="$BAZEL_OPTIONS --copt=-DENABLE_ASYNC_EXPORT"
-BAZEL_TEST_OPTIONS_ASYNC="$BAZEL_OPTIONS_ASYNC --test_output=errors"
-
-# https://github.com/bazelbuild/bazel/issues/4341
-BAZEL_MACOS_OPTIONS="$BAZEL_OPTIONS_ASYNC --features=-supports_dynamic_linker"
-BAZEL_MACOS_TEST_OPTIONS="$BAZEL_MACOS_OPTIONS --test_output=errors"
-
-BAZEL_STARTUP_OPTIONS="--output_user_root=$HOME/.cache/bazel"
-
-if [[ "${BUILD_TYPE}" =~ ^(Debug|Release|RelWithDebInfo|MinSizeRel)$ ]]; then
-  CMAKE_OPTIONS=(-DCMAKE_BUILD_TYPE=${BUILD_TYPE})
-else
-  CMAKE_OPTIONS=(-DCMAKE_BUILD_TYPE=Debug)
-fi
-
-if [ -n "${CXX_STANDARD}" ]; then
-  CMAKE_OPTIONS+=("-DCMAKE_CXX_STANDARD=${CXX_STANDARD}")
-else
-  CMAKE_OPTIONS+=("-DCMAKE_CXX_STANDARD=14")
-fi
-
-CMAKE_OPTIONS+=("-DCMAKE_CXX_STANDARD_REQUIRED=ON")
-CMAKE_OPTIONS+=("-DCMAKE_CXX_EXTENSIONS=OFF")
-
-if [ -n "$CMAKE_TOOLCHAIN_FILE" ]; then
-  echo "CMAKE_TOOLCHAIN_FILE is set to: $CMAKE_TOOLCHAIN_FILE"
-  CMAKE_OPTIONS+=("-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE")
-fi
-
-echo "CMAKE_OPTIONS:" "${CMAKE_OPTIONS[@]}"
-
-export CTEST_OUTPUT_ON_FAILURE=1
-
-if [[ "$1" == "cmake.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_PROMETHEUS=ON \
-        -DWITH_ZIPKIN=ON \
-        -DWITH_ELASTICSEARCH=ON \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        "${SRC_DIR}"
-  make -j $(nproc)
-  make test
-  exit 0
-elif [[ "$1" == "cmake.maintainer.sync.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_PROMETHEUS=ON \
-        -DWITH_EXAMPLES=ON \
-        -DWITH_EXAMPLES_HTTP=ON \
-        -DWITH_ZIPKIN=ON \
-        -DBUILD_W3CTRACECONTEXT_TEST=ON \
-        -DWITH_ELASTICSEARCH=ON \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=OFF \
-        -DOTELCPP_MAINTAINER_MODE=ON \
-        -DWITH_NO_DEPRECATED_CODE=ON \
-        -DWITH_OTLP_HTTP_COMPRESSION=ON \
-        -DWITH_OTLP_RETRY_PREVIEW=ON \
-        -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.maintainer.async.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_PROMETHEUS=ON \
-        -DWITH_EXAMPLES=ON \
-        -DWITH_EXAMPLES_HTTP=ON \
-        -DWITH_ZIPKIN=ON \
-        -DBUILD_W3CTRACECONTEXT_TEST=ON \
-        -DWITH_ELASTICSEARCH=ON \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DOTELCPP_MAINTAINER_MODE=ON \
-        -DWITH_NO_DEPRECATED_CODE=ON \
-        -DWITH_OTLP_HTTP_COMPRESSION=ON \
-        -DWITH_OTLP_RETRY_PREVIEW=ON \
-        -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.maintainer.cpp11.async.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_CXX_STANDARD=11 \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_PROMETHEUS=ON \
-        -DWITH_EXAMPLES=ON \
-        -DWITH_EXAMPLES_HTTP=ON \
-        -DWITH_ZIPKIN=ON \
-        -DBUILD_W3CTRACECONTEXT_TEST=ON \
-        -DWITH_ELASTICSEARCH=ON \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DOTELCPP_MAINTAINER_MODE=ON \
-        -DWITH_NO_DEPRECATED_CODE=ON \
-        -DWITH_OTLP_HTTP_COMPRESSION=ON \
-        -DWITH_OTLP_RETRY_PREVIEW=ON \
-        -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-        "${SRC_DIR}"
-  make -k -j $(nproc)
-  make test
-  exit 0
-elif [[ "$1" == "cmake.maintainer.abiv2.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_PROMETHEUS=ON \
-        -DWITH_EXAMPLES=ON \
-        -DWITH_EXAMPLES_HTTP=ON \
-        -DWITH_ZIPKIN=ON \
-        -DBUILD_W3CTRACECONTEXT_TEST=ON \
-        -DWITH_ELASTICSEARCH=ON \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=OFF \
-        -DOTELCPP_MAINTAINER_MODE=ON \
-        -DWITH_NO_DEPRECATED_CODE=ON \
-        -DWITH_ABI_VERSION_1=OFF \
-        -DWITH_ABI_VERSION_2=ON \
-        -DWITH_OTLP_HTTP_COMPRESSION=ON \
-        -DWITH_OTLP_RETRY_PREVIEW=ON \
-        -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.with_async_export.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_PROMETHEUS=ON \
-        -DWITH_ZIPKIN=ON \
-        -DWITH_ELASTICSEARCH=ON \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        "${SRC_DIR}"
-  make -j $(nproc)
-  make test
-  exit 0
-elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}" \
-        -DCMAKE_CXX_FLAGS="-Werror -Wno-error=redundant-move $CXXFLAGS" \
-        -DWITH_OPENTRACING=ON \
-        "${SRC_DIR}"
-  make -j $(nproc)
-  make test
-  exit 0
-elif [[ "$1" == "cmake.opentracing_shim.install.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  rm -rf ${INSTALL_TEST_DIR}/*
-  cmake "${CMAKE_OPTIONS[@]}" \
-        -DCMAKE_CXX_FLAGS="-Werror -Wno-error=redundant-move $CXXFLAGS" \
-        -DWITH_OPENTRACING=ON \
-        -DCMAKE_INSTALL_PREFIX=${INSTALL_TEST_DIR} \
-        "${SRC_DIR}"
-  make -j $(nproc)
-  make test
-  make install
-  export LD_LIBRARY_PATH="${INSTALL_TEST_DIR}/lib:$LD_LIBRARY_PATH"
-  CMAKE_OPTIONS_STRING=$(IFS=" "; echo "${CMAKE_OPTIONS[*]}")
-  EXPECTED_COMPONENTS=(
-    "api"
-    "sdk"
-    "ext_common"
-    "exporters_in_memory"
-    "exporters_ostream"
-    "shims_opentracing"
-  )
-  EXPECTED_COMPONENTS_STRING=$(IFS=\;; echo "${EXPECTED_COMPONENTS[*]}")
-  mkdir -p "${BUILD_DIR}/install_test"
-  cd "${BUILD_DIR}/install_test"
-  cmake "${CMAKE_OPTIONS[@]}" \
-        "-DCMAKE_PREFIX_PATH=${INSTALL_TEST_DIR}" \
-        "-DINSTALL_TEST_CMAKE_OPTIONS=${CMAKE_OPTIONS_STRING}" \
-        "-DINSTALL_TEST_COMPONENTS=${EXPECTED_COMPONENTS_STRING}" \
-        -S "${SRC_DIR}/install/test/cmake"
-  ctest --output-on-failure
-  exit 0
-elif [[ "$1" == "cmake.c++20.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DWITH_STL=CXX20 \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.c++23.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DWITH_STL=CXX23 \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.c++14.stl.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DWITH_STL=CXX14 \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.c++17.stl.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DWITH_STL=CXX17 \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.c++20.stl.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DWITH_STL=CXX20 \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.c++23.stl.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DWITH_STL=CXX23 \
-        "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  make test
-  exit 0
-elif [[ "$1" == "cmake.legacy.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  export BUILD_ROOT="${BUILD_DIR}"
-  ${SRC_DIR}/tools/build-benchmark.sh
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        "${SRC_DIR}"
-  make -j $(nproc)
-  make test
-  exit 0
-elif [[ "$1" == "cmake.legacy.exporter.otprotocol.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  export BUILD_ROOT="${BUILD_DIR}"
-  ${SRC_DIR}/tools/build-benchmark.sh
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_CXX_STANDARD=11 \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        "${SRC_DIR}"
-  grpc_cpp_plugin=`which grpc_cpp_plugin`
-  proto_make_file="CMakeFiles/opentelemetry_proto.dir/build.make"
-  sed -i "s~gRPC_CPP_PLUGIN_EXECUTABLE-NOTFOUND~$grpc_cpp_plugin~" ${proto_make_file} #fixme
-  make -j $(nproc)
-  cd exporters/otlp && make test
-  exit 0
-elif [[ "$1" == "cmake.exporter.otprotocol.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
-        -DWITH_OTLP_RETRY_PREVIEW=ON \
-        "${SRC_DIR}"
-  grpc_cpp_plugin=`which grpc_cpp_plugin`
-  proto_make_file="CMakeFiles/opentelemetry_proto.dir/build.make"
-  sed -i "s~gRPC_CPP_PLUGIN_EXECUTABLE-NOTFOUND~$grpc_cpp_plugin~" ${proto_make_file} #fixme
-  make -j $(nproc)
-  cd exporters/otlp && make test
-  exit 0
-elif [[ "$1" == "cmake.exporter.otprotocol.shared_libs.with_static_grpc.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DBUILD_SHARED_LIBS=ON \
-        "${SRC_DIR}"
-  grpc_cpp_plugin=`which grpc_cpp_plugin`
-  proto_make_file="CMakeFiles/opentelemetry_proto.dir/build.make"
-  sed -i "s~gRPC_CPP_PLUGIN_EXECUTABLE-NOTFOUND~$grpc_cpp_plugin~" ${proto_make_file} #fixme
-  make -j $(nproc)
-  cd exporters/otlp && make test
-  exit 0
-elif [[ "$1" == "cmake.exporter.otprotocol.with_async_export.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        "${SRC_DIR}"
-  grpc_cpp_plugin=`which grpc_cpp_plugin`
-  proto_make_file="CMakeFiles/opentelemetry_proto.dir/build.make"
-  sed -i "s~gRPC_CPP_PLUGIN_EXECUTABLE-NOTFOUND~$grpc_cpp_plugin~" ${proto_make_file} #fixme
-  make -j $(nproc)
-  cd exporters/otlp && make test
-  exit 0
-elif [[ "$1" == "cmake.w3c.trace-context.build-server" ]]; then
-  echo "Building w3c trace context test server"
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-          -DBUILD_W3CTRACECONTEXT_TEST=ON \
-          -DCMAKE_CXX_STANDARD=${CXX_STANDARD} \
-          "${SRC_DIR}"
-  eval "$MAKE_COMMAND"
-  exit 0
-elif [[ "$1" == "cmake.do_not_install.test" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DOPENTELEMETRY_INSTALL=OFF \
-        "${SRC_DIR}"
-  grpc_cpp_plugin=`which grpc_cpp_plugin`
-  proto_make_file="CMakeFiles/opentelemetry_proto.dir/build.make"
-  sed -i "s~gRPC_CPP_PLUGIN_EXECUTABLE-NOTFOUND~$grpc_cpp_plugin~" ${proto_make_file} #fixme
-  make -j $(nproc)
-  cd exporters/otlp && make test
-  exit 0
-elif [[ "$1" == "cmake.install.test" ]]; then
-  if [[ -n "${BUILD_SHARED_LIBS}" && "${BUILD_SHARED_LIBS}" == "ON" ]]; then
-    CMAKE_OPTIONS+=("-DBUILD_SHARED_LIBS=ON")
-    echo "BUILD_SHARED_LIBS is set to: ON"
-  else
-    CMAKE_OPTIONS+=("-DBUILD_SHARED_LIBS=OFF")
-    echo "BUILD_SHARED_LIBS is set to: OFF"
-  fi
-  CMAKE_OPTIONS+=("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
-
-  cd "${BUILD_DIR}"
-  rm -rf *
-  rm -rf ${INSTALL_TEST_DIR}/*
-
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_INSTALL_PREFIX=${INSTALL_TEST_DIR} \
-        -DWITH_ABI_VERSION_1=OFF \
-        -DWITH_ABI_VERSION_2=ON \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-        -DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
-        -DWITH_OTLP_RETRY_PREVIEW=ON \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_OTLP_HTTP_COMPRESSION=ON \
-        -DWITH_HTTP_CLIENT_CURL=ON \
-        -DWITH_PROMETHEUS=ON \
-        -DWITH_ZIPKIN=ON \
-        -DWITH_ELASTICSEARCH=ON \
-        -DWITH_EXAMPLES=ON \
-        -DWITH_EXAMPLES_HTTP=ON \
-        -DBUILD_W3CTRACECONTEXT_TEST=ON \
-        -DOPENTELEMETRY_INSTALL=ON \
-        "${SRC_DIR}"
-
-  make -j $(nproc)
-  make test
-  make install
-  export LD_LIBRARY_PATH="${INSTALL_TEST_DIR}/lib:$LD_LIBRARY_PATH"
-
-  CMAKE_OPTIONS_STRING=$(IFS=" "; echo "${CMAKE_OPTIONS[*]}")
-
-  EXPECTED_COMPONENTS=(
-    "api"
-    "sdk"
-    "ext_common"
-    "ext_http_curl"
-    "exporters_in_memory"
-    "exporters_ostream"
-    "exporters_otlp_common"
-    "exporters_otlp_file"
-    "exporters_otlp_grpc"
-    "exporters_otlp_http"
-    "exporters_prometheus"
-    "exporters_elasticsearch"
-    "exporters_zipkin"
-  )
-  EXPECTED_COMPONENTS_STRING=$(IFS=\;; echo "${EXPECTED_COMPONENTS[*]}")
-  mkdir -p "${BUILD_DIR}/install_test"
-  cd "${BUILD_DIR}/install_test"
-  cmake  "${CMAKE_OPTIONS[@]}" \
-         "-DCMAKE_PREFIX_PATH=${INSTALL_TEST_DIR}" \
-         "-DINSTALL_TEST_CMAKE_OPTIONS=${CMAKE_OPTIONS_STRING}" \
-         "-DINSTALL_TEST_COMPONENTS=${EXPECTED_COMPONENTS_STRING}" \
-         -S "${SRC_DIR}/install/test/cmake"
-  ctest --output-on-failure
-  exit 0
-elif [[ "$1" == "cmake.fetch_content.test" ]]; then
-  if [[ -n "${BUILD_SHARED_LIBS}" && "${BUILD_SHARED_LIBS}" == "ON" ]]; then
-    CMAKE_OPTIONS+=("-DBUILD_SHARED_LIBS=ON")
-    echo "BUILD_SHARED_LIBS is set to: ON"
-  else
-    CMAKE_OPTIONS+=("-DBUILD_SHARED_LIBS=OFF")
-    echo "BUILD_SHARED_LIBS is set to: OFF"
-  fi
-  CMAKE_OPTIONS+=("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
-
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_INSTALL_PREFIX=${INSTALL_TEST_DIR} \
-        -DWITH_ABI_VERSION_1=OFF \
-        -DWITH_ABI_VERSION_2=ON \
-        -DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-        -DWITH_ASYNC_EXPORT_PREVIEW=ON \
-        -DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-        -DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
-        -DWITH_OTLP_RETRY_PREVIEW=ON \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DWITH_OTLP_FILE=ON \
-        -DWITH_OTLP_HTTP_COMPRESSION=ON \
-        -DWITH_HTTP_CLIENT_CURL=ON \
-        -DWITH_PROMETHEUS=ON \
-        -DWITH_ZIPKIN=ON \
-        -DWITH_ELASTICSEARCH=ON \
-        -DWITH_EXAMPLES=ON \
-        -DWITH_EXAMPLES_HTTP=ON \
-        -DBUILD_W3CTRACECONTEXT_TEST=ON \
-        -DOPENTELEMETRY_INSTALL=OFF \
-        -DOPENTELEMETRY_CPP_SRC_DIR="${SRC_DIR}" \
-        "${SRC_DIR}/install/test/cmake/fetch_content_test"
-  make -j $(nproc)
-  make test
-  exit 0
-
-elif [[ "$1" == "cmake.test_example_plugin" ]]; then
-  # Build the plugin
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cat <<EOF > export.map
-{
-  global:
-    OpenTelemetryMakeFactoryImpl;
-  local: *;
-};
-EOF
-
-  LINKER_FLAGS="\
-    -static-libstdc++ \
-    -static-libgcc \
-    -Wl,--version-script=${PWD}/export.map \
-  "
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        -DCMAKE_EXE_LINKER_FLAGS="$LINKER_FLAGS" \
-        -DCMAKE_SHARED_LINKER_FLAGS="$LINKER_FLAGS" \
-        "${SRC_DIR}"
-  make example_plugin
-  cp examples/plugin/plugin/libexample_plugin.so ${PLUGIN_DIR}
-
-  # Verify we can load the plugin
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS" \
-        "${SRC_DIR}"
-  make load_plugin_example
-  examples/plugin/load/load_plugin_example ${PLUGIN_DIR}/libexample_plugin.so /dev/null
-  exit 0
-elif [[ "$1" == "bazel.no_bzlmod.test" ]]; then
-  bazel $BAZEL_STARTUP_OPTIONS build --enable_bzlmod=false $BAZEL_OPTIONS //...
-  bazel $BAZEL_STARTUP_OPTIONS test --enable_bzlmod=false $BAZEL_TEST_OPTIONS //...
-  exit 0
-elif [[ "$1" == "bazel.test" ]]; then
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS //...
-  bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS //...
-  exit 0
-elif [[ "$1" == "bazel.with_async_export.test" ]]; then
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC //...
-  bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS_ASYNC //...
-  exit 0
-elif [[ "$1" == "bazel.benchmark" ]]; then
-  run_benchmarks
-  exit 0
-elif [[ "$1" == "bazel.macos.test" ]]; then
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_MACOS_OPTIONS -- //...
-  bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_MACOS_TEST_OPTIONS -- //...
-  exit 0
-elif [[ "$1" == "bazel.legacy.test" ]]; then
-  # we uses C++ future and async() function to test the Prometheus Exporter functionality,
-  # that make this test always fail. ignore Prometheus exporter here.
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC -- //... -//exporters/otlp/... -//exporters/prometheus/...
-  bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS_ASYNC -- //... -//exporters/otlp/... -//exporters/prometheus/...
-  exit 0
-elif [[ "$1" == "bazel.noexcept" ]]; then
-  # there are some exceptions and error handling code from the Prometheus Client
-  # as well as Opentracing shim (due to some third party code in its Opentracing dependency)
-  # that make this test always fail. Ignore these packages in the noexcept test here.
-  bazel $BAZEL_STARTUP_OPTIONS build --copt=-fno-exceptions $BAZEL_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//opentracing-shim/...
-  bazel $BAZEL_STARTUP_OPTIONS test --copt=-fno-exceptions $BAZEL_TEST_OPTIONS_ASYNC -- //... -//exporters/prometheus/... -//examples/prometheus/... -//opentracing-shim/...
-  exit 0
-elif [[ "$1" == "bazel.nortti" ]]; then
-  # there are some exceptions and error handling code from the Prometheus Client
-  # that make this test always fail. Ignore these packages in the nortti test here.
-  bazel $BAZEL_STARTUP_OPTIONS build --cxxopt=-fno-rtti $BAZEL_OPTIONS_ASYNC -- //... -//exporters/prometheus/...
-  bazel $BAZEL_STARTUP_OPTIONS test --cxxopt=-fno-rtti $BAZEL_TEST_OPTIONS_ASYNC -- //... -//exporters/prometheus/...
-  exit 0
-elif [[ "$1" == "bazel.asan" ]]; then
-  bazel $BAZEL_STARTUP_OPTIONS test --config=asan $BAZEL_TEST_OPTIONS_ASYNC //...
-  exit 0
-elif [[ "$1" == "bazel.tsan" ]]; then
-# TODO - potential race condition in Civetweb server used by prometheus-cpp during shutdown
-# https://github.com/civetweb/civetweb/issues/861, so removing prometheus from the test
-  bazel $BAZEL_STARTUP_OPTIONS test --config=tsan $BAZEL_TEST_OPTIONS_ASYNC  -- //... -//exporters/prometheus/...
-  exit 0
-elif [[ "$1" == "bazel.valgrind" ]]; then
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC //...
-  bazel $BAZEL_STARTUP_OPTIONS test --run_under="/usr/bin/valgrind --leak-check=full --error-exitcode=1 --errors-for-leak-kinds=definite --suppressions=\"${SRC_DIR}/ci/valgrind-suppressions\"" $BAZEL_TEST_OPTIONS_ASYNC //...
-  exit 0
-elif [[ "$1" == "bazel.e2e" ]]; then
-  cd examples/e2e
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_DEFAULT //...
-  exit 0
-elif [[ "$1" == "benchmark" ]]; then
-  [ -z "${BENCHMARK_DIR}" ] && export BENCHMARK_DIR=$HOME/benchmark
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC -c opt -- \
-    $(bazel query 'attr("tags", "benchmark_result", ...)')
-  echo ""
-  echo "Benchmark results in $BENCHMARK_DIR:"
-  (
-    cd bazel-bin
-    find . -name \*_result.json -exec bash -c \
-      'echo "$@" && mkdir -p "$BENCHMARK_DIR/$(dirname "$@")" && \
-       cp "$@" "$BENCHMARK_DIR/$@" && chmod +w "$BENCHMARK_DIR/$@"' _ {} \;
-  )
-  exit 0
-elif [[ "$1" == "format" ]]; then
-  tools/format.sh
-  CHANGED="$(git ls-files --modified)"
-  if [[ ! -z "$CHANGED" ]]; then
-    echo "The following files have changes:"
-    echo "$CHANGED"
-    git diff
-    exit 1
-  fi
-  exit 0
-elif [[ "$1" == "code.coverage" ]]; then
-  cd "${BUILD_DIR}"
-  rm -rf *
-  cmake "${CMAKE_OPTIONS[@]}"  \
-        -DCMAKE_CXX_FLAGS="-Werror --coverage $CXXFLAGS" \
-        "${SRC_DIR}"
-  make
-  make test
-  lcov --directory $PWD --capture --output-file coverage.info
-  # removing test http server coverage from the total coverage. We don't use this server completely.
-  lcov --remove coverage.info '*/ext/http/server/*'> tmp_coverage.info 2>/dev/null
-  cp tmp_coverage.info coverage.info
-  exit 0
-elif [[ "$1" == "third_party.tags" ]]; then
-  echo "gRPC=v1.49.2" > third_party_release
-  echo "abseil=20240116.1" >> third_party_release
-  git submodule foreach --quiet 'echo "$name=$(git describe --tags HEAD)"' | sed 's:.*/::' >> third_party_release
-  exit 0
-fi
-
-echo "Invalid do_ci.sh target, see ci/README.md for valid targets."
-exit 1
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/docfx.cmd b/ext/opentelemetry-cpp-1.21.0/ci/docfx.cmd
deleted file mode 100644
index a2dd80cab..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/docfx.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-SETLOCAL ENABLEEXTENSIONS
-
-type ci\docfx.json > docfx.json
-type ci\toc.yml > toc.yml
-docfx build docfx.json > docfx.log
-DEL docfx.json 2> NUL
-DEL toc.yml 2> NUL
-@IF NOT %ERRORLEVEL% == 0 (
-  type docfx.log
-  ECHO Error: docfx build failed. 1>&2
-  EXIT /B %ERRORLEVEL%
-)
-@type docfx.log
-@type docfx.log | findstr /C:"Build succeeded."
-@IF NOT %ERRORLEVEL% == 0 (
-  ECHO Error: you have introduced build warnings. 1>&2
-  EXIT /B %ERRORLEVEL%
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/docfx.json b/ext/opentelemetry-cpp-1.21.0/ci/docfx.json
deleted file mode 100644
index cbf1b3027..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/docfx.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "build": {
-    "content": [
-      {
-        "files": [
-          "**.md",
-          "toc.yml"
-        ]
-      }
-    ],
-    "resource": [
-      {
-        "files": [
-          "api/**.h",
-          "api/**.cc",
-          "exporters/**.h",
-          "exporters/**.cc",
-          "sdk/**.h",
-          "sdk/**.cc"
-        ]
-      }
-    ],
-    "dest": "_site",
-    "globalMetadataFiles": [],
-    "fileMetadataFiles": [],
-    "noLangKeyword": false,
-    "keepFileLink": false,
-    "cleanupCacheHistory": true,
-    "disableGitFeatures": true
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/fix-abseil-cpp-issue-1536.patch b/ext/opentelemetry-cpp-1.21.0/ci/fix-abseil-cpp-issue-1536.patch
deleted file mode 100644
index 7004cf047..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/fix-abseil-cpp-issue-1536.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 779a3565ac6c5b69dd1ab9183e500a27633117d5
-Author: Derek Mauro <dmauro@google.com>
-Date:   Tue Jan 30 10:13:25 2024 -0800
-
-    Avoid export of testonly target absl::test_allocator in CMake builds
-    
-    Closes #1536
-    
-    PiperOrigin-RevId: 602764437
-    Change-Id: Ia5c20a3874262a2ddb8797f608af17d7e86dd6d6
-
-diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
-index 449a2cad..ee9ca9c3 100644
---- a/absl/container/CMakeLists.txt
-+++ b/absl/container/CMakeLists.txt
-@@ -213,6 +213,7 @@ absl_cc_library(
-   DEPS
-     absl::config
-     GTest::gmock
-+  TESTONLY
- )
- 
- absl_cc_test(
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/install_abseil.sh b/ext/opentelemetry-cpp-1.21.0/ci/install_abseil.sh
deleted file mode 100755
index 04ac0e003..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/install_abseil.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -ex
-export DEBIAN_FRONTEND=noninteractive
-[ -z "${ABSEIL_CPP_VERSION}" ] && export ABSEIL_CPP_VERSION="20240116.1"
-
-TOPDIR=`pwd`
-
-BUILD_DIR=/tmp/
-INSTALL_DIR=/usr/local/
-pushd $BUILD_DIR
-git clone --depth=1 -b ${ABSEIL_CPP_VERSION} https://github.com/abseil/abseil-cpp.git
-cd abseil-cpp
-ABSEIL_CPP_BUILD_OPTIONS=(
-    "-DBUILD_TESTING=OFF"
-    "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
-    "-DCMAKE_INSTALL_PREFIX=$INSTALL_DIR"
-)
-
-if [ ! -z "${CXX_STANDARD}" ]; then
-    ABSEIL_CPP_BUILD_OPTIONS+=("-DCMAKE_CXX_STANDARD=${CXX_STANDARD}")
-    ABSEIL_CPP_BUILD_OPTIONS+=("-DCMAKE_CXX_STANDARD_REQUIRED=ON")
-    ABSEIL_CPP_BUILD_OPTIONS+=("-DCMAKE_CXX_EXTENSIONS=OFF")
-fi
-
-#
-# ABSEIL_CPP_VERSION="20240116.1" fails to build with CMake 3.30
-# ABSEIL_CPP_VERSION="20240116.2" fails to build with CMake 3.30
-# note that somehow the same builds with CMake 3.29.6
-#
-# Error reported:
-#   CMake Error at CMake/AbseilHelpers.cmake:317 (target_link_libraries):
-#    The link interface of target "test_allocator" contains:
-#
-#      GTest::gmock
-#
-#    but the target was not found.  Possible reasons include:
-#
-#      * There is a typo in the target name.
-#      * A find_package call is missing for an IMPORTED target.
-#      * An ALIAS target is missing.
-#
-#   Call Stack (most recent call first):
-#    absl/container/CMakeLists.txt:206 (absl_cc_library)
-#
-# Root cause:
-#   https://github.com/abseil/abseil-cpp/pull/1536
-#
-# Applying fix from abseil commit 779a3565ac6c5b69dd1ab9183e500a27633117d5
-#
-# TODO(marcalff) Cleanup once abseil is upgraded to the next LTS
-
-
-if [ "${ABSEIL_CPP_VERSION}" = "20240116.1" ] || [ "${ABSEIL_CPP_VERSION}" = "20240116.2" ]; then
-  echo "Patching abseil"
-  patch -p1 < ${TOPDIR}/ci/fix-abseil-cpp-issue-1536.patch
-else
-  echo "Not patching abseil"
-fi
-
-echo "Building abseil ${ABSEIL_CPP_VERSION}"
-echo "CMake build options:" "${ABSEIL_CPP_BUILD_OPTIONS[@]}"
-
-mkdir build && pushd build
-cmake "${ABSEIL_CPP_BUILD_OPTIONS[@]}" ..
-make -j $(nproc)
-make install
-popd
-popd
-export PATH=${INSTALL_DIR}/bin:$PATH  # ensure to use the installed abseil
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/install_bazelisk.sh b/ext/opentelemetry-cpp-1.21.0/ci/install_bazelisk.sh
deleted file mode 100755
index 674ca215e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/install_bazelisk.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-BAZELISK_VERSION=v1.16.0
-
-wget -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/$BAZELISK_VERSION/bazelisk-linux-amd64
-chmod +x /usr/local/bin/bazel
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/install_format_tools.sh b/ext/opentelemetry-cpp-1.21.0/ci/install_format_tools.sh
deleted file mode 100755
index 3ede569da..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/install_format_tools.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-CLANG_VERSION=18
-CMAKE_FORMAT_VERSION=0.6.13
-BUILDIFIER_VERSION=3.5.0
-
-#
-# This script expects ubuntu:24.04
-#
-
-apt update
-
-# Install clang-format
-apt install -y clang-format-${CLANG_VERSION} python3 python3-pip git curl
-# ln /usr/bin/clang-format-${CLANG_VERSION} /usr/bin/clang-format
-
-# Install cmake_format
-pip3 install --break-system-packages cmake_format==${CMAKE_FORMAT_VERSION}
-
-# Install buildifier
-curl -L -o /usr/local/bin/buildifier https://github.com/bazelbuild/buildtools/releases/download/${BUILDIFIER_VERSION}/buildifier
-chmod +x /usr/local/bin/buildifier
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/install_gcc48.sh b/ext/opentelemetry-cpp-1.21.0/ci/install_gcc48.sh
deleted file mode 100755
index 497b89dbe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/install_gcc48.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-apt-get update
-apt-get install --no-install-recommends --no-install-suggests -y \
-  g++-4.8
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/install_osx_bazelisk.sh b/ext/opentelemetry-cpp-1.21.0/ci/install_osx_bazelisk.sh
deleted file mode 100755
index dbe5a15e3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/install_osx_bazelisk.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-brew install bazelisk
-sudo ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/install_protobuf.sh b/ext/opentelemetry-cpp-1.21.0/ci/install_protobuf.sh
deleted file mode 100755
index ac041b633..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/install_protobuf.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-[ -z "${PROTOBUF_VERSION}" ] && export PROTOBUF_VERSION="21.12"
-
-#
-# Note
-#
-# protobuf uses two release number schemes,
-# for example 3.21.12 and 21.12,
-# and both tags corresponds to the same commit:
-#
-#   commit f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c (HEAD -> release-3.21.12, tag: v3.21.12, tag: v21.12)
-#   Author: Protobuf Team Bot <protobuf-team-bot@google.com>
-#   Date:   Mon Dec 12 16:03:12 2022 -0800
-#
-#       Updating version.json and repo version numbers to: 21.12
-#
-# tag v21.12 corresponds to the 'protoc version', or repo version
-# tag v3.21.12 corresponds to the 'cpp version'
-#
-# protobuf-cpp-3.21.12.tar.gz:
-# - is provided under releases/download/v21.12
-# - is no longer provided under releases/download/v3.21.12,
-#
-# Use the "repo version number" (PROTOBUF_VERSION=21.12)
-# when calling this script
-#
-
-CPP_PROTOBUF_BUILD_OPTIONS=(
-  "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
-  "-Dprotobuf_BUILD_TESTS=OFF"
-  "-Dprotobuf_BUILD_EXAMPLES=OFF"
-)
-
-if [ ! -z "${CXX_STANDARD}" ]; then
-    CPP_PROTOBUF_BUILD_OPTIONS+=("-DCMAKE_CXX_STANDARD=${CXX_STANDARD}")
-    CPP_PROTOBUF_BUILD_OPTIONS+=("-DCMAKE_CXX_STANDARD_REQUIRED=ON")
-    CPP_PROTOBUF_BUILD_OPTIONS+=("-DCMAKE_CXX_EXTENSIONS=OFF")
-fi
-
-# After protobuf 22/4.22, protobuf depends on absl and we can use
-# "-Dprotobuf_ABSL_PROVIDER=package" to tell protobuf to find absl from the
-# system. Otherwise, it will build absl from source.
-# 4.XX.YY and 3.XX.YY are alias of XX.YY, and source pacakges are moved into the
-# tag of XX.YY and without -cpp suffix from protobuf v22.
-if [[ ${PROTOBUF_VERSION/.*/} -ge 22 ]]; then
-  export CPP_PROTOBUF_VERSION="${PROTOBUF_VERSION}"
-  CPP_PROTOBUF_PACKAGE_NAME="protobuf-${CPP_PROTOBUF_VERSION}"
-  CPP_PROTOBUF_BUILD_OPTIONS=(${CPP_PROTOBUF_BUILD_OPTIONS[@]} "-Dprotobuf_ABSL_PROVIDER=package")
-else
-  export CPP_PROTOBUF_VERSION="3.${PROTOBUF_VERSION}"
-  CPP_PROTOBUF_PACKAGE_NAME="protobuf-cpp-${CPP_PROTOBUF_VERSION}"
-fi
-
-cd /tmp
-wget https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/${CPP_PROTOBUF_PACKAGE_NAME}.tar.gz
-tar zxf ${CPP_PROTOBUF_PACKAGE_NAME}.tar.gz --no-same-owner
-
-echo "Building protobuf ${CPP_PROTOBUF_VERSION}"
-echo "CMake build options:" "${CPP_PROTOBUF_BUILD_OPTIONS[@]}"
-
-mkdir protobuf-${CPP_PROTOBUF_VERSION}/build && pushd protobuf-${CPP_PROTOBUF_VERSION}/build
-if [ -e "../CMakeLists.txt" ]; then
-  cmake .. "${CPP_PROTOBUF_BUILD_OPTIONS[@]}"
-else
-  cmake ../cmake "${CPP_PROTOBUF_BUILD_OPTIONS[@]}"
-fi
-make -j $(nproc)
-make install
-popd
-ldconfig
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/install_windows_bazelisk.ps1 b/ext/opentelemetry-cpp-1.21.0/ci/install_windows_bazelisk.ps1
deleted file mode 100644
index 2f1f48c1e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/install_windows_bazelisk.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-$ErrorActionPreference = "Stop"
-trap { $host.SetShouldExit(1) }
-
-$BAZELISK_VERSION="1.16.0"
-$CWD=(Get-Item -Path ".\").FullName
-(new-object System.Net.WebClient). `
-   DownloadFile("https://github.com/bazelbuild/bazelisk/releases/download/v$BAZELISK_VERSION/bazelisk-windows-amd64.exe",
-                "C:\windows\system32\bazel.exe")
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/install_windows_protobuf.ps1 b/ext/opentelemetry-cpp-1.21.0/ci/install_windows_protobuf.ps1
deleted file mode 100644
index 0faea9f5e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/install_windows_protobuf.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-$ErrorActionPreference = "Stop"
-trap { $host.SetShouldExit(1) }
-
-cd tools/vcpkg
-# Lock to specific version of Protobuf port file to avoid build break
-./vcpkg "--vcpkg-root=$PWD" install --overlay-ports="$PSScriptRoot\ports" protobuf:x64-windows
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/CONTROL b/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/CONTROL
deleted file mode 100644
index 2daa1ecaa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/CONTROL
+++ /dev/null
@@ -1,8 +0,0 @@
-Source: protobuf
-Version: 3.12.3
-Homepage: https://github.com/google/protobuf
-Description: Protocol Buffers - Google's data interchange format
-
-Feature: zlib
-Description: ZLib based features like Gzip streams
-Build-Depends: zlib
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-android-log.patch b/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-android-log.patch
deleted file mode 100644
index 47a935078..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-android-log.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake
-index 6bf86a277..424854798 100644
---- a/cmake/libprotobuf-lite.cmake
-+++ b/cmake/libprotobuf-lite.cmake
-@@ -67,6 +67,9 @@ target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT})
- if(protobuf_LINK_LIBATOMIC)
-   target_link_libraries(libprotobuf-lite atomic)
- endif()
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-+       target_link_libraries(libprotobuf-lite log)
-+endif()
- target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src)
- if(MSVC AND protobuf_BUILD_SHARED_LIBS)
-   target_compile_definitions(libprotobuf-lite
-diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
-index 0c12596c2..a5be494fb 100644
---- a/cmake/libprotobuf.cmake
-+++ b/cmake/libprotobuf.cmake
-@@ -121,6 +121,9 @@ endif()
- if(protobuf_LINK_LIBATOMIC)
-   target_link_libraries(libprotobuf atomic)
- endif()
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-+       target_link_libraries(libprotobuf log)
-+endif()
- target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src)
- if(MSVC AND protobuf_BUILD_SHARED_LIBS)
-   target_compile_definitions(libprotobuf
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-static-build.patch b/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-static-build.patch
deleted file mode 100644
index 22d99435c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-static-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/install.cmake b/cmake/install.cmake
-index be47c54..8b1bd97 100644
---- a/cmake/install.cmake
-+++ b/cmake/install.cmake
-@@ -31,7 +31,7 @@ endforeach()
- if (protobuf_BUILD_PROTOC_BINARIES)
-   install(TARGETS protoc EXPORT protobuf-targets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
--  if (UNIX AND NOT APPLE)
-+  if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME)
-     set_property(TARGET protoc
-       PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-   elseif (APPLE)
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-uwp.patch b/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-uwp.patch
deleted file mode 100644
index 72e36cb97..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/fix-uwp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 849679995..dba537a68 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -198,6 +198,7 @@ if (MSVC)
-     /wd4506 # no definition for inline function 'function'
-     /wd4800 # 'type' : forcing value to bool 'true' or 'false' (performance warning)
-     /wd4996 # The compiler encountered a deprecated declaration.
-+    /wd4703 # Potentially uninitialized local pointer variable 'name' used.
-   )
-   # Allow big object
-   add_definitions(/bigobj)
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/portfile.cmake b/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/portfile.cmake
deleted file mode 100644
index 12c7e95fd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/ports/protobuf/portfile.cmake
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO protocolbuffers/protobuf
-    REF 31ebe2ac71400344a5db91ffc13c4ddfb7589f92    #v3.12.3
-    SHA512 74e623547bb9448ccea29925172bf13fcbffab80eb02f58d248180000b4ae7249f0dee88bb4ef438857b0e1a96a600ab270ebf3b58568da28cbf97d8a2398297
-    HEAD_REF master
-    PATCHES
-        fix-uwp.patch
-        fix-android-log.patch
-        fix-static-build.patch
-)
-
-if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
-    set(protobuf_BUILD_PROTOC_BINARIES OFF)
-elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME)
-    set(protobuf_BUILD_PROTOC_BINARIES OFF)
-else()
-    set(protobuf_BUILD_PROTOC_BINARIES ON)
-endif()
-
-if(NOT protobuf_BUILD_PROTOC_BINARIES AND NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/protobuf)
-    message(FATAL_ERROR "Cross-targeting protobuf requires the x86-windows protoc to be available. Please install protobuf:x86-windows first.")
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-  set(VCPKG_BUILD_SHARED_LIBS ON)
-else()
-  set(VCPKG_BUILD_SHARED_LIBS OFF)
-endif()
-
-if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-  set(VCPKG_BUILD_STATIC_CRT OFF)
-else()
-  set(VCPKG_BUILD_STATIC_CRT ON)
-endif()
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-	zlib	protobuf_WITH_ZLIB
-)
-
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/cmake
-    PREFER_NINJA
-    OPTIONS
-        -Dprotobuf_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS}
-        -Dprotobuf_MSVC_STATIC_RUNTIME=${VCPKG_BUILD_STATIC_CRT}
-        -Dprotobuf_BUILD_TESTS=OFF
-        -DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf
-        -Dprotobuf_BUILD_PROTOC_BINARIES=${protobuf_BUILD_PROTOC_BINARIES}
-         ${FEATURE_OPTIONS}
-)
-
-vcpkg_install_cmake()
-
-# It appears that at this point the build hasn't actually finished. There is probably
-# a process spawned by the build, therefore we need to wait a bit.
-
-function(protobuf_try_remove_recurse_wait PATH_TO_REMOVE)
-    file(REMOVE_RECURSE ${PATH_TO_REMOVE})
-    if (EXISTS "${PATH_TO_REMOVE}")
-        execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5)
-        file(REMOVE_RECURSE ${PATH_TO_REMOVE})
-    endif()
-endfunction()
-
-protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/include)
-
-if(CMAKE_HOST_WIN32)
-    set(EXECUTABLE_SUFFIX ".exe")
-else()
-    set(EXECUTABLE_SUFFIX "")
-endif()
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-	vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake
-		"\${_IMPORT_PREFIX}/bin/protoc${EXECUTABLE_SUFFIX}"
-		"\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}"
-)
-endif()
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(READ ${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake DEBUG_MODULE)
-    string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
-    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}" DEBUG_MODULE "${DEBUG_MODULE}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake "${DEBUG_MODULE}")
-endif()
-
-protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share)
-
-if(CMAKE_HOST_WIN32)
-    if(protobuf_BUILD_PROTOC_BINARIES)
-        file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-        vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
-    else()
-        file(COPY ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-    endif()
-
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
-        protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
-    else()
-        protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin/protoc.exe)
-        protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe)
-    endif()
-else()
-    file(GLOB EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/protoc*)
-    foreach(E IN LISTS EXECUTABLES)
-        file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}
-                PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ)
-    endforeach()
-    protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
-    protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-	vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h
-		"\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_"
-		"\#ifndef PROTOBUF_USE_DLLS\n\#define PROTOBUF_USE_DLLS\n\#endif // PROTOBUF_USE_DLLS\n\n\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_"
-)
-endif()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-vcpkg_copy_pdbs()
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/run_docker.sh b/ext/opentelemetry-cpp-1.21.0/ci/run_docker.sh
deleted file mode 100755
index 1f499e935..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/run_docker.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-BUILD_IMAGE=opentelemetry-cpp-build
-docker image inspect "$BUILD_IMAGE" &> /dev/null || {
-  docker build -t "$BUILD_IMAGE" -f .devcontainer/Dockerfile.dev .
-}
-
-if [[ $# -ge 1 ]]; then
-  docker run --user "$(id -u):$(id -g)" -v "$PWD":/src -w /src -it "$BUILD_IMAGE" "$@"
-else
-  docker run -v "$PWD":/src -w /src --privileged -it "$BUILD_IMAGE" /bin/bash -l
-fi
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/setup_ci_environment.sh b/ext/opentelemetry-cpp-1.21.0/ci/setup_ci_environment.sh
deleted file mode 100755
index ed4378e2d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/setup_ci_environment.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-apt-get update
-apt-get install --no-install-recommends --no-install-suggests -y \
-                build-essential \
-                ca-certificates \
-                wget \
-                git \
-                valgrind \
-                lcov \
-                iwyu \
-                pkg-config
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake.ps1 b/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake.ps1
deleted file mode 100644
index 6a9a62fae..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake.ps1
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-$ErrorActionPreference = "Stop"
-trap { $host.SetShouldExit(1) }
-
-if (-not $env:CMAKE_VERSION) { $env:CMAKE_VERSION = "3.31.6" }
-$CMAKE_VERSION = $env:CMAKE_VERSION
-
-choco uninstall cmake cmake.install -y --remove-dependencies --skip-autouninstaller --force --no-progress
-
-Write-Host "Installing CMake version $CMAKE_VERSION ..."
-choco install cmake --version=$CMAKE_VERSION --allow-downgrade -y --force --no-progress
-
-function Get-Version {
-    param (
-        [string]$output
-    )
-    if ($output -match '(\d+\.\d+\.\d+)') {
-        return $matches[1]
-    }
-    return $null
-}
-
-$cmakeOutput = & cmake --version | Select-Object -First 1
-$ctestOutput = & ctest --version | Select-Object -First 1
-$cpackOutput = & cpack --version | Select-Object -First 1
-
-$cmakeVersion = Get-Version $cmakeOutput
-$ctestVersion = Get-Version $ctestOutput
-$cpackVersion = Get-Version $cpackOutput
-
-Write-Host "cmake version $cmakeVersion detected"
-Write-Host "ctest version $ctestVersion detected"
-Write-Host "cpack version $cpackVersion detected"
-
-if ($cmakeVersion -ne $CMAKE_VERSION) {
-    Write-Error "CMake version mismatch: expected $CMAKE_VERSION, installed $cmakeVersion"
-    exit 1
-}
-if ($ctestVersion -ne $CMAKE_VERSION) {
-    Write-Error "CTest version mismatch: expected $CMAKE_VERSION, installed $ctestVersion"
-    exit 1
-}
-if ($cpackVersion -ne $CMAKE_VERSION) {
-    Write-Error "CPack version mismatch: expected $CMAKE_VERSION, installed $cpackVersion"
-    exit 1
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake.sh b/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake.sh
deleted file mode 100755
index 365b3e01b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-CMAKE_VERSION=${CMAKE_VERSION:-3.31.6}
-CMAKE_DIR="cmake-${CMAKE_VERSION}-linux-x86_64"
-CMAKE_TAR="${CMAKE_DIR}.tar.gz"
-CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_TAR}"
-
-INSTALL_DIR="/opt/cmake"
-
-echo "Installing CMake version: ${CMAKE_VERSION}..."
-
-apt-get update && apt-get remove --purge -y cmake || true
-
-apt-get install -y wget tar
-
-wget "${CMAKE_URL}"
-
-mkdir -p "${INSTALL_DIR}"
-tar --strip-components=1 -xzf "${CMAKE_TAR}" -C "${INSTALL_DIR}"
-
-for executable in "${INSTALL_DIR}/bin/"*; do
-    exe_name=$(basename "$executable")
-    ln -sf "$executable" "/usr/local/bin/$exe_name"
-done
-
-rm -f "${CMAKE_TAR}"
-
-echo "Verifying installed versions..."
-
-for executable in cmake ctest cpack; do
-    if command -v "$executable" >/dev/null 2>&1; then
-        ACTUAL_VERSION=$("$executable" --version | grep -Eo '[0-9]+(\.[0-9]+)*' | head -n 1)
-        echo "$executable version: $ACTUAL_VERSION detected"
-        if [ "$ACTUAL_VERSION" != "$CMAKE_VERSION" ]; then
-            echo "E: $executable version mismatch. Expected $CMAKE_VERSION, found '$ACTUAL_VERSION'" >&2
-            exit 1
-        fi
-    else
-        echo "E: $executable is not installed or not in PATH." >&2
-        exit 1
-    fi
-done
-
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake_macos.sh b/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake_macos.sh
deleted file mode 100755
index 54cbdae5e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/setup_cmake_macos.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-CMAKE_VERSION="${CMAKE_VERSION:-3.31.6}"
-CMAKE_PKG="cmake-${CMAKE_VERSION}-macos-universal"
-CMAKE_TAR="${CMAKE_PKG}.tar.gz"
-CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_TAR}"
-
-INSTALL_DIR="/opt/cmake"
-
-echo "Installing CMake version ${CMAKE_VERSION}..."
-
-brew uninstall cmake || true
-
-if ! command -v wget >/dev/null 2>&1; then
-  echo "Installing wget..."
-  brew install wget
-fi
-
-wget -q "${CMAKE_URL}"
-sudo mkdir -p "${INSTALL_DIR}"
-sudo tar --strip-components=1 -xzf "${CMAKE_TAR}" -C "${INSTALL_DIR}"
-
-BINARY_DIR="${INSTALL_DIR}/CMake.app/Contents/bin"
-
-for executable in "${BINARY_DIR}/"*; do
-    exe_name=$(basename "$executable")
-    sudo ln -sf "$executable" "/usr/local/bin/$exe_name"
-done
-
-rm -f "${CMAKE_TAR}"
-
-echo "Verifying installed versions..."
-
-for executable in cmake ctest cpack; do
-    if command -v "$executable" >/dev/null 2>&1; then
-        ACTUAL_VERSION=$("$executable" --version | grep -Eo '[0-9]+(\.[0-9]+)*' | head -n 1)
-        echo "$executable version: $ACTUAL_VERSION detected"
-        if [ "$ACTUAL_VERSION" != "$CMAKE_VERSION" ]; then
-            echo "E: $executable version mismatch. Expected $CMAKE_VERSION, found '$ACTUAL_VERSION'" >&2
-            exit 1
-        fi
-    else
-        echo "E: $executable is not installed or not in PATH." >&2
-        exit 1
-    fi
-done
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/setup_gcc10.sh b/ext/opentelemetry-cpp-1.21.0/ci/setup_gcc10.sh
deleted file mode 100755
index 119d361cb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/setup_gcc10.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-apt-get update
-apt-get install --no-install-recommends --no-install-suggests -y \
-                g++-10 \
-                gcc-10
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/setup_googletest.sh b/ext/opentelemetry-cpp-1.21.0/ci/setup_googletest.sh
deleted file mode 100755
index 7b4a20840..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/setup_googletest.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-export DEBIAN_FRONTEND=noninteractive
-apt-get update
-
-if [ -z "${GOOGLETEST_VERSION}" ]; then
-  # Version by default. Requires C++14.
-  export GOOGLETEST_VERSION=1.14.0
-fi
-
-OLD_GOOGLETEST_VERSION_REGEXP="^1\.([0-9]|10|11|12)(\..*)?$"
-
-if [[ ${GOOGLETEST_VERSION} =~ ${OLD_GOOGLETEST_VERSION_REGEXP} ]]; then
-  # Old (up to 1.12.x included) download URL format.
-  GOOGLETEST_VERSION_PATH="release-${GOOGLETEST_VERSION}"
-  GOOGLETEST_FOLDER_PATH="googletest-release-${GOOGLETEST_VERSION}"
-else
-  # New (since 1.13.0) download URL format.
-  GOOGLETEST_VERSION_PATH="v${GOOGLETEST_VERSION}"
-  GOOGLETEST_FOLDER_PATH="googletest-${GOOGLETEST_VERSION}"
-fi
-
-googletest_install()
-{
-  # Follows these instructions
-  # https://gist.github.com/dlime/313f74fd23e4267c4a915086b84c7d3d
-  tmp_dir=$(mktemp -d)
-  pushd $tmp_dir
-  wget https://github.com/google/googletest/archive/${GOOGLETEST_VERSION_PATH}.tar.gz
-  tar -xf ${GOOGLETEST_VERSION_PATH}.tar.gz
-  cd ${GOOGLETEST_FOLDER_PATH}/
-  mkdir build && cd build
-  cmake .. -DBUILD_SHARED_LIBS=ON -DINSTALL_GTEST=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr
-  make -j $(nproc)
-  make install
-  ldconfig
-  popd
-}
-
-set +e
-echo	\
-      libbenchmark-dev \
-      zlib1g-dev \
-      sudo \
-      libcurl4-openssl-dev \
-      nlohmann-json-dev \
-      nlohmann-json3 \
-      nlohmann-json3-dev | xargs -n 1 apt-get install --ignore-missing --no-install-recommends --no-install-suggests -y
-set -e
-
-googletest_install
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/setup_grpc.sh b/ext/opentelemetry-cpp-1.21.0/ci/setup_grpc.sh
deleted file mode 100755
index c922af50c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/setup_grpc.sh
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-export DEBIAN_FRONTEND=noninteractive
-old_grpc_version='v1.33.2'
-new_grpc_version='v1.49.2'
-modern_grpc_version='v1.55.0'
-gcc_version_for_new_grpc='5.1'
-std_version='14'
-if [ ! -z "${CXX_STANDARD}" ]; then
-    std_version="${CXX_STANDARD}"
-fi
-install_grpc_version=${new_grpc_version}
-install_dir='/usr/local/'
-build_shared_libs=''
-build_internal_abseil_cpp=1
-GRPC_BUILD_OPTIONS=()
-usage() {
-    echo "Usage: $0 [options...]" 1>&2;
-    echo "Available options:" 1>&2;
-    echo "    -v <gcc-version>              Set GCC version" 1>&2;
-    echo "    -h                            Show help message and exit" 1>&2;
-    echo "    -i <install_dir>              Set installation prefix" 1>&2;
-    echo "    -m                            Use the modern gRPC version" 1>&2;
-    echo "    -p <protobuf|abseil-cpp>      Let gRPC find protobuf or abseil-cpp by CONFIG package" 1>&2;
-    echo "    -r <gRPC version>             Specify the version of gRPC" 1>&2;
-    echo "    -s <STD version>              Specify std version(CMAKE_CXX_STANDARD)" 1>&2;
-    echo "    -T                            Build static libraries" 1>&2;
-    echo "    -H                            Build shared libraries" 1>&2;
-}
-
-while getopts ":v:hi:mp:r:s:TH" o; do
-    case "${o}" in
-        v)
-            gcc_version=${OPTARG}
-            ;;
-        h)
-            usage
-            exit 0;
-            ;;
-        i)
-            install_dir=${OPTARG}
-            ;;
-        p)
-            if [ "${OPTARG}" == "protobuf" ]; then
-                GRPC_BUILD_OPTIONS=(${GRPC_BUILD_OPTIONS[@]} "-DgRPC_PROTOBUF_PROVIDER=package")
-            elif [ "${OPTARG}" == "abseil-cpp" ]; then
-                GRPC_BUILD_OPTIONS=(${GRPC_BUILD_OPTIONS[@]} "-DgRPC_ABSL_PROVIDER=package")
-                build_internal_abseil_cpp=0
-            else
-                usage
-                exit 1;
-            fi
-            ;;
-        r)
-            install_grpc_version=${OPTARG}
-            ;;
-        m)
-            install_grpc_version=${modern_grpc_version}
-            ;;
-        s)
-            std_version=${OPTARG}
-            ;;
-        T)
-            build_shared_libs="OFF"
-            ;;
-        H)
-            build_shared_libs="ON"
-            ;;
-        *)
-            usage
-            exit 1;
-            ;;
-    esac
-done
-
-if [ -z "${gcc_version}" ]; then
-    gcc_version=`gcc --version | awk '/gcc/  {print $NF}'`
-fi
-if [[ "${gcc_version}" < "${gcc_version_for_new_grpc}" ]] && [[ "${gcc_version:1:1}" == "." ]]; then
-    echo "${gcc_version} less than ${gcc_version_for_new_grpc}"
-    std_version='11'
-    install_grpc_version=${old_grpc_version}
-fi
-if ! type cmake > /dev/null; then
-    #cmake not installed, exiting
-    exit 1
-fi
-export BUILD_DIR=/tmp/
-export INSTALL_DIR=${install_dir}
-pushd $BUILD_DIR
-echo "installing grpc version: ${install_grpc_version}"
-git clone --depth=1 -b ${install_grpc_version} https://github.com/grpc/grpc
-pushd grpc
-git submodule init
-git submodule update --depth 1
-
-if [[ $build_internal_abseil_cpp -ne 0 ]]; then
-    mkdir -p "third_party/abseil-cpp/build" && pushd "third_party/abseil-cpp/build"
-    set -x
-
-    ABSEIL_CPP_BUILD_OPTIONS=(
-        -DCMAKE_BUILD_TYPE=Release
-        -DCMAKE_CXX_STANDARD=${std_version}
-        -DCMAKE_CXX_STANDARD_REQUIRED=ON
-        -DCMAKE_CXX_EXTENSIONS=OFF
-        -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE
-        -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
-    )
-    if [ ! -z "$build_shared_libs" ]; then
-        ABSEIL_CPP_BUILD_OPTIONS=(${ABSEIL_CPP_BUILD_OPTIONS[@]} "-DBUILD_SHARED_LIBS=$build_shared_libs")
-    fi
-    cmake  "${ABSEIL_CPP_BUILD_OPTIONS[@]}" ..
-    make -j $(nproc)
-    make install
-    popd
-fi
-mkdir -p build && pushd build
-
-GRPC_BUILD_OPTIONS=(
-    ${GRPC_BUILD_OPTIONS[@]}
-    -DgRPC_INSTALL=ON
-    -DCMAKE_CXX_STANDARD=${std_version}
-    -DCMAKE_CXX_STANDARD_REQUIRED=ON
-    -DCMAKE_CXX_EXTENSIONS=OFF
-    -DgRPC_BUILD_TESTS=OFF
-    -DgRPC_BUILD_GRPC_CPP_PLUGIN=ON
-    -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF
-    -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF
-    -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF
-    -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF
-    -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF
-    -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF
-    -DgRPC_BUILD_GRPCPP_OTEL_PLUGIN=OFF
-    -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
-    -DCMAKE_PREFIX_PATH=$INSTALL_DIR
-)
-if [ ! -z "$build_shared_libs" ]; then
-    GRPC_BUILD_OPTIONS=(${GRPC_BUILD_OPTIONS[@]} "-DBUILD_SHARED_LIBS=$build_shared_libs")
-fi
-
-echo "Building gRPC ${install_grpc_version}"
-echo "CMake build options:" "${GRPC_BUILD_OPTIONS[@]}"
-
-cmake "${GRPC_BUILD_OPTIONS[@]}" ..
-make -j $(nproc)
-make install
-popd
-popd
-
-export PATH=${INSTALL_DIR}/bin:$PATH  # ensure to use the installed grpc
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/setup_windows_ci_environment.ps1 b/ext/opentelemetry-cpp-1.21.0/ci/setup_windows_ci_environment.ps1
deleted file mode 100755
index f5c761edb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/setup_windows_ci_environment.ps1
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-$ErrorActionPreference = "Stop"
-trap { $host.SetShouldExit(1) }
-
-git submodule update -f "tools/vcpkg"
-Push-Location -Path "tools/vcpkg"
-$VCPKG_DIR = (Get-Item -Path ".\").FullName
-./bootstrap-vcpkg.bat
-./vcpkg integrate install
-
-# Google Benchmark
-./vcpkg "--vcpkg-root=$VCPKG_DIR" install benchmark:x64-windows
-
-# Google Test
-./vcpkg "--vcpkg-root=$VCPKG_DIR" install gtest:x64-windows
-
-# nlohmann-json
-./vcpkg "--vcpkg-root=$VCPKG_DIR" install nlohmann-json:x64-windows
-
-# grpc
-./vcpkg "--vcpkg-root=$VCPKG_DIR" install grpc:x64-windows
-
-# curl
-./vcpkg "--vcpkg-root=$VCPKG_DIR" install curl:x64-windows
-
-# prometheus-cpp
-./vcpkg "--vcpkg-root=$VCPKG_DIR" install prometheus-cpp:x64-windows
-
-Pop-Location
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/toc.yml b/ext/opentelemetry-cpp-1.21.0/ci/toc.yml
deleted file mode 100644
index 64357acfc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/toc.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-- name: OpenTelemetry CPP
-  href: ./README.md
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/valgrind-suppressions b/ext/opentelemetry-cpp-1.21.0/ci/valgrind-suppressions
deleted file mode 100644
index 28741e7a1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/valgrind-suppressions
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  <flakiness on gRPC initialization>
-  Memcheck:Leak
-  ...
-  fun:grpc_shutdown
-  ...
-}
-
-{
-  <flakiness on gRPC initialization>
-  Memcheck:Leak
-  ...
-  fun:grpc_init
-  ...
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/ci/verify_packages.sh b/ext/opentelemetry-cpp-1.21.0/ci/verify_packages.sh
deleted file mode 100755
index 3d4e3efa4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ci/verify_packages.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -ex
-
-PKG_CONFIG_PATH="/usr/local/lib64/pkgconfig:${PKG_CONFIG_PATH:-}"
-
-for library in api common logs metrics resources trace version; do
-  pkg-config --validate opentelemetry_${library} --print-errors
-done
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/ParseOsRelease.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/ParseOsRelease.cmake
deleted file mode 100644
index 26c6109dc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/ParseOsRelease.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Parse /etc/os-release to determine Linux distro
-
-if(EXISTS /etc/os-release)
-file(STRINGS /etc/os-release OS_RELEASE)
-foreach(NameAndValue ${OS_RELEASE})
-  # Strip leading spaces
-  string(REGEX REPLACE "^[ ]+" "" NameAndValue ${NameAndValue})
-  # Find variable name
-  string(REGEX MATCH "^[^=]+" Name ${NameAndValue})
-  # Find the value
-  string(REPLACE "${Name}=" "" Value ${NameAndValue})
-  # Strip quotes from value
-  string(REPLACE "\"" "" Value ${Value})
-  # Set the variable
-  message("-- /etc/os-release : ${Name}=${Value}")
-  set("OS_RELEASE_${Name}" "${Value}")
-endforeach()
-else()
-  set("OS_RELEASE_NAME" ${CMAKE_SYSTEM_NAME})
-  set("OS_RELEASE_ID" ${CMAKE_SYSTEM_NAME})
-  set("OS_RELEASE_VERSION_ID" "1.0")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/find-package-support-functions.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/find-package-support-functions.cmake
deleted file mode 100644
index f74d029d2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/find-package-support-functions.cmake
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include("${CMAKE_CURRENT_LIST_DIR}/component-definitions.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/thirdparty-dependency-definitions.cmake")
-
-#-------------------------------------------------------------------------
-# Function to get installed components.
-#-------------------------------------------------------------------------
-function(get_installed_components installed_components_out)
-  set(result "")
-  foreach(_COMPONENT IN LISTS OTEL_BUILT_COMPONENTS_LIST)
-      set(_COMPONENT_TARGET_FILE "${CMAKE_CURRENT_LIST_DIR}/opentelemetry-cpp-${_COMPONENT}-target.cmake")
-      if(EXISTS "${_COMPONENT_TARGET_FILE}")
-          list(APPEND result ${_COMPONENT})
-          message(DEBUG "get_installed_components: component = ${_COMPONENT},  installed = TRUE")
-      else()
-          message(DEBUG "get_installed_components: component = ${_COMPONENT},  installed = FALSE")
-      endif()
-  endforeach()
-  set(${installed_components_out} ${result} PARENT_SCOPE)
-endfunction()
-
-#-------------------------------------------------------------------------
-# Function to get dependent components.
-#-------------------------------------------------------------------------
-function(get_dependent_components component_in dependent_components_out)
-  set(result "")
-  set(depends_var "COMPONENT_${component_in}_COMPONENT_DEPENDS")
-  if(DEFINED ${depends_var})
-    set(result ${${depends_var}})
-  endif()
-  set(${dependent_components_out} ${result} PARENT_SCOPE)
-endfunction()
-
-
-#-------------------------------------------------------------------------
-# Function to get requested components.
-#-------------------------------------------------------------------------
-function(get_requested_components installed_components_in requested_components_out)
-  set(result "")
-  if (NOT opentelemetry-cpp_FIND_COMPONENTS)
-    set(result ${${installed_components_in}})
-    message(DEBUG "get_requested_components: No components explicitly requested. Importing all installed components including: ${result}")
-    set(${requested_components_out} ${result} PARENT_SCOPE)
-  else()
-    message(DEBUG "get_requested_components: Components requested: ${opentelemetry-cpp_FIND_COMPONENTS}")
-    foreach(_COMPONENT IN LISTS opentelemetry-cpp_FIND_COMPONENTS)
-        if(NOT ${_COMPONENT} IN_LIST OTEL_BUILT_COMPONENTS_LIST)
-            message(ERROR " get_requested_components: Component `${_COMPONENT}` is not a built component of the opentelemetry-cpp package. Built components include: ${OTEL_BUILT_COMPONENTS_LIST}")
-            return()
-        endif()
-        if(NOT ${_COMPONENT} IN_LIST ${installed_components_in})
-            message(ERROR " get_requested_components: Component `${_COMPONENT}` is supported by opentelemetry-cpp but not installed. Installed components include: ${${installed_components_in}}")
-            return()
-        endif()
-        get_dependent_components(${_COMPONENT} _DEPENDENT_COMPONENTS)
-        list(APPEND result ${_DEPENDENT_COMPONENTS})
-        list(APPEND result ${_COMPONENT})
-    endforeach()
-    list(REMOVE_DUPLICATES result)
-    set(${requested_components_out} ${result} PARENT_SCOPE)
-  endif()
-endfunction()
-
-
-#-------------------------------------------------------------------------
-# Function to get the targets for a component.
-#-------------------------------------------------------------------------
-function(get_component_targets component_in targets_out)
-  set(result "")
-  if(NOT ${component_in} IN_LIST OTEL_BUILT_COMPONENTS_LIST)
-      message(ERROR " get_component_targets: Component `${component_in}` component is not a built component of the opentelemetry-cpp package.")
-  else()
-    set(targets_var "COMPONENT_${component_in}_TARGETS")
-    if(DEFINED ${targets_var})
-      set(result ${${targets_var}})
-    endif()
-  endif()
-  set(${targets_out} ${result} PARENT_SCOPE)
-endfunction()
-
-#-------------------------------------------------------------------------
-# Get targets for a list of components.
-#-------------------------------------------------------------------------
-function(get_targets components_in targets_out)
-  set(result "")
-  foreach(_comp IN LISTS ${components_in})
-    get_component_targets(${_comp} comp_targets)
-    foreach(target IN LISTS comp_targets)
-      list(APPEND result ${target})
-    endforeach()
-  endforeach()
-  set(${targets_out} ${result} PARENT_SCOPE)
-endfunction()
-
-
-#-------------------------------------------------------------------------
-# Check if a target is imported for a list of targets.
-#-------------------------------------------------------------------------
-function(check_targets_imported targets_in)
-  set(result TRUE)
-  foreach(_target IN LISTS ${targets_in})
-    if(TARGET ${_target})
-      message(DEBUG "check_targets_imported: imported target `${_target}`")
-    else()
-      message(FATAL_ERROR " check_targets_imported: failed to import target `${_target}`")
-      set(result FALSE)
-    endif()
-  endforeach()
-  set(${result_bool_out} ${result} PARENT_SCOPE)
-endfunction()
-
-#-------------------------------------------------------------------------
-# Check if a dependency is expected and required
-#-------------------------------------------------------------------------
-function (is_dependency_required dependency_in components_in is_required_out)
-  foreach(_component IN LISTS ${components_in})
-    if(${dependency_in} IN_LIST COMPONENT_${_component}_THIRDPARTY_DEPENDS)
-      set(${is_required_out} TRUE PARENT_SCOPE)
-      return()
-    endif()
-  endforeach()
-endfunction()
-
-#-------------------------------------------------------------------------
-# Find all required and expected dependencies
-#-------------------------------------------------------------------------
-include(CMakeFindDependencyMacro)
-
-function(find_required_dependencies components_in)
-  foreach(_dependency IN LISTS OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED)
-    if(${_dependency}_FOUND)
-      # The dependency is already found by another component. Continue.
-      continue()
-    endif()
-    set(is_required FALSE)
-    is_dependency_required(${_dependency} ${components_in} is_required)
-    message(DEBUG "find_required_dependencies: dependency = ${_dependency}, is_required = ${is_required}")
-    if(is_required)
-        message(DEBUG "find_required_dependencies: calling find_dependency(${_dependency} ${OTEL_${_dependency}_SEARCH_MODE} )...")
-        find_dependency(${_dependency} ${OTEL_${_dependency}_SEARCH_MODE})
-    endif()
-  endforeach()
-endfunction()
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/nlohmann-json.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/nlohmann-json.cmake
deleted file mode 100644
index eb952cb81..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/nlohmann-json.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# The dependency on nlohmann_json can be provided different ways. By order of
-# decreasing priority, options are:
-#
-# 1 - Search for a nlohmann_json package
-#
-# Packages installed on the local machine are used if found.
-#
-# The nlohmann_json dependency is not installed, as it already is.
-#
-# 2 - Search for a nlohmann_json git submodule
-#
-# When git submodule is used, the nlohmann_json code is located in:
-# third_party/nlohmann-json
-#
-# The nlohmann_json dependency is installed, by building the sub directory with
-# JSON_Install=ON
-#
-# 3 - Download nlohmann_json from github
-#
-# Code from the development branch is used, unless a specific release tag is
-# provided in variable ${nlohmann-json}
-#
-# The nlohmann_json dependency is installed, by building the downloaded code
-# with JSON_Install=ON
-#
-
-# nlohmann_json package is required for most SDK build configurations
-find_package(nlohmann_json QUIET)
-set(nlohmann_json_clone FALSE)
-if(nlohmann_json_FOUND)
-  message(STATUS "nlohmann::json dependency satisfied by: package")
-elseif(TARGET nlohmann_json)
-  message(STATUS "nlohmann::json is already added as a CMake target!")
-elseif(EXISTS ${PROJECT_SOURCE_DIR}/.git
-       AND EXISTS
-           ${PROJECT_SOURCE_DIR}/third_party/nlohmann-json/CMakeLists.txt)
-  message(STATUS "nlohmann::json dependency satisfied by: git submodule")
-  set(JSON_BuildTests
-      OFF
-      CACHE INTERNAL "")
-  set(JSON_Install
-      ON
-      CACHE INTERNAL "")
-  # This option allows to link nlohmann_json::nlohmann_json target
-  add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/nlohmann-json)
-  # This option allows to add header to include directories
-  include_directories(
-    ${PROJECT_SOURCE_DIR}/third_party/nlohmann-json/single_include)
-else()
-  if("${nlohmann-json}" STREQUAL "")
-    set(nlohmann-json "develop")
-  endif()
-  message(STATUS "nlohmann::json dependency satisfied by: github download")
-  set(nlohmann_json_clone TRUE)
-  include(ExternalProject)
-  ExternalProject_Add(
-    nlohmann_json_download
-    PREFIX third_party
-    GIT_REPOSITORY https://github.com/nlohmann/json.git
-    GIT_TAG "${nlohmann-json}"
-    UPDATE_COMMAND ""
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-               -DJSON_BuildTests=OFF -DJSON_Install=ON
-               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    TEST_AFTER_INSTALL 0
-    DOWNLOAD_NO_PROGRESS 1
-    LOG_CONFIGURE 1
-    LOG_BUILD 1
-    LOG_INSTALL 1)
-
-  ExternalProject_Get_Property(nlohmann_json_download INSTALL_DIR)
-  set(NLOHMANN_JSON_INCLUDE_DIR
-      ${INSTALL_DIR}/src/nlohmann_json_download/single_include)
-  add_library(nlohmann_json_ INTERFACE)
-  target_include_directories(
-    nlohmann_json_ INTERFACE "$<BUILD_INTERFACE:${NLOHMANN_JSON_INCLUDE_DIR}>"
-                             "$<INSTALL_INTERFACE:include>")
-  add_dependencies(nlohmann_json_ nlohmann_json_download)
-  add_library(nlohmann_json::nlohmann_json ALIAS nlohmann_json_)
-
-  if(OPENTELEMETRY_INSTALL)
-    install(
-      TARGETS nlohmann_json_
-      EXPORT "${PROJECT_NAME}-third_party_nlohmann_json_target"
-      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      COMPONENT third_party_nlohmann_json)
-  endif()
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/opentelemetry-build-external-component.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/opentelemetry-build-external-component.cmake
deleted file mode 100644
index 74b651520..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/opentelemetry-build-external-component.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-function(get_directory_name_in_path PATH_VAR RESULT_VAR)
-  # get_filename_component does not work with paths ending in / or \, so remove it.
-  string(REGEX REPLACE "[/\\]$" "" PATH_TRIMMED "${PATH_VAR}")
-
-  get_filename_component(DIR_NAME ${PATH_TRIMMED} NAME)
-
-  set(${RESULT_VAR} "${DIR_NAME}" PARENT_SCOPE)
-endfunction()
-
-# Enable building external components through otel-cpp build
-# The config options are
-#  - OPENTELEMETRY_EXTERNAL_COMPONENT_PATH - Setting local paths of the external
-# component as env variable. Multiple paths can be set by separating them with.
-#  - OPENTELEMETRY_EXTERNAL_COMPONENT_URL Setting github-repo of external component
-#  as env variable
-
-# Add custom vendor component from local path, or GitHub repo
-# Prefer CMake option, then env variable, then URL.
-if(OPENTELEMETRY_EXTERNAL_COMPONENT_PATH)
-  # Add custom component path to build tree and consolidate binary artifacts in
-  # current project binary output directory.
-  foreach(DIR IN LISTS OPENTELEMETRY_EXTERNAL_COMPONENT_PATH)
-    get_directory_name_in_path(${DIR} EXTERNAL_EXPORTER_DIR_NAME)
-    add_subdirectory(${DIR} ${PROJECT_BINARY_DIR}/external/${EXTERNAL_EXPORTER_DIR_NAME})
-  endforeach()
-elseif(DEFINED ENV{OPENTELEMETRY_EXTERNAL_COMPONENT_PATH})
-  # Add custom component path to build tree and consolidate binary artifacts in
-  # current project binary output directory.
-  set(OPENTELEMETRY_EXTERNAL_COMPONENT_PATH_VAR $ENV{OPENTELEMETRY_EXTERNAL_COMPONENT_PATH})
-  foreach(DIR IN LISTS OPENTELEMETRY_EXTERNAL_COMPONENT_PATH_VAR)
-    get_directory_name_in_path(${DIR} EXTERNAL_EXPORTER_DIR_NAME)
-    add_subdirectory(${DIR} ${PROJECT_BINARY_DIR}/external/${EXTERNAL_EXPORTER_DIR_NAME})
-  endforeach()
-elseif(DEFINED $ENV{OPENTELEMETRY_EXTERNAL_COMPONENT_URL})
-  # This option requires CMake 3.11+: add standard remote repo to build tree.
-  include(FetchContent)
-  FetchContent_Declare(
-    external
-    GIT_REPOSITORY $ENV{OPENTELEMETRY_EXTERNAL_COMPONENT_URL}
-    GIT_TAG "main")
-  FetchContent_GetProperties(external)
-  if(NOT external_POPULATED)
-    FetchContent_Populate(external)
-    add_subdirectory(${external_SOURCE_DIR})
-  endif()
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/opentelemetry-proto.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/opentelemetry-proto.cmake
deleted file mode 100644
index 60b347284..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/opentelemetry-proto.cmake
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# The dependency on opentelemetry-proto can be provided different ways. By order
-# of decreasing priority, options are:
-#
-# 1 - Use a provided package
-#
-# This is useful to build opentelemetry-cpp as part of a super project.
-#
-# The super project provides the path to the opentelemetry-proto source code
-# using variable ${OTELCPP_PROTO_PATH}
-#
-# 2 - Search for a opentelemetry-proto git submodule
-#
-# When git submodule is used, the opentelemetry-proto code is located in:
-# third_party/opentelemetry-proto
-#
-# 3 - Download opentelemetry-proto from github
-#
-# Code from the required version is used, unless a specific release tag is
-# provided in variable ${opentelemetry-proto}
-#
-
-if(OTELCPP_PROTO_PATH)
-  if(NOT EXISTS
-     "${OTELCPP_PROTO_PATH}/opentelemetry/proto/common/v1/common.proto")
-    message(
-      FATAL_ERROR
-        "OTELCPP_PROTO_PATH does not point to a opentelemetry-proto repository")
-  endif()
-  message(STATUS "opentelemetry-proto dependency satisfied by: external path")
-  set(PROTO_PATH ${OTELCPP_PROTO_PATH})
-  set(needs_proto_download FALSE)
-else()
-  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto/.git)
-    message(STATUS "opentelemetry-proto dependency satisfied by: git submodule")
-    set(PROTO_PATH
-        "${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto")
-    set(needs_proto_download FALSE)
-  else()
-    message(
-      STATUS "opentelemetry-proto dependency satisfied by: github download")
-    if("${opentelemetry-proto}" STREQUAL "")
-      file(READ "${CMAKE_CURRENT_LIST_DIR}/../third_party_release"
-           OTELCPP_THIRD_PARTY_RELEASE_CONTENT)
-      if(OTELCPP_THIRD_PARTY_RELEASE_CONTENT MATCHES
-         "opentelemetry-proto=[ \\t]*([A-Za-z0-9_\\.\\-]+)")
-        set(opentelemetry-proto "${CMAKE_MATCH_1}")
-      else()
-        set(opentelemetry-proto "v1.6.0")
-      endif()
-      unset(OTELCPP_THIRD_PARTY_RELEASE_CONTENT)
-    endif()
-    include(ExternalProject)
-    ExternalProject_Add(
-      opentelemetry-proto
-      GIT_REPOSITORY https://github.com/open-telemetry/opentelemetry-proto.git
-      GIT_TAG "${opentelemetry-proto}"
-      UPDATE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      CONFIGURE_COMMAND ""
-      TEST_AFTER_INSTALL 0
-      DOWNLOAD_NO_PROGRESS 1
-      LOG_CONFIGURE 1
-      LOG_BUILD 1
-      LOG_INSTALL 1)
-    ExternalProject_Get_Property(opentelemetry-proto INSTALL_DIR)
-    set(PROTO_PATH "${INSTALL_DIR}/src/opentelemetry-proto")
-    set(needs_proto_download TRUE)
-  endif()
-endif()
-
-set(COMMON_PROTO "${PROTO_PATH}/opentelemetry/proto/common/v1/common.proto")
-set(RESOURCE_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/resource/v1/resource.proto")
-set(TRACE_PROTO "${PROTO_PATH}/opentelemetry/proto/trace/v1/trace.proto")
-set(LOGS_PROTO "${PROTO_PATH}/opentelemetry/proto/logs/v1/logs.proto")
-set(METRICS_PROTO "${PROTO_PATH}/opentelemetry/proto/metrics/v1/metrics.proto")
-
-set(PROFILES_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/profiles/v1development/profiles.proto")
-
-set(TRACE_SERVICE_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.proto")
-set(LOGS_SERVICE_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.proto")
-set(METRICS_SERVICE_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.proto"
-)
-
-set(PROFILES_SERVICE_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.proto"
-)
-
-set(GENERATED_PROTOBUF_PATH
-    "${CMAKE_BINARY_DIR}/generated/third_party/opentelemetry-proto")
-
-file(MAKE_DIRECTORY "${GENERATED_PROTOBUF_PATH}")
-
-set(COMMON_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/common/v1/common.pb.cc")
-set(COMMON_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/common/v1/common.pb.h")
-set(RESOURCE_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/resource/v1/resource.pb.cc")
-set(RESOURCE_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/resource/v1/resource.pb.h")
-set(TRACE_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/trace/v1/trace.pb.cc")
-set(TRACE_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/trace/v1/trace.pb.h")
-set(LOGS_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/logs/v1/logs.pb.cc")
-set(LOGS_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/logs/v1/logs.pb.h")
-set(METRICS_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/metrics/v1/metrics.pb.cc")
-set(METRICS_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/metrics/v1/metrics.pb.h")
-
-set(TRACE_SERVICE_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.pb.cc"
-)
-set(TRACE_SERVICE_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-)
-
-#
-# Notes about the PROFILES signal: - *.proto files added in opentelemetry-proto
-# 1.3.0 - C++ code is generated from proto files - The generated code is not
-# used yet.
-#
-
-set(PROFILES_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/profiles/v1development/profiles.pb.cc"
-)
-set(PROFILES_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/profiles/v1development/profiles.pb.h"
-)
-set(PROFILES_SERVICE_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.pb.h"
-)
-set(PROFILES_SERVICE_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.pb.cc"
-)
-
-if(WITH_OTLP_GRPC)
-  set(PROFILES_SERVICE_GRPC_PB_H_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.grpc.pb.h"
-  )
-  set(PROFILES_SERVICE_GRPC_PB_CPP_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.grpc.pb.cc"
-  )
-endif()
-
-if(WITH_OTLP_GRPC)
-  set(TRACE_SERVICE_GRPC_PB_CPP_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.cc"
-  )
-  set(TRACE_SERVICE_GRPC_PB_H_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h"
-  )
-endif()
-set(LOGS_SERVICE_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.pb.cc"
-)
-set(LOGS_SERVICE_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-)
-if(WITH_OTLP_GRPC)
-  set(LOGS_SERVICE_GRPC_PB_CPP_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.cc"
-  )
-  set(LOGS_SERVICE_GRPC_PB_H_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h"
-  )
-endif()
-set(METRICS_SERVICE_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.pb.cc"
-)
-set(METRICS_SERVICE_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-)
-if(WITH_OTLP_GRPC)
-  set(METRICS_SERVICE_GRPC_PB_CPP_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.cc"
-  )
-  set(METRICS_SERVICE_GRPC_PB_H_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h"
-  )
-endif()
-
-foreach(IMPORT_DIR ${PROTOBUF_IMPORT_DIRS})
-  list(APPEND PROTOBUF_INCLUDE_FLAGS "-I${IMPORT_DIR}")
-endforeach()
-
-if(WITH_OTLP_GRPC)
-  if(CMAKE_CROSSCOMPILING)
-    find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
-  else()
-    if(TARGET gRPC::grpc_cpp_plugin)
-      project_build_tools_get_imported_location(gRPC_CPP_PLUGIN_EXECUTABLE
-                                                gRPC::grpc_cpp_plugin)
-    else()
-      find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
-    endif()
-  endif()
-  message(STATUS "gRPC_CPP_PLUGIN_EXECUTABLE=${gRPC_CPP_PLUGIN_EXECUTABLE}")
-endif()
-
-set(PROTOBUF_COMMON_FLAGS "--proto_path=${PROTO_PATH}"
-                          "--cpp_out=${GENERATED_PROTOBUF_PATH}")
-# --experimental_allow_proto3_optional is available from 3.13 and be stable and
-# enabled by default from 3.16
-if(Protobuf_VERSION AND Protobuf_VERSION VERSION_LESS "3.16")
-  list(APPEND PROTOBUF_COMMON_FLAGS "--experimental_allow_proto3_optional")
-elseif(PROTOBUF_VERSION AND PROTOBUF_VERSION VERSION_LESS "3.16")
-  list(APPEND PROTOBUF_COMMON_FLAGS "--experimental_allow_proto3_optional")
-endif()
-
-set(PROTOBUF_GENERATED_FILES
-    ${COMMON_PB_H_FILE}
-    ${COMMON_PB_CPP_FILE}
-    ${RESOURCE_PB_H_FILE}
-    ${RESOURCE_PB_CPP_FILE}
-    ${TRACE_PB_H_FILE}
-    ${TRACE_PB_CPP_FILE}
-    ${LOGS_PB_H_FILE}
-    ${LOGS_PB_CPP_FILE}
-    ${METRICS_PB_H_FILE}
-    ${METRICS_PB_CPP_FILE}
-    ${PROFILES_H_FILE}
-    ${PROFILES_CPP_FILE}
-    ${TRACE_SERVICE_PB_H_FILE}
-    ${TRACE_SERVICE_PB_CPP_FILE}
-    ${LOGS_SERVICE_PB_H_FILE}
-    ${LOGS_SERVICE_PB_CPP_FILE}
-    ${METRICS_SERVICE_PB_H_FILE}
-    ${METRICS_SERVICE_PB_CPP_FILE}
-    ${PROFILES_SERVICE_PB_H_FILE}
-    ${PROFILES_SERVICE_PB_CPP_FILE})
-
-if(WITH_OTLP_GRPC)
-  list(APPEND PROTOBUF_COMMON_FLAGS
-       "--grpc_out=generate_mock_code=true:${GENERATED_PROTOBUF_PATH}"
-       --plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}")
-
-  list(
-    APPEND
-    PROTOBUF_GENERATED_FILES
-    ${TRACE_SERVICE_GRPC_PB_H_FILE}
-    ${TRACE_SERVICE_GRPC_PB_CPP_FILE}
-    ${LOGS_SERVICE_GRPC_PB_H_FILE}
-    ${LOGS_SERVICE_GRPC_PB_CPP_FILE}
-    ${METRICS_SERVICE_GRPC_PB_H_FILE}
-    ${METRICS_SERVICE_GRPC_PB_CPP_FILE}
-    ${PROFILES_SERVICE_GRPC_PB_H_FILE}
-    ${PROFILES_SERVICE_GRPC_PB_CPP_FILE})
-endif()
-
-set(PROTOBUF_RUN_PROTOC_COMMAND "\"${PROTOBUF_PROTOC_EXECUTABLE}\"")
-foreach(
-  PROTOBUF_RUN_PROTOC_ARG
-  ${PROTOBUF_COMMON_FLAGS}
-  ${PROTOBUF_INCLUDE_FLAGS}
-  ${COMMON_PROTO}
-  ${RESOURCE_PROTO}
-  ${TRACE_PROTO}
-  ${LOGS_PROTO}
-  ${METRICS_PROTO}
-  ${PROFILES_PROTO}
-  ${TRACE_SERVICE_PROTO}
-  ${LOGS_SERVICE_PROTO}
-  ${METRICS_SERVICE_PROTO}
-  ${PROFILES_SERVICE_PROTO})
-  set(PROTOBUF_RUN_PROTOC_COMMAND
-      "${PROTOBUF_RUN_PROTOC_COMMAND} \"${PROTOBUF_RUN_PROTOC_ARG}\"")
-endforeach()
-
-add_custom_command(
-  OUTPUT ${PROTOBUF_GENERATED_FILES}
-  COMMAND
-    ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTOBUF_COMMON_FLAGS}
-    ${PROTOBUF_INCLUDE_FLAGS} ${COMMON_PROTO} ${RESOURCE_PROTO} ${TRACE_PROTO}
-    ${LOGS_PROTO} ${METRICS_PROTO} ${TRACE_SERVICE_PROTO} ${LOGS_SERVICE_PROTO}
-    ${METRICS_SERVICE_PROTO} ${PROFILES_PROTO} ${PROFILES_SERVICE_PROTO}
-  COMMENT "[Run]: ${PROTOBUF_RUN_PROTOC_COMMAND}"
-  DEPENDS ${PROTOBUF_PROTOC_EXECUTABLE})
-
-unset(OTELCPP_PROTO_TARGET_OPTIONS)
-if(CMAKE_SYSTEM_NAME MATCHES "Windows|MinGW|WindowsStore")
-  list(APPEND OTELCPP_PROTO_TARGET_OPTIONS STATIC)
-elseif(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
-  list(APPEND OTELCPP_PROTO_TARGET_OPTIONS SHARED)
-else()
-  list(APPEND OTELCPP_PROTO_TARGET_OPTIONS STATIC)
-endif()
-
-set(OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto)
-add_library(
-  opentelemetry_proto
-  ${OTELCPP_PROTO_TARGET_OPTIONS}
-  ${COMMON_PB_CPP_FILE}
-  ${RESOURCE_PB_CPP_FILE}
-  ${TRACE_PB_CPP_FILE}
-  ${LOGS_PB_CPP_FILE}
-  ${METRICS_PB_CPP_FILE}
-  ${TRACE_SERVICE_PB_CPP_FILE}
-  ${LOGS_SERVICE_PB_CPP_FILE}
-  ${METRICS_SERVICE_PB_CPP_FILE})
-set_target_version(opentelemetry_proto)
-
-target_include_directories(
-  opentelemetry_proto
-  PUBLIC "$<BUILD_INTERFACE:${GENERATED_PROTOBUF_PATH}>"
-         "$<INSTALL_INTERFACE:include>")
-
-# Disable include-what-you-use on generated code.
-set_target_properties(opentelemetry_proto PROPERTIES CXX_INCLUDE_WHAT_YOU_USE
-                                                     "")
-if(NOT Protobuf_INCLUDE_DIRS AND TARGET protobuf::libprotobuf)
-  get_target_property(Protobuf_INCLUDE_DIRS protobuf::libprotobuf
-                      INTERFACE_INCLUDE_DIRECTORIES)
-endif()
-if(Protobuf_INCLUDE_DIRS)
-  target_include_directories(
-    opentelemetry_proto BEFORE
-    PUBLIC "$<BUILD_INTERFACE:${Protobuf_INCLUDE_DIRS}>")
-endif()
-
-if(WITH_OTLP_GRPC)
-  add_library(
-    opentelemetry_proto_grpc
-    ${OTELCPP_PROTO_TARGET_OPTIONS} ${TRACE_SERVICE_GRPC_PB_CPP_FILE}
-    ${LOGS_SERVICE_GRPC_PB_CPP_FILE} ${METRICS_SERVICE_GRPC_PB_CPP_FILE})
-  set_target_version(opentelemetry_proto_grpc)
-
-  # Disable include-what-you-use on generated code.
-  set_target_properties(opentelemetry_proto_grpc
-                        PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "")
-
-  list(APPEND OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto_grpc)
-  target_link_libraries(opentelemetry_proto_grpc PUBLIC opentelemetry_proto)
-
-  get_target_property(grpc_lib_type gRPC::grpc++ TYPE)
-  if(grpc_lib_type STREQUAL "SHARED_LIBRARY")
-    target_link_libraries(opentelemetry_proto_grpc PUBLIC gRPC::grpc++)
-  endif()
-  set_target_properties(opentelemetry_proto_grpc PROPERTIES EXPORT_NAME
-                                                            proto_grpc)
-  patch_protobuf_targets(opentelemetry_proto_grpc)
-  get_target_property(GRPC_INCLUDE_DIRECTORY gRPC::grpc++
-                      INTERFACE_INCLUDE_DIRECTORIES)
-  if(GRPC_INCLUDE_DIRECTORY)
-    target_include_directories(
-      opentelemetry_proto_grpc BEFORE
-      PUBLIC "$<BUILD_INTERFACE:${GRPC_INCLUDE_DIRECTORY}>")
-  endif()
-endif()
-
-if(needs_proto_download)
-  add_dependencies(opentelemetry_proto opentelemetry-proto)
-endif()
-set_target_properties(opentelemetry_proto PROPERTIES EXPORT_NAME proto)
-patch_protobuf_targets(opentelemetry_proto)
-
-if(OPENTELEMETRY_INSTALL)
-  install(
-    DIRECTORY ${GENERATED_PROTOBUF_PATH}/opentelemetry
-    DESTINATION include
-    COMPONENT exporters_otlp_common
-    FILES_MATCHING
-    PATTERN "*.h")
-endif()
-
-if(TARGET protobuf::libprotobuf)
-  target_link_libraries(opentelemetry_proto PUBLIC protobuf::libprotobuf)
-else() # cmake 3.8 or lower
-  target_link_libraries(opentelemetry_proto PUBLIC ${Protobuf_LIBRARIES})
-endif()
-
-# this is needed on some older grcp versions specifically conan recipe for grpc/1.54.3
-if(WITH_OTLP_GRPC)
-  if(TARGET absl::synchronization)
-    target_link_libraries(opentelemetry_proto_grpc
-                          PUBLIC "$<BUILD_INTERFACE:absl::synchronization>")
-  endif()
-endif()
-
-if(BUILD_SHARED_LIBS)
-  foreach(proto_target ${OPENTELEMETRY_PROTO_TARGETS})
-    set_property(TARGET ${proto_target} PROPERTY POSITION_INDEPENDENT_CODE ON)
-  endforeach()
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/otel-install-functions.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/otel-install-functions.cmake
deleted file mode 100644
index 8d72c12ce..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/otel-install-functions.cmake
+++ /dev/null
@@ -1,506 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-include("${PROJECT_SOURCE_DIR}/cmake/thirdparty-dependency-config.cmake")
-
-########################################################################
-# INTERNAL FUNCTIONS - do not call directly. Use the otel_* "Main" functions
-########################################################################
-
-#-----------------------------------------------------------------------
-# _otel_set_component_properties:
-#   Sets the component properties used for install.
-#   Properties set on PROJECT_SOURCE_DIR directory include:
-#     OTEL_COMPONENTS_LIST: List of components added using otel_add_component
-#     OTEL_COMPONENT_TARGETS_<component>: List of targets associated with the component
-#     OTEL_COMPONENT_TARGETS_ALIAS_<component>: List of targets aliases associated with the component
-#     OTEL_COMPONENT_FILES_DIRECTORY_<component>: Directory containing files to be installed with the component
-#     OTEL_COMPONENT_FILES_DESTINATION_<component>: Destination directory for the files
-#     OTEL_COMPONENT_FILES_MATCHING_<component>: Matching pattern for the files to be installed
-#     OTEL_COMPONENT_DEPENDS_<component>: List of components that this component depends on
-#     OTEL_COMPONENT_THIRDPARTY_DEPENDS_<component>: List of thirdparty dependencies that this component depends on
-#-----------------------------------------------------------------------
-function(_otel_set_component_properties)
-    set(optionArgs )
-    set(oneValueArgs COMPONENT FILES_DIRECTORY FILES_DESTINATION)
-    set(multiValueArgs TARGETS TARGETS_ALIAS FILES_MATCHING COMPONENT_DEPENDS THIRDPARTY_DEPENDS)
-    cmake_parse_arguments(_PROPERTIES "${optionArgs}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
-
-    # Add the component to the current components list
-    get_property(existing_components DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENTS_LIST)
-    if(_PROPERTIES_COMPONENT IN_LIST existing_components)
-      message(FATAL_ERROR "  component ${_PROPERTIES_COMPONENT} has already been created.")
-    endif()
-    list(APPEND existing_components "${_PROPERTIES_COMPONENT}")
-    set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENTS_LIST "${existing_components}")
-
-    # Set the component targets property
-    if(_PROPERTIES_TARGETS)
-      set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_TARGETS_${_PROPERTIES_COMPONENT} "${_PROPERTIES_TARGETS}")
-    else()
-      message(FATAL_ERROR "  component ${_PROPERTIES_COMPONENT} does not have any targets.")
-    endif()
-
-    # Set the component targets alias property
-    if(_PROPERTIES_TARGETS_ALIAS)
-      set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_TARGETS_ALIAS_${_PROPERTIES_COMPONENT} "${_PROPERTIES_TARGETS_ALIAS}")
-    endif()
-
-    # Set the component files property
-    if(_PROPERTIES_FILES_DIRECTORY)
-      if(NOT _PROPERTIES_FILES_DESTINATION)
-        message(FATAL_ERROR "  component ${_PROPERTIES_COMPONENT} has FILES_DIRECTORY set and must have FILES_DESINATION set.")
-      endif()
-      if(NOT _PROPERTIES_FILES_MATCHING)
-        message(FATAL_ERROR "  component ${_PROPERTIES_COMPONENT} has FILES_DIRECTORY set and must have FILES_MATCHING set.")
-      endif()
-
-      set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_FILES_DIRECTORY_${_PROPERTIES_COMPONENT} "${_PROPERTIES_FILES_DIRECTORY}")
-      set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_FILES_DESTINATION_${_PROPERTIES_COMPONENT} "${_PROPERTIES_FILES_DESTINATION}")
-      set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_FILES_MATCHING_${_PROPERTIES_COMPONENT} "${_PROPERTIES_FILES_MATCHING}")
-    endif()
-
-    if(_PROPERTIES_COMPONENT_DEPENDS)
-      set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_DEPENDS_${_PROPERTIES_COMPONENT} "${_PROPERTIES_COMPONENT_DEPENDS}")
-    endif()
-
-    if(_PROPERTIES_THIRDPARTY_DEPENDS)
-      set_property(DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_THIRDPARTY_DEPENDS_${_PROPERTIES_COMPONENT} "${_PROPERTIES_THIRDPARTY_DEPENDS}")
-    endif()
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_set_target_component_property:
-#   Sets the target's INTERFACE_OTEL_COMPONENT_NAME property to the component.
-#   A target can only be assigned to one component.
-# Note: The INTERFACE_* prefix can be dropped with CMake 3.19+ when custom
-#       properties without the prefix are supported on INTERFACE targets.
-#-----------------------------------------------------------------------
-function(_otel_set_target_component_property _TARGET _COMPONENT)
-  get_target_property(_TARGET_COMPONENT ${_TARGET} INTERFACE_OTEL_COMPONENT_NAME)
-  if(_TARGET_COMPONENT)
-    message(FATAL_ERROR "  Target ${_TARGET} is already assigned to an opentelemetry-cpp COMPONENT ${_TARGET_COMPONENT}.")
-  endif()
-  set_target_properties(${_TARGET} PROPERTIES INTERFACE_OTEL_COMPONENT_NAME ${_OTEL_ADD_COMP_COMPONENT})
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_append_dependent_components:
-#   Appends the dependent component to the OUT_COMPONENTS variable.
-#   The dependent component is defined in the OTEL_COMPONENT_DEPENDS_<component> property
-#   on the PROJECT_SOURCE_DIR directory.
-#-----------------------------------------------------------------------
-function(_otel_append_dependent_components _COMPONENT OUT_COMPONENTS)
-  get_property(_COMPONENT_DEPENDS DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_DEPENDS_${_COMPONENT})
-  if(_COMPONENT_DEPENDS)
-    set(_output_components "${${OUT_COMPONENTS}}")
-    message(DEBUG "  - adding dependent component ${_COMPONENT_DEPENDS} from component ${_COMPONENT}")
-    list(APPEND _output_components ${_COMPONENT_DEPENDS})
-    set(${OUT_COMPONENTS} "${_output_components}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_append_component_found:
-#   Checks if the target is associated with an otel component using the INTERFACE_OTEL_COMPONENT_NAME target property.
-#   If so then the component is appended to the OUT_COMPONENTS varaiable.
-#-----------------------------------------------------------------------
-function(_otel_append_component_found _COMPONENT _TARGET OUT_COMPONENTS OUT_COMPONENT_FOUND)
-  set(_output_components "${${OUT_COMPONENTS}}")
-  get_target_property(_DEPEND_COMPONENT ${_TARGET} INTERFACE_OTEL_COMPONENT_NAME)
-  if(_DEPEND_COMPONENT AND NOT ${_DEPEND_COMPONENT} STREQUAL ${_COMPONENT})
-    _otel_append_dependent_components(${_DEPEND_COMPONENT} _output_components)
-    message(DEBUG "  - adding dependent component ${_DEPEND_COMPONENT} from target ${_TARGET}")
-    list(APPEND _output_components ${_DEPEND_COMPONENT})
-    set(${OUT_COMPONENT_FOUND} TRUE PARENT_SCOPE)
-  else()
-    set(${OUT_COMPONENT_FOUND} FALSE PARENT_SCOPE)
-  endif()
-  set(${OUT_COMPONENTS} "${_output_components}" PARENT_SCOPE)
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_append_thirdparty_found:
-#   Tries to match one of the supported third-party dependencies to the target name.
-#   If found the dependency project name is appended to the OUT_THIRDPARTY_DEPS variable.
-#   The match is based on the OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED list and optional
-#   OTEL_<dependency>_TARGET_NAMESPACE variables.
-#------------------------------------------------------------------------
-function(_otel_append_thirdparty_found _TARGET OUT_THIRDPARTY_DEPS)
-  set(_output_thirdparty_deps "${${OUT_THIRDPARTY_DEPS}}")
-
-  foreach(_DEPENDENCY ${OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED})
-    # Search for the dependency namespace in the target name
-    if(NOT "${OTEL_${_DEPENDENCY}_TARGET_NAMESPACE}" STREQUAL "")
-      set(_DEPENDENCY_NAMESPACE "${OTEL_${_DEPENDENCY}_TARGET_NAMESPACE}")
-    else()
-      set(_DEPENDENCY_NAMESPACE "${_DEPENDENCY}")
-    endif()
-    string(FIND "${_TARGET}" "${_DEPENDENCY_NAMESPACE}" _is_thirdparty)
-    if(_is_thirdparty GREATER -1)
-      message(DEBUG "  - adding thirdparty dependency ${_DEPENDENCY} from target ${_TARGET}")
-      list(APPEND _output_thirdparty_deps ${_DEPENDENCY})
-    endif()
-  endforeach()
-  set(${OUT_THIRDPARTY_DEPS} "${_output_thirdparty_deps}" PARENT_SCOPE)
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_collect_component_dependencies:
-#   Collects the component to component dependencies and thirdparty dependencies of a target.
-#   The dependencies are collected from the target's LINK_LIBRARIES property# and are appended
-#   to the OUT_COMPONENT_DEPS and OUT_THIRDPARTY_DEPS variables.
-#------------------------------------------------------------------------
-function(_otel_collect_component_dependencies _TARGET _COMPONENT OUT_COMPONENT_DEPS OUT_THIRDPARTY_DEPS)
-  get_target_property(_TARGET_TYPE ${_TARGET} TYPE)
-  message(DEBUG "  Target: ${_TARGET} - Type: ${_TARGET_TYPE}")
-
-  # Set the linked libraries to search for dependencies
-  set(_linked_libraries "")
-  if(_TARGET_TYPE STREQUAL "INTERFACE_LIBRARY")
-    get_target_property(_interface_libs ${_TARGET} INTERFACE_LINK_LIBRARIES)
-    set(_linked_libraries "${_interface_libs}")
-    message(DEBUG "  - INTERFACE_LINK_LIBRARIES: ${_interface_libs}")
-  else()
-    get_target_property(_link_libs ${_TARGET} LINK_LIBRARIES)
-    set(_linked_libraries "${_link_libs}")
-    message(DEBUG "  - LINK_LIBRARIES: ${_link_libs}")
-  endif()
-
-  set(_component_deps "${${OUT_COMPONENT_DEPS}}")
-  set(_thirdparty_deps "${${OUT_THIRDPARTY_DEPS}}")
-
-  foreach(_linked_target ${_linked_libraries})
-    # Handle targets
-    if(TARGET "${_linked_target}")
-      set(_component_found FALSE)
-      _otel_append_component_found(${_COMPONENT} "${_linked_target}" _component_deps _component_found)
-      if(NOT ${_component_found})
-        _otel_append_thirdparty_found(${_linked_target} _thirdparty_deps)
-      endif()
-      continue()
-    endif()
-
-    # Skip BUILD_INTERFACE targets
-    string(FIND "${_linked_target}" "$<BUILD_INTERFACE:" _is_build_interface)
-    if(_is_build_interface GREATER -1)
-      message(DEBUG "  - skipping BUILD_INTERFACE target: ${_linked_target}")
-      continue()
-    endif()
-
-    # Handle targets in generator expressions
-    string(FIND "${_linked_target}" "$<" _is_generator_expression)
-    if(_is_generator_expression GREATER -1)
-      # Find targets in generator expressions (there can be more than one per expression)
-      string(REGEX MATCHALL "[A-Za-z0-9_\\-\\.]+(::[A-Za-z0-9_\\-\\.]+)*" _parsed_targets "${_linked_target}")
-      foreach(_parsed_target ${_parsed_targets})
-        if(TARGET ${_parsed_target})
-          set(_component_found FALSE)
-          _otel_append_component_found(${_COMPONENT} "${_parsed_target}" _component_deps _component_found)
-          if(NOT ${_component_found})
-            _otel_append_thirdparty_found(${_parsed_target} _thirdparty_deps)
-          endif()
-        endif()
-      endforeach()
-    endif()
-  endforeach()
-
-  list(REMOVE_DUPLICATES _component_deps)
-  list(REMOVE_DUPLICATES _thirdparty_deps)
-
-  set(${OUT_COMPONENT_DEPS} "${_component_deps}" PARENT_SCOPE)
-  set(${OUT_THIRDPARTY_DEPS} "${_thirdparty_deps}" PARENT_SCOPE)
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_add_target_alias:
-#   Adds an alias target using target's export name and project name.
-#   opentelemetry-cpp::<target_export_name>
-#------------------------------------------------------------------------
-function(_otel_add_target_alias _TARGET OUT_ALIAS_TARGETS)
-  get_target_property(_TARGET_EXPORT_NAME ${_TARGET} EXPORT_NAME)
-  if(NOT _TARGET_EXPORT_NAME)
-    message(FATAL_ERROR "  Target ${_TARGET} does not have an EXPORT_NAME property.")
-  elseif(NOT TARGET "${PROJECT_NAME}::${_TARGET_EXPORT_NAME}")
-    add_library("${PROJECT_NAME}::${_TARGET_EXPORT_NAME}" ALIAS ${_TARGET})
-  endif()
-  set(_alias_targets "${${OUT_ALIAS_TARGETS}}")
-  list(APPEND _alias_targets "${PROJECT_NAME}::${_TARGET_EXPORT_NAME}")
-  set(${OUT_ALIAS_TARGETS} "${_alias_targets}" PARENT_SCOPE)
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_install_component:
-#   Installs the component targets and optional files
-#-----------------------------------------------------------------------
-function(_otel_install_component _COMPONENT)
-  install(
-    TARGETS ${_COMPONENT_TARGETS}
-    EXPORT "${PROJECT_NAME}-${_COMPONENT}-target"
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_COMPONENT})
-
-  install(
-    EXPORT "${PROJECT_NAME}-${_COMPONENT}-target"
-    FILE "${PROJECT_NAME}-${_COMPONENT}-target.cmake"
-    NAMESPACE "${PROJECT_NAME}::"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-    COMPONENT ${_COMPONENT})
-
-  if(_COMPONENT_FILES_DIRECTORY)
-    install(
-      DIRECTORY ${_COMPONENT_FILES_DIRECTORY}
-      DESTINATION ${_COMPONENT_FILES_DESTINATION}
-      COMPONENT ${_COMPONENT}
-      FILES_MATCHING ${_COMPONENT_FILES_MATCHING})
-  endif()
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_populate_component_targets_block:
-#   Populates the OTEL_COMPONENTS_TARGETS_BLOCK with the component targets
-#   - sets COMPONENT_<component>_TARGETS variables
-#-----------------------------------------------------------------------
-function(_otel_populate_component_targets_block IN_COMPONENT COMPONENTS_TARGETS_BLOCK)
-  # Populate OTEL_COMPONENTS_TARGETS_BLOCK
-  set(_targets_block ${${COMPONENTS_TARGETS_BLOCK}})
-  string(APPEND _targets_block
-    "# COMPONENT ${IN_COMPONENT}\n"
-    "set(COMPONENT_${IN_COMPONENT}_TARGETS\n"
-  )
-  foreach(_TARGET IN LISTS _COMPONENT_TARGETS_ALIAS)
-    string(APPEND _targets_block "    ${_TARGET}\n")
-  endforeach()
-  string(APPEND _targets_block ")\n\n")
-  set(${COMPONENTS_TARGETS_BLOCK} "${_targets_block}" PARENT_SCOPE)
-endfunction()
-
-#-----------------------------------------------------------------------
-# _otel_populate_component_internal_depends_block:
-#   Populates the OTEL_COMPONENTS_INTERNAL_DEPENDENCIES_BLOCK with the component dependencies
-#   - sets COMPONENT_<component>_COMPONENT_DEPENDS variables
-#-----------------------------------------------------------------------
-function(_otel_populate_component_internal_depends_block IN_COMPONENT COMPONENTS_INTERNAL_DEPENDENCIES_BLOCK)
-  # Populate OTEL_COMPONENTS_INTERNAL_DEPENDENCIES_BLOCK
-  set(_deps_block ${${COMPONENTS_INTERNAL_DEPENDENCIES_BLOCK}})
-  string(APPEND _deps_block
-      "# COMPONENT ${IN_COMPONENT} internal dependencies\n"
-      "set(COMPONENT_${IN_COMPONENT}_COMPONENT_DEPENDS\n"
-    )
-  foreach(dep IN LISTS _COMPONENT_DEPENDS)
-    string(APPEND _deps_block "    ${dep}\n")
-  endforeach()
-  string(APPEND _deps_block ")\n\n")
-  set(${COMPONENTS_INTERNAL_DEPENDENCIES_BLOCK} "${_deps_block}" PARENT_SCOPE)
-endfunction()
-
-#-----------------------------------------------------------------------
-function(_otel_populate_component_thirdparty_depends_block IN_COMPONENT COMPONENTS_THIRDPARTY_DEPENDENCIES_BLOCK)
-  # Populate OTEL_COMPONENTS_THIRDPARTY_DEPENDENCIES_BLOCK
-  set(_deps_block ${${COMPONENTS_THIRDPARTY_DEPENDENCIES_BLOCK}})
-  string(APPEND _deps_block
-      "# COMPONENT ${IN_COMPONENT} thirdparty dependencies\n"
-      "set(COMPONENT_${IN_COMPONENT}_THIRDPARTY_DEPENDS\n"
-    )
-  foreach(dep IN LISTS _COMPONENT_THIRDPARTY_DEPENDS)
-    string(APPEND _deps_block "    ${dep}\n")
-  endforeach()
-  string(APPEND _deps_block ")\n\n")
-  set(${COMPONENTS_THIRDPARTY_DEPENDENCIES_BLOCK} "${_deps_block}" PARENT_SCOPE)
-endfunction()
-#-----------------------------------------------------------------------
-
-########################################################################
-# Main functions to support installing components
-# and the opentlemetry-cpp cmake package config files
-########################################################################
-
-#-----------------------------------------------------------------------
-# otel_add_component:
-#   Adds a component to the list of components to be installed. A component name and list of targest are required.
-#   Optional files can be added to the component by specifying a directory, destination and matching pattern.
-#   Each target is assigned to the component and its dependencies are identified based on the LINK_LIBRARIES property.
-#   An alias target is also created for each target in the form of PROJECT_NAME::TARGET_EXPORT_NAME.
-# Usage:
-#    otel_add_component(
-#      COMPONENT <component_name>
-#      TARGETS <target1> <target2> ...
-#      FILES_DIRECTORY <directory>
-#      FILES_DESTINATION <destination>
-#      FILES_MATCHING <matching>)
-#-----------------------------------------------------------------------
-function(otel_add_component)
-  set(optionArgs )
-  set(oneValueArgs COMPONENT FILES_DIRECTORY FILES_DESTINATION)
-  set(multiValueArgs TARGETS FILES_MATCHING)
-  cmake_parse_arguments(_OTEL_ADD_COMP "${optionArgs}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
-
-  if(NOT _OTEL_ADD_COMP_COMPONENT)
-    message(FATAL_ERROR "otel_add_component: COMPONENT is required")
-  endif()
-
-  if(NOT _OTEL_ADD_COMP_TARGETS)
-    message(FATAL_ERROR "otel_add_component: TARGETS is required")
-  endif()
-
-  message(DEBUG "Add COMPONENT: ${_OTEL_ADD_COMP_COMPONENT}")
-  set(_COMPONENT_DEPENDS "")
-  set(_THIRDPARTY_DEPENDS "")
-  set(_ALIAS_TARGETS "")
-
-  foreach(_TARGET ${_OTEL_ADD_COMP_TARGETS})
-    if(NOT TARGET ${_TARGET})
-      message(FATAL_ERROR "  Target ${_TARGET} not found")
-    endif()
-    _otel_set_target_component_property(${_TARGET} ${_OTEL_ADD_COMP_COMPONENT})
-    _otel_collect_component_dependencies(${_TARGET} ${_OTEL_ADD_COMP_COMPONENT} _COMPONENT_DEPENDS _THIRDPARTY_DEPENDS)
-    _otel_add_target_alias(${_TARGET} _ALIAS_TARGETS)
-  endforeach()
-
-  if(_OTEL_ADD_COMP_FILES_DIRECTORY)
-    set(_OTEL_ADD_COMP_FILES_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${_OTEL_ADD_COMP_FILES_DIRECTORY}")
-  endif()
-
-  message(DEBUG "  TARGETS: ${_OTEL_ADD_COMP_TARGETS}")
-  message(DEBUG "  TARGETS_ALIAS: ${_ALIAS_TARGETS}")
-  message(DEBUG "  COMPONENT_DEPENDS: ${_COMPONENT_DEPENDS}")
-  message(DEBUG "  THIRDPARTY_DEPENDS: ${_THIRDPARTY_DEPENDS}")
-  message(DEBUG "  FILES_DIRECTORY: ${_OTEL_ADD_COMP_FILES_DIRECTORY}")
-  message(DEBUG "  FILES_DESTINATION: ${_OTEL_ADD_COMP_FILES_DESTINATION}")
-  message(DEBUG "  FILES_MATCHING: ${_OTEL_ADD_COMP_FILES_MATCHING}")
-
-  _otel_set_component_properties(
-    COMPONENT ${_OTEL_ADD_COMP_COMPONENT}
-    TARGETS ${_OTEL_ADD_COMP_TARGETS}
-    TARGETS_ALIAS ${_ALIAS_TARGETS}
-    FILES_DIRECTORY ${_OTEL_ADD_COMP_FILES_DIRECTORY}
-    FILES_DESTINATION ${_OTEL_ADD_COMP_FILES_DESTINATION}
-    FILES_MATCHING ${_OTEL_ADD_COMP_FILES_MATCHING}
-    COMPONENT_DEPENDS ${_COMPONENT_DEPENDS}
-    THIRDPARTY_DEPENDS ${_THIRDPARTY_DEPENDS})
-endfunction()
-
-#-----------------------------------------------------------------------
-# otel_install_components:
-#   Installs all components that have been added using otel_add_component.
-#   The components are installed in the order they were added.
-#   The install function will create a cmake config file for each component
-#   that contains the component name, targets, dependencies and thirdparty dependencies.
-# Usage:
-#    otel_install_components()
-#-----------------------------------------------------------------------
-function(otel_install_components)
-  get_property(OTEL_BUILT_COMPONENTS_LIST DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENTS_LIST)
-  message(STATUS "Installing components:")
-  set(OTEL_COMPONENTS_TARGETS_BLOCK "")
-  set(OTEL_COMPONENTS_INTERNAL_DEPENDENCIES_BLOCK "")
-  set(OTEL_COMPONENTS_THIRDPARTY_DEPENDENCIES_BLOCK "")
-
-  foreach(_COMPONENT ${OTEL_BUILT_COMPONENTS_LIST})
-    get_property(_COMPONENT_DEPENDS DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_DEPENDS_${_COMPONENT})
-    get_property(_COMPONENT_TARGETS DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_TARGETS_${_COMPONENT})
-    get_property(_COMPONENT_TARGETS_ALIAS DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_TARGETS_ALIAS_${_COMPONENT})
-    get_property(_COMPONENT_THIRDPARTY_DEPENDS DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_THIRDPARTY_DEPENDS_${_COMPONENT})
-    get_property(_COMPONENT_FILES_DIRECTORY DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_FILES_DIRECTORY_${_COMPONENT})
-    get_property(_COMPONENT_FILES_DESTINATION DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_FILES_DESTINATION_${_COMPONENT})
-    get_property(_COMPONENT_FILES_MATCHING DIRECTORY ${PROJECT_SOURCE_DIR} PROPERTY OTEL_COMPONENT_FILES_MATCHING_${_COMPONENT})
-
-    message(STATUS "Install COMPONENT ${_COMPONENT}")
-    message(STATUS "  TARGETS: ${_COMPONENT_TARGETS}")
-    message(STATUS "  TARGETS_ALIAS: ${_COMPONENT_TARGETS_ALIAS}")
-    message(STATUS "  COMPONENT_DEPENDS: ${_COMPONENT_DEPENDS}")
-    message(STATUS "  THIRDPARTY_DEPENDS: ${_COMPONENT_THIRDPARTY_DEPENDS}")
-    message(STATUS "  FILES_DIRECTORY: ${_COMPONENT_FILES_DIRECTORY}")
-    message(STATUS "  FILES_DESTINATION: ${_COMPONENT_FILES_DESTINATION}")
-    message(STATUS "  FILES_MATCHING: ${_COMPONENT_FILES_MATCHING}")
-
-    _otel_install_component(${_COMPONENT})
-    _otel_populate_component_targets_block(${_COMPONENT} OTEL_COMPONENTS_TARGETS_BLOCK)
-    _otel_populate_component_internal_depends_block(${_COMPONENT} OTEL_COMPONENTS_INTERNAL_DEPENDENCIES_BLOCK)
-    _otel_populate_component_thirdparty_depends_block(${_COMPONENT} OTEL_COMPONENTS_THIRDPARTY_DEPENDENCIES_BLOCK)
-  endforeach()
-
-  configure_file(
-    "${PROJECT_SOURCE_DIR}/cmake/templates/component-definitions.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake/component-definitions.cmake"
-    @ONLY
-  )
-
-  install(
-    FILES
-      "${CMAKE_CURRENT_BINARY_DIR}/cmake/component-definitions.cmake"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-    COMPONENT cmake-config)
-endfunction()
-
-#-----------------------------------------------------------------------
-# otel_install_thirdparty_definitions:
-#   Installs the thirdparty dependency definitions file that contains the list
-#   of thirdparty dependencies their versions and cmake search modes.
-#   - sets `OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED` to the list of dependencies
-#   - sets `OTEL_<dependency>_VERSION` to the version used to build opentelemetry-cpp
-#   - sets `OTEL_<dependency>_SEARCH_MODE` to the search mode required to find the dependency
-# Usage:
-#    otel_install_thirdparty_definitions()
-#-----------------------------------------------------------------------
-function(otel_install_thirdparty_definitions)
-  set(OTEL_THIRDPARTY_DEPENDENCY_VERSIONS_BLOCK "")
-  set(OTEL_THIRDPARTY_DEPENDENCY_SEARCH_MODES_BLOCK "")
-
-  # Populate OTEL_THIRDPARTY_DEPENDENCY_VERSIONS_BLOCK
-  foreach(_DEPENDENCY ${OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED})
-    string(APPEND OTEL_THIRDPARTY_DEPENDENCY_VERSIONS_BLOCK
-      "set(OTEL_${_DEPENDENCY}_VERSION \"${${_DEPENDENCY}_VERSION}\")\n"
-    )
-  endforeach()
-
-  # Populate OTEL_THIRDPARTY_DEPENDENCY_SEARCH_MODES_BLOCK
-  foreach(_DEPENDENCY ${OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED})
-    string(APPEND OTEL_THIRDPARTY_DEPENDENCY_SEARCH_MODES_BLOCK
-      "set(OTEL_${_DEPENDENCY}_SEARCH_MODE \"${OTEL_${_DEPENDENCY}_SEARCH_MODE}\")\n"
-    )
-  endforeach()
-
-  configure_file(
-    "${PROJECT_SOURCE_DIR}/cmake/templates/thirdparty-dependency-definitions.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake/thirdparty-dependency-definitions.cmake"
-    @ONLY)
-
-  install(
-      FILES
-      "${CMAKE_CURRENT_BINARY_DIR}/cmake/thirdparty-dependency-definitions.cmake"
-      DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-      COMPONENT cmake-config)
-endfunction()
-
-#-----------------------------------------------------------------------
-# otel_install_cmake_config:
-#   Configures and installs the cmake.config package file and version file
-#   to support find_package(opentelemetry-cpp CONFIG COMPONENTS ...)
-# Usage:
-#    otel_install_cmake_config()
-#-----------------------------------------------------------------------
-function(otel_install_cmake_config)
-  # Write config file for find_package(opentelemetry-cpp CONFIG)
-  set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
-  configure_package_config_file(
-    "${PROJECT_SOURCE_DIR}/cmake/templates/opentelemetry-cpp-config.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
-    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-    PATH_VARS OPENTELEMETRY_ABI_VERSION_NO OPENTELEMETRY_VERSION PROJECT_NAME
-              INCLUDE_INSTALL_DIR CMAKE_INSTALL_LIBDIR)
-
-  # Write version file for find_package(opentelemetry-cpp CONFIG)
-  write_basic_package_version_file(
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
-    VERSION ${OPENTELEMETRY_VERSION}
-    COMPATIBILITY ExactVersion)
-
-  install(
-    FILES
-      "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake"
-      "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config-version.cmake"
-      "${CMAKE_CURRENT_LIST_DIR}/cmake/find-package-support-functions.cmake"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-    COMPONENT cmake-config)
-endfunction()
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/package.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/package.cmake
deleted file mode 100644
index c14b38fde..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/package.cmake
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set(CPACK_PACKAGE_VERSION "${OPENTELEMETRY_VERSION}")
-set(CPACK_PACKAGE_DESCRIPTION "OpenTelemetry C++ for Linux")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenTelemetry C++ for Linux - C++ Implementation of OpenTelemetry Specification")
-set(CPACK_PACKAGE_VENDOR "OpenTelemetry")
-set(CPACK_PACKAGE_CONTACT "OpenTelemetry-cpp")
-set(CPACK_PACKAGE_HOMEPAGE_URL "https://opentelemetry.io/")
-set(CMAKE_PROJECT_NAME "opentelemetry-cpp")
-
-option(TARBALL "Build a tarball package" OFF)
-
-if (UNIX AND NOT APPLE)
-    include(cmake/ParseOsRelease.cmake)
-    set(CPACK_SYSTEM_NAME "${OS_RELEASE_ID}-${OS_RELEASE_VERSION_ID}")
-    #set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
-    set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OPENTELEMETRY_VERSION}-${CPACK_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
-
-    # Check if system is deb or rpm capable
-    find_program(RPMCAPABLE rpmbuild)
-    find_program(DEBCAPABLE dpkg-buildpackage)
-    if (TARBALL)
-        set(CPACK_GENERATOR "TGZ")
-        message("-- Package name: ${CPACK_PACKAGE_FILE_NAME}.tar.gz")
-    elseif (DEBCAPABLE MATCHES "NOTFOUND" AND RPMCAPABLE MATCHES "NOTFOUND")
-        message(FATAL_ERROR "Required Package generator not found for either deb or rpm."
-        " Install required package generation software and try again")
-    elseif (NOT DEBCAPABLE MATCHES "NOTFOUND")
-        if (NOT RPMCAPABLE MATCHES "NOTFOUND")
-            message(WARNING "Both deb and rpm package generator found."
-            "Selecting deb as default packager.")
-        endif()
-        set(CPACK_GENERATOR "DEB")
-        set(INSTALL_LIB_DIR
-            ${CMAKE_INSTALL_PREFIX}/lib/${CPACK_DEBIAN_ARCHITECTURE}-linux-gnu)
-        set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-        set(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
-        #set(CPACK_COMPONENTS_ALL headers libraries)
-        set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-        message("-- Package name: ${CPACK_PACKAGE_FILE_NAME}.deb")
-    elseif(NOT RPMCAPABLE MATCHES "NOTFOUND")
-        set(CPACK_GENERATOR "RPM")
-        set(INSTALL_LIB_DIR
-            ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
-        list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/lib64/cmake")
-        list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/lib64/pkgconfig")
-        set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0")
-        message("-- Package name: ${CPACK_PACKAGE_FILE_NAME}.rpm")
-    endif()
-elseif(APPLE)
-    if (TARBALL)
-        set(CPACK_GENERATOR "TGZ")
-        message("-- Package name: ${CPACK_PACKAGE_FILE_NAME}.tar.gz")
-    endif()
-elseif(WIN32)
-    find_program(NUGETCAPABLE nuget)
-    if(NOT NUGETCAPABLE MATCHES "NOTFOUND")
-        set(CPACK_NUGET_PACKAGE_NAME "${CPACK_PROJECT_NAME}")
-        set(CPACK_NUGET_PACKAGE_VERSION "${OPENTELEMETRY_VERSION}")
-        set(CPACK_NUGET_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}")
-        set(CPACK_NUGET_PACKAGE_AUTHORS "${CPACK_PACKAGE_VENDOR}")
-        set(CPACK_NUGET_PACKAGE_TITLE "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-        set(CPACK_NUGET_PACKAGE_OWNERS "${CPACK_PACKAGE_VENDOR}")
-        set(CPACK_NUGET_PACKAGE_HOMEPAGE_URL "${CPACK_PACKAGE_HOMEPAGE_URL}")
-        set(CPACK_NUGET_PACKAGE_DESCRIPTION_SUMMARY "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-        set(CPACK_NUGET_PACKAGE_COPYRIGHT "${CPACK_PACKAGE_VENDOR}")
-        set(CPACK_NUGET_PACKAGE_LICENSEURL "https://www.apache.org/licenses/LICENSE-2.0.txt")
-        set(CPACK_NUGET_PACKAGE_LANGUAGE "en_US")
-        set(CPACK_GENERATOR NuGet)
-    else()
-        set(CPACK_GENERATOR ZIP)
-    endif()
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/patch-imported-config.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/patch-imported-config.cmake
deleted file mode 100644
index 364d5407d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/patch-imported-config.cmake
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Some prebuilt or installed targets may have different CONFIG settings than
-# what we use to configure otel-cpp. This file applies patches to the imported
-# targets in order to use compatible CONFIG settings for fallback.
-
-# Common dependencies
-project_build_tools_patch_default_imported_config(ZLIB::ZLIB)
-
-# protobuf targets
-if(Protobuf_FOUND)
-  project_build_tools_patch_default_imported_config(
-    utf8_range::utf8_range utf8_range::utf8_validity protobuf::libprotobuf-lite
-    protobuf::libprotobuf protobuf::libprotoc)
-endif()
-
-# cares targets
-if(TARGET c-ares::cares)
-  project_build_tools_patch_default_imported_config(c-ares::cares)
-endif()
-
-# curl targets
-if(TARGET CURL::libcurl
-   OR TARGET CURL::libcurl_static
-   OR TARGET CURL::libcurl_shared)
-  project_build_tools_patch_default_imported_config(
-    CURL::libcurl CURL::libcurl_static CURL::libcurl_shared)
-endif()
-
-# abseil targets
-if(TARGET absl::bad_variant_access)
-  project_build_tools_patch_default_imported_config(
-    absl::bad_variant_access
-    absl::raw_logging_internal
-    absl::log_severity
-    absl::log_internal_check_op
-    absl::log_internal_nullguard
-    absl::strings
-    absl::strings_internal
-    absl::base
-    absl::spinlock_wait
-    absl::int128
-    absl::throw_delegate
-    absl::log_internal_message
-    absl::examine_stack
-    absl::stacktrace
-    absl::debugging_internal
-    absl::symbolize
-    absl::demangle_internal
-    absl::malloc_internal
-    absl::log_internal_format
-    absl::log_internal_globals
-    absl::time
-    absl::civil_time
-    absl::time_zone
-    absl::str_format_internal
-    absl::log_internal_proto
-    absl::log_internal_log_sink_set
-    absl::log_globals
-    absl::hash
-    absl::city
-    absl::bad_optional_access
-    absl::low_level_hash
-    absl::log_entry
-    absl::log_sink
-    absl::synchronization
-    absl::graphcycles_internal
-    absl::strerror
-    absl::log_internal_conditions
-    absl::cord
-    absl::cord_internal
-    absl::crc_cord_state
-    absl::crc32c
-    absl::crc_cpu_detect
-    absl::crc_internal
-    absl::cordz_functions
-    absl::exponential_biased
-    absl::cordz_info
-    absl::cordz_handle
-    absl::leak_check
-    absl::die_if_null
-    absl::flags
-    absl::flags_commandlineflag
-    absl::flags_commandlineflag_internal
-    absl::flags_config
-    absl::flags_program_name
-    absl::flags_internal
-    absl::flags_marshalling
-    absl::flags_reflection
-    absl::flags_private_handle_accessor
-    absl::raw_hash_set
-    absl::hashtablez_sampler
-    absl::log_initialize
-    absl::status
-    absl::statusor)
-endif()
-
-# gRPC targets
-if(TARGET gRPC::grpc++)
-  project_build_tools_patch_default_imported_config(
-    gRPC::cares
-    gRPC::re2
-    gRPC::ssl
-    gRPC::crypto
-    gRPC::zlibstatic
-    gRPC::address_sorting
-    gRPC::gpr
-    gRPC::grpc
-    gRPC::grpc_unsecure
-    gRPC::grpc++
-    gRPC::grpc++_alts
-    gRPC::grpc++_error_details
-    gRPC::grpc++_reflection
-    gRPC::grpc++_unsecure
-    gRPC::grpc_authorization_provider
-    gRPC::grpc_plugin_support
-    gRPC::grpcpp_channelz
-    gRPC::upb)
-endif()
-
-# prometheus targets
-if(TARGET prometheus-cpp::core)
-  project_build_tools_patch_default_imported_config(
-    prometheus-cpp::core prometheus-cpp::pull prometheus-cpp::push)
-endif()
-
-# civetweb targets
-if(TARGET civetweb::civetweb)
-  project_build_tools_patch_default_imported_config(
-    civetweb::civetweb civetweb::server civetweb::civetweb-cpp)
-endif()
-
-if(BUILD_TESTING)
-  project_build_tools_patch_default_imported_config(
-    GTest::gtest
-    GTest::gtest_main
-    GTest::gmock
-    GTest::gmock_main
-    GTest::GTest
-    GTest::Main
-    benchmark::benchmark
-    benchmark::benchmark_main)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/pkgconfig.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/pkgconfig.cmake
deleted file mode 100644
index 7bff4cb48..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/pkgconfig.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Unlike functions, macros do not introduce a scope. This is an advantage when
-# trying to set global variables, as we do here.
-macro (opentelemetry_set_pkgconfig_paths)
-    if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
-      set(OPENTELEMETRY_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
-    else ()
-      set(OPENTELEMETRY_PC_LIBDIR
-            "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-    endif ()
-
-    if (IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
-      set(OPENTELEMETRY_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
-    else ()
-      set(OPENTELEMETRY_PC_INCLUDEDIR
-            "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-    endif ()
-endmacro ()
-
-# Create the pkgconfig configuration file (aka *.pc files) and the rules to install it.
-#
-# * library:     the short name of the target, such as `api` or `resources`.
-# * name:        the displayed name of the library, such as "OpenTelemetry API".
-# * description: the description of the library.
-# * ARGN:        the names of any pkgconfig modules the generated module depends on.
-#
-function (opentelemetry_add_pkgconfig library name description)
-  opentelemetry_set_pkgconfig_paths()
-  set(target "opentelemetry_${library}")
-  set(OPENTELEMETRY_PC_NAME "${name}")
-  set(OPENTELEMETRY_PC_DESCRIPTION ${description})
-  string(JOIN " " OPENTELEMETRY_PC_REQUIRES ${ARGN})
-  get_target_property(target_type ${target} TYPE)
-  if ("${target_type}" STREQUAL "INTERFACE_LIBRARY")
-    # Interface libraries only contain headers. They do not generate lib files
-    # to link against with `-l`.
-    set(OPENTELEMETRY_PC_LIBS "")
-  else ()
-    set(OPENTELEMETRY_PC_LIBS "-l${target}")
-  endif ()
-  get_target_property(target_defs ${target} INTERFACE_COMPILE_DEFINITIONS)
-  if (target_defs)
-    foreach (def ${target_defs})
-      string(APPEND OPENTELEMETRY_PC_CFLAGS " -D${def}")
-    endforeach ()
-  endif ()
-
-  # Create and install the pkg-config files.
-  configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/config.pc.in" "${target}.pc" @ONLY)
-  install(
-    FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}.pc"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-endfunction()
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/templates/component-definitions.cmake.in b/ext/opentelemetry-cpp-1.21.0/cmake/templates/component-definitions.cmake.in
deleted file mode 100644
index 8430cc90f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/templates/component-definitions.cmake.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Configured from opentelemetry-cpp/cmake/component-definitions.cmake.in
-
-# ----------------------------------------------------------------------
-# opentelmetry-cpp Built COMPONENT list
-# ----------------------------------------------------------------------
-set(OTEL_BUILT_COMPONENTS_LIST @OTEL_BUILT_COMPONENTS_LIST@)
-
-# ----------------------------------------------------------------------
-# COMPONENT to TARGET lists
-# ----------------------------------------------------------------------
-
-@OTEL_COMPONENTS_TARGETS_BLOCK@
-
-#-----------------------------------------------------------------------
-# COMPONENT to COMPONENT dependencies
-#-----------------------------------------------------------------------
-
-@OTEL_COMPONENTS_INTERNAL_DEPENDENCIES_BLOCK@
-
-
-#-----------------------------------------------------------------------
-# COMPONENT to THIRDPARTY dependencies
-#-----------------------------------------------------------------------
-
-@OTEL_COMPONENTS_THIRDPARTY_DEPENDENCIES_BLOCK@
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/templates/config.pc.in b/ext/opentelemetry-cpp-1.21.0/cmake/templates/config.pc.in
deleted file mode 100644
index eac5fd9e8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/templates/config.pc.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-prefix=${pcfiledir}/../..
-exec_prefix=${prefix}
-libdir=@OPENTELEMETRY_PC_LIBDIR@
-includedir=@OPENTELEMETRY_PC_INCLUDEDIR@
-
-Name: @OPENTELEMETRY_PC_NAME@
-Description: @OPENTELEMETRY_PC_DESCRIPTION@
-Requires: @OPENTELEMETRY_PC_REQUIRES@
-Version: @OPENTELEMETRY_VERSION@
-
-Libs: -L${libdir} @OPENTELEMETRY_PC_LIBS@
-Cflags: -I${includedir} @OPENTELEMETRY_PC_CFLAGS@
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/templates/opentelemetry-cpp-config.cmake.in b/ext/opentelemetry-cpp-1.21.0/cmake/templates/opentelemetry-cpp-config.cmake.in
deleted file mode 100644
index 46655f8ff..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/templates/opentelemetry-cpp-config.cmake.in
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#.rst:
-# opentelemetry-cpp-config.cmake
-# --------
-# Finding opentelemetry-cpp in CMake projects
-# ========================================
-#
-#  - find_package(opentelemetry-cpp CONFIG REQUIRED) to import all installed targets and dependencies
-#  - find_package(opentelemetry-cpp CONFIG COMPONENTS ...) to import specific components' targets and dependencies
-#
-# Example usage
-# -------------------
-#
-# 1. **No Components Specified**
-#
-#    When no components are provided, all components and their targets are imported.
-#
-#    .. code-block:: cmake
-#
-#       find_package(opentelemetry-cpp CONFIG REQUIRED)
-#
-#
-# 2. **Components Specified**
-#
-#    When a component is specified, its third-party dependencies are found;
-#    then, targets from that component, along with the components on which it depends, are imported.
-#
-#    .. code-block:: cmake
-#
-#       find_package(opentelemetry-cpp CONFIG REQUIRED COMPONENTS exporters_otlp_grpc)
-#
-#
-#.. note::
-#   To troubleshoot issues with ``find_package(opentelemetry-cpp CONFIG REQUIRED)``, run CMake with debug logging enabled:
-#
-#   .. code-block:: bash
-#
-#      cmake --log-level=DEBUG -S <source_dir> -B <build_dir>
-#
-#   To get more verbose output from CMake’s package search, run CMake with the following flag:
-#
-#   .. code-block:: bash
-#
-#      cmake -DCMAKE_FIND_DEBUG_MODE=ON -S <source_dir> -B <build_dir>
-#
-#
-# CMake Variables Defined
-# --------------------
-#
-# This module defines the following variables:
-#
-# ::
-#
-#   OPENTELEMETRY_CPP_INCLUDE_DIRS  - Include directories of opentelemetry-cpp.
-#   OPENTELEMETRY_CPP_LIBRARY_DIRS  - Link directories of opentelemetry-cpp.
-#   OPENTELEMETRY_CPP_LIBRARIES     - List of libraries when using opentelemetry-cpp.
-#   OPENTELEMETRY_CPP_FOUND         - True if opentelemetry-cpp found.
-#   OPENTELEMETRY_ABI_VERSION_NO    - ABI version of opentelemetry-cpp.
-#   OPENTELEMETRY_VERSION           - Version of opentelemetry-cpp.
-#   OPENTELEMETRY_CPP_COMPONENTS_INSTALLED - List of components installed.
-#   opentelemetry-cpp_FOUND         - True if opentelemetry-cpp found.
-#   opentelemetry-cpp_<component>_FOUND - True if the requested component is found.
-# ::
-#
-#
-# CMake Components and Targets Supported
-# --------------------
-# opentelemetry-cpp supports the following components and targets. This install may include a subset.
-#
-# COMPONENTS
-#   api
-#   sdk
-#   ext_common
-#   ext_http_curl
-#   ext_dll
-#   exporters_in_memory
-#   exporters_ostream
-#   exporters_otlp_common
-#   exporters_otlp_file
-#   exporters_otlp_grpc
-#   exporters_otlp_http
-#   exporters_prometheus
-#   exporters_elasticsearch
-#   exporters_etw
-#   exporters_zipkin
-#   shims_opentracing
-#
-# ::
-#
-# TARGETS
-#   opentelemetry-cpp::api                               - Imported target of COMPONENT api
-#   opentelemetry-cpp::sdk                               - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::version                           - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::common                            - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::resources                         - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::trace                             - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::metrics                           - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::logs                              - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::ext                               - Imported target of COMPONENT ext_common
-#   opentelemetry-cpp::http_client_curl                  - Imported target of COMPONENT ext_http_curl
-#   opentelemetry-cpp::opentelemetry_cpp                 - Imported target of COMPONENT ext_dll
-#   opentelemetry-cpp::in_memory_span_exporter           - Imported target of COMPONENT exporters_in_memory
-#   opentelemetry-cpp::in_memory_metric_exporter         - Imported target of COMPONENT exporters_in_memory
-#   opentelemetry-cpp::ostream_log_record_exporter       - Imported target of COMPONENT exporters_ostream
-#   opentelemetry-cpp::ostream_metrics_exporter          - Imported target of COMPONENT exporters_ostream
-#   opentelemetry-cpp::ostream_span_exporter             - Imported target of COMPONENT exporters_ostream
-#   opentelemetry-cpp::proto                             - Imported target of COMPONENT exporters_otlp_common
-#   opentelemetry-cpp::otlp_recordable                   - Imported target of COMPONENT exporters_otlp_common
-#   opentelemetry-cpp::otlp_file_client                  - Imported target of COMPONENT exporters_otlp_file
-#   opentelemetry-cpp::otlp_file_exporter                - Imported target of COMPONENT exporters_otlp_file
-#   opentelemetry-cpp::otlp_file_log_record_exporter     - Imported target of COMPONENT exporters_otlp_file
-#   opentelemetry-cpp::otlp_file_metric_exporter         - Imported target of COMPONENT exporters_otlp_file
-#   opentelemetry-cpp::proto_grpc                        - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_grpc_client                  - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_grpc_exporter                - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_grpc_log_record_exporter     - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_grpc_metrics_exporter        - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_http_client                  - Imported target of COMPONENT exporters_otlp_http
-#   opentelemetry-cpp::otlp_http_exporter                - Imported target of COMPONENT exporters_otlp_http
-#   opentelemetry-cpp::otlp_http_log_record_exporter     - Imported target of COMPONENT exporters_otlp_http
-#   opentelemetry-cpp::otlp_http_metric_exporter         - Imported target of COMPONENT exporters_otlp_http
-#   opentelemetry-cpp::prometheus_exporter               - Imported target of COMPONENT exporters_prometheus
-#   opentelemetry-cpp::elasticsearch_log_record_exporter - Imported target of COMPONENT exporters_elasticsearch
-#   opentelemetry-cpp::etw_exporter                      - Imported target of COMPONENT exporters_etw
-#   opentelemetry-cpp::zipkin_trace_exporter             - Imported target of COMPONENT exporters_zipkin
-#   opentelemetry-cpp::opentracing_shim                  - Imported target of COMPONENT shims_opentracing
-#
-# Additional Files Used in Component to Component and Third-Party Dependency Resolution
-# --------------------------------------------------------
-#
-# - **thirdparty-dependency-definitions.cmake**
-#   This file lists the third-party dependencies supported by opentelemetry-cpp and components that may require them.
-#   Dependencies are found in the order defined in this file when find_package(opentelemetry-cpp …) is invoked.
-#
-#   **Found using CMake CONFIG search mode:**
-#
-#   - **absl**
-#   - **nlohmann_json**
-#   - **Protobuf**
-#   - **gRPC**
-#   - **prometheus-cpp**
-#   - **OpenTracing**
-#
-#   **Found using the CMake MODULE search mode:**
-#
-#   - **Threads**
-#   - **ZLIB**
-#   - **CURL**
-#
-# - **component-definitions.cmake**
-#   This file defines the available opentelemetry-cpp components, the targets associated with each
-#   component, and the inter-component dependencies.
-#
-
-
-# =============================================================================
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-# =============================================================================
-
-set(OPENTELEMETRY_ABI_VERSION_NO
-    "@OPENTELEMETRY_ABI_VERSION_NO@"
-    CACHE STRING "opentelemetry-cpp ABI version" FORCE)
-set(OPENTELEMETRY_VERSION
-    "@OPENTELEMETRY_VERSION@"
-    CACHE STRING "opentelemetry-cpp version" FORCE)
-
-@PACKAGE_INIT@
-
-# Include the opentelemetry-cpp file that includes component defintions, thirdparty definitons and functions to support finding this package and dependencies.
-include("${CMAKE_CURRENT_LIST_DIR}/find-package-support-functions.cmake")
-
-set(_INSTALLED_COMPONENTS "")
-get_installed_components(_INSTALLED_COMPONENTS)
-
-set(OPENTELEMETRY_CPP_COMPONENTS_INSTALLED ${_INSTALLED_COMPONENTS} CACHE STRING "opentelemetry-cpp components installed" FORCE)
-
-set(_REQUESTED_COMPONENTS "")
-get_requested_components(_INSTALLED_COMPONENTS _REQUESTED_COMPONENTS)
-
-find_required_dependencies(_REQUESTED_COMPONENTS)
-
-set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
-
-# include the target files selected and set the component found flag
-foreach(_COMPONENT IN LISTS _REQUESTED_COMPONENTS)
-  include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-${_COMPONENT}-target.cmake")
-  set(${CMAKE_FIND_PACKAGE_NAME}_${_COMPONENT}_FOUND TRUE
-    CACHE BOOL "whether ${CMAKE_FIND_PACKAGE_NAME} component ${_COMPONENT} is found" FORCE)
-endforeach()
-
-# get installed and requested targets
-set(_OPENTELEMETRY_CPP_TARGETS "")
-get_targets(_REQUESTED_COMPONENTS _OPENTELEMETRY_CPP_TARGETS)
-check_targets_imported(_OPENTELEMETRY_CPP_TARGETS)
-
-# Set OPENTELEMETRY_CPP_* variables
-set(OPENTELEMETRY_CPP_LIBRARIES)
-
-set(DLL_TARGET "opentelemetry-cpp::opentelemetry_cpp")
-
-foreach(_TARGET IN LISTS _OPENTELEMETRY_CPP_TARGETS)
-  if(TARGET "${_TARGET}" AND NOT "${_TARGET}" STREQUAL "${DLL_TARGET}")
-    list(APPEND OPENTELEMETRY_CPP_LIBRARIES "${_TARGET}")
-  endif()
-endforeach()
-
-# handle the QUIETLY and REQUIRED arguments and set opentelemetry-cpp_FOUND to
-# TRUE if all variables listed contain valid results, e.g. valid file paths.
-include("FindPackageHandleStandardArgs")
-find_package_handle_standard_args(
-  ${CMAKE_FIND_PACKAGE_NAME}
-  FOUND_VAR ${CMAKE_FIND_PACKAGE_NAME}_FOUND
-  REQUIRED_VARS OPENTELEMETRY_CPP_INCLUDE_DIRS OPENTELEMETRY_CPP_LIBRARIES)
-
-if(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-  set(OPENTELEMETRY_CPP_FOUND
-      ${${CMAKE_FIND_PACKAGE_NAME}_FOUND}
-      CACHE BOOL "whether opentelemetry-cpp is found" FORCE)
-else()
-  unset(OPENTELEMETRY_CPP_FOUND)
-  unset(OPENTELEMETRY_CPP_FOUND CACHE)
-endif()
-
-check_required_components(${CMAKE_FIND_PACKAGE_NAME})
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/templates/thirdparty-dependency-definitions.cmake.in b/ext/opentelemetry-cpp-1.21.0/cmake/templates/thirdparty-dependency-definitions.cmake.in
deleted file mode 100644
index d6a1716ec..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/templates/thirdparty-dependency-definitions.cmake.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Configured from opentelmetry-cpp/cmake/thirdparty-dependency-definitions.cmake.in
-
-#-----------------------------------------------------------------------
-# Third party dependencies supported by opentelemetry-cpp
-#    Dependencies will be found in this order when find_package(opentelemetry-cpp ...)  is called.
-#-----------------------------------------------------------------------
-set(OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED @OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED@)
-
-#-----------------------------------------------------------------------
-# Third party dependency versions used to build opentelemetry-cpp
-#-----------------------------------------------------------------------
-@OTEL_THIRDPARTY_DEPENDENCY_VERSIONS_BLOCK@
-
-#-----------------------------------------------------------------------
-# Set the find_dependecy search mode - empty is default. Options MODULE or CONFIG
-#-----------------------------------------------------------------------
-@OTEL_THIRDPARTY_DEPENDENCY_SEARCH_MODES_BLOCK@
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/thirdparty-dependency-config.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/thirdparty-dependency-config.cmake
deleted file mode 100644
index 046e3a540..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/thirdparty-dependency-config.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#-----------------------------------------------------------------------
-# Third party dependencies supported by opentelemetry-cpp
-# Dependencies that must be found with find_dependency() when a user calls find_package(opentelemetry-cpp ...)
-# should be included in this list.
-#-----------------------------------------------------------------------
-set(OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED
-     Threads
-     ZLIB
-     CURL
-     nlohmann_json
-     Protobuf
-     gRPC
-     prometheus-cpp
-     OpenTracing
-)
-
-#-----------------------------------------------------------------------
-# Third party dependency target namespaces. Defaults to the dependency's project name if not set.
-# Only set if the target namespace is different from the project name (these are case sensitive).
-# set(OTEL_<dependency>_TARGET_NAMESPACE "<namespace>")
-#-----------------------------------------------------------------------
-set(OTEL_Protobuf_TARGET_NAMESPACE "protobuf")
-
-#-----------------------------------------------------------------------
-# Set the find_dependecy search mode - empty is default. Options: cmake default (empty string ""), "MODULE", or "CONFIG"
-# # set(OTEL_<dependency>_SEARCH_MODE "<search mode>")
-#-----------------------------------------------------------------------
-set(OTEL_Threads_SEARCH_MODE "")
-set(OTEL_ZLIB_SEARCH_MODE "")
-set(OTEL_CURL_SEARCH_MODE "")
-set(OTEL_nlohmann_json_SEARCH_MODE "CONFIG")
-set(OTEL_gRPC_SEARCH_MODE "CONFIG")
-set(OTEL_prometheus-cpp_SEARCH_MODE "CONFIG")
-set(OTEL_OpenTracing_SEARCH_MODE "CONFIG")
-
-# The search mode is set to "CONFIG" for Protobuf versions >= 3.22.0
-# to find Protobuf's abseil dependency properly until the FindProtobuf module is updated support the upstream protobuf-config.cmake.
-# See https://gitlab.kitware.com/cmake/cmake/-/issues/24321
-if(DEFINED Protobuf_VERSION AND Protobuf_VERSION VERSION_GREATER_EQUAL 3.22.0)
-    set(OTEL_Protobuf_SEARCH_MODE "CONFIG")
-else()
-    set(OTEL_Protobuf_SEARCH_MODE "")
-endif()
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/cmake/tools.cmake b/ext/opentelemetry-cpp-1.21.0/cmake/tools.cmake
deleted file mode 100644
index ffc3732d2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/cmake/tools.cmake
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-macro(check_append_cxx_compiler_flag OUTPUT_VAR)
-  foreach(CHECK_FLAG ${ARGN})
-    check_cxx_compiler_flag(${CHECK_FLAG}
-                            "check_cxx_compiler_flag_${CHECK_FLAG}")
-    if(check_cxx_compiler_flag_${CHECK_FLAG})
-      list(APPEND ${OUTPUT_VAR} ${CHECK_FLAG})
-    endif()
-  endforeach()
-endmacro()
-
-if(NOT PATCH_PROTOBUF_SOURCES_OPTIONS_SET)
-  if(MSVC)
-    unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE)
-    set(PATCH_PROTOBUF_SOURCES_OPTIONS
-        /wd4244
-        /wd4251
-        /wd4267
-        /wd4309
-        /wd4668
-        /wd4946
-        /wd6001
-        /wd6244
-        /wd6246)
-
-    if(MSVC_VERSION GREATER_EQUAL 1922)
-      # see
-      # https://docs.microsoft.com/en-us/cpp/overview/cpp-conformance-improvements?view=vs-2019#improvements_162
-      # for detail
-      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd5054)
-    endif()
-
-    if(MSVC_VERSION GREATER_EQUAL 1925)
-      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd4996)
-    endif()
-
-    if(MSVC_VERSION LESS 1910)
-      list(APPEND PATCH_PROTOBUF_SOURCES_OPTIONS /wd4800)
-    endif()
-  else()
-    unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE)
-    include(CheckCXXCompilerFlag)
-    check_append_cxx_compiler_flag(
-      PATCH_PROTOBUF_SOURCES_OPTIONS -Wno-type-limits
-      -Wno-deprecated-declarations -Wno-unused-parameter)
-  endif()
-  set(PATCH_PROTOBUF_SOURCES_OPTIONS_SET TRUE)
-  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
-    set(PATCH_PROTOBUF_SOURCES_OPTIONS
-        ${PATCH_PROTOBUF_SOURCES_OPTIONS}
-        CACHE INTERNAL
-              "Options to disable warning of generated protobuf sources" FORCE)
-  endif()
-endif()
-
-function(patch_protobuf_sources)
-  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
-    foreach(PROTO_SRC ${ARGN})
-      unset(PROTO_SRC_OPTIONS)
-      get_source_file_property(PROTO_SRC_OPTIONS ${PROTO_SRC} COMPILE_OPTIONS)
-      if(PROTO_SRC_OPTIONS)
-        list(APPEND PROTO_SRC_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
-      else()
-        set(PROTO_SRC_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
-      endif()
-
-      set_source_files_properties(
-        ${PROTO_SRC} PROPERTIES COMPILE_OPTIONS "${PROTO_SRC_OPTIONS}")
-    endforeach()
-    unset(PROTO_SRC)
-    unset(PROTO_SRC_OPTIONS)
-  endif()
-endfunction()
-
-function(patch_protobuf_targets)
-  if(PATCH_PROTOBUF_SOURCES_OPTIONS)
-    foreach(PROTO_TARGET ${ARGN})
-      unset(PROTO_TARGET_OPTIONS)
-      get_target_property(PROTO_TARGET_OPTIONS ${PROTO_TARGET} COMPILE_OPTIONS)
-      if(PROTO_TARGET_OPTIONS)
-        list(APPEND PROTO_TARGET_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
-      else()
-        set(PROTO_TARGET_OPTIONS ${PATCH_PROTOBUF_SOURCES_OPTIONS})
-      endif()
-
-      set_target_properties(
-        ${PROTO_TARGET} PROPERTIES COMPILE_OPTIONS "${PROTO_TARGET_OPTIONS}")
-    endforeach()
-    unset(PROTO_TARGET)
-    unset(PROTO_TARGET_OPTIONS)
-  endif()
-endfunction()
-
-function(project_build_tools_get_imported_location OUTPUT_VAR_NAME TARGET_NAME)
-
-  # The following if statement was added to support cmake versions < 3.19
-  get_target_property(TARGET_TYPE ${TARGET_NAME} TYPE)
-  if(TARGET_TYPE STREQUAL "INTERFACE_LIBRARY")
-    # For interface libraries, do not attempt to retrieve imported location.
-    set(${OUTPUT_VAR_NAME} "" PARENT_SCOPE)
-    return()
-  endif()
-
-  if(CMAKE_BUILD_TYPE)
-    string(TOUPPER "IMPORTED_LOCATION_${CMAKE_BUILD_TYPE}"
-                   TRY_SPECIFY_IMPORTED_LOCATION)
-    get_target_property(${OUTPUT_VAR_NAME} ${TARGET_NAME}
-                        ${TRY_SPECIFY_IMPORTED_LOCATION})
-  endif()
-  if(NOT ${OUTPUT_VAR_NAME})
-    get_target_property(${OUTPUT_VAR_NAME} ${TARGET_NAME} IMPORTED_LOCATION)
-  endif()
-  if(NOT ${OUTPUT_VAR_NAME})
-    get_target_property(
-      project_build_tools_get_imported_location_IMPORTED_CONFIGURATIONS
-      ${TARGET_NAME} IMPORTED_CONFIGURATIONS)
-    foreach(
-      project_build_tools_get_imported_location_IMPORTED_CONFIGURATION IN
-      LISTS project_build_tools_get_imported_location_IMPORTED_CONFIGURATIONS)
-      get_target_property(
-        ${OUTPUT_VAR_NAME}
-        ${TARGET_NAME}
-        "IMPORTED_LOCATION_${project_build_tools_get_imported_location_IMPORTED_CONFIGURATION}"
-      )
-      if(${OUTPUT_VAR_NAME})
-        break()
-      endif()
-    endforeach()
-  endif()
-  if(${OUTPUT_VAR_NAME})
-    set(${OUTPUT_VAR_NAME}
-        ${${OUTPUT_VAR_NAME}}
-        PARENT_SCOPE)
-  endif()
-endfunction()
-
-#[[
-If we build third party packages with a different CONFIG setting from building
-otel-cpp, cmake may not find a suitable file in imported targets (#705, #1359)
-when linking. But on some platforms, different CONFIG settings can be used when
-these CONFIG settings have the same ABI. For example, on Linux, we can build
-gRPC and protobuf with -DCMAKE_BUILD_TYPE=Release, but build otel-cpp with
--DCMAKE_BUILD_TYPE=Debug and link these libraries together.
-The properties of imported targets can be found here:
-https://cmake.org/cmake/help/latest/manual/cmake-properties.7.html#properties-on-targets
-]]
-function(project_build_tools_patch_default_imported_config)
-  set(PATCH_VARS
-      IMPORTED_IMPLIB
-      IMPORTED_LIBNAME
-      IMPORTED_LINK_DEPENDENT_LIBRARIES
-      IMPORTED_LINK_INTERFACE_LANGUAGES
-      IMPORTED_LINK_INTERFACE_LIBRARIES
-      IMPORTED_LINK_INTERFACE_MULTIPLICITY
-      IMPORTED_LOCATION
-      IMPORTED_NO_SONAME
-      IMPORTED_OBJECTS
-      IMPORTED_SONAME)
-  foreach(TARGET_NAME ${ARGN})
-    if(TARGET ${TARGET_NAME})
-      get_target_property(IS_IMPORTED_TARGET ${TARGET_NAME} IMPORTED)
-      if(NOT IS_IMPORTED_TARGET)
-        continue()
-      endif()
-
-      get_target_property(IS_ALIAS_TARGET ${TARGET_NAME} ALIASED_TARGET)
-      if(IS_ALIAS_TARGET)
-        continue()
-      endif()
-
-      if(CMAKE_VERSION VERSION_LESS "3.19.0")
-        get_target_property(TARGET_TYPE_NAME ${TARGET_NAME} TYPE)
-        if(TARGET_TYPE_NAME STREQUAL "INTERFACE_LIBRARY")
-          continue()
-        endif()
-      endif()
-
-      get_target_property(DO_NOT_OVERWRITE ${TARGET_NAME} IMPORTED_LOCATION)
-      if(DO_NOT_OVERWRITE)
-        continue()
-      endif()
-
-      # MSVC's STL and debug level must match the target, so we can only move
-      # out IMPORTED_LOCATION_NOCONFIG
-      if(MSVC)
-        set(PATCH_IMPORTED_CONFIGURATION "NOCONFIG")
-      else()
-        get_target_property(PATCH_IMPORTED_CONFIGURATION ${TARGET_NAME}
-                            IMPORTED_CONFIGURATIONS)
-      endif()
-
-      if(NOT PATCH_IMPORTED_CONFIGURATION)
-        continue()
-      endif()
-
-      get_target_property(PATCH_TARGET_LOCATION ${TARGET_NAME}
-                          "IMPORTED_LOCATION_${PATCH_IMPORTED_CONFIGURATION}")
-      if(NOT PATCH_TARGET_LOCATION)
-        continue()
-      endif()
-
-      foreach(PATCH_IMPORTED_KEY IN LISTS PATCH_VARS)
-        get_target_property(
-          PATCH_IMPORTED_VALUE ${TARGET_NAME}
-          "${PATCH_IMPORTED_KEY}_${PATCH_IMPORTED_CONFIGURATION}")
-        if(PATCH_IMPORTED_VALUE)
-          set_target_properties(
-            ${TARGET_NAME} PROPERTIES "${PATCH_IMPORTED_KEY}"
-                                      "${PATCH_IMPORTED_VALUE}")
-          if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            message(
-              STATUS
-                "Patch: ${TARGET_NAME} ${PATCH_IMPORTED_KEY} will use ${PATCH_IMPORTED_KEY}_${PATCH_IMPORTED_CONFIGURATION}(\"${PATCH_IMPORTED_VALUE}\") by default."
-            )
-          endif()
-        endif()
-      endforeach()
-    endif()
-  endforeach()
-endfunction()
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/.gitignore b/ext/opentelemetry-cpp-1.21.0/docker/.gitignore
deleted file mode 100644
index 21c4e486a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-**/setup-*.sh
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile b/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile
deleted file mode 100644
index 5fe143c4f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-ARG BASE_IMAGE=ubuntu:latest
-ARG GRPC_IMAGE=grpc-${BASE_IMAGE}
-
-FROM ${GRPC_IMAGE} as grpc
-
-FROM base-${BASE_IMAGE}-dev AS otel-cpp
-
-ARG CORES=${nproc}
-ARG OTEL_GIT_TAG=v1.3.0
-
-COPY --from=grpc / /usr/local
-
-#install opentelemetry-cpp
-RUN git clone --recurse-submodules -j ${CORES} --depth=1 \
-    -b ${OTEL_GIT_TAG} https://github.com/open-telemetry/opentelemetry-cpp.git \
-    && cd opentelemetry-cpp \
-    && mkdir -p build && cd build \
-    && cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE  \
-        -DWITH_ZIPKIN=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/third_party/install \
-        -DBUILD_TESTING=OFF \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        -DBUILD_SHARED_LIBS=ON \
-        .. \
-    && cmake --build . -j ${CORES} --target install
-
-FROM scratch as final
-
-COPY --from=otel-cpp /opt/third_party/install /
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.alpine.base b/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.alpine.base
deleted file mode 100644
index d4f5932cc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.alpine.base
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-ARG BASE_IMAGE=alpine:latest
-ARG CORES=${nproc}
-
-FROM ${BASE_IMAGE} as final
-
-RUN apk update
-
-RUN apk add --update alpine-sdk \
-    && apk add cmake openssl openssl-dev g++ \
-    curl-dev git autoconf libtool linux-headers \
-    libevent-dev openssl-dev
-
-RUN mkdir -p /opt/third_party/install
-
-WORKDIR /opt
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.centos b/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.centos
deleted file mode 100644
index c38b32b17..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.centos
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-FROM centos:7
-
-ARG TOOLSET_VER=11
-
-RUN yum update -y && yum install -y centos-release-scl epel-release
-RUN yum install -y devtoolset-${TOOLSET_VER} \
-    cmake3 git \
-    openssl-devel \
-    libcurl-devel \
-    && source /opt/rh/devtoolset-${TOOLSET_VER}/enable
-
-RUN echo "source /opt/rh/devtoolset-${TOOLSET_VER}/enable" >> /etc/bashrc
-
-ARG GRPC_VERSION=v1.43.2
-
-# install gRPC
-RUN git clone --depth=1 -b $GRPC_VERSION  https://github.com/grpc/grpc.git \
-    && cd grpc && git submodule update --init \
-    && mkdir -p "third_party/abseil-cpp/build" && cd "third_party/abseil-cpp/build" \
-    && source /opt/rh/devtoolset-${TOOLSET_VER}/enable \
-    && cmake3 -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE .. \
-    && make -j${nproc} install && cd ../../.. \
-    && mkdir build && cd build \
-    && cmake3 \
-        -DCMAKE_CXX_STANDARD=17 \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DgRPC_INSTALL=ON \
-        -DgRPC_BUILD_TESTS=OFF \
-        -DgRPC_ABSL_PROVIDER=package \
-        -DgRPC_SSL_PROVIDER=package \
-        .. && \
-    make -j${nproc} install && make clean && ldconfig
-
-#install opentelemetry-cpp
-RUN git clone --depth=1 https://github.com/open-telemetry/opentelemetry-cpp.git \
-    && cd opentelemetry-cpp && git submodule update --init \
-    && mkdir -p build && cd build \
-    && source /opt/rh/devtoolset-${TOOLSET_VER}/enable \
-    && cmake3 \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE  \
-        -DWITH_ZIPKIN=ON \
-        -DBUILD_TESTING=OFF \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        .. \
-    && make -j${nproc} install && ldconfig
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.debian.deps b/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.debian.deps
deleted file mode 100644
index 3fe4fe28d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/Dockerfile.debian.deps
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-ARG BASE_IMAGE=ubuntu:latest
-ARG CORES=${nproc}
-
-FROM ${BASE_IMAGE} as base
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y build-essential autoconf \
-    libtool pkg-config cmake git libssl-dev curl \
-	libcurl4-openssl-dev libgtest-dev libgmock-dev libbenchmark-dev
-
-WORKDIR /work
-RUN mkdir -p /opt/otel-cpp
-
-FROM base as grpc
-# install grpc, protobuf and abseil
-ARG GRPC_VERSION=1.43.2
-
-ADD setup_grpc.sh .
-RUN ./setup_grpc.sh  -i "/opt/otel-cpp" -v ${GRPC_VERSION}
-
-FROM scratch as final
-
-COPY --from=grpc /opt/otel-cpp /
-
-# how to use:
-#
-# docker create -ti --name deps otel-cpp-deps bash
-# docker cp deps:/ ./
-# docker rm -f deps
-#
-# or:
-#
-# COPY --from=otel-cpp-deps /usr
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/README.md b/ext/opentelemetry-cpp-1.21.0/docker/README.md
deleted file mode 100644
index 8c7ca3ce3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# OpenTelemetry library builder
-
-**How to use this build script:**
-
-The build script `build.sh` can be used to build OpenTelemetry and
-it's dependencies within the desired base image.
-The final image only contains the necessary files in `/`.
-
-```sh
-bash build.sh -b alpine -j ${nproc} -g v1.43.2 -o v1.3.0 -t 0.14.1
-
-# copy to current dir
-docker create -ti --name otel otel-cpp-<base_image> bash
-docker cp otel:/ ./
-docker rm -f otel
-
-docker create -ti --name grpc grpc-<base_image> bash
-docker cp grpc:/ ./
-docker rm -f grpc
-```
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/build.sh b/ext/opentelemetry-cpp-1.21.0/docker/build.sh
deleted file mode 100644
index d418a909d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/build.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-Help()
-{
-   # Display Help
-   echo "Add description of the script functions here."
-   echo
-   echo "Syntax: scriptTemplate [-b|o|g|j]"
-   echo "options:"
-   echo "b     Base image"
-   echo "o     OpenTelemetry-cpp git tag"
-   echo "h     Print Help."
-   echo "g     gRPC git tag"
-   echo "j     Parallel jobs"
-   echo
-   echo "how to use:"
-   echo
-   echo "docker create -ti --name otel otel-cpp-<base_image> bash"
-   echo "docker cp otel:/ ./"
-   echo "docker rm -f otel"
-   echo
-   echo "or:"
-   echo
-   echo "COPY --from=otel-cpp-<base_image> /usr"
-}
-
-base_image=${base_image:="alpine"}
-grpc_git_tag=${grpc_git_tag:="v1.43.2"}
-otel_git_tag=${otel_git_tag:="v1.3.0"}
-cores=${cores:=1}
-
-while getopts ":h:b:o:g:j:" option; do
-   case $option in
-    h) # display Help
-         Help
-         exit;;
-    b) # base image
-        base_image=$OPTARG
-        ;;
-    o) # OpenTelemetry-cpp git tag
-        otel_git_tag=$OPTARG
-        ;;
-    g) # gRPC git tag
-        grpc_git_tag=$OPTARG
-        ;;
-    j) # number of cores
-        cores=$OPTARG
-        ;;
-    \?)
-        Help
-        exit;;
-   esac
-done
-
-docker build -t base-${base_image}-dev -f Dockerfile.${base_image}.base .
-
-pushd grpc/
-docker build --build-arg BASE_IMAGE=base-${base_image}-dev \
-    --build-arg GRPC_GIT_TAG=${grpc_git_tag} \
-    --build-arg CORES=${cores} \
-    -t grpc-${base_image} -f Dockerfile .
-popd
-
-docker build --build-arg BASE_IMAGE=${base_image} \
-    --build-arg CORES=${cores} \
-    --build-arg OTEL_GIT_TAG=${otel_git_tag} \
-    -t otel-cpp-${base_image} -f Dockerfile .
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/grpc/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/docker/grpc/CMakeLists.txt
deleted file mode 100644
index 95ddf7db8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/grpc/CMakeLists.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-
-project(
-  dependencies
-  LANGUAGES CXX
-  VERSION 0.0.1)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "-O2")
-
-set(CMAKE_BUILD_TYPE
-    Release
-    CACHE STRING "Build type" FORCE)
-
-include(GNUInstallDirs)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-
-set(INSTALL_LIBDIR
-    ${CMAKE_INSTALL_LIBDIR}
-    CACHE PATH "directory for libraries")
-set(INSTALL_BINDIR
-    ${CMAKE_INSTALL_BINDIR}
-    CACHE PATH "directory for executables")
-set(INSTALL_INCLUDEDIR
-    ${CMAKE_INSTALL_INCLUDEDIR}
-    CACHE PATH "directory for header files")
-
-set(DEF_INSTALL_CMAKEDIR share/cmake/${PROJECT_NAME})
-set(INSTALL_CMAKEDIR
-    ${DEF_INSTALL_CMAKEDIR}
-    CACHE PATH "directory for CMake files")
-
-set_property(DIRECTORY PROPERTY EP_BASE ${CMAKE_BINARY_DIR}/subs)
-
-set(STAGED_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/stage)
-message(STATUS "${PROJECT_NAME} staged install: ${STAGED_INSTALL_PREFIX}")
-
-find_package(OpenSSL REQUIRED)
-message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
-message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
-
-set(GRPC_GIT_TAG
-    "v1.45.2"
-    CACHE STRING "gRPC version")
-
-include(ExternalProject)
-ExternalProject_Add(
-  grpc
-  GIT_REPOSITORY https://github.com/grpc/grpc.git
-  GIT_TAG ${GRPC_GIT_TAG}
-  GIT_SHALLOW 1
-  UPDATE_COMMAND ""
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
-             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-             -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-             -DgRPC_SSL_PROVIDER=package
-             -DOPENSSL_ROOT_DIR=OpenSSL
-             -DgRPC_BUILD_TESTS=OFF
-             -DBUILD_SHARED_LIBS=ON
-             -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF
-             -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF
-  CMAKE_CACHE_ARGS -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-  TEST_AFTER_INSTALL 0
-  DOWNLOAD_NO_PROGRESS 1
-  LOG_CONFIGURE 1
-  LOG_BUILD 0
-  LOG_INSTALL 1)
-
-install(
-  DIRECTORY ${STAGED_INSTALL_PREFIX}/
-  DESTINATION .
-  USE_SOURCE_PERMISSIONS)
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/grpc/Dockerfile b/ext/opentelemetry-cpp-1.21.0/docker/grpc/Dockerfile
deleted file mode 100644
index 2d88d209b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/grpc/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-ARG BASE_IMAGE=ubuntu:latest
-FROM ${BASE_IMAGE} AS grpc
-
-ARG CORES=${nproc}
-ARG GRPC_GIT_TAG=v1.45.2
-
-RUN mkdir mkdir -p /opt/third_party/grpc
-
-WORKDIR /opt/third_party/grpc
-
-ADD CMakeLists.txt /opt/third_party/grpc
-
-RUN mkdir build \
-    && cd build \
-    && cmake -DCMAKE_INSTALL_PREFIX=/opt/third_party/install \
-    -DGRPC_GIT_TAG=${GRPC_GIT_TAG} /opt/third_party/grpc \
-    && cmake --build . -j ${CORES} --target install
-
-FROM scratch as final
-
-COPY --from=grpc /opt/third_party/install /
diff --git a/ext/opentelemetry-cpp-1.21.0/docker/ubuntuLatest/Dockerfile b/ext/opentelemetry-cpp-1.21.0/docker/ubuntuLatest/Dockerfile
deleted file mode 100644
index ef39e17f0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docker/ubuntuLatest/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-FROM ubuntu:latest@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02
-ENV DEBIAN_FRONTEND=noninteractive
-
-WORKDIR /work
-
-#install grpc and abseil
-ARG GRPC_VERSION=v1.38.0
-RUN apt-get update && apt-get install -y build-essential autoconf libtool pkg-config cmake git libssl-dev && \
-    git clone --depth=1 -b $GRPC_VERSION  https://github.com/grpc/grpc.git && \
-    cd grpc && git submodule update --init && \
-    mkdir -p "third_party/abseil-cpp/build" && cd "third_party/abseil-cpp/build" && \
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE .. && \
-    make -j${nproc} install && cd ../../.. && \
-    mkdir build && cd build &&  \
-    cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DgRPC_INSTALL=ON \
-        -DgRPC_BUILD_TESTS=OFF \
-        -DgRPC_ABSL_PROVIDER=package \
-        -DgRPC_SSL_PROVIDER=package \
-        .. && \
-    make -j${nproc} install && make clean && ldconfig && \
-    cd ../..
-
-#install opentelemetry-cpp
-RUN apt-get install -y --no-install-recommends libcurl4-openssl-dev && git clone --depth=1 https://github.com/open-telemetry/opentelemetry-cpp.git && \
-    cd opentelemetry-cpp && git submodule update --init && \
-    mkdir -p build && cd build && \
-    cmake \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE  \
-        -DWITH_ZIPKIN=ON \
-        -DBUILD_TESTING=OFF \
-        -DWITH_OTLP_GRPC=ON \
-        -DWITH_OTLP_HTTP=ON \
-        .. && \
-    make -j${nproc} install && ldconfig && \
-    cd ../..
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/abi-compatibility.md b/ext/opentelemetry-cpp-1.21.0/docs/abi-compatibility.md
deleted file mode 100644
index de1577c7b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/abi-compatibility.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Windows
-
-## Visual Studio 2015, 2017, 2019
-
-The Microsoft C++ (MSVC) compiler toolsets in Visual Studio 2013 and earlier
-don't guarantee binary compatibility across versions. You can't link object
-files, static libraries, dynamic libraries, and executables built by different
-versions. The ABIs, object formats, and runtime libraries are incompatible.
-
-We've changed this behavior in Visual Studio 2015, 2017, and 2019. The runtime
-libraries and apps compiled by any of these versions of the compiler are
-binary-compatible. It's reflected in the C++ toolset major number, which is 14
-for all three versions. (The toolset version is v140 for Visual Studio 2015,
-v141 for 2017, and v142 for 2019). Say you have third-party libraries built by
-Visual Studio 2015. You can still use them in an application built by Visual
-Studio 2017 or 2019. There's no need to recompile with a matching toolset. The
-latest version of the Microsoft Visual C++ Redistributable package (the
-Redistributable) works for all of them.
-
-There are three important restrictions on binary compatibility:
-
-- You can mix binaries built by different versions of the toolset. However, you
-  must use a toolset at least as recent as the most recent binary to link your
-  app. Here's an example: you can link an app compiled using the 2017 toolset to
-  a static library compiled using 2019, if they're linked using the 2019
-  toolset.
-
-- The Redistributable your app uses has a similar binary-compatibility
-  restriction. When you mix binaries built by different supported versions of
-  the toolset, the Redistributable version must be at least as new as the latest
-  toolset used by any app component.
-
-- Static libraries or object files compiled using the /GL (Whole program
-  optimization) compiler switch aren't binary-compatible across versions. All
-  object files and libraries compiled using /GL must use exactly the same
-  toolset for the compile and the final link.
-
-[Reference](https://docs.microsoft.com/en-us/cpp/porting/binary-compat-2015-2017?view=vs-2019)
-
-## Breaking Compatibility
-
-### Exceptions
-
-- [__CxxFrameHandler4](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/)
-  - static library built with Visual Studio 2019 wont link to executable
-  compiled with Visual Studio 2017
-
-### Release vs Debug libraries on Windows
-
-- [\_SECURE_SCL](https://docs.microsoft.com/en-us/cpp/standard-library/secure-scl?view=vs-2019)
-  - checked iterators (old)
-
-- [\_ITERATOR_DEBUG_LEVEL](https://docs.microsoft.com/en-us/cpp/standard-library/iterator-debug-level?view=vs-2019)
-  - checked iterators (new)
-
-### Spectre Mitigation
-
-- [Runtime Libraries for Spectre
-  Mitigation](https://docs.microsoft.com/en-us/cpp/build/reference/qspectre?view=vs-2019)
-
-- [New Spectre Mitigations in Visual Studio
-  2019](https://devblogs.microsoft.com/cppblog/more-spectre-mitigations-in-msvc/)
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/abi-policy.md b/ext/opentelemetry-cpp-1.21.0/docs/abi-policy.md
deleted file mode 100644
index 6a063a3f0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/abi-policy.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Application Binary Interface (ABI) Policy
-
-To support scenarios where OpenTelemetry implementations are deployed as binary
-plugins, certain restrictions are imposed on portions of the OpenTelemetry API.
-
-Many parts of the C++ standard library don't have well-defined ABIs. To ensure
-that a plugin compiled against one version of the C++ standard library can work
-with an application or library compiled against a different version of the C++
-standard library, we limit a portion of the OpenTelemetry API to use ABI stable
-types.
-
-In the areas of the API where we need ABI stability, we use C++ as an extended
-C. We assume that standard language features like inheritance follow a
-consistent ABI (vtable layouts, for example, are specified by the [Itanium
-ABI](https://itanium-cxx-abi.github.io/cxx-abi/abi.html#vtable)) and can be used
-across compilers, but don't rely on the ABI stability of the C++ standard
-library classes.
-
-ABI stability is not provided by the interfaces the SDK provides as
-implementation hooks to vendor implementors, like exporters, processors,
-aggregators and propagators.
-
-These are some of the rules for where ABI stability is required.
-
-Note: This assumes export maps are used to properly control symbol resolution.
-
-1. Abstract classes in the OpenTelemetry API must use ABI stable types in their
-   virtual function signatures. Example
-
-```cpp
-class Tracer {
-public:
-  ...
-
-  // Bad: std::string doesn't have a well-defined ABI.
-  virtual void f(const std::string& s);
-
-  // OK: We provide a ABI stable string_view type.
-  virtual void f(nostd::string_view s);
-
-  // OK: g is non-virtual function.
-  void g(const std::vector<int>& v);
-  ...
-};
-```
-
-The ABI restrictions don't apply to concrete classes.
-
-```cpp
-class TracerImpl final : public Tracer {
-public:
-  // ...
-private:
-  std::string s; // OK
-};
-```
-
-Singletons defined by the OpenTelemetry API must use ABI stable types since they
-could potentially be shared across multiple instrumented dynamic shared objects
-(DSOs) compiled against different versions of the C++ standard library.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/abi-version-policy.md b/ext/opentelemetry-cpp-1.21.0/docs/abi-version-policy.md
deleted file mode 100644
index f3d66bb4f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/abi-version-policy.md
+++ /dev/null
@@ -1,529 +0,0 @@
-# Application Binary Interface (ABI) version policy
-
-## Goals
-
-### Instrumented applications
-
-Once a given release of opentelemetry-cpp is published as stable,
-subsequent releases are expected to provide compatibility,
-to avoid disruption.
-
-Compatibility at the source code level (API) is expected,
-so that no code change in an application already instrumented is required
-to adopt a newer release.
-
-Also, compatibility at the binary level (ABI) is expected,
-so that an instrumented application already compiled against
-opentelemetry-cpp API headers from an older version, and distributed as a
-binary package, can be linked against the SDK library from a newer version.
-
-In other words, once an application is instrumented using the
-opentelemetry-cpp API, adopting a newer version:
-
-* should not require source code changes,
-* should not require building and distributing a new package.
-
-### opentelemetry-cpp
-
-The opentelemetry-cpp project itself needs to deliver fixes and features on
-a continual basis.
-
-Reasons to change an API can be external:
-
-* new APIs added in the specification, for new features
-* changes in APIs in the specifications, extending existing features.
-
-Changes can also be caused by internal issues:
-
-* fix technical design issues with an API (incorrect types used, missing
-  parameters)
-
-Regardless of the root cause for a change (bug or feature),
-changes to the existing APIs are unavoidable.
-
-For the opentelemetry-cpp project to stay healthy,
-there must be a way to deliver ABI breaking fixes while preserving
-compatibility for users.
-
-This is achieved with ABI versions.
-
-## Concept of ABI version
-
-### Inline namespaces
-
-For the sake of illustration, let's consider a fictitious API such as:
-
-```cpp
-namespace opentelemetry
-{
-  namespace common
-  {
-    class OtelUtil
-    {
-      virtual void DoSomething() = 0;
-    };
-  }
-}
-```
-
-An application can be instrumented to use it:
-
-```cpp
-opentelemetry::common::OtelUtil *p = ...;
-p->DoSomething();
-```
-
-The problem here is that the binary package produced during the build
-contains references to symbols such as:
-
-```cpp
-opentelemetry::common::OtelUtil::DoSomething()
-```
-
-Because all symbols are in the same `opentelemetry::` namespace, it becomes
-impossible to deliver changes (new or different symbols) while at the same
-time not deliver changes (to preserve binary compatibility).
-
-This is resolved by the use of inline namespaces in C++, leading to
-dedicated ABI versions.
-
-Revised example:
-
-```cpp
-namespace opentelemetry
-{
-  inline namespace v1
-  {
-    namespace common
-    {
-      class OtelUtil
-      {
-        virtual void DoSomething() = 0;
-      };
-    }
-  }
-}
-```
-
-```cpp
-opentelemetry::common::OtelUtil *p = ...;
-p->DoSomething();
-```
-
-When building, the compiler translates `opentelemetry::common` to
-`opentelemetry::v1::common`
-
-The symbols delivered by the opentelemetry library, and used by the
-instrumented application, are:
-
-```cpp
-opentelemetry::v1::common::OtelUtil::DoSomething()
-```
-
-With the help of the `OPENTELEMETRY_BEGIN_NAMESPACE` macro,
-the source code can be abstracted to:
-
-```cpp
-#define OPENTELEMETRY_ABI_VERSION_NO 1
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-{
-  namespace common
-  {
-    class OtelUtil
-    {
-      virtual void DoSomething() = 0;
-    };
-  }
-}
-OPENTELEMETRY_END_NAMESPACE
-```
-
-Adding a new API to the OtelUtil class is an ABI breaking change (the C++
-virtual table is different).
-
-This change can be delivered, but in a different namespace, which defines
-a different (extended) ABI:
-
-```cpp
-#define OPENTELEMETRY_ABI_VERSION_NO 2
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-{
-  namespace common
-  {
-    class OtelUtil
-    {
-      virtual void DoSomething() = 0;
-      virtual void DoSomethingMore() = 0;
-    };
-  }
-}
-OPENTELEMETRY_END_NAMESPACE
-```
-
-Compiling this declaration produce the following symbols:
-
-```cpp
-opentelemetry::v2::common::OtelUtil::DoSomething()
-opentelemetry::v2::common::OtelUtil::DoSomethingMore()
-```
-
-### ABI version
-
-By defining an inline namespace per ABI, it is possible to deliver
-an ABI v2 implementation independently of ABI v1, keeping v1 unchanged.
-
-Code compiled against the v1 ABI can continue to link against a library
-providing v1 symbols, while code compiled against the v2 ABI can link
-against a library providing the v2 symbols.
-
-An application, when building, can choose to:
-
-* either build against the v1 interface
-* or build against the v2 interface
-
-Using v1 ensures compatibility, at the API and ABI level.
-
-Using v2 allows to benefit from new features.
-
-The choice is made by the application owner when building,
-and not by the opentelemetry-cpp library.
-
-This, in essence, describes the technical 'ABI version' building block used
-to deliver breaking changes.
-
-How to use this versioning feature, provided by the C++ language with inline
-namespaces, is described in the next section.
-
-## Versioning policy
-
-### Version scope
-
-Due to dependencies between classes, having an ABI version per class is not
-viable.
-
-For example, class TracerProvider depends on
-class Tracer, as it builds tracers.
-
-If class Tracer comes in multiple versions,
-then class TracerProvider needs to also comes in multiple versions,
-and these versions are correlated:
-
-* v1::TracerProvider creates v1::Tracer instances
-* v2::TracerProvider creates v2::Tracer instances
-
-The next logical scope is to consider ABI versions per signal.
-
-This is not viable either, because of interdependencies between signals:
-
-* metrics can use traces in examplars
-* eventually, the trace implementation can emit internal metrics
-* all signals can use common utility classes
-
-In conclusion, the scope of a version is the entire opentelemetry-cpp project.
-
-### Source code
-
-The number of breaking change that affects an APIs is expected to be very low,
-with only specific methods affected directly.
-
-It is very undesirable to:
-
-* create a different git branch per ABI version, in effect forking the
-  entire code base
-* create a different header file per ABI version, in effect forking
-  the entire include headers
-
-just to handle a few modified APIs.
-
-As a result, differences between ABI versions are handled using C
-preprocessor macros, in the few places where it is necessary.
-
-For example:
-
-```cpp
-OPENTELEMETRY_BEGIN_NAMESPACE
-{
-  namespace common
-  {
-    class OtelUtil
-    {
-      virtual void DoSomething() = 0;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-      // Added in ABI v2
-      virtual void DoSomethingMore() = 0;
-#endif
-
-    };
-  }
-}
-OPENTELEMETRY_END_NAMESPACE
-```
-
-The same source code, when compiled with different values of
-OPENTELEMETRY_ABI_VERSION_NO, produces the proper declarations for ABI v1 or
-ABI v2.
-
-This solution reduces the maintenance burden on the source code itself.
-
-## Versions lifecycle
-
-For a given ABI, the lifecycle is:
-
-* EXPERIMENTAL
-* STABLE
-* DEPRECATED
-* REMOVED
-
-In the EXPERIMENTAL status,
-any change to the ABI can be implemented, without notice.
-
-There are no compatibility guarantees.
-This status is meant as a preview, until the ABI is declared STABLE.
-
-In the STABLE status,
-changes to the ABI are forbidden, to guarantee stability.
-
-In the DEPRECATED status, the ABI is still functional and supported,
-but instrumented applications are encouraged to migrate to a newer ABI.
-
-In the REMOVED status,
-the given ABI is no longer available.
-
-The following sections describe the migration path from one ABI (v1) to the
-next (v2).
-
-### STABLE V1
-
-In this state, only one ABI version is available, and it is closed to
-changes.
-
-Instrumented applications are built against ABI v1 by default.
-
-opentelemetry-cpp produces a library for ABI v1 by default.
-
-Fixes introducing breaking changes can __not__ be delivered.
-
-This is the current status as of opentelemetry-cpp version 1.11.0
-
-### STABLE V1, EXPERIMENTAL V2
-
-In this state, two ABI versions are available.
-
-CMake offers the following options:
-
-```cmake
-option(WITH_ABI_VERSION_1 "ABI version 1" ON)
-option(WITH_ABI_VERSION_2 "EXPERIMENTAL: ABI version 2 preview" OFF)
-```
-
-Instrumented applications are built against ABI v1 by default,
-but may ask to use ABI v2 instead.
-
-opentelemetry-cpp produces a library for stable ABI v1 by default,
-but can be configured to provide experimental ABI v2 instead.
-
-Fixes introducing breaking changes can only be delivered in the experimental
-ABI v2.
-
-### STABLE V1, STABLE V2, EXPERIMENTAL V3
-
-In this state, two stable ABI versions are available,
-the ABI offered by default is the conservative ABI v1.
-
-Fixes introducing breaking changes can no longer be delivered in ABI v2,
-because it is declared stable.
-An experimental ABI v3 is created.
-
-CMake offers the following options:
-
-```cmake
-option(WITH_ABI_VERSION_1 "ABI version 1" ON)
-option(WITH_ABI_VERSION_2 "ABI version 2" OFF)
-option(WITH_ABI_VERSION_3 "EXPERIMENTAL: ABI version 3 preview" OFF)
-```
-
-Instrumented applications are built against stable ABI v1 by default,
-but may ask to use the now stable ABI v2 instead.
-
-opentelemetry-cpp produces a library for ABI v1 by default,
-but can be configured to provide ABI v2 instead.
-
-Fixes introducing breaking changes can only be delivered in the experimental
-ABI v3.
-
-### DEPRECATED V1, STABLE V2, EXPERIMENTAL V3
-
-In this state, two stable ABI versions are available,
-the ABI offered by default is the newer ABI v2.
-
-CMake offers the following options:
-
-```cmake
-option(WITH_ABI_VERSION_1 "DEPRECATED: ABI version 1" OFF)
-option(WITH_ABI_VERSION_2 "ABI version 2" ON)
-option(WITH_ABI_VERSION_3 "EXPERIMENTAL: ABI version 3 preview" OFF)
-```
-
-Instrumented applications are built against stable ABI v2 by default,
-but may ask to use stable ABI v1 instead.
-
-opentelemetry-cpp produces a library for ABI v2 by default,
-but can be configured to provide ABI v1 instead.
-
-Fixes introducing breaking changes can only be delivered in the experimental
-ABI v3.
-
-### (REMOVED V1), STABLE V2, EXPERIMENTAL V3
-
-In this state, the only stable ABI available is v2.
-ABI v1 is no longer supported.
-
-CMake offers the following options:
-
-```cmake
-option(WITH_ABI_VERSION_2 "ABI version 2" ON)
-option(WITH_ABI_VERSION_3 "EXPERIMENTAL: ABI version 3 preview" OFF)
-```
-
-Instrumented applications and the opentelemetry-cpp library are build using
-ABI v2.
-
-Now that ABI v1 no longer exists, the code:
-
-```cpp
-OPENTELEMETRY_BEGIN_NAMESPACE
-{
-  namespace common
-  {
-    class OtelUtil
-    {
-      virtual void DoSomething() = 0;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-      // Added in ABI v2
-      virtual void DoSomethingMore() = 0;
-#endif
-
-    };
-  }
-}
-OPENTELEMETRY_END_NAMESPACE
-```
-
-can be simplified to:
-
-```cpp
-OPENTELEMETRY_BEGIN_NAMESPACE
-{
-  namespace common
-  {
-    class OtelUtil
-    {
-      virtual void DoSomething() = 0;
-      virtual void DoSomethingMore() = 0;
-    };
-  }
-}
-OPENTELEMETRY_END_NAMESPACE
-```
-
-## Practical Example
-
-### Fixing issue #2033
-
-The problem is to change the MeterProvider::GetMeter() prototype,
-to follow specification changes.
-
-See the issue description for all details:
-
-* [Metrics API/SDK]
-  Add InstrumentationScope attributes in MeterProvider::GetMeter() #2033
-
-#### API change
-
-In the API, class MeterProvider is changed as follows:
-
-```cpp
-class MeterProvider
-{
-public:
-  virtual ~MeterProvider() = default;
-  /**
-   * Gets or creates a named Meter instance.
-   *
-   * Optionally a version can be passed to create a named and versioned Meter
-   * instance.
-   */
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  virtual nostd::shared_ptr<Meter> GetMeter(nostd::string_view library_name,
-                                            nostd::string_view library_version = "",
-                                            nostd::string_view schema_url = "",
-                                            const common::KeyValueIterable *attributes = nullptr) noexcept = 0;
-#else
-  virtual nostd::shared_ptr<Meter> GetMeter(nostd::string_view library_name,
-                                            nostd::string_view library_version = "",
-                                            nostd::string_view schema_url      = "") noexcept = 0;
-#endif
-
-  /* ... */
-};
-
-```
-
-Note how the ABI changes, while the API stays compatible, requiring no code
-change in the caller when providing up to 3 parameters.
-
-#### SDK change
-
-In the SDK class declaration, implement the expected API.
-
-```cpp
-class MeterProvider final : public opentelemetry::metrics::MeterProvider
-{
-public:
-
-  /* ... */
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<opentelemetry::metrics::Meter> GetMeter(
-      nostd::string_view name,
-      nostd::string_view version                                = "",
-      nostd::string_view schema_url                             = "",
-      const opentelemetry::common::KeyValueIterable *attributes = nullptr) noexcept override;
-#else
-  nostd::shared_ptr<opentelemetry::metrics::Meter> GetMeter(
-      nostd::string_view name,
-      nostd::string_view version    = "",
-      nostd::string_view schema_url = "") noexcept override;
-#endif
-
-  /* ... */
-};
-```
-
-In the SDK implementation:
-
-* either get the new parameters from the extended ABI v2 method
-* or provide default values for the old ABI v1 method
-
-```cpp
-nostd::shared_ptr<metrics_api::Meter> MeterProvider::GetMeter(
-    nostd::string_view name,
-    nostd::string_view version,
-    nostd::string_view schema_url
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    ,
-    const opentelemetry::common::KeyValueIterable *attributes
-#endif
-    ) noexcept
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-  const opentelemetry::common::KeyValueIterable *attributes = nullptr;
-#endif
-
-  /* common implementation, use attributes */
-}
-```
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/build-as-dll.md b/ext/opentelemetry-cpp-1.21.0/docs/build-as-dll.md
deleted file mode 100644
index 9a5363983..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/build-as-dll.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Design of building OpenTelemetry C++ SDK and exporters as DLL
-
-**NOTE**: the current build produces a single DLL which includes API, SDK and
-exporters. This **MAY** change in future.
-
-OpenTelemetry C++ can be built into single DLL named opentelemetry_cpp.dll on
-Windows, with CMake flag `OPENTELEMETRY_BUILD_DLL` set to `ON`.
-
-To instrument an application based on the DLL, please define macro
-`OPENTELEMETRY_BUILD_IMPORT_DLL` before including any OpenTelemetry API header
-files in the application source files.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/building-with-stdlib.md b/ext/opentelemetry-cpp-1.21.0/docs/building-with-stdlib.md
deleted file mode 100644
index 7dd72eecc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/building-with-stdlib.md
+++ /dev/null
@@ -1,207 +0,0 @@
-# Building with Standard C++ Library
-
-Standard Library build flavor works best for statically linking the SDK in a
-process (environment where ABI compat is not a requirement), or for
-"header-only" implementation of SDK.
-
-Proposed approach cannot be employed for shared libs in environments where ABI
-compatibility is required. OpenTelemetry SDK binary compiled with `compiler A +
-STL B` will not be ABI -compatible with the main executable compiled with
-`compiler C + STL D`.
-
-In addition to standard library, similar approach can be reused to implement the
-API surface classes with [Abseil classes](https://abseil.io/) instead of
-`nostd`, in products that prefer Abseil.
-
-## Motivation
-
-`nostd` classes in OpenTelemetry API were introduced for the following reasons:
-
-* ABI stability: scenario where different modules are compiled with different
-  compiler and incompatible standard library.
-* backport of C++17 and above features to C++14 compiler.
-
-The need for custom `nostd` classes is significantly diminished when the SDK is
-compiled with C++17 or above compiler. Only `std::span` needs to be backported.
-
-Subsequently, there is no need for `nostd` classes in environment with C++20 or
-above compiler, where all system modules are compiled with the same / compatible
-compiler. And where the same standard library implementation is being used. This
-is the case when SDK is compiled into product itself, with no runtime loadable
-components.
-
-Compiling OpenTelemetry SDK from source using standard library classes:
-`std::map`, `std::string_view`, `std::span`, `std::variant` instead of `nostd::`
-yields better performance and debugability at expense of potentially losing ABI
-compatibility. However, the standard library built for Release is guaranteed to
-be compatible across Visual Studio 2015, 2017 and 2019 compilers on Windows with
-vc14x runtime. Thus, ABI stability requirement introduces an additional
-unnecessary runtime complexity and overhead.
-
-While we are committed to support `nostd` classes for those environments where
-ABI compatibility is a requirement, we would also like to add flexibility to
-build system to optimize the SDK for the case where ABI compatibility is NOT a
-requirement.
-
-Implementation of this feature can be subsequently be used as a foundation for
-further work - allow bindings to [Abseil](https://github.com/abseil/abseil-cpp)
-"backport" implementation of the standard library.
-
-Implementation is completely opaque from SDK code / SDK developer perspective:
-mapping / aliasing from `nostd::` classes back to their `std::` counterparts is
-done in a corresponding `opentelemetry/nostd/*.h` header. Users still use
-`nostd` classes, but the most optimal implementation is picked up depending on
-whether users require ABI stability or not.
-
-Example environments that contain the full set of standard classes:
-
-* C++17 or above compiler, with Microsoft GSL backport of `gsl::span`
-* C++20 compilers: Visual Studio 2019+, latest LLVM clang, latest gcc
-
-We continue fully supporting both models (`nostd`, `stdlib`) by running CI for
-both.
-
-## Implementation
-
-Allow to alias from `nostd::` to `std::` classes for C++17 and above.
-
-Consistent handling of `std::variant` across various OS:
-
-* backport of a few missing variant features, e.g. `std::get` and `std::visit`
-  for older version of Mac OS X. Patches that enable proper handling of
-  `std::visit` and `std::variant` irrespective of OS version to resolve [this
-  quirk](https://stackoverflow.com/questions/52310835/xcode-10-call-to-unavailable-function-stdvisit).
-
-* ability to borrow implementation of C++20 `gsl::span` from [Microsoft
-  Guidelines Support Library](https://github.com/microsoft/GSL). This is
-  necessary for C++14 and C++17 standard compilers.
-
-## Pros and Cons
-
-### Using trusted/certified Standard Library
-
-Using standard library implementation classes in customer code and on API
-surface instead of `nostd` classes. Certain environments would prefer to have
-**standard** instead of non-standard classes due to security, performance,
-stability and debug'ability considerations. For example, Visual Studio IDE
-provides 1st class Debug experience for Standard containers, plus additional
-runtime-checks for Debug builds that use Standard containers.
-
-### Minimizing binary size
-
-No need to marshal types from standard to `nostd`, then back to standard library
-across ABI boundary - means less code involved and less memcpy. We use Standard
-Library classes used elsewhere in the app. We can optimize the event passing by
-avoiding `KeyValueIterable` transform (and, thus, unnecessary memcpy) when we
-know that the incoming container type matches that one used by SDK.
-
-### Avoiding unnecessary extra memcpy (perf improvements)
-
-No need to transform from 'native' standard library types, e.g. `std::map` via
-`KeyValueIterable` means we can bypass that transformation process, if and when
-we know that the ABI compatibility is not a requirement in certain environment.
-ETA perf improvement is 1.5%-3% better perf since an extra transform, memcpy,
-iteration for-each key-value is avoided. Custom OpenTelemetry SDK implementation
-may operate on standard container classes rather than doing transform from one
-container type to another.
-
-### ABI stability
-
-Obviously this approach does not work in Linux environments, where ABI stability
-guarantee must be provided, e.g. for dynamically loadable OpenTelemetry SDK
-module and plugins for products such as NGINX, Envoy, etc. Example: a product is
-compiled with modern gcc compiler. But OpenTelemetry SDK is compiled with an
-older runtime library. In this case the SDK must be compiled with `nostd`.
-
-Note that for most scenarios with modern Windows compilers, STL library is
-ABI-safe across Visual Studio 2015, 2017 and 2019 with vc14x runtime.
-
-Quote from [official
-documentation](https://docs.microsoft.com/en-us/cpp/porting/binary-compat-2015-2017?view=msvc-160)
-:
-
-Visual Studio 2015, 2017, and 2019: the runtime libraries and apps compiled by
-any of these versions of the compiler are binary-compatible. It's reflected in
-the C++ toolset major number, which is 14 for all three versions. The toolset
-version is v140 for Visual Studio 2015, v141 for 2017, and v142 for 2019. Say
-you have third-party libraries built by Visual Studio 2015. You can still use
-them in an application built by Visual Studio 2017 or 2019. There's no need to
-recompile with a matching toolset. The latest version of the Microsoft Visual
-C++ Redistributable package (the Redistributable) works for all of them.
-
-Visual Studio provides 1st class debug experience for the standard library.
-
-## Build and Test considerations
-
-### Separate flavors of SDK build
-
-Supported build flavors:
-
-* `nostd` - OpenTelemetry backport of classes for C++14. Not using standard lib.
-* `stdlib` - Standard Library.
-  Native experience with C++14/C++17/C++20/C++23 compiler.
-  Depending on the stdlib level in effect,
-  C++ features are used from the standard library,
-  completed with `nostd` replacement implementations.
-  C++17 and below works but with additional dependencies,
-  e.g. either MS-GSL or Abseil for
-  `std::span` implementation (`gsl::span` or `absl::Span`).
-* `absl`  - TODO: this should allow using Abseil C++ library only (no MS-GSL).
-
-Currently only `nostd` and `stdlib` configurations are implemented in CMake
-build. `absl` is reserved for future use. Build systems other than CMake need to
-`#define OPENTELEMETRY_STL_VERSION=<version>` to enable the Standard Library classes.
-
-Valid values for `OPENTELEMETRY_STL_VERSION` are `2011`, `2014`, `2017`, `2020` and
-`2023`.
-
-### Build matrix
-
-List of compilers that support building with standard library classes:
-
-| Compiler           | Language standard | Notes                                               |
-| ------------------ | ----------------- | --------------------------------------------------- |
-| Visual Studio 2015 | C++14             | requires `gsl::span` for `std::span` implementation |
-| Visual Studio 2017 | C++17             | requires `gsl::span` for `std::span` implementation |
-| Visual Studio 2019 | C++20             |                                                     |
-| Xcode 11.x         | C++17             | requires `gsl::span` for `std::span` implementation |
-| Xcode 12.x         | C++20             |                                                     |
-| gcc-7              | C++17             | requires `gsl::span` for `std::span` implementation |
-| gcc-9+             | C++20             |                                                     |
-
-If SDK is compiled without standard library classes, then `nostd::variant`
-implementation internally uses a private snapshot of [Abseil
-Variant](https://github.com/abseil/abseil-cpp/blob/master/absl/types/variant.h)
-.
-
-Other modern C++ language features used by OpenTelemetry, e.g.
-`std::string_view` and `std::variant` are available in C++17 standard library.
-
-Minor customization needed for Apple LLVM clang in `std::variant` exception
-handling due to the fact that the variant exception handler presence depends on
-what OS version developer is targeting. This exception on Apple systems is
-implemented inside the OS system library. This idiosyncrasy is now handled by
-OpenTelemetry API in opaque manner: support `nostd::variant` exception handling
-even on older Mac OS X and iOS by providing implementation of it in
-OpenTelemetry SDK: if exceptions are enabled, then throw
-`nostd::bad_variant_access` exception old OS where `std::bad_variant_access` is
-unavailable.
-
-#### Note on `gsl::span` vs `absl::Span`
-
-It is important to note that, while `absl::Span` is similar in design and
-purpose to the `std::span` (and existing `gsl::span` reference implementation),
-`absl::Span` is not currently guaranteeing to be a drop-in replacement for any
-eventual standard. Instead, `absl::Span` aims to have an interface as similar as
-possible to `absl::string_view`, without the string-specific functionality.
-
-Thus, OpenTelemetry built with standard library and C++17 compiler prefers
-`gsl::span` as it is fully compatible with standard `std::span` available in
-C++20 compiler.
-
-### Test setup
-
-CI allows to validate that all OpenTelemetry functionality is working the same
-identical way irrespective of what C++ runtime / STL library it is compiled
-with, to ensure that both `nostd::` and `std::` classes on API surface are
-operating the same way.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/building-with-vcpkg.md b/ext/opentelemetry-cpp-1.21.0/docs/building-with-vcpkg.md
deleted file mode 100644
index 70d794d5c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/building-with-vcpkg.md
+++ /dev/null
@@ -1,119 +0,0 @@
-# Building OpenTelemetry C++ SDK with vcpkg
-
-vcpkg is a Microsoft cross-platform open source C++ package manager. Onboarding
-instructions for Windows, Linux and Mac OS X [available
-here](https://docs.microsoft.com/en-us/cpp/build/vcpkg). This document assumes
-that the customer build system is already configured to use vcpkg. OpenTelemetry
-C++ SDK maintainers provide a build recipe, `opentelemetry` port or CONTROL file
-for vcpkg. Mainline vcpkg repo is refreshed to point to latest stable open
-source release of OpenTelemetry C++ SDK.
-
-## Installing opentelemetry package
-
-The following command can be used to install the public open source release:
-
-```console
-vcpkg install opentelemetry-cpp
-```
-
-That's it! The package should be compiled for the current OS.
-
-See instructions below to build the SDK with additional Microsoft-proprietary
-modules.
-
-## Testing custom dev OpenTelemetry build on Windows
-
-`cmd.exe` command line prompt commands:
-
-```console
-git clone --recurse-submodules https://github.com/open-telemetry/opentelemetry-cpp
-cd opentelemetry-cpp
-vcpkg install --head --overlay-ports=%CD%\tools\ports opentelemetry
-```
-
-## Testing custom dev OpenTelemetry build on POSIX (Linux and Mac)
-
-Shell commands:
-
-```console
-git clone --recurse-submodules https://github.com/open-telemetry/opentelemetry-cpp
-cd opentelemetry-cpp
-vcpkg install --head --overlay-ports=`pwd`/tools/ports opentelemetry
-```
-
-## Using response files to specify dependencies
-
-vcpkg allows to consolidate parameters passed to vcpkg in a response file. All
-3rd party dependencies needed for OpenTelemetry SDK can be described and
-installed via response file.
-
-Example for Mac:
-
-```console
-vcpkg install @tools/ports/opentelemetry/response_file_mac.txt
-```
-
-Example for Linux:
-
-```console
-vcpkg install @tools/ports/opentelemetry/response_file_linux.txt
-```
-
-vcpkg build log files are created in
-`${VCPKG_INSTALL_DIR}/buildtrees/opentelemetry/build-[err|out].log` . Review the
-logs in case if you encounter package installation failures.
-
-## Using triplets
-
-In order to enable custom build flags - vcpkg triplets and custom environment
-variables may be used. Please see [triplets instruction
-here](https://learn.microsoft.com/en-us/vcpkg/users/triplets). Response file for
-a custom build, e.g. `response_file_linux_PRODUCTNAME.txt` may specify a custom
-triplet. For example, custom triplet controls if the library is built as static
-or dynamic. Default triplets may also be overridden with [overlay
-triplets](https://learn.microsoft.com/en-us/vcpkg/users/examples/overlay-triplets-linux-dynamic).
-Overlay triplets specific to various products must be maintained by product
-teams. Product teams may optionally decide to integrate their triplets in the
-mainline OpenTelemetry C++ SDK repo as-needed.
-
-## Using Feature Packages
-
-To install opentelemetry built with standard library API surface classes:
-
-```console
-vcpkg install opentelemetry[stdlib]
-```
-
-To install opentelemetry built with Abseil API surface classes:
-
-```console
-vcpkg install opentelemetry[abseil]
-```
-
-## Build with vcpkg dependencies
-
-`CMakeLists.txt` in top-level directory lists the following package
-dependencies:
-
-- `Protobuf` - required for OTLP exporter. Not required otherwise.
-- `GTest` - required when building with tests enabled.
-- `Benchmark` - required when building with tests enabled.
-- `ms-gsl` - required for `gsl::span` when building with Standard Library with
-  C++14 or C++17 compiler.
-- `nlohmann-json` - required when building with zPages module.
-- `prometheus-cpp` - required for Prometheus exporter.
-- `gRPC` and `Protobuf` - required for OTLP exporter
-
-It is possible to adjust the build system to use either vcpkg-installed
-dependencies or OS-provided dependencies, e.g. `brew` or `deb` packages.
-To install the dependencies through vcpkg,
-
-- Set the VCPKG_ROOT env variable to the vcpkg install directory, or
-- Set the CMake variable CMAKE_TOOLCHAIN_FILE to vcpkg toolchain file `vcpkg.cmake`.
-
-With either of these settings, the appropriate vcpkg folders get added to the cmake
-search path, and makes the required libraries to be found through `find_package()`.
-
-The opentelemetry-cpp repo also brings the vcpkg package under `tools` directory.
-This would be used during Windows builds to install the missing dependencies ONLY
-if the external vcpkg toolchain is not configured.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/building-with-vs2019.md b/ext/opentelemetry-cpp-1.21.0/docs/building-with-vs2019.md
deleted file mode 100644
index fa41c4a1b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/building-with-vs2019.md
+++ /dev/null
@@ -1,190 +0,0 @@
-# Building OpenTelemetry C++ SDK with Visual Studio 2019, CMake and Ninja
-
-## Preface
-
-These instructions are focused on developers and integrators, providing a hassle-free
-and FAST option of building OpenTelemetry C++ SDK with Visual Studio on Windows.
-
-The process is optimized for both scenarios:
-
-- SDK developer experience on developer machine.
-- final product CI/CD pipeline.
-
-## Build System Components
-
-Visual Studio 2019 is a Full-featured integrated development environment (IDE) for
-Android, iOS, Windows, web, and cloud. There are three editions:
-
-- FREE [Community Edition](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=16)
-- [Professional Edition](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Professional&rel=16)
-- [Enterprise Edition](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Enterprise&rel=16)
-
-There is also no-IDE 'headless' set of command line tools available as
-`Visual Studio 2019 Build Tools` package. You may install it on Windows
-via [Chocolatey package manager](https://community.chocolatey.org/packages/visualstudio2019buildtools).
-
-You may also use Visual Studio with Windows 10 Subsystem for Linux to cross-compile
-the SDK [targeting Linux distributions](https://code.visualstudio.com/docs/cpp/config-wsl).
-Linux build process is largely identical to Windows process described below,
-with `tools/setup-buildtools.sh` and `tools/build.sh` running on Linux.
-
-Older versions of Visual Studio, such as 2015 and 2017 are known to work well
-with CMake and Ninja. However, these old versions are not covered by instructions
-below. If you would like to contribute additional instructions for older versions,
-feel free to contribute a Pull Request detailing your build experience with older
-versions.
-
-[CMake](https://cmake.org/) is cross-platform free and open-source software for
-build automation, testing, packaging and installation of software by using a
-compiler-independent method. CMake is not a build system but rather it generates
-another system's build files.
-
-[MSBuild](https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild?view=vs-2019)
-is a default build system used by Visual Studio for loading and building software
-projects.
-
-[Ninja](https://ninja-build.org/) is a small build system with a focus on speed.
-It differs from other build systems in two major respects: it is designed to have
-its input files generated by a higher-level build system, and it is designed
-to run builds as fast as possible.
-
-[Chocolatey package manager](https://chocolatey.org/) has the largest online registry
-of Windows packages. Chocolatey packages encapsulate everything required to manage
-a particular piece of software into one deployment artifact by wrapping installers,
-executables, zips, and/or scripts into a compiled package file.
-
-[vcpkg](https://vcpkg.io/en/index.html) is a free C/C++ package manager for acquiring
-and managing libraries. Choose from over 1500 open source libraries to download
-and build in a single step or add your own private libraries to simplify your
-build process. Maintained by the Microsoft C++ team and open source contributors.
-
-## Installing Prerequisites
-
-Please install the following software:
-
-- Install Visual Studio 2019 with C/C++ development tools, including CMake tools.
-[This article](https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-160)
- explains the fundamentals of working with CMake projects in Visual Studio.
-
-- Install [Git tools for Windows](https://git-scm.com/downloads).
-
-Setup script below uses Chocolatey to install the following components:
-
-- `vswhere` - utility to auto-discover Visual Studio installation.
-- `cmake`
-- `git`
-- `vcpkg` to download, compile and install 3rd party C++ libraries from source.
-
-List of C++ dependencies compiled and installed via `vcpkg`:
-
-- [Google Test](https://github.com/google/googletest)
-- [Google Benchmark](https://github.com/google/benchmark)
-- [Microsoft GSL](https://github.com/microsoft/GSL)
-- [nlohmann/json](https://github.com/nlohmann/json)
-- [Abseil](https://github.com/abseil/abseil-cpp)
-- [Protocol Buffers](https://github.com/protocolbuffers/protobuf)
-- [gRPC](https://github.com/grpc/grpc)
-- [Prometheus C++ client](https://github.com/jupp0r/prometheus-cpp)
-- [cURL](https://github.com/curl/curl)
-
-## Command Line Build Process
-
-Start `Command Prompt` as Administrator and execute the following commands:
-
-```console
-git clone --recursive https://github.com/open-telemetry/opentelemetry-cpp
-cd opentelemetry-cpp
-tools\setup-buildtools.cmd
-tools\build.cmd
-```
-
-Let's dissect the flow:
-
-```console
-git clone --recursive https://github.com/open-telemetry/opentelemetry-cpp
-```
-
-SDK will be cloned recursively with remote submodule dependencies.
-
-```console
-cd opentelemetry-cpp
-tools\setup-buildtools.cmd
-```
-
-The necessary build tools are installed. This step requires elevation to install
-additional tooling, e.g. CMake to `Program Files`. The necessary dependencies are
-being built using [vcpkg package manager](https://vcpkg.io/en/index.html). This
-one-time step is time-consuming - about up to 5-10 minutes. It has to be done once
-during the initial installation and configuration of build tools and dependencies.
-
-```console
-tools\build.cmd
-```
-
-The build of all SDK components is done using CMake + ninja in less than couple
-minutes. Above script shows you how to build both configurations:
-
-- `nostd`  - OpenTelemetry implementation of standard containers.
-- `stdlib` - Standard Template Library containers.
-
-You may execute this workflow in a docker container. Please refer to generic
-instructions that detail how to [run build build tools in a docker container](https://docs.microsoft.com/en-us/visualstudio/install/build-tools-container?view=vs-2019).
-
-## Building in Visual Studio 2019 IDE
-
-- Run as Administrator: `tools\setup-buildtools.cmd` to install the necessary
-build tooling. This script installs all build tools and builds all 3rd party
-dependencies from source using [vcpkg package manager](https://vcpkg.io/en/index.html).
-- Launch Visual Studio 2019 IDE.
-- Use `Open a local folder` option to open the folder where you cloned the
-  source code.
-- Right-click on `CMakeLists.txt` and choose `Generate Cache for opentelemetry-cpp`.
-- In the top bar menu - select `Build -> Build All` to build SDK, Exporters and Tests.
-- You can use [Google Test Adapter](https://marketplace.visualstudio.com/items?itemName=ChristianSoltenborn.GoogleTestAdapter)
-Visual Studio extension to run all SDK and Exporter tests in IDE.
-- You can individually select and run only given tests or examples.
-
-Visual Studio provides an excellent debugging and troubleshooting experience,
-with incremental builds using Ninja typically taking just one click to build
-and less than a few seconds for the build to complete.
-
-## Build time comparison between `MSBuild` and `Ninja`
-
-After the initial set of 3rd party dependencies have been built via
-`tools\setup-buildtools.cmd`, we can benchmark the OpenTelemetry C++ SDK build
-times with [MSBuild](https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild?view=vs-2019)
-vs with [Ninja](https://ninja-build.org/).
-
-[ptime utility](https://community.chocolatey.org/packages/ptime) may be used
-to measure the total execution time for two build configurations built in one
-run: `nostd-debug` and `stdlib-debug`.
-
-### MSBuild build timing
-
-```console
-set CMAKE_GEN=Visual Studio 16 2019
-ptime build.cmd
-...
-Execution time: 543.701 s
-```
-
-### Ninja build timing
-
-```console
-REM Unset CMAKE_GEN= - default is ninja with autodetection of ninja.exe tool path
-set CMAKE_GEN=
-ptime build.cmd
-...
-Execution time: 105.158 s
-```
-
-## Conclusion
-
-It is strongly recommended to build the SDK with *Ninja* since it is at least x5
-times faster than MSBuild for a full clean build. Incremental builds with *Ninja*
-are also considerably faster. Each incremental build is taking about 10 seconds
-total for 2 build configurations. Absolute time may differ depending on machine
-being benchmarked. Relative ratio on most machines demonstrates that building
-with *Ninja* build system greatly optimizes your development cycle. Not only it
-saves your development time, optimizes your CI/CD cycle, but it is also much more
-environmentally friendly.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/cpp-ostream-exporter-design.md b/ext/opentelemetry-cpp-1.21.0/docs/cpp-ostream-exporter-design.md
deleted file mode 100644
index 6da8bdd03..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/cpp-ostream-exporter-design.md
+++ /dev/null
@@ -1,259 +0,0 @@
-# OStreamExporter Design
-
-In strongly typed languages typically there will be 2 separate `Exporter`
-interfaces, one that accepts spans from a tracer (SpanExporter) and one that
-accepts metrics (MetricsExporter)
-
-The exporter SHOULD be called with a checkpoint of finished (possibly
-dimensionally reduced) export records. Most configuration decisions have been
-made before the exporter is invoked, including which instruments are enabled,
-which concrete aggregator types to use, and which dimensions to aggregate by.
-
-## Use Cases
-
-Monitoring and alerting systems commonly use the data provided through metric
-events or tracers, after applying various aggregations and converting into
-various exposition format. After getting the data, the systems need to be able
-to see the data. The OStreamExporter will be used here to print data through an
-ostream, this is seen as a simple exporter where the user doesn’t have the
-burden of implementing or setting up a protocol dependent exporter.
-
-The OStreamExporter will also be used as a debugging tool for the Metrics
-API/SDK and Tracing API/SDK which are currently work in progress projects. This
-exporter will allow contributors to easily diagnose problems when working on the
-project.
-
-## Push vs Pull Exporter
-
-There are two different versions of exporters: Push and Pull. A Push Exporter
-pushes the data outwards towards a system, in the case of the OStreamExporter it
-sends its data into an ostream. A Pull Exporter exposes data to some endpoint
-for another system to grab the data.
-
-The OStreamExporter will only be implementing a Push Exporter framework.
-
-## Design Tenets
-
-* Reliability
-  * The Exporter should be reliable; data exported should always be accounted
-    for. The data will either all be successfully exported to the destination
-    server, or in the case of failure, the data is dropped. `Export` will always
-    return failure or success to notify the user of the result.
-  * Thread Safety
-    * The OStreamExporter can be called simultaneously, however we do not handle
-      this in the Exporter. Synchronization should be done at a lower level.
-* Scalability
-  * The Exporter must be able to operate on sizeable systems with predictable
-    overhead growth.  A key requirement of this is that the library does not
-    consume unbounded memory resource.
-* Security
-  * OStreamExporter should only be used for development and testing purpose,
-    where security and privacy is less a concern as it doesn't communicate to
-    external systems.
-
-## SpanExporter
-
-`Span Exporter` defines the interface that protocol-specific exporters must
-implement so that they can be plugged into OpenTelemetry SDK and support sending
-of telemetry data.
-
-The goal of the interface is to minimize burden of implementation for
-protocol-dependent telemetry exporters. The protocol exporter is expected to be
-primarily a simple telemetry data encoder and transmitter.
-
-The SpanExporter is called through the SpanProcessor, which passes finished
-spans to the configured SpanExporter, as soon as they are finished. The
-SpanProcessor also shutdown the exporter by the Shutdown function within the
-SpanProcessor.
-
-<!-- [//]: # ![SDK Data Path](./images/SpanDataPath.png) -->
-
-The specification states: exporter must support two functions: Export and
-Shutdown.
-
-### SpanExporter.Export(span of recordables)
-
-Exports a batch of telemetry data. Protocol exporters that will implement this
-function are typically expected to serialize and transmit the data to the
-destination.
-
-Export() must not block indefinitely. We can rely on printing to an ostream is
-reasonably performant and doesn't block.
-
-The specification states: Any retry logic that is required by the exporter is
-the responsibility of the exporter. The default SDK SHOULD NOT implement retry
-logic, as the required logic is likely to depend heavily on the specific
-protocol and backend the spans are being sent to.
-
-### SpanExporter.Shutdown()
-
-Shuts down the exporter. Called when SDK is shut down. This is an opportunity
-for exporter to do any cleanup required.
-
-`Shutdown` should be called only once for each `Exporter` instance. After the
-call to `Shutdown` subsequent calls to `Export` are not allowed and should
-return a `Failure` result.
-
-`Shutdown` should not block indefinitely (e.g. if it attempts to flush the data
-and the destination is unavailable). Language library authors can decide if they
-want to make the shutdown timeout configurable.
-
-In the OStreamExporter there is no cleanup to be done, so there is no need to
-use the timeout within the `Shutdown` function as it will never be blocking.
-
-```cpp
-class StreamSpanExporter final : public sdktrace::SpanExporter
-{
-
-private:
-    bool isShutdown = false;
-
-public:
-    /*
-        This function should never be called concurrently.
-    */
-    sdktrace::ExportResult Export(
-        const nostd::span<std::unique_ptr<sdktrace::Recordable>> &spans) noexcept
-    {
-
-        if(isShutdown)
-        {
-            return sdktrace::ExportResult::kFailure;
-        }
-
-        for (auto &recordable : spans)
-        {
-            auto span = std::unique_ptr<sdktrace::SpanData>(
-                static_cast<sdktrace::SpanData *>(recordable.release()));
-
-            if (span != nullptr)
-            {
-                char trace_id[32]       = {0};
-                char span_id[16]        = {0};
-                char parent_span_id[16] = {0};
-
-                span->GetTraceId().ToLowerBase16(trace_id);
-                span->GetSpanId().ToLowerBase16(span_id);
-                span->GetParentSpanId().ToLowerBase16(parent_span_id);
-
-                std::cout << "{"
-                          << "\n  name          : " << span->GetName()
-                          << "\n  trace_id      : " << std::string(trace_id, 32)
-                          << "\n  span_id       : " << std::string(span_id, 16)
-                          << "\n  parent_span_id: " << std::string(parent_span_id, 16)
-                          << "\n  start         : " << span->GetStartTime().time_since_epoch().count()
-                          << "\n  duration      : " << span->GetDuration().count()
-                          << "\n  description   : " << span->GetDescription()
-                          << "\n  status        : " << span->GetStatus()
-                          << "\n  attributes    : " << span->GetAttributes() << "\n}"
-                          << "\n";
-            }
-
-        }
-
-        return sdktrace::ExportResult::kSuccess;
-    }
-
-    bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept
-    {
-        isShutdown = true;
-        return true;
-    }
-};
-```
-
-## MetricsExporter
-
-The MetricsExporter has the same requirements as the SpanExporter. The exporter
-will go through the different metric instruments and send the value stored in
-their aggregators to an ostream, for simplicity only Counter is shown here, but
-all aggregators will be implemented. Counter, Gauge, MinMaxSumCount, Sketch,
-Histogram and Exact Aggregators will be supported.
-
-Exports a batch of telemetry data. Protocol exporters that will implement this
-function are typically expected to serialize and transmit the data to the
-destination.
-
-<!-- [//]: # ![SDK Data Path](./images/DataPath.png) -->
-
-### MetricsExporter.Export(batch of Records)
-
-Export() must not block indefinitely. We can rely on printing to an ostream is
-reasonably performant and doesn't block.
-
-The specification states: Any retry logic that is required by the exporter is
-the responsibility of the exporter. The default SDK SHOULD NOT implement retry
-logic, as the required logic is likely to depend heavily on the specific
-protocol and backend the spans are being sent to.
-
-The MetricsExporter is called through the Controller in the SDK data path. The
-exporter will either be called on a regular interval in the case of a push
-controller or through manual calls in the case of a pull controller.
-
-### MetricsExporter.Shutdown()
-
-Shutdown() is currently not required for the OStreamMetricsExporter.
-
-```cpp
-class StreamMetricsExporter final : public sdkmeter::MetricsExporter
-{
-
-private:
-    bool isShutdown = false;
-
-public:
-    sdkmeter::ExportResult Export(
-        const Collection<Record> batch) noexcept
-    {
-
-        for (auto &metric : batch)
-        {
-
-            if (metric != nullptr)
-            {
-
-                if(metric.AggregationType == CounterAggregator) {
-                    std::cout << "{"
-                              << "\n  name          : " << metric->GetName()
-                              << "\n  labels        : " << metric->GetLabels()
-                              << "\n  sum           : " << metric->Value[0] << "\n}"
-                }
-                else if(metric.AggregationType == SketchAggregator) {
-                    // Similarly print data
-                }
-                // Other Aggreagators will also be handeled,
-                // Counter, Gauge, MinMaxSumCount, Sketch, Histogram,
-                // and Exact Aggreagtors
-            }
-
-        }
-
-        return sdkmeter::ExportResult::kSuccess;
-    }
-
-};
-```
-
-## Test Strategy / Plan
-
-In this project, we will follow the TDD rules, and write enough functional unit
-tests before implementing production code. We will design exhaustive test cases
-for normal and abnormal inputs, and tests for edge cases.
-
-In terms of test framework, as is described in the [Metrics API/SDK design
-document](https://quip-amazon.com/UBXyAuqRzkIj/Metrics-APISDK-C-Design-Document-External),
-the OStreamExporter will use [Googletest](https://github.com/google/googletest)
-framework because it provides test coverage reports, and it also integrate code
-coverage tools such as [codecov.io](http://codecov.io/) in the project. There
-are already many reference tests such as MockExporter tests written in
-GoogleTest, making it a clear choice to stick with it as the testing framework.
-A required coverage target of 90% will help to ensure that our code is fully
-tested.
-
-## Future Features
-
-* Serialize data to another format (json)
-
-## Contributors
-
-* Hudson Humphries
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/cpp-sdk-factory-design.md b/ext/opentelemetry-cpp-1.21.0/docs/cpp-sdk-factory-design.md
deleted file mode 100644
index 90d2506dd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/cpp-sdk-factory-design.md
+++ /dev/null
@@ -1,210 +0,0 @@
-# SDK Factory Design
-
-When an application owner needs to configure the opentelemetry SDK,
-this can be done in different ways:
-
-- by assembly of available SDK elements already provided,
-- by extension of the SDK to support more functionality.
-
-The sections below investigate each use case,
-and the consequences when using shared libraries.
-
-Last, a section discuss the impact of C++ conditional parameters
-on the SDK interface, and how this affects shared libraries.
-
-## SDK assembly
-
-Assume the application owner needs to build a trace provider, using the gRPC trace
-exporter.
-
-### Case study, direct call to the SDK implementation classes
-
-A possible way to build the exporter is to call, from the application code:
-
-```cpp
-opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
-
-auto exporter = std::unique_ptr<opentelemetry::sdk::trace::SpanExporter>(
-  new opentelemetry::exporter::otlp::OtlpGrpcExporter(opts));
-```
-
-When the application code is built and linked against static
-opentelemetry-cpp libraries, the result is a binary that is consistent, and
-works.
-
-However, in case of a bug fixed in opentelemetry-cpp itself, the entire
-application must be rebuilt (with a fixed version), redistributed,
-and reinstalled, to have the bug effectively fixed.
-
-This is highly undesirable.
-
-Instead of static libraries, now consider the same application built and
-linked against shared (dynamic) libraries instead.
-
-The desired goal with shared libraries is to allow to:
-
-- fix a bug in opentelemetry-cpp
-- deploy a fixed shared library
-- keep the application unchanged.
-
-For this to be possible, the ABI exposed by the SDK shared library
-must be stable.
-
-Here, class OtlpGrpcExporter is the implementation itself,
-and is very likely to change, even for a bug fix,
-so it is not a good thing to expose it.
-
-Setting the constraint on the SDK implementation that class
-OtlpGrpcExporter will never change is unrealistic,
-because a bug fix might require new members (for example, to add a mutex to
-fix a race), which will change the ABI (the memory layout is different),
-breaking the application code compiled with a different version.
-
-In summary, this line of code alone, in the application space:
-
-  new opentelemetry::exporter::otlp::OtlpGrpcExporter(opts);
-
-prevents in practice any deployment using shared libraries.
-
-### Case study, using Factory and builders from the SDK
-
-The SDK also provide Factory classes, that can be used as follows
-from the application code:
-
-```cpp
-opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
-
-auto exporter =
-  opentelemetry::exporter::otlp::OtlpGrpcExporterFactory::Create(opts);
-```
-
-While the application code does not change much,
-the amount of SDK internals exposed to the application is reduced
-significantly.
-
-OtlpGrpcExporterFactory::Create() actually returns a abstract SpanExporter
-object, instead of a concrete OtlpGrpcExporter object.
-
-As a result, the application binary is not even aware of the implementation
-class OtlpGrpcExporter.
-
-This property makes it possible to:
-
-- implement changes in the SDK itself
-- deploy a new SDK shared library
-- keep the application unchanged
-
-### Case study, using Factory and shared gRPC client between OTLP gRPC exporters
-
-To reduce the cost of gRPC, the SDK allow users to share gRPC clients between
-OTLP gRPC exporters when these exporters have the same settings. This can be
-used as follows from the application code:
-
-```cpp
-// Include following headers
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
-
-// Create exporters with shared gRPC Client
-namespace otlp = opentelemetry::exporter::otlp;
-
-void SetupOtlp() {
-  otlp::OtlpGrpcClientOptions client_opts;
-  otlp::OtlpGrpcExporterOptions trace_opts;
-  otlp::OtlpGrpcLogRecordExporterOptions log_opts;
-
-  // Setting client_opts, trace_opts and log_opts
-  // client_opts.endpoint = "localhost:1234";
-  // Or we can use client_opts = trace_opts; to copy options from environment of
-  // trace OTLP exporter.
-
-  std::shared_ptr<otlp::OtlpGrpcClient> shared_client =
-    otlp::OtlpGrpcClientFactory::Create(client_opts);
-
-  // Create exporters
-  auto trace_exporter =
-    otlp::OtlpGrpcExporterFactory::Create(trace_opts, shared_client);
-  auto log_exporter =
-    otlp::OtlpGrpcLogRecordExporterFactory::Create(log_opts, shared_client);
-
-  // Other initialization codes ...
-}
-```
-
-Be careful, create OTLP exporters with an existing `OtlpGrpcClient` will ignore
-the options of gRPC when passing the `OtlpGrpcExporterOptions` or other option
-object.
-
-## SDK extension
-
-Applications owners who want to extend existing SDK classes are expected
-to have a stronger dependency on the SDK internals.
-
-For example, with
-
-```cpp
-class MyFancyOtlpGrpcExporter : public OtlpGrpcExporter {...}
-```
-
-the build depends on the actual SDK implementation.
-
-Class OtlpGrpcExporter is visible in the SDK public header files,
-to allow this pattern.
-
-Using shared libraries in this case is not recommended,
-because the SDK implementation is at greater risk of change.
-
-## Conditional parameters
-
-Assume Foo() is part of the SDK, delivered as a shared library.
-
-When an API contains conditional parameters, as in:
-
-```cpp
-void Foo(int x = 0, int y = 0);
-```
-
-this in reality produces 3 APIs usable by the application code:
-
-```cpp
-void Foo();
-void Foo(int x);
-void Foo(int x, int y);
-```
-
-as well as 1 ABI provided in a library:
-
-```cpp
-void Foo(int x, int y);
-```
-
-The value of the defaults parameters (x = 0) is compiled in the application
-code.
-
-Assume that, for a bug fix, the API definition is changed to:
-
-```cpp
-void Foo(int x = 0, int y = 1);
-```
-
-Deploying a new version of the SDK will have no effect,
-because the default value is in the application binary, not the shared
-library.
-
-Now, assume a later change needs to add a new parameter:
-
-```cpp
-void Foo(int x = 0, int y = 1, int z = 2);
-```
-
-Here, clients will call the old Foo(int x, int y) ABI, crashing in the SDK
-because the SDK expects 3 parameters, not 2.
-
-Because of this, conditional parameters are to be avoided,
-not to be used in the SDK interface.
-
-Note that using conditional parameters in the opentelemetry-cpp API is ok,
-because the API is header only (there is no ABI).
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/dependencies.md b/ext/opentelemetry-cpp-1.21.0/docs/dependencies.md
deleted file mode 100644
index 8d19b6490..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/dependencies.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Dependencies and Licenses
-
-There are
-
-- External dependencies as linkable libraries or externally installed headers, and
-- Internal dependencies as the part of code from external libraries
-  backported/copied in main repo.
-
-Both these dependencies are listed here:
-
-## Internal dependencies
-
-- [nostd::variant](/api/include/opentelemetry/nostd/internal/absl/types/variant.h):
-  This is backported from [Abseil C++
-  libraries](https://github.com/abseil/abseil-cpp) and used as default variant
-  implementation. License: `Apache License 2.0`
-- [TraceLoggingDynamic](/exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h):
-  Dynamic TraceLogging Provider API for C++ used by ETW exporter. License: `MIT License`
-
-## External dependencies
-
-- [API](/api)
-  &
-  [SDK](/sdk):
-  - Uses Standard C++ library for latest features (std::string_view,
-    std::variant, std::span, std::shared_ptr, std::unique_ptr) with  C++14/17/20
-    compiler if cmake option `WITH_STL` is enabled
-    or macro `OPENTELEMETRY_STL_VERSION` is defined.
-    License: `GNU General Public License`
-    - For C++14/17 compilers, fallback to gsl::span if [GSL C++
-      library](https://github.com/microsoft/GSL) is installed. License: `MIT
-      License`
-    - libc++ 14.0.0 do not support construct std::span from a range or container
-      .We don't use the std::span in this situation.Users can also define
-      `OPENTELEMETRY_OPTION_USE_STD_SPAN=0` to indicate nostd:span will always
-      not be a alias for std::span.
-
-- [OTLP/HTTP+JSON](/exporters/otlp)
-  exporter:
-  - [protobuf](https://github.com/protocolbuffers/protobuf):  Library to
-    serialize structured data.
-    - OTLP messages are constructed as protobuf payloads.
-    - `protoc` compiler is used to generate C++ stubs for proto files provided
-      by `opentelemetry-proto`.
-    - `libprotobuf` library is used for generating serialized trace/metrics/log
-      data to be sent to opentelemetry collector.
-    - License: The library is licensed
-      [here](https://github.com/protocolbuffers/protobuf/blob/master/LICENSE).
-      The  code generated by protoc compiler is owned by the owner of `.proto`
-      file.
-  - [libcurl](https://curl.se/libcurl/) : the multiprotocol file transfer
-    library.
-    - Export connects with opentelemetry collector over HTTP protocol using
-      libcurl library
-    - License: Inspired by `MIT/X` but not same.
-      <https://curl.se/docs/copyright.html>
-  - [nlohmann/json](https://github.com/nlohmann/json): JSON for Modern C++.
-    - protobuf serialized otlp messages are encoded in JSON format using this
-      library.
-    - License: `MIT License`
-  - [zlib](https://www.zlib.net/): A Massively Spiffy Yet Delicately
-    Unobtrusive Compression Library.
-    - The `http_client` utilizes zlib to compress the message body and send
-      it in gzip format.
-    - License: The library is licensed
-      [here](https://www.zlib.net/zlib_license.html)
-
-- [OTLP/gRPC](/exporters/otlp)
-  exporter:
-  - `protobuf`  OTLP messages are constructed as protobuf payloads.
-  - [gRPC](https://github.com/grpc/grpc): An RPC library and framework
-    - Exporter communicates with OTLP collector using gRPC transport mechanism.
-    - License: `Apache License 2.0`
-
-- [Zipkin](/exporters/zipkin)
-  exporter:
-  - `libcurl` for connecting with Zipkin server over HTTP protocol.
-  - `nlohmann/json` for encoding Zipkin messages.
-
-- [ETW](/exporters/etw)
-  exporter:
-  - `nlohmann/json` for generating MessagePack serialization for message to be
-    transmitted to ETW.
-
-- [Prometheus](/exporters/prometheus)
-  exporter:
-  - [`prometheus-cpp`](https://github.com/jupp0r/prometheus-cpp) Prometheus
-    Client Library for Modern C++
-    - License: `MIT License`
-
-- [ElasticSearch](/exporters/elasticsearch)
-  exporter:
-  - `libcurl` for connecting with Elasticsearch server over HTTP protocol.
-  - `nlohmann/json` for encoding Elastic Search messages.
-
-- [Opentracing](/opentracing-shim)
-  shim:
-  - [`opentracing-cpp`](https://github.com/opentracing/opentracing-cpp)
-    OpenTracing API for C++
-    - A bridge layer implementing the OpenTracing API using the OpenTelemetry API
-    - License: `Apache License 2.0`
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/deprecation-process.md b/ext/opentelemetry-cpp-1.21.0/docs/deprecation-process.md
deleted file mode 100644
index 81d3e845c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/deprecation-process.md
+++ /dev/null
@@ -1,433 +0,0 @@
-# Deprecation process
-
-## Motivation
-
-Deprecation of code is a difficult topic,
-which can become a point of friction.
-
-On one hand, maintainers have to maintain the code base
-for many platforms, many compilers, while making bug fixes
-and adding new features over time.
-
-To do so, sometime code cleanup, minor refactoring, or removal of
-previous engineering debt is required to maintain a healthy code base,
-to allow for further improvements.
-
-In short, maintainers may want to, or may have to,
-remove some apis during the lifetime of a project.
-
-On the other hand, users who have a working application built using
-opentelemetry-cpp, for a given platform, a given compiler, and a given
-configuration, prefer to have stability and as few changes as possible.
-
-Doing code changes in the application imply a new build / test / deploy
-cycle, which induce costs, and risks.
-
-In short, users typically do now want changes, if the code works for them.
-
-The following extreme behaviors are what needs to be avoided for a project
-to stay healthy:
-
-* constant changes in the code base, done without notice,
-  introducing incompatibilities, causing adoption of each new release to
-  be costly with code rewrite. While this allows maintainers to make
-  more releases, it ultimately slows down adoption from users.
-
-* impossibility to make any changes in the code base, or having to support
-  many different flavors of the same api for compatibility reasons,
-  which introduces cost, technical risks, and code bloat, ultimately slowing
-  innovation down.
-
-The whole idea of a deprecation and removal process is to provide some
-mitigation, that will satisfy both maintainers and users, while allowing
-both to move forward with their own areas or responsibilities.
-
-Also, note that some areas of the code are considered stable, while others
-are maturing (feature preview), or experimental and in active development.
-
-The deprecation and removal process is primarily for stable parts of the
-code. Code in feature preview and experimental is expected to change in a
-faster pace, possibly with short of no notice in case of experimental code.
-
-This process attempts to provide:
-
-* visibility on the delivery pipeline itself, so that deprecations are
-  visible and documented in advance,
-* sufficient time between the deprecation and the removal of an API,
-  so that users can adapt the application at a time of their choice,
-  planned, instead of having to do it in emergency,
-* tooling to verify if a given code base is exposed to deprecated code or
-  not, to help assess how much effort is required to stay up to date,
-* migration and mitigations, to document not only that some api is going
-  away, but to also provide instructions to adjust the code with an
-  alternate solution.
-
-## Artifacts
-
-### Issues
-
-Deprecation issues should be tagged with the "Deprecated" label,
-for example like
-[issue #1892](https://github.com/open-telemetry/opentelemetry-cpp/issues/1892).
-
-Removal issues should be tagged with the "Removal" label,
-for example like
-[issue #1938](https://github.com/open-telemetry/opentelemetry-cpp/issues/1938).
-
-Discoverability of ongoing deprecations and removals is the key here,
-to avoid surprises.
-
-### The DEPRECATED document
-
-At any given time, file `DEPRECATED` lists all the ongoing deprecations,
-no matter how long ago these were announced.
-
-A user using release N should find, when reading `DEPRECATED`,
-if a given api was deprecated in release N-5 or N-10, without having to go back to
-release notes from past versions.
-
-When a removal is finally implemented, the `DEPRECATED` file is expunged,
-so it contains only the currently active deprecations.
-
-Main sections in that document are organized as follows:
-
-* [Platforms]
-* [Compilers]
-* [Third party dependencies]
-* [Build tools]
-  * This is for `CMake`, `Bazel`, `Doxygen`, ...
-  * Changes of tooling go here.
-* [Build scripts]
-  * This is for `CMakeLists.txt`, `BUILD`, `Doxyfile`, ...
-  * Changes of build options go here.
-* [opentelemetry-cpp API]
-* [opentelemetry-cpp SDK]
-* [opentelemetry-cpp Exporter]
-* [Documentation]
-
-Please keep main sections as is, with a content of "N/A", instead of
-removing sections with no current deprecations.
-
-## Workflow
-
-### Decide deprecation
-
-The first step is to discuss, typically in SIG C++ meeting,
-the need to deprecate a given feature or api.
-
-Upon agreement,
-file an issue in GitHub so it becomes visible to all parties
-following closely development.
-
-Use [DEPRECATION] in the title, and tag with label "Deprecation".
-
-For highly visible features,
-consider other ways to improve awareness, such as:
-
-* pin the deprecation issue in the GitHub UI,
-* discussions in the slack channels
-* discussions with other teams in open-telemetry
-* blog posts
-
-### Prepare deprecation
-
-Implement the deprecation issue with a PR.
-
-Deprecation consist of two parts, communication and tooling.
-
-For the communication, the PR should add an entry in file `DEPRECATED`,
-detailing the following sections:
-
-* Announcement
-  * set `Version:` to TO-BE-RELEASED-VERSION
-  * set `Date:` to TO-BE-RELEASED-DATE
-  * set `PR:` to the deprecation PR
-  * If applicable, add references to any other relevant document
-    (slack discussion, blog, meeting minutes)
-* Motivation
-  * add justifications for the need to deprecate.
-  * this step is critical to get support from users that will be affected,
-    instead of getting push back.
-* Scope:
-  * details which part are affected.
-  * when applicable, give the exact name of CMake options,
-    C++ header files, classes, functions, etc,
-    so that users can easily search in their code base
-    for references to the deprecated items,
-    and assess the exposure to deprecated code.
-* Mitigation:
-  * indicate any tooling available to identify the
-    deprecated code still in use,
-  * indicate technical mitigations if known,
-  * name replacement apis, libraries, compiling options, etc,
-    and describe how to adjust the user code in general,
-    to remove any dependencies on deprecated code.
-* Planned removal:
-  * Indicate an estimated date and/or version, if known,
-    by which the deprecated code will be removed,
-  * this allows users to plan accordingly, to minimize disruption.
-
-For the tooling, the PR should implement any code change necessary
-to help users transition to a clean code base,
-where all dependencies to deprecated code are removed.
-
-This imply these dependencies can be identified,
-in a reliable way.
-
-The goal is to, at the same time:
-
-* not break existing functionality in any way, in "normal" mode,
-* find all references to deprecated code, in "verify" mode.
-
-See [Technical guidelines](#technical-guidelines) for examples.
-
-Once both parts are addressed,
-get the PR reviewed and merged to the main branch.
-
-File a different issue, to remove the deprecated code later.
-
-Use [REMOVAL] in the title, and tag with label "Removal".
-
-In the removal issue, refer to the corresponding deprecation issue.
-
-### Release deprecation
-
-When making a new opentelemetry-cpp release,
-in addition to the regular release tasks:
-
-* Replace every occurrences of `TO-BE-RELEASED-VERSION` in file
-  `DEPRECATED` with the new release version,
-* Replace every occurrences of `TO-BE-RELEASED-DATE` in file
-  `DEPRECATED` with the new release date,
-* In the `CHANGELOG` and the release notes, add references
-  to the new deprecated items for this release,
-  pointing to the `DEPRECATED` document.
-
-### Wait
-
-Do not implement the removal right away.
-
-First, if a removal is implemented and merged to main just after a new release,
-it exposes itself to a full revert, should another release be necessary to fix
-any regressions just caused recently.
-
-Second, some people will only notice the deprecation when discovering it
-in the release, no matter how many previous announcements were done.
-Allow some time for people to raise issues or concerns,
-especially if there are special usage patterns that were not anticipated.
-
-Once things are stable, proceed with the removal.
-Depending on the change, it can be implemented:
-
-* in the next minor release,
-* after a few minor releases,
-* in the next major release,
-* after a few major releases
-
-following the deprecation.
-
-The more disruptive the change is,
-the more time users will need to adjust,
-so trivial deprecations can be removed right away,
-while complex ones can take much longer.
-
-In any case, never implement the deprecation and the removal in the same
-release: wait.
-
-### Prepare removal
-
-Implement the removal issue with a PR.
-
-Remove all the deprecated code.
-
-Remove all the tooling (compiling options) related to the deprecated code,
-if any.
-
-Remove all the relevant entries in `DEPRECATED`.
-
-Add a `CHANGELOG` entry for the removal.
-
-Get the removal PR reviewed and merged to the main branch.
-
-### Release removal
-
-When making a new opentelemetry-cpp release,
-in addition to the regular release tasks:
-
-* In the `CHANGELOG` and the release notes, add references
-  to the new removed items for this release.
-
-## Technical guidelines
-
-### CMake options deprecation
-
-Assume the option `WITH_FOO` needs to be deprecated.
-
-Code using `WITH_FOO=OFF` or `WITH_FOO=ON` must build as before,
-yet users should be notified if they use `WITH_FOO` in their build.
-
-CMake defines a `WITH_NO_DEPRECATED_CODE` option, set to OFF by default.
-
-In a normal build, used in production, code is compiled with
-`WITH_NO_DEPRECATED_CODE=OFF`.
-
-In a verification build, code is compiled with `WITH_NO_DEPRECATED_CODE=ON`.
-This verification also defines `OPENTELEMETRY_NO_DEPRECATED_CODE`, for code
-level checks.
-
-Implement the following logic in CMake:
-
-```cmake
-  option(WITH_FOO "DEPRECATED - With the foo feature" OFF)
-
-  if(WITH_FOO)
-    if(WITH_NO_DEPRECATED_CODE)
-      message(FATAL_ERROR "WITH_FOO is deprecated")
-    else()
-      message(WARNING "WITH_FOO is deprecated")
-    endif()
-  endif
-```
-
-The verification build is not meant to be used in production.
-It is meant to find all references of deprecated items.
-
-If the verification build succeeds, the user code is guaranteed to be clean,
-and will not be impacted by the removal to come.
-
-When implementing such logic, document it in the mitigation section,
-in file `DEPRECATED`.
-
-### C++ deprecation
-
-#### C++ header deprecation
-
-When a header is deprecated, it will be removed,
-so users should no longer include the header.
-
-Add the following code in the header file
-
-```cpp
-#ifdef OPENTELEMETRY_NO_DEPRECATED_CODE
-#  error "header <opentelemetry/foo.h> is deprecated."
-#endif
-```
-
-#### macro deprecation
-
-For macros, there are no `[[deprecated]]` annotations.
-
-Replace the macro with something that is sure to fail at build time,
-so it gets noticed when used.
-
-```cpp
-#ifndef OPENTELEMETRY_NO_DEPRECATED_CODE
-  #define OTEL_MACRO_FOO(X, Y) ... (normal implementation) ...
-#else
-  #define OTEL_MACRO_FOO(X, Y) { this macro foo is deprecated }
-#endif
-
-```
-
-#### C++ code deprecation
-
-Assume a C++ item needs to be deprecated.
-
-For example:
-
-```cpp
-  struct some_options
-  {
-    int x;
-    int y; // TODO: deprecate me
-    int z;
-  };
-```
-
-Code using y must build as before, and yet users should be notified if still
-using y.
-
-First, there is a way in C++ to flag deprecated code:
-
-```cpp
-  struct some_options
-  {
-    int x;
-    OPENTELEMETRY_DEPRECATED int y; // deprecated, to be removed
-    int z;
-  };
-```
-
-This will cause deprecation warnings.
-Some users will notice, but others will not,
-because warnings are most of the time ignored.
-
-A better solution is to provide a way to forcefully
-remove the deprecated code:
-
-```cpp
-  struct some_options
-  {
-    int x;
-#ifndef OPENTELEMETRY_NO_DEPRECATED_CODE
-    OPENTELEMETRY_DEPRECATED int y; // deprecated, to be removed
-#endif
-    int z;
-  };
-```
-
-A regular build, to use in production, will build with
-the regular, unchanged, configuration,
-in which OPENTELEMETRY_NO_DEPRECATED_CODE is not defined.
-
-A verification build, to _not_ use in production,
-will build with `OPENTELEMETRY_NO_DEPRECATED_CODE` defined,
-removing the deprecated member entirely.
-
-A verification build that succeeds is a proof that
-the application does not use the deprecated member,
-and needs no change.
-
-A verification build that fails will list all the application code that needs
-to be fixed before the deprecated code is finally removed.
-
-Even if the verification build succeeds, it really should not be used in
-production, because the memory layout just changed, breaking the ABI.
-
-This verification build is used to enforce:
-
-* the API (Application _Programming_ Interface) subset is compatible,
-  aka the source code will build before and after the removal.
-
-By the time the removal is implemented:
-
-```cpp
-  struct some_options
-  {
-    int x;
-    int z;
-  };
-```
-
-the new release will have:
-
-* a reduced API
-* an ABI (Application _Binary_ Interface) change
-
-The reduced API will be:
-
-* a subset of the original API,
-* compatible with applications which no longer use the removed code
-* incompatible with applications which still uses the removed code
-
-When documenting the deprecation, document this logic in the mitigation
-section, so that users know how to find and remove old references to
-deprecated code.
-
-When documenting the removal, clarify in the release notes that the
-release is API compatible (when application cleanup was done),
-but not ABI compatible (when sizeof() or virtual tables of classes changed),
-and therefore a full build must be done again.
-
-This example used a member in a struct, but the same applies to other
-constructs as well (classes, structs, functions, methods, etc).
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/google-test.md b/ext/opentelemetry-cpp-1.21.0/docs/google-test.md
deleted file mode 100644
index 7f767e54e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/google-test.md
+++ /dev/null
@@ -1,375 +0,0 @@
-# Google Test Demo
-
-## Introduction
-
-[Google Test](https://github.com/google/googletest) is a unit testing framework
-for C++ programming developed by Google. It is currently being used for unit
-testing in the [OpenTelemetry
-C++](https://github.com/open-telemetry/opentelemetry-cpp) repo, along with tools
-like [codecov.io](http://codecov.io/) to thoroughly test the code in the
-repository. A primer for using Google Test can be found
-[here](https://github.com/google/googletest/blob/master/googletest/docs/primer.md).
-
-## Features
-
-Google Test provides a vast set of tools to be used for unit testing. The two
-most important are assertions and tests.
-
-### Assertions
-
-Google Test allows a developer to write test cases that use assertions to verify
-code behavior. Refer to the
-[assertions](https://github.com/google/googletest/blob/master/googletest/docs/primer.md#assertions)
-section in the primer for more details.
-
-### Tests
-
-To create a test, use the `TEST()` macro to define a test function. This is
-similar to a normal C++ function that returns no value. Google Test assertions
-are used inside the test function, and the result of the test is determined by
-the assertions used inside the test function. If any assertion fails (can be
-either fatal or nonfatal), then the test fails; if all assertions pass, the test
-succeeds. A sample test function is outlined below.
-
-```cpp
-TEST(TestSuiteName, TestName) {
-
-    // Test body goes here
-
-}
-```
-
-A [sample unit
-test](https://github.com/open-telemetry/opentelemetry-cpp/blob/master/sdk/test/trace/tracer_provider_test.cc)
-from the OTel C++ repo, testing the `GetTracer()` method in the `TracerProvider`
-class, is shown below.
-
-```cpp
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/context/threadlocal_context.h"
-#include "opentelemetry/sdk/trace/samplers/always_off.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-
-#include <gtest/gtest.h>
-
-using namespace opentelemetry::sdk::trace;
-
-TEST(TracerProvider, GetTracer)
-{
-  std::shared_ptr<SpanProcessor> processor(new SimpleSpanProcessor(nullptr));
-
-  TracerProvider tp1(processor);
-  auto t1 = tp1.GetTracer("test");
-  auto t2 = tp1.GetTracer("test");
-  auto t3 = tp1.GetTracer("different", "1.0.0");
-  ASSERT_NE(nullptr, t1);
-  ASSERT_NE(nullptr, t2);
-  ASSERT_NE(nullptr, t3);
-
-  // Should return the same instance each time.
-  ASSERT_EQ(t1, t2);
-  ASSERT_EQ(t1, t3);
-
-  // Should be an sdk::trace::Tracer with the processor attached.
-  auto sdkTracer1 = dynamic_cast<Tracer *>(t1.get());
-  ASSERT_NE(nullptr, sdkTracer1);
-  ASSERT_EQ(processor, sdkTracer1->GetProcessor());
-  ASSERT_EQ("AlwaysOnSampler", sdkTracer1->GetSampler()->GetDescription());
-
-  TracerProvider tp2(processor, std::make_shared<AlwaysOffSampler>());
-  auto sdkTracer2 = dynamic_cast<Tracer *>(tp2.GetTracer("test").get());
-  ASSERT_EQ("AlwaysOffSampler", sdkTracer2->GetSampler()->GetDescription());
-}
-```
-
-### Test Coverage Reports
-
-Another feature that Google Test provides is test coverage reports; along with
-this, Google Test also allows us to easily integrate code coverage tools such as
-[codecov.io](http://codecov.io/) with the project.
-
-## Integration and Usage
-
-One of the base requirements to build and use Google Test from a source package
-are to use either Bazel or CMake; the other is a C++14-standard-compliant
-compiler like GCC or Clang.
-
-### Bazel
-
-First, to install bazel, refer to the instructions
-[here](https://docs.bazel.build/versions/3.3.0/install.html), and for an example
-build using bazel, refer to the tutorial
-[here](https://docs.bazel.build/versions/3.3.0/tutorial/cpp.html).
-
-Bazel makes use of a `BUILD` file, which gives instructions to bazel on how to
-build the project. The file contains targets that point to a set of source files
-and dependencies. Along with a `BUILD` file, a `WORKSPACE` file exists that
-identifies the directory it resides in as a bazel workspace. In the OTel C++
-repository, the SDK unit tests using the Google Test framework to ensure code
-functionality. In the
-[BUILD](/sdk/test/trace)
-file for trace tests, there are six different targets, each corresponding to a
-different unit test. An example target taken from this file is shown below.
-
-```cmake
-cc_test(
-    name = "tracer_provider_test",
-    srcs = [
-        "tracer_provider_test.cc",
-    ],
-    deps = [
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-    tags = ["test",],
-)
-```
-
-Integrating Google Tests with bazel is as simple as creating a target with:
-
-- name: The target name, aka the name of the binary to build
-- srcs: The source file containing the tests
-- deps: The dependencies of the build; here, `//sdk/src/trace` refers to the
-  directory of the source code being tested, and
-  `@com_google_googletest//:gtest_main` is the Google Test dependency.
-
-Building and executing a unit test is also very simple. On terminal, navigate to
-the directory the WORKSPACE file resides in, and execute two commands:
-
-```console
-bazel build //path/to/package:target-name
-bazel-bin/path/to/package/target-name
-```
-
-The first command builds the unit test with the given target name; the second
-runs the unit test.
-
-This next command runs the above two commands at once, though you may get a
-message stating `There were tests whose specified size is too big` and they may
-not run without modifying some options.
-
-```console
-bazel test //path/to/package:target-name
-```
-
-For our example the commands above would be:
-
-```console
-bazel build //sdk/test/trace:tracer_provider_test
-bazel-bin/sdk/test/trace/tracer_provider_test
-```
-
-or
-
-```console
-bazel test //sdk/test/trace:tracer_provider_test
-```
-
-Additionally, all Bazel tests can be ran in a Docker container by navigating to
-the root of the directory and executing the command:
-
-```console
-./ci/run_docker.sh ./ci/do_ci.sh bazel.test
-```
-
-### CMake
-
-CMake can be installed following instructions from
-[here](https://cmake.org/download/). You will also need to install Google Test,
-along with libbenchmark.
-
-Download a zip of the Google Test source code
-[here](https://github.com/google/googletest/releases/tag/release-1.10.0). Then,
-navigate into the source code directory and run the following commands:
-
-```console
-mkdir build && cd build
-cmake ..
-make
-make install
-```
-
-This will install Google Test for you; you can delete the source code after
-running these commands.
-
-Next, follow the instructions
-[here](https://github.com/google/benchmark#installation) to download Google
-Benchmark. The section following this one will detail performance benchmarking
-using Google Benchmark.
-
-CMake makes use of a `CMakeLists.txt` file that provides instructions for a
-project’s source files and targets. There is a main `CMakeLists.txt` file in the
-root of the project directory, and a `CMakeLists.txt` for each subdirectory. In
-the main `CMakeLists.txt` file, the `cmake_minimum_required`  and
-`CMAKE_CXX_STANDARD` are set, the project name is set with `project()`,
-directories are included and subdirectories added, and much more. However, more
-importantly, in the context of Google Test within the OTel C++ repo, the
-`CMakeLists.txt` to look at is the one located in the directory your tests are
-being written in; for this example, it’s `opentelemetry-cpp/sdk/test/trace`.
-This
-[CMakeLists.txt](https://github.com/open-telemetry/opentelemetry-cpp/blob/master/sdk/test/trace/CMakeLists.txt)
-file, shown below, describes the names of the tests to be added as executables.
-
-```cmake
-foreach(
-  testname
-  tracer_provider_test
-  span_data_test
-  simple_processor_test
-  tracer_test
-  always_off_sampler_test
-  always_on_sampler_test
-  parent_or_else_sampler_test
-  probability_sampler_test
-  batch_span_processor_test
-  attribute_utils_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(
-    ${testname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_common opentelemetry_trace)
-  gtest_add_tests(TARGET ${testname} TEST_PREFIX trace. TEST_LIST ${testname})
-endforeach()
-
-add_executable(sampler_benchmark sampler_benchmark.cc)
-target_link_libraries(sampler_benchmark benchmark::benchmark
-                      ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace)
-
-```
-
-This is how a `CMakeLists.txt` file will be written with the purpose of unit
-testing. After writing a unit test, navigate to the `CMakeLists.txt` file for
-that subdirectory and add the test name to the list of test names in
-`foreach()`.
-
-To build and execute using CMake, navigate into the root directory
-(`opentelemetry-cpp` here), and run the following commands from terminal:
-
-```console
-mkdir build && cd build
-cmake .. // or cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=“-Werror —coverage” ..
-make
-make test
-```
-
-This will run all tests in the repo.
-
-To run tests individually, in terminal, navigate to the `build` directory and
-execute the following command:
-
-```console
-ctest -R <name_of_your_test>
-```
-
-For example, this command will build and execute the test named TEST(Meter,
-CollectSyncInstruments) in the metrics library:
-
-```console
-ctest -R metrics.Meter.CollectSyncInstruments
-```
-
-The second cmake option creates test coverage reports; these are able to be
-viewed using a tool like lcov (instructions to download
-[here](http://ltp.sourceforge.net/coverage/lcov.php)), and running the command
-
-```console
-lcov --directory $PWD --capture --output-file coverage.info
-```
-
-Additionally, all CMake tests can be ran in a Docker container by navigating to
-the root of the directory and executing the command:
-
-```console
-./ci/run_docker.sh ./ci/do_ci.sh cmake.test
-```
-
-### Performance Benchmarking
-
-While Google Test itself does not provide performance benchmarking, Google
-Benchmark, a closely related tool, does. Follow the instructions
-[here](https://github.com/google/benchmark#installation) to download Google
-Benchmark using CMake. A basic usage example can be viewed
-[here](https://github.com/google/benchmark#usage), while a more in depth usage
-guide can be found [here](https://github.com/google/benchmark#user-guide).
-Generally, it is very similar to the Googletest unit testing structure and we
-can easily convert unit tests into benchmarked routines.
-
-A benchmark consists of a “benchmarked function” which takes a benchmark state
-as a parameter.  The library automatically decides how many iterations to run
-based on the duration of the first few run iterations.  This function is called
-directly underneath using the benchmark macro.  Finally, a call to
-BENCHMARK_MAIN() runs all benchmarks.  As a proof of concept, below is a unit
-test for the PrometheusCollector class into a benchmark:
-
-```cpp
-#include "opentelemetry/exporters/prometheus/prometheus_collector.h"
-#include "opentelemetry/sdk/metrics/aggregator/counter_aggregator.h"
-#include "opentelemetry/sdk/metrics/record.h"
-#include "opentelemetry/version.h"
-#include <benchmark/benchmark.h>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporters
-{
-namespace prometheus
-{
-
-void CreateRecordsAndCollect(benchmark::State &state) {
-
-
-    for (auto _ : state) {
-
-        // construct a collection to add metric records
-        int num_records = 2;
-        std::vector<opentelemetry::sdk::metrics::Record> records;
-
-        for (int i = 0; i < num_records; i++)
-        {
-            std::string name        = "record_" + std::to_string(i);
-            std::string description = "record_" + std::to_string(i);
-            std::string labels      = "{label1:v1,label2:v2,}";
-            auto aggregator         = std::shared_ptr<opentelemetry::sdk::metrics::Aggregator<int>>(
-                new opentelemetry::sdk::metrics::CounterAggregator<int>(
-                    opentelemetry::metrics::InstrumentKind::Counter));
-            aggregator->update(10);
-            aggregator->checkpoint();
-
-            opentelemetry::sdk::metrics::Record r{name, description, labels, aggregator};
-            records.push_back(r);
-        }
-
-        opentelemetry::exporter::prometheus::PrometheusCollector collector;
-
-        collector.AddMetricData(records);
-
-        collector.Collect();
-
-    }
-}
-BENCHMARK(CreateRecordsAndCollect);
-
-} //namespace prometheus
-} //namespace exporters
-OPENTELEMETRY_END_NAMESPACE
-
-BENCHMARK_MAIN();
-```
-
-Output
-
-```console
-------------------------------------------------------------------
-Benchmark                        Time             CPU   Iterations
-------------------------------------------------------------------
-CreateRecordsAndCollect      51989 ns        51821 ns        12438
-```
-
-OTel also provides a bazel shortcut to build tests which can be seen
-[here](https://github.com/open-telemetry/opentelemetry-cpp/blob/573696f3fdc1fd85e24ac19860ae6f2345837a3e/bazel/otel_cc_benchmark.bzl).
-This not only creates a benchmark executable, but a “smoketest” which runs each
-benchmark for one iteration.
-
-We can use benchmarking to measure performance of exporting, data translation,
-and collecting. Additionally, creating benchmarks for each component will help
-us determine which areas of the pipeline can be optimized further.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/library-distribution.md b/ext/opentelemetry-cpp-1.21.0/docs/library-distribution.md
deleted file mode 100644
index 00794f87a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/library-distribution.md
+++ /dev/null
@@ -1,128 +0,0 @@
-# Library Distribution
-
-This document describes the considerations and recommendations for using the
-OpenTelemetry-cpp library.
-
-## Definitions
-
-### Binary vs Source Distribution
-
-The OpenTelemetry-cpp libraries (API and SDK) and any library that depends on
-them are expected to be distributed as either "source" or "binary" artifacts.
-This document defines these distribution models as:
-
-* **Source** - The source code is shipped as-is and can be built as desired.
-* **Binary** - The library and/or its dependants may be distributed as pre-built
-  binaries which can be built using different toolchains or compilers.
-
-This document will focus on the specific challenges of the "binary" distribution
-model.
-
-### Library Binding Model
-
-The library and its dependants can be distributed and bound (loaded) in multiple
-ways which are defined as follows:
-
-* **Static Linkage** - The library is distributed as a compiled artifact (`.a`
-  extension on Unix-like systems) which is linked and bound at compile-time.
-* **Dynamic Linkage with Early Binding** - The library is distributed as a
-  compiled artifact (`.so` on Unix-like systems), and its binding is defined at
-  compile-time. It is loaded by the dynamic linker when the application/library
-  depending on it is started/loaded.
-* **Dynamic Linkage with Late Binding** - The library is distributed as a
-  compiled artifact (`.so` on Unix-like systems), only its interface is known at
-  compile-time. It is loaded dynamically (using `dlopen` on POSIX).
-
-_NOTE: A library may itself link in other libraries based on any of the above._
-
-### Components
-
-The following components will be considered for analysing the impact of
-different binding models and the recommendations.
-
-* **OpenTelemetry Libraries** - The libraries produced from this project, the
-  API library will contain a minimal implementation including some compiled
-  globals/singletons such as `TracerProvider`.
-* **OpenTelemetry Instrumented Libraries** - A library that depends on the
-  OpenTelemetry API library to generate telemetry.
-* **OpenTelemetry Implementations or Exporters** - A specific implementation of
-  the OpenTelemetry API or the `exporters` may be provided externally (e.g.
-  distributed by a vendor).
-* **Binary Executable** - The compiled binary that has `main()`, this also
-  includes interpreters such as Python which will be considered. This binary may
-  itself instrument using OpenTelemetry or register a specific implementation.
-
-For more information on language-agnostic library, please see: [OpenTelemetry
-Specification Library
-Guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/library-guidelines.md).
-
-### ABI Compatibility
-
-Some guarantees regarding binary compatibility will be necessary given the
-binary distribution model supported by this project. The policies and approach
-regarding this will be documented in [ABI Policy](abi-policy.md).
-
-## Recommendations
-
-### Link OpenTelemetry plugins for portability
-
-If you're a vendor and you wish to distribute an OpenTelemetry plugin (either a
-full implementation of the API or an exporter), you need to take precautions
-when linking your plugin to ensure it's portable. Here are some steps you should
-follow:
-
-* Ensure you compile to target portable architectures (e.g. x86-64).
-* Statically link most dependencies. You should statically both external
-  dependencies and the standard C++ library. The exceptions are the standard C
-  library and other low-level system libraries that need to be dynamically
-  linked.
-* Use an export map to avoid unwanted symbol resolution. When statically linking
-  dependencies in a dynamic library, care should be taken to make sure that
-  symbol resolution for dependencies doesn't conflict with that of the app or
-  other dynamic libraries. See this [StackOverflow
-  post](https://stackoverflow.com/q/47841812/4447365) for more information.
-* Re-map symbols from the standard C library to portable versions. If you want
-  to plugin to work on systems with different versions of the standard C
-  library, you need to link to portable symbols. See this [StackOverflow
-  answer](https://stackoverflow.com/a/20065096/4447365) for how to do this.
-
-## Example Scenarios
-
-### Statically compiled binary executable
-
-Binary executable can be distributed with static linkage ,for all libraries
-known at compile time. In this case the OpenTelemetry API Library can be linked
-in statically, guaranteeing that only a single symbol is exported for
-singletons.
-
-### Dynamically linked binary executable
-
-An application can link to the OpenTelemetry API but dynamically load an
-implementation at runtime. Under this mode, an application can work with any
-vendor's implementation by using it as a plugin.
-
-For example, a C++ database server might add support for the OpenTelemetry API
-and exposes configuration options that let a user point to a vendor's plugin and
-load it with a JSON config. (With OpenTracing, Ceph explored a deployment
-scenario similar to this. See this
-[link](https://www.spinics.net/lists/ceph-devel/msg41007.html))
-
-### Non OpenTelemetry aware application with OpenTelemetry capability library
-
-An application itself may not be OpenTelemetry-aware, but it can support
-OpenTelemetry via extensions.
-
-Examples:
-
-* The core NGINX application has no knowledge of tracing. However, through
-  NGINX's dynamic module capability, tracing can be supported as a plugin. For
-  instance, the [nginx-opentracing
-  module](https://github.com/opentracing-contrib/nginx-opentracing) provides
-  this type of extension and is used by projects such as Kubernetes [ingress
-  controller](https://kubernetes.github.io/ingress-nginx/user-guide/third-party-addons/opentracing/).
-* The CPython binary also has no knowledge of OpenTelemetry, but C++ Python
-  extension modules can be instrumented for OpenTelemetry.
-
-Additionally, when multiple OpenTelemetry-aware extensions co-exist in the same
-application, the extensions should be able to coordinate and share context
-through the OpenTelemetry API's singletons.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/maintaining-dependencies.md b/ext/opentelemetry-cpp-1.21.0/docs/maintaining-dependencies.md
deleted file mode 100644
index f213e653c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/maintaining-dependencies.md
+++ /dev/null
@@ -1,638 +0,0 @@
-
-# Maintaining dependencies
-
-In general, several places in the code base need to be adjusted when
-upgrading a dependency to a new version.
-
-This documentation contains notes about which place to fix,
-to make maintenance easier and less error prone.
-
-This doc is only useful when up to date,
-so make sure to add details about missing parts if any.
-
-Also, another good place to start when upgrading something to N+1
-is to find the commit that upgraded to version N (use `git blame`),
-and inspect the commit for the last upgrade.
-
-## Overview
-
-|      Dependency      |      Type     |
-| -------------------- | ------------- |
-| opentelemetry-proto  | git submodule |
-|    prometheus-cpp    | git submodule |
-
-## opentelemetry-proto
-
-### Comments (opentelemetry-proto)
-
-Unlike other opentelemetry SIGs, opentelemetry-cpp generates code
-from opentelemetry-proto as part of the opentelemetry-cpp build.
-
-Only the source code of opentelemetry-proto is required,
-which is why this repository is used as a git submodule under third_party.
-
-Code is generated by the protobuf compiler during the build,
-so that generated code is never checked in.
-
-This allows more flexibility, should the compiler (protobuf) be
-upgraded even when the source code (opentelemetry-proto) is unchanged.
-
-### Origin (opentelemetry-proto)
-
-The repository for opentelemetry-proto is:
-
-* [repository](https://github.com/open-telemetry/opentelemetry-proto)
-
-Check release notes at:
-
-* [release-notes](https://github.com/open-telemetry/opentelemetry-proto/releases)
-
-### Upgrade (opentelemetry-proto)
-
-When upgrading opentelemetry-proto to a newer release,
-a few places in the code need adjustment.
-
-In this example, we upgrade from 1.3.1 to 1.3.2
-
-#### directory third_party/opentelemetry-proto
-
-You need to update the git submodule third_party/opentelemetry-proto,
-check [Upgrade a git submodule](#upgrade-a-git-submodule) for more details.
-
-#### file third_party_release
-
-Update the line pointing to the opentelemetry-proto tag.
-
-```text
-opentelemetry-proto=v1.3.2
-```
-
-Typical change:
-
-```shell
-[malff@malff-desktop opentelemetry-cpp]$ git diff third_party_release
-diff --git a/third_party_release b/third_party_release
-index 0bbf67f3..7362473f 100644
---- a/third_party_release
-+++ b/third_party_release
-@@ -19,7 +19,7 @@ benchmark=v1.8.3
- googletest=1.14.0
- ms-gsl=v3.1.0-67-g6f45293
- nlohmann-json=v3.11.3
--opentelemetry-proto=v1.3.1
-+opentelemetry-proto=v1.3.2
- opentracing-cpp=v1.6.0
- prometheus-cpp=v1.2.4
- vcpkg=2024.02.14
-```
-
-#### file bazel/repository.bzl
-
-Please follow the guide [Upgrade a bazel dependency](#upgrade-a-bazel-dependency)
-for more details.
-
-#### file cmake/opentelemetry-proto.cmake
-
-Update the tag in the CMake logic:
-
-```cmake
-        set(opentelemetry-proto "v1.3.2")
-```
-
-Typical change:
-
-```shell
-[malff@malff-desktop opentelemetry-cpp]$ git diff cmake/opentelemetry-proto.cmake
-diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
-index 19516c3b..dd6213c1 100644
---- a/cmake/opentelemetry-proto.cmake
-+++ b/cmake/opentelemetry-proto.cmake
-@@ -49,7 +49,7 @@ else()
-          "opentelemetry-proto=[ \\t]*([A-Za-z0-9_\\.\\-]+)")
-         set(opentelemetry-proto "${CMAKE_MATCH_1}")
-       else()
--        set(opentelemetry-proto "v1.3.1")
-+        set(opentelemetry-proto "v1.3.2")
-       endif()
-       unset(OTELCPP_THIRD_PARTY_RELEASE_CONTENT)
-     endif()
-```
-
-If opentelemetry-proto contains new files,
-the makefile needs to be adjusted to build the new code.
-
-Depending on the actual changes in the opentelemetry-proto files,
-the C++ code in opentelemetry-cpp may need adjustments.
-
-Typically, when opentelemetry-proto:
-
-* defines a new message (for example, for profiling)
-* adds new optional fields to an existing message (for example, trace flags)
-
-the existing C++ code should work as is with the new opentelemetry-proto
-format.
-
-In this case, it is better to:
-
-* upgrade the opentelemetry-proto version independently with one PR.
-* upgrade the C++ code later (to use the new message, of provide new fields)
-  in a different PR.
-
-When the C++ code requires a newer minimum version of opentelemetry-proto,
-make sure to document this, including in the release notes.
-
-### Known issues (opentelemetry-proto)
-
-For bazel, two different methods to build exists.
-
-First, the code can build using file `bazel/repository.bzl`.
-This option does not depend on bazel central.
-
-Secondly, there is also a build using modules, with file `MODULE.bazel`.
-This option does depend on bazel central, and CI depends on it.
-
-## semantic-conventions and build-tools
-
-### Comments (semantic-conventions)
-
-Some code in opentelemetry-cpp is generated automatically, namely files:
-
-* api/include/opentelemetry/trace/semantic_conventions.h
-* sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
-
-The semantic conventions C++ declarations are generated using:
-
-* data represented in yaml ("semantic-conventions")
-* a code generator ("build-tools")
-
-This generation is not done as part of the build,
-it is done once by maintainers, and the generated code
-is added (checked in) in the opentelemetry-cpp repository.
-
-### Origin (semantic-conventions)
-
-The repository for semantic-conventions is:
-
-* [repository](https://github.com/open-telemetry/semantic-conventions)
-
-Check release notes at:
-
-* [release-notes](https://github.com/open-telemetry/semantic-conventions/releases)
-
-The repository for build-tools is:
-
-* [repository](https://github.com/open-telemetry/build-tools)
-
-Check release notes at:
-
-* [release-notes](https://github.com/open-telemetry/build-tools/releases)
-
-Semantic conventions and build-tools works together,
-make sure to use the proper version of build-tools
-that is required to use a given version of semantic-conventions.
-
-### Upgrade (semantic-conventions)
-
-When upgrading semantic-conventions to a newer release,
-a few places in the code need adjustment.
-
-In this example, we upgrade from semantic-conventions 1.26.0 to 1.27.0
-
-In this case, semantic-conventions 1.27.0 also
-require a new version of build-tools,
-because the yaml format for the data changed.
-
-In this example, we upgrade from build-tools 0.24.0 to 0.25.0
-
-#### file buildscripts/semantic-convention/generate.sh
-
-Update the line pointing to the semantic-conventions tag.
-
-```text
-SEMCONV_VERSION=1.27.0
-```
-
-Update the line pointing to the build-tools tag.
-
-```text
-GENERATOR_VERSION=0.25.0
-```
-
-Typical change:
-
-```shell
-[malff@malff-desktop opentelemetry-cpp]$ git diff buildscripts/semantic-convention/generate.sh
-diff --git a/buildscripts/semantic-convention/generate.sh b/buildscripts/semantic-convention/generate.sh
-index 2bcd07e2..8ad3292e 100755
---- a/buildscripts/semantic-convention/generate.sh
-+++ b/buildscripts/semantic-convention/generate.sh
-@@ -19,10 +19,10 @@ ROOT_DIR="${SCRIPT_DIR}/../../"
- #   https://github.com/open-telemetry/opentelemetry-specification
- # Repository from 1.21.0:
- #   https://github.com/open-telemetry/semantic-conventions
--SEMCONV_VERSION=1.26.0
-+SEMCONV_VERSION=1.27.0
-
- # repository: https://github.com/open-telemetry/build-tools
--GENERATOR_VERSION=0.24.0
-+GENERATOR_VERSION=0.25.0
-
- SPEC_VERSION=v$SEMCONV_VERSION
- SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
-```
-
-This change alone does nothing, the next step is to execute the generate.sh
-script.
-
-If generation is successful, the generated code contains the new schema URL:
-
-```shell
-[malff@malff-desktop opentelemetry-cpp]$ find . -name semantic_conventions.h
-./api/include/opentelemetry/trace/semantic_conventions.h
-./sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
-[malff@malff-desktop opentelemetry-cpp]$ grep kSchemaUrl ./api/include/opentelemetry/trace/semantic_conventions.h
-static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.27.0";
-[malff@malff-desktop opentelemetry-cpp]$ grep kSchemaUrl ./sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
-static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.27.0";
-```
-
-Apply clang-format on the generated code, and check-in changes.
-
-### Known issues (semantic-conventions)
-
-Depending on tooling changes,
-the generate.sh script may need adjustments.
-
-Depending on changes in code generation,
-the template used to generate code may need adjustments.
-
-This template is implemented in file
-  `buildscripts/semantic-convention/templates/SemanticAttributes.h.j2`.
-
-Last, in some special case like name collisions for a given symbol,
-the template itself may need to be adjusted for special logic.
-
-See for example how `messaging.client_id` is treated.
-
-## prometheus-cpp
-
-### Comments (prometheus-cpp)
-
-The `prometheus-cpp` library provides a C++ client for Prometheus,
-facilitating the creation and registration of metrics that Prometheus scrapes.
-`prometheus-cpp` is used as a git submodule under the `third_party` directory
-for ease of inclusion in build system.
-
-### Origin (prometheus-cpp)
-
-The repository for `prometheus-cpp` can be found here:
-
-* [repository](https://github.com/jupp0r/prometheus-cpp)
-
-Check release notes at:
-
-* [release-notes](https://github.com/jupp0r/prometheus-cpp/releases)
-
-### Upgrade (prometheus-cpp)
-
-When upgrading `prometheus-cpp` to a newer release,
-you’ll need to update a few key files in the codebase to reflect the new version.
-
-In this example, we upgrade from `v1.2.3` to `v1.2.4`.
-
-#### Directory `third_party/prometheus-cpp`
-
-`prometheus-cpp` is a `git submodule`,
-so it needs to be pointed to the new release tag.
-
-```shell
-cd third_party/prometheus-cpp
-git log -1
-```
-
-The current submodule should show something like:
-
-```shell
-commit abcdef1234567890abcdef1234567890abcdef12 (HEAD, tag: v1.2.3)
-Author: John Doe <johndoe@example.com>
-Date:   Fri Apr 25 17:55:35 2024 +0200
-
-    Minor fixes for performance and compatibility
-```
-
-Pull new tags:
-
-```shell
-git pull --tag origin
-```
-
-Upgrade to the new tag:
-
-```shell
-git pull origin v1.2.4
-```
-
-Verify the new commit:
-
-```shell
-git log -1
-commit 1234567890abcdef1234567890abcdef12345678 (HEAD, tag: v1.2.4)
-Author: Jane Doe <janedoe@example.com>
-Date:   Thu Jun 28 08:19:11 2024 -0500
-
-    Improved metrics handling for high concurrency
-```
-
-Return to the root directory:
-
-```shell
-cd ../..
-git status
-```
-
-The status should display:
-
-```shell
-On branch upgrade_prometheus_1.2.4
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-        modified:   third_party/prometheus-cpp (new commits)
-```
-
-Add the upgraded submodule:
-
-```shell
-git add third_party/prometheus-cpp
-```
-
-File third_party_release
-Update the line referencing the prometheus-cpp version.
-
-```shell
-prometheus-cpp=v1.2.4
-```
-
-Example change:
-
-```shell
-$ git diff third_party_release
-diff --git a/third_party_release b/third_party_release
-index abc1234..def5678 100644
---- a/third_party_release
-+++ b/third_party_release
-@@ -19,7 +19,7 @@ some-dependency=v0.8.3
- another-dependency=1.14.0
- prometheus-cpp=v1.2.3
-+prometheus-cpp=v1.2.4
-```
-
-In file bazel/repository.bzl locate the entry for prometheus-cpp:
-
-```shell
-# C++ Prometheus Client library.
-maybe(
-    http_archive,
-    name = "com_github_jupp0r_prometheus_cpp",
-    sha256 = "ac6e958405a29fbbea9db70b00fa3c420e16ad32e1baf941ab233ba031dd72ee",
-    strip_prefix = "prometheus-cpp-1.2.3",
-    urls = [
-        "https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.2.3.tar.gz",
-    ],
-)
-```
-
-Update the URL to the new tag:
-
-```shell
-urls = [
-    "https://github.com/jupp0r/prometheus-cpp/archive/v1.2.4.tar.gz",
-],
-```
-
-Update strip_prefix to match the new version:
-
-```shell
-strip_prefix = "prometheus-cpp-1.2.4",
-```
-
-Download the new URL:
-
-```shell
-wget https://github.com/jupp0r/prometheus-cpp/archive/v1.2.4.tar.gz
-```
-
-Calculate the checksum:
-
-```shell
-sha256sum v1.2.4.tar.gz
-abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234  v1.2.4.tar.gz
-```
-
-Update the `sha256`.
-
-## Upgrade a git submodule
-
-All the git submodule are under the folder `third_party`.
-We will use `opentelemetry-propto` as example in this case.
-This is a `git submodule`, it needs to point to the new tag.
-
-### Get current tag
-
-```shell
-cd third_party/opentelemetry-proto
-git log -1
-```
-
-The current submodule show something like:
-
-```shell
-commit b3060d2104df364136d75a35779e6bd48bac449a (HEAD, tag: v1.3.1)
-Author: Damien Mathieu <42@dmathieu.com>
-Date:   Thu Apr 25 17:55:35 2024 +0200
-
-    generate profiles proto for CI (#552)
-```
-
-In this case we can see the current tag is `v.1.3.1`.
-
-### Upgrade to new tag
-
-Pull new tags:
-
-```shell
-git pull --tag origin
-```
-
-Upgrade to a new tag:
-
-```shell
-git pull origin v1.3.2
-```
-
-Check the new state:
-
-```shell
-git log -1
-```
-
-```shell
-commit 40b3c1b746767cbc13c2e39da3eaf1a23e54ffdd (HEAD, tag: v1.3.2)
-Author: jack-berg <34418638+jack-berg@users.noreply.github.com>
-Date:   Fri Jun 28 08:19:11 2024 -0500
-
-    Prepare changelog for 1.3.2 release (#563)
-
-    Co-authored-by: Armin Ruech <7052238+arminru@users.noreply.github.com>
-```
-
-### Add changes
-
-Go back to the root of opentelemetry-cpp
-
-```shell
-cd ../..
-git status
-```
-
-```shell
-On branch upgrade_proto_1.3.2
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-        modified:   third_party/opentelemetry-proto (new commits)
-```
-
-Add the upgraded submodule:
-
-```shell
-git add third_party/opentelemetry-proto
-```
-
-## Upgrade a bazel dependency
-
-Same as git submodule, we will continue use `opentelemetry-proto` as example.
-
-All the bazel dependencies are defined in [repository.bzl](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/bazel/repository.bzl)
-and [MODULE.bazel](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/MODULE.bazel).
-
-### Update the dependency in repository.bzl
-
-Locate the entry for opentelemetry-proto:
-
-```text
-    # OTLP Protocol definition
-    maybe(
-        http_archive,
-        name = "com_github_opentelemetry_proto",
-        build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
-        sha256 = "bed250ceec8e4a83aa5604d7d5595a61945059dc662edd058a9da082283f7a00",
-        strip_prefix = "opentelemetry-proto-1.3.1",
-        urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.1.tar.gz",
-        ],
-    )
-```
-
-Update the URL to the new tag:
-
-```text
-        urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.2.tar.gz",
-        ],
-```
-
-Update strip_prefix to the new tag:
-
-```text
-        strip_prefix = "opentelemetry-proto-1.3.2",
-```
-
-Download the new URL:
-
-```shell
-wget https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.2.tar.gz
-```
-
-Run a checksum on the new file:
-
-```shell
-sha256sum v1.3.2.tar.gz
-```
-
-```shell
-c069c0d96137cf005d34411fa67dd3b6f1f8c64af1e7fb2fe0089a41c425acd7  v1.3.2.tar.gz
-```
-
-Update the checksum in file bazel/repository.bzl:
-
-```text
-        sha256 = "c069c0d96137cf005d34411fa67dd3b6f1f8c64af1e7fb2fe0089a41c425acd7",
-```
-
-Typical change:
-
-```shell
-[malff@malff-desktop opentelemetry-cpp]$ git diff bazel/repository.bzl
-diff --git a/bazel/repository.bzl b/bazel/repository.bzl
-index bac1e45b..508b95a3 100644
---- a/bazel/repository.bzl
-+++ b/bazel/repository.bzl
-@@ -88,10 +88,10 @@ def opentelemetry_cpp_deps():
-         http_archive,
-         name = "com_github_opentelemetry_proto",
-         build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
--        sha256 = "bed250ceec8e4a83aa5604d7d5595a61945059dc662edd058a9da082283f7a00",
--        strip_prefix = "opentelemetry-proto-1.3.1",
-+        sha256 = "c069c0d96137cf005d34411fa67dd3b6f1f8c64af1e7fb2fe0089a41c425acd7",
-+        strip_prefix = "opentelemetry-proto-1.3.2",
-         urls = [
--            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.1.tar.gz",
-+            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.2.tar.gz",
-         ],
-     )
-```
-
-#### Update MODULE.bazel
-
-> Remember, the link is different in your case.
-Replace `opentelemetry-proto` to correct target.
-
-Make sure the new tag is available in bazel central:
-
-* [opentelemetry-proto bazel-central](https://registry.bazel.build/modules/opentelemetry-proto)
-
-If missing, file a PR to add it, or contact the maintainer:
-
-* [opentelemetry-proto repository](https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto)
-
-Update the `opentelemetry-proto` version to the new tag:
-
-```text
-bazel_dep(name = "opentelemetry-proto", version = "1.3.2", repo_name = "com_github_opentelemetry_proto")
-```
-
-File `MODULE.bazel` is used in the github CI for repository
-opentelemetry-cpp, so using a tag that does not exist (yet) in bazel central
-will break the CI build.
-
-See the known issues section.
-
-Typical change:
-
-```shell
-[malff@malff-desktop opentelemetry-cpp]$ git diff MODULE.bazel
-diff --git a/MODULE.bazel b/MODULE.bazel
-index 7b84c2b7..3161ffb1 100644
---- a/MODULE.bazel
-+++ b/MODULE.bazel
-@@ -13,7 +13,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")
- bazel_dep(name = "curl", version = "8.4.0")
- bazel_dep(name = "grpc", version = "1.62.1", repo_name = "com_github_grpc_grpc")
- bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json")
--bazel_dep(name = "opentelemetry-proto", version = "1.3.1", repo_name = "com_github_opentelemetry_proto")
-+bazel_dep(name = "opentelemetry-proto", version = "1.3.2", repo_name = "com_github_opentelemetry_proto")
- bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
- bazel_dep(name = "platforms", version = "0.0.8")
- bazel_dep(name = "prometheus-cpp", version = "1.2.4", repo_name = "com_github_jupp0r_prometheus_cpp")
-```
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/Doxyfile b/ext/opentelemetry-cpp-1.21.0/docs/public/Doxyfile
deleted file mode 100644
index a5d76ecba..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/Doxyfile
+++ /dev/null
@@ -1,2479 +0,0 @@
-# Doxyfile 1.8.13
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = "OpenTelemetry C++ API"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "Version 1.0.0-rc2"
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           = ./resources/opentelemetry_logo.jpg
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       =
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 0.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 0
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = YES
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  =  \
-                         ../../api/include/opentelemetry/baggage \
-                         ../../api/include/opentelemetry/context \
-                         ../../api/include/opentelemetry/common \
-                         ../../api/include/opentelemetry/logs \
-                         ../../api/include/opentelemetry/nostd/shared_ptr.h \
-                         ../../api/include/opentelemetry/nostd/span.h \
-                         ../../api/include/opentelemetry/nostd/string_view.h \
-                         ../../api/include/opentelemetry/nostd/unique_ptr.h \
-                         ../../api/include/opentelemetry/nostd/variant.h \
-                         ../../api/include/opentelemetry/metrics \
-                         ../../api/include/opentelemetry/trace \
-                          ../../sdk/include/opentelemetry/sdk/instrumentationlibrary \
-                          ../../sdk/include/opentelemetry/sdk/instrumentationscope \
-                          ../../sdk/include/opentelemetry/sdk/logs \
-                          ../../sdk/include/opentelemetry/sdk/metrics \
-                          ../../sdk/include/opentelemetry/sdk/resource \
-                          ../../sdk/include/opentelemetry/sdk/trace \
-
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
-
-FILE_PATTERNS          = *.h
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = ../../api/include/opentelemetry/common/spin_lock_mutex.h \
-                         ../../api/include/opentelemetry/common/key_value_iterable_view.h \
-                         ../../api/include/opentelemetry/common/kv_properties.h \
-                         ../../api/include/opentelemetry/common/string_util.h \
-                         ../../api/include/opentelemetry/trace/span_context_kv_iterable_view.h \
-                         ./../api/include/opentelemetry/trace/propagation/detail \
-                         ../../api/include/opentelemetry/nostd
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        = AttributeType \
-                         Context::DataList \
-                         ThreadLocalContextStorage::Stack
-
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = ./Overview.md
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse-libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = NO
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            = ./resources/header.html
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            = ./resources/footer.html
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  = ./resources/stylesheet.css
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = YES
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = doxyoutput/xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED = "OPENTELEMETRY_BEGIN_NAMESPACE=namespace opentelemetry {" \
-             "OPENTELEMETRY_END_NAMESPACE=}"
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: YES.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
-# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/GettingHelp.rst b/ext/opentelemetry-cpp-1.21.0/docs/public/GettingHelp.rst
deleted file mode 100644
index 7e33171a9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/GettingHelp.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-Getting help
-------------
-
--  Refer to `opentelemetry.io <https://opentelemetry.io/>`__ for general
-   information about OpenTelemetry.
--  Refer to the `OpenTelemetry C++ GitHub
-   repository <https://github.com/open-telemetry/opentelemetry-cpp>`__
-   for further information and resources related to OpenTelemetry C++.
--  For questions related to OpenTelemetry C++ that are not covered by
-   the existing documentation, please ask away in `GitHub
-   discussions <https://github.com/open-telemetry/opentelemetry-cpp/discussions>`__.
--  Feel free to join the `CNCF OpenTelemetry C++ Slack
-   channel <https://cloud-native.slack.com/archives/C01N3AT62SJ>`__. If
-   you are new, you can create a CNCF Slack account
-   `here <http://slack.cncf.io/>`__.
--  For bugs and feature requests, write a `GitHub
-   issue <https://github.com/open-telemetry/opentelemetry-cpp/issues>`__.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/Makefile b/ext/opentelemetry-cpp-1.21.0/docs/public/Makefile
deleted file mode 100644
index 85085abef..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line, and also
-# from the environment for the first two.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = .
-BUILDDIR      = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile clean
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-clean:
-	rm -rf doxyoutput
-	@$(SPHINXBUILD) -M clean "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/_static/opentelemetry_logo.png b/ext/opentelemetry-cpp-1.21.0/docs/public/_static/opentelemetry_logo.png
deleted file mode 100644
index e00831d04..000000000
Binary files a/ext/opentelemetry-cpp-1.21.0/docs/public/_static/opentelemetry_logo.png and /dev/null differ
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/_templates/sidebar/brand.html b/ext/opentelemetry-cpp-1.21.0/docs/public/_templates/sidebar/brand.html
deleted file mode 100644
index 0c2c3f7d7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/_templates/sidebar/brand.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<a class="sidebar-brand{% if logo %} centered{% endif %}" href="{{ pathto(master_doc) }}">
-  {% block brand_content %}
-  {% if not theme_sidebar_hide_name %}
-  <img class="sidebar-logo" style="width: 40%;" src="{{ pathto('_static/opentelemetry_logo.png', 1) }}" alt="Logo"/>
-  <span class="sidebar-brand-text" style="font-size: 100%; font-weight: bold; color: grey;">OpenTelemetry C++ {{ release }}</span>
-  {%- endif %}
-  {% endblock brand_content %}
-</a>`
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/api/GettingStarted.rst b/ext/opentelemetry-cpp-1.21.0/docs/public/api/GettingStarted.rst
deleted file mode 100644
index c50a143d0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/api/GettingStarted.rst
+++ /dev/null
@@ -1,104 +0,0 @@
-Getting started
----------------
-
-Tracing
-~~~~~~~
-
-When instrumenting libraries and applications, the most simple approach
-requires three steps.
-
-Obtain a tracer
-^^^^^^^^^^^^^^^
-
-.. code:: cpp
-
-    auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-    auto tracer = provider->GetTracer("foo_library", "1.0.0");
-
-The ``TracerProvider`` acquired in the first step is a singleton object
-that is usually provided by the OpenTelemetry C++ SDK. It is used to
-provide specific implementations for API interfaces. In case no SDK is
-used, the API provides a default no-op implementation of a
-``TracerProvider``.
-
-The ``Tracer`` acquired in the second step is needed to create and start
-``Span``\ s.
-
-Start a span
-^^^^^^^^^^^^
-
-.. code:: cpp
-
-    auto span = tracer->StartSpan("HandleRequest");
-
-This creates a span, sets its name to ``"HandleRequest"``, and sets its
-start time to the current time. Refer to the API documentation for other
-operations that are available to enrich spans with additional data.
-
-Mark a span as active
-^^^^^^^^^^^^^^^^^^^^^
-
-.. code:: cpp
-
-    auto scope = tracer->WithActiveSpan(span);
-
-This marks a span as active and returns a ``Scope`` object. The scope object
-controls how long a span is active. The span remains active for the lifetime
-of the scope object.
-
-The concept of an active span is important, as any span that is created
-without explicitly specifying a parent is parented to the currently
-active span. A span without a parent is called root span.
-
-Create nested Spans
-^^^^^^^^^^^^^^^^^^^
-
-.. code:: cpp
-
-    auto outer_span = tracer->StartSpan("Outer operation");
-    auto outer_scope = tracer->WithActiveSpan(outer_span);
-    {
-        auto inner_span = tracer->StartSpan("Inner operation");
-        auto inner_scope = tracer->WithActiveSpan(inner_span);
-        // ... perform inner operation
-        inner_span->End();
-    }
-    // ... perform outer operation
-    outer_span->End();
-
-
-Spans can be nested, and have a parent-child relationship with other spans.
-When a given span is active, the newly created span inherits the active span's
-trace ID, and other context attributes.
-
-Context Propagation
-^^^^^^^^^^^^^^^^^^
-
-.. code:: cpp
-
-    // set global propagator
-    opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
-        nostd::shared_ptr<opentelemetry::context::propagation::TextMapPropagator>(
-            new opentelemetry::trace::propagation::HttpTraceContext()));
-
-    // get global propagator
-    HttpTextMapCarrier<opentelemetry::ext::http::client::Headers> carrier;
-    auto propagator =
-        opentelemetry::context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-
-    //inject context to headers
-    auto current_ctx = opentelemetry::context::RuntimeContext::GetCurrent();
-    propagator->Inject(carrier, current_ctx);
-
-    //Extract headers to context
-    auto current_ctx = opentelemetry::context::RuntimeContext::GetCurrent();
-    auto new_context = propagator->Extract(carrier, current_ctx);
-    auto remote_span = opentelemetry::trace::propagation::GetSpan(new_context);
-
-
-
-``Context`` contains the meta-data of the currently active Span including Span Id,
-Trace Id, and flags. Context Propagation is an important mechanism in distributed
-tracing to transfer this Context across service boundary often through HTTP headers.
-OpenTelemetry provides a text-based approach to propagate context to remote services
-using the W3C Trace Context HTTP headers.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/api/Overview.rst b/ext/opentelemetry-cpp-1.21.0/docs/public/api/Overview.rst
deleted file mode 100644
index 6b1e826d0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/api/Overview.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-Overview
-========
-
-The OpenTelemetry C++ API enables developers to instrument their
-applications and libraries in order to make them ready to create and
-emit telemetry data. The OpenTelemetry C++ API exclusively focuses on
-instrumentation and does not address concerns like exporting, sampling,
-and aggregating telemetry data. Those concerns are addressed by the
-OpenTelemetry C++ SDK. This architecture enables developers to
-instrument applications and libraries with the OpenTelemetry C++ API
-while being completely agnostic of how telemetry data is exported and
-processed.
-
-Library design
---------------
-
-The OpenTelemetry C++ API is provided as a header-only library and
-supports all recent versions of the C++ standard, down to C++14.
-
-A single application might dynamically or statically link to different
-libraries that were compiled with different compilers, while several of
-the linked libraries are instrumented with OpenTelemetry. OpenTelemetry
-C++ supports those scenarios by providing a stable ABI. This is achieved
-by a careful API design, and most notably by providing ABI stable
-versions of classes from the standard library. All those classes are
-provided in the ``opentelemetry::nostd`` namespace.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/api/api.rst b/ext/opentelemetry-cpp-1.21.0/docs/public/api/api.rst
deleted file mode 100644
index fd28f2b7c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/api/api.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-OpenTelemetry C++ API
-====================
-
-.. toctree::
-   :maxdepth: 1
-
-   Overview.rst
-   GettingStarted.rst
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/conf.py b/ext/opentelemetry-cpp-1.21.0/docs/public/conf.py
deleted file mode 100644
index 2f45afd66..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/conf.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-# -- Project information -----------------------------------------------------
-
-project = 'OpenTelemetry C++'
-copyright = '2021, OpenTelemetry authors'
-author = 'OpenTelemetry authors'
-
-# The full version, including alpha/beta/rc tags
-release = "1.21.0"
-
-# Run sphinx on subprojects and copy output
-# -----------------------------------------
-# This is necessary so the readthedocs build works. It doesn't invoke the
-# Makefile, but just runs sphinx on this conf.py.
-import os
-import shutil
-import subprocess
-if not os.path.exists('doxyoutput'):
-        os.makedirs('doxyoutput')
-
-# -- General configuration ---------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    "breathe",
-    "exhale"
-]
-
-exhale_args = {
-        "containmentFolder": "otel_docs",
-        "rootFileName": "otel_docs.rst",
-        "rootFileTitle": "Reference documentation",
-        "doxygenStripFromPath": "..",
-        "exhaleExecutesDoxygen": True,
-        "exhaleUseDoxyfile": True,
-        "createTreeView": True
-}
-
-breathe_projects = {
-        "OpenTelemetry C++": "doxyoutput/xml",
-}
-breathe_default_project = "OpenTelemetry C++"
-
-
-primary_domain = "cpp"
-
-higlight_language = "cpp"
-
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-#html_theme = "furo"
-html_theme = "sphinx_rtd_theme"
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/index.rst b/ext/opentelemetry-cpp-1.21.0/docs/public/index.rst
deleted file mode 100644
index 958200a56..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/index.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-OpenTelemetry C++
-=================
-
-.. toctree::
-   :maxdepth: 1
-   :caption: OpenTelemetry C++ API
-
-   api/api
-
-.. toctree::
-   :maxdepth: 1
-   :caption: OpenTelemetry C++ SDK
-
-   sdk/sdk
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Reference Documentation
-
-   otel_docs/otel_docs
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Reference Documentation (API)
-
-   otel_docs/namespace_opentelemetry__trace
-   otel_docs/namespace_opentelemetry__baggage
-   otel_docs/namespace_opentelemetry__common
-   otel_docs/namespace_opentelemetry__context
-   otel_docs/namespace_opentelemetry__metrics
-   otel_docs/namespace_opentelemetry__logs
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Reference Documentation (SDK)
-
-   otel_docs/namespace_opentelemetry__sdk__trace
-   otel_docs/namespace_opentelemetry__sdk__instrumentationlibrary
-   otel_docs/namespace_opentelemetry__sdk__resource
-   otel_docs/namespace_opentelemetry__sdk__metrics
-   otel_docs/namespace_opentelemetry__sdk__logs
-
-.. toctree::
-    :maxdepth: 1
-    :caption: Performance
-    :name: performance-tests
-    :glob:
-
-    performance/**
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Further Reading
-
-   Source code <https://github.com/open-telemetry/opentelemetry-cpp>
-   GettingHelp.rst
-
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/performance/benchmarks.rst b/ext/opentelemetry-cpp-1.21.0/docs/public/performance/benchmarks.rst
deleted file mode 100644
index ff7bb49dd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/performance/benchmarks.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Performance Tests - Benchmarks
-==============================
-
-Click `here <https://open-telemetry.github.io/opentelemetry-cpp/benchmarks/index.html>`_ to view the latest performance benchmarks for packages in this repo.
-
-Please note that the fluctuation in the results are mainly because `machines with different CPUs <https://github.com/benchmark-action/github-action-benchmark/issues/79>`_ are used for tests.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/requirements.txt b/ext/opentelemetry-cpp-1.21.0/docs/public/requirements.txt
deleted file mode 100644
index e6922e8c3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-breathe
-exhale
-furo
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/resources/footer.html b/ext/opentelemetry-cpp-1.21.0/docs/public/resources/footer.html
deleted file mode 100644
index 4ed6714a7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/resources/footer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- HTML footer for doxygen 1.8.13-->
-<!-- start footer part -->
-<!--BEGIN GENERATE_TREEVIEW-->
-<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
-  <ul>
-  </ul>
-</div>
-<!--END GENERATE_TREEVIEW-->
-<!--BEGIN !GENERATE_TREEVIEW-->
-<hr class="footer"/><address class="footer"><small>
-</small></address>
-<!--END !GENERATE_TREEVIEW-->
-</body>
-</html>
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/resources/header.html b/ext/opentelemetry-cpp-1.21.0/docs/public/resources/header.html
deleted file mode 100644
index 1da9d2069..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/resources/header.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- HTML header for doxygen 1.8.13-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen $doxygenversion"/>
-<meta name="viewport" content="width=device-width, initial-scale=1"/>
-<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath^jquery.js"></script>
-<script type="text/javascript" src="$relpath^dynsections.js"></script>
-$treeview
-$search
-$mathjax
-<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-$extrastylesheet
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-
-<!--BEGIN TITLEAREA-->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo"><img style="height: 56px;" alt="Logo" src="$relpath^$projectlogo"/></td>
-  <!--END PROJECT_LOGO-->
-  <!--BEGIN PROJECT_NAME-->
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">$projectname
-   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
-   </div>
-   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
-  </td>
-  <!--END PROJECT_NAME-->
-  <!--BEGIN !PROJECT_NAME-->
-   <!--BEGIN PROJECT_BRIEF-->
-    <td style="padding-left: 0.5em;">
-    <div id="projectbrief">$projectbrief</div>
-    </td>
-   <!--END PROJECT_BRIEF-->
-  <!--END !PROJECT_NAME-->
-  <!--BEGIN DISABLE_INDEX-->
-   <!--BEGIN SEARCHENGINE-->
-   <!--<td>$searchbox</td>-->
-   <!--END SEARCHENGINE-->
-  <!--END DISABLE_INDEX-->
- </tr>
- </tbody>
-</table>
-</div>
-<!--END TITLEAREA-->
-<!-- end header part -->
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/resources/stylesheet.css b/ext/opentelemetry-cpp-1.21.0/docs/public/resources/stylesheet.css
deleted file mode 100644
index b4914a528..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/resources/stylesheet.css
+++ /dev/null
@@ -1,1600 +0,0 @@
-/* The standard CSS for doxygen 1.8.13 */
-
-body, table, div, p, dl {
-	font: 400 14px/22px Roboto,sans-serif;
-}
-
-p.reference, p.definition {
-	font: 400 14px/22px Roboto,sans-serif;
-}
-
-/* @group Heading Levels */
-
-h1.groupheader {
-	font-size: 150%;
-}
-
-.title {
-	font: 400 14px/28px Roboto,sans-serif;
-	font-size: 150%;
-	font-weight: bold;
-	margin: 10px 2px;
-}
-
-h2.groupheader {
-	border-bottom: 1px solid #879ECB;
-	color: #354C7B;
-	font-size: 150%;
-	font-weight: normal;
-	margin-top: 1.75em;
-	padding-top: 8px;
-	padding-bottom: 4px;
-	width: 100%;
-}
-
-h3.groupheader {
-	font-size: 100%;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	-webkit-transition: text-shadow 0.5s linear;
-	-moz-transition: text-shadow 0.5s linear;
-	-ms-transition: text-shadow 0.5s linear;
-	-o-transition: text-shadow 0.5s linear;
-	transition: text-shadow 0.5s linear;
-	margin-right: 15px;
-}
-
-h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
-	text-shadow: 0 0 15px cyan;
-}
-
-dt {
-	font-weight: bold;
-}
-
-div.multicol {
-	-moz-column-gap: 1em;
-	-webkit-column-gap: 1em;
-	-moz-column-count: 3;
-	-webkit-column-count: 3;
-}
-
-p.startli, p.startdd {
-	margin-top: 2px;
-}
-
-p.starttd {
-	margin-top: 0px;
-}
-
-p.endli {
-	margin-bottom: 0px;
-}
-
-p.enddd {
-	margin-bottom: 4px;
-}
-
-p.endtd {
-	margin-bottom: 2px;
-}
-
-/* @end */
-
-caption {
-	font-weight: bold;
-}
-
-span.legend {
-        font-size: 70%;
-        text-align: center;
-}
-
-h3.version {
-        font-size: 90%;
-        text-align: center;
-}
-
-div.qindex, div.navtab{
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-}
-
-div.qindex, div.navpath {
-	width: 100%;
-	line-height: 140%;
-}
-
-div.navtab {
-	margin-right: 15px;
-}
-
-/* @group Link Styling */
-
-a {
-	color: #3D578C;
-	font-weight: normal;
-	text-decoration: none;
-}
-
-.contents a:visited {
-	color: #4665A2;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-a.qindex {
-	font-weight: bold;
-}
-
-a.qindexHL {
-	font-weight: bold;
-	background-color: #9CAFD4;
-	color: #ffffff;
-	border: 1px double #869DCA;
-}
-
-.contents a.qindexHL:visited {
-        color: #ffffff;
-}
-
-a.el {
-	font-weight: bold;
-}
-
-a.elRef {
-}
-
-a.code, a.code:visited, a.line, a.line:visited {
-	color: #4665A2;
-}
-
-a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited {
-	color: #4665A2;
-}
-
-/* @end */
-
-dl.el {
-	margin-left: -1cm;
-}
-
-pre.fragment {
-        border: 1px solid #C4CFE5;
-        background-color: #FBFCFD;
-        padding: 4px 6px;
-        margin: 4px 8px 4px 2px;
-        overflow: auto;
-        word-wrap: break-word;
-        font-size:  9pt;
-        line-height: 125%;
-        font-family: monospace, fixed;
-        font-size: 105%;
-}
-
-div.fragment {
-        padding: 0px;
-        margin: 4px 8px 4px 2px;
-	background-color: #FBFCFD;
-	border: 1px solid #C4CFE5;
-}
-
-div.line {
-	font-family: monospace, fixed;
-        font-size: 13px;
-	min-height: 13px;
-	line-height: 1.0;
-	text-wrap: unrestricted;
-	white-space: -moz-pre-wrap; /* Moz */
-	white-space: -pre-wrap;     /* Opera 4-6 */
-	white-space: -o-pre-wrap;   /* Opera 7 */
-	white-space: pre-wrap;      /* CSS3  */
-	word-wrap: break-word;      /* IE 5.5+ */
-	text-indent: -53px;
-	padding-left: 53px;
-	padding-bottom: 0px;
-	margin: 0px;
-	-webkit-transition-property: background-color, box-shadow;
-	-webkit-transition-duration: 0.5s;
-	-moz-transition-property: background-color, box-shadow;
-	-moz-transition-duration: 0.5s;
-	-ms-transition-property: background-color, box-shadow;
-	-ms-transition-duration: 0.5s;
-	-o-transition-property: background-color, box-shadow;
-	-o-transition-duration: 0.5s;
-	transition-property: background-color, box-shadow;
-	transition-duration: 0.5s;
-}
-
-div.line:after {
-    content:"\000A";
-    white-space: pre;
-}
-
-div.line.glow {
-	background-color: cyan;
-	box-shadow: 0 0 10px cyan;
-}
-
-
-span.lineno {
-	padding-right: 4px;
-	text-align: right;
-	border-right: 2px solid #0F0;
-	background-color: #E8E8E8;
-        white-space: pre;
-}
-span.lineno a {
-	background-color: #D8D8D8;
-}
-
-span.lineno a:hover {
-	background-color: #C8C8C8;
-}
-
-.lineno {
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-div.ah, span.ah {
-	background-color: black;
-	font-weight: bold;
-	color: #ffffff;
-	margin-bottom: 3px;
-	margin-top: 3px;
-	padding: 0.2em;
-	border: solid thin #333;
-	border-radius: 0.5em;
-	-webkit-border-radius: .5em;
-	-moz-border-radius: .5em;
-	box-shadow: 2px 2px 3px #999;
-	-webkit-box-shadow: 2px 2px 3px #999;
-	-moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
-	background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000 110%);
-}
-
-div.classindex ul {
-        list-style: none;
-        padding-left: 0;
-}
-
-div.classindex span.ai {
-        display: inline-block;
-}
-
-div.groupHeader {
-	margin-left: 16px;
-	margin-top: 12px;
-	font-weight: bold;
-}
-
-div.groupText {
-	margin-left: 16px;
-	font-style: italic;
-}
-
-body {
-	background-color: white;
-	color: black;
-        margin: 0;
-}
-
-body {
-	margin-left: 36px;
-	margin-right: 24px;
-}
-
-div.contents {
-	margin-top: 10px;
-	margin-left: 12px;
-	margin-right: 8px;
-}
-
-td.indexkey {
-	background-color: #EBEFF6;
-	font-weight: bold;
-	border: 1px solid #C4CFE5;
-	margin: 2px 0px 2px 0;
-	padding: 2px 10px;
-        white-space: nowrap;
-        vertical-align: top;
-}
-
-td.indexvalue {
-	background-color: #EBEFF6;
-	border: 1px solid #C4CFE5;
-	padding: 2px 10px;
-	margin: 2px 0px;
-}
-
-tr.memlist {
-	background-color: #EEF1F7;
-}
-
-p.formulaDsp {
-	text-align: center;
-}
-
-img.formulaDsp {
-	
-}
-
-img.formulaInl {
-	vertical-align: middle;
-}
-
-div.center {
-	text-align: center;
-        margin-top: 0px;
-        margin-bottom: 0px;
-        padding: 0px;
-}
-
-div.center img {
-	border: 0px;
-}
-
-address.footer {
-	text-align: right;
-	padding-right: 12px;
-}
-
-img.footer {
-	border: 0px;
-	vertical-align: middle;
-}
-
-/* @group Code Colorization */
-
-span.keyword {
-	color: #008000
-}
-
-span.keywordtype {
-	color: #604020
-}
-
-span.keywordflow {
-	color: #e08000
-}
-
-span.comment {
-	color: #800000
-}
-
-span.preprocessor {
-	color: #806020
-}
-
-span.stringliteral {
-	color: #002080
-}
-
-span.charliteral {
-	color: #008080
-}
-
-span.vhdldigit {
-	color: #ff00ff
-}
-
-span.vhdlchar {
-	color: #000000
-}
-
-span.vhdlkeyword {
-	color: #700070
-}
-
-span.vhdllogic {
-	color: #ff0000
-}
-
-blockquote {
-        background-color: #F7F8FB;
-        border-left: 2px solid #9CAFD4;
-        margin: 0 24px 0 4px;
-        padding: 0 12px 0 16px;
-}
-
-/* @end */
-
-/*
-.search {
-	color: #003399;
-	font-weight: bold;
-}
-
-form.search {
-	margin-bottom: 0px;
-	margin-top: 0px;
-}
-
-input.search {
-	font-size: 75%;
-	color: #000080;
-	font-weight: normal;
-	background-color: #e8eef2;
-}
-*/
-
-td.tiny {
-	font-size: 75%;
-}
-
-.dirtab {
-	padding: 4px;
-	border-collapse: collapse;
-	border: 1px solid #A3B4D7;
-}
-
-th.dirtab {
-	background: #EBEFF6;
-	font-weight: bold;
-}
-
-hr {
-	height: 0px;
-	border: none;
-	border-top: 1px solid #4A6AAA;
-}
-
-hr.footer {
-	height: 1px;
-}
-
-/* @group Member Descriptions */
-
-table.memberdecls {
-	border-spacing: 0px;
-	padding: 0px;
-}
-
-.memberdecls td, .fieldtable tr {
-	-webkit-transition-property: background-color, box-shadow;
-	-webkit-transition-duration: 0.5s;
-	-moz-transition-property: background-color, box-shadow;
-	-moz-transition-duration: 0.5s;
-	-ms-transition-property: background-color, box-shadow;
-	-ms-transition-duration: 0.5s;
-	-o-transition-property: background-color, box-shadow;
-	-o-transition-duration: 0.5s;
-	transition-property: background-color, box-shadow;
-	transition-duration: 0.5s;
-}
-
-.memberdecls td.glow, .fieldtable tr.glow {
-	background-color: cyan;
-	box-shadow: 0 0 15px cyan;
-}
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-	background-color: #F9FAFC;
-	border: none;
-	margin: 4px;
-	padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
-	padding: 0px 8px 4px 8px;
-	color: #555;
-}
-
-.memSeparator {
-        border-bottom: 1px solid #DEE4F0;
-        line-height: 1px;
-        margin: 0px;
-        padding: 0px;
-}
-
-.memItemLeft, .memTemplItemLeft {
-        white-space: nowrap;
-}
-
-.memItemRight {
-	width: 100%;
-}
-
-.memTemplParams {
-	color: #4665A2;
-        white-space: nowrap;
-	font-size: 80%;
-}
-
-/* @end */
-
-/* @group Member Details */
-
-/* Styles for detailed member documentation */
-
-.memtitle {
-	padding: 8px;
-	border-top: 1px solid #A8B8D9;
-	border-left: 1px solid #A8B8D9;
-	border-right: 1px solid #A8B8D9;
-	border-top-right-radius: 4px;
-	border-top-left-radius: 4px;
-	margin-bottom: -1px;
-	background-image: url('nav_f.png');
-	background-repeat: repeat-x;
-	background-color: #E2E8F2;
-	line-height: 1.25;
-	font-weight: 300;
-	float:left;
-}
-
-.permalink
-{
-        font-size: 65%;
-        display: inline-block;
-        vertical-align: middle;
-}
-
-.memtemplate {
-	font-size: 80%;
-	color: #4665A2;
-	font-weight: normal;
-	margin-left: 9px;
-}
-
-.memnav {
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-	margin: 2px;
-	margin-right: 15px;
-	padding: 2px;
-}
-
-.mempage {
-	width: 100%;
-}
-
-.memitem {
-	padding: 0;
-	margin-bottom: 10px;
-	margin-right: 5px;
-        -webkit-transition: box-shadow 0.5s linear;
-        -moz-transition: box-shadow 0.5s linear;
-        -ms-transition: box-shadow 0.5s linear;
-        -o-transition: box-shadow 0.5s linear;
-        transition: box-shadow 0.5s linear;
-        display: table !important;
-        width: 100%;
-}
-
-.memitem.glow {
-         box-shadow: 0 0 15px cyan;
-}
-
-.memname {
-        font-weight: 400;
-        margin-left: 6px;
-}
-
-.memname td {
-	vertical-align: bottom;
-}
-
-.memproto, dl.reflist dt {
-        border-top: 1px solid #A8B8D9;
-        border-left: 1px solid #A8B8D9;
-        border-right: 1px solid #A8B8D9;
-        padding: 6px 0px 6px 0px;
-        color: #253555;
-        font-weight: bold;
-        text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-        background-color: #DFE5F1;
-        /* opera specific markup */
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 4px;
-        /* firefox specific markup */
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 4px;
-        /* webkit specific markup */
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 4px;
-
-}
-
-.overload {
-        font-family: "courier new",courier,monospace;
-	font-size: 65%;
-}
-
-.memdoc, dl.reflist dd {
-        border-bottom: 1px solid #A8B8D9;
-        border-left: 1px solid #A8B8D9;
-        border-right: 1px solid #A8B8D9;
-        padding: 6px 10px 2px 10px;
-        background-color: #FBFCFD;
-        border-top-width: 0;
-        background-image:url('nav_g.png');
-        background-repeat:repeat-x;
-        background-color: #FFFFFF;
-        /* opera specific markup */
-        border-bottom-left-radius: 4px;
-        border-bottom-right-radius: 4px;
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        /* firefox specific markup */
-        -moz-border-radius-bottomleft: 4px;
-        -moz-border-radius-bottomright: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 4px;
-        -webkit-border-bottom-right-radius: 4px;
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-}
-
-dl.reflist dt {
-        padding: 5px;
-}
-
-dl.reflist dd {
-        margin: 0px 0px 10px 0px;
-        padding: 5px;
-}
-
-.paramkey {
-	text-align: right;
-}
-
-.paramtype {
-	white-space: nowrap;
-}
-
-.paramname {
-	color: #602020;
-	white-space: nowrap;
-}
-.paramname em {
-	font-style: normal;
-}
-.paramname code {
-        line-height: 14px;
-}
-
-.params, .retval, .exception, .tparams {
-        margin-left: 0px;
-        padding-left: 0px;
-}
-
-.params .paramname, .retval .paramname {
-        font-weight: bold;
-        vertical-align: top;
-}
-
-.params .paramtype {
-        font-style: italic;
-        vertical-align: top;
-}
-
-.params .paramdir {
-        font-family: "courier new",courier,monospace;
-        vertical-align: top;
-}
-
-table.mlabels {
-	border-spacing: 0px;
-}
-
-td.mlabels-left {
-	width: 100%;
-	padding: 0px;
-}
-
-td.mlabels-right {
-	vertical-align: bottom;
-	padding: 0px;
-	white-space: nowrap;
-}
-
-span.mlabels {
-        margin-left: 8px;
-}
-
-span.mlabel {
-        background-color: #728DC1;
-        border-top:1px solid #5373B4;
-        border-left:1px solid #5373B4;
-        border-right:1px solid #C4CFE5;
-        border-bottom:1px solid #C4CFE5;
-	text-shadow: none;
-	color: white;
-	margin-right: 4px;
-	padding: 2px 3px;
-	border-radius: 3px;
-	font-size: 7pt;
-	white-space: nowrap;
-	vertical-align: middle;
-}
-
-
-
-/* @end */
-
-/* these are for tree view inside a (index) page */
-
-div.directory {
-        margin: 10px 0px;
-        border-top: 1px solid #9CAFD4;
-        border-bottom: 1px solid #9CAFD4;
-        width: 100%;
-}
-
-.directory table {
-        border-collapse:collapse;
-}
-
-.directory td {
-        margin: 0px;
-        padding: 0px;
-	vertical-align: top;
-}
-
-.directory td.entry {
-        white-space: nowrap;
-        padding-right: 6px;
-	padding-top: 3px;
-}
-
-.directory td.entry a {
-        outline:none;
-}
-
-.directory td.entry a img {
-        border: none;
-}
-
-.directory td.desc {
-        width: 100%;
-        padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	border-left: 1px solid rgba(0,0,0,0.05);
-}
-
-.directory tr.even {
-	padding-left: 6px;
-	background-color: #F7F8FB;
-}
-
-.directory img {
-	vertical-align: -30%;
-}
-
-.directory .levels {
-        white-space: nowrap;
-        width: 100%;
-        text-align: right;
-        font-size: 9pt;
-}
-
-.directory .levels span {
-        cursor: pointer;
-        padding-left: 2px;
-        padding-right: 2px;
-	color: #3D578C;
-}
-
-.arrow {
-    color: #9CAFD4;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    cursor: pointer;
-    font-size: 80%;
-    display: inline-block;
-    width: 16px;
-    height: 22px;
-}
-
-.icon {
-    font-family: Arial, Helvetica;
-    font-weight: bold;
-    font-size: 12px;
-    height: 14px;
-    width: 16px;
-    display: inline-block;
-    background-color: #728DC1;
-    color: white;
-    text-align: center;
-    border-radius: 4px;
-    margin-left: 2px;
-    margin-right: 2px;
-}
-
-.icona {
-    width: 24px;
-    height: 22px;
-    display: inline-block;
-}
-
-.iconfopen {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('folderopen.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-.iconfclosed {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('folderclosed.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-.icondoc {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('doc.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-table.directory {
-    font: 400 14px Roboto,sans-serif;
-}
-
-/* @end */
-
-div.dynheader {
-        margin-top: 8px;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-address {
-	font-style: normal;
-	color: #2A3D61;
-}
-
-table.doxtable caption {
-	caption-side: top;
-}
-
-table.doxtable {
-	border-collapse:collapse;
-        margin-top: 4px;
-        margin-bottom: 4px;
-}
-
-table.doxtable td, table.doxtable th {
-	border: 1px solid #2D4068;
-	padding: 3px 7px 2px;
-}
-
-table.doxtable th {
-	background-color: #374F7F;
-	color: #FFFFFF;
-	font-size: 110%;
-	padding-bottom: 4px;
-	padding-top: 5px;
-}
-
-table.fieldtable {
-        /*width: 100%;*/
-        margin-bottom: 10px;
-        border: 1px solid #A8B8D9;
-        border-spacing: 0px;
-        -moz-border-radius: 4px;
-        -webkit-border-radius: 4px;
-        border-radius: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-        box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-}
-
-.fieldtable td, .fieldtable th {
-        padding: 3px 7px 2px;
-}
-
-.fieldtable td.fieldtype, .fieldtable td.fieldname {
-        white-space: nowrap;
-        border-right: 1px solid #A8B8D9;
-        border-bottom: 1px solid #A8B8D9;
-        vertical-align: top;
-}
-
-.fieldtable td.fieldname {
-        padding-top: 3px;
-}
-
-.fieldtable td.fielddoc {
-        border-bottom: 1px solid #A8B8D9;
-        /*width: 100%;*/
-}
-
-.fieldtable td.fielddoc p:first-child {
-        margin-top: 0px;
-}
-
-.fieldtable td.fielddoc p:last-child {
-        margin-bottom: 2px;
-}
-
-.fieldtable tr:last-child td {
-        border-bottom: none;
-}
-
-.fieldtable th {
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
-        font-size: 90%;
-        color: #253555;
-        padding-bottom: 4px;
-        padding-top: 5px;
-        text-align:left;
-        font-weight: 400;
-        -moz-border-radius-topleft: 4px;
-        -moz-border-radius-topright: 4px;
-        -webkit-border-top-left-radius: 4px;
-        -webkit-border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-        border-bottom: 1px solid #A8B8D9;
-}
-
-
-.tabsearch {
-	top: 0px;
-	left: 10px;
-	height: 36px;
-	background-image: url('tab_b.png');
-	z-index: 101;
-	overflow: hidden;
-	font-size: 13px;
-}
-
-.navpath ul
-{
-	font-size: 11px;
-	background-image:url('tab_b.png');
-	background-repeat:repeat-x;
-	background-position: 0 -5px;
-	height:30px;
-	line-height:30px;
-	color:#8AA0CC;
-	border:solid 1px #C2CDE4;
-	overflow:hidden;
-	margin:0px;
-	padding:0px;
-}
-
-.navpath li
-{
-	list-style-type:none;
-	float:left;
-	padding-left:10px;
-	padding-right:15px;
-	background-image:url('bc_s.png');
-	background-repeat:no-repeat;
-	background-position:right;
-	color:#364D7C;
-}
-
-.navpath li.navelem a
-{
-	height:32px;
-	display:block;
-	text-decoration: none;
-	outline: none;
-	color: #283A5D;
-	font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-	text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-	text-decoration: none;
-}
-
-.navpath li.navelem a:hover
-{
-	color:#6884BD;
-}
-
-.navpath li.footer
-{
-        list-style-type:none;
-        float:right;
-        padding-left:10px;
-        padding-right:15px;
-        background-image:none;
-        background-repeat:no-repeat;
-        background-position:right;
-        color:#364D7C;
-        font-size: 8pt;
-}
-
-
-div.summary
-{
-	float: right;
-	font-size: 8pt;
-	padding-right: 5px;
-	width: 50%;
-	text-align: right;
-}
-
-div.summary a
-{
-	white-space: nowrap;
-}
-
-table.classindex
-{
-        margin: 10px;
-        white-space: nowrap;
-        margin-left: 3%;
-        margin-right: 3%;
-        width: 94%;
-        border: 0;
-        border-spacing: 0;
-        padding: 0;
-}
-
-div.ingroups
-{
-	font-size: 8pt;
-	width: 50%;
-	text-align: left;
-}
-
-div.ingroups a
-{
-	white-space: nowrap;
-}
-
-div.header
-{
-        background-image:url('nav_h.png');
-        background-repeat:repeat-x;
-	background-color: #F9FAFC;
-	margin:  0px;
-	border-bottom: 1px solid #C4CFE5;
-}
-
-div.headertitle
-{
-	padding: 5px 5px 5px 10px;
-}
-
-dl
-{
-        padding: 0 0 0 10px;
-}
-
-/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
-dl.section
-{
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-dl.note
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #D0C000;
-}
-
-dl.warning, dl.attention
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #FF0000;
-}
-
-dl.pre, dl.post, dl.invariant
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #00D000;
-}
-
-dl.deprecated
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #505050;
-}
-
-dl.todo
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #00C0E0;
-}
-
-dl.test
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #3030E0;
-}
-
-dl.bug
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #C08050;
-}
-
-dl.section dd {
-	margin-bottom: 6px;
-}
-
-
-#projectlogo
-{
-	text-align: center;
-	vertical-align: middle;
-	border-collapse: separate;
-}
-
-#projectlogo img
-{
-	border: 0px none;
-}
-
-#projectalign
-{
-        vertical-align: middle;
-}
-
-#projectname
-{
-	font: 300% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 2px 0px;
-}
-
-#projectbrief
-{
-	font: 120% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 0px;
-}
-
-#projectnumber
-{
-	font: 50% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 0px;
-}
-
-#titlearea
-{
-	padding: 0px;
-	margin: 0px;
-	padding-bottom: 8px;
-	width: 100%;
-}
-
-.image
-{
-        text-align: center;
-}
-
-.dotgraph
-{
-        text-align: center;
-}
-
-.mscgraph
-{
-        text-align: center;
-}
-
-.plantumlgraph
-{
-        text-align: center;
-}
-
-.diagraph
-{
-        text-align: center;
-}
-
-.caption
-{
-	font-weight: bold;
-}
-
-div.zoom
-{
-	border: 1px solid #90A5CE;
-}
-
-dl.citelist {
-        margin-bottom:50px;
-}
-
-dl.citelist dt {
-        color:#334975;
-        float:left;
-        font-weight:bold;
-        margin-right:10px;
-        padding:5px;
-}
-
-dl.citelist dd {
-        margin:2px 0;
-        padding:5px 0;
-}
-
-div.toc {
-        padding: 14px 25px;
-        background-color: #F4F6FA;
-        border: 1px solid #D8DFEE;
-        border-radius: 7px 7px 7px 7px;
-        float: right;
-        height: auto;
-        margin: 0 8px 10px 10px;
-        width: 200px;
-}
-
-div.toc li {
-        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
-        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
-        margin-top: 5px;
-        padding-left: 10px;
-        padding-top: 2px;
-}
-
-div.toc h3 {
-        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
-	color: #4665A2;
-        border-bottom: 0 none;
-        margin: 0;
-}
-
-div.toc ul {
-        list-style: none outside none;
-        border: medium none;
-        padding: 0px;
-}
-
-div.toc li.level1 {
-        margin-left: 0px;
-}
-
-div.toc li.level2 {
-        margin-left: 15px;
-}
-
-div.toc li.level3 {
-        margin-left: 30px;
-}
-
-div.toc li.level4 {
-        margin-left: 45px;
-}
-
-.inherit_header {
-        font-weight: bold;
-        color: gray;
-        cursor: pointer;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-.inherit_header td {
-        padding: 6px 0px 2px 5px;
-}
-
-.inherit {
-        display: none;
-}
-
-tr.heading h2 {
-        margin-top: 12px;
-        margin-bottom: 4px;
-}
-
-/* tooltip related style info */
-
-.ttc {
-        position: absolute;
-        display: none;
-}
-
-#powerTip {
-	cursor: default;
-	white-space: nowrap;
-	background-color: white;
-	border: 1px solid gray;
-	border-radius: 4px 4px 4px 4px;
-	box-shadow: 1px 1px 7px gray;
-	display: none;
-	font-size: smaller;
-	max-width: 80%;
-	opacity: 0.9;
-	padding: 1ex 1em 1em;
-	position: absolute;
-	z-index: 2147483647;
-}
-
-#powerTip div.ttdoc {
-        color: grey;
-	font-style: italic;
-}
-
-#powerTip div.ttname a {
-        font-weight: bold;
-}
-
-#powerTip div.ttname {
-        font-weight: bold;
-}
-
-#powerTip div.ttdeci {
-        color: #006318;
-}
-
-#powerTip div {
-        margin: 0px;
-        padding: 0px;
-        font: 12px/16px Roboto,sans-serif;
-}
-
-#powerTip:before, #powerTip:after {
-	content: "";
-	position: absolute;
-	margin: 0px;
-}
-
-#powerTip.n:after,  #powerTip.n:before,
-#powerTip.s:after,  #powerTip.s:before,
-#powerTip.w:after,  #powerTip.w:before,
-#powerTip.e:after,  #powerTip.e:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.nw:after, #powerTip.nw:before,
-#powerTip.sw:after, #powerTip.sw:before {
-	border: solid transparent;
-	content: " ";
-	height: 0;
-	width: 0;
-	position: absolute;
-}
-
-#powerTip.n:after,  #powerTip.s:after,
-#powerTip.w:after,  #powerTip.e:after,
-#powerTip.nw:after, #powerTip.ne:after,
-#powerTip.sw:after, #powerTip.se:after {
-	border-color: rgba(255, 255, 255, 0);
-}
-
-#powerTip.n:before,  #powerTip.s:before,
-#powerTip.w:before,  #powerTip.e:before,
-#powerTip.nw:before, #powerTip.ne:before,
-#powerTip.sw:before, #powerTip.se:before {
-	border-color: rgba(128, 128, 128, 0);
-}
-
-#powerTip.n:after,  #powerTip.n:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.nw:after, #powerTip.nw:before {
-	top: 100%;
-}
-
-#powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after {
-	border-top-color: #ffffff;
-	border-width: 10px;
-	margin: 0px -10px;
-}
-#powerTip.n:before {
-	border-top-color: #808080;
-	border-width: 11px;
-	margin: 0px -11px;
-}
-#powerTip.n:after, #powerTip.n:before {
-	left: 50%;
-}
-
-#powerTip.nw:after, #powerTip.nw:before {
-	right: 14px;
-}
-
-#powerTip.ne:after, #powerTip.ne:before {
-	left: 14px;
-}
-
-#powerTip.s:after,  #powerTip.s:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.sw:after, #powerTip.sw:before {
-	bottom: 100%;
-}
-
-#powerTip.s:after, #powerTip.se:after, #powerTip.sw:after {
-	border-bottom-color: #ffffff;
-	border-width: 10px;
-	margin: 0px -10px;
-}
-
-#powerTip.s:before, #powerTip.se:before, #powerTip.sw:before {
-	border-bottom-color: #808080;
-	border-width: 11px;
-	margin: 0px -11px;
-}
-
-#powerTip.s:after, #powerTip.s:before {
-	left: 50%;
-}
-
-#powerTip.sw:after, #powerTip.sw:before {
-	right: 14px;
-}
-
-#powerTip.se:after, #powerTip.se:before {
-	left: 14px;
-}
-
-#powerTip.e:after, #powerTip.e:before {
-	left: 100%;
-}
-#powerTip.e:after {
-	border-left-color: #ffffff;
-	border-width: 10px;
-	top: 50%;
-	margin-top: -10px;
-}
-#powerTip.e:before {
-	border-left-color: #808080;
-	border-width: 11px;
-	top: 50%;
-	margin-top: -11px;
-}
-
-#powerTip.w:after, #powerTip.w:before {
-	right: 100%;
-}
-#powerTip.w:after {
-	border-right-color: #ffffff;
-	border-width: 10px;
-	top: 50%;
-	margin-top: -10px;
-}
-#powerTip.w:before {
-	border-right-color: #808080;
-	border-width: 11px;
-	top: 50%;
-	margin-top: -11px;
-}
-
-@media print
-{
-  #top { display: none; }
-  #side-nav { display: none; }
-  #nav-path { display: none; }
-  body { overflow:visible; }
-  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
-  .summary { display: none; }
-  .memitem { page-break-inside: avoid; }
-  #doc-content
-  {
-    margin-left:0 !important;
-    height:auto !important;
-    width:auto !important;
-    overflow:inherit;
-    display:inline;
-  }
-}
-
-/* @group Markdown */
-
-/*
-table.markdownTable {
-	border-collapse:collapse;
-        margin-top: 4px;
-        margin-bottom: 4px;
-}
-
-table.markdownTable td, table.markdownTable th {
-	border: 1px solid #2D4068;
-	padding: 3px 7px 2px;
-}
-
-table.markdownTableHead tr {
-}
-
-table.markdownTableBodyLeft td, table.markdownTable th {
-	border: 1px solid #2D4068;
-	padding: 3px 7px 2px;
-}
-
-th.markdownTableHeadLeft th.markdownTableHeadRight th.markdownTableHeadCenter th.markdownTableHeadNone {
-	background-color: #374F7F;
-	color: #FFFFFF;
-	font-size: 110%;
-	padding-bottom: 4px;
-	padding-top: 5px;
-}
-
-th.markdownTableHeadLeft {
-	text-align: left
-}
-
-th.markdownTableHeadRight {
-	text-align: right
-}
-
-th.markdownTableHeadCenter {
-	text-align: center
-}
-*/
-
-table.markdownTable {
-	border-collapse:collapse;
-        margin-top: 4px;
-        margin-bottom: 4px;
-}
-
-table.markdownTable td, table.markdownTable th {
-	border: 1px solid #2D4068;
-	padding: 3px 7px 2px;
-}
-
-table.markdownTable tr {
-}
-
-th.markdownTableHeadLeft, th.markdownTableHeadRight, th.markdownTableHeadCenter, th.markdownTableHeadNone {
-	background-color: #374F7F;
-	color: #FFFFFF;
-	font-size: 110%;
-	padding-bottom: 4px;
-	padding-top: 5px;
-}
-
-th.markdownTableHeadLeft, td.markdownTableBodyLeft {
-	text-align: left
-}
-
-th.markdownTableHeadRight, td.markdownTableBodyRight {
-	text-align: right
-}
-
-th.markdownTableHeadCenter, td.markdownTableBodyCenter {
-	text-align: center
-}
-
-/* @end */
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/sdk/GettingStarted.rst b/ext/opentelemetry-cpp-1.21.0/docs/public/sdk/GettingStarted.rst
deleted file mode 100644
index d93e778d9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/sdk/GettingStarted.rst
+++ /dev/null
@@ -1,209 +0,0 @@
-Getting started
-^^^^^^^^^^^^^^^
-
-OpenTelemetry C++ SDK provides the reference implementation of OpenTelemetry C++ API,
-and also provides implementation for Processor, Sampler, and core Exporters as per the
-specification.
-
-
-Exporter
-^^^^^^^^
-
-An exporter is responsible for sending the telemetry data to a particular backend.
-OpenTelemetry offers six tracing exporters out of the box:
-
-- In-Memory Exporter: keeps the data in memory, useful for debugging.
-- Zipkin Exporter: prepares and sends the collected telemetry data to a Zipkin backend via the Zipkin APIs.
-- Logging Exporter: saves the telemetry data into log streams.
-- OpenTelemetry(otlp) Exporter: sends the data to the OpenTelemetry Collector using protobuf/gRPC or protobuf/HTTP.
-- ETW Exporter: sends the telemetry data to Event Tracing for Windows (ETW).
-
-.. code:: cpp
-
-    //namespace alias used in sample code here.
-    namespace sdktrace   = opentelemetry::sdk::trace;
-
-    // logging exporter
-    auto ostream_exporter =
-        std::unique_ptr<sdktrace::SpanExporter>(new opentelemetry::exporter::trace::OStreamSpanExporter);
-
-    // memory exporter
-    auto memory_exporter =
-        std::unique_ptr<sdktrace::SpanExporter>(new opentelemetry::exporter::memory::InMemorySpanExporter);
-
-    // zipkin exporter
-    opentelemetry::exporter::zipkin::ZipkinExporterOptions opts;
-    opts.endpoint = "http://localhost:9411/api/v2/spans" ; // or export OTEL_EXPORTER_ZIPKIN_ENDPOINT="..."
-    opts.service_name = "default_service" ;
-    auto zipkin_exporter =
-        std::unique_ptr<sdktrace::SpanExporter>(new opentelemetry::exporter::zipkin::ZipkinExporter(opts));
-
-    // otlp grpc exporter
-    opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
-    opts.endpoint = "localhost:4317";
-    opts.use_ssl_credentials = true;
-    opts.ssl_credentials_cacert_as_string = "ssl-certificate";
-    auto otlp_grpc_exporter =
-        std::unique_ptr<sdktrace::SpanExporter>(new opentelemetry::exporter::otlp::OtlpGrpcExporter(opts));
-
-    // otlp http exporter
-    opentelemetry::exporter::otlp::OtlpHttpExporterOptions opts;
-    opts.url = "http://localhost:4318/v1/traces";
-    auto otlp_http_exporter =
-        std::unique_ptr<sdktrace::SpanExporter>(new opentelemetry::exporter::otlp::OtlpHttpExporter(opts));
-
-
-Span Processor
-^^^^^^^^^^^^^^
-
-Span Processor is initialised with an Exporter. Different Span Processors are offered by OpenTelemetry C++ SDK:
-
-- SimpleSpanProcessor: immediately forwards ended spans to the exporter.
-- BatchSpanProcessor: batches the ended spans and send them to exporter in bulk.
-- MultiSpanProcessor: Allows multiple span processors to be active and configured at the same time.
-
-.. code:: cpp
-
-    // simple processor
-    auto simple_processor = std::unique_ptr<sdktrace::SpanProcessor>(
-        new sdktrace::SimpleSpanProcessor(std::move(ostream_exporter)));
-
-    // batch processor
-    sdktrace::BatchSpanProcessorOptions options{};
-    auto batch_processor = std::unique_ptr<sdktrace::SpanProcessor>(
-        new sdktrace::BatchSpanProcessor(std::move(memory_exporter), options));
-
-    // multi-processor
-    std::vector<std::unique_ptr<SpanProcessor>>
-        processors{std::move(simple_processor), std::move(batch_processor)};
-    auto multi_processor = std::unique_ptr<sdktrace::SpanProcessor>(
-        new sdktrace::MultiSpanProcessor(std::move(processors));
-
-Resource
-^^^^^^^^
-
-A Resource is an immutable representation of the entity producing telemetry as key-value pair.
-The OpenTelemetry C++ SDK allow for creation of Resources and for associating them with telemetry.
-
-.. code:: cpp
-
-    auto resource_attributes = opentelemetry::sdk::resource::ResourceAttributes
-        {
-            {"service.name", "shoppingcart"},
-            {"service.instance.id", "instance-12"}
-        };
-    auto resource = opentelemetry::sdk::resource::Resource::Create(resource_attributes);
-    auto received_attributes = resource.GetAttributes();
-    // received_attributes contains
-    //      - service.name = shoppingcart
-    //      - service.instance.id = instance-12
-    //      - telemetry.sdk.name = opentelemetry
-    //      - telemetry.sdk.language = cpp
-    //      - telemetry.sdk.version = <current sdk version>
-
-It is possible to define the custom resource detectors by inhering from
-`opentelemetry::sdk::Resource::ResourceDetector` class.
-
-Sampler
-^^^^^^^
-
-Sampling is mechanism to control/reducing the number of samples of traces collected and sent to the backend.
-OpenTelemetry C++ SDK  offers four samplers out of the box:
-
-- AlwaysOnSampler which samples every trace regardless of upstream sampling decisions.
-- AlwaysOffSampler which doesn’t sample any trace, regardless of upstream sampling decisions.
-- ParentBased which uses the parent span to make sampling decisions, if present.
-- TraceIdRatioBased which samples a configurable percentage of traces.
-
-.. code:: cpp
-
-    //AlwaysOnSampler
-    auto always_on_sampler = std::unique_ptr<sdktrace::AlwaysOnSampler>
-        (new sdktrace::AlwaysOnSampler);
-
-    //AlwaysOffSampler
-    auto always_off_sampler = std::unique_ptr<sdktrace::AlwaysOffSampler>
-        (new sdktrace::AlwaysOffSampler);
-
-    //ParentBasedSampler
-    auto parent_based_sampler = std::unique_ptr<sdktrace::ParentBasedSampler>
-        (new sdktrace::ParentBasedSampler);
-
-    //TraceIdRatioBasedSampler - Sample 50% generated spans
-    double ratio       = 0.5;
-    auto always_off_sampler = std::unique_ptr<sdktrace::TraceIdRatioBasedSampler>
-        (new sdktrace::TraceIdRatioBasedSampler(ratio));
-
-TracerContext
-^^^^^^^^^^^^^
-
-SDK configuration are shared between `TracerProvider` and all it's `Tracer` instances through `TracerContext`.
-
-.. code:: cpp
-
-    auto tracer_context = std::make_shared<sdktrace::TracerContext>
-        (std::move(multi_processor), resource, std::move(always_on_sampler));
-
-TracerProvider
-^^^^^^^^^^^^^^
-
-`TracerProvider` instance holds the SDK configurations ( Span Processors, Samplers, Resource). There is single
-global TracerProvider instance for an application, and it is created at the start of application.
-There are two different mechanisms to create TraceProvider instance
-
-- Using constructor which takes already created TracerContext shared object as parameter.
-- Using consructor which takes SDK configurations as parameter.
-
-.. code:: cpp
-
-    // Created using `TracerContext` instance
-    auto tracer_provider = nostd::shared_ptr<sdktrace::TracerProvider>
-        (new sdktrace::TracerProvider(tracer_context));
-
-    // Create using SDK configurations as parameter
-    auto tracer_provider = nostd::shared_ptr<sdktrace::TracerProvider>
-        (std::move(simple_processor), resource, std::move(always_on_sampler));
-
-    // set the global tracer TraceProvider
-    opentelemetry::trace::Provider::SetTracerProvider(tracer_provider);
-
-
-Logging and Error Handling
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-OpenTelemetry C++ SDK provides mechanism for application owner to add customer log and error handler.
-The default log handler is redirected to standard output ( using std::cout ).
-
-The logging macro supports logging using C++ stream format, and key-value pair.
-The log handler is meant to capture errors and warnings arising from SDK, not supposed to be used for the application errors.
-The different log levels are supported - Error, Warn, Info and Debug. The default log level is Warn ( to dump both Error and Warn)
-and it can be changed at compile time.
-
-.. code:: cpp
-
-    OTEL_INTERNAL_LOG_ERROR(" Connection failed. Error string " << error_str << " Error Num: " << errorno);
-    opentelemetry::sdk::common::AttributeMap error_attributes = {
-      {"url", url}, {"content-length", len}, {"content-type", type}};
-    OTEL_INTERNAL_LOG_ERROR(" Connection failed." , error_attributes);
-    opentelemetry::sdk::common::AttributeMap http_attributes = {
-      {"url", url}, {"content-length", len}, {"content-type", type}};
-    OTEL_INTERNAL_LOG_DEBUG(" Connection Established Successfully. Headers:", http_attributes);
-
-The custom log handler can be defined by inheriting from `opentelemetry::sdk::common::internal_log::LogHandler` class.
-
-.. code:: cpp
-
-    class CustomLogHandler : public opentelemetry::sdk::common::internal_log::LogHandler
-    {
-        void Handle(opentelemetry::sdk::common::internal_log::LogLevel level,
-                    const char \*file,
-                    int line,
-                    const char \*msg,
-                    const opentelemetry::sdk::common::AttributeMap &attributes) noexcept override
-
-        {
-            // add implementation here
-        }
-    };
-    opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogHandler(CustomLogHandler());
-    opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogLevel(opentelemetry::sdk::common::internal_log::LogLevel::Debug);
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/public/sdk/sdk.rst b/ext/opentelemetry-cpp-1.21.0/docs/public/sdk/sdk.rst
deleted file mode 100644
index 3c3db47df..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/public/sdk/sdk.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTelemetry C++ SDK
-====================
-
-.. toctree::
-   :maxdepth: 1
-
-   GettingStarted.rst
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/requirements.md b/ext/opentelemetry-cpp-1.21.0/docs/requirements.md
deleted file mode 100644
index b82944cde..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/requirements.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Requirements
-
-* The API must have zero dependencies and be header-only.
-
-Pros: allows you to drop it into a source tree (i.e. vendor it) without changing
-the build or adding a dependency.
-
-* The SDK should have minimal dependencies.
-
-* Exporters can bring in transport dependencies, e.g. Stackdriver exporter
-  depends on gRPC.
-
-* Support both static linking and dynamic loading.
-
-Dynamic loading is required because some vendors want to drop in their own
-implementation of the SDK. It also allows low-dependency builds.
-
-This also requires a stable C++ ABI. There is quite a bit of interest in this.
-
-This means STL types can't be used in the interface.
-
-* OpenTelemetry should not _require_ a dedicated thread for background work and
-  exporters.
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/testing-with-ssl.md b/ext/opentelemetry-cpp-1.21.0/docs/testing-with-ssl.md
deleted file mode 100644
index 47fdfeab6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/testing-with-ssl.md
+++ /dev/null
@@ -1,351 +0,0 @@
-# Testing with SSL/TLS
-
-## Required software
-
-The opentelemetry-collector
-[documentation](https://opentelemetry.io/docs/collector/configuration/#setting-up-certificates)
-uses [cfssl](https://github.com/cloudflare/cfssl),
-so we are using cfssl as well here.
-
-In addition, install `openssl`, which provides tooling for testing.
-
-## Generating CERT
-
-### Generating CA CERT
-
-First, write a CA request file in json, named `ca_csr.json`
-
-It should contains the following data:
-
-```console
-shell> cat ca_csr.json
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry CA Example"
-    }
-  ]
-}
-```
-
-Then, generate a CA certificate:
-
-```console
-shell> cfssl genkey -initca ca_csr.json | cfssljson -bare ca
-2022/12/13 16:42:57 [INFO] generate received request
-2022/12/13 16:42:57 [INFO] received CSR
-2022/12/13 16:42:57 [INFO] generating key: rsa-2048
-2022/12/13 16:42:57 [INFO] encoded CSR
-2022/12/13 16:42:57 [INFO] signed certificate with serial number 78705522450145914781445058194934247010984259280
-```
-
-This will create three files, `ca.csr`, `ca.pem` and `ca-key.pem`
-
-Congratulation, "OpenTelemetry CA Example" is now a CA certification
-authority, with signing keys.
-
-### Generating Client CERT
-
-Second, write a certificate request file in json, named `client_csr.json`,
-for the opentelemetry-cpp client.
-
-It should contains the following data:
-
-```console
-shell> cat client_csr.json
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry Client Example"
-    }
-  ]
-}
-```
-
-Note that the name ("OpenTelemetry Client Example") should be different
-from the CA authority name ("OpenTelemetry CA Example"),
-otherwise the client certificate will be self-signed, and rejected later in SSL/TLS.
-
-Now, use the CA certificate generated in the previous step
-to create and sign a new client certificate.
-
-```console
-shell> cfssl gencert -ca ca.pem -ca-key ca-key.pem client_csr.json | cfssljson -bare client_cert
-2022/12/13 16:50:18 [INFO] generate received request
-2022/12/13 16:50:18 [INFO] received CSR
-2022/12/13 16:50:18 [INFO] generating key: rsa-2048
-2022/12/13 16:50:18 [INFO] encoded CSR
-2022/12/13 16:50:18 [INFO] signed certificate with serial number 579932794730090029542135367576037344135399122179
-```
-
-This will create three files, `client_cert.csr`, `client_cert.pem` and `client_cert-key.pem`
-
-### Generating Server CERT
-
-Third and likewise, write a certificate request file in json, named `server_csr.json`,
-for the opentelemetry server (the opentelemetry-collector)
-
-It should contains the following data:
-
-```console
-shell> cat server_csr.json
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry Server Example"
-    }
-  ]
-}
-```
-
-Likewise, use a different name from the CA authority name.
-
-Use the CA certificate to create and sign a new server certificate.
-
-```console
-shell> cfssl gencert -ca ca.pem -ca-key ca-key.pem server_csr.json | cfssljson -bare server_cert
-2022/12/13 17:04:40 [INFO] generate received request
-2022/12/13 17:04:40 [INFO] received CSR
-2022/12/13 17:04:40 [INFO] generating key: rsa-2048
-2022/12/13 17:04:40 [INFO] encoded CSR
-2022/12/13 17:04:40 [INFO] signed certificate with serial number 332420451189450993545238745169293824985460186638
-```
-
-This will create three files, `server_cert.csr`, `server_cert.pem` and `server_cert-key.pem`
-
-### Verify certificates
-
-Verify the certificates generated, using `openssl`:
-
-```console
-shell> openssl verify -CAfile ca.pem server_cert.pem client_cert.pem
-server_cert.pem: OK
-client_cert.pem: OK
-```
-
-Useful commands, to inspect certificates if needed (output not shown here)
-
-```console
-shell> openssl x509 -in ca.pem -text
-```
-
-```console
-shell> openssl x509 -in client_cert.pem -text
-```
-
-```console
-shell> openssl x509 -in server_cert.pem -text
-```
-
-## OpenTelemetry SSL clients
-
-### Simulated client, for testing
-
-Use `openssl` to simulate an opentelemetry-cpp client connecting to port 4318:
-
-```console
-shell> openssl s_client -connect localhost:4318 -CAfile ca.pem -cert client_cert.pem -key client_cert-key.pem
-```
-
-### OTLP HTTP Client
-
-Use the example `example_otlp_http` client to connect to an OTLP HTTP server:
-
-```console
-shell> export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=https://localhost:4318/v1/traces
-shell> export OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE=ca.pem
-shell> export OTEL_EXPORTER_OTLP_TRACES_CLIENT_CERTIFICATE=client_cert.pem
-shell> export OTEL_EXPORTER_OTLP_TRACES_CLIENT_KEY=client_cert-key.pem
-shell> example_otlp_http
-```
-
-## OpenTelemetry SSL servers
-
-### Simulated server, for testing
-
-Use `openssl` to simulate an opentelemetry-collector process serving port 4318:
-
-```console
-shell> openssl s_server -accept 4318 -CAfile ca.pem -cert server_cert.pem -key server_cert-key.pem
-Using default temp DH parameters
-ACCEPT
-```
-
-This command does not return,
-the server waits for SSL connections (Use CTRL-C to quit).
-
-### OTLP HTTP Server
-
-To use a server that:
-
-- implements OTLP HTTP
-- supports SSL
-
-use the opentelemetry-collector,
-configured to use SSL/TLS for receivers:
-
-```console
-shell> cat otel-collector-config-ssl.yaml
-receivers:
-  otlp:
-    protocols:
-      http:
-        tls:
-          ca_file: ca.pem
-          cert_file: server_cert.pem
-          key_file: server_cert-key.pem
-...
-```
-
-For example:
-
-```console
-shell> /path/to/bin/otelcorecol_linux_amd64 --config /path/to/otel-config-ssl.yaml
-```
-
-Note, the `example/http/http_example` can not be used (it understands neither SSL
-nor OTLP HTTP).
-
-## Testing SSL on the wire
-
-### Fake client with fake server
-
-This configuration tests nothing in opentelemetry,
-but is useful to understand what a nominal SSL communication between a
-client and a server should look like.
-
-### Real client with fake server
-
-In this configuration, we can test that the opentelemetry-cpp
-client actually sends SSL traffic on the wire.
-
-### Fake client with real server
-
-In this configuration, we can test that the opentelemetry-collector
-server actually accepts SSL traffic on the wire.
-This can be used to verify the client keys are working properly.
-
-## Full integration test with SSL
-
-Start an opentelemetry-collector, configured to use SSL/TLS.
-
-```console
-shell> /path/to/bin/otelcorecol_linux_amd64 --config /path/to/otel-config-ssl.yaml
-...
-2022-12-13T18:03:21.140+0100    info    otlpreceiver@v0.66.0/otlp.go:89 Starting HTTP server    {"kind": "receiver", "name": "otlp", "pipeline": "metrics", "endpoint": "0.0.0.0:4318"}
-2022-12-13T18:03:21.141+0100    info    service/pipelines.go:106        Receiver started.       {"kind": "receiver", "name": "otlp", "pipeline": "metrics"}
-2022-12-13T18:03:21.141+0100    info    service/pipelines.go:102        Receiver is starting... {"kind": "receiver", "name": "otlp", "pipeline": "traces"}
-2022-12-13T18:03:21.141+0100    info    service/pipelines.go:106        Receiver started.       {"kind": "receiver", "name": "otlp", "pipeline": "traces"}
-2022-12-13T18:03:21.141+0100    info    service/service.go:105  Everything is ready. Begin running and processing data.
-```
-
-Start the example_otlp_http client, configured to use SSL/TLS.
-
-```console
-shell> export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=https://localhost:4318/v1/traces
-shell> export OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE=ca.pem
-shell> export OTEL_EXPORTER_OTLP_TRACES_CLIENT_CERTIFICATE=client_cert.pem
-shell> export OTEL_EXPORTER_OTLP_TRACES_CLIENT_KEY=client_cert-key.pem
-shell> example_otlp_http
-```
-
-The opentelemetry-collector process receives data, as seen in logs:
-
-```console
-2022-12-13T18:05:36.611+0100 info TracesExporter {"kind": "exporter", "data_type": "traces", "name": "logging", "#spans": 4}
-2022-12-13T18:05:36.611+0100 info ResourceSpans #0
-Resource SchemaURL:
-Resource attributes:
-     -> service.name: Str(unknown_service)
-     -> telemetry.sdk.version: Str(1.8.1)
-     -> telemetry.sdk.name: Str(opentelemetry)
-     -> telemetry.sdk.language: Str(cpp)
-ScopeSpans #0
-ScopeSpans SchemaURL:
-InstrumentationScope foo_library 1.8.1
-Span #0
-    Trace ID       : ebbd7e13e9cdfb05f0ca9ed4b0cdf6c0
-    Parent ID      : 042ae76539c294c6
-    ID             : c87b21d63c505bae
-    Name           : f1
-    Kind           : Internal
-    Start time     : 2022-12-13 17:05:36.482165738 +0000 UTC
-    End time       : 2022-12-13 17:05:36.482170938 +0000 UTC
-    Status code    : Unset
-    Status message :
-ResourceSpans #1
-Resource SchemaURL:
-Resource attributes:
-     -> service.name: Str(unknown_service)
-     -> telemetry.sdk.version: Str(1.8.1)
-     -> telemetry.sdk.name: Str(opentelemetry)
-     -> telemetry.sdk.language: Str(cpp)
-ScopeSpans #0
-ScopeSpans SchemaURL:
-InstrumentationScope foo_library 1.8.1
-Span #0
-    Trace ID       : ebbd7e13e9cdfb05f0ca9ed4b0cdf6c0
-    Parent ID      : 042ae76539c294c6
-    ID             : 801227b9ee6d3b03
-    Name           : f1
-    Kind           : Internal
-    Start time     : 2022-12-13 17:05:36.487636362 +0000 UTC
-    End time       : 2022-12-13 17:05:36.487641983 +0000 UTC
-    Status code    : Unset
-    Status message :
-ResourceSpans #2
-Resource SchemaURL:
-Resource attributes:
-     -> service.name: Str(unknown_service)
-     -> telemetry.sdk.version: Str(1.8.1)
-     -> telemetry.sdk.name: Str(opentelemetry)
-     -> telemetry.sdk.language: Str(cpp)
-ScopeSpans #0
-ScopeSpans SchemaURL:
-InstrumentationScope foo_library 1.8.1
-Span #0
-    Trace ID       : ebbd7e13e9cdfb05f0ca9ed4b0cdf6c0
-    Parent ID      : 6489f2ada8d95da0
-    ID             : 042ae76539c294c6
-    Name           : f2
-    Kind           : Internal
-    Start time     : 2022-12-13 17:05:36.482154908 +0000 UTC
-    End time       : 2022-12-13 17:05:36.488641122 +0000 UTC
-    Status code    : Unset
-    Status message :
-ResourceSpans #3
-Resource SchemaURL:
-Resource attributes:
-     -> service.name: Str(unknown_service)
-     -> telemetry.sdk.version: Str(1.8.1)
-     -> telemetry.sdk.name: Str(opentelemetry)
-     -> telemetry.sdk.language: Str(cpp)
-ScopeSpans #0
-ScopeSpans SchemaURL:
-InstrumentationScope foo_library 1.8.1
-Span #0
-    Trace ID       : ebbd7e13e9cdfb05f0ca9ed4b0cdf6c0
-    Parent ID      :
-    ID             : 6489f2ada8d95da0
-    Name           : library
-    Kind           : Internal
-    Start time     : 2022-12-13 17:05:36.482136052 +0000 UTC
-    End time       : 2022-12-13 17:05:36.489263125 +0000 UTC
-    Status code    : Unset
-    Status message :
-```
diff --git a/ext/opentelemetry-cpp-1.21.0/docs/using-clang-format.md b/ext/opentelemetry-cpp-1.21.0/docs/using-clang-format.md
deleted file mode 100644
index 3d1fcc108..000000000
--- a/ext/opentelemetry-cpp-1.21.0/docs/using-clang-format.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Using clang-format
-
-## Command-line use
-
-To format a file according to Coding style using command line, please setup the
-build tools environment first.
-
-For Windows - cmd.exe command:
-
-```call tools\setup-devenv.cmd```
-
-For Linux and Mac:
-
-```. tools/setup-devenv.sh```
-
-Command will add the tools from repo *tools* directory to PATH environment
-variable.
-
-Then run:
-
-```git cl format <filename>```
-
-At the moment the tool requires you to specify the path to file you want to
-format. Long-term goal is to integrate the [clang-format from
-Chromium](https://chromium.googlesource.com/chromium/src/+/master/docs/clang_format.md)
-to automatically format all source code files being changed.
-
-## Alternative
-
-Run: `tools/format.sh`
-
-Or, via Docker: `./ci/run_docker.sh ./ci/do_ci.sh format`
-
-## Editor integrations
-
-For further guidance on editor integration, see these specific pages:
-
-* [Download link for LLVM tools for
-  Windows](https://releases.llvm.org/9.0.0/LLVM-9.0.0-win64.exe)
-* [LLVM tools extension for Visual
-  Studio](https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain)
-* [Visual Studio code
-  extension](https://marketplace.visualstudio.com/items?itemName=xaver.clang-format)
-* [CppStyle Eclipse CDT
-  extension](https://marketplace.eclipse.org/content/cppstyle)
-
-## Are robots taking over my freedom to choose where newlines go
-
-No. For the project as a whole, using clang-format is just one optional way to
-format your code. While it will produce style-guide conformant code, other
-formats would also satisfy the style guide. For certain modules it may be
-appropriate to use alternate coding style. In those scenarios a local directory
-*.clang-format* settings file takes precedence over the one at top-level.
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/CMakeLists.txt
deleted file mode 100644
index b0991c0c8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(common)
-
-if(WITH_OTLP_GRPC
-   OR WITH_OTLP_HTTP
-   OR WITH_OTLP_FILE)
-  add_subdirectory(otlp)
-endif()
-if(WITH_OTLP_GRPC)
-  add_subdirectory(grpc)
-endif()
-if(WITH_ETW)
-  add_subdirectory(etw_threads)
-endif()
-if(WITH_ZIPKIN)
-  add_subdirectory(zipkin)
-endif()
-if(WITH_PROMETHEUS)
-  add_subdirectory(prometheus)
-endif()
-add_subdirectory(logs_simple)
-add_subdirectory(plugin)
-add_subdirectory(simple)
-add_subdirectory(batch)
-add_subdirectory(metrics_simple)
-add_subdirectory(multithreaded)
-add_subdirectory(multi_processor)
-
-if(WITH_EXAMPLES_HTTP)
-  add_subdirectory(http)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/batch/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/batch/BUILD
deleted file mode 100644
index c5db0f4b6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/batch/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_simple",
-    srcs = [
-        "main.cc",
-    ],
-    linkopts = ["-lpthread"],
-    tags = ["ostream"],
-    deps = [
-        "//api",
-        "//exporters/ostream:ostream_span_exporter",
-        "//sdk/src/trace",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/batch/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/batch/CMakeLists.txt
deleted file mode 100644
index 2d88df76b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/batch/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-add_executable(batch_span_processor_example main.cc)
-
-target_link_libraries(
-  batch_span_processor_example PRIVATE opentelemetry-cpp::ostream_span_exporter
-                                       opentelemetry-cpp::trace)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/batch/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/batch/main.cc
deleted file mode 100644
index 888c17e51..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/batch/main.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <stdio.h>
-#include <chrono>
-#include <iostream>
-#include <string>
-#include <thread>
-#include <utility>
-
-#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_factory.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-constexpr int kNumSpans  = 10;
-namespace trace_api      = opentelemetry::trace;
-namespace resource       = opentelemetry::sdk::resource;
-namespace trace_sdk      = opentelemetry::sdk::trace;
-namespace trace_exporter = opentelemetry::exporter::trace;
-
-namespace
-{
-
-void InitTracer()
-{
-  auto exporter = trace_exporter::OStreamSpanExporterFactory::Create();
-
-  // CONFIGURE BATCH SPAN PROCESSOR PARAMETERS
-
-  trace_sdk::BatchSpanProcessorOptions options{};
-  // We make the queue size `KNumSpans`*2+5 because when the queue is half full, a preemptive notif
-  // is sent to start an export call, which we want to avoid in this simple example.
-  options.max_queue_size = kNumSpans * 2 + 5;
-  // Time interval (in ms) between two consecutive exports.
-  options.schedule_delay_millis = std::chrono::milliseconds(3000);
-  // We export `kNumSpans` after every `schedule_delay_millis` milliseconds.
-  options.max_export_batch_size = kNumSpans;
-
-  resource::ResourceAttributes attributes = {{"service", "test_service"},
-                                             {"version", static_cast<uint32_t>(1)}};
-  auto resource                           = resource::Resource::Create(attributes);
-
-  auto processor = trace_sdk::BatchSpanProcessorFactory::Create(std::move(exporter), options);
-
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
-      trace_sdk::TracerProviderFactory::Create(std::move(processor), resource);
-
-  // Set the global trace provider.
-  trace_sdk::Provider::SetTracerProvider(provider);
-}
-
-void CleanupTracer()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-
-opentelemetry::nostd::shared_ptr<trace_api::Tracer> get_tracer()
-{
-  auto provider = trace_api::Provider::GetTracerProvider();
-  return provider->GetTracer("foo_library");
-}
-
-void StartAndEndSpans()
-{
-  for (int i = 1; i <= kNumSpans; ++i)
-  {
-    get_tracer()->StartSpan("Span " + std::to_string(i));
-  }
-}
-
-}  // namespace
-
-int main(int /* argc */, char ** /* argv */)
-{
-  // Removing this line will leave the default noop TracerProvider in place.
-  InitTracer();
-
-  std::cout << "Creating first batch of " << kNumSpans << " spans and waiting 3 seconds ...\n";
-  StartAndEndSpans();
-  std::this_thread::sleep_for(std::chrono::milliseconds(3000 + 50));
-  // The spans should now be exported.
-  std::cout << "....Exported!\n\n\n";
-
-  // Do the same again
-  std::cout << "Creating second batch of " << kNumSpans << " spans and waiting 3 seconds ...\n";
-  StartAndEndSpans();
-  std::this_thread::sleep_for(std::chrono::milliseconds(3000 + 50));
-  std::cout << "....Exported!\n\n\n";
-
-  // Shutdown and drain queue
-  StartAndEndSpans();
-  printf("Shutting down and draining queue.... \n");
-  std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-
-  // We invoke the processor destructor
-  // which in turn invokes the processor Shutdown(), which finally drains the queue of ALL
-  // its spans.
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/common/CMakeLists.txt
deleted file mode 100644
index 2c29e7054..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set(EXAMPLES_COMMON_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-add_subdirectory(foo_library)
-add_subdirectory(logs_foo_library)
-add_subdirectory(metrics_foo_library)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/BUILD
deleted file mode 100644
index 541d78692..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "common_foo_library",
-    srcs = [
-        "foo_library.cc",
-    ],
-    hdrs = [
-        "foo_library.h",
-    ],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/CMakeLists.txt
deleted file mode 100644
index 58cb179f8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(common_foo_library foo_library.h foo_library.cc)
-
-set_target_version(common_foo_library)
-
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  target_compile_definitions(common_foo_library
-                             PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-endif()
-
-target_include_directories(common_foo_library
-                           PUBLIC "$<BUILD_INTERFACE:${EXAMPLES_COMMON_DIR}>")
-target_link_libraries(common_foo_library PUBLIC opentelemetry-cpp::api)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/foo_library.cc b/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/foo_library.cc
deleted file mode 100644
index 8c90bfec5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/foo_library.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace trace = opentelemetry::trace;
-namespace nostd = opentelemetry::nostd;
-
-namespace
-{
-nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("foo_library");
-}
-
-void f1()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("f1"));
-}
-
-void f2()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("f2"));
-
-  f1();
-  f1();
-}
-}  // namespace
-
-void foo_library()
-{
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("library"));
-
-  f2();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/foo_library.h b/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/foo_library.h
deleted file mode 100644
index daebb2603..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/foo_library/foo_library.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-void foo_library();
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/BUILD
deleted file mode 100644
index 3dc0ae9fb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "common_logs_foo_library",
-    srcs = [
-        "foo_library.cc",
-    ],
-    hdrs = [
-        "foo_library.h",
-    ],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/CMakeLists.txt
deleted file mode 100644
index af6207ca9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(common_logs_foo_library foo_library.h foo_library.cc)
-
-set_target_version(common_logs_foo_library)
-
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  target_compile_definitions(common_logs_foo_library
-                             PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-endif()
-
-target_include_directories(common_logs_foo_library
-                           PUBLIC $<BUILD_INTERFACE:${EXAMPLES_COMMON_DIR}>)
-
-target_link_libraries(common_logs_foo_library PUBLIC opentelemetry-cpp::api)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/foo_library.cc b/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/foo_library.cc
deleted file mode 100644
index caf1cf73d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/foo_library.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace logs  = opentelemetry::logs;
-namespace trace = opentelemetry::trace;
-
-namespace
-{
-opentelemetry::nostd::shared_ptr<trace::Tracer> get_tracer()
-{
-  auto provider = trace::Provider::GetTracerProvider();
-  return provider->GetTracer("foo_library");
-}
-
-opentelemetry::nostd::shared_ptr<logs::Logger> get_logger()
-{
-  auto provider = logs::Provider::GetLoggerProvider();
-  return provider->GetLogger("foo_library_logger", "foo_library");
-}
-}  // namespace
-
-void foo_library()
-{
-  auto span        = get_tracer()->StartSpan("span 1");
-  auto scoped_span = trace::Scope(get_tracer()->StartSpan("foo_library"));
-  auto ctx         = span->GetContext();
-  auto logger      = get_logger();
-
-  logger->Debug("body", ctx.trace_id(), ctx.span_id(), ctx.trace_flags());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/foo_library.h b/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/foo_library.h
deleted file mode 100644
index daebb2603..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/logs_foo_library/foo_library.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-void foo_library();
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/BUILD
deleted file mode 100644
index 55ab0154d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/BUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "common_metrics_foo_library",
-    srcs = [
-        "foo_library.cc",
-    ],
-    hdrs = [
-        "foo_library.h",
-    ],
-    defines = ["BAZEL_BUILD"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/metrics",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/CMakeLists.txt
deleted file mode 100644
index 64a4b53ac..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(common_metrics_foo_library foo_library.h foo_library.cc)
-
-set_target_version(common_metrics_foo_library)
-
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  target_compile_definitions(common_metrics_foo_library
-                             PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-endif()
-
-target_include_directories(common_metrics_foo_library
-                           PUBLIC $<BUILD_INTERFACE:${EXAMPLES_COMMON_DIR}>)
-
-target_link_libraries(common_metrics_foo_library PUBLIC opentelemetry-cpp::api)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/foo_library.cc b/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/foo_library.cc
deleted file mode 100644
index 5f1fb8677..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/foo_library.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <chrono>
-#include <cmath>
-#include <map>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "foo_library.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/semconv/http_metrics.h"
-#include "opentelemetry/semconv/incubating/container_metrics.h"
-#include "opentelemetry/semconv/incubating/system_metrics.h"
-
-namespace metrics_api = opentelemetry::metrics;
-
-namespace
-{
-
-static opentelemetry::nostd::shared_ptr<metrics_api::ObservableInstrument>
-    double_observable_counter;
-
-std::map<std::string, std::string> get_random_attr()
-{
-  const std::vector<std::pair<std::string, std::string>> labels = {{"key1", "value1"},
-                                                                   {"key2", "value2"},
-                                                                   {"key3", "value3"},
-                                                                   {"key4", "value4"},
-                                                                   {"key5", "value5"}};
-  return std::map<std::string, std::string>{labels[rand() % (labels.size() - 1)],
-                                            labels[rand() % (labels.size() - 1)]};
-}
-
-class MeasurementFetcher
-{
-public:
-  static void Fetcher(opentelemetry::metrics::ObserverResult observer_result, void * /* state */)
-  {
-    if (opentelemetry::nostd::holds_alternative<
-            opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(
-            observer_result))
-    {
-      double random_incr = (rand() % 5) + 1.1;
-      value_ += random_incr;
-      std::map<std::string, std::string> labels = get_random_attr();
-      opentelemetry::nostd::get<
-          opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(
-          observer_result)
-          ->Observe(value_, labels);
-    }
-  }
-  static double value_;
-};
-double MeasurementFetcher::value_ = 0.0;
-}  // namespace
-
-void foo_library::counter_example(const std::string &name)
-{
-  std::string counter_name = name + "_counter";
-  auto provider            = metrics_api::Provider::GetMeterProvider();
-  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
-  auto double_counter = meter->CreateDoubleCounter(counter_name);
-
-  for (uint32_t i = 0; i < 20; ++i)
-  {
-    double val = (rand() % 700) + 1.1;
-    double_counter->Add(val);
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-  }
-}
-
-void foo_library::observable_counter_example(const std::string &name)
-{
-  std::string counter_name = name + "_observable_counter";
-  auto provider            = metrics_api::Provider::GetMeterProvider();
-  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
-  double_observable_counter = meter->CreateDoubleObservableCounter(counter_name);
-  double_observable_counter->AddCallback(MeasurementFetcher::Fetcher, nullptr);
-  for (uint32_t i = 0; i < 20; ++i)
-  {
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-  }
-}
-
-void foo_library::histogram_example(const std::string &name)
-{
-  std::string histogram_name = name + "_histogram";
-  auto provider              = metrics_api::Provider::GetMeterProvider();
-  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
-  auto histogram_counter = meter->CreateDoubleHistogram(histogram_name, "des", "histogram-unit");
-  auto context           = opentelemetry::context::Context{};
-  for (uint32_t i = 0; i < 20; ++i)
-  {
-    double val                                = (rand() % 700) + 1.1;
-    std::map<std::string, std::string> labels = get_random_attr();
-    auto labelkv = opentelemetry::common::KeyValueIterableView<decltype(labels)>{labels};
-    histogram_counter->Record(val, labelkv, context);
-    std::this_thread::sleep_for(std::chrono::milliseconds(250));
-  }
-}
-
-void foo_library::histogram_exp_example(const std::string &name)
-{
-  std::string histogram_name = name + "_exponential_histogram";
-  auto provider              = metrics_api::Provider::GetMeterProvider();
-  auto meter                 = provider->GetMeter(name, "1.2.0");
-  auto histogram_counter = meter->CreateDoubleHistogram(histogram_name, "des", "histogram-unit");
-  auto context           = opentelemetry::context::Context{};
-  for (uint32_t i = 0; i < 20; ++i)
-  {
-    double val                                = (rand() % 700) + 1.1;
-    std::map<std::string, std::string> labels = get_random_attr();
-    auto labelkv = opentelemetry::common::KeyValueIterableView<decltype(labels)>{labels};
-    histogram_counter->Record(val, labelkv, context);
-    std::this_thread::sleep_for(std::chrono::milliseconds(250));
-  }
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-void foo_library::gauge_example(const std::string &name)
-{
-  std::string gauge_name = name + "_gauge";
-  auto provider          = metrics_api::Provider::GetMeterProvider();
-  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter(name, "1.2.0");
-  auto gauge   = meter->CreateInt64Gauge(gauge_name, "des", "unit");
-  auto context = opentelemetry::context::Context{};
-  for (uint32_t i = 0; i < 20; ++i)
-  {
-    int64_t val                               = (rand() % 100) + 100;
-    std::map<std::string, std::string> labels = get_random_attr();
-    auto labelkv = opentelemetry::common::KeyValueIterableView<decltype(labels)>{labels};
-    gauge->Record(val, labelkv, context);
-    std::this_thread::sleep_for(std::chrono::milliseconds(250));
-  }
-}
-#endif
-
-void foo_library::semconv_counter_example()
-{
-  auto provider = metrics_api::Provider::GetMeterProvider();
-  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter("demo", "1.2.0");
-  auto double_counter =
-      opentelemetry::semconv::container::CreateSyncDoubleMetricContainerDiskIo(meter.get());
-
-  for (uint32_t i = 0; i < 20; ++i)
-  {
-    double val = (rand() % 700) + 1.1;
-    double_counter->Add(val);
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-  }
-}
-
-void foo_library::semconv_observable_counter_example()
-{
-  auto provider = metrics_api::Provider::GetMeterProvider();
-  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter("demo", "1.2.0");
-  double_observable_counter =
-      opentelemetry::semconv::system::CreateAsyncDoubleMetricSystemCpuTime(meter.get());
-  double_observable_counter->AddCallback(MeasurementFetcher::Fetcher, nullptr);
-  for (uint32_t i = 0; i < 20; ++i)
-  {
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-  }
-}
-
-void foo_library::semconv_histogram_example()
-{
-  auto provider = metrics_api::Provider::GetMeterProvider();
-  opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter("demo", "1.2.0");
-  auto histogram_counter =
-      opentelemetry::semconv::http::CreateSyncInt64MetricHttpClientRequestDuration(meter.get());
-  auto context = opentelemetry::context::Context{};
-  for (uint32_t i = 0; i < 20; ++i)
-  {
-    double val                                = (rand() % 700) + 1.1;
-    uint64_t int_val                          = std::llround(val);
-    std::map<std::string, std::string> labels = get_random_attr();
-    auto labelkv = opentelemetry::common::KeyValueIterableView<decltype(labels)>{labels};
-    histogram_counter->Record(int_val, labelkv, context);
-    std::this_thread::sleep_for(std::chrono::milliseconds(250));
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/foo_library.h b/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/foo_library.h
deleted file mode 100644
index d157a78f2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/common/metrics_foo_library/foo_library.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-
-class foo_library
-{
-public:
-  static void counter_example(const std::string &name);
-  static void histogram_example(const std::string &name);
-  static void histogram_exp_example(const std::string &name);
-  static void observable_counter_example(const std::string &name);
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  static void gauge_example(const std::string &name);
-#endif
-  static void semconv_counter_example();
-  static void semconv_histogram_example();
-  static void semconv_observable_counter_example();
-};
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/BUILD
deleted file mode 100644
index edb60080e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_etw_threads",
-    srcs = [
-        "main.cc",
-    ],
-    tags = [
-        "etw",
-        "examples",
-    ],
-    target_compatible_with = ["@platforms//os:windows"],
-    deps = [
-        "//api",
-        "//exporters/etw:etw_exporter",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/CMakeLists.txt
deleted file mode 100644
index bcc88350e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-project(etw_threadpool)
-
-add_executable(etw_threadpool main.cc)
-
-target_link_libraries(
-  etw_threadpool PRIVATE Threads::Threads opentelemetry-cpp::api
-                         opentelemetry-cpp::etw_exporter)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/README.md b/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/README.md
deleted file mode 100644
index a004a9f55..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# ETW Exporter multithreaded context propagation example
-
-## Preface
-
-This example shows how to pass context from main dispatcher thread to worker threads.
-While this example is convenient to run in Visual Studio with ETW exporter, the same
-logic should apply to any other exporter. Only the initial portion that obtains ETW
-Tracer is unique to ETW, the rest can be reused.
-
-## How to debug events in Visual Studio 2019 or newer
-
-Specify your component instrumentation name, which should match the destination ETW
-Provider Name or GUID. Example uses "OpenTelemetry-ETW-TLD" for the instrument /
-instrumentation name.
-
-In Visual Studio IDE:
-
-- navigate to `View -> Other Windows -> Diagnostic Events...`
-- click `Configure...` gear on top.
-- specify `OpenTelemetry-ETW-TLD` in the list of providers to monitor.
-- run example.
-- `Diagnostic Events` view shows you the event flow in realtime.
-
-## Explanation of the code flow
-
-`main` function acts as a dispatcher to manage thread pool called `pool`. `beep_bop`
-span is started in the `main`. Then in a loop up to `kMaxThreads` get started
-concurrently. Each thread executing `beep` function with a parent scope of `main`.
-`beep` subsequently calls into `bop` function, with a parent scope of `beep` span.
-Entire execution of all threads is grouped under the main span called `beep_bop`.
-At the end of execution, the `main` function joins all pending threads and ends
-the main span.
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/main.cc
deleted file mode 100644
index e5b8dbac9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/etw_threads/main.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Include common Trace Provider API and processor
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/trace/provider.h"
-
-#include "opentelemetry/exporters/etw/etw_tracer_exporter.h"
-
-#include <iostream>
-#include <thread>
-
-#include <cstdio>
-#ifndef LOG_DEBUG
-#  include <mutex>
-
-/**
- * @brief Thread-safe logger routine.
- * @param format
- * @param args
- * @return
- */
-static inline int log_vprintf(const char *format, va_list args)
-{
-  static std::mutex cout_mutex;
-  std::lock_guard<std::mutex> lk(cout_mutex);
-  return vprintf(format, args);
-};
-
-/**
- * @brief Thread-safe logger routine.
- * @param format
- * @param
- * @return
- */
-static inline int log_printf(const char *format, ...)
-{
-  int result;
-  va_list ap;
-  va_start(ap, format);
-  result = log_vprintf(format, ap);
-  va_end(ap);
-  return result;
-};
-
-// Debug macros
-#  define LOG_DEBUG(fmt_, ...) log_printf(" " fmt_ "\n", ##__VA_ARGS__)
-#  define LOG_TRACE(fmt_, ...) log_printf(" " fmt_ "\n", ##__VA_ARGS__)
-#  define LOG_INFO(fmt_, ...) log_printf(" " fmt_ "\n", ##__VA_ARGS__)
-#  define LOG_WARN(fmt_, ...) log_printf(" " fmt_ "\n", ##__VA_ARGS__)
-#  define LOG_ERROR(fmt_, ...) log_printf(" " fmt_ "\n", ##__VA_ARGS__)
-#endif
-
-using namespace OPENTELEMETRY_NAMESPACE;
-
-using namespace opentelemetry::exporter::etw;
-
-// Specify destination ETW Provider Name or GUID.
-//
-// In Visual Studio:
-// - View -> Other Windows -> Diagnostic Events...
-// - Click Configure (gear on top).
-// - Specify "OpenTelemetry-ETW-TLD" in the list of providers.
-//
-// Event view shows event flow in realtime.
-const char *kGlobalProviderName = "OpenTelemetry-ETW-TLD";
-
-std::string providerName = kGlobalProviderName;
-
-// One provider can be used to associate with different destinations.
-exporter::etw::TracerProvider provider;
-
-// Code below is generic and may be reused with any other TracerProvider.
-// In ETW provider case - instrumentation name must match destination
-// ETW provider name.
-nostd::shared_ptr<trace::Tracer> tracer = provider.GetTracer(providerName, "1.0");
-
-// Obtain numeric thread id
-static inline uint64_t gettid()
-{
-  std::stringstream ss;
-  ss << std::this_thread::get_id();
-  uint64_t id = std::stoull(ss.str());
-  return id;
-}
-
-// bop gets called by beep.
-void bop()
-{
-  LOG_TRACE("bop worker tid=%u", gettid());
-  auto span = tracer->StartSpan("bop");
-  span->AddEvent("BopEvent", {{"tid", gettid()}});
-  span->SetAttribute("attrib", 2);
-  span->End();
-}
-
-// beep gets called in its own thread.
-// It is running in a thread pool, invoked via lambda by dispatcher.
-void beep()
-{
-  LOG_TRACE("beep worker tid=%u", gettid());
-  auto span = tracer->StartSpan("beep");
-  span->AddEvent("BeepEvent", {{"tid", gettid()}});
-  span->SetAttribute("attrib", 1);
-  {
-    auto bopScope = tracer->WithActiveSpan(span);
-    bop();
-  }
-  span->End();
-}
-
-// Max number of threads to spawn
-constexpr int kMaxThreads = 10;
-
-int main(int /*arc*/, char ** /*argv*/)
-{
-  std::thread pool[kMaxThreads];
-
-  // Main dispatcher span: parent of all child thread spans.
-  auto mainSpan = tracer->StartSpan("beep_bop");
-  mainSpan->SetAttribute("attrib", 0);
-
-  // Start several threads to perform beep-bop actions.
-  LOG_TRACE("beep-boop dispatcher tid=%u", gettid());
-  for (auto i = 0; i < kMaxThreads; i++)
-  {
-    pool[i] = std::thread([&]() {
-      // This code runs in its own worker thread.
-      auto beepScope = tracer->WithActiveSpan(mainSpan);
-      // call beep -> bop
-      beep();
-    });
-  };
-
-  // Join all worker threads in the pool
-  for (auto &th : pool)
-  {
-    try
-    {
-      if (th.joinable())
-        th.join();
-    }
-    catch (...)
-    {
-      // thread might have been gracefully terminated already
-    }
-  }
-
-  // End span
-  mainSpan->End();
-
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/grpc/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/grpc/BUILD
deleted file mode 100644
index 5fe8898ac..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/grpc/BUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-
-package(default_visibility = ["//visibility:public"])
-
-proto_library(
-    name = "messages_proto",
-    srcs = ["protos/messages.proto"],
-)
-
-cc_proto_library(
-    name = "messages_cc_proto",
-    deps = [":messages_proto"],
-)
-
-cc_grpc_library(
-    name = "messages_cc_grpc",
-    srcs = [":messages_proto"],
-    grpc_only = True,
-    deps = [":messages_cc_proto"],
-)
-
-cc_library(
-    name = "tracer_common",
-    srcs = ["tracer_common.h"],
-    defines = ["BAZEL_BUILD"],
-    tags = ["ostream"],
-    deps = [
-        "//exporters/ostream:ostream_span_exporter",
-    ],
-)
-
-cc_binary(
-    name = "client_grpc",
-    srcs = [
-        "client.cc",
-    ],
-    defines = ["BAZEL_BUILD"],
-    tags = ["ostream"],
-    deps = [
-        "messages_cc_grpc",
-        ":tracer_common",
-        "//api",
-        "//sdk/src/trace",
-        "@com_github_grpc_grpc//:grpc++",
-    ],
-)
-
-cc_binary(
-    name = "server_grpc",
-    srcs = [
-        "server.cc",
-    ],
-    defines = ["BAZEL_BUILD"],
-    tags = ["ostream"],
-    deps = [
-        "messages_cc_grpc",
-        ":tracer_common",
-        "//api",
-        "//sdk/src/trace",
-        "@com_github_grpc_grpc//:grpc++",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/grpc/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/grpc/CMakeLists.txt
deleted file mode 100644
index 20d35f3c5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/grpc/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Proto file
-get_filename_component(proto_file "./protos/messages.proto" ABSOLUTE)
-get_filename_component(proto_file_path "${proto_file}" PATH)
-
-message(STATUS "PATH:${proto_file_path}:${proto_file}")
-# Generated sources
-set(example_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/messages.pb.cc")
-set(example_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/messages.pb.h")
-set(example_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/messages.grpc.pb.cc")
-set(example_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/messages.grpc.pb.h")
-
-add_custom_command(
-  OUTPUT "${example_proto_srcs}" "${example_proto_hdrs}" "${example_grpc_srcs}"
-         "${example_grpc_hdrs}"
-  COMMAND
-    ${PROTOBUF_PROTOC_EXECUTABLE} ARGS "--grpc_out=${CMAKE_CURRENT_BINARY_DIR}"
-    "--cpp_out=${CMAKE_CURRENT_BINARY_DIR}" "--proto_path=${proto_file_path}"
-    "--plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN_EXECUTABLE}" "${proto_file}")
-
-add_library(example_grpc_proto ${example_grpc_srcs} ${example_grpc_hdrs}
-                               ${example_proto_srcs} ${example_proto_hdrs})
-
-patch_protobuf_targets(example_grpc_proto)
-
-# Disable include-what-you-use on generated code.
-set_target_properties(example_grpc_proto PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "")
-
-target_include_directories(
-  example_grpc_proto PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
-
-if(TARGET protobuf::libprotobuf)
-  target_link_libraries(example_grpc_proto PUBLIC gRPC::grpc++
-                                                  protobuf::libprotobuf)
-else()
-  target_include_directories(example_grpc_proto PUBLIC ${Protobuf_INCLUDE_DIRS})
-  target_link_libraries(example_grpc_proto PUBLIC gRPC::grpc++
-                                                  ${Protobuf_LIBRARIES})
-endif()
-
-foreach(_target client server)
-  add_executable(${_target} "${_target}.cc")
-  target_link_libraries(
-    ${_target} PRIVATE example_grpc_proto
-                       opentelemetry-cpp::ostream_span_exporter)
-  patch_protobuf_targets(${_target})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/grpc/README.md b/ext/opentelemetry-cpp-1.21.0/examples/grpc/README.md
deleted file mode 100644
index 0b7296323..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/grpc/README.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# OpenTelemetry C++  Example
-
-## gRPC
-
-This is a simple example that demonstrates tracing a gRPC request from client to
-server. There is an experimental directory in this example - the code within has
-been commented out to prevent any conflicts. The example shows several aspects
-of tracing such as:
-
-* Using the `TracerProvider`
-* Implementing the TextMapCarrier
-* Context injection/extraction
-* Span Attributes
-* Span Semantic Conventions
-* Using the ostream exporter
-* Nested spans
-* W3c Trace Context Propagation (Very soon!)
-
-### Running the example
-
-1. The example uses gRPC C++ as well as Google's protocol buffers. Make sure you
-   have installed both of these packages on your system, in such a way that
-   CMake would know how to find them with this command:
-
-    ``find_package(gRPC)``
-
-2. Build and Deploy the opentelemetry-cpp as described in
-   [INSTALL.md](../../INSTALL.md). Building the project will build all of the
-   examples and create new folders containing their executables within the
-   'build' directory NOT the 'examples' directory.
-
-3. Start the server from your `build/examples/grpc` directory. Both the server
-   and client are configured to use 8800 as the default port, but if you would
-   like to use another port, you can specify that as an argument.
-
-   ```console
-   $ ./server [port_num]
-    Server listening on port: 0.0.0.0:8800
-   ```
-
-4. In a separate terminal window, run the client to make a single request:
-
-    ```console
-    $ ./client [port_num]
-    ...
-    ```
-
-5. You should see console exporter output for both the client and server
-   sessions.
-   * Client console
-
-   ```console
-   {
-        name          : GreeterClient/Greet
-        trace_id      : f5d16f8399be0d2c6b39d992634ffdbb
-        span_id       : 9c79a2dd744d7d2d
-        tracestate    :
-        parent_span_id: 0000000000000000
-        start         : 1622603339918985700
-        duration      : 4960500
-        description   :
-        span kind     : Client
-        status        : Ok
-        attributes    :
-            rpc.grpc.status_code: 0
-            net.peer.port: 8080
-            net.peer.ip: 0.0.0.0
-            rpc.method: Greet
-            rpc.service: grpc-example.GreetService
-            rpc.system: grpc
-        events        :
-   }
-   ```
-
-   * Server console
-
-   ```console
-   {
-        name          : GreeterService/Greet
-        trace_id      : f5d16f8399be0d2c6b39d992634ffdbb
-        span_id       : 1e8a7d2d46e08573
-        tracestate    :
-        parent_span_id: 9c79a2dd744d7d2d
-        start         : 1622603339923163800
-        duration      : 76400
-        description   :
-        span kind     : Server
-        status        : Ok
-        attributes    :
-            rpc.grpc.status_code: 0
-            rpc.method: Greet
-            rpc.service: GreeterService
-            rpc.system: grpc
-        events        :
-            {
-                name          : Processing client attributes
-                timestamp     : 1622603339923180800
-                attributes    :
-            }
-            {
-                name          : Response sent to client
-                timestamp     : 1622603339923233700
-                attributes    :
-            }
-        links         :
-    }
-   ```
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/grpc/client.cc b/ext/opentelemetry-cpp-1.21.0/examples/grpc/client.cc
deleted file mode 100644
index ab11d8604..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/grpc/client.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Make sure to include GRPC headers first because otherwise Abseil may create
-// ambiguity with `nostd::variant` if compiled with Visual Studio 2015. Other
-// modern compilers are unaffected.
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/status.h>
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <iostream>
-#include <string>
-#include <utility>
-#include "opentelemetry/context/propagation/global_propagator.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/propagation/http_trace_context.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/tracer.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/grpc/protos/messages.grpc.pb.h"
-#  include "examples/grpc/protos/messages.pb.h"
-#else
-#  include "messages.grpc.pb.h"
-#  include "messages.pb.h"
-#endif
-
-#include "opentelemetry/semconv/incubating/rpc_attributes.h"
-#include "opentelemetry/semconv/network_attributes.h"
-#include "tracer_common.h"
-
-using grpc::Channel;
-using grpc::ClientContext;
-using grpc::Status;
-
-using grpc_example::Greeter;
-using grpc_example::GreetRequest;
-using grpc_example::GreetResponse;
-
-namespace
-{
-namespace context = opentelemetry::context;
-namespace semconv = opentelemetry::semconv;
-using namespace opentelemetry::trace;
-class GreeterClient
-{
-public:
-  GreeterClient(const std::shared_ptr<Channel> &channel) : stub_(Greeter::NewStub(channel)) {}
-
-  std::string Greet(std::string ip, uint16_t port)
-  {
-    // Build gRPC Context objects and protobuf message containers
-    GreetRequest request;
-    GreetResponse response;
-    ClientContext context;
-    request.set_request("Nice to meet you!");
-
-    StartSpanOptions options;
-    options.kind = SpanKind::kClient;
-
-    std::string span_name = "GreeterClient/Greet";
-    auto span =
-        get_tracer("grpc")->StartSpan(span_name,
-                                      {{semconv::rpc::kRpcSystem, "grpc"},
-                                       {semconv::rpc::kRpcService, "grpc-example.GreetService"},
-                                       {semconv::rpc::kRpcMethod, "Greet"},
-                                       {semconv::network::kNetworkPeerAddress, ip},
-                                       {semconv::network::kNetworkPeerPort, port}},
-                                      options);
-
-    auto scope = get_tracer("grpc-client")->WithActiveSpan(span);
-
-    // inject current context to grpc metadata
-    auto current_ctx = context::RuntimeContext::GetCurrent();
-    GrpcClientCarrier carrier(&context);
-    auto prop = context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-    prop->Inject(carrier, current_ctx);
-
-    // Send request to server
-    Status status = stub_->Greet(&context, request, &response);
-    if (status.ok())
-    {
-      span->SetStatus(StatusCode::kOk);
-      span->SetAttribute(semconv::rpc::kRpcGrpcStatusCode, status.error_code());
-      // Make sure to end your spans!
-      span->End();
-      return response.response();
-    }
-    else
-    {
-      std::cout << status.error_code() << ": " << status.error_message() << '\n';
-      span->SetStatus(StatusCode::kError);
-      span->SetAttribute(semconv::rpc::kRpcGrpcStatusCode, status.error_code());
-      // Make sure to end your spans!
-      span->End();
-      return "RPC failed";
-    }
-  }
-
-private:
-  std::unique_ptr<Greeter::Stub> stub_;
-};  // GreeterClient class
-
-void RunClient(uint16_t port)
-{
-  GreeterClient greeter(
-      grpc::CreateChannel("0.0.0.0:" + std::to_string(port), grpc::InsecureChannelCredentials()));
-  std::string response = greeter.Greet("0.0.0.0", port);
-  std::cout << "grpc_server says: " << response << '\n';
-}
-}  // namespace
-
-int main(int argc, char **argv)
-{
-  InitTracer();
-  // set global propagator
-  context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
-      opentelemetry::nostd::shared_ptr<context::propagation::TextMapPropagator>(
-          new propagation::HttpTraceContext()));
-  constexpr uint16_t default_port = 8800;
-  uint16_t port;
-  if (argc > 1)
-  {
-    port = atoi(argv[1]);
-  }
-  else
-  {
-    port = default_port;
-  }
-  RunClient(port);
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/grpc/protos/messages.proto b/ext/opentelemetry-cpp-1.21.0/examples/grpc/protos/messages.proto
deleted file mode 100644
index ccab03cd6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/grpc/protos/messages.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-syntax = "proto3";
-
-package grpc_example;
-
-service Greeter {
-    rpc Greet(GreetRequest) returns (GreetResponse) {}
-}
-
-message GreetRequest {
-    string request = 1;
-}
-
-message GreetResponse {
-    string response = 1;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/grpc/server.cc b/ext/opentelemetry-cpp-1.21.0/examples/grpc/server.cc
deleted file mode 100644
index 1c23b27a0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/grpc/server.cc
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/string_ref.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <iostream>
-#include <map>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/context/propagation/global_propagator.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/semconv/incubating/rpc_attributes.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/tracer.h"
-#include "tracer_common.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/grpc/protos/messages.grpc.pb.h"
-#  include "examples/grpc/protos/messages.pb.h"
-#else
-#  include "messages.grpc.pb.h"
-#  include "messages.pb.h"
-#endif
-
-using grpc::Server;
-using grpc::ServerBuilder;
-using grpc::ServerContext;
-using grpc::Status;
-
-using grpc_example::Greeter;
-using grpc_example::GreetRequest;
-using grpc_example::GreetResponse;
-
-using Span        = opentelemetry::trace::Span;
-using SpanContext = opentelemetry::trace::SpanContext;
-using namespace opentelemetry::trace;
-
-namespace context = opentelemetry::context;
-namespace semconv = opentelemetry::semconv;
-
-namespace
-{
-class GreeterServer final : public Greeter::Service
-{
-public:
-  Status Greet(ServerContext *context,
-               const GreetRequest *request,
-               GreetResponse *response) override
-  {
-    for (const auto &elem : context->client_metadata())
-    {
-      std::cout << "ELEM: " << elem.first << " " << elem.second << "\n";
-    }
-
-    // Create a SpanOptions object and set the kind to Server to inform OpenTel.
-    StartSpanOptions options;
-    options.kind = SpanKind::kServer;
-
-    // extract context from grpc metadata
-    GrpcServerCarrier carrier(context);
-
-    auto prop        = context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-    auto current_ctx = context::RuntimeContext::GetCurrent();
-    auto new_context = prop->Extract(carrier, current_ctx);
-    options.parent   = GetSpan(new_context)->GetContext();
-
-    std::string span_name = "GreeterService/Greet";
-    auto span             = get_tracer("grpc")->StartSpan(span_name,
-                                                          {{semconv::rpc::kRpcSystem, "grpc"},
-                                                           {semconv::rpc::kRpcService, "GreeterService"},
-                                                           {semconv::rpc::kRpcMethod, "Greet"},
-                                                           {semconv::rpc::kRpcGrpcStatusCode, 0}},
-                                                          options);
-    auto scope            = get_tracer("grpc")->WithActiveSpan(span);
-
-    // Fetch and parse whatever HTTP headers we can from the gRPC request.
-    span->AddEvent("Processing client attributes");
-
-    const std::string &req = request->request();
-    std::cout << '\n' << "grpc_client says: " << req << '\n';
-    std::string message = "The pleasure is mine.";
-    // Send response to client
-    response->set_response(message);
-    span->AddEvent("Response sent to client");
-
-    span->SetStatus(StatusCode::kOk);
-    // Make sure to end your spans!
-    span->End();
-    return Status::OK;
-  }
-};  // GreeterServer class
-
-void RunServer(uint16_t port)
-{
-  std::string address("0.0.0.0:" + std::to_string(port));
-  GreeterServer service;
-  ServerBuilder builder;
-
-  builder.RegisterService(&service);
-  builder.AddListeningPort(address, grpc::InsecureServerCredentials());
-
-  std::unique_ptr<Server> server(builder.BuildAndStart());
-  std::cout << "Server listening on port: " << address << '\n';
-  server->Wait();
-  server->Shutdown();
-}
-}  // namespace
-
-int main(int argc, char **argv)
-{
-  InitTracer();
-  constexpr uint16_t default_port = 8800;
-  uint16_t port;
-  if (argc > 1)
-  {
-    port = atoi(argv[1]);
-  }
-  else
-  {
-    port = default_port;
-  }
-
-  RunServer(port);
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/grpc/tracer_common.h b/ext/opentelemetry-cpp-1.21.0/examples/grpc/tracer_common.h
deleted file mode 100644
index cb9940a71..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/grpc/tracer_common.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/propagation/global_propagator.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_context_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/propagation/http_trace_context.h"
-#include "opentelemetry/trace/provider.h"
-
-#include <grpcpp/grpcpp.h>
-#include <cstring>
-#include <iostream>
-#include <vector>
-
-using grpc::ClientContext;
-using grpc::ServerContext;
-
-namespace
-{
-class GrpcClientCarrier : public opentelemetry::context::propagation::TextMapCarrier
-{
-public:
-  GrpcClientCarrier(ClientContext *context) : context_(context) {}
-  GrpcClientCarrier() = default;
-  virtual opentelemetry::nostd::string_view Get(
-      opentelemetry::nostd::string_view /* key */) const noexcept override
-  {
-    return "";
-  }
-
-  virtual void Set(opentelemetry::nostd::string_view key,
-                   opentelemetry::nostd::string_view value) noexcept override
-  {
-    std::cout << " Client ::: Adding " << key << " " << value << "\n";
-    context_->AddMetadata(std::string(key), std::string(value));
-  }
-
-  ClientContext *context_ = nullptr;
-};
-
-class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCarrier
-{
-public:
-  GrpcServerCarrier(ServerContext *context) : context_(context) {}
-  GrpcServerCarrier() = default;
-  virtual opentelemetry::nostd::string_view Get(
-      opentelemetry::nostd::string_view key) const noexcept override
-  {
-    auto it = context_->client_metadata().find({key.data(), key.size()});
-    if (it != context_->client_metadata().end())
-    {
-      return opentelemetry::nostd::string_view(it->second.data(), it->second.size());
-    }
-    return "";
-  }
-
-  virtual void Set(opentelemetry::nostd::string_view /* key */,
-                   opentelemetry::nostd::string_view /* value */) noexcept override
-  {
-    // Not required for server
-  }
-
-  ServerContext *context_ = nullptr;
-};
-
-void InitTracer()
-{
-  auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
-  auto processor =
-      opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  std::vector<std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  // Default is an always-on sampler.
-  std::unique_ptr<opentelemetry::sdk::trace::TracerContext> context =
-      opentelemetry::sdk::trace::TracerContextFactory::Create(std::move(processors));
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
-      opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(context));
-  // Set the global trace provider
-  opentelemetry::sdk::trace::Provider::SetTracerProvider(provider);
-
-  // set global propagator
-  opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
-      opentelemetry::nostd::shared_ptr<opentelemetry::context::propagation::TextMapPropagator>(
-          new opentelemetry::trace::propagation::HttpTraceContext()));
-}
-
-void CleanupTracer()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  opentelemetry::sdk::trace::Provider::SetTracerProvider(none);
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(std::string tracer_name)
-{
-  auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-  return provider->GetTracer(tracer_name);
-}
-
-}  // namespace
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/http/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/http/BUILD
deleted file mode 100644
index 2737a8823..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/http/BUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_http_client",
-    srcs = [
-        "client.cc",
-        "tracer_common.h",
-    ],
-    linkopts = select({
-        "//bazel:windows": [
-            "-DEFAULTLIB:advapi32.lib",
-            "-DEFAULTLIB:crypt32.lib",
-            "-DEFAULTLIB:Normaliz.lib",
-        ],
-        "//conditions:default": [],
-    }),
-    tags = ["ostream"],
-    deps = [
-        "//api",
-        "//exporters/ostream:ostream_span_exporter",
-        "//ext:headers",
-        "//ext/src/http/client/curl:http_client_curl",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_binary(
-    name = "example_http_server",
-    srcs = [
-        "server.cc",
-        "server.h",
-        "tracer_common.h",
-    ],
-    tags = ["ostream"],
-    deps = [
-        "//api",
-        "//exporters/ostream:ostream_span_exporter",
-        "//ext:headers",
-        "//sdk/src/trace",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/http/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/http/CMakeLists.txt
deleted file mode 100644
index 693781f59..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/http/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(http_client client.cc)
-add_executable(http_server server.cc)
-
-target_link_libraries(
-  http_client
-  PRIVATE opentelemetry-cpp::trace opentelemetry-cpp::http_client_curl
-          opentelemetry-cpp::ostream_span_exporter ${CURL_LIBRARIES})
-
-target_link_libraries(
-  http_server
-  PRIVATE opentelemetry-cpp::trace opentelemetry-cpp::http_client_curl
-          opentelemetry-cpp::ostream_span_exporter)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/http/README.md b/ext/opentelemetry-cpp-1.21.0/examples/http/README.md
deleted file mode 100644
index a02acbe89..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/http/README.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# OpenTelemetry C++  Example
-
-## HTTP
-
-This is a simple example that demonstrates tracing an HTTP request from client
-to server. The example shows several aspects of tracing such as:
-
-* Using the `TracerProvider`
-* Using the `GlobalPropagator`
-* Span Attributes
-* Span Events
-* Using the ostream exporter
-* Nested spans (TBD)
-* W3C Trace Context Propagation
-
-### Running the example
-
-1. The example uses HTTP server and client provided as part of this repo:
-    * [HTTP
-      Client](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/ext/include/opentelemetry/ext/http/client)
-    * [HTTP
-      Server](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/ext/include/opentelemetry/ext/http/server)
-
-2. Build and Deploy the opentelemetry-cpp as described in
-   [INSTALL.md](../../INSTALL.md)
-
-3. Start the server from the `examples/http` directory
-
-   ```console
-   $ http_server 8800
-    Server is running..Press ctrl-c to exit...
-   ```
-
-4. In a separate terminal window, run the client to make a single request:
-
-    ```console
-    $ ./http_client 8800
-    ...
-    ...
-    ```
-
-5. You should see console exporter output for both the client and server
-   sessions.
-   * Client console
-
-   ```console
-
-   {
-     name          : /helloworld
-     trace_id      : baa922bc0da6f79d46373371f4416463
-     span_id       : 83bed4da7a01267d
-     tracestate    :
-     parent_span_id: 0000000000000000
-     start         : 1620287026111457000
-     duration      : 5164400
-     description   :
-     span kind     : Client
-     status        : Unset
-     attributes    :
-           http.header.Date: Thu, 06 May 2021 07:43:46 GMT
-           http.header.Content-Length: 0
-           http.status_code: 200
-           http.method: GET
-           http.header.Host: localhost
-           http.header.Content-Type: text/plain
-           http.header.Connection: keep-alive
-           http.scheme: http
-           http.url: h**p://localhost:8800/helloworld
-     events        :
-     links         :
-
-   }
-   ```
-
-   * Server console
-
-   ```console
-
-   {
-     name          : /helloworld
-     trace_id      : baa922bc0da6f79d46373371f4416463
-     span_id       : c3e7e23042eb670e
-     tracestate    :
-     parent_span_id: 83bed4da7a01267d
-     start         : 1620287026115443300
-     duration      : 50700
-     description   :
-     span kind     : Server
-     status        : Unset
-     attributes    :
-           http.header.Traceparent: 00-baa922bc0da6f79d46373371f4416463-83bed4da7a01267d-01
-           http.header.Accept: */*
-           http.request_content_length: 0
-           http.header.Host: localhost:8800
-           http.scheme: http
-           http.client_ip: 127.0.0.1:50792
-           http.method: GET
-           net.host.port: 8800
-           http.server_name: localhost
-     events        :
-           {
-             name          : Processing request
-             timestamp     : 1620287026115464000
-             attributes    :
-           }
-     links         :
-
-   }
-   ```
-
-   As seen from example above, `trace_id` and `parent_span_id` is propagated
-   from client to server.
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/http/client.cc b/ext/opentelemetry-cpp-1.21.0/examples/http/client.cc
deleted file mode 100644
index c89f496ab..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/http/client.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/semconv/http_attributes.h"
-#include "opentelemetry/semconv/url_attributes.h"
-#include "tracer_common.h"
-
-namespace
-{
-
-using namespace opentelemetry::trace;
-namespace http_client = opentelemetry::ext::http::client;
-namespace context     = opentelemetry::context;
-namespace nostd       = opentelemetry::nostd;
-namespace semconv     = opentelemetry::semconv;
-
-void sendRequest(const std::string &url)
-{
-  auto http_client = http_client::HttpClientFactory::CreateSync();
-
-  // start active span
-  StartSpanOptions options;
-  options.kind = SpanKind::kClient;  // client
-  opentelemetry::ext::http::common::UrlParser url_parser(url);
-
-  std::string span_name = url_parser.path_;
-  auto span             = get_tracer("http-client")
-                  ->StartSpan(span_name,
-                              {{semconv::url::kUrlFull, url_parser.url_},
-                               {semconv::url::kUrlScheme, url_parser.scheme_},
-                               {semconv::http::kHttpRequestMethod, "GET"}},
-                              options);
-  auto scope = get_tracer("http-client")->WithActiveSpan(span);
-
-  // inject current context into http header
-  auto current_ctx = context::RuntimeContext::GetCurrent();
-  HttpTextMapCarrier<http_client::Headers> carrier;
-  auto prop = context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-  prop->Inject(carrier, current_ctx);
-
-  // send http request
-  http_client::Result result = http_client->GetNoSsl(url, carrier.headers_);
-  if (result)
-  {
-    // set span attributes
-    auto status_code = result.GetResponse().GetStatusCode();
-    span->SetAttribute(semconv::http::kHttpResponseStatusCode, status_code);
-    result.GetResponse().ForEachHeader(
-        [&span](nostd::string_view header_name, nostd::string_view header_value) {
-          span->SetAttribute("http.header." + std::string(header_name.data()), header_value);
-          return true;
-        });
-
-    if (status_code >= 400)
-    {
-      span->SetStatus(StatusCode::kError);
-    }
-  }
-  else
-  {
-    span->SetStatus(
-        StatusCode::kError,
-        "Response Status :" +
-            std::to_string(
-                static_cast<typename std::underlying_type<http_client::SessionState>::type>(
-                    result.GetSessionState())));
-  }
-  // end span and export data
-  span->End();
-}
-
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  InitTracer();
-  constexpr char default_host[]   = "localhost";
-  constexpr char default_path[]   = "/helloworld";
-  constexpr uint16_t default_port = 8800;
-  uint16_t port;
-
-  // The port the validation service listens to can be specified via the command line.
-  if (argc > 1)
-  {
-    port = static_cast<uint16_t>(atoi(argv[1]));
-  }
-  else
-  {
-    port = default_port;
-  }
-
-  std::string url = "http://" + std::string(default_host) + ":" + std::to_string(port) +
-                    std::string(default_path);
-  sendRequest(url);
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/http/server.cc b/ext/opentelemetry-cpp-1.21.0/examples/http/server.cc
deleted file mode 100644
index 23b37d3ab..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/http/server.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "server.h"
-#include "opentelemetry/semconv/client_attributes.h"
-#include "opentelemetry/semconv/incubating/http_attributes.h"
-#include "opentelemetry/semconv/server_attributes.h"
-#include "opentelemetry/semconv/url_attributes.h"
-#include "opentelemetry/trace/context.h"
-#include "tracer_common.h"
-
-#include <iostream>
-#include <thread>
-
-namespace
-{
-
-using namespace opentelemetry::trace;
-namespace context = opentelemetry::context;
-namespace semconv = opentelemetry::semconv;
-
-uint16_t server_port              = 8800;
-constexpr const char *server_name = "localhost";
-
-class RequestHandler : public HTTP_SERVER_NS::HttpRequestCallback
-{
-public:
-  int onHttpRequest(HTTP_SERVER_NS::HttpRequest const &request,
-                    HTTP_SERVER_NS::HttpResponse &response) override
-  {
-    StartSpanOptions options;
-    options.kind          = SpanKind::kServer;  // server
-    std::string span_name = request.uri;
-
-    // extract context from http header
-    std::map<std::string, std::string> &request_headers =
-        const_cast<std::map<std::string, std::string> &>(request.headers);
-    const HttpTextMapCarrier<std::map<std::string, std::string>> carrier(request_headers);
-    auto prop        = context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-    auto current_ctx = context::RuntimeContext::GetCurrent();
-    auto new_context = prop->Extract(carrier, current_ctx);
-    options.parent   = GetSpan(new_context)->GetContext();
-
-    // start span with parent context extracted from http header
-    auto span = get_tracer("http-server")
-                    ->StartSpan(span_name,
-                                {{semconv::server::kServerAddress, server_name},
-                                 {semconv::server::kServerPort, server_port},
-                                 {semconv::http::kHttpRequestMethod, request.method},
-                                 {semconv::url::kUrlScheme, "http"},
-                                 {semconv::http::kHttpRequestBodySize,
-                                  static_cast<uint64_t>(request.content.length())},
-                                 {semconv::client::kClientAddress, request.client}},
-                                options);
-
-    auto scope = get_tracer("http_server")->WithActiveSpan(span);
-
-    for (auto &kv : request.headers)
-    {
-      span->SetAttribute("http.header." + std::string(kv.first.data()), kv.second);
-    }
-    if (request.uri == "/helloworld")
-    {
-      span->AddEvent("Processing request");
-      response.headers[HTTP_SERVER_NS::CONTENT_TYPE] = HTTP_SERVER_NS::CONTENT_TYPE_TEXT;
-      span->End();
-      return 200;
-    }
-    span->End();
-    return 404;
-  }
-};
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  InitTracer();
-
-  // The port the validation service listens to can be specified via the command line.
-  if (argc > 1)
-  {
-    server_port = static_cast<uint16_t>(atoi(argv[1]));
-  }
-
-  HttpServer http_server(server_name, server_port);
-  RequestHandler req_handler;
-  http_server.AddHandler("/helloworld", &req_handler);
-  auto root_span = get_tracer("http_server")->StartSpan(__func__);
-  Scope scope(root_span);
-  http_server.Start();
-  std::cout << "Server is running..Press ctrl-c to exit...\n";
-  while (1)
-  {
-    std::this_thread::sleep_for(std::chrono::seconds(100));
-  }
-  http_server.Stop();
-  root_span->End();
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/http/server.h b/ext/opentelemetry-cpp-1.21.0/examples/http/server.h
deleted file mode 100644
index 5691a6e46..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/http/server.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-#include <atomic>
-#include <string>
-#include "opentelemetry/ext/http/server/http_server.h"
-
-namespace
-{
-
-class HttpServer : public HTTP_SERVER_NS::HttpRequestCallback
-{
-
-protected:
-  HTTP_SERVER_NS::HttpServer server_;
-  std::string server_url_;
-  uint16_t port_;
-  std::atomic<bool> is_running_{false};
-
-public:
-  HttpServer(const std::string &server_name = "test_server", uint16_t port = 8800) : port_(port)
-  {
-    server_.setServerName(server_name);
-    server_.setKeepalive(false);
-  }
-
-  void AddHandler(const std::string &path, HTTP_SERVER_NS::HttpRequestCallback *request_handler)
-  {
-    server_.addHandler(path, *request_handler);
-  }
-
-  void Start()
-  {
-    if (!is_running_.exchange(true))
-    {
-      server_.addListeningPort(port_);
-      server_.start();
-    }
-  }
-
-  void Stop()
-  {
-    if (is_running_.exchange(false))
-    {
-      server_.stop();
-    }
-  }
-
-  ~HttpServer() { Stop(); }
-};
-
-}  // namespace
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/http/tracer_common.h b/ext/opentelemetry-cpp-1.21.0/examples/http/tracer_common.h
deleted file mode 100644
index d94a754d5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/http/tracer_common.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstring>
-#include <iostream>
-#include <vector>
-
-#include "opentelemetry/context/propagation/global_propagator.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_context_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/propagation/http_trace_context.h"
-#include "opentelemetry/trace/provider.h"
-
-namespace
-{
-
-template <typename T>
-class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCarrier
-{
-public:
-  HttpTextMapCarrier(T &headers) : headers_(headers) {}
-  HttpTextMapCarrier() = default;
-  virtual opentelemetry::nostd::string_view Get(
-      opentelemetry::nostd::string_view key) const noexcept override
-  {
-    std::string key_to_compare = key.data();
-    // Header's first letter seems to be  automatically capitaliazed by our test http-server, so
-    // compare accordingly.
-    if (key == opentelemetry::trace::propagation::kTraceParent)
-    {
-      key_to_compare = "Traceparent";
-    }
-    else if (key == opentelemetry::trace::propagation::kTraceState)
-    {
-      key_to_compare = "Tracestate";
-    }
-    auto it = headers_.find(key_to_compare);
-    if (it != headers_.end())
-    {
-      return it->second;
-    }
-    return "";
-  }
-
-  virtual void Set(opentelemetry::nostd::string_view key,
-                   opentelemetry::nostd::string_view value) noexcept override
-  {
-    headers_.insert(std::pair<std::string, std::string>(std::string(key), std::string(value)));
-  }
-
-  T headers_;
-};
-
-void InitTracer()
-{
-  auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
-  auto processor =
-      opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  std::vector<std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  // Default is an always-on sampler.
-  std::unique_ptr<opentelemetry::sdk::trace::TracerContext> context =
-      opentelemetry::sdk::trace::TracerContextFactory::Create(std::move(processors));
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
-      opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(context));
-  // Set the global trace provider
-  opentelemetry::sdk::trace::Provider::SetTracerProvider(provider);
-
-  // set global propagator
-  opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
-      opentelemetry::nostd::shared_ptr<opentelemetry::context::propagation::TextMapPropagator>(
-          new opentelemetry::trace::propagation::HttpTraceContext()));
-}
-
-void CleanupTracer()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  opentelemetry::sdk::trace::Provider::SetTracerProvider(none);
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> get_tracer(std::string tracer_name)
-{
-  auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-  return provider->GetTracer(tracer_name);
-}
-
-}  // namespace
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/BUILD
deleted file mode 100644
index 03073b429..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_logs_simple",
-    srcs = [
-        "main.cc",
-    ],
-    tags = [
-        "examples",
-        "ostream",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/logs_foo_library:common_logs_foo_library",
-        "//exporters/ostream:ostream_log_record_exporter",
-        "//exporters/ostream:ostream_span_exporter",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/CMakeLists.txt
deleted file mode 100644
index 91d45e0bf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(example_logs_simple main.cc)
-target_link_libraries(example_logs_simple PRIVATE common_logs_foo_library)
-
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  target_compile_definitions(example_logs_simple
-                             PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-  target_link_libraries(example_logs_simple
-                        PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-else()
-  target_link_libraries(
-    example_logs_simple
-    PRIVATE opentelemetry-cpp::trace opentelemetry-cpp::logs
-            opentelemetry-cpp::ostream_span_exporter
-            opentelemetry-cpp::ostream_log_record_exporter)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/README.md b/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/README.md
deleted file mode 100644
index 7e4a1dfc7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Simple Logs Example
-
-In this example, the application in `main.cc` initializes an
-`OStreamLogRecordExporter` instance and registers a logger
-provider, as well as initializes a `StdoutSpanExporter` instance and registers a
-tracer provider from the [OpenTelemetry C++
-SDK](https://github.com/open-telemetry/opentelemetry-cpp).
-
-The application then calls into
-[`logs_foo_library`](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/examples/common/logs_foo_library/foo_library.cc)
-which has been instrumented using the [OpenTelemetry Logs
-API](../../api/include/opentelemetry/logs/logger.h). Resulting logs and traces
-are directed to stdout.
-
-See [CONTRIBUTING.md](../../CONTRIBUTING.md) for instructions on building and
-running the example.
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/main.cc
deleted file mode 100644
index 275ebada1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/logs_simple/main.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/exporters/ostream/log_record_exporter.h"
-#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/provider.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/logs_foo_library/foo_library.h"
-#else
-#  include "logs_foo_library/foo_library.h"
-#endif
-
-namespace logs_api      = opentelemetry::logs;
-namespace logs_sdk      = opentelemetry::sdk::logs;
-namespace logs_exporter = opentelemetry::exporter::logs;
-
-namespace trace_api      = opentelemetry::trace;
-namespace trace_sdk      = opentelemetry::sdk::trace;
-namespace trace_exporter = opentelemetry::exporter::trace;
-
-namespace
-{
-void InitTracer()
-{
-  // Create ostream span exporter instance
-  auto exporter  = trace_exporter::OStreamSpanExporterFactory::Create();
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-
-  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> sdk_provider =
-      trace_sdk::TracerProviderFactory::Create(std::move(processor));
-
-  // Set the global trace provider
-  const std::shared_ptr<trace_api::TracerProvider> &api_provider = sdk_provider;
-  trace_sdk::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  std::shared_ptr<trace_api::TracerProvider> noop;
-  trace_sdk::Provider::SetTracerProvider(noop);
-}
-
-void InitLogger()
-{
-  // Create ostream log exporter instance
-  auto exporter =
-      std::unique_ptr<logs_sdk::LogRecordExporter>(new logs_exporter::OStreamLogRecordExporter);
-  auto processor = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
-
-  std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> sdk_provider(
-      logs_sdk::LoggerProviderFactory::Create(std::move(processor)));
-
-  // Set the global logger provider
-  const std::shared_ptr<logs_api::LoggerProvider> &api_provider = sdk_provider;
-  logs_sdk::Provider::SetLoggerProvider(api_provider);
-}
-
-void CleanupLogger()
-{
-  std::shared_ptr<logs_api::LoggerProvider> noop;
-  logs_sdk::Provider::SetLoggerProvider(noop);
-}
-
-}  // namespace
-
-int main(int /* argc */, char ** /* argv */)
-{
-  InitTracer();
-  InitLogger();
-  foo_library();
-  CleanupTracer();
-  CleanupLogger();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/BUILD
deleted file mode 100644
index 029fda8a7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "metrics_ostream_example",
-    srcs = [
-        "metrics_ostream.cc",
-    ],
-    linkopts = ["-pthread"],
-    tags = ["ostream"],
-    deps = [
-        "//api",
-        "//examples/common/metrics_foo_library:common_metrics_foo_library",
-        "//exporters/ostream:ostream_metric_exporter",
-        "//sdk/src/metrics",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/CMakeLists.txt
deleted file mode 100644
index 4b649c199..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(metrics_ostream_example metrics_ostream.cc)
-
-target_link_libraries(metrics_ostream_example
-                      PRIVATE common_metrics_foo_library)
-
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  target_compile_definitions(metrics_ostream_example
-                             PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-  target_link_libraries(metrics_ostream_example
-                        PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-else()
-  target_link_libraries(
-    metrics_ostream_example PRIVATE opentelemetry-cpp::metrics
-                                    opentelemetry-cpp::ostream_metrics_exporter)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/README.md b/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/README.md
deleted file mode 100644
index 1e2b1517d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/README.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Simple Metrics Example
-
-See [INSTALL.md](../../INSTALL.md) for instructions on building and
-running the example.
-
-This example initializes the metrics pipeline with 3 different instrument types:
-
-- [Counter](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#counter)
-- [Histogram](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#histogram)
-- [Asynchronous/Observable Counter](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#asynchronous-counter)
-
- Here are more detailed steps with explanation. Note that the steps 4, 6, and 8
- are done in Instrumentation library for creating and recording Instruments,
- and rest of the steps are done in application to configure SDK.
-
- Namespace alias used in below steps
-
- ```cpp
-using namespace metrics_api = opentelemetry::metrics;
-using namespace metric_sdk = opentelemetry::sdk::metrics;
-using namespace exportermetrics = opentelemetry::exporters;
-
- ```
-
-1. Initialize an exporter and a reader. In this case, we initialize an OStream
-Exporter which will print to stdout by default.
-The reader periodically collects metrics from the Aggregation Store and exports them.
-
-    ```cpp
-    std::unique_ptr<metric_sdk::PushMetricExporter> exporter{new exportermetrics::OStreamMetricExporter};
-    std::unique_ptr<metric_sdk::MetricReader> reader{
-        new metric_sdk::PeriodicExportingMetricReader(std::move(exporter), options)};
-    ```
-
-2. Initialize a MeterProvider and add the reader.
-We will use this to obtain Meter objects in the future.
-
-    ```cpp
-    auto provider = std::shared_ptr<metrics_api::MeterProvider>(new metric_sdk::MeterProvider());
-    auto p = std::static_pointer_cast<metric_sdk::MeterProvider>(provider);
-    p->AddMetricReader(std::move(reader));
-    ```
-
-3. Optional: Create a view to map the Counter Instrument to Sum Aggregation.
-Add this view to provider. View creation is optional unless we want to add
-custom aggregation config, and attribute processor. Metrics SDK  will implicitly
-create a missing view with default mapping between Instrument and Aggregation.
-
-    ```cpp
-    std::string counter_name = "counter_name";
-    std::unique_ptr<metric_sdk::InstrumentSelector> instrument_selector{
-        new metric_sdk::InstrumentSelector(metric_sdk::InstrumentType::kCounter, counter_name)};
-    std::unique_ptr<metric_sdk::MeterSelector> meter_selector{
-        new metric_sdk::MeterSelector(name, version, schema)};
-    std::unique_ptr<metric_sdk::View> sum_view{
-        new metric_sdk::View{name, "description", metric_sdk::AggregationType::kSum}};
-    p->AddView(std::move(instrument_selector), std::move(meter_selector), std::move(sum_view));
-    ```
-
-4. Create a Counter instrument from the Meter, and record the measurement.
-Every Meter pointer returned by the MeterProvider points to the same Meter.
-This means that the Meter will be able to combine metrics captured from
-different functions without having to constantly pass the Meter around the library.
-
-    ```cpp
-    auto meter = provider->GetMeter(name, "1.2.0");
-    auto double_counter = meter->CreateDoubleCounter(counter_name);
-    // Create a label set which annotates metric values
-    std::map<std::string, std::string> labels = {{"key", "value"}};
-    auto labelkv = common::KeyValueIterableView<decltype(labels)>{labels};
-    double_counter->Add(val, labelkv);
-    ```
-
-5. Optional: Create a view to map the Histogram Instrument to Histogram Aggregation.
-
-    ```cpp
-    std::unique_ptr<metric_sdk::InstrumentSelector> histogram_instrument_selector{
-        new metric_sdk::InstrumentSelector(metric_sdk::InstrumentType::kHistogram, "histogram_name")};
-    std::unique_ptr<metric_sdk::MeterSelector> histogram_meter_selector{
-        new metric_sdk::MeterSelector(name, version, schema)};
-    std::unique_ptr<metric_sdk::View> histogram_view{
-        new metric_sdk::View{name, "description", metric_sdk::AggregationType::kHistogram}};
-    p->AddView(std::move(histogram_instrument_selector), std::move(histogram_meter_selector),
-        std::move(histogram_view));
-    ```
-
-6. Create a Histogram instrument from the Meter, and record the measurement.
-
-    ```cpp
-    auto meter = provider->GetMeter(name, "1.2.0");
-    auto histogram_counter = meter->CreateDoubleHistogram("histogram_name");
-    histogram_counter->Record(val, labelkv);
-    ```
-
-7. Optional: Create a view to map the Observable Counter Instrument to Sum Aggregation
-
-    ```cpp
-    std::unique_ptr<metric_sdk::InstrumentSelector> observable_instrument_selector{
-        new metric_sdk::InstrumentSelector(metric_sdk::InstrumentType::kObservableCounter,
-                                         "observable_counter_name")};
-    std::unique_ptr<metric_sdk::MeterSelector> observable_meter_selector{
-      new metric_sdk::MeterSelector(name, version, schema)};
-    std::unique_ptr<metric_sdk::View> observable_sum_view{
-      new metric_sdk::View{name, "description", metric_sdk::AggregationType::kSum}};
-    p->AddView(std::move(observable_instrument_selector), std::move(observable_meter_selector),
-             std::move(observable_sum_view));
-    ```
-
-8. Create a Observable Counter Instrument from the Meter, and add a callback.
-The callbackwould be used to record the measurement during metrics collection.
-Ensure to keep the Instrument object active for the lifetime of collection.
-
-    ```cpp
-    auto meter = provider->GetMeter(name, "1.2.0");
-    auto counter = meter->CreateDoubleObservableCounter(counter_name);
-    counter->AddCallback(MeasurementFetcher::Fetcher, nullptr);
-    ```
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/metrics_ostream.cc b/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/metrics_ostream.cc
deleted file mode 100644
index a7b6bcdd0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/metrics_simple/metrics_ostream.cc
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/exporters/ostream/metric_exporter_factory.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/meter_context_factory.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_factory.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/metrics_foo_library/foo_library.h"
-#else
-#  include "metrics_foo_library/foo_library.h"
-#endif
-
-namespace metrics_sdk     = opentelemetry::sdk::metrics;
-namespace common          = opentelemetry::common;
-namespace exportermetrics = opentelemetry::exporter::metrics;
-namespace metrics_api     = opentelemetry::metrics;
-
-namespace
-{
-
-void InitMetrics(const std::string &name)
-{
-  auto exporter = exportermetrics::OStreamMetricExporterFactory::Create();
-
-  std::string version{"1.2.0"};
-  std::string schema{"https://opentelemetry.io/schemas/1.2.0"};
-
-  // Initialize and set the global MeterProvider
-  metrics_sdk::PeriodicExportingMetricReaderOptions options;
-  options.export_interval_millis = std::chrono::milliseconds(1000);
-  options.export_timeout_millis  = std::chrono::milliseconds(500);
-
-  auto reader =
-      metrics_sdk::PeriodicExportingMetricReaderFactory::Create(std::move(exporter), options);
-
-  auto context = metrics_sdk::MeterContextFactory::Create();
-  context->AddMetricReader(std::move(reader));
-  auto provider = opentelemetry::sdk::metrics::MeterProviderFactory::Create(std::move(context));
-
-  // counter view
-  std::string counter_name = name + "_counter";
-  std::string unit         = "counter-unit";
-
-  auto instrument_selector = metrics_sdk::InstrumentSelectorFactory::Create(
-      metrics_sdk::InstrumentType::kCounter, counter_name, unit);
-
-  auto meter_selector = metrics_sdk::MeterSelectorFactory::Create(name, version, schema);
-
-  auto sum_view = metrics_sdk::ViewFactory::Create(name, "description", unit,
-                                                   metrics_sdk::AggregationType::kSum);
-
-  provider->AddView(std::move(instrument_selector), std::move(meter_selector), std::move(sum_view));
-
-  // observable counter view
-  std::string observable_counter_name = name + "_observable_counter";
-
-  auto observable_instrument_selector = metrics_sdk::InstrumentSelectorFactory::Create(
-      metrics_sdk::InstrumentType::kObservableCounter, observable_counter_name, unit);
-
-  auto observable_meter_selector = metrics_sdk::MeterSelectorFactory::Create(name, version, schema);
-
-  auto observable_sum_view = metrics_sdk::ViewFactory::Create(name, "test_description", unit,
-                                                              metrics_sdk::AggregationType::kSum);
-
-  provider->AddView(std::move(observable_instrument_selector), std::move(observable_meter_selector),
-                    std::move(observable_sum_view));
-
-  // histogram view
-  std::string histogram_name = name + "_histogram";
-  unit                       = "histogram-unit";
-
-  auto histogram_instrument_selector = metrics_sdk::InstrumentSelectorFactory::Create(
-      metrics_sdk::InstrumentType::kHistogram, histogram_name, unit);
-
-  auto histogram_meter_selector = metrics_sdk::MeterSelectorFactory::Create(name, version, schema);
-
-  auto histogram_aggregation_config = std::unique_ptr<metrics_sdk::HistogramAggregationConfig>(
-      new metrics_sdk::HistogramAggregationConfig);
-
-  histogram_aggregation_config->boundaries_ = std::vector<double>{
-      0.0, 50.0, 100.0, 250.0, 500.0, 750.0, 1000.0, 2500.0, 5000.0, 10000.0, 20000.0};
-
-  std::shared_ptr<metrics_sdk::AggregationConfig> aggregation_config(
-      std::move(histogram_aggregation_config));
-
-  auto histogram_view = metrics_sdk::ViewFactory::Create(
-      name, "description", unit, metrics_sdk::AggregationType::kHistogram, aggregation_config);
-
-  provider->AddView(std::move(histogram_instrument_selector), std::move(histogram_meter_selector),
-                    std::move(histogram_view));
-
-  // hisogram view with base2 exponential aggregation
-  std::string histogram_base2_name         = name + "_exponential_histogram";
-  unit                                     = "histogram-unit";
-  auto histogram_base2_instrument_selector = metrics_sdk::InstrumentSelectorFactory::Create(
-      metrics_sdk::InstrumentType::kHistogram, histogram_base2_name, unit);
-  auto histogram_base2_meter_selector =
-      metrics_sdk::MeterSelectorFactory::Create(name, version, schema);
-  auto histogram_base2_aggregation_config =
-      std::unique_ptr<metrics_sdk::Base2ExponentialHistogramAggregationConfig>(
-          new metrics_sdk::Base2ExponentialHistogramAggregationConfig);
-  histogram_base2_aggregation_config->max_scale_      = 3;
-  histogram_base2_aggregation_config->record_min_max_ = true;
-  histogram_base2_aggregation_config->max_buckets_    = 100;
-
-  std::shared_ptr<metrics_sdk::AggregationConfig> base2_aggregation_config(
-      std::move(histogram_base2_aggregation_config));
-
-  auto histogram_base2_view = metrics_sdk::ViewFactory::Create(
-      name, "description", unit, metrics_sdk::AggregationType::kBase2ExponentialHistogram,
-      base2_aggregation_config);
-
-  provider->AddView(std::move(histogram_base2_instrument_selector),
-                    std::move(histogram_base2_meter_selector), std::move(histogram_base2_view));
-
-  std::shared_ptr<opentelemetry::metrics::MeterProvider> api_provider(std::move(provider));
-
-  metrics_sdk::Provider::SetMeterProvider(api_provider);
-}
-
-void CleanupMetrics()
-{
-  std::shared_ptr<metrics_api::MeterProvider> none;
-  metrics_sdk::Provider::SetMeterProvider(none);
-}
-}  // namespace
-
-int main(int argc, char **argv)
-{
-  std::string example_type;
-  if (argc >= 2)
-  {
-    example_type = argv[1];
-  }
-
-  std::string name{"ostream_metric_example"};
-  InitMetrics(name);
-
-  if (example_type == "counter")
-  {
-    foo_library::counter_example(name);
-  }
-  else if (example_type == "observable_counter")
-  {
-    foo_library::observable_counter_example(name);
-  }
-  else if (example_type == "histogram")
-  {
-    foo_library::histogram_example(name);
-  }
-  else if (example_type == "exponential_histogram")
-  {
-    foo_library::histogram_exp_example(name);
-  }
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  else if (example_type == "gauge")
-  {
-    foo_library::gauge_example(name);
-  }
-#endif
-  else if (example_type == "semconv_counter")
-  {
-    foo_library::semconv_counter_example();
-  }
-  else if (example_type == "semconv_observable_counter")
-  {
-    foo_library::semconv_observable_counter_example();
-  }
-  else if (example_type == "semconv_histogram")
-  {
-    foo_library::semconv_histogram_example();
-  }
-  else
-  {
-    std::thread counter_example{&foo_library::counter_example, name};
-    std::thread observable_counter_example{&foo_library::observable_counter_example, name};
-    std::thread histogram_example{&foo_library::histogram_example, name};
-    std::thread histogram_exp_example{&foo_library::histogram_exp_example, name};
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    std::thread gauge_example{&foo_library::gauge_example, name};
-#endif
-    std::thread semconv_counter_example{&foo_library::semconv_counter_example};
-    std::thread semconv_observable_counter_example{
-        &foo_library::semconv_observable_counter_example};
-    std::thread semconv_histogram_example{&foo_library::semconv_histogram_example};
-
-    counter_example.join();
-    observable_counter_example.join();
-    histogram_example.join();
-    histogram_exp_example.join();
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    gauge_example.join();
-#endif
-    semconv_counter_example.join();
-    semconv_observable_counter_example.join();
-    semconv_histogram_example.join();
-  }
-
-  CleanupMetrics();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/BUILD
deleted file mode 100644
index 1c7a3789b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/BUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_multi_processor",
-    srcs = [
-        "main.cc",
-    ],
-    tags = [
-        "memory",
-        "ostream",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/foo_library:common_foo_library",
-        "//exporters/memory:in_memory_span_exporter",
-        "//exporters/ostream:ostream_span_exporter",
-        "//sdk/src/trace",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/CMakeLists.txt
deleted file mode 100644
index 537f64aba..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(example_multi_processor main.cc)
-target_link_libraries(
-  example_multi_processor
-  PRIVATE common_foo_library opentelemetry-cpp::trace
-          opentelemetry-cpp::ostream_span_exporter
-          opentelemetry-cpp::in_memory_span_exporter)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/README.md b/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/README.md
deleted file mode 100644
index c53939762..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Multi Processor Trace Example
-
-In this example, the application in `main.cc` initializes and registers a tracer
-provider from the [OpenTelemetry
-SDK](https://github.com/open-telemetry/opentelemetry-cpp). The `TracerProvider`
-is connected to two `processor-exporter` pipelines - for exporting
-simultaneously to `StdoutSpanExporter` and `InMemorySpanExporter`. The
-application then calls a `foo_library` which has been instrumented using the
-[OpenTelemetry
-API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
-Resulting telemetry is directed to stdout through the StdoutSpanExporter, and
-saved as a variable (vector of spans) through `InMemorySpanExporter`.
-
-See [CONTRIBUTING.md](../../CONTRIBUTING.md) for instructions on building and
-running the example.
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/main.cc
deleted file mode 100644
index de01b7a74..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/multi_processor/main.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/memory/in_memory_span_data.h"
-#include "opentelemetry/exporters/memory/in_memory_span_exporter_factory.h"
-#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/foo_library/foo_library.h"
-#else
-#  include "foo_library/foo_library.h"
-#endif
-
-using opentelemetry::exporter::memory::InMemorySpanData;
-namespace trace_api = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-
-namespace
-{
-std::shared_ptr<InMemorySpanData> InitTracer()
-{
-  std::shared_ptr<InMemorySpanData> data;
-
-  auto exporter1  = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
-  auto processor1 = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter1));
-
-  auto exporter2  = opentelemetry::exporter::memory::InMemorySpanExporterFactory::Create(data);
-  auto processor2 = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter2));
-
-  std::vector<std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>> processors;
-  processors.push_back(std::move(processor1));
-  processors.push_back(std::move(processor2));
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
-      trace_sdk::TracerProviderFactory::Create(std::move(processors));
-
-  // Set the global trace provider
-  trace_sdk::Provider::SetTracerProvider(std::move(provider));
-
-  return data;
-}
-
-void CleanupTracer()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-
-void dumpSpans(std::vector<std::unique_ptr<trace_sdk::SpanData>> &spans)
-{
-  char span_buf[trace_api::SpanId::kSize * 2];
-  char trace_buf[trace_api::TraceId::kSize * 2];
-  char parent_span_buf[trace_api::SpanId::kSize * 2];
-  std::cout << "\nSpans from memory :" << '\n';
-
-  for (auto &span : spans)
-  {
-    std::cout << "\n\tSpan: " << '\n';
-    std::cout << "\t\tName: " << span->GetName() << '\n';
-    span->GetSpanId().ToLowerBase16(span_buf);
-    span->GetTraceId().ToLowerBase16(trace_buf);
-    span->GetParentSpanId().ToLowerBase16(parent_span_buf);
-    std::cout << "\t\tTraceId: " << std::string(trace_buf, sizeof(trace_buf)) << '\n';
-    std::cout << "\t\tSpanId: " << std::string(span_buf, sizeof(span_buf)) << '\n';
-    std::cout << "\t\tParentSpanId: " << std::string(parent_span_buf, sizeof(parent_span_buf))
-              << '\n';
-
-    std::cout << "\t\tDescription: " << span->GetDescription() << '\n';
-    std::cout << "\t\tSpan kind:"
-              << static_cast<typename std::underlying_type<trace_api::SpanKind>::type>(
-                     span->GetSpanKind())
-              << '\n';
-    std::cout << "\t\tSpan Status: "
-              << static_cast<typename std::underlying_type<trace_api::StatusCode>::type>(
-                     span->GetStatus())
-              << '\n';
-  }
-}
-}  // namespace
-
-int main(int /* argc */, char ** /* argv */)
-{
-  // Removing this line will leave the default noop TracerProvider in place.
-  std::shared_ptr<InMemorySpanData> data = InitTracer();
-
-  foo_library();
-  auto memory_spans = data->GetSpans();
-  dumpSpans(memory_spans);
-
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/BUILD
deleted file mode 100644
index 4ee138629..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_multithreaded",
-    srcs = [
-        "main.cc",
-    ],
-    tags = ["ostream"],
-    deps = [
-        "//api",
-        "//exporters/ostream:ostream_span_exporter",
-        "//sdk/src/trace",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/CMakeLists.txt
deleted file mode 100644
index 08615756e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(example_multithreaded main.cc)
-target_link_libraries(
-  example_multithreaded PRIVATE opentelemetry-cpp::trace
-                                opentelemetry-cpp::ostream_span_exporter)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/main.cc
deleted file mode 100644
index c5271a474..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/multithreaded/main.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace trace_api = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-
-namespace
-{
-void InitTracer()
-{
-  auto exporter  = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
-      trace_sdk::TracerProviderFactory::Create(std::move(processor),
-                                               opentelemetry::sdk::resource::Resource::Create({}));
-  // Set the global trace provider
-  trace_sdk::Provider::SetTracerProvider(provider);
-}
-
-void CleanupTracer()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-
-opentelemetry::nostd::shared_ptr<trace_api::Tracer> get_tracer()
-{
-  auto provider = trace_api::Provider::GetTracerProvider();
-  return provider->GetTracer("foo_library");
-}
-}  // namespace
-
-void run_threads()
-{
-  auto thread_span = get_tracer()->StartSpan(__func__);
-
-  std::vector<std::thread> threads;
-  threads.reserve(5);
-  for (int thread_num = 0; thread_num < 5; ++thread_num)
-  {
-    // This shows how one can effectively use Scope objects to correctly
-    // parent spans across threads.
-    threads.push_back(std::thread([=] {
-      trace_api::Scope scope(thread_span);
-      auto thread_span_2 =
-          get_tracer()->StartSpan(std::string("thread ") + std::to_string(thread_num));
-    }));
-  }
-
-  std::for_each(threads.begin(), threads.end(), [](std::thread &th) { th.join(); });
-}
-
-int main(int /* argc */, char ** /* argv */)
-{
-  InitTracer();
-
-  {
-    auto root_span = get_tracer()->StartSpan(__func__);
-    trace_api::Scope scope(root_span);
-
-    run_threads();
-  }
-
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/otlp/BUILD
deleted file mode 100644
index b27cbef32..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/BUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_otlp_grpc",
-    srcs = [
-        "grpc_main.cc",
-    ],
-    tags = [
-        "examples",
-        "otlp",
-        "otlp_grpc",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/foo_library:common_foo_library",
-        "//exporters/otlp:otlp_grpc_exporter",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_http",
-    srcs = [
-        "http_main.cc",
-    ],
-    tags = [
-        "examples",
-        "otlp",
-        "otlp_http",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/foo_library:common_foo_library",
-        "//exporters/otlp:otlp_http_exporter",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_file",
-    srcs = [
-        "file_main.cc",
-    ],
-    tags = [
-        "examples",
-        "otlp",
-        "otlp_file",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/foo_library:common_foo_library",
-        "//exporters/otlp:otlp_file_exporter",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_http_log",
-    srcs = [
-        "http_log_main.cc",
-    ],
-    tags = [
-        "examples",
-        "otlp",
-        "otlp_http_log",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/logs_foo_library:common_logs_foo_library",
-        "//exporters/otlp:otlp_http_exporter",
-        "//exporters/otlp:otlp_http_log_record_exporter",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_grpc_log",
-    srcs = [
-        "grpc_log_main.cc",
-    ],
-    tags = [
-        "examples",
-        "otlp",
-        "otlp_grpc_log",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/logs_foo_library:common_logs_foo_library",
-        "//exporters/otlp:otlp_grpc_exporter",
-        "//exporters/otlp:otlp_grpc_log_record_exporter",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_file_log",
-    srcs = [
-        "file_log_main.cc",
-    ],
-    tags = [
-        "examples",
-        "otlp",
-        "otlp_file_log",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/logs_foo_library:common_logs_foo_library",
-        "//exporters/otlp:otlp_file_exporter",
-        "//exporters/otlp:otlp_file_log_record_exporter",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_grpc_metric",
-    srcs = [
-        "grpc_metric_main.cc",
-    ],
-    tags = [
-        "examples",
-        "metrics",
-        "otlp",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/metrics_foo_library:common_metrics_foo_library",
-        "//exporters/otlp:otlp_grpc_exporter",
-        "//exporters/otlp:otlp_grpc_metric_exporter",
-        "//sdk/src/metrics",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_http_metric",
-    srcs = [
-        "http_metric_main.cc",
-    ],
-    tags = [
-        "examples",
-        "metrics",
-        "otlp",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/metrics_foo_library:common_metrics_foo_library",
-        "//exporters/otlp:otlp_http_exporter",
-        "//exporters/otlp:otlp_http_metric_exporter",
-        "//sdk/src/metrics",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_file_metric",
-    srcs = [
-        "file_metric_main.cc",
-    ],
-    tags = [
-        "examples",
-        "metrics",
-        "otlp",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/metrics_foo_library:common_metrics_foo_library",
-        "//exporters/otlp:otlp_file_exporter",
-        "//exporters/otlp:otlp_file_metric_exporter",
-        "//sdk/src/metrics",
-    ],
-)
-
-cc_binary(
-    name = "example_otlp_instrumented_http",
-    srcs = [
-        "http_instrumented_main.cc",
-    ],
-    tags = [
-        "examples",
-        "otlp",
-        "otlp_http",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/logs_foo_library:common_logs_foo_library",
-        "//examples/common/metrics_foo_library:common_metrics_foo_library",
-        "//exporters/otlp:otlp_http_exporter",
-        "//exporters/otlp:otlp_http_log_record_exporter",
-        "//exporters/otlp:otlp_http_metric_exporter",
-        "//sdk/src/metrics",
-        "//sdk/src/trace",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/otlp/CMakeLists.txt
deleted file mode 100644
index e6102611b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/CMakeLists.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(WITH_OTLP_GRPC)
-  # TRACE
-
-  add_executable(example_otlp_grpc grpc_main.cc)
-
-  target_link_libraries(example_otlp_grpc PRIVATE common_foo_library)
-
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_grpc
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_grpc
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(example_otlp_grpc
-                          PRIVATE opentelemetry-cpp::otlp_grpc_exporter)
-  endif()
-
-  # METRIC
-
-  add_executable(example_otlp_grpc_metric grpc_metric_main.cc)
-
-  target_link_libraries(example_otlp_grpc_metric
-                        PRIVATE common_metrics_foo_library)
-
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_grpc_metric
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_grpc_metric
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(example_otlp_grpc_metric
-                          PRIVATE opentelemetry-cpp::otlp_grpc_metrics_exporter)
-  endif()
-
-  # LOG
-
-  add_executable(example_otlp_grpc_log grpc_log_main.cc)
-
-  target_link_libraries(example_otlp_grpc_log PRIVATE common_logs_foo_library)
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_grpc_log
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_grpc_log
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(
-      example_otlp_grpc_log
-      PRIVATE opentelemetry-cpp::otlp_grpc_exporter
-              opentelemetry-cpp::otlp_grpc_log_record_exporter)
-  endif()
-endif()
-
-if(WITH_OTLP_HTTP)
-  # TRACE
-
-  add_executable(example_otlp_http http_main.cc)
-
-  target_link_libraries(example_otlp_http PRIVATE common_foo_library)
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_http
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_http
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(example_otlp_http
-                          PRIVATE opentelemetry-cpp::otlp_http_exporter)
-  endif()
-
-  # METRIC
-
-  add_executable(example_otlp_http_metric http_metric_main.cc)
-  target_link_libraries(example_otlp_http_metric
-                        PRIVATE common_metrics_foo_library)
-
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_http_metric
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_http_metric
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(example_otlp_http_metric
-                          PRIVATE opentelemetry-cpp::otlp_http_metric_exporter)
-  endif()
-
-  # LOG
-
-  add_executable(example_otlp_http_log http_log_main.cc)
-  target_link_libraries(example_otlp_http_log PRIVATE common_logs_foo_library)
-
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_http_log
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_http_log
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(
-      example_otlp_http_log
-      PRIVATE opentelemetry-cpp::otlp_http_exporter
-              opentelemetry-cpp::otlp_http_log_record_exporter)
-  endif()
-
-  # ALL, instrumented
-
-  add_executable(example_otlp_instrumented_http http_instrumented_main.cc)
-
-  # Note: common_logs_foo_library provide traces and logs
-  target_link_libraries(
-    example_otlp_instrumented_http PRIVATE common_metrics_foo_library
-                                           common_logs_foo_library)
-
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_instrumented_http
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_instrumented_http
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(
-      example_otlp_instrumented_http
-      PRIVATE opentelemetry-cpp::otlp_http_exporter
-              opentelemetry-cpp::otlp_http_metric_exporter
-              opentelemetry-cpp::otlp_http_log_record_exporter)
-  endif()
-
-endif()
-
-if(WITH_OTLP_FILE)
-  # TRACE
-
-  add_executable(example_otlp_file file_main.cc)
-
-  target_link_libraries(example_otlp_file PRIVATE common_foo_library)
-
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_file
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_file
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(example_otlp_file
-                          PRIVATE opentelemetry-cpp::otlp_file_exporter)
-  endif()
-
-  # METRIC
-
-  add_executable(example_otlp_file_metric file_metric_main.cc)
-
-  target_link_libraries(example_otlp_file_metric
-                        PRIVATE common_metrics_foo_library)
-
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_file_metric
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_file_metric
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(example_otlp_file_metric
-                          PRIVATE opentelemetry-cpp::otlp_file_metric_exporter)
-  endif()
-
-  # LOG
-
-  add_executable(example_otlp_file_log file_log_main.cc)
-
-  target_link_libraries(example_otlp_file_log PRIVATE common_logs_foo_library)
-  if(DEFINED OPENTELEMETRY_BUILD_DLL)
-    target_compile_definitions(example_otlp_file_log
-                               PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-    target_link_libraries(example_otlp_file_log
-                          PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-  else()
-    target_link_libraries(
-      example_otlp_file_log
-      PRIVATE opentelemetry-cpp::otlp_file_exporter
-              opentelemetry-cpp::otlp_file_log_record_exporter)
-  endif()
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/README.md b/ext/opentelemetry-cpp-1.21.0/examples/otlp/README.md
deleted file mode 100644
index dab6a5048..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# OTLP Exporter Example
-
-This is an example of how to use the [OpenTelemetry
-Protocol](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/README.md)
-(OTLP) exporter.
-
-### Traces
-The application in `grpc_main.cc` initializes an `OtlpGrpcExporter` instance,
-the application in `http_main.cc` initializes an `OtlpHttpExporter` instance.
-And they register a tracer provider from the [OpenTelemetry
-SDK](https://github.com/open-telemetry/opentelemetry-cpp). The application then
-calls a `foo_library` which has been instrumented using the [OpenTelemetry
-API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
-
-### Logs
-The application in `http_log_main.cc` initializes an `OtlpHttpLogRecordExporter` instance,
-the application in `grpc_log_main.cc` initializes an `OtlpGrpcLogRecordExporter` instance.
-And they register a logger provider from the [OpenTelemetry
-SDK](https://github.com/open-telemetry/opentelemetry-cpp). The application then
-calls a `logs_foo_library` which has been instrumented using the [OpenTelemetry
-API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
-
-### Metrics
-The application in `grpc_metrics_main.cc` initializes an `OtlpGrpcMetricExporter` instance.
-And it registers a meter provider from the [OpenTelemetry
-SDK](https://github.com/open-telemetry/opentelemetry-cpp). The application then
-calls a `metrics_foo_library` which has been instrumented using the [OpenTelemetry
-API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
-
-### Enable SSL/TLS
-To enable TLS authentication for OTLP grpc exporter, SslCredentials can be used
-by specifying the path to client certificate pem file, or the string containing
-this certificate via OtlpGrpcExporterOptions. The path to such a .pem file can be
-provided as a command-line argument along with the collector endpoint to the main
-binary invocation above.
-
-### Running OpenTelemetry Collector as docker container
-Resulting spans are exported to the **OpenTelemetry Collector** using the OTLP
-exporter. The OpenTelemetry Collector can be configured to export to other
-backends (see list of [supported
-backends](https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/README.md)).
-
-Follow below command to run the **OpenTelemetry Collector** with OTLP receiver
-in docker which dumps the received data into console. See [Getting
-Started](https://opentelemetry.io/docs/collector/about/) for more information.
-
-Open a terminal window at the root directory of this repo and launch the
-OpenTelemetry Collector with an OTLP receiver by running:
-
-- On Unix based systems use:
-
-```console
-docker run --rm -it -p 4317:4317 -p 4318:4318 -v $(pwd)/examples/otlp:/cfg otel/opentelemetry-collector:0.109.0 --config=/cfg/opentelemetry-collector-config/config.dev.yaml
-```
-
-- On Windows use:
-
-```console
-docker run --rm -it -p 4317:4317 -p 4318:4318 -v "%cd%/examples/otlp":/cfg otel/opentelemetry-collector:0.109.0 --config=/cfg/opentelemetry-collector-config/config.dev.yaml
-```
-
-Note that the OTLP gRPC and HTTP exporters connects to the Collector at `localhost:4317` and `localhost:4318/v1/traces` respectively. This can be changed with first argument from command-line, for example:
-`./example_otlp_grpc gateway.docker.internal:4317` and
-`./example_otlp_http gateway.docker.internal:4318/v1/traces`.
-
-Once you have the Collector running, see
-[CONTRIBUTING.md](../../CONTRIBUTING.md) for instructions on building and
-running the example.
-
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_log_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_log_main.cc
deleted file mode 100644
index c5c7987bf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_log_main.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <functional>
-#include <iostream>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/provider.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/logs_foo_library/foo_library.h"
-#else
-#  include "logs_foo_library/foo_library.h"
-#endif
-
-namespace trace     = opentelemetry::trace;
-namespace nostd     = opentelemetry::nostd;
-namespace otlp      = opentelemetry::exporter::otlp;
-namespace logs_sdk  = opentelemetry::sdk::logs;
-namespace logs      = opentelemetry::logs;
-namespace trace_sdk = opentelemetry::sdk::trace;
-
-namespace
-{
-opentelemetry::exporter::otlp::OtlpFileExporterOptions opts;
-opentelemetry::exporter::otlp::OtlpFileLogRecordExporterOptions log_opts;
-
-std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> tracer_provider;
-std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> logger_provider;
-
-void InitTracer()
-{
-  // Create OTLP exporter instance
-  auto exporter   = otlp::OtlpFileExporterFactory::Create(opts);
-  auto processor  = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  tracer_provider = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-
-  // Set the global trace provider
-  std::shared_ptr<opentelemetry::trace::TracerProvider> api_provider = tracer_provider;
-  trace_sdk::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (tracer_provider)
-  {
-    tracer_provider->ForceFlush();
-  }
-
-  tracer_provider.reset();
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-
-void InitLogger()
-{
-  // Create OTLP exporter instance
-  auto exporter   = otlp::OtlpFileLogRecordExporterFactory::Create(log_opts);
-  auto processor  = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
-  logger_provider = logs_sdk::LoggerProviderFactory::Create(std::move(processor));
-
-  std::shared_ptr<opentelemetry::logs::LoggerProvider> api_provider = logger_provider;
-  logs_sdk::Provider::SetLoggerProvider(api_provider);
-}
-
-void CleanupLogger()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (logger_provider)
-  {
-    logger_provider->ForceFlush();
-  }
-
-  logger_provider.reset();
-  nostd::shared_ptr<logs::LoggerProvider> none;
-  logs_sdk::Provider::SetLoggerProvider(none);
-}
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  if (argc > 1)
-  {
-    opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions fs_backend;
-    fs_backend.file_pattern = argv[1];
-    opts.backend_options    = fs_backend;
-    if (argc > 2)
-    {
-      opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions logs_fs_backend;
-      logs_fs_backend.file_pattern = argv[2];
-      log_opts.backend_options     = logs_fs_backend;
-    }
-    else
-    {
-      log_opts.backend_options = std::ref(std::cout);
-    }
-  }
-  else
-  {
-    opts.backend_options = std::ref(std::cout);
-  }
-  InitLogger();
-  InitTracer();
-  foo_library();
-  CleanupTracer();
-  CleanupLogger();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_main.cc
deleted file mode 100644
index 62000dc18..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_main.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/foo_library/foo_library.h"
-#else
-#  include "foo_library/foo_library.h"
-#endif
-
-namespace trace     = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace otlp      = opentelemetry::exporter::otlp;
-
-namespace
-{
-opentelemetry::exporter::otlp::OtlpFileExporterOptions opts;
-
-std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider;
-
-void InitTracer()
-{
-  // Create OTLP exporter instance
-  auto exporter  = otlp::OtlpFileExporterFactory::Create(opts);
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  provider       = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-
-  // Set the global trace provider
-  std::shared_ptr<opentelemetry::trace::TracerProvider> api_provider = provider;
-  trace_sdk::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (provider)
-  {
-    provider->ForceFlush();
-  }
-
-  provider.reset();
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  if (argc > 1)
-  {
-    opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions fs_backend;
-    fs_backend.file_pattern = argv[1];
-    opts.backend_options    = fs_backend;
-  }
-  // Removing this line will leave the default noop TracerProvider in place.
-  InitTracer();
-
-  foo_library();
-
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_metric_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_metric_main.cc
deleted file mode 100644
index 98a541159..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/file_metric_main.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/meter_context_factory.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/metrics_foo_library/foo_library.h"
-#else
-#  include "metrics_foo_library/foo_library.h"
-#endif
-
-namespace metrics_sdk   = opentelemetry::sdk::metrics;
-namespace common        = opentelemetry::common;
-namespace metrics_api   = opentelemetry::metrics;
-namespace otlp_exporter = opentelemetry::exporter::otlp;
-
-namespace
-{
-
-otlp_exporter::OtlpFileMetricExporterOptions exporter_options;
-
-void InitMetrics()
-{
-  auto exporter = otlp_exporter::OtlpFileMetricExporterFactory::Create(exporter_options);
-
-  std::string version{"1.2.0"};
-  std::string schema{"https://opentelemetry.io/schemas/1.2.0"};
-
-  // Initialize and set the global MeterProvider
-  metrics_sdk::PeriodicExportingMetricReaderOptions reader_options;
-  reader_options.export_interval_millis = std::chrono::milliseconds(1000);
-  reader_options.export_timeout_millis  = std::chrono::milliseconds(500);
-
-  auto reader = metrics_sdk::PeriodicExportingMetricReaderFactory::Create(std::move(exporter),
-                                                                          reader_options);
-
-  auto context = metrics_sdk::MeterContextFactory::Create();
-  context->AddMetricReader(std::move(reader));
-
-  auto u_provider = metrics_sdk::MeterProviderFactory::Create(std::move(context));
-  std::shared_ptr<opentelemetry::metrics::MeterProvider> provider(std::move(u_provider));
-
-  metrics_sdk::Provider::SetMeterProvider(provider);
-}
-
-void CleanupMetrics()
-{
-  std::shared_ptr<metrics_api::MeterProvider> none;
-  metrics_sdk::Provider::SetMeterProvider(none);
-}
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  std::string example_type;
-  if (argc > 1)
-  {
-    opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions fs_backend;
-    fs_backend.file_pattern          = argv[1];
-    exporter_options.backend_options = fs_backend;
-    if (argc > 2)
-    {
-      example_type = argv[2];
-    }
-  }
-  // Removing this line will leave the default noop MetricProvider in place.
-  InitMetrics();
-  std::string name{"otlp_file_metric_example"};
-
-  if (example_type == "counter")
-  {
-    foo_library::counter_example(name);
-  }
-  else if (example_type == "observable_counter")
-  {
-    foo_library::observable_counter_example(name);
-  }
-  else if (example_type == "histogram")
-  {
-    foo_library::histogram_example(name);
-  }
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  else if (example_type == "gauge")
-  {
-    foo_library::gauge_example(name);
-  }
-#endif
-  else
-  {
-    std::thread counter_example{&foo_library::counter_example, name};
-    std::thread observable_counter_example{&foo_library::observable_counter_example, name};
-    std::thread histogram_example{&foo_library::histogram_example, name};
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    std::thread gauge_example{&foo_library::gauge_example, name};
-#endif
-
-    counter_example.join();
-    observable_counter_example.join();
-    histogram_example.join();
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    gauge_example.join();
-#endif
-  }
-
-  CleanupMetrics();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_log_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_log_main.cc
deleted file mode 100644
index 2fc87dbd6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_log_main.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/provider.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/provider.h"
-
-#include <string>
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/logs_foo_library/foo_library.h"
-#else
-#  include "logs_foo_library/foo_library.h"
-#endif
-
-namespace trace     = opentelemetry::trace;
-namespace nostd     = opentelemetry::nostd;
-namespace otlp      = opentelemetry::exporter::otlp;
-namespace logs_sdk  = opentelemetry::sdk::logs;
-namespace logs      = opentelemetry::logs;
-namespace trace_sdk = opentelemetry::sdk::trace;
-
-namespace
-{
-opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
-opentelemetry::exporter::otlp::OtlpGrpcLogRecordExporterOptions log_opts;
-
-std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> tracer_provider;
-std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> logger_provider;
-
-void InitTracer(const std::shared_ptr<otlp::OtlpGrpcClient> &shared_client)
-{
-  // Create OTLP exporter instance
-  auto exporter   = otlp::OtlpGrpcExporterFactory::Create(opts, shared_client);
-  auto processor  = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  tracer_provider = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-
-  // Set the global trace provider
-  std::shared_ptr<opentelemetry::trace::TracerProvider> api_provider = tracer_provider;
-  trace_sdk::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (tracer_provider)
-  {
-    tracer_provider->ForceFlush();
-  }
-
-  tracer_provider.reset();
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-
-void InitLogger(const std::shared_ptr<otlp::OtlpGrpcClient> &shared_client)
-{
-  // Create OTLP exporter instance
-  auto exporter   = otlp::OtlpGrpcLogRecordExporterFactory::Create(log_opts, shared_client);
-  auto processor  = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
-  logger_provider = logs_sdk::LoggerProviderFactory::Create(std::move(processor));
-
-  // Set the global logger provider
-  std::shared_ptr<opentelemetry::logs::LoggerProvider> api_provider = logger_provider;
-  logs_sdk::Provider::SetLoggerProvider(api_provider);
-}
-
-void CleanupLogger()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (logger_provider)
-  {
-    logger_provider->ForceFlush();
-  }
-
-  logger_provider.reset();
-  nostd::shared_ptr<logs::LoggerProvider> none;
-  logs_sdk::Provider::SetLoggerProvider(none);
-}
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  if (argc > 1)
-  {
-    opts.endpoint     = argv[1];
-    log_opts.endpoint = argv[1];
-    if (argc > 2)
-    {
-      opts.use_ssl_credentials             = true;
-      log_opts.use_ssl_credentials         = true;
-      opts.ssl_credentials_cacert_path     = argv[2];
-      log_opts.ssl_credentials_cacert_path = argv[2];
-    }
-  }
-
-  std::shared_ptr<otlp::OtlpGrpcClient> shared_client = otlp::OtlpGrpcClientFactory::Create(opts);
-
-  InitLogger(shared_client);
-  InitTracer(shared_client);
-  foo_library();
-  CleanupTracer();
-  CleanupLogger();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_main.cc
deleted file mode 100644
index 1b9698b45..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_main.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/foo_library/foo_library.h"
-#else
-#  include "foo_library/foo_library.h"
-#endif
-
-namespace trace     = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace otlp      = opentelemetry::exporter::otlp;
-
-namespace
-{
-opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
-
-std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider;
-
-void InitTracer()
-{
-  // Create OTLP exporter instance
-  auto exporter  = otlp::OtlpGrpcExporterFactory::Create(opts);
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  provider       = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-
-  // Set the global trace provider
-  std::shared_ptr<opentelemetry::trace::TracerProvider> api_provider = provider;
-  trace_sdk::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (provider)
-  {
-    provider->ForceFlush();
-  }
-
-  provider.reset();
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  if (argc > 1)
-  {
-    opts.endpoint = argv[1];
-    if (argc > 2)
-    {
-      opts.use_ssl_credentials         = true;
-      opts.ssl_credentials_cacert_path = argv[2];
-    }
-  }
-  // Removing this line will leave the default noop TracerProvider in place.
-  InitTracer();
-
-  foo_library();
-
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_metric_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_metric_main.cc
deleted file mode 100644
index 761eabd4f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/grpc_metric_main.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "grpcpp/grpcpp.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-#include "opentelemetry/sdk/metrics/meter_context_factory.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
-#include "opentelemetry/sdk/metrics/view/view_factory.h"
-
-#include <memory>
-#include <thread>
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/metrics_foo_library/foo_library.h"
-#else
-#  include "metrics_foo_library/foo_library.h"
-#endif
-
-namespace metric_sdk    = opentelemetry::sdk::metrics;
-namespace common        = opentelemetry::common;
-namespace metrics_api   = opentelemetry::metrics;
-namespace otlp_exporter = opentelemetry::exporter::otlp;
-
-namespace
-{
-
-otlp_exporter::OtlpGrpcMetricExporterOptions exporter_options;
-
-void InitMetrics(std::string &name)
-{
-  auto exporter = otlp_exporter::OtlpGrpcMetricExporterFactory::Create(exporter_options);
-
-  std::string version{"1.2.0"};
-  std::string schema{"https://opentelemetry.io/schemas/1.2.0"};
-
-  // Initialize and set the global MeterProvider
-  metric_sdk::PeriodicExportingMetricReaderOptions reader_options;
-  reader_options.export_interval_millis = std::chrono::milliseconds(1000);
-  reader_options.export_timeout_millis  = std::chrono::milliseconds(500);
-
-  auto reader =
-      metric_sdk::PeriodicExportingMetricReaderFactory::Create(std::move(exporter), reader_options);
-
-  auto context = metric_sdk::MeterContextFactory::Create();
-  context->AddMetricReader(std::move(reader));
-
-  auto provider = metric_sdk::MeterProviderFactory::Create(std::move(context));
-
-  // histogram view
-  std::string histogram_name = name + "_exponential_histogram";
-  std::string unit           = "histogram-unit";
-
-  auto histogram_instrument_selector = metric_sdk::InstrumentSelectorFactory::Create(
-      metric_sdk::InstrumentType::kHistogram, histogram_name, unit);
-
-  auto histogram_meter_selector = metric_sdk::MeterSelectorFactory::Create(name, version, schema);
-
-  auto histogram_aggregation_config =
-      std::unique_ptr<metric_sdk::Base2ExponentialHistogramAggregationConfig>(
-          new metric_sdk::Base2ExponentialHistogramAggregationConfig);
-
-  std::shared_ptr<metric_sdk::AggregationConfig> aggregation_config(
-      std::move(histogram_aggregation_config));
-
-  auto histogram_view = metric_sdk::ViewFactory::Create(
-      name, "des", unit, metric_sdk::AggregationType::kBase2ExponentialHistogram,
-      aggregation_config);
-
-  provider->AddView(std::move(histogram_instrument_selector), std::move(histogram_meter_selector),
-                    std::move(histogram_view));
-
-  std::shared_ptr<opentelemetry::metrics::MeterProvider> api_provider(std::move(provider));
-
-  metric_sdk::Provider::SetMeterProvider(api_provider);
-}
-
-void CleanupMetrics()
-{
-  std::shared_ptr<metrics_api::MeterProvider> none;
-  metric_sdk::Provider::SetMeterProvider(none);
-}
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  std::string example_type;
-  if (argc > 1)
-  {
-    exporter_options.endpoint = argv[1];
-    if (argc > 2)
-    {
-      example_type = argv[2];
-      if (argc > 3)
-      {
-        exporter_options.use_ssl_credentials         = true;
-        exporter_options.ssl_credentials_cacert_path = argv[3];
-      }
-    }
-  }
-  std::cout << "Using endpoint: " << exporter_options.endpoint << std::endl;
-  std::cout << "Using example type: " << example_type << std::endl;
-  std::cout << "Using cacert path: " << exporter_options.ssl_credentials_cacert_path << std::endl;
-  std::cout << "Using ssl credentials: " << exporter_options.use_ssl_credentials << std::endl;
-
-  // Removing this line will leave the default noop MetricProvider in place.
-
-  std::string name{"otlp_grpc_metric_example"};
-
-  InitMetrics(name);
-
-  if (example_type == "counter")
-  {
-    foo_library::counter_example(name);
-  }
-  else if (example_type == "observable_counter")
-  {
-    foo_library::observable_counter_example(name);
-  }
-  else if (example_type == "histogram")
-  {
-    foo_library::histogram_example(name);
-  }
-  else if (example_type == "exponential_histogram")
-  {
-    foo_library::histogram_exp_example(name);
-  }
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  else if (example_type == "gauge")
-  {
-    foo_library::gauge_example(name);
-  }
-#endif
-  else
-  {
-    std::thread counter_example{&foo_library::counter_example, name};
-    std::thread observable_counter_example{&foo_library::observable_counter_example, name};
-    std::thread histogram_example{&foo_library::histogram_example, name};
-    std::thread histogram_exp_example{&foo_library::histogram_exp_example, name};
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    std::thread gauge_example{&foo_library::gauge_example, name};
-#endif
-
-    counter_example.join();
-    observable_counter_example.join();
-    histogram_example.join();
-    histogram_exp_example.join();
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    gauge_example.join();
-#endif
-  }
-
-  CleanupMetrics();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_instrumented_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_instrumented_main.cc
deleted file mode 100644
index 5084a6a5f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_instrumented_main.cc
+++ /dev/null
@@ -1,360 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <iostream>
-#include <memory>
-#include <mutex>  // IWYU pragma: keep
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_factory.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_runtime_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/provider.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/meter_context_factory.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_factory.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_runtime_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/logs_foo_library/foo_library.h"
-#  include "examples/common/metrics_foo_library/foo_library.h"
-#else
-#  include "logs_foo_library/foo_library.h"
-#  include "metrics_foo_library/foo_library.h"
-#endif
-
-namespace
-{
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-
-std::mutex serialize;
-
-/**
- The purpose of MyThreadInstrumentation is to demonstrate
- how notifications are delivered to the application.
-
- Printing to std::cout is useful for debugging,
- to understand the overall thread execution in the library.
-
- In production, a real application would instead:
- - set thread priorities / CPU affinity
- - set thread local storage keys
- - set a thread name to the operating system
- - set network namespaces
- in the OnXXX() code here.
-*/
-class MyThreadInstrumentation : public opentelemetry::sdk::common::ThreadInstrumentation
-{
-public:
-  MyThreadInstrumentation(const std::string &thread_name,
-                          const std::string &network_name,
-                          const std::string &priority)
-      : thread_name_(thread_name), network_name_(network_name), priority_(priority)
-  {}
-  ~MyThreadInstrumentation() override = default;
-
-  void OnStart() override
-  {
-    std::lock_guard<std::mutex> lock_guard(serialize);
-    std::cout << "OnStart() thread " << thread_name_ << ", id " << std::this_thread::get_id();
-    if (!network_name_.empty())
-    {
-      std::cout << ", network_name " << network_name_;
-    }
-    if (!priority_.empty())
-    {
-      std::cout << ", priority " << priority_;
-    }
-    std::cout << std::endl << std::flush;
-  }
-
-  void OnEnd() override
-  {
-    std::lock_guard<std::mutex> lock_guard(serialize);
-    std::cout << "OnEnd() thread " << thread_name_ << ", id " << std::this_thread::get_id()
-              << std::endl
-              << std::flush;
-  }
-
-  void BeforeWait() override
-  {
-    std::lock_guard<std::mutex> lock_guard(serialize);
-    std::cout << "BeforeWait() thread " << thread_name_ << ", id " << std::this_thread::get_id()
-              << ", waiting" << std::endl
-              << std::flush;
-  }
-
-  void AfterWait() override
-  {
-    std::lock_guard<std::mutex> lock_guard(serialize);
-    std::cout << "AfterWait() thread " << thread_name_ << ", id " << std::this_thread::get_id()
-              << ", done waiting" << std::endl
-              << std::flush;
-  }
-
-  void BeforeLoad() override
-  {
-    std::lock_guard<std::mutex> lock_guard(serialize);
-    std::cout << "BeforeLoad() thread " << thread_name_ << ", id " << std::this_thread::get_id()
-              << ", about to work" << std::endl
-              << std::flush;
-  }
-
-  void AfterLoad() override
-  {
-    std::lock_guard<std::mutex> lock_guard(serialize);
-    std::cout << "AfterLoad() thread " << thread_name_ << ", id " << std::this_thread::get_id()
-              << ", done working" << std::endl
-              << std::flush;
-  }
-
-private:
-  std::string thread_name_;
-  std::string network_name_;
-  std::string priority_;
-};
-
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-opentelemetry::exporter::otlp::OtlpHttpExporterOptions tracer_opts;
-opentelemetry::exporter::otlp::OtlpHttpMetricExporterOptions meter_opts;
-opentelemetry::exporter::otlp::OtlpHttpLogRecordExporterOptions logger_opts;
-
-std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> tracer_provider;
-std::shared_ptr<opentelemetry::sdk::metrics::MeterProvider> meter_provider;
-std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> logger_provider;
-
-void InitTracer()
-{
-  // Create OTLP exporter instance
-  opentelemetry::exporter::otlp::OtlpHttpExporterRuntimeOptions exp_rt_opts;
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  auto exp_instr = std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation>(
-      new MyThreadInstrumentation("OtlpHttpExporter", "trace-net", "high"));
-  exp_rt_opts.thread_instrumentation = exp_instr;
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-  auto exporter =
-      opentelemetry::exporter::otlp::OtlpHttpExporterFactory::Create(tracer_opts, exp_rt_opts);
-
-  // Create Processor instance
-  opentelemetry::sdk::trace::BatchSpanProcessorOptions pro_opts;
-  opentelemetry::sdk::trace::BatchSpanProcessorRuntimeOptions pro_rt_opts;
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  auto pro_instr = std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation>(
-      new MyThreadInstrumentation("BatchSpanProcessor", "", "high"));
-  pro_rt_opts.thread_instrumentation = pro_instr;
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-  auto processor = opentelemetry::sdk::trace::BatchSpanProcessorFactory::Create(
-      std::move(exporter), pro_opts, pro_rt_opts);
-
-  // Create Provider instance
-  tracer_provider = opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(processor));
-
-  // Set the global trace provider
-  std::shared_ptr<opentelemetry::trace::TracerProvider> api_provider = tracer_provider;
-  opentelemetry::sdk::trace::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (tracer_provider)
-  {
-    tracer_provider->ForceFlush();
-    tracer_provider->Shutdown();
-  }
-
-  tracer_provider.reset();
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  opentelemetry::sdk::trace::Provider::SetTracerProvider(none);
-}
-
-void InitMetrics()
-{
-  // Create OTLP exporter instance
-  opentelemetry::exporter::otlp::OtlpHttpMetricExporterRuntimeOptions exp_rt_opts;
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  auto exp_instr = std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation>(
-      new MyThreadInstrumentation("OtlpHttpMetricExporter", "metric-net", "medium"));
-  exp_rt_opts.thread_instrumentation = exp_instr;
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-  auto exporter =
-      opentelemetry::exporter::otlp::OtlpHttpMetricExporterFactory::Create(meter_opts, exp_rt_opts);
-
-  std::string version{"1.2.0"};
-  std::string schema{"https://opentelemetry.io/schemas/1.2.0"};
-
-  // Initialize and set the global MeterProvider
-  opentelemetry::sdk::metrics::PeriodicExportingMetricReaderOptions reader_options;
-  reader_options.export_interval_millis = std::chrono::milliseconds(1000);
-  reader_options.export_timeout_millis  = std::chrono::milliseconds(500);
-
-  opentelemetry::sdk::metrics::PeriodicExportingMetricReaderRuntimeOptions reader_rt_opts;
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  auto reader_periodic_instr = std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation>(
-      new MyThreadInstrumentation("PeriodicExportingMetricReader(periodic)", "", "medium"));
-  auto reader_collect_instr = std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation>(
-      new MyThreadInstrumentation("PeriodicExportingMetricReader(collect)", "", "medium"));
-  reader_rt_opts.periodic_thread_instrumentation = reader_periodic_instr;
-  reader_rt_opts.collect_thread_instrumentation  = reader_collect_instr;
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-  auto reader = opentelemetry::sdk::metrics::PeriodicExportingMetricReaderFactory::Create(
-      std::move(exporter), reader_options, reader_rt_opts);
-
-  auto context = opentelemetry::sdk::metrics::MeterContextFactory::Create();
-  context->AddMetricReader(std::move(reader));
-
-  meter_provider = opentelemetry::sdk::metrics::MeterProviderFactory::Create(std::move(context));
-  std::shared_ptr<opentelemetry::metrics::MeterProvider> api_provider = meter_provider;
-
-  opentelemetry::sdk::metrics::Provider::SetMeterProvider(api_provider);
-}
-
-void CleanupMetrics()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (meter_provider)
-  {
-    meter_provider->ForceFlush();
-    meter_provider->Shutdown();
-  }
-
-  meter_provider.reset();
-  std::shared_ptr<opentelemetry::metrics::MeterProvider> none;
-  opentelemetry::sdk::metrics::Provider::SetMeterProvider(none);
-}
-
-void InitLogger()
-{
-  // Create OTLP exporter instance
-  opentelemetry::exporter::otlp::OtlpHttpLogRecordExporterRuntimeOptions exp_rt_opts;
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  auto exp_instr = std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation>(
-      new MyThreadInstrumentation("OtlpHttpLogRecordExporter", "log-net", "low"));
-  exp_rt_opts.thread_instrumentation = exp_instr;
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-  auto exporter = opentelemetry::exporter::otlp::OtlpHttpLogRecordExporterFactory::Create(
-      logger_opts, exp_rt_opts);
-
-  // Create Processor instance
-  opentelemetry::sdk::logs::BatchLogRecordProcessorOptions pro_opts;
-  opentelemetry::sdk::logs::BatchLogRecordProcessorRuntimeOptions pro_rt_opts;
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  auto pro_instr = std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation>(
-      new MyThreadInstrumentation("BatchLogRecordProcessor", "", "low"));
-  pro_rt_opts.thread_instrumentation = pro_instr;
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-  auto processor = opentelemetry::sdk::logs::BatchLogRecordProcessorFactory::Create(
-      std::move(exporter), pro_opts, pro_rt_opts);
-
-  logger_provider = opentelemetry::sdk::logs::LoggerProviderFactory::Create(std::move(processor));
-
-  std::shared_ptr<opentelemetry::logs::LoggerProvider> api_provider = logger_provider;
-  opentelemetry::sdk::logs::Provider::SetLoggerProvider(api_provider);
-}
-
-void CleanupLogger()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (logger_provider)
-  {
-    logger_provider->ForceFlush();
-    logger_provider->Shutdown();
-  }
-
-  logger_provider.reset();
-  std::shared_ptr<opentelemetry::logs::LoggerProvider> none;
-  opentelemetry::sdk::logs::Provider::SetLoggerProvider(none);
-}
-
-}  // namespace
-
-/*
-  Usage:
-  - example_otlp_instrumented_http
-  - example_otlp_instrumented_http <TRACE_URL> <METRIC_URL> <LOG_URL>
-*/
-int main(int argc, char *argv[])
-{
-  if (argc > 1)
-  {
-    tracer_opts.url = argv[1];
-  }
-  else
-  {
-    tracer_opts.url = "http://localhost:4318/v1/traces";
-  }
-
-  if (argc > 2)
-  {
-    meter_opts.url = argv[2];
-  }
-  else
-  {
-    meter_opts.url = "http://localhost:4318/v1/metrics";
-  }
-
-  if (argc > 3)
-  {
-    logger_opts.url = argv[3];
-  }
-  else
-  {
-    logger_opts.url = "http://localhost:4318/v1/logs";
-  }
-
-  std::cout << "Initializing opentelemetry-cpp" << std::endl << std::flush;
-
-  InitTracer();
-  InitMetrics();
-  InitLogger();
-
-  std::cout << "Application payload" << std::endl << std::flush;
-
-  foo_library();
-
-  std::string name{"otlp_http_metric_example"};
-  foo_library::observable_counter_example(name);
-
-  std::cout << "Shutting down opentelemetry-cpp" << std::endl << std::flush;
-
-  CleanupLogger();
-  CleanupMetrics();
-  CleanupTracer();
-
-  std::cout << "Done" << std::endl << std::flush;
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_log_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_log_main.cc
deleted file mode 100644
index ad96d6b02..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_log_main.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <iostream>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/provider.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/logs_foo_library/foo_library.h"
-#else
-#  include "logs_foo_library/foo_library.h"
-#endif
-
-namespace trace     = opentelemetry::trace;
-namespace otlp      = opentelemetry::exporter::otlp;
-namespace logs_sdk  = opentelemetry::sdk::logs;
-namespace logs      = opentelemetry::logs;
-namespace trace_sdk = opentelemetry::sdk::trace;
-
-namespace internal_log = opentelemetry::sdk::common::internal_log;
-
-namespace
-{
-
-opentelemetry::exporter::otlp::OtlpHttpExporterOptions trace_opts;
-
-std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> tracer_provider;
-
-void InitTracer()
-{
-  if (trace_opts.url.size() > 9)
-  {
-    if (trace_opts.url.substr(trace_opts.url.size() - 8) == "/v1/logs")
-    {
-      trace_opts.url = trace_opts.url.substr(0, trace_opts.url.size() - 8) + "/v1/traces";
-    }
-    else if (trace_opts.url.substr(trace_opts.url.size() - 9) == "/v1/logs/")
-    {
-      trace_opts.url = trace_opts.url.substr(0, trace_opts.url.size() - 9) + "/v1/traces";
-    }
-    else
-    {
-      trace_opts.url = opentelemetry::exporter::otlp::GetOtlpDefaultHttpTracesEndpoint();
-    }
-  }
-  std::cout << "Using " << trace_opts.url << " to export trace spans." << '\n';
-
-  // Create OTLP exporter instance
-  auto exporter   = otlp::OtlpHttpExporterFactory::Create(trace_opts);
-  auto processor  = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  tracer_provider = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-
-  // Set the global trace provider
-  std::shared_ptr<opentelemetry::trace::TracerProvider> api_provider = tracer_provider;
-  trace_sdk::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (tracer_provider)
-  {
-    tracer_provider->ForceFlush();
-  }
-
-  tracer_provider.reset();
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-
-opentelemetry::exporter::otlp::OtlpHttpLogRecordExporterOptions logger_opts;
-
-std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> logger_provider;
-
-void InitLogger()
-{
-  std::cout << "Using " << logger_opts.url << " to export log records." << '\n';
-  logger_opts.console_debug = true;
-  // Create OTLP exporter instance
-  auto exporter   = otlp::OtlpHttpLogRecordExporterFactory::Create(logger_opts);
-  auto processor  = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
-  logger_provider = logs_sdk::LoggerProviderFactory::Create(std::move(processor));
-
-  std::shared_ptr<opentelemetry::logs::LoggerProvider> api_provider = logger_provider;
-  logs_sdk::Provider::SetLoggerProvider(api_provider);
-}
-
-void CleanupLogger()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (logger_provider)
-  {
-    logger_provider->ForceFlush();
-  }
-
-  logger_provider.reset();
-  std::shared_ptr<logs::LoggerProvider> none;
-  logs_sdk::Provider::SetLoggerProvider(none);
-}
-}  // namespace
-
-/*
-  Usage:
-  - example_otlp_http_log
-  - example_otlp_http_log <URL>
-  - example_otlp_http_log <URL> <DEBUG>
-  - example_otlp_http_log <URL> <DEBUG> <BIN>
-  <DEBUG> = yes|no, to turn console debug on or off
-  <BIN> = bin, to export in binary format
-*/
-int main(int argc, char *argv[])
-{
-  if (argc > 1)
-  {
-    trace_opts.url  = argv[1];
-    logger_opts.url = argv[1];
-    if (argc > 2)
-    {
-      std::string debug        = argv[2];
-      trace_opts.console_debug = debug != "" && debug != "0" && debug != "no";
-    }
-
-    if (argc > 3)
-    {
-      std::string binary_mode = argv[3];
-      if (binary_mode.size() >= 3 && binary_mode.substr(0, 3) == "bin")
-      {
-        trace_opts.content_type  = opentelemetry::exporter::otlp::HttpRequestContentType::kBinary;
-        logger_opts.content_type = opentelemetry::exporter::otlp::HttpRequestContentType::kBinary;
-      }
-    }
-  }
-
-  if (trace_opts.console_debug)
-  {
-    internal_log::GlobalLogHandler::SetLogLevel(internal_log::LogLevel::Debug);
-  }
-
-  InitLogger();
-  InitTracer();
-  foo_library();
-  CleanupTracer();
-  CleanupLogger();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_main.cc
deleted file mode 100644
index a76a00e18..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_main.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/foo_library/foo_library.h"
-#else
-#  include "foo_library/foo_library.h"
-#endif
-
-namespace trace     = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace otlp      = opentelemetry::exporter::otlp;
-
-namespace internal_log = opentelemetry::sdk::common::internal_log;
-
-namespace
-{
-opentelemetry::exporter::otlp::OtlpHttpExporterOptions opts;
-
-std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider;
-
-void InitTracer()
-{
-  // Create OTLP exporter instance
-  auto exporter  = otlp::OtlpHttpExporterFactory::Create(opts);
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  provider       = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-  // Set the global trace provider
-  std::shared_ptr<opentelemetry::trace::TracerProvider> api_provider = provider;
-  trace_sdk::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  // We call ForceFlush to prevent to cancel running exportings, It's optional.
-  if (provider)
-  {
-    provider->ForceFlush();
-  }
-
-  provider.reset();
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-}  // namespace
-
-/*
-  Usage:
-  - example_otlp_http
-  - example_otlp_http <URL>
-  - example_otlp_http <URL> <DEBUG>
-  - example_otlp_http <URL> <DEBUG> <BIN>
-  <DEBUG> = yes|no, to turn console debug on or off
-  <BIN> = bin, to export in binary format
-*/
-int main(int argc, char *argv[])
-{
-  if (argc > 1)
-  {
-    opts.url = argv[1];
-    if (argc > 2)
-    {
-      std::string debug  = argv[2];
-      opts.console_debug = debug != "" && debug != "0" && debug != "no";
-    }
-
-    if (argc > 3)
-    {
-      std::string binary_mode = argv[3];
-      if (binary_mode.size() >= 3 && binary_mode.substr(0, 3) == "bin")
-      {
-        opts.content_type = otlp::HttpRequestContentType::kBinary;
-      }
-    }
-  }
-
-  if (opts.console_debug)
-  {
-    internal_log::GlobalLogHandler::SetLogLevel(internal_log::LogLevel::Debug);
-  }
-
-  // Removing this line will leave the default noop TracerProvider in place.
-  InitTracer();
-
-  foo_library();
-
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_metric_main.cc b/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_metric_main.cc
deleted file mode 100644
index 7e0040e3c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/http_metric_main.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/meter_context_factory.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/metrics_foo_library/foo_library.h"
-#else
-#  include "metrics_foo_library/foo_library.h"
-#endif
-
-namespace metrics_sdk   = opentelemetry::sdk::metrics;
-namespace common        = opentelemetry::common;
-namespace metrics_api   = opentelemetry::metrics;
-namespace otlp_exporter = opentelemetry::exporter::otlp;
-
-namespace internal_log = opentelemetry::sdk::common::internal_log;
-
-namespace
-{
-
-otlp_exporter::OtlpHttpMetricExporterOptions exporter_options;
-
-void InitMetrics()
-{
-  auto exporter = otlp_exporter::OtlpHttpMetricExporterFactory::Create(exporter_options);
-
-  std::string version{"1.2.0"};
-  std::string schema{"https://opentelemetry.io/schemas/1.2.0"};
-
-  // Initialize and set the global MeterProvider
-  metrics_sdk::PeriodicExportingMetricReaderOptions reader_options;
-  reader_options.export_interval_millis = std::chrono::milliseconds(1000);
-  reader_options.export_timeout_millis  = std::chrono::milliseconds(500);
-
-  auto reader = metrics_sdk::PeriodicExportingMetricReaderFactory::Create(std::move(exporter),
-                                                                          reader_options);
-
-  auto context = metrics_sdk::MeterContextFactory::Create();
-  context->AddMetricReader(std::move(reader));
-
-  auto u_provider = metrics_sdk::MeterProviderFactory::Create(std::move(context));
-  std::shared_ptr<opentelemetry::metrics::MeterProvider> provider(std::move(u_provider));
-
-  metrics_sdk::Provider::SetMeterProvider(provider);
-}
-
-void CleanupMetrics()
-{
-  std::shared_ptr<metrics_api::MeterProvider> none;
-  metrics_sdk::Provider::SetMeterProvider(none);
-}
-}  // namespace
-
-/*
-  Usage:
-  - example_otlp_http_metric
-  - example_otlp_http_metric <URL>
-  - example_otlp_http_metric <URL> <EXAMPLE>
-  - example_otlp_http_metric <URL> <EXAMPLE> <DEBUG>
-  - example_otlp_http_metric <URL> <EXAMPLE> <DEBUG> <BIN>
-  <EXAMPLE> = counter|observable_counter|histogram|all
-  <DEBUG> = yes|no, to turn console debug on or off
-  <BIN> = bin, to export in binary format
-*/
-int main(int argc, char *argv[])
-{
-  std::string example_type;
-  if (argc > 1)
-  {
-    exporter_options.url = argv[1];
-  }
-
-  if (argc > 2)
-  {
-    example_type = argv[2];
-  }
-
-  if (argc > 3)
-  {
-    std::string debug              = argv[3];
-    exporter_options.console_debug = debug != "" && debug != "0" && debug != "no";
-  }
-
-  if (argc > 4)
-  {
-    std::string binary_mode = argv[4];
-    if (binary_mode.size() >= 3 && binary_mode.substr(0, 3) == "bin")
-    {
-      exporter_options.content_type = otlp_exporter::HttpRequestContentType::kBinary;
-    }
-  }
-
-  if (exporter_options.console_debug)
-  {
-    internal_log::GlobalLogHandler::SetLogLevel(internal_log::LogLevel::Debug);
-  }
-
-  // Removing this line will leave the default noop MetricProvider in place.
-  InitMetrics();
-  std::string name{"otlp_http_metric_example"};
-
-  if (example_type == "counter")
-  {
-    foo_library::counter_example(name);
-  }
-  else if (example_type == "observable_counter")
-  {
-    foo_library::observable_counter_example(name);
-  }
-  else if (example_type == "histogram")
-  {
-    foo_library::histogram_example(name);
-  }
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  else if (example_type == "gauge")
-  {
-    foo_library::gauge_example(name);
-  }
-#endif
-  else
-  {
-    std::thread counter_example{&foo_library::counter_example, name};
-    std::thread observable_counter_example{&foo_library::observable_counter_example, name};
-    std::thread histogram_example{&foo_library::histogram_example, name};
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    std::thread gauge_example{&foo_library::gauge_example, name};
-#endif
-
-    counter_example.join();
-    observable_counter_example.join();
-    histogram_example.join();
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    gauge_example.join();
-#endif
-  }
-
-  CleanupMetrics();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/otlp/opentelemetry-collector-config/config.dev.yaml b/ext/opentelemetry-cpp-1.21.0/examples/otlp/opentelemetry-collector-config/config.dev.yaml
deleted file mode 100644
index b98e38491..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/otlp/opentelemetry-collector-config/config.dev.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-exporters:
-  debug:
-    verbosity: detailed
-receivers:
-  otlp:
-    protocols:
-      grpc:
-        endpoint: 0.0.0.0:4317
-      http:
-        endpoint: 0.0.0.0:4318
-service:
-  pipelines:
-    traces:
-      receivers:
-      - otlp
-      exporters:
-      - debug
-    logs:
-      receivers:
-      - otlp
-      exporters:
-      - debug
-    metrics:
-      receivers:
-      - otlp
-      exporters:
-      - debug
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/plugin/CMakeLists.txt
deleted file mode 100644
index 5dfc79963..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(load)
-
-if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
-  add_subdirectory(plugin)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/BUILD
deleted file mode 100644
index b129854a4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "load_plugin",
-    srcs = [
-        "main.cc",
-    ],
-    linkopts = [
-        "-ldl",
-    ],
-    deps = [
-        "//api",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/CMakeLists.txt
deleted file mode 100644
index ab8d51fde..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(load_plugin_example main.cc)
-target_link_libraries(load_plugin_example PRIVATE opentelemetry-cpp::api
-                                                  ${CMAKE_DL_LIBS})
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/main.cc
deleted file mode 100644
index 81d522137..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/load/main.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <cstdio>
-#include <fstream>  // IWYU pragma: keep
-#include <iostream>
-#include <iterator>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/plugin/dynamic_load.h"
-#include "opentelemetry/plugin/factory.h"
-#include "opentelemetry/trace/tracer.h"
-
-int main(int argc, char *argv[])
-{
-  if (argc != 3)
-  {
-    std::cerr << "Usage: load_plugin <plugin> <config>\n";
-    return -1;
-  }
-  std::string error_message;
-  auto factory = opentelemetry::plugin::LoadFactory(argv[1], error_message);
-  if (factory == nullptr)
-  {
-    std::cerr << "Failed to load opentelemetry plugin: " << error_message << "\n";
-    return -1;
-  }
-  std::ifstream config_in{argv[2]};
-  if (!config_in.good())
-  {
-    std::perror("Failed to open config file");
-    return -1;
-  }
-  std::string config{std::istreambuf_iterator<char>{config_in}, std::istreambuf_iterator<char>{}};
-  auto tracer = factory->MakeTracer(config, error_message);
-  if (tracer == nullptr)
-  {
-    std::cerr << "Failed to make tracer: " << error_message << "\n";
-    return -1;
-  }
-  auto span = tracer->StartSpan("abc");
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/BUILD
deleted file mode 100644
index 2f7398066..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_plugin.so",
-    srcs = [
-        "factory_impl.cc",
-        "tracer.cc",
-        "tracer.h",
-    ],
-    linkshared = 1,
-    deps = [
-        "//api",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/CMakeLists.txt
deleted file mode 100644
index 116b991fc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(example_plugin SHARED tracer.cc factory_impl.cc)
-target_link_libraries(example_plugin PUBLIC opentelemetry-cpp::api)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/factory_impl.cc b/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/factory_impl.cc
deleted file mode 100644
index 6eaa4aa4f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/factory_impl.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <new>
-#include <utility>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/plugin/factory.h"
-#include "opentelemetry/plugin/hook.h"
-#include "opentelemetry/plugin/tracer.h"
-#include "tracer.h"
-
-namespace nostd  = opentelemetry::nostd;
-namespace plugin = opentelemetry::plugin;
-
-class TracerHandle final : public plugin::TracerHandle
-{
-public:
-  explicit TracerHandle(std::shared_ptr<Tracer> &&tracer) noexcept : tracer_{std::move(tracer)} {}
-
-  // opentelemetry::plugin::TracerHandle
-  Tracer &tracer() const noexcept override { return *tracer_; }
-
-private:
-  std::shared_ptr<Tracer> tracer_;
-};
-
-class FactoryImpl final : public plugin::Factory::FactoryImpl
-{
-public:
-  // opentelemetry::plugin::Factory::FactoryImpl
-  nostd::unique_ptr<plugin::TracerHandle> MakeTracerHandle(
-      nostd::string_view /* tracer_config */,
-      nostd::unique_ptr<char[]> & /* error_message */) const noexcept override
-  {
-    std::shared_ptr<Tracer> tracer{new (std::nothrow) Tracer{""}};
-    if (tracer == nullptr)
-    {
-      return nullptr;
-    }
-    return nostd::unique_ptr<TracerHandle>{new (std::nothrow) TracerHandle{std::move(tracer)}};
-  }
-};
-
-static nostd::unique_ptr<plugin::Factory::FactoryImpl> MakeFactoryImpl(
-    const plugin::LoaderInfo &loader_info,
-    nostd::unique_ptr<char[]> &error_message) noexcept
-{
-  (void)loader_info;
-  (void)error_message;
-  return nostd::unique_ptr<plugin::Factory::FactoryImpl>{new (std::nothrow) FactoryImpl{}};
-}
-
-OPENTELEMETRY_DEFINE_PLUGIN_HOOK(MakeFactoryImpl)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/tracer.cc b/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/tracer.cc
deleted file mode 100644
index a89640e00..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/tracer.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <iostream>
-#include <new>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "tracer.h"
-
-namespace nostd   = opentelemetry::nostd;
-namespace common  = opentelemetry::common;
-namespace trace   = opentelemetry::trace;
-namespace context = opentelemetry::context;
-
-namespace
-{
-class Span final : public trace::Span
-{
-public:
-  Span(std::shared_ptr<Tracer> &&tracer,
-       nostd::string_view name,
-       const common::KeyValueIterable & /*attributes*/,
-       const trace::SpanContextKeyValueIterable & /*links*/,
-       const trace::StartSpanOptions & /*options*/) noexcept
-      : tracer_{std::move(tracer)}, name_{name}, span_context_{trace::SpanContext::GetInvalid()}
-  {
-    std::cout << "StartSpan: " << name << "\n";
-  }
-
-  ~Span() override { std::cout << "~Span\n"; }
-
-  // opentelemetry::trace::Span
-  void SetAttribute(nostd::string_view /*name*/,
-                    const common::AttributeValue & /*value*/) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /*name*/) noexcept override {}
-
-  void AddEvent(nostd::string_view /*name*/,
-                common::SystemTimestamp /*timestamp*/) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /*name*/,
-                common::SystemTimestamp /*timestamp*/,
-                const common::KeyValueIterable & /*attributes*/) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /*name*/,
-                const common::KeyValueIterable & /*attributes*/) noexcept override
-  {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void AddLink(const trace::SpanContext & /* target */,
-               const common::KeyValueIterable & /* attrs */) noexcept override
-  {}
-
-  void AddLinks(const trace::SpanContextKeyValueIterable & /* links */) noexcept override {}
-#endif
-
-  void SetStatus(trace::StatusCode /*code*/, nostd::string_view /*description*/) noexcept override
-  {}
-
-  void UpdateName(nostd::string_view /*name*/) noexcept override {}
-
-  void End(const trace::EndSpanOptions & /*options*/) noexcept override {}
-
-  bool IsRecording() const noexcept override { return true; }
-
-  trace::SpanContext GetContext() const noexcept override { return span_context_; }
-
-private:
-  std::shared_ptr<Tracer> tracer_;
-  std::string name_;
-  trace::SpanContext span_context_;
-};
-}  // namespace
-
-Tracer::Tracer(nostd::string_view /*output*/)
-{
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  UpdateEnabled(true);
-#endif
-}
-
-nostd::shared_ptr<trace::Span> Tracer::StartSpan(nostd::string_view name,
-                                                 const common::KeyValueIterable &attributes,
-                                                 const trace::SpanContextKeyValueIterable &links,
-                                                 const trace::StartSpanOptions &options) noexcept
-{
-  return nostd::shared_ptr<trace::Span>{
-      new (std::nothrow) Span{this->shared_from_this(), name, attributes, links, options}};
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/tracer.h b/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/tracer.h
deleted file mode 100644
index 92012fa4a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/plugin/plugin/tracer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/tracer.h"
-
-class Tracer final : public opentelemetry::trace::Tracer,
-                     public std::enable_shared_from_this<Tracer>
-{
-public:
-  explicit Tracer(opentelemetry::nostd::string_view output);
-
-  // opentelemetry::trace::Tracer
-  opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> StartSpan(
-      opentelemetry::nostd::string_view name,
-      const opentelemetry::common::KeyValueIterable & /*attributes*/,
-      const opentelemetry::trace::SpanContextKeyValueIterable & /*links*/,
-      const opentelemetry::trace::StartSpanOptions & /*options */) noexcept override;
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-
-  void ForceFlushWithMicroseconds(uint64_t /*timeout*/) noexcept override {}
-
-  void CloseWithMicroseconds(uint64_t /*timeout*/) noexcept override {}
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-};
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/prometheus/BUILD
deleted file mode 100644
index 0a6789f21..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "prometheus_example",
-    srcs = [
-        "main.cc",
-    ],
-    linkopts = ["-pthread"],
-    tags = ["ostream"],
-    deps = [
-        "//api",
-        "//examples/common/metrics_foo_library:common_metrics_foo_library",
-        "//exporters/prometheus:prometheus_exporter",
-        "//sdk/src/metrics",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/prometheus/CMakeLists.txt
deleted file mode 100644
index d101274e7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(prometheus_example main.cc)
-target_link_libraries(
-  prometheus_example PRIVATE opentelemetry-cpp::prometheus_exporter
-                             common_metrics_foo_library)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/README.md b/ext/opentelemetry-cpp-1.21.0/examples/prometheus/README.md
deleted file mode 100644
index d44007391..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/README.md
+++ /dev/null
@@ -1,180 +0,0 @@
-# Getting Started with Prometheus and Grafana
-
-- [Export metrics from the application](#export-metrics-from-the-application)
-  - [Check results in the browser](#check-results-in-the-browser)
-- [Collect metrics using Prometheus](#collect-metrics-using-prometheus)
-  - [Configuration](#configuration)
-  - [Start Prometheus](#start-prometheus)
-  - [View results in Prometheus](#view-results-in-prometheus)
-- [Explore metrics using Grafana](#explore-metrics-using-grafana)
-- [Learn more](#learn-more)
-
-## Export metrics from the application
-
-Run the application with:
-
-```sh
-bazel run //examples/prometheus:prometheus_example
-```
-
-OpenTelemetry `PrometheusExporter` will export
-data via the endpoint defined by
-`metrics_exporter::PrometheusExporterOptions::url`,
-which is `http://localhost:9464/` by default.
-
-```mermaid
-graph LR
-
-subgraph SDK
-  MeterProvider
-  MetricReader["PrometheusExporter<br/>(http://localhost:9464/)"]
-end
-
-subgraph API
-  Instrument["Meter(#quot;prometheus_metric_example#quot;, #quot;1.0#quot;)<br/>Histogram(#quot;prometheus_metric_example_histogram#quot;)"]
-end
-
-Instrument --> | Measurements | MeterProvider
-
-MeterProvider --> | Metrics | MetricReader
-```
-
-Also, for our learning purpose, we use a while-loop to keep recoring random
-values until the program stops.
-
-```cpp
-while (true)
-{
-    double val = (rand() % 700) + 1.1;
-    std::map<std::string, std::string> labels = get_random_attr();
-    auto labelkv = opentelemetry::common::KeyValueIterableView<decltype(labels)>{labels};
-    histogram_counter->Record(val, labelkv, context);
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
-}
-```
-
-### Check results in the browser
-
-Start the application and keep it running. Now we should be able to see the
-metrics at [http://localhost:9464/metrics](http://localhost:9464/metrics) from a
-web browser:
-
-![Browser UI](https://user-images.githubusercontent.com/9139451/224979531-beaa4d6e-98ec-4798-9934-ed25c6b196db.png)
-
-Now, we understand how we can configure `PrometheusExporter` to export metrics.
-Next, we are going to learn about how to use Prometheus to collect the metrics.
-
-## Collect metrics using Prometheus
-
-Follow the [first steps](https://prometheus.io/docs/introduction/first_steps/)
-to download the [latest release](https://prometheus.io/download/) of Prometheus.
-It is also possible to use `prom/prometheus` docker image.
-
-### Configuration
-
-After downloading, extract it to a local location that's easy to
-access. We will find the default Prometheus configuration YAML file in the
-folder, named `prometheus.yml`.
-
-```yaml
-global:
-  scrape_interval: 5s
-  scrape_timeout: 2s
-  evaluation_interval: 5s
-scrape_configs:
-  - job_name: otel
-    static_configs:
-      - targets: ['localhost:9464']
-```
-
-### Start Prometheus
-
-Follow the instructions from
-[starting-prometheus](https://prometheus.io/docs/introduction/first_steps/#starting-prometheus)
-to start the Prometheus server and verify it has been started successfully.
-
-Please note that we will need pass in `prometheus.yml` file as the argument
-or mount as volume:
-
-```console
-./prometheus --config.file=prometheus.yml
-# OR:
-docker run -p 9090:9090 -v $(pwd):/etc/prometheus --network="host" prom/prometheus
-```
-
-### View results in Prometheus
-
-To use the graphical interface for viewing our metrics with Prometheus, navigate
-to [http://localhost:9090/graph](http://localhost:9090/graph),
-and type `prometheus_metric_example_histogram_bucket` in the expression bar of
-the UI; finally, click the execute button.
-
-We should be able to see the following chart from the browser:
-
-![Prometheus UI](https://user-images.githubusercontent.com/9139451/224979224-e7d3865a-f56e-4bb9-8aab-e3f81de40d6e.png)
-
-From the legend, we can see that the `instance` name and the `job` name are the
-values we have set in `prometheus.yml`.
-
-Congratulations!
-
-Now we know how to configure Prometheus server and deploy OpenTelemetry
-`PrometheusExporter` to export our metrics. Next, we are going to explore a tool
-called Grafana, which has powerful visualizations for the metrics.
-
-## Explore metrics using Grafana
-
-[Install Grafana](https://grafana.com/docs/grafana/latest/installation/).
-
-Start the standalone Grafana server (`grafana-server.exe` or
-`./bin/grafana-server`, depending on the operating system). Then, use the
-browser to navigate to [http://localhost:3000/](http://localhost:3000/).
-It is also possible to run `grafana/grafana` container:
-
-```sh
-docker run -d -p 3000:3000 --network="host" grafana/grafana
-```
-
-Follow the instructions in the Grafana getting started
-[doc](https://grafana.com/docs/grafana/latest/getting-started/getting-started/#step-2-log-in)
-to log in.
-
-After successfully logging in, click on the Configuration icon
-on the panel at the left hand side, and click on Prometheus.
-Type in the default endpoint of Prometheus as suggested by the UI
-as the value for the URI.
-
-```console
-http://localhost:9090
-```
-
-Then, click on the Explore icon on the left panel of
-the website - we should be able to write some queries to explore our metrics
-now!
-
-Feel free to find some handy PromQL
-[here](https://promlabs.com/promql-cheat-sheet/).
-
-![Grafana
-UI](https://user-images.githubusercontent.com/9139451/224983906-52e061b8-b561-4414-87e9-68823bbc3ad6.png)
-
-```mermaid
-graph TD
-
-subgraph Prometheus
-  PrometheusScraper
-  PrometheusDatabase
-end
-
-PrometheusExporter["PrometheusExporter<br/>(listening at #quot;http://localhost:9464/#quot;)"] -->|HTTP GET| PrometheusScraper{{"Prometheus scraper<br/>(polling #quot;http://localhost:9464/metrics#quot; every 5 seconds)"}}
-PrometheusScraper --> PrometheusDatabase[("Prometheus TSDB (time series database)")]
-PrometheusDatabase -->|http://localhost:9090/graph| PrometheusUI["Browser<br/>(Prometheus Dashboard)"]
-PrometheusDatabase -->|http://localhost:9090/api/| Grafana[Grafana Server]
-Grafana -->|http://localhost:3000/dashboard| GrafanaUI["Browser<br/>(Grafana Dashboard)"]
-```
-
-## Learn more
-
-- [What is Prometheus?](https://prometheus.io/docs/introduction/overview/)
-- [Grafana support for
-  Prometheus](https://prometheus.io/docs/visualization/grafana/#creating-a-prometheus-graph)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/prometheus/main.cc
deleted file mode 100644
index b2c2c74fe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/main.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <cstdio>
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/exporters/prometheus/exporter_factory.h"
-#include "opentelemetry/exporters/prometheus/exporter_options.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_factory.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/metrics_foo_library/foo_library.h"
-#else
-#  include "metrics_foo_library/foo_library.h"
-#endif
-
-namespace metrics_sdk      = opentelemetry::sdk::metrics;
-namespace common           = opentelemetry::common;
-namespace metrics_exporter = opentelemetry::exporter::metrics;
-namespace metrics_api      = opentelemetry::metrics;
-
-namespace
-{
-
-void InitMetrics(const std::string &name, const std::string &addr)
-{
-  metrics_exporter::PrometheusExporterOptions opts;
-  if (!addr.empty())
-  {
-    opts.url = addr;
-  }
-  std::puts("PrometheusExporter example program running ...");
-
-  std::string version{"1.2.0"};
-  std::string schema{"https://opentelemetry.io/schemas/1.2.0"};
-
-  auto prometheus_exporter = metrics_exporter::PrometheusExporterFactory::Create(opts);
-
-  // Initialize and set the global MeterProvider
-  auto u_provider = metrics_sdk::MeterProviderFactory::Create();
-  auto *p         = static_cast<metrics_sdk::MeterProvider *>(u_provider.get());
-
-  p->AddMetricReader(std::move(prometheus_exporter));
-
-  // counter view
-  std::string counter_name = name + "_counter";
-  std::string counter_unit = "unit";
-
-  auto instrument_selector = metrics_sdk::InstrumentSelectorFactory::Create(
-      metrics_sdk::InstrumentType::kCounter, counter_name, counter_unit);
-
-  auto meter_selector = metrics_sdk::MeterSelectorFactory::Create(name, version, schema);
-
-  auto sum_view = metrics_sdk::ViewFactory::Create(counter_name, "description", counter_unit,
-                                                   metrics_sdk::AggregationType::kSum);
-
-  p->AddView(std::move(instrument_selector), std::move(meter_selector), std::move(sum_view));
-
-  // histogram view
-  std::string histogram_name = name + "_histogram";
-  std::string histogram_unit = "unit";
-
-  auto histogram_instrument_selector = metrics_sdk::InstrumentSelectorFactory::Create(
-      metrics_sdk::InstrumentType::kHistogram, histogram_name, histogram_unit);
-
-  auto histogram_meter_selector = metrics_sdk::MeterSelectorFactory::Create(name, version, schema);
-
-  auto histogram_view = metrics_sdk::ViewFactory::Create(
-      histogram_name, "description", histogram_unit, metrics_sdk::AggregationType::kHistogram);
-
-  p->AddView(std::move(histogram_instrument_selector), std::move(histogram_meter_selector),
-             std::move(histogram_view));
-
-  std::shared_ptr<opentelemetry::metrics::MeterProvider> provider(std::move(u_provider));
-  metrics_sdk::Provider::SetMeterProvider(provider);
-}
-
-void CleanupMetrics()
-{
-  std::shared_ptr<metrics_api::MeterProvider> none;
-  metrics_sdk::Provider::SetMeterProvider(none);
-}
-}  // namespace
-
-int main(int argc, char **argv)
-{
-  std::string example_type;
-  std::string addr{"localhost:9464"};
-  if (argc == 1)
-  {
-    std::puts("usage: $prometheus_example <example type> <url>");
-  }
-
-  if (argc >= 2)
-  {
-    example_type = argv[1];
-  }
-  if (argc > 2)
-  {
-    addr = argv[2];
-  }
-
-  std::string name{"prometheus_metric_example"};
-  InitMetrics(name, addr);
-
-  if (example_type == "counter")
-  {
-    foo_library::counter_example(name);
-  }
-  else if (example_type == "histogram")
-  {
-    foo_library::histogram_example(name);
-  }
-  else
-  {
-    std::thread counter_example{&foo_library::counter_example, name};
-    std::thread histogram_example{&foo_library::histogram_example, name};
-    counter_example.join();
-    histogram_example.join();
-  }
-
-  CleanupMetrics();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/prometheus.yml b/ext/opentelemetry-cpp-1.21.0/examples/prometheus/prometheus.yml
deleted file mode 100644
index 31b0f99ff..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/prometheus.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-global:
-  scrape_interval: 5s
-  scrape_timeout: 2s
-  evaluation_interval: 5s
-scrape_configs:
-  - job_name: otel
-    static_configs:
-      - targets: ["localhost:9464"]
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/run.sh b/ext/opentelemetry-cpp-1.21.0/examples/prometheus/run.sh
deleted file mode 100644
index 5562272e9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/prometheus/run.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-docker run -p 9090:9090 -v $(pwd):/etc/prometheus --network="host" prom/prometheus
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/simple/BUILD b/ext/opentelemetry-cpp-1.21.0/examples/simple/BUILD
deleted file mode 100644
index 5a3c27c28..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/simple/BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "example_simple",
-    srcs = [
-        "main.cc",
-    ],
-    tags = [
-        "examples",
-        "ostream",
-    ],
-    deps = [
-        "//api",
-        "//examples/common/foo_library:common_foo_library",
-        "//exporters/ostream:ostream_span_exporter",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/simple/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/simple/CMakeLists.txt
deleted file mode 100644
index b7eefef8a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/simple/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(example_simple main.cc)
-target_link_libraries(example_simple PRIVATE common_foo_library)
-
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  target_compile_definitions(example_simple
-                             PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-  target_link_libraries(example_simple
-                        PRIVATE opentelemetry-cpp::opentelemetry_cpp)
-else()
-  target_link_libraries(
-    example_simple PRIVATE opentelemetry-cpp::trace
-                           opentelemetry-cpp::ostream_span_exporter)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/simple/README.md b/ext/opentelemetry-cpp-1.21.0/examples/simple/README.md
deleted file mode 100644
index b3c449c53..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/simple/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# Simple Trace Example
-
-In this example, the application in `main.cc` initializes and registers a tracer
-provider from the [OpenTelemetry
-SDK](https://github.com/open-telemetry/opentelemetry-cpp). The application then
-calls a `foo_library` which has been instrumented using the [OpenTelemetry
-API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
-Resulting telemetry is directed to stdout through the StdoutSpanExporter.
-
-See [CONTRIBUTING.md](../../CONTRIBUTING.md) for instructions on building and
-running the example.
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/simple/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/simple/main.cc
deleted file mode 100644
index f0341a946..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/simple/main.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/foo_library/foo_library.h"
-#else
-#  include "foo_library/foo_library.h"
-#endif
-
-namespace trace_api      = opentelemetry::trace;
-namespace trace_sdk      = opentelemetry::sdk::trace;
-namespace trace_exporter = opentelemetry::exporter::trace;
-
-namespace
-{
-void InitTracer()
-{
-  auto exporter  = trace_exporter::OStreamSpanExporterFactory::Create();
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-
-  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> sdk_provider =
-      trace_sdk::TracerProviderFactory::Create(std::move(processor));
-
-  // Set the global trace provider
-  const std::shared_ptr<opentelemetry::trace::TracerProvider> &api_provider = sdk_provider;
-  trace_sdk::Provider::SetTracerProvider(api_provider);
-}
-
-void CleanupTracer()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> noop;
-  trace_sdk::Provider::SetTracerProvider(noop);
-}
-}  // namespace
-
-int main(int /* argc */, char ** /* argv */)
-{
-  // Removing this line will leave the default noop TracerProvider in place.
-  InitTracer();
-
-  foo_library();
-
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/zipkin/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/examples/zipkin/CMakeLists.txt
deleted file mode 100644
index a95d5a616..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/zipkin/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(example_zipkin main.cc)
-target_link_libraries(
-  example_zipkin PRIVATE common_foo_library
-                         opentelemetry-cpp::zipkin_trace_exporter)
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/zipkin/README.md b/ext/opentelemetry-cpp-1.21.0/examples/zipkin/README.md
deleted file mode 100644
index 17d325ecb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/zipkin/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Zipkin Exporter Example
-
-This is an example of how to use the Zipkin exporter.
-
-The application in `main.cc` initializes an `ZipkinExporter` instance and uses
-it to register a tracer provider from the [OpenTelemetry
-SDK](https://github.com/open-telemetry/opentelemetry-cpp). The application then
-calls a `foo_library` which has been instrumented using the [OpenTelemetry
-API](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/api).
-
-Resulting spans are exported to the Zipkin server using the Zipkin exporter.
-
-Note that the Zipkin exporter connects to the server at `localhost:9411` by
-default.
-
-## Running Zipkin server locally
-
-The quick way to run the Zipkin server is using Docker container :
-
-``console
-
-$ docker run -d -p 9411:9411 openzipkin/zipkin
-
-``
-
-## Running Zipkin example
-
-Build this example using instructions in [INSTALL.md](../../INSTALL.md).
-
-## Viewing the traces
-
-Please visit the Zipkin UI endpoint `http://localhost:9411`
diff --git a/ext/opentelemetry-cpp-1.21.0/examples/zipkin/main.cc b/ext/opentelemetry-cpp-1.21.0/examples/zipkin/main.cc
deleted file mode 100644
index 909c52fb6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/examples/zipkin/main.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/foo_library/foo_library.h"
-#else
-#  include "foo_library/foo_library.h"
-#endif
-
-namespace trace     = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace zipkin    = opentelemetry::exporter::zipkin;
-namespace resource  = opentelemetry::sdk::resource;
-
-namespace
-{
-zipkin::ZipkinExporterOptions opts;
-void InitTracer()
-{
-  // Create zipkin exporter instance
-  resource::ResourceAttributes attributes = {{"service.name", "zipkin_demo_service"}};
-  auto resource                           = resource::Resource::Create(attributes);
-  auto exporter                           = zipkin::ZipkinExporterFactory::Create(opts);
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
-      trace_sdk::TracerProviderFactory::Create(std::move(processor), resource);
-  // Set the global trace provider
-  trace_sdk::Provider::SetTracerProvider(provider);
-}
-
-void CleanupTracer()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-}  // namespace
-
-int main(int argc, char *argv[])
-{
-  if (argc == 2)
-  {
-    opts.endpoint = argv[1];
-  }
-  // Removing this line will leave the default noop TracerProvider in place.
-  InitTracer();
-
-  foo_library();
-
-  CleanupTracer();
-  return 0;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/CMakeLists.txt
deleted file mode 100644
index a59e1f904..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(WITH_OTLP_GRPC
-   OR WITH_OTLP_HTTP
-   OR WITH_OTLP_FILE)
-  add_subdirectory(otlp)
-endif()
-
-add_subdirectory(ostream)
-add_subdirectory(memory)
-
-if(WITH_PROMETHEUS)
-  add_subdirectory(prometheus)
-endif()
-
-if(WITH_ZIPKIN)
-  add_subdirectory(zipkin)
-endif()
-
-if(WITH_ELASTICSEARCH)
-  add_subdirectory(elasticsearch)
-endif()
-
-if(WITH_ETW)
-  add_subdirectory(etw)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/BUILD b/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/BUILD
deleted file mode 100644
index 9990c2586..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/BUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "es_log_record_exporter",
-    srcs = [
-        "src/es_log_record_exporter.cc",
-        "src/es_log_recordable.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h",
-        "include/opentelemetry/exporters/elasticsearch/es_log_recordable.h",
-    ],
-    linkopts = select({
-        "//bazel:windows": [
-            "-DEFAULTLIB:advapi32.lib",
-            "-DEFAULTLIB:crypt32.lib",
-            "-DEFAULTLIB:Normaliz.lib",
-        ],
-        "//conditions:default": [],
-    }),
-    strip_include_prefix = "include",
-    tags = ["es"],
-    deps = [
-        "//ext:headers",
-        "//ext/src/http/client/curl:http_client_curl",
-        "//sdk/src/logs",
-        "@curl",
-        "@github_nlohmann_json//:json",
-    ],
-)
-
-cc_test(
-    name = "es_log_record_exporter_test",
-    srcs = ["test/es_log_record_exporter_test.cc"],
-    tags = [
-        "es",
-        "test",
-    ],
-    deps = [
-        ":es_log_record_exporter",
-        "@com_google_googletest//:gtest_main",
-        "@curl",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/CMakeLists.txt
deleted file mode 100644
index c2763f66b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_exporter_elasticsearch_logs
-            src/es_log_record_exporter.cc src/es_log_recordable.cc)
-
-set_target_properties(opentelemetry_exporter_elasticsearch_logs
-                      PROPERTIES EXPORT_NAME elasticsearch_log_record_exporter)
-set_target_version(opentelemetry_exporter_elasticsearch_logs)
-
-target_include_directories(
-  opentelemetry_exporter_elasticsearch_logs
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-         "$<INSTALL_INTERFACE:include>")
-
-target_link_libraries(
-  opentelemetry_exporter_elasticsearch_logs
-  PUBLIC opentelemetry_trace opentelemetry_logs opentelemetry_http_client_curl
-         nlohmann_json::nlohmann_json)
-
-otel_add_component(
-  COMPONENT
-  exporters_elasticsearch
-  TARGETS
-  opentelemetry_exporter_elasticsearch_logs
-  FILES_DIRECTORY
-  "include/opentelemetry/exporters/elasticsearch"
-  FILES_DESTINATION
-  "include/opentelemetry/exporters"
-  FILES_MATCHING
-  PATTERN
-  "*.h"
-  PATTERN
-  "es_log_recordable.h"
-  EXCLUDE)
-
-if(BUILD_TESTING)
-  add_executable(es_log_record_exporter_test
-                 test/es_log_record_exporter_test.cc)
-
-  target_link_libraries(
-    es_log_record_exporter_test ${GTEST_BOTH_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporter_elasticsearch_logs)
-
-  gtest_add_tests(
-    TARGET es_log_record_exporter_test
-    TEST_PREFIX exporter.
-    TEST_LIST es_log_record_exporter_test)
-endif() # BUILD_TESTING
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h
deleted file mode 100644
index a8b23dc08..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "nlohmann/json.hpp"
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-
-#include <time.h>
-#include <atomic>
-#include <condition_variable>
-#include <cstddef>
-#include <iostream>
-#include <mutex>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-/**
- * Struct to hold Elasticsearch exporter configuration options.
- */
-struct ElasticsearchExporterOptions
-{
-  using HttpHeaders = std::multimap<std::string, std::string>;
-
-  // Configuration options to establish Elasticsearch connection
-  std::string host_;
-  int port_;
-  std::string index_;
-
-  // Maximum time to wait for response after sending request to Elasticsearch
-  int response_timeout_;
-
-  // Whether to print the status of the exporter in the console
-  bool console_debug_;
-
-  /** Additional HTTP headers. */
-  HttpHeaders http_headers_;
-
-  /**
-   * Constructor for the ElasticsearchExporterOptions. By default, the endpoint is
-   * localhost:9200/logs with a timeout of 30 seconds and disabled console debugging
-   * @param host The host of the Elasticsearch instance
-   * @param port The port of the Elasticsearch instance
-   * @param index The index/shard that the logs will be written to
-   * @param response_timeout The maximum time in seconds the exporter should wait for a response
-   * from elasticsearch
-   * @param console_debug If true, print the status of the exporter methods in the console
-   */
-  ElasticsearchExporterOptions(const std::string &host         = "localhost",
-                               int port                        = 9200,
-                               const std::string &index        = "logs",
-                               int response_timeout            = 30,
-                               bool console_debug              = false,
-                               const HttpHeaders &http_headers = {})
-      : host_{host},
-        port_{port},
-        index_{index},
-        response_timeout_{response_timeout},
-        console_debug_{console_debug},
-        http_headers_{http_headers}
-  {}
-};
-
-/**
- * The ElasticsearchLogRecordExporter exports logs to Elasticsearch in JSON format
- */
-class ElasticsearchLogRecordExporter final : public opentelemetry::sdk::logs::LogRecordExporter
-{
-public:
-  /**
-   * Create an ElasticsearchLogRecordExporter with default exporter options.
-   */
-  ElasticsearchLogRecordExporter();
-
-  /**
-   * Create an ElasticsearchLogRecordExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   */
-  ElasticsearchLogRecordExporter(const ElasticsearchExporterOptions &options);
-
-  /**
-   * Creates a recordable that stores the data in a JSON object
-   * @return a newly initialized Recordable object.
-   */
-  std::unique_ptr<opentelemetry::sdk::logs::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Exports a vector of log records to the Elasticsearch instance. Guaranteed to return after a
-   * timeout specified from the options passed from the constructor.
-   * @param records A list of log records to send to Elasticsearch.
-   */
-  sdk::common::ExportResult Export(
-      const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>>
-          &records) noexcept override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shutdown this exporter.
-   * @param timeout The maximum time to wait for the shutdown method to return
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  // Stores if this exporter had its Shutdown() method called
-  std::atomic<bool> is_shutdown_{false};
-
-  // Configuration options for the exporter
-  ElasticsearchExporterOptions options_;
-
-  // Object that stores the HTTP sessions that have been created
-  std::shared_ptr<ext::http::client::HttpClient> http_client_;
-  bool isShutdown() const noexcept;
-
-#ifdef ENABLE_ASYNC_EXPORT
-  struct SynchronizationData
-  {
-    std::atomic<std::size_t> session_counter_{0};
-    std::atomic<std::size_t> finished_session_counter_{0};
-    std::condition_variable force_flush_cv;
-    std::mutex force_flush_cv_m;
-    std::recursive_mutex force_flush_m;
-  };
-  nostd::shared_ptr<SynchronizationData> synchronization_data_;
-#endif
-};
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h b/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h
deleted file mode 100644
index 9baf9ef7b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <map>
-#include <sstream>
-#include <type_traits>
-#include <unordered_map>
-
-#include "nlohmann/json.hpp"
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-
-/**
- * An Elasticsearch Recordable implemenation that stores the 10 fields of the Log Data Model inside
- * a JSON object,
- */
-class ElasticSearchRecordable final : public sdk::logs::Recordable
-{
-private:
-  /**
-   * A helper method that writes a value under a specified name.
-   * `name` will be at the root of the JSON object. If it has to be nested under some other keys,
-   * then write `name` as `key1.key2.[...].name`
-   */
-  void WriteValue(const opentelemetry::sdk::common::OwnedAttributeValue &value,
-                  const std::string &name);
-
-  void WriteValue(const opentelemetry::common::AttributeValue &value, const std::string &name);
-
-public:
-  ElasticSearchRecordable() noexcept;
-
-  /**
-   * Returns a JSON object contain the log information
-   */
-  nlohmann::json GetJSON() noexcept;
-
-  /**
-   * Set the timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  void SetTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  /**
-   * Set the observed timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  void SetObservedTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  /**
-   * Set the severity for this log.
-   * @param severity the severity of the event
-   */
-  void SetSeverity(opentelemetry::logs::Severity severity) noexcept override;
-
-  /**
-   * Set body field for this log.
-   * @param message the body to set
-   */
-  void SetBody(const opentelemetry::common::AttributeValue &message) noexcept override;
-
-  /**
-   * Set the Event Id
-   * @param id the event id to set
-   * @param name the event name to set
-   */
-  void SetEventId(int64_t /* id */, nostd::string_view /* name */) noexcept override
-  {
-    // TODO: implement event id
-  }
-
-  /**
-   * Set the trace id for this log.
-   * @param trace_id the trace id to set
-   */
-  void SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept override;
-
-  /**
-   * Set the span id for this log.
-   * @param span_id the span id to set
-   */
-  void SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept override;
-
-  /**
-   * Inject trace_flags for this log.
-   * @param trace_flags the trace flags to set
-   */
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept override;
-
-  /**
-   * Set an attribute of a log.
-   * @param key the name of the attribute
-   * @param value the attribute value
-   */
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override;
-
-  /**
-   * Set Resource of this log
-   * @param Resource the resource to set
-   */
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override;
-
-  /**
-   * Set instrumentation_scope for this log.
-   * @param instrumentation_scope the instrumentation scope to set
-   */
-  void SetInstrumentationScope(const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-                                   &instrumentation_scope) noexcept override;
-
-private:
-  // Define a JSON object that will be populated with the log data
-  nlohmann::json json_;
-};
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/src/es_log_record_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/src/es_log_record_exporter.cc
deleted file mode 100644
index d20453b9d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/src/es_log_record_exporter.cc
+++ /dev/null
@@ -1,484 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <sstream>  // std::stringstream
-
-#include <condition_variable>
-#include <mutex>
-#include "opentelemetry/exporters/elasticsearch/es_log_record_exporter.h"
-#include "opentelemetry/exporters/elasticsearch/es_log_recordable.h"
-#include "opentelemetry/sdk_config.h"
-
-namespace nostd       = opentelemetry::nostd;
-namespace sdklogs     = opentelemetry::sdk::logs;
-namespace http_client = opentelemetry::ext::http::client;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-/**
- * This class handles the response message from the Elasticsearch request
- */
-class ResponseHandler : public http_client::EventHandler
-{
-public:
-  /**
-   * Creates a response handler, that by default doesn't display to console
-   */
-  ResponseHandler(bool console_debug = false) : console_debug_{console_debug} {}
-
-  std::string BuildResponseLogMessage(http_client::Response &response,
-                                      const std::string &body) noexcept
-  {
-    std::stringstream ss;
-    ss << "Status:" << response.GetStatusCode() << ", Header:";
-    response.ForEachHeader([&ss](opentelemetry::nostd::string_view header_name,
-                                 opentelemetry::nostd::string_view header_value) {
-      ss << "\t" << header_name.data() << ": " << header_value.data() << ",";
-      return true;
-    });
-    ss << "Body:" << body;
-
-    return ss.str();
-  }
-
-  /**
-   * Automatically called when the response is received, store the body into a string and notify any
-   * threads blocked on this result
-   */
-  void OnResponse(http_client::Response &response) noexcept override
-  {
-    std::string log_message;
-
-    // Lock the private members so they can't be read while being modified
-    {
-      std::unique_lock<std::mutex> lk(mutex_);
-
-      // Store the body of the request
-      body_ = std::string(response.GetBody().begin(), response.GetBody().end());
-
-      if (!(response.GetStatusCode() >= 200 && response.GetStatusCode() <= 299))
-      {
-        log_message = BuildResponseLogMessage(response, body_);
-
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Export failed, " << log_message);
-      }
-
-      if (console_debug_)
-      {
-        if (log_message.empty())
-        {
-          log_message = BuildResponseLogMessage(response, body_);
-        }
-
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Got response from Elasticsearch, "
-                                << log_message);
-      }
-
-      // Set the response_received_ flag to true and notify any threads waiting on this result
-      response_received_ = true;
-    }
-    cv_.notify_all();
-  }
-
-  /**
-   * A method the user calls to block their thread until the response is received. The longest
-   * duration is the timeout of the request, set by SetTimeoutMs()
-   */
-  bool waitForResponse()
-  {
-    std::unique_lock<std::mutex> lk(mutex_);
-    cv_.wait(lk);
-    return response_received_;
-  }
-
-  /**
-   * Returns the body of the response
-   */
-  std::string GetResponseBody()
-  {
-    // Lock so that body_ can't be written to while returning it
-    std::unique_lock<std::mutex> lk(mutex_);
-    return body_;
-  }
-
-  // Callback method when an http event occurs
-  void OnEvent(http_client::SessionState state, nostd::string_view /* reason */) noexcept override
-  {
-    // If any failure event occurs, release the condition variable to unblock main thread
-    switch (state)
-    {
-      case http_client::SessionState::CreateFailed:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Failed to create session");
-        cv_.notify_all();
-        break;
-      case http_client::SessionState::Created:
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Session created");
-        break;
-      case http_client::SessionState::Destroyed:
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Session destroyed");
-        break;
-      case http_client::SessionState::Connecting:
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Connecting to peer");
-        break;
-      case http_client::SessionState::ConnectFailed:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Failed to connect to peer");
-        cv_.notify_all();
-        break;
-      case http_client::SessionState::Connected:
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Connected to peer");
-        break;
-      case http_client::SessionState::Sending:
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Sending request");
-        break;
-      case http_client::SessionState::SendFailed:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Failed to send request");
-        cv_.notify_all();
-        break;
-      case http_client::SessionState::Response:
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Received response");
-        break;
-      case http_client::SessionState::SSLHandshakeFailed:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Failed SSL Handshake");
-        cv_.notify_all();
-        break;
-      case http_client::SessionState::TimedOut:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Request timed out");
-        cv_.notify_all();
-        break;
-      case http_client::SessionState::NetworkError:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Network error");
-        cv_.notify_all();
-        break;
-      case http_client::SessionState::ReadError:
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Read error");
-        break;
-      case http_client::SessionState::WriteError:
-        OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Write error");
-        break;
-      case http_client::SessionState::Cancelled:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] (manually) cancelled");
-        cv_.notify_all();
-        break;
-    }
-  }
-
-private:
-  // Define a condition variable and mutex
-  std::condition_variable cv_;
-  std::mutex mutex_;
-
-  // Whether the response from Elasticsearch has been received
-  bool response_received_ = false;
-
-  // A string to store the response body
-  std::string body_ = "";
-
-  // Whether to print the results from the callback
-  bool console_debug_ = false;
-};
-
-#ifdef ENABLE_ASYNC_EXPORT
-/**
- * This class handles the async response message from the Elasticsearch request
- */
-class AsyncResponseHandler : public http_client::EventHandler
-{
-public:
-  /**
-   * Creates a response handler, that by default doesn't display to console
-   */
-  AsyncResponseHandler(
-      std::shared_ptr<ext::http::client::Session> session,
-      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback,
-      bool console_debug = false)
-      : session_{std::move(session)},
-        result_callback_{std::move(result_callback)},
-        console_debug_{console_debug}
-  {}
-
-  /**
-   * Cleans up the session in the destructor.
-   */
-  ~AsyncResponseHandler() override { session_->FinishSession(); }
-
-  /**
-   * Automatically called when the response is received
-   */
-  void OnResponse(http_client::Response &response) noexcept override
-  {
-
-    // Store the body of the response
-    body_ = std::string(response.GetBody().begin(), response.GetBody().end());
-    if (console_debug_)
-    {
-      OTEL_INTERNAL_LOG_DEBUG(
-          "[ES Log Exporter] Got response from Elasticsearch,  response body: " << body_);
-    }
-    if (body_.find("\"failed\" : 0") == std::string::npos)
-    {
-      OTEL_INTERNAL_LOG_ERROR(
-          "[ES Log Exporter] Logs were not written to Elasticsearch correctly, response body: "
-          << body_);
-      result_callback_(sdk::common::ExportResult::kFailure);
-    }
-    else
-    {
-      result_callback_(sdk::common::ExportResult::kSuccess);
-    }
-  }
-
-  // Callback method when an http event occurs
-  void OnEvent(http_client::SessionState state, nostd::string_view /* reason */) noexcept override
-  {
-    bool need_stop = false;
-    switch (state)
-    {
-      case http_client::SessionState::CreateFailed:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Create request to elasticsearch failed");
-        need_stop = true;
-        break;
-      case http_client::SessionState::ConnectFailed:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Connection to elasticsearch failed");
-        need_stop = true;
-        break;
-      case http_client::SessionState::SendFailed:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Request failed to be sent to elasticsearch");
-        need_stop = true;
-        break;
-      case http_client::SessionState::SSLHandshakeFailed:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] SSL handshake to elasticsearch failed");
-        need_stop = true;
-        break;
-      case http_client::SessionState::TimedOut:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Request to elasticsearch timed out");
-        need_stop = true;
-        break;
-      case http_client::SessionState::NetworkError:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Network error to elasticsearch");
-        need_stop = true;
-        break;
-      case http_client::SessionState::Cancelled:
-        OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Request to elasticsearch cancelled");
-        need_stop = true;
-        break;
-      default:
-        break;
-    }
-    if (need_stop)
-    {
-      result_callback_(sdk::common::ExportResult::kFailure);
-    }
-  }
-
-private:
-  // Stores the session object for the request
-  std::shared_ptr<ext::http::client::Session> session_;
-  // Callback to call to on receiving events
-  std::function<bool(opentelemetry::sdk::common::ExportResult)> result_callback_;
-
-  // A string to store the response body
-  std::string body_ = "";
-
-  // Whether to print the results from the callback
-  bool console_debug_ = false;
-};
-#endif
-
-ElasticsearchLogRecordExporter::ElasticsearchLogRecordExporter()
-    : ElasticsearchLogRecordExporter(ElasticsearchExporterOptions())
-{}
-
-ElasticsearchLogRecordExporter::ElasticsearchLogRecordExporter(
-    const ElasticsearchExporterOptions &options)
-    : options_{options},
-      http_client_{ext::http::client::HttpClientFactory::Create()}
-#ifdef ENABLE_ASYNC_EXPORT
-      ,
-      synchronization_data_(new SynchronizationData())
-#endif
-{
-#ifdef ENABLE_ASYNC_EXPORT
-  synchronization_data_->finished_session_counter_.store(0);
-  synchronization_data_->session_counter_.store(0);
-#endif
-}
-
-std::unique_ptr<sdklogs::Recordable> ElasticsearchLogRecordExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<sdklogs::Recordable>(new ElasticSearchRecordable());
-}
-
-sdk::common::ExportResult ElasticsearchLogRecordExporter::Export(
-    const nostd::span<std::unique_ptr<sdklogs::Recordable>> &records) noexcept
-{
-  // Return failure if this exporter has been shutdown
-  if (isShutdown())
-  {
-    OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] Exporting "
-                            << records.size() << " log(s) failed, exporter is shutdown");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  // Create a connection to the ElasticSearch instance
-  auto session = http_client_->CreateSession(options_.host_ + ":" + std::to_string(options_.port_));
-  auto request = session->CreateRequest();
-
-  // Populate the request with headers and methods
-  request->SetUri(options_.index_ + "/_bulk?pretty");
-  request->SetMethod(http_client::Method::Post);
-  request->AddHeader("Content-Type", "application/json");
-
-  // Add options headers
-  for (auto it = options_.http_headers_.cbegin(); it != options_.http_headers_.cend(); ++it)
-  {
-    request->AddHeader(it->first, it->second);
-  }
-
-  request->SetTimeoutMs(std::chrono::milliseconds(1000 * options_.response_timeout_));
-
-  // Create the request body
-  std::string body = "";
-  for (auto &record : records)
-  {
-    // Append {"index":{}} before JSON body, which tells Elasticsearch to write to index specified
-    // in URI
-    body += "{\"index\" : {}}\n";
-
-    // Add the context of the Recordable
-    auto json_record = std::unique_ptr<ElasticSearchRecordable>(
-        static_cast<ElasticSearchRecordable *>(record.release()));
-    body += json_record->GetJSON().dump() + "\n";
-  }
-  std::vector<uint8_t> body_vec(body.begin(), body.end());
-  request->SetBody(body_vec);
-
-#ifdef ENABLE_ASYNC_EXPORT
-  // Send the request
-  synchronization_data_->session_counter_.fetch_add(1, std::memory_order_release);
-  std::size_t span_count    = records.size();
-  auto synchronization_data = synchronization_data_;
-  auto handler              = std::make_shared<AsyncResponseHandler>(
-      session,
-      [span_count, synchronization_data](opentelemetry::sdk::common::ExportResult result) {
-        if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-        {
-          OTEL_INTERNAL_LOG_ERROR("[ES Log Exporter] ERROR: Export "
-                                               << span_count
-                                               << " trace span(s) error: " << static_cast<int>(result));
-        }
-        else
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] Export " << span_count
-                                                                           << " trace span(s) success");
-        }
-
-        synchronization_data->finished_session_counter_.fetch_add(1, std::memory_order_release);
-        synchronization_data->force_flush_cv.notify_all();
-        return true;
-      },
-      options_.console_debug_);
-  session->SendRequest(handler);
-  return sdk::common::ExportResult::kSuccess;
-#else
-  // Send the request
-  auto handler = std::make_shared<ResponseHandler>(options_.console_debug_);
-  session->SendRequest(handler);
-
-  // Wait for the response to be received
-  if (options_.console_debug_)
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[ES Log Exporter] waiting for response from Elasticsearch (timeout = "
-                            << options_.response_timeout_ << " seconds)");
-  }
-  bool write_successful = handler->waitForResponse();
-
-  // End the session
-  session->FinishSession();
-
-  // If an error occurred with the HTTP request
-  if (!write_successful)
-  {
-    // TODO: retry logic
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  // Parse the response output to determine if Elasticsearch consumed it correctly
-  std::string responseBody = handler->GetResponseBody();
-  if (responseBody.find("\"failed\" : 0") == std::string::npos)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[ES Log Exporter] Logs were not written to Elasticsearch correctly, response body: "
-        << responseBody);
-    // TODO: Retry logic
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  return sdk::common::ExportResult::kSuccess;
-#endif
-}
-
-bool ElasticsearchLogRecordExporter::ForceFlush(std::chrono::microseconds timeout
-                                                OPENTELEMETRY_MAYBE_UNUSED) noexcept
-{
-#ifdef ENABLE_ASYNC_EXPORT
-  std::lock_guard<std::recursive_mutex> lock_guard{synchronization_data_->force_flush_m};
-  std::size_t running_counter =
-      synchronization_data_->session_counter_.load(std::memory_order_acquire);
-  // ASAN will report chrono: runtime error: signed integer overflow: A + B cannot be represented
-  //   in type 'long int' here. So we reset timeout to meet signed long int limit here.
-  timeout = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-      timeout, std::chrono::microseconds::zero());
-
-  std::chrono::steady_clock::duration timeout_steady =
-      std::chrono::duration_cast<std::chrono::steady_clock::duration>(timeout);
-  if (timeout_steady <= std::chrono::steady_clock::duration::zero())
-  {
-    timeout_steady = (std::chrono::steady_clock::duration::max)();
-  }
-
-  std::unique_lock<std::mutex> lk_cv(synchronization_data_->force_flush_cv_m);
-  // Wait for all the sessions to finish
-  while (timeout_steady > std::chrono::steady_clock::duration::zero())
-  {
-    if (synchronization_data_->finished_session_counter_.load(std::memory_order_acquire) >=
-        running_counter)
-    {
-      break;
-    }
-
-    std::chrono::steady_clock::time_point start_timepoint = std::chrono::steady_clock::now();
-    if (std::cv_status::no_timeout != synchronization_data_->force_flush_cv.wait_for(
-                                          lk_cv, std::chrono::seconds{options_.response_timeout_}))
-    {
-      break;
-    }
-    timeout_steady -= std::chrono::steady_clock::now() - start_timepoint;
-  }
-
-  return timeout_steady > std::chrono::steady_clock::duration::zero();
-#else
-  return true;
-#endif
-}
-
-bool ElasticsearchLogRecordExporter::Shutdown(std::chrono::microseconds /* timeout */) noexcept
-{
-  is_shutdown_ = true;
-
-  // Shutdown the session manager
-  http_client_->CancelAllSessions();
-  http_client_->FinishAllSessions();
-
-  return true;
-}
-
-bool ElasticsearchLogRecordExporter::isShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/src/es_log_recordable.cc b/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/src/es_log_recordable.cc
deleted file mode 100644
index 1b6fe3f0e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/src/es_log_recordable.cc
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <opentelemetry/version.h>
-
-#include <chrono>
-#include <ctime>
-#include <nlohmann/json.hpp>
-#include <string>
-
-#if defined(__cpp_lib_format)
-#  include <format>
-#endif
-
-#include "opentelemetry/exporters/elasticsearch/es_log_recordable.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-
-namespace nlohmann
-{
-template <class T>
-struct json_assign_visitor
-{
-  T *j_;
-  json_assign_visitor(T &j) : j_(&j) {}
-
-  template <class U>
-  void operator()(const U &u)
-  {
-    *j_ = u;
-  }
-
-  template <class U>
-  void operator()(const opentelemetry::nostd::span<U> &span)
-  {
-    *j_ = nlohmann::json::array();
-    for (const auto &elem : span)
-    {
-      j_->push_back(elem);
-    }
-  }
-};
-
-template <>
-struct adl_serializer<opentelemetry::sdk::common::OwnedAttributeValue>
-{
-  static void to_json(json &j, const opentelemetry::sdk::common::OwnedAttributeValue &v)
-  {
-    opentelemetry::nostd::visit(json_assign_visitor<json>(j), v);
-  }
-};
-
-template <>
-struct adl_serializer<opentelemetry::common::AttributeValue>
-{
-  static void to_json(json &j, const opentelemetry::common::AttributeValue &v)
-  {
-    opentelemetry::nostd::visit(json_assign_visitor<json>(j), v);
-  }
-};
-}  // namespace nlohmann
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-void ElasticSearchRecordable::WriteValue(
-    const opentelemetry::sdk::common::OwnedAttributeValue &value,
-    const std::string &name)
-{
-  json_[name] = value;
-}
-
-void ElasticSearchRecordable::WriteValue(const opentelemetry::common::AttributeValue &value,
-                                         const std::string &name)
-{
-  json_[name] = value;
-}
-
-ElasticSearchRecordable::ElasticSearchRecordable() noexcept : sdk::logs::Recordable()
-{
-  json_["ecs"]["version"] = "8.11.0";
-}
-
-nlohmann::json ElasticSearchRecordable::GetJSON() noexcept
-{
-  return json_;
-}
-
-void ElasticSearchRecordable::SetTimestamp(
-    opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  const std::chrono::system_clock::time_point timePoint{timestamp};
-
-  std::time_t time = std::chrono::system_clock::to_time_t(timePoint);
-  std::tm tm       = *std::gmtime(&time);
-  auto microseconds =
-      std::chrono::duration_cast<std::chrono::microseconds>(timePoint.time_since_epoch()) %
-      std::chrono::seconds(1);
-
-  // `sizeof()` includes the null terminator
-  constexpr auto dateSize = sizeof("YYYY-MM-DDTHH:MM:SS.uuuuuuZ");
-  char bufferDate[dateSize];
-  auto offset = std::strftime(bufferDate, sizeof(bufferDate), "%Y-%m-%dT%H:%M:%S", &tm);
-  std::snprintf(bufferDate + offset, sizeof(bufferDate) - offset, ".%06ldZ",
-                static_cast<long>(microseconds.count()));
-
-  const std::string dateStr(bufferDate);
-
-  json_["@timestamp"] = dateStr;
-}
-
-void ElasticSearchRecordable::SetObservedTimestamp(
-    opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  json_["observedtimestamp"] = timestamp.time_since_epoch().count();
-}
-
-void ElasticSearchRecordable::SetSeverity(opentelemetry::logs::Severity severity) noexcept
-{
-  auto &severityField = json_["log"]["level"];
-
-  // Convert the severity enum to a string
-  std::uint32_t severity_index = static_cast<std::uint32_t>(severity);
-  if (severity_index >= std::extent<decltype(opentelemetry::logs::SeverityNumToText)>::value)
-  {
-    severityField =
-        std::string("Invalid severity(").append(std::to_string(severity_index)).append(")");
-  }
-  else
-  {
-    severityField = opentelemetry::logs::SeverityNumToText[severity_index];
-  }
-}
-
-void ElasticSearchRecordable::SetBody(const opentelemetry::common::AttributeValue &message) noexcept
-{
-  WriteValue(message, "message");
-}
-
-void ElasticSearchRecordable::SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept
-{
-  if (trace_id.IsValid())
-  {
-    char trace_buf[opentelemetry::trace::TraceId::kSize * 2];
-    trace_id.ToLowerBase16(trace_buf);
-    json_["traceid"] = std::string(trace_buf, sizeof(trace_buf));
-  }
-  else
-  {
-    json_.erase("traceid");
-  }
-}
-
-void ElasticSearchRecordable::SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept
-{
-  if (span_id.IsValid())
-  {
-    char span_buf[opentelemetry::trace::SpanId::kSize * 2];
-    span_id.ToLowerBase16(span_buf);
-    json_["spanid"] = std::string(span_buf, sizeof(span_buf));
-  }
-  else
-  {
-    json_.erase("spanid");
-  }
-}
-
-void ElasticSearchRecordable::SetTraceFlags(
-    const opentelemetry::trace::TraceFlags &trace_flags) noexcept
-{
-  char flag_buf[2];
-  trace_flags.ToLowerBase16(flag_buf);
-  json_["traceflags"] = std::string(flag_buf, sizeof(flag_buf));
-}
-
-void ElasticSearchRecordable::SetAttribute(
-    nostd::string_view key,
-    const opentelemetry::common::AttributeValue &value) noexcept
-{
-  WriteValue(value, key.data());
-}
-
-void ElasticSearchRecordable::SetResource(
-    const opentelemetry::sdk::resource::Resource &resource) noexcept
-{
-  for (const auto &attribute : resource.GetAttributes())
-  {
-    WriteValue(attribute.second, attribute.first);
-  }
-}
-
-void ElasticSearchRecordable::SetInstrumentationScope(
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-        &instrumentation_scope) noexcept
-{
-  json_["log"]["logger"] = instrumentation_scope.GetName();
-}
-
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/test/es_log_record_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/test/es_log_record_exporter_test.cc
deleted file mode 100644
index 6bdd5248a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/elasticsearch/test/es_log_record_exporter_test.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/elasticsearch/es_log_record_exporter.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/elasticsearch/es_log_recordable.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/resource/resource.h"
-
-#include <gtest/gtest.h>
-#include <chrono>
-#include <string>
-
-namespace sdklogs       = opentelemetry::sdk::logs;
-namespace logs_api      = opentelemetry::logs;
-namespace nostd         = opentelemetry::nostd;
-namespace logs_exporter = opentelemetry::exporter::logs;
-
-// Attempt to write a log to an invalid host/port, test that the Export() returns failure
-TEST(DISABLED_ElasticsearchLogsExporterTests, InvalidEndpoint)
-{
-  // Create invalid connection options for the elasticsearch exporter
-  logs_exporter::ElasticsearchExporterOptions options("localhost", -1);
-
-  // Create an elasticsearch exporter
-  auto exporter = std::unique_ptr<sdklogs::LogRecordExporter>(
-      new logs_exporter::ElasticsearchLogRecordExporter(options));
-
-  // Create a log record and send to the exporter
-  auto record = exporter->MakeRecordable();
-  auto result = exporter->Export(nostd::span<std::unique_ptr<sdklogs::Recordable>>(&record, 1));
-
-  // Ensure the return value is failure
-  ASSERT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-// Test that when the exporter is shutdown, any call to Export should return failure
-TEST(DISABLED_ElasticsearchLogsExporterTests, Shutdown)
-{
-  // Create an elasticsearch exporter and immediately shut it down
-  auto exporter = std::unique_ptr<sdklogs::LogRecordExporter>(
-      new logs_exporter::ElasticsearchLogRecordExporter);
-  bool shutdownResult = exporter->Shutdown();
-  ASSERT_TRUE(shutdownResult);
-
-  // Write a log to the shutdown exporter
-  auto record = exporter->MakeRecordable();
-  auto result = exporter->Export(nostd::span<std::unique_ptr<sdklogs::Recordable>>(&record, 1));
-
-  // Ensure the return value is failure
-  ASSERT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-// Test the elasticsearch recordable object
-TEST(DISABLED_ElasticsearchLogsExporterTests, RecordableCreation)
-{
-  // Create an elasticsearch exporter
-  auto exporter = std::unique_ptr<sdklogs::LogRecordExporter>(
-      new logs_exporter::ElasticsearchLogRecordExporter);
-
-  // Create a recordable
-  auto record = exporter->MakeRecordable();
-  record->SetSeverity(logs_api::Severity::kFatal);
-  record->SetTimestamp(std::chrono::system_clock::now());
-  record->SetBody("Body of the log message");
-
-  // Attributes and resource support different types
-  record->SetAttribute("key0", false);
-  record->SetAttribute("key1", "1");
-
-  auto resource = opentelemetry::sdk::resource::Resource::Create({{"key2", 2}, {"key3", 3142}});
-  record->SetResource(resource);
-
-  exporter->Export(nostd::span<std::unique_ptr<sdklogs::Recordable>>(&record, 1));
-}
-
-TEST(ElasticsearchLogRecordableTests, BasicTests)
-{
-  const auto severity = logs_api::Severity::kFatal;
-  const std::array<nostd::string_view, 2> stringlist{
-      {nostd::string_view("string1"), nostd::string_view("string2")}};
-
-  const std::int64_t expected_observed_ts = 1732063944999647774LL;
-  const std::string expected_timestamp("2024-11-20T00:52:24.999647Z");
-  const std::string expected_severity(
-      opentelemetry::logs::SeverityNumToText[static_cast<std::size_t>(severity)]);
-  const std::string expected_body("Body of the log message");
-  const std::string expected_scope_name("scope_name");
-  const bool expected_boolean  = false;
-  const int expected_int       = 1;
-  const double expected_double = 2.0;
-
-  const nlohmann::json expected{
-      {"@timestamp", expected_timestamp},
-      {"boolean", expected_boolean},
-      {"double", expected_double},
-      {"ecs", {{"version", "8.11.0"}}},
-      {"int", expected_int},
-      {"log", {{"level", expected_severity}, {"logger", expected_scope_name}}},
-      {"message", expected_body},
-      {"observedtimestamp", expected_observed_ts},
-      {"stringlist", {stringlist[0], stringlist[1]}}};
-
-  const opentelemetry::common::SystemTimestamp now{std::chrono::nanoseconds(expected_observed_ts)};
-
-  const auto scope =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(expected_scope_name);
-
-  opentelemetry::exporter::logs::ElasticSearchRecordable recordable;
-  recordable.SetTimestamp(now);
-  recordable.SetObservedTimestamp(now);
-  recordable.SetSeverity(severity);
-  recordable.SetBody(expected_body);
-  recordable.SetInstrumentationScope(*scope);
-
-  recordable.SetAttribute("boolean", expected_boolean);
-  recordable.SetAttribute("int", expected_int);
-  recordable.SetAttribute("double", expected_double);
-  recordable.SetAttribute("stringlist", stringlist);
-
-  const auto actual = recordable.GetJSON();
-
-  EXPECT_EQ(actual, expected);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/BUILD b/ext/opentelemetry-cpp-1.21.0/exporters/etw/BUILD
deleted file mode 100644
index ad8518bc2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/BUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "etw_exporter",
-    hdrs = glob([
-        "include/opentelemetry/exporters/etw/*.h",
-    ]),
-    includes = ["include"],
-    local_defines = [
-        "HAVE_MSGPACK",
-    ],
-    tags = ["etw"],
-    deps = [
-        "//api",
-        "//sdk/src/trace",
-        "@github_nlohmann_json//:json",
-    ],
-)
-
-cc_test(
-    name = "etw_provider_test",
-    srcs = ["test/etw_provider_test.cc"],
-    local_defines = [
-        "HAVE_MSGPACK",
-    ],
-    tags = [
-        "etw",
-        "test",
-    ],
-    deps = [
-        ":etw_exporter",
-        "@com_google_googletest//:gtest_main",
-        "@github_nlohmann_json//:json",
-    ],
-)
-
-cc_test(
-    name = "etw_tracer_test",
-    srcs = ["test/etw_tracer_test.cc"],
-    local_defines = [
-        "HAVE_MSGPACK",
-    ],
-    tags = [
-        "etw",
-        "test",
-    ],
-    deps = [
-        ":etw_exporter",
-        "@com_google_googletest//:gtest_main",
-        "@github_nlohmann_json//:json",
-    ],
-)
-
-cc_test(
-    name = "etw_logger_test",
-    srcs = ["test/etw_logger_test.cc"],
-    local_defines = [
-        "HAVE_MSGPACK",
-    ],
-    tags = [
-        "etw",
-        "test",
-    ],
-    deps = [
-        ":etw_exporter",
-        "@com_google_googletest//:gtest_main",
-        "@github_nlohmann_json//:json",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/etw/CMakeLists.txt
deleted file mode 100644
index 82147007d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_exporter_etw INTERFACE)
-
-target_include_directories(
-  opentelemetry_exporter_etw
-  INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-            "$<INSTALL_INTERFACE:include>")
-
-set_target_properties(opentelemetry_exporter_etw PROPERTIES EXPORT_NAME
-                                                            etw_exporter)
-
-target_link_libraries(
-  opentelemetry_exporter_etw INTERFACE opentelemetry_api opentelemetry_trace
-                                       nlohmann_json::nlohmann_json)
-target_link_libraries(opentelemetry_exporter_etw INTERFACE opentelemetry_logs)
-if(nlohmann_json_clone)
-  add_dependencies(opentelemetry_exporter_etw nlohmann_json::nlohmann_json)
-endif()
-
-otel_add_component(
-  COMPONENT
-  exporters_etw
-  TARGETS
-  opentelemetry_exporter_etw
-  FILES_DIRECTORY
-  "include/opentelemetry/exporters/etw"
-  FILES_DESTINATION
-  "include/opentelemetry/exporters"
-  FILES_MATCHING
-  PATTERN
-  "*.h")
-
-if(BUILD_TESTING)
-  add_executable(etw_provider_test test/etw_provider_test.cc)
-  add_executable(etw_tracer_test test/etw_tracer_test.cc)
-  add_executable(etw_logger_test test/etw_logger_test.cc)
-  add_executable(etw_tracer_test_enable_env_properties test/etw_tracer_test.cc)
-  add_executable(etw_logger_test_enable_env_properties test/etw_logger_test.cc)
-
-  target_link_libraries(etw_provider_test ${GTEST_BOTH_LIBRARIES}
-                        opentelemetry_exporter_etw ${CMAKE_THREAD_LIBS_INIT})
-
-  target_link_libraries(etw_tracer_test ${GTEST_BOTH_LIBRARIES}
-                        opentelemetry_exporter_etw ${CMAKE_THREAD_LIBS_INIT})
-
-  target_link_libraries(etw_logger_test ${GTEST_BOTH_LIBRARIES}
-                        opentelemetry_exporter_etw ${CMAKE_THREAD_LIBS_INIT})
-
-  target_link_libraries(
-    etw_tracer_test_enable_env_properties ${GTEST_BOTH_LIBRARIES}
-    opentelemetry_exporter_etw ${CMAKE_THREAD_LIBS_INIT})
-  target_compile_definitions(etw_tracer_test_enable_env_properties
-                             PRIVATE ENABLE_ENV_PROPERTIES)
-
-  target_link_libraries(
-    etw_logger_test_enable_env_properties ${GTEST_BOTH_LIBRARIES}
-    opentelemetry_exporter_etw ${CMAKE_THREAD_LIBS_INIT})
-  target_compile_definitions(etw_logger_test_enable_env_properties
-                             PRIVATE ENABLE_ENV_PROPERTIES)
-
-  if(WITH_BENCHMARK)
-    add_executable(etw_perf_test test/etw_perf_test.cc)
-    target_link_libraries(
-      etw_perf_test benchmark::benchmark ${GTEST_BOTH_LIBRARIES}
-      opentelemetry_exporter_etw ${CMAKE_THREAD_LIBS_INIT})
-  endif()
-
-  gtest_add_tests(
-    TARGET etw_provider_test
-    TEST_PREFIX exporter.
-    TEST_LIST etw_provider_test)
-  gtest_add_tests(
-    TARGET etw_tracer_test
-    TEST_PREFIX exporter.
-    TEST_LIST etw_tracer_test)
-  gtest_add_tests(
-    TARGET etw_logger_test
-    TEST_PREFIX exporter.
-    TEST_LIST etw_logger_test)
-  gtest_add_tests(
-    TARGET etw_tracer_test_enable_env_properties
-    TEST_PREFIX exporter.with_env_properties.
-    TEST_LIST etw_tracer_test_enable_env_properties)
-  gtest_add_tests(
-    TARGET etw_logger_test_enable_env_properties
-    TEST_PREFIX exporter.with_env_properties.
-    TEST_LIST etw_logger_test_enable_env_properties)
-
-endif() # BUILD_TESTING
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/README.md b/ext/opentelemetry-cpp-1.21.0/exporters/etw/README.md
deleted file mode 100644
index 372aa5738..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Getting Started with OpenTelemetry C++ SDK and ETW exporter on Windows
-
-Event Tracing for Windows (ETW) is an efficient kernel-level tracing facility
-that lets you log kernel or application-defined events to a log file. You can
-consume the events in real time or from a log file and use them to debug an
-application or to determine where performance issues are occurring in the
-application.
-
-OpenTelemetry C++ SDK ETW exporter allows the code instrumented using
-OpenTelemetry API to forward events to out-of-process ETW listener, for
-subsequent data recording or forwarding to alternate pipelines and flows.
-Windows Event Tracing infrastructure is available to any vendor or application
-being deployed on Windows.
-
-It is recommended to consume this exporter via
-[vcpkg](https://vcpkg.io/en/package/opentelemetry-cpp).
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/LICENSE b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/LICENSE
deleted file mode 100644
index cfc21fd2c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-TraceLogging Dynamic for Windows
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h
deleted file mode 100644
index ea98b0da2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h
+++ /dev/null
@@ -1,3458 +0,0 @@
-/* ++
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) Microsoft Corporation.  All rights reserved.
-
-Module Name:
-
-    TraceLoggingDynamic.h
-
-Abstract:
-
-    Dynamic TraceLogging Provider API for C++.
-
-Environment:
-
-    User mode.
-
---*/
-
-#pragma once
-#include <windows.h>
-#include <evntprov.h>
-#include <stdlib.h> // byteswap
-
-namespace tld
-{
-#pragma region Public interface
-
-    /*
-    GENERAL:
-
-    - This implementation of manifest-free ETW supports more functionality
-      than the implementation in TraceLoggingProvider.h, but it also has
-      higher runtime costs. This implementation is intended for use only when
-      the set of events is not known at compile-time. For example,
-      TraceLoggingDynamic.h might be used to implement a library providing
-      manifest-free ETW to a scripting language like JavaScript or Perl.
-    - This header is not optimized for direct use by developers adding events
-      to their code. There is no way to make an optimal solution that
-      works for all of the intended target users. Instead, this header
-      provides various pieces that you can build upon to create a user-friendly
-      implementation of manifest-free ETW tailored for a specific scenario.
-
-    HIGH-LEVEL API:
-
-    The high-level API provides an easy way to get up and running with
-    TraceLogging ETW events.
-
-    Contents:
-    - Class:    tld::Provider
-    - Class:    tld::Event
-    - Class:    tld::EventBuilder
-    - Enum:     tld::Type
-
-    Basic usage:
-    - Create a Provider object.
-    - Check provider.IsEnabled(...) so that you don't do the remaining steps
-      if nobody is listening for your event.
-    - Create an Event<std::vector<BYTE>> object.
-    - Add fields definitions (metadata) and values (data) using methods on
-      Event. (You are responsible for making sure that the metadata you add
-      matches the data you add -- the Event object does not validate this.)
-    - Some methods on the Event object return EventBuilder objects, which are
-      used to build the fields of nested structures. Note that Event inherits
-      from EventBuilder, so if you write a function that accepts an
-      EventBuilder&, it will also accept an Event&.
-    - Once you've added all data and metadata, call event.Write() to send the
-      event to ETW.
-
-    LOW-LEVEL API:
-
-    The low-level API provides components that you can mix and match to build
-    your own solution when the high-level components don't precisely meet your
-    needs. For example, you might use the high-level Provider class to manage
-    your REGHANDLE and the ETW callbacks, but you might use
-    EventMetadataBuilder and EventDataBuilder directly instead of using Event
-    so that you can cache event definitions.
-
-    Contents:
-    - Function: tld::RegisterProvider
-    - Function: tld::UnregisterProvider
-    - Function: tld::GetGuidForName
-    - Function: tld::SetInformation
-    - Class:    tld::ProviderMetadataBuilder
-    - Class:    tld::EventMetadataBuilder
-    - Class:    tld::EventDataBuilder
-    - Struct:   tld::EventDescriptor
-    - Class:    tld::ByteArrayWrapper
-    - Enum:     tld::InType
-    - Enum:     tld::OutType
-    - Enum:     tld::ProviderTraitType
-    - Function: tld::WriteEvent
-    - Function: tld::WriteEventEx
-    - Function: tld::PushBackAsUtf8
-    - Function: tld::MakeType
-    - Macro:    TLD_HAVE_EVENT_SET_INFORMATION
-    - Macro:    TLD_HAVE_EVENT_WRITE_EX
-
-    Notes:
-    - EventDataDescCreate is a native ETW API from <evntprov.h>. It is not
-      part of this API, but you may want to use it to initialize
-      EVENT_DATA_DESCRIPTOR structures instead of doing it directly.
-    - If you directly initialize your EVENT_DATA_DESCRIPTOR structures instead
-      of using EventDataDescCreate, be sure to properly initialize the
-      EVENT_DATA_DESCRIPTOR.Reserved field (e.g. by setting it to 0).
-      Initializing the Reserved field is NOT optional. (EventDataDescCreate
-      does correctly initialize the Reserved field.)
-    - When the API asks for a byte-buffer, you can use std::vector<BYTE> or
-      another similar type. If you don't want to use a vector, the provided
-      ByteArrayWrapper type allows you to use your own allocation strategy for
-      the buffer.
-    - By default, TraceLogging events have Id=0 and Version=0, indicating
-      that the event does not have an assigned Id. However, events can have
-      Id and Version assigned (typically assigned manually). If you don't want
-      to manage event IDs, set both Id and Version to 0. If you do assign
-      IDs to your events, the Id must be non-zero and there should be a
-      one-to-one mapping between {provider.Id + event.Id + event.Version} and
-      {event metadata}. In other words, any event with a given non-zero
-      Id+Version combination must always have exactly the same event metadata.
-      (Note to decoders: this can be used as an optimization, but do not rely
-      on providers to follow this rule.)
-    - TraceLogging events default to channel 11 (WINEVENT_CHANNEL_TRACELOGGING).
-      This channel has no effect other than to mark the event as TraceLogging-
-      compatible. Other channels can be used, but channels other than 11 will
-      only work if the provider is running on a version of Windows that
-      understands TraceLogging (Windows 7sp1 with latest updates, Windows 8.1
-      with latest updates, Windows 10, or later). If your provider is running
-      on a version of Windows that does not understand TraceLogging and you use
-      a channel other than 11, the resulting events will not decode correctly.
-
-    Low-level provider management:
-    - Use tld::ProviderMetadataBuilder to build a provider metadata blob.
-    - If you don't have a specific provider GUID already selected, use
-      tld::GetGuidForName to compute your provider GUID.
-    - Use tld::RegisterProvider to open the REGHANDLE.
-    - Use the REGHANDLE in calls to tld::WriteEvent.
-    - Use tld::UnregisterProvider to close the REGHANDLE.
-
-    Low-level event management:
-    - Use tld::EventMetadataBuilder to build an event metadata blob.
-      - Use tld::Type values to define field types, or create non-standard
-        types using tld::MakeType, tld::InType, and tld::OutType.
-    - Use tld::EventDataBuilder to build an event data blob.
-    - Create an EVENT_DESCRIPTOR for your event.
-      - Optionally use the tld::EventDescriptor wrapper class to simplify
-        initialization of EVENT_DESCRIPTOR structures.
-    - Allocate an array of EVENT_DATA_DESCRIPTORs. Size should be two more
-      than you need for your event payload (the first two are reserved for the
-      provider and event metadata).
-    - Use EventDataDescCreate to fill in the data descriptor array (skipping
-      the first two) to reference your event payload data.
-    - Use tld::WriteEvent to write your event.
-    */
-
-    /*
-    class Provider (high-level API):
-
-    Manages an ETW REGHANDLE and the provider metadata blob.
-    - Constructor creates the provider metadata blob and registers the provider.
-      Note that this includes configuring ETW callbacks.
-    - Destructor unregisters the provider and frees the metadata blob.
-    - IsEnabled APIs provide very efficient checks for whether an event needs
-      to be written.
-    - Write APIs call WriteEvent, automatically providing the correct REGHANDLE
-      and provider metadata blobs.
-
-    Typical usage:
-
-    tld::Provider provider("ProviderName", ...);
-    if (provider.IsEnabled(eventLevel, eventKeywords))
-    {
-        (prepare event);
-        provider.Write(...);
-    }
-
-    It is not a problem to call provider.Write without checking
-    provider.IsEnabled(...), but it is more efficient to check
-    provider.IsEnabled(...) so that you can skip the process of preparing the
-    event if the event is not enabled.
-    */
-    class Provider;
-
-    /*
-    class Event (high-level API):
-
-    Manages the data and metadata for an event. You create an Event object,
-    set properties, add field definitions, add field values, and then Write
-    the event.
-
-    ByteVectorTy will usually be std::vector<BYTE>, though other similar
-    types could be used instead.
-
-    Typical usage:
-
-    if (provider.IsEnabled(eventLevel, eventKeywords))
-    {
-        Event event(provider, szEventName, eventLevel, eventKeywords);
-        (add fields definitions and values);
-        event.Write();
-    }
-
-    You can reuse an Event object by calling event.Reset(...).
-    */
-    template<class ByteVectorTy>
-    class Event;
-
-    /*
-    class EventBuilder (high-level API):
-
-    This class exposes an interface for adding field metadata/data to an event.
-    The Event class inherits from EventBuilder so that it can expose this
-    interface. In addition, each call to eventBuilder.AddStruct(...) returns a
-    new EventBuilder that can be used to add fields to a nested structure.
-    You won't directly create instances of this type -- you'll use instances
-    returned by Event.AddStruct or by EventBuilder.AddStruct.
-
-    You can use EventBuilder& as the type of a parameter to a function, and
-    then pass either an Event or an EventBuilder to that function (allowing
-    for recursive processing of event fields).
-
-    Note that order is important but not checked when using multiple Event or
-    EventBuilder objects. Fields are always added to the end of the overall
-    event, regardless of which Event or EventBuilder you use to add the field.
-    The separate Event and EventBuilder objects are used for the sole purpose
-    of tracking the number of fields in each struct.
-
-    Assume that you have obtained EventBuilder object b from object a, i.e.
-    EventBuilder b = a.AddStruct(...). You must complete all operations using
-    b before resuming any operations using a. If this rule is not followed,
-    fields may end up nesting in unexpected ways.
-    */
-    template<class ByteVectorTy>
-    class EventBuilder;
-
-    /*
-    enum Type (high-level API and low-level API):
-
-    Types for event fields, corresponding to a combination of TDH_INTYPE and
-    TDH_OUTTYPE values. The Type enumeration contains predefined combinations
-    of InType and OutType that are known to work well and are recognized by
-    decoders such as TDH and xperf.
-
-    Advanced use: It is possible to create other Type values by combining
-    values from the InType and OutType enumerations using the tld::MakeType
-    function. (Valid Type values consist of one InType combined with one
-    OutType.) However, custom combinations not already present in the Type
-    enumeration are unlikely to be recognized by xperf or other decoders,
-    and will usually end up being decoded as if they had used OutTypeDefault.
-
-    When providing payload for a field, the payload data must match the InType.
-    Payload is always packed tightly with no alignment or padding.
-
-    ****
-
-    How to pack single values:
-    
-    Primitive values (int, GUID) are packed directly, with no padding or
-    alignment. Just reserve sizeof(value) bytes in the buffer, then memcpy the
-    value into the buffer. Note that there should be no alignment or padding
-    between items -- the payload is always tightly-packed.
-
-    NUL-terminated strings are also simply memcpy'ed into the buffer. Be sure
-    to include the NUL termination when reserving space and copying the value.
-    There is no special encoding reserved for a NULL string. The encoding
-    helpers in this header simply treat a NULL string the same as an empty
-    string, i.e. AddString((char*)NULL) is the same as AppendString("").
-    
-    Binary, CountedString, and CountedAnsiString scalars are all encoded as a
-    UINT16 byte-count followed by the string data. In this case, no NUL
-    termination should be included. Remember that the size is a byte count,
-    not a character count.
-
-    ****
-
-    How to pack arrays:
-
-    Assume you have a function Pack(payloadVec, item) that correctly appends an
-    item to the end of payloadVec.
-
-    Packing a variable-length array of N items is done by appending N (encoded
-    as UINT16) to payloadVec followed by calling Pack(...) N times.
-
-    Packing a constant-length array of N items is done by calling Pack(...) N
-    times. The value of N is encoded in the metadata (it was provided in the
-    field's declaration) so it does not need to be provided in the payload.
-
-    Note: while this header allows you to create arrays of anything, you
-    should avoid creating arrays of the following, as they might not decode
-    correctly:
-    - TypeNone (or anything based on InTypeNull).
-    - TypeBinary (or anything based on InTypeBinary).
-
-    It is ok to create an array of nested structures where fields in the
-    structure have TypeNone or TypeBinary.
-    */
-    enum Type : UINT16;
-
-    /*
-    Used for composing Type values.
-    Normally you'll use a precomposed Type... value, but you can compose a
-    custom Type... value by combining a value from InType with a value from
-    OutType using MakeType.
-
-    The InType tells the pipeline how to encode the field's payload (primarily
-    how to determine payload size). In addition, each InType has an implicit
-    default formatting behavior that will be used if not overridden by an
-    OutType.
-
-    The comments for each InType value indicate the payload encoding rules and
-    the OutTypes that are most likely to be usable with this InType.
-    */
-    enum InType : UINT8;
-
-    /*
-    Used for composing Type values.
-    Normally you'll use a precomposed Type... value, but you can compose a
-    custom Type... value by combining a value from InType with a value from
-    OutType using MakeType.
-
-    The OutType gives the pipeline a formatting hint that the trace consumer
-    may use to override the InType's default formatting behavior. If no
-    OutType is specified (i.e. if OutTypeDefault is used) or if the trace
-    consumer does not recognize the specified InType+OutType combination, the
-    trace consumer will perform default formatting based solely on InType.
-
-    The comments for each OutType indicate the InTypes for which the OutType
-    might have valid semantics. However, most trace consumer only recognize a
-    small subset of the "valid" InType+OutType combinations, so even if the
-    semantics are valid, the OutType might still be ignored by the trace
-    consumer. The most commonly-supported combinations are the combinations
-    with corresponding precomposed Type... values.
-    */
-    enum OutType : UINT8;
-
-    /*
-    enum ProviderTraitType (low-level API):
-
-    The type of a provider trait. Used when building up provider metadata.
-    */
-    enum ProviderTraitType : UINT8;
-
-    /*
-    macro TLD_HAVE_EVENT_SET_INFORMATION (low-level API):
-
-    Configuration macro for controlling the behavior of SetInformation.
-
-    Not all versions of Windows support the EventSetInformation API. The
-    tld::SetInformation wrapper provides default behavior that works well in
-    most cases, but may not meet the needs of all users. The configuration
-    macros can be used to control how the tld::SetInformation function invokes
-    the EventSetInformation API. (Note that tld::SetInformation is called
-    automatically by the Provider class's constructor to register the
-    provider's traits with ETW.)
-
-    When TLD_HAVE_EVENT_SET_INFORMATION is not defined and WINVER < 0x0602:
-    SetInformation uses GetModuleHandleExW+GetProcAddress to find the
-    EventSetInformation function. If found, SetInformation calls it and
-    returns whatever EventSetInformation returns. Otherwise, SetInformation
-    returns an error.
-
-    When TLD_HAVE_EVENT_SET_INFORMATION is not defined and WINVER >= 0x0602:
-    SetInformation directly calls the EventSetInformation(...) function and
-    returns whatever EventSetInformation returns.
-
-    If you set TLD_HAVE_EVENT_SET_INFORMATION:
-    - If TLD_HAVE_EVENT_SET_INFORMATION == 0, SetInformation always returns an
-      error.
-    - If TLD_HAVE_EVENT_SET_INFORMATION == 1, SetInformation calls
-      EventSetInformation.
-    - If TLD_HAVE_EVENT_SET_INFORMATION == 2, SetInformation locates
-      EventSetInformation via GetProcAddress.
-    */
-#ifndef TLD_HAVE_EVENT_SET_INFORMATION
-  #if WINVER < 0x0602 // If targeting Windows before Windows 8
-    #define TLD_HAVE_EVENT_SET_INFORMATION 2 // Find "EventSetInformation" via GetModuleHandleExW/GetProcAddress
-  #else
-    #define TLD_HAVE_EVENT_SET_INFORMATION 1 // Directly invoke EventSetInformation(...)
-  #endif
-#endif // TLD_HAVE_EVENT_SET_INFORMATION
-
-    /*
-    macro TLD_HAVE_EVENT_WRITE_EX (low-level API):
-
-    Configuration macro for enabling/disabling WriteEventEx, WriteEx.
-
-    If TLD_HAVE_EVENT_WRITE_EX is not defined and WINVER < 0x0601, or
-    if TLD_HAVE_EVENT_WRITE_EX is defined as 0,
-    then the WriteEventEx, WriteEx, and related APIs will not be available.
-
-    If TLD_HAVE_EVENT_WRITE_EX is not defined and WINVER >= 0x0601, or
-    if TLD_HAVE_EVENT_WRITE_EX is defined as 1,
-    then the WriteEventEx, WriteEx, and related APIs will be available.
-    */
-#ifndef TLD_HAVE_EVENT_WRITE_EX
-  #if WINVER < 0x0601 // If targeting Windows before Windows 7
-    #define TLD_HAVE_EVENT_WRITE_EX 0
-  #else
-    #define TLD_HAVE_EVENT_WRITE_EX 1
-  #endif
-#endif // TLD_HAVE_EVENT_WRITE_EX
-
-
-    /*
-    class ProviderMetadataBuilder (low-level API):
-
-    Helper for building the provider metadata blob.
-    The type provided for ByteBufferTy must behave like a std::vector<BYTE>.
-
-    Example usage:
-
-        std::vector<BYTE> byteVector;
-        tld::ProviderMetadataBuilder<std::vector<BYTE>> builder(byteVector);
-        builder.Begin(szProviderName); // Note: calls byteVector.clear().
-        if (builder.End()) // Returns false if the metadata is too large.
-        {
-            // byteVector now contains a valid provider metadata blob.
-        }
-    */
-    template<class ByteBufferTy>
-    class ProviderMetadataBuilder;
-
-    /*
-    class EventMetadataBuilder (low-level API):
-
-    Helper for building the event metadata blob, including field definitions.
-    The type provided for ByteBufferTy must behave like a std::vector<BYTE>.
-
-    Example usage:
-
-        std::vector<BYTE> byteVector;
-        tld::EventMetadataBuilder<std::vector<BYTE>> builder(byteVector);
-        builder.Begin(eventName); // Note: calls byteVector.clear().
-        builder.AddField("Field1", TypeBOOL32); // top-level field
-        auto  struct1 = builder.AddStruct("Struct1");
-        struct1.AddField("Nested1", TypeINT32) // nested field
-        struct1.AddField("Nested2", TypeANSISTRING); // nested field
-        if (builder.End()) // Returns false if the metadata is too large.
-        {
-            // byteVector now contains a valid event metadata blob.
-        }
-    */
-    template<class ByteBufferTy>
-    class EventMetadataBuilder;
-
-    /*
-    class EventDataBuilder (low-level API):
-
-    Helpers for adding event data to an event data blob.
-    The type provided for ByteBufferTy must behave like a std::vector<BYTE>.
-    */
-    template<class ByteBufferTy>
-    class EventDataBuilder;
-
-    /*
-    class EventDescriptor (low-level API):
-
-    Derives from EVENT_DESCRIPTOR. Adds convenient constructor and Reset
-    members. Contains an event's Id/Version/Level/Opcode/Task/Keyword
-    settings. Use of this class is optional - you can use this class if you
-    want to use the constructor or Reset methods, or you can use
-    EVENT_DESCRIPTOR directly if you don't need the convenience methods.
-    */
-    struct EventDescriptor;
-
-    /*
-    class ByteArrayWrapper (low-level API):
-
-    Adapter that allows a regular BYTE array (stack-allocated or
-    manually-allocated) to be used as the buffer in MetadataBuilder
-    operations. If the underlying BYTE array is too small, or if no array is
-    provided at all, this adapter will stop writing data beyond the end of the
-    array, but will continue to "accept" data (and will increment it size
-    member accordingly). This allows you to determine the size of the required
-    array so that the operation can be retried with a correctly-sized array.
-
-    Example usage:
-
-        // Create a wrapper with a default (0-length) buffer.
-        tld::ByteArrayWrapper wrapper;
-
-        // Create a metadata builder attached to the wrapper.
-        tld::ProviderMetadataBuilder<tld::ByteArrayWrapper> builder(wrapper);
-
-        // Determine the size needed for provider metadata.
-        builder.Begin(providerName);
-        builder.End();
-
-        // Allocate a real buffer and reset the wrapper to use it.
-        BYTE* pBuffer = new BYTE[wrapper.size()];
-        wrapper.reset(pBuffer, wrapper.size());
-
-        // Redo the operation with the real buffer.
-        builder.Begin(providerName);
-        if (builder.End())
-        {
-            // pBuffer now contains a valid provider metadata blob.
-        }
-    */
-    class ByteArrayWrapper;
-
-    /*
-    function RegisterProvider (low-level API):
-
-    Calls EventRegister. If EventRegister succeeds, calls EventSetInformation
-    to register your provider traits with ETW. Use this instead of calling
-    EventRegister directly to ensure that your provider traits are properly
-    registered.
-    */
-    inline HRESULT RegisterProvider(
-        _Out_ REGHANDLE* phProvider,
-        _In_ GUID const* pProviderId,
-        _In_count_x_((UINT16*)pProviderMetadata) UINT8 const* pProviderMetadata,
-        _In_opt_ PENABLECALLBACK pEnableCallback = 0,
-        _In_opt_ void* pEnableCallbackContext = 0);
-
-    /*
-    function UnregisterProvider (low-level API):
-
-    Calls EventUnregister.
-    */
-    inline HRESULT UnregisterProvider(
-        REGHANDLE hProvider);
-
-    /*
-    function WriteEvent (low-level API):
-
-    Calls EventWriteTransfer. You must provide 2 more data descriptors than
-    are required for your data. The first two elements in pDataDescriptors
-    will be used for provider and event metadata. The actual payload (if any)
-    is expected to be in the remaining elements of pDataDescriptors.
-
-    Example usage:
-
-        tld::EventDescriptor eventDescriptor(
-            level,
-            opcode,
-            task,
-            keywords);
-        EVENT_DATA_DESCRIPTOR pDataDescriptors[cFields + 2];
-        for (int i = 0; i < cFields; i++)
-        {
-            EventDataDescCreate(&pDataDescriptors[i + 2], ...);
-        }
-        tld::WriteEvent(
-            hProvider,
-            eventDescriptor,
-            pProviderMetadata,
-            pEventMetadata,
-            cFields + 2,
-            pDataDescriptors);
-    */
-    inline HRESULT WriteEvent(
-        _In_ REGHANDLE hProvider,
-        _In_ EVENT_DESCRIPTOR const& eventDescriptor,
-        _In_count_x_((UINT16*)pProviderMetadata) UINT8 const* pProviderMetadata,
-        _In_count_x_((UINT16*)pEventMetadata) UINT8 const* pEventMetadata,
-        _In_range_(2, 128) ULONG cDataDescriptors,
-        _Inout_count_(cDataDescriptors) EVENT_DATA_DESCRIPTOR* pDataDescriptors,
-        _In_opt_ GUID const* pActivityId = 0,
-        _In_opt_ GUID const* pRelatedActivityId = 0);
-
-#if TLD_HAVE_EVENT_WRITE_EX == 1
-
-    /*
-    function WriteEventEx (low-level API):
-    Calls EventWriteEx. Otherwise works like the WriteEvent function.
-    */
-    inline HRESULT WriteEventEx(
-        _In_ REGHANDLE hProvider,
-        _In_ EVENT_DESCRIPTOR const& eventDescriptor,
-        _In_count_x_((UINT16*)pProviderMetadata) UINT8 const* pProviderMetadata,
-        _In_count_x_((UINT16*)pEventMetadata) UINT8 const* pEventMetadata,
-        _In_range_(2, 128) ULONG cDataDescriptors,
-        _Inout_count_(cDataDescriptors) EVENT_DATA_DESCRIPTOR* pDataDescriptors,
-        ULONG64 filter = 0,
-        ULONG flags = 0,
-        _In_opt_ GUID const* pActivityId = 0,
-        _In_opt_ GUID const* pRelatedActivityId = 0);
-
-#endif // TLD_HAVE_EVENT_WRITE_EX
-
-    /*
-    function SetInformation (low-level API):
-
-    Wrapper for ETW API EventSetInformation.
-    If TraceLoggingDynamic.cpp was compiled to require Win8 or later (as
-    determined by WINVER), this directly calls EventSetInformation. Otherwise,
-    this attempts to dynamically load the EventSetInformation API via
-    GetModuleHandleExW.
-
-    The behavior of this function (e.g. to override the WINVER check) can be
-    adjusted by setting the TLD_HAVE_EVENT_SET_INFORMATION macro as described
-    below.
-    */
-    inline HRESULT SetInformation(
-        _In_ REGHANDLE hProvider,
-        EVENT_INFO_CLASS informationClass,
-        _In_reads_bytes_opt_(cbInformation) void* pbInformation,
-        ULONG cbInformation);
-
-    /*
-    function GetGuidForName (low-level API):
-
-    Hashes a provider name to generate a GUID. Uses the same GUID generation
-    algorithm as System.Diagnostics.Tracing.EventSource (from .NET) and
-    Windows.Foundation.Diagnostics.LoggingChannel (from Windows Runtime).
-    */
-    inline GUID GetGuidForName(
-        _In_z_ char const* szUtf8Name);
-
-    /*
-    function GetGuidForName (low-level API):
-
-    Hashes a provider name to generate a GUID. Uses the same GUID generation
-    algorithm as .NET System.Diagnostics.Tracing.EventSource and Windows
-    Runtime Windows.Foundation.Diagnostics.LoggingChannel.
-    */
-    inline GUID GetGuidForName(
-        _In_z_ wchar_t const* szUtf16Name);
-
-    /*
-    function PushBackAsUtf8 (low-level API):
-
-    Transcodes a NUL-terminated UTF-16LE string to a NUL-terminated UTF-8
-    string. Intended for use when appending provider/event/field names to
-    metadata buffers.
-    */
-    template<class ByteBufferTy>
-    void PushBackAsUtf8(
-        ByteBufferTy& buffer,
-        _In_z_ wchar_t const* szUtf16);
-
-#pragma endregion
-
-    namespace detail
-    {
-#pragma region Internal macros
-
-#define _tld_MAKE_TYPE(inType, outType) \
-    static_cast<::tld::Type>((inType) | (static_cast<int>(outType) << 8))
-
-#ifndef TLD_DEBUG
-  #if (DBG || defined(DEBUG) || defined(_DEBUG)) && !defined(NDEBUG)
-    #define TLD_DEBUG 1
-  #else // DBG
-    #define TLD_DEBUG 0
-  #endif // DBG
-#endif // TLD_DEBUG
-
-#ifndef _tld_ASSERT
-  #if TLD_DEBUG
-    #define _tld_ASSERT(exp, str) ((void)(!(exp) ? (__annotation(L"Debug", L"AssertFail", L"TraceLogging: " L#exp L" : " L##str), DbgRaiseAssertionFailure(), 0) : 0))
-  #else // TLD_DEBUG
-    #define _tld_ASSERT(exp, str) ((void)0)
-  #endif // TLD_DEBUG
-#endif // _tld_ASSERT
-
-#pragma endregion
-
-#pragma region MetadataBuilderBase
-
-        template<class ByteBufferTy>
-        class MetadataBuilderBase
-        {
-            ByteBufferTy& m_buffer;
-
-            MetadataBuilderBase(MetadataBuilderBase const&); // = delete
-            void operator=(MetadataBuilderBase const&); // = delete
-
-        protected:
-
-            explicit MetadataBuilderBase(ByteBufferTy& buffer)
-                : m_buffer(buffer)
-            {
-                return;
-            }
-
-            void BaseBegin()
-            {
-                m_buffer.clear();
-                AddU16(0); // Metadata size filled in by BaseEnd
-            }
-
-            bool BaseEnd()
-            {
-                auto size = m_buffer.size();
-                _tld_ASSERT(2 <= size, "Begin was not called");
-                SetU16(0, static_cast<UINT16>(size));
-                return size < 32768;
-            }
-
-            void AddBytes(
-                _In_reads_bytes_(cb) void const* p,
-                unsigned cb)
-            {
-                auto pb = static_cast<UINT8 const*>(p);
-                for (unsigned i = 0; i != cb; i++)
-                {
-                    m_buffer.push_back(pb[i]);
-                }
-            }
-
-            void AddString(
-                _In_z_ char const* szUtf8)
-            {
-                for (unsigned i = 0;; i++)
-                {
-                    m_buffer.push_back(szUtf8[i]);
-                    if (szUtf8[i] == 0)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            void AddString(
-                _In_z_ wchar_t const* szUtf16)
-            {
-                PushBackAsUtf8(m_buffer, szUtf16);
-            }
-
-            void AddU8(
-                UINT8 val)
-            {
-                m_buffer.push_back(val);;
-            }
-
-            void AddU16(
-                UINT16 val)
-            {
-                m_buffer.push_back(static_cast<UINT8>(val));
-                m_buffer.push_back(static_cast<UINT8>(val >> 8));
-            }
-
-            UINT32 GetBookmark()
-            {
-                return static_cast<UINT32>(m_buffer.size());
-            }
-
-            void SetU8(
-                UINT32 bookmark,
-                UINT8 val)
-            {
-                _tld_ASSERT(bookmark < m_buffer.size(), "bookmark out of range");
-                m_buffer[bookmark] = val;
-            }
-
-            void SetU16(
-                UINT32 bookmark,
-                UINT16 val)
-            {
-                _tld_ASSERT(1 <= bookmark + 1, "bookmark out of range");
-                SetU8(bookmark + 0, static_cast<UINT8>(val));
-                SetU8(bookmark + 1, static_cast<UINT8>(val >> 8));
-            }
-
-            void IncrementU7(
-                UINT32 bookmark)
-            {
-                _tld_ASSERT(bookmark < m_buffer.size(), "bookmark out of range");
-                UINT8 result;
-                result = ++m_buffer[bookmark];
-                _tld_ASSERT((result & 0x7f) != 0, "too many fields in struct");
-            }
-
-        public:
-
-            ByteBufferTy& GetBuffer()
-            {
-                return m_buffer;
-            }
-
-            ByteBufferTy const& GetBuffer() const
-            {
-                return m_buffer;
-            }
-        };
-
-#pragma endregion
-
-#pragma region Sha1ForNonSecretPurposes
-
-        /*
-        Implements the SHA1 hashing algorithm. Note that this implementation is
-        for hashing public information. Do not use this code to hash private data,
-        as this implementation does not take any steps to avoid information
-        disclosure (i.e. does not scrub its buffers).
-        */
-        class Sha1ForNonSecretPurposes
-        {
-            Sha1ForNonSecretPurposes(Sha1ForNonSecretPurposes const&); // = delete
-            void operator=(Sha1ForNonSecretPurposes const&); // = delete
-
-            UINT64 m_length; // Total message length in bits
-            unsigned m_pos; // Length of current chunk in bytes
-            UINT32 m_results[5];
-            UINT32 m_w[80]; // Workspace
-
-        public:
-
-            Sha1ForNonSecretPurposes()
-                : m_length()
-                , m_pos()
-            {
-                m_results[0] = 0x67452301;
-                m_results[1] = 0xEFCDAB89;
-                m_results[2] = 0x98BADCFE;
-                m_results[3] = 0x10325476;
-                m_results[4] = 0xC3D2E1F0;
-            }
-
-            void Append(
-                _In_reads_bytes_(cbInput) void const* pInput,
-                unsigned cbInput)
-            {
-                for (unsigned i = 0; i != cbInput; i++)
-                {
-                    Append(static_cast<UINT8 const*>(pInput)[i]);
-                }
-            }
-
-            void Append(UINT8 input)
-            {
-                reinterpret_cast<UINT8*>(m_w)[m_pos++] = input;
-                if (64 == m_pos)
-                {
-                    Drain();
-                }
-            }
-
-            _Ret_bytecount_(20) UINT8* Finish()
-            {
-                UINT64 totalBitCount = m_length + 8 * m_pos;
-                Append(0x80);
-                while (m_pos != 56)
-                {
-                    Append(0x00);
-                }
-
-                *reinterpret_cast<UINT64*>(m_w + 14) = _byteswap_uint64(totalBitCount);
-                Drain();
-
-                for (unsigned i = 0; i != 5; i++)
-                {
-                    m_results[i] = _byteswap_ulong(m_results[i]);
-                }
-
-                return reinterpret_cast<UINT8*>(m_results);
-            }
-
-        private:
-
-            void Drain()
-            {
-                for (unsigned i = 0; i != 16; i++)
-                {
-                    m_w[i] = _byteswap_ulong(m_w[i]);
-                }
-
-                for (unsigned i = 16; i != 80; i++)
-                {
-                    m_w[i] = _rotl((m_w[i - 3] ^ m_w[i - 8] ^ m_w[i - 14] ^ m_w[i - 16]), 1);
-                }
-
-                UINT32 a = m_results[0];
-                UINT32 b = m_results[1];
-                UINT32 c = m_results[2];
-                UINT32 d = m_results[3];
-                UINT32 e = m_results[4];
-
-                for (unsigned i = 0; i != 20; i++)
-                {
-                    UINT32 const k = 0x5A827999;
-                    UINT32 f = (b & c) | ((~b) & d);
-                    UINT32 temp = _rotl(a, 5) + f + e + k + m_w[i]; e = d; d = c; c = _rotl(b, 30); b = a; a = temp;
-                }
-
-                for (unsigned i = 20; i != 40; i++)
-                {
-                    const UINT32 k = 0x6ED9EBA1;
-                    UINT32 f = b ^ c ^ d;
-                    UINT32 temp = _rotl(a, 5) + f + e + k + m_w[i]; e = d; d = c; c = _rotl(b, 30); b = a; a = temp;
-                }
-
-                for (unsigned i = 40; i != 60; i++)
-                {
-                    const UINT32 k = 0x8F1BBCDC;
-                    UINT32 f = (b & c) | (b & d) | (c & d);
-                    UINT32 temp = _rotl(a, 5) + f + e + k + m_w[i]; e = d; d = c; c = _rotl(b, 30); b = a; a = temp;
-                }
-
-                for (unsigned i = 60; i != 80; i++)
-                {
-                    const UINT32 k = 0xCA62C1D6;
-                    UINT32 f = b ^ c ^ d;
-                    UINT32 temp = _rotl(a, 5) + f + e + k + m_w[i]; e = d; d = c; c = _rotl(b, 30); b = a; a = temp;
-                }
-
-                m_results[0] += a;
-                m_results[1] += b;
-                m_results[2] += c;
-                m_results[3] += d;
-                m_results[4] += e;
-
-                m_length += 512; // 64 bytes == 512 bits
-                m_pos = 0;
-            }
-        };
-
-#pragma endregion
-
-#pragma region CopyUtfCodePoint
-
-        /*
-        Transcodes one code point from UTF-8 to UTF-16LE.
-    
-        Note that this function requires the input buffer to be nul-terminated.
-        This function may try to read several bytes from the input buffer, and the
-        nul-termination is required to ensure that it doesn't read off the end of
-        the valid buffer when decoding what appears to be a multi-byte code point.
-
-        The UTF-8 validation is very permissive -- anything that is not valid
-        UTF-8 is treated as if it were ISO-8859-1 (i.e. the BYTE value is cast
-        to wchar_t and assumed to be a valid Unicode code point). This usually
-        works well - it has a reasonable probability of doing what the developer
-        expects even when the input is CP1252/Latin1 instead of UTF-8, and doesn't
-        fail too badly when it doesn't do what the developer expects.
-
-        pchUtf16Output:
-        Buffer that receives a single code point, encoded in UTF-16-LE as one or
-        two 16-bit wchar_t values.
-    
-        pszUtf8Input:
-        Pointer into a nul-terminated UTF-8 byte sequence. On entry, this points
-        to the next char to be consumed. This function will advance the pointer
-        past the consumed data.
-
-        returns:
-        The number of 16-bit wchar_t values added to pchUtf16Output (one or two).
-        */
-        static unsigned CopyUtfCodePoint(
-            _Out_writes_to_(2, return) wchar_t* pchUtf16Output,
-            char const*& pszUtf8Input)
-        {
-            unsigned cchOutput = 1;
-            unsigned ch = static_cast<unsigned char>(*pszUtf8Input);
-            pszUtf8Input += 1;
-            if (ch <= 0xbf)
-            {
-                // 0x01..0x7f: ASCII - pass through.
-                // 0x80..0xbf: Invalid - pass through.
-            }
-            else if ((pszUtf8Input[0] & 0xc0) != 0x80)
-            {
-                // Invalid trail byte - pass through.
-            }
-            else if (ch <= 0xdf)
-            {
-                // 0xc0..0xdf: Two-byte encoding for 0x0080..0x07ff.
-                unsigned ch2 = ((ch & 0x1f) << 6)
-                    | (pszUtf8Input[0] & 0x3f);
-                if (0x0080 <= ch2)
-                {
-                    ch = ch2;
-                    pszUtf8Input += 1;
-                }
-            }
-            else if ((pszUtf8Input[1] & 0xc0) != 0x80)
-            {
-                // Invalid trail byte - pass through.
-            }
-            else if (ch <= 0xef)
-            {
-                // 0xe0..0xef: Three-byte encoding for 0x0800..0xffff.
-                unsigned ch2 = ((ch & 0x0f) << 12)
-                    | ((pszUtf8Input[0] & 0x3f) << 6)
-                    | (pszUtf8Input[1] & 0x3f);
-                if (0x0800 <= ch2)
-                {
-                    ch = ch2;
-                    pszUtf8Input += 2;
-                }
-            }
-            else if ((pszUtf8Input[2] & 0xc0) != 0x80)
-            {
-                // Invalid trail byte - pass through.
-            }
-            else if (ch <= 0xf4)
-            {
-                // 0xf0..0xf4: Four-byte encoding for 0x010000..0x10ffff.
-                unsigned ch2 = ((ch & 0x07) << 18)
-                    | ((pszUtf8Input[0] & 0x3f) << 12)
-                    | ((pszUtf8Input[1] & 0x3f) << 6)
-                    | (pszUtf8Input[2] & 0x3f);
-                ch2 -= 0x10000;
-                if (ch2 <= 0xfffff)
-                {
-                    // Decode into surrogate pair (2 wchar_t units)
-                    pchUtf16Output[1] = static_cast<wchar_t>(0xdc00 | (ch2 & 0x3ff));
-                    ch = 0xd800 | (ch2 >> 10);
-                    pszUtf8Input += 3;
-                    cchOutput = 2;
-                }
-            }
-
-            pchUtf16Output[0] = static_cast<wchar_t>(ch);
-            return cchOutput;
-        }
-
-        /*
-        Copies one code point of UTF-16LE data.
-
-        Note that this function requires the input buffer to be nul-terminated.
-        This function may try to read several words from the input buffer, and the
-        nul-termination is required to ensure that it doesn't read off the end of
-        the valid buffer when copying what appears to be a surrogate pair.
-
-        pchUtf16Output:
-        Buffer that receives a single code point, encoded in UTF-16-LE as one or
-        two 16-bit wchar_t values.
-
-        pszUtf16Input:
-        Pointer into a nul-terminated UTF-16-LE wchar_t sequence. On entry, this
-        points to the next wchar_t to be consumed. This function will advance the
-        pointer past the consumed data.
-
-        returns:
-        The number of 16-bit wchar_t values added to pchUtf16Output (one or two).
-        */
-        static unsigned CopyUtfCodePoint(
-            _Out_writes_to_(2, return) wchar_t* pchUtf16Output,
-            wchar_t const*& pszUtf16Input)
-        {
-            unsigned cchOutput = 1;
-            wchar_t ch = *pszUtf16Input;
-            pszUtf16Input += 1;
-            if (0xd800 <= ch && ch < 0xdc00 &&
-                0xdc00 <= *pszUtf16Input && *pszUtf16Input < 0xe000)
-            {
-                pchUtf16Output[1] = *pszUtf16Input;
-                pszUtf16Input += 1;
-                cchOutput = 2;
-            }
-            pchUtf16Output[0] = ch;
-            return cchOutput;
-        }
-
-#pragma endregion
-
-#pragma region GetGuidForNameImpl
-
-        __declspec(selectany) extern UINT32 const NamespaceValue[] = {
-            0xB22D2C48, 0xC84790C3, 0x151AF887, 0xFB30C1Bf
-        };
-
-        template<class CharTy>
-        GUID GetGuidForNameImpl(
-            _In_z_ CharTy const* szUtfName)
-        {
-            /*
-            Algorithm:
-            szNameUpperBE = ByteSwap(ToUpper(szName));
-            hash = SHA1(namespaceBytes + szNameUpperBE); // Does not include zero-termination in hash.
-            hash[7] = (hash[7] & 0x0F) | 0x50;
-            guid = First16Bytes(hash);
-            */
-
-            WCHAR buffer[16];
-            unsigned const cchBuffer = ARRAYSIZE(buffer);
-            Sha1ForNonSecretPurposes sha1;
-
-            sha1.Append(NamespaceValue, sizeof(NamespaceValue));
-            if (szUtfName[0] != 0)
-            {
-                CharTy const* pszName = szUtfName;
-                unsigned iBuffer = 0;
-                for (;;)
-                {
-                    // CopyUtfCodePoint may add up to 2 wchar_t units to buffer.
-                    iBuffer += CopyUtfCodePoint(buffer + iBuffer, pszName);
-                    _tld_ASSERT(iBuffer <= cchBuffer, "buffer overflow");
-
-                    bool const bDone = *pszName == 0;
-                    if (bDone || cchBuffer - 1 <= iBuffer)
-                    {
-    #pragma warning(suppress: 26035) // string is counted, not nul-terminated.
-                        LCMapStringEx(
-                            LOCALE_NAME_INVARIANT,
-                            LCMAP_UPPERCASE | LCMAP_BYTEREV,
-                            buffer,
-                            iBuffer,
-                            buffer,
-                            iBuffer,
-                            NULL,
-                            NULL,
-                            0);
-                        sha1.Append(buffer, iBuffer * 2);
-
-                        if (bDone)
-                        {
-                            break;
-                        }
-
-                        iBuffer = 0;
-                    }
-                }
-            }
-
-            UINT8* pSha1 = sha1.Finish();
-
-            // Set high 4 bits of octet 7 to 5, as per RFC 4122
-            pSha1[7] = (pSha1[7] & 0x0f) | 0x50;
-
-            return *reinterpret_cast<GUID*>(pSha1);
-        }
-
-#pragma endregion
-    }
-    // namespace detail
-
-#pragma region Enumerations
-
-    enum InType : UINT8
-    {
-        /*
-        A field with no value (0-length payload).
-        Arrays of InTypeNull are illegal.
-        */
-        InTypeNull,
-
-        /*
-        A nul-terminated CHAR16 string.
-        Useful OutTypes: Xml, Json.
-        */
-        InTypeUnicodeString,
-
-        /*
-        A nul-terminated CHAR8 string.
-        Useful OutTypes: Xml, Json, Utf8.
-        */
-        InTypeAnsiString,
-
-        /*
-        INT8.
-        */
-        InTypeInt8,
-
-        /*
-        UINT8.
-        Useful OutTypes: String, Boolean, Hex.
-        */
-        InTypeUInt8,
-
-        /*
-        INT16.
-        */
-        InTypeInt16,
-
-        /*
-        UINT16.
-        Useful OutTypes: String, Hex, Port.
-        */
-        InTypeUInt16,
-
-        /*
-        INT32.
-        Useful OutTypes: HResult.
-        */
-        InTypeInt32,
-
-        /*
-        UINT32.
-        Useful OutTypes: Pid, Tid, IPv4, Win32Error, NTStatus.
-        */
-        InTypeUInt32,
-
-        /*
-        INT64.
-        */
-        InTypeInt64,
-
-        /*
-        UINT64.
-        */
-        InTypeUInt64,
-
-        /*
-        FLOAT.
-        */
-        InTypeFloat,
-
-        /*
-        DOUBLE.
-        */
-        InTypeDouble,
-
-        /*
-        BOOL.
-        */
-        InTypeBool32,
-
-        /*
-        UINT16 byte-count followed by binary data.
-        Useful OutTypes: IPv6, SocketAddress.
-        Arrays of InTypeBinary are not supported. (No error will be reported,
-        but decoding tools will probably not be able to decode them).
-        */
-        InTypeBinary,
-
-        /*
-        GUID.
-        */
-        InTypeGuid,
-
-        /*
-        Not supported. Use InTypePointer. (No error will be reported,
-        but decoding tools will probably not be able to decode them).
-        */
-        InTypePointer_PlatformSpecific,
-
-        /*
-        FILETIME.
-        */
-        InTypeFileTime,
-
-        /*
-        SYSTEMTIME.
-        */
-        InTypeSystemTime,
-
-        /*
-        SID. Size is determined from the number of subauthorities.
-        */
-        InTypeSid,
-
-        /*
-        INT32.
-        */
-        InTypeHexInt32,
-
-        /*
-        INT64.
-        */
-        InTypeHexInt64,
-
-        /*
-        UINT16 byte-count followed by UTF-16 data.
-        */
-        InTypeCountedString,
-
-        /*
-        UINT16 byte-count followed by MBCS data.
-        */
-        InTypeCountedAnsiString,
-
-        /*
-        This field has no value by itself, but it causes the decoder to treat
-        the next N fields as part of this field. The value of N is taken from
-        the field's OutType.
-
-        Note that it is valid to have an array of structs. The array length
-        will apply to the entire group of fields contained in the array.
-
-        The Struct type is special. Do not use it directly. Use helper APIs to
-        create nested structures.
-        */
-        InTypeStruct,
-
-        /*
-        INT_PTR.
-        InTypeIntPtr is an alias for either InTypeInt32 or InTypeInt64.
-        */
-        InTypeIntPtr = sizeof(void*) == 8 ? InTypeInt64 : InTypeInt32,
-
-        /*
-        UINT_PTR.
-        InTypeUIntPtr is an alias for either InTypeUInt32 or InTypeUInt64.
-        */
-        InTypeUIntPtr = sizeof(void*) == 8 ? InTypeUInt64 : InTypeUInt32,
-
-        /*
-        LPVOID.
-        InTypePointer is an alias for either InTypeHexInt32 or InTypeHexInt64.
-        */
-        InTypePointer = sizeof(void*) == 8 ? InTypeHexInt64 : InTypeHexInt32,
-
-        /*
-        InType must fit in 5 bits.
-        */
-        InTypeMask = 31
-    };
-
-    enum OutType : UINT8
-    {
-        OutTypeDefault = 0x00,
-        OutTypeNoPrint = 0x01,
-        OutTypeString = 0x02,    // affects 8-bit and 16-bit integral types.
-        OutTypeBoolean = 0x03,   // affects 8-bit and 32-bit integral types.
-        OutTypeHex = 0x04,       // affects integral types.
-        OutTypePid = 0x05,       // affects 32-bit integral types.
-        OutTypeTid = 0x06,       // affects 32-bit integral types.
-        OutTypePort = 0x07,      // affects 16-bit integral types.
-        OutTypeIPv4 = 0x08,      // affects 32-bit integral types.
-        OutTypeIPv6 = 0x09,      // affects arrays of 8-bit integral types, e.g. UInt8[].
-        OutTypeSocketAddress = 0x0a, // affects arrays of 8-bit integral types, e.g. UInt8[].
-        OutTypeXml = 0x0b,       // affects strings; affects arrays of 8-bit and 16-bit integral types.
-        OutTypeJson = 0x0c,      // affects strings; affects arrays of 8-bit and 16-bit integral types.
-        OutTypeWin32Error = 0x0d,// affects 32-bit integral types.
-        OutTypeNTStatus = 0x0e,  // affects 32-bit integral types.
-        OutTypeHResult = 0x0f,   // affects 32-bit integral types.
-        OutTypeFileTime = 0x10,  // affects 64-bit integral types.
-        OutTypeSigned = 0x11,    // affects integral types.
-        OutTypeUnsigned = 0x12,  // affects integral types.
-        OutTypeDateTimeCultureInsensitive = 0x21, // affects FileTime, SystemTime.
-        OutTypeUtf8 = 0x23,      // affects AnsiString types.
-        OutTypePkcs7WithTypeInfo = 0x24, // affects binary types.
-        OutTypeCodePointer = 0x25, // affects UInt32, UInt64, HexInt32, HexInt64.
-        OutTypeDateTimeUtc = 0x26, // affects FileTime, SystemTime.
-        OutTypeMask = 0x7f // OutType must fit into 7 bits.
-    };
-
-    enum Type : UINT16
-    {
-        /*
-        Field with no data (empty). 0-length payload.
-        Can only be used on scalar fields. Illegal for arrays.
-        NOTE: Not well-supported by decoders.
-        */
-        TypeNone = InTypeNull,
-
-        /*
-        Encoding assumes 0-terminated CHAR16 string.
-        Formatting treats as UTF-16LE string.
-        */
-        TypeUtf16String = InTypeUnicodeString,
-
-        /*
-        Encoding assumes 0-terminated CHAR8 string.
-        Formatting treats as MBCS string.
-        */
-        TypeMbcsString = InTypeAnsiString,
-
-        /*
-        Encoding assumes nul-terminated CHAR8 string.
-        Formatting treats as UTF-8 string.
-        */
-        TypeUtf8String = _tld_MAKE_TYPE(InTypeAnsiString, OutTypeUtf8),
-
-        /*
-        Encoding assumes 1-byte value.
-        Formatting treats as signed integer.
-        */
-        TypeInt8 = InTypeInt8,
-
-        /*
-        Encoding assumes 1-byte value.
-        Formatting treats as unsigned integer.
-        */
-        TypeUInt8 = InTypeUInt8,
-
-        /*
-        Encoding assumes 2-byte value.
-        Formatting treats as signed integer.
-        */
-        TypeInt16 = InTypeInt16,
-
-        /*
-        Encoding assumes 2-byte value.
-        Formatting treats as unsigned integer.
-        */
-        TypeUInt16 = InTypeUInt16,
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as signed integer.
-        */
-        TypeInt32 = InTypeInt32,
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as unsigned integer.
-        */
-        TypeUInt32 = InTypeUInt32,
-
-        /*
-        Encoding assumes 8-byte value.
-        Formatting treats as signed integer.
-        */
-        TypeInt64 = InTypeInt64,
-
-        /*
-        Encoding assumes 8-byte value.
-        Formatting treats as unsigned integer.
-        */
-        TypeUInt64 = InTypeUInt64,
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as Float32.
-        */
-        TypeFloat = InTypeFloat,
-
-        /*
-        Encoding assumes 8-byte value.
-        Formatting treats as Float64.
-        */
-        TypeDouble = InTypeDouble,
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as Boolean.
-        */
-        TypeBool32 = InTypeBool32,
-
-        /*
-        Encoding assumes 2-byte length followed by binary data.
-        Formatting treats as binary blob.
-        Arrays of TypeBinary are not supported. (No error will be reported,
-        but decoding tools will probably not be able to decode them).
-        */
-        TypeBinary = InTypeBinary,
-
-        /*
-        Encoding assumes 16-byte value.
-        Formatting treats as GUID.
-        */
-        TypeGuid = InTypeGuid,
-
-        /*
-        Encoding assumes 8-byte value.
-        Formatting treats as FILETIME.
-        */
-        TypeFileTime = InTypeFileTime,
-
-        /*
-        Encoding assumes 16-byte value.
-        Formatting treats as SYSTEMTIME.
-        */
-        TypeSystemTime = InTypeSystemTime,
-
-        /*
-        Encoding assumes 16-byte value.
-        Formatting treats as UTC SYSTEMTIME.
-        */
-        TypeSystemTimeUtc = _tld_MAKE_TYPE(InTypeSystemTime, OutTypeDateTimeUtc),
-
-        /*
-        Encoding assumes SID. Length is determined from number of subauthorities.
-        Formatting treats as a SID.
-        */
-        TypeSid = InTypeSid,
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as hexadecimal unsigned integer.
-        */
-        TypeHexInt32 = InTypeHexInt32,
-
-        /*
-        Encoding assumes 8-byte value.
-        Formatting treats as hexadecimal unsigned integer.
-        */
-        TypeHexInt64 = InTypeHexInt64,
-
-        /*
-        Encoding assumes 2-byte bytecount followed by CHAR16 data.
-        Formatting treats as UTF-16LE string.
-        */
-        TypeCountedUtf16String = InTypeCountedString,
-
-        /*
-        Encoding assumes 2-byte bytecount followed by CHAR8 data.
-        Formatting treats as MBCS string.
-        */
-        TypeCountedMbcsString = InTypeCountedAnsiString,
-
-        /*
-        Encoding assumes 2-byte bytecount followed by CHAR8 data.
-        Formatting treats as UTF-8 string.
-        */
-        TypeCountedUtf8String = _tld_MAKE_TYPE(InTypeCountedAnsiString, OutTypeUtf8),
-
-        /*
-        Encoding assumes pointer-sized value.
-        Formatting treats as signed integer.
-        Note: the value of this enum is different on 32-bit and 64-bit systems.
-        This is an alias for TypeInt32 when compiled for a 32-bit target.
-        This is an alias for TypeInt64 when compiled for a 64-bit target.
-        */
-        TypeIntPtr = InTypeIntPtr,
-
-        /*
-        Encoding assumes pointer-sized value.
-        Formatting treats as unsigned integer.
-        Note: the value of this enum is different on 32-bit and 64-bit systems.
-        This is an alias for TypeUInt32 when compiled for a 32-bit target.
-        This is an alias for TypeUInt64 when compiled for a 64-bit target.
-        */
-        TypeUIntPtr = InTypeUIntPtr,
-
-        /*
-        Encoding assumes pointer-sized value.
-        Formatting treats as hexadecimal unsigned integer.
-        Note: the value of this enum is different on 32-bit and 64-bit systems.
-        This is an alias for TypeHexInt32 when compiled for a 32-bit target.
-        This is an alias for TypeHexInt64 when compiled for a 64-bit target.
-        */
-        TypePointer = InTypePointer,
-
-        /*
-        Encoding assumes pointer-sized value.
-        Formatting treats as code pointer.
-        Note: the value of this enum is different on 32-bit and 64-bit systems.
-        This is a subtype of TypeHexInt32 when compiled for a 32-bit target.
-        This is a subtype of TypeHexInt64 when compiled for a 64-bit target.
-        */
-        TypeCodePointer = _tld_MAKE_TYPE(InTypePointer, OutTypeCodePointer),
-
-        /*
-        Encoding assumes 2-byte value.
-        Formatting treats as UTF-16LE character.
-        */
-        TypeChar16 = _tld_MAKE_TYPE(InTypeUInt16, OutTypeString),
-
-        /*
-        Encoding assumes 1-byte value.
-        Formatting treats as ANSI character.
-        */
-        TypeChar8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeString),
-
-        /*
-        Encoding assumes 1-byte value.
-        Formatting treats as Boolean.
-        */
-        TypeBool8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeBoolean),
-
-        /*
-        Encoding assumes 1-byte value.
-        Formatting treats as hexadecimal unsigned integer.
-        */
-        TypeHexInt8 = _tld_MAKE_TYPE(InTypeUInt8, OutTypeHex),
-
-        /*
-        Encoding assumes 2-byte value.
-        Formatting treats as hexadecimal unsigned integer.
-        */
-        TypeHexInt16 = _tld_MAKE_TYPE(InTypeUInt16, OutTypeHex),
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as process identifier.
-        */
-        TypePid = _tld_MAKE_TYPE(InTypeUInt32, OutTypePid),
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as thread identifier.
-        */
-        TypeTid = _tld_MAKE_TYPE(InTypeUInt32, OutTypeTid),
-
-        /*
-        Encoding assumes 2-byte value.
-        Formatting treats as big-endian IP port(s).
-        */
-        TypePort = _tld_MAKE_TYPE(InTypeUInt16, OutTypePort),
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as IPv4 address.
-        */
-        TypeIPv4 = _tld_MAKE_TYPE(InTypeUInt32, OutTypeIPv4),
-
-        /*
-        Encoding assumes 2-byte length followed by binary data.
-        Formatting treats as IPv6 address.
-        Arrays of TypeIPv6 are not supported. (No error will be reported,
-        but decoding tools will probably not be able to decode them).
-        */
-        TypeIPv6 = _tld_MAKE_TYPE(InTypeBinary, OutTypeIPv6),
-
-        /*
-        Encoding assumes 2-byte length followed by binary data.
-        Formatting treats as SOCKADDR.
-        Arrays of TypeSocketAddress are not supported. (No error will be
-        reported, but decoding tools will probably not be able to decode them).
-        */
-        TypeSocketAddress = _tld_MAKE_TYPE(InTypeBinary, OutTypeSocketAddress),
-
-        /*
-        Encoding assumes nul-terminated CHAR16 string.
-        Formatting treats as UTF-16LE XML.
-        */
-        TypeUtf16Xml = _tld_MAKE_TYPE(InTypeUnicodeString, OutTypeXml),
-
-        /*
-        Encoding assumes nul-terminated CHAR8 string.
-        Formatting treats as UTF-8 XML.
-        */
-        TypeMbcsXml = _tld_MAKE_TYPE(InTypeAnsiString, OutTypeXml),
-
-        /*
-        Encoding assumes nul-terminated CHAR16 string.
-        Formatting treats as UTF-16LE JSON.
-        */
-        TypeUtf16Json = _tld_MAKE_TYPE(InTypeUnicodeString, OutTypeJson),
-
-        /*
-        Encoding assumes nul-terminated CHAR8 string.
-        Formatting treats as UTF-8 JSON.
-        */
-        TypeMbcsJson = _tld_MAKE_TYPE(InTypeAnsiString, OutTypeJson),
-
-        /*
-        Encoding assumes 2-byte bytecount followed by CHAR16 data.
-        Formatting treats as UTF-16LE XML.
-        */
-        TypeCountedUtf16Xml = _tld_MAKE_TYPE(InTypeCountedString, OutTypeXml),
-
-        /*
-        Encoding assumes 2-byte bytecount followed by CHAR8 data.
-        Formatting treats as UTF-8 XML.
-        */
-        TypeCountedMbcsXml = _tld_MAKE_TYPE(InTypeCountedAnsiString, OutTypeXml),
-
-        /*
-        Encoding assumes 2-byte bytecount followed by CHAR16 data.
-        Formatting treats as UTF-16LE JSON.
-        */
-        TypeCountedUtf16Json = _tld_MAKE_TYPE(InTypeCountedString, OutTypeJson),
-
-        /*
-        Encoding assumes 2-byte bytecount followed by CHAR8 data.
-        Formatting treats as UTF-8 JSON.
-        */
-        TypeCountedMbcsJson = _tld_MAKE_TYPE(InTypeCountedAnsiString, OutTypeJson),
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as Win32 error(s).
-        */
-        TypeWin32Error = _tld_MAKE_TYPE(InTypeUInt32, OutTypeWin32Error),
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as NTSTATUS(s).
-        */
-        TypeNTStatus = _tld_MAKE_TYPE(InTypeUInt32, OutTypeNTStatus),
-
-        /*
-        Encoding assumes 4-byte value.
-        Formatting treats as HRESULT(s).
-        */
-        TypeHResult = _tld_MAKE_TYPE(InTypeInt32, OutTypeHResult)
-    };
-
-    enum ProviderTraitType : UINT8
-    {
-        ProviderTraitNone = 0, // Invalid value
-        ProviderTraitGroupGuid = 1 // Data is the group GUID.
-    };
-
-#pragma endregion
-
-#pragma region EventDescriptor
-
-    /*
-    Simple wrapper around the ETW EVENT_DESCRIPTOR structure.
-    Provides a constructor to make initialization easier.
-    Can be used anywhere an EVENT_DESCRIPTOR is required.
-
-    Notes:
-    - Channel defaults to 11 (WINEVENT_CHANNEL_TRACELOGGING). Other channels
-      will only work if the provider is running on a TraceLogging-enabled OS
-      (Windows 10 or later, or Windows 7 sp1 with updates, or Windows 8.1 with
-      updates). If the provider is running on an earlier version of Windows and
-      you use a channel other than 11, the events will not decode correctly.
-    - If you are not assigning unique Ids for your events, set both Id and
-      Version to 0.
-    */
-    struct EventDescriptor
-        : EVENT_DESCRIPTOR
-    {
-        explicit EventDescriptor(
-            UCHAR level = 5, // 5 = WINEVENT_LEVEL_VERBOSE
-            ULONGLONG keyword = 0, // 0 = no keywords
-            UCHAR opcode = 0, // 0 = WINEVENT_OPCODE_INFO
-            USHORT task = 0) // 0 = WINEVENT_TASK_NONE
-        {
-            Reset(level, keyword, opcode, task);
-        }
-
-        void Reset(
-            UCHAR level = 5, // 5 = WINEVENT_LEVEL_VERBOSE
-            ULONGLONG keyword = 0, // 0 = no keywords
-            UCHAR opcode = 0, // 0 = WINEVENT_OPCODE_INFO
-            USHORT task = 0) // 0 = WINEVENT_TASK_NONE
-        {
-            Id = 0;
-            Version = 0;
-            Channel = 11; // WINEVENT_CHANNEL_TRACELOGGING
-            Level = level;
-            Opcode = opcode;
-            Task = task;
-            Keyword = keyword;
-        }
-    };
-
-#pragma endregion
-
-#pragma region Support functions
-
-#pragma warning(push)
-#pragma warning(disable: 26018) // PREfast: Potential read overflow. (Analysis is incorrect.)
-
-    template<class ByteBufferTy>
-    void PushBackAsUtf8(
-        ByteBufferTy& buffer,
-        _In_z_ wchar_t const* szUtf16)
-    {
-        for (unsigned i = 0;; i++)
-        {
-            unsigned ch = szUtf16[i];
-            if (ch < 0x80)
-            {
-                buffer.push_back(static_cast<UINT8>(ch));
-                if (ch == 0)
-                {
-                    break;
-                }
-            }
-            else if (ch < 0x800)
-            {
-                buffer.push_back(static_cast<UINT8>(((ch >> 6)) | 0xc0));
-                buffer.push_back(static_cast<UINT8>(((ch)& 0x3f) | 0x80));
-            }
-            else if (
-                0xd800 <= ch && ch < 0xdc00 &&
-                0xdc00 <= szUtf16[i + 1] && szUtf16[i + 1] < 0xe000)
-            {
-                // Decode surrogate pair.
-                ++i;
-                ch = 0x010000 + (((ch - 0xd800) << 10) | (szUtf16[i] - 0xdc00));
-                buffer.push_back(static_cast<UINT8>(((ch >> 18)) | 0xf0));
-                buffer.push_back(static_cast<UINT8>(((ch >> 12) & 0x3f) | 0x80));
-                buffer.push_back(static_cast<UINT8>(((ch >> 6) & 0x3f) | 0x80));
-                buffer.push_back(static_cast<UINT8>(((ch)& 0x3f) | 0x80));
-            }
-            else
-            {
-                buffer.push_back(static_cast<UINT8>(((ch >> 12)) | 0xe0));
-                buffer.push_back(static_cast<UINT8>(((ch >> 6) & 0x3f) | 0x80));
-                buffer.push_back(static_cast<UINT8>(((ch)& 0x3f) | 0x80));
-            }
-        }
-    }
-
-#pragma warning(pop)
-
-    inline ::tld::Type MakeType(
-        ::tld::InType inType,
-        ::tld::OutType outType)
-    {
-        return _tld_MAKE_TYPE(inType & InTypeMask, outType & OutTypeMask);
-    }
-
-    _Use_decl_annotations_
-    inline GUID GetGuidForName(
-        wchar_t const* szUtf16Name)
-    {
-        return ::tld::detail::GetGuidForNameImpl(szUtf16Name);
-    }
-
-    _Use_decl_annotations_
-    inline GUID GetGuidForName(
-        char const* szUtf8Name)
-    {
-        return ::tld::detail::GetGuidForNameImpl(szUtf8Name);
-    }
-
-    inline HRESULT RegisterProvider(
-        _Out_ REGHANDLE* phProvider,
-        _In_ GUID const* pProviderId,
-        _In_count_x_((UINT16*)pProviderMetadata) UINT8 const* pProviderMetadata,
-        _In_opt_ PENABLECALLBACK pEnableCallback,
-        _In_opt_ void* pEnableCallbackContext)
-    {
-        HRESULT hr;
-        REGHANDLE hProvider = 0;
-        ULONG status = ::EventRegister(
-            pProviderId,
-            pEnableCallback,
-            pEnableCallbackContext,
-            &hProvider);
-        if (status == 0)
-        {
-            auto cbMetadata = *reinterpret_cast<UINT16 const*>(pProviderMetadata);
-            status = tld::SetInformation(
-                hProvider,
-                static_cast<EVENT_INFO_CLASS>(2), // EventProviderSetTraits
-                const_cast<UINT8*>(pProviderMetadata),
-                cbMetadata);
-            hr = S_OK; // Ignore any failures from SetInformation.
-        }
-        else
-        {
-            hr = HRESULT_FROM_WIN32(status);
-        }
-
-        *phProvider = hProvider;
-        return hr;
-    }
-
-    inline HRESULT UnregisterProvider(
-        REGHANDLE hProvider)
-    {
-        ULONG status = ::EventUnregister(hProvider);
-        return HRESULT_FROM_WIN32(status);
-    }
-
-    _Use_decl_annotations_
-    inline HRESULT SetInformation(
-        REGHANDLE hProvider,
-        EVENT_INFO_CLASS informationClass,
-        void* pvInformation,
-        ULONG cbInformation)
-    {
-        ULONG status;
-
-#if TLD_HAVE_EVENT_SET_INFORMATION == 1
-
-#pragma warning(suppress: 6387) // It's ok for pvInformation to be null if cbInformation is 0.
-        status = ::EventSetInformation(
-            hProvider,
-            informationClass,
-            pvInformation,
-            cbInformation);
-
-#elif TLD_HAVE_EVENT_SET_INFORMATION == 2
-
-        HMODULE hEventing;
-        status = ERROR_NOT_SUPPORTED;
-        if (GetModuleHandleExW(0, L"api-ms-win-eventing-provider-l1-1-0", &hEventing) ||
-            GetModuleHandleExW(0, L"advapi32.dll", &hEventing))
-        {
-            typedef ULONG(WINAPI* PFEventSetInformation)(
-                _In_ REGHANDLE RegHandle,
-                _In_ EVENT_INFO_CLASS InformationClass,
-                _In_reads_bytes_opt_(InformationLength) PVOID EventInformation,
-                _In_ ULONG InformationLength);
-            PFEventSetInformation pfEventSetInformation =
-                (PFEventSetInformation)GetProcAddress(hEventing, "EventSetInformation");
-            if (pfEventSetInformation)
-            {
-                status = pfEventSetInformation(
-                    hProvider,
-                    informationClass,
-                    pvInformation,
-                    cbInformation);
-            }
-
-            FreeLibrary(hEventing);
-        }
-
-#else // TLD_HAVE_EVENT_SET_INFORMATION == 0
-
-        (void)hProvider;
-        (void)informationClass;
-        (void)pvInformation;
-        (void)cbInformation;
-
-        status = ERROR_NOT_SUPPORTED;
-
-#endif // TLD_HAVE_EVENT_SET_INFORMATION
-
-        return HRESULT_FROM_WIN32(status);
-    }
-
-    _Use_decl_annotations_
-    inline HRESULT WriteEvent(
-        REGHANDLE hProvider,
-        EVENT_DESCRIPTOR const& eventDescriptor,
-        UINT8 const* pProviderMetadata,
-        UINT8 const* pEventMetadata,
-        ULONG cDataDescriptors,
-        EVENT_DATA_DESCRIPTOR* pDataDescriptors,
-        LPCGUID pActivityId,
-        LPCGUID pRelatedActivityId)
-    {
-        _tld_ASSERT(3 <= *(UINT16*)pProviderMetadata, "Invalid provider metadata.");
-        _tld_ASSERT(4 <= *(UINT16*)pEventMetadata, "Invalid event metadata.");
-        pDataDescriptors[0].Ptr = (ULONG_PTR)pProviderMetadata;
-        pDataDescriptors[0].Size = *(UINT16*)pProviderMetadata;
-        pDataDescriptors[0].Reserved = 2; // Descriptor contains provider metadata.
-        pDataDescriptors[1].Ptr = (ULONG_PTR)pEventMetadata;
-        pDataDescriptors[1].Size = *(UINT16*)pEventMetadata;
-        pDataDescriptors[1].Reserved = 1; // Descriptor contains event metadata.
-        ULONG status = ::EventWriteTransfer(
-            hProvider,
-            &eventDescriptor,
-            pActivityId,
-            pRelatedActivityId,
-            cDataDescriptors,
-            pDataDescriptors);
-        return HRESULT_FROM_WIN32(status);
-    }
-
-#if TLD_HAVE_EVENT_WRITE_EX == 1
-
-    _Use_decl_annotations_
-    inline HRESULT WriteEventEx(
-        REGHANDLE hProvider,
-        EVENT_DESCRIPTOR const& eventDescriptor,
-        UINT8 const* pProviderMetadata,
-        UINT8 const* pEventMetadata,
-        ULONG cDataDescriptors,
-        EVENT_DATA_DESCRIPTOR* pDataDescriptors,
-        ULONG64 filter,
-        ULONG flags,
-        GUID const* pActivityId,
-        GUID const* pRelatedActivityId)
-    {
-        _tld_ASSERT(3 <= *(UINT16*)pProviderMetadata, "Invalid provider metadata.");
-        _tld_ASSERT(4 <= *(UINT16*)pEventMetadata, "Invalid event metadata.");
-        pDataDescriptors[0].Ptr = (ULONG_PTR)pProviderMetadata;
-        pDataDescriptors[0].Size = *(UINT16*)pProviderMetadata;
-        pDataDescriptors[0].Reserved = 2; // Descriptor contains provider metadata.
-        pDataDescriptors[1].Ptr = (ULONG_PTR)pEventMetadata;
-        pDataDescriptors[1].Size = *(UINT16*)pEventMetadata;
-        pDataDescriptors[1].Reserved = 1; // Descriptor contains event metadata.
-        ULONG status = ::EventWriteEx(
-            hProvider,
-            &eventDescriptor,
-            filter,
-            flags,
-            pActivityId,
-            pRelatedActivityId,
-            cDataDescriptors,
-            pDataDescriptors);
-        return HRESULT_FROM_WIN32(status);
-    }
-
-#endif // TLD_HAVE_EVENT_WRITE_EX
-
-#pragma endregion
-
-#pragma region ByteArrayWrapper
-
-    class ByteArrayWrapper
-    {
-        UINT8* m_pb;
-        UINT32 m_cbMax;
-        UINT32 m_cbCur;
-
-    public:
-
-        ByteArrayWrapper()
-        {
-            reset();
-        }
-
-        ByteArrayWrapper(
-            _Out_writes_(cbMax) UINT8* pb,
-            UINT32 cbMax)
-        {
-            reset(pb, cbMax);
-        }
-
-        void reset()
-        {
-            m_pb = 0;
-            m_cbMax = 0;
-            m_cbCur = 0;
-        }
-
-        void reset(
-            _Inout_updates_bytes_(cbMax) UINT8* pb,
-            UINT32 cbMax)
-        {
-            m_pb = pb;
-            m_cbMax = cbMax;
-            m_cbCur = 0;
-        }
-
-        void clear()
-        {
-            m_cbCur = 0;
-        }
-
-        UINT32 size() const
-        {
-            return m_cbCur;
-        }
-
-        BYTE const& front() const
-        {
-            return *m_pb;
-        }
-
-        BYTE const* data() const
-        {
-            return m_pb;
-        }
-
-        UINT32 capacity() const
-        {
-            return m_cbMax;
-        }
-
-        void push_back(UINT8 val)
-        {
-            if (m_cbCur < m_cbMax)
-            {
-                m_pb[m_cbCur] = val;
-            }
-
-            m_cbCur += 1;
-        }
-
-        UINT8& operator[](UINT32 index)
-        {
-            static UINT8 dummy;
-            return index < m_cbMax
-                ? m_pb[index]
-                : dummy;
-        }
-    };
-
-#pragma endregion
-
-#pragma region ProviderMetadataBuilder
-
-    template<class ByteBufferTy>
-    class ProviderMetadataBuilder
-        : public detail::MetadataBuilderBase<ByteBufferTy>
-    {
-        /*
-        ProviderMetadata =
-        Size    : UINT16; // Size counts the whole data structure, including the Size field.
-        Name    : Nul-terminated UTF-8.
-        Traits[]: ProviderTrait (parse until you have consumed Size bytes)
-
-        ProviderTrait =
-        TraitSize: UINT16;
-        TraitType: UINT8;
-        TraitData: UINT8[TraitSize - 3];
-        */
-
-    public:
-
-        explicit ProviderMetadataBuilder(ByteBufferTy& buffer)
-            : detail::MetadataBuilderBase<ByteBufferTy>(buffer)
-        {
-            return;
-        }
-
-        template<class CharTy>
-        void Begin(
-            _In_z_ CharTy const* szUtfProviderName)
-        {
-            this->BaseBegin();
-            this->AddString(szUtfProviderName);
-        }
-
-        void AddTrait(
-            ProviderTraitType type,
-            _In_reads_bytes_(cbData) void const* pData,
-            unsigned cbData)
-        {
-            this->AddU16(static_cast<UINT16>(cbData + 3));
-            this->AddU8(static_cast<UINT8>(type));
-            this->AddBytes(pData, cbData);
-        }
-
-        bool End()
-        {
-            return this->BaseEnd();
-        }
-    };
-
-#pragma endregion
-
-#pragma region EventMetadataBuilder
-
-    template<class ByteBufferTy>
-    class EventMetadataBuilder
-        : public detail::MetadataBuilderBase<ByteBufferTy>
-    {
-        /*
-        EventMetadata =
-        Size    : UINT16; // Size counts the whole data structure, including the Size field.
-        Tags[]  : UINT8 (read bytes until you encounter a byte with high bit unset);
-        Name    : Nul-terminated UTF-8;
-        Fields[]: FieldMetadata (parse until you get to end of EventMetadata);
-
-        FieldMetadata =
-        Name    : Nul-terminated UTF-8.
-        InMeta  : UINT8.
-        OutMeta : UINT8 (only present if InMeta & InMetaChain);
-        Tags[]  : UINT8 (only present if OutMeta & OutMetaChain, read bytes until you encounter a byte with high bit unset);
-        Ccount  : UINT16 (only present if InMeta & InMetaCountMask == InMetaCcount);
-        CbSchema: UINT16 (only present if InMeta & InMetaCountMask == InMetaCustom);
-        Schema  : UINT8[CbSchema]
-        */
-
-        static const UINT8 InMetaScalar = 0;
-        static const UINT8 InMetaCcount = 32;
-        static const UINT8 InMetaVcount = 64;
-        static const UINT8 InMetaCustom = 96;
-        static const UINT8 InMetaCountMask = 96;
-        static const UINT8 InMetaChain = 128;
-        static const UINT8 OutMetaChain = 128;
-
-        UINT32 const m_bookmark;
-
-        EventMetadataBuilder(
-            ByteBufferTy& buffer,
-            UINT32 bookmark)
-            : detail::MetadataBuilderBase<ByteBufferTy>(buffer)
-            , m_bookmark(bookmark)
-        {
-            return;
-        }
-
-        void AddTags(UINT32 tags)
-        {
-            _tld_ASSERT(0 == (tags & 0xf0000000), "Tags only supports 28-bit values.");
-            for (;;)
-            {
-                auto val = static_cast<UINT8>(tags >> 21);
-                if ((tags & 0x1fffff) == 0)
-                {
-                    this->AddU8(val & 0x7f);
-                    break;
-                }
-
-                this->AddU8(val | 0x80);
-                tags = tags << 7;
-            }
-        }
-
-        void AddFieldInfo(UINT8 arity, Type type, UINT32 tags)
-        {
-            _tld_ASSERT((type & (Type)InTypeMask) == (type & 0xff), "InType out of range");
-            _tld_ASSERT((type & _tld_MAKE_TYPE(0, OutTypeMask)) == (Type)(type & 0xffffff00), "OutType out of range");
-
-            UINT8 inMeta = arity | static_cast<UINT8>(type);
-            UINT8 outMeta = static_cast<UINT8>(type >> 8);
-            if (tags != 0)
-            {
-                this->AddU8(static_cast<UINT8>(inMeta | InMetaChain));
-                this->AddU8(static_cast<UINT8>(outMeta | OutMetaChain));
-                AddTags(tags);
-            }
-            else if (outMeta != 0)
-            {
-                this->AddU8(static_cast<UINT8>(inMeta | InMetaChain));
-                this->AddU8(static_cast<UINT8>(outMeta));
-            }
-            else
-            {
-                this->AddU8(inMeta);
-            }
-
-            if (m_bookmark != 0)
-            {
-                this->IncrementU7(m_bookmark);
-            }
-        }
-
-        UINT32 AddStructInfo(UINT8 arity, UINT32 tags)
-        {
-            UINT8 inMeta = arity | InTypeStruct;
-            this->AddU8(static_cast<UINT8>(inMeta | InMetaChain));
-            UINT32 bookmark = this->GetBookmark();
-            if (tags == 0)
-            {
-                this->AddU8(0);
-            }
-            else
-            {
-                this->AddU8(OutMetaChain);
-                AddTags(tags);
-            }
-
-            if (m_bookmark != 0)
-            {
-                this->IncrementU7(m_bookmark);
-            }
-
-            return bookmark;
-        }
-
-    public:
-
-        explicit EventMetadataBuilder(
-            ByteBufferTy& buffer)
-            : detail::MetadataBuilderBase<ByteBufferTy>(buffer)
-            , m_bookmark(0)
-        {
-            return;
-        }
-
-        EventMetadataBuilder(EventMetadataBuilder& other)
-            : detail::MetadataBuilderBase<ByteBufferTy>(other.GetBuffer())
-            , m_bookmark(other.m_bookmark)
-        {
-            return;
-        }
-
-        EventMetadataBuilder(EventMetadataBuilder&& other)
-            : detail::MetadataBuilderBase<ByteBufferTy>(other.GetBuffer())
-            , m_bookmark(other.m_bookmark)
-        {
-            return;
-        }
-
-        template<class CharTy>
-        void Begin(
-            _In_z_ CharTy const* szUtfEventName,
-            UINT32 eventTags = 0)
-        {
-            _tld_ASSERT(m_bookmark == 0, "Must not call Begin on a struct builder");
-            this->BaseBegin();
-            AddTags(eventTags);
-            this->AddString(szUtfEventName);
-        }
-
-        bool End()
-        {
-            _tld_ASSERT(m_bookmark == 0, "Must not call End on a struct builder");
-            return this->BaseEnd();
-        }
-
-        // Note: Do not create structs with 0 fields.
-        template<class CharTy>
-        EventMetadataBuilder AddStruct(
-            _In_z_ CharTy const* szUtfStructName,
-            UINT32 fieldTags = 0)
-        {
-            this->AddString(szUtfStructName);
-            auto bookmark = AddStructInfo(InMetaScalar, fieldTags);
-            return EventMetadataBuilder(this->GetBuffer(), bookmark);
-        }
-
-        // Note: Do not create structs with 0 fields.
-        template<class CharTy>
-        UINT32 AddStructRaw(
-            _In_z_ CharTy const* szUtfStructName,
-            UINT32 fieldTags = 0)
-        {
-            this->AddString(szUtfStructName);
-            auto bookmark = AddStructInfo(InMetaScalar, fieldTags);
-            return bookmark;
-        }
-
-        // Note: Do not create structs with 0 fields.
-        template<class CharTy>
-        EventMetadataBuilder AddStructArray(
-            _In_z_ CharTy const* szUtfStructName,
-            UINT32 fieldTags = 0)
-        {
-            this->AddString(szUtfStructName);
-            auto bookmark = AddStructInfo(InMetaVcount, fieldTags);
-            return EventMetadataBuilder(this->GetBuffer(), bookmark);
-        }
-
-        // Note: Do not use 0 for itemCount.
-        // Note: Do not create structs with 0 fields.
-        template<class CharTy>
-        EventMetadataBuilder AddStructFixedArray(
-            _In_z_ CharTy const* szUtfStructName,
-            UINT16 itemCount,
-            UINT32 fieldTags = 0)
-        {
-            this->AddString(szUtfStructName);
-            auto bookmark = AddStructInfo(InMetaCcount, fieldTags);
-            this->AddU16(itemCount);
-            return EventMetadataBuilder(this->GetBuffer(), bookmark);
-        }
-
-        template<class CharTy>
-        void AddField(
-            _In_z_ CharTy const* szUtfFieldName,
-            Type type,
-            UINT32 fieldTags = 0)
-        {
-            this->AddString(szUtfFieldName);
-            AddFieldInfo(InMetaScalar, type, fieldTags);
-        }
-
-        template<class CharTy>
-        void AddFieldArray(
-            _In_z_ CharTy const* szUtfFieldName,
-            Type type,
-            UINT32 fieldTags = 0)
-        {
-            this->AddString(szUtfFieldName);
-            AddFieldInfo(InMetaVcount, type, fieldTags);
-        }
-
-        // Note: Do not use 0 for itemCount.
-        template<class CharTy>
-        void AddFieldFixedArray(
-            _In_z_ CharTy const* szUtfFieldName,
-            UINT16 itemCount,
-            Type type,
-            UINT32 fieldTags = 0)
-        {
-            this->AddString(szUtfFieldName);
-            AddFieldInfo(InMetaCcount, type, fieldTags);
-            this->AddU16(itemCount);
-        }
-
-        template<class CharTy>
-        void AddFieldCustom(
-            _In_z_ CharTy const* szUtfFieldName,
-            _In_reads_bytes_(cbSchema) void const* pSchema,
-            UINT16 cbSchema,
-            Type type,
-            UINT32 fieldTags = 0)
-        {
-            this->AddString(szUtfFieldName);
-            AddFieldInfo(InMetaCustom, type, fieldTags);
-            this->AddU16(cbSchema);
-            auto pbSchema = static_cast<UINT8 const*>(pSchema);
-            for (UINT32 i = 0; i != cbSchema; i++)
-            {
-                this->AddU8(pbSchema[i]);
-            }
-        }
-    };
-
-#pragma endregion
-
-#pragma region EventDataBuilder
-
-    template<class ByteBufferTy>
-    class EventDataBuilder
-    {
-        void operator=(EventDataBuilder const&); // = delete
-        ByteBufferTy& m_buffer;
-
-    public:
-
-        explicit EventDataBuilder(ByteBufferTy& buffer)
-            : m_buffer(buffer)
-        {
-            return;
-        }
-
-        EventDataBuilder(EventDataBuilder& other)
-            : m_buffer(other.m_buffer)
-        {
-            return;
-        }
-
-        EventDataBuilder(EventDataBuilder&& other)
-            : m_buffer(other.m_buffer)
-        {
-            return;
-        }
-
-        ByteBufferTy& Buffer()
-        {
-            return m_buffer;
-        }
-
-        ByteBufferTy const& Buffer() const
-        {
-            return m_buffer;
-        }
-
-        void Clear()
-        {
-            m_buffer.clear();
-        }
-
-        UINT32 Size() const
-        {
-            return static_cast<UINT32>(m_buffer.size());
-        }
-
-        UINT8& operator[](UINT32 index)
-        {
-            return m_buffer[index];
-        }
-
-        void AddArrayCount(UINT16 cItems)
-        {
-            AddBytes(&cItems, sizeof(cItems));
-        }
-
-        /*
-        Adds a value to the payload.
-        Note: should only be used for blittable POD types with no padding.
-        */
-        template<class T>
-        void AddValue(T const& value)
-        {
-            AddBytes(&reinterpret_cast<const char&>(value), sizeof(T));
-        }
-
-        /*
-        Adds an array of values to the payload.
-        Note: should only be used for blittable POD types with no padding.
-        */
-        template<class T>
-        void AddValues(_In_reads_(cValues) T const* pValues, unsigned cValues)
-        {
-            AddBytes(pValues, sizeof(T) * cValues);
-        }
-
-        /*
-        Appends an InTypeBinary field to the payload.
-        Compatible with: TypeBinary, TypeIPv6, TypeSocketAddress.
-        */
-        void AddBinary(_In_reads_bytes_(cbData) void const* pbData, UINT16 cbData)
-        {
-            AddBytes(&cbData, sizeof(cbData));
-            AddBytes(pbData, cbData);
-        }
-
-        /*
-        Appends an InTypeCountedAnsiString field to the payload.
-        Compatible with: TypeCountedMbcsString, TypeCountedMbcsXml, TypeCountedMbcsJson.
-        */
-        void AddCountedString(_In_reads_(cch) char const* pch, UINT16 cch)
-        {
-            AddBinary(pch, cch * sizeof(*pch));
-        }
-
-        /*
-        Appends an InTypeCountedString field to the payload.
-        Compatible with: TypeCountedUtf16String, TypeCountedUtf16Xml, TypeCountedUtf16Json.
-        */
-        void AddCountedString(_In_reads_(cch) wchar_t const* pch, UINT16 cch)
-        {
-            AddBinary(pch, cch * sizeof(*pch));
-        }
-
-        /*
-        Appends an InTypeAnsiString field to the payload.
-        Compatible with: TypeMbcsString, TypeMbcsXml, TypeMbcsJson.
-        */
-        void AddString(_In_z_ char const* psz)
-        {
-            AddBytes(psz, static_cast<unsigned>(strlen(psz) + 1));
-        }
-
-        /*
-        Appends a InTypeUnicodeString field to the payload.
-        Compatible with: TypeUtf16String, TypeUtf16Xml, TypeUtf16Json
-        */
-        void AddString(_In_z_ wchar_t const* psz)
-        {
-            AddBytes(psz, static_cast<unsigned>(2 * (wcslen(psz) + 1)));
-        }
-
-        /*
-        Appends a raw byte to the payload. (Calls buffer.push_back)
-        */
-        void AddByte(UINT8 val)
-        {
-            m_buffer.push_back(val);
-        }
-
-        /*
-        Appends raw bytes to the payload. (Calls buffer.insert)
-        */
-        void AddBytes(_In_reads_bytes_(cbData) void const* pbData, unsigned cbData)
-        {
-            auto pb = static_cast<UINT8 const*>(pbData);
-            m_buffer.insert(m_buffer.end(), pb + 0, pb + cbData);
-        }
-    };
-
-#pragma endregion
-
-#pragma region Provider
-
-    class Provider
-    {
-        Provider(Provider const&); // = delete
-        void operator=(Provider const&); // = delete
-
-        UINT32 m_levelPlus1;
-        HRESULT m_hrInitialization;
-        ULONGLONG m_keywordsAny;
-        ULONGLONG m_keywordsAll;
-        REGHANDLE m_hProvider;
-        UINT8 const* m_pbMetadata;
-        PENABLECALLBACK m_pfCallback;
-        LPVOID m_pCallbackContext;
-        GUID m_id;
-
-        /*
-        Shortest possible valid provider metadata blob:
-        Size = 0x0003, Name = "", no options.
-        */
-        static _Ret_bytecount_(3) UINT8 const* NullMetadata()
-        {
-            return reinterpret_cast<UINT8 const*>("\03\0");
-        }
-
-        static VOID NTAPI EnableCallback(
-            _In_ LPCGUID pSourceId,
-            _In_ ULONG callbackType,
-            _In_ UCHAR level,
-            _In_ ULONGLONG keywordsAny,
-            _In_ ULONGLONG keywordsAll,
-            _In_opt_ PEVENT_FILTER_DESCRIPTOR pFilterData,
-            _Inout_opt_ PVOID pCallbackContext)
-        {
-            if (pCallbackContext)
-            {
-                Provider* pProvider = static_cast<Provider*>(pCallbackContext);
-                switch (callbackType)
-                {
-                case 0: // EVENT_CONTROL_CODE_DISABLE_PROVIDER
-                    pProvider->m_levelPlus1 = 0;
-                    break;
-                case 1: // EVENT_CONTROL_CODE_ENABLE_PROVIDER
-                    pProvider->m_levelPlus1 = level != 0 ? (UINT32)level + 1u : 256u;
-                    pProvider->m_keywordsAny = keywordsAny;
-                    pProvider->m_keywordsAll = keywordsAll;
-                    break;
-                }
-
-                if (pProvider->m_pfCallback)
-                {
-                    pProvider->m_pfCallback(
-                        pSourceId,
-                        callbackType,
-                        level,
-                        keywordsAny,
-                        keywordsAll,
-                        pFilterData,
-                        pProvider->m_pCallbackContext);
-                }
-            }
-        }
-
-        _Ret_opt_bytecount_(cbMetadata)
-        static UINT8* MetadataAlloc(
-            UINT32 cbMetadata)
-        {
-            return static_cast<UINT8*>(HeapAlloc(GetProcessHeap(), 0, cbMetadata));
-        }
-
-        static void MetadataFree(
-            _Post_invalid_ UINT8* pbMetadata)
-        {
-            if (pbMetadata)
-            {
-                HeapFree(GetProcessHeap(), 0, pbMetadata);
-            }
-        }
-
-        void InitFail(
-            HRESULT hr)
-        {
-            _tld_ASSERT(m_pbMetadata != NullMetadata(), "InitFail called with m_pbMetadata == NullMetadata()");
-            MetadataFree(const_cast<UINT8*>(m_pbMetadata));
-            m_hrInitialization = hr;
-            m_pbMetadata = NullMetadata();
-        }
-
-        template<class CharTy>
-        void Init(
-            _In_z_ CharTy const* szName,
-            _In_opt_ GUID const* pGroupId)
-        {
-            // Already initialized: m_pfCallback, m_pCallbackContext, m_id.
-            m_levelPlus1 = 0;
-            m_hrInitialization = 0;
-            m_keywordsAny = 0;
-            m_keywordsAll = 0;
-            m_hProvider = 0;
-            m_pbMetadata = 0;
-
-            ByteArrayWrapper wrapper(0, 0);
-            ProviderMetadataBuilder<ByteArrayWrapper> builder(wrapper);
-            builder.Begin(szName);
-            if (pGroupId)
-            {
-                builder.AddTrait(ProviderTraitGroupGuid, pGroupId, sizeof(GUID));
-            }
-            if (!builder.End())
-            {
-                InitFail(E_INVALIDARG); // Metadata > 64KB.
-                goto Done;
-            }
-
-            {
-                UINT32 const cbMetadata = wrapper.size();
-                UINT8* pbMetadata = MetadataAlloc(cbMetadata);
-                if (!pbMetadata)
-                {
-                    InitFail(E_OUTOFMEMORY);
-                    goto Done;
-                }
-
-                m_pbMetadata = pbMetadata;
-                wrapper.reset(pbMetadata, cbMetadata);
-                builder.Begin(szName);
-                if (pGroupId)
-                {
-                    builder.AddTrait(ProviderTraitGroupGuid, pGroupId, sizeof(GUID));
-                }
-                if (!builder.End() || cbMetadata < wrapper.size())
-                {
-                    InitFail(0x8000000CL); // E_CHANGED_STATE
-                    goto Done;
-                }
-
-                {
-                    HRESULT hr = ::tld::RegisterProvider(&m_hProvider, &m_id, m_pbMetadata, &EnableCallback, this);
-                    if (FAILED(hr))
-                    {
-                        InitFail(hr);
-                    }
-                }
-            }
-
-        Done:
-
-            return;
-        }
-
-        bool IsEnabledForKeywords(ULONGLONG keywords) const
-        {
-            return keywords == 0 || (
-                (keywords & m_keywordsAny) != 0 &&
-                (keywords & m_keywordsAll) == m_keywordsAll);
-        }
-
-    public:
-
-        ~Provider()
-        {
-            EventUnregister(m_hProvider);
-            if (m_pbMetadata != NullMetadata())
-            {
-                MetadataFree(const_cast<UINT8*>(m_pbMetadata));
-            }
-        }
-
-        Provider(
-            _In_z_ wchar_t const* szUtf16Name,
-            GUID const& providerId,
-            _In_opt_ GUID const* pGroupId = 0,
-            PENABLECALLBACK pfCallback = 0,
-            LPVOID pCallbackContext = 0)
-            : m_pfCallback(pfCallback)
-            , m_pCallbackContext(pCallbackContext)
-            , m_id(providerId)
-        {
-            Init(szUtf16Name, pGroupId);
-        }
-
-        Provider(
-            _In_z_ char const* szUtf8Name,
-            GUID const& providerId,
-            _In_opt_ GUID const* pGroupId = 0,
-            PENABLECALLBACK pfCallback = 0,
-            LPVOID pCallbackContext = 0)
-            : m_pfCallback(pfCallback)
-            , m_pCallbackContext(pCallbackContext)
-            , m_id(providerId)
-        {
-            Init(szUtf8Name, pGroupId);
-        }
-
-        explicit Provider(
-            _In_z_ wchar_t const* szUtf16Name,
-            _In_opt_ GUID const* pGroupId = 0,
-            PENABLECALLBACK pfCallback = 0,
-            LPVOID pCallbackContext = 0)
-            : m_pfCallback(pfCallback)
-            , m_pCallbackContext(pCallbackContext)
-            , m_id(GetGuidForName(szUtf16Name))
-        {
-            Init(szUtf16Name, pGroupId);
-        }
-
-        explicit Provider(
-            _In_z_ char const* szUtf8Name,
-            _In_opt_ GUID const* pGroupId = 0,
-            PENABLECALLBACK pfCallback = 0,
-            LPVOID pCallbackContext = 0)
-            : m_pfCallback(pfCallback)
-            , m_pCallbackContext(pCallbackContext)
-            , m_id(GetGuidForName(szUtf8Name))
-        {
-            Init(szUtf8Name, pGroupId);
-        }
-
-        HRESULT InitializationResult() const
-        {
-            return m_hrInitialization;
-        }
-
-        _Ret_z_ char const* Name() const
-        {
-            return reinterpret_cast<char const*>(m_pbMetadata + 2);
-        }
-
-        GUID const& Id() const
-        {
-            return m_id;
-        }
-
-        _Ret_notnull_ UINT8 const* GetMetadata() const
-        {
-            return m_pbMetadata;
-        }
-
-        UINT16 GetMetadataSize() const
-        {
-            return *reinterpret_cast<UINT16 const*>(m_pbMetadata);
-        }
-
-        bool IsEnabled() const
-        {
-            return m_levelPlus1 != 0;
-        }
-
-        bool IsEnabled(UCHAR level) const
-        {
-            return level < m_levelPlus1;
-        }
-
-        bool IsEnabled(UCHAR level, ULONGLONG keywords) const
-        {
-            return level < m_levelPlus1 && IsEnabledForKeywords(keywords);
-        }
-
-        HRESULT SetInformation(
-            EVENT_INFO_CLASS informationClass,
-            _In_reads_bytes_opt_(cbInformation) void* pbInformation,
-            ULONG cbInformation
-            ) const
-        {
-            return ::tld::SetInformation(m_hProvider, informationClass, pbInformation, cbInformation);
-        }
-
-        HRESULT WriteGather(
-            EVENT_DESCRIPTOR const& eventDescriptor,
-            _In_count_x_((UINT16*)pEventMetadata) UINT8 const* pEventMetadata,
-            _In_range_(2, 128) ULONG cDataDescriptors,
-            _Inout_count_(cDataDescriptors) EVENT_DATA_DESCRIPTOR* pDataDescriptors,
-            _In_opt_ LPCGUID pActivityId = 0,
-            _In_opt_ LPCGUID pRelatedActivityId = 0
-            ) const
-        {
-            return ::tld::WriteEvent(
-                m_hProvider,
-                eventDescriptor,
-                m_pbMetadata,
-                pEventMetadata,
-                cDataDescriptors,
-                pDataDescriptors,
-                pActivityId,
-                pRelatedActivityId);
-        }
-
-        HRESULT Write(
-            EVENT_DESCRIPTOR const& eventDescriptor,
-            _In_count_x_((UINT16*)pEventMetadata) UINT8 const* pEventMetadata,
-            _In_reads_bytes_(cbData) LPCVOID pbData,
-            UINT32 cbData,
-            _In_opt_ LPCGUID pActivityId = 0,
-            _In_opt_ LPCGUID pRelatedActivityId = 0
-            ) const
-        {
-            EVENT_DATA_DESCRIPTOR dataDesc[3];
-            EventDataDescCreate(dataDesc + 2, pbData, cbData);
-            return ::tld::WriteEvent(
-                m_hProvider,
-                eventDescriptor,
-                m_pbMetadata,
-                pEventMetadata,
-                cbData ? 3 : 2,
-                dataDesc,
-                pActivityId,
-                pRelatedActivityId);
-        }
-
-#if TLD_HAVE_EVENT_WRITE_EX == 1
-
-        HRESULT WriteGatherEx(
-            EVENT_DESCRIPTOR const& eventDescriptor,
-            _In_count_x_((UINT16*)pEventMetadata) UINT8 const* pEventMetadata,
-            _In_range_(2, 128) ULONG cDataDescriptors,
-            _Inout_count_(cDataDescriptors) EVENT_DATA_DESCRIPTOR* pDataDescriptors,
-            ULONG64 filter,
-            ULONG flags,
-            _In_opt_ LPCGUID pActivityId = 0,
-            _In_opt_ LPCGUID pRelatedActivityId = 0
-            ) const
-        {
-            return ::tld::WriteEventEx(
-                m_hProvider,
-                eventDescriptor,
-                m_pbMetadata,
-                pEventMetadata,
-                cDataDescriptors,
-                pDataDescriptors,
-                filter,
-                flags,
-                pActivityId,
-                pRelatedActivityId);
-        }
-
-        HRESULT WriteEx(
-            EVENT_DESCRIPTOR const& eventDescriptor,
-            _In_count_x_((UINT16*)pEventMetadata) UINT8 const* pEventMetadata,
-            _In_reads_bytes_(cbData) LPCVOID pbData,
-            UINT32 cbData,
-            ULONG64 filter,
-            ULONG flags,
-            _In_opt_ LPCGUID pActivityId = 0,
-            _In_opt_ LPCGUID pRelatedActivityId = 0
-            ) const
-        {
-            EVENT_DATA_DESCRIPTOR dataDesc[3];
-            EventDataDescCreate(dataDesc + 2, pbData, cbData);
-            return ::tld::WriteEventEx(
-                m_hProvider,
-                eventDescriptor,
-                m_pbMetadata,
-                pEventMetadata,
-                cbData ? 3 : 2,
-                dataDesc,
-                filter,
-                flags,
-                pActivityId,
-                pRelatedActivityId);
-        }
-
-#endif // TLD_HAVE_EVENT_WRITE_EX
-    };
-
-#pragma endregion
-
-#pragma region EventBuilder
-
-    enum EventState
-    {
-        EventStateOpen,
-        EventStateClosed,
-        EventStateError
-    };
-
-    template<class ByteBufferTy>
-    class EventBuilder
-    {
-        void operator=(EventBuilder const&); // = delete
-
-        EventMetadataBuilder<ByteBufferTy> m_metaBuilder;
-        EventDataBuilder<ByteBufferTy> m_dataBuilder;
-        EventState& m_eventState;
-
-        EventBuilder(EventBuilder& other, EventMetadataBuilder<ByteBufferTy>&& metaBuilder)
-            : m_metaBuilder(metaBuilder)
-            , m_dataBuilder(other.m_dataBuilder)
-            , m_eventState(other.m_eventState)
-        {
-            return;
-        }
-
-    protected:
-
-        EventBuilder(
-            ByteBufferTy& metaBuffer,
-            ByteBufferTy& dataBuffer,
-            EventState& eventState)
-            : m_metaBuilder(metaBuffer)
-            , m_dataBuilder(dataBuffer)
-            , m_eventState(eventState)
-        {
-            return;
-        }
-
-    public:
-
-        EventBuilder(EventBuilder& other)
-            : m_metaBuilder(other.m_metaBuilder)
-            , m_dataBuilder(other.m_dataBuilder)
-            , m_eventState(other.m_eventState)
-        {
-            return;
-        }
-
-        EventBuilder(EventBuilder&& other)
-            : m_metaBuilder(other.m_metaBuilder)
-            , m_dataBuilder(other.m_dataBuilder)
-            , m_eventState(other.m_eventState)
-        {
-            return;
-        }
-
-        /*
-        Returns a const reference to the event metadata's underlying buffer.
-        */
-        ByteBufferTy const& MetaBuffer() const
-        {
-            return m_metaBuilder.GetBuffer();
-        }
-
-        /*
-        Returns a const reference to the event payload data's underlying buffer.
-        */
-        ByteBufferTy const& DataBuffer() const
-        {
-            return m_dataBuilder.Buffer();
-        }
-
-        /*
-        Adds a nested struct to the event's metadata.
-        Use the returned EventBuilder to add data and metadata for the fields
-        of the nested struct.
-        Note: do not call any Add methods on this builder object until you are
-        done calling Add methods on the nested builder object.
-        Note: Do not create structs with 0 fields.
-        */
-        template<class CharTy>
-        EventBuilder AddStruct(
-            _In_z_ CharTy const* szUtfStructName,
-            UINT32 fieldTags = 0)
-        {
-            _tld_ASSERT(m_eventState == EventStateOpen, "Metadata already prepared.");
-            return EventBuilder(*this, m_metaBuilder.AddStruct(szUtfStructName, fieldTags));
-        }
-
-        /*
-        Adds a nested array of struct to the event's metadata.
-        Use the returned EventBuilder to add data and metadata for the fields
-        of the nested struct.
-        Note: do not call any Add methods on this builder object until you are
-        done calling Add methods on the nested builder object.
-        Note: Do not create structs with 0 fields.
-        */
-        template<class CharTy>
-        EventBuilder AddStructArray(
-            _In_z_ CharTy const* szUtfStructName,
-            UINT32 fieldTags = 0)
-        {
-            _tld_ASSERT(m_eventState == EventStateOpen, "Metadata already prepared.");
-            return EventBuilder(*this, m_metaBuilder.AddStructArray(szUtfStructName, fieldTags));
-        }
-
-        /*
-        Adds a nested array of struct to the event's metadata.
-        Use the returned EventBuilder to add data and metadata for the fields
-        of the nested struct.
-        Note: do not call any Add methods on this builder object until you are
-        done calling Add methods on the nested builder object.
-        Note: Do not use 0 for itemCount.
-        Note: Do not create structs with 0 fields.
-        */
-        template<class CharTy>
-        EventBuilder AddStructFixedArray(
-            _In_z_ CharTy const* szUtfStructName,
-            UINT16 itemCount,
-            UINT32 fieldTags = 0)
-        {
-            _tld_ASSERT(m_eventState == EventStateOpen, "Metadata already prepared.");
-            return EventBuilder(*this, m_metaBuilder.AddStructFixedArray(szUtfStructName, itemCount, fieldTags));
-        }
-
-        /*
-        Adds a scalar field to the event's metadata.
-        */
-        template<class CharTy>
-        void AddField(
-            _In_z_ CharTy const* szUtfFieldName,
-            Type type,
-            UINT32 fieldTags = 0)
-        {
-            _tld_ASSERT(m_eventState == EventStateOpen, "Metadata already prepared.");
-            m_metaBuilder.AddField(szUtfFieldName, type, fieldTags);
-        }
-
-        /*
-        Adds a variable-length array field to the event's metadata.
-        The length (item count) must be added to the event's payload
-        immediately before the array item values.
-        */
-        template<class CharTy>
-        void AddFieldArray(
-            _In_z_ CharTy const* szUtfFieldName,
-            Type type,
-            UINT32 fieldTags = 0)
-        {
-            _tld_ASSERT(m_eventState == EventStateOpen, "Metadata already prepared.");
-            m_metaBuilder.AddFieldArray(szUtfFieldName, type, fieldTags);
-        }
-
-        /*
-        Adds a fixed-length array field to the event's metadata.
-        The length (item count) is encoded in the metadata, so it does not
-        need to be included in the event's payload.
-        Note: Do not use 0 for itemCount.
-        */
-        template<class CharTy>
-        void AddFieldFixedArray(
-            _In_z_ CharTy const* szUtfFieldName,
-            UINT16 itemCount,
-            Type type,
-            UINT32 fieldTags = 0)
-        {
-            _tld_ASSERT(m_eventState == EventStateOpen, "Metadata already prepared.");
-            m_metaBuilder.AddFieldFixedArray(szUtfFieldName, itemCount, type, fieldTags);
-        }
-
-        /*
-        Adds a custom-encoded field to the event's metadata.
-        Custom-encoded means that you are using some other serialization
-        system (e.g. Bond, Protocol Buffers) to produce the schema and data.
-        The payload is encoded as a UINT16 byte count followed by the data.
-        */
-        template<class CharTy>
-        void AddFieldCustom(
-            _In_z_ CharTy const* szUtfFieldName,
-            _In_reads_bytes_(cbSchema) void const* pSchema,
-            UINT16 cbSchema,
-            Type type,
-            UINT32 fieldTags = 0)
-        {
-            _tld_ASSERT(m_eventState == EventStateOpen, "Metadata already prepared.");
-            m_metaBuilder.AddFieldCustom(szUtfFieldName, pSchema, cbSchema, type, fieldTags);
-        }
-
-        /*
-        Advanced use: adds raw metadata bytes.
-        */
-        void AddRawMetadata(
-            _In_reads_bytes_(cbMetadata) void const* pMetadata,
-            UINT32 cbMetadata)
-        {
-            auto& buf = m_metaBuilder.GetBuffer();
-            auto pb = static_cast<BYTE const*>(pMetadata);
-            buf.insert(buf.end(), pb + 0u, pb + cbMetadata);
-        }
-
-        /*
-        Adds an array length (item count) to the payload. This is for
-        variable-length arrays only (not fixed-length), and must occur
-        immediately before the array item values are written to the payload.
-        */
-        void AddArrayCount(UINT16 cItems)
-        {
-            m_dataBuilder.AddArrayCount(cItems);
-        }
-
-        /*
-        Adds a value to the payload.
-        Note: should only be used for blittable POD types with no padding,
-        e.g. INT32, FILETIME, GUID, not for strings or structs.
-        */
-        template<class T>
-        void AddValue(T const& value)
-        {
-            m_dataBuilder.AddValue(value);
-        }
-
-        /*
-        Adds an array of values to the payload.
-        Note: should only be used for blittable POD types with no padding,
-        e.g. INT32, FILETIME, GUID, not for strings or structs.
-        */
-        template<class T>
-        void AddValues(_In_reads_(cValues) T const* pValues, unsigned cValues)
-        {
-            m_dataBuilder.AddValues(pValues, cValues);
-        }
-
-        /*
-        Appends an InTypeBinary field to the payload.
-        Compatible with: TypeBinary, TypeIPv6, TypeSocketAddress.
-        */
-        void AddBinary(_In_reads_bytes_(cbData) void const* pbData, UINT16 cbData)
-        {
-            m_dataBuilder.AddBinary(pbData, cbData);
-        }
-
-        /*
-        Appends an InTypeCountedAnsiString field to the payload.
-        Compatible with: TypeCountedMbcsString, TypeCountedMbcsXml, TypeCountedMbcsJson.
-        */
-        void AddCountedString(_In_reads_(cch) char const* pch, UINT16 cch)
-        {
-            m_dataBuilder.AddCountedString(pch, cch);
-        }
-
-        /*
-        Appends an InTypeCountedString field to the payload.
-        Compatible with: TypeCountedUtf16String, TypeCountedUtf16Xml, TypeCountedUtf16Json.
-        */
-        void AddCountedString(_In_reads_(cch) wchar_t const* pch, UINT16 cch)
-        {
-            m_dataBuilder.AddCountedString(pch, cch);
-        }
-
-        /*
-        Appends an InTypeAnsiString field to the payload.
-        Compatible with: TypeMbcsString, TypeMbcsXml, TypeMbcsJson.
-        */
-        void AddString(_In_z_ char const* psz)
-        {
-            m_dataBuilder.AddString(psz);
-        }
-
-        /*
-        Appends a InTypeUnicodeString field to the payload.
-        Compatible with: TypeUtf16String, TypeUtf16Xml, TypeUtf16Json
-        */
-        void AddString(_In_z_ wchar_t const* psz)
-        {
-            m_dataBuilder.AddString(psz);
-        }
-
-        /*
-        Appends a raw byte to the payload.
-        */
-        void AddByte(UINT8 val)
-        {
-            m_dataBuilder.AddByte(val);
-        }
-
-        /*
-        Appends raw bytes to the payload.
-        */
-        void AddBytes(_In_reads_bytes_(cbData) void const* pbData, unsigned cbData)
-        {
-            m_dataBuilder.AddBytes(pbData, cbData);
-        }
-    };
-
-#pragma endregion
-
-#pragma region Event
-
-    template<class ByteBufferTy>
-    class Event
-        : public EventBuilder<ByteBufferTy>
-    {
-        Event(Event const&); // = delete
-        void operator=(Event const&); // = delete
-
-        ByteBufferTy m_metaBuffer;
-        ByteBufferTy m_dataBuffer;
-        EventDescriptor m_descriptor;
-        GUID const* m_pActivityId;
-        GUID const* m_pRelatedActivityId;
-        EventState m_state;
-
-    public:
-
-        Event(
-            _In_z_ char const* szUtf8Name,
-            UCHAR level = 5,
-            ULONGLONG keywords = 0,
-            UINT32 tags = 0,
-            UCHAR opcode = 0,
-            USHORT task = 0,
-            GUID const* pActivityId = 0,
-            GUID const* pRelatedActivityId = 0)
-            : EventBuilder<ByteBufferTy>(m_metaBuffer, m_dataBuffer, m_state)
-            , m_descriptor(level, keywords, opcode, task)
-            , m_pActivityId(pActivityId)
-            , m_pRelatedActivityId(pRelatedActivityId)
-            , m_state(EventStateOpen)
-        {
-            EventMetadataBuilder<ByteBufferTy>(m_metaBuffer).Begin(szUtf8Name, tags);
-        }
-
-        Event(
-            _In_z_ wchar_t const* szUtf16Name,
-            UCHAR level = 5,
-            ULONGLONG keywords = 0,
-            UINT32 tags = 0,
-            UCHAR opcode = 0,
-            USHORT task = 0,
-            GUID const* pActivityId = 0,
-            GUID const* pRelatedActivityId = 0)
-            : EventBuilder<ByteBufferTy>(m_metaBuffer, m_dataBuffer, m_state)
-            , m_descriptor(level, keywords, opcode, task)
-            , m_pActivityId(pActivityId)
-            , m_pRelatedActivityId(pRelatedActivityId)
-            , m_state(EventStateOpen)
-        {
-            EventMetadataBuilder<ByteBufferTy>(m_metaBuffer).Begin(szUtf16Name, tags);
-        }
-
-        /*
-        Clears the metadata and the payload.
-        */
-        template<class CharTy>
-        void Reset(
-            _In_z_ CharTy const* szUtfName,
-            UCHAR level = 5,
-            ULONGLONG keywords = 0,
-            UINT32 tags = 0,
-            UCHAR opcode = 0,
-            USHORT task = 0,
-            GUID* pActivityId = 0,
-            GUID* pRelatedActivityId = 0)
-        {
-            m_metaBuffer.clear();
-            m_dataBuffer.clear();
-            m_descriptor.Reset(level, keywords, opcode, task);
-            m_pActivityId = pActivityId;
-            m_pRelatedActivityId = pRelatedActivityId;
-            m_state = EventStateOpen;
-            EventMetadataBuilder<ByteBufferTy>(m_metaBuffer).Begin(szUtfName, tags);
-        }
-
-        /*
-        Clears the payload without clearing the metadata.
-        */
-        void ResetData()
-        {
-            m_dataBuffer.clear();
-        }
-
-        /*
-        Sends the event to ETW using EventWriteTransfer.
-        */
-        HRESULT Write(Provider const& provider)
-        {
-            HRESULT hr = E_INVALIDARG;
-            if (PrepareEvent())
-            {
-                hr = provider.Write(
-                    m_descriptor,
-                    &m_metaBuffer.front(),
-                    m_dataBuffer.empty() ? NULL : &m_dataBuffer.front(),
-                    static_cast<UINT32>(m_dataBuffer.size()),
-                    m_pActivityId,
-                    m_pRelatedActivityId);
-            }
-            return hr;
-        }
-
-        /*
-        Sends the event to ETW using EventWriteTransfer.
-        */
-        HRESULT Write(
-            REGHANDLE hProvider,
-            _In_count_x_((UINT16*)pProviderMetadata) UINT8 const* pProviderMetadata)
-        {
-            HRESULT hr = E_INVALIDARG;
-
-            if (PrepareEvent())
-            {
-                EVENT_DATA_DESCRIPTOR dataDesc[3];
-                ULONG cDataDesc = 2;
-                if (!m_dataBuffer.empty())
-                {
-                    EventDataDescCreate(
-                        &dataDesc[cDataDesc++],
-                        &m_dataBuffer.front(),
-                        static_cast<ULONG>(m_dataBuffer.size()));
-                }
-
-                hr = ::tld::WriteEvent(
-                    hProvider,
-                    m_descriptor,
-                    pProviderMetadata,
-                    &m_metaBuffer.front(),
-                    cDataDesc,
-                    dataDesc,
-                    m_pActivityId,
-                    m_pRelatedActivityId);
-            }
-
-            return hr;
-        }
-
-#if TLD_HAVE_EVENT_WRITE_EX == 1
-
-        /*
-        Sends the event to ETW using EventWriteEx.
-        */
-        HRESULT WriteEx(
-            Provider const& provider,
-            ULONG64 filter,
-            ULONG flags)
-        {
-            HRESULT hr = E_INVALIDARG;
-            if (PrepareEvent())
-            {
-                hr = provider.WriteEx(
-                    m_descriptor,
-                    &m_metaBuffer.front(),
-                    m_dataBuffer.empty() ? NULL : &m_dataBuffer.front(),
-                    static_cast<UINT32>(m_dataBuffer.size()),
-                    filter,
-                    flags,
-                    m_pActivityId,
-                    m_pRelatedActivityId);
-            }
-            return hr;
-        }
-
-        /*
-        Sends the event to ETW using EventWriteEx.
-        */
-        HRESULT WriteEx(
-            REGHANDLE hProvider,
-            _In_count_x_((UINT16*)pEventMetadata) UINT8 const* pProviderMetadata,
-            ULONG64 filter,
-            ULONG flags)
-        {
-            HRESULT hr = E_INVALIDARG;
-
-            if (PrepareEvent())
-            {
-                EVENT_DATA_DESCRIPTOR dataDesc[3];
-                ULONG cDataDesc = 2;
-                if (!m_dataBuffer.empty())
-                {
-                    EventDataDescCreate(
-                        &dataDesc[cDataDesc++],
-                        &m_dataBuffer.front(),
-                        static_cast<ULONG>(m_dataBuffer.size()));
-                }
-
-                hr = ::tld::WriteEventEx(
-                    hProvider,
-                    m_descriptor,
-                    pProviderMetadata,
-                    &m_metaBuffer.front(),
-                    cDataDesc,
-                    dataDesc,
-                    filter,
-                    flags,
-                    m_pActivityId,
-                    m_pRelatedActivityId);
-            }
-
-            return hr;
-        }
-
-#endif // TLD_HAVE_EVENT_WRITE_EX
-
-#pragma region Basic properties
-
-        UCHAR Channel() const
-        {
-            return m_descriptor.Channel;
-        }
-
-        /*
-        Note: the default channel is 11 (WINEVENT_CHANNEL_TRACELOGGING). 
-        Other channels are only supported if the provider is running on
-        Windows 10 or later. If a provider is running on an earlier version
-        of Windows and it uses a channel other than 11, TDH will not be able
-        to decode the events.
-        */
-        void Channel(UCHAR channel)
-        {
-            m_descriptor.Channel = channel;
-        }
-
-        UCHAR Level() const
-        {
-            return m_descriptor.Level;
-        }
-
-        void Level(UCHAR value)
-        {
-            m_descriptor.Level = value;
-        }
-
-        ULONGLONG Keywords() const
-        {
-            return m_descriptor.Keyword;
-        }
-
-        void Keywords(ULONGLONG value)
-        {
-            m_descriptor.Keyword = value;
-        }
-
-        UCHAR Opcode() const
-        {
-            return m_descriptor.Opcode;
-        }
-
-        void Opcode(UCHAR value)
-        {
-            m_descriptor.Opcode = value;
-        }
-
-        USHORT Task() const
-        {
-            return m_descriptor.Task;
-        }
-
-        void Task(USHORT value)
-        {
-            m_descriptor.Task = value;
-        }
-
-        const GUID* ActivityId() const
-        {
-            return m_pActivityId;
-        }
-
-        void ActivityId(GUID* pValue)
-        {
-            m_pActivityId = pValue;
-        }
-
-        const GUID* RelatedActivityId() const
-        {
-            return m_pRelatedActivityId;
-        }
-
-        void RelatedActivityId(GUID* pValue)
-        {
-            m_pRelatedActivityId = pValue;
-        }
-
-        bool IsEnabledFor(Provider const& provider) const
-        {
-            return provider.IsEnabled(m_descriptor.Level, m_descriptor.Keyword);
-        }
-
-#pragma endregion
-
-    private:
-
-        bool PrepareEvent()
-        {
-            if (m_state == EventStateOpen)
-            {
-                PrepareEventImpl();
-            }
-            return m_state == EventStateClosed;
-        }
-
-        void PrepareEventImpl()
-        {
-            m_state =
-                EventMetadataBuilder<ByteBufferTy>(m_metaBuffer).End()
-                ? EventStateClosed
-                : EventStateError;
-        }
-    };
-
-#pragma endregion
-}
-// namespace tld
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h
deleted file mode 100644
index 29e411ce6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-#include <map>
-
-#if defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-#  include <set>
-#endif  // defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/span_id.h"
-
-#include "opentelemetry/exporters/etw/etw_provider.h"
-#include "opentelemetry/exporters/etw/etw_tail_sampler.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace etw
-{
-/**
- * @brief TelemetryProvider Options passed via SDK API.
- */
-
-#if defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-using TelemetryProviderOptions = std::map<std::string,
-                                          nostd::variant<std::string,
-                                                         uint64_t,
-                                                         float,
-                                                         bool,
-                                                         std::map<std::string, std::string>,
-                                                         std::set<std::string>>>;
-
-#else
-using TelemetryProviderOptions = std::map<
-    std::string,
-    nostd::variant<std::string, uint64_t, float, bool, std::map<std::string, std::string>>>;
-
-#endif  // defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-
-/**
- * @brief TelemetryProvider runtime configuration class. Internal representation
- * of TelemetryProviderOptions used by various components of SDK.
- */
-typedef struct
-{
-  bool enableTraceId;            // Set `TraceId` on ETW events
-  bool enableSpanId;             // Set `SpanId` on ETW events
-  bool enableActivityId;         // Assign `SpanId` to `ActivityId`
-  bool enableActivityTracking;   // Emit TraceLogging events for Span/Start and Span/Stop Not used
-                                 // for Logs
-  bool enableRelatedActivityId;  // Assign parent `SpanId` to `RelatedActivityId`
-  bool enableAutoParent;  // Start new spans as children of current active span, Not used for Logs
-  ETWProvider::EventFormat
-      encoding;  // Event encoding to use for this provider (TLD, MsgPack, XML, etc.).
-  bool enableTableNameMappings;  // Map instrumentation scope name to table name with
-                                 // `tableNameMappings`
-  std::map<std::string, std::string> tableNameMappings;
-
-#if defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-
-  std::set<std::string> timestampAttributes;  // Attributes to use as timestamp
-
-#endif  // defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-
-} TelemetryProviderConfiguration;
-
-/**
- * @brief Helper template to convert a variant value from TelemetryProviderOptions to
- * LoggerProviderConfiguration
- *
- * @param options           TelemetryProviderOptions passed on API surface
- * @param key               Option name
- * @param value             Reference to destination value
- * @param defaultValue      Default value if option is not supplied
- */
-template <typename T>
-static inline void GetOption(const TelemetryProviderOptions &options,
-                             const char *key,
-                             T &value,
-                             T defaultValue)
-{
-  auto it = options.find(key);
-  if (it != options.end())
-  {
-    auto val = it->second;
-    value    = nostd::get<T>(val);
-  }
-  else
-  {
-    value = defaultValue;
-  }
-}
-
-/**
- * @brief Helper template to convert encoding config option to EventFormat.
- * Configuration option passed as `options["encoding"] = "MsgPack"`.
- * Default encoding is TraceLogging Dynamic Manifest (TLD).
- *
- * Valid encoding names listed below.
- *
- * For MessagePack encoding:
- * - "MSGPACK"
- * - "MsgPack"
- * - "MessagePack"
- *
- * For XML encoding:
- * - "XML"
- * - "xml"
- *
- * For TraceLogging Dynamic encoding:
- * - "TLD"
- * - "tld"
- *
- */
-static inline ETWProvider::EventFormat GetEncoding(const TelemetryProviderOptions &options)
-{
-  ETWProvider::EventFormat evtFmt = ETWProvider::EventFormat::ETW_MANIFEST;
-
-  auto it = options.find("encoding");
-  if (it != options.end())
-  {
-    auto varValue   = it->second;
-    std::string val = nostd::get<std::string>(varValue);
-
-#pragma warning(push)
-#pragma warning(disable : 4307) /* Integral constant overflow - OK while computing hash */
-    auto h = utils::hashCode(val.c_str());
-    switch (h)
-    {
-      case CONST_HASHCODE(MSGPACK):
-        // nobrk
-      case CONST_HASHCODE(MsgPack):
-        // nobrk
-      case CONST_HASHCODE(MessagePack):
-        evtFmt = ETWProvider::EventFormat::ETW_MSGPACK;
-        break;
-
-      case CONST_HASHCODE(XML):
-        // nobrk
-      case CONST_HASHCODE(xml):
-        evtFmt = ETWProvider::EventFormat::ETW_XML;
-        break;
-
-      case CONST_HASHCODE(TLD):
-        // nobrk
-      case CONST_HASHCODE(tld):
-        // nobrk
-        evtFmt = ETWProvider::EventFormat::ETW_MANIFEST;
-        break;
-
-      default:
-        break;
-    }
-#pragma warning(pop)
-  }
-
-  return evtFmt;
-}
-
-/**
- * @brief Utility template to obtain etw::TracerProvider._config or etw::LoggerProvider._config
- *
- * @tparam T    etw::TracerProvider
- * @param t     etw::TracerProvider ref
- * @return      TelemetryProviderConfiguration ref
- */
-template <class T>
-TelemetryProviderConfiguration &GetConfiguration(T &t)
-{
-  return t.config_;
-}
-
-/**
- * @brief Utility function to obtain etw::TracerProvider.id_generator_
- */
-template <class T>
-sdk::trace::IdGenerator &GetIdGenerator(T &t)
-{
-  return *t.id_generator_;
-}
-
-/**
- * @brief Utility function to obtain etw::TracerProvider.sampler_
- */
-template <class T>
-sdk::trace::Sampler &GetSampler(T &t)
-{
-  return *t.sampler_;
-}
-
-/**
- * @brief Utility function to obtain etw::TracerProvider.tail_sampler_
- */
-template <class T>
-TailSampler &GetTailSampler(T &t)
-{
-  return *t.tail_sampler_;
-}
-
-/**
- * @brief Utility template to convert SpanId or TraceId to hex.
- * @param id - value of SpanId or TraceId
- * @return Hexadecimal representation of Id as string.
- */
-template <class T>
-static inline std::string ToLowerBase16(const T &id)
-{
-  char buf[2 * T::kSize] = {0};
-  id.ToLowerBase16(buf);
-  return std::string(buf, sizeof(buf));
-}
-
-/**
- * @brief Utility method to convert span_id (8 byte) to ActivityId GUID (16 bytes)
- * @param span OpenTelemetry Span Id object
- * @return GUID struct containing 8-bytes of SpanId + 8 NUL bytes.
- */
-static inline bool CopySpanIdToActivityId(const opentelemetry::trace::SpanId &span_id,
-                                          GUID &outGuid)
-{
-  memset(&outGuid, 0, sizeof(outGuid));
-  if (!span_id.IsValid())
-  {
-    return false;
-  }
-  auto spanId      = span_id.Id().data();
-  uint8_t *guidPtr = reinterpret_cast<uint8_t *>(&outGuid);
-  for (size_t i = 0; i < 8; i++)
-  {
-    guidPtr[i] = spanId[i];
-  }
-  return true;
-}
-
-}  // namespace etw
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_fields.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_fields.h
deleted file mode 100644
index ea4354426..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_fields.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* // Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma once
-
-#include <unordered_map>
-
-#include "opentelemetry/exporters/etw/utils.h"
-
-/* clang-format off */
-#ifdef CUSTOM_ETW_FIELDS_H
-/* Customers may redefine the default field names by including CUSTOM_ETW_FIELDS_H header */
-#  include CUSTOM_ETW_FIELDS_H
-#else
-
-/**
-
-  List of configurable Field Name constants:
-
-   Version                      - Schema version (optional for ETW exporter).
-   _name                        - Built-in ETW name at envelope level (dedicated ETW field).
-   _time                        - Built-in ETW time at envelope level (dedicated ETW field).
-   SpanId                       - OT SpanId
-   TraceId                      - OT TraceId
-   StartTime                    - OT Span start time
-   Kind                         - OT Span kind
-   Name                         - OT Span name in ETW 'Payload["Name"]'
-   ParentId                     - OT Span parentId
-   Links                        - OT Span links array
-
-  Other standard fields (reserved names) that may be appended by ETW channel:
-
-   Level                        - a 1-byte integer that enables filtering based on the severity or verbosity of events
-   ProviderGuid                 - ETW Provider Guid
-   ProviderName                 - ETW Provider Name
-   OpcodeName                   - Name of Opcode (e.g. Start, Stop)
-   KeywordName                  - Name of Keyword
-   TaskName                     - TaskName, could be handled as an alias to Payload['name']
-   ChannelName                  - ETW Channel Name
-   EventMessage                 - ETW Event Message string for unstructured events
-   ActivityId                   - ActivityId for EventSource parenting (current event)
-   RelatedActivityId            - RelatedActivityId for EventSource parenting (parent event)
-   Pid                          - Process Id
-   Tid                          - Thread Id
-
-  Example "Span" as shown in Visual Studio "Diagnostic Events" view. EventName="Span":
-
-    {
-      "Timestamp": "2021-04-01T00:33:25.5876605-07:00",
-      "ProviderName": "OpenTelemetry-ETW-TLD",
-      "Id": 20,
-      "Message": null,
-      "ProcessId": 10424,
-      "Level": "Always",
-      "Keywords": "0x0000000000000000",
-      "EventName": "Span",
-      "ActivityID": "56f2366b-5475-496f-0000-000000000000",
-      "RelatedActivityID": null,
-      "Payload": {
-        "Duration": 0,
-        "Name": "B.max",
-        "ParentId": "8ad900d0587fad4a",
-        "SpanId": "6b36f25675546f49",
-        "StartTime": "2021-04-01T07:33:25.587Z",
-        "TraceId": "8f8ac710c37c5a419f0fe574f335e986"
-      }
-    }
-
-  Example named Event on Span. Note that EventName="MyEvent2" in this case:
-
-    {
-      "Timestamp": "2021-04-01T00:33:22.5848789-07:00",
-      "ProviderName": "OpenTelemetry-ETW-TLD",
-      "Id": 15,
-      "Message": null,
-      "ProcessId": 10424,
-      "Level": "Always",
-      "Keywords": "0x0000000000000000",
-      "EventName": "MyEvent2",
-      "ActivityID": null,
-      "RelatedActivityID": null,
-      "Payload": {
-        "SpanId": "0da9f6bf7524a449",
-        "TraceId": "7715c9d490f54f44a5d0c6b62570f1b2",
-        "strKey": "anotherValue",
-        "uint32Key": 9876,
-        "uint64Key": 987654321
-      }
-    }
-
- */
-#  define ETW_FIELD_VERSION         "Version"               /* Event version           */
-#  define ETW_FIELD_TYPE            "Type"              	/* Event type              */
-#  define ETW_FIELD_NAME            "_name"              	/* Event name              */
-#  define ETW_FIELD_TIME            "_time"              	/* Event time              */
-#  define ETW_FIELD_OPCODE          "OpCode"            	/* OpCode for TraceLogging */
-
-#  define ETW_FIELD_TRACE_ID        "TraceId"        		/* Trace Id                */
-#  define ETW_FIELD_SPAN_ID         "SpanId"         		/* Span Id                 */
-#  define ETW_FIELD_SPAN_PARENTID   "ParentId"              /* Span ParentId           */
-#  define ETW_FIELD_SPAN_KIND       "Kind"                  /* Span Kind               */
-#  define ETW_FIELD_SPAN_LINKS      "Links"                 /* Span Links array        */
-
-#  define ETW_FIELD_SPAN_LINKS_TO_SPAN_ID  "toSpanId"         /* Span Links toSpanId     */
-#  define ETW_FIELD_SPAN_LINKS_TO_TRACE_ID "toTraceId"        /* Span Links toTraceId    */
-
-#  define ETW_FIELD_PAYLOAD_NAME    "Name"                  /* ETW Payload["Name"]     */
-
-/* Span option constants */
-#  define ETW_FIELD_STARTTIME       "StartTime"             /* Operation start time    */
-#  define ETW_FIELD_DURATION        "Duration"              /* Operation duration      */
-#  define ETW_FIELD_STATUSCODE      "StatusCode"            /* Span status code        */
-#  define ETW_FIELD_STATUSMESSAGE   "StatusMessage"         /* Span status message     */
-#  define ETW_FIELD_SUCCESS         "Success"               /* Span success            */
-#  define ETW_FIELD_TIMESTAMP       "Timestamp"             /* Log timestamp   */
-
-/* Value constants */
-#  define ETW_VALUE_SPAN            "Span"                  /* ETW event name for Span */
-#  define ETW_VALUE_LOG             "Log"                   /* ETW event name for Log */
-
-#  define ETW_VALUE_SPAN_START      "SpanStart"             /* ETW for Span Start      */
-#  define ETW_VALUE_SPAN_END        "SpanEnd"               /* ETW for Span Start      */
-
-
-# define ETW_FIELD_ENV_PROPERTIES   "env_properties"        /* ETW event_properties with JSON string */
-
-/* Log specific */
-# define ETW_FIELD_LOG_BODY               "body"                 /* Log body   */
-# define ETW_FIELD_LOG_SEVERITY_TEXT      "severityText"         /* Sev text  */
-# define ETW_FIELD_LOG_SEVERITY_NUM       "severityNumber"       /* Sev num   */
-
-#endif
-
-/* clang-format on */
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h
deleted file mode 100644
index d0aff9324..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_logger.h
+++ /dev/null
@@ -1,432 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-
-#include <chrono>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <sstream>
-#include <type_traits>
-
-#include <fstream>
-
-#include <map>
-#include <unordered_map>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-
-#include "opentelemetry/exporters/etw/etw_config.h"
-#include "opentelemetry/exporters/etw/etw_fields.h"
-#include "opentelemetry/exporters/etw/etw_properties.h"
-#include "opentelemetry/exporters/etw/etw_provider.h"
-#include "opentelemetry/exporters/etw/utils.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace etw
-{
-
-class LoggerProvider;
-
-class LogRecord : public opentelemetry::logs::LogRecord
-{
-public:
-  ~LogRecord() override = default;
-
-  void SetTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override
-  {
-    timestamp_ = timestamp;
-  }
-
-  opentelemetry::common::SystemTimestamp GetTimestamp() const noexcept { return timestamp_; }
-
-  void SetObservedTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override
-  {
-    observed_timestamp_ = timestamp;
-  }
-
-  opentelemetry::common::SystemTimestamp GetObservedTimestamp() const noexcept
-  {
-    return observed_timestamp_;
-  }
-
-  void SetSeverity(opentelemetry::logs::Severity severity) noexcept override
-  {
-    severity_ = severity;
-  }
-
-  opentelemetry::logs::Severity GetSeverity() const noexcept { return severity_; }
-
-  void SetBody(const opentelemetry::common::AttributeValue &message) noexcept override
-  {
-    body_ = message;
-  }
-
-  const opentelemetry::common::AttributeValue &GetBody() const noexcept { return body_; }
-
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override
-  {
-    attributes_map_[static_cast<std::string>(key)] = value;
-  }
-
-  void SetEventId(int64_t /* id */, nostd::string_view /* name */) noexcept override {}
-
-  const std::unordered_map<std::string, opentelemetry::common::AttributeValue> &GetAttributes()
-      const noexcept
-  {
-    return attributes_map_;
-  }
-
-  void SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept override
-  {
-    trace_id_ = trace_id;
-  }
-
-  const opentelemetry::trace::TraceId &GetTraceId() const noexcept { return trace_id_; }
-
-  void SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept override
-  {
-    span_id_ = span_id;
-  }
-
-  const opentelemetry::trace::SpanId &GetSpanId() const noexcept { return span_id_; }
-
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept override
-  {
-    trace_flags_ = trace_flags;
-  }
-
-  const opentelemetry::trace::TraceFlags &GetTraceFlags() const noexcept { return trace_flags_; }
-
-private:
-  opentelemetry::logs::Severity severity_ = opentelemetry::logs::Severity::kInvalid;
-
-  std::unordered_map<std::string, opentelemetry::common::AttributeValue> attributes_map_;
-  opentelemetry::common::AttributeValue body_ = opentelemetry::nostd::string_view();
-  opentelemetry::common::SystemTimestamp timestamp_;
-  opentelemetry::common::SystemTimestamp observed_timestamp_ = std::chrono::system_clock::now();
-
-  opentelemetry::trace::TraceId trace_id_;
-  opentelemetry::trace::SpanId span_id_;
-  opentelemetry::trace::TraceFlags trace_flags_;
-};
-
-/**
- * @brief Logger  class that allows to send logs to ETW Provider.
- */
-class Logger : public opentelemetry::logs::Logger
-{
-
-  /**
-   * @brief Parent provider of this Tracer
-   */
-  etw::LoggerProvider &loggerProvider_;
-
-  /**
-   * @brief ProviderId (Name or GUID)
-   */
-  std::string provId;
-
-  std::string eventName_;
-
-  /**
-   * @brief Encoding (Manifest, MessagePack or XML)
-   */
-  ETWProvider::EventFormat encoding;
-
-  /**
-   * @brief Provider Handle
-   */
-  ETWProvider::Handle &provHandle;
-
-  /**
-   * @brief ETWProvider is a singleton that aggregates all ETW writes.
-   * @return
-   */
-  static ETWProvider &etwProvider()
-  {
-    static ETWProvider instance;  // C++11 magic static
-    return instance;
-  }
-
-  /**
-   * @brief Init a reference to etw::ProviderHandle
-   * @return Provider Handle
-   */
-  ETWProvider::Handle &initProvHandle() { return etwProvider().open(provId, encoding); }
-
-public:
-  /**
-   * @brief Tracer constructor
-   * @param parent Parent LoggerProvider
-   * @param providerId ProviderId - Name or GUID
-   * @param encoding ETW encoding format to use.
-   */
-  Logger(etw::LoggerProvider &parent,
-         nostd::string_view eventName,
-         nostd::string_view providerId     = "",
-         ETWProvider::EventFormat encoding = ETWProvider::EventFormat::ETW_MANIFEST)
-      : opentelemetry::logs::Logger(),
-        loggerProvider_(parent),
-        eventName_(eventName),
-        provId(providerId.data(), providerId.size()),
-        encoding(encoding),
-        provHandle(initProvHandle())
-  {}
-
-  nostd::unique_ptr<opentelemetry::logs::LogRecord> CreateLogRecord() noexcept
-  {
-    return nostd::unique_ptr<opentelemetry::logs::LogRecord>(new LogRecord());
-  }
-
-  using opentelemetry::logs::Logger::EmitLogRecord;
-
-  void EmitLogRecord(
-      nostd::unique_ptr<opentelemetry::logs::LogRecord> &&log_record) noexcept override
-  {
-    if (!log_record)
-    {
-      return;
-    }
-    LogRecord *readable_record = static_cast<LogRecord *>(log_record.get());
-
-    nostd::string_view body;
-    if (nostd::holds_alternative<const char *>(readable_record->GetBody()))
-    {
-      body = nostd::get<const char *>(readable_record->GetBody());
-    }
-    else if (nostd::holds_alternative<nostd::string_view>(readable_record->GetBody()))
-    {
-      body = nostd::get<nostd::string_view>(readable_record->GetBody());
-    }
-    // TODO: More body types?
-
-    Properties evtCopy{
-        opentelemetry::common::MakeKeyValueIterableView(readable_record->GetAttributes())};
-    return Log(readable_record->GetSeverity(), provId, body, evtCopy, readable_record->GetTraceId(),
-               readable_record->GetSpanId(), readable_record->GetTraceFlags(),
-               readable_record->GetTimestamp());
-  }
-
-  virtual void Log(opentelemetry::logs::Severity severity,
-                   nostd::string_view name,
-                   nostd::string_view body,
-                   Properties &input_evt,
-                   opentelemetry::trace::TraceId trace_id,
-                   opentelemetry::trace::SpanId span_id,
-                   opentelemetry::trace::TraceFlags trace_flags,
-                   opentelemetry::common::SystemTimestamp timestamp) noexcept
-  {
-    UNREFERENCED_PARAMETER(trace_flags);
-
-#if defined(ENABLE_ENV_PROPERTIES)
-
-    Properties env_properties_env = {};
-    bool has_customer_attribute   = false;
-    if (input_evt.size() > 0)
-    {
-      nlohmann::json env_properties_json = nlohmann::json::object();
-      for (auto &kv : input_evt)
-      {
-        nostd::string_view key = kv.first.data();
-
-        // don't serialize fields propagated from span data.
-        if (key == ETW_FIELD_NAME || key == ETW_FIELD_SPAN_ID || key == ETW_FIELD_TRACE_ID ||
-            key == ETW_FIELD_SPAN_PARENTID)
-        {
-          env_properties_env[key.data()] = kv.second;
-        }
-        else
-        {
-          utils::PopulateAttribute(env_properties_json, key, kv.second);
-          has_customer_attribute = true;
-        }
-      }
-      if (has_customer_attribute)
-      {
-        env_properties_env[ETW_FIELD_ENV_PROPERTIES] = env_properties_json.dump();
-      }
-    }
-
-    Properties &evt = has_customer_attribute ? env_properties_env : input_evt;
-
-#else
-
-    Properties &evt = input_evt;
-
-#endif  // defined(ENABLE_ENV_PROPERTIES)
-
-    // Populate Etw.EventName attribute at envelope level
-    evt[ETW_FIELD_NAME] = eventName_.data();
-
-#ifdef HAVE_FIELD_TIME
-    {
-      auto timeNow        = std::chrono::system_clock::now().time_since_epoch();
-      auto nanos          = std::chrono::duration_cast<std::chrono::nanoseconds>(timeNow).count();
-      evt[ETW_FIELD_TIME] = utils::formatUtcTimestampNsAsISO8601(nanos);
-    }
-#endif
-    const auto &cfg = GetConfiguration(loggerProvider_);
-    if (cfg.enableSpanId)
-    {
-      evt[ETW_FIELD_SPAN_ID] = ToLowerBase16(span_id);
-    }
-    if (cfg.enableTraceId)
-    {
-      evt[ETW_FIELD_TRACE_ID] = ToLowerBase16(trace_id);
-    }
-    // Populate ActivityId if enabled
-    GUID ActivityId;
-    LPGUID ActivityIdPtr = nullptr;
-    if (cfg.enableActivityId)
-    {
-      if (CopySpanIdToActivityId(span_id, ActivityId))
-      {
-        ActivityIdPtr = &ActivityId;
-      }
-    }
-    evt[ETW_FIELD_PAYLOAD_NAME]              = std::string(name.data(), name.size());
-    std::chrono::system_clock::time_point ts = timestamp;
-    int64_t tsNs =
-        std::chrono::duration_cast<std::chrono::nanoseconds>(ts.time_since_epoch()).count();
-    evt[ETW_FIELD_TIMESTAMP] = utils::formatUtcTimestampNsAsISO8601(tsNs);
-    int severity_index       = static_cast<int>(severity);
-    if (severity_index < 0 ||
-        severity_index >= std::extent<decltype(opentelemetry::logs::SeverityNumToText)>::value)
-    {
-      std::stringstream sout;
-      sout << "Invalid severity(" << severity_index << ")";
-      evt[ETW_FIELD_LOG_SEVERITY_TEXT] = sout.str();
-    }
-    else
-    {
-      evt[ETW_FIELD_LOG_SEVERITY_TEXT] =
-          opentelemetry::logs::SeverityNumToText[severity_index].data();
-    }
-    evt[ETW_FIELD_LOG_SEVERITY_NUM] = static_cast<uint32_t>(severity);
-    evt[ETW_FIELD_LOG_BODY]         = std::string(body.data(), body.length());
-
-#if defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-
-    for (const auto &attr : cfg.timestampAttributes)
-    {
-      auto it = evt.find(attr);
-      if (it != evt.end())
-      {
-        auto value_index = it->second.index();
-        if (value_index != exporter_etw::PropertyType::kTypeInt64 &&
-            value_index != exporter_etw::PropertyType::kTypeUInt64)
-        {
-          continue;
-        }
-        int64_t filetime = value_index == exporter_etw::PropertyType::kTypeUInt64
-                               ? nostd::get<uint64_t>(it->second)
-                               : nostd::get<int64_t>(it->second);
-        constexpr int64_t FILETIME_EPOCH_DIFF = 11644473600LL;  // Seconds from 1601 to 1970
-        constexpr int64_t HUNDRED_NANOSECONDS_PER_SECOND = 10000000LL;
-        int64_t unix_time_seconds =
-            (filetime / HUNDRED_NANOSECONDS_PER_SECOND) - FILETIME_EPOCH_DIFF;
-        int64_t unix_time_nanos =
-            unix_time_seconds * 1'000'000'000 + (filetime % HUNDRED_NANOSECONDS_PER_SECOND) * 100;
-        it->second = utils::formatUtcTimestampNsAsISO8601(unix_time_nanos);
-      }
-    }
-
-#endif  // defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-
-    etwProvider().write(provHandle, evt, nullptr, nullptr, 0, encoding);
-  }
-
-  const nostd::string_view GetName() noexcept override { return std::string(); }
-  // TODO : Flush and Shutdown method in main Logger API
-  ~Logger() { etwProvider().close(provHandle); }
-};
-
-/**
- * @brief ETW LoggerProvider
- */
-class LoggerProvider : public opentelemetry::logs::LoggerProvider
-{
-public:
-  /**
-   * @brief LoggerProvider options supplied during initialization.
-   */
-  TelemetryProviderConfiguration config_;
-
-  /**
-   * @brief Construct instance of LoggerProvider with given options
-   * @param options Configuration options
-   */
-  LoggerProvider(TelemetryProviderOptions options) : opentelemetry::logs::LoggerProvider()
-  {
-    GetOption(options, "enableTraceId", config_.enableTraceId, true);
-    GetOption(options, "enableSpanId", config_.enableSpanId, true);
-    GetOption(options, "enableActivityId", config_.enableActivityId, false);
-    GetOption(options, "enableTableNameMappings", config_.enableTableNameMappings, false);
-    GetOption(options, "tableNameMappings", config_.tableNameMappings, {});
-
-#if defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-
-    GetOption(options, "timestampAttributes", config_.timestampAttributes, {});
-
-#endif  // defined(OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW)
-
-    // Determines what encoding to use for ETW events: TraceLogging Dynamic, MsgPack, XML, etc.
-    config_.encoding = GetEncoding(options);
-  }
-
-  LoggerProvider() : opentelemetry::logs::LoggerProvider()
-  {
-    config_.encoding = ETWProvider::EventFormat::ETW_MANIFEST;
-  }
-
-  nostd::shared_ptr<opentelemetry::logs::Logger> GetLogger(
-      opentelemetry::nostd::string_view logger_name,
-      opentelemetry::nostd::string_view library_name = "",
-      opentelemetry::nostd::string_view version      = "",
-      opentelemetry::nostd::string_view schema_url   = "",
-      const opentelemetry::common::KeyValueIterable &attributes =
-          opentelemetry::common::NoopKeyValueIterable()) override
-  {
-    UNREFERENCED_PARAMETER(version);
-    UNREFERENCED_PARAMETER(schema_url);
-    UNREFERENCED_PARAMETER(attributes);
-
-    std::string event_name{ETW_VALUE_LOG};
-    if (config_.enableTableNameMappings)
-    {
-      auto it =
-          config_.tableNameMappings.find(std::string(library_name.data(), library_name.size()));
-      if (it != config_.tableNameMappings.end())
-      {
-        event_name = it->second;
-      }
-    }
-
-    ETWProvider::EventFormat evtFmt = config_.encoding;
-    return nostd::shared_ptr<opentelemetry::logs::Logger>{
-        new (std::nothrow) etw::Logger(*this, event_name, logger_name, evtFmt)};
-  }
-};
-
-}  // namespace etw
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_logger_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_logger_exporter.h
deleted file mode 100644
index d9f8ec230..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_logger_exporter.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-#pragma once
-
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-
-#include <mutex>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-
-#include "opentelemetry/sdk/logs/exporter.h"
-
-#include "opentelemetry/exporters/etw/etw_config.h"
-#include "opentelemetry/exporters/etw/etw_logger.h"
-#include "opentelemetry/exporters/etw/etw_provider.h"
-
-#include "opentelemetry/exporters/etw/utils.h"
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h
deleted file mode 100644
index 3a14780d8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h
+++ /dev/null
@@ -1,459 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-
-#include <opentelemetry/nostd/span.h>
-#include <opentelemetry/nostd/type_traits.h>
-#include <map>
-#include <string>
-#include <vector>
-
-#ifdef _WIN32
-#  include <Windows.h>
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace etw
-{
-
-/**
- * @brief PropertyVariant provides:
- * - a constructor to initialize from initializer lists
- * - an owning wrapper around `common::AttributeValue`
- */
-using PropertyVariant =
-    nostd::variant<bool,
-                   int32_t,
-                   int64_t,
-                   uint32_t,
-                   uint64_t,
-                   double,
-                   std::string,
-                   const char *,
-                   // 8-bit byte arrays / binary blobs are not part of OT spec yet!
-                   // Ref: https://github.com/open-telemetry/opentelemetry-specification/issues/780
-                   std::vector<uint8_t>,
-                   std::vector<bool>,
-                   std::vector<int32_t>,
-                   std::vector<int64_t>,
-                   std::vector<uint32_t>,
-                   std::vector<uint64_t>,
-                   std::vector<double>,
-                   std::vector<std::string>>;
-
-enum PropertyType
-{
-  kTypeBool,
-  kTypeInt,
-  kTypeInt64,
-  kTypeUInt,
-  kTypeUInt64,
-  kTypeDouble,
-  kTypeString,
-  kTypeCString,
-  kTypeSpanByte,
-  kTypeSpanBool,
-  kTypeSpanInt,
-  kTypeSpanInt64,
-  kTypeSpanUInt,
-  kTypeSpanUInt64,
-  kTypeSpanDouble,
-  kTypeSpanString
-};
-
-/**
- * @brief PropertyValue class that holds PropertyVariant and
- * provides converter for non-owning common::AttributeValue
- */
-class PropertyValue : public PropertyVariant
-{
-
-  /**
-   * @brief Convert span<T> to vector<T>
-   * @tparam T
-   * @param source
-   * @return
-   */
-  template <typename T>
-  static std::vector<T> to_vector(const nostd::span<const T, nostd::dynamic_extent> &source)
-  {
-    return std::vector<T>(source.begin(), source.end());
-  }
-
-  /**
-   * @brief Convert span<string_view> to vector<string>
-   * @param source Span of non-owning string views.
-   * @return Vector of owned strings.
-   */
-  std::vector<std::string> static to_vector(const nostd::span<const nostd::string_view> &source)
-  {
-    std::vector<std::string> result(source.size());
-    for (const auto &item : source)
-    {
-      result.push_back(std::string(item.data()));
-    }
-    return result;
-  }
-
-  /**
-   * @brief Convert vector<INTEGRAL> to span<INTEGRAL>.
-   * @tparam T Integral type
-   * @param vec Vector of integral type primitives to convert to span.
-   * @return Span of integral type primitives.
-   */
-  template <typename T, nostd::enable_if_t<std::is_integral<T>::value, bool> = true>
-  static nostd::span<const T> to_span(const std::vector<T> &vec)
-  {
-    nostd::span<const T> result(vec.data(), vec.size());
-    return result;
-  }
-
-  /**
-   * @brief Convert vector<FLOAT> to span<const FLOAT>.
-   * @tparam T Float type
-   * @param vec Vector of float type primitives to convert to span.
-   * @return Span of float type primitives.
-   */
-  template <typename T, nostd::enable_if_t<std::is_floating_point<T>::value, bool> = true>
-  static nostd::span<const T> to_span(const std::vector<T> &vec)
-  {
-    nostd::span<const T> result(vec.data(), vec.size());
-    return result;
-  }
-
-public:
-  /**
-   * @brief PropertyValue from bool
-   * @param v
-   * @return
-   */
-  PropertyValue(bool value) : PropertyVariant(value) {}
-
-  /**
-   * @brief PropertyValue from integral.
-   * @param v
-   * @return
-   */
-  template <typename TInteger, nostd::enable_if_t<std::is_integral<TInteger>::value, bool> = true>
-  PropertyValue(TInteger number) : PropertyVariant(number)
-  {}
-
-  /**
-   * @brief PropertyValue from floating point.
-   * @param v
-   * @return
-   */
-  template <typename TFloat, nostd::enable_if_t<std::is_floating_point<TFloat>::value, bool> = true>
-  PropertyValue(TFloat number) : PropertyVariant(double(number))
-  {}
-
-  /**
-   * @brief Default PropertyValue (int32_t=0)
-   * @param v
-   * @return
-   */
-  PropertyValue() : PropertyVariant(int32_t(0)) {}
-
-  /**
-   * @brief PropertyValue from array of characters as string.
-   *
-   * @param v
-   * @return
-   */
-  PropertyValue(char value[]) : PropertyVariant(std::string(value)) {}
-
-  /**
-   * @brief PropertyValue from array of characters as string.
-   *
-   * @param v
-   * @return
-   */
-  PropertyValue(const char *value) : PropertyVariant(std::string(value)) {}
-
-  /**
-   * @brief PropertyValue from string.
-   *
-   * @param v
-   * @return
-   */
-  PropertyValue(const std::string &value) : PropertyVariant(value) {}
-
-  /**
-   * @brief PropertyValue from vector as array.
-   * @return
-   */
-  template <typename T>
-  PropertyValue(std::vector<T> value) : PropertyVariant(value)
-  {}
-
-  /**
-   * @brief Convert non-owning common::AttributeValue to owning PropertyValue.
-   * @return
-   */
-  PropertyValue &FromAttributeValue(const opentelemetry::common::AttributeValue &v)
-  {
-    switch (v.index())
-    {
-      case opentelemetry::common::AttributeType::kTypeBool:
-        PropertyVariant::operator=(nostd::get<bool>(v));
-        break;
-      case opentelemetry::common::AttributeType::kTypeInt:
-        PropertyVariant::operator=(nostd::get<int32_t>(v));
-        break;
-      case opentelemetry::common::AttributeType::kTypeInt64:
-        PropertyVariant::operator=(nostd::get<int64_t>(v));
-        break;
-      case opentelemetry::common::AttributeType::kTypeUInt:
-        PropertyVariant::operator=(nostd::get<uint32_t>(v));
-        break;
-      case opentelemetry::common::AttributeType::kTypeUInt64:
-        PropertyVariant::operator=(nostd::get<uint64_t>(v));
-        break;
-      case opentelemetry::common::AttributeType::kTypeDouble:
-        PropertyVariant::operator=(nostd::get<double>(v));
-        break;
-      case opentelemetry::common::AttributeType::kTypeCString: {
-        PropertyVariant::operator=(nostd::get<const char *>(v));
-        break;
-      }
-      case opentelemetry::common::AttributeType::kTypeString: {
-        PropertyVariant::operator=(
-            std::string{nostd::string_view(nostd::get<nostd::string_view>(v)).data()});
-        break;
-      }
-
-      case opentelemetry::common::AttributeType::kTypeSpanByte:
-        PropertyVariant::operator=(to_vector(nostd::get<nostd::span<const uint8_t>>(v)));
-        break;
-
-      case opentelemetry::common::AttributeType::kTypeSpanBool:
-        PropertyVariant::operator=(to_vector(nostd::get<nostd::span<const bool>>(v)));
-        break;
-
-      case opentelemetry::common::AttributeType::kTypeSpanInt:
-        PropertyVariant::operator=(to_vector(nostd::get<nostd::span<const int32_t>>(v)));
-        break;
-
-      case opentelemetry::common::AttributeType::kTypeSpanInt64:
-        PropertyVariant::operator=(to_vector(nostd::get<nostd::span<const int64_t>>(v)));
-        break;
-
-      case opentelemetry::common::AttributeType::kTypeSpanUInt:
-        PropertyVariant::operator=(to_vector(nostd::get<nostd::span<const uint32_t>>(v)));
-        break;
-
-      case opentelemetry::common::AttributeType::kTypeSpanUInt64:
-        PropertyVariant::operator=(to_vector(nostd::get<nostd::span<const uint64_t>>(v)));
-        break;
-
-      case opentelemetry::common::AttributeType::kTypeSpanDouble:
-        PropertyVariant::operator=(to_vector(nostd::get<nostd::span<const double>>(v)));
-        break;
-
-      case opentelemetry::common::AttributeType::kTypeSpanString:
-        PropertyVariant::operator=(to_vector(nostd::get<nostd::span<const nostd::string_view>>(v)));
-        break;
-
-      default:
-        break;
-    }
-    return (*this);
-  }
-
-  /**
-   * @brief Convert owning PropertyValue to non-owning common::AttributeValue
-   * @param other
-   */
-  opentelemetry::common::AttributeValue ToAttributeValue() const
-  {
-    opentelemetry::common::AttributeValue value;
-
-    switch (this->index())
-    {
-      case PropertyType::kTypeBool:
-        value = nostd::get<bool>(*this);
-        break;
-      case PropertyType::kTypeInt:
-        value = nostd::get<int32_t>(*this);
-        break;
-      case PropertyType::kTypeInt64:
-        value = nostd::get<int64_t>(*this);
-        break;
-      case PropertyType::kTypeUInt:
-        value = nostd::get<uint32_t>(*this);
-        break;
-      case PropertyType::kTypeUInt64:
-        value = nostd::get<uint64_t>(*this);
-        break;
-      case PropertyType::kTypeDouble:
-        value = nostd::get<double>(*this);
-        break;
-      case PropertyType::kTypeString: {
-        const std::string &str = nostd::get<std::string>(*this);
-        return nostd::string_view(str.data(), str.size());
-        break;
-      }
-      case PropertyType::kTypeCString: {
-        const char *data = nostd::get<const char *>(*this);
-        return nostd::string_view(data, (data) ? strlen(data) : 0);
-        break;
-      }
-      case PropertyType::kTypeSpanByte: {
-        value = to_span(nostd::get<std::vector<uint8_t>>(*this));
-        break;
-      }
-      case PropertyType::kTypeSpanBool: {
-        const auto &vec = nostd::get<std::vector<bool>>(*this);
-        // FIXME: sort out how to remap from vector<bool> to span<bool>
-        UNREFERENCED_PARAMETER(vec);
-        break;
-      }
-      case PropertyType::kTypeSpanInt:
-        value = to_span(nostd::get<std::vector<int32_t>>(*this));
-        break;
-
-      case PropertyType::kTypeSpanInt64:
-        value = to_span(nostd::get<std::vector<int64_t>>(*this));
-        break;
-
-      case PropertyType::kTypeSpanUInt:
-        value = to_span(nostd::get<std::vector<uint32_t>>(*this));
-        break;
-
-      case PropertyType::kTypeSpanUInt64:
-        value = to_span(nostd::get<std::vector<uint64_t>>(*this));
-        break;
-
-      case PropertyType::kTypeSpanDouble:
-        value = to_span(nostd::get<std::vector<double>>(*this));
-        break;
-
-      case PropertyType::kTypeSpanString:
-        // FIXME: sort out how to remap from vector<string> to span<string_view>
-        // value = to_span(nostd::get<std::vector<std::string>>(self));
-        break;
-
-      default:
-        break;
-    }
-    return value;
-  }
-};
-
-/**
- * @brief Map of PropertyValue
- */
-using PropertyValueMap = std::map<std::string, PropertyValue>;
-
-/**
- * @brief Map of PropertyValue with common::KeyValueIterable interface.
- */
-class Properties : public opentelemetry::common::KeyValueIterable, public PropertyValueMap
-{
-
-  /**
-   * @brief Helper tyoe for map constructor.
-   */
-  using PropertyValueType = std::pair<const std::string, PropertyValue>;
-
-public:
-  /**
-   * @brief PropertyValueMap constructor.
-   */
-  Properties() : PropertyValueMap() {}
-
-  /**
-   * @brief PropertyValueMap constructor from initializer list.
-   */
-  Properties(const std::initializer_list<PropertyValueType> properties) : PropertyValueMap()
-  {
-    (*this) = (properties);
-  }
-
-  /**
-   * @brief PropertyValueMap assignment operator from initializer list.
-   */
-  Properties &operator=(std::initializer_list<PropertyValueType> properties)
-  {
-    PropertyValueMap::operator=(properties);
-    return (*this);
-  }
-
-  /**
-   * @brief PropertyValueMap constructor from map.
-   */
-  Properties(const PropertyValueMap &properties) : PropertyValueMap() { (*this) = properties; }
-
-  /**
-   * @brief PropertyValueMap assignment operator from map.
-   */
-  Properties &operator=(const PropertyValueMap &properties)
-  {
-    PropertyValueMap::operator=(properties);
-    return (*this);
-  }
-
-  /**
-   * @brief PropertyValueMap constructor from KeyValueIterable
-   * allows to convert non-Owning KeyValueIterable to owning
-   * container.
-   *
-   */
-  Properties(const opentelemetry::common::KeyValueIterable &other) { (*this) = other; }
-
-  /**
-   * @brief PropertyValueMap assignment operator.
-   */
-  Properties &operator=(const opentelemetry::common::KeyValueIterable &other)
-  {
-    clear();
-    other.ForEachKeyValue(
-        [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
-          std::string k(key.data(), key.length());
-          (*this)[k].FromAttributeValue(value);
-          return true;
-        });
-    return (*this);
-  }
-
-  /**
-   * @brief PropertyValueMap property accessor.
-   */
-  PropertyValue &operator[](const std::string &k) { return PropertyValueMap::operator[](k); }
-
-  /**
-   * Iterate over key-value pairs
-   * @param callback a callback to invoke for each key-value. If the callback returns false,
-   * the iteration is aborted.
-   * @return true if every key-value pair was iterated over
-   */
-  bool ForEachKeyValue(
-      nostd::function_ref<bool(nostd::string_view, opentelemetry::common::AttributeValue)> callback)
-      const noexcept override
-  {
-    for (const auto &kv : (*this))
-    {
-      const opentelemetry::common::AttributeValue &value = kv.second.ToAttributeValue();
-      if (!callback(nostd::string_view{kv.first}, value))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * @return the number of key-value pairs
-   */
-  size_t size() const noexcept override { return PropertyValueMap::size(); }
-};
-
-}  // namespace etw
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h
deleted file mode 100644
index 7dc2bad0f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_provider.h
+++ /dev/null
@@ -1,635 +0,0 @@
-// // Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#pragma once
-
-#ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable : 4459)
-#  pragma warning(disable : 4018)
-#  pragma warning(disable : 5054)
-#endif
-
-#include "opentelemetry/exporters/etw/etw_properties.h"
-#include "opentelemetry/exporters/etw/uuid.h"
-#include "opentelemetry/version.h"
-
-#include "opentelemetry/exporters/etw/etw_fields.h"
-#include "opentelemetry/exporters/etw/utils.h"
-
-#include "opentelemetry/exporters/etw/etw_traceloggingdynamic.h"
-
-#include <map>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#ifdef HAVE_KRABS_TESTS
-// krabs.hpp requires this definition of min macro from Windows.h
-#  ifndef min
-#    define min(a, b) (((a) < (b)) ? (a) : (b))
-#  endif
-#endif
-
-#define MICROSOFT_EVENTTAG_NORMAL_PERSISTENCE 0x01000000
-
-namespace exporter_etw = OPENTELEMETRY_NAMESPACE::exporter::etw;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-class ETWProvider
-{
-
-public:
-  const unsigned long STATUS_OK    = 0;
-  const unsigned long STATUS_ERROR = ULONG_MAX;
-  const unsigned long STATUS_EFBIG = ULONG_MAX - 1;
-
-  enum EventFormat
-  {
-    ETW_MANIFEST = 0,
-    ETW_MSGPACK  = 1,
-    ETW_XML      = 2
-  };
-
-  /// <summary>
-  /// Entry that contains Provider Handle, Provider MetaData and Provider GUID
-  /// </summary>
-  struct Handle
-  {
-    uint64_t refCount;
-    REGHANDLE providerHandle;
-    std::vector<BYTE> providerMetaVector;
-    GUID providerGuid;
-  };
-
-  /// <summary>
-  /// Check if given provider is registered.
-  /// </summary>
-  /// <param name="providerId"></param>
-  /// <returns></returns>
-  bool is_registered(const std::string &providerId)
-  {
-    std::lock_guard<std::mutex> lock(m_providerMapLock);
-    auto it = providers().find(providerId);
-    if (it != providers().end())
-    {
-      if (it->second.providerHandle != INVALID_HANDLE)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /// <summary>
-  /// Get Provider by Name or string representation of GUID
-  /// </summary>
-  /// <param name="providerId"></param>
-  /// <returns></returns>
-  Handle &open(const std::string &providerId, EventFormat format = EventFormat::ETW_MSGPACK)
-  {
-    std::lock_guard<std::mutex> lock(m_providerMapLock);
-
-    // Check and return if provider is already registered
-    auto it = providers().find(providerId);
-    if (it != providers().end())
-    {
-      if (it->second.providerHandle != INVALID_HANDLE)
-      {
-        it->second.refCount++;
-        return it->second;
-      }
-    }
-
-    // Register provider if necessary
-    auto &data = providers()[providerId];
-    data.providerMetaVector.clear();
-
-    utils::UUID guid = (providerId.rfind("{", 0) == 0) ? utils::UUID(providerId.c_str())
-                                                       :                // It's a ProviderGUID
-                           utils::GetProviderGuid(providerId.c_str());  // It's a ProviderName
-
-    data.providerGuid = guid.to_GUID();
-
-    // TODO: currently we do not allow to specify a custom group GUID
-    GUID providerGroupGuid = NULL_GUID;
-
-    switch (format)
-    {
-      // Register with TraceLoggingDynamic facility - dynamic manifest ETW events.
-      case EventFormat::ETW_MANIFEST: {
-        tld::ProviderMetadataBuilder<std::vector<BYTE>> providerMetaBuilder(
-            data.providerMetaVector);
-
-        // Use Tenant ID as provider Name
-        providerMetaBuilder.Begin(providerId.c_str());
-        providerMetaBuilder.AddTrait(tld::ProviderTraitType::ProviderTraitGroupGuid,
-                                     (void *)&providerGroupGuid, sizeof(GUID));
-        providerMetaBuilder.End();
-
-        REGHANDLE hProvider = 0;
-        if (0 !=
-            tld::RegisterProvider(&hProvider, &data.providerGuid, data.providerMetaVector.data()))
-        {
-          // There was an error registering the ETW provider
-          data.refCount       = 0;
-          data.providerHandle = INVALID_HANDLE;
-        }
-        else
-        {
-          data.refCount       = 1;
-          data.providerHandle = hProvider;
-        }
-      }
-      break;
-
-#ifdef HAVE_MSGPACK
-      // Register for MsgPack payload ETW events.
-      case EventFormat::ETW_MSGPACK: {
-        REGHANDLE hProvider = 0;
-        if (EventRegister(&data.providerGuid, NULL, NULL, &hProvider) != ERROR_SUCCESS)
-        {
-          // There was an error registering the ETW provider
-          data.refCount       = 0;
-          data.providerHandle = INVALID_HANDLE;
-        }
-        else
-        {
-          data.refCount       = 1;
-          data.providerHandle = hProvider;
-        }
-      }
-      break;
-#endif
-
-      default:
-        // TODO: other protocols, e.g. XML events - not supported yet
-        break;
-    }
-
-    // We always return an entry even if we failed to register.
-    // Caller should check whether the hProvider handle is valid.
-    return data;
-  }
-
-  /**
-   * @brief Unregister provider
-   * @param data Provider Handle
-   * @return status code
-   */
-  unsigned long close(Handle handle)
-  {
-    std::lock_guard<std::mutex> lock(m_providerMapLock);
-
-    // use reference to provider list, NOT it' copy.
-    auto &m = providers();
-    auto it = m.begin();
-    while (it != m.end())
-    {
-      if (it->second.providerHandle == handle.providerHandle)
-      {
-        // reference to item in the map of open provider handles
-        auto &data           = it->second;
-        unsigned long result = STATUS_OK;
-
-        data.refCount--;
-        if (data.refCount == 0)
-        {
-          if (data.providerMetaVector.size())
-          {
-            // ETW/TraceLoggingDynamic provider
-            result = tld::UnregisterProvider(data.providerHandle);
-          }
-          else
-          {
-            // Other provider types, e.g. ETW/MsgPack
-            result = EventUnregister(data.providerHandle);
-          }
-
-          it->second.providerHandle = INVALID_HANDLE;
-          if (result == STATUS_OK)
-          {
-            m.erase(it);
-          }
-        }
-        return result;
-      }
-    }
-    return STATUS_ERROR;
-  }
-
-  unsigned long writeMsgPack(Handle &providerData,
-                             exporter_etw::Properties &eventData,
-                             LPCGUID ActivityId        = nullptr,
-                             LPCGUID RelatedActivityId = nullptr,
-                             uint8_t Opcode            = 0)
-  {
-#ifdef HAVE_MSGPACK
-    // Events can only be sent if provider is registered
-    if (providerData.providerHandle == INVALID_HANDLE)
-    {
-      // Provider not registered!
-      return STATUS_ERROR;
-    }
-
-    std::string eventName = "NoName";
-    auto nameField        = eventData[ETW_FIELD_NAME];
-
-#  ifdef HAVE_FIELD_TIME
-    // Event time is appended by ETW layer itself by default. This code allows
-    // to override the timestamp by millisecond timestamp, in case if it has
-    // not been already provided by the upper layer.
-    if (!eventData.count(ETW_FIELD_TIME))
-    {
-      // TODO: if nanoseconds resolution is required, then we can populate it in 96-bit MsgPack
-      // spec. auto nanos =
-      // std::chrono::duration_cast<std::chrono::nanoseconds>(now.time_since_epoch()).count();
-      eventData[ETW_FIELD_TIME] = opentelemetry::utils::getUtcSystemTimeMs();
-    }
-#  endif
-
-    switch (nameField.index())
-    {
-      case exporter_etw::PropertyType::kTypeString:
-        eventName = (char *)(nostd::get<std::string>(nameField).data());  // must be 0-terminated!
-        break;
-      case exporter_etw::PropertyType::kTypeCString:
-        eventName = (char *)(nostd::get<const char *>(nameField));
-        break;
-      default:
-        // If invalid event name is supplied, then we replace it with 'NoName'
-        break;
-    }
-
-    /* clang-format off */
-    nlohmann::json jObj =
-    {
-      { ETW_FIELD_OPCODE, Opcode }
-    };
-    /* clang-format on */
-
-    std::string eventFieldName(ETW_FIELD_NAME);
-    for (auto &kv : eventData)
-    {
-      const char *name = kv.first.data();
-
-      // Don't include event name field in the Payload section
-      if (eventFieldName == name)
-        continue;
-
-      auto &value = kv.second;
-      switch (value.index())
-      {
-        case exporter_etw::PropertyType::kTypeBool: {
-          UINT8 temp = static_cast<UINT8>(nostd::get<bool>(value));
-          jObj[name] = temp;
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeInt: {
-          auto temp  = nostd::get<int32_t>(value);
-          jObj[name] = temp;
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeInt64: {
-          auto temp  = nostd::get<int64_t>(value);
-          jObj[name] = temp;
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeUInt: {
-          auto temp  = nostd::get<uint32_t>(value);
-          jObj[name] = temp;
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeUInt64: {
-          auto temp  = nostd::get<uint64_t>(value);
-          jObj[name] = temp;
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeDouble: {
-          auto temp  = nostd::get<double>(value);
-          jObj[name] = temp;
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeString: {
-          jObj[name] = nostd::get<std::string>(value);
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeCString: {
-          auto temp  = nostd::get<const char *>(value);
-          jObj[name] = temp;
-          break;
-        }
-#  if HAVE_TYPE_GUID
-          // TODO: consider adding UUID/GUID to spec
-        case opentelemetry::common::AttributeType::TYPE_GUID: {
-          auto temp = nostd::get<GUID>(value);
-          // TODO: add transform from GUID type to string?
-          jObj[name] = temp;
-          break;
-        }
-#  endif
-
-        // TODO: arrays are not supported yet
-        case exporter_etw::PropertyType::kTypeSpanByte:
-        case exporter_etw::PropertyType::kTypeSpanBool:
-        case exporter_etw::PropertyType::kTypeSpanInt:
-        case exporter_etw::PropertyType::kTypeSpanInt64:
-        case exporter_etw::PropertyType::kTypeSpanUInt:
-        case exporter_etw::PropertyType::kTypeSpanUInt64:
-        case exporter_etw::PropertyType::kTypeSpanDouble:
-        case exporter_etw::PropertyType::kTypeSpanString:
-        default:
-          // TODO: unsupported type
-          break;
-      }
-    }
-
-    // forwardMessage.push_back(nameField);
-    nlohmann::json payloadPair = nlohmann::json::array();
-
-    payloadPair.push_back(
-        utils::GetMsgPackEventTimeFromSystemTimestamp(std::chrono::system_clock::now()));
-    payloadPair.push_back(jObj);
-
-    nlohmann::json payloadArray = nlohmann::json::array({payloadPair});
-
-    nlohmann::json forwardMessage = nlohmann::json::array({eventName, payloadArray});
-
-    std::vector<uint8_t> v = nlohmann::json::to_msgpack(forwardMessage);
-
-    EVENT_DESCRIPTOR evtDescriptor;
-    // TODO: event descriptor may be populated with additional values as follows:
-    // Id       - if 0, auto-incremented sequence number that uniquely identifies event in a trace
-    // Version  - event version
-    // Channel  - 11 for TraceLogging
-    // Level    - verbosity level
-    // Task     - TaskId
-    // Opcode   - described in evntprov.h:259 : 0 - info, 1 - activity start, 2 - activity stop.
-    EventDescCreate(&evtDescriptor, 100, 0x1, 0, 0, 0, Opcode, 0);
-    EVENT_DATA_DESCRIPTOR evtData[1];
-    EventDataDescCreate(&evtData[0], v.data(), static_cast<ULONG>(v.size()));
-    ULONG writeResponse = 0;
-    if ((ActivityId != nullptr) || (RelatedActivityId != nullptr))
-    {
-      writeResponse = EventWriteTransfer(providerData.providerHandle, &evtDescriptor, ActivityId,
-                                         RelatedActivityId, 1, evtData);
-    }
-    else
-    {
-      writeResponse = EventWrite(providerData.providerHandle, &evtDescriptor, 1, evtData);
-    }
-
-    switch (writeResponse)
-    {
-      case ERROR_INVALID_PARAMETER:
-        break;
-      case ERROR_INVALID_HANDLE:
-        break;
-      case ERROR_ARITHMETIC_OVERFLOW:
-        break;
-      case ERROR_MORE_DATA:
-        break;
-      case ERROR_NOT_ENOUGH_MEMORY:
-        break;
-      default:
-        break;
-    }
-
-    if (writeResponse == ERROR_ARITHMETIC_OVERFLOW)
-    {
-      return STATUS_EFBIG;
-    }
-    return (unsigned long)(writeResponse);
-#else
-    UNREFERENCED_PARAMETER(providerData);
-    UNREFERENCED_PARAMETER(eventData);
-    UNREFERENCED_PARAMETER(ActivityId);
-    UNREFERENCED_PARAMETER(RelatedActivityId);
-    UNREFERENCED_PARAMETER(Opcode);
-    return STATUS_ERROR;
-#endif
-  }
-
-  /// <summary>
-  /// Send event to Provider Id
-  /// </summary>
-  /// <param name="providerId"></param>
-  /// <param name="eventData"></param>
-  /// <returns></returns>
-  unsigned long writeTld(Handle &providerData,
-                         exporter_etw::Properties &eventData,
-                         LPCGUID ActivityId        = nullptr,
-                         LPCGUID RelatedActivityId = nullptr,
-                         uint8_t Opcode            = 0 /* Information */)
-  {
-    // Make sure you stop sending event before register unregistering providerData
-    if (providerData.providerHandle == INVALID_HANDLE)
-    {
-      // Provider not registered!
-      return STATUS_ERROR;
-    }
-
-    UINT32 eventTags = MICROSOFT_EVENTTAG_NORMAL_PERSISTENCE;
-
-    std::vector<BYTE> byteVector;
-    std::vector<BYTE> byteDataVector;
-    tld::EventMetadataBuilder<std::vector<BYTE>> builder(byteVector);
-    tld::EventDataBuilder<std::vector<BYTE>> dbuilder(byteDataVector);
-
-    const std::string EVENT_NAME = ETW_FIELD_NAME;
-    std::string eventName        = "NoName";
-    auto nameField               = eventData[EVENT_NAME];
-    switch (nameField.index())
-    {
-      case exporter_etw::PropertyType::kTypeString:
-        eventName = (char *)(nostd::get<std::string>(nameField).data());
-        break;
-      case exporter_etw::PropertyType::kTypeCString:
-        eventName = (char *)(nostd::get<const char *>(nameField));
-        break;
-      default:
-        // This is user error. Invalid event name!
-        // We supply default 'NoName' event name in this case.
-        break;
-    }
-
-    builder.Begin(eventName.c_str(), eventTags);
-
-    for (auto &kv : eventData)
-    {
-      const char *name = kv.first.data();
-      auto &value      = kv.second;
-      switch (value.index())
-      {
-        case exporter_etw::PropertyType::kTypeBool: {
-          builder.AddField(name, tld::TypeBool8);
-          UINT8 temp = static_cast<UINT8>(nostd::get<bool>(value));
-          dbuilder.AddByte(temp);
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeInt: {
-          builder.AddField(name, tld::TypeInt32);
-          auto temp = nostd::get<int32_t>(value);
-          dbuilder.AddValue(temp);
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeInt64: {
-          builder.AddField(name, tld::TypeInt64);
-          auto temp = nostd::get<int64_t>(value);
-          dbuilder.AddValue(temp);
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeUInt: {
-          builder.AddField(name, tld::TypeUInt32);
-          auto temp = nostd::get<uint32_t>(value);
-          dbuilder.AddValue(temp);
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeUInt64: {
-          builder.AddField(name, tld::TypeUInt64);
-          auto temp = nostd::get<uint64_t>(value);
-          dbuilder.AddValue(temp);
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeDouble: {
-          builder.AddField(name, tld::TypeDouble);
-          auto temp = nostd::get<double>(value);
-          dbuilder.AddValue(temp);
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeString: {
-          builder.AddField(name, tld::TypeUtf8String);
-          dbuilder.AddString(nostd::get<std::string>(value).data());
-          break;
-        }
-        case exporter_etw::PropertyType::kTypeCString: {
-          builder.AddField(name, tld::TypeUtf8String);
-          auto temp = nostd::get<const char *>(value);
-          dbuilder.AddString(temp);
-          break;
-        }
-#if HAVE_TYPE_GUID
-          // TODO: consider adding UUID/GUID to spec
-        case exporter_etw::PropertyType::kGUID: {
-          builder.AddField(name.c_str(), TypeGuid);
-          auto temp = nostd::get<GUID>(value);
-          dbuilder.AddBytes(&temp, sizeof(GUID));
-          break;
-        }
-#endif
-
-        // TODO: arrays are not supported
-        case exporter_etw::PropertyType::kTypeSpanByte:
-        case exporter_etw::PropertyType::kTypeSpanBool:
-        case exporter_etw::PropertyType::kTypeSpanInt:
-        case exporter_etw::PropertyType::kTypeSpanInt64:
-        case exporter_etw::PropertyType::kTypeSpanUInt:
-        case exporter_etw::PropertyType::kTypeSpanUInt64:
-        case exporter_etw::PropertyType::kTypeSpanDouble:
-        case exporter_etw::PropertyType::kTypeSpanString:
-        default:
-          // TODO: unsupported type
-          break;
-      }
-    }
-
-    if (!builder.End())  // Returns false if the metadata is too large.
-    {
-      return STATUS_EFBIG;  // if event is too big for UTC to handle
-    }
-
-    tld::EventDescriptor eventDescriptor;
-    eventDescriptor.Opcode = Opcode;
-    eventDescriptor.Level  = 0; /* FIXME: Always on for now */
-
-    EVENT_DATA_DESCRIPTOR pDataDescriptors[3];
-    EventDataDescCreate(&pDataDescriptors[2], byteDataVector.data(),
-                        static_cast<ULONG>(byteDataVector.size()));
-
-    HRESULT writeResponse = 0;
-    if ((ActivityId != nullptr) || (RelatedActivityId != nullptr))
-    {
-      writeResponse = tld::WriteEvent(providerData.providerHandle, eventDescriptor,
-                                      providerData.providerMetaVector.data(), byteVector.data(), 3,
-                                      pDataDescriptors, ActivityId, RelatedActivityId);
-    }
-    else
-    {
-      writeResponse = tld::WriteEvent(providerData.providerHandle, eventDescriptor,
-                                      providerData.providerMetaVector.data(), byteVector.data(), 3,
-                                      pDataDescriptors);
-    }
-
-    // Event is larger than ETW max sized of 64KB
-    if (writeResponse == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW))
-    {
-      return STATUS_EFBIG;
-    }
-
-    return (unsigned long)(writeResponse);
-  }
-
-  unsigned long write(Handle &providerData,
-                      exporter_etw::Properties &eventData,
-                      LPCGUID ActivityId,
-                      LPCGUID RelatedActivityId,
-                      uint8_t Opcode,
-                      ETWProvider::EventFormat format)
-  {
-    if (format == ETWProvider::EventFormat::ETW_MANIFEST)
-    {
-      return writeTld(providerData, eventData, ActivityId, RelatedActivityId, Opcode);
-    }
-    if (format == ETWProvider::EventFormat::ETW_MSGPACK)
-    {
-      return writeMsgPack(providerData, eventData, ActivityId, RelatedActivityId, Opcode);
-    }
-    if (format == ETWProvider::EventFormat::ETW_XML)
-    {
-      // TODO: not implemented
-      return STATUS_ERROR;
-    }
-    return STATUS_ERROR;
-  }
-
-  static const REGHANDLE INVALID_HANDLE = _UI64_MAX;
-
-protected:
-  const unsigned int LargeEventSizeKB = 62;
-
-  const GUID NULL_GUID = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};
-
-  mutable std::mutex m_providerMapLock;
-
-  using ProviderMap = std::map<std::string, Handle>;
-
-  ProviderMap &providers()
-  {
-    static std::map<std::string, Handle> providers;
-    return providers;
-  }
-};
-
-OPENTELEMETRY_END_NAMESPACE
-
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h
deleted file mode 100644
index aa23e6f81..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_random_id_generator.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/version.h"
-
-#ifdef _WIN32
-#  include "Windows.h"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-class ETWRandomIdGenerator : public IdGenerator
-{
-public:
-  ETWRandomIdGenerator() : IdGenerator(false) {}
-
-  opentelemetry::trace::SpanId GenerateSpanId() noexcept override
-  {
-    GUID span_id;
-    // Generate random GUID
-    CoCreateGuid(&span_id);
-    const auto *spanIdPtr = reinterpret_cast<const uint8_t *>(std::addressof(span_id));
-
-    // Populate SpanId with that GUID
-    nostd::span<const uint8_t, opentelemetry::trace::SpanId::kSize> spanIdBytes(
-        spanIdPtr, spanIdPtr + opentelemetry::trace::SpanId::kSize);
-    return opentelemetry::trace::SpanId(spanIdBytes);
-  }
-
-  opentelemetry::trace::TraceId GenerateTraceId() noexcept override
-  {
-    GUID trace_id;
-    CoCreateGuid(&trace_id);
-    // Populate TraceId of the Tracer with the above GUID
-    const auto *traceIdPtr = reinterpret_cast<const uint8_t *>(std::addressof(trace_id));
-    nostd::span<const uint8_t, opentelemetry::trace::TraceId::kSize> traceIdBytes(
-        traceIdPtr, traceIdPtr + opentelemetry::trace::TraceId::kSize);
-    return opentelemetry::trace::TraceId(traceIdBytes);
-  }
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tail_sampler.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tail_sampler.h
deleted file mode 100644
index bd4a9bb90..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tail_sampler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/trace/span.h"
-
-#pragma once
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace etw
-{
-
-class TailSampler
-{
-public:
-  // convert to etw span if required for getters on span.
-  // auto etw_span = static_cast<const opentelemetry::exporter::etw::Span*>(&span);
-  // Decision based on
-  //      Span::GetStatus()
-  //      Span::GetProperties()
-  //      Span::GetContext()
-  virtual opentelemetry::sdk::trace::SamplingResult ShouldSample(
-      const opentelemetry::trace::Span &span) noexcept = 0;
-  virtual ~TailSampler()                               = default;
-};
-
-class AlwaysOnTailSampler : public TailSampler
-{
-public:
-  opentelemetry::sdk::trace::SamplingResult ShouldSample(
-      const opentelemetry::trace::Span &span) noexcept override
-  {
-    UNREFERENCED_PARAMETER(span);
-    return {opentelemetry::sdk::trace::Decision::RECORD_AND_SAMPLE};
-  }
-};
-
-}  // namespace etw
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_traceloggingdynamic.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_traceloggingdynamic.h
deleted file mode 100644
index dc5a3356c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_traceloggingdynamic.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef __has_include
-#  if __has_include("TraceLoggingDynamic.h")
-#    include "TraceLoggingDynamic.h"
-#    ifndef HAVE_TLD
-#      define HAVE_TLD
-#    endif
-#  endif
-#else
-#  ifndef HAVE_TLD
-#    define HAVE_TLD
-#  endif
-#  include "TraceLoggingDynamic.h"
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h
deleted file mode 100644
index c6c7f0ed6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer.h
+++ /dev/null
@@ -1,1193 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-#include <atomic>
-
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <sstream>
-#include <vector>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#include "opentelemetry/sdk/common/empty_attributes.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-
-#include "opentelemetry/exporters/etw/etw_config.h"
-#include "opentelemetry/exporters/etw/etw_fields.h"
-#include "opentelemetry/exporters/etw/etw_properties.h"
-#include "opentelemetry/exporters/etw/etw_provider.h"
-#include "opentelemetry/exporters/etw/etw_random_id_generator.h"
-#include "opentelemetry/exporters/etw/etw_tail_sampler.h"
-#include "opentelemetry/exporters/etw/utils.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace etw
-{
-
-class Span;
-
-/**
- * @brief Template that allows to instantiate new Span object for header-only forward-declared
- * etw::Span type
- *
- * @tparam SpanType     Expected to be etw::Span
- * @tparam TracerType   expected to be etw::Tracer
- * @param objPtr        Pointer to parent
- * @param name          Span Name
- * @param options       Span Options
- * @return              Span instance
- */
-template <class SpanType, class TracerType>
-SpanType *new_span(TracerType *objPtr,
-                   nostd::string_view name,
-                   const opentelemetry::trace::StartSpanOptions &options,
-                   std::unique_ptr<opentelemetry::trace::SpanContext> spanContext)
-{
-  return new (std::nothrow) SpanType{*objPtr, name, options, std::move(spanContext)};
-}
-
-/**
- * @brief Template that allows to convert etw::Span pointer to smart shared pointer to
- * `opentelemetry::trace::Span`
- * @tparam SpanType     Expected to be etw::Span
- * @param ptr           Pointer to etw::Span
- * @return              Smart shared pointer to `opentelemetry::trace::Span`
- */
-template <class SpanType>
-nostd::shared_ptr<opentelemetry::trace::Span> to_span_ptr(SpanType *ptr)
-{
-  return nostd::shared_ptr<opentelemetry::trace::Span>{ptr};
-}
-
-class TracerProvider;
-
-/**
- * @brief Utility template for obtaining Span Name
- * @tparam T            etw::Span
- * @param t             instance of etw::Span
- * @return              Span Name
- */
-template <class T>
-std::string GetName(T &t)
-{
-  auto sV = t.GetName();
-  return std::string(sV.data(), sV.length());
-}
-
-/**
- * @brief Utility template to obtain Span start time
- * @tparam T            etw::Span
- * @param t             instance of etw::Span
- * @return              Span Start timestamp
- */
-template <class T>
-opentelemetry::common::SystemTimestamp GetStartTime(T &t)
-{
-  return t.GetStartTime();
-}
-
-/**
- * @brief Utility template to obtain Span end time
- * @tparam T           etw::Span
- * @param t            instance of etw::Span
- * @return             Span Stop timestamp
- */
-template <class T>
-opentelemetry::common::SystemTimestamp GetEndTime(T &t)
-{
-  return t.GetEndTime();
-}
-
-class Properties;
-
-/**
- * @brief Utility template to store Attributes on Span
- * @tparam T           etw::Span
- * @param instance     instance of etw::Span
- * @param t            Properties to store as Attributes
- */
-template <class T>
-void SetSpanAttributes(T &instance, Properties &t)
-{
-  instance.SetAttributes(t);
-}
-
-/**
- * @brief Utility template to obtain Span Attributes
- * @tparam T           etw::Span
- * @param instance     instance of etw::Span
- * @return             ref to Span Attributes
- */
-template <class T>
-Properties &GetSpanAttributes(T &instance)
-{
-  return instance.GetAttributes();
-}
-
-template <class T>
-void UpdateStatus(T &t, Properties &props)
-{
-  t.UpdateStatus(props);
-}
-
-/**
- * @brief Tracer class that allows to send spans to ETW Provider.
- */
-
-class Tracer : public opentelemetry::trace::Tracer,
-               public std::enable_shared_from_this<opentelemetry::trace::Tracer>
-{
-
-  /**
-   * @brief Parent provider of this Tracer
-   */
-  etw::TracerProvider &tracerProvider_;
-
-  /**
-   * @brief ProviderId (Name or GUID)
-   */
-  std::string provId;
-
-  /**
-   * @brief Encoding (Manifest, MessagePack or XML)
-   */
-  ETWProvider::EventFormat encoding;
-
-  /**
-   * @brief Provider Handle
-   */
-  ETWProvider::Handle &provHandle;
-
-  opentelemetry::trace::TraceId traceId_;
-
-  std::atomic<bool> isClosed_{true};
-
-  /**
-   * @brief ETWProvider is a singleton that aggregates all ETW writes.
-   * @return
-   */
-  static ETWProvider &etwProvider()
-  {
-    static ETWProvider instance;  // C++11 magic static
-    return instance;
-  }
-
-  /**
-   * @brief Internal method that allows to populate Links to other Spans.
-   * Span links are in hexadecimal representation, comma-separated in their
-   * order of appearance.
-   *
-   * @param attributes
-   * @param links
-   */
-  virtual void DecorateLinks(Properties &attributes,
-                             const opentelemetry::trace::SpanContextKeyValueIterable &links) const
-  {
-    // Add `SpanLinks` attribute if the list is not empty
-    if (links.size())
-    {
-      bool first = true;
-      std::string linksValue;
-
-      // reserve space for all the SpanLinks.
-      // A single SpanLink will be outptut as:
-      // [{"toSpanId":"9a43c801557f26b7","toTraceId":"ac6cd70ac4bb168a99cb7651b048d965"}]
-      // The second and above link output to string are 1 byte less than the first SpanLink.
-      const size_t kSingleSpanLinkSizeInBytes = 80;
-      linksValue.reserve(kSingleSpanLinkSizeInBytes +
-                         (links.size() - 1) * (kSingleSpanLinkSizeInBytes - 1));
-      linksValue += "[";
-
-      links.ForEachKeyValue([&](opentelemetry::trace::SpanContext ctx,
-                                const opentelemetry::common::KeyValueIterable &) {
-        if (first)
-        {
-          first = false;
-          linksValue += "{\"" ETW_FIELD_SPAN_LINKS_TO_SPAN_ID "\":\"";
-        }
-        else
-        {
-          linksValue += ",{\"" ETW_FIELD_SPAN_LINKS_TO_SPAN_ID "\":\"";
-        }
-
-        linksValue += ToLowerBase16(ctx.span_id());
-        linksValue += "\",\"" ETW_FIELD_SPAN_LINKS_TO_TRACE_ID "\":\"";
-        linksValue += ToLowerBase16(ctx.trace_id());
-        linksValue += "\"}";
-
-        return true;
-      });
-
-      linksValue += "]";
-
-      attributes[ETW_FIELD_SPAN_LINKS] = std::move(linksValue);
-    }
-  }
-
-  /**
-   * @brief Allow our friendly etw::Span to end itself on Tracer.
-   * @param span
-   * @param
-   */
-  virtual void EndSpan(const Span &span,
-                       const opentelemetry::trace::Span *parentSpan = nullptr,
-                       const opentelemetry::trace::EndSpanOptions & = {})
-  {
-    const auto &cfg          = GetConfiguration(tracerProvider_);
-    const auto &tail_sampler = GetTailSampler(tracerProvider_);
-    const opentelemetry::trace::Span &spanBase =
-        reinterpret_cast<const opentelemetry::trace::Span &>(span);
-
-    //  Sample span based on the decision of tail based sampler
-    auto sampling_result = const_cast<TailSampler *>(&tail_sampler)->ShouldSample(spanBase);
-    if (!sampling_result.IsRecording() || !sampling_result.IsSampled())
-    {
-      return;
-    }
-    auto spanContext = spanBase.GetContext();
-
-    // Populate Span with presaved attributes
-    Span &currentSpan = const_cast<Span &>(span);
-    Properties evt    = GetSpanAttributes(currentSpan);
-
-#if defined(ENABLE_ENV_PROPERTIES)
-
-    Properties env_properties_env = {};
-    if (evt.size() > 0)
-    {
-      bool has_customer_attribute        = false;
-      nlohmann::json env_properties_json = nlohmann::json::object();
-      for (auto &kv : evt)
-      {
-        nostd::string_view key = kv.first.data();
-
-        // don't serialize fields propagated from span data.
-        if (key == ETW_FIELD_NAME || key == ETW_FIELD_SPAN_ID || key == ETW_FIELD_TRACE_ID ||
-            key == ETW_FIELD_SPAN_PARENTID)
-        {
-          env_properties_env[key.data()] = kv.second;
-        }
-        else
-        {
-          utils::PopulateAttribute(env_properties_json, key, kv.second);
-          has_customer_attribute = true;
-        }
-      }
-      if (has_customer_attribute)
-      {
-        env_properties_env[ETW_FIELD_ENV_PROPERTIES] = env_properties_json.dump();
-        evt                                          = std::move(env_properties_env);
-      }
-    }
-
-#endif  // defined(ENABLE_ENV_PROPERTIES)
-
-    evt[ETW_FIELD_NAME] = GetName(span);
-
-    if (cfg.enableSpanId)
-    {
-      evt[ETW_FIELD_SPAN_ID] = ToLowerBase16(spanContext.span_id());
-    }
-
-    if (cfg.enableTraceId)
-    {
-      evt[ETW_FIELD_TRACE_ID] = ToLowerBase16(spanContext.trace_id());
-    }
-
-    // Populate ActivityId if enabled
-    GUID ActivityId;
-    LPGUID ActivityIdPtr = nullptr;
-    if (cfg.enableActivityId)
-    {
-      if (CopySpanIdToActivityId(spanBase.GetContext().span_id(), ActivityId))
-      {
-        ActivityIdPtr = &ActivityId;
-      }
-    }
-
-    // Populate RelatedActivityId if enabled
-    GUID RelatedActivityId;
-    LPGUID RelatedActivityIdPtr = nullptr;
-    if (cfg.enableRelatedActivityId)
-    {
-      if (parentSpan != nullptr)
-      {
-        if (CopySpanIdToActivityId(parentSpan->GetContext().span_id(), RelatedActivityId))
-        {
-          RelatedActivityIdPtr = &RelatedActivityId;
-        }
-      }
-    }
-
-    if (cfg.enableActivityTracking)
-    {
-      // TODO: check what EndSpanOptions should be supported for this exporter.
-      // The only option available currently (end_steady_time) does not apply.
-      //
-      // This event on Span Stop enables generation of "non-transactional"
-      // OpCode=Stop in alignment with TraceLogging Activity "EventSource"
-      // spec.
-      etwProvider().write(provHandle, evt, ActivityIdPtr, RelatedActivityIdPtr, 2, encoding);
-    }
-
-    {
-      // Now since the span has ended, we need to emit the "Span" event that
-      // contains the entire span information, attributes, time, etc. on it.
-      evt[ETW_FIELD_NAME]         = ETW_VALUE_SPAN;
-      evt[ETW_FIELD_PAYLOAD_NAME] = GetName(span);
-
-      // Add timing details in ISO8601 format, which adequately represents
-      // the actual time, taking Timezone into consideration. This is NOT
-      // local time, but rather UTC time (Z=0).
-      std::chrono::system_clock::time_point startTime = GetStartTime(currentSpan);
-      std::chrono::system_clock::time_point endTime   = GetEndTime(currentSpan);
-      int64_t startTimeNs =
-          std::chrono::duration_cast<std::chrono::nanoseconds>(startTime.time_since_epoch())
-              .count();
-      int64_t endTimeNs =
-          std::chrono::duration_cast<std::chrono::nanoseconds>(endTime.time_since_epoch()).count();
-
-      // It may be more optimal to enable passing timestamps as UTC nanoseconds
-      // since Unix epoch instead of string, but that implies additional tooling
-      // is needed to convert it, rendering it NOT human-readable.
-      evt[ETW_FIELD_STARTTIME] = utils::formatUtcTimestampNsAsISO8601(startTimeNs);
-#ifdef ETW_FIELD_ENDTTIME
-      // ETW has its own precise timestamp at envelope layer for every event.
-      // However, in some scenarios it is easier to deal with ISO8601 strings.
-      // In that case we convert the app-created timestamp and place it into
-      // Payload[$ETW_FIELD_TIME] field. The option configurable at compile-time.
-      evt[ETW_FIELD_ENDTTIME] = utils::formatUtcTimestampNsAsISO8601(endTimeNs);
-#endif
-      // Duration of Span in nanoseconds
-      evt[ETW_FIELD_DURATION] = endTimeNs - startTimeNs;
-      // Presently we assume that all spans are server spans
-      evt[ETW_FIELD_SPAN_KIND] = uint32_t(opentelemetry::trace::SpanKind::kServer);
-      UpdateStatus(currentSpan, evt);
-      etwProvider().write(provHandle, evt, ActivityIdPtr, RelatedActivityIdPtr, 0, encoding);
-    }
-  }
-
-  const opentelemetry::trace::TraceId &trace_id() { return traceId_; }
-
-  friend class Span;
-
-  /**
-   * @brief Init a reference to etw::ProviderHandle
-   * @return Provider Handle
-   */
-  ETWProvider::Handle &initProvHandle()
-  {
-    isClosed_ = false;
-    return etwProvider().open(provId, encoding);
-  }
-
-public:
-  /**
-   * @brief Tracer constructor
-   * @param parent Parent TraceProvider
-   * @param providerId ProviderId - Name or GUID
-   * @param encoding ETW encoding format to use.
-   */
-  Tracer(etw::TracerProvider &parent,
-         nostd::string_view providerId     = "",
-         ETWProvider::EventFormat encoding = ETWProvider::EventFormat::ETW_MANIFEST)
-      : opentelemetry::trace::Tracer(),
-        tracerProvider_(parent),
-        provId(providerId.data(), providerId.size()),
-        encoding(encoding),
-        provHandle(initProvHandle())
-  {
-    traceId_ = GetIdGenerator(tracerProvider_).GenerateTraceId();
-  }
-
-  /**
-   * @brief Start Span
-   * @param name Span name
-   * @param attributes Span attributes
-   * @param links Span links
-   * @param options Span options
-   * @return
-   */
-  nostd::shared_ptr<opentelemetry::trace::Span> StartSpan(
-      nostd::string_view name,
-      const opentelemetry::common::KeyValueIterable &attributes,
-      const opentelemetry::trace::SpanContextKeyValueIterable &links,
-      const opentelemetry::trace::StartSpanOptions &options = {}) noexcept override
-  {
-    // If RTTI is enabled by compiler, the below code modifies the attributes object passed as arg,
-    // which is sometime not desirable, set OPENTELEMETRY_NOT_USE_RTTI in application
-    // to avoid using RTTI in that case in below set of code.
-#if !defined OPENTELEMETRY_RTTI_ENABLED || defined OPENTELEMETRY_NOT_USE_RTTI
-    Properties evtCopy = attributes;
-    return StartSpan(name, evtCopy, links, options);
-#else  // OPENTELEMETRY_RTTI_ENABLED is defined
-    opentelemetry::common::KeyValueIterable &attribs =
-        const_cast<opentelemetry::common::KeyValueIterable &>(attributes);
-    Properties *evt = dynamic_cast<Properties *>(&attribs);
-    if (evt != nullptr)
-    {
-      // Pass as a reference to original modifyable collection without creating a copy
-      return StartSpan(name, *evt, links, options);
-    }
-    Properties evtCopy = attributes;
-    return StartSpan(name, evtCopy, links, options);
-#endif
-  }
-
-  /**
-   * @brief Start Span
-   * @param name Span name
-   * @param attributes Span attributes
-   * @param links Span links
-   * @param options Span options
-   * @return
-   */
-  virtual nostd::shared_ptr<opentelemetry::trace::Span> StartSpan(
-      nostd::string_view name,
-      Properties &evt,
-      const opentelemetry::trace::SpanContextKeyValueIterable &links,
-      const opentelemetry::trace::StartSpanOptions &options = {}) noexcept
-  {
-    const auto &cfg = GetConfiguration(tracerProvider_);
-
-    // Parent Context:
-    // - either use current span
-    // - or attach to parent SpanContext specified in options
-    opentelemetry::trace::SpanContext parentContext = GetCurrentSpan()->GetContext();
-    if (nostd::holds_alternative<opentelemetry::trace::SpanContext>(options.parent))
-    {
-      auto spanContext = nostd::get<opentelemetry::trace::SpanContext>(options.parent);
-      if (spanContext.IsValid())
-      {
-        parentContext = spanContext;
-      }
-    }
-    auto traceId = parentContext.IsValid() ? parentContext.trace_id() : traceId_;
-
-    // Sampling based on attributes is not supported for now, so passing empty below.
-    std::map<std::string, int> emptyAttributes = {{}};
-    opentelemetry::sdk::trace::SamplingResult sampling_result =
-        GetSampler(tracerProvider_)
-            .ShouldSample(parentContext, traceId, name, options.kind,
-                          opentelemetry::common::KeyValueIterableView<std::map<std::string, int>>(
-                              emptyAttributes),
-                          links);
-
-    opentelemetry::trace::TraceFlags traceFlags =
-        sampling_result.decision == opentelemetry::sdk::trace::Decision::DROP
-            ? opentelemetry::trace::TraceFlags{}
-            : opentelemetry::trace::TraceFlags{opentelemetry::trace::TraceFlags::kIsSampled};
-
-    auto spanContext =
-        std::unique_ptr<opentelemetry::trace::SpanContext>(new opentelemetry::trace::SpanContext(
-            traceId, GetIdGenerator(tracerProvider_).GenerateSpanId(), traceFlags, false,
-            sampling_result.trace_state ? sampling_result.trace_state
-            : parentContext.IsValid()   ? parentContext.trace_state()
-                                        : opentelemetry::trace::TraceState::GetDefault()));
-
-    if (sampling_result.decision == sdk::trace::Decision::DROP)
-    {
-      auto noopSpan = nostd::shared_ptr<opentelemetry::trace::Span>{
-          new (std::nothrow)
-              opentelemetry::trace::NoopSpan(this->shared_from_this(), std::move(spanContext))};
-      return noopSpan;
-    }
-
-    // Populate Etw.RelatedActivityId at envelope level if enabled
-    GUID RelatedActivityId;
-    LPCGUID RelatedActivityIdPtr = nullptr;
-    if (cfg.enableAutoParent)
-    {
-      if (cfg.enableRelatedActivityId)
-      {
-        if (CopySpanIdToActivityId(parentContext.span_id(), RelatedActivityId))
-        {
-          RelatedActivityIdPtr = &RelatedActivityId;
-        }
-      }
-    }
-
-    // This template pattern allows us to forward-declare the etw::Span,
-    // create an instance of it, then assign it to tracer::Span result.
-    auto currentSpan = new_span<Span, Tracer>(this, name, options, std::move(spanContext));
-    nostd::shared_ptr<opentelemetry::trace::Span> result = to_span_ptr<Span>(currentSpan);
-
-    // Decorate with additional standard fields
-    std::string eventName = name.data();
-
-    // Populate Etw.EventName attribute at envelope level
-    evt[ETW_FIELD_NAME] = eventName;
-
-    // Populate Payload["SpanId"] attribute
-    // Populate Payload["ParentSpanId"] attribute if parent Span is valid
-    if (cfg.enableSpanId)
-    {
-      if (parentContext.IsValid())
-      {
-        evt[ETW_FIELD_SPAN_PARENTID] = ToLowerBase16(parentContext.span_id());
-      }
-      evt[ETW_FIELD_SPAN_ID] = ToLowerBase16(result.get()->GetContext().span_id());
-    }
-
-    // Populate Etw.Payload["TraceId"] attribute
-    if (cfg.enableTraceId)
-    {
-      evt[ETW_FIELD_TRACE_ID] = ToLowerBase16(result.get()->GetContext().trace_id());
-    }
-
-    // Populate Etw.ActivityId at envelope level if enabled
-    GUID ActivityId;
-    LPCGUID ActivityIdPtr = nullptr;
-    if (cfg.enableActivityId)
-    {
-      if (CopySpanIdToActivityId(result.get()->GetContext().span_id(), ActivityId))
-      {
-        ActivityIdPtr = &ActivityId;
-      }
-    }
-
-    // Links
-    DecorateLinks(evt, links);
-
-    // Remember Span attributes to be passed down to ETW on Span end
-    SetSpanAttributes(*currentSpan, evt);
-
-    if (cfg.enableActivityTracking)
-    {
-      // TODO: add support for options that are presently ignored :
-      // - options.kind
-      // - options.start_steady_time
-      // - options.start_system_time
-      etwProvider().write(provHandle, evt, ActivityIdPtr, RelatedActivityIdPtr, 1, encoding);
-    }
-
-    return result;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * Reports if the tracer is enabled or not. A disabled tracer will not create spans.
-   * Note: The etw_tracer currently does not accept a TracerConfig and can therefore not be disabled
-   * based on the instrumentation scope.
-   *
-   * The instrumentation authors should call this method before creating a spans to
-   * potentially avoid performing computationally expensive operations for disabled tracers.
-   *
-   * @since ABI_VERSION 2
-   */
-  virtual bool Enabled() const noexcept { return true; }
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-  /**
-   * @brief Force flush data to Tracer, spending up to given amount of microseconds to flush.
-   * NOTE: this method has no effect for the realtime streaming Tracer.
-   *
-   * @param timeout Allow Tracer to drop data if timeout is reached
-   * @return
-   */
-  void ForceFlushWithMicroseconds(uint64_t) noexcept override {}
-
-  /**
-   * @brief Close tracer, spending up to given amount of microseconds to flush and close.
-   * NOTE: This method decrements the reference count on current ETW Provider Handle and
-   * closes it if reference count on that provider handle is zero.
-   *
-   * @param  timeout Allow Tracer to drop data if timeout is reached.
-   * @return
-   */
-  void CloseWithMicroseconds(uint64_t) noexcept override
-  {
-    // Close once only
-    if (!isClosed_.exchange(true))
-    {
-      etwProvider().close(provHandle);
-    }
-  }
-#endif
-
-  /**
-   * @brief Add event data to span associated with tracer.
-   * @param span Parent span.
-   * @param name Event name.
-   * @param timestamp Event timestamp.
-   * @param attributes Event attributes.
-   * @return
-   */
-  void AddEvent(opentelemetry::trace::Span &span,
-                opentelemetry::nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept
-  {
-    // If RTTI is enabled by compiler, the below code modifies the attributes object passed as arg,
-    // which is sometime not desirable, set OPENTELEMETRY_NOT_USE_RTTI in application
-    // to avoid using RTTI in that case in below set of code.
-#if !defined OPENTELEMETRY_RTTI_ENABLED || defined OPENTELEMETRY_NOT_USE_RTTI
-    // Pass a copy converted to Properties object on stack
-    Properties evtCopy = attributes;
-    return AddEvent(span, name, timestamp, evtCopy);
-#else  // OPENTELEMETRY_RTTI_ENABLED is defined
-    opentelemetry::common::KeyValueIterable &attribs =
-        const_cast<opentelemetry::common::KeyValueIterable &>(attributes);
-    Properties *evt = dynamic_cast<Properties *>(&attribs);
-    if (evt != nullptr)
-    {
-      // Pass as a reference to original modifyable collection without creating a copy
-      return AddEvent(span, name, timestamp, *evt);
-    }
-    Properties evtCopy = attributes;
-    return AddEvent(span, name, timestamp, evtCopy);
-#endif
-  }
-
-  /**
-   * @brief Add event data to span associated with tracer.
-   * @param span Parent span.
-   * @param name Event name.
-   * @param timestamp Event timestamp.
-   * @param attributes Event attributes.
-   * @return
-   */
-  void AddEvent(opentelemetry::trace::Span &span,
-                opentelemetry::nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                Properties &evt) noexcept
-  {
-    // TODO: respect originating timestamp. Do we need to reserve
-    // a special 'Timestamp' field or is it an overkill? The delta
-    // between when `AddEvent` API is called and when ETW layer
-    // timestamp is appended is nanos- to micros-, thus handling
-    // the explicitly provided timestamp is only necessary in case
-    // if a process wants to submit back-dated or future-dated
-    // timestamp. Unless there is a strong ask from any ETW customer
-    // to have it, this feature (custom timestamp) remains unimplemented.
-    (void)timestamp;
-
-    const auto &cfg = GetConfiguration(tracerProvider_);
-
-    evt[ETW_FIELD_NAME] = name.data();
-
-    const auto &spanContext = span.GetContext();
-    if (cfg.enableSpanId)
-    {
-      evt[ETW_FIELD_SPAN_ID] = ToLowerBase16(spanContext.span_id());
-    }
-
-    if (cfg.enableTraceId)
-    {
-      evt[ETW_FIELD_TRACE_ID] = ToLowerBase16(spanContext.trace_id());
-    }
-
-    LPGUID ActivityIdPtr = nullptr;
-    GUID ActivityId;
-    if (cfg.enableActivityId)
-    {
-      if (CopySpanIdToActivityId(spanContext.span_id(), ActivityId))
-      {
-        ActivityIdPtr = &ActivityId;
-      }
-    }
-
-#ifdef HAVE_FIELD_TIME
-    {
-      auto timeNow        = std::chrono::system_clock::now().time_since_epoch();
-      auto nanosecs       = std::chrono::duration_cast<std::chrono::nanoseconds>(timeNow).count();
-      evt[ETW_FIELD_TIME] = utils::formatUtcTimestampNsAsISO8601(nanosecs);
-    }
-#endif
-
-    etwProvider().write(provHandle, evt, ActivityIdPtr, nullptr, 0, encoding);
-  }
-
-  /**
-   * @brief Add event data to span associated with tracer.
-   * @param span Span.
-   * @param name Event name.
-   * @param timestamp Event timestamp.
-   * @return
-   */
-  void AddEvent(opentelemetry::trace::Span &span,
-                opentelemetry::nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp) noexcept
-  {
-    AddEvent(span, name, timestamp, sdk::GetEmptyAttributes());
-  }
-
-  /**
-   * @brief Add event data to span associated with tracer.
-   * @param span Spab.
-   * @param name Event name.
-   */
-  void AddEvent(opentelemetry::trace::Span &span, nostd::string_view name)
-  {
-    AddEvent(span, name, std::chrono::system_clock::now(), sdk::GetEmptyAttributes());
-  }
-
-  /**
-   * @brief Tracer destructor.
-   */
-  virtual ~Tracer()
-  {
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-    CloseWithMicroseconds(0);
-#else
-    // Close once only
-    if (!isClosed_.exchange(true))
-    {
-      etwProvider().close(provHandle);
-    }
-#endif
-  }
-};
-
-/**
- * @brief etw::Span allows to send event data to ETW listener.
- */
-class Span : public opentelemetry::trace::Span
-{
-protected:
-  friend class Tracer;
-
-  /**
-   * @brief Span properties are attached on "Span" event on end of Span.
-   */
-  Properties attributes_;
-
-  opentelemetry::common::SystemTimestamp start_time_;
-  opentelemetry::common::SystemTimestamp end_time_;
-
-  opentelemetry::trace::StatusCode status_code_{opentelemetry::trace::StatusCode::kUnset};
-  std::string status_description_;
-
-  /**
-   * @brief Owner Tracer of this Span
-   */
-  Tracer &owner_;
-
-  /**
-   * @brief Span name.
-   */
-  nostd::string_view name_;
-
-  /**
-   * @brief Attribute indicating that the span has ended.
-   */
-  std::atomic<bool> has_ended_{false};
-
-  /**
-   * @brief Attribute indicating that the span has started.
-   */
-  std::atomic<bool> has_started_{false};
-
-  /**
-   * @brief Parent Span of this nested Span (optional)
-   */
-  Span *parent_{nullptr};
-
-  /**
-   * @brief Get Parent Span of this nested Span.
-   * @return Pointer to Parent or nullptr if no Parent.
-   */
-  Span *GetParent() const { return parent_; }
-
-  std::unique_ptr<opentelemetry::trace::SpanContext> context_;
-
-public:
-  /**
-   * @brief Update Properties object with current Span status
-   * @param evt
-   */
-  void UpdateStatus(Properties &evt)
-  {
-    /* Should we avoid populating this extra field if status is unset? */
-    if ((status_code_ == opentelemetry::trace::StatusCode::kUnset) ||
-        (status_code_ == opentelemetry::trace::StatusCode::kOk))
-    {
-      evt[ETW_FIELD_SUCCESS]       = "True";
-      evt[ETW_FIELD_STATUSCODE]    = uint32_t(status_code_);
-      evt[ETW_FIELD_STATUSMESSAGE] = status_description_;
-    }
-    else
-    {
-      evt[ETW_FIELD_SUCCESS]       = "False";
-      evt[ETW_FIELD_STATUSCODE]    = uint32_t(status_code_);
-      evt[ETW_FIELD_STATUSMESSAGE] = status_description_;
-    }
-  }
-
-  /**
-   * @brief Get start time of this Span.
-   * @return
-   */
-  opentelemetry::common::SystemTimestamp GetStartTime() { return start_time_; }
-
-  /**
-   * @brief Get end time of this Span.
-   * @return
-   */
-  opentelemetry::common::SystemTimestamp GetEndTime() { return end_time_; }
-
-  /**
-   * @brief Get Span Name.
-   * @return Span Name.
-   */
-  nostd::string_view GetName() const { return name_; }
-
-  /**
-   * @brief Span constructor
-   * @param owner Owner Tracer
-   * @param name Span name
-   * @param options Span options
-   * @param parent Parent Span (optional)
-   * @return
-   */
-  Span(Tracer &owner,
-       nostd::string_view name,
-       const opentelemetry::trace::StartSpanOptions &options,
-       std::unique_ptr<opentelemetry::trace::SpanContext> spanContext,
-       Span *parent = nullptr) noexcept
-      : opentelemetry::trace::Span(),
-        start_time_(std::chrono::system_clock::now()),
-        owner_(owner),
-        context_(std::move(spanContext)),
-        parent_(parent)
-  {
-    name_ = name;
-    UNREFERENCED_PARAMETER(options);
-  }
-
-  /**
-   * @brief Span Destructor
-   */
-  ~Span() { End(); }
-
-  /**
-   * @brief Add named event with no attributes.
-   * @param name Event name.
-   * @return
-   */
-  void AddEvent(nostd::string_view name) noexcept override { owner_.AddEvent(*this, name); }
-
-  /**
-   * @brief Add named event with custom timestamp.
-   * @param name
-   * @param timestamp
-   * @return
-   */
-  void AddEvent(nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp) noexcept override
-  {
-    owner_.AddEvent(*this, name, timestamp);
-  }
-
-  /**
-   * @brief Add named event with custom timestamp and attributes.
-   * @param name Event name.
-   * @param timestamp Event timestamp.
-   * @param attributes Event attributes.
-   * @return
-   */
-  void AddEvent(opentelemetry::nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept override
-  {
-    owner_.AddEvent(*this, name, timestamp, attributes);
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Add link (ABI).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  void AddLink(const trace::SpanContext & /*target*/,
-               const common::KeyValueIterable & /*attrs*/) noexcept override
-  {
-    // FIXME: What to do with links?
-  }
-
-  /**
-   * Add links (ABI).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  void AddLinks(const trace::SpanContextKeyValueIterable & /*links*/) noexcept override
-  {
-    // FIXME: What to do with links?
-  }
-#endif
-
-  /**
-   * @brief Set Span status
-   * @param code Span status code.
-   * @param description Span description.
-   * @return
-   */
-  void SetStatus(opentelemetry::trace::StatusCode code,
-                 nostd::string_view description) noexcept override
-  {
-    status_code_        = code;
-    status_description_ = description.data();
-  }
-
-  opentelemetry::trace::StatusCode GetStatus() { return status_code_; }
-
-  void SetAttributes(Properties attributes) { attributes_ = attributes; }
-
-  /**
-   * @brief Obtain span attributes specified at Span start.
-   * NOTE: please consider that this method is NOT thread-safe.
-   *
-   * @return ref to Properties collection
-   */
-  Properties &GetAttributes() { return attributes_; }
-
-  /**
-   * @brief Sets an attribute on the Span. If the Span previously contained a mapping
-   * for the key, the old value is replaced.
-   *
-   * @param key
-   * @param value
-   * @return
-   */
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override
-  {
-    // don't override fields propagated from span data.
-    if (key == ETW_FIELD_NAME || key == ETW_FIELD_SPAN_ID || key == ETW_FIELD_TRACE_ID ||
-        key == ETW_FIELD_SPAN_PARENTID)
-    {
-      return;
-    }
-    attributes_[std::string{key}].FromAttributeValue(value);
-  }
-
-  /**
-   * @brief Update Span name.
-   *
-   * NOTE: this method is a no-op for streaming implementation.
-   * We cannot change the Span name after it started streaming.
-   *
-   * @param name
-   * @return
-   */
-  void UpdateName(nostd::string_view) noexcept override
-  {
-    // We can't do that!
-    // name_ = name;
-  }
-
-  /**
-   * @brief End Span.
-   * @param EndSpanOptions
-   * @return
-   */
-  void End(const opentelemetry::trace::EndSpanOptions &options = {}) noexcept override
-  {
-    // TODO - explicitly setting end_time as 0 is not supported, and would be changed to
-    // current_time.
-    if (options.end_steady_time.time_since_epoch().count() == 0)
-    {
-      end_time_ = std::chrono::system_clock::now();
-    }
-    else
-    {
-      end_time_ =
-          opentelemetry::common::SystemTimestamp(options.end_steady_time.time_since_epoch());
-    }
-
-    if (!has_ended_.exchange(true))
-    {
-      owner_.EndSpan(*this, parent_, options);
-    }
-  }
-
-  /**
-   * @brief Obtain SpanContext
-   * @return
-   */
-  opentelemetry::trace::SpanContext GetContext() const noexcept override { return *context_.get(); }
-
-  /**
-   * @brief Check if Span is recording data.
-   * @return
-   */
-  bool IsRecording() const noexcept override
-  {
-    // For streaming implementation this should return the state of ETW Listener.
-    // In certain unprivileged environments, ex. containers, it is impossible
-    // to determine if a listener is registered. Thus, we always return true.
-    return true;
-  }
-
-  virtual void SetToken(nostd::unique_ptr<context::Token> &&token) noexcept
-  {
-    // TODO: not implemented
-    UNREFERENCED_PARAMETER(token);
-  }
-
-  /// <summary>
-  /// Get Owner tracer of this Span
-  /// </summary>
-  /// <returns></returns>
-  opentelemetry::trace::Tracer &tracer() const noexcept { return this->owner_; }
-};
-
-/**
- * @brief ETW TracerProvider
- */
-class TracerProvider : public opentelemetry::trace::TracerProvider
-{
-public:
-  /**
-   * @brief TracerProvider options supplied during initialization.
-   */
-  TelemetryProviderConfiguration config_;
-
-  /**
-   * @brief Sampler configured
-   *
-   */
-  std::unique_ptr<sdk::trace::Sampler> sampler_;
-
-  /**
-   * @brief Sampler configured
-   *
-   */
-  std::unique_ptr<opentelemetry::exporter::etw::TailSampler> tail_sampler_;
-
-  /**
-   * @brief IdGenerator for trace_id and span_id
-   *
-   */
-  std::unique_ptr<sdk::trace::IdGenerator> id_generator_;
-
-  /**
-   * @brief Construct instance of TracerProvider with given options
-   * @param options Configuration options
-   */
-  TracerProvider(
-      TelemetryProviderOptions options,
-      std::unique_ptr<sdk::trace::Sampler> sampler =
-          std::unique_ptr<sdk::trace::AlwaysOnSampler>(new sdk::trace::AlwaysOnSampler),
-      std::unique_ptr<sdk::trace::IdGenerator> id_generator =
-          std::unique_ptr<opentelemetry::sdk::trace::IdGenerator>(
-              new sdk::trace::ETWRandomIdGenerator()),
-      std::unique_ptr<opentelemetry::exporter::etw::TailSampler> tail_sampler =
-          std::unique_ptr<opentelemetry::exporter::etw::TailSampler>(new AlwaysOnTailSampler()))
-      : opentelemetry::trace::TracerProvider(),
-        sampler_{std::move(sampler)},
-        id_generator_{std::move(id_generator)},
-        tail_sampler_{std::move(tail_sampler)}
-  {
-    // By default we ensure that all events carry their with TraceId and SpanId
-    GetOption(options, "enableTraceId", config_.enableTraceId, true);
-    GetOption(options, "enableSpanId", config_.enableSpanId, true);
-
-    // Backwards-compatibility option that allows to reuse ETW-specific parenting described here:
-    // https://docs.microsoft.com/en-us/uwp/api/windows.foundation.diagnostics.loggingoptions.relatedactivityid
-    // https://docs.microsoft.com/en-us/windows/win32/api/evntprov/nf-evntprov-eventwritetransfer
-
-    // Emit separate events compatible with TraceLogging Activity/Start and Activity/Stop
-    // format for every Span emitted.
-    GetOption(options, "enableActivityTracking", config_.enableActivityTracking, false);
-
-    // Map current `SpanId` to ActivityId - GUID that uniquely identifies this activity. If NULL,
-    // ETW gets the identifier from the thread local storage. For details on getting this
-    // identifier, see EventActivityIdControl.
-    GetOption(options, "enableActivityId", config_.enableActivityId, false);
-
-    // Map parent `SpanId` to RelatedActivityId -  Activity identifier from the previous
-    // component. Use this parameter to link your component's events to the previous component's
-    // events.
-    GetOption(options, "enableRelatedActivityId", config_.enableRelatedActivityId, false);
-
-    // When a new Span is started, the current span automatically becomes its parent.
-    GetOption(options, "enableAutoParent", config_.enableAutoParent, false);
-
-    // Determines what encoding to use for ETW events: TraceLogging Dynamic, MsgPack, XML, etc.
-    config_.encoding = GetEncoding(options);
-  }
-
-  TracerProvider()
-      : opentelemetry::trace::TracerProvider(),
-        sampler_{std::unique_ptr<sdk::trace::AlwaysOnSampler>(new sdk::trace::AlwaysOnSampler)},
-        id_generator_{std::unique_ptr<opentelemetry::sdk::trace::IdGenerator>(
-            new sdk::trace::ETWRandomIdGenerator())},
-        tail_sampler_{
-            std::unique_ptr<opentelemetry::exporter::etw::TailSampler>(new AlwaysOnTailSampler())}
-  {
-    config_.enableTraceId           = true;
-    config_.enableSpanId            = true;
-    config_.enableActivityId        = false;
-    config_.enableActivityTracking  = false;
-    config_.enableRelatedActivityId = false;
-    config_.enableAutoParent        = false;
-    config_.encoding                = ETWProvider::EventFormat::ETW_MANIFEST;
-  }
-
-  /**
-   * @brief Obtain ETW Tracer.
-   * @param name ProviderId (instrumentation name) - Name or GUID
-   *
-   * @param args Additional arguments that controls `codec` of the provider.
-   * Possible values are:
-   * - "ETW"            - 'classic' Trace Logging Dynamic manifest ETW events.
-   * - "MSGPACK"        - MessagePack-encoded binary payload ETW events.
-   * - "XML"            - XML events (reserved for future use)
-   * @return
-   */
-  nostd::shared_ptr<opentelemetry::trace::Tracer> GetTracer(
-      nostd::string_view name,
-      nostd::string_view args       = "",
-      nostd::string_view schema_url = ""
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-      ,
-      // FIXME: This is a temporary workaround to avoid breaking compiling.
-      const common::KeyValueIterable * /*attributes*/ = nullptr
-#endif
-      ) noexcept override
-  {
-    UNREFERENCED_PARAMETER(args);
-    UNREFERENCED_PARAMETER(schema_url);
-    ETWProvider::EventFormat evtFmt = config_.encoding;
-    std::shared_ptr<opentelemetry::trace::Tracer> tracer{new (std::nothrow)
-                                                             Tracer(*this, name, evtFmt)};
-    return nostd::shared_ptr<opentelemetry::trace::Tracer>{tracer};
-  }
-};
-
-}  // namespace etw
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h
deleted file mode 100644
index b28f1a021..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-#pragma once
-
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-
-#include <mutex>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#include "opentelemetry/sdk/trace/exporter.h"
-
-#include "opentelemetry/exporters/etw/etw_config.h"
-#include "opentelemetry/exporters/etw/etw_provider.h"
-#include "opentelemetry/exporters/etw/etw_tracer.h"
-
-#include "opentelemetry/exporters/etw/utils.h"
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/utils.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/utils.h
deleted file mode 100644
index f3665efc8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/utils.h
+++ /dev/null
@@ -1,431 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-#include <chrono>
-#include <ctime>
-#include <iomanip>
-#include <locale>
-#include <sstream>
-#include <string>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/etw/uuid.h"
-#include "opentelemetry/version.h"
-
-#ifdef _WIN32
-#  include <Windows.h>
-#  include <evntprov.h>
-#  include <wincrypt.h>
-#  pragma comment(lib, "Advapi32.lib")
-#  pragma comment(lib, "Rpcrt4.lib")
-#  include <Objbase.h>
-#  pragma comment(lib, "Ole32.Lib")
-#else
-#  include <codecvt>
-#endif
-
-#if defined(ENABLE_ENV_PROPERTIES) || defined(HAVE_MSGPACK)
-#  include <nlohmann/json.hpp>
-#endif
-
-#if defined(ENABLE_ENV_PROPERTIES)
-#  include "etw_properties.h"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace utils
-{
-
-/// <summary>
-/// Compile-time constexpr djb2 hash function for strings
-/// </summary>
-static constexpr uint32_t hashCode(const char *str, uint32_t h = 0)
-{
-  return (uint32_t)(!str[h] ? 5381 : ((uint32_t)hashCode(str, h + 1) * (uint32_t)33) ^ str[h]);
-}
-
-#define CONST_UINT32_T(x) std::integral_constant<uint32_t, (uint32_t)x>::value
-
-#define CONST_HASHCODE(name) CONST_UINT32_T(OPENTELEMETRY_NAMESPACE::utils::hashCode(#name))
-
-#ifdef _WIN32
-
-/// <summary>
-/// Compute SHA-1 hash of input buffer and save to output
-/// </summary>
-/// <param name="pData">Input buffer</param>
-/// <param name="nData">Input buffer size</param>
-/// <param name="pHashedData">Output buffer</param>
-/// <param name="nHashedData">Output buffer size</param>
-/// <returns></returns>
-static inline bool sha1(const BYTE *pData, DWORD nData, BYTE *pHashedData, DWORD &nHashedData)
-{
-  bool bRet        = false;
-  HCRYPTPROV hProv = NULL;
-  HCRYPTHASH hHash = NULL;
-
-  if (!CryptAcquireContext(&hProv,                // handle of the CSP
-                           NULL,                  // key container name
-                           NULL,                  // CSP name
-                           PROV_RSA_FULL,         // provider type
-                           CRYPT_VERIFYCONTEXT))  // no key access is requested
-  {
-    bRet = false;
-    goto CleanUp;
-  }
-
-  if (!CryptCreateHash(hProv,      // handle of the CSP
-                       CALG_SHA1,  // hash algorithm to use
-                       0,          // hash key
-                       0,          // reserved
-                       &hHash))    //
-  {
-    bRet = false;
-    goto CleanUp;
-  }
-
-  if (!CryptHashData(hHash,  // handle of the HMAC hash object
-                     pData,  // message to hash
-                     nData,  // number of bytes of data to add
-                     0))     // flags
-  {
-    bRet = false;
-    goto CleanUp;
-  }
-
-  if (!CryptGetHashParam(hHash,         // handle of the HMAC hash object
-                         HP_HASHVAL,    // query on the hash value
-                         pHashedData,   // filled on second call
-                         &nHashedData,  // length, in bytes,of the hash
-                         0))
-  {
-    bRet = false;
-    goto CleanUp;
-  }
-
-  bRet = true;
-
-CleanUp:
-
-  if (hHash)
-  {
-    CryptDestroyHash(hHash);
-  }
-
-  if (hProv)
-  {
-    CryptReleaseContext(hProv, 0);
-  }
-  return bRet;
-}
-
-/// <summary>
-/// Convert UTF-8 string to UTF-16 wide string.
-///
-/// </summary>
-/// <param name="in"></param>
-/// <returns></returns>
-static inline std::wstring to_utf16_string(const std::string &in)
-{
-#  ifdef _WIN32
-  int in_length  = static_cast<int>(in.size());
-  int out_length = MultiByteToWideChar(CP_UTF8, 0, &in[0], in_length, NULL, 0);
-  std::wstring result(out_length, '\0');
-  MultiByteToWideChar(CP_UTF8, 0, &in[0], in_length, &result[0], out_length);
-  return result;
-#  else
-  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
-  return converter.from_bytes(in);
-#  endif
-}
-
-/// <summary>
-/// Transform ETW provider name to provider GUID as described here:
-/// https://blogs.msdn.microsoft.com/dcook/2015/09/08/etw-provider-names-and-guids/
-/// </summary>
-/// <param name="providerName"></param>
-/// <returns></returns>
-static inline GUID GetProviderGuid(const char *providerName)
-{
-  std::string name(providerName);
-  std::transform(name.begin(), name.end(), name.begin(),
-                 [](unsigned char c) { return (char)::toupper(c); });
-
-  size_t len      = name.length() * 2 + 0x10;
-  uint8_t *buffer = new uint8_t[len];
-  uint32_t num    = 0x482c2db2;
-  uint32_t num2   = 0xc39047c8;
-  uint32_t num3   = 0x87f81a15;
-  uint32_t num4   = 0xbfc130fb;
-
-  for (int i = 3; i >= 0; i--)
-  {
-    buffer[i]      = (uint8_t)num;
-    num            = num >> 8;
-    buffer[i + 4]  = (uint8_t)num2;
-    num2           = num2 >> 8;
-    buffer[i + 8]  = (uint8_t)num3;
-    num3           = num3 >> 8;
-    buffer[i + 12] = (uint8_t)num4;
-    num4           = num4 >> 8;
-  }
-
-  for (size_t j = 0; j < name.length(); j++)
-  {
-    buffer[((2 * j) + 0x10) + 1] = (uint8_t)name[j];
-    buffer[(2 * j) + 0x10]       = (uint8_t)(name[j] >> 8);
-  }
-
-  const size_t sha1_hash_size = 21;
-  uint8_t *buffer2            = new uint8_t[sha1_hash_size];
-  DWORD len2                  = sha1_hash_size;
-  sha1((const BYTE *)buffer, (DWORD)len, (BYTE *)buffer2, len2);
-
-  unsigned long a     = (((((buffer2[3] << 8) + buffer2[2]) << 8) + buffer2[1]) << 8) + buffer2[0];
-  unsigned short b    = (unsigned short)((buffer2[5] << 8) + buffer2[4]);
-  unsigned short num9 = (unsigned short)((buffer2[7] << 8) + buffer2[6]);
-
-  GUID guid;
-  guid.Data1    = a;
-  guid.Data2    = b;
-  guid.Data3    = (unsigned short)((num9 & 0xfff) | 0x5000);
-  guid.Data4[0] = buffer2[8];
-  guid.Data4[1] = buffer2[9];
-  guid.Data4[2] = buffer2[10];
-  guid.Data4[3] = buffer2[11];
-  guid.Data4[4] = buffer2[12];
-  guid.Data4[5] = buffer2[13];
-  guid.Data4[6] = buffer2[14];
-  guid.Data4[7] = buffer2[15];
-
-  delete[] buffer;
-  delete[] buffer2;
-
-  return guid;
-}
-#endif
-
-static inline int64_t getUtcSystemTimeMs()
-{
-#ifdef _WIN32
-  ULARGE_INTEGER now;
-  ::GetSystemTimeAsFileTime(reinterpret_cast<FILETIME *>(&now));
-  return (now.QuadPart - 116444736000000000ull) / 10000;
-#else
-  return std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
-#endif
-}
-
-static inline int64_t getUtcSystemTimeinTicks()
-{
-#ifdef _WIN32
-  FILETIME tocks;
-  ::GetSystemTimeAsFileTime(&tocks);
-  ULONGLONG ticks = (ULONGLONG(tocks.dwHighDateTime) << 32) | tocks.dwLowDateTime;
-  // number of days from beginning to 1601 multiplied by ticks per day
-  return ticks + 0x701ce1722770000ULL;
-#else
-  // On Un*x systems system_clock de-facto contains UTC time. Ref:
-  // https://en.cppreference.com/w/cpp/chrono/system_clock
-  // This UTC epoch contract has been signed in blood since C++20
-  std::chrono::time_point<std::chrono::system_clock> now = std::chrono::system_clock::now();
-  auto duration                                          = now.time_since_epoch();
-  auto millis    = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();
-  uint64_t ticks = millis;
-  ticks *= 10000;                 // convert millis to ticks (1 tick = 100ns)
-  ticks += 0x89F7FF5F7B58000ULL;  // UTC time 0 in .NET ticks
-  return ticks;
-#endif
-}
-
-constexpr unsigned int NANOSECS_PRECISION = 1000000000;
-/**
- * @brief Convert local system nanoseconds time to ISO8601 string UTC time
- *
- * @param timestampNs   Milliseconds since epoch in system time
- *
- * @return ISO8601 UTC string with nanoseconds
- */
-static inline std::string formatUtcTimestampNsAsISO8601(int64_t timestampNs)
-{
-  char buf[sizeof("YYYY-MM-DDTHH:MM:SS.sssssssssZ") + 1] = {0};
-#ifdef _WIN32
-  __time64_t seconds = static_cast<__time64_t>(timestampNs / NANOSECS_PRECISION);
-  int nanoseconds    = static_cast<int>(timestampNs % NANOSECS_PRECISION);
-  tm tm;
-  if (::_gmtime64_s(&tm, &seconds) != 0)
-  {
-    memset(&tm, 0, sizeof(tm));
-  }
-  ::_snprintf_s(buf, _TRUNCATE, "%04d-%02d-%02dT%02d:%02d:%02d.%09dZ", 1900 + tm.tm_year,
-                1 + tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, nanoseconds);
-#else
-  time_t seconds  = static_cast<time_t>(timestampNs / NANOSECS_PRECISION);
-  int nanoseconds = static_cast<int>(timestampNs % NANOSECS_PRECISION);
-  tm tm;
-  bool valid = (gmtime_r(&seconds, &tm) != NULL);
-  if (!valid)
-  {
-    memset(&tm, 0, sizeof(tm));
-  }
-  (void)snprintf(buf, sizeof(buf), "%04d-%02d-%02dT%02d:%02d:%02d.%09dZ", 1900 + tm.tm_year,
-                 1 + tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, nanoseconds);
-#endif
-  return buf;
-}
-
-#if defined(ENABLE_ENV_PROPERTIES)
-
-static inline void PopulateAttribute(nlohmann::json &attribute,
-                                     nostd::string_view key,
-                                     const exporter::etw::PropertyValue &value)
-{
-  if (nostd::holds_alternative<bool>(value))
-  {
-    attribute[key.data()] = nostd::get<bool>(value);
-  }
-  else if (nostd::holds_alternative<int>(value))
-  {
-    attribute[key.data()] = nostd::get<int>(value);
-  }
-  else if (nostd::holds_alternative<int64_t>(value))
-  {
-    attribute[key.data()] = nostd::get<int64_t>(value);
-  }
-  else if (nostd::holds_alternative<unsigned int>(value))
-  {
-    attribute[key.data()] = nostd::get<unsigned int>(value);
-  }
-  else if (nostd::holds_alternative<uint64_t>(value))
-  {
-    attribute[key.data()] = nostd::get<uint64_t>(value);
-  }
-  else if (nostd::holds_alternative<double>(value))
-  {
-    attribute[key.data()] = nostd::get<double>(value);
-  }
-  else if (nostd::holds_alternative<const char *>(value))
-  {
-    attribute[key.data()] = std::string(nostd::get<const char *>(value));
-  }
-  else if (nostd::holds_alternative<std::string>(value))
-  {
-    attribute[key.data()] = nostd::get<std::string>(value);
-  }
-  else if (nostd::holds_alternative<std::vector<uint8_t>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<std::vector<uint8_t>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<bool>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<std::vector<bool>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<int>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<std::vector<int>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<int64_t>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<std::vector<int64_t>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<unsigned int>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<std::vector<unsigned int>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<uint64_t>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<std::vector<uint64_t>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<double>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<std::vector<double>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<std::string>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<std::vector<std::string>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-}
-
-#endif  // defined(ENABLE_ENV_PROPERTIES)
-
-#if defined(HAVE_MSGPACK)
-
-static inline nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>
-get_msgpack_eventtimeext(int32_t seconds = 0, int32_t nanoseconds = 0)
-{
-  if ((seconds == 0) && (nanoseconds == 0))
-  {
-    std::chrono::system_clock::time_point tp = std::chrono::system_clock::now();
-    auto duration                            = tp.time_since_epoch();
-    seconds =
-        static_cast<int32_t>(std::chrono::duration_cast<std::chrono::seconds>(duration).count());
-    nanoseconds = static_cast<int32_t>(
-        std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count() % 1000000000);
-  }
-
-  uint64_t timestamp =
-      ((seconds / 100) & ((1ull << 34) - 1)) |
-      (((seconds % 100 * 10000000 + nanoseconds / 100) & ((1ull << 30) - 1)) << 34);
-
-  nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>> ts{std::vector<uint8_t>(8)};
-
-  *reinterpret_cast<uint64_t *>(ts.data()) = timestamp;
-  ts.set_subtype(0x00);
-
-  return ts;
-}
-
-static inline nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>
-GetMsgPackEventTimeFromSystemTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  return get_msgpack_eventtimeext(
-      // Add all whole seconds to the event time
-      static_cast<int32_t>(
-          std::chrono::duration_cast<std::chrono::seconds>(timestamp.time_since_epoch()).count()),
-      // Add any remaining nanoseconds past the last whole second
-      std::chrono::duration_cast<std::chrono::nanoseconds>(timestamp.time_since_epoch()).count() %
-          1000000000);
-}
-
-#endif  // defined(HAVE_MSGPACK)
-
-};  // namespace utils
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/uuid.h b/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/uuid.h
deleted file mode 100644
index dfe749d83..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/include/opentelemetry/exporters/etw/uuid.h
+++ /dev/null
@@ -1,412 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#include <cstddef>
-#include <cstring>
-#include <functional>
-#include <initializer_list>
-#include <string>
-#include <vector>
-
-#ifdef _WIN32
-#  include "Windows.h"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace utils
-{
-
-/// <summary>
-/// The UUID structure represents the portable cross-platform implementation of a GUID (Globally
-/// Unique ID).
-/// </summary>
-/// <remarks>
-/// UUIDs identify objects such as interfaces, manager entry-point vectors (EPVs), and class
-/// objects. A UUID is a 128-bit value consisting of one group of eight hexadecimal digits, followed
-/// by three groups of four hexadecimal digits, each followed by one group of 12 hexadecimal digits.
-/// </remarks>
-#pragma pack(push) /* push current alignment to stack */
-#pragma pack(1)    /* set alignment to 1 byte boundary */
-struct UUID
-{
-  /// <summary>
-  /// Specifies the first eight hexadecimal digits of the GUID.
-  /// </summary>
-  uint32_t Data1;
-
-  /// <summary>
-  /// Specifies the first group of four hexadecimal digits.
-  ///</summary>
-  uint16_t Data2;
-
-  /// <summary>
-  /// Specifies the second group of four hexadecimal digits.
-  /// </summary>
-  uint16_t Data3;
-
-  /// <summary>
-  /// An array of eight bytes.
-  /// The first two bytes contain the third group of four hexadecimal digits.
-  /// The remaining six bytes contain the final 12 hexadecimal digits.
-  /// </summary>
-  uint8_t Data4[8];
-
-  /// <summary>
-  /// The default UUID constructor.
-  /// Creates a null instance of the UUID object (initialized to all zeros).
-  /// {00000000-0000-0000-0000-000000000000}.
-  /// </summary>
-  UUID() : Data1(0), Data2(0), Data3(0)
-  {
-    for (size_t i = 0; i < 8; i++)
-    {
-      Data4[i] = 0;
-    }
-  }
-
-  /// <summary>
-  /// A constructor that creates a UUID object from a hyphenated string as defined by
-  /// https://tools.ietf.org/html/rfc4122#page-4
-  /// </summary>
-  /// <param name="uuid_string">A hyphenated string that contains the UUID (curly braces
-  /// optional).</param>
-  UUID(const char *uuid_string)
-  {
-    const char *str = uuid_string;
-    // Skip curly brace
-    if (str[0] == '{')
-    {
-      str++;
-    }
-    // Convert to set of integer values
-    unsigned long p0;
-    unsigned int p1, p2, p3, p4, p5, p6, p7, p8, p9, p10;
-    if (
-        // Parse input with dashes
-        (11 == sscanf_s(str, "%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", &p0, &p1, &p2,
-                        &p3, &p4, &p5, &p6, &p7, &p8, &p9, &p10)) ||
-        // Parse input without dashes
-        (11 == sscanf_s(str, "%08lX%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X", &p0, &p1, &p2, &p3,
-                        &p4, &p5, &p6, &p7, &p8, &p9, &p10)))
-    {
-      Data1    = static_cast<uint32_t>(p0);
-      Data2    = static_cast<uint16_t>(p1);
-      Data3    = static_cast<uint16_t>(p2);
-      Data4[0] = static_cast<uint8_t>(p3);
-      Data4[1] = static_cast<uint8_t>(p4);
-      Data4[2] = static_cast<uint8_t>(p5);
-      Data4[3] = static_cast<uint8_t>(p6);
-      Data4[4] = static_cast<uint8_t>(p7);
-      Data4[5] = static_cast<uint8_t>(p8);
-      Data4[6] = static_cast<uint8_t>(p9);
-      Data4[7] = static_cast<uint8_t>(p10);
-    }
-    else  // Invalid input--use a safe default value
-    {
-      Data1    = 0;
-      Data2    = 0;
-      Data3    = 0;
-      Data4[0] = 0;
-      Data4[1] = 0;
-      Data4[2] = 0;
-      Data4[3] = 0;
-      Data4[4] = 0;
-      Data4[5] = 0;
-      Data4[6] = 0;
-      Data4[7] = 0;
-    }
-  }
-
-  /// <summary>
-  /// A constructor that creates a UUID object from a byte array.
-  /// </summary>
-  /// <param name="guid_bytes">A byte array.</param>
-  /// <param name="bigEndian">
-  /// A boolean value that specifies the byte order.<br>
-  /// A value of <i>true</i> specifies the more natural human-readable order.<br>
-  /// A value of <i>false</i> (the default) specifies the same order as the .NET GUID constructor.
-  /// </param>
-  UUID(const uint8_t guid_bytes[16], bool bigEndian = false)
-  {
-    if (bigEndian)
-    {
-      /* Use big endian - human-readable */
-      // Part 1
-      Data1 = guid_bytes[3];
-      Data1 |= ((uint32_t)(guid_bytes[2])) << 8;
-      Data1 |= ((uint32_t)(guid_bytes[1])) << 16;
-      Data1 |= ((uint32_t)(guid_bytes[0])) << 24;
-      // Part 2
-      Data2 = guid_bytes[5];
-      Data2 |= ((uint16_t)(guid_bytes[4])) << 8;
-      // Part 3
-      Data3 = guid_bytes[7];
-      Data3 |= ((uint16_t)(guid_bytes[6])) << 8;
-    }
-    else
-    {
-      /* Use little endian - the same order as .NET C# Guid() class uses */
-      // Part 1
-      Data1 = guid_bytes[0];
-      Data1 |= ((uint32_t)(guid_bytes[1])) << 8;
-      Data1 |= ((uint32_t)(guid_bytes[2])) << 16;
-      Data1 |= ((uint32_t)(guid_bytes[3])) << 24;
-      // Part 2
-      Data2 = guid_bytes[4];
-      Data2 |= ((uint16_t)(guid_bytes[5])) << 8;
-      // Part 3
-      Data3 = guid_bytes[6];
-      Data3 |= ((uint16_t)(guid_bytes[7])) << 8;
-    }
-    // Part 4
-    for (size_t i = 0; i < 8; i++)
-    {
-      Data4[i] = guid_bytes[8 + i];
-    }
-  }
-
-  /// <summary>
-  /// A constructor that creates a UUID object from three integers and a byte array.
-  /// </summary>
-  /// <param name="d1">An integer that specifies the first eight hexadecimal digits of the
-  /// UUID.</param> <param name="d2">An integer that specifies the first group of four hexadecimal
-  /// digits.</param> <param name="d3">An integer that specifies the second group of four
-  /// hexadecimal digits.</param> <param name="v">A reference to an array of eight bytes. The first
-  /// two bytes contain the third group of four hexadecimal digits. The remaining six bytes contain
-  /// the final 12 hexadecimal digits.</param>
-  UUID(int d1, int d2, int d3, const std::initializer_list<uint8_t> &v)
-      : Data1((uint32_t)d1), Data2((uint16_t)d2), Data3((uint16_t)d3)
-  {
-    size_t i = 0;
-    for (auto val : v)
-    {
-      Data4[i] = val;
-      i++;
-    }
-  }
-
-  /// <summary>
-  /// The UUID copy constructor.
-  /// </summary>
-  /// <param name="uuid">A UUID object.</param>
-  UUID(const UUID &uuid)
-  {
-    this->Data1 = uuid.Data1;
-    this->Data2 = uuid.Data2;
-    this->Data3 = uuid.Data3;
-    memcpy(&(this->Data4[0]), &(uuid.Data4[0]), sizeof(uuid.Data4));
-  }
-
-#ifdef _WIN32
-
-  /// <summary>
-  /// A constructor that creates a UUID object from a Windows GUID object.
-  /// </summary>
-  /// <param name="guid">A Windows GUID object.</param>
-  UUID(GUID guid)
-  {
-    this->Data1 = guid.Data1;
-    this->Data2 = guid.Data2;
-    this->Data3 = guid.Data3;
-    std::memcpy(&(this->Data4[0]), &(guid.Data4[0]), sizeof(guid.Data4));
-  }
-
-  /// <summary>
-  /// Converts a standard vector of bytes into a Windows GUID object.
-  /// </summary>
-  /// <param name="bytes">A standard vector of bytes.</param>
-  /// <returns>A GUID.</returns>
-  static GUID to_GUID(std::vector<uint8_t> const &bytes)
-  {
-    UUID temp_t = UUID(bytes.data());
-    GUID temp;
-    temp.Data1 = temp_t.Data1;
-    temp.Data2 = temp_t.Data2;
-    temp.Data3 = temp_t.Data3;
-    for (size_t i = 0; i < 8; i++)
-    {
-      temp.Data4[i] = temp_t.Data4[i];
-    }
-    return temp;
-  }
-
-  GUID to_GUID()
-  {
-    GUID temp;
-    temp.Data1 = Data1;
-    temp.Data2 = Data2;
-    temp.Data3 = Data3;
-    for (size_t i = 0; i < 8; i++)
-    {
-      temp.Data4[i] = Data4[i];
-    }
-    return temp;
-  }
-
-#endif
-
-  /// <summary>
-  /// Converts this UUID to an array of bytes.
-  /// </summary>
-  /// <param name="guid_bytes">A uint8_t array of 16 bytes.</param>
-  void to_bytes(uint8_t (&guid_bytes)[16]) const
-  {
-    // Part 1
-    guid_bytes[0] = (uint8_t)((Data1) & 0xFF);
-    guid_bytes[1] = (uint8_t)((Data1 >> 8) & 0xFF);
-    guid_bytes[2] = (uint8_t)((Data1 >> 16) & 0xFF);
-    guid_bytes[3] = (uint8_t)((Data1 >> 24) & 0xFF);
-    // Part 2
-    guid_bytes[4] = (uint8_t)((Data2) & 0xFF);
-    guid_bytes[5] = (uint8_t)((Data2 >> 8) & 0xFF);
-    // Part 3
-    guid_bytes[6] = (uint8_t)((Data3) & 0xFF);
-    guid_bytes[7] = (uint8_t)((Data3 >> 8) & 0xFF);
-    // Part 4
-    for (size_t i = 0; i < 8; i++)
-    {
-      guid_bytes[8 + i] = Data4[i];
-    }
-  }
-
-  /// <summary>
-  /// Convert this UUID object to a string.
-  /// </summary>
-  /// <returns>This UUID object in a string.</returns>
-  std::string to_string() const
-  {
-    static char inttoHex[16] = {'0', '1', '2', '3', '4', '5', '6', '7',
-                                '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
-    const unsigned buffSize = 36 + 1;  // 36 + null-terminator
-    char buf[buffSize]      = {0};
-
-    int test = (Data1 >> 28 & 0x0000000F);
-    buf[0]   = inttoHex[test];
-    test     = (int)(Data1 >> 24 & 0x0000000F);
-    buf[1]   = inttoHex[test];
-    test     = (int)(Data1 >> 20 & 0x0000000F);
-    buf[2]   = inttoHex[test];
-    test     = (int)(Data1 >> 16 & 0x0000000F);
-    buf[3]   = inttoHex[test];
-    test     = (int)(Data1 >> 12 & 0x0000000F);
-    buf[4]   = inttoHex[test];
-    test     = (int)(Data1 >> 8 & 0x0000000F);
-    buf[5]   = inttoHex[test];
-    test     = (int)(Data1 >> 4 & 0x0000000F);
-    buf[6]   = inttoHex[test];
-    test     = (int)(Data1 & 0x0000000F);
-    buf[7]   = inttoHex[test];
-    buf[8]   = '-';
-    test     = (int)(Data2 >> 12 & 0x000F);
-    buf[9]   = inttoHex[test];
-    test     = (int)(Data2 >> 8 & 0x000F);
-    buf[10]  = inttoHex[test];
-    test     = (int)(Data2 >> 4 & 0x000F);
-    buf[11]  = inttoHex[test];
-    test     = (int)(Data2 & 0x000F);
-    buf[12]  = inttoHex[test];
-    buf[13]  = '-';
-    test     = (int)(Data3 >> 12 & 0x000F);
-    buf[14]  = inttoHex[test];
-    test     = (int)(Data3 >> 8 & 0x000F);
-    buf[15]  = inttoHex[test];
-    test     = (int)(Data3 >> 4 & 0x000F);
-    buf[16]  = inttoHex[test];
-    test     = (int)(Data3 & 0x000F);
-    buf[17]  = inttoHex[test];
-    buf[18]  = '-';
-    test     = (int)(Data4[0] >> 4 & 0x0F);
-    buf[19]  = inttoHex[test];
-    test     = (int)(Data4[0] & 0x0F);
-    buf[20]  = inttoHex[test];
-    test     = (int)(Data4[1] >> 4 & 0x0F);
-    buf[21]  = inttoHex[test];
-    test     = (int)(Data4[1] & 0x0F);
-    buf[22]  = inttoHex[test];
-    buf[23]  = '-';
-    test     = (int)(Data4[2] >> 4 & 0x0F);
-    buf[24]  = inttoHex[test];
-    test     = (int)(Data4[2] & 0x0F);
-    buf[25]  = inttoHex[test];
-    test     = (int)(Data4[3] >> 4 & 0x0F);
-    buf[26]  = inttoHex[test];
-    test     = (int)(Data4[3] & 0x0F);
-    buf[27]  = inttoHex[test];
-    test     = (int)(Data4[4] >> 4 & 0x0F);
-    buf[28]  = inttoHex[test];
-    test     = (int)(Data4[4] & 0x0F);
-    buf[29]  = inttoHex[test];
-    test     = (int)(Data4[5] >> 4 & 0x0F);
-    buf[30]  = inttoHex[test];
-    test     = (int)(Data4[5] & 0x0F);
-    buf[31]  = inttoHex[test];
-    test     = (int)(Data4[6] >> 4 & 0x0F);
-    buf[32]  = inttoHex[test];
-    test     = (int)(Data4[6] & 0x0F);
-    buf[33]  = inttoHex[test];
-    test     = (int)(Data4[7] >> 4 & 0x0F);
-    buf[34]  = inttoHex[test];
-    test     = (int)(Data4[7] & 0x0F);
-    buf[35]  = inttoHex[test];
-    buf[36]  = 0;
-
-    return std::string(buf);
-  }
-
-  /// <summary>
-  /// Calculates the size of this UUID object.
-  /// The output from this method is compatible with std::unordered_map.
-  /// </summary>
-  /// <returns>The size of the UUID object in bytes.</returns>
-  size_t Hash() const
-  {
-    // Compute individual hash values for Data1, Data2, Data3, and parts of Data4
-    size_t res = 17;
-    res        = res * 31 + Data1;
-    res        = res * 31 + Data2;
-    res        = res * 31 + Data3;
-    res        = res * 31 + (Data4[0] << 24 | Data4[1] << 16 | Data4[6] << 8 | Data4[7]);
-    return res;
-  }
-
-  /// <summary>
-  /// Tests to determine whether two UUID objects are equivalent (needed for maps).
-  /// </summary>
-  /// <returns>A boolean value that indicates success or failure.</returns>
-  bool operator==(UUID const &other) const
-  {
-    return Data1 == other.Data1 && Data2 == other.Data2 && Data3 == other.Data3 &&
-           (0 == memcmp(Data4, other.Data4, sizeof(Data4)));
-  }
-
-  /// <summary>
-  /// Tests to determine how to sort 2 UUID objects
-  /// </summary>
-  /// <returns>A boolean value that indicates success or failure.</returns>
-  bool operator<(UUID const &other) const
-  {
-    return Data1 < other.Data1 || Data2 < other.Data2 || Data3 == other.Data3 ||
-           (memcmp(Data4, other.Data4, sizeof(Data4)) < 0);
-  }
-};
-#pragma pack(pop) /* restore original alignment from stack */
-
-/// <summary>
-/// Declare UUIDComparer as the Comparer when using UUID as a key in a map or set
-/// </summary>
-struct UUIDComparer : std::less<UUID>
-{
-  inline size_t operator()(UUID const &key) const { return key.Hash(); }
-
-  inline bool operator()(UUID const &lhs, UUID const &rhs) const { return lhs.Hash() < rhs.Hash(); }
-};
-
-}  // namespace utils
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_logger_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_logger_test.cc
deleted file mode 100644
index f901d784b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_logger_test.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef _WIN32
-
-#  include <gtest/gtest.h>
-#  include <map>
-#  include <set>
-#  include <string>
-
-#  define OPENTELEMETRY_ATTRIBUTE_TIMESTAMP_PREVIEW
-
-#  include "opentelemetry/exporters/etw/etw_logger_exporter.h"
-#  include "opentelemetry/sdk/trace/simple_processor.h"
-
-using namespace OPENTELEMETRY_NAMESPACE;
-
-using namespace opentelemetry::exporter::etw;
-
-// The ETW provider ID is {4533CB59-77E2-54E9-E340-F0F0549058B7}
-const char *kGlobalProviderName = "OpenTelemetry-ETW-TLD";
-
-/**
- * @brief Logger test with name and unstructured text
- * {
- * "Timestamp": "2021-09-30T16:40:40.0820563-07:00",
- * "ProviderName": "OpenTelemetry-ETW-TLD",
- * "Id": 2,
- * "Message": null,
- * "ProcessId": 23180,
- * "Level": "Always",
- * "Keywords": "0x0000000000000000",
- * "EventName": "Log",
- * "ActivityID": null,
- * "RelatedActivityID": null,
- * "Payload": {
- *   "Name": "test",
- *   "SpanId": "0000000000000000",
- *   "Timestamp": "2021-09-30T23:40:40.066411500Z",
- *   "TraceId": "00000000000000000000000000000000",
- *   "_name": "Log",
- *   "body": "This is test message",
- *   "severityNumber": 5,
- *   "severityText": "DEBUG"
- * }
- * }
- */
-
-TEST(ETWLogger, LoggerCheckWithBody)
-{
-  std::string providerName = kGlobalProviderName;  // supply unique instrumentation name here
-  exporter::etw::LoggerProvider lp;
-
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-  auto logger        = lp.GetLogger(providerName, schema_url);
-  Properties attribs = {{"attrib1", 1}, {"attrib2", 2}};
-  EXPECT_NO_THROW(
-      logger->EmitLogRecord(opentelemetry::logs::Severity::kDebug, "This is test log body"));
-}
-
-/**
- * @brief Logger Test with structured attributes
- *
- * Example Event for below test:
- * {
- *  "Timestamp": "2021-09-30T15:04:15.4227815-07:00",
- *  "ProviderName": "OpenTelemetry-ETW-TLD",
- * "Id": 1,
- * "Message": null,
- * "ProcessId": 33544,
- * "Level": "Always",
- * "Keywords": "0x0000000000000000",
- * "EventName": "Log",
- * "ActivityID": null,
- * "RelatedActivityID": null,
- * "Payload": {
- *  "Name": "test",
- *   "SpanId": "0000000000000000",
- *  "Timestamp": "2021-09-30T22:04:15.066411500Z",
- *   "TraceId": "00000000000000000000000000000000",
- *   "_name": "Log",
- *  "attrib1": 1,
- *   "attrib2": 2,
- *   "body": "",
- *   "severityNumber": 5,
- *   "severityText": "DEBUG"
- * }
- * }
- *
- */
-
-TEST(ETWLogger, LoggerCheckWithAttributes)
-{
-  std::string providerName = kGlobalProviderName;  // supply unique instrumentation name here
-  exporter::etw::LoggerProvider lp;
-
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-  auto logger = lp.GetLogger(providerName, schema_url);
-  // Log attributes
-  Properties attribs = {{"attrib1", 1}, {"attrib2", 2}};
-  EXPECT_NO_THROW(logger->EmitLogRecord(opentelemetry::logs::Severity::kDebug,
-                                        opentelemetry::common::MakeAttributes(attribs)));
-}
-
-/**
- * @brief Logger Test with structured attributes
- *
- * Example Event for below test:
- * {
- *  "Timestamp": "2024-06-02T15:04:15.4227815-07:00",
- *  "ProviderName": "OpenTelemetry-ETW-TLD",
- *  "Id": 1,
- *  "Message": null,
- *  "ProcessId": 37696,
- *  "Level": "Always",
- *  "Keywords": "0x0000000000000000",
- *  "EventName": "table1",
- *  "ActivityID": null,
- *  "RelatedActivityID": null,
- *  "Payload": {
- *   "SpanId": "0000000000000000",
- *   "Timestamp": "2021-09-30T22:04:15.066411500Z",
- *   "TraceId": "00000000000000000000000000000000",
- *   "_name": "table1",
- *   "attrib1": 1,
- *   "attrib2": "value2",
- *   "body": "This is a debug log body",
- *   "severityNumber": 5,
- *   "severityText": "DEBUG"
- *  }
- * }
- *
- */
-
-TEST(ETWLogger, LoggerCheckWithTableNameMappings)
-{
-  std::string providerName = kGlobalProviderName;  // supply unique instrumentation name here
-  std::map<std::string, std::string> tableNameMappings = {{"name1", "table1"}, {"name2", "table2"}};
-  exporter::etw::TelemetryProviderOptions options      = {{"enableTableNameMappings", true},
-                                                          {"tableNameMappings", tableNameMappings}};
-  exporter::etw::LoggerProvider lp{options};
-
-  auto logger = lp.GetLogger(providerName, "name1");
-
-  // Log attributes
-  Properties attribs = {{"attrib1", 1}, {"attrib2", "value2"}};
-
-  EXPECT_NO_THROW(
-      logger->Debug("This is a debug log body", opentelemetry::common::MakeAttributes(attribs)));
-}
-
-/**
- * @brief Logger Test with structured attributes
- *
- * Example Event for below test:
- * {
- *  "Timestamp": "2024-06-02T15:04:15.4227815-07:00",
- *  "ProviderName": "OpenTelemetry-ETW-TLD",
- *  "Id": 1,
- *  "Message": null,
- *  "ProcessId": 37696,
- *  "Level": "Always",
- *  "Keywords": "0x0000000000000000",
- *  "EventName": "table1",
- *  "ActivityID": null,
- *  "RelatedActivityID": null,
- *  "Payload": {
- *   "SpanId": "0000000000000000",
- *   "Timestamp": "2021-09-30T22:04:15.066411500Z",
- *   "TraceId": "00000000000000000000000000000000",
- *   "_name": "table1",
- *   "tiemstamp1": "2025-02-20T19:18:11.048166700Z",
- *   "attrib2": "value2",
- *   "body": "This is a debug log body",
- *   "severityNumber": 5,
- *   "severityText": "DEBUG"
- *  }
- * }
- *
- */
-
-TEST(ETWLogger, LoggerCheckWithTimestampAttributes)
-{
-  std::string providerName = kGlobalProviderName;  // supply unique instrumentation name here
-  std::set<std::string> timestampAttributes       = {{"timestamp1"}};
-  exporter::etw::TelemetryProviderOptions options = {{"timestampAttributes", timestampAttributes}};
-  exporter::etw::LoggerProvider lp{options};
-
-  auto logger = lp.GetLogger(providerName, "name1");
-
-  // Log attributes
-  Properties attribs = {{"timestamp1", 133845526910481667ULL}, {"attrib2", "value2"}};
-
-  EXPECT_NO_THROW(
-      logger->Debug("This is a debug log body", opentelemetry::common::MakeAttributes(attribs)));
-}
-
-#endif  // _WIN32
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_perf_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_perf_test.cc
deleted file mode 100644
index 0c54aa1e9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_perf_test.cc
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef _WIN32
-
-#  include <benchmark/benchmark.h>
-#  include <gtest/gtest.h>
-#  include <map>
-#  include <string>
-#  include <unordered_map>
-
-#  include "opentelemetry/exporters/etw/etw_tracer_exporter.h"
-#  include "opentelemetry/sdk/trace/simple_processor.h"
-
-using namespace OPENTELEMETRY_NAMESPACE;
-
-using namespace opentelemetry::exporter::etw;
-
-namespace
-{
-static constexpr const char *providerName = "OpenTelemetry-ETW-StressTest";
-
-static exporter::etw::TelemetryProviderOptions providerOptions = {
-    {"enableTraceId", false},
-    {"enableSpanId", false},
-    {"enableActivityId", false},
-    {"enableRelatedActivityId", false},
-    {"enableAutoParent", false}};
-
-class ETWProviderStressTest
-{
-  exporter::etw::TracerProvider provider_;
-  std::string mode_;
-  nostd::shared_ptr<trace::Tracer> tracer_;
-  nostd::shared_ptr<trace::Span> span_;
-
-public:
-  /**
-   * @brief Construct ETW Provider stress test object
-   * @param mode Operational mode: "TLD" or "MsgPack"
-   */
-  ETWProviderStressTest(std::string mode = "TLD") : mode_(mode), provider_(providerOptions) {}
-
-  /**
-   * @brief Initializer tracer and start a Span
-   */
-  void Initialize()
-  {
-    tracer_ = provider_.GetTracer(providerName, mode_);
-    span_   = tracer_->StartSpan("Span");
-  }
-
-  /**
-   * @brief Obtain the tracer
-   */
-  nostd::shared_ptr<trace::Tracer> GetTracer() { return tracer_; }
-
-  /**
-   * @brief Add event using Properties container
-   */
-  bool AddProperties()
-  {
-    std::string eventName = "MyEvent";
-    Properties event      = {{"uint32Key", (uint32_t)1234},
-                             {"uint64Key", (uint64_t)1234567890},
-                             {"strKey", "someValue"}};
-    span_->AddEvent(eventName, event);
-    return true;
-  }
-
-  /**
-   * @brief Add event using static preallocated "reusable" Properties container.
-   * This approach works well for single-threaded flows, but may not be safe in
-   * some multithreaded scenarios in case if reusable `Properties` get concurrently
-   * modified by different threads (writes to Properties are not thread-safe).
-   */
-  bool AddPropertiesStatic()
-  {
-    std::string eventName   = "MyEvent";
-    static Properties event = {{"uint32Key", (uint32_t)1234},
-                               {"uint64Key", (uint64_t)1234567890},
-                               {"strKey", "someValue"}};
-    span_->AddEvent(eventName, event);
-    return true;
-  }
-
-  /**
-   * @brief Add event using initializer list
-   */
-  bool AddInitList()
-  {
-    std::string eventName = "MyEvent";
-    span_->AddEvent(eventName, {{"uint32Key", (uint32_t)1234},
-                                {"uint64Key", (uint64_t)1234567890},
-                                {"strKey", "someValue"}});
-    return true;
-  }
-
-  /**
-   * @brief Add event using unordered_map
-   */
-  bool AddMap()
-  {
-    std::string eventName                                      = "MyEvent";
-    std::unordered_map<const char *, common::AttributeValue> m = {
-        {"uint32Key", (uint32_t)1234},
-        {"uint64Key", (uint64_t)1234567890},
-        {"strKey", "someValue"}};
-    span_->AddEvent(eventName, m);
-    return true;
-  }
-
-  /**
-   * @brief End Span and close tracer.
-   */
-  void Teardown()
-  {
-    span_->End();
-#  if OPENTELEMETRY_ABI_VERSION_NO == 1
-    tracer_->CloseWithMicroseconds(0);
-#  endif
-  }
-};
-
-ETWProviderStressTest provider;
-
-/**
- * @brief Create Properties and AddEvent(Properties) to Tracer
- * @param state Benchmark state.
- */
-void BM_AddPropertiesToTracer(benchmark::State &state)
-{
-  provider.Initialize();
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(provider.AddProperties());
-  }
-  provider.Teardown();
-}
-BENCHMARK(BM_AddPropertiesToTracer);
-
-/**
- * @brief Create static Properties and AddEvent(Properties) to Tracer
- * @param state Benchmark state.
- */
-void BM_AddPropertiesStaticToTracer(benchmark::State &state)
-{
-  provider.Initialize();
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(provider.AddPropertiesStatic());
-  }
-  provider.Teardown();
-}
-BENCHMARK(BM_AddPropertiesStaticToTracer);
-
-/**
- * @brief Create event via initializer list and AddEvent({...}) to Tracer
- * @param state Benchmark state.
- */
-void BM_AddInitListToTracer(benchmark::State &state)
-{
-  provider.Initialize();
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(provider.AddInitList());
-  }
-  provider.Teardown();
-}
-BENCHMARK(BM_AddInitListToTracer);
-
-/**
- * @brief Create event as `std::map<std::string, common::AttributeValue>`
- * and AddEvent(event) to Tracer.
- * @param state Benchmark state.
- */
-void BM_AddMapToTracer(benchmark::State &state)
-{
-  provider.Initialize();
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(provider.AddMap());
-  }
-  provider.Teardown();
-}
-BENCHMARK(BM_AddMapToTracer);
-
-}  // namespace
-
-BENCHMARK_MAIN();
-
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_provider_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_provider_test.cc
deleted file mode 100644
index d5ebbcad4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_provider_test.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef _WIN32
-
-#  include <gtest/gtest.h>
-#  include <string>
-
-#  include "opentelemetry/exporters/etw/etw_provider.h"
-
-using namespace OPENTELEMETRY_NAMESPACE;
-
-TEST(ETWProvider, ProviderIsRegisteredSuccessfully)
-{
-  std::string providerName = "OpenTelemetry-ETW-Provider";
-  static ETWProvider etw;
-  auto handle = etw.open(providerName.c_str());
-
-  bool registered = etw.is_registered(providerName);
-  ASSERT_TRUE(registered);
-  etw.close(handle);
-}
-
-TEST(ETWProvider, ProviderIsNotRegisteredSuccessfully)
-{
-  std::string providerName = "OpenTelemetry-ETW-Provider-NULL";
-  static ETWProvider etw;
-
-  bool registered = etw.is_registered(providerName);
-  ASSERT_FALSE(registered);
-}
-
-TEST(ETWProvider, CheckOpenGUIDDataSuccessfully)
-{
-  std::string providerName = "OpenTelemetry-ETW-Provider";
-
-  // get GUID from the handle returned
-  static ETWProvider etw;
-  auto handle = etw.open(providerName.c_str());
-
-  utils::UUID uuid_handle(handle.providerGuid);
-  auto guidStrHandle = uuid_handle.to_string();
-
-  // get GUID from the providerName
-  auto guid = utils::GetProviderGuid(providerName.c_str());
-  utils::UUID uuid_name(guid);
-  auto guidStrName = uuid_name.to_string();
-
-  ASSERT_STREQ(guidStrHandle.c_str(), guidStrName.c_str());
-  etw.close(handle);
-}
-
-TEST(ETWProvider, CheckCloseSuccess)
-{
-  std::string providerName = "OpenTelemetry-ETW-Provider";
-
-  static ETWProvider etw;
-  auto handle = etw.open(providerName.c_str(), ETWProvider::EventFormat::ETW_MANIFEST);
-  auto result = etw.close(handle);
-  ASSERT_NE(result, etw.STATUS_ERROR);
-  ASSERT_FALSE(etw.is_registered(providerName));
-}
-
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_tracer_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_tracer_test.cc
deleted file mode 100644
index 5833b6a73..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/etw/test/etw_tracer_test.cc
+++ /dev/null
@@ -1,571 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef _WIN32
-
-#  include <gtest/gtest.h>
-#  include <map>
-#  include <string>
-#  include "opentelemetry//sdk/trace/sampler.h"
-#  include "opentelemetry/exporters/etw/etw_tracer_exporter.h"
-#  include "opentelemetry/sdk/trace/samplers/always_off.h"
-#  include "opentelemetry/sdk/trace/simple_processor.h"
-
-using namespace OPENTELEMETRY_NAMESPACE;
-
-using namespace opentelemetry::exporter::etw;
-using namespace opentelemetry::sdk::trace;
-
-const char *kGlobalProviderName = "OpenTelemetry-ETW-TLD";
-
-std::string getTemporaryValue()
-{
-  return std::string("Value from Temporary std::string");
-}
-
-/**
- * A Mock Custom Id Generator
- */
-class MockIdGenerator : public sdk::trace::IdGenerator
-{
-public:
-  MockIdGenerator() : sdk::trace::IdGenerator(false) {}
-
-  opentelemetry::trace::SpanId GenerateSpanId() noexcept override
-  {
-    return opentelemetry::trace::SpanId(buf_span);
-  }
-
-  opentelemetry::trace::TraceId GenerateTraceId() noexcept override
-  {
-    return opentelemetry::trace::TraceId(buf_trace);
-  }
-  uint8_t buf_span[8]   = {1, 2, 3, 4, 5, 6, 7, 8};
-  uint8_t buf_trace[16] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1};
-};
-
-/* A Custom Sampler, implementing parent based sampler*/
-class MockSampler : public sdk::trace::Sampler
-{
-public:
-  MockSampler(std::shared_ptr<Sampler> delegate_sampler) noexcept
-      : delegate_sampler_(delegate_sampler)
-  {}
-  sdk::trace::SamplingResult ShouldSample(
-      const trace_api::SpanContext &parent_context,
-      trace_api::TraceId trace_id,
-      nostd::string_view name,
-      trace_api::SpanKind span_kind,
-      const opentelemetry::common::KeyValueIterable &attributes,
-      const trace_api::SpanContextKeyValueIterable &links) noexcept
-  {
-    if (!parent_context.IsValid())
-    {
-      // If no parent (root span) exists returns the result of the delegateSampler
-      return delegate_sampler_->ShouldSample(parent_context, trace_id, name, span_kind, attributes,
-                                             links);
-    }
-
-    // If parent exists:
-    if (parent_context.IsSampled())
-    {
-      return {Decision::RECORD_AND_SAMPLE, nullptr, parent_context.trace_state()};
-    }
-    return {Decision::DROP, nullptr, parent_context.trace_state()};
-  }
-
-  nostd::string_view GetDescription() const noexcept { return "Custom Sampler"; }
-
-private:
-  std::shared_ptr<Sampler> delegate_sampler_;
-};
-
-class AlwaysOffTailSampler : public TailSampler
-{
-public:
-  opentelemetry::sdk::trace::SamplingResult ShouldSample(
-      const opentelemetry::trace::Span &span) noexcept override
-  {
-    return {opentelemetry::sdk::trace::Decision::DROP};
-  }
-};
-
-/* clang-format off */
-TEST(ETWTracer, TracerCheck)
-{
-  // SDK customer specifies their unique ETW ProviderName. Every component or library
-  // is assumed to have its own instrumentation name. Traces are routed to dedicated
-  // provider. Standard hash function maps from ProviderName to ProviderGUID.
-  //
-  // Prominent naming examples from `logman query providers` :
-  //
-  // [Docker]                                 {a3693192-9ed6-46d2-a981-f8226c8363bd}
-  // ...
-  // Intel-Autologger-iclsClient              {B8D7E9A0-65D5-40BE-AFEA-83593FC0164E}
-  // Intel-Autologger-iclsProxy                {301B773F-50F3-4C8E-83F0-53BA9590A13E}
-  // Intel-Autologger-PTTEKRecertification    {F33E9E07-8792-47E8-B3FA-2C92AB32C5B3}
-  // ...
-  // NodeJS-ETW-provider                      {77754E9B-264B-4D8D-B981-E4135C1ECB0C}
-  // ...
-  // OpenSSH                                  {C4B57D35-0636-4BC3-A262-370F249F9802}
-  // ...
-  // Windows Connect Now                      {C100BECE-D33A-4A4B-BF23-BBEF4663D017}
-  // Windows Defender Firewall API            {28C9F48F-D244-45A8-842F-DC9FBC9B6E92}
-  // Windows Defender Firewall API - GP       {0EFF663F-8B6E-4E6D-8182-087A8EAA29CB}
-  // Windows Defender Firewall Driver         {D5E09122-D0B2-4235-ADC1-C89FAAAF1069}
-
-  std::string providerName = kGlobalProviderName; // supply unique instrumentation name here
-  exporter::etw::TracerProvider tp;
-
-  auto tracer = tp.GetTracer(providerName);
-
-  // Span attributes
-  Properties outer_attribs =
-  {
-    {"attrib1", 1},
-    {"attrib2", 2}
-  };
-  // copy the outer attributes
-  Properties inner_attribs = outer_attribs;
-
-  {
-    auto topSpan = tracer->StartSpan("MySpanTop");
-    auto topScope = tracer->WithActiveSpan(topSpan);
-    {
-      auto outerSpan = tracer->StartSpan("MySpanL2", outer_attribs);
-      auto outerScope = tracer->WithActiveSpan(outerSpan);
-
-      // Create nested span. Note how we share the attributes here.
-      // It is Okay to either reuse/share or have your own attributes.
-      {
-        auto innerSpan = tracer->StartSpan("MySpanL3", inner_attribs);
-        auto innerScope = tracer->WithActiveSpan(innerSpan);
-
-        // Add span attribute
-        EXPECT_NO_THROW(outerSpan->SetAttribute("AttrName1", "AttrValue1"));
-
-        // Add first event
-        std::string eventName1 = "MyEvent1";
-        Properties event1 =
-        {
-          {"uint32Key", (uint32_t)1234},
-          {"uint64Key", (uint64_t)1234567890},
-          {"strKey", "someValue"}
-        };
-        EXPECT_NO_THROW(outerSpan->AddEvent(eventName1, event1));
-
-        // Add second event
-        std::string eventName2 = "MyEvent2";
-        Properties event2 =
-        {
-          {"uint32Key", (uint32_t)9876},
-          {"uint64Key", (uint64_t)987654321},
-          {"strKey", "anotherValue"}
-        };
-        EXPECT_NO_THROW(outerSpan->AddEvent(eventName2, event2));
-
-        std::string eventName3= "MyEvent3";
-        Properties event3 =
-        {
-          /* Extra metadata that allows event to flow to A.I. pipeline */
-          {"metadata", "ai_event"},
-          {"uint32Key", (uint32_t)9876},
-          {"uint64Key", (uint64_t)987654321},
-          // {"int32array", {{-1,0,1,2,3}} },
-          {"tempString", getTemporaryValue() }
-        };
-        EXPECT_NO_THROW(innerSpan->AddEvent(eventName3, event3));
-        EXPECT_NO_THROW(innerSpan->End());
-
-      }
-      EXPECT_NO_THROW(outerSpan->End());
-
-    }
-    EXPECT_NO_THROW(topSpan->End());
-  }
-#  if OPENTELEMETRY_ABI_VERSION_NO == 1
-  EXPECT_NO_THROW(tracer->CloseWithMicroseconds(0));
-#  endif
-}
-
-// Lowest decoration level -> smaller ETW event size.
-// Expected output in C# listener on the other side:
-// no ActivityID GUID, no SpanId, no TraceId.
-/*
-{
-  "Timestamp": "2021-03-19T21:04:38.411193-07:00",
-  "ProviderName": "OpenTelemetry-ETW-TLD",
-  "Id": 13,
-  "Message": null,
-  "ProcessId": 15120,
-  "Level": "Always",
-  "Keywords": "0x0000000000000000",
-  "EventName": "C.min/Stop",
-  "ActivityID": null,
-  "RelatedActivityID": null,
-  "Payload": {}
-}
-*/
-TEST(ETWTracer, TracerCheckMinDecoration)
-{
-  std::string providerName = kGlobalProviderName;
-  exporter::etw::TracerProvider tp
-  ({
-      {"enableTraceId", false},
-      {"enableSpanId", false},
-      {"enableActivityId", false},
-      {"enableActivityTracking", true},
-      {"enableRelatedActivityId", false},
-      {"enableAutoParent", false}
-  });
-  auto tracer = tp.GetTracer(providerName);
-  {
-    auto aSpan = tracer->StartSpan("A.min");
-    auto aScope = tracer->WithActiveSpan(aSpan);
-    {
-      auto bSpan = tracer->StartSpan("B.min");
-      auto bScope = tracer->WithActiveSpan(bSpan);
-      {
-        auto cSpan = tracer->StartSpan("C.min");
-        auto cScope = tracer->WithActiveSpan(cSpan);
-        EXPECT_NO_THROW(cSpan->End());
-      }
-      EXPECT_NO_THROW(bSpan->End());
-    }
-    EXPECT_NO_THROW(aSpan->End());
-}
-#  if OPENTELEMETRY_ABI_VERSION_NO == 1
-  tracer->CloseWithMicroseconds(0);
-#  endif
-}
-
-// Highest decoration level -> larger ETW event size
-// Expected output in C# listener on the other side:
-// ActivityID GUID (==SpanId), SpanId, TraceId.
-/*
-{
-  "Timestamp": "2021-03-19T21:04:38.4120274-07:00",
-  "ProviderName": "OpenTelemetry-ETW-TLD",
-  "Id": 21,
-  "Message": null,
-  "ProcessId": 15120,
-  "Level": "Always",
-  "Keywords": "0x0000000000000000",
-  "EventName": "C.max/Stop",
-  "ActivityID": "d55a2c25-8033-40ab-0000-000000000000",
-  "RelatedActivityID": null,
-  "Payload": {
-    "SpanId": "252c5ad53380ab40",
-    "TraceId": "4dea2a63c188894ea5ab979e5cd7ec36"
-  }
-}
-*/
-TEST(ETWTracer, TracerCheckMaxDecoration)
-{
-  std::string providerName = kGlobalProviderName;
-  exporter::etw::TracerProvider tp
-  ({
-      {"enableTraceId", true},
-      {"enableSpanId", true},
-      {"enableActivityId", true},
-      {"enableRelatedActivityId", true},
-      {"enableAutoParent", true}
-  });
-  auto tracer = tp.GetTracer(providerName);
-  {
-    auto aSpan = tracer->StartSpan("A.max");
-    auto aScope = tracer->WithActiveSpan(aSpan);
-    {
-      auto bSpan = tracer->StartSpan("B.max");
-      auto bScope = tracer->WithActiveSpan(bSpan);
-      {
-        auto cSpan = tracer->StartSpan("C.max");
-        auto cScope = tracer->WithActiveSpan(cSpan);
-        EXPECT_NO_THROW(cSpan->End());
-      }
-      EXPECT_NO_THROW(bSpan->End());
-    }
-    EXPECT_NO_THROW(aSpan->End());
-  }
-#  if OPENTELEMETRY_ABI_VERSION_NO == 1
-  tracer->CloseWithMicroseconds(0);
-#  endif
-}
-
-TEST(ETWTracer, TracerCheckMsgPack)
-{
-  std::string providerName = "OpenTelemetry-ETW-MsgPack";
-  exporter::etw::TracerProvider tp
-  ({
-      {"enableTraceId", true},
-      {"enableSpanId", true},
-      {"enableActivityId", true},
-      {"enableRelatedActivityId", true},
-      {"enableAutoParent", true}
-  });
-  auto tracer = tp.GetTracer(providerName);
-  {
-      auto aSpan = tracer->StartSpan("A.max");
-      auto aScope = tracer->WithActiveSpan(aSpan);
-      {
-          auto bSpan = tracer->StartSpan("B.max");
-          auto bScope = tracer->WithActiveSpan(bSpan);
-          {
-              auto cSpan = tracer->StartSpan("C.max");
-              auto cScope = tracer->WithActiveSpan(cSpan);
-              std::string eventName = "MyMsgPackEvent";
-              Properties event =
-              {
-                  {"uint32Key", (uint32_t)1234},
-                  {"uint64Key", (uint64_t)1234567890},
-                  {"strKey", "someValue"}
-              };
-              cSpan->AddEvent(eventName, event);
-              EXPECT_NO_THROW(cSpan->End());
-          }
-          EXPECT_NO_THROW(bSpan->End());
-      }
-      EXPECT_NO_THROW(aSpan->End());
-  }
-#  if OPENTELEMETRY_ABI_VERSION_NO == 1
-  tracer->CloseWithMicroseconds(0);
-#  endif
-}
-
-/**
- * @brief Global Tracer singleton may be placed in .h header and
- * shared across different compilation units. All would get the
- * same object.
- *
- * @return Single global tracer instance.
-*/
-static OPENTELEMETRY_NAMESPACE::trace::TracerProvider& GetGlobalTracerProvider()
-{
-    static exporter::etw::TracerProvider tp
-    ({
-      {"enableTraceId", true},
-      {"enableSpanId", true},
-      {"enableActivityId", true},
-      {"enableRelatedActivityId", true},
-      {"enableAutoParent", true}
-     });
-    return tp;
-}
-
-static OPENTELEMETRY_NAMESPACE::trace::Tracer& GetGlobalTracer()
-{
-    static auto tracer = GetGlobalTracerProvider().GetTracer(kGlobalProviderName);
-    return (*tracer.get());
-}
-
-TEST(ETWTracer, GlobalSingletonTracer)
-{
-  // Obtain a global tracer using C++11 magic static.
-  auto& globalTracer = GetGlobalTracer();
-  auto s1 = globalTracer.StartSpan("Span1");
-  auto traceId1 = s1->GetContext().trace_id();
-  s1->End();
-/* === Span 1 - "TraceId": "182a64258fb1864ca4e1a542eecbd9bf"
-{
-  "Timestamp": "2021-05-10T11:45:27.028827-07:00",
-  "ProviderName": "OpenTelemetry-ETW-TLD",
-  "Id": 5,
-  "Message": null,
-  "ProcessId": 23712,
-  "Level": "Always",
-  "Keywords": "0x0000000000000000",
-  "EventName": "Span",
-  "ActivityID": "6ed94703-6b0a-4e76-0000-000000000000",
-  "RelatedActivityID": null,
-  "Payload": {
-    "Duration": 23456,
-    "Kind": 1,
-    "Name": "Span1",
-    "SpanId": "0347d96e0a6b764e",
-    "StartTime": "2021-05-10T18:45:27.066411500Z",
-    "StatusCode": 0,
-    "StatusMessage": "",
-    "Success": "True",
-    "TraceId": "182a64258fb1864ca4e1a542eecbd9bf",
-    "_name": "Span"
-  }
-}
-*/
-
-  // Obtain a different tracer withs its own trace-id.
-  auto localTracer = GetGlobalTracerProvider().GetTracer(kGlobalProviderName);
-  auto s2 = localTracer->StartSpan("Span2");
-  auto traceId2 = s2->GetContext().trace_id();
-  s2->End();
-/* === Span 2 - "TraceId": "334bf9a1eed98d40a873a606295a9368"
-{
-  "Timestamp": "2021-05-10T11:45:27.0289654-07:00",
-  "ProviderName": "OpenTelemetry-ETW-TLD",
-  "Id": 5,
-  "Message": null,
-  "ProcessId": 23712,
-  "Level": "Always",
-  "Keywords": "0x0000000000000000",
-  "EventName": "Span",
-  "ActivityID": "3b7b2ecb-2e84-4903-0000-000000000000",
-  "RelatedActivityID": null,
-  "Payload": {
-    "Duration": 03434,
-    "Kind": 1,
-    "Name": "Span2",
-    "SpanId": "cb2e7b3b842e0349",
-    "StartTime": "2021-05-10T18:45:27.066411500Z",
-    "StatusCode": 0,
-    "StatusMessage": "",
-    "Success": "True",
-    "TraceId": "334bf9a1eed98d40a873a606295a9368",
-    "_name": "Span"
-  }
-}
-*/
-
-  // Obtain the same global tracer with the same trace-id as before.
-  auto& globalTracer2 = GetGlobalTracer();
-  auto s3 = globalTracer2.StartSpan("Span3");
-  auto traceId3 = s3->GetContext().trace_id();
-  s3->End();
-/* === Span 3 - "TraceId": "182a64258fb1864ca4e1a542eecbd9bf"
-{
-  "Timestamp": "2021-05-10T11:45:27.0290936-07:00",
-  "ProviderName": "OpenTelemetry-ETW-TLD",
-  "Id": 5,
-  "Message": null,
-  "ProcessId": 23712,
-  "Level": "Always",
-  "Keywords": "0x0000000000000000",
-  "EventName": "Span",
-  "ActivityID": "0a970247-ba0e-4d4b-0000-000000000000",
-  "RelatedActivityID": null,
-  "Payload": {
-    "Duration": 12323,
-    "Kind": 1,
-    "Name": "Span3",
-    "SpanId": "4702970a0eba4b4d",
-    "StartTime": "2021-05-10T18:45:27.066411500Z",
-    "StatusCode": 0,
-    "StatusMessage": "",
-    "Success": "True",
-    "TraceId": "182a64258fb1864ca4e1a542eecbd9bf",
-    "_name": "Span"
-  }
-}
-*/
-  EXPECT_NE(traceId1, traceId2);
-  EXPECT_EQ(traceId1, traceId3);
-
-#  if OPENTELEMETRY_ABI_VERSION_NO == 1
-  localTracer->CloseWithMicroseconds(0);
-  globalTracer.CloseWithMicroseconds(0);
-#  endif
-}
-
-TEST(ETWTracer, AlwayOffSampler)
-{
-  std::string providerName = kGlobalProviderName; // supply unique instrumentation name here
-  std::unique_ptr<sdk::trace::Sampler> always_off{new sdk::trace::AlwaysOffSampler()};
-  exporter::etw::TracerProvider tp
-    ({
-      {"enableTraceId", true},
-      {"enableSpanId", true},
-      {"enableActivityId", true},
-      {"enableRelatedActivityId", true},
-      {"enableAutoParent", true}
-     },
-     std::move(always_off));
-  auto tracer = tp.GetTracer(providerName);
-  auto span = tracer->StartSpan("span_off");
-  EXPECT_EQ(span->GetContext().IsValid(), true);
-  EXPECT_EQ(span->GetContext().IsSampled(), false);
-}
-
-TEST(ETWTracer, AlwayOffTailSampler)
-{
-  std::string providerName = kGlobalProviderName; // supply unique instrumentation name here
-  std::unique_ptr<sdk::trace::Sampler> always_on{new sdk::trace::AlwaysOnSampler()};
-  sdk::trace::IdGenerator *id_generator = new MockIdGenerator();
-  std::unique_ptr<TailSampler> always_off_tail{new AlwaysOffTailSampler()};
-  exporter::etw::TracerProvider tp
-    ({
-      {"enableTraceId", true},
-      {"enableSpanId", true},
-      {"enableActivityId", true},
-      {"enableRelatedActivityId", true},
-      {"enableAutoParent", true}
-     },
-     std::move(always_on),
-     std::unique_ptr<sdk::trace::IdGenerator>(id_generator),
-     std::move(always_off_tail));
-  auto tracer = tp.GetTracer(providerName);
-}
-
-TEST(ETWTracer, CustomIdGenerator)
-{
-  std::string providerName = kGlobalProviderName; // supply unique instrumentation name here
-  sdk::trace::IdGenerator *id_generator = new MockIdGenerator();
-  std::unique_ptr<sdk::trace::Sampler> always_on{new sdk::trace::AlwaysOnSampler()};
-  exporter::etw::TracerProvider tp
-    ({
-      {"enableTraceId", true},
-      {"enableSpanId", true},
-      {"enableActivityId", true},
-      {"enableRelatedActivityId", true},
-      {"enableAutoParent", true}
-     },
-     std::move(always_on),
-     std::unique_ptr<sdk::trace::IdGenerator>(id_generator));
-  auto tracer = tp.GetTracer(providerName);
-  auto span = tracer->StartSpan("span_on");
-  EXPECT_EQ(span->GetContext().trace_id(), id_generator->GenerateTraceId());
-}
-
-TEST(ETWTracer, CustomSampler)
-{
-  std::string providerName = kGlobalProviderName; // supply unique instrumentation name here
-  auto parent_off = std::unique_ptr<Sampler>(new MockSampler(std::make_shared<AlwaysOnSampler>()));
-  exporter::etw::TracerProvider tp
-    ({
-      {"enableTraceId", true},
-      {"enableSpanId", true},
-      {"enableActivityId", true},
-      {"enableRelatedActivityId", true},
-      {"enableAutoParent", true}
-     },
-     std::move(parent_off));
-  auto tracer = tp.GetTracer(providerName);
-  {
-    auto span = tracer->StartSpan("span_off");
-    EXPECT_EQ(span->GetContext().IsValid(), true);
-    EXPECT_EQ(span->GetContext().IsSampled(), true);
-    auto scope = tracer->WithActiveSpan(span);
-    auto trace_id = span->GetContext().trace_id();
-    {
-      auto child_span = tracer->StartSpan("span on");
-      EXPECT_EQ(child_span->GetContext().IsValid(), true);
-      EXPECT_EQ(child_span->GetContext().IsSampled(), true);
-      EXPECT_EQ(child_span->GetContext().trace_id(), trace_id);
-    }
-  }
-}
-
-TEST(ETWTracer, EndWithCustomTime)
-{
-  // Obtain a global tracer using C++11 magic static.
-  auto& globalTracer = GetGlobalTracer();
-  auto s1 = globalTracer.StartSpan("Span1");
-  auto traceId1 = s1->GetContext().trace_id();
-  opentelemetry::trace::EndSpanOptions end;
-  end.end_steady_time =  opentelemetry::common::SteadyTimestamp(std::chrono::nanoseconds(40));
-  s1->End(end);
-  auto end_time = static_cast<opentelemetry::exporter::etw::Span *>(s1.get())->GetEndTime();
-  EXPECT_EQ(end.end_steady_time.time_since_epoch(), end_time.time_since_epoch());
-
-}
-
-/* clang-format on */
-
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/BUILD b/ext/opentelemetry-cpp-1.21.0/exporters/memory/BUILD
deleted file mode 100644
index 033c85d36..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/BUILD
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "in_memory_metric_data",
-    srcs = [
-        "src/in_memory_metric_data.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/memory/in_memory_metric_data.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "memory",
-        "test",
-    ],
-    deps = [
-        ":in_memory_data",
-        "//sdk/src/metrics",
-    ],
-)
-
-cc_test(
-    name = "in_memory_metric_data_test",
-    srcs = ["test/in_memory_metric_data_test.cc"],
-    tags = [
-        "memory",
-        "test",
-    ],
-    deps = [
-        ":in_memory_metric_data",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_library(
-    name = "in_memory_metric_exporter_factory",
-    srcs = [
-        "src/in_memory_metric_exporter_factory.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "memory",
-        "test",
-    ],
-    deps = [
-        ":in_memory_metric_data",
-        "//sdk/src/metrics",
-    ],
-)
-
-cc_test(
-    name = "in_memory_metric_exporter_test",
-    srcs = ["test/in_memory_metric_exporter_test.cc"],
-    tags = [
-        "memory",
-        "test",
-    ],
-    deps = [
-        ":in_memory_metric_exporter_factory",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_library(
-    name = "in_memory_data",
-    hdrs = [
-        "include/opentelemetry/exporters/memory/in_memory_data.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["memory"],
-    deps = [
-        "//sdk:headers",
-    ],
-)
-
-cc_library(
-    name = "in_memory_span_data",
-    hdrs = [
-        "include/opentelemetry/exporters/memory/in_memory_span_data.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["memory"],
-    deps = [
-        ":in_memory_data",
-        "//api",
-        "//sdk/src/resource",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_test(
-    name = "in_memory_span_data_test",
-    srcs = ["test/in_memory_span_data_test.cc"],
-    tags = [
-        "memory",
-        "test",
-    ],
-    deps = [
-        ":in_memory_span_data",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_library(
-    name = "in_memory_span_exporter",
-    srcs = [
-        "src/in_memory_span_exporter_factory.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/memory/in_memory_span_exporter.h",
-        "include/opentelemetry/exporters/memory/in_memory_span_exporter_factory.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "memory",
-        "test",
-    ],
-    deps = [
-        ":in_memory_span_data",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_test(
-    name = "in_memory_span_exporter_test",
-    srcs = ["test/in_memory_span_exporter_test.cc"],
-    tags = [
-        "memory",
-        "test",
-    ],
-    deps = [
-        ":in_memory_span_exporter",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/memory/CMakeLists.txt
deleted file mode 100644
index d216bd134..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/CMakeLists.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_exporter_in_memory
-            src/in_memory_span_exporter_factory.cc)
-
-target_include_directories(
-  opentelemetry_exporter_in_memory
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-         "$<INSTALL_INTERFACE:include>")
-
-set_target_properties(opentelemetry_exporter_in_memory
-                      PROPERTIES EXPORT_NAME in_memory_span_exporter)
-set_target_version(opentelemetry_exporter_in_memory)
-
-target_link_libraries(opentelemetry_exporter_in_memory
-                      PUBLIC opentelemetry_trace)
-
-add_library(
-  opentelemetry_exporter_in_memory_metric
-  src/in_memory_metric_exporter_factory.cc src/in_memory_metric_data.cc)
-
-target_include_directories(
-  opentelemetry_exporter_in_memory_metric
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-         "$<INSTALL_INTERFACE:include>")
-
-set_target_properties(opentelemetry_exporter_in_memory_metric
-                      PROPERTIES EXPORT_NAME in_memory_metric_exporter)
-set_target_version(opentelemetry_exporter_in_memory_metric)
-
-target_link_libraries(opentelemetry_exporter_in_memory_metric
-                      PUBLIC opentelemetry_metrics)
-
-otel_add_component(
-  COMPONENT
-  exporters_in_memory
-  TARGETS
-  opentelemetry_exporter_in_memory
-  opentelemetry_exporter_in_memory_metric
-  FILES_DIRECTORY
-  "include/opentelemetry/exporters/memory"
-  FILES_DESTINATION
-  "include/opentelemetry/exporters"
-  FILES_MATCHING
-  PATTERN
-  "*.h")
-
-if(BUILD_TESTING)
-  add_executable(in_memory_span_data_test test/in_memory_span_data_test.cc)
-  add_executable(in_memory_span_exporter_test
-                 test/in_memory_span_exporter_test.cc)
-  add_executable(in_memory_metric_data_test test/in_memory_metric_data_test.cc)
-  add_executable(in_memory_metric_exporter_test
-                 test/in_memory_metric_exporter_test.cc)
-
-  target_link_libraries(
-    in_memory_span_data_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_exporter_in_memory opentelemetry_resources)
-
-  target_link_libraries(
-    in_memory_metric_data_test ${GTEST_BOTH_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporter_in_memory_metric
-    opentelemetry_resources)
-
-  target_link_libraries(
-    in_memory_span_exporter_test ${GTEST_BOTH_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporter_in_memory
-    opentelemetry_resources)
-
-  target_link_libraries(
-    in_memory_metric_exporter_test ${GTEST_BOTH_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporter_in_memory_metric
-    opentelemetry_resources)
-
-  gtest_add_tests(
-    TARGET in_memory_span_data_test
-    TEST_PREFIX exporter.
-    TEST_LIST in_memory_span_data_test)
-  gtest_add_tests(
-    TARGET in_memory_span_exporter_test
-    TEST_PREFIX exporter.
-    TEST_LIST in_memory_span_exporter_test)
-  gtest_add_tests(
-    TARGET in_memory_metric_data_test
-    TEST_PREFIX exporter.
-    TEST_LIST in_memory_metric_data_test)
-  gtest_add_tests(
-    TARGET in_memory_metric_exporter_test
-    TEST_PREFIX exporter.
-    TEST_LIST in_memory_metric_exporter_test)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_data.h b/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_data.h
deleted file mode 100644
index 26acba4b6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_data.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/sdk/common/circular_buffer.h"
-
-#include <vector>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-/**
- * A wrapper class holding in memory exporter data
- */
-template <typename T>
-class InMemoryData
-{
-public:
-  /**
-   * @param buffer_size a required value that sets the size of the CircularBuffer
-   */
-  InMemoryData(size_t buffer_size) : data_(buffer_size) {}
-
-  /**
-   * @param data a required unique pointer to the data to add to the CircularBuffer
-   */
-  void Add(std::unique_ptr<T> data) noexcept { data_.Add(data); }
-
-  /**
-   * @return Returns a vector of unique pointers containing all the data in the
-   * CircularBuffer. This operation will empty the Buffer, which is why the data
-   * is returned as unique pointers
-   */
-  std::vector<std::unique_ptr<T>> Get() noexcept
-  {
-    std::vector<std::unique_ptr<T>> res;
-
-    // Pointer swap is required because the Consume function requires that the
-    // AtomicUniquePointer be set to null
-    data_.Consume(
-        data_.size(), [&](opentelemetry::sdk::common::CircularBufferRange<
-                          opentelemetry::sdk::common::AtomicUniquePtr<T>> range) noexcept {
-          range.ForEach([&](opentelemetry::sdk::common::AtomicUniquePtr<T> &ptr) noexcept {
-            std::unique_ptr<T> swap_ptr = nullptr;
-            ptr.Swap(swap_ptr);
-            res.push_back(std::move(swap_ptr));
-            return true;
-          });
-        });
-
-    return res;
-  }
-
-private:
-  opentelemetry::sdk::common::CircularBuffer<T> data_;
-};
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_data.h b/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_data.h
deleted file mode 100644
index 077f5ec69..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_data.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <map>
-#include <memory>
-#include <string>
-#include <tuple>
-
-#include "opentelemetry/exporters/memory/in_memory_data.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-
-/// The abstract base class for types used to store in-memory data backing an
-/// InMemoryMetricExporter.
-class InMemoryMetricData
-{
-public:
-  InMemoryMetricData()          = default;
-  virtual ~InMemoryMetricData() = default;
-
-  InMemoryMetricData(const InMemoryMetricData &)            = delete;
-  InMemoryMetricData(InMemoryMetricData &&)                 = delete;
-  InMemoryMetricData &operator=(const InMemoryMetricData &) = delete;
-  InMemoryMetricData &operator=(InMemoryMetricData &&)      = delete;
-
-  virtual void Add(std::unique_ptr<sdk::metrics::ResourceMetrics> resource_metrics) = 0;
-};
-
-/// An implementation of InMemoryMetricData that stores full-fidelity data points in a circular
-/// buffer. This allows tests to inspect every aspect of exported data, in exchange for a somewhat
-/// cumbersome API.
-class CircularBufferInMemoryMetricData final : public InMemoryMetricData,
-                                               public InMemoryData<sdk::metrics::ResourceMetrics>
-{
-public:
-  explicit CircularBufferInMemoryMetricData(size_t buffer_size);
-  void Add(std::unique_ptr<sdk::metrics::ResourceMetrics> resource_metrics) override;
-};
-
-/// An implementation of InMemoryMetricData that stores only the most recent data point in each time
-/// series, and allows convenient lookups of time series. This makes simple tests easier to write.
-class SimpleAggregateInMemoryMetricData final : public InMemoryMetricData
-{
-public:
-  using AttributeToPoint = std::map<opentelemetry::sdk::metrics::PointAttributes,
-                                    opentelemetry::sdk::metrics::PointType>;
-
-  void Add(std::unique_ptr<sdk::metrics::ResourceMetrics> resource_metrics) override;
-  const AttributeToPoint &Get(const std::string &scope, const std::string &metric);
-  void Clear();
-
-private:
-  std::map<std::tuple<std::string, std::string>, AttributeToPoint> data_;
-};
-
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h
deleted file mode 100644
index ae1c2b857..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/memory/in_memory_metric_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-
-/// A factory for InMemoryMetricExporter
-class InMemoryMetricExporterFactory
-{
-public:
-  /// Create a InMemoryMetricExporter with a default buffer size and aggregation
-  /// temporality selector.
-  /// @param [out] data the InMemoryMetricData the exporter will write to,
-  ///                   for the caller to inspect
-  /// @param [in] buffer_size number of entries to save in the circular buffer
-  /// @param [in] temporality output temporality as a function of instrument kind
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      const std::shared_ptr<InMemoryMetricData> &data,
-      const sdk::metrics::AggregationTemporalitySelector &temporality);
-
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      const std::shared_ptr<InMemoryMetricData> &data);
-};
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h b/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h
deleted file mode 100644
index 6eaae0663..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/exporters/memory/in_memory_data.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-class InMemorySpanData final : public exporter::memory::InMemoryData<sdk::trace::SpanData>
-{
-public:
-  /**
-   * @param buffer_size a required value that sets the size of the CircularBuffer
-   */
-  explicit InMemorySpanData(size_t buffer_size)
-      : exporter::memory::InMemoryData<sdk::trace::SpanData>(buffer_size)
-  {}
-
-  std::vector<std::unique_ptr<sdk::trace::SpanData>> GetSpans() noexcept { return Get(); }
-};
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h
deleted file mode 100644
index 8d3918f90..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <ostream>
-#include <utility>
-
-#include "opentelemetry/exporters/memory/in_memory_span_data.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-const size_t MAX_BUFFER_SIZE = 100;
-
-/**
- * A in memory exporter that switches a flag once a valid recordable was received
- * and keeps track of all received spans in memory.
- */
-class InMemorySpanExporter final : public opentelemetry::sdk::trace::SpanExporter
-{
-public:
-  /**
-   * @param buffer_size an optional value that sets the size of the InMemorySpanData
-   */
-  InMemorySpanExporter(size_t buffer_size = MAX_BUFFER_SIZE)
-      : data_(new InMemorySpanData(buffer_size))
-  {}
-
-  /**
-   * @return Returns a unique pointer to an empty recordable object
-   */
-  std::unique_ptr<sdk::trace::Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<sdk::trace::Recordable>(new sdk::trace::SpanData());
-  }
-
-  /**
-   * @param recordables a required span containing unique pointers to the data
-   * to add to the InMemorySpanData
-   * @return Returns the result of the operation
-   */
-  sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &recordables) noexcept override
-  {
-    if (isShutdown())
-    {
-      OTEL_INTERNAL_LOG_ERROR("[In Memory Span Exporter] Exporting "
-                              << recordables.size() << " span(s) failed, exporter is shutdown");
-      return sdk::common::ExportResult::kFailure;
-    }
-    for (auto &recordable : recordables)
-    {
-      auto span = std::unique_ptr<sdk::trace::SpanData>(
-          static_cast<sdk::trace::SpanData *>(recordable.release()));
-      if (span != nullptr)
-      {
-        data_->Add(std::move(span));
-      }
-    }
-
-    return sdk::common::ExportResult::kSuccess;
-  }
-
-  virtual bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    return true;
-  }
-
-  /**
-   * @param timeout an optional value containing the timeout of the exporter
-   * note: passing custom timeout values is not currently supported for this exporter
-   * @return Returns the status of the operation
-   */
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    is_shutdown_ = true;
-    return true;
-  }
-
-  /**
-   * @return Returns a shared pointer to this exporters InMemorySpanData
-   */
-  std::shared_ptr<InMemorySpanData> GetData() noexcept { return data_; }
-
-private:
-  std::shared_ptr<InMemorySpanData> data_;
-  std::atomic<bool> is_shutdown_{false};
-  bool isShutdown() const noexcept { return is_shutdown_; }
-};
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter_factory.h
deleted file mode 100644
index 549ff13c7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter_factory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <memory>
-
-#include "opentelemetry/exporters/memory/in_memory_span_data.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-
-/**
- * Factory class for InMemorySpanExporter.
- */
-class InMemorySpanExporterFactory
-{
-public:
-  /**
-   * Create a InMemorySpanExporter with a default buffer size.
-   * @param [out] data the InMemorySpanData the exporter will write to,
-   *                   for the caller to inspect
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      std::shared_ptr<InMemorySpanData> &data);
-
-  /**
-   * Create a InMemorySpanExporter with a default buffer size.
-   * @param [out] data the InMemorySpanData the exporter will write to,
-   *                   for the caller to inspect
-   * @param [in] buffer_size size of the underlying InMemorySpanData
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      std::shared_ptr<InMemorySpanData> &data,
-      size_t buffer_size);
-};
-
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_metric_data.cc b/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_metric_data.cc
deleted file mode 100644
index 2f995df0c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_metric_data.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stddef.h>
-#include <map>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/memory/in_memory_data.h"
-#include "opentelemetry/exporters/memory/in_memory_metric_data.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-using sdk::metrics::ResourceMetrics;
-
-CircularBufferInMemoryMetricData::CircularBufferInMemoryMetricData(size_t buffer_size)
-    : InMemoryData(buffer_size)
-{}
-
-void CircularBufferInMemoryMetricData::Add(std::unique_ptr<ResourceMetrics> resource_metrics)
-{
-  InMemoryData::Add(std::move(resource_metrics));
-}
-
-void SimpleAggregateInMemoryMetricData::Add(std::unique_ptr<ResourceMetrics> resource_metrics)
-{
-  for (const auto &sm : resource_metrics->scope_metric_data_)
-  {
-    const auto &scope = sm.scope_->GetName();
-    for (const auto &m : sm.metric_data_)
-    {
-      const auto &metric = m.instrument_descriptor.name_;
-      for (const auto &pda : m.point_data_attr_)
-      {
-        // NOTE: Explicit type conversion added for C++11 (gcc 4.8)
-        data_[std::tuple<std::string, std::string>{scope, metric}].insert(
-            {pda.attributes, pda.point_data});
-      }
-    }
-  }
-}
-
-const SimpleAggregateInMemoryMetricData::AttributeToPoint &SimpleAggregateInMemoryMetricData::Get(
-    const std::string &scope,
-    const std::string &metric)
-{
-  // NOTE: Explicit type conversion added for C++11 (gcc 4.8)
-  return data_[std::tuple<std::string, std::string>{scope, metric}];
-}
-
-void SimpleAggregateInMemoryMetricData::Clear()
-{
-  data_.clear();
-}
-
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_metric_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_metric_exporter_factory.cc
deleted file mode 100644
index 227d846fb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_metric_exporter_factory.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <atomic>
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/exporters/memory/in_memory_metric_data.h"
-#include "opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-
-using opentelemetry::sdk::metrics::PushMetricExporter;
-using sdk::common::ExportResult;
-using sdk::metrics::AggregationTemporality;
-using sdk::metrics::AggregationTemporalitySelector;
-using sdk::metrics::InstrumentType;
-using sdk::metrics::ResourceMetrics;
-
-namespace
-{
-
-/// A Push Metric Exporter which accumulates metrics data in memory and allows it to be inspected.
-/// It is not thread-safe.
-class InMemoryMetricExporter final : public sdk::metrics::PushMetricExporter
-{
-public:
-  /// @param buffer_size a required value that sets the size of the CircularBuffer
-  /// @param temporality Output temporality as a function of instrument kind.
-  InMemoryMetricExporter(const std::shared_ptr<InMemoryMetricData> &data,
-                         const sdk::metrics::AggregationTemporalitySelector &temporality)
-      : data_(data), temporality_(temporality)
-  {}
-
-  ~InMemoryMetricExporter() override = default;
-
-  InMemoryMetricExporter(const InMemoryMetricExporter &)  = delete;
-  InMemoryMetricExporter(const InMemoryMetricExporter &&) = delete;
-  void operator=(const InMemoryMetricExporter &)          = delete;
-  void operator=(const InMemoryMetricExporter &&)         = delete;
-
-  ExportResult Export(const ResourceMetrics &data) noexcept override
-  {
-    if (is_shutdown_)
-    {
-      OTEL_INTERNAL_LOG_ERROR("[In Memory Metric Exporter] Exporting failed, exporter is shutdown");
-      return ExportResult::kFailure;
-    }
-    data_->Add(std::unique_ptr<ResourceMetrics>(new ResourceMetrics{data}));
-    return ExportResult::kSuccess;
-  }
-
-  AggregationTemporality GetAggregationTemporality(
-      InstrumentType instrument_type) const noexcept override
-  {
-    return temporality_(instrument_type);
-  }
-
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return true; }
-
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    is_shutdown_ = true;
-    return true;
-  }
-
-private:
-  std::shared_ptr<InMemoryMetricData> data_;
-  std::atomic<bool> is_shutdown_{false};
-  sdk::metrics::AggregationTemporalitySelector temporality_;
-};
-
-}  // namespace
-
-std::unique_ptr<PushMetricExporter> InMemoryMetricExporterFactory::Create(
-    const std::shared_ptr<InMemoryMetricData> &data)
-{
-  return Create(data,
-                [](sdk::metrics::InstrumentType) { return AggregationTemporality::kCumulative; });
-}
-
-std::unique_ptr<PushMetricExporter> InMemoryMetricExporterFactory::Create(
-    const std::shared_ptr<InMemoryMetricData> &data,
-    const AggregationTemporalitySelector &temporality)
-{
-  return std::unique_ptr<InMemoryMetricExporter>(new InMemoryMetricExporter{data, temporality});
-}
-
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_span_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_span_exporter_factory.cc
deleted file mode 100644
index ff5bab925..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/src/in_memory_span_exporter_factory.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/memory/in_memory_span_exporter_factory.h"
-#include "opentelemetry/exporters/memory/in_memory_span_data.h"
-#include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace memory
-{
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> InMemorySpanExporterFactory::Create(
-    std::shared_ptr<InMemorySpanData> &data)
-{
-  return Create(data, MAX_BUFFER_SIZE);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> InMemorySpanExporterFactory::Create(
-    std::shared_ptr<InMemorySpanData> &data,
-    size_t buffer_size)
-{
-  InMemorySpanExporter *memory_exporter = new InMemorySpanExporter(buffer_size);
-  data                                  = memory_exporter->GetData();
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter(memory_exporter);
-  return exporter;
-}
-
-}  // namespace memory
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_metric_data_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_metric_data_test.cc
deleted file mode 100644
index 7cbc2cec4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_metric_data_test.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/memory/in_memory_metric_data.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/resource/resource.h"
-
-using opentelemetry::exporter::memory::CircularBufferInMemoryMetricData;
-using opentelemetry::exporter::memory::SimpleAggregateInMemoryMetricData;
-using opentelemetry::sdk::metrics::MetricData;
-using opentelemetry::sdk::metrics::PointDataAttributes;
-using opentelemetry::sdk::metrics::ResourceMetrics;
-using opentelemetry::sdk::metrics::ScopeMetrics;
-using opentelemetry::sdk::metrics::SumPointData;
-using opentelemetry::sdk::resource::Resource;
-
-TEST(InMemoryMetricDataTest, CircularBuffer)
-{
-  CircularBufferInMemoryMetricData buf(10);
-  Resource resource = Resource::GetEmpty();
-  buf.Add(std::unique_ptr<ResourceMetrics>(new ResourceMetrics{
-      &resource, std::vector<ScopeMetrics>{{nullptr, std::vector<MetricData>{}}}}));
-  EXPECT_EQ((*buf.Get().begin())->resource_, &resource);
-}
-
-TEST(InMemoryMetricDataTest, SimpleAggregate)
-{
-  SimpleAggregateInMemoryMetricData agg;
-
-  Resource resource = Resource::GetEmpty();
-
-  auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "my-scope", "1.0.0", "http://example.com");
-
-  SumPointData spd;
-  spd.value_ = 42.0;
-  PointDataAttributes pda{{{"hello", "world"}}, spd};
-
-  MetricData md;
-  md.instrument_descriptor.name_ = "my-metric";
-  md.point_data_attr_.push_back(pda);
-
-  agg.Add(std::unique_ptr<ResourceMetrics>(new ResourceMetrics{
-      &resource, std::vector<ScopeMetrics>{{scope.get(), std::vector<MetricData>{md}}}}));
-  auto it = agg.Get("my-scope", "my-metric").begin();
-
-  auto saved_point = opentelemetry::nostd::get<SumPointData>(it->second);
-
-  EXPECT_EQ(opentelemetry::nostd::get<double>(saved_point.value_), 42.0);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_metric_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_metric_exporter_test.cc
deleted file mode 100644
index e0342d33a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_metric_exporter_test.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "opentelemetry/exporters/memory/in_memory_metric_data.h"
-#include "opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/resource/resource.h"
-
-using opentelemetry::exporter::memory::CircularBufferInMemoryMetricData;
-using opentelemetry::exporter::memory::InMemoryMetricExporterFactory;
-using opentelemetry::sdk::common::ExportResult;
-using opentelemetry::sdk::metrics::AggregationTemporality;
-using opentelemetry::sdk::metrics::InstrumentType;
-using opentelemetry::sdk::metrics::PushMetricExporter;
-using opentelemetry::sdk::metrics::ResourceMetrics;
-using opentelemetry::sdk::metrics::ScopeMetrics;
-using opentelemetry::sdk::resource::Resource;
-
-class InMemoryMetricExporterTest : public ::testing::Test
-{
-protected:
-  InMemoryMetricExporterTest() { exporter_ = InMemoryMetricExporterFactory::Create(data_); }
-
-  std::unique_ptr<PushMetricExporter> exporter_;
-  std::shared_ptr<CircularBufferInMemoryMetricData> data_ =
-      std::make_shared<CircularBufferInMemoryMetricData>(10);
-
-  Resource resource_ = Resource::GetEmpty();
-  ResourceMetrics resource_metrics_{&resource_, std::vector<ScopeMetrics>{}};
-};
-
-TEST_F(InMemoryMetricExporterTest, Export)
-{
-  EXPECT_EQ(exporter_->Export(resource_metrics_), ExportResult::kSuccess);
-
-  auto data = data_->Get();
-  EXPECT_EQ(data.size(), 1);
-  EXPECT_EQ((*data.begin())->resource_, &resource_);
-}
-
-TEST_F(InMemoryMetricExporterTest, ForceFlush)
-{
-  EXPECT_TRUE(exporter_->ForceFlush());
-}
-
-TEST_F(InMemoryMetricExporterTest, Shutdown)
-{
-  EXPECT_TRUE(exporter_->Shutdown());
-  EXPECT_EQ(exporter_->Export(resource_metrics_), ExportResult::kFailure);
-}
-
-TEST_F(InMemoryMetricExporterTest, TemporalitySelector)
-{
-  EXPECT_EQ(exporter_->GetAggregationTemporality(InstrumentType::kCounter),
-            AggregationTemporality::kCumulative);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_span_data_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_span_data_test.cc
deleted file mode 100644
index 83a907f32..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_span_data_test.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/memory/in_memory_span_data.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-
-using opentelemetry::exporter::memory::InMemorySpanData;
-using opentelemetry::sdk::trace::SpanData;
-
-TEST(InMemorySpanData, AddRecordable)
-{
-  InMemorySpanData data(100);
-
-  ASSERT_EQ(0, data.GetSpans().size());
-
-  std::unique_ptr<SpanData> spandata(new SpanData());
-
-  data.Add(std::move(spandata));
-
-  // Consumes all spans in exporter
-  ASSERT_EQ(1, data.GetSpans().size());
-
-  ASSERT_EQ(0, data.GetSpans().size());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_span_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_span_exporter_test.cc
deleted file mode 100644
index 7b40ec050..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/memory/test/in_memory_span_exporter_test.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/exporters/memory/in_memory_span_data.h"
-#include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-
-using opentelemetry::exporter::memory::InMemorySpanExporter;
-using opentelemetry::sdk::trace::Recordable;
-using opentelemetry::sdk::trace::SpanData;
-
-TEST(InMemorySpanExporter, ExportBatch)
-{
-  InMemorySpanExporter exporter;
-
-  ASSERT_EQ(0, exporter.GetData().get()->GetSpans().size());
-
-  std::unique_ptr<Recordable> spandata(new SpanData());
-  opentelemetry::nostd::span<std::unique_ptr<Recordable>> batch(&spandata, 1);
-
-  exporter.Export(batch);
-
-  ASSERT_EQ(1, exporter.GetData().get()->GetSpans().size());
-
-  // Consumes all spans in exporter
-  ASSERT_EQ(0, exporter.GetData().get()->GetSpans().size());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/BUILD b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/BUILD
deleted file mode 100644
index 177bf6a96..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/BUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "ostream_log_record_exporter",
-    srcs = [
-        "src/log_record_exporter.cc",
-        "src/log_record_exporter_factory.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/ostream/common_utils.h",
-        "include/opentelemetry/exporters/ostream/log_record_exporter.h",
-        "include/opentelemetry/exporters/ostream/log_record_exporter_factory.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["ostream"],
-    deps = [
-        "//sdk/src/logs",
-    ],
-)
-
-cc_test(
-    name = "ostream_log_test",
-    srcs = ["test/ostream_log_test.cc"],
-    tags = [
-        "ostream",
-        "test",
-    ],
-    deps = [
-        ":ostream_log_record_exporter",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_library(
-    name = "ostream_metric_exporter",
-    srcs = [
-        "src/metric_exporter.cc",
-        "src/metric_exporter_factory.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/ostream/common_utils.h",
-        "include/opentelemetry/exporters/ostream/metric_exporter.h",
-        "include/opentelemetry/exporters/ostream/metric_exporter_factory.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "metrics",
-        "ostream",
-    ],
-    deps = [
-        "//sdk/src/metrics",
-    ],
-)
-
-cc_test(
-    name = "ostream_metric_test",
-    srcs = ["test/ostream_metric_test.cc"],
-    tags = [
-        "ostream",
-        "test",
-    ],
-    deps = [
-        ":ostream_metric_exporter",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_library(
-    name = "ostream_span_exporter",
-    srcs = [
-        "src/span_exporter.cc",
-        "src/span_exporter_factory.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/ostream/common_utils.h",
-        "include/opentelemetry/exporters/ostream/span_exporter.h",
-        "include/opentelemetry/exporters/ostream/span_exporter_factory.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["ostream"],
-    deps = [
-        "//sdk/src/trace",
-    ],
-)
-
-cc_library(
-    name = "ostream_capture",
-    hdrs = [
-        "test/ostream_capture.h",
-    ],
-    tags = ["ostream"],
-    deps = [
-        "//api",
-    ],
-)
-
-cc_test(
-    name = "ostream_span_test",
-    srcs = ["test/ostream_span_test.cc"],
-    tags = [
-        "ostream",
-        "test",
-    ],
-    deps = [
-        ":ostream_capture",
-        ":ostream_span_exporter",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/CMakeLists.txt
deleted file mode 100644
index 52369ea13..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/CMakeLists.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_exporter_ostream_span src/span_exporter.cc
-                                                src/span_exporter_factory.cc)
-
-set_target_properties(opentelemetry_exporter_ostream_span
-                      PROPERTIES EXPORT_NAME ostream_span_exporter)
-set_target_version(opentelemetry_exporter_ostream_span)
-
-target_include_directories(
-  opentelemetry_exporter_ostream_span
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
-
-target_link_libraries(opentelemetry_exporter_ostream_span
-                      PUBLIC opentelemetry_trace)
-
-list(APPEND OPENTELEMETRY_OSTREAM_TARGETS opentelemetry_exporter_ostream_span)
-
-if(BUILD_TESTING)
-  add_executable(ostream_span_test test/ostream_span_test.cc)
-  target_link_libraries(ostream_span_test ${GTEST_BOTH_LIBRARIES}
-                        opentelemetry_exporter_ostream_span)
-  gtest_add_tests(
-    TARGET ostream_span_test
-    TEST_PREFIX exporter.
-    TEST_LIST ostream_span_test)
-endif() # BUILD_TESTING
-
-add_library(opentelemetry_exporter_ostream_metrics
-            src/metric_exporter.cc src/metric_exporter_factory.cc)
-set_target_properties(opentelemetry_exporter_ostream_metrics
-                      PROPERTIES EXPORT_NAME ostream_metrics_exporter)
-set_target_version(opentelemetry_exporter_ostream_metrics)
-
-target_include_directories(
-  opentelemetry_exporter_ostream_metrics
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
-target_link_libraries(opentelemetry_exporter_ostream_metrics
-                      PUBLIC opentelemetry_metrics)
-
-list(APPEND OPENTELEMETRY_OSTREAM_TARGETS
-     opentelemetry_exporter_ostream_metrics)
-
-if(BUILD_TESTING)
-  add_executable(ostream_metric_test test/ostream_metric_test.cc)
-  target_link_libraries(
-    ostream_metric_test ${GTEST_BOTH_LIBRARIES}
-    opentelemetry_exporter_ostream_metrics opentelemetry_resources)
-  gtest_add_tests(
-    TARGET ostream_metric_test
-    TEST_PREFIX exporter.
-    TEST_LIST ostream_metric_test)
-endif()
-
-add_library(opentelemetry_exporter_ostream_logs
-            src/log_record_exporter.cc src/log_record_exporter_factory.cc)
-set_target_properties(opentelemetry_exporter_ostream_logs
-                      PROPERTIES EXPORT_NAME ostream_log_record_exporter)
-set_target_version(opentelemetry_exporter_ostream_logs)
-
-target_include_directories(
-  opentelemetry_exporter_ostream_logs
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
-target_link_libraries(opentelemetry_exporter_ostream_logs
-                      PUBLIC opentelemetry_logs)
-list(APPEND OPENTELEMETRY_OSTREAM_TARGETS opentelemetry_exporter_ostream_logs)
-
-otel_add_component(
-  COMPONENT
-  exporters_ostream
-  TARGETS
-  ${OPENTELEMETRY_OSTREAM_TARGETS}
-  FILES_DIRECTORY
-  "include/opentelemetry/exporters/ostream"
-  FILES_DESTINATION
-  "include/opentelemetry/exporters"
-  FILES_MATCHING
-  PATTERN
-  "*.h")
-
-if(BUILD_TESTING)
-  add_executable(ostream_log_test test/ostream_log_test.cc)
-  target_link_libraries(ostream_log_test ${GTEST_BOTH_LIBRARIES}
-                        opentelemetry_exporter_ostream_logs)
-  gtest_add_tests(
-    TARGET ostream_log_test
-    TEST_PREFIX exporter.
-    TEST_LIST ostream_log_test)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h
deleted file mode 100644
index ec860794f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/common_utils.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <sstream>
-#include <string>
-#include <vector>
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-
-#pragma once
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace ostream_common
-{
-/*
-  print_value is used to print out the value of an attribute within a vector.
-  These values are held in a variant which makes the process of printing them much more
-  complicated.
-*/
-
-template <typename T>
-void print_value(const T &item, std::ostream &sout)
-{
-  sout << item;
-}
-
-template <typename T>
-void print_value(const std::vector<T> &vec, std::ostream &sout)
-{
-  sout << '[';
-  size_t i  = 1;
-  size_t sz = vec.size();
-  for (auto v : vec)
-  {
-    sout << v;
-    if (i != sz)
-      sout << ',';
-    i++;
-  };
-  sout << ']';
-}
-
-template <typename T>
-void print_value(const nostd::span<T> &vec, std::ostream &sout)
-{
-  sout << '[';
-  size_t i  = 1;
-  size_t sz = vec.size();
-  for (auto v : vec)
-  {
-    sout << v;
-    if (i != sz)
-      sout << ',';
-    i++;
-  };
-  sout << ']';
-}
-
-// Prior to C++14, generic lambda is not available so fallback to functor.
-#if (!defined(_MSVC_LANG) && (__cplusplus < 201402L)) || \
-    (defined(_MSVC_LANG) && (_MSVC_LANG < 201402L))
-
-class OwnedAttributeValueVisitor
-{
-public:
-  OwnedAttributeValueVisitor(std::ostream &sout) : sout_(sout) {}
-
-  template <typename T>
-  void operator()(T &&arg)
-  {
-    print_value(arg, sout_);
-  }
-
-private:
-  std::ostream &sout_;
-};
-
-class AttributeValueVisitor
-{
-public:
-  AttributeValueVisitor(std::ostream &sout) : sout_(sout) {}
-
-  template <typename T>
-  void operator()(T &&arg)
-  {
-    print_value(arg, sout_);
-  }
-
-  void operator()(nostd::string_view &&arg) { sout_.write(arg.data(), arg.size()); }
-
-private:
-  std::ostream &sout_;
-};
-
-#endif
-
-inline void print_value(const opentelemetry::sdk::common::OwnedAttributeValue &value,
-                        std::ostream &sout)
-{
-#if (!defined(_MSVC_LANG) && (__cplusplus < 201402L)) || \
-    (defined(_MSVC_LANG) && (_MSVC_LANG < 201402L))
-  opentelemetry::nostd::visit(OwnedAttributeValueVisitor(sout), value);
-#else
-  opentelemetry::nostd::visit(
-      [&sout](auto &&arg) {
-        /* explicit this is needed by some gcc versions (observed with v5.4.0)*/
-        print_value(arg, sout);
-      },
-      value);
-#endif
-}
-
-inline void print_value(const opentelemetry::common::AttributeValue &value, std::ostream &sout)
-{
-#if (!defined(_MSVC_LANG) && (__cplusplus < 201402L)) || \
-    (defined(_MSVC_LANG) && (_MSVC_LANG < 201402L))
-  opentelemetry::nostd::visit(AttributeValueVisitor(sout), value);
-#else
-  opentelemetry::nostd::visit(
-      [&sout](auto &&arg) {
-        /* explicit this is needed by some gcc versions (observed with v5.4.0)*/
-        print_value(arg, sout);
-      },
-      value);
-#endif
-}
-
-}  // namespace ostream_common
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h
deleted file mode 100644
index 840d7d5b8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <unordered_map>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-/**
- * The OStreamLogRecordExporter exports logs through an ostream (default set to std::cout)
- */
-class OStreamLogRecordExporter final : public opentelemetry::sdk::logs::LogRecordExporter
-{
-public:
-  /**
-   * Create an OStreamLogRecordExporter. This constructor takes in a reference to an ostream that
-   * the Export() method will send log data into. The default ostream is set to stdout.
-   */
-  explicit OStreamLogRecordExporter(std::ostream &sout = std::cout) noexcept;
-
-  std::unique_ptr<sdk::logs::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Exports a span of logs sent from the processor.
-   */
-  opentelemetry::sdk::common::ExportResult Export(
-      const opentelemetry::nostd::span<std::unique_ptr<sdk::logs::Recordable>> &records) noexcept
-      override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Marks the OStream Log Exporter as shut down.
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  // The OStream to send the logs to
-  std::ostream &sout_;
-  // Whether this exporter has been shut down
-  std::atomic<bool> is_shutdown_{false};
-  bool isShutdown() const noexcept;
-  void printAttributes(
-      const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &map,
-      const std::string &prefix = "\n\t");
-  void printAttributes(
-      const std::unordered_map<std::string, opentelemetry::common::AttributeValue> &map,
-      const std::string &prefix = "\n\t");
-};
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter_factory.h
deleted file mode 100644
index 36c09a9f7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter_factory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <iostream>
-#include <memory>
-
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-
-/**
- * Factory class for OStreamLogRecordExporter.
- */
-class OPENTELEMETRY_EXPORT OStreamLogRecordExporterFactory
-{
-public:
-  /**
-   * Creates an OStreamLogRecordExporter writing to the default location.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create();
-
-  /**
-   * Creates an OStreamLogRecordExporter writing to the given location.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(std::ostream &sout);
-};
-
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h
deleted file mode 100644
index f1b2cd6ef..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <map>
-#include <mutex>
-#include <string>
-
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-
-/**
- * The OStreamMetricExporter exports record data through an ostream
- */
-class OStreamMetricExporter final : public opentelemetry::sdk::metrics::PushMetricExporter
-{
-public:
-  /**
-   * Create an OStreamMetricExporter. This constructor takes in a reference to an ostream that the
-   * export() function will send metrics data into.
-   * The default ostream is set to stdout
-   */
-  explicit OStreamMetricExporter(std::ostream &sout = std::cout,
-                                 sdk::metrics::AggregationTemporality aggregation_temporality =
-                                     sdk::metrics::AggregationTemporality::kCumulative) noexcept;
-
-  /**
-   * Export
-   * @param data metrics data
-   */
-  sdk::common::ExportResult Export(const sdk::metrics::ResourceMetrics &data) noexcept override;
-
-  /**
-   * Get the AggregationTemporality for ostream exporter
-   *
-   * @return AggregationTemporality
-   */
-  sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      sdk::metrics::InstrumentType instrument_type) const noexcept override;
-
-  /**
-   * Force flush the exporter.
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shut down the exporter.
-   * @param timeout an optional timeout.
-   * @return return the status of this operation
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  std::ostream &sout_;
-  std::atomic<bool> is_shutdown_{false};
-  std::mutex serialize_lock_;
-  sdk::metrics::AggregationTemporality aggregation_temporality_;
-  bool isShutdown() const noexcept;
-  void printInstrumentationInfoMetricData(const sdk::metrics::ScopeMetrics &info_metrics,
-                                          const sdk::metrics::ResourceMetrics &data);
-  void printPointData(const opentelemetry::sdk::metrics::PointType &point_data);
-  void printPointAttributes(const opentelemetry::sdk::metrics::PointAttributes &point_attributes);
-  void printAttributes(const std::map<std::string, sdk::common::OwnedAttributeValue> &map,
-                       const std::string &prefix);
-  void printResources(const opentelemetry::sdk::resource::Resource &resources);
-};
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter_factory.h
deleted file mode 100644
index 345176974..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/metric_exporter_factory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <iostream>
-#include <memory>
-
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-
-/**
- * Factory class for OStreamMetricExporter.
- */
-class OPENTELEMETRY_EXPORT OStreamMetricExporterFactory
-{
-public:
-  /**
-   * Creates an OStreamMetricExporter writing to the default location.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create();
-
-  /**
-   * Creates an OStreamMetricExporter writing to the given location.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      std::ostream &sout);
-
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      std::ostream &sout,
-      sdk::metrics::AggregationTemporality aggregation_temporality);
-};
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h
deleted file mode 100644
index e22eb77f3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <map>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace trace
-{
-
-/**
- * The OStreamSpanExporter exports span data through an ostream
- */
-class OStreamSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
-{
-public:
-  /**
-   * Create an OStreamSpanExporter. This constructor takes in a reference to an ostream that the
-   * export() function will send span data into.
-   * The default ostream is set to stdout
-   */
-  explicit OStreamSpanExporter(std::ostream &sout = std::cout) noexcept;
-
-  std::unique_ptr<opentelemetry::sdk::trace::Recordable> MakeRecordable() noexcept override;
-
-  sdk::common::ExportResult Export(
-      const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>>
-          &spans) noexcept override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  std::ostream &sout_;
-  std::atomic<bool> is_shutdown_{false};
-  bool isShutdown() const noexcept;
-
-  // Mapping status number to the string from api/include/opentelemetry/trace/span_metadata.h
-  std::map<int, std::string> statusMap{{0, "Unset"}, {1, "Ok"}, {2, "Error"}};
-
-  // various print helpers
-  void printAttributes(
-      const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &map,
-      const std::string &prefix = "\n\t");
-
-  void printEvents(const std::vector<opentelemetry::sdk::trace::SpanDataEvent> &events);
-
-  void printLinks(const std::vector<opentelemetry::sdk::trace::SpanDataLink> &links);
-
-  void printResources(const opentelemetry::sdk::resource::Resource &resources);
-
-  void printInstrumentationScope(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope);
-};
-}  // namespace trace
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter_factory.h
deleted file mode 100644
index 4797473bb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter_factory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <iostream>
-#include <memory>
-
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace trace
-{
-
-/**
- * Factory class for OStreamSpanExporter.
- */
-class OPENTELEMETRY_EXPORT OStreamSpanExporterFactory
-{
-public:
-  /**
-   * Creates an OStreamSpanExporter writing to the default location.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create();
-
-  /**
-   * Creates an OStreamSpanExporter writing to the given location.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(std::ostream &sout);
-};
-
-}  // namespace trace
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/log_record_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/log_record_exporter.cc
deleted file mode 100644
index b046e01c6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/log_record_exporter.cc
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <atomic>
-#include <chrono>
-#include <cstdint>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <unordered_map>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/ostream/common_utils.h"
-#include "opentelemetry/exporters/ostream/log_record_exporter.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/read_write_log_record.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-namespace sdklogs   = opentelemetry::sdk::logs;
-namespace sdkcommon = opentelemetry::sdk::common;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-
-/*********************** Constructor ***********************/
-
-OStreamLogRecordExporter::OStreamLogRecordExporter(std::ostream &sout) noexcept : sout_(sout) {}
-
-/*********************** Exporter methods ***********************/
-
-std::unique_ptr<sdklogs::Recordable> OStreamLogRecordExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<sdklogs::Recordable>(new sdklogs::ReadWriteLogRecord());
-}
-
-sdk::common::ExportResult OStreamLogRecordExporter::Export(
-    const opentelemetry::nostd::span<std::unique_ptr<sdklogs::Recordable>> &records) noexcept
-{
-  if (isShutdown())
-  {
-    OTEL_INTERNAL_LOG_ERROR("[Ostream Log Exporter] Exporting "
-                            << records.size() << " log(s) failed, exporter is shutdown");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  for (auto &record : records)
-  {
-    auto log_record = std::unique_ptr<sdklogs::ReadWriteLogRecord>(
-        static_cast<sdklogs::ReadWriteLogRecord *>(record.release()));
-
-    if (log_record == nullptr)
-    {
-      // TODO: Log Internal SDK error "recordable data was lost"
-      continue;
-    }
-
-    int64_t event_id = log_record->GetEventId();
-
-    // Convert trace, spanid, traceflags into exportable representation
-    constexpr int trace_id_len    = 32;
-    constexpr int span_id_len     = 16;
-    constexpr int trace_flags_len = 2;
-
-    char trace_id[trace_id_len]       = {0};
-    char span_id[span_id_len]         = {0};
-    char trace_flags[trace_flags_len] = {0};
-
-    log_record->GetTraceId().ToLowerBase16(trace_id);
-    log_record->GetSpanId().ToLowerBase16(span_id);
-    log_record->GetTraceFlags().ToLowerBase16(trace_flags);
-
-    // Print out each field of the log record, noting that severity is separated
-    // into severity_num and severity_text
-    sout_ << "{\n"
-          << "  timestamp          : " << log_record->GetTimestamp().time_since_epoch().count()
-          << "\n"
-          << "  observed_timestamp : "
-          << log_record->GetObservedTimestamp().time_since_epoch().count() << "\n"
-          << "  severity_num       : " << static_cast<std::uint32_t>(log_record->GetSeverity())
-          << "\n"
-          << "  severity_text      : ";
-
-    std::uint32_t severity_index = static_cast<std::uint32_t>(log_record->GetSeverity());
-    if (severity_index >= std::extent<decltype(opentelemetry::logs::SeverityNumToText)>::value)
-    {
-      sout_ << "Invalid severity(" << severity_index << ")\n";
-    }
-    else
-    {
-      sout_ << opentelemetry::logs::SeverityNumToText[severity_index] << "\n";
-    }
-
-    sout_ << "  body               : ";
-    opentelemetry::exporter::ostream_common::print_value(log_record->GetBody(), sout_);
-    sout_ << "\n  resource           : ";
-    printAttributes(log_record->GetResource().GetAttributes(), "\n    ");
-
-    sout_ << "\n  attributes         : ";
-
-    printAttributes(log_record->GetAttributes(), "\n    ");
-
-    sout_ << "\n"
-          << "  event_id           : " << event_id << "\n"
-          << "  event_name         : " << log_record->GetEventName() << "\n"
-          << "  trace_id           : " << std::string(trace_id, trace_id_len) << "\n"
-          << "  span_id            : " << std::string(span_id, span_id_len) << "\n"
-          << "  trace_flags        : " << std::string(trace_flags, trace_flags_len) << "\n"
-          << "  scope              : \n"
-          << "    name             : " << log_record->GetInstrumentationScope().GetName() << "\n"
-          << "    version          : " << log_record->GetInstrumentationScope().GetVersion() << "\n"
-          << "    schema_url       : " << log_record->GetInstrumentationScope().GetSchemaURL()
-          << "\n"
-          << "    attributes       : ";
-
-    printAttributes(log_record->GetInstrumentationScope().GetAttributes(), "\n      ");
-    sout_ << "\n}\n";
-  }
-
-  return sdk::common::ExportResult::kSuccess;
-}
-
-bool OStreamLogRecordExporter::ForceFlush(std::chrono::microseconds /* timeout */) noexcept
-{
-  sout_.flush();
-  return true;
-}
-
-bool OStreamLogRecordExporter::Shutdown(std::chrono::microseconds) noexcept
-{
-  is_shutdown_ = true;
-  return true;
-}
-
-bool OStreamLogRecordExporter::isShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-
-void OStreamLogRecordExporter::printAttributes(
-    const std::unordered_map<std::string, sdkcommon::OwnedAttributeValue> &map,
-    const std::string &prefix)
-{
-  for (const auto &kv : map)
-  {
-    sout_ << prefix << kv.first << ": ";
-    opentelemetry::exporter::ostream_common::print_value(kv.second, sout_);
-  }
-}
-
-void OStreamLogRecordExporter::printAttributes(
-    const std::unordered_map<std::string, opentelemetry::common::AttributeValue> &map,
-    const std::string &prefix)
-{
-  for (const auto &kv : map)
-  {
-    sout_ << prefix << kv.first << ": ";
-    opentelemetry::exporter::ostream_common::print_value(kv.second, sout_);
-  }
-}
-
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/log_record_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/log_record_exporter_factory.cc
deleted file mode 100644
index 99699001d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/log_record_exporter_factory.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/ostream/log_record_exporter_factory.h"
-#include "opentelemetry/exporters/ostream/log_record_exporter.h"
-#include "opentelemetry/version.h"
-
-namespace logs_sdk = opentelemetry::sdk::logs;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-
-std::unique_ptr<logs_sdk::LogRecordExporter> OStreamLogRecordExporterFactory::Create()
-{
-  return Create(std::cout);
-}
-
-std::unique_ptr<logs_sdk::LogRecordExporter> OStreamLogRecordExporterFactory::Create(
-    std::ostream &sout)
-{
-  std::unique_ptr<logs_sdk::LogRecordExporter> exporter(new OStreamLogRecordExporter(sout));
-  return exporter;
-}
-
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/metric_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/metric_exporter.cc
deleted file mode 100644
index 39f5b017e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/metric_exporter.cc
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <ctime>
-#include <iterator>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <ostream>
-#include <string>
-#include <type_traits>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/ostream/common_utils.h"
-#include "opentelemetry/exporters/ostream/metric_exporter.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-namespace
-{
-std::string timeToString(opentelemetry::common::SystemTimestamp time_stamp)
-{
-  std::time_t epoch_time = std::chrono::system_clock::to_time_t(time_stamp);
-
-  struct tm *tm_ptr = nullptr;
-#if defined(_MSC_VER)
-  struct tm buf_tm;
-  if (!gmtime_s(&buf_tm, &epoch_time))
-  {
-    tm_ptr = &buf_tm;
-  }
-#else
-  tm_ptr = std::gmtime(&epoch_time);
-#endif
-
-  char buf[100];
-  char *date_str = nullptr;
-  if (tm_ptr == nullptr)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OStream Metric] gmtime failed for " << epoch_time);
-  }
-  else if (std::strftime(buf, sizeof(buf), "%c", tm_ptr) > 0)
-  {
-    date_str = buf;
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OStream Metric] strftime failed for " << epoch_time);
-  }
-
-  return std::string{date_str};
-}
-}  // namespace
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-
-template <typename Container>
-inline void printVec(std::ostream &os, Container &vec)
-{
-  using T = typename std::decay<decltype(*vec.begin())>::type;
-  os << '[';
-  if (vec.size() > 1)
-  {
-    std::copy(vec.begin(), vec.end(), std::ostream_iterator<T>(os, ", "));
-  }
-  os << ']';
-}
-
-OStreamMetricExporter::OStreamMetricExporter(
-    std::ostream &sout,
-    sdk::metrics::AggregationTemporality aggregation_temporality) noexcept
-    : sout_(sout), aggregation_temporality_(aggregation_temporality)
-{}
-
-sdk::metrics::AggregationTemporality OStreamMetricExporter::GetAggregationTemporality(
-    sdk::metrics::InstrumentType /* instrument_type */) const noexcept
-{
-  return aggregation_temporality_;
-}
-
-sdk::common::ExportResult OStreamMetricExporter::Export(
-    const sdk::metrics::ResourceMetrics &data) noexcept
-{
-  if (isShutdown())
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OStream Metric] Exporting "
-                            << data.scope_metric_data_.size()
-                            << " records(s) failed, exporter is shutdown");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  for (auto &record : data.scope_metric_data_)
-  {
-    printInstrumentationInfoMetricData(record, data);
-  }
-  return sdk::common::ExportResult::kSuccess;
-}
-
-void OStreamMetricExporter::printAttributes(
-    const std::map<std::string, sdk::common::OwnedAttributeValue> &map,
-    const std::string &prefix)
-{
-  for (const auto &kv : map)
-  {
-    sout_ << prefix << kv.first << ": ";
-    opentelemetry::exporter::ostream_common::print_value(kv.second, sout_);
-  }
-}
-
-void OStreamMetricExporter::printResources(const opentelemetry::sdk::resource::Resource &resources)
-{
-  auto attributes = resources.GetAttributes();
-  if (attributes.size())
-  {
-    // Convert unordered_map to map for printing so that iteration
-    // order is guaranteed.
-    std::map<std::string, sdk::common::OwnedAttributeValue> attr_map;
-    for (auto &kv : attributes)
-      attr_map[kv.first] = std::move(kv.second);
-    printAttributes(attr_map, "\n\t");
-  }
-}
-
-void OStreamMetricExporter::printInstrumentationInfoMetricData(
-    const sdk::metrics::ScopeMetrics &info_metric,
-    const sdk::metrics::ResourceMetrics &data)
-{
-  // sout_ is shared
-  const std::lock_guard<std::mutex> serialize(serialize_lock_);
-  sout_ << "{";
-  sout_ << "\n  scope name\t: " << info_metric.scope_->GetName()
-        << "\n  schema url\t: " << info_metric.scope_->GetSchemaURL()
-        << "\n  version\t: " << info_metric.scope_->GetVersion();
-  for (const auto &record : info_metric.metric_data_)
-  {
-    sout_ << "\n  start time\t: " << timeToString(record.start_ts)
-          << "\n  end time\t: " << timeToString(record.end_ts)
-          << "\n  instrument name\t: " << record.instrument_descriptor.name_
-          << "\n  description\t: " << record.instrument_descriptor.description_
-          << "\n  unit\t\t: " << record.instrument_descriptor.unit_;
-
-    for (const auto &pd : record.point_data_attr_)
-    {
-      if (!nostd::holds_alternative<sdk::metrics::DropPointData>(pd.point_data))
-      {
-        printPointData(pd.point_data);
-        printPointAttributes(pd.attributes);
-      }
-    }
-
-    sout_ << "\n  resources\t:";
-    printResources(*data.resource_);
-  }
-  sout_ << "\n}\n";
-}
-
-void OStreamMetricExporter::printPointData(const opentelemetry::sdk::metrics::PointType &point_data)
-{
-  if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data))
-  {
-    auto sum_point_data = nostd::get<sdk::metrics::SumPointData>(point_data);
-    sout_ << "\n  type\t\t: SumPointData";
-    sout_ << "\n  value\t\t: ";
-    if (nostd::holds_alternative<double>(sum_point_data.value_))
-    {
-      sout_ << nostd::get<double>(sum_point_data.value_);
-    }
-    else if (nostd::holds_alternative<int64_t>(sum_point_data.value_))
-    {
-      sout_ << nostd::get<int64_t>(sum_point_data.value_);
-    }
-  }
-  else if (nostd::holds_alternative<sdk::metrics::HistogramPointData>(point_data))
-  {
-    auto histogram_point_data = nostd::get<sdk::metrics::HistogramPointData>(point_data);
-    sout_ << "\n  type     : HistogramPointData";
-    sout_ << "\n  count     : " << histogram_point_data.count_;
-    sout_ << "\n  sum     : ";
-    if (nostd::holds_alternative<double>(histogram_point_data.sum_))
-    {
-      sout_ << nostd::get<double>(histogram_point_data.sum_);
-    }
-    else if (nostd::holds_alternative<int64_t>(histogram_point_data.sum_))
-    {
-      sout_ << nostd::get<int64_t>(histogram_point_data.sum_);
-    }
-
-    if (histogram_point_data.record_min_max_)
-    {
-      if (nostd::holds_alternative<int64_t>(histogram_point_data.min_))
-      {
-        sout_ << "\n  min     : " << nostd::get<int64_t>(histogram_point_data.min_);
-      }
-      else if (nostd::holds_alternative<double>(histogram_point_data.min_))
-      {
-        sout_ << "\n  min     : " << nostd::get<double>(histogram_point_data.min_);
-      }
-      if (nostd::holds_alternative<int64_t>(histogram_point_data.max_))
-      {
-        sout_ << "\n  max     : " << nostd::get<int64_t>(histogram_point_data.max_);
-      }
-      if (nostd::holds_alternative<double>(histogram_point_data.max_))
-      {
-        sout_ << "\n  max     : " << nostd::get<double>(histogram_point_data.max_);
-      }
-    }
-
-    sout_ << "\n  buckets     : ";
-    printVec(sout_, histogram_point_data.boundaries_);
-
-    sout_ << "\n  counts     : ";
-    printVec(sout_, histogram_point_data.counts_);
-  }
-  else if (nostd::holds_alternative<sdk::metrics::LastValuePointData>(point_data))
-  {
-    auto last_point_data = nostd::get<sdk::metrics::LastValuePointData>(point_data);
-    sout_ << "\n  type     : LastValuePointData";
-    sout_ << "\n  timestamp     : "
-          << std::to_string(last_point_data.sample_ts_.time_since_epoch().count()) << std::boolalpha
-          << "\n  valid     : " << last_point_data.is_lastvalue_valid_;
-    sout_ << "\n  value     : ";
-    if (nostd::holds_alternative<double>(last_point_data.value_))
-    {
-      sout_ << nostd::get<double>(last_point_data.value_);
-    }
-    else if (nostd::holds_alternative<int64_t>(last_point_data.value_))
-    {
-      sout_ << nostd::get<int64_t>(last_point_data.value_);
-    }
-  }
-  else if (nostd::holds_alternative<sdk::metrics::Base2ExponentialHistogramPointData>(point_data))
-  {
-    auto histogram_point_data =
-        nostd::get<sdk::metrics::Base2ExponentialHistogramPointData>(point_data);
-    if (!histogram_point_data.positive_buckets_ && !histogram_point_data.negative_buckets_)
-    {
-      return;
-    }
-    sout_ << "\n  type: Base2ExponentialHistogramPointData";
-    sout_ << "\n  count: " << histogram_point_data.count_;
-    sout_ << "\n  sum: " << histogram_point_data.sum_;
-    sout_ << "\n  zero_count: " << histogram_point_data.zero_count_;
-    if (histogram_point_data.record_min_max_)
-    {
-      sout_ << "\n  min: " << histogram_point_data.min_;
-      sout_ << "\n  max: " << histogram_point_data.max_;
-    }
-    sout_ << "\n  scale: " << histogram_point_data.scale_;
-    sout_ << "\n  positive buckets:";
-    if (!histogram_point_data.positive_buckets_->Empty())
-    {
-      for (auto i = histogram_point_data.positive_buckets_->StartIndex();
-           i <= histogram_point_data.positive_buckets_->EndIndex(); ++i)
-      {
-        sout_ << "\n\t" << i << ": " << histogram_point_data.positive_buckets_->Get(i);
-      }
-    }
-    sout_ << "\n  negative buckets:";
-    if (!histogram_point_data.negative_buckets_->Empty())
-    {
-      for (auto i = histogram_point_data.negative_buckets_->StartIndex();
-           i <= histogram_point_data.negative_buckets_->EndIndex(); ++i)
-      {
-        sout_ << "\n\t" << i << ": " << histogram_point_data.negative_buckets_->Get(i);
-      }
-    }
-  }
-}
-
-void OStreamMetricExporter::printPointAttributes(
-    const opentelemetry::sdk::metrics::PointAttributes &point_attributes)
-{
-  sout_ << "\n  attributes\t\t: ";
-  for (const auto &kv : point_attributes)
-  {
-    sout_ << "\n\t" << kv.first << ": ";
-    opentelemetry::exporter::ostream_common::print_value(kv.second, sout_);
-  }
-}
-
-bool OStreamMetricExporter::ForceFlush(std::chrono::microseconds /* timeout */) noexcept
-{
-  const std::lock_guard<std::mutex> serialize(serialize_lock_);
-  sout_.flush();
-  return true;
-}
-
-bool OStreamMetricExporter::Shutdown(std::chrono::microseconds /* timeout */) noexcept
-{
-  is_shutdown_ = true;
-  return true;
-}
-
-bool OStreamMetricExporter::isShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/metric_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/metric_exporter_factory.cc
deleted file mode 100644
index c5750b6f2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/metric_exporter_factory.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/ostream/metric_exporter_factory.h"
-#include "opentelemetry/exporters/ostream/metric_exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OStreamMetricExporterFactory::Create()
-{
-  return Create(std::cout);
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OStreamMetricExporterFactory::Create(std::ostream &sout)
-{
-  return Create(sout, sdk::metrics::AggregationTemporality::kCumulative);
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OStreamMetricExporterFactory::Create(std::ostream &sout,
-                                     sdk::metrics::AggregationTemporality aggregation_temporality)
-{
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter(
-      new OStreamMetricExporter(sout, aggregation_temporality));
-  return exporter;
-}
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/span_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/span_exporter.cc
deleted file mode 100644
index f41d33ae6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/span_exporter.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/ostream/common_utils.h"
-#include "opentelemetry/exporters/ostream/span_exporter.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "opentelemetry/version.h"
-
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace trace_api = opentelemetry::trace;
-namespace sdkcommon = opentelemetry::sdk::common;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace trace
-{
-
-std::ostream &operator<<(std::ostream &os, trace_api::SpanKind span_kind)
-{
-  switch (span_kind)
-  {
-    case trace_api::SpanKind::kClient:
-      return os << "Client";
-    case trace_api::SpanKind::kInternal:
-      return os << "Internal";
-    case trace_api::SpanKind::kServer:
-      return os << "Server";
-    case trace_api::SpanKind::kProducer:
-      return os << "Producer";
-    case trace_api::SpanKind::kConsumer:
-      return os << "Consumer";
-  };
-  return os << "";
-}
-
-OStreamSpanExporter::OStreamSpanExporter(std::ostream &sout) noexcept : sout_(sout) {}
-
-std::unique_ptr<trace_sdk::Recordable> OStreamSpanExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<trace_sdk::Recordable>(new trace_sdk::SpanData);
-}
-
-sdk::common::ExportResult OStreamSpanExporter::Export(
-    const opentelemetry::nostd::span<std::unique_ptr<trace_sdk::Recordable>> &spans) noexcept
-{
-  if (isShutdown())
-  {
-    OTEL_INTERNAL_LOG_ERROR("[Ostream Trace Exporter] Exporting "
-                            << spans.size() << " span(s) failed, exporter is shutdown");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  for (auto &recordable : spans)
-  {
-    auto span = std::unique_ptr<trace_sdk::SpanData>(
-        static_cast<trace_sdk::SpanData *>(recordable.release()));
-
-    if (span != nullptr)
-    {
-
-      char trace_id[32]       = {0};
-      char span_id[16]        = {0};
-      char parent_span_id[16] = {0};
-
-      span->GetTraceId().ToLowerBase16(trace_id);
-      span->GetSpanId().ToLowerBase16(span_id);
-      span->GetParentSpanId().ToLowerBase16(parent_span_id);
-
-      sout_ << "{" << "\n  name          : " << span->GetName()
-            << "\n  trace_id      : " << std::string(trace_id, 32)
-            << "\n  span_id       : " << std::string(span_id, 16)
-            << "\n  tracestate    : " << span->GetSpanContext().trace_state()->ToHeader()
-            << "\n  parent_span_id: " << std::string(parent_span_id, 16)
-            << "\n  start         : " << span->GetStartTime().time_since_epoch().count()
-            << "\n  duration      : " << span->GetDuration().count()
-            << "\n  description   : " << span->GetDescription()
-            << "\n  span kind     : " << span->GetSpanKind()
-            << "\n  status        : " << statusMap[static_cast<int>(span->GetStatus())]
-            << "\n  attributes    : ";
-      printAttributes(span->GetAttributes());
-      sout_ << "\n  events        : ";
-      printEvents(span->GetEvents());
-      sout_ << "\n  links         : ";
-      printLinks(span->GetLinks());
-      sout_ << "\n  resources     : ";
-      printResources(span->GetResource());
-      sout_ << "\n  instr-lib     : ";
-      printInstrumentationScope(span->GetInstrumentationScope());
-      sout_ << "\n}\n";
-    }
-  }
-
-  return sdk::common::ExportResult::kSuccess;
-}
-
-bool OStreamSpanExporter::ForceFlush(std::chrono::microseconds /* timeout */) noexcept
-{
-  sout_.flush();
-  return true;
-}
-
-bool OStreamSpanExporter::Shutdown(std::chrono::microseconds /* timeout */) noexcept
-{
-  is_shutdown_ = true;
-  return true;
-}
-
-bool OStreamSpanExporter::isShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-
-void OStreamSpanExporter::printAttributes(
-    const std::unordered_map<std::string, sdkcommon::OwnedAttributeValue> &map,
-    const std::string &prefix)
-{
-  for (const auto &kv : map)
-  {
-    sout_ << prefix << kv.first << ": ";
-    opentelemetry::exporter::ostream_common::print_value(kv.second, sout_);
-  }
-}
-
-void OStreamSpanExporter::printEvents(const std::vector<trace_sdk::SpanDataEvent> &events)
-{
-  for (const auto &event : events)
-  {
-    sout_ << "\n\t{" << "\n\t  name          : " << event.GetName()
-          << "\n\t  timestamp     : " << event.GetTimestamp().time_since_epoch().count()
-          << "\n\t  attributes    : ";
-    printAttributes(event.GetAttributes(), "\n\t\t");
-    sout_ << "\n\t}";
-  }
-}
-
-void OStreamSpanExporter::printLinks(const std::vector<trace_sdk::SpanDataLink> &links)
-{
-  for (const auto &link : links)
-  {
-    char trace_id[32] = {0};
-    char span_id[16]  = {0};
-    link.GetSpanContext().trace_id().ToLowerBase16(trace_id);
-    link.GetSpanContext().span_id().ToLowerBase16(span_id);
-    sout_ << "\n\t{" << "\n\t  trace_id      : " << std::string(trace_id, 32)
-          << "\n\t  span_id       : " << std::string(span_id, 16)
-          << "\n\t  tracestate    : " << link.GetSpanContext().trace_state()->ToHeader()
-          << "\n\t  attributes    : ";
-    printAttributes(link.GetAttributes(), "\n\t\t");
-    sout_ << "\n\t}";
-  }
-}
-
-void OStreamSpanExporter::printResources(const opentelemetry::sdk::resource::Resource &resources)
-{
-  const auto &attributes = resources.GetAttributes();
-  if (attributes.size())
-  {
-    printAttributes(attributes, "\n\t");
-  }
-}
-
-void OStreamSpanExporter::printInstrumentationScope(
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope)
-{
-  sout_ << instrumentation_scope.GetName();
-  const auto &version = instrumentation_scope.GetVersion();
-  if (version.size())
-  {
-    sout_ << "-" << version;
-  }
-}
-
-}  // namespace trace
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/span_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/span_exporter_factory.cc
deleted file mode 100644
index eb4214aaa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/src/span_exporter_factory.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/ostream/span_exporter_factory.h"
-#include "opentelemetry/exporters/ostream/span_exporter.h"
-#include "opentelemetry/version.h"
-
-namespace trace_sdk = opentelemetry::sdk::trace;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace trace
-{
-
-std::unique_ptr<trace_sdk::SpanExporter> OStreamSpanExporterFactory::Create()
-{
-  return Create(std::cout);
-}
-
-std::unique_ptr<trace_sdk::SpanExporter> OStreamSpanExporterFactory::Create(std::ostream &sout)
-{
-  std::unique_ptr<trace_sdk::SpanExporter> exporter(new OStreamSpanExporter(sout));
-  return exporter;
-}
-
-}  // namespace trace
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_capture.h b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_capture.h
deleted file mode 100644
index 6c61c7152..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_capture.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <iostream>
-#include <sstream>
-#include <string>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace ostream
-{
-namespace test
-{
-/**
- * The OStreamCapture captures from the specified stream for its lifetime
- */
-class OStreamCapture
-{
-public:
-  /**
-   * Create a OStreamCapture which will capture the output of the ostream that it was constructed
-   * with for the lifetime of the instance.
-   */
-  OStreamCapture(std::ostream &ostream) : stream_(ostream), buf_(ostream.rdbuf())
-  {
-    stream_.rdbuf(captured_.rdbuf());
-  }
-
-  ~OStreamCapture() { stream_.rdbuf(buf_); }
-
-  /**
-   * Returns the captured data from the stream.
-   */
-  std::string GetCaptured() const { return captured_.str(); }
-
-private:
-  std::ostream &stream_;
-  std::streambuf *buf_;
-  std::stringstream captured_;
-};
-
-/**
- * Helper method to invoke the passed func while recording the output of the specified stream and
- * return the output afterwards.
- */
-template <typename Func>
-std::string WithOStreamCapture(std::ostream &stream, Func func)
-{
-  OStreamCapture capture(stream);
-  func();
-  return capture.GetCaptured();
-}
-
-}  // namespace test
-}  // namespace ostream
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_log_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_log_test.cc
deleted file mode 100644
index bf3af291f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_log_test.cc
+++ /dev/null
@@ -1,538 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <array>
-#include <chrono>
-#include <initializer_list>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/ostream/log_record_exporter.h"
-#include "opentelemetry/exporters/ostream/log_record_exporter_factory.h"
-#include "opentelemetry/logs/event_id.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/provider.h"
-#include "opentelemetry/sdk/logs/read_write_log_record.h"
-#include "opentelemetry/sdk/logs/readable_log_record.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/version/version.h"
-#include "opentelemetry/version.h"
-
-namespace sdklogs      = opentelemetry::sdk::logs;
-namespace logs_api     = opentelemetry::logs;
-namespace nostd        = opentelemetry::nostd;
-namespace exporterlogs = opentelemetry::exporter::logs;
-namespace common       = opentelemetry::common;
-
-using Attributes = std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace logs
-{
-
-namespace
-{
-static opentelemetry::sdk::instrumentationscope::InstrumentationScope GetTestInstrumentationScope()
-{
-  opentelemetry::sdk::instrumentationscope::InstrumentationScope result =
-      opentelemetry::sdk::logs::ReadableLogRecord::GetDefaultInstrumentationScope();
-
-  result.SetAttribute("scope.attr.key", "scope.attr.value");
-
-  return result;
-}
-}  // namespace
-
-// Test that when OStream Log exporter is shutdown, no logs should be sent to stream
-TEST(OStreamLogRecordExporter, Shutdown)
-{
-  auto exporter =
-      std::unique_ptr<sdklogs::LogRecordExporter>(new exporterlogs::OStreamLogRecordExporter);
-
-  // Save cerr original buffer here
-  std::streambuf *original = std::cerr.rdbuf();
-
-  // Redirect cerr to our stringstream buffer
-  std::stringstream output;
-  std::cerr.rdbuf(output.rdbuf());
-
-  EXPECT_TRUE(exporter->Shutdown());
-
-  // After processor/exporter is shutdown, no logs should be sent to stream
-  auto record = exporter->MakeRecordable();
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())->SetBody("Log record not empty");
-  exporter->Export(nostd::span<std::unique_ptr<sdklogs::Recordable>>(&record, 1));
-
-  // Restore original stringstream buffer
-  std::cerr.rdbuf(original);
-  std::string err_message =
-      "[Ostream Log Exporter] Exporting 1 log(s) failed, exporter is shutdown";
-  EXPECT_TRUE(output.str().find(err_message) != std::string::npos);
-}
-
-// ---------------------------------- Print to cout -------------------------
-
-// Testing what a default log record that has no values changed will print out
-// This function tests MakeRecordable() as well as Export().
-TEST(OstreamLogExporter, DefaultLogRecordToCout)
-{
-  auto exporter = std::unique_ptr<sdklogs::LogRecordExporter>(
-      new exporterlogs::OStreamLogRecordExporter(std::cout));
-
-  // Save cout's original buffer here
-  std::streambuf *original = std::cout.rdbuf();
-
-  // Redirect cout to our stringstream buffer
-  std::stringstream output;
-  std::cout.rdbuf(output.rdbuf());
-
-  // Pass a default recordable created by the exporter to be exported
-  auto log_record = exporter->MakeRecordable();
-  opentelemetry::sdk::instrumentationscope::InstrumentationScope instrumentation_scope =
-      GetTestInstrumentationScope();
-  log_record->SetInstrumentationScope(instrumentation_scope);
-  exporter->Export(nostd::span<std::unique_ptr<sdklogs::Recordable>>(&log_record, 1));
-
-  // Restore cout's original stringstream
-  std::cout.rdbuf(original);
-
-  std::vector<std::string> expected_output{
-      "{\n",
-      "  timestamp          : 0\n",
-      "  severity_num       : 0\n",
-      "  severity_text      : INVALID\n",
-      "  body               : \n",
-      "  resource           : \n",
-      "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
-      "    telemetry.sdk.name: opentelemetry\n",
-      "    telemetry.sdk.language: cpp\n",
-      "  attributes         : \n",
-      "  event_id           : 0\n",
-      "  event_name         : \n",
-      "  trace_id           : 00000000000000000000000000000000\n",
-      "  span_id            : 0000000000000000\n",
-      "  trace_flags        : 00\n",
-      "  scope              : \n",
-      "    name             : otel-cpp\n",
-      "    version          : " OPENTELEMETRY_SDK_VERSION "\n",
-      "    schema_url       : https://opentelemetry.io/schemas/1.15.0\n",
-      "    attributes       : \n",
-      "      scope.attr.key: scope.attr.value\n",
-      "}\n"};
-
-  std::string ostream_output = output.str();
-  for (auto &expected : expected_output)
-  {
-    std::string::size_type result = ostream_output.find(expected);
-    if (result == std::string::npos)
-    {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
-    }
-    ASSERT_NE(result, std::string::npos);
-  }
-}
-
-// Testing what a log record with only the "timestamp", "severity", "name" and "message" fields set,
-// will print out
-TEST(OStreamLogRecordExporter, SimpleLogToCout)
-{
-  // Initialize an Ostream exporter to std::cout
-  auto exporter = std::unique_ptr<sdklogs::LogRecordExporter>(
-      new exporterlogs::OStreamLogRecordExporter(std::cout));
-
-  // Save original stream buffer, then redirect cout to our new stream buffer
-  std::streambuf *original = std::cout.rdbuf();
-  std::stringstream output;
-  std::cout.rdbuf(output.rdbuf());
-
-  // Pass a default recordable created by the exporter to be exported
-  // Create a log record and manually timestamp, severity, name, message
-  common::SystemTimestamp now(std::chrono::system_clock::now());
-
-  auto record = std::unique_ptr<sdklogs::Recordable>(new sdklogs::ReadWriteLogRecord());
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())->SetTimestamp(now);
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())->SetObservedTimestamp(now);
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())
-      ->SetSeverity(logs_api::Severity::kTrace);  // kTrace has enum value of 1
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())->SetBody("Message");
-
-  opentelemetry::sdk::instrumentationscope::InstrumentationScope instrumentation_scope =
-      GetTestInstrumentationScope();
-  record->SetInstrumentationScope(instrumentation_scope);
-
-  // Log a record to cout
-  exporter->Export(nostd::span<std::unique_ptr<sdklogs::Recordable>>(&record, 1));
-
-  // Reset cout's original stringstream buffer
-  std::cout.rdbuf(original);
-
-  std::vector<std::string> expected_output{
-      "{\n",
-      "  timestamp          : " + std::to_string(now.time_since_epoch().count()) +
-          "\n"
-          "  observed_timestamp : " +
-          std::to_string(now.time_since_epoch().count()) +
-          "\n"
-          "  severity_num       : 1\n"
-          "  severity_text      : TRACE\n"
-          "  body               : Message\n",
-      "  resource           : \n",
-      "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
-      "    telemetry.sdk.name: opentelemetry\n",
-      "    telemetry.sdk.language: cpp\n",
-      "  attributes         : \n",
-      "  event_id           : 0\n",
-      "  event_name         : \n",
-      "  trace_id           : 00000000000000000000000000000000\n",
-      "  span_id            : 0000000000000000\n",
-      "  trace_flags        : 00\n",
-      "  scope              : \n",
-      "    name             : otel-cpp\n",
-      "    version          : " OPENTELEMETRY_SDK_VERSION "\n",
-      "    schema_url       : https://opentelemetry.io/schemas/1.15.0\n",
-      "    attributes       : \n",
-      "      scope.attr.key: scope.attr.value\n",
-      "}\n"};
-
-  std::string ostream_output = output.str();
-  for (auto &expected : expected_output)
-  {
-    std::string::size_type result = ostream_output.find(expected);
-    if (result == std::string::npos)
-    {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
-    }
-    ASSERT_NE(result, std::string::npos);
-  }
-}
-
-// ---------------------------------- Print to cerr --------------------------
-
-// Testing what a log record with only the "resource" and "attributes" fields
-// (i.e. KeyValueIterable types) set with primitive types, will print out
-TEST(OStreamLogRecordExporter, LogWithStringAttributesToCerr)
-{
-  // Initialize an Ostream exporter to cerr
-  auto exporter = std::unique_ptr<sdklogs::LogRecordExporter>(
-      new exporterlogs::OStreamLogRecordExporter(std::cerr));
-
-  // Save original stream buffer, then redirect cout to our new stream buffer
-  std::streambuf *original = std::cerr.rdbuf();
-  std::stringstream stdcerrOutput;
-  std::cerr.rdbuf(stdcerrOutput.rdbuf());
-
-  // Pass a recordable created by the exporter to be exported
-  auto record = exporter->MakeRecordable();
-
-  // Set resources for this log record only of type <string, string>
-  auto resource = opentelemetry::sdk::resource::Resource::Create({{"key1", "val1"}});
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())->SetResource(resource);
-
-  // Set attributes to this log record of type <string, AttributeValue>
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())->SetAttribute("a", true);
-
-  opentelemetry::sdk::instrumentationscope::InstrumentationScope instrumentation_scope =
-      GetTestInstrumentationScope();
-  record->SetInstrumentationScope(instrumentation_scope);
-
-  // Log record to cerr
-  exporter->Export(nostd::span<std::unique_ptr<sdklogs::Recordable>>(&record, 1));
-
-  // Reset cerr's original stringstream buffer
-  std::cerr.rdbuf(original);
-
-  std::vector<std::string> expected_output{
-      "{\n",
-      "  timestamp          : 0\n",
-      "  severity_num       : 0\n",
-      "  severity_text      : INVALID\n",
-      "  body               : \n",
-      "  resource           : \n",
-      "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
-      "    telemetry.sdk.name: opentelemetry\n",
-      "    telemetry.sdk.language: cpp\n",
-      "    service.name: unknown_service\n",
-      "    key1: val1\n",
-      "  attributes         : \n",
-      "    a: 1\n",
-      "  event_id           : 0\n",
-      "  event_name         : \n",
-      "  trace_id           : 00000000000000000000000000000000\n",
-      "  span_id            : 0000000000000000\n",
-      "  trace_flags        : 00\n",
-      "  scope              : \n",
-      "    name             : otel-cpp\n",
-      "    version          : " OPENTELEMETRY_SDK_VERSION "\n",
-      "    schema_url       : https://opentelemetry.io/schemas/1.15.0\n",
-      "    attributes       : \n",
-      "      scope.attr.key: scope.attr.value\n",
-      "}\n"};
-
-  std::string ostream_output = stdcerrOutput.str();
-  for (auto &expected : expected_output)
-  {
-    std::string::size_type result = ostream_output.find(expected);
-    if (result == std::string::npos)
-    {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
-    }
-    ASSERT_NE(result, std::string::npos);
-  }
-}
-
-// ---------------------------------- Print to clog -------------------------
-
-// Testing what a log record with only the "resource", and "attributes" fields
-// (i.e. KeyValueIterable types), set with 2D arrays as values, will print out
-TEST(OStreamLogRecordExporter, LogWithVariantTypesToClog)
-{
-
-  // Initialize an Ostream exporter to cerr
-  auto exporter = std::unique_ptr<sdklogs::LogRecordExporter>(
-      new exporterlogs::OStreamLogRecordExporter(std::clog));
-
-  // Save original stream buffer, then redirect cout to our new stream buffer
-  std::streambuf *original = std::clog.rdbuf();
-  std::stringstream stdclogOutput;
-  std::clog.rdbuf(stdclogOutput.rdbuf());
-
-  // Pass a recordable created by the exporter to be exported
-  auto record = exporter->MakeRecordable();
-
-  // Set resources for this log record of only integer types as the value
-  std::array<int, 3> array1 = {1, 2, 3};
-  nostd::span<int> data1{array1.data(), array1.size()};
-
-  auto resource = opentelemetry::sdk::resource::Resource::Create({{"res1", data1}});
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())->SetResource(resource);
-
-  // Set resources for this log record of bool types as the value
-  // e.g. key/value is a par of type <string, array of bools>
-  std::array<bool, 3> array = {false, true, false};
-  static_cast<sdklogs::ReadWriteLogRecord *>(record.get())
-      ->SetAttribute("attr1", nostd::span<bool>{array.data(), array.size()});
-
-  opentelemetry::sdk::instrumentationscope::InstrumentationScope instrumentation_scope =
-      GetTestInstrumentationScope();
-  record->SetInstrumentationScope(instrumentation_scope);
-
-  // Log a record to clog
-  exporter->Export(nostd::span<std::unique_ptr<sdklogs::Recordable>>(&record, 1));
-
-  // Reset clog's original stringstream buffer
-  std::clog.rdbuf(original);
-
-  std::vector<std::string> expected_output{
-      "{\n",
-      "  timestamp          : 0\n",
-      "  severity_num       : 0\n",
-      "  severity_text      : INVALID\n",
-      "  body               : \n",
-      "  resource           : \n",
-      "    service.name: unknown_service\n",
-      "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
-      "    telemetry.sdk.name: opentelemetry\n",
-      "    telemetry.sdk.language: cpp\n",
-      "    res1: [1,2,3]\n",
-      "  attributes         : \n",
-      "    attr1: [0,1,0]\n",
-      "  event_id           : 0\n",
-      "  event_name         : \n",
-      "  trace_id           : 00000000000000000000000000000000\n",
-      "  span_id            : 0000000000000000\n",
-      "  trace_flags        : 00\n",
-      "  scope              : \n",
-      "    name             : otel-cpp\n",
-      "    version          : " OPENTELEMETRY_SDK_VERSION "\n",
-      "    schema_url       : https://opentelemetry.io/schemas/1.15.0\n",
-      "    attributes       : \n",
-      "      scope.attr.key: scope.attr.value\n",
-      "}\n"};
-
-  std::string ostream_output = stdclogOutput.str();
-  for (auto &expected : expected_output)
-  {
-    std::string::size_type result = ostream_output.find(expected);
-    if (result == std::string::npos)
-    {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
-    }
-    ASSERT_NE(result, std::string::npos);
-  }
-}
-
-// // ---------------------------------- Integration Tests -------------------------
-
-// Test using the simple log processor and ostream exporter to cout
-// and use the rest of the logging pipeline (Logger, LoggerProvider, Provider) as well
-TEST(OStreamLogRecordExporter, IntegrationTest)
-{
-  // Initialize a logger
-  auto exporter =
-      std::unique_ptr<sdklogs::LogRecordExporter>(new exporterlogs::OStreamLogRecordExporter);
-  auto sdkProvider = std::shared_ptr<sdklogs::LoggerProvider>(new sdklogs::LoggerProvider());
-  sdkProvider->AddProcessor(std::unique_ptr<sdklogs::LogRecordProcessor>(
-      new sdklogs::SimpleLogRecordProcessor(std::move(exporter))));
-  auto apiProvider = nostd::shared_ptr<logs_api::LoggerProvider>(sdkProvider);
-  auto provider    = nostd::shared_ptr<logs_api::LoggerProvider>(apiProvider);
-  sdklogs::Provider::SetLoggerProvider(provider);
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = logs_api::Provider::GetLoggerProvider()->GetLogger(
-      "Logger", "opentelelemtry_library", OPENTELEMETRY_SDK_VERSION, schema_url,
-      {{"scope.attr.key", 123}});
-
-  // Back up cout's streambuf
-  std::streambuf *original = std::cout.rdbuf();
-
-  // Redirect cout to our string stream
-  std::stringstream stdcoutOutput;
-  std::cout.rdbuf(stdcoutOutput.rdbuf());
-
-  // Write a log to ostream exporter
-  common::SystemTimestamp now(std::chrono::system_clock::now());
-  logger->EmitLogRecord(logs_api::Severity::kDebug, "Hello", now);
-
-  // Restore cout's original streambuf
-  std::cout.rdbuf(original);
-
-  // Compare actual vs expected outputs
-  std::vector<std::string> expected_output{
-      "{\n",
-      "  timestamp          : " + std::to_string(now.time_since_epoch().count()) + "\n",
-      "  severity_num       : 5\n",
-      "  severity_text      : DEBUG\n",
-      "  body               : Hello\n",
-      "  resource           : \n",
-      "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
-      "    service.name: unknown_service\n",
-      "    telemetry.sdk.name: opentelemetry\n",
-      "    telemetry.sdk.language: cpp\n",
-      "  attributes         : \n",
-      "  event_id           : 0\n",
-      "  event_name         : \n",
-      "  trace_id           : 00000000000000000000000000000000\n",
-      "  span_id            : 0000000000000000\n",
-      "  trace_flags        : 00\n",
-      "  scope              : \n",
-      "    name             : opentelelemtry_library\n",
-      "    version          : " OPENTELEMETRY_SDK_VERSION "\n",
-      "    schema_url       : https://opentelemetry.io/schemas/1.11.0\n",
-      "    attributes       : \n",
-      "      scope.attr.key: 123\n",
-      "}\n"};
-
-  std::string ostream_output = stdcoutOutput.str();
-  for (auto &expected : expected_output)
-  {
-    std::string::size_type result = ostream_output.find(expected);
-    if (result == std::string::npos)
-    {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
-    }
-    ASSERT_NE(result, std::string::npos);
-  }
-}
-
-// Test using the simple log processor and ostream exporter to cout
-// and use the rest of the logging pipeline (Logger, LoggerProvider, Provider) and user-facing API
-// as well
-TEST(OStreamLogRecordExporter, IntegrationTestWithEventId)
-{
-  // Initialize a logger
-  auto exporter =
-      std::unique_ptr<sdklogs::LogRecordExporter>(new exporterlogs::OStreamLogRecordExporter);
-  auto sdkProvider = std::shared_ptr<sdklogs::LoggerProvider>(new sdklogs::LoggerProvider());
-  sdkProvider->AddProcessor(std::unique_ptr<sdklogs::LogRecordProcessor>(
-      new sdklogs::SimpleLogRecordProcessor(std::move(exporter))));
-  auto apiProvider = nostd::shared_ptr<logs_api::LoggerProvider>(sdkProvider);
-  auto provider    = nostd::shared_ptr<logs_api::LoggerProvider>(apiProvider);
-  sdklogs::Provider::SetLoggerProvider(provider);
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = logs_api::Provider::GetLoggerProvider()->GetLogger(
-      "Logger", "opentelelemtry_library", OPENTELEMETRY_SDK_VERSION, schema_url,
-      {{"scope.attr.key", 123}});
-
-  // Back up cout's streambuf
-  std::streambuf *original = std::cout.rdbuf();
-
-  // Redirect cout to our string stream
-  std::stringstream stdcoutOutput;
-  std::cout.rdbuf(stdcoutOutput.rdbuf());
-
-  logs_api::EventId event_id{12345678, "test_event_id"};
-
-  // Write a log to ostream exporter
-  logger->Debug(event_id, "Hello {key1} {key2}",
-                common::MakeKeyValueIterableView<Attributes>({{"key1", 123}, {"key2", "value2"}}));
-
-  // Restore cout's original streambuf
-  std::cout.rdbuf(original);
-
-  // Compare actual vs expected outputs
-  std::vector<std::string> expected_output{
-      "  severity_num       : 5\n",
-      "  severity_text      : DEBUG\n",
-      "  body               : Hello {key1} {key2}\n",
-      "  resource           : \n",
-      "    telemetry.sdk.version: " OPENTELEMETRY_VERSION "\n",
-      "    service.name: unknown_service\n",
-      "    telemetry.sdk.name: opentelemetry\n",
-      "    telemetry.sdk.language: cpp\n",
-      "  attributes         : \n",
-      "  event_id           : 12345678\n",
-      "  event_name         : test_event_id\n",
-      "  trace_id           : 00000000000000000000000000000000\n",
-      "  span_id            : 0000000000000000\n",
-      "  trace_flags        : 00\n",
-      "  scope              : \n",
-      "    name             : opentelelemtry_library\n",
-      "    version          : " OPENTELEMETRY_SDK_VERSION "\n",
-      "    schema_url       : https://opentelemetry.io/schemas/1.11.0\n",
-      "    attributes       : \n",
-      "      scope.attr.key: 123\n",
-      "}\n"};
-
-  std::string ostream_output = stdcoutOutput.str();
-  for (auto &expected : expected_output)
-  {
-    std::string::size_type result = ostream_output.find(expected);
-    if (result == std::string::npos)
-    {
-      std::cout << "Can not find: \"" << expected << "\" in\n" << ostream_output << '\n';
-    }
-    ASSERT_NE(result, std::string::npos);
-  }
-}
-
-// Test using the factory to create the ostream exporter
-TEST(OStreamLogRecordExporter, Factory)
-{
-  auto exporter = OStreamLogRecordExporterFactory::Create();
-  ASSERT_NE(exporter, nullptr);
-}
-
-}  // namespace logs
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_metric_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_metric_test.cc
deleted file mode 100644
index de79c3c75..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_metric_test.cc
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstdint>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/ostream/metric_exporter.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/version/version.h"
-
-namespace metric_sdk      = opentelemetry::sdk::metrics;
-namespace nostd           = opentelemetry::nostd;
-namespace exportermetrics = opentelemetry::exporter::metrics;
-
-TEST(OStreamMetricsExporter, Shutdown)
-{
-  auto exporter =
-      std::unique_ptr<metric_sdk::PushMetricExporter>(new exportermetrics::OStreamMetricExporter);
-  ASSERT_TRUE(exporter->Shutdown());
-  auto result = exporter->Export(metric_sdk::ResourceMetrics{});
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-TEST(OStreamMetricsExporter, ExportSumPointData)
-{
-  auto exporter =
-      std::unique_ptr<metric_sdk::PushMetricExporter>(new exportermetrics::OStreamMetricExporter);
-
-  metric_sdk::SumPointData sum_point_data{};
-  sum_point_data.value_ = 10.0;
-  metric_sdk::SumPointData sum_point_data2{};
-  sum_point_data2.value_ = 20.0;
-  metric_sdk::ResourceMetrics data;
-  auto resource = opentelemetry::sdk::resource::Resource::Create(
-      opentelemetry::sdk::resource::ResourceAttributes{});
-  data.resource_ = &resource;
-  auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "library_name", "1.2.0");
-  metric_sdk::MetricData metric_data{
-      metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                       metric_sdk::InstrumentType::kCounter,
-                                       metric_sdk::InstrumentValueType::kDouble},
-      metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-      opentelemetry::common::SystemTimestamp{},
-      std::vector<metric_sdk::PointDataAttributes>{
-          {metric_sdk::PointAttributes{{"a1", "b1"}}, sum_point_data},
-          {metric_sdk::PointAttributes{{"a1", "b1"}}, sum_point_data2}}};
-  data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-      {scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-
-  std::stringstream stdoutOutput;
-  std::streambuf *sbuf = std::cout.rdbuf();
-  std::cout.rdbuf(stdoutOutput.rdbuf());
-
-  auto result = exporter->Export(data);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-  std::cout.rdbuf(sbuf);
-
-  std::string expected_output =
-      "{"
-      "\n  scope name\t: library_name"
-      "\n  schema url\t: "
-      "\n  version\t: 1.2.0"
-      "\n  start time\t: Thu Jan  1 00:00:00 1970"
-      "\n  end time\t: Thu Jan  1 00:00:00 1970"
-      "\n  instrument name\t: library_name"
-      "\n  description\t: description"
-      "\n  unit\t\t: unit"
-      "\n  type\t\t: SumPointData"
-      "\n  value\t\t: 10"
-      "\n  attributes\t\t: "
-      "\n\ta1: b1"
-      "\n  type\t\t: SumPointData"
-      "\n  value\t\t: 20"
-      "\n  attributes\t\t: "
-      "\n\ta1: b1"
-      "\n  resources\t:"
-      "\n\tservice.name: unknown_service"
-      "\n\ttelemetry.sdk.language: cpp"
-      "\n\ttelemetry.sdk.name: opentelemetry"
-      "\n\ttelemetry.sdk.version: ";
-  expected_output += OPENTELEMETRY_SDK_VERSION;
-  expected_output += "\n}\n";
-  ASSERT_EQ(stdoutOutput.str(), expected_output);
-}
-
-TEST(OStreamMetricsExporter, ExportHistogramPointData)
-{
-  auto exporter =
-      std::unique_ptr<metric_sdk::PushMetricExporter>(new exportermetrics::OStreamMetricExporter);
-
-  metric_sdk::HistogramPointData histogram_point_data{};
-  histogram_point_data.boundaries_ = std::vector<double>{10.1, 20.2, 30.2};
-  histogram_point_data.count_      = 3;
-  histogram_point_data.counts_     = {200, 300, 400, 500};
-  histogram_point_data.sum_        = 900.5;
-  histogram_point_data.min_        = 1.8;
-  histogram_point_data.max_        = 12.0;
-  metric_sdk::HistogramPointData histogram_point_data2{};
-  histogram_point_data2.boundaries_ = std::vector<double>{10.0, 20.0, 30.0};
-  histogram_point_data2.count_      = 3;
-  histogram_point_data2.counts_     = {200, 300, 400, 500};
-  histogram_point_data2.sum_        = static_cast<int64_t>(900);
-  metric_sdk::ResourceMetrics data;
-  auto resource = opentelemetry::sdk::resource::Resource::Create(
-      opentelemetry::sdk::resource::ResourceAttributes{});
-  data.resource_ = &resource;
-  auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "library_name", "1.2.0");
-  metric_sdk::MetricData metric_data{
-      metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                       metric_sdk::InstrumentType::kCounter,
-                                       metric_sdk::InstrumentValueType::kDouble},
-      metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-      opentelemetry::common::SystemTimestamp{},
-      std::vector<metric_sdk::PointDataAttributes>{
-          {metric_sdk::PointAttributes{{"a1", "b1"}, {"a2", "b2"}}, histogram_point_data},
-          {metric_sdk::PointAttributes{{"a1", "b1"}}, histogram_point_data2}}};
-  data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-      {scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-
-  std::stringstream stdoutOutput;
-  std::streambuf *sbuf = std::cout.rdbuf();
-  std::cout.rdbuf(stdoutOutput.rdbuf());
-
-  auto result = exporter->Export(data);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-  std::cout.rdbuf(sbuf);
-
-  std::string expected_output =
-      "{"
-      "\n  scope name\t: library_name"
-      "\n  schema url\t: "
-      "\n  version\t: 1.2.0"
-      "\n  start time\t: Thu Jan  1 00:00:00 1970"
-      "\n  end time\t: Thu Jan  1 00:00:00 1970"
-      "\n  instrument name\t: library_name"
-      "\n  description\t: description"
-      "\n  unit\t\t: unit"
-      "\n  type     : HistogramPointData"
-      "\n  count     : 3"
-      "\n  sum     : 900.5"
-      "\n  min     : 1.8"
-      "\n  max     : 12"
-      "\n  buckets     : [10.1, 20.2, 30.2, ]"
-      "\n  counts     : [200, 300, 400, 500, ]"
-      "\n  attributes\t\t: "
-      "\n\ta1: b1"
-      "\n\ta2: b2"
-      "\n  type     : HistogramPointData"
-      "\n  count     : 3"
-      "\n  sum     : 900"
-      "\n  min     : 0"
-      "\n  max     : 0"
-      "\n  buckets     : [10, 20, 30, ]"
-      "\n  counts     : [200, 300, 400, 500, ]"
-      "\n  attributes\t\t: "
-      "\n\ta1: b1"
-      "\n  resources\t:"
-      "\n\tservice.name: unknown_service"
-      "\n\ttelemetry.sdk.language: cpp"
-      "\n\ttelemetry.sdk.name: opentelemetry"
-      "\n\ttelemetry.sdk.version: ";
-  expected_output += OPENTELEMETRY_SDK_VERSION;
-  expected_output += "\n}\n";
-  ASSERT_EQ(stdoutOutput.str(), expected_output);
-}
-
-TEST(OStreamMetricsExporter, ExportBase2ExponentialHistogramPointData)
-{
-  auto exporter =
-      std::unique_ptr<metric_sdk::PushMetricExporter>(new exportermetrics::OStreamMetricExporter);
-
-  metric_sdk::Base2ExponentialHistogramPointData histogram_point_data1;
-  histogram_point_data1.count_          = 3;
-  histogram_point_data1.sum_            = 6.5;
-  histogram_point_data1.min_            = 0.0;
-  histogram_point_data1.max_            = 3.5;
-  histogram_point_data1.scale_          = 3;
-  histogram_point_data1.record_min_max_ = true;
-  histogram_point_data1.zero_count_     = 1;
-  histogram_point_data1.positive_buckets_ =
-      std::make_unique<opentelemetry::sdk::metrics::AdaptingCircularBufferCounter>(10);
-  histogram_point_data1.negative_buckets_ =
-      std::make_unique<opentelemetry::sdk::metrics::AdaptingCircularBufferCounter>(10);
-  histogram_point_data1.positive_buckets_->Increment(1, 1);
-  histogram_point_data1.negative_buckets_->Increment(-2, 1);
-
-  metric_sdk::Base2ExponentialHistogramPointData histogram_point_data2;
-  histogram_point_data2.count_          = 4;
-  histogram_point_data2.sum_            = 6.2;
-  histogram_point_data2.min_            = -0.03;
-  histogram_point_data2.max_            = 3.5;
-  histogram_point_data2.scale_          = 3;
-  histogram_point_data2.record_min_max_ = false;
-  histogram_point_data2.zero_count_     = 2;
-  histogram_point_data2.positive_buckets_ =
-      std::make_unique<opentelemetry::sdk::metrics::AdaptingCircularBufferCounter>(10);
-  histogram_point_data2.negative_buckets_ =
-      std::make_unique<opentelemetry::sdk::metrics::AdaptingCircularBufferCounter>(10);
-  histogram_point_data2.positive_buckets_->Increment(3, 1);
-  histogram_point_data2.negative_buckets_->Increment(-2, 1);
-  histogram_point_data2.negative_buckets_->Increment(-4, 2);
-
-  metric_sdk::ResourceMetrics data;
-  auto resource = opentelemetry::sdk::resource::Resource::Create(
-      opentelemetry::sdk::resource::ResourceAttributes{});
-  data.resource_ = &resource;
-  auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "library_name", "1.2.0");
-  metric_sdk::MetricData metric_data{
-      metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                       metric_sdk::InstrumentType::kCounter,
-                                       metric_sdk::InstrumentValueType::kDouble},
-      metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-      opentelemetry::common::SystemTimestamp{},
-      std::vector<metric_sdk::PointDataAttributes>{
-          {metric_sdk::PointAttributes{{"a1", "b1"}, {"a2", "b2"}}, histogram_point_data1},
-          {metric_sdk::PointAttributes{{"a1", "b1"}}, histogram_point_data2}}};
-  data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-      {scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-
-  std::stringstream stdoutOutput;
-  std::streambuf *sbuf = std::cout.rdbuf();
-  std::cout.rdbuf(stdoutOutput.rdbuf());
-
-  auto result = exporter->Export(data);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-  std::cout.rdbuf(sbuf);
-
-  std::string expected_output =
-      "{"
-      "\n  scope name\t: library_name"
-      "\n  schema url\t: "
-      "\n  version\t: 1.2.0"
-      "\n  start time\t: Thu Jan  1 00:00:00 1970"
-      "\n  end time\t: Thu Jan  1 00:00:00 1970"
-      "\n  instrument name\t: library_name"
-      "\n  description\t: description"
-      "\n  unit\t\t: unit"
-      "\n  type: Base2ExponentialHistogramPointData"
-      "\n  count: 3"
-      "\n  sum: 6.5"
-      "\n  zero_count: 1"
-      "\n  min: 0"
-      "\n  max: 3.5"
-      "\n  scale: 3"
-      "\n  positive buckets:"
-      "\n\t1: 1"
-      "\n  negative buckets:"
-      "\n\t-2: 1"
-      "\n  attributes\t\t: "
-      "\n\ta1: b1"
-      "\n\ta2: b2"
-      "\n  type: Base2ExponentialHistogramPointData"
-      "\n  count: 4"
-      "\n  sum: 6.2"
-      "\n  zero_count: 2"
-      "\n  scale: 3"
-      "\n  positive buckets:"
-      "\n\t3: 1"
-      "\n  negative buckets:"
-      "\n\t-4: 2"
-      "\n\t-3: 0"
-      "\n\t-2: 1"
-      "\n  attributes\t\t: "
-      "\n\ta1: b1"
-      "\n  resources\t:"
-      "\n\tservice.name: unknown_service"
-      "\n\ttelemetry.sdk.language: cpp"
-      "\n\ttelemetry.sdk.name: opentelemetry"
-      "\n\ttelemetry.sdk.version: ";
-  expected_output += OPENTELEMETRY_SDK_VERSION;
-  expected_output += "\n}\n";
-  ASSERT_EQ(stdoutOutput.str(), expected_output);
-}
-
-TEST(OStreamMetricsExporter, ExportLastValuePointData)
-{
-  auto exporter =
-      std::unique_ptr<metric_sdk::PushMetricExporter>(new exportermetrics::OStreamMetricExporter);
-
-  metric_sdk::ResourceMetrics data;
-  auto resource = opentelemetry::sdk::resource::Resource::Create(
-      opentelemetry::sdk::resource::ResourceAttributes{});
-  data.resource_ = &resource;
-  auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "library_name", "1.2.0");
-  metric_sdk::LastValuePointData last_value_point_data{};
-  last_value_point_data.value_              = 10.0;
-  last_value_point_data.is_lastvalue_valid_ = true;
-  last_value_point_data.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-  metric_sdk::LastValuePointData last_value_point_data2{};
-  last_value_point_data2.value_              = static_cast<int64_t>(20);
-  last_value_point_data2.is_lastvalue_valid_ = true;
-  last_value_point_data2.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-  metric_sdk::MetricData metric_data{
-      metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                       metric_sdk::InstrumentType::kCounter,
-                                       metric_sdk::InstrumentValueType::kDouble},
-      metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-      opentelemetry::common::SystemTimestamp{},
-      std::vector<metric_sdk::PointDataAttributes>{
-          {metric_sdk::PointAttributes{}, last_value_point_data},
-          {metric_sdk::PointAttributes{}, last_value_point_data2}}};
-  data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-      {scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-
-  std::stringstream stdoutOutput;
-  std::streambuf *sbuf = std::cout.rdbuf();
-  std::cout.rdbuf(stdoutOutput.rdbuf());
-
-  auto result = exporter->Export(data);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-  std::cout.rdbuf(sbuf);
-
-  std::string expected_output =
-      "{"
-      "\n  scope name\t: library_name"
-      "\n  schema url\t: "
-      "\n  version\t: 1.2.0"
-      "\n  start time\t: Thu Jan  1 00:00:00 1970"
-      "\n  end time\t: Thu Jan  1 00:00:00 1970"
-      "\n  instrument name\t: library_name"
-      "\n  description\t: description"
-      "\n  unit\t\t: unit"
-      "\n  type     : LastValuePointData"
-      "\n  timestamp     : 0"
-      "\n  valid     : true"
-      "\n  value     : 10"
-      "\n  attributes\t\t: "
-      "\n  type     : LastValuePointData"
-      "\n  timestamp     : 0"
-      "\n  valid     : true"
-      "\n  value     : 20"
-      "\n  attributes\t\t: "
-      "\n  resources\t:"
-      "\n\tservice.name: unknown_service"
-      "\n\ttelemetry.sdk.language: cpp"
-      "\n\ttelemetry.sdk.name: opentelemetry"
-      "\n\ttelemetry.sdk.version: ";
-  expected_output += OPENTELEMETRY_SDK_VERSION;
-  expected_output += "\n}\n";
-  ASSERT_EQ(stdoutOutput.str(), expected_output);
-}
-
-TEST(OStreamMetricsExporter, ExportDropPointData)
-{
-  auto exporter =
-      std::unique_ptr<metric_sdk::PushMetricExporter>(new exportermetrics::OStreamMetricExporter);
-
-  metric_sdk::ResourceMetrics data;
-  auto resource = opentelemetry::sdk::resource::Resource::Create(
-      opentelemetry::sdk::resource::ResourceAttributes{});
-  data.resource_ = &resource;
-  auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "library_name", "1.2.0");
-  metric_sdk::DropPointData drop_point_data{};
-  metric_sdk::DropPointData drop_point_data2{};
-  metric_sdk::MetricData metric_data{
-      metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                       metric_sdk::InstrumentType::kCounter,
-                                       metric_sdk::InstrumentValueType::kDouble},
-      metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-      opentelemetry::common::SystemTimestamp{},
-      std::vector<metric_sdk::PointDataAttributes>{
-          {metric_sdk::PointAttributes{}, drop_point_data},
-          {metric_sdk::PointAttributes{}, drop_point_data2}}};
-  data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-      {scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-
-  std::stringstream stdoutOutput;
-  std::streambuf *sbuf = std::cout.rdbuf();
-  std::cout.rdbuf(stdoutOutput.rdbuf());
-
-  auto result = exporter->Export(data);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-  std::cout.rdbuf(sbuf);
-
-  std::string expected_output =
-      "{"
-      "\n  scope name\t: library_name"
-      "\n  schema url\t: "
-      "\n  version\t: 1.2.0"
-      "\n  start time\t: Thu Jan  1 00:00:00 1970"
-      "\n  end time\t: Thu Jan  1 00:00:00 1970"
-      "\n  instrument name\t: library_name"
-      "\n  description\t: description"
-      "\n  unit\t\t: unit"
-      "\n  resources\t:"
-      "\n\tservice.name: unknown_service"
-      "\n\ttelemetry.sdk.language: cpp"
-      "\n\ttelemetry.sdk.name: opentelemetry"
-      "\n\ttelemetry.sdk.version: ";
-  expected_output += OPENTELEMETRY_SDK_VERSION;
-  expected_output += "\n}\n";
-
-  ASSERT_EQ(stdoutOutput.str(), expected_output);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_span_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_span_test.cc
deleted file mode 100644
index 86336a779..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/ostream/test/ostream_span_test.cc
+++ /dev/null
@@ -1,412 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <array>
-#include <chrono>
-#include <initializer_list>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/ostream/span_exporter.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "ostream_capture.h"
-
-using namespace opentelemetry::exporter::ostream::test;
-
-namespace trace         = opentelemetry::trace;
-namespace common        = opentelemetry::common;
-namespace nostd         = opentelemetry::nostd;
-namespace trace_sdk     = opentelemetry::sdk::trace;
-namespace resource      = opentelemetry::sdk::resource;
-namespace exportertrace = opentelemetry::exporter::trace;
-
-using Attributes = std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>;
-
-class TestResource : public resource::Resource
-{
-public:
-  TestResource(const resource::ResourceAttributes &attributes = resource::ResourceAttributes())
-      : resource::Resource(attributes)
-  {}
-};
-
-// Testing Shutdown functionality of OStreamSpanExporter, should expect no data to be sent to Stream
-TEST(OStreamSpanExporter, Shutdown)
-{
-  auto exporter  = std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter);
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-  recordable->SetName("Test Span");
-
-  // Capture the output of cerr
-  const auto captured = WithOStreamCapture(std::cerr, [&]() {
-    EXPECT_TRUE(processor->Shutdown());
-    processor->OnEnd(std::move(recordable));
-  });
-  std::string err_message =
-      "[Ostream Trace Exporter] Exporting 1 span(s) failed, exporter is shutdown";
-  EXPECT_TRUE(captured.find(err_message) != std::string::npos);
-}
-
-constexpr const char *kDefaultSpanPrinted =
-    "{\n"
-    "  name          : \n"
-    "  trace_id      : 00000000000000000000000000000000\n"
-    "  span_id       : 0000000000000000\n"
-    "  tracestate    : \n"
-    "  parent_span_id: 0000000000000000\n"
-    "  start         : 0\n"
-    "  duration      : 0\n"
-    "  description   : \n"
-    "  span kind     : Internal\n"
-    "  status        : Unset\n"
-    "  attributes    : \n"
-    "  events        : \n"
-    "  links         : \n"
-    "  resources     : \n"
-    "  instr-lib     : unknown_service\n"
-    "}\n";
-
-// Testing what a default span that is not changed will print out, either all 0's or empty values
-TEST(OStreamSpanExporter, PrintDefaultSpan)
-{
-  std::stringstream output;
-  auto exporter =
-      std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter(output));
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-
-  processor->OnEnd(std::move(recordable));
-
-  EXPECT_EQ(output.str(), kDefaultSpanPrinted);
-}
-
-TEST(OStreamSpanExporter, PrintSpanWithBasicFields)
-{
-  std::stringstream output;
-  auto exporter =
-      std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter(output));
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-
-  constexpr uint8_t trace_id_buf[]       = {1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t span_id_buf[]        = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t parent_span_id_buf[] = {8, 7, 6, 5, 4, 3, 2, 1};
-  trace::TraceId trace_id{trace_id_buf};
-  trace::SpanId span_id{span_id_buf};
-  trace::SpanId parent_span_id{parent_span_id_buf};
-  const auto trace_state = trace::TraceState::GetDefault()->Set("state1", "value");
-  const trace::SpanContext span_context{
-      trace_id, span_id, trace::TraceFlags{trace::TraceFlags::kIsSampled}, true, trace_state};
-
-  recordable->SetIdentity(span_context, parent_span_id);
-  recordable->SetName("Test Span");
-  common::SystemTimestamp now(std::chrono::system_clock::now());
-  recordable->SetStartTime(now);
-  recordable->SetDuration(std::chrono::nanoseconds(100));
-  recordable->SetStatus(trace::StatusCode::kOk, "Test Description");
-  recordable->SetSpanKind(trace::SpanKind::kClient);
-
-  TestResource resource1(resource::ResourceAttributes({{"key1", "val1"}}));
-  recordable->SetResource(resource1);
-
-  processor->OnEnd(std::move(recordable));
-
-  std::string start = std::to_string(now.time_since_epoch().count());
-
-  std::string expectedOutput =
-      "{\n"
-      "  name          : Test Span\n"
-      "  trace_id      : 01020304050607080102030405060708\n"
-      "  span_id       : 0102030405060708\n"
-      "  tracestate    : state1=value\n"
-      "  parent_span_id: 0807060504030201\n"
-      "  start         : " +
-      start +
-      "\n"
-      "  duration      : 100\n"
-      "  description   : Test Description\n"
-      "  span kind     : Client\n"
-      "  status        : Ok\n"
-      "  attributes    : \n"
-      "  events        : \n"
-      "  links         : \n"
-      "  resources     : \n"
-      "\tkey1: val1\n"
-      "  instr-lib     : unknown_service\n"
-      "}\n";
-  EXPECT_EQ(output.str(), expectedOutput);
-}
-
-TEST(OStreamSpanExporter, PrintSpanWithAttribute)
-{
-  std::stringstream output;
-  auto exporter =
-      std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter(output));
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-
-  recordable->SetAttribute("attr1", "string");
-
-  processor->OnEnd(std::move(recordable));
-
-  std::string expectedOutput =
-      "{\n"
-      "  name          : \n"
-      "  trace_id      : 00000000000000000000000000000000\n"
-      "  span_id       : 0000000000000000\n"
-      "  tracestate    : \n"
-      "  parent_span_id: 0000000000000000\n"
-      "  start         : 0\n"
-      "  duration      : 0\n"
-      "  description   : \n"
-      "  span kind     : Internal\n"
-      "  status        : Unset\n"
-      "  attributes    : \n"
-      "\tattr1: string\n"
-      "  events        : \n"
-      "  links         : \n"
-      "  resources     : \n"
-      "  instr-lib     : unknown_service\n"
-      "}\n";
-  EXPECT_EQ(output.str(), expectedOutput);
-}
-
-TEST(OStreamSpanExporter, PrintSpanWithArrayAttribute)
-{
-  std::stringstream output;
-  auto exporter =
-      std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter(output));
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-
-  std::array<int, 3> array1 = {1, 2, 3};
-  nostd::span<int> span1{array1.data(), array1.size()};
-  recordable->SetAttribute("array1", span1);
-
-  processor->OnEnd(std::move(recordable));
-
-  std::string expectedOutput =
-      "{\n"
-      "  name          : \n"
-      "  trace_id      : 00000000000000000000000000000000\n"
-      "  span_id       : 0000000000000000\n"
-      "  tracestate    : \n"
-      "  parent_span_id: 0000000000000000\n"
-      "  start         : 0\n"
-      "  duration      : 0\n"
-      "  description   : \n"
-      "  span kind     : Internal\n"
-      "  status        : Unset\n"
-      "  attributes    : \n"
-      "\tarray1: [1,2,3]\n"
-      "  events        : \n"
-      "  links         : \n"
-      "  resources     : \n"
-      "  instr-lib     : unknown_service\n"
-      "}\n";
-  EXPECT_EQ(output.str(), expectedOutput);
-}
-
-TEST(OStreamSpanExporter, PrintSpanWithEvents)
-{
-  std::stringstream output;
-  auto exporter =
-      std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter(output));
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-  common::SystemTimestamp now(std::chrono::system_clock::now());
-  common::SystemTimestamp next(std::chrono::system_clock::now() + std::chrono::seconds(1));
-
-  std::string now_str  = std::to_string(now.time_since_epoch().count());
-  std::string next_str = std::to_string(next.time_since_epoch().count());
-
-  recordable->AddEvent("hello", now);
-  recordable->AddEvent("world", next,
-                       common::KeyValueIterableView<Attributes>({{"attr1", "string"}}));
-
-  processor->OnEnd(std::move(recordable));
-
-  std::string expectedOutput =
-      "{\n"
-      "  name          : \n"
-      "  trace_id      : 00000000000000000000000000000000\n"
-      "  span_id       : 0000000000000000\n"
-      "  tracestate    : \n"
-      "  parent_span_id: 0000000000000000\n"
-      "  start         : 0\n"
-      "  duration      : 0\n"
-      "  description   : \n"
-      "  span kind     : Internal\n"
-      "  status        : Unset\n"
-      "  attributes    : \n"
-      "  events        : \n"
-      "\t{\n"
-      "\t  name          : hello\n"
-      "\t  timestamp     : " +
-      now_str +
-      "\n"
-      "\t  attributes    : \n"
-      "\t}\n"
-      "\t{\n"
-      "\t  name          : world\n"
-      "\t  timestamp     : " +
-      next_str +
-      "\n"
-      "\t  attributes    : \n"
-      "\t\tattr1: string\n"
-      "\t}\n"
-      "  links         : \n"
-      "  resources     : \n"
-      "  instr-lib     : unknown_service\n"
-      "}\n";
-  EXPECT_EQ(output.str(), expectedOutput);
-}
-
-TEST(OStreamSpanExporter, PrintSpanWithLinks)
-{
-  std::stringstream output;
-  auto exporter =
-      std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter(output));
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-
-  // produce valid SpanContext with pseudo span and trace Id.
-  uint8_t span_id_buf[trace::SpanId::kSize] = {
-      1,
-  };
-  trace::SpanId span_id{span_id_buf};
-  uint8_t trace_id_buf[trace::TraceId::kSize] = {
-      2,
-  };
-  trace::TraceId trace_id{trace_id_buf};
-  const auto span_context =
-      trace::SpanContext(trace_id, span_id, trace::TraceFlags{trace::TraceFlags::kIsSampled}, true);
-
-  // and another to check preserving order.
-  uint8_t span_id_buf2[trace::SpanId::kSize] = {
-      3,
-  };
-  trace::SpanId span_id2{span_id_buf2};
-  const auto span_context2 =
-      trace::SpanContext(trace_id, span_id2, trace::TraceFlags{trace::TraceFlags::kIsSampled}, true,
-                         trace::TraceState::FromHeader("state1=value"));
-
-  recordable->AddLink(span_context);
-  recordable->AddLink(span_context2,
-                      common::KeyValueIterableView<Attributes>({{"attr1", "string"}}));
-
-  processor->OnEnd(std::move(recordable));
-
-  std::string expectedOutput =
-      "{\n"
-      "  name          : \n"
-      "  trace_id      : 00000000000000000000000000000000\n"
-      "  span_id       : 0000000000000000\n"
-      "  tracestate    : \n"
-      "  parent_span_id: 0000000000000000\n"
-      "  start         : 0\n"
-      "  duration      : 0\n"
-      "  description   : \n"
-      "  span kind     : Internal\n"
-      "  status        : Unset\n"
-      "  attributes    : \n"
-      "  events        : \n"
-      "  links         : \n"
-      "\t{\n"
-      "\t  trace_id      : 02000000000000000000000000000000\n"
-      "\t  span_id       : 0100000000000000\n"
-      "\t  tracestate    : \n"
-      "\t  attributes    : \n"
-      "\t}\n"
-      "\t{\n"
-      "\t  trace_id      : 02000000000000000000000000000000\n"
-      "\t  span_id       : 0300000000000000\n"
-      "\t  tracestate    : state1=value\n"
-      "\t  attributes    : \n"
-      "\t\tattr1: string\n"
-      "\t}\n"
-      "  resources     : \n"
-      "  instr-lib     : unknown_service\n"
-      "}\n";
-  EXPECT_EQ(output.str(), expectedOutput);
-}
-
-// Test with the three common ostreams, tests are more of a sanity check and usage examples.
-TEST(OStreamSpanExporter, PrintSpanToCout)
-{
-  auto exporter  = std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter);
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-
-  const auto captured =
-      WithOStreamCapture(std::cout, [&]() { processor->OnEnd(std::move(recordable)); });
-
-  EXPECT_EQ(captured, kDefaultSpanPrinted);
-}
-
-TEST(OStreamSpanExporter, PrintSpanToCerr)
-{
-  auto exporter =
-      std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter(std::cerr));
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-
-  const auto captured =
-      WithOStreamCapture(std::cerr, [&]() { processor->OnEnd(std::move(recordable)); });
-
-  EXPECT_EQ(captured, kDefaultSpanPrinted);
-}
-
-TEST(OStreamSpanExporter, PrintSpanToClog)
-{
-  auto exporter =
-      std::unique_ptr<trace_sdk::SpanExporter>(new exportertrace::OStreamSpanExporter(std::clog));
-  auto processor = std::shared_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-
-  auto recordable = processor->MakeRecordable();
-
-  const auto captured =
-      WithOStreamCapture(std::clog, [&]() { processor->OnEnd(std::move(recordable)); });
-
-  EXPECT_EQ(captured, kDefaultSpanPrinted);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/BUILD b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/BUILD
deleted file mode 100644
index 6198e39fe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/BUILD
+++ /dev/null
@@ -1,781 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "otlp_recordable",
-    srcs = [
-        "src/otlp_environment.cc",
-        "src/otlp_log_recordable.cc",
-        "src/otlp_metric_utils.cc",
-        "src/otlp_populate_attribute_utils.cc",
-        "src/otlp_recordable.cc",
-        "src/otlp_recordable_utils.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_log_recordable.h",
-        "include/opentelemetry/exporters/otlp/otlp_metric_utils.h",
-        "include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h",
-        "include/opentelemetry/exporters/otlp/otlp_preferred_temporality.h",
-        "include/opentelemetry/exporters/otlp/otlp_recordable.h",
-        "include/opentelemetry/exporters/otlp/otlp_recordable_utils.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["otlp"],
-    deps = [
-        "//sdk/src/logs",
-        "//sdk/src/resource",
-        "//sdk/src/trace",
-        "@com_github_opentelemetry_proto//:logs_service_proto_cc",
-        "@com_github_opentelemetry_proto//:metrics_service_proto_cc",
-        "@com_github_opentelemetry_proto//:trace_service_proto_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_grpc_client",
-    srcs = [
-        "src/otlp_grpc_client.cc",
-        "src/otlp_grpc_client_factory.cc",
-        "src/otlp_grpc_utils.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_client.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_client_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_utils.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_grpc",
-    ],
-    deps = [
-        "//ext:headers",
-        "//sdk/src/common:global_log_handler",
-        "@com_github_grpc_grpc//:grpc++",
-        "@com_github_opentelemetry_proto//:common_proto_cc",
-        "@com_github_opentelemetry_proto//:logs_service_grpc_cc",
-        "@com_github_opentelemetry_proto//:metrics_service_grpc_cc",
-        "@com_github_opentelemetry_proto//:trace_service_grpc_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_grpc_exporter",
-    srcs = [
-        "src/otlp_grpc_exporter.cc",
-        "src/otlp_grpc_exporter_factory.cc",
-        "src/otlp_grpc_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_utils.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_grpc",
-    ],
-    deps = [
-        ":otlp_recordable",
-        ":otlp_grpc_client",
-        "//ext:headers",
-        "//sdk/src/trace",
-
-        # For gRPC
-        "@com_github_opentelemetry_proto//:trace_service_grpc_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_http_client",
-    srcs = [
-        "src/otlp_http.cc",
-        "src/otlp_http_client.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_http.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_client.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    copts = [
-        "-DCURL_STATICLIB",
-    ],
-    linkopts = select({
-        "//bazel:windows": [
-            "-DEFAULTLIB:advapi32.lib",
-            "-DEFAULTLIB:crypt32.lib",
-        ],
-        "//conditions:default": [],
-    }),
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_http",
-        "otlp_http_log",
-    ],
-    deps = [
-        "//api",
-        "//ext/src/http/client/curl:http_client_curl",
-        "//sdk:headers",
-        "//sdk/src/common:base64",
-        "@com_github_opentelemetry_proto//:common_proto_cc",
-        "@com_google_absl//absl/strings",
-        "@github_nlohmann_json//:json",
-    ],
-)
-
-cc_library(
-    name = "otlp_http_exporter",
-    srcs = [
-        "src/otlp_http_exporter.cc",
-        "src/otlp_http_exporter_factory.cc",
-        "src/otlp_http_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_http",
-    ],
-    deps = [
-        ":otlp_http_client",
-        ":otlp_recordable",
-        "//sdk/src/trace",
-        "@com_github_opentelemetry_proto//:trace_service_proto_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_file_client",
-    srcs = [
-        "src/otlp_file_client.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_client.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_client_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_file",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common:base64",
-        "@com_github_opentelemetry_proto//:common_proto_cc",
-        "@com_google_absl//absl/strings",
-        "@github_nlohmann_json//:json",
-    ],
-)
-
-cc_library(
-    name = "otlp_file_exporter",
-    srcs = [
-        "src/otlp_file_exporter.cc",
-        "src/otlp_file_exporter_factory.cc",
-        "src/otlp_file_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_exporter_runtime_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_file",
-    ],
-    deps = [
-        ":otlp_file_client",
-        ":otlp_recordable",
-        "//sdk/src/trace",
-        "@com_github_opentelemetry_proto//:trace_service_proto_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_grpc_metric_exporter",
-    srcs = [
-        "src/otlp_grpc_metric_exporter.cc",
-        "src/otlp_grpc_metric_exporter_factory.cc",
-        "src/otlp_grpc_metric_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_grpc_metric",
-    ],
-    deps = [
-        ":otlp_recordable",
-        ":otlp_grpc_client",
-        "//ext:headers",
-        "//sdk/src/metrics",
-
-        # For gRPC
-        "@com_github_opentelemetry_proto//:metrics_service_grpc_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_http_metric_exporter",
-    srcs = [
-        "src/otlp_http_metric_exporter.cc",
-        "src/otlp_http_metric_exporter_factory.cc",
-        "src/otlp_http_metric_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_http_metric",
-    ],
-    deps = [
-        ":otlp_http_client",
-        ":otlp_recordable",
-        "//sdk/src/metrics",
-        "@com_github_opentelemetry_proto//:metrics_service_proto_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_file_metric_exporter",
-    srcs = [
-        "src/otlp_file_metric_exporter.cc",
-        "src/otlp_file_metric_exporter_factory.cc",
-        "src/otlp_file_metric_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_metric_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_runtime_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_file_metric",
-    ],
-    deps = [
-        ":otlp_file_client",
-        ":otlp_recordable",
-        "//sdk/src/metrics",
-        "@com_github_opentelemetry_proto//:metrics_service_proto_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_http_log_record_exporter",
-    srcs = [
-        "src/otlp_http_log_record_exporter.cc",
-        "src/otlp_http_log_record_exporter_factory.cc",
-        "src/otlp_http_log_record_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_http_log",
-    ],
-    deps = [
-        ":otlp_http_client",
-        ":otlp_recordable",
-        "//sdk/src/logs",
-        "@com_github_opentelemetry_proto//:logs_service_proto_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_file_log_record_exporter",
-    srcs = [
-        "src/otlp_file_log_record_exporter.cc",
-        "src/otlp_file_log_record_exporter_factory.cc",
-        "src/otlp_file_log_record_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_runtime_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_file_log",
-    ],
-    deps = [
-        ":otlp_file_client",
-        ":otlp_recordable",
-        "//sdk/src/logs",
-        "@com_github_opentelemetry_proto//:logs_service_proto_cc",
-    ],
-)
-
-cc_library(
-    name = "otlp_grpc_log_record_exporter",
-    srcs = [
-        "src/otlp_grpc_log_record_exporter.cc",
-        "src/otlp_grpc_log_record_exporter_factory.cc",
-        "src/otlp_grpc_log_record_exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h",
-        "include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
-        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
-    ],
-    strip_include_prefix = "include",
-    tags = [
-        "otlp",
-        "otlp_grpc_log",
-    ],
-    deps = [
-        ":otlp_recordable",
-        ":otlp_grpc_client",
-        "//ext:headers",
-        "//sdk/src/logs",
-        # For gRPC
-        "@com_github_opentelemetry_proto//:logs_service_grpc_cc",
-    ],
-)
-
-cc_test(
-    name = "otlp_recordable_test",
-    srcs = ["test/otlp_recordable_test.cc"],
-    tags = [
-        "otlp",
-        "test",
-    ],
-    deps = [
-        ":otlp_recordable",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_log_recordable_test",
-    srcs = [
-        "test/otlp_log_recordable_test.cc",
-        "test/otlp_metrics_serialization_test.cc",
-    ],
-    tags = [
-        "otlp",
-        "test",
-    ],
-    deps = [
-        ":otlp_recordable",
-        "//sdk/src/metrics",
-        "@com_github_opentelemetry_proto//:logs_service_proto_cc",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_file_client_test",
-    srcs = ["test/otlp_file_client_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_file",
-        "test",
-    ],
-    deps = [
-        ":otlp_file_client",
-        ":otlp_file_exporter",
-        ":otlp_recordable",
-        "//api",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_grpc_exporter_test",
-    srcs = ["test/otlp_grpc_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_grpc",
-        "test",
-    ],
-    deps = [
-        ":otlp_grpc_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_grpc_target_test",
-    srcs = ["test/otlp_grpc_target_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_grpc",
-        "test",
-    ],
-    deps = [
-        ":otlp_grpc_client",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_grpc_exporter_factory_test",
-    srcs = ["test/otlp_grpc_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_grpc",
-        "test",
-    ],
-    deps = [
-        ":otlp_grpc_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_http_exporter_test",
-    srcs = ["test/otlp_http_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_http",
-        "test",
-    ],
-    deps = [
-        ":otlp_http_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "//test_common/src/http/client/nosend:http_client_nosend",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_http_exporter_factory_test",
-    srcs = ["test/otlp_http_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_http",
-        "test",
-    ],
-    deps = [
-        ":otlp_http_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "//test_common/src/http/client/nosend:http_client_nosend",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_file_exporter_test",
-    srcs = ["test/otlp_file_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_file",
-        "test",
-    ],
-    deps = [
-        ":otlp_file_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_file_exporter_factory_test",
-    srcs = ["test/otlp_file_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_file",
-        "test",
-    ],
-    deps = [
-        ":otlp_file_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_http_log_record_exporter_test",
-    srcs = ["test/otlp_http_log_record_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_http_log",
-        "test",
-    ],
-    deps = [
-        ":otlp_http_log_record_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "//test_common/src/http/client/nosend:http_client_nosend",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_http_log_record_exporter_factory_test",
-    srcs = ["test/otlp_http_log_record_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_http_log",
-        "test",
-    ],
-    deps = [
-        ":otlp_http_log_record_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "//test_common/src/http/client/nosend:http_client_nosend",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_file_log_record_exporter_test",
-    srcs = ["test/otlp_file_log_record_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_file_log",
-        "test",
-    ],
-    deps = [
-        ":otlp_file_log_record_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_file_log_record_exporter_factory_test",
-    srcs = ["test/otlp_file_log_record_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_file_log",
-        "test",
-    ],
-    deps = [
-        ":otlp_file_log_record_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_grpc_log_record_exporter_test",
-    srcs = ["test/otlp_grpc_log_record_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_grpc_log",
-        "test",
-    ],
-    deps = [
-        ":otlp_grpc_exporter",
-        ":otlp_grpc_log_record_exporter",
-        "//api",
-        "//sdk/src/logs",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_grpc_log_record_exporter_factory_test",
-    srcs = ["test/otlp_grpc_log_record_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_grpc_log",
-        "test",
-    ],
-    deps = [
-        ":otlp_grpc_log_record_exporter",
-        "//api",
-        "//sdk/src/logs",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_grpc_metric_exporter_test",
-    srcs = ["test/otlp_grpc_metric_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_grpc_metric",
-        "test",
-    ],
-    deps = [
-        ":otlp_grpc_metric_exporter",
-        "//api",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_grpc_metric_exporter_factory_test",
-    srcs = ["test/otlp_grpc_metric_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_grpc_metric",
-        "test",
-    ],
-    deps = [
-        ":otlp_grpc_metric_exporter",
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_http_metric_exporter_test",
-    srcs = ["test/otlp_http_metric_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_http_metric",
-        "test",
-    ],
-    deps = [
-        ":otlp_http_metric_exporter",
-        "//api",
-        "//test_common/src/http/client/nosend:http_client_nosend",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_http_metric_exporter_factory_test",
-    srcs = ["test/otlp_http_metric_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_http_metric",
-        "test",
-    ],
-    deps = [
-        ":otlp_http_metric_exporter",
-        "//api",
-        "//test_common/src/http/client/nosend:http_client_nosend",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_file_metric_exporter_test",
-    srcs = ["test/otlp_file_metric_exporter_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_file_metric",
-        "test",
-    ],
-    deps = [
-        ":otlp_file_metric_exporter",
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "otlp_file_metric_exporter_factory_test",
-    srcs = ["test/otlp_file_metric_exporter_factory_test.cc"],
-    tags = [
-        "otlp",
-        "otlp_file_metric",
-        "test",
-    ],
-    deps = [
-        ":otlp_file_metric_exporter",
-        "//api",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "otlp_grpc_exporter_benchmark",
-    srcs = ["test/otlp_grpc_exporter_benchmark.cc"],
-    tags = [
-        "benchmark",
-        "otlp",
-        "otlp_grpc",
-        "test",
-    ],
-    deps = [
-        ":otlp_grpc_exporter",
-        "//examples/common/foo_library:common_foo_library",
-        "//sdk/src/metrics",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/CMakeLists.txt
deleted file mode 100644
index 3ec20517e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/CMakeLists.txt
+++ /dev/null
@@ -1,623 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(
-  opentelemetry_otlp_recordable
-  src/otlp_environment.cc src/otlp_log_recordable.cc src/otlp_recordable.cc
-  src/otlp_populate_attribute_utils.cc src/otlp_recordable_utils.cc
-  src/otlp_metric_utils.cc)
-set_target_properties(opentelemetry_otlp_recordable PROPERTIES EXPORT_NAME
-                                                               otlp_recordable)
-set_target_version(opentelemetry_otlp_recordable)
-
-target_include_directories(
-  opentelemetry_otlp_recordable
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-         "$<INSTALL_INTERFACE:include>")
-
-set(OPENTELEMETRY_OTLP_TARGETS opentelemetry_otlp_recordable)
-
-target_link_libraries(opentelemetry_otlp_recordable PUBLIC opentelemetry_logs)
-target_link_libraries(opentelemetry_otlp_recordable
-                      PUBLIC opentelemetry_metrics)
-
-if(WITH_OTLP_GRPC)
-  find_package(gRPC REQUIRED)
-  add_library(
-    opentelemetry_exporter_otlp_grpc_client
-    src/otlp_grpc_client.cc src/otlp_grpc_client_factory.cc
-    src/otlp_grpc_utils.cc)
-  set_target_properties(opentelemetry_exporter_otlp_grpc_client
-                        PROPERTIES EXPORT_NAME otlp_grpc_client)
-  set_target_version(opentelemetry_exporter_otlp_grpc_client)
-
-  # Because opentelemetry_proto_grpc depends on gRPC, and gRPC can only be
-  # linked in one dynamic library or executable (otherwise, there may be
-  # conflicts with some global variables in certain versions of gRPC), we have
-  # switched the link for opentelemetry_exporter_otlp_grpc_client into all
-  # targets that depend on opentelemetry_proto_grpc.
-  target_link_libraries(
-    opentelemetry_exporter_otlp_grpc_client
-    PUBLIC opentelemetry_sdk opentelemetry_common
-           # gRPC::grpc++ must be linked before opentelemetry_proto_grpc.
-           opentelemetry_proto_grpc
-    PRIVATE gRPC::grpc++ opentelemetry_ext)
-
-  get_target_property(GRPC_INCLUDE_DIRECTORY gRPC::grpc++
-                      INTERFACE_INCLUDE_DIRECTORIES)
-  if(GRPC_INCLUDE_DIRECTORY)
-    target_include_directories(
-      opentelemetry_exporter_otlp_grpc_client BEFORE
-      PUBLIC "$<BUILD_INTERFACE:${GRPC_INCLUDE_DIRECTORY}>")
-  endif()
-  target_include_directories(
-    opentelemetry_exporter_otlp_grpc_client
-    PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-           "$<INSTALL_INTERFACE:include>")
-
-  list(APPEND OPENTELEMETRY_OTLP_GRPC_TARGETS
-       opentelemetry_exporter_otlp_grpc_client opentelemetry_proto_grpc)
-
-  add_library(
-    opentelemetry_exporter_otlp_grpc
-    src/otlp_grpc_exporter.cc src/otlp_grpc_exporter_factory.cc
-    src/otlp_grpc_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_grpc
-                        PROPERTIES EXPORT_NAME otlp_grpc_exporter)
-  set_target_version(opentelemetry_exporter_otlp_grpc)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_grpc
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_grpc_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_GRPC_TARGETS opentelemetry_exporter_otlp_grpc)
-
-  add_library(
-    opentelemetry_exporter_otlp_grpc_log
-    src/otlp_grpc_log_record_exporter.cc
-    src/otlp_grpc_log_record_exporter_factory.cc
-    src/otlp_grpc_log_record_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_grpc_log
-                        PROPERTIES EXPORT_NAME otlp_grpc_log_record_exporter)
-  set_target_version(opentelemetry_exporter_otlp_grpc_log)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_grpc_log
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_grpc_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_GRPC_TARGETS
-       opentelemetry_exporter_otlp_grpc_log)
-
-  add_library(
-    opentelemetry_exporter_otlp_grpc_metrics
-    src/otlp_grpc_metric_exporter.cc src/otlp_grpc_metric_exporter_factory.cc
-    src/otlp_grpc_metric_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_grpc_metrics
-                        PROPERTIES EXPORT_NAME otlp_grpc_metrics_exporter)
-  set_target_version(opentelemetry_exporter_otlp_grpc_metrics)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_grpc_metrics
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_grpc_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_GRPC_TARGETS
-       opentelemetry_exporter_otlp_grpc_metrics)
-endif()
-
-if(WITH_OTLP_HTTP)
-  add_library(opentelemetry_exporter_otlp_http_client src/otlp_http.cc
-                                                      src/otlp_http_client.cc)
-  set_target_properties(opentelemetry_exporter_otlp_http_client
-                        PROPERTIES EXPORT_NAME otlp_http_client)
-  set_target_version(opentelemetry_exporter_otlp_http_client)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_http_client
-    PUBLIC opentelemetry_sdk opentelemetry_ext
-    # Links flags of opentelemetry_http_client_curl should be public when
-    # building internal components
-    PRIVATE opentelemetry_proto
-            "$<BUILD_INTERFACE:opentelemetry_http_client_curl>"
-            "$<BUILD_INTERFACE:nlohmann_json::nlohmann_json>"
-            "$<INSTALL_INTERFACE:opentelemetry_http_client_curl>")
-
-  if(nlohmann_json_clone)
-    add_dependencies(opentelemetry_exporter_otlp_http_client
-                     nlohmann_json::nlohmann_json)
-  endif()
-  target_include_directories(
-    opentelemetry_exporter_otlp_http_client
-    PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-           "$<INSTALL_INTERFACE:include>")
-
-  list(APPEND OPENTELEMETRY_OTLP_HTTP_TARGETS
-       opentelemetry_exporter_otlp_http_client)
-
-  add_library(
-    opentelemetry_exporter_otlp_http
-    src/otlp_http_exporter.cc src/otlp_http_exporter_factory.cc
-    src/otlp_http_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_http
-                        PROPERTIES EXPORT_NAME otlp_http_exporter)
-  set_target_version(opentelemetry_exporter_otlp_http)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_http
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_http_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_HTTP_TARGETS opentelemetry_exporter_otlp_http)
-
-  add_library(
-    opentelemetry_exporter_otlp_http_log
-    src/otlp_http_log_record_exporter.cc
-    src/otlp_http_log_record_exporter_factory.cc
-    src/otlp_http_log_record_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_http_log
-                        PROPERTIES EXPORT_NAME otlp_http_log_record_exporter)
-  set_target_version(opentelemetry_exporter_otlp_http_log)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_http_log
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_http_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_HTTP_TARGETS
-       opentelemetry_exporter_otlp_http_log)
-
-  add_library(
-    opentelemetry_exporter_otlp_http_metric
-    src/otlp_http_metric_exporter.cc src/otlp_http_metric_exporter_factory.cc
-    src/otlp_http_metric_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_http_metric
-                        PROPERTIES EXPORT_NAME otlp_http_metric_exporter)
-  set_target_version(opentelemetry_exporter_otlp_http_metric)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_http_metric
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_http_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_HTTP_TARGETS
-       opentelemetry_exporter_otlp_http_metric)
-endif()
-
-if(WITH_OTLP_FILE)
-  add_library(opentelemetry_exporter_otlp_file_client src/otlp_file_client.cc)
-  set_target_properties(opentelemetry_exporter_otlp_file_client
-                        PROPERTIES EXPORT_NAME otlp_file_client)
-  set_target_version(opentelemetry_exporter_otlp_file_client)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_file_client
-    PUBLIC opentelemetry_sdk opentelemetry_common
-    PRIVATE opentelemetry_proto $<BUILD_INTERFACE:nlohmann_json::nlohmann_json>)
-
-  if(nlohmann_json_clone)
-    add_dependencies(opentelemetry_exporter_otlp_file_client
-                     nlohmann_json::nlohmann_json)
-  endif()
-  target_include_directories(
-    opentelemetry_exporter_otlp_file_client
-    PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-           "$<INSTALL_INTERFACE:include>")
-
-  list(APPEND OPENTELEMETRY_OTLP_FILE_TARGETS
-       opentelemetry_exporter_otlp_file_client)
-
-  add_library(
-    opentelemetry_exporter_otlp_file
-    src/otlp_file_exporter.cc src/otlp_file_exporter_factory.cc
-    src/otlp_file_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_file
-                        PROPERTIES EXPORT_NAME otlp_file_exporter)
-  set_target_version(opentelemetry_exporter_otlp_file)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_file
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_file_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_FILE_TARGETS opentelemetry_exporter_otlp_file)
-
-  add_library(
-    opentelemetry_exporter_otlp_file_log
-    src/otlp_file_log_record_exporter.cc
-    src/otlp_file_log_record_exporter_factory.cc
-    src/otlp_file_log_record_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_file_log
-                        PROPERTIES EXPORT_NAME otlp_file_log_record_exporter)
-  set_target_version(opentelemetry_exporter_otlp_file_log)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_file_log
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_file_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_FILE_TARGETS
-       opentelemetry_exporter_otlp_file_log)
-
-  add_library(
-    opentelemetry_exporter_otlp_file_metric
-    src/otlp_file_metric_exporter.cc src/otlp_file_metric_exporter_factory.cc
-    src/otlp_file_metric_exporter_options.cc)
-
-  set_target_properties(opentelemetry_exporter_otlp_file_metric
-                        PROPERTIES EXPORT_NAME otlp_file_metric_exporter)
-  set_target_version(opentelemetry_exporter_otlp_file_metric)
-
-  target_link_libraries(
-    opentelemetry_exporter_otlp_file_metric
-    PUBLIC opentelemetry_otlp_recordable
-           opentelemetry_exporter_otlp_file_client)
-
-  list(APPEND OPENTELEMETRY_OTLP_FILE_TARGETS
-       opentelemetry_exporter_otlp_file_metric)
-endif()
-
-target_link_libraries(
-  opentelemetry_otlp_recordable
-  PUBLIC opentelemetry_trace opentelemetry_resources opentelemetry_proto)
-
-otel_add_component(
-  COMPONENT
-  exporters_otlp_common
-  TARGETS
-  opentelemetry_otlp_recordable
-  opentelemetry_proto
-  FILES_DIRECTORY
-  "include/opentelemetry/exporters/otlp"
-  FILES_DESTINATION
-  "include/opentelemetry/exporters"
-  FILES_MATCHING
-  PATTERN
-  "*.h"
-  PATTERN
-  "otlp_http*.h"
-  EXCLUDE
-  PATTERN
-  "otlp_grpc*.h"
-  EXCLUDE
-  PATTERN
-  "otlp_file*.h"
-  EXCLUDE)
-
-if(WITH_OTLP_GRPC)
-  otel_add_component(
-    COMPONENT
-    exporters_otlp_grpc
-    TARGETS
-    ${OPENTELEMETRY_OTLP_GRPC_TARGETS}
-    FILES_DIRECTORY
-    "include/opentelemetry/exporters/otlp"
-    FILES_DESTINATION
-    "include/opentelemetry/exporters"
-    FILES_MATCHING
-    PATTERN
-    "otlp_grpc*.h")
-endif()
-
-if(WITH_OTLP_HTTP)
-  otel_add_component(
-    COMPONENT
-    exporters_otlp_http
-    TARGETS
-    ${OPENTELEMETRY_OTLP_HTTP_TARGETS}
-    FILES_DIRECTORY
-    "include/opentelemetry/exporters/otlp"
-    FILES_DESTINATION
-    "include/opentelemetry/exporters"
-    FILES_MATCHING
-    PATTERN
-    "otlp_http*.h")
-endif()
-
-if(WITH_OTLP_FILE)
-  otel_add_component(
-    COMPONENT
-    exporters_otlp_file
-    TARGETS
-    ${OPENTELEMETRY_OTLP_FILE_TARGETS}
-    FILES_DIRECTORY
-    "include/opentelemetry/exporters/otlp"
-    FILES_DESTINATION
-    "include/opentelemetry/exporters"
-    FILES_MATCHING
-    PATTERN
-    "otlp_file*.h")
-endif()
-
-if(BUILD_TESTING)
-  add_executable(otlp_recordable_test test/otlp_recordable_test.cc)
-  target_link_libraries(
-    otlp_recordable_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_otlp_recordable protobuf::libprotobuf)
-  gtest_add_tests(
-    TARGET otlp_recordable_test
-    TEST_PREFIX exporter.otlp.
-    TEST_LIST otlp_recordable_test)
-
-  add_executable(otlp_log_recordable_test test/otlp_log_recordable_test.cc)
-  target_link_libraries(otlp_log_recordable_test ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_otlp_recordable)
-  gtest_add_tests(
-    TARGET otlp_log_recordable_test
-    TEST_PREFIX exporter.otlp.
-    TEST_LIST otlp_log_recordable_test)
-
-  add_executable(otlp_metrics_serialization_test
-                 test/otlp_metrics_serialization_test.cc)
-  target_link_libraries(
-    otlp_metrics_serialization_test ${GTEST_BOTH_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT} opentelemetry_otlp_recordable
-    protobuf::libprotobuf)
-  gtest_add_tests(
-    TARGET otlp_metrics_serialization_test
-    TEST_PREFIX exporter.otlp.
-    TEST_LIST otlp_metrics_serialization_test)
-
-  if(WITH_OTLP_GRPC)
-    add_executable(otlp_grpc_exporter_test test/otlp_grpc_exporter_test.cc)
-    target_link_libraries(
-      otlp_grpc_exporter_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB} opentelemetry_exporter_otlp_grpc gRPC::grpc++)
-    gtest_add_tests(
-      TARGET otlp_grpc_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_grpc_exporter_test)
-
-    add_executable(otlp_grpc_target_test test/otlp_grpc_target_test.cc)
-    target_link_libraries(
-      otlp_grpc_target_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB} opentelemetry_exporter_otlp_grpc)
-    gtest_add_tests(
-      TARGET otlp_grpc_target_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_grpc_target_test)
-
-    add_executable(otlp_grpc_exporter_factory_test
-                   test/otlp_grpc_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_grpc_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB} opentelemetry_exporter_otlp_grpc)
-    gtest_add_tests(
-      TARGET otlp_grpc_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_grpc_exporter_factory_test)
-
-    add_executable(otlp_grpc_log_record_exporter_test
-                   test/otlp_grpc_log_record_exporter_test.cc)
-    target_link_libraries(
-      otlp_grpc_log_record_exporter_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_grpc
-      opentelemetry_exporter_otlp_grpc_log
-      opentelemetry_trace
-      opentelemetry_logs)
-    gtest_add_tests(
-      TARGET otlp_grpc_log_record_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_grpc_log_record_exporter_test)
-
-    add_executable(otlp_grpc_log_record_exporter_factory_test
-                   test/otlp_grpc_log_record_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_grpc_log_record_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_grpc_log opentelemetry_logs)
-    gtest_add_tests(
-      TARGET otlp_grpc_log_record_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_grpc_log_record_exporter_factory_test)
-
-    add_executable(otlp_grpc_metric_exporter_test
-                   test/otlp_grpc_metric_exporter_test.cc)
-    target_link_libraries(
-      otlp_grpc_metric_exporter_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB} opentelemetry_exporter_otlp_grpc
-      opentelemetry_exporter_otlp_grpc_metrics)
-    gtest_add_tests(
-      TARGET otlp_grpc_metric_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_grpc_metric_exporter_test)
-
-    add_executable(otlp_grpc_metric_exporter_factory_test
-                   test/otlp_grpc_metric_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_grpc_metric_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_grpc_metrics opentelemetry_metrics)
-    gtest_add_tests(
-      TARGET otlp_grpc_metric_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_grpc_metric_exporter_factory_test)
-  endif()
-
-  if(WITH_OTLP_HTTP)
-    add_executable(otlp_http_exporter_test test/otlp_http_exporter_test.cc)
-    target_link_libraries(
-      otlp_http_exporter_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_http
-      opentelemetry_http_client_nosend
-      nlohmann_json::nlohmann_json
-      protobuf::libprotobuf)
-    gtest_add_tests(
-      TARGET otlp_http_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_http_exporter_test)
-
-    add_executable(otlp_http_exporter_factory_test
-                   test/otlp_http_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_http_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB} opentelemetry_exporter_otlp_http)
-    gtest_add_tests(
-      TARGET otlp_http_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_http_exporter_factory_test)
-
-    add_executable(otlp_http_log_record_exporter_test
-                   test/otlp_http_log_record_exporter_test.cc)
-    target_link_libraries(
-      otlp_http_log_record_exporter_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_http_log
-      opentelemetry_logs
-      opentelemetry_http_client_nosend
-      nlohmann_json::nlohmann_json)
-    gtest_add_tests(
-      TARGET otlp_http_log_record_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_http_log_record_exporter_test)
-
-    add_executable(otlp_http_log_record_exporter_factory_test
-                   test/otlp_http_log_record_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_http_log_record_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_http_log opentelemetry_logs)
-    gtest_add_tests(
-      TARGET otlp_http_log_record_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_http_log_record_exporter_factory_test)
-
-    add_executable(otlp_http_metric_exporter_test
-                   test/otlp_http_metric_exporter_test.cc)
-    target_link_libraries(
-      otlp_http_metric_exporter_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_http_metric
-      opentelemetry_metrics
-      opentelemetry_http_client_nosend
-      nlohmann_json::nlohmann_json
-      protobuf::libprotobuf)
-    gtest_add_tests(
-      TARGET otlp_http_metric_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_http_metric_exporter_test)
-
-    add_executable(otlp_http_metric_exporter_factory_test
-                   test/otlp_http_metric_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_http_metric_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_http_metric opentelemetry_metrics)
-    gtest_add_tests(
-      TARGET otlp_http_metric_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_http_metric_exporter_factory_test)
-  endif()
-
-  if(WITH_OTLP_FILE)
-    add_executable(otlp_file_client_test test/otlp_file_client_test.cc)
-    target_link_libraries(
-      otlp_file_client_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_file
-      opentelemetry_otlp_recordable
-      nlohmann_json::nlohmann_json)
-    gtest_add_tests(
-      TARGET otlp_file_client_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_file_client_test)
-
-    add_executable(otlp_file_exporter_test test/otlp_file_exporter_test.cc)
-    target_link_libraries(
-      otlp_file_exporter_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_file
-      nlohmann_json::nlohmann_json
-      protobuf::libprotobuf)
-    gtest_add_tests(
-      TARGET otlp_file_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_file_exporter_test)
-
-    add_executable(otlp_file_exporter_factory_test
-                   test/otlp_file_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_file_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB} opentelemetry_exporter_otlp_file)
-    gtest_add_tests(
-      TARGET otlp_file_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_file_exporter_factory_test)
-
-    add_executable(otlp_file_log_record_exporter_test
-                   test/otlp_file_log_record_exporter_test.cc)
-    target_link_libraries(
-      otlp_file_log_record_exporter_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_file_log
-      opentelemetry_logs
-      nlohmann_json::nlohmann_json)
-    gtest_add_tests(
-      TARGET otlp_file_log_record_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_file_log_record_exporter_test)
-
-    add_executable(otlp_file_log_record_exporter_factory_test
-                   test/otlp_file_log_record_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_file_log_record_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_file_log opentelemetry_logs)
-    gtest_add_tests(
-      TARGET otlp_file_log_record_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_file_log_record_exporter_factory_test)
-
-    add_executable(otlp_file_metric_exporter_test
-                   test/otlp_file_metric_exporter_test.cc)
-    target_link_libraries(
-      otlp_file_metric_exporter_test
-      ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_file_metric
-      opentelemetry_metrics
-      nlohmann_json::nlohmann_json
-      protobuf::libprotobuf)
-    gtest_add_tests(
-      TARGET otlp_file_metric_exporter_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_file_metric_exporter_test)
-
-    add_executable(otlp_file_metric_exporter_factory_test
-                   test/otlp_file_metric_exporter_factory_test.cc)
-    target_link_libraries(
-      otlp_file_metric_exporter_factory_test ${GTEST_BOTH_LIBRARIES}
-      ${CMAKE_THREAD_LIBS_INIT} ${GMOCK_LIB}
-      opentelemetry_exporter_otlp_file_metric opentelemetry_metrics)
-    gtest_add_tests(
-      TARGET otlp_file_metric_exporter_factory_test
-      TEST_PREFIX exporter.otlp.
-      TEST_LIST otlp_file_metric_exporter_factory_test)
-  endif()
-endif() # BUILD_TESTING
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/README.md b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/README.md
deleted file mode 100644
index 21b5f002e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/README.md
+++ /dev/null
@@ -1,137 +0,0 @@
-# OTLP Exporter
-
-The [OpenTelemetry
-Protocol](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/README.md)
-(OTLP) is a vendor-agnostic protocol designed as part of the OpenTelemetry
-project. The OTLP exporter can be used to export to any backend that supports
-OTLP.
-
-The [OpenTelemetry
-Collector](https://github.com/open-telemetry/opentelemetry-collector) is a
-reference implementation of an OTLP backend. The Collector can be configured to
-export to many other backends, such as Zipkin and Jaegar.
-
-For a full list of backends supported by the Collector, see the [main Collector
-repo](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter)
-and [Collector
-contributions](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter).
-
-## Configuration
-
-The OTLP exporter offers some configuration options. To configure the exporter,
-create an `OtlpGrpcExporterOptions` struct (defined in
-[otlp_grpc_exporter.h](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h)),
-set the options inside, and pass the struct to the `OtlpGrpcExporter` constructor,
-like so:
-
-```cpp
-OtlpGrpcExporterOptions options;
-options.endpoint = "localhost:12345";
-auto exporter = std::unique_ptr<sdktrace::SpanExporter>(new otlp::OtlpGrpcExporter(options));
-```
-
-The OTLP HTTP exporter offers some configuration options. To configure the exporter,
-create an `OtlpHttpExporterOptions` struct (defined in
-[otlp_http_exporter.h](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h)),
-set the options inside, and pass the struct to the `OtlpHttpExporter` constructor,
-like so:
-
-```cpp
-OtlpHttpExporterOptions options;
-options.url = "localhost:12345";
-auto exporter = std::unique_ptr<sdktrace::SpanExporter>(new otlp::OtlpHttpExporter(options));
-```
-
-The OTLP File exporter offers some configuration options. To configure the exporter,
-create an `OtlpFileExporterOptions` struct (defined in
-[otlp_file_exporter_options.h](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_options.h)
-and
-[otlp_file_client_options.h](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client_options.h)),
-set the options inside, and pass the struct to the `OtlpFileExporter` constructor,
-like so:
-
-```cpp
-OtlpFileExporterOptions options;
-OtlpFileClientFileSystemOptions fs_backend;
-fs_backend.file_pattern = "trace.%N.log";
-options.backend_options = fs_backend;
-auto exporter = std::unique_ptr<sdktrace::SpanExporter>(new otlp::OtlpFileExporter(options));
-```
-
-### Configuration options ( OTLP GRPC Exporter )
-
-| Option                           | Env Variable                                 | Default               | Description                          |
-|----------------------------------|----------------------------------------------|-----------------------|--------------------------------------|
-|`endpoint`                        |`OTEL_EXPORTER_OTLP_ENDPOINT`                 |`http://localhost:4317`| The OTLP GRPC endpoint to connect to |
-|                                  |`OTEL_EXPORTER_OTLP_TRACES_ENDPOINT`          |                       |                                      |
-|`use_ssl_credentials`             |`OTEL_EXPORTER_OTLP_SSL_ENABLE`               | `false`               | Whether the endpoint is SSL enabled  |
-|                                  |`OTEL_EXPORTER_OTLP_TRACES_SSL_ENABLE`        |                       |                                      |
-|`ssl_credentials_cacert_path`     |`OTEL_EXPORTER_OTLP_CERTIFICATE`              | `""`                  | SSL Certificate file path            |
-|                                  |`OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE`       |                       |                                      |
-|`ssl_credentials_cacert_as_string`|`OTEL_EXPORTER_OTLP_CERTIFICATE_STRING`       | `""`                  | SSL Certifcate as in-memory string   |
-|                                  |`OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE_STRING`|                       |                                      |
-|`timeout`                         |`OTEL_EXPORTER_OTLP_TIMEOUT`                  | `10s`                 | GRPC deadline                        |
-|                                  |`OTEL_EXPORTER_OTLP_TRACES_TIMEOUT`           |                       |                                      |
-|`metadata`                        |`OTEL_EXPORTER_OTLP_HEADERS`                  |                       | Custom metadata for GRPC             |
-|                                  |`OTEL_EXPORTER_OTLP_TRACES_HEADERS`           |                       |                                      |
-
-### Configuration options ( OTLP HTTP Exporter )
-
-| Option             | Env Variable                       | Default                         | Description                                                       |
-|--------------------|------------------------------------|---------------------------------|-------------------------------------------------------------------|
-|`url`               |`OTEL_EXPORTER_OTLP_ENDPOINT`       |`http://localhost:4318`          | The OTLP HTTP endpoint to connect to                              |
-|                    |`OTEL_EXPORTER_OTLP_TRACES_ENDPOINT`|                                 |                                                                   |
-|`content_type`      | n/a                                | `application/json`              | Data format used - JSON or Binary                                 |
-|`json_bytes_mapping`| n/a                                | `JsonBytesMappingKind::kHexId`  | Encoding used for trace_id and span_id                            |
-|`use_json_name`     | n/a                                | `false`                         | Whether to use json name of protobuf field to set the key of json |
-|`timeout`           |`OTEL_EXPORTER_OTLP_TIMEOUT`        | `10s`                           | http timeout                                                      |
-|                    |`OTEL_EXPORTER_OTLP_TRACES_TIMEOUT` |                                 |                                                                   |
-|`http_headers`      |`OTEL_EXPORTER_OTLP_HEADERS`        |                                 | http headers                                                      |
-|                    |`OTEL_EXPORTER_OTLP_TRACES_HEADERS` |                                 |                                                                   |
-
-### Configuration options ( OTLP File Exporter )
-
-| Option             | Env Variable                       | Default                         | Description                                                       |
-|--------------------|------------------------------------|---------------------------------|-------------------------------------------------------------------|
-|`backend_options`   | n/a                                |`OtlpFileClientFileSystemOptions`| The OTLP FILE backend                                             |
-
-The backend for OTLP File Exporter can be `OtlpFileClientFileSystemOptions` (which
-support basic log rotate and alias), and reference to `std::ostream` or custom `OtlpFileAppender`.
-
-#### Configuration options ( File System Backend for OTLP File Exporter )
-
-| Option             | Env Variable                       | Default                         | Description                                                       |
-|--------------------|------------------------------------|---------------------------------|-------------------------------------------------------------------|
-|`file_pattern`      | n/a                                |`trace-%N.jsonl`                 | The file pattern to use                                           |
-|                    |                                    |`metrics-%N.jsonl`               |                                                                   |
-|                    |                                    |`logs-%N.jsonl`                  |                                                                   |
-|`alias_pattern`     | n/a                                | `trace-latest.jsonl`            | The file which always point to the latest file                    |
-|                    |                                    | `metrics-latest.jsonl`          |                                                                   |
-|                    |                                    | `logs-latest.jsonl`             |                                                                   |
-|`flush_interval`    | n/a                                | `30s`                           | Interval to force flush ostream                                   |
-|`flush_count`       | n/a                                | `256`                           | Force flush ostream every `flush_count` records                   |
-|`file_size`         | n/a                                | `20MB`                          | File size to rotate log files                                     |
-|`rotate_size`       | n/a                                |                                 | Rotate count                                                      |
-
-Some special placeholders are available for `file_pattern` and `alias_pattern`:
-
-+ `%Y`:  Writes year as a 4 digit decimal number
-+ `%y`:  Writes last 2 digits of year as a decimal number (range [00,99])
-+ `%m`:  Writes month as a decimal number (range [01,12])
-+ `%j`:  Writes day of the year as a decimal number (range [001,366])
-+ `%d`:  Writes day of the month as a decimal number (range [01,31])
-+ `%w`:  Writes weekday as a decimal number, where Sunday is 0 (range [0-6])
-+ `%H`:  Writes hour as a decimal number, 24 hour clock (range [00-23])
-+ `%I`:  Writes hour as a decimal number, 12 hour clock (range [01,12])
-+ `%M`:  Writes minute as a decimal number (range [00,59])
-+ `%S`:  Writes second as a decimal number (range [00,60])
-+ `%F`:  Equivalent to "%Y-%m-%d" (the ISO 8601 date format)
-+ `%T`:  Equivalent to "%H:%M:%S" (the ISO 8601 time format)
-+ `%R`:  Equivalent to "%H:%M"
-+ `%N`:  Rotate index, start from 0
-+ `%n`:  Rotate index, start from 1
-
-## Example
-
-For a complete example demonstrating how to use the OTLP exporter, see
-[examples/otlp](https://github.com/open-telemetry/opentelemetry-cpp/blob/main/examples/otlp/).
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h
deleted file mode 100644
index f6ea55d32..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_environment.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <ctype.h>
-#include <algorithm>
-#include <chrono>
-#include <map>
-#include <string>
-
-#include "opentelemetry/sdk/version/version.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-inline std::string GetOtlpDefaultUserAgent()
-{
-  return "OTel-OTLP-Exporter-Cpp/" OPENTELEMETRY_SDK_VERSION;
-}
-
-std::string GetOtlpDefaultGrpcTracesEndpoint();
-std::string GetOtlpDefaultGrpcMetricsEndpoint();
-std::string GetOtlpDefaultGrpcLogsEndpoint();
-
-// Compatibility with OTELCPP 1.8.2
-inline std::string GetOtlpDefaultGrpcEndpoint()
-{
-  return GetOtlpDefaultGrpcTracesEndpoint();
-}
-
-std::string GetOtlpDefaultHttpTracesEndpoint();
-std::string GetOtlpDefaultHttpMetricsEndpoint();
-std::string GetOtlpDefaultHttpLogsEndpoint();
-
-std::string GetOtlpDefaultHttpTracesProtocol();
-std::string GetOtlpDefaultHttpMetricsProtocol();
-std::string GetOtlpDefaultHttpLogsProtocol();
-
-// Compatibility with OTELCPP 1.8.2
-inline std::string GetOtlpDefaultHttpEndpoint()
-{
-  return GetOtlpDefaultHttpTracesEndpoint();
-}
-
-// Compatibility with OTELCPP 1.8.2
-inline std::string GetOtlpDefaultMetricsEndpoint()
-{
-  return GetOtlpDefaultHttpMetricsEndpoint();
-}
-
-bool GetOtlpDefaultGrpcTracesIsInsecure();
-bool GetOtlpDefaultGrpcMetricsIsInsecure();
-bool GetOtlpDefaultGrpcLogsIsInsecure();
-
-// Compatibility with OTELCPP 1.8.2
-inline bool GetOtlpDefaultIsSslEnable()
-{
-  return (!GetOtlpDefaultGrpcTracesIsInsecure());
-}
-
-std::string GetOtlpDefaultTracesSslCertificatePath();
-std::string GetOtlpDefaultMetricsSslCertificatePath();
-std::string GetOtlpDefaultLogsSslCertificatePath();
-
-// Compatibility with OTELCPP 1.8.2
-inline std::string GetOtlpDefaultSslCertificatePath()
-{
-  return GetOtlpDefaultTracesSslCertificatePath();
-}
-
-std::string GetOtlpDefaultTracesSslCertificateString();
-std::string GetOtlpDefaultMetricsSslCertificateString();
-std::string GetOtlpDefaultLogsSslCertificateString();
-
-// Compatibility with OTELCPP 1.8.2
-inline std::string GetOtlpDefaultSslCertificateString()
-{
-  return GetOtlpDefaultTracesSslCertificateString();
-}
-
-std::string GetOtlpDefaultTracesSslClientKeyPath();
-std::string GetOtlpDefaultMetricsSslClientKeyPath();
-std::string GetOtlpDefaultLogsSslClientKeyPath();
-
-std::string GetOtlpDefaultTracesSslClientKeyString();
-std::string GetOtlpDefaultMetricsSslClientKeyString();
-std::string GetOtlpDefaultLogsSslClientKeyString();
-
-std::string GetOtlpDefaultTracesSslClientCertificatePath();
-std::string GetOtlpDefaultMetricsSslClientCertificatePath();
-std::string GetOtlpDefaultLogsSslClientCertificatePath();
-
-std::string GetOtlpDefaultTracesSslClientCertificateString();
-std::string GetOtlpDefaultMetricsSslClientCertificateString();
-std::string GetOtlpDefaultLogsSslClientCertificateString();
-
-std::string GetOtlpDefaultTracesSslTlsMinVersion();
-std::string GetOtlpDefaultMetricsSslTlsMinVersion();
-std::string GetOtlpDefaultLogsSslTlsMinVersion();
-
-std::string GetOtlpDefaultTracesSslTlsMaxVersion();
-std::string GetOtlpDefaultMetricsSslTlsMaxVersion();
-std::string GetOtlpDefaultLogsSslTlsMaxVersion();
-
-// For TLS 1.2
-std::string GetOtlpDefaultTracesSslTlsCipher();
-std::string GetOtlpDefaultMetricsSslTlsCipher();
-std::string GetOtlpDefaultLogsSslTlsCipher();
-
-// For TLS 1.3
-std::string GetOtlpDefaultTracesSslTlsCipherSuite();
-std::string GetOtlpDefaultMetricsSslTlsCipherSuite();
-std::string GetOtlpDefaultLogsSslTlsCipherSuite();
-
-std::chrono::system_clock::duration GetOtlpDefaultTracesTimeout();
-std::chrono::system_clock::duration GetOtlpDefaultMetricsTimeout();
-std::chrono::system_clock::duration GetOtlpDefaultLogsTimeout();
-
-// Compatibility with OTELCPP 1.8.2
-inline std::chrono::system_clock::duration GetOtlpDefaultTimeout()
-{
-  return GetOtlpDefaultTracesTimeout();
-}
-
-struct cmp_ic
-{
-  bool operator()(const std::string &s1, const std::string &s2) const
-  {
-    return std::lexicographical_compare(
-        s1.begin(), s1.end(), s2.begin(), s2.end(),
-        [](char c1, char c2) { return ::tolower(c1) < ::tolower(c2); });
-  }
-};
-using OtlpHeaders = std::multimap<std::string, std::string, cmp_ic>;
-
-OtlpHeaders GetOtlpDefaultTracesHeaders();
-OtlpHeaders GetOtlpDefaultMetricsHeaders();
-OtlpHeaders GetOtlpDefaultLogsHeaders();
-
-// Compatibility with OTELCPP 1.8.2
-inline OtlpHeaders GetOtlpDefaultHeaders()
-{
-  return GetOtlpDefaultTracesHeaders();
-}
-
-std::string GetOtlpDefaultTracesCompression();
-std::string GetOtlpDefaultMetricsCompression();
-std::string GetOtlpDefaultLogsCompression();
-
-std::uint32_t GetOtlpDefaultTracesRetryMaxAttempts();
-std::uint32_t GetOtlpDefaultMetricsRetryMaxAttempts();
-std::uint32_t GetOtlpDefaultLogsRetryMaxAttempts();
-
-std::chrono::duration<float> GetOtlpDefaultTracesRetryInitialBackoff();
-std::chrono::duration<float> GetOtlpDefaultMetricsRetryInitialBackoff();
-std::chrono::duration<float> GetOtlpDefaultLogsRetryInitialBackoff();
-
-std::chrono::duration<float> GetOtlpDefaultTracesRetryMaxBackoff();
-std::chrono::duration<float> GetOtlpDefaultMetricsRetryMaxBackoff();
-std::chrono::duration<float> GetOtlpDefaultLogsRetryMaxBackoff();
-
-float GetOtlpDefaultTracesRetryBackoffMultiplier();
-float GetOtlpDefaultMetricsRetryBackoffMultiplier();
-float GetOtlpDefaultLogsRetryBackoffMultiplier();
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client.h
deleted file mode 100644
index 987606ecd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstddef>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/version.h"
-
-// forward declare google::protobuf::Message
-namespace google
-{
-namespace protobuf
-{
-class Message;
-}
-}  // namespace google
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * The OTLP File client exports data in OpenTelemetry Protocol (OTLP) format.
- */
-class OtlpFileClient
-{
-public:
-  /**
-   * Create an OtlpFileClient using the given options.
-   */
-  explicit OtlpFileClient(OtlpFileClientOptions &&options,
-                          OtlpFileClientRuntimeOptions &&runtime_options);
-
-  ~OtlpFileClient();
-
-  /**
-   * Sync export
-   * @param message message to export, it should be ExportTraceServiceRequest,
-   * ExportMetricsServiceRequest or ExportLogsServiceRequest
-   * @param record_count record count of the message
-   * @return return the status of this operation
-   */
-  sdk::common::ExportResult Export(const google::protobuf::Message &message,
-                                   std::size_t record_count) noexcept;
-
-  /**
-   * Force flush the file client.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Shut down the file client.
-   * @param timeout an optional timeout, the default timeout of 0 means that no
-   * timeout is applied.
-   * @return return the status of this operation
-   */
-  bool Shutdown(std::chrono::microseconds timeout = std::chrono::microseconds(0)) noexcept;
-
-  /**
-   * Get options of current OTLP file client.
-   * @return options of current OTLP file client.
-   */
-  inline const OtlpFileClientOptions &GetOptions() const noexcept { return options_; }
-
-  /**
-   * Get if this OTLP file client is shutdown.
-   * @return return true after Shutdown is called.
-   */
-  bool IsShutdown() const noexcept;
-
-private:
-  // Stores if this file client had its Shutdown() method called
-  bool is_shutdown_;
-
-  // The configuration options associated with this file client.
-  const OtlpFileClientOptions options_;
-  // The runtime options associated with this file client.
-  const OtlpFileClientRuntimeOptions runtime_options_;
-
-  opentelemetry::nostd::shared_ptr<OtlpFileAppender> backend_;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client_options.h
deleted file mode 100644
index c355d515c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client_options.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-
-#include <chrono>
-#include <cstddef>
-#include <functional>
-#include <ostream>
-#include <string>
-
-// forward declare google::protobuf::Message
-namespace google
-{
-namespace protobuf
-{
-class Message;
-}
-}  // namespace google
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP File client options for file system backend.
- * @note Available placeholder for file_pattern and alias_pattern:
- *     %Y:  writes year as a 4 digit decimal number
- *     %y:  writes last 2 digits of year as a decimal number (range [00,99])
- *     %m:  writes month as a decimal number (range [01,12])
- *     %j:  writes day of the year as a decimal number (range [001,366])
- *     %d:  writes day of the month as a decimal number (range [01,31])
- *     %w:  writes weekday as a decimal number, where Sunday is 0 (range [0-6])
- *     %H:  writes hour as a decimal number, 24 hour clock (range [00-23])
- *     %I:  writes hour as a decimal number, 12 hour clock (range [01,12])
- *     %M:  writes minute as a decimal number (range [00,59])
- *     %S:  writes second as a decimal number (range [00,60])
- *     %F:  equivalent to "%Y-%m-%d" (the ISO 8601 date format)
- *     %T:  equivalent to "%H:%M:%S" (the ISO 8601 time format)
- *     %R:  equivalent to "%H:%M"
- *     %N:  rotate index, start from 0
- *     %n:  rotate index, start from 1
- */
-struct OtlpFileClientFileSystemOptions
-{
-  // Pattern to create output file
-  std::string file_pattern;
-
-  // Pattern to create alias file path for the latest file rotation.
-  std::string alias_pattern;
-
-  // Flush interval
-  std::chrono::microseconds flush_interval = std::chrono::microseconds(30000000);
-
-  // Flush record count
-  std::size_t flush_count = 256;
-
-  // Maximum file size
-  std::size_t file_size = 1024 * 1024 * 20;
-
-  // Maximum file count
-  std::size_t rotate_size = 3;
-
-  inline OtlpFileClientFileSystemOptions() noexcept {}
-};
-
-/**
- * Class to append data of OTLP format.
- */
-class OtlpFileAppender
-{
-public:
-  virtual ~OtlpFileAppender() = default;
-
-  virtual void Export(opentelemetry::nostd::string_view data, std::size_t record_count) = 0;
-
-  virtual bool ForceFlush(std::chrono::microseconds timeout) noexcept = 0;
-
-  virtual bool Shutdown(std::chrono::microseconds timeout) noexcept = 0;
-};
-
-using OtlpFileClientBackendOptions =
-    nostd::variant<OtlpFileClientFileSystemOptions,
-                   std::reference_wrapper<std::ostream>,
-                   opentelemetry::nostd::shared_ptr<OtlpFileAppender>>;
-
-/**
- * Struct to hold OTLP FILE client options.
- */
-struct OtlpFileClientOptions
-{
-  // Whether to print the status of the FILE client in the console
-  bool console_debug = false;
-
-  OtlpFileClientBackendOptions backend_options;
-
-  inline OtlpFileClientOptions() noexcept {}
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h
deleted file mode 100644
index 2fc4c2e31..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP FILE client runtime options.
- */
-struct OtlpFileClientRuntimeOptions
-{
-  OtlpFileClientRuntimeOptions()  = default;
-  ~OtlpFileClientRuntimeOptions() = default;
-
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter.h
deleted file mode 100644
index e2b3b4bd6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_runtime_options.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * The OTLP exporter exports span data in OpenTelemetry Protocol (OTLP) format.
- */
-class OPENTELEMETRY_EXPORT OtlpFileExporter final : public opentelemetry::sdk::trace::SpanExporter
-{
-public:
-  /**
-   * Create an OtlpFileExporter using all default options.
-   */
-  OtlpFileExporter();
-
-  /**
-   * Create an OtlpFileExporter using the given options.
-   */
-  explicit OtlpFileExporter(const OtlpFileExporterOptions &options);
-
-  /**
-   * Create an OtlpFileExporter using the given options.
-   */
-  explicit OtlpFileExporter(const OtlpFileExporterOptions &options,
-                            const OtlpFileExporterRuntimeOptions &runtime_options);
-
-  /**
-   * Create a span recordable.
-   * @return a newly initialized Recordable object
-   */
-  std::unique_ptr<opentelemetry::sdk::trace::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Export
-   * @param spans a span of unique pointers to span recordables
-   */
-  opentelemetry::sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans) noexcept
-      override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shut down the exporter.
-   * @param timeout an optional timeout, the default timeout of 0 means that no
-   * timeout is applied.
-   * @return return the status of this operation
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  // The configuration options associated with this exporter.
-  const OtlpFileExporterOptions options_;
-  // The runtime options associated with this exporter.
-  const OtlpFileExporterRuntimeOptions runtime_options_;
-
-  // Object that stores the file context.
-  std::unique_ptr<OtlpFileClient> file_client_;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_factory.h
deleted file mode 100644
index 326fba4f2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_factory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_runtime_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Factory class for OtlpFileExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpFileExporterFactory
-{
-public:
-  /**
-   * Create an OtlpFileExporter using all default options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create();
-
-  /**
-   * Create an OtlpFileExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      const OtlpFileExporterOptions &options);
-
-  /**
-   * Create an OtlpFileExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      const OtlpFileExporterOptions &options,
-      const OtlpFileExporterRuntimeOptions &runtime_options);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_options.h
deleted file mode 100644
index 862ce1daf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_options.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP File traces exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/file-exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpFileExporterOptions : public OtlpFileClientOptions
-{
-  OtlpFileExporterOptions();
-  ~OtlpFileExporterOptions();
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_runtime_options.h
deleted file mode 100644
index dcd30239a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_exporter_runtime_options.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP File traces exporter runtime options.
- */
-struct OPENTELEMETRY_EXPORT OtlpFileExporterRuntimeOptions : public OtlpFileClientRuntimeOptions
-{
-  OtlpFileExporterRuntimeOptions()  = default;
-  ~OtlpFileExporterRuntimeOptions() = default;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h
deleted file mode 100644
index 23af07c02..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_runtime_options.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * The OTLP exporter exports log data in OpenTelemetry Protocol (OTLP) format.
- */
-class OtlpFileLogRecordExporter final : public opentelemetry::sdk::logs::LogRecordExporter
-{
-public:
-  /**
-   * Create an OtlpFileLogRecordExporter with default exporter options.
-   */
-  OtlpFileLogRecordExporter();
-
-  /**
-   * Create an OtlpFileLogRecordExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   */
-  OtlpFileLogRecordExporter(const OtlpFileLogRecordExporterOptions &options);
-
-  /**
-   * Create an OtlpFileLogRecordExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   * @param runtime_options An object containing the user's runtime options.
-   */
-  OtlpFileLogRecordExporter(const OtlpFileLogRecordExporterOptions &options,
-                            const OtlpFileLogRecordExporterRuntimeOptions &runtime_options);
-
-  /**
-   * Creates a recordable that stores the data in a JSON object
-   */
-  std::unique_ptr<opentelemetry::sdk::logs::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Exports a vector of log records to the Elasticsearch instance. Guaranteed to return after a
-   * timeout specified from the options passed from the constructor.
-   * @param records A list of log records to send to Elasticsearch.
-   */
-  opentelemetry::sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &records) noexcept
-      override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shutdown this exporter.
-   * @param timeout The maximum time to wait for the shutdown method to return
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  // Configuration options for the exporter
-  const OtlpFileLogRecordExporterOptions options_;
-  // Runtime options for the exporter
-  const OtlpFileLogRecordExporterRuntimeOptions runtime_options_;
-
-  // Object that stores the file context.
-  std::unique_ptr<OtlpFileClient> file_client_;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h
deleted file mode 100644
index 5a72043de..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_runtime_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Factory class for OtlpFileExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpFileLogRecordExporterFactory
-{
-public:
-  /**
-   * Create an OtlpFileExporter using all default options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create();
-
-  /**
-   * Create an OtlpFileExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
-      const OtlpFileLogRecordExporterOptions &options);
-
-  /**
-   * Create an OtlpFileExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
-      const OtlpFileLogRecordExporterOptions &options,
-      const OtlpFileLogRecordExporterRuntimeOptions &runtime_options);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h
deleted file mode 100644
index 7045ffdc1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP File log record exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/file-exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpFileLogRecordExporterOptions : public OtlpFileClientOptions
-{
-  OtlpFileLogRecordExporterOptions();
-  ~OtlpFileLogRecordExporterOptions();
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_runtime_options.h
deleted file mode 100644
index 4c10ab298..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_log_record_exporter_runtime_options.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP File log record exporter runtime options.
- */
-struct OPENTELEMETRY_EXPORT OtlpFileLogRecordExporterRuntimeOptions
-    : public OtlpFileClientRuntimeOptions
-{
-  OtlpFileLogRecordExporterRuntimeOptions()  = default;
-  ~OtlpFileLogRecordExporterRuntimeOptions() = default;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter.h
deleted file mode 100644
index 7439c4032..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_runtime_options.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-/**
- * The OTLP exporter exports metrics data in OpenTelemetry Protocol (OTLP) format to file.
- */
-class OtlpFileMetricExporter final : public opentelemetry::sdk::metrics::PushMetricExporter
-{
-public:
-  /**
-   * Create an OtlpFileMetricExporter with default exporter options.
-   */
-  OtlpFileMetricExporter();
-
-  /**
-   * Create an OtlpFileMetricExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   */
-  OtlpFileMetricExporter(const OtlpFileMetricExporterOptions &options);
-
-  /**
-   * Create an OtlpFileMetricExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   * @param runtime_options An object containing the user's runtime options.
-   */
-  OtlpFileMetricExporter(const OtlpFileMetricExporterOptions &options,
-                         const OtlpFileMetricExporterRuntimeOptions &runtime_options);
-
-  /**
-   * Get the AggregationTemporality for exporter
-   *
-   * @return AggregationTemporality
-   */
-  sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      sdk::metrics::InstrumentType instrument_type) const noexcept override;
-
-  opentelemetry::sdk::common::ExportResult Export(
-      const opentelemetry::sdk::metrics::ResourceMetrics &data) noexcept override;
-
-  /**
-   * Force flush the exporter.
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  friend class OtlpFileMetricExporterTestPeer;
-
-  // Configuration options for the exporter
-  const OtlpFileMetricExporterOptions options_;
-  // Runtime options for the exporter
-  const OtlpFileMetricExporterRuntimeOptions runtime_options_;
-
-  // Aggregation Temporality Selector
-  const sdk::metrics::AggregationTemporalitySelector aggregation_temporality_selector_;
-
-  // Object that stores the file context.
-  std::unique_ptr<OtlpFileClient> file_client_;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h
deleted file mode 100644
index 355c4693b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_runtime_options.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Factory class for OtlpFileExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpFileMetricExporterFactory
-{
-public:
-  /**
-   * Create an OtlpFileExporter using all default options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create();
-
-  /**
-   * Create an OtlpFileExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      const OtlpFileMetricExporterOptions &options);
-
-  /**
-   * Create an OtlpFileExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      const OtlpFileMetricExporterOptions &options,
-      const OtlpFileMetricExporterRuntimeOptions &runtime_options);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h
deleted file mode 100644
index 922c4bf84..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP File metrics exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/file-exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpFileMetricExporterOptions : public OtlpFileClientOptions
-{
-  OtlpFileMetricExporterOptions();
-  ~OtlpFileMetricExporterOptions();
-
-  PreferredAggregationTemporality aggregation_temporality;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_runtime_options.h
deleted file mode 100644
index be8f3e2ca..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_file_metric_exporter_runtime_options.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP File metrics exporter runtime options.
- */
-struct OPENTELEMETRY_EXPORT OtlpFileMetricExporterRuntimeOptions
-    : public OtlpFileClientRuntimeOptions
-{
-  OtlpFileMetricExporterRuntimeOptions()  = default;
-  ~OtlpFileMetricExporterRuntimeOptions() = default;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h
deleted file mode 100644
index b83c72128..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/grpcpp.h>
-
-#include <atomic>
-#include <memory>
-
-#include "opentelemetry/sdk/common/exporter_utils.h"
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-// clang-format on
-
-#include "google/protobuf/arena.h"
-#include "opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h"
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h"
-#include "opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcClient;
-struct OtlpGrpcClientOptions;
-struct OtlpGrpcClientAsyncData;
-
-class OtlpGrpcClientReferenceGuard
-{
-public:
-  OtlpGrpcClientReferenceGuard() noexcept;
-  ~OtlpGrpcClientReferenceGuard() noexcept;
-
-  OtlpGrpcClientReferenceGuard(const OtlpGrpcClientReferenceGuard &)            = delete;
-  OtlpGrpcClientReferenceGuard(OtlpGrpcClientReferenceGuard &&)                 = delete;
-  OtlpGrpcClientReferenceGuard &operator=(const OtlpGrpcClientReferenceGuard &) = delete;
-  OtlpGrpcClientReferenceGuard &operator=(OtlpGrpcClientReferenceGuard &&)      = delete;
-
-private:
-  friend class OtlpGrpcClient;
-  std::atomic<bool> has_value_;
-};
-
-/**
- * The OTLP gRPC client contains utility functions of gRPC.
- */
-class OtlpGrpcClient
-{
-public:
-  OtlpGrpcClient(const OtlpGrpcClientOptions &options);
-
-  ~OtlpGrpcClient();
-
-  static std::string GetGrpcTarget(const std::string &endpoint);
-
-  /**
-   * Create gRPC channel from the exporter options.
-   */
-  static std::shared_ptr<grpc::Channel> MakeChannel(const OtlpGrpcClientOptions &options);
-
-  /**
-   * Create gRPC client context to call RPC.
-   */
-  static std::unique_ptr<grpc::ClientContext> MakeClientContext(
-      const OtlpGrpcClientOptions &options);
-
-  /**
-   * Create trace service stub to communicate with the OpenTelemetry Collector.
-   */
-  std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> MakeTraceServiceStub();
-
-  /**
-   * Create metrics service stub to communicate with the OpenTelemetry Collector.
-   */
-  std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface>
-  MakeMetricsServiceStub();
-
-  /**
-   * Create logs service stub to communicate with the OpenTelemetry Collector.
-   */
-  std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> MakeLogsServiceStub();
-
-  static grpc::Status DelegateExport(
-      proto::collector::trace::v1::TraceService::StubInterface *stub,
-      std::unique_ptr<grpc::ClientContext> &&context,
-      std::unique_ptr<google::protobuf::Arena> &&arena,
-      proto::collector::trace::v1::ExportTraceServiceRequest &&request,
-      proto::collector::trace::v1::ExportTraceServiceResponse *response);
-
-  static grpc::Status DelegateExport(
-      proto::collector::metrics::v1::MetricsService::StubInterface *stub,
-      std::unique_ptr<grpc::ClientContext> &&context,
-      std::unique_ptr<google::protobuf::Arena> &&arena,
-      proto::collector::metrics::v1::ExportMetricsServiceRequest &&request,
-      proto::collector::metrics::v1::ExportMetricsServiceResponse *response);
-
-  static grpc::Status DelegateExport(
-      proto::collector::logs::v1::LogsService::StubInterface *stub,
-      std::unique_ptr<grpc::ClientContext> &&context,
-      std::unique_ptr<google::protobuf::Arena> &&arena,
-      proto::collector::logs::v1::ExportLogsServiceRequest &&request,
-      proto::collector::logs::v1::ExportLogsServiceResponse *response);
-
-  void AddReference(OtlpGrpcClientReferenceGuard &guard,
-                    const OtlpGrpcClientOptions &options) noexcept;
-
-  /**
-   * Reomve reference fro a guard object
-   *
-   * @param guard guard object to remove reference from
-   * @return true if there is no more reference to this gRPC client
-   */
-  bool RemoveReference(OtlpGrpcClientReferenceGuard &guard) noexcept;
-
-#ifdef ENABLE_ASYNC_EXPORT
-  /**
-   * Async export
-   * @param options Options used to message to create gRPC context and stub(if necessary)
-   * @param arena Protobuf arena to hold lifetime of all messages
-   * @param request Request for this RPC
-   * @param result_callback callback to call when the exporting is done
-   * @return return the status of this operation
-   */
-  sdk::common::ExportResult DelegateAsyncExport(
-      const OtlpGrpcClientOptions &options,
-      proto::collector::trace::v1::TraceService::StubInterface *stub,
-      std::unique_ptr<grpc::ClientContext> &&context,
-      std::unique_ptr<google::protobuf::Arena> &&arena,
-      proto::collector::trace::v1::ExportTraceServiceRequest &&request,
-      std::function<bool(opentelemetry::sdk::common::ExportResult,
-                         std::unique_ptr<google::protobuf::Arena> &&,
-                         const proto::collector::trace::v1::ExportTraceServiceRequest &,
-                         proto::collector::trace::v1::ExportTraceServiceResponse *)>
-          &&result_callback) noexcept;
-
-  /**
-   * Async export
-   * @param options Options used to message to create gRPC context and stub(if necessary)
-   * @param arena Protobuf arena to hold lifetime of all messages
-   * @param request Request for this RPC
-   * @param result_callback callback to call when the exporting is done
-   * @return return the status of this operation
-   */
-  sdk::common::ExportResult DelegateAsyncExport(
-      const OtlpGrpcClientOptions &options,
-      proto::collector::metrics::v1::MetricsService::StubInterface *stub,
-      std::unique_ptr<grpc::ClientContext> &&context,
-      std::unique_ptr<google::protobuf::Arena> &&arena,
-      proto::collector::metrics::v1::ExportMetricsServiceRequest &&request,
-      std::function<bool(opentelemetry::sdk::common::ExportResult,
-                         std::unique_ptr<google::protobuf::Arena> &&,
-                         const proto::collector::metrics::v1::ExportMetricsServiceRequest &,
-                         proto::collector::metrics::v1::ExportMetricsServiceResponse *)>
-          &&result_callback) noexcept;
-
-  /**
-   * Async export
-   * @param options Options used to message to create gRPC context and stub(if necessary)
-   * @param arena Protobuf arena to hold lifetime of all messages
-   * @param request Request for this RPC
-   * @param result_callback callback to call when the exporting is done
-   * @return return the status of this operation
-   */
-  sdk::common::ExportResult DelegateAsyncExport(
-      const OtlpGrpcClientOptions &options,
-      proto::collector::logs::v1::LogsService::StubInterface *stub,
-      std::unique_ptr<grpc::ClientContext> &&context,
-      std::unique_ptr<google::protobuf::Arena> &&arena,
-      proto::collector::logs::v1::ExportLogsServiceRequest &&request,
-      std::function<bool(opentelemetry::sdk::common::ExportResult,
-                         std::unique_ptr<google::protobuf::Arena> &&,
-                         const proto::collector::logs::v1::ExportLogsServiceRequest &,
-                         proto::collector::logs::v1::ExportLogsServiceResponse *)>
-          &&result_callback) noexcept;
-#endif
-
-  /**
-   * Force flush the gRPC client.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Shut down the gRPC client.
-   * @param timeout an optional timeout, the default timeout of 0 means that no
-   * timeout is applied.
-   * @return return the status of this operation
-   */
-  bool Shutdown(OtlpGrpcClientReferenceGuard &guard,
-                std::chrono::microseconds timeout = std::chrono::microseconds(0)) noexcept;
-
-  std::shared_ptr<OtlpGrpcClientAsyncData> MutableAsyncData(const OtlpGrpcClientOptions &options);
-
-  bool IsShutdown() const noexcept;
-
-private:
-  // Stores if this gRPC client had its Shutdown() method called
-  std::atomic<bool> is_shutdown_;
-
-  // Stores shared data between threads of this gRPC client
-  std::shared_ptr<OtlpGrpcClientAsyncData> async_data_;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_factory.h
deleted file mode 100644
index fb96db093..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_factory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-// IWYU pragma: no_include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcClient;                // IWYU pragma: keep
-class OtlpGrpcClientReferenceGuard;  // IWYU pragma: keep
-
-/**
- * Factory class for OtlpGrpcClient.
- */
-class OPENTELEMETRY_EXPORT OtlpGrpcClientFactory
-{
-public:
-  /**
-   * Create an OtlpGrpcClient using all default options.
-   */
-  static std::shared_ptr<OtlpGrpcClient> Create(const OtlpGrpcClientOptions &options);
-
-  static std::shared_ptr<OtlpGrpcClientReferenceGuard> CreateReferenceGuard();
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h
deleted file mode 100644
index babb4cac5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/version.h"
-
-#include <chrono>
-#include <string>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-struct OtlpGrpcClientOptions
-{
-  /** The endpoint to export to. */
-  std::string endpoint;
-
-  /** Use SSL. */
-  bool use_ssl_credentials;
-
-  /** CA CERT, path to a file. */
-  std::string ssl_credentials_cacert_path;
-
-  /** CA CERT, as a string. */
-  std::string ssl_credentials_cacert_as_string;
-
-#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  /** CLIENT KEY, path to a file. */
-  std::string ssl_client_key_path;
-
-  /** CLIENT KEY, as a string. */
-  std::string ssl_client_key_string;
-
-  /** CLIENT CERT, path to a file. */
-  std::string ssl_client_cert_path;
-
-  /** CLIENT CERT, as a string. */
-  std::string ssl_client_cert_string;
-#endif
-
-  /** Export timeout. */
-  std::chrono::system_clock::duration timeout;
-
-  /** Additional HTTP headers. */
-  OtlpHeaders metadata;
-
-  /** User agent. */
-  std::string user_agent;
-
-  /** max number of threads that can be allocated from this */
-  std::size_t max_threads;
-
-  /** Compression type. */
-  std::string compression;
-
-#ifdef ENABLE_ASYNC_EXPORT
-  // Concurrent requests
-  std::size_t max_concurrent_requests;
-#endif
-
-  /** The maximum number of call attempts, including the original attempt. */
-  std::uint32_t retry_policy_max_attempts{};
-
-  /** The initial backoff delay between retry attempts, random between (0, initial_backoff). */
-  std::chrono::duration<float> retry_policy_initial_backoff{};
-
-  /** The maximum backoff places an upper limit on exponential backoff growth. */
-  std::chrono::duration<float> retry_policy_max_backoff{};
-
-  /** The backoff will be multiplied by this value after each retry attempt. */
-  float retry_policy_backoff_multiplier{};
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h
deleted file mode 100644
index 1022b0dc8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-// clang-format on
-
-#include "opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-// clang-format on
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcClientReferenceGuard;
-
-class OtlpGrpcClient;
-
-/**
- * The OTLP exporter exports span data in OpenTelemetry Protocol (OTLP) format.
- */
-class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter
-{
-public:
-  /**
-   * Create an OtlpGrpcExporter using all default options.
-   */
-  OtlpGrpcExporter();
-
-  /**
-   * Create an OtlpGrpcExporter using specified OtlpGrpcClient.
-   *
-   * @param options options to create exporter
-   * @param client the gRPC client to use
-   */
-  OtlpGrpcExporter(const OtlpGrpcExporterOptions &options,
-                   const std::shared_ptr<OtlpGrpcClient> &client);
-
-  /**
-   * Create an OtlpGrpcExporter using the given options.
-   */
-  explicit OtlpGrpcExporter(const OtlpGrpcExporterOptions &options);
-
-  ~OtlpGrpcExporter() override;
-
-  /**
-   * Create a span recordable.
-   * @return a newly initialized Recordable object
-   */
-  std::unique_ptr<sdk::trace::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Export a batch of span recordables in OTLP format.
-   * @param spans a span of unique pointers to span recordables
-   */
-  sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans) noexcept override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shut down the exporter.
-   * @param timeout an optional timeout, the default timeout of 0 means that no
-   * timeout is applied.
-   * @return return the status of this operation
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Get the Client object
-   *
-   * @return return binded gRPC client
-   */
-  const std::shared_ptr<OtlpGrpcClient> &GetClient() const noexcept;
-
-private:
-  // The configuration options associated with this exporter.
-  const OtlpGrpcExporterOptions options_;
-
-  std::shared_ptr<OtlpGrpcClient> client_;
-  std::shared_ptr<OtlpGrpcClientReferenceGuard> client_reference_guard_;
-
-  // For testing
-  friend class OtlpGrpcExporterTestPeer;
-  friend class OtlpGrpcLogRecordExporterTestPeer;
-
-  // Store service stub internally. Useful for testing.
-  std::shared_ptr<proto::collector::trace::v1::TraceService::StubInterface> trace_service_stub_;
-
-  /**
-   * Create an OtlpGrpcExporter using the specified service stub.
-   * Only tests can call this constructor directly.
-   * @param stub the service stub to be used for exporting
-   */
-  OtlpGrpcExporter(std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> stub);
-
-  /**
-   * Create an OtlpGrpcExporter using the specified service stub and gRPC client.
-   * Only tests can call this constructor directly.
-   * @param stub the service stub to be used for exporting
-   * @param client the gRPC client to use
-   */
-  OtlpGrpcExporter(std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> stub,
-                   const std::shared_ptr<OtlpGrpcClient> &client);
-
-  std::atomic<bool> is_shutdown_{false};
-  bool isShutdown() const noexcept;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h
deleted file mode 100644
index 24d19d5ce..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcClient;
-
-/**
- * Factory class for OtlpGrpcExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpGrpcExporterFactory
-{
-public:
-  /**
-   * Create an OtlpGrpcExporter using all default options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create();
-
-  /**
-   * Create an OtlpGrpcExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      const OtlpGrpcExporterOptions &options);
-
-  /**
-   * Create an OtlpGrpcExporter using the given options and gRPC client.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      const OtlpGrpcExporterOptions &options,
-      const std::shared_ptr<OtlpGrpcClient> &client);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h
deleted file mode 100644
index b2556f1f7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP GRPC traces exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md#otlpgrpc
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpGrpcExporterOptions : public OtlpGrpcClientOptions
-{
-  OtlpGrpcExporterOptions();
-  ~OtlpGrpcExporterOptions();
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h
deleted file mode 100644
index da278ccd2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-// clang-format on
-
-#include "opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-// clang-format on
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-
-#include <atomic>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcClientReferenceGuard;
-
-class OtlpGrpcClient;
-
-/**
- * The OTLP exporter exports log data in OpenTelemetry Protocol (OTLP) format in gRPC.
- */
-class OtlpGrpcLogRecordExporter : public opentelemetry::sdk::logs::LogRecordExporter
-{
-public:
-  /**
-   * Create an OtlpGrpcLogRecordExporter with default exporter options.
-   */
-  OtlpGrpcLogRecordExporter();
-
-  /**
-   * Create an OtlpGrpcLogRecordExporter using specified OtlpGrpcClient.
-   *
-   * @param options options to create exporter
-   * @param client the gRPC client to use
-   */
-  OtlpGrpcLogRecordExporter(const OtlpGrpcLogRecordExporterOptions &options,
-                            const std::shared_ptr<OtlpGrpcClient> &client);
-
-  /**
-   * Create an OtlpGrpcLogRecordExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   */
-  OtlpGrpcLogRecordExporter(const OtlpGrpcLogRecordExporterOptions &options);
-
-  ~OtlpGrpcLogRecordExporter() override;
-
-  /**
-   * Creates a recordable that stores the data in protobuf.
-   * @return a newly initialized Recordable object.
-   */
-  std::unique_ptr<opentelemetry::sdk::logs::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Exports a vector of log records to the configured gRPC endpoint. Guaranteed to return after a
-   * timeout specified from the options passed to the constructor.
-   * @param records A list of log records.
-   */
-  opentelemetry::sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &records) noexcept
-      override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shutdown this exporter.
-   * @param timeout The maximum time to wait for the shutdown method to return.
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Get the Client object
-   *
-   * @return return binded gRPC client
-   */
-  const std::shared_ptr<OtlpGrpcClient> &GetClient() const noexcept;
-
-private:
-  // Configuration options for the exporter
-  const OtlpGrpcLogRecordExporterOptions options_;
-
-  std::shared_ptr<OtlpGrpcClient> client_;
-  std::shared_ptr<OtlpGrpcClientReferenceGuard> client_reference_guard_;
-
-  // For testing
-  friend class OtlpGrpcLogRecordExporterTestPeer;
-
-  // Store service stub internally. Useful for testing.
-  std::shared_ptr<proto::collector::logs::v1::LogsService::StubInterface> log_service_stub_;
-
-  /**
-   * Create an OtlpGrpcLogRecordExporter using the specified service stub.
-   * Only tests can call this constructor directly.
-   * @param stub the service stub to be used for exporting
-   */
-  OtlpGrpcLogRecordExporter(
-      std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> stub);
-
-  /**
-   * Create an OtlpGrpcLogRecordExporter using the specified service stub and gRPC client.
-   * Only tests can call this constructor directly.
-   * @param stub the service stub to be used for exporting
-   * @param client the gRPC client to use
-   */
-  OtlpGrpcLogRecordExporter(
-      std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> stub,
-      const std::shared_ptr<OtlpGrpcClient> &client);
-
-  std::atomic<bool> is_shutdown_{false};
-  bool isShutdown() const noexcept;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h
deleted file mode 100644
index e69a20b45..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcClient;
-
-/**
- * Factory class for OtlpGrpcLogRecordExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpGrpcLogRecordExporterFactory
-{
-public:
-  /**
-   * Create a OtlpGrpcLogRecordExporter.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create();
-
-  /**
-   * Create a OtlpGrpcLogRecordExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
-      const OtlpGrpcLogRecordExporterOptions &options);
-
-  /**
-   * Create a OtlpGrpcLogRecordExporter using the given options and gRPC client.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
-      const OtlpGrpcLogRecordExporterOptions &options,
-      const std::shared_ptr<OtlpGrpcClient> &client);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h
deleted file mode 100644
index cc1a199c4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP GRPC log record exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md#otlpgrpc
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpGrpcLogRecordExporterOptions : public OtlpGrpcClientOptions
-{
-  OtlpGrpcLogRecordExporterOptions();
-  ~OtlpGrpcLogRecordExporterOptions();
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h
deleted file mode 100644
index d3d857b3f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-// clang-format on
-
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-// clang-format on
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-
-#include <atomic>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcClientReferenceGuard;
-class OtlpGrpcClient;
-
-/**
- * The OTLP exporter exports metrics data in OpenTelemetry Protocol (OTLP) format in gRPC.
- */
-class OtlpGrpcMetricExporter : public opentelemetry::sdk::metrics::PushMetricExporter
-{
-public:
-  /**
-   * Create an OtlpGrpcMetricExporter using all default options.
-   */
-  OtlpGrpcMetricExporter();
-
-  /**
-   * Create an OtlpGrpcMetricExporter using specified OtlpGrpcClient.
-   *
-   * @param options options to create exporter
-   * @param client the gRPC client to use
-   */
-  OtlpGrpcMetricExporter(const OtlpGrpcMetricExporterOptions &options,
-                         const std::shared_ptr<OtlpGrpcClient> &client);
-
-  /**
-   * Create an OtlpGrpcMetricExporter using the given options.
-   */
-  explicit OtlpGrpcMetricExporter(const OtlpGrpcMetricExporterOptions &options);
-
-  ~OtlpGrpcMetricExporter() override;
-
-  /**
-   * Get the AggregationTemporality for exporter
-   *
-   * @return AggregationTemporality
-   */
-  sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      sdk::metrics::InstrumentType instrument_type) const noexcept override;
-
-  opentelemetry::sdk::common::ExportResult Export(
-      const opentelemetry::sdk::metrics::ResourceMetrics &data) noexcept override;
-
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Get the Client object
-   *
-   * @return return binded gRPC client
-   */
-  const std::shared_ptr<OtlpGrpcClient> &GetClient() const noexcept;
-
-private:
-  // The configuration options associated with this exporter.
-  const OtlpGrpcMetricExporterOptions options_;
-
-  std::shared_ptr<OtlpGrpcClient> client_;
-  std::shared_ptr<OtlpGrpcClientReferenceGuard> client_reference_guard_;
-
-  // Aggregation Temporality selector
-  const sdk::metrics::AggregationTemporalitySelector aggregation_temporality_selector_;
-
-  // For testing
-  friend class OtlpGrpcMetricExporterTestPeer;
-
-  // Store service stub internally. Useful for testing.
-  std::shared_ptr<proto::collector::metrics::v1::MetricsService::StubInterface>
-      metrics_service_stub_;
-
-  /**
-   * Create an OtlpGrpcMetricExporter using the specified service stub.
-   * Only tests can call this constructor directly.
-   * @param stub the service stub to be used for exporting
-   */
-  OtlpGrpcMetricExporter(
-      std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface> stub);
-
-  /**
-   * Create an OtlpGrpcMetricExporter using the specified service stub and gRPC client.
-   * Only tests can call this constructor directly.
-   * @param stub the service stub to be used for exporting
-   * @param client the gRPC client to use
-   */
-  OtlpGrpcMetricExporter(
-      std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface> stub,
-      const std::shared_ptr<OtlpGrpcClient> &client);
-
-  std::atomic<bool> is_shutdown_{false};
-  bool isShutdown() const noexcept;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h
deleted file mode 100644
index 5d405609b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcClient;
-
-/**
- * Factory class for OtlpGrpcMetricExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpGrpcMetricExporterFactory
-{
-public:
-  /**
-   * Create a OtlpGrpcMetricExporter.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create();
-
-  /**
-   * Create a OtlpGrpcMetricExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      const OtlpGrpcMetricExporterOptions &options);
-
-  /**
-   * Create a OtlpGrpcMetricExporter using the given options and gRPC client.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      const OtlpGrpcMetricExporterOptions &options,
-      const std::shared_ptr<OtlpGrpcClient> &client);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h
deleted file mode 100644
index 22be58097..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP GRPC metrics exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md#otlpgrpc
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpGrpcMetricExporterOptions : public OtlpGrpcClientOptions
-{
-  OtlpGrpcMetricExporterOptions();
-  ~OtlpGrpcMetricExporterOptions();
-
-  /** Preferred Aggregation Temporality. */
-  PreferredAggregationTemporality aggregation_temporality;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_utils.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_utils.h
deleted file mode 100644
index a5e4e018f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_utils.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <grpcpp/support/status.h>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace exporter
-{
-namespace otlp
-{
-namespace grpc_utils
-{
-
-const char *grpc_status_code_to_string(::grpc::StatusCode status_code);
-
-}  // namespace grpc_utils
-}  // namespace otlp
-}  // namespace exporter
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http.h
deleted file mode 100644
index 6899c6f54..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-enum class JsonBytesMappingKind
-{
-  kHexId,
-  kHex,
-  kBase64,
-};
-
-enum class HttpRequestContentType
-{
-  kJson,
-  kBinary,
-};
-
-OPENTELEMETRY_EXPORT HttpRequestContentType
-GetOtlpHttpProtocolFromString(nostd::string_view name) noexcept;
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h
deleted file mode 100644
index 5cb5fdfbc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_client.h
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstddef>
-#include <functional>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-// forward declare google::protobuf::Message
-namespace google
-{
-namespace protobuf
-{
-class Message;
-}
-}  // namespace google
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-// The default URL path to post metric data.
-constexpr char kDefaultMetricsPath[] = "/v1/metrics";
-// The HTTP header "Content-Type"
-constexpr char kHttpJsonContentType[]   = "application/json";
-constexpr char kHttpBinaryContentType[] = "application/x-protobuf";
-
-/**
- * Struct to hold OTLP HTTP client options.
- */
-struct OtlpHttpClientOptions
-{
-  std::string url;
-
-  /** SSL options. */
-  ext::http::client::HttpSslOptions ssl_options;
-
-  // By default, post binary data
-  HttpRequestContentType content_type = HttpRequestContentType::kBinary;
-
-  // If convert bytes into hex. By default, we will convert all bytes but id into base64
-  // This option is ignored if content_type is not kJson
-  JsonBytesMappingKind json_bytes_mapping = JsonBytesMappingKind::kHexId;
-
-  // By default, do not compress data
-  std::string compression = "none";
-
-  // If using the json name of protobuf field to set the key of json. By default, we will use the
-  // field name just like proto files.
-  bool use_json_name = false;
-
-  // Whether to print the status of the HTTP client in the console
-  bool console_debug = false;
-
-  std::chrono::system_clock::duration timeout;
-
-  // Additional HTTP headers
-  OtlpHeaders http_headers;
-
-  // Retry policy for select failure codes
-  ext::http::client::RetryPolicy retry_policy;
-
-  // Concurrent requests
-  std::size_t max_concurrent_requests = 64;
-
-  // Requests per connections
-  std::size_t max_requests_per_connection = 8;
-
-  // User agent
-  std::string user_agent;
-
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-
-  inline OtlpHttpClientOptions(
-      nostd::string_view input_url,
-      bool input_ssl_insecure_skip_verify,
-      nostd::string_view input_ssl_ca_cert_path,
-      nostd::string_view input_ssl_ca_cert_string,
-      nostd::string_view input_ssl_client_key_path,
-      nostd::string_view input_ssl_client_key_string,
-      nostd::string_view input_ssl_client_cert_path,
-      nostd::string_view input_ssl_client_cert_string,
-      nostd::string_view input_ssl_min_tls,
-      nostd::string_view input_ssl_max_tls,
-      nostd::string_view input_ssl_cipher,
-      nostd::string_view input_ssl_cipher_suite,
-      HttpRequestContentType input_content_type,
-      JsonBytesMappingKind input_json_bytes_mapping,
-      nostd::string_view input_compression,
-      bool input_use_json_name,
-      bool input_console_debug,
-      std::chrono::system_clock::duration input_timeout,
-      const OtlpHeaders &input_http_headers,
-      std::uint32_t input_retry_policy_max_attempts,
-      std::chrono::duration<float> input_retry_policy_initial_backoff,
-      std::chrono::duration<float> input_retry_policy_max_backoff,
-      float input_retry_policy_backoff_multiplier,
-      const std::shared_ptr<sdk::common::ThreadInstrumentation> &input_thread_instrumentation,
-      std::size_t input_concurrent_sessions         = 64,
-      std::size_t input_max_requests_per_connection = 8,
-      nostd::string_view input_user_agent           = GetOtlpDefaultUserAgent())
-      : url(input_url),
-        ssl_options(input_url,
-                    input_ssl_insecure_skip_verify,
-                    input_ssl_ca_cert_path,
-                    input_ssl_ca_cert_string,
-                    input_ssl_client_key_path,
-                    input_ssl_client_key_string,
-                    input_ssl_client_cert_path,
-                    input_ssl_client_cert_string,
-                    input_ssl_min_tls,
-                    input_ssl_max_tls,
-                    input_ssl_cipher,
-                    input_ssl_cipher_suite),
-        content_type(input_content_type),
-        json_bytes_mapping(input_json_bytes_mapping),
-        compression(input_compression),
-        use_json_name(input_use_json_name),
-        console_debug(input_console_debug),
-        timeout(input_timeout),
-        http_headers(input_http_headers),
-        retry_policy{input_retry_policy_max_attempts, input_retry_policy_initial_backoff,
-                     input_retry_policy_max_backoff, input_retry_policy_backoff_multiplier},
-        max_concurrent_requests(input_concurrent_sessions),
-        max_requests_per_connection(input_max_requests_per_connection),
-        user_agent(input_user_agent),
-        thread_instrumentation(input_thread_instrumentation)
-  {}
-};
-
-/**
- * The OTLP HTTP client exports span data in OpenTelemetry Protocol (OTLP) format.
- */
-class OtlpHttpClient
-{
-public:
-  /**
-   * Create an OtlpHttpClient using the given options.
-   */
-  explicit OtlpHttpClient(OtlpHttpClientOptions &&options);
-
-  ~OtlpHttpClient();
-
-  /**
-   * Sync export
-   * @param message message to export, it should be ExportTraceServiceRequest,
-   * ExportMetricsServiceRequest or ExportLogsServiceRequest
-   * @return return the status of this operation
-   */
-  sdk::common::ExportResult Export(const google::protobuf::Message &message) noexcept;
-
-  /**
-   * Async export
-   * @param message message to export, it should be ExportTraceServiceRequest,
-   * ExportMetricsServiceRequest or ExportLogsServiceRequest
-   * @param result_callback callback to call when the exporting is done
-   * @return return the status of this operation
-   */
-  sdk::common::ExportResult Export(
-      const google::protobuf::Message &message,
-      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept;
-
-  /**
-   * Async export
-   * @param message message to export, it should be ExportTraceServiceRequest,
-   * ExportMetricsServiceRequest or ExportLogsServiceRequest
-   * @param result_callback callback to call when the exporting is done
-   * @param max_running_requests wait for at most max_running_requests running requests
-   * @return return the status of this operation
-   */
-  sdk::common::ExportResult Export(
-      const google::protobuf::Message &message,
-      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback,
-      std::size_t max_running_requests) noexcept;
-
-  /**
-   * Force flush the HTTP client.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Shut down the HTTP client.
-   * @param timeout an optional timeout, the default timeout of 0 means that no
-   * timeout is applied.
-   * @return return the status of this operation
-   */
-  bool Shutdown(std::chrono::microseconds timeout = std::chrono::microseconds(0)) noexcept;
-
-  /**
-   * @brief Release the lifetime of specify session.
-   *
-   * @param session the session to release
-   */
-  void ReleaseSession(const opentelemetry::ext::http::client::Session &session) noexcept;
-
-  /**
-   * Get options of current OTLP http client.
-   * @return options of current OTLP http client.
-   */
-  inline const OtlpHttpClientOptions &GetOptions() const noexcept { return options_; }
-
-  /**
-   * Get if this OTLP http client is shutdown.
-   * @return return true after Shutdown is called.
-   */
-  bool IsShutdown() const noexcept;
-
-private:
-  struct HttpSessionData
-  {
-    std::shared_ptr<opentelemetry::ext::http::client::Session> session;
-    std::shared_ptr<opentelemetry::ext::http::client::EventHandler> event_handle;
-
-    inline HttpSessionData() = default;
-
-    inline explicit HttpSessionData(
-        std::shared_ptr<opentelemetry::ext::http::client::Session> &&input_session,
-        std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &&input_handle)
-    {
-      session.swap(input_session);
-      event_handle.swap(input_handle);
-    }
-
-    inline HttpSessionData(HttpSessionData &&other)
-    {
-      session.swap(other.session);
-      event_handle.swap(other.event_handle);
-    }
-
-    inline HttpSessionData &operator=(HttpSessionData &&other) noexcept
-    {
-      session.swap(other.session);
-      event_handle.swap(other.event_handle);
-      return *this;
-    }
-  };
-
-  /**
-   * @brief Create a Session object or return a error result
-   *
-   * @param message The message to send
-   */
-  nostd::variant<sdk::common::ExportResult, HttpSessionData> createSession(
-      const google::protobuf::Message &message,
-      std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept;
-
-  /**
-   * Add http session and hold it's lifetime.
-   * @param session_data the session to add
-   */
-  void addSession(HttpSessionData &&session_data) noexcept;
-
-  /**
-   * @brief Real delete all sessions and event handles.
-   * @note This function is called in the same thread where we create sessions and handles
-   *
-   * @return return true if there are more sessions to delete
-   */
-  bool cleanupGCSessions() noexcept;
-
-  // For testing
-  friend class OtlpHttpExporterTestPeer;
-  friend class OtlpHttpLogRecordExporterTestPeer;
-  friend class OtlpHttpMetricExporterTestPeer;
-
-  /**
-   * Create an OtlpHttpClient using the specified http client.
-   * Only tests can call this constructor directly.
-   * @param options the Otlp http client options to be used for exporting
-   * @param http_client the http client to be used for exporting
-   */
-  OtlpHttpClient(OtlpHttpClientOptions &&options,
-                 std::shared_ptr<ext::http::client::HttpClient> http_client);
-
-  // Stores if this HTTP client had its Shutdown() method called
-  std::atomic<bool> is_shutdown_;
-
-  // The configuration options associated with this HTTP client.
-  const OtlpHttpClientOptions options_;
-
-  // Object that stores the HTTP sessions that have been created
-  std::shared_ptr<ext::http::client::HttpClient> http_client_;
-
-  // Cached parsed URI
-  std::string http_uri_;
-
-  // Running sessions and event handles
-  std::unordered_map<const opentelemetry::ext::http::client::Session *, HttpSessionData>
-      running_sessions_;
-  // Sessions and event handles that are waiting to be deleted
-  std::list<HttpSessionData> gc_sessions_;
-  // Lock for running_sessions_, gc_sessions_ and http_client_
-  std::recursive_mutex session_manager_lock_;
-  // Condition variable and mutex to control the concurrency count of running sessions
-  std::mutex session_waker_lock_;
-  std::condition_variable session_waker_;
-  std::atomic<size_t> start_session_counter_;
-  std::atomic<size_t> finished_session_counter_;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
deleted file mode 100644
index 454959dd4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * The OTLP exporter exports span data in OpenTelemetry Protocol (OTLP) format.
- */
-class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::trace::SpanExporter
-{
-public:
-  /**
-   * Create an OtlpHttpExporter using all default options.
-   */
-  OtlpHttpExporter();
-
-  /**
-   * Create an OtlpHttpExporter using the given options.
-   */
-  explicit OtlpHttpExporter(const OtlpHttpExporterOptions &options);
-
-  /**
-   * Create an OtlpHttpExporter using the given options.
-   */
-  OtlpHttpExporter(const OtlpHttpExporterOptions &options,
-                   const OtlpHttpExporterRuntimeOptions &runtime_options);
-
-  /**
-   * Create a span recordable.
-   * @return a newly initialized Recordable object
-   */
-  std::unique_ptr<opentelemetry::sdk::trace::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Export
-   * @param spans a span of unique pointers to span recordables
-   */
-  opentelemetry::sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans) noexcept
-      override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shut down the exporter.
-   * @param timeout an optional timeout, the default timeout of 0 means that no
-   * timeout is applied.
-   * @return return the status of this operation
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  // The configuration options associated with this exporter.
-  OtlpHttpExporterOptions options_;
-  // The runtime options associated with this exporter.
-  OtlpHttpExporterRuntimeOptions runtime_options_;
-
-  // Object that stores the HTTP sessions that have been created
-  std::unique_ptr<OtlpHttpClient> http_client_;
-  // For testing
-  friend class OtlpHttpExporterTestPeer;
-  /**
-   * Create an OtlpHttpExporter using the specified http client.
-   * Only tests can call this constructor directly.
-   * @param http_client the http client to be used for exporting
-   */
-  OtlpHttpExporter(std::unique_ptr<OtlpHttpClient> http_client);
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h
deleted file mode 100644
index bf42d2635..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Factory class for OtlpHttpExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpHttpExporterFactory
-{
-public:
-  /**
-   * Create an OtlpHttpExporter using all default options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create();
-
-  /**
-   * Create an OtlpHttpExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      const OtlpHttpExporterOptions &options);
-
-  /**
-   * Create an OtlpHttpExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      const OtlpHttpExporterOptions &options,
-      const OtlpHttpExporterRuntimeOptions &runtime_options);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
deleted file mode 100644
index 314854f29..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstdint>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP HTTP traces exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md#otlphttp
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpHttpExporterOptions
-{
-  OtlpHttpExporterOptions();
-  ~OtlpHttpExporterOptions();
-
-  /** The endpoint to export to. */
-  std::string url;
-
-  /** HTTP content type. */
-  HttpRequestContentType content_type;
-
-  /**
-    Json byte mapping.
-
-    Used only for HttpRequestContentType::kJson.
-    Convert bytes to hex / base64.
-  */
-  JsonBytesMappingKind json_bytes_mapping;
-
-  /**
-    Use json names (true) or protobuf field names (false) to set the json key.
-  */
-  bool use_json_name;
-
-  /** Print debug messages. */
-  bool console_debug;
-
-  /** Export timeout. */
-  std::chrono::system_clock::duration timeout;
-
-  /** Additional HTTP headers. */
-  OtlpHeaders http_headers;
-
-#ifdef ENABLE_ASYNC_EXPORT
-  /** Max number of concurrent requests. */
-  std::size_t max_concurrent_requests;
-
-  /** Max number of requests per connection. */
-  std::size_t max_requests_per_connection;
-#endif
-
-  /** True do disable SSL. */
-  bool ssl_insecure_skip_verify;
-
-  /** CA CERT, path to a file. */
-  std::string ssl_ca_cert_path;
-
-  /** CA CERT, as a string. */
-  std::string ssl_ca_cert_string;
-
-  /** CLIENT KEY, path to a file. */
-  std::string ssl_client_key_path;
-
-  /** CLIENT KEY, as a string. */
-  std::string ssl_client_key_string;
-
-  /** CLIENT CERT, path to a file. */
-  std::string ssl_client_cert_path;
-
-  /** CLIENT CERT, as a string. */
-  std::string ssl_client_cert_string;
-
-  /** Minimum TLS version. */
-  std::string ssl_min_tls;
-
-  /** Maximum TLS version. */
-  std::string ssl_max_tls;
-
-  /** TLS cipher. */
-  std::string ssl_cipher;
-
-  /** TLS cipher suite. */
-  std::string ssl_cipher_suite;
-
-  /** Compression type. */
-  std::string compression;
-
-  /** The maximum number of call attempts, including the original attempt. */
-  std::uint32_t retry_policy_max_attempts{};
-
-  /** The initial backoff delay between retry attempts, random between (0, initial_backoff). */
-  std::chrono::duration<float> retry_policy_initial_backoff{};
-
-  /** The maximum backoff places an upper limit on exponential backoff growth. */
-  std::chrono::duration<float> retry_policy_max_backoff{};
-
-  /** The backoff will be multiplied by this value after each retry attempt. */
-  float retry_policy_backoff_multiplier{};
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h
deleted file mode 100644
index 02ec76acf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP HTTP traces exporter runtime options.
- */
-struct OPENTELEMETRY_EXPORT OtlpHttpExporterRuntimeOptions
-{
-  OtlpHttpExporterRuntimeOptions()  = default;
-  ~OtlpHttpExporterRuntimeOptions() = default;
-
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h
deleted file mode 100644
index aba430522..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * The OTLP exporter exports log data in OpenTelemetry Protocol (OTLP) format.
- */
-class OtlpHttpLogRecordExporter final : public opentelemetry::sdk::logs::LogRecordExporter
-{
-public:
-  /**
-   * Create an OtlpHttpLogRecordExporter with default exporter options.
-   */
-  OtlpHttpLogRecordExporter();
-
-  /**
-   * Create an OtlpHttpLogRecordExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   */
-  OtlpHttpLogRecordExporter(const OtlpHttpLogRecordExporterOptions &options);
-
-  /**
-   * Create an OtlpHttpLogRecordExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   * @param runtime_options An object containing the user's runtime options.
-   */
-  OtlpHttpLogRecordExporter(const OtlpHttpLogRecordExporterOptions &options,
-                            const OtlpHttpLogRecordExporterRuntimeOptions &runtime_options);
-
-  /**
-   * Creates a recordable that stores the data in a JSON object
-   */
-  std::unique_ptr<opentelemetry::sdk::logs::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Exports a vector of log records to the Elasticsearch instance. Guaranteed to return after a
-   * timeout specified from the options passed from the constructor.
-   * @param records A list of log records to send to Elasticsearch.
-   */
-  opentelemetry::sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &records) noexcept
-      override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shutdown this exporter.
-   * @param timeout The maximum time to wait for the shutdown method to return
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  // Configuration options for the exporter
-  OtlpHttpLogRecordExporterOptions options_;
-  // Runtime options for the exporter
-  OtlpHttpLogRecordExporterRuntimeOptions runtime_options_;
-
-  // Object that stores the HTTP sessions that have been created
-  std::unique_ptr<OtlpHttpClient> http_client_;
-  // For testing
-  friend class OtlpHttpLogRecordExporterTestPeer;
-  /**
-   * Create an OtlpHttpLogRecordExporter using the specified http client.
-   * Only tests can call this constructor directly.
-   * @param http_client the http client to be used for exporting
-   */
-  OtlpHttpLogRecordExporter(std::unique_ptr<OtlpHttpClient> http_client);
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h
deleted file mode 100644
index d01eb4259..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Factory class for OtlpHttpLogRecordExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpHttpLogRecordExporterFactory
-{
-public:
-  /**
-   * Create a OtlpHttpLogRecordExporter.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create();
-
-  /**
-   * Create a OtlpHttpLogRecordExporter.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
-      const OtlpHttpLogRecordExporterOptions &options);
-
-  /**
-   * Create a OtlpHttpLogRecordExporter.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
-      const OtlpHttpLogRecordExporterOptions &options,
-      const OtlpHttpLogRecordExporterRuntimeOptions &runtime_options);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h
deleted file mode 100644
index e7c47a556..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstdint>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP HTTP log record exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md#otlphttp
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpHttpLogRecordExporterOptions
-{
-  OtlpHttpLogRecordExporterOptions();
-  ~OtlpHttpLogRecordExporterOptions();
-
-  /** The endpoint to export to. */
-  std::string url;
-
-  /** HTTP content type. */
-  HttpRequestContentType content_type;
-
-  /**
-    Json byte mapping.
-
-    Used only for HttpRequestContentType::kJson.
-    Convert bytes to hex / base64.
-  */
-  JsonBytesMappingKind json_bytes_mapping;
-
-  /**
-    Use json names (true) or protobuf field names (false) to set the json key.
-  */
-  bool use_json_name;
-
-  /** Print debug messages. */
-  bool console_debug;
-
-  /** Export timeout. */
-  std::chrono::system_clock::duration timeout;
-
-  /** Additional HTTP headers. */
-  OtlpHeaders http_headers;
-
-#ifdef ENABLE_ASYNC_EXPORT
-  /** Max number of concurrent requests. */
-  std::size_t max_concurrent_requests;
-
-  /** Max number of requests per connection. */
-  std::size_t max_requests_per_connection;
-#endif
-
-  /** True do disable SSL. */
-  bool ssl_insecure_skip_verify;
-
-  /** CA CERT, path to a file. */
-  std::string ssl_ca_cert_path;
-
-  /** CA CERT, as a string. */
-  std::string ssl_ca_cert_string;
-
-  /** CLIENT KEY, path to a file. */
-  std::string ssl_client_key_path;
-
-  /** CLIENT KEY, as a string. */
-  std::string ssl_client_key_string;
-
-  /** CLIENT CERT, path to a file. */
-  std::string ssl_client_cert_path;
-
-  /** CLIENT CERT, as a string. */
-  std::string ssl_client_cert_string;
-
-  /** Minimum TLS version. */
-  std::string ssl_min_tls;
-
-  /** Maximum TLS version. */
-  std::string ssl_max_tls;
-
-  /** TLS cipher. */
-  std::string ssl_cipher;
-
-  /** TLS cipher suite. */
-  std::string ssl_cipher_suite;
-
-  /** Compression type. */
-  std::string compression;
-
-  /** The maximum number of call attempts, including the original attempt. */
-  std::uint32_t retry_policy_max_attempts{};
-
-  /** The initial backoff delay between retry attempts, random between (0, initial_backoff). */
-  std::chrono::duration<float> retry_policy_initial_backoff{};
-
-  /** The maximum backoff places an upper limit on exponential backoff growth. */
-  std::chrono::duration<float> retry_policy_max_backoff{};
-
-  /** The backoff will be multiplied by this value after each retry attempt. */
-  float retry_policy_backoff_multiplier{};
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h
deleted file mode 100644
index b5ef2ed96..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP HTTP log record exporter runtime options.
- */
-struct OPENTELEMETRY_EXPORT OtlpHttpLogRecordExporterRuntimeOptions
-{
-  OtlpHttpLogRecordExporterRuntimeOptions()  = default;
-  ~OtlpHttpLogRecordExporterRuntimeOptions() = default;
-
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h
deleted file mode 100644
index 8733a740a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-/**
- * The OTLP exporter exports metrics data in OpenTelemetry Protocol (OTLP) format in HTTP.
- */
-class OtlpHttpMetricExporter final : public opentelemetry::sdk::metrics::PushMetricExporter
-{
-public:
-  /**
-   * Create an OtlpHttpMetricExporter with default exporter options.
-   */
-  OtlpHttpMetricExporter();
-
-  /**
-   * Create an OtlpHttpMetricExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   */
-  OtlpHttpMetricExporter(const OtlpHttpMetricExporterOptions &options);
-
-  /**
-   * Create an OtlpHttpMetricExporter with user specified options.
-   * @param options An object containing the user's configuration options.
-   * @param runtime_options An object containing the user's runtime options.
-   */
-  OtlpHttpMetricExporter(const OtlpHttpMetricExporterOptions &options,
-                         const OtlpHttpMetricExporterRuntimeOptions &runtime_options);
-
-  /**
-   * Get the AggregationTemporality for exporter
-   *
-   * @return AggregationTemporality
-   */
-  sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      sdk::metrics::InstrumentType instrument_type) const noexcept override;
-
-  opentelemetry::sdk::common::ExportResult Export(
-      const opentelemetry::sdk::metrics::ResourceMetrics &data) noexcept override;
-
-  /**
-   * Force flush the exporter.
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  // Configuration options for the exporter
-  OtlpHttpMetricExporterOptions options_;
-  // Runtime options for the exporter
-  OtlpHttpMetricExporterRuntimeOptions runtime_options_;
-
-  // Aggregation Temporality Selector
-  const sdk::metrics::AggregationTemporalitySelector aggregation_temporality_selector_;
-
-  // Object that stores the HTTP sessions that have been created
-  std::unique_ptr<OtlpHttpClient> http_client_;
-  // For testing
-  friend class OtlpHttpMetricExporterTestPeer;
-
-  /**
-   * Create an OtlpHttpMetricExporter using the specified http client.
-   * Only tests can call this constructor directly.
-   * @param http_client the http client to be used for exporting
-   */
-  OtlpHttpMetricExporter(std::unique_ptr<OtlpHttpClient> http_client);
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h
deleted file mode 100644
index cb026cbe1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Factory class for OtlpHttpMetricExporter.
- */
-class OPENTELEMETRY_EXPORT OtlpHttpMetricExporterFactory
-{
-public:
-  /**
-   * Create a OtlpHttpMetricExporter.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create();
-
-  /**
-   * Create a OtlpHttpMetricExporter.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      const OtlpHttpMetricExporterOptions &options);
-
-  /**
-   * Create a OtlpHttpMetricExporter.
-   */
-  static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
-      const OtlpHttpMetricExporterOptions &options,
-      const OtlpHttpMetricExporterRuntimeOptions &runtime_options);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h
deleted file mode 100644
index 5ff1b2832..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstdint>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP HTTP metrics exporter options.
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md#otlphttp
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
- */
-struct OPENTELEMETRY_EXPORT OtlpHttpMetricExporterOptions
-{
-  OtlpHttpMetricExporterOptions();
-  ~OtlpHttpMetricExporterOptions();
-
-  /** The endpoint to export to. */
-  std::string url;
-
-  /** HTTP content type. */
-  HttpRequestContentType content_type;
-
-  /**
-    Json byte mapping.
-
-    Used only for HttpRequestContentType::kJson.
-    Convert bytes to hex / base64.
-  */
-  JsonBytesMappingKind json_bytes_mapping;
-
-  /**
-    Use json names (true) or protobuf field names (false) to set the json key.
-  */
-  bool use_json_name;
-
-  /** Print debug messages. */
-  bool console_debug;
-
-  /** Export timeout. */
-  std::chrono::system_clock::duration timeout;
-
-  /** Additional HTTP headers. */
-  OtlpHeaders http_headers;
-
-  PreferredAggregationTemporality aggregation_temporality;
-
-#ifdef ENABLE_ASYNC_EXPORT
-  /** Max number of concurrent requests. */
-  std::size_t max_concurrent_requests;
-
-  /** Max number of requests per connection. */
-  std::size_t max_requests_per_connection;
-#endif
-
-  /** True do disable SSL. */
-  bool ssl_insecure_skip_verify;
-
-  /** CA CERT, path to a file. */
-  std::string ssl_ca_cert_path;
-
-  /** CA CERT, as a string. */
-  std::string ssl_ca_cert_string;
-
-  /** CLIENT KEY, path to a file. */
-  std::string ssl_client_key_path;
-
-  /** CLIENT KEY, as a string. */
-  std::string ssl_client_key_string;
-
-  /** CLIENT CERT, path to a file. */
-  std::string ssl_client_cert_path;
-
-  /** CLIENT CERT, as a string. */
-  std::string ssl_client_cert_string;
-
-  /** Minimum TLS version. */
-  std::string ssl_min_tls;
-
-  /** Maximum TLS version. */
-  std::string ssl_max_tls;
-
-  /** TLS cipher. */
-  std::string ssl_cipher;
-
-  /** TLS cipher suite. */
-  std::string ssl_cipher_suite;
-
-  /** Compression type. */
-  std::string compression;
-
-  /** The maximum number of call attempts, including the original attempt. */
-  std::uint32_t retry_policy_max_attempts{};
-
-  /** The initial backoff delay between retry attempts, random between (0, initial_backoff). */
-  std::chrono::duration<float> retry_policy_initial_backoff{};
-
-  /** The maximum backoff places an upper limit on exponential backoff growth. */
-  std::chrono::duration<float> retry_policy_max_backoff{};
-
-  /** The backoff will be multiplied by this value after each retry attempt. */
-  float retry_policy_backoff_multiplier{};
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h
deleted file mode 100644
index c0e91a342..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * Struct to hold OTLP HTTP metrics exporter runtime options.
- */
-struct OPENTELEMETRY_EXPORT OtlpHttpMetricExporterRuntimeOptions
-{
-  OtlpHttpMetricExporterRuntimeOptions()  = default;
-  ~OtlpHttpMetricExporterRuntimeOptions() = default;
-
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_log_recordable.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_log_recordable.h
deleted file mode 100644
index 5a1ddf37b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_log_recordable.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "opentelemetry/proto/logs/v1/logs.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-/**
- * An OTLP Recordable implemenation for Logs.
- */
-class OtlpLogRecordable final : public opentelemetry::sdk::logs::Recordable
-{
-public:
-  ~OtlpLogRecordable() override = default;
-
-  proto::logs::v1::LogRecord &log_record() noexcept { return proto_record_; }
-  const proto::logs::v1::LogRecord &log_record() const noexcept { return proto_record_; }
-
-  /** Returns the associated resource */
-  const opentelemetry::sdk::resource::Resource &GetResource() const noexcept;
-
-  /** Returns the associated instruementation scope */
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope &GetInstrumentationScope()
-      const noexcept;
-
-  /**
-   * Set the timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  void SetTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  /**
-   * Set the observed timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  void SetObservedTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  /**
-   * Set the severity for this log.
-   * @param severity the severity of the event
-   */
-  void SetSeverity(opentelemetry::logs::Severity severity) noexcept override;
-
-  /**
-   * Set body field for this log.
-   * @param message the body to set
-   */
-  void SetBody(const opentelemetry::common::AttributeValue &message) noexcept override;
-
-  /**
-   * @brief Set the Event Id for this log.
-   * @param id the event Id to set
-   * @param name  the event name to set
-   */
-  void SetEventId(int64_t /* id */, nostd::string_view event_name) noexcept override;
-
-  /**
-   * Set the trace id for this log.
-   * @param trace_id the trace id to set
-   */
-  void SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept override;
-
-  /**
-   * Set the span id for this log.
-   * @param span_id the span id to set
-   */
-  void SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept override;
-
-  /**
-   * Inject trace_flags for this log.
-   * @param trace_flags the trace flags to set
-   */
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept override;
-
-  /**
-   * Set an attribute of a log.
-   * @param key the name of the attribute
-   * @param value the attribute value
-   */
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override;
-
-  /**
-   * Set Resource of this log
-   * @param Resource the resource to set
-   */
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override;
-
-  /**
-   * Set instrumentation_scope for this log.
-   * @param instrumentation_scope the instrumentation scope to set
-   */
-  void SetInstrumentationScope(const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-                                   &instrumentation_scope) noexcept override;
-
-private:
-  proto::logs::v1::LogRecord proto_record_;
-  const opentelemetry::sdk::resource::Resource *resource_ = nullptr;
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope *instrumentation_scope_ =
-      nullptr;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
deleted file mode 100644
index ba9b11e37..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "opentelemetry/proto/metrics/v1/metrics.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-namespace opentelemetry
-{
-namespace proto
-{
-namespace collector
-{
-namespace metrics
-{
-namespace v1
-{
-class ExportMetricsServiceRequest;
-}
-}  // namespace metrics
-}  // namespace collector
-}  // namespace proto
-}  // namespace opentelemetry
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-/**
- * The OtlpMetricUtils contains utility functions for OTLP metrics
- */
-class OtlpMetricUtils
-{
-public:
-  static opentelemetry::sdk::metrics::AggregationType GetAggregationType(
-      const opentelemetry::sdk::metrics::MetricData &metric_data) noexcept;
-
-  static proto::metrics::v1::AggregationTemporality GetProtoAggregationTemporality(
-      const opentelemetry::sdk::metrics::AggregationTemporality &aggregation_temporality) noexcept;
-
-  static void ConvertSumMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
-                               proto::metrics::v1::Sum *const sum) noexcept;
-
-  static void ConvertHistogramMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
-                                     proto::metrics::v1::Histogram *const histogram) noexcept;
-
-  static void ConvertExponentialHistogramMetric(
-      const opentelemetry::sdk::metrics::MetricData &metric_data,
-      proto::metrics::v1::ExponentialHistogram *const histogram) noexcept;
-
-  static void ConvertGaugeMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
-                                 proto::metrics::v1::Gauge *const gauge) noexcept;
-
-  static void PopulateInstrumentInfoMetrics(
-      const opentelemetry::sdk::metrics::MetricData &metric_data,
-      proto::metrics::v1::Metric *metric) noexcept;
-
-  static void PopulateResourceMetrics(
-      const opentelemetry::sdk::metrics::ResourceMetrics &data,
-      proto::metrics::v1::ResourceMetrics *proto_resource_metrics) noexcept;
-
-  static void PopulateRequest(
-      const opentelemetry::sdk::metrics::ResourceMetrics &data,
-      proto::collector::metrics::v1::ExportMetricsServiceRequest *request) noexcept;
-
-  static sdk::metrics::AggregationTemporalitySelector ChooseTemporalitySelector(
-      PreferredAggregationTemporality preferred_aggregation_temporality) noexcept;
-  static sdk::metrics::AggregationTemporality DeltaTemporalitySelector(
-      sdk::metrics::InstrumentType instrument_type) noexcept;
-  static sdk::metrics::AggregationTemporality CumulativeTemporalitySelector(
-      sdk::metrics::InstrumentType instrument_type) noexcept;
-  static sdk::metrics::AggregationTemporality LowMemoryTemporalitySelector(
-      sdk::metrics::InstrumentType instrument_type) noexcept;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h
deleted file mode 100644
index 441d1d3c5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-namespace opentelemetry
-{
-namespace proto
-{
-
-namespace common
-{
-namespace v1
-{
-class AnyValue;
-class KeyValue;
-class InstrumentationScope;
-}  // namespace v1
-}  // namespace common
-
-namespace resource
-{
-namespace v1
-{
-class Resource;
-}
-}  // namespace resource
-
-}  // namespace proto
-}  // namespace opentelemetry
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-/**
- * The OtlpCommoneUtils contains utility functions to populate attributes
- */
-class OtlpPopulateAttributeUtils
-{
-
-public:
-  static void PopulateAttribute(opentelemetry::proto::resource::v1::Resource *proto,
-                                const opentelemetry::sdk::resource::Resource &resource) noexcept;
-
-  static void PopulateAttribute(opentelemetry::proto::common::v1::InstrumentationScope *proto,
-                                const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-                                    &instrumentation_scope) noexcept;
-
-  static void PopulateAnyValue(opentelemetry::proto::common::v1::AnyValue *proto_value,
-                               const opentelemetry::common::AttributeValue &value) noexcept;
-
-  static void PopulateAnyValue(
-      opentelemetry::proto::common::v1::AnyValue *proto_value,
-      const opentelemetry::sdk::common::OwnedAttributeValue &value) noexcept;
-
-  static void PopulateAttribute(opentelemetry::proto::common::v1::KeyValue *attribute,
-                                nostd::string_view key,
-                                const opentelemetry::common::AttributeValue &value) noexcept;
-
-  static void PopulateAttribute(
-      opentelemetry::proto::common::v1::KeyValue *attribute,
-      nostd::string_view key,
-      const opentelemetry::sdk::common::OwnedAttributeValue &value) noexcept;
-};
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_preferred_temporality.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_preferred_temporality.h
deleted file mode 100644
index d9e4013fd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_preferred_temporality.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-enum class PreferredAggregationTemporality
-{
-  kUnspecified,
-  kDelta,
-  kCumulative,
-  kLowMemory,
-};
-
-}
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h
deleted file mode 100644
index 103357d11..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <string>
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/resource/v1/resource.pb.h"
-#include "opentelemetry/proto/trace/v1/trace.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-class OtlpRecordable final : public opentelemetry::sdk::trace::Recordable
-{
-public:
-  proto::trace::v1::Span &span() noexcept { return span_; }
-  const proto::trace::v1::Span &span() const noexcept { return span_; }
-
-  /** Dynamically converts the resource of this span into a proto. */
-  proto::resource::v1::Resource ProtoResource() const noexcept;
-
-  const opentelemetry::sdk::resource::Resource *GetResource() const noexcept;
-  const std::string GetResourceSchemaURL() const noexcept;
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope *GetInstrumentationScope()
-      const noexcept;
-  const std::string GetInstrumentationLibrarySchemaURL() const noexcept;
-
-  proto::common::v1::InstrumentationScope GetProtoInstrumentationScope() const noexcept;
-
-  void SetIdentity(const opentelemetry::trace::SpanContext &span_context,
-                   opentelemetry::trace::SpanId parent_span_id) noexcept override;
-
-  void SetAttribute(opentelemetry::nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override;
-
-  void AddEvent(opentelemetry::nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-  void AddLink(const opentelemetry::trace::SpanContext &span_context,
-               const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-  void SetStatus(opentelemetry::trace::StatusCode code,
-                 nostd::string_view description) noexcept override;
-
-  void SetName(nostd::string_view name) noexcept override;
-
-  void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept override;
-
-  void SetSpanKind(opentelemetry::trace::SpanKind span_kind) noexcept override;
-
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override;
-
-  void SetStartTime(opentelemetry::common::SystemTimestamp start_time) noexcept override;
-
-  void SetDuration(std::chrono::nanoseconds duration) noexcept override;
-
-  void SetInstrumentationScope(const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-                                   &instrumentation_scope) noexcept override;
-
-private:
-  proto::trace::v1::Span span_;
-  const opentelemetry::sdk::resource::Resource *resource_ = nullptr;
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope *instrumentation_scope_ =
-      nullptr;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable_utils.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable_utils.h
deleted file mode 100644
index 0651abc2b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_recordable_utils.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-namespace opentelemetry
-{
-namespace proto
-{
-namespace collector
-{
-
-namespace logs
-{
-namespace v1
-{
-class ExportLogsServiceRequest;
-}
-}  // namespace logs
-namespace trace
-{
-namespace v1
-{
-class ExportTraceServiceRequest;
-}
-}  // namespace trace
-
-}  // namespace collector
-}  // namespace proto
-}  // namespace opentelemetry
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-/**
- * The OtlpRecordableUtils contains utility functions for OTLP recordable
- */
-class OtlpRecordableUtils
-{
-public:
-  static void PopulateRequest(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
-      proto::collector::trace::v1::ExportTraceServiceRequest *request) noexcept;
-
-  static void PopulateRequest(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs,
-      proto::collector::logs::v1::ExportLogsServiceRequest *request) noexcept;
-};
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h
deleted file mode 100644
index dc674ce9e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// This file may be include multiple times, do not add #pragma once here
-
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  if ((defined(__cplusplus) && __cplusplus >= 201704L) || \
-       (defined(_MSVC_LANG) && _MSVC_LANG >= 201704L))
-#    pragma warning(disable : 4996)
-#    pragma warning(disable : 4309)
-#    if _MSC_VER >= 1922
-#      pragma warning(disable : 5054)
-#    endif
-#  endif
-
-#  if _MSC_VER < 1910
-#    pragma warning(disable : 4800)
-#  endif
-#  pragma warning(disable : 4244)
-#  pragma warning(disable : 4251)
-#  pragma warning(disable : 4267)
-#  pragma warning(disable : 4668)
-#  pragma warning(disable : 4946)
-#  pragma warning(disable : 6001)
-#  pragma warning(disable : 6244)
-#  pragma warning(disable : 6246)
-#endif
-
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
-#  if (__GNUC__ * 100 + __GNUC_MINOR__ * 10) >= 460
-#    pragma GCC diagnostic push
-#  endif
-#  pragma GCC diagnostic ignored "-Wunused-parameter"
-#  pragma GCC diagnostic ignored "-Wtype-limits"
-#  pragma GCC diagnostic ignored "-Wsign-compare"
-#  pragma GCC diagnostic ignored "-Wsign-conversion"
-#  pragma GCC diagnostic ignored "-Wshadow"
-#  pragma GCC diagnostic ignored "-Wuninitialized"
-#  pragma GCC diagnostic ignored "-Wconversion"
-#  if (__GNUC__ * 100 + __GNUC_MINOR__) >= 409
-#    pragma GCC diagnostic ignored "-Wfloat-conversion"
-#  endif
-#  if (__GNUC__ * 100 + __GNUC_MINOR__) >= 501
-#    pragma GCC diagnostic ignored "-Wsuggest-override"
-#  endif
-#elif defined(__clang__) || defined(__apple_build_version__)
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wunused-parameter"
-#  pragma clang diagnostic ignored "-Wtype-limits"
-#  pragma clang diagnostic ignored "-Wshadow-field"
-#  pragma clang diagnostic ignored "-Wsign-compare"
-#  pragma clang diagnostic ignored "-Wsign-conversion"
-#  pragma clang diagnostic ignored "-Wshadow"
-#  pragma clang diagnostic ignored "-Wuninitialized"
-#  pragma clang diagnostic ignored "-Wconversion"
-#  if ((__clang_major__ * 100) + __clang_minor__) >= 305
-#    pragma clang diagnostic ignored "-Wfloat-conversion"
-#  endif
-#  if ((__clang_major__ * 100) + __clang_minor__) >= 306
-#    pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#  endif
-#  if ((__clang_major__ * 100) + __clang_minor__) >= 1100
-#    pragma clang diagnostic ignored "-Wsuggest-override"
-#  endif
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h
deleted file mode 100644
index 547eb3f33..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_suffix.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// This file may be include multiple times, do not add #pragma once here
-
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
-#  if (__GNUC__ * 100 + __GNUC_MINOR__ * 10) >= 460
-#    pragma GCC diagnostic pop
-#  endif
-#elif defined(__clang__) || defined(__apple_build_version__)
-#  pragma clang diagnostic pop
-#endif
-
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_environment.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_environment.cc
deleted file mode 100644
index a7bc95b32..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_environment.cc
+++ /dev/null
@@ -1,1329 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <unordered_set>
-#include <utility>
-
-#include "opentelemetry/common/kv_properties.h"
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/env_variables.h"
-#include "opentelemetry/version.h"
-
-namespace sdk_common = opentelemetry::sdk::common;
-
-/*
-  TODO:
-  - Document new variables
-  - Announce deprecation in CHANGELOG
-  - Activate deprecation warning
-*/
-/* #define WARN_DEPRECATED_ENV */
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-static bool GetBoolDualEnvVar(const char *signal_name, const char *generic_name, bool &value)
-{
-  bool exists;
-
-  exists = sdk_common::GetBoolEnvironmentVariable(signal_name, value);
-  if (exists)
-  {
-    return true;
-  }
-
-  exists = sdk_common::GetBoolEnvironmentVariable(generic_name, value);
-
-  return exists;
-}
-
-static bool GetDurationDualEnvVar(const char *signal_name,
-                                  const char *generic_name,
-                                  std::chrono::system_clock::duration &value)
-{
-  bool exists;
-
-  exists = sdk_common::GetDurationEnvironmentVariable(signal_name, value);
-  if (exists)
-  {
-    return true;
-  }
-
-  exists = sdk_common::GetDurationEnvironmentVariable(generic_name, value);
-
-  return exists;
-}
-
-static bool GetStringDualEnvVar(const char *signal_name,
-                                const char *generic_name,
-                                std::string &value)
-{
-  bool exists;
-
-  exists = sdk_common::GetStringEnvironmentVariable(signal_name, value);
-  if (exists)
-  {
-    return true;
-  }
-
-  exists = sdk_common::GetStringEnvironmentVariable(generic_name, value);
-
-  return exists;
-}
-
-static bool GetUintDualEnvVar(const char *signal_name,
-                              const char *generic_name,
-                              std::uint32_t &value)
-{
-  bool exists;
-
-  exists = sdk_common::GetUintEnvironmentVariable(signal_name, value);
-  if (exists)
-  {
-    return true;
-  }
-
-  exists = sdk_common::GetUintEnvironmentVariable(generic_name, value);
-
-  return exists;
-}
-
-static bool GetFloatDualEnvVar(const char *signal_name, const char *generic_name, float &value)
-{
-  bool exists;
-
-  exists = sdk_common::GetFloatEnvironmentVariable(signal_name, value);
-  if (exists)
-  {
-    return true;
-  }
-
-  exists = sdk_common::GetFloatEnvironmentVariable(generic_name, value);
-
-  return exists;
-}
-
-std::string GetOtlpDefaultGrpcTracesEndpoint()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_ENDPOINT";
-  constexpr char kDefault[]    = "http://localhost:4317";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-
-  if (exists)
-  {
-    return value;
-  }
-
-  return kDefault;
-}
-
-std::string GetOtlpDefaultGrpcMetricsEndpoint()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_ENDPOINT";
-  constexpr char kDefault[]    = "http://localhost:4317";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-
-  if (exists)
-  {
-    return value;
-  }
-
-  return kDefault;
-}
-
-std::string GetOtlpDefaultGrpcLogsEndpoint()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_ENDPOINT";
-  constexpr char kDefault[]    = "http://localhost:4317";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-
-  if (exists)
-  {
-    return value;
-  }
-
-  return kDefault;
-}
-
-std::string GetOtlpDefaultHttpTracesEndpoint()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_ENDPOINT";
-  constexpr char kDefault[]    = "http://localhost:4318/v1/traces";
-
-  std::string value;
-  bool exists;
-
-  exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  exists = sdk_common::GetStringEnvironmentVariable(kGenericEnv, value);
-  if (exists)
-  {
-    value += "/v1/traces";
-    return value;
-  }
-
-  return kDefault;
-}
-
-std::string GetOtlpDefaultHttpMetricsEndpoint()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_ENDPOINT";
-  constexpr char kDefault[]    = "http://localhost:4318/v1/metrics";
-
-  std::string value;
-  bool exists;
-
-  exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  exists = sdk_common::GetStringEnvironmentVariable(kGenericEnv, value);
-  if (exists)
-  {
-    value += "/v1/metrics";
-    return value;
-  }
-
-  return kDefault;
-}
-
-std::string GetOtlpDefaultHttpLogsEndpoint()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_ENDPOINT";
-  constexpr char kDefault[]    = "http://localhost:4318/v1/logs";
-
-  std::string value;
-  bool exists;
-
-  exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  exists = sdk_common::GetStringEnvironmentVariable(kGenericEnv, value);
-  if (exists)
-  {
-    value += "/v1/logs";
-    return value;
-  }
-
-  return kDefault;
-}
-
-std::string GetOtlpDefaultHttpTracesProtocol()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_PROTOCOL";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_PROTOCOL";
-  constexpr char kDefault[]    = "http/protobuf";
-
-  std::string value;
-  bool exists;
-
-  exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  exists = sdk_common::GetStringEnvironmentVariable(kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return kDefault;
-}
-
-std::string GetOtlpDefaultHttpMetricsProtocol()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_PROTOCOL";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_PROTOCOL";
-  constexpr char kDefault[]    = "http/protobuf";
-
-  std::string value;
-  bool exists;
-
-  exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  exists = sdk_common::GetStringEnvironmentVariable(kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return kDefault;
-}
-
-std::string GetOtlpDefaultHttpLogsProtocol()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_PROTOCOL";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_PROTOCOL";
-  constexpr char kDefault[]    = "http/protobuf";
-
-  std::string value;
-  bool exists;
-
-  exists = sdk_common::GetStringEnvironmentVariable(kSignalEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  exists = sdk_common::GetStringEnvironmentVariable(kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return kDefault;
-}
-
-bool GetOtlpDefaultGrpcTracesIsInsecure()
-{
-  std::string endpoint = GetOtlpDefaultGrpcTracesEndpoint();
-
-  /* The trace endpoint, when providing a scheme, takes precedence. */
-
-  if (endpoint.substr(0, 6) == "https:")
-  {
-    return false;
-  }
-
-  if (endpoint.substr(0, 5) == "http:")
-  {
-    return true;
-  }
-
-  constexpr char kSignalEnv[]     = "OTEL_EXPORTER_OTLP_TRACES_INSECURE";
-  constexpr char kGenericEnv[]    = "OTEL_EXPORTER_OTLP_INSECURE";
-  constexpr char kOldSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_SSL_ENABLE";
-  constexpr char kOldGenericEnv[] = "OTEL_EXPORTER_OTLP_SSL_ENABLE";
-
-  bool insecure;
-  bool ssl_enabled;
-  bool exists;
-
-  exists = GetBoolDualEnvVar(kSignalEnv, kGenericEnv, insecure);
-  if (exists)
-  {
-    return insecure;
-  }
-
-  exists = sdk_common::GetBoolEnvironmentVariable(kOldSignalEnv, ssl_enabled);
-  if (exists)
-  {
-#ifdef WARN_DEPRECATED_ENV
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << kOldSignalEnv << "> is deprecated, use <"
-                                                    << kSignalEnv << "> instead.");
-#endif
-
-    insecure = !ssl_enabled;
-    return insecure;
-  }
-
-  exists = sdk_common::GetBoolEnvironmentVariable(kOldGenericEnv, ssl_enabled);
-  if (exists)
-  {
-#ifdef WARN_DEPRECATED_ENV
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << kOldGenericEnv << "> is deprecated, use <"
-                                                    << kGenericEnv << "> instead.");
-#endif
-
-    insecure = !ssl_enabled;
-    return insecure;
-  }
-
-  return false;
-}
-
-bool GetOtlpDefaultGrpcMetricsIsInsecure()
-{
-  std::string endpoint = GetOtlpDefaultGrpcMetricsEndpoint();
-
-  /* The metrics endpoint, when providing a scheme, takes precedence. */
-
-  if (endpoint.substr(0, 6) == "https:")
-  {
-    return false;
-  }
-
-  if (endpoint.substr(0, 5) == "http:")
-  {
-    return true;
-  }
-
-  constexpr char kSignalEnv[]     = "OTEL_EXPORTER_OTLP_METRICS_INSECURE";
-  constexpr char kGenericEnv[]    = "OTEL_EXPORTER_OTLP_INSECURE";
-  constexpr char kOldSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_SSL_ENABLE";
-  constexpr char kOldGenericEnv[] = "OTEL_EXPORTER_OTLP_SSL_ENABLE";
-
-  bool insecure;
-  bool ssl_enabled;
-  bool exists;
-
-  exists = GetBoolDualEnvVar(kSignalEnv, kGenericEnv, insecure);
-  if (exists)
-  {
-    return insecure;
-  }
-
-  exists = sdk_common::GetBoolEnvironmentVariable(kOldSignalEnv, ssl_enabled);
-  if (exists)
-  {
-#ifdef WARN_DEPRECATED_ENV
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << kOldSignalEnv << "> is deprecated, use <"
-                                                    << kSignalEnv << "> instead.");
-#endif
-
-    insecure = !ssl_enabled;
-    return insecure;
-  }
-
-  exists = sdk_common::GetBoolEnvironmentVariable(kOldGenericEnv, ssl_enabled);
-  if (exists)
-  {
-#ifdef WARN_DEPRECATED_ENV
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << kOldGenericEnv << "> is deprecated, use <"
-                                                    << kGenericEnv << "> instead.");
-#endif
-
-    insecure = !ssl_enabled;
-    return insecure;
-  }
-
-  return false;
-}
-
-bool GetOtlpDefaultGrpcLogsIsInsecure()
-{
-  std::string endpoint = GetOtlpDefaultGrpcLogsEndpoint();
-
-  /* The logs endpoint, when providing a scheme, takes precedence. */
-
-  if (endpoint.substr(0, 6) == "https:")
-  {
-    return false;
-  }
-
-  if (endpoint.substr(0, 5) == "http:")
-  {
-    return true;
-  }
-
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_INSECURE";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_INSECURE";
-
-  bool insecure;
-  bool exists;
-
-  exists = GetBoolDualEnvVar(kSignalEnv, kGenericEnv, insecure);
-  if (exists)
-  {
-    return insecure;
-  }
-
-  return false;
-}
-
-std::string GetOtlpDefaultTracesSslCertificatePath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslCertificatePath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslCertificatePath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultTracesSslCertificateString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslCertificateString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslCertificateString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CERTIFICATE_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultTracesSslClientKeyPath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_CLIENT_KEY";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslClientKeyPath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslClientKeyPath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_CLIENT_KEY";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultTracesSslClientKeyString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_CLIENT_KEY_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslClientKeyString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslClientKeyString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_CLIENT_KEY_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_KEY_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultTracesSslClientCertificatePath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_CLIENT_CERTIFICATE";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslClientCertificatePath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslClientCertificatePath()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultTracesSslClientCertificateString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_CLIENT_CERTIFICATE_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslClientCertificateString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslClientCertificateString()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE_STRING";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE_STRING";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-/*
-  EXPERIMENTAL:
-  Environment variable names do not exist in the spec,
-  using the OTEL_CPP_ namespace.
-*/
-
-std::string GetOtlpDefaultTracesSslTlsMinVersion()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_TRACES_MIN_TLS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MIN_TLS";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslTlsMinVersion()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_METRICS_MIN_TLS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MIN_TLS";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslTlsMinVersion()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_LOGS_MIN_TLS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MIN_TLS";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultTracesSslTlsMaxVersion()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_TRACES_MAX_TLS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MAX_TLS";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslTlsMaxVersion()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_METRICS_MAX_TLS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MAX_TLS";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslTlsMaxVersion()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_LOGS_MAX_TLS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_MAX_TLS";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultTracesSslTlsCipher()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_TRACES_CIPHER";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslTlsCipher()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_METRICS_CIPHER";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslTlsCipher()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_LOGS_CIPHER";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultTracesSslTlsCipherSuite()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_TRACES_CIPHER_SUITE";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER_SUITE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultMetricsSslTlsCipherSuite()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_METRICS_CIPHER_SUITE";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER_SUITE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::string GetOtlpDefaultLogsSslTlsCipherSuite()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_LOGS_CIPHER_SUITE";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_CIPHER_SUITE";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{};
-}
-
-std::chrono::system_clock::duration GetOtlpDefaultTracesTimeout()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_TIMEOUT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_TIMEOUT";
-
-  std::chrono::system_clock::duration value;
-  bool exists;
-
-  exists = GetDurationDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  value = std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{10});
-  return value;
-}
-
-std::chrono::system_clock::duration GetOtlpDefaultMetricsTimeout()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_TIMEOUT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_TIMEOUT";
-
-  std::chrono::system_clock::duration value;
-  bool exists;
-
-  exists = GetDurationDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  value = std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{10});
-  return value;
-}
-
-std::chrono::system_clock::duration GetOtlpDefaultLogsTimeout()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_TIMEOUT";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_TIMEOUT";
-
-  std::chrono::system_clock::duration value;
-  bool exists;
-
-  exists = GetDurationDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  value = std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{10});
-  return value;
-}
-
-static void DumpOtlpHeaders(OtlpHeaders &output, const char *env_var_name)
-{
-  std::string raw_value;
-  bool exists;
-
-  exists = sdk_common::GetStringEnvironmentVariable(env_var_name, raw_value);
-
-  if (!exists)
-  {
-    return;
-  }
-
-  opentelemetry::common::KeyValueStringTokenizer tokenizer{raw_value};
-  opentelemetry::nostd::string_view header_key;
-  opentelemetry::nostd::string_view header_value;
-  bool header_valid = true;
-
-  std::unordered_set<std::string> remove_cache;
-
-  while (tokenizer.next(header_valid, header_key, header_value))
-  {
-    if (header_valid)
-    {
-      std::string key(header_key);
-      if (remove_cache.end() == remove_cache.find(key))
-      {
-        remove_cache.insert(key);
-        auto range = output.equal_range(key);
-        if (range.first != range.second)
-        {
-          output.erase(range.first, range.second);
-        }
-      }
-
-      std::string value(header_value);
-      output.emplace(std::make_pair(std::move(key), std::move(value)));
-    }
-  }
-}
-
-static OtlpHeaders GetHeaders(const char *signal_name, const char *generic_name)
-{
-  OtlpHeaders result;
-  DumpOtlpHeaders(result, generic_name);
-  DumpOtlpHeaders(result, signal_name);
-
-  return result;
-}
-
-OtlpHeaders GetOtlpDefaultTracesHeaders()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_HEADERS";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_HEADERS";
-
-  return GetHeaders(kSignalEnv, kGenericEnv);
-}
-
-OtlpHeaders GetOtlpDefaultMetricsHeaders()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_HEADERS";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_HEADERS";
-
-  return GetHeaders(kSignalEnv, kGenericEnv);
-}
-
-OtlpHeaders GetOtlpDefaultLogsHeaders()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_HEADERS";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_HEADERS";
-
-  return GetHeaders(kSignalEnv, kGenericEnv);
-}
-
-std::string GetOtlpDefaultTracesCompression()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_TRACES_COMPRESSION";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_COMPRESSION";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{"none"};
-}
-
-std::string GetOtlpDefaultMetricsCompression()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_METRICS_COMPRESSION";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_COMPRESSION";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{"none"};
-}
-
-std::string GetOtlpDefaultLogsCompression()
-{
-  constexpr char kSignalEnv[]  = "OTEL_EXPORTER_OTLP_LOGS_COMPRESSION";
-  constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_COMPRESSION";
-
-  std::string value;
-  bool exists;
-
-  exists = GetStringDualEnvVar(kSignalEnv, kGenericEnv, value);
-  if (exists)
-  {
-    return value;
-  }
-
-  return std::string{"none"};
-}
-
-std::uint32_t GetOtlpDefaultTracesRetryMaxAttempts()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS";
-  std::uint32_t value{};
-
-  if (GetUintDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return value;
-  }
-
-  return 5U;
-}
-
-std::uint32_t GetOtlpDefaultMetricsRetryMaxAttempts()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS";
-  std::uint32_t value{};
-
-  if (GetUintDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return value;
-  }
-
-  return 5U;
-}
-
-std::uint32_t GetOtlpDefaultLogsRetryMaxAttempts()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS";
-  std::uint32_t value{};
-
-  if (GetUintDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return value;
-  }
-
-  return 5U;
-}
-
-std::chrono::duration<float> GetOtlpDefaultTracesRetryInitialBackoff()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return std::chrono::duration<float>{value};
-  }
-
-  return std::chrono::duration<float>{1.0f};
-}
-
-std::chrono::duration<float> GetOtlpDefaultMetricsRetryInitialBackoff()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return std::chrono::duration<float>{value};
-  }
-
-  return std::chrono::duration<float>{1.0f};
-}
-
-std::chrono::duration<float> GetOtlpDefaultLogsRetryInitialBackoff()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return std::chrono::duration<float>{value};
-  }
-
-  return std::chrono::duration<float>{1.0f};
-}
-
-std::chrono::duration<float> GetOtlpDefaultTracesRetryMaxBackoff()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_BACKOFF";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return std::chrono::duration<float>{value};
-  }
-
-  return std::chrono::duration<float>{5.0f};
-}
-
-std::chrono::duration<float> GetOtlpDefaultMetricsRetryMaxBackoff()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_BACKOFF";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return std::chrono::duration<float>{value};
-  }
-
-  return std::chrono::duration<float>{5.0f};
-}
-
-std::chrono::duration<float> GetOtlpDefaultLogsRetryMaxBackoff()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_BACKOFF";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return std::chrono::duration<float>{value};
-  }
-
-  return std::chrono::duration<float>{5.0f};
-}
-
-float GetOtlpDefaultTracesRetryBackoffMultiplier()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_BACKOFF_MULTIPLIER";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return value;
-  }
-
-  return 1.5f;
-}
-
-float GetOtlpDefaultMetricsRetryBackoffMultiplier()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_BACKOFF_MULTIPLIER";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return value;
-  }
-
-  return 1.5f;
-}
-
-float GetOtlpDefaultLogsRetryBackoffMultiplier()
-{
-  constexpr char kSignalEnv[]  = "OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_BACKOFF_MULTIPLIER";
-  constexpr char kGenericEnv[] = "OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER";
-  float value{};
-
-  if (GetFloatDualEnvVar(kSignalEnv, kGenericEnv, value))
-  {
-    return value;
-  }
-
-  return 1.5f;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_client.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_client.cc
deleted file mode 100644
index dab212871..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_client.cc
+++ /dev/null
@@ -1,1704 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <limits.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <ctime>
-#include <fstream>
-#include <functional>
-#include <mutex>
-#include <nlohmann/json.hpp>
-#include <ratio>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-// IWYU pragma: no_include <features.h>
-
-#if defined(HAVE_GSL)
-#  include <gsl/gsl>
-#else
-#  include <assert.h>
-#endif
-
-#ifdef _MSC_VER
-#  include <string.h>
-#  define strcasecmp _stricmp
-#else
-#  include <strings.h>
-#endif
-
-#if !defined(__CYGWIN__) && defined(_WIN32)
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  ifndef NOMINMAX
-#    define NOMINMAX
-#  endif
-
-#  include <Windows.h>
-#  include <direct.h>
-#  include <io.h>
-
-#  ifdef UNICODE
-#    include <atlconv.h>
-#    define VC_TEXT(x) A2W(x)
-#  else
-#    define VC_TEXT(x) x
-#  endif
-
-#  define FS_ACCESS(x) _access(x, 0)
-#  define SAFE_STRTOK_S(...) strtok_s(__VA_ARGS__)
-#  define FS_MKDIR(path, mode) _mkdir(path)
-
-#else
-
-#  include <fcntl.h>
-#  include <sys/stat.h>
-#  include <sys/types.h>
-#  include <unistd.h>
-
-#  define FS_ACCESS(x) access(x, F_OK)
-#  define SAFE_STRTOK_S(...) strtok_r(__VA_ARGS__)
-#  define FS_MKDIR(path, mode) ::mkdir(path, mode)
-
-#  if defined(__ANDROID__)
-#    define FS_DISABLE_LINK 1
-#  elif defined(__APPLE__)
-#    if __dest_os != __mac_os_x
-#      define FS_DISABLE_LINK 1
-#    endif
-#  endif
-
-#endif
-
-#ifdef GetMessage
-#  undef GetMessage
-#endif
-
-#if (defined(_MSC_VER) && _MSC_VER >= 1600) || \
-    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || defined(__STDC_LIB_EXT1__)
-#  ifdef _MSC_VER
-#    define OTLP_FILE_SNPRINTF(buffer, bufsz, ...) \
-      sprintf_s(buffer, static_cast<size_t>(bufsz), __VA_ARGS__)
-#  else
-#    define OTLP_FILE_SNPRINTF(buffer, bufsz, fmt, args...) \
-      snprintf_s(buffer, static_cast<rsize_t>(bufsz), fmt, ##args)
-#  endif
-#else
-#  define OTLP_FILE_SNPRINTF(buffer, bufsz, fmt, args...) \
-    snprintf(buffer, static_cast<size_t>(bufsz), fmt, ##args)
-#endif
-
-#if (defined(_MSC_VER) && _MSC_VER >= 1600) || \
-    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
-#  define OTLP_FILE_OPEN(f, path, mode) fopen_s(&f, path, mode)
-#else
-#  include <errno.h>
-#  define OTLP_FILE_OPEN(f, path, mode) f = fopen(path, mode)
-#endif
-
-#include "opentelemetry/exporters/otlp/otlp_file_client.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/base64.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/message.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-// Must be included after opentelemetry/version.h,
-// which exports opentelemetry/common/macros.h
-#if OPENTELEMETRY_HAVE_EXCEPTIONS
-#  include <exception>
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace
-{
-static std::tm GetLocalTime()
-{
-  std::time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || defined(__STDC_LIB_EXT1__)
-  std::tm ret;
-  localtime_s(&now, &ret);
-#elif defined(_MSC_VER) && _MSC_VER >= 1300
-  std::tm ret;
-  localtime_s(&ret, &now);
-#elif defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
-    defined(_POSIX_SOURCE)
-  std::tm ret;
-  localtime_r(&now, &ret);
-#else
-  std::tm ret = *localtime(&now);
-#endif
-  return ret;
-}
-
-static std::size_t FormatPath(char *buff,
-                              size_t bufz,
-                              opentelemetry::nostd::string_view fmt,
-                              std::size_t rotate_index)
-{
-  if (nullptr == buff || 0 == bufz)
-  {
-    return 0;
-  }
-
-  if (fmt.empty())
-  {
-    buff[0] = '\0';
-    return 0;
-  }
-
-  bool need_parse = false;
-  bool running    = true;
-  std::size_t ret = 0;
-  std::tm tm_obj_cache;
-  std::tm *tm_obj_ptr = nullptr;
-
-#define LOG_FMT_FN_TM_MEM(VAR, EXPRESS) \
-                                        \
-  int VAR;                              \
-                                        \
-  if (nullptr == tm_obj_ptr)            \
-  {                                     \
-    tm_obj_cache = GetLocalTime();      \
-    tm_obj_ptr   = &tm_obj_cache;       \
-    (VAR)        = tm_obj_ptr->EXPRESS; \
-  }                                     \
-  else                                  \
-  {                                     \
-    (VAR) = tm_obj_ptr->EXPRESS;        \
-  }
-
-  for (size_t i = 0; i < fmt.size() && ret < bufz && running; ++i)
-  {
-    if (!need_parse)
-    {
-      if ('%' == fmt[i])
-      {
-        need_parse = true;
-      }
-      else
-      {
-        buff[ret++] = fmt[i];
-      }
-      continue;
-    }
-
-    need_parse = false;
-    switch (fmt[i])
-    {
-      // =================== datetime ===================
-      case 'Y': {
-        if (bufz - ret < 4)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(year, tm_year + 1900);
-          buff[ret++] = static_cast<char>(year / 1000 + '0');
-          buff[ret++] = static_cast<char>((year / 100) % 10 + '0');
-          buff[ret++] = static_cast<char>((year / 10) % 10 + '0');
-          buff[ret++] = static_cast<char>(year % 10 + '0');
-        }
-        break;
-      }
-      case 'y': {
-        if (bufz - ret < 2)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(year, tm_year + 1900);
-          buff[ret++] = static_cast<char>((year / 10) % 10 + '0');
-          buff[ret++] = static_cast<char>(year % 10 + '0');
-        }
-        break;
-      }
-      case 'm': {
-        if (bufz - ret < 2)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(mon, tm_mon + 1);
-          buff[ret++] = static_cast<char>(mon / 10 + '0');
-          buff[ret++] = static_cast<char>(mon % 10 + '0');
-        }
-        break;
-      }
-      case 'j': {
-        if (bufz - ret < 3)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(yday, tm_yday);
-          buff[ret++] = static_cast<char>(yday / 100 + '0');
-          buff[ret++] = static_cast<char>((yday / 10) % 10 + '0');
-          buff[ret++] = static_cast<char>(yday % 10 + '0');
-        }
-        break;
-      }
-      case 'd': {
-        if (bufz - ret < 2)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(mday, tm_mday);
-          buff[ret++] = static_cast<char>(mday / 10 + '0');
-          buff[ret++] = static_cast<char>(mday % 10 + '0');
-        }
-        break;
-      }
-      case 'w': {
-        LOG_FMT_FN_TM_MEM(wday, tm_wday);
-        buff[ret++] = static_cast<char>(wday + '0');
-        break;
-      }
-      case 'H': {
-        if (bufz - ret < 2)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(hour, tm_hour);
-          buff[ret++] = static_cast<char>(hour / 10 + '0');
-          buff[ret++] = static_cast<char>(hour % 10 + '0');
-        }
-        break;
-      }
-      case 'I': {
-        if (bufz - ret < 2)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(hour, tm_hour % 12 + 1);
-          buff[ret++] = static_cast<char>(hour / 10 + '0');
-          buff[ret++] = static_cast<char>(hour % 10 + '0');
-        }
-        break;
-      }
-      case 'M': {
-        if (bufz - ret < 2)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(minite, tm_min);
-          buff[ret++] = static_cast<char>(minite / 10 + '0');
-          buff[ret++] = static_cast<char>(minite % 10 + '0');
-        }
-        break;
-      }
-      case 'S': {
-        if (bufz - ret < 2)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(sec, tm_sec);
-          buff[ret++] = static_cast<char>(sec / 10 + '0');
-          buff[ret++] = static_cast<char>(sec % 10 + '0');
-        }
-        break;
-      }
-      case 'F': {
-        if (bufz - ret < 10)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(year, tm_year + 1900);
-          LOG_FMT_FN_TM_MEM(mon, tm_mon + 1);
-          LOG_FMT_FN_TM_MEM(mday, tm_mday);
-          buff[ret++] = static_cast<char>(year / 1000 + '0');
-          buff[ret++] = static_cast<char>((year / 100) % 10 + '0');
-          buff[ret++] = static_cast<char>((year / 10) % 10 + '0');
-          buff[ret++] = static_cast<char>(year % 10 + '0');
-          buff[ret++] = '-';
-          buff[ret++] = static_cast<char>(mon / 10 + '0');
-          buff[ret++] = static_cast<char>(mon % 10 + '0');
-          buff[ret++] = '-';
-          buff[ret++] = static_cast<char>(mday / 10 + '0');
-          buff[ret++] = static_cast<char>(mday % 10 + '0');
-        }
-        break;
-      }
-      case 'T': {
-        if (bufz - ret < 8)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(hour, tm_hour);
-          LOG_FMT_FN_TM_MEM(minite, tm_min);
-          LOG_FMT_FN_TM_MEM(sec, tm_sec);
-          buff[ret++] = static_cast<char>(hour / 10 + '0');
-          buff[ret++] = static_cast<char>(hour % 10 + '0');
-          buff[ret++] = ':';
-          buff[ret++] = static_cast<char>(minite / 10 + '0');
-          buff[ret++] = static_cast<char>(minite % 10 + '0');
-          buff[ret++] = ':';
-          buff[ret++] = static_cast<char>(sec / 10 + '0');
-          buff[ret++] = static_cast<char>(sec % 10 + '0');
-        }
-        break;
-      }
-      case 'R': {
-        if (bufz - ret < 5)
-        {
-          running = false;
-        }
-        else
-        {
-          LOG_FMT_FN_TM_MEM(hour, tm_hour);
-          LOG_FMT_FN_TM_MEM(minite, tm_min);
-          buff[ret++] = static_cast<char>(hour / 10 + '0');
-          buff[ret++] = static_cast<char>(hour % 10 + '0');
-          buff[ret++] = ':';
-          buff[ret++] = static_cast<char>(minite / 10 + '0');
-          buff[ret++] = static_cast<char>(minite % 10 + '0');
-        }
-        break;
-      }
-
-      // =================== rotate index ===================
-      case 'n':
-      case 'N': {
-        std::size_t value = fmt[i] == 'n' ? rotate_index + 1 : rotate_index;
-#if (defined(_MSC_VER) && _MSC_VER >= 1600) || \
-    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || defined(__STDC_LIB_EXT1__)
-#  ifdef _MSC_VER
-        auto res =
-            sprintf_s(&buff[ret], bufz - ret, "%llu", static_cast<unsigned long long>(value));
-#  else
-        auto res =
-            snprintf_s(&buff[ret], bufz - ret, "%llu", static_cast<unsigned long long>(value));
-#  endif
-#else
-        auto res = snprintf(&buff[ret], bufz - ret, "%llu", static_cast<unsigned long long>(value));
-#endif
-        if (res < 0)
-        {
-          running = false;
-        }
-        else
-        {
-          ret += static_cast<std::size_t>(res);
-        }
-        break;
-      }
-
-      // =================== unknown ===================
-      default: {
-        buff[ret++] = fmt[i];
-        break;
-      }
-    }
-  }
-
-#undef LOG_FMT_FN_TM_MEM
-
-  if (ret < bufz)
-  {
-    buff[ret] = '\0';
-  }
-  else
-  {
-    buff[bufz - 1] = '\0';
-  }
-  return ret;
-}
-
-class OPENTELEMETRY_LOCAL_SYMBOL FileSystemUtil
-{
-public:
-  // When LongPathsEnabled on Windows, it allow 32767 characters in a absolute path.But it still
-  // only allow 260 characters in a relative path. See
-  // https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
-
-  static constexpr const std::size_t kMaxPathSize =
-#if defined(MAX_PATH)
-      MAX_PATH;
-#elif defined(_MAX_PATH)
-      _MAX_PATH;
-#elif defined(PATH_MAX)
-      PATH_MAX;
-#else
-      260;
-#endif
-
-  static constexpr const char kDirectorySeparator =
-#if !defined(__CYGWIN__) && defined(_WIN32)
-      '\\';
-#else
-      '/';
-#endif
-
-  static std::size_t GetFileSize(const char *file_path)
-  {
-    std::fstream file;
-    file.open(file_path, std::ios::binary | std::ios::in);
-    if (!file.is_open())
-    {
-      return 0;
-    }
-
-    file.seekg(std::ios::end);
-    auto size = file.tellg();
-    file.close();
-
-    if (size > 0)
-    {
-      return static_cast<std::size_t>(size);
-    }
-    else
-    {
-      return 0;
-    }
-  }
-
-  static std::string DirName(opentelemetry::nostd::string_view file_path, int depth = 1)
-  {
-    if (file_path.empty())
-    {
-      return "";
-    }
-
-    std::size_t sz = file_path.size() - 1;
-
-    while (sz > 0 && ('/' == file_path[sz] || '\\' == file_path[sz]))
-    {
-      --sz;
-    }
-
-    while (sz > 0 && depth > 0)
-    {
-      if ('/' == file_path[sz] || '\\' == file_path[sz])
-      {
-        // DirName(a//\b) -> a
-        while (sz > 0 && ('/' == file_path[sz] || '\\' == file_path[sz]))
-        {
-          --sz;
-        }
-
-        --depth;
-        if (depth <= 0)
-        {
-          ++sz;
-          break;
-        }
-      }
-      else
-      {
-        --sz;
-      }
-    }
-
-    return static_cast<std::string>(file_path.substr(0, sz));
-  }
-
-  static bool IsExist(const char *file_path) { return 0 == FS_ACCESS(file_path); }
-
-  static std::vector<std::string> SplitPath(opentelemetry::nostd::string_view path,
-                                            bool normalize = false)
-  {
-    std::vector<std::string> out;
-
-    std::string path_buffer = static_cast<std::string>(path);
-
-    char *saveptr = nullptr;
-    char *token   = SAFE_STRTOK_S(&path_buffer[0], "\\/", &saveptr);
-    while (nullptr != token)
-    {
-      if (0 != strlen(token))
-      {
-        if (normalize)
-        {
-          // Normalize path
-          if (0 == strcmp("..", token))
-          {
-            if (!out.empty() && out.back() != "..")
-            {
-              out.pop_back();
-            }
-            else
-            {
-              out.push_back(token);
-            }
-          }
-          else if (0 != strcmp(".", token))
-          {
-            out.push_back(token);
-          }
-        }
-        else
-        {
-          out.push_back(token);
-        }
-      }
-      token = SAFE_STRTOK_S(nullptr, "\\/", &saveptr);
-    }
-
-    return out;
-  }
-
-  static bool MkDir(const char *dir_path, bool recursion, OPENTELEMETRY_MAYBE_UNUSED int mode)
-  {
-#if !(!defined(__CYGWIN__) && defined(_WIN32))
-    if (0 == mode)
-    {
-      mode = S_IRWXU | S_IRWXG | S_IRWXO;
-    }
-#endif
-    if (!recursion)
-    {
-      return 0 == FS_MKDIR(dir_path, static_cast<mode_t>(mode));
-    }
-
-    std::vector<std::string> path_segs = SplitPath(dir_path, true);
-
-    if (path_segs.empty())
-    {
-      return false;
-    }
-
-    std::string current_path;
-    if (nullptr != dir_path && ('/' == *dir_path || '\\' == *dir_path))
-    {
-      current_path.reserve(strlen(dir_path) + 4);
-      current_path = *dir_path;
-
-      // NFS Supporting
-      char next_char = *(dir_path + 1);
-      if ('/' == next_char || '\\' == next_char)
-      {
-        current_path += next_char;
-      }
-    }
-
-    for (size_t i = 0; i < path_segs.size(); ++i)
-    {
-      current_path += path_segs[i];
-
-      if (false == IsExist(current_path.c_str()))
-      {
-        if (0 != FS_MKDIR(current_path.c_str(), static_cast<mode_t>(mode)))
-        {
-          return false;
-        }
-      }
-
-      current_path += kDirectorySeparator;
-    }
-
-    return true;
-  }
-
-#if !defined(UTIL_FS_DISABLE_LINK)
-  enum class LinkOption : uint8_t
-  {
-    kDefault       = 0x00,  // hard link for default
-    kSymbolicLink  = 0x01,  // or soft link
-    kDirectoryLink = 0x02,  // it's used only for windows
-    kForceRewrite  = 0x04,  // delete the old file if it exists
-  };
-
-  /**
-   * @brief Create link
-   * @param oldpath source path
-   * @param newpath target path
-   * @param options options
-   * @return 0 for success, or error code
-   */
-  static int Link(const char *oldpath,
-                  const char *newpath,
-                  int32_t options = static_cast<int32_t>(LinkOption::kDefault))
-  {
-    if ((options & static_cast<int32_t>(LinkOption::kForceRewrite)) && IsExist(newpath))
-    {
-      remove(newpath);
-    }
-
-#  if !defined(__CYGWIN__) && defined(_WIN32)
-#    if defined(UNICODE)
-    USES_CONVERSION;
-#    endif
-
-    if (options & static_cast<int32_t>(LinkOption::kSymbolicLink))
-    {
-      DWORD dwFlags = 0;
-      if (options & static_cast<int32_t>(LinkOption::kDirectoryLink))
-      {
-        dwFlags |= SYMBOLIC_LINK_FLAG_DIRECTORY;
-#    if defined(SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE)
-        dwFlags |= SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
-#    endif
-      }
-
-      if (CreateSymbolicLink(VC_TEXT(newpath), VC_TEXT(oldpath), dwFlags))
-      {
-        return 0;
-      }
-
-      return static_cast<int>(GetLastError());
-    }
-    else
-    {
-      if (CreateHardLink(VC_TEXT(newpath), VC_TEXT(oldpath), nullptr))
-      {
-        return 0;
-      }
-
-      return static_cast<int>(GetLastError());
-    }
-
-#  else
-    int opts = 0;
-    if (options & static_cast<int32_t>(LinkOption::kSymbolicLink))
-    {
-      opts = AT_SYMLINK_FOLLOW;
-    }
-
-    int res = ::linkat(AT_FDCWD, oldpath, AT_FDCWD, newpath, opts);
-    if (0 == res)
-    {
-      return 0;
-    }
-
-    return errno;
-
-#  endif
-  }
-#endif
-};
-
-static inline char HexEncode(unsigned char byte)
-{
-#if defined(HAVE_GSL)
-  Expects(byte <= 16);
-#else
-  assert(byte <= 16);
-#endif
-  if (byte >= 10)
-  {
-    return byte - 10 + 'a';
-  }
-  else
-  {
-    return byte + '0';
-  }
-}
-
-static std::string HexEncode(const std::string &bytes)
-{
-  std::string ret;
-  ret.reserve(bytes.size() * 2);
-  for (std::string::size_type i = 0; i < bytes.size(); ++i)
-  {
-    unsigned char byte = static_cast<unsigned char>(bytes[i]);
-    ret.push_back(HexEncode(byte >> 4));
-    ret.push_back(HexEncode(byte & 0x0f));
-  }
-  return ret;
-}
-
-static std::string BytesMapping(const std::string &bytes,
-                                const google::protobuf::FieldDescriptor *field_descriptor)
-{
-  if (field_descriptor->lowercase_name() == "trace_id" ||
-      field_descriptor->lowercase_name() == "span_id" ||
-      field_descriptor->lowercase_name() == "parent_span_id")
-  {
-    return HexEncode(bytes);
-  }
-  else
-  {
-    return opentelemetry::sdk::common::Base64Escape(bytes);
-  }
-}
-
-static void ConvertGenericFieldToJson(nlohmann::json &value,
-                                      const google::protobuf::Message &message,
-                                      const google::protobuf::FieldDescriptor *field_descriptor);
-
-static void ConvertListFieldToJson(nlohmann::json &value,
-                                   const google::protobuf::Message &message,
-                                   const google::protobuf::FieldDescriptor *field_descriptor);
-
-// NOLINTBEGIN(misc-no-recursion)
-static void ConvertGenericMessageToJson(nlohmann::json &value,
-                                        const google::protobuf::Message &message)
-{
-  std::vector<const google::protobuf::FieldDescriptor *> fields_with_data;
-  message.GetReflection()->ListFields(message, &fields_with_data);
-  for (std::size_t i = 0; i < fields_with_data.size(); ++i)
-  {
-    const google::protobuf::FieldDescriptor *field_descriptor = fields_with_data[i];
-    nlohmann::json &child_value = value[field_descriptor->camelcase_name()];
-    if (field_descriptor->is_repeated())
-    {
-      ConvertListFieldToJson(child_value, message, field_descriptor);
-    }
-    else
-    {
-      ConvertGenericFieldToJson(child_value, message, field_descriptor);
-    }
-  }
-}
-
-void ConvertGenericFieldToJson(nlohmann::json &value,
-                               const google::protobuf::Message &message,
-                               const google::protobuf::FieldDescriptor *field_descriptor)
-{
-  switch (field_descriptor->cpp_type())
-  {
-    case google::protobuf::FieldDescriptor::CPPTYPE_INT32: {
-      value = message.GetReflection()->GetInt32(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_INT64: {
-      // According to Protobuf specs 64-bit integer numbers in JSON-encoded payloads are encoded as
-      // decimal strings, and either numbers or strings are accepted when decoding.
-      value = std::to_string(message.GetReflection()->GetInt64(message, field_descriptor));
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_UINT32: {
-      value = message.GetReflection()->GetUInt32(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_UINT64: {
-      // According to Protobuf specs 64-bit integer numbers in JSON-encoded payloads are encoded as
-      // decimal strings, and either numbers or strings are accepted when decoding.
-      value = std::to_string(message.GetReflection()->GetUInt64(message, field_descriptor));
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_STRING: {
-      std::string empty;
-      if (field_descriptor->type() == google::protobuf::FieldDescriptor::TYPE_BYTES)
-      {
-        value = BytesMapping(
-            message.GetReflection()->GetStringReference(message, field_descriptor, &empty),
-            field_descriptor);
-      }
-      else
-      {
-        value = message.GetReflection()->GetStringReference(message, field_descriptor, &empty);
-      }
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE: {
-      ConvertGenericMessageToJson(
-          value, message.GetReflection()->GetMessage(message, field_descriptor, nullptr));
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE: {
-      value = message.GetReflection()->GetDouble(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT: {
-      value = message.GetReflection()->GetFloat(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_BOOL: {
-      value = message.GetReflection()->GetBool(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
-      value = message.GetReflection()->GetEnumValue(message, field_descriptor);
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-}
-
-void ConvertListFieldToJson(nlohmann::json &value,
-                            const google::protobuf::Message &message,
-                            const google::protobuf::FieldDescriptor *field_descriptor)
-{
-  auto field_size = message.GetReflection()->FieldSize(message, field_descriptor);
-
-  switch (field_descriptor->cpp_type())
-  {
-    case google::protobuf::FieldDescriptor::CPPTYPE_INT32: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedInt32(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_INT64: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        // According to Protobuf specs 64-bit integer numbers in JSON-encoded payloads are encoded
-        // as decimal strings, and either numbers or strings are accepted when decoding.
-        value.push_back(std::to_string(
-            message.GetReflection()->GetRepeatedInt64(message, field_descriptor, i)));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_UINT32: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedUInt32(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_UINT64: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        // According to Protobuf specs 64-bit integer numbers in JSON-encoded payloads are encoded
-        // as decimal strings, and either numbers or strings are accepted when decoding.
-        value.push_back(std::to_string(
-            message.GetReflection()->GetRepeatedUInt64(message, field_descriptor, i)));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_STRING: {
-      std::string empty;
-      if (field_descriptor->type() == google::protobuf::FieldDescriptor::TYPE_BYTES)
-      {
-        for (int i = 0; i < field_size; ++i)
-        {
-          value.push_back(BytesMapping(message.GetReflection()->GetRepeatedStringReference(
-                                           message, field_descriptor, i, &empty),
-                                       field_descriptor));
-        }
-      }
-      else
-      {
-        for (int i = 0; i < field_size; ++i)
-        {
-          value.push_back(message.GetReflection()->GetRepeatedStringReference(
-              message, field_descriptor, i, &empty));
-        }
-      }
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        nlohmann::json sub_value;
-        ConvertGenericMessageToJson(
-            sub_value, message.GetReflection()->GetRepeatedMessage(message, field_descriptor, i));
-        value.push_back(std::move(sub_value));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedDouble(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedFloat(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_BOOL: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedBool(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(
-            message.GetReflection()->GetRepeatedEnumValue(message, field_descriptor, i));
-      }
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-}
-
-// NOLINTEND(misc-no-recursion) suppressing for performance as if implemented with stack needs
-// Dynamic memory allocation
-}  // namespace
-
-class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileSystemBackend : public OtlpFileAppender
-{
-public:
-  explicit OtlpFileSystemBackend(const OtlpFileClientFileSystemOptions &options,
-                                 const OtlpFileClientRuntimeOptions &runtime_options)
-      : options_(options), runtime_options_(runtime_options), is_initialized_{false}
-  {
-    file_->is_shutdown.store(false);
-    file_->rotate_index            = 0;
-    file_->written_size            = 0;
-    file_->left_flush_record_count = 0;
-    file_->last_checkpoint         = 0;
-    file_->record_count.store(0);
-    file_->flushed_record_count.store(0);
-  }
-
-  ~OtlpFileSystemBackend() override
-  {
-    if (file_)
-    {
-      file_->background_thread_waker_cv.notify_all();
-      std::unique_ptr<std::thread> background_flush_thread;
-      {
-        std::lock_guard<std::mutex> lock_guard{file_->background_thread_lock};
-        file_->background_flush_thread.swap(background_flush_thread);
-      }
-      if (background_flush_thread && background_flush_thread->joinable())
-      {
-        background_flush_thread->join();
-      }
-    }
-  }
-
-  // Written size is not required to be precise, we can just ignore tsan report here.
-  OPENTELEMETRY_SANITIZER_NO_THREAD void MaybeRotateLog(std::size_t data_size)
-  {
-    if (file_->written_size > 0 && file_->written_size + data_size > options_.file_size)
-    {
-      RotateLog();
-    }
-    CheckUpdate();
-  }
-
-  void Export(nostd::string_view data, std::size_t record_count) override
-  {
-    if (!is_initialized_.load(std::memory_order_acquire))
-    {
-      Initialize();
-    }
-
-    MaybeRotateLog(data.size());
-
-    std::shared_ptr<FILE> out = OpenLogFile(true);
-    if (!out)
-    {
-      return;
-    }
-
-    fwrite(data.data(), 1, data.size(), out.get());
-
-    {
-      std::lock_guard<std::mutex> lock_guard{file_->file_lock};
-
-      file_->record_count += record_count;
-
-      // Pipe file size always returns 0, we ignore the size limit of it.
-      auto written_size = ftell(out.get());
-      if (written_size >= 0)
-      {
-        file_->written_size = static_cast<std::size_t>(written_size);
-      }
-
-      if (options_.flush_count > 0)
-      {
-        if (file_->left_flush_record_count <= record_count)
-        {
-          file_->left_flush_record_count = options_.flush_count;
-
-          fflush(out.get());
-
-          file_->flushed_record_count.store(file_->record_count.load(std::memory_order_acquire),
-                                            std::memory_order_release);
-        }
-        else
-        {
-          file_->left_flush_record_count -= record_count;
-        }
-      }
-    }
-
-    // Maybe need spawn a background thread to flush FILE
-    SpawnBackgroundWorkThread();
-  }
-
-  bool ForceFlush(std::chrono::microseconds timeout) noexcept override
-  {
-    std::chrono::microseconds wait_interval = timeout / 256;
-    if (wait_interval <= std::chrono::microseconds{0})
-    {
-      wait_interval = timeout;
-    }
-    // If set timeout to a large value, we limit the check interval to 256ms.
-    // So we will not wait too long to shutdown the client when missing the finish notification.
-    if (wait_interval > std::chrono::microseconds{256000})
-    {
-      wait_interval = std::chrono::microseconds{256000};
-    }
-
-    std::size_t current_wait_for_flush_count = file_->record_count.load(std::memory_order_acquire);
-
-    while (timeout >= std::chrono::microseconds::zero())
-    {
-      // No more data to flush
-      {
-        if (file_->flushed_record_count.load(std::memory_order_acquire) >=
-            current_wait_for_flush_count)
-        {
-          break;
-        }
-      }
-
-      std::chrono::system_clock::time_point begin_time = std::chrono::system_clock::now();
-      // Notify background thread to flush immediately
-      {
-        std::lock_guard<std::mutex> lock_guard{file_->background_thread_lock};
-        if (!file_->background_flush_thread)
-        {
-          break;
-        }
-        file_->background_thread_waker_cv.notify_all();
-      }
-
-      // Wait result
-      {
-        std::unique_lock<std::mutex> lk(file_->background_thread_waiter_lock);
-        file_->background_thread_waiter_cv.wait_for(lk, wait_interval);
-      }
-
-      std::chrono::system_clock::time_point end_time = std::chrono::system_clock::now();
-      if (end_time - begin_time > std::chrono::microseconds{1})
-      {
-        timeout -= std::chrono::duration_cast<std::chrono::microseconds>(end_time - begin_time);
-      }
-      else
-      {
-        timeout -= std::chrono::microseconds{1};
-      }
-    }
-
-    return timeout >= std::chrono::microseconds::zero();
-  }
-
-  bool Shutdown(std::chrono::microseconds timeout) noexcept override
-  {
-    file_->is_shutdown.store(true, std::memory_order_release);
-
-    bool result = ForceFlush(timeout);
-    return result;
-  }
-
-private:
-  void Initialize()
-  {
-    if (is_initialized_.load(std::memory_order_acquire))
-    {
-      return;
-    }
-
-    // Double check
-    std::string file_pattern;
-    {
-      std::lock_guard<std::mutex> lock_guard{file_->file_lock};
-      if (is_initialized_.load(std::memory_order_acquire))
-      {
-        return;
-      }
-      is_initialized_.store(true, std::memory_order_release);
-
-      file_->rotate_index = 0;
-      ResetLogFile();
-
-      char file_path[FileSystemUtil::kMaxPathSize];
-      for (std::size_t i = 0; options_.file_size > 0 && i < options_.rotate_size; ++i)
-      {
-        FormatPath(file_path, sizeof(file_path), options_.file_pattern, i);
-        std::size_t existed_file_size = FileSystemUtil::GetFileSize(file_path);
-
-        // File size is also zero when it's not existed.
-        if (existed_file_size < options_.file_size)
-        {
-          file_->rotate_index = i;
-          break;
-        }
-      }
-
-      file_pattern = options_.file_pattern;
-    }
-
-    // Reset the interval to check
-    static std::time_t check_interval[128] = {0};
-    // Some timezone contains half a hour, we use 1800s for the max check interval.
-    if (check_interval[static_cast<int>('S')] == 0)
-    {
-      check_interval[static_cast<int>('R')] = 60;
-      check_interval[static_cast<int>('T')] = 1;
-      check_interval[static_cast<int>('F')] = 1800;
-      check_interval[static_cast<int>('S')] = 1;
-      check_interval[static_cast<int>('M')] = 60;
-      check_interval[static_cast<int>('I')] = 1800;
-      check_interval[static_cast<int>('H')] = 1800;
-      check_interval[static_cast<int>('w')] = 1800;
-      check_interval[static_cast<int>('d')] = 1800;
-      check_interval[static_cast<int>('j')] = 1800;
-      check_interval[static_cast<int>('m')] = 1800;
-      check_interval[static_cast<int>('y')] = 1800;
-      check_interval[static_cast<int>('Y')] = 1800;
-    }
-
-    {
-      check_file_path_interval_ = 0;
-      for (std::size_t i = 0; i + 1 < file_pattern.size(); ++i)
-      {
-        if (file_pattern[i] == '%')
-        {
-          int checked = static_cast<int>(file_pattern[i + 1]);
-          if (checked > 0 && checked < 128 && check_interval[checked] > 0)
-          {
-            if (0 == check_file_path_interval_ ||
-                check_interval[checked] < check_file_path_interval_)
-            {
-              check_file_path_interval_ = check_interval[checked];
-            }
-          }
-        }
-      }
-    }
-
-    OpenLogFile(false);
-  }
-
-  std::shared_ptr<FILE> OpenLogFile(bool destroy_content)
-  {
-    std::lock_guard<std::mutex> lock_guard{file_->file_lock};
-
-    if (file_->current_file)
-    {
-      return file_->current_file;
-    }
-
-    ResetLogFile();
-
-    char file_path[FileSystemUtil::kMaxPathSize + 1];
-    std::size_t file_path_size = FormatPath(file_path, FileSystemUtil::kMaxPathSize,
-                                            options_.file_pattern, file_->rotate_index);
-    if (file_path_size <= 0)
-    {
-      OTEL_INTERNAL_LOG_ERROR("[OTLP FILE Client] Generate file path from pattern "
-                              << options_.file_pattern << " failed");
-      return nullptr;
-    }
-    file_path[file_path_size] = 0;
-
-    std::shared_ptr<FILE> of = std::make_shared<FILE>();
-
-    std::string directory_name = FileSystemUtil::DirName(file_path);
-    if (!directory_name.empty())
-    {
-      int error_code = 0;
-      if (!FileSystemUtil::IsExist(directory_name.c_str()))
-      {
-        FileSystemUtil::MkDir(directory_name.c_str(), true, 0);
-        error_code = errno;
-      }
-
-      if (!FileSystemUtil::IsExist(directory_name.c_str()))
-      {
-#if !defined(__CYGWIN__) && defined(_WIN32)
-        char error_message[256] = {0};
-        strerror_s(error_message, sizeof(error_message) - 1, error_code);
-#else
-        char error_message[256] = {0};
-        strerror_r(error_code, error_message, sizeof(error_message) - 1);
-#endif
-        OTEL_INTERNAL_LOG_ERROR("[OTLP FILE Client] Create directory \""
-                                << directory_name << "\" failed.errno: " << error_code
-                                << ", message: " << error_message);
-      }
-    }
-
-    if (destroy_content && FileSystemUtil::IsExist(file_path))
-    {
-      FILE *trunc_file = nullptr;
-      OTLP_FILE_OPEN(trunc_file, file_path, "wb");
-      if (nullptr == trunc_file)
-      {
-        OTEL_INTERNAL_LOG_ERROR("[OTLP FILE Client] Open "
-                                << static_cast<const char *>(file_path)
-                                << " failed with pattern: " << options_.file_pattern);
-        return nullptr;
-      }
-      fclose(trunc_file);
-    }
-
-    std::FILE *new_file = nullptr;
-    OTLP_FILE_OPEN(new_file, file_path, "ab");
-    if (nullptr == new_file)
-    {
-      std::string hint;
-      if (!directory_name.empty())
-      {
-        hint = std::string(".The directory \"") + directory_name +
-               "\" may not exist or may not be writable.";
-      }
-      OTEL_INTERNAL_LOG_ERROR("[OTLP FILE Client] Open "
-                              << static_cast<const char *>(file_path)
-                              << " failed with pattern: " << options_.file_pattern << hint);
-      return nullptr;
-    }
-    of = std::shared_ptr<std::FILE>(new_file, fclose);
-
-    fseek(of.get(), 0, SEEK_END);
-    file_->written_size = static_cast<size_t>(ftell(of.get()));
-
-    file_->current_file    = of;
-    file_->last_checkpoint = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-    file_->file_path.assign(file_path, file_path_size);
-
-    // Create hardlink for alias
-#if !defined(FS_DISABLE_LINK)
-    if (!options_.alias_pattern.empty())
-    {
-      char alias_file_path[FileSystemUtil::kMaxPathSize + 1];
-      std::size_t file_path_len = FormatPath(alias_file_path, sizeof(alias_file_path) - 1,
-                                             options_.alias_pattern, file_->rotate_index);
-      if (file_path_len <= 0)
-      {
-        OTEL_INTERNAL_LOG_ERROR("[OTLP FILE Client] Generate alias file path from "
-                                << options_.alias_pattern << " failed");
-        return file_->current_file;
-      }
-
-      if (file_path_len < sizeof(alias_file_path))
-      {
-        alias_file_path[file_path_len] = 0;
-      }
-
-      if (0 == strcasecmp(file_path, alias_file_path))
-      {
-        return file_->current_file;
-      }
-
-      int res =
-          FileSystemUtil::Link(file_->file_path.c_str(), alias_file_path,
-                               static_cast<int32_t>(FileSystemUtil::LinkOption::kForceRewrite));
-      if (res != 0)
-      {
-#  if !defined(__CYGWIN__) && defined(_WIN32)
-        // We can use FormatMessage to get error message.But it may be unicode and may not be
-        // printed correctly. See
-        // https://learn.microsoft.com/en-us/windows/win32/debug/retrieving-the-last-error-code for
-        // more details
-        OTEL_INTERNAL_LOG_ERROR("[OTLP FILE Client] Link " << file_->file_path << " to "
-                                                           << alias_file_path
-                                                           << " failed, errno: " << res);
-#  else
-        OTEL_INTERNAL_LOG_ERROR("[OTLP FILE Client] Link "
-                                << file_->file_path << " to " << alias_file_path
-                                << " failed, errno: " << res << ", message: " << strerror(res));
-#  endif
-        return file_->current_file;
-      }
-    }
-#endif
-
-    return file_->current_file;
-  }
-
-  void RotateLog()
-  {
-    std::lock_guard<std::mutex> lock_guard{file_->file_lock};
-    if (options_.rotate_size > 0)
-    {
-      file_->rotate_index = (file_->rotate_index + 1) % options_.rotate_size;
-    }
-    else
-    {
-      file_->rotate_index = 0;
-    }
-    ResetLogFile();
-  }
-
-  void CheckUpdate()
-  {
-    if (check_file_path_interval_ <= 0)
-    {
-      return;
-    }
-
-    std::time_t current_checkpoint =
-        std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-    if (current_checkpoint / check_file_path_interval_ ==
-        file_->last_checkpoint / check_file_path_interval_)
-    {
-      return;
-    }
-    // Refresh checkpoint
-    file_->last_checkpoint = current_checkpoint;
-
-    char file_path[FileSystemUtil::kMaxPathSize + 1];
-    size_t file_path_len =
-        FormatPath(file_path, sizeof(file_path) - 1, options_.file_pattern, file_->rotate_index);
-    if (file_path_len <= 0)
-    {
-      return;
-    }
-
-    std::string new_file_path;
-    std::string old_file_path;
-    new_file_path.assign(file_path, file_path_len);
-
-    {
-      // Lock for a short time
-      std::lock_guard<std::mutex> lock_guard{file_->file_lock};
-      old_file_path = file_->file_path;
-
-      if (new_file_path == old_file_path)
-      {
-        // Refresh checking time
-        return;
-      }
-    }
-
-    std::string new_dir = FileSystemUtil::DirName(new_file_path);
-    std::string old_dir = FileSystemUtil::DirName(old_file_path);
-
-    // Reset rotate index when directory changes
-    if (new_dir != old_dir)
-    {
-      file_->rotate_index = 0;
-    }
-
-    ResetLogFile();
-  }
-
-  void ResetLogFile()
-  {
-    // ResetLogFile is called in lock, do not lock again
-
-    file_->current_file.reset();
-    file_->last_checkpoint = 0;
-    file_->written_size    = 0;
-  }
-
-  void SpawnBackgroundWorkThread()
-  {
-    if (options_.flush_interval <= std::chrono::microseconds{0})
-    {
-      return;
-    }
-
-    if (!file_)
-    {
-      return;
-    }
-
-#if OPENTELEMETRY_HAVE_EXCEPTIONS
-    try
-    {
-#endif
-
-      std::lock_guard<std::mutex> lock_guard_caller{file_->background_thread_lock};
-      if (file_->background_flush_thread)
-      {
-        return;
-      }
-
-      std::shared_ptr<FileStats> concurrency_file = file_;
-      std::chrono::microseconds flush_interval    = options_.flush_interval;
-      auto thread_instrumentation                 = runtime_options_.thread_instrumentation;
-      file_->background_flush_thread.reset(new std::thread([concurrency_file, flush_interval,
-                                                            thread_instrumentation]() {
-        std::chrono::system_clock::time_point last_free_job_timepoint =
-            std::chrono::system_clock::now();
-        std::size_t last_record_count = 0;
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-        if (thread_instrumentation != nullptr)
-        {
-          thread_instrumentation->OnStart();
-        }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-        while (true)
-        {
-          std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
-          // Exit flush thread if there is not data to flush more than one minute.
-          if (now - last_free_job_timepoint > std::chrono::minutes{1})
-          {
-            break;
-          }
-
-          if (concurrency_file->is_shutdown.load(std::memory_order_acquire))
-          {
-            break;
-          }
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-          if (thread_instrumentation != nullptr)
-          {
-            thread_instrumentation->BeforeWait();
-          }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-          {
-            std::unique_lock<std::mutex> lk(concurrency_file->background_thread_waker_lock);
-            concurrency_file->background_thread_waker_cv.wait_for(lk, flush_interval);
-          }
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-          if (thread_instrumentation != nullptr)
-          {
-            thread_instrumentation->AfterWait();
-          }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-          {
-            std::size_t current_record_count =
-                concurrency_file->record_count.load(std::memory_order_acquire);
-            std::lock_guard<std::mutex> lock_guard{concurrency_file->file_lock};
-            if (current_record_count != last_record_count)
-            {
-              last_record_count       = current_record_count;
-              last_free_job_timepoint = std::chrono::system_clock::now();
-            }
-
-            if (concurrency_file->current_file)
-            {
-              fflush(concurrency_file->current_file.get());
-            }
-
-            concurrency_file->flushed_record_count.store(current_record_count,
-                                                         std::memory_order_release);
-          }
-
-          concurrency_file->background_thread_waiter_cv.notify_all();
-        }
-
-        // Detach running thread because it will exit soon
-        std::unique_ptr<std::thread> background_flush_thread;
-        {
-          std::lock_guard<std::mutex> lock_guard_inner{concurrency_file->background_thread_lock};
-          background_flush_thread.swap(concurrency_file->background_flush_thread);
-        }
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-        if (thread_instrumentation != nullptr)
-        {
-          thread_instrumentation->OnEnd();
-        }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-        if (background_flush_thread && background_flush_thread->joinable())
-        {
-          background_flush_thread->detach();
-        }
-      }));
-#if OPENTELEMETRY_HAVE_EXCEPTIONS
-    }
-    catch (std::exception &e)
-    {
-      OTEL_INTERNAL_LOG_WARN("[OTLP FILE Client] Try to spawn background but got a exception: "
-                             << e.what() << ".Data writing may experience some delays.");
-    }
-    catch (...)
-    {
-      OTEL_INTERNAL_LOG_WARN(
-          "[OTLP FILE Client] Try to spawn background but got a unknown exception.Data writing may "
-          "experience some delays.");
-    }
-#endif
-  }
-
-private:
-  OtlpFileClientFileSystemOptions options_;
-  OtlpFileClientRuntimeOptions runtime_options_;
-
-  struct FileStats
-  {
-    std::atomic<bool> is_shutdown;
-    std::size_t rotate_index;
-    std::size_t written_size;
-    std::size_t left_flush_record_count;
-    std::shared_ptr<FILE> current_file;
-    std::mutex file_lock;
-    std::time_t last_checkpoint;
-    std::string file_path;
-    std::atomic<std::size_t> record_count;
-    std::atomic<std::size_t> flushed_record_count;
-
-    std::unique_ptr<std::thread> background_flush_thread;
-    std::mutex background_thread_lock;
-    std::mutex background_thread_waker_lock;
-    std::condition_variable background_thread_waker_cv;
-    std::mutex background_thread_waiter_lock;
-    std::condition_variable background_thread_waiter_cv;
-  };
-  std::shared_ptr<FileStats> file_ = std::make_shared<FileStats>();
-
-  std::atomic<bool> is_initialized_{false};
-  std::time_t check_file_path_interval_{0};
-};
-
-class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileOstreamBackend : public OtlpFileAppender
-{
-public:
-  explicit OtlpFileOstreamBackend(const std::reference_wrapper<std::ostream> &os) : os_(os) {}
-
-  ~OtlpFileOstreamBackend() override {}
-
-  void Export(nostd::string_view data, std::size_t /*record_count*/) override
-  {
-    os_.get().write(data.data(), data.size());
-  }
-
-  bool ForceFlush(std::chrono::microseconds /*timeout*/) noexcept override
-  {
-    os_.get().flush();
-
-    return true;
-  }
-
-  bool Shutdown(std::chrono::microseconds timeout) noexcept override { return ForceFlush(timeout); }
-
-private:
-  std::reference_wrapper<std::ostream> os_;
-};
-
-OtlpFileClient::OtlpFileClient(OtlpFileClientOptions &&options,
-                               OtlpFileClientRuntimeOptions &&runtime_options)
-    : is_shutdown_(false),
-      options_(std::move(options)),
-      runtime_options_(std::move(runtime_options))
-{
-  if (nostd::holds_alternative<OtlpFileClientFileSystemOptions>(options_.backend_options))
-  {
-    backend_ = opentelemetry::nostd::shared_ptr<OtlpFileAppender>(new OtlpFileSystemBackend(
-        nostd::get<OtlpFileClientFileSystemOptions>(options_.backend_options), runtime_options_));
-  }
-  else if (nostd::holds_alternative<std::reference_wrapper<std::ostream>>(options_.backend_options))
-  {
-    backend_ = opentelemetry::nostd::shared_ptr<OtlpFileAppender>(new OtlpFileOstreamBackend(
-        nostd::get<std::reference_wrapper<std::ostream>>(options_.backend_options)));
-  }
-  else if (nostd::holds_alternative<opentelemetry::nostd::shared_ptr<OtlpFileAppender>>(
-               options_.backend_options))
-  {
-    backend_ =
-        nostd::get<opentelemetry::nostd::shared_ptr<OtlpFileAppender>>(options_.backend_options);
-  }
-}
-
-OtlpFileClient::~OtlpFileClient()
-{
-  if (!IsShutdown())
-  {
-    Shutdown();
-  }
-}
-
-// ----------------------------- File Client methods ------------------------------
-opentelemetry::sdk::common::ExportResult OtlpFileClient::Export(
-    const google::protobuf::Message &message,
-    std::size_t record_count) noexcept
-{
-  if (is_shutdown_)
-  {
-    return ::opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  nlohmann::json json_request;
-  // Convert from proto into json object
-  ConvertGenericMessageToJson(json_request, message);
-
-  std::string post_body_json =
-      json_request.dump(-1, ' ', false, nlohmann::detail::error_handler_t::replace);
-  if (options_.console_debug)
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[OTLP FILE Client] Write body(Json)" << post_body_json);
-  }
-
-  if (backend_)
-  {
-    post_body_json += '\n';
-    backend_->Export(post_body_json, record_count);
-    return ::opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  return ::opentelemetry::sdk::common::ExportResult::kFailure;
-}
-
-bool OtlpFileClient::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  if (backend_)
-  {
-    return backend_->ForceFlush(timeout);
-  }
-
-  return true;
-}
-
-bool OtlpFileClient::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  is_shutdown_ = true;
-
-  if (backend_)
-  {
-    return backend_->Shutdown(timeout);
-  }
-
-  return true;
-}
-
-bool OtlpFileClient::IsShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter.cc
deleted file mode 100644
index 158f152fa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <new>
-#include <ostream>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/arena.h"
-#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpFileExporter::OtlpFileExporter() : OtlpFileExporter(OtlpFileExporterOptions()) {}
-
-OtlpFileExporter::OtlpFileExporter(const OtlpFileExporterOptions &options)
-    : OtlpFileExporter(options, OtlpFileExporterRuntimeOptions())
-{}
-
-OtlpFileExporter::OtlpFileExporter(const OtlpFileExporterOptions &options,
-                                   const OtlpFileExporterRuntimeOptions &runtime_options)
-    : options_(options),
-      runtime_options_(runtime_options),
-      file_client_(new OtlpFileClient(OtlpFileClientOptions(options),
-                                      OtlpFileExporterRuntimeOptions(runtime_options)))
-{}
-
-// ----------------------------- Exporter methods ------------------------------
-
-std::unique_ptr<opentelemetry::sdk::trace::Recordable> OtlpFileExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<opentelemetry::sdk::trace::Recordable>(
-      new exporter::otlp::OtlpRecordable());
-}
-
-opentelemetry::sdk::common::ExportResult OtlpFileExporter::Export(
-    const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans) noexcept
-{
-  if (file_client_->IsShutdown())
-  {
-    std::size_t span_count = spans.size();
-    OTEL_INTERNAL_LOG_ERROR("[OTLP TRACE FILE Exporter] ERROR: Export "
-                            << span_count << " trace span(s) failed, exporter is shutdown");
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  if (spans.empty())
-  {
-    return opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a lager
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  google::protobuf::Arena arena{arena_options};
-
-  proto::collector::trace::v1::ExportTraceServiceRequest *service_request =
-      google::protobuf::Arena::Create<proto::collector::trace::v1::ExportTraceServiceRequest>(
-          &arena);
-  OtlpRecordableUtils::PopulateRequest(spans, service_request);
-  std::size_t span_count = spans.size();
-  opentelemetry::sdk::common::ExportResult result =
-      file_client_->Export(*service_request, span_count);
-  if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP TRACE FILE Exporter] ERROR: Export "
-                            << span_count << " trace span(s) error: " << static_cast<int>(result));
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[OTLP TRACE FILE Exporter] Export " << span_count
-                                                                 << " trace span(s) success");
-  }
-  return result;
-}
-
-bool OtlpFileExporter::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return file_client_->ForceFlush(timeout);
-}
-
-bool OtlpFileExporter::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return file_client_->Shutdown(timeout);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter_factory.cc
deleted file mode 100644
index 57c327a0c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter_factory.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_runtime_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpFileExporterFactory::Create()
-{
-  OtlpFileExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpFileExporterFactory::Create(
-    const OtlpFileExporterOptions &options)
-{
-  OtlpFileExporterRuntimeOptions runtime_options;
-  return Create(options, runtime_options);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpFileExporterFactory::Create(
-    const OtlpFileExporterOptions &options,
-    const OtlpFileExporterRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter(
-      new OtlpFileExporter(options, runtime_options));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter_options.cc
deleted file mode 100644
index b5e9fa725..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_exporter_options.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-
-#include <chrono>
-#include <string>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpFileExporterOptions::OtlpFileExporterOptions()
-{
-  console_debug = false;
-
-  OtlpFileClientFileSystemOptions fs_options;
-  fs_options.file_pattern   = "trace-%N.jsonl";
-  fs_options.alias_pattern  = "trace-latest.jsonl";
-  fs_options.flush_interval = std::chrono::seconds(30);
-  fs_options.flush_count    = 256;
-  fs_options.file_size      = 1024 * 1024 * 20;
-  fs_options.rotate_size    = 10;
-
-  backend_options = fs_options;
-}
-
-OtlpFileExporterOptions::~OtlpFileExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter.cc
deleted file mode 100644
index 8767a7fd6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <new>
-#include <ostream>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/arena.h"
-#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpFileLogRecordExporter::OtlpFileLogRecordExporter()
-    : OtlpFileLogRecordExporter(OtlpFileLogRecordExporterOptions())
-{}
-
-OtlpFileLogRecordExporter::OtlpFileLogRecordExporter(
-    const OtlpFileLogRecordExporterOptions &options)
-    : OtlpFileLogRecordExporter(options, OtlpFileLogRecordExporterRuntimeOptions())
-{}
-
-OtlpFileLogRecordExporter::OtlpFileLogRecordExporter(
-    const OtlpFileLogRecordExporterOptions &options,
-    const OtlpFileLogRecordExporterRuntimeOptions &runtime_options)
-    : options_(options),
-      runtime_options_(runtime_options),
-      file_client_(new OtlpFileClient(OtlpFileClientOptions(options),
-                                      OtlpFileLogRecordExporterRuntimeOptions(runtime_options)))
-{}
-// ----------------------------- Exporter methods ------------------------------
-
-std::unique_ptr<opentelemetry::sdk::logs::Recordable>
-OtlpFileLogRecordExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<opentelemetry::sdk::logs::Recordable>(new OtlpLogRecordable());
-}
-
-opentelemetry::sdk::common::ExportResult OtlpFileLogRecordExporter::Export(
-    const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs) noexcept
-{
-  if (file_client_->IsShutdown())
-  {
-    std::size_t log_count = logs.size();
-    OTEL_INTERNAL_LOG_ERROR("[OTLP LOG FILE Exporter] ERROR: Export "
-                            << log_count << " log(s) failed, exporter is shutdown");
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  if (logs.empty())
-  {
-    return opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a lager
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  google::protobuf::Arena arena{arena_options};
-
-  proto::collector::logs::v1::ExportLogsServiceRequest *service_request =
-      google::protobuf::Arena::Create<proto::collector::logs::v1::ExportLogsServiceRequest>(&arena);
-  OtlpRecordableUtils::PopulateRequest(logs, service_request);
-  std::size_t log_count = logs.size();
-
-  opentelemetry::sdk::common::ExportResult result =
-      file_client_->Export(*service_request, log_count);
-  if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP LOG FILE Exporter] ERROR: Export "
-                            << log_count << " log(s) error: " << static_cast<int>(result));
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[OTLP LOG FILE Exporter] Export " << log_count << " log(s) success");
-  }
-  return result;
-}
-
-bool OtlpFileLogRecordExporter::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return file_client_->ForceFlush(timeout);
-}
-
-bool OtlpFileLogRecordExporter::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return file_client_->Shutdown(timeout);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter_factory.cc
deleted file mode 100644
index 38aeb3b8e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter_factory.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_runtime_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpFileLogRecordExporterFactory::Create()
-{
-  OtlpFileLogRecordExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpFileLogRecordExporterFactory::Create(const OtlpFileLogRecordExporterOptions &options)
-{
-  OtlpFileLogRecordExporterRuntimeOptions runtime_options;
-  return Create(options, runtime_options);
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpFileLogRecordExporterFactory::Create(
-    const OtlpFileLogRecordExporterOptions &options,
-    const OtlpFileLogRecordExporterRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter(
-      new OtlpFileLogRecordExporter(options, runtime_options));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter_options.cc
deleted file mode 100644
index be794b287..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_log_record_exporter_options.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-
-#include <chrono>
-#include <string>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpFileLogRecordExporterOptions::OtlpFileLogRecordExporterOptions()
-{
-  console_debug = false;
-
-  OtlpFileClientFileSystemOptions fs_options;
-  fs_options.file_pattern   = "logs-%N.jsonl";
-  fs_options.alias_pattern  = "logs-latest.jsonl";
-  fs_options.flush_interval = std::chrono::seconds(30);
-  fs_options.flush_count    = 256;
-  fs_options.file_size      = 1024 * 1024 * 20;
-  fs_options.rotate_size    = 10;
-
-  backend_options = fs_options;
-}
-
-OtlpFileLogRecordExporterOptions::~OtlpFileLogRecordExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter.cc
deleted file mode 100644
index eafc588d4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <new>
-#include <ostream>
-#include <vector>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/arena.h"
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpFileMetricExporter::OtlpFileMetricExporter()
-    : OtlpFileMetricExporter(OtlpFileMetricExporterOptions())
-{}
-
-OtlpFileMetricExporter::OtlpFileMetricExporter(const OtlpFileMetricExporterOptions &options)
-    : OtlpFileMetricExporter(options, OtlpFileMetricExporterRuntimeOptions())
-{}
-
-OtlpFileMetricExporter::OtlpFileMetricExporter(
-    const OtlpFileMetricExporterOptions &options,
-    const OtlpFileMetricExporterRuntimeOptions &runtime_options)
-    : options_(options),
-      runtime_options_(runtime_options),
-      aggregation_temporality_selector_{
-          OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
-      file_client_(new OtlpFileClient(OtlpFileClientOptions(options),
-                                      OtlpFileClientRuntimeOptions(runtime_options)))
-{}
-
-// ----------------------------- Exporter methods ------------------------------
-
-sdk::metrics::AggregationTemporality OtlpFileMetricExporter::GetAggregationTemporality(
-    sdk::metrics::InstrumentType instrument_type) const noexcept
-{
-
-  return aggregation_temporality_selector_(instrument_type);
-}
-
-opentelemetry::sdk::common::ExportResult OtlpFileMetricExporter::Export(
-    const opentelemetry::sdk::metrics::ResourceMetrics &data) noexcept
-{
-  if (file_client_->IsShutdown())
-  {
-    std::size_t metric_count = data.scope_metric_data_.size();
-    OTEL_INTERNAL_LOG_ERROR("[OTLP METRIC FILE Exporter] ERROR: Export "
-                            << metric_count << " metric(s) failed, exporter is shutdown");
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  if (data.scope_metric_data_.empty())
-  {
-    return opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a lager
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  google::protobuf::Arena arena{arena_options};
-
-  proto::collector::metrics::v1::ExportMetricsServiceRequest *service_request =
-      google::protobuf::Arena::Create<proto::collector::metrics::v1::ExportMetricsServiceRequest>(
-          &arena);
-  OtlpMetricUtils::PopulateRequest(data, service_request);
-  std::size_t metric_count = data.scope_metric_data_.size();
-
-  opentelemetry::sdk::common::ExportResult result =
-      file_client_->Export(*service_request, metric_count);
-  if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP METRIC FILE Exporter] ERROR: Export "
-                            << metric_count << " metric(s) error: " << static_cast<int>(result));
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[OTLP METRIC FILE Exporter] Export " << metric_count
-                                                                  << " metric(s) success");
-  }
-  return result;
-}
-
-bool OtlpFileMetricExporter::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return file_client_->ForceFlush(timeout);
-}
-
-bool OtlpFileMetricExporter::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return file_client_->Shutdown(timeout);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter_factory.cc
deleted file mode 100644
index 7b52153e6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter_factory.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_runtime_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpFileMetricExporterFactory::Create()
-{
-  OtlpFileMetricExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpFileMetricExporterFactory::Create(const OtlpFileMetricExporterOptions &options)
-{
-  OtlpFileMetricExporterRuntimeOptions runtime_options;
-  return Create(options, runtime_options);
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpFileMetricExporterFactory::Create(const OtlpFileMetricExporterOptions &options,
-                                      const OtlpFileMetricExporterRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter(
-      new OtlpFileMetricExporter(options, runtime_options));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter_options.cc
deleted file mode 100644
index e1b1f5ca7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_file_metric_exporter_options.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-
-#include <chrono>
-#include <string>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpFileMetricExporterOptions::OtlpFileMetricExporterOptions()
-    : aggregation_temporality(PreferredAggregationTemporality::kCumulative)
-{
-  console_debug = false;
-
-  OtlpFileClientFileSystemOptions fs_options;
-  fs_options.file_pattern   = "metrics-%N.jsonl";
-  fs_options.alias_pattern  = "metrics-latest.jsonl";
-  fs_options.flush_interval = std::chrono::seconds(30);
-  fs_options.flush_count    = 256;
-  fs_options.file_size      = 1024 * 1024 * 20;
-  fs_options.rotate_size    = 10;
-
-  backend_options = fs_options;
-}
-
-OtlpFileMetricExporterOptions::~OtlpFileMetricExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_client.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_client.cc
deleted file mode 100644
index b520d1bd0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_client.cc
+++ /dev/null
@@ -1,774 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-
-#if defined(HAVE_GSL)
-#  include <gsl/gsl>
-#else
-#  include <assert.h>
-#endif
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstdio>
-#include <fstream>
-#include <iterator>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <thread>
-#include <unordered_set>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-#ifdef ENABLE_ASYNC_EXPORT
-
-namespace
-{
-// When building with -fvisibility=default, we hide the symbols and vtable to ensure we always use
-// local version of OtlpGrpcAsyncCallDataBase and OtlpGrpcAsyncCallData. It's used to keep
-// compatibility when executables links multiple versions of otel-cpp.
-class OPENTELEMETRY_LOCAL_SYMBOL OtlpGrpcAsyncCallDataBase
-{
-public:
-  using GrpcAsyncCallback = bool (*)(OtlpGrpcAsyncCallDataBase *);
-
-  std::unique_ptr<google::protobuf::Arena> arena;
-  grpc::Status grpc_status;
-  std::unique_ptr<grpc::ClientContext> grpc_context;
-
-  opentelemetry::sdk::common::ExportResult export_result =
-      opentelemetry::sdk::common::ExportResult::kFailure;
-  GrpcAsyncCallback grpc_async_callback = nullptr;
-
-  OtlpGrpcAsyncCallDataBase() {}
-  virtual ~OtlpGrpcAsyncCallDataBase() {}
-};
-
-// When building with -fvisibility=default, we hide the symbols and vtable to ensure we always use
-// local version of OtlpGrpcAsyncCallDataBase and OtlpGrpcAsyncCallData. It's used to keep
-// compatibility when executables links multiple versions of otel-cpp.
-template <class GrpcRequestType, class GrpcResponseType>
-class OPENTELEMETRY_LOCAL_SYMBOL OtlpGrpcAsyncCallData : public OtlpGrpcAsyncCallDataBase
-{
-public:
-  using RequestType  = GrpcRequestType;
-  using ResponseType = GrpcResponseType;
-
-  RequestType *request   = nullptr;
-  ResponseType *response = nullptr;
-
-  std::function<bool(opentelemetry::sdk::common::ExportResult,
-                     std::unique_ptr<google::protobuf::Arena> &&,
-                     const RequestType &,
-                     ResponseType *)>
-      result_callback;
-
-  OtlpGrpcAsyncCallData() {}
-  virtual ~OtlpGrpcAsyncCallData() {}
-};
-}  // namespace
-#endif
-
-struct OtlpGrpcClientAsyncData
-{
-
-  std::chrono::system_clock::duration export_timeout = std::chrono::seconds{10};
-
-  // The best performance trade-off of gRPC is having numcpu's threads and one completion queue
-  // per thread, but this exporter should not cost a lot resource and we don't want to create
-  // too many threads in the process. So we use one completion queue and shared context.
-  std::shared_ptr<grpc::Channel> channel;
-#ifdef ENABLE_ASYNC_EXPORT
-  std::mutex running_calls_lock;
-  std::unordered_set<std::shared_ptr<OtlpGrpcAsyncCallDataBase>> running_calls;
-  // Running requests, this is used to limit the number of concurrent requests.
-  std::atomic<std::size_t> running_requests{0};
-  // Request counter is used to record ForceFlush.
-  std::atomic<std::size_t> start_request_counter{0};
-  std::atomic<std::size_t> finished_request_counter{0};
-  std::size_t max_concurrent_requests = 64;
-
-  // Condition variable and mutex to control the concurrency count of running requests.
-  std::mutex session_waker_lock;
-  std::condition_variable session_waker;
-#endif
-
-  // Reference count of OtlpGrpcClient
-  std::atomic<int64_t> reference_count{0};
-
-  // Do not use OtlpGrpcClientAsyncData() = default; here, some versions of GCC&Clang have BUGs
-  // and may not initialize the member correctly. See also
-  // https://stackoverflow.com/questions/53408962/try-to-understand-compiler-error-message-default-member-initializer-required-be
-  OtlpGrpcClientAsyncData() {}
-};
-
-namespace
-{
-// ----------------------------- Helper functions ------------------------------
-static std::string GetFileContents(const char *fpath)
-{
-  std::ifstream finstream(fpath);
-  std::string contents;
-  contents.assign((std::istreambuf_iterator<char>(finstream)), std::istreambuf_iterator<char>());
-  finstream.close();
-  return contents;
-}
-
-// If the file path is non-empty, returns the contents of the file. Otherwise returns contents.
-static std::string GetFileContentsOrInMemoryContents(const std::string &file_path,
-                                                     const std::string &contents)
-{
-  if (!file_path.empty())
-  {
-    return GetFileContents(file_path.c_str());
-  }
-  return contents;
-}
-
-#ifdef ENABLE_ASYNC_EXPORT
-template <class StubType, class RequestType, class ResponseType>
-static sdk::common::ExportResult InternalDelegateAsyncExport(
-    const std::shared_ptr<OtlpGrpcClientAsyncData> &async_data,
-    StubType *stub,
-    std::unique_ptr<grpc::ClientContext> &&context,
-    std::unique_ptr<google::protobuf::Arena> &&arena,
-    RequestType &&request,
-    std::function<bool(opentelemetry::sdk::common::ExportResult,
-                       std::unique_ptr<google::protobuf::Arena> &&,
-                       const RequestType &,
-                       ResponseType *)> &&result_callback,
-    int32_t export_data_count,
-    const char *export_data_name) noexcept
-{
-  if (async_data->running_requests.load(std::memory_order_acquire) >=
-      async_data->max_concurrent_requests)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] ERROR: Export "
-                            << export_data_count << " " << export_data_name
-                            << " failed, exporter queue is full");
-    if (result_callback)
-    {
-      result_callback(opentelemetry::sdk::common::ExportResult::kFailureFull, std::move(arena),
-                      request, nullptr);
-    }
-    return opentelemetry::sdk::common::ExportResult::kFailureFull;
-  }
-
-  std::shared_ptr<OtlpGrpcAsyncCallData<RequestType, ResponseType>> call_data =
-      std::make_shared<OtlpGrpcAsyncCallData<RequestType, ResponseType>>();
-  call_data->arena.swap(arena);
-  call_data->result_callback.swap(result_callback);
-
-  call_data->request = google::protobuf::Arena::Create<RequestType>(
-      call_data->arena.get(), std::forward<RequestType>(request));
-  call_data->response = google::protobuf::Arena::Create<ResponseType>(call_data->arena.get());
-
-  if (call_data->request == nullptr || call_data->response == nullptr)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] ERROR: Export "
-                            << export_data_count << " " << export_data_name
-                            << " failed, create gRPC request/response failed");
-
-    if (call_data->result_callback)
-    {
-      call_data->result_callback(
-          opentelemetry::sdk::common::ExportResult::kFailure, std::move(call_data->arena),
-          nullptr == call_data->request ? request : *call_data->request, call_data->response);
-    }
-
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-  call_data->grpc_context.swap(context);
-
-  call_data->grpc_async_callback = [](OtlpGrpcAsyncCallDataBase *base_call_data) {
-    OtlpGrpcAsyncCallData<RequestType, ResponseType> *real_call_data =
-        static_cast<OtlpGrpcAsyncCallData<RequestType, ResponseType> *>(base_call_data);
-    if (real_call_data->result_callback)
-    {
-      return real_call_data->result_callback(real_call_data->export_result,
-                                             std::move(real_call_data->arena),
-                                             *real_call_data->request, real_call_data->response);
-    }
-
-    return true;
-  };
-
-  ++async_data->start_request_counter;
-  ++async_data->running_requests;
-  {
-    std::lock_guard<std::mutex> lock{async_data->running_calls_lock};
-    async_data->running_calls.insert(
-        std::static_pointer_cast<OtlpGrpcAsyncCallDataBase>(call_data));
-  }
-  // Some old toolchains can only use gRPC 1.33 and it's experimental.
-#  if defined(GRPC_CPP_VERSION_MAJOR) && \
-      (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039
-  stub->async()
-#  else
-  stub->experimental_async()
-#  endif
-      ->Export(call_data->grpc_context.get(), call_data->request, call_data->response,
-               [call_data, async_data, export_data_name](::grpc::Status grpc_status) {
-                 {
-                   std::lock_guard<std::mutex> lock{async_data->running_calls_lock};
-                   async_data->running_calls.erase(
-                       std::static_pointer_cast<OtlpGrpcAsyncCallDataBase>(call_data));
-                 }
-
-                 --async_data->running_requests;
-                 ++async_data->finished_request_counter;
-
-                 call_data->grpc_status = grpc_status;
-                 if (call_data->grpc_status.ok())
-                 {
-                   call_data->export_result = opentelemetry::sdk::common::ExportResult::kSuccess;
-                 }
-                 else
-                 {
-                   OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] ERROR: Export "
-                                           << export_data_name << " failed with status_code: \""
-                                           << grpc_status.error_code() << "\" error_message: \""
-                                           << grpc_status.error_message() << "\"");
-                 }
-
-                 if (call_data->grpc_async_callback)
-                 {
-                   call_data->grpc_async_callback(call_data.get());
-                 }
-
-                 // Maybe wake up blocking DelegateAsyncExport() call
-                 async_data->session_waker.notify_all();
-               });
-
-  // Can not cancel when start the request
-  {
-    std::unique_lock<std::mutex> lock{async_data->session_waker_lock};
-    async_data->session_waker.wait_for(lock, async_data->export_timeout, [async_data]() {
-      return async_data->running_requests.load(std::memory_order_acquire) <=
-             async_data->max_concurrent_requests;
-    });
-  }
-
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-}
-#endif
-}  // namespace
-
-OtlpGrpcClientReferenceGuard::OtlpGrpcClientReferenceGuard() noexcept : has_value_{false} {}
-
-OtlpGrpcClientReferenceGuard::~OtlpGrpcClientReferenceGuard() noexcept {}
-
-OtlpGrpcClient::OtlpGrpcClient(const OtlpGrpcClientOptions &options) : is_shutdown_(false)
-{
-  std::shared_ptr<OtlpGrpcClientAsyncData> async_data = MutableAsyncData(options);
-  async_data->channel                                 = MakeChannel(options);
-}
-
-OtlpGrpcClient::~OtlpGrpcClient()
-{
-  std::shared_ptr<OtlpGrpcClientAsyncData> async_data;
-  async_data.swap(async_data_);
-
-#ifdef ENABLE_ASYNC_EXPORT
-  if (async_data)
-  {
-    std::unordered_set<std::shared_ptr<OtlpGrpcAsyncCallDataBase>> running_calls;
-    {
-      std::lock_guard<std::mutex> lock(async_data->running_calls_lock);
-      running_calls = async_data->running_calls;
-    }
-    for (auto &call_data : running_calls)
-    {
-      if (call_data && call_data->grpc_context)
-      {
-        call_data->grpc_context->TryCancel();
-      }
-    }
-  }
-
-  while (async_data && async_data->running_requests.load(std::memory_order_acquire) > 0)
-  {
-    std::unique_lock<std::mutex> lock{async_data->session_waker_lock};
-    async_data->session_waker.wait_for(lock, async_data->export_timeout, [async_data]() {
-      return async_data->running_requests.load(std::memory_order_acquire) == 0;
-    });
-  }
-#endif
-}
-
-std::string OtlpGrpcClient::GetGrpcTarget(const std::string &endpoint)
-{
-  //
-  // Scheme is allowed in OTLP endpoint definition, but is not allowed for creating gRPC
-  // channel. Passing URI with scheme to grpc::CreateChannel could resolve the endpoint to some
-  // unexpected address.
-  //
-  ext::http::common::UrlParser url(endpoint);
-  if (!url.success_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] invalid endpoint: " << endpoint);
-    return "";
-  }
-
-  std::string grpc_target;
-  if (url.scheme_ == "unix")
-  {
-    grpc_target = "unix:" + url.path_;
-  }
-  else
-  {
-    grpc_target = url.host_ + ":" + std::to_string(static_cast<int>(url.port_));
-  }
-  return grpc_target;
-}
-
-std::shared_ptr<grpc::Channel> OtlpGrpcClient::MakeChannel(const OtlpGrpcClientOptions &options)
-{
-
-  if (options.endpoint.empty())
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] empty endpoint");
-
-    return nullptr;
-  }
-
-  std::shared_ptr<grpc::Channel> channel;
-  std::string grpc_target = GetGrpcTarget(options.endpoint);
-
-  if (grpc_target.empty())
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] invalid endpoint: " << options.endpoint);
-    return nullptr;
-  }
-
-  grpc::ChannelArguments grpc_arguments;
-  grpc_arguments.SetUserAgentPrefix(options.user_agent);
-
-  if (options.max_threads > 0)
-  {
-    grpc::ResourceQuota quota;
-    quota.SetMaxThreads(static_cast<int>(options.max_threads));
-    grpc_arguments.SetResourceQuota(quota);
-  }
-
-  if (options.compression == "gzip")
-  {
-    grpc_arguments.SetCompressionAlgorithm(GRPC_COMPRESS_GZIP);
-  }
-
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
-  if (options.retry_policy_max_attempts > 0U &&
-      options.retry_policy_initial_backoff > std::chrono::duration<float>::zero() &&
-      options.retry_policy_max_backoff > std::chrono::duration<float>::zero() &&
-      options.retry_policy_backoff_multiplier > 0.0f)
-  {
-    static const auto kServiceConfigJson = opentelemetry::nostd::string_view{R"(
-    {
-      "methodConfig": [
-        {
-          "name": [{}],
-          "retryPolicy": {
-            "maxAttempts": %0000000000u,
-            "initialBackoff": "%0000000000.1fs",
-            "maxBackoff": "%0000000000.1fs",
-            "backoffMultiplier": %0000000000.1f,
-            "retryableStatusCodes": [
-              "CANCELLED",
-              "DEADLINE_EXCEEDED",
-              "ABORTED",
-              "OUT_OF_RANGE",
-              "DATA_LOSS",
-              "UNAVAILABLE"
-            ]
-          }
-        }
-      ]
-    })"};
-
-    // Allocate string with buffer large enough to hold the formatted json config
-    auto service_config = std::string(kServiceConfigJson.size(), '\0');
-    // Prior to C++17, need to explicitly cast away constness from `data()` buffer
-    std::snprintf(
-        const_cast<decltype(service_config)::value_type *>(service_config.data()),
-        service_config.size(), kServiceConfigJson.data(), options.retry_policy_max_attempts,
-        std::min(std::max(options.retry_policy_initial_backoff.count(), 0.f), 999999999.f),
-        std::min(std::max(options.retry_policy_max_backoff.count(), 0.f), 999999999.f),
-        std::min(std::max(options.retry_policy_backoff_multiplier, 0.f), 999999999.f));
-
-    grpc_arguments.SetServiceConfigJSON(service_config);
-  }
-#endif  // ENABLE_OTLP_RETRY_PREVIEW
-
-  if (options.use_ssl_credentials)
-  {
-    grpc::SslCredentialsOptions ssl_opts;
-    ssl_opts.pem_root_certs = GetFileContentsOrInMemoryContents(
-        options.ssl_credentials_cacert_path, options.ssl_credentials_cacert_as_string);
-#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-    ssl_opts.pem_private_key = GetFileContentsOrInMemoryContents(options.ssl_client_key_path,
-                                                                 options.ssl_client_key_string);
-    ssl_opts.pem_cert_chain  = GetFileContentsOrInMemoryContents(options.ssl_client_cert_path,
-                                                                 options.ssl_client_cert_string);
-
-#endif
-    channel =
-        grpc::CreateCustomChannel(grpc_target, grpc::SslCredentials(ssl_opts), grpc_arguments);
-  }
-  else
-  {
-    channel =
-        grpc::CreateCustomChannel(grpc_target, grpc::InsecureChannelCredentials(), grpc_arguments);
-  }
-
-  return channel;
-}
-
-std::unique_ptr<grpc::ClientContext> OtlpGrpcClient::MakeClientContext(
-    const OtlpGrpcClientOptions &options)
-{
-  std::unique_ptr<grpc::ClientContext> context{new grpc::ClientContext()};
-  if (!context)
-  {
-    return context;
-  }
-
-  if (options.timeout.count() > 0)
-  {
-    context->set_deadline(std::chrono::system_clock::now() + options.timeout);
-  }
-
-  for (auto &header : options.metadata)
-  {
-    context->AddMetadata(header.first,
-                         opentelemetry::ext::http::common::UrlDecoder::Decode(header.second));
-  }
-
-  return context;
-}
-
-std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface>
-OtlpGrpcClient::MakeTraceServiceStub()
-{
-  if (!async_data_ || !async_data_->channel)
-  {
-    return nullptr;
-  }
-  return proto::collector::trace::v1::TraceService::NewStub(async_data_->channel);
-}
-
-std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface>
-OtlpGrpcClient::MakeMetricsServiceStub()
-{
-  if (!async_data_ || !async_data_->channel)
-  {
-    return nullptr;
-  }
-  return proto::collector::metrics::v1::MetricsService::NewStub(async_data_->channel);
-}
-
-std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface>
-OtlpGrpcClient::MakeLogsServiceStub()
-{
-  if (!async_data_ || !async_data_->channel)
-  {
-    return nullptr;
-  }
-  return proto::collector::logs::v1::LogsService::NewStub(async_data_->channel);
-}
-
-grpc::Status OtlpGrpcClient::DelegateExport(
-    proto::collector::trace::v1::TraceService::StubInterface *stub,
-    std::unique_ptr<grpc::ClientContext> &&context,
-    std::unique_ptr<google::protobuf::Arena> && /*arena*/,
-    proto::collector::trace::v1::ExportTraceServiceRequest &&request,
-    proto::collector::trace::v1::ExportTraceServiceResponse *response)
-{
-  return stub->Export(context.get(), request, response);
-}
-
-grpc::Status OtlpGrpcClient::DelegateExport(
-    proto::collector::metrics::v1::MetricsService::StubInterface *stub,
-    std::unique_ptr<grpc::ClientContext> &&context,
-    std::unique_ptr<google::protobuf::Arena> && /*arena*/,
-    proto::collector::metrics::v1::ExportMetricsServiceRequest &&request,
-    proto::collector::metrics::v1::ExportMetricsServiceResponse *response)
-{
-  return stub->Export(context.get(), request, response);
-}
-
-grpc::Status OtlpGrpcClient::DelegateExport(
-    proto::collector::logs::v1::LogsService::StubInterface *stub,
-    std::unique_ptr<grpc::ClientContext> &&context,
-    std::unique_ptr<google::protobuf::Arena> && /*arena*/,
-    proto::collector::logs::v1::ExportLogsServiceRequest &&request,
-    proto::collector::logs::v1::ExportLogsServiceResponse *response)
-{
-  return stub->Export(context.get(), request, response);
-}
-
-void OtlpGrpcClient::AddReference(OtlpGrpcClientReferenceGuard &guard,
-                                  const OtlpGrpcClientOptions &options) noexcept
-{
-  if (false == guard.has_value_.exchange(true, std::memory_order_acq_rel))
-  {
-    MutableAsyncData(options)->reference_count.fetch_add(1, std::memory_order_acq_rel);
-  }
-}
-
-bool OtlpGrpcClient::RemoveReference(OtlpGrpcClientReferenceGuard &guard) noexcept
-{
-  auto async_data = async_data_;
-  if (true == guard.has_value_.exchange(false, std::memory_order_acq_rel))
-  {
-    if (async_data)
-    {
-      int64_t left = async_data->reference_count.fetch_sub(1, std::memory_order_acq_rel);
-      return left <= 1;
-    }
-  }
-
-  if (async_data)
-  {
-    return async_data->reference_count.load(std::memory_order_acquire) <= 0;
-  }
-
-  return true;
-}
-
-#ifdef ENABLE_ASYNC_EXPORT
-
-/**
- * Async export
- * @param options Options used to message to create gRPC context and stub(if necessary)
- * @param arena Protobuf arena to hold lifetime of all messages
- * @param request Request for this RPC
- * @param result_callback callback to call when the exporting is done
- * @return return the status of this operation
- */
-sdk::common::ExportResult OtlpGrpcClient::DelegateAsyncExport(
-    const OtlpGrpcClientOptions &options,
-    proto::collector::trace::v1::TraceService::StubInterface *stub,
-    std::unique_ptr<grpc::ClientContext> &&context,
-    std::unique_ptr<google::protobuf::Arena> &&arena,
-    proto::collector::trace::v1::ExportTraceServiceRequest &&request,
-    std::function<bool(opentelemetry::sdk::common::ExportResult,
-                       std::unique_ptr<google::protobuf::Arena> &&,
-                       const proto::collector::trace::v1::ExportTraceServiceRequest &,
-                       proto::collector::trace::v1::ExportTraceServiceResponse *)>
-        &&result_callback) noexcept
-{
-  auto span_count = request.resource_spans_size();
-  if (is_shutdown_.load(std::memory_order_acquire))
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] ERROR: Export "
-                            << span_count << " trace span(s) failed, exporter is shutdown");
-    if (result_callback)
-    {
-      result_callback(opentelemetry::sdk::common::ExportResult::kFailure, std::move(arena), request,
-                      nullptr);
-    }
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  std::shared_ptr<OtlpGrpcClientAsyncData> async_data = MutableAsyncData(options);
-  return InternalDelegateAsyncExport(async_data, stub, std::move(context), std::move(arena),
-                                     std::move(request), std::move(result_callback), span_count,
-                                     "trace span(s)");
-}
-
-sdk::common::ExportResult OtlpGrpcClient::DelegateAsyncExport(
-    const OtlpGrpcClientOptions &options,
-    proto::collector::metrics::v1::MetricsService::StubInterface *stub,
-    std::unique_ptr<grpc::ClientContext> &&context,
-    std::unique_ptr<google::protobuf::Arena> &&arena,
-    proto::collector::metrics::v1::ExportMetricsServiceRequest &&request,
-    std::function<bool(opentelemetry::sdk::common::ExportResult,
-                       std::unique_ptr<google::protobuf::Arena> &&,
-                       const proto::collector::metrics::v1::ExportMetricsServiceRequest &,
-                       proto::collector::metrics::v1::ExportMetricsServiceResponse *)>
-        &&result_callback) noexcept
-{
-  auto metrics_count = request.resource_metrics_size();
-  if (is_shutdown_.load(std::memory_order_acquire))
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] ERROR: Export "
-                            << metrics_count << " metric(s) failed, exporter is shutdown");
-    if (result_callback)
-    {
-      result_callback(opentelemetry::sdk::common::ExportResult::kFailure, std::move(arena), request,
-                      nullptr);
-    }
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  std::shared_ptr<OtlpGrpcClientAsyncData> async_data = MutableAsyncData(options);
-  return InternalDelegateAsyncExport(async_data, stub, std::move(context), std::move(arena),
-                                     std::move(request), std::move(result_callback), metrics_count,
-                                     "metric(s)");
-}
-
-sdk::common::ExportResult OtlpGrpcClient::DelegateAsyncExport(
-    const OtlpGrpcClientOptions &options,
-    proto::collector::logs::v1::LogsService::StubInterface *stub,
-    std::unique_ptr<grpc::ClientContext> &&context,
-    std::unique_ptr<google::protobuf::Arena> &&arena,
-    proto::collector::logs::v1::ExportLogsServiceRequest &&request,
-    std::function<bool(opentelemetry::sdk::common::ExportResult,
-                       std::unique_ptr<google::protobuf::Arena> &&,
-                       const proto::collector::logs::v1::ExportLogsServiceRequest &,
-                       proto::collector::logs::v1::ExportLogsServiceResponse *)>
-        &&result_callback) noexcept
-{
-  auto logs_count = request.resource_logs_size();
-  if (is_shutdown_.load(std::memory_order_acquire))
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] ERROR: Export "
-                            << logs_count << " log(s) failed, exporter is shutdown");
-    if (result_callback)
-    {
-      result_callback(opentelemetry::sdk::common::ExportResult::kFailure, std::move(arena), request,
-                      nullptr);
-    }
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  std::shared_ptr<OtlpGrpcClientAsyncData> async_data = MutableAsyncData(options);
-  return InternalDelegateAsyncExport(async_data, stub, std::move(context), std::move(arena),
-                                     std::move(request), std::move(result_callback), logs_count,
-                                     "log(s)");
-}
-
-#endif
-
-std::shared_ptr<OtlpGrpcClientAsyncData> OtlpGrpcClient::MutableAsyncData(
-    const OtlpGrpcClientOptions &options)
-{
-  if (!async_data_)
-  {
-    async_data_                 = std::make_shared<OtlpGrpcClientAsyncData>();
-    async_data_->export_timeout = options.timeout;
-#ifdef ENABLE_ASYNC_EXPORT
-    async_data_->max_concurrent_requests = options.max_concurrent_requests;
-#endif
-  }
-
-  return async_data_;
-}
-
-bool OtlpGrpcClient::IsShutdown() const noexcept
-{
-  return is_shutdown_.load(std::memory_order_acquire);
-}
-
-bool OtlpGrpcClient::ForceFlush(
-    OPENTELEMETRY_MAYBE_UNUSED std::chrono::microseconds timeout) noexcept
-{
-  if (!async_data_)
-  {
-    return true;
-  }
-
-#ifdef ENABLE_ASYNC_EXPORT
-  std::size_t request_counter = async_data_->start_request_counter.load(std::memory_order_acquire);
-  if (request_counter <= async_data_->finished_request_counter.load(std::memory_order_acquire))
-  {
-    return true;
-  }
-
-  // ASAN will report chrono: runtime error: signed integer overflow: A + B cannot be represented
-  //   in type 'long int' here. So we reset timeout to meet signed long int limit here.
-  timeout = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-      timeout, std::chrono::microseconds::zero());
-
-  // Wait for all the sessions to finish
-  std::unique_lock<std::mutex> lock(async_data_->session_waker_lock);
-
-  std::chrono::steady_clock::duration timeout_steady =
-      std::chrono::duration_cast<std::chrono::steady_clock::duration>(timeout);
-  if (timeout_steady <= std::chrono::steady_clock::duration::zero())
-  {
-    timeout_steady = std::chrono::steady_clock::duration::max();
-  }
-
-  while (timeout_steady > std::chrono::steady_clock::duration::zero() &&
-         request_counter > async_data_->finished_request_counter.load(std::memory_order_acquire))
-  {
-    // When changes of running_sessions_ and notify_one/notify_all happen between predicate
-    // checking and waiting, we should not wait forever.We should cleanup gc sessions here as soon
-    // as possible to call FinishSession() and cleanup resources.
-    std::chrono::steady_clock::time_point start_timepoint = std::chrono::steady_clock::now();
-    if (std::cv_status::timeout !=
-        async_data_->session_waker.wait_for(lock, async_data_->export_timeout))
-    {
-      break;
-    }
-
-    timeout_steady -= std::chrono::steady_clock::now() - start_timepoint;
-  }
-
-  return timeout_steady > std::chrono::steady_clock::duration::zero();
-#else
-  return true;
-#endif
-}
-
-bool OtlpGrpcClient::Shutdown(OtlpGrpcClientReferenceGuard &guard,
-                              OPENTELEMETRY_MAYBE_UNUSED std::chrono::microseconds timeout) noexcept
-{
-  if (!async_data_)
-  {
-    return true;
-  }
-
-  bool last_reference_removed = RemoveReference(guard);
-  bool force_flush_result;
-  if (last_reference_removed && false == is_shutdown_.exchange(true, std::memory_order_acq_rel))
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[OTLP GRPC Client] DEBUG: OtlpGrpcClient start to shutdown");
-    force_flush_result = ForceFlush(timeout);
-
-#ifdef ENABLE_ASYNC_EXPORT
-    std::unordered_set<std::shared_ptr<OtlpGrpcAsyncCallDataBase>> running_calls;
-    {
-      std::lock_guard<std::mutex> lock(async_data_->running_calls_lock);
-      running_calls = async_data_->running_calls;
-    }
-    if (!running_calls.empty())
-    {
-      OTEL_INTERNAL_LOG_WARN(
-          "[OTLP GRPC Client] WARN: OtlpGrpcClient shutdown timeout, try to cancel "
-          << running_calls.size() << " running calls.");
-    }
-    for (auto &call_data : running_calls)
-    {
-      if (call_data && call_data->grpc_context)
-      {
-        call_data->grpc_context->TryCancel();
-      }
-    }
-#endif
-  }
-  else
-  {
-    force_flush_result = ForceFlush(timeout);
-  }
-
-  return force_flush_result;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_client_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_client_factory.cc
deleted file mode 100644
index 310593a77..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_client_factory.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-#include <memory>
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::shared_ptr<OtlpGrpcClient> OtlpGrpcClientFactory::Create(const OtlpGrpcClientOptions &options)
-{
-  return std::make_shared<OtlpGrpcClient>(options);
-}
-
-std::shared_ptr<OtlpGrpcClientReferenceGuard> OtlpGrpcClientFactory::CreateReferenceGuard()
-{
-  return std::make_shared<OtlpGrpcClientReferenceGuard>();
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter.cc
deleted file mode 100644
index 20cc67276..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter.cc
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <mutex>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-#include "opentelemetry/sdk_config.h"
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_utils.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-// -------------------------------- Constructors --------------------------------
-
-OtlpGrpcExporter::OtlpGrpcExporter() : OtlpGrpcExporter(OtlpGrpcExporterOptions()) {}
-
-OtlpGrpcExporter::OtlpGrpcExporter(const OtlpGrpcExporterOptions &options) : options_(options)
-{
-  client_                 = OtlpGrpcClientFactory::Create(options_);
-  client_reference_guard_ = OtlpGrpcClientFactory::CreateReferenceGuard();
-  client_->AddReference(*client_reference_guard_, options_);
-
-  trace_service_stub_ = client_->MakeTraceServiceStub();
-}
-
-OtlpGrpcExporter::OtlpGrpcExporter(
-    std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> stub)
-    : options_(OtlpGrpcExporterOptions()), trace_service_stub_(std::move(stub))
-{
-  client_                 = OtlpGrpcClientFactory::Create(options_);
-  client_reference_guard_ = OtlpGrpcClientFactory::CreateReferenceGuard();
-  client_->AddReference(*client_reference_guard_, options_);
-}
-
-OtlpGrpcExporter::OtlpGrpcExporter(const OtlpGrpcExporterOptions &options,
-                                   const std::shared_ptr<OtlpGrpcClient> &client)
-    : options_(options),
-      client_(client),
-      client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard())
-{
-  client_->AddReference(*client_reference_guard_, options_);
-
-  trace_service_stub_ = client_->MakeTraceServiceStub();
-}
-
-OtlpGrpcExporter::OtlpGrpcExporter(
-    std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> stub,
-    const std::shared_ptr<OtlpGrpcClient> &client)
-    : options_(OtlpGrpcExporterOptions()),
-      client_(client),
-      client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard()),
-      trace_service_stub_(std::move(stub))
-{
-  client_->AddReference(*client_reference_guard_, options_);
-}
-
-OtlpGrpcExporter::~OtlpGrpcExporter()
-{
-  if (client_)
-  {
-    client_->RemoveReference(*client_reference_guard_);
-  }
-}
-
-// ----------------------------- Exporter methods ------------------------------
-
-std::unique_ptr<sdk::trace::Recordable> OtlpGrpcExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-}
-
-sdk::common::ExportResult OtlpGrpcExporter::Export(
-    const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans) noexcept
-{
-  std::shared_ptr<OtlpGrpcClient> client = client_;
-  if (isShutdown() || !client)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP gRPC] Exporting " << spans.size()
-                                                     << " span(s) failed, exporter is shutdown");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  if (!trace_service_stub_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP gRPC] Exporting "
-                            << spans.size() << " span(s) failed, service stub unavailable");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  if (spans.empty())
-  {
-    return sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a larger
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  std::unique_ptr<google::protobuf::Arena> arena{new google::protobuf::Arena{arena_options}};
-
-  proto::collector::trace::v1::ExportTraceServiceRequest *request =
-      google::protobuf::Arena::Create<proto::collector::trace::v1::ExportTraceServiceRequest>(
-          arena.get());
-  OtlpRecordableUtils::PopulateRequest(spans, request);
-
-  auto context = OtlpGrpcClient::MakeClientContext(options_);
-  proto::collector::trace::v1::ExportTraceServiceResponse *response =
-      google::protobuf::Arena::Create<proto::collector::trace::v1::ExportTraceServiceResponse>(
-          arena.get());
-
-#ifdef ENABLE_ASYNC_EXPORT
-  if (options_.max_concurrent_requests > 1)
-  {
-    return client->DelegateAsyncExport(
-        options_, trace_service_stub_.get(), std::move(context), std::move(arena),
-        std::move(*request),
-        // Capture the trace_service_stub_ to ensure it is not destroyed before the callback is
-        // called.
-        [trace_service_stub = trace_service_stub_](
-            opentelemetry::sdk::common::ExportResult result,
-            std::unique_ptr<google::protobuf::Arena> &&,
-            const proto::collector::trace::v1::ExportTraceServiceRequest &request,
-            proto::collector::trace::v1::ExportTraceServiceResponse *) {
-          if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-          {
-            OTEL_INTERNAL_LOG_ERROR("[OTLP TRACE GRPC Exporter] ERROR: Export "
-                                    << request.resource_spans_size()
-                                    << " trace span(s) error: " << static_cast<int>(result));
-          }
-          else
-          {
-            OTEL_INTERNAL_LOG_DEBUG("[OTLP TRACE GRPC Exporter] Export "
-                                    << request.resource_spans_size() << " trace span(s) success");
-          }
-          return true;
-        });
-  }
-  else
-  {
-#endif
-    const auto resource_spans_size = request->resource_spans_size();
-    grpc::Status status =
-        OtlpGrpcClient::DelegateExport(trace_service_stub_.get(), std::move(context),
-                                       std::move(arena), std::move(*request), response);
-    if (!status.ok())
-    {
-      OTEL_INTERNAL_LOG_ERROR("[OTLP TRACE GRPC Exporter] Export() failed with status_code: \""
-                              << grpc_utils::grpc_status_code_to_string(status.error_code())
-                              << "\" error_message: \"" << status.error_message() << "\"");
-      return sdk::common::ExportResult::kFailure;
-    }
-    else
-    {
-      OTEL_INTERNAL_LOG_DEBUG("[OTLP TRACE GRPC Exporter] Export " << resource_spans_size
-                                                                   << " trace span(s) success");
-    }
-#ifdef ENABLE_ASYNC_EXPORT
-  }
-#endif
-  return sdk::common::ExportResult::kSuccess;
-}
-
-bool OtlpGrpcExporter::ForceFlush(
-    OPENTELEMETRY_MAYBE_UNUSED std::chrono::microseconds timeout) noexcept
-{
-  // Maybe already shutdown, we need to keep thread-safety here.
-  std::shared_ptr<OtlpGrpcClient> client = client_;
-  if (!client)
-  {
-    return true;
-  }
-  return client->ForceFlush(timeout);
-}
-
-bool OtlpGrpcExporter::Shutdown(
-    OPENTELEMETRY_MAYBE_UNUSED std::chrono::microseconds timeout) noexcept
-{
-  is_shutdown_ = true;
-  // Maybe already shutdown, we need to keep thread-safety here.
-  std::shared_ptr<OtlpGrpcClient> client;
-  client.swap(client_);
-  if (!client)
-  {
-    return true;
-  }
-  return client->Shutdown(*client_reference_guard_, timeout);
-}
-
-bool OtlpGrpcExporter::isShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-
-const std::shared_ptr<OtlpGrpcClient> &OtlpGrpcExporter::GetClient() const noexcept
-{
-  return client_;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter_factory.cc
deleted file mode 100644
index 5ed832a3c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter_factory.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Make sure to include GRPC exporter first because otherwise Abseil may create
-// ambiguity with `nostd::variant`. See issue:
-// https://github.com/open-telemetry/opentelemetry-cpp/issues/880
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory::Create()
-{
-  OtlpGrpcExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory::Create(
-    const OtlpGrpcExporterOptions &options)
-{
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter(new OtlpGrpcExporter(options));
-  return exporter;
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory::Create(
-    const OtlpGrpcExporterOptions &options,
-    const std::shared_ptr<OtlpGrpcClient> &client)
-{
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter(
-      new OtlpGrpcExporter(options, client));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter_options.cc
deleted file mode 100644
index 12a493111..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_exporter_options.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
-#include "opentelemetry/version.h"
-
-#include <string>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpGrpcExporterOptions::OtlpGrpcExporterOptions()
-{
-  endpoint                         = GetOtlpDefaultGrpcTracesEndpoint();
-  use_ssl_credentials              = !GetOtlpDefaultGrpcTracesIsInsecure(); /* negation intended. */
-  ssl_credentials_cacert_path      = GetOtlpDefaultTracesSslCertificatePath();
-  ssl_credentials_cacert_as_string = GetOtlpDefaultTracesSslCertificateString();
-
-#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  ssl_client_key_path    = GetOtlpDefaultTracesSslClientKeyPath();
-  ssl_client_key_string  = GetOtlpDefaultTracesSslClientKeyString();
-  ssl_client_cert_path   = GetOtlpDefaultTracesSslClientCertificatePath();
-  ssl_client_cert_string = GetOtlpDefaultTracesSslClientCertificateString();
-#endif
-
-  timeout    = GetOtlpDefaultTracesTimeout();
-  metadata   = GetOtlpDefaultTracesHeaders();
-  user_agent = GetOtlpDefaultUserAgent();
-
-  max_threads = 0;
-
-  compression = GetOtlpDefaultTracesCompression();
-#ifdef ENABLE_ASYNC_EXPORT
-  max_concurrent_requests = 64;
-#endif
-
-  retry_policy_max_attempts       = GetOtlpDefaultTracesRetryMaxAttempts();
-  retry_policy_initial_backoff    = GetOtlpDefaultTracesRetryInitialBackoff();
-  retry_policy_max_backoff        = GetOtlpDefaultTracesRetryMaxBackoff();
-  retry_policy_backoff_multiplier = GetOtlpDefaultTracesRetryBackoffMultiplier();
-}
-
-OtlpGrpcExporterOptions::~OtlpGrpcExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter.cc
deleted file mode 100644
index fe05be7b3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter.cc
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-// clang-format on
-
-#include "opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h"
-#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-// clang-format on
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-// -------------------------------- Constructors --------------------------------
-
-OtlpGrpcLogRecordExporter::OtlpGrpcLogRecordExporter()
-    : OtlpGrpcLogRecordExporter(OtlpGrpcLogRecordExporterOptions())
-{}
-
-OtlpGrpcLogRecordExporter::OtlpGrpcLogRecordExporter(
-    const OtlpGrpcLogRecordExporterOptions &options)
-    : options_(options)
-{
-  client_                 = OtlpGrpcClientFactory::Create(options_);
-  client_reference_guard_ = OtlpGrpcClientFactory::CreateReferenceGuard();
-  client_->AddReference(*client_reference_guard_, options_);
-
-  log_service_stub_ = client_->MakeLogsServiceStub();
-}
-
-OtlpGrpcLogRecordExporter::OtlpGrpcLogRecordExporter(
-    std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> stub)
-    : options_(OtlpGrpcLogRecordExporterOptions()), log_service_stub_(std::move(stub))
-{
-  client_                 = OtlpGrpcClientFactory::Create(options_);
-  client_reference_guard_ = OtlpGrpcClientFactory::CreateReferenceGuard();
-  client_->AddReference(*client_reference_guard_, options_);
-}
-
-OtlpGrpcLogRecordExporter::OtlpGrpcLogRecordExporter(
-    const OtlpGrpcLogRecordExporterOptions &options,
-    const std::shared_ptr<OtlpGrpcClient> &client)
-    : options_(options),
-      client_(client),
-      client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard())
-{
-  client_->AddReference(*client_reference_guard_, options_);
-
-  log_service_stub_ = client_->MakeLogsServiceStub();
-}
-
-OtlpGrpcLogRecordExporter::OtlpGrpcLogRecordExporter(
-    std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> stub,
-    const std::shared_ptr<OtlpGrpcClient> &client)
-    : options_(OtlpGrpcLogRecordExporterOptions()),
-      client_(client),
-      client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard()),
-      log_service_stub_(std::move(stub))
-{
-  client_->AddReference(*client_reference_guard_, options_);
-}
-
-OtlpGrpcLogRecordExporter::~OtlpGrpcLogRecordExporter()
-{
-  if (client_)
-  {
-    client_->RemoveReference(*client_reference_guard_);
-  }
-}
-
-// ----------------------------- Exporter methods ------------------------------
-
-std::unique_ptr<opentelemetry::sdk::logs::Recordable>
-OtlpGrpcLogRecordExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<opentelemetry::sdk::logs::Recordable>(new OtlpLogRecordable());
-}
-
-opentelemetry::sdk::common::ExportResult OtlpGrpcLogRecordExporter::Export(
-    const nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs) noexcept
-{
-  std::shared_ptr<OtlpGrpcClient> client = client_;
-  if (isShutdown() || !client)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP gRPC log] Exporting " << logs.size()
-                                                         << " log(s) failed, exporter is shutdown");
-    return sdk::common::ExportResult::kFailure;
-  }
-  if (!log_service_stub_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP gRPC] Exporting " << logs.size()
-                                                     << " log(s) failed, service stub unavailable");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  if (logs.empty())
-  {
-    return sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a lager
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  std::unique_ptr<google::protobuf::Arena> arena{new google::protobuf::Arena{arena_options}};
-
-  proto::collector::logs::v1::ExportLogsServiceRequest *request =
-      google::protobuf::Arena::Create<proto::collector::logs::v1::ExportLogsServiceRequest>(
-          arena.get());
-  OtlpRecordableUtils::PopulateRequest(logs, request);
-
-  auto context = OtlpGrpcClient::MakeClientContext(options_);
-  proto::collector::logs::v1::ExportLogsServiceResponse *response =
-      google::protobuf::Arena::Create<proto::collector::logs::v1::ExportLogsServiceResponse>(
-          arena.get());
-
-#ifdef ENABLE_ASYNC_EXPORT
-  if (options_.max_concurrent_requests > 1)
-  {
-    return client->DelegateAsyncExport(
-        options_, log_service_stub_.get(), std::move(context), std::move(arena),
-        std::move(*request),
-        // Capture log_service_stub by value to ensure it is not destroyed before the callback is
-        // called.
-        [log_service_stub = log_service_stub_](
-            opentelemetry::sdk::common::ExportResult result,
-            std::unique_ptr<google::protobuf::Arena> &&,
-            const proto::collector::logs::v1::ExportLogsServiceRequest &request,
-            proto::collector::logs::v1::ExportLogsServiceResponse *) {
-          if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-          {
-            OTEL_INTERNAL_LOG_ERROR("[OTLP LOG GRPC Exporter] ERROR: Export "
-                                    << request.resource_logs_size()
-                                    << " log(s) error: " << static_cast<int>(result));
-          }
-          else
-          {
-            OTEL_INTERNAL_LOG_DEBUG("[OTLP LOG GRPC Exporter] Export "
-                                    << request.resource_logs_size() << " log(s) success");
-          }
-          return true;
-        });
-  }
-  else
-  {
-#endif
-    grpc::Status status =
-        OtlpGrpcClient::DelegateExport(log_service_stub_.get(), std::move(context),
-                                       std::move(arena), std::move(*request), response);
-
-    if (!status.ok())
-    {
-      OTEL_INTERNAL_LOG_ERROR(
-          "[OTLP LOG GRPC Exporter] Export() failed: " << status.error_message());
-      return sdk::common::ExportResult::kFailure;
-    }
-#ifdef ENABLE_ASYNC_EXPORT
-  }
-#endif
-  return sdk::common::ExportResult::kSuccess;
-}
-
-bool OtlpGrpcLogRecordExporter::Shutdown(
-    OPENTELEMETRY_MAYBE_UNUSED std::chrono::microseconds timeout) noexcept
-{
-  is_shutdown_ = true;
-  // Maybe already shutdown, we need to keep thread-safety here.
-  std::shared_ptr<OtlpGrpcClient> client;
-  client.swap(client_);
-  if (!client)
-  {
-    return true;
-  }
-  return client->Shutdown(*client_reference_guard_, timeout);
-}
-
-bool OtlpGrpcLogRecordExporter::ForceFlush(
-    OPENTELEMETRY_MAYBE_UNUSED std::chrono::microseconds timeout) noexcept
-{
-  // Maybe already shutdown, we need to keep thread-safety here.
-  std::shared_ptr<OtlpGrpcClient> client = client_;
-  if (!client)
-  {
-    return true;
-  }
-  return client->ForceFlush(timeout);
-}
-
-bool OtlpGrpcLogRecordExporter::isShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-
-const std::shared_ptr<OtlpGrpcClient> &OtlpGrpcLogRecordExporter::GetClient() const noexcept
-{
-  return client_;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter_factory.cc
deleted file mode 100644
index 4b519e37e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter_factory.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// MUST be first (absl)
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpGrpcLogRecordExporterFactory::Create()
-{
-  OtlpGrpcLogRecordExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpGrpcLogRecordExporterFactory::Create(const OtlpGrpcLogRecordExporterOptions &options)
-{
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter(
-      new OtlpGrpcLogRecordExporter(options));
-  return exporter;
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpGrpcLogRecordExporterFactory::Create(const OtlpGrpcLogRecordExporterOptions &options,
-                                         const std::shared_ptr<OtlpGrpcClient> &client)
-{
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter(
-      new OtlpGrpcLogRecordExporter(options, client));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter_options.cc
deleted file mode 100644
index c789114ac..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_log_record_exporter_options.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpGrpcLogRecordExporterOptions::OtlpGrpcLogRecordExporterOptions()
-{
-  endpoint                         = GetOtlpDefaultGrpcLogsEndpoint();
-  use_ssl_credentials              = !GetOtlpDefaultGrpcLogsIsInsecure(); /* negation intended. */
-  ssl_credentials_cacert_path      = GetOtlpDefaultLogsSslCertificatePath();
-  ssl_credentials_cacert_as_string = GetOtlpDefaultLogsSslCertificateString();
-
-#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  ssl_client_key_path    = GetOtlpDefaultLogsSslClientKeyPath();
-  ssl_client_key_string  = GetOtlpDefaultLogsSslClientKeyString();
-  ssl_client_cert_path   = GetOtlpDefaultLogsSslClientCertificatePath();
-  ssl_client_cert_string = GetOtlpDefaultLogsSslClientCertificateString();
-#endif
-
-  timeout    = GetOtlpDefaultLogsTimeout();
-  metadata   = GetOtlpDefaultLogsHeaders();
-  user_agent = GetOtlpDefaultUserAgent();
-
-  max_threads = 0;
-
-  compression = GetOtlpDefaultLogsCompression();
-#ifdef ENABLE_ASYNC_EXPORT
-  max_concurrent_requests = 64;
-#endif
-
-  retry_policy_max_attempts       = GetOtlpDefaultLogsRetryMaxAttempts();
-  retry_policy_initial_backoff    = GetOtlpDefaultLogsRetryInitialBackoff();
-  retry_policy_max_backoff        = GetOtlpDefaultLogsRetryMaxBackoff();
-  retry_policy_backoff_multiplier = GetOtlpDefaultLogsRetryBackoffMultiplier();
-}
-
-OtlpGrpcLogRecordExporterOptions::~OtlpGrpcLogRecordExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter.cc
deleted file mode 100644
index 03d23b96a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter.cc
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <mutex>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
-
-#include "opentelemetry/sdk_config.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-// -------------------------------- Constructors --------------------------------
-
-OtlpGrpcMetricExporter::OtlpGrpcMetricExporter()
-    : OtlpGrpcMetricExporter(OtlpGrpcMetricExporterOptions())
-{}
-
-OtlpGrpcMetricExporter::OtlpGrpcMetricExporter(const OtlpGrpcMetricExporterOptions &options)
-    : options_(options),
-      aggregation_temporality_selector_{
-          OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)}
-{
-  client_                 = OtlpGrpcClientFactory::Create(options_);
-  client_reference_guard_ = OtlpGrpcClientFactory::CreateReferenceGuard();
-  client_->AddReference(*client_reference_guard_, options_);
-
-  metrics_service_stub_ = client_->MakeMetricsServiceStub();
-}
-
-OtlpGrpcMetricExporter::OtlpGrpcMetricExporter(
-    std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface> stub)
-    : options_(OtlpGrpcMetricExporterOptions()),
-      aggregation_temporality_selector_{
-          OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
-      metrics_service_stub_(std::move(stub))
-{
-  client_                 = OtlpGrpcClientFactory::Create(options_);
-  client_reference_guard_ = OtlpGrpcClientFactory::CreateReferenceGuard();
-  client_->AddReference(*client_reference_guard_, options_);
-}
-
-OtlpGrpcMetricExporter::OtlpGrpcMetricExporter(const OtlpGrpcMetricExporterOptions &options,
-                                               const std::shared_ptr<OtlpGrpcClient> &client)
-    : options_(options),
-      client_(client),
-      client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard()),
-      aggregation_temporality_selector_{
-          OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)}
-{
-  client_->AddReference(*client_reference_guard_, options_);
-
-  metrics_service_stub_ = client_->MakeMetricsServiceStub();
-}
-
-OtlpGrpcMetricExporter::OtlpGrpcMetricExporter(
-    std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface> stub,
-    const std::shared_ptr<OtlpGrpcClient> &client)
-    : options_(OtlpGrpcMetricExporterOptions()),
-      client_(client),
-      client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard()),
-      aggregation_temporality_selector_{
-          OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
-      metrics_service_stub_(std::move(stub))
-{
-  client_->AddReference(*client_reference_guard_, options_);
-}
-
-OtlpGrpcMetricExporter::~OtlpGrpcMetricExporter()
-{
-  if (client_)
-  {
-    client_->RemoveReference(*client_reference_guard_);
-  }
-}
-
-// ----------------------------- Exporter methods ------------------------------
-
-sdk::metrics::AggregationTemporality OtlpGrpcMetricExporter::GetAggregationTemporality(
-    sdk::metrics::InstrumentType instrument_type) const noexcept
-{
-  return aggregation_temporality_selector_(instrument_type);
-}
-
-opentelemetry::sdk::common::ExportResult OtlpGrpcMetricExporter::Export(
-    const opentelemetry::sdk::metrics::ResourceMetrics &data) noexcept
-{
-  std::shared_ptr<OtlpGrpcClient> client = client_;
-  if (isShutdown() || !client)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP METRICS gRPC] Exporting "
-                            << data.scope_metric_data_.size()
-                            << " metric(s) failed, exporter is shutdown");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  if (!metrics_service_stub_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP gRPC] Exporting "
-                            << data.scope_metric_data_.size()
-                            << " metric(s) failed, service stub unavailable");
-    return sdk::common::ExportResult::kFailure;
-  }
-
-  if (data.scope_metric_data_.empty())
-  {
-    return sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a lager
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  std::unique_ptr<google::protobuf::Arena> arena{new google::protobuf::Arena{arena_options}};
-
-  proto::collector::metrics::v1::ExportMetricsServiceRequest *request =
-      google::protobuf::Arena::Create<proto::collector::metrics::v1::ExportMetricsServiceRequest>(
-          arena.get());
-  OtlpMetricUtils::PopulateRequest(data, request);
-
-  auto context = OtlpGrpcClient::MakeClientContext(options_);
-  proto::collector::metrics::v1::ExportMetricsServiceResponse *response =
-      google::protobuf::Arena::Create<proto::collector::metrics::v1::ExportMetricsServiceResponse>(
-          arena.get());
-
-#ifdef ENABLE_ASYNC_EXPORT
-  if (options_.max_concurrent_requests > 1)
-  {
-    return client->DelegateAsyncExport(
-        options_, metrics_service_stub_.get(), std::move(context), std::move(arena),
-        std::move(*request),
-        // Capture the metrics_service_stub_ to ensure it is not destroyed before the callback is
-        // called.
-        [metrics_service_stub = metrics_service_stub_](
-            opentelemetry::sdk::common::ExportResult result,
-            std::unique_ptr<google::protobuf::Arena> &&,
-            const proto::collector::metrics::v1::ExportMetricsServiceRequest &request,
-            proto::collector::metrics::v1::ExportMetricsServiceResponse *) {
-          if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-          {
-            OTEL_INTERNAL_LOG_ERROR("[OTLP METRIC GRPC Exporter] ERROR: Export "
-                                    << request.resource_metrics_size()
-                                    << " metric(s) error: " << static_cast<int>(result));
-          }
-          else
-          {
-            OTEL_INTERNAL_LOG_DEBUG("[OTLP METRIC GRPC Exporter] Export "
-                                    << request.resource_metrics_size() << " metric(s) success");
-          }
-          return true;
-        });
-  }
-  else
-  {
-#endif
-    grpc::Status status =
-        OtlpGrpcClient::DelegateExport(metrics_service_stub_.get(), std::move(context),
-                                       std::move(arena), std::move(*request), response);
-
-    if (!status.ok())
-    {
-      OTEL_INTERNAL_LOG_ERROR(
-          "[OTLP METRIC GRPC Exporter] Export() failed: " << status.error_message());
-      return sdk::common::ExportResult::kFailure;
-    }
-#ifdef ENABLE_ASYNC_EXPORT
-  }
-#endif
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-}
-
-bool OtlpGrpcMetricExporter::ForceFlush(
-    OPENTELEMETRY_MAYBE_UNUSED std::chrono::microseconds timeout) noexcept
-{
-  // Maybe already shutdown, we need to keep thread-safety here.
-  std::shared_ptr<OtlpGrpcClient> client = client_;
-  if (!client)
-  {
-    return true;
-  }
-  return client->ForceFlush(timeout);
-}
-
-bool OtlpGrpcMetricExporter::Shutdown(
-    OPENTELEMETRY_MAYBE_UNUSED std::chrono::microseconds timeout) noexcept
-{
-  is_shutdown_ = true;
-  // Maybe already shutdown, we need to keep thread-safety here.
-  std::shared_ptr<OtlpGrpcClient> client;
-  client.swap(client_);
-  if (!client)
-  {
-    return true;
-  }
-  return client->Shutdown(*client_reference_guard_, timeout);
-}
-
-bool OtlpGrpcMetricExporter::isShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-
-const std::shared_ptr<OtlpGrpcClient> &OtlpGrpcMetricExporter::GetClient() const noexcept
-{
-  return client_;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter_factory.cc
deleted file mode 100644
index 244d27572..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter_factory.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// MUST be first (absl)
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpGrpcMetricExporterFactory::Create()
-{
-  OtlpGrpcMetricExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &options)
-{
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter(
-      new OtlpGrpcMetricExporter(options));
-  return exporter;
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &options,
-                                      const std::shared_ptr<OtlpGrpcClient> &client)
-{
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter(
-      new OtlpGrpcMetricExporter(options, client));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter_options.cc
deleted file mode 100644
index 3d9b1963c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_metric_exporter_options.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpGrpcMetricExporterOptions::OtlpGrpcMetricExporterOptions()
-    : aggregation_temporality(PreferredAggregationTemporality::kCumulative)
-{
-  endpoint                    = GetOtlpDefaultGrpcMetricsEndpoint();
-  use_ssl_credentials         = !GetOtlpDefaultGrpcMetricsIsInsecure(); /* negation intended. */
-  ssl_credentials_cacert_path = GetOtlpDefaultMetricsSslCertificatePath();
-  ssl_credentials_cacert_as_string = GetOtlpDefaultMetricsSslCertificateString();
-
-#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  ssl_client_key_path    = GetOtlpDefaultMetricsSslClientKeyPath();
-  ssl_client_key_string  = GetOtlpDefaultMetricsSslClientKeyString();
-  ssl_client_cert_path   = GetOtlpDefaultMetricsSslClientCertificatePath();
-  ssl_client_cert_string = GetOtlpDefaultMetricsSslClientCertificateString();
-#endif
-
-  timeout    = GetOtlpDefaultMetricsTimeout();
-  metadata   = GetOtlpDefaultMetricsHeaders();
-  user_agent = GetOtlpDefaultUserAgent();
-
-  max_threads = 0;
-
-  compression = GetOtlpDefaultMetricsCompression();
-#ifdef ENABLE_ASYNC_EXPORT
-  max_concurrent_requests = 64;
-#endif
-
-  retry_policy_max_attempts       = GetOtlpDefaultMetricsRetryMaxAttempts();
-  retry_policy_initial_backoff    = GetOtlpDefaultMetricsRetryInitialBackoff();
-  retry_policy_max_backoff        = GetOtlpDefaultMetricsRetryMaxBackoff();
-  retry_policy_backoff_multiplier = GetOtlpDefaultMetricsRetryBackoffMultiplier();
-}
-
-OtlpGrpcMetricExporterOptions::~OtlpGrpcMetricExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_utils.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_utils.cc
deleted file mode 100644
index 20bd8bd74..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_grpc_utils.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_utils.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace exporter
-{
-namespace otlp
-{
-namespace grpc_utils
-{
-
-const char *grpc_status_code_to_string(::grpc::StatusCode status_code)
-{
-  switch (status_code)
-  {
-    case ::grpc::StatusCode::OK:
-      return "OK";
-    case ::grpc::StatusCode::CANCELLED:
-      return "CANCELLED";
-    case ::grpc::StatusCode::UNKNOWN:
-      return "UNKNOWN";
-    case ::grpc::StatusCode::INVALID_ARGUMENT:
-      return "INVALID_ARGUMENT";
-    case ::grpc::StatusCode::DEADLINE_EXCEEDED:
-      return "DEADLINE_EXCEEDED";
-    case ::grpc::StatusCode::NOT_FOUND:
-      return "NOT_FOUND";
-    case ::grpc::StatusCode::ALREADY_EXISTS:
-      return "ALREADY_EXISTS";
-    case ::grpc::StatusCode::PERMISSION_DENIED:
-      return "PERMISSION_DENIED";
-    case ::grpc::StatusCode::UNAUTHENTICATED:
-      return "UNAUTHENTICATED";
-    case ::grpc::StatusCode::RESOURCE_EXHAUSTED:
-      return "RESOURCE_EXHAUSTED";
-    case ::grpc::StatusCode::FAILED_PRECONDITION:
-      return "FAILED_PRECONDITION";
-    case ::grpc::StatusCode::ABORTED:
-      return "ABORTED";
-    case ::grpc::StatusCode::OUT_OF_RANGE:
-      return "OUT_OF_RANGE";
-    case ::grpc::StatusCode::UNIMPLEMENTED:
-      return "UNIMPLEMENTED";
-    case ::grpc::StatusCode::INTERNAL:
-      return "INTERNAL";
-    case ::grpc::StatusCode::UNAVAILABLE:
-      return "UNAVAILABLE";
-    case ::grpc::StatusCode::DATA_LOSS:
-      return "DATA_LOSS";
-    default:
-      return "UNKNOWN";
-  }
-}
-
-}  // namespace grpc_utils
-}  // namespace otlp
-}  // namespace exporter
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http.cc
deleted file mode 100644
index 098de41c4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-HttpRequestContentType GetOtlpHttpProtocolFromString(nostd::string_view name) noexcept
-{
-  if (name == "http/json")
-  {
-    return HttpRequestContentType::kJson;
-  }
-  else
-  {
-    return HttpRequestContentType::kBinary;
-  }
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_client.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_client.cc
deleted file mode 100644
index a70d249f5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_client.cc
+++ /dev/null
@@ -1,1057 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstddef>
-#include <functional>
-#include <iostream>
-#include <list>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <ratio>
-#include <sstream>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#if defined(HAVE_GSL)
-#  include <gsl/gsl>
-#else
-#  include <assert.h>
-#endif
-
-#include "nlohmann/json.hpp"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/base64.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-// clang-format on
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/stubs/port.h>
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-#ifdef GetMessage
-#  undef GetMessage
-#endif
-
-namespace http_client = opentelemetry::ext::http::client;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace
-{
-
-/**
- * This class handles the response message from the HTTP request
- */
-class ResponseHandler : public http_client::EventHandler
-{
-public:
-  /**
-   * Creates a response handler, that by default doesn't display to console
-   */
-  ResponseHandler(std::function<bool(opentelemetry::sdk::common::ExportResult)> &&callback,
-                  bool console_debug = false)
-      : result_callback_{std::move(callback)}, console_debug_{console_debug}
-  {}
-
-  std::string BuildResponseLogMessage(http_client::Response &response,
-                                      const std::string &body) noexcept
-  {
-    std::stringstream ss;
-    ss << "Status:" << response.GetStatusCode() << ", Header:";
-    response.ForEachHeader([&ss](opentelemetry::nostd::string_view header_name,
-                                 opentelemetry::nostd::string_view header_value) {
-      ss << "\t" << header_name.data() << ": " << header_value.data() << ",";
-      return true;
-    });
-    ss << "Body:" << body;
-
-    return ss.str();
-  }
-
-  /**
-   * Automatically called when the response is received, store the body into a string and notify any
-   * threads blocked on this result
-   */
-  void OnResponse(http_client::Response &response) noexcept override
-  {
-    sdk::common::ExportResult result = sdk::common::ExportResult::kSuccess;
-    std::string log_message;
-    // Lock the private members so they can't be read while being modified
-    {
-      std::unique_lock<std::mutex> lk(mutex_);
-
-      // Store the body of the request
-      body_ = std::string(response.GetBody().begin(), response.GetBody().end());
-
-      if (!(response.GetStatusCode() >= 200 && response.GetStatusCode() <= 299))
-      {
-        log_message = BuildResponseLogMessage(response, body_);
-
-        OTEL_INTERNAL_LOG_ERROR("[OTLP HTTP Client] Export failed, " << log_message);
-        result = sdk::common::ExportResult::kFailure;
-      }
-      else if (console_debug_)
-      {
-        if (log_message.empty())
-        {
-          log_message = BuildResponseLogMessage(response, body_);
-        }
-        OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Export success, " << log_message);
-      }
-    }
-
-    {
-      bool expected = false;
-      if (stopping_.compare_exchange_strong(expected, true, std::memory_order_release))
-      {
-        Unbind(result);
-      }
-    }
-  }
-
-  /**
-   * Returns the body of the response
-   */
-  std::string GetResponseBody()
-  {
-    // Lock so that body_ can't be written to while returning it
-    std::unique_lock<std::mutex> lk(mutex_);
-    return body_;
-  }
-
-  // Callback method when an http event occurs
-  void OnEvent(http_client::SessionState state,
-               opentelemetry::nostd::string_view reason) noexcept override
-  {
-    // need to modify stopping_ under lock before calling callback
-    bool need_stop = false;
-    switch (state)
-    {
-      case http_client::SessionState::CreateFailed:
-      case http_client::SessionState::ConnectFailed:
-      case http_client::SessionState::SendFailed:
-      case http_client::SessionState::SSLHandshakeFailed:
-      case http_client::SessionState::TimedOut:
-      case http_client::SessionState::NetworkError:
-      case http_client::SessionState::Cancelled: {
-        need_stop = true;
-      }
-      break;
-
-      default:
-        break;
-    }
-
-    // If any failure event occurs, release the condition variable to unblock main thread
-    switch (state)
-    {
-      case http_client::SessionState::CreateFailed: {
-        std::stringstream error_message;
-        error_message << "[OTLP HTTP Client] Session state: session create failed.";
-        if (!reason.empty())
-        {
-          error_message.write(reason.data(), reason.size());
-        }
-        OTEL_INTERNAL_LOG_ERROR(error_message.str());
-      }
-      break;
-
-      case http_client::SessionState::Created:
-        if (console_debug_)
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Session state: session created");
-        }
-        break;
-
-      case http_client::SessionState::Destroyed:
-        if (console_debug_)
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Session state: session destroyed");
-        }
-        break;
-
-      case http_client::SessionState::Connecting:
-        if (console_debug_)
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Session state: connecting to peer");
-        }
-        break;
-
-      case http_client::SessionState::ConnectFailed: {
-        std::stringstream error_message;
-        error_message << "[OTLP HTTP Client] Session state: connection failed.";
-        if (!reason.empty())
-        {
-          error_message.write(reason.data(), reason.size());
-        }
-        OTEL_INTERNAL_LOG_ERROR(error_message.str());
-      }
-      break;
-
-      case http_client::SessionState::Connected:
-        if (console_debug_)
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Session state: connected");
-        }
-        break;
-
-      case http_client::SessionState::Sending:
-        if (console_debug_)
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Session state: sending request");
-        }
-        break;
-
-      case http_client::SessionState::SendFailed: {
-        std::stringstream error_message;
-        error_message << "[OTLP HTTP Client] Session state: request send failed.";
-        if (!reason.empty())
-        {
-          error_message.write(reason.data(), reason.size());
-        }
-        OTEL_INTERNAL_LOG_ERROR(error_message.str());
-      }
-      break;
-
-      case http_client::SessionState::Response:
-        if (console_debug_)
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Session state: response received");
-        }
-        break;
-
-      case http_client::SessionState::SSLHandshakeFailed: {
-        std::stringstream error_message;
-        error_message << "[OTLP HTTP Client] Session state: SSL handshake failed.";
-        if (!reason.empty())
-        {
-          error_message.write(reason.data(), reason.size());
-        }
-        OTEL_INTERNAL_LOG_ERROR(error_message.str());
-      }
-      break;
-
-      case http_client::SessionState::TimedOut: {
-        std::stringstream error_message;
-        error_message << "[OTLP HTTP Client] Session state: request time out.";
-        if (!reason.empty())
-        {
-          error_message.write(reason.data(), reason.size());
-        }
-        OTEL_INTERNAL_LOG_ERROR(error_message.str());
-      }
-      break;
-
-      case http_client::SessionState::NetworkError: {
-        std::stringstream error_message;
-        error_message << "[OTLP HTTP Client] Session state: network error.";
-        if (!reason.empty())
-        {
-          error_message.write(reason.data(), reason.size());
-        }
-        OTEL_INTERNAL_LOG_ERROR(error_message.str());
-      }
-      break;
-
-      case http_client::SessionState::ReadError:
-        if (console_debug_)
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Session state: error reading response");
-        }
-        break;
-
-      case http_client::SessionState::WriteError:
-        if (console_debug_)
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Session state: error writing request");
-        }
-        break;
-
-      case http_client::SessionState::Cancelled: {
-        std::stringstream error_message;
-        error_message << "[OTLP HTTP Client] Session state: (manually) cancelled.";
-        if (!reason.empty())
-        {
-          error_message.write(reason.data(), reason.size());
-        }
-        OTEL_INTERNAL_LOG_ERROR(error_message.str());
-      }
-      break;
-
-      default:
-        break;
-    }
-
-    if (need_stop)
-    {
-      bool expected = false;
-      if (stopping_.compare_exchange_strong(expected, true, std::memory_order_release))
-      {
-        Unbind(sdk::common::ExportResult::kFailure);
-      }
-    }
-  }
-
-  void Unbind(sdk::common::ExportResult result)
-  {
-    // ReleaseSession may destroy this object, so we need to move owner and session into stack
-    // first.
-    OtlpHttpClient *owner                                    = owner_;
-    const opentelemetry::ext::http::client::Session *session = session_;
-
-    owner_   = nullptr;
-    session_ = nullptr;
-
-    if (nullptr != owner && nullptr != session)
-    {
-      // Release the session at last
-      owner->ReleaseSession(*session);
-
-      if (result_callback_)
-      {
-        result_callback_(result);
-      }
-    }
-  }
-
-  void Bind(OtlpHttpClient *owner,
-            const opentelemetry::ext::http::client::Session &session) noexcept
-  {
-    session_ = &session;
-    owner_   = owner;
-  }
-
-private:
-  // Define a mutex to keep thread safety
-  std::mutex mutex_;
-
-  // Track the owner and the binded session
-  OtlpHttpClient *owner_                                    = nullptr;
-  const opentelemetry::ext::http::client::Session *session_ = nullptr;
-
-  // Whether notify has been called
-  std::atomic<bool> stopping_{false};
-
-  // A string to store the response body
-  std::string body_ = "";
-
-  // Result callback when in async mode
-  std::function<bool(opentelemetry::sdk::common::ExportResult)> result_callback_;
-
-  // Whether to print the results from the callback
-  bool console_debug_ = false;
-};
-
-static inline char HexEncode(unsigned char byte)
-{
-#if defined(HAVE_GSL)
-  Expects(byte <= 16);
-#else
-  assert(byte <= 16);
-#endif
-  if (byte >= 10)
-  {
-    return byte - 10 + 'a';
-  }
-  else
-  {
-    return byte + '0';
-  }
-}
-
-static std::string HexEncode(const std::string &bytes)
-{
-  std::string ret;
-  ret.reserve(bytes.size() * 2);
-  for (std::string::size_type i = 0; i < bytes.size(); ++i)
-  {
-    unsigned char byte = static_cast<unsigned char>(bytes[i]);
-    ret.push_back(HexEncode(byte >> 4));
-    ret.push_back(HexEncode(byte & 0x0f));
-  }
-  return ret;
-}
-
-static std::string BytesMapping(const std::string &bytes,
-                                const google::protobuf::FieldDescriptor *field_descriptor,
-                                JsonBytesMappingKind kind)
-{
-  switch (kind)
-  {
-    case JsonBytesMappingKind::kHexId: {
-      if (field_descriptor->lowercase_name() == "trace_id" ||
-          field_descriptor->lowercase_name() == "span_id" ||
-          field_descriptor->lowercase_name() == "parent_span_id")
-      {
-        return HexEncode(bytes);
-      }
-      else
-      {
-        return opentelemetry::sdk::common::Base64Escape(bytes);
-      }
-    }
-    case JsonBytesMappingKind::kBase64: {
-      // Base64 is the default bytes mapping of protobuf
-      return opentelemetry::sdk::common::Base64Escape(bytes);
-    }
-    case JsonBytesMappingKind::kHex:
-      return HexEncode(bytes);
-    default:
-      return bytes;
-  }
-}
-
-static void ConvertGenericFieldToJson(nlohmann::json &value,
-                                      const google::protobuf::Message &message,
-                                      const google::protobuf::FieldDescriptor *field_descriptor,
-                                      const OtlpHttpClientOptions &options);
-
-static void ConvertListFieldToJson(nlohmann::json &value,
-                                   const google::protobuf::Message &message,
-                                   const google::protobuf::FieldDescriptor *field_descriptor,
-                                   const OtlpHttpClientOptions &options);
-
-// NOLINTBEGIN(misc-no-recursion)
-static void ConvertGenericMessageToJson(nlohmann::json &value,
-                                        const google::protobuf::Message &message,
-                                        const OtlpHttpClientOptions &options)
-{
-  std::vector<const google::protobuf::FieldDescriptor *> fields_with_data;
-  message.GetReflection()->ListFields(message, &fields_with_data);
-  for (std::size_t i = 0; i < fields_with_data.size(); ++i)
-  {
-    const google::protobuf::FieldDescriptor *field_descriptor = fields_with_data[i];
-    nlohmann::json &child_value = options.use_json_name ? value[field_descriptor->json_name()]
-                                                        : value[field_descriptor->camelcase_name()];
-    if (field_descriptor->is_repeated())
-    {
-      ConvertListFieldToJson(child_value, message, field_descriptor, options);
-    }
-    else
-    {
-      ConvertGenericFieldToJson(child_value, message, field_descriptor, options);
-    }
-  }
-}
-
-bool SerializeToHttpBody(http_client::Body &output, const google::protobuf::Message &message)
-{
-  auto body_size = message.ByteSizeLong();
-  if (body_size > 0)
-  {
-    output.resize(body_size);
-    return message.SerializeWithCachedSizesToArray(
-        reinterpret_cast<google::protobuf::uint8 *>(&output[0]));
-  }
-  return true;
-}
-
-void ConvertGenericFieldToJson(nlohmann::json &value,
-                               const google::protobuf::Message &message,
-                               const google::protobuf::FieldDescriptor *field_descriptor,
-                               const OtlpHttpClientOptions &options)
-{
-  switch (field_descriptor->cpp_type())
-  {
-    case google::protobuf::FieldDescriptor::CPPTYPE_INT32: {
-      value = message.GetReflection()->GetInt32(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_INT64: {
-      // According to Protobuf specs 64-bit integer numbers in JSON-encoded payloads are encoded as
-      // decimal strings, and either numbers or strings are accepted when decoding.
-      value = std::to_string(message.GetReflection()->GetInt64(message, field_descriptor));
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_UINT32: {
-      value = message.GetReflection()->GetUInt32(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_UINT64: {
-      // According to Protobuf specs 64-bit integer numbers in JSON-encoded payloads are encoded as
-      // decimal strings, and either numbers or strings are accepted when decoding.
-      value = std::to_string(message.GetReflection()->GetUInt64(message, field_descriptor));
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_STRING: {
-      std::string empty;
-      if (field_descriptor->type() == google::protobuf::FieldDescriptor::TYPE_BYTES)
-      {
-        value = BytesMapping(
-            message.GetReflection()->GetStringReference(message, field_descriptor, &empty),
-            field_descriptor, options.json_bytes_mapping);
-      }
-      else
-      {
-        value = message.GetReflection()->GetStringReference(message, field_descriptor, &empty);
-      }
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE: {
-      ConvertGenericMessageToJson(
-          value, message.GetReflection()->GetMessage(message, field_descriptor, nullptr), options);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE: {
-      value = message.GetReflection()->GetDouble(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT: {
-      value = message.GetReflection()->GetFloat(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_BOOL: {
-      value = message.GetReflection()->GetBool(message, field_descriptor);
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
-      value = message.GetReflection()->GetEnumValue(message, field_descriptor);
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-}
-
-void ConvertListFieldToJson(nlohmann::json &value,
-                            const google::protobuf::Message &message,
-                            const google::protobuf::FieldDescriptor *field_descriptor,
-                            const OtlpHttpClientOptions &options)
-{
-  auto field_size = message.GetReflection()->FieldSize(message, field_descriptor);
-
-  switch (field_descriptor->cpp_type())
-  {
-    case google::protobuf::FieldDescriptor::CPPTYPE_INT32: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedInt32(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_INT64: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        // According to Protobuf specs 64-bit integer numbers in JSON-encoded payloads are encoded
-        // as decimal strings, and either numbers or strings are accepted when decoding.
-        value.push_back(std::to_string(
-            message.GetReflection()->GetRepeatedInt64(message, field_descriptor, i)));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_UINT32: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedUInt32(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_UINT64: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        // According to Protobuf specs 64-bit integer numbers in JSON-encoded payloads are encoded
-        // as decimal strings, and either numbers or strings are accepted when decoding.
-        value.push_back(std::to_string(
-            message.GetReflection()->GetRepeatedUInt64(message, field_descriptor, i)));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_STRING: {
-      std::string empty;
-      if (field_descriptor->type() == google::protobuf::FieldDescriptor::TYPE_BYTES)
-      {
-        for (int i = 0; i < field_size; ++i)
-        {
-          value.push_back(BytesMapping(message.GetReflection()->GetRepeatedStringReference(
-                                           message, field_descriptor, i, &empty),
-                                       field_descriptor, options.json_bytes_mapping));
-        }
-      }
-      else
-      {
-        for (int i = 0; i < field_size; ++i)
-        {
-          value.push_back(message.GetReflection()->GetRepeatedStringReference(
-              message, field_descriptor, i, &empty));
-        }
-      }
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        nlohmann::json sub_value;
-        ConvertGenericMessageToJson(
-            sub_value, message.GetReflection()->GetRepeatedMessage(message, field_descriptor, i),
-            options);
-        value.push_back(std::move(sub_value));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedDouble(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedFloat(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_BOOL: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(message.GetReflection()->GetRepeatedBool(message, field_descriptor, i));
-      }
-
-      break;
-    }
-    case google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
-      for (int i = 0; i < field_size; ++i)
-      {
-        value.push_back(
-            message.GetReflection()->GetRepeatedEnumValue(message, field_descriptor, i));
-      }
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-}
-
-// NOLINTEND(misc-no-recursion) suppressing for performance, if implemented iterative process needs
-// Dynamic memory allocation
-
-}  // namespace
-
-OtlpHttpClient::OtlpHttpClient(OtlpHttpClientOptions &&options)
-    : is_shutdown_(false),
-      options_(options),
-      http_client_(http_client::HttpClientFactory::Create(options.thread_instrumentation)),
-      start_session_counter_(0),
-      finished_session_counter_(0)
-{
-  http_client_->SetMaxSessionsPerConnection(options_.max_requests_per_connection);
-}
-
-OtlpHttpClient::~OtlpHttpClient()
-{
-  if (!IsShutdown())
-  {
-    Shutdown();
-  }
-
-  // Wait for all the sessions to finish
-  std::unique_lock<std::mutex> lock(session_waker_lock_);
-  while (true)
-  {
-    {
-      std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-      if (running_sessions_.empty())
-      {
-        break;
-      }
-    }
-    // When changes of running_sessions_ and notify_one/notify_all happen between predicate
-    // checking and waiting, we should not wait forever. We should cleanup gc sessions here as soon
-    // as possible to call FinishSession() and cleanup resources.
-    if (std::cv_status::timeout == session_waker_.wait_for(lock, options_.timeout))
-    {
-      cleanupGCSessions();
-    }
-  }
-
-  // And then remove all session datas
-  while (cleanupGCSessions())
-    ;
-}
-
-OtlpHttpClient::OtlpHttpClient(OtlpHttpClientOptions &&options,
-                               std::shared_ptr<ext::http::client::HttpClient> http_client)
-    : is_shutdown_(false),
-      options_(std::move(options)),
-      http_client_(std::move(http_client)),
-      start_session_counter_(0),
-      finished_session_counter_(0)
-{
-  http_client_->SetMaxSessionsPerConnection(options_.max_requests_per_connection);
-}
-
-// ----------------------------- HTTP Client methods ------------------------------
-opentelemetry::sdk::common::ExportResult OtlpHttpClient::Export(
-    const google::protobuf::Message &message) noexcept
-{
-  std::shared_ptr<opentelemetry::sdk::common::ExportResult> session_result =
-      std::make_shared<opentelemetry::sdk::common::ExportResult>(
-          opentelemetry::sdk::common::ExportResult::kSuccess);
-  opentelemetry::sdk::common::ExportResult export_result = Export(
-      message,
-      [session_result](opentelemetry::sdk::common::ExportResult result) {
-        *session_result = result;
-        return result == opentelemetry::sdk::common::ExportResult::kSuccess;
-      },
-      0);
-
-  if (opentelemetry::sdk::common::ExportResult::kSuccess != export_result)
-  {
-    return export_result;
-  }
-
-  return *session_result;
-}
-
-sdk::common::ExportResult OtlpHttpClient::Export(
-    const google::protobuf::Message &message,
-    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
-{
-  return Export(message, std::move(result_callback), options_.max_concurrent_requests);
-}
-
-sdk::common::ExportResult OtlpHttpClient::Export(
-    const google::protobuf::Message &message,
-    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback,
-    std::size_t max_running_requests) noexcept
-{
-  auto session = createSession(message, std::move(result_callback));
-  if (opentelemetry::nostd::holds_alternative<sdk::common::ExportResult>(session))
-  {
-    return opentelemetry::nostd::get<sdk::common::ExportResult>(session);
-  }
-
-  addSession(std::move(opentelemetry::nostd::get<HttpSessionData>(session)));
-
-  // Wait for the response to be received
-  if (options_.console_debug)
-  {
-    OTEL_INTERNAL_LOG_DEBUG(
-        "[OTLP HTTP Client] Waiting for response from "
-        << options_.url << " (timeout = "
-        << std::chrono::duration_cast<std::chrono::milliseconds>(options_.timeout).count()
-        << " milliseconds)");
-  }
-
-  // Wait for any session to finish if there are to many sessions
-  std::unique_lock<std::mutex> lock(session_waker_lock_);
-  bool wait_successful =
-      session_waker_.wait_for(lock, options_.timeout, [this, max_running_requests] {
-        std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-        return running_sessions_.size() <= max_running_requests;
-      });
-
-  cleanupGCSessions();
-
-  if (!wait_successful)
-  {
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-}
-
-bool OtlpHttpClient::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  // ASAN will report chrono: runtime error: signed integer overflow: A + B cannot be represented
-  //   in type 'long int' here. So we reset timeout to meet signed long int limit here.
-  timeout = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-      timeout, std::chrono::microseconds::zero());
-
-  // Wait for all the sessions to finish
-  std::unique_lock<std::mutex> lock(session_waker_lock_);
-
-  std::chrono::steady_clock::duration timeout_steady =
-      std::chrono::duration_cast<std::chrono::steady_clock::duration>(timeout);
-  if (timeout_steady <= std::chrono::steady_clock::duration::zero())
-  {
-    timeout_steady = (std::chrono::steady_clock::duration::max)();
-  }
-
-  size_t wait_counter = start_session_counter_.load(std::memory_order_acquire);
-
-  while (timeout_steady > std::chrono::steady_clock::duration::zero())
-  {
-    {
-      std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-      if (running_sessions_.empty())
-      {
-        break;
-      }
-    }
-    // When changes of running_sessions_ and notify_one/notify_all happen between predicate
-    // checking and waiting, we should not wait forever.We should cleanup gc sessions here as soon
-    // as possible to call FinishSession() and cleanup resources.
-    std::chrono::steady_clock::time_point start_timepoint = std::chrono::steady_clock::now();
-    if (std::cv_status::timeout == session_waker_.wait_for(lock, options_.timeout))
-    {
-      cleanupGCSessions();
-    }
-    else if (finished_session_counter_.load(std::memory_order_acquire) >= wait_counter)
-    {
-      break;
-    }
-
-    timeout_steady -= std::chrono::steady_clock::now() - start_timepoint;
-  }
-
-  return timeout_steady > std::chrono::steady_clock::duration::zero();
-}
-
-bool OtlpHttpClient::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  is_shutdown_.store(true, std::memory_order_release);
-
-  bool force_flush_result = ForceFlush(timeout);
-
-  {
-    std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-
-    // Shutdown the session manager
-    http_client_->CancelAllSessions();
-    http_client_->FinishAllSessions();
-  }
-
-  // Wait util all sessions are canceled.
-  while (cleanupGCSessions())
-  {
-    ForceFlush(std::chrono::milliseconds{1});
-  }
-  return force_flush_result;
-}
-
-void OtlpHttpClient::ReleaseSession(
-    const opentelemetry::ext::http::client::Session &session) noexcept
-{
-  bool has_session = false;
-
-  std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-
-  auto session_iter = running_sessions_.find(&session);
-  if (session_iter != running_sessions_.end())
-  {
-    // Move session and handle into gc list, and they will be destroyed later
-    gc_sessions_.emplace_back(std::move(session_iter->second));
-    running_sessions_.erase(session_iter);
-
-    finished_session_counter_.fetch_add(1, std::memory_order_release);
-    has_session = true;
-  }
-
-  // Call session_waker_.notify_all() with session_manager_lock_ locked to keep session_waker_
-  // available when destroying OtlpHttpClient
-  if (has_session)
-  {
-    session_waker_.notify_all();
-  }
-}
-
-opentelemetry::nostd::variant<opentelemetry::sdk::common::ExportResult,
-                              OtlpHttpClient::HttpSessionData>
-OtlpHttpClient::createSession(
-    const google::protobuf::Message &message,
-    std::function<bool(opentelemetry::sdk::common::ExportResult)> &&result_callback) noexcept
-{
-  // Parse uri and store it to cache
-  if (http_uri_.empty())
-  {
-    const auto parse_url = opentelemetry::ext::http::common::UrlParser(options_.url);
-    if (!parse_url.success_)
-    {
-      std::string error_message = "[OTLP HTTP Client] Export failed, invalid url: " + options_.url;
-      if (options_.console_debug)
-      {
-        std::cerr << error_message << '\n';
-      }
-      OTEL_INTERNAL_LOG_ERROR(error_message);
-
-      const auto result = opentelemetry::sdk::common::ExportResult::kFailure;
-      result_callback(result);
-      return result;
-    }
-
-    if (!parse_url.path_.empty() && parse_url.path_[0] == '/')
-    {
-      http_uri_ = parse_url.path_.substr(1);
-    }
-    else
-    {
-      http_uri_ = parse_url.path_;
-    }
-  }
-
-  http_client::Body body_vec;
-  std::string content_type;
-  if (options_.content_type == HttpRequestContentType::kBinary)
-  {
-    if (SerializeToHttpBody(body_vec, message))
-    {
-      if (options_.console_debug)
-      {
-        OTEL_INTERNAL_LOG_DEBUG(
-            "[OTLP HTTP Client] Request body(Binary): " << message.Utf8DebugString());
-      }
-    }
-    else
-    {
-      if (options_.console_debug)
-      {
-        OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Serialize body failed(Binary):"
-                                << message.InitializationErrorString());
-      }
-
-      const auto result = opentelemetry::sdk::common::ExportResult::kFailure;
-      result_callback(result);
-      return result;
-    }
-    content_type = kHttpBinaryContentType;
-  }
-  else
-  {
-    nlohmann::json json_request;
-
-    // Convert from proto into json object
-    ConvertGenericMessageToJson(json_request, message, options_);
-
-    std::string post_body_json =
-        json_request.dump(-1, ' ', false, nlohmann::detail::error_handler_t::replace);
-    if (options_.console_debug)
-    {
-      OTEL_INTERNAL_LOG_DEBUG("[OTLP HTTP Client] Request body(Json)" << post_body_json);
-    }
-    body_vec.assign(post_body_json.begin(), post_body_json.end());
-    content_type = kHttpJsonContentType;
-  }
-
-  // Send the request
-  std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-  // Return failure if this exporter has been shutdown
-  if (IsShutdown())
-  {
-    const char *error_message = "[OTLP HTTP Client] Export failed, exporter is shutdown";
-    if (options_.console_debug)
-    {
-      std::cerr << error_message << '\n';
-    }
-    OTEL_INTERNAL_LOG_ERROR(error_message);
-
-    const auto result = opentelemetry::sdk::common::ExportResult::kFailure;
-    result_callback(result);
-    return result;
-  }
-
-  auto session = http_client_->CreateSession(options_.url);
-  auto request = session->CreateRequest();
-
-  for (auto &header : options_.http_headers)
-  {
-    request->AddHeader(header.first,
-                       opentelemetry::ext::http::common::UrlDecoder::Decode(header.second));
-  }
-  request->SetUri(http_uri_);
-  request->SetSslOptions(options_.ssl_options);
-  request->SetTimeoutMs(std::chrono::duration_cast<std::chrono::milliseconds>(options_.timeout));
-  request->SetMethod(http_client::Method::Post);
-  request->SetBody(body_vec);
-  request->ReplaceHeader("Content-Type", content_type);
-  request->ReplaceHeader("User-Agent", options_.user_agent);
-  request->EnableLogging(options_.console_debug);
-  request->SetRetryPolicy(options_.retry_policy);
-
-  if (options_.compression == "gzip")
-  {
-    request->SetCompression(opentelemetry::ext::http::client::Compression::kGzip);
-  }
-
-  // Returns the created session data
-  return HttpSessionData{
-      std::move(session),
-      std::shared_ptr<opentelemetry::ext::http::client::EventHandler>{
-          new ResponseHandler(std::move(result_callback), options_.console_debug)}};
-}
-
-void OtlpHttpClient::addSession(HttpSessionData &&session_data) noexcept
-{
-  if (!session_data.session || !session_data.event_handle)
-  {
-    return;
-  }
-
-  std::shared_ptr<opentelemetry::ext::http::client::Session> session = session_data.session;
-  std::shared_ptr<opentelemetry::ext::http::client::EventHandler> handle =
-      session_data.event_handle;
-  {
-    std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-    static_cast<ResponseHandler *>(handle.get())->Bind(this, *session);
-
-    HttpSessionData &store_session_data = running_sessions_[session.get()];
-    store_session_data                  = std::move(session_data);
-  }
-
-  start_session_counter_.fetch_add(1, std::memory_order_release);
-  // Send request after the session is added
-  session->SendRequest(handle);
-}
-
-bool OtlpHttpClient::cleanupGCSessions() noexcept
-{
-  std::lock_guard<std::recursive_mutex> guard{session_manager_lock_};
-  std::list<HttpSessionData> gc_sessions;
-  gc_sessions_.swap(gc_sessions);
-
-  for (auto &session_data : gc_sessions)
-  {
-    // FinishSession must be called with same thread and before the session is destroyed
-    if (session_data.session)
-    {
-      session_data.session->FinishSession();
-    }
-  }
-
-  return !gc_sessions_.empty();
-}
-
-bool OtlpHttpClient::IsShutdown() const noexcept
-{
-  return is_shutdown_.load(std::memory_order_acquire);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter.cc
deleted file mode 100644
index 2ebb487af..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <new>
-#include <ostream>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/arena.h"
-#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpHttpExporter::OtlpHttpExporter() : OtlpHttpExporter(OtlpHttpExporterOptions()) {}
-
-OtlpHttpExporter::OtlpHttpExporter(const OtlpHttpExporterOptions &options)
-    : options_(options),
-      runtime_options_(),
-      http_client_(new OtlpHttpClient(OtlpHttpClientOptions(
-          options.url,
-          options.ssl_insecure_skip_verify,
-          options.ssl_ca_cert_path,
-          options.ssl_ca_cert_string,
-          options.ssl_client_key_path,
-          options.ssl_client_key_string,
-          options.ssl_client_cert_path,
-          options.ssl_client_cert_string,
-          options.ssl_min_tls,
-          options.ssl_max_tls,
-          options.ssl_cipher,
-          options.ssl_cipher_suite,
-          options.content_type,
-          options.json_bytes_mapping,
-          options.compression,
-          options.use_json_name,
-          options.console_debug,
-          options.timeout,
-          options.http_headers,
-          options.retry_policy_max_attempts,
-          options.retry_policy_initial_backoff,
-          options.retry_policy_max_backoff,
-          options.retry_policy_backoff_multiplier,
-          std::shared_ptr<sdk::common::ThreadInstrumentation>{nullptr}
-#ifdef ENABLE_ASYNC_EXPORT
-          ,
-          options.max_concurrent_requests,
-          options.max_requests_per_connection
-#endif
-          )))
-{}
-
-OtlpHttpExporter::OtlpHttpExporter(const OtlpHttpExporterOptions &options,
-                                   const OtlpHttpExporterRuntimeOptions &runtime_options)
-    : options_(options),
-      runtime_options_(runtime_options),
-      http_client_(new OtlpHttpClient(OtlpHttpClientOptions(options.url,
-                                                            options.ssl_insecure_skip_verify,
-                                                            options.ssl_ca_cert_path,
-                                                            options.ssl_ca_cert_string,
-                                                            options.ssl_client_key_path,
-                                                            options.ssl_client_key_string,
-                                                            options.ssl_client_cert_path,
-                                                            options.ssl_client_cert_string,
-                                                            options.ssl_min_tls,
-                                                            options.ssl_max_tls,
-                                                            options.ssl_cipher,
-                                                            options.ssl_cipher_suite,
-                                                            options.content_type,
-                                                            options.json_bytes_mapping,
-                                                            options.compression,
-                                                            options.use_json_name,
-                                                            options.console_debug,
-                                                            options.timeout,
-                                                            options.http_headers,
-                                                            options.retry_policy_max_attempts,
-                                                            options.retry_policy_initial_backoff,
-                                                            options.retry_policy_max_backoff,
-                                                            options.retry_policy_backoff_multiplier,
-                                                            runtime_options.thread_instrumentation
-#ifdef ENABLE_ASYNC_EXPORT
-                                                            ,
-                                                            options.max_concurrent_requests,
-                                                            options.max_requests_per_connection
-#endif
-                                                            )))
-{}
-
-OtlpHttpExporter::OtlpHttpExporter(std::unique_ptr<OtlpHttpClient> http_client)
-    : options_(OtlpHttpExporterOptions()), http_client_(std::move(http_client))
-{
-  options_.url                          = http_client_->GetOptions().url;
-  options_.content_type                 = http_client_->GetOptions().content_type;
-  options_.json_bytes_mapping           = http_client_->GetOptions().json_bytes_mapping;
-  options_.use_json_name                = http_client_->GetOptions().use_json_name;
-  options_.console_debug                = http_client_->GetOptions().console_debug;
-  options_.timeout                      = http_client_->GetOptions().timeout;
-  options_.http_headers                 = http_client_->GetOptions().http_headers;
-  options_.retry_policy_max_attempts    = http_client_->GetOptions().retry_policy.max_attempts;
-  options_.retry_policy_initial_backoff = http_client_->GetOptions().retry_policy.initial_backoff;
-  options_.retry_policy_max_backoff     = http_client_->GetOptions().retry_policy.max_backoff;
-  options_.retry_policy_backoff_multiplier =
-      http_client_->GetOptions().retry_policy.backoff_multiplier;
-#ifdef ENABLE_ASYNC_EXPORT
-  options_.max_concurrent_requests     = http_client_->GetOptions().max_concurrent_requests;
-  options_.max_requests_per_connection = http_client_->GetOptions().max_requests_per_connection;
-#endif
-  runtime_options_.thread_instrumentation = http_client_->GetOptions().thread_instrumentation;
-}
-// ----------------------------- Exporter methods ------------------------------
-
-std::unique_ptr<opentelemetry::sdk::trace::Recordable> OtlpHttpExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<opentelemetry::sdk::trace::Recordable>(
-      new exporter::otlp::OtlpRecordable());
-}
-
-opentelemetry::sdk::common::ExportResult OtlpHttpExporter::Export(
-    const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>>
-        &spans) noexcept
-{
-  if (http_client_->IsShutdown())
-  {
-    std::size_t span_count = spans.size();
-    OTEL_INTERNAL_LOG_ERROR("[OTLP TRACE HTTP Exporter] ERROR: Export "
-                            << span_count << " trace span(s) failed, exporter is shutdown");
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  if (spans.empty())
-  {
-    return opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a lager
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  google::protobuf::Arena arena{arena_options};
-
-  proto::collector::trace::v1::ExportTraceServiceRequest *service_request =
-      google::protobuf::Arena::Create<proto::collector::trace::v1::ExportTraceServiceRequest>(
-          &arena);
-  OtlpRecordableUtils::PopulateRequest(spans, service_request);
-  std::size_t span_count = spans.size();
-#ifdef ENABLE_ASYNC_EXPORT
-  http_client_->Export(
-      *service_request, [span_count](opentelemetry::sdk::common::ExportResult result) {
-        if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-        {
-          OTEL_INTERNAL_LOG_ERROR("[OTLP TRACE HTTP Exporter] ERROR: Export "
-                                  << span_count
-                                  << " trace span(s) error: " << static_cast<int>(result));
-        }
-        else
-        {
-          OTEL_INTERNAL_LOG_DEBUG("[OTLP TRACE HTTP Exporter] Export " << span_count
-                                                                       << " trace span(s) success");
-        }
-        return true;
-      });
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-#else
-  opentelemetry::sdk::common::ExportResult result = http_client_->Export(*service_request);
-  if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP TRACE HTTP Exporter] ERROR: Export "
-                            << span_count << " trace span(s) error: " << static_cast<int>(result));
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[OTLP TRACE HTTP Exporter] Export " << span_count
-                                                                 << " trace span(s) success");
-  }
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-#endif
-}
-
-bool OtlpHttpExporter::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return http_client_->ForceFlush(timeout);
-}
-
-bool OtlpHttpExporter::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return http_client_->Shutdown(timeout);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter_factory.cc
deleted file mode 100644
index eca355214..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter_factory.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpExporterFactory::Create()
-{
-  OtlpHttpExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpExporterFactory::Create(
-    const OtlpHttpExporterOptions &options)
-{
-  OtlpHttpExporterRuntimeOptions runtime_options;
-  return Create(options, runtime_options);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpExporterFactory::Create(
-    const OtlpHttpExporterOptions &options,
-    const OtlpHttpExporterRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter(
-      new OtlpHttpExporter(options, runtime_options));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter_options.cc
deleted file mode 100644
index 34ba5e173..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_exporter_options.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpHttpExporterOptions::OtlpHttpExporterOptions()
-    : url(GetOtlpDefaultHttpTracesEndpoint()),
-      content_type(GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpTracesProtocol())),
-      json_bytes_mapping(JsonBytesMappingKind::kHexId),
-      use_json_name(false),
-      console_debug(false),
-      timeout(GetOtlpDefaultTracesTimeout()),
-      http_headers(GetOtlpDefaultTracesHeaders()),
-      ssl_insecure_skip_verify(false),
-      ssl_ca_cert_path(GetOtlpDefaultTracesSslCertificatePath()),
-      ssl_ca_cert_string(GetOtlpDefaultTracesSslCertificateString()),
-      ssl_client_key_path(GetOtlpDefaultTracesSslClientKeyPath()),
-      ssl_client_key_string(GetOtlpDefaultTracesSslClientKeyString()),
-      ssl_client_cert_path(GetOtlpDefaultTracesSslClientCertificatePath()),
-      ssl_client_cert_string(GetOtlpDefaultTracesSslClientCertificateString()),
-      ssl_min_tls(GetOtlpDefaultTracesSslTlsMinVersion()),
-      ssl_max_tls(GetOtlpDefaultTracesSslTlsMaxVersion()),
-      ssl_cipher(GetOtlpDefaultTracesSslTlsCipher()),
-      ssl_cipher_suite(GetOtlpDefaultTracesSslTlsCipherSuite()),
-      compression(GetOtlpDefaultTracesCompression()),
-      retry_policy_max_attempts(GetOtlpDefaultTracesRetryMaxAttempts()),
-      retry_policy_initial_backoff(GetOtlpDefaultTracesRetryInitialBackoff()),
-      retry_policy_max_backoff(GetOtlpDefaultTracesRetryMaxBackoff()),
-      retry_policy_backoff_multiplier(GetOtlpDefaultTracesRetryBackoffMultiplier())
-{
-#ifdef ENABLE_ASYNC_EXPORT
-  max_concurrent_requests     = 64;
-  max_requests_per_connection = 8;
-#endif /* ENABLE_ASYNC_EXPORT */
-}
-
-OtlpHttpExporterOptions::~OtlpHttpExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter.cc
deleted file mode 100644
index cd9852e05..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <new>
-#include <ostream>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/arena.h"
-#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpHttpLogRecordExporter::OtlpHttpLogRecordExporter()
-    : OtlpHttpLogRecordExporter(OtlpHttpLogRecordExporterOptions())
-{}
-
-OtlpHttpLogRecordExporter::OtlpHttpLogRecordExporter(
-    const OtlpHttpLogRecordExporterOptions &options)
-    : options_(options),
-      runtime_options_(),
-      http_client_(new OtlpHttpClient(OtlpHttpClientOptions(
-          options.url,
-          options.ssl_insecure_skip_verify,
-          options.ssl_ca_cert_path,
-          options.ssl_ca_cert_string,
-          options.ssl_client_key_path,
-          options.ssl_client_key_string,
-          options.ssl_client_cert_path,
-          options.ssl_client_cert_string,
-          options.ssl_min_tls,
-          options.ssl_max_tls,
-          options.ssl_cipher,
-          options.ssl_cipher_suite,
-          options.content_type,
-          options.json_bytes_mapping,
-          options.compression,
-          options.use_json_name,
-          options.console_debug,
-          options.timeout,
-          options.http_headers,
-          options.retry_policy_max_attempts,
-          options.retry_policy_initial_backoff,
-          options.retry_policy_max_backoff,
-          options.retry_policy_backoff_multiplier,
-          std::shared_ptr<sdk::common::ThreadInstrumentation>{nullptr}
-#ifdef ENABLE_ASYNC_EXPORT
-          ,
-          options.max_concurrent_requests,
-          options.max_requests_per_connection
-#endif
-          )))
-{}
-
-OtlpHttpLogRecordExporter::OtlpHttpLogRecordExporter(
-    const OtlpHttpLogRecordExporterOptions &options,
-    const OtlpHttpLogRecordExporterRuntimeOptions &runtime_options)
-    : options_(options),
-      runtime_options_(runtime_options),
-      http_client_(new OtlpHttpClient(OtlpHttpClientOptions(options.url,
-                                                            options.ssl_insecure_skip_verify,
-                                                            options.ssl_ca_cert_path,
-                                                            options.ssl_ca_cert_string,
-                                                            options.ssl_client_key_path,
-                                                            options.ssl_client_key_string,
-                                                            options.ssl_client_cert_path,
-                                                            options.ssl_client_cert_string,
-                                                            options.ssl_min_tls,
-                                                            options.ssl_max_tls,
-                                                            options.ssl_cipher,
-                                                            options.ssl_cipher_suite,
-                                                            options.content_type,
-                                                            options.json_bytes_mapping,
-                                                            options.compression,
-                                                            options.use_json_name,
-                                                            options.console_debug,
-                                                            options.timeout,
-                                                            options.http_headers,
-                                                            options.retry_policy_max_attempts,
-                                                            options.retry_policy_initial_backoff,
-                                                            options.retry_policy_max_backoff,
-                                                            options.retry_policy_backoff_multiplier,
-                                                            runtime_options.thread_instrumentation
-#ifdef ENABLE_ASYNC_EXPORT
-                                                            ,
-                                                            options.max_concurrent_requests,
-                                                            options.max_requests_per_connection
-#endif
-                                                            )))
-{}
-
-OtlpHttpLogRecordExporter::OtlpHttpLogRecordExporter(std::unique_ptr<OtlpHttpClient> http_client)
-    : options_(OtlpHttpLogRecordExporterOptions()), http_client_(std::move(http_client))
-{
-  options_.url                          = http_client_->GetOptions().url;
-  options_.content_type                 = http_client_->GetOptions().content_type;
-  options_.json_bytes_mapping           = http_client_->GetOptions().json_bytes_mapping;
-  options_.use_json_name                = http_client_->GetOptions().use_json_name;
-  options_.console_debug                = http_client_->GetOptions().console_debug;
-  options_.timeout                      = http_client_->GetOptions().timeout;
-  options_.http_headers                 = http_client_->GetOptions().http_headers;
-  options_.retry_policy_max_attempts    = http_client_->GetOptions().retry_policy.max_attempts;
-  options_.retry_policy_initial_backoff = http_client_->GetOptions().retry_policy.initial_backoff;
-  options_.retry_policy_max_backoff     = http_client_->GetOptions().retry_policy.max_backoff;
-  options_.retry_policy_backoff_multiplier =
-      http_client_->GetOptions().retry_policy.backoff_multiplier;
-#ifdef ENABLE_ASYNC_EXPORT
-  options_.max_concurrent_requests     = http_client_->GetOptions().max_concurrent_requests;
-  options_.max_requests_per_connection = http_client_->GetOptions().max_requests_per_connection;
-#endif
-  runtime_options_.thread_instrumentation = http_client_->GetOptions().thread_instrumentation;
-}
-// ----------------------------- Exporter methods ------------------------------
-
-std::unique_ptr<opentelemetry::sdk::logs::Recordable>
-OtlpHttpLogRecordExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<opentelemetry::sdk::logs::Recordable>(new OtlpLogRecordable());
-}
-
-opentelemetry::sdk::common::ExportResult OtlpHttpLogRecordExporter::Export(
-    const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>>
-        &logs) noexcept
-{
-  if (http_client_->IsShutdown())
-  {
-    std::size_t log_count = logs.size();
-    OTEL_INTERNAL_LOG_ERROR("[OTLP LOG HTTP Exporter] ERROR: Export "
-                            << log_count << " log(s) failed, exporter is shutdown");
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  if (logs.empty())
-  {
-    return opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a lager
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  google::protobuf::Arena arena{arena_options};
-
-  proto::collector::logs::v1::ExportLogsServiceRequest *service_request =
-      google::protobuf::Arena::Create<proto::collector::logs::v1::ExportLogsServiceRequest>(&arena);
-  OtlpRecordableUtils::PopulateRequest(logs, service_request);
-  std::size_t log_count = logs.size();
-#ifdef ENABLE_ASYNC_EXPORT
-  http_client_->Export(*service_request, [log_count](
-                                             opentelemetry::sdk::common::ExportResult result) {
-    if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-    {
-      OTEL_INTERNAL_LOG_ERROR("[OTLP LOG HTTP Exporter] ERROR: Export "
-                              << log_count << " log(s) error: " << static_cast<int>(result));
-    }
-    else
-    {
-      OTEL_INTERNAL_LOG_DEBUG("[OTLP LOG HTTP Exporter] Export " << log_count << " log(s) success");
-    }
-    return true;
-  });
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-#else
-  opentelemetry::sdk::common::ExportResult result = http_client_->Export(*service_request);
-  if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP LOG HTTP Exporter] ERROR: Export "
-                            << log_count << " log(s) error: " << static_cast<int>(result));
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[OTLP LOG HTTP Exporter] Export " << log_count << " log(s) success");
-  }
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-#endif
-}
-
-bool OtlpHttpLogRecordExporter::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return http_client_->ForceFlush(timeout);
-}
-
-bool OtlpHttpLogRecordExporter::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return http_client_->Shutdown(timeout);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter_factory.cc
deleted file mode 100644
index 54e78bf4e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter_factory.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_runtime_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpHttpLogRecordExporterFactory::Create()
-{
-  OtlpHttpLogRecordExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpHttpLogRecordExporterFactory::Create(const OtlpHttpLogRecordExporterOptions &options)
-{
-  OtlpHttpLogRecordExporterRuntimeOptions runtime_options;
-  return Create(options, runtime_options);
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
-OtlpHttpLogRecordExporterFactory::Create(
-    const OtlpHttpLogRecordExporterOptions &options,
-    const OtlpHttpLogRecordExporterRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter(
-      new OtlpHttpLogRecordExporter(options, runtime_options));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter_options.cc
deleted file mode 100644
index d3c6742cb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_log_record_exporter_options.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpHttpLogRecordExporterOptions::OtlpHttpLogRecordExporterOptions()
-    : url(GetOtlpDefaultHttpLogsEndpoint()),
-      content_type(GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpLogsProtocol())),
-      json_bytes_mapping(JsonBytesMappingKind::kHexId),
-      use_json_name(false),
-      console_debug(false),
-      timeout(GetOtlpDefaultLogsTimeout()),
-      http_headers(GetOtlpDefaultLogsHeaders()),
-      ssl_insecure_skip_verify(false),
-      ssl_ca_cert_path(GetOtlpDefaultLogsSslCertificatePath()),
-      ssl_ca_cert_string(GetOtlpDefaultLogsSslCertificateString()),
-      ssl_client_key_path(GetOtlpDefaultLogsSslClientKeyPath()),
-      ssl_client_key_string(GetOtlpDefaultLogsSslClientKeyString()),
-      ssl_client_cert_path(GetOtlpDefaultLogsSslClientCertificatePath()),
-      ssl_client_cert_string(GetOtlpDefaultLogsSslClientCertificateString()),
-      ssl_min_tls(GetOtlpDefaultLogsSslTlsMinVersion()),
-      ssl_max_tls(GetOtlpDefaultLogsSslTlsMaxVersion()),
-      ssl_cipher(GetOtlpDefaultLogsSslTlsCipher()),
-      ssl_cipher_suite(GetOtlpDefaultLogsSslTlsCipherSuite()),
-      compression(GetOtlpDefaultLogsCompression()),
-      retry_policy_max_attempts(GetOtlpDefaultLogsRetryMaxAttempts()),
-      retry_policy_initial_backoff(GetOtlpDefaultLogsRetryInitialBackoff()),
-      retry_policy_max_backoff(GetOtlpDefaultLogsRetryMaxBackoff()),
-      retry_policy_backoff_multiplier(GetOtlpDefaultLogsRetryBackoffMultiplier())
-{
-#ifdef ENABLE_ASYNC_EXPORT
-  max_concurrent_requests     = 64;
-  max_requests_per_connection = 8;
-#endif
-}
-
-OtlpHttpLogRecordExporterOptions::~OtlpHttpLogRecordExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter.cc
deleted file mode 100644
index 5c2bc7683..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter.cc
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <new>
-#include <ostream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/arena.h"
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpHttpMetricExporter::OtlpHttpMetricExporter()
-    : OtlpHttpMetricExporter(OtlpHttpMetricExporterOptions())
-{}
-
-OtlpHttpMetricExporter::OtlpHttpMetricExporter(const OtlpHttpMetricExporterOptions &options)
-    : options_(options),
-      runtime_options_(),
-      aggregation_temporality_selector_{
-          OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
-      http_client_(new OtlpHttpClient(OtlpHttpClientOptions(
-          options.url,
-          options.ssl_insecure_skip_verify,
-          options.ssl_ca_cert_path,
-          options.ssl_ca_cert_string,
-          options.ssl_client_key_path,
-          options.ssl_client_key_string,
-          options.ssl_client_cert_path,
-          options.ssl_client_cert_string,
-          options.ssl_min_tls,
-          options.ssl_max_tls,
-          options.ssl_cipher,
-          options.ssl_cipher_suite,
-          options.content_type,
-          options.json_bytes_mapping,
-          options.compression,
-          options.use_json_name,
-          options.console_debug,
-          options.timeout,
-          options.http_headers,
-          options.retry_policy_max_attempts,
-          options.retry_policy_initial_backoff,
-          options.retry_policy_max_backoff,
-          options.retry_policy_backoff_multiplier,
-          std::shared_ptr<sdk::common::ThreadInstrumentation>{nullptr}
-#ifdef ENABLE_ASYNC_EXPORT
-          ,
-          options.max_concurrent_requests,
-          options.max_requests_per_connection
-#endif
-          )))
-{}
-
-OtlpHttpMetricExporter::OtlpHttpMetricExporter(
-    const OtlpHttpMetricExporterOptions &options,
-    const OtlpHttpMetricExporterRuntimeOptions &runtime_options)
-    : options_(options),
-      runtime_options_(runtime_options),
-      aggregation_temporality_selector_{
-          OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
-      http_client_(new OtlpHttpClient(OtlpHttpClientOptions(options.url,
-                                                            options.ssl_insecure_skip_verify,
-                                                            options.ssl_ca_cert_path,
-                                                            options.ssl_ca_cert_string,
-                                                            options.ssl_client_key_path,
-                                                            options.ssl_client_key_string,
-                                                            options.ssl_client_cert_path,
-                                                            options.ssl_client_cert_string,
-                                                            options.ssl_min_tls,
-                                                            options.ssl_max_tls,
-                                                            options.ssl_cipher,
-                                                            options.ssl_cipher_suite,
-                                                            options.content_type,
-                                                            options.json_bytes_mapping,
-                                                            options.compression,
-                                                            options.use_json_name,
-                                                            options.console_debug,
-                                                            options.timeout,
-                                                            options.http_headers,
-                                                            options.retry_policy_max_attempts,
-                                                            options.retry_policy_initial_backoff,
-                                                            options.retry_policy_max_backoff,
-                                                            options.retry_policy_backoff_multiplier,
-                                                            runtime_options.thread_instrumentation
-#ifdef ENABLE_ASYNC_EXPORT
-                                                            ,
-                                                            options.max_concurrent_requests,
-                                                            options.max_requests_per_connection
-#endif
-                                                            )))
-{}
-
-OtlpHttpMetricExporter::OtlpHttpMetricExporter(std::unique_ptr<OtlpHttpClient> http_client)
-    : options_(OtlpHttpMetricExporterOptions()),
-      aggregation_temporality_selector_{
-          OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
-      http_client_(std::move(http_client))
-{
-  options_.url                          = http_client_->GetOptions().url;
-  options_.content_type                 = http_client_->GetOptions().content_type;
-  options_.json_bytes_mapping           = http_client_->GetOptions().json_bytes_mapping;
-  options_.use_json_name                = http_client_->GetOptions().use_json_name;
-  options_.console_debug                = http_client_->GetOptions().console_debug;
-  options_.timeout                      = http_client_->GetOptions().timeout;
-  options_.http_headers                 = http_client_->GetOptions().http_headers;
-  options_.retry_policy_max_attempts    = http_client_->GetOptions().retry_policy.max_attempts;
-  options_.retry_policy_initial_backoff = http_client_->GetOptions().retry_policy.initial_backoff;
-  options_.retry_policy_max_backoff     = http_client_->GetOptions().retry_policy.max_backoff;
-  options_.retry_policy_backoff_multiplier =
-      http_client_->GetOptions().retry_policy.backoff_multiplier;
-#ifdef ENABLE_ASYNC_EXPORT
-  options_.max_concurrent_requests     = http_client_->GetOptions().max_concurrent_requests;
-  options_.max_requests_per_connection = http_client_->GetOptions().max_requests_per_connection;
-#endif
-  runtime_options_.thread_instrumentation = http_client_->GetOptions().thread_instrumentation;
-}
-// ----------------------------- Exporter methods ------------------------------
-
-sdk::metrics::AggregationTemporality OtlpHttpMetricExporter::GetAggregationTemporality(
-    sdk::metrics::InstrumentType instrument_type) const noexcept
-{
-
-  return aggregation_temporality_selector_(instrument_type);
-}
-
-opentelemetry::sdk::common::ExportResult OtlpHttpMetricExporter::Export(
-    const opentelemetry::sdk::metrics::ResourceMetrics &data) noexcept
-{
-  if (http_client_->IsShutdown())
-  {
-    std::size_t metric_count = data.scope_metric_data_.size();
-    OTEL_INTERNAL_LOG_ERROR("[OTLP METRIC HTTP Exporter] ERROR: Export "
-                            << metric_count << " metric(s) failed, exporter is shutdown");
-    return opentelemetry::sdk::common::ExportResult::kFailure;
-  }
-
-  if (data.scope_metric_data_.empty())
-  {
-    return opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  google::protobuf::ArenaOptions arena_options;
-  // It's easy to allocate datas larger than 1024 when we populate basic resource and attributes
-  arena_options.initial_block_size = 1024;
-  // When in batch mode, it's easy to export a large number of spans at once, we can alloc a lager
-  // block to reduce memory fragments.
-  arena_options.max_block_size = 65536;
-  google::protobuf::Arena arena{arena_options};
-
-  proto::collector::metrics::v1::ExportMetricsServiceRequest *service_request =
-      google::protobuf::Arena::Create<proto::collector::metrics::v1::ExportMetricsServiceRequest>(
-          &arena);
-  OtlpMetricUtils::PopulateRequest(data, service_request);
-  std::size_t metric_count = data.scope_metric_data_.size();
-#ifdef ENABLE_ASYNC_EXPORT
-  http_client_->Export(*service_request, [metric_count](
-                                             opentelemetry::sdk::common::ExportResult result) {
-    if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-    {
-      OTEL_INTERNAL_LOG_ERROR("[OTLP METRIC HTTP Exporter] ERROR: Export "
-                              << metric_count << " metric(s) error: " << static_cast<int>(result));
-    }
-    else
-    {
-      OTEL_INTERNAL_LOG_DEBUG("[OTLP METRIC HTTP Exporter] Export " << metric_count
-                                                                    << " metric(s) success");
-    }
-    return true;
-  });
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-#else
-  opentelemetry::sdk::common::ExportResult result = http_client_->Export(*service_request);
-  if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[OTLP METRIC HTTP Exporter] ERROR: Export "
-                            << metric_count << " metric(s) error: " << static_cast<int>(result));
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_DEBUG("[OTLP METRIC HTTP Exporter] Export " << metric_count
-                                                                  << " metric(s) success");
-  }
-  return opentelemetry::sdk::common::ExportResult::kSuccess;
-#endif
-}
-
-bool OtlpHttpMetricExporter::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return http_client_->ForceFlush(timeout);
-}
-
-bool OtlpHttpMetricExporter::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return http_client_->Shutdown(timeout);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter_factory.cc
deleted file mode 100644
index 1bd6d8a64..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter_factory.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpHttpMetricExporterFactory::Create()
-{
-  OtlpHttpMetricExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpHttpMetricExporterFactory::Create(const OtlpHttpMetricExporterOptions &options)
-{
-  OtlpHttpMetricExporterRuntimeOptions runtime_options;
-  return Create(options, runtime_options);
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
-OtlpHttpMetricExporterFactory::Create(const OtlpHttpMetricExporterOptions &options,
-                                      const OtlpHttpMetricExporterRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter(
-      new OtlpHttpMetricExporter(options, runtime_options));
-  return exporter;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter_options.cc
deleted file mode 100644
index eb11fe2a8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_http_metric_exporter_options.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-OtlpHttpMetricExporterOptions::OtlpHttpMetricExporterOptions()
-    : url(GetOtlpDefaultMetricsEndpoint()),
-      content_type(GetOtlpHttpProtocolFromString(GetOtlpDefaultHttpMetricsProtocol())),
-      json_bytes_mapping(JsonBytesMappingKind::kHexId),
-      use_json_name(false),
-      console_debug(false),
-      timeout(GetOtlpDefaultMetricsTimeout()),
-      http_headers(GetOtlpDefaultMetricsHeaders()),
-      aggregation_temporality(PreferredAggregationTemporality::kCumulative),
-      ssl_insecure_skip_verify(false),
-      ssl_ca_cert_path(GetOtlpDefaultMetricsSslCertificatePath()),
-      ssl_ca_cert_string(GetOtlpDefaultMetricsSslCertificateString()),
-      ssl_client_key_path(GetOtlpDefaultMetricsSslClientKeyPath()),
-      ssl_client_key_string(GetOtlpDefaultMetricsSslClientKeyString()),
-      ssl_client_cert_path(GetOtlpDefaultMetricsSslClientCertificatePath()),
-      ssl_client_cert_string(GetOtlpDefaultMetricsSslClientCertificateString()),
-      ssl_min_tls(GetOtlpDefaultMetricsSslTlsMinVersion()),
-      ssl_max_tls(GetOtlpDefaultMetricsSslTlsMaxVersion()),
-      ssl_cipher(GetOtlpDefaultMetricsSslTlsCipher()),
-      ssl_cipher_suite(GetOtlpDefaultMetricsSslTlsCipherSuite()),
-      compression(GetOtlpDefaultMetricsCompression()),
-      retry_policy_max_attempts(GetOtlpDefaultMetricsRetryMaxAttempts()),
-      retry_policy_initial_backoff(GetOtlpDefaultMetricsRetryInitialBackoff()),
-      retry_policy_max_backoff(GetOtlpDefaultMetricsRetryMaxBackoff()),
-      retry_policy_backoff_multiplier(GetOtlpDefaultMetricsRetryBackoffMultiplier())
-{
-#ifdef ENABLE_ASYNC_EXPORT
-  max_concurrent_requests     = 64;
-  max_requests_per_connection = 8;
-#endif
-}
-
-OtlpHttpMetricExporterOptions::~OtlpHttpMetricExporterOptions() {}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_log_recordable.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_log_recordable.cc
deleted file mode 100644
index 374c3c2f5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_log_recordable.cc
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/readable_log_record.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "opentelemetry/proto/logs/v1/logs.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-const opentelemetry::sdk::resource::Resource &OtlpLogRecordable::GetResource() const noexcept
-{
-  if OPENTELEMETRY_LIKELY_CONDITION (nullptr != resource_)
-  {
-    return *resource_;
-  }
-
-  return opentelemetry::sdk::logs::ReadableLogRecord::GetDefaultResource();
-}
-
-const opentelemetry::sdk::instrumentationscope::InstrumentationScope &
-OtlpLogRecordable::GetInstrumentationScope() const noexcept
-{
-  if OPENTELEMETRY_LIKELY_CONDITION (nullptr != instrumentation_scope_)
-  {
-    return *instrumentation_scope_;
-  }
-
-  return opentelemetry::sdk::logs::ReadableLogRecord::GetDefaultInstrumentationScope();
-}
-
-void OtlpLogRecordable::SetTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  proto_record_.set_time_unix_nano(timestamp.time_since_epoch().count());
-}
-
-void OtlpLogRecordable::SetObservedTimestamp(
-    opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  proto_record_.set_observed_time_unix_nano(timestamp.time_since_epoch().count());
-}
-
-void OtlpLogRecordable::SetSeverity(opentelemetry::logs::Severity severity) noexcept
-{
-  switch (severity)
-  {
-    case opentelemetry::logs::Severity::kTrace: {
-      proto_record_.set_severity_text("TRACE");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_TRACE);
-      break;
-    }
-    case opentelemetry::logs::Severity::kTrace2: {
-      proto_record_.set_severity_text("TRACE2");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_TRACE2);
-      break;
-    }
-    case opentelemetry::logs::Severity::kTrace3: {
-      proto_record_.set_severity_text("TRACE3");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_TRACE3);
-      break;
-    }
-    case opentelemetry::logs::Severity::kTrace4: {
-      proto_record_.set_severity_text("TRACE4");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_TRACE4);
-      break;
-    }
-    case opentelemetry::logs::Severity::kDebug: {
-      proto_record_.set_severity_text("DEBUG");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_DEBUG);
-      break;
-    }
-    case opentelemetry::logs::Severity::kDebug2: {
-      proto_record_.set_severity_text("DEBUG2");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_DEBUG2);
-      break;
-    }
-    case opentelemetry::logs::Severity::kDebug3: {
-      proto_record_.set_severity_text("DEBUG3");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_DEBUG3);
-      break;
-    }
-    case opentelemetry::logs::Severity::kDebug4: {
-      proto_record_.set_severity_text("DEBUG4");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_DEBUG4);
-      break;
-    }
-    case opentelemetry::logs::Severity::kInfo: {
-      proto_record_.set_severity_text("INFO");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_INFO);
-      break;
-    }
-    case opentelemetry::logs::Severity::kInfo2: {
-      proto_record_.set_severity_text("INFO2");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_INFO2);
-      break;
-    }
-    case opentelemetry::logs::Severity::kInfo3: {
-      proto_record_.set_severity_text("INFO3");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_INFO3);
-      break;
-    }
-    case opentelemetry::logs::Severity::kInfo4: {
-      proto_record_.set_severity_text("INFO4");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_INFO4);
-      break;
-    }
-    case opentelemetry::logs::Severity::kWarn: {
-      proto_record_.set_severity_text("WARN");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_WARN);
-      break;
-    }
-    case opentelemetry::logs::Severity::kWarn2: {
-      proto_record_.set_severity_text("WARN2");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_WARN2);
-      break;
-    }
-    case opentelemetry::logs::Severity::kWarn3: {
-      proto_record_.set_severity_text("WARN3");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_WARN3);
-      break;
-    }
-    case opentelemetry::logs::Severity::kWarn4: {
-      proto_record_.set_severity_text("WARN4");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_WARN4);
-      break;
-    }
-    case opentelemetry::logs::Severity::kError: {
-      proto_record_.set_severity_text("ERROR");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_ERROR);
-      break;
-    }
-    case opentelemetry::logs::Severity::kError2: {
-      proto_record_.set_severity_text("ERROR2");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_ERROR2);
-      break;
-    }
-    case opentelemetry::logs::Severity::kError3: {
-      proto_record_.set_severity_text("ERROR3");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_ERROR3);
-      break;
-    }
-    case opentelemetry::logs::Severity::kError4: {
-      proto_record_.set_severity_text("ERROR4");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_ERROR4);
-      break;
-    }
-    case opentelemetry::logs::Severity::kFatal: {
-      proto_record_.set_severity_text("FATAL");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_FATAL);
-      break;
-    }
-    case opentelemetry::logs::Severity::kFatal2: {
-      proto_record_.set_severity_text("FATAL2");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_FATAL2);
-      break;
-    }
-    case opentelemetry::logs::Severity::kFatal3: {
-      proto_record_.set_severity_text("FATAL3");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_FATAL3);
-      break;
-    }
-    case opentelemetry::logs::Severity::kFatal4: {
-      proto_record_.set_severity_text("FATAL4");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_FATAL4);
-      break;
-    }
-    default: {
-      proto_record_.set_severity_text("INVALID");
-      proto_record_.set_severity_number(proto::logs::v1::SEVERITY_NUMBER_UNSPECIFIED);
-      break;
-    }
-  }
-}
-
-void OtlpLogRecordable::SetBody(const opentelemetry::common::AttributeValue &message) noexcept
-{
-  OtlpPopulateAttributeUtils::PopulateAnyValue(proto_record_.mutable_body(), message);
-}
-
-void OtlpLogRecordable::SetEventId(int64_t /* id */, nostd::string_view event_name) noexcept
-{
-  proto_record_.set_event_name(event_name.data(), event_name.size());
-}
-
-void OtlpLogRecordable::SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept
-{
-  if (trace_id.IsValid())
-  {
-    proto_record_.set_trace_id(reinterpret_cast<const char *>(trace_id.Id().data()),
-                               trace_id.Id().size());
-  }
-  else
-  {
-    proto_record_.clear_trace_id();
-  }
-}
-
-void OtlpLogRecordable::SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept
-{
-  if (span_id.IsValid())
-  {
-    proto_record_.set_span_id(reinterpret_cast<const char *>(span_id.Id().data()),
-                              span_id.Id().size());
-  }
-  else
-  {
-    proto_record_.clear_span_id();
-  }
-}
-
-void OtlpLogRecordable::SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept
-{
-  proto_record_.set_flags(trace_flags.flags());
-}
-
-void OtlpLogRecordable::SetAttribute(opentelemetry::nostd::string_view key,
-                                     const opentelemetry::common::AttributeValue &value) noexcept
-{
-  OtlpPopulateAttributeUtils::PopulateAttribute(proto_record_.add_attributes(), key, value);
-}
-
-void OtlpLogRecordable::SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept
-{
-  resource_ = &resource;
-}
-
-void OtlpLogRecordable::SetInstrumentationScope(
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-        &instrumentation_scope) noexcept
-{
-  instrumentation_scope_ = &instrumentation_scope;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_metric_utils.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_metric_utils.cc
deleted file mode 100644
index 5383c0d56..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_metric_utils.cc
+++ /dev/null
@@ -1,412 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <map>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
-#include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/metrics/v1/metrics.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace exporter
-{
-namespace otlp
-{
-namespace metric_sdk = opentelemetry::sdk::metrics;
-
-proto::metrics::v1::AggregationTemporality OtlpMetricUtils::GetProtoAggregationTemporality(
-    const opentelemetry::sdk::metrics::AggregationTemporality &aggregation_temporality) noexcept
-{
-  if (aggregation_temporality == opentelemetry::sdk::metrics::AggregationTemporality::kCumulative)
-    return proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE;
-  else if (aggregation_temporality == opentelemetry::sdk::metrics::AggregationTemporality::kDelta)
-    return proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_DELTA;
-  else
-    return proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_UNSPECIFIED;
-}
-
-metric_sdk::AggregationType OtlpMetricUtils::GetAggregationType(
-    const opentelemetry::sdk::metrics::MetricData &metric_data) noexcept
-{
-  if (metric_data.point_data_attr_.size() == 0)
-  {
-    return metric_sdk::AggregationType::kDrop;
-  }
-  auto point_data_with_attributes = metric_data.point_data_attr_[0];
-  if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data_with_attributes.point_data))
-  {
-    return metric_sdk::AggregationType::kSum;
-  }
-  else if (nostd::holds_alternative<sdk::metrics::HistogramPointData>(
-               point_data_with_attributes.point_data))
-  {
-    return metric_sdk::AggregationType::kHistogram;
-  }
-  else if (nostd::holds_alternative<sdk::metrics::Base2ExponentialHistogramPointData>(
-               point_data_with_attributes.point_data))
-  {
-    return metric_sdk::AggregationType::kBase2ExponentialHistogram;
-  }
-  else if (nostd::holds_alternative<sdk::metrics::LastValuePointData>(
-               point_data_with_attributes.point_data))
-  {
-    return metric_sdk::AggregationType::kLastValue;
-  }
-  return metric_sdk::AggregationType::kDrop;
-}
-
-void OtlpMetricUtils::ConvertSumMetric(const metric_sdk::MetricData &metric_data,
-                                       proto::metrics::v1::Sum *const sum) noexcept
-{
-  sum->set_aggregation_temporality(
-      GetProtoAggregationTemporality(metric_data.aggregation_temporality));
-  sum->set_is_monotonic(
-      (metric_data.instrument_descriptor.type_ == metric_sdk::InstrumentType::kCounter) ||
-      (metric_data.instrument_descriptor.type_ == metric_sdk::InstrumentType::kObservableCounter));
-  auto start_ts = metric_data.start_ts.time_since_epoch().count();
-  auto ts       = metric_data.end_ts.time_since_epoch().count();
-  for (auto &point_data_with_attributes : metric_data.point_data_attr_)
-  {
-    proto::metrics::v1::NumberDataPoint *proto_sum_point_data = sum->add_data_points();
-    proto_sum_point_data->set_start_time_unix_nano(start_ts);
-    proto_sum_point_data->set_time_unix_nano(ts);
-    auto sum_data = nostd::get<sdk::metrics::SumPointData>(point_data_with_attributes.point_data);
-
-    if ((nostd::holds_alternative<int64_t>(sum_data.value_)))
-    {
-      proto_sum_point_data->set_as_int(nostd::get<int64_t>(sum_data.value_));
-    }
-    else
-    {
-      proto_sum_point_data->set_as_double(nostd::get<double>(sum_data.value_));
-    }
-    // set attributes
-    for (auto &kv_attr : point_data_with_attributes.attributes)
-    {
-      OtlpPopulateAttributeUtils::PopulateAttribute(proto_sum_point_data->add_attributes(),
-                                                    kv_attr.first, kv_attr.second);
-    }
-  }
-}
-
-void OtlpMetricUtils::ConvertHistogramMetric(
-    const metric_sdk::MetricData &metric_data,
-    proto::metrics::v1::Histogram *const histogram) noexcept
-{
-  histogram->set_aggregation_temporality(
-      GetProtoAggregationTemporality(metric_data.aggregation_temporality));
-  auto start_ts = metric_data.start_ts.time_since_epoch().count();
-  auto ts       = metric_data.end_ts.time_since_epoch().count();
-  for (auto &point_data_with_attributes : metric_data.point_data_attr_)
-  {
-    proto::metrics::v1::HistogramDataPoint *proto_histogram_point_data =
-        histogram->add_data_points();
-    proto_histogram_point_data->set_start_time_unix_nano(start_ts);
-    proto_histogram_point_data->set_time_unix_nano(ts);
-    auto histogram_data =
-        nostd::get<sdk::metrics::HistogramPointData>(point_data_with_attributes.point_data);
-    // sum
-    if ((nostd::holds_alternative<int64_t>(histogram_data.sum_)))
-    {
-      // Use static_cast to avoid C4244 in MSVC
-      proto_histogram_point_data->set_sum(
-          static_cast<double>(nostd::get<int64_t>(histogram_data.sum_)));
-    }
-    else
-    {
-      proto_histogram_point_data->set_sum(nostd::get<double>(histogram_data.sum_));
-    }
-    // count
-    proto_histogram_point_data->set_count(histogram_data.count_);
-    if (histogram_data.record_min_max_)
-    {
-      if (nostd::holds_alternative<int64_t>(histogram_data.min_))
-      {
-        // Use static_cast to avoid C4244 in MSVC
-        proto_histogram_point_data->set_min(
-            static_cast<double>(nostd::get<int64_t>(histogram_data.min_)));
-      }
-      else
-      {
-        proto_histogram_point_data->set_min(nostd::get<double>(histogram_data.min_));
-      }
-      if (nostd::holds_alternative<int64_t>(histogram_data.max_))
-      {
-        // Use static_cast to avoid C4244 in MSVC
-        proto_histogram_point_data->set_max(
-            static_cast<double>(nostd::get<int64_t>(histogram_data.max_)));
-      }
-      else
-      {
-        proto_histogram_point_data->set_max(nostd::get<double>(histogram_data.max_));
-      }
-    }
-    // buckets
-
-    for (auto bound : histogram_data.boundaries_)
-    {
-      proto_histogram_point_data->add_explicit_bounds(bound);
-    }
-    // bucket counts
-    for (auto bucket_value : histogram_data.counts_)
-    {
-      proto_histogram_point_data->add_bucket_counts(bucket_value);
-    }
-    // attributes
-    for (auto &kv_attr : point_data_with_attributes.attributes)
-    {
-      OtlpPopulateAttributeUtils::PopulateAttribute(proto_histogram_point_data->add_attributes(),
-                                                    kv_attr.first, kv_attr.second);
-    }
-  }
-}
-
-void OtlpMetricUtils::ConvertExponentialHistogramMetric(
-    const metric_sdk::MetricData &metric_data,
-    proto::metrics::v1::ExponentialHistogram *const histogram) noexcept
-{
-  histogram->set_aggregation_temporality(
-      GetProtoAggregationTemporality(metric_data.aggregation_temporality));
-  auto start_ts = metric_data.start_ts.time_since_epoch().count();
-  auto ts       = metric_data.end_ts.time_since_epoch().count();
-  for (auto &point_data_with_attributes : metric_data.point_data_attr_)
-  {
-    proto::metrics::v1::ExponentialHistogramDataPoint *proto_histogram_point_data =
-        histogram->add_data_points();
-    proto_histogram_point_data->set_start_time_unix_nano(start_ts);
-    proto_histogram_point_data->set_time_unix_nano(ts);
-    auto histogram_data = nostd::get<sdk::metrics::Base2ExponentialHistogramPointData>(
-        point_data_with_attributes.point_data);
-    if (histogram_data.positive_buckets_ == nullptr && histogram_data.negative_buckets_ == nullptr)
-    {
-      continue;
-    }
-    // sum
-    proto_histogram_point_data->set_sum(histogram_data.sum_);
-    proto_histogram_point_data->set_count(histogram_data.count_);
-    if (histogram_data.record_min_max_)
-    {
-      proto_histogram_point_data->set_min(histogram_data.min_);
-      proto_histogram_point_data->set_max(histogram_data.max_);
-    }
-    // negative buckets
-    if (!histogram_data.negative_buckets_->Empty())
-    {
-      auto negative_buckets = proto_histogram_point_data->mutable_negative();
-      negative_buckets->set_offset(histogram_data.negative_buckets_->StartIndex());
-
-      for (auto index = histogram_data.negative_buckets_->StartIndex();
-           index <= histogram_data.negative_buckets_->EndIndex(); ++index)
-      {
-        negative_buckets->add_bucket_counts(histogram_data.negative_buckets_->Get(index));
-      }
-    }
-    // positive buckets
-    if (!histogram_data.positive_buckets_->Empty())
-    {
-      auto positive_buckets = proto_histogram_point_data->mutable_positive();
-      positive_buckets->set_offset(histogram_data.positive_buckets_->StartIndex());
-
-      for (auto index = histogram_data.positive_buckets_->StartIndex();
-           index <= histogram_data.positive_buckets_->EndIndex(); ++index)
-      {
-        positive_buckets->add_bucket_counts(histogram_data.positive_buckets_->Get(index));
-      }
-    }
-    proto_histogram_point_data->set_scale(histogram_data.scale_);
-    proto_histogram_point_data->set_zero_count(histogram_data.zero_count_);
-
-    // attributes
-    for (auto &kv_attr : point_data_with_attributes.attributes)
-    {
-      OtlpPopulateAttributeUtils::PopulateAttribute(proto_histogram_point_data->add_attributes(),
-                                                    kv_attr.first, kv_attr.second);
-    }
-  }
-}
-
-void OtlpMetricUtils::ConvertGaugeMetric(const opentelemetry::sdk::metrics::MetricData &metric_data,
-                                         proto::metrics::v1::Gauge *const gauge) noexcept
-{
-  auto start_ts = metric_data.start_ts.time_since_epoch().count();
-  auto ts       = metric_data.end_ts.time_since_epoch().count();
-  for (auto &point_data_with_attributes : metric_data.point_data_attr_)
-  {
-    proto::metrics::v1::NumberDataPoint *proto_gauge_point_data = gauge->add_data_points();
-    proto_gauge_point_data->set_start_time_unix_nano(start_ts);
-    proto_gauge_point_data->set_time_unix_nano(ts);
-    auto gauge_data =
-        nostd::get<sdk::metrics::LastValuePointData>(point_data_with_attributes.point_data);
-
-    if ((nostd::holds_alternative<int64_t>(gauge_data.value_)))
-    {
-      proto_gauge_point_data->set_as_int(nostd::get<int64_t>(gauge_data.value_));
-    }
-    else
-    {
-      proto_gauge_point_data->set_as_double(nostd::get<double>(gauge_data.value_));
-    }
-    // set attributes
-    for (auto &kv_attr : point_data_with_attributes.attributes)
-    {
-      OtlpPopulateAttributeUtils::PopulateAttribute(proto_gauge_point_data->add_attributes(),
-                                                    kv_attr.first, kv_attr.second);
-    }
-  }
-}
-
-void OtlpMetricUtils::PopulateInstrumentInfoMetrics(
-    const opentelemetry::sdk::metrics::MetricData &metric_data,
-    proto::metrics::v1::Metric *metric) noexcept
-{
-  metric->set_name(metric_data.instrument_descriptor.name_);
-  metric->set_description(metric_data.instrument_descriptor.description_);
-  metric->set_unit(metric_data.instrument_descriptor.unit_);
-  auto kind = GetAggregationType(metric_data);
-  switch (kind)
-  {
-    case metric_sdk::AggregationType::kSum: {
-      ConvertSumMetric(metric_data, metric->mutable_sum());
-      break;
-    }
-    case metric_sdk::AggregationType::kHistogram: {
-      ConvertHistogramMetric(metric_data, metric->mutable_histogram());
-      break;
-    }
-    case metric_sdk::AggregationType::kBase2ExponentialHistogram: {
-      ConvertExponentialHistogramMetric(metric_data, metric->mutable_exponential_histogram());
-      break;
-    }
-    case metric_sdk::AggregationType::kLastValue: {
-      ConvertGaugeMetric(metric_data, metric->mutable_gauge());
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-void OtlpMetricUtils::PopulateResourceMetrics(
-    const opentelemetry::sdk::metrics::ResourceMetrics &data,
-    proto::metrics::v1::ResourceMetrics *resource_metrics) noexcept
-{
-  OtlpPopulateAttributeUtils::PopulateAttribute(resource_metrics->mutable_resource(),
-                                                *(data.resource_));
-
-  resource_metrics->set_schema_url(data.resource_->GetSchemaURL());
-
-  for (auto &scope_metrics : data.scope_metric_data_)
-  {
-    if (scope_metrics.scope_ == nullptr)
-    {
-      continue;
-    }
-    auto scope_lib_metrics                         = resource_metrics->add_scope_metrics();
-    proto::common::v1::InstrumentationScope *scope = scope_lib_metrics->mutable_scope();
-    scope->set_name(scope_metrics.scope_->GetName());
-    scope->set_version(scope_metrics.scope_->GetVersion());
-    scope_lib_metrics->set_schema_url(scope_metrics.scope_->GetSchemaURL());
-
-    OtlpPopulateAttributeUtils::PopulateAttribute(scope, *scope_metrics.scope_);
-
-    for (auto &metric_data : scope_metrics.metric_data_)
-    {
-      PopulateInstrumentInfoMetrics(metric_data, scope_lib_metrics->add_metrics());
-    }
-  }
-}
-
-void OtlpMetricUtils::PopulateRequest(
-    const opentelemetry::sdk::metrics::ResourceMetrics &data,
-    proto::collector::metrics::v1::ExportMetricsServiceRequest *request) noexcept
-{
-  if (request == nullptr || data.resource_ == nullptr)
-  {
-    return;
-  }
-
-  auto resource_metrics = request->add_resource_metrics();
-  PopulateResourceMetrics(data, resource_metrics);
-}
-
-sdk::metrics::AggregationTemporalitySelector OtlpMetricUtils::ChooseTemporalitySelector(
-    PreferredAggregationTemporality preferred_aggregation_temporality) noexcept
-{
-  if (preferred_aggregation_temporality == PreferredAggregationTemporality::kDelta)
-  {
-    return DeltaTemporalitySelector;
-  }
-  else if (preferred_aggregation_temporality == PreferredAggregationTemporality::kCumulative)
-  {
-    return CumulativeTemporalitySelector;
-  }
-  return LowMemoryTemporalitySelector;
-}
-
-sdk::metrics::AggregationTemporality OtlpMetricUtils::DeltaTemporalitySelector(
-    sdk::metrics::InstrumentType instrument_type) noexcept
-{
-  switch (instrument_type)
-  {
-    case sdk::metrics::InstrumentType::kCounter:
-    case sdk::metrics::InstrumentType::kObservableCounter:
-    case sdk::metrics::InstrumentType::kHistogram:
-    case sdk::metrics::InstrumentType::kObservableGauge:
-    case sdk::metrics::InstrumentType::kGauge:
-      return sdk::metrics::AggregationTemporality::kDelta;
-    case sdk::metrics::InstrumentType::kUpDownCounter:
-    case sdk::metrics::InstrumentType::kObservableUpDownCounter:
-      return sdk::metrics::AggregationTemporality::kCumulative;
-  }
-  return sdk::metrics::AggregationTemporality::kUnspecified;
-}
-
-sdk::metrics::AggregationTemporality OtlpMetricUtils::CumulativeTemporalitySelector(
-    sdk::metrics::InstrumentType /* instrument_type */) noexcept
-{
-  return sdk::metrics::AggregationTemporality::kCumulative;
-}
-
-sdk::metrics::AggregationTemporality OtlpMetricUtils::LowMemoryTemporalitySelector(
-    sdk::metrics::InstrumentType instrument_type) noexcept
-{
-  switch (instrument_type)
-  {
-    case sdk::metrics::InstrumentType::kCounter:
-    case sdk::metrics::InstrumentType::kHistogram:
-      return sdk::metrics::AggregationTemporality::kDelta;
-    case sdk::metrics::InstrumentType::kObservableCounter:
-    case sdk::metrics::InstrumentType::kGauge:
-    case sdk::metrics::InstrumentType::kObservableGauge:
-    case sdk::metrics::InstrumentType::kUpDownCounter:
-    case sdk::metrics::InstrumentType::kObservableUpDownCounter:
-      return sdk::metrics::AggregationTemporality::kCumulative;
-  }
-  return sdk::metrics::AggregationTemporality::kUnspecified;
-}
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_populate_attribute_utils.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_populate_attribute_utils.cc
deleted file mode 100644
index b7ff68630..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_populate_attribute_utils.cc
+++ /dev/null
@@ -1,330 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/resource/v1/resource.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-namespace nostd = opentelemetry::nostd;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-//
-// See `attribute_value.h` for details.
-//
-const int kAttributeValueSize      = 16;
-const int kOwnedAttributeValueSize = 15;
-
-void OtlpPopulateAttributeUtils::PopulateAnyValue(
-    opentelemetry::proto::common::v1::AnyValue *proto_value,
-    const opentelemetry::common::AttributeValue &value) noexcept
-{
-  if (nullptr == proto_value)
-  {
-    return;
-  }
-
-  // Assert size of variant to ensure that this method gets updated if the variant
-  // definition changes
-  static_assert(
-      nostd::variant_size<opentelemetry::common::AttributeValue>::value == kAttributeValueSize,
-      "AttributeValue contains unknown type");
-
-  if (nostd::holds_alternative<bool>(value))
-  {
-    proto_value->set_bool_value(nostd::get<bool>(value));
-  }
-  else if (nostd::holds_alternative<int>(value))
-  {
-    proto_value->set_int_value(nostd::get<int>(value));
-  }
-  else if (nostd::holds_alternative<int64_t>(value))
-  {
-    proto_value->set_int_value(nostd::get<int64_t>(value));
-  }
-  else if (nostd::holds_alternative<unsigned int>(value))
-  {
-    proto_value->set_int_value(nostd::get<unsigned int>(value));
-  }
-  else if (nostd::holds_alternative<uint64_t>(value))
-  {
-    proto_value->set_int_value(
-        nostd::get<uint64_t>(value));  // NOLINT(cppcoreguidelines-narrowing-conversions)
-  }
-  else if (nostd::holds_alternative<double>(value))
-  {
-    proto_value->set_double_value(nostd::get<double>(value));
-  }
-  else if (nostd::holds_alternative<const char *>(value))
-  {
-    proto_value->set_string_value(nostd::get<const char *>(value));
-  }
-  else if (nostd::holds_alternative<nostd::string_view>(value))
-  {
-    proto_value->set_string_value(nostd::get<nostd::string_view>(value).data(),
-                                  nostd::get<nostd::string_view>(value).size());
-  }
-  else if (nostd::holds_alternative<nostd::span<const uint8_t>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<nostd::span<const uint8_t>>(value))
-    {
-      array_value->add_values()->set_int_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const bool>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<nostd::span<const bool>>(value))
-    {
-      array_value->add_values()->set_bool_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const int>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<nostd::span<const int>>(value))
-    {
-      array_value->add_values()->set_int_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const int64_t>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<nostd::span<const int64_t>>(value))
-    {
-      array_value->add_values()->set_int_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const unsigned int>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<nostd::span<const unsigned int>>(value))
-    {
-      array_value->add_values()->set_int_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const uint64_t>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<nostd::span<const uint64_t>>(value))
-    {
-      array_value->add_values()->set_int_value(
-          val);  // NOLINT(cppcoreguidelines-narrowing-conversions)
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const double>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<nostd::span<const double>>(value))
-    {
-      array_value->add_values()->set_double_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const nostd::string_view>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<nostd::span<const nostd::string_view>>(value))
-    {
-      array_value->add_values()->set_string_value(val.data(), val.size());
-    }
-  }
-}
-
-void OtlpPopulateAttributeUtils::PopulateAnyValue(
-    opentelemetry::proto::common::v1::AnyValue *proto_value,
-    const opentelemetry::sdk::common::OwnedAttributeValue &value) noexcept
-{
-  if (nullptr == proto_value)
-  {
-    return;
-  }
-
-  // Assert size of variant to ensure that this method gets updated if the variant
-  // definition changes
-  static_assert(nostd::variant_size<opentelemetry::sdk::common::OwnedAttributeValue>::value ==
-                    kOwnedAttributeValueSize,
-                "OwnedAttributeValue contains unknown type");
-
-  if (nostd::holds_alternative<bool>(value))
-  {
-    proto_value->set_bool_value(nostd::get<bool>(value));
-  }
-  else if (nostd::holds_alternative<int32_t>(value))
-  {
-    proto_value->set_int_value(nostd::get<int32_t>(value));
-  }
-  else if (nostd::holds_alternative<int64_t>(value))
-  {
-    proto_value->set_int_value(nostd::get<int64_t>(value));
-  }
-  else if (nostd::holds_alternative<uint32_t>(value))
-  {
-    proto_value->set_int_value(nostd::get<uint32_t>(value));
-  }
-  else if (nostd::holds_alternative<uint64_t>(value))
-  {
-    proto_value->set_int_value(
-        nostd::get<uint64_t>(value));  // NOLINT(cppcoreguidelines-narrowing-conversions)
-  }
-  else if (nostd::holds_alternative<double>(value))
-  {
-    proto_value->set_double_value(nostd::get<double>(value));
-  }
-  else if (nostd::holds_alternative<std::string>(value))
-  {
-    proto_value->set_string_value(nostd::get<std::string>(value));
-  }
-  else if (nostd::holds_alternative<std::vector<bool>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto val : nostd::get<std::vector<bool>>(value))
-    {
-      array_value->add_values()->set_bool_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<int32_t>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<std::vector<int32_t>>(value))
-    {
-      array_value->add_values()->set_int_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<uint32_t>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<std::vector<uint32_t>>(value))
-    {
-      array_value->add_values()->set_int_value(
-          val);  // NOLINT(cppcoreguidelines-narrowing-conversions)
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<int64_t>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<std::vector<int64_t>>(value))
-    {
-      array_value->add_values()->set_int_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<uint64_t>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<std::vector<uint64_t>>(value))
-    {
-      array_value->add_values()->set_int_value(
-          val);  // NOLINT(cppcoreguidelines-narrowing-conversions)
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<double>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<std::vector<double>>(value))
-    {
-      array_value->add_values()->set_double_value(val);
-    }
-  }
-  else if (nostd::holds_alternative<std::vector<std::string>>(value))
-  {
-    auto array_value = proto_value->mutable_array_value();
-    for (const auto &val : nostd::get<std::vector<std::string>>(value))
-    {
-      array_value->add_values()->set_string_value(val);
-    }
-  }
-}
-
-void OtlpPopulateAttributeUtils::PopulateAttribute(
-    opentelemetry::proto::common::v1::KeyValue *attribute,
-    nostd::string_view key,
-    const opentelemetry::common::AttributeValue &value) noexcept
-{
-  if (nullptr == attribute)
-  {
-    return;
-  }
-
-  // Assert size of variant to ensure that this method gets updated if the variant
-  // definition changes
-  static_assert(
-      nostd::variant_size<opentelemetry::common::AttributeValue>::value == kAttributeValueSize,
-      "AttributeValue contains unknown type");
-
-  attribute->set_key(key.data(), key.size());
-  PopulateAnyValue(attribute->mutable_value(), value);
-}
-
-/** Maps from C++ attribute into OTLP proto attribute. */
-void OtlpPopulateAttributeUtils::PopulateAttribute(
-    opentelemetry::proto::common::v1::KeyValue *attribute,
-    nostd::string_view key,
-    const opentelemetry::sdk::common::OwnedAttributeValue &value) noexcept
-{
-  if (nullptr == attribute)
-  {
-    return;
-  }
-
-  // Assert size of variant to ensure that this method gets updated if the variant
-  // definition changes
-  static_assert(nostd::variant_size<opentelemetry::sdk::common::OwnedAttributeValue>::value ==
-                    kOwnedAttributeValueSize,
-                "OwnedAttributeValue contains unknown type");
-
-  attribute->set_key(key.data(), key.size());
-  PopulateAnyValue(attribute->mutable_value(), value);
-}
-
-void OtlpPopulateAttributeUtils::PopulateAttribute(
-    opentelemetry::proto::resource::v1::Resource *proto,
-    const opentelemetry::sdk::resource::Resource &resource) noexcept
-{
-  if (nullptr == proto)
-  {
-    return;
-  }
-
-  for (const auto &kv : resource.GetAttributes())
-  {
-    OtlpPopulateAttributeUtils::PopulateAttribute(proto->add_attributes(), kv.first, kv.second);
-  }
-}
-
-void OtlpPopulateAttributeUtils::PopulateAttribute(
-    opentelemetry::proto::common::v1::InstrumentationScope *proto,
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-        &instrumentation_scope) noexcept
-{
-  for (const auto &kv : instrumentation_scope.GetAttributes())
-  {
-    OtlpPopulateAttributeUtils::PopulateAttribute(proto->add_attributes(), kv.first, kv.second);
-  }
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_recordable.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_recordable.cc
deleted file mode 100644
index 411c0db35..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_recordable.cc
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <chrono>
-#include <string>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/resource/v1/resource.pb.h"
-#include "opentelemetry/proto/trace/v1/trace.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-namespace nostd = opentelemetry::nostd;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-void OtlpRecordable::SetIdentity(const opentelemetry::trace::SpanContext &span_context,
-                                 opentelemetry::trace::SpanId parent_span_id) noexcept
-{
-  span_.set_trace_id(reinterpret_cast<const char *>(span_context.trace_id().Id().data()),
-                     trace::TraceId::kSize);
-  span_.set_span_id(reinterpret_cast<const char *>(span_context.span_id().Id().data()),
-                    trace::SpanId::kSize);
-  if (parent_span_id.IsValid())
-  {
-    span_.set_parent_span_id(reinterpret_cast<const char *>(parent_span_id.Id().data()),
-                             trace::SpanId::kSize);
-  }
-  span_.set_trace_state(span_context.trace_state()->ToHeader());
-}
-
-proto::resource::v1::Resource OtlpRecordable::ProtoResource() const noexcept
-{
-  proto::resource::v1::Resource proto;
-  if (resource_)
-  {
-    OtlpPopulateAttributeUtils::PopulateAttribute(&proto, *resource_);
-  }
-
-  return proto;
-}
-
-const opentelemetry::sdk::resource::Resource *OtlpRecordable::GetResource() const noexcept
-{
-  return resource_;
-}
-
-const std::string OtlpRecordable::GetResourceSchemaURL() const noexcept
-{
-  std::string schema_url;
-  if (resource_)
-  {
-    schema_url = resource_->GetSchemaURL();
-  }
-
-  return schema_url;
-}
-
-const opentelemetry::sdk::instrumentationscope::InstrumentationScope *
-OtlpRecordable::GetInstrumentationScope() const noexcept
-{
-  return instrumentation_scope_;
-}
-
-const std::string OtlpRecordable::GetInstrumentationLibrarySchemaURL() const noexcept
-{
-  std::string schema_url;
-  if (instrumentation_scope_)
-  {
-    schema_url = instrumentation_scope_->GetSchemaURL();
-  }
-
-  return schema_url;
-}
-
-proto::common::v1::InstrumentationScope OtlpRecordable::GetProtoInstrumentationScope()
-    const noexcept
-{
-  proto::common::v1::InstrumentationScope instrumentation_scope;
-  if (instrumentation_scope_)
-  {
-    instrumentation_scope.set_name(instrumentation_scope_->GetName());
-    instrumentation_scope.set_version(instrumentation_scope_->GetVersion());
-    OtlpPopulateAttributeUtils::PopulateAttribute(&instrumentation_scope, *instrumentation_scope_);
-  }
-  return instrumentation_scope;
-}
-
-void OtlpRecordable::SetResource(const sdk::resource::Resource &resource) noexcept
-{
-  resource_ = &resource;
-}
-
-void OtlpRecordable::SetAttribute(nostd::string_view key,
-                                  const common::AttributeValue &value) noexcept
-{
-  auto *attribute = span_.add_attributes();
-  OtlpPopulateAttributeUtils::PopulateAttribute(attribute, key, value);
-}
-
-void OtlpRecordable::AddEvent(nostd::string_view name,
-                              common::SystemTimestamp timestamp,
-                              const common::KeyValueIterable &attributes) noexcept
-{
-  auto *event = span_.add_events();
-  event->set_name(name.data(), name.size());
-  event->set_time_unix_nano(timestamp.time_since_epoch().count());
-
-  attributes.ForEachKeyValue([&](nostd::string_view key, common::AttributeValue value) noexcept {
-    OtlpPopulateAttributeUtils::PopulateAttribute(event->add_attributes(), key, value);
-    return true;
-  });
-}
-
-void OtlpRecordable::AddLink(const trace::SpanContext &span_context,
-                             const common::KeyValueIterable &attributes) noexcept
-{
-  auto *link = span_.add_links();
-  link->set_trace_id(reinterpret_cast<const char *>(span_context.trace_id().Id().data()),
-                     trace::TraceId::kSize);
-  link->set_span_id(reinterpret_cast<const char *>(span_context.span_id().Id().data()),
-                    trace::SpanId::kSize);
-  link->set_trace_state(span_context.trace_state()->ToHeader());
-  attributes.ForEachKeyValue([&](nostd::string_view key, common::AttributeValue value) noexcept {
-    OtlpPopulateAttributeUtils::PopulateAttribute(link->add_attributes(), key, value);
-    return true;
-  });
-}
-
-void OtlpRecordable::SetStatus(trace::StatusCode code, nostd::string_view description) noexcept
-{
-  span_.mutable_status()->set_code(proto::trace::v1::Status_StatusCode(code));
-  if (code == trace::StatusCode::kError)
-  {
-    span_.mutable_status()->set_message(description.data(), description.size());
-  }
-}
-
-void OtlpRecordable::SetName(nostd::string_view name) noexcept
-{
-  span_.set_name(name.data(), name.size());
-}
-
-void OtlpRecordable::SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept
-{
-  uint32_t all_flags = flags.flags() & opentelemetry::proto::trace::v1::SPAN_FLAGS_TRACE_FLAGS_MASK;
-
-  span_.set_flags(all_flags);
-}
-
-void OtlpRecordable::SetSpanKind(trace::SpanKind span_kind) noexcept
-{
-  proto::trace::v1::Span_SpanKind proto_span_kind =
-      proto::trace::v1::Span_SpanKind::Span_SpanKind_SPAN_KIND_UNSPECIFIED;
-
-  switch (span_kind)
-  {
-
-    case trace::SpanKind::kInternal:
-      proto_span_kind = proto::trace::v1::Span_SpanKind::Span_SpanKind_SPAN_KIND_INTERNAL;
-      break;
-
-    case trace::SpanKind::kServer:
-      proto_span_kind = proto::trace::v1::Span_SpanKind::Span_SpanKind_SPAN_KIND_SERVER;
-      break;
-
-    case trace::SpanKind::kClient:
-      proto_span_kind = proto::trace::v1::Span_SpanKind::Span_SpanKind_SPAN_KIND_CLIENT;
-      break;
-
-    case trace::SpanKind::kProducer:
-      proto_span_kind = proto::trace::v1::Span_SpanKind::Span_SpanKind_SPAN_KIND_PRODUCER;
-      break;
-
-    case trace::SpanKind::kConsumer:
-      proto_span_kind = proto::trace::v1::Span_SpanKind::Span_SpanKind_SPAN_KIND_CONSUMER;
-      break;
-
-    default:
-      // shouldn't reach here.
-      proto_span_kind = proto::trace::v1::Span_SpanKind::Span_SpanKind_SPAN_KIND_UNSPECIFIED;
-  }
-
-  span_.set_kind(proto_span_kind);
-}
-
-void OtlpRecordable::SetStartTime(common::SystemTimestamp start_time) noexcept
-{
-  span_.set_start_time_unix_nano(start_time.time_since_epoch().count());
-}
-
-void OtlpRecordable::SetDuration(std::chrono::nanoseconds duration) noexcept
-{
-  const uint64_t unix_end_time = span_.start_time_unix_nano() + duration.count();
-  span_.set_end_time_unix_nano(unix_end_time);
-}
-
-void OtlpRecordable::SetInstrumentationScope(
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-        &instrumentation_scope) noexcept
-{
-  instrumentation_scope_ = &instrumentation_scope;
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_recordable_utils.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_recordable_utils.cc
deleted file mode 100644
index b1f2ada40..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/src/otlp_recordable_utils.cc
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <cstddef>
-#include <list>
-#include <memory>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_populate_attribute_utils.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"  // IWYU pragma: keep
-#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/logs/v1/logs.pb.h"
-#include "opentelemetry/proto/resource/v1/resource.pb.h"
-#include "opentelemetry/proto/trace/v1/trace.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"  // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace
-{
-struct InstrumentationScopePointerHasher
-{
-  std::size_t operator()(const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-                             *instrumentation) const noexcept
-  {
-    return instrumentation->HashCode();
-  }
-};
-
-struct InstrumentationScopePointerEqual
-{
-  std::size_t operator()(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope *left,
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope *right) const noexcept
-  {
-    return *left == *right;
-  }
-};
-}  // namespace
-
-void OtlpRecordableUtils::PopulateRequest(
-    const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans,
-    proto::collector::trace::v1::ExportTraceServiceRequest *request) noexcept
-{
-  if (nullptr == request)
-  {
-    return;
-  }
-
-  using spans_by_scope =
-      std::unordered_map<const opentelemetry::sdk::instrumentationscope::InstrumentationScope *,
-                         std::vector<std::unique_ptr<OtlpRecordable>>>;
-  std::unordered_map<const opentelemetry::sdk::resource::Resource *, spans_by_scope> spans_index;
-
-  // Collect spans per resource and instrumentation scope
-  for (auto &recordable : spans)
-  {
-    auto rec = std::unique_ptr<OtlpRecordable>(static_cast<OtlpRecordable *>(recordable.release()));
-    auto resource        = rec->GetResource();
-    auto instrumentation = rec->GetInstrumentationScope();
-
-    spans_index[resource][instrumentation].emplace_back(std::move(rec));
-  }
-
-  // Add all resource spans
-  for (auto &input_resource_spans : spans_index)
-  {
-    // Add the resource
-    auto resource_spans = request->add_resource_spans();
-    if (input_resource_spans.first)
-    {
-      proto::resource::v1::Resource resource_proto;
-      OtlpPopulateAttributeUtils::PopulateAttribute(&resource_proto, *input_resource_spans.first);
-      *resource_spans->mutable_resource() = resource_proto;
-      resource_spans->set_schema_url(input_resource_spans.first->GetSchemaURL());
-    }
-
-    // Add all scope spans
-    for (auto &input_scope_spans : input_resource_spans.second)
-    {
-      // Add the instrumentation scope
-      auto scope_spans = resource_spans->add_scope_spans();
-      if (input_scope_spans.first)
-      {
-        proto::common::v1::InstrumentationScope instrumentation_scope_proto;
-        instrumentation_scope_proto.set_name(input_scope_spans.first->GetName());
-        instrumentation_scope_proto.set_version(input_scope_spans.first->GetVersion());
-        OtlpPopulateAttributeUtils::PopulateAttribute(&instrumentation_scope_proto,
-                                                      *input_scope_spans.first);
-
-        *scope_spans->mutable_scope() = instrumentation_scope_proto;
-        scope_spans->set_schema_url(input_scope_spans.first->GetSchemaURL());
-      }
-
-      // Add all spans to this scope spans
-      for (auto &input_span : input_scope_spans.second)
-      {
-        *scope_spans->add_spans() = std::move(input_span->span());
-      }
-    }
-  }
-}
-
-void OtlpRecordableUtils::PopulateRequest(
-    const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> &logs,
-    proto::collector::logs::v1::ExportLogsServiceRequest *request) noexcept
-{
-  if (nullptr == request)
-  {
-    return;
-  }
-
-  using logs_index_by_instrumentation_type =
-      std::unordered_map<const opentelemetry::sdk::instrumentationscope::InstrumentationScope *,
-                         std::list<std::unique_ptr<OtlpLogRecordable>>,
-                         InstrumentationScopePointerHasher, InstrumentationScopePointerEqual>;
-  std::unordered_map<const opentelemetry::sdk::resource::Resource *,
-                     logs_index_by_instrumentation_type>
-      logs_index_by_resource;
-
-  for (auto &recordable : logs)
-  {
-    auto rec =
-        std::unique_ptr<OtlpLogRecordable>(static_cast<OtlpLogRecordable *>(recordable.release()));
-    auto instrumentation = &rec->GetInstrumentationScope();
-    auto resource        = &rec->GetResource();
-
-    logs_index_by_resource[resource][instrumentation].emplace_back(std::move(rec));
-  }
-
-  for (auto &input_resource_log : logs_index_by_resource)
-  {
-    auto output_resource_log = request->add_resource_logs();
-    for (auto &input_scope_log : input_resource_log.second)
-    {
-      auto output_scope_log = output_resource_log->add_scope_logs();
-      for (auto &input_log_record : input_scope_log.second)
-      {
-        if (!output_resource_log->has_resource())
-        {
-          OtlpPopulateAttributeUtils::PopulateAttribute(output_resource_log->mutable_resource(),
-                                                        *input_resource_log.first);
-          output_resource_log->set_schema_url(input_resource_log.first->GetSchemaURL());
-        }
-
-        if (!output_scope_log->has_scope())
-        {
-          auto proto_scope = output_scope_log->mutable_scope();
-          if (proto_scope != nullptr)
-          {
-            proto_scope->set_name(input_scope_log.first->GetName());
-            proto_scope->set_version(input_scope_log.first->GetVersion());
-
-            OtlpPopulateAttributeUtils::PopulateAttribute(proto_scope, *input_scope_log.first);
-          }
-          output_scope_log->set_schema_url(input_scope_log.first->GetSchemaURL());
-        }
-
-        *output_scope_log->add_log_records() = std::move(input_log_record->log_record());
-      }
-    }
-  }
-}
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_client_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_client_test.cc
deleted file mode 100644
index 20ba905c4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_client_test.cc
+++ /dev/null
@@ -1,557 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <chrono>
-#include <cstdint>
-#include <ctime>
-#include <fstream>
-#include <functional>
-#include <iostream>
-#include <nlohmann/json.hpp>
-#include <sstream>
-#include <string>
-#include <thread>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-// IWYU pragma: no_include <features.h>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_runtime_options.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include <google/protobuf/message_lite.h>
-#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-#include "opentelemetry/proto/trace/v1/trace.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace resource = opentelemetry::sdk::resource;
-
-class ProtobufGlobalSymbolGuard
-{
-public:
-  ProtobufGlobalSymbolGuard() {}
-  ~ProtobufGlobalSymbolGuard() { google::protobuf::ShutdownProtobufLibrary(); }
-};
-
-static std::tm GetLocalTime(std::chrono::system_clock::time_point tp)
-{
-  std::time_t now = std::chrono::system_clock::to_time_t(tp);
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || defined(__STDC_LIB_EXT1__)
-  std::tm ret;
-  localtime_s(&now, &ret);
-#elif defined(_MSC_VER) && _MSC_VER >= 1300
-  std::tm ret;
-  localtime_s(&ret, &now);
-#elif defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
-    defined(_POSIX_SOURCE)
-  std::tm ret;
-  localtime_r(&now, &ret);
-#else
-  std::tm ret = *localtime(&now);
-#endif
-  return ret;
-}
-
-template <class T, size_t N>
-static nostd::span<T, N> MakeSpan(T (&array)[N])
-{
-  return nostd::span<T, N>(array);
-}
-
-static resource::Resource MakeResource()
-{
-  static ProtobufGlobalSymbolGuard global_symbol_guard;
-
-  resource::ResourceAttributes resource_attributes = {{"service.name", "unit_test_service"},
-                                                      {"tenant.id", "test_user"}};
-  resource_attributes["bool_value"]                = true;
-  resource_attributes["int32_value"]               = static_cast<int32_t>(1);
-  resource_attributes["uint32_value"]              = static_cast<uint32_t>(2);
-  resource_attributes["int64_value"]               = static_cast<int64_t>(0x1100000000LL);
-  resource_attributes["uint64_value"]              = static_cast<uint64_t>(0x1200000000ULL);
-  resource_attributes["double_value"]              = static_cast<double>(3.1);
-  resource_attributes["vec_bool_value"]            = std::vector<bool>{true, false, true};
-  resource_attributes["vec_int32_value"]           = std::vector<int32_t>{1, 2};
-  resource_attributes["vec_uint32_value"]          = std::vector<uint32_t>{3, 4};
-  resource_attributes["vec_int64_value"]           = std::vector<int64_t>{5, 6};
-  resource_attributes["vec_uint64_value"]          = std::vector<uint64_t>{7, 8};
-  resource_attributes["vec_double_value"]          = std::vector<double>{3.2, 3.3};
-  resource_attributes["vec_string_value"]          = std::vector<std::string>{"vector", "string"};
-
-  return resource::Resource::Create(resource_attributes);
-}
-
-static opentelemetry::nostd::unique_ptr<
-    opentelemetry::sdk::instrumentationscope::InstrumentationScope>
-MakeInstrumentationScope()
-{
-  return opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "otlp_file_client_test", "1.11.0", "https://opentelemetry.io/schemas/1.11.0");
-}
-
-static std::unique_ptr<opentelemetry::sdk::trace::Recordable> MakeRecordable(
-    const resource::Resource &resource,
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope)
-{
-  OtlpRecordable *recordable = new OtlpRecordable();
-  recordable->SetResource(resource);
-  recordable->SetInstrumentationScope(instrumentation_scope);
-
-  recordable->SetName("otlp_file_client_test_span");
-  recordable->SetSpanKind(opentelemetry::trace::SpanKind::kInternal);
-  recordable->SetAttribute("test-attribute-key", "test-attribute-value");
-  recordable->SetDuration(std::chrono::nanoseconds(1234567890));
-  recordable->SetStartTime(
-      opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
-  recordable->SetStatus(opentelemetry::trace::StatusCode::kOk, "success");
-
-  {
-    constexpr uint8_t trace_id_buf[]       = {1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8};
-    constexpr uint8_t span_id_buf[]        = {1, 2, 3, 4, 5, 6, 7, 8};
-    constexpr uint8_t parent_span_id_buf[] = {8, 7, 6, 5, 4, 3, 2, 1};
-    opentelemetry::trace::TraceId trace_id{trace_id_buf};
-    opentelemetry::trace::SpanId span_id{span_id_buf};
-    opentelemetry::trace::SpanId parent_span_id{parent_span_id_buf};
-    const auto trace_state = opentelemetry::trace::TraceState::GetDefault()->Set("key1", "value");
-    const opentelemetry::trace::SpanContext span_context{
-        trace_id, span_id,
-        opentelemetry::trace::TraceFlags{opentelemetry::trace::TraceFlags::kIsSampled}, true,
-        trace_state};
-
-    recordable->SetIdentity(span_context, parent_span_id);
-  }
-
-  return std::unique_ptr<opentelemetry::sdk::trace::Recordable>(recordable);
-}
-
-TEST(OtlpFileClientTest, Shutdown)
-{
-  opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request;
-  auto client = std::unique_ptr<opentelemetry::exporter::otlp::OtlpFileClient>(
-      new opentelemetry::exporter::otlp::OtlpFileClient(
-          opentelemetry::exporter::otlp::OtlpFileClientOptions(),
-          opentelemetry::exporter::otlp::OtlpFileClientRuntimeOptions()));
-  ASSERT_FALSE(client->IsShutdown());
-  ASSERT_TRUE(client->Shutdown());
-  ASSERT_TRUE(client->IsShutdown());
-
-  auto result = client->Export(request, 1);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-TEST(OtlpFileClientTest, ExportToOstreamTest)
-{
-  auto resource              = MakeResource();
-  auto instrumentation_scope = MakeInstrumentationScope();
-
-  std::unique_ptr<opentelemetry::sdk::trace::Recordable> recordable[] = {
-      MakeRecordable(resource, *instrumentation_scope)};
-
-  opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request;
-  OtlpRecordableUtils::PopulateRequest(MakeSpan(recordable), &request);
-
-  std::stringstream output_stream;
-
-  opentelemetry::exporter::otlp::OtlpFileClientOptions opts;
-  opentelemetry::exporter::otlp::OtlpFileClientRuntimeOptions rt_opts;
-  opts.backend_options = std::ref(output_stream);
-
-  auto client = std::unique_ptr<opentelemetry::exporter::otlp::OtlpFileClient>(
-      new opentelemetry::exporter::otlp::OtlpFileClient(std::move(opts), std::move(rt_opts)));
-  client->Export(request, 1);
-
-  {
-    auto check_json        = nlohmann::json::parse(output_stream.str(), nullptr, false);
-    auto resource_span     = *check_json["resourceSpans"].begin();
-    auto scope_span        = *resource_span["scopeSpans"].begin();
-    auto span              = *scope_span["spans"].begin();
-    auto received_trace_id = span["traceId"].get<std::string>();
-    EXPECT_EQ(received_trace_id, "01020304050607080102030405060708");
-
-    auto received_name = span["name"].get<std::string>();
-    EXPECT_EQ(received_name, request.resource_spans(0).scope_spans(0).spans(0).name());
-
-    auto receivec_attributes = span["attributes"];
-    int attribute_found      = 0;
-    for (auto iter = receivec_attributes.begin(); iter != receivec_attributes.end(); ++iter)
-    {
-      auto key = (*iter)["key"].get<std::string>();
-      if (key == "test-attribute-key")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "test-attribute-value");
-      }
-    }
-    EXPECT_EQ(attribute_found, 1);
-
-    auto receivec_resource_attributes = resource_span["resource"]["attributes"];
-    for (auto iter = receivec_resource_attributes.begin();
-         iter != receivec_resource_attributes.end(); ++iter)
-    {
-      auto key = (*iter)["key"].get<std::string>();
-      if (key == "service.name")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "unit_test_service");
-      }
-      else if (key == "tenant.id")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "test_user");
-      }
-      else if (key == "int32_value")
-      {
-        auto value = (*iter)["value"]["intValue"];
-        ++attribute_found;
-        if (value.is_number())
-        {
-          EXPECT_EQ(value.get<int32_t>(), 1);
-        }
-        else
-        {
-          EXPECT_EQ(value.get<std::string>(), "1");
-        }
-      }
-    }
-    EXPECT_EQ(attribute_found, 4);
-  }
-}
-
-TEST(OtlpFileClientTest, ExportToFileSystemRotateIndexTest)
-{
-  auto resource              = MakeResource();
-  auto instrumentation_scope = MakeInstrumentationScope();
-
-  std::unique_ptr<opentelemetry::sdk::trace::Recordable> recordable[] = {
-      MakeRecordable(resource, *instrumentation_scope)};
-
-  opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request;
-  OtlpRecordableUtils::PopulateRequest(MakeSpan(recordable), &request);
-
-  std::stringstream output_stream;
-
-  // Clear old files
-  {
-    std::fstream clear_file1("otlp_file_client_test_dir/trace-1.jsonl",
-                             std::ios::out | std::ios::trunc);
-    std::fstream clear_file2("otlp_file_client_test_dir/trace-2.jsonl",
-                             std::ios::out | std::ios::trunc);
-    std::fstream clear_file3("otlp_file_client_test_dir/trace-3.jsonl",
-                             std::ios::out | std::ios::trunc);
-    std::fstream clear_file4("otlp_file_client_test_dir/trace-latest.jsonl",
-                             std::ios::out | std::ios::trunc);
-  }
-
-  opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions backend_opts;
-  backend_opts.file_pattern  = "otlp_file_client_test_dir/trace-%n.jsonl";
-  backend_opts.alias_pattern = "otlp_file_client_test_dir/trace-latest.jsonl";
-  // Smaller than the size of one record, so it will rotate after each record.
-  backend_opts.file_size   = 1500;
-  backend_opts.rotate_size = 3;
-
-  opentelemetry::exporter::otlp::OtlpFileClientOptions opts;
-  opentelemetry::exporter::otlp::OtlpFileClientRuntimeOptions rt_opts;
-  opts.backend_options = backend_opts;
-
-  auto client = std::unique_ptr<opentelemetry::exporter::otlp::OtlpFileClient>(
-      new opentelemetry::exporter::otlp::OtlpFileClient(std::move(opts), std::move(rt_opts)));
-
-  // Write 5 records with rotatation index 1,2,3,1,2
-  for (int i = 0; i < 4; ++i)
-  {
-    client->Export(request, 1);
-  }
-  request.mutable_resource_spans(0)->set_schema_url("https://opentelemetry.io/schemas/1.12.0");
-  client->Export(request, 1);
-  client->ForceFlush();
-
-  std::unique_ptr<std::ifstream> input_file[5] = {
-      std::unique_ptr<std::ifstream>(
-          new std::ifstream("otlp_file_client_test_dir/trace-1.jsonl", std::ios::in)),
-      std::unique_ptr<std::ifstream>(
-          new std::ifstream("otlp_file_client_test_dir/trace-2.jsonl", std::ios::in)),
-      std::unique_ptr<std::ifstream>(
-          new std::ifstream("otlp_file_client_test_dir/trace-3.jsonl", std::ios::in)),
-      std::unique_ptr<std::ifstream>(
-          new std::ifstream("otlp_file_client_test_dir/trace-4.jsonl", std::ios::in)),
-      std::unique_ptr<std::ifstream>(
-          new std::ifstream("otlp_file_client_test_dir/trace-latest.jsonl", std::ios::in))};
-
-  EXPECT_TRUE(input_file[0]->is_open());
-  EXPECT_TRUE(input_file[1]->is_open());
-  EXPECT_TRUE(input_file[2]->is_open());
-  EXPECT_FALSE(input_file[3]->is_open());
-  EXPECT_TRUE(input_file[4]->is_open());
-
-  std::string jsonl[4];
-  std::getline(*input_file[0], jsonl[0]);
-  std::getline(*input_file[1], jsonl[1]);
-  std::getline(*input_file[2], jsonl[2]);
-  std::getline(*input_file[4], jsonl[3]);
-
-  EXPECT_EQ(jsonl[0], jsonl[2]);
-  EXPECT_EQ(jsonl[1], jsonl[3]);
-
-  {
-    auto check_json        = nlohmann::json::parse(jsonl[0], nullptr, false);
-    auto resource_span     = *check_json["resourceSpans"].begin();
-    auto scope_span        = *resource_span["scopeSpans"].begin();
-    auto span              = *scope_span["spans"].begin();
-    auto received_trace_id = span["traceId"].get<std::string>();
-    EXPECT_EQ(received_trace_id, "01020304050607080102030405060708");
-
-    auto received_name = span["name"].get<std::string>();
-    EXPECT_EQ(received_name, request.resource_spans(0).scope_spans(0).spans(0).name());
-
-    auto receivec_attributes = span["attributes"];
-    int attribute_found      = 0;
-    for (auto iter = receivec_attributes.begin(); iter != receivec_attributes.end(); ++iter)
-    {
-      auto key = (*iter)["key"].get<std::string>();
-      if (key == "test-attribute-key")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "test-attribute-value");
-      }
-    }
-    EXPECT_EQ(attribute_found, 1);
-
-    auto receivec_resource_attributes = resource_span["resource"]["attributes"];
-    for (auto iter = receivec_resource_attributes.begin();
-         iter != receivec_resource_attributes.end(); ++iter)
-    {
-      auto key = (*iter)["key"].get<std::string>();
-      if (key == "service.name")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "unit_test_service");
-      }
-      else if (key == "tenant.id")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "test_user");
-      }
-      else if (key == "int32_value")
-      {
-        auto value = (*iter)["value"]["intValue"];
-        ++attribute_found;
-        if (value.is_number())
-        {
-          EXPECT_EQ(value.get<int32_t>(), 1);
-        }
-        else
-        {
-          EXPECT_EQ(value.get<std::string>(), "1");
-        }
-      }
-    }
-    EXPECT_EQ(attribute_found, 4);
-  }
-}
-
-TEST(OtlpFileClientTest, ExportToFileSystemRotateByTimeTest)
-{
-  auto resource              = MakeResource();
-  auto instrumentation_scope = MakeInstrumentationScope();
-
-  std::unique_ptr<opentelemetry::sdk::trace::Recordable> recordable[] = {
-      MakeRecordable(resource, *instrumentation_scope)};
-
-  opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request;
-  OtlpRecordableUtils::PopulateRequest(MakeSpan(recordable), &request);
-
-  std::stringstream output_stream;
-
-  opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions backend_opts;
-  backend_opts.file_pattern  = "otlp_file_client_test_dir/trace-%Y-%m-%d-%H-%M-%S.jsonl";
-  backend_opts.alias_pattern = "";
-  // Smaller than the size of one record, so it will rotate after each record.
-  backend_opts.file_size = 1500;
-
-  opentelemetry::exporter::otlp::OtlpFileClientOptions opts;
-  opentelemetry::exporter::otlp::OtlpFileClientRuntimeOptions rt_opts;
-  opts.backend_options = backend_opts;
-
-  auto client = std::unique_ptr<opentelemetry::exporter::otlp::OtlpFileClient>(
-      new opentelemetry::exporter::otlp::OtlpFileClient(std::move(opts), std::move(rt_opts)));
-
-  auto start_time = std::chrono::system_clock::now();
-  client->Export(request, 1);
-  std::this_thread::sleep_for(std::chrono::seconds{1});
-  client->Export(request, 1);
-  client->ForceFlush();
-
-  std::unique_ptr<std::ifstream> input_file[2];
-  std::size_t found_file_index = 0;
-  // Try to load the file in 5s, it should finished.
-  for (int i = 0; i < 5; ++i)
-  {
-    char file_path_buf[256] = {0};
-    std::tm local_tm        = GetLocalTime(start_time);
-    std::strftime(file_path_buf, sizeof(file_path_buf) - 1,
-                  "otlp_file_client_test_dir/trace-%Y-%m-%d-%H-%M-%S.jsonl", &local_tm);
-    start_time += std::chrono::seconds{1};
-
-    input_file[found_file_index] =
-        std::unique_ptr<std::ifstream>(new std::ifstream(file_path_buf, std::ios::in));
-    if (input_file[found_file_index]->is_open())
-    {
-      ++found_file_index;
-    }
-    if (found_file_index >= 2)
-    {
-      break;
-    }
-  }
-
-  ASSERT_EQ(found_file_index, 2);
-
-  std::string jsonl[2];
-  std::getline(*input_file[0], jsonl[0]);
-  std::getline(*input_file[1], jsonl[1]);
-
-  EXPECT_EQ(jsonl[0], jsonl[1]);
-
-  {
-    auto check_json        = nlohmann::json::parse(jsonl[0], nullptr, false);
-    auto resource_span     = *check_json["resourceSpans"].begin();
-    auto scope_span        = *resource_span["scopeSpans"].begin();
-    auto span              = *scope_span["spans"].begin();
-    auto received_trace_id = span["traceId"].get<std::string>();
-    EXPECT_EQ(received_trace_id, "01020304050607080102030405060708");
-
-    auto received_name = span["name"].get<std::string>();
-    EXPECT_EQ(received_name, request.resource_spans(0).scope_spans(0).spans(0).name());
-
-    auto receivec_attributes = span["attributes"];
-    int attribute_found      = 0;
-    for (auto iter = receivec_attributes.begin(); iter != receivec_attributes.end(); ++iter)
-    {
-      auto key = (*iter)["key"].get<std::string>();
-      if (key == "test-attribute-key")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "test-attribute-value");
-      }
-    }
-    EXPECT_EQ(attribute_found, 1);
-
-    auto receivec_resource_attributes = resource_span["resource"]["attributes"];
-    for (auto iter = receivec_resource_attributes.begin();
-         iter != receivec_resource_attributes.end(); ++iter)
-    {
-      auto key = (*iter)["key"].get<std::string>();
-      if (key == "service.name")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "unit_test_service");
-      }
-      else if (key == "tenant.id")
-      {
-        auto value = (*iter)["value"]["stringValue"];
-        ++attribute_found;
-        EXPECT_EQ(value.get<std::string>(), "test_user");
-      }
-      else if (key == "int32_value")
-      {
-        auto value = (*iter)["value"]["intValue"];
-        ++attribute_found;
-        if (value.is_number())
-        {
-          EXPECT_EQ(value.get<int32_t>(), 1);
-        }
-        else
-        {
-          EXPECT_EQ(value.get<std::string>(), "1");
-        }
-      }
-    }
-    EXPECT_EQ(attribute_found, 4);
-  }
-}
-
-// Test client configuration options
-TEST(OtlpFileClientTest, ConfigTest)
-{
-  {
-    opentelemetry::exporter::otlp::OtlpFileClientOptions opts;
-    opentelemetry::exporter::otlp::OtlpFileClientRuntimeOptions rt_opts;
-    opts.console_debug   = true;
-    opts.backend_options = std::ref(std::cout);
-
-    auto client = std::unique_ptr<opentelemetry::exporter::otlp::OtlpFileClient>(
-        new opentelemetry::exporter::otlp::OtlpFileClient(std::move(opts), std::move(rt_opts)));
-
-    ASSERT_TRUE(client->GetOptions().console_debug);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::reference_wrapper<std::ostream>>(
-        client->GetOptions().backend_options));
-  }
-
-  {
-    opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions backend_opts;
-    backend_opts.file_pattern = "test_file_pattern.jsonl";
-
-    opentelemetry::exporter::otlp::OtlpFileClientOptions opts;
-    opentelemetry::exporter::otlp::OtlpFileClientRuntimeOptions rt_opts;
-    opts.console_debug   = false;
-    opts.backend_options = backend_opts;
-
-    auto client = std::unique_ptr<opentelemetry::exporter::otlp::OtlpFileClient>(
-        new opentelemetry::exporter::otlp::OtlpFileClient(std::move(opts), std::move(rt_opts)));
-
-    ASSERT_FALSE(client->GetOptions().console_debug);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<
-                opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions>(
-        client->GetOptions().backend_options));
-
-    EXPECT_EQ(
-        opentelemetry::nostd::get<opentelemetry::exporter::otlp::OtlpFileClientFileSystemOptions>(
-            client->GetOptions().backend_options)
-            .file_pattern,
-        "test_file_pattern.jsonl");
-  }
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_exporter_factory_test.cc
deleted file mode 100644
index 1aab3ebba..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_exporter_factory_test.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-/*
-  Make sure OtlpFileExporterFactory does not require,
-  even indirectly, nlohmann/json headers.
-*/
-#ifdef NLOHMANN_JSON_VERSION_MAJOR
-#  error "nlohmann/json should not be included"
-#endif /* NLOHMANN_JSON_VERSION_MAJOR */
-
-/*
-  Make sure OtlpFileExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpFileExporterFactoryTest, BuildTest)
-{
-  OtlpFileExporterOptions opts;
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter =
-      OtlpFileExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_exporter_test.cc
deleted file mode 100644
index d0c530f55..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_exporter_test.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <chrono>
-#include <cstdint>
-#include <functional>
-#include <nlohmann/json.hpp>
-#include <sstream>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_exporter_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/batch_span_processor.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/message_lite.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace trace_api = opentelemetry::trace;
-namespace resource  = opentelemetry::sdk::resource;
-
-class ProtobufGlobalSymbolGuard
-{
-public:
-  ProtobufGlobalSymbolGuard() {}
-  ~ProtobufGlobalSymbolGuard() { google::protobuf::ShutdownProtobufLibrary(); }
-};
-
-template <class T, size_t N>
-static nostd::span<T, N> MakeSpan(T (&array)[N])
-{
-  return nostd::span<T, N>(array);
-}
-
-class OtlpFileExporterTestPeer : public ::testing::Test
-{
-public:
-  void ExportJsonIntegrationTest()
-  {
-    static ProtobufGlobalSymbolGuard global_symbol_guard;
-
-    std::stringstream output;
-    OtlpFileExporterOptions opts;
-    opts.backend_options = std::ref(output);
-
-    auto exporter = OtlpFileExporterFactory::Create(opts);
-
-    resource::ResourceAttributes resource_attributes = {{"service.name", "unit_test_service"},
-                                                        {"tenant.id", "test_user"}};
-    resource_attributes["bool_value"]                = true;
-    resource_attributes["int32_value"]               = static_cast<int32_t>(1);
-    resource_attributes["uint32_value"]              = static_cast<uint32_t>(2);
-    resource_attributes["int64_value"]               = static_cast<int64_t>(0x1100000000LL);
-    resource_attributes["uint64_value"]              = static_cast<uint64_t>(0x1200000000ULL);
-    resource_attributes["double_value"]              = static_cast<double>(3.1);
-    resource_attributes["vec_bool_value"]            = std::vector<bool>{true, false, true};
-    resource_attributes["vec_int32_value"]           = std::vector<int32_t>{1, 2};
-    resource_attributes["vec_uint32_value"]          = std::vector<uint32_t>{3, 4};
-    resource_attributes["vec_int64_value"]           = std::vector<int64_t>{5, 6};
-    resource_attributes["vec_uint64_value"]          = std::vector<uint64_t>{7, 8};
-    resource_attributes["vec_double_value"]          = std::vector<double>{3.2, 3.3};
-    resource_attributes["vec_string_value"]          = std::vector<std::string>{"vector", "string"};
-    auto resource = resource::Resource::Create(resource_attributes, "resource_url");
-
-    auto processor_opts                  = sdk::trace::BatchSpanProcessorOptions();
-    processor_opts.max_export_batch_size = 5;
-    processor_opts.max_queue_size        = 5;
-    processor_opts.schedule_delay_millis = std::chrono::milliseconds(256);
-
-    auto processor = std::unique_ptr<sdk::trace::SpanProcessor>(
-        new sdk::trace::BatchSpanProcessor(std::move(exporter), processor_opts));
-    auto provider = nostd::shared_ptr<sdk::trace::TracerProvider>(
-        new sdk::trace::TracerProvider(std::move(processor), resource));
-
-    std::string report_trace_id;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    std::unordered_map<std::string, common::AttributeValue> scope_attributes;
-    scope_attributes["scope_key"] = common::AttributeValue("scope_value");
-    auto tracer = provider->GetTracer("scope_name", "scope_version", "scope_url", scope_attributes);
-#else
-    auto tracer = provider->GetTracer("scope_name", "scope_version", "scope_url");
-#endif
-
-    auto parent_span = tracer->StartSpan("Test parent span");
-
-    char trace_id_hex[2 * trace_api::TraceId::kSize] = {0};
-
-    trace_api::StartSpanOptions child_span_opts = {};
-    child_span_opts.parent                      = parent_span->GetContext();
-
-    auto child_span = tracer->StartSpan("Test child span", child_span_opts);
-
-    nostd::get<trace_api::SpanContext>(child_span_opts.parent)
-        .trace_id()
-        .ToLowerBase16(MakeSpan(trace_id_hex));
-    report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex));
-
-    child_span->End();
-    parent_span->End();
-
-    provider->ForceFlush();
-
-    output.flush();
-    output.sync();
-    auto check_json_text = output.str();
-    if (!check_json_text.empty())
-    {
-      // If the exporting is splited to two standalone resource_span, just checking the first one.
-      std::string::size_type eol = check_json_text.find('\n');
-      if (eol != std::string::npos)
-      {
-        check_json_text = check_json_text.substr(0, eol);
-      }
-      auto check_json = nlohmann::json::parse(check_json_text, nullptr, false);
-      if (!check_json.is_discarded())
-      {
-        auto resource_span = *check_json["resourceSpans"].begin();
-        auto scope_span    = *resource_span["scopeSpans"].begin();
-        auto scope         = scope_span["scope"];
-        auto span          = *scope_span["spans"].begin();
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-        ASSERT_EQ(1, scope["attributes"].size());
-        const auto scope_attribute = scope["attributes"].front();
-        EXPECT_EQ("scope_key", scope_attribute["key"].get<std::string>());
-        EXPECT_EQ("scope_value", scope_attribute["value"]["stringValue"].get<std::string>());
-#endif
-        EXPECT_EQ("resource_url", resource_span["schemaUrl"].get<std::string>());
-        EXPECT_EQ("scope_url", scope_span["schemaUrl"].get<std::string>());
-        EXPECT_EQ("scope_name", scope["name"].get<std::string>());
-        EXPECT_EQ("scope_version", scope["version"].get<std::string>());
-        EXPECT_EQ(report_trace_id, span["traceId"].get<std::string>());
-      }
-      else
-      {
-        FAIL() << "Failed to parse json:" << check_json_text;
-      }
-    }
-  }
-};
-
-TEST(OtlpFileExporterTest, Shutdown)
-{
-  auto exporter = std::unique_ptr<opentelemetry::sdk::trace::SpanExporter>(new OtlpFileExporter());
-  ASSERT_TRUE(exporter->Shutdown());
-
-  nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> spans = {};
-
-  auto result = exporter->Export(spans);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-// Create spans, let processor call Export()
-TEST_F(OtlpFileExporterTestPeer, ExportJsonIntegrationTestSync)
-{
-  ExportJsonIntegrationTest();
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_log_record_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_log_record_exporter_factory_test.cc
deleted file mode 100644
index 927e76382..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_log_record_exporter_factory_test.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/version.h"
-
-/*
-  Make sure OtlpFileExporterFactory does not require,
-  even indirectly, nlohmann/json headers.
-*/
-#ifdef NLOHMANN_JSON_VERSION_MAJOR
-#  error "nlohmann/json should not be included"
-#endif /* NLOHMANN_JSON_VERSION_MAJOR */
-
-/*
-  Make sure OtlpFileExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpFileLogRecordExporterFactoryTest, BuildTest)
-{
-  OtlpFileLogRecordExporterOptions opts;
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter =
-      OtlpFileLogRecordExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_log_record_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_log_record_exporter_test.cc
deleted file mode 100644
index 67cc24d25..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_log_record_exporter_test.cc
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <chrono>
-#include <functional>
-#include <nlohmann/json.hpp>
-#include <sstream>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include <google/protobuf/message_lite.h>
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class ProtobufGlobalSymbolGuard
-{
-public:
-  ProtobufGlobalSymbolGuard() {}
-  ~ProtobufGlobalSymbolGuard() { google::protobuf::ShutdownProtobufLibrary(); }
-};
-
-template <class T, size_t N>
-static nostd::span<T, N> MakeSpan(T (&array)[N])
-{
-  return nostd::span<T, N>(array);
-}
-
-class OtlpFileLogRecordExporterTestPeer : public ::testing::Test
-{
-public:
-  void ExportJsonIntegrationTest()
-  {
-    static ProtobufGlobalSymbolGuard global_symbol_guard;
-
-    std::stringstream output;
-    OtlpFileLogRecordExporterOptions opts;
-    opts.backend_options = std::ref(output);
-
-    auto exporter = OtlpFileLogRecordExporterFactory::Create(opts);
-
-    bool attribute_storage_bool_value[]                                = {true, false, true};
-    int32_t attribute_storage_int32_value[]                            = {1, 2};
-    uint32_t attribute_storage_uint32_value[]                          = {3, 4};
-    int64_t attribute_storage_int64_value[]                            = {5, 6};
-    uint64_t attribute_storage_uint64_value[]                          = {7, 8};
-    double attribute_storage_double_value[]                            = {3.2, 3.3};
-    opentelemetry::nostd::string_view attribute_storage_string_value[] = {"vector", "string"};
-
-    auto provider = nostd::shared_ptr<sdk::logs::LoggerProvider>(new sdk::logs::LoggerProvider());
-
-    provider->AddProcessor(
-        std::unique_ptr<sdk::logs::LogRecordProcessor>(new sdk::logs::BatchLogRecordProcessor(
-            std::move(exporter), 5, std::chrono::milliseconds(256), 5)));
-
-    std::string report_trace_id;
-    std::string report_span_id;
-    uint8_t trace_id_bin[opentelemetry::trace::TraceId::kSize] = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-    char trace_id_hex[2 * opentelemetry::trace::TraceId::kSize] = {0};
-    opentelemetry::trace::TraceId trace_id{trace_id_bin};
-    uint8_t span_id_bin[opentelemetry::trace::SpanId::kSize] = {
-        // Fix clang-format 10 has different behavior for this line
-        '7', '6', '5', '4', '3', '2', '1', '0'};
-    char span_id_hex[2 * opentelemetry::trace::SpanId::kSize] = {0};
-    opentelemetry::trace::SpanId span_id{span_id_bin};
-
-    const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-    auto logger = provider->GetLogger("test", "opentelelemtry_library", "", schema_url,
-                                      {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-
-    trace_id.ToLowerBase16(MakeSpan(trace_id_hex));
-    report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex));
-
-    span_id.ToLowerBase16(MakeSpan(span_id_hex));
-    report_span_id.assign(span_id_hex, sizeof(span_id_hex));
-    logger->EmitLogRecord(
-        opentelemetry::logs::Severity::kInfo, "Log message",
-        opentelemetry::common::MakeAttributes(
-            {{"service.name", "unit_test_service"},
-             {"tenant.id", "test_user"},
-             {"bool_value", true},
-             {"int32_value", static_cast<int32_t>(1)},
-             {"uint32_value", static_cast<uint32_t>(2)},
-             {"int64_value", static_cast<int64_t>(0x1100000000LL)},
-             {"uint64_value", static_cast<uint64_t>(0x1200000000ULL)},
-             {"double_value", static_cast<double>(3.1)},
-             {"vec_bool_value", attribute_storage_bool_value},
-             {"vec_int32_value", attribute_storage_int32_value},
-             {"vec_uint32_value", attribute_storage_uint32_value},
-             {"vec_int64_value", attribute_storage_int64_value},
-             {"vec_uint64_value", attribute_storage_uint64_value},
-             {"vec_double_value", attribute_storage_double_value},
-             {"vec_string_value", attribute_storage_string_value}}),
-        trace_id, span_id,
-        opentelemetry::trace::TraceFlags{opentelemetry::trace::TraceFlags::kIsSampled},
-        std::chrono::system_clock::now());
-
-    provider->ForceFlush();
-
-    output.flush();
-    output.sync();
-    auto check_json_text = output.str();
-    if (!check_json_text.empty())
-    {
-      auto check_json        = nlohmann::json::parse(check_json_text, nullptr, false);
-      auto resource_logs     = *check_json["resourceLogs"].begin();
-      auto scope_logs        = *resource_logs["scopeLogs"].begin();
-      auto scope             = scope_logs["scope"];
-      auto log               = *scope_logs["logRecords"].begin();
-      auto received_trace_id = log["traceId"].get<std::string>();
-      auto received_span_id  = log["spanId"].get<std::string>();
-      EXPECT_EQ(received_trace_id, report_trace_id);
-      EXPECT_EQ(received_span_id, report_span_id);
-      EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
-      EXPECT_LE(15, log["attributes"].size());
-
-      bool check_scope_attribute = false;
-      auto scope_attributes      = scope["attributes"];
-      for (auto &attribute : scope_attributes)
-      {
-        if (!attribute.is_object())
-        {
-          continue;
-        }
-        if ("scope_key1" == attribute["key"])
-        {
-          check_scope_attribute = true;
-          EXPECT_EQ("scope_value", attribute["value"]["stringValue"].get<std::string>());
-        }
-      }
-      ASSERT_TRUE(check_scope_attribute);
-    }
-  }
-};
-
-TEST(OtlpFileLogRecordExporterTest, Shutdown)
-{
-  auto exporter =
-      std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>(new OtlpFileLogRecordExporter());
-  ASSERT_TRUE(exporter->Shutdown());
-
-  nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> logs = {};
-
-  auto result = exporter->Export(logs);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-// Create log records, let processor call Export()
-TEST_F(OtlpFileLogRecordExporterTestPeer, ExportJsonIntegrationTestSync)
-{
-  ExportJsonIntegrationTest();
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_metric_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_metric_exporter_factory_test.cc
deleted file mode 100644
index 78e3bf366..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_metric_exporter_factory_test.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-/*
-  Make sure OtlpFileExporterFactory does not require,
-  even indirectly, nlohmann/json headers.
-*/
-#ifdef NLOHMANN_JSON_VERSION_MAJOR
-#  error "nlohmann/json should not be included"
-#endif /* NLOHMANN_JSON_VERSION_MAJOR */
-
-/*
-  Make sure OtlpFileExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpFileMetricExporterFactory, BuildTest)
-{
-  OtlpFileMetricExporterOptions opts;
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter =
-      OtlpFileMetricExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_metric_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_metric_exporter_test.cc
deleted file mode 100644
index 76d1db7e5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_file_metric_exporter_test.cc
+++ /dev/null
@@ -1,416 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstdint>
-#include <cstdlib>
-#include <functional>
-#include <nlohmann/json.hpp>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_file_client_options.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "google/protobuf/message_lite.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class ProtobufGlobalSymbolGuard
-{
-public:
-  ProtobufGlobalSymbolGuard() {}
-  ~ProtobufGlobalSymbolGuard() { google::protobuf::ShutdownProtobufLibrary(); }
-};
-
-template <class IntegerType>
-static IntegerType JsonToInteger(nlohmann::json value)
-{
-  if (value.is_string())
-  {
-    return static_cast<IntegerType>(strtol(value.get<std::string>().c_str(), nullptr, 10));
-  }
-
-  return value.get<IntegerType>();
-}
-
-class OtlpFileMetricExporterTestPeer : public ::testing::Test
-{
-public:
-  // Get the options associated with the given exporter.
-  const OtlpFileMetricExporterOptions &GetOptions(std::unique_ptr<OtlpFileMetricExporter> &exporter)
-  {
-    return exporter->options_;
-  }
-
-  void ExportJsonIntegrationTestExportSumPointData()
-  {
-    static ProtobufGlobalSymbolGuard global_symbol_guard;
-
-    std::stringstream output;
-    OtlpFileMetricExporterOptions opts;
-    opts.backend_options = std::ref(output);
-
-    auto exporter = OtlpFileMetricExporterFactory::Create(opts);
-
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
-    sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
-    sum_point_data2.value_ = 20.0;
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{}, "resource_url");
-    data.resource_ = &resource;
-
-    auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0", "scope_url", {{"scope_key", "scope_value"}});
-
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kCounter,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, sum_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, sum_point_data2}}};
-
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-
-    output.flush();
-    output.sync();
-    auto check_json_text = output.str();
-
-    if (!check_json_text.empty())
-    {
-      auto check_json = nlohmann::json::parse(check_json_text, nullptr, false);
-
-      auto resource_metrics = *check_json["resourceMetrics"].begin();
-      auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-      auto scope            = scope_metrics["scope"];
-
-      EXPECT_EQ("resource_url", resource_metrics["schemaUrl"].get<std::string>());
-      EXPECT_EQ("library_name", scope["name"].get<std::string>());
-      EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-      EXPECT_EQ("scope_url", scope_metrics["schemaUrl"].get<std::string>());
-      ASSERT_EQ(1, scope["attributes"].size());
-      const auto scope_attribute = scope["attributes"].front();
-      EXPECT_EQ("scope_key", scope_attribute["key"].get<std::string>());
-      EXPECT_EQ("scope_value", scope_attribute["value"]["stringValue"].get<std::string>());
-
-      auto metric = *scope_metrics["metrics"].begin();
-      EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-      EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-      EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-      auto data_points = metric["sum"]["dataPoints"];
-      EXPECT_EQ(10.0, data_points[0]["asDouble"].get<double>());
-      EXPECT_EQ(20.0, data_points[1]["asDouble"].get<double>());
-    }
-  }
-
-  void ExportJsonIntegrationTestExportLastValuePointData()
-  {
-    std::stringstream output;
-    OtlpFileMetricExporterOptions opts;
-    opts.backend_options = std::ref(output);
-
-    auto exporter = OtlpFileMetricExporterFactory::Create(opts);
-
-    opentelemetry::sdk::metrics::LastValuePointData last_value_point_data{};
-    last_value_point_data.value_              = 10.0;
-    last_value_point_data.is_lastvalue_valid_ = true;
-    last_value_point_data.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    opentelemetry::sdk::metrics::LastValuePointData last_value_point_data2{};
-    last_value_point_data2.value_              = static_cast<int64_t>(20);
-    last_value_point_data2.is_lastvalue_valid_ = true;
-    last_value_point_data2.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kObservableGauge,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, last_value_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, last_value_point_data2}}};
-
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{});
-    data.resource_ = &resource;
-    auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0");
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-
-    output.flush();
-    output.sync();
-    auto check_json_text = output.str();
-    if (!check_json_text.empty())
-    {
-      auto check_json = nlohmann::json::parse(check_json_text, nullptr, false);
-
-      auto resource_metrics = *check_json["resourceMetrics"].begin();
-      auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-      auto scope            = scope_metrics["scope"];
-      EXPECT_EQ("library_name", scope["name"].get<std::string>());
-      EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-
-      auto metric = *scope_metrics["metrics"].begin();
-      EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-      EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-      EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-      auto data_points = metric["gauge"]["dataPoints"];
-      EXPECT_EQ(10.0, data_points[0]["asDouble"].get<double>());
-      EXPECT_EQ(20l, JsonToInteger<int64_t>(data_points[1]["asInt"]));
-    }
-  }
-
-  void ExportJsonIntegrationTestExportHistogramPointData()
-  {
-    std::stringstream output;
-    OtlpFileMetricExporterOptions opts;
-    opts.backend_options = std::ref(output);
-
-    auto exporter = OtlpFileMetricExporterFactory::Create(opts);
-
-    opentelemetry::sdk::metrics::HistogramPointData histogram_point_data{};
-    histogram_point_data.boundaries_ = {10.1, 20.2, 30.2};
-    histogram_point_data.count_      = 3;
-    histogram_point_data.counts_     = {200, 300, 400, 500};
-    histogram_point_data.sum_        = 900.5;
-    histogram_point_data.min_        = 1.8;
-    histogram_point_data.max_        = 19.0;
-    opentelemetry::sdk::metrics::HistogramPointData histogram_point_data2{};
-    histogram_point_data2.boundaries_ = {10.0, 20.0, 30.0};
-    histogram_point_data2.count_      = 3;
-    histogram_point_data2.counts_     = {200, 300, 400, 500};
-    histogram_point_data2.sum_        = static_cast<int64_t>(900);
-
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kHistogram,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, histogram_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, histogram_point_data2}}};
-
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{});
-    data.resource_ = &resource;
-    auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0");
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-
-    output.flush();
-    output.sync();
-    auto check_json_text = output.str();
-    if (!check_json_text.empty())
-    {
-      auto check_json = nlohmann::json::parse(check_json_text, nullptr, false);
-
-      auto resource_metrics = *check_json["resourceMetrics"].begin();
-      auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-      auto scope            = scope_metrics["scope"];
-      EXPECT_EQ("library_name", scope["name"].get<std::string>());
-      EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-
-      auto metric = *scope_metrics["metrics"].begin();
-      EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-      EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-      EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-      auto data_points = metric["histogram"]["dataPoints"];
-      EXPECT_EQ(3, JsonToInteger<int64_t>(data_points[0]["count"]));
-      EXPECT_EQ(900.5, data_points[0]["sum"].get<double>());
-      EXPECT_EQ(1.8, data_points[0]["min"].get<double>());
-      EXPECT_EQ(19, data_points[0]["max"].get<double>());
-      EXPECT_EQ(4, data_points[0]["bucketCounts"].size());
-      if (4 == data_points[0]["bucketCounts"].size())
-      {
-        EXPECT_EQ(200, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][0]));
-        EXPECT_EQ(300, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][1]));
-        EXPECT_EQ(400, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][2]));
-        EXPECT_EQ(500, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][3]));
-      }
-      EXPECT_EQ(3, data_points[0]["explicitBounds"].size());
-      if (3 == data_points[0]["explicitBounds"].size())
-      {
-        EXPECT_EQ(10.1, data_points[0]["explicitBounds"][0].get<double>());
-        EXPECT_EQ(20.2, data_points[0]["explicitBounds"][1].get<double>());
-        EXPECT_EQ(30.2, data_points[0]["explicitBounds"][2].get<double>());
-      }
-
-      EXPECT_EQ(3, JsonToInteger<int64_t>(data_points[1]["count"]));
-      EXPECT_EQ(900.0, data_points[1]["sum"].get<double>());
-      EXPECT_EQ(4, data_points[1]["bucketCounts"].size());
-      if (4 == data_points[1]["bucketCounts"].size())
-      {
-        EXPECT_EQ(200, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][0]));
-        EXPECT_EQ(300, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][1]));
-        EXPECT_EQ(400, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][2]));
-        EXPECT_EQ(500, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][3]));
-      }
-      EXPECT_EQ(3, data_points[1]["explicitBounds"].size());
-      if (3 == data_points[1]["explicitBounds"].size())
-      {
-        EXPECT_EQ(10.0, data_points[1]["explicitBounds"][0].get<double>());
-        EXPECT_EQ(20.0, data_points[1]["explicitBounds"][1].get<double>());
-        EXPECT_EQ(30.0, data_points[1]["explicitBounds"][2].get<double>());
-      }
-    }
-  }
-};
-
-TEST(OtlpFileMetricExporterTest, Shutdown)
-{
-  auto exporter = std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>(
-      new OtlpFileMetricExporter());
-  ASSERT_TRUE(exporter->Shutdown());
-  auto result = exporter->Export(opentelemetry::sdk::metrics::ResourceMetrics{});
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-TEST_F(OtlpFileMetricExporterTestPeer, ExportJsonIntegrationTestSumPointDataSync)
-{
-  ExportJsonIntegrationTestExportSumPointData();
-}
-
-TEST_F(OtlpFileMetricExporterTestPeer, ExportJsonIntegrationTestLastValuePointDataSync)
-{
-  ExportJsonIntegrationTestExportLastValuePointData();
-}
-
-TEST_F(OtlpFileMetricExporterTestPeer, ExportJsonIntegrationTestHistogramPointDataSync)
-{
-  ExportJsonIntegrationTestExportHistogramPointData();
-}
-
-// Test Preferred aggregtion temporality selection
-TEST_F(OtlpFileMetricExporterTestPeer, PreferredAggergationTemporality)
-{
-  // Cummulative aggregation selector : use cummulative aggregation for all instruments.
-  std::unique_ptr<OtlpFileMetricExporter> exporter(new OtlpFileMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).aggregation_temporality,
-            PreferredAggregationTemporality::kCumulative);
-  auto cumm_selector =
-      OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter).aggregation_temporality);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-
-  // LowMemory aggregation selector use:
-  //   - cummulative aggregtion for Counter and Histogram
-  //   - delta aggregation for up-down counter, observable counter, observable gauge, observable
-  //   up-down counter
-  OtlpFileMetricExporterOptions opts2;
-  opts2.aggregation_temporality = PreferredAggregationTemporality::kLowMemory;
-  std::unique_ptr<OtlpFileMetricExporter> exporter2(new OtlpFileMetricExporter(opts2));
-  EXPECT_EQ(GetOptions(exporter2).aggregation_temporality,
-            PreferredAggregationTemporality::kLowMemory);
-  auto lowmemory_selector =
-      OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter2).aggregation_temporality);
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(
-      lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
-      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-
-  // Delta aggregation selector use:
-  //   - delta aggregtion for Counter, Histogram, Observable Counter, Observable Gauge
-  //   - cummulative aggregation for up-down counter, observable up-down counter
-  OtlpFileMetricExporterOptions opts3;
-  opts3.aggregation_temporality = PreferredAggregationTemporality::kDelta;
-  std::unique_ptr<OtlpFileMetricExporter> exporter3(new OtlpFileMetricExporter(opts3));
-  EXPECT_EQ(GetOptions(exporter3).aggregation_temporality, PreferredAggregationTemporality::kDelta);
-  auto delta_selector =
-      OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter3).aggregation_temporality);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_benchmark.cc
deleted file mode 100644
index 53ea48800..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_benchmark.cc
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
-
-#include <benchmark/benchmark.h>
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/trace/provider.h"
-
-#ifdef BAZEL_BUILD
-#  include "examples/common/foo_library/foo_library.h"
-#else
-#  include "foo_library/foo_library.h"
-#endif
-
-namespace trace     = opentelemetry::trace;
-namespace nostd     = opentelemetry::nostd;
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace otlp      = opentelemetry::exporter::otlp;
-
-#include <benchmark/benchmark.h>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace trace_api = opentelemetry::trace;
-
-const int kBatchSize     = 200;
-const int kNumAttributes = 5;
-const int kNumIterations = 1000;
-
-const trace::TraceId kTraceId(std::array<const uint8_t, trace::TraceId::kSize>(
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}));
-const trace::SpanId kSpanId(std::array<const uint8_t, trace::SpanId::kSize>({0, 0, 0, 0, 0, 0, 0,
-                                                                             2}));
-const trace::SpanId kParentSpanId(std::array<const uint8_t, trace::SpanId::kSize>({0, 0, 0, 0, 0, 0,
-                                                                                   0, 3}));
-const auto kTraceState = trace_api::TraceState::GetDefault()->Set("key1", "value");
-const trace_api::SpanContext kSpanContext{
-    kTraceId, kSpanId, trace_api::TraceFlags{trace_api::TraceFlags::kIsSampled}, true, kTraceState};
-
-// ----------------------- Helper classes and functions ------------------------
-
-// Create a fake service stub to avoid dependency on gmock
-class FakeServiceStub : public proto::collector::trace::v1::TraceService::StubInterface
-{
-public:
-#if defined(GRPC_CPP_VERSION_MAJOR) && \
-    (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039
-  using async_interface_base =
-      proto::collector::trace::v1::TraceService::StubInterface::async_interface;
-#else
-  using async_interface_base =
-      proto::collector::trace::v1::TraceService::StubInterface::experimental_async_interface;
-#endif
-
-  FakeServiceStub() : async_interface_(this) {}
-
-  class async_interface : public async_interface_base
-  {
-  public:
-    async_interface(FakeServiceStub *owner) : stub_(owner) {}
-
-    virtual ~async_interface() {}
-
-    void Export(
-        ::grpc::ClientContext *context,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest *request,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse *response,
-        std::function<void(::grpc::Status)> callback) override
-    {
-      callback(stub_->Export(context, *request, response));
-    }
-
-#if defined(GRPC_CPP_VERSION_MAJOR) &&                                      \
-        (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039 || \
-    defined(GRPC_CALLBACK_API_NONEXPERIMENTAL)
-    void Export(
-        ::grpc::ClientContext * /*context*/,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest * /*request*/,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse * /*response*/,
-        ::grpc::ClientUnaryReactor * /*reactor*/) override
-    {}
-#else
-    void Export(
-        ::grpc::ClientContext * /*context*/,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest * /*request*/,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse * /*response*/,
-        ::grpc::experimental::ClientUnaryReactor * /*reactor*/)
-    {}
-#endif
-
-  private:
-    FakeServiceStub *stub_;
-  };
-
-  async_interface_base *async() { return &async_interface_; }
-  async_interface_base *experimental_async() { return &async_interface_; }
-
-  grpc::Status Export(grpc::ClientContext *,
-                      const proto::collector::trace::v1::ExportTraceServiceRequest &,
-                      proto::collector::trace::v1::ExportTraceServiceResponse *) override
-  {
-    return grpc::Status::OK;
-  }
-
-  grpc::ClientAsyncResponseReaderInterface<
-      proto::collector::trace::v1::ExportTraceServiceResponse> *
-  AsyncExportRaw(grpc::ClientContext *,
-                 const proto::collector::trace::v1::ExportTraceServiceRequest &,
-                 grpc::CompletionQueue *) override
-  {
-    return nullptr;
-  }
-
-  grpc::ClientAsyncResponseReaderInterface<
-      proto::collector::trace::v1::ExportTraceServiceResponse> *
-  PrepareAsyncExportRaw(grpc::ClientContext *,
-                        const proto::collector::trace::v1::ExportTraceServiceRequest &,
-                        grpc::CompletionQueue *) override
-  {
-    return nullptr;
-  }
-
-private:
-  async_interface async_interface_;
-};
-
-// OtlpGrpcExporterTestPeer is a friend class of OtlpGrpcExporter
-class OtlpGrpcExporterTestPeer
-{
-public:
-  std::unique_ptr<sdk::trace::SpanExporter> GetExporter()
-  {
-    auto mock_stub = new FakeServiceStub();
-    std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> stub_interface(
-        mock_stub);
-    return std::unique_ptr<sdk::trace::SpanExporter>(
-        new exporter::otlp::OtlpGrpcExporter(std::move(stub_interface)));
-  }
-};
-
-// Helper function to create empty spans
-void CreateEmptySpans(std::array<std::unique_ptr<sdk::trace::Recordable>, kBatchSize> &recordables)
-{
-  for (int i = 0; i < kBatchSize; i++)
-  {
-    auto recordable = std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-    recordables[i]  = std::move(recordable);
-  }
-}
-
-// Helper function to create sparse spans
-void CreateSparseSpans(std::array<std::unique_ptr<sdk::trace::Recordable>, kBatchSize> &recordables)
-{
-  for (int i = 0; i < kBatchSize; i++)
-  {
-    auto recordable = std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-
-    recordable->SetIdentity(kSpanContext, kParentSpanId);
-    recordable->SetName("TestSpan");
-    recordable->SetStartTime(common::SystemTimestamp(std::chrono::system_clock::now()));
-    recordable->SetDuration(std::chrono::nanoseconds(10));
-
-    recordables[i] = std::move(recordable);
-  }
-}
-
-// Helper function to create dense spans
-void CreateDenseSpans(std::array<std::unique_ptr<sdk::trace::Recordable>, kBatchSize> &recordables)
-{
-  for (int i = 0; i < kBatchSize; i++)
-  {
-    auto recordable = std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-
-    recordable->SetIdentity(kSpanContext, kParentSpanId);
-    recordable->SetName("TestSpan");
-    recordable->SetStartTime(common::SystemTimestamp(std::chrono::system_clock::now()));
-    recordable->SetDuration(std::chrono::nanoseconds(10));
-
-    for (int i = 0; i < kNumAttributes; i++)
-    {
-      recordable->SetAttribute("int_key_" + i, static_cast<int64_t>(i));
-      recordable->SetAttribute("str_key_" + i, "string_val_" + i);
-      recordable->SetAttribute("bool_key_" + i, true);
-    }
-
-    recordables[i] = std::move(recordable);
-  }
-}
-
-// ------------------------------ Benchmark tests ------------------------------
-
-// Benchmark Export() with empty spans
-void BM_OtlpExporterEmptySpans(benchmark::State &state)
-{
-  std::unique_ptr<OtlpGrpcExporterTestPeer> testpeer(new OtlpGrpcExporterTestPeer());
-  auto exporter = testpeer->GetExporter();
-
-  while (state.KeepRunningBatch(kNumIterations))
-  {
-    std::array<std::unique_ptr<sdk::trace::Recordable>, kBatchSize> recordables;
-    CreateEmptySpans(recordables);
-    exporter->Export(nostd::span<std::unique_ptr<sdk::trace::Recordable>>(recordables));
-  }
-}
-BENCHMARK(BM_OtlpExporterEmptySpans);
-
-// Benchmark Export() with sparse spans
-void BM_OtlpExporterSparseSpans(benchmark::State &state)
-{
-  std::unique_ptr<OtlpGrpcExporterTestPeer> testpeer(new OtlpGrpcExporterTestPeer());
-  auto exporter = testpeer->GetExporter();
-
-  while (state.KeepRunningBatch(kNumIterations))
-  {
-    std::array<std::unique_ptr<sdk::trace::Recordable>, kBatchSize> recordables;
-    CreateSparseSpans(recordables);
-    exporter->Export(nostd::span<std::unique_ptr<sdk::trace::Recordable>>(recordables));
-  }
-}
-BENCHMARK(BM_OtlpExporterSparseSpans);
-
-// Benchmark Export() with dense spans
-void BM_OtlpExporterDenseSpans(benchmark::State &state)
-{
-  std::unique_ptr<OtlpGrpcExporterTestPeer> testpeer(new OtlpGrpcExporterTestPeer());
-  auto exporter = testpeer->GetExporter();
-
-  while (state.KeepRunningBatch(kNumIterations))
-  {
-    std::array<std::unique_ptr<sdk::trace::Recordable>, kBatchSize> recordables;
-    CreateDenseSpans(recordables);
-    exporter->Export(nostd::span<std::unique_ptr<sdk::trace::Recordable>>(recordables));
-  }
-}
-BENCHMARK(BM_OtlpExporterDenseSpans);
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
-
-#ifdef NDEBUG
-// disabled as valgrind reports a memroy leak at absl::lts_20220623::random_internal::(anonymous
-// namespace)::PoolAlignedAlloc()
-// see PR #1737
-namespace
-{
-opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
-void InitTracer()
-{
-  // Create OTLP exporter instance
-  auto exporter  = std::unique_ptr<trace_sdk::SpanExporter>(new otlp::OtlpGrpcExporter(opts));
-  auto processor = std::unique_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-  auto provider =
-      nostd::shared_ptr<trace::TracerProvider>(new trace_sdk::TracerProvider(std::move(processor)));
-  // Set the global trace provider
-  trace::Provider::SetTracerProvider(provider);
-}
-
-void BM_otlp_grpc_with_collector(benchmark::State &state)
-{
-  InitTracer();
-  while (state.KeepRunning())
-  {
-    foo_library();
-  }
-}
-BENCHMARK(BM_otlp_grpc_with_collector);
-}  // namespace
-#endif
-
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_factory_test.cc
deleted file mode 100644
index e77b0f1d9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_factory_test.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
-
-/*
-  Make sure OtlpGrpcExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-/*
-  Implementation, this requires protobuf.
-*/
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-
-/*
-  Make sure OtlpGrpcClientFactory does not require,
-  even indirectly, gRPC headers.
-*/
-#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
-#  error "gRPC should not be included"
-#endif
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpGrpcExporterFactoryTest, BuildTest)
-{
-  OtlpGrpcExporterOptions opts;
-  opts.endpoint = "localhost:45454";
-
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter =
-      OtlpGrpcExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-TEST(OtlpGrpcExporterFactoryTest, ShareClient)
-{
-  OtlpGrpcExporterOptions opts;
-  opts.endpoint = "localhost:45454";
-
-  std::shared_ptr<OtlpGrpcClient> client = OtlpGrpcClientFactory::Create(opts);
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter1 =
-      OtlpGrpcExporterFactory::Create(opts, client);
-
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter2 =
-      OtlpGrpcExporterFactory::Create(opts, client);
-
-  EXPECT_TRUE(exporter1 != nullptr);
-  EXPECT_TRUE(exporter2 != nullptr);
-
-  EXPECT_TRUE(static_cast<OtlpGrpcExporter *>(exporter1.get())->GetClient().get() == client.get());
-  EXPECT_TRUE(static_cast<OtlpGrpcExporter *>(exporter2.get())->GetClient().get() == client.get());
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_test.cc
deleted file mode 100644
index 365d98cec..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_exporter_test.cc
+++ /dev/null
@@ -1,567 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifndef OPENTELEMETRY_STL_VERSION
-// Unfortunately as of 04/27/2021 the fix is NOT in the vcpkg snapshot of Google Test.
-// Remove above `#ifdef` once the GMock fix for C++20 is in the mainline.
-//
-// Please refer to this GitHub issue for additional details:
-// https://github.com/google/googletest/issues/2914
-// https://github.com/google/googletest/commit/61f010d703b32de9bfb20ab90ece38ab2f25977f
-//
-// If we compile using Visual Studio 2019 with `c++latest` (C++20) without the GMock fix,
-// then the compilation here fails in `gmock-actions.h` from:
-//   .\tools\vcpkg\installed\x64-windows\include\gmock\gmock-actions.h(819):
-//   error C2653: 'result_of': is not a class or namespace name
-//
-// That is because `std::result_of` has been removed in C++20.
-
-#  include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
-#  include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
-#  include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
-// Problematic code that pulls in Gmock and breaks with vs2019/c++latest :
-#  include "opentelemetry/proto/collector/trace/v1/trace_service_mock.grpc.pb.h"
-
-#  include "opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h"
-
-#  include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/sdk/trace/simple_processor.h"
-#  include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#  include "opentelemetry/sdk/trace/tracer_provider.h"
-#  include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#  include "opentelemetry/trace/provider.h"
-#  include "opentelemetry/trace/tracer_provider.h"
-
-#  include <grpcpp/grpcpp.h>
-#  include <gtest/gtest.h>
-#  include <future>
-
-#  if defined(_MSC_VER)
-#    include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#  endif
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace
-{
-class OtlpMockTraceServiceStub : public proto::collector::trace::v1::MockTraceServiceStub
-{
-public:
-// Some old toolchains can only use gRPC 1.33 and it's experimental.
-#  if defined(GRPC_CPP_VERSION_MAJOR) && \
-      (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039
-  using async_interface_base =
-      proto::collector::trace::v1::TraceService::StubInterface::async_interface;
-#  else
-  using async_interface_base =
-      proto::collector::trace::v1::TraceService::StubInterface::experimental_async_interface;
-#  endif
-
-  OtlpMockTraceServiceStub() : async_interface_(this) {}
-
-  class async_interface : public async_interface_base
-  {
-  public:
-    async_interface(OtlpMockTraceServiceStub *owner) : stub_(owner) {}
-
-    virtual ~async_interface() override = default;
-
-    void Export(
-        ::grpc::ClientContext *context,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest *request,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse *response,
-        std::function<void(::grpc::Status)> callback) override
-    {
-      stub_->last_async_status_ = stub_->Export(context, *request, response);
-      callback(stub_->last_async_status_);
-    }
-
-// Some old toolchains can only use gRPC 1.33 and it's experimental.
-#  if defined(GRPC_CPP_VERSION_MAJOR) &&                                      \
-          (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039 || \
-      defined(GRPC_CALLBACK_API_NONEXPERIMENTAL)
-    void Export(
-        ::grpc::ClientContext * /*context*/,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest * /*request*/,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse * /*response*/,
-        ::grpc::ClientUnaryReactor * /*reactor*/) override
-    {}
-#  else
-    void Export(
-        ::grpc::ClientContext * /*context*/,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest * /*request*/,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse * /*response*/,
-        ::grpc::experimental::ClientUnaryReactor * /*reactor*/)
-    {}
-#  endif
-
-  private:
-    OtlpMockTraceServiceStub *stub_;
-  };
-
-  async_interface_base *async() override { return &async_interface_; }
-  async_interface_base *experimental_async() { return &async_interface_; }
-
-  ::grpc::Status GetLastAsyncStatus() const noexcept { return last_async_status_; }
-
-private:
-  ::grpc::Status last_async_status_;
-  async_interface async_interface_;
-};
-}  // namespace
-
-class OtlpGrpcExporterTestPeer : public ::testing::Test
-{
-public:
-  std::unique_ptr<sdk::trace::SpanExporter> GetExporter(
-      std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> &stub_interface)
-  {
-    return std::unique_ptr<sdk::trace::SpanExporter>(
-        new OtlpGrpcExporter(std::move(stub_interface)));
-  }
-
-  // Get the options associated with the given exporter.
-  const OtlpGrpcExporterOptions &GetOptions(std::unique_ptr<OtlpGrpcExporter> &exporter)
-  {
-    return exporter->options_;
-  }
-};
-
-TEST_F(OtlpGrpcExporterTestPeer, ShutdownTest)
-{
-  auto mock_stub = new OtlpMockTraceServiceStub();
-  std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> stub_interface(
-      mock_stub);
-  auto exporter = GetExporter(stub_interface);
-
-  auto recordable_1 = exporter->MakeRecordable();
-  recordable_1->SetName("Test span 1");
-  auto recordable_2 = exporter->MakeRecordable();
-  recordable_2->SetName("Test span 2");
-
-  // exporter shuold not be shutdown by default
-  nostd::span<std::unique_ptr<sdk::trace::Recordable>> batch_1(&recordable_1, 1);
-  EXPECT_CALL(*mock_stub, Export(_, _, _)).Times(Exactly(1)).WillOnce(Return(grpc::Status::OK));
-  auto result = exporter->Export(batch_1);
-  exporter->ForceFlush();
-  EXPECT_EQ(sdk::common::ExportResult::kSuccess, result);
-
-  exporter->Shutdown();
-
-  nostd::span<std::unique_ptr<sdk::trace::Recordable>> batch_2(&recordable_2, 1);
-  result = exporter->Export(batch_2);
-  EXPECT_EQ(sdk::common::ExportResult::kFailure, result);
-}
-
-// Call Export() directly
-TEST_F(OtlpGrpcExporterTestPeer, ExportUnitTest)
-{
-  auto mock_stub = new OtlpMockTraceServiceStub();
-  std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> stub_interface(
-      mock_stub);
-  auto exporter = GetExporter(stub_interface);
-
-  auto recordable_1 = exporter->MakeRecordable();
-  recordable_1->SetName("Test span 1");
-  auto recordable_2 = exporter->MakeRecordable();
-  recordable_2->SetName("Test span 2");
-
-  // Test successful RPC
-  nostd::span<std::unique_ptr<sdk::trace::Recordable>> batch_1(&recordable_1, 1);
-  EXPECT_CALL(*mock_stub, Export(_, _, _)).Times(Exactly(1)).WillOnce(Return(grpc::Status::OK));
-  auto result = exporter->Export(batch_1);
-  EXPECT_EQ(sdk::common::ExportResult::kSuccess, result);
-
-  // Test failed RPC
-  nostd::span<std::unique_ptr<sdk::trace::Recordable>> batch_2(&recordable_2, 1);
-  EXPECT_CALL(*mock_stub, Export(_, _, _))
-      .Times(Exactly(1))
-      .WillOnce(Return(grpc::Status::CANCELLED));
-  result = exporter->Export(batch_2);
-  exporter->ForceFlush();
-#  if defined(ENABLE_ASYNC_EXPORT)
-  EXPECT_EQ(sdk::common::ExportResult::kSuccess, result);
-  EXPECT_FALSE(mock_stub->GetLastAsyncStatus().ok());
-#  else
-  EXPECT_EQ(sdk::common::ExportResult::kFailure, result);
-#  endif
-}
-
-// Create spans, let processor call Export()
-TEST_F(OtlpGrpcExporterTestPeer, ExportIntegrationTest)
-{
-  auto mock_stub = new OtlpMockTraceServiceStub();
-  std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> stub_interface(
-      mock_stub);
-
-  auto exporter = GetExporter(stub_interface);
-
-  auto processor = std::unique_ptr<sdk::trace::SpanProcessor>(
-      new sdk::trace::SimpleSpanProcessor(std::move(exporter)));
-  auto provider = nostd::shared_ptr<trace::TracerProvider>(
-      new sdk::trace::TracerProvider(std::move(processor)));
-  auto tracer = provider->GetTracer("test");
-
-  EXPECT_CALL(*mock_stub, Export(_, _, _))
-      .Times(AtLeast(1))
-      .WillRepeatedly(Return(grpc::Status::OK));
-
-  auto parent_span = tracer->StartSpan("Test parent span");
-  auto child_span  = tracer->StartSpan("Test child span");
-  child_span->End();
-  parent_span->End();
-}
-
-// Test exporter configuration options
-TEST_F(OtlpGrpcExporterTestPeer, ConfigTest)
-{
-  OtlpGrpcExporterOptions opts;
-  opts.endpoint = "localhost:45454";
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).endpoint, "localhost:45454");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcExporterTestPeer, ConfigSslCredentialsTest)
-{
-  std::string cacert_str = "--begin and end fake cert--";
-  OtlpGrpcExporterOptions opts;
-  opts.use_ssl_credentials              = true;
-  opts.ssl_credentials_cacert_as_string = cacert_str;
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).ssl_credentials_cacert_as_string, cacert_str);
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
-}
-
-#  ifndef NO_GETENV
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcExporterTestPeer, ConfigFromEnv)
-{
-  const std::string cacert_str = "--begin and end fake cert--";
-  setenv("OTEL_EXPORTER_OTLP_CERTIFICATE_STRING", cacert_str.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_SSL_ENABLE", "True", 1);
-  const std::string endpoint = "https://localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_TIMEOUT", "20050ms", 1);
-  setenv("OTEL_EXPORTER_OTLP_HEADERS", "k1=v1,k2=v2", 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_HEADERS", "k1=v3,k1=v4", 1);
-
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
-  EXPECT_EQ(GetOptions(exporter).ssl_credentials_cacert_as_string, cacert_str);
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-  EXPECT_EQ(GetOptions(exporter).timeout.count(),
-            std::chrono::duration_cast<std::chrono::system_clock::duration>(
-                std::chrono::milliseconds{20050})
-                .count());
-  EXPECT_EQ(GetOptions(exporter).metadata.size(), 3);
-  {
-    // Test k2
-    auto range = GetOptions(exporter).metadata.equal_range("k2");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v2"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  {
-    // Test k1
-    auto range = GetOptions(exporter).metadata.equal_range("k1");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v3"));
-    ++range.first;
-    EXPECT_EQ(range.first->second, std::string("v4"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_CERTIFICATE_STRING");
-  unsetenv("OTEL_EXPORTER_OTLP_SSL_ENABLE");
-  unsetenv("OTEL_EXPORTER_OTLP_TIMEOUT");
-  unsetenv("OTEL_EXPORTER_OTLP_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_HEADERS");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcExporterTestPeer, ConfigHttpsSecureFromEnv)
-{
-  // https takes precedence over insecure
-  const std::string endpoint = "https://localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_INSECURE", "true", 1);
-
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_INSECURE");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcExporterTestPeer, ConfigHttpInsecureFromEnv)
-{
-  // http takes precedence over secure
-  const std::string endpoint = "http://localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_INSECURE", "false", 1);
-
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, false);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_INSECURE");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcExporterTestPeer, ConfigUnknownSecureFromEnv)
-{
-  const std::string endpoint = "localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_INSECURE", "false", 1);
-
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_INSECURE");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcExporterTestPeer, ConfigUnknownInsecureFromEnv)
-{
-  const std::string endpoint = "localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_INSECURE", "true", 1);
-
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, false);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_INSECURE");
-}
-
-TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryDefaultValues)
-{
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 5);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
-}
-
-TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS", "123", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF", "4.5", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_BACKOFF", "6.7", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_BACKOFF_MULTIPLIER", "8.9", 1);
-
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 123);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_BACKOFF_MULTIPLIER");
-}
-
-TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryGenericValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS", "321", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF", "5.4", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF", "7.6", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER", "9.8", 1);
-
-  std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 321);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER");
-}
-#  endif  // NO_GETENV
-
-#  ifdef ENABLE_OTLP_RETRY_PREVIEW
-struct TestTraceService : public opentelemetry::proto::collector::trace::v1::TraceService::Service
-{
-  TestTraceService(std::vector<grpc::StatusCode> status_codes) : status_codes_(status_codes) {}
-
-  inline grpc::Status Export(
-      grpc::ServerContext *,
-      const opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest *,
-      opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse *) override
-  {
-    ++request_count_;
-    return grpc::Status(status_codes_.at(index_++ % status_codes_.size()), "TEST!");
-  }
-
-  size_t request_count_ = 0UL;
-  size_t index_         = 0UL;
-  std::vector<grpc::StatusCode> status_codes_;
-};
-
-using StatusCodeVector = std::vector<grpc::StatusCode>;
-
-class OtlpGrpcExporterRetryIntegrationTests
-    : public ::testing::TestWithParam<std::tuple<bool, StatusCodeVector, std::size_t>>
-{};
-
-INSTANTIATE_TEST_SUITE_P(
-    StatusCodes,
-    OtlpGrpcExporterRetryIntegrationTests,
-    testing::Values(
-        // With retry policy enabled
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::CANCELLED}, 5),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::UNKNOWN}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::INVALID_ARGUMENT}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::DEADLINE_EXCEEDED}, 5),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::NOT_FOUND}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::ALREADY_EXISTS}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::PERMISSION_DENIED}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::UNAUTHENTICATED}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::RESOURCE_EXHAUSTED}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::FAILED_PRECONDITION}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::ABORTED}, 5),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::OUT_OF_RANGE}, 5),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::UNIMPLEMENTED}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::INTERNAL}, 1),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::UNAVAILABLE}, 5),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::DATA_LOSS}, 5),
-        std::make_tuple(true, StatusCodeVector{grpc::StatusCode::OK}, 1),
-        std::make_tuple(true,
-                        StatusCodeVector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::ABORTED,
-                                         grpc::StatusCode::OUT_OF_RANGE,
-                                         grpc::StatusCode::DATA_LOSS},
-                        5),
-        std::make_tuple(true,
-                        StatusCodeVector{grpc::StatusCode::UNAVAILABLE,
-                                         grpc::StatusCode::UNAVAILABLE,
-                                         grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::OK},
-                        4),
-        std::make_tuple(true,
-                        StatusCodeVector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::CANCELLED,
-                                         grpc::StatusCode::DEADLINE_EXCEEDED, grpc::StatusCode::OK},
-                        4),
-        // With retry policy disabled
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::CANCELLED}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::UNKNOWN}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::INVALID_ARGUMENT}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::DEADLINE_EXCEEDED}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::NOT_FOUND}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::ALREADY_EXISTS}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::PERMISSION_DENIED}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::UNAUTHENTICATED}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::RESOURCE_EXHAUSTED}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::FAILED_PRECONDITION}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::ABORTED}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::OUT_OF_RANGE}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::UNIMPLEMENTED}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::INTERNAL}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::UNAVAILABLE}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::DATA_LOSS}, 1),
-        std::make_tuple(false, StatusCodeVector{grpc::StatusCode::OK}, 1),
-        std::make_tuple(false,
-                        StatusCodeVector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::ABORTED,
-                                         grpc::StatusCode::OUT_OF_RANGE,
-                                         grpc::StatusCode::DATA_LOSS},
-                        1),
-        std::make_tuple(false,
-                        StatusCodeVector{grpc::StatusCode::UNAVAILABLE,
-                                         grpc::StatusCode::UNAVAILABLE,
-                                         grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::OK},
-                        1),
-        std::make_tuple(false,
-                        StatusCodeVector{grpc::StatusCode::UNAVAILABLE, grpc::StatusCode::CANCELLED,
-                                         grpc::StatusCode::DEADLINE_EXCEEDED, grpc::StatusCode::OK},
-                        1)));
-
-TEST_P(OtlpGrpcExporterRetryIntegrationTests, StatusCodes)
-{
-  namespace otlp      = opentelemetry::exporter::otlp;
-  namespace trace_sdk = opentelemetry::sdk::trace;
-
-  const auto is_retry_enabled  = std::get<0>(GetParam());
-  const auto status_codes      = std::get<1>(GetParam());
-  const auto expected_attempts = std::get<2>(GetParam());
-  TestTraceService service(status_codes);
-  std::unique_ptr<grpc::Server> server;
-
-  std::promise<void> server_ready;
-  auto server_ready_future = server_ready.get_future();
-
-  std::thread server_thread([&server, &service, &server_ready]() {
-    std::string address("localhost:4317");
-    grpc::ServerBuilder builder;
-    builder.RegisterService(&service);
-    builder.AddListeningPort(address, grpc::InsecureServerCredentials());
-    server = builder.BuildAndStart();
-    server_ready.set_value();
-    server->Wait();
-  });
-
-  server_ready_future.wait();
-
-  otlp::OtlpGrpcExporterOptions opts{};
-
-  if (is_retry_enabled)
-  {
-    opts.retry_policy_max_attempts       = 5;
-    opts.retry_policy_initial_backoff    = std::chrono::duration<float>{0.1f};
-    opts.retry_policy_max_backoff        = std::chrono::duration<float>{5.0f};
-    opts.retry_policy_backoff_multiplier = 1.0f;
-  }
-  else
-  {
-    opts.retry_policy_max_attempts       = 0;
-    opts.retry_policy_initial_backoff    = std::chrono::duration<float>::zero();
-    opts.retry_policy_max_backoff        = std::chrono::duration<float>::zero();
-    opts.retry_policy_backoff_multiplier = 0.0f;
-  }
-
-  auto exporter  = otlp::OtlpGrpcExporterFactory::Create(opts);
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  auto provider  = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-  provider->GetTracer("Test tracer")->StartSpan("Test span")->End();
-  provider->ForceFlush();
-
-  ASSERT_TRUE(server);
-  server->Shutdown();
-
-  if (server_thread.joinable())
-  {
-    server_thread.join();
-  }
-
-  ASSERT_EQ(expected_attempts, service.request_count_);
-}
-#  endif  // ENABLE_OTLP_RETRY_PREVIEW
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_STL_VERSION */
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_log_record_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_log_record_exporter_factory_test.cc
deleted file mode 100644
index 36cd7780d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_log_record_exporter_factory_test.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
-
-/*
-  Make sure OtlpGrpcLogRecordExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-/*
-  Implementation, this requires protobuf.
-*/
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-
-/*
-  Make sure OtlpGrpcClientFactory does not require,
-  even indirectly, gRPC headers.
-*/
-#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
-#  error "gRPC should not be included"
-#endif
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpGrpcLogRecordExporterFactoryTest, BuildTest)
-{
-  OtlpGrpcLogRecordExporterOptions opts;
-  opts.endpoint = "localhost:45454";
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter =
-      OtlpGrpcLogRecordExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-TEST(OtlpGrpcLogRecordExporterFactoryTest, ShareClient)
-{
-  OtlpGrpcLogRecordExporterOptions opts;
-  opts.endpoint = "localhost:45454";
-
-  std::shared_ptr<OtlpGrpcClient> client = OtlpGrpcClientFactory::Create(opts);
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter1 =
-      OtlpGrpcLogRecordExporterFactory::Create(opts, client);
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter2 =
-      OtlpGrpcLogRecordExporterFactory::Create(opts, client);
-
-  EXPECT_TRUE(exporter1 != nullptr);
-  EXPECT_TRUE(exporter2 != nullptr);
-
-  EXPECT_TRUE(static_cast<OtlpGrpcLogRecordExporter *>(exporter1.get())->GetClient().get() ==
-              client.get());
-  EXPECT_TRUE(static_cast<OtlpGrpcLogRecordExporter *>(exporter2.get())->GetClient().get() ==
-              client.get());
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc
deleted file mode 100644
index 0e1aa8e3e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc
+++ /dev/null
@@ -1,524 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <unordered_map>
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-// clang-format on
-
-#include "opentelemetry/proto/collector/logs/v1/logs_service_mock.grpc.pb.h"
-#include "opentelemetry/proto/collector/trace/v1/trace_service_mock.grpc.pb.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-// clang-format on
-
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/provider.h"
-
-#include <grpcpp/grpcpp.h>
-#include <gtest/gtest.h>
-
-#if defined(_MSC_VER)
-#  include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#endif
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace
-{
-class OtlpMockTraceServiceStub : public proto::collector::trace::v1::MockTraceServiceStub
-{
-public:
-#if defined(GRPC_CPP_VERSION_MAJOR) && \
-    (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039
-  using async_interface_base =
-      proto::collector::trace::v1::TraceService::StubInterface::async_interface;
-#else
-  using async_interface_base =
-      proto::collector::trace::v1::TraceService::StubInterface::experimental_async_interface;
-#endif
-
-  OtlpMockTraceServiceStub() : async_interface_(this) {}
-
-  class async_interface : public async_interface_base
-  {
-  public:
-    async_interface(OtlpMockTraceServiceStub *owner) : stub_(owner) {}
-
-    virtual ~async_interface() override = default;
-
-    void Export(
-        ::grpc::ClientContext *context,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest *request,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse *response,
-        std::function<void(::grpc::Status)> callback) override
-    {
-      stub_->last_async_status_ = stub_->Export(context, *request, response);
-      callback(stub_->last_async_status_);
-    }
-
-#if defined(GRPC_CPP_VERSION_MAJOR) &&                                      \
-        (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039 || \
-    defined(GRPC_CALLBACK_API_NONEXPERIMENTAL)
-    void Export(
-        ::grpc::ClientContext * /*context*/,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest * /*request*/,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse * /*response*/,
-        ::grpc::ClientUnaryReactor * /*reactor*/) override
-    {}
-#else
-    void Export(
-        ::grpc::ClientContext * /*context*/,
-        const ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest * /*request*/,
-        ::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse * /*response*/,
-        ::grpc::experimental::ClientUnaryReactor * /*reactor*/)
-    {}
-#endif
-
-  private:
-    OtlpMockTraceServiceStub *stub_;
-  };
-
-  async_interface_base *async() override { return &async_interface_; }
-  async_interface_base *experimental_async() { return &async_interface_; }
-
-  ::grpc::Status GetLastAsyncStatus() const noexcept { return last_async_status_; }
-
-private:
-  ::grpc::Status last_async_status_;
-  async_interface async_interface_;
-};
-
-class OtlpMockLogsServiceStub : public proto::collector::logs::v1::MockLogsServiceStub
-{
-public:
-#if defined(GRPC_CPP_VERSION_MAJOR) && \
-    (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039
-  using async_interface_base =
-      proto::collector::logs::v1::LogsService::StubInterface::async_interface;
-#else
-  using async_interface_base =
-      proto::collector::logs::v1::LogsService::StubInterface::experimental_async_interface;
-#endif
-
-  OtlpMockLogsServiceStub() : async_interface_(this) {}
-
-  class async_interface : public async_interface_base
-  {
-  public:
-    async_interface(OtlpMockLogsServiceStub *owner) : stub_(owner) {}
-
-    virtual ~async_interface() override = default;
-
-    void Export(
-        ::grpc::ClientContext *context,
-        const ::opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest *request,
-        ::opentelemetry::proto::collector::logs::v1::ExportLogsServiceResponse *response,
-        std::function<void(::grpc::Status)> callback) override
-    {
-      stub_->last_async_status_ = stub_->Export(context, *request, response);
-      callback(stub_->last_async_status_);
-    }
-
-#if defined(GRPC_CPP_VERSION_MAJOR) &&                                      \
-        (GRPC_CPP_VERSION_MAJOR * 1000 + GRPC_CPP_VERSION_MINOR) >= 1039 || \
-    defined(GRPC_CALLBACK_API_NONEXPERIMENTAL)
-    void Export(
-        ::grpc::ClientContext * /*context*/,
-        const ::opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest * /*request*/,
-        ::opentelemetry::proto::collector::logs::v1::ExportLogsServiceResponse * /*response*/,
-        ::grpc::ClientUnaryReactor * /*reactor*/) override
-    {}
-#else
-    void Export(
-        ::grpc::ClientContext * /*context*/,
-        const ::opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest * /*request*/,
-        ::opentelemetry::proto::collector::logs::v1::ExportLogsServiceResponse * /*response*/,
-        ::grpc::experimental::ClientUnaryReactor * /*reactor*/)
-    {}
-#endif
-
-  private:
-    OtlpMockLogsServiceStub *stub_;
-  };
-
-  async_interface_base *async() override { return &async_interface_; }
-  async_interface_base *experimental_async() { return &async_interface_; }
-
-  ::grpc::Status GetLastAsyncStatus() const noexcept { return last_async_status_; }
-
-private:
-  ::grpc::Status last_async_status_;
-  async_interface async_interface_;
-};
-}  // namespace
-
-class OtlpGrpcLogRecordExporterTestPeer : public ::testing::Test
-{
-public:
-  std::unique_ptr<sdk::logs::LogRecordExporter> GetExporter(
-      std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> &stub_interface)
-  {
-    return std::unique_ptr<sdk::logs::LogRecordExporter>(
-        new OtlpGrpcLogRecordExporter(std::move(stub_interface)));
-  }
-
-  std::unique_ptr<sdk::trace::SpanExporter> GetExporter(
-      std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> &stub_interface)
-  {
-    return std::unique_ptr<sdk::trace::SpanExporter>(
-        new OtlpGrpcExporter(std::move(stub_interface)));
-  }
-
-  std::unique_ptr<sdk::logs::LogRecordExporter> GetExporter(
-      std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> &stub_interface,
-      const std::shared_ptr<OtlpGrpcClient> &client)
-  {
-    return std::unique_ptr<sdk::logs::LogRecordExporter>(
-        new OtlpGrpcLogRecordExporter(std::move(stub_interface), std::move(client)));
-  }
-
-  std::unique_ptr<sdk::trace::SpanExporter> GetExporter(
-      std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> &stub_interface,
-      const std::shared_ptr<OtlpGrpcClient> &client)
-  {
-    return std::unique_ptr<sdk::trace::SpanExporter>(
-        new OtlpGrpcExporter(std::move(stub_interface), std::move(client)));
-  }
-
-  // Get the options associated with the given exporter.
-  const OtlpGrpcLogRecordExporterOptions &GetOptions(
-      std::unique_ptr<OtlpGrpcLogRecordExporter> &exporter)
-  {
-    return exporter->options_;
-  }
-};
-
-TEST_F(OtlpGrpcLogRecordExporterTestPeer, ShutdownTest)
-{
-  auto mock_stub = new OtlpMockLogsServiceStub();
-  std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> stub_interface(mock_stub);
-  auto exporter = GetExporter(stub_interface);
-
-  auto recordable_1 = exporter->MakeRecordable();
-  auto recordable_2 = exporter->MakeRecordable();
-
-  // exporter shuold not be shutdown by default
-  nostd::span<std::unique_ptr<sdk::logs::Recordable>> batch_1(&recordable_1, 1);
-  EXPECT_CALL(*mock_stub, Export(_, _, _)).Times(Exactly(1)).WillOnce(Return(grpc::Status::OK));
-
-  auto result = exporter->Export(batch_1);
-  exporter->ForceFlush();
-  EXPECT_EQ(sdk::common::ExportResult::kSuccess, result);
-
-  exporter->Shutdown();
-
-  nostd::span<std::unique_ptr<sdk::logs::Recordable>> batch_2(&recordable_2, 1);
-  result = exporter->Export(batch_2);
-  EXPECT_EQ(sdk::common::ExportResult::kFailure, result);
-}
-
-// Call Export() directly
-TEST_F(OtlpGrpcLogRecordExporterTestPeer, ExportUnitTest)
-{
-  auto mock_stub = new OtlpMockLogsServiceStub();
-  std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> stub_interface(mock_stub);
-  auto exporter = GetExporter(stub_interface);
-
-  auto recordable_1 = exporter->MakeRecordable();
-  auto recordable_2 = exporter->MakeRecordable();
-
-  // Test successful RPC
-  nostd::span<std::unique_ptr<sdk::logs::Recordable>> batch_1(&recordable_1, 1);
-  EXPECT_CALL(*mock_stub, Export(_, _, _)).Times(Exactly(1)).WillOnce(Return(grpc::Status::OK));
-  auto result = exporter->Export(batch_1);
-  exporter->ForceFlush();
-  EXPECT_EQ(sdk::common::ExportResult::kSuccess, result);
-
-  // Test failed RPC
-  nostd::span<std::unique_ptr<sdk::logs::Recordable>> batch_2(&recordable_2, 1);
-  EXPECT_CALL(*mock_stub, Export(_, _, _))
-      .Times(Exactly(1))
-      .WillOnce(Return(grpc::Status::CANCELLED));
-  result = exporter->Export(batch_2);
-  exporter->ForceFlush();
-#if defined(ENABLE_ASYNC_EXPORT)
-  EXPECT_EQ(sdk::common::ExportResult::kSuccess, result);
-  EXPECT_FALSE(mock_stub->GetLastAsyncStatus().ok());
-#else
-  EXPECT_EQ(sdk::common::ExportResult::kFailure, result);
-#endif
-}
-
-// Create spans, let processor call Export()
-TEST_F(OtlpGrpcLogRecordExporterTestPeer, ExportIntegrationTest)
-{
-  auto mock_stub = new OtlpMockLogsServiceStub();
-  std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> stub_interface(mock_stub);
-
-  auto exporter = GetExporter(stub_interface);
-
-  bool attribute_storage_bool_value[]                                = {true, false, true};
-  int32_t attribute_storage_int32_value[]                            = {1, 2};
-  uint32_t attribute_storage_uint32_value[]                          = {3, 4};
-  int64_t attribute_storage_int64_value[]                            = {5, 6};
-  uint64_t attribute_storage_uint64_value[]                          = {7, 8};
-  double attribute_storage_double_value[]                            = {3.2, 3.3};
-  opentelemetry::nostd::string_view attribute_storage_string_value[] = {"vector", "string"};
-
-  auto provider = nostd::shared_ptr<sdk::logs::LoggerProvider>(new sdk::logs::LoggerProvider());
-  provider->AddProcessor(
-      std::unique_ptr<sdk::logs::LogRecordProcessor>(new sdk::logs::BatchLogRecordProcessor(
-          std::move(exporter), 5, std::chrono::milliseconds(256), 1)));
-
-  EXPECT_CALL(*mock_stub, Export(_, _, _))
-      .Times(AtLeast(1))
-      .WillRepeatedly(Return(grpc::Status::OK));
-
-  uint8_t trace_id_bin[opentelemetry::trace::TraceId::kSize] = {
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-  opentelemetry::trace::TraceId trace_id{trace_id_bin};
-  uint8_t span_id_bin[opentelemetry::trace::SpanId::kSize] = {'7', '6', '5', '4',
-                                                              '3', '2', '1', '0'};
-  opentelemetry::trace::SpanId span_id{span_id_bin};
-
-  auto trace_mock_stub = new OtlpMockTraceServiceStub();
-  std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> trace_stub_interface(
-      trace_mock_stub);
-
-  auto trace_provider = opentelemetry::nostd::shared_ptr<opentelemetry::sdk::trace::TracerProvider>(
-      opentelemetry::sdk::trace::TracerProviderFactory::Create(
-          opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Create(
-              GetExporter(trace_stub_interface))));
-
-  // Trace and Logs should both receive datas when links static gRPC on ELF ABI.
-  EXPECT_CALL(*trace_mock_stub, Export(_, _, _))
-      .Times(AtLeast(1))
-      .WillRepeatedly(Return(grpc::Status::OK));
-
-  {
-    const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-
-    auto tracer = trace_provider->GetTracer("opentelelemtry_library", "", schema_url);
-    opentelemetry::sdk::trace::Provider::SetTracerProvider(std::move(trace_provider));
-    auto trace_span = tracer->StartSpan("test_log");
-    opentelemetry::trace::Scope trace_scope{trace_span};
-
-    auto logger = provider->GetLogger("test", "opentelelemtry_library", "", schema_url,
-                                      {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-    std::unordered_map<std::string, opentelemetry::common::AttributeValue> attributes;
-    attributes["service.name"]     = "unit_test_service";
-    attributes["tenant.id"]        = "test_user";
-    attributes["bool_value"]       = true;
-    attributes["int32_value"]      = static_cast<int32_t>(1);
-    attributes["uint32_value"]     = static_cast<uint32_t>(2);
-    attributes["int64_value"]      = static_cast<int64_t>(0x1100000000LL);
-    attributes["uint64_value"]     = static_cast<uint64_t>(0x1200000000ULL);
-    attributes["double_value"]     = static_cast<double>(3.1);
-    attributes["vec_bool_value"]   = attribute_storage_bool_value;
-    attributes["vec_int32_value"]  = attribute_storage_int32_value;
-    attributes["vec_uint32_value"] = attribute_storage_uint32_value;
-    attributes["vec_int64_value"]  = attribute_storage_int64_value;
-    attributes["vec_uint64_value"] = attribute_storage_uint64_value;
-    attributes["vec_double_value"] = attribute_storage_double_value;
-    attributes["vec_string_value"] = attribute_storage_string_value;
-    logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, "Log message", attributes,
-                          trace_span->GetContext(), std::chrono::system_clock::now());
-  }
-
-  opentelemetry::sdk::trace::Provider::SetTracerProvider(
-      opentelemetry::nostd::shared_ptr<opentelemetry::trace::TracerProvider>(
-          new opentelemetry::trace::NoopTracerProvider()));
-  trace_provider = opentelemetry::nostd::shared_ptr<opentelemetry::sdk::trace::TracerProvider>();
-}
-
-// Create spans, let processor call Export() and share client object between trace and logs
-TEST_F(OtlpGrpcLogRecordExporterTestPeer, ShareClientTest)
-{
-  std::shared_ptr<OtlpGrpcClient> shared_client =
-      OtlpGrpcClientFactory::Create(OtlpGrpcLogRecordExporterOptions());
-
-  auto mock_stub = new OtlpMockLogsServiceStub();
-  std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> stub_interface(mock_stub);
-
-  auto exporter = GetExporter(stub_interface, shared_client);
-
-  bool attribute_storage_bool_value[]                                = {true, false, true};
-  int32_t attribute_storage_int32_value[]                            = {1, 2};
-  uint32_t attribute_storage_uint32_value[]                          = {3, 4};
-  int64_t attribute_storage_int64_value[]                            = {5, 6};
-  uint64_t attribute_storage_uint64_value[]                          = {7, 8};
-  double attribute_storage_double_value[]                            = {3.2, 3.3};
-  opentelemetry::nostd::string_view attribute_storage_string_value[] = {"vector", "string"};
-
-  auto provider = nostd::shared_ptr<sdk::logs::LoggerProvider>(new sdk::logs::LoggerProvider());
-  provider->AddProcessor(
-      std::unique_ptr<sdk::logs::LogRecordProcessor>(new sdk::logs::BatchLogRecordProcessor(
-          std::move(exporter), 5, std::chrono::milliseconds(256), 1)));
-
-  EXPECT_CALL(*mock_stub, Export(_, _, _))
-      .Times(Exactly(1))
-      .WillRepeatedly(Return(grpc::Status::OK));
-
-  uint8_t trace_id_bin[opentelemetry::trace::TraceId::kSize] = {
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-  opentelemetry::trace::TraceId trace_id{trace_id_bin};
-  uint8_t span_id_bin[opentelemetry::trace::SpanId::kSize] = {'7', '6', '5', '4',
-                                                              '3', '2', '1', '0'};
-  opentelemetry::trace::SpanId span_id{span_id_bin};
-
-  auto trace_mock_stub = new OtlpMockTraceServiceStub();
-  std::unique_ptr<proto::collector::trace::v1::TraceService::StubInterface> trace_stub_interface(
-      trace_mock_stub);
-
-  auto trace_provider = opentelemetry::nostd::shared_ptr<opentelemetry::sdk::trace::TracerProvider>(
-      opentelemetry::sdk::trace::TracerProviderFactory::Create(
-          opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Create(
-              GetExporter(trace_stub_interface, shared_client))));
-
-  // Trace and Logs should both receive datas when links static gRPC on ELF ABI.
-  EXPECT_CALL(*trace_mock_stub, Export(_, _, _))
-      .Times(AtLeast(2))
-      .WillRepeatedly(Return(grpc::Status::OK));
-
-  {
-    const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-
-    auto tracer              = trace_provider->GetTracer("opentelelemtry_library", "", schema_url);
-    auto copy_trace_provider = trace_provider;
-    opentelemetry::sdk::trace::Provider::SetTracerProvider(std::move(copy_trace_provider));
-    auto trace_span = tracer->StartSpan("test_log");
-    opentelemetry::trace::Scope trace_scope{trace_span};
-
-    auto logger = provider->GetLogger("test", "opentelelemtry_library", "", schema_url,
-                                      {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-    std::unordered_map<std::string, opentelemetry::common::AttributeValue> attributes;
-    attributes["service.name"]     = "unit_test_service";
-    attributes["tenant.id"]        = "test_user";
-    attributes["bool_value"]       = true;
-    attributes["int32_value"]      = static_cast<int32_t>(1);
-    attributes["uint32_value"]     = static_cast<uint32_t>(2);
-    attributes["int64_value"]      = static_cast<int64_t>(0x1100000000LL);
-    attributes["uint64_value"]     = static_cast<uint64_t>(0x1200000000ULL);
-    attributes["double_value"]     = static_cast<double>(3.1);
-    attributes["vec_bool_value"]   = attribute_storage_bool_value;
-    attributes["vec_int32_value"]  = attribute_storage_int32_value;
-    attributes["vec_uint32_value"] = attribute_storage_uint32_value;
-    attributes["vec_int64_value"]  = attribute_storage_int64_value;
-    attributes["vec_uint64_value"] = attribute_storage_uint64_value;
-    attributes["vec_double_value"] = attribute_storage_double_value;
-    attributes["vec_string_value"] = attribute_storage_string_value;
-    logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, "Log message", attributes,
-                          trace_span->GetContext(), std::chrono::system_clock::now());
-  }
-
-  // Shudown logs, but tracer still works
-  provider->Shutdown();
-  EXPECT_FALSE(shared_client->IsShutdown());
-
-  {
-    const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-
-    auto tracer     = trace_provider->GetTracer("opentelelemtry_library", "", schema_url);
-    auto trace_span = tracer->StartSpan("test_log");
-    opentelemetry::trace::Scope trace_scope{trace_span};
-
-    auto logger = provider->GetLogger("test", "opentelelemtry_library", "", schema_url,
-                                      {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-    std::unordered_map<std::string, opentelemetry::common::AttributeValue> attributes;
-    attributes["service.name"] = "unit_test_service";
-    attributes["tenant.id"]    = "test_user";
-    logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, "Log message", attributes,
-                          trace_span->GetContext(), std::chrono::system_clock::now());
-  }
-
-  // All references are released, client should also be shutdown
-  trace_provider->Shutdown();
-  EXPECT_TRUE(shared_client->IsShutdown());
-
-  opentelemetry::sdk::trace::Provider::SetTracerProvider(
-      opentelemetry::nostd::shared_ptr<opentelemetry::trace::TracerProvider>(
-          new opentelemetry::trace::NoopTracerProvider()));
-  trace_provider = opentelemetry::nostd::shared_ptr<opentelemetry::sdk::trace::TracerProvider>();
-}
-
-#ifndef NO_GETENV
-TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryDefaultValues)
-{
-  std::unique_ptr<OtlpGrpcLogRecordExporter> exporter(new OtlpGrpcLogRecordExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 5);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
-}
-
-TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS", "123", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF", "4.5", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_BACKOFF", "6.7", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_BACKOFF_MULTIPLIER", "8.9", 1);
-
-  std::unique_ptr<OtlpGrpcLogRecordExporter> exporter(new OtlpGrpcLogRecordExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 123);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_BACKOFF_MULTIPLIER");
-}
-
-TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryGenericValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS", "321", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF", "5.4", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF", "7.6", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER", "9.8", 1);
-
-  std::unique_ptr<OtlpGrpcLogRecordExporter> exporter(new OtlpGrpcLogRecordExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 321);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER");
-}
-#endif  // NO_GETENV
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc
deleted file mode 100644
index e7c938299..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
-
-/*
-  Make sure OtlpGrpcMetricExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-/*
-  Implementation, this requires protobuf.
-*/
-#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-
-/*
-  Make sure OtlpGrpcClientFactory does not require,
-  even indirectly, gRPC headers.
-*/
-#if defined(GRPC_CPP_VERSION_MAJOR) || defined(GRPC_CPP_VERSION_STRING)
-#  error "gRPC should not be included"
-#endif
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpGrpcMetricExporterFactory, BuildTest)
-{
-  OtlpGrpcMetricExporterOptions opts;
-  opts.endpoint = "localhost:45454";
-
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter =
-      OtlpGrpcMetricExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-TEST(OtlpGrpcMetricExporterFactory, ShareClient)
-{
-  OtlpGrpcMetricExporterOptions opts;
-  opts.endpoint = "localhost:45454";
-
-  std::shared_ptr<OtlpGrpcClient> client = OtlpGrpcClientFactory::Create(opts);
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter1 =
-      OtlpGrpcMetricExporterFactory::Create(opts, client);
-
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter2 =
-      OtlpGrpcMetricExporterFactory::Create(opts, client);
-
-  EXPECT_TRUE(exporter1 != nullptr);
-  EXPECT_TRUE(exporter2 != nullptr);
-
-  EXPECT_TRUE(static_cast<OtlpGrpcMetricExporter *>(exporter1.get())->GetClient().get() ==
-              client.get());
-  EXPECT_TRUE(static_cast<OtlpGrpcMetricExporter *>(exporter2.get())->GetClient().get() ==
-              client.get());
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_metric_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_metric_exporter_test.cc
deleted file mode 100644
index 429dd01b5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_metric_exporter_test.cc
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifndef OPENTELEMETRY_STL_VERSION
-// Unfortunately as of 04/27/2021 the fix is NOT in the vcpkg snapshot of Google Test.
-// Remove above `#ifdef` once the GMock fix for C++20 is in the mainline.
-//
-// Please refer to this GitHub issue for additional details:
-// https://github.com/google/googletest/issues/2914
-// https://github.com/google/googletest/commit/61f010d703b32de9bfb20ab90ece38ab2f25977f
-//
-// If we compile using Visual Studio 2019 with `c++latest` (C++20) without the GMock fix,
-// then the compilation here fails in `gmock-actions.h` from:
-//   .\tools\vcpkg\installed\x64-windows\include\gmock\gmock-actions.h(819):
-//   error C2653: 'result_of': is not a class or namespace name
-//
-// That is because `std::result_of` has been removed in C++20.
-
-#  include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"
-
-#  include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
-// Problematic code that pulls in Gmock and breaks with vs2019/c++latest :
-#  include "opentelemetry/proto/collector/metrics/v1/metrics_service_mock.grpc.pb.h"
-
-#  include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#  include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-#  include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
-
-#  include "opentelemetry/sdk/trace/simple_processor.h"
-#  include "opentelemetry/sdk/trace/tracer_provider.h"
-#  include "opentelemetry/trace/provider.h"
-
-#  include <grpcpp/grpcpp.h>
-#  include <gtest/gtest.h>
-
-#  if defined(_MSC_VER)
-#    include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#  endif
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-class OtlpGrpcMetricExporterTestPeer : public ::testing::Test
-{
-public:
-  std::unique_ptr<sdk::metrics::PushMetricExporter> GetExporter(
-      const OtlpGrpcMetricExporterOptions &options)
-  {
-    return std::unique_ptr<sdk::metrics::PushMetricExporter>(new OtlpGrpcMetricExporter(options));
-  }
-
-  std::unique_ptr<sdk::metrics::PushMetricExporter> GetExporter(
-      std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface> stub_interface)
-  {
-    return std::unique_ptr<sdk::metrics::PushMetricExporter>(
-        new OtlpGrpcMetricExporter(std::move(stub_interface)));
-  }
-
-  std::unique_ptr<sdk::metrics::PushMetricExporter> GetExporter(
-      std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface> stub_interface,
-      std::shared_ptr<OtlpGrpcClient> client)
-  {
-    return std::unique_ptr<sdk::metrics::PushMetricExporter>(
-        new OtlpGrpcMetricExporter(std::move(stub_interface), std::move(client)));
-  }
-
-  std::unique_ptr<sdk::metrics::PushMetricExporter> GetExporter(
-      const OtlpGrpcMetricExporterOptions &options,
-      std::shared_ptr<OtlpGrpcClient> client)
-  {
-    return std::unique_ptr<sdk::metrics::PushMetricExporter>(
-        new OtlpGrpcMetricExporter(options, std::move(client)));
-  }
-
-  // Get the options associated with the given exporter.
-  const OtlpGrpcMetricExporterOptions &GetOptions(std::unique_ptr<OtlpGrpcMetricExporter> &exporter)
-  {
-    return exporter->options_;
-  }
-};
-
-// Test exporter configuration options
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigTest)
-{
-  OtlpGrpcMetricExporterOptions opts;
-  opts.endpoint = "localhost:45454";
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).endpoint, "localhost:45454");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigSslCredentialsTest)
-{
-  std::string cacert_str = "--begin and end fake cert--";
-  OtlpGrpcMetricExporterOptions opts;
-  opts.use_ssl_credentials              = true;
-  opts.ssl_credentials_cacert_as_string = cacert_str;
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).ssl_credentials_cacert_as_string, cacert_str);
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
-}
-
-#  ifndef NO_GETENV
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigFromEnv)
-{
-  const std::string cacert_str = "--begin and end fake cert--";
-  setenv("OTEL_EXPORTER_OTLP_CERTIFICATE_STRING", cacert_str.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_SSL_ENABLE", "True", 1);
-  const std::string endpoint = "https://localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_TIMEOUT", "20050ms", 1);
-  setenv("OTEL_EXPORTER_OTLP_HEADERS", "k1=v1,k2=v2", 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_HEADERS", "k1=v3,k1=v4", 1);
-
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).ssl_credentials_cacert_as_string, cacert_str);
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-  EXPECT_EQ(GetOptions(exporter).timeout.count(),
-            std::chrono::duration_cast<std::chrono::system_clock::duration>(
-                std::chrono::milliseconds{20050})
-                .count());
-  EXPECT_EQ(GetOptions(exporter).metadata.size(), 3);
-  {
-    // Test k2
-    auto range = GetOptions(exporter).metadata.equal_range("k2");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v2"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  {
-    // Test k1
-    auto range = GetOptions(exporter).metadata.equal_range("k1");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v3"));
-    ++range.first;
-    EXPECT_EQ(range.first->second, std::string("v4"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_CERTIFICATE_STRING");
-  unsetenv("OTEL_EXPORTER_OTLP_SSL_ENABLE");
-  unsetenv("OTEL_EXPORTER_OTLP_TIMEOUT");
-  unsetenv("OTEL_EXPORTER_OTLP_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_HEADERS");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigHttpsSecureFromEnv)
-{
-  // https takes precedence over insecure
-  const std::string endpoint = "https://localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_INSECURE", "true", 1);
-
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_INSECURE");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigHttpInsecureFromEnv)
-{
-  // http takes precedence over secure
-  const std::string endpoint = "http://localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_INSECURE", "false", 1);
-
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, false);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_INSECURE");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigUnknownSecureFromEnv)
-{
-  const std::string endpoint = "localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_INSECURE", "false", 1);
-
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_INSECURE");
-}
-
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigUnknownInsecureFromEnv)
-{
-  const std::string endpoint = "localhost:9999";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", endpoint.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_INSECURE", "true", 1);
-
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, false);
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_INSECURE");
-}
-
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryDefaultValues)
-{
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 5);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
-}
-
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS", "123", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF", "4.5", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_BACKOFF", "6.7", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_BACKOFF_MULTIPLIER", "8.9", 1);
-
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 123);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_BACKOFF_MULTIPLIER");
-}
-
-TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryGenericValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS", "321", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF", "5.4", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF", "7.6", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER", "9.8", 1);
-
-  std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 321);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER");
-}
-#  endif  // NO_GETENV
-
-TEST_F(OtlpGrpcMetricExporterTestPeer, CheckGetAggregationTemporality)
-{
-  auto options                    = OtlpGrpcMetricExporterOptions();
-  options.aggregation_temporality = PreferredAggregationTemporality::kCumulative;
-
-  auto client = OtlpGrpcClientFactory::Create(options);
-
-  auto exporter0 = GetExporter(options);
-  auto exporter1 = GetExporter(client->MakeMetricsServiceStub());
-  auto exporter2 = GetExporter(options, client);
-  auto exporter3 = GetExporter(client->MakeMetricsServiceStub(), client);
-
-  EXPECT_EQ(
-      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-      exporter0->GetAggregationTemporality(opentelemetry::sdk::metrics::InstrumentType::kCounter));
-
-  EXPECT_EQ(
-      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-      exporter1->GetAggregationTemporality(opentelemetry::sdk::metrics::InstrumentType::kCounter));
-
-  EXPECT_EQ(
-      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-      exporter2->GetAggregationTemporality(opentelemetry::sdk::metrics::InstrumentType::kCounter));
-
-  EXPECT_EQ(
-      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-      exporter3->GetAggregationTemporality(opentelemetry::sdk::metrics::InstrumentType::kCounter));
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_STL_VERSION */
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_target_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_target_test.cc
deleted file mode 100644
index 0073aeedb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_grpc_target_test.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <grpcpp/grpcpp.h>
-#include <gtest/gtest.h>
-
-#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpGrpcClientEndpointTest, GrpcClientTest)
-{
-  OtlpGrpcClientOptions opts1;
-  opts1.endpoint = "unix:///tmp/otel1.sock";
-
-  OtlpGrpcClientOptions opts2;
-  opts2.endpoint = "unix:tmp/otel2.sock";
-
-  OtlpGrpcClientOptions opts3;
-  opts3.endpoint = "localhost:4317";
-
-  auto target1 = OtlpGrpcClient::GetGrpcTarget(opts1.endpoint);
-  auto target2 = OtlpGrpcClient::GetGrpcTarget(opts2.endpoint);
-  auto target3 = OtlpGrpcClient::GetGrpcTarget(opts3.endpoint);
-
-  EXPECT_EQ(target1, "unix:/tmp/otel1.sock");
-  EXPECT_EQ(target2, "");
-  EXPECT_EQ(target3, "localhost:4317");
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_exporter_factory_test.cc
deleted file mode 100644
index 77bf230f7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_exporter_factory_test.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-/*
-  Make sure OtlpHttpExporterFactory does not require,
-  even indirectly, nlohmann/json headers.
-*/
-#ifdef NLOHMANN_JSON_VERSION_MAJOR
-#  error "nlohmann/json should not be included"
-#endif /* NLOHMANN_JSON_VERSION_MAJOR */
-
-/*
-  Make sure OtlpHttpExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpHttpExporterFactoryTest, BuildTest)
-{
-  OtlpHttpExporterOptions opts;
-  opts.url = "localhost:45454";
-
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter =
-      OtlpHttpExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_exporter_test.cc
deleted file mode 100644
index c9a3b6901..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_exporter_test.cc
+++ /dev/null
@@ -1,797 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifndef OPENTELEMETRY_STL_VERSION
-
-#  include <chrono>
-#  include <thread>
-
-#  include "opentelemetry/exporters/otlp/otlp_http_exporter.h"
-#  include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
-
-#  include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
-#  include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-
-#  include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#  include "opentelemetry/ext/http/client/http_client_factory.h"
-#  include "opentelemetry/ext/http/server/http_server.h"
-#  include "opentelemetry/sdk/trace/batch_span_processor.h"
-#  include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#  include "opentelemetry/sdk/trace/simple_processor.h"
-#  include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#  include "opentelemetry/sdk/trace/tracer_provider.h"
-#  include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#  include "opentelemetry/test_common/ext/http/client/http_client_test_factory.h"
-#  include "opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h"
-#  include "opentelemetry/trace/provider.h"
-#  include "opentelemetry/trace/tracer_provider.h"
-
-#  include <google/protobuf/message_lite.h>
-#  include <gtest/gtest.h>
-#  include "gmock/gmock.h"
-
-#  include "nlohmann/json.hpp"
-
-#  if defined(_MSC_VER)
-#    include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#  endif
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-namespace trace_api = opentelemetry::trace;
-namespace resource  = opentelemetry::sdk::resource;
-
-template <class T, size_t N>
-static nostd::span<T, N> MakeSpan(T (&array)[N])
-{
-  return nostd::span<T, N>(array);
-}
-
-OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
-                                                bool async_mode)
-{
-  std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation> not_instrumented;
-  OtlpHttpExporterOptions options;
-  options.content_type  = content_type;
-  options.console_debug = true;
-  options.timeout       = std::chrono::system_clock::duration::zero();
-  options.http_headers.insert(std::make_pair("Custom-Header-Key", "Custom-Header-Value"));
-  options.retry_policy_max_attempts       = 0U;
-  options.retry_policy_initial_backoff    = std::chrono::duration<float>::zero();
-  options.retry_policy_max_backoff        = std::chrono::duration<float>::zero();
-  options.retry_policy_backoff_multiplier = 0.0f;
-  OtlpHttpClientOptions otlp_http_client_options(
-      options.url, false, /* ssl_insecure_skip_verify */
-      "",                 /* ssl_ca_cert_path */
-      "",                 /* ssl_ca_cert_string */
-      "",                 /* ssl_client_key_path */
-      "",                 /* ssl_client_key_string */
-      "",                 /* ssl_client_cert_path */
-      "",                 /* ssl_client_cert_string */
-      "",                 /* ssl_min_tls */
-      "",                 /* ssl_max_tls */
-      "",                 /* ssl_cipher */
-      "",                 /* ssl_cipher_suite */
-      options.content_type, options.json_bytes_mapping, options.compression, options.use_json_name,
-      options.console_debug, options.timeout, options.http_headers,
-      options.retry_policy_max_attempts, options.retry_policy_initial_backoff,
-      options.retry_policy_max_backoff, options.retry_policy_backoff_multiplier, not_instrumented);
-  if (!async_mode)
-  {
-    otlp_http_client_options.max_concurrent_requests = 0;
-  }
-  return otlp_http_client_options;
-}
-
-namespace http_client = opentelemetry::ext::http::client;
-
-class OtlpHttpExporterTestPeer : public ::testing::Test
-{
-public:
-  std::unique_ptr<sdk::trace::SpanExporter> GetExporter(std::unique_ptr<OtlpHttpClient> http_client)
-  {
-    return std::unique_ptr<sdk::trace::SpanExporter>(new OtlpHttpExporter(std::move(http_client)));
-  }
-
-  // Get the options associated with the given exporter.
-  const OtlpHttpExporterOptions &GetOptions(std::unique_ptr<OtlpHttpExporter> &exporter)
-  {
-    return exporter->options_;
-  }
-
-  static std::pair<OtlpHttpClient *, std::shared_ptr<http_client::HttpClient>>
-  GetMockOtlpHttpClient(HttpRequestContentType content_type, bool async_mode = false)
-  {
-    auto http_client = http_client::HttpClientTestFactory::Create();
-    return {new OtlpHttpClient(MakeOtlpHttpClientOptions(content_type, async_mode), http_client),
-            http_client};
-  }
-
-  void ExportJsonIntegrationTest()
-  {
-    auto mock_otlp_client =
-        OtlpHttpExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kJson);
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    resource::ResourceAttributes resource_attributes = {{"service.name", "unit_test_service"},
-                                                        {"tenant.id", "test_user"}};
-    resource_attributes["bool_value"]                = true;
-    resource_attributes["int32_value"]               = static_cast<int32_t>(1);
-    resource_attributes["uint32_value"]              = static_cast<uint32_t>(2);
-    resource_attributes["int64_value"]               = static_cast<int64_t>(0x1100000000LL);
-    resource_attributes["uint64_value"]              = static_cast<uint64_t>(0x1200000000ULL);
-    resource_attributes["double_value"]              = static_cast<double>(3.1);
-    resource_attributes["vec_bool_value"]            = std::vector<bool>{true, false, true};
-    resource_attributes["vec_int32_value"]           = std::vector<int32_t>{1, 2};
-    resource_attributes["vec_uint32_value"]          = std::vector<uint32_t>{3, 4};
-    resource_attributes["vec_int64_value"]           = std::vector<int64_t>{5, 6};
-    resource_attributes["vec_uint64_value"]          = std::vector<uint64_t>{7, 8};
-    resource_attributes["vec_double_value"]          = std::vector<double>{3.2, 3.3};
-    resource_attributes["vec_string_value"]          = std::vector<std::string>{"vector", "string"};
-    auto resource = resource::Resource::Create(resource_attributes);
-
-    auto processor_opts                  = sdk::trace::BatchSpanProcessorOptions();
-    processor_opts.max_export_batch_size = 5;
-    processor_opts.max_queue_size        = 5;
-    processor_opts.schedule_delay_millis = std::chrono::milliseconds(256);
-
-    auto processor = std::unique_ptr<sdk::trace::SpanProcessor>(
-        new sdk::trace::BatchSpanProcessor(std::move(exporter), processor_opts));
-    auto provider = nostd::shared_ptr<sdk::trace::TracerProvider>(
-        new sdk::trace::TracerProvider(std::move(processor), resource));
-
-    std::string report_trace_id;
-
-    char trace_id_hex[2 * trace_api::TraceId::kSize] = {0};
-    auto tracer                                      = provider->GetTracer("test");
-    auto parent_span                                 = tracer->StartSpan("Test parent span");
-
-    trace_api::StartSpanOptions child_span_opts = {};
-    child_span_opts.parent                      = parent_span->GetContext();
-
-    auto child_span = tracer->StartSpan("Test child span", child_span_opts);
-
-    nostd::get<trace_api::SpanContext>(child_span_opts.parent)
-        .trace_id()
-        .ToLowerBase16(MakeSpan(trace_id_hex));
-    report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex));
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              auto check_json =
-                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-              auto resource_span     = *check_json["resourceSpans"].begin();
-              auto scope_span        = *resource_span["scopeSpans"].begin();
-              auto span              = *scope_span["spans"].begin();
-              auto received_trace_id = span["traceId"].get<std::string>();
-              EXPECT_EQ(received_trace_id, report_trace_id);
-
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              auto user_agent_header = mock_session->GetRequest()->headers_.find("User-Agent");
-              ASSERT_TRUE(user_agent_header != mock_session->GetRequest()->headers_.end());
-              if (user_agent_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ(GetOtlpDefaultUserAgent(), user_agent_header->second);
-              }
-
-              // let the otlp_http_client to continue
-              http_client::nosend::Response response;
-              response.Finish(*callback.get());
-            });
-
-    child_span->End();
-    parent_span->End();
-
-    provider->ForceFlush();
-  }
-
-#  ifdef ENABLE_ASYNC_EXPORT
-  void ExportJsonIntegrationTestAsync()
-  {
-    auto mock_otlp_client =
-        OtlpHttpExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kJson, true);
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    resource::ResourceAttributes resource_attributes = {{"service.name", "unit_test_service"},
-                                                        {"tenant.id", "test_user"}};
-    resource_attributes["bool_value"]                = true;
-    resource_attributes["int32_value"]               = static_cast<int32_t>(1);
-    resource_attributes["uint32_value"]              = static_cast<uint32_t>(2);
-    resource_attributes["int64_value"]               = static_cast<int64_t>(0x1100000000LL);
-    resource_attributes["uint64_value"]              = static_cast<uint64_t>(0x1200000000ULL);
-    resource_attributes["double_value"]              = static_cast<double>(3.1);
-    resource_attributes["vec_bool_value"]            = std::vector<bool>{true, false, true};
-    resource_attributes["vec_int32_value"]           = std::vector<int32_t>{1, 2};
-    resource_attributes["vec_uint32_value"]          = std::vector<uint32_t>{3, 4};
-    resource_attributes["vec_int64_value"]           = std::vector<int64_t>{5, 6};
-    resource_attributes["vec_uint64_value"]          = std::vector<uint64_t>{7, 8};
-    resource_attributes["vec_double_value"]          = std::vector<double>{3.2, 3.3};
-    resource_attributes["vec_string_value"]          = std::vector<std::string>{"vector", "string"};
-    auto resource = resource::Resource::Create(resource_attributes);
-
-    auto processor_opts                  = sdk::trace::BatchSpanProcessorOptions();
-    processor_opts.max_export_batch_size = 5;
-    processor_opts.max_queue_size        = 5;
-    processor_opts.schedule_delay_millis = std::chrono::milliseconds(256);
-
-    auto processor = std::unique_ptr<sdk::trace::SpanProcessor>(
-        new sdk::trace::BatchSpanProcessor(std::move(exporter), processor_opts));
-    auto provider = nostd::shared_ptr<sdk::trace::TracerProvider>(
-        new sdk::trace::TracerProvider(std::move(processor), resource));
-
-    std::string report_trace_id;
-
-    char trace_id_hex[2 * trace_api::TraceId::kSize] = {0};
-    auto tracer                                      = provider->GetTracer("test");
-    auto parent_span                                 = tracer->StartSpan("Test parent span");
-
-    trace_api::StartSpanOptions child_span_opts = {};
-    child_span_opts.parent                      = parent_span->GetContext();
-
-    auto child_span = tracer->StartSpan("Test child span", child_span_opts);
-
-    nostd::get<trace_api::SpanContext>(child_span_opts.parent)
-        .trace_id()
-        .ToLowerBase16(MakeSpan(trace_id_hex));
-    report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex));
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              auto check_json =
-                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-              auto resource_span     = *check_json["resourceSpans"].begin();
-              auto scope_span        = *resource_span["scopeSpans"].begin();
-              auto span              = *scope_span["spans"].begin();
-              auto received_trace_id = span["traceId"].get<std::string>();
-              EXPECT_EQ(received_trace_id, report_trace_id);
-
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              auto user_agent_header = mock_session->GetRequest()->headers_.find("User-Agent");
-              ASSERT_TRUE(user_agent_header != mock_session->GetRequest()->headers_.end());
-              if (user_agent_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ(GetOtlpDefaultUserAgent(), user_agent_header->second);
-              }
-
-              // let the otlp_http_client to continue
-              std::thread async_finish{[callback]() {
-                std::this_thread::sleep_for(std::chrono::milliseconds(100));
-                http_client::nosend::Response response;
-                response.Finish(*callback.get());
-              }};
-              async_finish.detach();
-            });
-
-    child_span->End();
-    parent_span->End();
-
-    provider->ForceFlush();
-  }
-#  endif
-
-  void ExportBinaryIntegrationTest()
-  {
-    auto mock_otlp_client =
-        OtlpHttpExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kBinary);
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    resource::ResourceAttributes resource_attributes = {{"service.name", "unit_test_service"},
-                                                        {"tenant.id", "test_user"}};
-    resource_attributes["bool_value"]                = true;
-    resource_attributes["int32_value"]               = static_cast<int32_t>(1);
-    resource_attributes["uint32_value"]              = static_cast<uint32_t>(2);
-    resource_attributes["int64_value"]               = static_cast<int64_t>(0x1100000000LL);
-    resource_attributes["uint64_value"]              = static_cast<uint64_t>(0x1200000000ULL);
-    resource_attributes["double_value"]              = static_cast<double>(3.1);
-    resource_attributes["vec_bool_value"]            = std::vector<bool>{true, false, true};
-    resource_attributes["vec_int32_value"]           = std::vector<int32_t>{1, 2};
-    resource_attributes["vec_uint32_value"]          = std::vector<uint32_t>{3, 4};
-    resource_attributes["vec_int64_value"]           = std::vector<int64_t>{5, 6};
-    resource_attributes["vec_uint64_value"]          = std::vector<uint64_t>{7, 8};
-    resource_attributes["vec_double_value"]          = std::vector<double>{3.2, 3.3};
-    resource_attributes["vec_string_value"]          = std::vector<std::string>{"vector", "string"};
-    auto resource = resource::Resource::Create(resource_attributes);
-
-    auto processor_opts                  = sdk::trace::BatchSpanProcessorOptions();
-    processor_opts.max_export_batch_size = 5;
-    processor_opts.max_queue_size        = 5;
-    processor_opts.schedule_delay_millis = std::chrono::milliseconds(256);
-
-    auto processor = std::unique_ptr<sdk::trace::SpanProcessor>(
-        new sdk::trace::BatchSpanProcessor(std::move(exporter), processor_opts));
-    auto provider = nostd::shared_ptr<sdk::trace::TracerProvider>(
-        new sdk::trace::TracerProvider(std::move(processor), resource));
-
-    std::string report_trace_id;
-
-    uint8_t trace_id_binary[trace_api::TraceId::kSize] = {0};
-    auto tracer                                        = provider->GetTracer("test");
-    auto parent_span                                   = tracer->StartSpan("Test parent span");
-
-    trace_api::StartSpanOptions child_span_opts = {};
-    child_span_opts.parent                      = parent_span->GetContext();
-
-    auto child_span = tracer->StartSpan("Test child span", child_span_opts);
-    nostd::get<trace_api::SpanContext>(child_span_opts.parent)
-        .trace_id()
-        .CopyBytesTo(MakeSpan(trace_id_binary));
-    report_trace_id.assign(reinterpret_cast<char *>(trace_id_binary), sizeof(trace_id_binary));
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
-              request_body.ParseFromArray(
-                  &mock_session->GetRequest()->body_[0],
-                  static_cast<int>(mock_session->GetRequest()->body_.size()));
-              auto received_trace_id =
-                  request_body.resource_spans(0).scope_spans(0).spans(0).trace_id();
-              EXPECT_EQ(received_trace_id, report_trace_id);
-
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              http_client::nosend::Response response;
-              response.Finish(*callback.get());
-            });
-
-    child_span->End();
-    parent_span->End();
-
-    provider->ForceFlush();
-  }
-
-#  ifdef ENABLE_ASYNC_EXPORT
-  void ExportBinaryIntegrationTestAsync()
-  {
-    auto mock_otlp_client =
-        OtlpHttpExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kBinary, true);
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    resource::ResourceAttributes resource_attributes = {{"service.name", "unit_test_service"},
-                                                        {"tenant.id", "test_user"}};
-    resource_attributes["bool_value"]                = true;
-    resource_attributes["int32_value"]               = static_cast<int32_t>(1);
-    resource_attributes["uint32_value"]              = static_cast<uint32_t>(2);
-    resource_attributes["int64_value"]               = static_cast<int64_t>(0x1100000000LL);
-    resource_attributes["uint64_value"]              = static_cast<uint64_t>(0x1200000000ULL);
-    resource_attributes["double_value"]              = static_cast<double>(3.1);
-    resource_attributes["vec_bool_value"]            = std::vector<bool>{true, false, true};
-    resource_attributes["vec_int32_value"]           = std::vector<int32_t>{1, 2};
-    resource_attributes["vec_uint32_value"]          = std::vector<uint32_t>{3, 4};
-    resource_attributes["vec_int64_value"]           = std::vector<int64_t>{5, 6};
-    resource_attributes["vec_uint64_value"]          = std::vector<uint64_t>{7, 8};
-    resource_attributes["vec_double_value"]          = std::vector<double>{3.2, 3.3};
-    resource_attributes["vec_string_value"]          = std::vector<std::string>{"vector", "string"};
-    auto resource = resource::Resource::Create(resource_attributes);
-
-    auto processor_opts                  = sdk::trace::BatchSpanProcessorOptions();
-    processor_opts.max_export_batch_size = 5;
-    processor_opts.max_queue_size        = 5;
-    processor_opts.schedule_delay_millis = std::chrono::milliseconds(256);
-
-    auto processor = std::unique_ptr<sdk::trace::SpanProcessor>(
-        new sdk::trace::BatchSpanProcessor(std::move(exporter), processor_opts));
-    auto provider = nostd::shared_ptr<sdk::trace::TracerProvider>(
-        new sdk::trace::TracerProvider(std::move(processor), resource));
-
-    std::string report_trace_id;
-
-    uint8_t trace_id_binary[trace_api::TraceId::kSize] = {0};
-    auto tracer                                        = provider->GetTracer("test");
-    auto parent_span                                   = tracer->StartSpan("Test parent span");
-
-    trace_api::StartSpanOptions child_span_opts = {};
-    child_span_opts.parent                      = parent_span->GetContext();
-
-    auto child_span = tracer->StartSpan("Test child span", child_span_opts);
-    nostd::get<trace_api::SpanContext>(child_span_opts.parent)
-        .trace_id()
-        .CopyBytesTo(MakeSpan(trace_id_binary));
-    report_trace_id.assign(reinterpret_cast<char *>(trace_id_binary), sizeof(trace_id_binary));
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
-              request_body.ParseFromArray(
-                  &mock_session->GetRequest()->body_[0],
-                  static_cast<int>(mock_session->GetRequest()->body_.size()));
-              auto received_trace_id =
-                  request_body.resource_spans(0).scope_spans(0).spans(0).trace_id();
-              EXPECT_EQ(received_trace_id, report_trace_id);
-
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              // let the otlp_http_client to continue
-              std::thread async_finish{[callback]() {
-                std::this_thread::sleep_for(std::chrono::milliseconds(100));
-                http_client::nosend::Response response;
-                response.Finish(*callback.get());
-              }};
-              async_finish.detach();
-            });
-
-    child_span->End();
-    parent_span->End();
-
-    provider->ForceFlush();
-  }
-#  endif
-};
-
-TEST(OtlpHttpExporterTest, Shutdown)
-{
-  auto exporter = std::unique_ptr<opentelemetry::sdk::trace::SpanExporter>(new OtlpHttpExporter());
-  ASSERT_TRUE(exporter->Shutdown());
-
-  nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> spans = {};
-
-  auto result = exporter->Export(spans);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-// Create spans, let processor call Export()
-TEST_F(OtlpHttpExporterTestPeer, ExportJsonIntegrationTestSync)
-{
-  ExportJsonIntegrationTest();
-}
-
-#  ifdef ENABLE_ASYNC_EXPORT
-TEST_F(OtlpHttpExporterTestPeer, ExportJsonIntegrationTestAsync)
-{
-  ExportJsonIntegrationTestAsync();
-  google::protobuf::ShutdownProtobufLibrary();
-}
-#  endif
-
-// Create spans, let processor call Export()
-TEST_F(OtlpHttpExporterTestPeer, ExportBinaryIntegrationTestSync)
-{
-  ExportBinaryIntegrationTest();
-}
-
-#  ifdef ENABLE_ASYNC_EXPORT
-TEST_F(OtlpHttpExporterTestPeer, ExportBinaryIntegrationTestAsync)
-{
-  ExportBinaryIntegrationTestAsync();
-}
-#  endif
-
-// Test exporter configuration options
-TEST_F(OtlpHttpExporterTestPeer, ConfigTest)
-{
-  OtlpHttpExporterOptions opts;
-  opts.url = "http://localhost:45455/v1/traces";
-  std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).url, "http://localhost:45455/v1/traces");
-}
-
-// Test exporter configuration options with use_json_name
-TEST_F(OtlpHttpExporterTestPeer, ConfigUseJsonNameTest)
-{
-  OtlpHttpExporterOptions opts;
-  opts.use_json_name = true;
-  std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).use_json_name, true);
-}
-
-// Test exporter configuration options with json_bytes_mapping=JsonBytesMappingKind::kHex
-TEST_F(OtlpHttpExporterTestPeer, ConfigJsonBytesMappingTest)
-{
-  OtlpHttpExporterOptions opts;
-  opts.json_bytes_mapping = JsonBytesMappingKind::kHex;
-  std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).json_bytes_mapping, JsonBytesMappingKind::kHex);
-}
-
-TEST(OtlpHttpExporterTest, ConfigDefaultProtocolTest)
-{
-  OtlpHttpExporterOptions opts;
-  EXPECT_EQ(opts.content_type, HttpRequestContentType::kBinary);
-}
-
-#  ifndef NO_GETENV
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpHttpExporterTestPeer, ConfigFromEnv)
-{
-  const std::string url = "http://localhost:9999/v1/traces";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:9999", 1);
-  setenv("OTEL_EXPORTER_OTLP_TIMEOUT", "20s", 1);
-  setenv("OTEL_EXPORTER_OTLP_HEADERS", "k1=v1,k2=v2", 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_HEADERS", "k1=v3,k1=v4", 1);
-  setenv("OTEL_EXPORTER_OTLP_PROTOCOL", "http/json", 1);
-
-  std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
-  EXPECT_EQ(GetOptions(exporter).url, url);
-  EXPECT_EQ(
-      GetOptions(exporter).timeout.count(),
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{20})
-          .count());
-  EXPECT_EQ(GetOptions(exporter).http_headers.size(), 3);
-  {
-    // Test k2
-    auto range = GetOptions(exporter).http_headers.equal_range("k2");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v2"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  {
-    // k1
-    auto range = GetOptions(exporter).http_headers.equal_range("k1");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v3"));
-    ++range.first;
-    EXPECT_EQ(range.first->second, std::string("v4"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  EXPECT_EQ(GetOptions(exporter).content_type, HttpRequestContentType::kJson);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_TIMEOUT");
-  unsetenv("OTEL_EXPORTER_OTLP_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_PROTOCOL");
-}
-
-TEST_F(OtlpHttpExporterTestPeer, ConfigFromTracesEnv)
-{
-  const std::string url = "http://localhost:9999/v1/traces";
-  setenv("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", url.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_TIMEOUT", "1eternity", 1);
-  setenv("OTEL_EXPORTER_OTLP_HEADERS", "k1=v1,k2=v2", 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_HEADERS", "k1=v3,k1=v4", 1);
-  setenv("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "http/json", 1);
-
-  std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
-  EXPECT_EQ(GetOptions(exporter).url, url);
-  EXPECT_EQ(
-      GetOptions(exporter).timeout.count(),
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{10})
-          .count());
-  EXPECT_EQ(GetOptions(exporter).http_headers.size(), 3);
-  {
-    // Test k2
-    auto range = GetOptions(exporter).http_headers.equal_range("k2");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v2"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  {
-    // k1
-    auto range = GetOptions(exporter).http_headers.equal_range("k1");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v3"));
-    ++range.first;
-    EXPECT_EQ(range.first->second, std::string("v4"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  EXPECT_EQ(GetOptions(exporter).content_type, HttpRequestContentType::kJson);
-
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_TIMEOUT");
-  unsetenv("OTEL_EXPORTER_OTLP_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL");
-}
-
-TEST_F(OtlpHttpExporterTestPeer, ConfigRetryDefaultValues)
-{
-  std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 5);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
-}
-
-TEST_F(OtlpHttpExporterTestPeer, ConfigRetryValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS", "123", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF", "4.5", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_BACKOFF", "6.7", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_BACKOFF_MULTIPLIER", "8.9", 1);
-
-  std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 123);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_BACKOFF_MULTIPLIER");
-}
-
-TEST_F(OtlpHttpExporterTestPeer, ConfigRetryGenericValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS", "321", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF", "5.4", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF", "7.6", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER", "9.8", 1);
-
-  std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 321);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER");
-}
-#  endif  // NO_GETENV
-
-#  ifdef ENABLE_OTLP_RETRY_PREVIEW
-using StatusCodeVector = std::vector<int>;
-
-class OtlpHttpExporterRetryIntegrationTests
-    : public ::testing::TestWithParam<std::tuple<bool, StatusCodeVector, std::size_t>>
-{};
-
-INSTANTIATE_TEST_SUITE_P(StatusCodes,
-                         OtlpHttpExporterRetryIntegrationTests,
-                         testing::Values(
-                             // With retry policy enabled
-                             std::make_tuple(true, StatusCodeVector{100}, 1),
-                             std::make_tuple(true, StatusCodeVector{200}, 1),
-                             std::make_tuple(true, StatusCodeVector{201}, 1),
-                             std::make_tuple(true, StatusCodeVector{202}, 1),
-                             std::make_tuple(true, StatusCodeVector{204}, 1),
-                             std::make_tuple(true, StatusCodeVector{302}, 1),
-                             std::make_tuple(true, StatusCodeVector{400}, 1),
-                             std::make_tuple(true, StatusCodeVector{401}, 1),
-                             std::make_tuple(true, StatusCodeVector{403}, 1),
-                             std::make_tuple(true, StatusCodeVector{404}, 1),
-                             std::make_tuple(true, StatusCodeVector{405}, 1),
-                             std::make_tuple(true, StatusCodeVector{429}, 5),
-                             std::make_tuple(true, StatusCodeVector{500}, 1),
-                             std::make_tuple(true, StatusCodeVector{501}, 1),
-                             std::make_tuple(true, StatusCodeVector{502}, 5),
-                             std::make_tuple(true, StatusCodeVector{503}, 5),
-                             std::make_tuple(true, StatusCodeVector{504}, 5),
-                             std::make_tuple(true, StatusCodeVector{429, 502, 503, 504}, 5),
-                             std::make_tuple(true, StatusCodeVector{503, 503, 503, 200}, 4),
-                             std::make_tuple(true, StatusCodeVector{429, 503, 504, 200}, 4),
-                             // With retry policy disabled
-                             std::make_tuple(false, StatusCodeVector{100}, 1),
-                             std::make_tuple(false, StatusCodeVector{200}, 1),
-                             std::make_tuple(false, StatusCodeVector{201}, 1),
-                             std::make_tuple(false, StatusCodeVector{202}, 1),
-                             std::make_tuple(false, StatusCodeVector{204}, 1),
-                             std::make_tuple(false, StatusCodeVector{302}, 1),
-                             std::make_tuple(false, StatusCodeVector{400}, 1),
-                             std::make_tuple(false, StatusCodeVector{401}, 1),
-                             std::make_tuple(false, StatusCodeVector{403}, 1),
-                             std::make_tuple(false, StatusCodeVector{404}, 1),
-                             std::make_tuple(false, StatusCodeVector{405}, 1),
-                             std::make_tuple(false, StatusCodeVector{429}, 1),
-                             std::make_tuple(false, StatusCodeVector{500}, 1),
-                             std::make_tuple(false, StatusCodeVector{501}, 1),
-                             std::make_tuple(false, StatusCodeVector{502}, 1),
-                             std::make_tuple(false, StatusCodeVector{503}, 1),
-                             std::make_tuple(false, StatusCodeVector{504}, 1),
-                             std::make_tuple(false, StatusCodeVector{429, 502, 503, 504}, 1),
-                             std::make_tuple(false, StatusCodeVector{503, 503, 503, 200}, 1),
-                             std::make_tuple(false, StatusCodeVector{429, 503, 504, 200}, 1)));
-
-TEST_P(OtlpHttpExporterRetryIntegrationTests, StatusCodes)
-{
-  namespace otlp      = opentelemetry::exporter::otlp;
-  namespace trace_sdk = opentelemetry::sdk::trace;
-
-  const auto is_retry_enabled  = std::get<0>(GetParam());
-  const auto status_codes      = std::get<1>(GetParam());
-  const auto expected_attempts = std::get<2>(GetParam());
-
-  size_t request_count = 0UL;
-  HTTP_SERVER_NS::HttpRequestCallback request_handler{
-      [&request_count, &status_codes](HTTP_SERVER_NS::HttpRequest const & /* request */,
-                                      HTTP_SERVER_NS::HttpResponse &response) {
-        response.body = "TEST!";
-        response.code = status_codes.at(request_count++ % status_codes.size());
-        return response.code;
-      }};
-  HTTP_SERVER_NS::HttpServer server;
-  server.setKeepalive(true);
-  server.setServerName("test_server");
-  server.addHandler("/v1/traces", request_handler);
-  ASSERT_EQ(server.addListeningPort(4318), 4318);
-  server.start();
-
-  otlp::OtlpHttpExporterOptions opts{};
-
-  if (is_retry_enabled)
-  {
-    opts.retry_policy_max_attempts       = 5;
-    opts.retry_policy_initial_backoff    = std::chrono::duration<float>{0.1f};
-    opts.retry_policy_max_backoff        = std::chrono::duration<float>{5.0f};
-    opts.retry_policy_backoff_multiplier = 1.0f;
-  }
-  else
-  {
-    opts.retry_policy_max_attempts       = 0;
-    opts.retry_policy_initial_backoff    = std::chrono::duration<float>::zero();
-    opts.retry_policy_max_backoff        = std::chrono::duration<float>::zero();
-    opts.retry_policy_backoff_multiplier = 0.0f;
-  }
-
-  auto exporter  = otlp::OtlpHttpExporterFactory::Create(opts);
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  auto provider  = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-  provider->GetTracer("Test tracer")->StartSpan("Test span")->End();
-  provider->ForceFlush();
-  server.stop();
-
-  ASSERT_EQ(expected_attempts, request_count);
-}
-#  endif  // ENABLE_OTLP_RETRY_PREVIEW
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_STL_VERSION */
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_log_record_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_log_record_exporter_factory_test.cc
deleted file mode 100644
index 93f2fede1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_log_record_exporter_factory_test.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/version.h"
-
-/*
-  Make sure OtlpHttpExporterFactory does not require,
-  even indirectly, nlohmann/json headers.
-*/
-#ifdef NLOHMANN_JSON_VERSION_MAJOR
-#  error "nlohmann/json should not be included"
-#endif /* NLOHMANN_JSON_VERSION_MAJOR */
-
-/*
-  Make sure OtlpHttpExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpHttpLogRecordExporterFactoryTest, BuildTest)
-{
-  OtlpHttpLogRecordExporterOptions opts;
-  opts.url = "localhost:45454";
-
-  std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> exporter =
-      OtlpHttpLogRecordExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_log_record_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_log_record_exporter_test.cc
deleted file mode 100644
index fd84953f8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_log_record_exporter_test.cc
+++ /dev/null
@@ -1,814 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifndef OPENTELEMETRY_STL_VERSION
-
-#  include <chrono>
-#  include <thread>
-
-#  include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h"
-
-#  include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
-
-#  include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-
-#  include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
-
-#  include "opentelemetry/common/key_value_iterable_view.h"
-#  include "opentelemetry/ext/http/client/http_client_factory.h"
-#  include "opentelemetry/ext/http/server/http_server.h"
-#  include "opentelemetry/logs/provider.h"
-#  include "opentelemetry/sdk/logs/batch_log_record_processor.h"
-#  include "opentelemetry/sdk/logs/exporter.h"
-#  include "opentelemetry/sdk/logs/logger_provider.h"
-#  include "opentelemetry/sdk/resource/resource.h"
-#  include "opentelemetry/test_common/ext/http/client/http_client_test_factory.h"
-#  include "opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h"
-
-#  include <google/protobuf/message_lite.h>
-#  include <gtest/gtest.h>
-#  include "gmock/gmock.h"
-
-#  include "nlohmann/json.hpp"
-
-#  if defined(_MSC_VER)
-#    include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#  endif
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-template <class T, size_t N>
-static nostd::span<T, N> MakeSpan(T (&array)[N])
-{
-  return nostd::span<T, N>(array);
-}
-
-OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
-                                                bool async_mode)
-{
-  std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation> not_instrumented;
-  OtlpHttpLogRecordExporterOptions options;
-  options.content_type  = content_type;
-  options.console_debug = true;
-  options.http_headers.insert(std::make_pair("Custom-Header-Key", "Custom-Header-Value"));
-  options.retry_policy_max_attempts       = 0U;
-  options.retry_policy_initial_backoff    = std::chrono::duration<float>::zero();
-  options.retry_policy_max_backoff        = std::chrono::duration<float>::zero();
-  options.retry_policy_backoff_multiplier = 0.0f;
-  OtlpHttpClientOptions otlp_http_client_options(
-      options.url, false, /* ssl_insecure_skip_verify */
-      "",                 /* ssl_ca_cert_path */
-      "",                 /* ssl_ca_cert_string */
-      "",                 /* ssl_client_key_path */
-      "",                 /* ssl_client_key_string */
-      "",                 /* ssl_client_cert_path */
-      "",                 /* ssl_client_cert_string */
-      "",                 /* ssl_min_tls */
-      "",                 /* ssl_max_tls */
-      "",                 /* ssl_cipher */
-      "",                 /* ssl_cipher_suite */
-      options.content_type, options.json_bytes_mapping, options.compression, options.use_json_name,
-      options.console_debug, options.timeout, options.http_headers,
-      options.retry_policy_max_attempts, options.retry_policy_initial_backoff,
-      options.retry_policy_max_backoff, options.retry_policy_backoff_multiplier, not_instrumented);
-  if (!async_mode)
-  {
-    otlp_http_client_options.max_concurrent_requests = 0;
-  }
-  return otlp_http_client_options;
-}
-
-namespace http_client = opentelemetry::ext::http::client;
-
-class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
-{
-public:
-  std::unique_ptr<sdk::logs::LogRecordExporter> GetExporter(
-      std::unique_ptr<OtlpHttpClient> http_client)
-  {
-    return std::unique_ptr<sdk::logs::LogRecordExporter>(
-        new OtlpHttpLogRecordExporter(std::move(http_client)));
-  }
-
-  // Get the options associated with the given exporter.
-  const OtlpHttpLogRecordExporterOptions &GetOptions(
-      std::unique_ptr<OtlpHttpLogRecordExporter> &exporter)
-  {
-    return exporter->options_;
-  }
-  static std::pair<OtlpHttpClient *, std::shared_ptr<http_client::HttpClient>>
-  GetMockOtlpHttpClient(HttpRequestContentType content_type, bool async_mode = false)
-  {
-    auto http_client = http_client::HttpClientTestFactory::Create();
-    return {new OtlpHttpClient(MakeOtlpHttpClientOptions(content_type, async_mode), http_client),
-            http_client};
-  }
-
-  void ExportJsonIntegrationTest()
-  {
-    auto mock_otlp_client =
-        OtlpHttpLogRecordExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kJson);
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    bool attribute_storage_bool_value[]                                = {true, false, true};
-    int32_t attribute_storage_int32_value[]                            = {1, 2};
-    uint32_t attribute_storage_uint32_value[]                          = {3, 4};
-    int64_t attribute_storage_int64_value[]                            = {5, 6};
-    uint64_t attribute_storage_uint64_value[]                          = {7, 8};
-    double attribute_storage_double_value[]                            = {3.2, 3.3};
-    opentelemetry::nostd::string_view attribute_storage_string_value[] = {"vector", "string"};
-
-    auto provider = nostd::shared_ptr<sdk::logs::LoggerProvider>(new sdk::logs::LoggerProvider());
-
-    provider->AddProcessor(
-        std::unique_ptr<sdk::logs::LogRecordProcessor>(new sdk::logs::BatchLogRecordProcessor(
-            std::move(exporter), 5, std::chrono::milliseconds(256), 5)));
-
-    std::string report_trace_id;
-    std::string report_span_id;
-    uint8_t trace_id_bin[opentelemetry::trace::TraceId::kSize] = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-    char trace_id_hex[2 * opentelemetry::trace::TraceId::kSize] = {0};
-    opentelemetry::trace::TraceId trace_id{trace_id_bin};
-    uint8_t span_id_bin[opentelemetry::trace::SpanId::kSize]  = {'7', '6', '5', '4',
-                                                                 '3', '2', '1', '0'};
-    char span_id_hex[2 * opentelemetry::trace::SpanId::kSize] = {0};
-    opentelemetry::trace::SpanId span_id{span_id_bin};
-
-    const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-    auto logger = provider->GetLogger("test", "opentelelemtry_library", "", schema_url,
-                                      {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-
-    trace_id.ToLowerBase16(MakeSpan(trace_id_hex));
-    report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex));
-
-    span_id.ToLowerBase16(MakeSpan(span_id_hex));
-    report_span_id.assign(span_id_hex, sizeof(span_id_hex));
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id, report_span_id](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              auto check_json =
-                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-              auto resource_logs     = *check_json["resourceLogs"].begin();
-              auto scope_logs        = *resource_logs["scopeLogs"].begin();
-              auto scope             = scope_logs["scope"];
-              auto log               = *scope_logs["logRecords"].begin();
-              auto received_trace_id = log["traceId"].get<std::string>();
-              auto received_span_id  = log["spanId"].get<std::string>();
-              EXPECT_EQ(received_trace_id, report_trace_id);
-              EXPECT_EQ(received_span_id, report_span_id);
-              EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
-              EXPECT_LE(15, log["attributes"].size());
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              bool check_scope_attribute = false;
-              auto scope_attributes      = scope["attributes"];
-              for (auto &attribute : scope_attributes)
-              {
-                if (!attribute.is_object())
-                {
-                  continue;
-                }
-                if ("scope_key1" == attribute["key"])
-                {
-                  check_scope_attribute = true;
-                  EXPECT_EQ("scope_value", attribute["value"]["stringValue"].get<std::string>());
-                }
-              }
-              ASSERT_TRUE(check_scope_attribute);
-
-              http_client::nosend::Response response;
-              response.Finish(*callback.get());
-            });
-
-    logger->EmitLogRecord(
-        opentelemetry::logs::Severity::kInfo, "Log message",
-        opentelemetry::common::MakeAttributes(
-            {{"service.name", "unit_test_service"},
-             {"tenant.id", "test_user"},
-             {"bool_value", true},
-             {"int32_value", static_cast<int32_t>(1)},
-             {"uint32_value", static_cast<uint32_t>(2)},
-             {"int64_value", static_cast<int64_t>(0x1100000000LL)},
-             {"uint64_value", static_cast<uint64_t>(0x1200000000ULL)},
-             {"double_value", static_cast<double>(3.1)},
-             {"vec_bool_value", attribute_storage_bool_value},
-             {"vec_int32_value", attribute_storage_int32_value},
-             {"vec_uint32_value", attribute_storage_uint32_value},
-             {"vec_int64_value", attribute_storage_int64_value},
-             {"vec_uint64_value", attribute_storage_uint64_value},
-             {"vec_double_value", attribute_storage_double_value},
-             {"vec_string_value", attribute_storage_string_value}}),
-        trace_id, span_id,
-        opentelemetry::trace::TraceFlags{opentelemetry::trace::TraceFlags::kIsSampled},
-        std::chrono::system_clock::now());
-
-    provider->ForceFlush();
-  }
-
-#  ifdef ENABLE_ASYNC_EXPORT
-  void ExportJsonIntegrationTestAsync()
-  {
-    auto mock_otlp_client = OtlpHttpLogRecordExporterTestPeer::GetMockOtlpHttpClient(
-        HttpRequestContentType::kJson, true);
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    bool attribute_storage_bool_value[]                                = {true, false, true};
-    int32_t attribute_storage_int32_value[]                            = {1, 2};
-    uint32_t attribute_storage_uint32_value[]                          = {3, 4};
-    int64_t attribute_storage_int64_value[]                            = {5, 6};
-    uint64_t attribute_storage_uint64_value[]                          = {7, 8};
-    double attribute_storage_double_value[]                            = {3.2, 3.3};
-    opentelemetry::nostd::string_view attribute_storage_string_value[] = {"vector", "string"};
-
-    auto provider = nostd::shared_ptr<sdk::logs::LoggerProvider>(new sdk::logs::LoggerProvider());
-    sdk::logs::BatchLogRecordProcessorOptions options;
-    options.max_queue_size        = 5;
-    options.schedule_delay_millis = std::chrono::milliseconds(256);
-    options.max_export_batch_size = 5;
-
-    provider->AddProcessor(std::unique_ptr<sdk::logs::LogRecordProcessor>(
-        new sdk::logs::BatchLogRecordProcessor(std::move(exporter), options)));
-
-    std::string report_trace_id;
-    std::string report_span_id;
-    uint8_t trace_id_bin[opentelemetry::trace::TraceId::kSize] = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-    char trace_id_hex[2 * opentelemetry::trace::TraceId::kSize] = {0};
-    opentelemetry::trace::TraceId trace_id{trace_id_bin};
-    uint8_t span_id_bin[opentelemetry::trace::SpanId::kSize]  = {'7', '6', '5', '4',
-                                                                 '3', '2', '1', '0'};
-    char span_id_hex[2 * opentelemetry::trace::SpanId::kSize] = {0};
-    opentelemetry::trace::SpanId span_id{span_id_bin};
-
-    const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-    auto logger = provider->GetLogger("test", "opentelelemtry_library", "1.2.0", schema_url,
-                                      {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-
-    trace_id.ToLowerBase16(MakeSpan(trace_id_hex));
-    report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex));
-
-    span_id.ToLowerBase16(MakeSpan(span_id_hex));
-    report_span_id.assign(span_id_hex, sizeof(span_id_hex));
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id, report_span_id](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              auto check_json =
-                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-              auto resource_logs     = *check_json["resourceLogs"].begin();
-              auto scope_logs        = *resource_logs["scopeLogs"].begin();
-              auto schema_url        = scope_logs["schemaUrl"].get<std::string>();
-              auto scope             = scope_logs["scope"];
-              auto scope_name        = scope["name"];
-              auto scope_version     = scope["version"];
-              auto log               = *scope_logs["logRecords"].begin();
-              auto received_trace_id = log["traceId"].get<std::string>();
-              auto received_span_id  = log["spanId"].get<std::string>();
-              EXPECT_EQ(schema_url, "https://opentelemetry.io/schemas/1.2.0");
-              EXPECT_EQ(scope_name, "opentelelemtry_library");
-              EXPECT_EQ(scope_version, "1.2.0");
-              EXPECT_EQ(received_trace_id, report_trace_id);
-              EXPECT_EQ(received_span_id, report_span_id);
-              EXPECT_EQ("Log message", log["body"]["stringValue"].get<std::string>());
-              EXPECT_LE(15, log["attributes"].size());
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              bool check_scope_attribute = false;
-              auto scope_attributes      = scope["attributes"];
-              for (auto &attribute : scope_attributes)
-              {
-                if (!attribute.is_object())
-                {
-                  continue;
-                }
-                if ("scope_key1" == attribute["key"])
-                {
-                  check_scope_attribute = true;
-                  EXPECT_EQ("scope_value", attribute["value"]["stringValue"].get<std::string>());
-                }
-              }
-              ASSERT_TRUE(check_scope_attribute);
-
-              // let the otlp_http_client to continue
-              std::thread async_finish{[callback]() {
-                std::this_thread::sleep_for(std::chrono::milliseconds(100));
-                http_client::nosend::Response response;
-                response.Finish(*callback.get());
-              }};
-              async_finish.detach();
-            });
-
-    logger->EmitLogRecord(
-        opentelemetry::logs::Severity::kInfo, "Log message",
-        opentelemetry::common::MakeAttributes(
-            {{"service.name", "unit_test_service"},
-             {"tenant.id", "test_user"},
-             {"bool_value", true},
-             {"int32_value", static_cast<int32_t>(1)},
-             {"uint32_value", static_cast<uint32_t>(2)},
-             {"int64_value", static_cast<int64_t>(0x1100000000LL)},
-             {"uint64_value", static_cast<uint64_t>(0x1200000000ULL)},
-             {"double_value", static_cast<double>(3.1)},
-             {"vec_bool_value", attribute_storage_bool_value},
-             {"vec_int32_value", attribute_storage_int32_value},
-             {"vec_uint32_value", attribute_storage_uint32_value},
-             {"vec_int64_value", attribute_storage_int64_value},
-             {"vec_uint64_value", attribute_storage_uint64_value},
-             {"vec_double_value", attribute_storage_double_value},
-             {"vec_string_value", attribute_storage_string_value}}),
-        trace_id, span_id,
-        opentelemetry::trace::TraceFlags{opentelemetry::trace::TraceFlags::kIsSampled},
-        std::chrono::system_clock::now());
-
-    provider->ForceFlush();
-  }
-#  endif
-
-  void ExportBinaryIntegrationTest()
-  {
-    auto mock_otlp_client =
-        OtlpHttpLogRecordExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kBinary);
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    bool attribute_storage_bool_value[]                                = {true, false, true};
-    int32_t attribute_storage_int32_value[]                            = {1, 2};
-    uint32_t attribute_storage_uint32_value[]                          = {3, 4};
-    int64_t attribute_storage_int64_value[]                            = {5, 6};
-    uint64_t attribute_storage_uint64_value[]                          = {7, 8};
-    double attribute_storage_double_value[]                            = {3.2, 3.3};
-    opentelemetry::nostd::string_view attribute_storage_string_value[] = {"vector", "string"};
-
-    auto provider = nostd::shared_ptr<sdk::logs::LoggerProvider>(new sdk::logs::LoggerProvider());
-    sdk::logs::BatchLogRecordProcessorOptions processor_options;
-    processor_options.max_export_batch_size = 5;
-    processor_options.max_queue_size        = 5;
-    processor_options.schedule_delay_millis = std::chrono::milliseconds(256);
-    provider->AddProcessor(std::unique_ptr<sdk::logs::LogRecordProcessor>(
-        new sdk::logs::BatchLogRecordProcessor(std::move(exporter), processor_options)));
-
-    std::string report_trace_id;
-    std::string report_span_id;
-    uint8_t trace_id_bin[opentelemetry::trace::TraceId::kSize] = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-    opentelemetry::trace::TraceId trace_id{trace_id_bin};
-    uint8_t span_id_bin[opentelemetry::trace::SpanId::kSize] = {'7', '6', '5', '4',
-                                                                '3', '2', '1', '0'};
-    opentelemetry::trace::SpanId span_id{span_id_bin};
-
-    const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-    auto logger = provider->GetLogger("test", "opentelelemtry_library", "1.2.0", schema_url,
-                                      {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-
-    report_trace_id.assign(reinterpret_cast<const char *>(trace_id_bin), sizeof(trace_id_bin));
-    report_span_id.assign(reinterpret_cast<const char *>(span_id_bin), sizeof(span_id_bin));
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id, report_span_id](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
-              request_body.ParseFromArray(
-                  &mock_session->GetRequest()->body_[0],
-                  static_cast<int>(mock_session->GetRequest()->body_.size()));
-              auto scope_log = request_body.resource_logs(0).scope_logs(0);
-              EXPECT_EQ(scope_log.schema_url(), "https://opentelemetry.io/schemas/1.2.0");
-              EXPECT_EQ(scope_log.scope().name(), "opentelelemtry_library");
-              EXPECT_EQ(scope_log.scope().version(), "1.2.0");
-              const auto &received_log = scope_log.log_records(0);
-              EXPECT_EQ(received_log.trace_id(), report_trace_id);
-              EXPECT_EQ(received_log.span_id(), report_span_id);
-              EXPECT_EQ("Log message", received_log.body().string_value());
-              EXPECT_LE(15, received_log.attributes_size());
-              bool check_service_name = false;
-              for (auto &attribute : received_log.attributes())
-              {
-                if ("service.name" == attribute.key())
-                {
-                  check_service_name = true;
-                  EXPECT_EQ("unit_test_service", attribute.value().string_value());
-                }
-              }
-              ASSERT_TRUE(check_service_name);
-
-              bool check_scope_attribute = false;
-              for (auto &attribute : scope_log.scope().attributes())
-              {
-                if ("scope_key1" == attribute.key())
-                {
-                  check_scope_attribute = true;
-                  EXPECT_EQ("scope_value", attribute.value().string_value());
-                }
-              }
-              ASSERT_TRUE(check_scope_attribute);
-
-              // let the otlp_http_client to continue
-
-              http_client::nosend::Response response;
-              response.Finish(*callback.get());
-            });
-
-    logger->EmitLogRecord(
-        opentelemetry::logs::Severity::kInfo, "Log message",
-        opentelemetry::common::MakeAttributes(
-            {{"service.name", "unit_test_service"},
-             {"tenant.id", "test_user"},
-             {"bool_value", true},
-             {"int32_value", static_cast<int32_t>(1)},
-             {"uint32_value", static_cast<uint32_t>(2)},
-             {"int64_value", static_cast<int64_t>(0x1100000000LL)},
-             {"uint64_value", static_cast<uint64_t>(0x1200000000ULL)},
-             {"double_value", static_cast<double>(3.1)},
-             {"vec_bool_value", attribute_storage_bool_value},
-             {"vec_int32_value", attribute_storage_int32_value},
-             {"vec_uint32_value", attribute_storage_uint32_value},
-             {"vec_int64_value", attribute_storage_int64_value},
-             {"vec_uint64_value", attribute_storage_uint64_value},
-             {"vec_double_value", attribute_storage_double_value},
-             {"vec_string_value", attribute_storage_string_value}}),
-        trace_id, span_id,
-        opentelemetry::trace::TraceFlags{opentelemetry::trace::TraceFlags::kIsSampled},
-        std::chrono::system_clock::now());
-
-    provider->ForceFlush();
-  }
-
-#  ifdef ENABLE_ASYNC_EXPORT
-  void ExportBinaryIntegrationTestAsync()
-  {
-    auto mock_otlp_client = OtlpHttpLogRecordExporterTestPeer::GetMockOtlpHttpClient(
-        HttpRequestContentType::kBinary, true);
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    bool attribute_storage_bool_value[]                                = {true, false, true};
-    int32_t attribute_storage_int32_value[]                            = {1, 2};
-    uint32_t attribute_storage_uint32_value[]                          = {3, 4};
-    int64_t attribute_storage_int64_value[]                            = {5, 6};
-    uint64_t attribute_storage_uint64_value[]                          = {7, 8};
-    double attribute_storage_double_value[]                            = {3.2, 3.3};
-    opentelemetry::nostd::string_view attribute_storage_string_value[] = {"vector", "string"};
-
-    auto provider = nostd::shared_ptr<sdk::logs::LoggerProvider>(new sdk::logs::LoggerProvider());
-
-    sdk::logs::BatchLogRecordProcessorOptions processor_options;
-    processor_options.max_export_batch_size = 5;
-    processor_options.max_queue_size        = 5;
-    processor_options.schedule_delay_millis = std::chrono::milliseconds(256);
-    provider->AddProcessor(std::unique_ptr<sdk::logs::LogRecordProcessor>(
-        new sdk::logs::BatchLogRecordProcessor(std::move(exporter), processor_options)));
-
-    std::string report_trace_id;
-    std::string report_span_id;
-    uint8_t trace_id_bin[opentelemetry::trace::TraceId::kSize] = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-    opentelemetry::trace::TraceId trace_id{trace_id_bin};
-    uint8_t span_id_bin[opentelemetry::trace::SpanId::kSize] = {'7', '6', '5', '4',
-                                                                '3', '2', '1', '0'};
-    opentelemetry::trace::SpanId span_id{span_id_bin};
-
-    const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-    auto logger = provider->GetLogger("test", "opentelelemtry_library", "", schema_url,
-                                      {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-
-    report_trace_id.assign(reinterpret_cast<const char *>(trace_id_bin), sizeof(trace_id_bin));
-    report_span_id.assign(reinterpret_cast<const char *>(span_id_bin), sizeof(span_id_bin));
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session, report_trace_id, report_span_id, schema_url](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
-              request_body.ParseFromArray(
-                  &mock_session->GetRequest()->body_[0],
-                  static_cast<int>(mock_session->GetRequest()->body_.size()));
-              auto &scope_log   = request_body.resource_logs(0).scope_logs(0);
-              auto received_log = scope_log.log_records(0);
-              EXPECT_EQ(received_log.trace_id(), report_trace_id);
-              EXPECT_EQ(received_log.span_id(), report_span_id);
-              EXPECT_EQ("Log message", received_log.body().string_value());
-              EXPECT_LE(15, received_log.attributes_size());
-              bool check_service_name = false;
-              for (auto &attribute : received_log.attributes())
-              {
-                if ("service.name" == attribute.key())
-                {
-                  check_service_name = true;
-                  EXPECT_EQ("unit_test_service", attribute.value().string_value());
-                }
-              }
-              ASSERT_TRUE(check_service_name);
-
-              auto &scope = scope_log.scope();
-              EXPECT_EQ(scope.name(), "opentelelemtry_library");
-              EXPECT_EQ(scope_log.schema_url(), schema_url);
-              bool check_scope_attribute = false;
-              for (auto &attribute : scope.attributes())
-              {
-                if ("scope_key1" == attribute.key())
-                {
-                  check_scope_attribute = true;
-                  EXPECT_EQ("scope_value", attribute.value().string_value());
-                }
-              }
-              ASSERT_TRUE(check_scope_attribute);
-
-              // let the otlp_http_client to continue
-
-              std::thread async_finish{[callback]() {
-                std::this_thread::sleep_for(std::chrono::milliseconds(100));
-                http_client::nosend::Response response;
-                response.Finish(*callback.get());
-              }};
-              async_finish.detach();
-            });
-
-    logger->EmitLogRecord(
-        opentelemetry::logs::Severity::kInfo, "Log message",
-        opentelemetry::common::MakeAttributes(
-            {{"service.name", "unit_test_service"},
-             {"tenant.id", "test_user"},
-             {"bool_value", true},
-             {"int32_value", static_cast<int32_t>(1)},
-             {"uint32_value", static_cast<uint32_t>(2)},
-             {"int64_value", static_cast<int64_t>(0x1100000000LL)},
-             {"uint64_value", static_cast<uint64_t>(0x1200000000ULL)},
-             {"double_value", static_cast<double>(3.1)},
-             {"vec_bool_value", attribute_storage_bool_value},
-             {"vec_int32_value", attribute_storage_int32_value},
-             {"vec_uint32_value", attribute_storage_uint32_value},
-             {"vec_int64_value", attribute_storage_int64_value},
-             {"vec_uint64_value", attribute_storage_uint64_value},
-             {"vec_double_value", attribute_storage_double_value},
-             {"vec_string_value", attribute_storage_string_value}}),
-        trace_id, span_id,
-        opentelemetry::trace::TraceFlags{opentelemetry::trace::TraceFlags::kIsSampled},
-        std::chrono::system_clock::now());
-
-    provider->ForceFlush();
-  }
-#  endif
-};
-
-TEST(OtlpHttpLogRecordExporterTest, Shutdown)
-{
-  auto exporter =
-      std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>(new OtlpHttpLogRecordExporter());
-  ASSERT_TRUE(exporter->Shutdown());
-
-  nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> logs = {};
-
-  auto result = exporter->Export(logs);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-// Create log records, let processor call Export()
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ExportJsonIntegrationTestSync)
-{
-  ExportJsonIntegrationTest();
-}
-
-#  ifdef ENABLE_ASYNC_EXPORT
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ExportJsonIntegrationTestAsync)
-{
-  ExportJsonIntegrationTestAsync();
-  google::protobuf::ShutdownProtobufLibrary();
-}
-#  endif
-
-// Create log records, let processor call Export()
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ExportBinaryIntegrationTestSync)
-{
-  ExportBinaryIntegrationTest();
-}
-
-#  ifdef ENABLE_ASYNC_EXPORT
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ExportBinaryIntegrationTestAsync)
-{
-  ExportBinaryIntegrationTestAsync();
-}
-#  endif
-
-// Test exporter configuration options
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigTest)
-{
-  OtlpHttpLogRecordExporterOptions opts;
-  opts.url = "http://localhost:45456/v1/logs";
-  std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).url, "http://localhost:45456/v1/logs");
-}
-
-// Test exporter configuration options with use_json_name
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigUseJsonNameTest)
-{
-  OtlpHttpLogRecordExporterOptions opts;
-  opts.use_json_name = true;
-  std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).use_json_name, true);
-}
-
-// Test exporter configuration options with json_bytes_mapping=JsonBytesMappingKind::kHex
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigJsonBytesMappingTest)
-{
-  OtlpHttpLogRecordExporterOptions opts;
-  opts.json_bytes_mapping = JsonBytesMappingKind::kHex;
-  std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).json_bytes_mapping, JsonBytesMappingKind::kHex);
-}
-
-TEST(OtlpHttpLogRecordExporterTest, ConfigDefaultProtocolTest)
-{
-  OtlpHttpLogRecordExporterOptions opts;
-  EXPECT_EQ(opts.content_type, HttpRequestContentType::kBinary);
-}
-
-#  ifndef NO_GETENV
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigFromEnv)
-{
-  const std::string url = "http://localhost:9999/v1/logs";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:9999", 1);
-  setenv("OTEL_EXPORTER_OTLP_TIMEOUT", "20s", 1);
-  setenv("OTEL_EXPORTER_OTLP_HEADERS", "k1=v1,k2=v2", 1);
-  setenv("OTEL_EXPORTER_OTLP_LOGS_HEADERS", "k1=v3,k1=v4", 1);
-  setenv("OTEL_EXPORTER_OTLP_PROTOCOL", "http/json", 1);
-
-  std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
-  EXPECT_EQ(GetOptions(exporter).url, url);
-  EXPECT_EQ(
-      GetOptions(exporter).timeout.count(),
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{20})
-          .count());
-  EXPECT_EQ(GetOptions(exporter).http_headers.size(), 3);
-  {
-    // Test k2
-    auto range = GetOptions(exporter).http_headers.equal_range("k2");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v2"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  {
-    // k1
-    auto range = GetOptions(exporter).http_headers.equal_range("k1");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v3"));
-    ++range.first;
-    EXPECT_EQ(range.first->second, std::string("v4"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  EXPECT_EQ(GetOptions(exporter).content_type, HttpRequestContentType::kJson);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_TIMEOUT");
-  unsetenv("OTEL_EXPORTER_OTLP_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_LOGS_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_PROTOCOL");
-}
-
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigFromLogsEnv)
-{
-  const std::string url = "http://localhost:9999/v1/logs";
-  setenv("OTEL_EXPORTER_OTLP_LOGS_ENDPOINT", url.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_LOGS_TIMEOUT", "20s", 1);
-  setenv("OTEL_EXPORTER_OTLP_HEADERS", "k1=v1,k2=v2", 1);
-  setenv("OTEL_EXPORTER_OTLP_LOGS_HEADERS", "k1=v3,k1=v4", 1);
-  setenv("OTEL_EXPORTER_OTLP_LOGS_PROTOCOL", "http/json", 1);
-
-  std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
-  EXPECT_EQ(GetOptions(exporter).url, url);
-  EXPECT_EQ(
-      GetOptions(exporter).timeout.count(),
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{20})
-          .count());
-  EXPECT_EQ(GetOptions(exporter).http_headers.size(), 3);
-  {
-    // Test k2
-    auto range = GetOptions(exporter).http_headers.equal_range("k2");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v2"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  {
-    // k1
-    auto range = GetOptions(exporter).http_headers.equal_range("k1");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v3"));
-    ++range.first;
-    EXPECT_EQ(range.first->second, std::string("v4"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  EXPECT_EQ(GetOptions(exporter).content_type, HttpRequestContentType::kJson);
-
-  unsetenv("OTEL_EXPORTER_OTLP_LOGS_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_LOGS_TIMEOUT");
-  unsetenv("OTEL_EXPORTER_OTLP_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_LOGS_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_LOGS_PROTOCOL");
-}
-
-TEST_F(OtlpHttpLogRecordExporterTestPeer, DefaultEndpoint)
-{
-  EXPECT_EQ("http://localhost:4318/v1/logs", GetOtlpDefaultHttpLogsEndpoint());
-  EXPECT_EQ("http://localhost:4318/v1/traces", GetOtlpDefaultHttpEndpoint());
-  EXPECT_EQ("http://localhost:4317", GetOtlpDefaultGrpcEndpoint());
-}
-
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryDefaultValues)
-{
-  std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 5);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
-}
-
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS", "123", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF", "4.5", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_BACKOFF", "6.7", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_BACKOFF_MULTIPLIER", "8.9", 1);
-
-  std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 123);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_BACKOFF_MULTIPLIER");
-}
-
-TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryGenericValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS", "321", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF", "5.4", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF", "7.6", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER", "9.8", 1);
-
-  std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 321);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER");
-}
-#  endif  // NO_GETENV
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_STL_VERSION */
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_metric_exporter_factory_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_metric_exporter_factory_test.cc
deleted file mode 100644
index 2f042b8f6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_metric_exporter_factory_test.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-/*
-  Make sure OtlpHttpExporterFactory does not require,
-  even indirectly, nlohmann/json headers.
-*/
-#ifdef NLOHMANN_JSON_VERSION_MAJOR
-#  error "nlohmann/json should not be included"
-#endif /* NLOHMANN_JSON_VERSION_MAJOR */
-
-/*
-  Make sure OtlpHttpExporterFactory does not require,
-  even indirectly, protobuf headers.
-*/
-#ifdef GOOGLE_PROTOBUF_VERSION
-#  error "protobuf should not be included"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-TEST(OtlpHttpMetricExporterFactory, BuildTest)
-{
-  OtlpHttpMetricExporterOptions opts;
-  opts.url = "localhost:45454";
-
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter =
-      OtlpHttpMetricExporterFactory::Create(opts);
-
-  EXPECT_TRUE(exporter != nullptr);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_metric_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_metric_exporter_test.cc
deleted file mode 100644
index d1ca0572a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_http_metric_exporter_test.cc
+++ /dev/null
@@ -1,1140 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <chrono>
-#include <cstdint>
-#include <cstdlib>
-#include <functional>
-#include <map>
-#include <nlohmann/json.hpp>
-#include <string>
-#include <utility>
-#include <vector>
-#include "gmock/gmock.h"
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_http.h"
-#include "opentelemetry/exporters/otlp/otlp_http_client.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
-#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
-#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/test_common/ext/http/client/http_client_test_factory.h"
-#include "opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-// IWYU pragma: no_include "net/proto2/public/repeated_field.h"
-#include <google/protobuf/message_lite.h>
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/metrics/v1/metrics.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-#if defined(_MSC_VER)
-#  include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#endif
-
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-
-template <class IntegerType>
-static IntegerType JsonToInteger(nlohmann::json value)
-{
-  if (value.is_string())
-  {
-    return static_cast<IntegerType>(strtol(value.get<std::string>().c_str(), nullptr, 10));
-  }
-
-  return value.get<IntegerType>();
-}
-
-OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
-                                                bool async_mode)
-{
-  std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation> not_instrumented;
-  OtlpHttpMetricExporterOptions options;
-  options.content_type  = content_type;
-  options.console_debug = true;
-  options.http_headers.insert(std::make_pair("Custom-Header-Key", "Custom-Header-Value"));
-  options.retry_policy_max_attempts       = 0U;
-  options.retry_policy_initial_backoff    = std::chrono::duration<float>::zero();
-  options.retry_policy_max_backoff        = std::chrono::duration<float>::zero();
-  options.retry_policy_backoff_multiplier = 0.0f;
-  OtlpHttpClientOptions otlp_http_client_options(
-      options.url, false, /* ssl_insecure_skip_verify */
-      "",                 /* ssl_ca_cert_path */
-      "",                 /* ssl_ca_cert_string */
-      "",                 /* ssl_client_key_path */
-      "",                 /* ssl_client_key_string */
-      "",                 /* ssl_client_cert_path */
-      "",                 /* ssl_client_cert_string */
-      "",                 /* ssl_min_tls */
-      "",                 /* ssl_max_tls */
-      "",                 /* ssl_cipher */
-      "",                 /* ssl_cipher_suite */
-      options.content_type, options.json_bytes_mapping, options.compression, options.use_json_name,
-      options.console_debug, options.timeout, options.http_headers,
-      options.retry_policy_max_attempts, options.retry_policy_initial_backoff,
-      options.retry_policy_max_backoff, options.retry_policy_backoff_multiplier, not_instrumented);
-  if (!async_mode)
-  {
-    otlp_http_client_options.max_concurrent_requests = 0;
-  }
-  return otlp_http_client_options;
-}
-
-namespace http_client = opentelemetry::ext::http::client;
-
-class OtlpHttpMetricExporterTestPeer : public ::testing::Test
-{
-public:
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> GetExporter(
-      std::unique_ptr<OtlpHttpClient> http_client)
-  {
-    return std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>(
-        new OtlpHttpMetricExporter(std::move(http_client)));
-  }
-
-  // Get the options associated with the given exporter.
-  const OtlpHttpMetricExporterOptions &GetOptions(std::unique_ptr<OtlpHttpMetricExporter> &exporter)
-  {
-    return exporter->options_;
-  }
-  static std::pair<OtlpHttpClient *, std::shared_ptr<http_client::HttpClient>>
-  GetMockOtlpHttpClient(HttpRequestContentType content_type, bool async_mode = false)
-  {
-    auto http_client = http_client::HttpClientTestFactory::Create();
-    return {new OtlpHttpClient(MakeOtlpHttpClientOptions(content_type, async_mode), http_client),
-            http_client};
-  }
-
-  void ExportJsonIntegrationTestExportSumPointData(
-#ifdef ENABLE_ASYNC_EXPORT
-      bool async_mode
-#endif
-  )
-  {
-    auto mock_otlp_client =
-        OtlpHttpMetricExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kJson
-#ifdef ENABLE_ASYNC_EXPORT
-                                                              ,
-                                                              async_mode
-#endif
-        );
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
-    sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
-    sum_point_data2.value_ = 20.0;
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{});
-    data.resource_ = &resource;
-    auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0");
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kCounter,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, sum_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, sum_point_data2}}};
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              auto check_json =
-                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-
-              auto resource_metrics = *check_json["resourceMetrics"].begin();
-              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-              auto scope            = scope_metrics["scope"];
-              EXPECT_EQ("library_name", scope["name"].get<std::string>());
-              EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-
-              auto metric = *scope_metrics["metrics"].begin();
-              EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-              EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-              EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-              auto data_points = metric["sum"]["dataPoints"];
-              EXPECT_EQ(10.0, data_points[0]["asDouble"].get<double>());
-              EXPECT_EQ(20.0, data_points[1]["asDouble"].get<double>());
-
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              http_client::nosend::Response response;
-              response.Finish(*callback.get());
-            });
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-  }
-
-  void ExportBinaryIntegrationTestExportSumPointData(
-#ifdef ENABLE_ASYNC_EXPORT
-      bool async_mode
-#endif
-  )
-  {
-    auto mock_otlp_client =
-        OtlpHttpMetricExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kBinary
-#ifdef ENABLE_ASYNC_EXPORT
-                                                              ,
-                                                              async_mode
-#endif
-        );
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
-    sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
-    sum_point_data2.value_ = 20.0;
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{});
-    data.resource_ = &resource;
-    auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0");
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kCounter,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, sum_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, sum_point_data2}}};
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
-                          &callback) {
-          opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
-          request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
-                                      static_cast<int>(mock_session->GetRequest()->body_.size()));
-          auto &scope_metrics = request_body.resource_metrics(0).scope_metrics(0);
-          auto &scope         = scope_metrics.scope();
-          EXPECT_EQ("library_name", scope.name());
-          EXPECT_EQ("1.5.0", scope.version());
-
-          auto &metric = scope_metrics.metrics(0);
-          EXPECT_EQ("metrics_library_name", metric.name());
-          EXPECT_EQ("metrics_description", metric.description());
-          EXPECT_EQ("metrics_unit", metric.unit());
-
-          auto &data_points = metric.sum().data_points();
-          EXPECT_EQ(10.0, data_points.Get(0).as_double());
-          bool has_attributes = false;
-          for (auto &kv : data_points.Get(0).attributes())
-          {
-            if (kv.key() == "a1")
-            {
-              EXPECT_EQ("b1", kv.value().string_value());
-              has_attributes = true;
-            }
-          }
-          EXPECT_TRUE(has_attributes);
-
-          EXPECT_EQ(20.0, data_points.Get(1).as_double());
-          has_attributes = false;
-          for (auto &kv : data_points.Get(1).attributes())
-          {
-            if (kv.key() == "a2")
-            {
-              EXPECT_EQ("b2", kv.value().string_value());
-              has_attributes = true;
-            }
-          }
-          EXPECT_TRUE(has_attributes);
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-  }
-
-  void ExportJsonIntegrationTestExportLastValuePointData(
-#ifdef ENABLE_ASYNC_EXPORT
-      bool async_mode
-#endif
-  )
-  {
-    auto mock_otlp_client =
-        OtlpHttpMetricExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kJson
-#ifdef ENABLE_ASYNC_EXPORT
-                                                              ,
-                                                              async_mode
-#endif
-        );
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    opentelemetry::sdk::metrics::LastValuePointData last_value_point_data{};
-    last_value_point_data.value_              = 10.0;
-    last_value_point_data.is_lastvalue_valid_ = true;
-    last_value_point_data.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    opentelemetry::sdk::metrics::LastValuePointData last_value_point_data2{};
-    last_value_point_data2.value_              = static_cast<int64_t>(20);
-    last_value_point_data2.is_lastvalue_valid_ = true;
-    last_value_point_data2.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kObservableGauge,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, last_value_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, last_value_point_data2}}};
-
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{});
-    data.resource_ = &resource;
-    auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0");
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              auto check_json =
-                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-
-              auto resource_metrics = *check_json["resourceMetrics"].begin();
-              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-              auto scope            = scope_metrics["scope"];
-              EXPECT_EQ("library_name", scope["name"].get<std::string>());
-              EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-
-              auto metric = *scope_metrics["metrics"].begin();
-              EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-              EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-              EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-              auto data_points = metric["gauge"]["dataPoints"];
-              EXPECT_EQ(10.0, data_points[0]["asDouble"].get<double>());
-              EXPECT_EQ(20l, JsonToInteger<int64_t>(data_points[1]["asInt"]));
-
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              http_client::nosend::Response response;
-              response.Finish(*callback.get());
-            });
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-  }
-
-  void ExportBinaryIntegrationTestExportLastValuePointData(
-#ifdef ENABLE_ASYNC_EXPORT
-      bool async_mode
-#endif
-  )
-  {
-    auto mock_otlp_client =
-        OtlpHttpMetricExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kBinary
-#ifdef ENABLE_ASYNC_EXPORT
-                                                              ,
-                                                              async_mode
-#endif
-        );
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
-    sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
-    sum_point_data2.value_ = 20.0;
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{});
-    data.resource_ = &resource;
-    auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0");
-    opentelemetry::sdk::metrics::LastValuePointData last_value_point_data{};
-    last_value_point_data.value_              = 10.0;
-    last_value_point_data.is_lastvalue_valid_ = true;
-    last_value_point_data.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    opentelemetry::sdk::metrics::LastValuePointData last_value_point_data2{};
-    last_value_point_data2.value_              = static_cast<int64_t>(20);
-    last_value_point_data2.is_lastvalue_valid_ = true;
-    last_value_point_data2.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kObservableGauge,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, last_value_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, last_value_point_data2}}};
-
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
-                          &callback) {
-          opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
-          request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
-                                      static_cast<int>(mock_session->GetRequest()->body_.size()));
-          auto &scope_metrics = request_body.resource_metrics(0).scope_metrics(0);
-          auto &scope         = scope_metrics.scope();
-          EXPECT_EQ("library_name", scope.name());
-          EXPECT_EQ("1.5.0", scope.version());
-
-          auto &metric = scope_metrics.metrics(0);
-          EXPECT_EQ("metrics_library_name", metric.name());
-          EXPECT_EQ("metrics_description", metric.description());
-          EXPECT_EQ("metrics_unit", metric.unit());
-
-          auto &data_points = metric.gauge().data_points();
-          EXPECT_EQ(10.0, data_points.Get(0).as_double());
-          bool has_attributes = false;
-          for (auto &kv : data_points.Get(0).attributes())
-          {
-            if (kv.key() == "a1")
-            {
-              EXPECT_EQ("b1", kv.value().string_value());
-              has_attributes = true;
-            }
-          }
-          EXPECT_TRUE(has_attributes);
-
-          EXPECT_EQ(20, data_points.Get(1).as_int());
-          has_attributes = false;
-          for (auto &kv : data_points.Get(1).attributes())
-          {
-            if (kv.key() == "a2")
-            {
-              EXPECT_EQ("b2", kv.value().string_value());
-              has_attributes = true;
-            }
-          }
-          EXPECT_TRUE(has_attributes);
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-  }
-
-  void ExportJsonIntegrationTestExportHistogramPointData(
-#ifdef ENABLE_ASYNC_EXPORT
-      bool async_mode
-#endif
-  )
-  {
-    auto mock_otlp_client =
-        OtlpHttpMetricExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kJson
-#ifdef ENABLE_ASYNC_EXPORT
-                                                              ,
-                                                              async_mode
-#endif
-        );
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    opentelemetry::sdk::metrics::HistogramPointData histogram_point_data{};
-    histogram_point_data.boundaries_ = {10.1, 20.2, 30.2};
-    histogram_point_data.count_      = 3;
-    histogram_point_data.counts_     = {200, 300, 400, 500};
-    histogram_point_data.sum_        = 900.5;
-    histogram_point_data.min_        = 1.8;
-    histogram_point_data.max_        = 19.0;
-    opentelemetry::sdk::metrics::HistogramPointData histogram_point_data2{};
-    histogram_point_data2.boundaries_ = {10.0, 20.0, 30.0};
-    histogram_point_data2.count_      = 3;
-    histogram_point_data2.counts_     = {200, 300, 400, 500};
-    histogram_point_data2.sum_        = static_cast<int64_t>(900);
-
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kHistogram,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, histogram_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, histogram_point_data2}}};
-
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{});
-    data.resource_ = &resource;
-    auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0");
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce(
-            [&mock_session](
-                const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
-              auto check_json =
-                  nlohmann::json::parse(mock_session->GetRequest()->body_, nullptr, false);
-
-              auto resource_metrics = *check_json["resourceMetrics"].begin();
-              auto scope_metrics    = *resource_metrics["scopeMetrics"].begin();
-              auto scope            = scope_metrics["scope"];
-              EXPECT_EQ("library_name", scope["name"].get<std::string>());
-              EXPECT_EQ("1.5.0", scope["version"].get<std::string>());
-
-              auto metric = *scope_metrics["metrics"].begin();
-              EXPECT_EQ("metrics_library_name", metric["name"].get<std::string>());
-              EXPECT_EQ("metrics_description", metric["description"].get<std::string>());
-              EXPECT_EQ("metrics_unit", metric["unit"].get<std::string>());
-
-              auto data_points = metric["histogram"]["dataPoints"];
-              EXPECT_EQ(3, JsonToInteger<int64_t>(data_points[0]["count"]));
-              EXPECT_EQ(900.5, data_points[0]["sum"].get<double>());
-              EXPECT_EQ(1.8, data_points[0]["min"].get<double>());
-              EXPECT_EQ(19, data_points[0]["max"].get<double>());
-              EXPECT_EQ(4, data_points[0]["bucketCounts"].size());
-              if (4 == data_points[0]["bucketCounts"].size())
-              {
-                EXPECT_EQ(200, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][0]));
-                EXPECT_EQ(300, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][1]));
-                EXPECT_EQ(400, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][2]));
-                EXPECT_EQ(500, JsonToInteger<int64_t>(data_points[0]["bucketCounts"][3]));
-              }
-              EXPECT_EQ(3, data_points[0]["explicitBounds"].size());
-              if (3 == data_points[0]["explicitBounds"].size())
-              {
-                EXPECT_EQ(10.1, data_points[0]["explicitBounds"][0].get<double>());
-                EXPECT_EQ(20.2, data_points[0]["explicitBounds"][1].get<double>());
-                EXPECT_EQ(30.2, data_points[0]["explicitBounds"][2].get<double>());
-              }
-
-              EXPECT_EQ(3, JsonToInteger<int64_t>(data_points[1]["count"]));
-              EXPECT_EQ(900.0, data_points[1]["sum"].get<double>());
-              EXPECT_EQ(4, data_points[1]["bucketCounts"].size());
-              if (4 == data_points[1]["bucketCounts"].size())
-              {
-                EXPECT_EQ(200, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][0]));
-                EXPECT_EQ(300, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][1]));
-                EXPECT_EQ(400, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][2]));
-                EXPECT_EQ(500, JsonToInteger<int64_t>(data_points[1]["bucketCounts"][3]));
-              }
-              EXPECT_EQ(3, data_points[1]["explicitBounds"].size());
-              if (3 == data_points[1]["explicitBounds"].size())
-              {
-                EXPECT_EQ(10.0, data_points[1]["explicitBounds"][0].get<double>());
-                EXPECT_EQ(20.0, data_points[1]["explicitBounds"][1].get<double>());
-                EXPECT_EQ(30.0, data_points[1]["explicitBounds"][2].get<double>());
-              }
-
-              auto custom_header = mock_session->GetRequest()->headers_.find("Custom-Header-Key");
-              ASSERT_TRUE(custom_header != mock_session->GetRequest()->headers_.end());
-              if (custom_header != mock_session->GetRequest()->headers_.end())
-              {
-                EXPECT_EQ("Custom-Header-Value", custom_header->second);
-              }
-
-              http_client::nosend::Response response;
-              response.Finish(*callback.get());
-            });
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-  }
-
-  void ExportBinaryIntegrationTestExportHistogramPointData(
-#ifdef ENABLE_ASYNC_EXPORT
-      bool async_mode
-#endif
-  )
-  {
-    auto mock_otlp_client =
-        OtlpHttpMetricExporterTestPeer::GetMockOtlpHttpClient(HttpRequestContentType::kBinary
-#ifdef ENABLE_ASYNC_EXPORT
-                                                              ,
-                                                              async_mode
-#endif
-        );
-    auto mock_otlp_http_client = mock_otlp_client.first;
-    auto client                = mock_otlp_client.second;
-    auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
-
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
-    sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
-    sum_point_data2.value_ = 20.0;
-    opentelemetry::sdk::metrics::ResourceMetrics data;
-    auto resource = opentelemetry::sdk::resource::Resource::Create(
-        opentelemetry::sdk::resource::ResourceAttributes{});
-    data.resource_ = &resource;
-    auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-        "library_name", "1.5.0");
-
-    opentelemetry::sdk::metrics::HistogramPointData histogram_point_data{};
-    histogram_point_data.boundaries_ = {10.1, 20.2, 30.2};
-    histogram_point_data.count_      = 3;
-    histogram_point_data.counts_     = {200, 300, 400, 500};
-    histogram_point_data.sum_        = 900.5;
-    opentelemetry::sdk::metrics::HistogramPointData histogram_point_data2{};
-    histogram_point_data2.boundaries_ = {10.0, 20.0, 30.0};
-    histogram_point_data2.count_      = 3;
-    histogram_point_data2.counts_     = {200, 300, 400, 500};
-    histogram_point_data2.sum_        = static_cast<int64_t>(900);
-
-    opentelemetry::sdk::metrics::MetricData metric_data{
-        opentelemetry::sdk::metrics::InstrumentDescriptor{
-            "metrics_library_name", "metrics_description", "metrics_unit",
-            opentelemetry::sdk::metrics::InstrumentType::kHistogram,
-            opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-        opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
-        opentelemetry::common::SystemTimestamp{}, opentelemetry::common::SystemTimestamp{},
-        std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
-            {opentelemetry::sdk::metrics::PointAttributes{{"a1", "b1"}}, histogram_point_data},
-            {opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, histogram_point_data2}}};
-
-    data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
-        {scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
-
-    auto no_send_client = std::static_pointer_cast<http_client::nosend::HttpClient>(client);
-    auto mock_session =
-        std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
-
-    EXPECT_CALL(*mock_session, SendRequest)
-        .WillOnce([&mock_session](
-                      const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
-                          &callback) {
-          opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
-          request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
-                                      static_cast<int>(mock_session->GetRequest()->body_.size()));
-          auto &scope_metrics = request_body.resource_metrics(0).scope_metrics(0);
-          auto &scope         = scope_metrics.scope();
-          EXPECT_EQ("library_name", scope.name());
-          EXPECT_EQ("1.5.0", scope.version());
-
-          auto &metric = scope_metrics.metrics(0);
-          EXPECT_EQ("metrics_library_name", metric.name());
-          EXPECT_EQ("metrics_description", metric.description());
-          EXPECT_EQ("metrics_unit", metric.unit());
-
-          auto &data_points = metric.histogram().data_points();
-          EXPECT_EQ(3, data_points.Get(0).count());
-          EXPECT_EQ(900.5, data_points.Get(0).sum());
-          EXPECT_EQ(4, data_points.Get(0).bucket_counts_size());
-          if (4 == data_points.Get(0).bucket_counts_size())
-          {
-            EXPECT_EQ(200, data_points.Get(0).bucket_counts(0));
-            EXPECT_EQ(300, data_points.Get(0).bucket_counts(1));
-            EXPECT_EQ(400, data_points.Get(0).bucket_counts(2));
-            EXPECT_EQ(500, data_points.Get(0).bucket_counts(3));
-          }
-          EXPECT_EQ(3, data_points.Get(0).explicit_bounds_size());
-          if (3 == data_points.Get(0).explicit_bounds_size())
-          {
-            EXPECT_EQ(10.1, data_points.Get(0).explicit_bounds(0));
-            EXPECT_EQ(20.2, data_points.Get(0).explicit_bounds(1));
-            EXPECT_EQ(30.2, data_points.Get(0).explicit_bounds(2));
-          }
-
-          bool has_attributes = false;
-          for (auto &kv : data_points.Get(0).attributes())
-          {
-            if (kv.key() == "a1")
-            {
-              EXPECT_EQ("b1", kv.value().string_value());
-              has_attributes = true;
-            }
-          }
-          EXPECT_TRUE(has_attributes);
-
-          EXPECT_EQ(3, data_points.Get(1).count());
-          EXPECT_EQ(900l, data_points.Get(1).sum());
-          EXPECT_EQ(4, data_points.Get(1).bucket_counts_size());
-          if (4 == data_points.Get(1).bucket_counts_size())
-          {
-            EXPECT_EQ(200, data_points.Get(1).bucket_counts(0));
-            EXPECT_EQ(300, data_points.Get(1).bucket_counts(1));
-            EXPECT_EQ(400, data_points.Get(1).bucket_counts(2));
-            EXPECT_EQ(500, data_points.Get(1).bucket_counts(3));
-          }
-          EXPECT_EQ(3, data_points.Get(1).explicit_bounds_size());
-          if (3 == data_points.Get(1).explicit_bounds_size())
-          {
-            EXPECT_EQ(10, data_points.Get(1).explicit_bounds(0));
-            EXPECT_EQ(20, data_points.Get(1).explicit_bounds(1));
-            EXPECT_EQ(30, data_points.Get(1).explicit_bounds(2));
-          }
-          has_attributes = false;
-          for (auto &kv : data_points.Get(1).attributes())
-          {
-            if (kv.key() == "a2")
-            {
-              EXPECT_EQ("b2", kv.value().string_value());
-              has_attributes = true;
-            }
-          }
-          EXPECT_TRUE(has_attributes);
-
-          http_client::nosend::Response response;
-          response.Finish(*callback.get());
-        });
-
-    auto result = exporter->Export(data);
-    EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-
-    exporter->ForceFlush();
-  }
-};
-
-TEST(OtlpHttpMetricExporterTest, Shutdown)
-{
-  auto exporter = std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>(
-      new OtlpHttpMetricExporter());
-  ASSERT_TRUE(exporter->Shutdown());
-  auto result = exporter->Export(opentelemetry::sdk::metrics::ResourceMetrics{});
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kFailure);
-}
-
-#ifdef ENABLE_ASYNC_EXPORT
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestSumPointDataAsync)
-{
-  ExportJsonIntegrationTestExportSumPointData(true);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestSumPointDataSync)
-{
-  ExportJsonIntegrationTestExportSumPointData(false);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestSumPointDataAsync)
-{
-  ExportBinaryIntegrationTestExportSumPointData(true);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestSumPointDataSync)
-{
-  ExportBinaryIntegrationTestExportSumPointData(false);
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestLastValuePointDataAsync)
-{
-  ExportJsonIntegrationTestExportLastValuePointData(true);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestLastValuePointDataSync)
-{
-  ExportJsonIntegrationTestExportLastValuePointData(false);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestLastValuePointDataAsync)
-{
-  ExportBinaryIntegrationTestExportLastValuePointData(true);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestLastValuePointDataSync)
-{
-  ExportBinaryIntegrationTestExportLastValuePointData(false);
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestHistogramPointDataAsync)
-{
-  ExportJsonIntegrationTestExportHistogramPointData(true);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestHistogramPointDataSync)
-{
-  ExportJsonIntegrationTestExportHistogramPointData(false);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestHistogramPointDataAsync)
-{
-  ExportBinaryIntegrationTestExportHistogramPointData(true);
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestHistogramPointDataSync)
-{
-  ExportBinaryIntegrationTestExportHistogramPointData(false);
-}
-
-#else
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestSumPointData)
-{
-  ExportJsonIntegrationTestExportSumPointData();
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestSumPointData)
-{
-  ExportBinaryIntegrationTestExportSumPointData();
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestLastValuePointData)
-{
-  ExportJsonIntegrationTestExportLastValuePointData();
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestLastValuePointData)
-{
-  ExportBinaryIntegrationTestExportLastValuePointData();
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportJsonIntegrationTestHistogramPointData)
-{
-  ExportJsonIntegrationTestExportHistogramPointData();
-}
-TEST_F(OtlpHttpMetricExporterTestPeer, ExportBinaryIntegrationTestHistogramPointData)
-{
-  ExportBinaryIntegrationTestExportHistogramPointData();
-}
-#endif
-
-// Test exporter configuration options
-TEST_F(OtlpHttpMetricExporterTestPeer, ConfigTest)
-{
-  OtlpHttpMetricExporterOptions opts;
-  opts.url = "http://localhost:45456/v1/metrics";
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).url, "http://localhost:45456/v1/metrics");
-}
-
-// Test exporter configuration options with use_json_name
-TEST_F(OtlpHttpMetricExporterTestPeer, ConfigUseJsonNameTest)
-{
-  OtlpHttpMetricExporterOptions opts;
-  opts.use_json_name = true;
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).use_json_name, true);
-}
-
-// Test exporter configuration options with json_bytes_mapping=JsonBytesMappingKind::kHex
-TEST_F(OtlpHttpMetricExporterTestPeer, ConfigJsonBytesMappingTest)
-{
-  OtlpHttpMetricExporterOptions opts;
-  opts.json_bytes_mapping = JsonBytesMappingKind::kHex;
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).json_bytes_mapping, JsonBytesMappingKind::kHex);
-  google::protobuf::ShutdownProtobufLibrary();
-}
-
-TEST(OtlpHttpMetricExporterTest, ConfigDefaultProtocolTest)
-{
-  OtlpHttpMetricExporterOptions opts;
-  EXPECT_EQ(opts.content_type, HttpRequestContentType::kBinary);
-}
-
-#ifndef NO_GETENV
-// Test exporter configuration options with use_ssl_credentials
-TEST_F(OtlpHttpMetricExporterTestPeer, ConfigFromEnv)
-{
-  const std::string url = "http://localhost:9999/v1/metrics";
-  setenv("OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:9999", 1);
-  setenv("OTEL_EXPORTER_OTLP_TIMEOUT", "20s", 1);
-  setenv("OTEL_EXPORTER_OTLP_HEADERS", "k1=v1,k2=v2", 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_HEADERS", "k1=v3,k1=v4", 1);
-  setenv("OTEL_EXPORTER_OTLP_PROTOCOL", "http/json", 1);
-
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).url, url);
-  EXPECT_EQ(
-      GetOptions(exporter).timeout.count(),
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{20})
-          .count());
-  EXPECT_EQ(GetOptions(exporter).http_headers.size(), 3);
-  {
-    // Test k2
-    auto range = GetOptions(exporter).http_headers.equal_range("k2");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v2"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  {
-    // k1
-    auto range = GetOptions(exporter).http_headers.equal_range("k1");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v3"));
-    ++range.first;
-    EXPECT_EQ(range.first->second, std::string("v4"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  EXPECT_EQ(GetOptions(exporter).content_type, HttpRequestContentType::kJson);
-
-  unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_TIMEOUT");
-  unsetenv("OTEL_EXPORTER_OTLP_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_PROTOCOL");
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, ConfigFromMetricsEnv)
-{
-  const std::string url = "http://localhost:9999/v1/metrics";
-  setenv("OTEL_EXPORTER_OTLP_METRICS_ENDPOINT", url.c_str(), 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_TIMEOUT", "20s", 1);
-  setenv("OTEL_EXPORTER_OTLP_HEADERS", "k1=v1,k2=v2", 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_HEADERS", "k1=v3,k1=v4", 1);
-  setenv("OTEL_EXPORTER_OTLP_METRICS_PROTOCOL", "http/json", 1);
-
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).url, url);
-  EXPECT_EQ(
-      GetOptions(exporter).timeout.count(),
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{20})
-          .count());
-  EXPECT_EQ(GetOptions(exporter).http_headers.size(), 3);
-  {
-    // Test k2
-    auto range = GetOptions(exporter).http_headers.equal_range("k2");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v2"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  {
-    // k1
-    auto range = GetOptions(exporter).http_headers.equal_range("k1");
-    EXPECT_TRUE(range.first != range.second);
-    EXPECT_EQ(range.first->second, std::string("v3"));
-    ++range.first;
-    EXPECT_EQ(range.first->second, std::string("v4"));
-    ++range.first;
-    EXPECT_TRUE(range.first == range.second);
-  }
-  EXPECT_EQ(GetOptions(exporter).content_type, HttpRequestContentType::kJson);
-
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_ENDPOINT");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_TIMEOUT");
-  unsetenv("OTEL_EXPORTER_OTLP_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_HEADERS");
-  unsetenv("OTEL_EXPORTER_OTLP_METRICS_PROTOCOL");
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, DefaultEndpoint)
-{
-  EXPECT_EQ("http://localhost:4318/v1/metrics", GetOtlpDefaultMetricsEndpoint());
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, CheckDefaultTemporality)
-{
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
-  EXPECT_EQ(
-      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-      exporter->GetAggregationTemporality(opentelemetry::sdk::metrics::InstrumentType::kCounter));
-  EXPECT_EQ(
-      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-      exporter->GetAggregationTemporality(opentelemetry::sdk::metrics::InstrumentType::kHistogram));
-  EXPECT_EQ(opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-            exporter->GetAggregationTemporality(
-                opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter));
-  EXPECT_EQ(opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-            exporter->GetAggregationTemporality(
-                opentelemetry::sdk::metrics::InstrumentType::kObservableCounter));
-  EXPECT_EQ(opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-            exporter->GetAggregationTemporality(
-                opentelemetry::sdk::metrics::InstrumentType::kObservableGauge));
-  EXPECT_EQ(opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
-            exporter->GetAggregationTemporality(
-                opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter));
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryDefaultValues)
-{
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 5);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS", "123", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF", "4.5", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_BACKOFF", "6.7", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_BACKOFF_MULTIPLIER", "8.9", 1);
-
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 123);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_BACKOFF_MULTIPLIER");
-}
-
-TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryGenericValuesFromEnv)
-{
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS", "321", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF", "5.4", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF", "7.6", 1);
-  setenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER", "9.8", 1);
-
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
-  const auto options = GetOptions(exporter);
-  ASSERT_EQ(options.retry_policy_max_attempts, 321);
-  ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
-  ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
-  ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
-
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_BACKOFF");
-  unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_BACKOFF_MULTIPLIER");
-}
-#endif  // NO_GETENV
-
-// Test Preferred aggregtion temporality selection
-TEST_F(OtlpHttpMetricExporterTestPeer, PreferredAggergationTemporality)
-{
-  // Cummulative aggregation selector : use cummulative aggregation for all instruments.
-  std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
-  EXPECT_EQ(GetOptions(exporter).aggregation_temporality,
-            PreferredAggregationTemporality::kCumulative);
-  auto cumm_selector =
-      OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter).aggregation_temporality);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-
-  // LowMemory aggregation selector use:
-  //   - cummulative aggregtion for Counter and Histogram
-  //   - delta aggregation for up-down counter, observable counter, observable gauge, observable
-  //   up-down counter
-  OtlpHttpMetricExporterOptions opts2;
-  opts2.aggregation_temporality = PreferredAggregationTemporality::kLowMemory;
-  std::unique_ptr<OtlpHttpMetricExporter> exporter2(new OtlpHttpMetricExporter(opts2));
-  EXPECT_EQ(GetOptions(exporter2).aggregation_temporality,
-            PreferredAggregationTemporality::kLowMemory);
-  auto lowmemory_selector =
-      OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter2).aggregation_temporality);
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(
-      lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
-      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-
-  // Delta aggregation selector use:
-  //   - delta aggregtion for Counter, Histogram, Observable Counter, Observable Gauge
-  //   - cummulative aggregation for up-down counter, observable up-down counter
-  OtlpHttpMetricExporterOptions opts3;
-  opts3.aggregation_temporality = PreferredAggregationTemporality::kDelta;
-  std::unique_ptr<OtlpHttpMetricExporter> exporter3(new OtlpHttpMetricExporter(opts3));
-  EXPECT_EQ(GetOptions(exporter3).aggregation_temporality, PreferredAggregationTemporality::kDelta);
-  auto delta_selector =
-      OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter3).aggregation_temporality);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
-            opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
-
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-  EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
-            opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_log_recordable_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_log_recordable_test.cc
deleted file mode 100644
index 5c1032912..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_log_recordable_test.cc
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <chrono>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_log_recordable.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/readable_log_record.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-// IWYU pragma: no_include "net/proto2/public/repeated_field.h"
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/logs/v1/logs.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-namespace resource = opentelemetry::sdk::resource;
-namespace proto    = opentelemetry::proto;
-
-TEST(OtlpLogRecordable, Basic)
-{
-  OtlpLogRecordable rec;
-  std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
-  common::SystemTimestamp start_timestamp(now);
-
-  uint64_t unix_start =
-      std::chrono::duration_cast<std::chrono::nanoseconds>(now.time_since_epoch()).count();
-
-  rec.SetTimestamp(start_timestamp);
-  rec.SetSeverity(opentelemetry::logs::Severity::kError);
-  nostd::string_view name = "Test Log Message";
-  rec.SetBody(name);
-
-  uint8_t trace_id_bin[opentelemetry::trace::TraceId::kSize] = {
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-  std::string expected_trace_id_bytes;
-  expected_trace_id_bytes.assign(
-      reinterpret_cast<char *>(trace_id_bin),
-      reinterpret_cast<char *>(trace_id_bin) + opentelemetry::trace::TraceId::kSize);
-  rec.SetTraceId(opentelemetry::trace::TraceId{trace_id_bin});
-  uint8_t span_id_bin[opentelemetry::trace::SpanId::kSize] = {'7', '6', '5', '4',
-                                                              '3', '2', '1', '0'};
-  std::string expected_span_id_bytes;
-  expected_span_id_bytes.assign(
-      reinterpret_cast<char *>(span_id_bin),
-      reinterpret_cast<char *>(span_id_bin) + opentelemetry::trace::SpanId::kSize);
-  rec.SetSpanId(opentelemetry::trace::SpanId{span_id_bin});
-
-  EXPECT_EQ(rec.log_record().time_unix_nano(), unix_start);
-  EXPECT_EQ(rec.log_record().severity_number(), proto::logs::v1::SEVERITY_NUMBER_ERROR);
-  EXPECT_EQ(rec.log_record().severity_text(), "ERROR");
-  EXPECT_EQ(rec.log_record().body().string_value(), name);
-  EXPECT_EQ(rec.log_record().trace_id(), expected_trace_id_bytes);
-  EXPECT_EQ(rec.log_record().span_id(), expected_span_id_bytes);
-}
-
-TEST(OtlpLogRecordable, GetResource)
-{
-  OtlpLogRecordable rec;
-  const std::string service_name_key = "service.name";
-  std::string service_name           = "test-otlp";
-  auto resource =
-      opentelemetry::sdk::resource::Resource::Create({{service_name_key, service_name}});
-  rec.SetResource(resource);
-
-  EXPECT_EQ(&rec.GetResource(), &resource);
-}
-
-TEST(OtlpLogRecordable, DefaultResource)
-{
-  OtlpLogRecordable rec;
-
-  EXPECT_EQ(&rec.GetResource(), &opentelemetry::sdk::logs::ReadableLogRecord::GetDefaultResource());
-}
-
-// Test non-int single types. Int single types are tested using templates (see IntAttributeTest)
-TEST(OtlpLogRecordable, SetSingleAttribute)
-{
-  OtlpLogRecordable rec;
-
-  nostd::string_view bool_key = "bool_attr";
-  common::AttributeValue bool_val(true);
-  rec.SetAttribute(bool_key, bool_val);
-
-  nostd::string_view double_key = "double_attr";
-  common::AttributeValue double_val(3.3);
-  rec.SetAttribute(double_key, double_val);
-
-  nostd::string_view str_key = "str_attr";
-  common::AttributeValue str_val(nostd::string_view("Test"));
-  rec.SetAttribute(str_key, str_val);
-
-  int checked_attributes = 0;
-  for (auto &attribute : rec.log_record().attributes())
-  {
-    if (attribute.key() == bool_key)
-    {
-      ++checked_attributes;
-      EXPECT_EQ(attribute.value().bool_value(), nostd::get<bool>(bool_val));
-    }
-    else if (attribute.key() == double_key)
-    {
-      ++checked_attributes;
-      EXPECT_EQ(attribute.value().double_value(), nostd::get<double>(double_val));
-    }
-    else if (attribute.key() == str_key)
-    {
-      ++checked_attributes;
-      EXPECT_EQ(attribute.value().string_value(), nostd::get<nostd::string_view>(str_val).data());
-    }
-  }
-  EXPECT_EQ(3, checked_attributes);
-}
-
-// Test non-int array types. Int array types are tested using templates (see IntAttributeTest)
-TEST(OtlpLogRecordable, SetArrayAttribute)
-{
-  OtlpLogRecordable rec;
-
-  const int kArraySize = 3;
-
-  bool bool_arr[kArraySize] = {true, false, true};
-  nostd::span<const bool> bool_span(bool_arr);
-  rec.SetAttribute("bool_arr_attr", bool_span);
-
-  double double_arr[kArraySize] = {22.3, 33.4, 44.5};
-  nostd::span<const double> double_span(double_arr);
-  rec.SetAttribute("double_arr_attr", double_span);
-
-  nostd::string_view str_arr[kArraySize] = {"Hello", "World", "Test"};
-  nostd::span<const nostd::string_view> str_span(str_arr);
-  rec.SetAttribute("str_arr_attr", str_span);
-
-  for (int i = 0; i < kArraySize; i++)
-  {
-    EXPECT_EQ(rec.log_record().attributes(0).value().array_value().values(i).bool_value(),
-              bool_span[i]);
-    EXPECT_EQ(rec.log_record().attributes(1).value().array_value().values(i).double_value(),
-              double_span[i]);
-    EXPECT_EQ(rec.log_record().attributes(2).value().array_value().values(i).string_value(),
-              str_span[i]);
-  }
-}
-
-TEST(OtlpLogRecordable, SetInstrumentationScope)
-{
-  OtlpLogRecordable rec;
-
-  auto inst_lib =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("test", "v1");
-  rec.SetInstrumentationScope(*inst_lib);
-
-  EXPECT_EQ(&rec.GetInstrumentationScope(), inst_lib.get());
-}
-
-TEST(OtlpLogRecordable, SetEventName)
-{
-  OtlpLogRecordable rec;
-
-  nostd::string_view event_name = "Test Event";
-  rec.SetEventId(0, event_name);
-
-  EXPECT_EQ(rec.log_record().event_name(), event_name);
-}
-
-/**
- * AttributeValue can contain different int types, such as int, int64_t,
- * unsigned int, and uint64_t. To avoid writing test cases for each, we can
- * use a template approach to test all int types.
- */
-template <typename T>
-struct OtlpLogRecordableIntAttributeTest : public testing::Test
-{
-  using IntParamType = T;
-};
-
-using IntTypes = testing::Types<int, int64_t, unsigned int, uint64_t>;
-TYPED_TEST_SUITE(OtlpLogRecordableIntAttributeTest, IntTypes);
-
-TYPED_TEST(OtlpLogRecordableIntAttributeTest, SetIntSingleAttribute)
-{
-  using IntType = typename TestFixture::IntParamType;
-  IntType i     = 2;
-  common::AttributeValue int_val(i);
-
-  OtlpLogRecordable rec;
-
-  rec.SetAttribute("int_attr", int_val);
-
-  EXPECT_EQ(rec.log_record().attributes(0).value().int_value(), nostd::get<IntType>(int_val));
-}
-
-TYPED_TEST(OtlpLogRecordableIntAttributeTest, SetIntArrayAttribute)
-{
-  using IntType = typename TestFixture::IntParamType;
-
-  const int kArraySize        = 3;
-  IntType int_arr[kArraySize] = {4, 5, 6};
-  nostd::span<const IntType> int_span(int_arr);
-
-  OtlpLogRecordable rec;
-
-  rec.SetAttribute("int_arr_attr", int_span);
-
-  for (int i = 0; i < kArraySize; i++)
-  {
-    EXPECT_EQ(rec.log_record().attributes(0).value().array_value().values(i).int_value(),
-              int_span[i]);
-  }
-}
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_metrics_serialization_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_metrics_serialization_test.cc
deleted file mode 100644
index c7b72aa75..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_metrics_serialization_test.cc
+++ /dev/null
@@ -1,460 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <algorithm>
-#include <chrono>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/metrics/v1/metrics.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-namespace resource      = opentelemetry::sdk::resource;
-namespace proto         = opentelemetry::proto;
-namespace metrics_sdk   = opentelemetry::sdk::metrics;
-namespace otlp_exporter = opentelemetry::exporter::otlp;
-
-static metrics_sdk::MetricData CreateSumAggregationData()
-{
-  metrics_sdk::MetricData data;
-  data.start_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  metrics_sdk::InstrumentDescriptor inst_desc = {"Counter", "desc", "unit",
-                                                 metrics_sdk::InstrumentType::kCounter,
-                                                 metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2;
-  s_data_1.value_ = 10.2;
-  s_data_2.value_ = 20.2;
-
-  data.aggregation_temporality = metrics_sdk::AggregationTemporality::kCumulative;
-  data.end_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  data.instrument_descriptor = inst_desc;
-  metrics_sdk::PointDataAttributes point_data_attr_1, point_data_attr_2;
-  point_data_attr_1.attributes = {{"k1", "v1"}};
-  point_data_attr_1.point_data = s_data_1;
-
-  point_data_attr_2.attributes = {{"k2", "v2"}};
-  point_data_attr_2.point_data = s_data_2;
-  std::vector<metrics_sdk::PointDataAttributes> point_data_attr;
-  point_data_attr.push_back(point_data_attr_1);
-  point_data_attr.push_back(point_data_attr_2);
-  data.point_data_attr_ = std::move(point_data_attr);
-  return data;
-}
-
-static metrics_sdk::MetricData CreateUpDownCounterAggregationData()
-{
-  metrics_sdk::MetricData data;
-  data.start_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  metrics_sdk::InstrumentDescriptor inst_desc = {"UpDownCounter", "Robot Pose Y", "Meter",
-                                                 metrics_sdk::InstrumentType::kUpDownCounter,
-                                                 metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2;
-  s_data_1.value_ = 1.35;
-  s_data_2.value_ = 1.37;
-
-  data.aggregation_temporality = metrics_sdk::AggregationTemporality::kCumulative;
-  data.end_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  data.instrument_descriptor = inst_desc;
-  metrics_sdk::PointDataAttributes point_data_attr_1, point_data_attr_2;
-  point_data_attr_1.attributes = {{"environment_id", "DEV-AYS"}};
-  point_data_attr_1.point_data = s_data_1;
-
-  point_data_attr_2.attributes = {{"robot_id", "DEV-AYS-03-02"}};
-  point_data_attr_2.point_data = s_data_2;
-  std::vector<metrics_sdk::PointDataAttributes> point_data_attr;
-  point_data_attr.push_back(point_data_attr_1);
-  point_data_attr.push_back(point_data_attr_2);
-  data.point_data_attr_ = std::move(point_data_attr);
-  return data;
-}
-
-static metrics_sdk::MetricData CreateHistogramAggregationData()
-{
-  metrics_sdk::MetricData data;
-  data.start_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  metrics_sdk::InstrumentDescriptor inst_desc = {"Histogram", "desc", "unit",
-                                                 metrics_sdk::InstrumentType::kCounter,
-                                                 metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::HistogramPointData s_data_1, s_data_2;
-  s_data_1.sum_        = 100.2;
-  s_data_1.count_      = 22;
-  s_data_1.counts_     = {2, 9, 4, 7};
-  s_data_1.boundaries_ = std::vector<double>({0.0, 10.0, 20.0, 30.0});
-  s_data_2.sum_        = 200.2;
-  s_data_2.count_      = 20;
-  s_data_2.counts_     = {0, 8, 5, 7};
-  s_data_2.boundaries_ = std::vector<double>({0.0, 10.0, 20.0, 30.0});
-
-  data.aggregation_temporality = metrics_sdk::AggregationTemporality::kCumulative;
-  data.end_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  data.instrument_descriptor = inst_desc;
-  metrics_sdk::PointDataAttributes point_data_attr_1, point_data_attr_2;
-  point_data_attr_1.attributes = {{"k1", "v1"}};
-  point_data_attr_1.point_data = s_data_1;
-
-  point_data_attr_2.attributes = {{"k2", "v2"}};
-  point_data_attr_2.point_data = s_data_2;
-  std::vector<metrics_sdk::PointDataAttributes> point_data_attr;
-  point_data_attr.push_back(point_data_attr_1);
-  point_data_attr.push_back(point_data_attr_2);
-  data.point_data_attr_ = std::move(point_data_attr);
-  return data;
-}
-
-static metrics_sdk::MetricData CreateExponentialHistogramAggregationData(
-    const std::chrono::system_clock::time_point &now_time)
-{
-  metrics_sdk::MetricData data;
-  data.start_ts                               = opentelemetry::common::SystemTimestamp(now_time);
-  metrics_sdk::InstrumentDescriptor inst_desc = {"Histogram", "desc", "unit",
-                                                 metrics_sdk::InstrumentType::kHistogram,
-                                                 metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::Base2ExponentialHistogramPointData s_data_1, s_data_2;
-  s_data_1.count_          = 3;
-  s_data_1.sum_            = 6.5;
-  s_data_1.min_            = 0.0;
-  s_data_1.max_            = 3.5;
-  s_data_1.scale_          = 3;
-  s_data_1.record_min_max_ = true;
-  s_data_1.zero_count_     = 1;
-  s_data_1.positive_buckets_ =
-      std::make_unique<opentelemetry::sdk::metrics::AdaptingCircularBufferCounter>(10);
-  s_data_1.negative_buckets_ =
-      std::make_unique<opentelemetry::sdk::metrics::AdaptingCircularBufferCounter>(10);
-  s_data_1.positive_buckets_->Increment(1, 1);
-  s_data_1.negative_buckets_->Increment(-2, 1);
-
-  s_data_2.count_          = 4;
-  s_data_2.sum_            = 6.2;
-  s_data_2.min_            = -0.03;
-  s_data_2.max_            = 3.5;
-  s_data_2.scale_          = 3;
-  s_data_2.record_min_max_ = false;
-  s_data_2.zero_count_     = 2;
-  s_data_2.positive_buckets_ =
-      std::make_unique<opentelemetry::sdk::metrics::AdaptingCircularBufferCounter>(10);
-  s_data_2.negative_buckets_ =
-      std::make_unique<opentelemetry::sdk::metrics::AdaptingCircularBufferCounter>(10);
-  s_data_2.positive_buckets_->Increment(3, 1);
-  s_data_2.negative_buckets_->Increment(-2, 1);
-  s_data_2.negative_buckets_->Increment(-4, 2);
-
-  data.aggregation_temporality = metrics_sdk::AggregationTemporality::kCumulative;
-  data.end_ts                  = opentelemetry::common::SystemTimestamp(now_time);
-  data.instrument_descriptor   = inst_desc;
-  metrics_sdk::PointDataAttributes point_data_attr_1, point_data_attr_2;
-  point_data_attr_1.attributes = {{"k1", "v1"}};
-  point_data_attr_1.point_data = s_data_1;
-
-  point_data_attr_2.attributes = {{"k2", "v2"}};
-  point_data_attr_2.point_data = s_data_2;
-  std::vector<metrics_sdk::PointDataAttributes> point_data_attr;
-  point_data_attr.push_back(point_data_attr_1);
-  point_data_attr.push_back(point_data_attr_2);
-  data.point_data_attr_ = std::move(point_data_attr);
-  return data;
-}
-
-static metrics_sdk::MetricData CreateObservableGaugeAggregationData()
-{
-  metrics_sdk::MetricData data;
-  data.start_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  metrics_sdk::InstrumentDescriptor inst_desc = {"LastValue", "desc", "unit",
-                                                 metrics_sdk::InstrumentType::kObservableGauge,
-                                                 metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::LastValuePointData s_data_1, s_data_2;
-  s_data_1.value_ = 30.2;
-  s_data_2.value_ = 50.2;
-
-  data.aggregation_temporality = metrics_sdk::AggregationTemporality::kCumulative;
-  data.end_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  data.instrument_descriptor = inst_desc;
-  metrics_sdk::PointDataAttributes point_data_attr_1, point_data_attr_2;
-  point_data_attr_1.attributes = {{"k1", "v1"}};
-  point_data_attr_1.point_data = s_data_1;
-
-  point_data_attr_2.attributes = {{"k2", "v2"}};
-  point_data_attr_2.point_data = s_data_2;
-  std::vector<metrics_sdk::PointDataAttributes> point_data_attr;
-  point_data_attr.push_back(point_data_attr_1);
-  point_data_attr.push_back(point_data_attr_2);
-  data.point_data_attr_ = std::move(point_data_attr);
-  return data;
-}
-
-static metrics_sdk::MetricData CreateObservableCounterAggregationData()
-{
-  metrics_sdk::MetricData data;
-  data.start_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  metrics_sdk::InstrumentDescriptor inst_desc = {
-      "ObservableCounter", "test description", "test unit",
-      metrics_sdk::InstrumentType::kObservableCounter, metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2;
-  s_data_1.value_ = 1.23;
-  s_data_2.value_ = 4.56;
-
-  data.aggregation_temporality = metrics_sdk::AggregationTemporality::kCumulative;
-  data.end_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  data.instrument_descriptor = inst_desc;
-  metrics_sdk::PointDataAttributes point_data_attr_1, point_data_attr_2;
-  point_data_attr_1.attributes = {{"key1", "value1"}};
-  point_data_attr_1.point_data = s_data_1;
-
-  point_data_attr_2.attributes = {{"key2", "value2"}};
-  point_data_attr_2.point_data = s_data_2;
-  std::vector<metrics_sdk::PointDataAttributes> point_data_attr;
-  point_data_attr.push_back(point_data_attr_1);
-  point_data_attr.push_back(point_data_attr_2);
-  data.point_data_attr_ = std::move(point_data_attr);
-  return data;
-}
-
-static metrics_sdk::MetricData CreateObservableUpDownCounterAggregationData()
-{
-  metrics_sdk::MetricData data;
-  data.start_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  metrics_sdk::InstrumentDescriptor inst_desc = {
-      "ObservableUpDownCounter", "test description", "test unit",
-      metrics_sdk::InstrumentType::kObservableUpDownCounter,
-      metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2, s_data_3;
-  s_data_1.value_ = 1.23;
-  s_data_2.value_ = 4.56;
-  s_data_3.value_ = 2.34;
-
-  data.aggregation_temporality = metrics_sdk::AggregationTemporality::kCumulative;
-  data.end_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  data.instrument_descriptor = inst_desc;
-  metrics_sdk::PointDataAttributes point_data_attr_1, point_data_attr_2, point_data_attr_3;
-  point_data_attr_1.attributes = {{"key1", "value1"}};
-  point_data_attr_1.point_data = s_data_1;
-
-  point_data_attr_2.attributes = {{"key2", "value2"}};
-  point_data_attr_2.point_data = s_data_2;
-
-  point_data_attr_3.attributes = {{"key3", "value3"}};
-  point_data_attr_3.point_data = s_data_3;
-  std::vector<metrics_sdk::PointDataAttributes> point_data_attr;
-  point_data_attr.push_back(point_data_attr_1);
-  point_data_attr.push_back(point_data_attr_2);
-  point_data_attr.push_back(point_data_attr_3);
-  data.point_data_attr_ = std::move(point_data_attr);
-  return data;
-}
-
-TEST(OtlpMetricSerializationTest, Counter)
-{
-  metrics_sdk::MetricData data = CreateSumAggregationData();
-  opentelemetry::proto::metrics::v1::Sum sum;
-  otlp_exporter::OtlpMetricUtils::ConvertSumMetric(data, &sum);
-  EXPECT_EQ(sum.aggregation_temporality(),
-            proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE);
-  EXPECT_EQ(sum.is_monotonic(), true);
-  for (size_t i = 0; i < 1; i++)
-  {
-    const auto &proto_number_point = sum.data_points(i);
-    EXPECT_EQ(proto_number_point.as_double(), i == 0 ? 10.2 : 20.2);
-  }
-
-  EXPECT_EQ(1, 1);
-}
-
-TEST(OtlpMetricSerializationTest, UpDownCounter)
-{
-  metrics_sdk::MetricData data = CreateUpDownCounterAggregationData();
-  opentelemetry::proto::metrics::v1::Sum sum;
-  otlp_exporter::OtlpMetricUtils::ConvertSumMetric(data, &sum);
-  EXPECT_EQ(sum.aggregation_temporality(),
-            proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE);
-  EXPECT_EQ(sum.is_monotonic(), false);
-  EXPECT_EQ(sum.data_points(0).as_double(), 1.35);
-  EXPECT_EQ(sum.data_points(1).as_double(), 1.37);
-
-  EXPECT_EQ(1, 1);
-}
-
-TEST(OtlpMetricSerializationTest, Histogram)
-{
-  metrics_sdk::MetricData data = CreateHistogramAggregationData();
-  opentelemetry::proto::metrics::v1::Histogram histogram;
-  otlp_exporter::OtlpMetricUtils::ConvertHistogramMetric(data, &histogram);
-  EXPECT_EQ(histogram.aggregation_temporality(),
-            proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE);
-  for (size_t i = 0; i < 1; i++)
-  {
-    const auto &proto_number_point = histogram.data_points(i);
-    EXPECT_EQ(proto_number_point.sum(), i == 0 ? 100.2 : 200.2);
-  }
-
-  EXPECT_EQ(1, 1);
-}
-
-TEST(OtlpMetricSerializationTest, ExponentialHistogramAggregationData)
-{
-  const auto start_test_time = std::chrono::system_clock::now();
-  const auto data            = CreateExponentialHistogramAggregationData(start_test_time);
-  opentelemetry::proto::metrics::v1::ExponentialHistogram exponentialHistogram;
-  otlp_exporter::OtlpMetricUtils::ConvertExponentialHistogramMetric(data, &exponentialHistogram);
-  EXPECT_EQ(exponentialHistogram.aggregation_temporality(),
-            proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE);
-
-  EXPECT_EQ(exponentialHistogram.data_points_size(), 2);
-  // Point 1
-  {
-    const auto &data_point1 = exponentialHistogram.data_points(0);
-    EXPECT_EQ(data_point1.count(), 3);
-    EXPECT_EQ(data_point1.sum(), 6.5);
-    EXPECT_EQ(data_point1.min(), 0.0);
-    EXPECT_EQ(data_point1.max(), 3.5);
-    EXPECT_EQ(data_point1.zero_count(), 1);
-    EXPECT_EQ(data_point1.scale(), 3);
-    EXPECT_EQ(data_point1.positive().offset(), 1);
-    EXPECT_EQ(data_point1.positive().bucket_counts_size(), 1);
-    EXPECT_EQ(data_point1.positive().bucket_counts(0), 1);
-    EXPECT_EQ(data_point1.negative().offset(), -2);
-    EXPECT_EQ(data_point1.negative().bucket_counts_size(), 1);
-    EXPECT_EQ(data_point1.negative().bucket_counts(0), 1);
-
-    EXPECT_EQ(data_point1.attributes_size(), 1);
-    EXPECT_EQ(data_point1.attributes(0).key(), "k1");
-    EXPECT_EQ(data_point1.attributes(0).value().string_value(), "v1");
-    EXPECT_EQ(data_point1.start_time_unix_nano(), data.start_ts.time_since_epoch().count());
-    EXPECT_EQ(data_point1.time_unix_nano(), data.end_ts.time_since_epoch().count());
-  }
-
-  // Point 2
-  {
-    const auto &data_point2 = exponentialHistogram.data_points(1);
-    EXPECT_EQ(data_point2.count(), 4);
-    EXPECT_EQ(data_point2.sum(), 6.2);
-    EXPECT_EQ(data_point2.min(), 0.0);
-    EXPECT_EQ(data_point2.max(), 0.0);
-    EXPECT_EQ(data_point2.zero_count(), 2);
-    EXPECT_EQ(data_point2.scale(), 3);
-    EXPECT_EQ(data_point2.positive().offset(), 3);
-    EXPECT_EQ(data_point2.positive().bucket_counts_size(), 1);
-    EXPECT_EQ(data_point2.positive().bucket_counts(0), 1);
-    EXPECT_EQ(data_point2.negative().offset(), -4);
-    EXPECT_EQ(data_point2.negative().bucket_counts_size(), 3);
-    EXPECT_EQ(data_point2.negative().bucket_counts(0), 2);
-    EXPECT_EQ(data_point2.negative().bucket_counts(1), 0);
-    EXPECT_EQ(data_point2.negative().bucket_counts(2), 1);
-    EXPECT_EQ(data_point2.attributes(0).key(), "k2");
-    EXPECT_EQ(data_point2.attributes(0).value().string_value(), "v2");
-    EXPECT_EQ(data_point2.start_time_unix_nano(), data.start_ts.time_since_epoch().count());
-    EXPECT_EQ(data_point2.time_unix_nano(), data.end_ts.time_since_epoch().count());
-  }
-
-  EXPECT_EQ(1, 1);
-}
-
-TEST(OtlpMetricSerializationTest, ObservableGauge)
-{
-  metrics_sdk::MetricData data = CreateObservableGaugeAggregationData();
-  opentelemetry::proto::metrics::v1::Gauge gauge;
-  otlp_exporter::OtlpMetricUtils::ConvertGaugeMetric(data, &gauge);
-  for (size_t i = 0; i < 1; i++)
-  {
-    const auto &proto_number_point = gauge.data_points(i);
-    EXPECT_EQ(proto_number_point.as_double(), i == 0 ? 30.2 : 50.2);
-  }
-
-  EXPECT_EQ(1, 1);
-}
-
-TEST(OtlpMetricSerializationTest, ObservableCounter)
-{
-  metrics_sdk::MetricData data = CreateObservableCounterAggregationData();
-  opentelemetry::proto::metrics::v1::Sum sum;
-  otlp_exporter::OtlpMetricUtils::ConvertSumMetric(data, &sum);
-  EXPECT_EQ(sum.aggregation_temporality(),
-            proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE);
-  EXPECT_EQ(sum.is_monotonic(), true);
-  EXPECT_EQ(sum.data_points_size(), 2);
-  EXPECT_EQ(sum.data_points(0).as_double(), 1.23);
-  EXPECT_EQ(sum.data_points(1).as_double(), 4.56);
-
-  EXPECT_EQ(1, 1);
-}
-
-TEST(OtlpMetricSerializationTest, ObservableUpDownCounter)
-{
-  metrics_sdk::MetricData data = CreateObservableUpDownCounterAggregationData();
-  opentelemetry::proto::metrics::v1::Sum sum;
-  otlp_exporter::OtlpMetricUtils::ConvertSumMetric(data, &sum);
-  EXPECT_EQ(sum.aggregation_temporality(),
-            proto::metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE);
-  EXPECT_EQ(sum.is_monotonic(), false);
-  EXPECT_EQ(sum.data_points_size(), 3);
-  EXPECT_EQ(sum.data_points(0).as_double(), 1.23);
-  EXPECT_EQ(sum.data_points(1).as_double(), 4.56);
-  EXPECT_EQ(sum.data_points(2).as_double(), 2.34);
-
-  EXPECT_EQ(1, 1);
-}
-
-TEST(OtlpMetricSerializationTest, PopulateExportMetricsServiceRequest)
-{
-  const auto resource =
-      resource::Resource::Create({{"service.name", "test_service_name"}}, "resource_schema_url");
-  const auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "scope_name", "scope_version", "scope_schema_url", {{"scope_key", "scope_value"}});
-
-  metrics_sdk::ScopeMetrics scope_metrics{scope.get(), CreateSumAggregationData()};
-  metrics_sdk::ResourceMetrics resource_metrics{&resource, scope_metrics};
-
-  proto::collector::metrics::v1::ExportMetricsServiceRequest request_proto;
-  otlp_exporter::OtlpMetricUtils::PopulateRequest(resource_metrics, &request_proto);
-
-  ASSERT_EQ(1, request_proto.resource_metrics_size());
-  const auto &resource_metrics_proto = request_proto.resource_metrics(0);
-  EXPECT_EQ("resource_schema_url", resource_metrics_proto.schema_url());
-
-  ASSERT_EQ(1, resource_metrics_proto.scope_metrics_size());
-  const auto &scope_metrics_proto = resource_metrics_proto.scope_metrics(0);
-  EXPECT_EQ("scope_schema_url", scope_metrics_proto.schema_url());
-
-  ASSERT_EQ(1, scope_metrics_proto.metrics_size());
-  const auto &metric_proto = scope_metrics_proto.metrics(0);
-  EXPECT_EQ("Counter", metric_proto.name());
-
-  const auto &scope_proto = scope_metrics_proto.scope();
-  EXPECT_EQ("scope_name", scope_proto.name());
-  EXPECT_EQ("scope_version", scope_proto.version());
-
-  ASSERT_EQ(1, scope_proto.attributes_size());
-  const auto &scope_attributes_proto = scope_proto.attributes(0);
-  EXPECT_EQ("scope_key", scope_attributes_proto.key());
-  EXPECT_EQ("scope_value", scope_attributes_proto.value().string_value());
-}
-
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_recordable_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_recordable_test.cc
deleted file mode 100644
index c2449c2c2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/otlp/test/otlp_recordable_test.cc
+++ /dev/null
@@ -1,510 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <algorithm>
-#include <chrono>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable.h"
-#include "opentelemetry/exporters/otlp/otlp_recordable_utils.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "opentelemetry/version.h"
-
-#if defined(__GNUC__)
-// GCC raises -Wsuggest-override warnings on GTest,
-// in code related to TYPED_TEST() .
-#  pragma GCC diagnostic ignored "-Wsuggest-override"
-#endif
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep
-// IWYU pragma: no_include "net/proto2/public/repeated_field.h"
-#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/resource/v1/resource.pb.h"
-#include "opentelemetry/proto/trace/v1/trace.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
-// clang-format on
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace otlp
-{
-namespace trace_api = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace resource  = opentelemetry::sdk::resource;
-namespace proto     = opentelemetry::proto;
-
-namespace trace_sdk_2 = opentelemetry::sdk::trace;
-
-TEST(OtlpRecordable, SetIdentity)
-{
-  constexpr uint8_t trace_id_buf[]       = {1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t span_id_buf[]        = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t parent_span_id_buf[] = {8, 7, 6, 5, 4, 3, 2, 1};
-  trace_api::TraceId trace_id{trace_id_buf};
-  trace_api::SpanId span_id{span_id_buf};
-  trace_api::SpanId parent_span_id{parent_span_id_buf};
-  const auto trace_state = trace_api::TraceState::GetDefault()->Set("key1", "value");
-  const trace_api::SpanContext span_context{
-      trace_id, span_id, trace_api::TraceFlags{trace_api::TraceFlags::kIsSampled}, true,
-      trace_state};
-
-  OtlpRecordable rec;
-
-  rec.SetIdentity(span_context, parent_span_id);
-
-  EXPECT_EQ(rec.span().trace_id(), std::string(reinterpret_cast<const char *>(trace_id.Id().data()),
-                                               trace::TraceId::kSize));
-  EXPECT_EQ(rec.span().span_id(),
-            std::string(reinterpret_cast<const char *>(span_id.Id().data()), trace::SpanId::kSize));
-  EXPECT_EQ(rec.span().trace_state(), "key1=value");
-  EXPECT_EQ(rec.span().parent_span_id(),
-            std::string(reinterpret_cast<const char *>(parent_span_id.Id().data()),
-                        trace::SpanId::kSize));
-
-  OtlpRecordable rec_invalid_parent;
-
-  constexpr uint8_t invalid_parent_span_id_buf[] = {0, 0, 0, 0, 0, 0, 0, 0};
-  trace_api::SpanId invalid_parent_span_id{invalid_parent_span_id_buf};
-  rec_invalid_parent.SetIdentity(span_context, invalid_parent_span_id);
-
-  EXPECT_EQ(rec_invalid_parent.span().parent_span_id(), std::string{});
-}
-
-TEST(OtlpRecordable, SetSpanKind)
-{
-  OtlpRecordable rec;
-  trace_api::SpanKind span_kind = trace_api::SpanKind::kServer;
-  rec.SetSpanKind(span_kind);
-  EXPECT_EQ(rec.span().kind(), proto::trace::v1::Span_SpanKind::Span_SpanKind_SPAN_KIND_SERVER);
-}
-
-TEST(OtlpRecordable, SetInstrumentationScope)
-{
-  OtlpRecordable rec;
-  auto inst_lib = trace_sdk::InstrumentationScope::Create("test", "v1");
-  rec.SetInstrumentationScope(*inst_lib);
-  auto proto_instr_libr = rec.GetProtoInstrumentationScope();
-  EXPECT_EQ(proto_instr_libr.name(), inst_lib->GetName());
-  EXPECT_EQ(proto_instr_libr.version(), inst_lib->GetVersion());
-}
-
-TEST(OtlpRecordable, SetInstrumentationLibraryWithSchemaURL)
-{
-  OtlpRecordable rec;
-  const std::string expected_schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto inst_lib = trace_sdk::InstrumentationScope::Create("test", "v1", expected_schema_url);
-  rec.SetInstrumentationScope(*inst_lib);
-  EXPECT_EQ(expected_schema_url, rec.GetInstrumentationLibrarySchemaURL());
-}
-
-TEST(OtlpRecordable, SetInstrumentationScopeWithAttributes)
-{
-  exporter::otlp::OtlpRecordable rec;
-
-  auto inst_lib = trace_sdk::InstrumentationScope::Create(
-      "test_scope_name", "test_version", "test_schema_url", {{"test_key", "test_value"}});
-
-  ASSERT_EQ(inst_lib->GetAttributes().size(), 1);
-
-  rec.SetInstrumentationScope(*inst_lib);
-
-  const auto proto_instr_libr = rec.GetProtoInstrumentationScope();
-  EXPECT_EQ("test_scope_name", proto_instr_libr.name());
-  EXPECT_EQ("test_version", proto_instr_libr.version());
-
-  ASSERT_EQ(proto_instr_libr.attributes_size(), 1);
-  const auto &proto_attributes = proto_instr_libr.attributes(0);
-  // Requires protoc 3.15.0
-  // ASSERT_TRUE(proto_attributes.value().has_string_value());
-  EXPECT_EQ("test_key", proto_attributes.key());
-  EXPECT_EQ("test_value", proto_attributes.value().string_value());
-}
-
-TEST(OtlpRecordable, SetStartTime)
-{
-  OtlpRecordable rec;
-  std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now();
-  common::SystemTimestamp start_timestamp(start_time);
-
-  uint64_t unix_start =
-      std::chrono::duration_cast<std::chrono::nanoseconds>(start_time.time_since_epoch()).count();
-
-  rec.SetStartTime(start_timestamp);
-  EXPECT_EQ(rec.span().start_time_unix_nano(), unix_start);
-}
-
-TEST(OtlpRecordable, SetDuration)
-{
-  OtlpRecordable rec;
-  // Start time is 0
-  common::SystemTimestamp start_timestamp;
-
-  std::chrono::nanoseconds duration(10);
-  uint64_t unix_end = duration.count();
-
-  rec.SetStartTime(start_timestamp);
-  rec.SetDuration(duration);
-
-  EXPECT_EQ(rec.span().end_time_unix_nano(), unix_end);
-}
-
-TEST(OtlpRecordable, SetStatus)
-{
-  OtlpRecordable rec1;
-  trace::StatusCode code_error(trace::StatusCode::kError);
-  nostd::string_view description = "For test";
-  rec1.SetStatus(code_error, description);
-
-  EXPECT_EQ(rec1.span().status().code(), proto::trace::v1::Status_StatusCode(code_error));
-  EXPECT_EQ(rec1.span().status().message(), description);
-
-  OtlpRecordable rec2;
-  trace::StatusCode code_ok(trace::StatusCode::kOk);
-  rec2.SetStatus(code_ok, description);
-  EXPECT_EQ(rec2.span().status().code(), proto::trace::v1::Status_StatusCode(code_ok));
-  EXPECT_EQ(rec2.span().status().message(), "");
-}
-
-TEST(OtlpRecordable, AddEventDefault)
-{
-  OtlpRecordable rec;
-  nostd::string_view name = "Test Event";
-
-  std::chrono::system_clock::time_point event_time = std::chrono::system_clock::now();
-  common::SystemTimestamp event_timestamp(event_time);
-
-  rec.sdk::trace::Recordable::AddEvent(name, event_timestamp);
-
-  uint64_t unix_event_time =
-      std::chrono::duration_cast<std::chrono::nanoseconds>(event_time.time_since_epoch()).count();
-
-  EXPECT_EQ(rec.span().events(0).name(), name);
-  EXPECT_EQ(rec.span().events(0).time_unix_nano(), unix_event_time);
-  EXPECT_EQ(rec.span().events(0).attributes().size(), 0);
-}
-
-TEST(OtlpRecordable, AddEventWithAttributes)
-{
-  OtlpRecordable rec;
-  const int kNumAttributes              = 3;
-  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3"};
-  int values[kNumAttributes]            = {4, 7, 23};
-  std::map<std::string, int> attributes = {
-      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
-
-  rec.AddEvent("Test Event", std::chrono::system_clock::now(),
-               common::KeyValueIterableView<std::map<std::string, int>>(attributes));
-
-  for (int i = 0; i < kNumAttributes; i++)
-  {
-    EXPECT_EQ(rec.span().events(0).attributes(i).key(), keys[i]);
-    EXPECT_EQ(rec.span().events(0).attributes(i).value().int_value(), values[i]);
-  }
-}
-
-TEST(OtlpRecordable, AddLink)
-{
-  OtlpRecordable rec;
-  const int kNumAttributes              = 3;
-  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3"};
-  int values[kNumAttributes]            = {5, 12, 40};
-  std::map<std::string, int> attributes = {
-      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
-
-  auto trace_id = rec.span().trace_id();
-  auto span_id  = rec.span().span_id();
-
-  trace::TraceFlags flags;
-  std::string trace_state_header = "k1=v1,k2=v2";
-  auto ts                        = trace::TraceState::FromHeader(trace_state_header);
-
-  rec.AddLink(trace::SpanContext(trace::TraceId(), trace::SpanId(), flags, false, ts),
-              common::KeyValueIterableView<std::map<std::string, int>>(attributes));
-
-  EXPECT_EQ(rec.span().trace_id(), trace_id);
-  EXPECT_EQ(rec.span().span_id(), span_id);
-  EXPECT_EQ(rec.span().links(0).trace_state(), trace_state_header);
-  for (int i = 0; i < kNumAttributes; i++)
-  {
-    EXPECT_EQ(rec.span().links(0).attributes(i).key(), keys[i]);
-    EXPECT_EQ(rec.span().links(0).attributes(i).value().int_value(), values[i]);
-  }
-}
-
-TEST(OtlpRecordable, SetResource)
-{
-  OtlpRecordable rec;
-  const std::string service_name_key = "service.name";
-  std::string service_name           = "test-otlp";
-  auto resource = resource::Resource::Create({{service_name_key, service_name}});
-  rec.SetResource(resource);
-
-  auto proto_resource     = rec.ProtoResource();
-  bool found_service_name = false;
-  for (int i = 0; i < proto_resource.attributes_size(); i++)
-  {
-    const auto &attr = proto_resource.attributes(static_cast<int>(i));
-    if (attr.key() == service_name_key && attr.value().string_value() == service_name)
-    {
-      found_service_name = true;
-    }
-  }
-  EXPECT_TRUE(found_service_name);
-}
-
-TEST(OtlpRecordable, SetResourceWithSchemaURL)
-{
-  OtlpRecordable rec;
-  const std::string service_name_key    = "service.name";
-  const std::string service_name        = "test-otlp";
-  const std::string expected_schema_url = "https://opentelemetry.io/schemas/1.11.0";
-  auto resource =
-      resource::Resource::Create({{service_name_key, service_name}}, expected_schema_url);
-  rec.SetResource(resource);
-
-  EXPECT_EQ(expected_schema_url, rec.GetResourceSchemaURL());
-}
-
-// Test non-int single types. Int single types are tested using templates (see IntAttributeTest)
-TEST(OtlpRecordable, SetSingleAttribute)
-{
-  OtlpRecordable rec;
-  nostd::string_view bool_key = "bool_attr";
-  common::AttributeValue bool_val(true);
-  rec.SetAttribute(bool_key, bool_val);
-
-  nostd::string_view double_key = "double_attr";
-  common::AttributeValue double_val(3.3);
-  rec.SetAttribute(double_key, double_val);
-
-  nostd::string_view str_key = "str_attr";
-  common::AttributeValue str_val(nostd::string_view("Test"));
-  rec.SetAttribute(str_key, str_val);
-
-  EXPECT_EQ(rec.span().attributes(0).key(), bool_key);
-  EXPECT_EQ(rec.span().attributes(0).value().bool_value(), nostd::get<bool>(bool_val));
-
-  EXPECT_EQ(rec.span().attributes(1).key(), double_key);
-  EXPECT_EQ(rec.span().attributes(1).value().double_value(), nostd::get<double>(double_val));
-
-  EXPECT_EQ(rec.span().attributes(2).key(), str_key);
-  EXPECT_EQ(rec.span().attributes(2).value().string_value(),
-            nostd::get<nostd::string_view>(str_val).data());
-}
-
-// Test non-int array types. Int array types are tested using templates (see IntAttributeTest)
-TEST(OtlpRecordable, SetArrayAttribute)
-{
-  OtlpRecordable rec;
-  const int kArraySize = 3;
-
-  bool bool_arr[kArraySize] = {true, false, true};
-  nostd::span<const bool> bool_span(bool_arr);
-  rec.SetAttribute("bool_arr_attr", bool_span);
-
-  double double_arr[kArraySize] = {22.3, 33.4, 44.5};
-  nostd::span<const double> double_span(double_arr);
-  rec.SetAttribute("double_arr_attr", double_span);
-
-  nostd::string_view str_arr[kArraySize] = {"Hello", "World", "Test"};
-  nostd::span<const nostd::string_view> str_span(str_arr);
-  rec.SetAttribute("str_arr_attr", str_span);
-
-  for (int i = 0; i < kArraySize; i++)
-  {
-    EXPECT_EQ(rec.span().attributes(0).value().array_value().values(i).bool_value(), bool_span[i]);
-    EXPECT_EQ(rec.span().attributes(1).value().array_value().values(i).double_value(),
-              double_span[i]);
-    EXPECT_EQ(rec.span().attributes(2).value().array_value().values(i).string_value(), str_span[i]);
-  }
-}
-
-// Test otlp resource populate request util
-TEST(OtlpRecordable, PopulateRequest)
-{
-  auto rec1      = std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-  auto resource1 = resource::Resource::Create({{"service.name", "one"}});
-  rec1->SetResource(resource1);
-  auto inst_lib1 = trace_sdk::InstrumentationScope::Create("one", "1", "scope_schema",
-                                                           {{"scope_key", "scope_value"}});
-  rec1->SetInstrumentationScope(*inst_lib1);
-
-  auto rec2      = std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-  auto resource2 = resource::Resource::Create({{"service.name", "two"}});
-  rec2->SetResource(resource2);
-  auto inst_lib2 = trace_sdk::InstrumentationScope::Create("two", "2");
-  rec2->SetInstrumentationScope(*inst_lib2);
-
-  // This has the same resource as rec2, but a different scope
-  auto rec3 = std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-  rec3->SetResource(resource2);
-  auto inst_lib3 = trace_sdk::InstrumentationScope::Create("three", "3");
-  rec3->SetInstrumentationScope(*inst_lib3);
-
-  proto::collector::trace::v1::ExportTraceServiceRequest req;
-  std::vector<std::unique_ptr<sdk::trace::Recordable>> spans;
-  spans.push_back(std::move(rec1));
-  spans.push_back(std::move(rec2));
-  spans.push_back(std::move(rec3));
-  const nostd::span<std::unique_ptr<sdk::trace::Recordable>, 3> spans_span(spans.data(), 3);
-  OtlpRecordableUtils::PopulateRequest(spans_span, &req);
-
-  EXPECT_EQ(req.resource_spans().size(), 2);
-  for (const auto &resource_spans : req.resource_spans())
-  {
-    ASSERT_GT(resource_spans.resource().attributes_size(), 0);
-    const auto service_name     = resource_spans.resource().attributes(0).value().string_value();
-    const auto scope_spans_size = resource_spans.scope_spans().size();
-    if (service_name == "one")
-    {
-      ASSERT_GT(resource_spans.scope_spans_size(), 0);
-      const auto &scope_one = resource_spans.scope_spans(0).scope();
-
-      EXPECT_EQ(scope_spans_size, 1);
-      EXPECT_EQ(scope_one.name(), "one");
-      EXPECT_EQ(scope_one.version(), "1");
-
-      ASSERT_EQ(scope_one.attributes_size(), 1);
-      const auto &scope_attribute = scope_one.attributes(0);
-
-      EXPECT_EQ(scope_attribute.key(), "scope_key");
-      EXPECT_EQ(scope_attribute.value().string_value(), "scope_value");
-    }
-    if (service_name == "two")
-    {
-      EXPECT_EQ(scope_spans_size, 2);
-    }
-  }
-}
-
-// Test otlp resource populate request util with missing data
-TEST(OtlpRecordable, PopulateRequestMissing)
-{
-  // Missing scope
-  auto rec1      = std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-  auto resource1 = resource::Resource::Create({{"service.name", "one"}});
-  rec1->SetResource(resource1);
-
-  // Missing resource
-  auto rec2      = std::unique_ptr<sdk::trace::Recordable>(new OtlpRecordable);
-  auto inst_lib2 = trace_sdk::InstrumentationScope::Create("two", "2");
-  rec2->SetInstrumentationScope(*inst_lib2);
-
-  proto::collector::trace::v1::ExportTraceServiceRequest req;
-  std::vector<std::unique_ptr<sdk::trace::Recordable>> spans;
-  spans.push_back(std::move(rec1));
-  spans.push_back(std::move(rec2));
-  const nostd::span<std::unique_ptr<sdk::trace::Recordable>, 2> spans_span(spans.data(), 2);
-  OtlpRecordableUtils::PopulateRequest(spans_span, &req);
-
-  EXPECT_EQ(req.resource_spans().size(), 2);
-  for (const auto &resource_spans : req.resource_spans())
-  {
-    // Both should have scope spans
-    EXPECT_EQ(resource_spans.scope_spans().size(), 1);
-    auto scope = resource_spans.scope_spans(0).scope();
-    // Select the one with missing scope
-    if (scope.name() == "")
-    {
-      // Version is also empty
-      EXPECT_EQ(scope.version(), "");
-    }
-    else
-    {
-      // The other has a name and version
-      EXPECT_EQ(scope.name(), "two");
-      EXPECT_EQ(scope.version(), "2");
-    }
-  }
-}
-
-template <typename T>
-struct EmptyArrayAttributeTest : public testing::Test
-{
-  using ElementType = T;
-};
-
-using ArrayElementTypes =
-    testing::Types<bool, double, nostd::string_view, uint8_t, int, int64_t, unsigned int, uint64_t>;
-TYPED_TEST_SUITE(EmptyArrayAttributeTest, ArrayElementTypes);
-
-// Test empty arrays.
-TYPED_TEST(EmptyArrayAttributeTest, SetEmptyArrayAttribute)
-{
-  using ArrayElementType = typename TestFixture::ElementType;
-  OtlpRecordable rec;
-
-  nostd::span<const ArrayElementType> span = {};
-  rec.SetAttribute("empty_arr_attr", span);
-
-  EXPECT_TRUE(rec.span().attributes(0).value().has_array_value());
-  EXPECT_TRUE(rec.span().attributes(0).value().array_value().values().empty());
-}
-
-/**
- * AttributeValue can contain different int types, such as int, int64_t,
- * unsigned int, and uint64_t. To avoid writing test cases for each, we can
- * use a template approach to test all int types.
- */
-template <typename T>
-struct IntAttributeTest : public testing::Test
-{
-  using IntParamType = T;
-};
-
-using IntTypes = testing::Types<int, int64_t, unsigned int, uint64_t>;
-TYPED_TEST_SUITE(IntAttributeTest, IntTypes);
-
-TYPED_TEST(IntAttributeTest, SetIntSingleAttribute)
-{
-  using IntType = typename TestFixture::IntParamType;
-  IntType i     = 2;
-  common::AttributeValue int_val(i);
-
-  OtlpRecordable rec;
-  rec.SetAttribute("int_attr", int_val);
-  EXPECT_EQ(rec.span().attributes(0).value().int_value(), nostd::get<IntType>(int_val));
-}
-
-TYPED_TEST(IntAttributeTest, SetIntArrayAttribute)
-{
-  using IntType = typename TestFixture::IntParamType;
-
-  const int kArraySize        = 3;
-  IntType int_arr[kArraySize] = {4, 5, 6};
-  nostd::span<const IntType> int_span(int_arr);
-
-  OtlpRecordable rec;
-  rec.SetAttribute("int_arr_attr", int_span);
-
-  for (int i = 0; i < kArraySize; i++)
-  {
-    EXPECT_EQ(rec.span().attributes(0).value().array_value().values(i).int_value(), int_span[i]);
-  }
-}
-}  // namespace otlp
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/BUILD b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/BUILD
deleted file mode 100644
index fc981921d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/BUILD
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "prometheus_exporter",
-    srcs = [
-        "src/exporter.cc",
-        "src/exporter_factory.cc",
-        "src/exporter_options.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/prometheus/exporter.h",
-        "include/opentelemetry/exporters/prometheus/exporter_factory.h",
-        "include/opentelemetry/exporters/prometheus/exporter_options.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["prometheus"],
-    deps = [
-        ":prometheus_collector",
-        ":prometheus_exporter_utils",
-        "//api",
-        "//sdk:headers",
-        "@com_github_jupp0r_prometheus_cpp//core",
-        "@com_github_jupp0r_prometheus_cpp//pull",
-    ],
-)
-
-cc_library(
-    name = "prometheus_exporter_utils",
-    srcs = [
-        "src/exporter_utils.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/prometheus/exporter_utils.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["prometheus"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "@com_github_jupp0r_prometheus_cpp//core",
-        "@com_github_jupp0r_prometheus_cpp//pull",
-    ],
-)
-
-cc_library(
-    name = "prometheus_collector",
-    srcs = [
-        "src/collector.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/prometheus/collector.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["prometheus"],
-    deps = [
-        ":prometheus_exporter_utils",
-        "//api",
-        "//sdk:headers",
-        "@com_github_jupp0r_prometheus_cpp//core",
-        "@com_github_jupp0r_prometheus_cpp//pull",
-    ],
-)
-
-cc_library(
-    name = "prometheus_test_helper",
-    hdrs = [
-        "test/prometheus_test_helper.h",
-    ],
-    tags = ["prometheus"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/trace",
-    ],
-)
-
-cc_test(
-    name = "prometheus_exporter_test",
-    srcs = [
-        "test/exporter_test.cc",
-    ],
-    tags = [
-        "prometheus",
-        "test",
-    ],
-    deps = [
-        ":prometheus_exporter",
-        ":prometheus_test_helper",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "prometheus_collector_test",
-    srcs = [
-        "test/collector_test.cc",
-    ],
-    tags = [
-        "prometheus",
-        "test",
-    ],
-    deps = [
-        ":prometheus_collector",
-        ":prometheus_test_helper",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "prometheus_exporter_utils_test",
-    srcs = [
-        "test/exporter_utils_test.cc",
-    ],
-    tags = [
-        "prometheus",
-        "test",
-    ],
-    deps = [
-        ":prometheus_exporter_utils",
-        ":prometheus_test_helper",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/CMakeLists.txt
deleted file mode 100644
index 5dd75be48..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(NOT TARGET prometheus-cpp::core)
-  find_package(prometheus-cpp CONFIG REQUIRED)
-endif()
-
-add_library(
-  opentelemetry_exporter_prometheus
-  src/exporter.cc src/exporter_options.cc src/exporter_factory.cc
-  src/collector.cc src/exporter_utils.cc)
-
-set_target_properties(opentelemetry_exporter_prometheus
-                      PROPERTIES EXPORT_NAME prometheus_exporter)
-set_target_version(opentelemetry_exporter_prometheus)
-
-target_include_directories(
-  opentelemetry_exporter_prometheus
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-         "$<INSTALL_INTERFACE:include>")
-
-set(PROMETHEUS_EXPORTER_TARGETS opentelemetry_exporter_prometheus)
-if(TARGET pull)
-  list(APPEND PROMETHEUS_EXPORTER_TARGETS pull)
-endif()
-if(TARGET core)
-  list(APPEND PROMETHEUS_EXPORTER_TARGETS core)
-endif()
-if(TARGET util)
-  list(APPEND PROMETHEUS_EXPORTER_TARGETS util)
-endif()
-set(PROMETHEUS_CPP_TARGETS prometheus-cpp::pull prometheus-cpp::core)
-if(TARGET prometheus-cpp::util)
-  list(APPEND PROMETHEUS_CPP_TARGETS prometheus-cpp::util)
-endif()
-target_link_libraries(opentelemetry_exporter_prometheus
-                      PUBLIC opentelemetry_metrics ${PROMETHEUS_CPP_TARGETS})
-
-otel_add_component(
-  COMPONENT
-  exporters_prometheus
-  TARGETS
-  opentelemetry_exporter_prometheus
-  FILES_DIRECTORY
-  "include/opentelemetry/exporters/prometheus"
-  FILES_DESTINATION
-  "include/opentelemetry/exporters"
-  FILES_MATCHING
-  PATTERN
-  "*.h")
-
-if(BUILD_TESTING)
-  add_subdirectory(test)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/collector.h b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/collector.h
deleted file mode 100644
index 12cc26e6f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/collector.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <prometheus/collectable.h>
-#include <prometheus/metric_family.h>
-#include <mutex>
-#include <vector>
-
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/version.h"
-
-namespace prometheus_client = ::prometheus;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-/**
- * The Prometheus Collector maintains the intermediate collection in Prometheus Exporter
- */
-class PrometheusCollector : public prometheus_client::Collectable
-{
-public:
-  /**
-   * Default Constructor.
-   *
-   * This constructor initializes the collection for metrics to export
-   * in this class with default capacity
-   */
-  explicit PrometheusCollector(sdk::metrics::MetricReader *reader,
-                               bool populate_target_info,
-                               bool without_otel_scope);
-
-  /**
-   * Collects all metrics data from metricsToCollect collection.
-   *
-   * @return all metrics in the metricsToCollect snapshot
-   */
-  std::vector<prometheus_client::MetricFamily> Collect() const override;
-
-private:
-  sdk::metrics::MetricReader *reader_;
-  bool populate_target_info_;
-  bool without_otel_scope_;
-
-  /*
-   * Lock when operating the metricsToCollect collection
-   */
-  mutable std::mutex collection_lock_;
-};
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter.h
deleted file mode 100644
index 3cdca002f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <prometheus/exposer.h>
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/exporters/prometheus/collector.h"
-#include "opentelemetry/exporters/prometheus/exporter_options.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/version.h"
-
-/**
- * This class is an implementation of the MetricsExporter interface and
- * exports Prometheus metrics data. Functions in this class should be
- * called by the Controller in our data pipeline.
- */
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace exporter
-{
-namespace metrics
-{
-
-class PrometheusExporter : public sdk::metrics::MetricReader
-{
-public:
-  /**
-   * Constructor - binds an exposer and collector to the exporter
-   * @param options: options for an exposer that exposes
-   *  an HTTP endpoint for the exporter to connect to
-   */
-  PrometheusExporter(const PrometheusExporterOptions &options);
-
-  sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      sdk::metrics::InstrumentType instrument_type) const noexcept override;
-
-private:
-  // The configuration options associated with this exporter.
-  const PrometheusExporterOptions options_;
-
-  /**
-   * Pointer to a
-   * PrometheusCollector instance
-   */
-  std::shared_ptr<PrometheusCollector> collector_;
-
-  /**
-   * Pointer to an
-   * Exposer instance
-   */
-  std::unique_ptr<::prometheus::Exposer> exposer_;
-
-  bool OnForceFlush(std::chrono::microseconds timeout) noexcept override;
-
-  bool OnShutDown(std::chrono::microseconds timeout) noexcept override;
-
-  void OnInitialized() noexcept override;
-};
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_factory.h
deleted file mode 100644
index 67a30a5fe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_factory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-
-struct PrometheusExporterOptions;
-
-/**
- * Factory class for PrometheusExporter.
- */
-class PrometheusExporterFactory
-{
-public:
-  /**
-   * Create a PrometheusExporter using the given options.
-   */
-  static std::unique_ptr<sdk::metrics::MetricReader> Create(
-      const PrometheusExporterOptions &options);
-};
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_options.h
deleted file mode 100644
index da9d12402..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_options.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-
-/**
- * Struct to hold Prometheus exporter options.
- */
-struct PrometheusExporterOptions
-{
-  PrometheusExporterOptions();
-
-  // The endpoint the Prometheus backend can collect metrics from
-  std::string url;
-
-  // Populating target_info
-  bool populate_target_info = true;
-
-  // Populating otel_scope_name/otel_scope_labels attributes
-  bool without_otel_scope = false;
-
-  // Option to export metrics without the unit suffix
-  bool without_units = false;
-
-  // Option to export metrics without the type suffix
-  bool without_type_suffix = false;
-};
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_utils.h b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_utils.h
deleted file mode 100644
index 496ec9bd3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_utils.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <prometheus/metric_family.h>
-#include <string>
-#include <vector>
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-/**
- * The Prometheus Utils contains utility functions for Prometheus Exporter
- */
-class PrometheusExporterUtils
-{
-public:
-  /**
-   * Helper function to convert OpenTelemetry metrics data collection
-   * to Prometheus metrics data collection
-   *
-   * @param records a collection of metrics in OpenTelemetry
-   * @param populate_target_info whether to populate target_info
-   * @param without_otel_scope whether to populate otel_scope_name and otel_scope_version
-   * attributes
-   * @param without_units exporter configuration controlling whether to append unit suffix in
-   * the exported metrics.
-   * @param without_type_suffix exporter configuration controlling whether to append type suffix in
-   * the exported metrics.
-   * @return a collection of translated metrics that is acceptable by Prometheus
-   */
-  static std::vector<::prometheus::MetricFamily> TranslateToPrometheus(
-      const sdk::metrics::ResourceMetrics &data,
-      bool populate_target_info = true,
-      bool without_otel_scope   = false,
-      bool without_units        = false,
-      bool without_type_suffix  = false);
-
-private:
-  /**
-   * Sanitize the given metric name or label according to Prometheus rule.
-   *
-   * This function is needed because names in OpenTelemetry can contain
-   * alphanumeric characters, '_', '.', and '-', whereas in Prometheus the
-   * name should only contain alphanumeric characters and '_'.
-   * @param name name
-   */
-  static std::string SanitizeNames(std::string name);
-
-  /**
-   * Sanitize the given metric name or label according to Prometheus rule.
-   *
-   * @param name label name
-   * @param value label value
-   * @param labels target labels
-   */
-  static void AddPrometheusLabel(std::string name,
-                                 std::string value,
-                                 std::vector<::prometheus::ClientMetric::Label> *labels);
-
-  static std::string MapToPrometheusName(const std::string &name,
-                                         const std::string &unit,
-                                         ::prometheus::MetricType prometheus_type,
-                                         bool without_units,
-                                         bool without_type_suffix);
-
-  /**
-   * A utility function that returns the equivalent Prometheus name for the provided OTLP metric
-   * unit.
-   *
-   * @param raw_metric_unitName The raw metric unit for which Prometheus metric unit needs to be
-   *     computed.
-   * @return the computed Prometheus metric unit equivalent of the OTLP metric unit
-   */
-  static std::string GetEquivalentPrometheusUnit(const std::string &raw_metric_unitName);
-
-  /**
-   * This method retrieves the expanded Prometheus unit name for known abbreviations. OTLP metrics
-   * use the c/s notation as specified at <a href="https://ucum.org/ucum.html">UCUM</a>. The list of
-   * mappings is adopted from <a
-   * href="https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/9a9d4778bbbf242dba233db28e2fbcfda3416959/pkg/translator/prometheus/normalize_name.go#L30">OpenTelemetry
-   * Collector Contrib</a>.
-   *
-   * @param unit_abbreviation The unit that name that needs to be expanded/converted to Prometheus
-   *     units.
-   * @return The expanded/converted unit name if known, otherwise returns the input unit name as-is.
-   */
-  static std::string GetPrometheusUnit(const std::string &unit_abbreviation);
-
-  /**
-   * This method retrieves the expanded Prometheus unit name to be used with "per" units for known
-   * units. For example: s => per second (singular)
-   *
-   * @param per_unit_abbreviation The unit abbreviation used in a 'per' unit.
-   * @return The expanded unit equivalent to be used in 'per' unit if the input is a known unit,
-   *     otherwise returns the input as-is.
-   */
-  static std::string GetPrometheusPerUnit(const std::string &per_unit_abbreviation);
-
-  /**
-   * Replaces all characters that are not a letter or a digit with '_' to make the resulting string
-   * Prometheus compliant. This method also removes leading and trailing underscores - this is done
-   * to keep the resulting unit similar to what is produced from the collector's implementation.
-   *
-   * @param str The string input that needs to be made Prometheus compliant.
-   * @return the cleaned-up Prometheus compliant string.
-   */
-  static std::string CleanUpString(const std::string &str);
-
-  /**
-   * This method is used to convert the units expressed as a rate via '/' symbol in their name to
-   * their expanded text equivalent. For instance, km/h => km_per_hour. The method operates on the
-   * input by splitting it in 2 parts - before and after '/' symbol and will attempt to expand any
-   * known unit abbreviation in both parts. Unknown abbreviations & unsupported characters will
-   * remain unchanged in the final output of this function.
-   *
-   * @param rate_expressed_unit The rate unit input that needs to be converted to its text
-   * equivalent.
-   * @return The text equivalent of unit expressed as rate. If the input does not contain '/', the
-   *     function returns it as-is.
-   */
-  static std::string ConvertRateExpressedToPrometheusUnit(const std::string &rate_expressed_unit);
-
-  /**
-   * This method drops all characters enclosed within '{}' (including the curly braces) by replacing
-   * them with an empty string. Note that this method will not produce the intended effect if there
-   * are nested curly braces within the outer enclosure of '{}'.
-   *
-   * <p>For instance, {packet{s}s} => s}.
-   *
-   * @param unit The input unit from which text within curly braces needs to be removed.
-   * @return The resulting unit after removing the text within '{}'.
-   */
-  static std::string RemoveUnitPortionInBraces(const std::string &unit);
-
-  static opentelemetry::sdk::metrics::AggregationType getAggregationType(
-      const opentelemetry::sdk::metrics::PointType &point_type);
-
-  /**
-   * Translate the OTel metric type to Prometheus metric type
-   */
-  static ::prometheus::MetricType TranslateType(opentelemetry::sdk::metrics::AggregationType kind,
-                                                bool is_monotonic = true);
-
-  /**
-   * Add a target_info metric to collect resource attributes
-   */
-  static void SetTarget(const sdk::metrics::ResourceMetrics &data,
-                        std::chrono::nanoseconds time,
-                        const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
-                        std::vector<::prometheus::MetricFamily> *output);
-
-  /**
-   * Set metric data for:
-   * Counter => Prometheus Counter
-   */
-  template <typename T>
-  static void SetData(std::vector<T> values,
-                      const opentelemetry::sdk::metrics::PointAttributes &labels,
-                      const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
-                      ::prometheus::MetricType type,
-                      std::chrono::nanoseconds time,
-                      ::prometheus::MetricFamily *metric_family,
-                      const opentelemetry::sdk::resource::Resource *resource);
-
-  /**
-   * Set metric data for:
-   * Histogram => Prometheus Histogram
-   */
-  template <typename T>
-  static void SetData(std::vector<T> values,
-                      const std::vector<double> &boundaries,
-                      const std::vector<uint64_t> &counts,
-                      const opentelemetry::sdk::metrics::PointAttributes &labels,
-                      const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
-                      std::chrono::nanoseconds time,
-                      ::prometheus::MetricFamily *metric_family,
-                      const opentelemetry::sdk::resource::Resource *resource);
-
-  /**
-   * Set time and labels to metric data
-   */
-  static void SetMetricBasic(
-      ::prometheus::ClientMetric &metric,
-      const opentelemetry::sdk::metrics::PointAttributes &labels,
-      std::chrono::nanoseconds time,
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
-      const opentelemetry::sdk::resource::Resource *resource);
-
-  /**
-   * Convert attribute value to string
-   */
-  static std::string AttributeValueToString(
-      const opentelemetry::sdk::common::OwnedAttributeValue &value);
-
-  /**
-   * Handle Counter and Gauge.
-   */
-  template <typename T>
-  static void SetValue(const std::vector<T> &values,
-                       ::prometheus::MetricType type,
-                       ::prometheus::ClientMetric *metric);
-
-  /**
-   * Handle Gauge from MinMaxSumCount
-   */
-  static void SetValue(double value, ::prometheus::ClientMetric *metric);
-
-  /**
-   * Handle Histogram
-   */
-  template <typename T>
-  static void SetValue(const std::vector<T> &values,
-                       const std::vector<double> &boundaries,
-                       const std::vector<uint64_t> &counts,
-                       ::prometheus::ClientMetric *metric);
-
-  // For testing
-  friend class SanitizeNameTester;
-};
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/collector.cc b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/collector.cc
deleted file mode 100644
index 2387baf57..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/collector.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <prometheus/metric_family.h>
-#include <algorithm>
-#include <mutex>
-#include <vector>
-
-#include "opentelemetry/exporters/prometheus/collector.h"
-#include "opentelemetry/exporters/prometheus/exporter_utils.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/version.h"
-
-namespace metric_sdk = opentelemetry::sdk::metrics;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-/**
- * Default Constructor.
- *
- * This constructor initializes the collection for metrics to export
- * in this class with default capacity
- */
-PrometheusCollector::PrometheusCollector(sdk::metrics::MetricReader *reader,
-                                         bool populate_target_info,
-                                         bool without_otel_scope)
-    : reader_(reader),
-      populate_target_info_(populate_target_info),
-      without_otel_scope_(without_otel_scope)
-{}
-
-/**
- * Collects all metrics data from metricsToCollect collection.
- *
- * @return all metrics in the metricsToCollect snapshot
- */
-std::vector<prometheus_client::MetricFamily> PrometheusCollector::Collect() const
-{
-  if (reader_->IsShutdown())
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[Prometheus Exporter] Collect: "
-        "Exporter is shutdown, can not invoke collect operation.");
-    return {};
-  }
-  collection_lock_.lock();
-
-  std::vector<prometheus_client::MetricFamily> result;
-
-  reader_->Collect([&result, this](sdk::metrics::ResourceMetrics &metric_data) {
-    auto prometheus_metric_data = PrometheusExporterUtils::TranslateToPrometheus(
-        metric_data, this->populate_target_info_, this->without_otel_scope_);
-    for (auto &data : prometheus_metric_data)
-      result.emplace_back(data);
-    return true;
-  });
-  collection_lock_.unlock();
-  return result;
-}
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter.cc
deleted file mode 100644
index 12fef5acd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <prometheus/exposer.h>
-#include <chrono>
-#include <exception>
-#include <memory>
-#include <ostream>
-#include <string>
-
-#include "opentelemetry/exporters/prometheus/collector.h"
-#include "opentelemetry/exporters/prometheus/exporter.h"
-#include "opentelemetry/exporters/prometheus/exporter_options.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace exporter
-{
-namespace metrics
-{
-/**
- * Constructor - binds an exposer and collector to the exporter
- * @param address: an address for an exposer that exposes
- *  an HTTP endpoint for the exporter to connect to
- */
-PrometheusExporter::PrometheusExporter(const PrometheusExporterOptions &options) : options_(options)
-{
-  try
-  {
-    exposer_ = std::unique_ptr<::prometheus::Exposer>(new ::prometheus::Exposer{options_.url});
-  }
-  catch (const std::exception &ex)
-  {
-    exposer_.reset(nullptr);
-    OTEL_INTERNAL_LOG_ERROR("[Prometheus Exporter] "
-                            << "Can't initialize prometheus exposer with endpoint: " << options_.url
-                            << "\nError: " << ex.what());
-    Shutdown();  // set MetricReader in shutdown state.
-    return;
-  }
-  collector_ = std::shared_ptr<PrometheusCollector>(
-      new PrometheusCollector(this, options_.populate_target_info, options_.without_otel_scope));
-
-  exposer_->RegisterCollectable(collector_);
-}
-
-sdk::metrics::AggregationTemporality PrometheusExporter::GetAggregationTemporality(
-    sdk::metrics::InstrumentType /* instrument_type */) const noexcept
-{
-  // Prometheus exporter only support Cumulative
-  return sdk::metrics::AggregationTemporality::kCumulative;
-}
-
-bool PrometheusExporter::OnForceFlush(std::chrono::microseconds /* timeout */) noexcept
-{
-  return true;
-}
-
-bool PrometheusExporter::OnShutDown(std::chrono::microseconds /* timeout */) noexcept
-{
-  if (exposer_ != nullptr)
-    exposer_->RemoveCollectable(collector_);
-  return true;
-}
-
-void PrometheusExporter::OnInitialized() noexcept {}
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_factory.cc
deleted file mode 100644
index f736dc755..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_factory.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-
-#include "opentelemetry/exporters/prometheus/exporter.h"
-#include "opentelemetry/exporters/prometheus/exporter_factory.h"
-#include "opentelemetry/exporters/prometheus/exporter_options.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-
-std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> PrometheusExporterFactory::Create(
-    const PrometheusExporterOptions &options)
-{
-  std::unique_ptr<opentelemetry::sdk::metrics::MetricReader> exporter(
-      new PrometheusExporter(options));
-  return exporter;
-}
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_options.cc b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_options.cc
deleted file mode 100644
index 2ac24b635..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_options.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <string>
-
-#include "opentelemetry/exporters/prometheus/exporter_options.h"
-#include "opentelemetry/sdk/common/env_variables.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-
-inline const std::string GetPrometheusDefaultHttpEndpoint()
-{
-  constexpr char kPrometheusEndpointEnv[]     = "PROMETHEUS_EXPORTER_ENDPOINT";
-  constexpr char kPrometheusEndpointDefault[] = "localhost:9464";
-
-  std::string endpoint;
-
-  auto exists =
-      opentelemetry::sdk::common::GetStringEnvironmentVariable(kPrometheusEndpointEnv, endpoint);
-  return exists ? endpoint : kPrometheusEndpointDefault;
-}
-
-inline bool GetPrometheusWithoutOtelScope()
-{
-  constexpr char kPrometheusWithoutOtelScope[] = "OTEL_CPP_PROMETHEUS_EXPORTER_WITHOUT_OTEL_SCOPE";
-
-  bool setting;
-  auto exists =
-      opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutOtelScope, setting);
-
-  return exists ? setting : false;
-}
-
-inline bool GetPrometheusPopulateTargetInfo()
-{
-  constexpr char kPrometheusPopulateTargetInfo[] =
-      "OTEL_CPP_PROMETHEUS_EXPORTER_POPULATE_TARGET_INFO";
-
-  bool setting;
-  auto exists = opentelemetry::sdk::common::GetBoolEnvironmentVariable(
-      kPrometheusPopulateTargetInfo, setting);
-
-  return exists ? setting : true;
-}
-
-inline bool GetPrometheusWithoutUnits()
-{
-  constexpr char kPrometheusWithoutUnits[] = "OTEL_CPP_PROMETHEUS_EXPORTER_WITHOUT_UNITS";
-  bool setting;
-  const auto exists =
-      opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutUnits, setting);
-
-  return exists ? setting : false;
-}
-
-inline bool GetPrometheusWithoutTypeSuffix()
-{
-  constexpr char kPrometheusWithoutTypeSuffix[] =
-      "OTEL_CPP_PROMETHEUS_EXPORTER_WITHOUT_TYPE_SUFFIX";
-  bool setting;
-  const auto exists =
-      opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutTypeSuffix, setting);
-
-  return exists ? setting : false;
-}
-
-PrometheusExporterOptions::PrometheusExporterOptions()
-    : url(GetPrometheusDefaultHttpEndpoint()),
-      populate_target_info(GetPrometheusPopulateTargetInfo()),
-      without_otel_scope(GetPrometheusWithoutOtelScope()),
-      without_units(GetPrometheusWithoutUnits()),
-      without_type_suffix(GetPrometheusWithoutTypeSuffix())
-{}
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_utils.cc b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_utils.cc
deleted file mode 100644
index 7055e0d86..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/src/exporter_utils.cc
+++ /dev/null
@@ -1,855 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <prometheus/client_metric.h>
-#include <prometheus/metric_family.h>
-#include <prometheus/metric_type.h>
-#include <algorithm>
-#include <chrono>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <limits>
-#include <map>
-#include <regex>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/prometheus/exporter_utils.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-namespace prometheus_client = ::prometheus;
-namespace metric_sdk        = opentelemetry::sdk::metrics;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace metrics
-{
-namespace
-{
-
-static constexpr const char *kScopeNameKey    = "otel_scope_name";
-static constexpr const char *kScopeVersionKey = "otel_scope_version";
-
-/**
- * Sanitize the given metric name by replacing invalid characters with _,
- * ensuring that multiple consecutive _ characters are collapsed to a single _.
- *
- * @param valid a callable with the signature `(int pos, char ch) -> bool` that
- *        returns whether `ch` is valid at position `pos` in the string
- * @param name the string to sanitize
- */
-template <typename T>
-inline std::string Sanitize(std::string name, const T &valid)
-{
-  static_assert(std::is_convertible<T, std::function<bool(int, char)>>::value,
-                "valid should be a callable with the signature "
-                "(int, char) -> bool");
-
-  constexpr const auto replacement     = '_';
-  constexpr const auto replacement_dup = '=';
-
-  bool has_dup = false;
-  for (int i = 0; i < static_cast<int>(name.size()); ++i)
-  {
-    if (valid(i, name[i]) && name[i] != replacement)
-    {
-      continue;
-    }
-    if (i > 0 && (name[i - 1] == replacement || name[i - 1] == replacement_dup))
-    {
-      has_dup = true;
-      name[i] = replacement_dup;
-    }
-    else
-    {
-      name[i] = replacement;
-    }
-  }
-  if (has_dup)
-  {
-    auto end = std::remove(name.begin(), name.end(), replacement_dup);
-    return std::string{name.begin(), end};
-  }
-  return name;
-}
-
-/**
- * Sanitize the given metric label key according to Prometheus rule.
- * Prometheus metric label keys are required to match the following regex:
- *   [a-zA-Z_]([a-zA-Z0-9_])*
- * and multiple consecutive _ characters must be collapsed to a single _.
- */
-std::string SanitizeLabel(std::string label_key)
-{
-  return Sanitize(std::move(label_key), [](int i, char c) {
-    return (c >= 'a' && c <= 'z') ||  //
-           (c >= 'A' && c <= 'Z') ||  //
-           c == '_' ||                //
-           (c >= '0' && c <= '9' && i > 0);
-  });
-}
-
-}  // namespace
-
-/**
- * Helper function to convert OpenTelemetry metrics data collection
- * to Prometheus metrics data collection
- *
- * @param data a collection of metrics in OpenTelemetry
- * @return a collection of translated metrics that is acceptable by Prometheus
- */
-std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateToPrometheus(
-    const sdk::metrics::ResourceMetrics &data,
-    bool populate_target_info,
-    bool without_otel_scope,
-    bool without_units,
-    bool without_type_suffix)
-{
-
-  // initialize output vector
-  std::size_t reserve_size = 1;
-  for (const auto &instrumentation_info : data.scope_metric_data_)
-  {
-    reserve_size += instrumentation_info.metric_data_.size();
-  }
-
-  std::vector<prometheus_client::MetricFamily> output;
-  output.reserve(reserve_size);
-  if (data.scope_metric_data_.empty())
-  {
-    return output;
-  }
-  // Append target_info as the first metric
-  if (populate_target_info && !data.scope_metric_data_.empty())
-  {
-    SetTarget(data,
-              data.scope_metric_data_.begin()->metric_data_.begin()->end_ts.time_since_epoch(),
-              without_otel_scope ? nullptr : (*data.scope_metric_data_.begin()).scope_, &output);
-  }
-
-  for (const auto &instrumentation_info : data.scope_metric_data_)
-  {
-    for (const auto &metric_data : instrumentation_info.metric_data_)
-    {
-      auto origin_name = metric_data.instrument_descriptor.name_;
-      auto unit        = metric_data.instrument_descriptor.unit_;
-      prometheus_client::MetricFamily metric_family;
-      metric_family.help = metric_data.instrument_descriptor.description_;
-      auto time          = metric_data.end_ts.time_since_epoch();
-      auto front         = metric_data.point_data_attr_.front();
-      auto kind          = getAggregationType(front.point_data);
-      bool is_monotonic  = true;
-      if (kind == sdk::metrics::AggregationType::kSum)
-      {
-        is_monotonic = nostd::get<sdk::metrics::SumPointData>(front.point_data).is_monotonic_;
-      }
-      const prometheus_client::MetricType type = TranslateType(kind, is_monotonic);
-      metric_family.name = MapToPrometheusName(metric_data.instrument_descriptor.name_,
-                                               metric_data.instrument_descriptor.unit_, type,
-                                               without_units, without_type_suffix);
-      metric_family.type = type;
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope =
-          without_otel_scope ? nullptr : instrumentation_info.scope_;
-
-      for (const auto &point_data_attr : metric_data.point_data_attr_)
-      {
-        if (type == prometheus_client::MetricType::Histogram)  // Histogram
-        {
-          auto histogram_point_data =
-              nostd::get<sdk::metrics::HistogramPointData>(point_data_attr.point_data);
-          auto boundaries = histogram_point_data.boundaries_;
-          auto counts     = histogram_point_data.counts_;
-          double sum      = 0.0;
-          if (nostd::holds_alternative<double>(histogram_point_data.sum_))
-          {
-            sum = nostd::get<double>(histogram_point_data.sum_);
-          }
-          else
-          {
-            sum = static_cast<double>(nostd::get<int64_t>(histogram_point_data.sum_));
-          }
-          SetData(std::vector<double>{sum, static_cast<double>(histogram_point_data.count_)},
-                  boundaries, counts, point_data_attr.attributes, scope, time, &metric_family,
-                  data.resource_);
-        }
-        else if (type == prometheus_client::MetricType::Gauge)
-        {
-          if (nostd::holds_alternative<sdk::metrics::LastValuePointData>(
-                  point_data_attr.point_data))
-          {
-            auto last_value_point_data =
-                nostd::get<sdk::metrics::LastValuePointData>(point_data_attr.point_data);
-            std::vector<metric_sdk::ValueType> values{last_value_point_data.value_};
-            SetData(values, point_data_attr.attributes, scope, type, time, &metric_family,
-                    data.resource_);
-          }
-          else if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data_attr.point_data))
-          {
-            auto sum_point_data =
-                nostd::get<sdk::metrics::SumPointData>(point_data_attr.point_data);
-            std::vector<metric_sdk::ValueType> values{sum_point_data.value_};
-            SetData(values, point_data_attr.attributes, scope, type, time, &metric_family,
-                    data.resource_);
-          }
-          else
-          {
-            OTEL_INTERNAL_LOG_WARN(
-                "[Prometheus Exporter] TranslateToPrometheus - "
-                "invalid LastValuePointData type");
-          }
-        }
-        else  // Counter, Untyped
-        {
-          if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data_attr.point_data))
-          {
-            auto sum_point_data =
-                nostd::get<sdk::metrics::SumPointData>(point_data_attr.point_data);
-            std::vector<metric_sdk::ValueType> values{sum_point_data.value_};
-            SetData(values, point_data_attr.attributes, scope, type, time, &metric_family,
-                    data.resource_);
-          }
-          else
-          {
-            OTEL_INTERNAL_LOG_WARN(
-                "[Prometheus Exporter] TranslateToPrometheus - "
-                "invalid SumPointData type");
-          }
-        }
-      }
-      output.emplace_back(metric_family);
-    }
-  }
-  return output;
-}
-
-void PrometheusExporterUtils::AddPrometheusLabel(
-    std::string name,
-    std::string value,
-    std::vector<::prometheus::ClientMetric::Label> *labels)
-{
-  prometheus_client::ClientMetric::Label prometheus_label;
-  prometheus_label.name  = std::move(name);
-  prometheus_label.value = std::move(value);
-  labels->emplace_back(std::move(prometheus_label));
-}
-
-/**
- * Sanitize the given metric name or label according to Prometheus rule.
- *
- * This function is needed because names in OpenTelemetry can contain
- * alphanumeric characters, '_', '.', and '-', whereas in Prometheus the
- * name should only contain alphanumeric characters and '_'.
- */
-std::string PrometheusExporterUtils::SanitizeNames(std::string name)
-{
-  constexpr const auto replacement     = '_';
-  constexpr const auto replacement_dup = '=';
-
-  auto valid = [](int i, char c) {
-    if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == ':' ||
-        (c >= '0' && c <= '9' && i > 0))
-    {
-      return true;
-    }
-    return false;
-  };
-
-  bool has_dup = false;
-  for (int i = 0; i < static_cast<int>(name.size()); ++i)
-  {
-    if (valid(i, name[i]))
-    {
-      continue;
-    }
-    if (i > 0 && (name[i - 1] == replacement || name[i - 1] == replacement_dup))
-    {
-      has_dup = true;
-      name[i] = replacement_dup;
-    }
-    else
-    {
-      name[i] = replacement;
-    }
-  }
-  if (has_dup)
-  {
-    auto end = std::remove(name.begin(), name.end(), replacement_dup);
-    return std::string{name.begin(), end};
-  }
-  return name;
-}
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-const std::regex INVALID_CHARACTERS_PATTERN("[^a-zA-Z0-9]");
-const std::regex CHARACTERS_BETWEEN_BRACES_PATTERN("\\{(.*?)\\}");
-const std::regex SANITIZE_LEADING_UNDERSCORES("^_+");
-const std::regex SANITIZE_TRAILING_UNDERSCORES("_+$");
-const std::regex SANITIZE_CONSECUTIVE_UNDERSCORES("[_]{2,}");
-#endif
-
-std::string PrometheusExporterUtils::GetEquivalentPrometheusUnit(
-    const std::string &raw_metric_unit_name)
-{
-  if (raw_metric_unit_name.empty())
-  {
-    return raw_metric_unit_name;
-  }
-
-  std::string converted_metric_unit_name = RemoveUnitPortionInBraces(raw_metric_unit_name);
-  converted_metric_unit_name = ConvertRateExpressedToPrometheusUnit(converted_metric_unit_name);
-
-  return CleanUpString(GetPrometheusUnit(converted_metric_unit_name));
-}
-
-std::string PrometheusExporterUtils::GetPrometheusUnit(const std::string &unit_abbreviation)
-{
-  static std::unordered_map<std::string, std::string> units{// Time
-                                                            {"d", "days"},
-                                                            {"h", "hours"},
-                                                            {"min", "minutes"},
-                                                            {"s", "seconds"},
-                                                            {"ms", "milliseconds"},
-                                                            {"us", "microseconds"},
-                                                            {"ns", "nanoseconds"},
-                                                            // Bytes
-                                                            {"By", "bytes"},
-                                                            {"KiBy", "kibibytes"},
-                                                            {"MiBy", "mebibytes"},
-                                                            {"GiBy", "gibibytes"},
-                                                            {"TiBy", "tibibytes"},
-                                                            {"KBy", "kilobytes"},
-                                                            {"MBy", "megabytes"},
-                                                            {"GBy", "gigabytes"},
-                                                            {"TBy", "terabytes"},
-                                                            {"By", "bytes"},
-                                                            {"KBy", "kilobytes"},
-                                                            {"MBy", "megabytes"},
-                                                            {"GBy", "gigabytes"},
-                                                            {"TBy", "terabytes"},
-                                                            // SI
-                                                            {"m", "meters"},
-                                                            {"V", "volts"},
-                                                            {"A", "amperes"},
-                                                            {"J", "joules"},
-                                                            {"W", "watts"},
-                                                            {"g", "grams"},
-                                                            // Misc
-                                                            {"Cel", "celsius"},
-                                                            {"Hz", "hertz"},
-                                                            {"1", ""},
-                                                            {"%", "percent"}};
-  auto res_it = units.find(unit_abbreviation);
-  if (res_it == units.end())
-  {
-    return unit_abbreviation;
-  }
-  return res_it->second;
-}
-
-std::string PrometheusExporterUtils::GetPrometheusPerUnit(const std::string &per_unit_abbreviation)
-{
-  static std::unordered_map<std::string, std::string> per_units{
-      {"s", "second"}, {"m", "minute"}, {"h", "hour"}, {"d", "day"},
-      {"w", "week"},   {"mo", "month"}, {"y", "year"}};
-  auto res_it = per_units.find(per_unit_abbreviation);
-  if (res_it == per_units.end())
-  {
-    return per_unit_abbreviation;
-  }
-  return res_it->second;
-}
-
-std::string PrometheusExporterUtils::RemoveUnitPortionInBraces(const std::string &unit)
-{
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  return std::regex_replace(unit, CHARACTERS_BETWEEN_BRACES_PATTERN, "");
-#else
-  bool in_braces = false;
-  std::string cleaned_unit;
-  cleaned_unit.reserve(unit.size());
-  for (auto c : unit)
-  {
-    if (in_braces)
-    {
-      if (c == '}')
-      {
-        in_braces = false;
-      }
-    }
-    else if (c == '{')
-    {
-      in_braces = true;
-    }
-    else
-    {
-      cleaned_unit += c;
-    }
-  }
-  return cleaned_unit;
-#endif
-}
-
-std::string PrometheusExporterUtils::ConvertRateExpressedToPrometheusUnit(
-    const std::string &rate_expressed_unit)
-{
-  size_t pos = rate_expressed_unit.find('/');
-  if (pos == std::string::npos)
-  {
-    return rate_expressed_unit;
-  }
-
-  std::vector<std::string> rate_entities;
-  rate_entities.push_back(rate_expressed_unit.substr(0, pos));
-  rate_entities.push_back(rate_expressed_unit.substr(pos + 1));
-
-  if (rate_entities[1].empty())
-  {
-    return rate_expressed_unit;
-  }
-
-  std::string prometheus_unit     = GetPrometheusUnit(rate_entities[0]);
-  std::string prometheus_per_unit = GetPrometheusPerUnit(rate_entities[1]);
-
-  return prometheus_unit + "_per_" + prometheus_per_unit;
-}
-
-std::string PrometheusExporterUtils::CleanUpString(const std::string &str)
-{
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  std::string cleaned_string = std::regex_replace(str, INVALID_CHARACTERS_PATTERN, "_");
-  cleaned_string = std::regex_replace(cleaned_string, SANITIZE_CONSECUTIVE_UNDERSCORES, "_");
-  cleaned_string = std::regex_replace(cleaned_string, SANITIZE_TRAILING_UNDERSCORES, "");
-  cleaned_string = std::regex_replace(cleaned_string, SANITIZE_LEADING_UNDERSCORES, "");
-  return cleaned_string;
-#else
-  std::string cleaned_string = str;
-  if (cleaned_string.empty())
-  {
-    return cleaned_string;
-  }
-  std::transform(cleaned_string.begin(), cleaned_string.end(), cleaned_string.begin(),
-                 [](const char c) {
-                   if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
-                   {
-                     return c;
-                   }
-                   return '_';
-                 });
-
-  std::string::size_type trim_start = 0;
-  std::string::size_type trim_end   = 0;
-  bool previous_underscore          = false;
-  for (std::string::size_type i = 0; i < cleaned_string.size(); ++i)
-  {
-    if (cleaned_string[i] == '_')
-    {
-      if (previous_underscore)
-      {
-        continue;
-      }
-
-      previous_underscore = true;
-    }
-    else
-    {
-      previous_underscore = false;
-    }
-
-    if (trim_end != i)
-    {
-      cleaned_string[trim_end] = cleaned_string[i];
-    }
-    ++trim_end;
-  }
-
-  while (trim_end > 0 && cleaned_string[trim_end - 1] == '_')
-  {
-    --trim_end;
-  }
-  while (trim_start < trim_end && cleaned_string[trim_start] == '_')
-  {
-    ++trim_start;
-  }
-
-  // All characters are underscore
-  if (trim_start >= trim_end)
-  {
-    return "_";
-  }
-  if (0 != trim_start || cleaned_string.size() != trim_end)
-  {
-    return cleaned_string.substr(trim_start, trim_end - trim_start);
-  }
-
-  return cleaned_string;
-#endif
-}
-
-std::string PrometheusExporterUtils::MapToPrometheusName(
-    const std::string &name,
-    const std::string &unit,
-    prometheus_client::MetricType prometheus_type,
-    bool without_units,
-    bool without_type_suffix)
-{
-  auto sanitized_name = SanitizeNames(name);
-  // append unit suffixes
-  if (!without_units)
-  {
-    std::string prometheus_equivalent_unit = GetEquivalentPrometheusUnit(unit);
-    // Append prometheus unit if not null or empty.
-    if (!prometheus_equivalent_unit.empty() &&
-        sanitized_name.find(prometheus_equivalent_unit) == std::string::npos)
-    {
-      sanitized_name += "_" + prometheus_equivalent_unit;
-    }
-    // Special case - gauge
-    if (unit == "1" && prometheus_type == prometheus_client::MetricType::Gauge &&
-        sanitized_name.find("ratio") == std::string::npos)
-    {
-      // this is replacing the unit name
-      sanitized_name += "_ratio";
-    }
-  }
-
-  // append type suffixes
-  if (!without_type_suffix)
-  {
-    // Special case - counter
-    if (prometheus_type == prometheus_client::MetricType::Counter)
-    {
-      auto t_pos           = sanitized_name.rfind("_total");
-      bool ends_with_total = t_pos == sanitized_name.size() - 6;
-      if (!ends_with_total)
-      {
-        sanitized_name += "_total";
-      }
-    }
-  }
-
-  return CleanUpString(SanitizeNames(sanitized_name));
-}
-
-metric_sdk::AggregationType PrometheusExporterUtils::getAggregationType(
-    const metric_sdk::PointType &point_type)
-{
-
-  if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_type))
-  {
-    return metric_sdk::AggregationType::kSum;
-  }
-  else if (nostd::holds_alternative<sdk::metrics::DropPointData>(point_type))
-  {
-    return metric_sdk::AggregationType::kDrop;
-  }
-  else if (nostd::holds_alternative<sdk::metrics::HistogramPointData>(point_type))
-  {
-    return metric_sdk::AggregationType::kHistogram;
-  }
-  else if (nostd::holds_alternative<sdk::metrics::Base2ExponentialHistogramPointData>(point_type))
-  {
-    return metric_sdk::AggregationType::kBase2ExponentialHistogram;
-  }
-  else if (nostd::holds_alternative<sdk::metrics::LastValuePointData>(point_type))
-  {
-    return metric_sdk::AggregationType::kLastValue;
-  }
-  return metric_sdk::AggregationType::kDefault;
-}
-
-/**
- * Translate the OTel metric type to Prometheus metric type
- */
-prometheus_client::MetricType PrometheusExporterUtils::TranslateType(
-    metric_sdk::AggregationType kind,
-    bool is_monotonic)
-{
-  switch (kind)
-  {
-    case metric_sdk::AggregationType::kSum:
-      if (!is_monotonic)
-      {
-        return prometheus_client::MetricType::Gauge;
-      }
-      else
-      {
-        return prometheus_client::MetricType::Counter;
-      }
-      break;
-    case metric_sdk::AggregationType::kHistogram:
-      return prometheus_client::MetricType::Histogram;
-      break;
-    case metric_sdk::AggregationType::kLastValue:
-      return prometheus_client::MetricType::Gauge;
-      break;
-    default:
-      return prometheus_client::MetricType::Untyped;
-  }
-}
-
-void PrometheusExporterUtils::SetTarget(
-    const sdk::metrics::ResourceMetrics &data,
-    std::chrono::nanoseconds time,
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
-    std::vector<::prometheus::MetricFamily> *output)
-{
-  if (output == nullptr || data.resource_ == nullptr)
-  {
-    return;
-  }
-
-  prometheus_client::MetricFamily metric_family;
-  metric_family.name = "target";
-  metric_family.help = "Target metadata";
-  metric_family.type = prometheus_client::MetricType::Info;
-  metric_family.metric.emplace_back();
-
-  prometheus_client::ClientMetric &metric = metric_family.metric.back();
-  metric.info.value                       = 1.0;
-
-  metric_sdk::PointAttributes empty_attributes;
-  SetMetricBasic(metric, empty_attributes, time, scope, data.resource_);
-
-  for (auto &label : data.resource_->GetAttributes())
-  {
-    AddPrometheusLabel(SanitizeNames(label.first), AttributeValueToString(label.second),
-                       &metric.label);
-  }
-
-  output->emplace_back(std::move(metric_family));
-}
-
-/**
- * Set metric data for:
- * sum => Prometheus Counter
- */
-template <typename T>
-void PrometheusExporterUtils::SetData(
-    std::vector<T> values,
-    const metric_sdk::PointAttributes &labels,
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
-    prometheus_client::MetricType type,
-    std::chrono::nanoseconds time,
-    prometheus_client::MetricFamily *metric_family,
-    const opentelemetry::sdk::resource::Resource *resource)
-{
-  metric_family->metric.emplace_back();
-  prometheus_client::ClientMetric &metric = metric_family->metric.back();
-  SetMetricBasic(metric, labels, time, scope, resource);
-  SetValue(values, type, &metric);
-}
-
-/**
- * Set metric data for:
- * Histogram => Prometheus Histogram
- */
-template <typename T>
-void PrometheusExporterUtils::SetData(
-    std::vector<T> values,
-    const std::vector<double> &boundaries,
-    const std::vector<uint64_t> &counts,
-    const metric_sdk::PointAttributes &labels,
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
-    std::chrono::nanoseconds time,
-    prometheus_client::MetricFamily *metric_family,
-    const opentelemetry::sdk::resource::Resource *resource)
-{
-  metric_family->metric.emplace_back();
-  prometheus_client::ClientMetric &metric = metric_family->metric.back();
-  SetMetricBasic(metric, labels, time, scope, resource);
-  SetValue(values, boundaries, counts, &metric);
-}
-
-/**
- * Set labels to metric data
- */
-void PrometheusExporterUtils::SetMetricBasic(
-    prometheus_client::ClientMetric &metric,
-    const metric_sdk::PointAttributes &labels,
-    std::chrono::nanoseconds time,
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
-    const opentelemetry::sdk::resource::Resource *resource)
-{
-  metric.timestamp_ms = time.count() / 1000000;
-  if (labels.empty() && nullptr == resource)
-  {
-    return;
-  }
-
-  // Concatenate values for keys that collide after sanitation.
-  // Note that attribute keys are sorted, but sanitized keys can be out-of-order.
-  // We could sort the sanitized keys again, but this seems too expensive to do
-  // in this hot code path. Instead, we ignore out-of-order keys and emit a warning.
-  metric.label.reserve(labels.size() + 2);
-  std::string previous_key;
-  for (auto const &label : labels)
-  {
-    auto sanitized = SanitizeLabel(label.first);
-    int comparison = previous_key.compare(sanitized);
-    if (metric.label.empty() || comparison < 0)  // new key
-    {
-      previous_key = sanitized;
-      metric.label.push_back({sanitized, AttributeValueToString(label.second)});
-    }
-    else if (comparison == 0)  // key collision after sanitation
-    {
-      metric.label.back().value += ";" + AttributeValueToString(label.second);
-    }
-    else  // order inversion introduced by sanitation
-    {
-      OTEL_INTERNAL_LOG_WARN(
-          "[Prometheus Exporter] SetMetricBase - "
-          "the sort order of labels has changed because of sanitization: '"
-          << label.first << "' became '" << sanitized << "' which is less than '" << previous_key
-          << "'. Ignoring this label.");
-    }
-  }
-  if (!scope)
-  {
-    return;
-  }
-  auto scope_name = scope->GetName();
-  if (!scope_name.empty())
-  {
-    metric.label.emplace_back();
-    metric.label.back().name  = kScopeNameKey;
-    metric.label.back().value = std::move(scope_name);
-  }
-  auto scope_version = scope->GetVersion();
-  if (!scope_version.empty())
-  {
-    metric.label.emplace_back();
-    metric.label.back().name  = kScopeVersionKey;
-    metric.label.back().value = std::move(scope_version);
-  }
-}
-
-std::string PrometheusExporterUtils::AttributeValueToString(
-    const opentelemetry::sdk::common::OwnedAttributeValue &value)
-{
-  std::string result;
-  if (nostd::holds_alternative<bool>(value))
-  {
-    result = nostd::get<bool>(value) ? "true" : "false";
-  }
-  else if (nostd::holds_alternative<int>(value))
-  {
-    result = std::to_string(nostd::get<int>(value));
-  }
-  else if (nostd::holds_alternative<int64_t>(value))
-  {
-    result = std::to_string(nostd::get<int64_t>(value));
-  }
-  else if (nostd::holds_alternative<unsigned int>(value))
-  {
-    result = std::to_string(nostd::get<unsigned int>(value));
-  }
-  else if (nostd::holds_alternative<uint64_t>(value))
-  {
-    result = std::to_string(nostd::get<uint64_t>(value));
-  }
-  else if (nostd::holds_alternative<double>(value))
-  {
-    result = std::to_string(nostd::get<double>(value));
-  }
-  else if (nostd::holds_alternative<std::string>(value))
-  {
-    result = nostd::get<std::string>(value);
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[Prometheus Exporter] AttributeValueToString - "
-        " Nested attributes not supported - ignored");
-  }
-  return result;
-}
-
-/**
- * Handle Counter.
- */
-template <typename T>
-void PrometheusExporterUtils::SetValue(const std::vector<T> &values,
-                                       prometheus_client::MetricType type,
-                                       prometheus_client::ClientMetric *metric)
-{
-  double value          = 0.0;
-  const auto &value_var = values[0];
-  if (nostd::holds_alternative<int64_t>(value_var))
-  {
-    value = static_cast<double>(nostd::get<int64_t>(value_var));
-  }
-  else
-  {
-    value = nostd::get<double>(value_var);
-  }
-
-  switch (type)
-  {
-    case prometheus_client::MetricType::Counter: {
-      metric->counter.value = value;
-      break;
-    }
-    case prometheus_client::MetricType::Gauge: {
-      metric->gauge.value = value;
-      break;
-    }
-    case prometheus_client::MetricType::Untyped: {
-      metric->untyped.value = value;
-      break;
-    }
-    default:
-      return;
-  }
-}
-
-/**
- * Handle Histogram
- */
-template <typename T>
-void PrometheusExporterUtils::SetValue(const std::vector<T> &values,
-                                       const std::vector<double> &boundaries,
-                                       const std::vector<uint64_t> &counts,
-                                       prometheus_client::ClientMetric *metric)
-{
-  metric->histogram.sample_sum   = static_cast<double>(values[0]);
-  metric->histogram.sample_count = static_cast<std::uint64_t>(values[1]);
-  std::uint64_t cumulative       = 0;
-  std::vector<prometheus_client::ClientMetric::Bucket> buckets;
-  uint32_t idx = 0;
-  for (const auto &boundary : boundaries)
-  {
-    prometheus_client::ClientMetric::Bucket bucket;
-    cumulative += counts[idx];
-    bucket.cumulative_count = cumulative;
-    bucket.upper_bound      = boundary;
-    buckets.emplace_back(bucket);
-    ++idx;
-  }
-  prometheus_client::ClientMetric::Bucket bucket;
-  cumulative += counts[idx];
-  bucket.cumulative_count = cumulative;
-  bucket.upper_bound      = std::numeric_limits<double>::infinity();
-  buckets.emplace_back(bucket);
-  metric->histogram.bucket = buckets;
-}
-
-}  // namespace metrics
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/CMakeLists.txt
deleted file mode 100644
index 1ef890b27..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(testname exporter_test collector_test exporter_utils_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(
-    ${testname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_exporter_prometheus prometheus-cpp::pull
-    opentelemetry_resources)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX exporter.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/collector_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/collector_test.cc
deleted file mode 100644
index f0626c8a0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/collector_test.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <prometheus/metric_family.h>
-#include <stddef.h>
-#include <chrono>
-#include <thread>
-#include <vector>
-
-#include "opentelemetry/exporters/prometheus/collector.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "prometheus_test_helper.h"
-
-using opentelemetry::exporter::metrics::PrometheusCollector;
-using opentelemetry::sdk::metrics::MetricProducer;
-using opentelemetry::sdk::metrics::ResourceMetrics;
-namespace metric_api      = opentelemetry::metrics;
-namespace metric_sdk      = opentelemetry::sdk::metrics;
-namespace metric_exporter = opentelemetry::exporter::metrics;
-
-class MockMetricProducer : public MetricProducer
-{
-  TestDataPoints test_data_points_;
-
-public:
-  MockMetricProducer(std::chrono::microseconds sleep_ms = std::chrono::microseconds::zero())
-      : sleep_ms_{sleep_ms}
-  {}
-
-  MetricProducer::Result Produce() noexcept override
-  {
-    std::this_thread::sleep_for(sleep_ms_);
-    data_sent_size_++;
-    ResourceMetrics data = test_data_points_.CreateSumPointData();
-    return {data, MetricProducer::Status::kSuccess};
-  }
-
-  size_t GetDataCount() { return data_sent_size_; }
-
-private:
-  std::chrono::microseconds sleep_ms_;
-  size_t data_sent_size_{0};
-};
-
-class MockMetricReader : public opentelemetry::sdk::metrics::MetricReader
-{
-public:
-  opentelemetry::sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      opentelemetry::sdk::metrics::InstrumentType /* instrument_type */) const noexcept override
-  {
-    // Prometheus exporter only support Cumulative
-    return opentelemetry::sdk::metrics::AggregationTemporality::kCumulative;
-  }
-
-private:
-  bool OnForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return true; }
-
-  bool OnShutDown(std::chrono::microseconds /* timeout */) noexcept override { return true; }
-
-  void OnInitialized() noexcept override {}
-};
-
-// ==================== Test for addMetricsData() function ======================
-
-/**
- * AddMetricData() should be able to successfully add a collection
- * of SumPointData. It checks that the cumulative
- * sum of updates to the aggregator of a record before and after AddMetricData()
- * is called are equal.
- */
-TEST(PrometheusCollector, BasicTests)
-{
-  MockMetricReader reader;
-  MockMetricProducer producer;
-  reader.SetMetricProducer(&producer);
-  PrometheusCollector collector(&reader, true, false);
-  auto data = collector.Collect();
-
-  // Collection size should be the same as the size
-  // of the records collection produced by MetricProducer.
-  ASSERT_EQ(data.size(), 2);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/exporter_test.cc
deleted file mode 100644
index aa2e0de4b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/exporter_test.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-
-#include "opentelemetry/exporters/prometheus/exporter.h"
-#include "opentelemetry/exporters/prometheus/exporter_options.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-
-/**
- * PrometheusExporterTest is a friend class of PrometheusExporter.
- * It has access to a private constructor that does not take in
- * an exposer as an argument, and instead takes no arguments; this
- * private constructor is only to be used here for testing
- */
-
-using opentelemetry::exporter::metrics::PrometheusExporter;
-using opentelemetry::exporter::metrics::PrometheusExporterOptions;
-using opentelemetry::sdk::metrics::AggregationTemporality;
-using opentelemetry::sdk::metrics::InstrumentType;
-/**
- * When a PrometheusExporter is initialized,
- * isShutdown should be false.
- */
-TEST(PrometheusExporter, InitializeConstructorIsNotShutdown)
-{
-  PrometheusExporterOptions options;
-  options.url = "localhost:8081";
-  PrometheusExporter exporter(options);
-  // // Asserts that the exporter is not shutdown.
-  // ASSERT_TRUE(!exporter.IsShutdown());
-  exporter.Shutdown();
-}
-
-/**
- * The shutdown() function should set the isShutdown field to true.
- */
-TEST(PrometheusExporter, ShutdownSetsIsShutdownToTrue)
-{
-  PrometheusExporterOptions options;
-  PrometheusExporter exporter(options);
-
-  // exporter shuold not be shutdown by default
-  ASSERT_TRUE(!exporter.IsShutdown());
-
-  exporter.Shutdown();
-
-  // the exporter shuold be shutdown
-  ASSERT_TRUE(exporter.IsShutdown());
-
-  // shutdown function should be idempotent
-  exporter.Shutdown();
-  ASSERT_TRUE(exporter.IsShutdown());
-}
-
-/**
- * The Aggregation temporality should be correctly set
- */
-TEST(PrometheusExporter, CheckAggregationTemporality)
-{
-  PrometheusExporterOptions options;
-  PrometheusExporter exporter(options);
-
-  ASSERT_EQ(exporter.GetAggregationTemporality(InstrumentType::kCounter),
-            AggregationTemporality::kCumulative);
-  ASSERT_EQ(exporter.GetAggregationTemporality(InstrumentType::kHistogram),
-            AggregationTemporality::kCumulative);
-  ASSERT_EQ(exporter.GetAggregationTemporality(InstrumentType::kObservableCounter),
-            AggregationTemporality::kCumulative);
-  ASSERT_EQ(exporter.GetAggregationTemporality(InstrumentType::kObservableGauge),
-            AggregationTemporality::kCumulative);
-  ASSERT_EQ(exporter.GetAggregationTemporality(InstrumentType::kObservableUpDownCounter),
-            AggregationTemporality::kCumulative);
-  ASSERT_EQ(exporter.GetAggregationTemporality(InstrumentType::kUpDownCounter),
-            AggregationTemporality::kCumulative);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/exporter_utils_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/exporter_utils_test.cc
deleted file mode 100644
index 5a597f2b2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/exporter_utils_test.cc
+++ /dev/null
@@ -1,540 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <prometheus/client_metric.h>
-#include <prometheus/metric_family.h>
-#include <prometheus/metric_type.h>
-#include <stddef.h>
-#include <limits>
-#include <list>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/prometheus/exporter_utils.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-#include "prometheus_test_helper.h"
-
-using opentelemetry::exporter::metrics::PrometheusExporterUtils;
-namespace metric_sdk        = opentelemetry::sdk::metrics;
-namespace prometheus_client = ::prometheus;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace exporter
-{
-namespace metrics
-{
-class SanitizeNameTester
-{
-public:
-  static std::string sanitize(std::string name)
-  {
-    return PrometheusExporterUtils::SanitizeNames(std::move(name));
-  }
-  static std::string getPrometheusUnit(const std::string &unit_abbreviation)
-  {
-    return PrometheusExporterUtils::GetPrometheusUnit(unit_abbreviation);
-  }
-  static std::string getPrometheusPerUnit(const std::string &per_unit_abbreviation)
-  {
-    return PrometheusExporterUtils::GetPrometheusPerUnit(per_unit_abbreviation);
-  }
-  static std::string removeUnitPortionInBraces(const std::string &unit)
-  {
-    return PrometheusExporterUtils::RemoveUnitPortionInBraces(unit);
-  }
-  static std::string convertRateExpressedToPrometheusUnit(const std::string &rate_expressed_unit)
-  {
-    return PrometheusExporterUtils::ConvertRateExpressedToPrometheusUnit(rate_expressed_unit);
-  }
-  static std::string cleanUpString(const std::string &str)
-  {
-    return PrometheusExporterUtils::CleanUpString(str);
-  }
-  static std::string getEquivalentPrometheusUnit(const std::string &raw_metric_unit_name)
-  {
-    return PrometheusExporterUtils::GetEquivalentPrometheusUnit(raw_metric_unit_name);
-  }
-  static std::string mapToPrometheusName(const std::string &name,
-                                         const std::string &unit,
-                                         prometheus_client::MetricType prometheus_type,
-                                         bool without_units       = false,
-                                         bool without_type_suffix = false)
-  {
-    return PrometheusExporterUtils::MapToPrometheusName(name, unit, prometheus_type, without_units,
-                                                        without_type_suffix);
-  }
-};
-}  // namespace metrics
-}  // namespace exporter
-
-template <typename T>
-void assert_basic(prometheus_client::MetricFamily &metric,
-                  const std::string &expected_name,
-                  const std::string &description,
-                  prometheus_client::MetricType type,
-                  size_t label_num,
-                  std::vector<T> vals)
-{
-  ASSERT_EQ(metric.name, expected_name);  // name sanitized
-  ASSERT_EQ(metric.help, description);    // description not changed
-  ASSERT_EQ(metric.type, type);           // type translated
-
-  // Prometheus metric data points should not have explicit timestamps
-  for (const prometheus::ClientMetric &cm : metric.metric)
-  {
-    ASSERT_EQ(cm.timestamp_ms, 0);
-  }
-
-  auto metric_data = metric.metric[0];
-  ASSERT_EQ(metric_data.label.size(), label_num);
-
-  switch (type)
-  {
-    case prometheus_client::MetricType::Counter: {
-      ASSERT_DOUBLE_EQ(metric_data.counter.value, vals[0]);
-      break;
-    }
-    case prometheus_client::MetricType::Histogram: {
-      ASSERT_DOUBLE_EQ(metric_data.histogram.sample_count, vals[0]);
-      ASSERT_DOUBLE_EQ(metric_data.histogram.sample_sum, vals[1]);
-      auto buckets = metric_data.histogram.bucket;
-      ASSERT_EQ(buckets.size(), vals[2]);
-      break;
-    }
-    case prometheus_client::MetricType::Gauge: {
-      ASSERT_DOUBLE_EQ(metric_data.gauge.value, vals[0]);
-      break;
-    }
-    break;
-    case prometheus_client::MetricType::Summary:
-      // Summary and Info type not supported
-      ASSERT_TRUE(false);
-      break;
-    case prometheus::MetricType::Untyped:
-    default:
-      break;
-  }
-}
-
-void assert_histogram(prometheus_client::MetricFamily &metric,
-                      const std::list<double> &boundaries,
-                      std::vector<int> correct)
-{
-  int cumulative_count = 0;
-  auto buckets         = metric.metric[0].histogram.bucket;
-  auto boundary_it     = boundaries.cbegin();
-  for (size_t i = 0; i < buckets.size(); i++)
-  {
-    auto bucket = buckets[i];
-    if (i != buckets.size() - 1)
-    {
-      ASSERT_DOUBLE_EQ(*boundary_it++, bucket.upper_bound);
-    }
-    else
-    {
-      ASSERT_DOUBLE_EQ(std::numeric_limits<double>::infinity(), bucket.upper_bound);
-    }
-    cumulative_count += correct[i];
-    ASSERT_EQ(cumulative_count, bucket.cumulative_count);
-  }
-}
-
-TEST(PrometheusExporterUtils, TranslateToPrometheusEmptyInputReturnsEmptyCollection)
-{
-  metric_sdk::ResourceMetrics metrics_data = {};
-  auto translated = PrometheusExporterUtils::TranslateToPrometheus(metrics_data);
-  ASSERT_EQ(translated.size(), 0);
-}
-
-TEST(PrometheusExporterUtils, TranslateToPrometheusIntegerCounter)
-{
-
-  opentelemetry::sdk::resource::Resource resource = opentelemetry::sdk::resource::Resource::Create(
-      {{"service.name", "test_service"},
-       {"service.namespace", "test_namespace"},
-       {"service.instance.id", "localhost:8000"},
-       {"custom_resource_attr", "custom_resource_value"}});
-  TestDataPoints dp;
-  metric_sdk::ResourceMetrics metrics_data = dp.CreateSumPointData();
-  metrics_data.resource_                   = &resource;
-
-  auto translated = PrometheusExporterUtils::TranslateToPrometheus(metrics_data);
-  ASSERT_EQ(translated.size(), 2);
-  auto metric1          = translated[1];
-  std::vector<int> vals = {10};
-  assert_basic(metric1, "library_name_unit_total", "description",
-               prometheus_client::MetricType::Counter, 3, vals);
-  int checked_label_num = 0;
-  for (auto &label : translated[0].metric[0].label)
-  {
-    if (label.name == "service_namespace")
-    {
-      ASSERT_EQ(label.value, "test_namespace");
-      checked_label_num++;
-    }
-    else if (label.name == "service_name")
-    {
-      ASSERT_EQ(label.value, "test_service");
-      checked_label_num++;
-    }
-    else if (label.name == "service_instance_id")
-    {
-      ASSERT_EQ(label.value, "localhost:8000");
-      checked_label_num++;
-    }
-    else if (label.name == "custom_resource_attr")
-    {
-      ASSERT_EQ(label.value, "custom_resource_value");
-      checked_label_num++;
-    }
-  }
-  ASSERT_EQ(checked_label_num, 4);
-}
-
-TEST(PrometheusExporterUtils, TranslateToPrometheusIntegerLastValue)
-{
-  opentelemetry::sdk::resource::Resource resource = opentelemetry::sdk::resource::Resource::Create(
-      {{"service.name", "test_service"},
-       {"service.instance.id", "localhost:8000"},
-       {"custom_resource_attr", "custom_resource_value"}});
-  TestDataPoints dp;
-  metric_sdk::ResourceMetrics metrics_data = dp.CreateLastValuePointData();
-  metrics_data.resource_                   = &resource;
-
-  auto translated = PrometheusExporterUtils::TranslateToPrometheus(metrics_data);
-  ASSERT_EQ(translated.size(), 2);
-
-  auto metric1          = translated[1];
-  std::vector<int> vals = {10};
-  assert_basic(metric1, "library_name_unit", "description", prometheus_client::MetricType::Gauge, 3,
-               vals);
-
-  int checked_label_num = 0;
-  for (auto &label : translated[0].metric[0].label)
-  {
-    if (label.name == "service_name")
-    {
-      ASSERT_EQ(label.value, "test_service");
-      checked_label_num++;
-    }
-    else if (label.name == "service_instance_id")
-    {
-      ASSERT_EQ(label.value, "localhost:8000");
-      checked_label_num++;
-    }
-    else if (label.name == "custom_resource_attr")
-    {
-      ASSERT_EQ(label.value, "custom_resource_value");
-      checked_label_num++;
-    }
-  }
-  ASSERT_EQ(checked_label_num, 3);
-}
-
-TEST(PrometheusExporterUtils, TranslateToPrometheusHistogramNormal)
-{
-  opentelemetry::sdk::resource::Resource resource = opentelemetry::sdk::resource::Resource::Create(
-      {{"service.instance.id", "localhost:8001"},
-       {"custom_resource_attr", "custom_resource_value"}});
-  TestDataPoints dp;
-  metric_sdk::ResourceMetrics metrics_data = dp.CreateHistogramPointData();
-  metrics_data.resource_                   = &resource;
-
-  auto translated = PrometheusExporterUtils::TranslateToPrometheus(metrics_data);
-  ASSERT_EQ(translated.size(), 2);
-
-  auto metric              = translated[1];
-  std::vector<double> vals = {3, 900.5, 4};
-  assert_basic(metric, "library_name_unit", "description", prometheus_client::MetricType::Histogram,
-               3, vals);
-  assert_histogram(metric, std::list<double>{10.1, 20.2, 30.2}, {200, 300, 400, 500});
-
-  int checked_label_num = 0;
-  for (auto &label : translated[0].metric[0].label)
-  {
-    if (label.name == "service_name")
-    {
-      // default service name is "unknown_service"
-      ASSERT_EQ(label.value, "unknown_service");
-      checked_label_num++;
-    }
-    else if (label.name == "service_instance_id")
-    {
-      ASSERT_EQ(label.value, "localhost:8001");
-      checked_label_num++;
-    }
-    else if (label.name == "custom_resource_attr")
-    {
-      ASSERT_EQ(label.value, "custom_resource_value");
-      checked_label_num++;
-    }
-  }
-  ASSERT_EQ(checked_label_num, 3);
-}
-
-class SanitizeTest : public ::testing::Test
-{
-  Resource resource_ = Resource::Create({});
-  nostd::unique_ptr<InstrumentationScope> instrumentation_scope_ =
-      InstrumentationScope::Create("library_name", "1.2.0");
-
-protected:
-  void CheckSanitizeLabel(const std::string &original, const std::string &sanitized)
-  {
-    metric_sdk::InstrumentDescriptor instrument_descriptor{
-        "name", "description", "unit", metric_sdk::InstrumentType::kCounter,
-        metric_sdk::InstrumentValueType::kDouble};
-    auto result = PrometheusExporterUtils::TranslateToPrometheus(
-        {&resource_,
-         std::vector<metric_sdk::ScopeMetrics>{
-             {instrumentation_scope_.get(),
-              std::vector<metric_sdk::MetricData>{
-                  {instrument_descriptor, {}, {}, {}, {{{{original, "value"}}, {}}}}}}}},
-        false);
-    EXPECT_EQ(result.begin()->metric.begin()->label.begin()->name, sanitized);
-  }
-};
-
-TEST_F(SanitizeTest, Label)
-{
-  CheckSanitizeLabel("name", "name");
-  CheckSanitizeLabel("name?", "name_");
-  CheckSanitizeLabel("name???", "name_");
-  CheckSanitizeLabel("name?__", "name_");
-  CheckSanitizeLabel("name?__name", "name_name");
-  CheckSanitizeLabel("name?__name:", "name_name_");
-}
-
-TEST_F(SanitizeTest, Name) {}
-
-class AttributeCollisionTest : public ::testing::Test
-{
-  Resource resource_ = Resource::Create(ResourceAttributes{});
-  nostd::unique_ptr<InstrumentationScope> instrumentation_scope_ =
-      InstrumentationScope::Create("library_name", "1.2.0");
-  metric_sdk::InstrumentDescriptor instrument_descriptor_{"library_name", "description", "unit",
-                                                          metric_sdk::InstrumentType::kCounter,
-                                                          metric_sdk::InstrumentValueType::kDouble};
-
-protected:
-  void CheckTranslation(const metric_sdk::PointAttributes &attrs,
-                        const std::vector<prometheus::ClientMetric::Label> &expected)
-  {
-    std::vector<prometheus::MetricFamily> result = PrometheusExporterUtils::TranslateToPrometheus(
-        {&resource_,
-         std::vector<metric_sdk::ScopeMetrics>{
-             {instrumentation_scope_.get(),
-              std::vector<metric_sdk::MetricData>{
-                  {instrument_descriptor_, {}, {}, {}, {{attrs, {}}}}}}}},
-        false);
-    for (auto &expected_kv : expected)
-    {
-      bool found = false;
-      for (auto &found_kv : result.begin()->metric.begin()->label)
-      {
-        if (found_kv.name == expected_kv.name)
-        {
-          EXPECT_EQ(found_kv.value, expected_kv.value);
-          found = true;
-        }
-      }
-      EXPECT_TRUE(found);
-    }
-  }
-};
-
-TEST_F(AttributeCollisionTest, SeparatesDistinctKeys)
-{
-  CheckTranslation({{"foo.a", "value1"}, {"foo.b", "value2"}}, {{"foo_a", "value1"},
-                                                                {"foo_b", "value2"},
-                                                                {"otel_scope_name", "library_name"},
-                                                                {"otel_scope_version", "1.2.0"}});
-}
-
-TEST(PrometheusExporterUtils, PrometheusUnit)
-{
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("d"), "days");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("h"), "hours");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("min"), "minutes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("s"), "seconds");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("ms"), "milliseconds");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("us"), "microseconds");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("ns"), "nanoseconds");
-
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("By"), "bytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("KiBy"), "kibibytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("MiBy"), "mebibytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("GiBy"), "gibibytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("TiBy"), "tibibytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("KBy"), "kilobytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("MBy"), "megabytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("GBy"), "gigabytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("TBy"), "terabytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("By"), "bytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("KBy"), "kilobytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("MBy"), "megabytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("GBy"), "gigabytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("TBy"), "terabytes");
-
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("m"), "meters");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("V"), "volts");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("A"), "amperes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("J"), "joules");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("W"), "watts");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("g"), "grams");
-
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("Cel"), "celsius");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("Hz"), "hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("1"), "");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusUnit("%"), "percent");
-}
-
-TEST(PrometheusExporterUtils, PrometheusPerUnit)
-{
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusPerUnit("s"), "second");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusPerUnit("m"), "minute");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusPerUnit("h"), "hour");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusPerUnit("d"), "day");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusPerUnit("w"), "week");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusPerUnit("mo"), "month");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::getPrometheusPerUnit("y"), "year");
-}
-
-TEST(PrometheusExporterUtils, RemoveUnitPortionInBraces)
-{
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::removeUnitPortionInBraces("{unit}"), "");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::removeUnitPortionInBraces("unit{unit}"), "unit");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::removeUnitPortionInBraces("unit_{unit}"),
-            "unit_");
-}
-
-TEST(PrometheusExporterUtils, ConvertRateExpressedToPrometheusUnit)
-{
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::convertRateExpressedToPrometheusUnit("unit/d"),
-            "unit_per_day");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::convertRateExpressedToPrometheusUnit("unit/s"),
-            "unit_per_second");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::convertRateExpressedToPrometheusUnit("unit/"),
-            "unit/");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::convertRateExpressedToPrometheusUnit("unit"),
-            "unit");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::convertRateExpressedToPrometheusUnit("unit/m"),
-            "unit_per_minute");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::convertRateExpressedToPrometheusUnit("/m"),
-            "_per_minute");
-}
-
-TEST(PromentheusExporterUtils, PrometheusNameMapping)
-{
-  // General test cases on unit expansions and name sanitization
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric___name", "g", prometheus::MetricType::Counter),
-            "sample_metric_name_grams_total");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "s", prometheus::MetricType::Counter),
-            "sample_metric_name_seconds_total");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "s", prometheus::MetricType::Gauge),
-            "sample_metric_name_seconds");
-  // Test without_units & without_type_suffix with Counters and unit = 1
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Counter),
-            "sample_metric_name_total");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Counter, true, false),
-            "sample_metric_name_total");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Counter, false, true),
-            "sample_metric_name");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Counter, true, true),
-            "sample_metric_name");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Counter, true, true),
-            "sample_metric_name");
-  // Test without_units & without_type_suffix with Counters and non-special units
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "%", prometheus::MetricType::Counter),
-            "sample_metric_name_percent_total");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "m", prometheus::MetricType::Counter, true, false),
-            "sample_metric_name_total");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "By", prometheus::MetricType::Counter, false, true),
-            "sample_metric_name_bytes");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "s", prometheus::MetricType::Counter, true, true),
-            "sample_metric_name");
-  // Special case Gauges & ratio
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Gauge),
-            "sample_metric_name_ratio");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Gauge, false, true),
-            "sample_metric_name_ratio");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Gauge, true, false),
-            "sample_metric_name");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "1", prometheus::MetricType::Gauge, true, true),
-            "sample_metric_name");
-  // Test without_type_suffix affects only counters
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Counter),
-            "sample_metric_name_hertz_total");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Counter, false, true),
-            "sample_metric_name_hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Gauge),
-            "sample_metric_name_hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Gauge, false, true),
-            "sample_metric_name_hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Histogram),
-            "sample_metric_name_hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Histogram, false, true),
-            "sample_metric_name_hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Summary),
-            "sample_metric_name_hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Summary, false, true),
-            "sample_metric_name_hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Info),
-            "sample_metric_name_hertz");
-  ASSERT_EQ(exporter::metrics::SanitizeNameTester::mapToPrometheusName(
-                "sample_metric_name", "Hz", prometheus::MetricType::Info, false, true),
-            "sample_metric_name_hertz");
-}
-
-TEST_F(AttributeCollisionTest, JoinsCollidingKeys)
-{
-  CheckTranslation({{"foo.a", "value1"}, {"foo_a", "value2"}}, {{"foo_a", "value1;value2"},
-                                                                {"otel_scope_name", "library_name"},
-                                                                {"otel_scope_version", "1.2.0"}});
-}
-
-TEST_F(AttributeCollisionTest, DropsInvertedKeys)
-{
-  CheckTranslation({{"foo.a", "value1"}, {"foo.b", "value2"}, {"foo__a", "value3"}},
-                   {{"foo_a", "value1"},
-                    {"foo_b", "value2"},
-                    {"otel_scope_name", "library_name"},
-                    {"otel_scope_version", "1.2.0"}});
-}
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/prometheus_test_helper.h b/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/prometheus_test_helper.h
deleted file mode 100644
index 1bf1f1765..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/prometheus/test/prometheus_test_helper.h
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-namespace metric_sdk      = opentelemetry::sdk::metrics;
-namespace nostd           = opentelemetry::nostd;
-namespace exportermetrics = opentelemetry::exporter::metrics;
-
-namespace
-{
-
-using opentelemetry::sdk::instrumentationscope::InstrumentationScope;
-using opentelemetry::sdk::resource::Resource;
-using opentelemetry::sdk::resource::ResourceAttributes;
-
-struct TestDataPoints
-{
-  Resource resource = Resource::Create(ResourceAttributes{});
-  nostd::unique_ptr<InstrumentationScope> instrumentation_scope =
-      InstrumentationScope::Create("library_name", "1.2.0");
-
-  /**
-   * Helper function to create ResourceMetrics
-   */
-  inline metric_sdk::ResourceMetrics CreateSumPointData()
-  {
-    metric_sdk::SumPointData sum_point_data{};
-    sum_point_data.value_ = 10.0;
-    metric_sdk::SumPointData sum_point_data2{};
-    sum_point_data2.value_ = 20.0;
-    metric_sdk::ResourceMetrics data;
-    data.resource_ = &resource;
-    metric_sdk::MetricData metric_data{
-        metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                         metric_sdk::InstrumentType::kCounter,
-                                         metric_sdk::InstrumentValueType::kDouble},
-        metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-        opentelemetry::common::SystemTimestamp{},
-        std::vector<metric_sdk::PointDataAttributes>{
-            {metric_sdk::PointAttributes{{"a1", "b1"}}, sum_point_data},
-            {metric_sdk::PointAttributes{{"a2", "b2"}}, sum_point_data2}}};
-    data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-        {instrumentation_scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-    return data;
-  }
-
-  inline metric_sdk::ResourceMetrics CreateHistogramPointData()
-  {
-    metric_sdk::HistogramPointData histogram_point_data{};
-    histogram_point_data.boundaries_ = {10.1, 20.2, 30.2};
-    histogram_point_data.count_      = 3;
-    histogram_point_data.counts_     = {200, 300, 400, 500};
-    histogram_point_data.sum_        = 900.5;
-    metric_sdk::HistogramPointData histogram_point_data2{};
-    histogram_point_data2.boundaries_ = {10.0, 20.0, 30.0};
-    histogram_point_data2.count_      = 3;
-    histogram_point_data2.counts_     = {200, 300, 400, 500};
-    histogram_point_data2.sum_        = static_cast<int64_t>(900);
-    metric_sdk::ResourceMetrics data;
-    data.resource_ = &resource;
-    metric_sdk::MetricData metric_data{
-        metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                         metric_sdk::InstrumentType::kHistogram,
-                                         metric_sdk::InstrumentValueType::kDouble},
-        metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-        opentelemetry::common::SystemTimestamp{},
-        std::vector<metric_sdk::PointDataAttributes>{
-            {metric_sdk::PointAttributes{{"a1", "b1"}}, histogram_point_data},
-            {metric_sdk::PointAttributes{{"a2", "b2"}}, histogram_point_data2}}};
-    data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-        {instrumentation_scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-    return data;
-  }
-
-  inline metric_sdk::ResourceMetrics CreateLastValuePointData()
-  {
-    metric_sdk::ResourceMetrics data;
-    data.resource_ = &resource;
-    metric_sdk::LastValuePointData last_value_point_data{};
-    last_value_point_data.value_              = 10.0;
-    last_value_point_data.is_lastvalue_valid_ = true;
-    last_value_point_data.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    metric_sdk::LastValuePointData last_value_point_data2{};
-    last_value_point_data2.value_              = static_cast<int64_t>(20);
-    last_value_point_data2.is_lastvalue_valid_ = true;
-    last_value_point_data2.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    metric_sdk::MetricData metric_data{
-        metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                         metric_sdk::InstrumentType::kCounter,
-                                         metric_sdk::InstrumentValueType::kDouble},
-        metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-        opentelemetry::common::SystemTimestamp{},
-        std::vector<metric_sdk::PointDataAttributes>{
-            {metric_sdk::PointAttributes{{"a1", "b1"}}, last_value_point_data},
-            {metric_sdk::PointAttributes{{"a2", "b2"}}, last_value_point_data2}}};
-    data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-        {instrumentation_scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-    return data;
-  }
-
-  inline metric_sdk::ResourceMetrics CreateDropPointData()
-  {
-    metric_sdk::ResourceMetrics data;
-    data.resource_ = &resource;
-    metric_sdk::DropPointData drop_point_data{};
-    metric_sdk::DropPointData drop_point_data2{};
-    metric_sdk::MetricData metric_data{
-        metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
-                                         metric_sdk::InstrumentType::kCounter,
-                                         metric_sdk::InstrumentValueType::kDouble},
-        metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
-        opentelemetry::common::SystemTimestamp{},
-        std::vector<metric_sdk::PointDataAttributes>{
-            {metric_sdk::PointAttributes{{"a1", "b1"}}, drop_point_data},
-            {metric_sdk::PointAttributes{{"a2", "b2"}}, drop_point_data2}}};
-    data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
-        {instrumentation_scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
-    return data;
-  }
-};
-}  // namespace
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-inline bool operator==(const metric_sdk::MetricData &lhs, const metric_sdk::MetricData &rhs)
-{
-  if (lhs.start_ts != rhs.start_ts)
-  {
-    return false;
-  }
-  if (lhs.end_ts != rhs.end_ts)
-  {
-    return false;
-  }
-
-  if (lhs.instrument_descriptor.description_ != rhs.instrument_descriptor.description_)
-  {
-    return false;
-  }
-  if (lhs.instrument_descriptor.name_ != rhs.instrument_descriptor.name_)
-  {
-    return false;
-  }
-  if (lhs.instrument_descriptor.type_ != rhs.instrument_descriptor.type_)
-  {
-    return false;
-  }
-  if (lhs.instrument_descriptor.unit_ != rhs.instrument_descriptor.unit_)
-  {
-    return false;
-  }
-  if (lhs.instrument_descriptor.value_type_ != rhs.instrument_descriptor.value_type_)
-  {
-    return false;
-  }
-
-  if (lhs.point_data_attr_.size() != rhs.point_data_attr_.size())
-  {
-    return false;
-  }
-  for (uint32_t idx = 0; idx < lhs.point_data_attr_.size(); ++idx)
-  {
-    if (lhs.point_data_attr_.at(idx).attributes != rhs.point_data_attr_.at(idx).attributes)
-    {
-      return false;
-    }
-    auto &lhs_point_data = lhs.point_data_attr_.at(idx).point_data;
-    auto &rhs_point_data = rhs.point_data_attr_.at(idx).point_data;
-    if (nostd::holds_alternative<metric_sdk::SumPointData>(lhs_point_data))
-    {
-      if (nostd::get<metric_sdk::SumPointData>(lhs_point_data).value_ !=
-          nostd::get<metric_sdk::SumPointData>(rhs_point_data).value_)
-      {
-        return false;
-      }
-    }
-    else if (nostd::holds_alternative<metric_sdk::DropPointData>(lhs_point_data))
-    {
-      if (!nostd::holds_alternative<metric_sdk::DropPointData>(rhs_point_data))
-      {
-        return false;
-      }
-    }
-    else if (nostd::holds_alternative<metric_sdk::HistogramPointData>(lhs_point_data))
-    {
-      auto &lhs_histogram_d = nostd::get<metric_sdk::HistogramPointData>(lhs_point_data);
-      auto &rhs_histogram_d = nostd::get<metric_sdk::HistogramPointData>(rhs_point_data);
-      if (lhs_histogram_d.count_ != rhs_histogram_d.count_)
-      {
-        return false;
-      }
-      if (lhs_histogram_d.counts_ != rhs_histogram_d.counts_)
-      {
-        return false;
-      }
-      if (lhs_histogram_d.boundaries_ != rhs_histogram_d.boundaries_)
-      {
-        return false;
-      }
-      if (lhs_histogram_d.sum_ != rhs_histogram_d.sum_)
-      {
-        return false;
-      }
-    }
-    else if (nostd::holds_alternative<metric_sdk::LastValuePointData>(lhs_point_data))
-    {
-      auto &lhs_last_value_d = nostd::get<metric_sdk::LastValuePointData>(lhs_point_data);
-      auto &rhs_last_value_d = nostd::get<metric_sdk::LastValuePointData>(rhs_point_data);
-      if (lhs_last_value_d.is_lastvalue_valid_ != rhs_last_value_d.is_lastvalue_valid_)
-      {
-        return false;
-      }
-      if (lhs_last_value_d.sample_ts_ != rhs_last_value_d.sample_ts_)
-      {
-        return false;
-      }
-      if (lhs_last_value_d.value_ != rhs_last_value_d.value_)
-      {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/BUILD b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/BUILD
deleted file mode 100644
index 16774e80d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/BUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "zipkin_recordable",
-    srcs = [
-        "src/recordable.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/zipkin/recordable.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["zipkin"],
-    deps = [
-        "//sdk/src/resource",
-        "//sdk/src/trace",
-        "@github_nlohmann_json//:json",
-    ],
-)
-
-cc_library(
-    name = "zipkin_exporter",
-    srcs = [
-        "src/zipkin_exporter.cc",
-        "src/zipkin_exporter_factory.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/exporters/zipkin/zipkin_exporter.h",
-        "include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h",
-        "include/opentelemetry/exporters/zipkin/zipkin_exporter_options.h",
-    ],
-    copts = [
-        "-DCURL_STATICLIB",
-    ],
-    strip_include_prefix = "include",
-    tags = ["zipkin"],
-    deps = [
-        ":zipkin_recordable",
-        "//ext/src/http/client/curl:http_client_curl",
-    ],
-)
-
-cc_test(
-    name = "zipkin_recordable_test",
-    srcs = ["test/zipkin_recordable_test.cc"],
-    tags = [
-        "test",
-        "zipkin",
-    ],
-    deps = [
-        ":zipkin_recordable",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "zipkin_exporter_test",
-    srcs = ["test/zipkin_exporter_test.cc"],
-    tags = [
-        "test",
-        "zipkin",
-    ],
-    deps = [
-        ":zipkin_exporter",
-        ":zipkin_recordable",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/CMakeLists.txt
deleted file mode 100644
index 548a9fd44..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/CMakeLists.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(
-  opentelemetry_exporter_zipkin_trace
-  src/zipkin_exporter.cc src/zipkin_exporter_factory.cc src/recordable.cc)
-
-target_include_directories(
-  opentelemetry_exporter_zipkin_trace
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-         "$<INSTALL_INTERFACE:include>")
-
-set_target_properties(opentelemetry_exporter_zipkin_trace
-                      PROPERTIES EXPORT_NAME zipkin_trace_exporter)
-
-set_target_version(opentelemetry_exporter_zipkin_trace)
-
-target_link_libraries(
-  opentelemetry_exporter_zipkin_trace
-  PUBLIC opentelemetry_trace opentelemetry_http_client_curl
-         nlohmann_json::nlohmann_json)
-
-otel_add_component(
-  COMPONENT
-  exporters_zipkin
-  TARGETS
-  opentelemetry_exporter_zipkin_trace
-  FILES_DIRECTORY
-  "include/opentelemetry/exporters/zipkin"
-  FILES_DESTINATION
-  "include/opentelemetry/exporters"
-  FILES_MATCHING
-  PATTERN
-  "*.h"
-  PATTERN
-  "recordable.h"
-  EXCLUDE)
-
-if(BUILD_TESTING)
-  add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
-
-  add_executable(zipkin_recordable_test test/zipkin_recordable_test.cc)
-
-  target_link_libraries(
-    zipkin_recordable_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_exporter_zipkin_trace opentelemetry_resources)
-
-  gtest_add_tests(
-    TARGET zipkin_recordable_test
-    TEST_PREFIX exporter.
-    TEST_LIST zipkin_recordable_test)
-
-  add_executable(zipkin_exporter_test test/zipkin_exporter_test.cc)
-
-  target_link_libraries(
-    zipkin_exporter_test
-    ${GTEST_BOTH_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT}
-    ${GMOCK_LIB}
-    opentelemetry_exporter_zipkin_trace
-    opentelemetry_resources
-    ${CURL_LIBRARIES})
-
-  gtest_add_tests(
-    TARGET zipkin_exporter_test
-    TEST_PREFIX exporter.
-    TEST_LIST zipkin_exporter_test)
-endif() # BUILD_TESTING
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/README.md b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/README.md
deleted file mode 100644
index 40bb1f061..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Zipkin Exporter for OpenTelemetry C++
-
-## Prerequisite
-
-* [Get Zipkin](https://zipkin.io/pages/quickstart.html)
-
-## Installation
-
-### CMake Install Instructions
-
-Refer to install instructions [INSTALL.md](../../INSTALL.md#building-as-standalone-cmake-project).
-Modify step 2 to create `cmake` build configuration for compiling Zipkin as below:
-
-```console
-   $ cmake -DWITH_ZIPKIN=ON ..
-   -- The C compiler identification is GNU 9.3.0
-   -- The CXX compiler identification is GNU 9.3.0
-   ...
-   -- Configuring done
-   -- Generating done
-   -- Build files have been written to: /home/<user>/source/opentelemetry-cpp/build
-   $
-```
-
-### Bazel Install Instructions
-
-TODO
-
-## Usage
-
-Install the exporter on your application and pass the options. `service_name`
-is an optional string. If omitted, the exporter will first try to get the
-service name from the Resource. If no service name can be detected on the
-Resource, a fallback name of "unknown_service" will be used.
-
-```cpp
-
-opentelemetry::exporter::zipkin::ZipkinExporterOptions options;
-options.endpoint = "http://localhost:9411/api/v2/spans";
-options.service_name = "my_service";
-
-auto exporter = std::unique_ptr<opentelemetry::sdk::trace::SpanExporter>(
-    new opentelemetry::exporter::zipkin::ZipkinExporter(options));
-auto processor = std::shared_ptr<sdktrace::SpanProcessor>(
-    new sdktrace::SimpleSpanProcessor(std::move(exporter)));
-auto provider = nostd::shared_ptr<opentelemetry::trace::TracerProvider>(
-    new sdktrace::TracerProvider(processor, opentelemetry::sdk::resource::Resource::Create({}),
-                std::make_shared<opentelemetry::sdk::trace::AlwaysOnSampler>()));
-
-// Set the global trace provider
-opentelemetry::trace::Provider::SetTracerProvider(provider);
-```
-
-## Viewing your traces
-
-Please visit the Zipkin UI endpoint <http://localhost:9411>
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h
deleted file mode 100644
index 0331178f2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <string>
-
-#include "nlohmann/json.hpp"
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-using ZipkinSpan = nlohmann::json;
-
-class Recordable final : public sdk::trace::Recordable
-{
-public:
-  const ZipkinSpan &span() const noexcept { return span_; }
-
-  const std::string &GetServiceName() const noexcept { return service_name_; }
-
-  void SetIdentity(const opentelemetry::trace::SpanContext &span_context,
-                   opentelemetry::trace::SpanId parent_span_id) noexcept override;
-
-  void SetAttribute(opentelemetry::nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override;
-
-  void AddEvent(opentelemetry::nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-  void AddLink(const opentelemetry::trace::SpanContext &span_context,
-               const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-  void SetStatus(opentelemetry::trace::StatusCode code,
-                 nostd::string_view description) noexcept override;
-
-  void SetName(nostd::string_view name) noexcept override;
-
-  void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept override;
-
-  void SetStartTime(opentelemetry::common::SystemTimestamp start_time) noexcept override;
-
-  void SetSpanKind(opentelemetry::trace::SpanKind span_kind) noexcept override;
-
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override;
-
-  void SetDuration(std::chrono::nanoseconds duration) noexcept override;
-
-  void SetInstrumentationScope(const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-                                   &instrumentation_scope) noexcept override;
-
-private:
-  ZipkinSpan span_;
-  std::string service_name_;
-};
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h
deleted file mode 100644
index 19e7af9cf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <memory>
-
-#include "nlohmann/json.hpp"
-
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-/**
- * The Zipkin exporter exports span data in JSON format as expected by Zipkin
- */
-class ZipkinExporter final : public opentelemetry::sdk::trace::SpanExporter
-{
-public:
-  /**
-   * Create a ZipkinExporter using all default options.
-   */
-  ZipkinExporter();
-
-  /**
-   * Create a ZipkinExporter using the given options.
-   */
-  explicit ZipkinExporter(const ZipkinExporterOptions &options);
-
-  /**
-   * Create a span recordable.
-   * @return a newly initialized Recordable object
-   */
-  std::unique_ptr<opentelemetry::sdk::trace::Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Export a batch of span recordables in JSON format.
-   * @param spans a span of unique pointers to span recordables
-   */
-  sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<opentelemetry::sdk::trace::Recordable>> &spans) noexcept
-      override;
-
-  /**
-   * Force flush the exporter.
-   * @param timeout an option timeout, default to max.
-   * @return return true when all data are exported, and false when timeout
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shut down the exporter.
-   * @param timeout an optional timeout, default to max.
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  void InitializeLocalEndpoint();
-
-private:
-  // The configuration options associated with this exporter.
-  std::atomic<bool> is_shutdown_{false};
-  ZipkinExporterOptions options_;
-  std::shared_ptr<opentelemetry::ext::http::client::HttpClientSync> http_client_;
-  opentelemetry::ext::http::common::UrlParser url_parser_;
-  nlohmann::json local_end_point_;
-
-  // For testing
-  friend class ZipkinExporterTestPeer;
-  /**
-   * Create an ZipkinExporter using the specified http client.
-   * Only tests can call this constructor directly.
-   * @param http_client the http client to be used for exporting
-   */
-  ZipkinExporter(std::shared_ptr<opentelemetry::ext::http::client::HttpClientSync> http_client);
-
-  bool isShutdown() const noexcept;
-};
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h
deleted file mode 100644
index b1564a797..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-/**
- * Factory class for ZipkinExporter.
- */
-class ZipkinExporterFactory
-{
-public:
-  /**
-   * Create a ZipkinExporter using all default options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create();
-
-  /**
-   * Create a ZipkinExporter using the given options.
-   */
-  static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
-      const ZipkinExporterOptions &options);
-};
-
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_options.h b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_options.h
deleted file mode 100644
index f5ee941d2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_options.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/sdk/common/env_variables.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-inline const std::string GetDefaultZipkinEndpoint()
-{
-  const char *otel_exporter_zipkin_endpoint_env = "OTEL_EXPORTER_ZIPKIN_ENDPOINT";
-  const char *kZipkinEndpointDefault            = "http://localhost:9411/api/v2/spans";
-
-  std::string endpoint;
-
-  auto exists = opentelemetry::sdk::common::GetStringEnvironmentVariable(
-      otel_exporter_zipkin_endpoint_env, endpoint);
-  return exists ? endpoint : kZipkinEndpointDefault;
-}
-
-enum class TransportFormat
-{
-  kJson,
-  kProtobuf
-};
-
-/**
- * Struct to hold Zipkin  exporter options.
- */
-struct ZipkinExporterOptions
-{
-  // The endpoint to export to. By default the OpenTelemetry Collector's default endpoint.
-  std::string endpoint     = GetDefaultZipkinEndpoint();
-  TransportFormat format   = TransportFormat::kJson;
-  std::string service_name = "default-service";
-  std::string ipv4;
-  std::string ipv6;
-  ext::http::client::Headers headers = {{"content-type", "application/json"}};
-};
-
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/recordable.cc b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/recordable.cc
deleted file mode 100644
index 7152e7c92..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/recordable.cc
+++ /dev/null
@@ -1,281 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <chrono>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-#include "nlohmann/json.hpp"
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/zipkin/recordable.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/semconv/service_attributes.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-using namespace opentelemetry::sdk::resource;
-namespace trace_api = opentelemetry::trace;
-namespace common    = opentelemetry::common;
-namespace sdk       = opentelemetry::sdk;
-
-// constexpr needs keys to be constexpr, const is next best to use.
-static const std::map<trace_api::SpanKind, std::string> kSpanKindMap = {
-    {trace_api::SpanKind::kClient, "CLIENT"},
-    {trace_api::SpanKind::kServer, "SERVER"},
-    {trace_api::SpanKind::kConsumer, "CONSUMER"},
-    {trace_api::SpanKind::kProducer, "PRODUCER"},
-};
-
-//
-// See `attribute_value.h` for details.
-//
-const int kAttributeValueSize = 16;
-
-void Recordable::SetIdentity(const trace_api::SpanContext &span_context,
-                             trace_api::SpanId parent_span_id) noexcept
-{
-  char trace_id_lower_base16[trace::TraceId::kSize * 2] = {0};
-  span_context.trace_id().ToLowerBase16(trace_id_lower_base16);
-  char span_id_lower_base16[trace::SpanId::kSize * 2] = {0};
-  span_context.span_id().ToLowerBase16(span_id_lower_base16);
-  if (parent_span_id.IsValid())
-  {
-    char parent_span_id_lower_base16[trace::SpanId::kSize * 2] = {0};
-    parent_span_id.ToLowerBase16(parent_span_id_lower_base16);
-    span_["parentId"] = std::string(parent_span_id_lower_base16, 16);
-  }
-
-  span_["id"]      = std::string(span_id_lower_base16, 16);
-  span_["traceId"] = std::string(trace_id_lower_base16, 32);
-}
-
-void PopulateAttribute(nlohmann::json &attribute,
-                       nostd::string_view key,
-                       const common::AttributeValue &value)
-{
-  // Assert size of variant to ensure that this method gets updated if the variant
-  // definition changes
-  static_assert(nostd::variant_size<common::AttributeValue>::value == kAttributeValueSize,
-                "AttributeValue contains unknown type");
-
-  if (nostd::holds_alternative<bool>(value))
-  {
-    attribute[key.data()] = nostd::get<bool>(value);
-  }
-  else if (nostd::holds_alternative<int>(value))
-  {
-    attribute[key.data()] = nostd::get<int>(value);
-  }
-  else if (nostd::holds_alternative<int64_t>(value))
-  {
-    attribute[key.data()] = nostd::get<int64_t>(value);
-  }
-  else if (nostd::holds_alternative<unsigned int>(value))
-  {
-    attribute[key.data()] = nostd::get<unsigned int>(value);
-  }
-  else if (nostd::holds_alternative<uint64_t>(value))
-  {
-    attribute[key.data()] = nostd::get<uint64_t>(value);
-  }
-  else if (nostd::holds_alternative<double>(value))
-  {
-    attribute[key.data()] = nostd::get<double>(value);
-  }
-  else if (nostd::holds_alternative<const char *>(value))
-  {
-    attribute[key.data()] = nostd::get<const char *>(value);
-  }
-  else if (nostd::holds_alternative<nostd::string_view>(value))
-  {
-    attribute[key.data()] = nostd::string_view(nostd::get<nostd::string_view>(value).data(),
-                                               nostd::get<nostd::string_view>(value).size());
-  }
-  else if (nostd::holds_alternative<nostd::span<const uint8_t>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<nostd::span<const uint8_t>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const bool>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<nostd::span<const bool>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const int>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<nostd::span<const int>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const int64_t>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<nostd::span<const int64_t>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const unsigned int>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<nostd::span<const unsigned int>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const uint64_t>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<nostd::span<const uint64_t>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const double>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<nostd::span<const double>>(value))
-    {
-      attribute[key.data()].push_back(val);
-    }
-  }
-  else if (nostd::holds_alternative<nostd::span<const nostd::string_view>>(value))
-  {
-    attribute[key.data()] = {};
-    for (const auto &val : nostd::get<nostd::span<const nostd::string_view>>(value))
-    {
-      attribute[key.data()].push_back(std::string(val.data(), val.size()));
-    }
-  }
-}
-
-void Recordable::SetAttribute(nostd::string_view key, const common::AttributeValue &value) noexcept
-{
-  if (!span_.contains("tags"))
-  {
-    span_["tags"] = nlohmann::json::object();
-  }
-  PopulateAttribute(span_["tags"], key, value);
-}
-
-void Recordable::AddEvent(nostd::string_view name,
-                          common::SystemTimestamp timestamp,
-                          const common::KeyValueIterable &attributes) noexcept
-{
-  nlohmann::json attrs = nlohmann::json::object();  // empty object
-  attributes.ForEachKeyValue([&](nostd::string_view key, common::AttributeValue value) noexcept {
-    PopulateAttribute(attrs, key, value);
-    return true;
-  });
-
-  nlohmann::json annotation = {{"value", nlohmann::json::object({{name.data(), attrs}}).dump()},
-                               {"timestamp", std::chrono::duration_cast<std::chrono::microseconds>(
-                                                 timestamp.time_since_epoch())
-                                                 .count()}};
-
-  if (!span_.contains("annotations"))
-  {
-    span_["annotations"] = nlohmann::json::array();
-  }
-  span_["annotations"].push_back(annotation);
-}
-
-void Recordable::AddLink(const trace_api::SpanContext & /* span_context */,
-                         const common::KeyValueIterable & /* attributes */) noexcept
-{
-  // TODO: Currently not supported by specs:
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/sdk_exporters/zipkin.md
-}
-
-void Recordable::SetStatus(trace::StatusCode code, nostd::string_view description) noexcept
-{
-  if (code != trace::StatusCode::kUnset)
-  {
-    span_["tags"]["otel.status_code"] = code;
-    if (code == trace::StatusCode::kError)
-    {
-      span_["tags"]["error"] = description;
-    }
-  }
-}
-
-void Recordable::SetName(nostd::string_view name) noexcept
-{
-  span_["name"] = name.data();
-}
-
-void Recordable::SetTraceFlags(opentelemetry::trace::TraceFlags /* flags */) noexcept
-{
-  // TODO: Currently not supported by specs:
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/sdk_exporters/zipkin.md
-}
-
-void Recordable::SetResource(const sdk::resource::Resource &resource) noexcept
-{
-  // only service.name attribute is supported by specs as of now.
-  auto attributes = resource.GetAttributes();
-  if (attributes.find(semconv::service::kServiceName) != attributes.end())
-  {
-    service_name_ = nostd::get<std::string>(attributes[semconv::service::kServiceName]);
-  }
-}
-
-void Recordable::SetStartTime(common::SystemTimestamp start_time) noexcept
-{
-  span_["timestamp"] =
-      std::chrono::duration_cast<std::chrono::microseconds>(start_time.time_since_epoch()).count();
-}
-
-void Recordable::SetDuration(std::chrono::nanoseconds duration) noexcept
-{
-  span_["duration"] = std::chrono::duration_cast<std::chrono::microseconds>(duration).count();
-}
-
-void Recordable::SetSpanKind(trace_api::SpanKind span_kind) noexcept
-{
-  auto span_iter = kSpanKindMap.find(span_kind);
-  if (span_iter != kSpanKindMap.end())
-  {
-    span_["kind"] = span_iter->second;
-  }
-}
-
-void Recordable::SetInstrumentationScope(
-    const sdk::instrumentationscope::InstrumentationScope &instrumentation_scope) noexcept
-{
-  span_["tags"]["otel.library.name"]    = instrumentation_scope.GetName();
-  span_["tags"]["otel.library.version"] = instrumentation_scope.GetVersion();
-}
-
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/zipkin_exporter.cc b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/zipkin_exporter.cc
deleted file mode 100644
index f28e9f4d3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/zipkin_exporter.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// NOLINTNEXTLINE
-#define _WINSOCKAPI_  // stops including winsock.h
-
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <ostream>
-#include <string>
-#include <utility>
-
-#include "nlohmann/json.hpp"
-
-#include "opentelemetry/exporters/zipkin/recordable.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-namespace http_client = opentelemetry::ext::http::client;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-// -------------------------------- Constructors --------------------------------
-
-ZipkinExporter::ZipkinExporter(const ZipkinExporterOptions &options)
-    : options_(options),
-      http_client_(ext::http::client::HttpClientFactory::CreateSync()),
-      url_parser_(options_.endpoint)
-{
-  InitializeLocalEndpoint();
-}
-
-ZipkinExporter::ZipkinExporter()
-    : options_(ZipkinExporterOptions()),
-      http_client_(ext::http::client::HttpClientFactory::CreateSync()),
-      url_parser_(options_.endpoint)
-{
-  InitializeLocalEndpoint();
-}
-
-ZipkinExporter::ZipkinExporter(
-    std::shared_ptr<opentelemetry::ext::http::client::HttpClientSync> http_client)
-    : options_(ZipkinExporterOptions()),
-      http_client_(std::move(http_client)),
-      url_parser_(options_.endpoint)
-{
-
-  InitializeLocalEndpoint();
-}
-
-// ----------------------------- Exporter methods ------------------------------
-
-std::unique_ptr<sdk::trace::Recordable> ZipkinExporter::MakeRecordable() noexcept
-{
-  return std::unique_ptr<sdk::trace::Recordable>(new Recordable);
-}
-
-sdk::common::ExportResult ZipkinExporter::Export(
-    const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &spans) noexcept
-{
-  if (isShutdown())
-  {
-    OTEL_INTERNAL_LOG_ERROR("[Zipkin Trace Exporter] Exporting "
-                            << spans.size() << " span(s) failed, exporter is shutdown");
-    return sdk::common::ExportResult::kFailure;
-  }
-  exporter::zipkin::ZipkinSpan json_spans = {};
-  for (auto &recordable : spans)
-  {
-    auto rec = std::unique_ptr<Recordable>(static_cast<Recordable *>(recordable.release()));
-    if (rec != nullptr)
-    {
-      auto json_span = rec->span();
-      // add localEndPoint
-      json_span["localEndpoint"] = local_end_point_;
-      // check service.name
-      auto service_name = rec->GetServiceName();
-      if (service_name.size())
-      {
-        json_span["localEndpoint"]["serviceName"] = service_name;
-      }
-      json_spans.push_back(json_span);
-    }
-  }
-  auto body_s = json_spans.dump();
-  http_client::Body body_v(body_s.begin(), body_s.end());
-  auto result = http_client_->PostNoSsl(url_parser_.url_, body_v, options_.headers);
-  if (result &&
-      (result.GetResponse().GetStatusCode() >= 200 && result.GetResponse().GetStatusCode() <= 299))
-  {
-    return sdk::common::ExportResult::kSuccess;
-  }
-  else
-  {
-    if (result.GetSessionState() == http_client::SessionState::ConnectFailed)
-    {
-      OTEL_INTERNAL_LOG_ERROR("ZIPKIN EXPORTER] Zipkin Exporter: Connection failed");
-    }
-    return sdk::common::ExportResult::kFailure;
-  }
-}
-
-void ZipkinExporter::InitializeLocalEndpoint()
-{
-  if (options_.service_name.length())
-  {
-    local_end_point_["serviceName"] = options_.service_name;
-  }
-  if (options_.ipv4.length())
-  {
-    local_end_point_["ipv4"] = options_.ipv4;
-  }
-  if (options_.ipv6.length())
-  {
-    local_end_point_["ipv6"] = options_.ipv6;
-  }
-  local_end_point_["port"] = url_parser_.port_;
-}
-
-bool ZipkinExporter::ForceFlush(std::chrono::microseconds /* timeout */) noexcept
-{
-  return true;
-}
-
-bool ZipkinExporter::Shutdown(std::chrono::microseconds /* timeout */) noexcept
-{
-  is_shutdown_ = true;
-  return true;
-}
-
-bool ZipkinExporter::isShutdown() const noexcept
-{
-  return is_shutdown_;
-}
-
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/zipkin_exporter_factory.cc b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/zipkin_exporter_factory.cc
deleted file mode 100644
index edacb7984..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/src/zipkin_exporter_factory.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/version.h"
-
-namespace http_client = opentelemetry::ext::http::client;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> ZipkinExporterFactory::Create()
-{
-  ZipkinExporterOptions options;
-  return Create(options);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> ZipkinExporterFactory::Create(
-    const ZipkinExporterOptions &options)
-{
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> exporter(new ZipkinExporter(options));
-  return exporter;
-}
-
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/test/zipkin_exporter_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/test/zipkin_exporter_test.cc
deleted file mode 100644
index 8e58f83d2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/test/zipkin_exporter_test.cc
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifndef OPENTELEMETRY_STL_VERSION
-
-#  include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
-#  include "opentelemetry/ext/http/client/curl/http_client_curl.h"
-#  include "opentelemetry/ext/http/server/http_server.h"
-#  include "opentelemetry/sdk/trace/batch_span_processor.h"
-#  include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#  include "opentelemetry/sdk/trace/tracer_provider.h"
-#  include "opentelemetry/trace/provider.h"
-
-#  include <gtest/gtest.h>
-#  include "gmock/gmock.h"
-
-#  include "nlohmann/json.hpp"
-
-#  include <string>
-#  include <utility>
-
-#  if defined(_MSC_VER)
-#    include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#  endif
-namespace sdk_common = opentelemetry::sdk::common;
-using namespace testing;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace exporter
-{
-namespace zipkin
-{
-
-namespace trace_api = opentelemetry::trace;
-namespace resource  = opentelemetry::sdk::resource;
-
-template <class T, size_t N>
-static nostd::span<T, N> MakeSpan(T (&array)[N])
-{
-  return nostd::span<T, N>(array);
-}
-
-class ZipkinExporterTestPeer : public ::testing::Test
-{
-public:
-  std::unique_ptr<sdk::trace::SpanExporter> GetExporter(
-      std::shared_ptr<opentelemetry::ext::http::client::HttpClientSync> http_client)
-  {
-    return std::unique_ptr<sdk::trace::SpanExporter>(new ZipkinExporter(std::move(http_client)));
-  }
-
-  // Get the options associated with the given exporter.
-  const ZipkinExporterOptions &GetOptions(std::unique_ptr<ZipkinExporter> &exporter)
-  {
-    return exporter->options_;
-  }
-};
-
-class MockHttpClient : public opentelemetry::ext::http::client::HttpClientSync
-{
-public:
-  MOCK_METHOD(ext::http::client::Result,
-              Post,
-              (const nostd::string_view &,
-               const ext::http::client::HttpSslOptions &,
-               const ext::http::client::Body &,
-               const ext::http::client::Headers &,
-               const ext::http::client::Compression &),
-              (noexcept, override));
-
-  MOCK_METHOD(ext::http::client::Result,
-              Get,
-              (const nostd::string_view &,
-               const ext::http::client::HttpSslOptions &,
-               const ext::http::client::Headers &,
-               const ext::http::client::Compression &),
-              (noexcept, override));
-};
-
-class IsValidMessageMatcher
-{
-public:
-  IsValidMessageMatcher(const std::string &trace_id) : trace_id_(trace_id) {}
-  template <typename T>
-  bool MatchAndExplain(const T &p, MatchResultListener * /* listener */) const
-  {
-    auto body                 = std::string(p.begin(), p.end());
-    nlohmann::json check_json = nlohmann::json::parse(body);
-    auto trace_id_kv          = check_json.at(0).find("traceId");
-    auto received_trace_id    = trace_id_kv.value().get<std::string>();
-    return trace_id_ == received_trace_id;
-  }
-
-  void DescribeTo(std::ostream *os) const { *os << "received trace_id matches"; }
-
-  void DescribeNegationTo(std::ostream *os) const { *os << "received trace_id does not matche"; }
-
-private:
-  std::string trace_id_;
-};
-
-PolymorphicMatcher<IsValidMessageMatcher> IsValidMessage(const std::string &trace_id)
-{
-  return MakePolymorphicMatcher(IsValidMessageMatcher(trace_id));
-}
-
-// Create spans, let processor call Export()
-TEST_F(ZipkinExporterTestPeer, ExportJsonIntegrationTest)
-{
-  auto mock_http_client = new MockHttpClient;
-  // Leave a comment line here or different version of clang-format has a different result here
-  auto exporter = GetExporter(
-      std::shared_ptr<opentelemetry::ext::http::client::HttpClientSync>{mock_http_client});
-
-  resource::ResourceAttributes resource_attributes = {{"service.name", "unit_test_service"},
-                                                      {"tenant.id", "test_user"}};
-  resource_attributes["bool_value"]                = true;
-  resource_attributes["int32_value"]               = static_cast<int32_t>(1);
-  resource_attributes["uint32_value"]              = static_cast<uint32_t>(2);
-  resource_attributes["int64_value"]               = static_cast<int64_t>(0x1100000000LL);
-  resource_attributes["uint64_value"]              = static_cast<uint64_t>(0x1200000000ULL);
-  resource_attributes["double_value"]              = static_cast<double>(3.1);
-  resource_attributes["vec_bool_value"]            = std::vector<bool>{true, false, true};
-  resource_attributes["vec_int32_value"]           = std::vector<int32_t>{1, 2};
-  resource_attributes["vec_uint32_value"]          = std::vector<uint32_t>{3, 4};
-  resource_attributes["vec_int64_value"]           = std::vector<int64_t>{5, 6};
-  resource_attributes["vec_uint64_value"]          = std::vector<uint64_t>{7, 8};
-  resource_attributes["vec_double_value"]          = std::vector<double>{3.2, 3.3};
-  resource_attributes["vec_string_value"]          = std::vector<std::string>{"vector", "string"};
-  auto resource = resource::Resource::Create(resource_attributes);
-
-  auto processor_opts                  = sdk::trace::BatchSpanProcessorOptions();
-  processor_opts.max_export_batch_size = 5;
-  processor_opts.max_queue_size        = 5;
-  processor_opts.schedule_delay_millis = std::chrono::milliseconds(256);
-  auto processor                       = std::unique_ptr<sdk::trace::SpanProcessor>(
-      new sdk::trace::BatchSpanProcessor(std::move(exporter), processor_opts));
-  auto provider = nostd::shared_ptr<trace::TracerProvider>(
-      new sdk::trace::TracerProvider(std::move(processor), resource));
-
-  std::string report_trace_id;
-  char trace_id_hex[2 * trace_api::TraceId::kSize] = {0};
-  auto tracer                                      = provider->GetTracer("test");
-  auto parent_span                                 = tracer->StartSpan("Test parent span");
-
-  trace_api::StartSpanOptions child_span_opts = {};
-  child_span_opts.parent                      = parent_span->GetContext();
-  auto child_span = tracer->StartSpan("Test child span", child_span_opts);
-
-  nostd::get<trace_api::SpanContext>(child_span_opts.parent)
-      .trace_id()
-      .ToLowerBase16(MakeSpan(trace_id_hex));
-  report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex));
-
-  auto expected_url = nostd::string_view{"http://localhost:9411/api/v2/spans"};
-
-  EXPECT_CALL(*mock_http_client, Post(expected_url, _, IsValidMessage(report_trace_id), _, _))
-
-      .Times(Exactly(1))
-      .WillOnce(Return(ByMove(ext::http::client::Result{
-          std::unique_ptr<ext::http::client::Response>{new ext::http::client::curl::Response()},
-          ext::http::client::SessionState::Response})));
-
-  child_span->End();
-  parent_span->End();
-}
-
-// Create spans, let processor call Export()
-TEST_F(ZipkinExporterTestPeer, ShutdownTest)
-{
-  auto mock_http_client = new MockHttpClient;
-  // Leave a comment line here or different version of clang-format has a different result here
-  auto exporter = GetExporter(
-      std::shared_ptr<opentelemetry::ext::http::client::HttpClientSync>{mock_http_client});
-  auto recordable_1 = exporter->MakeRecordable();
-  recordable_1->SetName("Test span 1");
-  auto recordable_2 = exporter->MakeRecordable();
-  recordable_2->SetName("Test span 2");
-
-  // exporter should not be shutdown by default
-  nostd::span<std::unique_ptr<sdk::trace::Recordable>> batch_1(&recordable_1, 1);
-
-  EXPECT_CALL(*mock_http_client, Post(_, _, _, _, _))
-
-      .Times(Exactly(1))
-      .WillOnce(Return(ByMove(ext::http::client::Result{
-          std::unique_ptr<ext::http::client::Response>{new ext::http::client::curl::Response()},
-          ext::http::client::SessionState::Response})));
-  auto result = exporter->Export(batch_1);
-  EXPECT_EQ(sdk_common::ExportResult::kSuccess, result);
-
-  exporter->Shutdown();
-
-  nostd::span<std::unique_ptr<sdk::trace::Recordable>> batch_2(&recordable_2, 1);
-  result = exporter->Export(batch_2);
-  EXPECT_EQ(sdk_common::ExportResult::kFailure, result);
-}
-
-// Test exporter configuration options
-TEST_F(ZipkinExporterTestPeer, ConfigTest)
-{
-  ZipkinExporterOptions opts;
-  opts.endpoint = "http://localhost:45455/v1/traces";
-  std::unique_ptr<ZipkinExporter> exporter(new ZipkinExporter(opts));
-  EXPECT_EQ(GetOptions(exporter).endpoint, "http://localhost:45455/v1/traces");
-}
-
-#  ifndef NO_GETENV
-// Test exporter configuration options from env
-TEST_F(ZipkinExporterTestPeer, ConfigFromEnv)
-{
-  const std::string endpoint = "http://localhost:9999/v1/traces";
-  setenv("OTEL_EXPORTER_ZIPKIN_ENDPOINT", endpoint.c_str(), 1);
-
-  std::unique_ptr<ZipkinExporter> exporter(new ZipkinExporter());
-  EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
-
-  unsetenv("OTEL_EXPORTER_ZIPKIN_ENDPOINT");
-}
-
-#  endif  // NO_GETENV
-
-}  // namespace zipkin
-}  // namespace exporter
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_STL_VERSION */
diff --git a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/test/zipkin_recordable_test.cc b/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/test/zipkin_recordable_test.cc
deleted file mode 100644
index 532fcc2a0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/exporters/zipkin/test/zipkin_recordable_test.cc
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <array>
-#include <chrono>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <nlohmann/json.hpp>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/exporters/zipkin/recordable.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-
-#if defined(__GNUC__)
-// GCC raises -Wsuggest-override warnings on GTest,
-// in code related to TYPED_TEST() .
-#  pragma GCC diagnostic ignored "-Wsuggest-override"
-#endif
-
-namespace trace    = opentelemetry::trace;
-namespace nostd    = opentelemetry::nostd;
-namespace sdktrace = opentelemetry::sdk::trace;
-namespace common   = opentelemetry::common;
-namespace zipkin   = opentelemetry::exporter::zipkin;
-using json         = nlohmann::json;
-
-// Testing Shutdown functionality of OStreamSpanExporter, should expect no data to be sent to Stream
-TEST(ZipkinSpanRecordable, SetIdentity)
-{
-  json j_span = {{"id", "0000000000000002"},
-                 {"parentId", "0000000000000003"},
-                 {"traceId", "00000000000000000000000000000001"}};
-  zipkin::Recordable rec;
-  const trace::TraceId trace_id(std::array<const uint8_t, trace::TraceId::kSize>(
-      {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}));
-
-  const trace::SpanId span_id(
-      std::array<const uint8_t, trace::SpanId::kSize>({0, 0, 0, 0, 0, 0, 0, 2}));
-
-  const trace::SpanId parent_span_id(
-      std::array<const uint8_t, trace::SpanId::kSize>({0, 0, 0, 0, 0, 0, 0, 3}));
-
-  const trace::SpanContext span_context{trace_id, span_id,
-                                        trace::TraceFlags{trace::TraceFlags::kIsSampled}, true};
-
-  rec.SetIdentity(span_context, parent_span_id);
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-// according to https://zipkin.io/zipkin-api/#/ in case root span is created
-// the parentId filed should be absent.
-TEST(ZipkinSpanRecordable, SetIdentityEmptyParent)
-{
-  json j_span = {{"id", "0000000000000002"}, {"traceId", "00000000000000000000000000000001"}};
-  zipkin::Recordable rec;
-  const trace::TraceId trace_id(std::array<const uint8_t, trace::TraceId::kSize>(
-      {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}));
-
-  const trace::SpanId span_id(
-      std::array<const uint8_t, trace::SpanId::kSize>({0, 0, 0, 0, 0, 0, 0, 2}));
-
-  const trace::SpanId parent_span_id(
-      std::array<const uint8_t, trace::SpanId::kSize>({0, 0, 0, 0, 0, 0, 0, 0}));
-
-  const trace::SpanContext span_context{trace_id, span_id,
-                                        trace::TraceFlags{trace::TraceFlags::kIsSampled}, true};
-
-  rec.SetIdentity(span_context, parent_span_id);
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-TEST(ZipkinSpanRecordable, SetName)
-{
-  nostd::string_view name = "Test Span";
-  json j_span             = {{"name", name}};
-  zipkin::Recordable rec;
-  rec.SetName(name);
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-TEST(ZipkinSpanRecordable, SetStartTime)
-{
-  zipkin::Recordable rec;
-  std::chrono::system_clock::time_point start_time = std::chrono::system_clock::now();
-  common::SystemTimestamp start_timestamp(start_time);
-
-  uint64_t unix_start =
-      std::chrono::duration_cast<std::chrono::microseconds>(start_time.time_since_epoch()).count();
-  json j_span = {{"timestamp", unix_start}};
-  rec.SetStartTime(start_timestamp);
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-TEST(ZipkinSpanRecordable, SetDuration)
-{
-  std::chrono::nanoseconds durationNS(1000000000);  // in ns
-  std::chrono::microseconds durationMS =
-      std::chrono::duration_cast<std::chrono::microseconds>(durationNS);  // in ms
-  json j_span = {{"duration", durationMS.count()}, {"timestamp", 0}};
-  zipkin::Recordable rec;
-  // Start time is 0
-  common::SystemTimestamp start_timestamp;
-
-  rec.SetStartTime(start_timestamp);
-  rec.SetDuration(durationNS);
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-TEST(ZipkinSpanRecordable, SetInstrumentationScope)
-{
-  using InstrumentationScope = opentelemetry::sdk::instrumentationscope::InstrumentationScope;
-
-  const char *library_name    = "otel-cpp";
-  const char *library_version = "0.5.0";
-  json j_span                 = {
-      {"tags", {{"otel.library.name", library_name}, {"otel.library.version", library_version}}}};
-  zipkin::Recordable rec;
-
-  rec.SetInstrumentationScope(*InstrumentationScope::Create(library_name, library_version));
-
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-TEST(ZipkinSpanRecordable, SetStatus)
-{
-  std::string description                     = "Error description";
-  std::vector<trace::StatusCode> status_codes = {trace::StatusCode::kError, trace::StatusCode::kOk};
-  for (auto &status_code : status_codes)
-  {
-    zipkin::Recordable rec;
-    trace::StatusCode code(status_code);
-    json j_span;
-    if (status_code == trace::StatusCode::kError)
-      j_span = {{"tags", {{"otel.status_code", status_code}, {"error", description}}}};
-    else
-      j_span = {{"tags", {{"otel.status_code", status_code}}}};
-
-    rec.SetStatus(code, description);
-    EXPECT_EQ(rec.span(), j_span);
-  }
-}
-
-TEST(ZipkinSpanRecordable, SetSpanKind)
-{
-  json j_json_client = {{"kind", "CLIENT"}};
-  zipkin::Recordable rec;
-  rec.SetSpanKind(trace::SpanKind::kClient);
-  EXPECT_EQ(rec.span(), j_json_client);
-}
-
-TEST(ZipkinSpanRecordable, AddEventDefault)
-{
-  zipkin::Recordable rec;
-  nostd::string_view name = "Test Event";
-
-  std::chrono::system_clock::time_point event_time = std::chrono::system_clock::now();
-  common::SystemTimestamp event_timestamp(event_time);
-
-  rec.sdktrace::Recordable::AddEvent(name, event_timestamp);
-
-  uint64_t unix_event_time =
-      std::chrono::duration_cast<std::chrono::microseconds>(event_time.time_since_epoch()).count();
-
-  json j_span = {
-      {"annotations",
-       {{{"value", json({{name, json::object()}}).dump()}, {"timestamp", unix_event_time}}}}};
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-TEST(ZipkinSpanRecordable, AddEventWithAttributes)
-{
-  zipkin::Recordable rec;
-
-  std::chrono::system_clock::time_point event_time = std::chrono::system_clock::now();
-  common::SystemTimestamp event_timestamp(event_time);
-  uint64_t unix_event_time =
-      std::chrono::duration_cast<std::chrono::microseconds>(event_time.time_since_epoch()).count();
-
-  const int kNumAttributes              = 3;
-  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3"};
-  int values[kNumAttributes]            = {4, 7, 23};
-  std::map<std::string, int> attributes = {
-      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
-
-  rec.AddEvent("Test Event", event_timestamp,
-               common::KeyValueIterableView<std::map<std::string, int>>(attributes));
-
-  nlohmann::json j_span = {
-      {"annotations",
-       {{{"value", json({{"Test Event", {{"attr1", 4}, {"attr2", 7}, {"attr3", 23}}}}).dump()},
-         {"timestamp", unix_event_time}}}}};
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-// Test non-int single types. Int single types are tested using templates (see IntAttributeTest)
-TEST(ZipkinSpanRecordable, SetSingleAtrribute)
-{
-  zipkin::Recordable rec;
-  nostd::string_view bool_key = "bool_attr";
-  common::AttributeValue bool_val(true);
-  rec.SetAttribute(bool_key, bool_val);
-
-  nostd::string_view double_key = "double_attr";
-  common::AttributeValue double_val(3.3);
-  rec.SetAttribute(double_key, double_val);
-
-  nostd::string_view str_key = "str_attr";
-  common::AttributeValue str_val(nostd::string_view("Test"));
-  rec.SetAttribute(str_key, str_val);
-  nlohmann::json j_span = {
-      {"tags", {{"bool_attr", true}, {"double_attr", 3.3}, {"str_attr", "Test"}}}};
-
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-// Test non-int array types. Int array types are tested using templates (see IntAttributeTest)
-TEST(ZipkinSpanRecordable, SetArrayAtrribute)
-{
-  zipkin::Recordable rec;
-  nlohmann::json j_span = {{"tags",
-                            {{"bool_arr_attr", {true, false, true}},
-                             {"double_arr_attr", {22.3, 33.4, 44.5}},
-                             {"str_arr_attr", {"Hello", "World", "Test"}}}}};
-  const int kArraySize  = 3;
-
-  bool bool_arr[kArraySize] = {true, false, true};
-  nostd::span<const bool> bool_span(bool_arr);
-  rec.SetAttribute("bool_arr_attr", bool_span);
-
-  double double_arr[kArraySize] = {22.3, 33.4, 44.5};
-  nostd::span<const double> double_span(double_arr);
-  rec.SetAttribute("double_arr_attr", double_span);
-
-  nostd::string_view str_arr[kArraySize] = {"Hello", "World", "Test"};
-  nostd::span<const nostd::string_view> str_span(str_arr);
-  rec.SetAttribute("str_arr_attr", str_span);
-
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-TEST(ZipkinSpanRecordable, SetResource)
-{
-  zipkin::Recordable rec;
-  std::string service_name = "test";
-  auto resource = opentelemetry::sdk::resource::Resource::Create({{"service.name", service_name}});
-  rec.SetResource(resource);
-  EXPECT_EQ(rec.GetServiceName(), service_name);
-}
-
-/**
- * AttributeValue can contain different int types, such as int, int64_t,
- * unsigned int, and uint64_t. To avoid writing test cases for each, we can
- * use a template approach to test all int types.
- */
-template <typename T>
-struct ZipkinIntAttributeTest : public testing::Test
-{
-  using IntParamType = T;
-};
-
-using IntTypes = testing::Types<int, int64_t, unsigned int, uint64_t>;
-TYPED_TEST_SUITE(ZipkinIntAttributeTest, IntTypes);
-
-TYPED_TEST(ZipkinIntAttributeTest, SetIntSingleAttribute)
-{
-  using IntType = typename TestFixture::IntParamType;
-  IntType i     = 2;
-  common::AttributeValue int_val(i);
-
-  zipkin::Recordable rec;
-  rec.SetAttribute("int_attr", int_val);
-  nlohmann::json j_span = {{"tags", {{"int_attr", 2}}}};
-  EXPECT_EQ(rec.span(), j_span);
-}
-
-TYPED_TEST(ZipkinIntAttributeTest, SetIntArrayAttribute)
-{
-  using IntType = typename TestFixture::IntParamType;
-
-  const int kArraySize        = 3;
-  IntType int_arr[kArraySize] = {4, 5, 6};
-  nostd::span<const IntType> int_span(int_arr);
-
-  zipkin::Recordable rec;
-  rec.SetAttribute("int_arr_attr", int_span);
-  nlohmann::json j_span = {{"tags", {{"int_arr_attr", {4, 5, 6}}}}};
-  EXPECT_EQ(rec.span(), j_span);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/BUILD b/ext/opentelemetry-cpp-1.21.0/ext/BUILD
deleted file mode 100644
index b19ae921e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "headers",
-    hdrs = glob(["include/**/*.h"]),
-    strip_include_prefix = "include",
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/ext/CMakeLists.txt
deleted file mode 100644
index 511087856..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_ext INTERFACE)
-target_include_directories(
-  opentelemetry_ext
-  INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-            "$<INSTALL_INTERFACE:include>")
-
-set_target_properties(opentelemetry_ext PROPERTIES EXPORT_NAME "ext")
-target_link_libraries(opentelemetry_ext INTERFACE opentelemetry_api)
-
-otel_add_component(
-  COMPONENT
-  ext_common
-  TARGETS
-  opentelemetry_ext
-  FILES_DIRECTORY
-  "include/opentelemetry/ext"
-  FILES_DESTINATION
-  "include/opentelemetry/"
-  FILES_MATCHING
-  PATTERN
-  "*.h")
-
-add_subdirectory(src)
-
-if(BUILD_TESTING)
-  add_subdirectory(test)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h b/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h
deleted file mode 100644
index 77bd6bf89..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/curl/http_client_curl.h
+++ /dev/null
@@ -1,383 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <curl/curl.h>
-#include <atomic>
-#include <chrono>
-#include <cstddef>
-#include <cstdint>
-#include <deque>
-#include <list>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <thread>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-
-#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-namespace curl
-{
-
-const opentelemetry::ext::http::client::StatusCode Http_Ok = 200;
-
-class HttpCurlGlobalInitializer
-{
-private:
-  HttpCurlGlobalInitializer(const HttpCurlGlobalInitializer &) = delete;
-  HttpCurlGlobalInitializer(HttpCurlGlobalInitializer &&)      = delete;
-
-  HttpCurlGlobalInitializer &operator=(const HttpCurlGlobalInitializer &) = delete;
-
-  HttpCurlGlobalInitializer &operator=(HttpCurlGlobalInitializer &&) = delete;
-
-  HttpCurlGlobalInitializer();
-
-public:
-  ~HttpCurlGlobalInitializer();
-
-  static nostd::shared_ptr<HttpCurlGlobalInitializer> GetInstance();
-};
-
-class Request : public opentelemetry::ext::http::client::Request
-{
-public:
-  Request() : method_(opentelemetry::ext::http::client::Method::Get), uri_("/") {}
-
-  void SetMethod(opentelemetry::ext::http::client::Method method) noexcept override
-  {
-    method_ = method;
-  }
-
-  void SetSslOptions(const HttpSslOptions &ssl_options) noexcept override
-  {
-    ssl_options_ = ssl_options;
-  }
-
-  void SetBody(opentelemetry::ext::http::client::Body &body) noexcept override
-  {
-    body_ = std::move(body);
-  }
-
-  void AddHeader(nostd::string_view name, nostd::string_view value) noexcept override
-  {
-    headers_.insert(std::pair<std::string, std::string>(static_cast<std::string>(name),
-                                                        static_cast<std::string>(value)));
-  }
-
-  void ReplaceHeader(nostd::string_view name, nostd::string_view value) noexcept override
-  {
-    // erase matching headers
-    auto range = headers_.equal_range(static_cast<std::string>(name));
-    headers_.erase(range.first, range.second);
-    AddHeader(name, value);
-  }
-
-  void SetUri(nostd::string_view uri) noexcept override { uri_ = static_cast<std::string>(uri); }
-
-  void SetTimeoutMs(std::chrono::milliseconds timeout_ms) noexcept override
-  {
-    timeout_ms_ = timeout_ms;
-  }
-
-  void SetCompression(
-      const opentelemetry::ext::http::client::Compression &compression) noexcept override
-  {
-    compression_ = compression;
-  }
-
-  void EnableLogging(bool is_log_enabled) noexcept override { is_log_enabled_ = is_log_enabled; }
-
-  void SetRetryPolicy(
-      const opentelemetry::ext::http::client::RetryPolicy &retry_policy) noexcept override
-  {
-    retry_policy_ = retry_policy;
-  }
-
-public:
-  opentelemetry::ext::http::client::Method method_;
-  opentelemetry::ext::http::client::HttpSslOptions ssl_options_;
-  opentelemetry::ext::http::client::Body body_;
-  opentelemetry::ext::http::client::Headers headers_;
-  std::string uri_;
-  std::chrono::milliseconds timeout_ms_{5000};  // ms
-  opentelemetry::ext::http::client::Compression compression_{
-      opentelemetry::ext::http::client::Compression::kNone};
-  bool is_log_enabled_{false};
-  opentelemetry::ext::http::client::RetryPolicy retry_policy_;
-};
-
-class Response : public opentelemetry::ext::http::client::Response
-{
-public:
-  Response() : status_code_(Http_Ok) {}
-
-  const opentelemetry::ext::http::client::Body &GetBody() const noexcept override { return body_; }
-
-  bool ForEachHeader(nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)>
-                         callable) const noexcept override
-  {
-    for (const auto &header : headers_)
-    {
-      if (!callable(header.first, header.second))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  bool ForEachHeader(const nostd::string_view &name,
-                     nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)>
-                         callable) const noexcept override
-  {
-    auto range = headers_.equal_range(static_cast<std::string>(name));
-    for (auto it = range.first; it != range.second; ++it)
-    {
-      if (!callable(it->first, it->second))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  opentelemetry::ext::http::client::StatusCode GetStatusCode() const noexcept override
-  {
-    return status_code_;
-  }
-
-public:
-  Headers headers_;
-  opentelemetry::ext::http::client::Body body_;
-  opentelemetry::ext::http::client::StatusCode status_code_;
-};
-
-class HttpClient;
-
-class Session : public opentelemetry::ext::http::client::Session,
-                public std::enable_shared_from_this<Session>
-{
-public:
-  Session(HttpClient &http_client,
-          const std::string &scheme = "http",
-          const std::string &host   = "",
-          uint16_t port             = 80)
-      : host_{scheme + "://" + host + ":" + std::to_string(port) + "/"}, http_client_(http_client)
-  {}
-
-  std::shared_ptr<opentelemetry::ext::http::client::Request> CreateRequest() noexcept override
-  {
-    http_request_.reset(new Request());
-    return http_request_;
-  }
-
-  void SendRequest(
-      std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) noexcept override;
-
-  bool CancelSession() noexcept override;
-
-  bool FinishSession() noexcept override;
-
-  bool IsSessionActive() noexcept override
-  {
-    return is_session_active_.load(std::memory_order_acquire);
-  }
-
-  void SetId(uint64_t session_id) { session_id_ = session_id; }
-
-  /**
-   * Returns the base URI.
-   * @return the base URI as a string consisting of scheme, host and port.
-   */
-  const std::string &GetBaseUri() const { return host_; }
-
-  std::shared_ptr<Request> GetRequest() { return http_request_; }
-
-  inline HttpClient &GetHttpClient() noexcept { return http_client_; }
-  inline const HttpClient &GetHttpClient() const noexcept { return http_client_; }
-
-  inline uint64_t GetSessionId() const noexcept { return session_id_; }
-
-  inline const std::unique_ptr<HttpOperation> &GetOperation() const noexcept
-  {
-    return curl_operation_;
-  }
-  inline std::unique_ptr<HttpOperation> &GetOperation() noexcept { return curl_operation_; }
-
-  /**
-   * Finish and cleanup the operation.It will remove curl easy handle in it from HttpClient
-   */
-  void FinishOperation();
-
-private:
-  std::shared_ptr<Request> http_request_;
-  std::string host_;
-  std::unique_ptr<HttpOperation> curl_operation_;
-  uint64_t session_id_ = 0UL;
-  HttpClient &http_client_;
-  std::atomic<bool> is_session_active_{false};
-};
-
-class HttpClientSync : public opentelemetry::ext::http::client::HttpClientSync
-{
-public:
-  HttpClientSync() : curl_global_initializer_(HttpCurlGlobalInitializer::GetInstance()) {}
-
-  opentelemetry::ext::http::client::Result Get(
-      const nostd::string_view &url,
-      const opentelemetry::ext::http::client::HttpSslOptions &ssl_options,
-      const opentelemetry::ext::http::client::Headers &headers,
-      const opentelemetry::ext::http::client::Compression &compression) noexcept override
-  {
-    opentelemetry::ext::http::client::Body body;
-
-    HttpOperation curl_operation(opentelemetry::ext::http::client::Method::Get, url.data(),
-                                 ssl_options, nullptr, headers, body, compression);
-
-    curl_operation.SendSync();
-    auto session_state = curl_operation.GetSessionState();
-    if (curl_operation.WasAborted())
-    {
-      session_state = opentelemetry::ext::http::client::SessionState::Cancelled;
-    }
-    auto response = std::unique_ptr<Response>(new Response());
-    if (curl_operation.GetResponseCode() >= CURL_LAST)
-    {
-      // we have a http response
-
-      response->headers_     = curl_operation.GetResponseHeaders();
-      response->body_        = curl_operation.GetResponseBody();
-      response->status_code_ = curl_operation.GetResponseCode();
-    }
-    return opentelemetry::ext::http::client::Result(std::move(response), session_state);
-  }
-
-  opentelemetry::ext::http::client::Result Post(
-      const nostd::string_view &url,
-      const opentelemetry::ext::http::client::HttpSslOptions &ssl_options,
-      const Body &body,
-      const opentelemetry::ext::http::client::Headers &headers,
-      const opentelemetry::ext::http::client::Compression &compression) noexcept override
-  {
-    HttpOperation curl_operation(opentelemetry::ext::http::client::Method::Post, url.data(),
-                                 ssl_options, nullptr, headers, body, compression);
-    curl_operation.SendSync();
-    auto session_state = curl_operation.GetSessionState();
-    if (curl_operation.WasAborted())
-    {
-      session_state = opentelemetry::ext::http::client::SessionState::Cancelled;
-    }
-    auto response = std::unique_ptr<Response>(new Response());
-    if (curl_operation.GetResponseCode() >= CURL_LAST)
-    {
-      // we have a http response
-
-      response->headers_     = curl_operation.GetResponseHeaders();
-      response->body_        = curl_operation.GetResponseBody();
-      response->status_code_ = curl_operation.GetResponseCode();
-    }
-
-    return opentelemetry::ext::http::client::Result(std::move(response), session_state);
-  }
-
-public:
-  ~HttpClientSync() override {}
-
-private:
-  nostd::shared_ptr<HttpCurlGlobalInitializer> curl_global_initializer_;
-};
-
-class HttpClient : public opentelemetry::ext::http::client::HttpClient
-{
-public:
-  // The call (curl_global_init) is not thread safe. Ensure this is called only once.
-  HttpClient();
-  HttpClient(const std::shared_ptr<sdk::common::ThreadInstrumentation> &thread_instrumentation);
-  ~HttpClient() override;
-
-  std::shared_ptr<opentelemetry::ext::http::client::Session> CreateSession(
-      nostd::string_view url) noexcept override;
-
-  bool CancelAllSessions() noexcept override;
-
-  bool FinishAllSessions() noexcept override;
-
-  void SetMaxSessionsPerConnection(std::size_t max_requests_per_connection) noexcept override;
-
-  inline uint64_t GetMaxSessionsPerConnection() const noexcept
-  {
-    return max_sessions_per_connection_;
-  }
-
-  void CleanupSession(uint64_t session_id);
-
-  inline CURLM *GetMultiHandle() noexcept { return multi_handle_; }
-
-  // return true if create background thread, false is already exist background thread
-  bool MaybeSpawnBackgroundThread();
-
-  void ScheduleAddSession(uint64_t session_id);
-  void ScheduleAbortSession(uint64_t session_id);
-  void ScheduleRemoveSession(uint64_t session_id, HttpCurlEasyResource &&resource);
-
-  void SetBackgroundWaitFor(std::chrono::milliseconds ms);
-
-  void WaitBackgroundThreadExit();
-
-private:
-  void wakeupBackgroundThread();
-  bool doAddSessions();
-  bool doAbortSessions();
-  bool doRemoveSessions();
-  bool doRetrySessions(bool report_all);
-  void resetMultiHandle();
-
-  std::mutex multi_handle_m_;
-  CURLM *multi_handle_;
-  std::atomic<uint64_t> next_session_id_{0};
-  uint64_t max_sessions_per_connection_;
-
-  std::mutex sessions_m_;
-  std::recursive_mutex session_ids_m_;
-  std::unordered_map<uint64_t, std::shared_ptr<Session>> sessions_;
-  std::unordered_set<uint64_t> pending_to_add_session_ids_;
-  std::unordered_map<uint64_t, std::shared_ptr<Session>> pending_to_abort_sessions_;
-  std::unordered_map<uint64_t, HttpCurlEasyResource> pending_to_remove_session_handles_;
-  std::list<std::shared_ptr<Session>> pending_to_remove_sessions_;
-  std::deque<std::shared_ptr<Session>> pending_to_retry_sessions_;
-
-  std::mutex background_thread_m_;
-  std::unique_ptr<std::thread> background_thread_;
-  std::shared_ptr<sdk::common::ThreadInstrumentation> background_thread_instrumentation_;
-  std::chrono::milliseconds scheduled_delay_milliseconds_;
-
-  std::chrono::milliseconds background_thread_wait_for_;
-  std::atomic<bool> is_shutdown_{false};
-
-  nostd::shared_ptr<HttpCurlGlobalInitializer> curl_global_initializer_;
-};
-
-}  // namespace curl
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h b/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
deleted file mode 100644
index 2c3565177..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/version.h"
-
-#if defined(_MSC_VER)
-#  pragma warning(suppress : 5204)
-#  include <future>
-#else
-#  include <future>
-#endif
-
-#include <cstdint>
-#include <functional>
-#include <map>
-#include <regex>
-#include <sstream>
-#include <string>
-#include <thread>
-#include <vector>
-#ifdef _WIN32
-#  include <io.h>
-#  include <winsock2.h>
-#else
-#  include <poll.h>
-#  include <unistd.h>
-#endif
-#include "curl/curl.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-namespace curl
-{
-const std::chrono::milliseconds kDefaultHttpConnTimeout(5000);  // ms
-const std::string kHttpStatusRegexp = "HTTP\\/\\d\\.\\d (\\d+)\\ .*";
-const std::string kHttpHeaderRegexp = "(.*)\\: (.*)\\n*";
-
-class HttpClient;
-class Session;
-
-struct HttpCurlEasyResource
-{
-  CURL *easy_handle;
-  curl_slist *headers_chunk;
-
-  HttpCurlEasyResource(CURL *curl = nullptr, curl_slist *headers = nullptr)
-      : easy_handle{curl}, headers_chunk{headers}
-  {}
-
-  HttpCurlEasyResource(HttpCurlEasyResource &&other)
-      : easy_handle{other.easy_handle}, headers_chunk{other.headers_chunk}
-  {
-    other.easy_handle   = nullptr;
-    other.headers_chunk = nullptr;
-  }
-
-  HttpCurlEasyResource &operator=(HttpCurlEasyResource &&other)
-  {
-    using std::swap;
-    swap(easy_handle, other.easy_handle);
-    swap(headers_chunk, other.headers_chunk);
-
-    return *this;
-  }
-
-  HttpCurlEasyResource(const HttpCurlEasyResource &other)            = delete;
-  HttpCurlEasyResource &operator=(const HttpCurlEasyResource &other) = delete;
-};
-
-class HttpOperation
-{
-private:
-  /**
-   * Old-school memory allocator
-   *
-   * @param contents
-   * @param size
-   * @param nmemb
-   * @param userp
-   * @return
-   */
-  static size_t WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp);
-
-  /**
-   * C++ STL std::vector allocator
-   *
-   * @param ptr
-   * @param size
-   * @param nmemb
-   * @param data
-   * @return
-   */
-  static size_t WriteVectorHeaderCallback(void *ptr, size_t size, size_t nmemb, void *userp);
-  static size_t WriteVectorBodyCallback(void *ptr, size_t size, size_t nmemb, void *userp);
-
-  static size_t ReadMemoryCallback(char *buffer, size_t size, size_t nitems, void *userp);
-
-  static int CurlLoggerCallback(const CURL * /* handle */,
-                                curl_infotype type,
-                                const char *data,
-                                size_t size,
-                                void * /* clientp */) noexcept;
-
-#if LIBCURL_VERSION_NUM >= 0x075000
-  static int PreRequestCallback(void *clientp,
-                                char *conn_primary_ip,
-                                char *conn_local_ip,
-                                int conn_primary_port,
-                                int conn_local_port);
-#endif
-
-#if LIBCURL_VERSION_NUM >= 0x072000
-  static int OnProgressCallback(void *clientp,
-                                curl_off_t dltotal,
-                                curl_off_t dlnow,
-                                curl_off_t ultotal,
-                                curl_off_t ulnow);
-#else
-  static int OnProgressCallback(void *clientp,
-                                double dltotal,
-                                double dlnow,
-                                double ultotal,
-                                double ulnow);
-#endif
-public:
-  void DispatchEvent(opentelemetry::ext::http::client::SessionState type,
-                     const std::string &reason = "");
-
-  /**
-   * Create local CURL instance for url and body
-   * @param method   HTTP Method
-   * @param url   HTTP URL
-   * @param callback
-   * @param request_mode   Sync or async
-   * @param request   Request Headers
-   * @param body   Request Body
-   * @param raw_response   Whether to parse the response
-   * @param http_conn_timeout   HTTP connection timeout in seconds
-   * @param reuse_connection   Whether connection should be reused or closed
-   * @param is_log_enabled   To intercept some information from cURL request
-   * @param retry_policy   Retry policy for select failure status codes
-   */
-  HttpOperation(opentelemetry::ext::http::client::Method method,
-                std::string url,
-                const opentelemetry::ext::http::client::HttpSslOptions &ssl_options,
-                opentelemetry::ext::http::client::EventHandler *event_handle,
-                // Default empty headers and empty request body
-                const opentelemetry::ext::http::client::Headers &request_headers =
-                    opentelemetry::ext::http::client::Headers(),
-                const opentelemetry::ext::http::client::Body &request_body =
-                    opentelemetry::ext::http::client::Body(),
-                const opentelemetry::ext::http::client::Compression &compression =
-                    opentelemetry::ext::http::client::Compression::kNone,
-                // Default connectivity and response size options
-                bool is_raw_response                        = false,
-                std::chrono::milliseconds http_conn_timeout = kDefaultHttpConnTimeout,
-                bool reuse_connection                       = false,
-                bool is_log_enabled                         = false,
-                const opentelemetry::ext::http::client::RetryPolicy &retry_policy = {});
-
-  /**
-   * Destroy CURL instance
-   */
-  virtual ~HttpOperation();
-
-  /**
-   * Finish CURL instance
-   */
-  virtual void Finish();
-
-  /**
-   * Cleanup all resource of curl
-   */
-  void Cleanup();
-
-  /**
-   * Determine if operation is retryable
-   */
-  bool IsRetryable();
-
-  /**
-   * Calculate next time to retry request
-   */
-  std::chrono::system_clock::time_point NextRetryTime();
-
-  /**
-   * Setup request
-   */
-  CURLcode Setup();
-
-  /**
-   * Send request synchronously
-   */
-  CURLcode Send();
-
-  /**
-   * Send request asynchronously
-   * @param session This operator must be binded to a Session
-   * @param callback callback when start async request success and got response
-   */
-  CURLcode SendAsync(Session *session, std::function<void(HttpOperation &)> callback = nullptr);
-
-  inline void SendSync() { Send(); }
-
-  /**
-   * Get HTTP response code. This function returns 0.
-   */
-  inline StatusCode GetResponseCode() const noexcept
-  {
-    return static_cast<StatusCode>(response_code_);
-  }
-
-  CURLcode GetLastResultCode() { return last_curl_result_; }
-
-  /**
-   * Get last session state.
-   */
-  opentelemetry::ext::http::client::SessionState GetSessionState() { return session_state_; }
-
-  /**
-   * Get whether or not response was programmatically aborted
-   */
-  bool WasAborted() { return is_aborted_.load(std::memory_order_acquire); }
-
-  /**
-   * Return a copy of response headers
-   *
-   * @return
-   */
-  Headers GetResponseHeaders();
-
-  /**
-   * Return a copy of response body
-   *
-   * @return
-   */
-  inline const std::vector<uint8_t> &GetResponseBody() const noexcept { return response_body_; }
-
-  /**
-   * Return a raw copy of response headers+body
-   *
-   * @return
-   */
-  inline const std::vector<uint8_t> &GetRawResponse() const noexcept { return raw_response_; }
-
-  /**
-   * Release memory allocated for response
-   */
-  void ReleaseResponse();
-
-  /**
-   * Abort request in connecting or reading state.
-   */
-  void Abort();
-
-  /**
-   * Perform curl message, this function only can be called in the polling thread and it can only
-   * be called when got a CURLMSG_DONE.
-   *
-   * @param code
-   */
-  void PerformCurlMessage(CURLcode code);
-
-  inline CURL *GetCurlEasyHandle() noexcept { return curl_resource_.easy_handle; }
-
-private:
-  CURLcode SetCurlPtrOption(CURLoption option, void *value);
-
-  CURLcode SetCurlStrOption(CURLoption option, const char *str)
-  {
-    void *ptr = const_cast<char *>(str);
-    return SetCurlPtrOption(option, ptr);
-  }
-
-  CURLcode SetCurlBlobOption(CURLoption option, struct curl_blob *blob)
-  {
-    return SetCurlPtrOption(option, blob);
-  }
-
-  CURLcode SetCurlListOption(CURLoption option, struct curl_slist *list)
-  {
-    return SetCurlPtrOption(option, list);
-  }
-
-  CURLcode SetCurlLongOption(CURLoption option, long value);
-
-  CURLcode SetCurlOffOption(CURLoption option, curl_off_t value);
-
-  const char *GetCurlErrorMessage(CURLcode code);
-
-  std::atomic<bool> is_aborted_{false};   // Set to 'true' when async callback is aborted
-  std::atomic<bool> is_finished_{false};  // Set to 'true' when async callback is finished.
-  std::atomic<bool> is_cleaned_{false};   // Set to 'true' when async callback is cleaned.
-  const bool is_raw_response_;            // Do not split response headers from response body
-  const bool reuse_connection_;           // Reuse connection
-  const std::chrono::milliseconds http_conn_timeout_;  // Timeout for connect.  Default: 5000ms
-
-  char curl_error_message_[CURL_ERROR_SIZE];
-  HttpCurlEasyResource curl_resource_;
-  CURLcode last_curl_result_;  // Curl result OR HTTP status code if successful
-
-  opentelemetry::ext::http::client::EventHandler *event_handle_;
-
-  // Request values
-  opentelemetry::ext::http::client::Method method_;
-  std::string url_;
-
-  const opentelemetry::ext::http::client::HttpSslOptions &ssl_options_;
-
-  const Headers &request_headers_;
-  const opentelemetry::ext::http::client::Body &request_body_;
-  size_t request_nwrite_;
-  opentelemetry::ext::http::client::SessionState session_state_;
-
-  const opentelemetry::ext::http::client::Compression &compression_;
-
-  const bool is_log_enabled_;
-
-  const RetryPolicy retry_policy_;
-  decltype(RetryPolicy::max_attempts) retry_attempts_;
-  std::chrono::system_clock::time_point last_attempt_time_;
-
-  // Processed response headers and body
-  long response_code_;
-  std::vector<uint8_t> response_headers_;
-  std::vector<uint8_t> response_body_;
-  std::vector<uint8_t> raw_response_;
-
-  struct AsyncData
-  {
-    Session *session;  // Owner Session
-
-    std::thread::id callback_thread;
-    std::function<void(HttpOperation &)> callback;
-    std::atomic<bool> is_promise_running{false};
-    std::promise<CURLcode> result_promise;
-    std::future<CURLcode> result_future;
-  };
-  std::unique_ptr<AsyncData> async_data_;
-};
-}  // namespace curl
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/http_client.h b/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/http_client.h
deleted file mode 100644
index 36f4e2d0a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/http_client.h
+++ /dev/null
@@ -1,421 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstring>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-/*
- Usage Example
-
-Sync Request:
-
-  HttpClient httpClient;
-  auto result = httpClient.Get(url); // GET request
-  if (result){
-    auto response = result.GetResponse();
-  } else {
-    std::cout << result.GetSessionState();
-  }
-
-Async Request:
-
- struct SimpleReponseHandler: public ResponseHandler {
-      void OnResponse(Response& res) noexcept override
-      {
-           if (res.IsSuccess()) {
-            res.GetNextHeader([](nostd::string_view name, std::string value) -> bool {
-                std::cout << "Header Name:" << name << " Header Value:"<< value ;
-                return true;
-            });
-            .. process response body
-           }
-      }
-
-      void OnError(nostd::string_view err) noexcept override
-      {
-          std::cerr << " Error:" << err;
-      }
-  };
-
-  HttpClient httpClient; // implementer can provide singleton implementation for it
-  auto session = httpClient.createSession("localhost" + 8000);
-  auto request = session->CreateRequest();
-  request->AddHeader(..);
-  SimpleResponseHandler res_handler;
-  session->SendRequest(res_handler);
-  session->FinishSession() // optionally in the end
-  ...shutdown
-  httpClient.FinishAllSessions()
-
-*/
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-
-enum class Method
-{
-  Get,
-  Post,
-  Put,
-  Options,
-  Head,
-  Patch,
-  Delete
-};
-
-enum class SessionState
-{
-  CreateFailed,        // session create failed
-  Created,             // session created
-  Destroyed,           // session destroyed
-  Connecting,          // connecting to peer
-  ConnectFailed,       // connection failed
-  Connected,           // connected
-  Sending,             // sending request
-  SendFailed,          // request send failed
-  Response,            // response received
-  SSLHandshakeFailed,  // SSL handshake failed
-  TimedOut,            // request time out
-  NetworkError,        // network error
-  ReadError,           // error reading response
-  WriteError,          // error writing request
-  Cancelled            // (manually) cancelled
-};
-
-enum class Compression
-{
-  kNone,
-  kGzip
-};
-
-using Byte       = uint8_t;
-using StatusCode = uint16_t;
-using Body       = std::vector<Byte>;
-
-struct cmp_ic
-{
-  bool operator()(const std::string &s1, const std::string &s2) const
-  {
-    return std::lexicographical_compare(
-        s1.begin(), s1.end(), s2.begin(), s2.end(),
-        [](char c1, char c2) { return ::tolower(c1) < ::tolower(c2); });
-  }
-};
-using Headers = std::multimap<std::string, std::string, cmp_ic>;
-
-struct HttpSslOptions
-{
-  HttpSslOptions() {}
-
-  HttpSslOptions(nostd::string_view url,
-                 bool input_ssl_insecure_skip_verify,
-                 nostd::string_view input_ssl_ca_cert_path,
-                 nostd::string_view input_ssl_ca_cert_string,
-                 nostd::string_view input_ssl_client_key_path,
-                 nostd::string_view input_ssl_client_key_string,
-                 nostd::string_view input_ssl_client_cert_path,
-                 nostd::string_view input_ssl_client_cert_string,
-                 nostd::string_view input_ssl_min_tls,
-                 nostd::string_view input_ssl_max_tls,
-                 nostd::string_view input_ssl_cipher,
-                 nostd::string_view input_ssl_cipher_suite)
-      : use_ssl(false),
-        ssl_insecure_skip_verify(input_ssl_insecure_skip_verify),
-        ssl_ca_cert_path(input_ssl_ca_cert_path),
-        ssl_ca_cert_string(input_ssl_ca_cert_string),
-        ssl_client_key_path(input_ssl_client_key_path),
-        ssl_client_key_string(input_ssl_client_key_string),
-        ssl_client_cert_path(input_ssl_client_cert_path),
-        ssl_client_cert_string(input_ssl_client_cert_string),
-        ssl_min_tls(input_ssl_min_tls),
-        ssl_max_tls(input_ssl_max_tls),
-        ssl_cipher(input_ssl_cipher),
-        ssl_cipher_suite(input_ssl_cipher_suite)
-  {
-    /* Use SSL if url starts with "https:" */
-    if (strncmp(url.data(), "https:", 6) == 0)
-    {
-      use_ssl = true;
-    }
-  }
-
-  /**
-    Use HTTPS (true) or HTTP (false).
-  */
-  bool use_ssl{false};
-  /**
-    Skip SSL/TLS verifications.
-    Setting this flag to true is insecure.
-  */
-  bool ssl_insecure_skip_verify{false};
-  /**
-    Path to the CA CERT file.
-  */
-  std::string ssl_ca_cert_path{};
-  /**
-    CA CERT.
-    Used only if @p ssl_ca_cert_path is empty.
-  */
-  std::string ssl_ca_cert_string{};
-  /**
-    Path to the client key file.
-  */
-  std::string ssl_client_key_path{};
-  /**
-    Client key.
-    Used only if @p ssl_client_key_path is empty.
-  */
-  std::string ssl_client_key_string{};
-  /**
-    Path to the client cert file.
-  */
-  std::string ssl_client_cert_path{};
-  /**
-    Client cert.
-    Used only if @p ssl_client_cert_path is empty.
-  */
-  std::string ssl_client_cert_string{};
-
-  /**
-    Minimum SSL version to use.
-    Valid values are:
-    - empty (defaults to TLSv1.2)
-    - "1.2" (TLSv1.2)
-    - "1.3" (TLSv1.3)
-  */
-  std::string ssl_min_tls{};
-
-  /**
-    Maximum SSL version to use.
-    Valid values are:
-    - empty (no maximum version required)
-    - "1.2" (TLSv1.2)
-    - "1.3" (TLSv1.3)
-  */
-  std::string ssl_max_tls{};
-
-  /**
-    TLS Cipher.
-    This is for TLS 1.2.
-    The list is delimited by colons (":").
-    Cipher names depends on the underlying CURL implementation.
-  */
-  std::string ssl_cipher{};
-
-  /**
-    TLS Cipher suite.
-    This is for TLS 1.3.
-    The list is delimited by colons (":").
-    Cipher names depends on the underlying CURL implementation.
-  */
-  std::string ssl_cipher_suite{};
-};
-
-using SecondsDecimal = std::chrono::duration<float, std::ratio<1>>;
-
-struct RetryPolicy
-{
-  RetryPolicy() = default;
-
-  RetryPolicy(std::uint32_t input_max_attempts,
-              SecondsDecimal input_initial_backoff,
-              SecondsDecimal input_max_backoff,
-              float input_backoff_multiplier)
-      : max_attempts(input_max_attempts),
-        initial_backoff(input_initial_backoff),
-        max_backoff(input_max_backoff),
-        backoff_multiplier(input_backoff_multiplier)
-  {}
-
-  std::uint32_t max_attempts{};
-  SecondsDecimal initial_backoff{};
-  SecondsDecimal max_backoff{};
-  float backoff_multiplier{};
-};
-
-class Request
-{
-public:
-  virtual void SetMethod(Method method) noexcept = 0;
-
-  virtual void SetUri(nostd::string_view uri) noexcept = 0;
-
-  virtual void SetSslOptions(const HttpSslOptions &options) noexcept = 0;
-
-  virtual void SetBody(Body &body) noexcept = 0;
-
-  virtual void AddHeader(nostd::string_view name, nostd::string_view value) noexcept = 0;
-
-  virtual void ReplaceHeader(nostd::string_view name, nostd::string_view value) noexcept = 0;
-
-  virtual void SetTimeoutMs(std::chrono::milliseconds timeout_ms) noexcept = 0;
-
-  virtual void SetCompression(const Compression &compression) noexcept = 0;
-
-  virtual void EnableLogging(bool is_log_enabled) noexcept = 0;
-
-  virtual void SetRetryPolicy(const RetryPolicy &retry_policy) noexcept = 0;
-
-  virtual ~Request() = default;
-};
-
-class Response
-{
-public:
-  virtual const Body &GetBody() const noexcept = 0;
-
-  virtual bool ForEachHeader(
-      nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)> callable)
-      const noexcept = 0;
-
-  virtual bool ForEachHeader(
-      const nostd::string_view &key,
-      nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)> callable)
-      const noexcept = 0;
-
-  virtual StatusCode GetStatusCode() const noexcept = 0;
-
-  virtual ~Response() = default;
-};
-
-class NoopResponse : public Response
-{
-public:
-  const Body &GetBody() const noexcept override
-  {
-    static Body body;
-    return body;
-  }
-  bool ForEachHeader(nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)>
-                     /* callable */) const noexcept override
-  {
-    return true;
-  }
-
-  bool ForEachHeader(const nostd::string_view & /* key */,
-                     nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)>
-                     /* callable */) const noexcept override
-  {
-    return true;
-  }
-
-  StatusCode GetStatusCode() const noexcept override { return 0; }
-};
-
-class Result
-{
-
-public:
-  Result(std::unique_ptr<Response> res, SessionState session_state)
-      : response_(std::move(res)), session_state_(session_state)
-  {}
-  operator bool() const { return session_state_ == SessionState::Response; }
-  Response &GetResponse()
-  {
-    if (response_ == nullptr)
-    {
-      // let's not return nullptr
-      response_.reset(new NoopResponse());
-    }
-    return *response_;
-  }
-  SessionState GetSessionState() { return session_state_; }
-
-private:
-  std::unique_ptr<Response> response_;
-  SessionState session_state_;
-};
-
-class EventHandler
-{
-public:
-  virtual void OnResponse(Response &) noexcept = 0;
-
-  virtual void OnEvent(SessionState, nostd::string_view) noexcept = 0;
-
-  virtual ~EventHandler() = default;
-};
-
-class Session
-{
-public:
-  virtual std::shared_ptr<Request> CreateRequest() noexcept = 0;
-
-  virtual void SendRequest(std::shared_ptr<EventHandler>) noexcept = 0;
-
-  virtual bool IsSessionActive() noexcept = 0;
-
-  virtual bool CancelSession() noexcept = 0;
-
-  virtual bool FinishSession() noexcept = 0;
-
-  virtual ~Session() = default;
-};
-
-class HttpClient
-{
-public:
-  virtual std::shared_ptr<Session> CreateSession(nostd::string_view url) noexcept = 0;
-
-  virtual bool CancelAllSessions() noexcept = 0;
-
-  virtual bool FinishAllSessions() noexcept = 0;
-
-  virtual void SetMaxSessionsPerConnection(std::size_t max_requests_per_connection) noexcept = 0;
-
-  virtual ~HttpClient() = default;
-};
-
-class HttpClientSync
-{
-public:
-  Result GetNoSsl(const nostd::string_view &url,
-                  const Headers &headers         = {{}},
-                  const Compression &compression = Compression::kNone) noexcept
-  {
-    static const HttpSslOptions no_ssl;
-    return Get(url, no_ssl, headers, compression);
-  }
-
-  virtual Result PostNoSsl(const nostd::string_view &url,
-                           const Body &body,
-                           const Headers &headers         = {{"content-type", "application/json"}},
-                           const Compression &compression = Compression::kNone) noexcept
-  {
-    static const HttpSslOptions no_ssl;
-    return Post(url, no_ssl, body, headers, compression);
-  }
-
-  virtual Result Get(const nostd::string_view &url,
-                     const HttpSslOptions &ssl_options,
-                     const Headers                & = {{}},
-                     const Compression &compression = Compression::kNone) noexcept = 0;
-
-  virtual Result Post(const nostd::string_view &url,
-                      const HttpSslOptions &ssl_options,
-                      const Body &body,
-                      const Headers                & = {{"content-type", "application/json"}},
-                      const Compression &compression = Compression::kNone) noexcept = 0;
-
-  virtual ~HttpClientSync() = default;
-};
-
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/http_client_factory.h b/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/http_client_factory.h
deleted file mode 100644
index c1a326b7e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/client/http_client_factory.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-class HttpClientFactory
-{
-public:
-  static std::shared_ptr<HttpClientSync> CreateSync();
-
-  static std::shared_ptr<HttpClient> Create();
-  static std::shared_ptr<HttpClient> Create(
-      const std::shared_ptr<sdk::common::ThreadInstrumentation> &thread_instrumentation);
-};
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/common/url_parser.h b/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/common/url_parser.h
deleted file mode 100644
index c5fe156aa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/common/url_parser.h
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cerrno>
-#include <cstdint>
-#include <cstdlib>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace common
-{
-// http://user:password@host:port/path1/path2?key1=val2&key2=val2
-// http://host:port/path1/path2?key1=val1&key2=val2
-// host:port/path1
-// host:port ( path defaults to "/")
-// host:port?
-
-class UrlParser
-{
-public:
-  std::string url_;
-  std::string host_;
-  std::string scheme_;
-  std::string path_;
-  uint16_t port_;
-  std::string query_;
-  bool success_;
-
-  UrlParser(std::string url) : url_(std::move(url)), success_(true)
-  {
-    if (url_.length() == 0)
-    {
-      return;
-    }
-    size_t cpos = 0;
-    // scheme
-    size_t pos = url_.find("://", cpos);
-    if (pos == std::string::npos)
-    {
-      // scheme missing, use default as http
-      scheme_ = "http";
-    }
-    else
-    {
-      scheme_ = url_.substr(cpos, pos - cpos);
-      cpos    = pos + 3;
-    }
-
-    // credentials
-    size_t pos1 = url_.find_first_of('@', cpos);
-    if (pos1 != std::string::npos)
-    {
-      size_t pos2 = url_.find_first_of('/', cpos);
-      // TODO - handle credentials
-      if (pos2 == std::string::npos || pos1 < pos2)
-      {
-        pos  = pos1;
-        cpos = pos1 + 1;
-      }
-    }
-    pos          = FindPortPosition(url_, cpos);
-    bool is_port = false;
-    if (pos == std::string::npos)
-    {
-      // port missing. Used default 80 / 443
-      if (scheme_ == "http")
-      {
-        port_ = 80;
-      }
-      else if (scheme_ == "https")
-      {
-        port_ = 443;
-      }
-    }
-    else
-    {
-      // port present
-      is_port = true;
-      host_   = url_.substr(cpos, pos - cpos);
-      cpos    = pos + 1;
-    }
-    pos = url_.find_first_of("/?", cpos);
-    if (pos == std::string::npos)
-    {
-      path_ = std::string("/");  // use default path
-      if (is_port)
-      {
-        auto port_str = url_.substr(cpos);
-        port_         = GetPort(port_str);
-      }
-      else
-      {
-        host_ = url_.substr(cpos);
-      }
-      return;
-    }
-    if (is_port)
-    {
-      auto port_str = url_.substr(cpos, pos - cpos);
-      port_         = GetPort(port_str);
-    }
-    else
-    {
-      host_ = url_.substr(cpos, pos - cpos);
-    }
-    cpos = pos;
-
-    if (url_[cpos] == '/')
-    {
-      pos = url_.find('?', cpos);
-      if (pos == std::string::npos)
-      {
-        path_ = url_.substr(cpos);
-      }
-      else
-      {
-        path_  = url_.substr(cpos, pos - cpos);
-        cpos   = pos + 1;
-        query_ = url_.substr(cpos);
-      }
-      return;
-    }
-    path_ = std::string("/");
-    if (url_[cpos] == '?')
-    {
-      query_ = url_.substr(cpos);
-    }
-  }
-
-private:
-  static std::string::size_type FindPortPosition(const std::string &url,
-                                                 std::string::size_type offset)
-  {
-    // @see https://www.rfc-editor.org/rfc/rfc3986#page-18
-    size_t sub_expression_counter = 0;
-    for (std::string::size_type i = offset; i < url.size(); ++i)
-    {
-      char c = url[i];
-      if (0 == sub_expression_counter && c == ':')
-      {
-        return i;
-      }
-
-      if (c == '[')
-      {
-        ++sub_expression_counter;
-      }
-      else if (c == ']')
-      {
-        if (sub_expression_counter > 0)
-        {
-          --sub_expression_counter;
-        }
-      }
-      else if (0 == sub_expression_counter && c == '/')
-      {
-        break;
-      }
-    }
-
-    return std::string::npos;
-  }
-
-  std::uint16_t GetPort(const std::string &s)
-  {
-    char *e   = nullptr;
-    errno     = 0;
-    auto port = std::strtol(s.c_str(), &e, 10);
-    if (e == s.c_str() || e != s.c_str() + s.size() || errno == ERANGE || port < 0 || port > 65535)
-    {
-      success_ = false;
-      return 0;
-    }
-
-    return static_cast<uint16_t>(port);
-  }
-};
-
-class UrlDecoder
-{
-public:
-  static std::string Decode(const std::string &encoded)
-  {
-    std::string result;
-    result.reserve(encoded.size());
-
-    auto hex_to_int = [](int ch) -> int {
-      if (ch >= '0' && ch <= '9')
-        return ch - '0';
-      if (ch >= 'a' && ch <= 'f')
-        return ch - 'a' + 10;
-      if (ch >= 'A' && ch <= 'F')
-        return ch - 'A' + 10;
-      return -1;
-    };
-
-    for (size_t pos = 0; pos < encoded.size(); pos++)
-    {
-      auto c = encoded[pos];
-      if (c == '%')
-      {
-        if (pos + 2 >= encoded.size())
-        {
-          return encoded;
-        }
-
-        int hi = hex_to_int(encoded[pos + 1]);
-        int lo = hex_to_int(encoded[pos + 2]);
-
-        if (hi == -1 || lo == -1)
-        {
-          return encoded;
-        }
-
-        c = static_cast<char>((hi << 4) | lo);
-        pos += 2;
-      }
-
-      result.push_back(c);
-    }
-
-    return result;
-  }
-};
-
-}  // namespace common
-
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/file_http_server.h b/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/file_http_server.h
deleted file mode 100644
index cb28d01fa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/file_http_server.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "opentelemetry/ext/http/server/http_server.h"
-
-namespace HTTP_SERVER_NS
-{
-
-class FileHttpServer : public HTTP_SERVER_NS::HttpServer
-{
-protected:
-  /**
-   * Construct the server by initializing the endpoint for serving static files,
-   * which show up on the web if the user is on the given host:port. Static
-   * files can be seen relative to the folder where the executable was ran.
-   */
-  FileHttpServer(const std::string &host = "127.0.0.1", int port = 3333) : HttpServer()
-  {
-    std::ostringstream os;
-    os << host << ":" << port;
-    setServerName(os.str());
-    addListeningPort(port);
-  };
-
-  /**
-   * Set the HTTP server to serve static files from the root of host:port.
-   * Derived HTTP servers should initialize the file endpoint AFTER they
-   * initialize their own, otherwise everything will be served like a file
-   * @param server should be an instance of this object
-   */
-  void InitializeFileEndpoint(FileHttpServer &server) { server[root_endpt_] = ServeFile; }
-
-private:
-  /**
-   * Return whether a file is found whose location is searched for relative to
-   * where the executable was triggered. If the file is valid, fill result with
-   * the file data/information required to display it on a webpage
-   * @param name of the file to look for,
-   * @param resulting file information, necessary for displaying them on a
-   * webpage
-   * @returns whether a file was found and result filled with display
-   * information
-   */
-  bool FileGetSuccess(const std::string &filename, std::vector<char> &result)
-  {
-#ifdef _WIN32
-    std::replace(filename.begin(), filename.end(), '/', '\\');
-#endif
-    std::streampos size;
-    std::ifstream file(filename, std::ios::in | std::ios::binary | std::ios::ate);
-    if (file.is_open())
-    {
-      size = file.tellg();
-      if (size)
-      {
-        result.resize(size);
-        file.seekg(0, std::ios::beg);
-        file.read(result.data(), size);
-      }
-      file.close();
-      return true;
-    }
-    return false;
-  };
-
-  /**
-   * Returns the extension of a file
-   * @param name of the file
-   * @returns file extension type under HTTP protocol
-   */
-  std::string GetMimeContentType(const std::string &filename)
-  {
-    std::string file_ext = filename.substr(filename.find_last_of(".") + 1);
-    auto file_type       = mime_types_.find(file_ext);
-    return (file_type != mime_types_.end()) ? file_type->second : HTTP_SERVER_NS::CONTENT_TYPE_TEXT;
-  };
-
-  /**
-   * Returns the standardized name of a file by removing backslashes, and
-   * assuming index.html is the wanted file if a directory is given
-   * @param name of the file
-   */
-  std::string GetFileName(std::string name)
-  {
-    if (name.back() == '/')
-    {
-      auto temp = name.substr(0, name.size() - 1);
-      name      = temp;
-    }
-    // If filename appears to be a directory, serve the hypothetical index.html
-    // file there
-    if (name.find(".") == std::string::npos)
-      name += "/index.html";
-
-    return name;
-  }
-
-  /**
-   * Sets the response object with the correct file data based on the requested
-   * file address, or return 404 error if a file isn't found
-   * @param req is the HTTP request, which we use to figure out the response to
-   * send
-   * @param resp is the HTTP response we want to send to the frontend, including
-   * file data
-   */
-  HTTP_SERVER_NS::HttpRequestCallback ServeFile{
-      [&](HTTP_SERVER_NS::HttpRequest const &req, HTTP_SERVER_NS::HttpResponse &resp) {
-        LOG_INFO("File: %s\n", req.uri.c_str());
-        auto f        = GetFileName(req.uri);
-        auto filename = f.c_str() + 1;
-
-        std::vector<char> content;
-        if (FileGetSuccess(filename, content))
-        {
-          resp.headers[HTTP_SERVER_NS::CONTENT_TYPE] = GetMimeContentType(filename);
-          resp.body                                  = std::string(content.data(), content.size());
-          resp.code                                  = 200;
-          resp.message = HTTP_SERVER_NS::HttpServer::getDefaultResponseMessage(resp.code);
-          return resp.code;
-        }
-        // Two additional 'special' return codes possible here:
-        // 0    - proceed to next handler
-        // -1   - immediately terminate and close connection
-        resp.headers[HTTP_SERVER_NS::CONTENT_TYPE] = HTTP_SERVER_NS::CONTENT_TYPE_TEXT;
-        resp.code                                  = 404;
-        resp.message = HTTP_SERVER_NS::HttpServer::getDefaultResponseMessage(resp.code);
-        resp.body    = resp.message;
-        return 404;
-      }};
-
-  // Maps file extensions to their HTTP-compatible mime file type
-  const std::unordered_map<std::string, std::string> mime_types_ = {
-      {"css", "text/css"},   {"png", "image/png"},  {"js", "text/javascript"},
-      {"htm", "text/html"},  {"html", "text/html"}, {"json", "application/json"},
-      {"txt", "text/plain"}, {"jpg", "image/jpeg"}, {"jpeg", "image/jpeg"},
-  };
-  const std::string root_endpt_ = "/";
-};
-
-}  // namespace HTTP_SERVER_NS
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/http_server.h b/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/http_server.h
deleted file mode 100644
index 0b3028275..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/http_server.h
+++ /dev/null
@@ -1,889 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <functional>
-#include <list>
-#include <map>
-
-#include "socket_tools.h"
-
-#ifdef HAVE_HTTP_DEBUG
-#  ifdef LOG_TRACE
-#    undef LOG_TRACE
-#    define LOG_TRACE(x, ...) printf(x "\n", __VA_ARGS__)
-#  endif
-#endif
-
-#ifndef HTTP_SERVER_NS
-#  define HTTP_SERVER_NS testing
-#endif
-
-namespace HTTP_SERVER_NS
-{
-
-constexpr const char *CONTENT_TYPE      = "Content-Type";
-constexpr const char *CONTENT_TYPE_TEXT = "text/plain";
-constexpr const char *CONTENT_TYPE_BIN  = "application/octet-stream";
-
-struct HttpRequest
-{
-  std::string client;
-  std::string method;
-  std::string uri;
-  std::string protocol;
-  std::map<std::string, std::string> headers;
-  std::string content;
-};
-
-struct HttpResponse
-{
-  int code;
-  std::string message;
-  std::map<std::string, std::string> headers;
-  std::string body;
-};
-
-using CallbackFunction = std::function<int(HttpRequest const &request, HttpResponse &response)>;
-
-class HttpRequestCallback
-{
-protected:
-  CallbackFunction callback = nullptr;
-
-public:
-  HttpRequestCallback() {}
-  virtual ~HttpRequestCallback() = default;
-
-  HttpRequestCallback &operator=(HttpRequestCallback other)
-  {
-    callback = other.callback;
-    return *this;
-  }
-
-  HttpRequestCallback(CallbackFunction func) : callback(func) {}
-
-  HttpRequestCallback &operator=(CallbackFunction func)
-  {
-    callback = func;
-    return (*this);
-  }
-
-  virtual int onHttpRequest(HttpRequest const &request, HttpResponse &response)
-  {
-    if (callback != nullptr)
-    {
-      return callback(request, response);
-    }
-    return 0;
-  }
-};
-
-// Simple HTTP server
-// Goals:
-//   - Support enough of HTTP to be used as a mock
-//   - Be flexible to allow creating various test scenarios
-// Out of scope:
-//   - Performance
-//   - Full support of RFC 7230-7237
-class HttpServer : private SocketTools::Reactor::SocketCallback
-{
-protected:
-  struct Connection
-  {
-    SocketTools::Socket socket;
-    std::string receiveBuffer;
-    std::string sendBuffer;
-    enum
-    {
-      Idle,
-      ReceivingHeaders,
-      Sending100Continue,
-      ReceivingBody,
-      Processing,
-      SendingHeaders,
-      SendingBody,
-      Closing
-    } state;
-    size_t contentLength;
-    bool keepalive;
-    HttpRequest request;
-    HttpResponse response;
-  };
-
-  std::string m_serverHost;
-  bool allowKeepalive{true};
-  SocketTools::Reactor m_reactor;
-  std::list<SocketTools::Socket> m_listeningSockets;
-
-  class HttpRequestHandler : public std::pair<std::string, HttpRequestCallback *>
-  {
-  public:
-    HttpRequestHandler(const std::string &key, HttpRequestCallback *value)
-    {
-      first  = key;
-      second = value;
-    }
-
-    HttpRequestHandler() : std::pair<std::string, HttpRequestCallback *>()
-    {
-      first  = "";
-      second = nullptr;
-    }
-
-    HttpRequestHandler &operator=(std::pair<std::string, HttpRequestCallback *> other)
-    {
-      first  = other.first;
-      second = other.second;
-      return (*this);
-    }
-
-    HttpRequestHandler &operator=(HttpRequestCallback &cb)
-    {
-      second = &cb;
-      return (*this);
-    }
-
-    HttpRequestHandler &operator=(HttpRequestCallback *cb)
-    {
-      second = cb;
-      return (*this);
-    }
-  };
-
-  std::list<HttpRequestHandler> m_handlers;
-
-  std::map<SocketTools::Socket, Connection> m_connections;
-  size_t m_maxRequestHeadersSize, m_maxRequestContentSize;
-
-public:
-  void setKeepalive(bool keepAlive) { allowKeepalive = keepAlive; }
-
-  HttpServer()
-      : m_serverHost("unnamed"),
-        allowKeepalive(true),
-        m_reactor(*this),
-        m_maxRequestHeadersSize(8192),
-        m_maxRequestContentSize(2 * 1024 * 1024)
-  {}
-
-  HttpServer(const std::string &serverHost, int port = 30000) : HttpServer()
-  {
-    std::ostringstream os;
-    os << serverHost << ":" << port;
-    setServerName(os.str());
-    addListeningPort(port);
-  }
-
-  ~HttpServer() override
-  {
-    for (auto &sock : m_listeningSockets)
-    {
-      sock.close();
-    }
-  }
-
-  void setRequestLimits(size_t maxRequestHeadersSize, size_t maxRequestContentSize)
-  {
-    m_maxRequestHeadersSize = maxRequestHeadersSize;
-    m_maxRequestContentSize = maxRequestContentSize;
-  }
-
-  void setServerName(std::string const &name) { m_serverHost = name; }
-
-  int addListeningPort(int port)
-  {
-    SocketTools::Socket socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    socket.setNonBlocking();
-    socket.setReuseAddr();
-
-    SocketTools::SocketAddr addr(0, port);
-    socket.bind(addr);
-    socket.getsockname(addr);
-
-    socket.listen(10);
-    m_listeningSockets.push_back(socket);
-    m_reactor.addSocket(socket, SocketTools::Reactor::Acceptable);
-    LOG_INFO("HttpServer: Listening on %s", addr.toString().c_str());
-
-    return addr.port();
-  }
-
-  HttpRequestHandler &addHandler(const std::string &root, HttpRequestCallback &handler)
-  {
-    // No thread-safety here!
-    m_handlers.push_back({root, &handler});
-    LOG_INFO("HttpServer: Added handler for %s", root.c_str());
-    return m_handlers.back();
-  }
-
-  HttpRequestHandler &operator[](const std::string &root)
-  {
-    // No thread-safety here!
-    m_handlers.push_back({root, nullptr});
-    LOG_INFO("HttpServer: Added handler for %s", root.c_str());
-    return m_handlers.back();
-  }
-
-  HttpServer &operator+=(std::pair<const std::string &, HttpRequestCallback &> other)
-  {
-    LOG_INFO("HttpServer: Added handler for %s", other.first.c_str());
-    m_handlers.push_back(HttpRequestHandler(other.first, &other.second));
-    return (*this);
-  }
-
-  void start() { m_reactor.start(); }
-
-  void stop() { m_reactor.stop(); }
-
-protected:
-  virtual void onSocketAcceptable(SocketTools::Socket socket) override
-  {
-    LOG_TRACE("HttpServer: accepting socket fd=0x%llx", socket.m_sock);
-    assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) !=
-           m_listeningSockets.end());
-
-    SocketTools::Socket csocket;
-    SocketTools::SocketAddr caddr;
-    if (socket.accept(csocket, caddr))
-    {
-      csocket.setNonBlocking();
-      Connection &conn    = m_connections[csocket];
-      conn.socket         = csocket;
-      conn.state          = Connection::Idle;
-      conn.request.client = caddr.toString();
-      m_reactor.addSocket(csocket, SocketTools::Reactor::Readable | SocketTools::Reactor::Closed);
-      LOG_TRACE("HttpServer: [%s] accepted", conn.request.client.c_str());
-    }
-  }
-
-  virtual void onSocketReadable(SocketTools::Socket socket) override
-  {
-    LOG_TRACE("HttpServer: reading socket fd=0x%llx", socket.m_sock);
-    // No thread-safety here!
-    assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) ==
-           m_listeningSockets.end());
-
-    // No thread-safety here!
-    auto connIt = m_connections.find(socket);
-    if (connIt == m_connections.end())
-    {
-      return;
-    }
-    Connection &conn = connIt->second;
-
-    char buffer[2048] = {0};
-    int received      = socket.recv(buffer, sizeof(buffer));
-    LOG_TRACE("HttpServer: [%s] received %d", conn.request.client.c_str(), received);
-    if (received <= 0)
-    {
-      handleConnectionClosed(conn);
-      return;
-    }
-    conn.receiveBuffer.append(buffer, buffer + received);
-
-    handleConnection(conn);
-  }
-
-  virtual void onSocketWritable(SocketTools::Socket socket) override
-  {
-    LOG_TRACE("HttpServer: writing socket fd=0x%llx", socket.m_sock);
-
-    // No thread-safety here!
-    assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) ==
-           m_listeningSockets.end());
-
-    // No thread-safety here!
-    auto connIt = m_connections.find(socket);
-    if (connIt == m_connections.end())
-    {
-      return;
-    }
-    Connection &conn = connIt->second;
-
-    if (!sendMore(conn))
-    {
-      handleConnection(conn);
-    }
-  }
-
-  virtual void onSocketClosed(SocketTools::Socket socket) override
-  {
-    LOG_TRACE("HttpServer: closing socket fd=0x%llx", socket.m_sock);
-    assert(std::find(m_listeningSockets.begin(), m_listeningSockets.end(), socket) ==
-           m_listeningSockets.end());
-
-    auto connIt = m_connections.find(socket);
-    if (connIt == m_connections.end())
-    {
-      return;
-    }
-    Connection &conn = connIt->second;
-
-    handleConnectionClosed(conn);
-  }
-
-  bool sendMore(Connection &conn)
-  {
-    if (conn.sendBuffer.empty())
-    {
-      return false;
-    }
-
-    int sent = conn.socket.send(conn.sendBuffer.data(), static_cast<int>(conn.sendBuffer.size()));
-    LOG_TRACE("HttpServer: [%s] sent %d", conn.request.client.c_str(), sent);
-    if (sent < 0 && conn.socket.error() != SocketTools::Socket::ErrorWouldBlock)
-    {
-      return true;
-    }
-    conn.sendBuffer.erase(0, sent);
-
-    if (!conn.sendBuffer.empty())
-    {
-      m_reactor.addSocket(conn.socket,
-                          SocketTools::Reactor::Writable | SocketTools::Reactor::Closed);
-      return true;
-    }
-
-    return false;
-  }
-
-protected:
-  void handleConnectionClosed(Connection &conn)
-  {
-    LOG_TRACE("HttpServer: [%s] closed", conn.request.client.c_str());
-    if (conn.state != Connection::Idle && conn.state != Connection::Closing)
-    {
-      LOG_WARN("HttpServer: [%s] connection closed unexpectedly", conn.request.client.c_str());
-    }
-    m_reactor.removeSocket(conn.socket);
-    auto connIt = m_connections.find(conn.socket);
-    conn.socket.close();
-    m_connections.erase(connIt);
-  }
-
-  void handleConnection(Connection &conn)
-  {
-    for (;;)
-    {
-      if (conn.state == Connection::Idle)
-      {
-        conn.response.code = 0;
-        conn.state         = Connection::ReceivingHeaders;
-        LOG_TRACE("HttpServer: [%s] receiving headers", conn.request.client.c_str());
-      }
-
-      if (conn.state == Connection::ReceivingHeaders)
-      {
-        bool lfOnly = false;
-        size_t ofs  = conn.receiveBuffer.find("\r\n\r\n");
-        if (ofs == std::string::npos)
-        {
-          lfOnly = true;
-          ofs    = conn.receiveBuffer.find("\n\n");
-        }
-        size_t headersLen = (ofs != std::string::npos) ? ofs : conn.receiveBuffer.length();
-        if (headersLen > m_maxRequestHeadersSize)
-        {
-          LOG_WARN("HttpServer: [%s] headers too long - %u", conn.request.client.c_str(),
-                   static_cast<unsigned>(headersLen));
-          conn.response.code = 431;  // Request Header Fields Too Large
-          conn.keepalive     = false;
-          conn.state         = Connection::Processing;
-          continue;
-        }
-        if (ofs == std::string::npos)
-        {
-          return;
-        }
-
-        if (!parseHeaders(conn))
-        {
-          LOG_WARN("HttpServer: [%s] invalid headers", conn.request.client.c_str());
-          conn.response.code = 400;  // Bad Request
-          conn.keepalive     = false;
-          conn.state         = Connection::Processing;
-          continue;
-        }
-        LOG_INFO("HttpServer: [%s] %s %s %s", conn.request.client.c_str(),
-                 conn.request.method.c_str(), conn.request.uri.c_str(),
-                 conn.request.protocol.c_str());
-        conn.receiveBuffer.erase(0, ofs + (lfOnly ? 2 : 4));
-
-        conn.keepalive        = (conn.request.protocol == "HTTP/1.1");
-        auto const connection = conn.request.headers.find("Connection");
-        if (connection != conn.request.headers.end())
-        {
-          if (equalsLowercased(connection->second, "keep-alive"))
-          {
-            conn.keepalive = true;
-          }
-          else if (equalsLowercased(connection->second, "close"))
-          {
-            conn.keepalive = false;
-          }
-        }
-
-        auto const contentLength = conn.request.headers.find("Content-Length");
-        if (contentLength != conn.request.headers.end())
-        {
-          conn.contentLength = atoi(contentLength->second.c_str());
-        }
-        else
-        {
-          conn.contentLength = 0;
-        }
-        if (conn.contentLength > m_maxRequestContentSize)
-        {
-          LOG_WARN("HttpServer: [%s] content too long - %u", conn.request.client.c_str(),
-                   static_cast<unsigned>(conn.contentLength));
-          conn.response.code = 413;  // Payload Too Large
-          conn.keepalive     = false;
-          conn.state         = Connection::Processing;
-          continue;
-        }
-
-        auto const expect = conn.request.headers.find("Expect");
-        if (expect != conn.request.headers.end() && conn.request.protocol == "HTTP/1.1")
-        {
-          if (!equalsLowercased(expect->second, "100-continue"))
-          {
-            LOG_WARN("HttpServer: [%s] unknown expectation - %s", conn.request.client.c_str(),
-                     expect->second.c_str());
-            conn.response.code = 417;  // Expectation Failed
-            conn.keepalive     = false;
-            conn.state         = Connection::Processing;
-            continue;
-          }
-          conn.sendBuffer = "HTTP/1.1 100 Continue\r\n\r\n";
-          conn.state      = Connection::Sending100Continue;
-          LOG_TRACE("HttpServer: [%s] sending \"100 Continue\"", conn.request.client.c_str());
-          continue;
-        }
-
-        conn.state = Connection::ReceivingBody;
-        LOG_TRACE("HttpServer: [%s] receiving body", conn.request.client.c_str());
-      }
-
-      if (conn.state == Connection::Sending100Continue)
-      {
-        if (sendMore(conn))
-        {
-          return;
-        }
-
-        conn.state = Connection::ReceivingBody;
-        LOG_TRACE("HttpServer: [%s] receiving body", conn.request.client.c_str());
-      }
-
-      if (conn.state == Connection::ReceivingBody)
-      {
-        if (conn.receiveBuffer.length() < conn.contentLength)
-        {
-          return;
-        }
-
-        if (conn.receiveBuffer.length() == conn.contentLength)
-        {
-          conn.request.content = std::move(conn.receiveBuffer);
-          conn.receiveBuffer.clear();
-        }
-        else
-        {
-          conn.request.content.assign(conn.receiveBuffer, 0, conn.contentLength);
-          conn.receiveBuffer.erase(0, conn.contentLength);
-        }
-
-        conn.state = Connection::Processing;
-        LOG_TRACE("HttpServer: [%s] processing request", conn.request.client.c_str());
-      }
-
-      if (conn.state == Connection::Processing)
-      {
-        processRequest(conn);
-
-        std::ostringstream os;
-        os << conn.request.protocol << ' ' << conn.response.code << ' ' << conn.response.message
-           << "\r\n";
-        for (auto const &header : conn.response.headers)
-        {
-          os << header.first << ": " << header.second << "\r\n";
-        }
-        os << "\r\n";
-
-        conn.sendBuffer = os.str();
-        conn.state      = Connection::SendingHeaders;
-        LOG_TRACE("HttpServer: [%s] sending headers", conn.request.client.c_str());
-      }
-
-      if (conn.state == Connection::SendingHeaders)
-      {
-        if (sendMore(conn))
-        {
-          return;
-        }
-
-        conn.sendBuffer = std::move(conn.response.body);
-        conn.state      = Connection::SendingBody;
-        LOG_TRACE("HttpServer: [%s] sending body", conn.request.client.c_str());
-      }
-
-      if (conn.state == Connection::SendingBody)
-      {
-        if (sendMore(conn))
-        {
-          return;
-        }
-
-        conn.keepalive &= allowKeepalive;
-
-        if (conn.keepalive)
-        {
-          m_reactor.addSocket(conn.socket,
-                              SocketTools::Reactor::Readable | SocketTools::Reactor::Closed);
-          conn.state = Connection::Idle;
-          LOG_TRACE("HttpServer: [%s] idle (keep-alive)", conn.request.client.c_str());
-          if (conn.receiveBuffer.empty())
-          {
-            return;
-          }
-        }
-        else
-        {
-          conn.socket.shutdown(SocketTools::Socket::ShutdownSend);
-          m_reactor.addSocket(conn.socket, SocketTools::Reactor::Closed);
-          conn.state = Connection::Closing;
-          LOG_TRACE("HttpServer: [%s] closing", conn.request.client.c_str());
-        }
-      }
-
-      if (conn.state == Connection::Closing)
-      {
-        return;
-      }
-    }
-  }
-
-  bool parseHeaders(Connection &conn)
-  {
-    // Method
-    char const *begin = conn.receiveBuffer.c_str();
-    char const *ptr   = begin;
-    while (*ptr && *ptr != ' ' && *ptr != '\r' && *ptr != '\n')
-    {
-      ptr++;
-    }
-    if (*ptr != ' ')
-    {
-      return false;
-    }
-    conn.request.method.assign(begin, ptr);
-    while (*ptr == ' ')
-    {
-      ptr++;
-    }
-
-    // URI
-    begin = ptr;
-    while (*ptr && *ptr != ' ' && *ptr != '\r' && *ptr != '\n')
-    {
-      ptr++;
-    }
-    if (*ptr != ' ')
-    {
-      return false;
-    }
-    conn.request.uri.assign(begin, ptr);
-    while (*ptr == ' ')
-    {
-      ptr++;
-    }
-
-    // Protocol
-    begin = ptr;
-    while (*ptr && *ptr != ' ' && *ptr != '\r' && *ptr != '\n')
-    {
-      ptr++;
-    }
-    if (*ptr != '\r' && *ptr != '\n')
-    {
-      return false;
-    }
-    conn.request.protocol.assign(begin, ptr);
-    if (*ptr == '\r')
-    {
-      ptr++;
-    }
-    if (*ptr != '\n')
-    {
-      return false;
-    }
-    ptr++;
-
-    // Headers
-    conn.request.headers.clear();
-    while (*ptr != '\r' && *ptr != '\n')
-    {
-      // Name
-      begin = ptr;
-      while (*ptr && *ptr != ':' && *ptr != ' ' && *ptr != '\r' && *ptr != '\n')
-      {
-        ptr++;
-      }
-      if (*ptr != ':')
-      {
-        return false;
-      }
-      std::string name = normalizeHeaderName(begin, ptr);
-      ptr++;
-      while (*ptr == ' ')
-      {
-        ptr++;
-      }
-
-      // Value
-      begin = ptr;
-      while (*ptr && *ptr != '\r' && *ptr != '\n')
-      {
-        ptr++;
-      }
-      if (!conn.request.headers[name].empty())
-      {
-        conn.request.headers[name] =
-            conn.request.headers[name].append(",").append(std::string(begin, ptr));
-      }
-      else
-      {
-        conn.request.headers[name] = std::string(begin, ptr);
-      }
-      if (*ptr == '\r')
-      {
-        ptr++;
-      }
-      if (*ptr != '\n')
-      {
-        return false;
-      }
-      ptr++;
-    }
-
-    if (*ptr == '\r')
-    {
-      ptr++;
-    }
-    if (*ptr != '\n')
-    {
-      return false;
-    }
-    ptr++;
-
-    return true;
-  }
-
-  static bool equalsLowercased(std::string const &str, char const *mask)
-  {
-    char const *ptr = str.c_str();
-    while (*ptr && *mask && ::tolower(*ptr) == *mask)
-    {
-      ptr++;
-      mask++;
-    }
-    return !*ptr && !*mask;
-  }
-
-  static std::string normalizeHeaderName(char const *begin, char const *end)
-  {
-    std::string result(begin, end);
-    bool first = true;
-    for (char &ch : result)
-    {
-      if (first)
-      {
-        ch    = static_cast<char>(::toupper(ch));
-        first = false;
-      }
-      else if (ch == '-')
-      {
-        first = true;
-      }
-      else
-      {
-        ch = static_cast<char>(::tolower(ch));
-      }
-    }
-    return result;
-  }
-
-  void processRequest(Connection &conn)
-  {
-    conn.response.message.clear();
-    conn.response.headers.clear();
-    conn.response.body.clear();
-
-    if (conn.response.code == 0)
-    {
-      conn.response.code = 404;  // Not Found
-      for (auto &handler : m_handlers)
-      {
-        if (conn.request.uri.length() >= handler.first.length() &&
-            strncmp(conn.request.uri.c_str(), handler.first.c_str(), handler.first.length()) == 0)
-        {
-          LOG_TRACE("HttpServer: [%s] using handler for %s", conn.request.client.c_str(),
-                    handler.first.c_str());
-          // auto callback = handler.second; // Bazel gets mad at this unused
-          // var, uncomment when using
-          int result = handler.second->onHttpRequest(conn.request, conn.response);
-          if (result != 0)
-          {
-            conn.response.code = result;
-            break;
-          }
-        }
-      }
-
-      if (conn.response.code == -1)
-      {
-        LOG_TRACE("HttpServer: [%s] closing by request", conn.request.client.c_str());
-        handleConnectionClosed(conn);
-      }
-    }
-
-    if (conn.response.message.empty())
-    {
-      conn.response.message = getDefaultResponseMessage(conn.response.code);
-    }
-
-    conn.response.headers["Host"]           = m_serverHost;
-    conn.response.headers["Connection"]     = (conn.keepalive ? "keep-alive" : "close");
-    conn.response.headers["Date"]           = formatTimestamp(time(nullptr));
-    conn.response.headers["Content-Length"] = std::to_string(conn.response.body.size());
-  }
-
-  static std::string formatTimestamp(time_t time)
-  {
-    tm tm;
-#ifdef _WIN32
-    gmtime_s(&tm, &time);
-#else
-    gmtime_r(&time, &tm);
-#endif
-    char buf[32];
-    strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S GMT", &tm);
-    return buf;
-  }
-
-public:
-  static char const *getDefaultResponseMessage(int code)
-  {
-    switch (code)
-    {
-      // *INDENT-OFF*
-      case 100:
-        return "Continue";
-      case 101:
-        return "Switching Protocols";
-      case 200:
-        return "OK";
-      case 201:
-        return "Created";
-      case 202:
-        return "Accepted";
-      case 203:
-        return "Non-Authoritative Information";
-      case 204:
-        return "No Content";
-      case 205:
-        return "Reset Content";
-      case 206:
-        return "Partial Content";
-      case 300:
-        return "Multiple Choices";
-      case 301:
-        return "Moved Permanently";
-      case 302:
-        return "Found";
-      case 303:
-        return "See Other";
-      case 304:
-        return "Not Modified";
-      case 305:
-        return "Use Proxy";
-      case 306:
-        return "Switch Proxy";
-      case 307:
-        return "Temporary Redirect";
-      case 308:
-        return "Permanent Redirect";
-      case 400:
-        return "Bad Request";
-      case 401:
-        return "Unauthorized";
-      case 402:
-        return "Payment Required";
-      case 403:
-        return "Forbidden";
-      case 404:
-        return "Not Found";
-      case 405:
-        return "Method Not Allowed";
-      case 406:
-        return "Not Acceptable";
-      case 407:
-        return "Proxy Authentication Required";
-      case 408:
-        return "Request Timeout";
-      case 409:
-        return "Conflict";
-      case 410:
-        return "Gone";
-      case 411:
-        return "Length Required";
-      case 412:
-        return "Precondition Failed";
-      case 413:
-        return "Payload Too Large";
-      case 414:
-        return "URI Too Long";
-      case 415:
-        return "Unsupported Media Type";
-      case 416:
-        return "Range Not Satisfiable";
-      case 417:
-        return "Expectation Failed";
-      case 421:
-        return "Misdirected Request";
-      case 426:
-        return "Upgrade Required";
-      case 428:
-        return "Precondition Required";
-      case 429:
-        return "Too Many Requests";
-      case 431:
-        return "Request Header Fields Too Large";
-      case 500:
-        return "Internal Server Error";
-      case 501:
-        return "Not Implemented";
-      case 502:
-        return "Bad Gateway";
-      case 503:
-        return "Service Unavailable";
-      case 504:
-        return "Gateway Timeout";
-      case 505:
-        return "HTTP Version Not Supported";
-      case 506:
-        return "Variant Also Negotiates";
-      case 510:
-        return "Not Extended";
-      case 511:
-        return "Network Authentication Required";
-      default:
-        return "???";
-        // *INDENT-ON*
-    }
-  }
-};
-
-}  // namespace HTTP_SERVER_NS
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/socket_tools.h b/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/socket_tools.h
deleted file mode 100644
index 317d08e84..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/include/opentelemetry/ext/http/server/socket_tools.h
+++ /dev/null
@@ -1,851 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-#pragma once
-
-#include <algorithm>
-#include <atomic>
-#include <cassert>
-#include <cstddef>
-#include <cstring>
-#include <iostream>
-#include <map>
-#include <sstream>
-#include <string>
-#include <thread>
-#include <vector>
-
-#ifdef _WIN32
-
-// #  include <Windows.h>
-
-#  include <winsock2.h>
-
-// TODO: consider NOMINMAX
-#  undef min
-#  undef max
-#  pragma comment(lib, "ws2_32.lib")
-
-#else
-
-#  include <unistd.h>
-
-#  ifdef __linux__
-#    include <sys/epoll.h>
-#  endif
-
-#  ifdef __APPLE__
-#    include "TargetConditionals.h"
-// Use kqueue on mac
-#    include <sys/event.h>
-#    include <sys/time.h>
-#    include <sys/types.h>
-#  endif
-
-// Common POSIX headers for Linux and Mac OS X
-#  include <arpa/inet.h>
-#  include <fcntl.h>
-#  include <netdb.h>
-#  include <netinet/in.h>
-#  include <netinet/tcp.h>
-#  include <sys/socket.h>
-
-#endif
-
-#ifndef _Out_cap_
-#  define _Out_cap_(size)
-#endif
-
-#if defined(HAVE_CONSOLE_LOG) && !defined(LOG_DEBUG)
-// Log to console if there's no standard log facility defined
-#  include <cstdio>
-#  ifndef LOG_DEBUG
-#    define LOG_DEBUG(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
-#    define LOG_TRACE(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
-#    define LOG_INFO(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
-#    define LOG_WARN(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
-#    define LOG_ERROR(fmt_, ...) printf(" " fmt_ "\n", ##__VA_ARGS__)
-#  endif
-#endif
-
-#ifndef LOG_DEBUG
-// Don't log anything if there's no standard log facility defined
-#  define LOG_DEBUG(fmt_, ...)
-#  define LOG_TRACE(fmt_, ...)
-#  define LOG_INFO(fmt_, ...)
-#  define LOG_WARN(fmt_, ...)
-#  define LOG_ERROR(fmt_, ...)
-#endif
-
-namespace common
-{
-
-/// <summary>
-/// A simple thread, derived class overloads onThread() method.
-/// </summary>
-struct Thread
-{
-  std::thread m_thread;
-
-  std::atomic<bool> m_terminate{false};
-
-  /// <summary>
-  /// Thread Constructor
-  /// </summary>
-  /// <returns>Thread</returns>
-  Thread() {}
-
-  /// <summary>
-  /// Start Thread
-  /// </summary>
-  void startThread()
-  {
-    m_terminate = false;
-    m_thread    = std::thread([&]() { this->onThread(); });
-  }
-
-  /// <summary>
-  /// Join Thread
-  /// </summary>
-  void joinThread()
-  {
-    m_terminate = true;
-    if (m_thread.joinable())
-    {
-      m_thread.join();
-    }
-  }
-
-  /// <summary>
-  /// Indicates if this thread should terminate
-  /// </summary>
-  /// <returns></returns>
-  bool shouldTerminate() const { return m_terminate; }
-
-  /// <summary>
-  /// Must be implemented by children
-  /// </summary>
-  virtual void onThread() = 0;
-
-  /// <summary>
-  /// Thread destructor
-  /// </summary>
-  /// <returns></returns>
-  virtual ~Thread() noexcept {}
-};
-
-}  // namespace common
-namespace SocketTools
-{
-
-#ifdef _WIN32
-// WinSocks need extra (de)initialization, solved by a global object here,
-// whose constructor/destructor will be called before and after main().
-struct WsaInitializer
-{
-  WsaInitializer()
-  {
-    WSADATA wsaData;
-    WSAStartup(MAKEWORD(2, 2), &wsaData);
-  }
-
-  ~WsaInitializer() { WSACleanup(); }
-};
-
-static WsaInitializer g_wsaInitializer;
-
-#endif
-
-/// <summary>
-/// Encapsulation of sockaddr(_in)
-/// </summary>
-struct SocketAddr
-{
-  static u_long const Loopback = 0x7F000001;
-
-  sockaddr m_data;
-
-  /// <summary>
-  /// SocketAddr constructor
-  /// </summary>
-  /// <returns>SocketAddr</returns>
-  SocketAddr() { memset(&m_data, 0, sizeof(m_data)); }
-
-  SocketAddr(u_long addr, int port)
-  {
-    sockaddr_in &inet4    = reinterpret_cast<sockaddr_in &>(m_data);
-    inet4.sin_family      = AF_INET;
-    inet4.sin_port        = htons(static_cast<unsigned short>(port));
-    inet4.sin_addr.s_addr = htonl(addr);
-  }
-
-  SocketAddr(char const *addr)
-  {
-#ifdef _WIN32
-    INT addrlen = sizeof(m_data);
-    WCHAR buf[200];
-    for (int i = 0; i < sizeof(buf) && addr[i]; i++)
-    {
-      buf[i] = addr[i];
-    }
-    buf[199] = L'\0';
-    ::WSAStringToAddressW(buf, AF_INET, nullptr, &m_data, &addrlen);
-#else
-    sockaddr_in &inet4 = reinterpret_cast<sockaddr_in &>(m_data);
-    inet4.sin_family   = AF_INET;
-    char const *colon  = strchr(addr, ':');
-    if (colon)
-    {
-      inet4.sin_port = htons(atoi(colon + 1));
-      char buf[16];
-      memcpy(buf, addr, (std::min<ptrdiff_t>)(15, colon - addr));
-      buf[15] = '\0';
-      ::inet_pton(AF_INET, buf, &inet4.sin_addr);
-    }
-    else
-    {
-      inet4.sin_port = 0;
-      ::inet_pton(AF_INET, addr, &inet4.sin_addr);
-    }
-#endif
-  }
-
-  SocketAddr(SocketAddr const &other) = default;
-
-  SocketAddr &operator=(SocketAddr const &other) = default;
-
-  operator sockaddr *() { return &m_data; }
-
-  operator const sockaddr *() const { return &m_data; }
-
-  int port() const
-  {
-    switch (m_data.sa_family)
-    {
-      case AF_INET: {
-        sockaddr_in const &inet4 = reinterpret_cast<sockaddr_in const &>(m_data);
-        return ntohs(inet4.sin_port);
-      }
-
-      default:
-        return -1;
-    }
-  }
-
-  std::string toString() const
-  {
-    std::ostringstream os;
-
-    switch (m_data.sa_family)
-    {
-      case AF_INET: {
-        sockaddr_in const &inet4 = reinterpret_cast<sockaddr_in const &>(m_data);
-        u_long addr              = ntohl(inet4.sin_addr.s_addr);
-        os << (addr >> 24) << '.' << ((addr >> 16) & 255) << '.' << ((addr >> 8) & 255) << '.'
-           << (addr & 255);
-        os << ':' << ntohs(inet4.sin_port);
-        break;
-      }
-
-      default:
-        os << "[?AF?" << m_data.sa_family << ']';
-    }
-    return os.str();
-  }
-};
-
-/// <summary>
-/// Encapsulation of a socket (non-exclusive ownership)
-/// </summary>
-struct Socket
-{
-#ifdef _WIN32
-  typedef SOCKET Type;
-  static Type const Invalid = INVALID_SOCKET;
-#else
-  typedef int Type;
-  static Type const Invalid = -1;
-#endif
-
-  Type m_sock;
-
-  Socket(Type sock = Invalid) : m_sock(sock) {}
-
-  Socket(int af, int type, int proto) : m_sock(::socket(af, type, proto)) {}
-
-  ~Socket() {}
-
-  operator Socket::Type() const { return m_sock; }
-
-  bool operator==(Socket const &other) const { return (m_sock == other.m_sock); }
-
-  bool operator!=(Socket const &other) const { return (m_sock != other.m_sock); }
-
-  bool operator<(Socket const &other) const { return (m_sock < other.m_sock); }
-
-  bool invalid() const { return (m_sock == Invalid); }
-
-  void setNonBlocking()
-  {
-    assert(m_sock != Invalid);
-#ifdef _WIN32
-    u_long value = 1;
-    ::ioctlsocket(m_sock, FIONBIO, &value);
-#else
-    int flags = ::fcntl(m_sock, F_GETFL, 0);
-    ::fcntl(m_sock, F_SETFL, flags | O_NONBLOCK);
-#endif
-  }
-
-  bool setReuseAddr()
-  {
-    assert(m_sock != Invalid);
-#ifdef _WIN32
-    BOOL value = TRUE;
-#else
-    int value = 1;
-#endif
-    return (::setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char *>(&value),
-                         sizeof(value)) == 0);
-  }
-
-  bool setNoDelay()
-  {
-    assert(m_sock != Invalid);
-#ifdef _WIN32
-    BOOL value = TRUE;
-#else
-    int value = 1;
-#endif
-    return (::setsockopt(m_sock, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&value),
-                         sizeof(value)) == 0);
-  }
-
-  bool connect(SocketAddr const &addr)
-  {
-    assert(m_sock != Invalid);
-    return (::connect(m_sock, addr, sizeof(addr)) == 0);
-  }
-
-  void close()
-  {
-    assert(m_sock != Invalid);
-#ifdef _WIN32
-    ::closesocket(m_sock);
-#else
-    ::close(m_sock);
-#endif
-    m_sock = Invalid;
-  }
-
-  int recv(_Out_cap_(size) void *buffer, unsigned size)
-  {
-    assert(m_sock != Invalid);
-    int flags = 0;
-    return static_cast<int>(::recv(m_sock, reinterpret_cast<char *>(buffer), size, flags));
-  }
-
-  int send(void const *buffer, unsigned size)
-  {
-    assert(m_sock != Invalid);
-    return static_cast<int>(::send(m_sock, reinterpret_cast<char const *>(buffer), size, 0));
-  }
-
-  bool bind(SocketAddr const &addr)
-  {
-    assert(m_sock != Invalid);
-    return (::bind(m_sock, addr, sizeof(addr)) == 0);
-  }
-
-  bool getsockname(SocketAddr &addr) const
-  {
-    assert(m_sock != Invalid);
-#ifdef _WIN32
-    int addrlen = sizeof(addr);
-#else
-    socklen_t addrlen = sizeof(addr);
-#endif
-    return (::getsockname(m_sock, addr, &addrlen) == 0);
-  }
-
-  bool listen(int backlog)
-  {
-    assert(m_sock != Invalid);
-    return (::listen(m_sock, backlog) == 0);
-  }
-
-  bool accept(Socket &csock, SocketAddr &caddr)
-  {
-    assert(m_sock != Invalid);
-#ifdef _WIN32
-    int addrlen = sizeof(caddr);
-#else
-    socklen_t addrlen = sizeof(caddr);
-#endif
-    csock = ::accept(m_sock, caddr, &addrlen);
-    return !csock.invalid();
-  }
-
-  bool shutdown(int how)
-  {
-    assert(m_sock != Invalid);
-    return (::shutdown(m_sock, how) == 0);
-  }
-
-  int error() const
-  {
-#ifdef _WIN32
-    return ::WSAGetLastError();
-#else
-    return errno;
-#endif
-  }
-
-  enum
-  {
-#ifdef _WIN32
-    ErrorWouldBlock = WSAEWOULDBLOCK
-#else
-    ErrorWouldBlock = EWOULDBLOCK
-#endif
-  };
-
-  enum
-  {
-#ifdef _WIN32
-    ShutdownReceive = SD_RECEIVE,
-    ShutdownSend    = SD_SEND,
-    ShutdownBoth    = SD_BOTH
-#else
-    ShutdownReceive = SHUT_RD,
-    ShutdownSend    = SHUT_WR,
-    ShutdownBoth    = SHUT_RDWR
-#endif
-  };
-};
-
-/// <summary>
-/// Socket Data
-/// </summary>
-struct SocketData
-{
-  Socket socket;
-  int flags;
-
-  SocketData() : socket(), flags(0) {}
-
-  bool operator==(Socket s) { return (socket == s); }
-};
-
-/// <summary>
-/// Socket Reactor
-/// </summary>
-struct Reactor : protected common::Thread
-{
-  /// <summary>
-  /// Socket State callback
-  /// </summary>
-  class SocketCallback
-  {
-  public:
-    SocketCallback()                             = default;
-    virtual ~SocketCallback()                    = default;
-    virtual void onSocketReadable(Socket sock)   = 0;
-    virtual void onSocketWritable(Socket sock)   = 0;
-    virtual void onSocketAcceptable(Socket sock) = 0;
-    virtual void onSocketClosed(Socket sock)     = 0;
-  };
-
-  /// <summary>
-  /// Socket State
-  /// </summary>
-  enum State
-  {
-    Readable   = 1,
-    Writable   = 2,
-    Acceptable = 4,
-    Closed     = 8
-  };
-
-  SocketCallback &m_callback;
-
-  std::vector<SocketData> m_sockets;
-
-#ifdef _WIN32
-  /* use WinSock events on Windows */
-  std::vector<WSAEVENT> m_events{};
-#endif
-
-#ifdef __linux__
-  /* use epoll on Linux */
-  int m_epollFd;
-#endif
-
-#ifdef TARGET_OS_MAC
-  /* use kqueue on Mac */
-#  define KQUEUE_SIZE 32
-  int kq{0};
-  struct kevent m_events[KQUEUE_SIZE];
-#endif
-
-public:
-  Reactor(SocketCallback &callback) : m_callback(callback)
-  {
-#ifdef __linux__
-#  ifdef ANDROID
-    m_epollFd = ::epoll_create(0);
-#  else
-    m_epollFd = ::epoll_create1(0);
-#  endif
-#endif
-
-#ifdef TARGET_OS_MAC
-    bzero(&m_events[0], sizeof(m_events));
-    kq = kqueue();
-#endif
-  }
-
-  ~Reactor() override
-  {
-#ifdef __linux__
-    ::close(m_epollFd);
-#endif
-#ifdef TARGET_OS_MAC
-    ::close(kq);
-#endif
-  }
-
-  /// <summary>
-  /// Add Socket
-  /// </summary>
-  /// <param name="socket"></param>
-  /// <param name="flags"></param>
-  void addSocket(const Socket &socket, int flags)
-  {
-    if (flags == 0)
-    {
-      removeSocket(socket);
-    }
-    else
-    {
-      auto it = std::find(m_sockets.begin(), m_sockets.end(), socket);
-      if (it == m_sockets.end())
-      {
-        LOG_TRACE("Reactor: Adding socket 0x%x with flags 0x%x", static_cast<int>(socket), flags);
-#ifdef _WIN32
-        m_events.push_back(::WSACreateEvent());
-#endif
-#ifdef __linux__
-        epoll_event event = {};
-        event.data.fd     = socket;
-        event.events      = 0;
-        ::epoll_ctl(m_epollFd, EPOLL_CTL_ADD, socket, &event);
-#endif
-#ifdef TARGET_OS_MAC
-        struct kevent event;
-        bzero(&event, sizeof(event));
-        event.ident = socket.m_sock;
-        EV_SET(&event, event.ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
-        kevent(kq, &event, 1, NULL, 0, NULL);
-        EV_SET(&event, event.ident, EVFILT_WRITE, EV_ADD, 0, 0, NULL);
-        kevent(kq, &event, 1, NULL, 0, NULL);
-#endif
-        m_sockets.push_back(SocketData());
-        m_sockets.back().socket = socket;
-        m_sockets.back().flags  = 0;
-        it                      = m_sockets.end() - 1;
-      }
-      else
-      {
-        LOG_TRACE("Reactor: Updating socket 0x%x with flags 0x%x", static_cast<int>(socket), flags);
-      }
-
-      if (it->flags != flags)
-      {
-        it->flags = flags;
-#ifdef _WIN32
-        long lNetworkEvents = 0;
-        if (it->flags & Readable)
-        {
-          lNetworkEvents |= FD_READ;
-        }
-        if (it->flags & Writable)
-        {
-          lNetworkEvents |= FD_WRITE;
-        }
-        if (it->flags & Acceptable)
-        {
-          lNetworkEvents |= FD_ACCEPT;
-        }
-        if (it->flags & Closed)
-        {
-          lNetworkEvents |= FD_CLOSE;
-        }
-        auto eventIt = m_events.begin() + std::distance(m_sockets.begin(), it);
-        ::WSAEventSelect(socket, *eventIt, lNetworkEvents);
-#endif
-#ifdef __linux__
-        int events = 0;
-        if (it->flags & Readable)
-        {
-          events |= EPOLLIN;
-        }
-        if (it->flags & Writable)
-        {
-          events |= EPOLLOUT;
-        }
-        if (it->flags & Acceptable)
-        {
-          events |= EPOLLIN;
-        }
-        // if (it->flags & Closed) - always handled (EPOLLERR | EPOLLHUP)
-        epoll_event event = {};
-        event.data.fd     = socket;
-        event.events      = events;
-        ::epoll_ctl(m_epollFd, EPOLL_CTL_MOD, socket, &event);
-#endif
-#ifdef TARGET_OS_MAC
-        // TODO: [MG] - Mac OS X socket doesn't currently support updating flags
-#endif
-      }
-    }
-  }
-
-  /// <summary>
-  /// Remove Socket
-  /// </summary>
-  /// <param name="socket"></param>
-  void removeSocket(const Socket &socket)
-  {
-    LOG_TRACE("Reactor: Removing socket 0x%x", static_cast<int>(socket));
-    auto it = std::find(m_sockets.begin(), m_sockets.end(), socket);
-    if (it != m_sockets.end())
-    {
-#ifdef _WIN32
-      auto eventIt = m_events.begin() + std::distance(m_sockets.begin(), it);
-      ::WSAEventSelect(it->socket, *eventIt, 0);
-      ::WSACloseEvent(*eventIt);
-      m_events.erase(eventIt);
-#endif
-#ifdef __linux__
-      ::epoll_ctl(m_epollFd, EPOLL_CTL_DEL, socket, nullptr);
-#endif
-#ifdef TARGET_OS_MAC
-      struct kevent event;
-      bzero(&event, sizeof(event));
-      event.ident = socket;
-      EV_SET(&event, socket, EVFILT_READ, EV_DELETE, 0, 0, NULL);
-      if (-1 == kevent(kq, &event, 1, NULL, 0, NULL))
-      {
-        //// Already removed?
-        LOG_ERROR("cannot delete fd=0x%x from kqueue!", event.ident);
-      }
-      EV_SET(&event, socket, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
-      if (-1 == kevent(kq, &event, 1, NULL, 0, NULL))
-      {
-        //// Already removed?
-        LOG_ERROR("cannot delete fd=0x%x from kqueue!", event.ident);
-      }
-#endif
-      m_sockets.erase(it);
-    }
-  }
-
-  /// <summary>
-  /// Start server
-  /// </summary>
-  void start()
-  {
-    LOG_INFO("Reactor: Starting...");
-    startThread();
-  }
-
-  /// <summary>
-  /// Stop server
-  /// </summary>
-  void stop()
-  {
-    LOG_INFO("Reactor: Stopping...");
-    joinThread();
-#ifdef _WIN32
-    for (auto &hEvent : m_events)
-    {
-      ::WSACloseEvent(hEvent);
-    }
-#else /* Linux and Mac */
-    for (auto &sd : m_sockets)
-    {
-#  ifdef __linux__
-      ::epoll_ctl(m_epollFd, EPOLL_CTL_DEL, sd.socket, nullptr);
-#  endif
-#  ifdef TARGET_OS_MAC
-      struct kevent event;
-      bzero(&event, sizeof(event));
-      event.ident = sd.socket;
-      EV_SET(&event, sd.socket, EVFILT_READ, EV_DELETE, 0, 0, NULL);
-      if (-1 == kevent(kq, &event, 1, NULL, 0, NULL))
-      {
-        LOG_ERROR("cannot delete fd=0x%x from kqueue!", event.ident);
-      }
-      EV_SET(&event, sd.socket, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
-      if (-1 == kevent(kq, &event, 1, NULL, 0, NULL))
-      {
-        LOG_ERROR("cannot delete fd=0x%x from kqueue!", event.ident);
-      }
-#  endif
-    }
-#endif
-    m_sockets.clear();
-  }
-
-  /// <summary>
-  /// Thread Loop for async events processing
-  /// </summary>
-  virtual void onThread() override
-  {
-    LOG_INFO("Reactor: Thread started");
-    while (!shouldTerminate())
-    {
-#ifdef _WIN32
-      DWORD dwResult = ::WSAWaitForMultipleEvents(static_cast<DWORD>(m_events.size()),
-                                                  m_events.data(), FALSE, 500, FALSE);
-      if (dwResult == WSA_WAIT_TIMEOUT)
-      {
-        continue;
-      }
-
-      assert(dwResult <= WSA_WAIT_EVENT_0 + m_events.size());
-      int index     = dwResult - WSA_WAIT_EVENT_0;
-      Socket socket = m_sockets[index].socket;
-      int flags     = m_sockets[index].flags;
-
-      WSANETWORKEVENTS ne;
-      ::WSAEnumNetworkEvents(socket, m_events[index], &ne);
-      LOG_TRACE(
-          "Reactor: Handling socket 0x%x (index %d) with active flags 0x%x "
-          "(armed 0x%x)",
-          static_cast<int>(socket), index, ne.lNetworkEvents, flags);
-
-      if ((flags & Readable) && (ne.lNetworkEvents & FD_READ))
-      {
-        m_callback.onSocketReadable(socket);
-      }
-      if ((flags & Writable) && (ne.lNetworkEvents & FD_WRITE))
-      {
-        m_callback.onSocketWritable(socket);
-      }
-      if ((flags & Acceptable) && (ne.lNetworkEvents & FD_ACCEPT))
-      {
-        m_callback.onSocketAcceptable(socket);
-      }
-      if ((flags & Closed) && (ne.lNetworkEvents & FD_CLOSE))
-      {
-        m_callback.onSocketClosed(socket);
-      }
-#endif
-
-#ifdef __linux__
-      epoll_event events[4];
-      int result = ::epoll_wait(m_epollFd, events, sizeof(events) / sizeof(events[0]), 500);
-      if (result == 0 || (result == -1 && errno == EINTR))
-      {
-        continue;
-      }
-
-      assert(result >= 1 && static_cast<size_t>(result) <= sizeof(events) / sizeof(events[0]));
-      for (int i = 0; i < result; i++)
-      {
-        auto it = std::find(m_sockets.begin(), m_sockets.end(), events[i].data.fd);
-        assert(it != m_sockets.end());
-        Socket socket = it->socket;
-        int flags     = it->flags;
-
-        LOG_TRACE("Reactor: Handling socket 0x%x active flags 0x%x (armed 0x%x)",
-                  static_cast<int>(socket), events[i].events, flags);
-
-        if ((flags & Readable) && (events[i].events & EPOLLIN))
-        {
-          m_callback.onSocketReadable(socket);
-        }
-        if ((flags & Writable) && (events[i].events & EPOLLOUT))
-        {
-          m_callback.onSocketWritable(socket);
-        }
-        if ((flags & Acceptable) && (events[i].events & EPOLLIN))
-        {
-          m_callback.onSocketAcceptable(socket);
-        }
-        if ((flags & Closed) && (events[i].events & (EPOLLHUP | EPOLLERR)))
-        {
-          m_callback.onSocketClosed(socket);
-        }
-      }
-#endif
-
-#if defined(TARGET_OS_MAC)
-      unsigned waitms = 500;  // never block for more than 500ms
-      struct timespec timeout;
-      timeout.tv_sec  = waitms / 1000;
-      timeout.tv_nsec = (waitms % 1000) * 1000 * 1000;
-
-      int nev = kevent(kq, NULL, 0, m_events, KQUEUE_SIZE, &timeout);
-      for (int i = 0; i < nev; i++)
-      {
-        struct kevent &event = m_events[i];
-        int fd               = (int)event.ident;
-        auto it              = std::find(m_sockets.begin(), m_sockets.end(), fd);
-        assert(it != m_sockets.end());
-        Socket socket = it->socket;
-        int flags     = it->flags;
-
-        LOG_TRACE("Handling socket 0x%x active flags 0x%x (armed 0x%x)", static_cast<int>(socket),
-                  event.flags, event.fflags);
-
-        if (event.filter == EVFILT_READ)
-        {
-          if (flags & Acceptable)
-          {
-            m_callback.onSocketAcceptable(socket);
-          }
-          if (flags & Readable)
-          {
-            m_callback.onSocketReadable(socket);
-          }
-          continue;
-        }
-
-        if (event.filter == EVFILT_WRITE)
-        {
-          if (flags & Writable)
-          {
-            m_callback.onSocketWritable(socket);
-          }
-          continue;
-        }
-
-        if ((event.flags & EV_EOF) || (event.flags & EV_ERROR))
-        {
-          LOG_TRACE("event.filter=%s", "EVFILT_WRITE");
-          m_callback.onSocketClosed(socket);
-          it->flags = Closed;
-          struct kevent kevt;
-          EV_SET(&kevt, event.ident, EVFILT_READ, EV_DELETE, 0, 0, NULL);
-          if (-1 == kevent(kq, &kevt, 1, NULL, 0, NULL))
-          {
-            LOG_ERROR("cannot delete fd=0x%x from kqueue!", event.ident);
-          }
-          EV_SET(&kevt, event.ident, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
-          if (-1 == kevent(kq, &kevt, 1, NULL, 0, NULL))
-          {
-            LOG_ERROR("cannot delete fd=0x%x from kqueue!", event.ident);
-          }
-          continue;
-        }
-        LOG_ERROR("Reactor: unhandled kevent!");
-      }
-#endif
-    }
-    LOG_TRACE("Reactor: Thread done");
-  }
-};
-
-}  // namespace SocketTools
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/ext/src/CMakeLists.txt
deleted file mode 100644
index b3d45a719..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(WITH_HTTP_CLIENT_CURL)
-  add_subdirectory(http/client/curl)
-endif()
-
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  add_subdirectory(dll)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/ext/src/dll/CMakeLists.txt
deleted file mode 100644
index d5c273c83..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/CMakeLists.txt
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(NOT MSVC)
-  message(
-    FATAL_ERROR
-      "The OpenTelemetry C++ SDK for Windows DLL is only supported on MSVC.")
-endif()
-
-set(OPENTELEMETRY_EXPORT_DEF
-    "${CMAKE_CURRENT_BINARY_DIR}/opentelemetry_cpp.def")
-
-add_library(opentelemetry_cpp SHARED dllmain.cc ${OPENTELEMETRY_EXPORT_DEF})
-
-set_target_properties(opentelemetry_cpp PROPERTIES EXPORT_NAME
-                                                   opentelemetry_cpp)
-
-target_link_libraries(
-  opentelemetry_cpp PRIVATE opentelemetry_trace
-                            opentelemetry_exporter_ostream_span)
-
-target_include_directories(
-  opentelemetry_cpp
-  PUBLIC
-    $<TARGET_PROPERTY:opentelemetry_trace,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:opentelemetry_exporter_ostream_span,INTERFACE_INCLUDE_DIRECTORIES>
-)
-
-if(WITH_OTLP_GRPC)
-  target_compile_definitions(opentelemetry_cpp PRIVATE WITH_OTLP_GRPC)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_grpc)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_grpc,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-if(WITH_OTLP_HTTP)
-  target_compile_definitions(opentelemetry_cpp PRIVATE WITH_OTLP_HTTP)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_http)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_http,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-if(WITH_OTLP_FILE)
-  target_compile_definitions(opentelemetry_cpp PRIVATE WITH_OTLP_FILE)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_file)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_file,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-target_link_libraries(
-  opentelemetry_cpp PRIVATE opentelemetry_metrics
-                            opentelemetry_exporter_ostream_metrics)
-target_include_directories(
-  opentelemetry_cpp
-  PUBLIC
-    $<TARGET_PROPERTY:opentelemetry_metrics,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:opentelemetry_exporter_ostream_metrics,INTERFACE_INCLUDE_DIRECTORIES>
-)
-
-if(WITH_OTLP_GRPC)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_grpc_metrics)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_grpc_metrics,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-if(WITH_OTLP_HTTP)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_http_metric)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_http_metric,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-if(WITH_OTLP_FILE)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_file_metric)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_file_metric,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-target_link_libraries(
-  opentelemetry_cpp PRIVATE opentelemetry_logs
-                            opentelemetry_exporter_ostream_logs)
-target_include_directories(
-  opentelemetry_cpp
-  PUBLIC
-    $<TARGET_PROPERTY:opentelemetry_logs,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:opentelemetry_exporter_ostream_logs,INTERFACE_INCLUDE_DIRECTORIES>
-)
-
-if(WITH_OTLP_GRPC)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_grpc_log)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_grpc_log,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-if(WITH_OTLP_HTTP)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_http_log)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_http_log,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-if(WITH_OTLP_FILE)
-  target_link_libraries(opentelemetry_cpp
-                        PRIVATE opentelemetry_exporter_otlp_file_log)
-  target_include_directories(
-    opentelemetry_cpp
-    PUBLIC
-      $<TARGET_PROPERTY:opentelemetry_exporter_otlp_file_log,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-endif()
-
-find_program(
-  _vswhere_tool
-  NAMES vswhere
-  PATHS "$ENV{ProgramFiles\(x86\)}/Microsoft Visual Studio/Installer")
-if(NOT ${vswhere})
-  message(
-    FATAL_ERROR "Could not locate vswhere.exe - unable to locate dumpbin.exe")
-endif()
-
-execute_process(
-  COMMAND "${_vswhere_tool}" -latest -find **/dumpbin.exe
-  OUTPUT_VARIABLE DUMPBIN_PATHS
-  RESULT_VARIABLE _vs_where_exitcode
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-message(STATUS "DUMPBIN PATHS: ${DUMPBIN_PATHS} ${RESULT_VARIABLE}")
-
-string(REPLACE "\n" ";" DUMPBIN_PATHS_LIST ${DUMPBIN_PATHS})
-
-list(POP_FRONT DUMPBIN_PATHS_LIST DUMPBIN_PATH)
-
-message(STATUS "DUMPBIN PATH: ${DUMPBIN_PATH}")
-
-# find Powershell executable find_program(DUMPBIN_PATH NAMES dumpbin REQUIRED)
-
-# find Powershell executable
-find_program(POWERSHELL_PATH NAMES pwsh powershell REQUIRED)
-
-set(OPENTELEMETRY_INPUT_DEF "${CMAKE_CURRENT_SOURCE_DIR}/input.txt")
-
-add_custom_command(
-  OUTPUT ${OPENTELEMETRY_INPUT_DEF}
-  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/input.src"
-  COMMAND
-    ${CMAKE_CXX_COMPILER}
-    "-D$<JOIN:$<TARGET_PROPERTY:opentelemetry_cpp,COMPILE_DEFINITIONS>,;-D>" /EP
-    ${CMAKE_CURRENT_SOURCE_DIR}/input.src > ${OPENTELEMETRY_INPUT_DEF}
-  VERBATIM COMMAND_EXPAND_LISTS)
-
-add_custom_command(
-  OUTPUT ${OPENTELEMETRY_EXPORT_DEF}
-  DEPENDS "${OPENTELEMETRY_INPUT_DEF}"
-          "${CMAKE_CURRENT_SOURCE_DIR}/make_def.ps1"
-  COMMAND
-    ${POWERSHELL_PATH} "-ExecutionPolicy" "Bypass" "-File"
-    "${CMAKE_CURRENT_SOURCE_DIR}/make_def.ps1" "-dumpbin" "${DUMPBIN_PATH}"
-    "-bindir" ${PROJECT_BINARY_DIR} "-inputfile" ${OPENTELEMETRY_INPUT_DEF}
-    "-targetfile" ${OPENTELEMETRY_EXPORT_DEF}
-  VERBATIM)
-
-otel_add_component(COMPONENT ext_dll TARGETS opentelemetry_cpp)
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/dllmain.cc b/ext/opentelemetry-cpp-1.21.0/ext/src/dll/dllmain.cc
deleted file mode 100644
index df1d2bc70..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/dllmain.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <windows.h>  // NOLINT
-
-// Include API header files here for exporting
-#include <opentelemetry/trace/provider.h>
-
-#include <opentelemetry/logs/logger_provider.h>
-#include <opentelemetry/logs/provider.h>
-
-extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
-{
-  UNREFERENCED_PARAMETER(hInstance);
-  UNREFERENCED_PARAMETER(dwReason);
-  UNREFERENCED_PARAMETER(lpReserved);
-
-  return TRUE;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/input.src b/ext/opentelemetry-cpp-1.21.0/ext/src/dll/input.src
deleted file mode 100644
index 661e01c1a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/input.src
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// clang-format off
-Create@OStreamSpanExporterFactory@trace@exporter@v1@opentelemetry
-Create@SimpleSpanProcessorFactory@trace@sdk@v1@opentelemetry
-Create@TracerProviderFactory@trace@sdk@v1@opentelemetry
-Create@LoggerProviderFactory@logs@sdk@v1@opentelemetry
-Create@BatchLogRecordProcessorFactory@logs@sdk@v1@opentelemetry
-Create@SimpleLogRecordProcessorFactory@logs@sdk@v1@opentelemetry
-Create@MultiLogRecordProcessorFactory@logs@sdk@v1@opentelemetry
-TracerProvider@trace@sdk@v1@opentelemetry
-ForceFlush@TracerProvider@trace@sdk@v1@opentelemetry
-LoggerProvider@logs@sdk@v1@opentelemetry
-ForceFlush@LoggerProvider@logs@sdk@v1@opentelemetry
-OStreamLogRecordExporter@logs@exporter@v1@opentelemetry
-Create@OStreamMetricExporterFactory@metrics@exporter@v1@opentelemetry
-Create@PeriodicExportingMetricReaderFactory@metrics@sdk@v1@opentelemetry
-Create@MeterProviderFactory@metrics@sdk@v1@opentelemetry
-Create@MeterContextFactory@metrics@sdk@v1@opentelemetry
-Create@ViewFactory@metrics@sdk@v1@opentelemetry
-Create@MeterSelectorFactory@metrics@sdk@v1@opentelemetry
-Create@InstrumentSelectorFactory@metrics@sdk@v1@opentelemetry
-AddMetricReader@MeterContext@metrics@sdk@v1@opentelemetry
-AddMetricReader@MeterProvider@metrics@sdk@v1@opentelemetry
-MeterProvider@metrics@sdk@v1@opentelemetry
-AddView@MeterProvider@metrics@sdk@v1@opentelemetry
-SetTracerProvider@Provider@trace@sdk@v1@opentelemetry
-SetMeterProvider@Provider@metrics@sdk@v1@opentelemetry
-SetLoggerProvider@Provider@logs@sdk@v1@opentelemetry
-
-#if defined(WITH_OTLP_GRPC) || defined(WITH_OTLP_HTTP)
-GetOtlpDefaultTracesTimeout@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultTracesHeaders@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultLogsTimeout@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultLogsHeaders@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultMetricsTimeout@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultMetricsHeaders@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultTracesSslCertificatePath@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultMetricsSslCertificatePath@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultLogsSslCertificatePath@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultTracesSslCertificateString@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultMetricsSslCertificateString@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultLogsSslCertificateString@otlp@exporter@v1@opentelemetry
-#endif  // defined(WITH_OTLP_GRPC) || defined(WITH_OTLP_HTTP)
-
-#if defined(WITH_OTLP_GRPC)
-Create@OtlpGrpcExporterFactory@otlp@exporter@v1@opentelemetry
-Create@OtlpGrpcMetricExporterFactory@otlp@exporter@v1@opentelemetry
-Create@OtlpGrpcLogRecordExporterFactory@otlp@exporter@v1@opentelemetry
-OtlpGrpcExporterOptions@otlp@exporter@v1@opentelemetry
-OtlpGrpcMetricExporterOptions@otlp@exporter@v1@opentelemetry
-OtlpGrpcLogRecordExporterOptions@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultGrpcTracesEndpoint@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultGrpcMetricsEndpoint@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultGrpcLogsEndpoint@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultGrpcTracesIsInsecure@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultGrpcMetricsIsInsecure@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultGrpcLogsIsInsecure@otlp@exporter@v1@opentelemetry
-#endif  // defined(WITH_OTLP_GRPC)
-
-#if defined(WITH_OTLP_HTTP)
-Create@OtlpHttpExporterFactory@otlp@exporter@v1@opentelemetry
-Create@OtlpHttpMetricExporterFactory@otlp@exporter@v1@opentelemetry
-Create@OtlpHttpLogRecordExporterFactory@otlp@exporter@v1@opentelemetry
-OtlpHttpExporterOptions@otlp@exporter@v1@opentelemetry
-OtlpHttpMetricExporterOptions@otlp@exporter@v1@opentelemetry
-OtlpHttpLogRecordExporterOptions@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultHttpTracesEndpoint@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultHttpMetricsEndpoint@otlp@exporter@v1@opentelemetry
-GetOtlpDefaultHttpLogsEndpoint@otlp@exporter@v1@opentelemetry
-#endif  // defined(WITH_OTLP_HTTP)
-
-#if defined(WITH_OTLP_FILE)
-Create@OtlpFileExporterFactory@otlp@exporter@v1@opentelemetry
-Create@OtlpFileLogRecordExporterFactory@otlp@exporter@v1@opentelemetry
-Create@OtlpFileMetricExporterFactory@otlp@exporter@v1@opentelemetry
-OtlpFileExporterOptions@otlp@exporter@v1@opentelemetry
-OtlpFileLogRecordExporterOptions@otlp@exporter@v1@opentelemetry
-OtlpFileMetricExporterOptions@otlp@exporter@v1@opentelemetry
-#endif  // defined(WITH_OTLP_FILE)
-
-// clang-format on
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/make_def.ps1 b/ext/opentelemetry-cpp-1.21.0/ext/src/dll/make_def.ps1
deleted file mode 100644
index a7ee93bc4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/make_def.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-param ($dumpbin, $bindir, $inputfile, $targetfile)
-   
- "LIBRARY opentelemetry_cpp`r`nEXPORTS`r`n" > $targetfile
-    
- Get-ChildItem -Verbose -Path $bindir/sdk/*,$bindir/exporters/* -Include *.lib -Recurse | % { & "$dumpbin" /SYMBOLS $_ | Select-String -Pattern @(Get-Content -Verbose -Path "$inputfile" | Where-Object { $_.Trim() -ne '' } | % { "External\s+\|\s+(\?+[0-9]?$_[^\s]*)\s+\((.*)\)$" }) | % { "; $($_.matches.groups[2])`r`n$($_.matches.groups[1])" } >> $targetfile }
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/opentelemetry_cpp.src b/ext/opentelemetry-cpp-1.21.0/ext/src/dll/opentelemetry_cpp.src
deleted file mode 100644
index 195b30640..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/dll/opentelemetry_cpp.src
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// clang-format off
-LIBRARY opentelemetry_cpp
-EXPORTS
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::trace::SpanExporter,struct std::default_delete<class opentelemetry::v1::sdk::trace::SpanExporter> > __cdecl opentelemetry::v1::exporter::trace::OStreamSpanExporterFactory::Create(void)
-    ?Create@OStreamSpanExporterFactory@trace@exporter@v1@opentelemetry@@SA?AV?$unique_ptr@VSpanExporter@trace@sdk@v1@opentelemetry@@U?$default_delete@VSpanExporter@trace@sdk@v1@opentelemetry@@@std@@@std@@XZ
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::trace::SpanProcessor,struct std::default_delete<class opentelemetry::v1::sdk::trace::SpanProcessor> > __cdecl opentelemetry::v1::sdk::trace::SimpleSpanProcessorFactory::Create(class std::unique_ptr<class opentelemetry::v1::sdk::trace::SpanExporter,struct std::default_delete<class opentelemetry::v1::sdk::trace::SpanExporter> > && __ptr64)
-#if defined(_WIN64)
-    ?Create@SimpleSpanProcessorFactory@trace@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VSpanProcessor@trace@sdk@v1@opentelemetry@@U?$default_delete@VSpanProcessor@trace@sdk@v1@opentelemetry@@@std@@@std@@$$QEAV?$unique_ptr@VSpanExporter@trace@sdk@v1@opentelemetry@@U?$default_delete@VSpanExporter@trace@sdk@v1@opentelemetry@@@std@@@7@@Z
-#else
-    ?Create@SimpleSpanProcessorFactory@trace@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VSpanProcessor@trace@sdk@v1@opentelemetry@@U?$default_delete@VSpanProcessor@trace@sdk@v1@opentelemetry@@@std@@@std@@$$QAV?$unique_ptr@VSpanExporter@trace@sdk@v1@opentelemetry@@U?$default_delete@VSpanExporter@trace@sdk@v1@opentelemetry@@@std@@@7@@Z
-#endif
-    // public: static class std::unique_ptr<class opentelemetry::v1::trace::TracerProvider,struct std::default_delete<class opentelemetry::v1::trace::TracerProvider> > __cdecl opentelemetry::v1::sdk::trace::TracerProviderFactory::Create(class std::unique_ptr<class opentelemetry::v1::sdk::trace::SpanProcessor,struct std::default_delete<class opentelemetry::v1::sdk::trace::SpanProcessor> >)
-    ?Create@TracerProviderFactory@trace@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VTracerProvider@trace@v1@opentelemetry@@U?$default_delete@VTracerProvider@trace@v1@opentelemetry@@@std@@@std@@V?$unique_ptr@VSpanProcessor@trace@sdk@v1@opentelemetry@@U?$default_delete@VSpanProcessor@trace@sdk@v1@opentelemetry@@@std@@@7@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::logs::LoggerProvider,class std::default_delete<class opentelemetry::v1::logs::LoggerProvider> > __cdecl opentelemetry::v1::sdk::logs::LoggerProviderFactory::Create(class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordProcessor,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordProcessor> > && __ptr64)
-#if defined(_WIN64)
-    ?Create@LoggerProviderFactory@logs@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VLoggerProvider@logs@v1@opentelemetry@@U?$default_delete@VLoggerProvider@logs@v1@opentelemetry@@@std@@@std@@$$QEAV?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@7@@Z
-#else
-    ?Create@LoggerProviderFactory@logs@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VLoggerProvider@logs@v1@opentelemetry@@U?$default_delete@VLoggerProvider@logs@v1@opentelemetry@@@std@@@std@@$$QAV?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@7@@Z
-#endif
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordProcessor,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordProcessor> > __cdecl opentelemetry::v1::sdk::logs::BatchLogRecordProcessorFactory::Create(class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordExporter,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordExporter> > && __ptr64,struct opentelemetry::v1::sdk::logs::BatchLogRecordProcessorOptions const & __ptr64)
-#if defined(_WIN64)
-    ?Create@BatchLogRecordProcessorFactory@logs@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@$$QEAV?$unique_ptr@VLogRecordExporter@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordExporter@logs@sdk@v1@opentelemetry@@@std@@@7@AEBUBatchLogRecordProcessorOptions@2345@@Z
-#else
-    ?Create@BatchLogRecordProcessorFactory@logs@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@$$QAV?$unique_ptr@VLogRecordExporter@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordExporter@logs@sdk@v1@opentelemetry@@@std@@@7@AEBUBatchLogRecordProcessorOptions@2345@@Z
-#endif
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordProcessor,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordProcessor> > __cdecl opentelemetry::v1::sdk::logs::SimpleLogRecordProcessorFactory::Create(class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordExporter,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordExporter> > && __ptr64)
-#if defined(_WIN64)
-    ?Create@SimpleLogRecordProcessorFactory@logs@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@$$QEAV?$unique_ptr@VLogRecordExporter@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordExporter@logs@sdk@v1@opentelemetry@@@std@@@7@@Z
-#else
-    ?Create@SimpleLogRecordProcessorFactory@logs@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@$$QAV?$unique_ptr@VLogRecordExporter@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordExporter@logs@sdk@v1@opentelemetry@@@std@@@7@@Z
-#endif
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordProcessor,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordProcessor> > __cdecl opentelemetry::v1::sdk::logs::MultiLogRecordProcessorFactory::Create(class std::vector<class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordProcessor,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordProcessor> >,class std::allocator<class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordProcessor,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordProcessor> > > > && __ptr64)
-#if defined(WIN32)
-    ?Create@MultiLogRecordProcessorFactory@logs@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@$$QEAV?$vector@V?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@V?$allocator@V?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@@2@@7@@Z
-#else
-    ?Create@MultiLogRecordProcessorFactory@logs@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@$$QEAV?$vector@V?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@V?$allocator@V?$unique_ptr@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordProcessor@logs@sdk@v1@opentelemetry@@@std@@@std@@@2@@7@@Z
-#endif
-    ?ForceFlush@TracerProvider@trace@sdk@v1@opentelemetry@@QEAA_NV?$duration@_JU?$ratio@$00$0PECEA@@std@@@chrono@std@@@Z
-    ?ForceFlush@LoggerProvider@logs@sdk@v1@opentelemetry@@QEAA_NV?$duration@_JU?$ratio@$00$0PECEA@@std@@@chrono@std@@@Z
-    ??0OStreamLogRecordExporter@logs@exporter@v1@opentelemetry@@QEAA@AEAV?$basic_ostream@DU?$char_traits@D@std@@@std@@@Z
-
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::PushMetricExporter,struct std::default_delete<class opentelemetry::v1::sdk::metrics::PushMetricExporter> > __cdecl opentelemetry::v1::exporter::metrics::OStreamMetricExporterFactory::Create(void)
-    ?Create@OStreamMetricExporterFactory@metrics@exporter@v1@opentelemetry@@SA?AV?$unique_ptr@VPushMetricExporter@metrics@sdk@v1@opentelemetry@@U?$default_delete@VPushMetricExporter@metrics@sdk@v1@opentelemetry@@@std@@@std@@XZ
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::MetricReader,struct std::default_delete<class opentelemetry::v1::sdk::metrics::MetricReader> > __cdecl opentelemetry::v1::sdk::metrics::PeriodicExportingMetricReaderFactory::Create(class std::unique_ptr<class opentelemetry::v1::sdk::metrics::PushMetricExporter,struct std::default_delete<class opentelemetry::v1::sdk::metrics::PushMetricExporter> >,struct opentelemetry::v1::sdk::metrics::PeriodicExportingMetricReaderOptions const & __ptr64)
-    ?Create@PeriodicExportingMetricReaderFactory@metrics@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VMetricReader@metrics@sdk@v1@opentelemetry@@U?$default_delete@VMetricReader@metrics@sdk@v1@opentelemetry@@@std@@@std@@V?$unique_ptr@VPushMetricExporter@metrics@sdk@v1@opentelemetry@@U?$default_delete@VPushMetricExporter@metrics@sdk@v1@opentelemetry@@@std@@@7@AEBUPeriodicExportingMetricReaderOptions@2345@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::metrics::MeterProvider,struct std::default_delete<class opentelemetry::v1::metrics::MeterProvider> > __cdecl opentelemetry::v1::sdk::metrics::MeterProviderFactory::Create(void)
-    ?Create@MeterProviderFactory@metrics@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VMeterProvider@metrics@v1@opentelemetry@@U?$default_delete@VMeterProvider@metrics@v1@opentelemetry@@@std@@@std@@XZ
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::MeterContext,struct std::default_delete<class opentelemetry::v1::sdk::metrics::MeterContext> > __cdecl opentelemetry::v1::sdk::metrics::MeterContextFactory::Create(void)
-    ?Create@MeterContextFactory@metrics@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VMeterContext@metrics@sdk@v1@opentelemetry@@U?$default_delete@VMeterContext@metrics@sdk@v1@opentelemetry@@@std@@@std@@XZ
-    // public: static class std::unique_ptr<class opentelemetry::v1::metrics::MeterProvider,struct std::default_delete<class opentelemetry::v1::metrics::MeterProvider> > __cdecl opentelemetry::v1::sdk::metrics::MeterProviderFactory::Create(class std::unique_ptr<class opentelemetry::v1::sdk::metrics::MeterContext,struct std::default_delete<class opentelemetry::v1::sdk::metrics::MeterContext> >)
-    ?Create@MeterProviderFactory@metrics@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VMeterProvider@metrics@v1@opentelemetry@@U?$default_delete@VMeterProvider@metrics@v1@opentelemetry@@@std@@@std@@V?$unique_ptr@VMeterContext@metrics@sdk@v1@opentelemetry@@U?$default_delete@VMeterContext@metrics@sdk@v1@opentelemetry@@@std@@@7@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::View,struct std::default_delete<class opentelemetry::v1::sdk::metrics::View> > __cdecl opentelemetry::v1::sdk::metrics::ViewFactory::Create(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,enum opentelemetry::v1::sdk::metrics::AggregationType,class std::shared_ptr<class opentelemetry::v1::sdk::metrics::AggregationConfig>)
-    ?Create@ViewFactory@metrics@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VView@metrics@sdk@v1@opentelemetry@@U?$default_delete@VView@metrics@sdk@v1@opentelemetry@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@00W4AggregationType@2345@V?$shared_ptr@VAggregationConfig@metrics@sdk@v1@opentelemetry@@@7@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::View,struct std::default_delete<class opentelemetry::v1::sdk::metrics::View> > __cdecl opentelemetry::v1::sdk::metrics::ViewFactory::Create(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,enum opentelemetry::v1::sdk::metrics::AggregationType)
-    ?Create@ViewFactory@metrics@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VView@metrics@sdk@v1@opentelemetry@@U?$default_delete@VView@metrics@sdk@v1@opentelemetry@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@00W4AggregationType@2345@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::MeterSelector,struct std::default_delete<class opentelemetry::v1::sdk::metrics::MeterSelector> > __cdecl opentelemetry::v1::sdk::metrics::MeterSelectorFactory::Create(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)
-    ?Create@MeterSelectorFactory@metrics@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VMeterSelector@metrics@sdk@v1@opentelemetry@@U?$default_delete@VMeterSelector@metrics@sdk@v1@opentelemetry@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@00@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::InstrumentSelector,struct std::default_delete<class opentelemetry::v1::sdk::metrics::InstrumentSelector> > __cdecl opentelemetry::v1::sdk::metrics::InstrumentSelectorFactory::Create(enum opentelemetry::v1::sdk::metrics::InstrumentType,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)
-    ?Create@InstrumentSelectorFactory@metrics@sdk@v1@opentelemetry@@SA?AV?$unique_ptr@VInstrumentSelector@metrics@sdk@v1@opentelemetry@@U?$default_delete@VInstrumentSelector@metrics@sdk@v1@opentelemetry@@@std@@@std@@W4InstrumentType@2345@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@1@Z
-    // public: void __cdecl opentelemetry::v1::sdk::metrics::MeterContext::AddMetricReader(class std::shared_ptr<class opentelemetry::v1::sdk::metrics::MetricReader>)
-    ?AddMetricReader@MeterContext@metrics@sdk@v1@opentelemetry@@QEAAXV?$shared_ptr@VMetricReader@metrics@sdk@v1@opentelemetry@@@std@@@Z
-    // public: void __cdecl opentelemetry::v1::sdk::metrics::MeterProvider::AddMetricReader(class std::shared_ptr<class opentelemetry::v1::sdk::metrics::MetricReader>)
-    ?AddMetricReader@MeterProvider@metrics@sdk@v1@opentelemetry@@QEAAXV?$shared_ptr@VMetricReader@metrics@sdk@v1@opentelemetry@@@std@@@Z
-    // public: void __cdecl opentelemetry::v1::sdk::metrics::MeterProvider::AddView(class std::unique_ptr<class opentelemetry::v1::sdk::metrics::InstrumentSelector,struct std::default_delete<class opentelemetry::v1::sdk::metrics::InstrumentSelector> >,class std::unique_ptr<class opentelemetry::v1::sdk::metrics::MeterSelector,struct std::default_delete<class opentelemetry::v1::sdk::metrics::MeterSelector> >,class std::unique_ptr<class opentelemetry::v1::sdk::metrics::View,struct std::default_delete<class opentelemetry::v1::sdk::metrics::View> >)
-    ?AddView@MeterProvider@metrics@sdk@v1@opentelemetry@@QEAAXV?$unique_ptr@VInstrumentSelector@metrics@sdk@v1@opentelemetry@@U?$default_delete@VInstrumentSelector@metrics@sdk@v1@opentelemetry@@@std@@@std@@V?$unique_ptr@VMeterSelector@metrics@sdk@v1@opentelemetry@@U?$default_delete@VMeterSelector@metrics@sdk@v1@opentelemetry@@@std@@@7@V?$unique_ptr@VView@metrics@sdk@v1@opentelemetry@@U?$default_delete@VView@metrics@sdk@v1@opentelemetry@@@std@@@7@@Z
-#if defined(WITH_OTLP_GRPC) || defined(WITH_OTLP_HTTP)
-    ?GetOtlpDefaultTracesTimeout@otlp@exporter@v1@opentelemetry@@YA?AV?$duration@_JU?$ratio@$00$0JIJGIA@@std@@@chrono@std@@XZ
-    ?GetOtlpDefaultTracesHeaders@otlp@exporter@v1@opentelemetry@@YA?AV?$multimap@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@Ucmp_ic@otlp@exporter@v1@opentelemetry@@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@@std@@@2@@std@@XZ
-    ?GetOtlpDefaultLogsTimeout@otlp@exporter@v1@opentelemetry@@YA?AV?$duration@_JU?$ratio@$00$0JIJGIA@@std@@@chrono@std@@XZ
-    ?GetOtlpDefaultLogsHeaders@otlp@exporter@v1@opentelemetry@@YA?AV?$multimap@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@Ucmp_ic@otlp@exporter@v1@opentelemetry@@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@@std@@@2@@std@@XZ
-    ?GetOtlpDefaultMetricsTimeout@otlp@exporter@v1@opentelemetry@@YA?AV?$duration@_JU?$ratio@$00$0JIJGIA@@std@@@chrono@std@@XZ
-    ?GetOtlpDefaultMetricsHeaders@otlp@exporter@v1@opentelemetry@@YA?AV?$multimap@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@Ucmp_ic@otlp@exporter@v1@opentelemetry@@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V12@@std@@@2@@std@@XZ
-    ?GetOtlpDefaultTracesSslCertificatePath@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultMetricsSslCertificatePath@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultLogsSslCertificatePath@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultTracesSslCertificateString@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultMetricsSslCertificateString@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultLogsSslCertificateString@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-#endif  // defined(WITH_OTLP_GRPC) || defined(WITH_OTLP_HTTP)
-#if defined(WITH_OTLP_GRPC)
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::trace::SpanExporter,struct std::default_delete<class opentelemetry::v1::sdk::trace::SpanExporter> > __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcExporterFactory::Create(struct opentelemetry::v1::exporter::otlp::OtlpGrpcExporterOptions const & __ptr64)
-    ?Create@OtlpGrpcExporterFactory@otlp@exporter@v1@opentelemetry@@SA?AV?$unique_ptr@VSpanExporter@trace@sdk@v1@opentelemetry@@U?$default_delete@VSpanExporter@trace@sdk@v1@opentelemetry@@@std@@@std@@AEBUOtlpGrpcExporterOptions@2345@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::PushMetricExporter,struct std::default_delete<class opentelemetry::v1::sdk::metrics::PushMetricExporter> > __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcMetricExporterFactory::Create(struct opentelemetry::v1::exporter::otlp::OtlpGrpcMetricExporterOptions const & __ptr64)
-    ?Create@OtlpGrpcMetricExporterFactory@otlp@exporter@v1@opentelemetry@@SA?AV?$unique_ptr@VPushMetricExporter@metrics@sdk@v1@opentelemetry@@U?$default_delete@VPushMetricExporter@metrics@sdk@v1@opentelemetry@@@std@@@std@@AEBUOtlpGrpcMetricExporterOptions@2345@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordExporter,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordExporter> > __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcLogRecordExporterFactory::Create(struct opentelemetry::v1::exporter::otlp::OtlpGrpcLogRecordExporterOptions const &)
-    ?Create@OtlpGrpcLogRecordExporterFactory@otlp@exporter@v1@opentelemetry@@SA?AV?$unique_ptr@VLogRecordExporter@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordExporter@logs@sdk@v1@opentelemetry@@@std@@@std@@AEBUOtlpGrpcLogRecordExporterOptions@2345@@Z
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcExporterOptions::OtlpGrpcExporterOptions(void)
-    ??0OtlpGrpcExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcExporterOptions::~OtlpGrpcExporterOptions(void)
-    ??1OtlpGrpcExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcMetricExporterOptions::OtlpGrpcMetricExporterOptions(void)
-    ??0OtlpGrpcMetricExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcMetricExporterOptions::~OtlpGrpcMetricExporterOptions(void)
-    ??1OtlpGrpcMetricExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcLogRecordExporterOptions::OtlpGrpcLogRecordExporterOptions(void)
-    ??0OtlpGrpcLogRecordExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpGrpcLogRecordExporterOptions::~OtlpGrpcLogRecordExporterOptions(void)
-    ??1OtlpGrpcLogRecordExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-
-    ?GetOtlpDefaultGrpcTracesEndpoint@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultGrpcMetricsEndpoint@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultGrpcLogsEndpoint@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultGrpcTracesIsInsecure@otlp@exporter@v1@opentelemetry@@YA_NXZ
-    ?GetOtlpDefaultGrpcMetricsIsInsecure@otlp@exporter@v1@opentelemetry@@YA_NXZ
-    ?GetOtlpDefaultGrpcLogsIsInsecure@otlp@exporter@v1@opentelemetry@@YA_NXZ
-#endif  // defined(WITH_OTLP_GRPC)
-
-#if defined(WITH_OTLP_HTTP)
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::trace::SpanExporter,struct std::default_delete<class opentelemetry::v1::sdk::trace::SpanExporter> > __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpExporterFactory::Create(struct opentelemetry::v1::exporter::otlp::OtlpHttpExporterOptions const & __ptr64)
-    ?Create@OtlpHttpExporterFactory@otlp@exporter@v1@opentelemetry@@SA?AV?$unique_ptr@VSpanExporter@trace@sdk@v1@opentelemetry@@U?$default_delete@VSpanExporter@trace@sdk@v1@opentelemetry@@@std@@@std@@AEBUOtlpHttpExporterOptions@2345@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::metrics::PushMetricExporter,struct std::default_delete<class opentelemetry::v1::sdk::metrics::PushMetricExporter> > __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpMetricExporterFactory::Create(struct opentelemetry::v1::exporter::otlp::OtlpHttpMetricExporterOptions const &)
-    ?Create@OtlpHttpMetricExporterFactory@otlp@exporter@v1@opentelemetry@@SA?AV?$unique_ptr@VPushMetricExporter@metrics@sdk@v1@opentelemetry@@U?$default_delete@VPushMetricExporter@metrics@sdk@v1@opentelemetry@@@std@@@std@@AEBUOtlpHttpMetricExporterOptions@2345@@Z
-    // public: static class std::unique_ptr<class opentelemetry::v1::sdk::logs::LogRecordExporter,struct std::default_delete<class opentelemetry::v1::sdk::logs::LogRecordExporter> > __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpLogRecordExporterFactory::Create(struct opentelemetry::v1::exporter::otlp::OtlpHttpLogRecordExporterOptions const & __ptr64)
-    ?Create@OtlpHttpLogRecordExporterFactory@otlp@exporter@v1@opentelemetry@@SA?AV?$unique_ptr@VLogRecordExporter@logs@sdk@v1@opentelemetry@@U?$default_delete@VLogRecordExporter@logs@sdk@v1@opentelemetry@@@std@@@std@@AEBUOtlpHttpLogRecordExporterOptions@2345@@Z
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpExporterOptions::OtlpHttpExporterOptions(void)
-    ??0OtlpHttpExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpExporterOptions::~OtlpHttpExporterOptions(void)
-    ??1OtlpHttpExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpMetricExporterOptions::OtlpHttpMetricExporterOptions(void)
-    ??0OtlpHttpMetricExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpMetricExporterOptions::~OtlpHttpMetricExporterOptions(void)
-    ??1OtlpHttpMetricExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpLogRecordExporterOptions::OtlpHttpLogRecordExporterOptions(void)
-    ??0OtlpHttpLogRecordExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-    // public: __cdecl opentelemetry::v1::exporter::otlp::OtlpHttpLogRecordExporterOptions::~OtlpHttpLogRecordExporterOptions(void)
-    ??1OtlpHttpLogRecordExporterOptions@otlp@exporter@v1@opentelemetry@@QEAA@XZ
-
-    ?GetOtlpDefaultHttpTracesEndpoint@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultHttpMetricsEndpoint@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-    ?GetOtlpDefaultHttpLogsEndpoint@otlp@exporter@v1@opentelemetry@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
-#endif  // defined(WITH_OTLP_HTTP)
-// clang-format on
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/BUILD b/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/BUILD
deleted file mode 100644
index 51613ecf0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/BUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "http_client_curl",
-    srcs = [
-        "http_client_curl.cc",
-        "http_client_factory_curl.cc",
-        "http_operation_curl.cc",
-    ],
-    include_prefix = "src/http/client/curl",
-    linkopts = select({
-        "//bazel:windows": [
-            "-DEFAULTLIB:advapi32.lib",
-            "-DEFAULTLIB:crypt32.lib",
-            "-DEFAULTLIB:Normaliz.lib",
-            "-DEFAULTLIB:Ws2_32.lib",
-        ],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-        "//ext:headers",
-        "//sdk:headers",
-        "//sdk/src/common:random",
-        "@curl",
-        "@zlib",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/CMakeLists.txt
deleted file mode 100644
index 0c1d8c619..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/CMakeLists.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(
-  opentelemetry_http_client_curl http_client_factory_curl.cc
-                                 http_client_curl.cc http_operation_curl.cc)
-
-set_target_properties(opentelemetry_http_client_curl
-                      PROPERTIES EXPORT_NAME http_client_curl)
-set_target_version(opentelemetry_http_client_curl)
-target_link_libraries(opentelemetry_http_client_curl
-                      PUBLIC opentelemetry_common)
-
-unset(CURL_IMPORTED_TARGET_NAME)
-
-foreach(FIND_CURL_IMPORTED_TARGET CURL::libcurl CURL::libcurl_shared
-                                  CURL::libcurl_static)
-  if(TARGET ${FIND_CURL_IMPORTED_TARGET})
-    set(CURL_IMPORTED_TARGET_NAME ${FIND_CURL_IMPORTED_TARGET})
-    break()
-  endif()
-endforeach()
-
-if(TARGET ${CURL_IMPORTED_TARGET_NAME})
-  target_link_libraries(
-    opentelemetry_http_client_curl
-    PUBLIC opentelemetry_ext
-    PRIVATE ${CURL_IMPORTED_TARGET_NAME})
-
-  # Some versions of libcurl do not export the link directories, which may cause
-  # link errors
-  project_build_tools_get_imported_location(CURL_LIB_FILE_PATH
-                                            ${CURL_IMPORTED_TARGET_NAME})
-  get_filename_component(CURL_LIB_DIR_PATH "${CURL_LIB_FILE_PATH}" DIRECTORY)
-
-  if(CURL_LIB_DIR_PATH)
-    target_link_directories(opentelemetry_http_client_curl PUBLIC
-                            "$<BUILD_INTERFACE:${CURL_LIB_DIR_PATH}>")
-  endif()
-else()
-  target_include_directories(opentelemetry_http_client_curl
-                             INTERFACE "${CURL_INCLUDE_DIRS}")
-  target_link_libraries(
-    opentelemetry_http_client_curl
-    PUBLIC opentelemetry_ext
-    PRIVATE ${CURL_LIBRARIES})
-endif()
-
-if(WITH_CURL_LOGGING)
-  target_compile_definitions(opentelemetry_http_client_curl
-                             PRIVATE ENABLE_CURL_LOGGING)
-endif()
-
-if(WITH_OTLP_HTTP_COMPRESSION)
-  if(TARGET ZLIB::ZLIB)
-    target_link_libraries(
-      opentelemetry_http_client_curl
-      PUBLIC opentelemetry_ext
-      PRIVATE ZLIB::ZLIB)
-  else()
-    target_include_directories(opentelemetry_http_client_curl
-                               INTERFACE "${ZLIB_INCLUDE_DIRS}")
-    target_link_libraries(
-      opentelemetry_http_client_curl
-      PUBLIC opentelemetry_ext
-      PRIVATE ${ZLIB_LIBRARIES})
-  endif()
-endif()
-
-otel_add_component(COMPONENT ext_http_curl TARGETS
-                   opentelemetry_http_client_curl)
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_client_curl.cc b/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_client_curl.cc
deleted file mode 100644
index 597f0c7a2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_client_curl.cc
+++ /dev/null
@@ -1,912 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <curl/curl.h>
-#include <curl/curlver.h>
-#include <algorithm>
-#include <array>
-#include <atomic>
-#include <chrono>
-#include <cstdint>
-#include <cstring>
-#include <deque>
-#include <functional>
-#include <list>
-#include <mutex>
-#include <string>
-#include <thread>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-
-#include "opentelemetry/ext/http/client/curl/http_client_curl.h"
-#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/ext/http/common/url_parser.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-#ifdef ENABLE_OTLP_COMPRESSION_PREVIEW
-#  include <zconf.h>
-#  include <zlib.h>
-#else
-#  include "opentelemetry/sdk/common/global_log_handler.h"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-namespace curl
-{
-
-HttpCurlGlobalInitializer::HttpCurlGlobalInitializer()
-{
-  curl_global_init(CURL_GLOBAL_ALL);
-}
-
-HttpCurlGlobalInitializer::~HttpCurlGlobalInitializer()
-{
-  curl_global_cleanup();
-}
-
-nostd::shared_ptr<HttpCurlGlobalInitializer> HttpCurlGlobalInitializer::GetInstance()
-{
-  static nostd::shared_ptr<HttpCurlGlobalInitializer> shared_initializer{
-      new HttpCurlGlobalInitializer()};
-  return shared_initializer;
-}
-
-#ifdef ENABLE_OTLP_COMPRESSION_PREVIEW
-// Original source:
-// https://stackoverflow.com/questions/12398377/is-it-possible-to-have-zlib-read-from-and-write-to-the-same-memory-buffer/12412863#12412863
-int deflateInPlace(z_stream *strm, unsigned char *buf, uint32_t len, uint32_t *max_len)
-{
-  // must be large enough to hold zlib or gzip header (if any) and one more byte -- 11 works for the
-  // worst case here, but if gzip encoding is used and a deflateSetHeader() call is inserted in this
-  // code after the deflateReset(), then the 11 needs to be increased to accommodate the resulting
-  // gzip header size plus one
-  std::array<unsigned char, 11> temp{};
-
-  // kick start the process with a temporary output buffer -- this allows deflate to consume a large
-  // chunk of input data in order to make room for output data there
-  strm->next_in  = buf;
-  strm->avail_in = len;
-  if (*max_len < len)
-  {
-    *max_len = len;
-  }
-  strm->next_out  = temp.data();
-  strm->avail_out = (std::min)(static_cast<decltype(z_stream::avail_out)>(temp.size()), *max_len);
-  auto ret        = deflate(strm, Z_FINISH);
-  if (ret == Z_STREAM_ERROR)
-  {
-    return ret;
-  }
-
-  // if we can, copy the temporary output data to the consumed portion of the input buffer, and then
-  // continue to write up to the start of the consumed input for as long as possible
-  auto have = strm->next_out - temp.data();  // number of bytes in temp[]
-  if (have <= static_cast<decltype(have)>(strm->avail_in ? len - strm->avail_in : *max_len))
-  {
-    std::memcpy(buf, temp.data(), have);
-    strm->next_out = buf + have;
-    have           = 0;
-    while (ret == Z_OK)
-    {
-      strm->avail_out =
-          strm->avail_in ? strm->next_in - strm->next_out : (buf + *max_len) - strm->next_out;
-      ret = deflate(strm, Z_FINISH);
-    }
-    if (ret != Z_BUF_ERROR || strm->avail_in == 0)
-    {
-      *max_len = strm->next_out - buf;
-      return ret == Z_STREAM_END ? Z_OK : ret;
-    }
-  }
-
-  // the output caught up with the input due to insufficiently compressible data -- copy the
-  // remaining input data into an allocated buffer and complete the compression from there to the
-  // now empty input buffer (this will only occur for long incompressible streams, more than ~20 MB
-  // for the default deflate memLevel of 8, or when *max_len is too small and less than the length
-  // of the header plus one byte)
-  auto hold = static_cast<nostd::remove_const_t<decltype(z_stream::next_in)>>(
-      strm->zalloc(strm->opaque, strm->avail_in, 1));  // allocated buffer to hold input data
-  if (hold == Z_NULL)
-  {
-    return Z_MEM_ERROR;
-  }
-  std::memcpy(hold, strm->next_in, strm->avail_in);
-  strm->next_in = hold;
-  if (have)
-  {
-    std::memcpy(buf, temp.data(), have);
-    strm->next_out = buf + have;
-  }
-  strm->avail_out = (buf + *max_len) - strm->next_out;
-  ret             = deflate(strm, Z_FINISH);
-  strm->zfree(strm->opaque, hold);
-  *max_len = strm->next_out - buf;
-  return ret == Z_OK ? Z_BUF_ERROR : (ret == Z_STREAM_END ? Z_OK : ret);
-}
-#endif  // ENABLE_OTLP_COMPRESSION_PREVIEW
-
-void Session::SendRequest(
-    std::shared_ptr<opentelemetry::ext::http::client::EventHandler> callback) noexcept
-{
-  is_session_active_.store(true, std::memory_order_release);
-  const auto &url       = host_ + http_request_->uri_;
-  auto callback_ptr     = callback.get();
-  bool reuse_connection = false;
-
-  // Set CURLOPT_FRESH_CONNECT and CURLOPT_FORBID_REUSE to 1L every max_sessions_per_connection_
-  // requests. So libcurl will create a new connection instead of queue the request to the existing
-  // connection.
-  if (http_client_.GetMaxSessionsPerConnection() > 0)
-  {
-    reuse_connection = session_id_ % http_client_.GetMaxSessionsPerConnection() != 0;
-  }
-
-  if (http_request_->compression_ == opentelemetry::ext::http::client::Compression::kGzip)
-  {
-#ifdef ENABLE_OTLP_COMPRESSION_PREVIEW
-    z_stream zs{};
-    zs.zalloc = Z_NULL;
-    zs.zfree  = Z_NULL;
-    zs.opaque = Z_NULL;
-
-    // ZLIB: Have to maually specify 16 bits for the Gzip headers
-    static constexpr int kWindowBits = MAX_WBITS + 16;
-    static constexpr int kMemLevel   = MAX_MEM_LEVEL;
-
-    auto stream = deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, kWindowBits, kMemLevel,
-                               Z_DEFAULT_STRATEGY);
-
-    if (stream == Z_OK)
-    {
-      auto size     = static_cast<uInt>(http_request_->body_.size());
-      auto max_size = size;
-      stream        = deflateInPlace(&zs, http_request_->body_.data(), size, &max_size);
-
-      if (stream == Z_OK)
-      {
-        http_request_->AddHeader("Content-Encoding", "gzip");
-        http_request_->body_.resize(max_size);
-      }
-    }
-
-    if (stream != Z_OK)
-    {
-      if (callback)
-      {
-        callback->OnEvent(opentelemetry::ext::http::client::SessionState::CreateFailed,
-                          zs.msg ? zs.msg : "");
-      }
-      is_session_active_.store(false, std::memory_order_release);
-    }
-
-    deflateEnd(&zs);
-#else
-    OTEL_INTERNAL_LOG_ERROR(
-        "[HTTP Client Curl] Set WITH_OTLP_HTTP_COMPRESSION=ON to use gzip compression with the "
-        "OTLP HTTP Exporter");
-#endif  // ENABLE_OTLP_COMPRESSION_PREVIEW
-  }
-
-  curl_operation_.reset(
-      new HttpOperation(http_request_->method_, url, http_request_->ssl_options_, callback_ptr,
-                        http_request_->headers_, http_request_->body_, http_request_->compression_,
-                        false, http_request_->timeout_ms_, reuse_connection,
-                        http_request_->is_log_enabled_, http_request_->retry_policy_));
-  bool success =
-      CURLE_OK == curl_operation_->SendAsync(this, [this, callback](HttpOperation &operation) {
-        if (operation.WasAborted())
-        {
-          // Manually cancelled
-          callback->OnEvent(opentelemetry::ext::http::client::SessionState::Cancelled, "");
-        }
-
-        if (operation.GetSessionState() == opentelemetry::ext::http::client::SessionState::Response)
-        {
-          // we have a http response
-          auto response          = std::unique_ptr<Response>(new Response());
-          response->headers_     = operation.GetResponseHeaders();
-          response->body_        = operation.GetResponseBody();
-          response->status_code_ = operation.GetResponseCode();
-          callback->OnResponse(*response);
-        }
-        is_session_active_.store(false, std::memory_order_release);
-      });
-
-  if (success)
-  {
-    // We will try to create a background to poll events. But when the background is running, we
-    // will reuse it instead of creating a new one.
-    http_client_.MaybeSpawnBackgroundThread();
-  }
-  else
-  {
-    if (callback)
-    {
-      callback->OnEvent(opentelemetry::ext::http::client::SessionState::CreateFailed, "");
-    }
-    is_session_active_.store(false, std::memory_order_release);
-  }
-}
-
-bool Session::CancelSession() noexcept
-{
-  if (curl_operation_)
-  {
-    curl_operation_->Abort();
-  }
-  http_client_.CleanupSession(session_id_);
-  return true;
-}
-
-bool Session::FinishSession() noexcept
-{
-  if (curl_operation_)
-  {
-    curl_operation_->Finish();
-  }
-  http_client_.CleanupSession(session_id_);
-  return true;
-}
-
-void Session::FinishOperation()
-{
-  if (curl_operation_)
-  {
-    curl_operation_->Cleanup();
-  }
-}
-
-HttpClient::HttpClient()
-    : multi_handle_(curl_multi_init()),
-      next_session_id_{0},
-      max_sessions_per_connection_{8},
-      background_thread_instrumentation_(nullptr),
-      scheduled_delay_milliseconds_{std::chrono::milliseconds(256)},
-      background_thread_wait_for_{std::chrono::minutes{1}},
-      curl_global_initializer_(HttpCurlGlobalInitializer::GetInstance())
-{}
-
-HttpClient::HttpClient(
-    const std::shared_ptr<sdk::common::ThreadInstrumentation> &thread_instrumentation)
-    : multi_handle_(curl_multi_init()),
-      next_session_id_{0},
-      max_sessions_per_connection_{8},
-      background_thread_instrumentation_(thread_instrumentation),
-      scheduled_delay_milliseconds_{std::chrono::milliseconds(256)},
-      background_thread_wait_for_{std::chrono::minutes{1}},
-      curl_global_initializer_(HttpCurlGlobalInitializer::GetInstance())
-{}
-
-HttpClient::~HttpClient()
-{
-  is_shutdown_.store(true, std::memory_order_release);
-  while (true)
-  {
-    std::unique_ptr<std::thread> background_thread;
-    {
-      std::lock_guard<std::mutex> lock_guard{background_thread_m_};
-      background_thread.swap(background_thread_);
-    }
-
-    // Force to abort all sessions
-    CancelAllSessions();
-
-    if (!background_thread)
-    {
-      break;
-    }
-    if (background_thread->joinable())
-    {
-      wakeupBackgroundThread();  // if delay quit, wake up first
-      background_thread->join();
-    }
-  }
-  {
-    std::lock_guard<std::mutex> lock_guard{multi_handle_m_};
-    curl_multi_cleanup(multi_handle_);
-  }
-}
-
-std::shared_ptr<opentelemetry::ext::http::client::Session> HttpClient::CreateSession(
-    nostd::string_view url) noexcept
-{
-  const auto parsedUrl = common::UrlParser(std::string(url));
-  if (!parsedUrl.success_)
-  {
-    return std::make_shared<Session>(*this);
-  }
-  auto session =
-      std::make_shared<Session>(*this, parsedUrl.scheme_, parsedUrl.host_, parsedUrl.port_);
-  auto session_id = ++next_session_id_;
-  session->SetId(session_id);
-
-  std::lock_guard<std::mutex> lock_guard{sessions_m_};
-  sessions_.insert({session_id, session});
-
-  // FIXME: Session may leak if it does not call SendRequest
-  return session;
-}
-
-bool HttpClient::CancelAllSessions() noexcept
-{
-  // CancelSession may change sessions_, we can not change a container while iterating it.
-  while (true)
-  {
-    std::unordered_map<uint64_t, std::shared_ptr<Session>> sessions;
-    {
-      // We can only cleanup session and curl handles in the IO thread.
-      std::lock_guard<std::mutex> lock_guard{sessions_m_};
-      sessions = sessions_;
-    }
-
-    if (sessions.empty())
-    {
-      break;
-    }
-
-    for (auto &session : sessions)
-    {
-      session.second->CancelSession();
-    }
-  }
-  return true;
-}
-
-bool HttpClient::FinishAllSessions() noexcept
-{
-  // FinishSession may change sessions_, we can not change a container while iterating it.
-  while (true)
-  {
-    std::unordered_map<uint64_t, std::shared_ptr<Session>> sessions;
-    {
-      // We can only cleanup session and curl handles in the IO thread.
-      std::lock_guard<std::mutex> lock_guard{sessions_m_};
-      sessions = sessions_;
-    }
-
-    if (sessions.empty())
-    {
-      break;
-    }
-
-    for (auto &session : sessions)
-    {
-      session.second->FinishSession();
-    }
-  }
-  return true;
-}
-
-void HttpClient::SetMaxSessionsPerConnection(std::size_t max_requests_per_connection) noexcept
-{
-  max_sessions_per_connection_ = max_requests_per_connection;
-}
-
-void HttpClient::CleanupSession(uint64_t session_id)
-{
-  std::shared_ptr<Session> session;
-  {
-    std::lock_guard<std::mutex> lock_guard{sessions_m_};
-    auto it = sessions_.find(session_id);
-    if (it != sessions_.end())
-    {
-      session = it->second;
-      sessions_.erase(it);
-    }
-  }
-
-  bool need_wakeup_background_thread = false;
-  {
-    std::lock_guard<std::recursive_mutex> lock_guard{session_ids_m_};
-    pending_to_add_session_ids_.erase(session_id);
-
-    if (session)
-    {
-      if (pending_to_remove_session_handles_.end() !=
-          pending_to_remove_session_handles_.find(session_id))
-      {
-        pending_to_remove_sessions_.emplace_back(std::move(session));
-      }
-      else if (session->IsSessionActive() && session->GetOperation())
-      {
-        // If this session is already running, give it to the background thread for cleanup.
-        pending_to_abort_sessions_[session_id] = std::move(session);
-        need_wakeup_background_thread          = true;
-      }
-    }
-  }
-
-  if (need_wakeup_background_thread)
-  {
-    wakeupBackgroundThread();
-  }
-}
-
-bool HttpClient::MaybeSpawnBackgroundThread()
-{
-  std::lock_guard<std::mutex> lock_guard{background_thread_m_};
-  if (background_thread_)
-  {
-    return false;
-  }
-
-  background_thread_.reset(new std::thread(
-      [](HttpClient *self) {
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-        if (self->background_thread_instrumentation_ != nullptr)
-        {
-          self->background_thread_instrumentation_->OnStart();
-        }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-        auto still_running           = 1;
-        auto last_free_job_timepoint = std::chrono::system_clock::now();
-        auto need_wait_more          = false;
-        while (true)
-        {
-          CURLMsg *msg = nullptr;
-          int queued   = 0;
-          CURLMcode mc = curl_multi_perform(self->multi_handle_, &still_running);
-          // According to https://curl.se/libcurl/c/curl_multi_perform.html, when mc is not OK, we
-          // can not curl_multi_perform it again
-          if (mc != CURLM_OK)
-          {
-            self->resetMultiHandle();
-          }
-          else if (still_running || need_wait_more)
-          {
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-            if (self->background_thread_instrumentation_ != nullptr)
-            {
-              self->background_thread_instrumentation_->BeforeWait();
-            }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-        // curl_multi_poll is added from libcurl 7.66.0, before 7.68.0, we can only wait until
-        // timeout to do the remaining jobs
-#if LIBCURL_VERSION_NUM >= 0x074200
-            /* wait for activity, timeout or "nothing" */
-            mc = curl_multi_poll(self->multi_handle_, nullptr, 0,
-                                 static_cast<int>(self->scheduled_delay_milliseconds_.count()),
-                                 nullptr);
-#else
-            mc = curl_multi_wait(self->multi_handle_, nullptr, 0,
-                                 static_cast<int>(self->scheduled_delay_milliseconds_.count()),
-                                 nullptr);
-#endif
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-            if (self->background_thread_instrumentation_ != nullptr)
-            {
-              self->background_thread_instrumentation_->AfterWait();
-            }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-          }
-
-          do
-          {
-            msg = curl_multi_info_read(self->multi_handle_, &queued);
-            if (msg == nullptr)
-            {
-              break;
-            }
-
-            if (msg->msg == CURLMSG_DONE)
-            {
-              CURL *easy_handle = msg->easy_handle;
-              CURLcode result   = msg->data.result;
-              Session *session  = nullptr;
-              curl_easy_getinfo(easy_handle, CURLINFO_PRIVATE, &session);
-              const auto operation = (nullptr != session) ? session->GetOperation().get() : nullptr;
-
-              // If it's already moved into pending_to_remove_session_handles_, we just ignore this
-              // message.
-              if (operation)
-              {
-                // Session can not be destroyed when calling PerformCurlMessage
-                auto hold_session = session->shared_from_this();
-                operation->PerformCurlMessage(result);
-
-                if (operation->IsRetryable())
-                {
-                  self->pending_to_retry_sessions_.push_back(hold_session);
-                }
-              }
-            }
-          } while (true);
-
-          // Abort all pending easy handles
-          if (self->doAbortSessions())
-          {
-            still_running = 1;
-          }
-
-          // Remove all pending easy handles
-          if (self->doRemoveSessions())
-          {
-            still_running = 1;
-          }
-
-          // Add all pending easy handles
-          if (self->doAddSessions())
-          {
-            still_running = 1;
-          }
-
-          // Check if pending easy handles can be retried
-          if (self->doRetrySessions(false))
-          {
-            still_running = 1;
-          }
-
-          std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
-          if (still_running > 0)
-          {
-            last_free_job_timepoint = now;
-            need_wait_more          = false;
-            continue;
-          }
-
-          std::chrono::milliseconds wait_for = std::chrono::milliseconds::zero();
-
-#if LIBCURL_VERSION_NUM >= 0x074400
-          // only available with curl_multi_poll+curl_multi_wakeup, because curl_multi_wait would
-          // cause CPU busy, curl_multi_wait+sleep could not wakeup quickly
-          wait_for = self->background_thread_wait_for_;
-#endif
-          if (self->is_shutdown_.load(std::memory_order_acquire))
-          {
-            wait_for = std::chrono::milliseconds::zero();
-          }
-
-          if (now - last_free_job_timepoint < wait_for)
-          {
-            need_wait_more = true;
-            continue;
-          }
-
-          if (still_running == 0)
-          {
-            std::lock_guard<std::mutex> lock_guard{self->background_thread_m_};
-            // Double check, make sure no more pending sessions after locking background thread
-            // management
-
-            // Abort all pending easy handles
-            if (self->doAbortSessions())
-            {
-              still_running = 1;
-            }
-
-            // Remove all pending easy handles
-            if (self->doRemoveSessions())
-            {
-              still_running = 1;
-            }
-
-            // Add all pending easy handles
-            if (self->doAddSessions())
-            {
-              still_running = 1;
-            }
-
-            // Check if pending easy handles can be retried
-            if (self->doRetrySessions(true))
-            {
-              still_running = 1;
-            }
-
-            // If there is no pending jobs, we can stop the background thread.
-            if (still_running == 0)
-            {
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-              if (self->background_thread_instrumentation_ != nullptr)
-              {
-                self->background_thread_instrumentation_->OnEnd();
-              }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-              if (self->background_thread_)
-              {
-                self->background_thread_->detach();
-                self->background_thread_.reset();
-              }
-              break;
-            }
-          }
-        }
-      },
-      this));
-  return true;
-}
-
-void HttpClient::ScheduleAddSession(uint64_t session_id)
-{
-  {
-    std::lock_guard<std::recursive_mutex> lock_guard{session_ids_m_};
-    pending_to_add_session_ids_.insert(session_id);
-    pending_to_remove_session_handles_.erase(session_id);
-    pending_to_abort_sessions_.erase(session_id);
-  }
-
-  wakeupBackgroundThread();
-}
-
-void HttpClient::ScheduleAbortSession(uint64_t session_id)
-{
-  {
-    std::lock_guard<std::mutex> sessions_lock{sessions_m_};
-    auto session = sessions_.find(session_id);
-    if (session == sessions_.end())
-    {
-      std::lock_guard<std::recursive_mutex> session_ids_lock{session_ids_m_};
-      pending_to_add_session_ids_.erase(session_id);
-    }
-    else
-    {
-      std::lock_guard<std::recursive_mutex> session_ids_lock{session_ids_m_};
-      pending_to_abort_sessions_[session_id] = std::move(session->second);
-      pending_to_add_session_ids_.erase(session_id);
-
-      sessions_.erase(session);
-    }
-  }
-
-  wakeupBackgroundThread();
-}
-
-void HttpClient::ScheduleRemoveSession(uint64_t session_id, HttpCurlEasyResource &&resource)
-{
-  {
-    std::lock_guard<std::recursive_mutex> lock_guard{session_ids_m_};
-    pending_to_add_session_ids_.erase(session_id);
-    pending_to_remove_session_handles_[session_id] = std::move(resource);
-  }
-
-  wakeupBackgroundThread();
-}
-
-void HttpClient::SetBackgroundWaitFor(std::chrono::milliseconds ms)
-{
-  background_thread_wait_for_ = ms;
-}
-
-void HttpClient::WaitBackgroundThreadExit()
-{
-  is_shutdown_.store(true, std::memory_order_release);
-  std::unique_ptr<std::thread> background_thread;
-  {
-    std::lock_guard<std::mutex> lock_guard{background_thread_m_};
-    background_thread.swap(background_thread_);
-  }
-
-  if (background_thread && background_thread->joinable())
-  {
-    wakeupBackgroundThread();
-    background_thread->join();
-  }
-  is_shutdown_.store(false, std::memory_order_release);
-}
-
-void HttpClient::wakeupBackgroundThread()
-{
-// Before libcurl 7.68.0, we can only wait for timeout and do the rest jobs
-// See https://curl.se/libcurl/c/curl_multi_wakeup.html
-#if LIBCURL_VERSION_NUM >= 0x074400
-  std::lock_guard<std::mutex> lock_guard{multi_handle_m_};
-  if (nullptr != multi_handle_)
-  {
-    curl_multi_wakeup(multi_handle_);
-  }
-#endif
-}
-
-bool HttpClient::doAddSessions()
-{
-  std::unordered_set<uint64_t> pending_to_add_session_ids;
-  {
-    std::lock_guard<std::recursive_mutex> session_id_lock_guard{session_ids_m_};
-    pending_to_add_session_ids_.swap(pending_to_add_session_ids);
-  }
-
-  bool has_data = false;
-
-  std::lock_guard<std::mutex> lock_guard{sessions_m_};
-  for (auto &session_id : pending_to_add_session_ids)
-  {
-    auto session = sessions_.find(session_id);
-    if (session == sessions_.end())
-    {
-      continue;
-    }
-
-    if (!session->second->GetOperation())
-    {
-      continue;
-    }
-
-    CURL *easy_handle = session->second->GetOperation()->GetCurlEasyHandle();
-    if (nullptr == easy_handle)
-    {
-      continue;
-    }
-
-    curl_multi_add_handle(multi_handle_, easy_handle);
-    has_data = true;
-  }
-
-  return has_data;
-}
-
-bool HttpClient::doAbortSessions()
-{
-  std::unordered_map<uint64_t, std::shared_ptr<Session>> pending_to_abort_sessions;
-  {
-    std::lock_guard<std::recursive_mutex> session_id_lock_guard{session_ids_m_};
-    pending_to_abort_sessions_.swap(pending_to_abort_sessions);
-  }
-
-  bool has_data = false;
-  for (const auto &session : pending_to_abort_sessions)
-  {
-    if (!session.second)
-    {
-      continue;
-    }
-
-    if (session.second->GetOperation())
-    {
-      session.second->FinishOperation();
-      has_data = true;
-    }
-  }
-  return has_data;
-}
-
-bool HttpClient::doRemoveSessions()
-{
-  bool has_data = false;
-  bool should_continue;
-  do
-  {
-    std::unordered_map<uint64_t, HttpCurlEasyResource> pending_to_remove_session_handles;
-    std::list<std::shared_ptr<Session>> pending_to_remove_sessions;
-    {
-      std::lock_guard<std::recursive_mutex> session_id_lock_guard{session_ids_m_};
-      pending_to_remove_session_handles_.swap(pending_to_remove_session_handles);
-      pending_to_remove_sessions_.swap(pending_to_remove_sessions);
-    }
-    {
-      // If user callback do not call CancelSession or FinishSession, We still need to remove it
-      // from sessions_
-      std::lock_guard<std::mutex> session_lock_guard{sessions_m_};
-      for (auto &removing_handle : pending_to_remove_session_handles)
-      {
-        auto session = sessions_.find(removing_handle.first);
-        if (session != sessions_.end())
-        {
-          pending_to_remove_sessions.emplace_back(std::move(session->second));
-          sessions_.erase(session);
-        }
-      }
-    }
-
-    for (auto &removing_handle : pending_to_remove_session_handles)
-    {
-      if (nullptr != removing_handle.second.headers_chunk)
-      {
-        curl_slist_free_all(removing_handle.second.headers_chunk);
-      }
-
-      curl_multi_remove_handle(multi_handle_, removing_handle.second.easy_handle);
-      curl_easy_cleanup(removing_handle.second.easy_handle);
-    }
-
-    for (auto &removing_session : pending_to_remove_sessions)
-    {
-      // This operation may add more pending_to_remove_session_handles
-      removing_session->FinishOperation();
-    }
-
-    should_continue =
-        !pending_to_remove_session_handles.empty() || !pending_to_remove_sessions.empty();
-    if (should_continue)
-    {
-      has_data = true;
-    }
-  } while (should_continue);
-
-  return has_data;
-}
-
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
-bool HttpClient::doRetrySessions(bool report_all)
-{
-  const auto now = std::chrono::system_clock::now();
-  auto has_data  = false;
-
-  // Assumptions:
-  // - This is a FIFO list so older sessions, pushed at the back, always end up at the front
-  // - Locking not required because only the background thread would be pushing to this container
-  // - Retry policy is not changed once HTTP client is initialized, so same settings for everyone
-  for (auto retry_it = pending_to_retry_sessions_.cbegin();
-       retry_it != pending_to_retry_sessions_.cend();)
-  {
-    const auto session   = *retry_it;
-    const auto operation = session ? session->GetOperation().get() : nullptr;
-
-    if (!operation)
-    {
-      retry_it = pending_to_retry_sessions_.erase(retry_it);
-    }
-    else if (operation->NextRetryTime() < now)
-    {
-      auto easy_handle = operation->GetCurlEasyHandle();
-      curl_multi_remove_handle(multi_handle_, easy_handle);
-      curl_multi_add_handle(multi_handle_, easy_handle);
-      retry_it = pending_to_retry_sessions_.erase(retry_it);
-      has_data = true;
-    }
-    else
-    {
-      break;
-    }
-  }
-
-  report_all = report_all && !pending_to_retry_sessions_.empty();
-  return has_data || report_all;
-}
-#else
-bool HttpClient::doRetrySessions(bool /* report_all */)
-{
-  return false;
-}
-#endif  // ENABLE_OTLP_RETRY_PREVIEW
-
-void HttpClient::resetMultiHandle()
-{
-  std::list<std::shared_ptr<Session>> sessions;
-  std::lock_guard<std::mutex> session_lock_guard{sessions_m_};
-  {
-    std::lock_guard<std::recursive_mutex> session_id_lock_guard{session_ids_m_};
-    for (auto &session : sessions_)
-    {
-      if (pending_to_add_session_ids_.end() == pending_to_add_session_ids_.find(session.first))
-      {
-        sessions.push_back(session.second);
-      }
-    }
-  }
-
-  for (auto &session : sessions)
-  {
-    session->CancelSession();
-    session->FinishOperation();
-  }
-
-  doRemoveSessions();
-
-  // We will modify the multi_handle_, so we need to lock it
-  std::lock_guard<std::mutex> lock_guard{multi_handle_m_};
-  curl_multi_cleanup(multi_handle_);
-
-  // Create a another multi handle to continue pending sessions
-  multi_handle_ = curl_multi_init();
-}
-
-}  // namespace curl
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_client_factory_curl.cc b/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_client_factory_curl.cc
deleted file mode 100644
index b339c2d93..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_client_factory_curl.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-
-#include "opentelemetry/ext/http/client/curl/http_client_curl.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-
-namespace http_client = opentelemetry::ext::http::client;
-
-std::shared_ptr<http_client::HttpClient> http_client::HttpClientFactory::Create()
-{
-  return std::make_shared<http_client::curl::HttpClient>();
-}
-
-std::shared_ptr<http_client::HttpClient> http_client::HttpClientFactory::Create(
-    const std::shared_ptr<sdk::common::ThreadInstrumentation> &thread_instrumentation)
-{
-  return std::make_shared<http_client::curl::HttpClient>(thread_instrumentation);
-}
-
-std::shared_ptr<http_client::HttpClientSync> http_client::HttpClientFactory::CreateSync()
-{
-  return std::make_shared<http_client::curl::HttpClientSync>();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_operation_curl.cc b/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_operation_curl.cc
deleted file mode 100644
index b1e5e4c9a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/src/http/client/curl/http_operation_curl.cc
+++ /dev/null
@@ -1,1434 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <curl/curl.h>
-#include <curl/curlver.h>
-
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
-#  include <array>
-#endif  // ENABLE_OTLP_RETRY_PREVIEW
-
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <cmath>
-#include <cstring>
-#include <functional>
-#include <future>
-#include <map>
-#include <memory>
-#include <random>
-#include <ratio>
-#include <sstream>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/ext/http/client/curl/http_client_curl.h"
-#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/version.h"
-
-// CURL_VERSION_BITS was added in CURL 7.43.0
-#ifndef CURL_VERSION_BITS
-#  define CURL_VERSION_BITS(x, y, z) ((x) << 16 | (y) << 8 | (z))
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-namespace curl
-{
-
-size_t HttpOperation::WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp)
-{
-  HttpOperation *self = reinterpret_cast<HttpOperation *>(userp);
-  if (nullptr == self)
-  {
-    return 0;
-  }
-
-  self->raw_response_.insert(self->raw_response_.end(), static_cast<char *>(contents),
-                             static_cast<char *>(contents) + (size * nmemb));
-
-  if (self->WasAborted())
-  {
-    return 0;
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connecting)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Connected);
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connected)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Sending);
-  }
-
-  return size * nmemb;
-}
-
-size_t HttpOperation::WriteVectorHeaderCallback(void *ptr, size_t size, size_t nmemb, void *userp)
-{
-  HttpOperation *self = reinterpret_cast<HttpOperation *>(userp);
-  if (nullptr == self)
-  {
-    return 0;
-  }
-
-  const unsigned char *begin = static_cast<unsigned char *>(ptr);
-  const unsigned char *end   = begin + size * nmemb;
-  self->response_headers_.insert(self->response_headers_.end(), begin, end);
-
-  if (self->WasAborted())
-  {
-    return 0;
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connecting)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Connected);
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connected)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Sending);
-  }
-
-  return size * nmemb;
-}
-
-size_t HttpOperation::WriteVectorBodyCallback(void *ptr, size_t size, size_t nmemb, void *userp)
-{
-  HttpOperation *self = reinterpret_cast<HttpOperation *>(userp);
-  if (nullptr == self)
-  {
-    return 0;
-  }
-
-  const unsigned char *begin = static_cast<unsigned char *>(ptr);
-  const unsigned char *end   = begin + size * nmemb;
-  self->response_body_.insert(self->response_body_.end(), begin, end);
-
-  if (self->WasAborted())
-  {
-    return 0;
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connecting)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Connected);
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connected)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Sending);
-  }
-
-  return size * nmemb;
-}
-
-size_t HttpOperation::ReadMemoryCallback(char *buffer, size_t size, size_t nitems, void *userp)
-{
-  HttpOperation *self = reinterpret_cast<HttpOperation *>(userp);
-  if (nullptr == self)
-  {
-    return 0;
-  }
-
-  if (self->WasAborted())
-  {
-    return CURL_READFUNC_ABORT;
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connecting)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Connected);
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connected)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Sending);
-  }
-
-  // EOF
-  if (self->request_nwrite_ >= self->request_body_.size())
-  {
-    return 0;
-  }
-
-  size_t nwrite = size * nitems;
-  if (nwrite > self->request_body_.size() - self->request_nwrite_)
-  {
-    nwrite = self->request_body_.size() - self->request_nwrite_;
-  }
-
-  memcpy(buffer, &self->request_body_[self->request_nwrite_], nwrite);
-  self->request_nwrite_ += nwrite;
-  return nwrite;
-}
-
-#if LIBCURL_VERSION_NUM >= 0x075000
-int HttpOperation::PreRequestCallback(void *clientp, char *, char *, int, int)
-{
-  HttpOperation *self = reinterpret_cast<HttpOperation *>(clientp);
-  if (nullptr == self)
-  {
-    return CURL_PREREQFUNC_ABORT;
-  }
-
-  if (self->GetSessionState() == opentelemetry::ext::http::client::SessionState::Connecting)
-  {
-    self->DispatchEvent(opentelemetry::ext::http::client::SessionState::Connected);
-  }
-
-  if (self->WasAborted())
-  {
-    return CURL_PREREQFUNC_ABORT;
-  }
-
-  return CURL_PREREQFUNC_OK;
-}
-#endif
-
-#if LIBCURL_VERSION_NUM >= 0x072000
-int HttpOperation::OnProgressCallback(void *clientp,
-                                      curl_off_t /* dltotal */,
-                                      curl_off_t /* dlnow */,
-                                      curl_off_t /* ultotal */,
-                                      curl_off_t /* ulnow */)
-{
-  HttpOperation *self = reinterpret_cast<HttpOperation *>(clientp);
-  if (nullptr == self)
-  {
-    return -1;
-  }
-
-  if (self->WasAborted())
-  {
-    return -1;
-  }
-
-  // CURL_PROGRESSFUNC_CONTINUE is added in 7.68.0
-#  if defined(CURL_PROGRESSFUNC_CONTINUE)
-  return CURL_PROGRESSFUNC_CONTINUE;
-#  else
-  return 0;
-#  endif
-}
-#else
-int HttpOperation::OnProgressCallback(void *clientp,
-                                      double /* dltotal */,
-                                      double /* dlnow */,
-                                      double /* ultotal */,
-                                      double /* ulnow */)
-{
-  HttpOperation *self = reinterpret_cast<HttpOperation *>(clientp);
-  if (nullptr == self)
-  {
-    return -1;
-  }
-
-  if (self->WasAborted())
-  {
-    return -1;
-  }
-
-  return 0;
-}
-#endif
-
-void HttpOperation::DispatchEvent(opentelemetry::ext::http::client::SessionState type,
-                                  const std::string &reason)
-{
-  if (event_handle_ != nullptr)
-  {
-    event_handle_->OnEvent(type, reason);
-  }
-
-  session_state_ = type;
-}
-
-HttpOperation::HttpOperation(opentelemetry::ext::http::client::Method method,
-                             std::string url,
-                             const HttpSslOptions &ssl_options,
-                             opentelemetry::ext::http::client::EventHandler *event_handle,
-                             // Default empty headers and empty request body
-                             const opentelemetry::ext::http::client::Headers &request_headers,
-                             const opentelemetry::ext::http::client::Body &request_body,
-                             const opentelemetry::ext::http::client::Compression &compression,
-                             // Default connectivity and response size options
-                             bool is_raw_response,
-                             std::chrono::milliseconds http_conn_timeout,
-                             bool reuse_connection,
-                             bool is_log_enabled,
-                             const RetryPolicy &retry_policy)
-    : is_aborted_(false),
-      is_finished_(false),
-      is_cleaned_(false),
-      // Optional connection params
-      is_raw_response_(is_raw_response),
-      reuse_connection_(reuse_connection),
-      http_conn_timeout_(http_conn_timeout),
-      // Result
-      last_curl_result_(CURLE_OK),
-      event_handle_(event_handle),
-      method_(method),
-      url_(std::move(url)),
-      ssl_options_(ssl_options),
-      // Local vars
-      request_headers_(request_headers),
-      request_body_(request_body),
-      request_nwrite_(0),
-      session_state_(opentelemetry::ext::http::client::SessionState::Created),
-      compression_(compression),
-      is_log_enabled_(is_log_enabled),
-      retry_policy_(retry_policy),
-      retry_attempts_((retry_policy.max_attempts > 0U &&
-                       retry_policy.initial_backoff > SecondsDecimal::zero() &&
-                       retry_policy.max_backoff > SecondsDecimal::zero() &&
-                       retry_policy.backoff_multiplier > 0.0f)
-                          ? 0
-                          : retry_policy.max_attempts),
-      response_code_(0)
-{
-  /* get a curl handle */
-  curl_resource_.easy_handle = curl_easy_init();
-  if (!curl_resource_.easy_handle)
-  {
-    last_curl_result_ = CURLE_FAILED_INIT;
-    DispatchEvent(opentelemetry::ext::http::client::SessionState::CreateFailed,
-                  curl_easy_strerror(last_curl_result_));
-    return;
-  }
-
-  // Specify our custom headers
-  if (!this->request_headers_.empty())
-  {
-    for (auto &kv : this->request_headers_)
-    {
-      const auto header = std::string(kv.first).append(": ").append(kv.second);
-      curl_resource_.headers_chunk =
-          curl_slist_append(curl_resource_.headers_chunk, header.c_str());
-    }
-  }
-
-  DispatchEvent(opentelemetry::ext::http::client::SessionState::Created);
-}
-
-HttpOperation::~HttpOperation()
-{
-  // Given the request has not been aborted we should wait for completion here
-  // This guarantees the lifetime of this request.
-  switch (GetSessionState())
-  {
-    case opentelemetry::ext::http::client::SessionState::Connecting:
-    case opentelemetry::ext::http::client::SessionState::Connected:
-    case opentelemetry::ext::http::client::SessionState::Sending: {
-      if (async_data_ && async_data_->result_future.valid())
-      {
-        if (async_data_->callback_thread != std::this_thread::get_id())
-        {
-          async_data_->result_future.wait();
-          last_curl_result_ = async_data_->result_future.get();
-        }
-      }
-      break;
-    }
-    default:
-      break;
-  }
-
-  Cleanup();
-}
-
-void HttpOperation::Finish()
-{
-  if (is_finished_.exchange(true, std::memory_order_acq_rel))
-  {
-    return;
-  }
-
-  if (async_data_ && async_data_->result_future.valid())
-  {
-    // We should not wait in callback from Cleanup()
-    if (async_data_->callback_thread != std::this_thread::get_id())
-    {
-      async_data_->result_future.wait();
-      last_curl_result_ = async_data_->result_future.get();
-    }
-  }
-}
-
-void HttpOperation::Cleanup()
-{
-  if (is_cleaned_.exchange(true, std::memory_order_acq_rel))
-  {
-    return;
-  }
-
-  switch (GetSessionState())
-  {
-    case opentelemetry::ext::http::client::SessionState::Created:
-    case opentelemetry::ext::http::client::SessionState::Connecting:
-    case opentelemetry::ext::http::client::SessionState::Connected:
-    case opentelemetry::ext::http::client::SessionState::Sending: {
-      const char *message = GetCurlErrorMessage(last_curl_result_);
-      DispatchEvent(opentelemetry::ext::http::client::SessionState::Cancelled, message);
-      break;
-    }
-    default:
-      break;
-  }
-
-  std::function<void(HttpOperation &)> callback;
-
-  // Only cleanup async once even in recursive calls
-  if (async_data_)
-  {
-    // Just reset and move easy_handle to owner if in async mode
-    if (async_data_->session != nullptr)
-    {
-      auto session         = async_data_->session;
-      async_data_->session = nullptr;
-
-      if (curl_resource_.easy_handle != nullptr)
-      {
-        curl_easy_setopt(curl_resource_.easy_handle, CURLOPT_PRIVATE, NULL);
-        curl_easy_reset(curl_resource_.easy_handle);
-      }
-      session->GetHttpClient().ScheduleRemoveSession(session->GetSessionId(),
-                                                     std::move(curl_resource_));
-    }
-
-    callback.swap(async_data_->callback);
-    if (callback)
-    {
-      async_data_->callback_thread = std::this_thread::get_id();
-      callback(*this);
-      async_data_->callback_thread = std::thread::id();
-    }
-
-    // Set value to promise to continue Finish()
-    if (true == async_data_->is_promise_running.exchange(false, std::memory_order_acq_rel))
-    {
-      async_data_->result_promise.set_value(last_curl_result_);
-    }
-
-    return;
-  }
-
-  // Sync mode
-  if (curl_resource_.easy_handle != nullptr)
-  {
-    curl_easy_cleanup(curl_resource_.easy_handle);
-    curl_resource_.easy_handle = nullptr;
-  }
-
-  if (curl_resource_.headers_chunk != nullptr)
-  {
-    curl_slist_free_all(curl_resource_.headers_chunk);
-    curl_resource_.headers_chunk = nullptr;
-  }
-}
-
-bool HttpOperation::IsRetryable()
-{
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
-  static constexpr auto kRetryableStatusCodes = std::array<decltype(response_code_), 4>{
-      429,  // Too Many Requests
-      502,  // Bad Gateway
-      503,  // Service Unavailable
-      504   // Gateway Timeout
-  };
-
-  const auto is_retryable = std::find(kRetryableStatusCodes.cbegin(), kRetryableStatusCodes.cend(),
-                                      response_code_) != kRetryableStatusCodes.cend();
-
-  return is_retryable && (last_curl_result_ == CURLE_OK) &&
-         (retry_attempts_ < retry_policy_.max_attempts);
-#else
-  return false;
-#endif  // ENABLE_OTLP_RETRY_PREVIEW
-}
-
-std::chrono::system_clock::time_point HttpOperation::NextRetryTime()
-{
-  static std::random_device rd;
-  static std::mt19937 gen(rd());
-  static std::uniform_real_distribution<float> dis(0.8f, 1.2f);
-
-  // The initial retry attempt will occur after initialBackoff * random(0.8, 1.2)
-  auto backoff = retry_policy_.initial_backoff;
-
-  // After that, the n-th attempt will occur after
-  // min(initialBackoff*backoffMultiplier**(n-1), maxBackoff) * random(0.8, 1.2))
-  if (retry_attempts_ > 1)
-  {
-    backoff = (std::min)(retry_policy_.initial_backoff *
-                             std::pow(retry_policy_.backoff_multiplier,
-                                      static_cast<SecondsDecimal::rep>(retry_attempts_ - 1)),
-                         retry_policy_.max_backoff);
-  }
-
-  // Jitter of plus or minus 0.2 is applied to the backoff delay to avoid hammering servers at the
-  // same time from a large number of clients. Note that this means that the backoff delay may
-  // actually be slightly lower than initialBackoff or slightly higher than maxBackoff
-  backoff *= dis(gen);
-
-  return last_attempt_time_ + std::chrono::duration_cast<std::chrono::milliseconds>(backoff);
-}
-
-/*
-  Support for TLS min version, TLS max version.
-
-  To represent versions, the following symbols are needed:
-
-  Added in CURL 7.34.0:
-  - CURL_SSLVERSION_TLSv1_0 (do not use)
-  - CURL_SSLVERSION_TLSv1_1 (do not use)
-  - CURL_SSLVERSION_TLSv1_2
-
-  Added in CURL 7.52.0:
-  - CURL_SSLVERSION_TLSv1_3
-
-  Added in CURL 7.54.0:
-  - CURL_SSLVERSION_MAX_TLSv1_0 (do not use)
-  - CURL_SSLVERSION_MAX_TLSv1_1 (do not use)
-  - CURL_SSLVERSION_MAX_TLSv1_2
-  - CURL_SSLVERSION_MAX_TLSv1_3
-
-  For 7.34.0 <= CURL < 7.54.0,
-  we don't want to get into partial support.
-
-  CURL 7.54.0 is required.
-*/
-#if LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(7, 54, 0)
-#  define HAVE_TLS_VERSION
-#endif
-
-static long parse_min_ssl_version(const std::string &version)
-{
-#ifdef HAVE_TLS_VERSION
-  if (version == "1.2")
-  {
-    return CURL_SSLVERSION_TLSv1_2;
-  }
-
-  if (version == "1.3")
-  {
-    return CURL_SSLVERSION_TLSv1_3;
-  }
-#endif
-
-  return 0;
-}
-
-static long parse_max_ssl_version(const std::string &version)
-{
-#ifdef HAVE_TLS_VERSION
-  if (version == "1.2")
-  {
-    return CURL_SSLVERSION_MAX_TLSv1_2;
-  }
-
-  if (version == "1.3")
-  {
-    return CURL_SSLVERSION_MAX_TLSv1_3;
-  }
-#endif
-
-  return 0;
-}
-
-const char *HttpOperation::GetCurlErrorMessage(CURLcode code)
-{
-  const char *message;
-
-  if (curl_error_message_[0] != '\0')
-  {
-    // Will contain contextual data
-    message = curl_error_message_;
-  }
-  else
-  {
-    // Generic message
-    message = curl_easy_strerror(code);
-  }
-
-  return message;
-}
-
-CURLcode HttpOperation::SetCurlPtrOption(CURLoption option, void *value)
-{
-  CURLcode rc;
-
-  /*
-    curl_easy_setopt() is a macro with variadic arguments, type unsafe.
-    Various SetCurlXxxOption() helpers ensure it is called with a pointer,
-    which can be:
-    - a string (const char*)
-    - a blob (struct curl_blob*)
-    - a headers chunk (curl_slist *)
-  */
-  rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
-
-  if (rc != CURLE_OK)
-  {
-    const char *message = GetCurlErrorMessage(rc);
-    OTEL_INTERNAL_LOG_ERROR("CURL, set option <" << std::to_string(option) << "> failed: <"
-                                                 << message << ">");
-  }
-
-  return rc;
-}
-
-CURLcode HttpOperation::SetCurlLongOption(CURLoption option, long value)
-{
-  CURLcode rc;
-
-  /*
-    curl_easy_setopt() is a macro with variadic arguments, type unsafe.
-    SetCurlLongOption() ensures it is called with a long.
-  */
-  rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
-
-  if (rc != CURLE_OK)
-  {
-    const char *message = GetCurlErrorMessage(rc);
-    OTEL_INTERNAL_LOG_ERROR("CURL, set option <" << std::to_string(option) << "> failed: <"
-                                                 << message << ">");
-  }
-
-  return rc;
-}
-
-CURLcode HttpOperation::SetCurlOffOption(CURLoption option, curl_off_t value)
-{
-  CURLcode rc;
-
-  /*
-    curl_easy_setopt() is a macro with variadic arguments, type unsafe.
-    SetCurlOffOption() ensures it is called with a curl_off_t.
-  */
-  rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);
-
-  if (rc != CURLE_OK)
-  {
-    const char *message = GetCurlErrorMessage(rc);
-    OTEL_INTERNAL_LOG_ERROR("CURL, set option <" << std::to_string(option) << "> failed: <"
-                                                 << message << ">");
-  }
-
-  return rc;
-}
-
-int HttpOperation::CurlLoggerCallback(const CURL * /* handle */,
-                                      curl_infotype type,
-                                      const char *data,
-                                      size_t size,
-                                      void * /* clientp */) noexcept
-{
-  nostd::string_view text_to_log{data, size};
-
-  if (!text_to_log.empty() && text_to_log[size - 1] == '\n')
-  {
-    text_to_log = text_to_log.substr(0, size - 1);
-  }
-
-  if (type == CURLINFO_TEXT)
-  {
-    static const auto kTlsInfo    = nostd::string_view("SSL connection using");
-    static const auto kFailureMsg = nostd::string_view("Recv failure:");
-
-    if (text_to_log.substr(0, kTlsInfo.size()) == kTlsInfo)
-    {
-      OTEL_INTERNAL_LOG_INFO(text_to_log);
-    }
-    else if (text_to_log.substr(0, kFailureMsg.size()) == kFailureMsg)
-    {
-      OTEL_INTERNAL_LOG_ERROR(text_to_log);
-    }
-// This guard serves as a catch-all block for all other less interesting output that should
-// remain available for maintainer internal use and for debugging purposes only.
-#ifdef OTEL_CURL_DEBUG
-    else
-    {
-      OTEL_INTERNAL_LOG_DEBUG(text_to_log);
-    }
-#endif  // OTEL_CURL_DEBUG
-  }
-// Same as above, this guard is meant only for internal use by maintainers, and should not be used
-// in production (information leak).
-#ifdef OTEL_CURL_DEBUG
-  else if (type == CURLINFO_HEADER_OUT)
-  {
-    static const auto kHeaderSent = nostd::string_view("Send header => ");
-
-    while (!text_to_log.empty() && !std::iscntrl(text_to_log[0]))
-    {
-      const auto pos = text_to_log.find('\n');
-
-      if (pos != nostd::string_view::npos)
-      {
-        OTEL_INTERNAL_LOG_DEBUG(kHeaderSent << text_to_log.substr(0, pos - 1));
-        text_to_log = text_to_log.substr(pos + 1);
-      }
-    }
-  }
-  else if (type == CURLINFO_HEADER_IN)
-  {
-    static const auto kHeaderRecv = nostd::string_view("Recv header => ");
-    OTEL_INTERNAL_LOG_DEBUG(kHeaderRecv << text_to_log);
-  }
-#endif  // OTEL_CURL_DEBUG
-
-  return 0;
-}
-
-CURLcode HttpOperation::Setup()
-{
-#ifdef ENABLE_CURL_LOGGING
-  static constexpr auto kEnableCurlLogging = true;
-#else
-  static constexpr auto kEnableCurlLogging = false;
-#endif  // ENABLE_CURL_LOGGING
-
-  if (!curl_resource_.easy_handle)
-  {
-    return CURLE_FAILED_INIT;
-  }
-
-  CURLcode rc;
-
-  curl_error_message_[0] = '\0';
-  curl_easy_setopt(curl_resource_.easy_handle, CURLOPT_ERRORBUFFER, curl_error_message_);
-
-// Support for custom debug function callback was added in version 7.9.6 so we guard against
-// exposing the default CURL output by keeping verbosity always disabled in lower versions.
-#if LIBCURL_VERSION_NUM < CURL_VERSION_BITS(7, 9, 6)
-  rc = SetCurlLongOption(CURLOPT_VERBOSE, 0L);
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-#else
-  rc = SetCurlLongOption(CURLOPT_VERBOSE, (is_log_enabled_ && kEnableCurlLogging) ? 1L : 0L);
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-
-  rc = SetCurlPtrOption(CURLOPT_DEBUGFUNCTION,
-                        reinterpret_cast<void *>(&HttpOperation::CurlLoggerCallback));
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-#endif
-
-  // Specify target URL
-  rc = SetCurlStrOption(CURLOPT_URL, url_.c_str());
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-
-  if (ssl_options_.use_ssl)
-  {
-    /* 1 - CA CERT */
-
-    if (!ssl_options_.ssl_ca_cert_path.empty())
-    {
-      const char *path = ssl_options_.ssl_ca_cert_path.c_str();
-
-      rc = SetCurlStrOption(CURLOPT_CAINFO, path);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-    }
-    else if (!ssl_options_.ssl_ca_cert_string.empty())
-    {
-#if LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(7, 77, 0)
-      const char *data = ssl_options_.ssl_ca_cert_string.c_str();
-      size_t data_len  = ssl_options_.ssl_ca_cert_string.length();
-
-      struct curl_blob stblob;
-      stblob.data  = const_cast<char *>(data);
-      stblob.len   = data_len;
-      stblob.flags = CURL_BLOB_COPY;
-
-      rc = SetCurlBlobOption(CURLOPT_CAINFO_BLOB, &stblob);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-#else
-      // CURL 7.77.0 required for CURLOPT_CAINFO_BLOB.
-      OTEL_INTERNAL_LOG_ERROR("CURL 7.77.0 required for CA CERT STRING");
-      return CURLE_UNKNOWN_OPTION;
-#endif
-    }
-
-    /* 2 - CLIENT KEY */
-
-    if (!ssl_options_.ssl_client_key_path.empty())
-    {
-      const char *path = ssl_options_.ssl_client_key_path.c_str();
-
-      rc = SetCurlStrOption(CURLOPT_SSLKEY, path);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-
-      rc = SetCurlStrOption(CURLOPT_SSLKEYTYPE, "PEM");
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-    }
-    else if (!ssl_options_.ssl_client_key_string.empty())
-    {
-#if LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(7, 71, 0)
-      const char *data = ssl_options_.ssl_client_key_string.c_str();
-      size_t data_len  = ssl_options_.ssl_client_key_string.length();
-
-      struct curl_blob stblob;
-      stblob.data  = const_cast<char *>(data);
-      stblob.len   = data_len;
-      stblob.flags = CURL_BLOB_COPY;
-
-      rc = SetCurlBlobOption(CURLOPT_SSLKEY_BLOB, &stblob);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-
-      rc = SetCurlStrOption(CURLOPT_SSLKEYTYPE, "PEM");
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-#else
-      // CURL 7.71.0 required for CURLOPT_SSLKEY_BLOB.
-      OTEL_INTERNAL_LOG_ERROR("CURL 7.71.0 required for CLIENT KEY STRING");
-      return CURLE_UNKNOWN_OPTION;
-#endif
-    }
-
-    /* 3 - CLIENT CERT */
-
-    if (!ssl_options_.ssl_client_cert_path.empty())
-    {
-      const char *path = ssl_options_.ssl_client_cert_path.c_str();
-
-      rc = SetCurlStrOption(CURLOPT_SSLCERT, path);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-
-      rc = SetCurlStrOption(CURLOPT_SSLCERTTYPE, "PEM");
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-    }
-    else if (!ssl_options_.ssl_client_cert_string.empty())
-    {
-#if LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(7, 71, 0)
-      const char *data = ssl_options_.ssl_client_cert_string.c_str();
-      size_t data_len  = ssl_options_.ssl_client_cert_string.length();
-
-      struct curl_blob stblob;
-      stblob.data  = const_cast<char *>(data);
-      stblob.len   = data_len;
-      stblob.flags = CURL_BLOB_COPY;
-
-      rc = SetCurlBlobOption(CURLOPT_SSLCERT_BLOB, &stblob);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-
-      rc = SetCurlStrOption(CURLOPT_SSLCERTTYPE, "PEM");
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-#else
-      // CURL 7.71.0 required for CURLOPT_SSLCERT_BLOB.
-      OTEL_INTERNAL_LOG_ERROR("CURL 7.71.0 required for CLIENT CERT STRING");
-      return CURLE_UNKNOWN_OPTION;
-#endif
-    }
-
-    /* 4 - TLS */
-
-#ifdef HAVE_TLS_VERSION
-    /* By default, TLSv1.2 or better is required (if we have TLS). */
-    long min_ssl_version = CURL_SSLVERSION_TLSv1_2;
-#else
-    long min_ssl_version = 0;
-#endif
-
-    if (!ssl_options_.ssl_min_tls.empty())
-    {
-#ifdef HAVE_TLS_VERSION
-      min_ssl_version = parse_min_ssl_version(ssl_options_.ssl_min_tls);
-
-      if (min_ssl_version == 0)
-      {
-        OTEL_INTERNAL_LOG_ERROR("Unknown min TLS version <" << ssl_options_.ssl_min_tls << ">");
-        return CURLE_UNKNOWN_OPTION;
-      }
-#else
-      OTEL_INTERNAL_LOG_ERROR("CURL 7.54.0 required for MIN TLS");
-      return CURLE_UNKNOWN_OPTION;
-#endif
-    }
-
-    /*
-     * Do not set a max TLS version by default.
-     * The CURL + openssl library may be more recent than this code,
-     * and support a version we do not know about.
-     */
-    long max_ssl_version = 0;
-
-    if (!ssl_options_.ssl_max_tls.empty())
-    {
-#ifdef HAVE_TLS_VERSION
-      max_ssl_version = parse_max_ssl_version(ssl_options_.ssl_max_tls);
-
-      if (max_ssl_version == 0)
-      {
-        OTEL_INTERNAL_LOG_ERROR("Unknown max TLS version <" << ssl_options_.ssl_max_tls << ">");
-        return CURLE_UNKNOWN_OPTION;
-      }
-#else
-      OTEL_INTERNAL_LOG_ERROR("CURL 7.54.0 required for MAX TLS");
-      return CURLE_UNKNOWN_OPTION;
-#endif
-    }
-
-    long version_range = min_ssl_version | max_ssl_version;
-    if (version_range != 0)
-    {
-      rc = SetCurlLongOption(CURLOPT_SSLVERSION, version_range);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-    }
-
-    /* 5 - CIPHER */
-
-    if (!ssl_options_.ssl_cipher.empty())
-    {
-      /* TLS 1.2 */
-      const char *cipher_list = ssl_options_.ssl_cipher.c_str();
-
-      rc = SetCurlStrOption(CURLOPT_SSL_CIPHER_LIST, cipher_list);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-    }
-
-    if (!ssl_options_.ssl_cipher_suite.empty())
-    {
-#if LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(7, 61, 0)
-      /* TLS 1.3 */
-      const char *cipher_list = ssl_options_.ssl_cipher_suite.c_str();
-
-      rc = SetCurlStrOption(CURLOPT_TLS13_CIPHERS, cipher_list);
-#else
-      // CURL 7.61.0 required for CURLOPT_TLS13_CIPHERS.
-      OTEL_INTERNAL_LOG_ERROR("CURL 7.61.0 required for CIPHER SUITE");
-      return CURLE_UNKNOWN_OPTION;
-#endif
-
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-    }
-
-    if (ssl_options_.ssl_insecure_skip_verify)
-    {
-      /* 6 - DO NOT ENFORCE VERIFICATION, This is not secure. */
-      rc = SetCurlLongOption(CURLOPT_USE_SSL, static_cast<long>(CURLUSESSL_NONE));
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-
-      rc = SetCurlLongOption(CURLOPT_SSL_VERIFYPEER, 0L);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-
-      rc = SetCurlLongOption(CURLOPT_SSL_VERIFYHOST, 0L);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-    }
-    else
-    {
-      /* 6 - ENFORCE VERIFICATION */
-      rc = SetCurlLongOption(CURLOPT_USE_SSL, static_cast<long>(CURLUSESSL_ALL));
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-
-      rc = SetCurlLongOption(CURLOPT_SSL_VERIFYPEER, 1L);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-
-      rc = SetCurlLongOption(CURLOPT_SSL_VERIFYHOST, 2L);
-      if (rc != CURLE_OK)
-      {
-        return rc;
-      }
-    }
-  }
-  else
-  {
-    rc = SetCurlLongOption(CURLOPT_SSL_VERIFYPEER, 0L);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlLongOption(CURLOPT_SSL_VERIFYHOST, 0L);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-  }
-
-  if (compression_ == opentelemetry::ext::http::client::Compression::kGzip)
-  {
-    rc = SetCurlStrOption(CURLOPT_ACCEPT_ENCODING, "gzip");
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-  }
-
-  if (curl_resource_.headers_chunk != nullptr)
-  {
-    rc = SetCurlListOption(CURLOPT_HTTPHEADER, curl_resource_.headers_chunk);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-  }
-
-  // TODO: control local port to use
-  // curl_easy_setopt(curl, CURLOPT_LOCALPORT, dcf_port);
-
-  rc = SetCurlLongOption(CURLOPT_TIMEOUT_MS, static_cast<long>(http_conn_timeout_.count()));
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-
-  // abort if slower than 4kb/sec during 30 seconds
-  rc = SetCurlLongOption(CURLOPT_LOW_SPEED_TIME, 30L);
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-
-  rc = SetCurlLongOption(CURLOPT_LOW_SPEED_LIMIT, 4096L);
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-
-  if (reuse_connection_)
-  {
-    rc = SetCurlLongOption(CURLOPT_FRESH_CONNECT, 0L);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlLongOption(CURLOPT_FORBID_REUSE, 0L);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-  }
-  else
-  {
-    rc = SetCurlLongOption(CURLOPT_FRESH_CONNECT, 1L);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-    rc = SetCurlLongOption(CURLOPT_FORBID_REUSE, 1L);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-  }
-
-  if (is_raw_response_)
-  {
-    rc = SetCurlLongOption(CURLOPT_HEADER, 1L);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlPtrOption(CURLOPT_WRITEFUNCTION,
-                          reinterpret_cast<void *>(&HttpOperation::WriteMemoryCallback));
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlPtrOption(CURLOPT_WRITEDATA, this);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-  }
-  else
-  {
-    rc = SetCurlPtrOption(CURLOPT_WRITEFUNCTION,
-                          reinterpret_cast<void *>(&HttpOperation::WriteVectorBodyCallback));
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlPtrOption(CURLOPT_WRITEDATA, this);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlPtrOption(CURLOPT_HEADERFUNCTION,
-                          reinterpret_cast<void *>(&HttpOperation::WriteVectorHeaderCallback));
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlPtrOption(CURLOPT_HEADERDATA, this);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-  }
-
-  // TODO: only two methods supported for now - POST and GET
-  if (method_ == opentelemetry::ext::http::client::Method::Post)
-  {
-    // Request buffer
-    const curl_off_t req_size = static_cast<curl_off_t>(request_body_.size());
-    // POST
-    rc = SetCurlLongOption(CURLOPT_POST, 1L);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlStrOption(CURLOPT_POSTFIELDS, NULL);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlOffOption(CURLOPT_POSTFIELDSIZE_LARGE, req_size);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlPtrOption(CURLOPT_READFUNCTION,
-                          reinterpret_cast<void *>(&HttpOperation::ReadMemoryCallback));
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-
-    rc = SetCurlPtrOption(CURLOPT_READDATA, this);
-    if (rc != CURLE_OK)
-    {
-      return rc;
-    }
-  }
-  else if (method_ == opentelemetry::ext::http::client::Method::Get)
-  {
-    // GET
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_ERROR("Unexpected HTTP method");
-    return CURLE_UNSUPPORTED_PROTOCOL;
-  }
-
-#if LIBCURL_VERSION_NUM >= 0x072000
-  rc = SetCurlPtrOption(CURLOPT_XFERINFOFUNCTION,
-                        reinterpret_cast<void *>(&HttpOperation::OnProgressCallback));
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-
-  rc = SetCurlPtrOption(CURLOPT_XFERINFODATA, this);
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-#else
-  rc = SetCurlPtrOption(CURLOPT_PROGRESSFUNCTION, (void *)&HttpOperation::OnProgressCallback);
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-
-  rc = SetCurlPtrOption(CURLOPT_PROGRESSDATA, this);
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-#endif
-
-#if LIBCURL_VERSION_NUM >= 0x075000
-  rc = SetCurlPtrOption(CURLOPT_PREREQFUNCTION,
-                        reinterpret_cast<void *>(&HttpOperation::PreRequestCallback));
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-
-  rc = SetCurlPtrOption(CURLOPT_PREREQDATA, this);
-  if (rc != CURLE_OK)
-  {
-    return rc;
-  }
-#endif
-
-  return CURLE_OK;
-}
-
-CURLcode HttpOperation::Send()
-{
-  // If it is async sending, just return error
-  if (async_data_ && async_data_->is_promise_running.load(std::memory_order_acquire))
-  {
-    return CURLE_FAILED_INIT;
-  }
-
-  ReleaseResponse();
-
-  last_curl_result_ = Setup();
-  if (last_curl_result_ != CURLE_OK)
-  {
-    const char *message = GetCurlErrorMessage(last_curl_result_);
-    DispatchEvent(opentelemetry::ext::http::client::SessionState::ConnectFailed, message);
-    return last_curl_result_;
-  }
-
-  // Perform initial connect, handling the timeout if needed
-  // We can not use CURLOPT_CONNECT_ONLY because it will disable the reuse of connections.
-  DispatchEvent(opentelemetry::ext::http::client::SessionState::Connecting);
-  is_finished_.store(false, std::memory_order_release);
-  is_aborted_.store(false, std::memory_order_release);
-  is_cleaned_.store(false, std::memory_order_release);
-
-  CURLcode code = curl_easy_perform(curl_resource_.easy_handle);
-  PerformCurlMessage(code);
-  return code;
-}
-
-CURLcode HttpOperation::SendAsync(Session *session, std::function<void(HttpOperation &)> callback)
-{
-  if (nullptr == session)
-  {
-    return CURLE_FAILED_INIT;
-  }
-
-  if (async_data_ && async_data_->is_promise_running.load(std::memory_order_acquire))
-  {
-    return CURLE_FAILED_INIT;
-  }
-
-  async_data_.reset(new AsyncData());
-  async_data_->is_promise_running.store(false, std::memory_order_release);
-  async_data_->session = nullptr;
-
-  ReleaseResponse();
-
-  CURLcode code     = Setup();
-  last_curl_result_ = code;
-  if (code != CURLE_OK)
-  {
-    const char *message = GetCurlErrorMessage(code);
-    DispatchEvent(opentelemetry::ext::http::client::SessionState::ConnectFailed, message);
-    return code;
-  }
-  curl_easy_setopt(curl_resource_.easy_handle, CURLOPT_PRIVATE, session);
-
-  DispatchEvent(opentelemetry::ext::http::client::SessionState::Connecting);
-  is_finished_.store(false, std::memory_order_release);
-  is_aborted_.store(false, std::memory_order_release);
-  is_cleaned_.store(false, std::memory_order_release);
-
-  async_data_->session = session;
-  if (false == async_data_->is_promise_running.exchange(true, std::memory_order_acq_rel))
-  {
-    async_data_->result_promise = std::promise<CURLcode>();
-    async_data_->result_future  = async_data_->result_promise.get_future();
-  }
-  async_data_->callback = std::move(callback);
-
-  session->GetHttpClient().ScheduleAddSession(session->GetSessionId());
-  return CURLE_OK;
-}
-
-Headers HttpOperation::GetResponseHeaders()
-{
-  Headers result;
-  if (response_headers_.size() == 0)
-    return result;
-
-  std::stringstream ss;
-  std::string headers(reinterpret_cast<const char *>(&response_headers_[0]),
-                      response_headers_.size());
-  ss.str(headers);
-
-  std::string header;
-  while (std::getline(ss, header, '\n'))
-  {
-    // TODO - Regex below crashes with out-of-memory on CI docker container, so
-    // switching to string comparison. Need to debug and revert back.
-
-    /*std::smatch match;
-    std::regex http_headers_regex(kHttpHeaderRegexp);
-    if (std::regex_search(header, match, http_headers_regex))
-      result.insert(std::pair<nostd::string_view, nostd::string_view>(
-          static_cast<nostd::string_view>(match[1]), static_cast<nostd::string_view>(match[2])));
-    */
-    size_t pos = header.find(": ");
-    if (pos != std::string::npos)
-      result.insert(
-          std::pair<std::string, std::string>(header.substr(0, pos), header.substr(pos + 2)));
-  }
-  return result;
-}
-
-void HttpOperation::ReleaseResponse()
-{
-  response_headers_.clear();
-  response_body_.clear();
-  raw_response_.clear();
-}
-
-void HttpOperation::Abort()
-{
-  is_aborted_.store(true, std::memory_order_release);
-  if (curl_resource_.easy_handle != nullptr)
-  {
-    // Enable progress callback to abort from polling thread
-    curl_easy_setopt(curl_resource_.easy_handle, CURLOPT_NOPROGRESS, 0L);
-    if (async_data_ && nullptr != async_data_->session)
-    {
-      async_data_->session->GetHttpClient().ScheduleAbortSession(
-          async_data_->session->GetSessionId());
-    }
-  }
-}
-
-void HttpOperation::PerformCurlMessage(CURLcode code)
-{
-  ++retry_attempts_;
-  last_attempt_time_ = std::chrono::system_clock::now();
-  last_curl_result_  = code;
-
-  if (code != CURLE_OK)
-  {
-    switch (GetSessionState())
-    {
-      case opentelemetry::ext::http::client::SessionState::Connecting: {
-        const char *message = GetCurlErrorMessage(code);
-        DispatchEvent(opentelemetry::ext::http::client::SessionState::ConnectFailed,
-                      message);  // couldn't connect - stage 1
-        break;
-      }
-      case opentelemetry::ext::http::client::SessionState::Connected:
-      case opentelemetry::ext::http::client::SessionState::Sending: {
-        if (GetSessionState() == opentelemetry::ext::http::client::SessionState::Connected)
-        {
-          DispatchEvent(opentelemetry::ext::http::client::SessionState::Sending);
-        }
-
-        const char *message = GetCurlErrorMessage(code);
-        DispatchEvent(opentelemetry::ext::http::client::SessionState::SendFailed, message);
-      }
-      default:
-        break;
-    }
-  }
-  else if (curl_resource_.easy_handle != nullptr)
-  {
-    curl_easy_getinfo(curl_resource_.easy_handle, CURLINFO_RESPONSE_CODE, &response_code_);
-  }
-
-  // Transform state
-  if (GetSessionState() == opentelemetry::ext::http::client::SessionState::Connecting)
-  {
-    DispatchEvent(opentelemetry::ext::http::client::SessionState::Connected);
-  }
-
-  if (GetSessionState() == opentelemetry::ext::http::client::SessionState::Connected)
-  {
-    DispatchEvent(opentelemetry::ext::http::client::SessionState::Sending);
-  }
-
-  if (GetSessionState() == opentelemetry::ext::http::client::SessionState::Sending)
-  {
-    DispatchEvent(opentelemetry::ext::http::client::SessionState::Response);
-  }
-
-  if (IsRetryable())
-  {
-    // Clear any response data received in previous attempt
-    ReleaseResponse();
-    // Rewind request data so that read callback can re-transfer the payload
-    request_nwrite_ = 0;
-    // Reset session state
-    DispatchEvent(opentelemetry::ext::http::client::SessionState::Connecting);
-  }
-  else
-  {
-    // Cleanup and unbind easy handle from multi handle, and finish callback
-    Cleanup();
-  }
-}
-
-}  // namespace curl
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/ext/test/CMakeLists.txt
deleted file mode 100644
index 4dabab382..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(http)
-if(BUILD_W3CTRACECONTEXT_TEST)
-  add_subdirectory(w3c_tracecontext_http_test_server)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/http/BUILD b/ext/opentelemetry-cpp-1.21.0/ext/test/http/BUILD
deleted file mode 100644
index d030ec284..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/http/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_test(
-    name = "curl_http_test",
-    srcs = [
-        "curl_http_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//ext:headers",
-        "//ext/src/http/client/curl:http_client_curl",
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-        "@curl",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/http/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/ext/test/http/CMakeLists.txt
deleted file mode 100644
index f4d377473..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/http/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(WITH_HTTP_CLIENT_CURL)
-  set(FILENAME curl_http_test)
-  add_executable(${FILENAME} ${FILENAME}.cc)
-  target_link_libraries(${FILENAME} ${GMOCK_LIB} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT})
-
-  unset(CURL_IMPORTED_TARGET_NAME)
-
-  foreach(FIND_CURL_IMPORTED_TARGET CURL::libcurl CURL::libcurl_shared
-                                    CURL::libcurl_static)
-    if(TARGET ${FIND_CURL_IMPORTED_TARGET})
-      set(CURL_IMPORTED_TARGET_NAME ${FIND_CURL_IMPORTED_TARGET})
-      break()
-    endif()
-  endforeach()
-
-  if(TARGET ${CURL_IMPORTED_TARGET_NAME})
-    target_link_libraries(${FILENAME} opentelemetry_http_client_curl
-                          opentelemetry_common ${CURL_IMPORTED_TARGET_NAME})
-  else()
-    target_include_directories(${FILENAME} PRIVATE ${CURL_INCLUDE_DIRS})
-    target_link_libraries(${FILENAME} ${CURL_LIBRARIES}
-                          opentelemetry_http_client_curl opentelemetry_common)
-  endif()
-
-  gtest_add_tests(
-    TARGET ${FILENAME}
-    TEST_PREFIX ext.http.curl.
-    TEST_LIST ${FILENAME})
-endif()
-
-set(URL_PARSER_FILENAME url_parser_test)
-add_executable(${URL_PARSER_FILENAME} ${URL_PARSER_FILENAME}.cc)
-target_link_libraries(${URL_PARSER_FILENAME} opentelemetry_ext ${GMOCK_LIB}
-                      ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-gtest_add_tests(
-  TARGET ${URL_PARSER_FILENAME}
-  TEST_PREFIX ext.http.urlparser.
-  TEST_LIST ${URL_PARSER_FILENAME})
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/http/curl_http_test.cc b/ext/opentelemetry-cpp-1.21.0/ext/test/http/curl_http_test.cc
deleted file mode 100644
index e8299202b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/http/curl_http_test.cc
+++ /dev/null
@@ -1,821 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <curl/curlver.h>
-#include "gtest/gtest.h"
-
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
-#  include <curl/curl.h>
-#  include "gmock/gmock.h"
-#endif  // ENABLE_OTLP_RETRY_PREVIEW
-
-#include <string.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <numeric>
-#include <ratio>
-#include <sstream>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/ext//http/client/curl/http_client_curl.h"
-#include "opentelemetry/ext/http/client/curl/http_operation_curl.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/ext/http/client/http_client_factory.h"
-#include "opentelemetry/ext/http/server/http_server.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-
-#define HTTP_PORT 19000
-
-namespace curl        = opentelemetry::ext::http::client::curl;
-namespace http_client = opentelemetry::ext::http::client;
-namespace nostd       = opentelemetry::nostd;
-
-class CustomEventHandler : public http_client::EventHandler
-{
-public:
-  void OnResponse(http_client::Response & /* response */) noexcept override
-  {
-    got_response_.store(true, std::memory_order_release);
-  }
-  void OnEvent(http_client::SessionState state, nostd::string_view /* reason */) noexcept override
-  {
-    switch (state)
-    {
-      case http_client::SessionState::ConnectFailed:
-      case http_client::SessionState::SendFailed: {
-        is_called_.store(true, std::memory_order_release);
-        break;
-      }
-      default:
-        break;
-    }
-  }
-
-  CustomEventHandler() : is_called_(false), got_response_(false) {}
-
-  ~CustomEventHandler() override = default;
-
-  std::atomic<bool> is_called_;
-  std::atomic<bool> got_response_;
-};
-
-class GetEventHandler : public CustomEventHandler
-{
-  void OnResponse(http_client::Response &response) noexcept override
-  {
-    ASSERT_EQ(200, response.GetStatusCode());
-    ASSERT_EQ(response.GetBody().size(), 0);
-    is_called_.store(true, std::memory_order_release);
-    got_response_.store(true, std::memory_order_release);
-  }
-};
-
-class PostEventHandler : public CustomEventHandler
-{
-  void OnResponse(http_client::Response &response) noexcept override
-  {
-    ASSERT_EQ(200, response.GetStatusCode());
-    std::string body(response.GetBody().begin(), response.GetBody().end());
-    ASSERT_EQ(body, "{'k1':'v1', 'k2':'v2', 'k3':'v3'}");
-    is_called_.store(true, std::memory_order_release);
-    got_response_.store(true, std::memory_order_release);
-  }
-};
-
-class FinishInCallbackHandler : public CustomEventHandler
-{
-public:
-  FinishInCallbackHandler(std::shared_ptr<http_client::Session> session)
-      : session_(std::move(session))
-  {}
-
-  void OnResponse(http_client::Response &response) noexcept override
-  {
-    ASSERT_EQ(200, response.GetStatusCode());
-    ASSERT_EQ(response.GetBody().size(), 0);
-    is_called_.store(true, std::memory_order_release);
-    got_response_.store(true, std::memory_order_release);
-
-    if (session_)
-    {
-      session_->FinishSession();
-      session_.reset();
-    }
-  }
-
-private:
-  std::shared_ptr<http_client::Session> session_;
-};
-
-class RetryEventHandler : public CustomEventHandler
-{
-  void OnResponse(http_client::Response &response) noexcept override
-  {
-    ASSERT_EQ(429, response.GetStatusCode());
-    ASSERT_EQ(response.GetBody().size(), 0);
-    is_called_.store(true, std::memory_order_release);
-    got_response_.store(true, std::memory_order_release);
-  }
-};
-
-class BasicCurlHttpTests : public ::testing::Test, public HTTP_SERVER_NS::HttpRequestCallback
-{
-protected:
-  HTTP_SERVER_NS::HttpServer server_;
-  std::string server_address_;
-  std::atomic<bool> is_setup_{false};
-  std::atomic<bool> is_running_{false};
-  std::vector<HTTP_SERVER_NS::HttpRequest> received_requests_;
-  std::mutex cv_mtx_requests;
-  std::mutex mtx_requests;
-  std::condition_variable cv_got_events;
-  std::mutex cv_m;
-
-public:
-  BasicCurlHttpTests() : is_setup_(false), is_running_(false) {}
-
-  void SetUp() override
-  {
-    if (is_setup_.exchange(true))
-    {
-      return;
-    }
-    int port = server_.addListeningPort(HTTP_PORT);
-    std::ostringstream os;
-    os << "localhost:" << port;
-    server_address_ = "http://" + os.str() + "/simple/";
-    server_.setServerName(os.str());
-    server_.setKeepalive(false);
-    server_.addHandler("/simple/", *this);
-    server_.addHandler("/get/", *this);
-    server_.addHandler("/post/", *this);
-    server_.addHandler("/retry/", *this);
-    server_.start();
-    is_running_ = true;
-  }
-
-  void TearDown() override
-  {
-    if (!is_setup_.exchange(false))
-      return;
-    server_.stop();
-    is_running_ = false;
-  }
-
-  int onHttpRequest(HTTP_SERVER_NS::HttpRequest const &request,
-                    HTTP_SERVER_NS::HttpResponse &response) override
-  {
-    int response_status = 404;
-    if (request.uri == "/get/")
-    {
-      std::unique_lock<std::mutex> lk1(mtx_requests);
-      received_requests_.push_back(request);
-      response.headers["Content-Type"] = "text/plain";
-      response_status                  = 200;
-    }
-    else if (request.uri == "/post/")
-    {
-      std::unique_lock<std::mutex> lk1(mtx_requests);
-      received_requests_.push_back(request);
-      response.headers["Content-Type"] = "application/json";
-      response.body                    = "{'k1':'v1', 'k2':'v2', 'k3':'v3'}";
-      response_status                  = 200;
-    }
-    else if (request.uri == "/retry/")
-    {
-      std::unique_lock<std::mutex> lk1(mtx_requests);
-      received_requests_.push_back(request);
-      response.headers["Content-Type"] = "text/plain";
-      response_status                  = 429;
-    }
-
-    cv_got_events.notify_one();
-
-    return response_status;
-  }
-
-  bool waitForRequests(unsigned timeOutSec, unsigned expected_count = 1)
-  {
-    std::unique_lock<std::mutex> lk(cv_mtx_requests);
-    if (cv_got_events.wait_for(lk, std::chrono::milliseconds(1000 * timeOutSec), [&] {
-          std::unique_lock<std::mutex> lk1(mtx_requests);
-          return received_requests_.size() >= expected_count;
-        }))
-    {
-      return true;
-    }
-    return false;
-  }
-};
-
-TEST_F(BasicCurlHttpTests, DoNothing) {}
-
-TEST_F(BasicCurlHttpTests, HttpRequest)
-{
-  curl::Request req;
-  const char *b           = "test-data";
-  http_client::Body body  = {b, b + strlen(b)};
-  http_client::Body body1 = body;
-  req.SetBody(body);
-  ASSERT_EQ(req.body_, body1);
-  req.AddHeader("name1", "value1");
-  req.AddHeader("name2", "value2");
-  ASSERT_TRUE(req.headers_.find("name1")->second == "value1");
-  ASSERT_TRUE(req.headers_.find("name2")->second == "value2");
-
-  req.ReplaceHeader("name1", "value3");
-  ASSERT_EQ(req.headers_.find("name1")->second, "value3");
-
-  req.SetTimeoutMs(std::chrono::duration<int>(2000));
-  ASSERT_EQ(req.timeout_ms_, std::chrono::duration<int>(2000));
-}
-
-TEST_F(BasicCurlHttpTests, HttpResponse)
-{
-  curl::Response res;
-  http_client::Headers m1 = {
-      {"name1", "value1_1"}, {"name1", "value1_2"}, {"name2", "value3"}, {"name3", "value3"}};
-  res.headers_ = m1;
-
-  const char *b          = "test-data";
-  http_client::Body body = {b, b + strlen(b)};
-  int count              = 0;
-  res.ForEachHeader("name1", [&count](nostd::string_view name, nostd::string_view value) {
-    if (name != "name1")
-      return false;
-    if (value != "value1_1" && value != "value1_2")
-      return false;
-    count++;
-    return true;
-  });
-  ASSERT_EQ(count, 2);
-  count = 0;
-  res.ForEachHeader([&count](nostd::string_view name, nostd::string_view value) {
-    if (name != "name1" && name != "name2" && name != "name3")
-      return false;
-    if (value != "value1_1" && value != "value1_2" && value != "value2" && value != "value3")
-      return false;
-    count++;
-    return true;
-  });
-  ASSERT_EQ(count, 4);
-}
-
-TEST_F(BasicCurlHttpTests, SendGetRequest)
-{
-  received_requests_.clear();
-  auto session_manager = http_client::HttpClientFactory::Create();
-  EXPECT_TRUE(session_manager != nullptr);
-
-  auto session = session_manager->CreateSession("http://127.0.0.1:19000");
-  auto request = session->CreateRequest();
-  request->SetUri("get/");
-  auto handler = std::make_shared<GetEventHandler>();
-  session->SendRequest(handler);
-  ASSERT_TRUE(waitForRequests(30, 1));
-  session->FinishSession();
-  ASSERT_TRUE(handler->is_called_.load(std::memory_order_acquire));
-  ASSERT_TRUE(handler->got_response_.load(std::memory_order_acquire));
-}
-
-TEST_F(BasicCurlHttpTests, SendPostRequest)
-{
-  received_requests_.clear();
-  auto session_manager = http_client::HttpClientFactory::Create();
-  EXPECT_TRUE(session_manager != nullptr);
-
-  auto session = session_manager->CreateSession("http://127.0.0.1:19000");
-  auto request = session->CreateRequest();
-  request->SetUri("post/");
-  request->SetMethod(http_client::Method::Post);
-
-  const char *b          = "test-data";
-  http_client::Body body = {b, b + strlen(b)};
-  request->SetBody(body);
-  request->AddHeader("Content-Type", "text/plain");
-  auto handler = std::make_shared<PostEventHandler>();
-  session->SendRequest(handler);
-  ASSERT_TRUE(waitForRequests(30, 1));
-  session->FinishSession();
-  ASSERT_TRUE(handler->is_called_.load(std::memory_order_acquire));
-  ASSERT_TRUE(handler->got_response_.load(std::memory_order_acquire));
-
-  session_manager->CancelAllSessions();
-  session_manager->FinishAllSessions();
-}
-
-TEST_F(BasicCurlHttpTests, RequestTimeout)
-{
-  received_requests_.clear();
-  auto session_manager = http_client::HttpClientFactory::Create();
-  EXPECT_TRUE(session_manager != nullptr);
-
-  auto session = session_manager->CreateSession("222.222.222.200:19000");  // Non Existing address
-  auto request = session->CreateRequest();
-  request->SetUri("get/");
-  auto handler = std::make_shared<GetEventHandler>();
-  session->SendRequest(handler);
-  session->FinishSession();
-  ASSERT_TRUE(handler->is_called_.load(std::memory_order_acquire));
-  ASSERT_FALSE(handler->got_response_.load(std::memory_order_acquire));
-}
-
-TEST_F(BasicCurlHttpTests, CurlHttpOperations)
-{
-  http_client::HttpSslOptions no_ssl;
-
-  GetEventHandler *handler = new GetEventHandler();
-
-  const char *b          = "test-data";
-  http_client::Body body = {b, b + strlen(b)};
-
-  http_client::Headers headers = {
-      {"name1", "value1_1"}, {"name1", "value1_2"}, {"name2", "value3"}, {"name3", "value3"}};
-
-  http_client::Compression compression = http_client::Compression::kNone;
-
-  curl::HttpOperation http_operations1(http_client::Method::Head, "/get", no_ssl, handler, headers,
-                                       body, compression, true);
-  http_operations1.Send();
-
-  curl::HttpOperation http_operations2(http_client::Method::Get, "/get", no_ssl, handler, headers,
-                                       body, compression, true);
-  http_operations2.Send();
-
-  curl::HttpOperation http_operations3(http_client::Method::Get, "/get", no_ssl, handler, headers,
-                                       body, compression, false);
-  http_operations3.Send();
-  delete handler;
-}
-
-#ifdef ENABLE_OTLP_RETRY_PREVIEW
-TEST_F(BasicCurlHttpTests, RetryPolicyEnabled)
-{
-  RetryEventHandler handler;
-  http_client::HttpSslOptions no_ssl;
-  http_client::Body body;
-  http_client::Headers headers;
-  http_client::Compression compression  = http_client::Compression::kNone;
-  http_client::RetryPolicy retry_policy = {5, std::chrono::duration<float>{1.0f},
-                                           std::chrono::duration<float>{5.0f}, 1.5f};
-
-  curl::HttpOperation operation(http_client::Method::Post, "http://127.0.0.1:19000/retry/", no_ssl,
-                                &handler, headers, body, compression, false,
-                                curl::kDefaultHttpConnTimeout, false, false, retry_policy);
-
-  ASSERT_EQ(CURLE_OK, operation.Send());
-  ASSERT_TRUE(operation.IsRetryable());
-}
-
-TEST_F(BasicCurlHttpTests, RetryPolicyDisabled)
-{
-  RetryEventHandler handler;
-  http_client::HttpSslOptions no_ssl;
-  http_client::Body body;
-  http_client::Headers headers;
-  http_client::Compression compression     = http_client::Compression::kNone;
-  http_client::RetryPolicy no_retry_policy = {0, std::chrono::duration<float>::zero(),
-                                              std::chrono::duration<float>::zero(), 0.0f};
-
-  curl::HttpOperation operation(http_client::Method::Post, "http://127.0.0.1:19000/retry/", no_ssl,
-                                &handler, headers, body, compression, false,
-                                curl::kDefaultHttpConnTimeout, false, false, no_retry_policy);
-
-  ASSERT_EQ(CURLE_OK, operation.Send());
-  ASSERT_FALSE(operation.IsRetryable());
-}
-
-TEST_F(BasicCurlHttpTests, ExponentialBackoffRetry)
-{
-  using ::testing::AllOf;
-  using ::testing::Gt;
-  using ::testing::Lt;
-
-  RetryEventHandler handler;
-  http_client::HttpSslOptions no_ssl;
-  http_client::Body body;
-  http_client::Headers headers;
-  http_client::Compression compression  = http_client::Compression::kNone;
-  http_client::RetryPolicy retry_policy = {4, std::chrono::duration<float>{1.0f},
-                                           std::chrono::duration<float>{5.0f}, 2.0f};
-
-  curl::HttpOperation operation(http_client::Method::Post, "http://127.0.0.1:19000/retry/", no_ssl,
-                                &handler, headers, body, compression, false,
-                                curl::kDefaultHttpConnTimeout, false, false, retry_policy);
-
-  auto first_attempt_time = std::chrono::system_clock::now();
-  ASSERT_EQ(CURLE_OK, operation.Send());
-  ASSERT_TRUE(operation.IsRetryable());
-  ASSERT_THAT(
-      operation.NextRetryTime().time_since_epoch().count(),
-      AllOf(Gt((first_attempt_time + std::chrono::milliseconds{750}).time_since_epoch().count()),
-            Lt((first_attempt_time + std::chrono::milliseconds{1250}).time_since_epoch().count())));
-
-  auto second_attempt_time = std::chrono::system_clock::now();
-  ASSERT_EQ(CURLE_OK, operation.Send());
-  ASSERT_TRUE(operation.IsRetryable());
-  ASSERT_THAT(
-      operation.NextRetryTime().time_since_epoch().count(),
-      AllOf(
-          Gt((second_attempt_time + std::chrono::milliseconds{1550}).time_since_epoch().count()),
-          Lt((second_attempt_time + std::chrono::milliseconds{2450}).time_since_epoch().count())));
-
-  auto third_attempt_time = std::chrono::system_clock::now();
-  ASSERT_EQ(CURLE_OK, operation.Send());
-  ASSERT_TRUE(operation.IsRetryable());
-  ASSERT_THAT(
-      operation.NextRetryTime().time_since_epoch().count(),
-      AllOf(Gt((third_attempt_time + std::chrono::milliseconds{3150}).time_since_epoch().count()),
-            Lt((third_attempt_time + std::chrono::milliseconds{4850}).time_since_epoch().count())));
-
-  ASSERT_EQ(CURLE_OK, operation.Send());
-  ASSERT_FALSE(operation.IsRetryable());
-}
-#endif  // ENABLE_OTLP_RETRY_PREVIEW
-
-TEST_F(BasicCurlHttpTests, SendGetRequestSync)
-{
-  received_requests_.clear();
-  curl::HttpClientSync http_client;
-
-  http_client::Headers m1 = {};
-  auto result             = http_client.GetNoSsl("http://127.0.0.1:19000/get/", m1);
-  EXPECT_EQ(result, true);
-  EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response);
-}
-
-TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
-{
-  received_requests_.clear();
-  curl::HttpClientSync http_client;
-
-  http_client::Headers m1 = {};
-  auto result             = http_client.GetNoSsl("https://192.0.2.0:19000/get/", m1);
-  EXPECT_EQ(result, false);
-
-  // When network is under proxy, it may connect success but closed by peer when send data
-  EXPECT_TRUE(result.GetSessionState() == http_client::SessionState::ConnectFailed ||
-              result.GetSessionState() == http_client::SessionState::SendFailed);
-}
-
-TEST_F(BasicCurlHttpTests, SendPostRequestSync)
-{
-  received_requests_.clear();
-  curl::HttpClientSync http_client;
-
-  http_client::Headers m1 = {};
-  http_client::Body body  = {};
-  auto result             = http_client.PostNoSsl("http://127.0.0.1:19000/post/", body, m1);
-  EXPECT_EQ(result, true);
-  EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response);
-}
-
-TEST_F(BasicCurlHttpTests, GetBaseUri)
-{
-  curl::HttpClient session_manager;
-
-  auto session = session_manager.CreateSession("127.0.0.1:80");
-  ASSERT_EQ(std::static_pointer_cast<curl::Session>(session)->GetBaseUri(), "http://127.0.0.1:80/");
-
-  session = session_manager.CreateSession("https://127.0.0.1:443");
-  ASSERT_EQ(std::static_pointer_cast<curl::Session>(session)->GetBaseUri(),
-            "https://127.0.0.1:443/");
-
-  session = session_manager.CreateSession("http://127.0.0.1:31339");
-  ASSERT_EQ(std::static_pointer_cast<curl::Session>(session)->GetBaseUri(),
-            "http://127.0.0.1:31339/");
-}
-
-TEST_F(BasicCurlHttpTests, SendGetRequestAsync)
-{
-  curl::HttpClient http_client;
-
-  for (int round = 0; round < 2; ++round)
-  {
-    received_requests_.clear();
-    static constexpr const unsigned batch_count = 5;
-    std::shared_ptr<http_client::Session> sessions[batch_count];
-    std::shared_ptr<GetEventHandler> handlers[batch_count];
-    for (unsigned i = 0; i < batch_count; ++i)
-    {
-      sessions[i]  = http_client.CreateSession("http://127.0.0.1:19000/get/");
-      auto request = sessions[i]->CreateRequest();
-      request->SetMethod(http_client::Method::Get);
-      request->SetUri("get/");
-
-      handlers[i] = std::make_shared<GetEventHandler>();
-
-      // Lock mtx_requests to prevent response, we will check IsSessionActive() in the end
-      std::unique_lock<std::mutex> lock_requests(mtx_requests);
-      sessions[i]->SendRequest(handlers[i]);
-      ASSERT_TRUE(sessions[i]->IsSessionActive());
-    }
-
-    ASSERT_TRUE(waitForRequests(30, batch_count));
-
-    for (unsigned i = 0; i < batch_count; ++i)
-    {
-      sessions[i]->FinishSession();
-      ASSERT_FALSE(sessions[i]->IsSessionActive());
-
-      ASSERT_TRUE(handlers[i]->is_called_.load(std::memory_order_acquire));
-      ASSERT_TRUE(handlers[i]->got_response_.load(std::memory_order_acquire));
-    }
-
-    http_client.WaitBackgroundThreadExit();
-  }
-}
-
-TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)
-{
-  received_requests_.clear();
-  curl::HttpClient http_client;
-
-  static constexpr const unsigned batch_count = 5;
-  std::shared_ptr<http_client::Session> sessions[batch_count];
-  std::shared_ptr<GetEventHandler> handlers[batch_count];
-  for (unsigned i = 0; i < batch_count; ++i)
-  {
-    sessions[i]  = http_client.CreateSession("https://192.0.2.0:19000/get/");
-    auto request = sessions[i]->CreateRequest();
-    request->SetMethod(http_client::Method::Get);
-    request->SetUri("get/");
-    request->SetTimeoutMs(std::chrono::milliseconds(256));
-
-    handlers[i] = std::make_shared<GetEventHandler>();
-
-    // Lock mtx_requests to prevent response, we will check IsSessionActive() in the end
-    std::unique_lock<std::mutex> lock_requests(mtx_requests);
-    sessions[i]->SendRequest(handlers[i]);
-    ASSERT_TRUE(sessions[i]->IsSessionActive() ||
-                handlers[i]->is_called_.load(std::memory_order_acquire));
-  }
-
-  for (unsigned i = 0; i < batch_count; ++i)
-  {
-    sessions[i]->FinishSession();
-    ASSERT_FALSE(sessions[i]->IsSessionActive());
-
-    ASSERT_TRUE(handlers[i]->is_called_.load(std::memory_order_acquire));
-    ASSERT_FALSE(handlers[i]->got_response_.load(std::memory_order_acquire));
-  }
-}
-
-TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
-{
-  curl::HttpClient http_client;
-
-  for (int round = 0; round < 2; ++round)
-  {
-    received_requests_.clear();
-    auto handler = std::make_shared<PostEventHandler>();
-
-    static constexpr const unsigned batch_count = 5;
-    std::shared_ptr<http_client::Session> sessions[batch_count];
-    for (auto &session : sessions)
-    {
-      session      = http_client.CreateSession("http://127.0.0.1:19000/post/");
-      auto request = session->CreateRequest();
-      request->SetMethod(http_client::Method::Post);
-      request->SetUri("post/");
-
-      // Lock mtx_requests to prevent response, we will check IsSessionActive() in the end
-      std::unique_lock<std::mutex> lock_requests(mtx_requests);
-      session->SendRequest(handler);
-      ASSERT_TRUE(session->IsSessionActive());
-    }
-
-    ASSERT_TRUE(waitForRequests(30, batch_count));
-
-    for (auto &session : sessions)
-    {
-      session->FinishSession();
-      ASSERT_FALSE(session->IsSessionActive());
-    }
-
-    ASSERT_TRUE(handler->is_called_.load(std::memory_order_acquire));
-    ASSERT_TRUE(handler->got_response_.load(std::memory_order_acquire));
-
-    http_client.WaitBackgroundThreadExit();
-  }
-}
-
-TEST_F(BasicCurlHttpTests, FinishInAsyncCallback)
-{
-  curl::HttpClient http_client;
-
-  for (int round = 0; round < 2; ++round)
-  {
-    received_requests_.clear();
-    static constexpr const unsigned batch_count = 5;
-    std::shared_ptr<http_client::Session> sessions[batch_count];
-    std::shared_ptr<FinishInCallbackHandler> handlers[batch_count];
-    for (unsigned i = 0; i < batch_count; ++i)
-    {
-      sessions[i]  = http_client.CreateSession("http://127.0.0.1:19000/get/");
-      auto request = sessions[i]->CreateRequest();
-      request->SetMethod(http_client::Method::Get);
-      request->SetUri("get/");
-
-      handlers[i] = std::make_shared<FinishInCallbackHandler>(sessions[i]);
-
-      // Lock mtx_requests to prevent response, we will check IsSessionActive() in the end
-      std::unique_lock<std::mutex> lock_requests(mtx_requests);
-      sessions[i]->SendRequest(handlers[i]);
-      ASSERT_TRUE(sessions[i]->IsSessionActive());
-    }
-
-    http_client.WaitBackgroundThreadExit();
-    ASSERT_TRUE(waitForRequests(300, batch_count));
-
-    for (unsigned i = 0; i < batch_count; ++i)
-    {
-      ASSERT_FALSE(sessions[i]->IsSessionActive());
-
-      ASSERT_TRUE(handlers[i]->is_called_.load(std::memory_order_acquire));
-      ASSERT_TRUE(handlers[i]->got_response_.load(std::memory_order_acquire));
-    }
-  }
-}
-
-TEST_F(BasicCurlHttpTests, ElegantQuitQuick)
-{
-  auto http_client = http_client::HttpClientFactory::Create();
-  std::static_pointer_cast<curl::HttpClient>(http_client)->MaybeSpawnBackgroundThread();
-  // start background first, then test it could wakeup
-  auto session = http_client->CreateSession("http://127.0.0.1:19000/get/");
-  auto request = session->CreateRequest();
-  request->SetUri("get/");
-  auto handler = std::make_shared<GetEventHandler>();
-  session->SendRequest(handler);
-  std::this_thread::sleep_for(std::chrono::milliseconds{10});  // let it enter poll state
-  auto beg = std::chrono::system_clock::now();
-  http_client->FinishAllSessions();
-  http_client.reset();
-  // when background_thread_wait_for_ is used, it should have no side effect on elegant quit
-  // wait should be less than scheduled_delay_milliseconds_
-  // Due to load on CI hosts (some take 10ms), we assert it is less than 20ms
-  auto cost = std::chrono::system_clock::now() - beg;
-  ASSERT_TRUE(cost < std::chrono::milliseconds{20})
-      << "cost ms: " << std::chrono::duration_cast<std::chrono::milliseconds>(cost).count()
-      << " libcurl version: 0x" << std::hex << LIBCURL_VERSION_NUM;
-  ASSERT_TRUE(handler->is_called_);
-  ASSERT_TRUE(handler->got_response_);
-}
-
-TEST_F(BasicCurlHttpTests, BackgroundThreadWaitMore)
-{
-  {
-    curl::HttpClient http_client;
-    http_client.MaybeSpawnBackgroundThread();
-    std::this_thread::sleep_for(std::chrono::milliseconds{10});
-#if LIBCURL_VERSION_NUM >= 0x074200
-    ASSERT_FALSE(http_client.MaybeSpawnBackgroundThread());
-#else
-    // low version curl do not support delay quit, so old background would quit
-    ASSERT_TRUE(http_client.MaybeSpawnBackgroundThread());
-#endif
-  }
-  {
-    curl::HttpClient http_client;
-    http_client.SetBackgroundWaitFor(std::chrono::milliseconds::zero());
-    http_client.MaybeSpawnBackgroundThread();
-    std::this_thread::sleep_for(std::chrono::milliseconds{10});
-    // we can disable delay quit by set wait for 0
-    ASSERT_TRUE(http_client.MaybeSpawnBackgroundThread());
-  }
-}
-
-#ifdef ENABLE_OTLP_COMPRESSION_PREVIEW
-struct GzipEventHandler : public CustomEventHandler
-{
-  ~GzipEventHandler() override = default;
-
-  void OnResponse(http_client::Response & /* response */) noexcept override {}
-
-  void OnEvent(http_client::SessionState state, nostd::string_view reason) noexcept override
-  {
-    is_called_ = true;
-    state_     = state;
-    reason_    = std::string{reason};
-  }
-
-  bool is_called_                  = false;
-  http_client::SessionState state_ = static_cast<http_client::SessionState>(-1);
-  std::string reason_;
-};
-
-TEST_F(BasicCurlHttpTests, GzipCompressibleData)
-{
-  received_requests_.clear();
-  auto session_manager = http_client::HttpClientFactory::Create();
-  EXPECT_TRUE(session_manager != nullptr);
-
-  auto session = session_manager->CreateSession("http://127.0.0.1:19000");
-  auto request = session->CreateRequest();
-  request->SetUri("post/");
-  request->SetMethod(http_client::Method::Post);
-
-  const auto original_size = 500UL;
-  http_client::Body body(original_size);
-  std::iota(body.begin(), body.end(), 0);
-  request->SetBody(body);
-  request->AddHeader("Content-Type", "text/plain");
-  request->SetCompression(opentelemetry::ext::http::client::Compression::kGzip);
-  auto handler = std::make_shared<GzipEventHandler>();
-  session->SendRequest(handler);
-  ASSERT_TRUE(waitForRequests(30, 1));
-  session->FinishSession();
-  ASSERT_TRUE(handler->is_called_);
-  ASSERT_EQ(handler->state_, http_client::SessionState::Response);
-  ASSERT_TRUE(handler->reason_.empty());
-
-  auto http_request =
-      dynamic_cast<opentelemetry::ext::http::client::curl::Request *>(request.get());
-  ASSERT_TRUE(http_request != nullptr);
-  ASSERT_LT(http_request->body_.size(), original_size);
-
-  session_manager->CancelAllSessions();
-  session_manager->FinishAllSessions();
-}
-
-TEST_F(BasicCurlHttpTests, GzipIncompressibleData)
-{
-  received_requests_.clear();
-  auto session_manager = http_client::HttpClientFactory::Create();
-  EXPECT_TRUE(session_manager != nullptr);
-
-  auto session = session_manager->CreateSession("http://127.0.0.1:19000");
-  auto request = session->CreateRequest();
-  request->SetUri("post/");
-  request->SetMethod(http_client::Method::Post);
-
-  // Random data generated using code snippet below.
-  //   const auto original_size = 500UL;
-  //   http_client::Body body(original_size);
-  //   std::random_device rd;
-  //   std::mt19937 gen(rd());
-  //   std::uniform_int_distribution<> uid(1, 255);
-  //   std::generate(body.begin(), body.end(), [&]() { return uid(gen); });
-
-  // The input values are fixed to make the test repeatable in the event that some distributions
-  // might yield results that are, in fact, compressible.
-  http_client::Body body = {
-      140, 198, 12,  56,  165, 185, 173, 20,  13,  83,  127, 223, 77,  38,  224, 43,  236, 10,  178,
-      75,  169, 157, 136, 199, 74,  30,  148, 195, 51,  30,  225, 21,  121, 219, 7,   155, 198, 121,
-      205, 102, 80,  38,  132, 202, 45,  229, 206, 90,  150, 202, 53,  221, 54,  37,  172, 90,  238,
-      248, 191, 240, 109, 227, 248, 41,  251, 121, 35,  226, 107, 122, 15,  242, 203, 45,  64,  195,
-      186, 23,  1,   158, 61,  196, 182, 26,  201, 47,  211, 241, 251, 209, 255, 170, 181, 192, 89,
-      133, 176, 60,  178, 97,  168, 223, 152, 9,   118, 98,  169, 240, 170, 15,  13,  161, 24,  57,
-      123, 117, 230, 30,  244, 117, 238, 255, 198, 232, 95,  148, 37,  61,  67,  103, 31,  240, 52,
-      21,  145, 175, 201, 86,  19,  61,  228, 76,  131, 185, 111, 149, 203, 143, 16,  142, 95,  173,
-      42,  106, 39,  203, 116, 235, 20,  162, 112, 173, 112, 70,  126, 191, 210, 219, 90,  145, 126,
-      118, 43,  241, 101, 66,  175, 179, 5,   233, 208, 164, 180, 83,  214, 194, 173, 29,  179, 149,
-      75,  202, 17,  152, 139, 130, 94,  247, 142, 249, 159, 224, 205, 131, 93,  82,  186, 226, 210,
-      84,  17,  212, 155, 61,  226, 103, 152, 37,  3,   193, 216, 219, 203, 101, 99,  33,  59,  38,
-      106, 62,  232, 127, 44,  125, 90,  169, 148, 238, 34,  106, 12,  221, 90,  173, 67,  122, 232,
-      161, 89,  198, 43,  241, 195, 248, 219, 35,  47,  200, 11,  227, 168, 246, 243, 103, 38,  17,
-      203, 237, 203, 158, 204, 89,  231, 19,  24,  25,  199, 160, 233, 43,  117, 144, 196, 117, 152,
-      42,  121, 189, 217, 202, 221, 250, 157, 237, 47,  29,  64,  32,  10,  32,  243, 28,  114, 158,
-      228, 102, 36,  191, 139, 217, 161, 162, 186, 19,  141, 212, 49,  1,   239, 153, 107, 249, 31,
-      235, 138, 73,  80,  58,  152, 15,  149, 50,  42,  84,  75,  95,  82,  56,  86,  143, 45,  214,
-      11,  184, 164, 181, 249, 74,  184, 26,  207, 165, 162, 240, 154, 90,  56,  175, 72,  4,   166,
-      188, 78,  232, 87,  243, 50,  59,  62,  175, 213, 210, 182, 31,  123, 91,  118, 98,  249, 23,
-      170, 240, 228, 236, 121, 87,  132, 129, 250, 41,  227, 204, 250, 147, 145, 109, 149, 210, 21,
-      174, 165, 127, 234, 64,  211, 52,  93,  126, 117, 231, 216, 210, 15,  16,  2,   167, 215, 178,
-      104, 245, 119, 211, 235, 120, 135, 202, 117, 150, 101, 94,  201, 136, 179, 205, 167, 212, 236,
-      7,   178, 132, 228, 65,  230, 90,  171, 109, 31,  83,  31,  210, 123, 136, 76,  186, 81,  205,
-      63,  35,  21,  121, 152, 22,  242, 199, 106, 217, 199, 211, 206, 165, 88,  77,  112, 108, 193,
-      122, 8,   193, 74,  91,  50,  6,   156, 185, 165, 15,  92,  116, 3,   18,  244, 165, 191, 2,
-      183, 9,   164, 116, 75,  127};
-  const auto original_size = body.size();
-
-  request->SetBody(body);
-  request->AddHeader("Content-Type", "text/plain");
-  request->SetCompression(opentelemetry::ext::http::client::Compression::kGzip);
-  auto handler = std::make_shared<GzipEventHandler>();
-  session->SendRequest(handler);
-  ASSERT_TRUE(waitForRequests(30, 1));
-  session->FinishSession();
-  ASSERT_TRUE(handler->is_called_);
-  ASSERT_EQ(handler->state_, http_client::SessionState::Response);
-  ASSERT_TRUE(handler->reason_.empty());
-
-  auto http_request =
-      dynamic_cast<opentelemetry::ext::http::client::curl::Request *>(request.get());
-  ASSERT_TRUE(http_request != nullptr);
-  ASSERT_EQ(http_request->body_.size(), original_size);
-
-  session_manager->CancelAllSessions();
-  session_manager->FinishAllSessions();
-}
-#endif  // ENABLE_OTLP_COMPRESSION_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/http/url_parser_test.cc b/ext/opentelemetry-cpp-1.21.0/ext/test/http/url_parser_test.cc
deleted file mode 100644
index 450bdd424..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/http/url_parser_test.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstdint>
-#include <ostream>
-#include <string>
-#include <tuple>
-
-#include "opentelemetry/ext/http/common/url_parser.h"
-
-namespace http_common = opentelemetry::ext::http::common;
-
-struct ParsedUrl
-{
-  std::string scheme;
-  std::string host;
-  std::uint16_t port;
-  std::string path;
-  std::string query;
-  bool success;
-
-  friend void PrintTo(const ParsedUrl &p, std::ostream *os)
-  {
-    *os << "(valid: " << (p.success ? "yes" : "no") << ", scheme: " << p.scheme
-        << ", host: " << p.host << ", port: " << p.port << ", path: " << p.path
-        << ", query: " << p.query << ")";
-  }
-};
-
-class UrlParserTests : public testing::TestWithParam<std::tuple<std::string, ParsedUrl>>
-{};
-
-INSTANTIATE_TEST_SUITE_P(
-    SampleValues,
-    UrlParserTests,
-    testing::Values(
-        std::make_tuple("www.abc.com", ParsedUrl{"http", "www.abc.com", 80, "/", "", true}),
-        std::make_tuple("http://www.abc.com", ParsedUrl{"http", "www.abc.com", 80, "/", "", true}),
-        std::make_tuple("https://www.abc.com",
-                        ParsedUrl{"https", "www.abc.com", 443, "/", "", true}),
-        std::make_tuple("https://www.abc.com:4431",
-                        ParsedUrl{"https", "www.abc.com", 4431, "/", "", true}),
-        std::make_tuple("https://www.abc.com:4431/path1",
-                        ParsedUrl{"https", "www.abc.com", 4431, "/path1", "", true}),
-        std::make_tuple("https://www.abc.com:4431/path1/path2",
-                        ParsedUrl{"https", "www.abc.com", 4431, "/path1/path2", "", true}),
-        std::make_tuple("https://www.abc.com/path1/path2",
-                        ParsedUrl{"https", "www.abc.com", 443, "/path1/path2", "", true}),
-        std::make_tuple("http://www.abc.com/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "www.abc.com", 80, "/path1/path2", "q1=a1&q2=a2", true}),
-        std::make_tuple("http://www.abc.com:8080/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "www.abc.com", 8080, "/path1/path2", "q1=a1&q2=a2",
-                                  true}),
-        std::make_tuple("www.abc.com:8080/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "www.abc.com", 8080, "/path1/path2", "q1=a1&q2=a2",
-                                  true}),
-        std::make_tuple("http://user:password@www.abc.com:8080/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "www.abc.com", 8080, "/path1/path2", "q1=a1&q2=a2",
-                                  true}),
-        std::make_tuple("user:password@www.abc.com:8080/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "www.abc.com", 8080, "/path1/path2", "q1=a1&q2=a2",
-                                  true}),
-        std::make_tuple("https://user@www.abc.com/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"https", "www.abc.com", 443, "/path1/path2", "q1=a1&q2=a2",
-                                  true}),
-        std::make_tuple("http://www.abc.com/path1@bbb/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "www.abc.com", 80, "/path1@bbb/path2", "q1=a1&q2=a2",
-                                  true}),
-        std::make_tuple("http://1.2.3.4/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "1.2.3.4", 80, "/path1/path2", "q1=a1&q2=a2", true}),
-        std::make_tuple("user:password@1.2.3.4:8080/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "1.2.3.4", 8080, "/path1/path2", "q1=a1&q2=a2", true}),
-        std::make_tuple("https://user@1.2.3.4/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"https", "1.2.3.4", 443, "/path1/path2", "q1=a1&q2=a2", true}),
-        std::make_tuple("http://1.2.3.4/path1@bbb/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "1.2.3.4", 80, "/path1@bbb/path2", "q1=a1&q2=a2", true}),
-        std::make_tuple("http://[fe80::225:93da:bfde:b5f5]/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "[fe80::225:93da:bfde:b5f5]", 80, "/path1/path2",
-                                  "q1=a1&q2=a2", true}),
-        std::make_tuple("user:password@[fe80::225:93da:bfde:b5f5]:8080/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "[fe80::225:93da:bfde:b5f5]", 8080, "/path1/path2",
-                                  "q1=a1&q2=a2", true}),
-        std::make_tuple("https://user@[fe80::225:93da:bfde:b5f5]/path1/path2?q1=a1&q2=a2",
-                        ParsedUrl{"https", "[fe80::225:93da:bfde:b5f5]", 443, "/path1/path2",
-                                  "q1=a1&q2=a2", true}),
-        std::make_tuple("http://[fe80::225:93da:bfde:b5f5]/path1@bbb/path2?q1=a1&q2=a2",
-                        ParsedUrl{"http", "[fe80::225:93da:bfde:b5f5]", 80, "/path1@bbb/path2",
-                                  "q1=a1&q2=a2", true}),
-        std::make_tuple("https://https://example.com/some/path",
-                        ParsedUrl{"https", "https", 0, "//example.com/some/path", "", false}),
-        std::make_tuple("https://example.com:-1/some/path",
-                        ParsedUrl{"https", "example.com", 0, "/some/path", "", false}),
-        std::make_tuple("https://example.com:65536/some/path",
-                        ParsedUrl{"https", "example.com", 0, "/some/path", "", false}),
-        std::make_tuple("https://example.com:80a/some/path",
-                        ParsedUrl{"https", "example.com", 0, "/some/path", "", false}),
-        std::make_tuple("https://example.com:18446744073709551616/some/path",
-                        ParsedUrl{"https", "example.com", 0, "/some/path", "", false})));
-
-TEST_P(UrlParserTests, BasicTests)
-{
-  const auto &url      = std::get<0>(GetParam());
-  const auto &expected = std::get<1>(GetParam());
-
-  const auto actual = http_common::UrlParser(url);
-
-  EXPECT_EQ(actual.success_, expected.success);
-  EXPECT_EQ(actual.host_, expected.host);
-  EXPECT_EQ(actual.port_, expected.port);
-  EXPECT_EQ(actual.scheme_, expected.scheme);
-  EXPECT_EQ(actual.path_, expected.path);
-  EXPECT_EQ(actual.query_, expected.query);
-}
-
-class UrlDecoderTests : public ::testing::TestWithParam<std::tuple<std::string, std::string>>
-{};
-
-INSTANTIATE_TEST_SUITE_P(
-    SampleValues,
-    UrlDecoderTests,
-    testing::Values(std::make_tuple("Authentication=Basic xxx", "Authentication=Basic xxx"),
-                    std::make_tuple("Authentication=Basic%20xxx", "Authentication=Basic xxx"),
-                    std::make_tuple("%C3%B6%C3%A0%C2%A7%C3%96abcd%C3%84",
-                                    "\xc3\xb6\xc3\xa0\xc2\xa7\xc3\x96\x61\x62\x63\x64\xc3\x84"),
-                    std::make_tuple("%2x", "%2x"),
-                    std::make_tuple("%20", " "),
-                    std::make_tuple("text%2", "text%2"),
-                    std::make_tuple("%20test%zztest", "%20test%zztest"),
-                    std::make_tuple("%20test%2", "%20test%2")));
-
-TEST_P(UrlDecoderTests, BasicTests)
-{
-  const auto &encoded  = std::get<0>(GetParam());
-  const auto &expected = std::get<1>(GetParam());
-  const auto actual    = http_common::UrlDecoder::Decode(encoded);
-
-  EXPECT_EQ(actual, expected);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/BUILD b/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/BUILD
deleted file mode 100644
index 8c1c8c17e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_binary(
-    name = "w3c_tracecontext_http_test_server",
-    srcs = [
-        "main.cc",
-    ],
-    linkopts = select({
-        "//bazel:windows": [
-            "-DEFAULTLIB:advapi32.lib",
-            "-DEFAULTLIB:crypt32.lib",
-            "-DEFAULTLIB:Normaliz.lib",
-        ],
-        "//conditions:default": [],
-    }),
-    deps = [
-        "//api",
-        "//exporters/ostream:ostream_span_exporter",
-        "//ext:headers",
-        "//ext/src/http/client/curl:http_client_curl",
-        "//sdk/src/trace",
-        "@curl",
-        "@github_nlohmann_json//:json",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt
deleted file mode 100644
index f4cfb7ee0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_executable(w3c_tracecontext_http_test_server main.cc)
-target_link_libraries(
-  w3c_tracecontext_http_test_server
-  PRIVATE ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace
-          opentelemetry_http_client_curl opentelemetry_exporter_ostream_span
-          ${CURL_LIBRARIES} nlohmann_json::nlohmann_json)
-if(nlohmann_json_clone)
-  add_dependencies(w3c_tracecontext_http_test_server
-                   nlohmann_json::nlohmann_json)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/Dockerfile b/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/Dockerfile
deleted file mode 100644
index cfe663d06..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-FROM python
-
-RUN pip install aiohttp
-RUN git clone https://github.com/w3c/trace-context
-
-WORKDIR ./trace-context/test
-
-ENTRYPOINT [ "python", "test.py" ]
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/README.md b/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/README.md
deleted file mode 100644
index afe2a6863..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test service endpoint for W3C validation
-
-This test application is intended to be used as a test service for the [W3C
-Distributed Tracing Validation
-Service](https://github.com/w3c/trace-context/tree/master/test). It is
-implemented according to [these
-instructions](https://github.com/w3c/trace-context/tree/master/test#implement-test-service).
-
-## Usage
-
-1: Build and start the test service endpoint:
-
-```sh
-./w3c_tracecontext_http_test_server
-
-Listening to http://localhost:30000/test
-```
-
-A custom port number for the test service to listen to can be specified:
-
-```sh
-./w3c_tracecontext_http_test_server 31339
-
-Listening to http://localhost:31339/test
-```
-
-The test service will print the full URI that the validation service can connect
-to.
-
-2: In a different terminal, set up and start the validation service according to
-the
-[instructions](https://github.com/w3c/trace-context/tree/master/test#run-test-cases),
-giving the address of the test service endpoint as argument:
-
-```sh
-python test.py http://localhost:31339/test
-```
-
-One can also use the `Dockerfile` provided in this folder to conveniently run
-the validation service:
-
-```sh
-docker build --tag w3c_driver .
-docker run --network host w3c_driver http://localhost:31339/test
-```
-
-3: The validation service will run the test suite and print detailed test
-results.
-
-4: Stop the test service by invoking `/stop`. Make sure to use the correct port number.
-
-```sh
-# Assuming the service is currently running at port 30000
-curl http://localhost:30000/stop
-```
diff --git a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/main.cc b/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/main.cc
deleted file mode 100644
index bf440a1a0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/ext/test/w3c_tracecontext_http_test_server/main.cc
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <ctype.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <map>
-#include <nlohmann/json.hpp>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/exporters/ostream/span_exporter.h"
-#include "opentelemetry/ext/http/client/curl/http_client_curl.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/ext/http/server/http_server.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/trace/propagation/http_trace_context.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace trace_api   = opentelemetry::trace;
-namespace http_client = opentelemetry::ext::http::client;
-namespace curl        = opentelemetry::ext::http::client::curl;
-namespace context     = opentelemetry::context;
-namespace nostd       = opentelemetry::nostd;
-namespace trace_sdk   = opentelemetry::sdk::trace;
-
-namespace
-{
-static trace_api::propagation::HttpTraceContext propagator_format;
-
-static bool equalsIgnoreCase(const std::string &str1, const std::string &str2)
-{
-  if (str1.length() != str2.length())
-  {
-    return false;
-  }
-  for (size_t i = 0; i < str1.length(); i++)
-  {
-    if (tolower(str1[i]) != tolower(str2[i]))
-    {
-      return false;
-    }
-  }
-  return true;
-}
-
-class TextMapCarrierTest : public context::propagation::TextMapCarrier
-{
-public:
-  TextMapCarrierTest(std::map<std::string, std::string> &headers) : headers_(headers) {}
-  nostd::string_view Get(nostd::string_view key) const noexcept override
-  {
-    for (const auto &elem : headers_)
-    {
-      if (equalsIgnoreCase(elem.first, std::string(key)))
-      {
-        return nostd::string_view(elem.second);
-      }
-    }
-    return "";
-  }
-  void Set(nostd::string_view key, nostd::string_view value) noexcept override
-  {
-    headers_[std::string(key)] = std::string(value);
-  }
-
-  std::map<std::string, std::string> &headers_;
-};
-
-void initTracer()
-{
-  auto exporter = std::unique_ptr<trace_sdk::SpanExporter>(
-      new opentelemetry::exporter::trace::OStreamSpanExporter);
-  auto processor = std::unique_ptr<trace_sdk::SpanProcessor>(
-      new trace_sdk::SimpleSpanProcessor(std::move(exporter)));
-  std::vector<std::unique_ptr<trace_sdk::SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  auto context = std::unique_ptr<trace_sdk::TracerContext>(
-      new trace_sdk::TracerContext(std::move(processors)));
-  auto provider = nostd::shared_ptr<trace_api::TracerProvider>(
-      new trace_sdk::TracerProvider(std::move(context)));
-  // Set the global trace provider
-  trace_sdk::Provider::SetTracerProvider(provider);
-}
-
-nostd::shared_ptr<trace_api::Tracer> get_tracer()
-{
-  auto provider = trace_api::Provider::GetTracerProvider();
-  return provider->GetTracer("w3c_tracecontext_http_test_server");
-}
-
-struct Uri
-{
-  std::string host;
-  uint16_t port;
-  std::string path;
-
-  Uri(const std::string &uri)
-  {
-    size_t host_end = uri.substr(7, std::string::npos).find(':');
-    size_t port_end = uri.substr(host_end + 1, std::string::npos).find('/');
-
-    host = uri.substr(0, host_end + 7);
-    port = std::stoi(uri.substr(7 + host_end + 1, port_end));
-    path = uri.substr(host_end + port_end + 2, std::string::npos);
-  }
-};
-
-// A noop event handler for making HTTP requests. We don't care about response bodies and error
-// messages.
-class NoopEventHandler : public http_client::EventHandler
-{
-public:
-  void OnEvent(http_client::SessionState /* state */,
-               nostd::string_view /* reason */) noexcept override
-  {}
-
-  void OnResponse(http_client::Response & /* response */) noexcept override {}
-};
-}  // namespace
-
-// Sends an HTTP POST request to the given url, with the given body.
-void send_request(curl::HttpClient &client, const std::string &url, const std::string &body)
-{
-  static std::shared_ptr<http_client::EventHandler> handler(new NoopEventHandler());
-
-  auto request_span = get_tracer()->StartSpan(__func__);
-  trace_api::Scope scope(request_span);
-
-  Uri uri{url};
-
-  auto session = client.CreateSession(url);
-  auto request = session->CreateRequest();
-
-  request->SetMethod(http_client::Method::Post);
-  request->SetUri(uri.path);
-  http_client::Body b = {body.c_str(), body.c_str() + body.size()};
-  request->SetBody(b);
-  request->AddHeader("Content-Type", "application/json");
-  request->AddHeader("Content-Length", std::to_string(body.size()));
-
-  std::map<std::string, std::string> headers;
-  TextMapCarrierTest carrier(headers);
-  propagator_format.Inject(carrier, context::RuntimeContext::GetCurrent());
-
-  for (auto const &hdr : headers)
-  {
-    request->AddHeader(hdr.first, hdr.second);
-  }
-
-  session->SendRequest(handler);
-  session->FinishSession();
-}
-
-// This application receives requests from the W3C test service. Each request has a JSON body which
-// consists of an array of objects, each containing an URL to which to post to, and arguments which
-// need to be used as body when posting to the given URL.
-int main(int argc, char *argv[])
-{
-  initTracer();
-
-  constexpr char default_host[]   = "localhost";
-  constexpr uint16_t default_port = 30000;
-  uint16_t port;
-  std::atomic_bool stop_server(false);
-
-  // The port the validation service listens to can be specified via the command line.
-  if (argc > 1)
-  {
-    port = atoi(argv[1]);
-  }
-  else
-  {
-    port = default_port;
-  }
-
-  auto root_span = get_tracer()->StartSpan(__func__);
-  trace_api::Scope scope(root_span);
-
-  testing::HttpServer server(default_host, port);
-  curl::HttpClient client;
-
-  testing::HttpRequestCallback test_cb{
-      [&](testing::HttpRequest const &req, testing::HttpResponse &resp) {
-        auto body = nlohmann::json::parse(req.content);
-
-        std::cout << "Received request with body :\n" << req.content << "\n";
-
-        for (auto &part : body)
-        {
-          auto headers_2 = const_cast<std::map<std::string, std::string> &>(req.headers);
-
-          const TextMapCarrierTest carrier(headers_2);
-          auto current_ctx = context::RuntimeContext::GetCurrent();
-          auto ctx         = propagator_format.Extract(carrier, current_ctx);
-          auto token       = context::RuntimeContext::Attach(ctx);
-
-          auto url       = part["url"].get<std::string>();
-          auto arguments = part["arguments"].dump();
-
-          std::cout << "  Sending request to " << url << "\n";
-
-          send_request(client, url, arguments);
-        }
-
-        std::cout << "\n";
-
-        resp.code = 200;
-        return 0;
-      }};
-
-  testing::HttpRequestCallback stop_cb{
-      [&](testing::HttpRequest const & /*req*/, testing::HttpResponse &resp) {
-        std::cout << "Received request to stop server \n";
-        stop_server.store(true);
-        resp.code = 200;
-        return 0;
-      }};
-
-  server["/test"] = test_cb;
-  server["/stop"] = stop_cb;
-
-  // Start server
-  server.start();
-
-  std::cout << "Listening at http://" << default_host << ":" << port << "/test\n";
-
-  // Wait for signal to stop server
-  while (!stop_server.load())
-  {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-  }
-  // received signal to stop server
-  std::cout << "Stopping server \n";
-  server.stop();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/functional/CMakeLists.txt
deleted file mode 100644
index 66924fea8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(WITH_OTLP_HTTP)
-  add_subdirectory(otlp)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/cert/ca_csr.json b/ext/opentelemetry-cpp-1.21.0/functional/cert/ca_csr.json
deleted file mode 100644
index 2c388b104..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/cert/ca_csr.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry CA Example"
-    }
-  ]
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/cert/ca_csr_b.json b/ext/opentelemetry-cpp-1.21.0/functional/cert/ca_csr_b.json
deleted file mode 100644
index 65acabe08..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/cert/ca_csr_b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry CA Example B"
-    }
-  ]
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/cert/client_csr.json b/ext/opentelemetry-cpp-1.21.0/functional/cert/client_csr.json
deleted file mode 100644
index 672dd314a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/cert/client_csr.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry Client Example"
-    }
-  ]
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/cert/client_csr_b.json b/ext/opentelemetry-cpp-1.21.0/functional/cert/client_csr_b.json
deleted file mode 100644
index b01279600..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/cert/client_csr_b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry Client Example B"
-    }
-  ]
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/cert/garbage.pem b/ext/opentelemetry-cpp-1.21.0/functional/cert/garbage.pem
deleted file mode 100644
index 531bebbf0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/cert/garbage.pem
+++ /dev/null
@@ -1 +0,0 @@
-This is garbage, not a real cert.
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/cert/generate_cert.sh b/ext/opentelemetry-cpp-1.21.0/functional/cert/generate_cert.sh
deleted file mode 100755
index d0b2b008a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/cert/generate_cert.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-which cfssl
-which cfssljson
-
-cfssl version
-cfssljson -version
-
-echo "Generating CA"
-cfssl genkey -initca ca_csr.json | cfssljson -bare ca
-
-echo "Generating CLIENT CERT"
-cfssl gencert -ca ca.pem -ca-key ca-key.pem client_csr.json | cfssljson -bare client_cert
-echo "Generating SERVER CERT"
-cfssl gencert -ca ca.pem -ca-key ca-key.pem server_csr.json | cfssljson -bare server_cert
-
-echo "Generating CA B"
-cfssl genkey -initca ca_csr_b.json | cfssljson -bare ca_b
-
-echo "Generating CLIENT CERT B"
-cfssl gencert -ca ca_b.pem -ca-key ca_b-key.pem client_csr_b.json | cfssljson -bare client_cert_b
-echo "Generating SERVER CERT B"
-cfssl gencert -ca ca_b.pem -ca-key ca_b-key.pem server_csr_b.json | cfssljson -bare server_cert_b
-
-echo "UNREADABLE" > unreadable.pem
-chmod 0 unreadable.pem
-
-# Needed to copy this key inside docker (different owner)
-chmod +r server_cert-key.pem
-
-# Debug
-ls -l
-
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/cert/server_csr.json b/ext/opentelemetry-cpp-1.21.0/functional/cert/server_csr.json
deleted file mode 100644
index 39a5a6472..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/cert/server_csr.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry Server Example"
-    }
-  ]
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/cert/server_csr_b.json b/ext/opentelemetry-cpp-1.21.0/functional/cert/server_csr_b.json
deleted file mode 100644
index b54e7c9bb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/cert/server_csr_b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "hosts": ["localhost", "127.0.0.1"],
-  "key": {
-    "algo": "rsa",
-    "size": 2048
-  },
-  "names": [
-    {
-      "O": "OpenTelemetry Server Example B"
-    }
-  ]
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/functional/otlp/CMakeLists.txt
deleted file mode 100644
index d675b4341..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(WITH_OTLP_GRPC)
-  add_executable(func_otlp_grpc func_grpc_main.cc)
-  target_link_libraries(func_otlp_grpc ${CMAKE_THREAD_LIBS_INIT}
-                        opentelemetry_trace opentelemetry_exporter_otlp_grpc)
-endif()
-
-if(WITH_OTLP_HTTP)
-  add_executable(func_otlp_http func_http_main.cc)
-  target_link_libraries(func_otlp_http ${CMAKE_THREAD_LIBS_INIT}
-                        opentelemetry_trace opentelemetry_exporter_otlp_http)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/Dockerfile b/ext/opentelemetry-cpp-1.21.0/functional/otlp/Dockerfile
deleted file mode 100644
index 99a67b943..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-FROM otel/opentelemetry-collector:0.123.0@sha256:c8e36258c1b26927fb7b05c5186b90e9c3d77315efc24f65d6fddec1c14b60b3
-COPY . .
-CMD ["--config", "/otel-cpp/otel-config.yaml"]
-EXPOSE 4317
-EXPOSE 4318
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/func_grpc_main.cc b/ext/opentelemetry-cpp-1.21.0/functional/otlp/func_grpc_main.cc
deleted file mode 100644
index 378418622..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/func_grpc_main.cc
+++ /dev/null
@@ -1,822 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <iostream>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_environment.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace trace     = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace otlp      = opentelemetry::exporter::otlp;
-namespace nostd     = opentelemetry::nostd;
-
-namespace internal_log = opentelemetry::sdk::common::internal_log;
-
-const int TEST_PASSED = 0;
-const int TEST_FAILED = 1;
-
-/*
-  Command line parameters.
-*/
-
-enum class TestMode : std::uint8_t
-{
-  kNone,
-  kHttp,
-  kHttps
-};
-
-bool opt_help   = false;
-bool opt_list   = false;
-bool opt_debug  = false;
-bool opt_secure = false;
-// HTTPS by default
-std::string opt_endpoint = "https://127.0.0.1:4317";
-std::string opt_cert_dir;
-std::string opt_test_name;
-TestMode opt_mode = TestMode::kNone;
-
-/*
-  Log parsing
-*/
-
-struct TestResult
-{
-  bool found_connection_failed = false;
-  bool found_export_error      = false;
-  bool found_export_success    = false;
-  bool deadline_exceeded       = false;
-  bool empty_address_list      = false;
-
-  void reset()
-  {
-    found_connection_failed = false;
-    found_export_error      = false;
-    found_export_success    = false;
-    deadline_exceeded       = false;
-    empty_address_list      = false;
-  }
-};
-
-struct TestResult g_test_result;
-
-void parse_error_msg(TestResult *result, const std::string &msg)
-{
-  static std::string connection_failed("failed to connect to all addresses");
-
-  if (msg.find(connection_failed) != std::string::npos)
-  {
-    result->found_connection_failed = true;
-  }
-
-  static std::string export_failed("Export() failed with status_code");
-
-  if (msg.find(export_failed) != std::string::npos)
-  {
-    result->found_export_error = true;
-  }
-
-  static std::string deadline_exceeded("Deadline Exceeded");
-
-  if (msg.find(deadline_exceeded) != std::string::npos)
-  {
-    result->deadline_exceeded = true;
-  }
-
-  static std::string empty_address_list("empty address list:");
-
-  if (msg.find(empty_address_list) != std::string::npos)
-  {
-    result->empty_address_list = true;
-  }
-}
-
-void parse_warning_msg(TestResult * /* result */, const std::string & /* msg */) {}
-
-void parse_info_msg(TestResult * /* result */, const std::string & /* msg */) {}
-
-void parse_debug_msg(TestResult *result, const std::string &msg)
-{
-  static std::string export_success("Export 1 trace span(s) success");
-
-  if (msg.find(export_success) != std::string::npos)
-  {
-    result->found_export_success = true;
-  }
-}
-
-class TestLogHandler : public opentelemetry::sdk::common::internal_log::LogHandler
-{
-public:
-  void Handle(opentelemetry::sdk::common::internal_log::LogLevel level,
-              const char * /* file */,
-              int /* line */,
-              const char *msg,
-              const opentelemetry::sdk::common::AttributeMap & /* attributes */) noexcept override
-  {
-    if (msg == nullptr)
-    {
-      msg = "<no msg>";
-    }
-
-    switch (level)
-    {
-      case opentelemetry::sdk::common::internal_log::LogLevel::None:
-        break;
-      case opentelemetry::sdk::common::internal_log::LogLevel::Error:
-        std::cout << " - [E] " << msg << '\n';
-        parse_error_msg(&g_test_result, msg);
-        break;
-      case opentelemetry::sdk::common::internal_log::LogLevel::Warning:
-        std::cout << " - [W] " << msg << '\n';
-        parse_warning_msg(&g_test_result, msg);
-        break;
-      case opentelemetry::sdk::common::internal_log::LogLevel::Info:
-        std::cout << " - [I] " << msg << '\n';
-        parse_info_msg(&g_test_result, msg);
-        break;
-      case opentelemetry::sdk::common::internal_log::LogLevel::Debug:
-        std::cout << " - [D] " << msg << '\n';
-        parse_debug_msg(&g_test_result, msg);
-        break;
-    }
-  }
-};
-
-void init(const otlp::OtlpGrpcExporterOptions &opts)
-{
-  // Create OTLP exporter instance
-  auto exporter  = otlp::OtlpGrpcExporterFactory::Create(opts);
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
-      trace_sdk::TracerProviderFactory::Create(std::move(processor));
-  // Set the global trace provider
-  trace_sdk::Provider::SetTracerProvider(provider);
-}
-
-void payload()
-{
-  static const nostd::string_view k_tracer_name("func_test");
-  static const nostd::string_view k_span_name("func_grpc_main");
-  static const nostd::string_view k_attr_test_name("test_name");
-
-  auto provider = trace::Provider::GetTracerProvider();
-  auto tracer   = provider->GetTracer(k_tracer_name, "1.0");
-
-  auto span = tracer->StartSpan(k_span_name);
-  span->SetAttribute(k_attr_test_name, opt_test_name);
-  span->End();
-}
-
-void cleanup()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-
-void instrumented_payload(const otlp::OtlpGrpcExporterOptions &opts)
-{
-  g_test_result.reset();
-  init(opts);
-  payload();
-  cleanup();
-}
-
-void usage(FILE *out)
-{
-  static const char *msg =
-      "Usage: func_otlp_grpc [options] test_name\n"
-      "Valid options are:\n"
-      "  --help            Print this help\n"
-      "  --list            List test names\n"
-      "  --endpoint url    OTLP gRPC endpoint (https://localhost:4317/ by default)\n"
-      "  --cert-dir dir    Directory that contains test ssl certificates\n"
-      "  --mode mode       Test server mode (used to verify expected results)\n"
-      "                      - none: no endpoint\n"
-      "                      - http: http endpoint\n"
-      "                      - https: https endpoint\n";
-  fprintf(out, "%s", msg);
-}
-
-int parse_args(int argc, char *argv[])
-{
-  int remaining_argc    = argc;
-  char **remaining_argv = argv;
-
-  while (remaining_argc > 0)
-  {
-    if (strcmp(*remaining_argv, "--help") == 0)
-    {
-      opt_help = true;
-      return 0;
-    }
-
-    if (strcmp(*remaining_argv, "--list") == 0)
-    {
-      opt_list = true;
-      return 0;
-    }
-
-    if (strcmp(*remaining_argv, "--debug") == 0)
-    {
-      opt_debug = true;
-      remaining_argc--;
-      remaining_argv++;
-      continue;
-    }
-
-    if (remaining_argc >= 2)
-    {
-      if (strcmp(*remaining_argv, "--cert-dir") == 0)
-      {
-        remaining_argc--;
-        remaining_argv++;
-        opt_cert_dir = *remaining_argv;
-        remaining_argc--;
-        remaining_argv++;
-        continue;
-      }
-
-      if (strcmp(*remaining_argv, "--endpoint") == 0)
-      {
-        remaining_argc--;
-        remaining_argv++;
-        opt_endpoint = *remaining_argv;
-        remaining_argc--;
-        remaining_argv++;
-        continue;
-      }
-
-      if (strcmp(*remaining_argv, "--mode") == 0)
-      {
-        remaining_argc--;
-        remaining_argv++;
-        std::string mode = *remaining_argv;
-        remaining_argc--;
-        remaining_argv++;
-
-        if (mode == "none")
-        {
-          opt_mode = TestMode::kNone;
-        }
-        else if (mode == "http")
-        {
-          opt_mode = TestMode::kHttp;
-        }
-        else if (mode == "https")
-        {
-          opt_mode = TestMode::kHttps;
-        }
-        else
-        {
-          // Unknown mode
-          return 2;
-        }
-
-        continue;
-      }
-    }
-
-    opt_test_name = *remaining_argv;
-    remaining_argc--;
-    remaining_argv++;
-
-    if (remaining_argc)
-    {
-      // Unknown option
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
-typedef int (*test_func_t)();
-
-struct test_case
-{
-  std::string m_name;
-  test_func_t m_func;
-};
-
-int test_basic();
-
-int test_cert_not_found();
-int test_cert_invalid();
-int test_cert_unreadable();
-int test_client_cert_not_found();
-int test_client_cert_invalid();
-int test_client_cert_unreadable();
-int test_client_cert_no_key();
-int test_client_key_not_found();
-int test_client_key_invalid();
-int test_client_key_unreadable();
-
-int test_mtls_ok();
-
-static const test_case all_tests[] = {{"basic", test_basic},
-                                      {"cert-not-found", test_cert_not_found},
-                                      {"cert-invalid", test_cert_invalid},
-                                      {"cert-unreadable", test_cert_unreadable},
-#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-                                      {"client-cert-not-found", test_client_cert_not_found},
-                                      {"client-cert-invalid", test_client_cert_invalid},
-                                      {"client-cert-unreadable", test_client_cert_unreadable},
-                                      {"client-cert-no-key", test_client_cert_no_key},
-                                      {"client-key-not-found", test_client_key_not_found},
-                                      {"client-key-invalid", test_client_key_invalid},
-                                      {"client-key-unreadable", test_client_key_unreadable},
-                                      {"mtls-ok", test_mtls_ok},
-#endif  // ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-                                      {"", nullptr}};
-
-void list_test_cases()
-{
-  const test_case *current = all_tests;
-
-  while (current->m_func != nullptr)
-  {
-    std::cout << current->m_name << '\n';
-    current++;
-  }
-}
-
-int run_test_case(const std::string &name)
-{
-  const test_case *current = all_tests;
-
-  while (current->m_func != nullptr)
-  {
-    if (current->m_name == name)
-    {
-      int rc = current->m_func();
-      return rc;
-    }
-    current++;
-  }
-
-  std::cerr << "Unknown test <" << name << ">" << '\n';
-  return 1;
-}
-
-int main(int argc, char *argv[])
-{
-  // Program name
-  argc--;
-  argv++;
-
-  int rc = parse_args(argc, argv);
-
-  if (rc != 0)
-  {
-    usage(stderr);
-    return 1;
-  }
-
-  if (opt_help)
-  {
-    usage(stdout);
-    return 0;
-  }
-
-  if (opt_list)
-  {
-    list_test_cases();
-    return 0;
-  }
-
-  if (opt_endpoint.find("https:") != std::string::npos)
-  {
-    opt_secure = true;
-  }
-  else
-  {
-    opt_secure = false;
-  }
-
-  opentelemetry::nostd::shared_ptr<internal_log::LogHandler> log_handler(new TestLogHandler);
-
-  internal_log::GlobalLogHandler::SetLogHandler(log_handler);
-  internal_log::GlobalLogHandler::SetLogLevel(internal_log::LogLevel::Debug);
-
-  rc = run_test_case(opt_test_name);
-  return rc;
-}
-
-void set_common_opts(otlp::OtlpGrpcExporterOptions &opts)
-{
-  opts.endpoint            = opt_endpoint;
-  opts.timeout             = std::chrono::milliseconds{100};
-  opts.use_ssl_credentials = (opt_mode == TestMode::kHttps);
-
-#ifdef ENABLE_ASYNC_EXPORT
-  // Work around, ASYNC export not working.
-  opts.max_concurrent_requests = 0;
-#endif
-}
-
-int expect_connection_failed()
-{
-  if (g_test_result.found_export_error &&
-      (g_test_result.found_connection_failed || g_test_result.deadline_exceeded ||
-       g_test_result.empty_address_list))
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int expect_success()
-{
-  if (g_test_result.found_export_success)
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int expect_export_failed()
-{
-  /*
-    Can not test exact root cause:
-    - connect failed ?
-    - send request failed ?
-    - exact error message ?
-    so only verifying export failed.
-  */
-
-  if (g_test_result.found_export_error)
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int test_basic()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_cert_not_found()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/no-such-file.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_cert_invalid()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/garbage.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_cert_unreadable()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/unreadable.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-int test_client_cert_not_found()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path        = opt_cert_dir + "/no-such-file.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_cert_invalid()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path        = opt_cert_dir + "/garbage.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_cert_unreadable()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path        = opt_cert_dir + "/unreadable.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_cert_no_key()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path        = opt_cert_dir + "/client_cert.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_key_not_found()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path        = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path         = opt_cert_dir + "/no-such-file.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_key_invalid()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path        = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path         = opt_cert_dir + "/garbage.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_key_unreadable()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path        = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path         = opt_cert_dir + "/unreadable.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_mtls_ok()
-{
-  otlp::OtlpGrpcExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_credentials_cacert_path = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path        = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path         = opt_cert_dir + "/client_cert-key.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == TestMode::kNone)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == TestMode::kHttps))
-  {
-    return expect_success();
-  }
-
-  if (opt_secure && (opt_mode == TestMode::kHttp))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-#endif  // ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/func_http_main.cc b/ext/opentelemetry-cpp-1.21.0/functional/otlp/func_http_main.cc
deleted file mode 100644
index 874c8bec0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/func_http_main.cc
+++ /dev/null
@@ -1,1881 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdio.h>
-#include <string.h>
-#include <cstdint>
-#include <iostream>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace trace     = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-namespace otlp      = opentelemetry::exporter::otlp;
-namespace nostd     = opentelemetry::nostd;
-
-namespace internal_log = opentelemetry::sdk::common::internal_log;
-
-const int TEST_PASSED = 0;
-const int TEST_FAILED = 1;
-
-/*
-  Command line parameters.
-*/
-
-enum test_mode : std::uint8_t
-{
-  MODE_NONE,
-  MODE_HTTP,
-  MODE_HTTPS
-};
-
-bool opt_help   = false;
-bool opt_list   = false;
-bool opt_debug  = false;
-bool opt_secure = false;
-// HTTPS by default
-std::string opt_endpoint = "https://localhost:4318/v1/traces";
-std::string opt_cert_dir;
-std::string opt_test_name;
-test_mode opt_mode = MODE_NONE;
-
-/*
-  Log parsing
-*/
-
-struct TestResult
-{
-  bool found_connection_failed    = false;
-  bool found_connection_refused   = false;
-  bool found_request_send_failure = false;
-  bool found_export_error         = false;
-  bool found_export_success       = false;
-  bool found_unknown_min_tls      = false;
-  bool found_unknown_max_tls      = false;
-
-  void reset()
-  {
-    found_connection_failed    = false;
-    found_connection_refused   = false;
-    found_request_send_failure = false;
-    found_export_error         = false;
-    found_export_success       = false;
-    found_unknown_min_tls      = false;
-    found_unknown_max_tls      = false;
-  }
-};
-
-struct TestResult g_test_result;
-
-void parse_error_msg(TestResult *result, const std::string &msg)
-{
-  static std::string connection_failed("Session state: connection failed.");
-
-  if (msg.find(connection_failed) != std::string::npos)
-  {
-    result->found_connection_failed = true;
-  }
-
-  static std::string connection_refused("Connection refused");
-
-  if (msg.find(connection_refused) != std::string::npos)
-  {
-    result->found_connection_refused = true;
-  }
-
-  static std::string request_send_failed("Session state: request send failed.");
-
-  if (msg.find(request_send_failed) != std::string::npos)
-  {
-    result->found_request_send_failure = true;
-  }
-
-  static std::string export_failed("ERROR: Export 1 trace span(s) error: 1");
-
-  if (msg.find(export_failed) != std::string::npos)
-  {
-    result->found_export_error = true;
-  }
-
-  static std::string unknown_min_tls("Unknown min TLS version");
-
-  if (msg.find(unknown_min_tls) != std::string::npos)
-  {
-    result->found_unknown_min_tls = true;
-  }
-
-  static std::string unknown_max_tls("Unknown max TLS version");
-
-  if (msg.find(unknown_max_tls) != std::string::npos)
-  {
-    result->found_unknown_max_tls = true;
-  }
-}
-
-void parse_warning_msg(TestResult * /* result */, const std::string & /* msg */) {}
-
-void parse_info_msg(TestResult * /* result */, const std::string & /* msg */) {}
-
-void parse_debug_msg(TestResult *result, const std::string &msg)
-{
-  static std::string export_success("Export 1 trace span(s) success");
-
-  if (msg.find(export_success) != std::string::npos)
-  {
-    result->found_export_success = true;
-  }
-}
-
-class TestLogHandler : public opentelemetry::sdk::common::internal_log::LogHandler
-{
-public:
-  void Handle(opentelemetry::sdk::common::internal_log::LogLevel level,
-              const char * /* file */,
-              int /* line */,
-              const char *msg,
-              const opentelemetry::sdk::common::AttributeMap & /* attributes */) noexcept override
-  {
-    if (msg == nullptr)
-    {
-      msg = "<no msg>";
-    }
-
-    switch (level)
-    {
-      case opentelemetry::sdk::common::internal_log::LogLevel::None:
-        break;
-      case opentelemetry::sdk::common::internal_log::LogLevel::Error:
-        std::cout << " - [E] " << msg << '\n';
-        parse_error_msg(&g_test_result, msg);
-        break;
-      case opentelemetry::sdk::common::internal_log::LogLevel::Warning:
-        std::cout << " - [W] " << msg << '\n';
-        parse_warning_msg(&g_test_result, msg);
-        break;
-      case opentelemetry::sdk::common::internal_log::LogLevel::Info:
-        std::cout << " - [I] " << msg << '\n';
-        parse_info_msg(&g_test_result, msg);
-        break;
-      case opentelemetry::sdk::common::internal_log::LogLevel::Debug:
-        std::cout << " - [D] " << msg << '\n';
-        parse_debug_msg(&g_test_result, msg);
-        break;
-    }
-  }
-};
-
-void init(const otlp::OtlpHttpExporterOptions &opts)
-{
-  // Create OTLP exporter instance
-  auto exporter  = otlp::OtlpHttpExporterFactory::Create(opts);
-  auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-  std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
-      trace_sdk::TracerProviderFactory::Create(std::move(processor));
-  // Set the global trace provider
-  trace_sdk::Provider::SetTracerProvider(provider);
-}
-
-void payload()
-{
-  static const nostd::string_view k_tracer_name("func_test");
-  static const nostd::string_view k_span_name("func_http_main");
-  static const nostd::string_view k_attr_test_name("test_name");
-
-  auto provider = trace::Provider::GetTracerProvider();
-  auto tracer   = provider->GetTracer(k_tracer_name, "1.0");
-
-  auto span = tracer->StartSpan(k_span_name);
-  span->SetAttribute(k_attr_test_name, opt_test_name);
-  span->End();
-}
-
-void cleanup()
-{
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_sdk::Provider::SetTracerProvider(none);
-}
-
-void instrumented_payload(const otlp::OtlpHttpExporterOptions &opts)
-{
-  g_test_result.reset();
-  init(opts);
-  payload();
-  cleanup();
-}
-
-void usage(FILE *out)
-{
-  static const char *msg =
-      "Usage: func_otlp_http [options] test_name\n"
-      "Valid options are:\n"
-      "  --help            Print this help\n"
-      "  --list            List test names\n"
-      "  --endpoint url    OTLP HTTP endpoint (https://localhost:4318/v1/traces by default)\n"
-      "  --cert-dir dir    Directory that contains test ssl certificates\n"
-      "  --mode mode       Test server mode (used to verify expected results)\n"
-      "                      - none: no endpoint\n"
-      "                      - http: http endpoint\n"
-      "                      - https: https endpoint\n";
-  fprintf(out, "%s", msg);
-}
-
-int parse_args(int argc, char *argv[])
-{
-  int remaining_argc    = argc;
-  char **remaining_argv = argv;
-
-  while (remaining_argc > 0)
-  {
-    if (strcmp(*remaining_argv, "--help") == 0)
-    {
-      opt_help = true;
-      return 0;
-    }
-
-    if (strcmp(*remaining_argv, "--list") == 0)
-    {
-      opt_list = true;
-      return 0;
-    }
-
-    if (strcmp(*remaining_argv, "--debug") == 0)
-    {
-      opt_debug = true;
-      remaining_argc--;
-      remaining_argv++;
-      continue;
-    }
-
-    if (remaining_argc >= 2)
-    {
-      if (strcmp(*remaining_argv, "--cert-dir") == 0)
-      {
-        remaining_argc--;
-        remaining_argv++;
-        opt_cert_dir = *remaining_argv;
-        remaining_argc--;
-        remaining_argv++;
-        continue;
-      }
-
-      if (strcmp(*remaining_argv, "--endpoint") == 0)
-      {
-        remaining_argc--;
-        remaining_argv++;
-        opt_endpoint = *remaining_argv;
-        remaining_argc--;
-        remaining_argv++;
-        continue;
-      }
-
-      if (strcmp(*remaining_argv, "--mode") == 0)
-      {
-        remaining_argc--;
-        remaining_argv++;
-        std::string mode = *remaining_argv;
-        remaining_argc--;
-        remaining_argv++;
-
-        if (mode == "none")
-        {
-          opt_mode = MODE_NONE;
-        }
-        else if (mode == "http")
-        {
-          opt_mode = MODE_HTTP;
-        }
-        else if (mode == "https")
-        {
-          opt_mode = MODE_HTTPS;
-        }
-        else
-        {
-          // Unknown mode
-          return 2;
-        }
-
-        continue;
-      }
-    }
-
-    opt_test_name = *remaining_argv;
-    remaining_argc--;
-    remaining_argv++;
-
-    if (remaining_argc)
-    {
-      // Unknown option
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
-typedef int (*test_func_t)();
-
-struct test_case
-{
-  std::string m_name;
-  test_func_t m_func;
-};
-
-int test_basic();
-
-int test_cert_not_found();
-int test_cert_invalid();
-int test_cert_unreadable();
-int test_cert_ok();
-int test_client_cert_not_found();
-int test_client_cert_invalid();
-int test_client_cert_unreadable();
-int test_client_cert_no_key();
-int test_client_key_not_found();
-int test_client_key_invalid();
-int test_client_key_unreadable();
-int test_client_key_ok();
-
-int test_min_tls_unknown();
-int test_min_tls_10();
-int test_min_tls_11();
-int test_min_tls_12();
-int test_min_tls_13();
-int test_max_tls_unknown();
-int test_max_tls_10();
-int test_max_tls_11();
-int test_max_tls_12();
-int test_max_tls_13();
-int test_range_tls_10();
-int test_range_tls_11();
-int test_range_tls_12();
-int test_range_tls_13();
-int test_range_tls_10_11();
-int test_range_tls_10_12();
-int test_range_tls_10_13();
-int test_range_tls_11_10();
-int test_range_tls_11_12();
-int test_range_tls_11_13();
-int test_range_tls_12_10();
-int test_range_tls_12_11();
-int test_range_tls_12_13();
-int test_range_tls_13_10();
-int test_range_tls_13_11();
-int test_range_tls_13_12();
-
-int test_gzip_compression();
-
-static const test_case all_tests[] = {{"basic", test_basic},
-                                      {"cert-not-found", test_cert_not_found},
-                                      {"cert-invalid", test_cert_invalid},
-                                      {"cert-unreadable", test_cert_unreadable},
-                                      {"cert-ok", test_cert_ok},
-                                      {"client-cert-not-found", test_client_cert_not_found},
-                                      {"client-cert-invalid", test_client_cert_invalid},
-                                      {"client-cert-unreadable", test_client_cert_unreadable},
-                                      {"client-cert-no-key", test_client_cert_no_key},
-                                      {"client-key-not-found", test_client_key_not_found},
-                                      {"client-key-invalid", test_client_key_invalid},
-                                      {"client-key-unreadable", test_client_key_unreadable},
-                                      {"client-key-ok", test_client_key_ok},
-                                      {"min-tls-unknown", test_min_tls_unknown},
-                                      {"min-tls-10", test_min_tls_10},
-                                      {"min-tls-11", test_min_tls_11},
-                                      {"min-tls-12", test_min_tls_12},
-                                      {"min-tls-13", test_min_tls_13},
-                                      {"max-tls-unknown", test_max_tls_unknown},
-                                      {"max-tls-10", test_max_tls_10},
-                                      {"max-tls-11", test_max_tls_11},
-                                      {"max-tls-12", test_max_tls_12},
-                                      {"max-tls-13", test_max_tls_13},
-                                      {"range-tls-10", test_range_tls_10},
-                                      {"range-tls-11", test_range_tls_11},
-                                      {"range-tls-12", test_range_tls_12},
-                                      {"range-tls-13", test_range_tls_13},
-                                      {"range-tls-10-11", test_range_tls_10_11},
-                                      {"range-tls-10-12", test_range_tls_10_12},
-                                      {"range-tls-10-13", test_range_tls_10_13},
-                                      {"range-tls-11-10", test_range_tls_11_10},
-                                      {"range-tls-11-12", test_range_tls_11_12},
-                                      {"range-tls-11-13", test_range_tls_11_13},
-                                      {"range-tls-12-10", test_range_tls_12_10},
-                                      {"range-tls-12-11", test_range_tls_12_11},
-                                      {"range-tls-12-13", test_range_tls_12_13},
-                                      {"range-tls-13-10", test_range_tls_13_10},
-                                      {"range-tls-13-11", test_range_tls_13_11},
-                                      {"range-tls-13-12", test_range_tls_13_12},
-                                      {"gzip-compression", test_gzip_compression},
-                                      {"", nullptr}};
-
-void list_test_cases()
-{
-  const test_case *current = all_tests;
-
-  while (current->m_func != nullptr)
-  {
-    std::cout << current->m_name << '\n';
-    current++;
-  }
-}
-
-int run_test_case(const std::string &name)
-{
-  const test_case *current = all_tests;
-
-  while (current->m_func != nullptr)
-  {
-    if (current->m_name == name)
-    {
-      int rc = current->m_func();
-      return rc;
-    }
-    current++;
-  }
-
-  std::cerr << "Unknown test <" << name << ">" << '\n';
-  return 1;
-}
-
-int main(int argc, char *argv[])
-{
-  // Program name
-  argc--;
-  argv++;
-
-  int rc = parse_args(argc, argv);
-
-  if (rc != 0)
-  {
-    usage(stderr);
-    return 1;
-  }
-
-  if (opt_help)
-  {
-    usage(stdout);
-    return 0;
-  }
-
-  if (opt_list)
-  {
-    list_test_cases();
-    return 0;
-  }
-
-  if (opt_endpoint.find("https:") != std::string::npos)
-  {
-    opt_secure = true;
-  }
-  else
-  {
-    opt_secure = false;
-  }
-
-  opentelemetry::nostd::shared_ptr<internal_log::LogHandler> log_handler(new TestLogHandler);
-
-  internal_log::GlobalLogHandler::SetLogHandler(log_handler);
-  internal_log::GlobalLogHandler::SetLogLevel(internal_log::LogLevel::Debug);
-
-  rc = run_test_case(opt_test_name);
-  return rc;
-}
-
-void set_common_opts(otlp::OtlpHttpExporterOptions &opts)
-{
-  opts.url = opt_endpoint;
-
-  if (opt_debug)
-  {
-    opts.console_debug = true;
-  }
-
-#ifdef ENABLE_ASYNC_EXPORT
-  // Work around, ASYNC export not working.
-  opts.max_concurrent_requests = 0;
-#endif
-}
-
-int expect_connection_failed()
-{
-  if (g_test_result.found_export_error && g_test_result.found_connection_failed)
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int expect_success()
-{
-  if (g_test_result.found_export_success)
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int expect_request_send_failed()
-{
-  if (g_test_result.found_export_error && g_test_result.found_request_send_failure)
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int expect_unknown_min_tls()
-{
-  if (g_test_result.found_export_error && g_test_result.found_unknown_min_tls)
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int expect_unknown_max_tls()
-{
-  if (g_test_result.found_export_error && g_test_result.found_unknown_max_tls)
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int expect_export_failed()
-{
-  /*
-    Can not test exact root cause:
-    - connect failed ?
-    - send request failed ?
-    - exact error message ?
-    so only verifying export failed.
-  */
-
-  if (g_test_result.found_export_error)
-  {
-    return TEST_PASSED;
-  }
-  return TEST_FAILED;
-}
-
-int test_basic()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_cert_not_found()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path = opt_cert_dir + "/no-such-file.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_cert_invalid()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path = opt_cert_dir + "/garbage.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_cert_unreadable()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path = opt_cert_dir + "/unreadable.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_cert_ok()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path = opt_cert_dir + "/ca.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_client_cert_not_found()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/no-such-file.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_cert_invalid()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/garbage.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_cert_unreadable()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/unreadable.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_cert_no_key()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_key_not_found()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/no-such-file.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_key_invalid()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/garbage.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_key_unreadable()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/unreadable.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_connection_failed();
-}
-
-int test_client_key_ok()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_min_tls_unknown()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "99.99";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_unknown_min_tls();
-}
-
-int test_min_tls_10()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.0";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_unknown_min_tls();
-}
-
-int test_min_tls_11()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.1";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_unknown_min_tls();
-}
-
-int test_min_tls_12()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.2";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_min_tls_13()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.3";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_max_tls_unknown()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_max_tls          = "99.99";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  return expect_unknown_max_tls();
-}
-
-int test_max_tls_10()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_max_tls          = "1.0";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_export_failed();
-  }
-
-  // No support for TLS 1.0
-  return expect_unknown_max_tls();
-}
-
-int test_max_tls_11()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_max_tls          = "1.1";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_export_failed();
-  }
-
-  // No support for TLS 1.1
-  return expect_unknown_max_tls();
-}
-
-int test_max_tls_12()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_max_tls          = "1.2";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_max_tls_13()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_max_tls          = "1.3";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_range_tls_10()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.0";
-  opts.ssl_max_tls          = "1.0";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  // No support for TLS 1.0
-  return expect_unknown_min_tls();
-}
-
-int test_range_tls_11()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.1";
-  opts.ssl_max_tls          = "1.1";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  // No support for TLS 1.0
-  return expect_unknown_min_tls();
-}
-
-int test_range_tls_12()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.2";
-  opts.ssl_max_tls          = "1.2";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_range_tls_13()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.3";
-  opts.ssl_max_tls          = "1.3";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_range_tls_10_11()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.0";
-  opts.ssl_max_tls          = "1.1";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  // No support for TLS 1.0, TLS 1.1
-  return expect_unknown_min_tls();
-}
-
-int test_range_tls_10_12()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.0";
-  opts.ssl_max_tls          = "1.2";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_unknown_min_tls();
-}
-
-int test_range_tls_10_13()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.0";
-  opts.ssl_max_tls          = "1.3";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_unknown_min_tls();
-}
-
-int test_range_tls_11_10()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.1";
-  opts.ssl_max_tls          = "1.0";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  // Impossible
-  return expect_connection_failed();
-}
-
-int test_range_tls_11_12()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.1";
-  opts.ssl_max_tls          = "1.2";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_unknown_min_tls();
-}
-
-int test_range_tls_11_13()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.1";
-  opts.ssl_max_tls          = "1.3";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_unknown_min_tls();
-}
-
-int test_range_tls_12_10()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.2";
-  opts.ssl_max_tls          = "1.0";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  // Impossible
-  return expect_connection_failed();
-}
-
-int test_range_tls_12_11()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.2";
-  opts.ssl_max_tls          = "1.1";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  // Impossible
-  return expect_connection_failed();
-}
-
-int test_range_tls_12_13()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.2";
-  opts.ssl_max_tls          = "1.3";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  return expect_success();
-}
-
-int test_range_tls_13_10()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.3";
-  opts.ssl_max_tls          = "1.0";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  // Impossible
-  return expect_connection_failed();
-}
-
-int test_range_tls_13_11()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.3";
-  opts.ssl_max_tls          = "1.1";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  // Impossible
-  return expect_connection_failed();
-}
-
-int test_range_tls_13_12()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.ssl_ca_cert_path     = opt_cert_dir + "/ca.pem";
-  opts.ssl_client_cert_path = opt_cert_dir + "/client_cert.pem";
-  opts.ssl_client_key_path  = opt_cert_dir + "/client_cert-key.pem";
-  opts.ssl_min_tls          = "1.3";
-  opts.ssl_max_tls          = "1.2";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  // Impossible
-  return expect_connection_failed();
-}
-
-int test_gzip_compression()
-{
-  otlp::OtlpHttpExporterOptions opts;
-
-  set_common_opts(opts);
-  opts.compression = "gzip";
-
-  instrumented_payload(opts);
-
-  if (opt_mode == MODE_NONE)
-  {
-    return expect_connection_failed();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_success();
-  }
-
-  if (!opt_secure && (opt_mode == MODE_HTTPS))
-  {
-    return expect_export_failed();
-  }
-
-  if (opt_secure && (opt_mode == MODE_HTTP))
-  {
-    return expect_connection_failed();
-  }
-
-  // Impossible
-  return expect_connection_failed();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-http.yaml b/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-http.yaml
deleted file mode 100644
index 8e5fcb6ae..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-http.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# To use directly:
-# otelcol --config ...
-#
-
-receivers:
-  otlp:
-    protocols:
-      http:
-        endpoint: 0.0.0.0:4318
-
-processors:
-  batch:
-  memory_limiter:
-    # 75% of maximum memory up to 4G
-    limit_mib: 1536
-    # 25% of limit up to 2G
-    spike_limit_mib: 512
-    check_interval: 5s
-
-exporters:
-  debug:
-    verbosity: detailed
-
-service:
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [memory_limiter, batch]
-      exporters: [debug]
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-https-mtls.yaml b/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-https-mtls.yaml
deleted file mode 100644
index 4b32da4ea..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-https-mtls.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# To use directly:
-# otelcol --config ...
-#
-
-receivers:
-  otlp:
-    protocols:
-      grpc:
-        endpoint: 0.0.0.0:4317
-        tls:
-          ca_file: ../cert/ca.pem
-          cert_file: ../cert/server_cert.pem
-          client_ca_file: ../cert/client_cert.pem
-          key_file: ../cert/server_cert-key.pem
-          min_version: "1.0"
-          max_version: "1.3"
-
-processors:
-  batch:
-  memory_limiter:
-    # 75% of maximum memory up to 4G
-    limit_mib: 1536
-    # 25% of limit up to 2G
-    spike_limit_mib: 512
-    check_interval: 5s
-
-exporters:
-  debug:
-    verbosity: detailed
-
-service:
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [memory_limiter, batch]
-      exporters: [debug]
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-https.yaml b/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-https.yaml
deleted file mode 100644
index 63ae36f21..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-config-https.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# To use directly:
-# otelcol --config ...
-#
-
-receivers:
-  otlp:
-    protocols:
-      http:
-        endpoint: 0.0.0.0:4318
-        tls:
-          ca_file: ../cert/ca.pem
-          cert_file: ../cert/server_cert.pem
-          key_file: ../cert/server_cert-key.pem
-          min_version: "1.0"
-          max_version: "1.3"
-
-
-processors:
-  batch:
-  memory_limiter:
-    # 75% of maximum memory up to 4G
-    limit_mib: 1536
-    # 25% of limit up to 2G
-    spike_limit_mib: 512
-    check_interval: 5s
-
-exporters:
-  debug:
-    verbosity: detailed
-
-service:
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [memory_limiter, batch]
-      exporters: [debug]
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-http.yaml b/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-http.yaml
deleted file mode 100644
index beadb8513..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-http.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# To use from a docker container
-#
-
-receivers:
-  otlp:
-    protocols:
-      http:
-        endpoint: 0.0.0.0:4318
-
-processors:
-  batch:
-  memory_limiter:
-    # 75% of maximum memory up to 4G
-    limit_mib: 1536
-    # 25% of limit up to 2G
-    spike_limit_mib: 512
-    check_interval: 5s
-
-exporters:
-  debug:
-    verbosity: detailed
-
-service:
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [memory_limiter, batch]
-      exporters: [debug]
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-https-mtls.yaml b/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-https-mtls.yaml
deleted file mode 100644
index f4109eb4d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-https-mtls.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# To use inside a docker container
-#
-
-receivers:
-  otlp:
-    protocols:
-      grpc:
-        endpoint: 0.0.0.0:4317
-        tls:
-          ca_file: /otel-cpp/ca.pem
-          cert_file: /otel-cpp/server_cert.pem
-          client_ca_file: /otel-cpp/client_cert.pem
-          key_file: /otel-cpp/server_cert-key.pem
-          min_version: "1.0"
-          max_version: "1.3"
-
-processors:
-  batch:
-  memory_limiter:
-    # 75% of maximum memory up to 4G
-    limit_mib: 1536
-    # 25% of limit up to 2G
-    spike_limit_mib: 512
-    check_interval: 5s
-
-exporters:
-  debug:
-    verbosity: detailed
-
-service:
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [memory_limiter, batch]
-      exporters: [debug]
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-https.yaml b/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-https.yaml
deleted file mode 100644
index ef15696e7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/otel-docker-config-https.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# To use inside a docker container
-#
-
-receivers:
-  otlp:
-    protocols:
-      http:
-        endpoint: 0.0.0.0:4318
-        tls:
-          ca_file: /otel-cpp/ca.pem
-          cert_file: /otel-cpp/server_cert.pem
-          key_file: /otel-cpp/server_cert-key.pem
-          min_version: "1.0"
-          max_version: "1.3"
-
-
-processors:
-  batch:
-  memory_limiter:
-    # 75% of maximum memory up to 4G
-    limit_mib: 1536
-    # 25% of limit up to 2G
-    spike_limit_mib: 512
-    check_interval: 5s
-
-exporters:
-  debug:
-    verbosity: detailed
-
-service:
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [memory_limiter, batch]
-      exporters: [debug]
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/run_test.sh b/ext/opentelemetry-cpp-1.21.0/functional/otlp/run_test.sh
deleted file mode 100755
index da6598ce0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/run_test.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-# To run tests in a local dev environment:
-# - make sure docker is running
-# - set BUILD_DIR to the top level build directory,
-
-[ -z "${BUILD_DIR}" ] && export BUILD_DIR="${HOME}/build"
-
-export CERT_DIR=../cert
-
-export TEST_BIN_DIR="${BUILD_DIR}/functional/otlp/"
-
-# SELINUX
-# https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label
-
-USE_MOUNT_OPTION=""
-
-if [ -x "$(command -v getenforce)" ]; then
-  SELINUXSTATUS=$(getenforce);
-  if [ "${SELINUXSTATUS}" == "Enforcing" ]; then
-    echo "Detected SELINUX"
-    USE_MOUNT_OPTION=":z"
-  fi;
-fi
-
-#
-# Prepare docker image
-#
-
-docker build -t otelcpp-func-test .
-
-echo "REPORT:" > report.log
-
-#
-# Exercising HTTP functional tests
-#
-
-export TEST_EXECUTABLE="func_otlp_http"
-export TEST_URL="localhost:4318/v1/traces"
-
-#
-# MODE 'NONE'
-#
-
-export SERVER_MODE="none"
-./run_test_mode.sh
-
-#
-# MODE 'HTTP'
-#
-
-echo ""
-echo "###############################################################"
-echo "Starting otelcol --config otel-config-http.yaml"
-echo "###############################################################"
-echo ""
-
-
-docker run -d \
-  -v `pwd`/otel-docker-config-http.yaml:/otel-cpp/otel-config.yaml${USE_MOUNT_OPTION} \
-  -p 4318:4318 \
-  --name otelcpp-test-http \
-  otelcpp-func-test
-
-sleep 5;
-
-export SERVER_MODE="http"
-./run_test_mode.sh
-
-echo ""
-echo "###############################################################"
-echo "Stopping otelcol (http)"
-echo "###############################################################"
-echo ""
-
-docker stop otelcpp-test-http
-docker rm otelcpp-test-http
-
-#
-# MODE 'SSL'
-#
-
-echo ""
-echo "###############################################################"
-echo "Starting otelcol --config otel-config-https.yaml"
-echo "###############################################################"
-echo ""
-
-docker run -d \
-  -v `pwd`/otel-docker-config-https.yaml:/otel-cpp/otel-config.yaml${USE_MOUNT_OPTION} \
-  -v `pwd`/../cert/ca.pem:/otel-cpp/ca.pem${USE_MOUNT_OPTION} \
-  -v `pwd`/../cert/server_cert.pem:/otel-cpp/server_cert.pem${USE_MOUNT_OPTION} \
-  -v `pwd`/../cert/server_cert-key.pem:/otel-cpp/server_cert-key.pem${USE_MOUNT_OPTION} \
-  -p 4318:4318 \
-  --name otelcpp-test-https \
-  otelcpp-func-test
-
-sleep 5;
-
-export SERVER_MODE="https"
-./run_test_mode.sh
-
-echo ""
-echo "###############################################################"
-echo "Stopping otelcol (https)"
-echo "###############################################################"
-echo ""
-
-docker stop otelcpp-test-https
-docker rm otelcpp-test-https
-
-#
-# Exercising gRPC functional tests
-#
-export TEST_EXECUTABLE="func_otlp_grpc"
-export TEST_URL="localhost:4317"
-
-#
-# MODE 'SSL'
-#
-
-echo ""
-echo "###############################################################"
-echo "Starting otelcol --config otel-config-https-mtls.yaml"
-echo "###############################################################"
-echo ""
-
-docker run -d \
-  -v `pwd`/otel-docker-config-https-mtls.yaml:/otel-cpp/otel-config.yaml${USE_MOUNT_OPTION} \
-  -v `pwd`/../cert/ca.pem:/otel-cpp/ca.pem${USE_MOUNT_OPTION} \
-  -v `pwd`/../cert/client_cert.pem:/otel-cpp/client_cert.pem${USE_MOUNT_OPTION} \
-  -v `pwd`/../cert/server_cert.pem:/otel-cpp/server_cert.pem${USE_MOUNT_OPTION} \
-  -v `pwd`/../cert/server_cert-key.pem:/otel-cpp/server_cert-key.pem${USE_MOUNT_OPTION} \
-  -p 4317:4317 \
-  --name otelcpp-test-grpc-mtls \
-  otelcpp-func-test
-
-sleep 5;
-
-export SERVER_MODE="https"
-./run_test_mode.sh
-
-echo ""
-echo "###############################################################"
-echo "Stopping otelcol (https / mTLS)"
-echo "###############################################################"
-echo ""
-
-docker stop otelcpp-test-grpc-mtls
-docker rm otelcpp-test-grpc-mtls
-
-echo ""
-echo "###############################################################"
-echo "TEST REPORT"
-echo "###############################################################"
-echo ""
-
-cat report.log
-
-export PASSED_COUNT=`grep -c "PASSED" report.log`
-export FAILED_COUNT=`grep -c "FAILED" report.log`
-
-echo ""
-echo "###############################################################"
-echo "TEST VERDICT: ${PASSED_COUNT} PASSED, ${FAILED_COUNT} FAILED"
-echo "###############################################################"
-echo ""
-
-if [ "${FAILED_COUNT}" != "0" ]; then
-  #
-  # CI FAILED
-  #
-
-  exit 1
-fi;
-
-#
-# CI PASSED
-#
-exit 0
diff --git a/ext/opentelemetry-cpp-1.21.0/functional/otlp/run_test_mode.sh b/ext/opentelemetry-cpp-1.21.0/functional/otlp/run_test_mode.sh
deleted file mode 100755
index 3f10ca848..000000000
--- a/ext/opentelemetry-cpp-1.21.0/functional/otlp/run_test_mode.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# This script can be invoked as follows:
-#
-# export SERVER_MODE="none" (default)
-# No collector listening on endpoint.
-#
-# export SERVER_MODE="http"
-# Http collector listening on endpoint.
-#
-# export SERVER_MODE="https"
-# Https collector listening on endpoint.
-#
-
-set -e
-
-[ -z "${BUILD_DIR}" ] && export BUILD_DIR=$HOME/build
-
-[ -z "${SERVER_MODE}" ] && export SERVER_MODE="none"
-
-[ -z "${TEST_EXECUTABLE}" ] && echo "Please specify TEST_EXECUTABLE name" && exit 1
-
-[ -z "${TEST_URL}" ] && echo "Please specify TEST_URL endpoint (without scheme)" && exit 1
-
-export CERT_DIR=../cert
-
-export TEST_BIN_DIR="${BUILD_DIR}/functional/otlp/"
-
-[ ! -f "${TEST_BIN_DIR}/${TEST_EXECUTABLE}" ] && echo "::notice::Executable ${TEST_EXECUTABLE} not built in this configuration" && exit 0
-
-"${TEST_BIN_DIR}/${TEST_EXECUTABLE}" --list > test_list.txt
-
-export TEST_FULL_NAME=""
-
-#
-# Connect with no security
-#
-
-export TEST_ENDPOINT="http://${TEST_URL}"
-export TEST_RUN="insecure"
-
-for T in `cat test_list.txt`
-do
-  echo "====================================================================="
-  echo "Running test ${T} on ${TEST_RUN} ${TEST_ENDPOINT} with server ${SERVER_MODE}"
-  TEST_FULL_NAME="${T}-${TEST_RUN}-${SERVER_MODE}"
-  "${TEST_BIN_DIR}/${TEST_EXECUTABLE}" --debug --mode ${SERVER_MODE} --cert-dir ${CERT_DIR} --endpoint ${TEST_ENDPOINT} ${T}
-  RC=$?
-  if [ ${RC} -eq 0 ]; then
-    echo "TEST ${TEST_FULL_NAME}: PASSED" | tee -a report.log
-  else
-    echo "TEST ${TEST_FULL_NAME}: FAILED" | tee -a report.log
-  fi
-done
-
-#
-# Connect with security
-#
-
-export TEST_ENDPOINT="https://${TEST_URL}"
-export TEST_RUN="secure"
-
-for T in `cat test_list.txt`
-do
-  echo "====================================================================="
-  echo "Running test ${T} on ${TEST_RUN} ${TEST_ENDPOINT} with server ${SERVER_MODE}"
-  TEST_FULL_NAME="${T}-${TEST_RUN}-${SERVER_MODE}"
-  "${TEST_BIN_DIR}/${TEST_EXECUTABLE}" --debug --mode ${SERVER_MODE} --cert-dir ${CERT_DIR} --endpoint ${TEST_ENDPOINT} ${T}
-  RC=$?
-  if [ ${RC} -eq 0 ]; then
-    echo "TEST ${TEST_FULL_NAME}: PASSED" | tee -a report.log
-  else
-    echo "TEST ${TEST_FULL_NAME}: FAILED" | tee -a report.log
-  fi
-done
-
diff --git a/ext/opentelemetry-cpp-1.21.0/install/conan/conanfile_latest.txt b/ext/opentelemetry-cpp-1.21.0/install/conan/conanfile_latest.txt
deleted file mode 100644
index 6db1d7b13..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/conan/conanfile_latest.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-[requires]
-zlib/1.3.1
-libcurl/8.12.1
-abseil/20240116.2
-protobuf/5.27.0
-grpc/1.67.1
-nlohmann_json/3.12.0
-prometheus-cpp/1.3.0
-opentracing-cpp/1.6.0
-
-[options]
-grpc/*:fPIC=True
-grpc/*:shared=False
-grpc/*:csharp_plugin=False
-grpc/*:node_plugin=False
-grpc/*:objective_c_plugin=False
-grpc/*:php_plugin=False
-grpc/*:python_plugin=False
-grpc/*:ruby_plugin=False
-protobuf/*:fPIC=True
-protobuf/*:shared=False
-abseil/*:fPIC=True
-abseil/*:shared=False
-opentracing-cpp/*:fPIC=True
-opentracing-cpp/*:shared=True
-pcre2/*:with_bzip2=False
-
-[test_requires]
-gtest/1.16.0
-benchmark/1.9.1
-
-[generators]
-CMakeToolchain
-CMakeDeps
-
-[layout]
-cmake_layout
diff --git a/ext/opentelemetry-cpp-1.21.0/install/conan/conanfile_stable.txt b/ext/opentelemetry-cpp-1.21.0/install/conan/conanfile_stable.txt
deleted file mode 100644
index f9b1f36b7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/conan/conanfile_stable.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-[requires]
-zlib/1.2.13
-libcurl/8.5.0
-abseil/20230125.3
-protobuf/3.21.12
-grpc/1.54.3
-nlohmann_json/3.10.5
-prometheus-cpp/1.2.4
-opentracing-cpp/1.6.0
-
-[options]
-grpc/*:fPIC=True
-grpc/*:shared=False
-grpc/*:csharp_plugin=False
-grpc/*:node_plugin=False
-grpc/*:objective_c_plugin=False
-grpc/*:php_plugin=False
-grpc/*:python_plugin=False
-grpc/*:ruby_plugin=False
-protobuf/*:fPIC=True
-protobuf/*:shared=False
-abseil/*:fPIC=True
-abseil/*:shared=False
-opentracing-cpp/*:fPIC=True
-opentracing-cpp/*:shared=True
-pcre2/*:with_bzip2=False
-
-[test_requires]
-gtest/1.14.0
-benchmark/1.8.3
-
-[generators]
-CMakeToolchain
-CMakeDeps
-
-[layout]
-cmake_layout
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/CMakeLists.txt
deleted file mode 100644
index fc6227894..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-component-install-tests LANGUAGES CXX)
-
-if(NOT INSTALL_TEST_CMAKE_OPTIONS)
-  set(INSTALL_TEST_CMAKE_OPTIONS
-      "-DCMAKE_CXX_STANDARD=14 -DCMAKE_BUILD_TYPE=Debug")
-endif()
-
-separate_arguments(INSTALL_TEST_CMAKE_OPTIONS)
-
-message(
-  STATUS "INSTALL_TEST_CMAKE_OPTIONS is set to ${INSTALL_TEST_CMAKE_OPTIONS}")
-
-find_package(opentelemetry-cpp CONFIG REQUIRED)
-
-message(
-  STATUS
-    "OPENTELEMETRY_CPP_COMPONENTS_INSTALLED = ${OPENTELEMETRY_CPP_COMPONENTS_INSTALLED}"
-)
-
-# Check that INSTALL_TEST_COMPONENTS is set and contains installed components
-if(NOT INSTALL_TEST_COMPONENTS)
-  message(
-    STATUS
-      "INSTALL_TEST_COMPONENTS is not set. Setting to OPENTELEMETRY_CPP_COMPONENTS_INSTALLED"
-  )
-  set(INSTALL_TEST_COMPONENTS ${OPENTELEMETRY_CPP_COMPONENTS_INSTALLED})
-else()
-  set(COMPONENTS_ARE_VALID TRUE)
-  foreach(component ${INSTALL_TEST_COMPONENTS})
-    if(NOT component IN_LIST OPENTELEMETRY_CPP_COMPONENTS_INSTALLED)
-      message(
-        ERROR
-        " Component ${component} is not an installed opentelemetry-cpp component"
-      )
-      set(COMPONENTS_ARE_VALID FALSE)
-    endif()
-  endforeach()
-  if(NOT COMPONENTS_ARE_VALID)
-    message(FATAL_ERROR "INSTALL_TEST_COMPONENTS contains invalid components")
-  endif()
-endif()
-
-message(STATUS "INSTALL_TEST_COMPONENTS = ${INSTALL_TEST_COMPONENTS}")
-
-set(INSTALL_TEST_SRC_DIR "${CMAKE_SOURCE_DIR}/../src")
-
-enable_testing()
-
-# -----------------------------------------------------------
-# CMake Usage tests for find_package(opentelemetry-cpp ...)
-#
-# 1. Test find_package with no components specified
-# 2. Test find_package with components specified but not sorted in dependency
-#    order
-# 3. Test find_package with components specified but missing dependent components
-# 4. Test find_package with components specified but including
-#    unsupported/unknown components
-
-add_test(
-  NAME cmake-usage-no-components-test
-  COMMAND
-    ${CMAKE_COMMAND} --log-level=DEBUG -S
-    ${CMAKE_SOURCE_DIR}/usage_tests/no_components -B
-    build-cmake-usage-no-components-test
-    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${INSTALL_TEST_CMAKE_OPTIONS})
-
-add_test(
-  NAME cmake-usage-unsorted-components-test
-  COMMAND
-    ${CMAKE_COMMAND} --log-level=DEBUG -S
-    ${CMAKE_SOURCE_DIR}/usage_tests/unsorted_components -B
-    build-cmake-usage-unsorted-components-test
-    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${INSTALL_TEST_CMAKE_OPTIONS})
-
-add_test(
-  NAME cmake-usage-missing-components-test
-  COMMAND
-    ${CMAKE_COMMAND} --log-level=DEBUG -S
-    ${CMAKE_SOURCE_DIR}/usage_tests/missing_components -B
-    build-cmake-usage-missing-components-test
-    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${INSTALL_TEST_CMAKE_OPTIONS})
-
-add_test(
-  NAME cmake-usage-unsupported-components-test
-  COMMAND
-    ${CMAKE_COMMAND} --log-level=DEBUG -S
-    ${CMAKE_SOURCE_DIR}/usage_tests/unsupported_components -B
-    build-cmake-usage-unsupported-components-test
-    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${INSTALL_TEST_CMAKE_OPTIONS})
-
-# -----------------------------------------------------------
-# Test the full package install using legacy cmake build instructions
-# find_package(opentelemetry-cpp CONFIG REQUIRED)
-
-# Test cmake configuration
-add_test(
-  NAME full-package-cmake-config-test
-  COMMAND
-    ${CMAKE_COMMAND} --log-level=DEBUG -S ${CMAKE_SOURCE_DIR}/package_test -B
-    build-full-package-test "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
-    ${INSTALL_TEST_CMAKE_OPTIONS}
-    "-DINSTALL_TEST_COMPONENTS=${INSTALL_TEST_COMPONENTS}"
-    "-DINSTALL_TEST_SRC_DIR=${INSTALL_TEST_SRC_DIR}")
-
-# Build the full package test executable
-add_test(NAME full-package-build-test
-         COMMAND ${CMAKE_COMMAND} --build
-                 ${CMAKE_BINARY_DIR}/build-full-package-test --parallel)
-
-# Run the full package test executable
-add_test(NAME full-package-run-test
-         COMMAND ${CMAKE_BINARY_DIR}/build-full-package-test/full_test)
-# -----------------------------------------------------------
-
-# -----------------------------------------------------------
-# Loop over all the components to test
-foreach(component ${INSTALL_TEST_COMPONENTS})
-  # Test cmake configuration
-  add_test(
-    NAME component-${component}-cmake-config-test
-    COMMAND
-      ${CMAKE_COMMAND} --log-level=DEBUG -S
-      ${CMAKE_SOURCE_DIR}/component_tests/${component} -B
-      build-${component}-test "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
-      ${INSTALL_TEST_CMAKE_OPTIONS}
-      "-DINSTALL_TEST_SRC_DIR=${INSTALL_TEST_SRC_DIR}")
-
-  # Build the component test executable
-  add_test(NAME component-${component}-build-test
-           COMMAND ${CMAKE_COMMAND} --build
-                   ${CMAKE_BINARY_DIR}/build-${component}-test --parallel)
-
-  # Run the component test executable
-  add_test(
-    NAME component-${component}-run-test
-    COMMAND ${CMAKE_BINARY_DIR}/build-${component}-test/${component}_test)
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/api/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/api/CMakeLists.txt
deleted file mode 100644
index 271255f58..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/api/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-
-project(opentelemetry-cpp-api-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS api)
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(api_test ${INSTALL_TEST_SRC_DIR}/test_api.cc)
-target_link_libraries(api_test PRIVATE opentelemetry-cpp::api GTest::gtest
-                                       GTest::gtest_main)
-
-gtest_discover_tests(api_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_elasticsearch/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_elasticsearch/CMakeLists.txt
deleted file mode 100644
index 9b2d7ef1a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_elasticsearch/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-elasticsearch-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_elasticsearch)
-
-if(NOT TARGET nlohmann_json::nlohmann_json)
-  message(FATAL_ERROR "nlohmann_json::nlohmann_json target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_elasticsearch_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_elasticsearch.cc)
-target_link_libraries(
-  exporters_elasticsearch_test
-  PRIVATE opentelemetry-cpp::elasticsearch_log_record_exporter GTest::gtest
-          GTest::gtest_main)
-
-gtest_discover_tests(exporters_elasticsearch_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_etw/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_etw/CMakeLists.txt
deleted file mode 100644
index b2dcb302b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_etw/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters_etw-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_etw)
-
-if(NOT TARGET nlohmann_json::nlohmann_json)
-  message(FATAL_ERROR "nlohmann_json::nlohmann_json target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_etw_test ${INSTALL_TEST_SRC_DIR}/test_exporters_etw.cc)
-target_link_libraries(exporters_etw_test PRIVATE opentelemetry-cpp::etw_exporter
-                                                 GTest::gtest GTest::gtest_main)
-
-gtest_discover_tests(exporters_etw_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_in_memory/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_in_memory/CMakeLists.txt
deleted file mode 100644
index ca3ab3e32..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_in_memory/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-in-memory-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_in_memory)
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_in_memory_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_in_memory.cc)
-target_link_libraries(
-  exporters_in_memory_test
-  PRIVATE opentelemetry-cpp::in_memory_span_exporter
-          opentelemetry-cpp::in_memory_metric_exporter GTest::gtest
-          GTest::gtest_main)
-
-gtest_discover_tests(exporters_in_memory_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_ostream/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_ostream/CMakeLists.txt
deleted file mode 100644
index 2028b4b92..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_ostream/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-ostream-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_ostream)
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_ostream_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_ostream.cc)
-target_link_libraries(
-  exporters_ostream_test
-  PRIVATE opentelemetry-cpp::ostream_log_record_exporter
-          opentelemetry-cpp::ostream_metrics_exporter
-          opentelemetry-cpp::ostream_span_exporter
-          GTest::gtest
-          GTest::gtest_main)
-
-gtest_discover_tests(exporters_ostream_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_common/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_common/CMakeLists.txt
deleted file mode 100644
index a9d9a0c27..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_common/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-otlp-common-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_common)
-
-if(NOT TARGET protobuf::libprotobuf)
-  message(FATAL_ERROR "protobuf::libprotobuf target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_otlp_common_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_otlp_common.cc)
-target_link_libraries(
-  exporters_otlp_common_test
-  PRIVATE opentelemetry-cpp::proto opentelemetry-cpp::otlp_recordable
-          GTest::gtest GTest::gtest_main)
-
-gtest_discover_tests(exporters_otlp_common_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_file/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_file/CMakeLists.txt
deleted file mode 100644
index 11d79dfd6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_file/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-otlp-file-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_file)
-
-if(NOT TARGET protobuf::libprotobuf)
-  message(FATAL_ERROR "protobuf::libprotobuf target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_otlp_file_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_otlp_file.cc)
-target_link_libraries(
-  exporters_otlp_file_test
-  PRIVATE opentelemetry-cpp::otlp_file_client
-          opentelemetry-cpp::otlp_file_exporter
-          opentelemetry-cpp::otlp_file_log_record_exporter
-          opentelemetry-cpp::otlp_file_metric_exporter
-          GTest::gtest
-          GTest::gtest_main)
-
-gtest_discover_tests(exporters_otlp_file_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_grpc/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_grpc/CMakeLists.txt
deleted file mode 100644
index 6e9b4b6b9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_grpc/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-otlp-grpc-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_grpc)
-
-if(NOT TARGET protobuf::libprotobuf)
-  message(FATAL_ERROR "protobuf::libprotobuf target not found")
-endif()
-
-if(NOT TARGET gRPC::grpc++)
-  message(FATAL_ERROR "gRPC::grpc++ target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_otlp_grpc_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_otlp_grpc.cc)
-target_link_libraries(
-  exporters_otlp_grpc_test
-  PRIVATE opentelemetry-cpp::otlp_grpc_exporter
-          opentelemetry-cpp::otlp_grpc_log_record_exporter
-          opentelemetry-cpp::otlp_grpc_metrics_exporter
-          GTest::gtest
-          GTest::gtest_main)
-
-gtest_discover_tests(exporters_otlp_grpc_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_http/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_http/CMakeLists.txt
deleted file mode 100644
index 09b4f433d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_otlp_http/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-otlp-http-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_otlp_http)
-
-if(NOT TARGET protobuf::libprotobuf)
-  message(FATAL_ERROR "protobuf::libprotobuf target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_otlp_http_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_otlp_http.cc)
-target_link_libraries(
-  exporters_otlp_http_test
-  PRIVATE opentelemetry-cpp::otlp_http_client
-          opentelemetry-cpp::otlp_http_exporter
-          opentelemetry-cpp::otlp_http_log_record_exporter
-          opentelemetry-cpp::otlp_http_metric_exporter
-          GTest::gtest
-          GTest::gtest_main)
-
-gtest_discover_tests(exporters_otlp_http_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_prometheus/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_prometheus/CMakeLists.txt
deleted file mode 100644
index 526a01626..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_prometheus/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-prometheus-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_prometheus)
-
-if(NOT TARGET prometheus-cpp::core)
-  message(FATAL_ERROR "prometheus-cpp::core target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_prometheus_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_prometheus.cc)
-target_link_libraries(
-  exporters_prometheus_test PRIVATE opentelemetry-cpp::prometheus_exporter
-                                    GTest::gtest GTest::gtest_main)
-
-gtest_discover_tests(exporters_prometheus_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_zipkin/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_zipkin/CMakeLists.txt
deleted file mode 100644
index 378794bce..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/exporters_zipkin/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-exporters-zipkin-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS exporters_zipkin)
-
-if(NOT TARGET nlohmann_json::nlohmann_json)
-  message(FATAL_ERROR "nlohmann_json::nlohmann_json target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(exporters_zipkin_test
-               ${INSTALL_TEST_SRC_DIR}/test_exporters_zipkin.cc)
-target_link_libraries(
-  exporters_zipkin_test PRIVATE opentelemetry-cpp::zipkin_trace_exporter
-                                GTest::gtest GTest::gtest_main)
-
-gtest_discover_tests(exporters_zipkin_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_common/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_common/CMakeLists.txt
deleted file mode 100644
index c80058318..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_common/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-ext_common-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS ext_common)
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(ext_common_test ${INSTALL_TEST_SRC_DIR}/test_ext_common.cc)
-target_link_libraries(ext_common_test PRIVATE opentelemetry-cpp::ext
-                                              GTest::gtest GTest::gtest_main)
-
-gtest_discover_tests(ext_common_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_dll/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_dll/CMakeLists.txt
deleted file mode 100644
index d02fdf945..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_dll/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-ext_dll-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS ext_dll exporters_ostream)
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(ext_dll_test ${INSTALL_TEST_SRC_DIR}/test_ext_dll.cc)
-
-target_compile_definitions(ext_dll_test PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
-
-target_link_libraries(ext_dll_test PRIVATE opentelemetry-cpp::opentelemetry_cpp
-                                           GTest::gtest GTest::gtest_main)
-
-gtest_discover_tests(ext_dll_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_http_curl/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_http_curl/CMakeLists.txt
deleted file mode 100644
index f9adda65c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/ext_http_curl/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-ext_http_curl-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS ext_http_curl)
-
-if(NOT TARGET CURL::libcurl)
-  message(FATAL_ERROR "CURL::libcurl target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(ext_http_curl_test ${INSTALL_TEST_SRC_DIR}/test_ext_http_curl.cc)
-target_link_libraries(
-  ext_http_curl_test PRIVATE opentelemetry-cpp::http_client_curl GTest::gtest
-                             GTest::gtest_main)
-
-gtest_discover_tests(ext_http_curl_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/sdk/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/sdk/CMakeLists.txt
deleted file mode 100644
index 1dd110231..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/sdk/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-sdk-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS sdk)
-
-if(NOT TARGET Threads::Threads)
-  message(FATAL_ERROR "Threads::Threads target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(sdk_test ${INSTALL_TEST_SRC_DIR}/test_sdk.cc)
-target_link_libraries(
-  sdk_test
-  PRIVATE opentelemetry-cpp::api
-          opentelemetry-cpp::sdk
-          opentelemetry-cpp::version
-          opentelemetry-cpp::common
-          opentelemetry-cpp::resources
-          opentelemetry-cpp::trace
-          opentelemetry-cpp::metrics
-          opentelemetry-cpp::logs
-          GTest::gtest
-          GTest::gtest_main)
-
-gtest_discover_tests(sdk_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/shims_opentracing/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/shims_opentracing/CMakeLists.txt
deleted file mode 100644
index f541f15dd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/component_tests/shims_opentracing/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-project(opentelemetry-cpp-shims_opentracing-install-test LANGUAGES CXX)
-
-find_package(opentelemetry-cpp REQUIRED COMPONENTS shims_opentracing)
-
-if(NOT TARGET OpenTracing::opentracing)
-  message(FATAL_ERROR "OpenTracing::opentracing target not found")
-endif()
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(shims_opentracing_test
-               ${INSTALL_TEST_SRC_DIR}/test_shims_opentracing.cc)
-target_link_libraries(
-  shims_opentracing_test PRIVATE opentelemetry-cpp::opentracing_shim
-                                 GTest::gtest GTest::gtest_main)
-
-gtest_discover_tests(shims_opentracing_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/fetch_content_test/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/fetch_content_test/CMakeLists.txt
deleted file mode 100644
index 79df95624..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/fetch_content_test/CMakeLists.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# This test uses CMake's FetchContent module to build opentelemetry-cpp from src
-# and make its targets available within an external project.
-
-cmake_minimum_required(VERSION 3.14)
-
-project(opentelemetry-cpp-fetch-content-test LANGUAGES CXX)
-
-find_package(GTest CONFIG REQUIRED)
-
-set(BUILD_TESTING
-    ON
-    CACHE BOOL "Build tests" FORCE)
-
-if(NOT DEFINED OPENTELEMETRY_CPP_SRC_DIR)
-  message(
-    FATAL_ERROR
-      "OPENTELEMETRY_CPP_SRC_DIR must be defined when running cmake on this test project"
-  )
-endif()
-
-message(
-  STATUS
-    "Adding opentelemetry-cpp as a subdirectory with FetchContent from ${OPENTELEMETRY_CPP_SRC_DIR}"
-)
-
-include(FetchContent)
-FetchContent_Declare(opentelemetry-cpp SOURCE_DIR ${OPENTELEMETRY_CPP_SRC_DIR})
-FetchContent_MakeAvailable(opentelemetry-cpp)
-
-add_executable(
-  fetch_content_src_test
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_api.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_sdk.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_ext_common.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_ext_http_curl.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_ostream.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_in_memory.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_otlp_common.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_otlp_grpc.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_otlp_http.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_otlp_file.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_prometheus.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_zipkin.cc
-  ${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_elasticsearch.cc)
-
-target_link_libraries(
-  fetch_content_src_test
-  PRIVATE opentelemetry-cpp::api
-          opentelemetry-cpp::version
-          opentelemetry-cpp::metrics
-          opentelemetry-cpp::trace
-          opentelemetry-cpp::logs
-          opentelemetry-cpp::http_client_curl
-          opentelemetry-cpp::in_memory_span_exporter
-          opentelemetry-cpp::in_memory_metric_exporter
-          opentelemetry-cpp::ostream_log_record_exporter
-          opentelemetry-cpp::ostream_metrics_exporter
-          opentelemetry-cpp::ostream_span_exporter
-          opentelemetry-cpp::otlp_file_exporter
-          opentelemetry-cpp::otlp_file_log_record_exporter
-          opentelemetry-cpp::otlp_file_metric_exporter
-          opentelemetry-cpp::otlp_grpc_exporter
-          opentelemetry-cpp::otlp_grpc_log_record_exporter
-          opentelemetry-cpp::otlp_grpc_metrics_exporter
-          opentelemetry-cpp::otlp_http_exporter
-          opentelemetry-cpp::otlp_http_log_record_exporter
-          opentelemetry-cpp::otlp_http_metric_exporter
-          opentelemetry-cpp::prometheus_exporter
-          opentelemetry-cpp::zipkin_trace_exporter
-          opentelemetry-cpp::elasticsearch_log_record_exporter
-          GTest::gtest
-          GTest::gtest_main)
-
-include(CTest)
-include(GoogleTest)
-
-gtest_add_tests(
-  TARGET fetch_content_src_test
-  TEST_PREFIX fetch_content.
-  TEST_LIST fetch_content_src_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/package_test/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/package_test/CMakeLists.txt
deleted file mode 100644
index 63f5bf424..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/package_test/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-
-project(opentelemetry-cpp-full-package-install-test LANGUAGES CXX)
-
-if(NOT DEFINED INSTALL_TEST_SRC_DIR)
-  message(
-    FATAL_ERROR
-      "INSTALL_TEST_SRC_DIR must be defined when running cmake on this test project"
-  )
-endif()
-
-find_package(opentelemetry-cpp CONFIG REQUIRED)
-
-# Test that the required OPENTELEMETRY_CPP_* variables are set
-
-if(NOT OPENTELEMETRY_CPP_INCLUDE_DIRS)
-  message(FATAL_ERROR "OPENTELEMETRY_CPP_INCLUDE_DIRS is empty")
-endif()
-
-if(NOT OPENTELEMETRY_CPP_LIBRARY_DIRS)
-  message(FATAL_ERROR "OPENTELEMETRY_CPP_LIBRARY_DIRS is empty")
-endif()
-
-if(NOT OPENTELEMETRY_CPP_LIBRARIES)
-  message(FATAL_ERROR "OPENTELEMETRY_CPP_LIBRARIES is empty")
-endif()
-
-if(NOT OPENTELEMETRY_CPP_FOUND)
-  message(FATAL_ERROR "OPENTELEMETRY_CPP_FOUND is not set")
-endif()
-
-if(NOT OPENTELEMETRY_ABI_VERSION_NO)
-  message(FATAL_ERROR "OPENTELEMETRY_ABI_VERSION_NO is empty")
-endif()
-
-if(NOT OPENTELEMETRY_VERSION)
-  message(FATAL_ERROR "OPENTELEMETRY_VERSION is empty")
-endif()
-
-if(NOT opentelemetry-cpp_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package must import the components and set opentelemetry-cpp_FOUND"
-  )
-endif()
-
-if(NOT OPENTELEMETRY_CPP_COMPONENTS_INSTALLED)
-  message(FATAL_ERROR "OPENTELEMETRY_CPP_COMPONENTS_INSTALLED is empty")
-endif()
-
-if(NOT INSTALL_TEST_COMPONENTS)
-  message(FATAL_ERROR "INSTALL_TEST_COMPONENTS is empty")
-endif()
-
-message(
-  STATUS
-    "Testing the full package install on components = ${INSTALL_TEST_COMPONENTS}"
-)
-
-find_package(GTest CONFIG REQUIRED)
-include(GoogleTest)
-
-add_executable(full_test)
-
-foreach(component IN LISTS INSTALL_TEST_COMPONENTS)
-  message(STATUS "Adding test source for component ${component}")
-  target_sources(full_test
-                 PRIVATE "${INSTALL_TEST_SRC_DIR}/test_${component}.cc")
-endforeach()
-
-target_include_directories(full_test PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS})
-target_link_libraries(full_test PRIVATE ${OPENTELEMETRY_CPP_LIBRARIES}
-                                        GTest::gtest GTest::gtest_main)
-
-gtest_discover_tests(full_test)
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/missing_components/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/missing_components/CMakeLists.txt
deleted file mode 100644
index adbf5fd8f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/missing_components/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-
-project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)
-
-# Any missing component dependencies must be implicitly resolved. This tests
-# implicitly resolves the sdk component dependency
-find_package(opentelemetry-cpp CONFIG REQUIRED COMPONENTS api
-                                                          exporters_in_memory)
-
-if(NOT OPENTELEMETRY_CPP_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with out of order components must import the components and set OPENTELEMETRY_CPP_FOUND"
-  )
-endif()
-
-if(NOT opentelemetry-cpp_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with out of order components must import the components and set opentelemetry-cpp_FOUND"
-  )
-endif()
-
-if(NOT opentelemetry-cpp_exporters_in_memory_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with out of order components must import the components and set opentelemetry-cpp_exporters_in_memory_FOUND"
-  )
-endif()
-
-if(NOT TARGET opentelemetry-cpp::api)
-  message(FATAL_ERROR "opentelemetry-cpp::api target not found")
-endif()
-
-if(NOT TARGET opentelemetry-cpp::sdk)
-  message(FATAL_ERROR "opentelemetry-cpp::sdk target not found")
-endif()
-
-if(NOT TARGET opentelemetry-cpp::in_memory_span_exporter)
-  message(
-    FATAL_ERROR "opentelemetry-cpp::in_memory_span_exporter target not found")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/no_components/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/no_components/CMakeLists.txt
deleted file mode 100644
index 17fec851d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/no_components/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-
-project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)
-
-# specifying no components must import all installed components
-find_package(opentelemetry-cpp CONFIG REQUIRED)
-
-if(NOT OPENTELEMETRY_CPP_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with out of order components must import the components and set OPENTELEMETRY_CPP_FOUND"
-  )
-endif()
-
-if(NOT opentelemetry-cpp_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with out of order components must import the components and set opentelemetry-cpp_FOUND"
-  )
-endif()
-
-if(NOT TARGET opentelemetry-cpp::api)
-  message(FATAL_ERROR "opentelemetry-cpp::api target not found")
-endif()
-
-if(NOT TARGET opentelemetry-cpp::sdk)
-  message(FATAL_ERROR "opentelemetry-cpp::sdk target not found")
-endif()
-
-if(NOT TARGET opentelemetry-cpp::ostream_log_record_exporter)
-  message(
-    FATAL_ERROR
-      "opentelemetry-cpp::ostream_log_record_exporter target not found")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/unsorted_components/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/unsorted_components/CMakeLists.txt
deleted file mode 100644
index 3fdd175a1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/unsorted_components/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-
-project(opentelemetry-cpp-unsorted-components-install-test LANGUAGES CXX)
-
-# components not provided in order of dependency must be imported in the correct
-# order without error
-find_package(opentelemetry-cpp CONFIG REQUIRED COMPONENTS exporters_ostream api
-                                                          sdk)
-
-if(NOT OPENTELEMETRY_CPP_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with out of order components must import the components and set OPENTELEMETRY_CPP_FOUND"
-  )
-endif()
-
-if(NOT opentelemetry-cpp_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with out of order components must import the components and set opentelemetry-cpp_FOUND"
-  )
-endif()
-
-if(NOT opentelemetry-cpp_exporters_ostream_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with out of order components must import the components and set opentelemetry-cpp_exporters_ostream_FOUND"
-  )
-endif()
-
-if(NOT TARGET opentelemetry-cpp::api)
-  message(FATAL_ERROR "opentelemetry-cpp::api target not found")
-endif()
-
-if(NOT TARGET opentelemetry-cpp::sdk)
-  message(FATAL_ERROR "opentelemetry-cpp::sdk target not found")
-endif()
-
-if(NOT TARGET opentelemetry-cpp::ostream_log_record_exporter)
-  message(
-    FATAL_ERROR
-      "opentelemetry-cpp::ostream_log_record_exporter target not found")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/unsupported_components/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/unsupported_components/CMakeLists.txt
deleted file mode 100644
index 43ab06c0b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/cmake/usage_tests/unsupported_components/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.14)
-
-project(opentelemetry-cpp-unsupported-components-install-test LANGUAGES CXX)
-
-# request an unsupported/unknown component (without the REQUIRED arg)
-find_package(opentelemetry-cpp CONFIG COMPONENTS api an_unknown_component)
-
-if(OPENTELEMETRY_CPP_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with an unsuported component should not set OPENTELEMETRY_CPP_FOUND"
-  )
-endif()
-
-if(opentelemetry-cpp_FOUND)
-  message(
-    FATAL_ERROR
-      "calling find_package with an unsupported component should not set opentelemetry-cpp_FOUND"
-  )
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_api.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_api.cc
deleted file mode 100644
index 6fc88663f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_api.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/version.h>
-
-#include <opentelemetry/logs/provider.h>
-#include <opentelemetry/metrics/provider.h>
-#include <opentelemetry/trace/provider.h>
-
-#include <opentelemetry/trace/scope.h>
-#include <opentelemetry/trace/span.h>
-#include <opentelemetry/trace/tracer.h>
-
-#include <opentelemetry/logs/log_record.h>
-#include <opentelemetry/logs/logger.h>
-
-#include <opentelemetry/metrics/async_instruments.h>
-#include <opentelemetry/metrics/meter.h>
-#include <opentelemetry/metrics/sync_instruments.h>
-
-TEST(ApiInstallTest, VersionCheck)
-{
-  EXPECT_GE(OPENTELEMETRY_VERSION_MAJOR, 0);
-  EXPECT_GE(OPENTELEMETRY_VERSION_MINOR, 0);
-  EXPECT_GE(OPENTELEMETRY_VERSION_PATCH, 0);
-  EXPECT_NE(OPENTELEMETRY_VERSION, "not a version");
-}
-
-TEST(ApiInstallTest, TraceApiCheck)
-{
-  auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-  ASSERT_TRUE(provider != nullptr);
-
-  auto tracer = provider->GetTracer("test-tracer");
-  ASSERT_TRUE(tracer != nullptr);
-
-  auto span = tracer->StartSpan("test-span");
-  ASSERT_TRUE(span != nullptr);
-
-  auto scope = opentelemetry::trace::Tracer::WithActiveSpan(span);
-  span->AddEvent("test-event");
-  span->SetAttribute("test-attribute", "test-value");
-  span->SetStatus(opentelemetry::trace::StatusCode::kOk, "test-status");
-  span->End();
-}
-
-TEST(ApiInstallTest, LogsApiCheck)
-{
-  auto provider = opentelemetry::logs::Provider::GetLoggerProvider();
-  ASSERT_TRUE(provider != nullptr);
-
-  auto logger = provider->GetLogger("test-logger");
-  ASSERT_TRUE(logger != nullptr);
-
-  auto record = logger->CreateLogRecord();
-  ASSERT_TRUE(record != nullptr);
-  record->SetSeverity(opentelemetry::logs::Severity::kInfo);
-  record->SetBody("test-body");
-  record->SetAttribute("test-attribute", "test-value");
-  logger->EmitLogRecord(std::move(record));
-}
-
-TEST(ApiInstallTest, MetricsApiCheck)
-{
-  auto provider = opentelemetry::metrics::Provider::GetMeterProvider();
-  ASSERT_TRUE(provider != nullptr);
-
-  auto meter = provider->GetMeter("test-meter");
-  ASSERT_TRUE(meter != nullptr);
-
-  auto counter = meter->CreateUInt64Counter("test-counter");
-  ASSERT_TRUE(counter != nullptr);
-  counter->Add(1, {{"test-attribute", "test-value"}});
-
-  auto histogram = meter->CreateDoubleHistogram("test-histogram");
-  ASSERT_TRUE(histogram != nullptr);
-  histogram->Record(1, {{"test-attribute", "test-value"}},
-                    opentelemetry::context::RuntimeContext::GetCurrent());
-
-  auto async_gauge = meter->CreateDoubleObservableGauge("test-gauge");
-  ASSERT_TRUE(async_gauge != nullptr);
-
-  auto async_counter = meter->CreateDoubleObservableCounter("test-async-counter");
-  ASSERT_TRUE(async_counter != nullptr);
-
-  auto async_updown_counter =
-      meter->CreateInt64ObservableUpDownCounter("test-async-updown-counter");
-  ASSERT_TRUE(async_updown_counter != nullptr);
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_elasticsearch.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_elasticsearch.cc
deleted file mode 100644
index f18d59cf1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_elasticsearch.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/exporters/elasticsearch/es_log_record_exporter.h>
-#include <opentelemetry/sdk/logs/exporter.h>
-
-namespace logs_exporter = opentelemetry::exporter::logs;
-namespace sdklogs       = opentelemetry::sdk::logs;
-
-TEST(ExportersElasticSearchInstall, ElasticsearchLogRecordExporter)
-{
-  logs_exporter::ElasticsearchExporterOptions options;
-
-  auto exporter = std::unique_ptr<sdklogs::LogRecordExporter>(
-      new logs_exporter::ElasticsearchLogRecordExporter(options));
-
-  ASSERT_TRUE(exporter != nullptr);
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_etw.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_etw.cc
deleted file mode 100644
index 12a5d292c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_etw.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef _WIN32
-
-#  include <gtest/gtest.h>
-#  include <map>
-#  include <string>
-
-#  include "opentelemetry/exporters/etw/etw_logger_exporter.h"
-#  include "opentelemetry/exporters/etw/etw_tracer_exporter.h"
-#  include "opentelemetry/sdk/trace/sampler.h"
-#  include "opentelemetry/sdk/trace/simple_processor.h"
-
-using namespace OPENTELEMETRY_NAMESPACE;
-
-using namespace opentelemetry::exporter::etw;
-
-TEST(ExportersEtwInstall, LoggerProvider)
-{
-  std::string providerName = "OpenTelemetry-ETW-TLD";
-  exporter::etw::LoggerProvider lp;
-
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.2.0"};
-  auto logger = lp.GetLogger(providerName, schema_url);
-  ASSERT_TRUE(logger != nullptr);
-
-  // Log attributes
-  Properties attribs = {{"attrib1", 1}, {"attrib2", 2}};
-  EXPECT_NO_THROW(logger->EmitLogRecord(opentelemetry::logs::Severity::kDebug,
-                                        opentelemetry::common::MakeAttributes(attribs)));
-}
-
-TEST(ExportersEtwInstall, TracerProvider)
-{
-  std::string providerName = "OpenTelemetry-ETW-TLD";
-  exporter::etw::TracerProvider tp({{"enableTraceId", false},
-                                    {"enableSpanId", false},
-                                    {"enableActivityId", false},
-                                    {"enableActivityTracking", true},
-                                    {"enableRelatedActivityId", false},
-                                    {"enableAutoParent", false}});
-  auto tracer = tp.GetTracer(providerName);
-  ASSERT_TRUE(tracer != nullptr);
-  {
-    auto aSpan  = tracer->StartSpan("A.min");
-    auto aScope = tracer->WithActiveSpan(aSpan);
-    {
-      auto bSpan  = tracer->StartSpan("B.min");
-      auto bScope = tracer->WithActiveSpan(bSpan);
-      {
-        auto cSpan  = tracer->StartSpan("C.min");
-        auto cScope = tracer->WithActiveSpan(cSpan);
-        EXPECT_NO_THROW(cSpan->End());
-      }
-      EXPECT_NO_THROW(bSpan->End());
-    }
-    EXPECT_NO_THROW(aSpan->End());
-  }
-#  if OPENTELEMETRY_ABI_VERSION_NO == 1
-  EXPECT_NO_THROW(tracer->CloseWithMicroseconds(0));
-#  endif
-}
-
-#endif  // _WIN32
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_in_memory.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_in_memory.cc
deleted file mode 100644
index 660dbd6f4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_in_memory.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/exporters/memory/in_memory_metric_data.h>
-#include <opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h>
-#include <opentelemetry/exporters/memory/in_memory_span_data.h>
-#include <opentelemetry/exporters/memory/in_memory_span_exporter_factory.h>
-
-using namespace opentelemetry::exporter::memory;
-
-TEST(ExportersInMemoryInstall, InMemorySpanExporter)
-{
-  auto data     = std::shared_ptr<InMemorySpanData>{new InMemorySpanData(10)};
-  auto exporter = InMemorySpanExporterFactory::Create(data);
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOstreamInstall, InMemoryMetricExporter)
-{
-  auto data     = std::shared_ptr<InMemoryMetricData>{new SimpleAggregateInMemoryMetricData()};
-  auto exporter = InMemoryMetricExporterFactory::Create(data);
-  ASSERT_TRUE(exporter != nullptr);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_ostream.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_ostream.cc
deleted file mode 100644
index ef5985672..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_ostream.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/exporters/ostream/log_record_exporter_factory.h>
-#include <opentelemetry/exporters/ostream/metric_exporter_factory.h>
-#include <opentelemetry/exporters/ostream/span_exporter_factory.h>
-
-TEST(ExportersOstreamInstall, OStreamSpanExporter)
-{
-  auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOstreamInstall, OStreamMetricExporter)
-{
-  auto exporter = opentelemetry::exporter::metrics::OStreamMetricExporterFactory::Create();
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOstreamInstall, OStreamLogRecordExporter)
-{
-  auto exporter = opentelemetry::exporter::logs::OStreamLogRecordExporterFactory::Create();
-  ASSERT_TRUE(exporter != nullptr);
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_common.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_common.cc
deleted file mode 100644
index da4e2550d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_common.cc
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <chrono>
-
-// clang-format off
-#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"  // IWYU pragma: keep
-#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
-#include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
-#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
-#include "opentelemetry/proto/common/v1/common.pb.h"
-#include "opentelemetry/proto/logs/v1/logs.pb.h"
-#include "opentelemetry/proto/resource/v1/resource.pb.h"
-#include "opentelemetry/proto/metrics/v1/metrics.pb.h"
-#include "opentelemetry/proto/trace/v1/trace.pb.h"
-#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"  // IWYU pragma: keep
-// clang-format on
-
-#include <opentelemetry/sdk/metrics/data/metric_data.h>
-
-#include <opentelemetry/exporters/otlp/otlp_log_recordable.h>
-#include <opentelemetry/exporters/otlp/otlp_metric_utils.h>
-#include <opentelemetry/exporters/otlp/otlp_recordable.h>
-#include <opentelemetry/exporters/otlp/otlp_recordable_utils.h>
-
-namespace nostd         = opentelemetry::nostd;
-namespace resource_sdk  = opentelemetry::sdk::resource;
-namespace proto         = opentelemetry::proto;
-namespace metrics_sdk   = opentelemetry::sdk::metrics;
-namespace trace_sdk     = opentelemetry::sdk::trace;
-namespace logs_sdk      = opentelemetry::sdk::logs;
-namespace otlp_exporter = opentelemetry::exporter::otlp;
-
-static metrics_sdk::MetricData CreateSumAggregationData()
-{
-  metrics_sdk::MetricData data;
-  data.start_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  metrics_sdk::InstrumentDescriptor inst_desc = {"Counter", "desc", "unit",
-                                                 metrics_sdk::InstrumentType::kCounter,
-                                                 metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2;
-  s_data_1.value_ = 10.2;
-  s_data_2.value_ = 20.2;
-
-  data.aggregation_temporality = metrics_sdk::AggregationTemporality::kCumulative;
-  data.end_ts = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-  data.instrument_descriptor = inst_desc;
-  metrics_sdk::PointDataAttributes point_data_attr_1, point_data_attr_2;
-  point_data_attr_1.attributes = {{"k1", "v1"}};
-  point_data_attr_1.point_data = s_data_1;
-
-  point_data_attr_2.attributes = {{"k2", "v2"}};
-  point_data_attr_2.point_data = s_data_2;
-  std::vector<metrics_sdk::PointDataAttributes> point_data_attr;
-  point_data_attr.push_back(point_data_attr_1);
-  point_data_attr.push_back(point_data_attr_2);
-  data.point_data_attr_ = std::move(point_data_attr);
-  return data;
-}
-
-TEST(ExportersOtlpCommon, OtlpSpanRecordable)
-{
-  auto resource = resource_sdk::Resource::Create({{"service.name", "one"}});
-  auto scope    = trace_sdk::InstrumentationScope::Create("one", "1", "scope_schema",
-                                                          {{"scope_key", "scope_value"}});
-  ASSERT_TRUE(scope != nullptr);
-
-  auto span_recordable = std::unique_ptr<trace_sdk::Recordable>(new otlp_exporter::OtlpRecordable);
-  ASSERT_TRUE(span_recordable != nullptr);
-  span_recordable->SetResource(resource);
-  span_recordable->SetInstrumentationScope(*scope);
-  span_recordable->SetAttribute("test", "test");
-  span_recordable->SetName("test-name");
-
-  proto::collector::trace::v1::ExportTraceServiceRequest request;
-  std::vector<std::unique_ptr<trace_sdk::Recordable>> spans;
-  spans.push_back(std::move(span_recordable));
-  const nostd::span<std::unique_ptr<trace_sdk::Recordable>, 1> spans_span(spans.data(), 1);
-  otlp_exporter::OtlpRecordableUtils::PopulateRequest(spans_span, &request);
-
-  ASSERT_EQ(request.resource_spans().size(), 1);
-
-  auto resource_spans = request.resource_spans().at(0);
-
-  ASSERT_EQ(resource_spans.scope_spans().size(), 1);
-
-  auto spans_proto = resource_spans.scope_spans().at(0).spans();
-  auto &span       = spans_proto.at(0);
-
-  EXPECT_EQ(span.name(), "test-name");
-}
-
-TEST(ExportersOtlpCommon, OtlpLogRecordable)
-{
-  auto resource = resource_sdk::Resource::Create({{"service.name", "one"}});
-  auto scope    = trace_sdk::InstrumentationScope::Create("one", "1", "scope_schema",
-                                                          {{"scope_key", "scope_value"}});
-  ASSERT_TRUE(scope != nullptr);
-
-  auto logs_recordable =
-      std::unique_ptr<opentelemetry::sdk::logs::Recordable>(new otlp_exporter::OtlpLogRecordable);
-  ASSERT_TRUE(logs_recordable != nullptr);
-
-  logs_recordable->SetResource(resource);
-  logs_recordable->SetInstrumentationScope(*scope);
-  logs_recordable->SetAttribute("test", "test");
-  logs_recordable->SetBody("testing 123");
-  logs_recordable->SetSeverity(opentelemetry::logs::Severity::kInfo);
-
-  std::vector<std::unique_ptr<logs_sdk::Recordable>> logs;
-  logs.push_back(std::move(logs_recordable));
-
-  opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request;
-  const opentelemetry::nostd::span<std::unique_ptr<opentelemetry::sdk::logs::Recordable>> logs_span(
-      logs.data(), 1);
-
-  otlp_exporter::OtlpRecordableUtils::PopulateRequest(logs_span, &request);
-  ASSERT_EQ(request.resource_logs().size(), 1);
-  auto logs_proto        = request.resource_logs().at(0).scope_logs();
-  auto log_records_proto = logs_proto.at(0).log_records();
-
-  ASSERT_EQ(log_records_proto.size(), 1);
-  auto &log = log_records_proto.at(0);
-  EXPECT_EQ(log.body().string_value(), "testing 123");
-}
-
-TEST(ExportersOtlpCommon, ExportMetricsServiceRequest)
-{
-  const auto resource = resource_sdk::Resource::Create({{"service.name", "test_service_name"}},
-                                                       "resource_schema_url");
-  const auto scope    = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-      "scope_name", "scope_version", "scope_schema_url", {{"scope_key", "scope_value"}});
-
-  metrics_sdk::ScopeMetrics scope_metrics{scope.get(), CreateSumAggregationData()};
-  metrics_sdk::ResourceMetrics resource_metrics{&resource, scope_metrics};
-
-  proto::collector::metrics::v1::ExportMetricsServiceRequest request_proto;
-  otlp_exporter::OtlpMetricUtils::PopulateRequest(resource_metrics, &request_proto);
-
-  ASSERT_EQ(1, request_proto.resource_metrics_size());
-  const auto &resource_metrics_proto = request_proto.resource_metrics(0);
-  EXPECT_EQ("resource_schema_url", resource_metrics_proto.schema_url());
-
-  ASSERT_EQ(1, resource_metrics_proto.scope_metrics_size());
-  const auto &scope_metrics_proto = resource_metrics_proto.scope_metrics(0);
-  EXPECT_EQ("scope_schema_url", scope_metrics_proto.schema_url());
-
-  ASSERT_EQ(1, scope_metrics_proto.metrics_size());
-  const auto &metric_proto = scope_metrics_proto.metrics(0);
-  EXPECT_EQ("Counter", metric_proto.name());
-
-  const auto &scope_proto = scope_metrics_proto.scope();
-  EXPECT_EQ("scope_name", scope_proto.name());
-  EXPECT_EQ("scope_version", scope_proto.version());
-
-  ASSERT_EQ(1, scope_proto.attributes_size());
-  const auto &scope_attributes_proto = scope_proto.attributes(0);
-  EXPECT_EQ("scope_key", scope_attributes_proto.key());
-  EXPECT_EQ("scope_value", scope_attributes_proto.value().string_value());
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_file.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_file.cc
deleted file mode 100644
index 11627f550..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_file.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/exporters/otlp/otlp_file_exporter_options.h>
-#include <opentelemetry/exporters/otlp/otlp_file_log_record_exporter_options.h>
-#include <opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h>
-
-#include <opentelemetry/exporters/otlp/otlp_file_client.h>
-#include <opentelemetry/exporters/otlp/otlp_file_exporter_factory.h>
-#include <opentelemetry/exporters/otlp/otlp_file_log_record_exporter_factory.h>
-#include <opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h>
-
-TEST(ExportersOtlpFileInstall, OtlpFileExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpFileExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpFileExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOtlpFileInstall, OtlpFileLogRecordExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpFileLogRecordExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpFileLogRecordExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOtlpFileInstall, OtlpFileMetricExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpFileMetricExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpFileMetricExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_grpc.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_grpc.cc
deleted file mode 100644
index 6e32c68a2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_grpc.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/exporters/otlp/otlp_grpc_client_options.h>
-#include <opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h>
-#include <opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h>
-#include <opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h>
-
-#include <opentelemetry/exporters/otlp/otlp_grpc_client_factory.h>
-#include <opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h>
-#include <opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h>
-#include <opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h>
-
-TEST(ExportersOtlpGrpcInstall, OtlpGrpcClient)
-{
-  auto options = opentelemetry::exporter::otlp::OtlpGrpcExporterOptions();
-  auto client  = opentelemetry::exporter::otlp::OtlpGrpcClientFactory::Create(options);
-  ASSERT_TRUE(client != nullptr);
-}
-
-TEST(ExportersOtlpGrpcInstall, OtlpGrpcExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpGrpcExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpGrpcExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOtlpGrpcInstall, OtlpGrpcLogRecordExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpGrpcLogRecordExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpGrpcLogRecordExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOtlpGrpcInstall, OtlpGrpcMetricExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpGrpcMetricExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpGrpcMetricExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_http.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_http.cc
deleted file mode 100644
index 441df255c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_otlp_http.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/exporters/otlp/otlp_http_exporter_options.h>
-#include <opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h>
-#include <opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h>
-
-#include <opentelemetry/exporters/otlp/otlp_http_client.h>
-#include <opentelemetry/exporters/otlp/otlp_http_exporter_factory.h>
-#include <opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h>
-#include <opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h>
-
-TEST(ExportersOtlpHttpInstall, OtlpHttpExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpHttpExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpHttpExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOtlpHttpInstall, OtlpHttpLogRecordExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpHttpLogRecordExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpHttpLogRecordExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
-
-TEST(ExportersOtlpHttpInstall, OtlpHttpMetricExporter)
-{
-  auto options  = opentelemetry::exporter::otlp::OtlpHttpMetricExporterOptions();
-  auto exporter = opentelemetry::exporter::otlp::OtlpHttpMetricExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_prometheus.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_prometheus.cc
deleted file mode 100644
index 1def1417f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_prometheus.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/exporters/prometheus/exporter_factory.h>
-#include <opentelemetry/exporters/prometheus/exporter_options.h>
-
-TEST(ExportersPrometheusInstall, PrometheusExporter)
-{
-  auto options  = opentelemetry::exporter::metrics::PrometheusExporterOptions();
-  auto exporter = opentelemetry::exporter::metrics::PrometheusExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_zipkin.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_zipkin.cc
deleted file mode 100644
index 1a09fe614..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_exporters_zipkin.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/exporters/zipkin/zipkin_exporter_factory.h>
-#include <opentelemetry/exporters/zipkin/zipkin_exporter_options.h>
-
-TEST(ExportersZipkinInstall, ZipkinExporter)
-{
-  auto options  = opentelemetry::exporter::zipkin::ZipkinExporterOptions();
-  auto exporter = opentelemetry::exporter::zipkin::ZipkinExporterFactory::Create(options);
-  ASSERT_TRUE(exporter != nullptr);
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_common.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_common.cc
deleted file mode 100644
index cd4b83dfa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_common.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/ext/http/common/url_parser.h>
-
-TEST(ExtCommonInstall, UrlParser)
-{
-  auto url_parser = opentelemetry::ext::http::common::UrlParser("www.opentelemetry.io");
-  ASSERT_TRUE(url_parser.success_);
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_dll.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_dll.cc
deleted file mode 100644
index ed8c1b994..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_dll.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/logs/provider.h>
-#include <opentelemetry/metrics/provider.h>
-#include <opentelemetry/trace/provider.h>
-
-#include <opentelemetry/sdk/resource/resource.h>
-#include <opentelemetry/sdk/resource/resource_detector.h>
-#include <opentelemetry/sdk/version/version.h>
-
-#include <opentelemetry/sdk/instrumentationscope/instrumentation_scope.h>
-
-#include <opentelemetry/sdk/logs/exporter.h>
-#include <opentelemetry/sdk/metrics/instruments.h>
-#include <opentelemetry/sdk/metrics/push_metric_exporter.h>
-#include <opentelemetry/sdk/trace/exporter.h>
-
-#include <opentelemetry/sdk/trace/provider.h>
-#include <opentelemetry/sdk/trace/simple_processor_factory.h>
-#include <opentelemetry/sdk/trace/tracer_provider_factory.h>
-
-#include <opentelemetry/sdk/logs/logger_provider_factory.h>
-#include <opentelemetry/sdk/logs/provider.h>
-#include <opentelemetry/sdk/logs/simple_log_record_processor_factory.h>
-
-#include <opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h>
-#include <opentelemetry/sdk/metrics/meter_context.h>
-#include <opentelemetry/sdk/metrics/meter_context_factory.h>
-#include <opentelemetry/sdk/metrics/meter_provider_factory.h>
-#include <opentelemetry/sdk/metrics/provider.h>
-
-#include <opentelemetry/exporters/ostream/log_record_exporter.h>
-#include <opentelemetry/exporters/ostream/log_record_exporter_factory.h>
-#include <opentelemetry/exporters/ostream/metric_exporter_factory.h>
-#include <opentelemetry/exporters/ostream/span_exporter_factory.h>
-
-namespace nostd        = opentelemetry::nostd;
-namespace version_sdk  = opentelemetry::sdk::version;
-namespace common       = opentelemetry::common;
-namespace common_sdk   = opentelemetry::sdk::common;
-namespace scope_sdk    = opentelemetry::sdk::instrumentationscope;
-namespace resource_sdk = opentelemetry::sdk::resource;
-namespace metrics_sdk  = opentelemetry::sdk::metrics;
-namespace metrics      = opentelemetry::metrics;
-namespace logs_sdk     = opentelemetry::sdk::logs;
-namespace logs         = opentelemetry::logs;
-namespace trace_sdk    = opentelemetry::sdk::trace;
-namespace trace        = opentelemetry::trace;
-
-TEST(ExtDllInstallTest, LoggerProviderCheck)
-{
-  {
-    auto exporter = std::unique_ptr<logs_sdk::LogRecordExporter>(
-        new opentelemetry::exporter::logs::OStreamLogRecordExporter());
-    auto processor    = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
-    auto sdk_provider = logs_sdk::LoggerProviderFactory::Create(std::move(processor));
-    nostd::shared_ptr<opentelemetry::logs::LoggerProvider> new_provider{sdk_provider.release()};
-    logs::Provider::SetLoggerProvider(new_provider);
-  }
-
-  auto provider = opentelemetry::logs::Provider::GetLoggerProvider();
-  ASSERT_TRUE(provider != nullptr);
-  {
-    auto logger = provider->GetLogger("test-logger");
-    ASSERT_TRUE(logger != nullptr);
-    logger->Info("test-message");
-  }
-}
-
-TEST(ExtDllInstallTest, TracerProviderCheck)
-{
-  {
-    auto exporter     = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Create();
-    auto processor    = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-    auto sdk_provider = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-    nostd::shared_ptr<trace::TracerProvider> new_provider{sdk_provider.release()};
-    trace::Provider::SetTracerProvider(new_provider);
-  }
-
-  auto provider = trace::Provider::GetTracerProvider();
-  ASSERT_TRUE(provider != nullptr);
-  {
-    auto tracer = provider->GetTracer("test-tracer");
-    ASSERT_TRUE(tracer != nullptr);
-    auto span = tracer->StartSpan("test-span");
-    ASSERT_TRUE(span != nullptr);
-    span->End();
-  }
-}
-
-TEST(ExtDllInstallTest, MeterProviderCheck)
-{
-  {
-    auto exporter = opentelemetry::exporter::metrics::OStreamMetricExporterFactory::Create();
-    auto reader   = metrics_sdk::PeriodicExportingMetricReaderFactory::Create(
-        std::move(exporter), metrics_sdk::PeriodicExportingMetricReaderOptions{});
-    auto context      = metrics_sdk::MeterContextFactory::Create();
-    auto sdk_provider = metrics_sdk::MeterProviderFactory::Create(std::move(context));
-    sdk_provider->AddMetricReader(std::move(reader));
-    nostd::shared_ptr<metrics::MeterProvider> new_provider{sdk_provider.release()};
-    metrics::Provider::SetMeterProvider(new_provider);
-  }
-
-  auto provider = metrics::Provider::GetMeterProvider();
-  ASSERT_TRUE(provider != nullptr);
-  {
-    auto meter = provider->GetMeter("test-meter");
-    ASSERT_TRUE(meter != nullptr);
-    auto counter = meter->CreateUInt64Counter("test-counter");
-    ASSERT_TRUE(counter != nullptr);
-    counter->Add(1);
-  }
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_http_curl.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_http_curl.cc
deleted file mode 100644
index 799ee4732..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_ext_http_curl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/ext/http/client/http_client.h>
-#include <opentelemetry/ext/http/client/http_client_factory.h>
-
-TEST(ExtHttpCurlInstall, HttpClient)
-{
-  auto client = opentelemetry::ext::http::client::HttpClientFactory::Create();
-  ASSERT_TRUE(client != nullptr);
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_sdk.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_sdk.cc
deleted file mode 100644
index 13c4d1924..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_sdk.cc
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/logs/provider.h>
-#include <opentelemetry/metrics/provider.h>
-#include <opentelemetry/trace/provider.h>
-
-#include <opentelemetry/sdk/resource/resource.h>
-#include <opentelemetry/sdk/resource/resource_detector.h>
-#include <opentelemetry/sdk/version/version.h>
-
-#include <opentelemetry/sdk/instrumentationscope/instrumentation_scope.h>
-
-#include <opentelemetry/sdk/logs/exporter.h>
-#include <opentelemetry/sdk/metrics/instruments.h>
-#include <opentelemetry/sdk/metrics/push_metric_exporter.h>
-#include <opentelemetry/sdk/trace/exporter.h>
-
-#include <opentelemetry/sdk/trace/provider.h>
-#include <opentelemetry/sdk/trace/simple_processor_factory.h>
-#include <opentelemetry/sdk/trace/tracer_provider_factory.h>
-
-#include <opentelemetry/sdk/logs/logger_provider_factory.h>
-#include <opentelemetry/sdk/logs/provider.h>
-#include <opentelemetry/sdk/logs/simple_log_record_processor_factory.h>
-
-#include <opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h>
-#include <opentelemetry/sdk/metrics/meter_context.h>
-#include <opentelemetry/sdk/metrics/meter_context_factory.h>
-#include <opentelemetry/sdk/metrics/meter_provider_factory.h>
-#include <opentelemetry/sdk/metrics/provider.h>
-
-namespace nostd        = opentelemetry::nostd;
-namespace version_sdk  = opentelemetry::sdk::version;
-namespace common       = opentelemetry::common;
-namespace common_sdk   = opentelemetry::sdk::common;
-namespace scope_sdk    = opentelemetry::sdk::instrumentationscope;
-namespace resource_sdk = opentelemetry::sdk::resource;
-namespace metrics_sdk  = opentelemetry::sdk::metrics;
-namespace metrics      = opentelemetry::metrics;
-namespace logs_sdk     = opentelemetry::sdk::logs;
-namespace logs         = opentelemetry::logs;
-namespace trace_sdk    = opentelemetry::sdk::trace;
-namespace trace        = opentelemetry::trace;
-
-class NoopLogRecordable : public logs_sdk::Recordable
-{
-public:
-  ~NoopLogRecordable() override = default;
-  void SetTimestamp(common::SystemTimestamp timestamp) noexcept override {}
-  void SetObservedTimestamp(common::SystemTimestamp timestamp) noexcept override {}
-  void SetSeverity(logs::Severity severity) noexcept override {}
-  void SetBody(const common::AttributeValue &message) noexcept override {}
-  void SetAttribute(nostd::string_view key, const common::AttributeValue &value) noexcept override
-  {}
-  void SetEventId(int64_t id, nostd::string_view name = {}) noexcept override {}
-  void SetTraceId(const trace::TraceId &trace_id) noexcept override {}
-  void SetSpanId(const trace::SpanId &span_id) noexcept override {}
-  void SetTraceFlags(const trace::TraceFlags &trace_flags) noexcept override {}
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override {}
-  void SetInstrumentationScope(
-      const scope_sdk::InstrumentationScope &instrumentation_scope) noexcept override
-  {}
-};
-
-class NoopLogRecordExporter : public logs_sdk::LogRecordExporter
-{
-public:
-  ~NoopLogRecordExporter() override = default;
-  std::unique_ptr<logs_sdk::Recordable> MakeRecordable() noexcept override
-  {
-    return std::move(std::unique_ptr<logs_sdk::Recordable>{new NoopLogRecordable()});
-  }
-  common_sdk::ExportResult Export(
-      const nostd::span<std::unique_ptr<logs_sdk::Recordable>> &records) noexcept override
-  {
-    return common_sdk::ExportResult::kSuccess;
-  }
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    return true;
-  }
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    return true;
-  }
-};
-
-class NoopSpanRecordable : public trace_sdk::Recordable
-{
-public:
-  ~NoopSpanRecordable() override = default;
-  void SetIdentity(const trace::SpanContext &span_context,
-                   trace::SpanId parent_span_id) noexcept override
-  {}
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override
-  {}
-  void AddEvent(nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept override
-  {}
-  void AddLink(const trace::SpanContext &span_context,
-               const opentelemetry::common::KeyValueIterable &attributes) noexcept override
-  {}
-  void SetStatus(trace::StatusCode code, nostd::string_view description) noexcept override {}
-  void SetName(nostd::string_view name) noexcept override {}
-  void SetSpanKind(trace::SpanKind span_kind) noexcept override {}
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override {}
-  void SetStartTime(opentelemetry::common::SystemTimestamp start_time) noexcept override {}
-  void SetDuration(std::chrono::nanoseconds duration) noexcept override {}
-  void SetInstrumentationScope(
-      const scope_sdk::InstrumentationScope &instrumentation_scope) noexcept override
-  {}
-};
-
-class NoopSpanExporter : public trace_sdk::SpanExporter
-{
-public:
-  ~NoopSpanExporter() override = default;
-  std::unique_ptr<trace_sdk::Recordable> MakeRecordable() noexcept override
-  {
-    return std::move(std::unique_ptr<trace_sdk::Recordable>{new NoopSpanRecordable()});
-  }
-  common_sdk::ExportResult Export(
-      const nostd::span<std::unique_ptr<trace_sdk::Recordable>> &spans) noexcept override
-  {
-    return common_sdk::ExportResult::kSuccess;
-  }
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    return true;
-  }
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    return true;
-  }
-};
-
-class NoopPushMetricExporter : public metrics_sdk::PushMetricExporter
-{
-public:
-  ~NoopPushMetricExporter() override = default;
-  common_sdk::ExportResult Export(
-      const metrics_sdk::ResourceMetrics &resource_metrics) noexcept override
-  {
-    return common_sdk::ExportResult::kSuccess;
-  }
-
-  metrics_sdk::AggregationTemporality GetAggregationTemporality(
-      metrics_sdk::InstrumentType instrument_type) const noexcept override
-  {
-    return metrics_sdk::AggregationTemporality::kCumulative;
-  }
-
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    return true;
-  }
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    return true;
-  }
-};
-
-TEST(SdkInstallTest, SdkVersionCheck)
-{
-  EXPECT_NE(OPENTELEMETRY_SDK_VERSION, "not a version");
-  EXPECT_GE(version_sdk::major_version, 0);
-  EXPECT_GE(version_sdk::minor_version, 0);
-  EXPECT_GE(version_sdk::patch_version, 0);
-  EXPECT_NE(version_sdk::full_version, "");
-  EXPECT_NE(version_sdk::short_version, "");
-}
-
-TEST(SdkInstallTest, ResourceDetectorCheck)
-{
-  auto resource = resource_sdk::Resource::GetDefault();
-  resource_sdk::OTELResourceDetector detector;
-  resource.Merge(detector.Detect());
-  resource_sdk::ResourceAttributes attributes = resource.GetAttributes();
-  EXPECT_NE(attributes.size(), 0);
-}
-
-TEST(SdkInstallTest, LoggerProviderCheck)
-{
-  {
-    auto exporter     = nostd::unique_ptr<logs_sdk::LogRecordExporter>(new NoopLogRecordExporter());
-    auto processor    = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
-    auto sdk_provider = logs_sdk::LoggerProviderFactory::Create(std::move(processor));
-    nostd::shared_ptr<opentelemetry::logs::LoggerProvider> new_provider{sdk_provider.release()};
-    logs::Provider::SetLoggerProvider(new_provider);
-  }
-
-  auto provider = opentelemetry::logs::Provider::GetLoggerProvider();
-  ASSERT_TRUE(provider != nullptr);
-  {
-    auto logger = provider->GetLogger("test-logger");
-    ASSERT_TRUE(logger != nullptr);
-    logger->Info("test-message");
-  }
-  auto sdk_provider = static_cast<logs_sdk::LoggerProvider *>(provider.get());
-  sdk_provider->ForceFlush();
-}
-
-TEST(SdkInstallTest, TracerProviderCheck)
-{
-  {
-    auto exporter     = nostd::unique_ptr<trace_sdk::SpanExporter>(new NoopSpanExporter());
-    auto processor    = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
-    auto sdk_provider = trace_sdk::TracerProviderFactory::Create(std::move(processor));
-    nostd::shared_ptr<trace::TracerProvider> new_provider{sdk_provider.release()};
-    trace::Provider::SetTracerProvider(new_provider);
-  }
-
-  auto provider = trace::Provider::GetTracerProvider();
-  ASSERT_TRUE(provider != nullptr);
-  {
-    auto tracer = provider->GetTracer("test-tracer");
-    ASSERT_TRUE(tracer != nullptr);
-    auto span = tracer->StartSpan("test-span");
-    ASSERT_TRUE(span != nullptr);
-    span->End();
-  }
-  auto sdk_provider = static_cast<trace_sdk::TracerProvider *>(provider.get());
-  sdk_provider->ForceFlush();
-}
-
-TEST(SdkInstallTest, MeterProviderCheck)
-{
-  {
-    auto exporter =
-        nostd::unique_ptr<metrics_sdk::PushMetricExporter>(new NoopPushMetricExporter());
-    auto reader = metrics_sdk::PeriodicExportingMetricReaderFactory::Create(
-        std::move(exporter), metrics_sdk::PeriodicExportingMetricReaderOptions{});
-    auto context      = metrics_sdk::MeterContextFactory::Create();
-    auto sdk_provider = metrics_sdk::MeterProviderFactory::Create(std::move(context));
-    sdk_provider->AddMetricReader(std::move(reader));
-    nostd::shared_ptr<metrics::MeterProvider> new_provider{sdk_provider.release()};
-    metrics::Provider::SetMeterProvider(new_provider);
-  }
-
-  auto provider = metrics::Provider::GetMeterProvider();
-  ASSERT_TRUE(provider != nullptr);
-  {
-    auto meter = provider->GetMeter("test-meter");
-    ASSERT_TRUE(meter != nullptr);
-    auto counter = meter->CreateUInt64Counter("test-counter");
-    ASSERT_TRUE(counter != nullptr);
-    counter->Add(1);
-  }
-  auto sdk_provider = static_cast<metrics_sdk::MeterProvider *>(provider.get());
-  sdk_provider->ForceFlush();
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_shims_opentracing.cc b/ext/opentelemetry-cpp-1.21.0/install/test/src/test_shims_opentracing.cc
deleted file mode 100644
index ddf037a30..000000000
--- a/ext/opentelemetry-cpp-1.21.0/install/test/src/test_shims_opentracing.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <opentelemetry/opentracingshim/propagation.h>
-#include <opentelemetry/opentracingshim/shim_utils.h>
-#include <opentelemetry/opentracingshim/span_context_shim.h>
-#include <opentelemetry/opentracingshim/span_shim.h>
-#include <opentelemetry/opentracingshim/tracer_shim.h>
-
-TEST(ShimsOpenTracingInstall, TracerShim)
-{
-  auto tracer_shim = opentelemetry::opentracingshim::TracerShim::createTracerShim();
-  ASSERT_TRUE(tracer_shim != nullptr);
-  auto span_shim = tracer_shim->StartSpan("test");
-  ASSERT_TRUE(span_shim != nullptr);
-  span_shim->Log({{"event", "test"}});
-  span_shim->SetTag("test", "test");
-  span_shim->SetBaggageItem("test", "test");
-  span_shim->Finish();
-  tracer_shim->Close();
-}
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/BUILD b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/BUILD
deleted file mode 100644
index e7d90a4b4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/BUILD
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "opentracing_shim",
-    srcs = [
-        "src/shim_utils.cc",
-        "src/span_context_shim.cc",
-        "src/span_shim.cc",
-        "src/tracer_shim.cc",
-    ],
-    hdrs = [
-        "include/opentelemetry/opentracingshim/propagation.h",
-        "include/opentelemetry/opentracingshim/shim_utils.h",
-        "include/opentelemetry/opentracingshim/span_context_shim.h",
-        "include/opentelemetry/opentracingshim/span_shim.h",
-        "include/opentelemetry/opentracingshim/tracer_shim.h",
-    ],
-    strip_include_prefix = "include",
-    tags = ["opentracing"],
-    deps = [
-        "//api",
-        "@com_github_opentracing//:opentracing",
-    ],
-)
-
-cc_test(
-    name = "propagation_test",
-    srcs = [
-        "test/propagation_test.cc",
-        "test/shim_mocks.h",
-    ],
-    tags = [
-        "opentracing_shim",
-        "test",
-    ],
-    deps = [
-        ":opentracing_shim",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "shim_utils_test",
-    srcs = [
-        "test/shim_mocks.h",
-        "test/shim_utils_test.cc",
-    ],
-    tags = [
-        "opentracing_shim",
-        "test",
-    ],
-    deps = [
-        ":opentracing_shim",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "span_shim_test",
-    srcs = [
-        "test/shim_mocks.h",
-        "test/span_shim_test.cc",
-    ],
-    tags = [
-        "opentracing_shim",
-        "test",
-    ],
-    deps = [
-        ":opentracing_shim",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "span_context_shim_test",
-    srcs = [
-        "test/span_context_shim_test.cc",
-    ],
-    tags = [
-        "opentracing_shim",
-        "test",
-    ],
-    deps = [
-        ":opentracing_shim",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "tracer_shim_test",
-    srcs = [
-        "test/shim_mocks.h",
-        "test/tracer_shim_test.cc",
-    ],
-    tags = [
-        "opentracing_shim",
-        "test",
-    ],
-    deps = [
-        ":opentracing_shim",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/CMakeLists.txt
deleted file mode 100644
index 5e3b89c5b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set(this_target opentelemetry_opentracing_shim)
-
-add_library(${this_target} src/shim_utils.cc src/span_shim.cc
-                           src/span_context_shim.cc src/tracer_shim.cc)
-
-set_target_properties(${this_target} PROPERTIES EXPORT_NAME opentracing_shim)
-set_target_version(${this_target})
-
-target_include_directories(
-  ${this_target} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-                        "$<INSTALL_INTERFACE:include>")
-
-if(OPENTRACING_DIR)
-  target_include_directories(
-    ${this_target}
-    PUBLIC
-      "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/${OPENTRACING_DIR}/include>"
-      "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/${OPENTRACING_DIR}/include>"
-      "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/${OPENTRACING_DIR}/3rd_party/include>"
-  )
-  target_link_libraries(${this_target} opentelemetry_api opentracing)
-else()
-  target_link_libraries(${this_target} opentelemetry_api
-                        OpenTracing::opentracing)
-endif()
-
-otel_add_component(
-  COMPONENT
-  shims_opentracing
-  TARGETS
-  ${this_target}
-  FILES_DIRECTORY
-  "include/opentelemetry/opentracingshim"
-  FILES_DESTINATION
-  "include/opentelemetry/"
-  FILES_MATCHING
-  PATTERN
-  "*.h")
-
-if(BUILD_TESTING)
-  foreach(testname propagation_test shim_utils_test span_shim_test
-                   span_context_shim_test tracer_shim_test)
-
-    add_executable(${testname} "test/${testname}.cc")
-
-    if(OPENTRACING_DIR)
-      target_link_libraries(
-        ${testname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-        opentelemetry_api opentelemetry_opentracing_shim opentracing)
-    else()
-      target_link_libraries(
-        ${testname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-        opentelemetry_api opentelemetry_opentracing_shim
-        OpenTracing::opentracing)
-    endif()
-
-    gtest_add_tests(
-      TARGET ${testname}
-      TEST_PREFIX opentracing_shim.
-      TEST_LIST ${testname})
-  endforeach()
-endif() # BUILD_TESTING
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/README.md b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/README.md
deleted file mode 100644
index 5a4fc7740..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# C++ OpenTracing Shim
-
-[![Apache License][license-image]][license-image]
-
-An [OpenTracing shim][migrating] is a bridge layer from OpenTelemetry to the
-OpenTracing API. It takes an OpenTelemetry Tracer and exposes it as an
-implementation compatible with that of an OpenTracing Tracer.
-
-## Usage
-
-Use the TracerShim wherever you initialize your OpenTracing tracers.
-There are 2 ways to expose an OpenTracing Tracer:
-
-1. From the global OpenTelemetry configuration:
-
-    ```cpp
-    auto tracer_shim = TracerShim::createTracerShim();
-    ```
-
-1. From a provided OpenTelemetry Tracer instance:
-
-    ```cpp
-    auto tracer_shim = TracerShim::createTracerShim(tracer);
-    ```
-
-Optionally, one can also specify the propagators to be used for the OpenTracing `TextMap`
-and `HttpHeaders` formats:
-
-```cpp
-OpenTracingPropagators propagators{
-  .text_map = nostd::shared_ptr<TextMapPropagator>(new CustomTextMap()),
-  .http_headers = nostd::shared_ptr<TextMapPropagator>(new trace::propagation::HttpTraceContext())
-};
-
-auto tracer_shim = TracerShim::createTracerShim(tracer, propagators);
-```
-
-If propagators are not specified, OpenTelemetry's global propagator will be used.
-
-## More information and help
-
-- [Migrating from OpenTracing][migrating]
-- [OpenTelemetry](https://opentelemetry.io)
-- For help or feedback on this project, join us in [GitHub Discussions][discussions-url]
-
-## License
-
-Apache 2.0 - See [LICENSE][license-url] for more information.
-
-[discussions-url]: https://github.com/open-telemetry/opentelemetry-cpp/discussions
-[license-url]: https://github.com/open-telemetry/opentelemetry-cpp/blob/main/LICENSE
-[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
-[migrating]: https://opentelemetry.io/docs/migration/opentracing/
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/propagation.h b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/propagation.h
deleted file mode 100644
index 3eceedb35..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/propagation.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include "opentracing/propagation.h"
-#include "opentracing/value.h"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-
-class CarrierWriterShim : public opentelemetry::context::propagation::TextMapCarrier
-{
-public:
-  CarrierWriterShim(const opentracing::TextMapWriter &writer) : writer_(writer) {}
-
-  virtual nostd::string_view Get(nostd::string_view) const noexcept override
-  {
-    return {};  // Not required for Opentracing writer
-  }
-
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept override
-  {
-    writer_.Set(opentracing::string_view{key.data(), key.size()},
-                opentracing::string_view{value.data(), value.size()});
-  }
-
-private:
-  const opentracing::TextMapWriter &writer_;
-};
-
-class CarrierReaderShim : public opentelemetry::context::propagation::TextMapCarrier
-{
-public:
-  CarrierReaderShim(const opentracing::TextMapReader &reader) : reader_(reader) {}
-
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept override
-  {
-    nostd::string_view value;
-
-    // First try carrier.LookupKey since that can potentially be the fastest approach.
-    if (auto result = reader_.LookupKey(opentracing::string_view{key.data(), key.size()}))
-    {
-      value = nostd::string_view{result.value().data(), result.value().size()};
-    }
-    else  // Fall back to iterating through all of the keys.
-    {
-      reader_.ForeachKey([key, &value](opentracing::string_view k,
-                                       opentracing::string_view v) -> opentracing::expected<void> {
-        if (key == nostd::string_view{k.data(), k.size()})
-        {
-          value = nostd::string_view{v.data(), v.size()};
-          // Found key, so bail out of the loop with a success error code.
-          return opentracing::make_unexpected(std::error_code{});
-        }
-        return opentracing::make_expected();
-      });
-    }
-
-    return value;
-  }
-
-  virtual void Set(nostd::string_view, nostd::string_view) noexcept override
-  {
-    // Not required for Opentracing reader
-  }
-
-  virtual bool Keys(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return reader_
-        .ForeachKey([&callback](opentracing::string_view key,
-                                opentracing::string_view) -> opentracing::expected<void> {
-          return callback(nostd::string_view{key.data(), key.size()})
-                     ? opentracing::make_expected()
-                     : opentracing::make_unexpected(std::error_code{});
-        })
-        .has_value();
-  }
-
-private:
-  const opentracing::TextMapReader &reader_;
-};
-
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/shim_utils.h b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/shim_utils.h
deleted file mode 100644
index f07216870..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/shim_utils.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <algorithm>
-#include <cstddef>
-#include <initializer_list>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentracing/propagation.h"
-#include "opentracing/span.h"
-#include "opentracing/string_view.h"
-#include "opentracing/tracer.h"
-#include "opentracing/value.h"
-#include "opentracing/variant/recursive_wrapper.hpp"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/semconv/incubating/opentracing_attributes.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-namespace utils
-{
-
-static inline opentelemetry::common::AttributeValue attributeFromValue(
-    const opentracing::Value &value)
-{
-  using opentelemetry::common::AttributeValue;
-
-  static struct
-  {
-    AttributeValue operator()(bool v) { return v; }
-    AttributeValue operator()(double v) { return v; }
-    AttributeValue operator()(int64_t v) { return v; }
-    AttributeValue operator()(uint64_t v) { return v; }
-    AttributeValue operator()(const std::string &v) { return nostd::string_view{v}; }
-    AttributeValue operator()(opentracing::string_view v)
-    {
-      return nostd::string_view{v.data(), v.size()};
-    }
-    AttributeValue operator()(std::nullptr_t) { return nostd::string_view{}; }
-    AttributeValue operator()(const char *v) { return v; }
-    AttributeValue operator()(opentracing::util::recursive_wrapper<opentracing::Values>)
-    {
-      return nostd::string_view{};
-    }
-    AttributeValue operator()(opentracing::util::recursive_wrapper<opentracing::Dictionary>)
-    {
-      return nostd::string_view{};
-    }
-  } AttributeMapper;
-
-  return opentracing::Value::visit(value, AttributeMapper);
-}
-
-static inline std::string stringFromValue(const opentracing::Value &value)
-{
-  static struct
-  {
-    std::string operator()(bool v) { return v ? "true" : "false"; }
-    std::string operator()(double v) { return std::to_string(v); }
-    std::string operator()(int64_t v) { return std::to_string(v); }
-    std::string operator()(uint64_t v) { return std::to_string(v); }
-    std::string operator()(const std::string &v) { return v; }
-    std::string operator()(opentracing::string_view v) { return std::string{v.data(), v.size()}; }
-    std::string operator()(std::nullptr_t) { return std::string{}; }
-    std::string operator()(const char *v) { return std::string{v}; }
-    std::string operator()(opentracing::util::recursive_wrapper<opentracing::Values>)
-    {
-      return std::string{};
-    }
-    std::string operator()(opentracing::util::recursive_wrapper<opentracing::Dictionary>)
-    {
-      return std::string{};
-    }
-  } StringMapper;
-
-  return opentracing::Value::visit(value, StringMapper);
-}
-
-static inline bool isBaggageEmpty(const nostd::shared_ptr<opentelemetry::baggage::Baggage> &baggage)
-{
-  if (baggage)
-  {
-    return baggage->GetAllEntries([](nostd::string_view, nostd::string_view) { return false; });
-  }
-
-  return true;
-}
-
-class LinksIterable final : public opentelemetry::trace::SpanContextKeyValueIterable
-{
-public:
-  using RefsList =
-      std::vector<std::pair<opentracing::SpanReferenceType, const opentracing::SpanContext *>>;
-
-  explicit LinksIterable(const RefsList &refs) noexcept : refs_(refs) {}
-
-  bool ForEachKeyValue(nostd::function_ref<bool(opentelemetry::trace::SpanContext,
-                                                const opentelemetry::common::KeyValueIterable &)>
-                           callback) const noexcept override
-  {
-    using opentracing::SpanReferenceType;
-    using namespace opentelemetry::semconv;
-    using LinksList = std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>;
-
-    for (const auto &entry : refs_)
-    {
-      nostd::string_view span_kind;
-
-      if (entry.first == SpanReferenceType::ChildOfRef)
-      {
-        span_kind = opentracing::OpentracingRefTypeValues::kChildOf;
-      }
-      else if (entry.first == SpanReferenceType::FollowsFromRef)
-      {
-        span_kind = opentracing::OpentracingRefTypeValues::kFollowsFrom;
-      }
-
-      auto context_shim = SpanContextShim::extractFrom(entry.second);
-
-      if (context_shim && !span_kind.empty() &&
-          !callback(context_shim->context(), opentelemetry::common::KeyValueIterableView<LinksList>(
-                                                 {{opentracing::kOpentracingRefType, span_kind}})))
-      {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  size_t size() const noexcept override { return refs_.size(); }
-
-private:
-  const RefsList &refs_;
-};
-
-class TagsIterable final : public opentelemetry::common::KeyValueIterable
-{
-public:
-  explicit TagsIterable(
-      const std::vector<std::pair<std::string, opentracing::Value>> &tags) noexcept
-      : tags_(tags)
-  {}
-
-  bool ForEachKeyValue(nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>
-                           callback) const noexcept override
-  {
-    for (const auto &entry : tags_)
-    {
-      if (!callback(entry.first, utils::attributeFromValue(entry.second)))
-        return false;
-    }
-    return true;
-  }
-
-  size_t size() const noexcept override { return tags_.size(); }
-
-private:
-  const std::vector<std::pair<std::string, opentracing::Value>> &tags_;
-};
-
-opentelemetry::trace::StartSpanOptions makeOptionsShim(
-    const opentracing::StartSpanOptions &options) noexcept;
-LinksIterable makeIterableLinks(const opentracing::StartSpanOptions &options) noexcept;
-TagsIterable makeIterableTags(const opentracing::StartSpanOptions &options) noexcept;
-nostd::shared_ptr<opentelemetry::baggage::Baggage> makeBaggage(
-    const opentracing::StartSpanOptions &options) noexcept;
-
-}  // namespace utils
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/span_context_shim.h b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/span_context_shim.h
deleted file mode 100644
index 8eba4a637..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/span_context_shim.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <functional>
-#include <string>
-
-#include "opentracing/span.h"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-
-using BaggagePtr = nostd::shared_ptr<opentelemetry::baggage::Baggage>;
-
-class SpanContextShim final : public opentracing::SpanContext
-{
-public:
-  explicit SpanContextShim(const opentelemetry::trace::SpanContext &context,
-                           const BaggagePtr &baggage)
-      : context_(context), baggage_(baggage)
-  {}
-
-  inline const opentelemetry::trace::SpanContext &context() const { return context_; }
-  inline const BaggagePtr &baggage() const { return baggage_; }
-  SpanContextShim newWithKeyValue(nostd::string_view key, nostd::string_view value) const noexcept;
-  bool BaggageItem(nostd::string_view key, std::string &value) const noexcept;
-
-  using VisitBaggageItem = std::function<bool(const std::string &key, const std::string &value)>;
-  void ForeachBaggageItem(VisitBaggageItem f) const override;
-  std::unique_ptr<opentracing::SpanContext> Clone() const noexcept override;
-  std::string ToTraceID() const noexcept override;
-  std::string ToSpanID() const noexcept override;
-
-  static inline const SpanContextShim *extractFrom(const opentracing::SpanContext *span_context)
-  {
-#ifndef OPENTELEMETRY_RTTI_ENABLED
-    auto result = static_cast<const SpanContextShim *>(span_context);
-    return result && result->provides_context_and_baggage_ == kUniqueTag ? result : nullptr;
-#else
-    return dynamic_cast<const SpanContextShim *>(span_context);
-#endif
-  }
-
-private:
-  template <typename T>
-  static std::string toHexString(const T &id_item)
-  {
-    char buf[T::kSize * 2];
-    id_item.ToLowerBase16(buf);
-    return std::string(buf, sizeof(buf));
-  }
-
-  opentelemetry::trace::SpanContext context_;
-  BaggagePtr baggage_;
-
-#ifndef OPENTELEMETRY_RTTI_ENABLED
-  static constexpr uint64_t kUniqueTag   = 0x07e1ca578e57a71c;
-  uint64_t provides_context_and_baggage_ = kUniqueTag;
-#endif
-};
-
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/span_shim.h b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/span_shim.h
deleted file mode 100644
index f15a07f2d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/span_shim.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <initializer_list>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentracing/span.h"
-#include "opentracing/string_view.h"
-#include "opentracing/tracer.h"
-#include "opentracing/util.h"
-#include "opentracing/value.h"
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/opentracingshim/tracer_shim.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-
-using SpanPtr    = nostd::shared_ptr<opentelemetry::trace::Span>;
-using EventEntry = std::pair<opentracing::string_view, opentracing::Value>;
-
-class SpanShim : public opentracing::Span
-{
-public:
-  explicit SpanShim(const TracerShim &tracer, const SpanPtr &span, const BaggagePtr &baggage)
-      : tracer_(tracer), span_(span), context_(span->GetContext(), baggage)
-  {}
-
-  void handleError(const opentracing::Value &value) noexcept;
-
-  void FinishWithOptions(
-      const opentracing::FinishSpanOptions &finish_span_options) noexcept override;
-  void SetOperationName(opentracing::string_view name) noexcept override;
-  void SetTag(opentracing::string_view key, const opentracing::Value &value) noexcept override;
-  void SetBaggageItem(opentracing::string_view restricted_key,
-                      opentracing::string_view value) noexcept override;
-  std::string BaggageItem(opentracing::string_view restricted_key) const noexcept override;
-  void Log(std::initializer_list<EventEntry> fields) noexcept override;
-  void Log(opentracing::SystemTime timestamp,
-           std::initializer_list<EventEntry> fields) noexcept override;
-  void Log(opentracing::SystemTime timestamp,
-           const std::vector<EventEntry> &fields) noexcept override;
-  inline const opentracing::SpanContext &context() const noexcept override { return context_; }
-  inline const opentracing::Tracer &tracer() const noexcept override { return tracer_; }
-
-private:
-  void logImpl(nostd::span<const EventEntry> fields,
-               const opentracing::SystemTime *const timestamp) noexcept;
-
-  const TracerShim &tracer_;
-  SpanPtr span_;
-  SpanContextShim context_;
-  mutable opentelemetry::common::SpinLockMutex context_lock_;
-};
-
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/tracer_shim.h b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/tracer_shim.h
deleted file mode 100644
index fcce5a634..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/include/opentelemetry/opentracingshim/tracer_shim.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <iosfwd>
-#include <new>
-
-#include "opentracing/expected/expected.hpp"
-#include "opentracing/propagation.h"
-#include "opentracing/span.h"
-#include "opentracing/string_view.h"
-#include "opentracing/tracer.h"
-
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-
-using TracerPtr         = nostd::shared_ptr<opentelemetry::trace::Tracer>;
-using TracerProviderPtr = nostd::shared_ptr<opentelemetry::trace::TracerProvider>;
-using PropagatorPtr     = nostd::shared_ptr<opentelemetry::context::propagation::TextMapPropagator>;
-
-struct OpenTracingPropagators
-{
-  PropagatorPtr text_map;
-  PropagatorPtr http_headers;
-};
-
-class TracerShim : public opentracing::Tracer
-{
-public:
-  static inline std::shared_ptr<opentracing::Tracer> createTracerShim(
-      const TracerProviderPtr &provider = opentelemetry::trace::Provider::GetTracerProvider(),
-      const OpenTracingPropagators &propagators = {}) noexcept
-  {
-    // This operation MUST accept the following parameters:
-    // - An OpenTelemetry TracerProvider. This operation MUST use this TracerProvider to obtain a
-    //   Tracer with the name opentracing-shim along with the current shim library version.
-    // - OpenTelemetry Propagators to be used to perform injection and extraction for the
-    //   OpenTracing TextMap and HTTPHeaders formats. If not specified, no Propagator values will
-    //   be stored in the Shim, and the global OpenTelemetry TextMap propagator will be used for
-    //   both OpenTracing TextMap and HTTPHeaders formats.
-    return std::shared_ptr<opentracing::Tracer>(
-        new (std::nothrow) TracerShim(provider->GetTracer("opentracing-shim"), propagators));
-  }
-
-  std::unique_ptr<opentracing::Span> StartSpanWithOptions(
-      opentracing::string_view operation_name,
-      const opentracing::StartSpanOptions &options) const noexcept override;
-  opentracing::expected<void> Inject(const opentracing::SpanContext &sc,
-                                     std::ostream &writer) const override;
-  opentracing::expected<void> Inject(const opentracing::SpanContext &sc,
-                                     const opentracing::TextMapWriter &writer) const override;
-  opentracing::expected<void> Inject(const opentracing::SpanContext &sc,
-                                     const opentracing::HTTPHeadersWriter &writer) const override;
-  opentracing::expected<std::unique_ptr<opentracing::SpanContext>> Extract(
-      std::istream &reader) const override;
-  opentracing::expected<std::unique_ptr<opentracing::SpanContext>> Extract(
-      const opentracing::TextMapReader &reader) const override;
-  opentracing::expected<std::unique_ptr<opentracing::SpanContext>> Extract(
-      const opentracing::HTTPHeadersReader &reader) const override;
-  inline void Close() noexcept override { is_closed_ = true; }
-
-private:
-  explicit TracerShim(const TracerPtr &tracer, const OpenTracingPropagators &propagators)
-      : tracer_(tracer), propagators_(propagators)
-  {}
-
-  opentracing::expected<void> injectImpl(const opentracing::SpanContext &sc,
-                                         const opentracing::TextMapWriter &writer,
-                                         const PropagatorPtr &propagator) const;
-  opentracing::expected<std::unique_ptr<opentracing::SpanContext>> extractImpl(
-      const opentracing::TextMapReader &reader,
-      const PropagatorPtr &propagator) const;
-
-  TracerPtr tracer_;
-  OpenTracingPropagators propagators_;
-  bool is_closed_ = false;
-};
-
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/shim_utils.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/shim_utils.cc
deleted file mode 100644
index e3f6fc72c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/shim_utils.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <algorithm>
-#include <functional>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentracing/propagation.h"
-#include "opentracing/span.h"
-#include "opentracing/tracer.h"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/baggage/baggage_context.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/opentracingshim/shim_utils.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-namespace utils
-{
-
-opentelemetry::trace::StartSpanOptions makeOptionsShim(
-    const opentracing::StartSpanOptions &options) noexcept
-{
-  using opentracing::SpanReferenceType;
-  // If an explicit start timestamp is specified, a conversion MUST
-  // be done to match the OpenTracing and OpenTelemetry units.
-  opentelemetry::trace::StartSpanOptions options_shim;
-  options_shim.start_system_time =
-      opentelemetry::common::SystemTimestamp{options.start_system_timestamp};
-  options_shim.start_steady_time =
-      opentelemetry::common::SteadyTimestamp{options.start_steady_timestamp};
-
-  const auto &refs = options.references;
-  // If a list of Span references is specified...
-  if (!refs.empty())
-  {
-    const auto &first_child_of = std::find_if(
-        refs.cbegin(), refs.cend(),
-        [](const std::pair<SpanReferenceType, const opentracing::SpanContext *> &entry) {
-          return entry.first == SpanReferenceType::ChildOfRef;
-        });
-    // The first SpanContext with Child Of type in the entire list is used as parent,
-    // else the first SpanContext is used as parent
-    auto context = (first_child_of != refs.cend()) ? first_child_of->second : refs.cbegin()->second;
-
-    if (auto context_shim = SpanContextShim::extractFrom(context))
-    {
-      options_shim.parent = context_shim->context();
-    }
-  }
-
-  return options_shim;
-}
-
-LinksIterable makeIterableLinks(const opentracing::StartSpanOptions &options) noexcept
-{
-  return LinksIterable(options.references);
-}
-
-TagsIterable makeIterableTags(const opentracing::StartSpanOptions &options) noexcept
-{
-  return TagsIterable(options.tags);
-}
-
-nostd::shared_ptr<opentelemetry::baggage::Baggage> makeBaggage(
-    const opentracing::StartSpanOptions &options) noexcept
-{
-  using namespace opentelemetry::baggage;
-
-  std::unordered_map<std::string, std::string> baggage_items;
-  // If a list of Span references is specified...
-  for (const auto &entry : options.references)
-  {
-    // The union of their Baggage values MUST be used
-    // as the initial Baggage of the newly created Span.
-    entry.second->ForeachBaggageItem(
-        [&baggage_items](const std::string &key, const std::string &value) {
-          // It is unspecified which Baggage value is used in the case of repeated keys.
-          return baggage_items.emplace(key, value).second;
-        });
-  }
-  // If no such list of references is specified, the current Baggage
-  // MUST be used as the initial value of the newly created Span.
-  return baggage_items.empty() ? GetBaggage(opentelemetry::context::RuntimeContext::GetCurrent())
-                               : nostd::shared_ptr<Baggage>(new Baggage(baggage_items));
-}
-
-}  // namespace utils
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/span_context_shim.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/span_context_shim.cc
deleted file mode 100644
index 153d40154..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/span_context_shim.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <functional>
-#include <memory>
-#include <new>
-#include <string>
-
-#include "opentracing/span.h"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-
-SpanContextShim SpanContextShim::newWithKeyValue(nostd::string_view key,
-                                                 nostd::string_view value) const noexcept
-{
-  return SpanContextShim{context_, baggage_->Set(key, value)};
-}
-
-bool SpanContextShim::BaggageItem(nostd::string_view key, std::string &value) const noexcept
-{
-  return baggage_->GetValue(key, value);
-}
-
-void SpanContextShim::ForeachBaggageItem(VisitBaggageItem f) const
-{
-  baggage_->GetAllEntries([&f](nostd::string_view key, nostd::string_view value) {
-    return f(std::string{key.data(), key.size()}, std::string{value.data(), value.size()});
-  });
-}
-
-std::unique_ptr<opentracing::SpanContext> SpanContextShim::Clone() const noexcept
-{
-  return std::unique_ptr<SpanContextShim>(new (std::nothrow) SpanContextShim(context_, baggage_));
-}
-
-std::string SpanContextShim::ToTraceID() const noexcept
-{
-  return toHexString(context_.trace_id());
-}
-
-std::string SpanContextShim::ToSpanID() const noexcept
-{
-  return toHexString(context_.span_id());
-}
-
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/span_shim.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/span_shim.cc
deleted file mode 100644
index 6bbac7ee8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/span_shim.cc
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <algorithm>
-#include <initializer_list>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentracing/ext/tags.h"
-#include "opentracing/span.h"
-#include "opentracing/string_view.h"
-#include "opentracing/util.h"
-#include "opentracing/value.h"
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/opentracingshim/shim_utils.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/opentracingshim/span_shim.h"
-#include "opentelemetry/semconv/exception_attributes.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-
-void SpanShim::handleError(const opentracing::Value &value) noexcept
-{
-  using opentelemetry::trace::StatusCode;
-  // The error tag MUST be mapped to StatusCode:
-  const auto &error_tag = utils::stringFromValue(value);
-  // - no value being set maps to Unset.
-  auto code = StatusCode::kUnset;
-
-  if (error_tag == "true")  // - true maps to Error.
-  {
-    code = StatusCode::kError;
-  }
-  else if (error_tag == "false")  // - false maps to Ok.
-  {
-    code = StatusCode::kOk;
-  }
-
-  span_->SetStatus(code);
-}
-
-void SpanShim::FinishWithOptions(const opentracing::FinishSpanOptions &finish_span_options) noexcept
-{
-  // If an explicit timestamp is specified, a conversion MUST
-  // be done to match the OpenTracing and OpenTelemetry units.
-  span_->End({{finish_span_options.finish_steady_timestamp}});
-}
-
-void SpanShim::SetOperationName(opentracing::string_view name) noexcept
-{
-  span_->UpdateName(nostd::string_view{name.data(), name.size()});
-}
-
-void SpanShim::SetTag(opentracing::string_view key, const opentracing::Value &value) noexcept
-{
-  // Calls Set Attribute on the underlying OpenTelemetry Span with the specified key/value pair.
-  if (key == opentracing::ext::error)
-  {
-    handleError(value);
-  }
-  else
-  {
-    auto key_view = nostd::string_view{key.data(), key.size()};
-    span_->SetAttribute(key_view, utils::attributeFromValue(value));
-  }
-}
-
-void SpanShim::SetBaggageItem(opentracing::string_view restricted_key,
-                              opentracing::string_view value) noexcept
-{
-  // Creates a new SpanContext Shim with a new OpenTelemetry Baggage containing the specified
-  // Baggage key/value pair, and sets it as the current instance for this Span Shim.
-  if (restricted_key.empty() || value.empty())
-    return;
-  auto restricted_key_view = nostd::string_view{restricted_key.data(), restricted_key.size()};
-  auto value_view          = nostd::string_view{value.data(), value.size()};
-  // This operation MUST be safe to be called concurrently.
-  const std::lock_guard<decltype(context_lock_)> guard(context_lock_);
-  context_ = context_.newWithKeyValue(restricted_key_view, value_view);
-}
-
-std::string SpanShim::BaggageItem(opentracing::string_view restricted_key) const noexcept
-{
-  // Returns the value for the specified key in the OpenTelemetry Baggage
-  // of the current SpanContext Shim, or null if none exists.
-  if (restricted_key.empty())
-    return "";
-  // This operation MUST be safe to be called concurrently.
-  const std::lock_guard<decltype(context_lock_)> guard(context_lock_);
-  std::string value;
-  auto restricted_key_view = nostd::string_view{restricted_key.data(), restricted_key.size()};
-  return context_.BaggageItem(restricted_key_view, value) ? value : "";
-}
-
-void SpanShim::Log(std::initializer_list<EventEntry> fields) noexcept
-{
-  // If an explicit timestamp is specified, a conversion MUST
-  // be done to match the OpenTracing and OpenTelemetry units.
-  logImpl(fields, nullptr);
-}
-
-void SpanShim::Log(opentracing::SystemTime timestamp,
-                   std::initializer_list<EventEntry> fields) noexcept
-{
-  // If an explicit timestamp is specified, a conversion MUST
-  // be done to match the OpenTracing and OpenTelemetry units.
-  logImpl(fields, &timestamp);
-}
-
-void SpanShim::Log(opentracing::SystemTime timestamp,
-                   const std::vector<EventEntry> &fields) noexcept
-{
-  // If an explicit timestamp is specified, a conversion MUST
-  // be done to match the OpenTracing and OpenTelemetry units.
-  logImpl(fields, &timestamp);
-}
-
-void SpanShim::logImpl(nostd::span<const EventEntry> fields,
-                       const opentracing::SystemTime *const timestamp) noexcept
-{
-  // The Add Event's name parameter MUST be the value with the event key
-  // in the pair set, or else fallback to use the log literal string.
-  const auto &event = std::find_if(fields.begin(), fields.end(),
-                                   [](const EventEntry &item) { return item.first == "event"; });
-  auto name = (event != fields.end()) ? utils::stringFromValue(event->second) : std::string{"log"};
-  // If pair set contains an event=error entry, the values MUST be mapped to an Event
-  // with the conventions outlined in the Exception semantic conventions document:
-  bool is_error = (name == opentracing::ext::error);
-  // A call to AddEvent is performed with name being set to exception
-  if (is_error)
-    name = "exception";
-  // Along the specified key/value pair set as additional event attributes...
-  std::vector<std::pair<nostd::string_view, common::AttributeValue>> attributes;
-  attributes.reserve(fields.size());
-
-  for (const auto &entry : fields)
-  {
-    nostd::string_view key{entry.first.data(), entry.first.size()};
-    // ... including mapping of the following key/value pairs:
-    if (is_error)
-    {
-      if (key == "error.kind")  // - error.kind maps to exception.type.
-      {
-        key = opentelemetry::semconv::exception::kExceptionType;
-      }
-      else if (key == "message")  // - message maps to exception.message.
-      {
-        key = opentelemetry::semconv::exception::kExceptionMessage;
-      }
-      else if (key == "stack")  // - stack maps to exception.stacktrace.
-      {
-        key = opentelemetry::semconv::exception::kExceptionStacktrace;
-      }
-    }
-
-    attributes.emplace_back(key, utils::attributeFromValue(entry.second));
-  }
-
-  // Calls Add Events on the underlying OpenTelemetry Span with the specified key/value pair set.
-  if (timestamp)
-  {
-    span_->AddEvent(name, *timestamp, attributes);
-  }
-  else
-  {
-    span_->AddEvent(name, attributes);
-  }
-}
-
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/tracer_shim.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/tracer_shim.cc
deleted file mode 100644
index 8c1ae8328..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/src/tracer_shim.cc
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <algorithm>
-#include <iosfwd>
-#include <new>
-#include <string>
-#include <system_error>
-#include <utility>
-#include <vector>
-
-#include "opentracing/expected/expected.hpp"
-#include "opentracing/ext/tags.h"
-#include "opentracing/propagation.h"
-#include "opentracing/span.h"
-#include "opentracing/string_view.h"
-#include "opentracing/tracer.h"
-#include "opentracing/value.h"
-
-#include "opentelemetry/baggage/baggage_context.h"
-#include "opentelemetry/context/propagation/global_propagator.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/opentracingshim/propagation.h"
-#include "opentelemetry/opentracingshim/shim_utils.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/opentracingshim/span_shim.h"
-#include "opentelemetry/opentracingshim/tracer_shim.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace opentracingshim
-{
-
-std::unique_ptr<opentracing::Span> TracerShim::StartSpanWithOptions(
-    opentracing::string_view operation_name,
-    const opentracing::StartSpanOptions &options) const noexcept
-{
-  if (is_closed_)
-    return nullptr;
-
-  const auto &opts         = utils::makeOptionsShim(options);
-  const auto &links        = utils::makeIterableLinks(options);
-  const auto &attributes   = utils::makeIterableTags(options);
-  const auto &baggage      = utils::makeBaggage(options);
-  auto operation_name_view = nostd::string_view{operation_name.data(), operation_name.size()};
-  auto span                = tracer_->StartSpan(operation_name_view, attributes, links, opts);
-  auto span_shim           = new (std::nothrow) SpanShim(*this, span, baggage);
-
-  // If an initial set of tags is specified and the OpenTracing error tag
-  // is included after the OpenTelemetry Span was created.
-  const auto &error_entry =
-      std::find_if(options.tags.cbegin(), options.tags.cend(),
-                   [](const std::pair<std::string, opentracing::v3::Value> &entry) {
-                     return entry.first == opentracing::ext::error;
-                   });
-  // The Shim layer MUST perform the same error handling as described in the Set Tag operation
-  if (span_shim && error_entry != options.tags.cend())
-  {
-    span_shim->handleError(error_entry->second);
-  }
-
-  return std::unique_ptr<opentracing::Span>(span_shim);
-}
-
-opentracing::expected<void> TracerShim::Inject(const opentracing::SpanContext &,
-                                               std::ostream &) const
-{
-  // Errors MAY be raised if the specified Format is not recognized,
-  // depending on the specific OpenTracing Language API.
-  return opentracing::make_unexpected(opentracing::invalid_carrier_error);
-}
-
-opentracing::expected<void> TracerShim::Inject(const opentracing::SpanContext &sc,
-                                               const opentracing::TextMapWriter &writer) const
-{
-  // TextMap and HttpHeaders formats MUST use their explicitly specified TextMapPropagator,
-  // if any, or else use the global TextMapPropagator.
-  const auto &propagator =
-      propagators_.text_map
-          ? propagators_.text_map
-          : opentelemetry::context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-
-  return injectImpl(sc, writer, propagator);
-}
-
-opentracing::expected<void> TracerShim::Inject(const opentracing::SpanContext &sc,
-                                               const opentracing::HTTPHeadersWriter &writer) const
-{
-  // TextMap and HttpHeaders formats MUST use their explicitly specified TextMapPropagator,
-  // if any, or else use the global TextMapPropagator.
-  const auto &propagator =
-      propagators_.http_headers
-          ? propagators_.http_headers
-          : opentelemetry::context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-
-  return injectImpl(sc, writer, propagator);
-}
-
-opentracing::expected<std::unique_ptr<opentracing::SpanContext>> TracerShim::Extract(
-    std::istream &) const
-{
-  // Errors MAY be raised if either the Format is not recognized or no value
-  // could be extracted, depending on the specific OpenTracing Language API.
-  return opentracing::make_unexpected(opentracing::invalid_carrier_error);
-}
-
-opentracing::expected<std::unique_ptr<opentracing::SpanContext>> TracerShim::Extract(
-    const opentracing::TextMapReader &reader) const
-{
-  // TextMap and HttpHeaders formats MUST use their explicitly specified TextMapPropagator,
-  // if any, or else use the global TextMapPropagator.
-  const auto &propagator =
-      propagators_.text_map
-          ? propagators_.text_map
-          : opentelemetry::context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-
-  return extractImpl(reader, propagator);
-}
-
-opentracing::expected<std::unique_ptr<opentracing::SpanContext>> TracerShim::Extract(
-    const opentracing::HTTPHeadersReader &reader) const
-{
-  // TextMap and HttpHeaders formats MUST use their explicitly specified TextMapPropagator,
-  // if any, or else use the global TextMapPropagator.
-  const auto &propagator =
-      propagators_.http_headers
-          ? propagators_.http_headers
-          : opentelemetry::context::propagation::GlobalTextMapPropagator::GetGlobalPropagator();
-
-  return extractImpl(reader, propagator);
-}
-
-opentracing::expected<void> TracerShim::injectImpl(const opentracing::SpanContext &sc,
-                                                   const opentracing::TextMapWriter &writer,
-                                                   const PropagatorPtr &propagator) const
-{
-  // Inject the underlying OpenTelemetry Span and Baggage using either the explicitly registered
-  // or the global OpenTelemetry Propagators, as configured at construction time.
-  if (auto context_shim = SpanContextShim::extractFrom(&sc))
-  {
-    auto current_context = opentelemetry::context::RuntimeContext::GetCurrent();
-
-    // Inject dummy span to provide SpanContext information
-    auto span_context = opentelemetry::trace::SpanContext(
-        context_shim->context().trace_id(), context_shim->context().span_id(),
-        context_shim->context().trace_flags(), false);
-    opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> sp{
-        new opentelemetry::trace::DefaultSpan(span_context)};
-    auto context_with_span = opentelemetry::trace::SetSpan(current_context, sp);
-
-    // Inject any non-empty Baggage
-    const auto &context_with_span_baggage =
-        opentelemetry::baggage::SetBaggage(context_with_span, context_shim->baggage());
-
-    CarrierWriterShim carrier{writer};
-    propagator->Inject(carrier, context_with_span_baggage);
-    return opentracing::make_expected();
-  }
-
-  return opentracing::make_unexpected(opentracing::invalid_span_context_error);
-}
-
-opentracing::expected<std::unique_ptr<opentracing::SpanContext>> TracerShim::extractImpl(
-    const opentracing::TextMapReader &reader,
-    const PropagatorPtr &propagator) const
-{
-  // Extract the underlying OpenTelemetry Span and Baggage using either the explicitly registered
-  // or the global OpenTelemetry Propagators, as configured at construction time.
-  CarrierReaderShim carrier{reader};
-  auto current_context = opentelemetry::context::RuntimeContext::GetCurrent();
-  auto context         = propagator->Extract(carrier, current_context);
-  auto span_context    = opentelemetry::trace::GetSpan(context)->GetContext();
-  auto baggage         = opentelemetry::baggage::GetBaggage(context);
-
-  // The operation MUST return a `SpanContext` Shim instance with the extracted values if any of
-  // these conditions are met:
-  // * `SpanContext` is valid.
-  // * `SpanContext` is sampled.
-  // * `SpanContext` contains non-empty extracted `Baggage`.
-  // Otherwise, the operation MUST return null or empty value.
-  SpanContextShim *context_shim =
-      (!span_context.IsValid() && !span_context.IsSampled() && utils::isBaggageEmpty(baggage))
-          ? nullptr
-          : new (std::nothrow) SpanContextShim(span_context, baggage);
-
-  // Note: Invalid but sampled `SpanContext` instances are returned as a way to support
-  // jaeger-debug-id headers (https://github.com/jaegertracing/jaeger-client-java#via-http-headers)
-  // which are used to force propagation of debug information.
-  return opentracing::make_expected(std::unique_ptr<opentracing::SpanContext>(context_shim));
-}
-
-}  // namespace opentracingshim
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/propagation_test.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/propagation_test.cc
deleted file mode 100644
index 497f0eb0a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/propagation_test.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <string>
-#include <system_error>
-#include <unordered_map>
-#include <vector>
-
-#include "opentracing/expected/expected.hpp"
-#include "opentracing/propagation.h"
-#include "opentracing/string_view.h"
-#include "opentracing/util.h"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/opentracingshim/propagation.h"
-
-#include "shim_mocks.h"
-
-namespace baggage = opentelemetry::baggage;
-namespace common  = opentelemetry::common;
-namespace nostd   = opentelemetry::nostd;
-namespace shim    = opentelemetry::opentracingshim;
-
-TEST(PropagationTest, TextMapReader_Get_LookupKey_Unsupported)
-{
-  std::unordered_map<std::string, std::string> text_map;
-  TextMapCarrier testee{text_map};
-  ASSERT_FALSE(testee.supports_lookup);
-  ASSERT_EQ(testee.foreach_key_call_count, 0);
-
-  shim::CarrierReaderShim tester{testee};
-  auto lookup_unsupported = testee.LookupKey("foo");
-  ASSERT_TRUE(text_map.empty());
-  ASSERT_TRUE(opentracing::are_errors_equal(lookup_unsupported.error(),
-                                            opentracing::lookup_key_not_supported_error));
-  ASSERT_EQ(tester.Get("foo"), nostd::string_view{});
-  ASSERT_EQ(testee.foreach_key_call_count, 1);
-
-  text_map["foo"]               = "bar";
-  auto lookup_still_unsupported = testee.LookupKey("foo");
-  ASSERT_FALSE(text_map.empty());
-  ASSERT_TRUE(opentracing::are_errors_equal(lookup_still_unsupported.error(),
-                                            opentracing::lookup_key_not_supported_error));
-  ASSERT_EQ(tester.Get("foo"), nostd::string_view{"bar"});
-  ASSERT_EQ(testee.foreach_key_call_count, 2);
-}
-
-TEST(PropagationTest, TextMapReader_Get_LookupKey_Supported)
-{
-  std::unordered_map<std::string, std::string> text_map;
-  TextMapCarrier testee{text_map};
-  testee.supports_lookup = true;
-  ASSERT_TRUE(testee.supports_lookup);
-  ASSERT_EQ(testee.foreach_key_call_count, 0);
-
-  shim::CarrierReaderShim tester{testee};
-  auto lookup_not_found = testee.LookupKey("foo");
-  ASSERT_TRUE(text_map.empty());
-  ASSERT_TRUE(
-      opentracing::are_errors_equal(lookup_not_found.error(), opentracing::key_not_found_error));
-  ASSERT_EQ(tester.Get("foo"), nostd::string_view{});
-  ASSERT_EQ(testee.foreach_key_call_count, 1);
-
-  text_map["foo"]   = "bar";
-  auto lookup_found = testee.LookupKey("foo");
-  ASSERT_FALSE(text_map.empty());
-  ASSERT_EQ(lookup_found.value(), opentracing::string_view{"bar"});
-  ASSERT_EQ(tester.Get("foo"), nostd::string_view{"bar"});
-  ASSERT_EQ(testee.foreach_key_call_count, 1);
-}
-
-TEST(PropagationTest, TextMapReader_Keys)
-{
-  std::unordered_map<std::string, std::string> text_map;
-  TextMapCarrier testee{text_map};
-  ASSERT_EQ(testee.foreach_key_call_count, 0);
-
-  shim::CarrierReaderShim tester{testee};
-  std::vector<nostd::string_view> kvs;
-  auto callback = [&text_map, &kvs](nostd::string_view k) {
-    kvs.emplace_back(k);
-    return !text_map.empty();
-  };
-
-  ASSERT_TRUE(tester.Keys(callback));
-  ASSERT_TRUE(text_map.empty());
-  ASSERT_TRUE(kvs.empty());
-  ASSERT_EQ(testee.foreach_key_call_count, 1);
-
-  text_map["foo"] = "bar";
-  text_map["bar"] = "baz";
-  text_map["baz"] = "foo";
-  ASSERT_TRUE(tester.Keys(callback));
-  ASSERT_FALSE(text_map.empty());
-  ASSERT_EQ(text_map.size(), kvs.size());
-  ASSERT_EQ(testee.foreach_key_call_count, 2);
-}
-
-TEST(PropagationTest, TextMapWriter_Set)
-{
-  std::unordered_map<std::string, std::string> text_map;
-  TextMapCarrier testee{text_map};
-  shim::CarrierWriterShim tester{testee};
-  ASSERT_TRUE(text_map.empty());
-
-  tester.Set("foo", "bar");
-  tester.Set("bar", "baz");
-  tester.Set("baz", "foo");
-  ASSERT_EQ(text_map.size(), 3);
-  ASSERT_EQ(text_map["foo"], "bar");
-  ASSERT_EQ(text_map["bar"], "baz");
-  ASSERT_EQ(text_map["baz"], "foo");
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/shim_mocks.h b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/shim_mocks.h
deleted file mode 100644
index 485e16623..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/shim_mocks.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <tuple>
-#include <unordered_map>
-
-#include "opentracing/propagation.h"
-
-#include "opentelemetry/baggage/baggage_context.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-namespace trace_api = opentelemetry::trace;
-namespace baggage   = opentelemetry::baggage;
-namespace common    = opentelemetry::common;
-namespace context   = opentelemetry::context;
-namespace nostd     = opentelemetry::nostd;
-
-struct MockSpan final : public trace_api::Span
-{
-  void SetAttribute(nostd::string_view key, const common::AttributeValue &value) noexcept override
-  {
-    attribute_ = {key.data(), value};
-  }
-
-  void AddEvent(nostd::string_view name,
-                common::SystemTimestamp timestamp,
-                const common::KeyValueIterable &attributes) noexcept override
-  {
-    std::unordered_map<std::string, common::AttributeValue> attribute_map;
-    attribute_map.reserve(attributes.size());
-    attributes.ForEachKeyValue(
-        [&attribute_map](nostd::string_view key, const common::AttributeValue &value) {
-          attribute_map.emplace(key.data(), value);
-          return true;
-        });
-    event_ = {name.data(), timestamp, attribute_map};
-  }
-
-  void AddEvent(nostd::string_view name,
-                const common::KeyValueIterable &attributes) noexcept override
-  {
-    AddEvent(name, {}, attributes);
-  }
-
-  void AddEvent(nostd::string_view, common::SystemTimestamp) noexcept override {}
-
-  void AddEvent(nostd::string_view) noexcept override {}
-
-  void SetStatus(trace_api::StatusCode code, nostd::string_view description) noexcept override
-  {
-    status_ = {code, description.data()};
-  }
-
-  void UpdateName(nostd::string_view name) noexcept override { name_ = name.data(); }
-
-  void End(const trace_api::EndSpanOptions &options) noexcept override { options_ = options; }
-
-  bool IsRecording() const noexcept override { return false; }
-
-  trace_api::SpanContext GetContext() const noexcept override
-  {
-    return trace_api::SpanContext(false, false);
-  }
-
-  std::pair<std::string, common::AttributeValue> attribute_;
-  std::tuple<std::string,
-             common::SystemTimestamp,
-             std::unordered_map<std::string, common::AttributeValue>>
-      event_;
-  std::pair<trace_api::StatusCode, std::string> status_;
-  std::string name_;
-  trace_api::EndSpanOptions options_;
-};
-
-struct MockTracer final : public trace_api::Tracer
-{
-  nostd::shared_ptr<trace_api::Span> StartSpan(
-      nostd::string_view name,
-      const common::KeyValueIterable &,
-      const trace_api::SpanContextKeyValueIterable &,
-      const trace_api::StartSpanOptions &) noexcept override
-  {
-    span_        = new MockSpan();
-    span_->name_ = std::string{name};
-    return nostd::shared_ptr<trace_api::Span>(span_);
-  }
-
-  void ForceFlushWithMicroseconds(uint64_t) noexcept override {}
-
-  void CloseWithMicroseconds(uint64_t) noexcept override {}
-
-  MockSpan *span_;
-};
-
-struct MockTracerProvider final : public trace_api::TracerProvider
-{
-  nostd::shared_ptr<trace_api::Tracer> GetTracer(nostd::string_view library_name,
-                                                 nostd::string_view,
-                                                 nostd::string_view) noexcept override
-  {
-    library_name_ = std::string{library_name};
-    tracer_       = new MockTracer();
-    return nostd::shared_ptr<trace_api::Tracer>(tracer_);
-  }
-
-  std::string library_name_;
-  MockTracer *tracer_;
-};
-
-struct MockPropagator : public context::propagation::TextMapPropagator
-{
-  static constexpr const char *kTraceIdKey    = "trace_id";
-  static constexpr const char *kSpanIdKey     = "span_id";
-  static constexpr const char *kTraceFlagsKey = "trace_flags_id";
-
-  template <class T, int N>
-  static inline std::string ToLowerBase16(const T &id)
-  {
-    char buf[N] = {0};
-    id.ToLowerBase16(buf);
-    return std::string(buf, sizeof(buf));
-  }
-
-  // Returns the context that is stored in the carrier with the TextMapCarrier as extractor.
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    std::vector<std::pair<std::string, std::string>> kvs;
-    carrier.Keys([&carrier, &kvs](nostd::string_view k) {
-      kvs.emplace_back(k, carrier.Get(k));
-      return true;
-    });
-    is_extracted = true;
-    return baggage::SetBaggage(context,
-                               nostd::shared_ptr<baggage::Baggage>(new baggage::Baggage(kvs)));
-  }
-
-  // Sets the context for carrier with self defined rules.
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    auto baggage = baggage::GetBaggage(context);
-    baggage->GetAllEntries([&carrier](nostd::string_view k, nostd::string_view v) {
-      carrier.Set(k, v);
-      return true;
-    });
-
-    auto span_key_value = context.GetValue(trace_api::kSpanKey);
-    if (nostd::holds_alternative<nostd::shared_ptr<trace_api::Span>>(span_key_value))
-    {
-      auto span = nostd::get<nostd::shared_ptr<trace_api::Span>>(span_key_value);
-      if (span)
-      {
-        // Store span context information in TextMapCarrier to allow verifying propagation
-        auto span_context = span->GetContext();
-        carrier.Set(kTraceIdKey, ToLowerBase16<trace_api::TraceId, 2 * trace_api::TraceId::kSize>(
-                                     span_context.trace_id()));
-        carrier.Set(kSpanIdKey, ToLowerBase16<trace_api::SpanId, 2 * trace_api::SpanId::kSize>(
-                                    span_context.span_id()));
-        carrier.Set(kTraceFlagsKey,
-                    ToLowerBase16<trace_api::TraceFlags, 2>(span_context.trace_flags()));
-      }
-    }
-
-    is_injected = true;
-  }
-
-  // Gets the fields set in the carrier by the `inject` method
-  bool Fields(nostd::function_ref<bool(nostd::string_view)>) const noexcept override
-  {
-    return true;
-  }
-
-  bool is_extracted = false;
-  bool is_injected  = false;
-};
-
-struct TextMapCarrier : opentracing::TextMapReader, opentracing::TextMapWriter
-{
-  TextMapCarrier(std::unordered_map<std::string, std::string> &text_map_) : text_map(text_map_) {}
-
-  opentracing::expected<void> Set(opentracing::string_view key,
-                                  opentracing::string_view value) const override
-  {
-    text_map[key] = value;
-    return {};
-  }
-
-  opentracing::expected<opentracing::string_view> LookupKey(
-      opentracing::string_view key) const override
-  {
-    if (!supports_lookup)
-    {
-      return opentracing::make_unexpected(opentracing::lookup_key_not_supported_error);
-    }
-    auto iter = text_map.find(key);
-    if (iter != text_map.end())
-    {
-      return opentracing::string_view{iter->second};
-    }
-    else
-    {
-      return opentracing::make_unexpected(opentracing::key_not_found_error);
-    }
-  }
-
-  opentracing::expected<void> ForeachKey(
-      std::function<opentracing::expected<void>(opentracing::string_view key,
-                                                opentracing::string_view value)> f) const override
-  {
-    ++foreach_key_call_count;
-    for (const auto &key_value : text_map)
-    {
-      auto result = f(key_value.first, key_value.second);
-      if (!result)
-        return result;
-    }
-    return {};
-  }
-
-  bool supports_lookup               = false;
-  mutable int foreach_key_call_count = 0;
-  std::unordered_map<std::string, std::string> &text_map;
-};
-
-struct HTTPHeadersCarrier : opentracing::HTTPHeadersReader, opentracing::HTTPHeadersWriter
-{
-  HTTPHeadersCarrier(std::unordered_map<std::string, std::string> &text_map_) : text_map(text_map_)
-  {}
-
-  opentracing::expected<void> Set(opentracing::string_view key,
-                                  opentracing::string_view value) const override
-  {
-    text_map[key] = value;
-    return {};
-  }
-
-  opentracing::expected<void> ForeachKey(
-      std::function<opentracing::expected<void>(opentracing::string_view key,
-                                                opentracing::string_view value)> f) const override
-  {
-    for (const auto &key_value : text_map)
-    {
-      auto result = f(key_value.first, key_value.second);
-      if (!result)
-        return result;
-    }
-    return {};
-  }
-
-  std::unordered_map<std::string, std::string> &text_map;
-};
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/shim_utils_test.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/shim_utils_test.cc
deleted file mode 100644
index 6af28d60c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/shim_utils_test.cc
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <algorithm>
-#include <chrono>
-#include <map>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "opentracing/propagation.h"
-#include "opentracing/span.h"
-#include "opentracing/string_view.h"
-#include "opentracing/tracer.h"
-#include "opentracing/util.h"
-#include "opentracing/value.h"
-#include "opentracing/variant/recursive_wrapper.hpp"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/baggage/baggage_context.h"
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/opentracingshim/shim_utils.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_startoptions.h"
-
-#include "shim_mocks.h"
-
-namespace trace_api = opentelemetry::trace;
-namespace baggage   = opentelemetry::baggage;
-namespace common    = opentelemetry::common;
-namespace nostd     = opentelemetry::nostd;
-namespace shim      = opentelemetry::opentracingshim;
-
-TEST(ShimUtilsTest, IsBaggageEmpty)
-{
-  auto none = nostd::shared_ptr<baggage::Baggage>(nullptr);
-  ASSERT_TRUE(shim::utils::isBaggageEmpty(none));
-
-  auto empty = nostd::shared_ptr<baggage::Baggage>(new baggage::Baggage({}));
-  ASSERT_TRUE(shim::utils::isBaggageEmpty(empty));
-
-  std::map<std::string, std::string> list{{"foo", "bar"}};
-  auto non_empty = nostd::shared_ptr<baggage::Baggage>(new baggage::Baggage(list));
-  ASSERT_FALSE(shim::utils::isBaggageEmpty(non_empty));
-}
-
-TEST(ShimUtilsTest, StringFromValue)
-{
-  ASSERT_EQ(shim::utils::stringFromValue(true), "true");
-  ASSERT_EQ(shim::utils::stringFromValue(false), "false");
-  ASSERT_EQ(shim::utils::stringFromValue(1234.567890), "1234.567890");
-  ASSERT_EQ(shim::utils::stringFromValue(42l), "42");
-  ASSERT_EQ(shim::utils::stringFromValue(55ul), "55");
-  ASSERT_EQ(shim::utils::stringFromValue(std::string{"a string"}), "a string");
-  ASSERT_EQ(shim::utils::stringFromValue(opentracing::string_view{"a string view"}),
-            "a string view");
-  ASSERT_EQ(shim::utils::stringFromValue(nullptr), "");
-  ASSERT_EQ(shim::utils::stringFromValue("a char ptr"), "a char ptr");
-
-  opentracing::util::recursive_wrapper<opentracing::Values> values{};
-  ASSERT_EQ(shim::utils::stringFromValue(values.get()), "");
-
-  opentracing::util::recursive_wrapper<opentracing::Dictionary> dict{};
-  ASSERT_EQ(shim::utils::stringFromValue(dict.get()), "");
-}
-
-TEST(ShimUtilsTest, AttributeFromValue)
-{
-  auto value = shim::utils::attributeFromValue(true);
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeBool);
-  ASSERT_TRUE(nostd::get<bool>(value));
-
-  value = shim::utils::attributeFromValue(false);
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeBool);
-  ASSERT_FALSE(nostd::get<bool>(value));
-
-  value = shim::utils::attributeFromValue(1234.567890);
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeDouble);
-  ASSERT_EQ(nostd::get<double>(value), 1234.567890);
-
-  value = shim::utils::attributeFromValue(42l);
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeInt64);
-  ASSERT_EQ(nostd::get<int64_t>(value), 42l);
-
-  value = shim::utils::attributeFromValue(55ul);
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeUInt64);
-  ASSERT_EQ(nostd::get<uint64_t>(value), 55ul);
-
-  opentracing::Value str{std::string{"a string"}};
-  value = shim::utils::attributeFromValue(str);
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeString);
-  ASSERT_EQ(nostd::get<nostd::string_view>(value), nostd::string_view{"a string"});
-
-  value = shim::utils::attributeFromValue(opentracing::string_view{"a string view"});
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeString);
-  ASSERT_EQ(nostd::get<nostd::string_view>(value), nostd::string_view{"a string view"});
-
-  value = shim::utils::attributeFromValue(nullptr);
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeString);
-  ASSERT_EQ(nostd::get<nostd::string_view>(value), nostd::string_view{});
-
-  value = shim::utils::attributeFromValue("a char ptr");
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeCString);
-  ASSERT_EQ(nostd::get<const char *>(value), "a char ptr");
-
-  opentracing::util::recursive_wrapper<opentracing::Values> values{};
-  value = shim::utils::attributeFromValue(values.get());
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeString);
-  ASSERT_EQ(nostd::get<nostd::string_view>(value), nostd::string_view{});
-
-  opentracing::util::recursive_wrapper<opentracing::Dictionary> dict{};
-  value = shim::utils::attributeFromValue(dict.get());
-  ASSERT_EQ(value.index(), common::AttributeType::kTypeString);
-  ASSERT_EQ(nostd::get<nostd::string_view>(value), nostd::string_view{});
-}
-
-TEST(ShimUtilsTest, MakeOptionsShim_EmptyRefs)
-{
-  opentracing::StartSpanOptions options;
-  options.start_system_timestamp = opentracing::SystemTime::time_point::clock::now();
-  options.start_steady_timestamp = opentracing::SteadyTime::time_point::clock::now();
-
-  auto options_shim = shim::utils::makeOptionsShim(options);
-  ASSERT_EQ(options_shim.start_system_time,
-            common::SystemTimestamp{options.start_system_timestamp});
-  ASSERT_EQ(options_shim.start_steady_time,
-            common::SteadyTimestamp{options.start_steady_timestamp});
-  ASSERT_EQ(nostd::get<trace_api::SpanContext>(options_shim.parent),
-            trace_api::SpanContext::GetInvalid());
-}
-
-TEST(ShimUtilsTest, MakeOptionsShim_InvalidSpanContext)
-{
-  opentracing::StartSpanOptions options;
-  options.start_system_timestamp = opentracing::SystemTime::time_point::clock::now();
-  options.start_steady_timestamp = opentracing::SteadyTime::time_point::clock::now();
-  options.references             = {{opentracing::SpanReferenceType::FollowsFromRef, nullptr}};
-
-  auto options_shim = shim::utils::makeOptionsShim(options);
-  ASSERT_EQ(options_shim.start_system_time,
-            common::SystemTimestamp{options.start_system_timestamp});
-  ASSERT_EQ(options_shim.start_steady_time,
-            common::SteadyTimestamp{options.start_steady_timestamp});
-  ASSERT_EQ(nostd::get<trace_api::SpanContext>(options_shim.parent),
-            trace_api::SpanContext::GetInvalid());
-}
-
-TEST(ShimUtilsTest, MakeOptionsShim_FirstChildOf)
-{
-  auto span_context_shim = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-      trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
-  auto span_context      = static_cast<opentracing::SpanContext *>(span_context_shim.get());
-
-  opentracing::StartSpanOptions options;
-  options.start_system_timestamp = opentracing::SystemTime::time_point::clock::now();
-  options.start_steady_timestamp = opentracing::SteadyTime::time_point::clock::now();
-  options.references             = {{opentracing::SpanReferenceType::FollowsFromRef, nullptr},
-                                    {opentracing::SpanReferenceType::ChildOfRef, span_context},
-                                    {opentracing::SpanReferenceType::ChildOfRef, nullptr}};
-
-  auto options_shim = shim::utils::makeOptionsShim(options);
-  ASSERT_EQ(options_shim.start_system_time,
-            common::SystemTimestamp{options.start_system_timestamp});
-  ASSERT_EQ(options_shim.start_steady_time,
-            common::SteadyTimestamp{options.start_steady_timestamp});
-  ASSERT_EQ(nostd::get<trace_api::SpanContext>(options_shim.parent), span_context_shim->context());
-}
-
-TEST(ShimUtilsTest, MakeOptionsShim_FirstInList)
-{
-  auto span_context_shim = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-      trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
-  auto span_context      = static_cast<opentracing::SpanContext *>(span_context_shim.get());
-
-  opentracing::StartSpanOptions options;
-  options.start_system_timestamp = opentracing::SystemTime::time_point::clock::now();
-  options.start_steady_timestamp = opentracing::SteadyTime::time_point::clock::now();
-  options.references             = {{opentracing::SpanReferenceType::FollowsFromRef, span_context},
-                                    {opentracing::SpanReferenceType::FollowsFromRef, nullptr}};
-
-  auto options_shim = shim::utils::makeOptionsShim(options);
-  ASSERT_EQ(options_shim.start_system_time,
-            common::SystemTimestamp{options.start_system_timestamp});
-  ASSERT_EQ(options_shim.start_steady_time,
-            common::SteadyTimestamp{options.start_steady_timestamp});
-  ASSERT_EQ(nostd::get<trace_api::SpanContext>(options_shim.parent), span_context_shim->context());
-}
-
-TEST(ShimUtilsTest, MakeIterableLinks)
-{
-  auto span_context_shim1 = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-      trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
-  auto span_context1      = static_cast<opentracing::SpanContext *>(span_context_shim1.get());
-  auto span_context_shim2 = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-      trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
-  auto span_context2      = static_cast<opentracing::SpanContext *>(span_context_shim2.get());
-
-  opentracing::StartSpanOptions options;
-  auto empty = shim::utils::makeIterableLinks(options);
-  ASSERT_EQ(empty.size(), 0);
-
-  options.references = {{opentracing::SpanReferenceType::FollowsFromRef, nullptr},
-                        {opentracing::SpanReferenceType::FollowsFromRef, span_context1},
-                        {opentracing::SpanReferenceType::ChildOfRef, span_context2}};
-  auto full          = shim::utils::makeIterableLinks(options);
-  ASSERT_EQ(full.size(), 3);
-
-  std::vector<std::tuple<trace_api::SpanContext, nostd::string_view, common::AttributeValue>> links;
-  full.ForEachKeyValue([&links](trace_api::SpanContext ctx, const common::KeyValueIterable &it) {
-    it.ForEachKeyValue([&links, &ctx](nostd::string_view key, common::AttributeValue value) {
-      links.emplace_back(ctx, key, value);
-      return false;
-    });
-    return true;
-  });
-  ASSERT_EQ(links.size(), 2);
-
-  trace_api::SpanContext ctx = trace_api::SpanContext::GetInvalid();
-  nostd::string_view key;
-  common::AttributeValue value;
-  std::tie(ctx, key, value) = links[0];
-  ASSERT_EQ(ctx, span_context_shim1->context());
-  ASSERT_EQ(key, "opentracing.ref_type");
-  ASSERT_EQ(nostd::get<nostd::string_view>(value), "follows_from");
-  std::tie(ctx, key, value) = links[1];
-  ASSERT_EQ(ctx, span_context_shim2->context());
-  ASSERT_EQ(key, "opentracing.ref_type");
-  ASSERT_EQ(nostd::get<nostd::string_view>(value), "child_of");
-}
-
-TEST(ShimUtilsTest, MakeBaggage_EmptyRefs)
-{
-  auto baggage = baggage::Baggage::GetDefault()->Set("foo", "bar");
-  std::string value;
-  ASSERT_TRUE(baggage->GetValue("foo", value));
-  ASSERT_EQ(value, "bar");
-
-  auto context     = context::RuntimeContext::GetCurrent();
-  auto new_context = baggage::SetBaggage(context, baggage);
-  auto token       = context::RuntimeContext::Attach(new_context);
-  ASSERT_EQ(context::RuntimeContext::GetCurrent(), new_context);
-
-  opentracing::StartSpanOptions options;
-  auto new_baggage = shim::utils::makeBaggage(options);
-  ASSERT_TRUE(new_baggage->GetValue("foo", value));
-  ASSERT_EQ(value, "bar");
-}
-
-TEST(ShimUtilsTest, MakeBaggage_NonEmptyRefs)
-{
-  auto span_context_shim1 = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-      trace_api::SpanContext::GetInvalid(),
-      baggage::Baggage::GetDefault()->Set("test", "foo")->Set("test1", "hello")));
-  auto span_context1      = static_cast<opentracing::SpanContext *>(span_context_shim1.get());
-  auto span_context_shim2 = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-      trace_api::SpanContext::GetInvalid(),
-      baggage::Baggage::GetDefault()->Set("test", "bar")->Set("test2", "world")));
-  auto span_context2      = static_cast<opentracing::SpanContext *>(span_context_shim2.get());
-
-  opentracing::StartSpanOptions options;
-  options.references = {{opentracing::SpanReferenceType::FollowsFromRef, span_context1},
-                        {opentracing::SpanReferenceType::ChildOfRef, span_context2}};
-
-  auto baggage = shim::utils::makeBaggage(options);
-  std::string value;
-  ASSERT_TRUE(baggage->GetValue("test", value));
-  ASSERT_EQ(value, "foo");
-  ASSERT_TRUE(baggage->GetValue("test1", value));
-  ASSERT_EQ(value, "hello");
-  ASSERT_TRUE(baggage->GetValue("test2", value));
-  ASSERT_EQ(value, "world");
-}
-
-TEST(ShimUtilsTest, MakeIterableTags)
-{
-  opentracing::StartSpanOptions options;
-  auto empty = shim::utils::makeIterableTags(options);
-  ASSERT_EQ(empty.size(), 0);
-
-  options.tags = {{"foo", 42.0}, {"bar", true}, {"baz", "test"}};
-  auto full    = shim::utils::makeIterableTags(options);
-  ASSERT_EQ(full.size(), 3);
-
-  std::vector<std::pair<nostd::string_view, common::AttributeValue>> attributes;
-  full.ForEachKeyValue([&attributes](nostd::string_view key, common::AttributeValue value) {
-    attributes.push_back({key, value});
-    return true;
-  });
-  ASSERT_EQ(attributes[0].first, "foo");
-  ASSERT_EQ(nostd::get<double>(attributes[0].second), 42.0);
-  ASSERT_EQ(attributes[1].first, "bar");
-  ASSERT_TRUE(nostd::get<bool>(attributes[1].second));
-  ASSERT_EQ(attributes[2].first, "baz");
-  ASSERT_STREQ(nostd::get<const char *>(attributes[2].second), "test");
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/span_context_shim_test.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/span_context_shim_test.cc
deleted file mode 100644
index 9433f3a1c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/span_context_shim_test.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <initializer_list>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentracing/noop.h"
-#include "opentracing/span.h"
-#include "opentracing/tracer.h"
-#include "opentracing/value.h"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/trace/span_context.h"
-
-namespace trace_api = opentelemetry::trace;
-namespace baggage   = opentelemetry::baggage;
-namespace nostd     = opentelemetry::nostd;
-namespace shim      = opentelemetry::opentracingshim;
-
-class SpanContextShimTest : public testing::Test
-{
-public:
-  nostd::unique_ptr<shim::SpanContextShim> span_context_shim;
-
-protected:
-  virtual void SetUp() override
-  {
-    auto span_context = trace_api::SpanContext::GetInvalid();
-    auto baggage      = baggage::Baggage::GetDefault()->Set("foo", "bar");
-    span_context_shim =
-        nostd::unique_ptr<shim::SpanContextShim>(new shim::SpanContextShim(span_context, baggage));
-  }
-
-  virtual void TearDown() override { span_context_shim.reset(); }
-};
-
-TEST_F(SpanContextShimTest, ExtractFrom)
-{
-  ASSERT_TRUE(shim::SpanContextShim::extractFrom(nullptr) == nullptr);
-
-  auto tracer = opentracing::MakeNoopTracer();
-  auto span   = tracer->StartSpanWithOptions("operation", {});
-  ASSERT_TRUE(shim::SpanContextShim::extractFrom(&span->context()) == nullptr);
-
-  auto span_context_shim = nostd::shared_ptr<shim::SpanContextShim>(new shim::SpanContextShim(
-      trace_api::SpanContext::GetInvalid(), baggage::Baggage::GetDefault()));
-  ASSERT_TRUE(shim::SpanContextShim::extractFrom(span_context_shim.get()) != nullptr);
-}
-
-TEST_F(SpanContextShimTest, BaggageItem)
-{
-  std::string value;
-  ASSERT_TRUE(span_context_shim->BaggageItem("foo", value));
-  ASSERT_EQ(value, "bar");
-  ASSERT_FALSE(span_context_shim->BaggageItem("", value));
-}
-
-TEST_F(SpanContextShimTest, NewWithKeyValue)
-{
-  auto new_span_context_shim = span_context_shim->newWithKeyValue("test", "this");
-  ASSERT_NE(span_context_shim.get(), &new_span_context_shim);
-  ASSERT_EQ(span_context_shim->context(), new_span_context_shim.context());
-  ASSERT_EQ(span_context_shim->context().IsValid(), new_span_context_shim.context().IsValid());
-  ASSERT_EQ(span_context_shim->context().IsRemote(), new_span_context_shim.context().IsRemote());
-
-  std::string value;
-  ASSERT_TRUE(new_span_context_shim.BaggageItem("foo", value));
-  ASSERT_EQ(value, "bar");
-  ASSERT_TRUE(new_span_context_shim.BaggageItem("test", value));
-  ASSERT_EQ(value, "this");
-}
-
-TEST_F(SpanContextShimTest, ForeachBaggageItem)
-{
-  std::initializer_list<std::pair<std::string, std::string>> list{
-      {"foo", "bar"}, {"bar", "baz"}, {"baz", "foo"}};
-  nostd::shared_ptr<baggage::Baggage> baggage(new baggage::Baggage(list));
-  shim::SpanContextShim new_span_context_shim(span_context_shim->context(), baggage);
-
-  std::vector<std::string> concatenated;
-  new_span_context_shim.ForeachBaggageItem(
-      [&concatenated](const std::string &key, const std::string &value) {
-        concatenated.emplace_back(key + ":" + value);
-        return true;
-      });
-
-  ASSERT_EQ(concatenated.size(), 3);
-  ASSERT_EQ(concatenated[0], "foo:bar");
-  ASSERT_EQ(concatenated[1], "bar:baz");
-  ASSERT_EQ(concatenated[2], "baz:foo");
-}
-
-TEST_F(SpanContextShimTest, Clone)
-{
-  auto new_span_context      = span_context_shim->Clone();
-  auto new_span_context_shim = static_cast<shim::SpanContextShim *>(new_span_context.get());
-  ASSERT_TRUE(new_span_context_shim != nullptr);
-  ASSERT_NE(span_context_shim.get(), new_span_context_shim);
-  ASSERT_EQ(span_context_shim->context(), new_span_context_shim->context());
-  ASSERT_EQ(span_context_shim->context().IsValid(), new_span_context_shim->context().IsValid());
-  ASSERT_EQ(span_context_shim->context().IsRemote(), new_span_context_shim->context().IsRemote());
-
-  std::string value;
-  std::string new_value;
-  ASSERT_TRUE(span_context_shim->BaggageItem("foo", value));
-  ASSERT_TRUE(new_span_context_shim->BaggageItem("foo", new_value));
-  ASSERT_EQ(value, new_value);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/span_shim_test.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/span_shim_test.cc
deleted file mode 100644
index 0b1aaf80c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/span_shim_test.cc
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <algorithm>
-#include <chrono>
-#include <functional>
-#include <initializer_list>
-#include <string>
-#include <thread>
-#include <tuple>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentracing/span.h"
-#include "opentracing/string_view.h"
-#include "opentracing/util.h"
-#include "opentracing/value.h"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/opentracingshim/span_shim.h"
-#include "opentelemetry/opentracingshim/tracer_shim.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_metadata.h"
-
-#include "shim_mocks.h"
-
-namespace trace_api = opentelemetry::trace;
-namespace baggage   = opentelemetry::baggage;
-namespace nostd     = opentelemetry::nostd;
-namespace shim      = opentelemetry::opentracingshim;
-
-class SpanShimTest : public testing::Test
-{
-public:
-  nostd::unique_ptr<shim::SpanShim> span_shim;
-  MockSpan *mock_span;
-
-protected:
-  virtual void SetUp() override
-  {
-    mock_span        = new MockSpan();
-    auto span        = nostd::shared_ptr<trace_api::Span>(mock_span);
-    auto tracer      = shim::TracerShim::createTracerShim();
-    auto tracer_shim = static_cast<shim::TracerShim *>(tracer.get());
-    auto baggage     = baggage::Baggage::GetDefault()->Set("baggage", "item");
-    span_shim = nostd::unique_ptr<shim::SpanShim>(new shim::SpanShim(*tracer_shim, span, baggage));
-  }
-
-  virtual void TearDown() override { span_shim.reset(); }
-};
-
-TEST_F(SpanShimTest, HandleError)
-{
-  span_shim->handleError(true);
-  ASSERT_EQ(mock_span->status_.first, trace_api::StatusCode::kError);
-  span_shim->handleError("true");
-  ASSERT_EQ(mock_span->status_.first, trace_api::StatusCode::kError);
-  span_shim->handleError(false);
-  ASSERT_EQ(mock_span->status_.first, trace_api::StatusCode::kOk);
-  span_shim->handleError("false");
-  ASSERT_EQ(mock_span->status_.first, trace_api::StatusCode::kOk);
-  span_shim->handleError(nullptr);
-  ASSERT_EQ(mock_span->status_.first, trace_api::StatusCode::kUnset);
-  span_shim->handleError("unknown");
-  ASSERT_EQ(mock_span->status_.first, trace_api::StatusCode::kUnset);
-  span_shim->handleError(42);
-  ASSERT_EQ(mock_span->status_.first, trace_api::StatusCode::kUnset);
-}
-
-TEST_F(SpanShimTest, FinishWithOptions)
-{
-  opentracing::FinishSpanOptions options;
-  options.finish_steady_timestamp = opentracing::SteadyTime::clock::now();
-  ASSERT_NE(mock_span->options_.end_steady_time, options.finish_steady_timestamp);
-  span_shim->FinishWithOptions(options);
-  ASSERT_EQ(mock_span->options_.end_steady_time, options.finish_steady_timestamp);
-}
-
-TEST_F(SpanShimTest, SetOperationName)
-{
-  ASSERT_NE(mock_span->name_, "foo");
-  span_shim->SetOperationName("foo");
-  ASSERT_EQ(mock_span->name_, "foo");
-}
-
-TEST_F(SpanShimTest, SetTag_Normal)
-{
-  ASSERT_NE(mock_span->attribute_.first, "foo");
-  span_shim->SetTag("foo", "bar");
-  ASSERT_EQ(mock_span->attribute_.first, "foo");
-  ASSERT_STREQ(nostd::get<const char *>(mock_span->attribute_.second), "bar");
-}
-
-TEST_F(SpanShimTest, SetTag_Error)
-{
-  ASSERT_NE(mock_span->attribute_.first, "error");
-  span_shim->SetTag("error", true);
-  ASSERT_NE(mock_span->attribute_.first, "error");
-  span_shim->SetTag("error", "false");
-  ASSERT_NE(mock_span->attribute_.first, "error");
-  span_shim->SetTag("error", 42);
-  ASSERT_NE(mock_span->attribute_.first, "error");
-  span_shim->SetTag("error", nullptr);
-  ASSERT_NE(mock_span->attribute_.first, "error");
-}
-
-TEST_F(SpanShimTest, BaggageItem)
-{
-  ASSERT_EQ(span_shim->BaggageItem({}), "");
-  ASSERT_EQ(span_shim->BaggageItem(""), "");
-  ASSERT_EQ(span_shim->BaggageItem("invalid"), "");
-  ASSERT_EQ(span_shim->BaggageItem("baggage"), "item");
-}
-
-TEST_F(SpanShimTest, SetBaggageItem)
-{
-  span_shim->SetBaggageItem("new", "entry");
-  ASSERT_EQ(span_shim->BaggageItem("new"), "entry");
-  ASSERT_EQ(span_shim->BaggageItem("baggage"), "item");
-  span_shim->SetBaggageItem("empty", "");
-  ASSERT_EQ(span_shim->BaggageItem("empty"), "");
-  span_shim->SetBaggageItem("no value", {});
-  ASSERT_EQ(span_shim->BaggageItem("no value"), "");
-}
-
-TEST_F(SpanShimTest, SetBaggageItem_MultiThreaded)
-{
-  auto span        = nostd::shared_ptr<trace_api::Span>(new MockSpan());
-  auto tracer      = shim::TracerShim::createTracerShim();
-  auto tracer_shim = static_cast<shim::TracerShim *>(tracer.get());
-  auto baggage     = baggage::Baggage::GetDefault();
-  shim::SpanShim span_shim(*tracer_shim, span, baggage);
-
-  std::vector<std::thread> threads;
-  std::vector<std::string> keys;
-  std::vector<std::string> values;
-  int thread_count = 100;
-
-  for (int index = 0; index < thread_count; ++index)
-  {
-    keys.emplace_back("key-" + std::to_string(index));
-    values.emplace_back("value-" + std::to_string(index));
-    threads.emplace_back(
-        std::bind(&shim::SpanShim::SetBaggageItem, &span_shim, keys[index], values[index]));
-  }
-
-  for (auto &thread : threads)
-  {
-    thread.join();
-  }
-
-  for (int index = 0; index < thread_count; ++index)
-  {
-    ASSERT_EQ(span_shim.BaggageItem(keys[index]), values[index]);
-  }
-}
-
-TEST_F(SpanShimTest, Log_NoEvent)
-{
-  std::string name;
-  common::SystemTimestamp timestamp;
-  std::unordered_map<std::string, common::AttributeValue> attributes;
-
-  span_shim->Log({{"test", 42}});
-  std::tie(name, timestamp, attributes) = mock_span->event_;
-
-  ASSERT_EQ(name, "log");
-  ASSERT_EQ(timestamp, common::SystemTimestamp{});
-  ASSERT_EQ(attributes.size(), 1);
-  ASSERT_EQ(nostd::get<int64_t>(attributes["test"]), 42);
-}
-
-TEST_F(SpanShimTest, Log_NoEvent_Timestamp)
-{
-  std::string name;
-  common::SystemTimestamp timestamp;
-  std::unordered_map<std::string, common::AttributeValue> attributes;
-
-  auto logtime = opentracing::SystemTime::time_point::clock::now();
-  span_shim->Log(logtime, {{"foo", "bar"}});
-  std::tie(name, timestamp, attributes) = mock_span->event_;
-
-  ASSERT_EQ(name, "log");
-  ASSERT_EQ(timestamp, common::SystemTimestamp{logtime});
-  ASSERT_EQ(attributes.size(), 1);
-  ASSERT_STREQ(nostd::get<const char *>(attributes["foo"]), "bar");
-}
-
-TEST_F(SpanShimTest, Log_Event)
-{
-  std::string name;
-  common::SystemTimestamp timestamp;
-  std::unordered_map<std::string, common::AttributeValue> attributes;
-
-  auto logtime = opentracing::SystemTime::time_point::clock::now();
-  std::initializer_list<std::pair<opentracing::string_view, opentracing::Value>> fields{
-      {"event", "normal"},
-      {"foo", opentracing::string_view{"bar"}},
-      {"error.kind", 42},
-      {"message", "hello"},
-      {"stack", "overflow"}};
-  span_shim->Log(logtime, fields);
-  std::tie(name, timestamp, attributes) = mock_span->event_;
-
-  ASSERT_EQ(name, "normal");
-  ASSERT_EQ(timestamp, common::SystemTimestamp{logtime});
-  ASSERT_EQ(attributes.size(), 5);
-  ASSERT_STREQ(nostd::get<const char *>(attributes["event"]), "normal");
-  ASSERT_EQ(nostd::get<nostd::string_view>(attributes["foo"]), nostd::string_view{"bar"});
-  ASSERT_EQ(nostd::get<int64_t>(attributes["error.kind"]), 42);
-  ASSERT_STREQ(nostd::get<const char *>(attributes["message"]), "hello");
-  ASSERT_STREQ(nostd::get<const char *>(attributes["stack"]), "overflow");
-}
-
-TEST_F(SpanShimTest, Log_Error)
-{
-  std::string name;
-  common::SystemTimestamp timestamp;
-  std::unordered_map<std::string, common::AttributeValue> attributes;
-
-  auto logtime = opentracing::SystemTime::time_point::clock::now();
-  std::vector<std::pair<opentracing::string_view, opentracing::Value>> fields{
-      {"event", "error"},
-      {"foo", opentracing::string_view{"bar"}},
-      {"error.kind", 42},
-      {"message", "hello"},
-      {"stack", "overflow"}};
-  span_shim->Log(logtime, fields);
-  std::tie(name, timestamp, attributes) = mock_span->event_;
-
-  ASSERT_EQ(name, "exception");
-  ASSERT_EQ(timestamp, common::SystemTimestamp{logtime});
-  ASSERT_EQ(attributes.size(), 5);
-  ASSERT_STREQ(nostd::get<const char *>(attributes["event"]), "error");
-  ASSERT_EQ(nostd::get<nostd::string_view>(attributes["foo"]), nostd::string_view{"bar"});
-  ASSERT_EQ(nostd::get<int64_t>(attributes["exception.type"]), 42);
-  ASSERT_STREQ(nostd::get<const char *>(attributes["exception.message"]), "hello");
-  ASSERT_STREQ(nostd::get<const char *>(attributes["exception.stacktrace"]), "overflow");
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/tracer_shim_test.cc b/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/tracer_shim_test.cc
deleted file mode 100644
index 7e48f47d0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/opentracing-shim/test/tracer_shim_test.cc
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <iostream>
-#include <string>
-#include <system_error>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentracing/expected/expected.hpp"
-#include "opentracing/noop.h"
-#include "opentracing/propagation.h"
-#include "opentracing/span.h"
-#include "opentracing/tracer.h"
-#include "opentracing/util.h"
-#include "opentracing/value.h"
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/opentracingshim/shim_utils.h"
-#include "opentelemetry/opentracingshim/span_context_shim.h"
-#include "opentelemetry/opentracingshim/tracer_shim.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#include "shim_mocks.h"
-
-namespace trace_api = opentelemetry::trace;
-namespace nostd     = opentelemetry::nostd;
-namespace context   = opentelemetry::context;
-namespace baggage   = opentelemetry::baggage;
-namespace shim      = opentelemetry::opentracingshim;
-
-class TracerShimTest : public testing::Test
-{
-public:
-  std::shared_ptr<opentracing::Tracer> tracer_shim;
-  MockPropagator *text_map_format;
-  MockPropagator *http_headers_format;
-
-protected:
-  virtual void SetUp() override
-  {
-    using context::propagation::TextMapPropagator;
-
-    text_map_format     = new MockPropagator();
-    http_headers_format = new MockPropagator();
-
-    tracer_shim = shim::TracerShim::createTracerShim(
-        trace_api::Provider::GetTracerProvider(),
-        {.text_map     = nostd::shared_ptr<TextMapPropagator>(text_map_format),
-         .http_headers = nostd::shared_ptr<TextMapPropagator>(http_headers_format)});
-  }
-
-  virtual void TearDown() override { tracer_shim.reset(); }
-};
-
-TEST_F(TracerShimTest, TracerName)
-{
-  auto mock_provider_ptr = new MockTracerProvider();
-  nostd::shared_ptr<trace_api::TracerProvider> provider(mock_provider_ptr);
-  ASSERT_NE(shim::TracerShim::createTracerShim(provider), nullptr);
-  ASSERT_EQ(mock_provider_ptr->library_name_, "opentracing-shim");
-}
-
-TEST_F(TracerShimTest, SpanReferenceToCreatingTracer)
-{
-  auto span_shim = tracer_shim->StartSpan("a");
-  ASSERT_NE(span_shim, nullptr);
-  ASSERT_EQ(&span_shim->tracer(), tracer_shim.get());
-}
-
-TEST_F(TracerShimTest, SpanParentChildRelationship)
-{
-  auto span_shim1 = tracer_shim->StartSpan("a");
-  auto span_shim2 = tracer_shim->StartSpan("b", {opentracing::ChildOf(&span_shim1->context())});
-  ASSERT_NE(span_shim1, nullptr);
-  ASSERT_NE(span_shim2, nullptr);
-  ASSERT_NE(span_shim1, span_shim2);
-  ASSERT_EQ(span_shim1->context().ToSpanID(), span_shim2->context().ToSpanID());
-  ASSERT_EQ(span_shim1->context().ToTraceID(), span_shim2->context().ToTraceID());
-
-  auto span_context_shim1 = static_cast<const shim::SpanContextShim *>(&span_shim1->context());
-  auto span_context_shim2 = static_cast<const shim::SpanContextShim *>(&span_shim2->context());
-  ASSERT_TRUE(span_context_shim1 != nullptr);
-  ASSERT_TRUE(span_context_shim2 != nullptr);
-  ASSERT_EQ(span_context_shim1->context(), span_context_shim2->context());
-}
-
-TEST_F(TracerShimTest, TracerGloballyRegistered)
-{
-  ASSERT_FALSE(opentracing::Tracer::IsGlobalTracerRegistered());
-  ASSERT_NE(opentracing::Tracer::InitGlobal(tracer_shim), nullptr);
-  ASSERT_TRUE(opentracing::Tracer::IsGlobalTracerRegistered());
-}
-
-TEST_F(TracerShimTest, Close)
-{
-  tracer_shim->Close();
-  auto span_shim = tracer_shim->StartSpan("a");
-  ASSERT_TRUE(span_shim == nullptr);
-}
-
-TEST_F(TracerShimTest, SpanHandleErrorTagAtCreation)
-{
-  auto mock_provider_ptr = new MockTracerProvider();
-  nostd::shared_ptr<trace_api::TracerProvider> provider(mock_provider_ptr);
-  auto tracer_shim = shim::TracerShim::createTracerShim(provider);
-  auto span_shim   = tracer_shim->StartSpanWithOptions("test", {});
-  ASSERT_TRUE(span_shim != nullptr);
-  ASSERT_TRUE(mock_provider_ptr->tracer_ != nullptr);
-  ASSERT_TRUE(mock_provider_ptr->tracer_->span_ != nullptr);
-  ASSERT_EQ(mock_provider_ptr->tracer_->span_->name_, "test");
-  ASSERT_EQ(mock_provider_ptr->tracer_->span_->status_.first, trace_api::StatusCode::kUnset);
-
-  auto span_shim1 = tracer_shim->StartSpanWithOptions("test1", {.tags = {{"event", "normal"}}});
-  ASSERT_TRUE(span_shim1 != nullptr);
-  ASSERT_EQ(mock_provider_ptr->tracer_->span_->name_, "test1");
-  ASSERT_EQ(mock_provider_ptr->tracer_->span_->status_.first, trace_api::StatusCode::kUnset);
-
-  auto span_shim2 = tracer_shim->StartSpanWithOptions("test2", {.tags = {{"error", true}}});
-  ASSERT_TRUE(span_shim2 != nullptr);
-  ASSERT_EQ(mock_provider_ptr->tracer_->span_->name_, "test2");
-  ASSERT_EQ(mock_provider_ptr->tracer_->span_->status_.first, trace_api::StatusCode::kError);
-
-  auto span_shim3 = tracer_shim->StartSpanWithOptions("test3", {.tags = {{"error", "false"}}});
-  ASSERT_TRUE(span_shim3 != nullptr);
-  ASSERT_EQ(mock_provider_ptr->tracer_->span_->name_, "test3");
-  ASSERT_EQ(mock_provider_ptr->tracer_->span_->status_.first, trace_api::StatusCode::kOk);
-}
-
-TEST_F(TracerShimTest, InjectInvalidCarrier)
-{
-  auto span_shim = tracer_shim->StartSpan("a");
-  auto result    = tracer_shim->Inject(span_shim->context(), std::cout);
-  ASSERT_TRUE(opentracing::are_errors_equal(result.error(), opentracing::invalid_carrier_error));
-}
-
-TEST_F(TracerShimTest, InjectNullContext)
-{
-  std::unordered_map<std::string, std::string> text_map;
-  auto noop_tracer = opentracing::MakeNoopTracer();
-  auto span        = noop_tracer->StartSpan("a");
-  auto result      = tracer_shim->Inject(span->context(), TextMapCarrier{text_map});
-  ASSERT_TRUE(
-      opentracing::are_errors_equal(result.error(), opentracing::invalid_span_context_error));
-  ASSERT_TRUE(text_map.empty());
-}
-
-TEST_F(TracerShimTest, InjectTextMap)
-{
-  ASSERT_FALSE(text_map_format->is_injected);
-  ASSERT_FALSE(http_headers_format->is_injected);
-
-  std::unordered_map<std::string, std::string> text_map;
-  auto span_shim = tracer_shim->StartSpan("a");
-  tracer_shim->Inject(span_shim->context(), TextMapCarrier{text_map});
-  ASSERT_TRUE(text_map_format->is_injected);
-  ASSERT_FALSE(http_headers_format->is_injected);
-}
-
-TEST_F(TracerShimTest, InjectHttpsHeaders)
-{
-  ASSERT_FALSE(text_map_format->is_injected);
-  ASSERT_FALSE(http_headers_format->is_injected);
-
-  std::unordered_map<std::string, std::string> text_map;
-  auto span_shim = tracer_shim->StartSpan("a");
-  tracer_shim->Inject(span_shim->context(), HTTPHeadersCarrier{text_map});
-  ASSERT_FALSE(text_map_format->is_injected);
-  ASSERT_TRUE(http_headers_format->is_injected);
-}
-
-TEST_F(TracerShimTest, ExtractInvalidCarrier)
-{
-  auto result = tracer_shim->Extract(std::cin);
-  ASSERT_TRUE(opentracing::are_errors_equal(result.error(), opentracing::invalid_carrier_error));
-}
-
-TEST_F(TracerShimTest, ExtractNullContext)
-{
-  std::unordered_map<std::string, std::string> text_map;
-  auto result = tracer_shim->Extract(TextMapCarrier{text_map});
-  ASSERT_EQ(result.value(), nullptr);
-}
-
-TEST_F(TracerShimTest, ExtractTextMap)
-{
-  ASSERT_FALSE(text_map_format->is_extracted);
-  ASSERT_FALSE(http_headers_format->is_extracted);
-
-  std::unordered_map<std::string, std::string> text_map;
-  auto result = tracer_shim->Extract(TextMapCarrier{text_map});
-  ASSERT_EQ(result.value(), nullptr);
-  ASSERT_TRUE(text_map_format->is_extracted);
-  ASSERT_FALSE(http_headers_format->is_extracted);
-}
-
-TEST_F(TracerShimTest, ExtractHttpsHeaders)
-{
-  ASSERT_FALSE(text_map_format->is_extracted);
-  ASSERT_FALSE(http_headers_format->is_extracted);
-
-  std::unordered_map<std::string, std::string> text_map;
-  auto result = tracer_shim->Extract(HTTPHeadersCarrier{text_map});
-  ASSERT_EQ(result.value(), nullptr);
-  ASSERT_FALSE(text_map_format->is_extracted);
-  ASSERT_TRUE(http_headers_format->is_extracted);
-}
-
-TEST_F(TracerShimTest, ExtractOnlyBaggage)
-{
-  std::unordered_map<std::string, std::string> text_map;
-  auto span_shim = tracer_shim->StartSpan("a");
-  span_shim->SetBaggageItem("foo", "bar");
-  ASSERT_EQ(span_shim->BaggageItem("foo"), "bar");
-
-  tracer_shim->Inject(span_shim->context(), TextMapCarrier{text_map});
-  auto span_context = tracer_shim->Extract(TextMapCarrier{text_map});
-  ASSERT_TRUE(span_context.value() != nullptr);
-
-  auto span_context_shim = static_cast<shim::SpanContextShim *>(span_context.value().get());
-  ASSERT_TRUE(span_context_shim != nullptr);
-  ASSERT_FALSE(span_context_shim->context().IsValid());
-  ASSERT_FALSE(span_context_shim->context().IsSampled());
-  ASSERT_FALSE(shim::utils::isBaggageEmpty(span_context_shim->baggage()));
-
-  std::string value;
-  ASSERT_TRUE(span_context_shim->BaggageItem("foo", value));
-  ASSERT_EQ(value, "bar");
-}
-
-class TracerWithSpanContext : public trace_api::Tracer
-{
-public:
-  nostd::shared_ptr<trace_api::Span> StartSpan(
-      nostd::string_view name,
-      const common::KeyValueIterable & /* attributes */,
-      const trace_api::SpanContextKeyValueIterable & /* links */,
-      const trace_api::StartSpanOptions & /* options */) noexcept override
-  {
-    constexpr uint8_t trace_id_buf[] = {1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8};
-    trace_api::TraceId trace_id(trace_id_buf);
-
-    constexpr uint8_t span_id_buf[] = {1, 2, 3, 4, 5, 6, 7, 8};
-    trace_api::SpanId span_id(span_id_buf);
-
-    auto span_context = trace_api::SpanContext(trace_id, span_id, GetTraceFlags(), false);
-    nostd::shared_ptr<trace_api::Span> result(new trace_api::DefaultSpan(span_context));
-
-    return result;
-  }
-
-  void ForceFlushWithMicroseconds(uint64_t /* timeout */) noexcept override {}
-
-  void CloseWithMicroseconds(uint64_t /* timeout */) noexcept override {}
-
-  static trace_api::TraceFlags GetTraceFlags()
-  {
-    return trace_api::TraceFlags(trace_api::TraceFlags::kIsSampled);
-  }
-};
-
-class TracerWithSpanContextProvider : public trace_api::TracerProvider
-{
-public:
-  static nostd::shared_ptr<trace_api::TracerProvider> Create()
-  {
-    nostd::shared_ptr<trace_api::TracerProvider> result(new TracerWithSpanContextProvider());
-    return result;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<trace_api::Tracer> GetTracer(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */,
-      const common::KeyValueIterable * /* attributes */) noexcept override
-  {
-    nostd::shared_ptr<trace_api::Tracer> result(new TracerWithSpanContext());
-    return result;
-  }
-#else
-  nostd::shared_ptr<trace_api::Tracer> GetTracer(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */) noexcept override
-  {
-    nostd::shared_ptr<trace_api::Tracer> result(new TracerWithSpanContext());
-    return result;
-  }
-#endif
-};
-
-TEST_F(TracerShimTest, InjectSpanKey)
-{
-  using context::propagation::TextMapPropagator;
-
-  auto local_text_map_format     = new MockPropagator();
-  auto local_http_headers_format = new MockPropagator();
-
-  ASSERT_FALSE(local_text_map_format->is_injected);
-  ASSERT_FALSE(local_http_headers_format->is_injected);
-
-  nostd::shared_ptr<trace_api::TracerProvider> tracer_provider =
-      TracerWithSpanContextProvider::Create();
-  auto local_tracer_shim = shim::TracerShim::createTracerShim(
-      tracer_provider,
-      {.text_map     = nostd::shared_ptr<TextMapPropagator>(local_text_map_format),
-       .http_headers = nostd::shared_ptr<TextMapPropagator>(local_http_headers_format)});
-
-  std::unordered_map<std::string, std::string> text_map;
-  auto span_shim = local_tracer_shim->StartSpan("a");
-  local_tracer_shim->Inject(span_shim->context(), TextMapCarrier{text_map});
-
-  ASSERT_TRUE(local_text_map_format->is_injected);
-  ASSERT_FALSE(local_http_headers_format->is_injected);
-
-  ASSERT_EQ(span_shim->context().ToTraceID(), text_map[MockPropagator::kTraceIdKey]);
-  ASSERT_EQ(span_shim->context().ToSpanID(), text_map[MockPropagator::kSpanIdKey]);
-
-  char flag_buffer[2];
-  TracerWithSpanContext::GetTraceFlags().ToLowerBase16(flag_buffer);
-  ASSERT_EQ(std::string(flag_buffer, 2), text_map[MockPropagator::kTraceFlagsKey]);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/BUILD
deleted file mode 100644
index b19ae921e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "headers",
-    hdrs = glob(["include/**/*.h"]),
-    strip_include_prefix = "include",
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/CMakeLists.txt
deleted file mode 100644
index 8e508cfca..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_sdk INTERFACE)
-target_include_directories(
-  opentelemetry_sdk
-  INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-            "$<INSTALL_INTERFACE:include>")
-
-set_target_properties(opentelemetry_sdk PROPERTIES EXPORT_NAME sdk)
-
-target_link_libraries(opentelemetry_sdk INTERFACE opentelemetry_api)
-
-set(OTEL_SDK_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-add_subdirectory(src)
-
-otel_add_component(
-  COMPONENT
-  sdk
-  TARGETS
-  opentelemetry_sdk
-  opentelemetry_common
-  opentelemetry_resources
-  opentelemetry_version
-  opentelemetry_logs
-  opentelemetry_trace
-  opentelemetry_metrics
-  FILES_DIRECTORY
-  "include/opentelemetry/"
-  FILES_DESTINATION
-  "include/opentelemetry"
-  FILES_MATCHING
-  PATTERN
-  "*.h")
-
-if(BUILD_TESTING)
-  add_subdirectory(test)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h
deleted file mode 100644
index 39c0ce91c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/atomic_shared_ptr.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <memory>
-#include <mutex>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-/**
- * A wrapper to provide atomic shared pointers.
- *
- * This wrapper relies on a mutex for gcc 4.8, and specializations of
- * std::atomic_store and std::atomic_load for all other instances.
- */
-#if (__GNUC__ == 4 && (__GNUC_MINOR__ >= 8))
-template <class T>
-class AtomicSharedPtr
-{
-public:
-  explicit AtomicSharedPtr(std::shared_ptr<T> ptr) noexcept : ptr_{std::move(ptr)} {}
-
-  void store(const std::shared_ptr<T> &other) noexcept
-  {
-    std::lock_guard<std::mutex> lock_guard{mu_};
-    ptr_ = other;
-  }
-
-  std::shared_ptr<T> load() const noexcept
-  {
-    std::lock_guard<std::mutex> lock_guard{mu_};
-    return ptr_;
-  }
-
-private:
-  std::shared_ptr<T> ptr_;
-  mutable std::mutex mu_;
-};
-#else
-template <class T>
-class AtomicSharedPtr
-{
-public:
-  explicit AtomicSharedPtr(std::shared_ptr<T> ptr) noexcept : ptr_{std::move(ptr)} {}
-
-  void store(const std::shared_ptr<T> &other) noexcept { std::atomic_store(&ptr_, other); }
-
-  std::shared_ptr<T> load() const noexcept { return std::atomic_load(&ptr_); }
-
-private:
-  std::shared_ptr<T> ptr_;
-};
-#endif
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/atomic_unique_ptr.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/atomic_unique_ptr.h
deleted file mode 100644
index e55452666..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/atomic_unique_ptr.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <memory>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-/**
- * An owning pointer similar to std::unique_ptr but with methods for atomic
- * operations.
- */
-template <class T>
-class AtomicUniquePtr
-{
-public:
-  AtomicUniquePtr() noexcept {}
-
-  explicit AtomicUniquePtr(std::unique_ptr<T> &&other) noexcept : ptr_(other.release()) {}
-
-  ~AtomicUniquePtr() noexcept { Reset(); }
-
-  T &operator*() const noexcept { return *Get(); }
-
-  T *operator->() const noexcept { return Get(); }
-
-  /**
-   * @return the underly pointer managed.
-   */
-  T *Get() const noexcept { return ptr_; }
-
-  /**
-   * @return true if the pointer is null
-   */
-  bool IsNull() const noexcept { return ptr_.load() == nullptr; }
-
-  /**
-   * Atomically swap the pointer only if it's null.
-   * @param owner the pointer to swap with
-   * @return true if the swap was successful
-   */
-  bool SwapIfNull(std::unique_ptr<T> &owner) noexcept
-  {
-    auto ptr            = owner.get();
-    T *expected         = nullptr;
-    auto was_successful = ptr_.compare_exchange_weak(expected, ptr, std::memory_order_release,
-                                                     std::memory_order_relaxed);
-    if (was_successful)
-    {
-      return owner.release() != nullptr;
-    }
-    return false;
-  }
-
-  /**
-   * Atomically swap the pointer with another.
-   * @param ptr the pointer to swap with
-   */
-  void Swap(std::unique_ptr<T> &other) noexcept { other.reset(ptr_.exchange(other.release())); }
-
-  /**
-   * Set the pointer to a new value and delete the current value if non-null.
-   * @param ptr the new pointer value to set
-   */
-  void Reset(T *ptr = nullptr) noexcept
-  {
-    ptr = ptr_.exchange(ptr);
-    if (ptr != nullptr)
-    {
-      delete ptr;
-    }
-  }
-
-private:
-  std::atomic<T *> ptr_{nullptr};
-};
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/attribute_utils.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/attribute_utils.h
deleted file mode 100644
index c2d0209a7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/attribute_utils.h
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-#include <initializer_list>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-/**
- * A counterpart to AttributeValue that makes sure a value is owned. This
- * replaces all non-owning references with owned copies.
- *
- * The following types are not currently supported by the OpenTelemetry
- * specification, but reserved for future use:
- *  - uint64_t
- *  - std::vector<uint64_t>
- *  - std::vector<uint8_t>
- */
-using OwnedAttributeValue = nostd::variant<bool,
-                                           int32_t,
-                                           uint32_t,
-                                           int64_t,
-                                           double,
-                                           std::string,
-                                           std::vector<bool>,
-                                           std::vector<int32_t>,
-                                           std::vector<uint32_t>,
-                                           std::vector<int64_t>,
-                                           std::vector<double>,
-                                           std::vector<std::string>,
-                                           uint64_t,
-                                           std::vector<uint64_t>,
-                                           std::vector<uint8_t>>;
-
-enum OwnedAttributeType
-{
-  kTypeBool,
-  kTypeInt,
-  kTypeUInt,
-  kTypeInt64,
-  kTypeDouble,
-  kTypeString,
-  kTypeSpanBool,
-  kTypeSpanInt,
-  kTypeSpanUInt,
-  kTypeSpanInt64,
-  kTypeSpanDouble,
-  kTypeSpanString,
-  kTypeUInt64,
-  kTypeSpanUInt64,
-  kTypeSpanByte
-};
-
-/**
- * Creates an owned copy (OwnedAttributeValue) of a non-owning AttributeValue.
- */
-struct AttributeConverter
-{
-  OwnedAttributeValue operator()(bool v) { return OwnedAttributeValue(v); }
-  OwnedAttributeValue operator()(int32_t v) { return OwnedAttributeValue(v); }
-  OwnedAttributeValue operator()(uint32_t v) { return OwnedAttributeValue(v); }
-  OwnedAttributeValue operator()(int64_t v) { return OwnedAttributeValue(v); }
-  OwnedAttributeValue operator()(uint64_t v) { return OwnedAttributeValue(v); }
-  OwnedAttributeValue operator()(double v) { return OwnedAttributeValue(v); }
-  OwnedAttributeValue operator()(nostd::string_view v)
-  {
-    return OwnedAttributeValue(std::string(v));
-  }
-  OwnedAttributeValue operator()(std::string v) { return OwnedAttributeValue(v); }
-  OwnedAttributeValue operator()(const char *v) { return OwnedAttributeValue(std::string(v)); }
-  OwnedAttributeValue operator()(nostd::span<const uint8_t> v) { return convertSpan<uint8_t>(v); }
-  OwnedAttributeValue operator()(nostd::span<const bool> v) { return convertSpan<bool>(v); }
-  OwnedAttributeValue operator()(nostd::span<const int32_t> v) { return convertSpan<int32_t>(v); }
-  OwnedAttributeValue operator()(nostd::span<const uint32_t> v) { return convertSpan<uint32_t>(v); }
-  OwnedAttributeValue operator()(nostd::span<const int64_t> v) { return convertSpan<int64_t>(v); }
-  OwnedAttributeValue operator()(nostd::span<const uint64_t> v) { return convertSpan<uint64_t>(v); }
-  OwnedAttributeValue operator()(nostd::span<const double> v) { return convertSpan<double>(v); }
-  OwnedAttributeValue operator()(nostd::span<const nostd::string_view> v)
-  {
-    return convertSpan<std::string>(v);
-  }
-
-  template <typename T, typename U = T>
-  OwnedAttributeValue convertSpan(nostd::span<const U> vals)
-  {
-    const std::vector<T> copy(vals.begin(), vals.end());
-    return OwnedAttributeValue(std::move(copy));
-  }
-};
-
-/**
- * Evaluates if an owned value (from an OwnedAttributeValue) is equal to another value (from a
- * non-owning AttributeValue). This only supports the checking equality with
- * nostd::visit(AttributeEqualToVisitor, OwnedAttributeValue, AttributeValue).
- */
-struct AttributeEqualToVisitor
-{
-  // Different types are not equal including containers of different element types
-  template <typename T, typename U>
-  bool operator()(const T &, const U &) const noexcept
-  {
-    return false;
-  }
-
-  // Compare the same arithmetic types
-  template <typename T>
-  bool operator()(const T &owned_value, const T &value) const noexcept
-  {
-    return owned_value == value;
-  }
-
-  // Compare std::string and const char*
-  bool operator()(const std::string &owned_value, const char *value) const noexcept
-  {
-    return owned_value == value;
-  }
-
-  // Compare std::string and nostd::string_view
-  bool operator()(const std::string &owned_value, nostd::string_view value) const noexcept
-  {
-    return owned_value == value;
-  }
-
-  // Compare std::vector<std::string> and nostd::span<const nostd::string_view>
-  bool operator()(const std::vector<std::string> &owned_value,
-                  const nostd::span<const nostd::string_view> &value) const noexcept
-  {
-    return owned_value.size() == value.size() &&
-           std::equal(owned_value.begin(), owned_value.end(), value.begin(),
-                      [](const std::string &owned_element, nostd::string_view element) {
-                        return owned_element == element;
-                      });
-  }
-
-  // Compare nostd::span<const T> and std::vector<T> for arithmetic types
-  template <typename T>
-  bool operator()(const std::vector<T> &owned_value,
-                  const nostd::span<const T> &value) const noexcept
-  {
-    return owned_value.size() == value.size() &&
-           std::equal(owned_value.begin(), owned_value.end(), value.begin());
-  }
-};
-
-/**
- * Class for storing attributes.
- */
-class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
-{
-public:
-  // Construct empty attribute map
-  AttributeMap() : std::unordered_map<std::string, OwnedAttributeValue>() {}
-
-  // Construct attribute map and populate with attributes
-  AttributeMap(const opentelemetry::common::KeyValueIterable &attributes) : AttributeMap()
-  {
-    attributes.ForEachKeyValue(
-        [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
-          SetAttribute(key, value);
-          return true;
-        });
-  }
-
-  // Construct attribute map and populate with optional attributes
-  AttributeMap(const opentelemetry::common::KeyValueIterable *attributes) : AttributeMap()
-  {
-    if (attributes != nullptr)
-    {
-      attributes->ForEachKeyValue(
-          [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
-            SetAttribute(key, value);
-            return true;
-          });
-    }
-  }
-
-  // Construct map from initializer list by applying `SetAttribute` transform for every attribute
-  AttributeMap(
-      std::initializer_list<std::pair<nostd::string_view, opentelemetry::common::AttributeValue>>
-          attributes)
-      : AttributeMap()
-  {
-    for (auto &kv : attributes)
-    {
-      SetAttribute(kv.first, kv.second);
-    }
-  }
-
-  // Returns a reference to this map
-  const std::unordered_map<std::string, OwnedAttributeValue> &GetAttributes() const noexcept
-  {
-    return (*this);
-  }
-
-  // Convert non-owning key-value to owning std::string(key) and OwnedAttributeValue(value)
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept
-  {
-    (*this)[std::string(key)] = nostd::visit(converter_, value);
-  }
-
-  // Compare the attributes of this map with another KeyValueIterable
-  bool EqualTo(const opentelemetry::common::KeyValueIterable &attributes) const noexcept
-  {
-    if (attributes.size() != this->size())
-    {
-      return false;
-    }
-
-    const bool is_equal = attributes.ForEachKeyValue(
-        [this](nostd::string_view key,
-               const opentelemetry::common::AttributeValue &value) noexcept {
-          // Perform a linear search to find the key assuming the map is small
-          // This avoids temporary string creation from this->find(std::string(key))
-          for (const auto &kv : *this)
-          {
-            if (kv.first == key)
-            {
-              // Order of arguments is important here. OwnedAttributeValue is first then
-              // AttributeValue AttributeEqualToVisitor does not support the reverse order
-              return nostd::visit(equal_to_visitor_, kv.second, value);
-            }
-          }
-          return false;
-        });
-
-    return is_equal;
-  }
-
-private:
-  AttributeConverter converter_;
-  AttributeEqualToVisitor equal_to_visitor_;
-};
-
-/**
- * Class for storing attributes.
- */
-class OrderedAttributeMap : public std::map<std::string, OwnedAttributeValue>
-{
-public:
-  // Contruct empty attribute map
-  OrderedAttributeMap() : std::map<std::string, OwnedAttributeValue>() {}
-
-  // Contruct attribute map and populate with attributes
-  OrderedAttributeMap(const opentelemetry::common::KeyValueIterable &attributes)
-      : OrderedAttributeMap()
-  {
-    attributes.ForEachKeyValue(
-        [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
-          SetAttribute(key, value);
-          return true;
-        });
-  }
-
-  // Construct map from initializer list by applying `SetAttribute` transform for every attribute
-  OrderedAttributeMap(
-      std::initializer_list<std::pair<nostd::string_view, opentelemetry::common::AttributeValue>>
-          attributes)
-      : OrderedAttributeMap()
-  {
-    for (auto &kv : attributes)
-    {
-      SetAttribute(kv.first, kv.second);
-    }
-  }
-
-  // Returns a reference to this map
-  const std::map<std::string, OwnedAttributeValue> &GetAttributes() const noexcept
-  {
-    return (*this);
-  }
-
-  // Convert non-owning key-value to owning std::string(key) and OwnedAttributeValue(value)
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept
-  {
-    (*this)[std::string(key)] = nostd::visit(converter_, value);
-  }
-
-private:
-  AttributeConverter converter_;
-};
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/attributemap_hash.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/attributemap_hash.h
deleted file mode 100644
index e56d6aaf7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/attributemap_hash.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <functional>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-
-template <class T>
-inline void GetHash(size_t &seed, const T &arg)
-{
-  std::hash<T> hasher;
-  // reference -
-  // https://www.boost.org/doc/libs/1_37_0/doc/html/hash/reference.html#boost.hash_combine
-  seed ^= hasher(arg) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
-}
-
-template <class T>
-inline void GetHash(size_t &seed, const std::vector<T> &arg)
-{
-  for (auto v : arg)
-  {
-    GetHash<T>(seed, v);
-  }
-}
-
-// Specialization for const char*
-// this creates an intermediate string.
-template <>
-inline void GetHash<const char *>(size_t &seed, const char *const &arg)
-{
-  std::hash<std::string> hasher;
-  seed ^= hasher(std::string(arg)) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
-}
-
-struct GetHashForAttributeValueVisitor
-{
-  GetHashForAttributeValueVisitor(size_t &seed) : seed_(seed) {}
-  template <class T>
-  void operator()(T &v)
-  {
-    GetHash(seed_, v);
-  }
-  size_t &seed_;
-};
-
-// Calculate hash of keys and values of attribute map
-inline size_t GetHashForAttributeMap(const OrderedAttributeMap &attribute_map)
-{
-  size_t seed = 0UL;
-  for (auto &kv : attribute_map)
-  {
-    GetHash(seed, kv.first);
-    nostd::visit(GetHashForAttributeValueVisitor(seed), kv.second);
-  }
-  return seed;
-}
-
-template <class T>
-inline size_t GetHash(T value)
-{
-  std::hash<T> hasher;
-  return hasher(value);
-}
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/base64.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/base64.h
deleted file mode 100644
index 918eaaf14..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/base64.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-// Base64Escape()
-//
-// Encodes a `src` string into a base64-encoded 'dest' string with padding
-// characters. This function conforms with RFC 4648 section 4 (base64) and RFC
-// 2045.
-OPENTELEMETRY_EXPORT void Base64Escape(opentelemetry::nostd::string_view src, std::string *dest);
-OPENTELEMETRY_EXPORT std::string Base64Escape(opentelemetry::nostd::string_view src);
-
-// Base64Unescape()
-//
-// Converts a `src` string encoded in Base64 (RFC 4648 section 4) to its binary
-// equivalent, writing it to a `dest` buffer, returning `true` on success. If
-// `src` contains invalid characters, `dest` is cleared and returns `false`.
-// If padding is included (note that `Base64Escape()` does produce it), it must
-// be correct. In the padding, '=' are treated identically.
-OPENTELEMETRY_EXPORT bool Base64Unescape(opentelemetry::nostd::string_view src, std::string *dest);
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/circular_buffer.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/circular_buffer.h
deleted file mode 100644
index a35498ece..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/circular_buffer.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <memory>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/atomic_unique_ptr.h"
-#include "opentelemetry/sdk/common/circular_buffer_range.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-/*
- * A lock-free circular buffer that supports multiple concurrent producers
- * and a single consumer.
- */
-template <class T>
-class CircularBuffer
-{
-public:
-  explicit CircularBuffer(size_t max_size)
-      : data_{new AtomicUniquePtr<T>[max_size + 1]}, capacity_{max_size + 1}
-  {}
-
-  /**
-   * @return a range of the elements in the circular buffer
-   *
-   * Note: This method must only be called from the consumer thread.
-   */
-  CircularBufferRange<const AtomicUniquePtr<T>> Peek() const noexcept
-  {
-    return const_cast<CircularBuffer *>(this)->PeekImpl();
-  }
-
-  /**
-   * Consume elements from the circular buffer's tail.
-   * @param n the number of elements to consume
-   * @param callback the callback to invoke with an AtomicUniquePtr to each
-   * consumed element.
-   *
-   * Note: The callback must set the passed AtomicUniquePtr to null.
-   *
-   * Note: This method must only be called from the consumer thread.
-   */
-  template <class Callback>
-  void Consume(size_t n, Callback callback) noexcept
-  {
-    assert(n <= static_cast<size_t>(head_ - tail_));
-    auto range = PeekImpl().Take(n);
-    static_assert(noexcept(callback(range)), "callback not allowed to throw");
-    tail_ += n;
-    callback(range);
-  }
-
-  /**
-   * Consume elements from the circular buffer's tail.
-   * @param n the number of elements to consume
-   *
-   * Note: This method must only be called from the consumer thread.
-   */
-  void Consume(size_t n) noexcept
-  {
-    Consume(n, [](CircularBufferRange<AtomicUniquePtr<T>> &range) noexcept {
-      range.ForEach([](AtomicUniquePtr<T> &ptr) noexcept {
-        ptr.Reset();
-        return true;
-      });
-    });
-  }
-
-  /**
-   * Adds an element into the circular buffer.
-   * @param ptr a pointer to the element to add
-   * @return true if the element was successfully added; false, otherwise.
-   */
-  bool Add(std::unique_ptr<T> &ptr) noexcept
-  {
-    while (true)
-    {
-      uint64_t tail = tail_;
-      uint64_t head = head_;
-
-      // The circular buffer is full, so return false.
-      if (head - tail >= capacity_ - 1)
-      {
-        return false;
-      }
-
-      uint64_t head_index = head % capacity_;
-      if (data_[head_index].SwapIfNull(ptr))
-      {
-        auto new_head      = head + 1;
-        auto expected_head = head;
-        if (head_.compare_exchange_weak(expected_head, new_head, std::memory_order_release,
-                                        std::memory_order_relaxed))
-        {
-          // free the swapped out value
-          ptr.reset();
-
-          return true;
-        }
-
-        // If we reached this point (unlikely), it means that between the last
-        // iteration elements were added and then consumed from the circular
-        // buffer, so we undo the swap and attempt to add again.
-        data_[head_index].Swap(ptr);
-      }
-    }
-  }
-
-  bool Add(std::unique_ptr<T> &&ptr) noexcept
-  {
-    // rvalue to lvalue reference
-    bool result = Add(std::ref(ptr));
-    ptr.reset();
-    return result;
-  }
-
-  /**
-   * Clear the circular buffer.
-   *
-   * Note: This method must only be called from the consumer thread.
-   */
-  void Clear() noexcept { Consume(size()); }
-
-  /**
-   * @return the maximum number of bytes that can be stored in the buffer.
-   */
-  size_t max_size() const noexcept { return capacity_ - 1; }
-
-  /**
-   * @return true if the buffer is empty.
-   */
-  bool empty() const noexcept { return head_ == tail_; }
-
-  /**
-   * @return the number of bytes stored in the circular buffer.
-   *
-   * Note: this method will only return a correct snapshot of the size if called
-   * from the consumer thread.
-   */
-  size_t size() const noexcept
-  {
-    uint64_t tail = tail_;
-    uint64_t head = head_;
-    assert(tail <= head);
-    return head - tail;
-  }
-
-  /**
-   * @return the number of elements consumed from the circular buffer.
-   */
-  uint64_t consumption_count() const noexcept { return tail_; }
-
-  /**
-   * @return the number of elements added to the circular buffer.
-   */
-  uint64_t production_count() const noexcept { return head_; }
-
-private:
-  std::unique_ptr<AtomicUniquePtr<T>[]> data_;
-  size_t capacity_;
-  std::atomic<uint64_t> head_{0};
-  std::atomic<uint64_t> tail_{0};
-
-  CircularBufferRange<AtomicUniquePtr<T>> PeekImpl() noexcept
-  {
-    uint64_t tail_index = tail_ % capacity_;
-    uint64_t head_index = head_ % capacity_;
-    if (head_index == tail_index)
-    {
-      return {};
-    }
-    auto data = data_.get();
-    if (tail_index < head_index)
-    {
-      return CircularBufferRange<AtomicUniquePtr<T>>{nostd::span<AtomicUniquePtr<T>>{
-          data + tail_index, static_cast<std::size_t>(head_index - tail_index)}};
-    }
-    return {nostd::span<AtomicUniquePtr<T>>{data + tail_index,
-                                            static_cast<std::size_t>(capacity_ - tail_index)},
-            nostd::span<AtomicUniquePtr<T>>{data, static_cast<std::size_t>(head_index)}};
-  }
-};
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/circular_buffer_range.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/circular_buffer_range.h
deleted file mode 100644
index 5e16c3d41..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/circular_buffer_range.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <cassert>
-#include <type_traits>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-/**
- * A non-owning view into a range of elements in a circular buffer.
- */
-template <class T>
-class CircularBufferRange
-{
-public:
-  CircularBufferRange() noexcept = default;
-
-  explicit CircularBufferRange(nostd::span<T> first) noexcept : first_{first} {}
-
-  CircularBufferRange(nostd::span<T> first, nostd::span<T> second) noexcept
-      : first_{first}, second_{second}
-  {}
-
-  operator CircularBufferRange<const T>() const noexcept { return {first_, second_}; }
-
-  /**
-   * Iterate over the elements in the range.
-   * @param callback the callback to call for each element
-   * @return true if we iterated over all elements
-   */
-  template <class Callback>
-  bool ForEach(Callback callback) const
-      noexcept(noexcept(std::declval<Callback>()(std::declval<T &>())))
-  {
-    for (auto &value : first_)
-    {
-      if (!callback(value))
-      {
-        return false;
-      }
-    }
-    for (auto &value : second_)
-    {
-      if (!callback(value))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * @return the number of elements in the range
-   */
-  size_t size() const noexcept { return first_.size() + second_.size(); }
-
-  /**
-   * @return true if the range is empty
-   */
-  bool empty() const noexcept { return first_.empty(); }
-
-  /**
-   * Return a subrange taken from the start of this range.
-   * @param n the number of element to take in the subrange
-   * @return a subrange of the first n elements in this range
-   */
-  CircularBufferRange Take(size_t n) const noexcept
-  {
-    assert(n <= size());
-    if (first_.size() >= n)
-    {
-      return CircularBufferRange{nostd::span<T>{first_.data(), n}};
-    }
-    return {first_, nostd::span<T>{second_.data(), n - first_.size()}};
-  }
-
-private:
-  nostd::span<T> first_;
-  nostd::span<T> second_;
-};
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/disabled.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/disabled.h
deleted file mode 100644
index ab181865d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/disabled.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-
-bool GetSdkDisabled();
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/empty_attributes.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/empty_attributes.h
deleted file mode 100644
index 4a699e7d3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/empty_attributes.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <array>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-/**
- * Maintain a static empty array of pairs that represents empty (default) attributes.
- * This helps to avoid constructing a new empty container every time a call is made
- * with default attributes.
- */
-static const opentelemetry::common::KeyValueIterableView<
-    std::array<std::pair<std::string, int32_t>, 0>> &
-GetEmptyAttributes() noexcept
-{
-  static const std::array<std::pair<std::string, int32_t>, 0> array{};
-  static const opentelemetry::common::KeyValueIterableView<
-      std::array<std::pair<std::string, int32_t>, 0>>
-      kEmptyAttributes(array);
-
-  return kEmptyAttributes;
-}
-
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/env_variables.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/env_variables.h
deleted file mode 100644
index 7bf28e2c1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/env_variables.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstdint>
-#include <string>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-
-/**
-  Read a boolean environment variable.
-  @param env_var_name Environment variable name
-  @param [out] value Variable value, if it exists
-  @return true if the variable exists
-*/
-bool GetBoolEnvironmentVariable(const char *env_var_name, bool &value);
-
-/**
-  Read a duration environment variable.
-  @param env_var_name Environment variable name
-  @param [out] value Variable value, if it exists
-  @return true if the variable exists
-*/
-bool GetDurationEnvironmentVariable(const char *env_var_name,
-                                    std::chrono::system_clock::duration &value);
-
-/**
-  Read a string environment variable.
-  @param env_var_name Environment variable name
-  @param [out] value Variable value, if it exists
-  @return true if the variable exists
-*/
-bool GetStringEnvironmentVariable(const char *env_var_name, std::string &value);
-
-/**
-  Read a uint32_t environment variable.
-  @param env_var_name Environment variable name
-  @param [out] value Variable value, if it exists
-  @return true if the variable exists
-*/
-bool GetUintEnvironmentVariable(const char *env_var_name, std::uint32_t &value);
-
-/**
-  Read a float environment variable.
-  @param env_var_name Environment variable name
-  @param [out] value Variable value, if it exists
-  @return true if the variable exists
-*/
-bool GetFloatEnvironmentVariable(const char *env_var_name, float &value);
-
-#if defined(_MSC_VER)
-inline int setenv(const char *name, const char *value, int)
-{
-  return _putenv_s(name, value);
-}
-
-inline int unsetenv(const char *name)
-{
-  return setenv(name, "", 1);
-}
-#endif
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/exporter_utils.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/exporter_utils.h
deleted file mode 100644
index 091f481f9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/exporter_utils.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-/**
- * ExportResult is returned as result of exporting a batch of Records.
- */
-enum class ExportResult
-{
-  // Batch was exported successfully.
-  kSuccess = 0,
-
-  // Batch exporting failed, caller must not retry exporting the same batch
-  // and the batch must be dropped.
-  kFailure = 1,
-
-  // The collection does not have enough space to receive the export batch.
-  kFailureFull = 2,
-
-  // The export() function was passed an invalid argument.
-  kFailureInvalidArgument = 3
-};
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/global_log_handler.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/global_log_handler.h
deleted file mode 100644
index 7930edcce..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/global_log_handler.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <sstream>  // IWYU pragma: keep
-#include <string>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/version.h"
-
-#define OTEL_INTERNAL_LOG_LEVEL_NONE 0
-#define OTEL_INTERNAL_LOG_LEVEL_ERROR 1
-#define OTEL_INTERNAL_LOG_LEVEL_WARN 2
-#define OTEL_INTERNAL_LOG_LEVEL_INFO 3
-#define OTEL_INTERNAL_LOG_LEVEL_DEBUG 4
-#ifndef OTEL_INTERNAL_LOG_LEVEL
-// DEBUG by default, we can change log level on runtime
-#  define OTEL_INTERNAL_LOG_LEVEL OTEL_INTERNAL_LOG_LEVEL_DEBUG
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-namespace internal_log
-{
-
-enum class LogLevel
-{
-  None    = OTEL_INTERNAL_LOG_LEVEL_NONE,
-  Error   = OTEL_INTERNAL_LOG_LEVEL_ERROR,
-  Warning = OTEL_INTERNAL_LOG_LEVEL_WARN,
-  Info    = OTEL_INTERNAL_LOG_LEVEL_INFO,
-  Debug   = OTEL_INTERNAL_LOG_LEVEL_DEBUG
-};
-
-inline std::string LevelToString(LogLevel level)
-{
-  switch (level)
-  {
-    case LogLevel::None:
-      return "None";
-    case LogLevel::Error:
-      return "Error";
-    case LogLevel::Warning:
-      return "Warning";
-    case LogLevel::Info:
-      return "Info";
-    case LogLevel::Debug:
-      return "Debug";
-  }
-  return {};
-}
-
-class LogHandler
-{
-public:
-  virtual ~LogHandler();
-
-  virtual void Handle(LogLevel level,
-                      const char *file,
-                      int line,
-                      const char *msg,
-                      const opentelemetry::sdk::common::AttributeMap &attributes) noexcept = 0;
-};
-
-class DefaultLogHandler : public LogHandler
-{
-public:
-  void Handle(LogLevel level,
-              const char *file,
-              int line,
-              const char *msg,
-              const opentelemetry::sdk::common::AttributeMap &attributes) noexcept override;
-};
-
-class NoopLogHandler : public LogHandler
-{
-public:
-  void Handle(LogLevel level,
-              const char *file,
-              int line,
-              const char *msg,
-              const opentelemetry::sdk::common::AttributeMap &error_attributes) noexcept override;
-};
-
-/**
- * Stores the singleton global LogHandler.
- */
-class GlobalLogHandler
-{
-public:
-  /**
-   * Returns the singleton LogHandler.
-   *
-   * By default, a default LogHandler is returned.
-   */
-  static nostd::shared_ptr<LogHandler> GetLogHandler() noexcept;
-
-  /**
-   * Changes the singleton LogHandler.
-   * This should be called once at the start of application before creating any Provider
-   * instance.
-   */
-  static void SetLogHandler(const nostd::shared_ptr<LogHandler> &eh) noexcept;
-
-  /**
-   * Returns the singleton log level.
-   *
-   * By default, a default log level is returned.
-   */
-  static LogLevel GetLogLevel() noexcept;
-
-  /**
-   * Changes the singleton Log level.
-   * This should be called once at the start of application before creating any Provider
-   * instance.
-   */
-  static void SetLogLevel(LogLevel level) noexcept;
-};
-
-}  // namespace internal_log
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-/**
- * GlobalLogHandler and TracerProvider/MeterProvider/LoggerProvider are lazy singletons.
- * To ensure that GlobalLogHandler is the first one to be initialized (and so last to be
- * destroyed), it is first used inside the constructors of TraceProvider, MeterProvider
- * and LoggerProvider for debug logging. */
-#define OTEL_INTERNAL_LOG_DISPATCH(level, message, attributes)                                    \
-  do                                                                                              \
-  {                                                                                               \
-    using opentelemetry::sdk::common::internal_log::GlobalLogHandler;                             \
-    using opentelemetry::sdk::common::internal_log::LogHandler;                                   \
-    if (level > GlobalLogHandler::GetLogLevel())                                                  \
-    {                                                                                             \
-      break;                                                                                      \
-    }                                                                                             \
-    opentelemetry::nostd::shared_ptr<LogHandler> log_handler = GlobalLogHandler::GetLogHandler(); \
-    if (!log_handler)                                                                             \
-    {                                                                                             \
-      break;                                                                                      \
-    }                                                                                             \
-    std::stringstream tmp_stream;                                                                 \
-    tmp_stream << message;                                                                        \
-    log_handler->Handle(level, __FILE__, __LINE__, tmp_stream.str().c_str(), attributes);         \
-  } while (false);
-
-#define OTEL_INTERNAL_LOG_GET_3RD_ARG(arg1, arg2, arg3, ...) arg3
-
-#if OTEL_INTERNAL_LOG_LEVEL >= OTEL_INTERNAL_LOG_LEVEL_ERROR
-#  define OTEL_INTERNAL_LOG_ERROR_1_ARGS(message)                                                  \
-    OTEL_INTERNAL_LOG_DISPATCH(opentelemetry::sdk::common::internal_log::LogLevel::Error, message, \
-                               {})
-#  define OTEL_INTERNAL_LOG_ERROR_2_ARGS(message, attributes)                                      \
-    OTEL_INTERNAL_LOG_DISPATCH(opentelemetry::sdk::common::internal_log::LogLevel::Error, message, \
-                               attributes)
-#  define OTEL_INTERNAL_LOG_ERROR_MACRO(...)                                   \
-    OTEL_INTERNAL_LOG_GET_3RD_ARG(__VA_ARGS__, OTEL_INTERNAL_LOG_ERROR_2_ARGS, \
-                                  OTEL_INTERNAL_LOG_ERROR_1_ARGS)
-#  define OTEL_INTERNAL_LOG_ERROR(...) OTEL_INTERNAL_LOG_ERROR_MACRO(__VA_ARGS__)(__VA_ARGS__)
-#else
-#  define OTEL_INTERNAL_LOG_ERROR(...)
-#endif
-
-#if OTEL_INTERNAL_LOG_LEVEL >= OTEL_INTERNAL_LOG_LEVEL_WARN
-#  define OTEL_INTERNAL_LOG_WARN_1_ARGS(message)                                            \
-    OTEL_INTERNAL_LOG_DISPATCH(opentelemetry::sdk::common::internal_log::LogLevel::Warning, \
-                               message, {})
-#  define OTEL_INTERNAL_LOG_WARN_2_ARGS(message, attributes)                                \
-    OTEL_INTERNAL_LOG_DISPATCH(opentelemetry::sdk::common::internal_log::LogLevel::Warning, \
-                               message, attributes)
-#  define OTEL_INTERNAL_LOG_WARN_MACRO(...)                                   \
-    OTEL_INTERNAL_LOG_GET_3RD_ARG(__VA_ARGS__, OTEL_INTERNAL_LOG_WARN_2_ARGS, \
-                                  OTEL_INTERNAL_LOG_WARN_1_ARGS)
-#  define OTEL_INTERNAL_LOG_WARN(...) OTEL_INTERNAL_LOG_WARN_MACRO(__VA_ARGS__)(__VA_ARGS__)
-#else
-#  define OTEL_INTERNAL_LOG_WARN(...)
-#endif
-
-#if OTEL_INTERNAL_LOG_LEVEL >= OTEL_INTERNAL_LOG_LEVEL_DEBUG
-#  define OTEL_INTERNAL_LOG_DEBUG_1_ARGS(message)                                                  \
-    OTEL_INTERNAL_LOG_DISPATCH(opentelemetry::sdk::common::internal_log::LogLevel::Debug, message, \
-                               {})
-#  define OTEL_INTERNAL_LOG_DEBUG_2_ARGS(message, attributes)                                      \
-    OTEL_INTERNAL_LOG_DISPATCH(opentelemetry::sdk::common::internal_log::LogLevel::Debug, message, \
-                               attributes)
-#  define OTEL_INTERNAL_LOG_DEBUG_MACRO(...)                                   \
-    OTEL_INTERNAL_LOG_GET_3RD_ARG(__VA_ARGS__, OTEL_INTERNAL_LOG_DEBUG_2_ARGS, \
-                                  OTEL_INTERNAL_LOG_DEBUG_1_ARGS)
-#  define OTEL_INTERNAL_LOG_DEBUG(...) OTEL_INTERNAL_LOG_DEBUG_MACRO(__VA_ARGS__)(__VA_ARGS__)
-#else
-#  define OTEL_INTERNAL_LOG_DEBUG(...)
-#endif
-
-#if OTEL_INTERNAL_LOG_LEVEL >= OTEL_INTERNAL_LOG_LEVEL_INFO
-#  define OTEL_INTERNAL_LOG_INFO_1_ARGS(message)                                                  \
-    OTEL_INTERNAL_LOG_DISPATCH(opentelemetry::sdk::common::internal_log::LogLevel::Info, message, \
-                               {})
-#  define OTEL_INTERNAL_LOG_INFO_2_ARGS(message, attributes)                                      \
-    OTEL_INTERNAL_LOG_DISPATCH(opentelemetry::sdk::common::internal_log::LogLevel::Info, message, \
-                               attributes)
-#  define OTEL_INTERNAL_LOG_INFO_MACRO(...)                                   \
-    OTEL_INTERNAL_LOG_GET_3RD_ARG(__VA_ARGS__, OTEL_INTERNAL_LOG_INFO_2_ARGS, \
-                                  OTEL_INTERNAL_LOG_INFO_1_ARGS)
-#  define OTEL_INTERNAL_LOG_INFO(...) OTEL_INTERNAL_LOG_INFO_MACRO(__VA_ARGS__)(__VA_ARGS__)
-#else
-#  define OTEL_INTERNAL_LOG_INFO(...)
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/thread_instrumentation.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/thread_instrumentation.h
deleted file mode 100644
index 7886af71b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/common/thread_instrumentation.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-
-/**
- * Thread instrumentation interface.
- * When the opentelemetry-cpp library executes internal threads,
- * the application linking with the opentelemetry-cpp library
- * may want to have some control on how the thread executes.
- *
- * There are many different use cases for this,
- * listing a few to illustrate.
- *
- * (1) The application may need to initialize thread local storage,
- * in an application specific way, because application code that
- * relies on thread local storage will be executed in the thread code path.
- * For example, custom samplers for traces, or custom observable instruments
- * for metrics, may expect specific thread local storage keys to exist.
- *
- * (2) The application may want opentelemetry-cpp threads to be observable
- * in a given way when exposed to the operating system.
- * For example, a linux application may want to give a name to
- * opentelemetry-cpp threads,
- * using [pthread_setname_np(3)](https://man7.org/linux/man-pages/man3/pthread_setname_np.3.html),
- * to help troubleshooting.
- *
- * (3) The application may want specific opentelemetry-cpp threads to use
- * application defined specific named network.
- * For example, a linux application may want to use
- * [setns(2)](https://man7.org/linux/man-pages/man2/setns.2.html)
- * on a per exporter basis, so that different exporters uses different networks.
- *
- * (4) The application may want to bind specific opentelemetry-cpp threads
- * to specific CPUs, for performance reasons.
- * For example, a linux application may want to use
- * [sched_setaffinity(2)](https://man7.org/linux/man-pages/man2/sched_setaffinity.2.html)
- * on a per thread basis.
- *
- * Providing dedicated opentelemetry-cpp interfaces in the SDK or exporters,
- * to support these use cases, is not practical, because the code involved
- * is highly platform dependent and use case dependent.
- *
- * Instead, the opentelemetry-cpp library provide hooks for applications
- * to implement their own, arbitrary, platform specific, logic.
- * This is done by implementing the ThreadInstrumentation interface
- * in the application, and providing a given ThreadInstrumentation object
- * when initializing the SDK or exporters.
- *
- * The opentelemetry-cpp library calls the following extension points,
- * when a ThreadInstrumentation is provided.
- *
- * Upon thread creation and termination, the methods OnStart() and OnEnd()
- * are invoked, respectively.
- *
- * When a thread is to block and wait, for example on a timer,
- * the methods BeforeWait() and AfterWait() are invoked.
- *
- * When a thread is to perform a chunk of work,
- * for example to process all the available data in an exporter,
- * the methods BeforeLoad() and AfterLoad() are invoked.
- */
-class ThreadInstrumentation
-{
-public:
-  ThreadInstrumentation()          = default;
-  virtual ~ThreadInstrumentation() = default;
-
-/*
- * This feature is experimental, protected by a _PREVIEW flag.
- */
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  virtual void OnStart() {}
-  virtual void OnEnd() {}
-  virtual void BeforeWait() {}
-  virtual void AfterWait() {}
-  virtual void BeforeLoad() {}
-  virtual void AfterLoad() {}
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-};
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h
deleted file mode 100644
index 52f58c6f4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace sdk
-{
-namespace instrumentationlibrary
-{
-
-using InstrumentationLibrary = instrumentationscope::InstrumentationScope;
-
-}  // namespace instrumentationlibrary
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h
deleted file mode 100644
index 68e9d10d4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-#include <type_traits>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace sdk
-{
-namespace instrumentationscope
-{
-
-using InstrumentationScopeAttributes = opentelemetry::sdk::common::AttributeMap;
-
-class InstrumentationScope
-{
-public:
-  InstrumentationScope(const InstrumentationScope &) = default;
-
-  /**
-   * Returns a newly created InstrumentationScope with the specified library name and version.
-   * @param name name of the instrumentation scope.
-   * @param version version of the instrumentation scope.
-   * @param schema_url schema url of the telemetry emitted by the library.
-   * @param attributes attributes of the instrumentation scope.
-   * @returns the newly created InstrumentationScope.
-   */
-  static nostd::unique_ptr<InstrumentationScope> Create(
-      nostd::string_view name,
-      nostd::string_view version                  = "",
-      nostd::string_view schema_url               = "",
-      InstrumentationScopeAttributes &&attributes = {})
-  {
-    return nostd::unique_ptr<InstrumentationScope>(
-        new InstrumentationScope{name, version, schema_url, std::move(attributes)});
-  }
-
-  /**
-   * Returns a newly created InstrumentationScope with the specified library name and version.
-   * @param name name of the instrumentation scope.
-   * @param version version of the instrumentation scope.
-   * @param schema_url schema url of the telemetry emitted by the library.
-   * @param attributes attributes of the instrumentation scope.
-   * @returns the newly created InstrumentationScope.
-   */
-  static nostd::unique_ptr<InstrumentationScope> Create(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      const InstrumentationScopeAttributes &attributes)
-  {
-    return nostd::unique_ptr<InstrumentationScope>(new InstrumentationScope{
-        name, version, schema_url, InstrumentationScopeAttributes(attributes)});
-  }
-
-  /**
-   * Returns a newly created InstrumentationScope with the specified library name and version.
-   * @param name name of the instrumentation scope.
-   * @param version version of the instrumentation scope.
-   * @param schema_url schema url of the telemetry emitted by the library.
-   * @param arg arguments used to create attributes of the instrumentation scope.
-   * @returns the newly created InstrumentationScope.
-   */
-  template <
-      class ArgumentType,
-      nostd::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
-          * = nullptr>
-  static nostd::unique_ptr<InstrumentationScope> Create(nostd::string_view name,
-                                                        nostd::string_view version,
-                                                        nostd::string_view schema_url,
-                                                        const ArgumentType &arg)
-  {
-    nostd::unique_ptr<InstrumentationScope> result = nostd::unique_ptr<InstrumentationScope>(
-        new InstrumentationScope{name, version, schema_url});
-
-    // Do not construct a KeyValueIterable, so it has better performance.
-    result->attributes_.reserve(opentelemetry::nostd::size(arg));
-    for (auto &argv : arg)
-    {
-      result->SetAttribute(argv.first, argv.second);
-    }
-
-    return result;
-  }
-
-  std::size_t HashCode() const noexcept { return hash_code_; }
-
-  /**
-   * Compare 2 instrumentation libraries.
-   * @param other the instrumentation scope to compare to.
-   * @returns true if the 2 instrumentation libraries are equal, false otherwise.
-   */
-  bool operator==(const InstrumentationScope &other) const noexcept
-  {
-    return this->name_ == other.name_ && this->version_ == other.version_ &&
-           this->schema_url_ == other.schema_url_ && this->attributes_ == other.attributes_;
-  }
-
-  /**
-   * Check whether the instrumentation scope has given name and version.
-   * This could be used to check version equality and avoid heap allocation.
-   * @param name name of the instrumentation scope to compare.
-   * @param version version of the instrumentation scope to compare.
-   * @param schema_url schema url of the telemetry emitted by the scope.
-   * @param attributes attributes of the instrumentation scope to compare.
-   * @returns true if name and version in this instrumentation scope are equal with the given name
-   * and version.
-   */
-  bool equal(const nostd::string_view name,
-             const nostd::string_view version,
-             const nostd::string_view schema_url                       = "",
-             const opentelemetry::common::KeyValueIterable *attributes = nullptr) const noexcept
-  {
-
-    if (this->name_ != name || this->version_ != version || this->schema_url_ != schema_url)
-    {
-      return false;
-    }
-
-    if (attributes == nullptr)
-    {
-      if (attributes_.empty())
-      {
-        return true;
-      }
-      return false;
-    }
-
-    return attributes_.EqualTo(*attributes);
-  }
-
-  const std::string &GetName() const noexcept { return name_; }
-  const std::string &GetVersion() const noexcept { return version_; }
-  const std::string &GetSchemaURL() const noexcept { return schema_url_; }
-  const InstrumentationScopeAttributes &GetAttributes() const noexcept { return attributes_; }
-
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept
-  {
-    attributes_[std::string(key)] =
-        nostd::visit(opentelemetry::sdk::common::AttributeConverter(), value);
-  }
-
-private:
-  InstrumentationScope(nostd::string_view name,
-                       nostd::string_view version,
-                       nostd::string_view schema_url               = "",
-                       InstrumentationScopeAttributes &&attributes = {})
-      : name_(name), version_(version), schema_url_(schema_url), attributes_(std::move(attributes))
-  {
-    std::string hash_data;
-    hash_data.reserve(name_.size() + version_.size() + schema_url_.size());
-    hash_data += name_;
-    hash_data += version_;
-    hash_data += schema_url_;
-    hash_code_ = std::hash<std::string>{}(hash_data);
-  }
-
-private:
-  std::string name_;
-  std::string version_;
-  std::string schema_url_;
-  std::size_t hash_code_;
-
-  InstrumentationScopeAttributes attributes_;
-};
-
-}  // namespace instrumentationscope
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationscope/scope_configurator.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationscope/scope_configurator.h
deleted file mode 100644
index f2d046f53..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/instrumentationscope/scope_configurator.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-#include <functional>
-
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace instrumentationscope
-{
-/**
- * A scope configurator is a function that returns the scope config for a given instrumentation
- * scope.
- */
-template <typename T>
-class ScopeConfigurator
-{
-public:
-  /**
-   * A builder class for the ScopeConfigurator that facilitates the creation of ScopeConfigurators.
-   */
-  class Builder
-  {
-  public:
-    /**
-     * Constructor for a builder object that cam be used to create a scope configurator. A minimally
-     * configured builder would build a ScopeConfigurator that applies the default_scope_config to
-     * every instrumentation scope.
-     * @param default_scope_config The default scope config that the built configurator should fall
-     * back on.
-     */
-    explicit Builder(T default_scope_config) noexcept : default_scope_config_(default_scope_config)
-    {}
-
-    /**
-     * Allows the user to pass a generic function that evaluates an instrumentation scope through a
-     * boolean check. If the check passes, the provided config is applied. Conditions are evaluated
-     * in order.
-     * @param scope_matcher a function that returns true if the scope being evaluated matches the
-     * criteria defined by the function.
-     * @param scope_config the scope configuration to return for the matched scope.
-     * @return this
-     */
-    Builder &AddCondition(std::function<bool(const InstrumentationScope &)> scope_matcher,
-                          T scope_config)
-    {
-      conditions_.emplace_back(scope_matcher, scope_config);
-      return *this;
-    }
-
-    /**
-     * A convenience condition that specifically matches the scope name of the scope being
-     * evaluated. If the scope name matches to the provided string, then the provided scope
-     * configuration is applied to the scope.
-     * @param scope_name The scope name to which the config needs to be applied.
-     * @param scope_config The scope config for the matching scopes.
-     * @return this
-     */
-    Builder &AddConditionNameEquals(nostd::string_view scope_name, T scope_config)
-    {
-      std::function<bool(const InstrumentationScope &)> name_equals_matcher =
-          [scope_name = std::string(scope_name)](const InstrumentationScope &scope_info) {
-            return scope_info.GetName() == scope_name;
-          };
-      conditions_.emplace_back(name_equals_matcher, scope_config);
-      return *this;
-    }
-
-    /**
-     * Constructs the scope configurator object that can be used to retrieve scope config depending
-     * on the instrumentation scope.
-     * @return a configured scope configurator.
-     */
-    ScopeConfigurator<T> Build() const
-    {
-      if (conditions_.size() == 0)
-      {
-        return ScopeConfigurator<T>(
-            [default_scope_config_ = this->default_scope_config_](const InstrumentationScope &) {
-              return default_scope_config_;
-            });
-      }
-
-      // Return a configurator that processes all the conditions
-      return ScopeConfigurator<T>(
-          [conditions_ = this->conditions_, default_scope_config_ = this->default_scope_config_](
-              const InstrumentationScope &scope_info) {
-            for (Condition condition : conditions_)
-            {
-              if (condition.scope_matcher(scope_info))
-              {
-                return condition.scope_config;
-              }
-            }
-            return default_scope_config_;
-          });
-    }
-
-  private:
-    /**
-     * An internal struct to encapsulate 'conditions' that can be applied to a
-     * ScopeConfiguratorBuilder. The applied conditions influence the behavior of the generated
-     * ScopeConfigurator.
-     */
-    struct Condition
-    {
-      std::function<bool(const InstrumentationScope &)> scope_matcher;
-      T scope_config;
-
-      Condition(const std::function<bool(const InstrumentationScope &)> &matcher, const T &config)
-          : scope_matcher(matcher), scope_config(config)
-      {}
-    };
-
-    T default_scope_config_;
-    std::vector<Condition> conditions_;
-  };
-
-  // Public methods for ScopeConfigurator
-
-  /**
-   * Invokes the underlying configurator function to get a valid scope configuration.
-   * @param scope_info The InstrumentationScope containing scope information for which configuration
-   * needs to be retrieved.
-   */
-  T ComputeConfig(const InstrumentationScope &scope_info) const
-  {
-    return this->configurator_(scope_info);
-  }
-
-private:
-  // Prevent direct initialization of ScopeConfigurator objects.
-  explicit ScopeConfigurator(std::function<T(const InstrumentationScope &)> configurator)
-      : configurator_(configurator)
-  {}
-
-  std::function<T(const InstrumentationScope &)> configurator_;
-};
-}  // namespace instrumentationscope
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h
deleted file mode 100644
index 9f36b18fc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <thread>
-
-#include "opentelemetry/sdk/common/circular_buffer.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_runtime_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-namespace logs
-{
-
-/**
- * This is an implementation of the LogRecordProcessor which creates batches of finished logs and
- * passes the export-friendly log data representations to the configured LogRecordExporter.
- */
-class BatchLogRecordProcessor : public LogRecordProcessor
-{
-public:
-  /**
-   * Creates a batch log processor by configuring the specified exporter and other parameters
-   * as per the official, language-agnostic opentelemetry specs.
-   *
-   * @param exporter - The backend exporter to pass the logs to
-   * @param max_queue_size -  The maximum buffer/queue size. After the size is reached, logs are
-   * dropped.
-   * @param scheduled_delay_millis - The time interval between two consecutive exports.
-   * @param max_export_batch_size - The maximum batch size of every export. It must be smaller or
-   * equal to max_queue_size
-   */
-  explicit BatchLogRecordProcessor(
-      std::unique_ptr<LogRecordExporter> &&exporter,
-      const size_t max_queue_size                            = 2048,
-      const std::chrono::milliseconds scheduled_delay_millis = std::chrono::milliseconds(5000),
-      const size_t max_export_batch_size                     = 512);
-
-  /**
-   * Creates a batch log processor by configuring the specified exporter and other parameters
-   * as per the official, language-agnostic opentelemetry specs.
-   *
-   * @param exporter The backend exporter to pass the logs to
-   * @param options The batch SpanProcessor configuration options.
-   */
-  explicit BatchLogRecordProcessor(std::unique_ptr<LogRecordExporter> &&exporter,
-                                   const BatchLogRecordProcessorOptions &options);
-
-  /**
-   * Creates a batch log processor by configuring the specified exporter and other parameters
-   * as per the official, language-agnostic opentelemetry specs.
-   *
-   * @param exporter The backend exporter to pass the logs to
-   * @param options The batch SpanProcessor configuration options.
-   * @param runtime_options The batch SpanProcessor runtime options.
-   */
-  explicit BatchLogRecordProcessor(std::unique_ptr<LogRecordExporter> &&exporter,
-                                   const BatchLogRecordProcessorOptions &options,
-                                   const BatchLogRecordProcessorRuntimeOptions &runtime_options);
-
-  /** Makes a new recordable **/
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Called when the Logger's log method creates a log record
-   * @param record the log record
-   */
-
-  void OnEmit(std::unique_ptr<Recordable> &&record) noexcept override;
-
-  /**
-   * Export all log records that have not been exported yet.
-   *
-   * NOTE: Timeout functionality not supported yet.
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of
-   * all its logs and passes them to the exporter. Any subsequent calls to
-   * ForceFlush or Shutdown will return immediately without doing anything.
-   *
-   * NOTE: Timeout functionality not supported yet.
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Class destructor which invokes the Shutdown() method.
-   */
-  ~BatchLogRecordProcessor() override;
-
-protected:
-  /**
-   * The background routine performed by the worker thread.
-   */
-  void DoBackgroundWork();
-
-  /**
-   * Exports all logs to the configured exporter.
-   *
-   */
-  virtual void Export();
-
-  /**
-   * Called when Shutdown() is invoked. Completely drains the queue of all log records and
-   * passes them to the exporter.
-   */
-  void DrainQueue();
-
-  struct SynchronizationData
-  {
-    /* Synchronization primitives */
-    std::condition_variable cv, force_flush_cv;
-    std::mutex cv_m, force_flush_cv_m, shutdown_m;
-
-    /* Important boolean flags to handle the workflow of the processor */
-    std::atomic<bool> is_force_wakeup_background_worker{false};
-    std::atomic<bool> is_shutdown{false};
-    std::atomic<uint64_t> force_flush_pending_sequence{0};
-    std::atomic<uint64_t> force_flush_notified_sequence{0};
-    std::atomic<std::chrono::microseconds::rep> force_flush_timeout_us{0};
-
-    // Do not use SynchronizationData() = default; here, some versions of GCC&Clang have BUGs
-    // and may not initialize the member correctly. See also
-    // https://stackoverflow.com/questions/53408962/try-to-understand-compiler-error-message-default-member-initializer-required-be
-    inline SynchronizationData() {}
-  };
-
-  /**
-   * @brief Notify completion of shutdown and force flush. This may be called from the any thread at
-   * any time
-   *
-   * @param notify_force_flush Sequence to indicate whether to notify force flush completion.
-   * @param synchronization_data Synchronization data to be notified.
-   */
-  static void NotifyCompletion(uint64_t notify_force_flush,
-                               const std::unique_ptr<LogRecordExporter> &exporter,
-                               const std::shared_ptr<SynchronizationData> &synchronization_data);
-
-  void GetWaitAdjustedTime(std::chrono::microseconds &timeout,
-                           std::chrono::time_point<std::chrono::system_clock> &start_time);
-
-  /* The configured backend log exporter */
-  std::unique_ptr<LogRecordExporter> exporter_;
-
-  /* Configurable parameters as per the official *trace* specs */
-  const size_t max_queue_size_;
-  const std::chrono::milliseconds scheduled_delay_millis_;
-  const size_t max_export_batch_size_;
-  /* The buffer/queue to which the ended logs are added */
-  opentelemetry::sdk::common::CircularBuffer<Recordable> buffer_;
-
-  std::shared_ptr<SynchronizationData> synchronization_data_;
-
-  /* The background worker thread */
-  std::shared_ptr<sdk::common::ThreadInstrumentation> worker_thread_instrumentation_;
-  std::thread worker_thread_;
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_factory.h
deleted file mode 100644
index 14be61450..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_factory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_runtime_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-namespace logs
-{
-
-/**
- * Factory class for BatchLogRecordProcessor.
- */
-class OPENTELEMETRY_EXPORT BatchLogRecordProcessorFactory
-{
-public:
-  /**
-   * Create a BatchLogRecordProcessor.
-   */
-  static std::unique_ptr<LogRecordProcessor> Create(std::unique_ptr<LogRecordExporter> &&exporter,
-                                                    const BatchLogRecordProcessorOptions &options);
-
-  /**
-   * Create a BatchLogRecordProcessor.
-   */
-  static std::unique_ptr<LogRecordProcessor> Create(
-      std::unique_ptr<LogRecordExporter> &&exporter,
-      const BatchLogRecordProcessorOptions &options,
-      const BatchLogRecordProcessorRuntimeOptions &runtime_options);
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h
deleted file mode 100644
index b130f947a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_options.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstddef>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-namespace logs
-{
-
-/**
- * Struct to hold batch SpanProcessor options.
- */
-struct BatchLogRecordProcessorOptions
-{
-  /**
-   * The maximum buffer/queue size. After the size is reached, spans are
-   * dropped.
-   */
-  size_t max_queue_size = 2048;
-
-  /* The time interval between two consecutive exports. */
-  std::chrono::milliseconds schedule_delay_millis = std::chrono::milliseconds(5000);
-
-  /**
-   * The maximum batch size of every export. It must be smaller or
-   * equal to max_queue_size.
-   */
-  size_t max_export_batch_size = 512;
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_runtime_options.h
deleted file mode 100644
index 9201ea129..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor_runtime_options.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstddef>
-
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-namespace logs
-{
-
-/**
- * Struct to hold batch SpanProcessor runtime options.
- */
-struct BatchLogRecordProcessorRuntimeOptions
-{
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger.h
deleted file mode 100644
index dcb93cb2d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-
-#include "opentelemetry/logs/event_logger.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-class OPENTELEMETRY_DEPRECATED EventLogger final : public opentelemetry::logs::EventLogger
-{
-public:
-  /**
-   * Initialize a new Eventlogger.
-   * @param delegate_logger The delegate logger instance
-   * @param event_domain Event domain
-   */
-  explicit EventLogger(nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger,
-                       nostd::string_view event_domain) noexcept;
-
-  /**
-   * Returns the name of this logger.
-   */
-  const opentelemetry::nostd::string_view GetName() noexcept override;
-
-  nostd::shared_ptr<opentelemetry::logs::Logger> GetDelegateLogger() noexcept override;
-
-  using opentelemetry::logs::EventLogger::EmitEvent;
-
-  void EmitEvent(nostd::string_view event_name,
-                 nostd::unique_ptr<opentelemetry::logs::LogRecord> &&log_record) noexcept override;
-
-private:
-  nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger_;
-  std::string event_domain_;
-};
-#endif
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h
deleted file mode 100644
index 351985c33..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0/
-
-#pragma once
-
-#include "opentelemetry/logs/event_logger.h"
-#include "opentelemetry/logs/event_logger_provider.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-// Define the maximum number of loggers that are allowed to be registered to the loggerprovider.
-// TODO: Add link to logging spec once this is added to it
-#define MAX_LOGGER_COUNT 100
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-class OPENTELEMETRY_EXPORT OPENTELEMETRY_DEPRECATED EventLoggerProvider final
-    : public opentelemetry::logs::EventLoggerProvider
-{
-public:
-  EventLoggerProvider() noexcept;
-
-  ~EventLoggerProvider() override;
-
-  nostd::shared_ptr<opentelemetry::logs::EventLogger> CreateEventLogger(
-      nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger,
-      nostd::string_view event_domain) noexcept override;
-};
-#endif
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h
deleted file mode 100644
index a57112d76..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/event_logger_provider_factory.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0/
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/logs/event_logger_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-/**
- * Factory class for EventLoggerProvider.
- */
-class OPENTELEMETRY_DEPRECATED EventLoggerProviderFactory
-{
-public:
-  /**
-   * Create a EventLoggerProvider.
-   */
-
-  OPENTELEMETRY_DEPRECATED static std::unique_ptr<opentelemetry::sdk::logs::EventLoggerProvider>
-  Create();
-};
-#endif
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/exporter.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/exporter.h
deleted file mode 100644
index 5e83fe460..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/exporter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-/**
- * LogRecordExporter defines the interface that log exporters must implement.
- */
-class OPENTELEMETRY_EXPORT LogRecordExporter
-{
-public:
-  LogRecordExporter();
-  virtual ~LogRecordExporter();
-
-  /**
-   * Create a log recordable. This object will be used to record log data and
-   * will subsequently be passed to LogRecordExporter::Export. Vendors can implement
-   * custom recordables or use the default ReadWriteLogRecord recordable provided by the
-   * SDK.
-   * @return a newly initialized Recordable object
-   *
-   * Note: This method must be callable from multiple threads.
-   */
-  virtual std::unique_ptr<Recordable> MakeRecordable() noexcept = 0;
-
-  /**
-   * Exports the batch of log records to their export destination.
-   * This method must not be called concurrently for the same exporter instance.
-   * The exporter may attempt to retry sending the batch, but should drop
-   * and return kFailure after a certain timeout.
-   * @param records a span of unique pointers to log records
-   * @returns an ExportResult code (whether export was success or failure)
-   */
-  virtual sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<Recordable>> &records) noexcept = 0;
-
-  /**
-   * Force flush the log records pushed into this log exporter.
-   */
-  virtual bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-
-  /**
-   * Marks the exporter as ShutDown and cleans up any resources as required.
-   * Shutdown should be called only once for each Exporter instance.
-   * @param timeout minimum amount of microseconds to wait for shutdown before giving up and
-   * returning failure.
-   * @return true if the exporter shutdown succeeded, false otherwise
-   */
-  virtual bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-};
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger.h
deleted file mode 100644
index cb8ff6ab3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "logger_config.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/noop.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-class Logger final : public opentelemetry::logs::Logger
-{
-public:
-  /**
-   * Initialize a new logger.
-   * @param name The name of this logger instance
-   * @param context The logger provider that owns this logger.
-   */
-  explicit Logger(
-      opentelemetry::nostd::string_view name,
-      std::shared_ptr<LoggerContext> context,
-      std::unique_ptr<instrumentationscope::InstrumentationScope> instrumentation_scope =
-          instrumentationscope::InstrumentationScope::Create("")) noexcept;
-
-  /**
-   * Returns the name of this logger.
-   */
-  const opentelemetry::nostd::string_view GetName() noexcept override;
-
-  nostd::unique_ptr<opentelemetry::logs::LogRecord> CreateLogRecord() noexcept override;
-
-  using opentelemetry::logs::Logger::EmitLogRecord;
-
-  void EmitLogRecord(
-      nostd::unique_ptr<opentelemetry::logs::LogRecord> &&log_record) noexcept override;
-
-  /** Returns the associated instrumentation scope */
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope &GetInstrumentationScope()
-      const noexcept;
-
-  OPENTELEMETRY_DEPRECATED_MESSAGE("Please use GetInstrumentationScope instead")
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope &GetInstrumentationLibrary()
-      const noexcept
-  {
-    return GetInstrumentationScope();
-  }
-
-private:
-  // The name of this logger
-  std::string logger_name_;
-
-  // order of declaration is important here - instrumentation scope should destroy after
-  // logger-context.
-  std::unique_ptr<instrumentationscope::InstrumentationScope> instrumentation_scope_;
-  std::shared_ptr<LoggerContext> context_;
-  LoggerConfig logger_config_;
-  static opentelemetry::logs::NoopLogger kNoopLogger;
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_config.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_config.h
deleted file mode 100644
index 650410299..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-/**
- * LoggerConfig defines various configurable aspects of a Logger's behavior.
- * This class should not be used directly to configure a Logger's behavior, instead a
- * ScopeConfigurator should be used to compute the desired LoggerConfig which can then be used to
- * configure a Logger.
- */
-class OPENTELEMETRY_EXPORT LoggerConfig
-{
-public:
-  bool operator==(const LoggerConfig &other) const noexcept;
-
-  /**
-   * Returns if the Logger is enabled or disabled. Loggers are enabled by default.
-   * @return a boolean indicating if the Logger is enabled. Defaults to true.
-   */
-  bool IsEnabled() const noexcept;
-
-  /**
-   * Returns a LoggerConfig that represents an enabled Logger.
-   * @return a static constant LoggerConfig that represents an enabled logger.
-   */
-  static LoggerConfig Enabled();
-
-  /**
-   * Returns a LoggerConfig that represents a disabled Logger. A disabled logger behaves like a
-   * no-op logger.
-   * @return a static constant LoggerConfig that represents a disabled logger.
-   */
-  static LoggerConfig Disabled();
-
-  /**
-   * Returns a LoggerConfig that represents a Logger configured with the default behavior.
-   * The default behavior is guided by the OpenTelemetry specification.
-   * @return a static constant LoggerConfig that represents a logger configured with default
-   * behavior.
-   */
-  static LoggerConfig Default();
-
-private:
-  explicit LoggerConfig(const bool disabled = false) : disabled_(disabled) {}
-
-  bool disabled_;
-};
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_context.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_context.h
deleted file mode 100644
index 038da2d94..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_context.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <vector>
-
-#include "logger_config.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-/**
- * A class which stores the LoggerContext context.
- *
- * This class meets the following design criteria:
- * - A shared reference between LoggerProvider and Logger instantiated.
- * - A thread-safe class that allows updating/altering processor/exporter pipelines
- *   and sampling config.
- * - The owner/destroyer of Processors/Exporters.  These will remain active until
- *   this class is destroyed.  I.e. Sampling, Exporting, flushing, Custom Iterator etc. are all ok
- * if this object is alive, and they will work together. If this object is destroyed, then no shared
- * references to Processor, Exporter, Recordable, Custom Iterator etc. should exist, and all
- *   associated pipelines will have been flushed.
- */
-class LoggerContext
-{
-public:
-  explicit LoggerContext(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource =
-          opentelemetry::sdk::resource::Resource::Create({}),
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator =
-          std::make_unique<instrumentationscope::ScopeConfigurator<LoggerConfig>>(
-              instrumentationscope::ScopeConfigurator<LoggerConfig>::Builder(
-                  LoggerConfig::Default())
-                  .Build())) noexcept;
-
-  /**
-   * Attaches a log processor to list of configured processors to this logger context.
-   * Processor once attached can't be removed.
-   * @param processor The new log processor for this tracer. This must not be
-   * a nullptr. Ownership is given to the `LoggerContext`.
-   *
-   * Note: This method is not thread safe.
-   */
-  void AddProcessor(std::unique_ptr<LogRecordProcessor> processor) noexcept;
-
-  /**
-   * Obtain the configured (composite) processor.
-   *
-   * Note: When more than one processor is active, this will
-   * return an "aggregate" processor
-   */
-  LogRecordProcessor &GetProcessor() const noexcept;
-
-  /**
-   * Obtain the resource associated with this tracer context.
-   * @return The resource for this tracer context.
-   */
-  const opentelemetry::sdk::resource::Resource &GetResource() const noexcept;
-
-  /**
-   * Obtain the ScopeConfigurator with this logger context.
-   * @return The ScopeConfigurator for this logger context.
-   */
-  const instrumentationscope::ScopeConfigurator<LoggerConfig> &GetLoggerConfigurator()
-      const noexcept;
-
-  /**
-   * Force all active LogProcessors to flush any buffered logs
-   * within the given timeout.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Shutdown the log processor associated with this tracer provider.
-   */
-  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-private:
-  //  order of declaration is important here - resource object should be destroyed after processor.
-  opentelemetry::sdk::resource::Resource resource_;
-  std::unique_ptr<LogRecordProcessor> processor_;
-
-  std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator_;
-};
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_context_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_context_factory.h
deleted file mode 100644
index 333c76f51..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_context_factory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-/**
- * Factory class for LoggerContext.
- */
-class LoggerContextFactory
-{
-public:
-  /**
-   * Create a LoggerContext with specified LogRecordProcessors.
-   * @param processors A vector of log processors that can parse the logs.
-   * @return A unique pointer to the created LoggerContext object.
-   */
-  static std::unique_ptr<LoggerContext> Create(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors);
-
-  /**
-   * Create a LoggerContext with specified LogRecordProcessors and OpenTelemetry resource.
-   * @param processors A vector of log processors that can parse the logs.
-   * @param resource The OpenTelemetry resource responsible for generating the logs.
-   * @return A unique pointer to the created LoggerContext object.
-   */
-  static std::unique_ptr<LoggerContext> Create(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource);
-
-  /**
-   * Create a LoggerContext with specified LogRecordProcessors, OpenTelemetry resource and a logger
-   * ScopeConfigurator.
-   * @param processors A vector of log processors that can parse the logs.
-   * @param resource The OpenTelemetry resource responsible for generating the logs.
-   * @param logger_configurator A ScopeConfigurator that can be used compute the LoggerConfig for a
-   * given InstrumentationScope.
-   * @return A unique pointer to the created LoggerContext object.
-   */
-  static std::unique_ptr<LoggerContext> Create(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator);
-};
-
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_provider.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_provider.h
deleted file mode 100644
index ee5165ebd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_provider.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0/
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <mutex>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/logs/logger.h"
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-// Define the maximum number of loggers that are allowed to be registered to the loggerprovider.
-// TODO: Add link to logging spec once this is added to it
-#define MAX_LOGGER_COUNT 100
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-class OPENTELEMETRY_EXPORT LoggerProvider final : public opentelemetry::logs::LoggerProvider
-{
-public:
-  /**
-   * Initialize a new logger provider.
-   * @param processor The log record processor for this logger provider. This must
-   * not be a nullptr.
-   * @param resource  The resources for this logger provider.
-   */
-  explicit LoggerProvider(
-      std::unique_ptr<LogRecordProcessor> &&processor,
-      const opentelemetry::sdk::resource::Resource &resource =
-          opentelemetry::sdk::resource::Resource::Create({}),
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator =
-          std::make_unique<instrumentationscope::ScopeConfigurator<LoggerConfig>>(
-              instrumentationscope::ScopeConfigurator<LoggerConfig>::Builder(
-                  LoggerConfig::Default())
-                  .Build())) noexcept;
-
-  /**
-   * Initialize a new logger provider.
-   * @param processors A list of log record processors for this logger provider.
-   * @param resource  The resources for this logger provider.
-   * @param logger_configurator The scope configurator used to determine the configs for loggers
-   * created using this logger provider.
-   */
-  explicit LoggerProvider(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource =
-          opentelemetry::sdk::resource::Resource::Create({}),
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator =
-          std::make_unique<instrumentationscope::ScopeConfigurator<LoggerConfig>>(
-              instrumentationscope::ScopeConfigurator<LoggerConfig>::Builder(
-                  LoggerConfig::Default())
-                  .Build())) noexcept;
-
-  /**
-   * Initialize a new logger provider. A processor must later be assigned
-   * to this logger provider via the AddProcessor() method.
-   */
-  explicit LoggerProvider() noexcept;
-
-  /**
-   * Initialize a new logger provider with a specified context
-   * @param context The owned logger configuration/pipeline for this provider.
-   */
-  explicit LoggerProvider(std::unique_ptr<LoggerContext> context) noexcept;
-
-  ~LoggerProvider() override;
-
-  using opentelemetry::logs::LoggerProvider::GetLogger;
-
-  /**
-   * Creates a logger with the given name, and returns a shared pointer to it.
-   * If a logger with that name already exists, return a shared pointer to it
-   * @param logger_name The name of the logger to be created.
-   * @param library_name The version of the library.
-   * @param library_version The version of the library.
-   * @param schema_url The schema URL.
-   */
-  nostd::shared_ptr<opentelemetry::logs::Logger> GetLogger(
-      nostd::string_view logger_name,
-      nostd::string_view library_name,
-      nostd::string_view library_version = "",
-      nostd::string_view schema_url      = "",
-      const opentelemetry::common::KeyValueIterable &attributes =
-          opentelemetry::common::NoopKeyValueIterable()) noexcept override;
-
-  /**
-   * Add the processor that is stored internally in the logger provider.
-   * @param processor The processor to be stored inside the logger provider.
-   * This must not be a nullptr.
-   */
-  void AddProcessor(std::unique_ptr<LogRecordProcessor> processor) noexcept;
-
-  /**
-   * Obtain the resource associated with this logger provider.
-   * @return The resource for this logger provider.
-   */
-  const opentelemetry::sdk::resource::Resource &GetResource() const noexcept;
-
-  /**
-   * Shutdown the log processor associated with this log provider.
-   */
-  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Force flush the log processor associated with this log provider.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-private:
-  // order of declaration is important here - loggers should destroy only after context.
-  std::vector<std::shared_ptr<opentelemetry::sdk::logs::Logger>> loggers_;
-  std::shared_ptr<LoggerContext> context_;
-  std::mutex lock_;
-};
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_provider_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_provider_factory.h
deleted file mode 100644
index 6745b39ce..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/logger_provider_factory.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0/
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-/**
- * Factory class for LoggerProvider.
- */
-class OPENTELEMETRY_EXPORT LoggerProviderFactory
-{
-public:
-  /**
-   * Create a LoggerProvider.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> Create(
-      std::unique_ptr<LogRecordProcessor> &&processor);
-
-  /**
-   * Create a LoggerProvider.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> Create(
-      std::unique_ptr<LogRecordProcessor> &&processor,
-      const opentelemetry::sdk::resource::Resource &resource);
-
-  /**
-   * Create a LoggerProvider.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> Create(
-      std::unique_ptr<LogRecordProcessor> &&processor,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator);
-
-  /**
-   * Create a LoggerProvider.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> Create(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors);
-
-  /**
-   * Create a LoggerProvider.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> Create(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource);
-
-  /**
-   * Create a LoggerProvider.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> Create(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator);
-
-  /**
-   * Create a LoggerProvider.
-   */
-  static std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> Create(
-      std::unique_ptr<LoggerContext> context);
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h
deleted file mode 100644
index 46432ef22..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-/**
- * Log processor allow hooks for receive method invocations.
- *
- * Built-in log processors are responsible for batching and conversion of
- * logs to exportable representation and passing batches to exporters.
- */
-class MultiLogRecordProcessor : public LogRecordProcessor
-{
-public:
-  MultiLogRecordProcessor(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors);
-  ~MultiLogRecordProcessor() override;
-
-  void AddProcessor(std::unique_ptr<LogRecordProcessor> &&processor);
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * OnEmit is called by the SDK once a log record has been successfully created.
-   * @param record the log record
-   */
-  void OnEmit(std::unique_ptr<Recordable> &&record) noexcept override;
-
-  /**
-   * Exports all log records that have not yet been exported to the configured Exporter.
-   * @param timeout that the forceflush is required to finish within.
-   * @return a result code indicating whether it succeeded, failed or timed out
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shuts down the processor and does any cleanup required.
-   * ShutDown should only be called once for each processor.
-   * @param timeout minimum amount of microseconds to wait for
-   * shutdown before giving up and returning failure.
-   * @return true if the shutdown succeeded, false otherwise
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-private:
-  std::vector<std::unique_ptr<LogRecordProcessor>> processors_;
-};
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor_factory.h
deleted file mode 100644
index 351b9c0f7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor_factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-/**
- * Factory class for MultiLogRecordProcessor.
- */
-class OPENTELEMETRY_EXPORT MultiLogRecordProcessorFactory
-{
-public:
-  static std::unique_ptr<LogRecordProcessor> Create(
-      std::vector<std::unique_ptr<LogRecordProcessor>> &&processors);
-};
-
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_recordable.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_recordable.h
deleted file mode 100644
index 40a9c92e3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/multi_recordable.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <cstddef>
-#include <memory>
-#include <unordered_map>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-class MultiRecordable final : public Recordable
-{
-public:
-  void AddRecordable(const LogRecordProcessor &processor,
-                     std::unique_ptr<Recordable> recordable) noexcept;
-
-  const std::unique_ptr<Recordable> &GetRecordable(
-      const LogRecordProcessor &processor) const noexcept;
-
-  std::unique_ptr<Recordable> ReleaseRecordable(const LogRecordProcessor &processor) noexcept;
-
-  /**
-   * Set the timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  void SetTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  /**
-   * Set the observed timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  void SetObservedTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  /**
-   * Set the severity for this log.
-   * @param severity the severity of the event
-   */
-  void SetSeverity(opentelemetry::logs::Severity severity) noexcept override;
-
-  /**
-   * Set body field for this log.
-   * @param message the body to set
-   */
-  void SetBody(const opentelemetry::common::AttributeValue &message) noexcept override;
-
-  /**
-   * Set the event id
-   * @param id the event id to set
-   * @param name  the event name to set
-   */
-  void SetEventId(int64_t id, nostd::string_view name) noexcept override;
-
-  /**
-   * Set the trace id for this log.
-   * @param trace_id the trace id to set
-   */
-  void SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept override;
-
-  /**
-   * Set the span id for this log.
-   * @param span_id the span id to set
-   */
-  void SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept override;
-
-  /**
-   * Inject trace_flags for this log.
-   * @param trace_flags the trace flags to set
-   */
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept override;
-
-  /**
-   * Set an attribute of a log.
-   * @param key the name of the attribute
-   * @param value the attribute value
-   */
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override;
-
-  /**
-   * Set Resource of this log
-   * @param Resource the resource to set
-   */
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override;
-
-  /**
-   * Set instrumentation_scope for this log.
-   * @param instrumentation_scope the instrumentation scope to set
-   */
-  void SetInstrumentationScope(const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-                                   &instrumentation_scope) noexcept override;
-
-private:
-  std::unordered_map<std::size_t, std::unique_ptr<Recordable>> recordables_;
-};
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/processor.h
deleted file mode 100644
index 57dbdb213..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/processor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-class Recordable;
-
-/**
- * The Log Processor is responsible for passing log records
- * to the configured exporter.
- */
-class LogRecordProcessor
-{
-public:
-  virtual ~LogRecordProcessor() = default;
-
-  /**
-   * Create a log recordable. This requests a new log recordable from the
-   * associated exporter.
-   *
-   * @return a newly initialized recordable
-   *
-   * Note: This method must be callable from multiple threads.
-   */
-  virtual std::unique_ptr<Recordable> MakeRecordable() noexcept = 0;
-
-  /**
-   * OnEmit is called by the SDK once a log record has been successfully created.
-   * @param record the log recordable object
-   */
-  virtual void OnEmit(std::unique_ptr<Recordable> &&record) noexcept = 0;
-
-  /**
-   * Exports all log records that have not yet been exported to the configured Exporter.
-   * @param timeout that the forceflush is required to finish within.
-   * @return a result code indicating whether it succeeded, failed or timed out
-   */
-  virtual bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-
-  /**
-   * Shuts down the processor and does any cleanup required.
-   * ShutDown should only be called once for each processor.
-   * @param timeout minimum amount of microseconds to wait for
-   * shutdown before giving up and returning failure.
-   * @return true if the shutdown succeeded, false otherwise
-   */
-  virtual bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-};
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/provider.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/provider.h
deleted file mode 100644
index aa637e699..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/provider.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-namespace logs
-{
-
-/**
- * Changes the singleton global LoggerProvider.
- */
-class Provider
-{
-public:
-  /**
-   * Changes the singleton LoggerProvider.
-   */
-  static void SetLoggerProvider(
-      const nostd::shared_ptr<opentelemetry::logs::LoggerProvider> &lp) noexcept;
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/read_write_log_record.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/read_write_log_record.h
deleted file mode 100644
index af28273c4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/read_write_log_record.h
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-#include <unordered_map>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/logs/readable_log_record.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-/**
- * Maintains a representation of a log in a format that can be processed by a recorder.
- *
- * This class is thread-compatible.
- */
-class ReadWriteLogRecord final : public ReadableLogRecord
-{
-public:
-  ReadWriteLogRecord();
-  ~ReadWriteLogRecord() override;
-
-  /**
-   * Set the timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  void SetTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  /**
-   * Get the timestamp of this log.
-   * @return the timestamp of this log
-   */
-  opentelemetry::common::SystemTimestamp GetTimestamp() const noexcept override;
-
-  /**
-   * Set the observed timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  void SetObservedTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  /**
-   * Get the observed timestamp of this log.
-   * @return the observed timestamp of this log
-   */
-  opentelemetry::common::SystemTimestamp GetObservedTimestamp() const noexcept override;
-
-  /**
-   * Set the severity for this log.
-   * @param severity the severity of the event
-   */
-  void SetSeverity(opentelemetry::logs::Severity severity) noexcept override;
-
-  /**
-   * Get the severity of this log.
-   * @return the severity of this log
-   */
-  opentelemetry::logs::Severity GetSeverity() const noexcept override;
-
-  /**
-   * Set body field for this log.
-   * @param message the body to set
-   */
-  void SetBody(const opentelemetry::common::AttributeValue &message) noexcept override;
-
-  /**
-   * Get body field of this log.
-   * @return the body field for this log.
-   */
-  const opentelemetry::sdk::common::OwnedAttributeValue &GetBody() const noexcept override;
-
-  /**
-   * Set the Event Id object
-   * @param id  the event Id to set
-   * @param name the event name to set
-   */
-  void SetEventId(int64_t id, nostd::string_view name) noexcept override;
-
-  /**
-   * Get event Id of this log.
-   * @return the event Id of this log.
-   */
-  int64_t GetEventId() const noexcept override;
-
-  /**
-   * Get event name of this log.
-   * @return the event name of this log.
-   */
-  nostd::string_view GetEventName() const noexcept override;
-
-  /**
-   * Set the trace id for this log.
-   * @param trace_id the trace id to set
-   */
-  void SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept override;
-
-  /**
-   * Get the trace id of this log.
-   * @return the trace id of this log
-   */
-  const opentelemetry::trace::TraceId &GetTraceId() const noexcept override;
-
-  /**
-   * Set the span id for this log.
-   * @param span_id the span id to set
-   */
-  void SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept override;
-
-  /**
-   * Get the span id of this log.
-   * @return the span id of this log
-   */
-  const opentelemetry::trace::SpanId &GetSpanId() const noexcept override;
-
-  /**
-   * Inject trace_flags for this log.
-   * @param trace_flags the trace flags to set
-   */
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept override;
-
-  /**
-   * Inject trace_flags of this log.
-   * @return trace_flags of this log
-   */
-  const opentelemetry::trace::TraceFlags &GetTraceFlags() const noexcept override;
-
-  /**
-   * Set an attribute of a log.
-   * @param key the name of the attribute
-   * @param value the attribute value
-   */
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override;
-
-  /**
-   * Get attributes of this log.
-   * @return the body field of this log
-   */
-  const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &
-  GetAttributes() const noexcept override;
-
-  /**
-   * Get resource of this log
-   * @return the resource of this log
-   */
-  const opentelemetry::sdk::resource::Resource &GetResource() const noexcept override;
-
-  /**
-   * Set Resource of this log
-   * @param Resource the resource to set
-   */
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override;
-
-  /**
-   * Get instrumentation_scope of this log.
-   * @return  the instrumentation_scope of this log
-   */
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope &GetInstrumentationScope()
-      const noexcept override;
-
-  /**
-   * Set instrumentation_scope for this log.
-   * @param instrumentation_scope the instrumentation scope to set
-   */
-  void SetInstrumentationScope(const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-                                   &instrumentation_scope) noexcept override;
-
-private:
-  // Default values are set by the respective data structures' constructors for all fields,
-  // except the severity field, which must be set manually (an enum with no default value).
-  opentelemetry::logs::Severity severity_;
-  const opentelemetry::sdk::resource::Resource *resource_;
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope *instrumentation_scope_;
-
-  std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> attributes_map_;
-  opentelemetry::sdk::common::OwnedAttributeValue body_;
-  opentelemetry::common::SystemTimestamp timestamp_;
-  opentelemetry::common::SystemTimestamp observed_timestamp_;
-
-  int64_t event_id_;
-  std::string event_name_;
-
-  // We do not pay for trace state when not necessary
-  struct TraceState
-  {
-    opentelemetry::trace::TraceId trace_id;
-    opentelemetry::trace::SpanId span_id;
-    opentelemetry::trace::TraceFlags trace_flags;
-  };
-  std::unique_ptr<TraceState> trace_state_;
-};
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/readable_log_record.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/readable_log_record.h
deleted file mode 100644
index 3245717ce..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/readable_log_record.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <string>
-#include <unordered_map>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-class SpanId;
-class TraceId;
-class TraceFlags;
-}  // namespace trace
-
-namespace sdk
-{
-namespace resource
-{
-class Resource;
-}  // namespace resource
-
-namespace instrumentationscope
-{
-class InstrumentationScope;
-}  // namespace instrumentationscope
-
-namespace logs
-{
-/**
- * Maintains a representation of a log in a format that can be processed by a recorder.
- *
- * This class is thread-compatible.
- */
-class ReadableLogRecord : public Recordable
-{
-public:
-  /**
-   * Get the timestamp of this log.
-   * @return the timestamp of this log
-   */
-  virtual opentelemetry::common::SystemTimestamp GetTimestamp() const noexcept = 0;
-
-  /**
-   * Get the observed timestamp of this log.
-   * @return the observed timestamp of this log
-   */
-  virtual opentelemetry::common::SystemTimestamp GetObservedTimestamp() const noexcept = 0;
-
-  /**
-   * Get the severity of this log.
-   * @return the severity of this log
-   */
-  virtual opentelemetry::logs::Severity GetSeverity() const noexcept = 0;
-
-  /**
-   * Get the severity text of this log.
-   * @return the severity text for this log
-   */
-  virtual nostd::string_view GetSeverityText() const noexcept;
-
-  /**
-   * Get body field of this log.
-   * @return the body field for this log.
-   */
-  virtual const opentelemetry::sdk::common::OwnedAttributeValue &GetBody() const noexcept = 0;
-
-  /**
-   * Get the Event id.
-   * @return the event id
-   */
-  virtual int64_t GetEventId() const noexcept = 0;
-
-  /**
-   * Get the Event Name.
-   * @return the event name
-   */
-  virtual nostd::string_view GetEventName() const noexcept = 0;
-
-  /**
-   * Get the trace id of this log.
-   * @return the trace id of this log
-   */
-  virtual const opentelemetry::trace::TraceId &GetTraceId() const noexcept = 0;
-
-  /**
-   * Get the span id of this log.
-   * @return the span id of this log
-   */
-  virtual const opentelemetry::trace::SpanId &GetSpanId() const noexcept = 0;
-
-  /**
-   * Inject trace_flags of this log.
-   * @return trace_flags of this log
-   */
-  virtual const opentelemetry::trace::TraceFlags &GetTraceFlags() const noexcept = 0;
-
-  /**
-   * Get attributes of this log.
-   * @return the body field of this log
-   */
-  virtual const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &
-  GetAttributes() const noexcept = 0;
-
-  /**
-   * Get resource of this log
-   * @return the resource of this log
-   */
-  virtual const opentelemetry::sdk::resource::Resource &GetResource() const noexcept = 0;
-
-  /**
-   * Get instrumentation scope of this log.
-   * @return  the instrumentation scope of this log
-   */
-  virtual const opentelemetry::sdk::instrumentationscope::InstrumentationScope &
-  GetInstrumentationScope() const noexcept = 0;
-
-  /**
-   * Get default instrumentation scope of logs.
-   * @return  the default instrumentation scope of logs
-   */
-  static const opentelemetry::sdk::instrumentationscope::InstrumentationScope &
-  GetDefaultInstrumentationScope() noexcept;
-
-  /**
-   * Get default resource of logs.
-   * @return  the default resource of logs
-   */
-  static const opentelemetry::sdk::resource::Resource &GetDefaultResource() noexcept;
-};
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/recordable.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/recordable.h
deleted file mode 100644
index 65f5f6ae9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/recordable.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace resource
-{
-class Resource;
-}  // namespace resource
-
-namespace instrumentationscope
-{
-class InstrumentationScope;
-}  // namespace instrumentationscope
-
-namespace logs
-{
-/**
- * Maintains a representation of a log in a format that can be processed by a recorder.
- *
- * This class is thread-compatible.
- */
-
-class Recordable : public opentelemetry::logs::LogRecord
-{
-public:
-  /**
-   * Set Resource of this log
-   * @param Resource the resource to set
-   */
-  virtual void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept = 0;
-
-  /**
-   * Set instrumentation_scope for this log.
-   * @param instrumentation_scope the instrumentation scope to set
-   */
-  virtual void SetInstrumentationScope(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-          &instrumentation_scope) noexcept = 0;
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/simple_log_record_processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/simple_log_record_processor.h
deleted file mode 100644
index 23b6efa46..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/simple_log_record_processor.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-/**
- * The simple log processor passes all log records
- * in a batch of 1 to the configured
- * LogRecordExporter.
- *
- * All calls to the configured LogRecordExporter are synchronized using a
- * spin-lock on an atomic_flag.
- */
-class SimpleLogRecordProcessor : public LogRecordProcessor
-{
-
-public:
-  explicit SimpleLogRecordProcessor(std::unique_ptr<LogRecordExporter> &&exporter);
-  ~SimpleLogRecordProcessor() override;
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override;
-
-  void OnEmit(std::unique_ptr<Recordable> &&record) noexcept override;
-
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  bool IsShutdown() const noexcept;
-
-private:
-  // The configured exporter
-  std::unique_ptr<LogRecordExporter> exporter_;
-  // The lock used to ensure the exporter is not called concurrently
-  opentelemetry::common::SpinLockMutex lock_;
-  // The atomic boolean to ensure the ShutDown() function is only called once
-  std::atomic<bool> is_shutdown_{false};
-};
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/simple_log_record_processor_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/simple_log_record_processor_factory.h
deleted file mode 100644
index 0b9df81c1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/logs/simple_log_record_processor_factory.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-class LogRecordExporter;
-
-/**
- * Factory class for SimpleLogRecordProcessor.
- */
-class OPENTELEMETRY_EXPORT SimpleLogRecordProcessorFactory
-{
-public:
-  /**
-   * Create a SimpleLogRecordProcessor.
-   */
-  static std::unique_ptr<LogRecordProcessor> Create(std::unique_ptr<LogRecordExporter> &&exporter);
-};
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation.h
deleted file mode 100644
index c932d5069..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <memory>
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class Aggregation
-{
-public:
-  virtual void Aggregate(int64_t value, const PointAttributes &attributes = {}) noexcept = 0;
-
-  virtual void Aggregate(double value, const PointAttributes &attributes = {}) noexcept = 0;
-
-  /**
-   * Returns the result of the merge of the two aggregations.
-   *
-   * This should always assume that the aggregations do not overlap and merge together for a new
-   * cumulative report.
-   *
-   * @param delta the newly captured (delta) aggregation
-   * @return the result of the merge of the given aggregation.
-   */
-
-  virtual std::unique_ptr<Aggregation> Merge(const Aggregation &delta) const noexcept = 0;
-
-  /**
-   * Returns a new delta aggregation by comparing two cumulative measurements.
-   *
-   * @param next the newly captured (cumulative) aggregation.
-   * @return The resulting delta aggregation.
-   */
-  virtual std::unique_ptr<Aggregation> Diff(const Aggregation &next) const noexcept = 0;
-
-  /**
-   * Returns the point data that the aggregation will produce.
-   *
-   * @return PointType
-   */
-
-  virtual PointType ToPoint() const noexcept = 0;
-
-  virtual ~Aggregation() = default;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h
deleted file mode 100644
index 0cae37f39..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/aggregation_config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <vector>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class AggregationConfig
-{
-public:
-  virtual ~AggregationConfig() = default;
-};
-
-class HistogramAggregationConfig : public AggregationConfig
-{
-public:
-  std::vector<double> boundaries_;
-  bool record_min_max_ = true;
-};
-
-class Base2ExponentialHistogramAggregationConfig : public AggregationConfig
-{
-public:
-  size_t max_buckets_  = 160;
-  int32_t max_scale_   = 20;
-  bool record_min_max_ = true;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_aggregation.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_aggregation.h
deleted file mode 100644
index 9e927b56a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_aggregation.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <memory>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_indexer.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class Base2ExponentialHistogramAggregation : public Aggregation
-{
-public:
-  Base2ExponentialHistogramAggregation(const AggregationConfig *aggregation_config = nullptr);
-  Base2ExponentialHistogramAggregation(const Base2ExponentialHistogramPointData &point_data);
-  Base2ExponentialHistogramAggregation(Base2ExponentialHistogramPointData &&point_data);
-
-  void Aggregate(int64_t value, const PointAttributes &attributes = {}) noexcept override;
-  void Aggregate(double value, const PointAttributes &attributes = {}) noexcept override;
-
-  /* Returns the result of merge of the existing aggregation with delta
-   * aggregation with same boundaries */
-  std::unique_ptr<Aggregation> Merge(const Aggregation &delta) const noexcept override;
-
-  /* Returns the new delta aggregation by comparing existing aggregation with
-   * next aggregation with same boundaries. Data points for `next` aggregation
-   * (sum , bucket-counts) should be more than the current aggregation - which
-   * is the normal scenario as measurements values are monotonic increasing.
-   */
-  std::unique_ptr<Aggregation> Diff(const Aggregation &next) const noexcept override;
-
-  PointType ToPoint() const noexcept override;
-
-private:
-  void AggregateIntoBuckets(std::unique_ptr<AdaptingCircularBufferCounter> &buckets,
-                            double value) noexcept;
-  void Downscale(uint32_t by) noexcept;
-
-  mutable opentelemetry::common::SpinLockMutex lock_;
-  Base2ExponentialHistogramPointData point_data_;
-  Base2ExponentialHistogramIndexer indexer_;
-  bool record_min_max_ = true;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_indexer.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_indexer.h
deleted file mode 100644
index ba6904d31..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_indexer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-/*
- * An indexer for base2 exponential histograms. It is used to calculate index for a given value and
- * scale.
- */
-class Base2ExponentialHistogramIndexer
-{
-public:
-  /*
-   * Construct a new indexer for a given scale.
-   */
-  explicit Base2ExponentialHistogramIndexer(int32_t scale = 0);
-  Base2ExponentialHistogramIndexer(const Base2ExponentialHistogramIndexer &other) = default;
-  Base2ExponentialHistogramIndexer &operator=(const Base2ExponentialHistogramIndexer &other) =
-      default;
-
-  /**
-   * Compute the index for the given value.
-   *
-   * @param value Measured value (must be non-zero).
-   * @return the index of the bucket which the value maps to.
-   */
-  int32_t ComputeIndex(double value) const;
-
-private:
-  int32_t scale_;
-  double scale_factor_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h
deleted file mode 100644
index 70f6f8ee7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/drop_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/lastvalue_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/sum_aggregation.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class AggregationConfig;
-
-class DefaultAggregation
-{
-public:
-  static std::unique_ptr<Aggregation> CreateAggregation(
-      const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor,
-      const AggregationConfig *aggregation_config)
-  {
-    bool is_monotonic = true;
-    auto aggr_type    = GetDefaultAggregationType(instrument_descriptor.type_, is_monotonic);
-    switch (aggr_type)
-    {
-      case AggregationType::kSum:
-        return (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-                   ? std::move(std::unique_ptr<Aggregation>(new LongSumAggregation(is_monotonic)))
-                   : std::move(
-                         std::unique_ptr<Aggregation>(new DoubleSumAggregation(is_monotonic)));
-        break;
-      case AggregationType::kHistogram: {
-        if (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-        {
-          return (std::unique_ptr<Aggregation>(new LongHistogramAggregation(aggregation_config)));
-        }
-        else
-        {
-          return (std::unique_ptr<Aggregation>(new DoubleHistogramAggregation(aggregation_config)));
-        }
-
-        break;
-      }
-      case AggregationType::kLastValue:
-        return (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-                   ? std::move(std::unique_ptr<Aggregation>(new LongLastValueAggregation()))
-                   : std::move(std::unique_ptr<Aggregation>(new DoubleLastValueAggregation()));
-        break;
-      default:
-        return std::unique_ptr<Aggregation>(new DropAggregation());
-    };
-  }
-
-  static std::unique_ptr<Aggregation> CreateAggregation(
-      AggregationType aggregation_type,
-      InstrumentDescriptor instrument_descriptor,
-      const AggregationConfig *aggregation_config = nullptr)
-  {
-    switch (aggregation_type)
-    {
-      case AggregationType::kDrop:
-        return std::unique_ptr<Aggregation>(new DropAggregation());
-        break;
-      case AggregationType::kHistogram:
-        if (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-        {
-          return std::unique_ptr<Aggregation>(new LongHistogramAggregation(aggregation_config));
-        }
-        else
-        {
-          return std::unique_ptr<Aggregation>(new DoubleHistogramAggregation(aggregation_config));
-        }
-        break;
-      case AggregationType::kBase2ExponentialHistogram:
-        return std::unique_ptr<Aggregation>(
-            new Base2ExponentialHistogramAggregation(aggregation_config));
-        break;
-      case AggregationType::kLastValue:
-        if (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-        {
-          return std::unique_ptr<Aggregation>(new LongLastValueAggregation());
-        }
-        else
-        {
-          return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation());
-        }
-        break;
-      case AggregationType::kSum: {
-        bool is_monotonic = true;
-        if (instrument_descriptor.type_ == InstrumentType::kUpDownCounter ||
-            instrument_descriptor.type_ == InstrumentType::kObservableUpDownCounter ||
-            instrument_descriptor.type_ == InstrumentType::kHistogram)
-        {
-          is_monotonic = false;
-        }
-        if (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-        {
-          return std::unique_ptr<Aggregation>(new LongSumAggregation(is_monotonic));
-        }
-        else
-        {
-          return std::unique_ptr<Aggregation>(new DoubleSumAggregation(is_monotonic));
-        }
-        break;
-      }
-      default:
-        return DefaultAggregation::CreateAggregation(instrument_descriptor, aggregation_config);
-    }
-  }
-
-  static std::unique_ptr<Aggregation> CloneAggregation(
-      AggregationType aggregation_type,
-      const InstrumentDescriptor &instrument_descriptor,
-      const Aggregation &to_copy)
-  {
-    const PointType point_data = to_copy.ToPoint();
-    bool is_monotonic          = true;
-    if (aggregation_type == AggregationType::kDefault)
-    {
-      aggregation_type = GetDefaultAggregationType(instrument_descriptor.type_, is_monotonic);
-    }
-    switch (aggregation_type)
-    {
-      case AggregationType::kDrop:
-        return std::unique_ptr<Aggregation>(new DropAggregation());
-      case AggregationType::kHistogram:
-        if (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-        {
-          return std::unique_ptr<Aggregation>(
-              new LongHistogramAggregation(nostd::get<HistogramPointData>(point_data)));
-        }
-        else
-        {
-          return std::unique_ptr<Aggregation>(
-              new DoubleHistogramAggregation(nostd::get<HistogramPointData>(point_data)));
-        }
-      case AggregationType::kBase2ExponentialHistogram:
-        return std::unique_ptr<Aggregation>(new Base2ExponentialHistogramAggregation(
-            nostd::get<Base2ExponentialHistogramPointData>(point_data)));
-      case AggregationType::kLastValue:
-        if (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-        {
-          return std::unique_ptr<Aggregation>(
-              new LongLastValueAggregation(nostd::get<LastValuePointData>(point_data)));
-        }
-        else
-        {
-          return std::unique_ptr<Aggregation>(
-              new DoubleLastValueAggregation(nostd::get<LastValuePointData>(point_data)));
-        }
-      case AggregationType::kSum:
-        if (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-        {
-          return std::unique_ptr<Aggregation>(
-              new LongSumAggregation(nostd::get<SumPointData>(point_data)));
-        }
-        else
-        {
-          return std::unique_ptr<Aggregation>(
-              new DoubleSumAggregation(nostd::get<SumPointData>(point_data)));
-        }
-      default:
-        return nullptr;  // won't reach here
-    }
-  }
-
-  static AggregationType GetDefaultAggregationType(InstrumentType instrument_type,
-                                                   bool &is_monotonic)
-  {
-    is_monotonic = false;
-    switch (instrument_type)
-    {
-      case InstrumentType::kCounter:
-      case InstrumentType::kObservableCounter:
-        is_monotonic = true;
-        return AggregationType::kSum;
-      case InstrumentType::kUpDownCounter:
-      case InstrumentType::kObservableUpDownCounter:
-        return AggregationType::kSum;
-      case InstrumentType::kHistogram:
-        return AggregationType::kHistogram;
-      case InstrumentType::kGauge:
-      case InstrumentType::kObservableGauge:
-        return AggregationType::kLastValue;
-      default:
-        return AggregationType::kDrop;
-    }
-  }
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/drop_aggregation.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/drop_aggregation.h
deleted file mode 100644
index 4664f8dcd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/drop_aggregation.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-/**
- * A null Aggregation which denotes no aggregation should occur.
- */
-
-class DropAggregation : public Aggregation
-{
-public:
-  DropAggregation() = default;
-
-  DropAggregation(const DropPointData &) {}
-
-  void Aggregate(int64_t /* value */, const PointAttributes & /* attributes */) noexcept override {}
-
-  void Aggregate(double /* value */, const PointAttributes & /* attributes */) noexcept override {}
-
-  std::unique_ptr<Aggregation> Merge(const Aggregation &) const noexcept override
-  {
-    return std::unique_ptr<Aggregation>(new DropAggregation());
-  }
-
-  std::unique_ptr<Aggregation> Diff(const Aggregation &) const noexcept override
-  {
-    return std::unique_ptr<Aggregation>(new DropAggregation());
-  }
-
-  PointType ToPoint() const noexcept override
-  {
-    static DropPointData point_data;
-    return point_data;
-  }
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h
deleted file mode 100644
index c5cfcfd89..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class AggregationConfig;
-
-class LongHistogramAggregation : public Aggregation
-{
-public:
-  LongHistogramAggregation(const AggregationConfig *aggregation_config = nullptr);
-  LongHistogramAggregation(HistogramPointData &&);
-  LongHistogramAggregation(const HistogramPointData &);
-
-  void Aggregate(int64_t value, const PointAttributes &attributes = {}) noexcept override;
-
-  void Aggregate(double /* value */, const PointAttributes & /* attributes */) noexcept override {}
-
-  /* Returns the result of merge of the existing aggregation with delta aggregation with same
-   * boundaries */
-  std::unique_ptr<Aggregation> Merge(const Aggregation &delta) const noexcept override;
-
-  /* Returns the new delta aggregation by comparing existing aggregation with next aggregation with
-   * same boundaries. Data points for `next` aggregation (sum , bucket-counts) should be more than
-   * the current aggregation - which is the normal scenario as measurements values are monotonic
-   * increasing.
-   */
-  std::unique_ptr<Aggregation> Diff(const Aggregation &next) const noexcept override;
-
-  PointType ToPoint() const noexcept override;
-
-private:
-  mutable opentelemetry::common::SpinLockMutex lock_;
-  HistogramPointData point_data_;
-  bool record_min_max_ = true;
-};
-
-class DoubleHistogramAggregation : public Aggregation
-{
-public:
-  DoubleHistogramAggregation(const AggregationConfig *aggregation_config = nullptr);
-  DoubleHistogramAggregation(HistogramPointData &&);
-  DoubleHistogramAggregation(const HistogramPointData &);
-
-  void Aggregate(int64_t /* value */, const PointAttributes & /* attributes */) noexcept override {}
-
-  void Aggregate(double value, const PointAttributes &attributes = {}) noexcept override;
-
-  /* Returns the result of merge of the existing aggregation with delta aggregation with same
-   * boundaries */
-  std::unique_ptr<Aggregation> Merge(const Aggregation &delta) const noexcept override;
-
-  /* Returns the new delta aggregation by comparing existing aggregation with next aggregation with
-   * same boundaries. Data points for `next` aggregation (sum , bucket-counts) should be more than
-   * the current aggregation - which is the normal scenario as measurements values are monotonic
-   * increasing.
-   */
-  std::unique_ptr<Aggregation> Diff(const Aggregation &next) const noexcept override;
-
-  PointType ToPoint() const noexcept override;
-
-private:
-  mutable opentelemetry::common::SpinLockMutex lock_;
-  mutable HistogramPointData point_data_;
-  bool record_min_max_ = true;
-};
-
-template <class T>
-void HistogramMerge(HistogramPointData &current,
-                    HistogramPointData &delta,
-                    HistogramPointData &merge)
-{
-  for (size_t i = 0; i < current.counts_.size(); i++)
-  {
-    merge.counts_[i] = current.counts_[i] + delta.counts_[i];
-  }
-  merge.boundaries_     = current.boundaries_;
-  merge.sum_            = nostd::get<T>(current.sum_) + nostd::get<T>(delta.sum_);
-  merge.count_          = current.count_ + delta.count_;
-  merge.record_min_max_ = current.record_min_max_ && delta.record_min_max_;
-  if (merge.record_min_max_)
-  {
-    merge.min_ = (std::min)(nostd::get<T>(current.min_), nostd::get<T>(delta.min_));
-    merge.max_ = (std::max)(nostd::get<T>(current.max_), nostd::get<T>(delta.max_));
-  }
-}
-
-template <class T>
-void HistogramDiff(HistogramPointData &current, HistogramPointData &next, HistogramPointData &diff)
-{
-  for (size_t i = 0; i < current.counts_.size(); i++)
-  {
-    diff.counts_[i] = next.counts_[i] - current.counts_[i];
-  }
-  diff.boundaries_     = current.boundaries_;
-  diff.count_          = next.count_ - current.count_;
-  diff.record_min_max_ = false;
-}
-
-template <class T>
-size_t BucketBinarySearch(T value, const std::vector<double> &boundaries)
-{
-  auto low = std::lower_bound(boundaries.begin(), boundaries.end(), value);
-  return low - boundaries.begin();
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/lastvalue_aggregation.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/lastvalue_aggregation.h
deleted file mode 100644
index e8e6c40a3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/lastvalue_aggregation.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <memory>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class LongLastValueAggregation : public Aggregation
-{
-public:
-  LongLastValueAggregation();
-  LongLastValueAggregation(LastValuePointData &&);
-  LongLastValueAggregation(const LastValuePointData &);
-
-  void Aggregate(int64_t value, const PointAttributes &attributes = {}) noexcept override;
-
-  void Aggregate(double /* value */, const PointAttributes & /* attributes */) noexcept override {}
-
-  std::unique_ptr<Aggregation> Merge(const Aggregation &delta) const noexcept override;
-
-  std::unique_ptr<Aggregation> Diff(const Aggregation &next) const noexcept override;
-
-  PointType ToPoint() const noexcept override;
-
-private:
-  mutable opentelemetry::common::SpinLockMutex lock_;
-  LastValuePointData point_data_;
-};
-
-class DoubleLastValueAggregation : public Aggregation
-{
-public:
-  DoubleLastValueAggregation();
-  DoubleLastValueAggregation(LastValuePointData &&);
-  DoubleLastValueAggregation(const LastValuePointData &);
-
-  void Aggregate(int64_t /* value */, const PointAttributes & /* attributes */) noexcept override {}
-
-  void Aggregate(double value, const PointAttributes &attributes = {}) noexcept override;
-
-  virtual std::unique_ptr<Aggregation> Merge(const Aggregation &delta) const noexcept override;
-
-  virtual std::unique_ptr<Aggregation> Diff(const Aggregation &next) const noexcept override;
-
-  PointType ToPoint() const noexcept override;
-
-private:
-  mutable opentelemetry::common::SpinLockMutex lock_;
-  mutable LastValuePointData point_data_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/sum_aggregation.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/sum_aggregation.h
deleted file mode 100644
index 035a8df84..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/aggregation/sum_aggregation.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <memory>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class LongSumAggregation : public Aggregation
-{
-public:
-  LongSumAggregation(bool is_monotonic);
-  LongSumAggregation(SumPointData &&);
-  LongSumAggregation(const SumPointData &);
-
-  void Aggregate(int64_t value, const PointAttributes &attributes = {}) noexcept override;
-
-  void Aggregate(double /* value */, const PointAttributes & /* attributes */) noexcept override {}
-
-  std::unique_ptr<Aggregation> Merge(const Aggregation &delta) const noexcept override;
-
-  std::unique_ptr<Aggregation> Diff(const Aggregation &next) const noexcept override;
-
-  PointType ToPoint() const noexcept override;
-
-private:
-  mutable opentelemetry::common::SpinLockMutex lock_;
-  SumPointData point_data_;
-};
-
-class DoubleSumAggregation : public Aggregation
-{
-public:
-  DoubleSumAggregation(bool is_monotonic);
-  DoubleSumAggregation(SumPointData &&);
-  DoubleSumAggregation(const SumPointData &);
-
-  void Aggregate(int64_t /* value */, const PointAttributes & /* attributes */) noexcept override {}
-
-  void Aggregate(double value, const PointAttributes &attributes = {}) noexcept override;
-
-  std::unique_ptr<Aggregation> Merge(const Aggregation &delta) const noexcept override;
-
-  std::unique_ptr<Aggregation> Diff(const Aggregation &next) const noexcept override;
-
-  PointType ToPoint() const noexcept override;
-
-private:
-  mutable opentelemetry::common::SpinLockMutex lock_;
-  SumPointData point_data_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/async_instruments.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/async_instruments.h
deleted file mode 100644
index 2ff8c9702..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/async_instruments.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/observable_registry.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class ObservableInstrument : public opentelemetry::metrics::ObservableInstrument
-{
-public:
-  ObservableInstrument(InstrumentDescriptor instrument_descriptor,
-                       std::unique_ptr<AsyncWritableMetricStorage> storage,
-                       std::shared_ptr<ObservableRegistry> observable_registry);
-  ~ObservableInstrument() override;
-
-  void AddCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
-                   void *state) noexcept override;
-
-  void RemoveCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
-                      void *state) noexcept override;
-
-  const InstrumentDescriptor &GetInstrumentDescriptor();
-
-  AsyncWritableMetricStorage *GetMetricStorage();
-
-private:
-  InstrumentDescriptor instrument_descriptor_;
-  std::unique_ptr<AsyncWritableMetricStorage> storage_;
-  std::shared_ptr<ObservableRegistry> observable_registry_;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/circular_buffer.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/circular_buffer.h
deleted file mode 100644
index 01588f71d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/circular_buffer.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <limits>
-#include <vector>
-
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-/**
- * An integer array that automatically expands its memory consumption (via copy/allocation) when
- * reaching limits. This assumes counts remain low, to lower memory overhead.
- *
- * This class is NOT thread-safe. It is expected to be behind a synchronized incrementer.
- *
- * Instances start by attempting to store one-byte per-cell in the integer array. As values grow,
- * this will automatically instantiate the next-size integer array (uint8_t -> uint16_t -> uint32_t
- * -> uint64_t) and copy over values into the larger array. This class expects most usage to remain
- * within the uint8_t boundary (e.g. cell values < 256).
- */
-class AdaptingIntegerArray
-{
-public:
-  // Construct an adapting integer array of a given size.
-  explicit AdaptingIntegerArray(size_t size) : backing_(std::vector<uint8_t>(size, 0)) {}
-  AdaptingIntegerArray(const AdaptingIntegerArray &other)            = default;
-  AdaptingIntegerArray(AdaptingIntegerArray &&other)                 = default;
-  AdaptingIntegerArray &operator=(const AdaptingIntegerArray &other) = default;
-  AdaptingIntegerArray &operator=(AdaptingIntegerArray &&other)      = default;
-
-  /**
-   * Increments the value at the specified index by the given count in the array.
-   *
-   * @param index The index of the value to increment.
-   * @param count The count by which to increment the value.
-   */
-  void Increment(size_t index, uint64_t count);
-
-  /**
-   * Returns the value at the specified index from the array.
-   *
-   * @param index The index of the value to retrieve.
-   * @return The value at the specified index.
-   */
-  uint64_t Get(size_t index) const;
-
-  /**
-   * Returns the size of the array.
-   *
-   * @return The size of the array.
-   */
-  size_t Size() const;
-
-  /**
-   * Clears the array, resetting all values to zero.
-   */
-  void Clear();
-
-private:
-  void EnlargeToFit(uint64_t value);
-
-  nostd::variant<std::vector<uint8_t>,
-                 std::vector<uint16_t>,
-                 std::vector<uint32_t>,
-                 std::vector<uint64_t>>
-      backing_;
-};
-
-/**
- * A circle-buffer-backed exponential counter.
- *
- * The first recorded value becomes the 'base_index'. Going backwards leads to start/stop index.
- *
- * This expand start/end index as it sees values.
- *
- * This class is NOT thread-safe. It is expected to be behind a synchronized incrementer.
- */
-class AdaptingCircularBufferCounter
-{
-public:
-  explicit AdaptingCircularBufferCounter(size_t max_size) : backing_(max_size) {}
-  AdaptingCircularBufferCounter(const AdaptingCircularBufferCounter &other)            = default;
-  AdaptingCircularBufferCounter(AdaptingCircularBufferCounter &&other)                 = default;
-  AdaptingCircularBufferCounter &operator=(const AdaptingCircularBufferCounter &other) = default;
-  AdaptingCircularBufferCounter &operator=(AdaptingCircularBufferCounter &&other)      = default;
-
-  /**
-   * The first index with a recording. May be negative.
-   *
-   * Note: the returned value is not meaningful when Empty returns true.
-   *
-   * @return the first index with a recording.
-   */
-  int32_t StartIndex() const { return start_index_; }
-
-  /**
-   * The last index with a recording. May be negative.
-   *
-   * Note: the returned value is not meaningful when Empty returns true.
-   *
-   * @return The last index with a recording.
-   */
-  int32_t EndIndex() const { return end_index_; }
-
-  /**
-   * Returns true if no recordings, false if at least one recording.
-   */
-  bool Empty() const { return base_index_ == kNullIndex; }
-
-  /**
-   * Returns the maximum number of buckets allowed in this counter.
-   */
-  size_t MaxSize() const { return backing_.Size(); }
-
-  /** Resets all bucket counts to zero and resets index start/end tracking. **/
-  void Clear();
-
-  /**
-   * Persist new data at index, incrementing by delta amount.
-   *
-   * @param index The index of where to perform the incrementation.
-   * @param delta How much to increment the index by.
-   * @return success status.
-   */
-  bool Increment(int32_t index, uint64_t delta);
-
-  /**
-   * Get the number of recordings for the given index.
-   *
-   * @return the number of recordings for the index, or 0 if the index is out of bounds.
-   */
-  uint64_t Get(int32_t index) const;
-
-private:
-  size_t ToBufferIndex(int32_t index) const;
-
-  static constexpr int32_t kNullIndex = (std::numeric_limits<int32_t>::min)();
-
-  // Index of the first populated element, may be kNullIndex if container is empty.
-  int32_t start_index_ = kNullIndex;
-  // Index of the last populated element, may be kNullIndex if container is empty.
-  int32_t end_index_ = kNullIndex;
-  // Index corresponding to the element located at the start of the backing array, may be kNullIndex
-  // if container is empty.
-  int32_t base_index_ = kNullIndex;
-  AdaptingIntegerArray backing_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h
deleted file mode 100644
index 59097185e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-using MetricAttributes = opentelemetry::sdk::metrics::FilteredOrderedAttributeMap;
-/**
- * A sample input measurement.
- *
- * Exemplars also hold information about the environment when the measurement was recorded, for
- * example the span and trace ID of the active span when the exemplar was recorded.
- */
-class ExemplarData
-{
-public:
-  static ExemplarData Create(std::shared_ptr<opentelemetry::trace::SpanContext> context,
-                             const opentelemetry::common::SystemTimestamp &timestamp,
-                             const PointDataAttributes &point_data_attr)
-  {
-    return ExemplarData(context, timestamp, point_data_attr);
-  }
-
-  /**
-   * The set of key/value pairs that were filtered out by the aggregator, but recorded alongside
-   * the original measurement. Only key/value pairs that were filtered out by the aggregator
-   * should be included
-   */
-  MetricAttributes GetFilteredAttributes() { return MetricAttributes{}; }
-
-  /** Returns the timestamp in nanos when measurement was collected. */
-  opentelemetry::common::SystemTimestamp GetEpochNanos() { return timestamp_; }
-
-  /**
-   * Returns the SpanContext associated with this exemplar. If the exemplar was not recorded
-   * inside a sampled trace, the Context will be invalid.
-   */
-  const opentelemetry::trace::SpanContext &GetSpanContext() const noexcept { return context_; }
-
-  static PointType CreateSumPointData(ValueType value)
-  {
-    SumPointData sum_point_data{};
-    sum_point_data.value_ = value;
-    return sum_point_data;
-  }
-
-  static PointType CreateLastValuePointData(ValueType value)
-  {
-    LastValuePointData last_value_point_data{};
-    last_value_point_data.value_              = value;
-    last_value_point_data.is_lastvalue_valid_ = true;
-    last_value_point_data.sample_ts_          = opentelemetry::common::SystemTimestamp{};
-    return last_value_point_data;
-  }
-
-  static PointType CreateDropPointData() { return DropPointData{}; }
-
-private:
-  ExemplarData(std::shared_ptr<opentelemetry::trace::SpanContext> context,
-               opentelemetry::common::SystemTimestamp timestamp,
-               const PointDataAttributes &point_data_attr)
-      : context_(*context.get()), timestamp_(timestamp), point_data_attr_(point_data_attr)
-  {}
-
-  opentelemetry::trace::SpanContext context_;
-  opentelemetry::common::SystemTimestamp timestamp_;
-  PointDataAttributes point_data_attr_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h
deleted file mode 100644
index 30fa04e47..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/metric_data.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <vector>
-
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-using PointAttributes = opentelemetry::sdk::common::OrderedAttributeMap;
-using PointType       = opentelemetry::nostd::variant<SumPointData,
-                                                      HistogramPointData,
-                                                      Base2ExponentialHistogramPointData,
-                                                      LastValuePointData,
-                                                      DropPointData>;
-
-struct PointDataAttributes
-{
-  PointAttributes attributes;
-  PointType point_data;
-};
-
-class MetricData
-{
-public:
-  InstrumentDescriptor instrument_descriptor;
-  AggregationTemporality aggregation_temporality;
-  opentelemetry::common::SystemTimestamp start_ts;
-  opentelemetry::common::SystemTimestamp end_ts;
-  std::vector<PointDataAttributes> point_data_attr_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/point_data.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/point_data.h
deleted file mode 100644
index df14e2d09..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/data/point_data.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-using ValueType = nostd::variant<int64_t, double>;
-
-// TODO: remove ctors and initializers from below classes when GCC<5 stops
-// shipping on Ubuntu
-
-class SumPointData
-{
-public:
-  // TODO: remove ctors and initializers when GCC<5 stops shipping on Ubuntu
-  SumPointData(SumPointData &&)            = default;
-  SumPointData(const SumPointData &)       = default;
-  SumPointData &operator=(SumPointData &&) = default;
-  SumPointData()                           = default;
-
-  ValueType value_   = {};
-  bool is_monotonic_ = true;
-};
-
-class LastValuePointData
-{
-public:
-  // TODO: remove ctors and initializers when GCC<5 stops shipping on Ubuntu
-  LastValuePointData(LastValuePointData &&)            = default;
-  LastValuePointData(const LastValuePointData &)       = default;
-  LastValuePointData &operator=(LastValuePointData &&) = default;
-  LastValuePointData()                                 = default;
-
-  ValueType value_                                  = {};
-  bool is_lastvalue_valid_                          = {};
-  opentelemetry::common::SystemTimestamp sample_ts_ = {};
-};
-
-class HistogramPointData
-{
-public:
-  // TODO: remove ctors and initializers when GCC<5 stops shipping on Ubuntu
-  HistogramPointData(HistogramPointData &&)            = default;
-  HistogramPointData &operator=(HistogramPointData &&) = default;
-  HistogramPointData(const HistogramPointData &)       = default;
-  HistogramPointData()                                 = default;
-  HistogramPointData(std::vector<double> &boundaries) : boundaries_(boundaries) {}
-  std::vector<double> boundaries_ = {};
-  ValueType sum_                  = {};
-  ValueType min_                  = {};
-  ValueType max_                  = {};
-  std::vector<uint64_t> counts_   = {};
-  uint64_t count_                 = {};
-  bool record_min_max_            = true;
-};
-
-class Base2ExponentialHistogramPointData
-{
-public:
-  Base2ExponentialHistogramPointData(Base2ExponentialHistogramPointData &&) noexcept = default;
-  Base2ExponentialHistogramPointData &operator=(Base2ExponentialHistogramPointData &&) noexcept =
-      default;
-
-  Base2ExponentialHistogramPointData(const Base2ExponentialHistogramPointData &other)
-      : sum_(other.sum_),
-        min_(other.min_),
-        max_(other.max_),
-        zero_threshold_(other.zero_threshold_),
-        count_(other.count_),
-        zero_count_(other.zero_count_),
-        max_buckets_(other.max_buckets_),
-        scale_(other.scale_),
-        record_min_max_(other.record_min_max_)
-  {
-    if (other.positive_buckets_)
-    {
-      positive_buckets_ = std::make_unique<AdaptingCircularBufferCounter>(*other.positive_buckets_);
-    }
-    if (other.negative_buckets_)
-    {
-      negative_buckets_ = std::make_unique<AdaptingCircularBufferCounter>(*other.negative_buckets_);
-    }
-  }
-
-  Base2ExponentialHistogramPointData &operator=(const Base2ExponentialHistogramPointData &other)
-  {
-    if (this != &other)
-    {
-      sum_            = other.sum_;
-      min_            = other.min_;
-      max_            = other.max_;
-      zero_threshold_ = other.zero_threshold_;
-      count_          = other.count_;
-      zero_count_     = other.zero_count_;
-      max_buckets_    = other.max_buckets_;
-      scale_          = other.scale_;
-      record_min_max_ = other.record_min_max_;
-
-      if (other.positive_buckets_)
-      {
-        positive_buckets_ =
-            std::make_unique<AdaptingCircularBufferCounter>(*other.positive_buckets_);
-      }
-      else
-      {
-        positive_buckets_.reset();
-      }
-
-      if (other.negative_buckets_)
-      {
-        negative_buckets_ =
-            std::make_unique<AdaptingCircularBufferCounter>(*other.negative_buckets_);
-      }
-      else
-      {
-        negative_buckets_.reset();
-      }
-    }
-    return *this;
-  }
-
-  // Default constructor
-  Base2ExponentialHistogramPointData() = default;
-
-  // Members
-  double sum_            = {};
-  double min_            = {};
-  double max_            = {};
-  double zero_threshold_ = {};
-  uint64_t count_        = {};
-  uint64_t zero_count_   = {};
-  std::unique_ptr<AdaptingCircularBufferCounter> positive_buckets_ =
-      std::make_unique<AdaptingCircularBufferCounter>(0);
-  std::unique_ptr<AdaptingCircularBufferCounter> negative_buckets_ =
-      std::make_unique<AdaptingCircularBufferCounter>(0);
-  size_t max_buckets_  = {};
-  int32_t scale_       = {};
-  bool record_min_max_ = true;
-};
-
-class DropPointData
-{
-public:
-  // TODO: remove ctors and initializers when GCC<5 stops shipping on Ubuntu
-  DropPointData(DropPointData &&)            = default;
-  DropPointData(const DropPointData &)       = default;
-  DropPointData()                            = default;
-  DropPointData &operator=(DropPointData &&) = default;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h
deleted file mode 100644
index 2690493d7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <memory>
-#  include <vector>
-
-#  include "opentelemetry/sdk/common/global_log_handler.h"
-#  include "opentelemetry/sdk/metrics/data/exemplar_data.h"
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class OrderedAttributeMap;
-}  // namespace common
-
-namespace context
-{
-class Context;
-}  // namespace context
-
-namespace sdk
-{
-namespace metrics
-{
-
-class AlignedHistogramBucketExemplarReservoir : public FixedSizeExemplarReservoir
-{
-
-public:
-  static std::shared_ptr<ReservoirCellSelector> GetHistogramCellSelector(
-      const std::vector<double> &boundaries = std::vector<double>{1.0, 2.0, 3.0, 4.0, 5.0})
-  {
-    return std::shared_ptr<ReservoirCellSelector>{new HistogramCellSelector(boundaries)};
-  }
-
-  AlignedHistogramBucketExemplarReservoir(
-      size_t size,
-      std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
-      MapAndResetCellType map_and_reset_cell)
-      : FixedSizeExemplarReservoir(size + 1, reservoir_cell_selector, map_and_reset_cell)
-  {}
-
-  class HistogramCellSelector : public ReservoirCellSelector
-  {
-  public:
-    HistogramCellSelector(const std::vector<double> &boundaries) : boundaries_(boundaries) {}
-
-    int ReservoirCellIndexFor(const std::vector<ReservoirCell> &cells,
-                              int64_t value,
-                              const MetricAttributes &attributes,
-                              const opentelemetry::context::Context &context) override
-    {
-      return ReservoirCellIndexFor(cells, static_cast<double>(value), attributes, context);
-    }
-
-    int ReservoirCellIndexFor(const std::vector<ReservoirCell> & /* cells */,
-                              double value,
-                              const MetricAttributes & /* attributes */,
-                              const opentelemetry::context::Context & /* context */) override
-    {
-      size_t max_size = boundaries_.size();
-      for (size_t i = 0; i < max_size; ++i)
-      {
-        if (value <= boundaries_[i])
-        {
-          return static_cast<int>(i);
-        }
-      }
-
-      // The bucket at max_size is for values greater than the last boundary
-      return static_cast<int>(max_size);
-    }
-
-  private:
-    void reset() override
-    {
-      // Do nothing
-    }
-    std::vector<double> boundaries_;
-  };
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h
deleted file mode 100644
index 83cf7531f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <memory>
-
-#  include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-class Context;
-}  // namespace context
-
-namespace sdk
-{
-namespace common
-{
-class OrderedAttributeMap;
-}  // namespace common
-
-namespace metrics
-{
-using MetricAttributes = opentelemetry::sdk::metrics::FilteredOrderedAttributeMap;
-
-/**
- * Exemplar filter type is used to pre-filter measurements before attempting to store them in a
- * reservoir.
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#exemplarfilter
- */
-enum class ExemplarFilterType : uint8_t
-{
-  kAlwaysOff,
-  kAlwaysOn,
-  kTraceBased
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h
deleted file mode 100644
index 55f9ed876..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <memory>
-#  include <vector>
-
-#  include "opentelemetry/context/context.h"
-#  include "opentelemetry/nostd/function_ref.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/sdk/common/attribute_utils.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class FixedSizeExemplarReservoir : public ExemplarReservoir
-{
-
-public:
-  FixedSizeExemplarReservoir(size_t size,
-                             std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
-                             MapAndResetCellType map_and_reset_cell)
-      : storage_(size),
-        reservoir_cell_selector_(reservoir_cell_selector),
-        map_and_reset_cell_(map_and_reset_cell)
-  {}
-
-  using ExemplarReservoir::OfferMeasurement;
-
-  void OfferMeasurement(
-      int64_t value,
-      const MetricAttributes &attributes,
-      const opentelemetry::context::Context &context,
-      const opentelemetry::common::SystemTimestamp & /* timestamp */) noexcept override
-  {
-    if (!reservoir_cell_selector_)
-    {
-      return;
-    }
-    auto idx =
-        reservoir_cell_selector_->ReservoirCellIndexFor(storage_, value, attributes, context);
-    if (idx != -1)
-    {
-      storage_[idx].RecordLongMeasurement(value, attributes, context);
-    }
-  }
-
-  void OfferMeasurement(
-      double value,
-      const MetricAttributes &attributes,
-      const opentelemetry::context::Context &context,
-      const opentelemetry::common::SystemTimestamp & /* timestamp */) noexcept override
-  {
-    if (!reservoir_cell_selector_)
-    {
-      return;
-    }
-    auto idx =
-        reservoir_cell_selector_->ReservoirCellIndexFor(storage_, value, attributes, context);
-    if (idx != -1)
-    {
-      storage_[idx].RecordDoubleMeasurement(value, attributes, context);
-    }
-  }
-
-  std::vector<std::shared_ptr<ExemplarData>> CollectAndReset(
-      const MetricAttributes &pointAttributes) noexcept override
-  {
-    std::vector<std::shared_ptr<ExemplarData>> results;
-    if (!reservoir_cell_selector_)
-    {
-      return results;
-    }
-    if (!map_and_reset_cell_)
-    {
-      reservoir_cell_selector_.reset();
-      return results;
-    }
-    for (auto reservoirCell : storage_)
-    {
-      auto result = (reservoirCell.*(map_and_reset_cell_))(pointAttributes);
-      results.push_back(result);
-    }
-    reservoir_cell_selector_.reset();
-    return results;
-  }
-
-private:
-  explicit FixedSizeExemplarReservoir() = default;
-  std::vector<ReservoirCell> storage_;
-  std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector_;
-  MapAndResetCellType map_and_reset_cell_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h
deleted file mode 100644
index 66486f0cd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <memory>
-#  include <vector>
-
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class SystemTimestamp;
-}  // namespace common
-
-namespace context
-{
-class Context;
-}  // namespace context
-
-namespace sdk
-{
-namespace metrics
-{
-class ExemplarData;
-
-class NoExemplarReservoir final : public ExemplarReservoir
-{
-
-public:
-  void OfferMeasurement(
-      int64_t /* value */,
-      const MetricAttributes & /* attributes */,
-      const opentelemetry::context::Context & /* context */,
-      const opentelemetry::common::SystemTimestamp & /* timestamp */) noexcept override
-  {
-    // Stores nothing
-  }
-
-  void OfferMeasurement(
-      double /* value */,
-      const MetricAttributes & /* attributes */,
-      const opentelemetry::context::Context & /* context */,
-      const opentelemetry::common::SystemTimestamp & /* timestamp */) noexcept override
-  {
-    // Stores nothing.
-  }
-
-  std::vector<std::shared_ptr<ExemplarData>> CollectAndReset(
-      const MetricAttributes & /* pointAttributes */) noexcept override
-  {
-    return std::vector<std::shared_ptr<ExemplarData>>{};
-  }
-
-  explicit NoExemplarReservoir() = default;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir.h
deleted file mode 100644
index ef1df1c9a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <memory>
-#  include <vector>
-
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class SystemTimestamp;
-}  // namespace common
-
-namespace context
-{
-class Context;
-}  // namespace context
-
-namespace sdk
-{
-namespace metrics
-{
-class ExemplarData;
-
-/**
- * An interface for an exemplar reservoir of samples.
- *
- * <p>This represents a reservoir for a specific "point" of metric data.
- */
-class ExemplarReservoir
-{
-public:
-  virtual ~ExemplarReservoir() = default;
-
-  /** Offers a long measurement to be sampled. */
-  virtual void OfferMeasurement(
-      int64_t value,
-      const MetricAttributes &attributes,
-      const opentelemetry::context::Context &context,
-      const opentelemetry::common::SystemTimestamp &timestamp) noexcept = 0;
-
-  /** Offers a double measurement to be sampled. */
-  virtual void OfferMeasurement(
-      double value,
-      const MetricAttributes &attributes,
-      const opentelemetry::context::Context &context,
-      const opentelemetry::common::SystemTimestamp &timestamp) noexcept = 0;
-
-  /**
-   * Builds vector of Exemplars for exporting from the current reservoir.
-   *
-   * <p>Additionally, clears the reservoir for the next sampling period.
-   *
-   * @param pointAttributes the Attributes associated with the metric point.
-   *     ExemplarDatas should filter these out of their final data state.
-   * @return A vector of sampled exemplars for this point. Implementers are expected to
-   *     filter out pointAttributes from the original recorded attributes.
-   */
-  virtual std::vector<std::shared_ptr<ExemplarData>> CollectAndReset(
-      const MetricAttributes &pointAttributes) noexcept = 0;
-
-  static nostd::shared_ptr<ExemplarReservoir> GetSimpleFilteredExemplarReservoir(
-      ExemplarFilterType filter_type,
-      std::shared_ptr<ExemplarReservoir> reservoir);
-
-  static nostd::shared_ptr<ExemplarReservoir> GetSimpleFixedSizeExemplarReservoir(
-      size_t size,
-      std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
-      MapAndResetCellType map_and_reset_cell);
-
-  static nostd::shared_ptr<ExemplarReservoir> GetAlignedHistogramBucketExemplarReservoir(
-      size_t size,
-      std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
-      MapAndResetCellType map_and_reset_cell);
-
-  static nostd::shared_ptr<ExemplarReservoir> GetNoExemplarReservoir();
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h
deleted file mode 100644
index cc315b713..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <cstddef>
-#  include <memory>
-
-#  include "opentelemetry/common/timestamp.h"
-#  include "opentelemetry/nostd/variant.h"
-#  include "opentelemetry/sdk/metrics/data/exemplar_data.h"
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/trace/context.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-class Context;
-}  // namespace context
-
-namespace sdk
-{
-namespace metrics
-{
-/**
- * A Reservoir cell pre-allocated memories for Exemplar data.
- */
-class ReservoirCell
-{
-public:
-  ReservoirCell() = default;
-
-  /**
-   * Record the long measurement to the cell.
-   */
-  void RecordLongMeasurement(int64_t value,
-                             const MetricAttributes &attributes,
-                             const opentelemetry::context::Context &context)
-  {
-    value_ = value;
-    offerMeasurement(attributes, context);
-  }
-
-  /**
-   * Record the long measurement to the cell.
-   */
-  void RecordDoubleMeasurement(double value,
-                               const MetricAttributes &attributes,
-                               const opentelemetry::context::Context &context)
-  {
-    value_ = value;
-    offerMeasurement(attributes, context);
-  }
-
-  /**
-   * Retrieve the cell's {@link ExemplarData}.
-   *
-   * <p>Must be used in tandem with {@link #recordLongMeasurement(int64_t, Attributes, Context)}.
-   */
-  std::shared_ptr<ExemplarData> GetAndResetLong(const MetricAttributes &point_attributes)
-  {
-    if (!context_)
-    {
-      return nullptr;
-    }
-    auto attributes = attributes_;
-    PointDataAttributes point_data_attributes;
-    point_data_attributes.attributes = filtered(attributes, point_attributes);
-    if (nostd::holds_alternative<int64_t>(value_))
-    {
-      point_data_attributes.point_data =
-          ExemplarData::CreateSumPointData(nostd::get<int64_t>(value_));
-    }
-    std::shared_ptr<ExemplarData> result{
-        new ExemplarData{ExemplarData::Create(context_, record_time_, point_data_attributes)}};
-    reset();
-    return result;
-  }
-
-  /**
-   * Retrieve the cell's {@link ExemplarData}.
-   *
-   * <p>Must be used in tandem with {@link #recordDoubleMeasurement(double, Attributes, Context)}.
-   */
-  std::shared_ptr<ExemplarData> GetAndResetDouble(const MetricAttributes &point_attributes)
-  {
-    if (!context_)
-    {
-      return nullptr;
-    }
-    auto attributes = attributes_;
-    PointDataAttributes point_data_attributes;
-    point_data_attributes.attributes = filtered(attributes, point_attributes);
-    if (nostd::holds_alternative<double>(value_))
-    {
-      point_data_attributes.point_data =
-          ExemplarData::CreateSumPointData(nostd::get<double>(value_));
-    }
-    std::shared_ptr<ExemplarData> result{
-        new ExemplarData{ExemplarData::Create(context_, record_time_, point_data_attributes)}};
-    reset();
-    return result;
-  }
-
-  void reset()
-  {
-    value_       = 0.0;
-    record_time_ = opentelemetry::common::SystemTimestamp{};
-  }
-
-private:
-  /** Returns filtered attributes for exemplars. */
-  static MetricAttributes filtered(const MetricAttributes &original,
-                                   const MetricAttributes &metric_point)
-  {
-    auto res = original;
-    for (const auto &kv : metric_point)
-    {
-      auto it = res.find(kv.first);
-      if (it != res.end())
-      {
-        res.erase(it);
-      }
-    }
-    res.UpdateHash();
-    return res;
-  }
-
-  void offerMeasurement(const MetricAttributes &attributes,
-                        const opentelemetry::context::Context &context)
-  {
-    attributes_  = attributes;
-    record_time_ = opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now());
-    auto span    = opentelemetry::trace::GetSpan(context);
-    if (span)
-    {
-      auto current_ctx = span->GetContext();
-      if (current_ctx.IsValid())
-      {
-        context_.reset(new opentelemetry::trace::SpanContext{current_ctx});
-      }
-    }
-  }
-
-  // Cell stores either long or double values, but must not store both
-  std::shared_ptr<opentelemetry::trace::SpanContext> context_;
-  nostd::variant<int64_t, double> value_;
-  opentelemetry::common::SystemTimestamp record_time_;
-  MetricAttributes attributes_;
-  // For testing
-  friend class ReservoirCellTestPeer;
-};
-
-typedef std::shared_ptr<ExemplarData> (ReservoirCell::*MapAndResetCellType)(
-    const MetricAttributes &);
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h
deleted file mode 100644
index 79136ed9e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <cstddef>
-#  include <vector>
-
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-class Context;
-}  // namespace context
-
-namespace sdk
-{
-namespace metrics
-{
-class ReservoirCellSelector
-{
-
-public:
-  virtual ~ReservoirCellSelector() = default;
-
-  /** Determine the index of the {@code cells} to record the measurement to. */
-  virtual int ReservoirCellIndexFor(const std::vector<ReservoirCell> &cells,
-                                    int64_t value,
-                                    const MetricAttributes &attributes,
-                                    const opentelemetry::context::Context &context) = 0;
-
-  /** Determine the index of the {@code cells} to record the measurement to. */
-  virtual int ReservoirCellIndexFor(const std::vector<ReservoirCell> &cells,
-                                    double value,
-                                    const MetricAttributes &attributes,
-                                    const opentelemetry::context::Context &context) = 0;
-
-  /** Called when {@link FixedSizeExemplarReservoir#CollectAndReset(Attributes)}. */
-  virtual void reset() = 0;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_utils.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_utils.h
deleted file mode 100644
index dfd10995a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_utils.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include "opentelemetry/common/macros.h"
-#  include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#  include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-static inline MapAndResetCellType GetMapAndResetCellMethod(
-    const InstrumentDescriptor &instrument_descriptor)
-{
-  if (instrument_descriptor.value_type_ == InstrumentValueType::kLong)
-  {
-    return &ReservoirCell::GetAndResetLong;
-  }
-
-  return &ReservoirCell::GetAndResetDouble;
-}
-
-static inline nostd::shared_ptr<ExemplarReservoir> GetExemplarReservoir(
-    const AggregationType agg_type,
-    const AggregationConfig *agg_config,
-    const InstrumentDescriptor &instrument_descriptor)
-{
-  if (agg_type == AggregationType::kHistogram)
-  {
-    const auto *histogram_agg_config = static_cast<const HistogramAggregationConfig *>(agg_config);
-
-    //
-    // Explicit bucket histogram aggregation with more than 1 bucket will use
-    // AlignedHistogramBucketExemplarReservoir.
-    // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#exemplar-defaults
-    //
-    if (histogram_agg_config != nullptr && histogram_agg_config->boundaries_.size() > 1)
-    {
-      return nostd::shared_ptr<ExemplarReservoir>(new AlignedHistogramBucketExemplarReservoir(
-          histogram_agg_config->boundaries_.size(),
-          AlignedHistogramBucketExemplarReservoir::GetHistogramCellSelector(
-              histogram_agg_config->boundaries_),
-          GetMapAndResetCellMethod(instrument_descriptor)));
-    }
-  }
-
-  return nostd::shared_ptr<ExemplarReservoir>(new SimpleFixedSizeExemplarReservoir(
-      SimpleFixedSizeExemplarReservoir::kDefaultSimpleReservoirSize,
-      SimpleFixedSizeExemplarReservoir::GetSimpleFixedSizeCellSelector(),
-      GetMapAndResetCellMethod(instrument_descriptor)));
-}
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h
deleted file mode 100644
index 99e659bf3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <memory>
-#  include <vector>
-
-#  include "opentelemetry/sdk/metrics/data/exemplar_data.h"
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h"
-#  include "opentelemetry/version.h"
-#  include "src/common/random.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class OrderedAttributeMap;
-}  // namespace common
-
-namespace context
-{
-class Context;
-}  // namespace context
-
-namespace sdk
-{
-namespace metrics
-{
-
-class SimpleFixedSizeExemplarReservoir : public FixedSizeExemplarReservoir
-{
-public:
-  static const size_t kDefaultSimpleReservoirSize = 1;
-
-  static std::shared_ptr<ReservoirCellSelector> GetSimpleFixedSizeCellSelector(
-      size_t size = kDefaultSimpleReservoirSize)
-  {
-    return std::shared_ptr<ReservoirCellSelector>{new SimpleFixedSizeCellSelector{size}};
-  }
-
-  SimpleFixedSizeExemplarReservoir(size_t size,
-                                   std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
-                                   MapAndResetCellType map_and_reset_cell)
-      : FixedSizeExemplarReservoir(size, reservoir_cell_selector, map_and_reset_cell)
-  {}
-
-  class SimpleFixedSizeCellSelector : public ReservoirCellSelector
-  {
-  public:
-    SimpleFixedSizeCellSelector(size_t size) : size_(size) {}
-
-    int ReservoirCellIndexFor(const std::vector<ReservoirCell> &cells,
-                              int64_t value,
-                              const MetricAttributes &attributes,
-                              const opentelemetry::context::Context &context) override
-    {
-      return ReservoirCellIndexFor(cells, static_cast<double>(value), attributes, context);
-    }
-
-    int ReservoirCellIndexFor(const std::vector<ReservoirCell> & /* cells */,
-                              double /* value */,
-                              const MetricAttributes & /* attributes */,
-                              const opentelemetry::context::Context & /* context */) override
-    {
-      //
-      // The simple reservoir sampling algorithm from the spec below is used.
-      // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#simplefixedsizeexemplarreservoir
-      //
-
-      size_t measurement_num = measurements_seen_++;
-      size_t index           = static_cast<size_t>(-1);
-
-      if (measurement_num < size_)
-      {
-        index = measurement_num;
-      }
-      else
-      {
-        size_t random_index = sdk::common::Random::GenerateRandom64() % measurement_num;
-
-        if (random_index < size_)
-        {
-          index = random_index;
-        }
-      }
-
-      return static_cast<int>(index);
-    }
-
-    void reset() override {}
-
-  private:
-    size_t measurements_seen_ = 0;
-    size_t size_;
-  };  // class SimpleFixedSizeCellSelector
-
-};  // class SimpleFixedSizeExemplarReservoir
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/metric_filter.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/metric_filter.h
deleted file mode 100644
index f21b9e8fc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/metric_filter.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <functional>
-#include <memory>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-/**
- * MetricFilter defines the interface which enables the MetricReader’s
- * registered MetricProducers or the SDK’s MetricProducer to filter aggregated
- * data points (Metric Points) inside its Produce operation. The filtering is
- * done at the MetricProducer for performance reasons.
- *
- * The MetricFilter allows filtering an entire metric stream - dropping or
- * allowing all its attribute sets - by its TestMetric operation, which accepts
- * the metric stream information (scope, name, kind and unit) and returns an
- * enumeration: kAccept, kDrop or kAcceptPartial. If the latter returned, the
- * TestAttributes operation is to be called per attribute set of that metric
- * stream, returning an enumeration determining if the data point for that
- * (metric stream, attributes) pair is to be allowed in the result of the
- * MetricProducer Produce operation.
- */
-class MetricFilter
-{
-public:
-  enum class MetricFilterResult
-  {
-    kAccept,
-    kDrop,
-    kAcceptPartial,
-  };
-
-  enum class AttributesFilterResult
-  {
-    kAccept,
-    kDrop,
-  };
-
-  using TestMetricFn = std::function<MetricFilterResult(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &scope,
-      opentelemetry::nostd::string_view name,
-      const InstrumentType &type,
-      opentelemetry::nostd::string_view unit)>;
-
-  using TestAttributesFn = std::function<AttributesFilterResult(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &scope,
-      opentelemetry::nostd::string_view name,
-      const InstrumentType &type,
-      opentelemetry::nostd::string_view unit,
-      const PointAttributes &attributes)>;
-
-  // static
-  static std::unique_ptr<MetricFilter> Create(TestMetricFn test_metric_fn,
-                                              TestAttributesFn test_attributes_fn)
-  {
-    return std::make_unique<MetricFilter>(test_metric_fn, test_attributes_fn);
-  }
-
-  MetricFilter(TestMetricFn test_metric_fn, TestAttributesFn test_attributes_fn)
-      : test_metric_fn_(test_metric_fn), test_attributes_fn_(test_attributes_fn)
-  {}
-
-  /**
-   * TestMetric is called once for every metric stream, in each MetricProducer
-   * Produce operation.
-   */
-  MetricFilterResult TestMetric(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &scope,
-      opentelemetry::nostd::string_view name,
-      const InstrumentType &type,
-      opentelemetry::nostd::string_view unit)
-  {
-    return test_metric_fn_(scope, name, type, unit);
-  }
-
-  /**
-   * TestAttributes determines for a given metric stream and attribute set if
-   * it should be allowed or filtered out.
-   *
-   * This operation should only be called if TestMetric operation returned
-   * kAcceptPartial for the given metric stream arguments.
-   */
-  AttributesFilterResult TestAttributes(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &scope,
-      opentelemetry::nostd::string_view name,
-      const InstrumentType &type,
-      opentelemetry::nostd::string_view unit,
-      const PointAttributes &attributes)
-  {
-    return test_attributes_fn_(scope, name, type, unit, attributes);
-  }
-
-private:
-  TestMetricFn test_metric_fn_;
-  TestAttributesFn test_attributes_fn_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/metric_producer.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/metric_producer.h
deleted file mode 100644
index c12b9c6db..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/metric_producer.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_filter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace resource
-{
-class Resource;
-}  // namespace resource
-
-namespace instrumentationscope
-{
-class InstrumentationScope;
-}  // namespace instrumentationscope
-
-namespace metrics
-{
-
-/**
- * Metric Data to be exported along with resources and
- * Instrumentation scope.
- */
-struct ScopeMetrics
-{
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope_ = nullptr;
-  std::vector<MetricData> metric_data_;
-
-  template <class ScopePtr, class MetricDataType>
-  inline ScopeMetrics(ScopePtr &&scope, MetricDataType &&metric)
-      : scope_{std::forward<ScopePtr>(scope)}, metric_data_{std::forward<MetricDataType>(metric)}
-  {}
-
-  inline ScopeMetrics() {}
-  inline ScopeMetrics(const ScopeMetrics &) = default;
-  inline ScopeMetrics(ScopeMetrics &&)      = default;
-
-  inline ScopeMetrics &operator=(const ScopeMetrics &) = default;
-
-  inline ScopeMetrics &operator=(ScopeMetrics &&) = default;
-};
-
-struct ResourceMetrics
-{
-  const opentelemetry::sdk::resource::Resource *resource_ = nullptr;
-  std::vector<ScopeMetrics> scope_metric_data_;
-
-  template <class ResourcePtr, class ScopeMetricsType>
-  inline ResourceMetrics(ResourcePtr &&resource, ScopeMetricsType &&scope_metric_data)
-      : resource_{std::forward<ResourcePtr>(resource)},
-        scope_metric_data_{std::forward<ScopeMetricsType>(scope_metric_data)}
-  {}
-
-  inline ResourceMetrics() {}
-  inline ResourceMetrics(const ResourceMetrics &) = default;
-  inline ResourceMetrics(ResourceMetrics &&)      = default;
-
-  inline ResourceMetrics &operator=(const ResourceMetrics &) = default;
-
-  inline ResourceMetrics &operator=(ResourceMetrics &&) = default;
-};
-
-/**
- * MetricProducer defines the interface which bridges to third-party metric sources MUST implement,
- * so they can be plugged into an OpenTelemetry MetricReader as a source of aggregated metric data.
- *
- * Implementations must be thread-safe, and should accept configuration for the
- * AggregationTemporality of produced metrics.
- */
-class MetricProducer
-{
-public:
-  MetricProducer()          = default;
-  virtual ~MetricProducer() = default;
-
-  MetricProducer(const MetricProducer &)  = delete;
-  MetricProducer(const MetricProducer &&) = delete;
-
-  enum class Status
-  {
-    kSuccess,
-    kFailure,
-    kTimeout,
-  };
-
-  struct Result
-  {
-    ResourceMetrics points_;
-    Status status_;
-  };
-
-  /**
-   * Produce returns a batch of Metric Points, with a single instrumentation scope that identifies
-   * the MetricProducer. Implementations may return successfully collected points even if there is a
-   * partial failure.
-   */
-  virtual Result Produce() noexcept = 0;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h
deleted file mode 100644
index bb8db1ac0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <thread>
-
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class PeriodicExportingMetricReader : public MetricReader
-{
-
-public:
-  PeriodicExportingMetricReader(std::unique_ptr<PushMetricExporter> exporter,
-                                const PeriodicExportingMetricReaderOptions &options);
-
-  PeriodicExportingMetricReader(std::unique_ptr<PushMetricExporter> exporter,
-                                const PeriodicExportingMetricReaderOptions &options,
-                                const PeriodicExportingMetricReaderRuntimeOptions &runtime_options);
-
-  AggregationTemporality GetAggregationTemporality(
-      InstrumentType instrument_type) const noexcept override;
-
-private:
-  bool OnForceFlush(std::chrono::microseconds timeout) noexcept override;
-
-  bool OnShutDown(std::chrono::microseconds timeout) noexcept override;
-
-  void OnInitialized() noexcept override;
-
-  std::unique_ptr<PushMetricExporter> exporter_;
-  std::chrono::milliseconds export_interval_millis_;
-  std::chrono::milliseconds export_timeout_millis_;
-
-  void DoBackgroundWork();
-  bool CollectAndExportOnce();
-
-  /* Synchronization primitives */
-  std::atomic<bool> is_force_wakeup_background_worker_{false};
-  std::atomic<uint64_t> force_flush_pending_sequence_{0};
-  std::atomic<uint64_t> force_flush_notified_sequence_{0};
-  std::condition_variable cv_, force_flush_cv_;
-  std::mutex cv_m_, force_flush_m_;
-
-  /* The background worker thread */
-  std::shared_ptr<sdk::common::ThreadInstrumentation> worker_thread_instrumentation_;
-  std::shared_ptr<sdk::common::ThreadInstrumentation> collect_thread_instrumentation_;
-  std::thread worker_thread_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h
deleted file mode 100644
index 4325edfc3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class OPENTELEMETRY_EXPORT PeriodicExportingMetricReaderFactory
-{
-public:
-  static std::unique_ptr<MetricReader> Create(std::unique_ptr<PushMetricExporter> exporter,
-                                              const PeriodicExportingMetricReaderOptions &options);
-
-  static std::unique_ptr<MetricReader> Create(
-      std::unique_ptr<PushMetricExporter> exporter,
-      const PeriodicExportingMetricReaderOptions &options,
-      const PeriodicExportingMetricReaderRuntimeOptions &runtime_options);
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h
deleted file mode 100644
index 80514f96d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#include <chrono>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-constexpr std::chrono::milliseconds kExportIntervalMillis = std::chrono::milliseconds(60000);
-constexpr std::chrono::milliseconds kExportTimeOutMillis  = std::chrono::milliseconds(30000);
-
-/**
- * Struct to hold PeriodicExortingMetricReader options.
- */
-
-struct PeriodicExportingMetricReaderOptions
-{
-  /* The time interval between two consecutive exports. */
-  std::chrono::milliseconds export_interval_millis =
-      std::chrono::milliseconds(kExportIntervalMillis);
-
-  /*  how long the export can run before it is cancelled. */
-  std::chrono::milliseconds export_timeout_millis = std::chrono::milliseconds(kExportTimeOutMillis);
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h
deleted file mode 100644
index f816fc05a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-/**
- * Struct to hold PeriodicExortingMetricReader runtime options.
- */
-struct PeriodicExportingMetricReaderRuntimeOptions
-{
-  std::shared_ptr<sdk::common::ThreadInstrumentation> periodic_thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-  std::shared_ptr<sdk::common::ThreadInstrumentation> collect_thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/instrument_metadata_validator.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/instrument_metadata_validator.h
deleted file mode 100644
index a24d6db73..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/instrument_metadata_validator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-#  include <regex>
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class InstrumentMetaDataValidator
-{
-public:
-  InstrumentMetaDataValidator();
-  bool ValidateName(nostd::string_view name) const;
-  bool ValidateUnit(nostd::string_view unit) const;
-  bool ValidateDescription(nostd::string_view description) const;
-
-private:
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  const std::regex name_reg_key_;
-  const std::regex unit_reg_key_;
-#endif
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/instruments.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/instruments.h
deleted file mode 100644
index 620fddedb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/instruments.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-#include <cctype>
-#include <functional>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-enum class InstrumentType
-{
-  kCounter,
-  kHistogram,
-  kUpDownCounter,
-  kObservableCounter,
-  kObservableGauge,
-  kObservableUpDownCounter,
-  kGauge
-};
-
-enum class InstrumentClass
-{
-  kSync,
-  kAsync
-};
-
-enum class InstrumentValueType
-{
-  kInt,
-  kLong,
-  kFloat,
-  kDouble
-};
-
-enum class AggregationType
-{
-  kDrop,
-  kHistogram,
-  kLastValue,
-  kSum,
-  kDefault,
-  kBase2ExponentialHistogram
-};
-
-enum class AggregationTemporality
-{
-  kUnspecified,
-  kDelta,
-  kCumulative
-};
-
-struct InstrumentDescriptor
-{
-  std::string name_;
-  std::string description_;
-  std::string unit_;
-  InstrumentType type_;
-  InstrumentValueType value_type_;
-};
-
-struct InstrumentDescriptorUtil
-{
-  // Case-insensitive comparison of two ASCII strings used to evaluate equality of instrument names
-  static bool CaseInsensitiveAsciiEquals(const std::string &lhs, const std::string &rhs) noexcept
-  {
-    return lhs.size() == rhs.size() &&
-           std::equal(lhs.begin(), lhs.end(), rhs.begin(), [](char a, char b) {
-             return std::tolower(static_cast<unsigned char>(a)) ==
-                    std::tolower(static_cast<unsigned char>(b));
-           });
-  }
-
-  // Implementation of the specification requirements on duplicate instruments
-  // An instrument is a duplicate if it has the same name (case-insensitive) as another instrument,
-  // but different instrument kind, unit, or description.
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/9c8c30631b0e288de93df7452f91ed47f6fba330/specification/metrics/sdk.md?plain=1#L869
-  static bool IsDuplicate(const InstrumentDescriptor &lhs, const InstrumentDescriptor &rhs) noexcept
-  {
-    // Not a duplicate if case-insensitive names are not equal
-    if (!InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals(lhs.name_, rhs.name_))
-    {
-      return false;
-    }
-
-    // Duplicate if names equal and kinds (Type and ValueType) are not equal
-    if (lhs.type_ != rhs.type_ || lhs.value_type_ != rhs.value_type_)
-    {
-      return true;
-    }
-
-    // Duplicate if names equal and units (case-sensitive) are not equal
-    if (lhs.unit_ != rhs.unit_)
-    {
-      return true;
-    }
-
-    // Duplicate if names equal and descriptions (case-sensitive) are not equal
-    if (lhs.description_ != rhs.description_)
-    {
-      return true;
-    }
-
-    // All identifying fields are equal
-    // These are identical instruments or only have a name case conflict
-    return false;
-  }
-
-  static opentelemetry::nostd::string_view GetInstrumentTypeString(InstrumentType type) noexcept
-  {
-    switch (type)
-    {
-      case InstrumentType::kCounter:
-        return "Counter";
-      case InstrumentType::kUpDownCounter:
-        return "UpDownCounter";
-      case InstrumentType::kHistogram:
-        return "Histogram";
-      case InstrumentType::kObservableCounter:
-        return "ObservableCounter";
-      case InstrumentType::kObservableUpDownCounter:
-        return "ObservableUpDownCounter";
-      case InstrumentType::kObservableGauge:
-        return "ObservableGauge";
-      case InstrumentType::kGauge:
-        return "Gauge";
-      default:
-        return "Unknown";
-    }
-  }
-
-  static opentelemetry::nostd::string_view GetInstrumentValueTypeString(
-      InstrumentValueType value_type) noexcept
-  {
-    switch (value_type)
-    {
-      case InstrumentValueType::kInt:
-        return "Int";
-      case InstrumentValueType::kLong:
-        return "Long";
-      case InstrumentValueType::kFloat:
-        return "Float";
-      case InstrumentValueType::kDouble:
-        return "Double";
-      default:
-        return "Unknown";
-    }
-  }
-};
-
-struct InstrumentEqualNameCaseInsensitive
-{
-  bool operator()(const InstrumentDescriptor &lhs, const InstrumentDescriptor &rhs) const noexcept
-  {
-    // Names (case-insensitive)
-    if (!InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals(lhs.name_, rhs.name_))
-    {
-      return false;
-    }
-
-    // Kinds (Type and ValueType)
-    if (lhs.type_ != rhs.type_ || lhs.value_type_ != rhs.value_type_)
-    {
-      return false;
-    }
-
-    // Units (case-sensitive)
-    if (lhs.unit_ != rhs.unit_)
-    {
-      return false;
-    }
-
-    // Descriptions (case-sensitive)
-    if (lhs.description_ != rhs.description_)
-    {
-      return false;
-    }
-
-    // All identifying fields are equal
-    return true;
-  }
-};
-
-// Hash for InstrumentDescriptor
-// Identical instruments must have the same hash value
-// Two instruments are identical when all identifying fields (case-insensitive name , kind,
-// description, unit) are equal.
-struct InstrumentDescriptorHash
-{
-  std::size_t operator()(const InstrumentDescriptor &instrument_descriptor) const noexcept
-  {
-    std::size_t hashcode{};
-
-    for (char c : instrument_descriptor.name_)
-    {
-      sdk::common::GetHash(hashcode,
-                           static_cast<char>(std::tolower(static_cast<unsigned char>(c))));
-    }
-
-    sdk::common::GetHash(hashcode, instrument_descriptor.description_);
-    sdk::common::GetHash(hashcode, instrument_descriptor.unit_);
-    sdk::common::GetHash(hashcode, static_cast<uint32_t>(instrument_descriptor.type_));
-    sdk::common::GetHash(hashcode, static_cast<uint32_t>(instrument_descriptor.value_type_));
-    return hashcode;
-  }
-};
-
-using MetricAttributes               = opentelemetry::sdk::metrics::FilteredOrderedAttributeMap;
-using MetricAttributesHash           = opentelemetry::sdk::metrics::FilteredOrderedAttributeMapHash;
-using AggregationTemporalitySelector = std::function<AggregationTemporality(InstrumentType)>;
-
-/*class InstrumentSelector {
-public:
-InstrumentSelector(opentelemetry::nostd::string_view name,
-opentelemetry::sdk::metrics::InstrumentType type): name_(name.data()), type_(type) {} InstrumentType
-GetType(){return type_;} std::string GetNameFilter() { return name_;}
-
-private:
-std::string name_;
-InstrumentType type_;
-};*/
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter.h
deleted file mode 100644
index 9e2107fcd..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter.h
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/noop.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/common/attributemap_hash.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/instrument_metadata_validator.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/state/async_metric_storage.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk_config.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class MetricStorage;
-class SyncWritableMetricStorage;
-class AsyncWritableMetricsStorge;
-class ObservableRegistry;
-
-class Meter final : public opentelemetry::metrics::Meter
-{
-public:
-  /** Construct a new Meter with the given  pipeline. */
-  explicit Meter(
-      std::weak_ptr<sdk::metrics::MeterContext> meter_context,
-      std::unique_ptr<opentelemetry::sdk::instrumentationscope::InstrumentationScope> scope =
-          opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("")) noexcept;
-
-  nostd::unique_ptr<opentelemetry::metrics::Counter<uint64_t>> CreateUInt64Counter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::unique_ptr<opentelemetry::metrics::Counter<double>> CreateDoubleCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument> CreateInt64ObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument> CreateDoubleObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::unique_ptr<opentelemetry::metrics::Histogram<uint64_t>> CreateUInt64Histogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::unique_ptr<opentelemetry::metrics::Histogram<double>> CreateDoubleHistogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::unique_ptr<opentelemetry::metrics::Gauge<int64_t>> CreateInt64Gauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::unique_ptr<opentelemetry::metrics::Gauge<double>> CreateDoubleGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-#endif
-
-  nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument> CreateInt64ObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument> CreateDoubleObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::unique_ptr<opentelemetry::metrics::UpDownCounter<int64_t>> CreateInt64UpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::unique_ptr<opentelemetry::metrics::UpDownCounter<double>> CreateDoubleUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override;
-
-  nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-  CreateInt64ObservableUpDownCounter(nostd::string_view name,
-                                     nostd::string_view description = "",
-                                     nostd::string_view unit        = "") noexcept override;
-
-  nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-  CreateDoubleObservableUpDownCounter(nostd::string_view name,
-                                      nostd::string_view description = "",
-                                      nostd::string_view unit        = "") noexcept override;
-
-  /** Returns the associated instrumentation scope */
-  const sdk::instrumentationscope::InstrumentationScope *GetInstrumentationScope() const noexcept;
-
-  OPENTELEMETRY_DEPRECATED_MESSAGE("Please use GetInstrumentationScope instead")
-  const sdk::instrumentationscope::InstrumentationScope *GetInstrumentationLibrary() const noexcept
-  {
-    return GetInstrumentationScope();
-  }
-
-  /** collect metrics across all the instruments configured for the meter **/
-  std::vector<MetricData> Collect(CollectorHandle *collector,
-                                  opentelemetry::common::SystemTimestamp collect_ts) noexcept;
-
-private:
-  // order of declaration is important here - instrumentation scope should destroy after
-  // meter-context.
-  std::unique_ptr<sdk::instrumentationscope::InstrumentationScope> scope_;
-  std::weak_ptr<sdk::metrics::MeterContext> meter_context_;
-  // Mapping between instrument descriptor and Aggregation Storage.
-  using MetricStorageMap = std::unordered_map<InstrumentDescriptor,
-                                              std::shared_ptr<MetricStorage>,
-                                              InstrumentDescriptorHash,
-                                              InstrumentEqualNameCaseInsensitive>;
-  MetricStorageMap storage_registry_;
-  std::shared_ptr<ObservableRegistry> observable_registry_;
-  MeterConfig meter_config_;
-  std::unique_ptr<SyncWritableMetricStorage> RegisterSyncMetricStorage(
-      InstrumentDescriptor &instrument_descriptor);
-  std::unique_ptr<AsyncWritableMetricStorage> RegisterAsyncMetricStorage(
-      InstrumentDescriptor &instrument_descriptor);
-  opentelemetry::common::SpinLockMutex storage_lock_;
-
-  static opentelemetry::metrics::NoopMeter kNoopMeter;
-
-  static nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-  GetNoopObservableInsrument()
-  {
-    static nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument> noop_instrument(
-        new opentelemetry::metrics::NoopObservableInstrument("", "", ""));
-    return noop_instrument;
-  }
-
-  static bool ValidateInstrument(nostd::string_view name,
-                                 nostd::string_view description,
-                                 nostd::string_view unit)
-  {
-    const static InstrumentMetaDataValidator instrument_validator;
-    return instrument_validator.ValidateName(name) && instrument_validator.ValidateUnit(unit) &&
-           instrument_validator.ValidateDescription(description);
-  }
-
-  // This function checks if the instrument is a duplicate of an existing one
-  // and emits a warning through the internal logger.
-  static void WarnOnDuplicateInstrument(
-      const sdk::instrumentationscope::InstrumentationScope *scope,
-      const MetricStorageMap &storage_registry,
-      const InstrumentDescriptor &new_instrument);
-
-  // This function checks if the instrument has a name case conflict with an existing one
-  // and emits a warning through the internal logger.
-  static void WarnOnNameCaseConflict(const sdk::instrumentationscope::InstrumentationScope *scope,
-                                     const InstrumentDescriptor &existing_instrument,
-                                     const InstrumentDescriptor &new_instrument);
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_config.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_config.h
deleted file mode 100644
index 3523230e1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-/**
- * MeterConfig defines various configurable aspects of a Meter's behavior.
- * This class should not be used directly to configure a Meter's behavior, instead a
- * ScopeConfigurator should be used to compute the desired MeterConfig which can then be used to
- * configure a Meter.
- */
-class OPENTELEMETRY_EXPORT MeterConfig
-{
-public:
-  bool operator==(const MeterConfig &other) const noexcept;
-
-  /**
-   * Returns if the Meter is enabled or disabled. Meters are enabled by default.
-   * @return a boolean indicating if the Meter is enabled. Defaults to true.
-   */
-  bool IsEnabled() const noexcept;
-
-  /**
-   * Returns a MeterConfig that represents a disabled Meter. A disabled meter behaves like a
-   * no-op meter.
-   * @return a static constant MeterConfig that represents a disabled meter.
-   */
-  static MeterConfig Disabled();
-
-  /**
-   * Returns a MeterConfig that represents an enabled Meter.
-   * @return a static constant MeterConfig that represents an enabled meter.
-   */
-  static MeterConfig Enabled();
-
-  /**
-   * Returns a MeterConfig that represents a Meter configured with the default behavior.
-   * The default behavior is guided by the OpenTelemetry specification.
-   * @return a static constant MeterConfig that represents a meter configured with default
-   * behavior.
-   */
-  static MeterConfig Default();
-
-private:
-  explicit MeterConfig(const bool disabled = false) : disabled_(disabled) {}
-  bool disabled_;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_context.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_context.h
deleted file mode 100644
index 468f5cdab..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_context.h
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/metrics/export/metric_filter.h"
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#endif
-
-namespace testing
-{
-class MetricCollectorTest;
-}
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-// forward declaration
-class CollectorHandle;
-class InstrumentSelector;
-class Meter;
-class MetricReader;
-class MeterSelector;
-
-/**
- * A class which stores the MeterProvider context.
-
- */
-class MeterContext : public std::enable_shared_from_this<MeterContext>
-{
-public:
-  /**
-   * Initialize a new meter provider
-   * @param views The views to be configured with meter context.
-   * @param resource  The resource for this meter context.
-   */
-  MeterContext(
-      std::unique_ptr<ViewRegistry> views = std::unique_ptr<ViewRegistry>(new ViewRegistry()),
-      const opentelemetry::sdk::resource::Resource &resource =
-          opentelemetry::sdk::resource::Resource::Create({}),
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>> meter_configurator =
-          std::make_unique<instrumentationscope::ScopeConfigurator<MeterConfig>>(
-              instrumentationscope::ScopeConfigurator<MeterConfig>::Builder(MeterConfig::Default())
-                  .Build())) noexcept;
-
-  /**
-   * Obtain the resource associated with this meter context.
-   * @return The resource for this meter context
-   */
-  const opentelemetry::sdk::resource::Resource &GetResource() const noexcept;
-
-  /**
-   * Obtain the View Registry configured
-   * @return The reference to view registry
-   */
-  ViewRegistry *GetViewRegistry() const noexcept;
-
-  /**
-   * Obtain the ScopeConfigurator with this meter context.
-   * @return The ScopeConfigurator for this meter context.
-   */
-  const instrumentationscope::ScopeConfigurator<MeterConfig> &GetMeterConfigurator() const noexcept;
-
-  /**
-   * NOTE - INTERNAL method, can change in the future.
-   * Process callback for each meter in thread-safe manner
-   */
-  bool ForEachMeter(nostd::function_ref<bool(std::shared_ptr<Meter> &meter)> callback) noexcept;
-
-  /**
-   * NOTE - INTERNAL method, can change in the future.
-   * Get the configured meters.
-   * This method is NOT thread safe, and only called through MeterProvider
-   *
-   */
-  nostd::span<std::shared_ptr<Meter>> GetMeters() noexcept;
-
-  /**
-   * Obtain the configured collectors.
-   *
-   */
-  nostd::span<std::shared_ptr<CollectorHandle>> GetCollectors() noexcept;
-
-  /**
-   * GET SDK Start time
-   *
-   */
-  opentelemetry::common::SystemTimestamp GetSDKStartTime() noexcept;
-
-  /**
-   * Create a MetricCollector from a MetricReader using this MeterContext and add it to the list of
-   * configured collectors.
-   * @param reader The MetricReader for which a MetricCollector is to be created. This must not be a
-   * nullptr.
-   * @param metric_filter The optional MetricFilter used when creating the MetricCollector.
-   *
-   * Note: This reader may not receive any in-flight meter data, but will get newly created meter
-   * data.
-   * Note: This method is not thread safe, and should ideally be called from main thread.
-   */
-  void AddMetricReader(std::shared_ptr<MetricReader> reader,
-                       std::unique_ptr<MetricFilter> metric_filter = nullptr) noexcept;
-
-  /**
-   * Attaches a View to list of configured Views for this Meter context.
-   * @param view The Views for this meter context. This
-   * must not be a nullptr.
-   *
-   * Note: This view may not receive any in-flight meter data, but will get newly created meter
-   * data. Note: This method is not thread safe, and should ideally be called from main thread.
-   */
-  void AddView(std::unique_ptr<InstrumentSelector> instrument_selector,
-               std::unique_ptr<MeterSelector> meter_selector,
-               std::unique_ptr<View> view) noexcept;
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-  void SetExemplarFilter(ExemplarFilterType exemplar_filter_type) noexcept;
-
-  ExemplarFilterType GetExemplarFilter() const noexcept;
-
-#endif
-
-  /**
-   * NOTE - INTERNAL method, can change in future.
-   * Adds a meter to the list of configured meters in thread safe manner.
-   *
-   * @param meter
-   */
-  void AddMeter(const std::shared_ptr<Meter> &meter);
-
-  void RemoveMeter(nostd::string_view name,
-                   nostd::string_view version,
-                   nostd::string_view schema_url);
-
-  /**
-   * Force all active Collectors to flush any buffered meter data
-   * within the given timeout.
-   */
-
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Shutdown the Collectors associated with this meter provider.
-   */
-  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-private:
-  friend class ::testing::MetricCollectorTest;
-
-  opentelemetry::sdk::resource::Resource resource_;
-  std::vector<std::shared_ptr<CollectorHandle>> collectors_;
-  std::unique_ptr<ViewRegistry> views_;
-  opentelemetry::common::SystemTimestamp sdk_start_ts_;
-  std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>> meter_configurator_;
-  std::vector<std::shared_ptr<Meter>> meters_;
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-  metrics::ExemplarFilterType exemplar_filter_type_ = metrics::ExemplarFilterType::kAlwaysOff;
-#endif
-
-#if defined(__cpp_lib_atomic_value_initialization) && \
-    __cpp_lib_atomic_value_initialization >= 201911L
-  std::atomic_flag shutdown_latch_{};
-#else
-  std::atomic_flag shutdown_latch_ = ATOMIC_FLAG_INIT;
-#endif
-  opentelemetry::common::SpinLockMutex forceflush_lock_;
-  opentelemetry::common::SpinLockMutex meter_lock_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_context_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_context_factory.h
deleted file mode 100644
index 3b6544b98..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_context_factory.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-/**
- * Factory class for MeterContext.
- */
-class OPENTELEMETRY_EXPORT MeterContextFactory
-{
-public:
-  /**
-   * Create a MeterContext with valid defaults.
-   * @return A unique pointer to the created MeterContext object.
-   */
-  static std::unique_ptr<MeterContext> Create();
-
-  /**
-   * Create a MeterContext with specified views.
-   * @param views ViewRegistry containing OpenTelemetry views registered with this meter context.
-   */
-  static std::unique_ptr<MeterContext> Create(std::unique_ptr<ViewRegistry> views);
-
-  /**
-   * Create a MeterContext with specified views and resource.
-   * @param views ViewRegistry containing OpenTelemetry views registered with this meter context.
-   * @param resource The OpenTelemetry resource associated with this meter context.
-   * @return A unique pointer to the created MeterContext object.
-   */
-  static std::unique_ptr<MeterContext> Create(
-      std::unique_ptr<ViewRegistry> views,
-      const opentelemetry::sdk::resource::Resource &resource);
-
-  /**
-   * Create a MeterContext with specified views, resource and meter scope configurator.
-   * @param views ViewRegistry containing OpenTelemetry views registered with this meter context.
-   * @param resource The OpenTelemetry resource associated with this meter context.
-   * @param meter_configurator A scope configurator defining the behavior of a meter associated with
-   * this meter context.
-   * @return A unique pointer to the created MeterContext object.
-   */
-  static std::unique_ptr<MeterContext> Create(
-      std::unique_ptr<ViewRegistry> views,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>> meter_configurator);
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_provider.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_provider.h
deleted file mode 100644
index b2c5d36b1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_provider.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <mutex>
-
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/metrics/export/metric_filter.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class OPENTELEMETRY_EXPORT MeterProvider final : public opentelemetry::metrics::MeterProvider
-{
-public:
-  /**
-   * Initialize a new meter provider.
-   * @param views The views for this meter provider
-   * @param resource  The resources for this meter provider.
-   * @param meter_configurator Provides access to a function that computes the MeterConfig for
-   * Meters provided by this MeterProvider.
-   */
-  MeterProvider(
-      std::unique_ptr<ViewRegistry> views     = std::unique_ptr<ViewRegistry>(new ViewRegistry()),
-      const sdk::resource::Resource &resource = sdk::resource::Resource::Create({}),
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>> meter_configurator =
-          std::make_unique<instrumentationscope::ScopeConfigurator<MeterConfig>>(
-              instrumentationscope::ScopeConfigurator<MeterConfig>::Builder(MeterConfig::Default())
-                  .Build())) noexcept;
-
-  /**
-   * Initialize a new meter provider with a specified context
-   * @param context The owned meter configuration/pipeline for this provider.
-   */
-  explicit MeterProvider(std::unique_ptr<MeterContext> context) noexcept;
-
-  /*
-    Make sure GetMeter() helpers from the API are seen in overload resolution.
-  */
-  using opentelemetry::metrics::MeterProvider::GetMeter;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<opentelemetry::metrics::Meter> GetMeter(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      const opentelemetry::common::KeyValueIterable *attributes) noexcept override;
-#else
-  nostd::shared_ptr<opentelemetry::metrics::Meter> GetMeter(
-      nostd::string_view name,
-      nostd::string_view version    = "",
-      nostd::string_view schema_url = "") noexcept override;
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void RemoveMeter(nostd::string_view name,
-                   nostd::string_view version,
-                   nostd::string_view schema_url) noexcept override;
-#endif
-
-  /**
-   * Obtain the resource associated with this meter provider.
-   * @return The resource for this meter provider.
-   */
-  const sdk::resource::Resource &GetResource() const noexcept;
-
-  /**
-   * Create a MetricCollector from a MetricReader using the MeterContext of this MeterProvider and
-   * add it to the list of configured collectors.
-   * @param reader The MetricReader for which a MetricCollector is to be created. This must not be a
-   * nullptr.
-   * @param metric_filter The optional MetricFilter used when creating the MetricCollector.
-   *
-   * Note: This reader may not receive any in-flight meter data, but will get newly created meter
-   * data.
-   * Note: This method is not thread safe, and should ideally be called from main thread.
-   */
-  void AddMetricReader(std::shared_ptr<MetricReader> reader,
-                       std::unique_ptr<MetricFilter> metric_filter = nullptr) noexcept;
-
-  /**
-   * Attaches a View to list of configured Views for this Meter provider.
-   * @param view The Views for this meter provider. This
-   * must not be a nullptr.
-   *
-   * Note: This view may not receive any in-flight meter data, but will get newly created meter
-   * data. Note: This method is not thread safe, and should ideally be called from main thread.
-   */
-  void AddView(std::unique_ptr<InstrumentSelector> instrument_selector,
-               std::unique_ptr<MeterSelector> meter_selector,
-               std::unique_ptr<View> view) noexcept;
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-  void SetExemplarFilter(metrics::ExemplarFilterType exemplar_filter_type =
-                             metrics::ExemplarFilterType::kTraceBased) noexcept;
-
-#endif
-
-  /**
-   * Shutdown the meter provider.
-   */
-  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Force flush the meter provider.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  ~MeterProvider() override;
-
-private:
-  std::shared_ptr<MeterContext> context_;
-  std::mutex lock_;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_provider_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_provider_factory.h
deleted file mode 100644
index f31b06ae1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/meter_provider_factory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class OPENTELEMETRY_EXPORT MeterProviderFactory
-{
-public:
-  static std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> Create();
-
-  static std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> Create(
-      std::unique_ptr<ViewRegistry> views);
-
-  static std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> Create(
-      std::unique_ptr<ViewRegistry> views,
-      const opentelemetry::sdk::resource::Resource &resource);
-
-  static std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> Create(
-      std::unique_ptr<ViewRegistry> views,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>> meter_configurator);
-
-  static std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> Create(
-      std::unique_ptr<sdk::metrics::MeterContext> context);
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/metric_reader.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/metric_reader.h
deleted file mode 100644
index 30d5e6082..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/metric_reader.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-/**
- * MetricReader defines the interface to collect metrics from SDK
- */
-class MetricReader
-{
-public:
-  MetricReader();
-
-  void SetMetricProducer(MetricProducer *metric_producer);
-
-  /**
-   * Collect the metrics from SDK.
-   * @return return the status of the operation.
-   */
-  bool Collect(nostd::function_ref<bool(ResourceMetrics &metric_data)> callback) noexcept;
-
-  /**
-   * Get the AggregationTemporality for given Instrument Type for this reader.
-   *
-   * @return AggregationTemporality
-   */
-
-  virtual AggregationTemporality GetAggregationTemporality(
-      InstrumentType instrument_type) const noexcept = 0;
-
-  /**
-   * Shutdown the metric reader.
-   */
-  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Force flush the metric read by the reader.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Return the status of Metric reader.
-   */
-  bool IsShutdown() const noexcept;
-
-  virtual ~MetricReader() = default;
-
-private:
-  virtual bool OnForceFlush(std::chrono::microseconds timeout) noexcept = 0;
-
-  virtual bool OnShutDown(std::chrono::microseconds timeout) noexcept = 0;
-
-  virtual void OnInitialized() noexcept {}
-
-protected:
-private:
-  MetricProducer *metric_producer_;
-  std::atomic<bool> shutdown_{false};
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/observer_result.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/observer_result.h
deleted file mode 100644
index cc60cf5f6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/observer_result.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <unordered_map>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-template <class T>
-class ObserverResultT final : public opentelemetry::metrics::ObserverResultT<T>
-{
-public:
-  explicit ObserverResultT(const AttributesProcessor *attributes_processor = nullptr)
-      : attributes_processor_(attributes_processor)
-  {}
-
-  ~ObserverResultT() override = default;
-
-  void Observe(T value) noexcept override
-  {
-    data_[MetricAttributes{{}, attributes_processor_}] = value;
-  }
-
-  void Observe(T value, const opentelemetry::common::KeyValueIterable &attributes) noexcept override
-  {
-    data_[MetricAttributes{attributes, attributes_processor_}] =
-        value;  // overwrites the previous value if present
-  }
-
-  const std::unordered_map<MetricAttributes, T, AttributeHashGenerator> &GetMeasurements()
-  {
-    return data_;
-  }
-
-private:
-  std::unordered_map<MetricAttributes, T, AttributeHashGenerator> data_;
-  const AttributesProcessor *attributes_processor_;
-};
-}  // namespace metrics
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/provider.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/provider.h
deleted file mode 100644
index facce0852..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/provider.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-namespace metrics
-{
-
-/**
- * Changes the singleton global MeterProvider.
- */
-class Provider
-{
-public:
-  /**
-   * Changes the singleton MeterProvider.
-   */
-  static void SetMeterProvider(
-      const nostd::shared_ptr<opentelemetry::metrics::MeterProvider> &mp) noexcept;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/push_metric_exporter.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/push_metric_exporter.h
deleted file mode 100644
index 9c5e6ad2b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/push_metric_exporter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class MetricData;
-struct ResourceMetrics;
-
-/**
- * PushMetricExporter defines the interface to be used by metrics libraries to
- *  push metrics data to the OpenTelemetry exporters.
- */
-class PushMetricExporter
-{
-public:
-  virtual ~PushMetricExporter() = default;
-
-  /**
-   * Exports a batch of metrics data. This method must not be called
-   * concurrently for the same exporter instance.
-   * @param data metrics data
-   */
-  virtual opentelemetry::sdk::common::ExportResult Export(const ResourceMetrics &data) noexcept = 0;
-
-  /**
-   * Get the AggregationTemporality for given Instrument Type for this exporter.
-   *
-   * @return AggregationTemporality
-   */
-  virtual AggregationTemporality GetAggregationTemporality(
-      InstrumentType instrument_type) const noexcept = 0;
-
-  /**
-   * Force flush the exporter.
-   */
-  virtual bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-
-  /**
-   * Shut down the metric exporter.
-   * @param timeout an optional timeout.
-   * @return return the status of the operation.
-   */
-  virtual bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h
deleted file mode 100644
index 93ffccc48..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <mutex>
-#include <unordered_map>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/attributemap_hash.h"
-#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#endif
-
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/observer_result.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/temporal_metric_storage.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class AsyncMetricStorage : public MetricStorage, public AsyncWritableMetricStorage
-{
-public:
-  AsyncMetricStorage(InstrumentDescriptor instrument_descriptor,
-                     const AggregationType aggregation_type,
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-                     ExemplarFilterType exempler_filter_type,
-                     nostd::shared_ptr<ExemplarReservoir> &&exemplar_reservoir,
-#endif
-                     const AggregationConfig *aggregation_config)
-      : instrument_descriptor_(instrument_descriptor),
-        aggregation_type_{aggregation_type},
-        cumulative_hash_map_(new AttributesHashMap()),
-        delta_hash_map_(new AttributesHashMap()),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-        exemplar_filter_type_(exempler_filter_type),
-        exemplar_reservoir_(exemplar_reservoir),
-#endif
-        temporal_metric_storage_(instrument_descriptor, aggregation_type, aggregation_config)
-  {}
-
-  template <class T>
-  void Record(const std::unordered_map<MetricAttributes, T, AttributeHashGenerator> &measurements,
-              opentelemetry::common::SystemTimestamp /* observation_time */) noexcept
-  {
-    // Async counter always record monotonically increasing values, and the
-    // exporter/reader can request either for delta or cumulative value.
-    // So we convert the async counter value to delta before passing it to temporal storage.
-    std::lock_guard<opentelemetry::common::SpinLockMutex> guard(hashmap_lock_);
-    for (auto &measurement : measurements)
-    {
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      if (exemplar_filter_type_ == ExemplarFilterType::kAlwaysOn)
-      {
-        exemplar_reservoir_->OfferMeasurement(measurement.second, {}, {},
-                                              std::chrono::system_clock::now());
-      }
-#endif
-
-      auto aggr = DefaultAggregation::CreateAggregation(aggregation_type_, instrument_descriptor_);
-      aggr->Aggregate(measurement.second);
-      auto prev = cumulative_hash_map_->Get(measurement.first);
-      if (prev)
-      {
-        auto delta = prev->Diff(*aggr);
-        // store received value in cumulative map, and the diff in delta map (to pass it to temporal
-        // storage)
-        cumulative_hash_map_->Set(measurement.first, std::move(aggr));
-        delta_hash_map_->Set(measurement.first, std::move(delta));
-      }
-      else
-      {
-        // store received value in cumulative and delta map.
-        cumulative_hash_map_->Set(
-            measurement.first,
-            DefaultAggregation::CloneAggregation(aggregation_type_, instrument_descriptor_, *aggr));
-        delta_hash_map_->Set(measurement.first, std::move(aggr));
-      }
-    }
-  }
-
-  void RecordLong(
-      const std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> &measurements,
-      opentelemetry::common::SystemTimestamp observation_time) noexcept override
-  {
-    if (instrument_descriptor_.value_type_ != InstrumentValueType::kLong)
-    {
-      return;
-    }
-    Record<int64_t>(measurements, observation_time);
-  }
-
-  void RecordDouble(
-      const std::unordered_map<MetricAttributes, double, AttributeHashGenerator> &measurements,
-      opentelemetry::common::SystemTimestamp observation_time) noexcept override
-  {
-    if (instrument_descriptor_.value_type_ != InstrumentValueType::kDouble)
-    {
-      return;
-    }
-    Record<double>(measurements, observation_time);
-  }
-
-  bool Collect(CollectorHandle *collector,
-               nostd::span<std::shared_ptr<CollectorHandle>> collectors,
-               opentelemetry::common::SystemTimestamp sdk_start_ts,
-               opentelemetry::common::SystemTimestamp collection_ts,
-               nostd::function_ref<bool(MetricData)> metric_collection_callback) noexcept override
-  {
-
-    std::shared_ptr<AttributesHashMap> delta_metrics = nullptr;
-    {
-      std::lock_guard<opentelemetry::common::SpinLockMutex> guard(hashmap_lock_);
-      delta_metrics = std::move(delta_hash_map_);
-      delta_hash_map_.reset(new AttributesHashMap);
-    }
-
-    auto status =
-        temporal_metric_storage_.buildMetrics(collector, collectors, sdk_start_ts, collection_ts,
-                                              delta_metrics, metric_collection_callback);
-    return status;
-  }
-
-private:
-  InstrumentDescriptor instrument_descriptor_;
-  AggregationType aggregation_type_;
-  std::unique_ptr<AttributesHashMap> cumulative_hash_map_;
-  std::unique_ptr<AttributesHashMap> delta_hash_map_;
-  opentelemetry::common::SpinLockMutex hashmap_lock_;
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-  ExemplarFilterType exemplar_filter_type_;
-  nostd::shared_ptr<ExemplarReservoir> exemplar_reservoir_;
-#endif
-  TemporalMetricStorage temporal_metric_storage_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h
deleted file mode 100644
index f1ab55ed6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <functional>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/attributemap_hash.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-using opentelemetry::sdk::common::OrderedAttributeMap;
-
-constexpr size_t kAggregationCardinalityLimit = 2000;
-const std::string kAttributesLimitOverflowKey = "otel.metrics.overflow";
-const bool kAttributesLimitOverflowValue      = true;
-const MetricAttributes kOverflowAttributes    = {
-    {kAttributesLimitOverflowKey,
-        kAttributesLimitOverflowValue}};  // precalculated for optimization
-
-class AttributeHashGenerator
-{
-public:
-  size_t operator()(const MetricAttributes &attributes) const
-  {
-    return opentelemetry::sdk::common::GetHashForAttributeMap(attributes);
-  }
-};
-
-template <typename CustomHash = MetricAttributesHash>
-class AttributesHashMapWithCustomHash
-{
-public:
-  AttributesHashMapWithCustomHash(size_t attributes_limit = kAggregationCardinalityLimit)
-      : attributes_limit_(attributes_limit)
-  {}
-  Aggregation *Get(const MetricAttributes &attributes) const
-  {
-    auto it = hash_map_.find(attributes);
-    if (it != hash_map_.end())
-    {
-      return it->second.get();
-    }
-    return nullptr;
-  }
-
-  /**
-   * @return check if key is present in hash
-   *
-   */
-  bool Has(const MetricAttributes &attributes) const
-  {
-    return hash_map_.find(attributes) != hash_map_.end();
-  }
-
-  /**
-   * @return the pointer to value for given key if present.
-   * If not present, it uses the provided callback to generate
-   * value and store in the hash
-   */
-  Aggregation *GetOrSetDefault(
-      const opentelemetry::common::KeyValueIterable &attributes,
-      const AttributesProcessor *attributes_processor,
-      nostd::function_ref<std::unique_ptr<Aggregation>()> aggregation_callback)
-  {
-    // TODO: avoid constructing MetricAttributes from KeyValueIterable for
-    // hash_map_.find which is a heavy operation
-    MetricAttributes attr{attributes, attributes_processor};
-
-    auto it = hash_map_.find(attr);
-    if (it != hash_map_.end())
-    {
-      return it->second.get();
-    }
-
-    if (IsOverflowAttributes())
-    {
-      return GetOrSetOveflowAttributes(aggregation_callback);
-    }
-
-    auto result = hash_map_.emplace(std::move(attr), aggregation_callback());
-    return result.first->second.get();
-  }
-
-  Aggregation *GetOrSetDefault(
-      const MetricAttributes &attributes,
-      nostd::function_ref<std::unique_ptr<Aggregation>()> aggregation_callback)
-  {
-    auto it = hash_map_.find(attributes);
-    if (it != hash_map_.end())
-    {
-      return it->second.get();
-    }
-
-    if (IsOverflowAttributes())
-    {
-      return GetOrSetOveflowAttributes(aggregation_callback);
-    }
-
-    hash_map_[attributes] = aggregation_callback();
-    return hash_map_[attributes].get();
-  }
-
-  Aggregation *GetOrSetDefault(
-      MetricAttributes &&attributes,
-      nostd::function_ref<std::unique_ptr<Aggregation>()> aggregation_callback)
-  {
-    auto it = hash_map_.find(attributes);
-    if (it != hash_map_.end())
-    {
-      return it->second.get();
-    }
-
-    if (IsOverflowAttributes())
-    {
-      return GetOrSetOveflowAttributes(aggregation_callback);
-    }
-
-    auto result = hash_map_.emplace(std::move(attributes), aggregation_callback());
-    return result.first->second.get();
-  }
-  /**
-   * Set the value for given key, overwriting the value if already present
-   */
-  void Set(const opentelemetry::common::KeyValueIterable &attributes,
-           const AttributesProcessor *attributes_processor,
-           std::unique_ptr<Aggregation> aggr)
-  {
-    Set(MetricAttributes{attributes, attributes_processor}, std::move(aggr));
-  }
-
-  void Set(const MetricAttributes &attributes, std::unique_ptr<Aggregation> aggr)
-  {
-    auto it = hash_map_.find(attributes);
-    if (it != hash_map_.end())
-    {
-      it->second = std::move(aggr);
-    }
-    else if (IsOverflowAttributes())
-    {
-      hash_map_[kOverflowAttributes] = std::move(aggr);
-    }
-    else
-    {
-      hash_map_[attributes] = std::move(aggr);
-    }
-  }
-
-  void Set(MetricAttributes &&attributes, std::unique_ptr<Aggregation> aggr)
-  {
-    auto it = hash_map_.find(attributes);
-    if (it != hash_map_.end())
-    {
-      it->second = std::move(aggr);
-    }
-    else if (IsOverflowAttributes())
-    {
-      hash_map_[kOverflowAttributes] = std::move(aggr);
-    }
-    else
-    {
-      hash_map_[std::move(attributes)] = std::move(aggr);
-    }
-  }
-
-  /**
-   * Iterate the hash to yield key and value stored in hash.
-   */
-  bool GetAllEnteries(
-      nostd::function_ref<bool(const MetricAttributes &, Aggregation &)> callback) const
-  {
-    for (auto &kv : hash_map_)
-    {
-      if (!callback(kv.first, *(kv.second.get())))
-      {
-        return false;  // callback is not prepared to consume data
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Return the size of hash.
-   */
-  size_t Size() { return hash_map_.size(); }
-
-#ifdef UNIT_TESTING
-  size_t BucketCount() { return hash_map_.bucket_count(); }
-  size_t BucketSize(size_t n) { return hash_map_.bucket_size(n); }
-#endif
-
-private:
-  std::unordered_map<MetricAttributes, std::unique_ptr<Aggregation>, CustomHash> hash_map_;
-  size_t attributes_limit_;
-
-  Aggregation *GetOrSetOveflowAttributes(
-      nostd::function_ref<std::unique_ptr<Aggregation>()> aggregation_callback)
-  {
-    auto agg = aggregation_callback();
-    return GetOrSetOveflowAttributes(std::move(agg));
-  }
-
-  Aggregation *GetOrSetOveflowAttributes(std::unique_ptr<Aggregation> agg)
-  {
-    auto it = hash_map_.find(kOverflowAttributes);
-    if (it != hash_map_.end())
-    {
-      return it->second.get();
-    }
-
-    auto result = hash_map_.emplace(kOverflowAttributes, std::move(agg));
-    return result.first->second.get();
-  }
-
-  bool IsOverflowAttributes() const { return (hash_map_.size() + 1 >= attributes_limit_); }
-};
-
-using AttributesHashMap = AttributesHashMapWithCustomHash<>;
-
-}  // namespace metrics
-
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h
deleted file mode 100644
index 6a0562e0e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <algorithm>
-#include <functional>
-#include <initializer_list>
-#include <limits>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/attributemap_hash.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class AttributesProcessor;  // IWYU pragma: keep
-
-class FilteredOrderedAttributeMap : public opentelemetry::sdk::common::OrderedAttributeMap
-{
-public:
-  FilteredOrderedAttributeMap() : OrderedAttributeMap() { UpdateHash(); }
-
-  FilteredOrderedAttributeMap(
-      std::initializer_list<std::pair<nostd::string_view, opentelemetry::common::AttributeValue>>
-          attributes)
-      : OrderedAttributeMap(attributes)
-  {
-    UpdateHash();
-  }
-
-  FilteredOrderedAttributeMap(const opentelemetry::common::KeyValueIterable &attributes)
-      : FilteredOrderedAttributeMap(attributes, nullptr)
-  {
-    // No need to update hash here as it is already updated in the constructor above
-  }
-
-  FilteredOrderedAttributeMap(const opentelemetry::common::KeyValueIterable &attributes,
-                              const opentelemetry::sdk::metrics::AttributesProcessor *processor);
-
-  FilteredOrderedAttributeMap(
-      std::initializer_list<std::pair<nostd::string_view, opentelemetry::common::AttributeValue>>
-          attributes,
-      const opentelemetry::sdk::metrics::AttributesProcessor *processor);
-
-  //
-  // Copy and move constructors, assignment operators
-  //
-  FilteredOrderedAttributeMap(const FilteredOrderedAttributeMap &other)            = default;
-  FilteredOrderedAttributeMap(FilteredOrderedAttributeMap &&other)                 = default;
-  FilteredOrderedAttributeMap &operator=(const FilteredOrderedAttributeMap &other) = default;
-  FilteredOrderedAttributeMap &operator=(FilteredOrderedAttributeMap &&other)      = default;
-
-  //
-  // equality operator
-  //
-  bool operator==(const FilteredOrderedAttributeMap &other) const
-  {
-    return hash_ == other.hash_ && static_cast<const OrderedAttributeMap &>(*this) ==
-                                       static_cast<const OrderedAttributeMap &>(other);
-  }
-
-  size_t GetHash() const { return hash_; }
-
-  void UpdateHash() { hash_ = GetHashForAttributeMap(*this); }
-
-private:
-  size_t hash_ = (std::numeric_limits<size_t>::max)();
-};
-
-class FilteredOrderedAttributeMapHash
-{
-public:
-  size_t operator()(
-      const opentelemetry::sdk::metrics::FilteredOrderedAttributeMap &attributes) const
-  {
-    return attributes.GetHash();
-  }
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/metric_collector.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/metric_collector.h
deleted file mode 100644
index e1df3f61f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/metric_collector.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/metrics/export/metric_filter.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class MetricReader;
-class MeterContext;
-
-class CollectorHandle
-{
-public:
-  CollectorHandle()          = default;
-  virtual ~CollectorHandle() = default;
-
-  virtual AggregationTemporality GetAggregationTemporality(
-      InstrumentType instrument_type) noexcept = 0;
-};
-
-/**
- * An internal opaque interface that the MetricReader receives as
- * MetricProducer. It acts as the storage key to the internal metric stream
- * state for each MetricReader.
- */
-
-class MetricCollector : public MetricProducer, public CollectorHandle
-{
-public:
-  MetricCollector(MeterContext *context,
-                  std::shared_ptr<MetricReader> metric_reader,
-                  std::unique_ptr<MetricFilter> metric_filter = nullptr);
-
-  ~MetricCollector() override = default;
-
-  AggregationTemporality GetAggregationTemporality(
-      InstrumentType instrument_type) noexcept override;
-
-  /**
-   * The callback to be called for each metric exporter. This will only be those
-   * metrics that have been produced since the last time this method was called.
-   *
-   * @return a status of completion of method.
-   */
-  Result Produce() noexcept override;
-
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-private:
-  MeterContext *meter_context_;
-  std::shared_ptr<MetricReader> metric_reader_;
-  std::unique_ptr<MetricFilter> metric_filter_;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/metric_storage.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/metric_storage.h
deleted file mode 100644
index 26adc37c0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/metric_storage.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <unordered_map>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class KeyValueIterable;
-}  // namespace common
-
-namespace sdk
-{
-namespace metrics
-{
-
-/* Represent the storage from which to collect the metrics */
-class CollectorHandle;
-
-class MetricStorage
-{
-public:
-  MetricStorage()          = default;
-  virtual ~MetricStorage() = default;
-
-  /* collect the metrics from this storage */
-  virtual bool Collect(CollectorHandle *collector,
-                       nostd::span<std::shared_ptr<CollectorHandle>> collectors,
-                       opentelemetry::common::SystemTimestamp sdk_start_ts,
-                       opentelemetry::common::SystemTimestamp collection_ts,
-                       nostd::function_ref<bool(MetricData)> callback) noexcept = 0;
-};
-
-/* Represents the sync metric storage */
-class SyncWritableMetricStorage
-{
-public:
-  virtual void RecordLong(int64_t value,
-                          const opentelemetry::context::Context &context) noexcept = 0;
-
-  virtual void RecordLong(int64_t value,
-                          const opentelemetry::common::KeyValueIterable &attributes,
-                          const opentelemetry::context::Context &context) noexcept = 0;
-
-  virtual void RecordDouble(double value,
-                            const opentelemetry::context::Context &context) noexcept = 0;
-
-  virtual void RecordDouble(double value,
-                            const opentelemetry::common::KeyValueIterable &attributes,
-                            const opentelemetry::context::Context &context) noexcept = 0;
-
-  virtual ~SyncWritableMetricStorage() = default;
-};
-
-/* Represents the async metric stroage */
-class AsyncWritableMetricStorage
-{
-public:
-  AsyncWritableMetricStorage()          = default;
-  virtual ~AsyncWritableMetricStorage() = default;
-
-  /* Records a batch of measurements */
-  virtual void RecordLong(
-      const std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> &measurements,
-      opentelemetry::common::SystemTimestamp observation_time) noexcept = 0;
-
-  virtual void RecordDouble(
-      const std::unordered_map<MetricAttributes, double, AttributeHashGenerator> &measurements,
-      opentelemetry::common::SystemTimestamp observation_time) noexcept = 0;
-};
-
-class NoopMetricStorage : public MetricStorage
-{
-public:
-  bool Collect(CollectorHandle * /* collector */,
-               nostd::span<std::shared_ptr<CollectorHandle>> /* collectors */,
-               opentelemetry::common::SystemTimestamp /* sdk_start_ts */,
-               opentelemetry::common::SystemTimestamp /* collection_ts */,
-               nostd::function_ref<bool(MetricData)> callback) noexcept override
-  {
-    MetricData metric_data{};
-    return callback(std::move(metric_data));
-  }
-};
-
-class NoopWritableMetricStorage : public SyncWritableMetricStorage
-{
-public:
-  void RecordLong(int64_t value,
-                  const opentelemetry::context::Context &context) noexcept override = 0;
-
-  void RecordLong(int64_t /* value */,
-                  const opentelemetry::common::KeyValueIterable & /* attributes */,
-                  const opentelemetry::context::Context & /* context */) noexcept override
-  {}
-
-  void RecordDouble(double /* value */,
-                    const opentelemetry::context::Context & /* context */) noexcept override
-  {}
-
-  void RecordDouble(double /* value */,
-                    const opentelemetry::common::KeyValueIterable & /* attributes */,
-                    const opentelemetry::context::Context & /* context */) noexcept override
-  {}
-};
-
-class NoopAsyncWritableMetricStorage : public AsyncWritableMetricStorage
-{
-public:
-  void RecordLong(const std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator>
-                      & /* measurements */,
-                  opentelemetry::common::SystemTimestamp /* observation_time */) noexcept override
-  {}
-
-  void RecordDouble(const std::unordered_map<MetricAttributes, double, AttributeHashGenerator>
-                        & /* measurements */,
-                    opentelemetry::common::SystemTimestamp /* observation_time */) noexcept override
-  {}
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h
deleted file mode 100644
index 2a77b2f85..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class SyncMultiMetricStorage : public SyncWritableMetricStorage
-{
-public:
-  void AddStorage(std::shared_ptr<SyncWritableMetricStorage> storage)
-  {
-    storages_.push_back(storage);
-  }
-
-  virtual void RecordLong(int64_t value,
-                          const opentelemetry::context::Context &context) noexcept override
-  {
-    for (auto &s : storages_)
-    {
-      s->RecordLong(value, context);
-    }
-  }
-
-  virtual void RecordLong(int64_t value,
-                          const opentelemetry::common::KeyValueIterable &attributes,
-                          const opentelemetry::context::Context &context) noexcept override
-  {
-    for (auto &s : storages_)
-    {
-      s->RecordLong(value, attributes, context);
-    }
-  }
-
-  virtual void RecordDouble(double value,
-                            const opentelemetry::context::Context &context) noexcept override
-  {
-    for (auto &s : storages_)
-    {
-      s->RecordDouble(value, context);
-    }
-  }
-
-  virtual void RecordDouble(double value,
-                            const opentelemetry::common::KeyValueIterable &attributes,
-                            const opentelemetry::context::Context &context) noexcept override
-  {
-    for (auto &s : storages_)
-    {
-      s->RecordDouble(value, attributes, context);
-    }
-  }
-
-private:
-  std::vector<std::shared_ptr<SyncWritableMetricStorage>> storages_;
-};
-
-class AsyncMultiMetricStorage : public AsyncWritableMetricStorage
-{
-public:
-  void AddStorage(std::shared_ptr<AsyncWritableMetricStorage> storage)
-  {
-    storages_.push_back(storage);
-  }
-
-  void RecordLong(
-      const std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> &measurements,
-      opentelemetry::common::SystemTimestamp observation_time) noexcept override
-  {
-    for (auto &s : storages_)
-    {
-      s->RecordLong(measurements, observation_time);
-    }
-  }
-
-  void RecordDouble(
-      const std::unordered_map<MetricAttributes, double, AttributeHashGenerator> &measurements,
-      opentelemetry::common::SystemTimestamp observation_time) noexcept override
-  {
-    for (auto &s : storages_)
-    {
-      s->RecordDouble(measurements, observation_time);
-    }
-  }
-
-private:
-  std::vector<std::shared_ptr<AsyncWritableMetricStorage>> storages_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/observable_registry.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/observable_registry.h
deleted file mode 100644
index b584cc055..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/observable_registry.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <mutex>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-struct ObservableCallbackRecord
-{
-  opentelemetry::metrics::ObservableCallbackPtr callback;
-  void *state;
-  opentelemetry::metrics::ObservableInstrument *instrument;
-};
-
-class ObservableRegistry
-{
-public:
-  void AddCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
-                   void *state,
-                   opentelemetry::metrics::ObservableInstrument *instrument);
-
-  void RemoveCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
-                      void *state,
-                      opentelemetry::metrics::ObservableInstrument *instrument);
-
-  void CleanupCallback(opentelemetry::metrics::ObservableInstrument *instrument);
-
-  void Observe(opentelemetry::common::SystemTimestamp collection_ts);
-
-private:
-  std::vector<std::unique_ptr<ObservableCallbackRecord>> callbacks_;
-  std::mutex callbacks_m_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h
deleted file mode 100644
index 0c9dea9c9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <stdint.h>
-#include <functional>
-#include <memory>
-#include <mutex>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attributemap_hash.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/temporal_metric_storage.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/version.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
-{
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-  static inline bool EnableExamplarFilter(ExemplarFilterType filter_type,
-                                          const opentelemetry::context::Context &context)
-  {
-    return filter_type == ExemplarFilterType::kAlwaysOn ||
-           (filter_type == ExemplarFilterType::kTraceBased &&
-            opentelemetry::trace::GetSpan(context)->GetContext().IsValid() &&
-            opentelemetry::trace::GetSpan(context)->GetContext().IsSampled());
-  }
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-public:
-  SyncMetricStorage(InstrumentDescriptor instrument_descriptor,
-                    const AggregationType aggregation_type,
-                    const AttributesProcessor *attributes_processor,
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-                    ExemplarFilterType exempler_filter_type,
-                    nostd::shared_ptr<ExemplarReservoir> &&exemplar_reservoir,
-#endif
-                    const AggregationConfig *aggregation_config,
-                    size_t attributes_limit = kAggregationCardinalityLimit)
-      : instrument_descriptor_(instrument_descriptor),
-        attributes_hashmap_(new AttributesHashMap(attributes_limit)),
-        attributes_processor_(attributes_processor),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-        exemplar_filter_type_(exempler_filter_type),
-        exemplar_reservoir_(exemplar_reservoir),
-#endif
-        temporal_metric_storage_(instrument_descriptor, aggregation_type, aggregation_config)
-  {
-    create_default_aggregation_ = [&, aggregation_type,
-                                   aggregation_config]() -> std::unique_ptr<Aggregation> {
-      return DefaultAggregation::CreateAggregation(aggregation_type, instrument_descriptor_,
-                                                   aggregation_config);
-    };
-  }
-
-  void RecordLong(int64_t value,
-                  const opentelemetry::context::Context &context
-                  OPENTELEMETRY_MAYBE_UNUSED) noexcept override
-  {
-    if (instrument_descriptor_.value_type_ != InstrumentValueType::kLong)
-    {
-      return;
-    }
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-    if (EnableExamplarFilter(exemplar_filter_type_, context))
-    {
-      exemplar_reservoir_->OfferMeasurement(value, {}, context, std::chrono::system_clock::now());
-    }
-#endif
-    static MetricAttributes attr = MetricAttributes{};
-    std::lock_guard<opentelemetry::common::SpinLockMutex> guard(attribute_hashmap_lock_);
-    attributes_hashmap_->GetOrSetDefault(attr, create_default_aggregation_)->Aggregate(value);
-  }
-
-  void RecordLong(int64_t value,
-                  const opentelemetry::common::KeyValueIterable &attributes,
-                  const opentelemetry::context::Context &context
-                  OPENTELEMETRY_MAYBE_UNUSED) noexcept override
-  {
-    if (instrument_descriptor_.value_type_ != InstrumentValueType::kLong)
-    {
-      return;
-    }
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-    if (EnableExamplarFilter(exemplar_filter_type_, context))
-    {
-      exemplar_reservoir_->OfferMeasurement(value, attributes, context,
-                                            std::chrono::system_clock::now());
-    }
-#endif
-
-    std::lock_guard<opentelemetry::common::SpinLockMutex> guard(attribute_hashmap_lock_);
-    attributes_hashmap_
-        ->GetOrSetDefault(attributes, attributes_processor_, create_default_aggregation_)
-        ->Aggregate(value);
-  }
-
-  void RecordDouble(double value,
-                    const opentelemetry::context::Context &context
-                    OPENTELEMETRY_MAYBE_UNUSED) noexcept override
-  {
-    if (instrument_descriptor_.value_type_ != InstrumentValueType::kDouble)
-    {
-      return;
-    }
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-    if (EnableExamplarFilter(exemplar_filter_type_, context))
-    {
-      exemplar_reservoir_->OfferMeasurement(value, {}, context, std::chrono::system_clock::now());
-    }
-#endif
-    static MetricAttributes attr = MetricAttributes{};
-    std::lock_guard<opentelemetry::common::SpinLockMutex> guard(attribute_hashmap_lock_);
-    attributes_hashmap_->GetOrSetDefault(attr, create_default_aggregation_)->Aggregate(value);
-  }
-
-  void RecordDouble(double value,
-                    const opentelemetry::common::KeyValueIterable &attributes,
-                    const opentelemetry::context::Context &context
-                    OPENTELEMETRY_MAYBE_UNUSED) noexcept override
-  {
-    if (instrument_descriptor_.value_type_ != InstrumentValueType::kDouble)
-    {
-      return;
-    }
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-    if (EnableExamplarFilter(exemplar_filter_type_, context))
-    {
-      exemplar_reservoir_->OfferMeasurement(value, attributes, context,
-                                            std::chrono::system_clock::now());
-    }
-#endif
-    std::lock_guard<opentelemetry::common::SpinLockMutex> guard(attribute_hashmap_lock_);
-    attributes_hashmap_
-        ->GetOrSetDefault(attributes, attributes_processor_, create_default_aggregation_)
-        ->Aggregate(value);
-  }
-
-  bool Collect(CollectorHandle *collector,
-               nostd::span<std::shared_ptr<CollectorHandle>> collectors,
-               opentelemetry::common::SystemTimestamp sdk_start_ts,
-               opentelemetry::common::SystemTimestamp collection_ts,
-               nostd::function_ref<bool(MetricData)> callback) noexcept override;
-
-private:
-  InstrumentDescriptor instrument_descriptor_;
-  // hashmap to maintain the metrics for delta collection (i.e, collection since last Collect call)
-  std::unique_ptr<AttributesHashMap> attributes_hashmap_;
-  std::function<std::unique_ptr<Aggregation>()> create_default_aggregation_;
-  const AttributesProcessor *attributes_processor_;
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-  ExemplarFilterType exemplar_filter_type_;
-  nostd::shared_ptr<ExemplarReservoir> exemplar_reservoir_;
-#endif
-  TemporalMetricStorage temporal_metric_storage_;
-  opentelemetry::common::SpinLockMutex attribute_hashmap_lock_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/temporal_metric_storage.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/temporal_metric_storage.h
deleted file mode 100644
index 007b3c74c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/state/temporal_metric_storage.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <list>
-#include <memory>
-#include <unordered_map>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-struct LastReportedMetrics
-{
-  std::unique_ptr<AttributesHashMap> attributes_map;
-  opentelemetry::common::SystemTimestamp collection_ts;
-};
-
-class TemporalMetricStorage
-{
-public:
-  TemporalMetricStorage(InstrumentDescriptor instrument_descriptor,
-                        AggregationType aggregation_type,
-                        const AggregationConfig *aggregation_config);
-
-  bool buildMetrics(CollectorHandle *collector,
-                    nostd::span<std::shared_ptr<CollectorHandle>> collectors,
-                    opentelemetry::common::SystemTimestamp sdk_start_ts,
-                    opentelemetry::common::SystemTimestamp collection_ts,
-                    const std::shared_ptr<AttributesHashMap> &delta_metrics,
-                    nostd::function_ref<bool(MetricData)> callback) noexcept;
-
-private:
-  InstrumentDescriptor instrument_descriptor_;
-  AggregationType aggregation_type_;
-
-  // unreported metrics stash for all the collectors
-  std::unordered_map<CollectorHandle *, std::list<std::shared_ptr<AttributesHashMap>>>
-      unreported_metrics_;
-  // last reported metrics stash for all the collectors.
-  std::unordered_map<CollectorHandle *, LastReportedMetrics> last_reported_metrics_;
-
-  // Lock while building metrics
-  mutable opentelemetry::common::SpinLockMutex lock_;
-  const AggregationConfig *aggregation_config_;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h
deleted file mode 100644
index ff5eaeb28..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/sync_instruments.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class Synchronous
-{
-public:
-  Synchronous(InstrumentDescriptor instrument_descriptor,
-              std::unique_ptr<SyncWritableMetricStorage> storage)
-      : instrument_descriptor_(instrument_descriptor), storage_(std::move(storage))
-  {}
-
-protected:
-  InstrumentDescriptor instrument_descriptor_;
-  std::unique_ptr<SyncWritableMetricStorage> storage_;
-};
-
-class LongCounter : public Synchronous, public opentelemetry::metrics::Counter<uint64_t>
-{
-public:
-  LongCounter(const InstrumentDescriptor &instrument_descriptor,
-              std::unique_ptr<SyncWritableMetricStorage> storage);
-
-  void Add(uint64_t value,
-           const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-  void Add(uint64_t value,
-           const opentelemetry::common::KeyValueIterable &attributes,
-           const opentelemetry::context::Context &context) noexcept override;
-
-  void Add(uint64_t value) noexcept override;
-
-  void Add(uint64_t value, const opentelemetry::context::Context &context) noexcept override;
-};
-
-class DoubleCounter : public Synchronous, public opentelemetry::metrics::Counter<double>
-{
-
-public:
-  DoubleCounter(const InstrumentDescriptor &instrument_descriptor,
-                std::unique_ptr<SyncWritableMetricStorage> storage);
-
-  void Add(double value,
-           const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-  void Add(double value,
-           const opentelemetry::common::KeyValueIterable &attributes,
-           const opentelemetry::context::Context &context) noexcept override;
-
-  void Add(double value) noexcept override;
-  void Add(double value, const opentelemetry::context::Context &context) noexcept override;
-};
-
-class LongUpDownCounter : public Synchronous, public opentelemetry::metrics::UpDownCounter<int64_t>
-{
-public:
-  LongUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
-                    std::unique_ptr<SyncWritableMetricStorage> storage);
-
-  void Add(int64_t value,
-           const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-  void Add(int64_t value,
-           const opentelemetry::common::KeyValueIterable &attributes,
-           const opentelemetry::context::Context &context) noexcept override;
-
-  void Add(int64_t value) noexcept override;
-  void Add(int64_t value, const opentelemetry::context::Context &context) noexcept override;
-};
-
-class DoubleUpDownCounter : public Synchronous, public opentelemetry::metrics::UpDownCounter<double>
-{
-public:
-  DoubleUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
-                      std::unique_ptr<SyncWritableMetricStorage> storage);
-
-  void Add(double value,
-           const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-  void Add(double value,
-           const opentelemetry::common::KeyValueIterable &attributes,
-           const opentelemetry::context::Context &context) noexcept override;
-
-  void Add(double value) noexcept override;
-  void Add(double value, const opentelemetry::context::Context &context) noexcept override;
-};
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-class LongGauge : public Synchronous, public opentelemetry::metrics::Gauge<int64_t>
-{
-public:
-  LongGauge(const InstrumentDescriptor &instrument_descriptor,
-            std::unique_ptr<SyncWritableMetricStorage> storage);
-
-  void Record(int64_t value,
-              const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-  void Record(int64_t value,
-              const opentelemetry::common::KeyValueIterable &attributes,
-              const opentelemetry::context::Context &context) noexcept override;
-
-  void Record(int64_t value) noexcept override;
-  void Record(int64_t value, const opentelemetry::context::Context &context) noexcept override;
-};
-
-class DoubleGauge : public Synchronous, public opentelemetry::metrics::Gauge<double>
-{
-public:
-  DoubleGauge(const InstrumentDescriptor &instrument_descriptor,
-              std::unique_ptr<SyncWritableMetricStorage> storage);
-
-  void Record(double value,
-              const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-  void Record(double value,
-              const opentelemetry::common::KeyValueIterable &attributes,
-              const opentelemetry::context::Context &context) noexcept override;
-
-  void Record(double value) noexcept override;
-  void Record(double value, const opentelemetry::context::Context &context) noexcept override;
-};
-#endif
-
-class LongHistogram : public Synchronous, public opentelemetry::metrics::Histogram<uint64_t>
-{
-public:
-  LongHistogram(const InstrumentDescriptor &instrument_descriptor,
-                std::unique_ptr<SyncWritableMetricStorage> storage);
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void Record(uint64_t value,
-              const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-  void Record(uint64_t value) noexcept override;
-#endif
-
-  void Record(uint64_t value,
-              const opentelemetry::common::KeyValueIterable &attributes,
-              const opentelemetry::context::Context &context) noexcept override;
-
-  void Record(uint64_t value, const opentelemetry::context::Context &context) noexcept override;
-};
-
-class DoubleHistogram : public Synchronous, public opentelemetry::metrics::Histogram<double>
-{
-public:
-  DoubleHistogram(const InstrumentDescriptor &instrument_descriptor,
-                  std::unique_ptr<SyncWritableMetricStorage> storage);
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void Record(double value,
-              const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-  void Record(double value) noexcept override;
-#endif
-
-  void Record(double value,
-              const opentelemetry::common::KeyValueIterable &attributes,
-              const opentelemetry::context::Context &context) noexcept override;
-
-  void Record(double value, const opentelemetry::context::Context &context) noexcept override;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/attributes_processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/attributes_processor.h
deleted file mode 100644
index 7ab8cafb1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/attributes_processor.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-using MetricAttributes = opentelemetry::sdk::metrics::FilteredOrderedAttributeMap;
-
-/**
- * The AttributesProcessor is responsible for customizing which
- * attribute(s) are to be reported as metrics dimension(s).
- */
-
-class AttributesProcessor
-{
-public:
-  // Process the metric instrument attributes.
-  // @returns integer with individual bits set if they are to be filtered.
-
-  virtual MetricAttributes process(
-      const opentelemetry::common::KeyValueIterable &attributes) const noexcept = 0;
-
-  virtual bool isPresent(nostd::string_view key) const noexcept = 0;
-
-  virtual ~AttributesProcessor() = default;
-};
-
-/**
- * DefaultAttributesProcessor returns copy of input instrument attributes without
- * any modification.
- */
-
-class DefaultAttributesProcessor : public AttributesProcessor
-{
-public:
-  MetricAttributes process(
-      const opentelemetry::common::KeyValueIterable &attributes) const noexcept override
-  {
-    MetricAttributes result(attributes);
-    return result;
-  }
-
-  bool isPresent(nostd::string_view /*key*/) const noexcept override { return true; }
-};
-
-/**
- * FilteringAttributesProcessor  filters by allowed attribute names and drops any names
- * that are not in the allow list.
- */
-
-class FilteringAttributesProcessor : public AttributesProcessor
-{
-public:
-  FilteringAttributesProcessor(std::unordered_map<std::string, bool> &&allowed_attribute_keys = {})
-      : allowed_attribute_keys_(std::move(allowed_attribute_keys))
-  {}
-
-  FilteringAttributesProcessor(
-      const std::unordered_map<std::string, bool> &allowed_attribute_keys = {})
-      : allowed_attribute_keys_(allowed_attribute_keys)
-  {}
-
-  MetricAttributes process(
-      const opentelemetry::common::KeyValueIterable &attributes) const noexcept override
-  {
-    MetricAttributes result;
-    attributes.ForEachKeyValue(
-        [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
-          if (allowed_attribute_keys_.find(key.data()) != allowed_attribute_keys_.end())
-          {
-            result.SetAttribute(key, value);
-            return true;
-          }
-          return true;
-        });
-
-    result.UpdateHash();
-    return result;
-  }
-
-  bool isPresent(nostd::string_view key) const noexcept override
-  {
-    return (allowed_attribute_keys_.find(key.data()) != allowed_attribute_keys_.end());
-  }
-
-private:
-  std::unordered_map<std::string, bool> allowed_attribute_keys_;
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/instrument_selector.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/instrument_selector.h
deleted file mode 100644
index 690a9168d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/instrument_selector.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/view/predicate_factory.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class InstrumentSelector
-{
-public:
-  InstrumentSelector(opentelemetry::sdk::metrics::InstrumentType instrument_type,
-                     const std::string &name,
-                     const std::string &units)
-      : name_filter_{PredicateFactory::GetPredicate(name, PredicateType::kPattern)},
-        unit_filter_{PredicateFactory::GetPredicate(units, PredicateType::kExact)},
-        instrument_type_{instrument_type}
-  {}
-
-  // Returns name filter predicate. This shouldn't be deleted
-  const opentelemetry::sdk::metrics::Predicate *GetNameFilter() const { return name_filter_.get(); }
-  // Returns unit filter predicate. This shouldn't be deleted
-  const opentelemetry::sdk::metrics::Predicate *GetUnitFilter() const { return unit_filter_.get(); }
-  // Returns instrument filter.
-  InstrumentType GetInstrumentType() { return instrument_type_; }
-
-private:
-  std::unique_ptr<opentelemetry::sdk::metrics::Predicate> name_filter_;
-  std::unique_ptr<opentelemetry::sdk::metrics::Predicate> unit_filter_;
-  opentelemetry::sdk::metrics::InstrumentType instrument_type_;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/instrument_selector_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/instrument_selector_factory.h
deleted file mode 100644
index a2db241e9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/instrument_selector_factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class OPENTELEMETRY_EXPORT InstrumentSelectorFactory
-{
-public:
-  static std::unique_ptr<InstrumentSelector> Create(
-      opentelemetry::sdk::metrics::InstrumentType instrument_type,
-      const std::string &name,
-      const std::string &unit);
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/meter_selector.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/meter_selector.h
deleted file mode 100644
index 65dba7d7b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/meter_selector.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/view/predicate_factory.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class MeterSelector
-{
-public:
-  MeterSelector(const std::string &name, const std::string &version, const std::string &schema)
-      : name_filter_{PredicateFactory::GetPredicate(name, PredicateType::kExact)},
-        version_filter_{PredicateFactory::GetPredicate(version, PredicateType::kExact)},
-        schema_filter_{PredicateFactory::GetPredicate(schema, PredicateType::kExact)}
-  {}
-
-  // Returns name filter predicate. This shouldn't be deleted
-  const opentelemetry::sdk::metrics::Predicate *GetNameFilter() const { return name_filter_.get(); }
-
-  // Returns version filter predicate. This shouldn't be deleted
-  const opentelemetry::sdk::metrics::Predicate *GetVersionFilter() const
-  {
-    return version_filter_.get();
-  }
-
-  // Returns schema filter predicate. This shouldn't be deleted
-  const opentelemetry::sdk::metrics::Predicate *GetSchemaFilter() const
-  {
-    return schema_filter_.get();
-  }
-
-private:
-  std::unique_ptr<opentelemetry::sdk::metrics::Predicate> name_filter_;
-  std::unique_ptr<opentelemetry::sdk::metrics::Predicate> version_filter_;
-  std::unique_ptr<opentelemetry::sdk::metrics::Predicate> schema_filter_;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/meter_selector_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/meter_selector_factory.h
deleted file mode 100644
index 19cee4162..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/meter_selector_factory.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-class OPENTELEMETRY_EXPORT MeterSelectorFactory
-{
-public:
-  static std::unique_ptr<MeterSelector> Create(const std::string &name,
-                                               const std::string &version,
-                                               const std::string &schema);
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/predicate.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/predicate.h
deleted file mode 100644
index cfa1b16eb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/predicate.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <vector>
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-#  include <regex>
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class Predicate
-{
-public:
-  virtual ~Predicate()                                                        = default;
-  virtual bool Match(opentelemetry::nostd::string_view string) const noexcept = 0;
-};
-
-class PatternPredicate : public Predicate
-{
-public:
-  PatternPredicate(opentelemetry::nostd::string_view pattern) : reg_key_{pattern.data()} {}
-  bool Match(opentelemetry::nostd::string_view str) const noexcept override
-  {
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-    return std::regex_match(str.data(), reg_key_);
-#else
-    // TBD - Support regex match for GCC4.8
-    OTEL_INTERNAL_LOG_ERROR(
-        "PatternPredicate::Match - failed. std::regex not fully supported for this compiler.");
-    return false;  // not supported
-#endif
-  }
-
-private:
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  std::regex reg_key_;
-#else
-  std::string reg_key_;
-#endif
-};
-
-class ExactPredicate : public Predicate
-{
-public:
-  ExactPredicate(opentelemetry::nostd::string_view pattern) : pattern_{pattern} {}
-  bool Match(opentelemetry::nostd::string_view str) const noexcept override
-  {
-    if (pattern_ == str)
-    {
-      return true;
-    }
-    return false;
-  }
-
-private:
-  std::string pattern_;
-};
-
-class MatchEverythingPattern : public Predicate
-{
-  bool Match(opentelemetry::nostd::string_view /* str */) const noexcept override { return true; }
-};
-
-class MatchNothingPattern : public Predicate
-{
-  bool Match(opentelemetry::nostd::string_view /* str */) const noexcept override { return false; }
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/predicate_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/predicate_factory.h
deleted file mode 100644
index ba2303ff9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/predicate_factory.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/metrics/view/predicate.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-enum class PredicateType : uint8_t
-{
-  kPattern,
-  kExact
-};
-
-class PredicateFactory
-{
-public:
-  static std::unique_ptr<Predicate> GetPredicate(opentelemetry::nostd::string_view pattern,
-                                                 PredicateType type)
-  {
-    if ((type == PredicateType::kPattern && pattern == "*") ||
-        (type == PredicateType::kExact && pattern == ""))
-    {
-      return std::unique_ptr<Predicate>(new MatchEverythingPattern());
-    }
-    if (type == PredicateType::kPattern)
-    {
-      return std::unique_ptr<Predicate>(new PatternPredicate(pattern));
-    }
-    if (type == PredicateType::kExact)
-    {
-      return std::unique_ptr<Predicate>(new ExactPredicate(pattern));
-    }
-    return std::unique_ptr<Predicate>(new MatchNothingPattern());
-  }
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view.h
deleted file mode 100644
index dc0888f47..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-/**
- * View defines the interface to allow SDK user to
- * customize the metrics before exported.
- */
-
-class View
-{
-public:
-  View(const std::string &name,
-       const std::string &description                        = "",
-       const std::string &unit                               = "",
-       AggregationType aggregation_type                      = AggregationType::kDefault,
-       std::shared_ptr<AggregationConfig> aggregation_config = nullptr,
-       std::unique_ptr<opentelemetry::sdk::metrics::AttributesProcessor> attributes_processor =
-           std::unique_ptr<opentelemetry::sdk::metrics::AttributesProcessor>(
-               new opentelemetry::sdk::metrics::DefaultAttributesProcessor()))
-      : name_(name),
-        description_(description),
-        unit_(unit),
-        aggregation_type_{aggregation_type},
-        aggregation_config_{aggregation_config},
-        attributes_processor_{std::move(attributes_processor)}
-  {}
-
-  virtual ~View() = default;
-
-  virtual std::string GetName() const noexcept { return name_; }
-
-  virtual std::string GetDescription() const noexcept { return description_; }
-
-  virtual AggregationType GetAggregationType() const noexcept { return aggregation_type_; }
-
-  virtual AggregationConfig *GetAggregationConfig() const noexcept
-  {
-    return aggregation_config_.get();
-  }
-
-  virtual const opentelemetry::sdk::metrics::AttributesProcessor &GetAttributesProcessor()
-      const noexcept
-  {
-    return *attributes_processor_.get();
-  }
-
-private:
-  std::string name_;
-  std::string description_;
-  std::string unit_;
-  AggregationType aggregation_type_;
-  std::shared_ptr<AggregationConfig> aggregation_config_;
-  std::unique_ptr<opentelemetry::sdk::metrics::AttributesProcessor> attributes_processor_;
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_factory.h
deleted file mode 100644
index 2fa1733f9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_factory.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-/**
- * Factory class for View.
- */
-class OPENTELEMETRY_EXPORT ViewFactory
-{
-public:
-  static std::unique_ptr<View> Create(const std::string &name);
-
-  static std::unique_ptr<View> Create(const std::string &name, const std::string &description);
-
-  static std::unique_ptr<View> Create(const std::string &name,
-                                      const std::string &description,
-                                      const std::string &unit);
-
-  static std::unique_ptr<View> Create(const std::string &name,
-                                      const std::string &description,
-                                      const std::string &unit,
-                                      AggregationType aggregation_type);
-
-  static std::unique_ptr<View> Create(const std::string &name,
-                                      const std::string &description,
-                                      const std::string &unit,
-                                      AggregationType aggregation_type,
-                                      std::shared_ptr<AggregationConfig> aggregation_config);
-
-  static std::unique_ptr<View> Create(const std::string &name,
-                                      const std::string &description,
-                                      const std::string &unit,
-                                      AggregationType aggregation_type,
-                                      std::shared_ptr<AggregationConfig> aggregation_config,
-                                      std::unique_ptr<AttributesProcessor> attributes_processor);
-};
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h
deleted file mode 100644
index fd1e4bee0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_registry.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/predicate.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-struct RegisteredView
-{
-  RegisteredView(
-      std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector,
-      std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector,
-      std::unique_ptr<opentelemetry::sdk::metrics::View> view)
-      : instrument_selector_{std::move(instrument_selector)},
-        meter_selector_{std::move(meter_selector)},
-        view_{std::move(view)}
-  {}
-  std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector_;
-  std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector_;
-  std::unique_ptr<opentelemetry::sdk::metrics::View> view_;
-};
-
-class ViewRegistry
-{
-public:
-  void AddView(std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector,
-               std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector,
-               std::unique_ptr<opentelemetry::sdk::metrics::View> view)
-  {
-    // TBD - thread-safe ?
-
-    auto registered_view = std::unique_ptr<RegisteredView>(new RegisteredView{
-        std::move(instrument_selector), std::move(meter_selector), std::move(view)});
-    registered_views_.push_back(std::move(registered_view));
-  }
-
-  bool FindViews(
-      const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor,
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope,
-      nostd::function_ref<bool(const View &)> callback) const
-  {
-    bool found = false;
-    for (auto const &registered_view : registered_views_)
-    {
-      if (MatchMeter(registered_view->meter_selector_.get(), instrumentation_scope) &&
-          MatchInstrument(registered_view->instrument_selector_.get(), instrument_descriptor))
-      {
-        found = true;
-        if (!callback(*(registered_view->view_.get())))
-        {
-          return false;
-        }
-      }
-    }
-    // return default view if none found;
-    if (!found)
-    {
-      static const View view("");
-      if (!callback(view))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  ViewRegistry()  = default;
-  ~ViewRegistry() = default;
-
-private:
-  std::vector<std::unique_ptr<RegisteredView>> registered_views_;
-  static bool MatchMeter(
-      opentelemetry::sdk::metrics::MeterSelector *selector,
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope)
-  {
-    return selector->GetNameFilter()->Match(instrumentation_scope.GetName()) &&
-           (instrumentation_scope.GetVersion().size() == 0 ||
-            selector->GetVersionFilter()->Match(instrumentation_scope.GetVersion())) &&
-           (instrumentation_scope.GetSchemaURL().size() == 0 ||
-            selector->GetSchemaFilter()->Match(instrumentation_scope.GetSchemaURL()));
-  }
-
-  static bool MatchInstrument(
-      opentelemetry::sdk::metrics::InstrumentSelector *selector,
-      const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor)
-  {
-    return selector->GetNameFilter()->Match(instrument_descriptor.name_) &&
-           selector->GetUnitFilter()->Match(instrument_descriptor.unit_) &&
-           (selector->GetInstrumentType() == instrument_descriptor.type_);
-  }
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_registry_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_registry_factory.h
deleted file mode 100644
index 3592e9551..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/metrics/view/view_registry_factory.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class ViewRegistryFactory
-{
-public:
-  static std::unique_ptr<ViewRegistry> Create();
-};
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/resource.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/resource.h
deleted file mode 100644
index 5260b7c3f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/resource.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace resource
-{
-
-using ResourceAttributes = opentelemetry::sdk::common::AttributeMap;
-
-class Resource
-{
-public:
-  Resource(const Resource &) = default;
-
-  const ResourceAttributes &GetAttributes() const noexcept;
-  const std::string &GetSchemaURL() const noexcept;
-
-  /**
-   * Returns a new, merged {@link Resource} by merging the current Resource
-   * with the other Resource. In case of a collision, the other Resource takes
-   * precedence.
-   *
-   * The specification notes that if schema urls collide, the resulting
-   * schema url is implementation-defined. In the C++ implementation, the
-   * schema url of @param other is picked.
-   *
-   * @param other the Resource that will be merged with this.
-   * @returns the newly merged Resource.
-   */
-
-  Resource Merge(const Resource &other) const noexcept;
-
-  /**
-   * Returns a newly created Resource with the specified attributes.
-   * It adds (merge) SDK attributes and OTEL attributes before returning.
-   * @param attributes for this resource
-   * @returns the newly created Resource.
-   */
-
-  static Resource Create(const ResourceAttributes &attributes,
-                         const std::string &schema_url = std::string{});
-
-  /**
-   * Returns an Empty resource.
-   */
-
-  static Resource &GetEmpty();
-
-  /**
-   * Returns a Resource that indentifies the SDK in use.
-   */
-
-  static Resource &GetDefault();
-
-protected:
-  /**
-   * The constructor is protected and only for use internally by the class and
-   * inside ResourceDetector class.
-   * Users should use the Create factory method to obtain a Resource
-   * instance.
-   */
-  Resource(const ResourceAttributes &attributes = ResourceAttributes(),
-           const std::string &schema_url        = std::string{}) noexcept;
-
-private:
-  ResourceAttributes attributes_;
-  std::string schema_url_;
-
-  friend class ResourceDetector;
-};
-
-}  // namespace resource
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/resource_detector.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/resource_detector.h
deleted file mode 100644
index f129d3d1b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/resource_detector.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <string>
-
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace resource
-{
-
-/**
- * Interface for a Resource Detector
- */
-class ResourceDetector
-{
-public:
-  ResourceDetector()          = default;
-  virtual ~ResourceDetector() = default;
-  virtual Resource Detect()   = 0;
-
-protected:
-  static Resource Create(const ResourceAttributes &attributes,
-                         const std::string &schema_url = std::string{});
-};
-
-/**
- * OTelResourceDetector to detect the presence of and create a Resource
- * from the OTEL_RESOURCE_ATTRIBUTES environment variable.
- */
-class OTELResourceDetector : public ResourceDetector
-{
-public:
-  Resource Detect() noexcept override;
-};
-
-}  // namespace resource
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
deleted file mode 100644
index 096c9ae21..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
+++ /dev/null
@@ -1,5114 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This file is DEPRECATED, and no longer updated.
- * See file DEPRECATED.md for details.
- */
-
-#ifdef OPENTELEMETRY_NO_DEPRECATED_CODE
-#  error "header <resource/semantic_conventions.h> is deprecated."
-#endif
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace resource
-{
-
-namespace SemanticConventions
-{
-/**
- * The URL of the OpenTelemetry schema for these keys and values.
- */
-static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.27.0";
-
-/**
- * Uniquely identifies the framework API revision offered by a version ({@code os.version}) of the
- * android operating system. More information can be found <a
- * href="https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels">here</a>.
- */
-static constexpr const char *kAndroidOsApiLevel = "android.os.api_level";
-
-/**
- * The provenance filename of the built attestation which directly relates to the build artifact
- * filename. This filename SHOULD accompany the artifact at publish time. See the <a
- * href="https://slsa.dev/spec/v1.0/distributing-provenance#relationship-between-artifacts-and-attestations">SLSA
- * Relationship</a> specification for more information.
- */
-static constexpr const char *kArtifactAttestationFilename = "artifact.attestation.filename";
-
-/**
- * The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
- * glossary)</a>, of the built attestation. Some envelopes in the software attestation space also
- * refer to this as the <a
- * href="https://github.com/in-toto/attestation/blob/main/spec/README.md#in-toto-attestation-framework-spec">digest</a>.
- */
-static constexpr const char *kArtifactAttestationHash = "artifact.attestation.hash";
-
-/**
- * The id of the build <a href="https://slsa.dev/attestation-model">software attestation</a>.
- */
-static constexpr const char *kArtifactAttestationId = "artifact.attestation.id";
-
-/**
- * The human readable file name of the artifact, typically generated during build and release
-processes. Often includes the package name and version in the file name.
- *
- * <p>Notes:
-  <ul> <li>This file name can also act as the <a
-href="https://slsa.dev/spec/v1.0/terminology#package-model">Package Name</a> in cases where the
-package ecosystem maps accordingly. Additionally, the artifact <a
-href="https://slsa.dev/spec/v1.0/terminology#software-supply-chain">can be published</a> for others,
-but that is not a guarantee.</li> </ul>
- */
-static constexpr const char *kArtifactFilename = "artifact.filename";
-
-/**
- * The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
-glossary)</a>, often found in checksum.txt on a release of the artifact and used to verify package
-integrity.
- *
- * <p>Notes:
-  <ul> <li>The specific algorithm used to create the cryptographic hash value is
-not defined. In situations where an artifact has multiple
-cryptographic hashes, it is up to the implementer to choose which
-hash value to set here; this should be the most secure hash algorithm
-that is suitable for the situation and consistent with the
-corresponding attestation. The implementer can then provide the other
-hash values through an additional set of attribute extensions as they
-deem necessary.</li> </ul>
- */
-static constexpr const char *kArtifactHash = "artifact.hash";
-
-/**
- * The <a href="https://github.com/package-url/purl-spec">Package URL</a> of the <a
- * href="https://slsa.dev/spec/v1.0/terminology#package-model">package artifact</a> provides a
- * standard way to identify and locate the packaged artifact.
- */
-static constexpr const char *kArtifactPurl = "artifact.purl";
-
-/**
- * The version of the artifact.
- */
-static constexpr const char *kArtifactVersion = "artifact.version";
-
-/**
- * Rate-limiting result, shows whether the lease was acquired or contains a rejection reason
- */
-static constexpr const char *kAspnetcoreRateLimitingResult = "aspnetcore.rate_limiting.result";
-
-/**
- * Full type name of the <a
- * href="https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.diagnostics.iexceptionhandler">{@code
- * IExceptionHandler}</a> implementation that handled the exception.
- */
-static constexpr const char *kAspnetcoreDiagnosticsHandlerType =
-    "aspnetcore.diagnostics.handler.type";
-
-/**
- * ASP.NET Core exception middleware handling result
- */
-static constexpr const char *kAspnetcoreDiagnosticsExceptionResult =
-    "aspnetcore.diagnostics.exception.result";
-
-/**
- * Rate limiting policy name.
- */
-static constexpr const char *kAspnetcoreRateLimitingPolicy = "aspnetcore.rate_limiting.policy";
-
-/**
- * Flag indicating if request was handled by the application pipeline.
- */
-static constexpr const char *kAspnetcoreRequestIsUnhandled = "aspnetcore.request.is_unhandled";
-
-/**
- * A value that indicates whether the matched route is a fallback route.
- */
-static constexpr const char *kAspnetcoreRoutingIsFallback = "aspnetcore.routing.is_fallback";
-
-/**
- * Match result - success or failure
- */
-static constexpr const char *kAspnetcoreRoutingMatchStatus = "aspnetcore.routing.match_status";
-
-/**
- * The AWS request ID as returned in the response headers {@code x-amz-request-id} or {@code
- * x-amz-requestid}.
- */
-static constexpr const char *kAwsRequestId = "aws.request_id";
-
-/**
- * The JSON-serialized value of each item in the {@code AttributeDefinitions} request field.
- */
-static constexpr const char *kAwsDynamodbAttributeDefinitions =
-    "aws.dynamodb.attribute_definitions";
-
-/**
- * The value of the {@code AttributesToGet} request parameter.
- */
-static constexpr const char *kAwsDynamodbAttributesToGet = "aws.dynamodb.attributes_to_get";
-
-/**
- * The value of the {@code ConsistentRead} request parameter.
- */
-static constexpr const char *kAwsDynamodbConsistentRead = "aws.dynamodb.consistent_read";
-
-/**
- * The JSON-serialized value of each item in the {@code ConsumedCapacity} response field.
- */
-static constexpr const char *kAwsDynamodbConsumedCapacity = "aws.dynamodb.consumed_capacity";
-
-/**
- * The value of the {@code Count} response parameter.
- */
-static constexpr const char *kAwsDynamodbCount = "aws.dynamodb.count";
-
-/**
- * The value of the {@code ExclusiveStartTableName} request parameter.
- */
-static constexpr const char *kAwsDynamodbExclusiveStartTable = "aws.dynamodb.exclusive_start_table";
-
-/**
- * The JSON-serialized value of each item in the {@code GlobalSecondaryIndexUpdates} request field.
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexUpdates =
-    "aws.dynamodb.global_secondary_index_updates";
-
-/**
- * The JSON-serialized value of each item of the {@code GlobalSecondaryIndexes} request field
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexes =
-    "aws.dynamodb.global_secondary_indexes";
-
-/**
- * The value of the {@code IndexName} request parameter.
- */
-static constexpr const char *kAwsDynamodbIndexName = "aws.dynamodb.index_name";
-
-/**
- * The JSON-serialized value of the {@code ItemCollectionMetrics} response field.
- */
-static constexpr const char *kAwsDynamodbItemCollectionMetrics =
-    "aws.dynamodb.item_collection_metrics";
-
-/**
- * The value of the {@code Limit} request parameter.
- */
-static constexpr const char *kAwsDynamodbLimit = "aws.dynamodb.limit";
-
-/**
- * The JSON-serialized value of each item of the {@code LocalSecondaryIndexes} request field.
- */
-static constexpr const char *kAwsDynamodbLocalSecondaryIndexes =
-    "aws.dynamodb.local_secondary_indexes";
-
-/**
- * The value of the {@code ProjectionExpression} request parameter.
- */
-static constexpr const char *kAwsDynamodbProjection = "aws.dynamodb.projection";
-
-/**
- * The value of the {@code ProvisionedThroughput.ReadCapacityUnits} request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedReadCapacity =
-    "aws.dynamodb.provisioned_read_capacity";
-
-/**
- * The value of the {@code ProvisionedThroughput.WriteCapacityUnits} request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedWriteCapacity =
-    "aws.dynamodb.provisioned_write_capacity";
-
-/**
- * The value of the {@code ScanIndexForward} request parameter.
- */
-static constexpr const char *kAwsDynamodbScanForward = "aws.dynamodb.scan_forward";
-
-/**
- * The value of the {@code ScannedCount} response parameter.
- */
-static constexpr const char *kAwsDynamodbScannedCount = "aws.dynamodb.scanned_count";
-
-/**
- * The value of the {@code Segment} request parameter.
- */
-static constexpr const char *kAwsDynamodbSegment = "aws.dynamodb.segment";
-
-/**
- * The value of the {@code Select} request parameter.
- */
-static constexpr const char *kAwsDynamodbSelect = "aws.dynamodb.select";
-
-/**
- * The number of items in the {@code TableNames} response parameter.
- */
-static constexpr const char *kAwsDynamodbTableCount = "aws.dynamodb.table_count";
-
-/**
- * The keys in the {@code RequestItems} object field.
- */
-static constexpr const char *kAwsDynamodbTableNames = "aws.dynamodb.table_names";
-
-/**
- * The value of the {@code TotalSegments} request parameter.
- */
-static constexpr const char *kAwsDynamodbTotalSegments = "aws.dynamodb.total_segments";
-
-/**
- * The ID of a running ECS task. The ID MUST be extracted from {@code task.arn}.
- */
-static constexpr const char *kAwsEcsTaskId = "aws.ecs.task.id";
-
-/**
- * The ARN of an <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html">ECS cluster</a>.
- */
-static constexpr const char *kAwsEcsClusterArn = "aws.ecs.cluster.arn";
-
-/**
- * The Amazon Resource Name (ARN) of an <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html">ECS
- * container instance</a>.
- */
-static constexpr const char *kAwsEcsContainerArn = "aws.ecs.container.arn";
-
-/**
- * The <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html">launch
- * type</a> for an ECS task.
- */
-static constexpr const char *kAwsEcsLaunchtype = "aws.ecs.launchtype";
-
-/**
- * The ARN of a running <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids">ECS
- * task</a>.
- */
-static constexpr const char *kAwsEcsTaskArn = "aws.ecs.task.arn";
-
-/**
- * The family name of the <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html">ECS task
- * definition</a> used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskFamily = "aws.ecs.task.family";
-
-/**
- * The revision for the task definition used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskRevision = "aws.ecs.task.revision";
-
-/**
- * The ARN of an EKS cluster.
- */
-static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn";
-
-/**
- * The Amazon Resource Name(s) (ARN) of the AWS log group(s).
- *
- * <p>Notes:
-  <ul> <li>See the <a
- href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
- group ARN format documentation</a>.</li> </ul>
- */
-static constexpr const char *kAwsLogGroupArns = "aws.log.group.arns";
-
-/**
- * The name(s) of the AWS log group(s) an application is writing to.
- *
- * <p>Notes:
-  <ul> <li>Multiple log groups must be supported for cases like multi-container applications, where
- a single application has sidecar containers, and each write to their own log group.</li> </ul>
- */
-static constexpr const char *kAwsLogGroupNames = "aws.log.group.names";
-
-/**
- * The ARN(s) of the AWS log stream(s).
- *
- * <p>Notes:
-  <ul> <li>See the <a
- href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
- stream ARN format documentation</a>. One log group can contain several log streams, so these ARNs
- necessarily identify both a log group and a log stream.</li> </ul>
- */
-static constexpr const char *kAwsLogStreamArns = "aws.log.stream.arns";
-
-/**
- * The name(s) of the AWS log stream(s) an application is writing to.
- */
-static constexpr const char *kAwsLogStreamNames = "aws.log.stream.names";
-
-/**
- * The full invoked ARN as provided on the {@code Context} passed to the function ({@code
- Lambda-Runtime-Invoked-Function-Arn} header on the {@code /runtime/invocation/next} applicable).
- *
- * <p>Notes:
-  <ul> <li>This may be different from {@code cloud.resource_id} if an alias is involved.</li> </ul>
- */
-static constexpr const char *kAwsLambdaInvokedArn = "aws.lambda.invoked_arn";
-
-/**
- * The S3 bucket name the request refers to. Corresponds to the {@code --bucket} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
- *
- * <p>Notes:
-  <ul> <li>The {@code bucket} attribute is applicable to all S3 operations that reference a bucket,
-i.e. that require the bucket name as a mandatory parameter. This applies to almost all S3 operations
-except {@code list-buckets}.</li> </ul>
- */
-static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
-
-/**
- * The source object (in the form {@code bucket}/{@code key}) for the copy operation.
- *
- * <p>Notes:
-  <ul> <li>The {@code copy_source} attribute applies to S3 copy operations and corresponds to the
-{@code --copy-source} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object operation
-within the S3 API</a>. This applies in particular to the following operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3CopySource = "aws.s3.copy_source";
-
-/**
- * The delete request container that specifies the objects to be deleted.
- *
- * <p>Notes:
-  <ul> <li>The {@code delete} attribute is only applicable to the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a>
-operation. The {@code delete} attribute corresponds to the {@code --delete} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-objects.html">delete-objects
-operation within the S3 API</a>.</li> </ul>
- */
-static constexpr const char *kAwsS3Delete = "aws.s3.delete";
-
-/**
- * The S3 object key the request refers to. Corresponds to the {@code --key} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
- *
- * <p>Notes:
-  <ul> <li>The {@code key} attribute is applicable to all object-related S3 operations, i.e. that
-require the object key as a mandatory parameter. This applies in particular to the following
-operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/get-object.html">get-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/head-object.html">head-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/put-object.html">put-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html">restore-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/select-object-content.html">select-object-content</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/create-multipart-upload.html">create-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3Key = "aws.s3.key";
-
-/**
- * The part number of the part being uploaded in a multipart-upload operation. This is a positive
-integer between 1 and 10,000.
- *
- * <p>Notes:
-  <ul> <li>The {@code part_number} attribute is only applicable to the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a> and
-<a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a>
-operations. The {@code part_number} attribute corresponds to the {@code --part-number} parameter of
-the <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part
-operation within the S3 API</a>.</li> </ul>
- */
-static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
-
-/**
- * Upload ID that identifies the multipart upload.
- *
- * <p>Notes:
-  <ul> <li>The {@code upload_id} attribute applies to S3 multipart-upload operations and corresponds
-to the {@code --upload-id} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
-operations. This applies in particular to the following operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3UploadId = "aws.s3.upload_id";
-
-/**
- * The unique identifier of the service request. It's generated by the Azure service and returned
- * with the response.
- */
-static constexpr const char *kAzServiceRequestId = "az.service_request_id";
-
-/**
- * Array of brand name and version separated by a space
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
- href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
- navigator.userAgentData.brands}).</li> </ul>
- */
-static constexpr const char *kBrowserBrands = "browser.brands";
-
-/**
- * Preferred language of the user using the browser
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the Navigator API {@code
- navigator.language}.</li> </ul>
- */
-static constexpr const char *kBrowserLanguage = "browser.language";
-
-/**
- * A boolean that is true if the browser is running on a mobile device
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
- href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
- navigator.userAgentData.mobile}). If unavailable, this attribute SHOULD be left unset.</li> </ul>
- */
-static constexpr const char *kBrowserMobile = "browser.mobile";
-
-/**
- * The platform on which the browser is running
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
-href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
-navigator.userAgentData.platform}). If unavailable, the legacy {@code navigator.platform} API SHOULD
-NOT be used instead and this attribute SHOULD be left unset in order for the values to be
-consistent. The list of possible values is defined in the <a
-href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-platform">W3C User-Agent Client Hints
-specification</a>. Note that some (but not all) of these values can overlap with values in the <a
-href="./os.md">{@code os.type} and {@code os.name} attributes</a>. However, for consistency, the
-values in the {@code browser.platform} attribute should capture the exact value that the user agent
-provides.</li> </ul>
- */
-static constexpr const char *kBrowserPlatform = "browser.platform";
-
-/**
- * The human readable name of the pipeline within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineName = "cicd.pipeline.name";
-
-/**
- * The unique identifier of a pipeline run within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineRunId = "cicd.pipeline.run.id";
-
-/**
- * The human readable name of a task within a pipeline. Task here most closely aligns with a <a
- * href="https://en.wikipedia.org/wiki/Pipeline_(computing)">computing process</a> in a pipeline.
- * Other terms for tasks include commands, steps, and procedures.
- */
-static constexpr const char *kCicdPipelineTaskName = "cicd.pipeline.task.name";
-
-/**
- * The unique identifier of a task run within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskRunId = "cicd.pipeline.task.run.id";
-
-/**
- * The <a href="https://en.wikipedia.org/wiki/URL">URL</a> of the pipeline run providing the
- * complete address in order to locate and identify the pipeline run.
- */
-static constexpr const char *kCicdPipelineTaskRunUrlFull = "cicd.pipeline.task.run.url.full";
-
-/**
- * The type of the task within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskType = "cicd.pipeline.task.type";
-
-/**
- * Client address - domain name if available without reverse DNS lookup; otherwise, IP address or
- Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the server side, and when communicating through an intermediary,
- {@code client.address} SHOULD represent the client address behind any intermediaries,  for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kClientAddress = "client.address";
-
-/**
- * Client port number.
- *
- * <p>Notes:
-  <ul> <li>When observed from the server side, and when communicating through an intermediary,
- {@code client.port} SHOULD represent the client port behind any intermediaries,  for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kClientPort = "client.port";
-
-/**
- * The cloud account ID the resource is assigned to.
- */
-static constexpr const char *kCloudAccountId = "cloud.account.id";
-
-/**
- * Cloud regions often have multiple, isolated locations known as zones to increase availability.
- Availability zone represents the zone where the resource is running.
- *
- * <p>Notes:
-  <ul> <li>Availability zones are called &quot;zones&quot; on Alibaba Cloud and Google Cloud.</li>
- </ul>
- */
-static constexpr const char *kCloudAvailabilityZone = "cloud.availability_zone";
-
-/**
- * The cloud platform in use.
- *
- * <p>Notes:
-  <ul> <li>The prefix of the service SHOULD match the one specified in {@code cloud.provider}.</li>
- </ul>
- */
-static constexpr const char *kCloudPlatform = "cloud.platform";
-
-/**
- * Name of the cloud provider.
- */
-static constexpr const char *kCloudProvider = "cloud.provider";
-
-/**
- * The geographical region the resource is running.
- *
- * <p>Notes:
-  <ul> <li>Refer to your provider's docs to see the available regions, for example <a
- href="https://www.alibabacloud.com/help/doc-detail/40654.htm">Alibaba Cloud regions</a>, <a
- href="https://aws.amazon.com/about-aws/global-infrastructure/regions_az/">AWS regions</a>, <a
- href="https://azure.microsoft.com/global-infrastructure/geographies/">Azure regions</a>, <a
- href="https://cloud.google.com/about/locations">Google Cloud regions</a>, or <a
- href="https://www.tencentcloud.com/document/product/213/6091">Tencent Cloud regions</a>.</li> </ul>
- */
-static constexpr const char *kCloudRegion = "cloud.region";
-
-/**
- * Cloud provider-specific native identifier of the monitored cloud resource (e.g. an <a
-href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a> on AWS, a
-<a href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">fully qualified
-resource ID</a> on Azure, a <a
-href="https://cloud.google.com/apis/design/resource_names#full_resource_name">full resource name</a>
-on GCP)
- *
- * <p>Notes:
-  <ul> <li>On some cloud providers, it may not be possible to determine the full ID at startup,
-so it may be necessary to set {@code cloud.resource_id} as a span attribute instead.</li><li>The
-exact value to use for {@code cloud.resource_id} depends on the cloud provider. The following
-well-known definitions MUST be used if you set this attribute and they apply:</li><li><strong>AWS
-Lambda:</strong> The function <a
-href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take care
-not to use the &quot;invoked ARN&quot; directly but replace any <a
-href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a> with
-the resolved function version, as the same runtime instance may be invocable with multiple different
-aliases.</li> <li><strong>GCP:</strong> The <a
-href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a></li>
-<li><strong>Azure:</strong> The <a
-href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
-ID</a> of the invoked function, <em>not</em> the function app, having the form
-{@code
-/subscriptions/<SUBSCIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC>}.
-This means that a span attribute MUST be used, as an Azure function app can host multiple functions
-that would usually share a TracerProvider.</li>
- </ul>
- */
-static constexpr const char *kCloudResourceId = "cloud.resource_id";
-
-/**
- * The <a href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id">event_id</a>
- * uniquely identifies the event.
- */
-static constexpr const char *kCloudeventsEventId = "cloudevents.event_id";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#source-1">source</a>
- * identifies the context in which an event happened.
- */
-static constexpr const char *kCloudeventsEventSource = "cloudevents.event_source";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#specversion">version of
- * the CloudEvents specification</a> which the event uses.
- */
-static constexpr const char *kCloudeventsEventSpecVersion = "cloudevents.event_spec_version";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#subject">subject</a> of
- * the event in the context of the event producer (identified by source).
- */
-static constexpr const char *kCloudeventsEventSubject = "cloudevents.event_subject";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type">event_type</a>
- * contains a value describing the type of event related to the originating occurrence.
- */
-static constexpr const char *kCloudeventsEventType = "cloudevents.event_type";
-
-/**
- * The column number in {@code code.filepath} best representing the operation. It SHOULD point
- * within the code unit named in {@code code.function}.
- */
-static constexpr const char *kCodeColumn = "code.column";
-
-/**
- * The source code file name that identifies the code unit as uniquely as possible (preferably an
- * absolute file path).
- */
-static constexpr const char *kCodeFilepath = "code.filepath";
-
-/**
- * The method or function name, or equivalent (usually rightmost part of the code unit's name).
- */
-static constexpr const char *kCodeFunction = "code.function";
-
-/**
- * The line number in {@code code.filepath} best representing the operation. It SHOULD point within
- * the code unit named in {@code code.function}.
- */
-static constexpr const char *kCodeLineno = "code.lineno";
-
-/**
- * The &quot;namespace&quot; within which {@code code.function} is defined. Usually the qualified
- * class or module name, such that {@code code.namespace} + some separator + {@code code.function}
- * form a unique identifier for the code unit.
- */
-static constexpr const char *kCodeNamespace = "code.namespace";
-
-/**
- * A stacktrace as a string in the natural representation for the language runtime. The
- * representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kCodeStacktrace = "code.stacktrace";
-
-/**
- * The command used to run the container (i.e. the command name).
- *
- * <p>Notes:
-  <ul> <li>If using embedded credentials or sensitive data, it is recommended to remove them to
- prevent potential leakage.</li> </ul>
- */
-static constexpr const char *kContainerCommand = "container.command";
-
-/**
- * All the command arguments (including the command/executable itself) run by the container. [2]
- */
-static constexpr const char *kContainerCommandArgs = "container.command_args";
-
-/**
- * The full command run by the container as a single string representing the full command. [2]
- */
-static constexpr const char *kContainerCommandLine = "container.command_line";
-
-/**
- * Container ID. Usually a UUID, as for example used to <a
- * href="https://docs.docker.com/engine/reference/run/#container-identification">identify Docker
- * containers</a>. The UUID might be abbreviated.
- */
-static constexpr const char *kContainerId = "container.id";
-
-/**
- * Runtime specific image identifier. Usually a hash algorithm followed by a UUID.
- *
- * <p>Notes:
-  <ul> <li>Docker defines a sha256 of the image id; {@code container.image.id} corresponds to the
-{@code Image} field from the Docker container inspect <a
-href="https://docs.docker.com/engine/api/v1.43/#tag/Container/operation/ContainerInspect">API</a>
-endpoint. K8s defines a link to the container registry repository with digest {@code "imageID":
-"registry.azurecr.io
-/namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"}.
-The ID is assigned by the container runtime and can vary in different environments. Consider using
-{@code oci.manifest.digest} if it is important to identify the same image in different
-environments/runtimes.</li> </ul>
- */
-static constexpr const char *kContainerImageId = "container.image.id";
-
-/**
- * Name of the image the container was built on.
- */
-static constexpr const char *kContainerImageName = "container.image.name";
-
-/**
- * Repo digests of the container image as provided by the container runtime.
- *
- * <p>Notes:
-  <ul> <li><a
- href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker</a> and <a
- href="https://github.com/kubernetes/cri-api/blob/c75ef5b473bbe2d0a4fc92f82235efd665ea8e9f/pkg/apis/runtime/v1/api.proto#L1237-L1238">CRI</a>
- report those under the {@code RepoDigests} field.</li> </ul>
- */
-static constexpr const char *kContainerImageRepoDigests = "container.image.repo_digests";
-
-/**
- * Container image tags. An example can be found in <a
- * href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker Image
- * Inspect</a>. Should be only the {@code <tag>} section of the full name for example from {@code
- * registry.example.com/my-org/my-image:<tag>}.
- */
-static constexpr const char *kContainerImageTags = "container.image.tags";
-
-/**
- * Container name used by container runtime.
- */
-static constexpr const char *kContainerName = "container.name";
-
-/**
- * The container runtime managing this container.
- */
-static constexpr const char *kContainerRuntime = "container.runtime";
-
-/**
- * The mode of the CPU
- */
-static constexpr const char *kCpuMode = "cpu.mode";
-
-/**
- * The name of the connection pool; unique within the instrumented application. In case the
- * connection pool implementation doesn't provide a name, instrumentation SHOULD use a combination
- * of parameters that would make the name unique, for example, combining attributes {@code
- * server.address}, {@code server.port}, and {@code db.namespace}, formatted as {@code
- * server.address:server.port/db.namespace}. Instrumentations that generate connection pool name
- * following different patterns SHOULD document it.
- */
-static constexpr const char *kDbClientConnectionPoolName = "db.client.connection.pool.name";
-
-/**
- * The state of a connection in the pool
- */
-static constexpr const char *kDbClientConnectionState = "db.client.connection.state";
-
-/**
- * The name of a collection (table, container) within the database.
- *
- * <p>Notes:
-  <ul> <li>It is RECOMMENDED to capture the value as provided by the application without attempting
-to do any case normalization. If the collection name is parsed from the query text, it SHOULD be the
-first collection name found in the query and it SHOULD match the value provided in the query text
-including any schema and database name prefix. For batch operations, if the individual operations
-are known to have the same collection name then that collection name SHOULD be used, otherwise
-{@code db.collection.name} SHOULD NOT be captured.</li> </ul>
- */
-static constexpr const char *kDbCollectionName = "db.collection.name";
-
-/**
- * The name of the database, fully qualified within the server address and port.
- *
- * <p>Notes:
-  <ul> <li>If a database system has multiple namespace components, they SHOULD be concatenated
-(potentially using database system specific conventions) from most general to most specific
-namespace component, and more specific namespaces SHOULD NOT be captured without the more general
-namespaces, to ensure that &quot;startswith&quot; queries for the more general namespaces will be
-valid. Semantic conventions for individual database systems SHOULD document what {@code
-db.namespace} means in the context of that system. It is RECOMMENDED to capture the value as
-provided by the application without attempting to do any case normalization.</li> </ul>
- */
-static constexpr const char *kDbNamespace = "db.namespace";
-
-/**
- * The number of queries included in a <a
- href="/docs/database/database-spans.md#batch-operations">batch operation</a>.
- *
- * <p>Notes:
-  <ul> <li>Operations are only considered batches when they contain two or more operations, and so
- {@code db.operation.batch.size} SHOULD never be {@code 1}.</li> </ul>
- */
-static constexpr const char *kDbOperationBatchSize = "db.operation.batch.size";
-
-/**
- * The name of the operation or command being executed.
- *
- * <p>Notes:
-  <ul> <li>It is RECOMMENDED to capture the value as provided by the application without attempting
-to do any case normalization. If the operation name is parsed from the query text, it SHOULD be the
-first operation name found in the query. For batch operations, if the individual operations are
-known to have the same operation name then that operation name SHOULD be used prepended by {@code
-BATCH}, otherwise {@code db.operation.name} SHOULD be {@code BATCH} or some other database system
-specific term if more applicable.</li> </ul>
- */
-static constexpr const char *kDbOperationName = "db.operation.name";
-
-/**
- * The database query being executed.
- *
- * <p>Notes:
-  <ul> <li>For sanitization see <a
-href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of {@code
-db.query.text}</a>. For batch operations, if the individual operations are known to have the same
-query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD
-be concatenated with separator {@code ;} or some other database system specific separator if more
-applicable. Even though parameterized query text can potentially have sensitive data, by using a
-parameterized query the user is giving a strong signal that any sensitive data will be passed as
-parameter values, and the benefit to observability of capturing the static part of the query text by
-default outweighs the risk.</li> </ul>
- */
-static constexpr const char *kDbQueryText = "db.query.text";
-
-/**
- * The database management system (DBMS) product as identified by the client instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The actual DBMS may differ from the one identified by the client. For example, when using
- PostgreSQL client libraries to connect to a CockroachDB, the {@code db.system} is set to {@code
- postgresql} based on the instrumentation's best knowledge.</li> </ul>
- */
-static constexpr const char *kDbSystem = "db.system";
-
-/**
- * The consistency level of the query. Based on consistency values from <a
- * href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
- */
-static constexpr const char *kDbCassandraConsistencyLevel = "db.cassandra.consistency_level";
-
-/**
- * The data center of the coordinating node for a query.
- */
-static constexpr const char *kDbCassandraCoordinatorDc = "db.cassandra.coordinator.dc";
-
-/**
- * The ID of the coordinating node for a query.
- */
-static constexpr const char *kDbCassandraCoordinatorId = "db.cassandra.coordinator.id";
-
-/**
- * Whether or not the query is idempotent.
- */
-static constexpr const char *kDbCassandraIdempotence = "db.cassandra.idempotence";
-
-/**
- * The fetch size used for paging, i.e. how many rows will be returned at once.
- */
-static constexpr const char *kDbCassandraPageSize = "db.cassandra.page_size";
-
-/**
- * The number of times a query was speculatively executed. Not set or {@code 0} if the query was not
- * executed speculatively.
- */
-static constexpr const char *kDbCassandraSpeculativeExecutionCount =
-    "db.cassandra.speculative_execution_count";
-
-/**
- * Unique Cosmos client instance id.
- */
-static constexpr const char *kDbCosmosdbClientId = "db.cosmosdb.client_id";
-
-/**
- * Cosmos client connection mode.
- */
-static constexpr const char *kDbCosmosdbConnectionMode = "db.cosmosdb.connection_mode";
-
-/**
- * CosmosDB Operation Type.
- */
-static constexpr const char *kDbCosmosdbOperationType = "db.cosmosdb.operation_type";
-
-/**
- * RU consumed for that operation
- */
-static constexpr const char *kDbCosmosdbRequestCharge = "db.cosmosdb.request_charge";
-
-/**
- * Request payload size in bytes
- */
-static constexpr const char *kDbCosmosdbRequestContentLength = "db.cosmosdb.request_content_length";
-
-/**
- * Cosmos DB status code.
- */
-static constexpr const char *kDbCosmosdbStatusCode = "db.cosmosdb.status_code";
-
-/**
- * Cosmos DB sub status code.
- */
-static constexpr const char *kDbCosmosdbSubStatusCode = "db.cosmosdb.sub_status_code";
-
-/**
- * Represents the human-readable identifier of the node/instance to which a request was routed.
- */
-static constexpr const char *kDbElasticsearchNodeName = "db.elasticsearch.node.name";
-
-/**
- * Name of the <a href="https://wikipedia.org/wiki/Deployment_environment">deployment
-environment</a> (aka deployment tier).
- *
- * <p>Notes:
-  <ul> <li>{@code deployment.environment.name} does not affect the uniqueness constraints defined
-through the {@code service.namespace}, {@code service.name} and {@code service.instance.id} resource
-attributes. This implies that resources carrying the following attribute combinations MUST be
-considered to be identifying the same service:</li><li>{@code service.name=frontend}, {@code
-deployment.environment.name=production}</li> <li>{@code service.name=frontend}, {@code
-deployment.environment.name=staging}.</li>
- </ul>
- */
-static constexpr const char *kDeploymentEnvironmentName = "deployment.environment.name";
-
-/**
- * The id of the deployment.
- */
-static constexpr const char *kDeploymentId = "deployment.id";
-
-/**
- * The name of the deployment.
- */
-static constexpr const char *kDeploymentName = "deployment.name";
-
-/**
- * The status of the deployment.
- */
-static constexpr const char *kDeploymentStatus = "deployment.status";
-
-/**
- * Deprecated use the {@code device.app.lifecycle} event definition including {@code android.state}
- as a payload field instead.
- *
- * <p>Notes:
-  <ul> <li>The Android lifecycle states are defined in <a
- href="https://developer.android.com/guide/components/activities/activity-lifecycle#lc">Activity
- lifecycle callbacks</a>, and from which the {@code OS identifiers} are derived.</li> </ul>
- */
-static constexpr const char *kAndroidState = "android.state";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraTable = "db.cassandra.table";
-
-/**
- * Deprecated, use {@code server.address}, {@code server.port} attributes instead.
- *
- * @deprecated Deprecated, use `server.address`, `server.port` attributes instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbConnectionString = "db.connection_string";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbContainer =
-    "db.cosmosdb.container";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchClusterName =
-    "db.elasticsearch.cluster.name";
-
-/**
- * Deprecated, no general replacement at this time. For Elasticsearch, use {@code
- * db.elasticsearch.node.name} instead.
- *
- * @deprecated Deprecated, no general replacement at this time. For Elasticsearch, use
- * `db.elasticsearch.node.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbInstanceId = "db.instance.id";
-
-/**
- * Removed, no replacement at this time.
- *
- * @deprecated Removed, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbJdbcDriverClassname =
-    "db.jdbc.driver_classname";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMongodbCollection =
-    "db.mongodb.collection";
-
-/**
- * Deprecated, SQL Server instance is now populated as a part of {@code db.namespace} attribute.
- *
- * @deprecated Deprecated, SQL Server instance is now populated as a part of `db.namespace`
- * attribute.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMssqlInstanceName =
-    "db.mssql.instance_name";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbName = "db.name";
-
-/**
- * Deprecated, use {@code db.operation.name} instead.
- *
- * @deprecated Deprecated, use `db.operation.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbOperation = "db.operation";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
-    "db.redis.database_index";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSqlTable = "db.sql.table";
-
-/**
- * The database statement being executed.
- *
- * @deprecated The database statement being executed.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbStatement = "db.statement";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbUser = "db.user";
-
-/**
- * Deprecated, use {@code db.client.connection.pool.name} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsPoolName =
-    "db.client.connections.pool.name";
-
-/**
- * Deprecated, use {@code db.client.connection.state} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.state` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsState =
-    "db.client.connections.state";
-
-/**
- * Deprecated, use {@code db.client.connection.pool.name} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name";
-
-/**
- * Deprecated, use {@code db.client.connection.state} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.state` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state";
-
-/**
- * 'Deprecated, use {@code deployment.environment.name} instead.'
- *
- * @deprecated 'Deprecated, use `deployment.environment.name` instead.'.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment =
-    "deployment.environment";
-
-/**
- * Deprecated, use {@code user.id} instead.
- *
- * @deprecated Deprecated, use `user.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserId = "enduser.id";
-
-/**
- * Deprecated, use {@code user.roles} instead.
- *
- * @deprecated Deprecated, use `user.roles` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope";
-
-/**
- * Deprecated, use {@code gen_ai.usage.output_tokens} instead.
- *
- * @deprecated Deprecated, use `gen_ai.usage.output_tokens` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens =
-    "gen_ai.usage.completion_tokens";
-
-/**
- * Deprecated, use {@code gen_ai.usage.input_tokens} instead.
- *
- * @deprecated Deprecated, use `gen_ai.usage.input_tokens` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens =
-    "gen_ai.usage.prompt_tokens";
-
-/**
- * Deprecated, use {@code client.address} instead.
- *
- * @deprecated Deprecated, use `client.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip";
-
-/**
- * Deprecated, use {@code network.protocol.name} instead.
- *
- * @deprecated Deprecated, use `network.protocol.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
-
-/**
- * Deprecated, use one of {@code server.address}, {@code client.address} or {@code
- * http.request.header.host} instead, depending on the usage.
- *
- * @deprecated Deprecated, use one of `server.address`, `client.address` or
- * `http.request.header.host` instead, depending on the usage.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host";
-
-/**
- * Deprecated, use {@code http.request.method} instead.
- *
- * @deprecated Deprecated, use `http.request.method` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method";
-
-/**
- * Deprecated, use {@code http.request.header.content-length} instead.
- *
- * @deprecated Deprecated, use `http.request.header.content-length` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength =
-    "http.request_content_length";
-
-/**
- * Deprecated, use {@code http.request.body.size} instead.
- *
- * @deprecated Deprecated, use `http.request.body.size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed =
-    "http.request_content_length_uncompressed";
-
-/**
- * Deprecated, use {@code http.response.header.content-length} instead.
- *
- * @deprecated Deprecated, use `http.response.header.content-length` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength =
-    "http.response_content_length";
-
-/**
- * Deprecated, use {@code http.response.body.size} instead.
- *
- * @deprecated Deprecated, use `http.response.body.size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed =
-    "http.response_content_length_uncompressed";
-
-/**
- * Deprecated, use {@code url.scheme} instead.
- *
- * @deprecated Deprecated, use `url.scheme` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme";
-
-/**
- * Deprecated, use {@code server.address} instead.
- *
- * @deprecated Deprecated, use `server.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name";
-
-/**
- * Deprecated, use {@code http.response.status_code} instead.
- *
- * @deprecated Deprecated, use `http.response.status_code` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code";
-
-/**
- * Deprecated, use {@code url.path} and {@code url.query} instead.
- *
- * @deprecated Deprecated, use `url.path` and `url.query` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target";
-
-/**
- * Deprecated, use {@code url.full} instead.
- *
- * @deprecated Deprecated, use `url.full` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url";
-
-/**
- * Deprecated, use {@code user_agent.original} instead.
- *
- * @deprecated Deprecated, use `user_agent.original` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent";
-
-/**
- * Deprecated use the {@code device.app.lifecycle} event definition including {@code ios.state} as a
- payload field instead.
- *
- * <p>Notes:
-  <ul> <li>The iOS lifecycle states are defined in the <a
- href="https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902">UIApplicationDelegate
- documentation</a>, and from which the {@code OS terminology} column values are derived.</li> </ul>
- *
- * @deprecated Deprecated use the `device.app.lifecycle` event definition including `ios.state` as a
- payload field instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kIosState = "ios.state";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous =
-    "messaging.destination_publish.anonymous";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName =
-    "messaging.destination_publish.name";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup =
-    "messaging.eventhubs.consumer.group";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup =
-    "messaging.kafka.consumer.group";
-
-/**
- * Deprecated, use {@code messaging.destination.partition.id} instead.
- *
- * @deprecated Deprecated, use `messaging.destination.partition.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
-    "messaging.kafka.destination.partition";
-
-/**
- * Deprecated, use {@code messaging.kafka.offset} instead.
- *
- * @deprecated Deprecated, use `messaging.kafka.offset` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset =
-    "messaging.kafka.message.offset";
-
-/**
- * Deprecated, use {@code messaging.operation.type} instead.
- *
- * @deprecated Deprecated, use `messaging.operation.type` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup =
-    "messaging.rocketmq.client_group";
-
-/**
- * Deprecated, use {@code messaging.servicebus.destination.subscription_name} instead.
- *
- * @deprecated Deprecated, use `messaging.servicebus.destination.subscription_name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *kMessagingServicebusDestinationSubscriptionName =
-        "messaging.servicebus.destination.subscription_name";
-
-/**
- * Deprecated, use {@code network.local.address}.
- *
- * @deprecated Deprecated, use `network.local.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip";
-
-/**
- * Deprecated, use {@code server.address}.
- *
- * @deprecated Deprecated, use `server.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name";
-
-/**
- * Deprecated, use {@code server.port}.
- *
- * @deprecated Deprecated, use `server.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port";
-
-/**
- * Deprecated, use {@code network.peer.address}.
- *
- * @deprecated Deprecated, use `network.peer.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip";
-
-/**
- * Deprecated, use {@code server.address} on client spans and {@code client.address} on server
- * spans.
- *
- * @deprecated Deprecated, use `server.address` on client spans and `client.address` on server
- * spans.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerName = "net.peer.name";
-
-/**
- * Deprecated, use {@code server.port} on client spans and {@code client.port} on server spans.
- *
- * @deprecated Deprecated, use `server.port` on client spans and `client.port` on server spans.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.port";
-
-/**
- * Deprecated, use {@code network.protocol.name}.
- *
- * @deprecated Deprecated, use `network.protocol.name`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name";
-
-/**
- * Deprecated, use {@code network.protocol.version}.
- *
- * @deprecated Deprecated, use `network.protocol.version`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version";
-
-/**
- * Deprecated, use {@code network.transport} and {@code network.type}.
- *
- * @deprecated Deprecated, use `network.transport` and `network.type`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock.family";
-
-/**
- * Deprecated, use {@code network.local.address}.
- *
- * @deprecated Deprecated, use `network.local.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
-
-/**
- * Deprecated, use {@code network.local.port}.
- *
- * @deprecated Deprecated, use `network.local.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port";
-
-/**
- * Deprecated, use {@code network.peer.address}.
- *
- * @deprecated Deprecated, use `network.peer.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
-
-/**
- * Deprecated, use {@code network.peer.port}.
- *
- * @deprecated Deprecated, use `network.peer.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
-
-/**
- * Deprecated, use {@code network.transport}.
- *
- * @deprecated Deprecated, use `network.transport`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport";
-
-/**
- *
- *
- * @deprecated .
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name";
-
-/**
- *
- *
- * @deprecated .
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state";
-
-/**
- * Deprecated, use {@code rpc.message.compressed_size} instead.
- *
- * @deprecated Deprecated, use `rpc.message.compressed_size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize =
-    "message.compressed_size";
-
-/**
- * Deprecated, use {@code rpc.message.id} instead.
- *
- * @deprecated Deprecated, use `rpc.message.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id";
-
-/**
- * Deprecated, use {@code rpc.message.type} instead.
- *
- * @deprecated Deprecated, use `rpc.message.type` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type";
-
-/**
- * Deprecated, use {@code rpc.message.uncompressed_size} instead.
- *
- * @deprecated Deprecated, use `rpc.message.uncompressed_size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize =
-    "message.uncompressed_size";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state";
-
-/**
- * Deprecated, use {@code system.process.status} instead.
- *
- * @deprecated Deprecated, use `system.process.status` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
-    "system.processes.status";
-
-/**
- * Deprecated, use {@code server.address} instead.
- *
- * @deprecated Deprecated, use `server.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName =
-    "tls.client.server_name";
-
-/**
- * Destination address - domain name if available without reverse DNS lookup; otherwise, IP address
- or Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the source side, and when communicating through an intermediary,
- {@code destination.address} SHOULD represent the destination address behind any intermediaries, for
- example proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kDestinationAddress = "destination.address";
-
-/**
- * Destination port number
- */
-static constexpr const char *kDestinationPort = "destination.port";
-
-/**
- * A unique identifier representing the device
- *
- * <p>Notes:
-  <ul> <li>The device identifier MUST only be defined using the values outlined below. This value is
- not an advertising identifier and MUST NOT be used as such. On iOS (Swift or Objective-C), this
- value MUST be equal to the <a
- href="https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor">vendor
- identifier</a>. On Android (Java or Kotlin), this value MUST be equal to the Firebase Installation
- ID or a globally unique UUID which is persisted across sessions in your application. More
- information can be found <a
- href="https://developer.android.com/training/articles/user-data-ids">here</a> on best practices and
- exact implementation details. Caution should be taken when storing personal data or anything which
- can identify a user. GDPR and data protection laws may apply, ensure you do your own due
- diligence.</li> </ul>
- */
-static constexpr const char *kDeviceId = "device.id";
-
-/**
- * The name of the device manufacturer
- *
- * <p>Notes:
-  <ul> <li>The Android OS provides this field via <a
- href="https://developer.android.com/reference/android/os/Build#MANUFACTURER">Build</a>. iOS apps
- SHOULD hardcode the value {@code Apple}.</li> </ul>
- */
-static constexpr const char *kDeviceManufacturer = "device.manufacturer";
-
-/**
- * The model identifier for the device
- *
- * <p>Notes:
-  <ul> <li>It's recommended this value represents a machine-readable version of the model identifier
- rather than the market or consumer-friendly name of the device.</li> </ul>
- */
-static constexpr const char *kDeviceModelIdentifier = "device.model.identifier";
-
-/**
- * The marketing name for the device model
- *
- * <p>Notes:
-  <ul> <li>It's recommended this value represents a human-readable version of the device model
- rather than a machine-readable alternative.</li> </ul>
- */
-static constexpr const char *kDeviceModelName = "device.model.name";
-
-/**
- * The disk IO operation direction.
- */
-static constexpr const char *kDiskIoDirection = "disk.io.direction";
-
-/**
- * The name being queried.
- *
- * <p>Notes:
-  <ul> <li>If the name field contains non-printable characters (below 32 or above 126), those
- characters should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should
- be escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n
- respectively.</li> </ul>
- */
-static constexpr const char *kDnsQuestionName = "dns.question.name";
-
-/**
- * Describes a class of error the operation ended with.
- *
- * <p>Notes:
-  <ul> <li>The {@code error.type} SHOULD be predictable, and SHOULD have low
-cardinality.</li><li>When {@code error.type} is set to a type (e.g., an exception type), its
-canonical class name identifying the type within the artifact SHOULD be
-used.</li><li>Instrumentations SHOULD document the list of errors they report.</li><li>The
-cardinality of {@code error.type} within one instrumentation library SHOULD be low. Telemetry
-consumers that aggregate data from multiple instrumentation libraries and applications should be
-prepared for {@code error.type} to have high cardinality at query time when no additional filters
-are applied.</li><li>If the operation has completed successfully, instrumentations SHOULD NOT set
-{@code error.type}.</li><li>If a specific domain defines its own set of error identifiers (such as
-HTTP or gRPC status codes), it's RECOMMENDED to:</li><li>Use a domain-specific attribute</li>
-<li>Set {@code error.type} to capture all errors, regardless of whether they are defined within the
-domain-specific set or not.</li>
- </ul>
- */
-static constexpr const char *kErrorType = "error.type";
-
-/**
- * Identifies the class / type of event.
- *
- * <p>Notes:
-  <ul> <li>Event names are subject to the same rules as <a
- href="/docs/general/attribute-naming.md">attribute names</a>. Notably, event names are namespaced
- to avoid collisions and provide a clean separation of semantics for events in separate domains like
- browser, mobile, and kubernetes.</li> </ul>
- */
-static constexpr const char *kEventName = "event.name";
-
-/**
- * SHOULD be set to true if the exception event is recorded at a point where it is known that the
-exception is escaping the scope of the span.
- *
- * <p>Notes:
-  <ul> <li>An exception is considered to have escaped (or left) the scope of a span,
-if that span is ended while the exception is still logically &quot;in flight&quot;.
-This may be actually &quot;in flight&quot; in some languages (e.g. if the exception
-is passed to a Context manager's {@code __exit__} method in Python) but will
-usually be caught at the point of recording the exception in most languages.</li><li>It is usually
-not possible to determine at the point where an exception is thrown whether it will escape the scope
-of a span. However, it is trivial to know that an exception will escape, if one checks for an active
-exception just before ending the span, as done in the <a
-href="https://opentelemetry.io/docs/specs/semconv/exceptions/exceptions-spans/#recording-an-exception">example
-for recording span exceptions</a>.</li><li>It follows that an exception may still escape the scope
-of the span even if the {@code exception.escaped} attribute was not set or set to false, since the
-event might have been recorded at a time where it was not clear whether the exception will
-escape.</li> </ul>
- */
-static constexpr const char *kExceptionEscaped = "exception.escaped";
-
-/**
- * The exception message.
- */
-static constexpr const char *kExceptionMessage = "exception.message";
-
-/**
- * A stacktrace as a string in the natural representation for the language runtime. The
- * representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kExceptionStacktrace = "exception.stacktrace";
-
-/**
- * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of
- * the exception should be preferred over the static type in languages that support it.
- */
-static constexpr const char *kExceptionType = "exception.type";
-
-/**
- * A boolean that is true if the serverless function is executed for the first time (aka
- * cold-start).
- */
-static constexpr const char *kFaasColdstart = "faas.coldstart";
-
-/**
- * A string containing the schedule period as <a
- * href="https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm">Cron
- * Expression</a>.
- */
-static constexpr const char *kFaasCron = "faas.cron";
-
-/**
- * The name of the source on which the triggering operation was performed. For example, in Cloud
- * Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name.
- */
-static constexpr const char *kFaasDocumentCollection = "faas.document.collection";
-
-/**
- * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the
- * name of the file, and in Cosmos DB the table name.
- */
-static constexpr const char *kFaasDocumentName = "faas.document.name";
-
-/**
- * Describes the type of the operation that was performed on the data.
- */
-static constexpr const char *kFaasDocumentOperation = "faas.document.operation";
-
-/**
- * A string containing the time when the data was accessed in the <a
- * href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
- * href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasDocumentTime = "faas.document.time";
-
-/**
- * The execution environment ID as a string, that will be potentially reused for other invocations
- to the same function/function version.
- *
- * <p>Notes:
-  <ul> <li><strong>AWS Lambda:</strong> Use the (full) log stream name.</li>
- </ul>
- */
-static constexpr const char *kFaasInstance = "faas.instance";
-
-/**
- * The invocation ID of the current function invocation.
- */
-static constexpr const char *kFaasInvocationId = "faas.invocation_id";
-
-/**
- * The name of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code faas.name} resource attribute of the invoked function.</li>
- </ul>
- */
-static constexpr const char *kFaasInvokedName = "faas.invoked_name";
-
-/**
- * The cloud provider of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code cloud.provider} resource attribute of the invoked
- function.</li> </ul>
- */
-static constexpr const char *kFaasInvokedProvider = "faas.invoked_provider";
-
-/**
- * The cloud region of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code cloud.region} resource attribute of the invoked
- function.</li> </ul>
- */
-static constexpr const char *kFaasInvokedRegion = "faas.invoked_region";
-
-/**
- * The amount of memory available to the serverless function converted to Bytes.
- *
- * <p>Notes:
-  <ul> <li>It's recommended to set this attribute since e.g. too little memory can easily stop a
- Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable {@code
- AWS_LAMBDA_FUNCTION_MEMORY_SIZE} provides this information (which must be multiplied by
- 1,048,576).</li> </ul>
- */
-static constexpr const char *kFaasMaxMemory = "faas.max_memory";
-
-/**
- * The name of the single function that this runtime instance executes.
- *
- * <p>Notes:
-  <ul> <li>This is the name of the function as configured/deployed on the FaaS
-platform and is usually different from the name of the callback
-function (which may be stored in the
-<a href="/docs/general/attributes.md#source-code-attributes">{@code code.namespace}/{@code
-code.function}</a> span attributes).</li><li>For some cloud providers, the above definition is
-ambiguous. The following definition of function name MUST be used for this attribute (and
-consequently the span name) for the listed cloud providers/products:</li><li><strong>Azure:</strong>
-The full name {@code <FUNCAPP>/<FUNC>}, i.e., function app name followed by a forward slash followed
-by the function name (this form can also be seen in the resource JSON for the function). This means
-that a span attribute MUST be used, as an Azure function app can host multiple functions that would
-usually share a TracerProvider (see also the {@code cloud.resource_id} attribute).</li>
- </ul>
- */
-static constexpr const char *kFaasName = "faas.name";
-
-/**
- * A string containing the function invocation time in the <a
- * href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
- * href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasTime = "faas.time";
-
-/**
- * Type of the trigger which caused this function invocation.
- */
-static constexpr const char *kFaasTrigger = "faas.trigger";
-
-/**
- * The immutable version of the function being executed.
- *
- * <p>Notes:
-  <ul> <li>Depending on the cloud provider and platform, use:</li><li><strong>AWS Lambda:</strong>
-The <a href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function
-version</a> (an integer represented as a decimal string).</li> <li><strong>Google Cloud Run
-(Services):</strong> The <a href="https://cloud.google.com/run/docs/managing/revisions">revision</a>
-(i.e., the function name plus the revision suffix).</li>
-<li><strong>Google Cloud Functions:</strong> The value of the
-<a
-href="https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically">{@code
-K_REVISION} environment variable</a>.</li> <li><strong>Azure Functions:</strong> Not applicable. Do
-not set this attribute.</li>
- </ul>
- */
-static constexpr const char *kFaasVersion = "faas.version";
-
-/**
- * The unique identifier of the feature flag.
- */
-static constexpr const char *kFeatureFlagKey = "feature_flag.key";
-
-/**
- * The name of the service provider that performs the flag evaluation.
- */
-static constexpr const char *kFeatureFlagProviderName = "feature_flag.provider_name";
-
-/**
- * SHOULD be a semantic identifier for a value. If one is unavailable, a stringified version of the
-value can be used.
- *
- * <p>Notes:
-  <ul> <li>A semantic identifier, commonly referred to as a variant, provides a means
-for referring to a value without including the value itself. This can
-provide additional context for understanding the meaning behind a value.
-For example, the variant {@code red} maybe be used for the value {@code #c05543}.</li><li>A
-stringified version of the value can be used in situations where a semantic identifier is
-unavailable. String representation of the value should be determined by the implementer.</li> </ul>
- */
-static constexpr const char *kFeatureFlagVariant = "feature_flag.variant";
-
-/**
- * Directory where the file is located. It should include the drive letter, when appropriate.
- */
-static constexpr const char *kFileDirectory = "file.directory";
-
-/**
- * File extension, excluding the leading dot.
- *
- * <p>Notes:
-  <ul> <li>When the file name has multiple extensions (example.tar.gz), only the last one should be
- captured (&quot;gz&quot;, not &quot;tar.gz&quot;).</li> </ul>
- */
-static constexpr const char *kFileExtension = "file.extension";
-
-/**
- * Name of the file including the extension, without the directory.
- */
-static constexpr const char *kFileName = "file.name";
-
-/**
- * Full path to the file, including the file name. It should include the drive letter, when
- * appropriate.
- */
-static constexpr const char *kFilePath = "file.path";
-
-/**
- * File size in bytes.
- */
-static constexpr const char *kFileSize = "file.size";
-
-/**
- * Identifies the Google Cloud service for which the official client library is intended.
- *
- * <p>Notes:
-  <ul> <li>Intended to be a stable identifier for Google Cloud client libraries that is uniform
- across implementation languages. The value should be derived from the canonical service domain for
- the service; for example, 'foo.googleapis.com' should result in a value of 'foo'.</li> </ul>
- */
-static constexpr const char *kGcpClientService = "gcp.client.service";
-
-/**
- * The name of the Cloud Run <a
- * href="https://cloud.google.com/run/docs/managing/job-executions">execution</a> being run for the
- * Job, as set by the <a
- * href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">{@code
- * CLOUD_RUN_EXECUTION}</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobExecution = "gcp.cloud_run.job.execution";
-
-/**
- * The index for a task within an execution as provided by the <a
- * href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">{@code
- * CLOUD_RUN_TASK_INDEX}</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobTaskIndex = "gcp.cloud_run.job.task_index";
-
-/**
- * The hostname of a GCE instance. This is the full value of the default or <a
- * href="https://cloud.google.com/compute/docs/instances/custom-hostname-vm">custom hostname</a>.
- */
-static constexpr const char *kGcpGceInstanceHostname = "gcp.gce.instance.hostname";
-
-/**
- * The instance name of a GCE instance. This is the value provided by {@code host.name}, the visible
- * name of the instance in the Cloud Console UI, and the prefix for the default hostname of the
- * instance as defined by the <a
- * href="https://cloud.google.com/compute/docs/internal-dns#instance-fully-qualified-domain-names">default
- * internal DNS name</a>.
- */
-static constexpr const char *kGcpGceInstanceName = "gcp.gce.instance.name";
-
-/**
- * The full response received from the GenAI model.
- *
- * <p>Notes:
-  <ul> <li>It's RECOMMENDED to format completions as JSON string matching <a
- href="https://platform.openai.com/docs/guides/text-generation">OpenAI messages format</a></li>
- </ul>
- */
-static constexpr const char *kGenAiCompletion = "gen_ai.completion";
-
-/**
- * The name of the operation being performed.
- *
- * <p>Notes:
-  <ul> <li>If one of the predefined values applies, but specific system uses a different name it's
- RECOMMENDED to document it in the semantic conventions for specific GenAI system and use
- system-specific name in the instrumentation. If a different name is not documented, instrumentation
- libraries SHOULD use applicable predefined value.</li> </ul>
- */
-static constexpr const char *kGenAiOperationName = "gen_ai.operation.name";
-
-/**
- * The full prompt sent to the GenAI model.
- *
- * <p>Notes:
-  <ul> <li>It's RECOMMENDED to format prompts as JSON string matching <a
- href="https://platform.openai.com/docs/guides/text-generation">OpenAI messages format</a></li>
- </ul>
- */
-static constexpr const char *kGenAiPrompt = "gen_ai.prompt";
-
-/**
- * The frequency penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestFrequencyPenalty = "gen_ai.request.frequency_penalty";
-
-/**
- * The maximum number of tokens the model generates for a request.
- */
-static constexpr const char *kGenAiRequestMaxTokens = "gen_ai.request.max_tokens";
-
-/**
- * The name of the GenAI model a request is being made to.
- */
-static constexpr const char *kGenAiRequestModel = "gen_ai.request.model";
-
-/**
- * The presence penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestPresencePenalty = "gen_ai.request.presence_penalty";
-
-/**
- * List of sequences that the model will use to stop generating further tokens.
- */
-static constexpr const char *kGenAiRequestStopSequences = "gen_ai.request.stop_sequences";
-
-/**
- * The temperature setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTemperature = "gen_ai.request.temperature";
-
-/**
- * The top_k sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopK = "gen_ai.request.top_k";
-
-/**
- * The top_p sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopP = "gen_ai.request.top_p";
-
-/**
- * Array of reasons the model stopped generating tokens, corresponding to each generation received.
- */
-static constexpr const char *kGenAiResponseFinishReasons = "gen_ai.response.finish_reasons";
-
-/**
- * The unique identifier for the completion.
- */
-static constexpr const char *kGenAiResponseId = "gen_ai.response.id";
-
-/**
- * The name of the model that generated the response.
- */
-static constexpr const char *kGenAiResponseModel = "gen_ai.response.model";
-
-/**
- * The Generative AI product as identified by the client or server instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The {@code gen_ai.system} describes a family of GenAI models with specific model
-identified by {@code gen_ai.request.model} and {@code gen_ai.response.model} attributes.</li><li>The
-actual GenAI product may differ from the one identified by the client. For example, when using
-OpenAI client libraries to communicate with Mistral, the {@code gen_ai.system} is set to {@code
-openai} based on the instrumentation's best knowledge.</li><li>For custom model, a custom friendly
-name SHOULD be used. If none of these options apply, the {@code gen_ai.system} SHOULD be set to
-{@code _OTHER}.</li> </ul>
- */
-static constexpr const char *kGenAiSystem = "gen_ai.system";
-
-/**
- * The type of token being counted.
- */
-static constexpr const char *kGenAiTokenType = "gen_ai.token.type";
-
-/**
- * The number of tokens used in the GenAI input (prompt).
- */
-static constexpr const char *kGenAiUsageInputTokens = "gen_ai.usage.input_tokens";
-
-/**
- * The number of tokens used in the GenAI response (completion).
- */
-static constexpr const char *kGenAiUsageOutputTokens = "gen_ai.usage.output_tokens";
-
-/**
- * The type of memory.
- */
-static constexpr const char *kGoMemoryType = "go.memory.type";
-
-/**
- * The GraphQL document being executed.
- *
- * <p>Notes:
-  <ul> <li>The value may be sanitized to exclude sensitive information.</li> </ul>
- */
-static constexpr const char *kGraphqlDocument = "graphql.document";
-
-/**
- * The name of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationName = "graphql.operation.name";
-
-/**
- * The type of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationType = "graphql.operation.type";
-
-/**
- * Unique identifier for the application
- */
-static constexpr const char *kHerokuAppId = "heroku.app.id";
-
-/**
- * Commit hash for the current release
- */
-static constexpr const char *kHerokuReleaseCommit = "heroku.release.commit";
-
-/**
- * Time and date the release was created
- */
-static constexpr const char *kHerokuReleaseCreationTimestamp = "heroku.release.creation_timestamp";
-
-/**
- * The CPU architecture the host system is running on.
- */
-static constexpr const char *kHostArch = "host.arch";
-
-/**
- * The amount of level 2 memory cache available to the processor (in Bytes).
- */
-static constexpr const char *kHostCpuCacheL2Size = "host.cpu.cache.l2.size";
-
-/**
- * Family or generation of the CPU.
- */
-static constexpr const char *kHostCpuFamily = "host.cpu.family";
-
-/**
- * Model identifier. It provides more granular information about the CPU, distinguishing it from
- * other CPUs within the same family.
- */
-static constexpr const char *kHostCpuModelId = "host.cpu.model.id";
-
-/**
- * Model designation of the processor.
- */
-static constexpr const char *kHostCpuModelName = "host.cpu.model.name";
-
-/**
- * Stepping or core revisions.
- */
-static constexpr const char *kHostCpuStepping = "host.cpu.stepping";
-
-/**
- * Processor manufacturer identifier. A maximum 12-character string.
- *
- * <p>Notes:
-  <ul> <li><a href="https://wiki.osdev.org/CPUID">CPUID</a> command returns the vendor ID string in
- EBX, EDX and ECX registers. Writing these to memory in this order results in a 12-character
- string.</li> </ul>
- */
-static constexpr const char *kHostCpuVendorId = "host.cpu.vendor.id";
-
-/**
- * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For
- * non-containerized systems, this should be the {@code machine-id}. See the table below for the
- * sources to use to determine the {@code machine-id} based on operating system.
- */
-static constexpr const char *kHostId = "host.id";
-
-/**
- * VM image ID or host OS image ID. For Cloud, this value is from the provider.
- */
-static constexpr const char *kHostImageId = "host.image.id";
-
-/**
- * Name of the VM image or OS install the host was instantiated from.
- */
-static constexpr const char *kHostImageName = "host.image.name";
-
-/**
- * The version string of the VM image or host OS as defined in <a
- * href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kHostImageVersion = "host.image.version";
-
-/**
- * Available IP addresses of the host, excluding loopback interfaces.
- *
- * <p>Notes:
-  <ul> <li>IPv4 Addresses MUST be specified in dotted-quad notation. IPv6 addresses MUST be
- specified in the <a href="https://www.rfc-editor.org/rfc/rfc5952.html">RFC 5952</a> format.</li>
- </ul>
- */
-static constexpr const char *kHostIp = "host.ip";
-
-/**
- * Available MAC addresses of the host, excluding loopback interfaces.
- *
- * <p>Notes:
-  <ul> <li>MAC Addresses MUST be represented in <a
- href="https://standards.ieee.org/wp-content/uploads/import/documents/tutorials/eui.pdf">IEEE RA
- hexadecimal form</a>: as hyphen-separated octets in uppercase hexadecimal form from most to least
- significant.</li> </ul>
- */
-static constexpr const char *kHostMac = "host.mac";
-
-/**
- * Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully
- * qualified hostname, or another name specified by the user.
- */
-static constexpr const char *kHostName = "host.name";
-
-/**
- * Type of host. For Cloud, this must be the machine type.
- */
-static constexpr const char *kHostType = "host.type";
-
-/**
- * State of the HTTP connection in the HTTP connection pool.
- */
-static constexpr const char *kHttpConnectionState = "http.connection.state";
-
-/**
- * The size of the request payload body in bytes. This is the number of bytes transferred excluding
- * headers and is often, but not always, present as the <a
- * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
- * header. For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpRequestBodySize = "http.request.body.size";
-
-/**
- * HTTP request method.
- *
- * <p>Notes:
-  <ul> <li>HTTP request method value SHOULD be &quot;known&quot; to the instrumentation.
-By default, this convention defines &quot;known&quot; methods as the ones listed in <a
-href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>.</li><li>If the HTTP
-request method is not known to instrumentation, it MUST set the {@code http.request.method}
-attribute to {@code _OTHER}.</li><li>If the HTTP instrumentation could end up converting valid HTTP
-request methods to {@code _OTHER}, then it MUST provide a way to override the list of known HTTP
-methods. If this override is done via environment variable, then the environment variable MUST be
-named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list of case-sensitive
-known HTTP methods (this list MUST be a full override of the default known method, it is not a list
-of known methods in addition to the defaults).</li><li>HTTP method names are case-sensitive and
-{@code http.request.method} attribute value MUST match a known HTTP method name exactly.
-Instrumentations for specific web frameworks that consider HTTP methods to be case insensitive,
-SHOULD populate a canonical equivalent. Tracing instrumentations that do so, MUST also set {@code
-http.request.method_original} to the original value.</li> </ul>
- */
-static constexpr const char *kHttpRequestMethod = "http.request.method";
-
-/**
- * Original HTTP method sent by the client in the request line.
- */
-static constexpr const char *kHttpRequestMethodOriginal = "http.request.method_original";
-
-/**
- * The ordinal number of request resending attempt (for any reason, including redirects).
- *
- * <p>Notes:
-  <ul> <li>The resend count SHOULD be updated each time an HTTP request gets resent by the client,
- regardless of what was the cause of the resending (e.g. redirection, authorization failure, 503
- Server Unavailable, network issues, or any other).</li> </ul>
- */
-static constexpr const char *kHttpRequestResendCount = "http.request.resend_count";
-
-/**
- * The total size of the request in bytes. This should be the total number of bytes sent over the
- * wire, including the request line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and request
- * body if any.
- */
-static constexpr const char *kHttpRequestSize = "http.request.size";
-
-/**
- * The size of the response payload body in bytes. This is the number of bytes transferred excluding
- * headers and is often, but not always, present as the <a
- * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
- * header. For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpResponseBodySize = "http.response.body.size";
-
-/**
- * The total size of the response in bytes. This should be the total number of bytes sent over the
- * wire, including the status line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and response
- * body and trailers if any.
- */
-static constexpr const char *kHttpResponseSize = "http.response.size";
-
-/**
- * <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>.
- */
-static constexpr const char *kHttpResponseStatusCode = "http.response.status_code";
-
-/**
- * The matched route, that is, the path template in the format used by the respective server
-framework.
- *
- * <p>Notes:
-  <ul> <li>MUST NOT be populated when this is not supported by the HTTP server framework as the
-route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD include
-the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if there is
-one.</li> </ul>
- */
-static constexpr const char *kHttpRoute = "http.route";
-
-/**
- * Name of the buffer pool.
- *
- * <p>Notes:
-  <ul> <li>Pool names are generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/BufferPoolMXBean.html#getName()">BufferPoolMXBean#getName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmBufferPoolName = "jvm.buffer.pool.name";
-
-/**
- * Name of the garbage collector action.
- *
- * <p>Notes:
-  <ul> <li>Garbage collector action is generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcAction()">GarbageCollectionNotificationInfo#getGcAction()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmGcAction = "jvm.gc.action";
-
-/**
- * Name of the garbage collector.
- *
- * <p>Notes:
-  <ul> <li>Garbage collector name is generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcName()">GarbageCollectionNotificationInfo#getGcName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmGcName = "jvm.gc.name";
-
-/**
- * Name of the memory pool.
- *
- * <p>Notes:
-  <ul> <li>Pool names are generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmMemoryPoolName = "jvm.memory.pool.name";
-
-/**
- * The type of memory.
- */
-static constexpr const char *kJvmMemoryType = "jvm.memory.type";
-
-/**
- * Whether the thread is daemon or not.
- */
-static constexpr const char *kJvmThreadDaemon = "jvm.thread.daemon";
-
-/**
- * State of the thread.
- */
-static constexpr const char *kJvmThreadState = "jvm.thread.state";
-
-/**
- * The name of the cluster.
- */
-static constexpr const char *kK8sClusterName = "k8s.cluster.name";
-
-/**
- * A pseudo-ID for the cluster, set to the UID of the {@code kube-system} namespace.
- *
- * <p>Notes:
-  <ul> <li>K8s doesn't have support for obtaining a cluster ID. If this is ever
-added, we will recommend collecting the {@code k8s.cluster.uid} through the
-official APIs. In the meantime, we are able to use the {@code uid} of the
-{@code kube-system} namespace as a proxy for cluster ID. Read on for the
-rationale.</li><li>Every object created in a K8s cluster is assigned a distinct UID. The
-{@code kube-system} namespace is used by Kubernetes itself and will exist
-for the lifetime of the cluster. Using the {@code uid} of the {@code kube-system}
-namespace is a reasonable proxy for the K8s ClusterID as it will only
-change if the cluster is rebuilt. Furthermore, Kubernetes UIDs are
-UUIDs as standardized by
-<a href="https://www.itu.int/ITU-T/studygroups/com17/oid.html">ISO/IEC 9834-8 and ITU-T X.667</a>.
-Which states:</li><blockquote>
-<li>If generated according to one of the mechanisms defined in Rec.</li></blockquote>
-<li>ITU-T X.667 | ISO/IEC 9834-8, a UUID is either guaranteed to be
-  different from all other UUIDs generated before 3603 A.D., or is
-  extremely likely to be different (depending on the mechanism chosen).</li><li>Therefore, UIDs
-between clusters should be extremely unlikely to conflict.</li> </ul>
- */
-static constexpr const char *kK8sClusterUid = "k8s.cluster.uid";
-
-/**
- * The name of the Container from Pod specification, must be unique within a Pod. Container runtime
- * usually uses different globally unique name ({@code container.name}).
- */
-static constexpr const char *kK8sContainerName = "k8s.container.name";
-
-/**
- * Number of times the container was restarted. This attribute can be used to identify a particular
- * container (running or stopped) within a container spec.
- */
-static constexpr const char *kK8sContainerRestartCount = "k8s.container.restart_count";
-
-/**
- * Last terminated reason of the Container.
- */
-static constexpr const char *kK8sContainerStatusLastTerminatedReason =
-    "k8s.container.status.last_terminated_reason";
-
-/**
- * The name of the CronJob.
- */
-static constexpr const char *kK8sCronjobName = "k8s.cronjob.name";
-
-/**
- * The UID of the CronJob.
- */
-static constexpr const char *kK8sCronjobUid = "k8s.cronjob.uid";
-
-/**
- * The name of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetName = "k8s.daemonset.name";
-
-/**
- * The UID of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetUid = "k8s.daemonset.uid";
-
-/**
- * The name of the Deployment.
- */
-static constexpr const char *kK8sDeploymentName = "k8s.deployment.name";
-
-/**
- * The UID of the Deployment.
- */
-static constexpr const char *kK8sDeploymentUid = "k8s.deployment.uid";
-
-/**
- * The name of the Job.
- */
-static constexpr const char *kK8sJobName = "k8s.job.name";
-
-/**
- * The UID of the Job.
- */
-static constexpr const char *kK8sJobUid = "k8s.job.uid";
-
-/**
- * The name of the namespace that the pod is running in.
- */
-static constexpr const char *kK8sNamespaceName = "k8s.namespace.name";
-
-/**
- * The name of the Node.
- */
-static constexpr const char *kK8sNodeName = "k8s.node.name";
-
-/**
- * The UID of the Node.
- */
-static constexpr const char *kK8sNodeUid = "k8s.node.uid";
-
-/**
- * The name of the Pod.
- */
-static constexpr const char *kK8sPodName = "k8s.pod.name";
-
-/**
- * The UID of the Pod.
- */
-static constexpr const char *kK8sPodUid = "k8s.pod.uid";
-
-/**
- * The name of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetName = "k8s.replicaset.name";
-
-/**
- * The UID of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetUid = "k8s.replicaset.uid";
-
-/**
- * The name of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetName = "k8s.statefulset.name";
-
-/**
- * The UID of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetUid = "k8s.statefulset.uid";
-
-/**
- * The Linux Slab memory state
- */
-static constexpr const char *kLinuxMemorySlabState = "linux.memory.slab.state";
-
-/**
- * The stream associated with the log. See below for a list of well-known values.
- */
-static constexpr const char *kLogIostream = "log.iostream";
-
-/**
- * The basename of the file.
- */
-static constexpr const char *kLogFileName = "log.file.name";
-
-/**
- * The basename of the file, with symlinks resolved.
- */
-static constexpr const char *kLogFileNameResolved = "log.file.name_resolved";
-
-/**
- * The full path to the file.
- */
-static constexpr const char *kLogFilePath = "log.file.path";
-
-/**
- * The full path to the file, with symlinks resolved.
- */
-static constexpr const char *kLogFilePathResolved = "log.file.path_resolved";
-
-/**
- * The complete orignal Log Record.
- *
- * <p>Notes:
-  <ul> <li>This value MAY be added when processing a Log Record which was originally transmitted as
- a string or equivalent data type AND the Body field of the Log Record does not contain the same
- value. (e.g. a syslog or a log record read from a file.)</li> </ul>
- */
-static constexpr const char *kLogRecordOriginal = "log.record.original";
-
-/**
- * A unique identifier for the Log Record.
- *
- * <p>Notes:
-  <ul> <li>If an id is provided, other log records with the same id will be considered duplicates
-and can be removed safely. This means, that two distinguishable log records MUST have different
-values. The id MAY be an <a href="https://github.com/ulid/spec">Universally Unique Lexicographically
-Sortable Identifier (ULID)</a>, but other identifiers (e.g. UUID) may be used as needed.</li> </ul>
- */
-static constexpr const char *kLogRecordUid = "log.record.uid";
-
-/**
- * The number of messages sent, received, or processed in the scope of the batching operation.
- *
- * <p>Notes:
-  <ul> <li>Instrumentations SHOULD NOT set {@code messaging.batch.message_count} on spans that
- operate with a single message. When a messaging client library supports both batch and
- single-message API for the same operation, instrumentations SHOULD use {@code
- messaging.batch.message_count} for batching APIs and SHOULD NOT use it for single-message
- APIs.</li> </ul>
- */
-static constexpr const char *kMessagingBatchMessageCount = "messaging.batch.message_count";
-
-/**
- * A unique identifier for the client that consumes or produces a message.
- */
-static constexpr const char *kMessagingClientId = "messaging.client.id";
-
-/**
- * The name of the consumer group with which a consumer is associated.
- *
- * <p>Notes:
-  <ul> <li>Semantic conventions for individual messaging systems SHOULD document whether {@code
- messaging.consumer.group.name} is applicable and what it means in the context of that system.</li>
- </ul>
- */
-static constexpr const char *kMessagingConsumerGroupName = "messaging.consumer.group.name";
-
-/**
- * A boolean that is true if the message destination is anonymous (could be unnamed or have
- * auto-generated name).
- */
-static constexpr const char *kMessagingDestinationAnonymous = "messaging.destination.anonymous";
-
-/**
- * The message destination name
- *
- * <p>Notes:
-  <ul> <li>Destination name SHOULD uniquely identify a specific queue, topic or other entity within
-the broker. If the broker doesn't have such notion, the destination name SHOULD uniquely identify
-the broker.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationName = "messaging.destination.name";
-
-/**
- * The identifier of the partition messages are sent to or received from, unique within the {@code
- * messaging.destination.name}.
- */
-static constexpr const char *kMessagingDestinationPartitionId =
-    "messaging.destination.partition.id";
-
-/**
- * The name of the destination subscription from which a message is consumed.
- *
- * <p>Notes:
-  <ul> <li>Semantic conventions for individual messaging systems SHOULD document whether {@code
- messaging.destination.subscription.name} is applicable and what it means in the context of that
- system.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationSubscriptionName =
-    "messaging.destination.subscription.name";
-
-/**
- * Low cardinality representation of the messaging destination name
- *
- * <p>Notes:
-  <ul> <li>Destination names could be constructed from templates. An example would be a destination
- name involving a user name or product id. Although the destination name in this case is of high
- cardinality, the underlying template is of low cardinality and can be effectively used for grouping
- and aggregation.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationTemplate = "messaging.destination.template";
-
-/**
- * A boolean that is true if the message destination is temporary and might not exist anymore after
- * messages are processed.
- */
-static constexpr const char *kMessagingDestinationTemporary = "messaging.destination.temporary";
-
-/**
- * The size of the message body in bytes.
- *
- * <p>Notes:
-  <ul> <li>This can refer to both the compressed or uncompressed body size. If both sizes are known,
-the uncompressed body size should be used.</li> </ul>
- */
-static constexpr const char *kMessagingMessageBodySize = "messaging.message.body.size";
-
-/**
- * The conversation ID identifying the conversation to which the message belongs, represented as a
- * string. Sometimes called &quot;Correlation ID&quot;.
- */
-static constexpr const char *kMessagingMessageConversationId = "messaging.message.conversation_id";
-
-/**
- * The size of the message body and metadata in bytes.
- *
- * <p>Notes:
-  <ul> <li>This can refer to both the compressed or uncompressed size. If both sizes are known, the
-uncompressed size should be used.</li> </ul>
- */
-static constexpr const char *kMessagingMessageEnvelopeSize = "messaging.message.envelope.size";
-
-/**
- * A value used by the messaging system as an identifier for the message, represented as a string.
- */
-static constexpr const char *kMessagingMessageId = "messaging.message.id";
-
-/**
- * The system-specific name of the messaging operation.
- */
-static constexpr const char *kMessagingOperationName = "messaging.operation.name";
-
-/**
- * A string identifying the type of the messaging operation.
- *
- * <p>Notes:
-  <ul> <li>If a custom value is used, it MUST be of low cardinality.</li> </ul>
- */
-static constexpr const char *kMessagingOperationType = "messaging.operation.type";
-
-/**
- * The messaging system as identified by the client instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The actual messaging system may differ from the one known by the client. For example,
- when using Kafka client libraries to communicate with Azure Event Hubs, the {@code
- messaging.system} is set to {@code kafka} based on the instrumentation's best knowledge.</li> </ul>
- */
-static constexpr const char *kMessagingSystem = "messaging.system";
-
-/**
- * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the
- same partition. They differ from {@code messaging.message.id} in that they're not unique. If the
- key is {@code null}, the attribute MUST NOT be set.
- *
- * <p>Notes:
-  <ul> <li>If the key type is not string, it's string representation has to be supplied for the
- attribute. If the key has no unambiguous, canonical string form, don't include its value.</li>
- </ul>
- */
-static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.message.key";
-
-/**
- * A boolean that is true if the message is a tombstone.
- */
-static constexpr const char *kMessagingKafkaMessageTombstone = "messaging.kafka.message.tombstone";
-
-/**
- * The offset of a record in the corresponding Kafka partition.
- */
-static constexpr const char *kMessagingKafkaOffset = "messaging.kafka.offset";
-
-/**
- * RabbitMQ message routing key.
- */
-static constexpr const char *kMessagingRabbitmqDestinationRoutingKey =
-    "messaging.rabbitmq.destination.routing_key";
-
-/**
- * RabbitMQ message delivery tag
- */
-static constexpr const char *kMessagingRabbitmqMessageDeliveryTag =
-    "messaging.rabbitmq.message.delivery_tag";
-
-/**
- * Model of message consumption. This only applies to consumer spans.
- */
-static constexpr const char *kMessagingRocketmqConsumptionModel =
-    "messaging.rocketmq.consumption_model";
-
-/**
- * The delay time level for delay message, which determines the message delay time.
- */
-static constexpr const char *kMessagingRocketmqMessageDelayTimeLevel =
-    "messaging.rocketmq.message.delay_time_level";
-
-/**
- * The timestamp in milliseconds that the delay message is expected to be delivered to consumer.
- */
-static constexpr const char *kMessagingRocketmqMessageDeliveryTimestamp =
-    "messaging.rocketmq.message.delivery_timestamp";
-
-/**
- * It is essential for FIFO message. Messages that belong to the same message group are always
- * processed one by one within the same consumer group.
- */
-static constexpr const char *kMessagingRocketmqMessageGroup = "messaging.rocketmq.message.group";
-
-/**
- * Key(s) of message, another way to mark message besides message id.
- */
-static constexpr const char *kMessagingRocketmqMessageKeys = "messaging.rocketmq.message.keys";
-
-/**
- * The secondary classifier of message besides topic.
- */
-static constexpr const char *kMessagingRocketmqMessageTag = "messaging.rocketmq.message.tag";
-
-/**
- * Type of message.
- */
-static constexpr const char *kMessagingRocketmqMessageType = "messaging.rocketmq.message.type";
-
-/**
- * Namespace of RocketMQ resources, resources in different namespaces are individual.
- */
-static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.namespace";
-
-/**
- * The ack deadline in seconds set for the modify ack deadline request.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckDeadline =
-    "messaging.gcp_pubsub.message.ack_deadline";
-
-/**
- * The ack id for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckId =
-    "messaging.gcp_pubsub.message.ack_id";
-
-/**
- * The delivery attempt for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageDeliveryAttempt =
-    "messaging.gcp_pubsub.message.delivery_attempt";
-
-/**
- * The ordering key for a given message. If the attribute is not present, the message does not have
- * an ordering key.
- */
-static constexpr const char *kMessagingGcpPubsubMessageOrderingKey =
-    "messaging.gcp_pubsub.message.ordering_key";
-
-/**
- * Describes the <a
- * href="https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock">settlement
- * type</a>.
- */
-static constexpr const char *kMessagingServicebusDispositionStatus =
-    "messaging.servicebus.disposition_status";
-
-/**
- * Number of deliveries that have been attempted for this message.
- */
-static constexpr const char *kMessagingServicebusMessageDeliveryCount =
-    "messaging.servicebus.message.delivery_count";
-
-/**
- * The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingServicebusMessageEnqueuedTime =
-    "messaging.servicebus.message.enqueued_time";
-
-/**
- * The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingEventhubsMessageEnqueuedTime =
-    "messaging.eventhubs.message.enqueued_time";
-
-/**
- * The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network.
- */
-static constexpr const char *kNetworkCarrierIcc = "network.carrier.icc";
-
-/**
- * The mobile carrier country code.
- */
-static constexpr const char *kNetworkCarrierMcc = "network.carrier.mcc";
-
-/**
- * The mobile carrier network code.
- */
-static constexpr const char *kNetworkCarrierMnc = "network.carrier.mnc";
-
-/**
- * The name of the mobile carrier.
- */
-static constexpr const char *kNetworkCarrierName = "network.carrier.name";
-
-/**
- * This describes more details regarding the connection.type. It may be the type of cell technology
- * connection, but it could be used for describing details about a wifi connection.
- */
-static constexpr const char *kNetworkConnectionSubtype = "network.connection.subtype";
-
-/**
- * The internet connection type.
- */
-static constexpr const char *kNetworkConnectionType = "network.connection.type";
-
-/**
- * The network IO operation direction.
- */
-static constexpr const char *kNetworkIoDirection = "network.io.direction";
-
-/**
- * Local address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkLocalAddress = "network.local.address";
-
-/**
- * Local port number of the network connection.
- */
-static constexpr const char *kNetworkLocalPort = "network.local.port";
-
-/**
- * Peer address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkPeerAddress = "network.peer.address";
-
-/**
- * Peer port number of the network connection.
- */
-static constexpr const char *kNetworkPeerPort = "network.peer.port";
-
-/**
- * <a href="https://osi-model.com/application-layer/">OSI application layer</a> or non-OSI
- equivalent.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li> </ul>
- */
-static constexpr const char *kNetworkProtocolName = "network.protocol.name";
-
-/**
- * The actual version of the protocol used for network communication.
- *
- * <p>Notes:
-  <ul> <li>If protocol version is subject to negotiation (for example using <a
- href="https://www.rfc-editor.org/rfc/rfc7301.html">ALPN</a>), this attribute SHOULD be set to the
- negotiated version. If the actual protocol version is not known, this attribute SHOULD NOT be
- set.</li> </ul>
- */
-static constexpr const char *kNetworkProtocolVersion = "network.protocol.version";
-
-/**
- * <a href="https://osi-model.com/transport-layer/">OSI transport layer</a> or <a
-href="https://wikipedia.org/wiki/Inter-process_communication">inter-process communication
-method</a>.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li><li>Consider always setting the
-transport when setting a port number, since a port number is ambiguous without knowing the
-transport. For example different processes could be listening on TCP port 12345 and UDP port
-12345.</li> </ul>
- */
-static constexpr const char *kNetworkTransport = "network.transport";
-
-/**
- * <a href="https://osi-model.com/network-layer/">OSI network layer</a> or non-OSI equivalent.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li> </ul>
- */
-static constexpr const char *kNetworkType = "network.type";
-
-/**
- * The digest of the OCI image manifest. For container images specifically is the digest by which
-the container image is known.
- *
- * <p>Notes:
-  <ul> <li>Follows <a href="https://github.com/opencontainers/image-spec/blob/main/manifest.md">OCI
-Image Manifest Specification</a>, and specifically the <a
-href="https://github.com/opencontainers/image-spec/blob/main/descriptor.md#digests">Digest
-property</a>. An example can be found in <a
-href="https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest">Example Image
-Manifest</a>.</li> </ul>
- */
-static constexpr const char *kOciManifestDigest = "oci.manifest.digest";
-
-/**
- * Parent-child Reference type
- *
- * <p>Notes:
-  <ul> <li>The causal relationship between a child Span and a parent Span.</li> </ul>
- */
-static constexpr const char *kOpentracingRefType = "opentracing.ref_type";
-
-/**
- * Unique identifier for a particular build or compilation of the operating system.
- */
-static constexpr const char *kOsBuildId = "os.build_id";
-
-/**
- * Human readable (not intended to be parsed) OS version information, like e.g. reported by {@code
- * ver} or {@code lsb_release -a} commands.
- */
-static constexpr const char *kOsDescription = "os.description";
-
-/**
- * Human readable operating system name.
- */
-static constexpr const char *kOsName = "os.name";
-
-/**
- * The operating system type.
- */
-static constexpr const char *kOsType = "os.type";
-
-/**
- * The version string of the operating system as defined in <a
- * href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kOsVersion = "os.version";
-
-/**
- * Name of the code, either &quot;OK&quot; or &quot;ERROR&quot;. MUST NOT be set if the status code
- * is UNSET.
- */
-static constexpr const char *kOtelStatusCode = "otel.status_code";
-
-/**
- * Description of the Status if it has a value, otherwise not set.
- */
-static constexpr const char *kOtelStatusDescription = "otel.status_description";
-
-/**
- * The name of the instrumentation scope - ({@code InstrumentationScope.Name} in OTLP).
- */
-static constexpr const char *kOtelScopeName = "otel.scope.name";
-
-/**
- * The version of the instrumentation scope - ({@code InstrumentationScope.Version} in OTLP).
- */
-static constexpr const char *kOtelScopeVersion = "otel.scope.version";
-
-/**
- * The <a href="/docs/resource/README.md#service">{@code service.name}</a> of the remote service.
- * SHOULD be equal to the actual {@code service.name} resource attribute of the remote service if
- * any.
- */
-static constexpr const char *kPeerService = "peer.service";
-
-/**
- * The command used to launch the process (i.e. the command name). On Linux based systems, can be
- * set to the zeroth string in {@code proc/[pid]/cmdline}. On Windows, can be set to the first
- * parameter extracted from {@code GetCommandLineW}.
- */
-static constexpr const char *kProcessCommand = "process.command";
-
-/**
- * All the command arguments (including the command/executable itself) as received by the process.
- * On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according
- * to the list of null-delimited strings extracted from {@code proc/[pid]/cmdline}. For libc-based
- * executables, this would be the full argv vector passed to {@code main}.
- */
-static constexpr const char *kProcessCommandArgs = "process.command_args";
-
-/**
- * The full command used to launch the process as a single string representing the full command. On
- * Windows, can be set to the result of {@code GetCommandLineW}. Do not set this if you have to
- * assemble it just for monitoring; use {@code process.command_args} instead.
- */
-static constexpr const char *kProcessCommandLine = "process.command_line";
-
-/**
- * Specifies whether the context switches for this data point were voluntary or involuntary.
- */
-static constexpr const char *kProcessContextSwitchType = "process.context_switch_type";
-
-/**
- * The date and time the process was created, in ISO 8601 format.
- */
-static constexpr const char *kProcessCreationTime = "process.creation.time";
-
-/**
- * The name of the process executable. On Linux based systems, can be set to the {@code Name} in
- * {@code proc/[pid]/status}. On Windows, can be set to the base name of {@code
- * GetProcessImageFileNameW}.
- */
-static constexpr const char *kProcessExecutableName = "process.executable.name";
-
-/**
- * The full path to the process executable. On Linux based systems, can be set to the target of
- * {@code proc/[pid]/exe}. On Windows, can be set to the result of {@code GetProcessImageFileNameW}.
- */
-static constexpr const char *kProcessExecutablePath = "process.executable.path";
-
-/**
- * The exit code of the process.
- */
-static constexpr const char *kProcessExitCode = "process.exit.code";
-
-/**
- * The date and time the process exited, in ISO 8601 format.
- */
-static constexpr const char *kProcessExitTime = "process.exit.time";
-
-/**
- * The PID of the process's group leader. This is also the process group ID (PGID) of the process.
- */
-static constexpr const char *kProcessGroupLeaderPid = "process.group_leader.pid";
-
-/**
- * Whether the process is connected to an interactive shell.
- */
-static constexpr const char *kProcessInteractive = "process.interactive";
-
-/**
- * The username of the user that owns the process.
- */
-static constexpr const char *kProcessOwner = "process.owner";
-
-/**
- * The type of page fault for this data point. Type {@code major} is for major/hard page faults, and
- * {@code minor} is for minor/soft page faults.
- */
-static constexpr const char *kProcessPagingFaultType = "process.paging.fault_type";
-
-/**
- * Parent Process identifier (PPID).
- */
-static constexpr const char *kProcessParentPid = "process.parent_pid";
-
-/**
- * Process identifier (PID).
- */
-static constexpr const char *kProcessPid = "process.pid";
-
-/**
- * The real user ID (RUID) of the process.
- */
-static constexpr const char *kProcessRealUserId = "process.real_user.id";
-
-/**
- * The username of the real user of the process.
- */
-static constexpr const char *kProcessRealUserName = "process.real_user.name";
-
-/**
- * An additional description about the runtime of the process, for example a specific vendor
- * customization of the runtime environment.
- */
-static constexpr const char *kProcessRuntimeDescription = "process.runtime.description";
-
-/**
- * The name of the runtime of this process.
- */
-static constexpr const char *kProcessRuntimeName = "process.runtime.name";
-
-/**
- * The version of the runtime of this process, as returned by the runtime without modification.
- */
-static constexpr const char *kProcessRuntimeVersion = "process.runtime.version";
-
-/**
- * The saved user ID (SUID) of the process.
- */
-static constexpr const char *kProcessSavedUserId = "process.saved_user.id";
-
-/**
- * The username of the saved user.
- */
-static constexpr const char *kProcessSavedUserName = "process.saved_user.name";
-
-/**
- * The PID of the process's session leader. This is also the session ID (SID) of the process.
- */
-static constexpr const char *kProcessSessionLeaderPid = "process.session_leader.pid";
-
-/**
- * The effective user ID (EUID) of the process.
- */
-static constexpr const char *kProcessUserId = "process.user.id";
-
-/**
- * The username of the effective user of the process.
- */
-static constexpr const char *kProcessUserName = "process.user.name";
-
-/**
- * Virtual process identifier.
- *
- * <p>Notes:
-  <ul> <li>The process ID within a PID namespace. This is not necessarily unique across all
- processes on the host but it is unique within the process namespace that the process exists
- within.</li> </ul>
- */
-static constexpr const char *kProcessVpid = "process.vpid";
-
-/**
- * The <a href="https://connect.build/docs/protocol/#error-codes">error codes</a> of the Connect
- * request. Error codes are always string values.
- */
-static constexpr const char *kRpcConnectRpcErrorCode = "rpc.connect_rpc.error_code";
-
-/**
- * The <a href="https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md">numeric status
- * code</a> of the gRPC request.
- */
-static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
-
-/**
- * {@code error.code} property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
-
-/**
- * {@code error.message} property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
-
-/**
- * {@code id} property of request or response. Since protocol allows id to be int, string, {@code
- * null} or missing (for notifications), value is expected to be cast to string for simplicity. Use
- * empty string in case of {@code null} value. Omit entirely if this is a notification.
- */
-static constexpr const char *kRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
-
-/**
- * Protocol version as in {@code jsonrpc} property of request/response. Since JSON-RPC 1.0 doesn't
- * specify this, the value can be omitted.
- */
-static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
-
-/**
- * Compressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageCompressedSize = "rpc.message.compressed_size";
-
-/**
- * MUST be calculated as two different counters starting from {@code 1} one for sent messages and
- one for received message.
- *
- * <p>Notes:
-  <ul> <li>This way we guarantee that the values will be consistent between different
- implementations.</li> </ul>
- */
-static constexpr const char *kRpcMessageId = "rpc.message.id";
-
-/**
- * Whether this is a received or sent message.
- */
-static constexpr const char *kRpcMessageType = "rpc.message.type";
-
-/**
- * Uncompressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageUncompressedSize = "rpc.message.uncompressed_size";
-
-/**
- * The name of the (logical) method being called, must be equal to the $method part in the span
- name.
- *
- * <p>Notes:
-  <ul> <li>This is the logical name of the method from the RPC interface perspective, which can be
- different from the name of any implementing method/function. The {@code code.function} attribute
- may be used to store the latter (e.g., method actually executing the call on the server side, RPC
- client stub method on the client side).</li> </ul>
- */
-static constexpr const char *kRpcMethod = "rpc.method";
-
-/**
- * The full (logical) name of the service being called, including its package name, if applicable.
- *
- * <p>Notes:
-  <ul> <li>This is the logical name of the service from the RPC interface perspective, which can be
- different from the name of any implementing class. The {@code code.namespace} attribute may be used
- to store the latter (despite the attribute name, it may include a class name; e.g., class with
- method actually executing the call on the server side, RPC client stub class on the client
- side).</li> </ul>
- */
-static constexpr const char *kRpcService = "rpc.service";
-
-/**
- * A string identifying the remoting system. See below for a list of well-known identifiers.
- */
-static constexpr const char *kRpcSystem = "rpc.system";
-
-/**
- * Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain
- socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the client side, and when communicating through an intermediary,
- {@code server.address} SHOULD represent the server address behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kServerAddress = "server.address";
-
-/**
- * Server port number.
- *
- * <p>Notes:
-  <ul> <li>When observed from the client side, and when communicating through an intermediary,
- {@code server.port} SHOULD represent the server port behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kServerPort = "server.port";
-
-/**
- * The string ID of the service instance.
- *
- * <p>Notes:
-  <ul> <li>MUST be unique for each instance of the same {@code service.namespace,service.name} pair
-(in other words
-{@code service.namespace,service.name,service.instance.id} triplet MUST be globally unique). The ID
-helps to distinguish instances of the same service that exist at the same time (e.g. instances of a
-horizontally scaled service).</li><li>Implementations, such as SDKs, are recommended to generate a
-random Version 1 or Version 4 <a href="https://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a> UUID, but
-are free to use an inherent unique ID as the source of this value if stability is desirable. In that
-case, the ID SHOULD be used as source of a UUID Version 5 and SHOULD use the following UUID as the
-namespace: {@code 4d63009a-8d0f-11ee-aad7-4c796ed8e320}.</li><li>UUIDs are typically recommended, as
-only an opaque value for the purposes of identifying a service instance is needed. Similar to what
-can be seen in the man page for the <a
-href="https://www.freedesktop.org/software/systemd/man/machine-id.html">{@code /etc/machine-id}</a>
-file, the underlying data, such as pod name and namespace should be treated as confidential, being
-the user's choice to expose it or not via another resource attribute.</li><li>For applications
-running behind an application server (like unicorn), we do not recommend using one identifier for
-all processes participating in the application. Instead, it's recommended each division (e.g. a
-worker thread in unicorn) to have its own instance.id.</li><li>It's not recommended for a Collector
-to set {@code service.instance.id} if it can't unambiguously determine the service instance that is
-generating that telemetry. For instance, creating an UUID based on {@code pod.name} will likely be
-wrong, as the Collector might not know from which container within that pod the telemetry
-originated. However, Collectors can set the {@code service.instance.id} if they can unambiguously
-determine the service instance for that telemetry. This is typically the case for scraping
-receivers, as they know the target address and port.</li> </ul>
- */
-static constexpr const char *kServiceInstanceId = "service.instance.id";
-
-/**
- * Logical name of the service.
- *
- * <p>Notes:
-  <ul> <li>MUST be the same for all instances of horizontally scaled services. If the value was not
- specified, SDKs MUST fallback to {@code unknown_service:} concatenated with <a
- href="process.md">{@code process.executable.name}</a>, e.g. {@code unknown_service:bash}. If {@code
- process.executable.name} is not available, the value MUST be set to {@code unknown_service}.</li>
- </ul>
- */
-static constexpr const char *kServiceName = "service.name";
-
-/**
- * A namespace for {@code service.name}.
- *
- * <p>Notes:
-  <ul> <li>A string value having a meaning that helps to distinguish a group of services, for
- example the team name that owns a group of services. {@code service.name} is expected to be unique
- within the same namespace. If {@code service.namespace} is not specified in the Resource then
- {@code service.name} is expected to be unique for all services that have no explicit namespace
- defined (so the empty/unspecified namespace is simply one more valid namespace). Zero-length
- namespace string is assumed equal to unspecified namespace.</li> </ul>
- */
-static constexpr const char *kServiceNamespace = "service.namespace";
-
-/**
- * The version string of the service API or implementation. The format is not defined by these
- * conventions.
- */
-static constexpr const char *kServiceVersion = "service.version";
-
-/**
- * A unique id to identify a session.
- */
-static constexpr const char *kSessionId = "session.id";
-
-/**
- * The previous {@code session.id} for this user, when known.
- */
-static constexpr const char *kSessionPreviousId = "session.previous_id";
-
-/**
- * SignalR HTTP connection closure status.
- */
-static constexpr const char *kSignalrConnectionStatus = "signalr.connection.status";
-
-/**
- * <a
- * href="https://github.com/dotnet/aspnetcore/blob/main/src/SignalR/docs/specs/TransportProtocols.md">SignalR
- * transport type</a>
- */
-static constexpr const char *kSignalrTransport = "signalr.transport";
-
-/**
- * Source address - domain name if available without reverse DNS lookup; otherwise, IP address or
- Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the destination side, and when communicating through an intermediary,
- {@code source.address} SHOULD represent the source address behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kSourceAddress = "source.address";
-
-/**
- * Source port number
- */
-static constexpr const char *kSourcePort = "source.port";
-
-/**
- * The device identifier
- */
-static constexpr const char *kSystemDevice = "system.device";
-
-/**
- * The logical CPU number [0..n-1]
- */
-static constexpr const char *kSystemCpuLogicalNumber = "system.cpu.logical_number";
-
-/**
- * The memory state
- */
-static constexpr const char *kSystemMemoryState = "system.memory.state";
-
-/**
- * The paging access direction
- */
-static constexpr const char *kSystemPagingDirection = "system.paging.direction";
-
-/**
- * The memory paging state
- */
-static constexpr const char *kSystemPagingState = "system.paging.state";
-
-/**
- * The memory paging type
- */
-static constexpr const char *kSystemPagingType = "system.paging.type";
-
-/**
- * The filesystem mode
- */
-static constexpr const char *kSystemFilesystemMode = "system.filesystem.mode";
-
-/**
- * The filesystem mount path
- */
-static constexpr const char *kSystemFilesystemMountpoint = "system.filesystem.mountpoint";
-
-/**
- * The filesystem state
- */
-static constexpr const char *kSystemFilesystemState = "system.filesystem.state";
-
-/**
- * The filesystem type
- */
-static constexpr const char *kSystemFilesystemType = "system.filesystem.type";
-
-/**
- * A stateless protocol MUST NOT set this attribute
- */
-static constexpr const char *kSystemNetworkState = "system.network.state";
-
-/**
- * The process state, e.g., <a
- * href="https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES">Linux Process State
- * Codes</a>
- */
-static constexpr const char *kSystemProcessStatus = "system.process.status";
-
-/**
- * The language of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
-
-/**
- * The name of the telemetry SDK as defined above.
- *
- * <p>Notes:
-  <ul> <li>The OpenTelemetry SDK MUST set the {@code telemetry.sdk.name} attribute to {@code
-opentelemetry}. If another SDK, like a fork or a vendor-provided implementation, is used, this SDK
-MUST set the
-{@code telemetry.sdk.name} attribute to the fully-qualified class or module name of this SDK's main
-entry point or another suitable identifier depending on the language. The identifier {@code
-opentelemetry} is reserved and MUST NOT be used in this case. All custom identifiers SHOULD be
-stable across different versions of an implementation.</li> </ul>
- */
-static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
-
-/**
- * The version string of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
-
-/**
- * The name of the auto instrumentation agent or distribution, if used.
- *
- * <p>Notes:
-  <ul> <li>Official auto instrumentation agents and distributions SHOULD set the {@code
-telemetry.distro.name} attribute to a string starting with {@code opentelemetry-}, e.g. {@code
-opentelemetry-java-instrumentation}.</li> </ul>
- */
-static constexpr const char *kTelemetryDistroName = "telemetry.distro.name";
-
-/**
- * The version string of the auto instrumentation agent or distribution, if used.
- */
-static constexpr const char *kTelemetryDistroVersion = "telemetry.distro.version";
-
-/**
- * The fully qualified human readable name of the <a
- * href="https://en.wikipedia.org/wiki/Test_case">test case</a>.
- */
-static constexpr const char *kTestCaseName = "test.case.name";
-
-/**
- * The status of the actual test case result from test execution.
- */
-static constexpr const char *kTestCaseResultStatus = "test.case.result.status";
-
-/**
- * The human readable name of a <a href="https://en.wikipedia.org/wiki/Test_suite">test suite</a>.
- */
-static constexpr const char *kTestSuiteName = "test.suite.name";
-
-/**
- * The status of the test suite run.
- */
-static constexpr const char *kTestSuiteRunStatus = "test.suite.run.status";
-
-/**
- * Current &quot;managed&quot; thread ID (as opposed to OS thread ID).
- */
-static constexpr const char *kThreadId = "thread.id";
-
-/**
- * Current thread name.
- */
-static constexpr const char *kThreadName = "thread.name";
-
-/**
- * String indicating the <a
- href="https://datatracker.ietf.org/doc/html/rfc5246#appendix-A.5">cipher</a> used during the
- current connection.
- *
- * <p>Notes:
-  <ul> <li>The values allowed for {@code tls.cipher} MUST be one of the {@code Descriptions} of the
- <a
- href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#table-tls-parameters-4">registered
- TLS Cipher Suits</a>.</li> </ul>
- */
-static constexpr const char *kTlsCipher = "tls.cipher";
-
-/**
- * PEM-encoded stand-alone certificate offered by the client. This is usually mutually-exclusive of
- * {@code client.certificate_chain} since this value also exists in that list.
- */
-static constexpr const char *kTlsClientCertificate = "tls.client.certificate";
-
-/**
- * Array of PEM-encoded certificates that make up the certificate chain offered by the client. This
- * is usually mutually-exclusive of {@code client.certificate} since that value should be the first
- * certificate in the chain.
- */
-static constexpr const char *kTlsClientCertificateChain = "tls.client.certificate_chain";
-
-/**
- * Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
- * client. For consistency with other hash values, this value should be formatted as an uppercase
- * hash.
- */
-static constexpr const char *kTlsClientHashMd5 = "tls.client.hash.md5";
-
-/**
- * Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by
- * the client. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsClientHashSha1 = "tls.client.hash.sha1";
-
-/**
- * Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
- * the client. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsClientHashSha256 = "tls.client.hash.sha256";
-
-/**
- * Distinguished name of <a
- * href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
- * the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientIssuer = "tls.client.issuer";
-
-/**
- * A hash that identifies clients based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsClientJa3 = "tls.client.ja3";
-
-/**
- * Date/Time indicating when client certificate is no longer considered valid.
- */
-static constexpr const char *kTlsClientNotAfter = "tls.client.not_after";
-
-/**
- * Date/Time indicating when client certificate is first considered valid.
- */
-static constexpr const char *kTlsClientNotBefore = "tls.client.not_before";
-
-/**
- * Distinguished name of subject of the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientSubject = "tls.client.subject";
-
-/**
- * Array of ciphers offered by the client during the client hello.
- */
-static constexpr const char *kTlsClientSupportedCiphers = "tls.client.supported_ciphers";
-
-/**
- * String indicating the curve used for the given cipher, when applicable
- */
-static constexpr const char *kTlsCurve = "tls.curve";
-
-/**
- * Boolean flag indicating if the TLS negotiation was successful and transitioned to an encrypted
- * tunnel.
- */
-static constexpr const char *kTlsEstablished = "tls.established";
-
-/**
- * String indicating the protocol being tunneled. Per the values in the <a
- * href="https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids">IANA
- * registry</a>, this string should be lower case.
- */
-static constexpr const char *kTlsNextProtocol = "tls.next_protocol";
-
-/**
- * Normalized lowercase protocol name parsed from original string of the negotiated <a
- * href="https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES">SSL/TLS
- * protocol version</a>
- */
-static constexpr const char *kTlsProtocolName = "tls.protocol.name";
-
-/**
- * Numeric part of the version parsed from the original string of the negotiated <a
- * href="https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES">SSL/TLS
- * protocol version</a>
- */
-static constexpr const char *kTlsProtocolVersion = "tls.protocol.version";
-
-/**
- * Boolean flag indicating if this TLS connection was resumed from an existing TLS negotiation.
- */
-static constexpr const char *kTlsResumed = "tls.resumed";
-
-/**
- * PEM-encoded stand-alone certificate offered by the server. This is usually mutually-exclusive of
- * {@code server.certificate_chain} since this value also exists in that list.
- */
-static constexpr const char *kTlsServerCertificate = "tls.server.certificate";
-
-/**
- * Array of PEM-encoded certificates that make up the certificate chain offered by the server. This
- * is usually mutually-exclusive of {@code server.certificate} since that value should be the first
- * certificate in the chain.
- */
-static constexpr const char *kTlsServerCertificateChain = "tls.server.certificate_chain";
-
-/**
- * Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
- * server. For consistency with other hash values, this value should be formatted as an uppercase
- * hash.
- */
-static constexpr const char *kTlsServerHashMd5 = "tls.server.hash.md5";
-
-/**
- * Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by
- * the server. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsServerHashSha1 = "tls.server.hash.sha1";
-
-/**
- * Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
- * the server. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsServerHashSha256 = "tls.server.hash.sha256";
-
-/**
- * Distinguished name of <a
- * href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
- * the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsServerIssuer = "tls.server.issuer";
-
-/**
- * A hash that identifies servers based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsServerJa3s = "tls.server.ja3s";
-
-/**
- * Date/Time indicating when server certificate is no longer considered valid.
- */
-static constexpr const char *kTlsServerNotAfter = "tls.server.not_after";
-
-/**
- * Date/Time indicating when server certificate is first considered valid.
- */
-static constexpr const char *kTlsServerNotBefore = "tls.server.not_before";
-
-/**
- * Distinguished name of subject of the x.509 certificate presented by the server.
- */
-static constexpr const char *kTlsServerSubject = "tls.server.subject";
-
-/**
- * Domain extracted from the {@code url.full}, such as &quot;opentelemetry.io&quot;.
- *
- * <p>Notes:
-  <ul> <li>In some cases a URL may refer to an IP and/or port directly, without a domain name. In
- this case, the IP address would go to the domain field. If the URL contains a <a
- href="https://www.rfc-editor.org/rfc/rfc2732#section-2">literal IPv6 address</a> enclosed by {@code
- [} and {@code ]}, the {@code [} and {@code ]} characters should also be captured in the domain
- field.</li> </ul>
- */
-static constexpr const char *kUrlDomain = "url.domain";
-
-/**
- * The file extension extracted from the {@code url.full}, excluding the leading dot.
- *
- * <p>Notes:
-  <ul> <li>The file extension is only set if it exists, as not every url has a file extension. When
- the file name has multiple extensions {@code example.tar.gz}, only the last one should be captured
- {@code gz}, not {@code tar.gz}.</li> </ul>
- */
-static constexpr const char *kUrlExtension = "url.extension";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component
- */
-static constexpr const char *kUrlFragment = "url.fragment";
-
-/**
- * Absolute URL describing a network resource according to <a
-href="https://www.rfc-editor.org/rfc/rfc3986">RFC3986</a>
- *
- * <p>Notes:
-  <ul> <li>For network calls, URL usually has {@code scheme://host[:port][path][?query][#fragment]}
-format, where the fragment is not transmitted over HTTP, but if it is known, it SHOULD be included
-nevertheless.
-{@code url.full} MUST NOT contain credentials passed via URL in form of {@code
-https://username:password@www.example.com/}. In such case username and password SHOULD be redacted
-and attribute's value SHOULD be {@code https://REDACTED:REDACTED@www.example.com/}.
-{@code url.full} SHOULD capture the absolute URL when it is available (or can be reconstructed).
-Sensitive content provided in {@code url.full} SHOULD be scrubbed when instrumentations can identify
-it.</li> </ul>
- */
-static constexpr const char *kUrlFull = "url.full";
-
-/**
- * Unmodified original URL as seen in the event source.
- *
- * <p>Notes:
-  <ul> <li>In network monitoring, the observed URL may be a full URL, whereas in access logs, the
-URL is often just represented as a path. This field is meant to represent the URL as it was
-observed, complete or not.
-{@code url.original} might contain credentials passed via URL in form of {@code
-https://username:password@www.example.com/}. In such case password and username SHOULD NOT be
-redacted and attribute's value SHOULD remain the same.</li> </ul>
- */
-static constexpr const char *kUrlOriginal = "url.original";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.3">URI path</a> component
- *
- * <p>Notes:
-  <ul> <li>Sensitive content provided in {@code url.path} SHOULD be scrubbed when instrumentations
- can identify it.</li> </ul>
- */
-static constexpr const char *kUrlPath = "url.path";
-
-/**
- * Port extracted from the {@code url.full}
- */
-static constexpr const char *kUrlPort = "url.port";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.4">URI query</a> component
- *
- * <p>Notes:
-  <ul> <li>Sensitive content provided in {@code url.query} SHOULD be scrubbed when instrumentations
- can identify it.</li> </ul>
- */
-static constexpr const char *kUrlQuery = "url.query";
-
-/**
- * The highest registered url domain, stripped of the subdomain.
- *
- * <p>Notes:
-  <ul> <li>This value can be determined precisely with the <a href="http://publicsuffix.org">public
- suffix list</a>. For example, the registered domain for {@code foo.example.com} is {@code
- example.com}. Trying to approximate this by simply taking the last two labels will not work well
- for TLDs such as {@code co.uk}.</li> </ul>
- */
-static constexpr const char *kUrlRegisteredDomain = "url.registered_domain";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
- * identifying the used protocol.
- */
-static constexpr const char *kUrlScheme = "url.scheme";
-
-/**
- * The subdomain portion of a fully qualified domain name includes all of the names except the host
- name under the registered_domain. In a partially qualified domain, or if the qualification level of
- the full name cannot be determined, subdomain contains all of the names below the registered
- domain.
- *
- * <p>Notes:
-  <ul> <li>The subdomain portion of {@code www.east.mydomain.co.uk} is {@code east}. If the domain
- has multiple levels of subdomain, such as {@code sub2.sub1.example.com}, the subdomain field should
- contain {@code sub2.sub1}, with no trailing period.</li> </ul>
- */
-static constexpr const char *kUrlSubdomain = "url.subdomain";
-
-/**
- * The low-cardinality template of an <a
- * href="https://www.rfc-editor.org/rfc/rfc3986#section-4.2">absolute path reference</a>.
- */
-static constexpr const char *kUrlTemplate = "url.template";
-
-/**
- * The effective top level domain (eTLD), also known as the domain suffix, is the last part of the
- domain name. For example, the top level domain for example.com is {@code com}.
- *
- * <p>Notes:
-  <ul> <li>This value can be determined precisely with the <a href="http://publicsuffix.org">public
- suffix list</a>.</li> </ul>
- */
-static constexpr const char *kUrlTopLevelDomain = "url.top_level_domain";
-
-/**
- * Name of the user-agent extracted from original. Usually refers to the browser's name.
- *
- * <p>Notes:
-  <ul> <li><a href="https://www.whatsmyua.info">Example</a> of extracting browser's name from
- original string. In the case of using a user-agent for non-browser products, such as microservices
- with multiple names/versions inside the {@code user_agent.original}, the most significant name
- SHOULD be selected. In such a scenario it should align with {@code user_agent.version}</li> </ul>
- */
-static constexpr const char *kUserAgentName = "user_agent.name";
-
-/**
- * Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
- * User-Agent</a> header sent by the client.
- */
-static constexpr const char *kUserAgentOriginal = "user_agent.original";
-
-/**
- * Version of the user-agent extracted from original. Usually refers to the browser's version
- *
- * <p>Notes:
-  <ul> <li><a href="https://www.whatsmyua.info">Example</a> of extracting browser's version from
- original string. In the case of using a user-agent for non-browser products, such as microservices
- with multiple names/versions inside the {@code user_agent.original}, the most significant version
- SHOULD be selected. In such a scenario it should align with {@code user_agent.name}</li> </ul>
- */
-static constexpr const char *kUserAgentVersion = "user_agent.version";
-
-/**
- * User email address.
- */
-static constexpr const char *kUserEmail = "user.email";
-
-/**
- * User's full name
- */
-static constexpr const char *kUserFullName = "user.full_name";
-
-/**
- * Unique user hash to correlate information for a user in anonymized form.
- *
- * <p>Notes:
-  <ul> <li>Useful if {@code user.id} or {@code user.name} contain confidential information and
- cannot be used.</li> </ul>
- */
-static constexpr const char *kUserHash = "user.hash";
-
-/**
- * Unique identifier of the user.
- */
-static constexpr const char *kUserId = "user.id";
-
-/**
- * Short name or login/username of the user.
- */
-static constexpr const char *kUserName = "user.name";
-
-/**
- * Array of user roles at the time of the event.
- */
-static constexpr const char *kUserRoles = "user.roles";
-
-/**
- * The type of garbage collection.
- */
-static constexpr const char *kV8jsGcType = "v8js.gc.type";
-
-/**
- * The name of the space type of heap memory.
- *
- * <p>Notes:
-  <ul> <li>Value can be retrieved from value {@code space_name} of <a
- href="https://nodejs.org/api/v8.html#v8getheapspacestatistics">{@code
- v8.getHeapSpaceStatistics()}</a></li> </ul>
- */
-static constexpr const char *kV8jsHeapSpaceName = "v8js.heap.space.name";
-
-/**
- * The ID of the change (pull request/merge request) if applicable. This is usually a unique (within
- * repository) identifier generated by the VCS system.
- */
-static constexpr const char *kVcsRepositoryChangeId = "vcs.repository.change.id";
-
-/**
- * The human readable title of the change (pull request/merge request). This title is often a brief
- * summary of the change and may get merged in to a ref as the commit summary.
- */
-static constexpr const char *kVcsRepositoryChangeTitle = "vcs.repository.change.title";
-
-/**
- * The name of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> such as
- * <strong>branch</strong> or <strong>tag</strong> in the repository.
- */
-static constexpr const char *kVcsRepositoryRefName = "vcs.repository.ref.name";
-
-/**
- * The revision, literally <a href="https://www.merriam-webster.com/dictionary/revision">revised
-version</a>, The revision most often refers to a commit object in Git, or a revision number in SVN.
- *
- * <p>Notes:
-  <ul> <li>The revision can be a full <a
-href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see glossary)</a>, of
-the recorded change to a ref within a repository pointing to a commit <a
-href="https://git-scm.com/docs/git-commit">commit</a> object. It does not necessarily have to be a
-hash; it can simply define a <a
-href="https://svnbook.red-bean.com/en/1.7/svn.tour.revs.specifiers.html">revision number</a> which
-is an integer that is monotonically increasing. In cases where it is identical to the {@code
-ref.name}, it SHOULD still be included. It is up to the implementer to decide which value to set as
-the revision based on the VCS system and situational context.</li> </ul>
- */
-static constexpr const char *kVcsRepositoryRefRevision = "vcs.repository.ref.revision";
-
-/**
- * The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
- * repository.
- */
-static constexpr const char *kVcsRepositoryRefType = "vcs.repository.ref.type";
-
-/**
- * The <a href="https://en.wikipedia.org/wiki/URL">URL</a> of the repository providing the complete
- * address in order to locate and identify the repository.
- */
-static constexpr const char *kVcsRepositoryUrlFull = "vcs.repository.url.full";
-
-/**
- * Additional description of the web engine (e.g. detailed version and edition information).
- */
-static constexpr const char *kWebengineDescription = "webengine.description";
-
-/**
- * The name of the web engine.
- */
-static constexpr const char *kWebengineName = "webengine.name";
-
-/**
- * The version of the web engine.
- */
-static constexpr const char *kWebengineVersion = "webengine.version";
-
-// Enum definitions
-namespace AspnetcoreRateLimitingResultValues
-{
-/** Lease was acquired. */
-static constexpr const char *kAcquired = "acquired";
-/** Lease request was rejected by the endpoint limiter. */
-static constexpr const char *kEndpointLimiter = "endpoint_limiter";
-/** Lease request was rejected by the global limiter. */
-static constexpr const char *kGlobalLimiter = "global_limiter";
-/** Lease request was canceled. */
-static constexpr const char *kRequestCanceled = "request_canceled";
-}  // namespace AspnetcoreRateLimitingResultValues
-
-namespace AspnetcoreDiagnosticsExceptionResultValues
-{
-/** Exception was handled by the exception handling middleware. */
-static constexpr const char *kHandled = "handled";
-/** Exception was not handled by the exception handling middleware. */
-static constexpr const char *kUnhandled = "unhandled";
-/** Exception handling was skipped because the response had started. */
-static constexpr const char *kSkipped = "skipped";
-/** Exception handling didn&#39;t run because the request was aborted. */
-static constexpr const char *kAborted = "aborted";
-}  // namespace AspnetcoreDiagnosticsExceptionResultValues
-
-namespace AspnetcoreRoutingMatchStatusValues
-{
-/** Match succeeded. */
-static constexpr const char *kSuccess = "success";
-/** Match failed. */
-static constexpr const char *kFailure = "failure";
-}  // namespace AspnetcoreRoutingMatchStatusValues
-
-namespace AwsEcsLaunchtypeValues
-{
-/** ec2. */
-static constexpr const char *kEc2 = "ec2";
-/** fargate. */
-static constexpr const char *kFargate = "fargate";
-}  // namespace AwsEcsLaunchtypeValues
-
-namespace CicdPipelineTaskTypeValues
-{
-/** build. */
-static constexpr const char *kBuild = "build";
-/** test. */
-static constexpr const char *kTest = "test";
-/** deploy. */
-static constexpr const char *kDeploy = "deploy";
-}  // namespace CicdPipelineTaskTypeValues
-
-namespace CloudPlatformValues
-{
-/** Alibaba Cloud Elastic Compute Service. */
-static constexpr const char *kAlibabaCloudEcs = "alibaba_cloud_ecs";
-/** Alibaba Cloud Function Compute. */
-static constexpr const char *kAlibabaCloudFc = "alibaba_cloud_fc";
-/** Red Hat OpenShift on Alibaba Cloud. */
-static constexpr const char *kAlibabaCloudOpenshift = "alibaba_cloud_openshift";
-/** AWS Elastic Compute Cloud. */
-static constexpr const char *kAwsEc2 = "aws_ec2";
-/** AWS Elastic Container Service. */
-static constexpr const char *kAwsEcs = "aws_ecs";
-/** AWS Elastic Kubernetes Service. */
-static constexpr const char *kAwsEks = "aws_eks";
-/** AWS Lambda. */
-static constexpr const char *kAwsLambda = "aws_lambda";
-/** AWS Elastic Beanstalk. */
-static constexpr const char *kAwsElasticBeanstalk = "aws_elastic_beanstalk";
-/** AWS App Runner. */
-static constexpr const char *kAwsAppRunner = "aws_app_runner";
-/** Red Hat OpenShift on AWS (ROSA). */
-static constexpr const char *kAwsOpenshift = "aws_openshift";
-/** Azure Virtual Machines. */
-static constexpr const char *kAzureVm = "azure_vm";
-/** Azure Container Apps. */
-static constexpr const char *kAzureContainerApps = "azure_container_apps";
-/** Azure Container Instances. */
-static constexpr const char *kAzureContainerInstances = "azure_container_instances";
-/** Azure Kubernetes Service. */
-static constexpr const char *kAzureAks = "azure_aks";
-/** Azure Functions. */
-static constexpr const char *kAzureFunctions = "azure_functions";
-/** Azure App Service. */
-static constexpr const char *kAzureAppService = "azure_app_service";
-/** Azure Red Hat OpenShift. */
-static constexpr const char *kAzureOpenshift = "azure_openshift";
-/** Google Bare Metal Solution (BMS). */
-static constexpr const char *kGcpBareMetalSolution = "gcp_bare_metal_solution";
-/** Google Cloud Compute Engine (GCE). */
-static constexpr const char *kGcpComputeEngine = "gcp_compute_engine";
-/** Google Cloud Run. */
-static constexpr const char *kGcpCloudRun = "gcp_cloud_run";
-/** Google Cloud Kubernetes Engine (GKE). */
-static constexpr const char *kGcpKubernetesEngine = "gcp_kubernetes_engine";
-/** Google Cloud Functions (GCF). */
-static constexpr const char *kGcpCloudFunctions = "gcp_cloud_functions";
-/** Google Cloud App Engine (GAE). */
-static constexpr const char *kGcpAppEngine = "gcp_app_engine";
-/** Red Hat OpenShift on Google Cloud. */
-static constexpr const char *kGcpOpenshift = "gcp_openshift";
-/** Red Hat OpenShift on IBM Cloud. */
-static constexpr const char *kIbmCloudOpenshift = "ibm_cloud_openshift";
-/** Tencent Cloud Cloud Virtual Machine (CVM). */
-static constexpr const char *kTencentCloudCvm = "tencent_cloud_cvm";
-/** Tencent Cloud Elastic Kubernetes Service (EKS). */
-static constexpr const char *kTencentCloudEks = "tencent_cloud_eks";
-/** Tencent Cloud Serverless Cloud Function (SCF). */
-static constexpr const char *kTencentCloudScf = "tencent_cloud_scf";
-}  // namespace CloudPlatformValues
-
-namespace CloudProviderValues
-{
-/** Alibaba Cloud. */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-/** Amazon Web Services. */
-static constexpr const char *kAws = "aws";
-/** Microsoft Azure. */
-static constexpr const char *kAzure = "azure";
-/** Google Cloud Platform. */
-static constexpr const char *kGcp = "gcp";
-/** Heroku Platform as a Service. */
-static constexpr const char *kHeroku = "heroku";
-/** IBM Cloud. */
-static constexpr const char *kIbmCloud = "ibm_cloud";
-/** Tencent Cloud. */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-}  // namespace CloudProviderValues
-
-namespace CpuModeValues
-{
-/** user. */
-static constexpr const char *kUser = "user";
-/** system. */
-static constexpr const char *kSystem = "system";
-/** nice. */
-static constexpr const char *kNice = "nice";
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** iowait. */
-static constexpr const char *kIowait = "iowait";
-/** interrupt. */
-static constexpr const char *kInterrupt = "interrupt";
-/** steal. */
-static constexpr const char *kSteal = "steal";
-/** kernel. */
-static constexpr const char *kKernel = "kernel";
-}  // namespace CpuModeValues
-
-namespace DbClientConnectionStateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace DbClientConnectionStateValues
-
-namespace DbSystemValues
-{
-/** Some other SQL database. Fallback only. See notes. */
-static constexpr const char *kOtherSql = "other_sql";
-/** Adabas (Adaptable Database System). */
-static constexpr const char *kAdabas = "adabas";
-/** Deprecated, use `intersystems_cache` instead. */
-static constexpr const char *kCache = "cache";
-/** InterSystems Caché. */
-static constexpr const char *kIntersystemsCache = "intersystems_cache";
-/** Apache Cassandra. */
-static constexpr const char *kCassandra = "cassandra";
-/** ClickHouse. */
-static constexpr const char *kClickhouse = "clickhouse";
-/** Deprecated, use `other_sql` instead. */
-static constexpr const char *kCloudscape = "cloudscape";
-/** CockroachDB. */
-static constexpr const char *kCockroachdb = "cockroachdb";
-/** Deprecated, no replacement at this time. */
-static constexpr const char *kColdfusion = "coldfusion";
-/** Microsoft Azure Cosmos DB. */
-static constexpr const char *kCosmosdb = "cosmosdb";
-/** Couchbase. */
-static constexpr const char *kCouchbase = "couchbase";
-/** CouchDB. */
-static constexpr const char *kCouchdb = "couchdb";
-/** IBM Db2. */
-static constexpr const char *kDb2 = "db2";
-/** Apache Derby. */
-static constexpr const char *kDerby = "derby";
-/** Amazon DynamoDB. */
-static constexpr const char *kDynamodb = "dynamodb";
-/** EnterpriseDB. */
-static constexpr const char *kEdb = "edb";
-/** Elasticsearch. */
-static constexpr const char *kElasticsearch = "elasticsearch";
-/** FileMaker. */
-static constexpr const char *kFilemaker = "filemaker";
-/** Firebird. */
-static constexpr const char *kFirebird = "firebird";
-/** Deprecated, use `other_sql` instead. */
-static constexpr const char *kFirstsql = "firstsql";
-/** Apache Geode. */
-static constexpr const char *kGeode = "geode";
-/** H2. */
-static constexpr const char *kH2 = "h2";
-/** SAP HANA. */
-static constexpr const char *kHanadb = "hanadb";
-/** Apache HBase. */
-static constexpr const char *kHbase = "hbase";
-/** Apache Hive. */
-static constexpr const char *kHive = "hive";
-/** HyperSQL DataBase. */
-static constexpr const char *kHsqldb = "hsqldb";
-/** InfluxDB. */
-static constexpr const char *kInfluxdb = "influxdb";
-/** Informix. */
-static constexpr const char *kInformix = "informix";
-/** Ingres. */
-static constexpr const char *kIngres = "ingres";
-/** InstantDB. */
-static constexpr const char *kInstantdb = "instantdb";
-/** InterBase. */
-static constexpr const char *kInterbase = "interbase";
-/** MariaDB. */
-static constexpr const char *kMariadb = "mariadb";
-/** SAP MaxDB. */
-static constexpr const char *kMaxdb = "maxdb";
-/** Memcached. */
-static constexpr const char *kMemcached = "memcached";
-/** MongoDB. */
-static constexpr const char *kMongodb = "mongodb";
-/** Microsoft SQL Server. */
-static constexpr const char *kMssql = "mssql";
-/** Deprecated, Microsoft SQL Server Compact is discontinued. */
-static constexpr const char *kMssqlcompact = "mssqlcompact";
-/** MySQL. */
-static constexpr const char *kMysql = "mysql";
-/** Neo4j. */
-static constexpr const char *kNeo4j = "neo4j";
-/** Netezza. */
-static constexpr const char *kNetezza = "netezza";
-/** OpenSearch. */
-static constexpr const char *kOpensearch = "opensearch";
-/** Oracle Database. */
-static constexpr const char *kOracle = "oracle";
-/** Pervasive PSQL. */
-static constexpr const char *kPervasive = "pervasive";
-/** PointBase. */
-static constexpr const char *kPointbase = "pointbase";
-/** PostgreSQL. */
-static constexpr const char *kPostgresql = "postgresql";
-/** Progress Database. */
-static constexpr const char *kProgress = "progress";
-/** Redis. */
-static constexpr const char *kRedis = "redis";
-/** Amazon Redshift. */
-static constexpr const char *kRedshift = "redshift";
-/** Cloud Spanner. */
-static constexpr const char *kSpanner = "spanner";
-/** SQLite. */
-static constexpr const char *kSqlite = "sqlite";
-/** Sybase. */
-static constexpr const char *kSybase = "sybase";
-/** Teradata. */
-static constexpr const char *kTeradata = "teradata";
-/** Trino. */
-static constexpr const char *kTrino = "trino";
-/** Vertica. */
-static constexpr const char *kVertica = "vertica";
-}  // namespace DbSystemValues
-
-namespace DbCassandraConsistencyLevelValues
-{
-/** all. */
-static constexpr const char *kAll = "all";
-/** each_quorum. */
-static constexpr const char *kEachQuorum = "each_quorum";
-/** quorum. */
-static constexpr const char *kQuorum = "quorum";
-/** local_quorum. */
-static constexpr const char *kLocalQuorum = "local_quorum";
-/** one. */
-static constexpr const char *kOne = "one";
-/** two. */
-static constexpr const char *kTwo = "two";
-/** three. */
-static constexpr const char *kThree = "three";
-/** local_one. */
-static constexpr const char *kLocalOne = "local_one";
-/** any. */
-static constexpr const char *kAny = "any";
-/** serial. */
-static constexpr const char *kSerial = "serial";
-/** local_serial. */
-static constexpr const char *kLocalSerial = "local_serial";
-}  // namespace DbCassandraConsistencyLevelValues
-
-namespace DbCosmosdbConnectionModeValues
-{
-/** Gateway (HTTP) connections mode. */
-static constexpr const char *kGateway = "gateway";
-/** Direct connection. */
-static constexpr const char *kDirect = "direct";
-}  // namespace DbCosmosdbConnectionModeValues
-
-namespace DbCosmosdbOperationTypeValues
-{
-/** invalid. */
-static constexpr const char *kInvalid = "Invalid";
-/** create. */
-static constexpr const char *kCreate = "Create";
-/** patch. */
-static constexpr const char *kPatch = "Patch";
-/** read. */
-static constexpr const char *kRead = "Read";
-/** read_feed. */
-static constexpr const char *kReadFeed = "ReadFeed";
-/** delete. */
-static constexpr const char *kDelete = "Delete";
-/** replace. */
-static constexpr const char *kReplace = "Replace";
-/** execute. */
-static constexpr const char *kExecute = "Execute";
-/** query. */
-static constexpr const char *kQuery = "Query";
-/** head. */
-static constexpr const char *kHead = "Head";
-/** head_feed. */
-static constexpr const char *kHeadFeed = "HeadFeed";
-/** upsert. */
-static constexpr const char *kUpsert = "Upsert";
-/** batch. */
-static constexpr const char *kBatch = "Batch";
-/** query_plan. */
-static constexpr const char *kQueryPlan = "QueryPlan";
-/** execute_javascript. */
-static constexpr const char *kExecuteJavascript = "ExecuteJavaScript";
-}  // namespace DbCosmosdbOperationTypeValues
-
-namespace DeploymentStatusValues
-{
-/** failed. */
-static constexpr const char *kFailed = "failed";
-/** succeeded. */
-static constexpr const char *kSucceeded = "succeeded";
-}  // namespace DeploymentStatusValues
-
-namespace AndroidStateValues
-{
-/** Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has
- * been called in the app for the first time. */
-static constexpr const char *kCreated = "created";
-/** Any time after Activity.onPause() or, if the app has no Activity, Context.stopService() has been
- * called when the app was in the foreground state. */
-static constexpr const char *kBackground = "background";
-/** Any time after Activity.onResume() or, if the app has no Activity, Context.startService() has
- * been called when the app was in either the created or background states. */
-static constexpr const char *kForeground = "foreground";
-}  // namespace AndroidStateValues
-
-namespace ContainerCpuStateValues
-{
-/** When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode
- * (Windows). */
-static constexpr const char *kUser = "user";
-/** When CPU is used by the system (host OS). */
-static constexpr const char *kSystem = "system";
-/** When tasks of the cgroup are in kernel mode (Linux). When all container processes are in kernel
- * mode (Windows). */
-static constexpr const char *kKernel = "kernel";
-}  // namespace ContainerCpuStateValues
-
-namespace DbClientConnectionsStateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace DbClientConnectionsStateValues
-
-namespace StateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace StateValues
-
-namespace HttpFlavorValues
-{
-/** HTTP/1.0. */
-static constexpr const char *kHttp10 = "1.0";
-/** HTTP/1.1. */
-static constexpr const char *kHttp11 = "1.1";
-/** HTTP/2. */
-static constexpr const char *kHttp20 = "2.0";
-/** HTTP/3. */
-static constexpr const char *kHttp30 = "3.0";
-/** SPDY protocol. */
-static constexpr const char *kSpdy = "SPDY";
-/** QUIC protocol. */
-static constexpr const char *kQuic = "QUIC";
-}  // namespace HttpFlavorValues
-
-namespace IosStateValues
-{
-/** The app has become `active`. Associated with UIKit notification `applicationDidBecomeActive`. */
-static constexpr const char *kActive = "active";
-/** The app is now `inactive`. Associated with UIKit notification `applicationWillResignActive`. */
-static constexpr const char *kInactive = "inactive";
-/** The app is now in the background. This value is associated with UIKit notification
- * `applicationDidEnterBackground`. */
-static constexpr const char *kBackground = "background";
-/** The app is now in the foreground. This value is associated with UIKit notification
- * `applicationWillEnterForeground`. */
-static constexpr const char *kForeground = "foreground";
-/** The app is about to terminate. Associated with UIKit notification `applicationWillTerminate`. */
-static constexpr const char *kTerminate = "terminate";
-}  // namespace IosStateValues
-
-namespace NetSockFamilyValues
-{
-/** IPv4 address. */
-static constexpr const char *kInet = "inet";
-/** IPv6 address. */
-static constexpr const char *kInet6 = "inet6";
-/** Unix domain socket path. */
-static constexpr const char *kUnix = "unix";
-}  // namespace NetSockFamilyValues
-
-namespace NetTransportValues
-{
-/** ip_tcp. */
-static constexpr const char *kIpTcp = "ip_tcp";
-/** ip_udp. */
-static constexpr const char *kIpUdp = "ip_udp";
-/** Named or anonymous pipe. */
-static constexpr const char *kPipe = "pipe";
-/** In-process communication. */
-static constexpr const char *kInproc = "inproc";
-/** Something else (non IP-based). */
-static constexpr const char *kOther = "other";
-}  // namespace NetTransportValues
-
-namespace ProcessCpuStateValues
-{
-/** system. */
-static constexpr const char *kSystem = "system";
-/** user. */
-static constexpr const char *kUser = "user";
-/** wait. */
-static constexpr const char *kWait = "wait";
-}  // namespace ProcessCpuStateValues
-
-namespace MessageTypeValues
-{
-/** sent. */
-static constexpr const char *kSent = "SENT";
-/** received. */
-static constexpr const char *kReceived = "RECEIVED";
-}  // namespace MessageTypeValues
-
-namespace SystemCpuStateValues
-{
-/** user. */
-static constexpr const char *kUser = "user";
-/** system. */
-static constexpr const char *kSystem = "system";
-/** nice. */
-static constexpr const char *kNice = "nice";
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** iowait. */
-static constexpr const char *kIowait = "iowait";
-/** interrupt. */
-static constexpr const char *kInterrupt = "interrupt";
-/** steal. */
-static constexpr const char *kSteal = "steal";
-}  // namespace SystemCpuStateValues
-
-namespace SystemProcessesStatusValues
-{
-/** running. */
-static constexpr const char *kRunning = "running";
-/** sleeping. */
-static constexpr const char *kSleeping = "sleeping";
-/** stopped. */
-static constexpr const char *kStopped = "stopped";
-/** defunct. */
-static constexpr const char *kDefunct = "defunct";
-}  // namespace SystemProcessesStatusValues
-
-namespace DiskIoDirectionValues
-{
-/** read. */
-static constexpr const char *kRead = "read";
-/** write. */
-static constexpr const char *kWrite = "write";
-}  // namespace DiskIoDirectionValues
-
-namespace ErrorTypeValues
-{
-/** A fallback error value to be used when the instrumentation doesn&#39;t define a custom value. */
-static constexpr const char *kOther = "_OTHER";
-}  // namespace ErrorTypeValues
-
-namespace FaasDocumentOperationValues
-{
-/** When a new object is created. */
-static constexpr const char *kInsert = "insert";
-/** When an object is modified. */
-static constexpr const char *kEdit = "edit";
-/** When an object is deleted. */
-static constexpr const char *kDelete = "delete";
-}  // namespace FaasDocumentOperationValues
-
-namespace FaasInvokedProviderValues
-{
-/** Alibaba Cloud. */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-/** Amazon Web Services. */
-static constexpr const char *kAws = "aws";
-/** Microsoft Azure. */
-static constexpr const char *kAzure = "azure";
-/** Google Cloud Platform. */
-static constexpr const char *kGcp = "gcp";
-/** Tencent Cloud. */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-}  // namespace FaasInvokedProviderValues
-
-namespace FaasTriggerValues
-{
-/** A response to some data source operation such as a database or filesystem read/write. */
-static constexpr const char *kDatasource = "datasource";
-/** To provide an answer to an inbound HTTP request. */
-static constexpr const char *kHttp = "http";
-/** A function is set to be executed when messages are sent to a messaging system. */
-static constexpr const char *kPubsub = "pubsub";
-/** A function is scheduled to be executed regularly. */
-static constexpr const char *kTimer = "timer";
-/** If none of the others apply. */
-static constexpr const char *kOther = "other";
-}  // namespace FaasTriggerValues
-
-namespace GenAiOperationNameValues
-{
-/** Chat completion operation such as [OpenAI Chat
- * API](https://platform.openai.com/docs/api-reference/chat). */
-static constexpr const char *kChat = "chat";
-/** Text completions operation such as [OpenAI Completions API
- * (Legacy)](https://platform.openai.com/docs/api-reference/completions). */
-static constexpr const char *kTextCompletion = "text_completion";
-}  // namespace GenAiOperationNameValues
-
-namespace GenAiSystemValues
-{
-/** OpenAI. */
-static constexpr const char *kOpenai = "openai";
-/** Vertex AI. */
-static constexpr const char *kVertexAi = "vertex_ai";
-/** Anthropic. */
-static constexpr const char *kAnthropic = "anthropic";
-/** Cohere. */
-static constexpr const char *kCohere = "cohere";
-}  // namespace GenAiSystemValues
-
-namespace GenAiTokenTypeValues
-{
-/** Input tokens (prompt, input, etc.). */
-static constexpr const char *kInput = "input";
-/** Output tokens (completion, response, etc.). */
-static constexpr const char *kCompletion = "output";
-}  // namespace GenAiTokenTypeValues
-
-namespace GoMemoryTypeValues
-{
-/** Memory allocated from the heap that is reserved for stack space, whether or not it is currently
- * in-use. */
-static constexpr const char *kStack = "stack";
-/** Memory used by the Go runtime, excluding other categories of memory usage described in this
- * enumeration. */
-static constexpr const char *kOther = "other";
-}  // namespace GoMemoryTypeValues
-
-namespace GraphqlOperationTypeValues
-{
-/** GraphQL query. */
-static constexpr const char *kQuery = "query";
-/** GraphQL mutation. */
-static constexpr const char *kMutation = "mutation";
-/** GraphQL subscription. */
-static constexpr const char *kSubscription = "subscription";
-}  // namespace GraphqlOperationTypeValues
-
-namespace HostArchValues
-{
-/** AMD64. */
-static constexpr const char *kAmd64 = "amd64";
-/** ARM32. */
-static constexpr const char *kArm32 = "arm32";
-/** ARM64. */
-static constexpr const char *kArm64 = "arm64";
-/** Itanium. */
-static constexpr const char *kIa64 = "ia64";
-/** 32-bit PowerPC. */
-static constexpr const char *kPpc32 = "ppc32";
-/** 64-bit PowerPC. */
-static constexpr const char *kPpc64 = "ppc64";
-/** IBM z/Architecture. */
-static constexpr const char *kS390x = "s390x";
-/** 32-bit x86. */
-static constexpr const char *kX86 = "x86";
-}  // namespace HostArchValues
-
-namespace HttpConnectionStateValues
-{
-/** active state. */
-static constexpr const char *kActive = "active";
-/** idle state. */
-static constexpr const char *kIdle = "idle";
-}  // namespace HttpConnectionStateValues
-
-namespace HttpRequestMethodValues
-{
-/** CONNECT method. */
-static constexpr const char *kConnect = "CONNECT";
-/** DELETE method. */
-static constexpr const char *kDelete = "DELETE";
-/** GET method. */
-static constexpr const char *kGet = "GET";
-/** HEAD method. */
-static constexpr const char *kHead = "HEAD";
-/** OPTIONS method. */
-static constexpr const char *kOptions = "OPTIONS";
-/** PATCH method. */
-static constexpr const char *kPatch = "PATCH";
-/** POST method. */
-static constexpr const char *kPost = "POST";
-/** PUT method. */
-static constexpr const char *kPut = "PUT";
-/** TRACE method. */
-static constexpr const char *kTrace = "TRACE";
-/** Any HTTP method that the instrumentation has no prior knowledge of. */
-static constexpr const char *kOther = "_OTHER";
-}  // namespace HttpRequestMethodValues
-
-namespace JvmMemoryTypeValues
-{
-/** Heap memory. */
-static constexpr const char *kHeap = "heap";
-/** Non-heap memory. */
-static constexpr const char *kNonHeap = "non_heap";
-}  // namespace JvmMemoryTypeValues
-
-namespace JvmThreadStateValues
-{
-/** A thread that has not yet started is in this state. */
-static constexpr const char *kNew = "new";
-/** A thread executing in the Java virtual machine is in this state. */
-static constexpr const char *kRunnable = "runnable";
-/** A thread that is blocked waiting for a monitor lock is in this state. */
-static constexpr const char *kBlocked = "blocked";
-/** A thread that is waiting indefinitely for another thread to perform a particular action is in
- * this state. */
-static constexpr const char *kWaiting = "waiting";
-/** A thread that is waiting for another thread to perform an action for up to a specified waiting
- * time is in this state. */
-static constexpr const char *kTimedWaiting = "timed_waiting";
-/** A thread that has exited is in this state. */
-static constexpr const char *kTerminated = "terminated";
-}  // namespace JvmThreadStateValues
-
-namespace LinuxMemorySlabStateValues
-{
-/** reclaimable. */
-static constexpr const char *kReclaimable = "reclaimable";
-/** unreclaimable. */
-static constexpr const char *kUnreclaimable = "unreclaimable";
-}  // namespace LinuxMemorySlabStateValues
-
-namespace LogIostreamValues
-{
-/** Logs from stdout stream. */
-static constexpr const char *kStdout = "stdout";
-/** Events from stderr stream. */
-static constexpr const char *kStderr = "stderr";
-}  // namespace LogIostreamValues
-
-namespace MessagingOperationTypeValues
-{
-/** One or more messages are provided for publishing to an intermediary. If a single message is
- * published, the context of the &#34;Publish&#34; span can be used as the creation context and no
- * &#34;Create&#34; span needs to be created. */
-static constexpr const char *kPublish = "publish";
-/** A message is created. &#34;Create&#34; spans always refer to a single message and are used to
- * provide a unique creation context for messages in batch publishing scenarios. */
-static constexpr const char *kCreate = "create";
-/** One or more messages are requested by a consumer. This operation refers to pull-based scenarios,
- * where consumers explicitly call methods of messaging SDKs to receive messages. */
-static constexpr const char *kReceive = "receive";
-/** One or more messages are processed by a consumer. */
-static constexpr const char *kProcess = "process";
-/** One or more messages are settled. */
-static constexpr const char *kSettle = "settle";
-/** Deprecated. Use `process` instead. */
-static constexpr const char *kDeliver = "deliver";
-}  // namespace MessagingOperationTypeValues
-
-namespace MessagingSystemValues
-{
-/** Apache ActiveMQ. */
-static constexpr const char *kActivemq = "activemq";
-/** Amazon Simple Queue Service (SQS). */
-static constexpr const char *kAwsSqs = "aws_sqs";
-/** Azure Event Grid. */
-static constexpr const char *kEventgrid = "eventgrid";
-/** Azure Event Hubs. */
-static constexpr const char *kEventhubs = "eventhubs";
-/** Azure Service Bus. */
-static constexpr const char *kServicebus = "servicebus";
-/** Google Cloud Pub/Sub. */
-static constexpr const char *kGcpPubsub = "gcp_pubsub";
-/** Java Message Service. */
-static constexpr const char *kJms = "jms";
-/** Apache Kafka. */
-static constexpr const char *kKafka = "kafka";
-/** RabbitMQ. */
-static constexpr const char *kRabbitmq = "rabbitmq";
-/** Apache RocketMQ. */
-static constexpr const char *kRocketmq = "rocketmq";
-/** Apache Pulsar. */
-static constexpr const char *kPulsar = "pulsar";
-}  // namespace MessagingSystemValues
-
-namespace MessagingRocketmqConsumptionModelValues
-{
-/** Clustering consumption model. */
-static constexpr const char *kClustering = "clustering";
-/** Broadcasting consumption model. */
-static constexpr const char *kBroadcasting = "broadcasting";
-}  // namespace MessagingRocketmqConsumptionModelValues
-
-namespace MessagingRocketmqMessageTypeValues
-{
-/** Normal message. */
-static constexpr const char *kNormal = "normal";
-/** FIFO message. */
-static constexpr const char *kFifo = "fifo";
-/** Delay message. */
-static constexpr const char *kDelay = "delay";
-/** Transaction message. */
-static constexpr const char *kTransaction = "transaction";
-}  // namespace MessagingRocketmqMessageTypeValues
-
-namespace MessagingServicebusDispositionStatusValues
-{
-/** Message is completed. */
-static constexpr const char *kComplete = "complete";
-/** Message is abandoned. */
-static constexpr const char *kAbandon = "abandon";
-/** Message is sent to dead letter queue. */
-static constexpr const char *kDeadLetter = "dead_letter";
-/** Message is deferred. */
-static constexpr const char *kDefer = "defer";
-}  // namespace MessagingServicebusDispositionStatusValues
-
-namespace NetworkConnectionSubtypeValues
-{
-/** GPRS. */
-static constexpr const char *kGprs = "gprs";
-/** EDGE. */
-static constexpr const char *kEdge = "edge";
-/** UMTS. */
-static constexpr const char *kUmts = "umts";
-/** CDMA. */
-static constexpr const char *kCdma = "cdma";
-/** EVDO Rel. 0. */
-static constexpr const char *kEvdo0 = "evdo_0";
-/** EVDO Rev. A. */
-static constexpr const char *kEvdoA = "evdo_a";
-/** CDMA2000 1XRTT. */
-static constexpr const char *kCdma20001xrtt = "cdma2000_1xrtt";
-/** HSDPA. */
-static constexpr const char *kHsdpa = "hsdpa";
-/** HSUPA. */
-static constexpr const char *kHsupa = "hsupa";
-/** HSPA. */
-static constexpr const char *kHspa = "hspa";
-/** IDEN. */
-static constexpr const char *kIden = "iden";
-/** EVDO Rev. B. */
-static constexpr const char *kEvdoB = "evdo_b";
-/** LTE. */
-static constexpr const char *kLte = "lte";
-/** EHRPD. */
-static constexpr const char *kEhrpd = "ehrpd";
-/** HSPAP. */
-static constexpr const char *kHspap = "hspap";
-/** GSM. */
-static constexpr const char *kGsm = "gsm";
-/** TD-SCDMA. */
-static constexpr const char *kTdScdma = "td_scdma";
-/** IWLAN. */
-static constexpr const char *kIwlan = "iwlan";
-/** 5G NR (New Radio). */
-static constexpr const char *kNr = "nr";
-/** 5G NRNSA (New Radio Non-Standalone). */
-static constexpr const char *kNrnsa = "nrnsa";
-/** LTE CA. */
-static constexpr const char *kLteCa = "lte_ca";
-}  // namespace NetworkConnectionSubtypeValues
-
-namespace NetworkConnectionTypeValues
-{
-/** wifi. */
-static constexpr const char *kWifi = "wifi";
-/** wired. */
-static constexpr const char *kWired = "wired";
-/** cell. */
-static constexpr const char *kCell = "cell";
-/** unavailable. */
-static constexpr const char *kUnavailable = "unavailable";
-/** unknown. */
-static constexpr const char *kUnknown = "unknown";
-}  // namespace NetworkConnectionTypeValues
-
-namespace NetworkIoDirectionValues
-{
-/** transmit. */
-static constexpr const char *kTransmit = "transmit";
-/** receive. */
-static constexpr const char *kReceive = "receive";
-}  // namespace NetworkIoDirectionValues
-
-namespace NetworkTransportValues
-{
-/** TCP. */
-static constexpr const char *kTcp = "tcp";
-/** UDP. */
-static constexpr const char *kUdp = "udp";
-/** Named or anonymous pipe. */
-static constexpr const char *kPipe = "pipe";
-/** Unix domain socket. */
-static constexpr const char *kUnix = "unix";
-/** QUIC. */
-static constexpr const char *kQuic = "quic";
-}  // namespace NetworkTransportValues
-
-namespace NetworkTypeValues
-{
-/** IPv4. */
-static constexpr const char *kIpv4 = "ipv4";
-/** IPv6. */
-static constexpr const char *kIpv6 = "ipv6";
-}  // namespace NetworkTypeValues
-
-namespace OpentracingRefTypeValues
-{
-/** The parent Span depends on the child Span in some capacity. */
-static constexpr const char *kChildOf = "child_of";
-/** The parent Span doesn&#39;t depend in any way on the result of the child Span. */
-static constexpr const char *kFollowsFrom = "follows_from";
-}  // namespace OpentracingRefTypeValues
-
-namespace OsTypeValues
-{
-/** Microsoft Windows. */
-static constexpr const char *kWindows = "windows";
-/** Linux. */
-static constexpr const char *kLinux = "linux";
-/** Apple Darwin. */
-static constexpr const char *kDarwin = "darwin";
-/** FreeBSD. */
-static constexpr const char *kFreebsd = "freebsd";
-/** NetBSD. */
-static constexpr const char *kNetbsd = "netbsd";
-/** OpenBSD. */
-static constexpr const char *kOpenbsd = "openbsd";
-/** DragonFly BSD. */
-static constexpr const char *kDragonflybsd = "dragonflybsd";
-/** HP-UX (Hewlett Packard Unix). */
-static constexpr const char *kHpux = "hpux";
-/** AIX (Advanced Interactive eXecutive). */
-static constexpr const char *kAix = "aix";
-/** SunOS, Oracle Solaris. */
-static constexpr const char *kSolaris = "solaris";
-/** IBM z/OS. */
-static constexpr const char *kZOs = "z_os";
-}  // namespace OsTypeValues
-
-namespace OtelStatusCodeValues
-{
-/** The operation has been validated by an Application developer or Operator to have completed
- * successfully. */
-static constexpr const char *kOk = "OK";
-/** The operation contains an error. */
-static constexpr const char *kError = "ERROR";
-}  // namespace OtelStatusCodeValues
-
-namespace ProcessContextSwitchTypeValues
-{
-/** voluntary. */
-static constexpr const char *kVoluntary = "voluntary";
-/** involuntary. */
-static constexpr const char *kInvoluntary = "involuntary";
-}  // namespace ProcessContextSwitchTypeValues
-
-namespace ProcessPagingFaultTypeValues
-{
-/** major. */
-static constexpr const char *kMajor = "major";
-/** minor. */
-static constexpr const char *kMinor = "minor";
-}  // namespace ProcessPagingFaultTypeValues
-
-namespace RpcConnectRpcErrorCodeValues
-{
-/** cancelled. */
-static constexpr const char *kCancelled = "cancelled";
-/** unknown. */
-static constexpr const char *kUnknown = "unknown";
-/** invalid_argument. */
-static constexpr const char *kInvalidArgument = "invalid_argument";
-/** deadline_exceeded. */
-static constexpr const char *kDeadlineExceeded = "deadline_exceeded";
-/** not_found. */
-static constexpr const char *kNotFound = "not_found";
-/** already_exists. */
-static constexpr const char *kAlreadyExists = "already_exists";
-/** permission_denied. */
-static constexpr const char *kPermissionDenied = "permission_denied";
-/** resource_exhausted. */
-static constexpr const char *kResourceExhausted = "resource_exhausted";
-/** failed_precondition. */
-static constexpr const char *kFailedPrecondition = "failed_precondition";
-/** aborted. */
-static constexpr const char *kAborted = "aborted";
-/** out_of_range. */
-static constexpr const char *kOutOfRange = "out_of_range";
-/** unimplemented. */
-static constexpr const char *kUnimplemented = "unimplemented";
-/** internal. */
-static constexpr const char *kInternal = "internal";
-/** unavailable. */
-static constexpr const char *kUnavailable = "unavailable";
-/** data_loss. */
-static constexpr const char *kDataLoss = "data_loss";
-/** unauthenticated. */
-static constexpr const char *kUnauthenticated = "unauthenticated";
-}  // namespace RpcConnectRpcErrorCodeValues
-
-namespace RpcGrpcStatusCodeValues
-{
-/** OK. */
-static constexpr const int kOk = 0;
-/** CANCELLED. */
-static constexpr const int kCancelled = 1;
-/** UNKNOWN. */
-static constexpr const int kUnknown = 2;
-/** INVALID_ARGUMENT. */
-static constexpr const int kInvalidArgument = 3;
-/** DEADLINE_EXCEEDED. */
-static constexpr const int kDeadlineExceeded = 4;
-/** NOT_FOUND. */
-static constexpr const int kNotFound = 5;
-/** ALREADY_EXISTS. */
-static constexpr const int kAlreadyExists = 6;
-/** PERMISSION_DENIED. */
-static constexpr const int kPermissionDenied = 7;
-/** RESOURCE_EXHAUSTED. */
-static constexpr const int kResourceExhausted = 8;
-/** FAILED_PRECONDITION. */
-static constexpr const int kFailedPrecondition = 9;
-/** ABORTED. */
-static constexpr const int kAborted = 10;
-/** OUT_OF_RANGE. */
-static constexpr const int kOutOfRange = 11;
-/** UNIMPLEMENTED. */
-static constexpr const int kUnimplemented = 12;
-/** INTERNAL. */
-static constexpr const int kInternal = 13;
-/** UNAVAILABLE. */
-static constexpr const int kUnavailable = 14;
-/** DATA_LOSS. */
-static constexpr const int kDataLoss = 15;
-/** UNAUTHENTICATED. */
-static constexpr const int kUnauthenticated = 16;
-}  // namespace RpcGrpcStatusCodeValues
-
-namespace RpcMessageTypeValues
-{
-/** sent. */
-static constexpr const char *kSent = "SENT";
-/** received. */
-static constexpr const char *kReceived = "RECEIVED";
-}  // namespace RpcMessageTypeValues
-
-namespace RpcSystemValues
-{
-/** gRPC. */
-static constexpr const char *kGrpc = "grpc";
-/** Java RMI. */
-static constexpr const char *kJavaRmi = "java_rmi";
-/** .NET WCF. */
-static constexpr const char *kDotnetWcf = "dotnet_wcf";
-/** Apache Dubbo. */
-static constexpr const char *kApacheDubbo = "apache_dubbo";
-/** Connect RPC. */
-static constexpr const char *kConnectRpc = "connect_rpc";
-}  // namespace RpcSystemValues
-
-namespace SignalrConnectionStatusValues
-{
-/** The connection was closed normally. */
-static constexpr const char *kNormalClosure = "normal_closure";
-/** The connection was closed due to a timeout. */
-static constexpr const char *kTimeout = "timeout";
-/** The connection was closed because the app is shutting down. */
-static constexpr const char *kAppShutdown = "app_shutdown";
-}  // namespace SignalrConnectionStatusValues
-
-namespace SignalrTransportValues
-{
-/** ServerSentEvents protocol. */
-static constexpr const char *kServerSentEvents = "server_sent_events";
-/** LongPolling protocol. */
-static constexpr const char *kLongPolling = "long_polling";
-/** WebSockets protocol. */
-static constexpr const char *kWebSockets = "web_sockets";
-}  // namespace SignalrTransportValues
-
-namespace SystemMemoryStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-/** shared. */
-static constexpr const char *kShared = "shared";
-/** buffers. */
-static constexpr const char *kBuffers = "buffers";
-/** cached. */
-static constexpr const char *kCached = "cached";
-}  // namespace SystemMemoryStateValues
-
-namespace SystemPagingDirectionValues
-{
-/** in. */
-static constexpr const char *kIn = "in";
-/** out. */
-static constexpr const char *kOut = "out";
-}  // namespace SystemPagingDirectionValues
-
-namespace SystemPagingStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-}  // namespace SystemPagingStateValues
-
-namespace SystemPagingTypeValues
-{
-/** major. */
-static constexpr const char *kMajor = "major";
-/** minor. */
-static constexpr const char *kMinor = "minor";
-}  // namespace SystemPagingTypeValues
-
-namespace SystemFilesystemStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-/** reserved. */
-static constexpr const char *kReserved = "reserved";
-}  // namespace SystemFilesystemStateValues
-
-namespace SystemFilesystemTypeValues
-{
-/** fat32. */
-static constexpr const char *kFat32 = "fat32";
-/** exfat. */
-static constexpr const char *kExfat = "exfat";
-/** ntfs. */
-static constexpr const char *kNtfs = "ntfs";
-/** refs. */
-static constexpr const char *kRefs = "refs";
-/** hfsplus. */
-static constexpr const char *kHfsplus = "hfsplus";
-/** ext4. */
-static constexpr const char *kExt4 = "ext4";
-}  // namespace SystemFilesystemTypeValues
-
-namespace SystemNetworkStateValues
-{
-/** close. */
-static constexpr const char *kClose = "close";
-/** close_wait. */
-static constexpr const char *kCloseWait = "close_wait";
-/** closing. */
-static constexpr const char *kClosing = "closing";
-/** delete. */
-static constexpr const char *kDelete = "delete";
-/** established. */
-static constexpr const char *kEstablished = "established";
-/** fin_wait_1. */
-static constexpr const char *kFinWait1 = "fin_wait_1";
-/** fin_wait_2. */
-static constexpr const char *kFinWait2 = "fin_wait_2";
-/** last_ack. */
-static constexpr const char *kLastAck = "last_ack";
-/** listen. */
-static constexpr const char *kListen = "listen";
-/** syn_recv. */
-static constexpr const char *kSynRecv = "syn_recv";
-/** syn_sent. */
-static constexpr const char *kSynSent = "syn_sent";
-/** time_wait. */
-static constexpr const char *kTimeWait = "time_wait";
-}  // namespace SystemNetworkStateValues
-
-namespace SystemProcessStatusValues
-{
-/** running. */
-static constexpr const char *kRunning = "running";
-/** sleeping. */
-static constexpr const char *kSleeping = "sleeping";
-/** stopped. */
-static constexpr const char *kStopped = "stopped";
-/** defunct. */
-static constexpr const char *kDefunct = "defunct";
-}  // namespace SystemProcessStatusValues
-
-namespace TelemetrySdkLanguageValues
-{
-/** cpp. */
-static constexpr const char *kCpp = "cpp";
-/** dotnet. */
-static constexpr const char *kDotnet = "dotnet";
-/** erlang. */
-static constexpr const char *kErlang = "erlang";
-/** go. */
-static constexpr const char *kGo = "go";
-/** java. */
-static constexpr const char *kJava = "java";
-/** nodejs. */
-static constexpr const char *kNodejs = "nodejs";
-/** php. */
-static constexpr const char *kPhp = "php";
-/** python. */
-static constexpr const char *kPython = "python";
-/** ruby. */
-static constexpr const char *kRuby = "ruby";
-/** rust. */
-static constexpr const char *kRust = "rust";
-/** swift. */
-static constexpr const char *kSwift = "swift";
-/** webjs. */
-static constexpr const char *kWebjs = "webjs";
-}  // namespace TelemetrySdkLanguageValues
-
-namespace TestCaseResultStatusValues
-{
-/** pass. */
-static constexpr const char *kPass = "pass";
-/** fail. */
-static constexpr const char *kFail = "fail";
-}  // namespace TestCaseResultStatusValues
-
-namespace TestSuiteRunStatusValues
-{
-/** success. */
-static constexpr const char *kSuccess = "success";
-/** failure. */
-static constexpr const char *kFailure = "failure";
-/** skipped. */
-static constexpr const char *kSkipped = "skipped";
-/** aborted. */
-static constexpr const char *kAborted = "aborted";
-/** timed_out. */
-static constexpr const char *kTimedOut = "timed_out";
-/** in_progress. */
-static constexpr const char *kInProgress = "in_progress";
-}  // namespace TestSuiteRunStatusValues
-
-namespace TlsProtocolNameValues
-{
-/** ssl. */
-static constexpr const char *kSsl = "ssl";
-/** tls. */
-static constexpr const char *kTls = "tls";
-}  // namespace TlsProtocolNameValues
-
-namespace V8jsGcTypeValues
-{
-/** Major (Mark Sweep Compact). */
-static constexpr const char *kMajor = "major";
-/** Minor (Scavenge). */
-static constexpr const char *kMinor = "minor";
-/** Incremental (Incremental Marking). */
-static constexpr const char *kIncremental = "incremental";
-/** Weak Callbacks (Process Weak Callbacks). */
-static constexpr const char *kWeakcb = "weakcb";
-}  // namespace V8jsGcTypeValues
-
-namespace V8jsHeapSpaceNameValues
-{
-/** New memory space. */
-static constexpr const char *kNewSpace = "new_space";
-/** Old memory space. */
-static constexpr const char *kOldSpace = "old_space";
-/** Code memory space. */
-static constexpr const char *kCodeSpace = "code_space";
-/** Map memory space. */
-static constexpr const char *kMapSpace = "map_space";
-/** Large object memory space. */
-static constexpr const char *kLargeObjectSpace = "large_object_space";
-}  // namespace V8jsHeapSpaceNameValues
-
-namespace VcsRepositoryRefTypeValues
-{
-/** [branch](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch). */
-static constexpr const char *kBranch = "branch";
-/** [tag](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag). */
-static constexpr const char *kTag = "tag";
-}  // namespace VcsRepositoryRefTypeValues
-
-}  // namespace SemanticConventions
-}  // namespace resource
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h
deleted file mode 100644
index 3a78d6f33..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <thread>
-
-#include "opentelemetry/sdk/common/circular_buffer.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_runtime_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * This is an implementation of the SpanProcessor which creates batches of finished spans and passes
- * the export-friendly span data representations to the configured SpanExporter.
- */
-class BatchSpanProcessor : public SpanProcessor
-{
-public:
-  /**
-   * Creates a batch span processor by configuring the specified exporter and other parameters
-   * as per the official, language-agnostic opentelemetry specs.
-   *
-   * @param exporter The backend exporter to pass the ended spans to.
-   * @param options The batch SpanProcessor configuration options.
-   */
-  BatchSpanProcessor(std::unique_ptr<SpanExporter> &&exporter,
-                     const BatchSpanProcessorOptions &options);
-
-  /**
-   * Creates a batch span processor by configuring the specified exporter and other parameters
-   * as per the official, language-agnostic opentelemetry specs.
-   *
-   * @param exporter The backend exporter to pass the ended spans to.
-   * @param options The batch SpanProcessor configuration options.
-   * @param runtime_options The batch SpanProcessor runtime options.
-   */
-  BatchSpanProcessor(std::unique_ptr<SpanExporter> &&exporter,
-                     const BatchSpanProcessorOptions &options,
-                     const BatchSpanProcessorRuntimeOptions &runtime_options);
-
-  /**
-   * Requests a Recordable(Span) from the configured exporter.
-   *
-   * @return A recordable generated by the backend exporter
-   */
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override;
-
-  /**
-   * Called when a span is started.
-   *
-   * NOTE: This method is a no-op.
-   *
-   * @param span - The span that just started
-   * @param parent_context - The parent context of the span that just started
-   */
-  void OnStart(Recordable &span,
-               const opentelemetry::trace::SpanContext &parent_context) noexcept override;
-
-  /**
-   * Called when a span ends.
-   *
-   * @param span - A recordable for a span that just ended
-   */
-  void OnEnd(std::unique_ptr<Recordable> &&span) noexcept override;
-
-  /**
-   * Export all ended spans that have not been exported yet.
-   *
-   * NOTE: Timeout functionality not supported yet.
-   */
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of
-   * all its ended spans and passes them to the exporter. Any subsequent calls to OnStart, OnEnd,
-   * ForceFlush or Shutdown will return immediately without doing anything.
-   *
-   * NOTE: Timeout functionality not supported yet.
-   */
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
-
-  /**
-   * Class destructor which invokes the Shutdown() method. The Shutdown() method is supposed to be
-   * invoked when the Tracer is shutdown (as per other languages), but the C++ Tracer only takes
-   * shared ownership of the processor, and thus doesn't call Shutdown (as the processor might be
-   * shared with other Tracers).
-   */
-  ~BatchSpanProcessor() override;
-
-protected:
-  /**
-   * The background routine performed by the worker thread.
-   */
-  void DoBackgroundWork();
-
-  /**
-   * Exports all ended spans to the configured exporter.
-   *
-   */
-  virtual void Export();
-
-  /**
-   * Called when Shutdown() is invoked. Completely drains the queue of all its ended spans and
-   * passes them to the exporter.
-   */
-  void DrainQueue();
-
-  struct SynchronizationData
-  {
-    /* Synchronization primitives */
-    std::condition_variable cv, force_flush_cv;
-    std::mutex cv_m, force_flush_cv_m, shutdown_m;
-
-    /* Important boolean flags to handle the workflow of the processor */
-    std::atomic<bool> is_force_wakeup_background_worker{false};
-    std::atomic<bool> is_shutdown{false};
-    std::atomic<uint64_t> force_flush_pending_sequence{0};
-    std::atomic<uint64_t> force_flush_notified_sequence{0};
-    std::atomic<std::chrono::microseconds::rep> force_flush_timeout_us{0};
-
-    // Do not use SynchronizationData() = default; here, some versions of GCC&Clang have BUGs
-    // and may not initialize the member correctly. See also
-    // https://stackoverflow.com/questions/53408962/try-to-understand-compiler-error-message-default-member-initializer-required-be
-    inline SynchronizationData() {}
-  };
-
-  /**
-   * @brief Notify completion of shutdown and force flush. This may be called from the any thread at
-   * any time
-   *
-   * @param notify_force_flush Sequence to indicate whether to notify force flush completion.
-   * @param synchronization_data Synchronization data to be notified.
-   */
-  static void NotifyCompletion(uint64_t notify_force_flush,
-                               const std::unique_ptr<SpanExporter> &exporter,
-                               const std::shared_ptr<SynchronizationData> &synchronization_data);
-
-  void GetWaitAdjustedTime(std::chrono::microseconds &timeout,
-                           std::chrono::time_point<std::chrono::system_clock> &start_time);
-  /* The configured backend exporter */
-  std::unique_ptr<SpanExporter> exporter_;
-
-  /* Configurable parameters as per the official specs */
-  const size_t max_queue_size_;
-  const std::chrono::milliseconds schedule_delay_millis_;
-  const size_t max_export_batch_size_;
-
-  /* The buffer/queue to which the ended spans are added */
-  opentelemetry::sdk::common::CircularBuffer<Recordable> buffer_;
-
-  std::shared_ptr<SynchronizationData> synchronization_data_;
-
-  /* The background worker thread */
-  std::shared_ptr<sdk::common::ThreadInstrumentation> worker_thread_instrumentation_;
-  std::thread worker_thread_;
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_factory.h
deleted file mode 100644
index 4ceddc6ae..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_factory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_runtime_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for BatchSpanProcessor.
- */
-class OPENTELEMETRY_EXPORT BatchSpanProcessorFactory
-{
-public:
-  /**
-   * Create a BatchSpanProcessor.
-   */
-  static std::unique_ptr<SpanProcessor> Create(std::unique_ptr<SpanExporter> &&exporter,
-                                               const BatchSpanProcessorOptions &options);
-
-  /**
-   * Create a BatchSpanProcessor.
-   */
-  static std::unique_ptr<SpanProcessor> Create(
-      std::unique_ptr<SpanExporter> &&exporter,
-      const BatchSpanProcessorOptions &options,
-      const BatchSpanProcessorRuntimeOptions &runtime_options);
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h
deleted file mode 100644
index ac1052383..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_options.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-namespace trace
-{
-
-/**
- * Struct to hold batch SpanProcessor options.
- */
-struct BatchSpanProcessorOptions
-{
-  /**
-   * The maximum buffer/queue size. After the size is reached, spans are
-   * dropped.
-   */
-  size_t max_queue_size = 2048;
-
-  /* The time interval between two consecutive exports. */
-  std::chrono::milliseconds schedule_delay_millis = std::chrono::milliseconds(5000);
-
-  /**
-   * The maximum batch size of every export. It must be smaller or
-   * equal to max_queue_size.
-   */
-  size_t max_export_batch_size = 512;
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_runtime_options.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_runtime_options.h
deleted file mode 100644
index 25674649e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/batch_span_processor_runtime_options.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-
-#include "opentelemetry/sdk/common/thread_instrumentation.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-
-namespace trace
-{
-
-/**
- * Struct to hold batch SpanProcessor runtime options.
- */
-struct BatchSpanProcessorRuntimeOptions
-{
-  std::shared_ptr<sdk::common::ThreadInstrumentation> thread_instrumentation =
-      std::shared_ptr<sdk::common::ThreadInstrumentation>(nullptr);
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/exporter.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/exporter.h
deleted file mode 100644
index ab3b39da9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/exporter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * SpanExporter defines the interface that protocol-specific span exporters must
- * implement.
- */
-class OPENTELEMETRY_EXPORT SpanExporter
-{
-public:
-  SpanExporter();
-  virtual ~SpanExporter();
-
-  /**
-   * Create a span recordable. This object will be used to record span data and
-   * will subsequently be passed to SpanExporter::Export. Vendors can implement
-   * custom recordables or use the default SpanData recordable provided by the
-   * SDK.
-   * @return a newly initialized Recordable object
-   *
-   * Note: This method must be callable from multiple threads.
-   */
-  virtual std::unique_ptr<Recordable> MakeRecordable() noexcept = 0;
-
-  /**
-   * Exports a batch of span recordables. This method must not be called
-   * concurrently for the same exporter instance.
-   * @param spans a span of unique pointers to span recordables
-   */
-  virtual sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<Recordable>> &spans) noexcept = 0;
-
-  /**
-   * Export all spans that have been exported.
-   * @param timeout an optional timeout, the default timeout means that no
-   * timeout is applied.
-   * @return return true when all data are exported, and false when timeout
-   */
-  virtual bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-
-  /**
-   * Shut down the exporter.
-   * @param timeout an optional timeout.
-   * @return return the status of the operation.
-   */
-  virtual bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/id_generator.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/id_generator.h
deleted file mode 100644
index 8e868efce..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/id_generator.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/** IdGenerator provides an interface for generating Trace Id and Span Id */
-class IdGenerator
-{
-public:
-  IdGenerator(bool is_random) : is_random_(is_random) {}
-
-  virtual ~IdGenerator() = default;
-
-  /** Returns a SpanId represented by opaque 128-bit trace identifier */
-  virtual opentelemetry::trace::SpanId GenerateSpanId() noexcept = 0;
-
-  /** Returns a TraceId represented by opaque 64-bit trace identifier */
-  virtual opentelemetry::trace::TraceId GenerateTraceId() noexcept = 0;
-
-  bool IsRandom() const { return is_random_; }
-
-private:
-  /** True if GenerateTraceId() is random,
-   * per https://www.w3.org/TR/trace-context-2/#random-trace-id-flag
-   */
-  bool is_random_;
-};
-}  // namespace trace
-
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/multi_recordable.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/multi_recordable.h
deleted file mode 100644
index e8ad3ea39..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/multi_recordable.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <map>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-namespace
-{
-std::size_t MakeKey(const SpanProcessor &processor)
-{
-  return reinterpret_cast<std::size_t>(&processor);
-}
-
-}  // namespace
-
-class MultiRecordable : public Recordable
-{
-public:
-  void AddRecordable(const SpanProcessor &processor,
-                     std::unique_ptr<Recordable> recordable) noexcept
-  {
-    recordables_[MakeKey(processor)] = std::move(recordable);
-  }
-
-  const std::unique_ptr<Recordable> &GetRecordable(const SpanProcessor &processor) const noexcept
-  {
-    // TODO - return nullptr ref on failed lookup?
-    auto i = recordables_.find(MakeKey(processor));
-    if (i != recordables_.end())
-    {
-      return i->second;
-    }
-    static std::unique_ptr<Recordable> empty(nullptr);
-    return empty;
-  }
-
-  std::unique_ptr<Recordable> ReleaseRecordable(const SpanProcessor &processor) noexcept
-  {
-    auto i = recordables_.find(MakeKey(processor));
-    if (i != recordables_.end())
-    {
-      std::unique_ptr<Recordable> result(i->second.release());
-      recordables_.erase(MakeKey(processor));
-      return result;
-    }
-    return std::unique_ptr<Recordable>(nullptr);
-  }
-
-  void SetIdentity(const opentelemetry::trace::SpanContext &span_context,
-                   opentelemetry::trace::SpanId parent_span_id) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetIdentity(span_context, parent_span_id);
-    }
-  }
-
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetAttribute(key, value);
-    }
-  }
-
-  void AddEvent(nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept override
-  {
-
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->AddEvent(name, timestamp, attributes);
-    }
-  }
-
-  void AddLink(const opentelemetry::trace::SpanContext &span_context,
-               const opentelemetry::common::KeyValueIterable &attributes) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->AddLink(span_context, attributes);
-    }
-  }
-
-  void SetStatus(opentelemetry::trace::StatusCode code,
-                 nostd::string_view description) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetStatus(code, description);
-    }
-  }
-
-  void SetName(nostd::string_view name) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetName(name);
-    }
-  }
-
-  void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetTraceFlags(flags);
-    }
-  }
-
-  void SetSpanKind(opentelemetry::trace::SpanKind span_kind) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetSpanKind(span_kind);
-    }
-  }
-
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetResource(resource);
-    }
-  }
-
-  void SetStartTime(opentelemetry::common::SystemTimestamp start_time) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetStartTime(start_time);
-    }
-  }
-
-  void SetDuration(std::chrono::nanoseconds duration) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetDuration(duration);
-    }
-  }
-
-  void SetInstrumentationScope(const InstrumentationScope &instrumentation_scope) noexcept override
-  {
-    for (auto &recordable : recordables_)
-    {
-      recordable.second->SetInstrumentationScope(instrumentation_scope);
-    }
-  }
-
-private:
-  std::map<std::size_t, std::unique_ptr<Recordable>> recordables_;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h
deleted file mode 100644
index 094c5b3e2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/multi_span_processor.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <mutex>
-#include <vector>
-
-#include "opentelemetry/sdk/trace/multi_recordable.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/** Instantiation options. */
-struct MultiSpanProcessorOptions
-{};
-
-/**
- * Span processor allow hooks for span start and end method invocations.
- *
- * Built-in span processors are responsible for batching and conversion of
- * spans to exportable representation and passing batches to exporters.
- */
-class MultiSpanProcessor : public SpanProcessor
-{
-public:
-  MultiSpanProcessor(std::vector<std::unique_ptr<SpanProcessor>> &&processors)
-      : head_(nullptr), tail_(nullptr), count_(0)
-  {
-    for (auto &processor : processors)
-    {
-      AddProcessor(std::move(processor));
-    }
-  }
-
-  void AddProcessor(std::unique_ptr<SpanProcessor> &&processor)
-  {
-    // Add preocessor to end of the list.
-    if (processor)
-    {
-      ProcessorNode *pNode = new ProcessorNode(std::move(processor), tail_);
-      if (count_ > 0)
-      {
-        tail_->next_ = pNode;
-        tail_        = pNode;
-      }
-      else
-      {
-        head_ = tail_ = pNode;
-      }
-      count_++;
-    }
-  }
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override
-  {
-    auto recordable       = std::unique_ptr<Recordable>(new MultiRecordable);
-    auto multi_recordable = static_cast<MultiRecordable *>(recordable.get());
-    ProcessorNode *node   = head_;
-    while (node != nullptr)
-    {
-      auto processor = node->value_.get();
-      multi_recordable->AddRecordable(*processor, processor->MakeRecordable());
-      node = node->next_;
-    }
-    return recordable;
-  }
-
-  virtual void OnStart(Recordable &span,
-                       const opentelemetry::trace::SpanContext &parent_context) noexcept override
-  {
-    auto multi_recordable = static_cast<MultiRecordable *>(&span);
-    ProcessorNode *node   = head_;
-    while (node != nullptr)
-    {
-      auto processor   = node->value_.get();
-      auto &recordable = multi_recordable->GetRecordable(*processor);
-      if (recordable != nullptr)
-      {
-        processor->OnStart(*recordable, parent_context);
-      }
-      node = node->next_;
-    }
-  }
-
-  virtual void OnEnd(std::unique_ptr<Recordable> &&span) noexcept override
-  {
-    auto multi_recordable = static_cast<MultiRecordable *>(span.release());
-    ProcessorNode *node   = head_;
-    while (node != nullptr)
-    {
-      auto processor  = node->value_.get();
-      auto recordable = multi_recordable->ReleaseRecordable(*processor);
-      if (recordable != nullptr)
-      {
-        processor->OnEnd(std::move(recordable));
-      }
-      node = node->next_;
-    }
-    delete multi_recordable;
-  }
-
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    bool result         = true;
-    ProcessorNode *node = head_;
-    while (node != nullptr)
-    {
-      auto processor = node->value_.get();
-      result |= processor->ForceFlush(timeout);
-      node = node->next_;
-    }
-    return result;
-  }
-
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    bool result         = true;
-    ProcessorNode *node = head_;
-    while (node != nullptr)
-    {
-      auto processor = node->value_.get();
-      result |= processor->Shutdown(timeout);
-      node = node->next_;
-    }
-    return result;
-  }
-
-  ~MultiSpanProcessor() override
-  {
-    Shutdown();
-    Cleanup();
-  }
-
-private:
-  struct ProcessorNode
-  {
-    std::unique_ptr<SpanProcessor> value_;
-    ProcessorNode *next_, *prev_;
-    ProcessorNode(std::unique_ptr<SpanProcessor> &&value,
-                  ProcessorNode *prev = nullptr,
-                  ProcessorNode *next = nullptr)
-        : value_(std::move(value)), next_(next), prev_(prev)
-    {}
-  };
-
-  void Cleanup()
-  {
-    if (count_)
-    {
-      ProcessorNode *node = tail_;
-      while (node != nullptr)
-      {
-        if (node->next_ != nullptr)
-        {
-          delete node->next_;
-          node->next_ = nullptr;
-        }
-        if (node->prev_ != nullptr)
-        {
-          node = node->prev_;
-        }
-        else
-        {
-          delete node;
-          node = nullptr;
-        }
-      }
-      head_ = tail_ = nullptr;
-      count_        = 0;
-    }
-  }
-
-  ProcessorNode *head_, *tail_;
-  size_t count_;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/processor.h
deleted file mode 100644
index 951c2ec6b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/processor.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-class SpanContext;
-}  // namespace trace
-
-namespace sdk
-{
-namespace trace
-{
-class Recordable;
-
-/**
- * Span processor allow hooks for span start and end method invocations.
- *
- * Built-in span processors are responsible for batching and conversion of
- * spans to exportable representation and passing batches to exporters.
- */
-class OPENTELEMETRY_EXPORT SpanProcessor
-{
-public:
-  virtual ~SpanProcessor() = default;
-
-  /**
-   * Create a span recordable. This requests a new span recordable from the
-   * associated exporter.
-   * @return a newly initialized recordable
-   *
-   * Note: This method must be callable from multiple threads.
-   */
-  virtual std::unique_ptr<Recordable> MakeRecordable() noexcept = 0;
-
-  /**
-   * OnStart is called when a span is started.
-   * @param span a recordable for a span that was just started
-   * @param parent_context The parent context of the span that just started
-   */
-  virtual void OnStart(Recordable &span,
-                       const opentelemetry::trace::SpanContext &parent_context) noexcept = 0;
-
-  /**
-   * OnEnd is called when a span is ended.
-   * @param span a recordable for a span that was ended
-   */
-  virtual void OnEnd(std::unique_ptr<Recordable> &&span) noexcept = 0;
-
-  /**
-   * Export all ended spans that have not yet been exported.
-   * @param timeout an optional timeout, the default timeout means that no
-   * timeout is applied.
-   */
-  virtual bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-
-  /**
-   * Shut down the processor and do any cleanup required. Ended spans are
-   * exported before shutdown. After the call to Shutdown, subsequent calls to
-   * OnStart, OnEnd, ForceFlush or Shutdown will return immediately without
-   * doing anything.
-   * @param timeout an optional timeout, the default timeout means that no
-   * timeout is applied.
-   */
-  virtual bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept = 0;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/provider.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/provider.h
deleted file mode 100644
index 98d3ca3a0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/provider.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Changes the singleton global TracerProvider.
- */
-class OPENTELEMETRY_EXPORT Provider
-{
-public:
-  /**
-   * Changes the singleton TracerProvider.
-   */
-  static void SetTracerProvider(
-      const nostd::shared_ptr<opentelemetry::trace::TracerProvider> &tp) noexcept;
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/random_id_generator.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/random_id_generator.h
deleted file mode 100644
index 01e460563..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/random_id_generator.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-class RandomIdGenerator : public IdGenerator
-{
-public:
-  RandomIdGenerator() : IdGenerator(true) {}
-
-  opentelemetry::trace::SpanId GenerateSpanId() noexcept override;
-
-  opentelemetry::trace::TraceId GenerateTraceId() noexcept override;
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/random_id_generator_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/random_id_generator_factory.h
deleted file mode 100644
index a1915d313..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/random_id_generator_factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for RandomIdGenerator.
- */
-class RandomIdGeneratorFactory
-{
-public:
-  /**
-   * Create a RandomIdGenerator.
-   */
-  static std::unique_ptr<IdGenerator> Create();
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/recordable.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/recordable.h
deleted file mode 100644
index 5918b8013..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/recordable.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/empty_attributes.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/version.h"
-
-// TODO: Create generic short pattern for opentelemetry::common and opentelemetry::trace
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class KeyValueIterable;
-}  // namespace common
-
-namespace sdk
-{
-namespace resource
-{
-class Resource;
-}  // namespace resource
-
-namespace trace
-{
-
-using namespace opentelemetry::sdk::instrumentationscope;
-class SpanData;
-
-/**
- * Maintains a representation of a span in a format that can be processed by a recorder.
- *
- * This class is thread-compatible.
- */
-class Recordable
-{
-public:
-  virtual ~Recordable() = default;
-
-  /**
-   * Set the span context and parent span id
-   * @param span_context the span context to set
-   * @param parent_span_id the parent span id to set
-   */
-  virtual void SetIdentity(const opentelemetry::trace::SpanContext &span_context,
-                           opentelemetry::trace::SpanId parent_span_id) noexcept = 0;
-
-  /**
-   * Set an attribute of a span.
-   * @param name the name of the attribute
-   * @param value the attribute value
-   */
-  virtual void SetAttribute(nostd::string_view key,
-                            const opentelemetry::common::AttributeValue &value) noexcept = 0;
-
-  /**
-   * Add an event to a span.
-   * @param name the name of the event
-   * @param timestamp the timestamp of the event
-   * @param attributes the attributes associated with the event
-   */
-  virtual void AddEvent(nostd::string_view name,
-                        opentelemetry::common::SystemTimestamp timestamp,
-                        const opentelemetry::common::KeyValueIterable &attributes) noexcept = 0;
-
-  /**
-   * Add an event to a span with default timestamp and attributes.
-   * @param name the name of the event
-   */
-  void AddEvent(nostd::string_view name)
-  {
-    AddEvent(name, opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()),
-             opentelemetry::sdk::GetEmptyAttributes());
-  }
-
-  /**
-   * Add an event to a span with default (empty) attributes.
-   * @param name the name of the event
-   * @param timestamp the timestamp of the event
-   */
-  void AddEvent(nostd::string_view name, opentelemetry::common::SystemTimestamp timestamp)
-  {
-    AddEvent(name, timestamp, opentelemetry::sdk::GetEmptyAttributes());
-  }
-
-  /**
-   * Add an event to a span.
-   * @param name the name of the event
-   * @param attributes the attributes associated with the event
-   */
-  void AddEvent(nostd::string_view name,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept
-  {
-    AddEvent(name, opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()),
-             attributes);
-  }
-
-  /**
-   * Add a link to a span.
-   * @param span_context the span context of the linked span
-   * @param attributes the attributes associated with the link
-   */
-  virtual void AddLink(const opentelemetry::trace::SpanContext &span_context,
-                       const opentelemetry::common::KeyValueIterable &attributes) noexcept = 0;
-
-  /**
-   * Add a link to a span with default (empty) attributes.
-   * @param span_context the span context of the linked span
-   */
-  void AddLink(opentelemetry::trace::SpanContext span_context)
-  {
-    AddLink(span_context, opentelemetry::sdk::GetEmptyAttributes());
-  }
-
-  /**
-   * Set the status of the span.
-   * @param code the status code
-   * @param description a description of the status
-   */
-  virtual void SetStatus(opentelemetry::trace::StatusCode code,
-                         nostd::string_view description) noexcept = 0;
-
-  /**
-   * Set the name of the span.
-   * @param name the name to set
-   */
-  virtual void SetName(nostd::string_view name) noexcept = 0;
-
-  /**
-   * Set the trace flags of the span.
-   * @param flags the flags to set
-   */
-  virtual void SetTraceFlags(opentelemetry::trace::TraceFlags /* flags */) noexcept {}
-
-  /**
-   * Set the spankind of the span.
-   * @param span_kind the spankind to set
-   */
-  virtual void SetSpanKind(opentelemetry::trace::SpanKind span_kind) noexcept = 0;
-
-  /**
-   * Set Resource of the span
-   * @param Resource the resource to set
-   */
-  virtual void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept = 0;
-
-  /**
-   * Set the start time of the span.
-   * @param start_time the start time to set
-   */
-  virtual void SetStartTime(opentelemetry::common::SystemTimestamp start_time) noexcept = 0;
-
-  /**
-   * Set the duration of the span.
-   * @param duration the duration to set
-   */
-  virtual void SetDuration(std::chrono::nanoseconds duration) noexcept = 0;
-
-  /**
-   * Get the SpanData object for this Recordable.
-   *
-   * @return SpanData*
-   */
-
-  virtual explicit operator SpanData *() const { return nullptr; }
-
-  /**
-   * Set the instrumentation scope of the span.
-   * @param instrumentation_scope the instrumentation scope to set
-   */
-  virtual void SetInstrumentationScope(
-      const InstrumentationScope &instrumentation_scope) noexcept = 0;
-
-  OPENTELEMETRY_DEPRECATED_MESSAGE("Please use SetInstrumentationScope instead")
-  void SetInstrumentationLibrary(const InstrumentationScope &instrumentation_scope) noexcept
-  {
-    SetInstrumentationScope(instrumentation_scope);
-  }
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/sampler.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/sampler.h
deleted file mode 100644
index b90a2e66b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/sampler.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class KeyValueIterable;
-}  // namespace common
-
-namespace trace
-{
-class SpanContext;
-class SpanContextKeyValueIterable;
-class TraceState;
-}  // namespace trace
-
-namespace sdk
-{
-namespace trace
-{
-/**
- * A sampling Decision for a Span to be created.
- */
-enum class Decision
-{
-  // IsRecording() == false, span will not be recorded and all events and attributes will be
-  // dropped.
-  DROP,
-  // IsRecording() == true, but Sampled flag MUST NOT be set.
-  RECORD_ONLY,
-  // IsRecording() == true AND Sampled flag` MUST be set.
-  RECORD_AND_SAMPLE
-};
-
-/**
- * The output of ShouldSample.
- * It contains a sampling Decision and a set of Span Attributes.
- */
-struct SamplingResult
-{
-  Decision decision;
-  // A set of span Attributes that will also be added to the Span. Can be nullptr.
-  std::unique_ptr<const std::map<std::string, opentelemetry::common::AttributeValue>> attributes;
-  //  The tracestate used by the span.
-  nostd::shared_ptr<opentelemetry::trace::TraceState> trace_state;
-
-  inline bool IsRecording()
-  {
-    return decision == Decision::RECORD_ONLY || decision == Decision::RECORD_AND_SAMPLE;
-  }
-  inline bool IsSampled() { return decision == Decision::RECORD_AND_SAMPLE; }
-};
-
-/**
- * The Sampler interface allows users to create custom samplers which will return a
- * SamplingResult based on information that is typically available just before the Span was created.
- */
-class Sampler
-{
-public:
-  virtual ~Sampler() = default;
-  /**
-   * Called during Span creation to make a sampling decision.
-   *
-   * @param parent_context a const reference to the SpanContext of a parent Span.
-   *        An invalid SpanContext if this is a root span.
-   * @param trace_id the TraceId for the new Span. This will be identical to that in
-   *        the parentContext, unless this is a root span.
-   * @param name the name of the new Span.
-   * @param spanKind the opentelemetry::trace::SpanKind of the Span.
-   * @param attributes list of AttributeValue with their keys.
-   * @param links Collection of links that will be associated with the Span to be created.
-   * @return sampling result whether span should be sampled or not.
-   * @since 0.1.0
-   */
-
-  virtual SamplingResult ShouldSample(
-      const opentelemetry::trace::SpanContext &parent_context,
-      opentelemetry::trace::TraceId trace_id,
-      nostd::string_view name,
-      opentelemetry::trace::SpanKind span_kind,
-      const opentelemetry::common::KeyValueIterable &attributes,
-      const opentelemetry::trace::SpanContextKeyValueIterable &links) noexcept = 0;
-
-  /**
-   * Returns the sampler name or short description with the configuration.
-   * This may be displayed on debug pages or in the logs.
-   *
-   * @return the description of this Sampler.
-   */
-  virtual nostd::string_view GetDescription() const noexcept = 0;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h
deleted file mode 100644
index a857086d2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_off.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-/**
- * The always off sampler always returns DROP, effectively disabling
- * tracing functionality.
- */
-class AlwaysOffSampler : public Sampler
-{
-public:
-  /**
-   * @return Returns DROP always
-   */
-  SamplingResult ShouldSample(
-      const opentelemetry::trace::SpanContext &parent_context,
-      opentelemetry::trace::TraceId /*trace_id*/,
-      nostd::string_view /*name*/,
-      opentelemetry::trace::SpanKind /*span_kind*/,
-      const opentelemetry::common::KeyValueIterable & /*attributes*/,
-      const opentelemetry::trace::SpanContextKeyValueIterable & /*links*/) noexcept override
-  {
-    if (!parent_context.IsValid())
-    {
-      return {Decision::DROP, nullptr, opentelemetry::trace::TraceState::GetDefault()};
-    }
-    else
-    {
-      return {Decision::DROP, nullptr, parent_context.trace_state()};
-    }
-  }
-
-  /**
-   * @return Description MUST be AlwaysOffSampler
-   */
-  nostd::string_view GetDescription() const noexcept override { return "AlwaysOffSampler"; }
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_off_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_off_factory.h
deleted file mode 100644
index af676dead..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_off_factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for AlwaysOffSampler.
- */
-class AlwaysOffSamplerFactory
-{
-public:
-  /**
-   * Create an AlwaysOffSampler.
-   */
-  static std::unique_ptr<Sampler> Create();
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_on.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_on.h
deleted file mode 100644
index 6b983008c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_on.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class KeyValueIterable;
-}  // namespace common
-
-namespace trace
-{
-class SpanContextKeyValueIterable;
-}  // namespace trace
-
-namespace sdk
-{
-namespace trace
-{
-/**
- * The always on sampler is a default sampler which always return Decision::RECORD_AND_SAMPLE
- */
-class AlwaysOnSampler : public Sampler
-{
-public:
-  /**
-   * @return Always return Decision RECORD_AND_SAMPLE
-   */
-  inline SamplingResult ShouldSample(
-      const opentelemetry::trace::SpanContext &parent_context,
-      opentelemetry::trace::TraceId /*trace_id*/,
-      nostd::string_view /*name*/,
-      opentelemetry::trace::SpanKind /*span_kind*/,
-      const opentelemetry::common::KeyValueIterable & /*attributes*/,
-      const opentelemetry::trace::SpanContextKeyValueIterable & /*links*/) noexcept override
-  {
-    if (!parent_context.IsValid())
-    {
-      return {Decision::RECORD_AND_SAMPLE, nullptr, opentelemetry::trace::TraceState::GetDefault()};
-    }
-    else
-    {
-      return {Decision::RECORD_AND_SAMPLE, nullptr, parent_context.trace_state()};
-    }
-  }
-
-  /**
-   * @return Description MUST be AlwaysOnSampler
-   */
-  inline nostd::string_view GetDescription() const noexcept override { return "AlwaysOnSampler"; }
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_on_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_on_factory.h
deleted file mode 100644
index 80b38f845..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/always_on_factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for AlwaysOnSampler.
- */
-class AlwaysOnSamplerFactory
-{
-public:
-  /**
-   * Create an AlwaysOnSampler.
-   */
-  static std::unique_ptr<Sampler> Create();
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/parent.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/parent.h
deleted file mode 100644
index e44e9fa32..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/parent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * The ParentBased sampler is a composite sampler. ParentBased(delegateSampler) either respects
- * the parent span's sampling decision or delegates to delegateSampler for root spans.
- */
-class ParentBasedSampler : public Sampler
-{
-public:
-  explicit ParentBasedSampler(const std::shared_ptr<Sampler> &delegate_sampler) noexcept;
-  /** The decision either respects the parent span's sampling decision or delegates to
-   * delegateSampler for root spans
-   * @return Returns DROP always
-   */
-  SamplingResult ShouldSample(
-      const opentelemetry::trace::SpanContext &parent_context,
-      opentelemetry::trace::TraceId trace_id,
-      nostd::string_view name,
-      opentelemetry::trace::SpanKind span_kind,
-      const opentelemetry::common::KeyValueIterable &attributes,
-      const opentelemetry::trace::SpanContextKeyValueIterable &links) noexcept override;
-
-  /**
-   * @return Description MUST be ParentBased{delegate_sampler_.getDescription()}
-   */
-  nostd::string_view GetDescription() const noexcept override;
-
-private:
-  const std::shared_ptr<Sampler> delegate_sampler_;
-  const std::string description_;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/parent_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/parent_factory.h
deleted file mode 100644
index d5cf59831..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/parent_factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for ParentBasedSampler.
- */
-class ParentBasedSamplerFactory
-{
-public:
-  /**
-   * Create a ParentBasedSampler.
-   */
-  static std::unique_ptr<Sampler> Create(const std::shared_ptr<Sampler> &delegate_sampler);
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h
deleted file mode 100644
index f1b895139..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-#include <string>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-/**
- * The TraceIdRatioBased sampler computes and returns a decision based on the
- * provided trace_id and the configured ratio.
- */
-class TraceIdRatioBasedSampler : public Sampler
-{
-public:
-  /**
-   * @param ratio a required value, 1.0 >= ratio >= 0.0. If the given trace_id
-   * falls into a given ratio of all possible trace_id values, ShouldSample will
-   * return RECORD_AND_SAMPLE.
-   * @throws invalid_argument if ratio is out of bounds [0.0, 1.0]
-   */
-  explicit TraceIdRatioBasedSampler(double ratio);
-
-  /**
-   * @return Returns either RECORD_AND_SAMPLE or DROP based on current
-   * sampler configuration and provided trace_id and ratio. trace_id
-   * is used as a pseudorandom value in conjunction with the predefined
-   * ratio to determine whether this trace should be sampled
-   */
-  SamplingResult ShouldSample(
-      const opentelemetry::trace::SpanContext & /*parent_context*/,
-      opentelemetry::trace::TraceId trace_id,
-      nostd::string_view /*name*/,
-      opentelemetry::trace::SpanKind /*span_kind*/,
-      const opentelemetry::common::KeyValueIterable & /*attributes*/,
-      const opentelemetry::trace::SpanContextKeyValueIterable & /*links*/) noexcept override;
-
-  /**
-   * @return Description MUST be TraceIdRatioBasedSampler{0.000100}
-   */
-  nostd::string_view GetDescription() const noexcept override;
-
-private:
-  std::string description_;
-  const uint64_t threshold_;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio_factory.h
deleted file mode 100644
index de6d98906..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/samplers/trace_id_ratio_factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for TraceIdRatioBasedSampler.
- */
-class TraceIdRatioBasedSamplerFactory
-{
-public:
-  /**
-   * Create a TraceIdRatioBasedSampler.
-   */
-  static std::unique_ptr<Sampler> Create(double ratio);
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/simple_processor.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/simple_processor.h
deleted file mode 100644
index ce6d378b7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/simple_processor.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <mutex>
-#include <utility>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-/**
- * The simple span processor passes finished recordables to the configured
- * SpanExporter, as soon as they are finished.
- *
- * OnEnd and ForceFlush are no-ops.
- *
- * All calls to the configured SpanExporter are synchronized using a
- * spin-lock on an atomic_flag.
- */
-class SimpleSpanProcessor : public SpanProcessor
-{
-public:
-  /**
-   * Initialize a simple span processor.
-   * @param exporter the exporter used by the span processor
-   */
-  explicit SimpleSpanProcessor(std::unique_ptr<SpanExporter> &&exporter) noexcept
-      : exporter_(std::move(exporter))
-  {}
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override
-  {
-    return exporter_->MakeRecordable();
-  }
-
-  void OnStart(Recordable & /* span */,
-               const opentelemetry::trace::SpanContext & /* parent_context */) noexcept override
-  {}
-
-  void OnEnd(std::unique_ptr<Recordable> &&span) noexcept override
-  {
-    nostd::span<std::unique_ptr<Recordable>> batch(&span, 1);
-    const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-    if (exporter_->Export(batch) == sdk::common::ExportResult::kFailure)
-    {
-      /* Once it is defined how the SDK does logging, an error should be
-       * logged in this case. */
-    }
-  }
-
-  bool ForceFlush(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    if (exporter_ != nullptr)
-    {
-      return exporter_->ForceFlush(timeout);
-    }
-
-    return true;
-  }
-
-  bool Shutdown(
-      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
-  {
-    // We only call shutdown ONCE.
-    if (exporter_ != nullptr && !shutdown_latch_.test_and_set(std::memory_order_acquire))
-    {
-      return exporter_->Shutdown(timeout);
-    }
-    return true;
-  }
-
-  ~SimpleSpanProcessor() override { Shutdown(); }
-
-private:
-  std::unique_ptr<SpanExporter> exporter_;
-  opentelemetry::common::SpinLockMutex lock_;
-#if defined(__cpp_lib_atomic_value_initialization) && \
-    __cpp_lib_atomic_value_initialization >= 201911L
-  std::atomic_flag shutdown_latch_{};
-#else
-  std::atomic_flag shutdown_latch_ = ATOMIC_FLAG_INIT;
-#endif
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/simple_processor_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/simple_processor_factory.h
deleted file mode 100644
index 2ae40c2f7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/simple_processor_factory.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for SimpleSpanProcessor.
- */
-class OPENTELEMETRY_EXPORT SimpleSpanProcessorFactory
-{
-public:
-  /**
-   * Create a SimpleSpanProcessor.
-   */
-  static std::unique_ptr<SpanProcessor> Create(std::unique_ptr<SpanExporter> &&exporter);
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/span_data.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/span_data.h
deleted file mode 100644
index 96b8e5dee..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/span_data.h
+++ /dev/null
@@ -1,328 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <map>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-/**
- * Class for storing events in SpanData.
- */
-class SpanDataEvent
-{
-public:
-  SpanDataEvent(std::string name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                const opentelemetry::common::KeyValueIterable &attributes)
-      : name_(name), timestamp_(timestamp), attribute_map_(attributes)
-  {}
-
-  /**
-   * Get the name for this event
-   * @return the name for this event
-   */
-  std::string GetName() const noexcept { return name_; }
-
-  /**
-   * Get the timestamp for this event
-   * @return the timestamp for this event
-   */
-  opentelemetry::common::SystemTimestamp GetTimestamp() const noexcept { return timestamp_; }
-
-  /**
-   * Get the attributes for this event
-   * @return the attributes for this event
-   */
-  const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &
-  GetAttributes() const noexcept
-  {
-    return attribute_map_.GetAttributes();
-  }
-
-private:
-  std::string name_;
-  opentelemetry::common::SystemTimestamp timestamp_;
-  opentelemetry::sdk::common::AttributeMap attribute_map_;
-};
-
-/**
- * Class for storing links in SpanData.
- */
-class SpanDataLink
-{
-public:
-  SpanDataLink(opentelemetry::trace::SpanContext span_context,
-               const opentelemetry::common::KeyValueIterable &attributes)
-      : span_context_(span_context), attribute_map_(attributes)
-  {}
-
-  /**
-   * Get the attributes for this link
-   * @return the attributes for this link
-   */
-  const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &
-  GetAttributes() const noexcept
-  {
-    return attribute_map_.GetAttributes();
-  }
-
-  /**
-   * Get the span context for this link
-   * @return the span context for this link
-   */
-  const opentelemetry::trace::SpanContext &GetSpanContext() const noexcept { return span_context_; }
-
-private:
-  opentelemetry::trace::SpanContext span_context_;
-  opentelemetry::sdk::common::AttributeMap attribute_map_;
-};
-
-/**
- * SpanData is a representation of all data collected by a span.
- */
-class SpanData final : public Recordable
-{
-public:
-  SpanData() : resource_{nullptr}, instrumentation_scope_{nullptr} {}
-  /**
-   * Get the trace id for this span
-   * @return the trace id for this span
-   */
-  opentelemetry::trace::TraceId GetTraceId() const noexcept { return span_context_.trace_id(); }
-
-  /**
-   * Get the span id for this span
-   * @return the span id for this span
-   */
-  opentelemetry::trace::SpanId GetSpanId() const noexcept { return span_context_.span_id(); }
-
-  /**
-   * Get the span context for this span
-   * @return the span context for this span
-   */
-  const opentelemetry::trace::SpanContext &GetSpanContext() const noexcept { return span_context_; }
-
-  /**
-   * Get the parent span id for this span
-   * @return the span id for this span's parent
-   */
-  opentelemetry::trace::SpanId GetParentSpanId() const noexcept { return parent_span_id_; }
-
-  /**
-   * Get the name for this span
-   * @return the name for this span
-   */
-  opentelemetry::nostd::string_view GetName() const noexcept { return name_; }
-
-  /**
-   * Get the trace flags for this span
-   * @return the trace flags for this span
-   */
-  opentelemetry::trace::TraceFlags GetFlags() const noexcept { return flags_; }
-
-  /**
-   * Get the kind of this span
-   * @return the kind of this span
-   */
-  opentelemetry::trace::SpanKind GetSpanKind() const noexcept { return span_kind_; }
-
-  /**
-   * Get the status for this span
-   * @return the status for this span
-   */
-  opentelemetry::trace::StatusCode GetStatus() const noexcept { return status_code_; }
-
-  /**
-   * Get the status description for this span
-   * @return the description of the the status of this span
-   */
-  opentelemetry::nostd::string_view GetDescription() const noexcept { return status_desc_; }
-
-  /**
-   * Get the attributes associated with the resource
-   * @returns the attributes associated with the resource configured for TracerProvider
-   */
-
-  const opentelemetry::sdk::resource::Resource &GetResource() const noexcept
-  {
-    if (resource_ == nullptr)
-    {
-      // this shouldn't happen as TraceProvider provides default resources
-      static opentelemetry::sdk::resource::Resource resource =
-          opentelemetry::sdk::resource::Resource::GetEmpty();
-      return resource;
-    }
-    return *resource_;
-  }
-
-  /**
-   * Get the attributes associated with the resource
-   * @returns the attributes associated with the resource configured for TracerProvider
-   */
-
-  const opentelemetry::sdk::trace::InstrumentationScope &GetInstrumentationScope() const noexcept
-  {
-    if (instrumentation_scope_ == nullptr)
-    {
-      // this shouldn't happen as Tracer ensures there is valid default instrumentation scope.
-      static std::unique_ptr<opentelemetry::sdk::instrumentationscope::InstrumentationScope>
-          instrumentation_scope =
-              opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-                  "unknown_service");
-      return *instrumentation_scope;
-    }
-    return *instrumentation_scope_;
-  }
-
-  OPENTELEMETRY_DEPRECATED_MESSAGE("Please use GetInstrumentationScope instead")
-  const opentelemetry::sdk::trace::InstrumentationScope &GetInstrumentationLibrary() const noexcept
-  {
-    return GetInstrumentationScope();
-  }
-
-  /**
-   * Get the start time for this span
-   * @return the start time for this span
-   */
-  opentelemetry::common::SystemTimestamp GetStartTime() const noexcept { return start_time_; }
-
-  /**
-   * Get the duration for this span
-   * @return the duration for this span
-   */
-  std::chrono::nanoseconds GetDuration() const noexcept { return duration_; }
-
-  /**
-   * Get the attributes for this span
-   * @return the attributes for this span
-   */
-  const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &
-  GetAttributes() const noexcept
-  {
-    return attribute_map_.GetAttributes();
-  }
-
-  /**
-   * Get the events associated with this span
-   * @return the events associated with this span
-   */
-  const std::vector<SpanDataEvent> &GetEvents() const noexcept { return events_; }
-
-  /**
-   * Get the links associated with this span
-   * @return the links associated with this span
-   */
-  const std::vector<SpanDataLink> &GetLinks() const noexcept { return links_; }
-
-  void SetIdentity(const opentelemetry::trace::SpanContext &span_context,
-                   opentelemetry::trace::SpanId parent_span_id) noexcept override
-  {
-    span_context_   = span_context;
-    parent_span_id_ = parent_span_id;
-  }
-
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override
-  {
-    attribute_map_.SetAttribute(key, value);
-  }
-
-  void AddEvent(nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp =
-                    opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()),
-                const opentelemetry::common::KeyValueIterable &attributes =
-                    opentelemetry::common::KeyValueIterableView<std::map<std::string, int32_t>>(
-                        {})) noexcept override
-  {
-    SpanDataEvent event(std::string(name), timestamp, attributes);
-    events_.push_back(event);
-  }
-
-  void AddLink(const opentelemetry::trace::SpanContext &span_context,
-               const opentelemetry::common::KeyValueIterable &attributes) noexcept override
-  {
-    SpanDataLink link(span_context, attributes);
-    links_.push_back(link);
-  }
-
-  void SetStatus(opentelemetry::trace::StatusCode code,
-                 nostd::string_view description) noexcept override
-  {
-    status_code_ = code;
-    status_desc_ = std::string(description);
-  }
-
-  void SetName(nostd::string_view name) noexcept override
-  {
-    name_ = std::string(name.data(), name.length());
-  }
-
-  void SetTraceFlags(opentelemetry::trace::TraceFlags flags) noexcept override { flags_ = flags; }
-
-  void SetSpanKind(opentelemetry::trace::SpanKind span_kind) noexcept override
-  {
-    span_kind_ = span_kind;
-  }
-
-  void SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept override
-  {
-    resource_ = &resource;
-  }
-
-  void SetStartTime(opentelemetry::common::SystemTimestamp start_time) noexcept override
-  {
-    start_time_ = start_time;
-  }
-
-  void SetDuration(std::chrono::nanoseconds duration) noexcept override { duration_ = duration; }
-
-  void SetInstrumentationScope(const InstrumentationScope &instrumentation_scope) noexcept override
-  {
-    instrumentation_scope_ = &instrumentation_scope;
-  }
-
-private:
-  opentelemetry::trace::SpanContext span_context_{false, false};
-  opentelemetry::trace::SpanId parent_span_id_;
-  opentelemetry::common::SystemTimestamp start_time_;
-  std::chrono::nanoseconds duration_{0};
-  std::string name_;
-  opentelemetry::trace::StatusCode status_code_{opentelemetry::trace::StatusCode::kUnset};
-  std::string status_desc_;
-  opentelemetry::sdk::common::AttributeMap attribute_map_;
-  std::vector<SpanDataEvent> events_;
-  std::vector<SpanDataLink> links_;
-  opentelemetry::trace::TraceFlags flags_;
-  opentelemetry::trace::SpanKind span_kind_{opentelemetry::trace::SpanKind::kInternal};
-  const opentelemetry::sdk::resource::Resource *resource_;
-  const InstrumentationScope *instrumentation_scope_;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer.h
deleted file mode 100644
index 26693e189..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-using namespace opentelemetry::sdk::instrumentationscope;
-
-class Tracer final : public opentelemetry::trace::Tracer,
-                     public std::enable_shared_from_this<Tracer>
-{
-public:
-  /** Construct a new Tracer with the given context pipeline. */
-  explicit Tracer(std::shared_ptr<TracerContext> context,
-                  std::unique_ptr<InstrumentationScope> instrumentation_scope =
-                      InstrumentationScope::Create("")) noexcept;
-
-  nostd::shared_ptr<opentelemetry::trace::Span> StartSpan(
-      nostd::string_view name,
-      const opentelemetry::common::KeyValueIterable &attributes,
-      const opentelemetry::trace::SpanContextKeyValueIterable &links,
-      const opentelemetry::trace::StartSpanOptions &options = {}) noexcept override;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * Force any buffered spans to flush.
-   * @param timeout to complete the flush
-   */
-  template <class Rep, class Period>
-  void ForceFlush(std::chrono::duration<Rep, Period> timeout) noexcept
-  {
-    this->ForceFlushWithMicroseconds(static_cast<uint64_t>(
-        std::chrono::duration_cast<std::chrono::microseconds>(timeout).count()));
-  }
-
-  void ForceFlushWithMicroseconds(uint64_t timeout) noexcept;
-
-  /**
-   * ForceFlush any buffered spans and stop reporting spans.
-   * @param timeout to complete the flush
-   */
-  template <class Rep, class Period>
-  void Close(std::chrono::duration<Rep, Period> timeout) noexcept
-  {
-    this->CloseWithMicroseconds(static_cast<uint64_t>(
-        std::chrono::duration_cast<std::chrono::microseconds>(timeout).count()));
-  }
-
-  void CloseWithMicroseconds(uint64_t timeout) noexcept;
-#else
-  /* Exposed in the API in ABI version 1, but does not belong to the API */
-  void ForceFlushWithMicroseconds(uint64_t timeout) noexcept override;
-
-  void CloseWithMicroseconds(uint64_t timeout) noexcept override;
-#endif
-
-  /** Returns the configured span processor. */
-  SpanProcessor &GetProcessor() noexcept { return context_->GetProcessor(); }
-
-  /** Returns the configured Id generator */
-  IdGenerator &GetIdGenerator() const noexcept { return context_->GetIdGenerator(); }
-
-  /** Returns the associated instrumentation scope */
-  const InstrumentationScope &GetInstrumentationScope() const noexcept
-  {
-    return *instrumentation_scope_;
-  }
-
-  OPENTELEMETRY_DEPRECATED_MESSAGE("Please use GetInstrumentationScope instead")
-  const InstrumentationScope &GetInstrumentationLibrary() const noexcept
-  {
-    return GetInstrumentationScope();
-  }
-
-  /** Returns the currently configured resource **/
-  const opentelemetry::sdk::resource::Resource &GetResource() { return context_->GetResource(); }
-
-  // Note: Test only
-  Sampler &GetSampler() { return context_->GetSampler(); }
-
-private:
-  // order of declaration is important here - instrumentation scope should destroy after
-  // tracer-context.
-  std::shared_ptr<InstrumentationScope> instrumentation_scope_;
-  std::shared_ptr<TracerContext> context_;
-  TracerConfig tracer_config_;
-  static const std::shared_ptr<opentelemetry::trace::NoopTracer> kNoopTracer;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_config.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_config.h
deleted file mode 100644
index 3fa5a144d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_config.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-/**
- * TracerConfig defines various configurable aspects of a Tracer's behavior.
- * This class should not be used directly to configure a Tracer's behavior, instead a
- * ScopeConfigurator should be used to compute the desired TracerConfig which can then be used to
- * configure a Tracer.
- */
-class OPENTELEMETRY_EXPORT TracerConfig
-{
-public:
-  bool operator==(const TracerConfig &other) const noexcept;
-
-  /**
-   * Returns if the Tracer is enabled or disabled. Tracers are enabled by default.
-   * @return a boolean indicating if the Tracer is enabled. Defaults to true.
-   */
-  bool IsEnabled() const noexcept;
-
-  /**
-   * Returns a TracerConfig that represents a disabled Tracer. A disabled tracer behaves like a
-   * no-op tracer.
-   * @return a static constant TracerConfig that represents a disabled tracer.
-   */
-  static TracerConfig Disabled();
-
-  /**
-   * Returns a TracerConfig that represents an enabled Tracer.
-   * @return a static constant TracerConfig that represents an enabled tracer.
-   */
-  static TracerConfig Enabled();
-
-  /**
-   * Returns a TracerConfig that represents a Tracer configured with the default behavior.
-   * The default behavior is guided by the OpenTelemetry specification.
-   * @return a static constant TracerConfig that represents a tracer configured with default
-   * behavior.
-   */
-  static TracerConfig Default();
-
-private:
-  explicit TracerConfig(const bool disabled = false) : disabled_(disabled) {}
-  bool disabled_;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_context.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_context.h
deleted file mode 100644
index 90beb9a2c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_context.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/random_id_generator.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * A class which stores the TracerProvider context.
- *
- * This class meets the following design criteria:
- * - A shared reference between TracerProvider and Tracers instantiated.
- * - A thread-safe class that allows updating/altering processor/exporter pipelines
- *   and sampling config.
- * - The owner/destroyer of Processors/Exporters.  These will remain active until
- *   this class is destroyed.  I.e. Sampling, Exporting, flushing, Custom Iterator etc. are all ok
- * if this object is alive, and they will work together. If this object is destroyed, then no shared
- * references to Processor, Exporter, Recordable, Custom Iterator etc. should exist, and all
- *   associated pipelines will have been flushed.
- */
-class TracerContext
-{
-public:
-  explicit TracerContext(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processor,
-      const opentelemetry::sdk::resource::Resource &resource =
-          opentelemetry::sdk::resource::Resource::Create({}),
-      std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
-      std::unique_ptr<IdGenerator> id_generator =
-          std::unique_ptr<IdGenerator>(new RandomIdGenerator()),
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator =
-          std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
-              instrumentationscope::ScopeConfigurator<TracerConfig>::Builder(
-                  TracerConfig::Default())
-                  .Build())) noexcept;
-
-  virtual ~TracerContext() = default;
-
-  /**
-   * Attaches a span processor to list of configured processors to this tracer context.
-   * Processor once attached can't be removed.
-   * @param processor The new span processor for this tracer. This must not be
-   * a nullptr. Ownership is given to the `TracerContext`.
-   *
-   * Note: This method is not thread safe.
-   */
-  void AddProcessor(std::unique_ptr<SpanProcessor> processor) noexcept;
-
-  /**
-   * Obtain the sampler associated with this tracer.
-   * @return The sampler for this tracer.
-   */
-  Sampler &GetSampler() const noexcept;
-
-  /**
-   * Obtain the configured (composite) processor.
-   *
-   * Note: When more than one processor is active, this will
-   * return an "aggregate" processor
-   */
-  SpanProcessor &GetProcessor() const noexcept;
-
-  /**
-   * Obtain the resource associated with this tracer context.
-   * @return The resource for this tracer context.
-   */
-  const opentelemetry::sdk::resource::Resource &GetResource() const noexcept;
-
-  /**
-   * Obtain the ScopeConfigurator with this tracer context.
-   * @return The ScopeConfigurator for this tracer context.
-   */
-  const instrumentationscope::ScopeConfigurator<TracerConfig> &GetTracerConfigurator()
-      const noexcept;
-
-  /**
-   * Obtain the Id Generator associated with this tracer context.
-   * @return The ID Generator for this tracer context.
-   */
-  opentelemetry::sdk::trace::IdGenerator &GetIdGenerator() const noexcept;
-
-  /**
-   * Force all active SpanProcessors to flush any buffered spans
-   * within the given timeout.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Shutdown the span processor associated with this tracer provider.
-   */
-  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-private:
-  //  order of declaration is important here - resource object should be destroyed after processor.
-  opentelemetry::sdk::resource::Resource resource_;
-  std::unique_ptr<Sampler> sampler_;
-  std::unique_ptr<IdGenerator> id_generator_;
-  std::unique_ptr<SpanProcessor> processor_;
-  std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator_;
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_context_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_context_factory.h
deleted file mode 100644
index 0279bee93..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_context_factory.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for TracerContext.
- */
-class OPENTELEMETRY_EXPORT TracerContextFactory
-{
-public:
-  /**
-   * Create a TracerContext.
-   */
-  static std::unique_ptr<TracerContext> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors);
-
-  /**
-   * Create a TracerContext.
-   */
-  static std::unique_ptr<TracerContext> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource);
-
-  /**
-   * Create a TracerContext.
-   */
-  static std::unique_ptr<TracerContext> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler);
-
-  /**
-   * Create a TracerContext.
-   */
-  static std::unique_ptr<TracerContext> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler,
-      std::unique_ptr<IdGenerator> id_generator);
-
-  /**
-   * Create a TracerContext.
-   */
-  static std::unique_ptr<TracerContext> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler,
-      std::unique_ptr<IdGenerator> id_generator,
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator);
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_provider.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_provider.h
deleted file mode 100644
index 97b7ab7d3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_provider.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <mutex>
-#include <vector>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/random_id_generator.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-class OPENTELEMETRY_EXPORT TracerProvider final : public opentelemetry::trace::TracerProvider
-{
-public:
-  /**
-   * Initialize a new tracer provider with a specified sampler
-   * @param processor The span processor for this tracer provider. This must
-   * not be a nullptr.
-   * @param resource  The resources for this tracer provider.
-   * @param sampler The sampler for this tracer provider. This must
-   * not be a nullptr.
-   * @param id_generator The custom id generator for this tracer provider. This must
-   * not be a nullptr
-   * @param tracer_configurator Provides access to a function that computes the TracerConfig for
-   * Tracers provided by this TracerProvider.
-   */
-  explicit TracerProvider(
-      std::unique_ptr<SpanProcessor> processor,
-      const opentelemetry::sdk::resource::Resource &resource =
-          opentelemetry::sdk::resource::Resource::Create({}),
-      std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
-      std::unique_ptr<IdGenerator> id_generator =
-          std::unique_ptr<IdGenerator>(new RandomIdGenerator()),
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator =
-          std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
-              instrumentationscope::ScopeConfigurator<TracerConfig>::Builder(
-                  TracerConfig::Default())
-                  .Build())) noexcept;
-
-  explicit TracerProvider(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource =
-          opentelemetry::sdk::resource::Resource::Create({}),
-      std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
-      std::unique_ptr<IdGenerator> id_generator =
-          std::unique_ptr<IdGenerator>(new RandomIdGenerator()),
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator =
-          std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
-              instrumentationscope::ScopeConfigurator<TracerConfig>::Builder(
-                  TracerConfig::Default())
-                  .Build())) noexcept;
-
-  /**
-   * Initialize a new tracer provider with a specified context
-   * @param context The owned tracer configuration/pipeline for this provider.
-   */
-  explicit TracerProvider(std::unique_ptr<TracerContext> context) noexcept;
-
-  ~TracerProvider() override;
-
-  /*
-    Make sure GetTracer() helpers from the API are seen in overload resolution.
-  */
-  using opentelemetry::trace::TracerProvider::GetTracer;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> GetTracer(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      const opentelemetry::common::KeyValueIterable *attributes) noexcept override;
-#else
-  opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> GetTracer(
-      nostd::string_view name,
-      nostd::string_view version    = "",
-      nostd::string_view schema_url = "") noexcept override;
-#endif
-
-  /**
-   * Attaches a span processor to list of configured processors for this tracer provider.
-   * @param processor The new span processor for this tracer provider. This
-   * must not be a nullptr.
-   *
-   * Note: This process may not receive any in-flight spans, but will get newly created spans.
-   * Note: This method is not thread safe, and should ideally be called from main thread.
-   */
-  void AddProcessor(std::unique_ptr<SpanProcessor> processor) noexcept;
-
-  /**
-   * Obtain the resource associated with this tracer provider.
-   * @return The resource for this tracer provider.
-   */
-  const opentelemetry::sdk::resource::Resource &GetResource() const noexcept;
-
-  /**
-   * Shutdown the span processor associated with this tracer provider.
-   */
-  bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-  /**
-   * Force flush the span processor associated with this tracer provider.
-   */
-  bool ForceFlush(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept;
-
-private:
-  // order of declaration is important here - tracers should destroy only after context.
-  std::vector<std::shared_ptr<Tracer>> tracers_;
-  std::shared_ptr<TracerContext> context_;
-  std::mutex lock_;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_provider_factory.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_provider_factory.h
deleted file mode 100644
index 071a0551c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/trace/tracer_provider_factory.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-/**
- * Factory class for TracerProvider.
- * See @ref TracerProvider.
- */
-class OPENTELEMETRY_EXPORT TracerProviderFactory
-{
-public:
-  /* Series of creator methods with a single processor. */
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::unique_ptr<SpanProcessor> processor);
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::unique_ptr<SpanProcessor> processor,
-      const opentelemetry::sdk::resource::Resource &resource);
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::unique_ptr<SpanProcessor> processor,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler);
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::unique_ptr<SpanProcessor> processor,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler,
-      std::unique_ptr<IdGenerator> id_generator);
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::unique_ptr<SpanProcessor> processor,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler,
-      std::unique_ptr<IdGenerator> id_generator,
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator);
-
-  /* Series of creator methods with a vector of processors. */
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors);
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource);
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler);
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler,
-      std::unique_ptr<IdGenerator> id_generator);
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource &resource,
-      std::unique_ptr<Sampler> sampler,
-      std::unique_ptr<IdGenerator> id_generator,
-      std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator);
-
-  /* Create with a tracer context. */
-
-  static std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> Create(
-      std::unique_ptr<TracerContext> context);
-};
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/version/version.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/version/version.h
deleted file mode 100644
index a8a93372c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk/version/version.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#define OPENTELEMETRY_SDK_VERSION "1.21.0"
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace version
-{
-extern const int major_version;
-extern const int minor_version;
-extern const int patch_version;
-extern const char *pre_release;
-extern const char *build_metadata;
-extern const char *short_version;
-extern const char *full_version;
-extern const char *build_date;
-}  // namespace version
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk_config.h b/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk_config.h
deleted file mode 100644
index afe78f1d8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/include/opentelemetry/sdk_config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/src/CMakeLists.txt
deleted file mode 100644
index 377d30562..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(common)
-add_subdirectory(trace)
-add_subdirectory(metrics)
-add_subdirectory(logs)
-add_subdirectory(version)
-add_subdirectory(resource)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/BUILD
deleted file mode 100644
index 19b47034f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/BUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "random",
-    srcs = [
-        "random.cc",
-    ],
-    hdrs = [
-        "fast_random_number_generator.h",
-        "random.h",
-    ],
-    include_prefix = "src/common",
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common/platform:fork",
-    ],
-)
-
-cc_library(
-    name = "base64",
-    srcs = [
-        "base64.cc",
-    ],
-    include_prefix = "src/common",
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common/platform:fork",
-    ],
-)
-
-cc_library(
-    name = "disabled",
-    srcs = [
-        "disabled.cc",
-    ],
-    include_prefix = "src/common",
-    deps = [
-        "//api",
-        "//sdk:headers",
-    ],
-)
-
-cc_library(
-    name = "env_variables",
-    srcs = [
-        "env_variables.cc",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common:global_log_handler",
-    ],
-)
-
-cc_library(
-    name = "global_log_handler",
-    srcs = [
-        "global_log_handler.cc",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/CMakeLists.txt
deleted file mode 100644
index 4a3b59aef..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set(COMMON_SRCS random.cc global_log_handler.cc env_variables.cc base64.cc
-                disabled.cc)
-if(WIN32)
-  list(APPEND COMMON_SRCS platform/fork_windows.cc)
-else()
-  list(APPEND COMMON_SRCS platform/fork_unix.cc)
-endif()
-
-add_library(opentelemetry_common ${COMMON_SRCS})
-
-set_target_properties(opentelemetry_common PROPERTIES EXPORT_NAME common)
-set_target_version(opentelemetry_common)
-
-target_include_directories(opentelemetry_common
-                           PUBLIC "$<BUILD_INTERFACE:${OTEL_SDK_DIR}>")
-
-target_link_libraries(
-  opentelemetry_common PUBLIC opentelemetry_api opentelemetry_sdk
-                              Threads::Threads)
-
-if(OPENTELEMETRY_INSTALL)
-  opentelemetry_add_pkgconfig(
-    common
-    "OpenTelemetry SDK - Common"
-    "Common components for the OpenTelemetry SDK, a library for exporting telemetry."
-    "opentelemetry_api")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/base64.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/base64.cc
deleted file mode 100644
index b6da95467..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/base64.cc
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/common/base64.h"
-
-#if defined(HAVE_GSL)
-#  include <gsl/gsl>
-#else
-#  include <assert.h>
-#endif
-#include <cstring>
-#include <limits>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-namespace
-{
-using Base64EscapeChars   = const unsigned char[64];
-using Base64UnescapeChars = const unsigned char[128];
-
-static constexpr Base64EscapeChars kBase64EscapeCharsBasic = {
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-    'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'};
-
-static constexpr Base64UnescapeChars kBase64UnescapeCharsBasic = {
-    127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-    127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-    127, 127, 127, 127, 127, 62,  127, 127, 127, 63,  52,  53,  54,  55,  56,  57,  58,  59,  60,
-    61,  127, 127, 127, 127, 127, 127, 127, 0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,
-    11,  12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  127, 127, 127, 127,
-    127, 127, 26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,
-    43,  44,  45,  46,  47,  48,  49,  50,  51,  127, 127, 127, 127, 127};
-
-static int Base64EscapeInternal(unsigned char *dest,
-                                std::size_t dlen,
-                                std::size_t *olen,
-                                const unsigned char *src,
-                                std::size_t slen,
-                                Base64EscapeChars &base64_enc_map,
-                                unsigned char padding_char)
-{
-  std::size_t i, n, nopadding;
-  int C1, C2, C3;
-  unsigned char *p;
-
-  if (slen == 0)
-  {
-    *olen = 0;
-    return 0;
-  }
-
-  n = (slen + 2) / 3;
-
-  if (n > (std::numeric_limits<std::size_t>::max() - 1) / 4)
-  {
-    *olen = std::numeric_limits<std::size_t>::max();
-    return -1;
-  }
-
-  n *= 4;
-
-  // no padding
-  if (0 == padding_char)
-  {
-    nopadding = slen % 3;
-    if (0 != nopadding)
-    {
-      n -= 3 - nopadding;
-    }
-  }
-
-  if ((dlen < n + 1) || (nullptr == dest))
-  {
-    *olen = n + 1;
-    return -1;
-  }
-
-  n = (slen / 3) * 3;
-
-  for (i = 0, p = dest; i < n; i += 3)
-  {
-    C1 = *src++;
-    C2 = *src++;
-    C3 = *src++;
-
-    *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
-    *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
-    *p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];
-    *p++ = base64_enc_map[C3 & 0x3F];
-  }
-
-  if (i < slen)
-  {
-    C1 = *src++;
-    C2 = ((i + 1) < slen) ? *src++ : 0;
-
-    *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
-    *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
-
-    if ((i + 1) < slen)
-    {
-      *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
-    }
-    else if (padding_char)
-    {
-      *p++ = padding_char;
-    }
-
-    if (padding_char)
-    {
-      *p++ = padding_char;
-    }
-  }
-
-  *olen = static_cast<std::size_t>(p - dest);
-  *p    = 0;
-
-  return 0;
-}
-
-static inline int Base64EscapeInternal(std::string &dest,
-                                       const unsigned char *src,
-                                       std::size_t slen,
-                                       Base64EscapeChars &base64_enc_map,
-                                       unsigned char padding_char)
-{
-  std::size_t olen = 0;
-  Base64EscapeInternal(nullptr, 0, &olen, src, slen, base64_enc_map, padding_char);
-  dest.resize(olen);
-
-  if (nullptr == src || 0 == slen)
-  {
-    return 0;
-  }
-
-  int ret = Base64EscapeInternal(reinterpret_cast<unsigned char *>(&dest[0]), dest.size(), &olen,
-                                 src, slen, base64_enc_map, padding_char);
-#if defined(HAVE_GSL)
-  Expects(0 != ret || dest.size() == olen + 1);
-#else
-  assert(0 != ret || dest.size() == olen + 1);
-#endif
-  // pop back last zero
-  if (!dest.empty() && *dest.rbegin() == 0)
-  {
-    dest.resize(dest.size() - 1);
-  }
-  return ret;
-}
-
-static int Base64UnescapeInternal(unsigned char *dst,
-                                  std::size_t dlen,
-                                  std::size_t *olen,
-                                  const unsigned char *src,
-                                  std::size_t slen,
-                                  Base64UnescapeChars &base64_dec_map,
-                                  unsigned char padding_char)
-{
-  std::size_t i, n;
-  std::size_t j, x;
-  std::size_t valid_slen, line_len;
-  unsigned char *p;
-
-  /* First pass: check for validity and get output length */
-  for (i = n = j = valid_slen = line_len = 0; i < slen; i++)
-  {
-    /* Skip spaces before checking for EOL */
-    x = 0;
-    while (i < slen && (src[i] == ' ' || src[i] == '\t'))
-    {
-      ++i;
-      ++x;
-    }
-
-    /* Spaces at end of buffer are OK */
-    if (i == slen)
-      break;
-
-    if (src[i] == '\r' || src[i] == '\n')
-    {
-      line_len = 0;
-      continue;
-    }
-
-    /* Space inside a line is an error */
-    if (x != 0 && line_len != 0)
-      return -2;
-
-    ++valid_slen;
-    ++line_len;
-    if (src[i] == padding_char)
-    {
-      if (++j > 2 || (valid_slen & 3) == 1 || (valid_slen & 3) == 2)
-      {
-        return -2;
-      }
-    }
-    else
-    {
-      if (src[i] > 127 || base64_dec_map[src[i]] == 127)
-        return -2;
-    }
-
-    if (base64_dec_map[src[i]] < 64 && j != 0)
-      return -2;
-
-    n++;
-  }
-
-  if (n == 0)
-  {
-    *olen = 0;
-    return 0;
-  }
-
-  // no padding, add j to padding length
-  if (valid_slen & 3)
-  {
-    j += 4 - (valid_slen & 3);
-    n += 4 - (valid_slen & 3);
-  }
-
-  /* The following expression is to calculate the following formula without
-   * risk of integer overflow in n:
-   *     n = ( ( n * 6 ) + 7 ) >> 3;
-   */
-  n = (6 * (n >> 3)) + ((6 * (n & 0x7) + 7) >> 3);
-  n -= j;
-
-  if (dst == nullptr || dlen < n)
-  {
-    *olen = n;
-    return -1;
-  }
-
-  for (n = x = 0, p = dst; i > 0; i--, src++)
-  {
-    if (*src == '\r' || *src == '\n' || *src == ' ' || *src == '\t')
-      continue;
-    if (*src == padding_char)
-      continue;
-
-    x = (x << 6) | (base64_dec_map[*src] & 0x3F);
-
-    if (++n == 4)
-    {
-      n    = 0;
-      *p++ = static_cast<unsigned char>(x >> 16);
-      *p++ = static_cast<unsigned char>(x >> 8);
-      *p++ = static_cast<unsigned char>(x);
-    }
-  }
-
-  // no padding, the tail code
-  if (n == 2)
-  {
-    *p++ = static_cast<unsigned char>(x >> 4);
-  }
-  else if (n == 3)
-  {
-    *p++ = static_cast<unsigned char>(x >> 10);
-    *p++ = static_cast<unsigned char>(x >> 2);
-  }
-
-  *olen = static_cast<std::size_t>(p - dst);
-
-  return 0;
-}
-
-}  // namespace
-
-// Base64Escape()
-//
-// Encodes a `src` string into a base64-encoded 'dest' string with padding
-// characters. This function conforms with RFC 4648 section 4 (base64) and RFC
-// 2045.
-OPENTELEMETRY_EXPORT void Base64Escape(opentelemetry::nostd::string_view src, std::string *dest)
-{
-  if (nullptr == dest || src.empty())
-  {
-    return;
-  }
-
-  Base64EscapeInternal(*dest, reinterpret_cast<const unsigned char *>(src.data()), src.size(),
-                       kBase64EscapeCharsBasic, '=');
-}
-
-OPENTELEMETRY_EXPORT std::string Base64Escape(opentelemetry::nostd::string_view src)
-{
-  std::string result;
-
-  Base64Escape(src, &result);
-  return result;
-}
-
-OPENTELEMETRY_EXPORT bool Base64Unescape(opentelemetry::nostd::string_view src, std::string *dest)
-{
-  if (nullptr == dest)
-  {
-    return false;
-  }
-
-  if (src.empty())
-  {
-    return true;
-  }
-
-  std::size_t olen = 0;
-
-  if (-2 == Base64UnescapeInternal(nullptr, 0, &olen,
-                                   reinterpret_cast<const unsigned char *>(src.data()), src.size(),
-                                   kBase64UnescapeCharsBasic, '='))
-  {
-    return false;
-  }
-
-  dest->resize(olen);
-  Base64UnescapeInternal(reinterpret_cast<unsigned char *>(&(*dest)[0]), dest->size(), &olen,
-                         reinterpret_cast<const unsigned char *>(src.data()), src.size(),
-                         kBase64UnescapeCharsBasic, '=');
-  return true;
-}
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/disabled.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/disabled.cc
deleted file mode 100644
index 340f4cffe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/disabled.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/common/disabled.h"
-#include "opentelemetry/sdk/common/env_variables.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-
-bool GetSdkDisabled()
-{
-  constexpr char kEnv[] = "OTEL_SDK_DISABLED";
-
-  bool exists;
-  bool value;
-
-  exists = GetBoolEnvironmentVariable(kEnv, value);
-  if (!exists)
-  {
-    value = false;
-  }
-
-  return value;
-}
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/env_variables.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/env_variables.cc
deleted file mode 100644
index 016f738d4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/env_variables.cc
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/common/env_variables.h"
-
-#ifdef _MSC_VER
-#  include <string.h>
-#  define strcasecmp _stricmp
-#else
-#  include <strings.h>
-#endif
-
-#include <cctype>
-#include <cerrno>
-#include <cstdlib>
-#include <limits>
-#include <ostream>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-
-bool GetRawEnvironmentVariable(const char *env_var_name, std::string &value)
-{
-#if !defined(NO_GETENV)
-  const char *endpoint_from_env = nullptr;
-#  if defined(_MSC_VER)
-  // avoid calling std::getenv which is deprecated in MSVC.
-  size_t required_size = 0;
-  getenv_s(&required_size, nullptr, 0, env_var_name);
-  std::unique_ptr<char[]> endpoint_buffer;
-  if (required_size > 0)
-  {
-    endpoint_buffer = std::unique_ptr<char[]>{new char[required_size]};
-    getenv_s(&required_size, endpoint_buffer.get(), required_size, env_var_name);
-    endpoint_from_env = endpoint_buffer.get();
-  }
-#  else
-  endpoint_from_env = std::getenv(env_var_name);
-#  endif  // defined(_MSC_VER)
-
-  if (endpoint_from_env != nullptr)
-  {
-    value = std::string{endpoint_from_env};
-    return true;
-  }
-
-  value = std::string{};
-  return false;
-#else
-  value = std::string{};
-  return false;
-#endif  // !defined(NO_GETENV)
-}
-
-bool GetBoolEnvironmentVariable(const char *env_var_name, bool &value)
-{
-  std::string raw_value;
-  bool exists = GetRawEnvironmentVariable(env_var_name, raw_value);
-  if (!exists || raw_value.empty())
-  {
-    value = false;
-    return false;
-  }
-
-  if (strcasecmp(raw_value.c_str(), "true") == 0)
-  {
-    value = true;
-    return true;
-  }
-
-  if (strcasecmp(raw_value.c_str(), "false") == 0)
-  {
-    value = false;
-    return true;
-  }
-
-  OTEL_INTERNAL_LOG_WARN("Environment variable <" << env_var_name << "> has an invalid value <"
-                                                  << raw_value << ">, defaulting to false");
-  value = false;
-  return true;
-}
-
-static bool GetTimeoutFromString(const char *input, std::chrono::system_clock::duration &value)
-{
-  std::chrono::system_clock::duration::rep result = 0;
-
-  // Skip spaces
-  for (; *input && std::isspace(*input); ++input)
-    ;
-
-  for (; *input && std::isdigit(*input); ++input)
-  {
-    result = result * 10 + (*input - '0');
-  }
-
-  if (result == 0)
-  {
-    // Rejecting duration 0 as invalid.
-    return false;
-  }
-
-  opentelemetry::nostd::string_view unit{input};
-
-  if (unit == "ns")
-  {
-    value = std::chrono::duration_cast<std::chrono::system_clock::duration>(
-        std::chrono::nanoseconds{result});
-    return true;
-  }
-
-  if (unit == "us")
-  {
-    value = std::chrono::duration_cast<std::chrono::system_clock::duration>(
-        std::chrono::microseconds{result});
-    return true;
-  }
-
-  if (unit == "ms")
-  {
-    value = std::chrono::duration_cast<std::chrono::system_clock::duration>(
-        std::chrono::milliseconds{result});
-    return true;
-  }
-
-  if (unit == "s")
-  {
-    value = std::chrono::duration_cast<std::chrono::system_clock::duration>(
-        std::chrono::seconds{result});
-    return true;
-  }
-
-  if (unit == "m")
-  {
-    value = std::chrono::duration_cast<std::chrono::system_clock::duration>(
-        std::chrono::minutes{result});
-    return true;
-  }
-
-  if (unit == "h")
-  {
-    value =
-        std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::hours{result});
-    return true;
-  }
-
-  if (unit == "")
-  {
-    // TODO: The spec says milliseconds, but opentelemetry-cpp implemented
-    // seconds by default. Fixing this is a breaking change.
-
-    value = std::chrono::duration_cast<std::chrono::system_clock::duration>(
-        std::chrono::seconds{result});
-    return true;
-  }
-
-  // Failed to parse the input string.
-  return false;
-}
-
-bool GetDurationEnvironmentVariable(const char *env_var_name,
-                                    std::chrono::system_clock::duration &value)
-{
-  std::string raw_value;
-  bool exists = GetRawEnvironmentVariable(env_var_name, raw_value);
-  if (!exists || raw_value.empty())
-  {
-    value =
-        std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{0});
-    return false;
-  }
-
-  exists = GetTimeoutFromString(raw_value.c_str(), value);
-
-  if (!exists)
-  {
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << env_var_name << "> has an invalid value <"
-                                                    << raw_value << ">, ignoring");
-  }
-  return exists;
-}
-
-bool GetStringEnvironmentVariable(const char *env_var_name, std::string &value)
-{
-  bool exists = GetRawEnvironmentVariable(env_var_name, value);
-  if (!exists || value.empty())
-  {
-    return false;
-  }
-  return true;
-}
-
-bool GetUintEnvironmentVariable(const char *env_var_name, std::uint32_t &value)
-{
-  static constexpr auto kDefaultValue = 0U;
-  std::string raw_value;
-  bool exists = GetRawEnvironmentVariable(env_var_name, raw_value);
-
-  if (!exists || raw_value.empty())
-  {
-    value = kDefaultValue;
-    return false;
-  }
-
-  const char *end  = raw_value.c_str() + raw_value.length();
-  char *actual_end = nullptr;
-  const auto temp  = std::strtoull(raw_value.c_str(), &actual_end, 10);
-
-  if (errno == ERANGE)
-  {
-    errno = 0;
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << env_var_name << "> is out of range <"
-                                                    << raw_value << ">, defaulting to "
-                                                    << kDefaultValue);
-  }
-  else if (actual_end != end || std::numeric_limits<std::uint32_t>::max() < temp)
-  {
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << env_var_name << "> has an invalid value <"
-                                                    << raw_value << ">, defaulting to "
-                                                    << kDefaultValue);
-  }
-  else
-  {
-    value = static_cast<std::uint32_t>(temp);
-    return true;
-  }
-
-  value = kDefaultValue;
-  return false;
-}
-
-bool GetFloatEnvironmentVariable(const char *env_var_name, float &value)
-{
-  static constexpr auto kDefaultValue = 0.0f;
-  std::string raw_value;
-  bool exists = GetRawEnvironmentVariable(env_var_name, raw_value);
-
-  if (!exists || raw_value.empty())
-  {
-    value = kDefaultValue;
-    return false;
-  }
-
-  const char *end  = raw_value.c_str() + raw_value.length();
-  char *actual_end = nullptr;
-  value            = std::strtof(raw_value.c_str(), &actual_end);
-
-  if (errno == ERANGE)
-  {
-    errno = 0;
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << env_var_name << "> is out of range <"
-                                                    << raw_value << ">, defaulting to "
-                                                    << kDefaultValue);
-  }
-  else if (actual_end != end)
-  {
-    OTEL_INTERNAL_LOG_WARN("Environment variable <" << env_var_name << "> has an invalid value <"
-                                                    << raw_value << ">, defaulting to "
-                                                    << kDefaultValue);
-  }
-  else
-  {
-    return true;
-  }
-
-  value = kDefaultValue;
-  return false;
-}
-
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/fast_random_number_generator.h b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/fast_random_number_generator.h
deleted file mode 100644
index 13e6c738d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/fast_random_number_generator.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <array>
-#include <cstdint>
-#include <limits>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-/**
- * Profiling shows that random number generation can be a significant cost of
- * span generation. This provides a faster random number generator than
- * std::mt19937_64; and since we don't care about the other beneficial random
- * number properties that std:mt19937_64 provides for this application, it's a
- * entirely appropriate replacement.
- *
- * Note for Windows users - please make sure that NOMINMAX is defined, e.g.
- *
- * ...
- * #define NOMINMAX
- * #include <Windows.h>
- * ...
- *
- * See:
- * https://stackoverflow.com/questions/13416418/define-nominmax-using-stdmin-max
- *
- */
-class FastRandomNumberGenerator
-{
-public:
-  using result_type = uint64_t;
-
-  FastRandomNumberGenerator() noexcept = default;
-
-  template <class SeedSequence>
-  FastRandomNumberGenerator(SeedSequence &seed_sequence) noexcept
-  {
-    seed(seed_sequence);
-  }
-
-  uint64_t operator()() noexcept
-  {
-    // Uses the xorshift128p random number generation algorithm described in
-    // https://en.wikipedia.org/wiki/Xorshift
-    auto &state_a = state_[0];
-    auto &state_b = state_[1];
-    auto t        = state_a;
-    auto s        = state_b;
-    state_a       = s;
-    t ^= t << 23;        // a
-    t ^= t >> 17;        // b
-    t ^= s ^ (s >> 26);  // c
-    state_b = t;
-    return t + s;
-  }
-
-  // RandomNumberGenerator concept functions required from standard library.
-  // See http://www.cplusplus.com/reference/random/mt19937/
-  template <class SeedSequence>
-  void seed(SeedSequence &seed_sequence) noexcept
-  {
-    seed_sequence.generate(reinterpret_cast<uint32_t *>(state_.data()),
-                           reinterpret_cast<uint32_t *>(state_.data() + state_.size()));
-  }
-
-  static constexpr uint64_t(min)() noexcept { return 0; }
-
-  static constexpr uint64_t(max)() noexcept { return (std::numeric_limits<uint64_t>::max)(); }
-
-private:
-  std::array<uint64_t, 2> state_{};
-};
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/global_log_handler.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/global_log_handler.cc
deleted file mode 100644
index 0883e5dfa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/global_log_handler.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-#include <iostream>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-namespace internal_log
-{
-
-namespace
-{
-struct GlobalLogHandlerData
-{
-  nostd::shared_ptr<LogHandler> handler;
-  LogLevel log_level;
-
-  GlobalLogHandlerData()
-      : handler(nostd::shared_ptr<LogHandler>(new DefaultLogHandler)), log_level(LogLevel::Warning)
-  {}
-  ~GlobalLogHandlerData() { is_singleton_destroyed = true; }
-
-  GlobalLogHandlerData(const GlobalLogHandlerData &) = delete;
-  GlobalLogHandlerData(GlobalLogHandlerData &&)      = delete;
-
-  GlobalLogHandlerData &operator=(const GlobalLogHandlerData &) = delete;
-  GlobalLogHandlerData &operator=(GlobalLogHandlerData &&)      = delete;
-
-  static GlobalLogHandlerData &Instance() noexcept;
-  static bool is_singleton_destroyed;
-};
-
-bool GlobalLogHandlerData::is_singleton_destroyed = false;
-
-GlobalLogHandlerData &GlobalLogHandlerData::Instance() noexcept
-{
-  static GlobalLogHandlerData instance;
-  return instance;
-}
-
-}  // namespace
-
-LogHandler::~LogHandler() {}
-
-void DefaultLogHandler::Handle(LogLevel level,
-                               const char *file,
-                               int line,
-                               const char *msg,
-                               const sdk::common::AttributeMap & /* attributes */) noexcept
-{
-  std::stringstream output_s;
-  output_s << "[" << LevelToString(level) << "] ";
-  if (file != nullptr)
-  {
-    output_s << "File: " << file << ":" << line << " ";
-  }
-  if (msg != nullptr)
-  {
-    output_s << msg;
-  }
-  output_s << '\n';
-  // TBD - print attributes
-
-  switch (level)
-  {
-    case LogLevel::Error:
-    case LogLevel::Warning:
-      std::cerr << output_s.str();  // thread safe.
-      break;
-    case LogLevel::Info:
-    case LogLevel::Debug:
-      std::cout << output_s.str();  // thread safe.
-      break;
-    case LogLevel::None:
-    default:
-      break;
-  }
-}
-
-void NoopLogHandler::Handle(LogLevel,
-                            const char *,
-                            int,
-                            const char *,
-                            const sdk::common::AttributeMap &) noexcept
-{}
-
-nostd::shared_ptr<LogHandler> GlobalLogHandler::GetLogHandler() noexcept
-{
-  if OPENTELEMETRY_UNLIKELY_CONDITION (GlobalLogHandlerData::is_singleton_destroyed)
-  {
-    return nostd::shared_ptr<LogHandler>();
-  }
-
-  return GlobalLogHandlerData::Instance().handler;
-}
-
-void GlobalLogHandler::SetLogHandler(const nostd::shared_ptr<LogHandler> &eh) noexcept
-{
-  if OPENTELEMETRY_UNLIKELY_CONDITION (GlobalLogHandlerData::is_singleton_destroyed)
-  {
-    return;
-  }
-
-  GlobalLogHandlerData::Instance().handler = eh;
-}
-
-LogLevel GlobalLogHandler::GetLogLevel() noexcept
-{
-  if OPENTELEMETRY_UNLIKELY_CONDITION (GlobalLogHandlerData::is_singleton_destroyed)
-  {
-    return LogLevel::None;
-  }
-
-  return GlobalLogHandlerData::Instance().log_level;
-}
-
-void GlobalLogHandler::SetLogLevel(LogLevel level) noexcept
-{
-  if OPENTELEMETRY_UNLIKELY_CONDITION (GlobalLogHandlerData::is_singleton_destroyed)
-  {
-    return;
-  }
-  GlobalLogHandlerData::Instance().log_level = level;
-}
-
-}  // namespace internal_log
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/BUILD
deleted file mode 100644
index f089ebf71..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "fork",
-    srcs = select({
-        "//bazel:windows": ["fork_windows.cc"],
-        "//conditions:default": ["fork_unix.cc"],
-    }),
-    hdrs = [
-        "fork.h",
-    ],
-    include_prefix = "src/common/platform",
-    linkopts = select({
-        "//bazel:windows": [],
-        "//conditions:default": ["-pthread"],
-    }),
-    deps = [
-        "//api",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork.h b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork.h
deleted file mode 100644
index b1a0e9d77..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-namespace platform
-{
-/**
- * Portable wrapper for pthread_atfork.
- * See
- * https://pubs.opengroup.org/onlinepubs/009695399/functions/pthread_atfork.html
- */
-int AtFork(void (*prepare)(), void (*parent)(), void (*child)()) noexcept;
-}  // namespace platform
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork_unix.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork_unix.cc
deleted file mode 100644
index 41926bbfe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork_unix.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/version.h"
-#include "src/common/platform/fork.h"
-
-#include <pthread.h>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-namespace platform
-{
-int AtFork(void (*prepare)(), void (*parent)(), void (*child)()) noexcept
-{
-  return ::pthread_atfork(prepare, parent, child);
-}
-}  // namespace platform
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork_windows.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork_windows.cc
deleted file mode 100644
index 9d9f2bf79..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/platform/fork_windows.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "src/common/platform/fork.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-namespace platform
-{
-int AtFork(void (*prepare)(), void (*parent)(), void (*child)()) noexcept
-{
-  (void)prepare;
-  (void)parent;
-  (void)child;
-  return 0;
-}
-}  // namespace platform
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/random.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/random.cc
deleted file mode 100644
index 9b696dea6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/random.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "src/common/random.h"
-#include "src/common/platform/fork.h"
-
-#include <atomic>
-#include <cstring>
-#include <random>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-// Wraps a thread_local random number generator, but adds a fork handler so that
-// the generator will be correctly seeded after forking.
-//
-// See https://stackoverflow.com/q/51882689/4447365 and
-//     https://github.com/opentracing-contrib/nginx-opentracing/issues/52
-namespace
-{
-class TlsRandomNumberGenerator
-{
-public:
-  TlsRandomNumberGenerator() noexcept
-  {
-    Seed();
-    if (!flag.test_and_set())
-    {
-      platform::AtFork(nullptr, nullptr, OnFork);
-    }
-  }
-
-  static FastRandomNumberGenerator &engine() noexcept { return engine_; }
-
-private:
-  static std::atomic_flag flag;
-
-  static thread_local FastRandomNumberGenerator engine_;
-
-  static void OnFork() noexcept { Seed(); }
-
-  static void Seed() noexcept
-  {
-    std::random_device random_device;
-    std::seed_seq seed_seq{random_device(), random_device(), random_device(), random_device()};
-    engine_.seed(seed_seq);
-  }
-};
-
-std::atomic_flag TlsRandomNumberGenerator::flag;
-thread_local FastRandomNumberGenerator TlsRandomNumberGenerator::engine_{};
-}  // namespace
-
-FastRandomNumberGenerator &Random::GetRandomNumberGenerator() noexcept
-{
-  static thread_local TlsRandomNumberGenerator random_number_generator{};
-  return TlsRandomNumberGenerator::engine();
-}
-
-uint64_t Random::GenerateRandom64() noexcept
-{
-  return GetRandomNumberGenerator()();
-}
-
-void Random::GenerateRandomBuffer(opentelemetry::nostd::span<uint8_t> buffer) noexcept
-{
-  auto buf_size = buffer.size();
-
-  for (size_t i = 0; i < buf_size; i += sizeof(uint64_t))
-  {
-    uint64_t value = GenerateRandom64();
-    if (i + sizeof(uint64_t) <= buf_size)
-    {
-      memcpy(&buffer[i], &value, sizeof(uint64_t));
-    }
-    else
-    {
-      memcpy(&buffer[i], &value, buf_size - i);
-    }
-  }
-}
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/random.h b/ext/opentelemetry-cpp-1.21.0/sdk/src/common/random.h
deleted file mode 100644
index 28adbaf41..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/common/random.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/version.h"
-#include "src/common/fast_random_number_generator.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace common
-{
-/**
- * Utility methods for creating random data, based on a seeded thread-local
- * number generator.
- */
-class Random
-{
-public:
-  /**
-   * @return an unsigned 64 bit random number
-   */
-  static uint64_t GenerateRandom64() noexcept;
-  /**
-   * Fill the passed span with random bytes.
-   *
-   * @param buffer A span of bytes.
-   */
-  static void GenerateRandomBuffer(opentelemetry::nostd::span<uint8_t> buffer) noexcept;
-
-private:
-  /**
-   * @return a seeded thread-local random number generator.
-   */
-  static FastRandomNumberGenerator &GetRandomNumberGenerator() noexcept;
-};
-}  // namespace common
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/BUILD
deleted file mode 100644
index 8c3e44e20..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "logs",
-    srcs = glob(["**/*.cc"]),
-    include_prefix = "src/logs",
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common:disabled",
-        "//sdk/src/common:global_log_handler",
-        "//sdk/src/resource",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/CMakeLists.txt
deleted file mode 100644
index e87378215..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(
-  opentelemetry_logs
-  provider.cc
-  logger_provider.cc
-  logger_provider_factory.cc
-  logger.cc
-  exporter.cc
-  event_logger_provider.cc
-  event_logger_provider_factory.cc
-  event_logger.cc
-  simple_log_record_processor.cc
-  simple_log_record_processor_factory.cc
-  batch_log_record_processor.cc
-  batch_log_record_processor_factory.cc
-  logger_config.cc
-  logger_context.cc
-  logger_context_factory.cc
-  multi_log_record_processor.cc
-  multi_log_record_processor_factory.cc
-  multi_recordable.cc
-  read_write_log_record.cc
-  readable_log_record.cc)
-
-set_target_properties(opentelemetry_logs PROPERTIES EXPORT_NAME logs)
-
-target_link_libraries(opentelemetry_logs PUBLIC opentelemetry_resources
-                                                opentelemetry_common)
-set_target_version(opentelemetry_logs)
-
-target_include_directories(
-  opentelemetry_logs
-  PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/sdk/include>")
-
-if(OPENTELEMETRY_INSTALL)
-  opentelemetry_add_pkgconfig(
-    logs "OpenTelemetry SDK - Logs"
-    "Components for exporting logs in the OpenTelemetry SDK."
-    "opentelemetry_resources")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/batch_log_record_processor.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/batch_log_record_processor.cc
deleted file mode 100644
index 324905ff6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/batch_log_record_processor.cc
+++ /dev/null
@@ -1,399 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stddef.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <ratio>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/atomic_unique_ptr.h"
-#include "opentelemetry/sdk/common/circular_buffer.h"
-#include "opentelemetry/sdk/common/circular_buffer_range.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_runtime_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-using opentelemetry::sdk::common::AtomicUniquePtr;
-using opentelemetry::sdk::common::CircularBufferRange;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-BatchLogRecordProcessor::BatchLogRecordProcessor(
-    std::unique_ptr<LogRecordExporter> &&exporter,
-    const size_t max_queue_size,
-    const std::chrono::milliseconds scheduled_delay_millis,
-    const size_t max_export_batch_size)
-    : exporter_(std::move(exporter)),
-      max_queue_size_(max_queue_size),
-      scheduled_delay_millis_(scheduled_delay_millis),
-      max_export_batch_size_(max_export_batch_size),
-      buffer_(max_queue_size_),
-      synchronization_data_(std::make_shared<SynchronizationData>()),
-      worker_thread_instrumentation_(nullptr),
-      worker_thread_()
-{
-  // Make sure the constructor is complete before giving 'this' to a thread.
-  worker_thread_ = std::thread(&BatchLogRecordProcessor::DoBackgroundWork, this);
-}
-
-BatchLogRecordProcessor::BatchLogRecordProcessor(std::unique_ptr<LogRecordExporter> &&exporter,
-                                                 const BatchLogRecordProcessorOptions &options)
-    : exporter_(std::move(exporter)),
-      max_queue_size_(options.max_queue_size),
-      scheduled_delay_millis_(options.schedule_delay_millis),
-      max_export_batch_size_(options.max_export_batch_size),
-      buffer_(options.max_queue_size),
-      synchronization_data_(std::make_shared<SynchronizationData>()),
-      worker_thread_instrumentation_(nullptr),
-      worker_thread_()
-{
-  // Make sure the constructor is complete before giving 'this' to a thread.
-  worker_thread_ = std::thread(&BatchLogRecordProcessor::DoBackgroundWork, this);
-}
-
-BatchLogRecordProcessor::BatchLogRecordProcessor(
-    std::unique_ptr<LogRecordExporter> &&exporter,
-    const BatchLogRecordProcessorOptions &options,
-    const BatchLogRecordProcessorRuntimeOptions &runtime_options)
-    : exporter_(std::move(exporter)),
-      max_queue_size_(options.max_queue_size),
-      scheduled_delay_millis_(options.schedule_delay_millis),
-      max_export_batch_size_(options.max_export_batch_size),
-      buffer_(options.max_queue_size),
-      synchronization_data_(std::make_shared<SynchronizationData>()),
-      worker_thread_instrumentation_(runtime_options.thread_instrumentation),
-      worker_thread_()
-{
-  // Make sure the constructor is complete before giving 'this' to a thread.
-  worker_thread_ = std::thread(&BatchLogRecordProcessor::DoBackgroundWork, this);
-}
-
-std::unique_ptr<Recordable> BatchLogRecordProcessor::MakeRecordable() noexcept
-{
-  return exporter_->MakeRecordable();
-}
-
-void BatchLogRecordProcessor::OnEmit(std::unique_ptr<Recordable> &&record) noexcept
-{
-  if (synchronization_data_->is_shutdown.load() == true)
-  {
-    return;
-  }
-
-  if (buffer_.Add(std::unique_ptr<Recordable>(record.release())) == false)
-  {
-    return;
-  }
-
-  // If the queue gets at least half full a preemptive notification is
-  // sent to the worker thread to start a new export cycle.
-  size_t buffer_size = buffer_.size();
-  if (buffer_size >= max_queue_size_ / 2 || buffer_size >= max_export_batch_size_)
-  {
-    // signal the worker thread
-    synchronization_data_->is_force_wakeup_background_worker.store(true, std::memory_order_release);
-    synchronization_data_->cv.notify_all();
-  }
-}
-
-bool BatchLogRecordProcessor::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  if (synchronization_data_->is_shutdown.load() == true)
-  {
-    return false;
-  }
-
-  // Now wait for the worker thread to signal back from the Export method
-  std::unique_lock<std::mutex> lk_cv(synchronization_data_->force_flush_cv_m);
-
-  std::uint64_t current_sequence =
-      synchronization_data_->force_flush_pending_sequence.fetch_add(1, std::memory_order_release) +
-      1;
-  synchronization_data_->force_flush_timeout_us.store(timeout.count(), std::memory_order_release);
-  auto break_condition = [this, current_sequence]() {
-    if (synchronization_data_->is_shutdown.load() == true)
-    {
-      return true;
-    }
-
-    // Wake up the worker thread once.
-    if (synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire) >
-        synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire))
-    {
-      synchronization_data_->cv.notify_all();
-    }
-
-    return synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire) >=
-           current_sequence;
-  };
-
-  // Fix timeout to meet requirement of wait_for
-  timeout = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-      timeout, std::chrono::microseconds::zero());
-
-  std::chrono::steady_clock::duration timeout_steady =
-      std::chrono::duration_cast<std::chrono::steady_clock::duration>(timeout);
-  if (timeout_steady <= std::chrono::steady_clock::duration::zero())
-  {
-    timeout_steady = (std::chrono::steady_clock::duration::max)();
-  }
-
-  bool result = false;
-  while (!result && timeout_steady > std::chrono::steady_clock::duration::zero())
-  {
-    // When force_flush_notified_sequence.compare_exchange_strong(...) and
-    // force_flush_cv.notify_all() is called between force_flush_pending_sequence.load(...) and
-    // force_flush_cv.wait(). We must not wait for ever
-    std::chrono::steady_clock::time_point start_timepoint = std::chrono::steady_clock::now();
-    std::chrono::microseconds wait_timeout                = scheduled_delay_millis_;
-
-    if (wait_timeout > timeout_steady)
-    {
-      wait_timeout = std::chrono::duration_cast<std::chrono::microseconds>(timeout_steady);
-    }
-    result = synchronization_data_->force_flush_cv.wait_for(lk_cv, wait_timeout, break_condition);
-    timeout_steady -= std::chrono::steady_clock::now() - start_timepoint;
-  }
-
-  return synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire) >=
-         current_sequence;
-}
-
-void BatchLogRecordProcessor::DoBackgroundWork()
-{
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->OnStart();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-  auto timeout = scheduled_delay_millis_;
-
-  while (true)
-  {
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (worker_thread_instrumentation_ != nullptr)
-    {
-      worker_thread_instrumentation_->BeforeWait();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-    // Wait for `timeout` milliseconds
-    std::unique_lock<std::mutex> lk(synchronization_data_->cv_m);
-    synchronization_data_->cv.wait_for(lk, timeout, [this] {
-      if (synchronization_data_->is_force_wakeup_background_worker.load(std::memory_order_acquire))
-      {
-        return true;
-      }
-
-      return !buffer_.empty();
-    });
-    synchronization_data_->is_force_wakeup_background_worker.store(false,
-                                                                   std::memory_order_release);
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (worker_thread_instrumentation_ != nullptr)
-    {
-      worker_thread_instrumentation_->AfterWait();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-    if (synchronization_data_->is_shutdown.load() == true)
-    {
-      DrainQueue();
-      break;
-    }
-
-    auto start = std::chrono::steady_clock::now();
-    Export();
-    auto end      = std::chrono::steady_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
-
-    // Subtract the duration of this export call from the next `timeout`.
-    timeout = scheduled_delay_millis_ - duration;
-  }
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->OnEnd();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-}
-
-void BatchLogRecordProcessor::Export()
-{
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->BeforeLoad();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-  do
-  {
-    std::vector<std::unique_ptr<Recordable>> records_arr;
-    size_t num_records_to_export;
-    std::uint64_t notify_force_flush =
-        synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire);
-    if (notify_force_flush)
-    {
-      num_records_to_export = buffer_.size();
-    }
-    else
-    {
-      num_records_to_export =
-          buffer_.size() >= max_export_batch_size_ ? max_export_batch_size_ : buffer_.size();
-    }
-
-    if (num_records_to_export == 0)
-    {
-      NotifyCompletion(notify_force_flush, exporter_, synchronization_data_);
-      break;
-    }
-
-    // Reserve space for the number of records
-    records_arr.reserve(num_records_to_export);
-    buffer_.Consume(num_records_to_export,
-                    [&](CircularBufferRange<AtomicUniquePtr<Recordable>> range) noexcept {
-                      range.ForEach([&](AtomicUniquePtr<Recordable> &ptr) {
-                        std::unique_ptr<Recordable> swap_ptr = std::unique_ptr<Recordable>(nullptr);
-                        ptr.Swap(swap_ptr);
-                        records_arr.push_back(std::unique_ptr<Recordable>(swap_ptr.release()));
-                        return true;
-                      });
-                    });
-
-    exporter_->Export(
-        nostd::span<std::unique_ptr<Recordable>>(records_arr.data(), records_arr.size()));
-    NotifyCompletion(notify_force_flush, exporter_, synchronization_data_);
-  } while (true);
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->AfterLoad();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-}
-
-void BatchLogRecordProcessor::NotifyCompletion(
-    std::uint64_t notify_force_flush,
-    const std::unique_ptr<LogRecordExporter> &exporter,
-    const std::shared_ptr<SynchronizationData> &synchronization_data)
-{
-  if (!synchronization_data)
-  {
-    return;
-  }
-
-  if (notify_force_flush >
-      synchronization_data->force_flush_notified_sequence.load(std::memory_order_acquire))
-  {
-    if (exporter)
-    {
-      std::chrono::microseconds timeout = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-          std::chrono::microseconds{
-              synchronization_data->force_flush_timeout_us.load(std::memory_order_acquire)},
-          std::chrono::microseconds::zero());
-      exporter->ForceFlush(timeout);
-    }
-
-    std::uint64_t notified_sequence =
-        synchronization_data->force_flush_notified_sequence.load(std::memory_order_acquire);
-    while (notify_force_flush > notified_sequence)
-    {
-      synchronization_data->force_flush_notified_sequence.compare_exchange_strong(
-          notified_sequence, notify_force_flush, std::memory_order_acq_rel);
-      synchronization_data->force_flush_cv.notify_all();
-    }
-  }
-}
-
-void BatchLogRecordProcessor::DrainQueue()
-{
-  while (true)
-  {
-    if (buffer_.empty() &&
-        synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire) <=
-            synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire))
-    {
-      break;
-    }
-
-    Export();
-  }
-}
-
-void BatchLogRecordProcessor::GetWaitAdjustedTime(
-    std::chrono::microseconds &timeout,
-    std::chrono::time_point<std::chrono::system_clock> &start_time)
-{
-  auto end_time = std::chrono::system_clock::now();
-  auto offset   = std::chrono::duration_cast<std::chrono::microseconds>(end_time - start_time);
-  start_time    = end_time;
-  timeout       = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-      timeout, std::chrono::microseconds::zero());
-  if (timeout > offset && timeout > std::chrono::microseconds::zero())
-  {
-    timeout -= offset;
-  }
-  else
-  {
-    // Some module use zero as indefinite timeout.So we can not reset timeout to zero here
-    timeout = std::chrono::microseconds(1);
-  }
-}
-
-bool BatchLogRecordProcessor::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  auto start_time = std::chrono::system_clock::now();
-
-  std::lock_guard<std::mutex> shutdown_guard{synchronization_data_->shutdown_m};
-  bool already_shutdown = synchronization_data_->is_shutdown.exchange(true);
-
-  if (worker_thread_.joinable())
-  {
-    synchronization_data_->is_force_wakeup_background_worker.store(true, std::memory_order_release);
-    synchronization_data_->cv.notify_all();
-    worker_thread_.join();
-  }
-
-  GetWaitAdjustedTime(timeout, start_time);
-  // Should only shutdown exporter ONCE.
-  if (!already_shutdown && exporter_ != nullptr)
-  {
-    return exporter_->Shutdown(timeout);
-  }
-
-  return true;
-}
-
-BatchLogRecordProcessor::~BatchLogRecordProcessor()
-{
-  if (synchronization_data_->is_shutdown.load() == false)
-  {
-    Shutdown();
-  }
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/batch_log_record_processor_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/batch_log_record_processor_factory.cc
deleted file mode 100644
index b76f7b20d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/batch_log_record_processor_factory.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/sdk/logs/batch_log_record_processor.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_factory.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_options.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor_runtime_options.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-std::unique_ptr<LogRecordProcessor> BatchLogRecordProcessorFactory::Create(
-    std::unique_ptr<LogRecordExporter> &&exporter,
-    const BatchLogRecordProcessorOptions &options)
-{
-  BatchLogRecordProcessorRuntimeOptions runtime_options;
-  return Create(std::move(exporter), options, runtime_options);
-}
-
-std::unique_ptr<LogRecordProcessor> BatchLogRecordProcessorFactory::Create(
-    std::unique_ptr<LogRecordExporter> &&exporter,
-    const BatchLogRecordProcessorOptions &options,
-    const BatchLogRecordProcessorRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<LogRecordProcessor> processor(
-      new BatchLogRecordProcessor(std::move(exporter), options, runtime_options));
-  return processor;
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger.cc
deleted file mode 100644
index 4a8c7d1c0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <string>
-#include <utility>
-
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/logs/event_logger.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-EventLogger::EventLogger(
-    opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger,
-    opentelemetry::nostd::string_view event_domain) noexcept
-    : delegate_logger_(std::move(delegate_logger)), event_domain_(event_domain)
-{}
-
-const opentelemetry::nostd::string_view EventLogger::GetName() noexcept
-{
-  if (delegate_logger_)
-  {
-    return delegate_logger_->GetName();
-  }
-
-  return {};
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger>
-EventLogger::GetDelegateLogger() noexcept
-{
-  return delegate_logger_;
-}
-
-void EventLogger::EmitEvent(
-    opentelemetry::nostd::string_view event_name,
-    opentelemetry::nostd::unique_ptr<opentelemetry::logs::LogRecord> &&log_record) noexcept
-{
-  if (!delegate_logger_ || !log_record)
-  {
-    return;
-  }
-
-  if (!event_domain_.empty() && !event_name.empty())
-  {
-    log_record->SetAttribute("event.domain", event_domain_);
-    log_record->SetAttribute("event.name", event_name);
-  }
-
-  delegate_logger_->EmitLogRecord(std::move(log_record));
-}
-#endif
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger_provider.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger_provider.cc
deleted file mode 100644
index 04e421658..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger_provider.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/logs/event_logger_provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/logs/event_logger.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-EventLoggerProvider::EventLoggerProvider() noexcept
-{
-  OTEL_INTERNAL_LOG_DEBUG("[EventLoggerProvider] EventLoggerProvider created.");
-}
-
-EventLoggerProvider::~EventLoggerProvider() {}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::logs::EventLogger>
-EventLoggerProvider::CreateEventLogger(
-    opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger> delegate_logger,
-    opentelemetry::nostd::string_view event_domain) noexcept
-{
-  return opentelemetry::nostd::shared_ptr<opentelemetry::logs::EventLogger>{
-      new EventLogger(delegate_logger, event_domain)};
-}
-#endif
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger_provider_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger_provider_factory.cc
deleted file mode 100644
index e1c7284e3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/event_logger_provider_factory.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/logs/event_logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/event_logger_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-std::unique_ptr<opentelemetry::sdk::logs::EventLoggerProvider> EventLoggerProviderFactory::Create()
-{
-  return std::unique_ptr<opentelemetry::sdk::logs::EventLoggerProvider>(new EventLoggerProvider());
-}
-#endif
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/exporter.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/exporter.cc
deleted file mode 100644
index e57363ff2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/exporter.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/logs/exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-OPENTELEMETRY_EXPORT LogRecordExporter::LogRecordExporter() {}
-
-OPENTELEMETRY_EXPORT LogRecordExporter::~LogRecordExporter() {}
-
-OPENTELEMETRY_EXPORT bool LogRecordExporter::ForceFlush(
-    std::chrono::microseconds /*timeout*/) noexcept
-{
-  return true;
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger.cc
deleted file mode 100644
index 1c0ce3ab2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/noop.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/logs/logger.h"
-#include "opentelemetry/sdk/logs/logger_config.h"
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-namespace trace_api = opentelemetry::trace;
-namespace common    = opentelemetry::common;
-
-opentelemetry::logs::NoopLogger Logger::kNoopLogger = opentelemetry::logs::NoopLogger();
-
-Logger::Logger(
-    opentelemetry::nostd::string_view name,
-    std::shared_ptr<LoggerContext> context,
-    std::unique_ptr<instrumentationscope::InstrumentationScope> instrumentation_scope) noexcept
-    : logger_name_(std::string(name)),
-      instrumentation_scope_(std::move(instrumentation_scope)),
-      context_(std::move(context)),
-      logger_config_(context_->GetLoggerConfigurator().ComputeConfig(*instrumentation_scope_))
-{}
-
-const opentelemetry::nostd::string_view Logger::GetName() noexcept
-{
-  if (!logger_config_.IsEnabled())
-  {
-    return kNoopLogger.GetName();
-  }
-  return logger_name_;
-}
-
-opentelemetry::nostd::unique_ptr<opentelemetry::logs::LogRecord> Logger::CreateLogRecord() noexcept
-{
-  if (!logger_config_.IsEnabled())
-  {
-    return kNoopLogger.CreateLogRecord();
-  }
-
-  auto recordable = context_->GetProcessor().MakeRecordable();
-
-  recordable->SetObservedTimestamp(std::chrono::system_clock::now());
-
-  if (opentelemetry::context::RuntimeContext::GetCurrent().HasKey(opentelemetry::trace::kSpanKey))
-  {
-    opentelemetry::context::ContextValue context_value =
-        opentelemetry::context::RuntimeContext::GetCurrent().GetValue(
-            opentelemetry::trace::kSpanKey);
-    if (opentelemetry::nostd::holds_alternative<
-            opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>>(context_value))
-    {
-      opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> &data =
-          opentelemetry::nostd::get<opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>>(
-              context_value);
-      if (data)
-      {
-        recordable->SetTraceId(data->GetContext().trace_id());
-        recordable->SetTraceFlags(data->GetContext().trace_flags());
-        recordable->SetSpanId(data->GetContext().span_id());
-      }
-    }
-    else if (opentelemetry::nostd::holds_alternative<
-                 opentelemetry::nostd::shared_ptr<trace::SpanContext>>(context_value))
-    {
-      opentelemetry::nostd::shared_ptr<trace::SpanContext> &data =
-          opentelemetry::nostd::get<opentelemetry::nostd::shared_ptr<trace::SpanContext>>(
-              context_value);
-      if (data)
-      {
-        recordable->SetTraceId(data->trace_id());
-        recordable->SetTraceFlags(data->trace_flags());
-        recordable->SetSpanId(data->span_id());
-      }
-    }
-  }
-
-  return opentelemetry::nostd::unique_ptr<opentelemetry::logs::LogRecord>(recordable.release());
-}
-
-void Logger::EmitLogRecord(
-    opentelemetry::nostd::unique_ptr<opentelemetry::logs::LogRecord> &&log_record) noexcept
-{
-  if (!logger_config_.IsEnabled())
-  {
-    return kNoopLogger.EmitLogRecord(std::move(log_record));
-  }
-
-  if (!log_record)
-  {
-    return;
-  }
-
-  std::unique_ptr<Recordable> recordable =
-      std::unique_ptr<Recordable>(static_cast<Recordable *>(log_record.release()));
-  recordable->SetResource(context_->GetResource());
-  recordable->SetInstrumentationScope(GetInstrumentationScope());
-
-  auto &processor = context_->GetProcessor();
-
-  // TODO: Sampler (should include check for minSeverity)
-
-  // Send the log recordable to the processor
-  processor.OnEmit(std::move(recordable));
-}
-
-const opentelemetry::sdk::instrumentationscope::InstrumentationScope &
-Logger::GetInstrumentationScope() const noexcept
-{
-  return *instrumentation_scope_;
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_config.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_config.cc
deleted file mode 100644
index 2bc8aeb5f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_config.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/logs/logger_config.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-OPENTELEMETRY_EXPORT bool LoggerConfig::operator==(const LoggerConfig &other) const noexcept
-{
-  return disabled_ == other.disabled_;
-}
-
-OPENTELEMETRY_EXPORT bool LoggerConfig::IsEnabled() const noexcept
-{
-  return !disabled_;
-}
-
-OPENTELEMETRY_EXPORT LoggerConfig LoggerConfig::Enabled()
-{
-  return Default();
-}
-
-OPENTELEMETRY_EXPORT LoggerConfig LoggerConfig::Disabled()
-{
-  static const auto kDisabledConfig = LoggerConfig(true);
-  return kDisabledConfig;
-}
-
-OPENTELEMETRY_EXPORT LoggerConfig LoggerConfig::Default()
-{
-  static const auto kDefaultConfig = LoggerConfig();
-  return kDefaultConfig;
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_context.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_context.cc
deleted file mode 100644
index f7ad9db0c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_context.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/logs/logger_config.h"
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/multi_log_record_processor.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-LoggerContext::LoggerContext(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                             const opentelemetry::sdk::resource::Resource &resource,
-                             std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>>
-                                 logger_configurator) noexcept
-    : resource_(resource),
-      processor_(
-          std::unique_ptr<LogRecordProcessor>(new MultiLogRecordProcessor(std::move(processors)))),
-      logger_configurator_(std::move(logger_configurator))
-{}
-
-void LoggerContext::AddProcessor(std::unique_ptr<LogRecordProcessor> processor) noexcept
-{
-  auto multi_processor = static_cast<MultiLogRecordProcessor *>(processor_.get());
-  multi_processor->AddProcessor(std::move(processor));
-}
-
-LogRecordProcessor &LoggerContext::GetProcessor() const noexcept
-{
-  return *processor_;
-}
-
-const opentelemetry::sdk::resource::Resource &LoggerContext::GetResource() const noexcept
-{
-  return resource_;
-}
-
-const instrumentationscope::ScopeConfigurator<LoggerConfig> &LoggerContext::GetLoggerConfigurator()
-    const noexcept
-{
-  return *logger_configurator_;
-}
-
-bool LoggerContext::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return processor_->ForceFlush(timeout);
-}
-
-bool LoggerContext::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return processor_->Shutdown(timeout);
-}
-
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_context_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_context_factory.cc
deleted file mode 100644
index ccdfe87e8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_context_factory.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/logs/logger_config.h"
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/logger_context_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-std::unique_ptr<LoggerContext> LoggerContextFactory::Create(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors)
-{
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  return Create(std::move(processors), resource);
-}
-
-std::unique_ptr<LoggerContext> LoggerContextFactory::Create(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource)
-{
-  auto logger_configurator =
-      std::make_unique<instrumentationscope::ScopeConfigurator<LoggerConfig>>(
-          instrumentationscope::ScopeConfigurator<LoggerConfig>::Builder(LoggerConfig::Default())
-              .Build());
-  return Create(std::move(processors), resource, std::move(logger_configurator));
-}
-
-std::unique_ptr<LoggerContext> LoggerContextFactory::Create(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-    const resource::Resource &resource,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator)
-{
-  std::unique_ptr<LoggerContext> context(
-      new LoggerContext(std::move(processors), resource, std::move(logger_configurator)));
-  return context;
-}
-
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_provider.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_provider.cc
deleted file mode 100644
index 159fd2b16..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_provider.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <chrono>
-#include <mutex>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/logs/logger.h"
-#include "opentelemetry/sdk/logs/logger_config.h"
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-LoggerProvider::LoggerProvider(
-    std::unique_ptr<LogRecordProcessor> &&processor,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>>
-        logger_configurator) noexcept
-{
-  std::vector<std::unique_ptr<LogRecordProcessor>> processors;
-  processors.emplace_back(std::move(processor));
-  context_ = std::make_shared<LoggerContext>(std::move(processors), resource,
-                                             std::move(logger_configurator));
-  OTEL_INTERNAL_LOG_DEBUG("[LoggerProvider] LoggerProvider created.");
-}
-
-LoggerProvider::LoggerProvider(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>>
-        logger_configurator) noexcept
-    : context_{std::make_shared<LoggerContext>(std::move(processors),
-                                               resource,
-                                               std::move(logger_configurator))}
-{}
-
-LoggerProvider::LoggerProvider() noexcept
-    : context_{std::make_shared<LoggerContext>(std::vector<std::unique_ptr<LogRecordProcessor>>{})}
-{}
-
-LoggerProvider::LoggerProvider(std::unique_ptr<LoggerContext> context) noexcept
-    : context_(std::move(context))
-{}
-
-LoggerProvider::~LoggerProvider()
-{
-  // Logger hold the shared pointer to the context. So we can not use destructor of LoggerContext to
-  // Shutdown and flush all pending recordables when we have more than one loggers. These
-  // recordables may use the raw pointer of instrumentation_scope_ in Logger
-  if (context_)
-  {
-    context_->Shutdown();
-  }
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger> LoggerProvider::GetLogger(
-    opentelemetry::nostd::string_view logger_name,
-    opentelemetry::nostd::string_view library_name,
-    opentelemetry::nostd::string_view library_version,
-    opentelemetry::nostd::string_view schema_url,
-    const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#field-instrumentationscope
-  if (library_name.empty())
-  {
-    library_name = logger_name;
-  }
-
-  // Ensure only one thread can read/write from the map of loggers
-  std::lock_guard<std::mutex> lock_guard{lock_};
-
-  // If a logger with a name "logger_name" already exists, return it
-  for (auto &logger : loggers_)
-  {
-    auto &logger_lib = logger->GetInstrumentationScope();
-    if (logger->GetName() == logger_name &&
-        logger_lib.equal(library_name, library_version, schema_url, &attributes))
-    {
-      return opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger>{logger};
-    }
-  }
-
-  // Check if creating a new logger would exceed the max number of loggers
-  // TODO: Remove the noexcept from the API's and SDK's GetLogger(~)
-  /*
-  if (loggers_.size() > MAX_LOGGER_COUNT)
-  {
-#if __EXCEPTIONS
-    throw std::length_error("Number of loggers exceeds max count");
-#else
-    std::terminate();
-#endif
-  }
-  */
-
-  std::unique_ptr<instrumentationscope::InstrumentationScope> lib =
-      instrumentationscope::InstrumentationScope::Create(library_name, library_version, schema_url,
-                                                         attributes);
-
-  loggers_.push_back(std::shared_ptr<opentelemetry::sdk::logs::Logger>(
-      new Logger(logger_name, context_, std::move(lib))));
-  return opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger>{loggers_.back()};
-}
-
-void LoggerProvider::AddProcessor(std::unique_ptr<LogRecordProcessor> processor) noexcept
-{
-  context_->AddProcessor(std::move(processor));
-}
-
-const opentelemetry::sdk::resource::Resource &LoggerProvider::GetResource() const noexcept
-{
-  return context_->GetResource();
-}
-
-bool LoggerProvider::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return context_->Shutdown(timeout);
-}
-
-bool LoggerProvider::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return context_->ForceFlush(timeout);
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_provider_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_provider_factory.cc
deleted file mode 100644
index f80dd43b5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/logger_provider_factory.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/logs/logger_config.h"
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> LoggerProviderFactory::Create(
-    std::unique_ptr<LogRecordProcessor> &&processor)
-{
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  return Create(std::move(processor), resource);
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> LoggerProviderFactory::Create(
-    std::unique_ptr<LogRecordProcessor> &&processor,
-    const opentelemetry::sdk::resource::Resource &resource)
-{
-  auto logger_configurator =
-      std::make_unique<instrumentationscope::ScopeConfigurator<LoggerConfig>>(
-          instrumentationscope::ScopeConfigurator<LoggerConfig>::Builder(LoggerConfig::Default())
-              .Build());
-  return Create(std::move(processor), resource, std::move(logger_configurator));
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> LoggerProviderFactory::Create(
-    std::unique_ptr<LogRecordProcessor> &&processor,
-    const resource::Resource &resource,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator)
-{
-  std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> provider(
-      new LoggerProvider(std::move(processor), resource, std::move(logger_configurator)));
-  return provider;
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> LoggerProviderFactory::Create(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors)
-{
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  return Create(std::move(processors), resource);
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> LoggerProviderFactory::Create(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource)
-{
-  auto logger_configurator =
-      std::make_unique<instrumentationscope::ScopeConfigurator<LoggerConfig>>(
-          instrumentationscope::ScopeConfigurator<LoggerConfig>::Builder(LoggerConfig::Default())
-              .Build());
-  return Create(std::move(processors), resource, std::move(logger_configurator));
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> LoggerProviderFactory::Create(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-    const resource::Resource &resource,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<LoggerConfig>> logger_configurator)
-{
-  std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> provider(
-      new LoggerProvider(std::move(processors), resource, std::move(logger_configurator)));
-  return provider;
-}
-
-std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> LoggerProviderFactory::Create(
-    std::unique_ptr<LoggerContext> context)
-{
-  std::unique_ptr<opentelemetry::sdk::logs::LoggerProvider> provider(
-      new LoggerProvider(std::move(context)));
-  return provider;
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_log_record_processor.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_log_record_processor.cc
deleted file mode 100644
index 1841a751a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_log_record_processor.cc
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <chrono>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/logs/multi_log_record_processor.h"
-#include "opentelemetry/sdk/logs/multi_recordable.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-MultiLogRecordProcessor::MultiLogRecordProcessor(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors)
-{
-  for (auto &processor : processors)
-  {
-    AddProcessor(std::move(processor));
-  }
-}
-MultiLogRecordProcessor::~MultiLogRecordProcessor()
-{
-  ForceFlush();
-  Shutdown();
-}
-
-void MultiLogRecordProcessor::AddProcessor(std::unique_ptr<LogRecordProcessor> &&processor)
-{
-  // Add preocessor to end of the list.
-  if (processor)
-  {
-    processors_.emplace_back(std::move(processor));
-  }
-}
-
-std::unique_ptr<Recordable> MultiLogRecordProcessor::MakeRecordable() noexcept
-{
-  auto recordable       = std::unique_ptr<Recordable>(new MultiRecordable());
-  auto multi_recordable = static_cast<MultiRecordable *>(recordable.get());
-  for (auto &processor : processors_)
-  {
-    multi_recordable->AddRecordable(*processor, processor->MakeRecordable());
-  }
-  return recordable;
-}
-
-void MultiLogRecordProcessor::OnEmit(std::unique_ptr<Recordable> &&record) noexcept
-{
-  if (!record)
-  {
-    return;
-  }
-  auto multi_recordable = static_cast<MultiRecordable *>(record.get());
-
-  for (auto &processor : processors_)
-  {
-    auto recordable = multi_recordable->ReleaseRecordable(*processor);
-    if (recordable)
-    {
-      processor->OnEmit(std::move(recordable));
-    }
-  }
-}
-
-bool MultiLogRecordProcessor::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  // Convert to nanos to prevent overflow
-  std::chrono::nanoseconds timeout_ns = std::chrono::nanoseconds::max();
-  if (std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns) > timeout)
-  {
-    timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(timeout);
-  }
-  bool result           = true;
-  auto start_time       = std::chrono::system_clock::now();
-  auto overflow_checker = std::chrono::system_clock::time_point::max();
-  std::chrono::system_clock::time_point expire_time;
-  if (overflow_checker - start_time <= timeout_ns)
-  {
-    expire_time = overflow_checker;
-  }
-  else
-  {
-    expire_time =
-        start_time + std::chrono::duration_cast<std::chrono::system_clock::duration>(timeout_ns);
-  }
-  for (auto &processor : processors_)
-  {
-    if (!processor->ForceFlush(std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns)))
-    {
-      result = false;
-    }
-    start_time = std::chrono::system_clock::now();
-    if (expire_time > start_time)
-    {
-      timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(expire_time - start_time);
-    }
-    else
-    {
-      timeout_ns = std::chrono::nanoseconds::zero();
-    }
-  }
-  return result;
-}
-
-bool MultiLogRecordProcessor::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  // Converto nanos to prevent overflow
-  std::chrono::nanoseconds timeout_ns = std::chrono::nanoseconds::max();
-  if (std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns) > timeout)
-  {
-    timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(timeout);
-  }
-  bool result           = true;
-  auto start_time       = std::chrono::system_clock::now();
-  auto overflow_checker = std::chrono::system_clock::time_point::max();
-  std::chrono::system_clock::time_point expire_time;
-  if (overflow_checker - start_time <= timeout_ns)
-  {
-    expire_time = overflow_checker;
-  }
-  else
-  {
-    expire_time =
-        start_time + std::chrono::duration_cast<std::chrono::system_clock::duration>(timeout_ns);
-  }
-  for (auto &processor : processors_)
-  {
-    result |=
-        processor->Shutdown(std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns));
-    start_time = std::chrono::system_clock::now();
-    if (expire_time > start_time)
-    {
-      timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(expire_time - start_time);
-    }
-    else
-    {
-      timeout_ns = std::chrono::nanoseconds::zero();
-    }
-  }
-  return result;
-}
-
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_log_record_processor_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_log_record_processor_factory.cc
deleted file mode 100644
index f51c851a2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_log_record_processor_factory.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/logs/multi_log_record_processor.h"
-#include "opentelemetry/sdk/logs/multi_log_record_processor_factory.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-std::unique_ptr<LogRecordProcessor> MultiLogRecordProcessorFactory::Create(
-    std::vector<std::unique_ptr<LogRecordProcessor>> &&processors)
-{
-  std::unique_ptr<LogRecordProcessor> processor(new MultiLogRecordProcessor(std::move(processors)));
-  return processor;
-}
-
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_recordable.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_recordable.cc
deleted file mode 100644
index 53c2b25e3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/multi_recordable.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <cstddef>
-#include <memory>
-#include <unordered_map>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/logs/multi_recordable.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-namespace
-{
-std::size_t MakeKey(const opentelemetry::sdk::logs::LogRecordProcessor &processor)
-{
-  return reinterpret_cast<std::size_t>(&processor);
-}
-
-}  // namespace
-
-void MultiRecordable::AddRecordable(const LogRecordProcessor &processor,
-                                    std::unique_ptr<Recordable> recordable) noexcept
-{
-  recordables_[MakeKey(processor)] = std::move(recordable);
-}
-
-const std::unique_ptr<Recordable> &MultiRecordable::GetRecordable(
-    const LogRecordProcessor &processor) const noexcept
-{
-  // TODO - return nullptr ref on failed lookup?
-  auto i = recordables_.find(MakeKey(processor));
-  if (i != recordables_.end())
-  {
-    return i->second;
-  }
-  static std::unique_ptr<Recordable> empty(nullptr);
-  return empty;
-}
-
-std::unique_ptr<Recordable> MultiRecordable::ReleaseRecordable(
-    const LogRecordProcessor &processor) noexcept
-{
-  auto i = recordables_.find(MakeKey(processor));
-  if (i != recordables_.end())
-  {
-    std::unique_ptr<Recordable> result(i->second.release());
-    recordables_.erase(MakeKey(processor));
-    return result;
-  }
-  return std::unique_ptr<Recordable>(nullptr);
-}
-
-void MultiRecordable::SetTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetTimestamp(timestamp);
-    }
-  }
-}
-
-void MultiRecordable::SetObservedTimestamp(
-    opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetObservedTimestamp(timestamp);
-    }
-  }
-}
-
-void MultiRecordable::SetSeverity(opentelemetry::logs::Severity severity) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetSeverity(severity);
-    }
-  }
-}
-
-void MultiRecordable::SetBody(const opentelemetry::common::AttributeValue &message) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetBody(message);
-    }
-  }
-}
-
-void MultiRecordable::SetEventId(int64_t id, nostd::string_view name) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetEventId(id, name);
-    }
-  }
-}
-
-void MultiRecordable::SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetTraceId(trace_id);
-    }
-  }
-}
-
-void MultiRecordable::SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetSpanId(span_id);
-    }
-  }
-}
-
-void MultiRecordable::SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetTraceFlags(trace_flags);
-    }
-  }
-}
-
-void MultiRecordable::SetAttribute(nostd::string_view key,
-                                   const opentelemetry::common::AttributeValue &value) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetAttribute(key, value);
-    }
-  }
-}
-
-void MultiRecordable::SetResource(const opentelemetry::sdk::resource::Resource &resource) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetResource(resource);
-    }
-  }
-}
-
-void MultiRecordable::SetInstrumentationScope(
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-        &instrumentation_scope) noexcept
-{
-  for (auto &recordable : recordables_)
-  {
-    if (recordable.second)
-    {
-      recordable.second->SetInstrumentationScope(instrumentation_scope);
-    }
-  }
-}
-
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/provider.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/provider.cc
deleted file mode 100644
index 224bc8c39..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/provider.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/disabled.h"
-#include "opentelemetry/sdk/logs/provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-void Provider::SetLoggerProvider(
-    const nostd::shared_ptr<opentelemetry::logs::LoggerProvider> &lp) noexcept
-{
-  bool disabled = opentelemetry::sdk::common::GetSdkDisabled();
-
-  if (!disabled)
-  {
-    opentelemetry::logs::Provider::SetLoggerProvider(lp);
-  }
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/read_write_log_record.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/read_write_log_record.cc
deleted file mode 100644
index 7743fbd5d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/read_write_log_record.cc
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <chrono>
-#include <memory>
-#include <string>
-#include <unordered_map>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/read_write_log_record.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-ReadWriteLogRecord::ReadWriteLogRecord()
-    : severity_(opentelemetry::logs::Severity::kInvalid),
-      resource_(nullptr),
-      instrumentation_scope_(nullptr),
-      body_(std::string()),
-      observed_timestamp_(std::chrono::system_clock::now()),
-      event_id_(0),
-      event_name_("")
-{}
-
-ReadWriteLogRecord::~ReadWriteLogRecord() {}
-
-void ReadWriteLogRecord::SetTimestamp(opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  timestamp_ = timestamp;
-}
-
-opentelemetry::common::SystemTimestamp ReadWriteLogRecord::GetTimestamp() const noexcept
-{
-  return timestamp_;
-}
-
-void ReadWriteLogRecord::SetObservedTimestamp(
-    opentelemetry::common::SystemTimestamp timestamp) noexcept
-{
-  observed_timestamp_ = timestamp;
-}
-
-opentelemetry::common::SystemTimestamp ReadWriteLogRecord::GetObservedTimestamp() const noexcept
-{
-  return observed_timestamp_;
-}
-
-void ReadWriteLogRecord::SetSeverity(opentelemetry::logs::Severity severity) noexcept
-{
-  severity_ = severity;
-}
-
-opentelemetry::logs::Severity ReadWriteLogRecord::GetSeverity() const noexcept
-{
-  return severity_;
-}
-
-void ReadWriteLogRecord::SetBody(const opentelemetry::common::AttributeValue &message) noexcept
-{
-  opentelemetry::sdk::common::AttributeConverter converter;
-  body_ = nostd::visit(converter, message);
-}
-
-const opentelemetry::sdk::common::OwnedAttributeValue &ReadWriteLogRecord::GetBody() const noexcept
-{
-  return body_;
-}
-
-void ReadWriteLogRecord::SetEventId(int64_t id, nostd::string_view name) noexcept
-{
-  event_id_   = id;
-  event_name_ = std::string{name};
-}
-
-int64_t ReadWriteLogRecord::GetEventId() const noexcept
-{
-  return event_id_;
-}
-
-nostd::string_view ReadWriteLogRecord::GetEventName() const noexcept
-{
-  return nostd::string_view{event_name_};
-}
-
-void ReadWriteLogRecord::SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept
-{
-  if (!trace_state_)
-  {
-    trace_state_ = std::unique_ptr<TraceState>(new TraceState());
-  }
-
-  trace_state_->trace_id = trace_id;
-}
-
-const opentelemetry::trace::TraceId &ReadWriteLogRecord::GetTraceId() const noexcept
-{
-  if (trace_state_)
-  {
-    return trace_state_->trace_id;
-  }
-
-  static opentelemetry::trace::TraceId empty;
-  return empty;
-}
-
-void ReadWriteLogRecord::SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept
-{
-  if (!trace_state_)
-  {
-    trace_state_ = std::unique_ptr<TraceState>(new TraceState());
-  }
-
-  trace_state_->span_id = span_id;
-}
-
-const opentelemetry::trace::SpanId &ReadWriteLogRecord::GetSpanId() const noexcept
-{
-  if (trace_state_)
-  {
-    return trace_state_->span_id;
-  }
-
-  static opentelemetry::trace::SpanId empty;
-  return empty;
-}
-
-void ReadWriteLogRecord::SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept
-{
-  if (!trace_state_)
-  {
-    trace_state_ = std::unique_ptr<TraceState>(new TraceState());
-  }
-
-  trace_state_->trace_flags = trace_flags;
-}
-
-const opentelemetry::trace::TraceFlags &ReadWriteLogRecord::GetTraceFlags() const noexcept
-{
-  if (trace_state_)
-  {
-    return trace_state_->trace_flags;
-  }
-
-  static opentelemetry::trace::TraceFlags empty;
-  return empty;
-}
-
-void ReadWriteLogRecord::SetAttribute(nostd::string_view key,
-                                      const opentelemetry::common::AttributeValue &value) noexcept
-{
-  std::string safe_key(key);
-  opentelemetry::sdk::common::AttributeConverter converter;
-  attributes_map_[safe_key] = nostd::visit(converter, value);
-}
-
-const std::unordered_map<std::string, opentelemetry::sdk::common::OwnedAttributeValue> &
-ReadWriteLogRecord::GetAttributes() const noexcept
-{
-  return attributes_map_;
-}
-
-const opentelemetry::sdk::resource::Resource &ReadWriteLogRecord::GetResource() const noexcept
-{
-  if OPENTELEMETRY_LIKELY_CONDITION (nullptr != resource_)
-  {
-    return *resource_;
-  }
-
-  return GetDefaultResource();
-}
-
-void ReadWriteLogRecord::SetResource(
-    const opentelemetry::sdk::resource::Resource &resource) noexcept
-{
-  resource_ = &resource;
-}
-
-const opentelemetry::sdk::instrumentationscope::InstrumentationScope &
-ReadWriteLogRecord::GetInstrumentationScope() const noexcept
-{
-  if OPENTELEMETRY_LIKELY_CONDITION (nullptr != instrumentation_scope_)
-  {
-    return *instrumentation_scope_;
-  }
-
-  return GetDefaultInstrumentationScope();
-}
-
-void ReadWriteLogRecord::SetInstrumentationScope(
-    const opentelemetry::sdk::instrumentationscope::InstrumentationScope
-        &instrumentation_scope) noexcept
-{
-  instrumentation_scope_ = &instrumentation_scope;
-}
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/readable_log_record.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/readable_log_record.cc
deleted file mode 100644
index 8d35c1eb2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/readable_log_record.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <cstddef>
-#include <memory>
-#include <type_traits>
-
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/readable_log_record.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/version/version.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-nostd::string_view ReadableLogRecord::GetSeverityText() const noexcept
-{
-  std::size_t severity_index = static_cast<std::size_t>(GetSeverity());
-  if (severity_index >= std::extent<decltype(opentelemetry::logs::SeverityNumToText)>::value)
-  {
-    return opentelemetry::logs::SeverityNumToText[0];
-  }
-
-  return opentelemetry::logs::SeverityNumToText[severity_index];
-}
-
-const opentelemetry::sdk::instrumentationscope::InstrumentationScope &
-ReadableLogRecord::GetDefaultInstrumentationScope() noexcept
-{
-  // FIXME: Use shared default instrumentation scope?
-  static std::unique_ptr<opentelemetry::sdk::instrumentationscope::InstrumentationScope>
-      default_scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "otel-cpp", OPENTELEMETRY_SDK_VERSION, "https://opentelemetry.io/schemas/1.15.0");
-  return *default_scope;
-}
-
-const opentelemetry::sdk::resource::Resource &ReadableLogRecord::GetDefaultResource() noexcept
-{
-  static opentelemetry::sdk::resource::Resource default_resource =
-      opentelemetry::sdk::resource::Resource::Create(
-          {}, GetDefaultInstrumentationScope().GetSchemaURL());
-
-  return default_resource;
-}
-
-}  // namespace logs
-}  // namespace sdk
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/simple_log_record_processor.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/simple_log_record_processor.cc
deleted file mode 100644
index 7e65f31ca..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/simple_log_record_processor.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <mutex>
-#include <utility>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-/**
- * Initialize a simple log processor.
- * @param exporter the configured exporter where log records are sent
- */
-SimpleLogRecordProcessor::SimpleLogRecordProcessor(std::unique_ptr<LogRecordExporter> &&exporter)
-    : exporter_(std::move(exporter)), is_shutdown_(false)
-{}
-
-SimpleLogRecordProcessor::~SimpleLogRecordProcessor() {}
-
-std::unique_ptr<Recordable> SimpleLogRecordProcessor::MakeRecordable() noexcept
-{
-  return exporter_->MakeRecordable();
-}
-
-/**
- * Batches the log record it receives in a batch of 1 and immediately sends it
- * to the configured exporter
- */
-void SimpleLogRecordProcessor::OnEmit(std::unique_ptr<Recordable> &&record) noexcept
-{
-  nostd::span<std::unique_ptr<Recordable>> batch(&record, 1);
-  // Get lock to ensure Export() is never called concurrently
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-
-  if (exporter_->Export(batch) != sdk::common::ExportResult::kSuccess)
-  {
-    /* Alert user of the failed export */
-  }
-}
-/**
- *  The simple processor does not have any log records to flush so this method is not used
- */
-bool SimpleLogRecordProcessor::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  if (exporter_ != nullptr)
-  {
-    return exporter_->ForceFlush(timeout);
-  }
-  return true;
-}
-
-bool SimpleLogRecordProcessor::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  // Should only shutdown exporter ONCE.
-  if (!is_shutdown_.exchange(true, std::memory_order_acq_rel) && exporter_ != nullptr)
-  {
-    return exporter_->Shutdown(timeout);
-  }
-
-  return true;
-}
-
-bool SimpleLogRecordProcessor::IsShutdown() const noexcept
-{
-  return is_shutdown_.load(std::memory_order_acquire);
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/simple_log_record_processor_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/simple_log_record_processor_factory.cc
deleted file mode 100644
index 88e1b4b1e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/logs/simple_log_record_processor_factory.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-
-std::unique_ptr<LogRecordProcessor> SimpleLogRecordProcessorFactory::Create(
-    std::unique_ptr<LogRecordExporter> &&exporter)
-{
-  std::unique_ptr<LogRecordProcessor> processor(new SimpleLogRecordProcessor(std::move(exporter)));
-  return processor;
-}
-
-}  // namespace logs
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/BUILD
deleted file mode 100644
index aa8ed74b4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "metrics",
-    srcs = glob(["**/*.cc"]),
-    include_prefix = "src/metrics",
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common:disabled",
-        "//sdk/src/common:global_log_handler",
-        "//sdk/src/common:random",
-        "//sdk/src/resource",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/CMakeLists.txt
deleted file mode 100644
index b56fd553e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(
-  opentelemetry_metrics
-  async_instruments.cc
-  provider.cc
-  meter_provider.cc
-  meter_provider_factory.cc
-  meter.cc
-  meter_config.cc
-  meter_context.cc
-  meter_context_factory.cc
-  metric_reader.cc
-  instrument_metadata_validator.cc
-  export/periodic_exporting_metric_reader.cc
-  export/periodic_exporting_metric_reader_factory.cc
-  state/filtered_ordered_attribute_map.cc
-  state/metric_collector.cc
-  state/observable_registry.cc
-  state/sync_metric_storage.cc
-  state/temporal_metric_storage.cc
-  aggregation/base2_exponential_histogram_aggregation.cc
-  aggregation/base2_exponential_histogram_indexer.cc
-  aggregation/histogram_aggregation.cc
-  aggregation/lastvalue_aggregation.cc
-  aggregation/sum_aggregation.cc
-  data/circular_buffer.cc
-  exemplar/reservoir.cc
-  view/instrument_selector_factory.cc
-  view/meter_selector_factory.cc
-  view/view_factory.cc
-  view/view_registry_factory.cc
-  sync_instruments.cc)
-
-set_target_properties(opentelemetry_metrics PROPERTIES EXPORT_NAME metrics)
-set_target_version(opentelemetry_metrics)
-
-target_link_libraries(opentelemetry_metrics PUBLIC opentelemetry_common
-                                                   opentelemetry_resources)
-
-target_include_directories(
-  opentelemetry_metrics
-  PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/sdk/include>")
-
-if(OPENTELEMETRY_INSTALL)
-  opentelemetry_add_pkgconfig(
-    metrics "OpenTelemetry SDK - Metrics"
-    "Components for exporting metrics in the OpenTelemetry SDK."
-    "opentelemetry_resources")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/base2_exponential_histogram_aggregation.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/base2_exponential_histogram_aggregation.cc
deleted file mode 100644
index 42fd73d89..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/base2_exponential_histogram_aggregation.cc
+++ /dev/null
@@ -1,491 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <limits>
-#include <memory>
-#include <mutex>
-#include <utility>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_indexer.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-namespace
-{
-
-uint32_t GetScaleReduction(int32_t start_index, int32_t end_index, size_t max_buckets) noexcept
-{
-  uint32_t scale_reduction = 0;
-  while (static_cast<size_t>(end_index - start_index + 1) > max_buckets)
-  {
-    start_index >>= 1;
-    end_index >>= 1;
-    scale_reduction++;
-  }
-  return scale_reduction;
-}
-
-void DownscaleBuckets(std::unique_ptr<AdaptingCircularBufferCounter> &buckets, uint32_t by) noexcept
-{
-  if (buckets->Empty())
-  {
-    return;
-  }
-
-  // We want to preserve other optimisations here as well, e.g. integer size.
-  // Instead of creating a new counter, we copy the existing one (for bucket size
-  // optimisations), and clear the values before writing the new ones.
-  // TODO(euroelessar): Do downscaling in-place.
-  auto new_buckets = std::make_unique<AdaptingCircularBufferCounter>(buckets->MaxSize());
-  new_buckets->Clear();
-
-  for (auto i = buckets->StartIndex(); i <= buckets->EndIndex(); ++i)
-  {
-    const uint64_t count = buckets->Get(i);
-    if (count > 0)
-    {
-      new_buckets->Increment(i >> by, count);
-    }
-  }
-  buckets = std::move(new_buckets);
-}
-
-}  // namespace
-
-Base2ExponentialHistogramAggregation::Base2ExponentialHistogramAggregation(
-    const AggregationConfig *aggregation_config)
-{
-  const Base2ExponentialHistogramAggregationConfig default_config;
-  auto ac = static_cast<const Base2ExponentialHistogramAggregationConfig *>(aggregation_config);
-  if (!ac)
-  {
-    ac = &default_config;
-  }
-
-  point_data_.max_buckets_    = (std::max)(ac->max_buckets_, static_cast<size_t>(2));
-  point_data_.scale_          = ac->max_scale_;
-  point_data_.record_min_max_ = ac->record_min_max_;
-  point_data_.min_            = (std::numeric_limits<double>::max)();
-  point_data_.max_            = (std::numeric_limits<double>::min)();
-
-  // Initialize buckets
-  point_data_.positive_buckets_ =
-      std::make_unique<AdaptingCircularBufferCounter>(point_data_.max_buckets_);
-  point_data_.negative_buckets_ =
-      std::make_unique<AdaptingCircularBufferCounter>(point_data_.max_buckets_);
-
-  indexer_ = Base2ExponentialHistogramIndexer(point_data_.scale_);
-}
-
-Base2ExponentialHistogramAggregation::Base2ExponentialHistogramAggregation(
-    const Base2ExponentialHistogramPointData &point_data)
-    : point_data_{}, indexer_(point_data.scale_), record_min_max_{point_data.record_min_max_}
-{
-  point_data_.sum_            = point_data.sum_;
-  point_data_.min_            = point_data.min_;
-  point_data_.max_            = point_data.max_;
-  point_data_.zero_threshold_ = point_data.zero_threshold_;
-  point_data_.count_          = point_data.count_;
-  point_data_.zero_count_     = point_data.zero_count_;
-  point_data_.max_buckets_    = point_data.max_buckets_;
-  point_data_.scale_          = point_data.scale_;
-  point_data_.record_min_max_ = point_data.record_min_max_;
-
-  // Deep copy the unique_ptr members
-  if (point_data.positive_buckets_)
-  {
-    point_data_.positive_buckets_ =
-        std::make_unique<AdaptingCircularBufferCounter>(*point_data.positive_buckets_);
-  }
-  if (point_data.negative_buckets_)
-  {
-    point_data_.negative_buckets_ =
-        std::make_unique<AdaptingCircularBufferCounter>(*point_data.negative_buckets_);
-  }
-}
-
-Base2ExponentialHistogramAggregation::Base2ExponentialHistogramAggregation(
-    Base2ExponentialHistogramPointData &&point_data)
-    : point_data_{std::move(point_data)},
-      indexer_(point_data_.scale_),
-      record_min_max_{point_data_.record_min_max_}
-{}
-
-void Base2ExponentialHistogramAggregation::Aggregate(
-    int64_t value,
-    const PointAttributes & /* attributes */) noexcept
-{
-  Aggregate(double(value));
-}
-
-void Base2ExponentialHistogramAggregation::Aggregate(
-    double value,
-    const PointAttributes & /* attributes */) noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  point_data_.sum_ += value;
-  point_data_.count_++;
-
-  if (record_min_max_)
-  {
-    point_data_.min_ = (std::min)(point_data_.min_, value);
-    point_data_.max_ = (std::max)(point_data_.max_, value);
-  }
-
-  if (value == 0)
-  {
-    point_data_.zero_count_++;
-    return;
-  }
-  else if (value > 0)
-  {
-    if (point_data_.positive_buckets_)
-    {
-      AggregateIntoBuckets(point_data_.positive_buckets_, value);
-    }
-  }
-  else
-  {
-    if (point_data_.negative_buckets_)
-    {
-      AggregateIntoBuckets(point_data_.negative_buckets_, -value);
-    }
-  }
-}
-
-void Base2ExponentialHistogramAggregation::AggregateIntoBuckets(
-    std::unique_ptr<AdaptingCircularBufferCounter> &buckets,
-    double value) noexcept
-{
-  if (!buckets)
-  {
-    buckets = std::make_unique<AdaptingCircularBufferCounter>(point_data_.max_buckets_);
-  }
-
-  if (buckets->MaxSize() == 0)
-  {
-    buckets = std::make_unique<AdaptingCircularBufferCounter>(point_data_.max_buckets_);
-  }
-
-  const int32_t index = indexer_.ComputeIndex(value);
-  if (!buckets->Increment(index, 1))
-  {
-    const int32_t start_index = (std::min)(buckets->StartIndex(), index);
-    const int32_t end_index   = (std::max)(buckets->EndIndex(), index);
-    const uint32_t scale_reduction =
-        GetScaleReduction(start_index, end_index, point_data_.max_buckets_);
-    Downscale(scale_reduction);
-
-    buckets->Increment(index >> scale_reduction, 1);
-  }
-}
-
-void Base2ExponentialHistogramAggregation::Downscale(uint32_t by) noexcept
-{
-  if (by == 0)
-  {
-    return;
-  }
-
-  if (point_data_.positive_buckets_)
-  {
-    DownscaleBuckets(point_data_.positive_buckets_, by);
-  }
-  if (point_data_.negative_buckets_)
-  {
-    DownscaleBuckets(point_data_.negative_buckets_, by);
-  }
-
-  point_data_.scale_ -= by;
-  indexer_ = Base2ExponentialHistogramIndexer(point_data_.scale_);
-}
-
-// Merge A and B into a new circular buffer C.
-// Caller must ensure that A and B are used as buckets at the same scale.
-AdaptingCircularBufferCounter MergeBuckets(size_t max_buckets,
-                                           const AdaptingCircularBufferCounter &A,
-                                           const AdaptingCircularBufferCounter &B)
-{
-  AdaptingCircularBufferCounter C = AdaptingCircularBufferCounter(max_buckets);
-  C.Clear();
-
-  if (A.Empty() && B.Empty())
-  {
-    return C;
-  }
-  if (A.Empty())
-  {
-    return B;
-  }
-  if (B.Empty())
-  {
-    return A;
-  }
-
-  auto min_index = (std::min)(A.StartIndex(), B.StartIndex());
-  auto max_index = (std::max)(A.EndIndex(), B.EndIndex());
-
-  for (int i = min_index; i <= max_index; i++)
-  {
-    auto count = A.Get(i) + B.Get(i);
-    if (count > 0)
-    {
-      C.Increment(i, count);
-    }
-  }
-
-  return C;
-}
-
-std::unique_ptr<Aggregation> Base2ExponentialHistogramAggregation::Merge(
-    const Aggregation &delta) const noexcept
-{
-  auto left  = nostd::get<Base2ExponentialHistogramPointData>(ToPoint());
-  auto right = nostd::get<Base2ExponentialHistogramPointData>(
-      (static_cast<const Base2ExponentialHistogramAggregation &>(delta).ToPoint()));
-
-  if (left.count_ == 0)
-  {
-    return std::make_unique<Base2ExponentialHistogramAggregation>(std::move(right));
-  }
-
-  if (right.count_ == 0)
-  {
-    return std::make_unique<Base2ExponentialHistogramAggregation>(std::move(left));
-  }
-
-  auto &low_res  = left.scale_ < right.scale_ ? left : right;
-  auto &high_res = left.scale_ < right.scale_ ? right : left;
-
-  Base2ExponentialHistogramPointData result_value;
-  result_value.count_      = low_res.count_ + high_res.count_;
-  result_value.sum_        = low_res.sum_ + high_res.sum_;
-  result_value.zero_count_ = low_res.zero_count_ + high_res.zero_count_;
-  result_value.scale_      = (std::min)(low_res.scale_, high_res.scale_);
-  result_value.max_buckets_ =
-      low_res.max_buckets_ >= high_res.max_buckets_ ? low_res.max_buckets_ : high_res.max_buckets_;
-  result_value.record_min_max_ = low_res.record_min_max_ && high_res.record_min_max_;
-
-  if (result_value.record_min_max_)
-  {
-    result_value.min_ = (std::min)(low_res.min_, high_res.min_);
-    result_value.max_ = (std::max)(low_res.max_, high_res.max_);
-  }
-
-  {
-    auto scale_reduction = high_res.scale_ - low_res.scale_;
-
-    if (scale_reduction > 0)
-    {
-      DownscaleBuckets(high_res.positive_buckets_, scale_reduction);
-      DownscaleBuckets(high_res.negative_buckets_, scale_reduction);
-      high_res.scale_ -= scale_reduction;
-    }
-  }
-
-  if (!low_res.positive_buckets_->Empty() && !high_res.positive_buckets_->Empty())
-  {
-    auto pos_min_index = (std::min)(low_res.positive_buckets_->StartIndex(),
-                                    high_res.positive_buckets_->StartIndex());
-    auto pos_max_index =
-        (std::max)(low_res.positive_buckets_->EndIndex(), high_res.positive_buckets_->EndIndex());
-    auto neg_min_index = (std::min)(low_res.negative_buckets_->StartIndex(),
-                                    high_res.negative_buckets_->StartIndex());
-    auto neg_max_index =
-        (std::max)(low_res.negative_buckets_->EndIndex(), high_res.negative_buckets_->EndIndex());
-
-    if (static_cast<size_t>(pos_max_index) >
-            static_cast<size_t>(pos_min_index) + result_value.max_buckets_ ||
-        static_cast<size_t>(neg_max_index) >
-            static_cast<size_t>(neg_min_index) + result_value.max_buckets_)
-    {
-      // We need to downscale the buckets to fit into the new max_buckets_.
-      const uint32_t scale_reduction =
-          GetScaleReduction(pos_min_index, pos_max_index, result_value.max_buckets_);
-      DownscaleBuckets(low_res.positive_buckets_, scale_reduction);
-      DownscaleBuckets(high_res.positive_buckets_, scale_reduction);
-      DownscaleBuckets(low_res.negative_buckets_, scale_reduction);
-      DownscaleBuckets(high_res.negative_buckets_, scale_reduction);
-      low_res.scale_ -= scale_reduction;
-      high_res.scale_ -= scale_reduction;
-      result_value.scale_ -= scale_reduction;
-    }
-  }
-
-  result_value.positive_buckets_ = std::make_unique<AdaptingCircularBufferCounter>(MergeBuckets(
-      result_value.max_buckets_, *low_res.positive_buckets_, *high_res.positive_buckets_));
-  result_value.negative_buckets_ = std::make_unique<AdaptingCircularBufferCounter>(MergeBuckets(
-      result_value.max_buckets_, *low_res.negative_buckets_, *high_res.negative_buckets_));
-
-  return std::unique_ptr<Base2ExponentialHistogramAggregation>{
-      new Base2ExponentialHistogramAggregation(std::move(result_value))};
-}
-
-std::unique_ptr<Aggregation> Base2ExponentialHistogramAggregation::Diff(
-    const Aggregation &next) const noexcept
-{
-  auto left  = nostd::get<Base2ExponentialHistogramPointData>(ToPoint());
-  auto right = nostd::get<Base2ExponentialHistogramPointData>(
-      (static_cast<const Base2ExponentialHistogramAggregation &>(next).ToPoint()));
-
-  auto &low_res  = left.scale_ < right.scale_ ? left : right;
-  auto &high_res = left.scale_ < right.scale_ ? right : left;
-
-  {
-    const auto scale_reduction = high_res.scale_ - low_res.scale_;
-
-    if (scale_reduction > 0)
-    {
-      if (high_res.positive_buckets_)
-      {
-        DownscaleBuckets(high_res.positive_buckets_, scale_reduction);
-      }
-
-      if (high_res.negative_buckets_)
-      {
-        DownscaleBuckets(high_res.negative_buckets_, scale_reduction);
-      }
-
-      high_res.scale_ -= scale_reduction;
-    }
-  }
-
-  auto pos_min_index =
-      (left.positive_buckets_ && right.positive_buckets_)
-          ? (std::min)(left.positive_buckets_->StartIndex(), right.positive_buckets_->StartIndex())
-          : 0;
-  auto pos_max_index =
-      (left.positive_buckets_ && right.positive_buckets_)
-          ? (std::max)(left.positive_buckets_->EndIndex(), right.positive_buckets_->EndIndex())
-          : 0;
-  auto neg_min_index =
-      (left.negative_buckets_ && right.negative_buckets_)
-          ? (std::min)(left.negative_buckets_->StartIndex(), right.negative_buckets_->StartIndex())
-          : 0;
-  auto neg_max_index =
-      (left.negative_buckets_ && right.negative_buckets_)
-          ? (std::max)(left.negative_buckets_->EndIndex(), right.negative_buckets_->EndIndex())
-          : 0;
-
-  if (static_cast<size_t>(pos_max_index) >
-          static_cast<size_t>(pos_min_index) + low_res.max_buckets_ ||
-      static_cast<size_t>(neg_max_index) >
-          static_cast<size_t>(neg_min_index) + low_res.max_buckets_)
-  {
-    const uint32_t scale_reduction =
-        GetScaleReduction(pos_min_index, pos_max_index, low_res.max_buckets_);
-
-    if (left.positive_buckets_)
-    {
-      DownscaleBuckets(left.positive_buckets_, scale_reduction);
-    }
-    if (right.positive_buckets_)
-    {
-      DownscaleBuckets(right.positive_buckets_, scale_reduction);
-    }
-    if (left.negative_buckets_)
-    {
-      DownscaleBuckets(left.negative_buckets_, scale_reduction);
-    }
-    if (right.negative_buckets_)
-    {
-      DownscaleBuckets(right.negative_buckets_, scale_reduction);
-    }
-    left.scale_ -= scale_reduction;
-    right.scale_ -= scale_reduction;
-  }
-
-  Base2ExponentialHistogramPointData result_value;
-  result_value.scale_          = low_res.scale_;
-  result_value.max_buckets_    = low_res.max_buckets_;
-  result_value.record_min_max_ = false;
-  result_value.count_          = (right.count_ >= left.count_) ? (right.count_ - left.count_) : 0;
-  result_value.sum_            = (right.sum_ >= left.sum_) ? (right.sum_ - left.sum_) : 0.0;
-  result_value.zero_count_ =
-      (right.zero_count_ >= left.zero_count_) ? (right.zero_count_ - left.zero_count_) : 0;
-
-  result_value.positive_buckets_ =
-      std::make_unique<AdaptingCircularBufferCounter>(right.max_buckets_);
-  result_value.negative_buckets_ =
-      std::make_unique<AdaptingCircularBufferCounter>(right.max_buckets_);
-
-  if (left.positive_buckets_ && right.positive_buckets_)
-  {
-    for (auto i = pos_min_index; i <= pos_max_index; i++)
-    {
-      auto l_cnt = left.positive_buckets_->Get(i);
-      auto r_cnt = right.positive_buckets_->Get(i);
-      auto delta = (std::max)(static_cast<uint64_t>(0), r_cnt - l_cnt);
-      if (delta > 0)
-      {
-        result_value.positive_buckets_->Increment(i, delta);
-      }
-    }
-  }
-
-  if (left.negative_buckets_ && right.negative_buckets_)
-  {
-    for (auto i = neg_min_index; i <= neg_max_index; i++)
-    {
-      auto l_cnt = left.negative_buckets_->Get(i);
-      auto r_cnt = right.negative_buckets_->Get(i);
-      auto delta = (std::max)(static_cast<uint64_t>(0), r_cnt - l_cnt);
-      if (delta > 0)
-      {
-        result_value.negative_buckets_->Increment(i, delta);
-      }
-    }
-  }
-
-  return std::unique_ptr<Base2ExponentialHistogramAggregation>{
-      new Base2ExponentialHistogramAggregation(std::move(result_value))};
-}
-
-PointType Base2ExponentialHistogramAggregation::ToPoint() const noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-
-  Base2ExponentialHistogramPointData copy;
-  copy.sum_            = point_data_.sum_;
-  copy.min_            = point_data_.min_;
-  copy.max_            = point_data_.max_;
-  copy.zero_threshold_ = point_data_.zero_threshold_;
-  copy.count_          = point_data_.count_;
-  copy.zero_count_     = point_data_.zero_count_;
-  copy.max_buckets_    = point_data_.max_buckets_;
-  copy.scale_          = point_data_.scale_;
-  copy.record_min_max_ = point_data_.record_min_max_;
-
-  if (point_data_.positive_buckets_)
-  {
-    copy.positive_buckets_ =
-        std::make_unique<AdaptingCircularBufferCounter>(*point_data_.positive_buckets_);
-  }
-  if (point_data_.negative_buckets_)
-  {
-    copy.negative_buckets_ =
-        std::make_unique<AdaptingCircularBufferCounter>(*point_data_.negative_buckets_);
-  }
-
-  return copy;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/base2_exponential_histogram_indexer.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/base2_exponential_histogram_indexer.cc
deleted file mode 100644
index a46a2775e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/base2_exponential_histogram_indexer.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_indexer.h"
-
-#include <cmath>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-namespace
-{
-
-const double kLogBase2E = 1.0 / std::log(2.0);
-
-double ComputeScaleFactor(int32_t scale)
-{
-  return std::scalbn(kLogBase2E, scale);
-}
-
-// Compute the bucket index using a logarithm based approach.
-int32_t GetIndexByLogarithm(double value, double scale_factor)
-{
-  return static_cast<int32_t>(std::ceil(std::log(value) * scale_factor)) - 1;
-}
-
-// Compute the bucket index at scale 0.
-int32_t MapToIndexScaleZero(double value)
-{
-  // Note: std::frexp() rounds submnormal values to the smallest normal value and returns an
-  // exponent corresponding to fractions in the range [0.5, 1), whereas an exponent for the range
-  // [1, 2), so subtract 1 from the exponent immediately.
-  int exp;
-  double frac = std::frexp(value, &exp);
-  exp--;
-
-  if (frac == 0.5)
-  {
-    // Special case for powers of two: they fall into the bucket numbered one less.
-    exp--;
-  }
-  return exp;
-}
-
-}  // namespace
-
-Base2ExponentialHistogramIndexer::Base2ExponentialHistogramIndexer(int32_t scale)
-    : scale_(scale), scale_factor_(scale > 0 ? ComputeScaleFactor(scale) : 0)
-{}
-
-int32_t Base2ExponentialHistogramIndexer::ComputeIndex(double value) const
-{
-  const double abs_value = std::fabs(value);
-  // For positive scales, compute the index by logarithm, which is simpler but may be
-  // inaccurate near bucket boundaries
-  if (scale_ > 0)
-  {
-    return GetIndexByLogarithm(abs_value, scale_factor_);
-  }
-  // For scale zero, compute the exact index by extracting the exponent.
-  // For negative scales, compute the exact index by extracting the exponent and shifting it to
-  // the right by -scale
-  return MapToIndexScaleZero(abs_value) >> -scale_;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/histogram_aggregation.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/histogram_aggregation.cc
deleted file mode 100644
index d6b4c90a0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/histogram_aggregation.cc
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stddef.h>
-#include <algorithm>
-#include <cstdint>
-#include <limits>
-#include <memory>
-#include <mutex>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-LongHistogramAggregation::LongHistogramAggregation(const AggregationConfig *aggregation_config)
-{
-  auto ac = static_cast<const HistogramAggregationConfig *>(aggregation_config);
-  if (ac)
-  {
-    point_data_.boundaries_ = ac->boundaries_;
-  }
-  else
-  {
-    point_data_.boundaries_ = {0.0,   5.0,   10.0,   25.0,   50.0,   75.0,   100.0,  250.0,
-                               500.0, 750.0, 1000.0, 2500.0, 5000.0, 7500.0, 10000.0};
-  }
-
-  if (ac)
-  {
-    record_min_max_ = ac->record_min_max_;
-  }
-  point_data_.counts_         = std::vector<uint64_t>(point_data_.boundaries_.size() + 1, 0);
-  point_data_.sum_            = static_cast<int64_t>(0);
-  point_data_.count_          = 0;
-  point_data_.record_min_max_ = record_min_max_;
-  point_data_.min_            = (std::numeric_limits<int64_t>::max)();
-  point_data_.max_            = (std::numeric_limits<int64_t>::min)();
-}
-
-LongHistogramAggregation::LongHistogramAggregation(HistogramPointData &&data)
-    : point_data_{std::move(data)}, record_min_max_{point_data_.record_min_max_}
-{}
-
-LongHistogramAggregation::LongHistogramAggregation(const HistogramPointData &data)
-    : point_data_{data}, record_min_max_{point_data_.record_min_max_}
-{}
-
-void LongHistogramAggregation::Aggregate(int64_t value,
-                                         const PointAttributes & /* attributes */) noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  point_data_.count_ += 1;
-  point_data_.sum_ = nostd::get<int64_t>(point_data_.sum_) + value;
-  if (record_min_max_)
-  {
-    point_data_.min_ = (std::min)(nostd::get<int64_t>(point_data_.min_), value);
-    point_data_.max_ = (std::max)(nostd::get<int64_t>(point_data_.max_), value);
-  }
-  size_t index = BucketBinarySearch(value, point_data_.boundaries_);
-  point_data_.counts_[index] += 1;
-}
-
-std::unique_ptr<Aggregation> LongHistogramAggregation::Merge(
-    const Aggregation &delta) const noexcept
-{
-  auto curr_value  = nostd::get<HistogramPointData>(ToPoint());
-  auto delta_value = nostd::get<HistogramPointData>(
-      (static_cast<const LongHistogramAggregation &>(delta).ToPoint()));
-  HistogramAggregationConfig agg_config;
-  agg_config.boundaries_         = curr_value.boundaries_;
-  agg_config.record_min_max_     = record_min_max_;
-  LongHistogramAggregation *aggr = new LongHistogramAggregation(&agg_config);
-  HistogramMerge<int64_t>(curr_value, delta_value, aggr->point_data_);
-  return std::unique_ptr<Aggregation>(aggr);
-}
-
-std::unique_ptr<Aggregation> LongHistogramAggregation::Diff(const Aggregation &next) const noexcept
-{
-  auto curr_value = nostd::get<HistogramPointData>(ToPoint());
-  auto next_value = nostd::get<HistogramPointData>(
-      (static_cast<const LongHistogramAggregation &>(next).ToPoint()));
-  HistogramAggregationConfig agg_config;
-  agg_config.boundaries_         = curr_value.boundaries_;
-  agg_config.record_min_max_     = record_min_max_;
-  LongHistogramAggregation *aggr = new LongHistogramAggregation(&agg_config);
-  HistogramDiff<int64_t>(curr_value, next_value, aggr->point_data_);
-  return std::unique_ptr<Aggregation>(aggr);
-}
-
-PointType LongHistogramAggregation::ToPoint() const noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  return point_data_;
-}
-
-DoubleHistogramAggregation::DoubleHistogramAggregation(const AggregationConfig *aggregation_config)
-{
-  auto ac = static_cast<const HistogramAggregationConfig *>(aggregation_config);
-  if (ac)
-  {
-    point_data_.boundaries_ = ac->boundaries_;
-  }
-  else
-  {
-    point_data_.boundaries_ = {0.0,   5.0,   10.0,   25.0,   50.0,   75.0,   100.0,  250.0,
-                               500.0, 750.0, 1000.0, 2500.0, 5000.0, 7500.0, 10000.0};
-  }
-  if (ac)
-  {
-    record_min_max_ = ac->record_min_max_;
-  }
-  point_data_.counts_         = std::vector<uint64_t>(point_data_.boundaries_.size() + 1, 0);
-  point_data_.sum_            = 0.0;
-  point_data_.count_          = 0;
-  point_data_.record_min_max_ = record_min_max_;
-  point_data_.min_            = (std::numeric_limits<double>::max)();
-  point_data_.max_            = (std::numeric_limits<double>::min)();
-}
-
-DoubleHistogramAggregation::DoubleHistogramAggregation(HistogramPointData &&data)
-    : point_data_{std::move(data)}
-{}
-
-DoubleHistogramAggregation::DoubleHistogramAggregation(const HistogramPointData &data)
-    : point_data_{data}
-{}
-
-void DoubleHistogramAggregation::Aggregate(double value,
-                                           const PointAttributes & /* attributes */) noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  point_data_.count_ += 1;
-  point_data_.sum_ = nostd::get<double>(point_data_.sum_) + value;
-  if (record_min_max_)
-  {
-    point_data_.min_ = (std::min)(nostd::get<double>(point_data_.min_), value);
-    point_data_.max_ = (std::max)(nostd::get<double>(point_data_.max_), value);
-  }
-  size_t index = BucketBinarySearch(value, point_data_.boundaries_);
-  point_data_.counts_[index] += 1;
-}
-
-std::unique_ptr<Aggregation> DoubleHistogramAggregation::Merge(
-    const Aggregation &delta) const noexcept
-{
-  auto curr_value  = nostd::get<HistogramPointData>(ToPoint());
-  auto delta_value = nostd::get<HistogramPointData>(
-      (static_cast<const DoubleHistogramAggregation &>(delta).ToPoint()));
-  HistogramAggregationConfig agg_config;
-  agg_config.boundaries_           = curr_value.boundaries_;
-  agg_config.record_min_max_       = record_min_max_;
-  DoubleHistogramAggregation *aggr = new DoubleHistogramAggregation(&agg_config);
-  HistogramMerge<double>(curr_value, delta_value, aggr->point_data_);
-  return std::unique_ptr<Aggregation>(aggr);
-}
-
-std::unique_ptr<Aggregation> DoubleHistogramAggregation::Diff(
-    const Aggregation &next) const noexcept
-{
-  auto curr_value = nostd::get<HistogramPointData>(ToPoint());
-  auto next_value = nostd::get<HistogramPointData>(
-      (static_cast<const DoubleHistogramAggregation &>(next).ToPoint()));
-  HistogramAggregationConfig agg_config;
-  agg_config.boundaries_           = curr_value.boundaries_;
-  agg_config.record_min_max_       = record_min_max_;
-  DoubleHistogramAggregation *aggr = new DoubleHistogramAggregation(&agg_config);
-  HistogramDiff<double>(curr_value, next_value, aggr->point_data_);
-  return std::unique_ptr<Aggregation>(aggr);
-}
-
-PointType DoubleHistogramAggregation::ToPoint() const noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  return point_data_;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/lastvalue_aggregation.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/lastvalue_aggregation.cc
deleted file mode 100644
index 2bc0eddb0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/lastvalue_aggregation.cc
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <chrono>
-#include <memory>
-#include <mutex>
-#include <utility>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/lastvalue_aggregation.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-LongLastValueAggregation::LongLastValueAggregation()
-{
-  point_data_.is_lastvalue_valid_ = false;
-  point_data_.value_              = static_cast<int64_t>(0);
-}
-
-LongLastValueAggregation::LongLastValueAggregation(LastValuePointData &&data) : point_data_{data} {}
-
-LongLastValueAggregation::LongLastValueAggregation(const LastValuePointData &data)
-    : point_data_{data}
-{}
-
-void LongLastValueAggregation::Aggregate(int64_t value,
-                                         const PointAttributes & /* attributes */) noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  point_data_.is_lastvalue_valid_ = true;
-  point_data_.value_              = value;
-  point_data_.sample_ts_          = std::chrono::system_clock::now();
-}
-
-std::unique_ptr<Aggregation> LongLastValueAggregation::Merge(
-    const Aggregation &delta) const noexcept
-{
-  if (nostd::get<LastValuePointData>(ToPoint()).sample_ts_.time_since_epoch() >
-      nostd::get<LastValuePointData>(delta.ToPoint()).sample_ts_.time_since_epoch())
-  {
-    LastValuePointData merge_data = nostd::get<LastValuePointData>(ToPoint());
-    return std::unique_ptr<Aggregation>(new LongLastValueAggregation(std::move(merge_data)));
-  }
-  else
-  {
-    LastValuePointData merge_data = nostd::get<LastValuePointData>(delta.ToPoint());
-    return std::unique_ptr<Aggregation>(new LongLastValueAggregation(std::move(merge_data)));
-  }
-}
-
-std::unique_ptr<Aggregation> LongLastValueAggregation::Diff(const Aggregation &next) const noexcept
-{
-  if (nostd::get<LastValuePointData>(ToPoint()).sample_ts_.time_since_epoch() >
-      nostd::get<LastValuePointData>(next.ToPoint()).sample_ts_.time_since_epoch())
-  {
-    LastValuePointData diff_data = nostd::get<LastValuePointData>(ToPoint());
-    return std::unique_ptr<Aggregation>(new LongLastValueAggregation(std::move(diff_data)));
-  }
-  else
-  {
-    LastValuePointData diff_data = nostd::get<LastValuePointData>(next.ToPoint());
-    return std::unique_ptr<Aggregation>(new LongLastValueAggregation(std::move(diff_data)));
-  }
-}
-
-PointType LongLastValueAggregation::ToPoint() const noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  return point_data_;
-}
-
-DoubleLastValueAggregation::DoubleLastValueAggregation()
-{
-  point_data_.is_lastvalue_valid_ = false;
-  point_data_.value_              = 0.0;
-}
-
-DoubleLastValueAggregation::DoubleLastValueAggregation(LastValuePointData &&data)
-    : point_data_{data}
-{}
-
-DoubleLastValueAggregation::DoubleLastValueAggregation(const LastValuePointData &data)
-    : point_data_{data}
-{}
-
-void DoubleLastValueAggregation::Aggregate(double value,
-                                           const PointAttributes & /* attributes */) noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  point_data_.is_lastvalue_valid_ = true;
-  point_data_.value_              = value;
-  point_data_.sample_ts_          = std::chrono::system_clock::now();
-}
-
-std::unique_ptr<Aggregation> DoubleLastValueAggregation::Merge(
-    const Aggregation &delta) const noexcept
-{
-  if (nostd::get<LastValuePointData>(ToPoint()).sample_ts_.time_since_epoch() >
-      nostd::get<LastValuePointData>(delta.ToPoint()).sample_ts_.time_since_epoch())
-  {
-    LastValuePointData merge_data = nostd::get<LastValuePointData>(ToPoint());
-    return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation(std::move(merge_data)));
-  }
-  else
-  {
-    LastValuePointData merge_data = nostd::get<LastValuePointData>(delta.ToPoint());
-    return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation(std::move(merge_data)));
-  }
-}
-
-std::unique_ptr<Aggregation> DoubleLastValueAggregation::Diff(
-    const Aggregation &next) const noexcept
-{
-  if (nostd::get<LastValuePointData>(ToPoint()).sample_ts_.time_since_epoch() >
-      nostd::get<LastValuePointData>(next.ToPoint()).sample_ts_.time_since_epoch())
-  {
-    LastValuePointData diff_data = nostd::get<LastValuePointData>(ToPoint());
-    return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation(std::move(diff_data)));
-  }
-  else
-  {
-    LastValuePointData diff_data = nostd::get<LastValuePointData>(next.ToPoint());
-    return std::unique_ptr<Aggregation>(new DoubleLastValueAggregation(std::move(diff_data)));
-  }
-}
-
-PointType DoubleLastValueAggregation::ToPoint() const noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  return point_data_;
-}
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/sum_aggregation.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/sum_aggregation.cc
deleted file mode 100644
index 59119872b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/aggregation/sum_aggregation.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <memory>
-#include <mutex>
-#include <ostream>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/sum_aggregation.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-LongSumAggregation::LongSumAggregation(bool is_monotonic)
-{
-  point_data_.value_        = static_cast<int64_t>(0);
-  point_data_.is_monotonic_ = is_monotonic;
-}
-
-LongSumAggregation::LongSumAggregation(SumPointData &&data) : point_data_{data} {}
-
-LongSumAggregation::LongSumAggregation(const SumPointData &data) : point_data_{data} {}
-
-void LongSumAggregation::Aggregate(int64_t value, const PointAttributes & /* attributes */) noexcept
-{
-  if (point_data_.is_monotonic_ && value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        " LongSumAggregation::Aggregate Negative value ignored for Monotonic increasing "
-        "measurement. Value"
-        << value);
-    return;
-  }
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  point_data_.value_ = nostd::get<int64_t>(point_data_.value_) + value;
-}
-
-std::unique_ptr<Aggregation> LongSumAggregation::Merge(const Aggregation &delta) const noexcept
-{
-  int64_t merge_value =
-      nostd::get<int64_t>(
-          nostd::get<SumPointData>((static_cast<const LongSumAggregation &>(delta).ToPoint()))
-              .value_) +
-      nostd::get<int64_t>(nostd::get<SumPointData>(ToPoint()).value_);
-  std::unique_ptr<Aggregation> aggr(new LongSumAggregation(point_data_.is_monotonic_));
-  static_cast<LongSumAggregation *>(aggr.get())->point_data_.value_ = merge_value;
-  return aggr;
-}
-
-std::unique_ptr<Aggregation> LongSumAggregation::Diff(const Aggregation &next) const noexcept
-{
-  int64_t diff_value =
-      nostd::get<int64_t>(
-          nostd::get<SumPointData>((static_cast<const LongSumAggregation &>(next).ToPoint()))
-              .value_) -
-      nostd::get<int64_t>(nostd::get<SumPointData>(ToPoint()).value_);
-  std::unique_ptr<Aggregation> aggr(new LongSumAggregation(point_data_.is_monotonic_));
-  static_cast<LongSumAggregation *>(aggr.get())->point_data_.value_ = diff_value;
-  return aggr;
-}
-
-PointType LongSumAggregation::ToPoint() const noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  return point_data_;
-}
-
-DoubleSumAggregation::DoubleSumAggregation(bool is_monotonic)
-{
-  point_data_.value_        = 0.0;
-  point_data_.is_monotonic_ = is_monotonic;
-}
-
-DoubleSumAggregation::DoubleSumAggregation(SumPointData &&data) : point_data_(data) {}
-
-DoubleSumAggregation::DoubleSumAggregation(const SumPointData &data) : point_data_(data) {}
-
-void DoubleSumAggregation::Aggregate(double value,
-                                     const PointAttributes & /* attributes */) noexcept
-{
-  if (point_data_.is_monotonic_ && value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        " DoubleSumAggregation::Aggregate Negative value ignored for Monotonic increasing "
-        "measurement. Value"
-        << value);
-    return;
-  }
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  point_data_.value_ = nostd::get<double>(point_data_.value_) + value;
-}
-
-std::unique_ptr<Aggregation> DoubleSumAggregation::Merge(const Aggregation &delta) const noexcept
-{
-  double merge_value =
-      nostd::get<double>(
-          nostd::get<SumPointData>((static_cast<const DoubleSumAggregation &>(delta).ToPoint()))
-              .value_) +
-      nostd::get<double>(nostd::get<SumPointData>(ToPoint()).value_);
-  std::unique_ptr<Aggregation> aggr(new DoubleSumAggregation(point_data_.is_monotonic_));
-  static_cast<DoubleSumAggregation *>(aggr.get())->point_data_.value_ = merge_value;
-  return aggr;
-}
-
-std::unique_ptr<Aggregation> DoubleSumAggregation::Diff(const Aggregation &next) const noexcept
-{
-  double diff_value =
-      nostd::get<double>(
-          nostd::get<SumPointData>((static_cast<const DoubleSumAggregation &>(next).ToPoint()))
-              .value_) -
-      nostd::get<double>(nostd::get<SumPointData>(ToPoint()).value_);
-  std::unique_ptr<Aggregation> aggr(new DoubleSumAggregation(point_data_.is_monotonic_));
-  static_cast<DoubleSumAggregation *>(aggr.get())->point_data_.value_ = diff_value;
-  return aggr;
-}
-
-PointType DoubleSumAggregation::ToPoint() const noexcept
-{
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(lock_);
-  return point_data_;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/async_instruments.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/async_instruments.cc
deleted file mode 100644
index 709957d68..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/async_instruments.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/sdk/metrics/async_instruments.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/observable_registry.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-ObservableInstrument::ObservableInstrument(InstrumentDescriptor instrument_descriptor,
-                                           std::unique_ptr<AsyncWritableMetricStorage> storage,
-                                           std::shared_ptr<ObservableRegistry> observable_registry)
-    : instrument_descriptor_(std::move(instrument_descriptor)),
-      storage_(std::move(storage)),
-      observable_registry_{std::move(observable_registry)}
-
-{}
-
-ObservableInstrument::~ObservableInstrument()
-{
-  observable_registry_->CleanupCallback(this);
-}
-
-void ObservableInstrument::AddCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
-                                       void *state) noexcept
-{
-  observable_registry_->AddCallback(callback, state, this);
-}
-
-void ObservableInstrument::RemoveCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
-                                          void *state) noexcept
-{
-  observable_registry_->RemoveCallback(callback, state, this);
-}
-
-const InstrumentDescriptor &ObservableInstrument::GetInstrumentDescriptor()
-{
-  return instrument_descriptor_;
-}
-
-AsyncWritableMetricStorage *ObservableInstrument::GetMetricStorage()
-{
-  return storage_.get();
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/data/circular_buffer.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/data/circular_buffer.cc
deleted file mode 100644
index b6aab91a0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/data/circular_buffer.cc
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stddef.h>
-#include <cstdint>
-#include <limits>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-namespace
-{
-
-struct AdaptingIntegerArrayIncrement
-{
-  size_t index;
-  uint64_t count;
-
-  template <typename T>
-  uint64_t operator()(std::vector<T> &backing)
-  {
-    const uint64_t result = backing[index] + count;
-    if OPENTELEMETRY_LIKELY_CONDITION (result <= uint64_t(std::numeric_limits<T>::max()))
-    {
-      backing[index] = static_cast<T>(result);
-      return 0;
-    }
-    return result;
-  }
-};
-
-struct AdaptingIntegerArrayGet
-{
-  size_t index;
-
-  template <typename T>
-  uint64_t operator()(const std::vector<T> &backing)
-  {
-    return backing[index];
-  }
-};
-
-struct AdaptingIntegerArraySize
-{
-  template <typename T>
-  size_t operator()(const std::vector<T> &backing)
-  {
-    return backing.size();
-  }
-};
-
-struct AdaptingIntegerArrayClear
-{
-  template <typename T>
-  void operator()(std::vector<T> &backing)
-  {
-    backing.assign(backing.size(), static_cast<T>(0));
-  }
-};
-
-struct AdaptingIntegerArrayCopy
-{
-  template <class T1, class T2>
-  void operator()(const std::vector<T1> &from, std::vector<T2> &to)
-  {
-    for (size_t i = 0; i < from.size(); i++)
-    {
-      to[i] = static_cast<T2>(from[i]);
-    }
-  }
-};
-
-}  // namespace
-
-void AdaptingIntegerArray::Increment(size_t index, uint64_t count)
-{
-  const uint64_t result = nostd::visit(AdaptingIntegerArrayIncrement{index, count}, backing_);
-  if OPENTELEMETRY_LIKELY_CONDITION (result == 0)
-  {
-    return;
-  }
-  EnlargeToFit(result);
-  Increment(index, count);
-}
-
-uint64_t AdaptingIntegerArray::Get(size_t index) const
-{
-  return nostd::visit(AdaptingIntegerArrayGet{index}, backing_);
-}
-
-size_t AdaptingIntegerArray::Size() const
-{
-  return nostd::visit(AdaptingIntegerArraySize{}, backing_);
-}
-
-void AdaptingIntegerArray::Clear()
-{
-  nostd::visit(AdaptingIntegerArrayClear{}, backing_);
-}
-
-void AdaptingIntegerArray::EnlargeToFit(uint64_t value)
-{
-  const size_t backing_size = Size();
-  decltype(backing_) backing;
-  if (value <= std::numeric_limits<uint16_t>::max())
-  {
-    backing = std::vector<uint16_t>(backing_size, 0);
-  }
-  else if (value <= std::numeric_limits<uint32_t>::max())
-  {
-    backing = std::vector<uint32_t>(backing_size, 0);
-  }
-  else
-  {
-    backing = std::vector<uint64_t>(backing_size, 0);
-  }
-  std::swap(backing_, backing);
-  nostd::visit(AdaptingIntegerArrayCopy{}, backing, backing_);
-}
-
-void AdaptingCircularBufferCounter::Clear()
-{
-  start_index_ = kNullIndex;
-  end_index_   = kNullIndex;
-  base_index_  = kNullIndex;
-  backing_.Clear();
-}
-
-bool AdaptingCircularBufferCounter::Increment(int32_t index, uint64_t delta)
-{
-  if (Empty())
-  {
-    start_index_ = index;
-    end_index_   = index;
-    base_index_  = index;
-    backing_.Increment(0, delta);
-    return true;
-  }
-
-  if (index > end_index_)
-  {
-    // Move end, check max size.
-    if (index + 1 > static_cast<int32_t>(backing_.Size()) + start_index_)
-    {
-      return false;
-    }
-    end_index_ = index;
-  }
-  else if (index < start_index_)
-  {
-    // Move end, check max size.
-    if (end_index_ + 1 > static_cast<int32_t>(backing_.Size()) + index)
-    {
-      return false;
-    }
-    start_index_ = index;
-  }
-  backing_.Increment(ToBufferIndex(index), delta);
-  return true;
-}
-
-uint64_t AdaptingCircularBufferCounter::Get(int32_t index) const
-{
-  if (index < start_index_ || index > end_index_)
-  {
-    return 0;
-  }
-  return backing_.Get(ToBufferIndex(index));
-}
-
-size_t AdaptingCircularBufferCounter::ToBufferIndex(int32_t index) const
-{
-  // Figure out the index relative to the start of the circular buffer.
-  if (index < base_index_)
-  {
-    // If index is before the base one, wrap around.
-    return static_cast<size_t>(index + backing_.Size() - base_index_);
-  }
-  return static_cast<size_t>(index - base_index_);
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/exemplar/reservoir.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/exemplar/reservoir.cc
deleted file mode 100644
index 264a00082..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/exemplar/reservoir.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <utility>
-
-#  include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h"
-#  include "opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-nostd::shared_ptr<ExemplarReservoir> ExemplarReservoir::GetSimpleFixedSizeExemplarReservoir(
-    size_t size,
-    std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
-    MapAndResetCellType map_and_reset_cell)
-{
-  return nostd::shared_ptr<ExemplarReservoir>{new SimpleFixedSizeExemplarReservoir{
-      size, std::move(reservoir_cell_selector), map_and_reset_cell}};
-}
-
-nostd::shared_ptr<ExemplarReservoir> ExemplarReservoir::GetAlignedHistogramBucketExemplarReservoir(
-    size_t size,
-    std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
-    MapAndResetCellType map_and_reset_cell)
-{
-  return nostd::shared_ptr<ExemplarReservoir>{new AlignedHistogramBucketExemplarReservoir{
-      size, std::move(reservoir_cell_selector), map_and_reset_cell}};
-}
-
-nostd::shared_ptr<ExemplarReservoir> ExemplarReservoir::GetNoExemplarReservoir()
-{
-  return nostd::shared_ptr<ExemplarReservoir>{new NoExemplarReservoir{}};
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/export/periodic_exporting_metric_reader.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
deleted file mode 100644
index 0fbde50bc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/export/periodic_exporting_metric_reader.cc
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <ostream>
-#include <ratio>
-#include <thread>
-#include <utility>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-#if OPENTELEMETRY_HAVE_EXCEPTIONS
-#  include <exception>
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-PeriodicExportingMetricReader::PeriodicExportingMetricReader(
-    std::unique_ptr<PushMetricExporter> exporter,
-    const PeriodicExportingMetricReaderOptions &options)
-    : exporter_{std::move(exporter)},
-      export_interval_millis_{options.export_interval_millis},
-      export_timeout_millis_{options.export_timeout_millis},
-      worker_thread_instrumentation_(nullptr),
-      collect_thread_instrumentation_(nullptr)
-{
-  if (export_interval_millis_ <= export_timeout_millis_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[Periodic Exporting Metric Reader] Invalid configuration: "
-        "export_timeout_millis_ should be less than export_interval_millis_, using default values");
-    export_interval_millis_ = kExportIntervalMillis;
-    export_timeout_millis_  = kExportTimeOutMillis;
-  }
-}
-
-PeriodicExportingMetricReader::PeriodicExportingMetricReader(
-    std::unique_ptr<PushMetricExporter> exporter,
-    const PeriodicExportingMetricReaderOptions &options,
-    const PeriodicExportingMetricReaderRuntimeOptions &runtime_options)
-    : exporter_{std::move(exporter)},
-      export_interval_millis_{options.export_interval_millis},
-      export_timeout_millis_{options.export_timeout_millis},
-      worker_thread_instrumentation_(runtime_options.periodic_thread_instrumentation),
-      collect_thread_instrumentation_(runtime_options.collect_thread_instrumentation)
-{
-  if (export_interval_millis_ <= export_timeout_millis_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[Periodic Exporting Metric Reader] Invalid configuration: "
-        "export_timeout_millis_ should be less than export_interval_millis_, using default values");
-    export_interval_millis_ = kExportIntervalMillis;
-    export_timeout_millis_  = kExportTimeOutMillis;
-  }
-}
-
-AggregationTemporality PeriodicExportingMetricReader::GetAggregationTemporality(
-    InstrumentType instrument_type) const noexcept
-{
-  return exporter_->GetAggregationTemporality(instrument_type);
-}
-void PeriodicExportingMetricReader::OnInitialized() noexcept
-{
-  worker_thread_ = std::thread(&PeriodicExportingMetricReader::DoBackgroundWork, this);
-}
-
-void PeriodicExportingMetricReader::DoBackgroundWork()
-{
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->OnStart();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-  do
-  {
-    auto start = std::chrono::steady_clock::now();
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (worker_thread_instrumentation_ != nullptr)
-    {
-      worker_thread_instrumentation_->BeforeLoad();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-    auto status = CollectAndExportOnce();
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (worker_thread_instrumentation_ != nullptr)
-    {
-      worker_thread_instrumentation_->AfterLoad();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-    if (!status)
-    {
-      OTEL_INTERNAL_LOG_ERROR("[Periodic Exporting Metric Reader]  Collect-Export Cycle Failure.")
-    }
-
-    auto end            = std::chrono::steady_clock::now();
-    auto export_time_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
-    auto remaining_wait_interval_ms = export_interval_millis_ - export_time_ms;
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (worker_thread_instrumentation_ != nullptr)
-    {
-      worker_thread_instrumentation_->BeforeWait();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-    std::unique_lock<std::mutex> lk(cv_m_);
-    cv_.wait_for(lk, remaining_wait_interval_ms, [this]() {
-      if (is_force_wakeup_background_worker_.load(std::memory_order_acquire))
-      {
-        is_force_wakeup_background_worker_.store(false, std::memory_order_release);
-        return true;
-      }
-      return IsShutdown();
-    });
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (worker_thread_instrumentation_ != nullptr)
-    {
-      worker_thread_instrumentation_->AfterWait();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-  } while (IsShutdown() != true);
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->OnEnd();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-}
-
-bool PeriodicExportingMetricReader::CollectAndExportOnce()
-{
-  std::uint64_t notify_force_flush = force_flush_pending_sequence_.load(std::memory_order_acquire);
-#if OPENTELEMETRY_HAVE_EXCEPTIONS
-  try
-  {
-#endif
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (collect_thread_instrumentation_ != nullptr)
-    {
-      collect_thread_instrumentation_->OnStart();
-      collect_thread_instrumentation_->BeforeLoad();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-    auto start = std::chrono::steady_clock::now();
-    this->Collect([this, &start](ResourceMetrics &metric_data) {
-      auto end = std::chrono::steady_clock::now();
-      if ((end - start) > this->export_timeout_millis_)
-      {
-        OTEL_INTERNAL_LOG_ERROR(
-            "[Periodic Exporting Metric Reader] Collect took longer configured time: "
-            << this->export_timeout_millis_.count() << " ms, and timed out");
-        return false;
-      }
-      this->exporter_->Export(metric_data);
-      return true;
-    });
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (collect_thread_instrumentation_ != nullptr)
-    {
-      collect_thread_instrumentation_->AfterLoad();
-      collect_thread_instrumentation_->OnEnd();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-#if OPENTELEMETRY_HAVE_EXCEPTIONS
-  }
-  catch (std::exception &e)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[Periodic Exporting Metric Reader] Collect failed with exception "
-                            << e.what());
-    return false;
-  }
-  catch (...)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[Periodic Exporting Metric Reader] Collect failed with unknown exception");
-    return false;
-  }
-#endif
-
-  std::uint64_t notified_sequence = force_flush_notified_sequence_.load(std::memory_order_acquire);
-  while (notify_force_flush > notified_sequence)
-  {
-    force_flush_notified_sequence_.compare_exchange_strong(notified_sequence, notify_force_flush,
-                                                           std::memory_order_acq_rel);
-    force_flush_cv_.notify_all();
-  }
-
-  return true;
-}
-
-bool PeriodicExportingMetricReader::OnForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  std::unique_lock<std::mutex> lk_cv(force_flush_m_);
-  std::uint64_t current_sequence =
-      force_flush_pending_sequence_.fetch_add(1, std::memory_order_release) + 1;
-  auto break_condition = [this, current_sequence]() {
-    if (IsShutdown())
-    {
-      return true;
-    }
-
-    // Wake up the worker thread.
-    if (force_flush_pending_sequence_.load(std::memory_order_acquire) >
-        force_flush_notified_sequence_.load(std::memory_order_acquire))
-    {
-      is_force_wakeup_background_worker_.store(true, std::memory_order_release);
-      cv_.notify_all();
-    }
-    return force_flush_notified_sequence_.load(std::memory_order_acquire) >= current_sequence;
-  };
-
-  std::chrono::microseconds wait_timeout =
-      opentelemetry::common::DurationUtil::AdjustWaitForTimeout(timeout,
-                                                                std::chrono::microseconds::zero());
-  std::chrono::steady_clock::duration timeout_steady =
-      std::chrono::duration_cast<std::chrono::steady_clock::duration>(wait_timeout);
-  if (timeout_steady <= std::chrono::steady_clock::duration::zero())
-  {
-    timeout_steady = (std::chrono::steady_clock::duration::max)();
-  }
-
-  bool result = false;
-  while (!result && timeout_steady > std::chrono::steady_clock::duration::zero())
-  {
-    // When force_flush_notified_sequence_.compare_exchange_strong(...) and
-    // force_flush_cv_.notify_all() is called between force_flush_pending_sequence_.load(...) and
-    // force_flush_cv_.wait(). We must not wait for ever
-    std::chrono::steady_clock::time_point start_timepoint = std::chrono::steady_clock::now();
-
-    wait_timeout = export_interval_millis_;
-    if (wait_timeout > timeout_steady)
-    {
-      wait_timeout = std::chrono::duration_cast<std::chrono::microseconds>(timeout_steady);
-    }
-    result = force_flush_cv_.wait_for(lk_cv, wait_timeout, break_condition);
-    timeout_steady -= std::chrono::steady_clock::now() - start_timepoint;
-  }
-
-  if (result)
-  {
-    // - If original `timeout` is `zero`, use that in exporter::forceflush
-    // - Else if remaining `timeout_steady` more than zero, use that in exporter::forceflush
-    // - Else don't invoke exporter::forceflush ( as remaining time is zero or less)
-    if (timeout <= std::chrono::milliseconds::duration::zero())
-    {
-      result =
-          exporter_->ForceFlush(std::chrono::duration_cast<std::chrono::microseconds>(timeout));
-    }
-    else if (timeout_steady > std::chrono::steady_clock::duration::zero())
-    {
-      result = exporter_->ForceFlush(
-          std::chrono::duration_cast<std::chrono::microseconds>(timeout_steady));
-    }
-    else
-    {
-      // remaining timeout_steady is zero or less
-      result = false;
-    }
-  }
-  return result &&
-         force_flush_notified_sequence_.load(std::memory_order_acquire) >= current_sequence;
-}
-
-bool PeriodicExportingMetricReader::OnShutDown(std::chrono::microseconds timeout) noexcept
-{
-  if (worker_thread_.joinable())
-  {
-    cv_.notify_all();
-    worker_thread_.join();
-  }
-  return exporter_->Shutdown(timeout);
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/export/periodic_exporting_metric_reader_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/export/periodic_exporting_metric_reader_factory.cc
deleted file mode 100644
index b1542d420..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/export/periodic_exporting_metric_reader_factory.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_runtime_options.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-std::unique_ptr<MetricReader> PeriodicExportingMetricReaderFactory::Create(
-    std::unique_ptr<PushMetricExporter> exporter,
-    const PeriodicExportingMetricReaderOptions &options)
-{
-  PeriodicExportingMetricReaderRuntimeOptions runtime_options;
-  return Create(std::move(exporter), options, runtime_options);
-}
-
-std::unique_ptr<MetricReader> PeriodicExportingMetricReaderFactory::Create(
-    std::unique_ptr<PushMetricExporter> exporter,
-    const PeriodicExportingMetricReaderOptions &options,
-    const PeriodicExportingMetricReaderRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<MetricReader> reader(
-      new PeriodicExportingMetricReader(std::move(exporter), options, runtime_options));
-  return reader;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/instrument_metadata_validator.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/instrument_metadata_validator.cc
deleted file mode 100644
index 482330a68..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/instrument_metadata_validator.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <string>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/metrics/instrument_metadata_validator.h"
-#include "opentelemetry/version.h"
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-#  include <regex>
-#else
-#  include <algorithm>
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-// instrument-name = ALPHA 0*254 ("_" / "." / "-" / "/" / ALPHA / DIGIT)
-const std::string kInstrumentNamePattern = "[a-zA-Z][-_./a-zA-Z0-9]{0,254}";
-//
-const std::string kInstrumentUnitPattern = "[\x01-\x7F]{0,63}";
-// instrument-unit = It can have a maximum length of 63 ASCII chars
-#endif
-
-InstrumentMetaDataValidator::InstrumentMetaDataValidator()
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-    // clang-format off
-    : name_reg_key_{kInstrumentNamePattern},
-      unit_reg_key_{kInstrumentUnitPattern}
-// clang-format on
-#endif
-{}
-
-bool InstrumentMetaDataValidator::ValidateName(nostd::string_view name) const
-{
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  return std::regex_match(name.data(), name_reg_key_);
-#else
-  const size_t kMaxSize = 255;
-  // size atmost 255 chars
-  if (name.size() > kMaxSize)
-  {
-    return false;
-  }
-  // first char should be alpha
-  if (!isalpha(name[0]))
-  {
-    return false;
-  }
-  // subsequent chars should be either of alphabets, digits, underscore,
-  // minus, dot, slash
-  return !std::any_of(std::next(name.begin()), name.end(), [](char c) {
-    return !isalnum(c) && (c != '-') && (c != '_') && (c != '.') && (c != '/');
-  });
-#endif
-}
-
-bool InstrumentMetaDataValidator::ValidateUnit(nostd::string_view unit) const
-{
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  return std::regex_match(unit.data(), unit_reg_key_);
-#else
-  const size_t kMaxSize = 63;
-  // length atmost 63 chars
-  if (unit.size() > kMaxSize)
-  {
-    return false;
-  }
-  // all should be ascii chars.
-  return !std::any_of(unit.begin(), unit.end(),
-                      [](char c) { return static_cast<unsigned char>(c) > 127; });
-#endif
-}
-
-bool InstrumentMetaDataValidator::ValidateDescription(nostd::string_view /*description*/) const
-{
-  return true;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter.cc
deleted file mode 100644
index 4424bbb4c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter.cc
+++ /dev/null
@@ -1,734 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <cstdint>
-#include <mutex>
-#include <ostream>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/metrics/noop.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/metrics/async_instruments.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/state/async_metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/multi_metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/observable_registry.h"
-#include "opentelemetry/sdk/metrics/state/sync_metric_storage.h"
-#include "opentelemetry/sdk/metrics/sync_instruments.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/version.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_utils.h"
-#endif
-
-namespace
-{
-
-struct InstrumentationScopeLogStreamable
-{
-  const opentelemetry::sdk::instrumentationscope::InstrumentationScope &scope;
-};
-
-struct InstrumentDescriptorLogStreamable
-{
-  const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument;
-};
-
-std::ostream &operator<<(std::ostream &os,
-                         const InstrumentationScopeLogStreamable &streamable) noexcept
-{
-  os << "\n  name=\"" << streamable.scope.GetName() << "\"" << "\n  schema_url=\""
-     << streamable.scope.GetSchemaURL() << "\"" << "\n  version=\"" << streamable.scope.GetVersion()
-     << "\"";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os,
-                         const InstrumentDescriptorLogStreamable &streamable) noexcept
-{
-  os << "\n  name=\"" << streamable.instrument.name_ << "\"" << "\n  description=\""
-     << streamable.instrument.description_ << "\"" << "\n  unit=\"" << streamable.instrument.unit_
-     << "\"" << "\n  kind=\""
-     << opentelemetry::sdk::metrics::InstrumentDescriptorUtil::GetInstrumentValueTypeString(
-            streamable.instrument.value_type_)
-     << opentelemetry::sdk::metrics::InstrumentDescriptorUtil::GetInstrumentTypeString(
-            streamable.instrument.type_)
-     << "\"";
-  return os;
-}
-
-}  // namespace
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-namespace metrics = opentelemetry::metrics;
-
-metrics::NoopMeter Meter::kNoopMeter = metrics::NoopMeter();
-
-Meter::Meter(
-    std::weak_ptr<MeterContext> meter_context,
-    std::unique_ptr<sdk::instrumentationscope::InstrumentationScope> instrumentation_scope) noexcept
-    : scope_{std::move(instrumentation_scope)},
-      meter_context_{std::move(meter_context)},
-      observable_registry_(new ObservableRegistry()),
-      meter_config_(MeterConfig::Default())
-{
-  if (auto meter_context_locked_ptr = meter_context_.lock())
-  {
-    meter_config_ = meter_context_locked_ptr->GetMeterConfigurator().ComputeConfig(*scope_);
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_ERROR("[Meter::Meter()] - Error during initialization."
-                            << "The metric context is invalid")
-  }
-}
-
-opentelemetry::nostd::unique_ptr<metrics::Counter<uint64_t>> Meter::CreateUInt64Counter(
-    opentelemetry::nostd::string_view name,
-    opentelemetry::nostd::string_view description,
-    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateUInt64Counter(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateUInt64Counter - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return opentelemetry::nostd::unique_ptr<metrics::Counter<uint64_t>>(
-        new metrics::NoopCounter<uint64_t>(name, description, unit));
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kCounter, InstrumentValueType::kLong};
-  auto storage = RegisterSyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::unique_ptr<metrics::Counter<uint64_t>>(
-      new LongCounter(instrument_descriptor, std::move(storage)));
-}
-
-opentelemetry::nostd::unique_ptr<metrics::Counter<double>> Meter::CreateDoubleCounter(
-    opentelemetry::nostd::string_view name,
-    opentelemetry::nostd::string_view description,
-    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateDoubleCounter(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateDoubleCounter - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return opentelemetry::nostd::unique_ptr<metrics::Counter<double>>(
-        new metrics::NoopCounter<double>(name, description, unit));
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kCounter,
-      InstrumentValueType::kDouble};
-  auto storage = RegisterSyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::unique_ptr<metrics::Counter<double>>{
-      new DoubleCounter(instrument_descriptor, std::move(storage))};
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-Meter::CreateInt64ObservableCounter(opentelemetry::nostd::string_view name,
-                                    opentelemetry::nostd::string_view description,
-                                    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateInt64ObservableCounter(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateInt64ObservableCounter - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return GetNoopObservableInsrument();
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kObservableCounter,
-      InstrumentValueType::kLong};
-  auto storage = RegisterAsyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::shared_ptr<metrics::ObservableInstrument>{
-      new ObservableInstrument(instrument_descriptor, std::move(storage), observable_registry_)};
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-Meter::CreateDoubleObservableCounter(opentelemetry::nostd::string_view name,
-                                     opentelemetry::nostd::string_view description,
-                                     opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateDoubleObservableCounter(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateDoubleObservableCounter - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return GetNoopObservableInsrument();
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kObservableCounter,
-      InstrumentValueType::kDouble};
-  auto storage = RegisterAsyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::shared_ptr<metrics::ObservableInstrument>{
-      new ObservableInstrument(instrument_descriptor, std::move(storage), observable_registry_)};
-}
-
-opentelemetry::nostd::unique_ptr<metrics::Histogram<uint64_t>> Meter::CreateUInt64Histogram(
-    opentelemetry::nostd::string_view name,
-    opentelemetry::nostd::string_view description,
-    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateUInt64Histogram(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateUInt64Histogram - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return opentelemetry::nostd::unique_ptr<metrics::Histogram<uint64_t>>(
-        new metrics::NoopHistogram<uint64_t>(name, description, unit));
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kHistogram,
-      InstrumentValueType::kLong};
-  auto storage = RegisterSyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::unique_ptr<metrics::Histogram<uint64_t>>{
-      new LongHistogram(instrument_descriptor, std::move(storage))};
-}
-
-opentelemetry::nostd::unique_ptr<metrics::Histogram<double>> Meter::CreateDoubleHistogram(
-    opentelemetry::nostd::string_view name,
-    opentelemetry::nostd::string_view description,
-    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateDoubleHistogram(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateDoubleHistogram - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return opentelemetry::nostd::unique_ptr<metrics::Histogram<double>>(
-        new metrics::NoopHistogram<double>(name, description, unit));
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kHistogram,
-      InstrumentValueType::kDouble};
-  auto storage = RegisterSyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::unique_ptr<metrics::Histogram<double>>{
-      new DoubleHistogram(instrument_descriptor, std::move(storage))};
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-opentelemetry::nostd::unique_ptr<metrics::Gauge<int64_t>> Meter::CreateInt64Gauge(
-    opentelemetry::nostd::string_view name,
-    opentelemetry::nostd::string_view description,
-    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateInt64Gauge(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateInt64Gauge - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return opentelemetry::nostd::unique_ptr<metrics::Gauge<int64_t>>(
-        new metrics::NoopGauge<int64_t>(name, description, unit));
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kGauge, InstrumentValueType::kLong};
-  auto storage = RegisterSyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::unique_ptr<metrics::Gauge<int64_t>>{
-      new LongGauge(instrument_descriptor, std::move(storage))};
-}
-
-opentelemetry::nostd::unique_ptr<metrics::Gauge<double>> Meter::CreateDoubleGauge(
-    opentelemetry::nostd::string_view name,
-    opentelemetry::nostd::string_view description,
-    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateDoubleGauge(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateDoubleGauge - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return opentelemetry::nostd::unique_ptr<metrics::Gauge<double>>(
-        new metrics::NoopGauge<double>(name, description, unit));
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kGauge, InstrumentValueType::kDouble};
-  auto storage = RegisterSyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::unique_ptr<metrics::Gauge<double>>{
-      new DoubleGauge(instrument_descriptor, std::move(storage))};
-}
-#endif
-
-opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-Meter::CreateInt64ObservableGauge(opentelemetry::nostd::string_view name,
-                                  opentelemetry::nostd::string_view description,
-                                  opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateInt64ObservableGauge(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateInt64ObservableGauge - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return GetNoopObservableInsrument();
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kObservableGauge,
-      InstrumentValueType::kLong};
-  auto storage = RegisterAsyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::shared_ptr<metrics::ObservableInstrument>{
-      new ObservableInstrument(instrument_descriptor, std::move(storage), observable_registry_)};
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-Meter::CreateDoubleObservableGauge(opentelemetry::nostd::string_view name,
-                                   opentelemetry::nostd::string_view description,
-                                   opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateDoubleObservableGauge(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateDoubleObservableGauge - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return GetNoopObservableInsrument();
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kObservableGauge,
-      InstrumentValueType::kDouble};
-  auto storage = RegisterAsyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::shared_ptr<metrics::ObservableInstrument>{
-      new ObservableInstrument(instrument_descriptor, std::move(storage), observable_registry_)};
-}
-
-opentelemetry::nostd::unique_ptr<metrics::UpDownCounter<int64_t>> Meter::CreateInt64UpDownCounter(
-    opentelemetry::nostd::string_view name,
-    opentelemetry::nostd::string_view description,
-    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateInt64UpDownCounter(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateInt64UpDownCounter - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return opentelemetry::nostd::unique_ptr<metrics::UpDownCounter<int64_t>>(
-        new metrics::NoopUpDownCounter<int64_t>(name, description, unit));
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kUpDownCounter,
-      InstrumentValueType::kLong};
-  auto storage = RegisterSyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::unique_ptr<metrics::UpDownCounter<int64_t>>{
-      new LongUpDownCounter(instrument_descriptor, std::move(storage))};
-}
-
-opentelemetry::nostd::unique_ptr<metrics::UpDownCounter<double>> Meter::CreateDoubleUpDownCounter(
-    opentelemetry::nostd::string_view name,
-    opentelemetry::nostd::string_view description,
-    opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateDoubleUpDownCounter(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR("Meter::CreateDoubleUpDownCounter - failed. Invalid parameters."
-                            << name << " " << description << " " << unit
-                            << ". Measurements won't be recorded.");
-    return opentelemetry::nostd::unique_ptr<metrics::UpDownCounter<double>>(
-        new metrics::NoopUpDownCounter<double>(name, description, unit));
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kUpDownCounter,
-      InstrumentValueType::kDouble};
-  auto storage = RegisterSyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::unique_ptr<metrics::UpDownCounter<double>>{
-      new DoubleUpDownCounter(instrument_descriptor, std::move(storage))};
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-Meter::CreateInt64ObservableUpDownCounter(opentelemetry::nostd::string_view name,
-                                          opentelemetry::nostd::string_view description,
-                                          opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateInt64ObservableUpDownCounter(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "Meter::CreateInt64ObservableUpDownCounter - failed. Invalid parameters -"
-        << name << " " << description << " " << unit << ". Measurements won't be recorded.");
-    return GetNoopObservableInsrument();
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kObservableUpDownCounter,
-      InstrumentValueType::kLong};
-  auto storage = RegisterAsyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::shared_ptr<metrics::ObservableInstrument>{
-      new ObservableInstrument(instrument_descriptor, std::move(storage), observable_registry_)};
-}
-
-opentelemetry::nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>
-Meter::CreateDoubleObservableUpDownCounter(opentelemetry::nostd::string_view name,
-                                           opentelemetry::nostd::string_view description,
-                                           opentelemetry::nostd::string_view unit) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return kNoopMeter.CreateDoubleObservableUpDownCounter(name, description, unit);
-  }
-
-  if (!ValidateInstrument(name, description, unit))
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "Meter::CreateDoubleObservableUpDownCounter - failed. Invalid parameters."
-        << name << " " << description << " " << unit << ". Measurements won't be recorded.");
-    return GetNoopObservableInsrument();
-  }
-  InstrumentDescriptor instrument_descriptor = {
-      std::string{name.data(), name.size()}, std::string{description.data(), description.size()},
-      std::string{unit.data(), unit.size()}, InstrumentType::kObservableUpDownCounter,
-      InstrumentValueType::kDouble};
-  auto storage = RegisterAsyncMetricStorage(instrument_descriptor);
-  return opentelemetry::nostd::shared_ptr<metrics::ObservableInstrument>{
-      new ObservableInstrument(instrument_descriptor, std::move(storage), observable_registry_)};
-}
-
-const sdk::instrumentationscope::InstrumentationScope *Meter::GetInstrumentationScope()
-    const noexcept
-{
-  return scope_.get();
-}
-
-std::unique_ptr<SyncWritableMetricStorage> Meter::RegisterSyncMetricStorage(
-    InstrumentDescriptor &instrument_descriptor)
-{
-  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(storage_lock_);
-  auto ctx = meter_context_.lock();
-  if (!ctx)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[Meter::RegisterSyncMetricStorage] - Error during finding matching views."
-        << "The metric context is invalid");
-    return nullptr;
-  }
-
-  auto view_registry = ctx->GetViewRegistry();
-  std::unique_ptr<SyncWritableMetricStorage> storages(new SyncMultiMetricStorage());
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-  auto exemplar_filter_type = ctx->GetExemplarFilter();
-#endif
-
-  auto success = view_registry->FindViews(
-      instrument_descriptor, *scope_,
-      [this, &instrument_descriptor, &storages
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-       ,
-       exemplar_filter_type
-#endif
-  ](const View &view) {
-        auto view_instr_desc = instrument_descriptor;
-        if (!view.GetName().empty())
-        {
-          view_instr_desc.name_ = view.GetName();
-        }
-        if (!view.GetDescription().empty())
-        {
-          view_instr_desc.description_ = view.GetDescription();
-        }
-        std::shared_ptr<SyncMetricStorage> sync_storage{};
-        auto storage_iter = storage_registry_.find(view_instr_desc);
-        if (storage_iter != storage_registry_.end())
-        {
-          WarnOnNameCaseConflict(GetInstrumentationScope(), storage_iter->first, view_instr_desc);
-          // static_pointer_cast is okay here. If storage_registry_.find is successful
-          // InstrumentEqualNameCaseInsensitive ensures that the
-          // instrument type and value type are the same for the existing and new instrument.
-          sync_storage = std::static_pointer_cast<SyncMetricStorage>(storage_iter->second);
-        }
-        else
-        {
-          WarnOnDuplicateInstrument(GetInstrumentationScope(), storage_registry_, view_instr_desc);
-          sync_storage = std::shared_ptr<SyncMetricStorage>(new SyncMetricStorage(
-              view_instr_desc, view.GetAggregationType(), &view.GetAttributesProcessor(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-              exemplar_filter_type,
-              GetExemplarReservoir(view.GetAggregationType(), view.GetAggregationConfig(),
-                                   view_instr_desc),
-#endif
-              view.GetAggregationConfig()));
-          storage_registry_.insert({view_instr_desc, sync_storage});
-        }
-        auto sync_multi_storage = static_cast<SyncMultiMetricStorage *>(storages.get());
-        sync_multi_storage->AddStorage(sync_storage);
-        return true;
-      });
-
-  if (!success)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[Meter::RegisterSyncMetricStorage] - Error during finding matching views."
-        << "Some of the matching view configurations mayn't be used for metric collection");
-  }
-  return storages;
-}
-
-std::unique_ptr<AsyncWritableMetricStorage> Meter::RegisterAsyncMetricStorage(
-    InstrumentDescriptor &instrument_descriptor)
-{
-  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(storage_lock_);
-  auto ctx = meter_context_.lock();
-  if (!ctx)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[Meter::RegisterAsyncMetricStorage] - Error during finding matching views."
-        << "The metric context is invalid");
-    return nullptr;
-  }
-  auto view_registry = ctx->GetViewRegistry();
-  std::unique_ptr<AsyncWritableMetricStorage> storages(new AsyncMultiMetricStorage());
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-  auto exemplar_filter_type = ctx->GetExemplarFilter();
-#endif
-
-  auto success = view_registry->FindViews(
-      instrument_descriptor, *GetInstrumentationScope(),
-      [this, &instrument_descriptor, &storages
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-       ,
-       exemplar_filter_type
-#endif
-  ](const View &view) {
-        auto view_instr_desc = instrument_descriptor;
-        if (!view.GetName().empty())
-        {
-          view_instr_desc.name_ = view.GetName();
-        }
-        if (!view.GetDescription().empty())
-        {
-          view_instr_desc.description_ = view.GetDescription();
-        }
-        std::shared_ptr<AsyncMetricStorage> async_storage{};
-        auto storage_iter = storage_registry_.find(view_instr_desc);
-        if (storage_iter != storage_registry_.end())
-        {
-          WarnOnNameCaseConflict(GetInstrumentationScope(), storage_iter->first, view_instr_desc);
-          // static_pointer_cast is okay here. If storage_registry_.find is successful
-          // InstrumentEqualNameCaseInsensitive ensures that the
-          // instrument type and value type are the same for the existing and new instrument.
-          async_storage = std::static_pointer_cast<AsyncMetricStorage>(storage_iter->second);
-        }
-        else
-        {
-          WarnOnDuplicateInstrument(GetInstrumentationScope(), storage_registry_, view_instr_desc);
-          async_storage = std::shared_ptr<AsyncMetricStorage>(new AsyncMetricStorage(
-              view_instr_desc, view.GetAggregationType(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-              exemplar_filter_type,
-              GetExemplarReservoir(view.GetAggregationType(), view.GetAggregationConfig(),
-                                   view_instr_desc),
-#endif
-              view.GetAggregationConfig()));
-          storage_registry_.insert({view_instr_desc, async_storage});
-        }
-        auto async_multi_storage = static_cast<AsyncMultiMetricStorage *>(storages.get());
-        async_multi_storage->AddStorage(async_storage);
-        return true;
-      });
-  if (!success)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[Meter::RegisterAsyncMetricStorage] - Error during finding matching views."
-        << "Some of the matching view configurations mayn't be used for metric collection");
-  }
-  return storages;
-}
-
-/** collect metrics across all the meters **/
-std::vector<MetricData> Meter::Collect(CollectorHandle *collector,
-                                       opentelemetry::common::SystemTimestamp collect_ts) noexcept
-{
-  if (!meter_config_.IsEnabled())
-  {
-    return std::vector<MetricData>();
-  }
-  observable_registry_->Observe(collect_ts);
-  std::vector<MetricData> metric_data_list;
-  auto ctx = meter_context_.lock();
-  if (!ctx)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[Meter::Collect] - Error during collection."
-                            << "The metric context is invalid");
-    return std::vector<MetricData>{};
-  }
-  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(storage_lock_);
-  for (auto &metric_storage : storage_registry_)
-  {
-    metric_storage.second->Collect(collector, ctx->GetCollectors(), ctx->GetSDKStartTime(),
-                                   collect_ts, [&metric_data_list](const MetricData &metric_data) {
-                                     metric_data_list.push_back(metric_data);
-                                     return true;
-                                   });
-  }
-  return metric_data_list;
-}
-
-// Implementation of the log message recommended by the SDK specification for duplicate instruments.
-// See
-// https://github.com/open-telemetry/opentelemetry-specification/blob/9c8c30631b0e288de93df7452f91ed47f6fba330/specification/metrics/sdk.md?plain=1#L882
-void Meter::WarnOnDuplicateInstrument(const sdk::instrumentationscope::InstrumentationScope *scope,
-                                      const MetricStorageMap &storage_registry,
-                                      const InstrumentDescriptor &new_instrument)
-{
-  for (const auto &element : storage_registry)
-  {
-    const auto &existing_instrument = element.first;
-    if (InstrumentDescriptorUtil::IsDuplicate(existing_instrument, new_instrument))
-    {
-      std::string resolution_info{""};
-
-      if (existing_instrument.type_ != new_instrument.type_ ||
-          existing_instrument.value_type_ != new_instrument.value_type_)
-      {
-        resolution_info +=
-            "\nDifferent instrument kinds found. Consider configuring a View to change the name of "
-            "the duplicate instrument.";
-      }
-
-      if (existing_instrument.unit_ != new_instrument.unit_)
-      {
-        resolution_info += "\nDifferent instrument units found.";
-      }
-
-      if (existing_instrument.description_ != new_instrument.description_)
-      {
-        resolution_info +=
-            "\nDifferent instrument descriptions found. Consider configuring a View to change the "
-            "description of the duplicate instrument.";
-      }
-
-      OTEL_INTERNAL_LOG_WARN(
-          "[Meter::WarnOnDuplicateInstrument] Creating a duplicate instrument of the same "
-          "case-insensitive name. This may cause "
-          "semantic errors in the data exported from this meter."
-          << resolution_info << "\nScope: " << InstrumentationScopeLogStreamable{*scope}
-          << "\nExisting instrument: " << InstrumentDescriptorLogStreamable{existing_instrument}
-          << "\nDuplicate instrument: " << InstrumentDescriptorLogStreamable{new_instrument});
-      return;
-    }
-  }
-}
-
-// Implementation of the log message recommended by the SDK specification for name case conflicts.
-// See
-// https://github.com/open-telemetry/opentelemetry-specification/blob/9c8c30631b0e288de93df7452f91ed47f6fba330/specification/metrics/sdk.md?plain=1#L910
-void Meter::WarnOnNameCaseConflict(const sdk::instrumentationscope::InstrumentationScope *scope,
-                                   const InstrumentDescriptor &existing_instrument,
-                                   const InstrumentDescriptor &new_instrument)
-{
-  if (InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals(existing_instrument.name_,
-                                                           new_instrument.name_) &&
-      existing_instrument.name_ != new_instrument.name_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[Meter::WarnOnNameCaseConflict] Instrument name case conflict detected on creation. "
-        "Returning the existing instrument with the first-seen instrument name. To resolve this "
-        "warning consider configuring a View to rename the duplicate instrument."
-        << "\nScope: " << InstrumentationScopeLogStreamable{*scope}
-        << "\nExisting instrument: " << InstrumentDescriptorLogStreamable{existing_instrument}
-        << "\nDuplicate instrument: " << InstrumentDescriptorLogStreamable{new_instrument});
-  }
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_config.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_config.cc
deleted file mode 100644
index 85f7d4caf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_config.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/meter_config.h"
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-OPENTELEMETRY_EXPORT bool MeterConfig::operator==(const MeterConfig &other) const noexcept
-{
-  return disabled_ == other.disabled_;
-}
-
-OPENTELEMETRY_EXPORT bool MeterConfig::IsEnabled() const noexcept
-{
-  return !disabled_;
-}
-
-OPENTELEMETRY_EXPORT MeterConfig MeterConfig::Disabled()
-{
-  static const auto kDisabledConfig = MeterConfig(true);
-  return kDisabledConfig;
-}
-
-OPENTELEMETRY_EXPORT MeterConfig MeterConfig::Enabled()
-{
-  return Default();
-}
-
-OPENTELEMETRY_EXPORT MeterConfig MeterConfig::Default()
-{
-  static const auto kDefaultConfig = MeterConfig();
-  return kDefaultConfig;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_context.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_context.cc
deleted file mode 100644
index 2b58387d4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_context.cc
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <mutex>
-#include <ostream>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/metrics/export/metric_filter.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-MeterContext::MeterContext(std::unique_ptr<ViewRegistry> views,
-                           const opentelemetry::sdk::resource::Resource &resource,
-                           std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>>
-                               meter_configurator) noexcept
-    : resource_{resource},
-      views_(std::move(views)),
-      sdk_start_ts_{std::chrono::system_clock::now()},
-      meter_configurator_(std::move(meter_configurator))
-{}
-
-const resource::Resource &MeterContext::GetResource() const noexcept
-{
-  return resource_;
-}
-
-ViewRegistry *MeterContext::GetViewRegistry() const noexcept
-{
-  return views_.get();
-}
-
-const instrumentationscope::ScopeConfigurator<MeterConfig> &MeterContext::GetMeterConfigurator()
-    const noexcept
-{
-  return *meter_configurator_;
-}
-
-bool MeterContext::ForEachMeter(
-    nostd::function_ref<bool(std::shared_ptr<Meter> &meter)> callback) noexcept
-{
-  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(meter_lock_);
-  for (auto &meter : meters_)
-  {
-    if (!callback(meter))
-    {
-      return false;
-    }
-  }
-  return true;
-}
-
-nostd::span<std::shared_ptr<Meter>> MeterContext::GetMeters() noexcept
-{
-  // no lock required, as this is called by MeterProvider in thread-safe manner.
-  return nostd::span<std::shared_ptr<Meter>>{meters_.data(), meters_.size()};
-}
-
-nostd::span<std::shared_ptr<CollectorHandle>> MeterContext::GetCollectors() noexcept
-{
-  return nostd::span<std::shared_ptr<CollectorHandle>>(collectors_.data(), collectors_.size());
-}
-
-opentelemetry::common::SystemTimestamp MeterContext::GetSDKStartTime() noexcept
-{
-  return sdk_start_ts_;
-}
-
-void MeterContext::AddMetricReader(std::shared_ptr<MetricReader> reader,
-                                   std::unique_ptr<MetricFilter> metric_filter) noexcept
-{
-  auto collector = std::shared_ptr<MetricCollector>{
-      new MetricCollector(this, std::move(reader), std::move(metric_filter))};
-  collectors_.push_back(collector);
-}
-
-void MeterContext::AddView(std::unique_ptr<InstrumentSelector> instrument_selector,
-                           std::unique_ptr<MeterSelector> meter_selector,
-                           std::unique_ptr<View> view) noexcept
-{
-  views_->AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-}
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-void MeterContext::SetExemplarFilter(metrics::ExemplarFilterType exemplar_filter_type) noexcept
-{
-  exemplar_filter_type_ = exemplar_filter_type;
-}
-
-ExemplarFilterType MeterContext::GetExemplarFilter() const noexcept
-{
-  return exemplar_filter_type_;
-}
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-void MeterContext::AddMeter(const std::shared_ptr<Meter> &meter)
-{
-  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(meter_lock_);
-  meters_.push_back(meter);
-}
-
-void MeterContext::RemoveMeter(nostd::string_view name,
-                               nostd::string_view version,
-                               nostd::string_view schema_url)
-{
-  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(meter_lock_);
-
-  std::vector<std::shared_ptr<Meter>> filtered_meters;
-
-  for (auto &meter : meters_)
-  {
-    auto scope = meter->GetInstrumentationScope();
-    if (scope->equal(name, version, schema_url))
-    {
-      OTEL_INTERNAL_LOG_INFO("[MeterContext::RemoveMeter] removing meter name <"
-                             << name << ">, version <" << version << ">, URL <" << schema_url
-                             << ">");
-    }
-    else
-    {
-      filtered_meters.push_back(meter);
-    }
-  }
-
-  meters_.swap(filtered_meters);
-}
-
-bool MeterContext::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  bool result = true;
-  // Shutdown only once.
-  if (!shutdown_latch_.test_and_set(std::memory_order_acquire))
-  {
-    for (auto &collector : collectors_)
-    {
-      bool status = std::static_pointer_cast<MetricCollector>(collector)->Shutdown(timeout);
-      result      = result && status;
-    }
-    if (!result)
-    {
-      OTEL_INTERNAL_LOG_WARN("[MeterContext::Shutdown] Unable to shutdown all metric readers");
-    }
-  }
-  else
-  {
-    OTEL_INTERNAL_LOG_WARN("[MeterContext::Shutdown] Shutdown can be invoked only once.");
-  }
-  return result;
-}
-
-bool MeterContext::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  bool result = true;
-  // Simultaneous flush not allowed.
-  const std::lock_guard<opentelemetry::common::SpinLockMutex> locked(forceflush_lock_);
-
-  auto time_remaining = (std::chrono::steady_clock::duration::max)();
-  if (std::chrono::duration_cast<std::chrono::microseconds>(time_remaining) > timeout)
-  {
-    time_remaining = timeout;
-  }
-
-  auto current_time = std::chrono::steady_clock::now();
-  auto expire_time  = (std::chrono::steady_clock::time_point::max)();
-  if (expire_time - current_time > time_remaining)
-  {
-    expire_time = current_time + time_remaining;
-  }
-
-  for (auto &collector : collectors_)
-  {
-    if (!std::static_pointer_cast<MetricCollector>(collector)->ForceFlush(
-            std::chrono::duration_cast<std::chrono::microseconds>(time_remaining)))
-    {
-      result = false;
-    }
-
-    current_time = std::chrono::steady_clock::now();
-    if (expire_time >= current_time)
-    {
-      time_remaining = expire_time - current_time;
-    }
-    else
-    {
-      time_remaining = std::chrono::steady_clock::duration::zero();
-    }
-  }
-  if (!result)
-  {
-    OTEL_INTERNAL_LOG_WARN("[MeterContext::ForceFlush] Unable to ForceFlush all metric readers");
-  }
-  return result;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_context_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_context_factory.cc
deleted file mode 100644
index 27efbc965..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_context_factory.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include <vector>
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/meter_context_factory.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/metrics/view/view_registry_factory.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-std::unique_ptr<MeterContext> MeterContextFactory::Create()
-{
-  auto views = ViewRegistryFactory::Create();
-  return Create(std::move(views));
-}
-
-std::unique_ptr<MeterContext> MeterContextFactory::Create(std::unique_ptr<ViewRegistry> views)
-{
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  return Create(std::move(views), resource);
-}
-
-std::unique_ptr<MeterContext> MeterContextFactory::Create(
-    std::unique_ptr<ViewRegistry> views,
-    const opentelemetry::sdk::resource::Resource &resource)
-{
-  auto meter_configurator = std::make_unique<instrumentationscope::ScopeConfigurator<MeterConfig>>(
-      instrumentationscope::ScopeConfigurator<MeterConfig>::Builder(MeterConfig::Default())
-          .Build());
-  return Create(std::move(views), resource, std::move(meter_configurator));
-}
-
-std::unique_ptr<MeterContext> MeterContextFactory::Create(
-    std::unique_ptr<ViewRegistry> views,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>> meter_configurator)
-{
-  std::unique_ptr<MeterContext> context(
-      new MeterContext(std::move(views), resource, std::move(meter_configurator)));
-  return context;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_provider.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_provider.cc
deleted file mode 100644
index 57a2fbace..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_provider.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <mutex>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/metrics/export/metric_filter.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-namespace resource    = opentelemetry::sdk::resource;
-namespace metrics_api = opentelemetry::metrics;
-
-MeterProvider::MeterProvider(std::unique_ptr<MeterContext> context) noexcept
-    : context_(std::move(context))
-{}
-
-MeterProvider::MeterProvider(std::unique_ptr<ViewRegistry> views,
-                             const sdk::resource::Resource &resource,
-                             std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>>
-                                 meter_configurator) noexcept
-    : context_(
-          std::make_shared<MeterContext>(std::move(views), resource, std::move(meter_configurator)))
-{
-  OTEL_INTERNAL_LOG_DEBUG("[MeterProvider] MeterProvider created.");
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-nostd::shared_ptr<metrics_api::Meter> MeterProvider::GetMeter(
-    nostd::string_view name,
-    nostd::string_view version,
-    nostd::string_view schema_url,
-    const opentelemetry::common::KeyValueIterable *attributes) noexcept
-#else
-nostd::shared_ptr<metrics_api::Meter> MeterProvider::GetMeter(
-    nostd::string_view name,
-    nostd::string_view version,
-    nostd::string_view schema_url) noexcept
-#endif
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-  const opentelemetry::common::KeyValueIterable *attributes = nullptr;
-#endif
-
-  if (name.data() == nullptr || name == "")
-  {
-    OTEL_INTERNAL_LOG_WARN("[MeterProvider::GetMeter] Library name is empty.");
-    name = "";
-  }
-
-  const std::lock_guard<std::mutex> guard(lock_);
-
-  for (auto &meter : context_->GetMeters())
-  {
-    auto meter_lib = meter->GetInstrumentationScope();
-    if (meter_lib->equal(name, version, schema_url, attributes))
-    {
-      return nostd::shared_ptr<metrics_api::Meter>{meter};
-    }
-  }
-
-  instrumentationscope::InstrumentationScopeAttributes attrs_map(attributes);
-  auto scope =
-      instrumentationscope::InstrumentationScope::Create(name, version, schema_url, attrs_map);
-
-  auto meter = std::shared_ptr<Meter>(new Meter(context_, std::move(scope)));
-  context_->AddMeter(meter);
-  return nostd::shared_ptr<metrics_api::Meter>{meter};
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-void MeterProvider::RemoveMeter(nostd::string_view name,
-                                nostd::string_view version,
-                                nostd::string_view schema_url) noexcept
-{
-  if (name.data() == nullptr || name == "")
-  {
-    OTEL_INTERNAL_LOG_WARN("[MeterProvider::RemoveMeter] Library name is empty.");
-    name = "";
-  }
-
-  const std::lock_guard<std::mutex> guard(lock_);
-
-  context_->RemoveMeter(name, version, schema_url);
-}
-#endif
-
-const resource::Resource &MeterProvider::GetResource() const noexcept
-{
-  return context_->GetResource();
-}
-
-void MeterProvider::AddMetricReader(std::shared_ptr<MetricReader> reader,
-                                    std::unique_ptr<MetricFilter> metric_filter) noexcept
-{
-  context_->AddMetricReader(std::move(reader), std::move(metric_filter));
-}
-
-void MeterProvider::AddView(std::unique_ptr<InstrumentSelector> instrument_selector,
-                            std::unique_ptr<MeterSelector> meter_selector,
-                            std::unique_ptr<View> view) noexcept
-{
-  context_->AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-}
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-void MeterProvider::SetExemplarFilter(metrics::ExemplarFilterType exemplar_filter_type) noexcept
-{
-  context_->SetExemplarFilter(exemplar_filter_type);
-}
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-/**
- * Shutdown the meter provider.
- */
-bool MeterProvider::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return context_->Shutdown(timeout);
-}
-
-/**
- * Force flush the meter provider.
- */
-bool MeterProvider::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return context_->ForceFlush(timeout);
-}
-
-/**
- * Shutdown MeterContext when MeterProvider is destroyed.
- *
- */
-MeterProvider::~MeterProvider()
-{
-  if (context_)
-  {
-    context_->Shutdown();
-  }
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_provider_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_provider_factory.cc
deleted file mode 100644
index 052639e34..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/meter_provider_factory.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include <vector>
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/metrics/view/view_registry_factory.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> MeterProviderFactory::Create()
-{
-  auto views = ViewRegistryFactory::Create();
-  return Create(std::move(views));
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> MeterProviderFactory::Create(
-    std::unique_ptr<ViewRegistry> views)
-{
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  return Create(std::move(views), resource);
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> MeterProviderFactory::Create(
-    std::unique_ptr<ViewRegistry> views,
-    const opentelemetry::sdk::resource::Resource &resource)
-{
-  auto meter_configurator = std::make_unique<instrumentationscope::ScopeConfigurator<MeterConfig>>(
-      instrumentationscope::ScopeConfigurator<MeterConfig>::Builder(MeterConfig::Default())
-          .Build());
-  return Create(std::move(views), resource, std::move(meter_configurator));
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> MeterProviderFactory::Create(
-    std::unique_ptr<ViewRegistry> views,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<MeterConfig>> meter_configurator)
-{
-  std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> provider(
-      new opentelemetry::sdk::metrics::MeterProvider(std::move(views), resource,
-                                                     std::move(meter_configurator)));
-  return provider;
-}
-
-std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> MeterProviderFactory::Create(
-    std::unique_ptr<sdk::metrics::MeterContext> context)
-{
-  std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> provider(
-      new opentelemetry::sdk::metrics::MeterProvider(std::move(context)));
-  return provider;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/metric_reader.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/metric_reader.cc
deleted file mode 100644
index 024f91fe0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/metric_reader.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-MetricReader::MetricReader() : metric_producer_(nullptr), shutdown_(false) {}
-
-void MetricReader::SetMetricProducer(MetricProducer *metric_producer)
-{
-  metric_producer_ = metric_producer;
-  OnInitialized();
-}
-
-bool MetricReader::Collect(
-    nostd::function_ref<bool(ResourceMetrics &metric_data)> callback) noexcept
-{
-  if (!metric_producer_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "MetricReader::Collect Cannot invoke Produce(). No MetricProducer registered for "
-        "collection!")
-    return false;
-  }
-  if (IsShutdown())
-  {
-    // Continue with warning, and let pull and push MetricReader state machine handle this.
-    OTEL_INTERNAL_LOG_WARN("MetricReader::Collect invoked while Shutdown in progress!");
-  }
-
-  auto result = metric_producer_->Produce();
-
-  // According to the spec,
-  //   When the Produce operation fails, the MetricProducer MAY return successfully collected
-  //   results and a failed reasons list to the caller.
-  // So we invoke the callback with whatever points we get back, even if the overall operation may
-  // have failed.
-  auto success = callback(result.points_);
-  return (result.status_ == MetricProducer::Status::kSuccess) && success;
-}
-
-bool MetricReader::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  bool status = true;
-  if (IsShutdown())
-  {
-    OTEL_INTERNAL_LOG_WARN("MetricReader::Shutdown - Cannot invoke shutdown twice!");
-  }
-
-  shutdown_.store(true, std::memory_order_release);
-
-  if (!OnShutDown(timeout))
-  {
-    status = false;
-    OTEL_INTERNAL_LOG_WARN("MetricReader::OnShutDown Shutdown failed. Will not be tried again!");
-  }
-  return status;
-}
-
-/** Flush metric read by this reader **/
-bool MetricReader::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  bool status = true;
-  if (IsShutdown())
-  {
-    OTEL_INTERNAL_LOG_WARN("MetricReader::Shutdown Cannot invoke Force flush on shutdown reader!");
-  }
-  if (!OnForceFlush(timeout))
-  {
-    status = false;
-    OTEL_INTERNAL_LOG_ERROR("MetricReader::OnForceFlush failed!");
-  }
-  return status;
-}
-
-bool MetricReader::IsShutdown() const noexcept
-{
-  return shutdown_.load(std::memory_order_acquire);
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/provider.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/provider.cc
deleted file mode 100644
index 798f6f974..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/provider.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/disabled.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-void Provider::SetMeterProvider(
-    const nostd::shared_ptr<opentelemetry::metrics::MeterProvider> &mp) noexcept
-{
-  bool disabled = opentelemetry::sdk::common::GetSdkDisabled();
-
-  if (!disabled)
-  {
-    opentelemetry::metrics::Provider::SetMeterProvider(mp);
-  }
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/filtered_ordered_attribute_map.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/filtered_ordered_attribute_map.cc
deleted file mode 100644
index 85f4bc9d6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/filtered_ordered_attribute_map.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-FilteredOrderedAttributeMap::FilteredOrderedAttributeMap(
-    const opentelemetry::common::KeyValueIterable &attributes,
-    const AttributesProcessor *processor)
-    : OrderedAttributeMap()
-{
-  attributes.ForEachKeyValue(
-      [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
-        if (!processor || processor->isPresent(key))
-        {
-          SetAttribute(key, value);
-        }
-        return true;
-      });
-
-  UpdateHash();
-}
-
-FilteredOrderedAttributeMap::FilteredOrderedAttributeMap(
-    std::initializer_list<std::pair<nostd::string_view, opentelemetry::common::AttributeValue>>
-        attributes,
-    const AttributesProcessor *processor)
-    : OrderedAttributeMap()
-{
-  for (auto &kv : attributes)
-  {
-    if (!processor || processor->isPresent(kv.first))
-    {
-      SetAttribute(kv.first, kv.second);
-    }
-  }
-
-  UpdateHash();
-}
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/metric_collector.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/metric_collector.cc
deleted file mode 100644
index 047e56ab7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/metric_collector.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <chrono>
-#include <memory>
-#include <ostream>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_filter.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-using opentelemetry::sdk::resource::Resource;
-
-MetricCollector::MetricCollector(opentelemetry::sdk::metrics::MeterContext *context,
-                                 std::shared_ptr<MetricReader> metric_reader,
-                                 std::unique_ptr<MetricFilter> metric_filter)
-    : meter_context_{context},
-      metric_reader_{std::move(metric_reader)},
-      metric_filter_(std::move(metric_filter))
-{
-  metric_reader_->SetMetricProducer(this);
-}
-
-AggregationTemporality MetricCollector::GetAggregationTemporality(
-    InstrumentType instrument_type) noexcept
-{
-  auto aggregation_temporality = metric_reader_->GetAggregationTemporality(instrument_type);
-  if (aggregation_temporality == AggregationTemporality::kDelta &&
-      instrument_type == InstrumentType::kGauge)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[MetricCollector::GetAggregationTemporality] - Error getting aggregation temporality."
-        << "Delta temporality for Synchronous Gauge is currently not supported, using cumulative "
-           "temporality");
-
-    return AggregationTemporality::kCumulative;
-  }
-  return aggregation_temporality;
-}
-
-MetricProducer::Result MetricCollector::Produce() noexcept
-{
-  if (!meter_context_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[MetricCollector::Collect] - Error during collecting."
-                            << "The metric context is invalid");
-    return {{}, MetricProducer::Status::kFailure};
-  }
-  ResourceMetrics resource_metrics;
-  meter_context_->ForEachMeter([&](const std::shared_ptr<Meter> &meter) noexcept {
-    auto collection_ts = std::chrono::system_clock::now();
-    auto metric_data   = meter->Collect(this, collection_ts);
-    if (metric_data.empty())
-    {
-      return true;
-    }
-    ScopeMetrics scope_metrics;
-    scope_metrics.metric_data_ = std::move(metric_data);
-    scope_metrics.scope_       = meter->GetInstrumentationScope();
-    if (!metric_filter_)
-    {
-      resource_metrics.scope_metric_data_.emplace_back(std::move(scope_metrics));
-      return true;
-    }
-
-    ScopeMetrics filtered_scope_metrics;
-    filtered_scope_metrics.scope_ = meter->GetInstrumentationScope();
-    for (MetricData &metric : scope_metrics.metric_data_)
-    {
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &scope =
-          *scope_metrics.scope_;
-      opentelemetry::nostd::string_view name = metric.instrument_descriptor.name_;
-      const InstrumentType &type             = metric.instrument_descriptor.type_;
-      opentelemetry::nostd::string_view unit = metric.instrument_descriptor.unit_;
-
-      MetricFilter::MetricFilterResult metric_filter_result =
-          metric_filter_->TestMetric(scope, name, type, unit);
-      if (metric_filter_result == MetricFilter::MetricFilterResult::kAccept)
-      {
-        filtered_scope_metrics.metric_data_.emplace_back(std::move(metric));
-        continue;
-      }
-      else if (metric_filter_result == MetricFilter::MetricFilterResult::kDrop)
-      {
-        continue;
-      }
-
-      std::vector<PointDataAttributes> filtered_point_data_attrs;
-      for (PointDataAttributes &point_data_attr : metric.point_data_attr_)
-      {
-        const PointAttributes &attributes = point_data_attr.attributes;
-        MetricFilter::AttributesFilterResult attributes_filter_result =
-            metric_filter_->TestAttributes(scope, name, type, unit, attributes);
-        if (attributes_filter_result == MetricFilter::AttributesFilterResult::kAccept)
-        {
-          filtered_point_data_attrs.emplace_back(std::move(point_data_attr));
-        }
-      }
-      if (!filtered_point_data_attrs.empty())
-      {
-        metric.point_data_attr_ = std::move(filtered_point_data_attrs);
-        filtered_scope_metrics.metric_data_.emplace_back(std::move(metric));
-      }
-    }
-    if (!filtered_scope_metrics.metric_data_.empty())
-    {
-      resource_metrics.scope_metric_data_.emplace_back(std::move(filtered_scope_metrics));
-    }
-    return true;
-  });
-  resource_metrics.resource_ = &meter_context_->GetResource();
-  return {resource_metrics, MetricProducer::Status::kSuccess};
-}
-
-bool MetricCollector::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return metric_reader_->ForceFlush(timeout);
-}
-
-bool MetricCollector::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return metric_reader_->Shutdown(timeout);
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/observable_registry.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/observable_registry.cc
deleted file mode 100644
index d8d6afb01..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/observable_registry.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <cstdint>
-#include <mutex>
-#include <ostream>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/async_instruments.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/observer_result.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/observable_registry.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-void ObservableRegistry::AddCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
-                                     void *state,
-                                     opentelemetry::metrics::ObservableInstrument *instrument)
-{
-  // TBD - Check if existing
-  std::unique_ptr<ObservableCallbackRecord> record(
-      new ObservableCallbackRecord{callback, state, instrument});
-  std::lock_guard<std::mutex> lock_guard{callbacks_m_};
-  callbacks_.push_back(std::move(record));
-}
-
-void ObservableRegistry::RemoveCallback(opentelemetry::metrics::ObservableCallbackPtr callback,
-                                        void *state,
-                                        opentelemetry::metrics::ObservableInstrument *instrument)
-{
-  std::lock_guard<std::mutex> lock_guard{callbacks_m_};
-  auto new_end = std::remove_if(
-      callbacks_.begin(), callbacks_.end(),
-      [callback, state, instrument](const std::unique_ptr<ObservableCallbackRecord> &record) {
-        return record->callback == callback && record->state == state &&
-               record->instrument == instrument;
-      });
-  callbacks_.erase(new_end, callbacks_.end());
-}
-
-void ObservableRegistry::CleanupCallback(opentelemetry::metrics::ObservableInstrument *instrument)
-{
-  std::lock_guard<std::mutex> lock_guard{callbacks_m_};
-  auto iter = std::remove_if(callbacks_.begin(), callbacks_.end(),
-                             [instrument](const std::unique_ptr<ObservableCallbackRecord> &record) {
-                               return record->instrument == instrument;
-                             });
-  callbacks_.erase(iter, callbacks_.end());
-}
-
-void ObservableRegistry::Observe(opentelemetry::common::SystemTimestamp collection_ts)
-{
-  static DefaultAttributesProcessor default_attribute_processor;
-  std::lock_guard<std::mutex> lock_guard{callbacks_m_};
-  for (auto &callback_wrap : callbacks_)
-  {
-    auto value_type =
-        static_cast<opentelemetry::sdk::metrics::ObservableInstrument *>(callback_wrap->instrument)
-            ->GetInstrumentDescriptor()
-            .value_type_;
-    auto storage =
-        static_cast<opentelemetry::sdk::metrics::ObservableInstrument *>(callback_wrap->instrument)
-            ->GetMetricStorage();
-    if (!storage)
-    {
-      OTEL_INTERNAL_LOG_ERROR("[ObservableRegistry::Observe] - Error during observe."
-                              << "The metric storage is invalid");
-      return;
-    }
-    if (value_type == InstrumentValueType::kDouble)
-    {
-      nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>> ob_res(
-          new opentelemetry::sdk::metrics::ObserverResultT<double>(&default_attribute_processor));
-      callback_wrap->callback(ob_res, callback_wrap->state);
-      storage->RecordDouble(
-          static_cast<opentelemetry::sdk::metrics::ObserverResultT<double> *>(ob_res.get())
-              ->GetMeasurements(),
-          collection_ts);
-    }
-    else
-    {
-      nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<int64_t>> ob_res(
-          new opentelemetry::sdk::metrics::ObserverResultT<int64_t>(&default_attribute_processor));
-      callback_wrap->callback(ob_res, callback_wrap->state);
-      storage->RecordLong(
-          static_cast<opentelemetry::sdk::metrics::ObserverResultT<int64_t> *>(ob_res.get())
-              ->GetMeasurements(),
-          collection_ts);
-    }
-  }
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/sync_metric_storage.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/sync_metric_storage.cc
deleted file mode 100644
index ad6ea2782..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/sync_metric_storage.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <mutex>
-#include <utility>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/sync_metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/temporal_metric_storage.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-bool SyncMetricStorage::Collect(CollectorHandle *collector,
-                                nostd::span<std::shared_ptr<CollectorHandle>> collectors,
-                                opentelemetry::common::SystemTimestamp sdk_start_ts,
-                                opentelemetry::common::SystemTimestamp collection_ts,
-                                nostd::function_ref<bool(MetricData)> callback) noexcept
-{
-  // Add the current delta metrics to `unreported metrics stash` for all the collectors,
-  // this will also empty the delta metrics hashmap, and make it available for
-  // recordings
-  std::shared_ptr<AttributesHashMap> delta_metrics = nullptr;
-  {
-    std::lock_guard<opentelemetry::common::SpinLockMutex> guard(attribute_hashmap_lock_);
-    delta_metrics = std::move(attributes_hashmap_);
-    attributes_hashmap_.reset(new AttributesHashMap);
-  }
-
-  return temporal_metric_storage_.buildMetrics(collector, collectors, sdk_start_ts, collection_ts,
-                                               delta_metrics, callback);
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/temporal_metric_storage.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/temporal_metric_storage.cc
deleted file mode 100644
index d027c9883..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/state/temporal_metric_storage.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/temporal_metric_storage.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-TemporalMetricStorage::TemporalMetricStorage(InstrumentDescriptor instrument_descriptor,
-                                             AggregationType aggregation_type,
-                                             const AggregationConfig *aggregation_config)
-    : instrument_descriptor_(std::move(instrument_descriptor)),
-      aggregation_type_(aggregation_type),
-      aggregation_config_(aggregation_config)
-{}
-
-bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
-                                         nostd::span<std::shared_ptr<CollectorHandle>> collectors,
-                                         opentelemetry::common::SystemTimestamp sdk_start_ts,
-                                         opentelemetry::common::SystemTimestamp collection_ts,
-                                         const std::shared_ptr<AttributesHashMap> &delta_metrics,
-                                         nostd::function_ref<bool(MetricData)> callback) noexcept
-{
-  std::lock_guard<opentelemetry::common::SpinLockMutex> guard(lock_);
-  opentelemetry::common::SystemTimestamp last_collection_ts = sdk_start_ts;
-  AggregationTemporality aggregation_temporarily =
-      collector->GetAggregationTemporality(instrument_descriptor_.type_);
-
-  // Fast path for single collector with delta temporality and counter, updown-counter, histogram
-  // This path doesn't need to aggregated-with/contribute-to the unreported_metric_, as there is
-  // no other reader configured to collect those data.
-  if (collectors.size() == 1 && aggregation_temporarily == AggregationTemporality::kDelta)
-  {
-    // If no metrics, early return
-    if (delta_metrics->Size() == 0)
-    {
-      return true;
-    }
-    // Create MetricData directly
-    MetricData metric_data;
-    metric_data.instrument_descriptor   = instrument_descriptor_;
-    metric_data.aggregation_temporality = AggregationTemporality::kDelta;
-    metric_data.start_ts                = sdk_start_ts;
-    metric_data.end_ts                  = collection_ts;
-
-    // Direct conversion of delta metrics to point data
-    delta_metrics->GetAllEnteries(
-        [&metric_data](const MetricAttributes &attributes, Aggregation &aggregation) {
-          PointDataAttributes point_data_attr;
-          point_data_attr.point_data = aggregation.ToPoint();
-          point_data_attr.attributes = attributes;
-          metric_data.point_data_attr_.emplace_back(std::move(point_data_attr));
-          return true;
-        });
-    return callback(metric_data);
-  }
-
-  if (delta_metrics->Size())
-  {
-    for (auto &col : collectors)
-    {
-      unreported_metrics_[col.get()].push_back(delta_metrics);
-    }
-  }
-
-  // Get the unreported metrics for the `collector` from `unreported metrics stash`
-  // since last collection, this will also cleanup the unreported metrics for `collector`
-  // from the stash.
-  auto present = unreported_metrics_.find(collector);
-  if (present == unreported_metrics_.end())
-  {
-    // no unreported metrics for the collector, return.
-    return true;
-  }
-  auto unreported_list = std::move(present->second);
-  // Iterate over the unreporter metrics for `collector` and store result in `merged_metrics`
-  std::unique_ptr<AttributesHashMap> merged_metrics(new AttributesHashMap);
-  for (auto &agg_hashmap : unreported_list)
-  {
-    agg_hashmap->GetAllEnteries(
-        [&merged_metrics, this](const MetricAttributes &attributes, Aggregation &aggregation) {
-          auto agg = merged_metrics->Get(attributes);
-          if (agg)
-          {
-            merged_metrics->Set(attributes, agg->Merge(aggregation));
-          }
-          else
-          {
-            merged_metrics->Set(attributes,
-                                DefaultAggregation::CreateAggregation(
-                                    aggregation_type_, instrument_descriptor_, aggregation_config_)
-                                    ->Merge(aggregation));
-          }
-          return true;
-        });
-  }
-  // Get the last reported metrics for the `collector` from `last reported metrics` stash
-  //   - If the aggregation_temporarily for the collector is cumulative
-  //       - Merge the last reported metrics with unreported metrics (which is in merged_metrics),
-  //           Final result of merge would be in merged_metrics.
-  //       - Move the final merge to the `last reported metrics` stash.
-  //   - If the aggregation_temporarily is delta
-  //       - Store the unreported metrics for `collector` (which is in merged_mtrics) to
-  //          `last reported metrics` stash.
-
-  auto reported = last_reported_metrics_.find(collector);
-  if (reported != last_reported_metrics_.end())
-  {
-    auto last_aggr_hashmap = std::move(last_reported_metrics_[collector].attributes_map);
-    if (aggregation_temporarily == AggregationTemporality::kCumulative)
-    {
-      // merge current delta to previous cumulative
-      last_aggr_hashmap->GetAllEnteries(
-          [&merged_metrics, this](const MetricAttributes &attributes, Aggregation &aggregation) {
-            auto agg = merged_metrics->Get(attributes);
-            if (agg)
-            {
-              merged_metrics->Set(attributes, agg->Merge(aggregation));
-            }
-            else
-            {
-              auto def_agg = DefaultAggregation::CreateAggregation(
-                  aggregation_type_, instrument_descriptor_, aggregation_config_);
-              merged_metrics->Set(attributes, def_agg->Merge(aggregation));
-            }
-            return true;
-          });
-    }
-    else
-    {
-      last_collection_ts = last_reported_metrics_[collector].collection_ts;
-    }
-    last_reported_metrics_[collector] =
-        LastReportedMetrics{std::move(merged_metrics), collection_ts};
-  }
-  else
-  {
-    last_reported_metrics_.insert(
-        std::make_pair(collector, LastReportedMetrics{std::move(merged_metrics), collection_ts}));
-  }
-
-  // Generate the MetricData from the final merged_metrics, and invoke callback over it.
-
-  AttributesHashMap *result_to_export = (last_reported_metrics_[collector]).attributes_map.get();
-  MetricData metric_data;
-  metric_data.instrument_descriptor   = instrument_descriptor_;
-  metric_data.aggregation_temporality = aggregation_temporarily;
-  metric_data.start_ts                = last_collection_ts;
-  metric_data.end_ts                  = collection_ts;
-  result_to_export->GetAllEnteries(
-      [&metric_data](const MetricAttributes &attributes, Aggregation &aggregation) {
-        PointDataAttributes point_data_attr;
-        point_data_attr.point_data = aggregation.ToPoint();
-        point_data_attr.attributes = attributes;
-        metric_data.point_data_attr_.emplace_back(std::move(point_data_attr));
-        return true;
-      });
-  return callback(metric_data);
-}
-
-}  // namespace metrics
-
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/sync_instruments.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/sync_instruments.cc
deleted file mode 100644
index de66e9305..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/sync_instruments.cc
+++ /dev/null
@@ -1,574 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <memory>
-#include <ostream>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/sync_instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-LongCounter::LongCounter(const InstrumentDescriptor &instrument_descriptor,
-                         std::unique_ptr<SyncWritableMetricStorage> storage)
-    : Synchronous(instrument_descriptor, std::move(storage))
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[LongCounter::LongCounter] - Error constructing LongCounter."
-                            << "The metric storage is invalid for " << instrument_descriptor.name_);
-  }
-}
-
-void LongCounter::Add(uint64_t value,
-                      const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  auto context = opentelemetry::context::Context{};
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongCounter::Add(V,A)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, attributes, context);
-}
-
-void LongCounter::Add(uint64_t value,
-                      const opentelemetry::common::KeyValueIterable &attributes,
-                      const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongCounter::Add(V,A,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, attributes, context);
-}
-
-void LongCounter::Add(uint64_t value) noexcept
-{
-  auto context = opentelemetry::context::Context{};
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongCounter::Add(V)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, context);
-}
-
-void LongCounter::Add(uint64_t value, const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongCounter::Add(V,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, context);
-}
-
-DoubleCounter::DoubleCounter(const InstrumentDescriptor &instrument_descriptor,
-                             std::unique_ptr<SyncWritableMetricStorage> storage)
-    : Synchronous(instrument_descriptor, std::move(storage))
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[DoubleCounter::DoubleCounter] - Error constructing DoubleCounter."
-                            << "The metric storage is invalid for " << instrument_descriptor.name_);
-  }
-}
-
-void DoubleCounter::Add(double value,
-                        const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  if (value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleCounter::Add(V,A)] Value not recorded - negative value for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleCounter::Add(V,A)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordDouble(value, attributes, context);
-}
-
-void DoubleCounter::Add(double value,
-                        const opentelemetry::common::KeyValueIterable &attributes,
-                        const opentelemetry::context::Context &context) noexcept
-{
-  if (value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleCounter::Add(V,A,C)] Value not recorded - negative value for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleCounter::Add(V,A,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordDouble(value, attributes, context);
-}
-
-void DoubleCounter::Add(double value) noexcept
-{
-  if (value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleCounter::Add(V)] Value not recorded - negative value for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleCounter::Add(V)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordDouble(value, context);
-}
-
-void DoubleCounter::Add(double value, const opentelemetry::context::Context &context) noexcept
-{
-  if (value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleCounter::Add(V)] Value not recorded - negative value for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleCounter::Add(V,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordDouble(value, context);
-}
-
-LongUpDownCounter::LongUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
-                                     std::unique_ptr<SyncWritableMetricStorage> storage)
-    : Synchronous(instrument_descriptor, std::move(storage))
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[LongUpDownCounter::LongUpDownCounter] - Error constructing LongUpDownCounter."
-        << "The metric storage is invalid for " << instrument_descriptor.name_);
-  }
-}
-
-void LongUpDownCounter::Add(int64_t value,
-                            const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  auto context = opentelemetry::context::Context{};
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[LongUpDownCounter::Add(V,A)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, attributes, context);
-}
-
-void LongUpDownCounter::Add(int64_t value,
-                            const opentelemetry::common::KeyValueIterable &attributes,
-                            const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[LongUpDownCounter::Add(V,A,C)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, attributes, context);
-}
-
-void LongUpDownCounter::Add(int64_t value) noexcept
-{
-  auto context = opentelemetry::context::Context{};
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongUpDownCounter::Add(V)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, context);
-}
-
-void LongUpDownCounter::Add(int64_t value, const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[LongUpDownCounter::Add(V,C)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, context);
-}
-
-DoubleUpDownCounter::DoubleUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
-                                         std::unique_ptr<SyncWritableMetricStorage> storage)
-    : Synchronous(instrument_descriptor, std::move(storage))
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[DoubleUpDownCounter::DoubleUpDownCounter] - Error constructing DoubleUpDownCounter."
-        << "The metric storage is invalid for " << instrument_descriptor.name_);
-  }
-}
-
-void DoubleUpDownCounter::Add(double value,
-                              const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleUpDownCounter::Add(V,A)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordDouble(value, attributes, context);
-}
-
-void DoubleUpDownCounter::Add(double value,
-                              const opentelemetry::common::KeyValueIterable &attributes,
-                              const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleUpDownCounter::Add(V,A,C)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordDouble(value, attributes, context);
-}
-
-void DoubleUpDownCounter::Add(double value) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleUpDownCounter::Add(V)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordDouble(value, context);
-}
-
-void DoubleUpDownCounter::Add(double value, const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleUpDownCounter::Add(V,C)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordDouble(value, context);
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-LongGauge::LongGauge(const InstrumentDescriptor &instrument_descriptor,
-                     std::unique_ptr<SyncWritableMetricStorage> storage)
-    : Synchronous(instrument_descriptor, std::move(storage))
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[LongGauge::LongGauge] - Error constructing LongGauge."
-                            << "The metric storage is invalid for " << instrument_descriptor.name_);
-  }
-}
-
-void LongGauge::Record(int64_t value,
-                       const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  auto context = opentelemetry::context::Context{};
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongGauge::Record(V,A)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, attributes, context);
-}
-
-void LongGauge::Record(int64_t value,
-                       const opentelemetry::common::KeyValueIterable &attributes,
-                       const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongGauge::Record(V,A,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, attributes, context);
-}
-
-void LongGauge::Record(int64_t value) noexcept
-{
-  auto context = opentelemetry::context::Context{};
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongGauge::Record(V)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, context);
-}
-
-void LongGauge::Record(int64_t value, const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongGauge::Record(V,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, context);
-}
-
-DoubleGauge::DoubleGauge(const InstrumentDescriptor &instrument_descriptor,
-                         std::unique_ptr<SyncWritableMetricStorage> storage)
-    : Synchronous(instrument_descriptor, std::move(storage))
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[DoubleGauge::DoubleGauge] - Error constructing DoubleUpDownCounter."
-                            << "The metric storage is invalid for " << instrument_descriptor.name_);
-  }
-}
-
-void DoubleGauge::Record(double value,
-                         const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleGauge::Record(V,A)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordDouble(value, attributes, context);
-}
-
-void DoubleGauge::Record(double value,
-                         const opentelemetry::common::KeyValueIterable &attributes,
-                         const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleGauge::Record(V,A,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordDouble(value, attributes, context);
-}
-
-void DoubleGauge::Record(double value) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleGauge::Record(V)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordDouble(value, context);
-}
-
-void DoubleGauge::Record(double value, const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleGauge::Record(V,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordDouble(value, context);
-}
-#endif
-
-LongHistogram::LongHistogram(const InstrumentDescriptor &instrument_descriptor,
-                             std::unique_ptr<SyncWritableMetricStorage> storage)
-    : Synchronous(instrument_descriptor, std::move(storage))
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[LongHistogram::LongHistogram] - Error constructing LongHistogram."
-                            << "The metric storage is invalid for " << instrument_descriptor.name_);
-  }
-}
-
-void LongHistogram::Record(uint64_t value,
-                           const opentelemetry::common::KeyValueIterable &attributes,
-                           const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[LongHistogram::Record(V,A,C)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, attributes, context);
-}
-
-void LongHistogram::Record(uint64_t value, const opentelemetry::context::Context &context) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongHistogram::Record(V,C)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordLong(value, context);
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-void LongHistogram::Record(uint64_t value,
-                           const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongHistogram::Record(V,A)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordLong(value, attributes, context);
-}
-
-void LongHistogram::Record(uint64_t value) noexcept
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[LongHistogram::Record(V)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordLong(value, context);
-}
-#endif
-
-DoubleHistogram::DoubleHistogram(const InstrumentDescriptor &instrument_descriptor,
-                                 std::unique_ptr<SyncWritableMetricStorage> storage)
-    : Synchronous(instrument_descriptor, std::move(storage))
-{
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_ERROR(
-        "[DoubleHistogram::DoubleHistogram] - Error constructing DoubleHistogram."
-        << "The metric storage is invalid for " << instrument_descriptor.name_);
-  }
-}
-
-void DoubleHistogram::Record(double value,
-                             const opentelemetry::common::KeyValueIterable &attributes,
-                             const opentelemetry::context::Context &context) noexcept
-{
-  if (value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleHistogram::Record(V,A,C)] Value not recorded - negative value for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleHistogram::Record(V,A,C)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordDouble(value, attributes, context);
-}
-
-void DoubleHistogram::Record(double value, const opentelemetry::context::Context &context) noexcept
-{
-  if (value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleHistogram::Record(V,C)] Value not recorded - negative value for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleHistogram::Record(V,C)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  return storage_->RecordDouble(value, context);
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-void DoubleHistogram::Record(double value,
-                             const opentelemetry::common::KeyValueIterable &attributes) noexcept
-{
-  if (value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleHistogram::Record(V,A)] Value not recorded - negative value for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN(
-        "[DoubleHistogram::Record(V,A)] Value not recorded - invalid storage for: "
-        << instrument_descriptor_.name_);
-    return;
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordDouble(value, attributes, context);
-}
-
-void DoubleHistogram::Record(double value) noexcept
-{
-  if (value < 0)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleHistogram::Record(V)] Value not recorded - negative value for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  if (!storage_)
-  {
-    OTEL_INTERNAL_LOG_WARN("[DoubleHistogram::Record(V)] Value not recorded - invalid storage for: "
-                           << instrument_descriptor_.name_);
-    return;
-  }
-  auto context = opentelemetry::context::Context{};
-  return storage_->RecordDouble(value, context);
-}
-#endif
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/instrument_selector_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/instrument_selector_factory.cc
deleted file mode 100644
index 5cf4a5b96..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/instrument_selector_factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-std::unique_ptr<InstrumentSelector> InstrumentSelectorFactory::Create(
-    opentelemetry::sdk::metrics::InstrumentType instrument_type,
-    const std::string &name,
-    const std::string &unit)
-{
-  std::unique_ptr<InstrumentSelector> instrument_selector(
-      new InstrumentSelector(instrument_type, name, unit));
-  return instrument_selector;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/meter_selector_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/meter_selector_factory.cc
deleted file mode 100644
index 088dcd864..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/meter_selector_factory.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-std::unique_ptr<MeterSelector> MeterSelectorFactory::Create(const std::string &name,
-                                                            const std::string &version,
-                                                            const std::string &schema)
-{
-  std::unique_ptr<MeterSelector> meter_selector(new MeterSelector(name, version, schema));
-  return meter_selector;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/view_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/view_factory.cc
deleted file mode 100644
index 319c10b95..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/view_factory.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_factory.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-std::unique_ptr<View> ViewFactory::Create(const std::string &name)
-{
-  return Create(name, "");
-}
-
-std::unique_ptr<View> ViewFactory::Create(const std::string &name, const std::string &description)
-{
-  return Create(name, description, "", AggregationType::kDefault);
-}
-
-std::unique_ptr<View> ViewFactory::Create(const std::string &name,
-                                          const std::string &description,
-                                          const std::string &unit)
-{
-  return Create(name, description, unit, AggregationType::kDefault);
-}
-
-std::unique_ptr<View> ViewFactory::Create(const std::string &name,
-                                          const std::string &description,
-                                          const std::string &unit,
-                                          AggregationType aggregation_type)
-{
-  std::shared_ptr<AggregationConfig> aggregation_config(nullptr);
-  return Create(name, description, unit, aggregation_type, aggregation_config);
-}
-
-std::unique_ptr<View> ViewFactory::Create(const std::string &name,
-                                          const std::string &description,
-                                          const std::string &unit,
-                                          AggregationType aggregation_type,
-                                          std::shared_ptr<AggregationConfig> aggregation_config)
-{
-  auto attributes_processor =
-      std::unique_ptr<AttributesProcessor>(new DefaultAttributesProcessor());
-
-  return Create(name, description, unit, aggregation_type, std::move(aggregation_config),
-                std::move(attributes_processor));
-}
-
-std::unique_ptr<View> ViewFactory::Create(const std::string &name,
-                                          const std::string &description,
-                                          const std::string &unit,
-                                          AggregationType aggregation_type,
-                                          std::shared_ptr<AggregationConfig> aggregation_config,
-                                          std::unique_ptr<AttributesProcessor> attributes_processor)
-{
-  std::unique_ptr<View> view(new View(name, description, unit, aggregation_type,
-                                      std::move(aggregation_config),
-                                      std::move(attributes_processor)));
-  return view;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/view_registry_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/view_registry_factory.cc
deleted file mode 100644
index ba8a4c5e2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/metrics/view/view_registry_factory.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/view/view_registry_factory.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-
-std::unique_ptr<ViewRegistry> ViewRegistryFactory::Create()
-{
-  std::unique_ptr<ViewRegistry> view_registry(new ViewRegistry());
-  return view_registry;
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/BUILD
deleted file mode 100644
index 884562999..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "resource",
-    srcs = glob(["**/*.cc"]),
-    include_prefix = "src/resource",
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common:env_variables",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/CMakeLists.txt
deleted file mode 100644
index 48b647ec4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_resources resource.cc resource_detector.cc)
-
-set_target_properties(opentelemetry_resources PROPERTIES EXPORT_NAME resources)
-set_target_version(opentelemetry_resources)
-
-target_link_libraries(opentelemetry_resources PUBLIC opentelemetry_common)
-
-target_include_directories(
-  opentelemetry_resources
-  PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/sdk/include>")
-
-if(OPENTELEMETRY_INSTALL)
-  opentelemetry_add_pkgconfig(
-    resources "OpenTelemetry SDK - Resources"
-    "Components for resource detection in the OpenTelemetry SDK."
-    "opentelemetry_common")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/resource.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/resource.cc
deleted file mode 100644
index 5ae5446e8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/resource.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/resource/resource_detector.h"
-#include "opentelemetry/sdk/version/version.h"
-#include "opentelemetry/semconv/incubating/process_attributes.h"
-#include "opentelemetry/semconv/service_attributes.h"
-#include "opentelemetry/semconv/telemetry_attributes.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace resource
-{
-
-Resource::Resource(const ResourceAttributes &attributes, const std::string &schema_url) noexcept
-    : attributes_(attributes), schema_url_(schema_url)
-{}
-
-Resource Resource::Merge(const Resource &other) const noexcept
-{
-  ResourceAttributes merged_resource_attributes(other.attributes_);
-  merged_resource_attributes.insert(attributes_.begin(), attributes_.end());
-  return Resource(merged_resource_attributes,
-                  other.schema_url_.empty() ? schema_url_ : other.schema_url_);
-}
-
-Resource Resource::Create(const ResourceAttributes &attributes, const std::string &schema_url)
-{
-  static auto otel_resource = OTELResourceDetector().Detect();
-  auto resource =
-      Resource::GetDefault().Merge(otel_resource).Merge(Resource{attributes, schema_url});
-
-  if (resource.attributes_.find(semconv::service::kServiceName) == resource.attributes_.end())
-  {
-    std::string default_service_name = "unknown_service";
-    auto it_process_executable_name =
-        resource.attributes_.find(semconv::process::kProcessExecutableName);
-    if (it_process_executable_name != resource.attributes_.end())
-    {
-      default_service_name += ":" + nostd::get<std::string>(it_process_executable_name->second);
-    }
-    resource.attributes_[semconv::service::kServiceName] = default_service_name;
-  }
-  return resource;
-}
-
-Resource &Resource::GetEmpty()
-{
-  static Resource empty_resource;
-  return empty_resource;
-}
-
-Resource &Resource::GetDefault()
-{
-  static Resource default_resource(
-      {{semconv::telemetry::kTelemetrySdkLanguage, "cpp"},
-       {semconv::telemetry::kTelemetrySdkName, "opentelemetry"},
-       {semconv::telemetry::kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION}},
-      std::string{});
-  return default_resource;
-}
-
-const ResourceAttributes &Resource::GetAttributes() const noexcept
-{
-  return attributes_;
-}
-
-const std::string &Resource::GetSchemaURL() const noexcept
-{
-  return schema_url_;
-}
-
-}  // namespace resource
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/resource_detector.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/resource_detector.cc
deleted file mode 100644
index 3158f2a43..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/resource/resource_detector.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/resource/resource_detector.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/env_variables.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/semconv/service_attributes.h"
-#include "opentelemetry/version.h"
-
-#include <stddef.h>
-#include <sstream>
-#include <string>
-#include <unordered_map>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace resource
-{
-
-const char *OTEL_RESOURCE_ATTRIBUTES = "OTEL_RESOURCE_ATTRIBUTES";
-const char *OTEL_SERVICE_NAME        = "OTEL_SERVICE_NAME";
-
-Resource ResourceDetector::Create(const ResourceAttributes &attributes,
-                                  const std::string &schema_url)
-{
-  return Resource(attributes, schema_url);
-}
-
-Resource OTELResourceDetector::Detect() noexcept
-{
-  std::string attributes_str, service_name;
-
-  bool attributes_exists = opentelemetry::sdk::common::GetStringEnvironmentVariable(
-      OTEL_RESOURCE_ATTRIBUTES, attributes_str);
-  bool service_name_exists =
-      opentelemetry::sdk::common::GetStringEnvironmentVariable(OTEL_SERVICE_NAME, service_name);
-
-  if (!attributes_exists && !service_name_exists)
-  {
-    return ResourceDetector::Create({});
-  }
-
-  ResourceAttributes attributes;
-
-  if (attributes_exists)
-  {
-    std::istringstream iss(attributes_str);
-    std::string token;
-    while (std::getline(iss, token, ','))
-    {
-      size_t pos = token.find('=');
-      if (pos != std::string::npos)
-      {
-        std::string key   = token.substr(0, pos);
-        std::string value = token.substr(pos + 1);
-        attributes[key]   = value;
-      }
-    }
-  }
-
-  if (service_name_exists)
-  {
-    attributes[semconv::service::kServiceName] = service_name;
-  }
-
-  return ResourceDetector::Create(attributes);
-}
-
-}  // namespace resource
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/BUILD
deleted file mode 100644
index 7262a1c0a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "trace",
-    srcs = glob(["**/*.cc"]),
-    hdrs = glob(["**/*.h"]),
-    include_prefix = "src/trace",
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common:disabled",
-        "//sdk/src/common:global_log_handler",
-        "//sdk/src/common:random",
-        "//sdk/src/resource",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/CMakeLists.txt
deleted file mode 100644
index 5d7a36dbf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(
-  opentelemetry_trace
-  tracer_context.cc
-  tracer_context_factory.cc
-  tracer_provider.cc
-  tracer_provider_factory.cc
-  tracer.cc
-  span.cc
-  exporter.cc
-  provider.cc
-  batch_span_processor.cc
-  batch_span_processor_factory.cc
-  simple_processor_factory.cc
-  samplers/always_on_factory.cc
-  samplers/always_off_factory.cc
-  samplers/parent.cc
-  samplers/parent_factory.cc
-  samplers/trace_id_ratio.cc
-  samplers/trace_id_ratio_factory.cc
-  random_id_generator.cc
-  random_id_generator_factory.cc
-  tracer_config.cc)
-
-set_target_properties(opentelemetry_trace PROPERTIES EXPORT_NAME trace)
-set_target_version(opentelemetry_trace)
-
-target_link_libraries(opentelemetry_trace PUBLIC opentelemetry_common
-                                                 opentelemetry_resources)
-
-target_include_directories(
-  opentelemetry_trace
-  PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/sdk/include>")
-
-if(OPENTELEMETRY_INSTALL)
-  opentelemetry_add_pkgconfig(
-    trace "OpenTelemetry SDK - Trace"
-    "Components for exporting traces in the OpenTelemetry SDK."
-    "opentelemetry_resources")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/batch_span_processor.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/batch_span_processor.cc
deleted file mode 100644
index 9a16724e4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/batch_span_processor.cc
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stddef.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <ratio>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/atomic_unique_ptr.h"
-#include "opentelemetry/sdk/common/circular_buffer.h"
-#include "opentelemetry/sdk/common/circular_buffer_range.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/trace/batch_span_processor.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_runtime_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/version.h"
-
-using opentelemetry::sdk::common::AtomicUniquePtr;
-using opentelemetry::sdk::common::CircularBufferRange;
-using opentelemetry::trace::SpanContext;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-BatchSpanProcessor::BatchSpanProcessor(std::unique_ptr<SpanExporter> &&exporter,
-                                       const BatchSpanProcessorOptions &options)
-    : exporter_(std::move(exporter)),
-      max_queue_size_(options.max_queue_size),
-      schedule_delay_millis_(options.schedule_delay_millis),
-      max_export_batch_size_(options.max_export_batch_size),
-      buffer_(max_queue_size_),
-      synchronization_data_(std::make_shared<SynchronizationData>()),
-      worker_thread_instrumentation_(nullptr),
-      worker_thread_()
-{
-  // Make sure the constructor is complete before giving 'this' to a thread.
-  worker_thread_ = std::thread(&BatchSpanProcessor::DoBackgroundWork, this);
-}
-
-BatchSpanProcessor::BatchSpanProcessor(std::unique_ptr<SpanExporter> &&exporter,
-                                       const BatchSpanProcessorOptions &options,
-                                       const BatchSpanProcessorRuntimeOptions &runtime_options)
-    : exporter_(std::move(exporter)),
-      max_queue_size_(options.max_queue_size),
-      schedule_delay_millis_(options.schedule_delay_millis),
-      max_export_batch_size_(options.max_export_batch_size),
-      buffer_(max_queue_size_),
-      synchronization_data_(std::make_shared<SynchronizationData>()),
-      worker_thread_instrumentation_(runtime_options.thread_instrumentation),
-      worker_thread_()
-{
-  // Make sure the constructor is complete before giving 'this' to a thread.
-  worker_thread_ = std::thread(&BatchSpanProcessor::DoBackgroundWork, this);
-}
-
-std::unique_ptr<Recordable> BatchSpanProcessor::MakeRecordable() noexcept
-{
-  return exporter_->MakeRecordable();
-}
-
-void BatchSpanProcessor::OnStart(Recordable &, const SpanContext &) noexcept
-{
-  // no-op
-}
-
-void BatchSpanProcessor::OnEnd(std::unique_ptr<Recordable> &&span) noexcept
-{
-  if (synchronization_data_->is_shutdown.load() == true)
-  {
-    return;
-  }
-
-  if (buffer_.Add(std::move(span)) == false)
-  {
-    OTEL_INTERNAL_LOG_WARN("BatchSpanProcessor queue is full - dropping span.");
-    return;
-  }
-
-  // If the queue gets at least half full a preemptive notification is
-  // sent to the worker thread to start a new export cycle.
-  size_t buffer_size = buffer_.size();
-  if (buffer_size >= max_queue_size_ / 2 || buffer_size >= max_export_batch_size_)
-  {
-    // signal the worker thread
-    synchronization_data_->cv.notify_all();
-  }
-}
-
-bool BatchSpanProcessor::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  if (synchronization_data_->is_shutdown.load() == true)
-  {
-    return false;
-  }
-
-  // Now wait for the worker thread to signal back from the Export method
-  std::unique_lock<std::mutex> lk_cv(synchronization_data_->force_flush_cv_m);
-
-  std::uint64_t current_sequence =
-      synchronization_data_->force_flush_pending_sequence.fetch_add(1, std::memory_order_release) +
-      1;
-  synchronization_data_->force_flush_timeout_us.store(timeout.count(), std::memory_order_release);
-  auto break_condition = [this, current_sequence]() {
-    if (synchronization_data_->is_shutdown.load() == true)
-    {
-      return true;
-    }
-
-    // Wake up the worker thread.
-    if (synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire) >
-        synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire))
-    {
-      synchronization_data_->is_force_wakeup_background_worker.store(true,
-                                                                     std::memory_order_release);
-      synchronization_data_->cv.notify_all();
-    }
-
-    return synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire) >=
-           current_sequence;
-  };
-
-  // Fix timeout to meet requirement of wait_for
-  timeout = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-      timeout, std::chrono::microseconds::zero());
-  std::chrono::steady_clock::duration timeout_steady =
-      std::chrono::duration_cast<std::chrono::steady_clock::duration>(timeout);
-  if (timeout_steady <= std::chrono::steady_clock::duration::zero())
-  {
-    timeout_steady = (std::chrono::steady_clock::duration::max)();
-  }
-
-  bool result = false;
-  while (!result && timeout_steady > std::chrono::steady_clock::duration::zero())
-  {
-    // When force_flush_notified_sequence.compare_exchange_strong(...) and
-    // force_flush_cv.notify_all() is called between force_flush_pending_sequence.load(...) and
-    // force_flush_cv.wait(). We must not wait for ever
-    std::chrono::steady_clock::time_point start_timepoint = std::chrono::steady_clock::now();
-
-    std::chrono::microseconds wait_timeout = schedule_delay_millis_;
-
-    if (wait_timeout > timeout_steady)
-    {
-      wait_timeout = std::chrono::duration_cast<std::chrono::microseconds>(timeout_steady);
-    }
-    result = synchronization_data_->force_flush_cv.wait_for(lk_cv, wait_timeout, break_condition);
-    timeout_steady -= std::chrono::steady_clock::now() - start_timepoint;
-  }
-
-  return synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire) >=
-         current_sequence;
-}
-
-void BatchSpanProcessor::DoBackgroundWork()
-{
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->OnStart();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-  auto timeout = schedule_delay_millis_;
-
-  while (true)
-  {
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (worker_thread_instrumentation_ != nullptr)
-    {
-      worker_thread_instrumentation_->BeforeWait();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-    // Wait for `timeout` milliseconds
-    std::unique_lock<std::mutex> lk(synchronization_data_->cv_m);
-    synchronization_data_->cv.wait_for(lk, timeout, [this] {
-      if (synchronization_data_->is_force_wakeup_background_worker.load(std::memory_order_acquire))
-      {
-        return true;
-      }
-
-      return !buffer_.empty();
-    });
-    synchronization_data_->is_force_wakeup_background_worker.store(false,
-                                                                   std::memory_order_release);
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-    if (worker_thread_instrumentation_ != nullptr)
-    {
-      worker_thread_instrumentation_->AfterWait();
-    }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-    if (synchronization_data_->is_shutdown.load() == true)
-    {
-      DrainQueue();
-      break;
-    }
-
-    auto start = std::chrono::steady_clock::now();
-    Export();
-    auto end      = std::chrono::steady_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
-
-    // Subtract the duration of this export call from the next `timeout`.
-    timeout = schedule_delay_millis_ - duration;
-  }
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->OnEnd();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-}
-
-void BatchSpanProcessor::Export()
-{
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->BeforeLoad();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-
-  do
-  {
-    std::vector<std::unique_ptr<Recordable>> spans_arr;
-    size_t num_records_to_export;
-    std::uint64_t notify_force_flush =
-        synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire);
-    if (notify_force_flush)
-    {
-      num_records_to_export = buffer_.size();
-    }
-    else
-    {
-      num_records_to_export =
-          buffer_.size() >= max_export_batch_size_ ? max_export_batch_size_ : buffer_.size();
-    }
-
-    if (num_records_to_export == 0)
-    {
-      NotifyCompletion(notify_force_flush, exporter_, synchronization_data_);
-      break;
-    }
-
-    // Reserve space for the number of records
-    spans_arr.reserve(num_records_to_export);
-
-    buffer_.Consume(num_records_to_export,
-                    [&](CircularBufferRange<AtomicUniquePtr<Recordable>> range) noexcept {
-                      range.ForEach([&](AtomicUniquePtr<Recordable> &ptr) {
-                        std::unique_ptr<Recordable> swap_ptr = std::unique_ptr<Recordable>(nullptr);
-                        ptr.Swap(swap_ptr);
-                        spans_arr.push_back(std::unique_ptr<Recordable>(swap_ptr.release()));
-                        return true;
-                      });
-                    });
-
-    exporter_->Export(nostd::span<std::unique_ptr<Recordable>>(spans_arr.data(), spans_arr.size()));
-    NotifyCompletion(notify_force_flush, exporter_, synchronization_data_);
-  } while (true);
-
-#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
-  if (worker_thread_instrumentation_ != nullptr)
-  {
-    worker_thread_instrumentation_->AfterLoad();
-  }
-#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
-}
-
-void BatchSpanProcessor::NotifyCompletion(
-    std::uint64_t notify_force_flush,
-    const std::unique_ptr<SpanExporter> &exporter,
-    const std::shared_ptr<SynchronizationData> &synchronization_data)
-{
-  if (!synchronization_data)
-  {
-    return;
-  }
-
-  if (notify_force_flush >
-      synchronization_data->force_flush_notified_sequence.load(std::memory_order_acquire))
-  {
-    if (exporter)
-    {
-      std::chrono::microseconds timeout = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-          std::chrono::microseconds{
-              synchronization_data->force_flush_timeout_us.load(std::memory_order_acquire)},
-          std::chrono::microseconds::zero());
-      exporter->ForceFlush(timeout);
-    }
-
-    std::uint64_t notified_sequence =
-        synchronization_data->force_flush_notified_sequence.load(std::memory_order_acquire);
-    while (notify_force_flush > notified_sequence)
-    {
-      synchronization_data->force_flush_notified_sequence.compare_exchange_strong(
-          notified_sequence, notify_force_flush, std::memory_order_acq_rel);
-      synchronization_data->force_flush_cv.notify_all();
-    }
-  }
-}
-
-void BatchSpanProcessor::DrainQueue()
-{
-  while (true)
-  {
-    if (buffer_.empty() &&
-        synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire) <=
-            synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire))
-    {
-      break;
-    }
-
-    Export();
-  }
-}
-
-void BatchSpanProcessor::GetWaitAdjustedTime(
-    std::chrono::microseconds &timeout,
-    std::chrono::time_point<std::chrono::system_clock> &start_time)
-{
-  auto end_time = std::chrono::system_clock::now();
-  auto offset   = std::chrono::duration_cast<std::chrono::microseconds>(end_time - start_time);
-  start_time    = end_time;
-  timeout       = opentelemetry::common::DurationUtil::AdjustWaitForTimeout(
-      timeout, std::chrono::microseconds::zero());
-  if (timeout > offset && timeout > std::chrono::microseconds::zero())
-  {
-    timeout -= offset;
-  }
-  else
-  {
-    // Some module use zero as indefinite timeout.So we can not reset timeout to zero here
-    timeout = std::chrono::microseconds(1);
-  }
-}
-
-bool BatchSpanProcessor::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  auto start_time = std::chrono::system_clock::now();
-  std::lock_guard<std::mutex> shutdown_guard{synchronization_data_->shutdown_m};
-  bool already_shutdown = synchronization_data_->is_shutdown.exchange(true);
-
-  if (worker_thread_.joinable())
-  {
-    synchronization_data_->is_force_wakeup_background_worker.store(true, std::memory_order_release);
-    synchronization_data_->cv.notify_all();
-    worker_thread_.join();
-  }
-
-  GetWaitAdjustedTime(timeout, start_time);
-  // Should only shutdown exporter ONCE.
-  if (!already_shutdown && exporter_ != nullptr)
-  {
-    return exporter_->Shutdown(timeout);
-  }
-
-  return true;
-}
-
-BatchSpanProcessor::~BatchSpanProcessor()
-{
-  if (synchronization_data_->is_shutdown.load() == false)
-  {
-    Shutdown();
-  }
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/batch_span_processor_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/batch_span_processor_factory.cc
deleted file mode 100644
index caaafbacb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/batch_span_processor_factory.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/sdk/trace/batch_span_processor.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_factory.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_runtime_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-std::unique_ptr<SpanProcessor> BatchSpanProcessorFactory::Create(
-    std::unique_ptr<SpanExporter> &&exporter,
-    const BatchSpanProcessorOptions &options)
-{
-  BatchSpanProcessorRuntimeOptions runtime_options;
-  return Create(std::move(exporter), options, runtime_options);
-}
-
-std::unique_ptr<SpanProcessor> BatchSpanProcessorFactory::Create(
-    std::unique_ptr<SpanExporter> &&exporter,
-    const BatchSpanProcessorOptions &options,
-    const BatchSpanProcessorRuntimeOptions &runtime_options)
-{
-  std::unique_ptr<SpanProcessor> processor(
-      new BatchSpanProcessor(std::move(exporter), options, runtime_options));
-  return processor;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/exporter.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/exporter.cc
deleted file mode 100644
index 5984583ba..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/exporter.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/trace/exporter.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-OPENTELEMETRY_EXPORT SpanExporter::SpanExporter() {}
-
-OPENTELEMETRY_EXPORT SpanExporter::~SpanExporter() {}
-
-OPENTELEMETRY_EXPORT bool SpanExporter::ForceFlush(std::chrono::microseconds /*timeout*/) noexcept
-{
-  return true;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/provider.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/provider.cc
deleted file mode 100644
index ff27c4096..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/provider.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/disabled.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-void Provider::SetTracerProvider(
-    const nostd::shared_ptr<opentelemetry::trace::TracerProvider> &tp) noexcept
-{
-  bool disabled = opentelemetry::sdk::common::GetSdkDisabled();
-
-  if (!disabled)
-  {
-    opentelemetry::trace::Provider::SetTracerProvider(tp);
-  }
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/random_id_generator.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/random_id_generator.cc
deleted file mode 100644
index f09fa8114..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/random_id_generator.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/trace/random_id_generator.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-#include "src/common/random.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-namespace trace_api = opentelemetry::trace;
-
-trace_api::SpanId RandomIdGenerator::GenerateSpanId() noexcept
-{
-  uint8_t span_id_buf[trace_api::SpanId::kSize];
-  sdk::common::Random::GenerateRandomBuffer(span_id_buf);
-  return trace_api::SpanId(span_id_buf);
-}
-
-trace_api::TraceId RandomIdGenerator::GenerateTraceId() noexcept
-{
-  uint8_t trace_id_buf[trace_api::TraceId::kSize];
-  sdk::common::Random::GenerateRandomBuffer(trace_id_buf);
-  return trace_api::TraceId(trace_id_buf);
-}
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/random_id_generator_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/random_id_generator_factory.cc
deleted file mode 100644
index 9bf081866..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/random_id_generator_factory.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/trace/random_id_generator_factory.h"
-#include "opentelemetry/sdk/trace/random_id_generator.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-std::unique_ptr<IdGenerator> RandomIdGeneratorFactory::Create()
-{
-  std::unique_ptr<IdGenerator> id_generator(new RandomIdGenerator());
-  return id_generator;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/always_off_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/always_off_factory.cc
deleted file mode 100644
index c148d60ee..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/always_off_factory.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/trace/samplers/always_off_factory.h"
-#include "opentelemetry/sdk/trace/samplers/always_off.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-std::unique_ptr<Sampler> AlwaysOffSamplerFactory::Create()
-{
-  std::unique_ptr<Sampler> sampler(new AlwaysOffSampler());
-  return sampler;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/always_on_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/always_on_factory.cc
deleted file mode 100644
index a803596b9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/always_on_factory.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/trace/samplers/always_on_factory.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-std::unique_ptr<Sampler> AlwaysOnSamplerFactory::Create()
-{
-  std::unique_ptr<Sampler> sampler(new AlwaysOnSampler());
-  return sampler;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/parent.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/parent.cc
deleted file mode 100644
index 1e7dd9ba3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/parent.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/parent.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-namespace trace_api = opentelemetry::trace;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-ParentBasedSampler::ParentBasedSampler(const std::shared_ptr<Sampler> &delegate_sampler) noexcept
-    : delegate_sampler_(delegate_sampler),
-      description_("ParentBased{" + std::string{delegate_sampler->GetDescription()} + "}")
-{}
-
-SamplingResult ParentBasedSampler::ShouldSample(
-    const trace_api::SpanContext &parent_context,
-    trace_api::TraceId trace_id,
-    nostd::string_view name,
-    trace_api::SpanKind span_kind,
-    const opentelemetry::common::KeyValueIterable &attributes,
-    const trace_api::SpanContextKeyValueIterable &links) noexcept
-{
-  if (!parent_context.IsValid())
-  {
-    // If no parent (root span) exists returns the result of the delegateSampler
-    return delegate_sampler_->ShouldSample(parent_context, trace_id, name, span_kind, attributes,
-                                           links);
-  }
-
-  // If parent exists:
-  if (parent_context.IsSampled())
-  {
-    return {Decision::RECORD_AND_SAMPLE, nullptr, parent_context.trace_state()};
-  }
-
-  return {Decision::DROP, nullptr, parent_context.trace_state()};
-}
-
-nostd::string_view ParentBasedSampler::GetDescription() const noexcept
-{
-  return description_;
-}
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/parent_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/parent_factory.cc
deleted file mode 100644
index 25a2e94f6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/parent_factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/parent.h"
-#include "opentelemetry/sdk/trace/samplers/parent_factory.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-std::unique_ptr<Sampler> ParentBasedSamplerFactory::Create(
-    const std::shared_ptr<Sampler> &delegate_sampler)
-{
-  std::unique_ptr<Sampler> sampler(new ParentBasedSampler(delegate_sampler));
-  return sampler;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/trace_id_ratio.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/trace_id_ratio.cc
deleted file mode 100644
index fcb074ffc..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/trace_id_ratio.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// Copyright 2017, OpenCensus Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <cmath>
-#include <cstdint>
-#include <cstring>
-#include <map>
-#include <memory>
-#include <string>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/trace_id_ratio.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-namespace trace_api = opentelemetry::trace;
-
-namespace
-{
-/**
- * Converts a ratio in [0, 1] to a threshold in [0, UINT64_MAX]
- *
- * @param ratio a required value top be converted to uint64_t. is
- * bounded by 1 >= ratio >= 0.
- * @return Returns threshold value computed after converting ratio to
- * uint64_t datatype
- */
-uint64_t CalculateThreshold(double ratio) noexcept
-{
-  if (ratio <= 0.0)
-    return 0;
-  if (ratio >= 1.0)
-    return UINT64_MAX;
-
-  // We can't directly return ratio * UINT64_MAX.
-  //
-  // UINT64_MAX is (2^64)-1, but as a double rounds up to 2^64.
-  // For probabilities >= 1-(2^-54), the product wraps to zero!
-  // Instead, calculate the high and low 32 bits separately.
-  const double product = UINT32_MAX * ratio;
-  double hi_bits, lo_bits = ldexp(modf(product, &hi_bits), 32) + product;
-  return (static_cast<uint64_t>(hi_bits) << 32) + static_cast<uint64_t>(lo_bits);
-}
-
-/**
- * @param trace_id a required value to be converted to uint64_t. trace_id must
- * at least 8 bytes long
- * @return Returns threshold value computed after converting trace_id to
- * uint64_t datatype
- */
-uint64_t CalculateThresholdFromBuffer(const trace_api::TraceId &trace_id) noexcept
-{
-  // We only use the first 8 bytes of TraceId.
-  static_assert(trace_api::TraceId::kSize >= 8, "TraceID must be at least 8 bytes long.");
-
-  uint64_t res = 0;
-  std::memcpy(&res, &trace_id, 8);
-
-  double ratio = static_cast<double>(res) / static_cast<double>(UINT64_MAX);
-
-  return CalculateThreshold(ratio);
-}
-}  // namespace
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-TraceIdRatioBasedSampler::TraceIdRatioBasedSampler(double ratio)
-    : threshold_(CalculateThreshold(ratio))
-{
-  if (ratio > 1.0)
-    ratio = 1.0;
-  if (ratio < 0.0)
-    ratio = 0.0;
-  description_ = "TraceIdRatioBasedSampler{" + std::to_string(ratio) + "}";
-}
-
-SamplingResult TraceIdRatioBasedSampler::ShouldSample(
-    const trace_api::SpanContext & /*parent_context*/,
-    trace_api::TraceId trace_id,
-    nostd::string_view /*name*/,
-    trace_api::SpanKind /*span_kind*/,
-    const opentelemetry::common::KeyValueIterable & /*attributes*/,
-    const trace_api::SpanContextKeyValueIterable & /*links*/) noexcept
-{
-  if (threshold_ == 0)
-    return {Decision::DROP, nullptr, {}};
-
-  if (CalculateThresholdFromBuffer(trace_id) <= threshold_)
-  {
-    return {Decision::RECORD_AND_SAMPLE, nullptr, {}};
-  }
-
-  return {Decision::DROP, nullptr, {}};
-}
-
-nostd::string_view TraceIdRatioBasedSampler::GetDescription() const noexcept
-{
-  return description_;
-}
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/trace_id_ratio_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/trace_id_ratio_factory.cc
deleted file mode 100644
index da4c4cc35..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/samplers/trace_id_ratio_factory.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/trace/samplers/trace_id_ratio_factory.h"
-#include "opentelemetry/sdk/trace/samplers/trace_id_ratio.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-std::unique_ptr<Sampler> TraceIdRatioBasedSamplerFactory::Create(double ratio)
-{
-  std::unique_ptr<Sampler> sampler(new TraceIdRatioBasedSampler(ratio));
-  return sampler;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/simple_processor_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/simple_processor_factory.cc
deleted file mode 100644
index 7e567d22c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/simple_processor_factory.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-std::unique_ptr<SpanProcessor> SimpleSpanProcessorFactory::Create(
-    std::unique_ptr<SpanExporter> &&exporter)
-{
-  std::unique_ptr<SpanProcessor> processor(new SimpleSpanProcessor(std::move(exporter)));
-  return processor;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/span.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/span.cc
deleted file mode 100644
index 4ac506bc6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/span.cc
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <utility>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/version.h"
-#include "src/trace/span.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-using opentelemetry::common::SteadyTimestamp;
-using opentelemetry::common::SystemTimestamp;
-namespace common = opentelemetry::common;
-
-namespace
-{
-SystemTimestamp NowOr(const SystemTimestamp &system)
-{
-  if (system == SystemTimestamp())
-  {
-    return SystemTimestamp(std::chrono::system_clock::now());
-  }
-  else
-  {
-    return system;
-  }
-}
-
-SteadyTimestamp NowOr(const SteadyTimestamp &steady)
-{
-  if (steady == SteadyTimestamp())
-  {
-    return SteadyTimestamp(std::chrono::steady_clock::now());
-  }
-  else
-  {
-    return steady;
-  }
-}
-}  // namespace
-
-Span::Span(std::shared_ptr<Tracer> &&tracer,
-           nostd::string_view name,
-           const common::KeyValueIterable &attributes,
-           const opentelemetry::trace::SpanContextKeyValueIterable &links,
-           const opentelemetry::trace::StartSpanOptions &options,
-           const opentelemetry::trace::SpanContext &parent_span_context,
-           std::unique_ptr<opentelemetry::trace::SpanContext> span_context) noexcept
-    : tracer_{std::move(tracer)},
-      recordable_{tracer_->GetProcessor().MakeRecordable()},
-      start_steady_time{options.start_steady_time},
-      span_context_(std::move(span_context)),
-      has_ended_{false}
-{
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-  recordable_->SetName(name);
-  recordable_->SetInstrumentationScope(tracer_->GetInstrumentationScope());
-  recordable_->SetIdentity(*span_context_, parent_span_context.IsValid()
-                                               ? parent_span_context.span_id()
-                                               : opentelemetry::trace::SpanId());
-
-  recordable_->SetTraceFlags(span_context_->trace_flags());
-
-  attributes.ForEachKeyValue([&](nostd::string_view key, common::AttributeValue value) noexcept {
-    recordable_->SetAttribute(key, value);
-    return true;
-  });
-
-  links.ForEachKeyValue([&](const opentelemetry::trace::SpanContext &span_context,
-                            const common::KeyValueIterable &attributes) {
-    recordable_->AddLink(span_context, attributes);
-    return true;
-  });
-
-  recordable_->SetSpanKind(options.kind);
-  recordable_->SetStartTime(NowOr(options.start_system_time));
-  start_steady_time = NowOr(options.start_steady_time);
-  recordable_->SetResource(tracer_->GetResource());
-  tracer_->GetProcessor().OnStart(*recordable_, parent_span_context);
-}
-
-Span::~Span()
-{
-  End();
-}
-
-void Span::SetAttribute(nostd::string_view key, const common::AttributeValue &value) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-
-  recordable_->SetAttribute(key, value);
-}
-
-void Span::AddEvent(nostd::string_view name) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-  recordable_->AddEvent(name);
-}
-
-void Span::AddEvent(nostd::string_view name, SystemTimestamp timestamp) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-  recordable_->AddEvent(name, timestamp);
-}
-
-void Span::AddEvent(nostd::string_view name, const common::KeyValueIterable &attributes) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-  recordable_->AddEvent(name, attributes);
-}
-
-void Span::AddEvent(nostd::string_view name,
-                    SystemTimestamp timestamp,
-                    const common::KeyValueIterable &attributes) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-  recordable_->AddEvent(name, timestamp, attributes);
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-void Span::AddLink(const opentelemetry::trace::SpanContext &target,
-                   const opentelemetry::common::KeyValueIterable &attrs) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-
-  recordable_->AddLink(target, attrs);
-}
-
-void Span::AddLinks(const opentelemetry::trace::SpanContextKeyValueIterable &links) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-
-  links.ForEachKeyValue([&](opentelemetry::trace::SpanContext span_context,
-                            const common::KeyValueIterable &attributes) {
-    recordable_->AddLink(span_context, attributes);
-    return true;
-  });
-}
-#endif
-
-void Span::SetStatus(opentelemetry::trace::StatusCode code, nostd::string_view description) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-  recordable_->SetStatus(code, description);
-}
-
-void Span::UpdateName(nostd::string_view name) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-  recordable_->SetName(name);
-}
-
-void Span::End(const opentelemetry::trace::EndSpanOptions &options) noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-
-  if (has_ended_ == true)
-  {
-    return;
-  }
-  has_ended_ = true;
-
-  if (recordable_ == nullptr)
-  {
-    return;
-  }
-
-  auto end_steady_time = NowOr(options.end_steady_time);
-  recordable_->SetDuration(std::chrono::steady_clock::time_point(end_steady_time) -
-                           std::chrono::steady_clock::time_point(start_steady_time));
-
-  tracer_->GetProcessor().OnEnd(std::move(recordable_));
-  recordable_.reset();
-}
-
-bool Span::IsRecording() const noexcept
-{
-  std::lock_guard<std::mutex> lock_guard{mu_};
-  return recordable_ != nullptr;
-}
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/span.h b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/span.h
deleted file mode 100644
index 5e0ff2c57..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/span.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <mutex>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-class Span final : public opentelemetry::trace::Span
-{
-public:
-  Span(std::shared_ptr<Tracer> &&tracer,
-       nostd::string_view name,
-       const opentelemetry::common::KeyValueIterable &attributes,
-       const opentelemetry::trace::SpanContextKeyValueIterable &links,
-       const opentelemetry::trace::StartSpanOptions &options,
-       const opentelemetry::trace::SpanContext &parent_span_context,
-       std::unique_ptr<opentelemetry::trace::SpanContext> span_context) noexcept;
-
-  ~Span() override;
-
-  // opentelemetry::trace::Span
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override;
-
-  void AddEvent(nostd::string_view name) noexcept override;
-
-  void AddEvent(nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp) noexcept override;
-
-  void AddEvent(nostd::string_view name,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-  void AddEvent(nostd::string_view name,
-                opentelemetry::common::SystemTimestamp timestamp,
-                const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void AddLink(const opentelemetry::trace::SpanContext &target,
-               const opentelemetry::common::KeyValueIterable &attrs) noexcept override;
-
-  void AddLinks(const opentelemetry::trace::SpanContextKeyValueIterable &links) noexcept override;
-#endif
-
-  void SetStatus(opentelemetry::trace::StatusCode code,
-                 nostd::string_view description) noexcept override;
-
-  void UpdateName(nostd::string_view name) noexcept override;
-
-  void End(const opentelemetry::trace::EndSpanOptions &options = {}) noexcept override;
-
-  bool IsRecording() const noexcept override;
-
-  opentelemetry::trace::SpanContext GetContext() const noexcept override
-  {
-    return *span_context_.get();
-  }
-
-private:
-  std::shared_ptr<Tracer> tracer_;
-  mutable std::mutex mu_;
-  std::unique_ptr<Recordable> recordable_;
-  opentelemetry::common::SteadyTimestamp start_steady_time;
-  std::unique_ptr<opentelemetry::trace::SpanContext> span_context_;
-  bool has_ended_;
-};
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer.cc
deleted file mode 100644
index 263638955..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer.cc
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <chrono>
-#include <map>
-#include <new>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "opentelemetry/version.h"
-
-#include "src/trace/span.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-const std::shared_ptr<opentelemetry::trace::NoopTracer> Tracer::kNoopTracer =
-    std::make_shared<opentelemetry::trace::NoopTracer>();
-
-Tracer::Tracer(std::shared_ptr<TracerContext> context,
-               std::unique_ptr<InstrumentationScope> instrumentation_scope) noexcept
-    : instrumentation_scope_{std::move(instrumentation_scope)},
-      context_{std::move(context)},
-      tracer_config_(context_->GetTracerConfigurator().ComputeConfig(*instrumentation_scope_))
-{
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  UpdateEnabled(tracer_config_.IsEnabled());
-#endif
-}
-
-nostd::shared_ptr<opentelemetry::trace::Span> Tracer::StartSpan(
-    nostd::string_view name,
-    const opentelemetry::common::KeyValueIterable &attributes,
-    const opentelemetry::trace::SpanContextKeyValueIterable &links,
-    const opentelemetry::trace::StartSpanOptions &options) noexcept
-{
-  if (!tracer_config_.IsEnabled())
-  {
-    return kNoopTracer->StartSpan(name, attributes, links, options);
-  }
-  opentelemetry::trace::SpanContext parent_context = GetCurrentSpan()->GetContext();
-  if (nostd::holds_alternative<opentelemetry::trace::SpanContext>(options.parent))
-  {
-    auto span_context = nostd::get<opentelemetry::trace::SpanContext>(options.parent);
-    if (span_context.IsValid())
-    {
-      parent_context = span_context;
-    }
-  }
-  else if (nostd::holds_alternative<context::Context>(options.parent))
-  {
-    auto context = nostd::get<context::Context>(options.parent);
-    // fetch span context from parent span stored in the context
-    auto span_context = opentelemetry::trace::GetSpan(context)->GetContext();
-    if (span_context.IsValid())
-    {
-      parent_context = span_context;
-    }
-    else
-    {
-      if (opentelemetry::trace::IsRootSpan(context))
-      {
-        parent_context = opentelemetry::trace::SpanContext{false, false};
-      }
-    }
-  }
-
-  IdGenerator &generator = GetIdGenerator();
-  opentelemetry::trace::TraceId trace_id;
-  opentelemetry::trace::SpanId span_id = generator.GenerateSpanId();
-  bool is_parent_span_valid            = false;
-  uint8_t flags                        = 0;
-
-  if (parent_context.IsValid())
-  {
-    trace_id             = parent_context.trace_id();
-    flags                = parent_context.trace_flags().flags();
-    is_parent_span_valid = true;
-  }
-  else
-  {
-    trace_id = generator.GenerateTraceId();
-    if (generator.IsRandom())
-    {
-      flags = opentelemetry::trace::TraceFlags::kIsRandom;
-    }
-  }
-
-  auto sampling_result = context_->GetSampler().ShouldSample(parent_context, trace_id, name,
-                                                             options.kind, attributes, links);
-  if (sampling_result.IsSampled())
-  {
-    flags |= opentelemetry::trace::TraceFlags::kIsSampled;
-  }
-
-#if 1
-  /* https://github.com/open-telemetry/opentelemetry-specification as of v1.29.0 */
-  /* Support W3C Trace Context version 1. */
-  flags &= opentelemetry::trace::TraceFlags::kAllW3CTraceContext1Flags;
-#endif
-
-#if 0
-  /* Waiting for https://github.com/open-telemetry/opentelemetry-specification/issues/3411 */
-  /* Support W3C Trace Context version 2. */
-  flags &= opentelemetry::trace::TraceFlags::kAllW3CTraceContext2Flags;
-#endif
-
-  opentelemetry::trace::TraceFlags trace_flags(flags);
-
-  auto span_context =
-      std::unique_ptr<opentelemetry::trace::SpanContext>(new opentelemetry::trace::SpanContext(
-          trace_id, span_id, trace_flags, false,
-          sampling_result.trace_state ? sampling_result.trace_state
-          : is_parent_span_valid      ? parent_context.trace_state()
-                                      : opentelemetry::trace::TraceState::GetDefault()));
-
-  if (!sampling_result.IsRecording())
-  {
-    // create no-op span with valid span-context.
-
-    auto noop_span = nostd::shared_ptr<opentelemetry::trace::Span>{
-        new (std::nothrow)
-            opentelemetry::trace::NoopSpan(this->shared_from_this(), std::move(span_context))};
-    return noop_span;
-  }
-  else
-  {
-
-    auto span = nostd::shared_ptr<opentelemetry::trace::Span>{
-        new (std::nothrow) Span{this->shared_from_this(), name, attributes, links, options,
-                                parent_context, std::move(span_context)}};
-
-    // if the attributes is not nullptr, add attributes to the span.
-    if (sampling_result.attributes)
-    {
-      for (auto &kv : *sampling_result.attributes)
-      {
-        span->SetAttribute(kv.first, kv.second);
-      }
-    }
-
-    return span;
-  }
-}
-
-void Tracer::ForceFlushWithMicroseconds(uint64_t timeout) noexcept
-{
-  if (context_)
-  {
-    context_->ForceFlush(
-        std::chrono::microseconds{static_cast<std::chrono::microseconds::rep>(timeout)});
-  }
-}
-
-void Tracer::CloseWithMicroseconds(uint64_t timeout) noexcept
-{
-  // Trace context is shared by many tracers.So we just call ForceFlush to flush all pending spans
-  // and do not shutdown it.
-  if (context_)
-  {
-    context_->ForceFlush(
-        std::chrono::microseconds{static_cast<std::chrono::microseconds::rep>(timeout)});
-  }
-}
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_config.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_config.cc
deleted file mode 100644
index f32c2d78e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_config.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/trace/tracer_config.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-OPENTELEMETRY_EXPORT TracerConfig TracerConfig::Disabled()
-{
-  static const auto kDisabledConfig = TracerConfig(true);
-  return kDisabledConfig;
-}
-
-OPENTELEMETRY_EXPORT TracerConfig TracerConfig::Enabled()
-{
-  return Default();
-}
-
-OPENTELEMETRY_EXPORT TracerConfig TracerConfig::Default()
-{
-  static const auto kDefaultConfig = TracerConfig();
-  return kDefaultConfig;
-}
-
-OPENTELEMETRY_EXPORT bool TracerConfig::IsEnabled() const noexcept
-{
-  return !disabled_;
-}
-
-OPENTELEMETRY_EXPORT bool TracerConfig::operator==(const TracerConfig &other) const noexcept
-{
-  return disabled_ == other.disabled_;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_context.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_context.cc
deleted file mode 100644
index c3cbfb9d7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_context.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <chrono>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/multi_span_processor.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-namespace resource = opentelemetry::sdk::resource;
-
-TracerContext::TracerContext(std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-                             const resource::Resource &resource,
-                             std::unique_ptr<Sampler> sampler,
-                             std::unique_ptr<IdGenerator> id_generator,
-                             std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>>
-                                 tracer_configurator) noexcept
-    : resource_(resource),
-      sampler_(std::move(sampler)),
-      id_generator_(std::move(id_generator)),
-      processor_(std::unique_ptr<SpanProcessor>(new MultiSpanProcessor(std::move(processors)))),
-      tracer_configurator_(std::move(tracer_configurator))
-{}
-
-Sampler &TracerContext::GetSampler() const noexcept
-{
-  return *sampler_;
-}
-
-const resource::Resource &TracerContext::GetResource() const noexcept
-{
-  return resource_;
-}
-
-const instrumentationscope::ScopeConfigurator<TracerConfig> &TracerContext::GetTracerConfigurator()
-    const noexcept
-{
-  return *tracer_configurator_;
-}
-
-opentelemetry::sdk::trace::IdGenerator &TracerContext::GetIdGenerator() const noexcept
-{
-  return *id_generator_;
-}
-
-void TracerContext::AddProcessor(std::unique_ptr<SpanProcessor> processor) noexcept
-{
-
-  auto multi_processor = static_cast<MultiSpanProcessor *>(processor_.get());
-  multi_processor->AddProcessor(std::move(processor));
-}
-
-SpanProcessor &TracerContext::GetProcessor() const noexcept
-{
-  return *processor_;
-}
-
-bool TracerContext::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return processor_->ForceFlush(timeout);
-}
-
-bool TracerContext::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return processor_->Shutdown(timeout);
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_context_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_context_factory.cc
deleted file mode 100644
index 9472dc041..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_context_factory.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/random_id_generator_factory.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_on_factory.h"
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_context_factory.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-std::unique_ptr<TracerContext> TracerContextFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors)
-{
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  return Create(std::move(processors), resource);
-}
-
-std::unique_ptr<TracerContext> TracerContextFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource)
-{
-  auto sampler = AlwaysOnSamplerFactory::Create();
-  return Create(std::move(processors), resource, std::move(sampler));
-}
-
-std::unique_ptr<TracerContext> TracerContextFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler)
-{
-  auto id_generator = RandomIdGeneratorFactory::Create();
-  return Create(std::move(processors), resource, std::move(sampler), std::move(id_generator));
-}
-
-std::unique_ptr<TracerContext> TracerContextFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler,
-    std::unique_ptr<IdGenerator> id_generator)
-{
-  auto tracer_configurator =
-      std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
-          instrumentationscope::ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Default())
-              .Build());
-  return Create(std::move(processors), resource, std::move(sampler), std::move(id_generator),
-                std::move(tracer_configurator));
-}
-
-std::unique_ptr<TracerContext> TracerContextFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler,
-    std::unique_ptr<IdGenerator> id_generator,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator)
-{
-  std::unique_ptr<TracerContext> context(
-      new TracerContext(std::move(processors), resource, std::move(sampler),
-                        std::move(id_generator), std::move(tracer_configurator)));
-  return context;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_provider.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_provider.cc
deleted file mode 100644
index 5d9540662..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_provider.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <algorithm>
-#include <chrono>
-#include <mutex>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-namespace resource  = opentelemetry::sdk::resource;
-namespace trace_api = opentelemetry::trace;
-
-TracerProvider::TracerProvider(std::unique_ptr<TracerContext> context) noexcept
-    : context_(std::move(context))
-{
-  OTEL_INTERNAL_LOG_DEBUG("[TracerProvider] TracerProvider created.");
-}
-
-TracerProvider::TracerProvider(
-    std::unique_ptr<SpanProcessor> processor,
-    const resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler,
-    std::unique_ptr<IdGenerator> id_generator,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>>
-        tracer_configurator) noexcept
-{
-  std::vector<std::unique_ptr<SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  context_ =
-      std::make_shared<TracerContext>(std::move(processors), resource, std::move(sampler),
-                                      std::move(id_generator), std::move(tracer_configurator));
-}
-
-TracerProvider::TracerProvider(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler,
-    std::unique_ptr<IdGenerator> id_generator,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>>
-        tracer_configurator) noexcept
-    : context_(std::make_shared<TracerContext>(std::move(processors),
-                                               resource,
-                                               std::move(sampler),
-                                               std::move(id_generator),
-                                               std::move(tracer_configurator)))
-{}
-
-TracerProvider::~TracerProvider()
-{
-  // Tracer hold the shared pointer to the context. So we can not use destructor of TracerContext to
-  // Shutdown and flush all pending recordables when we have more than one tracer.These recordables
-  // may use the raw pointer of instrumentation_scope_ in Tracer
-  if (context_)
-  {
-    context_->Shutdown();
-  }
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-nostd::shared_ptr<trace_api::Tracer> TracerProvider::GetTracer(
-    nostd::string_view name,
-    nostd::string_view version,
-    nostd::string_view schema_url,
-    const opentelemetry::common::KeyValueIterable *attributes) noexcept
-#else
-nostd::shared_ptr<trace_api::Tracer> TracerProvider::GetTracer(
-    nostd::string_view name,
-    nostd::string_view version,
-    nostd::string_view schema_url) noexcept
-#endif
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-  const opentelemetry::common::KeyValueIterable *attributes = nullptr;
-#endif
-
-  if (name.data() == nullptr)
-  {
-    OTEL_INTERNAL_LOG_ERROR("[TracerProvider::GetTracer] Library name is null.");
-    name = "";
-  }
-  else if (name == "")
-  {
-    OTEL_INTERNAL_LOG_ERROR("[TracerProvider::GetTracer] Library name is empty.");
-  }
-
-  const std::lock_guard<std::mutex> guard(lock_);
-
-  for (auto &tracer : tracers_)
-  {
-    auto &tracer_scope = tracer->GetInstrumentationScope();
-    if (tracer_scope.equal(name, version, schema_url, attributes))
-    {
-      return nostd::shared_ptr<trace_api::Tracer>{tracer};
-    }
-  }
-
-  instrumentationscope::InstrumentationScopeAttributes attrs_map(attributes);
-  auto scope =
-      instrumentationscope::InstrumentationScope::Create(name, version, schema_url, attrs_map);
-
-  auto tracer = std::shared_ptr<Tracer>(new Tracer(context_, std::move(scope)));
-  tracers_.push_back(tracer);
-  return nostd::shared_ptr<trace_api::Tracer>{tracer};
-}
-
-void TracerProvider::AddProcessor(std::unique_ptr<SpanProcessor> processor) noexcept
-{
-  context_->AddProcessor(std::move(processor));
-}
-
-const resource::Resource &TracerProvider::GetResource() const noexcept
-{
-  return context_->GetResource();
-}
-
-bool TracerProvider::Shutdown(std::chrono::microseconds timeout) noexcept
-{
-  return context_->Shutdown(timeout);
-}
-
-bool TracerProvider::ForceFlush(std::chrono::microseconds timeout) noexcept
-{
-  return context_->ForceFlush(timeout);
-}
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_provider_factory.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_provider_factory.cc
deleted file mode 100644
index 49d2aac12..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/trace/tracer_provider_factory.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/random_id_generator_factory.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_on_factory.h"
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::unique_ptr<SpanProcessor> processor)
-{
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  return Create(std::move(processor), resource);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::unique_ptr<SpanProcessor> processor,
-    const opentelemetry::sdk::resource::Resource &resource)
-{
-  auto sampler = AlwaysOnSamplerFactory::Create();
-  return Create(std::move(processor), resource, std::move(sampler));
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::unique_ptr<SpanProcessor> processor,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler)
-{
-  auto id_generator = RandomIdGeneratorFactory::Create();
-  return Create(std::move(processor), resource, std::move(sampler), std::move(id_generator));
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::unique_ptr<SpanProcessor> processor,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler,
-    std::unique_ptr<IdGenerator> id_generator)
-{
-  auto tracer_configurator =
-      std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
-          instrumentationscope::ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Default())
-              .Build());
-  return Create(std::move(processor), resource, std::move(sampler), std::move(id_generator),
-                std::move(tracer_configurator));
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::unique_ptr<SpanProcessor> processor,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler,
-    std::unique_ptr<IdGenerator> id_generator,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator)
-{
-  std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> provider(
-      new opentelemetry::sdk::trace::TracerProvider(std::move(processor), resource,
-                                                    std::move(sampler), std::move(id_generator),
-                                                    std::move(tracer_configurator)));
-  return provider;
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors)
-{
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  return Create(std::move(processors), resource);
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource)
-{
-  auto sampler = AlwaysOnSamplerFactory::Create();
-  return Create(std::move(processors), resource, std::move(sampler));
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler)
-{
-  auto id_generator = RandomIdGeneratorFactory::Create();
-  return Create(std::move(processors), resource, std::move(sampler), std::move(id_generator));
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler,
-    std::unique_ptr<IdGenerator> id_generator)
-{
-  auto tracer_configurator =
-      std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
-          instrumentationscope::ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Default())
-              .Build());
-  return Create(std::move(processors), resource, std::move(sampler), std::move(id_generator),
-                std::move(tracer_configurator));
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-    const opentelemetry::sdk::resource::Resource &resource,
-    std::unique_ptr<Sampler> sampler,
-    std::unique_ptr<IdGenerator> id_generator,
-    std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator)
-{
-  std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> provider(
-      new opentelemetry::sdk::trace::TracerProvider(std::move(processors), resource,
-                                                    std::move(sampler), std::move(id_generator),
-                                                    std::move(tracer_configurator)));
-  return provider;
-}
-
-std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> TracerProviderFactory::Create(
-    std::unique_ptr<TracerContext> context)
-{
-  std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> provider(
-      new opentelemetry::sdk::trace::TracerProvider(std::move(context)));
-  return provider;
-}
-
-}  // namespace trace
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/version/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/src/version/CMakeLists.txt
deleted file mode 100644
index aae7f51cf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/version/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(opentelemetry_version version.cc)
-
-set_target_properties(opentelemetry_version PROPERTIES EXPORT_NAME version)
-set_target_version(opentelemetry_version)
-
-target_link_libraries(opentelemetry_version PUBLIC opentelemetry_api
-                                                   opentelemetry_sdk)
-
-target_include_directories(
-  opentelemetry_version
-  PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/sdk/include>")
-
-if(OPENTELEMETRY_INSTALL)
-  opentelemetry_add_pkgconfig(
-    version "OpenTelemetry SDK - Version"
-    "A library exporting version information for OpenTelemetry."
-    "opentelemetry_api")
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/src/version/version.cc b/ext/opentelemetry-cpp-1.21.0/sdk/src/version/version.cc
deleted file mode 100644
index cb4d83d93..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/src/version/version.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Please DONOT touch this file.
-// Any changes done here would be overwritten by pre-commit git hook
-
-#include "opentelemetry/sdk/version/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace version
-{
-const int major_version    = 1;
-const int minor_version    = 21;
-const int patch_version    = 0;
-const char *pre_release    = "NONE";
-const char *build_metadata = "NONE";
-const char *short_version  = "1.21.0";
-const char *full_version   = "1.21.0-NONE-NONE";
-const char *build_date     = "Wed May 28 08:08:27 PM UTC 2025";
-}  // namespace version
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/test/CMakeLists.txt
deleted file mode 100644
index 33dd07f81..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(common)
-add_subdirectory(trace)
-add_subdirectory(metrics)
-add_subdirectory(logs)
-add_subdirectory(resource)
-add_subdirectory(instrumentationscope)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/BUILD
deleted file mode 100644
index de4c02ec5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/BUILD
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "random_test",
-    srcs = [
-        "random_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//sdk/src/common:random",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "base64_test",
-    srcs = [
-        "base64_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//sdk/src/common:base64",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "fast_random_number_generator_test",
-    srcs = [
-        "fast_random_number_generator_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//sdk/src/common:random",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "base64_benchmark",
-    srcs = ["base64_benchmark.cc"],
-    tags = [
-        "benchmark",
-        "test",
-    ],
-    deps = ["//sdk/src/common:base64"],
-)
-
-otel_cc_benchmark(
-    name = "random_benchmark",
-    srcs = ["random_benchmark.cc"],
-    tags = [
-        "benchmark",
-        "test",
-    ],
-    deps = ["//sdk/src/common:random"],
-)
-
-cc_test(
-    name = "atomic_unique_ptr_test",
-    srcs = [
-        "atomic_unique_ptr_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "circular_buffer_range_test",
-    srcs = [
-        "circular_buffer_range_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "random_fork_test",
-    srcs = [
-        "random_fork_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//sdk/src/common:random",
-    ],
-)
-
-cc_library(
-    name = "baseline_circular_buffer",
-    hdrs = [
-        "baseline_circular_buffer.h",
-    ],
-    include_prefix = "test/common",
-    deps = [
-        "//api",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "circular_buffer_benchmark",
-    srcs = ["circular_buffer_benchmark.cc"],
-    tags = [
-        "benchmark",
-        "test",
-    ],
-    deps = [
-        ":baseline_circular_buffer",
-        "//sdk:headers",
-    ],
-)
-
-cc_test(
-    name = "empty_attributes_test",
-    srcs = [
-        "empty_attributes_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "attribute_utils_test",
-    srcs = [
-        "attribute_utils_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "global_log_handle_test",
-    srcs = [
-        "global_log_handle_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common:global_log_handler",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "global_log_handle_singleton_lifetime_test",
-    srcs = [
-        "global_log_handle_singleton_lifetime_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/common:global_log_handler",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "attributemap_hash_test",
-    srcs = [
-        "attributemap_hash_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "attributemap_hash_benchmark",
-    srcs = ["attributemap_hash_benchmark.cc"],
-    tags = [
-        "benchmark",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-    ],
-)
-
-cc_test(
-    name = "env_var_test",
-    srcs = [
-        "env_var_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//sdk/src/common:env_variables",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/CMakeLists.txt
deleted file mode 100644
index 3228a55f6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(
-  testname
-  random_test
-  fast_random_number_generator_test
-  atomic_unique_ptr_test
-  circular_buffer_range_test
-  circular_buffer_test
-  attribute_utils_test
-  attributemap_hash_test
-  global_log_handle_test
-  global_log_handle_singleton_lifetime_test
-  env_var_test)
-
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(
-    ${testname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_common opentelemetry_trace)
-
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX trace.
-    TEST_LIST ${testname})
-endforeach()
-
-add_executable(base64_test base64_test.cc)
-target_link_libraries(base64_test ${GTEST_BOTH_LIBRARIES} opentelemetry_common)
-gtest_add_tests(
-  TARGET base64_test
-  TEST_PREFIX common.
-  TEST_LIST base64_test)
-
-add_executable(random_fork_test random_fork_test.cc)
-target_link_libraries(random_fork_test opentelemetry_common)
-add_test(random_fork_test random_fork_test)
-
-if(WITH_BENCHMARK)
-  add_executable(base64_benchmark base64_benchmark.cc)
-  target_link_libraries(base64_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common)
-
-  add_executable(random_benchmark random_benchmark.cc)
-  target_link_libraries(random_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common)
-
-  add_executable(circular_buffer_benchmark circular_buffer_benchmark.cc)
-  target_link_libraries(circular_buffer_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common)
-
-  add_executable(attributemap_hash_benchmark attributemap_hash_benchmark.cc)
-  target_link_libraries(attributemap_hash_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/atomic_unique_ptr_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/atomic_unique_ptr_test.cc
deleted file mode 100644
index 035c416a3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/atomic_unique_ptr_test.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/common/atomic_unique_ptr.h"
-
-#include <gtest/gtest.h>
-#include <string>
-
-using opentelemetry::sdk::common::AtomicUniquePtr;
-
-TEST(AtomicUniquePtrTest, SwapIfNullWithNull)
-{
-  AtomicUniquePtr<int> ptr;
-  EXPECT_TRUE(ptr.IsNull());
-
-  std::unique_ptr<int> x{new int{33}};
-  EXPECT_TRUE(ptr.SwapIfNull(x));
-  EXPECT_EQ(x, nullptr);
-}
-
-TEST(AtomicUniquePtrTest, SwapIfNullWithNonNull)
-{
-  AtomicUniquePtr<int> ptr;
-  ptr.Reset(new int{11});
-  std::unique_ptr<int> x{new int{33}};
-  EXPECT_TRUE(!ptr.SwapIfNull(x));
-  EXPECT_NE(x, nullptr);
-  EXPECT_EQ(*x, 33);
-  EXPECT_EQ(*ptr, 11);
-}
-
-TEST(AtomicUniquePtrTest, Swap)
-{
-  AtomicUniquePtr<int> ptr;
-  EXPECT_TRUE(ptr.IsNull());
-
-  ptr.Reset(new int{11});
-  std::unique_ptr<int> x{new int{33}};
-  ptr.Swap(x);
-  EXPECT_FALSE(ptr.IsNull());
-  EXPECT_NE(x, nullptr);
-  EXPECT_EQ(*x, 11);
-  EXPECT_EQ(*ptr, 33);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attribute_utils_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attribute_utils_test.cc
deleted file mode 100644
index 5b5f0ac5c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attribute_utils_test.cc
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <array>
-#include <initializer_list>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-
-TEST(AttributeMapTest, DefaultConstruction)
-{
-  opentelemetry::sdk::common::AttributeMap attribute_map;
-  EXPECT_EQ(attribute_map.GetAttributes().size(), 0);
-}
-
-TEST(OrderedAttributeMapTest, DefaultConstruction)
-{
-  opentelemetry::sdk::common::OrderedAttributeMap attribute_map;
-  EXPECT_EQ(attribute_map.GetAttributes().size(), 0);
-}
-
-TEST(AttributeMapTest, AttributesConstruction)
-{
-  const int kNumAttributes              = 3;
-  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3"};
-  int values[kNumAttributes]            = {15, 24, 37};
-  std::map<std::string, int> attributes = {
-      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
-
-  opentelemetry::common::KeyValueIterableView<std::map<std::string, int>> iterable(attributes);
-  opentelemetry::sdk::common::AttributeMap attribute_map(iterable);
-
-  for (int i = 0; i < kNumAttributes; i++)
-  {
-    EXPECT_EQ(opentelemetry::nostd::get<int>(attribute_map.GetAttributes().at(keys[i])), values[i]);
-  }
-}
-
-TEST(OrderedAttributeMapTest, AttributesConstruction)
-{
-  const int kNumAttributes              = 3;
-  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3"};
-  int values[kNumAttributes]            = {15, 24, 37};
-  std::map<std::string, int> attributes = {
-      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
-
-  opentelemetry::common::KeyValueIterableView<std::map<std::string, int>> iterable(attributes);
-  opentelemetry::sdk::common::OrderedAttributeMap attribute_map(iterable);
-
-  for (int i = 0; i < kNumAttributes; i++)
-  {
-    EXPECT_EQ(opentelemetry::nostd::get<int>(attribute_map.GetAttributes().at(keys[i])), values[i]);
-  }
-}
-
-TEST(AttributeEqualToVisitorTest, AttributeValueEqualTo)
-{
-  namespace sdk   = opentelemetry::sdk::common;
-  namespace api   = opentelemetry::common;
-  namespace nostd = opentelemetry::nostd;
-
-  using AV = api::AttributeValue;
-  using OV = sdk::OwnedAttributeValue;
-
-  sdk::AttributeEqualToVisitor equal_to_visitor;
-
-  // arithmetic types
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{bool(true)}, AV{bool(true)}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{int32_t(22)}, AV{int32_t(22)}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{int64_t(22)}, AV{int64_t(22)}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{uint32_t(22)}, AV{uint32_t(22)}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{uint64_t(22)}, AV{uint64_t(22)}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{double(22.0)}, AV{double(22.0)}));
-
-  // string types
-  EXPECT_TRUE(opentelemetry::nostd::visit(
-      equal_to_visitor, OV{std::string("string to const char*")}, AV{"string to const char*"}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor,
-                                          OV{std::string("string to string_view")},
-                                          AV{nostd::string_view("string to string_view")}));
-
-  // container types
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<bool>{true, false}},
-                                          AV{std::array<const bool, 2>{true, false}}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<uint8_t>{33, 44}},
-                                          AV{std::array<const uint8_t, 2>{33, 44}}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<int32_t>{33, 44}},
-                                          AV{std::array<const int32_t, 2>{33, 44}}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<int64_t>{33, 44}},
-                                          AV{std::array<const int64_t, 2>{33, 44}}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<uint32_t>{33, 44}},
-                                          AV{std::array<const uint32_t, 2>{33, 44}}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<uint64_t>{33, 44}},
-                                          AV{std::array<const uint64_t, 2>{33, 44}}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<double>{33.0, 44.0}},
-                                          AV{std::array<const double, 2>{33.0, 44.0}}));
-  EXPECT_TRUE(opentelemetry::nostd::visit(
-      equal_to_visitor, OV{std::vector<std::string>{"a string", "another string"}},
-      AV{std::array<const nostd::string_view, 2>{"a string", "another string"}}));
-}
-
-TEST(AttributeEqualToVisitorTest, AttributeValueNotEqualTo)
-{
-  namespace sdk   = opentelemetry::sdk::common;
-  namespace api   = opentelemetry::common;
-  namespace nostd = opentelemetry::nostd;
-
-  using AV = api::AttributeValue;
-  using OV = sdk::OwnedAttributeValue;
-
-  sdk::AttributeEqualToVisitor equal_to_visitor;
-
-  // check different values of the same type
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{bool(true)}, AV{bool(false)}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{int32_t(22)}, AV{int32_t(33)}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{int64_t(22)}, AV{int64_t(33)}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{uint32_t(22)}, AV{uint32_t(33)}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{double(22.2)}, AV{double(33.3)}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::string("string one")},
-                                           AV{"another string"}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::string("string one")},
-                                           AV{nostd::string_view("another string")}));
-
-  // check different value types
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{bool(true)}, AV{uint32_t(1)}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{int32_t(22)}, AV{uint32_t(22)}));
-
-  // check containers of different element values
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<bool>{true, false}},
-                                           AV{std::array<const bool, 2>{false, true}}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<int32_t>{22, 33}},
-                                           AV{std::array<const int32_t, 2>{33, 44}}));
-  EXPECT_FALSE(opentelemetry::nostd::visit(
-      equal_to_visitor, OV{std::vector<std::string>{"a string", "another string"}},
-      AV{std::array<const nostd::string_view, 2>{"a string", "a really different string"}}));
-
-  // check containers of different element types
-  EXPECT_FALSE(opentelemetry::nostd::visit(equal_to_visitor, OV{std::vector<int32_t>{22, 33}},
-                                           AV{std::array<const uint32_t, 2>{22, 33}}));
-}
-
-TEST(AttributeMapTest, EqualTo)
-{
-  using Attributes = std::initializer_list<
-      std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue>>;
-
-  // check for case where both are empty
-  Attributes attributes_empty = {};
-  auto kv_iterable_empty =
-      opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes_empty);
-  opentelemetry::sdk::common::AttributeMap attribute_map_empty(kv_iterable_empty);
-  EXPECT_TRUE(attribute_map_empty.EqualTo(kv_iterable_empty));
-
-  // check for equality with a range of attributes and types
-  Attributes attributes  = {{"key0", "some value"}, {"key1", 1}, {"key2", 2.0}, {"key3", true}};
-  auto kv_iterable_match = opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes);
-  opentelemetry::sdk::common::AttributeMap attribute_map(attributes);
-  EXPECT_TRUE(attribute_map.EqualTo(kv_iterable_match));
-
-  // check for several cases where the attributes are different
-  Attributes attributes_different_value = {
-      {"key0", "some value"}, {"key1", 1}, {"key2", 2.0}, {"key3", false}};
-  Attributes attributes_different_type = {
-      {"key0", "some value"}, {"key1", 1.0}, {"key2", 2.0}, {"key3", true}};
-  Attributes attributes_different_size = {{"key0", "some value"}};
-
-  // check for the case where the number of attributes is the same but all keys are different
-  Attributes attributes_different_all = {{"a", "b"}, {"c", "d"}, {"e", 4.0}, {"f", uint8_t(5)}};
-
-  auto kv_iterable_different_value =
-      opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes_different_value);
-  auto kv_iterable_different_type =
-      opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes_different_type);
-  auto kv_iterable_different_size =
-      opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes_different_size);
-  auto kv_iterable_different_all =
-      opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes_different_all);
-
-  EXPECT_FALSE(attribute_map.EqualTo(kv_iterable_different_value));
-  EXPECT_FALSE(attribute_map.EqualTo(kv_iterable_different_type));
-  EXPECT_FALSE(attribute_map.EqualTo(kv_iterable_different_size));
-  EXPECT_FALSE(attribute_map.EqualTo(kv_iterable_different_all));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attributemap_hash_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attributemap_hash_benchmark.cc
deleted file mode 100644
index e0641fb96..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attributemap_hash_benchmark.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/attributemap_hash.h"
-
-using namespace opentelemetry::sdk::common;
-namespace
-{
-void BM_AttributeMapHash(benchmark::State &state)
-{
-  OrderedAttributeMap map1 = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"},  {"k4", "v4"},
-                              {"k5", true}, {"k6", 12},   {"k7", 12.209}};
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(GetHashForAttributeMap(map1));
-  }
-}
-BENCHMARK(BM_AttributeMapHash);
-
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attributemap_hash_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attributemap_hash_test.cc
deleted file mode 100644
index a7a893f2a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/attributemap_hash_test.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/common/attributemap_hash.h"
-#include <gtest/gtest.h>
-
-using namespace opentelemetry::sdk::common;
-TEST(AttributeMapHashTest, BasicTests)
-{
-  {
-    OrderedAttributeMap map1 = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
-    OrderedAttributeMap map2 = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}, {"k4", "v4"}};
-    OrderedAttributeMap map3 = {{"k3", "v3"}, {"k1", "v1"}, {"k2", "v2"}};
-
-    EXPECT_TRUE(GetHashForAttributeMap(map1) != 0);
-    EXPECT_TRUE(GetHashForAttributeMap(map1) == GetHashForAttributeMap(map1));
-    EXPECT_TRUE(GetHashForAttributeMap(map1) != GetHashForAttributeMap(map2));
-    EXPECT_TRUE(GetHashForAttributeMap(map1) == GetHashForAttributeMap(map3));
-  }
-
-  {
-    // hash algo returns same value irrespective of order of attributes.
-    OrderedAttributeMap map1 = {{"k1", 10}, {"k2", true}, {"k3", 12.22}};
-    OrderedAttributeMap map2 = {{"k3", 12.22}, {"k1", 10}, {"k2", true}};
-    EXPECT_TRUE(GetHashForAttributeMap(map1) == GetHashForAttributeMap(map2));
-    EXPECT_TRUE(GetHashForAttributeMap(map1) != 0);
-  }
-
-  {
-    OrderedAttributeMap map1 = {};
-    EXPECT_TRUE(GetHashForAttributeMap(map1) == 0);
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/base64_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/base64_benchmark.cc
deleted file mode 100644
index acb8b01ff..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/base64_benchmark.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <string>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/base64.h"
-
-#include "benchmark/benchmark.h"
-
-namespace
-{
-
-static const unsigned char base64_test_dec[64] = {
-    0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD, 0xBF, 0x17, 0xD9, 0xA2, 0xC4, 0x17, 0x1A, 0x01,
-    0x94, 0xED, 0x8F, 0x1E, 0x11, 0xB3, 0xD7, 0x09, 0x0C, 0xB6, 0xE9, 0x10, 0x6F, 0x22, 0xEE, 0x13,
-    0xCA, 0xB3, 0x07, 0x05, 0x76, 0xC9, 0xFA, 0x31, 0x6C, 0x08, 0x34, 0xFF, 0x8D, 0xC2, 0x6C, 0x38,
-    0x00, 0x43, 0xE9, 0x54, 0x97, 0xAF, 0x50, 0x4B, 0xD1, 0x41, 0xBA, 0x95, 0x31, 0x5A, 0x0B, 0x97};
-
-static const unsigned char base64_test_enc_rfc_2045[] =
-    "JEhuVodiWr2/F9mixBcaAZTtjx4Rs9cJDLbpEG8i7hPK"
-    "swcFdsn6MWwINP+Nwmw4AEPpVJevUEvRQbqVMVoLlw==";
-
-void BM_Base64Escape(benchmark::State &state)
-{
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(
-        opentelemetry::sdk::common::Base64Escape(opentelemetry::nostd::string_view{
-            reinterpret_cast<const char *>(base64_test_dec), sizeof(base64_test_dec)}));
-  }
-}
-BENCHMARK(BM_Base64Escape);
-
-void BM_Base64Unescape(benchmark::State &state)
-{
-  std::string dest;
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(opentelemetry::sdk::common::Base64Unescape(
-        opentelemetry::nostd::string_view{reinterpret_cast<const char *>(base64_test_enc_rfc_2045),
-                                          88},
-        &dest));
-  }
-}
-BENCHMARK(BM_Base64Unescape);
-
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/base64_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/base64_test.cc
deleted file mode 100644
index 74ebe5cf2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/base64_test.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/common/base64.h"
-
-#include <string>
-
-#include <gtest/gtest.h>
-
-static const unsigned char base64_test_dec[64] = {
-    0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD, 0xBF, 0x17, 0xD9, 0xA2, 0xC4, 0x17, 0x1A, 0x01,
-    0x94, 0xED, 0x8F, 0x1E, 0x11, 0xB3, 0xD7, 0x09, 0x0C, 0xB6, 0xE9, 0x10, 0x6F, 0x22, 0xEE, 0x13,
-    0xCA, 0xB3, 0x07, 0x05, 0x76, 0xC9, 0xFA, 0x31, 0x6C, 0x08, 0x34, 0xFF, 0x8D, 0xC2, 0x6C, 0x38,
-    0x00, 0x43, 0xE9, 0x54, 0x97, 0xAF, 0x50, 0x4B, 0xD1, 0x41, 0xBA, 0x95, 0x31, 0x5A, 0x0B, 0x97};
-
-static const unsigned char base64_test_enc_rfc_2045[] =
-    "JEhuVodiWr2/F9mixBcaAZTtjx4Rs9cJDLbpEG8i7hPK"
-    "swcFdsn6MWwINP+Nwmw4AEPpVJevUEvRQbqVMVoLlw==";
-
-TEST(Base64Test, EscapeRfc2045)
-{
-  std::string encoded = opentelemetry::sdk::common::Base64Escape(opentelemetry::nostd::string_view{
-      reinterpret_cast<const char *>(base64_test_dec), sizeof(base64_test_dec)});
-  opentelemetry::nostd::string_view expected{
-      reinterpret_cast<const char *>(base64_test_enc_rfc_2045), 88};
-
-  EXPECT_EQ(encoded, expected);
-}
-
-TEST(Base64Test, UnescapeRfc2045)
-{
-  std::string decoded;
-  EXPECT_TRUE(opentelemetry::sdk::common::Base64Unescape(
-      opentelemetry::nostd::string_view{reinterpret_cast<const char *>(base64_test_enc_rfc_2045),
-                                        88},
-      &decoded));
-  opentelemetry::nostd::string_view expected{reinterpret_cast<const char *>(base64_test_dec),
-                                             sizeof(base64_test_dec)};
-
-  EXPECT_EQ(decoded, expected);
-}
-
-TEST(Base64Test, UnescapeRfc2045InvalidInput)
-{
-  std::string std_str_out;
-  std::string std_str_in = "=";
-
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-
-  std_str_in = "J=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "JEhu=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "JEhuV=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "JEhuVodi=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "JEhuVodiW=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "  J=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "  JEhu=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "  JEhuV=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "  JEhuVodi=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "  JEhuVodiW=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-
-  std_str_in = "JE==";
-  EXPECT_TRUE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "JE==huVo";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = "JE=huVo=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-
-  std_str_in = " JE==";
-  EXPECT_TRUE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = " JE==huVo";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-  std_str_in = " JE=huVo=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-
-  std_str_in = "JE==\r\n";
-  EXPECT_TRUE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-
-  std_str_in = "J E=";
-  EXPECT_FALSE(opentelemetry::sdk::common::Base64Unescape(std_str_in, &std_str_out));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/baseline_circular_buffer.h b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/baseline_circular_buffer.h
deleted file mode 100644
index 398a4d038..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/baseline_circular_buffer.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <vector>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace testing
-{
-/**
- * A locking circular buffer.
- *
- * Used as a baseline in benchmarking.
- */
-template <class T>
-class BaselineCircularBuffer
-{
-public:
-  explicit BaselineCircularBuffer(size_t max_size) : data_{max_size} {}
-
-  /**
-   * Add an element to the circular buffer.
-   * @param element the element to add
-   * @return true if the element was added successfully
-   */
-  bool Add(std::unique_ptr<T> &element) noexcept { return this->Add(std::move(element)); }
-
-  bool Add(std::unique_ptr<T> &&element) noexcept
-  {
-    std::lock_guard<std::mutex> lock_guard{mutex_};
-    if (tail_ + data_.size() == head_)
-    {
-      return false;
-    }
-    data_[head_ % data_.size()] = std::move(element);
-    head_ += 1;
-    return true;
-  }
-
-  /**
-   * Consume elements in the circular buffer.
-   * @param f the callback to call for each element
-   */
-  template <class F>
-  void Consume(F f) noexcept
-  {
-    std::lock_guard<std::mutex> lock_guard{mutex_};
-    if (head_ == tail_)
-    {
-      return;
-    }
-    auto tail_index = tail_ % data_.size();
-    auto head_index = head_ % data_.size();
-    if (tail_index < head_index)
-    {
-      for (auto i = tail_index; i < head_index; ++i)
-      {
-        f(std::move(data_[i]));
-      }
-    }
-    else
-    {
-      for (auto i = tail_index; i < data_.size(); ++i)
-      {
-        f(std::move(data_[i]));
-      }
-      for (auto i = 0ull; i < head_index; ++i)
-      {
-        f(std::move(data_[i]));
-      }
-    }
-    tail_ = head_;
-  }
-
-private:
-  std::mutex mutex_;
-  uint64_t head_{0};
-  uint64_t tail_{0};
-  std::vector<std::unique_ptr<T>> data_;
-};
-}  // namespace testing
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_benchmark.cc
deleted file mode 100644
index 97e2bf2aa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_benchmark.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stddef.h>
-#include <atomic>
-#include <cstdint>
-#include <exception>
-#include <functional>
-#include <iostream>
-#include <memory>
-#include <random>
-#include <thread>
-#include <vector>
-#include "benchmark/benchmark.h"
-
-#include "opentelemetry/sdk/common/atomic_unique_ptr.h"
-#include "opentelemetry/sdk/common/circular_buffer.h"
-#include "opentelemetry/sdk/common/circular_buffer_range.h"
-#include "test/common/baseline_circular_buffer.h"
-
-using opentelemetry::sdk::common::AtomicUniquePtr;
-using opentelemetry::sdk::common::CircularBuffer;
-using opentelemetry::sdk::common::CircularBufferRange;
-using opentelemetry::testing::BaselineCircularBuffer;
-
-const int N = 10000;
-
-static uint64_t ConsumeBufferNumbers(BaselineCircularBuffer<uint64_t> &buffer) noexcept
-{
-  uint64_t result = 0;
-  buffer.Consume([&](std::unique_ptr<uint64_t> &&x) {
-    result += *x;
-    x.reset();
-  });
-  return result;
-}
-
-static uint64_t ConsumeBufferNumbers(CircularBuffer<uint64_t> &buffer) noexcept
-{
-  uint64_t result = 0;
-  buffer.Consume(buffer.size(),
-                 [&](CircularBufferRange<AtomicUniquePtr<uint64_t>> &range) noexcept {
-                   range.ForEach([&](AtomicUniquePtr<uint64_t> &ptr) noexcept {
-                     result += *ptr;
-                     ptr.Reset();
-                     return true;
-                   });
-                 });
-  return result;
-}
-
-template <class Buffer>
-static void GenerateNumbersForThread(Buffer &buffer, int n, std::atomic<uint64_t> &sum) noexcept
-{
-  thread_local std::mt19937_64 random_number_generator{std::random_device{}()};
-  for (int i = 0; i < n; ++i)
-  {
-    auto x = random_number_generator();
-    std::unique_ptr<uint64_t> element{new uint64_t{x}};
-    if (buffer.Add(element))
-    {
-      sum += x;
-    }
-  }
-}
-
-template <class Buffer>
-static uint64_t GenerateNumbers(Buffer &buffer, int num_threads, int n) noexcept
-{
-  std::atomic<uint64_t> sum{0};
-  std::vector<std::thread> threads(num_threads);
-  for (auto &thread : threads)
-  {
-    thread = std::thread{GenerateNumbersForThread<Buffer>, std::ref(buffer), n, std::ref(sum)};
-  }
-  for (auto &thread : threads)
-  {
-    thread.join();
-  }
-  return sum;
-}
-
-template <class Buffer>
-static void ConsumeNumbers(Buffer &buffer, uint64_t &sum, std::atomic<bool> &finished) noexcept
-{
-  while (!finished)
-  {
-    sum += ConsumeBufferNumbers(buffer);
-  }
-  sum += ConsumeBufferNumbers(buffer);
-}
-
-template <class Buffer>
-static void RunSimulation(Buffer &buffer, int num_threads, int n) noexcept
-{
-  std::atomic<bool> finished{false};
-  uint64_t consumer_sum{0};
-  std::thread consumer_thread{ConsumeNumbers<Buffer>, std::ref(buffer), std::ref(consumer_sum),
-                              std::ref(finished)};
-  uint64_t producer_sum = GenerateNumbers(buffer, num_threads, n);
-  finished              = true;
-  consumer_thread.join();
-  if (consumer_sum != producer_sum)
-  {
-    std::cerr << "Sumulation failed: consumer_sum != producer_sum\n";
-    std::terminate();
-  }
-}
-
-static void BM_BaselineBuffer(benchmark::State &state)
-{
-  const size_t max_elements = 500;
-  const int num_threads     = static_cast<int>(state.range(0));
-  const int n               = static_cast<int>(N / num_threads);
-  BaselineCircularBuffer<uint64_t> buffer{max_elements};
-  for (auto _ : state)
-  {
-    RunSimulation(buffer, num_threads, n);
-  }
-}
-
-BENCHMARK(BM_BaselineBuffer)->Arg(1)->Arg(2)->Arg(4);
-
-static void BM_LockFreeBuffer(benchmark::State &state)
-{
-  const size_t max_elements = 500;
-  const int num_threads     = static_cast<int>(state.range(0));
-  const int n               = static_cast<int>(N / num_threads);
-  CircularBuffer<uint64_t> buffer{max_elements};
-  for (auto _ : state)
-  {
-    RunSimulation(buffer, num_threads, n);
-  }
-}
-
-BENCHMARK(BM_LockFreeBuffer)->Arg(1)->Arg(2)->Arg(4);
-
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_range_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_range_test.cc
deleted file mode 100644
index ed2f02897..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_range_test.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/circular_buffer_range.h"
-
-using opentelemetry::sdk::common::CircularBufferRange;
-
-TEST(CircularBufferRangeTest, ForEach)
-{
-  int array1[] = {1, 2, 3, 4};
-  int array2[] = {5, 6, 7};
-  CircularBufferRange<int> range{array1, array2};
-
-  int x = 0;
-  range.ForEach([&](int y) {
-    EXPECT_EQ(++x, y);
-    return true;
-  });
-  EXPECT_EQ(x, 7);
-}
-
-TEST(CircularBufferRangeTest, ForEachWithExit)
-{
-  int array1[] = {1, 2, 3, 4};
-  int array2[] = {5, 6, 7};
-  CircularBufferRange<int> range{array1, array2};
-
-  int x = 0;
-  range.ForEach([&](int y) {
-    EXPECT_EQ(++x, y);
-    return false;
-  });
-  EXPECT_EQ(x, 1);
-
-  x = 0;
-  range.ForEach([&](int y) {
-    EXPECT_EQ(++x, y);
-    return y != 5;
-  });
-  EXPECT_EQ(x, 5);
-}
-
-TEST(CircularBufferRangeTest, Conversion)
-{
-  int array1[] = {1, 2, 3, 4};
-  int array2[] = {5, 6, 7};
-  CircularBufferRange<int> range{array1, array2};
-
-  CircularBufferRange<const int> range2{range};
-  int x = 0;
-  range2.ForEach([&](int y) {
-    EXPECT_EQ(++x, y);
-    return true;
-  });
-  EXPECT_EQ(x, 7);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_test.cc
deleted file mode 100644
index 64075d5a6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/circular_buffer_test.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <algorithm>
-#include <atomic>
-#include <cassert>
-#include <cstdint>
-#include <functional>
-#include <initializer_list>
-#include <memory>
-#include <random>
-#include <string>
-#include <thread>
-#include <vector>
-
-#include "opentelemetry/sdk/common/atomic_unique_ptr.h"
-#include "opentelemetry/sdk/common/circular_buffer.h"
-#include "opentelemetry/sdk/common/circular_buffer_range.h"
-
-using opentelemetry::sdk::common::AtomicUniquePtr;
-using opentelemetry::sdk::common::CircularBuffer;
-using opentelemetry::sdk::common::CircularBufferRange;
-
-static thread_local std::mt19937 RandomNumberGenerator{std::random_device{}()};
-
-static void GenerateRandomNumbers(CircularBuffer<uint32_t> &buffer,
-                                  std::vector<uint32_t> &numbers,
-                                  int n)
-{
-  for (int i = 0; i < n; ++i)
-  {
-    auto value = static_cast<uint32_t>(RandomNumberGenerator());
-    std::unique_ptr<uint32_t> x{new uint32_t{value}};
-    if (buffer.Add(x))
-    {
-      numbers.push_back(value);
-    }
-  }
-}
-
-static void RunNumberProducers(CircularBuffer<uint32_t> &buffer,
-                               std::vector<uint32_t> &numbers,
-                               int num_threads,
-                               int n)
-{
-  std::vector<std::vector<uint32_t>> thread_numbers(num_threads);
-  std::vector<std::thread> threads(num_threads);
-  for (int thread_index = 0; thread_index < num_threads; ++thread_index)
-  {
-    threads[thread_index] = std::thread{GenerateRandomNumbers, std::ref(buffer),
-                                        std::ref(thread_numbers[thread_index]), n};
-  }
-  for (auto &thread : threads)
-  {
-    thread.join();
-  }
-  for (int thread_index = 0; thread_index < num_threads; ++thread_index)
-  {
-    numbers.insert(numbers.end(), thread_numbers[thread_index].begin(),
-                   thread_numbers[thread_index].end());
-  }
-}
-
-void RunNumberConsumer(CircularBuffer<uint32_t> &buffer,
-                       std::atomic<bool> &exit,
-                       std::vector<uint32_t> &numbers)
-{
-  while (true)
-  {
-    if (exit && buffer.Peek().empty())
-    {
-      return;
-    }
-    auto n = std::uniform_int_distribution<size_t>{0, buffer.Peek().size()}(RandomNumberGenerator);
-    buffer.Consume(n, [&](CircularBufferRange<AtomicUniquePtr<uint32_t>> range) noexcept {
-      assert(range.size() == n);
-      range.ForEach([&](AtomicUniquePtr<uint32_t> &ptr) noexcept {
-        assert(!ptr.IsNull());
-        numbers.push_back(*ptr);
-        ptr.Reset();
-        return true;
-      });
-    });
-  }
-}
-
-TEST(CircularBufferTest, Add)
-{
-  CircularBuffer<int> buffer{10};
-
-  std::unique_ptr<int> x{new int{11}};
-  EXPECT_TRUE(buffer.Add(x));
-  EXPECT_EQ(x, nullptr);
-  auto range = buffer.Peek();
-  EXPECT_EQ(range.size(), 1);
-  range.ForEach([](const AtomicUniquePtr<int> &y) {
-    EXPECT_EQ(*y, 11);
-    return true;
-  });
-}
-
-TEST(CircularBufferTest, Clear)
-{
-  CircularBuffer<int> buffer{10};
-
-  std::unique_ptr<int> x{new int{11}};
-  EXPECT_TRUE(buffer.Add(x));
-  EXPECT_EQ(x, nullptr);
-  buffer.Clear();
-  EXPECT_TRUE(buffer.empty());
-}
-
-TEST(CircularBufferTest, AddOnFull)
-{
-  CircularBuffer<int> buffer{10};
-  for (int i = 0; i < static_cast<int>(buffer.max_size()); ++i)
-  {
-    std::unique_ptr<int> x{new int{i}};
-    EXPECT_TRUE(buffer.Add(x));
-  }
-  std::unique_ptr<int> x{new int{33}};
-  EXPECT_FALSE(buffer.Add(x));
-  EXPECT_NE(x, nullptr);
-  EXPECT_EQ(*x, 33);
-}
-
-TEST(CircularBufferTest, Consume)
-{
-  CircularBuffer<int> buffer{10};
-  for (int i = 0; i < static_cast<int>(buffer.max_size()); ++i)
-  {
-    std::unique_ptr<int> x{new int{i}};
-    EXPECT_TRUE(buffer.Add(x));
-  }
-  int count = 0;
-  buffer.Consume(5, [&](CircularBufferRange<AtomicUniquePtr<int>> range) noexcept {
-    range.ForEach([&](AtomicUniquePtr<int> &ptr) {
-      EXPECT_EQ(*ptr, count++);
-      ptr.Reset();
-      return true;
-    });
-  });
-  EXPECT_EQ(count, 5);
-}
-
-TEST(CircularBufferTest, Simulation)
-{
-  const int num_producer_threads = 4;
-  const int n                    = 25000;
-  for (size_t max_size : {1, 2, 10, 50, 100, 1000})
-  {
-    CircularBuffer<uint32_t> buffer{max_size};
-    std::vector<uint32_t> producer_numbers;
-    std::vector<uint32_t> consumer_numbers;
-    auto producers = std::thread{RunNumberProducers, std::ref(buffer), std::ref(producer_numbers),
-                                 num_producer_threads, n};
-    std::atomic<bool> exit{false};
-    auto consumer = std::thread{RunNumberConsumer, std::ref(buffer), std::ref(exit),
-                                std::ref(consumer_numbers)};
-    producers.join();
-    exit = true;
-    consumer.join();
-    std::sort(producer_numbers.begin(), producer_numbers.end());
-    std::sort(consumer_numbers.begin(), consumer_numbers.end());
-
-    EXPECT_EQ(producer_numbers.size(), consumer_numbers.size());
-    EXPECT_EQ(producer_numbers, consumer_numbers);
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/empty_attributes_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/empty_attributes_test.cc
deleted file mode 100644
index 894cafc8a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/empty_attributes_test.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/common/empty_attributes.h"
-
-#include <gtest/gtest.h>
-
-TEST(EmptyAttributesTest, TestSize)
-{
-  EXPECT_EQ(opentelemetry::sdk::GetEmptyAttributes().size(), 0);
-}
-
-// Test that GetEmptyAttributes() always returns the same KeyValueIterableView
-TEST(EmptyAttributesTest, TestMemory)
-{
-  auto attributes1 = opentelemetry::sdk::GetEmptyAttributes();
-  auto attributes2 = opentelemetry::sdk::GetEmptyAttributes();
-  EXPECT_EQ(memcmp(&attributes1, &attributes2, sizeof(attributes1)), 0);  // NOLINT
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/env_var_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/env_var_test.cc
deleted file mode 100644
index b4cc0d2e1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/env_var_test.cc
+++ /dev/null
@@ -1,352 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <chrono>
-#include <cstdint>
-#include <cstdlib>
-#include <string>
-
-#include "opentelemetry/sdk/common/env_variables.h"
-
-#if defined(_MSC_VER)
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#endif
-
-using opentelemetry::sdk::common::GetBoolEnvironmentVariable;
-using opentelemetry::sdk::common::GetDurationEnvironmentVariable;
-using opentelemetry::sdk::common::GetFloatEnvironmentVariable;
-using opentelemetry::sdk::common::GetStringEnvironmentVariable;
-using opentelemetry::sdk::common::GetUintEnvironmentVariable;
-
-#ifndef NO_GETENV
-TEST(EnvVarTest, BoolEnvVar)
-{
-  unsetenv("BOOL_ENV_VAR_NONE");
-  setenv("BOOL_ENV_VAR_EMPTY", "", 1);
-  setenv("BOOL_ENV_VAR_T1", "true", 1);
-  setenv("BOOL_ENV_VAR_T2", "TRUE", 1);
-  setenv("BOOL_ENV_VAR_T3", "TrUe", 1);
-  setenv("BOOL_ENV_VAR_F1", "false", 1);
-  setenv("BOOL_ENV_VAR_F2", "FALSE", 1);
-  setenv("BOOL_ENV_VAR_F3", "FaLsE", 1);
-  setenv("BOOL_ENV_VAR_BROKEN", "Maybe ?", 1);
-
-  bool exists;
-  bool value = true;
-
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_NONE", value);
-  EXPECT_FALSE(exists);
-
-  value  = true;
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_EMPTY", value);
-  EXPECT_FALSE(exists);
-  EXPECT_FALSE(value);
-
-  value  = false;
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_T1", value);
-  EXPECT_TRUE(exists);
-  EXPECT_TRUE(value);
-
-  value  = false;
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_T2", value);
-  EXPECT_TRUE(exists);
-  EXPECT_TRUE(value);
-
-  value  = false;
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_T3", value);
-  EXPECT_TRUE(exists);
-  EXPECT_TRUE(value);
-
-  value  = true;
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_F1", value);
-  EXPECT_TRUE(exists);
-  EXPECT_FALSE(value);
-
-  value  = true;
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_F2", value);
-  EXPECT_TRUE(exists);
-  EXPECT_FALSE(value);
-
-  value  = true;
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_F3", value);
-  EXPECT_TRUE(exists);
-  EXPECT_FALSE(value);
-
-  // This raises a warning, not verifying the warning text.
-  value  = true;
-  exists = GetBoolEnvironmentVariable("BOOL_ENV_VAR_BROKEN", value);
-  EXPECT_TRUE(exists);
-  EXPECT_FALSE(value);
-
-  unsetenv("BOOL_ENV_VAR_EMPTY");
-  unsetenv("BOOL_ENV_VAR_T1");
-  unsetenv("BOOL_ENV_VAR_T2");
-  unsetenv("BOOL_ENV_VAR_T3");
-  unsetenv("BOOL_ENV_VAR_F1");
-  unsetenv("BOOL_ENV_VAR_F2");
-  unsetenv("BOOL_ENV_VAR_F3");
-  unsetenv("BOOL_ENV_VAR_BROKEN");
-}
-
-TEST(EnvVarTest, StringEnvVar)
-{
-  unsetenv("STRING_ENV_VAR_NONE");
-  setenv("STRING_ENV_VAR_EMPTY", "", 1);
-  setenv("STRING_ENV_VAR", "my string", 1);
-
-  bool exists;
-  std::string value;
-
-  exists = GetStringEnvironmentVariable("STRING_ENV_VAR_NONE", value);
-  EXPECT_FALSE(exists);
-
-  exists = GetStringEnvironmentVariable("STRING_ENV_VAR_EMPTY", value);
-  EXPECT_FALSE(exists);
-  EXPECT_EQ(value, "");
-
-  value  = "poison";
-  exists = GetStringEnvironmentVariable("STRING_ENV_VAR", value);
-  EXPECT_TRUE(exists);
-  EXPECT_EQ(value, "my string");
-
-  unsetenv("STRING_ENV_VAR_EMPTY");
-  unsetenv("STRING_ENV_VAR");
-}
-
-TEST(EnvVarTest, DurationEnvVar)
-{
-  unsetenv("DURATION_ENV_VAR_NONE");
-  setenv("DURATION_ENV_VAR_EMPTY", "", 1);
-  setenv("DURATION_ENV_VAR_1", "10ns", 1);
-  setenv("DURATION_ENV_VAR_2", "20us", 1);
-  setenv("DURATION_ENV_VAR_3", "30ms", 1);
-  setenv("DURATION_ENV_VAR_4", "40s", 1);
-  setenv("DURATION_ENV_VAR_5", "50m", 1);
-  setenv("DURATION_ENV_VAR_6", "60h", 1);
-  setenv("DURATION_ENV_VAR_7", "123", 1);
-  setenv("DURATION_ENV_VAR_BROKEN_1", "123 ms", 1);
-  setenv("DURATION_ENV_VAR_BROKEN_2", "1mississippi", 1);
-
-  bool exists;
-  std::chrono::system_clock::duration poison;
-  std::chrono::system_clock::duration value;
-  std::chrono::system_clock::duration expected;
-
-  poison =
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{666});
-
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_NONE", value);
-  EXPECT_FALSE(exists);
-
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_EMPTY", value);
-  EXPECT_FALSE(exists);
-
-  value = poison;
-  expected =
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::nanoseconds{10});
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_1", value);
-  EXPECT_TRUE(exists);
-  EXPECT_EQ(value, expected);
-
-  value    = poison;
-  expected = std::chrono::duration_cast<std::chrono::system_clock::duration>(
-      std::chrono::microseconds{20});
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_2", value);
-  EXPECT_TRUE(exists);
-  EXPECT_EQ(value, expected);
-
-  value    = poison;
-  expected = std::chrono::duration_cast<std::chrono::system_clock::duration>(
-      std::chrono::milliseconds{30});
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_3", value);
-  EXPECT_TRUE(exists);
-  EXPECT_EQ(value, expected);
-
-  value = poison;
-  expected =
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{40});
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_4", value);
-  EXPECT_TRUE(exists);
-  EXPECT_EQ(value, expected);
-
-  value = poison;
-  expected =
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::minutes{50});
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_5", value);
-  EXPECT_TRUE(exists);
-  EXPECT_EQ(value, expected);
-
-  value = poison;
-  expected =
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::hours{60});
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_6", value);
-  EXPECT_TRUE(exists);
-  EXPECT_EQ(value, expected);
-
-  value = poison;
-  // Deviation from the spec: 123 seconds instead of 123 milliseconds
-  expected =
-      std::chrono::duration_cast<std::chrono::system_clock::duration>(std::chrono::seconds{123});
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_7", value);
-  EXPECT_TRUE(exists);
-  EXPECT_EQ(value, expected);
-
-  // This raises a warning, not verifying the warning text.
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_BROKEN_1", value);
-  EXPECT_FALSE(exists);
-
-  // This raises a warning, not verifying the warning text.
-  exists = GetDurationEnvironmentVariable("DURATION_ENV_VAR_BROKEN_2", value);
-  EXPECT_FALSE(exists);
-
-  unsetenv("STRING_ENV_VAR_EMPTY");
-  unsetenv("STRING_ENV_VAR_1");
-  unsetenv("STRING_ENV_VAR_2");
-  unsetenv("STRING_ENV_VAR_3");
-  unsetenv("STRING_ENV_VAR_4");
-  unsetenv("STRING_ENV_VAR_5");
-  unsetenv("STRING_ENV_VAR_6");
-  unsetenv("STRING_ENV_VAR_7");
-  unsetenv("STRING_ENV_VAR_BROKEN_1");
-  unsetenv("STRING_ENV_VAR_BROKEN_2");
-}
-
-TEST(EnvVarTest, UintEnvVar)
-{
-  unsetenv("UINT_ENV_VAR_NONE");
-  setenv("UINT_ENV_VAR_EMPTY", "", 1);
-  setenv("UINT_ENV_VAR_POSITIVE_INT", "42", 1);
-  setenv("UINT_ENV_VAR_NEGATIVE_INT", "-42", 1);
-  setenv("UINT_ENV_VAR_POSITIVE_DEC", "12.34", 1);
-  setenv("UINT_ENV_VAR_NEGATIVE_DEC", "-12.34", 1);
-  setenv("UINT_ENV_VAR_POSITIVE_INT_MAX", "4294967295", 1);
-  setenv("UINT_ENV_VAR_POSITIVE_OVERFLOW", "4294967296", 1);
-  setenv("UINT_ENV_VAR_NEGATIVE_INT_MIN", "-2147483648", 1);
-  setenv("UINT_ENV_VAR_NEGATIVE_OVERFLOW", "-4294967296", 1);
-  setenv("UINT_ENV_VAR_TOO_LARGE_INT", "99999999999999999999", 1);
-  setenv("UINT_ENV_VAR_TOO_LARGE_DEC", "3.9999e+99", 1);
-  setenv("UINT_ENV_VAR_WITH_NOISE", "   \t \n 9.12345678.9", 1);
-  setenv("UINT_ENV_VAR_ONLY_SPACES", "   ", 1);
-
-  std::uint32_t value;
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_NONE", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_EMPTY", value));
-
-  ASSERT_TRUE(GetUintEnvironmentVariable("UINT_ENV_VAR_POSITIVE_INT", value));
-  ASSERT_EQ(42, value);
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_NEGATIVE_INT", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_POSITIVE_DEC", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_NEGATIVE_DEC", value));
-
-  ASSERT_TRUE(GetUintEnvironmentVariable("UINT_ENV_VAR_POSITIVE_INT_MAX", value));
-  ASSERT_EQ(4294967295, value);
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_POSITIVE_OVERFLOW", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_NEGATIVE_INT_MIN", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_NEGATIVE_OVERFLOW", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_TOO_LARGE_INT", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_TOO_LARGE_DEC", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_WITH_NOISE", value));
-
-  ASSERT_FALSE(GetUintEnvironmentVariable("UINT_ENV_VAR_ONLY_SPACES", value));
-
-  unsetenv("UINT_ENV_VAR_EMPTY");
-  unsetenv("UINT_ENV_VAR_POSITIVE_INT");
-  unsetenv("UINT_ENV_VAR_NEGATIVE_INT");
-  unsetenv("UINT_ENV_VAR_POSITIVE_DEC");
-  unsetenv("UINT_ENV_VAR_NEGATIVE_DEC");
-  unsetenv("UINT_ENV_VAR_POSITIVE_INT_MAX");
-  unsetenv("UINT_ENV_VAR_POSITIVE_OVERFLOW");
-  unsetenv("UINT_ENV_VAR_NEGATIVE_INT_MIN");
-  unsetenv("UINT_ENV_VAR_NEGATIVE_OVERFLOW");
-  unsetenv("UINT_ENV_VAR_TOO_LARGE_INT");
-  unsetenv("UINT_ENV_VAR_TOO_LARGE_DEC");
-  unsetenv("UINT_ENV_VAR_WITH_NOISE");
-  unsetenv("UINT_ENV_VAR_ONLY_SPACES");
-}
-
-TEST(EnvVarTest, FloatEnvVar)
-{
-  unsetenv("FLOAT_ENV_VAR_NONE");
-  setenv("FLOAT_ENV_VAR_EMPTY", "", 1);
-  setenv("FLOAT_ENV_VAR_POSITIVE_INT", "42", 1);
-  setenv("FLOAT_ENV_VAR_NEGATIVE_INT", "-42", 1);
-  setenv("FLOAT_ENV_VAR_POSITIVE_DEC", "12.34", 1);
-  setenv("FLOAT_ENV_VAR_NEGATIVE_DEC", "-12.34", 1);
-  setenv("FLOAT_ENV_VAR_POSITIVE_INT_MAX", "4294967295", 1);
-  setenv("FLOAT_ENV_VAR_POSITIVE_OVERFLOW", "4294967296", 1);
-  setenv("FLOAT_ENV_VAR_NEGATIVE_INT_MIN", "-2147483648", 1);
-  setenv("FLOAT_ENV_VAR_NEGATIVE_OVERFLOW", "-4294967296", 1);
-  setenv("FLOAT_ENV_VAR_TOO_LARGE_INT", "99999999999999999999", 1);
-  setenv("FLOAT_ENV_VAR_TOO_LARGE_DEC", "3.9999e+99", 1);
-  setenv("FLOAT_ENV_VAR_WITH_NOISE", "   \t \n 9.12345678.9", 1);
-  setenv("FLOAT_ENV_VAR_ONLY_SPACES", "   ", 1);
-
-  float value;
-
-  ASSERT_FALSE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_NONE", value));
-
-  ASSERT_FALSE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_EMPTY", value));
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_POSITIVE_INT", value));
-  ASSERT_FLOAT_EQ(42.f, value);
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_NEGATIVE_INT", value));
-  ASSERT_FLOAT_EQ(-42.f, value);
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_POSITIVE_DEC", value));
-  ASSERT_FLOAT_EQ(12.34f, value);
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_NEGATIVE_DEC", value));
-  ASSERT_FLOAT_EQ(-12.34f, value);
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_POSITIVE_INT_MAX", value));
-  ASSERT_FLOAT_EQ(4294967295.f, value);
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_POSITIVE_OVERFLOW", value));
-  ASSERT_FLOAT_EQ(4294967296.f, value);
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_NEGATIVE_INT_MIN", value));
-  ASSERT_FLOAT_EQ(-2147483648.f, value);
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_NEGATIVE_OVERFLOW", value));
-  ASSERT_FLOAT_EQ(-4294967296.f, value);
-
-  ASSERT_TRUE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_TOO_LARGE_INT", value));
-  ASSERT_FLOAT_EQ(99999999999999999999.f, value);
-
-  ASSERT_FALSE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_TOO_LARGE_DEC", value));
-
-  ASSERT_FALSE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_WITH_NOISE", value));
-
-  ASSERT_FALSE(GetFloatEnvironmentVariable("FLOAT_ENV_VAR_ONLY_SPACES", value));
-
-  unsetenv("FLOAT_ENV_VAR_EMPTY");
-  unsetenv("FLOAT_ENV_VAR_POSITIVE_INT");
-  unsetenv("FLOAT_ENV_VAR_NEGATIVE_INT");
-  unsetenv("FLOAT_ENV_VAR_POSITIVE_DEC");
-  unsetenv("FLOAT_ENV_VAR_NEGATIVE_DEC");
-  unsetenv("FLOAT_ENV_VAR_POSITIVE_INT_MAX");
-  unsetenv("FLOAT_ENV_VAR_POSITIVE_OVERFLOW");
-  unsetenv("FLOAT_ENV_VAR_NEGATIVE_INT_MIN");
-  unsetenv("FLOAT_ENV_VAR_NEGATIVE_OVERFLOW");
-  unsetenv("FLOAT_ENV_VAR_TOO_LARGE_INT");
-  unsetenv("FLOAT_ENV_VAR_TOO_LARGE_DEC");
-  unsetenv("FLOAT_ENV_VAR_WITH_NOISE");
-  unsetenv("FLOAT_ENV_VAR_ONLY_SPACES");
-}
-
-#endif  // NO_GETENV
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/fast_random_number_generator_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/fast_random_number_generator_test.cc
deleted file mode 100644
index f61ff05fa..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/fast_random_number_generator_test.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstdint>
-#include <random>
-#include <set>
-#include <string>
-#include <utility>
-
-#include "src/common/fast_random_number_generator.h"
-
-using opentelemetry::sdk::common::FastRandomNumberGenerator;
-
-TEST(FastRandomNumberGeneratorTest, GenerateUniqueNumbers)
-{
-  std::seed_seq seed_sequence{1, 2, 3};
-  FastRandomNumberGenerator random_number_generator;
-  random_number_generator.seed(seed_sequence);
-  std::set<uint64_t> values;
-  for (int i = 0; i < 1000; ++i)
-  {
-    EXPECT_TRUE(values.insert(random_number_generator()).second);
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/global_log_handle_singleton_lifetime_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/global_log_handle_singleton_lifetime_test.cc
deleted file mode 100644
index 981e34995..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/global_log_handle_singleton_lifetime_test.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstdlib>
-#include <iostream>
-#include <string>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-class GlobalLogHandlerChecker
-{
-public:
-  GlobalLogHandlerChecker() {}
-  ~GlobalLogHandlerChecker()
-  {
-    using opentelemetry::sdk::common::internal_log::GlobalLogHandler;
-    auto handle = GlobalLogHandler::GetLogHandler();
-    if (handle && custom_handler_destroyed)
-    {
-      OTEL_INTERNAL_LOG_ERROR("GlobalLogHandler should be destroyed here");
-      abort();
-    }
-    std::cout << "GlobalLogHandlerChecker destroyed and check pass.\n";
-  }
-
-  void Print() { std::cout << "GlobalLogHandlerChecker constructed\n"; }
-
-  GlobalLogHandlerChecker(const GlobalLogHandlerChecker &)            = delete;
-  GlobalLogHandlerChecker(GlobalLogHandlerChecker &&)                 = delete;
-  GlobalLogHandlerChecker &operator=(const GlobalLogHandlerChecker &) = delete;
-  GlobalLogHandlerChecker &operator=(GlobalLogHandlerChecker &&)      = delete;
-
-  static bool custom_handler_destroyed;
-};
-bool GlobalLogHandlerChecker::custom_handler_destroyed = false;
-
-namespace
-{
-static GlobalLogHandlerChecker &ConstructChecker()
-{
-  static GlobalLogHandlerChecker checker;
-  return checker;
-}
-}  // namespace
-
-class CustomLogHandler : public opentelemetry::sdk::common::internal_log::LogHandler
-{
-public:
-  ~CustomLogHandler() override
-  {
-    GlobalLogHandlerChecker::custom_handler_destroyed = true;
-    std::cout << "Custom Gobal Log Handle destroyed\n";
-  }
-
-  void Handle(opentelemetry::sdk::common::internal_log::LogLevel level,
-              const char *,
-              int,
-              const char *msg,
-              const opentelemetry::sdk::common::AttributeMap &) noexcept override
-  {
-    if (level == opentelemetry::sdk::common::internal_log::LogLevel::Debug)
-    {
-      std::cout << "Custom Gobal Log Handle[Debug]: " << msg << "\n";
-    }
-    else if (level == opentelemetry::sdk::common::internal_log::LogLevel::Error)
-    {
-      std::cout << "Custom Gobal Log Handle[Error]: " << msg << "\n";
-    }
-    else if (level == opentelemetry::sdk::common::internal_log::LogLevel::Info)
-    {
-      std::cout << "Custom Gobal Log Handle[Info]: " << msg << "\n";
-    }
-    else if (level == opentelemetry::sdk::common::internal_log::LogLevel::Warning)
-    {
-      std::cout << "Custom Gobal Log Handle[Warning]: " << msg << "\n";
-    }
-    ++count;
-  }
-
-  size_t count = 0;
-};
-
-TEST(GlobalLogHandleSingletonTest, Lifetime)
-{
-  // Setup a new static variable which will be destroyed after the global handle
-  ConstructChecker().Print();
-
-  using opentelemetry::sdk::common::internal_log::GlobalLogHandler;
-  using opentelemetry::sdk::common::internal_log::LogHandler;
-
-  auto custom_log_handler = opentelemetry::nostd::shared_ptr<LogHandler>(new CustomLogHandler{});
-  opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogHandler(custom_log_handler);
-  auto before_count = static_cast<CustomLogHandler *>(custom_log_handler.get())->count;
-  opentelemetry::sdk::common::AttributeMap attributes = {
-      {"url", "https://opentelemetry.io/"}, {"content-length", 0}, {"content-type", "text/html"}};
-  OTEL_INTERNAL_LOG_ERROR("Error message");
-  OTEL_INTERNAL_LOG_DEBUG("Debug message. Headers:", attributes);
-  EXPECT_EQ(before_count + 1, static_cast<CustomLogHandler *>(custom_log_handler.get())->count);
-
-  {
-    auto handle = GlobalLogHandler::GetLogHandler();
-    EXPECT_TRUE(!!handle);
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/global_log_handle_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/global_log_handle_test.cc
deleted file mode 100644
index 3c3fc3d7f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/global_log_handle_test.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstring>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-
-class CustomLogHandler : public opentelemetry::sdk::common::internal_log::LogHandler
-{
-public:
-  void Handle(opentelemetry::sdk::common::internal_log::LogLevel level,
-              const char *,
-              int,
-              const char *msg,
-              const opentelemetry::sdk::common::AttributeMap &) noexcept override
-  {
-    if (level == opentelemetry::sdk::common::internal_log::LogLevel::Debug)
-    {
-      EXPECT_EQ(0, strncmp(msg, "Debug message", 13));
-    }
-    else if (level == opentelemetry::sdk::common::internal_log::LogLevel::Error)
-    {
-      EXPECT_EQ(0, strncmp(msg, "Error message", 13));
-    }
-    else if (level == opentelemetry::sdk::common::internal_log::LogLevel::Info)
-    {
-      EXPECT_EQ(0, strncmp(msg, "Info message", 12));
-    }
-    else if (level == opentelemetry::sdk::common::internal_log::LogLevel::Warning)
-    {
-      EXPECT_EQ(0, strncmp(msg, "Warning message", 15));
-    }
-    ++count;
-  }
-
-  size_t count = 0;
-};
-
-TEST(GlobalLogHandleTest, CustomLogHandler)
-{
-  using opentelemetry::sdk::common::internal_log::LogHandler;
-  auto backup_log_handle =
-      opentelemetry::sdk::common::internal_log::GlobalLogHandler::GetLogHandler();
-  auto backup_log_level = opentelemetry::sdk::common::internal_log::GlobalLogHandler::GetLogLevel();
-
-  auto custom_log_handler = opentelemetry::nostd::shared_ptr<LogHandler>(new CustomLogHandler{});
-  opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogHandler(custom_log_handler);
-  auto before_count = static_cast<CustomLogHandler *>(custom_log_handler.get())->count;
-  opentelemetry::sdk::common::AttributeMap attributes = {
-      {"url", "https://opentelemetry.io/"}, {"content-length", 0}, {"content-type", "text/html"}};
-  OTEL_INTERNAL_LOG_ERROR("Error message");
-  OTEL_INTERNAL_LOG_DEBUG("Debug message. Headers:", attributes);
-  EXPECT_EQ(before_count + 1, static_cast<CustomLogHandler *>(custom_log_handler.get())->count);
-
-  opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogLevel(
-      opentelemetry::sdk::common::internal_log::LogLevel::Debug);
-  OTEL_INTERNAL_LOG_ERROR("Error message");
-  OTEL_INTERNAL_LOG_DEBUG("Debug message. Headers:", attributes);
-  OTEL_INTERNAL_LOG_INFO("Info message");
-  OTEL_INTERNAL_LOG_WARN("Warning message");
-  EXPECT_EQ(before_count + 5, static_cast<CustomLogHandler *>(custom_log_handler.get())->count);
-
-  opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogLevel(
-      opentelemetry::sdk::common::internal_log::LogLevel::None);
-  OTEL_INTERNAL_LOG_ERROR("Error message");
-  OTEL_INTERNAL_LOG_DEBUG("Debug message. Headers:", attributes);
-  OTEL_INTERNAL_LOG_INFO("Info message");
-  OTEL_INTERNAL_LOG_WARN("Warning message");
-  EXPECT_EQ(before_count + 5, static_cast<CustomLogHandler *>(custom_log_handler.get())->count);
-
-  opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogHandler(backup_log_handle);
-  opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogLevel(backup_log_level);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_benchmark.cc
deleted file mode 100644
index 46dadbe26..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_benchmark.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <random>
-
-#include "src/common/random.h"
-
-namespace
-{
-using opentelemetry::sdk::common::Random;
-
-void BM_RandomIdGeneration(benchmark::State &state)
-{
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(Random::GenerateRandom64());
-  }
-}
-BENCHMARK(BM_RandomIdGeneration);
-
-void BM_RandomIdStdGeneration(benchmark::State &state)
-{
-  std::mt19937_64 generator{0};
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(generator());
-  }
-}
-BENCHMARK(BM_RandomIdStdGeneration);
-
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_fork_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_fork_test.cc
deleted file mode 100644
index 15f7a43cf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_fork_test.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef __unix__
-// Verifies that IDs don't clash after forking the process.
-//
-// See https://github.com/opentracing-contrib/nginx-opentracing/issues/52
-#  include "src/common/random.h"
-
-#  include <stdint.h>
-#  include <sys/mman.h>
-#  include <sys/wait.h>
-#  include <unistd.h>
-#  include <cstdlib>
-#  include <iostream>
-
-using opentelemetry::sdk::common::Random;
-
-static uint64_t *child_id;
-
-int main()
-{
-  // Set up shared memory to communicate between parent and child processes.
-  //
-  // See https://stackoverflow.com/a/13274800/4447365
-  child_id = static_cast<uint64_t *>(
-      mmap(nullptr, sizeof(*child_id), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0));
-  *child_id = 0;
-  if (fork() == 0)
-  {
-    *child_id = Random::GenerateRandom64();
-    exit(EXIT_SUCCESS);
-  }
-  else
-  {
-    wait(nullptr);
-    auto parent_id     = Random::GenerateRandom64();
-    auto child_id_copy = *child_id;
-    munmap(static_cast<void *>(child_id), sizeof(*child_id));
-    if (parent_id == child_id_copy)
-    {
-      std::cerr << "Child and parent ids are the same value " << parent_id << "\n";
-      return -1;
-    }
-  }
-  return 0;
-}
-#else
-int main()
-{
-  return 0;
-}
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_test.cc
deleted file mode 100644
index 96cf24dd5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/common/random_test.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <atomic>
-#include <cstdint>
-#include <initializer_list>
-#include <iterator>
-#include <string>
-#include <thread>
-#include <vector>
-
-#include "opentelemetry/nostd/span.h"
-#include "src/common/random.h"
-
-using opentelemetry::sdk::common::Random;
-
-TEST(RandomTest, GenerateRandom64)
-{
-  EXPECT_NE(Random::GenerateRandom64(), Random::GenerateRandom64());
-}
-
-TEST(RandomTest, GenerateRandomBuffer)
-{
-  uint8_t buf1_array[8] = {0};
-  uint8_t buf2_array[8] = {0};
-  Random::GenerateRandomBuffer(buf1_array);
-  Random::GenerateRandomBuffer(buf2_array);
-  EXPECT_FALSE(std::equal(std::begin(buf1_array), std::end(buf1_array), std::begin(buf2_array)));
-
-  // Edge cases.
-  for (auto size : {7, 8, 9, 16, 17})
-  {
-    std::vector<uint8_t> buf1_vector(size);
-    std::vector<uint8_t> buf2_vector(size);
-
-    Random::GenerateRandomBuffer(buf1_vector);
-    Random::GenerateRandomBuffer(buf2_vector);
-    EXPECT_FALSE(
-        std::equal(std::begin(buf1_vector), std::end(buf1_vector), std::begin(buf2_vector)));
-  }
-}
-
-void doSomethingOnce(std::atomic_uint *count)
-{
-  static std::atomic_flag flag;
-  if (!flag.test_and_set())
-  {
-    (*count)++;
-  }
-}
-
-TEST(RandomTest, AtomicFlagMultiThreadTest)
-{
-  std::vector<std::thread> threads;
-  std::atomic_uint count(0);
-  threads.reserve(10);
-  for (int i = 0; i < 10; ++i)
-  {
-    threads.push_back(std::thread(doSomethingOnce, &count));
-  }
-  for (auto &t : threads)
-  {
-    t.join();
-  }
-  EXPECT_EQ(1, count.load());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/BUILD
deleted file mode 100644
index 39a61564a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_test(
-    name = "instrumentationscope_test",
-    srcs = [
-        "instrumentationscope_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/CMakeLists.txt
deleted file mode 100644
index 659728300..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include(GoogleTest)
-
-foreach(testname instrumentationscope_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_sdk)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX instrumentationscope.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/instrumentationscope_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/instrumentationscope_test.cc
deleted file mode 100644
index 3d3bf057c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/instrumentationscope/instrumentationscope_test.cc
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <initializer_list>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationlibrary/instrumentation_library.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-
-TEST(InstrumentationScope, CreateInstrumentationScope)
-{
-  std::string library_name    = "opentelemetry-cpp";
-  std::string library_version = "0.1.0";
-  std::string schema_url      = "https://opentelemetry.io/schemas/1.2.0";
-  uint32_t attrubite_value3[] = {7, 8, 9};
-  auto instrumentation_scope  = InstrumentationScope::Create(
-      library_name, library_version, schema_url,
-      {{"attribute-key1", "attribute-value"},
-        {"attribute-key2", static_cast<int32_t>(123)},
-        {"attribute-key3", opentelemetry::nostd::span<uint32_t>(attrubite_value3)}});
-
-  EXPECT_EQ(instrumentation_scope->GetName(), library_name);
-  EXPECT_EQ(instrumentation_scope->GetVersion(), library_version);
-  EXPECT_EQ(instrumentation_scope->GetSchemaURL(), schema_url);
-
-  auto attribute1 = instrumentation_scope->GetAttributes().find("attribute-key1");
-  auto attribute2 = instrumentation_scope->GetAttributes().find("attribute-key2");
-  auto attribute3 = instrumentation_scope->GetAttributes().find("attribute-key3");
-
-  ASSERT_FALSE(attribute1 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::string>(attribute1->second));
-  EXPECT_EQ(opentelemetry::nostd::get<std::string>(attribute1->second), "attribute-value");
-
-  ASSERT_FALSE(attribute2 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int32_t>(attribute2->second));
-  EXPECT_EQ(opentelemetry::nostd::get<int32_t>(attribute2->second), 123);
-
-  ASSERT_FALSE(attribute3 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<uint32_t>>(attribute3->second));
-
-  const std::vector<uint32_t> &attribute3_values =
-      opentelemetry::nostd::get<std::vector<uint32_t>>(attribute3->second);
-  EXPECT_EQ(attribute3_values.size(), 3);
-  for (std::vector<uint32_t>::size_type i = 0; i < 3; ++i)
-  {
-    EXPECT_EQ(attribute3_values[i], attrubite_value3[i]);
-  }
-}
-
-TEST(InstrumentationScope, CreateInstrumentationScopeWithLoopForAttributes)
-{
-  std::string library_name    = "opentelemetry-cpp";
-  std::string library_version = "0.1.0";
-  std::string schema_url      = "https://opentelemetry.io/schemas/1.2.0";
-  uint32_t attrubite_value3[] = {7, 8, 9};
-
-  std::unordered_map<std::string, opentelemetry::common::AttributeValue> attributes = {
-      {"attribute-key1", "attribute-value"},
-      {"attribute-key2", static_cast<int32_t>(123)},
-      {"attribute-key3", opentelemetry::nostd::span<uint32_t>(attrubite_value3)}};
-
-  auto instrumentation_scope =
-      InstrumentationScope::Create(library_name, library_version, schema_url, attributes);
-
-  EXPECT_EQ(instrumentation_scope->GetName(), library_name);
-  EXPECT_EQ(instrumentation_scope->GetVersion(), library_version);
-  EXPECT_EQ(instrumentation_scope->GetSchemaURL(), schema_url);
-
-  auto attribute1 = instrumentation_scope->GetAttributes().find("attribute-key1");
-  auto attribute2 = instrumentation_scope->GetAttributes().find("attribute-key2");
-  auto attribute3 = instrumentation_scope->GetAttributes().find("attribute-key3");
-
-  ASSERT_FALSE(attribute1 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::string>(attribute1->second));
-  EXPECT_EQ(opentelemetry::nostd::get<std::string>(attribute1->second), "attribute-value");
-
-  ASSERT_FALSE(attribute2 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int32_t>(attribute2->second));
-  EXPECT_EQ(opentelemetry::nostd::get<int32_t>(attribute2->second), 123);
-
-  ASSERT_FALSE(attribute3 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<uint32_t>>(attribute3->second));
-  const std::vector<uint32_t> &attribute3_values =
-      opentelemetry::nostd::get<std::vector<uint32_t>>(attribute3->second);
-
-  EXPECT_EQ(attribute3_values.size(), 3);
-  for (std::vector<uint32_t>::size_type i = 0; i < 3; ++i)
-  {
-    EXPECT_EQ(attribute3_values[i], attrubite_value3[i]);
-  }
-}
-
-TEST(InstrumentationScope, CreateInstrumentationScopeWithKeyValueIterableAttributes)
-{
-  std::string library_name    = "opentelemetry-cpp";
-  std::string library_version = "0.1.0";
-  std::string schema_url      = "https://opentelemetry.io/schemas/1.2.0";
-  uint32_t attrubite_value3[] = {7, 8, 9};
-
-  std::unordered_map<std::string, opentelemetry::common::AttributeValue> attributes = {
-      {"attribute-key1", "attribute-value"},
-      {"attribute-key2", static_cast<int32_t>(123)},
-      {"attribute-key3", opentelemetry::nostd::span<uint32_t>(attrubite_value3)}};
-
-  opentelemetry::common::KeyValueIterableView<
-      std::unordered_map<std::string, opentelemetry::common::AttributeValue>>
-      attributes_view{attributes};
-
-  auto instrumentation_scope =
-      InstrumentationScope::Create(library_name, library_version, schema_url, attributes_view);
-
-  EXPECT_EQ(instrumentation_scope->GetName(), library_name);
-  EXPECT_EQ(instrumentation_scope->GetVersion(), library_version);
-  EXPECT_EQ(instrumentation_scope->GetSchemaURL(), schema_url);
-
-  auto attribute1 = instrumentation_scope->GetAttributes().find("attribute-key1");
-  auto attribute2 = instrumentation_scope->GetAttributes().find("attribute-key2");
-  auto attribute3 = instrumentation_scope->GetAttributes().find("attribute-key3");
-
-  ASSERT_FALSE(attribute1 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::string>(attribute1->second));
-  EXPECT_EQ(opentelemetry::nostd::get<std::string>(attribute1->second), "attribute-value");
-
-  ASSERT_FALSE(attribute2 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int32_t>(attribute2->second));
-  EXPECT_EQ(opentelemetry::nostd::get<int32_t>(attribute2->second), 123);
-
-  ASSERT_FALSE(attribute3 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<uint32_t>>(attribute3->second));
-  const std::vector<uint32_t> &attribute3_values =
-      opentelemetry::nostd::get<std::vector<uint32_t>>(attribute3->second);
-
-  EXPECT_EQ(attribute3_values.size(), 3);
-  for (std::vector<uint32_t>::size_type i = 0; i < 3; ++i)
-  {
-    EXPECT_EQ(attribute3_values[i], attrubite_value3[i]);
-  }
-}
-
-TEST(InstrumentationScope, SetAttribute)
-{
-  std::string library_name    = "opentelemetry-cpp";
-  std::string library_version = "0.1.0";
-  std::string schema_url      = "https://opentelemetry.io/schemas/1.2.0";
-  uint32_t attrubite_value3[] = {7, 8, 9};
-  auto instrumentation_scope =
-      InstrumentationScope::Create(library_name, library_version, schema_url);
-
-  EXPECT_EQ(instrumentation_scope->GetName(), library_name);
-  EXPECT_EQ(instrumentation_scope->GetVersion(), library_version);
-  EXPECT_EQ(instrumentation_scope->GetSchemaURL(), schema_url);
-  EXPECT_EQ(instrumentation_scope->GetAttributes().size(), 0);
-
-  instrumentation_scope->SetAttribute("attribute-key1", "attribute-value");
-  instrumentation_scope->SetAttribute("attribute-key2", static_cast<int32_t>(123));
-  instrumentation_scope->SetAttribute("attribute-key3",
-                                      opentelemetry::nostd::span<uint32_t>(attrubite_value3));
-  EXPECT_EQ(instrumentation_scope->GetAttributes().size(), 3);
-
-  auto attribute1 = instrumentation_scope->GetAttributes().find("attribute-key1");
-  auto attribute2 = instrumentation_scope->GetAttributes().find("attribute-key2");
-  auto attribute3 = instrumentation_scope->GetAttributes().find("attribute-key3");
-
-  ASSERT_FALSE(attribute1 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::string>(attribute1->second));
-  EXPECT_EQ(opentelemetry::nostd::get<std::string>(attribute1->second), "attribute-value");
-
-  ASSERT_FALSE(attribute2 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int32_t>(attribute2->second));
-  EXPECT_EQ(opentelemetry::nostd::get<int32_t>(attribute2->second), 123);
-
-  ASSERT_FALSE(attribute3 == instrumentation_scope->GetAttributes().end());
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<uint32_t>>(attribute3->second));
-
-  const std::vector<uint32_t> &attribute3_values =
-      opentelemetry::nostd::get<std::vector<uint32_t>>(attribute3->second);
-  EXPECT_EQ(attribute3_values.size(), 3);
-  for (std::vector<uint32_t>::size_type i = 0; i < 3; ++i)
-  {
-    EXPECT_EQ(attribute3_values[i], attrubite_value3[i]);
-  }
-}
-
-TEST(InstrumentationScope, LegacyInstrumentationLibrary)
-{
-
-  std::string library_name    = "opentelemetry-cpp";
-  std::string library_version = "0.1.0";
-  std::string schema_url      = "https://opentelemetry.io/schemas/1.2.0";
-  auto instrumentation_library =
-      opentelemetry::sdk::instrumentationlibrary::InstrumentationLibrary::Create(
-          library_name, library_version, schema_url);
-
-  EXPECT_EQ(instrumentation_library->GetName(), library_name);
-  EXPECT_EQ(instrumentation_library->GetVersion(), library_version);
-  EXPECT_EQ(instrumentation_library->GetSchemaURL(), schema_url);
-}
-
-TEST(InstrumentationScope, Equal)
-{
-  using Attributes = std::initializer_list<
-      std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue>>;
-  Attributes attributes_empty = {};
-  Attributes attributes_match = {
-      {"key0", "some value"}, {"key1", 1}, {"key2", 2.0}, {"key3", true}};
-  Attributes attributes_different = {{"key42", "some other"}};
-
-  auto kv_iterable_empty =
-      opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes_empty);
-  auto kv_iterable_match =
-      opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes_match);
-  auto kv_iterable_different =
-      opentelemetry::common::MakeKeyValueIterableView<Attributes>(attributes_different);
-
-  // try with no attributes added to the instrumentation scope
-  auto instrumentation_scope =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name", "library_version", "schema_url");
-
-  // the instrumentation scope is equal if all parameters are equal (must handle nullptr attributes
-  // or empty attributes)
-  EXPECT_TRUE(instrumentation_scope->equal("library_name", "library_version", "schema_url"));
-  EXPECT_TRUE(
-      instrumentation_scope->equal("library_name", "library_version", "schema_url", nullptr));
-  EXPECT_TRUE(instrumentation_scope->equal("library_name", "library_version", "schema_url",
-                                           &kv_iterable_empty));
-
-  // the instrumentation scope is not equal if any parameter is different
-  EXPECT_FALSE(instrumentation_scope->equal("library_name", ""));
-  EXPECT_FALSE(instrumentation_scope->equal("library_name", "library_version", ""));
-  EXPECT_FALSE(instrumentation_scope->equal("library_name", "library_version", "schema_url",
-                                            &kv_iterable_different));
-
-  // try with attributes added to the instrumentation scope
-  auto instrumentation_scope_w_attributes =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name", "library_version", "schema_url", attributes_match);
-
-  // the instrumentation scope is equal if all parameters including all attribute keys, types, and
-  // values are equal
-  EXPECT_TRUE(instrumentation_scope_w_attributes->equal("library_name", "library_version",
-                                                        "schema_url", &kv_iterable_match));
-  EXPECT_FALSE(instrumentation_scope_w_attributes->equal("library_name", "library_version",
-                                                         "schema_url", nullptr));
-  EXPECT_FALSE(instrumentation_scope_w_attributes->equal("library_name", "library_version",
-                                                         "schema_url", &kv_iterable_empty));
-  EXPECT_FALSE(instrumentation_scope_w_attributes->equal("library_name", "library_version",
-                                                         "schema_url", &kv_iterable_different));
-}
-
-TEST(InstrumentationScope, OperatorEqual)
-{
-  using Attributes = std::initializer_list<
-      std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue>>;
-  Attributes attributes_empty = {};
-  Attributes attributes_match = {
-      {"key0", "some value"}, {"key1", 1}, {"key2", 2.0}, {"key3", true}};
-  Attributes attributes_different = {{"key42", "some other"}};
-
-  auto instrumentation_scope_1a =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name", "library_version", "schema_url");
-
-  auto instrumentation_scope_1b =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name", "library_version", "schema_url");
-
-  auto instrumentation_scope_2a =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name_2", "library_version", "schema_url");
-
-  auto instrumentation_scope_2b =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name_2", "library_version", "schema_url", attributes_empty);
-
-  auto instrumentation_scope_3a =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name_2", "library_version", "schema_url", attributes_match);
-
-  auto instrumentation_scope_3b =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name_2", "library_version", "schema_url", attributes_match);
-
-  auto instrumentation_scope_4 =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
-          "library_name_2", "library_version", "schema_url", attributes_different);
-
-  EXPECT_EQ(*instrumentation_scope_1a, *instrumentation_scope_1b);
-  EXPECT_FALSE(*instrumentation_scope_1a == *instrumentation_scope_2a);
-  EXPECT_EQ(*instrumentation_scope_2a, *instrumentation_scope_2b);
-  EXPECT_EQ(*instrumentation_scope_3a, *instrumentation_scope_3b);
-  EXPECT_FALSE(*instrumentation_scope_3a == *instrumentation_scope_4);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/BUILD
deleted file mode 100644
index 26c837ea8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/BUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_test(
-    name = "logger_provider_sdk_test",
-    srcs = [
-        "logger_provider_sdk_test.cc",
-    ],
-    tags = [
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "//sdk/src/logs",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "logger_provider_set_test",
-    srcs = [
-        "logger_provider_set_test.cc",
-    ],
-    tags = [
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "//sdk/src/logs",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "logger_sdk_test",
-    srcs = [
-        "logger_sdk_test.cc",
-    ],
-    tags = [
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//sdk/src/logs",
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "simple_log_record_processor_test",
-    srcs = [
-        "simple_log_record_processor_test.cc",
-    ],
-    tags = [
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//sdk/src/logs",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "log_record_test",
-    srcs = [
-        "log_record_test.cc",
-    ],
-    tags = [
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//sdk/src/logs",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "batch_log_record_processor_test",
-    srcs = [
-        "batch_log_record_processor_test.cc",
-    ],
-    tags = [
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//sdk/src/logs",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "logger_config_test",
-    srcs = [
-        "logger_config_test.cc",
-    ],
-    tags = [
-        "logs",
-        "test",
-    ],
-    deps = [
-        "//sdk/src/logs",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/CMakeLists.txt
deleted file mode 100644
index 8ef79df68..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(
-  testname
-  logger_provider_set_test
-  logger_provider_sdk_test
-  logger_sdk_test
-  log_record_test
-  simple_log_record_processor_test
-  batch_log_record_processor_test
-  logger_config_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(
-    ${testname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_logs opentelemetry_trace)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX logs.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/batch_log_record_processor_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/batch_log_record_processor_test.cc
deleted file mode 100644
index 8ff6f1fd1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/batch_log_record_processor_test.cc
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <atomic>
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/logs/batch_log_record_processor.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-
-using namespace opentelemetry::sdk::logs;
-using namespace opentelemetry::sdk::common;
-
-namespace nostd = opentelemetry::nostd;
-
-class MockLogRecordable final : public opentelemetry::sdk::logs::Recordable
-{
-public:
-  void SetTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}
-
-  void SetObservedTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}
-
-  void SetSeverity(opentelemetry::logs::Severity) noexcept override {}
-
-  nostd::string_view GetBody() const noexcept { return body_; }
-
-  void SetBody(const opentelemetry::common::AttributeValue &message) noexcept override
-  {
-    if (nostd::holds_alternative<const char *>(message))
-    {
-      body_ = nostd::get<const char *>(message);
-    }
-    else if (nostd::holds_alternative<nostd::string_view>(message))
-    {
-      body_ = static_cast<std::string>(nostd::get<nostd::string_view>(message));
-    }
-  }
-
-  void SetBody(const std::string &message) noexcept { body_ = message; }
-
-  void SetEventId(int64_t, nostd::string_view) noexcept override {}
-
-  void SetTraceId(const opentelemetry::trace::TraceId &) noexcept override {}
-
-  void SetSpanId(const opentelemetry::trace::SpanId &) noexcept override {}
-
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &) noexcept override {}
-
-  void SetAttribute(nostd::string_view,
-                    const opentelemetry::common::AttributeValue &) noexcept override
-  {}
-
-  void SetResource(const opentelemetry::sdk::resource::Resource &) noexcept override {}
-
-  void SetInstrumentationScope(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &) noexcept override
-  {}
-
-private:
-  std::string body_;
-};
-
-/**
- * A sample log exporter
- * for testing the batch log processor
- */
-class MockLogExporter final : public LogRecordExporter
-{
-public:
-  MockLogExporter(std::shared_ptr<std::vector<std::unique_ptr<MockLogRecordable>>> logs_received,
-                  std::shared_ptr<std::atomic<std::size_t>> force_flush_counter,
-                  std::shared_ptr<std::atomic<bool>> is_shutdown,
-                  std::shared_ptr<std::atomic<bool>> is_export_completed,
-                  const std::chrono::milliseconds export_delay = std::chrono::milliseconds(0))
-      : logs_received_(std::move(logs_received)),
-        force_flush_counter_(std::move(force_flush_counter)),
-        is_shutdown_(std::move(is_shutdown)),
-        is_export_completed_(std::move(is_export_completed)),
-        export_delay_(export_delay)
-  {}
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<Recordable>(new MockLogRecordable());
-  }
-
-  // Export method stores the logs received into a shared list of record names
-  ExportResult Export(
-      const opentelemetry::nostd::span<std::unique_ptr<Recordable>> &records) noexcept override
-  {
-    *is_export_completed_ = false;  // Meant exclusively to test scheduled_delay_millis
-
-    for (auto &record : records)
-    {
-      auto log =
-          std::unique_ptr<MockLogRecordable>(static_cast<MockLogRecordable *>(record.release()));
-      if (log != nullptr)
-      {
-        logs_received_->push_back(std::move(log));
-      }
-    }
-
-    if (export_delay_ > std::chrono::milliseconds::zero())
-    {
-      std::this_thread::sleep_for(export_delay_);
-    }
-
-    *is_export_completed_ = true;
-    return ExportResult::kSuccess;
-  }
-
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    ++(*force_flush_counter_);
-    return true;
-  }
-
-  // toggles the boolean flag marking this exporter as shut down
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    *is_shutdown_ = true;
-    return true;
-  }
-
-private:
-  std::shared_ptr<std::vector<std::unique_ptr<MockLogRecordable>>> logs_received_;
-  std::shared_ptr<std::atomic<std::size_t>> force_flush_counter_;
-  std::shared_ptr<std::atomic<bool>> is_shutdown_;
-  std::shared_ptr<std::atomic<bool>> is_export_completed_;
-  const std::chrono::milliseconds export_delay_;
-};
-
-/**
- * A fixture class for testing the BatchLogRecordProcessor class that uses the TestExporter defined
- * above.
- */
-class BatchLogRecordProcessorTest : public testing::Test  // ::testing::Test
-{
-public:
-  // returns a batch log processor that received a batch of log records, a shared pointer to a
-  // is_shutdown flag, and the processor configuration options (default if unspecified)
-  std::shared_ptr<LogRecordProcessor> GetMockProcessor(
-      std::shared_ptr<std::vector<std::unique_ptr<MockLogRecordable>>> logs_received,
-      std::shared_ptr<std::atomic<std::size_t>> force_flush_counter,
-      std::shared_ptr<std::atomic<bool>> is_shutdown,
-      std::shared_ptr<std::atomic<bool>> is_export_completed =
-          std::shared_ptr<std::atomic<bool>>(new std::atomic<bool>(false)),
-      const std::chrono::milliseconds export_delay           = std::chrono::milliseconds(0),
-      const std::chrono::milliseconds scheduled_delay_millis = std::chrono::milliseconds(5000),
-      const size_t max_queue_size                            = 2048,
-      const size_t max_export_batch_size                     = 512)
-  {
-    return std::shared_ptr<LogRecordProcessor>(new BatchLogRecordProcessor(
-        std::unique_ptr<LogRecordExporter>(new MockLogExporter(
-            std::move(logs_received), std::move(force_flush_counter), std::move(is_shutdown),
-            std::move(is_export_completed), export_delay)),
-        max_queue_size, scheduled_delay_millis, max_export_batch_size));
-  }
-};
-
-TEST_F(BatchLogRecordProcessorTest, TestShutdown)
-{
-  // initialize a batch log processor with the test exporter
-  std::shared_ptr<std::vector<std::unique_ptr<MockLogRecordable>>> logs_received(
-      new std::vector<std::unique_ptr<MockLogRecordable>>);
-  std::shared_ptr<std::atomic<std::size_t>> force_flush_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-
-  auto batch_processor = GetMockProcessor(logs_received, force_flush_counter, is_shutdown);
-
-  // Create a few test log records and send them to the processor
-  const int num_logs = 3;
-
-  for (int i = 0; i < num_logs; ++i)
-  {
-    auto log = batch_processor->MakeRecordable();
-    static_cast<MockLogRecordable *>(log.get())->SetBody("Log" + std::to_string(i));
-    batch_processor->OnEmit(std::move(log));
-  }
-
-  // Test that shutting down the processor will first wait for the
-  // current batch of logs to be sent to the log exporter
-  // by checking the number of logs sent and the names of the logs sent
-  EXPECT_EQ(true, batch_processor->Shutdown());
-  // It's safe to shutdown again
-  EXPECT_TRUE(batch_processor->Shutdown());
-
-  EXPECT_EQ(num_logs, logs_received->size());
-
-  // Assume logs are received by exporter in same order as sent by processor
-  for (int i = 0; i < num_logs; ++i)
-  {
-    EXPECT_EQ("Log" + std::to_string(i), logs_received->at(i)->GetBody());
-  }
-
-  // Also check that the processor is shut down at the end
-  EXPECT_TRUE(is_shutdown->load());
-}
-
-TEST_F(BatchLogRecordProcessorTest, TestForceFlush)
-{
-  std::shared_ptr<std::atomic<std::size_t>> force_flush_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<MockLogRecordable>>> logs_received(
-      new std::vector<std::unique_ptr<MockLogRecordable>>);
-
-  auto batch_processor = GetMockProcessor(logs_received, force_flush_counter, is_shutdown);
-  const int num_logs   = 2048;
-
-  for (int i = 0; i < num_logs; ++i)
-  {
-    auto log = batch_processor->MakeRecordable();
-    static_cast<MockLogRecordable *>(log.get())->SetBody("Log" + std::to_string(i));
-    batch_processor->OnEmit(std::move(log));
-  }
-
-  EXPECT_TRUE(batch_processor->ForceFlush());
-  EXPECT_GT(force_flush_counter->load(), 0);
-
-  EXPECT_EQ(num_logs, logs_received->size());
-  for (int i = 0; i < num_logs; ++i)
-  {
-    EXPECT_EQ("Log" + std::to_string(i), logs_received->at(i)->GetBody());
-  }
-
-  // Create some more logs to make sure that the processor still works
-  for (int i = 0; i < num_logs; ++i)
-  {
-    auto log = batch_processor->MakeRecordable();
-    static_cast<MockLogRecordable *>(log.get())->SetBody("Log" + std::to_string(i));
-    batch_processor->OnEmit(std::move(log));
-  }
-
-  std::size_t force_flush_counter_before = force_flush_counter->load();
-  EXPECT_TRUE(batch_processor->ForceFlush());
-  EXPECT_GT(force_flush_counter->load(), force_flush_counter_before);
-
-  EXPECT_EQ(num_logs * 2, logs_received->size());
-  for (int i = 0; i < num_logs * 2; ++i)
-  {
-    EXPECT_EQ("Log" + std::to_string(i % num_logs), logs_received->at(i)->GetBody());
-  }
-}
-
-TEST_F(BatchLogRecordProcessorTest, TestManyLogsLoss)
-{
-  /* Test that when exporting more than max_queue_size logs, some are most likely lost*/
-
-  std::shared_ptr<std::atomic<std::size_t>> force_flush_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<MockLogRecordable>>> logs_received(
-      new std::vector<std::unique_ptr<MockLogRecordable>>);
-
-  const int max_queue_size = 4096;
-
-  auto batch_processor = GetMockProcessor(logs_received, force_flush_counter, is_shutdown);
-
-  // Create max_queue_size log records
-  for (int i = 0; i < max_queue_size; ++i)
-  {
-    auto log = batch_processor->MakeRecordable();
-    static_cast<MockLogRecordable *>(log.get())->SetBody("Log" + std::to_string(i));
-    batch_processor->OnEmit(std::move(log));
-  }
-
-  EXPECT_TRUE(batch_processor->ForceFlush());
-
-  // Log should be exported by now
-  EXPECT_GE(max_queue_size, logs_received->size());
-}
-
-TEST_F(BatchLogRecordProcessorTest, TestManyLogsLossLess)
-{
-  /* Test that no logs are lost when sending max_queue_size logs */
-
-  std::shared_ptr<std::atomic<std::size_t>> force_flush_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<MockLogRecordable>>> logs_received(
-      new std::vector<std::unique_ptr<MockLogRecordable>>);
-  auto batch_processor = GetMockProcessor(logs_received, force_flush_counter, is_shutdown);
-
-  const int num_logs = 2048;
-
-  for (int i = 0; i < num_logs; ++i)
-  {
-    auto log = batch_processor->MakeRecordable();
-    static_cast<MockLogRecordable *>(log.get())->SetBody("Log" + std::to_string(i));
-    batch_processor->OnEmit(std::move(log));
-  }
-
-  EXPECT_TRUE(batch_processor->ForceFlush());
-
-  EXPECT_EQ(num_logs, logs_received->size());
-  for (int i = 0; i < num_logs; ++i)
-  {
-    EXPECT_EQ("Log" + std::to_string(i), logs_received->at(i)->GetBody());
-  }
-}
-
-TEST_F(BatchLogRecordProcessorTest, TestScheduledDelayMillis)
-{
-  /* Test that max_export_batch_size logs are exported every scheduled_delay_millis
-     seconds */
-
-  std::shared_ptr<std::atomic<std::size_t>> force_flush_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::atomic<bool>> is_export_completed(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<MockLogRecordable>>> logs_received(
-      new std::vector<std::unique_ptr<MockLogRecordable>>);
-
-  const std::chrono::milliseconds export_delay(0);
-  const std::chrono::milliseconds scheduled_delay_millis(2000);
-  const size_t max_export_batch_size = 512;
-
-  auto batch_processor =
-      GetMockProcessor(logs_received, force_flush_counter, is_shutdown, is_export_completed,
-                       export_delay, scheduled_delay_millis);
-
-  for (std::size_t i = 0; i < max_export_batch_size; ++i)
-  {
-    auto log = batch_processor->MakeRecordable();
-    static_cast<MockLogRecordable *>(log.get())->SetBody("Log" + std::to_string(i));
-    batch_processor->OnEmit(std::move(log));
-  }
-  // Sleep for scheduled_delay_millis milliseconds
-  std::this_thread::sleep_for(scheduled_delay_millis);
-
-  // small delay to give time to export, which is being performed
-  // asynchronously by the worker thread (this thread will not
-  // forcibly join() the main thread unless processor's shutdown() is called).
-  std::this_thread::sleep_for(std::chrono::milliseconds(200));
-
-  // Logs should be exported by now
-  EXPECT_TRUE(is_export_completed->load());
-  EXPECT_EQ(max_export_batch_size, logs_received->size());
-  for (size_t i = 0; i < max_export_batch_size; ++i)
-  {
-    EXPECT_EQ("Log" + std::to_string(i), logs_received->at(i)->GetBody());
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/log_record_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/log_record_test.cc
deleted file mode 100644
index 48d075406..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/log_record_test.cc
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <chrono>
-#include <cstdlib>
-#include <initializer_list>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/logs/read_write_log_record.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-
-using opentelemetry::sdk::logs::ReadWriteLogRecord;
-namespace trace_api = opentelemetry::trace;
-namespace logs_api  = opentelemetry::logs;
-namespace nostd     = opentelemetry::nostd;
-
-// Test what a default ReadWriteLogRecord with no fields set holds
-TEST(ReadWriteLogRecord, GetDefaultValues)
-{
-  trace_api::TraceId zero_trace_id;
-  trace_api::SpanId zero_span_id;
-  trace_api::TraceFlags zero_trace_flags;
-  ReadWriteLogRecord record;
-
-  ASSERT_EQ(record.GetSeverity(), logs_api::Severity::kInvalid);
-  ASSERT_NE(record.GetResource().GetAttributes().size(), 0);
-  ASSERT_EQ(record.GetAttributes().size(), 0);
-  ASSERT_EQ(record.GetTraceId(), zero_trace_id);
-  ASSERT_EQ(record.GetSpanId(), zero_span_id);
-  ASSERT_EQ(record.GetTraceFlags(), zero_trace_flags);
-  ASSERT_EQ(record.GetTimestamp().time_since_epoch(), std::chrono::nanoseconds(0));
-}
-
-// Test ReadWriteLogRecord fields are properly set and get
-TEST(ReadWriteLogRecord, SetAndGet)
-{
-  trace_api::TraceId trace_id;
-  trace_api::SpanId span_id;
-  trace_api::TraceFlags trace_flags;
-  opentelemetry::common::SystemTimestamp now(std::chrono::system_clock::now());
-
-  // Set most fields of the ReadWriteLogRecord
-  ReadWriteLogRecord record;
-  auto resource = opentelemetry::sdk::resource::Resource::Create({{"res1", true}});
-  record.SetSeverity(logs_api::Severity::kInvalid);
-  record.SetBody("Message");
-  record.SetResource(resource);
-  record.SetAttribute("attr1", static_cast<int64_t>(314159));
-  record.SetTraceId(trace_id);
-  record.SetSpanId(span_id);
-  record.SetTraceFlags(trace_flags);
-  record.SetTimestamp(now);
-
-  // Test that all fields match what was set
-  ASSERT_EQ(record.GetSeverity(), logs_api::Severity::kInvalid);
-  if (nostd::holds_alternative<std::string>(record.GetBody()))
-  {
-    ASSERT_EQ(std::string(nostd::get<std::string>(record.GetBody())), "Message");
-  }
-  ASSERT_TRUE(nostd::get<bool>(record.GetResource().GetAttributes().at("res1")));
-  ASSERT_EQ(nostd::get<int64_t>(record.GetAttributes().at("attr1")), 314159);
-  ASSERT_EQ(record.GetTraceId(), trace_id);
-  ASSERT_EQ(record.GetSpanId(), span_id);
-  ASSERT_EQ(record.GetTraceFlags(), trace_flags);
-  ASSERT_EQ(record.GetTimestamp().time_since_epoch(), now.time_since_epoch());
-}
-
-// Define a basic Logger class
-class TestBodyLogger : public opentelemetry::logs::Logger
-{
-public:
-  const nostd::string_view GetName() noexcept override { return "test body logger"; }
-
-  nostd::unique_ptr<opentelemetry::logs::LogRecord> CreateLogRecord() noexcept override
-  {
-    return nostd::unique_ptr<opentelemetry::logs::LogRecord>(new ReadWriteLogRecord());
-  }
-
-  using opentelemetry::logs::Logger::EmitLogRecord;
-
-  void EmitLogRecord(nostd::unique_ptr<opentelemetry::logs::LogRecord> &&record) noexcept override
-  {
-    if (record)
-    {
-      last_body_ = static_cast<ReadWriteLogRecord *>(record.get())->GetBody();
-    }
-  }
-
-  const opentelemetry::sdk::common::OwnedAttributeValue &GetLastLogRecord() const noexcept
-  {
-    return last_body_;
-  }
-
-private:
-  opentelemetry::sdk::common::OwnedAttributeValue last_body_;
-};
-
-// Define a basic LoggerProvider class that returns an instance of the logger class defined above
-class TestBodyProvider : public opentelemetry::logs::LoggerProvider
-{
-public:
-  using opentelemetry::logs::LoggerProvider::GetLogger;
-
-  nostd::shared_ptr<opentelemetry::logs::Logger> GetLogger(
-      nostd::string_view /* logger_name */,
-      nostd::string_view /* library_name */,
-      nostd::string_view /* library_version */,
-      nostd::string_view /* schema_url */,
-      const opentelemetry::common::KeyValueIterable & /* attributes */) override
-  {
-    return nostd::shared_ptr<opentelemetry::logs::Logger>(new TestBodyLogger());
-  }
-};
-
-TEST(LogBody, BodyConversation)
-{
-  // Push the new loggerprovider class into the global singleton
-  TestBodyProvider lp;
-
-  // Check that the implementation was pushed by calling TestLogger's GetName()
-  nostd::string_view schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = lp.GetLogger("TestBodyProvider", "opentelelemtry_library", "", schema_url, {});
-
-  auto real_logger = static_cast<TestBodyLogger *>(logger.get());
-
-  real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, true);
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<bool>(real_logger->GetLastLogRecord()));
-  ASSERT_TRUE(opentelemetry::nostd::get<bool>(real_logger->GetLastLogRecord()));
-
-  real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, static_cast<int32_t>(123));
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int32_t>(real_logger->GetLastLogRecord()));
-  ASSERT_EQ(123, opentelemetry::nostd::get<int32_t>(real_logger->GetLastLogRecord()));
-
-  real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, static_cast<uint32_t>(124));
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<uint32_t>(real_logger->GetLastLogRecord()));
-  ASSERT_EQ(124, opentelemetry::nostd::get<uint32_t>(real_logger->GetLastLogRecord()));
-
-  real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, static_cast<int64_t>(125));
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int64_t>(real_logger->GetLastLogRecord()));
-  ASSERT_EQ(125, opentelemetry::nostd::get<int64_t>(real_logger->GetLastLogRecord()));
-
-  real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, static_cast<uint64_t>(126));
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<uint64_t>(real_logger->GetLastLogRecord()));
-  ASSERT_EQ(126, opentelemetry::nostd::get<uint64_t>(real_logger->GetLastLogRecord()));
-
-  real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, static_cast<double>(127.0));
-  ASSERT_TRUE(opentelemetry::nostd::holds_alternative<double>(real_logger->GetLastLogRecord()));
-  ASSERT_TRUE(std::abs(127.0 - opentelemetry::nostd::get<double>(real_logger->GetLastLogRecord())) <
-              0.0001);
-
-  real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, "128");
-  ASSERT_TRUE(
-      opentelemetry::nostd::holds_alternative<std::string>(real_logger->GetLastLogRecord()));
-  ASSERT_EQ(nostd::string_view{"128"},
-            opentelemetry::nostd::get<std::string>(real_logger->GetLastLogRecord()));
-
-  {
-    bool data[]                       = {true, false, true};
-    nostd::span<const bool> data_span = data;
-    real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, data_span);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<bool>>(
-        real_logger->GetLastLogRecord()));
-
-    std::vector<bool> output =
-        opentelemetry::nostd::get<std::vector<bool>>(real_logger->GetLastLogRecord());
-
-    ASSERT_EQ(data_span.size(), output.size());
-
-    for (size_t i = 0; i < data_span.size(); ++i)
-    {
-      ASSERT_EQ(data_span[i], output[i]);
-    }
-  }
-
-  {
-    int32_t data[]                       = {221, 222, 223};
-    nostd::span<const int32_t> data_span = data;
-    real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, data_span);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<int32_t>>(
-        real_logger->GetLastLogRecord()));
-
-    nostd::span<const int32_t> output =
-        opentelemetry::nostd::get<std::vector<int32_t>>(real_logger->GetLastLogRecord());
-
-    ASSERT_EQ(data_span.size(), output.size());
-
-    for (size_t i = 0; i < data_span.size(); ++i)
-    {
-      ASSERT_EQ(data_span[i], output[i]);
-    }
-  }
-
-  {
-    uint32_t data[]                       = {231, 232, 233};
-    nostd::span<const uint32_t> data_span = data;
-    real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, data_span);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<uint32_t>>(
-        real_logger->GetLastLogRecord()));
-
-    std::vector<uint32_t> output =
-        opentelemetry::nostd::get<std::vector<uint32_t>>(real_logger->GetLastLogRecord());
-
-    ASSERT_EQ(data_span.size(), output.size());
-
-    for (size_t i = 0; i < data_span.size(); ++i)
-    {
-      ASSERT_EQ(data_span[i], output[i]);
-    }
-  }
-
-  {
-    int64_t data[]                       = {241, 242, 243};
-    nostd::span<const int64_t> data_span = data;
-    real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, data_span);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<int64_t>>(
-        real_logger->GetLastLogRecord()));
-
-    std::vector<int64_t> output =
-        opentelemetry::nostd::get<std::vector<int64_t>>(real_logger->GetLastLogRecord());
-
-    ASSERT_EQ(data_span.size(), output.size());
-
-    for (size_t i = 0; i < data_span.size(); ++i)
-    {
-      ASSERT_EQ(data_span[i], output[i]);
-    }
-  }
-
-  {
-    uint64_t data[]                       = {251, 252, 253};
-    nostd::span<const uint64_t> data_span = data;
-    real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, data_span);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<uint64_t>>(
-        real_logger->GetLastLogRecord()));
-
-    std::vector<uint64_t> output =
-        opentelemetry::nostd::get<std::vector<uint64_t>>(real_logger->GetLastLogRecord());
-
-    ASSERT_EQ(data_span.size(), output.size());
-
-    for (size_t i = 0; i < data_span.size(); ++i)
-    {
-      ASSERT_EQ(data_span[i], output[i]);
-    }
-  }
-
-  {
-    uint8_t data[]                       = {161, 162, 163};
-    nostd::span<const uint8_t> data_span = data;
-    real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, data_span);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<uint8_t>>(
-        real_logger->GetLastLogRecord()));
-
-    std::vector<uint8_t> output =
-        opentelemetry::nostd::get<std::vector<uint8_t>>(real_logger->GetLastLogRecord());
-
-    ASSERT_EQ(data_span.size(), output.size());
-
-    for (size_t i = 0; i < data_span.size(); ++i)
-    {
-      ASSERT_EQ(data_span[i], output[i]);
-    }
-  }
-
-  {
-    double data[]                       = {271.0, 272.0, 273.0};
-    nostd::span<const double> data_span = data;
-    real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, data_span);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<double>>(
-        real_logger->GetLastLogRecord()));
-
-    std::vector<double> output =
-        opentelemetry::nostd::get<std::vector<double>>(real_logger->GetLastLogRecord());
-
-    ASSERT_EQ(data_span.size(), output.size());
-
-    for (size_t i = 0; i < data_span.size(); ++i)
-    {
-      ASSERT_TRUE(std::abs(data_span[i] - output[i]) < 0.0001);
-    }
-  }
-
-  {
-    std::string data_origin[] = {"281", "282", "283"};
-    nostd::string_view data[] = {data_origin[0], data_origin[1], data_origin[2]};
-    nostd::span<const nostd::string_view> data_span = data;
-    real_logger->EmitLogRecord(opentelemetry::logs::Severity::kInfo, data_span);
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::vector<std::string>>(
-        real_logger->GetLastLogRecord()));
-
-    std::vector<std::string> output =
-        opentelemetry::nostd::get<std::vector<std::string>>(real_logger->GetLastLogRecord());
-
-    ASSERT_EQ(data_span.size(), output.size());
-
-    for (size_t i = 0; i < data_span.size(); ++i)
-    {
-      ASSERT_EQ(data_span[i], output[i]);
-    }
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_config_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_config_test.cc
deleted file mode 100644
index f9fd21ac5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_config_test.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/logs/logger_config.h"
-#include <gtest/gtest.h>
-#include <array>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-
-namespace logs_sdk              = opentelemetry::sdk::logs;
-namespace instrumentation_scope = opentelemetry::sdk::instrumentationscope;
-
-/** Test to verify the basic behavior of logs_sdk::LoggerConfig */
-
-TEST(LoggerConfig, CheckDisabledWorksAsExpected)
-{
-  logs_sdk::LoggerConfig disabled_config = logs_sdk::LoggerConfig::Disabled();
-  ASSERT_FALSE(disabled_config.IsEnabled());
-}
-
-TEST(LoggerConfig, CheckEnabledWorksAsExpected)
-{
-  logs_sdk::LoggerConfig enabled_config = logs_sdk::LoggerConfig::Enabled();
-  ASSERT_TRUE(enabled_config.IsEnabled());
-}
-
-TEST(LoggerConfig, CheckDefaultConfigWorksAccToSpec)
-{
-  logs_sdk::LoggerConfig default_config = logs_sdk::LoggerConfig::Default();
-  ASSERT_TRUE(default_config.IsEnabled());
-}
-
-/** Tests to verify the behavior of logs_sdk::LoggerConfig::Default */
-
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr1 = {
-    "accept_single_attr", true};
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr2 = {
-    "accept_second_attr", "some other attr"};
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr3 = {
-    "accept_third_attr", 3};
-
-static instrumentation_scope::InstrumentationScope test_scope_1 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_1");
-static instrumentation_scope::InstrumentationScope test_scope_2 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_2", "1.0");
-static instrumentation_scope::InstrumentationScope test_scope_3 =
-    *instrumentation_scope::InstrumentationScope::Create(
-        "test_scope_3",
-        "0",
-        "https://opentelemetry.io/schemas/v1.18.0");
-static instrumentation_scope::InstrumentationScope test_scope_4 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_4",
-                                                         "0",
-                                                         "https://opentelemetry.io/schemas/v1.18.0",
-                                                         {attr1});
-static instrumentation_scope::InstrumentationScope test_scope_5 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_5",
-                                                         "0",
-                                                         "https://opentelemetry.io/schemas/v1.18.0",
-                                                         {attr1, attr2, attr3});
-
-// This array could also directly contain the reference types, but that  leads to 'uninitialized
-// value was created by heap allocation' errors in Valgrind memcheck. This is a bug in Googletest
-// library, see https://github.com/google/googletest/issues/3805#issuecomment-1397301790 for more
-// details. Using pointers is a workaround to prevent the Valgrind warnings.
-const std::array<instrumentation_scope::InstrumentationScope *, 5> instrumentation_scopes = {
-    &test_scope_1, &test_scope_2, &test_scope_3, &test_scope_4, &test_scope_5,
-};
-
-// Test fixture for VerifyDefaultConfiguratorBehavior
-class DefaultLoggerConfiguratorTestFixture
-    : public ::testing::TestWithParam<instrumentation_scope::InstrumentationScope *>
-{};
-
-// verifies that the default configurator always returns the default meter config
-TEST_P(DefaultLoggerConfiguratorTestFixture, VerifyDefaultConfiguratorBehavior)
-{
-  instrumentation_scope::InstrumentationScope *scope = GetParam();
-  instrumentation_scope::ScopeConfigurator<logs_sdk::LoggerConfig> default_configurator =
-      instrumentation_scope::ScopeConfigurator<logs_sdk::LoggerConfig>::Builder(
-          logs_sdk::LoggerConfig::Default())
-          .Build();
-
-  ASSERT_EQ(default_configurator.ComputeConfig(*scope), logs_sdk::LoggerConfig::Default());
-}
-
-INSTANTIATE_TEST_SUITE_P(InstrumentationScopes,
-                         DefaultLoggerConfiguratorTestFixture,
-                         ::testing::ValuesIn(instrumentation_scopes));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_provider_sdk_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_provider_sdk_test.cc
deleted file mode 100644
index 9a20fb13d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_provider_sdk_test.cc
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <chrono>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/logs/event_logger_provider.h"
-#include "opentelemetry/sdk/logs/event_logger_provider_factory.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/logger.h"
-#include "opentelemetry/sdk/logs/logger_context.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/provider.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-
-using namespace opentelemetry::sdk::logs;
-namespace logs_api = opentelemetry::logs;
-namespace logs_sdk = opentelemetry::sdk::logs;
-namespace nostd    = opentelemetry::nostd;
-
-TEST(LoggerProviderSDK, PushToAPI)
-{
-  auto lp =
-      nostd::shared_ptr<logs_api::LoggerProvider>(new opentelemetry::sdk::logs::LoggerProvider());
-  logs_sdk::Provider::SetLoggerProvider(lp);
-
-  // Check that the loggerprovider was correctly pushed into the API
-  ASSERT_EQ(lp, logs_api::Provider::GetLoggerProvider());
-}
-
-TEST(LoggerProviderSDK, LoggerProviderGetLoggerSimple)
-{
-  auto lp = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider());
-
-  nostd::string_view schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger1 = lp->GetLogger("logger1", "opentelelemtry_library", "", schema_url);
-  auto logger2 = lp->GetLogger("logger2", "", "", schema_url);
-
-  // Check that the logger is not nullptr
-  ASSERT_NE(logger1, nullptr);
-  ASSERT_NE(logger2, nullptr);
-
-  auto sdk_logger1 = static_cast<opentelemetry::sdk::logs::Logger *>(logger1.get());
-  auto sdk_logger2 = static_cast<opentelemetry::sdk::logs::Logger *>(logger2.get());
-  ASSERT_EQ(sdk_logger1->GetInstrumentationScope().GetName(), "opentelelemtry_library");
-  ASSERT_EQ(sdk_logger1->GetInstrumentationScope().GetVersion(), "");
-  ASSERT_EQ(sdk_logger1->GetInstrumentationScope().GetSchemaURL(), schema_url);
-
-  ASSERT_EQ(sdk_logger2->GetInstrumentationScope().GetName(), "logger2");
-  ASSERT_EQ(sdk_logger2->GetInstrumentationScope().GetVersion(), "");
-  ASSERT_EQ(sdk_logger2->GetInstrumentationScope().GetSchemaURL(), schema_url);
-
-  // Check that two loggers with different names aren't the same instance
-  ASSERT_NE(logger1, logger2);
-
-  // Check that two loggers with the same name are the same instance
-  auto logger3 = lp->GetLogger("logger1", "opentelelemtry_library", "", schema_url);
-  ASSERT_EQ(logger1, logger3);
-  auto sdk_logger3 = static_cast<opentelemetry::sdk::logs::Logger *>(logger3.get());
-  ASSERT_EQ(sdk_logger3->GetInstrumentationScope(), sdk_logger1->GetInstrumentationScope());
-}
-
-TEST(LoggerProviderSDK, LoggerProviderLoggerArguments)
-{
-  auto lp = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider());
-
-  nostd::string_view schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger1 = lp->GetLogger("logger1", "opentelelemtry_library", "", schema_url);
-
-  auto logger2     = lp->GetLogger("logger2", "opentelelemtry_library", "", schema_url);
-  auto sdk_logger1 = static_cast<opentelemetry::sdk::logs::Logger *>(logger1.get());
-  auto sdk_logger2 = static_cast<opentelemetry::sdk::logs::Logger *>(logger2.get());
-  ASSERT_EQ(sdk_logger2->GetInstrumentationScope(), sdk_logger1->GetInstrumentationScope());
-
-  auto logger3 = lp->GetLogger("logger3", "opentelelemtry_library", "", schema_url,
-                               {{"scope_key1", "scope_value"}, {"scope_key2", 2}});
-
-  auto sdk_logger3 = static_cast<opentelemetry::sdk::logs::Logger *>(logger3.get());
-  EXPECT_EQ(sdk_logger3->GetInstrumentationScope().GetAttributes().size(), 2);
-  {
-    auto attibute = sdk_logger3->GetInstrumentationScope().GetAttributes().find("scope_key1");
-    ASSERT_FALSE(attibute == sdk_logger3->GetInstrumentationScope().GetAttributes().end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::string>(attibute->second));
-    EXPECT_EQ(opentelemetry::nostd::get<std::string>(attibute->second), "scope_value");
-  }
-
-  std::unordered_map<std::string, std::string> scope_attributes = {{"scope_key", "scope_value"}};
-  auto logger4 =
-      lp->GetLogger("logger4", "opentelelemtry_library", "", schema_url, scope_attributes);
-  auto sdk_logger4 = static_cast<opentelemetry::sdk::logs::Logger *>(logger4.get());
-
-  EXPECT_EQ(sdk_logger4->GetInstrumentationScope().GetAttributes().size(), 1);
-  {
-    auto attibute = sdk_logger4->GetInstrumentationScope().GetAttributes().find("scope_key");
-    ASSERT_FALSE(attibute == sdk_logger4->GetInstrumentationScope().GetAttributes().end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::string>(attibute->second));
-    EXPECT_EQ(opentelemetry::nostd::get<std::string>(attibute->second), "scope_value");
-  }
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-TEST(LoggerProviderSDK, EventLoggerProviderFactory)
-{
-  auto elp = opentelemetry::sdk::logs::EventLoggerProviderFactory::Create();
-  auto lp  = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider());
-
-  nostd::string_view schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger1 = lp->GetLogger("logger1", "opentelelemtry_library", "", schema_url);
-
-  auto event_logger = elp->CreateEventLogger(logger1, "otel-cpp.test");
-}
-#endif
-
-TEST(LoggerProviderSDK, LoggerEqualityCheck)
-{
-  auto lp = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider());
-  nostd::string_view schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-
-  auto logger1 = lp->GetLogger("logger1", "opentelelemtry_library", "", schema_url);
-  auto logger2 = lp->GetLogger("logger1", "opentelelemtry_library", "", schema_url);
-  EXPECT_EQ(logger1, logger2);
-
-  auto logger3         = lp->GetLogger("logger3");
-  auto another_logger3 = lp->GetLogger("logger3");
-  EXPECT_EQ(logger3, another_logger3);
-
-  auto logger4         = lp->GetLogger("logger4", "opentelelemtry_library", "1.0.0", schema_url);
-  auto another_logger4 = lp->GetLogger("logger4", "opentelelemtry_library", "1.0.0", schema_url);
-  EXPECT_EQ(logger4, another_logger4);
-
-  auto logger5 =
-      lp->GetLogger("logger5", "opentelelemtry_library", "1.0.0", schema_url, {{"key", "value"}});
-  auto another_logger5 =
-      lp->GetLogger("logger5", "opentelelemtry_library", "1.0.0", schema_url, {{"key", "value"}});
-  EXPECT_EQ(logger5, another_logger5);
-}
-
-TEST(LoggerProviderSDK, GetLoggerInequalityCheck)
-{
-  auto lp               = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider());
-  auto logger_library_1 = lp->GetLogger("logger1", "library_1");
-  auto logger_library_2 = lp->GetLogger("logger1", "library_2");
-  auto logger_version_1 = lp->GetLogger("logger1", "library_1", "1.0.0");
-  auto logger_version_2 = lp->GetLogger("logger1", "library_1", "2.0.0");
-  auto logger_url_1     = lp->GetLogger("logger1", "library_1", "1.0.0", "url_1");
-  auto logger_url_2     = lp->GetLogger("logger1", "library_1", "1.0.0", "url_2");
-  auto logger_attribute_1 =
-      lp->GetLogger("logger1", "library_1", "1.0.0", "url_1", {{"key", "one"}});
-  auto logger_attribute_2 =
-      lp->GetLogger("logger1", "library_1", "1.0.0", "url_1", {{"key", "two"}});
-
-  // different scope names should return distinct loggers
-  EXPECT_NE(logger_library_1, logger_library_2);
-
-  // different scope versions should return distinct loggers
-  EXPECT_NE(logger_version_1, logger_library_1);
-  EXPECT_NE(logger_version_1, logger_version_2);
-
-  // different scope schema urls should return distinct loggers
-  EXPECT_NE(logger_url_1, logger_library_1);
-  EXPECT_NE(logger_url_1, logger_version_1);
-  EXPECT_NE(logger_url_1, logger_url_2);
-
-  // different scope attributes should return distinct loggers
-  EXPECT_NE(logger_attribute_1, logger_library_1);
-  EXPECT_NE(logger_attribute_1, logger_url_1);
-  EXPECT_NE(logger_attribute_1, logger_attribute_2);
-}
-
-class DummyLogRecordable final : public opentelemetry::sdk::logs::Recordable
-{
-public:
-  void SetTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}
-
-  void SetObservedTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}
-
-  void SetSeverity(opentelemetry::logs::Severity) noexcept override {}
-
-  void SetBody(const opentelemetry::common::AttributeValue &) noexcept override {}
-
-  void SetEventId(int64_t, nostd::string_view) noexcept override {}
-
-  void SetTraceId(const opentelemetry::trace::TraceId &) noexcept override {}
-
-  void SetSpanId(const opentelemetry::trace::SpanId &) noexcept override {}
-
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &) noexcept override {}
-
-  void SetAttribute(nostd::string_view,
-                    const opentelemetry::common::AttributeValue &) noexcept override
-  {}
-
-  void SetResource(const opentelemetry::sdk::resource::Resource &) noexcept override {}
-
-  void SetInstrumentationScope(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &) noexcept override
-  {}
-};
-
-class DummyProcessor : public LogRecordProcessor
-{
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<Recordable>(new DummyLogRecordable());
-  }
-
-  void OnEmit(std::unique_ptr<Recordable> && /* record */) noexcept override {}
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return true; }
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override { return true; }
-};
-
-TEST(LoggerProviderSDK, GetResource)
-{
-  // Create a LoggerProvider without a processor
-  auto resource = opentelemetry::sdk::resource::Resource::Create({{"key", "value"}});
-  LoggerProvider lp{nullptr, resource};
-  ASSERT_EQ(nostd::get<std::string>(lp.GetResource().GetAttributes().at("key")), "value");
-}
-
-TEST(LoggerProviderSDK, Shutdown)
-{
-  std::unique_ptr<SimpleLogRecordProcessor> processor(new SimpleLogRecordProcessor(nullptr));
-  SimpleLogRecordProcessor *processor_ptr = processor.get();
-  std::vector<std::unique_ptr<LogRecordProcessor>> processors;
-  processors.push_back(std::move(processor));
-
-  std::unique_ptr<LoggerContext> context(new LoggerContext(std::move(processors)));
-  LoggerProvider lp(std::move(context));
-
-  EXPECT_TRUE(lp.Shutdown());
-  EXPECT_TRUE(processor_ptr->IsShutdown());
-
-  // It's safe to shutdown again
-  EXPECT_TRUE(lp.Shutdown());
-}
-
-TEST(LoggerProviderSDK, ForceFlush)
-{
-  std::unique_ptr<SimpleLogRecordProcessor> processor(new SimpleLogRecordProcessor(nullptr));
-  std::vector<std::unique_ptr<LogRecordProcessor>> processors;
-  processors.push_back(std::move(processor));
-
-  std::unique_ptr<LoggerContext> context(new LoggerContext(std::move(processors)));
-  LoggerProvider lp(std::move(context));
-
-  EXPECT_TRUE(lp.ForceFlush());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_provider_set_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_provider_set_test.cc
deleted file mode 100644
index 01ac0ee0e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_provider_set_test.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdlib.h>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/logs/event_logger.h"  // IWYU pragma: keep
-#include "opentelemetry/logs/event_logger_provider.h"
-#include "opentelemetry/logs/logger.h"  // IWYU pragma: keep
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/logs/provider.h"
-
-#if defined(_MSC_VER)
-#  include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-using opentelemetry::logs::EventLogger;
-using opentelemetry::logs::EventLoggerProvider;
-#endif
-using opentelemetry::logs::Logger;
-using opentelemetry::logs::LoggerProvider;
-using opentelemetry::logs::Provider;
-using opentelemetry::nostd::shared_ptr;
-
-namespace nostd    = opentelemetry::nostd;
-namespace logs_api = opentelemetry::logs;
-namespace logs_sdk = opentelemetry::sdk::logs;
-
-class TestProvider : public LoggerProvider
-{
-  nostd::shared_ptr<Logger> GetLogger(
-      nostd::string_view /* logger_name */,
-      nostd::string_view /* library_name */,
-      nostd::string_view /* library_version */,
-      nostd::string_view /* schema_url */,
-      const opentelemetry::common::KeyValueIterable & /* attributes */) override
-  {
-    return shared_ptr<Logger>(nullptr);
-  }
-};
-
-TEST(Provider, SetLoggerProviderDefault)
-{
-#ifndef NO_GETENV
-  unsetenv("OTEL_SDK_DISABLED");
-#endif
-
-  auto tf = shared_ptr<LoggerProvider>(new TestProvider());
-  logs_sdk::Provider::SetLoggerProvider(tf);
-  ASSERT_EQ(tf, logs_api::Provider::GetLoggerProvider());
-}
-
-#ifndef NO_GETENV
-TEST(Provider, SetLoggerProviderEnabled)
-{
-  setenv("OTEL_SDK_DISABLED", "false", 1);
-
-  auto tf = shared_ptr<LoggerProvider>(new TestProvider());
-  logs_sdk::Provider::SetLoggerProvider(tf);
-  ASSERT_EQ(tf, logs_api::Provider::GetLoggerProvider());
-
-  unsetenv("OTEL_SDK_DISABLED");
-}
-
-TEST(Provider, SetLoggerProviderDisabled)
-{
-  setenv("OTEL_SDK_DISABLED", "true", 1);
-
-  auto tf = shared_ptr<LoggerProvider>(new TestProvider());
-  logs_sdk::Provider::SetLoggerProvider(tf);
-  ASSERT_NE(tf, logs_api::Provider::GetLoggerProvider());
-
-  unsetenv("OTEL_SDK_DISABLED");
-}
-#endif
-
-TEST(Provider, MultipleLoggerProviders)
-{
-  auto tf = shared_ptr<LoggerProvider>(new TestProvider());
-  logs_sdk::Provider::SetLoggerProvider(tf);
-  auto tf2 = shared_ptr<LoggerProvider>(new TestProvider());
-  logs_sdk::Provider::SetLoggerProvider(tf2);
-
-  ASSERT_NE(logs_api::Provider::GetLoggerProvider(), tf);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_sdk_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_sdk_test.cc
deleted file mode 100644
index b4bdf2f42..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/logger_sdk_test.cc
+++ /dev/null
@@ -1,546 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <algorithm>
-#include <array>
-#include <chrono>
-#include <functional>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/event_logger.h"
-#include "opentelemetry/logs/event_logger_provider.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/logs/noop.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/logs/event_logger_provider.h"
-#include "opentelemetry/sdk/logs/logger.h"
-#include "opentelemetry/sdk/logs/logger_config.h"
-#include "opentelemetry/sdk/logs/logger_provider.h"
-#include "opentelemetry/sdk/logs/processor.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer.h"
-
-using namespace opentelemetry::sdk::logs;
-using namespace opentelemetry::sdk::instrumentationscope;
-namespace logs_api = opentelemetry::logs;
-namespace nostd    = opentelemetry::nostd;
-
-TEST(LoggerSDK, LogToNullProcessor)
-{
-  // Confirm Logger::EmitLogRecord() does not have undefined behavior
-  // even when there is no processor set
-  // since it calls Processor::OnEmit()
-
-  auto lp = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider());
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = lp->GetLogger("logger", "opentelelemtry_library", "", schema_url);
-
-  auto sdk_logger = static_cast<opentelemetry::sdk::logs::Logger *>(logger.get());
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetName(), "opentelelemtry_library");
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetVersion(), "");
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetSchemaURL(), schema_url);
-  // Log a sample log record to a nullptr processor
-  logger->Debug("Test log");
-}
-
-class MockLogRecordable final : public opentelemetry::sdk::logs::Recordable
-{
-public:
-  void SetTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}
-
-  void SetObservedTimestamp(
-      opentelemetry::common::SystemTimestamp observed_timestamp) noexcept override
-  {
-    observed_timestamp_ = observed_timestamp;
-  }
-
-  const opentelemetry::common::SystemTimestamp &GetObservedTimestamp() const noexcept
-  {
-    return observed_timestamp_;
-  }
-
-  opentelemetry::logs::Severity GetSeverity() const noexcept { return severity_; }
-
-  void SetSeverity(opentelemetry::logs::Severity severity) noexcept override
-  {
-    severity_ = severity;
-  }
-
-  nostd::string_view GetBody() const noexcept { return body_; }
-
-  void SetBody(const opentelemetry::common::AttributeValue &message) noexcept override
-  {
-    if (nostd::holds_alternative<const char *>(message))
-    {
-      body_ = nostd::get<const char *>(message);
-    }
-    else if (nostd::holds_alternative<nostd::string_view>(message))
-    {
-      body_ = static_cast<std::string>(nostd::get<nostd::string_view>(message));
-    }
-  }
-
-  void SetBody(const std::string &message) noexcept { body_ = message; }
-
-  void SetEventId(int64_t id, nostd::string_view name) noexcept override
-  {
-    event_id_              = id;
-    log_record_event_name_ = static_cast<std::string>(name);
-  }
-
-  void SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept override
-  {
-    trace_id_ = trace_id;
-  }
-  inline const opentelemetry::trace::TraceId &GetTraceId() const noexcept { return trace_id_; }
-
-  void SetSpanId(const opentelemetry::trace::SpanId &span_id) noexcept override
-  {
-    span_id_ = span_id;
-  }
-
-  inline const opentelemetry::trace::SpanId &GetSpanId() const noexcept { return span_id_; }
-
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &trace_flags) noexcept override
-  {
-    trace_flags_ = trace_flags;
-  }
-
-  inline const opentelemetry::trace::TraceFlags &GetTraceFlags() const noexcept
-  {
-    return trace_flags_;
-  }
-
-  void SetAttribute(nostd::string_view key,
-                    const opentelemetry::common::AttributeValue &value) noexcept override
-  {
-    if (!nostd::holds_alternative<nostd::string_view>(value))
-    {
-      return;
-    }
-
-    if (key == "event.domain")
-    {
-      event_domain_ = static_cast<std::string>(nostd::get<nostd::string_view>(value));
-    }
-    else if (key == "event.name")
-    {
-      event_name_ = static_cast<std::string>(nostd::get<nostd::string_view>(value));
-    }
-  }
-
-  inline const std::string &GetEventName() const noexcept { return event_name_; }
-
-  inline const std::string &GetEventDomain() const noexcept { return event_domain_; }
-
-  void SetResource(const opentelemetry::sdk::resource::Resource &) noexcept override {}
-
-  void SetInstrumentationScope(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &) noexcept override
-  {}
-
-  void CopyFrom(const MockLogRecordable &other)
-  {
-    severity_           = other.severity_;
-    body_               = other.body_;
-    trace_id_           = other.trace_id_;
-    span_id_            = other.span_id_;
-    trace_flags_        = other.trace_flags_;
-    event_name_         = other.event_name_;
-    event_domain_       = other.event_domain_;
-    observed_timestamp_ = other.observed_timestamp_;
-  }
-
-private:
-  opentelemetry::logs::Severity severity_ = opentelemetry::logs::Severity::kInvalid;
-  std::string body_;
-  int64_t event_id_;
-  std::string log_record_event_name_;
-  opentelemetry::trace::TraceId trace_id_;
-  opentelemetry::trace::SpanId span_id_;
-  opentelemetry::trace::TraceFlags trace_flags_;
-  std::string event_name_;
-  std::string event_domain_;
-  opentelemetry::common::SystemTimestamp observed_timestamp_ =
-      std::chrono::system_clock::from_time_t(0);
-};
-
-class MockProcessor final : public LogRecordProcessor
-{
-private:
-  std::shared_ptr<MockLogRecordable> record_received_;
-
-public:
-  // A processor used for testing that keeps a track of the recordable it received
-  explicit MockProcessor(std::shared_ptr<MockLogRecordable> record_received) noexcept
-      : record_received_(std::move(record_received))
-  {}
-
-  std::unique_ptr<opentelemetry::sdk::logs::Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<opentelemetry::sdk::logs::Recordable>(new MockLogRecordable());
-  }
-
-  // OnEmit stores the record it receives into the shared_ptr recordable passed into its
-  // constructor
-  void OnEmit(std::unique_ptr<opentelemetry::sdk::logs::Recordable> &&record) noexcept override
-  {
-    // Cast the recordable received into a concrete MockLogRecordable type
-    auto copy =
-        std::shared_ptr<MockLogRecordable>(static_cast<MockLogRecordable *>(record.release()));
-
-    // Copy over the received log record's severity, name, and body fields over to the recordable
-    // passed in the constructor
-    record_received_->CopyFrom(*copy);
-  }
-
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return true; }
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override { return true; }
-};
-
-TEST(LoggerSDK, LogToAProcessor)
-{
-  // Create an API LoggerProvider and logger
-  auto api_lp = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider());
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = api_lp->GetLogger("logger", "opentelelemtry_library", "", schema_url);
-
-  // Cast the API LoggerProvider to an SDK Logger Provider and assert that it is still the same
-  // LoggerProvider by checking that getting a logger with the same name as the previously defined
-  // logger is the same instance
-  auto lp      = static_cast<LoggerProvider *>(api_lp.get());
-  auto logger2 = lp->GetLogger("logger", "opentelelemtry_library", "", schema_url);
-  ASSERT_EQ(logger, logger2);
-
-  nostd::shared_ptr<opentelemetry::trace::Span> include_span;
-  {
-    std::vector<std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>> span_processors;
-    auto trace_provider =
-        opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(span_processors));
-    include_span = trace_provider->GetTracer("logger")->StartSpan("test_logger");
-  }
-  opentelemetry::trace::Scope trace_scope{include_span};
-
-  auto now = std::chrono::system_clock::now();
-
-  auto sdk_logger = static_cast<opentelemetry::sdk::logs::Logger *>(logger.get());
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetName(), "opentelelemtry_library");
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetVersion(), "");
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetSchemaURL(), schema_url);
-  // Set a processor for the LoggerProvider
-  auto shared_recordable = std::shared_ptr<MockLogRecordable>(new MockLogRecordable());
-  lp->AddProcessor(std::unique_ptr<opentelemetry::sdk::logs::LogRecordProcessor>(
-      new MockProcessor(shared_recordable)));
-
-  // Check that the recordable created by the EmitLogRecord() statement is set properly
-  logger->EmitLogRecord(logs_api::Severity::kWarn, "Log Message");
-
-  ASSERT_EQ(shared_recordable->GetSeverity(), logs_api::Severity::kWarn);
-  ASSERT_EQ(shared_recordable->GetBody(), "Log Message");
-  ASSERT_EQ(shared_recordable->GetTraceFlags().flags(),
-            include_span->GetContext().trace_flags().flags());
-  char trace_id_in_logger[opentelemetry::trace::TraceId::kSize * 2];
-  char trace_id_in_span[opentelemetry::trace::TraceId::kSize * 2];
-  char span_id_in_logger[opentelemetry::trace::SpanId::kSize * 2];
-  char span_id_in_span[opentelemetry::trace::SpanId::kSize * 2];
-  shared_recordable->GetTraceId().ToLowerBase16(trace_id_in_logger);
-  include_span->GetContext().trace_id().ToLowerBase16(trace_id_in_span);
-  shared_recordable->GetSpanId().ToLowerBase16(span_id_in_logger);
-  include_span->GetContext().span_id().ToLowerBase16(span_id_in_span);
-  std::string trace_id_text_in_logger{trace_id_in_logger, sizeof(trace_id_in_logger)};
-  std::string trace_id_text_in_span{trace_id_in_span, sizeof(trace_id_in_span)};
-  std::string span_id_text_in_logger{span_id_in_logger, sizeof(span_id_in_logger)};
-  std::string span_id_text_in_span{span_id_in_span, sizeof(span_id_in_span)};
-  ASSERT_EQ(trace_id_text_in_logger, trace_id_text_in_span);
-  ASSERT_EQ(span_id_text_in_logger, span_id_text_in_span);
-
-  ASSERT_GE(
-      static_cast<std::chrono::system_clock::time_point>(shared_recordable->GetObservedTimestamp()),
-      now);
-}
-
-TEST(LoggerSDK, LoggerWithDisabledConfig)
-{
-  ScopeConfigurator<LoggerConfig> disabled_all_scopes =
-      ScopeConfigurator<LoggerConfig>::Builder(LoggerConfig::Disabled()).Build();
-  // Set a processor for the LoggerProvider
-  auto shared_recordable = std::shared_ptr<MockLogRecordable>(new MockLogRecordable());
-  auto log_processor = std::unique_ptr<LogRecordProcessor>(new MockProcessor(shared_recordable));
-
-  // Create an API LoggerProvider and logger
-  const auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto api_lp = std::shared_ptr<logs_api::LoggerProvider>(
-      new LoggerProvider(std::move(log_processor), resource,
-                         std::make_unique<ScopeConfigurator<LoggerConfig>>(disabled_all_scopes)));
-  auto logger = api_lp->GetLogger("logger", "opentelelemtry_library", "", schema_url);
-
-  auto noop_logger = logs_api::NoopLogger();
-
-  // Test Logger functions for the constructed logger
-  // This logger should behave like a noop logger
-  ASSERT_EQ(logger->GetName(), noop_logger.GetName());
-
-  // Since the logger is disabled, when creating a LogRecord, the observed timestamp will not be
-  // set in the underlying LogRecordable
-  auto log_record = logger->CreateLogRecord();
-  logger->EmitLogRecord(std::move(log_record));
-  ASSERT_EQ(shared_recordable->GetObservedTimestamp(), std::chrono::system_clock::from_time_t(0));
-
-  // Since this logger should behave like a noop logger, no values within the recordable would be
-  // set.
-  logger->EmitLogRecord(logs_api::Severity::kWarn, "Log Message");
-  ASSERT_EQ(shared_recordable->GetBody(), "");
-  ASSERT_EQ(shared_recordable->GetSeverity(), opentelemetry::logs::Severity::kInvalid);
-  ASSERT_EQ(shared_recordable->GetObservedTimestamp(), std::chrono::system_clock::from_time_t(0));
-}
-
-TEST(LoggerSDK, LoggerWithEnabledConfig)
-{
-  ScopeConfigurator<LoggerConfig> enabled_all_scopes =
-      ScopeConfigurator<LoggerConfig>::Builder(LoggerConfig::Enabled()).Build();
-  // Set a processor for the LoggerProvider
-  auto shared_recordable = std::shared_ptr<MockLogRecordable>(new MockLogRecordable());
-  auto log_processor = std::unique_ptr<LogRecordProcessor>(new MockProcessor(shared_recordable));
-
-  // Create an API LoggerProvider and logger
-  const auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto api_lp = std::shared_ptr<logs_api::LoggerProvider>(
-      new LoggerProvider(std::move(log_processor), resource,
-                         std::make_unique<ScopeConfigurator<LoggerConfig>>(enabled_all_scopes)));
-  auto logger = api_lp->GetLogger("test-logger", "opentelemetry_library", "", schema_url);
-
-  // Test Logger functions for the constructed logger
-  ASSERT_EQ(logger->GetName(), "test-logger");
-
-  // Since the logger is enabled, when creating a LogRecord, the observed timestamp will be set
-  // in the underlying LogRecordable.
-  auto reference_ts = std::chrono::duration_cast<std::chrono::nanoseconds>(
-      std::chrono::system_clock::now().time_since_epoch());
-  auto log_record = logger->CreateLogRecord();
-  logger->EmitLogRecord(std::move(log_record));
-  // Since log_record was created after recording reference timestamp, expect that observed
-  // timestamp is greater
-  ASSERT_GE(shared_recordable->GetObservedTimestamp().time_since_epoch().count(),
-            reference_ts.count());
-
-  // Since this logger should behave like a valid logger, values within the recordable would be set.
-  logger->EmitLogRecord(logs_api::Severity::kWarn, "Log Message");
-  ASSERT_EQ(shared_recordable->GetBody(), "Log Message");
-  ASSERT_EQ(shared_recordable->GetSeverity(), opentelemetry::logs::Severity::kWarn);
-  ASSERT_GE(shared_recordable->GetObservedTimestamp().time_since_epoch().count(),
-            reference_ts.count());
-}
-
-static std::unique_ptr<MockLogRecordable> create_mock_log_recordable(
-    const std::string &body,
-    opentelemetry::logs::Severity severity)
-{
-  auto mock_log_recordable = std::make_unique<MockLogRecordable>();
-  mock_log_recordable->SetBody(body);
-  mock_log_recordable->SetSeverity(severity);
-  return mock_log_recordable;
-}
-
-class CustomLogConfiguratorTestData
-{
-public:
-  InstrumentationScope instrumentation_scope_;
-  MockLogRecordable test_log_recordable_;
-  MockLogRecordable expected_log_recordable_;
-  bool expected_disabled_for_scope_;
-
-  CustomLogConfiguratorTestData(const InstrumentationScope &instrumentation_scope,
-                                const MockLogRecordable &test_log_recordable,
-                                const MockLogRecordable &expected_log_recordable,
-                                const bool expected_disabled_for_scope)
-      : instrumentation_scope_(instrumentation_scope),
-        test_log_recordable_(test_log_recordable),
-        expected_log_recordable_(expected_log_recordable),
-        expected_disabled_for_scope_(expected_disabled_for_scope)
-  {}
-};
-
-// constants used in VerifyCustomConfiguratorBehavior test
-static auto noop_logger = logs_api::NoopLogger();
-const std::string schema{"https://opentelemetry.io/schemas/1.11.0"};
-
-// Generate test case data
-// Test Case 1
-static auto instrumentation_scope_1 =
-    *InstrumentationScope::Create("opentelemetry_library", "1.0.0", schema);
-static auto test_log_recordable_1 =
-    create_mock_log_recordable("Log Message", opentelemetry::logs::Severity::kWarn);
-static auto expected_log_recordable_1 =
-    create_mock_log_recordable("Log Message", opentelemetry::logs::Severity::kWarn);
-static auto custom_log_configurator_test_data_1 =
-    CustomLogConfiguratorTestData(instrumentation_scope_1,
-                                  *test_log_recordable_1,
-                                  *expected_log_recordable_1,
-                                  false);
-// Test Case 2
-static auto instrumentation_scope_2 = *InstrumentationScope::Create("bar_library", "1.0.0", schema);
-static auto test_log_recordable_2 =
-    create_mock_log_recordable("", opentelemetry::logs::Severity::kDebug);
-static auto expected_log_recordable_2 =
-    create_mock_log_recordable("", opentelemetry::logs::Severity::kDebug);
-static auto custom_log_configurator_test_data_2 =
-    CustomLogConfiguratorTestData(instrumentation_scope_2,
-                                  *test_log_recordable_2,
-                                  *expected_log_recordable_2,
-                                  false);
-// Test Case 3
-static auto instrumentation_scope_3 = *InstrumentationScope::Create("foo_library", "", schema);
-static auto test_log_recordable_3 =
-    create_mock_log_recordable("Info message", opentelemetry::logs::Severity::kInfo);
-static auto expected_log_recordable_3 =
-    create_mock_log_recordable("", opentelemetry::logs::Severity::kInvalid);
-static auto custom_log_configurator_test_data_3 =
-    CustomLogConfiguratorTestData(instrumentation_scope_3,
-                                  *test_log_recordable_3,
-                                  *expected_log_recordable_3,
-                                  true);
-// Test Case 4
-static auto instrumentation_scope_4 = *InstrumentationScope::Create("allowed_library", "", schema);
-static auto test_log_recordable_4 =
-    create_mock_log_recordable("Scope version missing", opentelemetry::logs::Severity::kInfo);
-static auto expected_log_recordable_4 =
-    create_mock_log_recordable("", opentelemetry::logs::Severity::kInvalid);
-static auto custom_log_configurator_test_data_4 =
-    CustomLogConfiguratorTestData(instrumentation_scope_4,
-                                  *test_log_recordable_4,
-                                  *expected_log_recordable_4,
-                                  true);
-
-// This array could also directly contain the reference types, but that  leads to 'uninitialized
-// value was created by heap allocation' errors in Valgrind memcheck. This is a bug in Googletest
-// library, see https://github.com/google/googletest/issues/3805#issuecomment-1397301790 for more
-// details. Using pointers is a workaround to prevent the Valgrind warnings.
-constexpr std::array<CustomLogConfiguratorTestData *, 4> log_configurator_test_cases = {
-    &custom_log_configurator_test_data_1, &custom_log_configurator_test_data_2,
-    &custom_log_configurator_test_data_3, &custom_log_configurator_test_data_4};
-
-// Test fixture for VerifyCustomConfiguratorBehavior
-class CustomLoggerConfiguratorTestFixture
-    : public ::testing::TestWithParam<CustomLogConfiguratorTestData *>
-{};
-
-TEST_P(CustomLoggerConfiguratorTestFixture, VerifyCustomConfiguratorBehavior)
-{
-  // lambda checks if version is present in scope information
-  auto check_if_version_present = [](const InstrumentationScope &scope_info) {
-    return !scope_info.GetVersion().empty();
-  };
-  // custom scope configurator that only disables loggers for library name "foo_library" or do not
-  // have version information
-  auto test_scope_configurator = ScopeConfigurator<LoggerConfig>(
-      ScopeConfigurator<LoggerConfig>::Builder(LoggerConfig::Disabled())
-          .AddConditionNameEquals("foo_library", LoggerConfig::Disabled())
-          .AddCondition(check_if_version_present, LoggerConfig::Enabled())
-          .Build());
-
-  // Get the test case data from fixture
-  CustomLogConfiguratorTestData *test_case = GetParam();
-  auto test_instrumentation_scope          = test_case->instrumentation_scope_;
-  auto test_log_recordable                 = test_case->test_log_recordable_;
-
-  // Set a processor for the LoggerProvider
-  auto shared_recordable_under_test = std::shared_ptr<MockLogRecordable>(new MockLogRecordable());
-  auto log_processor_test =
-      std::unique_ptr<LogRecordProcessor>(new MockProcessor(shared_recordable_under_test));
-
-  // Create an API LoggerProvider and logger
-  const auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  auto api_lp         = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider(
-      std::move(log_processor_test), resource,
-      std::make_unique<ScopeConfigurator<LoggerConfig>>(test_scope_configurator)));
-
-  // Create logger and make assertions
-  auto logger_under_test = api_lp->GetLogger("test-logger", test_instrumentation_scope.GetName(),
-                                             test_instrumentation_scope.GetVersion(),
-                                             test_instrumentation_scope.GetSchemaURL());
-  auto reference_ts      = std::chrono::duration_cast<std::chrono::nanoseconds>(
-      std::chrono::system_clock::now().time_since_epoch());
-  auto log_record = logger_under_test->CreateLogRecord();
-  logger_under_test->EmitLogRecord(std::move(log_record));
-
-  // Test Logger functions for the constructed logger
-  if (test_case->expected_disabled_for_scope_)
-  {
-    ASSERT_EQ(logger_under_test->GetName(), noop_logger.GetName());
-    ASSERT_EQ(shared_recordable_under_test->GetObservedTimestamp(),
-              std::chrono::system_clock::from_time_t(0));
-  }
-  else
-  {
-    ASSERT_EQ(logger_under_test->GetName(), "test-logger");
-    ASSERT_GE(shared_recordable_under_test->GetObservedTimestamp().time_since_epoch().count(),
-              reference_ts.count());
-  }
-
-  logger_under_test->EmitLogRecord(test_log_recordable.GetBody(),
-                                   test_log_recordable.GetSeverity());
-  ASSERT_EQ(shared_recordable_under_test->GetBody(), test_case->expected_log_recordable_.GetBody());
-  ASSERT_EQ(shared_recordable_under_test->GetSeverity(),
-            test_case->expected_log_recordable_.GetSeverity());
-}
-
-INSTANTIATE_TEST_SUITE_P(CustomLogConfiguratorTestData,
-                         CustomLoggerConfiguratorTestFixture,
-                         ::testing::ValuesIn(log_configurator_test_cases));
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-TEST(LoggerSDK, EventLog)
-{
-  // Create an API LoggerProvider and logger
-  auto api_lp = std::shared_ptr<logs_api::LoggerProvider>(new LoggerProvider());
-  const std::string schema_url{"https://opentelemetry.io/schemas/1.11.0"};
-  auto logger = api_lp->GetLogger("logger", "opentelelemtry_library", "", schema_url);
-
-  auto api_elp      = std::shared_ptr<logs_api::EventLoggerProvider>(new EventLoggerProvider());
-  auto event_logger = api_elp->CreateEventLogger(logger, "otel-cpp.event_domain");
-
-  auto sdk_logger = static_cast<opentelemetry::sdk::logs::Logger *>(logger.get());
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetName(), "opentelelemtry_library");
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetVersion(), "");
-  ASSERT_EQ(sdk_logger->GetInstrumentationScope().GetSchemaURL(), schema_url);
-  // Set a processor for the LoggerProvider
-  auto shared_recordable = std::shared_ptr<MockLogRecordable>(new MockLogRecordable());
-  auto sdk_lp            = static_cast<LoggerProvider *>(api_lp.get());
-  sdk_lp->AddProcessor(std::unique_ptr<opentelemetry::sdk::logs::LogRecordProcessor>(
-      new MockProcessor(shared_recordable)));
-
-  // Check that the recordable created by the EmitEvent() statement is set properly
-  event_logger->EmitEvent("otel-cpp.event_name", logs_api::Severity::kWarn, "Event Log Message");
-
-  ASSERT_EQ(shared_recordable->GetSeverity(), logs_api::Severity::kWarn);
-  ASSERT_EQ(shared_recordable->GetBody(), "Event Log Message");
-  ASSERT_EQ(shared_recordable->GetEventName(), "otel-cpp.event_name");
-  ASSERT_EQ(shared_recordable->GetEventDomain(), "otel-cpp.event_domain");
-}
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/simple_log_record_processor_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/simple_log_record_processor_test.cc
deleted file mode 100644
index d7e0925bb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/logs/simple_log_record_processor_test.cc
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <chrono>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/logs/exporter.h"
-#include "opentelemetry/sdk/logs/recordable.h"
-#include "opentelemetry/sdk/logs/simple_log_record_processor.h"
-
-using namespace opentelemetry::sdk::logs;
-using namespace opentelemetry::sdk::common;
-namespace nostd = opentelemetry::nostd;
-
-class TestLogRecordable final : public opentelemetry::sdk::logs::Recordable
-{
-public:
-  void SetTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}
-
-  void SetObservedTimestamp(opentelemetry::common::SystemTimestamp) noexcept override {}
-
-  void SetSeverity(opentelemetry::logs::Severity) noexcept override {}
-
-  nostd::string_view GetBody() const noexcept { return body_; }
-
-  void SetBody(const opentelemetry::common::AttributeValue &message) noexcept override
-  {
-    if (nostd::holds_alternative<const char *>(message))
-    {
-      body_ = nostd::get<const char *>(message);
-    }
-    else if (nostd::holds_alternative<nostd::string_view>(message))
-    {
-      body_ = static_cast<std::string>(nostd::get<nostd::string_view>(message));
-    }
-  }
-
-  void SetBody(const char *message) noexcept { body_ = message; }
-
-  void SetEventId(int64_t, nostd::string_view) noexcept override {}
-
-  void SetTraceId(const opentelemetry::trace::TraceId &) noexcept override {}
-
-  void SetSpanId(const opentelemetry::trace::SpanId &) noexcept override {}
-
-  void SetTraceFlags(const opentelemetry::trace::TraceFlags &) noexcept override {}
-
-  void SetAttribute(nostd::string_view,
-                    const opentelemetry::common::AttributeValue &) noexcept override
-  {}
-
-  void SetResource(const opentelemetry::sdk::resource::Resource &) noexcept override {}
-
-  void SetInstrumentationScope(
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &) noexcept override
-  {}
-
-private:
-  std::string body_;
-};
-
-/*
- * A test exporter that can return a vector of all the records it has received,
- * and keep track of the number of times its Shutdown() function was called.
- */
-class TestExporter final : public LogRecordExporter
-{
-public:
-  TestExporter(int *force_flush_counter,
-               int *shutdown_counter,
-               std::shared_ptr<std::vector<std::unique_ptr<TestLogRecordable>>> logs_received,
-               size_t *batch_size_received)
-      : force_flush_counter_(force_flush_counter),
-        shutdown_counter_(shutdown_counter),
-        logs_received_(std::move(logs_received)),
-        batch_size_received(batch_size_received)
-  {}
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<Recordable>(new TestLogRecordable());
-  }
-
-  // Stores the names of the log records this exporter receives to an internal list
-  ExportResult Export(const nostd::span<std::unique_ptr<Recordable>> &records) noexcept override
-  {
-    *batch_size_received = records.size();
-    for (auto &record : records)
-    {
-      auto log_record =
-          std::unique_ptr<TestLogRecordable>(static_cast<TestLogRecordable *>(record.release()));
-
-      if (log_record != nullptr)
-      {
-        logs_received_->push_back(std::move(log_record));
-      }
-    }
-    return ExportResult::kSuccess;
-  }
-
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    if (nullptr != force_flush_counter_)
-    {
-      ++(*force_flush_counter_);
-    }
-    return true;
-  }
-
-  // Increment the shutdown counter everytime this method is called
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    if (nullptr != shutdown_counter_)
-    {
-      *shutdown_counter_ += 1;
-    }
-    return true;
-  }
-
-private:
-  int *force_flush_counter_;
-  int *shutdown_counter_;
-  std::shared_ptr<std::vector<std::unique_ptr<TestLogRecordable>>> logs_received_;
-  size_t *batch_size_received;
-};
-
-// Tests whether the simple processor successfully creates a batch of size 1
-// and whether the contents of the record is sent to the exporter correctly
-TEST(SimpleLogRecordProcessorTest, SendReceivedLogsToExporter)
-{
-  // Create a simple processor with a TestExporter attached
-  std::shared_ptr<std::vector<std::unique_ptr<TestLogRecordable>>> logs_received(
-      new std::vector<std::unique_ptr<TestLogRecordable>>);
-  size_t batch_size_received = 0;
-
-  std::unique_ptr<TestExporter> exporter(
-      new TestExporter(nullptr, nullptr, logs_received, &batch_size_received));
-
-  SimpleLogRecordProcessor processor(std::move(exporter));
-
-  // Send some log records to the processor (which should then send to the TestExporter)
-  const int num_logs = 5;
-  for (int i = 0; i < num_logs; i++)
-  {
-    auto recordable = processor.MakeRecordable();
-    static_cast<TestLogRecordable *>(recordable.get())->SetBody("Log Body");
-    processor.OnEmit(std::move(recordable));
-
-    // Verify that the batch of 1 log record sent by processor matches what exporter received
-    EXPECT_EQ(1, batch_size_received);
-  }
-
-  // Test whether the processor's log sent matches the log record received by the exporter
-  EXPECT_EQ(logs_received->size(), num_logs);
-  for (int i = 0; i < num_logs; i++)
-  {
-    EXPECT_EQ("Log Body", logs_received->at(i)->GetBody());
-  }
-}
-
-// Tests behavior when calling the processor's ShutDown() multiple times
-TEST(SimpleLogRecordProcessorTest, ShutdownCalledOnce)
-{
-  // Create a TestExporter
-  int num_shutdowns = 0;
-
-  std::unique_ptr<TestExporter> exporter(
-      new TestExporter(nullptr, &num_shutdowns, nullptr, nullptr));
-
-  // Create a processor with the previous test exporter
-  SimpleLogRecordProcessor processor(std::move(exporter));
-
-  // The first time processor shutdown is called
-  EXPECT_EQ(0, num_shutdowns);
-  EXPECT_EQ(true, processor.Shutdown());
-  EXPECT_EQ(1, num_shutdowns);
-
-  EXPECT_EQ(true, processor.Shutdown());
-  // Processor::ShutDown(), even if called more than once, should only shutdown exporter once
-  EXPECT_EQ(1, num_shutdowns);
-}
-
-TEST(SimpleLogRecordProcessorTest, ForceFlush)
-{
-  // Create a TestExporter
-  int num_force_flush = 0;
-
-  std::unique_ptr<TestExporter> exporter(
-      new TestExporter(&num_force_flush, nullptr, nullptr, nullptr));
-
-  // Create a processor with the previous test exporter
-  SimpleLogRecordProcessor processor(std::move(exporter));
-
-  // The first time processor shutdown is called
-  EXPECT_EQ(0, num_force_flush);
-  EXPECT_EQ(true, processor.ForceFlush());
-  EXPECT_EQ(1, num_force_flush);
-}
-
-// A test exporter that always returns failure when shut down
-class FailShutDownForceFlushExporter final : public LogRecordExporter
-{
-public:
-  FailShutDownForceFlushExporter() {}
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<Recordable>(new TestLogRecordable());
-  }
-
-  ExportResult Export(
-      const nostd::span<std::unique_ptr<Recordable>> & /* records */) noexcept override
-  {
-    return ExportResult::kSuccess;
-  }
-
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return false; }
-
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override { return false; }
-};
-
-// Tests for when when processor should fail to shutdown
-TEST(SimpleLogRecordProcessorTest, ShutDownFail)
-{
-  std::unique_ptr<FailShutDownForceFlushExporter> exporter(new FailShutDownForceFlushExporter());
-  SimpleLogRecordProcessor processor(std::move(exporter));
-
-  // Expect failure result when exporter fails to shutdown
-  EXPECT_EQ(false, processor.Shutdown());
-}
-
-// Tests for when when processor should fail to force flush
-TEST(SimpleLogRecordProcessorTest, ForceFlushFail)
-{
-  std::unique_ptr<FailShutDownForceFlushExporter> exporter(new FailShutDownForceFlushExporter());
-  SimpleLogRecordProcessor processor(std::move(exporter));
-
-  // Expect failure result when exporter fails to force flush
-  EXPECT_EQ(false, processor.ForceFlush());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/BUILD
deleted file mode 100644
index dcd7a323f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/BUILD
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_library(
-    name = "metrics_common_test_utils",
-    srcs = [
-        "common.cc",
-    ],
-    hdrs = ["common.h"],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "//sdk/src/metrics",
-    ],
-)
-
-cc_test(
-    name = "meter_config_test",
-    srcs = [
-        "meter_config_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "all_tests",
-    srcs = glob(["*_test.cc"]),
-    copts = [
-        "-DUNIT_TESTING",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "stress_tests",
-    timeout = "long",
-    srcs = glob(["*_test_stress.cc"]),
-    copts = [
-        "-DUNIT_TESTING",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "attributes_processor_benchmark",
-    srcs = [
-        "attributes_processor_benchmark.cc",
-    ],
-    tags = [
-        "benchmark",
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "attributes_hashmap_benchmark",
-    srcs = [
-        "attributes_hashmap_benchmark.cc",
-    ],
-    tags = [
-        "benchmark",
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "base2_exponential_histogram_indexer_benchmark",
-    srcs = [
-        "base2_exponential_histogram_indexer_benchmark.cc",
-    ],
-    tags = [
-        "benchmark",
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "histogram_aggregation_benchmark",
-    srcs = [
-        "histogram_aggregation_benchmark.cc",
-    ],
-    tags = [
-        "benchmark",
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/metrics",
-        "//sdk/src/resource",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "sum_aggregation_benchmark",
-    srcs = [
-        "sum_aggregation_benchmark.cc",
-    ],
-    tags = [
-        "benchmark",
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "metrics_common_test_utils",
-        "//sdk/src/metrics",
-        "//sdk/src/resource",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "measurements_benchmark",
-    srcs = [
-        "measurements_benchmark.cc",
-    ],
-    tags = [
-        "benchmark",
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "//sdk/src/metrics",
-        "//sdk/src/resource",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/CMakeLists.txt
deleted file mode 100644
index 3eb65fbe3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/CMakeLists.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(metrics_common_test_utils common.cc)
-target_link_libraries(metrics_common_test_utils opentelemetry_metrics)
-
-foreach(
-  testname
-  meter_config_test
-  meter_provider_set_test
-  meter_provider_sdk_test
-  meter_test
-  view_registry_test
-  aggregation_test
-  sum_aggregation_test
-  histogram_aggregation_test
-  attributes_processor_test
-  attributes_hashmap_test
-  base2_exponential_histogram_indexer_test
-  circular_buffer_counter_test
-  cardinality_limit_test
-  histogram_test
-  sync_metric_storage_counter_test
-  sync_metric_storage_gauge_test
-  sync_metric_storage_histogram_test
-  sync_metric_storage_up_down_counter_test
-  async_metric_storage_test
-  multi_metric_storage_test
-  observer_result_test
-  sync_instruments_test
-  async_instruments_test
-  metric_collector_test
-  metric_reader_test
-  observable_registry_test
-  periodic_exporting_metric_reader_test
-  instrument_metadata_validator_test
-  metric_test_stress
-  instrument_descriptor_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(
-    ${testname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    metrics_common_test_utils opentelemetry_resources)
-  target_compile_definitions(${testname} PRIVATE UNIT_TESTING)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX metrics.
-    TEST_LIST ${testname})
-endforeach()
-
-if(WITH_BENCHMARK)
-  add_executable(attributes_processor_benchmark
-                 attributes_processor_benchmark.cc)
-  target_link_libraries(attributes_processor_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common)
-
-  add_executable(attributes_hashmap_benchmark attributes_hashmap_benchmark.cc)
-  target_link_libraries(attributes_hashmap_benchmark benchmark::benchmark
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common)
-
-  add_executable(base2_exponential_histogram_indexer_benchmark
-                 base2_exponential_histogram_indexer_benchmark.cc)
-  target_link_libraries(
-    base2_exponential_histogram_indexer_benchmark benchmark::benchmark
-    opentelemetry_metrics ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common)
-
-  add_executable(histogram_aggregation_benchmark
-                 histogram_aggregation_benchmark.cc)
-  target_link_libraries(
-    histogram_aggregation_benchmark benchmark::benchmark
-    ${CMAKE_THREAD_LIBS_INIT} metrics_common_test_utils opentelemetry_common
-    opentelemetry_resources)
-
-  add_executable(measurements_benchmark measurements_benchmark.cc)
-  target_link_libraries(
-    measurements_benchmark benchmark::benchmark opentelemetry_metrics
-    opentelemetry_resources ${CMAKE_THREAD_LIBS_INIT} opentelemetry_common)
-  add_executable(sum_aggregation_benchmark sum_aggregation_benchmark.cc)
-  target_link_libraries(
-    sum_aggregation_benchmark benchmark::benchmark ${CMAKE_THREAD_LIBS_INIT}
-    metrics_common_test_utils opentelemetry_common opentelemetry_resources)
-endif()
-
-add_subdirectory(exemplar)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/aggregation_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/aggregation_test.cc
deleted file mode 100644
index 1588ac319..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/aggregation_test.cc
+++ /dev/null
@@ -1,453 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <limits>
-#include <string>
-#include <vector>
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/histogram_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/lastvalue_aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/sum_aggregation.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-
-using namespace opentelemetry::sdk::metrics;
-namespace nostd = opentelemetry::nostd;
-TEST(Aggregation, LongSumAggregation)
-{
-  LongSumAggregation aggr(true);
-  auto data = aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<SumPointData>(data));
-  auto sum_data = nostd::get<SumPointData>(data);
-  ASSERT_TRUE(nostd::holds_alternative<int64_t>(sum_data.value_));
-  EXPECT_EQ(nostd::get<int64_t>(sum_data.value_), 0);
-  aggr.Aggregate(static_cast<int64_t>(12), {});
-  aggr.Aggregate(static_cast<int64_t>(0), {});
-  sum_data = nostd::get<SumPointData>(aggr.ToPoint());
-  EXPECT_EQ(nostd::get<int64_t>(sum_data.value_), 12);
-}
-
-TEST(Aggregation, DoubleSumAggregation)
-{
-  DoubleSumAggregation aggr(true);
-  auto data = aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<SumPointData>(data));
-  auto sum_data = nostd::get<SumPointData>(data);
-  ASSERT_TRUE(nostd::holds_alternative<double>(sum_data.value_));
-  EXPECT_EQ(nostd::get<double>(sum_data.value_), 0);
-  aggr.Aggregate(12.0, {});
-  aggr.Aggregate(1.0, {});
-  sum_data = nostd::get<SumPointData>(aggr.ToPoint());
-  EXPECT_EQ(nostd::get<double>(sum_data.value_), 13.0);
-}
-
-TEST(Aggregation, LongLastValueAggregation)
-{
-  LongLastValueAggregation aggr;
-  auto data = aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<LastValuePointData>(data));
-  auto lastvalue_data = nostd::get<LastValuePointData>(data);
-  ASSERT_TRUE(nostd::holds_alternative<int64_t>(lastvalue_data.value_));
-  EXPECT_EQ(lastvalue_data.is_lastvalue_valid_, false);
-  aggr.Aggregate(static_cast<int64_t>(12), {});
-  aggr.Aggregate(static_cast<int64_t>(1), {});
-  lastvalue_data = nostd::get<LastValuePointData>(aggr.ToPoint());
-  EXPECT_EQ(nostd::get<int64_t>(lastvalue_data.value_), 1.0);
-}
-
-TEST(Aggregation, DoubleLastValueAggregation)
-{
-  DoubleLastValueAggregation aggr;
-  auto data = aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<LastValuePointData>(data));
-  auto lastvalue_data = nostd::get<LastValuePointData>(data);
-  ASSERT_TRUE(nostd::holds_alternative<double>(lastvalue_data.value_));
-  EXPECT_EQ(lastvalue_data.is_lastvalue_valid_, false);
-  aggr.Aggregate(12.0, {});
-  aggr.Aggregate(1.0, {});
-  lastvalue_data = nostd::get<LastValuePointData>(aggr.ToPoint());
-  EXPECT_EQ(nostd::get<double>(lastvalue_data.value_), 1.0);
-}
-
-TEST(Aggregation, LongHistogramAggregation)
-{
-  LongHistogramAggregation aggr;
-  auto data = aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<HistogramPointData>(data));
-  auto histogram_data = nostd::get<HistogramPointData>(data);
-  ASSERT_TRUE(nostd::holds_alternative<int64_t>(histogram_data.sum_));
-  EXPECT_EQ(nostd::get<int64_t>(histogram_data.sum_), 0);
-  EXPECT_EQ(histogram_data.count_, 0);
-  aggr.Aggregate(static_cast<int64_t>(12), {});   // lies in third bucket
-  aggr.Aggregate(static_cast<int64_t>(100), {});  // lies in sixth bucket
-  histogram_data = nostd::get<HistogramPointData>(aggr.ToPoint());
-  EXPECT_EQ(nostd::get<int64_t>(histogram_data.min_), 12);
-  EXPECT_EQ(nostd::get<int64_t>(histogram_data.max_), 100);
-  EXPECT_EQ(nostd::get<int64_t>(histogram_data.sum_), 112);
-  EXPECT_EQ(histogram_data.count_, 2);
-  EXPECT_EQ(histogram_data.counts_[3], 1);
-  EXPECT_EQ(histogram_data.counts_[6], 1);
-  aggr.Aggregate(static_cast<int64_t>(13), {});   // lies in third bucket
-  aggr.Aggregate(static_cast<int64_t>(252), {});  // lies in eight bucket
-  histogram_data = nostd::get<HistogramPointData>(aggr.ToPoint());
-  EXPECT_EQ(histogram_data.count_, 4);
-  EXPECT_EQ(histogram_data.counts_[3], 2);
-  EXPECT_EQ(histogram_data.counts_[8], 1);
-  EXPECT_EQ(nostd::get<int64_t>(histogram_data.min_), 12);
-  EXPECT_EQ(nostd::get<int64_t>(histogram_data.max_), 252);
-
-  // Merge
-  LongHistogramAggregation aggr1;
-  aggr1.Aggregate(static_cast<int64_t>(1), {});
-  aggr1.Aggregate(static_cast<int64_t>(11), {});
-  aggr1.Aggregate(static_cast<int64_t>(26), {});
-
-  LongHistogramAggregation aggr2;
-  aggr2.Aggregate(static_cast<int64_t>(2), {});
-  aggr2.Aggregate(static_cast<int64_t>(3), {});
-  aggr2.Aggregate(static_cast<int64_t>(13), {});
-  aggr2.Aggregate(static_cast<int64_t>(28), {});
-  aggr2.Aggregate(static_cast<int64_t>(105), {});
-
-  auto aggr3     = aggr1.Merge(aggr2);
-  histogram_data = nostd::get<HistogramPointData>(aggr3->ToPoint());
-
-  EXPECT_EQ(histogram_data.count_, 8);      // 3 each from aggr1 and aggr2
-  EXPECT_EQ(histogram_data.counts_[1], 3);  // 1, 2, 3
-  EXPECT_EQ(histogram_data.counts_[3], 2);  // 11, 13
-  EXPECT_EQ(histogram_data.counts_[4], 2);  // 25, 28
-  EXPECT_EQ(histogram_data.counts_[7], 1);  // 105
-  EXPECT_EQ(nostd::get<int64_t>(histogram_data.min_), 1);
-  EXPECT_EQ(nostd::get<int64_t>(histogram_data.max_), 105);
-
-  // Diff
-  auto aggr4     = aggr1.Diff(aggr2);
-  histogram_data = nostd::get<HistogramPointData>(aggr4->ToPoint());
-  EXPECT_EQ(histogram_data.count_, 2);      // aggr2:5 - aggr1:3
-  EXPECT_EQ(histogram_data.counts_[1], 1);  // aggr2(2, 3) - aggr1(1)
-  EXPECT_EQ(histogram_data.counts_[3], 0);  // aggr2(13) - aggr1(11)
-  EXPECT_EQ(histogram_data.counts_[4], 0);  // aggr2(28) - aggr1(25)
-  EXPECT_EQ(histogram_data.counts_[7], 1);  // aggr2(105) - aggr1(0)
-}
-
-TEST(Aggregation, LongHistogramAggregationBoundaries)
-{
-  std::shared_ptr<opentelemetry::sdk::metrics::HistogramAggregationConfig> aggregation_config{
-      new opentelemetry::sdk::metrics::HistogramAggregationConfig};
-  std::vector<double> user_boundaries = {0.0,   50.0,   100.0,  250.0,  500.0,
-                                         750.0, 1000.0, 2500.0, 5000.0, 10000.0};
-  aggregation_config->boundaries_     = user_boundaries;
-  LongHistogramAggregation aggr{aggregation_config.get()};
-  auto data = aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<HistogramPointData>(data));
-  auto histogram_data = nostd::get<HistogramPointData>(data);
-  EXPECT_EQ(histogram_data.boundaries_, user_boundaries);
-}
-
-TEST(Aggregation, DoubleHistogramAggregationBoundaries)
-{
-  std::shared_ptr<opentelemetry::sdk::metrics::HistogramAggregationConfig> aggregation_config{
-      new opentelemetry::sdk::metrics::HistogramAggregationConfig};
-  std::vector<double> user_boundaries = {0.0,   50.0,   100.0,  250.0,  500.0,
-                                         750.0, 1000.0, 2500.0, 5000.0, 10000.0};
-  aggregation_config->boundaries_     = user_boundaries;
-  DoubleHistogramAggregation aggr{aggregation_config.get()};
-  auto data = aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<HistogramPointData>(data));
-  auto histogram_data = nostd::get<HistogramPointData>(data);
-  EXPECT_EQ(histogram_data.boundaries_, user_boundaries);
-}
-
-TEST(Aggregation, DoubleHistogramAggregation)
-{
-  DoubleHistogramAggregation aggr;
-  auto data = aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<HistogramPointData>(data));
-  auto histogram_data = nostd::get<HistogramPointData>(data);
-  ASSERT_TRUE(nostd::holds_alternative<double>(histogram_data.sum_));
-  EXPECT_EQ(nostd::get<double>(histogram_data.sum_), 0);
-  EXPECT_EQ(histogram_data.count_, 0);
-  aggr.Aggregate(12.0, {});   // lies in third bucket
-  aggr.Aggregate(100.0, {});  // lies in sixth bucket
-  histogram_data = nostd::get<HistogramPointData>(aggr.ToPoint());
-  EXPECT_EQ(nostd::get<double>(histogram_data.sum_), 112);
-  EXPECT_EQ(histogram_data.count_, 2);
-  EXPECT_EQ(histogram_data.counts_[3], 1);
-  EXPECT_EQ(histogram_data.counts_[6], 1);
-  EXPECT_EQ(nostd::get<double>(histogram_data.min_), 12);
-  EXPECT_EQ(nostd::get<double>(histogram_data.max_), 100);
-  aggr.Aggregate(13.0, {});   // lies in third bucket
-  aggr.Aggregate(252.0, {});  // lies in eight bucket
-  histogram_data = nostd::get<HistogramPointData>(aggr.ToPoint());
-  EXPECT_EQ(histogram_data.count_, 4);
-  EXPECT_EQ(histogram_data.counts_[3], 2);
-  EXPECT_EQ(histogram_data.counts_[8], 1);
-  EXPECT_EQ(nostd::get<double>(histogram_data.sum_), 377);
-  EXPECT_EQ(nostd::get<double>(histogram_data.min_), 12);
-  EXPECT_EQ(nostd::get<double>(histogram_data.max_), 252);
-
-  // Merge
-  DoubleHistogramAggregation aggr1;
-  aggr1.Aggregate(1.0, {});
-  aggr1.Aggregate(11.0, {});
-  aggr1.Aggregate(25.1, {});
-
-  DoubleHistogramAggregation aggr2;
-  aggr2.Aggregate(2.0, {});
-  aggr2.Aggregate(3.0, {});
-  aggr2.Aggregate(13.0, {});
-  aggr2.Aggregate(28.1, {});
-  aggr2.Aggregate(105.0, {});
-
-  auto aggr3     = aggr1.Merge(aggr2);
-  histogram_data = nostd::get<HistogramPointData>(aggr3->ToPoint());
-
-  EXPECT_EQ(histogram_data.count_, 8);      // 3 each from aggr1 and aggr2
-  EXPECT_EQ(histogram_data.counts_[1], 3);  // 1.0, 2.0, 3.0
-  EXPECT_EQ(histogram_data.counts_[3], 2);  // 11.0, 13.0
-  EXPECT_EQ(histogram_data.counts_[4], 2);  // 25.1, 28.1
-  EXPECT_EQ(histogram_data.counts_[7], 1);  // 105.0
-  EXPECT_EQ(nostd::get<double>(histogram_data.min_), 1);
-  EXPECT_EQ(nostd::get<double>(histogram_data.max_), 105);
-
-  // Diff
-  auto aggr4     = aggr1.Diff(aggr2);
-  histogram_data = nostd::get<HistogramPointData>(aggr4->ToPoint());
-  EXPECT_EQ(histogram_data.count_, 2);      // aggr2:5 - aggr1:3
-  EXPECT_EQ(histogram_data.counts_[1], 1);  // aggr2(2.0, 3.0) - aggr1(1.0)
-  EXPECT_EQ(histogram_data.counts_[3], 0);  // aggr2(13.0) - aggr1(11.0)
-  EXPECT_EQ(histogram_data.counts_[4], 0);  // aggr2(28.1) - aggr1(25.1)
-  EXPECT_EQ(histogram_data.counts_[7], 1);  // aggr2(105.0) - aggr1(0)
-}
-
-TEST(Aggregation, Base2ExponentialHistogramAggregation)
-{
-  // Low res histo
-  auto SCALE0       = 0;
-  auto MAX_BUCKETS0 = 7;
-  Base2ExponentialHistogramAggregationConfig scale0_config;
-  scale0_config.max_scale_      = SCALE0;
-  scale0_config.max_buckets_    = MAX_BUCKETS0;
-  scale0_config.record_min_max_ = true;
-  Base2ExponentialHistogramAggregation scale0_aggr(&scale0_config);
-  auto point = scale0_aggr.ToPoint();
-  ASSERT_TRUE(nostd::holds_alternative<Base2ExponentialHistogramPointData>(point));
-  auto histo_point = nostd::get<Base2ExponentialHistogramPointData>(point);
-  EXPECT_EQ(histo_point.count_, 0);
-  EXPECT_EQ(histo_point.sum_, 0.0);
-  EXPECT_EQ(histo_point.zero_count_, 0);
-  EXPECT_EQ(histo_point.min_, (std::numeric_limits<double>::max)());
-  EXPECT_EQ(histo_point.max_, (std::numeric_limits<double>::min)());
-  EXPECT_EQ(histo_point.scale_, SCALE0);
-  EXPECT_EQ(histo_point.max_buckets_, MAX_BUCKETS0);
-  ASSERT_TRUE(histo_point.positive_buckets_ != nullptr);
-  ASSERT_TRUE(histo_point.negative_buckets_ != nullptr);
-  ASSERT_TRUE(histo_point.positive_buckets_->Empty());
-  ASSERT_TRUE(histo_point.negative_buckets_->Empty());
-
-  // Create a new aggreagte based in point data
-  {
-    auto point_data = histo_point;
-    Base2ExponentialHistogramAggregation scale0_aggr2(point_data);
-    scale0_aggr2.Aggregate(0.0, {});
-
-    auto histo_point2 = nostd::get<Base2ExponentialHistogramPointData>(point);
-    EXPECT_EQ(histo_point2.count_, 0);
-    EXPECT_EQ(histo_point2.sum_, 0.0);
-    EXPECT_EQ(histo_point2.zero_count_, 0);
-    EXPECT_EQ(histo_point2.min_, (std::numeric_limits<double>::max)());
-    EXPECT_EQ(histo_point2.max_, (std::numeric_limits<double>::min)());
-    EXPECT_EQ(histo_point2.scale_, SCALE0);
-    EXPECT_EQ(histo_point2.max_buckets_, MAX_BUCKETS0);
-    ASSERT_TRUE(histo_point2.positive_buckets_->Empty());
-    ASSERT_TRUE(histo_point2.negative_buckets_->Empty());
-  }
-
-  // zero point
-  scale0_aggr.Aggregate(static_cast<int64_t>(0.0), {});
-  histo_point = nostd::get<Base2ExponentialHistogramPointData>(scale0_aggr.ToPoint());
-  EXPECT_EQ(histo_point.count_, 1);
-  EXPECT_EQ(histo_point.zero_count_, 1);
-
-  // Two recordings in the same bucket (bucket 1 at scale 0)
-  scale0_aggr.Aggregate(3.0, {});
-  scale0_aggr.Aggregate(3.5, {});
-  histo_point = nostd::get<Base2ExponentialHistogramPointData>(scale0_aggr.ToPoint());
-  EXPECT_EQ(histo_point.count_, 3);
-  EXPECT_EQ(histo_point.sum_, 6.5);
-  EXPECT_EQ(histo_point.min_, 0.0);
-  EXPECT_EQ(histo_point.max_, 3.5);
-  ASSERT_TRUE(histo_point.positive_buckets_ != nullptr);
-  ASSERT_TRUE(histo_point.negative_buckets_ != nullptr);
-  ASSERT_FALSE(histo_point.positive_buckets_->Empty());
-  auto start_index = histo_point.positive_buckets_->StartIndex();
-  auto end_index   = histo_point.positive_buckets_->EndIndex();
-  EXPECT_EQ(start_index, 1);
-  EXPECT_EQ(end_index, 1);
-  EXPECT_EQ(histo_point.positive_buckets_->Get(start_index), 2);
-
-  // Recording in a different bucket (bucket -2 at scale 0)
-  scale0_aggr.Aggregate(-0.3, {});
-  histo_point = nostd::get<Base2ExponentialHistogramPointData>(scale0_aggr.ToPoint());
-  EXPECT_EQ(histo_point.count_, 4);
-  EXPECT_EQ(histo_point.sum_, 6.2);
-  EXPECT_EQ(histo_point.min_, -0.3);
-  EXPECT_EQ(histo_point.max_, 3.5);
-  ASSERT_TRUE(histo_point.positive_buckets_ != nullptr);
-  ASSERT_TRUE(histo_point.negative_buckets_ != nullptr);
-  EXPECT_EQ(histo_point.negative_buckets_->Get(-2), 1);
-  EXPECT_EQ(histo_point.positive_buckets_->Get(1), 2);
-
-  Base2ExponentialHistogramAggregationConfig scale1_config;
-  scale1_config.max_scale_      = 1;
-  scale1_config.max_buckets_    = 14;
-  scale1_config.record_min_max_ = true;
-  Base2ExponentialHistogramAggregation scale1_aggr(&scale1_config);
-
-  scale1_aggr.Aggregate(0.0, {});
-  scale1_aggr.Aggregate(3.0, {});
-  scale1_aggr.Aggregate(3.5, {});
-  scale1_aggr.Aggregate(0.3, {});
-  auto scale1_point = nostd::get<Base2ExponentialHistogramPointData>(scale1_aggr.ToPoint());
-  EXPECT_EQ(scale1_point.count_, 4);
-  EXPECT_EQ(scale1_point.sum_, 6.8);
-  EXPECT_EQ(scale1_point.zero_count_, 1);
-  EXPECT_EQ(scale1_point.min_, 0.0);
-  EXPECT_EQ(scale1_point.max_, 3.5);
-
-  // Merge test
-  auto merged       = scale0_aggr.Merge(scale1_aggr);
-  auto merged_point = nostd::get<Base2ExponentialHistogramPointData>(merged->ToPoint());
-  EXPECT_EQ(merged_point.count_, 8);
-  EXPECT_EQ(merged_point.sum_, 13.0);
-  EXPECT_EQ(merged_point.zero_count_, 2);
-  EXPECT_EQ(merged_point.min_, -0.3);
-  EXPECT_EQ(merged_point.max_, 3.5);
-  EXPECT_EQ(merged_point.scale_, 0);
-  ASSERT_TRUE(merged_point.positive_buckets_ != nullptr);
-  ASSERT_TRUE(merged_point.negative_buckets_ != nullptr);
-  EXPECT_EQ(merged_point.positive_buckets_->Get(1), 4);
-  EXPECT_EQ(merged_point.negative_buckets_->Get(-2), 1);
-  EXPECT_EQ(merged_point.positive_buckets_->Get(2), 0);
-
-  // Diff test
-  Base2ExponentialHistogramAggregation scale2_aggr(&scale1_config);
-  Base2ExponentialHistogramAggregation scale3_aggr(&scale1_config);
-  scale2_aggr.Aggregate(2.0, {});
-  scale2_aggr.Aggregate(4.0, {});
-  scale2_aggr.Aggregate(2.5, {});
-
-  scale3_aggr.Aggregate(2.0, {});
-  scale3_aggr.Aggregate(2.3, {});
-  scale3_aggr.Aggregate(2.5, {});
-  scale3_aggr.Aggregate(4.0, {});
-
-  auto diffd       = scale2_aggr.Diff(scale3_aggr);
-  auto diffd_point = nostd::get<Base2ExponentialHistogramPointData>(diffd->ToPoint());
-  EXPECT_EQ(diffd_point.count_, 1);
-  EXPECT_NEAR(diffd_point.sum_, 2.3, 1e-9);
-  EXPECT_EQ(diffd_point.zero_count_, 0);
-  EXPECT_EQ(diffd_point.scale_, 1);
-  ASSERT_TRUE(diffd_point.positive_buckets_ != nullptr);
-  ASSERT_TRUE(diffd_point.negative_buckets_ != nullptr);
-  EXPECT_EQ(diffd_point.positive_buckets_->Get(2), 1);
-}
-
-TEST(Aggregation, Base2ExponentialHistogramAggregationMerge)
-{
-  Base2ExponentialHistogramAggregationConfig config;
-  config.max_scale_      = 10;
-  config.max_buckets_    = 100;
-  config.record_min_max_ = true;
-
-  Base2ExponentialHistogramAggregation aggr(&config);
-
-  int expected_count  = 0;
-  double expected_sum = 0.0;
-
-  // Aggregate some small values
-  for (int i = 1; i < 10; ++i)
-  {
-    expected_count++;
-    const double value = i * 1e-12;
-    expected_sum += value;
-    aggr.Aggregate(value);
-  }
-
-  const auto aggr_point = nostd::get<Base2ExponentialHistogramPointData>(aggr.ToPoint());
-
-  ASSERT_EQ(aggr_point.count_, expected_count);
-  ASSERT_DOUBLE_EQ(aggr_point.sum_, expected_sum);
-  ASSERT_EQ(aggr_point.zero_count_, 0);
-  ASSERT_GT(aggr_point.scale_, -10);
-  ASSERT_EQ(aggr_point.max_buckets_, config.max_buckets_);
-
-  auto test_merge = [](const std::unique_ptr<Aggregation> &merged_aggr, int expected_count,
-                       double expected_sum, int expected_zero_count, int expected_scale,
-                       int expected_max_buckets) {
-    auto merged_point = nostd::get<Base2ExponentialHistogramPointData>(merged_aggr->ToPoint());
-    EXPECT_EQ(merged_point.count_, expected_count);
-    EXPECT_DOUBLE_EQ(merged_point.sum_, expected_sum);
-    EXPECT_EQ(merged_point.zero_count_, expected_zero_count);
-    EXPECT_EQ(merged_point.scale_, expected_scale);
-    EXPECT_EQ(merged_point.max_buckets_, expected_max_buckets);
-  };
-
-  // default aggregation merge
-  {
-    InstrumentDescriptor descriptor;
-    descriptor.type_        = InstrumentType::kHistogram;
-    descriptor.unit_        = "unit";
-    descriptor.name_        = "histogram";
-    descriptor.description_ = "a histogram";
-    descriptor.value_type_  = InstrumentValueType::kDouble;
-
-    auto default_aggr = DefaultAggregation::CreateAggregation(
-        AggregationType::kBase2ExponentialHistogram, descriptor);
-    auto default_point = nostd::get<Base2ExponentialHistogramPointData>(default_aggr->ToPoint());
-
-    const int expected_scale =
-        aggr_point.scale_ < default_point.scale_ ? aggr_point.scale_ : default_point.scale_;
-    const int expected_max_buckets = aggr_point.max_buckets_ < default_point.max_buckets_
-                                         ? aggr_point.max_buckets_
-                                         : default_point.max_buckets_;
-    const int expected_zero_count  = 0;
-
-    auto merged_from_default = aggr.Merge(*default_aggr);
-    test_merge(merged_from_default, expected_count, expected_sum, expected_zero_count,
-               expected_scale, expected_max_buckets);
-
-    auto merged_to_default = default_aggr->Merge(aggr);
-    test_merge(merged_to_default, expected_count, expected_sum, expected_zero_count, expected_scale,
-               expected_max_buckets);
-  }
-
-  // zero count aggregation merge (Zero is a special case and does not increment the buckets)
-  {
-    Base2ExponentialHistogramAggregation zero_aggr(&config);
-    zero_aggr.Aggregate(0.0);
-
-    const auto zero_point = nostd::get<Base2ExponentialHistogramPointData>(zero_aggr.ToPoint());
-    const int expected_scale =
-        aggr_point.scale_ < zero_point.scale_ ? aggr_point.scale_ : zero_point.scale_;
-    const int expected_max_buckets = aggr_point.max_buckets_ < zero_point.max_buckets_
-                                         ? aggr_point.max_buckets_
-                                         : zero_point.max_buckets_;
-    const int expected_zero_count  = 1;
-
-    auto merged_from_zero = aggr.Merge(zero_aggr);
-    test_merge(merged_from_zero, expected_count + 1, expected_sum, expected_zero_count,
-               expected_scale, expected_max_buckets);
-
-    auto merged_to_zero = zero_aggr.Merge(aggr);
-    test_merge(merged_to_zero, expected_count + 1, expected_sum, expected_zero_count,
-               expected_scale, expected_max_buckets);
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/async_instruments_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/async_instruments_test.cc
deleted file mode 100644
index 17612a833..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/async_instruments_test.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/sdk/metrics/async_instruments.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/multi_metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/observable_registry.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::metrics;
-
-using M = std::map<std::string, std::string>;
-
-namespace
-{
-// NOLINTNEXTLINE
-void asyc_generate_measurements(opentelemetry::metrics::ObserverResult /* observer */,
-                                void * /* state */)
-{}
-}  // namespace
-
-TEST(AsyncInstruments, ObservableInstrument)
-{
-  InstrumentDescriptor instrument_descriptor = {"long_counter", "description", "1",
-                                                InstrumentType::kObservableCounter,
-                                                InstrumentValueType::kLong};
-  std::shared_ptr<ObservableRegistry> observable_registry(new ObservableRegistry());
-  std::unique_ptr<AsyncWritableMetricStorage> metric_storage(new AsyncMultiMetricStorage());
-  ObservableInstrument observable_counter_long(instrument_descriptor, std::move(metric_storage),
-                                               observable_registry);
-  observable_counter_long.AddCallback(asyc_generate_measurements, nullptr);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/async_metric_storage_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/async_metric_storage_test.cc
deleted file mode 100644
index 542415a90..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/async_metric_storage_test.cc
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <chrono>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/async_metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#endif
-
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::resource;
-using namespace opentelemetry::common;
-namespace nostd = opentelemetry::nostd;
-
-using M = std::map<std::string, std::string>;
-
-class WritableMetricStorageTestFixture : public ::testing::TestWithParam<AggregationTemporality>
-{};
-
-class WritableMetricStorageTestUpDownFixture
-    : public ::testing::TestWithParam<AggregationTemporality>
-{};
-
-class WritableMetricStorageTestObservableGaugeFixture
-    : public ::testing::TestWithParam<AggregationTemporality>
-{};
-
-TEST_P(WritableMetricStorageTestFixture, TestAggregation)
-{
-  AggregationTemporality temporality = GetParam();
-
-  InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kObservableCounter,
-                                     InstrumentValueType::kLong};
-
-  auto sdk_start_ts = std::chrono::system_clock::now();
-  // Some computation here
-  auto collection_ts = std::chrono::system_clock::now() + std::chrono::seconds(5);
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  opentelemetry::sdk::metrics::AsyncMetricStorage storage(
-      instr_desc, AggregationType::kSum,
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-  int64_t get_count1                                                                  = 20;
-  int64_t put_count1                                                                  = 10;
-  std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> measurements1 = {
-      {{{"RequestType", "GET"}}, get_count1}, {{{"RequestType", "PUT"}}, put_count1}};
-  storage.RecordLong(measurements1,
-                     opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
-
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), get_count1);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), put_count1);
-          }
-        }
-        return true;
-      });
-  // subsequent recording after collection shouldn't fail
-  // monotonic increasing values;
-  int64_t get_count2 = 50;
-  int64_t put_count2 = 70;
-
-  std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> measurements2 = {
-      {{{"RequestType", "GET"}}, get_count2}, {{{"RequestType", "PUT"}}, put_count2}};
-  storage.RecordLong(measurements2,
-                     opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), get_count2);
-            }
-            else
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), get_count2 - get_count1);
-            }
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), put_count2);
-            }
-            else
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), put_count2 - put_count1);
-            }
-          }
-        }
-        return true;
-      });
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestLong,
-                         WritableMetricStorageTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
-
-TEST_P(WritableMetricStorageTestUpDownFixture, TestAggregation)
-{
-  AggregationTemporality temporality = GetParam();
-
-  InstrumentDescriptor instr_desc = {"name", "desc", "1unit",
-                                     InstrumentType::kObservableUpDownCounter,
-                                     InstrumentValueType::kLong};
-
-  auto sdk_start_ts = std::chrono::system_clock::now();
-  // Some computation here
-  auto collection_ts = std::chrono::system_clock::now() + std::chrono::seconds(5);
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  opentelemetry::sdk::metrics::AsyncMetricStorage storage(
-      instr_desc, AggregationType::kDefault,
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-  int64_t get_count1                                                                  = 20;
-  int64_t put_count1                                                                  = 10;
-  std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> measurements1 = {
-      {{{"RequestType", "GET"}}, get_count1}, {{{"RequestType", "PUT"}}, put_count1}};
-  storage.RecordLong(measurements1,
-                     opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
-
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), get_count1);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), put_count1);
-          }
-        }
-        return true;
-      });
-  // subsequent recording after collection shouldn't fail
-  // monotonic increasing values;
-  int64_t get_count2 = -50;
-  int64_t put_count2 = -70;
-
-  std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> measurements2 = {
-      {{{"RequestType", "GET"}}, get_count2}, {{{"RequestType", "PUT"}}, put_count2}};
-  storage.RecordLong(measurements2,
-                     opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), get_count2);
-            }
-            else
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), get_count2 - get_count1);
-            }
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), put_count2);
-            }
-            else
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), put_count2 - put_count1);
-            }
-          }
-        }
-        return true;
-      });
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestUpDownLong,
-                         WritableMetricStorageTestUpDownFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
-
-TEST_P(WritableMetricStorageTestObservableGaugeFixture, TestAggregation)
-{
-  AggregationTemporality temporality = GetParam();
-
-  InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kObservableGauge,
-                                     InstrumentValueType::kLong};
-
-  auto sdk_start_ts = std::chrono::system_clock::now();
-  // Some computation here
-  auto collection_ts = std::chrono::system_clock::now() + std::chrono::seconds(5);
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  opentelemetry::sdk::metrics::AsyncMetricStorage storage(
-      instr_desc, AggregationType::kLastValue,
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-  int64_t freq_cpu0                                                                   = 3;
-  int64_t freq_cpu1                                                                   = 5;
-  std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> measurements1 = {
-      {{{"CPU", "0"}}, freq_cpu0}, {{{"CPU", "1"}}, freq_cpu1}};
-  storage.RecordLong(measurements1,
-                     opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
-
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (auto data_attr : metric_data.point_data_attr_)
-        {
-          auto data = opentelemetry::nostd::get<LastValuePointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(data_attr.attributes.find("CPU")->second) ==
-              "0")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), freq_cpu0);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("CPU")->second) == "1")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), freq_cpu1);
-          }
-        }
-        return true;
-      });
-
-  freq_cpu0 = 6;
-  freq_cpu1 = 8;
-
-  std::unordered_map<MetricAttributes, int64_t, AttributeHashGenerator> measurements2 = {
-      {{{"CPU", "0"}}, freq_cpu0}, {{{"CPU", "1"}}, freq_cpu1}};
-  storage.RecordLong(measurements2,
-                     opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (auto data_attr : metric_data.point_data_attr_)
-        {
-          auto data = opentelemetry::nostd::get<LastValuePointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(data_attr.attributes.find("CPU")->second) ==
-              "0")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), freq_cpu0);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("CPU")->second) == "1")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), freq_cpu1);
-          }
-        }
-        return true;
-      });
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestObservableGaugeFixtureLong,
-                         WritableMetricStorageTestObservableGaugeFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_hashmap_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_hashmap_benchmark.cc
deleted file mode 100644
index a44199878..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_hashmap_benchmark.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <thread>
-#include <vector>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/drop_aggregation.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-using namespace opentelemetry::sdk::metrics;
-constexpr size_t MAX_THREADS = 500;
-namespace
-{
-
-void BM_AttributseHashMap(benchmark::State &state)
-{
-
-  AttributesHashMap hash_map;
-  std::vector<std::thread> workers;
-  std::vector<MetricAttributes> attributes = {{{"k1", "v1"}, {"k2", "v2"}},
-                                              {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}}};
-
-  std::mutex m;
-
-  auto work = [&attributes, &hash_map, &m](const size_t i) {
-    std::function<std::unique_ptr<Aggregation>()> create_default_aggregation =
-        []() -> std::unique_ptr<Aggregation> {
-      return std::unique_ptr<Aggregation>(new DropAggregation);
-    };
-    m.lock();
-    hash_map.GetOrSetDefault(attributes[i % 2], create_default_aggregation)
-        ->Aggregate(static_cast<int64_t>(1));
-    benchmark::DoNotOptimize(hash_map.Has(attributes[i % 2]));
-    m.unlock();
-  };
-  while (state.KeepRunning())
-  {
-    for (size_t i = 0; i < MAX_THREADS; i++)
-    {
-      workers.push_back(std::thread(work, i));
-    }
-  }
-
-  for (auto &t : workers)
-  {
-    t.join();
-  }
-}
-
-BENCHMARK(BM_AttributseHashMap);
-}  // namespace
-
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_hashmap_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_hashmap_test.cc
deleted file mode 100644
index c51f4fe80..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_hashmap_test.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <functional>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/common/attributemap_hash.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/drop_aggregation.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-using namespace opentelemetry::sdk::metrics;
-namespace nostd = opentelemetry::nostd;
-
-TEST(AttributesHashMap, BasicTests)
-{
-  // Empty map
-  AttributesHashMap hash_map;
-  EXPECT_EQ(hash_map.Size(), 0);
-  MetricAttributes m1 = {{"k1", "v1"}};
-
-  EXPECT_EQ(hash_map.Get(m1), nullptr);
-  EXPECT_EQ(hash_map.Has(m1), false);
-
-  // Set
-  std::unique_ptr<Aggregation> aggregation1(
-      new DropAggregation());  //  = std::unique_ptr<Aggregation>(new DropAggregation);
-  hash_map.Set(m1, std::move(aggregation1));
-  hash_map.Get(m1)->Aggregate(static_cast<int64_t>(1));
-  EXPECT_EQ(hash_map.Size(), 1);
-  EXPECT_EQ(hash_map.Has(m1), true);
-
-  // Set same key again
-  auto aggregation2 = std::unique_ptr<Aggregation>(new DropAggregation());
-  hash_map.Set(m1, std::move(aggregation2));
-  hash_map.Get(m1)->Aggregate(static_cast<int64_t>(1));
-  EXPECT_EQ(hash_map.Size(), 1);
-  EXPECT_EQ(hash_map.Has(m1), true);
-
-  // Set more enteria
-  auto aggregation3   = std::unique_ptr<Aggregation>(new DropAggregation());
-  MetricAttributes m3 = {{"k1", "v1"}, {"k2", "v2"}};
-  hash_map.Set(m3, std::move(aggregation3));
-  EXPECT_EQ(hash_map.Has(m1), true);
-  EXPECT_EQ(hash_map.Has(m3), true);
-  hash_map.Get(m3)->Aggregate(static_cast<int64_t>(1));
-  EXPECT_EQ(hash_map.Size(), 2);
-
-  // GetOrSetDefault
-  std::function<std::unique_ptr<Aggregation>()> create_default_aggregation =
-      []() -> std::unique_ptr<Aggregation> {
-    return std::unique_ptr<Aggregation>(new DropAggregation);
-  };
-  MetricAttributes m4 = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
-  hash_map.GetOrSetDefault(m4, create_default_aggregation)->Aggregate(static_cast<int64_t>(1));
-  EXPECT_EQ(hash_map.Size(), 3);
-
-  // Set attributes with different order - shouldn't create a new entry.
-  MetricAttributes m5 = {{"k2", "v2"}, {"k1", "v1"}};
-  EXPECT_EQ(hash_map.Has(m5), true);
-
-  // Set attributes with different order - shouldn't create a new entry.
-  MetricAttributes m6 = {{"k1", "v2"}, {"k2", "v1"}};
-  EXPECT_EQ(hash_map.Has(m6), false);
-
-  // GetAllEnteries
-  size_t count = 0;
-  hash_map.GetAllEnteries(
-      [&count](const MetricAttributes & /* attributes */, Aggregation & /* aggregation */) {
-        count++;
-        return true;
-      });
-  EXPECT_EQ(count, hash_map.Size());
-}
-
-class MetricAttributeMapHashForCollision
-{
-public:
-  size_t operator()(const MetricAttributes & /*attributes*/) const { return 42; }
-};
-
-TEST(AttributesHashMap, CollisionTest)
-{
-  // The hash on MetricsAttributes will be ignored by MetricAttributeMapHashForCollision
-  MetricAttributes m1 = {{"k1", "v1"}};
-  MetricAttributes m2 = {{"k2", "v2"}};
-  MetricAttributes m3 = {{"k1", "v1"}, {"k2", "v2"}};
-  MetricAttributes m4 = {};
-
-  AttributesHashMapWithCustomHash<MetricAttributeMapHashForCollision> hash_map;
-
-  hash_map.Set(m1, std::unique_ptr<Aggregation>(new DropAggregation()));
-  hash_map.Set(m2, std::unique_ptr<Aggregation>(new DropAggregation()));
-  hash_map.Set(m3, std::unique_ptr<Aggregation>(new DropAggregation()));
-  hash_map.Set(m4, std::unique_ptr<Aggregation>(new DropAggregation()));
-
-  EXPECT_EQ(hash_map.Size(), 4);
-  EXPECT_EQ(hash_map.Has(m1), true);
-  EXPECT_EQ(hash_map.Has(m2), true);
-  EXPECT_EQ(hash_map.Has(m3), true);
-  EXPECT_EQ(hash_map.Has(m4), true);
-
-  MetricAttributes m5 = {{"k2", "v1"}};
-  EXPECT_EQ(hash_map.Has(m5), false);
-
-  //
-  // Verify only one bucket used based on the custom hash
-  //
-  size_t total_active_buckets = 0;
-  size_t total_elements       = 0;
-  for (size_t i = 0; i < hash_map.BucketCount(); i++)
-  {
-    size_t bucket_size = hash_map.BucketSize(i);
-    if (bucket_size > 0)
-    {
-      total_active_buckets++;
-      total_elements += bucket_size;
-    }
-  }
-  EXPECT_EQ(total_active_buckets, 1);
-  EXPECT_EQ(total_elements, 4);
-}
-
-TEST(AttributesHashMap, HashConsistencyAcrossStringTypes)
-{
-  const char *c_str                 = "teststring";
-  std::string std_str               = "teststring";
-  nostd::string_view nostd_str_view = "teststring";
-#if __cplusplus >= 201703L
-  std::string_view std_str_view = "teststring";
-#endif
-
-  size_t hash_c_str          = 0;
-  size_t hash_std_str        = 0;
-  size_t hash_nostd_str_view = 0;
-#if __cplusplus >= 201703L
-  size_t hash_std_str_view = 0;
-#endif
-
-  opentelemetry::sdk::common::GetHash(hash_c_str, c_str);
-  opentelemetry::sdk::common::GetHash(hash_std_str, std_str);
-  opentelemetry::sdk::common::GetHash(hash_nostd_str_view, nostd_str_view);
-#if __cplusplus >= 201703L
-  opentelemetry::sdk::common::GetHash(hash_std_str_view, std_str_view);
-#endif
-
-  EXPECT_EQ(hash_c_str, hash_std_str);
-  EXPECT_EQ(hash_c_str, hash_nostd_str_view);
-#if __cplusplus >= 201703L
-  EXPECT_EQ(hash_c_str, hash_std_str_view);
-#endif
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_processor_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_processor_benchmark.cc
deleted file mode 100644
index 70e4d2713..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_processor_benchmark.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <map>
-#include <string>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-using namespace opentelemetry::sdk::metrics;
-namespace
-{
-void BM_AttributseProcessorFilter(benchmark::State &state)
-{
-  std::map<std::string, int> attributes = {
-      {"att1", 10}, {"attr1", 20}, {"attr3", 30}, {"attr4", 40}};
-  FilteringAttributesProcessor attributes_processor(
-      {{"attr2", true}, {"attr4", true}, {"attr6", true}});
-  opentelemetry::common::KeyValueIterableView<std::map<std::string, int>> iterable(attributes);
-  while (state.KeepRunning())
-  {
-    auto filtered_attributes = attributes_processor.process(iterable);
-  }
-}
-
-BENCHMARK(BM_AttributseProcessorFilter);
-}  // namespace
-
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_processor_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_processor_test.cc
deleted file mode 100644
index 25652ed3e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/attributes_processor_test.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::common;
-using namespace opentelemetry::sdk::common;
-
-TEST(AttributesProcessor, FilteringAttributesProcessor)
-{
-  const int kNumFilterAttributes               = 3;
-  std::unordered_map<std::string, bool> filter = {
-      {"attr2", true}, {"attr4", true}, {"attr6", true}};
-  const int kNumAttributes              = 6;
-  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3", "attr4", "attr5", "attr6"};
-  int values[kNumAttributes]            = {10, 20, 30, 40, 50, 60};
-  std::map<std::string, int> attributes = {{keys[0], values[0]}, {keys[1], values[1]},
-                                           {keys[2], values[2]}, {keys[3], values[3]},
-                                           {keys[4], values[4]}, {keys[5], values[5]}};
-  FilteringAttributesProcessor attributes_processor(filter);
-  opentelemetry::common::KeyValueIterableView<std::map<std::string, int>> iterable(attributes);
-  auto filtered_attributes = attributes_processor.process(iterable);
-  for (auto &e : filtered_attributes)
-  {
-    EXPECT_FALSE(filter.find(e.first) == filter.end());
-  }
-  EXPECT_EQ(filter.size(), kNumFilterAttributes);
-}
-
-TEST(AttributesProcessor, FilteringAllAttributesProcessor)
-{
-  const int kNumFilterAttributes               = 0;
-  std::unordered_map<std::string, bool> filter = {};
-  const int kNumAttributes                     = 6;
-  std::string keys[kNumAttributes]      = {"attr1", "attr2", "attr3", "attr4", "attr5", "attr6"};
-  int values[kNumAttributes]            = {10, 20, 30, 40, 50, 60};
-  std::map<std::string, int> attributes = {{keys[0], values[0]}, {keys[1], values[1]},
-                                           {keys[2], values[2]}, {keys[3], values[3]},
-                                           {keys[4], values[4]}, {keys[5], values[5]}};
-  FilteringAttributesProcessor attributes_processor(filter);
-  opentelemetry::common::KeyValueIterableView<std::map<std::string, int>> iterable(attributes);
-  auto filtered_attributes = attributes_processor.process(iterable);
-  EXPECT_EQ(filter.size(), kNumFilterAttributes);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/base2_exponential_histogram_indexer_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/base2_exponential_histogram_indexer_benchmark.cc
deleted file mode 100644
index 40ea14d57..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/base2_exponential_histogram_indexer_benchmark.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <stdint.h>
-#include <array>
-#include <random>
-
-#include "opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_indexer.h"
-
-using namespace opentelemetry::sdk::metrics;
-namespace
-{
-
-void BM_NewIndexer(benchmark::State &state)
-{
-  std::array<int, 1000> batch;
-  std::default_random_engine generator;
-  std::uniform_int_distribution<int> distribution(1, 32);
-
-  while (state.KeepRunningBatch(static_cast<benchmark::IterationCount>(batch.size())))
-  {
-    state.PauseTiming();
-    for (auto &value : batch)
-    {
-      value = distribution(generator);
-    }
-    state.ResumeTiming();
-
-    for (const auto value : batch)
-    {
-      benchmark::DoNotOptimize(Base2ExponentialHistogramIndexer(value));
-    }
-  }
-}
-
-BENCHMARK(BM_NewIndexer);
-
-void BM_ComputeIndex(benchmark::State &state)
-{
-  std::array<double, 1000> batch;
-  std::default_random_engine generator;
-  std::uniform_real_distribution<double> distribution(0, 1000);
-  Base2ExponentialHistogramIndexer indexer(static_cast<int32_t>(state.range(0)));
-
-  while (state.KeepRunningBatch(static_cast<benchmark::IterationCount>(batch.size())))
-  {
-    state.PauseTiming();
-    for (auto &value : batch)
-    {
-      value = distribution(generator);
-    }
-    state.ResumeTiming();
-
-    for (const auto value : batch)
-    {
-      benchmark::DoNotOptimize(indexer.ComputeIndex(value));
-    }
-  }
-}
-
-BENCHMARK(BM_ComputeIndex)->Arg(-1)->Arg(0)->Arg(1)->Arg(20);
-
-}  // namespace
-
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/base2_exponential_histogram_indexer_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/base2_exponential_histogram_indexer_test.cc
deleted file mode 100644
index 716985e7c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/base2_exponential_histogram_indexer_test.cc
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdlib.h>
-#include <limits>
-
-#include "opentelemetry/sdk/metrics/aggregation/base2_exponential_histogram_indexer.h"
-
-using namespace opentelemetry::sdk::metrics;
-
-TEST(Base2ExponentialHistogramIndexerTest, ScaleOne)
-{
-  const Base2ExponentialHistogramIndexer indexer{1};
-  auto compute_index = [indexer](double value) { return indexer.ComputeIndex(value); };
-
-  EXPECT_EQ(compute_index(std::numeric_limits<double>::max()), 2047);
-  EXPECT_EQ(compute_index(strtod("0x1p1023", nullptr)), 2045);
-  EXPECT_EQ(compute_index(strtod("0x1.1p1023", nullptr)), 2046);
-  EXPECT_EQ(compute_index(strtod("0x1p1022", nullptr)), 2043);
-  EXPECT_EQ(compute_index(strtod("0x1.1p1022", nullptr)), 2044);
-  EXPECT_EQ(compute_index(strtod("0x1p-1022", nullptr)), -2045);
-  EXPECT_EQ(compute_index(strtod("0x1.1p-1022", nullptr)), -2044);
-  EXPECT_EQ(compute_index(strtod("0x1p-1021", nullptr)), -2043);
-  EXPECT_EQ(compute_index(strtod("0x1.1p-1021", nullptr)), -2042);
-  EXPECT_EQ(compute_index(std::numeric_limits<double>::min()), -2045);
-  EXPECT_EQ(compute_index(std::numeric_limits<double>::denorm_min()), -2149);
-  EXPECT_EQ(compute_index(15.0), 7);
-  EXPECT_EQ(compute_index(9.0), 6);
-  EXPECT_EQ(compute_index(7.0), 5);
-  EXPECT_EQ(compute_index(5.0), 4);
-  EXPECT_EQ(compute_index(3.0), 3);
-  EXPECT_EQ(compute_index(2.5), 2);
-  EXPECT_EQ(compute_index(1.5), 1);
-  EXPECT_EQ(compute_index(1.2), 0);
-  EXPECT_EQ(compute_index(1.0), -1);
-  EXPECT_EQ(compute_index(0.75), -1);
-  EXPECT_EQ(compute_index(0.55), -2);
-  EXPECT_EQ(compute_index(0.45), -3);
-}
-
-TEST(Base2ExponentialHistogramIndexerTest, ScaleZero)
-{
-  const Base2ExponentialHistogramIndexer indexer{0};
-  auto compute_index = [indexer](double value) { return indexer.ComputeIndex(value); };
-
-  // Near +Inf.
-  // Use constant for exp, as max_exponent constant includes bias.
-  EXPECT_EQ(compute_index(std::numeric_limits<double>::max()), 1023);
-  EXPECT_EQ(compute_index(strtod("0x1p1023", nullptr)), 1022);
-  EXPECT_EQ(compute_index(strtod("0x1.1p1023", nullptr)), 1023);
-  EXPECT_EQ(compute_index(strtod("0x1p1022", nullptr)), 1021);
-  EXPECT_EQ(compute_index(strtod("0x1.1p1022", nullptr)), 1022);
-  // Near 0.
-  EXPECT_EQ(compute_index(strtod("0x1p-1022", nullptr)), -1023);
-  EXPECT_EQ(compute_index(strtod("0x1.1p-1022", nullptr)), -1022);
-  EXPECT_EQ(compute_index(strtod("0x1p-1021", nullptr)), -1022);
-  EXPECT_EQ(compute_index(strtod("0x1.1p-1021", nullptr)), -1021);
-  EXPECT_EQ(compute_index(std::numeric_limits<double>::min()), -1023);
-  EXPECT_EQ(compute_index(std::numeric_limits<double>::denorm_min()), -1075);
-  // Near 1.
-  EXPECT_EQ(compute_index(4.0), 1);
-  EXPECT_EQ(compute_index(3.0), 1);
-  EXPECT_EQ(compute_index(2.0), 0);
-  EXPECT_EQ(compute_index(1.5), 0);
-  EXPECT_EQ(compute_index(1.0), -1);
-  EXPECT_EQ(compute_index(0.75), -1);
-  EXPECT_EQ(compute_index(0.51), -1);
-  EXPECT_EQ(compute_index(0.5), -2);
-  EXPECT_EQ(compute_index(0.26), -2);
-  EXPECT_EQ(compute_index(0.25), -3);
-  EXPECT_EQ(compute_index(0.126), -3);
-  EXPECT_EQ(compute_index(0.125), -4);
-}
-
-TEST(Base2ExponentialHistogramIndexerTest, ScaleNegativeOne)
-{
-  const Base2ExponentialHistogramIndexer indexer{-1};
-  auto compute_index = [indexer](double value) { return indexer.ComputeIndex(value); };
-
-  EXPECT_EQ(compute_index(17.0), 2);
-  EXPECT_EQ(compute_index(16.0), 1);
-  EXPECT_EQ(compute_index(15.0), 1);
-  EXPECT_EQ(compute_index(9.0), 1);
-  EXPECT_EQ(compute_index(8.0), 1);
-  EXPECT_EQ(compute_index(5.0), 1);
-  EXPECT_EQ(compute_index(4.0), 0);
-  EXPECT_EQ(compute_index(3.0), 0);
-  EXPECT_EQ(compute_index(2.0), 0);
-  EXPECT_EQ(compute_index(1.5), 0);
-  EXPECT_EQ(compute_index(1.0), -1);
-  EXPECT_EQ(compute_index(0.75), -1);
-  EXPECT_EQ(compute_index(0.5), -1);
-  EXPECT_EQ(compute_index(0.25), -2);
-  EXPECT_EQ(compute_index(0.20), -2);
-  EXPECT_EQ(compute_index(0.13), -2);
-  EXPECT_EQ(compute_index(0.125), -2);
-  EXPECT_EQ(compute_index(0.10), -2);
-  EXPECT_EQ(compute_index(0.0625), -3);
-  EXPECT_EQ(compute_index(0.06), -3);
-}
-
-TEST(Base2ExponentialHistogramIndexerTest, ScaleNegativeFour)
-{
-  const Base2ExponentialHistogramIndexer indexer{-4};
-  auto compute_index = [indexer](double value) { return indexer.ComputeIndex(value); };
-
-  EXPECT_EQ(compute_index(strtod("0x1p0", nullptr)), -1);
-  EXPECT_EQ(compute_index(strtod("0x10p0", nullptr)), 0);
-  EXPECT_EQ(compute_index(strtod("0x100p0", nullptr)), 0);
-  EXPECT_EQ(compute_index(strtod("0x1000p0", nullptr)), 0);
-  EXPECT_EQ(compute_index(strtod("0x10000p0", nullptr)), 0);  // Base == 2**16
-  EXPECT_EQ(compute_index(strtod("0x100000p0", nullptr)), 1);
-  EXPECT_EQ(compute_index(strtod("0x1000000p0", nullptr)), 1);
-  EXPECT_EQ(compute_index(strtod("0x10000000p0", nullptr)), 1);
-  EXPECT_EQ(compute_index(strtod("0x100000000p0", nullptr)), 1);  // == 2**32
-  EXPECT_EQ(compute_index(strtod("0x1000000000p0", nullptr)), 2);
-  EXPECT_EQ(compute_index(strtod("0x10000000000p0", nullptr)), 2);
-  EXPECT_EQ(compute_index(strtod("0x100000000000p0", nullptr)), 2);
-  EXPECT_EQ(compute_index(strtod("0x1000000000000p0", nullptr)), 2);  // 2**48
-  EXPECT_EQ(compute_index(strtod("0x10000000000000p0", nullptr)), 3);
-  EXPECT_EQ(compute_index(strtod("0x100000000000000p0", nullptr)), 3);
-  EXPECT_EQ(compute_index(strtod("0x1000000000000000p0", nullptr)), 3);
-  EXPECT_EQ(compute_index(strtod("0x10000000000000000p0", nullptr)), 3);  // 2**64
-  EXPECT_EQ(compute_index(strtod("0x100000000000000000p0", nullptr)), 4);
-  EXPECT_EQ(compute_index(strtod("0x1000000000000000000p0", nullptr)), 4);
-  EXPECT_EQ(compute_index(strtod("0x10000000000000000000p0", nullptr)), 4);
-  EXPECT_EQ(compute_index(strtod("0x100000000000000000000p0", nullptr)), 4);
-  EXPECT_EQ(compute_index(strtod("0x1000000000000000000000p0", nullptr)), 5);
-  EXPECT_EQ(compute_index(1 / strtod("0x1p0", nullptr)), -1);
-  EXPECT_EQ(compute_index(1 / strtod("0x10p0", nullptr)), -1);
-  EXPECT_EQ(compute_index(1 / strtod("0x100p0", nullptr)), -1);
-  EXPECT_EQ(compute_index(1 / strtod("0x1000p0", nullptr)), -1);
-  EXPECT_EQ(compute_index(1 / strtod("0x10000p0", nullptr)), -2);  // 2**-16
-  EXPECT_EQ(compute_index(1 / strtod("0x100000p0", nullptr)), -2);
-  EXPECT_EQ(compute_index(1 / strtod("0x1000000p0", nullptr)), -2);
-  EXPECT_EQ(compute_index(1 / strtod("0x10000000p0", nullptr)), -2);
-  EXPECT_EQ(compute_index(1 / strtod("0x100000000p0", nullptr)), -3);  // 2**-32
-  EXPECT_EQ(compute_index(1 / strtod("0x1000000000p0", nullptr)), -3);
-  EXPECT_EQ(compute_index(1 / strtod("0x10000000000p0", nullptr)), -3);
-  EXPECT_EQ(compute_index(1 / strtod("0x100000000000p0", nullptr)), -3);
-  EXPECT_EQ(compute_index(1 / strtod("0x1000000000000p0", nullptr)), -4);  // 2**-48
-  EXPECT_EQ(compute_index(1 / strtod("0x10000000000000p0", nullptr)), -4);
-  EXPECT_EQ(compute_index(1 / strtod("0x100000000000000p0", nullptr)), -4);
-  EXPECT_EQ(compute_index(1 / strtod("0x1000000000000000p0", nullptr)), -4);
-  EXPECT_EQ(compute_index(1 / strtod("0x10000000000000000p0", nullptr)), -5);  // 2**-64
-  EXPECT_EQ(compute_index(1 / strtod("0x100000000000000000p0", nullptr)), -5);
-  // Max values.
-  EXPECT_EQ(compute_index(0x1.FFFFFFFFFFFFFp1023), 63);
-  EXPECT_EQ(compute_index(strtod("0x1p1023", nullptr)), 63);
-  EXPECT_EQ(compute_index(strtod("0x1p1019", nullptr)), 63);
-  EXPECT_EQ(compute_index(strtod("0x1p1009", nullptr)), 63);
-  EXPECT_EQ(compute_index(strtod("0x1p1008", nullptr)), 62);
-  EXPECT_EQ(compute_index(strtod("0x1p1007", nullptr)), 62);
-  EXPECT_EQ(compute_index(strtod("0x1p1000", nullptr)), 62);
-  EXPECT_EQ(compute_index(strtod("0x1p0993", nullptr)), 62);
-  EXPECT_EQ(compute_index(strtod("0x1p0992", nullptr)), 61);
-  EXPECT_EQ(compute_index(strtod("0x1p0991", nullptr)), 61);
-  // Min and subnormal values.
-  EXPECT_EQ(compute_index(strtod("0x1p-1074", nullptr)), -68);
-  EXPECT_EQ(compute_index(strtod("0x1p-1073", nullptr)), -68);
-  EXPECT_EQ(compute_index(strtod("0x1p-1072", nullptr)), -68);
-  EXPECT_EQ(compute_index(strtod("0x1p-1057", nullptr)), -67);
-  EXPECT_EQ(compute_index(strtod("0x1p-1056", nullptr)), -67);
-  EXPECT_EQ(compute_index(strtod("0x1p-1041", nullptr)), -66);
-  EXPECT_EQ(compute_index(strtod("0x1p-1040", nullptr)), -66);
-  EXPECT_EQ(compute_index(strtod("0x1p-1025", nullptr)), -65);
-  EXPECT_EQ(compute_index(strtod("0x1p-1024", nullptr)), -65);
-  EXPECT_EQ(compute_index(strtod("0x1p-1023", nullptr)), -64);
-  EXPECT_EQ(compute_index(strtod("0x1p-1022", nullptr)), -64);
-  EXPECT_EQ(compute_index(strtod("0x1p-1009", nullptr)), -64);
-  EXPECT_EQ(compute_index(strtod("0x1p-1008", nullptr)), -64);
-  EXPECT_EQ(compute_index(strtod("0x1p-1007", nullptr)), -63);
-  EXPECT_EQ(compute_index(strtod("0x1p-0993", nullptr)), -63);
-  EXPECT_EQ(compute_index(strtod("0x1p-0992", nullptr)), -63);
-  EXPECT_EQ(compute_index(strtod("0x1p-0991", nullptr)), -62);
-  EXPECT_EQ(compute_index(strtod("0x1p-0977", nullptr)), -62);
-  EXPECT_EQ(compute_index(strtod("0x1p-0976", nullptr)), -62);
-  EXPECT_EQ(compute_index(strtod("0x1p-0975", nullptr)), -61);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/cardinality_limit_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/cardinality_limit_test.cc
deleted file mode 100644
index 801096b26..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/cardinality_limit_test.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <chrono>
-#include <functional>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation.h"
-#include "opentelemetry/sdk/metrics/aggregation/sum_aggregation.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/attributes_hashmap.h"
-#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/sync_metric_storage.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#endif
-
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::common;
-namespace nostd = opentelemetry::nostd;
-
-TEST(CardinalityLimit, AttributesHashMapBasicTests)
-{
-  AttributesHashMap hash_map(10);
-  std::function<std::unique_ptr<Aggregation>()> aggregation_callback =
-      []() -> std::unique_ptr<Aggregation> {
-    return std::unique_ptr<Aggregation>(new LongSumAggregation(true));
-  };
-  // add 10 unique metric points. 9 should be added to hashmap, 10th should be overflow.
-  int64_t record_value = 100;
-  for (auto i = 0; i < 10; i++)
-  {
-    FilteredOrderedAttributeMap attributes = {{"key", std::to_string(i)}};
-    static_cast<LongSumAggregation *>(hash_map.GetOrSetDefault(attributes, aggregation_callback))
-        ->Aggregate(record_value);
-  }
-  EXPECT_EQ(hash_map.Size(), 10);
-  // add 5 unique metric points above limit, they all should get consolidated as single
-  // overflowmetric point.
-  for (auto i = 10; i < 15; i++)
-  {
-    FilteredOrderedAttributeMap attributes = {{"key", std::to_string(i)}};
-    static_cast<LongSumAggregation *>(hash_map.GetOrSetDefault(attributes, aggregation_callback))
-        ->Aggregate(record_value);
-  }
-  EXPECT_EQ(hash_map.Size(), 10);  // only one more metric point should be added as overflow.
-  // record 5 more measurements to already existing (and not-overflow) metric points. They
-  // should get aggregated to these existing metric points.
-  for (auto i = 0; i < 5; i++)
-  {
-    FilteredOrderedAttributeMap attributes = {{"key", std::to_string(i)}};
-    static_cast<LongSumAggregation *>(hash_map.GetOrSetDefault(attributes, aggregation_callback))
-        ->Aggregate(record_value);
-  }
-  EXPECT_EQ(hash_map.Size(), 10);  // no new metric point added
-
-  // get the overflow metric point
-  auto agg1 = hash_map.GetOrSetDefault(kOverflowAttributes, aggregation_callback);
-  EXPECT_NE(agg1, nullptr);
-  auto sum_agg1 = static_cast<LongSumAggregation *>(agg1);
-  EXPECT_EQ(nostd::get<int64_t>(nostd::get<SumPointData>(sum_agg1->ToPoint()).value_),
-            record_value * 6);  // 1 from previous 10, 5 from current 5.
-  // get remaining metric points
-  for (auto i = 0; i < 9; i++)
-  {
-    FilteredOrderedAttributeMap attributes = {{"key", std::to_string(i)}};
-    auto agg2 = hash_map.GetOrSetDefault(attributes, aggregation_callback);
-    EXPECT_NE(agg2, nullptr);
-    auto sum_agg2 = static_cast<LongSumAggregation *>(agg2);
-    if (i < 5)
-    {
-      EXPECT_EQ(nostd::get<int64_t>(nostd::get<SumPointData>(sum_agg2->ToPoint()).value_),
-                record_value * 2);  // 1 from first recording, 1 from third recording
-    }
-    else
-    {
-      EXPECT_EQ(nostd::get<int64_t>(nostd::get<SumPointData>(sum_agg2->ToPoint()).value_),
-                record_value);  // 1 from first recording
-    }
-  }
-}
-
-class WritableMetricStorageCardinalityLimitTestFixture
-    : public ::testing::TestWithParam<AggregationTemporality>
-{};
-
-TEST_P(WritableMetricStorageCardinalityLimitTestFixture, LongCounterSumAggregation)
-{
-  auto sdk_start_ts               = std::chrono::system_clock::now();
-  const size_t attributes_limit   = 10;
-  InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kCounter,
-                                     InstrumentValueType::kLong};
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  SyncMetricStorage storage(instr_desc, AggregationType::kSum, default_attributes_processor.get(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-                            ExemplarFilterType::kAlwaysOff,
-                            ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-                            nullptr, attributes_limit);
-
-  int64_t record_value = 100;
-  // add 9 unique metric points, and 6 more above limit.
-  for (auto i = 0; i < 15; i++)
-  {
-    std::map<std::string, std::string> attributes = {{"key", std::to_string(i)}};
-    storage.RecordLong(record_value,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes),
-                       opentelemetry::context::Context{});
-  }
-  AggregationTemporality temporality = GetParam();
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-  //... Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  bool overflow_present   = false;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          count_attributes++;
-          if (data_attr.attributes.begin()->first == kAttributesLimitOverflowKey)
-          {
-            EXPECT_EQ(nostd::get<int64_t>(data.value_), record_value * 6);
-            overflow_present = true;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, attributes_limit);
-  EXPECT_EQ(overflow_present, true);
-}
-INSTANTIATE_TEST_SUITE_P(All,
-                         WritableMetricStorageCardinalityLimitTestFixture,
-                         ::testing::Values(AggregationTemporality::kDelta));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/circular_buffer_counter_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/circular_buffer_counter_test.cc
deleted file mode 100644
index d98077c9b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/circular_buffer_counter_test.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstdint>
-#include <limits>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-
-using namespace opentelemetry::sdk::metrics;
-
-class AdaptingIntegerArrayTest : public testing::TestWithParam<uint64_t>
-{};
-
-INSTANTIATE_TEST_SUITE_P(InterestingValues,
-                         AdaptingIntegerArrayTest,
-                         testing::Values<uint64_t>(1,
-                                                   std::numeric_limits<uint8_t>::max() + 1ull,
-                                                   std::numeric_limits<uint16_t>::max() + 1ull,
-                                                   std::numeric_limits<uint32_t>::max() + 1ull));
-
-TEST_P(AdaptingIntegerArrayTest, PreservesSizeOnEnlargement)
-{
-  AdaptingIntegerArray counter(10);
-  EXPECT_EQ(counter.Size(), 10);
-  counter.Increment(0, GetParam());
-  EXPECT_EQ(counter.Size(), 10);
-}
-
-TEST_P(AdaptingIntegerArrayTest, IncrementAndGet)
-{
-  AdaptingIntegerArray counter(10);
-  for (int idx = 0; idx < 10; idx += 1)
-  {
-    EXPECT_EQ(counter.Get(idx), 0);
-    counter.Increment(idx, 1);
-    EXPECT_EQ(counter.Get(idx), 1);
-    counter.Increment(idx, GetParam());
-    EXPECT_EQ(counter.Get(idx), GetParam() + 1);
-  }
-}
-
-TEST_P(AdaptingIntegerArrayTest, Copy)
-{
-  AdaptingIntegerArray counter(10);
-  counter.Increment(0, GetParam());
-  EXPECT_EQ(counter.Get(0), GetParam());
-
-  AdaptingIntegerArray copy = counter;
-  EXPECT_EQ(copy.Get(0), GetParam());
-
-  counter.Increment(0, 1);
-  EXPECT_EQ(counter.Get(0), GetParam() + 1);
-  EXPECT_EQ(copy.Get(0), GetParam());
-}
-
-TEST_P(AdaptingIntegerArrayTest, Clear)
-{
-  AdaptingIntegerArray counter(10);
-  counter.Increment(0, GetParam());
-  EXPECT_EQ(counter.Get(0), GetParam());
-
-  counter.Clear();
-  counter.Increment(0, 1);
-  EXPECT_EQ(counter.Get(0), 1);
-}
-
-TEST(AdaptingCircularBufferCounterTest, ReturnsZeroOutsidePopulatedRange)
-{
-  AdaptingCircularBufferCounter counter{10};
-  EXPECT_EQ(counter.Get(0), 0);
-  EXPECT_EQ(counter.Get(100), 0);
-  counter.Increment(2, 1);
-  counter.Increment(99, 1);
-  EXPECT_EQ(counter.Get(0), 0);
-  EXPECT_EQ(counter.Get(100), 0);
-}
-
-TEST(AdaptingCircularBufferCounterTest, ExpandLower)
-{
-  AdaptingCircularBufferCounter counter{160};
-  EXPECT_TRUE(counter.Increment(10, 1));
-  // Add BEFORE the initial see (array index 0) and make sure we wrap around the datastructure.
-  EXPECT_TRUE(counter.Increment(0, 1));
-  EXPECT_EQ(counter.Get(10), 1);
-  EXPECT_EQ(counter.Get(0), 1);
-  EXPECT_EQ(counter.StartIndex(), 0);
-  EXPECT_EQ(counter.EndIndex(), 10);
-  // Add AFTER initial entry and just push back end.
-  EXPECT_TRUE(counter.Increment(20, 1));
-  EXPECT_EQ(counter.Get(20), 1);
-  EXPECT_EQ(counter.Get(10), 1);
-  EXPECT_EQ(counter.Get(0), 1);
-  EXPECT_EQ(counter.StartIndex(), 0);
-  EXPECT_EQ(counter.EndIndex(), 20);
-}
-
-TEST(AdaptingCircularBufferCounterTest, ShouldFailAtLimit)
-{
-  AdaptingCircularBufferCounter counter{10};
-  EXPECT_TRUE(counter.Increment(10, 1));
-  EXPECT_TRUE(counter.Increment(15, 2));
-  EXPECT_TRUE(counter.Increment(6, 3));
-  // Check state
-  EXPECT_EQ(counter.StartIndex(), 6);
-  EXPECT_EQ(counter.EndIndex(), 15);
-  EXPECT_EQ(counter.Get(6), 3);
-  EXPECT_EQ(counter.Get(10), 1);
-  EXPECT_EQ(counter.Get(15), 2);
-  // Adding over the maximum # of buckets
-  EXPECT_FALSE(counter.Increment(5, 1));
-  EXPECT_FALSE(counter.Increment(16, 1));
-}
-
-TEST(AdaptingCircularBufferCounterTest, ShouldCopyCounters)
-{
-  AdaptingCircularBufferCounter counter{2};
-  EXPECT_TRUE(counter.Increment(2, 1));
-  EXPECT_TRUE(counter.Increment(1, 1));
-  EXPECT_FALSE(counter.Increment(3, 1));
-
-  AdaptingCircularBufferCounter copy{counter};
-  EXPECT_EQ(counter.Get(2), 1);
-  EXPECT_EQ(copy.Get(2), 1);
-  EXPECT_EQ(copy.MaxSize(), counter.MaxSize());
-  EXPECT_EQ(copy.StartIndex(), counter.StartIndex());
-  EXPECT_EQ(copy.EndIndex(), counter.EndIndex());
-  // Mutate copy and make sure original is unchanged.
-  EXPECT_TRUE(copy.Increment(2, 1));
-  EXPECT_EQ(copy.Get(2), 2);
-  EXPECT_EQ(counter.Get(2), 1);
-}
-
-TEST(AdaptingCircularBufferCounterTest, Clear)
-{
-  AdaptingCircularBufferCounter counter{10};
-  EXPECT_TRUE(counter.Empty());
-  EXPECT_TRUE(counter.Increment(2, 1));
-  EXPECT_FALSE(counter.Empty());
-  EXPECT_TRUE(counter.Increment(8, 1));
-  // Check state.
-  EXPECT_EQ(counter.StartIndex(), 2);
-  EXPECT_EQ(counter.EndIndex(), 8);
-  EXPECT_EQ(counter.Get(2), 1);
-  EXPECT_EQ(counter.Get(8), 1);
-  // Clear and verify.
-  EXPECT_FALSE(counter.Empty());
-  counter.Clear();
-  EXPECT_TRUE(counter.Empty());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/common.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/common.cc
deleted file mode 100644
index 1e9305fb3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/common.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "common.h"
-#include <utility>
-
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::sdk::common;
-
-// MockMetricExporter
-
-ExportResult MockMetricExporter::Export(const ResourceMetrics & /*resource_metrics*/) noexcept
-{
-  return ExportResult::kSuccess;
-}
-
-AggregationTemporality MockMetricExporter::GetAggregationTemporality(
-    InstrumentType /*instrument_type*/) const noexcept
-{
-  return AggregationTemporality::kCumulative;
-}
-
-bool MockMetricExporter::ForceFlush(std::chrono::microseconds /* timeout */) noexcept
-{
-  return true;
-}
-
-bool MockMetricExporter::Shutdown(std::chrono::microseconds /* timeout */) noexcept
-{
-  return true;
-}
-
-// MockMetricReader
-MockMetricReader::MockMetricReader(std::unique_ptr<PushMetricExporter> exporter)
-    : exporter_(std::move(exporter))
-{}
-
-MockMetricReader::MockMetricReader() : exporter_{new MockMetricExporter()} {}
-
-AggregationTemporality MockMetricReader::GetAggregationTemporality(
-    InstrumentType instrument_type) const noexcept
-
-{
-  return exporter_->GetAggregationTemporality(instrument_type);
-}
-
-bool MockMetricReader::OnForceFlush(std::chrono::microseconds /* timeout */) noexcept
-{
-  return true;
-}
-
-bool MockMetricReader::OnShutDown(std::chrono::microseconds /* timeout */) noexcept
-{
-  return true;
-}
-
-void MockMetricReader::OnInitialized() noexcept {}
-
-// MockCollectorHandle
-
-MockCollectorHandle::MockCollectorHandle(AggregationTemporality temp) : temporality_(temp) {}
-
-AggregationTemporality MockCollectorHandle::GetAggregationTemporality(
-    InstrumentType /* instrument_type */) noexcept
-{
-  return temporality_;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/common.h b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/common.h
deleted file mode 100644
index ff2060e28..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/common.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-
-class MockMetricExporter : public opentelemetry::sdk::metrics::PushMetricExporter
-{
-public:
-  MockMetricExporter() = default;
-  opentelemetry::sdk::common::ExportResult Export(
-      const opentelemetry::sdk::metrics::ResourceMetrics &) noexcept override;
-
-  opentelemetry::sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      opentelemetry::sdk::metrics::InstrumentType) const noexcept override;
-
-  bool ForceFlush(std::chrono::microseconds) noexcept override;
-
-  bool Shutdown(std::chrono::microseconds) noexcept override;
-};
-
-class MockMetricReader : public opentelemetry::sdk::metrics::MetricReader
-{
-public:
-  MockMetricReader(std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>);
-
-  MockMetricReader();
-
-  opentelemetry::sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      opentelemetry::sdk::metrics::InstrumentType) const noexcept override;
-
-  bool OnForceFlush(std::chrono::microseconds) noexcept override;
-
-  bool OnShutDown(std::chrono::microseconds) noexcept override;
-
-  void OnInitialized() noexcept override;
-
-private:
-  std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> exporter_;
-};
-
-class MockCollectorHandle : public opentelemetry::sdk::metrics::CollectorHandle
-{
-public:
-  MockCollectorHandle(opentelemetry::sdk::metrics::AggregationTemporality);
-
-  ~MockCollectorHandle() override = default;
-
-  opentelemetry::sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      opentelemetry::sdk::metrics::InstrumentType) noexcept override;
-
-private:
-  opentelemetry::sdk::metrics::AggregationTemporality temporality_;
-};
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/BUILD
deleted file mode 100644
index 413780b7d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/BUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_test(
-    name = "no_exemplar_reservoir_test",
-    srcs = [
-        "no_exemplar_reservoir_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "reservoir_cell_test",
-    srcs = [
-        "reservoir_cell_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "aligned_histogram_bucket_exemplar_reservoir_test",
-    srcs = [
-        "aligned_histogram_bucket_exemplar_reservoir_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-        "//sdk/src/metrics",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/CMakeLists.txt
deleted file mode 100644
index 04a715b2f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(testname
-        no_exemplar_reservoir_test
-        aligned_histogram_bucket_exemplar_reservoir_test reservoir_cell_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(
-    ${testname} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_metrics opentelemetry_metrics)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX metrics.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc
deleted file mode 100644
index 487a0414a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir_test.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include <vector>
-
-#  include <gtest/gtest.h>
-#  include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class AlignedHistogramBucketExemplarReservoirTestPeer : public ::testing::Test
-{
-public:
-};
-
-TEST_F(AlignedHistogramBucketExemplarReservoirTestPeer, OfferMeasurement)
-{
-  std::vector<double> boundaries{1, 5.0, 10, 15, 20};
-  auto histogram_exemplar_reservoir = ExemplarReservoir::GetAlignedHistogramBucketExemplarReservoir(
-      boundaries.size(),
-      AlignedHistogramBucketExemplarReservoir::GetHistogramCellSelector(boundaries), nullptr);
-  histogram_exemplar_reservoir->OfferMeasurement(
-      1.0, MetricAttributes{}, opentelemetry::context::Context{}, std::chrono::system_clock::now());
-  histogram_exemplar_reservoir->OfferMeasurement(static_cast<int64_t>(1), MetricAttributes{},
-                                                 opentelemetry::context::Context{},
-                                                 std::chrono::system_clock::now());
-  auto exemplar_data = histogram_exemplar_reservoir->CollectAndReset(MetricAttributes{});
-  ASSERT_TRUE(exemplar_data.empty());
-}
-
-TEST_F(AlignedHistogramBucketExemplarReservoirTestPeer, OfferMeasurementWithNonEmptyCollection)
-{
-  std::vector<double> boundaries{1, 5.0, 10, 15, 20};
-  auto histogram_exemplar_reservoir = ExemplarReservoir::GetAlignedHistogramBucketExemplarReservoir(
-      boundaries.size(),
-      AlignedHistogramBucketExemplarReservoir::GetHistogramCellSelector(boundaries),
-      &ReservoirCell::GetAndResetDouble);
-  histogram_exemplar_reservoir->OfferMeasurement(
-      1.0, MetricAttributes{}, opentelemetry::context::Context{}, std::chrono::system_clock::now());
-  histogram_exemplar_reservoir->OfferMeasurement(static_cast<int64_t>(1), MetricAttributes{},
-                                                 opentelemetry::context::Context{},
-                                                 std::chrono::system_clock::now());
-  auto exemplar_data = histogram_exemplar_reservoir->CollectAndReset(MetricAttributes{});
-  ASSERT_TRUE(!exemplar_data.empty());
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/always_sample_filter_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/always_sample_filter_test.cc
deleted file mode 100644
index f78cd412b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/always_sample_filter_test.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/sdk/metrics/exemplar/filter.h"
-
-using namespace opentelemetry::sdk::metrics;
-
-TEST(AlwaysSampleFilter, SampleMeasurement)
-{
-  auto filter = opentelemetry::sdk::metrics::ExemplarFilter::GetAlwaysSampleFilter();
-  ASSERT_TRUE(
-      filter->ShouldSampleMeasurement(1.0, MetricAttributes{}, opentelemetry::context::Context{}));
-  ASSERT_TRUE(filter->ShouldSampleMeasurement(static_cast<int64_t>(1), MetricAttributes{},
-                                              opentelemetry::context::Context{}));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc
deleted file mode 100644
index 6739152b0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/no_exemplar_reservoir_test.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h"
-#  include <gtest/gtest.h>
-
-using namespace opentelemetry::sdk::metrics;
-
-TEST(NoExemplarReservoir, OfferMeasurement)
-{
-  auto reservoir = opentelemetry::sdk::metrics::ExemplarReservoir::GetNoExemplarReservoir();
-  reservoir->OfferMeasurement(1.0, MetricAttributes{}, opentelemetry::context::Context{},
-                              std::chrono::system_clock::now());
-  reservoir->OfferMeasurement(static_cast<int64_t>(1), MetricAttributes{},
-                              opentelemetry::context::Context{}, std::chrono::system_clock::now());
-  auto exemplar_data = reservoir->CollectAndReset(MetricAttributes{});
-  ASSERT_TRUE(exemplar_data.empty());
-}
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/reservoir_cell_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/reservoir_cell_test.cc
deleted file mode 100644
index 2ce00ff3b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/reservoir_cell_test.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h"
-#  include <gtest/gtest.h>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class ReservoirCellTestPeer : public ::testing::Test
-{
-public:
-  int64_t GetLongVal(const opentelemetry::sdk::metrics::ReservoirCell &reservoir_cell)
-  {
-    return nostd::get<int64_t>(reservoir_cell.value_);
-  }
-
-  double GetDoubleVal(const opentelemetry::sdk::metrics::ReservoirCell &reservoir_cell)
-  {
-    return nostd::get<double>(reservoir_cell.value_);
-  }
-
-  opentelemetry::common::SystemTimestamp GetRecordTime(
-      const opentelemetry::sdk::metrics::ReservoirCell &reservoir_cell)
-  {
-    return reservoir_cell.record_time_;
-  }
-
-  void FilteredTest()
-  {
-    MetricAttributes original{{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
-    MetricAttributes metric_point{{"k2", "v2"}, {"k4", "v4"}};
-    MetricAttributes expected_result{{"k1", "v1"}, {"k3", "v3"}};
-    auto result = opentelemetry::sdk::metrics::ReservoirCell::filtered(original, metric_point);
-    ASSERT_TRUE(result == expected_result);
-  }
-};
-
-TEST_F(ReservoirCellTestPeer, recordMeasurement)
-{
-  opentelemetry::sdk::metrics::ReservoirCell reservoir_cell;
-  reservoir_cell.RecordLongMeasurement(static_cast<int64_t>(1), MetricAttributes{},
-                                       opentelemetry::context::Context{});
-  ASSERT_TRUE(GetLongVal(reservoir_cell) == 1);
-
-  reservoir_cell.RecordDoubleMeasurement(1.5, MetricAttributes{},
-                                         opentelemetry::context::Context{});
-  ASSERT_TRUE(GetDoubleVal(reservoir_cell) == 1.5);
-}
-
-TEST_F(ReservoirCellTestPeer, GetAndReset)
-{
-  opentelemetry::sdk::metrics::ReservoirCell reservoir_cell;
-  auto double_data = reservoir_cell.GetAndResetDouble(MetricAttributes{});
-  ASSERT_TRUE(GetRecordTime(reservoir_cell) == opentelemetry::common::SystemTimestamp{});
-  ASSERT_TRUE(double_data == nullptr);
-
-  auto long_data = reservoir_cell.GetAndResetLong(MetricAttributes{});
-  ASSERT_TRUE(GetRecordTime(reservoir_cell) == opentelemetry::common::SystemTimestamp{});
-  ASSERT_TRUE(long_data == nullptr);
-}
-
-TEST_F(ReservoirCellTestPeer, Filtered)
-{
-  FilteredTest();
-}
-
-}  // namespace metrics
-}  // namespace sdk
-OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/with_trace_sample_filter_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/with_trace_sample_filter_test.cc
deleted file mode 100644
index fcf9d6344..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/exemplar/with_trace_sample_filter_test.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/sdk/metrics/exemplar/filter.h"
-
-using namespace opentelemetry::sdk::metrics;
-
-TEST(WithTraceSampleFilter, SampleMeasurement)
-{
-  auto filter = opentelemetry::sdk::metrics::ExemplarFilter::GetWithTraceSampleFilter();
-  ASSERT_FALSE(
-      filter->ShouldSampleMeasurement(1.0, MetricAttributes{}, opentelemetry::context::Context{}));
-  ASSERT_FALSE(filter->ShouldSampleMeasurement(static_cast<int64_t>(1), MetricAttributes{},
-                                               opentelemetry::context::Context{}));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_aggregation_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_aggregation_benchmark.cc
deleted file mode 100644
index 188416729..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_aggregation_benchmark.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <stddef.h>
-#include <algorithm>
-#include <chrono>
-#include <functional>
-#include <random>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-#include "common.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-namespace
-{
-
-template <class T>
-void HistogramAggregation(benchmark::State &state, std::unique_ptr<ViewRegistry> views)
-{
-  MeterProvider mp(std::move(views));
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-  auto h = m->CreateDoubleHistogram("histogram1", "histogram1_description", "histogram1_unit");
-  std::default_random_engine generator;
-  std::uniform_int_distribution<int> distribution(0, 1000000);
-  // Generate 100000 measurements
-  constexpr size_t TOTAL_MEASUREMENTS = 100000;
-  double measurements[TOTAL_MEASUREMENTS];
-  for (size_t i = 0; i < TOTAL_MEASUREMENTS; i++)
-  {
-    measurements[i] = static_cast<double>(distribution(generator));
-  }
-  std::vector<T> actuals;
-  std::vector<std::thread> collectionThreads;
-  std::function<void()> collectMetrics = [&reader, &actuals]() {
-    reader->Collect([&](ResourceMetrics &rm) {
-      for (const ScopeMetrics &smd : rm.scope_metric_data_)
-      {
-        for (const MetricData &md : smd.metric_data_)
-        {
-          for (const PointDataAttributes &dp : md.point_data_attr_)
-          {
-            actuals.push_back(opentelemetry::nostd::get<T>(dp.point_data));
-          }
-        }
-      }
-      return true;
-    });
-  };
-
-  while (state.KeepRunningBatch(TOTAL_MEASUREMENTS))
-  {
-    for (size_t i = 0; i < TOTAL_MEASUREMENTS; i++)
-    {
-      h->Record(measurements[i], {});
-      if (i % 1000 == 0 || i == TOTAL_MEASUREMENTS - 1)
-      {
-        collectMetrics();
-      }
-      if (i == 100)
-      {
-        std::this_thread::sleep_for(std::chrono::nanoseconds(4));
-      }
-    }
-  }
-}
-
-void BM_HistogramAggregation(benchmark::State &state)
-{
-  std::unique_ptr<ViewRegistry> views{new ViewRegistry()};
-  HistogramAggregation<HistogramPointData>(state, std::move(views));
-}
-
-BENCHMARK(BM_HistogramAggregation);
-
-// Add this helper function before your benchmark functions
-
-void RunBase2ExponentialHistogramAggregation(benchmark::State &state, int scale)
-{
-  std::string instrument_unit = "histogram1_unit";
-  std::unique_ptr<InstrumentSelector> histogram_instrument_selector{
-      new InstrumentSelector(InstrumentType::kHistogram, ".*", instrument_unit)};
-  std::unique_ptr<MeterSelector> histogram_meter_selector{
-      new MeterSelector("meter1", "version1", "schema1")};
-
-  Base2ExponentialHistogramAggregationConfig config;
-  config.max_scale_ = scale;
-
-  std::unique_ptr<View> histogram_view{
-      new View("base2_expohisto", "description", instrument_unit,
-               AggregationType::kBase2ExponentialHistogram,
-               std::make_shared<Base2ExponentialHistogramAggregationConfig>(config))};
-
-  std::unique_ptr<ViewRegistry> views{new ViewRegistry()};
-  views->AddView(std::move(histogram_instrument_selector), std::move(histogram_meter_selector),
-                 std::move(histogram_view));
-
-  HistogramAggregation<Base2ExponentialHistogramPointData>(state, std::move(views));
-}
-
-void BM_Base2ExponentialHistogramAggregationZeroScale(benchmark::State &state)
-{
-  RunBase2ExponentialHistogramAggregation(state, 0);
-}
-BENCHMARK(BM_Base2ExponentialHistogramAggregationZeroScale);
-
-void BM_Base2ExponentialHistogramAggregationOneScale(benchmark::State &state)
-{
-  RunBase2ExponentialHistogramAggregation(state, 1);
-}
-BENCHMARK(BM_Base2ExponentialHistogramAggregationOneScale);
-
-void BM_Base2ExponentialHistogramAggregationTwoScale(benchmark::State &state)
-{
-  RunBase2ExponentialHistogramAggregation(state, 2);
-}
-BENCHMARK(BM_Base2ExponentialHistogramAggregationTwoScale);
-
-void BM_Base2ExponentialHistogramAggregationFourScale(benchmark::State &state)
-{
-  RunBase2ExponentialHistogramAggregation(state, 4);
-}
-BENCHMARK(BM_Base2ExponentialHistogramAggregationFourScale);
-
-void BM_Base2ExponentialHistogramAggregationEightScale(benchmark::State &state)
-{
-  RunBase2ExponentialHistogramAggregation(state, 8);
-}
-BENCHMARK(BM_Base2ExponentialHistogramAggregationEightScale);
-
-void BM_Base2ExponentialHistogramAggregationSixteenScale(benchmark::State &state)
-{
-  RunBase2ExponentialHistogramAggregation(state, 16);
-}
-BENCHMARK(BM_Base2ExponentialHistogramAggregationSixteenScale);
-
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_aggregation_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_aggregation_test.cc
deleted file mode 100644
index ee3168399..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_aggregation_test.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <initializer_list>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-TEST(HistogramInstrumentToHistogramAggregation, Double)
-{
-  MeterProvider mp;
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  auto h = m->CreateDoubleHistogram("histogram1", "histogram1_description", "histogram1_unit");
-
-  h->Record(5, {});
-  h->Record(10, {});
-  h->Record(15, {});
-  h->Record(20, {});
-  h->Record(25, {});
-  h->Record(30, {});
-  h->Record(35, {});
-  h->Record(40, {});
-  h->Record(45, {});
-  h->Record(50, {});
-  h->Record(1e6, {});
-
-  std::vector<HistogramPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(1000275.0, opentelemetry::nostd::get<double>(actual.sum_));
-  ASSERT_EQ(11, actual.count_);
-}
-
-TEST(CounterToHistogram, Double)
-{
-  MeterProvider mp;
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::unique_ptr<View> view{
-      new View("view1", "view1_description", "unit", AggregationType::kHistogram)};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kCounter, "counter1", "unit")};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto h = m->CreateDoubleCounter("counter1", "counter1_description", "unit");
-
-  h->Add(5, {});
-  h->Add(10, {});
-  h->Add(15, {});
-  h->Add(20, {});
-  h->Add(25, {});
-  h->Add(30, {});
-  h->Add(35, {});
-  h->Add(40, {});
-  h->Add(45, {});
-  h->Add(50, {});
-  h->Add(1e6, {});
-
-  std::vector<HistogramPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(1000275.0, opentelemetry::nostd::get<double>(actual.sum_));
-  ASSERT_EQ(11, actual.count_);
-}
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_test.cc
deleted file mode 100644
index 490e12cd7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/histogram_test.cc
+++ /dev/null
@@ -1,385 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <cstdint>
-#include <initializer_list>
-#include <string>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-TEST(Histogram, Double)
-{
-  MeterProvider mp;
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  auto h = m->CreateDoubleHistogram("histogram1", "histogram1_description", "histogram1_unit");
-
-  h->Record(5, {});
-  h->Record(10, {});
-  h->Record(15, {});
-  h->Record(20, {});
-  h->Record(25, {});
-  h->Record(30, {});
-  h->Record(35, {});
-  h->Record(40, {});
-  h->Record(45, {});
-  h->Record(50, {});
-  h->Record(1e6, {});
-
-  std::vector<HistogramPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(1000275.0, opentelemetry::nostd::get<double>(actual.sum_));
-  ASSERT_EQ(11, actual.count_);
-  ASSERT_EQ(5.0, opentelemetry::nostd::get<double>(actual.min_));
-  ASSERT_EQ(1e6, opentelemetry::nostd::get<double>(actual.max_));
-  ASSERT_EQ(std::vector<double>(
-                {0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000}),
-            actual.boundaries_);
-  ASSERT_EQ(std::vector<uint64_t>({0, 1, 1, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}),
-            actual.counts_);
-}
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-// FIXME - View Preficate search is only supported through regex
-TEST(Histogram, DoubleCustomBuckets)
-{
-  MeterProvider mp;
-  auto m                      = mp.GetMeter("meter1", "version1", "schema1");
-  std::string instrument_unit = "ms";
-  std::string instrument_name = "historgram1";
-  std::string instrument_desc = "histogram metrics";
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::shared_ptr<HistogramAggregationConfig> config(new HistogramAggregationConfig());
-  config->boundaries_ = {10, 20, 30, 40};
-  std::unique_ptr<View> view{
-      new View("view1", "view1_description", instrument_unit, AggregationType::kHistogram, config)};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kHistogram, instrument_name, instrument_unit)};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto h = m->CreateDoubleHistogram(instrument_name, instrument_desc, instrument_unit);
-
-  h->Record(5, {});
-  h->Record(10, {});
-  h->Record(15, {});
-  h->Record(20, {});
-  h->Record(25, {});
-  h->Record(30, {});
-  h->Record(35, {});
-  h->Record(40, {});
-  h->Record(45, {});
-  h->Record(50, {});
-
-  std::vector<HistogramPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(275.0, opentelemetry::nostd::get<double>(actual.sum_));
-  ASSERT_EQ(10, actual.count_);
-  ASSERT_EQ(5.0, opentelemetry::nostd::get<double>(actual.min_));
-  ASSERT_EQ(50.0, opentelemetry::nostd::get<double>(actual.max_));
-  ASSERT_EQ(std::vector<double>({10, 20, 30, 40}), actual.boundaries_);
-  ASSERT_EQ(std::vector<uint64_t>({2, 2, 2, 2, 2}), actual.counts_);
-}
-
-TEST(Histogram, DoubleEmptyBuckets)
-{
-  MeterProvider mp;
-  auto m                      = mp.GetMeter("meter1", "version1", "schema1");
-  std::string instrument_unit = "ms";
-  std::string instrument_name = "historgram1";
-  std::string instrument_desc = "histogram metrics";
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::shared_ptr<HistogramAggregationConfig> config(new HistogramAggregationConfig());
-  config->boundaries_ = {};
-  std::unique_ptr<View> view{
-      new View("view1", "view1_description", instrument_unit, AggregationType::kHistogram, config)};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kHistogram, instrument_name, instrument_unit)};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto h = m->CreateDoubleHistogram(instrument_name, instrument_desc, instrument_unit);
-
-  h->Record(-5, {});
-  h->Record(10, {});
-  h->Record(15, {});
-  h->Record(20, {});
-  h->Record(25, {});
-  h->Record(30, {});
-  h->Record(35, {});
-  h->Record(40, {});
-  h->Record(45, {});
-  h->Record(50, {});
-
-  std::vector<HistogramPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(270.0, opentelemetry::nostd::get<double>(actual.sum_));
-  ASSERT_EQ(9, actual.count_);
-  ASSERT_EQ(10.0, opentelemetry::nostd::get<double>(actual.min_));
-  ASSERT_EQ(50.0, opentelemetry::nostd::get<double>(actual.max_));
-  ASSERT_EQ(std::vector<double>({}), actual.boundaries_);
-  ASSERT_EQ(std::vector<uint64_t>({9}), actual.counts_);
-}
-#endif
-
-TEST(Histogram, UInt64)
-{
-  MeterProvider mp;
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  auto h = m->CreateUInt64Histogram("histogram1", "histogram1_description", "histogram1_unit");
-
-  h->Record(5, {});
-  h->Record(10, {});
-  h->Record(15, {});
-  h->Record(20, {});
-  h->Record(25, {});
-  h->Record(30, {});
-  h->Record(35, {});
-  h->Record(40, {});
-  h->Record(45, {});
-  h->Record(50, {});
-  h->Record(1000000, {});
-
-  std::vector<HistogramPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(1000275, opentelemetry::nostd::get<int64_t>(actual.sum_));
-  ASSERT_EQ(11, actual.count_);
-  ASSERT_EQ(5, opentelemetry::nostd::get<int64_t>(actual.min_));
-  ASSERT_EQ(1000000, opentelemetry::nostd::get<int64_t>(actual.max_));
-  ASSERT_EQ(std::vector<double>(
-                {0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000}),
-            actual.boundaries_);
-  ASSERT_EQ(std::vector<uint64_t>({0, 1, 1, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}),
-            actual.counts_);
-}
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-// FIXME - View Preficate search is only supported through regex
-TEST(Histogram, UInt64CustomBuckets)
-{
-  MeterProvider mp;
-  auto m                      = mp.GetMeter("meter1", "version1", "schema1");
-  std::string instrument_name = "historgram1";
-  std::string instrument_desc = "histogram metrics";
-  std::string instrument_unit = "ms";
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::shared_ptr<HistogramAggregationConfig> config(new HistogramAggregationConfig());
-  config->boundaries_ = {10, 20, 30, 40};
-  std::unique_ptr<View> view{
-      new View("view1", "view1_description", "ms", AggregationType::kHistogram, config)};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kHistogram, instrument_name, instrument_unit)};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto h = m->CreateUInt64Histogram(instrument_name, instrument_desc, instrument_unit);
-
-  h->Record(5, {});
-  h->Record(10, {});
-  h->Record(15, {});
-  h->Record(20, {});
-  h->Record(25, {});
-  h->Record(30, {});
-  h->Record(35, {});
-  h->Record(40, {});
-  h->Record(45, {});
-  h->Record(50, {});
-
-  std::vector<HistogramPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(275, opentelemetry::nostd::get<int64_t>(actual.sum_));
-  ASSERT_EQ(10, actual.count_);
-  ASSERT_EQ(5, opentelemetry::nostd::get<int64_t>(actual.min_));
-  ASSERT_EQ(50, opentelemetry::nostd::get<int64_t>(actual.max_));
-  ASSERT_EQ(std::vector<double>({10, 20, 30, 40}), actual.boundaries_);
-  ASSERT_EQ(std::vector<uint64_t>({2, 2, 2, 2, 2}), actual.counts_);
-}
-
-TEST(Histogram, UInt64EmptyBuckets)
-{
-  MeterProvider mp;
-  auto m                      = mp.GetMeter("meter1", "version1", "schema1");
-  std::string instrument_name = "historgram1";
-  std::string instrument_desc = "histogram metrics";
-  std::string instrument_unit = "ms";
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::shared_ptr<HistogramAggregationConfig> config(new HistogramAggregationConfig());
-  config->boundaries_ = {};
-  std::unique_ptr<View> view{
-      new View("view1", "view1_description", "ms", AggregationType::kHistogram, config)};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kHistogram, instrument_name, instrument_unit)};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto h = m->CreateUInt64Histogram(instrument_name, instrument_desc, instrument_unit);
-
-  h->Record(5, {});
-  h->Record(10, {});
-  h->Record(15, {});
-  h->Record(20, {});
-  h->Record(25, {});
-  h->Record(30, {});
-  h->Record(35, {});
-  h->Record(40, {});
-  h->Record(45, {});
-  h->Record(50, {});
-
-  std::vector<HistogramPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(275, opentelemetry::nostd::get<int64_t>(actual.sum_));
-  ASSERT_EQ(10, actual.count_);
-  ASSERT_EQ(5, opentelemetry::nostd::get<int64_t>(actual.min_));
-  ASSERT_EQ(50, opentelemetry::nostd::get<int64_t>(actual.max_));
-  ASSERT_EQ(std::vector<double>({}), actual.boundaries_);
-  ASSERT_EQ(std::vector<uint64_t>({10}), actual.counts_);
-}
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/instrument_descriptor_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/instrument_descriptor_test.cc
deleted file mode 100644
index ee398a2c0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/instrument_descriptor_test.cc
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-
-#include "opentelemetry/sdk/metrics/instruments.h"
-
-using namespace opentelemetry::sdk::metrics;
-
-InstrumentDescriptor CreateInstrumentDescriptor(
-    const std::string &name        = "counter",
-    const std::string &description = "description",
-    const std::string &unit        = "unit",
-    InstrumentType type            = InstrumentType::kCounter,
-    InstrumentValueType value_type = InstrumentValueType::kLong)
-{
-  return {name, description, unit, type, value_type};
-}
-
-TEST(InstrumentDescriptorUtilTest, CaseInsensitiveAsciiEquals)
-{
-  // same name
-  EXPECT_TRUE(InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals("counter", "counter"));
-
-  // same case-insensitive name
-  EXPECT_TRUE(InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals("counter", "COUNTer"));
-  EXPECT_TRUE(InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals("CountER", "counter"));
-
-  // different case-insensitive name same string length
-  EXPECT_FALSE(InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals("Counter_1", "counter_2"));
-  EXPECT_FALSE(InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals("counter_1", "counter_2"));
-
-  // different case-sensitive name different string length
-  EXPECT_FALSE(InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals("counter", "Counter1"));
-  EXPECT_FALSE(InstrumentDescriptorUtil::CaseInsensitiveAsciiEquals("Counter1", "counter"));
-}
-
-// The following tests cover the spec requirements on detecting identical and duplicate instruments
-// https://github.com/open-telemetry/opentelemetry-specification/blob/9c8c30631b0e288de93df7452f91ed47f6fba330/specification/metrics/sdk.md?plain=1#L869
-TEST(InstrumentDescriptorUtilTest, IsDuplicate)
-{
-  auto instrument_existing = CreateInstrumentDescriptor("counter");
-
-  // not a duplicate - different name
-  auto instrument_different_name  = instrument_existing;
-  instrument_different_name.name_ = "another_name";
-  EXPECT_FALSE(
-      InstrumentDescriptorUtil::IsDuplicate(instrument_existing, instrument_different_name));
-
-  // not a duplicate - identical instrument
-  auto instrument_identical = instrument_existing;
-  EXPECT_FALSE(InstrumentDescriptorUtil::IsDuplicate(instrument_existing, instrument_identical));
-
-  // not a duplicate - instrument with same case-insensitive name
-  auto instrument_same_name_case_insensitive  = instrument_existing;
-  instrument_same_name_case_insensitive.name_ = "COUNTER";
-  EXPECT_FALSE(InstrumentDescriptorUtil::IsDuplicate(instrument_existing,
-                                                     instrument_same_name_case_insensitive));
-
-  // is duplicate by description
-  auto instrument_different_desc         = instrument_existing;
-  instrument_different_desc.description_ = "another_description";
-  EXPECT_TRUE(
-      InstrumentDescriptorUtil::IsDuplicate(instrument_existing, instrument_different_desc));
-
-  // is duplicate by unit
-  auto instrument_different_unit  = instrument_existing;
-  instrument_different_unit.unit_ = "another_unit";
-  EXPECT_TRUE(
-      InstrumentDescriptorUtil::IsDuplicate(instrument_existing, instrument_different_unit));
-
-  // is duplicate by kind - instrument type
-  auto instrument_different_type  = instrument_existing;
-  instrument_different_type.type_ = InstrumentType::kHistogram;
-  EXPECT_TRUE(
-      InstrumentDescriptorUtil::IsDuplicate(instrument_existing, instrument_different_type));
-
-  // is duplicate by kind - instrument value_type
-  auto instrument_different_valuetype        = instrument_existing;
-  instrument_different_valuetype.value_type_ = InstrumentValueType::kDouble;
-  EXPECT_TRUE(
-      InstrumentDescriptorUtil::IsDuplicate(instrument_existing, instrument_different_valuetype));
-}
-
-TEST(InstrumentDescriptorTest, EqualNameCaseInsensitiveOperator)
-{
-  // equal by name, description, unit, type and value type
-  InstrumentEqualNameCaseInsensitive equal_operator{};
-  auto instrument_existing  = CreateInstrumentDescriptor("counter");
-  auto instrument_identical = instrument_existing;
-  EXPECT_TRUE(equal_operator(instrument_existing, instrument_identical));
-
-  // equal by name with different case
-  auto instrument_name_case_conflict  = instrument_existing;
-  instrument_name_case_conflict.name_ = "COUNTER";
-  EXPECT_TRUE(equal_operator(instrument_existing, instrument_name_case_conflict));
-
-  // not equal by name
-  auto instrument_different_name  = instrument_existing;
-  instrument_different_name.name_ = "another_counter";
-  EXPECT_FALSE(equal_operator(instrument_existing, instrument_different_name));
-
-  // not equal by instrument value type
-  auto instrument_different_valuetype        = instrument_existing;
-  instrument_different_valuetype.value_type_ = InstrumentValueType::kDouble;
-  EXPECT_FALSE(equal_operator(instrument_existing, instrument_different_valuetype));
-
-  // not equal by instrument type
-  auto instrument_different_type  = instrument_existing;
-  instrument_different_type.type_ = InstrumentType::kObservableCounter;
-  EXPECT_FALSE(equal_operator(instrument_existing, instrument_different_type));
-
-  // not equal by description
-  auto instrument_different_desc         = instrument_existing;
-  instrument_different_desc.description_ = "another description";
-  EXPECT_FALSE(equal_operator(instrument_existing, instrument_different_desc));
-
-  // not equal by unit
-  auto instrument_different_unit  = instrument_existing;
-  instrument_different_unit.unit_ = "another unit";
-  EXPECT_FALSE(equal_operator(instrument_existing, instrument_different_unit));
-}
-
-TEST(InstrumentDescriptorTest, HashOperator)
-{
-  InstrumentDescriptorHash hash_operator{};
-
-  // identical instrument - hash must match
-  auto instrument_existing  = CreateInstrumentDescriptor("counter");
-  auto instrument_identical = instrument_existing;
-  EXPECT_EQ(hash_operator(instrument_existing), hash_operator(instrument_identical));
-
-  // name case conflict - hash must match
-  auto instrument_name_case_conflict  = instrument_existing;
-  instrument_name_case_conflict.name_ = "COUNTER";
-  EXPECT_EQ(hash_operator(instrument_existing), hash_operator(instrument_name_case_conflict));
-
-  // different name
-  auto instrument_different_name  = instrument_existing;
-  instrument_different_name.name_ = "another_counter";
-  EXPECT_NE(hash_operator(instrument_existing), hash_operator(instrument_different_name));
-
-  // different kind - instrument value type
-  auto instrument_different_valuetype        = instrument_existing;
-  instrument_different_valuetype.value_type_ = InstrumentValueType::kFloat;
-  EXPECT_NE(hash_operator(instrument_existing), hash_operator(instrument_different_valuetype));
-
-  // different kind - instrument type
-  auto instrument_different_type  = instrument_existing;
-  instrument_different_type.type_ = InstrumentType::kObservableUpDownCounter;
-  EXPECT_NE(hash_operator(instrument_existing), hash_operator(instrument_different_type));
-
-  // different description
-  auto instrument_different_desc         = instrument_existing;
-  instrument_different_desc.description_ = "another description";
-  EXPECT_NE(hash_operator(instrument_existing), hash_operator(instrument_different_desc));
-
-  // different unit
-  auto instrument_different_unit  = instrument_existing;
-  instrument_different_unit.unit_ = "another unit";
-  EXPECT_NE(hash_operator(instrument_existing), hash_operator(instrument_different_unit));
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/instrument_metadata_validator_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/instrument_metadata_validator_test.cc
deleted file mode 100644
index 1ecdc1702..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/instrument_metadata_validator_test.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <string>
-#include <vector>
-
-#include "opentelemetry/sdk/metrics/instrument_metadata_validator.h"
-
-static std::string CreateVeryLargeString(size_t multiple)
-{
-  std::string result   = "START";
-  std::string repeater = "0123456789";
-  for (size_t i = 0; i < multiple; i++)
-  {
-    result += repeater;
-  }
-  return result;
-}
-
-TEST(InstrumentMetadataValidator, TestName)
-{
-  opentelemetry::sdk::metrics::InstrumentMetaDataValidator validator;
-  std::vector<std::string> invalid_names = {
-      "",      // empty string
-      "1sdf",  // string starting with number
-      "\x31\x32\x33\xe2\x82\xac\x41\x41\x41\xe2\x82\xac\x42\x42\x42",  // unicode characters
-      "/\\sdsd",                        // string starting with special character
-      "***sSSs",                        // string starting with special character
-      "a\\broken\\path",                // contains backward slash
-      CreateVeryLargeString(25) + "X",  // total 256 characters
-      CreateVeryLargeString(26),        // string much bigger than 255 character
-  };
-  for (auto const &str : invalid_names)
-  {
-    EXPECT_FALSE(validator.ValidateName(str));
-  }
-
-  std::vector<std::string> valid_names = {
-      "T",                                      // single char string
-      "s123",                                   // starting with char, followed by numbers
-      "dsdsdsd_-.",                             // string , and valid nonalphanumeric
-      "d1234_-sDSDs.sdsd344",                   // combination of all valid characters
-      "a/path/to/some/metric",                  // contains forward slash
-      CreateVeryLargeString(5) + "ABCERTYG",    // total 63 characters
-      CreateVeryLargeString(5) + "ABCERTYGJ",   // total 64 characters
-      CreateVeryLargeString(24) + "ABCDEFGHI",  // total 254 characters
-      CreateVeryLargeString(25),                // total 255 characters
-  };
-  for (auto const &str : valid_names)
-  {
-    EXPECT_TRUE(validator.ValidateName(str));
-  }
-}
-
-TEST(InstrumentMetadataValidator, TestUnit)
-{
-  opentelemetry::sdk::metrics::InstrumentMetaDataValidator validator;
-  std::vector<std::string> invalid_units = {
-      CreateVeryLargeString(5) + "ABCERTYGJ",  // total 64 charactes
-      CreateVeryLargeString(7),                // string bigger than 63 chars
-      "\x31\x32\x33\xe2\x82\xac\x41\x41\x41\xe2\x82\xac\x42\x42\x42",  // unicode string
-  };
-  for (auto const &str : invalid_units)
-  {
-    EXPECT_FALSE(validator.ValidateUnit(str));
-  }
-
-  std::vector<std::string> valid_units = {
-      "T",                                    // single char
-      "s123",                                 // starting with char, followed by numbers
-      "dsdsdsd_-.",                           // string , and valid nonalphanumeric
-      "d1234_-sdsds.sdsd344",                 // combination of all valid characters
-      CreateVeryLargeString(5) + "ABCERTYG",  // total 63 charactes
-      "ASDDSDF",                              // uppercase
-  };
-  for (auto const &str : valid_units)
-  {
-    EXPECT_TRUE(validator.ValidateName(str));
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/measurements_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/measurements_benchmark.cc
deleted file mode 100644
index 5f56b5d2c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/measurements_benchmark.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <stdlib.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::sdk::common;
-
-class MockMetricExporter : public MetricReader
-{
-public:
-  MockMetricExporter() = default;
-
-  opentelemetry::sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      opentelemetry::sdk::metrics::InstrumentType) const noexcept override
-  {
-    return AggregationTemporality::kCumulative;
-  }
-
-private:
-  bool OnForceFlush(std::chrono::microseconds /*timeout*/) noexcept override { return true; }
-
-  bool OnShutDown(std::chrono::microseconds /*timeout*/) noexcept override { return true; }
-
-  void OnInitialized() noexcept override {}
-};
-
-namespace
-{
-void BM_MeasurementsTest(benchmark::State &state)
-{
-  MeterProvider mp;
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::shared_ptr<MetricReader> exporter(new MockMetricExporter());
-  mp.AddMetricReader(exporter);
-  auto h = m->CreateDoubleCounter("counter1", "counter1_description", "counter1_unit");
-  size_t MAX_MEASUREMENTS = 10000;  // keep low to prevent CI failure due to timeout
-  size_t NUM_CORES        = 1;
-  std::vector<std::thread> threads;
-  std::map<std::string, uint32_t> attributes[1000];
-  size_t total_index = 0;
-  for (uint32_t i = 0; i < 10; i++)
-  {
-    for (uint32_t j = 0; j < 10; j++)
-      for (uint32_t k = 0; k < 10; k++)
-        attributes[total_index++] = {{"dim1", i}, {"dim2", j}, {"dim3", k}};
-  }
-  while (state.KeepRunning())
-  {
-    threads.clear();
-    std::atomic<size_t> cur_processed{0};
-    for (size_t i = 0; i < NUM_CORES; i++)
-    {
-      threads.push_back(std::thread([&h, &cur_processed, &MAX_MEASUREMENTS, &attributes]() {
-        while (cur_processed++ <= MAX_MEASUREMENTS)
-        {
-          size_t index = rand() % 1000;
-          h->Add(1.0,
-                 opentelemetry::common::KeyValueIterableView<std::map<std::string, uint32_t>>(
-                     attributes[index]),
-                 opentelemetry::context::Context{});
-        }
-      }));
-    }
-    for (auto &thread : threads)
-    {
-      thread.join();
-    }
-  }
-  exporter->Collect([&](ResourceMetrics & /*rm*/) { return true; });
-}
-BENCHMARK(BM_MeasurementsTest);
-
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_config_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_config_test.cc
deleted file mode 100644
index c16b1d93f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_config_test.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include <gtest/gtest.h>
-#include <array>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-
-namespace metrics_sdk           = opentelemetry::sdk::metrics;
-namespace instrumentation_scope = opentelemetry::sdk::instrumentationscope;
-
-/** Test to verify the basic behavior of metrics_sdk::MeterConfig */
-
-TEST(MeterConfig, CheckDisabledWorksAsExpected)
-{
-  metrics_sdk::MeterConfig disabled_config = metrics_sdk::MeterConfig::Disabled();
-  ASSERT_FALSE(disabled_config.IsEnabled());
-}
-
-TEST(MeterConfig, CheckEnabledWorksAsExpected)
-{
-  metrics_sdk::MeterConfig enabled_config = metrics_sdk::MeterConfig::Enabled();
-  ASSERT_TRUE(enabled_config.IsEnabled());
-}
-
-TEST(MeterConfig, CheckDefaultConfigWorksAccToSpec)
-{
-  metrics_sdk::MeterConfig enabled_config = metrics_sdk::MeterConfig::Default();
-  ASSERT_TRUE(enabled_config.IsEnabled());
-}
-
-/** Tests to verify the behavior of metrics_sdk::MeterConfig::Default */
-
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr1 = {
-    "accept_single_attr", true};
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr2 = {
-    "accept_second_attr", "some other attr"};
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr3 = {
-    "accept_third_attr", 3};
-
-static instrumentation_scope::InstrumentationScope test_scope_1 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_1");
-static instrumentation_scope::InstrumentationScope test_scope_2 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_2", "1.0");
-static instrumentation_scope::InstrumentationScope test_scope_3 =
-    *instrumentation_scope::InstrumentationScope::Create(
-        "test_scope_3",
-        "0",
-        "https://opentelemetry.io/schemas/v1.18.0");
-static instrumentation_scope::InstrumentationScope test_scope_4 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_4",
-                                                         "0",
-                                                         "https://opentelemetry.io/schemas/v1.18.0",
-                                                         {attr1});
-static instrumentation_scope::InstrumentationScope test_scope_5 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_5",
-                                                         "0",
-                                                         "https://opentelemetry.io/schemas/v1.18.0",
-                                                         {attr1, attr2, attr3});
-
-// This array could also directly contain the reference types, but that  leads to 'uninitialized
-// value was created by heap allocation' errors in Valgrind memcheck. This is a bug in Googletest
-// library, see https://github.com/google/googletest/issues/3805#issuecomment-1397301790 for more
-// details. Using pointers is a workaround to prevent the Valgrind warnings.
-const std::array<instrumentation_scope::InstrumentationScope *, 5> instrumentation_scopes = {
-    &test_scope_1, &test_scope_2, &test_scope_3, &test_scope_4, &test_scope_5,
-};
-
-// Test fixture for VerifyDefaultConfiguratorBehavior
-class DefaultMeterConfiguratorTestFixture
-    : public ::testing::TestWithParam<instrumentation_scope::InstrumentationScope *>
-{};
-
-// verifies that the default configurator always returns the default meter config
-TEST_P(DefaultMeterConfiguratorTestFixture, VerifyDefaultConfiguratorBehavior)
-{
-  instrumentation_scope::InstrumentationScope *scope = GetParam();
-  instrumentation_scope::ScopeConfigurator<metrics_sdk::MeterConfig> default_configurator =
-      instrumentation_scope::ScopeConfigurator<metrics_sdk::MeterConfig>::Builder(
-          metrics_sdk::MeterConfig::Default())
-          .Build();
-
-  ASSERT_EQ(default_configurator.ComputeConfig(*scope), metrics_sdk::MeterConfig::Default());
-}
-
-INSTANTIATE_TEST_SUITE_P(InstrumentationScopes,
-                         DefaultMeterConfiguratorTestFixture,
-                         ::testing::ValuesIn(instrumentation_scopes));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_provider_sdk_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_provider_sdk_test.cc
deleted file mode 100644
index 041b363af..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_provider_sdk_test.cc
+++ /dev/null
@@ -1,313 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <utility>
-#include "common.h"
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/meter_provider_factory.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-
-using namespace opentelemetry::sdk::metrics;
-
-TEST(MeterProvider, GetMeter)
-{
-  MeterProvider mp1;
-  //   std::unique_ptr<View> view{std::unique_ptr<View>()};
-  // MeterProvider mp1(std::move(exporters), std::move(readers), std::move(views);
-  auto m1 = mp1.GetMeter("test");
-  auto m2 = mp1.GetMeter("test");
-  auto m3 = mp1.GetMeter("different", "1.0.0");
-  auto m4 = mp1.GetMeter("");
-  auto m5 = mp1.GetMeter(opentelemetry::nostd::string_view{});
-  auto m6 = mp1.GetMeter("different", "1.0.0", "https://opentelemetry.io/schemas/1.2.0");
-  ASSERT_NE(nullptr, m1);
-  ASSERT_NE(nullptr, m2);
-  ASSERT_NE(nullptr, m3);
-  ASSERT_NE(nullptr, m6);
-
-  // Should return the same instance each time.
-  ASSERT_EQ(m1, m2);
-  ASSERT_NE(m1, m3);
-  ASSERT_EQ(m4, m5);
-  ASSERT_NE(m3, m6);
-
-  // Should be an sdk::metrics::Meter
-#ifdef OPENTELEMETRY_RTTI_ENABLED
-  auto sdkMeter1 = dynamic_cast<Meter *>(m1.get());
-#else
-  auto sdkMeter1 = static_cast<Meter *>(m1.get());
-#endif
-  ASSERT_NE(nullptr, sdkMeter1);
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::unique_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp1.AddMetricReader(std::move(reader));
-
-  std::unique_ptr<View> view{std::unique_ptr<View>()};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kCounter, "instru1", "unit1")};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("name1", "version1", "schema1")};
-
-  mp1.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  // cleanup properly without crash
-  mp1.ForceFlush();
-  mp1.Shutdown();
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-TEST(MeterProvider, GetMeterAbiv2)
-{
-  MeterProvider mp;
-
-  auto m1 = mp.GetMeter("name1", "version1", "url1");
-  ASSERT_NE(nullptr, m1);
-
-  auto m2 = mp.GetMeter("name2", "version2", "url2", nullptr);
-  ASSERT_NE(nullptr, m2);
-
-  auto m3 = mp.GetMeter("name3", "version3", "url3", {{"accept_single_attr", true}});
-  ASSERT_NE(nullptr, m3);
-  {
-    auto meter = static_cast<opentelemetry::sdk::metrics::Meter *>(m3.get());
-    auto scope = meter->GetInstrumentationScope();
-    auto attrs = scope->GetAttributes();
-    ASSERT_EQ(attrs.size(), 1);
-    auto attr = attrs.find("accept_single_attr");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<bool>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<bool>(attr->second), true);
-  }
-
-  std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr4 = {
-      "accept_single_attr", true};
-  auto m4 = mp.GetMeter("name4", "version4", "url4", {attr4});
-  ASSERT_NE(nullptr, m4);
-  {
-    auto meter = static_cast<opentelemetry::sdk::metrics::Meter *>(m4.get());
-    auto scope = meter->GetInstrumentationScope();
-    auto attrs = scope->GetAttributes();
-    ASSERT_EQ(attrs.size(), 1);
-    auto attr = attrs.find("accept_single_attr");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<bool>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<bool>(attr->second), true);
-  }
-
-  auto m5 = mp.GetMeter("name5", "version5", "url5", {{"foo", "1"}, {"bar", "2"}});
-  ASSERT_NE(nullptr, m5);
-  {
-    auto meter = static_cast<opentelemetry::sdk::metrics::Meter *>(m5.get());
-    auto scope = meter->GetInstrumentationScope();
-    auto attrs = scope->GetAttributes();
-    ASSERT_EQ(attrs.size(), 2);
-    auto attr = attrs.find("bar");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::string>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<std::string>(attr->second), "2");
-  }
-
-  std::initializer_list<
-      std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue>>
-      attrs6 = {{"foo", "1"}, {"bar", 42}};
-
-  auto m6 = mp.GetMeter("name6", "version6", "url6", attrs6);
-  ASSERT_NE(nullptr, m6);
-  {
-    auto meter = static_cast<opentelemetry::sdk::metrics::Meter *>(m6.get());
-    auto scope = meter->GetInstrumentationScope();
-    auto attrs = scope->GetAttributes();
-    ASSERT_EQ(attrs.size(), 2);
-    auto attr = attrs.find("bar");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<int>(attr->second), 42);
-  }
-
-  typedef std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> KV;
-
-  std::initializer_list<KV> attrs7 = {{"foo", 3.14}, {"bar", "2"}};
-  auto m7                          = mp.GetMeter("name7", "version7", "url7", attrs7);
-  ASSERT_NE(nullptr, m7);
-  {
-    auto meter = static_cast<opentelemetry::sdk::metrics::Meter *>(m7.get());
-    auto scope = meter->GetInstrumentationScope();
-    auto attrs = scope->GetAttributes();
-    ASSERT_EQ(attrs.size(), 2);
-    auto attr = attrs.find("foo");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<double>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<double>(attr->second), 3.14);
-  }
-
-  auto m8 = mp.GetMeter("name8", "version8", "url8",
-                        {{"a", "string"},
-                         {"b", false},
-                         {"c", 314159},
-                         {"d", static_cast<unsigned int>(314159)},
-                         {"e", static_cast<int32_t>(-20)},
-                         {"f", static_cast<uint32_t>(20)},
-                         {"g", static_cast<int64_t>(-20)},
-                         {"h", static_cast<uint64_t>(20)},
-                         {"i", 3.1},
-                         {"j", "string"}});
-  ASSERT_NE(nullptr, m8);
-  {
-    auto meter = static_cast<opentelemetry::sdk::metrics::Meter *>(m8.get());
-    auto scope = meter->GetInstrumentationScope();
-    auto attrs = scope->GetAttributes();
-    ASSERT_EQ(attrs.size(), 10);
-    auto attr = attrs.find("e");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int32_t>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<int32_t>(attr->second), -20);
-  }
-
-  std::map<std::string, opentelemetry::common::AttributeValue> attr9{
-      {"a", "string"},
-      {"b", false},
-      {"c", 314159},
-      {"d", static_cast<unsigned int>(314159)},
-      {"e", static_cast<int32_t>(-20)},
-      {"f", static_cast<uint32_t>(20)},
-      {"g", static_cast<int64_t>(-20)},
-      {"h", static_cast<uint64_t>(20)},
-      {"i", 3.1},
-      {"j", "string"}};
-
-  auto m9 = mp.GetMeter("name9", "version9", "url9", attr9);
-  ASSERT_NE(nullptr, m9);
-  {
-    auto meter = static_cast<opentelemetry::sdk::metrics::Meter *>(m9.get());
-    auto scope = meter->GetInstrumentationScope();
-    auto attrs = scope->GetAttributes();
-    ASSERT_EQ(attrs.size(), 10);
-    auto attr = attrs.find("h");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<uint64_t>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<uint64_t>(attr->second), 20);
-  }
-
-  // cleanup properly without crash
-  mp.ForceFlush();
-  mp.Shutdown();
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-TEST(MeterProvider, RemoveMeter)
-{
-  MeterProvider mp;
-
-  auto m1 = mp.GetMeter("test", "1", "URL");
-  ASSERT_NE(nullptr, m1);
-
-  // Will return the same meter
-  auto m2 = mp.GetMeter("test", "1", "URL");
-  ASSERT_NE(nullptr, m2);
-  ASSERT_EQ(m1, m2);
-
-  mp.RemoveMeter("unknown", "0", "");
-
-  // Will decrease use_count() on m1 and m2
-  mp.RemoveMeter("test", "1", "URL");
-
-  // Will create a different meter
-  auto m3 = mp.GetMeter("test", "1", "URL");
-  ASSERT_NE(nullptr, m3);
-  ASSERT_NE(m1, m3);
-  ASSERT_NE(m2, m3);
-
-  // Will decrease use_count() on m3
-  mp.RemoveMeter("test", "1", "URL");
-
-  // Will do nothing
-  mp.RemoveMeter("test", "1", "URL");
-
-  // cleanup properly without crash
-  mp.ForceFlush();
-  mp.Shutdown();
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */
-
-TEST(MeterProvider, GetMeterEqualityCheck)
-{
-  auto provider = MeterProviderFactory::Create();
-
-  // providing the same scope names should return the same Meter
-  auto meter_library_1a = provider->GetMeter("library_name");
-  auto meter_library_1b = provider->GetMeter("library_name");
-  EXPECT_EQ(meter_library_1a, meter_library_1b);
-
-  // providing the same scope name and version should return the same meter
-  auto meter_version_1a = provider->GetMeter("library_name", "v1.0");
-  auto meter_version_1b = provider->GetMeter("library_name", "v1.0");
-  EXPECT_EQ(meter_version_1a, meter_version_1b);
-
-  // providing the same name, version, and schema urls should return the same meter
-  auto meter_urla = provider->GetMeter("library_name", "v1.0", "url");
-  auto meter_urlb = provider->GetMeter("library_name", "v1.0", "url");
-  EXPECT_EQ(meter_urla, meter_urlb);
-}
-
-TEST(MeterProvider, GetMeterInequalityCheck)
-{
-  auto provider = MeterProviderFactory::Create();
-
-  auto meter_library_1 = provider->GetMeter("library_1");
-  auto meter_library_2 = provider->GetMeter("library_2");
-  auto meter_version_1 = provider->GetMeter("library_1", "v1.0");
-  auto meter_version_2 = provider->GetMeter("library_1", "v2.0");
-  auto meter_url_1     = provider->GetMeter("library_1", "v1.0", "url_1");
-  auto meter_url_2     = provider->GetMeter("library_1", "v1.0", "url_2");
-
-  // different scope names should return distinct meters
-  EXPECT_NE(meter_library_1, meter_library_2);
-
-  // different scope versions should return distinct meters
-  EXPECT_NE(meter_version_1, meter_library_1);
-  EXPECT_NE(meter_version_1, meter_version_2);
-
-  // different scope schema urls should return distinct meters
-  EXPECT_NE(meter_url_1, meter_library_1);
-  EXPECT_NE(meter_url_1, meter_version_1);
-  EXPECT_NE(meter_url_1, meter_url_2);
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-TEST(MeterProvider, GetMeterEqualityCheckAbiv2)
-{
-  auto provider = MeterProviderFactory::Create();
-
-  // providing the same name, version, schema url and attributes should return the same meter
-  auto meter_attribute1a = provider->GetMeter("library_name", "v1.0", "url", {{"key", "one"}});
-  auto meter_attribute1b = provider->GetMeter("library_name", "v1.0", "url", {{"key", "one"}});
-  EXPECT_EQ(meter_attribute1a, meter_attribute1b);
-}
-
-TEST(MeterProvider, GetMeterInequalityCheckAbiv2)
-{
-  auto provider = MeterProviderFactory::Create();
-
-  auto meter_1           = provider->GetMeter("library_name", "v1.0", "url");
-  auto meter_attribute_1 = provider->GetMeter("library_name", "v1.0", "url", {{"key", "one"}});
-  auto meter_attribute_2 = provider->GetMeter("library_name", "v1.0", "url", {{"key", "two"}});
-
-  // different scope attributes should return distinct meters
-  EXPECT_NE(meter_attribute_1, meter_1);
-  EXPECT_NE(meter_attribute_1, meter_attribute_2);
-}
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_provider_set_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_provider_set_test.cc
deleted file mode 100644
index bd8aae8cf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_provider_set_test.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdlib.h>
-
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/noop.h"
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-
-#if defined(_MSC_VER)
-#  include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#endif
-
-using opentelemetry::metrics::MeterProvider;
-using opentelemetry::metrics::NoopMeterProvider;
-using opentelemetry::metrics::Provider;
-
-namespace metrics_api = opentelemetry::metrics;
-namespace metrics_sdk = opentelemetry::sdk::metrics;
-
-TEST(Provider, SetMeterProviderDefault)
-{
-#ifndef NO_GETENV
-  unsetenv("OTEL_SDK_DISABLED");
-#endif
-
-  auto tf = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
-  metrics_sdk::Provider::SetMeterProvider(tf);
-  ASSERT_EQ(tf, metrics_api::Provider::GetMeterProvider());
-}
-
-#ifndef NO_GETENV
-TEST(Provider, SetMeterProviderEnabled)
-{
-  setenv("OTEL_SDK_DISABLED", "false", 1);
-
-  auto tf = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
-  metrics_sdk::Provider::SetMeterProvider(tf);
-  ASSERT_EQ(tf, metrics_api::Provider::GetMeterProvider());
-
-  unsetenv("OTEL_SDK_DISABLED");
-}
-
-TEST(Provider, SetMeterProviderDisabled)
-{
-  setenv("OTEL_SDK_DISABLED", "true", 1);
-
-  auto tf = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
-  metrics_sdk::Provider::SetMeterProvider(tf);
-  ASSERT_NE(tf, metrics_api::Provider::GetMeterProvider());
-
-  unsetenv("OTEL_SDK_DISABLED");
-}
-#endif
-
-TEST(Provider, MultipleMeterProviders)
-{
-  auto tf = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
-  metrics_sdk::Provider::SetMeterProvider(tf);
-  auto tf2 = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
-  metrics_sdk::Provider::SetMeterProvider(tf2);
-
-  ASSERT_NE(metrics_api::Provider::GetMeterProvider(), tf);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_test.cc
deleted file mode 100644
index 199ccc682..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/meter_test.cc
+++ /dev/null
@@ -1,853 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <atomic>
-#include <iostream>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include <functional>
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_config.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/resource/resource.h"
-
-#include <opentelemetry/sdk/metrics/view/view_registry_factory.h>
-
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/metrics/sync_instruments.h"  // IWYU pragma: keep
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::sdk::common::internal_log;
-
-namespace
-{
-nostd::shared_ptr<metrics::Meter> InitMeter(MetricReader **metricReaderPtr,
-                                            const std::string &meter_name = "meter_name")
-{
-  static std::shared_ptr<metrics::MeterProvider> provider(new MeterProvider());
-  std::unique_ptr<MetricReader> metric_reader(new MockMetricReader());
-  *metricReaderPtr = metric_reader.get();
-  auto p           = std::static_pointer_cast<MeterProvider>(provider);
-  p->AddMetricReader(std::move(metric_reader));
-  auto meter = provider->GetMeter(meter_name);
-  return meter;
-}
-
-void asyc_generate_measurements_long(opentelemetry::metrics::ObserverResult observer,
-                                     void * /* state */)
-{
-  auto observer_long =
-      nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<int64_t>>>(observer);
-  observer_long->Observe(10);
-}
-
-void asyc_generate_measurements_double(opentelemetry::metrics::ObserverResult observer,
-                                       void * /* state */)
-{
-  auto observer_double =
-      nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(observer);
-  observer_double->Observe(10.2f);
-}
-
-std::shared_ptr<metrics::MeterProvider> GetMeterProviderWithScopeConfigurator(
-    const ScopeConfigurator<MeterConfig> &meter_configurator,
-    MetricReader **metric_reader_ptr)
-{
-  auto views    = ViewRegistryFactory::Create();
-  auto resource = sdk::resource::Resource::Create({});
-  std::unique_ptr<MetricReader> metric_reader(new MockMetricReader());
-  *metric_reader_ptr = metric_reader.get();
-  std::shared_ptr<metrics::MeterProvider> provider(
-      new MeterProvider(std::move(views), resource,
-                        std::make_unique<ScopeConfigurator<MeterConfig>>(meter_configurator)));
-  auto p = std::static_pointer_cast<MeterProvider>(provider);
-  p->AddMetricReader(std::move(metric_reader));
-  return p;
-}
-
-class TestLogHandler : public LogHandler
-{
-public:
-  void Handle(LogLevel level,
-              const char * /*file*/,
-              int /*line*/,
-              const char *msg,
-              const sdk::common::AttributeMap & /*attributes*/) noexcept override
-
-  {
-    if (LogLevel::Warning == level)
-    {
-      std::cout << msg << std::endl;
-      warnings.push_back(msg);
-    }
-  }
-
-  bool HasNameCaseConflictWarning() const
-  {
-    return std::any_of(warnings.begin(), warnings.end(), [](const std::string &warning) {
-      return warning.find("WarnOnNameCaseConflict") != std::string::npos;
-    });
-  }
-
-  bool HasDuplicateInstrumentWarning() const
-  {
-    return std::any_of(warnings.begin(), warnings.end(), [](const std::string &warning) {
-      return warning.find("WarnOnDuplicateInstrument") != std::string::npos;
-    });
-  }
-
-private:
-  std::vector<std::string> warnings;
-};
-
-class MeterCreateInstrumentTest : public ::testing::Test
-{
-protected:
-  void SetUp() override
-  {
-    ASSERT_TRUE(log_handler_ != nullptr);
-    ASSERT_TRUE(metric_reader_ptr_ != nullptr);
-    ASSERT_TRUE(provider_ != nullptr);
-    GlobalLogHandler::SetLogHandler(std::static_pointer_cast<LogHandler>(log_handler_));
-    GlobalLogHandler::SetLogLevel(LogLevel::Warning);
-
-    provider_->AddMetricReader(metric_reader_ptr_);
-    meter_ = provider_->GetMeter("test_meter");
-    ASSERT_TRUE(meter_ != nullptr);
-  }
-
-  void TearDown() override {}
-
-  void AddNameCorrectionView(const std::string &name,
-                             const std::string &unit,
-                             InstrumentType type,
-                             const std::string &new_name)
-  {
-    std::unique_ptr<View> corrective_view{new View(new_name)};
-    std::unique_ptr<InstrumentSelector> instrument_selector{
-        new InstrumentSelector(type, name, unit)};
-
-    std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("test_meter", "", "")};
-
-    provider_->AddView(std::move(instrument_selector), std::move(meter_selector),
-                       std::move(corrective_view));
-  }
-
-  void AddDescriptionCorrectionView(const std::string &name,
-                                    const std::string &unit,
-                                    InstrumentType type,
-                                    const std::string &new_description)
-  {
-    std::unique_ptr<View> corrective_view{new View(name, new_description)};
-    std::unique_ptr<InstrumentSelector> instrument_selector{
-        new InstrumentSelector(type, name, unit)};
-
-    std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("test_meter", "", "")};
-
-    provider_->AddView(std::move(instrument_selector), std::move(meter_selector),
-                       std::move(corrective_view));
-  }
-
-  std::shared_ptr<sdk::metrics::MeterProvider> provider_{new sdk::metrics::MeterProvider()};
-  std::shared_ptr<TestLogHandler> log_handler_{new TestLogHandler()};
-  opentelemetry::nostd::shared_ptr<opentelemetry::metrics::Meter> meter_{nullptr};
-
-  std::shared_ptr<MetricReader> metric_reader_ptr_{new MockMetricReader()};
-};
-
-}  // namespace
-
-TEST(MeterTest, BasicAsyncTests)
-{
-  MetricReader *metric_reader_ptr = nullptr;
-  auto meter                      = InitMeter(&metric_reader_ptr);
-  auto observable_counter         = meter->CreateInt64ObservableCounter("observable_counter");
-  observable_counter->AddCallback(asyc_generate_measurements_long, nullptr);
-
-  size_t count = 0;
-  metric_reader_ptr->Collect([&count](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    if (metric_data.scope_metric_data_.size())
-    {
-      EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-      if (metric_data.scope_metric_data_.size())
-      {
-        count += metric_data.scope_metric_data_[0].metric_data_.size();
-        EXPECT_EQ(count, 1);
-      }
-    }
-    return true;
-  });
-  observable_counter->RemoveCallback(asyc_generate_measurements_long, nullptr);
-}
-
-constexpr static unsigned MAX_THREADS       = 25;
-constexpr static unsigned MAX_ITERATIONS_MT = 1000;
-
-TEST(MeterTest, StressMultiThread)
-{
-  MetricReader *metric_reader_ptr = nullptr;
-  auto meter                      = InitMeter(&metric_reader_ptr, "stress_test_meter");
-  std::atomic<unsigned> threadCount(0);
-  std::atomic<size_t> numIterations(MAX_ITERATIONS_MT);
-  std::atomic<bool> do_collect{false}, do_sync_create{true}, do_async_create{false};
-  std::vector<nostd::shared_ptr<opentelemetry::metrics::ObservableInstrument>>
-      observable_instruments;
-  std::vector<std::thread> meter_operation_threads;
-  std::atomic<size_t> instrument_id(0);
-  while (numIterations--)
-  {
-    for (size_t i = 0; i < MAX_THREADS; i++)
-    {
-      if (threadCount++ < MAX_THREADS)
-      {
-        auto t = std::thread([&]() {
-          std::this_thread::yield();
-          if (do_sync_create.exchange(false))
-          {
-            std::string instrument_name = "test_couter_" + std::to_string(instrument_id);
-            meter->CreateUInt64Counter(instrument_name, "", "");
-            do_async_create.store(true);
-            instrument_id++;
-          }
-          if (do_async_create.exchange(false))
-          {
-            std::cout << "\n creating async thread " << std::to_string(numIterations);
-            auto observable_instrument = meter->CreateInt64ObservableUpDownCounter(
-                "test_gauge_" + std::to_string(instrument_id));
-            observable_instrument->AddCallback(asyc_generate_measurements_long, nullptr);
-            observable_instruments.push_back(std::move(observable_instrument));
-            do_collect.store(true);
-            instrument_id++;
-          }
-          if (do_collect.exchange(false))
-          {
-            metric_reader_ptr->Collect([](ResourceMetrics & /* metric_data */) { return true; });
-            do_sync_create.store(true);
-          }
-        });
-        meter_operation_threads.push_back(std::move(t));
-      }
-    }
-  }
-  for (auto &t : meter_operation_threads)
-  {
-    if (t.joinable())
-    {
-      t.join();
-    }
-  }
-}
-
-TEST(MeterTest, MeterWithDisabledConfig)
-{
-  ScopeConfigurator<MeterConfig> disable_all_scopes =
-      ScopeConfigurator<MeterConfig>::Builder(MeterConfig::Disabled()).Build();
-  MetricReader *metric_reader_ptr = nullptr;
-  std::shared_ptr<metrics::MeterProvider> meter_provider =
-      GetMeterProviderWithScopeConfigurator(disable_all_scopes, &metric_reader_ptr);
-
-  auto meter = meter_provider->GetMeter("foo", "0.1.0", "https://opentelemetry.io/schemas/1.24.0");
-
-  // Test all supported instruments from this meter - create instruments
-  auto double_counter         = meter->CreateDoubleCounter("double_counter");
-  auto double_histogram       = meter->CreateDoubleHistogram("double_histogram");
-  auto double_up_down_counter = meter->CreateDoubleUpDownCounter("double_up_down_counter");
-  auto double_obs_counter     = meter->CreateDoubleObservableCounter("double_obs_counter");
-  auto double_obs_gauge       = meter->CreateDoubleObservableGauge("double_obs_gauge");
-  auto double_obs_up_down_counter =
-      meter->CreateDoubleObservableUpDownCounter("double_obs_up_down_counter");
-
-  auto uint64_counter        = meter->CreateUInt64Counter("uint64_counter");
-  auto uint64_histogram      = meter->CreateUInt64Histogram("uint64_histogram");
-  auto int64_up_down_counter = meter->CreateInt64UpDownCounter("int64_up_down_counter");
-  auto int64_obs_counter     = meter->CreateInt64ObservableCounter("int64_obs_counter");
-  auto int64_obs_gauge       = meter->CreateInt64ObservableGauge("int64_obs_gauge");
-  auto int64_obs_up_down_counter =
-      meter->CreateInt64ObservableUpDownCounter("int64_obs_up_down_counter");
-
-  // Invoke the created instruments
-  double_counter->Add(1.0f);
-  double_histogram->Record(23.2f, {});
-  double_up_down_counter->Add(-2.4f);
-  double_obs_counter->AddCallback(asyc_generate_measurements_double, nullptr);
-  double_obs_gauge->AddCallback(asyc_generate_measurements_double, nullptr);
-  double_obs_up_down_counter->AddCallback(asyc_generate_measurements_double, nullptr);
-
-  uint64_counter->Add(1);
-  uint64_histogram->Record(23, {});
-  int64_up_down_counter->Add(-2);
-  int64_obs_counter->AddCallback(asyc_generate_measurements_long, nullptr);
-  int64_obs_gauge->AddCallback(asyc_generate_measurements_long, nullptr);
-  int64_obs_up_down_counter->AddCallback(asyc_generate_measurements_long, nullptr);
-
-  // No active instruments are expected - since all scopes are disabled.
-  metric_reader_ptr->Collect([&](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 0);
-    return true;
-  });
-}
-
-TEST(MeterTest, MeterWithEnabledConfig)
-{
-  ScopeConfigurator<MeterConfig> enable_all_scopes =
-      ScopeConfigurator<MeterConfig>::Builder(MeterConfig::Enabled()).Build();
-  MetricReader *metric_reader_ptr = nullptr;
-  std::shared_ptr<metrics::MeterProvider> meter_provider =
-      GetMeterProviderWithScopeConfigurator(enable_all_scopes, &metric_reader_ptr);
-
-  auto meter = meter_provider->GetMeter("foo", "0.1.0", "https://opentelemetry.io/schemas/1.24.0");
-
-  // Test all supported instruments from this meter - create instruments
-  auto double_counter         = meter->CreateDoubleCounter("double_counter");
-  auto double_histogram       = meter->CreateDoubleHistogram("double_histogram");
-  auto double_up_down_counter = meter->CreateDoubleUpDownCounter("double_up_down_counter");
-  auto double_obs_counter     = meter->CreateDoubleObservableCounter("double_obs_counter");
-  auto double_obs_gauge       = meter->CreateDoubleObservableGauge("double_obs_gauge");
-  auto double_obs_up_down_counter =
-      meter->CreateDoubleObservableUpDownCounter("double_obs_up_down_counter");
-
-  auto uint64_counter        = meter->CreateUInt64Counter("uint64_counter");
-  auto uint64_histogram      = meter->CreateUInt64Histogram("uint64_histogram");
-  auto int64_up_down_counter = meter->CreateInt64UpDownCounter("int64_up_down_counter");
-  auto int64_obs_counter     = meter->CreateInt64ObservableCounter("int64_obs_counter");
-  auto int64_obs_gauge       = meter->CreateInt64ObservableGauge("int64_obs_gauge");
-  auto int64_obs_up_down_counter =
-      meter->CreateInt64ObservableUpDownCounter("int64_obs_up_down_counter");
-
-  // Invoke the created instruments
-  double_counter->Add(1.0f);
-  double_histogram->Record(23.2f, {});
-  double_up_down_counter->Add(-2.4f);
-  double_obs_counter->AddCallback(asyc_generate_measurements_double, nullptr);
-  double_obs_gauge->AddCallback(asyc_generate_measurements_double, nullptr);
-  double_obs_up_down_counter->AddCallback(asyc_generate_measurements_double, nullptr);
-
-  uint64_counter->Add(1);
-  uint64_histogram->Record(23, {});
-  int64_up_down_counter->Add(-2);
-  int64_obs_counter->AddCallback(asyc_generate_measurements_long, nullptr);
-  int64_obs_gauge->AddCallback(asyc_generate_measurements_long, nullptr);
-  int64_obs_up_down_counter->AddCallback(asyc_generate_measurements_long, nullptr);
-
-  // Expected active instruments
-  std::vector<std::pair<std::string, std::string>> active_scope_instrument_pairs;
-  active_scope_instrument_pairs.emplace_back("foo", "double_counter");
-  active_scope_instrument_pairs.emplace_back("foo", "double_histogram");
-  active_scope_instrument_pairs.emplace_back("foo", "double_up_down_counter");
-  active_scope_instrument_pairs.emplace_back("foo", "double_obs_up_down_counter");
-  active_scope_instrument_pairs.emplace_back("foo", "double_obs_counter");
-  active_scope_instrument_pairs.emplace_back("foo", "double_obs_gauge");
-  active_scope_instrument_pairs.emplace_back("foo", "uint64_counter");
-  active_scope_instrument_pairs.emplace_back("foo", "uint64_histogram");
-  active_scope_instrument_pairs.emplace_back("foo", "int64_up_down_counter");
-  active_scope_instrument_pairs.emplace_back("foo", "int64_obs_up_down_counter");
-  active_scope_instrument_pairs.emplace_back("foo", "int64_obs_counter");
-  active_scope_instrument_pairs.emplace_back("foo", "int64_obs_gauge");
-
-  metric_reader_ptr->Collect([&](const ResourceMetrics &metric_data) {
-    bool unexpected_instrument_found = false;
-    std::string curr_scope_name      = metric_data.scope_metric_data_.at(0).scope_->GetName();
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_.at(0).scope_->GetName(), "foo");
-    EXPECT_EQ(metric_data.scope_metric_data_.at(0).metric_data_.size(), 12);
-    for (const MetricData &md : metric_data.scope_metric_data_.at(0).metric_data_)
-    {
-      auto found_instrument = std::make_pair(curr_scope_name, md.instrument_descriptor.name_);
-      // confirm if the found instrument is expected
-      auto it = std::find(active_scope_instrument_pairs.begin(),
-                          active_scope_instrument_pairs.end(), found_instrument);
-      if (it == active_scope_instrument_pairs.end())
-      {
-        // found instrument is not expected
-        unexpected_instrument_found = true;
-        break;
-      }
-    }
-    EXPECT_FALSE(unexpected_instrument_found);
-    return true;
-  });
-}
-
-TEST(MeterTest, MeterWithCustomConfig)
-{
-  // within the same call
-  auto check_if_version_present = [](const InstrumentationScope &scope_info) {
-    return !scope_info.GetVersion().empty();
-  };
-
-  // custom scope configurator that only disables meters with name "foo_library" or do not have
-  // version information
-  ScopeConfigurator<MeterConfig> custom_scope_configurator =
-      ScopeConfigurator<MeterConfig>::Builder(MeterConfig::Disabled())
-          .AddConditionNameEquals("foo_library", MeterConfig::Disabled())
-          .AddCondition(check_if_version_present, MeterConfig::Enabled())
-          .Build();
-  MetricReader *metric_reader_ptr = nullptr;
-  std::shared_ptr<metrics::MeterProvider> meter_provider =
-      GetMeterProviderWithScopeConfigurator(custom_scope_configurator, &metric_reader_ptr);
-
-  // The meter has version information and name is not "foo_library".
-  // All instruments from this meter should be active and recording metrics.
-  auto meter_enabled_expected_bar =
-      meter_provider->GetMeter("bar_library", "0.1.0", "https://opentelemetry.io/schemas/1.24.0");
-
-  // The meter has version information and name is "foo_library".
-  // All instruments from this meter should be noop.
-  auto meter_disabled_expected_foo =
-      meter_provider->GetMeter("foo_library", "0.1.0", "https://opentelemetry.io/schemas/1.24.0");
-
-  // This meter has no version information.
-  // All instruments from this meter should be noop.
-  auto meter_disabled_expected_baz =
-      meter_provider->GetMeter("baz_library", "", "https://opentelemetry.io/schemas/1.24.0");
-
-  // Create instruments from all meters
-  auto double_counter_bar = meter_enabled_expected_bar->CreateDoubleCounter("double_counter");
-  auto double_counter_foo = meter_disabled_expected_foo->CreateDoubleCounter("double_counter");
-  auto double_counter_baz = meter_disabled_expected_baz->CreateDoubleCounter("double_counter");
-
-  // Invoke created instruments at least once
-  double_counter_bar->Add(1.0f);
-  double_counter_foo->Add(1.0f);
-  double_counter_baz->Add(1.0f);
-
-  std::vector<std::pair<std::string, std::string>> active_scope_instrument_pairs;
-  active_scope_instrument_pairs.emplace_back("bar_library", "double_counter");
-
-  metric_reader_ptr->Collect([&](const ResourceMetrics &metric_data) {
-    int found_instruments            = 0;
-    bool unexpected_instrument_found = false;
-    for (const ScopeMetrics &sm : metric_data.scope_metric_data_)
-    {
-      std::string curr_scope = sm.scope_->GetName();
-      for (const MetricData &md : sm.metric_data_)
-      {
-        found_instruments++;
-        auto found_instrument = std::make_pair(curr_scope, md.instrument_descriptor.name_);
-        // confirm if the found instrument is expected
-        auto it = std::find(active_scope_instrument_pairs.begin(),
-                            active_scope_instrument_pairs.end(), found_instrument);
-        if (it == active_scope_instrument_pairs.end())
-        {
-          // found instrument is not expected
-          unexpected_instrument_found = true;
-          break;
-        }
-      }
-    }
-    EXPECT_EQ(found_instruments, active_scope_instrument_pairs.size());
-    EXPECT_FALSE(unexpected_instrument_found);
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, IdenticalSyncInstruments)
-{
-  auto counter1 = meter_->CreateDoubleCounter("my_counter", "desc", "unit");
-  auto counter2 = meter_->CreateDoubleCounter("my_counter", "desc", "unit");
-
-  counter1->Add(1.0, {{"key", "value1"}});
-  counter2->Add(2.5, {{"key", "value2"}});
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 2);
-    auto &point_data1 =
-        metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_[0].point_data;
-    auto &point_data2 =
-        metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_[1].point_data;
-
-    auto sum_point_data1 = nostd::get<sdk::metrics::SumPointData>(point_data1);
-    auto sum_point_data2 = nostd::get<sdk::metrics::SumPointData>(point_data2);
-
-    const double sum =
-        nostd::get<double>(sum_point_data1.value_) + nostd::get<double>(sum_point_data2.value_);
-    EXPECT_DOUBLE_EQ(sum, 3.5);
-    EXPECT_FALSE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, NameCaseConflictSyncInstruments)
-{
-  auto counter1 = meter_->CreateUInt64Counter("My_CountER", "desc", "unit");
-  auto counter2 = meter_->CreateUInt64Counter("my_counter", "desc", "unit");
-
-  counter1->Add(1);
-  counter2->Add(2);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    auto &point_data =
-        metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_[0].point_data;
-    auto sum_point_data = nostd::get<sdk::metrics::SumPointData>(point_data);
-    const auto sum      = nostd::get<int64_t>(sum_point_data.value_);
-    EXPECT_EQ(sum, 3);
-    EXPECT_FALSE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_TRUE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, ViewCorrectedNameCaseConflictSyncInstruments)
-{
-  InstrumentDescriptor descriptor{"My_CountER", "desc", "unit", InstrumentType::kCounter,
-                                  InstrumentValueType::kLong};
-
-  AddNameCorrectionView(descriptor.name_, descriptor.unit_, descriptor.type_, "my_counter");
-
-  auto counter1 =
-      meter_->CreateUInt64Counter("My_CountER", descriptor.description_, descriptor.unit_);
-  auto counter2 =
-      meter_->CreateUInt64Counter("my_counter", descriptor.description_, descriptor.unit_);
-
-  counter1->Add(1);
-  counter2->Add(2);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    auto &point_data =
-        metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_[0].point_data;
-    auto sum_point_data = nostd::get<sdk::metrics::SumPointData>(point_data);
-    const auto sum      = nostd::get<int64_t>(sum_point_data.value_);
-    EXPECT_EQ(sum, 3);
-    // no warnings expected after correction with the view
-    EXPECT_FALSE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, DuplicateSyncInstrumentsByKind)
-{
-  auto counter1 = meter_->CreateDoubleCounter("my_counter", "desc", "unit");
-  auto counter2 = meter_->CreateUInt64Counter("my_counter", "desc", "unit");
-
-  counter1->Add(1, {{"key", "value1"}});
-  counter2->Add(1, {{"key", "value2"}});
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 2);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[1].point_data_attr_.size(), 1);
-    EXPECT_TRUE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, DuplicateSyncInstrumentsByUnits)
-{
-  auto counter1 = meter_->CreateDoubleCounter("my_counter", "desc", "unit");
-  auto counter2 = meter_->CreateDoubleCounter("my_counter", "desc", "another_unit");
-
-  counter1->Add(1, {{"key", "value1"}});
-  counter2->Add(1, {{"key", "value2"}});
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 2);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[1].point_data_attr_.size(), 1);
-    EXPECT_TRUE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, DuplicateSyncInstrumentsByDescription)
-{
-  auto counter1 = meter_->CreateDoubleCounter("my_counter", "desc", "unit");
-  auto counter2 = meter_->CreateDoubleCounter("my_counter", "another_desc", "unit");
-
-  counter1->Add(1, {{"key", "value1"}});
-  counter2->Add(1, {{"key", "value2"}});
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 2);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[1].point_data_attr_.size(), 1);
-    EXPECT_TRUE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, ViewCorrectedDuplicateSyncInstrumentsByDescription)
-{
-  InstrumentDescriptor descriptor{"my_counter", "desc", "unit", InstrumentType::kCounter,
-                                  InstrumentValueType::kDouble};
-  AddDescriptionCorrectionView(descriptor.name_, descriptor.unit_, descriptor.type_,
-                               descriptor.description_);
-
-  auto counter1 = meter_->CreateDoubleCounter("my_counter", "desc", "unit");
-  auto counter2 = meter_->CreateDoubleCounter("my_counter", "another_desc", "unit");
-
-  counter1->Add(1, {{"key", "value1"}});
-  counter2->Add(1, {{"key", "value2"}});
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    // only one metric_data object expected after correction with the view
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 2);
-    // no warnings expected after correction with the view
-    EXPECT_FALSE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, IdenticalAsyncInstruments)
-{
-  auto observable_counter1 =
-      meter_->CreateInt64ObservableCounter("observable_counter", "desc", "unit");
-  auto observable_counter2 =
-      meter_->CreateInt64ObservableCounter("observable_counter", "desc", "unit");
-
-  auto callback1 = [](opentelemetry::metrics::ObserverResult observer, void * /* state */) {
-    auto observer_long =
-        nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<int64_t>>>(observer);
-    observer_long->Observe(12, {{"key", "value1"}});
-  };
-
-  auto callback2 = [](opentelemetry::metrics::ObserverResult observer, void * /* state */) {
-    auto observer_long =
-        nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<int64_t>>>(observer);
-    observer_long->Observe(2, {{"key", "value2"}});
-  };
-
-  observable_counter1->AddCallback(callback1, nullptr);
-  observable_counter2->AddCallback(callback2, nullptr);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-    auto &point_data_attr = metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_;
-    EXPECT_EQ(point_data_attr.size(), 2);
-
-    auto &point_data1 = point_data_attr[0].point_data;
-    auto &point_data2 = point_data_attr[1].point_data;
-
-    auto sum_point_data1 = nostd::get<sdk::metrics::SumPointData>(point_data1);
-    auto sum_point_data2 = nostd::get<sdk::metrics::SumPointData>(point_data2);
-
-    int64_t sum =
-        nostd::get<int64_t>(sum_point_data1.value_) + nostd::get<int64_t>(sum_point_data2.value_);
-    EXPECT_EQ(sum, 14);
-    EXPECT_FALSE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, NameCaseConflictAsyncInstruments)
-{
-  auto observable_counter1 =
-      meter_->CreateDoubleObservableCounter("OBServable_CounTER", "desc", "unit");
-  auto observable_counter2 =
-      meter_->CreateDoubleObservableCounter("observable_counter", "desc", "unit");
-
-  auto callback1 = [](opentelemetry::metrics::ObserverResult observer, void * /* state */) {
-    auto observer_double =
-        nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(observer);
-    observer_double->Observe(22.22, {{"key", "value1"}});
-  };
-
-  auto callback2 = [](opentelemetry::metrics::ObserverResult observer, void * /* state */) {
-    auto observer_double =
-        nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(observer);
-    observer_double->Observe(55.55, {{"key", "value2"}});
-  };
-
-  observable_counter1->AddCallback(callback1, nullptr);
-  observable_counter2->AddCallback(callback2, nullptr);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-    auto &point_data_attr = metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_;
-    EXPECT_EQ(point_data_attr.size(), 2);
-
-    auto &point_data1    = point_data_attr[0].point_data;
-    auto &point_data2    = point_data_attr[1].point_data;
-    auto sum_point_data1 = nostd::get<sdk::metrics::SumPointData>(point_data1);
-    auto sum_point_data2 = nostd::get<sdk::metrics::SumPointData>(point_data2);
-
-    const double sum =
-        nostd::get<double>(sum_point_data1.value_) + nostd::get<double>(sum_point_data2.value_);
-    EXPECT_DOUBLE_EQ(sum, 77.77);
-    EXPECT_FALSE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_TRUE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, ViewCorrectedNameCaseConflictAsyncInstruments)
-{
-  AddNameCorrectionView("OBServable_CounTER", "unit", InstrumentType::kObservableCounter,
-                        "observable_counter");
-
-  auto observable_counter1 =
-      meter_->CreateDoubleObservableCounter("OBServable_CounTER", "desc", "unit");
-  auto observable_counter2 =
-      meter_->CreateDoubleObservableCounter("observable_counter", "desc", "unit");
-
-  auto callback1 = [](opentelemetry::metrics::ObserverResult observer, void * /* state */) {
-    auto observer_double =
-        nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(observer);
-    observer_double->Observe(22.22, {{"key", "value1"}});
-  };
-
-  auto callback2 = [](opentelemetry::metrics::ObserverResult observer, void * /* state */) {
-    auto observer_double =
-        nostd::get<nostd::shared_ptr<opentelemetry::metrics::ObserverResultT<double>>>(observer);
-    observer_double->Observe(55.55, {{"key", "value2"}});
-  };
-
-  observable_counter1->AddCallback(callback1, nullptr);
-  observable_counter2->AddCallback(callback2, nullptr);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-    auto &point_data_attr = metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_;
-    EXPECT_EQ(point_data_attr.size(), 2);
-
-    auto &point_data1    = point_data_attr[0].point_data;
-    auto &point_data2    = point_data_attr[1].point_data;
-    auto sum_point_data1 = nostd::get<sdk::metrics::SumPointData>(point_data1);
-    auto sum_point_data2 = nostd::get<sdk::metrics::SumPointData>(point_data2);
-
-    const double sum =
-        nostd::get<double>(sum_point_data1.value_) + nostd::get<double>(sum_point_data2.value_);
-    EXPECT_DOUBLE_EQ(sum, 77.77);
-    // no warnings expected after correction with the view
-    EXPECT_FALSE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, DuplicateAsyncInstrumentsByKind)
-{
-  auto observable_counter1 = meter_->CreateDoubleObservableCounter("observable_counter");
-  auto observable_counter2 = meter_->CreateDoubleObservableGauge("observable_counter");
-
-  observable_counter1->AddCallback(asyc_generate_measurements_double, nullptr);
-  observable_counter2->AddCallback(asyc_generate_measurements_double, nullptr);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 2);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    EXPECT_TRUE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, DuplicateAsyncInstrumentsByUnits)
-{
-  auto observable_counter1 =
-      meter_->CreateDoubleObservableCounter("observable_counter", "desc", "unit");
-  auto observable_counter2 =
-      meter_->CreateDoubleObservableCounter("observable_counter", "desc", "another_unit");
-
-  observable_counter1->AddCallback(asyc_generate_measurements_double, nullptr);
-  observable_counter2->AddCallback(asyc_generate_measurements_double, nullptr);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 2);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    EXPECT_TRUE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, DuplicateAsyncInstrumentsByDescription)
-{
-  auto observable_counter1 =
-      meter_->CreateDoubleObservableCounter("observable_counter", "desc", "unit");
-  auto observable_counter2 =
-      meter_->CreateDoubleObservableCounter("observable_counter", "another_desc", "unit");
-
-  observable_counter1->AddCallback(asyc_generate_measurements_double, nullptr);
-  observable_counter2->AddCallback(asyc_generate_measurements_double, nullptr);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 2);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    EXPECT_TRUE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
-
-TEST_F(MeterCreateInstrumentTest, ViewCorrectedDuplicateAsyncInstrumentsByDescription)
-{
-  InstrumentDescriptor descriptor{"observable_counter", "desc", "unit",
-                                  InstrumentType::kObservableCounter, InstrumentValueType::kDouble};
-
-  AddDescriptionCorrectionView(descriptor.name_, descriptor.unit_, descriptor.type_,
-                               descriptor.description_);
-
-  auto observable_counter1 = meter_->CreateDoubleObservableCounter(
-      descriptor.name_, descriptor.description_, descriptor.unit_);
-  auto observable_counter2 =
-      meter_->CreateDoubleObservableCounter(descriptor.name_, "another_desc", descriptor.unit_);
-
-  observable_counter1->AddCallback(asyc_generate_measurements_double, nullptr);
-  observable_counter2->AddCallback(asyc_generate_measurements_double, nullptr);
-
-  metric_reader_ptr_->Collect([this](ResourceMetrics &metric_data) {
-    EXPECT_EQ(metric_data.scope_metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_.size(), 1);
-    EXPECT_EQ(metric_data.scope_metric_data_[0].metric_data_[0].point_data_attr_.size(), 1);
-    // no warnings expected after correction with the view
-    EXPECT_FALSE(log_handler_->HasDuplicateInstrumentWarning());
-    EXPECT_FALSE(log_handler_->HasNameCaseConflictWarning());
-    return true;
-  });
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_collector_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_collector_test.cc
deleted file mode 100644
index fe05981de..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_collector_test.cc
+++ /dev/null
@@ -1,403 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include "common.h"
-#include "gmock/gmock.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/sync_instruments.h"  // IWYU pragma: keep
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_filter.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-#include "opentelemetry/sdk/metrics/view/view_registry_factory.h"
-
-#if defined(__GNUC__) || defined(__clang__) || defined(__apple_build_version__)
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wunused-parameter"
-#endif
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-using namespace testing;
-
-using M = std::map<std::string, std::string>;
-
-namespace
-{
-
-MetricFilter::TestMetricFn AcceptAllTestMetricFn()
-{
-  return [](const InstrumentationScope &scope, nostd::string_view name, const InstrumentType &type,
-            nostd::string_view unit) -> MetricFilter::MetricFilterResult {
-    return MetricFilter::MetricFilterResult::kAccept;
-  };
-}
-MetricFilter::TestMetricFn DropAllTestMetricFn()
-{
-  return [](const InstrumentationScope &scope, nostd::string_view name, const InstrumentType &type,
-            nostd::string_view unit) -> MetricFilter::MetricFilterResult {
-    return MetricFilter::MetricFilterResult::kDrop;
-  };
-}
-MetricFilter::TestMetricFn AcceptPartialAllTestMetricFn()
-{
-  return [](const InstrumentationScope &scope, nostd::string_view name, const InstrumentType &type,
-            nostd::string_view unit) -> MetricFilter::MetricFilterResult {
-    return MetricFilter::MetricFilterResult::kAcceptPartial;
-  };
-}
-
-MetricFilter::TestAttributesFn AcceptAllTestAttributesFn()
-{
-  return [](const InstrumentationScope &scope, nostd::string_view name, const InstrumentType &type,
-            nostd::string_view unit,
-            const PointAttributes &attributes) -> MetricFilter::AttributesFilterResult {
-    return MetricFilter::AttributesFilterResult::kAccept;
-  };
-}
-MetricFilter::TestAttributesFn DropAllTestAttributesFn()
-{
-  return [](const InstrumentationScope &scope, nostd::string_view name, const InstrumentType &type,
-            nostd::string_view unit,
-            const PointAttributes &attributes) -> MetricFilter::AttributesFilterResult {
-    return MetricFilter::AttributesFilterResult::kDrop;
-  };
-}
-
-}  // namespace
-
-class testing::MetricCollectorTest : public Test
-{
-public:
-  std::weak_ptr<MetricCollector> AddMetricReaderToMeterContext(
-      std::shared_ptr<MeterContext> context,
-      std::shared_ptr<MetricReader> reader,
-      std::unique_ptr<MetricFilter> metric_filter = nullptr) noexcept
-  {
-    auto collector = std::shared_ptr<MetricCollector>{
-        new MetricCollector(context.get(), std::move(reader), std::move(metric_filter))};
-    context->collectors_.push_back(collector);
-    return std::weak_ptr<MetricCollector>(collector);
-  }
-};
-
-TEST_F(MetricCollectorTest, CollectWithMetricFilterTestMetricTest1)
-{
-  auto context = std::shared_ptr<MeterContext>(new MeterContext(ViewRegistryFactory::Create()));
-  auto scope   = InstrumentationScope::Create("CollectWithMetricFilterTestMetricTest1");
-  auto meter   = std::shared_ptr<Meter>(new Meter(context, std::move(scope)));
-  context->AddMeter(meter);
-
-  auto filter    = MetricFilter::Create(AcceptAllTestMetricFn(), DropAllTestAttributesFn());
-  auto reader    = std::shared_ptr<MetricReader>(new MockMetricReader());
-  auto collector = AddMetricReaderToMeterContext(context, reader, std::move(filter)).lock();
-
-  auto instrument_1_name = "instrument_1";
-  auto instrument_1      = meter->CreateUInt64Counter(instrument_1_name);
-
-  auto instrument_2_name = "instrument_2";
-  auto instrument_2      = meter->CreateUInt64Counter(instrument_2_name);
-  M m_2                  = {{"stream", "1"}};
-  instrument_2->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_2),
-                    opentelemetry::context::Context{});
-
-  auto instrument_3_name = "instrument_3";
-  auto instrument_3      = meter->CreateUInt64Counter(instrument_3_name);
-  for (int s = 1; s <= 10; ++s)
-  {
-    for (int i = 0; i < s; ++i)
-    {
-      M m_3 = {{"stream", std::to_string(s)}};
-      instrument_3->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_3),
-                        opentelemetry::context::Context{});
-    }
-  }
-
-  auto resource_metrics = collector->Produce().points_;
-  for (const ScopeMetrics &scope_metrics : resource_metrics.scope_metric_data_)
-  {
-    for (const MetricData &metric : scope_metrics.metric_data_)
-    {
-      auto instrument_name = metric.instrument_descriptor.name_;
-      ASSERT_TRUE(instrument_name == instrument_2_name || instrument_name == instrument_3_name);
-      if (instrument_name == instrument_2_name)
-      {
-        EXPECT_EQ(metric.point_data_attr_.size(), 1);
-      }
-      else if (instrument_name == instrument_3_name)
-      {
-        EXPECT_EQ(metric.point_data_attr_.size(), 10);
-      }
-    }
-  }
-}
-
-TEST_F(MetricCollectorTest, CollectWithMetricFilterTestMetricTest2)
-{
-  auto context = std::shared_ptr<MeterContext>(new MeterContext(ViewRegistryFactory::Create()));
-  auto scope   = InstrumentationScope::Create("CollectWithMetricFilterTestMetricTest2");
-  auto meter   = std::shared_ptr<Meter>(new Meter(context, std::move(scope)));
-  context->AddMeter(meter);
-
-  auto filter    = MetricFilter::Create(DropAllTestMetricFn(), AcceptAllTestAttributesFn());
-  auto reader    = std::shared_ptr<MetricReader>(new MockMetricReader());
-  auto collector = AddMetricReaderToMeterContext(context, reader, std::move(filter)).lock();
-
-  auto instrument_1_name = "instrument_1";
-  auto instrument_1      = meter->CreateUInt64Counter(instrument_1_name);
-
-  auto instrument_2_name = "instrument_2";
-  auto instrument_2      = meter->CreateUInt64Counter(instrument_2_name);
-  M m_2                  = {{"stream", "1"}};
-  instrument_2->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_2),
-                    opentelemetry::context::Context{});
-
-  auto instrument_3_name = "instrument_3";
-  auto instrument_3      = meter->CreateUInt64Counter(instrument_3_name);
-  for (int s = 1; s <= 10; ++s)
-  {
-    for (int i = 0; i < s; ++i)
-    {
-      M m_3 = {{"stream", std::to_string(s)}};
-      instrument_3->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_3),
-                        opentelemetry::context::Context{});
-    }
-  }
-
-  auto resource_metrics = collector->Produce().points_;
-  EXPECT_EQ(resource_metrics.scope_metric_data_.size(), 0);
-}
-
-TEST_F(MetricCollectorTest, CollectWithMetricFilterTestMetricTest3)
-{
-  auto context = std::shared_ptr<MeterContext>(new MeterContext(ViewRegistryFactory::Create()));
-  auto scope   = InstrumentationScope::Create("CollectWithMetricFilterTestMetricTest3");
-  auto meter   = std::shared_ptr<Meter>(new Meter(context, std::move(scope)));
-  context->AddMeter(meter);
-
-  auto test_metric_fn = [](const InstrumentationScope &scope, nostd::string_view name,
-                           const InstrumentType &type,
-                           nostd::string_view unit) -> MetricFilter::MetricFilterResult {
-    std::string name_copy = {name.begin(), name.end()};
-    if (name_copy.find("_accept") != std::string::npos)
-    {
-      return MetricFilter::MetricFilterResult::kAccept;
-    }
-    return MetricFilter::MetricFilterResult::kDrop;
-  };
-  auto filter    = MetricFilter::Create(test_metric_fn, DropAllTestAttributesFn());
-  auto reader    = std::shared_ptr<MetricReader>(new MockMetricReader());
-  auto collector = AddMetricReaderToMeterContext(context, reader, std::move(filter)).lock();
-
-  auto instrument_1_name = "instrument_1";
-  auto instrument_1      = meter->CreateUInt64Counter(instrument_1_name);
-
-  auto instrument_2_name = "instrument_2";
-  auto instrument_2      = meter->CreateUInt64Counter(instrument_2_name);
-  M m_2                  = {{"stream", "1"}};
-  instrument_2->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_2),
-                    opentelemetry::context::Context{});
-
-  auto instrument_3_name = "instrument_3_accept";
-  auto instrument_3      = meter->CreateUInt64Counter(instrument_3_name);
-  for (int s = 1; s <= 10; ++s)
-  {
-    for (int i = 0; i < s; ++i)
-    {
-      M m_3 = {{"stream", std::to_string(s)}};
-      instrument_3->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_3),
-                        opentelemetry::context::Context{});
-    }
-  }
-
-  auto resource_metrics = collector->Produce().points_;
-  for (const ScopeMetrics &scope_metrics : resource_metrics.scope_metric_data_)
-  {
-    for (const MetricData &metric : scope_metrics.metric_data_)
-    {
-      auto instrument_name = metric.instrument_descriptor.name_;
-      ASSERT_EQ(instrument_name, instrument_3_name);
-      EXPECT_EQ(metric.point_data_attr_.size(), 10);
-    }
-  }
-}
-
-TEST_F(MetricCollectorTest, CollectWithMetricFilterTestAttributesTest1)
-{
-  auto context = std::shared_ptr<MeterContext>(new MeterContext(ViewRegistryFactory::Create()));
-  auto scope   = InstrumentationScope::Create("CollectWithMetricFilterTestAttributesTest1");
-  auto meter   = std::shared_ptr<Meter>(new Meter(context, std::move(scope)));
-  context->AddMeter(meter);
-
-  auto test_attributes_fn =
-      [](const InstrumentationScope &scope, nostd::string_view name, const InstrumentType &type,
-         nostd::string_view unit,
-         const PointAttributes &attributes) -> MetricFilter::AttributesFilterResult {
-    if (attributes.GetAttributes().find("stream") != attributes.GetAttributes().end())
-    {
-      return MetricFilter::AttributesFilterResult::kAccept;
-    }
-    return MetricFilter::AttributesFilterResult::kDrop;
-  };
-  auto filter    = MetricFilter::Create(AcceptPartialAllTestMetricFn(), test_attributes_fn);
-  auto reader    = std::shared_ptr<MetricReader>(new MockMetricReader());
-  auto collector = AddMetricReaderToMeterContext(context, reader, std::move(filter)).lock();
-
-  auto instrument_1_name = "instrument_1";
-  auto instrument_1      = meter->CreateUInt64Counter(instrument_1_name);
-  M m_1                  = {{"ocean", "1"}};
-  instrument_1->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_1),
-                    opentelemetry::context::Context{});
-
-  auto instrument_2_name = "instrument_2";
-  auto instrument_2      = meter->CreateUInt64Counter(instrument_2_name);
-  M m_2                  = {{"stream", "1"}, {"river", "10"}};
-  instrument_2->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_2),
-                    opentelemetry::context::Context{});
-
-  auto instrument_3_name = "instrument_3";
-  auto instrument_3      = meter->CreateUInt64Counter(instrument_3_name);
-  for (int s = 1; s <= 10; ++s)
-  {
-    for (int i = 0; i < s; ++i)
-    {
-      M m_3 = {{"stream", std::to_string(s)}, {"river", std::to_string(s * 10)}};
-      instrument_3->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_3),
-                        opentelemetry::context::Context{});
-    }
-  }
-
-  auto resource_metrics = collector->Produce().points_;
-  for (const ScopeMetrics &scope_metrics : resource_metrics.scope_metric_data_)
-  {
-    for (const MetricData &metric : scope_metrics.metric_data_)
-    {
-      auto instrument_name = metric.instrument_descriptor.name_;
-      ASSERT_TRUE(instrument_name == instrument_2_name || instrument_name == instrument_3_name);
-      if (instrument_name == instrument_2_name)
-      {
-        EXPECT_EQ(metric.point_data_attr_.size(), 1);
-      }
-      else if (instrument_name == instrument_3_name)
-      {
-        EXPECT_EQ(metric.point_data_attr_.size(), 10);
-        for (const PointDataAttributes &pda : metric.point_data_attr_)
-        {
-          auto sum_point_data = nostd::get<SumPointData>(pda.point_data);
-          auto value          = nostd::get<int64_t>(sum_point_data.value_);
-          auto stream =
-              std::stoi(nostd::get<std::string>(pda.attributes.GetAttributes().at("stream")));
-          auto river =
-              std::stoi(nostd::get<std::string>(pda.attributes.GetAttributes().at("river")));
-          std::vector<int64_t> stream_v = {value, stream};
-          std::vector<int64_t> river_v  = {value, river};
-          EXPECT_THAT(stream_v, AnyOf(ElementsAre(1, 1), ElementsAre(2, 2), ElementsAre(3, 3),
-                                      ElementsAre(4, 4), ElementsAre(5, 5), ElementsAre(6, 6),
-                                      ElementsAre(7, 7), ElementsAre(8, 8), ElementsAre(9, 9),
-                                      ElementsAre(10, 10)));
-          EXPECT_THAT(river_v, AnyOf(ElementsAre(1, 10), ElementsAre(2, 20), ElementsAre(3, 30),
-                                     ElementsAre(4, 40), ElementsAre(5, 50), ElementsAre(6, 60),
-                                     ElementsAre(7, 70), ElementsAre(8, 80), ElementsAre(9, 90),
-                                     ElementsAre(10, 100)));
-        }
-      }
-    }
-  }
-}
-
-TEST_F(MetricCollectorTest, CollectWithMetricFilterTestAttributesTest2)
-{
-  auto context = std::shared_ptr<MeterContext>(new MeterContext(ViewRegistryFactory::Create()));
-  auto scope   = InstrumentationScope::Create("CollectWithMetricFilterTestAttributesTest2");
-  auto meter   = std::shared_ptr<Meter>(new Meter(context, std::move(scope)));
-  context->AddMeter(meter);
-
-  auto test_attributes_fn =
-      [](const InstrumentationScope &scope, nostd::string_view name, const InstrumentType &type,
-         nostd::string_view unit,
-         const PointAttributes &attributes) -> MetricFilter::AttributesFilterResult {
-    if (attributes.GetAttributes().find("stream") != attributes.GetAttributes().end())
-    {
-      auto stream = nostd::get<std::string>(attributes.GetAttributes().at("stream"));
-      if (std::stoi(stream) >= 4 && std::stoi(stream) <= 6)
-      {
-        return MetricFilter::AttributesFilterResult::kAccept;
-      }
-    }
-    return MetricFilter::AttributesFilterResult::kDrop;
-  };
-  auto filter    = MetricFilter::Create(AcceptPartialAllTestMetricFn(), test_attributes_fn);
-  auto reader    = std::shared_ptr<MetricReader>(new MockMetricReader());
-  auto collector = AddMetricReaderToMeterContext(context, reader, std::move(filter)).lock();
-
-  auto instrument_1_name = "instrument_1";
-  auto instrument_1      = meter->CreateUInt64Counter(instrument_1_name);
-  M m_1                  = {{"ocean", "1"}};
-  instrument_1->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_1),
-                    opentelemetry::context::Context{});
-
-  auto instrument_2_name = "instrument_2";
-  auto instrument_2      = meter->CreateUInt64Counter(instrument_2_name);
-  M m_2                  = {{"stream", "1"}, {"river", "10"}};
-  instrument_2->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_2),
-                    opentelemetry::context::Context{});
-
-  auto instrument_3_name = "instrument_3";
-  auto instrument_3      = meter->CreateUInt64Counter(instrument_3_name);
-  for (int s = 1; s <= 10; ++s)
-  {
-    for (int i = 0; i < s; ++i)
-    {
-      M m_3 = {{"stream", std::to_string(s)}, {"river", std::to_string(s * 10)}};
-      instrument_3->Add(1, opentelemetry::common::KeyValueIterableView<M>(m_3),
-                        opentelemetry::context::Context{});
-    }
-  }
-
-  auto resource_metrics = collector->Produce().points_;
-  for (const ScopeMetrics &scope_metrics : resource_metrics.scope_metric_data_)
-  {
-    for (const MetricData &metric : scope_metrics.metric_data_)
-    {
-      auto instrument_name = metric.instrument_descriptor.name_;
-      ASSERT_EQ(instrument_name, instrument_3_name);
-      EXPECT_EQ(metric.point_data_attr_.size(), 3);
-      for (const PointDataAttributes &pda : metric.point_data_attr_)
-      {
-        auto sum_point_data = nostd::get<SumPointData>(pda.point_data);
-        auto value          = nostd::get<int64_t>(sum_point_data.value_);
-        auto stream =
-            std::stoi(nostd::get<std::string>(pda.attributes.GetAttributes().at("stream")));
-        auto river = std::stoi(nostd::get<std::string>(pda.attributes.GetAttributes().at("river")));
-        std::vector<int64_t> stream_v = {value, stream};
-        std::vector<int64_t> river_v  = {value, river};
-        EXPECT_THAT(stream_v, AnyOf(ElementsAre(4, 4), ElementsAre(5, 5), ElementsAre(6, 6)));
-        EXPECT_THAT(river_v, AnyOf(ElementsAre(4, 40), ElementsAre(5, 50), ElementsAre(6, 60)));
-      }
-    }
-  }
-}
-
-#if defined(__GNUC__) || defined(__clang__) || defined(__apple_build_version__)
-#  pragma GCC diagnostic pop
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_reader_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_reader_test.cc
deleted file mode 100644
index 36ca6532f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_reader_test.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <memory>
-#include <utility>
-#include "common.h"
-
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_context.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-TEST(MetricReaderTest, BasicTests)
-{
-  std::unique_ptr<MetricReader> metric_reader1(new MockMetricReader());
-  EXPECT_EQ(metric_reader1->GetAggregationTemporality(InstrumentType::kCounter),
-            AggregationTemporality::kCumulative);
-
-  std::shared_ptr<MeterContext> meter_context1(new MeterContext());
-  meter_context1->AddMetricReader(std::move(metric_reader1));
-
-  std::unique_ptr<MetricReader> metric_reader2(new MockMetricReader());
-  std::shared_ptr<MeterContext> meter_context2(new MeterContext());
-  std::shared_ptr<MetricProducer> metric_producer{
-      new MetricCollector(meter_context2.get(), std::move(metric_reader2))};
-  metric_producer->Produce();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_test_stress.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_test_stress.cc
deleted file mode 100644
index 833785264..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/metric_test_stress.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include <stdint.h>
-#include <atomic>
-#include <chrono>
-#include <random>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "common.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-class MockMetricExporterForStress : public opentelemetry::sdk::metrics::PushMetricExporter
-{
-public:
-  MockMetricExporterForStress() = default;
-
-  opentelemetry::sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      opentelemetry::sdk::metrics::InstrumentType) const noexcept override
-  {
-    return AggregationTemporality::kDelta;
-  }
-
-  opentelemetry::sdk::common::ExportResult Export(
-      const opentelemetry::sdk::metrics::ResourceMetrics &) noexcept override
-  {
-    return opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  bool ForceFlush(std::chrono::microseconds) noexcept override { return true; }
-
-  bool Shutdown(std::chrono::microseconds) noexcept override { return true; }
-};
-
-TEST(HistogramStress, UnsignedInt64)
-{
-  MeterProvider mp;
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::unique_ptr<MockMetricExporterForStress> exporter(new MockMetricExporterForStress());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  auto h = m->CreateUInt64Histogram("histogram1", "histogram1_description", "histogram1_unit");
-
-  //
-  // Start a dedicated thread to collect the metrics
-  //
-  std::vector<HistogramPointData> actuals;
-  auto stop_collecting = std::make_shared<std::atomic<bool>>(false);
-  auto collect_thread  = std::thread([&reader, &actuals, stop_collecting]() {
-    while (!*stop_collecting)
-    {
-      std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-      reader->Collect([&](ResourceMetrics &rm) {
-        for (const ScopeMetrics &smd : rm.scope_metric_data_)
-        {
-          for (const MetricData &md : smd.metric_data_)
-          {
-            for (const PointDataAttributes &dp : md.point_data_attr_)
-            {
-              actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-            }
-          }
-        }
-        return true;
-      });
-    }
-  });
-
-  //
-  // Start logging threads
-  //
-  int record_thread_count = std::thread::hardware_concurrency() - 1;
-  if (record_thread_count <= 0)
-  {
-    record_thread_count = 1;
-  }
-
-  std::vector<std::thread> threads(record_thread_count);
-  constexpr int iterations_per_thread = 2000000;
-  auto expected_sum                   = std::make_shared<std::atomic<uint64_t>>(0);
-
-  for (int i = 0; i < record_thread_count; ++i)
-  {
-    threads[i] = std::thread([&] {
-      std::random_device rd;
-      std::mt19937 random_engine(rd());
-      std::uniform_int_distribution<> gen_random(1, 20000);
-
-      for (int j = 0; j < iterations_per_thread; ++j)
-      {
-        int64_t val = gen_random(random_engine);
-        expected_sum->fetch_add(val, std::memory_order_relaxed);
-        h->Record(val, {});
-      }
-    });
-  }
-
-  for (int i = 0; i < record_thread_count; ++i)
-  {
-    threads[i].join();
-  }
-
-  //
-  // Stop the dedicated collection thread
-  //
-  *stop_collecting = true;
-  collect_thread.join();
-
-  //
-  // run the the final collection
-  //
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<HistogramPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  //
-  // Aggregate the results
-  //
-  int64_t expected_count  = record_thread_count * iterations_per_thread;
-  int64_t collected_count = 0;
-  int64_t collected_sum   = 0;
-  for (const auto &actual : actuals)
-  {
-    int64_t collected_bucket_sum = 0;
-    for (const auto &count : actual.counts_)
-    {
-      collected_bucket_sum += count;
-    }
-    ASSERT_EQ(collected_bucket_sum, actual.count_);
-
-    collected_sum += opentelemetry::nostd::get<int64_t>(actual.sum_);
-    collected_count += actual.count_;
-  }
-
-  ASSERT_EQ(expected_count, collected_count);
-  ASSERT_EQ(*expected_sum, collected_sum);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/multi_metric_storage_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/multi_metric_storage_test.cc
deleted file mode 100644
index 0999f9321..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/multi_metric_storage_test.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/multi_metric_storage.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h"
-#endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::metrics;
-
-class TestMetricStorage : public SyncWritableMetricStorage
-{
-public:
-  void RecordLong(int64_t /* value */,
-                  const opentelemetry::context::Context & /* context */) noexcept override
-  {
-    num_calls_long++;
-  }
-
-  void RecordLong(int64_t /* value */,
-                  const opentelemetry::common::KeyValueIterable & /* attributes */,
-                  const opentelemetry::context::Context & /* context */) noexcept override
-  {
-    num_calls_long++;
-  }
-
-  void RecordDouble(double /* value */,
-                    const opentelemetry::context::Context & /* context */) noexcept override
-  {
-    num_calls_double++;
-  }
-
-  void RecordDouble(double /* value */,
-                    const opentelemetry::common::KeyValueIterable & /* attributes */,
-                    const opentelemetry::context::Context & /* context */) noexcept override
-  {
-    num_calls_double++;
-  }
-
-  size_t num_calls_long;
-  size_t num_calls_double;
-};
-
-TEST(MultiMetricStorageTest, BasicTests)
-{
-  std::shared_ptr<opentelemetry::sdk::metrics::SyncWritableMetricStorage> storage(
-      new TestMetricStorage());
-  SyncMultiMetricStorage storages{};
-  storages.AddStorage(storage);
-  storages.RecordLong(10, opentelemetry::context::Context{});
-  storages.RecordLong(20, opentelemetry::context::Context{});
-
-  storages.RecordDouble(10.0, opentelemetry::context::Context{});
-  storages.RecordLong(30, opentelemetry::context::Context{});
-
-  EXPECT_EQ(static_cast<TestMetricStorage *>(storage.get())->num_calls_long, 3);
-  EXPECT_EQ(static_cast<TestMetricStorage *>(storage.get())->num_calls_double, 1);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/observable_registry_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/observable_registry_test.cc
deleted file mode 100644
index 23957b827..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/observable_registry_test.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-
-#include "opentelemetry/sdk/metrics/state/observable_registry.h"
-
-using namespace opentelemetry::sdk::metrics;
-
-#if 0
-class MeasurementFetcher
-{
-public:
-  static void Fetcher1(opentelemetry::metrics::ObserverResult &observer_result,
-                      void * /*state*/)
-  {
-    fetch_count1++;
-    if (fetch_count1 == 1)
-    {
-      std::get<observer_result.Observe((int64_t)20, {{"RequestType", "GET"}});
-      observer_result.Observe((int64_t)10, {{"RequestType", "PUT"}});
-      number_of_get1 += (int64_t)20;
-      number_of_put1 += (int64_t)10;
-    }
-    else if (fetch_count1 == 2)
-    {
-      observer_result.Observe((int64_t)40, {{"RequestType", "GET"}});
-      observer_result.Observe((int64_t)20, {{"RequestType", "PUT"}});
-      number_of_get1 += (int64_t)40;
-      number_of_put1 += (int64_t)20;
-    }
-  }
-
-  static void Fetcher2(opentelemetry::metrics::ObserverResult &observer_result,
-                      void * /*state*/)
-  {
-    fetch_count2++;
-    if (fetch_count2 == 1)
-    {
-      observer_result.Observe((int64_t)20, {{"RequestType", "GET"}});
-      observer_result.Observe((int64_t)10, {{"RequestType", "PUT"}});
-      number_of_get2 += (int64_t)20;
-      number_of_put2 += (int64_t)10;
-    }
-    else if (fetch_count2 == 2)
-    {
-      observer_result.Observe((int64_t)40, {{"RequestType", "GET"}});
-      observer_result.Observe((int64_t)20, {{"RequestType", "PUT"}});
-      number_of_get2 += (int64_t)40;
-      number_of_put2 += (int64_t)20;
-    }
-  }
-
-  static void init_values()
-  {
-    fetch_count1 = fetch_count2   = 0;
-    number_of_get1 = number_of_get2 = 0;
-    number_of_put1 = number_of_put2 = 0;
-
-  }
-
-  static size_t fetch_count1, fetch_count2;
-  static int64_t number_of_get1, number_of_get2;
-  static int64_t number_of_put1, number_of_put2;
-  static const size_t number_of_attributes = 2;  // GET , PUT
-};
-
-#endif
-
-TEST(ObservableRegistry, BasicTests)
-{
-  ObservableRegistry registry;
-  EXPECT_EQ(1, 1);
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/observer_result_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/observer_result_test.cc
deleted file mode 100644
index b33141b4f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/observer_result_test.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <unordered_map>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/sdk/metrics/observer_result.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-using namespace opentelemetry::sdk::metrics;
-TEST(ObserverResult, BasicTests)
-{
-  const AttributesProcessor *attributes_processor = new DefaultAttributesProcessor();
-
-  ObserverResultT<int64_t> observer_result(attributes_processor);
-
-  observer_result.Observe(10);
-  observer_result.Observe(20);
-  EXPECT_EQ(observer_result.GetMeasurements().size(), 1);
-
-  std::map<std::string, int64_t> m1 = {{"k2", 12}};
-  observer_result.Observe(
-      30, opentelemetry::common::KeyValueIterableView<std::map<std::string, int64_t>>(m1));
-  EXPECT_EQ(observer_result.GetMeasurements().size(), 2);
-
-  observer_result.Observe(
-      40, opentelemetry::common::KeyValueIterableView<std::map<std::string, int64_t>>(m1));
-  EXPECT_EQ(observer_result.GetMeasurements().size(), 2);
-
-  std::map<std::string, int64_t> m2 = {{"k2", 12}, {"k4", 12}};
-  observer_result.Observe(
-      40, opentelemetry::common::KeyValueIterableView<std::map<std::string, int64_t>>(m2));
-  EXPECT_EQ(observer_result.GetMeasurements().size(), 3);
-
-  delete attributes_processor;
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/periodic_exporting_metric_reader_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/periodic_exporting_metric_reader_test.cc
deleted file mode 100644
index ed144aaae..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/periodic_exporting_metric_reader_test.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <algorithm>
-#include <chrono>
-#include <memory>
-#include <ratio>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-class MockPushMetricExporter : public PushMetricExporter
-{
-public:
-  MockPushMetricExporter(std::chrono::milliseconds wait) : wait_(wait) {}
-
-  opentelemetry::sdk::common::ExportResult Export(const ResourceMetrics &record) noexcept override
-  {
-    if (wait_ > std::chrono::milliseconds::zero())
-    {
-      std::this_thread::sleep_for(wait_);
-    }
-    records_.push_back(record);
-    return opentelemetry::sdk::common::ExportResult::kSuccess;
-  }
-
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return false; }
-
-  sdk::metrics::AggregationTemporality GetAggregationTemporality(
-      sdk::metrics::InstrumentType /* instrument_type */) const noexcept override
-  {
-    return sdk::metrics::AggregationTemporality::kCumulative;
-  }
-
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override { return true; }
-
-  size_t GetDataCount() { return records_.size(); }
-
-private:
-  std::vector<ResourceMetrics> records_;
-  std::chrono::milliseconds wait_;
-};
-
-class MockMetricProducer : public MetricProducer
-{
-public:
-  MockMetricProducer(std::chrono::microseconds sleep_ms = std::chrono::microseconds::zero())
-      : sleep_ms_{sleep_ms}
-  {}
-
-  MetricProducer::Result Produce() noexcept override
-  {
-    std::this_thread::sleep_for(sleep_ms_);
-    data_sent_size_++;
-    ResourceMetrics data;
-    return {data, MetricProducer::Status::kSuccess};
-  }
-
-  size_t GetDataCount() { return data_sent_size_; }
-
-private:
-  std::chrono::microseconds sleep_ms_;
-  size_t data_sent_size_{0};
-};
-
-TEST(PeriodicExporingMetricReader, BasicTests)
-{
-  std::unique_ptr<PushMetricExporter> exporter(
-      new MockPushMetricExporter(std::chrono::milliseconds{0}));
-  PeriodicExportingMetricReaderOptions options;
-  options.export_timeout_millis  = std::chrono::milliseconds(200);
-  options.export_interval_millis = std::chrono::milliseconds(500);
-  auto exporter_ptr              = exporter.get();
-  std::shared_ptr<PeriodicExportingMetricReader> reader =
-      std::make_shared<PeriodicExportingMetricReader>(std::move(exporter), options);
-  MockMetricProducer producer;
-  reader->SetMetricProducer(&producer);
-  std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-  reader->ForceFlush();
-  reader->Shutdown();
-  EXPECT_EQ(static_cast<MockPushMetricExporter *>(exporter_ptr)->GetDataCount(),
-            static_cast<MockMetricProducer *>(&producer)->GetDataCount());
-}
-
-TEST(PeriodicExporingMetricReader, Timeout)
-{
-  std::unique_ptr<PushMetricExporter> exporter(
-      new MockPushMetricExporter(std::chrono::milliseconds{2000}));
-  PeriodicExportingMetricReaderOptions options;
-  options.export_timeout_millis  = std::chrono::milliseconds(200);
-  options.export_interval_millis = std::chrono::milliseconds(500);
-  std::shared_ptr<PeriodicExportingMetricReader> reader =
-      std::make_shared<PeriodicExportingMetricReader>(std::move(exporter), options);
-  MockMetricProducer producer;
-  reader->SetMetricProducer(&producer);
-  std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-  reader->Shutdown();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sum_aggregation_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sum_aggregation_benchmark.cc
deleted file mode 100644
index a51c1bcb6..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sum_aggregation_benchmark.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <stddef.h>
-#include <algorithm>
-#include <chrono>
-#include <functional>
-#include <initializer_list>
-#include <random>
-#include <thread>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-namespace
-{
-void BM_SumAggregation(benchmark::State &state)
-{
-  MeterProvider mp;
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-  auto h = m->CreateDoubleCounter("counter1", "counter1_description", "counter1_unit");
-  std::default_random_engine generator;
-  std::uniform_int_distribution<int> distribution(0, 1000000);
-  // Generate 100000 measurements
-  constexpr size_t TOTAL_MEASUREMENTS = 100000;
-  double measurements[TOTAL_MEASUREMENTS];
-  for (size_t i = 0; i < TOTAL_MEASUREMENTS; i++)
-  {
-    measurements[i] = static_cast<double>(distribution(generator));
-  }
-  std::vector<SumPointData> actuals;
-  std::vector<std::thread> collectionThreads;
-  std::function<void()> collectMetrics = [&reader, &actuals]() {
-    reader->Collect([&](ResourceMetrics &rm) {
-      for (const ScopeMetrics &smd : rm.scope_metric_data_)
-      {
-        for (const MetricData &md : smd.metric_data_)
-        {
-          for (const PointDataAttributes &dp : md.point_data_attr_)
-          {
-            actuals.push_back(opentelemetry::nostd::get<SumPointData>(dp.point_data));
-          }
-        }
-      }
-      return true;
-    });
-  };
-
-  while (state.KeepRunning())
-  {
-    for (size_t i = 0; i < TOTAL_MEASUREMENTS; i++)
-    {
-      h->Add(measurements[i], {});
-      if (i % 1000 == 0 || i == TOTAL_MEASUREMENTS - 1)
-      {
-        collectMetrics();
-      }
-      if (i == 500)
-      {
-        std::this_thread::sleep_for(std::chrono::nanoseconds(2));
-      }
-    }
-  }
-}
-
-BENCHMARK(BM_SumAggregation);
-
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sum_aggregation_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sum_aggregation_test.cc
deleted file mode 100644
index 72783f649..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sum_aggregation_test.cc
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <initializer_list>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/export/metric_producer.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-TEST(HistogramToSum, Double)
-{
-  MeterProvider mp;
-  auto m                      = mp.GetMeter("meter1", "version1", "schema1");
-  std::string instrument_unit = "ms";
-  std::string instrument_name = "historgram1";
-  std::string instrument_desc = "histogram metrics";
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::unique_ptr<View> view{
-      new View("view1", "view1_description", instrument_unit, AggregationType::kSum)};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kHistogram, instrument_name, instrument_unit)};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto h = m->CreateDoubleHistogram(instrument_name, instrument_desc, instrument_unit);
-
-  h->Record(5, {});
-  h->Record(10, {});
-  h->Record(15, {});
-  h->Record(20, {});
-  h->Record(25, {});
-  h->Record(30, {});
-  h->Record(35, {});
-  h->Record(40, {});
-  h->Record(45, {});
-  h->Record(50, {});
-  h->Record(1e6, {});
-
-  std::vector<SumPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<SumPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(1000275.0, opentelemetry::nostd::get<double>(actual.value_));
-}
-
-TEST(HistogramToSumFilterAttributes, Double)
-{
-  MeterProvider mp;
-  auto m                      = mp.GetMeter("meter1", "version1", "schema1");
-  std::string instrument_unit = "ms";
-  std::string instrument_name = "historgram1";
-  std::string instrument_desc = "histogram metrics";
-
-  std::unordered_map<std::string, bool> allowedattr;
-  allowedattr["attr1"] = true;
-  std::unique_ptr<opentelemetry::sdk::metrics::AttributesProcessor> attrproc{
-      new opentelemetry::sdk::metrics::FilteringAttributesProcessor(allowedattr)};
-
-  std::shared_ptr<opentelemetry::sdk::metrics::AggregationConfig> dummy_aggregation_config{
-      new opentelemetry::sdk::metrics::AggregationConfig};
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::unique_ptr<View> view{new View("view1", "view1_description", instrument_unit,
-                                      AggregationType::kSum, dummy_aggregation_config,
-                                      std::move(attrproc))};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kHistogram, instrument_name, instrument_unit)};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto h = m->CreateDoubleHistogram(instrument_name, instrument_desc, instrument_unit);
-  std::unordered_map<std::string, std::string> attr1 = {{"attr1", "val1"}, {"attr2", "val2"}};
-  std::unordered_map<std::string, std::string> attr2 = {{"attr1", "val1"}, {"attr2", "val2"}};
-  h->Record(5, attr1, opentelemetry::context::Context{});
-  h->Record(10, attr2, opentelemetry::context::Context{});
-
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        EXPECT_EQ(1, md.point_data_attr_.size());
-        if (md.point_data_attr_.size() == 1)
-        {
-          EXPECT_EQ(15.0, opentelemetry::nostd::get<double>(opentelemetry::nostd::get<SumPointData>(
-                                                                md.point_data_attr_[0].point_data)
-                                                                .value_));
-          EXPECT_EQ(1, md.point_data_attr_[0].attributes.size());
-          EXPECT_NE(md.point_data_attr_[0].attributes.end(),
-                    md.point_data_attr_[0].attributes.find("attr1"));
-        }
-      }
-    }
-    return true;
-  });
-}
-
-TEST(CounterToSum, Double)
-{
-  MeterProvider mp;
-  auto m = mp.GetMeter("meter1", "version1", "schema1");
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::unique_ptr<View> view{new View("view1", "view1_description", "ms", AggregationType::kSum)};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kCounter, "counter1", "ms")};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto h = m->CreateDoubleCounter("counter1", "counter1_description", "counter1_unit");
-
-  h->Add(5, {});
-  h->Add(10, {});
-  h->Add(15, {});
-  h->Add(20, {});
-  h->Add(25, {});
-  h->Add(30, {});
-  h->Add(35, {});
-  h->Add(40, {});
-  h->Add(45, {});
-  h->Add(50, {});
-  h->Add(1e6, {});
-
-  std::vector<SumPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<SumPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(1000275.0, opentelemetry::nostd::get<double>(actual.value_));
-}
-
-TEST(CounterToSumFilterAttributes, Double)
-{
-  MeterProvider mp;
-  auto m                      = mp.GetMeter("meter1", "version1", "schema1");
-  std::string instrument_unit = "ms";
-  std::string instrument_name = "counter1";
-  std::string instrument_desc = "counter metrics";
-
-  std::unordered_map<std::string, bool> allowedattr;
-  allowedattr["attr1"] = true;
-  std::unique_ptr<opentelemetry::sdk::metrics::AttributesProcessor> attrproc{
-      new opentelemetry::sdk::metrics::FilteringAttributesProcessor(allowedattr)};
-
-  std::shared_ptr<opentelemetry::sdk::metrics::AggregationConfig> dummy_aggregation_config{
-      new opentelemetry::sdk::metrics::AggregationConfig};
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  std::unique_ptr<View> view{new View("view1", "view1_description", instrument_unit,
-                                      AggregationType::kSum, dummy_aggregation_config,
-                                      std::move(attrproc))};
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(InstrumentType::kCounter, instrument_name, instrument_unit)};
-  std::unique_ptr<MeterSelector> meter_selector{new MeterSelector("meter1", "version1", "schema1")};
-  mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-
-  auto c = m->CreateDoubleCounter(instrument_name, instrument_desc, instrument_unit);
-  std::unordered_map<std::string, std::string> attr1 = {{"attr1", "val1"}, {"attr2", "val2"}};
-  std::unordered_map<std::string, std::string> attr2 = {{"attr1", "val1"}, {"attr2", "val2"}};
-  c->Add(5, attr1, opentelemetry::context::Context{});
-  c->Add(10, attr2, opentelemetry::context::Context{});
-
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        EXPECT_EQ(1, md.point_data_attr_.size());
-        if (md.point_data_attr_.size() == 1)
-        {
-          EXPECT_EQ(15.0, opentelemetry::nostd::get<double>(opentelemetry::nostd::get<SumPointData>(
-                                                                md.point_data_attr_[0].point_data)
-                                                                .value_));
-          EXPECT_EQ(1, md.point_data_attr_[0].attributes.size());
-          EXPECT_NE(md.point_data_attr_[0].attributes.end(),
-                    md.point_data_attr_[0].attributes.find("attr1"));
-        }
-      }
-    }
-    return true;
-  });
-}
-
-class UpDownCounterToSumFixture : public ::testing::TestWithParam<bool>
-{};
-
-TEST_P(UpDownCounterToSumFixture, Double)
-{
-  bool is_matching_view = GetParam();
-  MeterProvider mp;
-  auto m                      = mp.GetMeter("meter1", "version1", "schema1");
-  std::string instrument_name = "updowncounter1";
-  std::string instrument_desc = "updowncounter desc";
-  std::string instrument_unit = "ms";
-
-  std::unique_ptr<MockMetricExporter> exporter(new MockMetricExporter());
-  std::shared_ptr<MetricReader> reader{new MockMetricReader(std::move(exporter))};
-  mp.AddMetricReader(reader);
-
-  if (is_matching_view)
-  {
-    std::unique_ptr<View> view{
-        new View("view1", "view1_description", instrument_unit, AggregationType::kSum)};
-    std::unique_ptr<InstrumentSelector> instrument_selector{
-        new InstrumentSelector(InstrumentType::kUpDownCounter, instrument_name, instrument_unit)};
-    std::unique_ptr<MeterSelector> meter_selector{
-        new MeterSelector("meter1", "version1", "schema1")};
-    mp.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-  }
-  auto h = m->CreateDoubleUpDownCounter(instrument_name, instrument_desc, instrument_unit);
-
-  h->Add(5, {});
-  h->Add(10, {});
-  h->Add(-15, {});
-  h->Add(20, {});
-  h->Add(25, {});
-  h->Add(-30, {});
-
-  std::vector<SumPointData> actuals;
-  reader->Collect([&](ResourceMetrics &rm) {
-    for (const ScopeMetrics &smd : rm.scope_metric_data_)
-    {
-      for (const MetricData &md : smd.metric_data_)
-      {
-        for (const PointDataAttributes &dp : md.point_data_attr_)
-        {
-          actuals.push_back(opentelemetry::nostd::get<SumPointData>(dp.point_data));
-        }
-      }
-    }
-    return true;
-  });
-
-  ASSERT_EQ(1, actuals.size());
-  const auto &actual = actuals.at(0);
-  ASSERT_EQ(15.0, opentelemetry::nostd::get<double>(actual.value_));
-}
-INSTANTIATE_TEST_SUITE_P(UpDownCounterToSum,
-                         UpDownCounterToSumFixture,
-                         ::testing::Values(true, false));
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_instruments_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_instruments_test.cc
deleted file mode 100644
index 6e5635b43..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_instruments_test.cc
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <limits>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_storage.h"
-#include "opentelemetry/sdk/metrics/state/multi_metric_storage.h"
-#include "opentelemetry/sdk/metrics/sync_instruments.h"
-
-using namespace opentelemetry;
-using namespace opentelemetry::sdk::instrumentationscope;
-using namespace opentelemetry::sdk::metrics;
-
-auto instrumentation_scope = InstrumentationScope::Create("opentelemetry-cpp", "0.1.0");
-
-using M = std::map<std::string, std::string>;
-
-TEST(SyncInstruments, LongCounter)
-{
-  InstrumentDescriptor instrument_descriptor = {
-      "long_counter", "description", "1", InstrumentType::kCounter, InstrumentValueType::kLong};
-  std::unique_ptr<SyncWritableMetricStorage> metric_storage(new SyncMultiMetricStorage());
-  LongCounter counter(instrument_descriptor, std::move(metric_storage));
-  counter.Add(10);
-  counter.Add(10, opentelemetry::context::Context{});
-
-  counter.Add(10, opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}));
-  counter.Add(10, opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-              opentelemetry::context::Context{});
-  counter.Add(10, opentelemetry::common::KeyValueIterableView<M>({}));
-  counter.Add(10, opentelemetry::common::KeyValueIterableView<M>({}),
-              opentelemetry::context::Context{});
-}
-
-TEST(SyncInstruments, DoubleCounter)
-{
-  InstrumentDescriptor instrument_descriptor = {
-      "double_counter", "description", "1", InstrumentType::kCounter, InstrumentValueType::kDouble};
-  std::unique_ptr<SyncWritableMetricStorage> metric_storage(new SyncMultiMetricStorage());
-  DoubleCounter counter(instrument_descriptor, std::move(metric_storage));
-  counter.Add(10.10);
-  counter.Add(10.10, opentelemetry::context::Context{});
-
-  counter.Add(10.10,
-              opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}));
-  counter.Add(10.10,
-              opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-              opentelemetry::context::Context{});
-  counter.Add(10.10, opentelemetry::common::KeyValueIterableView<M>({}));
-  counter.Add(10.10, opentelemetry::common::KeyValueIterableView<M>({}),
-              opentelemetry::context::Context{});
-}
-
-TEST(SyncInstruments, LongUpDownCounter)
-{
-  InstrumentDescriptor instrument_descriptor = {"long_updowncounter", "description", "1",
-                                                InstrumentType::kUpDownCounter,
-                                                InstrumentValueType::kLong};
-  std::unique_ptr<SyncWritableMetricStorage> metric_storage(new SyncMultiMetricStorage());
-  LongUpDownCounter counter(instrument_descriptor, std::move(metric_storage));
-  counter.Add(10);
-  counter.Add(10, opentelemetry::context::Context{});
-
-  counter.Add(10, opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}));
-  counter.Add(10, opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-              opentelemetry::context::Context{});
-  counter.Add(10, opentelemetry::common::KeyValueIterableView<M>({}));
-  counter.Add(10, opentelemetry::common::KeyValueIterableView<M>({}),
-              opentelemetry::context::Context{});
-
-  // negative values
-  counter.Add(-10);
-  counter.Add(-10, opentelemetry::context::Context{});
-
-  counter.Add(-10,
-              opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}));
-  counter.Add(-10, opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-              opentelemetry::context::Context{});
-  counter.Add(-10, opentelemetry::common::KeyValueIterableView<M>({}));
-  counter.Add(-10, opentelemetry::common::KeyValueIterableView<M>({}),
-              opentelemetry::context::Context{});
-}
-
-TEST(SyncInstruments, DoubleUpDownCounter)
-{
-  InstrumentDescriptor instrument_descriptor = {"double_updowncounter", "description", "1",
-                                                InstrumentType::kUpDownCounter,
-                                                InstrumentValueType::kDouble};
-  std::unique_ptr<SyncWritableMetricStorage> metric_storage(new SyncMultiMetricStorage());
-  DoubleUpDownCounter counter(instrument_descriptor, std::move(metric_storage));
-  counter.Add(10.10);
-  counter.Add(10.10, opentelemetry::context::Context{});
-
-  counter.Add(10.10,
-              opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-              opentelemetry::context::Context{});
-  counter.Add(10.10,
-              opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}));
-  counter.Add(10.10, opentelemetry::common::KeyValueIterableView<M>({}),
-              opentelemetry::context::Context{});
-  counter.Add(10.10, opentelemetry::common::KeyValueIterableView<M>({}));
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-TEST(SyncInstruments, LongGauge)
-{
-  InstrumentDescriptor instrument_descriptor = {"long_gauge", "description", "1",
-                                                InstrumentType::kGauge, InstrumentValueType::kLong};
-  std::unique_ptr<SyncWritableMetricStorage> metric_storage(new SyncMultiMetricStorage());
-  LongGauge gauge(instrument_descriptor, std::move(metric_storage));
-  gauge.Record(10);
-  gauge.Record(10, opentelemetry::context::Context{});
-
-  gauge.Record(10, opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-               opentelemetry::context::Context{});
-  gauge.Record(10,
-               opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}));
-  gauge.Record(10, opentelemetry::common::KeyValueIterableView<M>({}),
-               opentelemetry::context::Context{});
-  gauge.Record(10, opentelemetry::common::KeyValueIterableView<M>({}));
-}
-
-TEST(SyncInstruments, DoubleGauge)
-{
-  InstrumentDescriptor instrument_descriptor = {
-      "double_gauge", "description", "1", InstrumentType::kGauge, InstrumentValueType::kDouble};
-  std::unique_ptr<SyncWritableMetricStorage> metric_storage(new SyncMultiMetricStorage());
-  DoubleGauge gauge(instrument_descriptor, std::move(metric_storage));
-  gauge.Record(10.10);
-  gauge.Record(10.10, opentelemetry::context::Context{});
-
-  gauge.Record(10.10,
-               opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-               opentelemetry::context::Context{});
-  gauge.Record(10.10,
-               opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}));
-  gauge.Record(10.10, opentelemetry::common::KeyValueIterableView<M>({}),
-               opentelemetry::context::Context{});
-  gauge.Record(10.10, opentelemetry::common::KeyValueIterableView<M>({}));
-}
-#endif
-
-TEST(SyncInstruments, LongHistogram)
-{
-  InstrumentDescriptor instrument_descriptor = {
-      "long_histogram", "description", "1", InstrumentType::kHistogram, InstrumentValueType::kLong};
-  std::unique_ptr<SyncWritableMetricStorage> metric_storage(new SyncMultiMetricStorage());
-  LongHistogram histogram(instrument_descriptor, std::move(metric_storage));
-  histogram.Record(10, opentelemetry::context::Context{});
-
-  histogram.Record(10,
-                   opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-                   opentelemetry::context::Context{});
-  histogram.Record(10, opentelemetry::common::KeyValueIterableView<M>({}),
-                   opentelemetry::context::Context{});
-}
-
-TEST(SyncInstruments, DoubleHistogram)
-{
-  InstrumentDescriptor instrument_descriptor = {"double_histogram", "description", "1",
-                                                InstrumentType::kHistogram,
-                                                InstrumentValueType::kDouble};
-  std::unique_ptr<SyncWritableMetricStorage> metric_storage(new SyncMultiMetricStorage());
-  DoubleHistogram histogram(instrument_descriptor, std::move(metric_storage));
-  histogram.Record(10.10, opentelemetry::context::Context{});
-  histogram.Record(-10.10, opentelemetry::context::Context{});  // This is ignored.
-  histogram.Record(std::numeric_limits<double>::quiet_NaN(),
-                   opentelemetry::context::Context{});  // This is ignored too
-  histogram.Record(std::numeric_limits<double>::infinity(),
-                   opentelemetry::context::Context{});  // This is ignored too
-
-  histogram.Record(10.10,
-                   opentelemetry::common::KeyValueIterableView<M>({{"abc", "123"}, {"xyz", "456"}}),
-                   opentelemetry::context::Context{});
-  histogram.Record(10.10, opentelemetry::common::KeyValueIterableView<M>({}),
-                   opentelemetry::context::Context{});
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_counter_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_counter_test.cc
deleted file mode 100644
index 9ca84fd0c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_counter_test.cc
+++ /dev/null
@@ -1,326 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <chrono>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/sync_metric_storage.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#endif
-
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::common;
-using M         = std::map<std::string, std::string>;
-namespace nostd = opentelemetry::nostd;
-
-class WritableMetricStorageTestFixture : public ::testing::TestWithParam<AggregationTemporality>
-{};
-
-TEST_P(WritableMetricStorageTestFixture, LongCounterSumAggregation)
-{
-  AggregationTemporality temporality  = GetParam();
-  auto sdk_start_ts                   = std::chrono::system_clock::now();
-  int64_t expected_total_get_requests = 0;
-  int64_t expected_total_put_requests = 0;
-  InstrumentDescriptor instr_desc     = {"name", "desc", "1unit", InstrumentType::kCounter,
-                                         InstrumentValueType::kLong};
-  std::map<std::string, std::string> attributes_get = {{"RequestType", "GET"}};
-  std::map<std::string, std::string> attributes_put = {{"RequestType", "PUT"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kSum, default_attributes_processor.get(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-
-  storage.RecordLong(10, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_get_requests += 10;
-
-  storage.RecordLong(30, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_put_requests += 30;
-
-  storage.RecordLong(20, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_get_requests += 20;
-
-  storage.RecordLong(40, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), expected_total_get_requests);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), expected_total_put_requests);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-  // In case of delta temporarily, subsequent collection would contain new data points, so resetting
-  // the counts
-  if (temporality == AggregationTemporality::kDelta)
-  {
-    expected_total_get_requests = 0;
-    expected_total_put_requests = 0;
-  }
-  // collect one more time.
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        if (temporality == AggregationTemporality::kCumulative)
-        {
-          EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
-        }
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            count_attributes++;
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), expected_total_get_requests);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            count_attributes++;
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), expected_total_put_requests);
-          }
-        }
-        return true;
-      });
-  if (temporality == AggregationTemporality::kCumulative)
-  {
-    EXPECT_EQ(count_attributes, 2);  // GET AND PUT
-  }
-
-  storage.RecordLong(50, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_get_requests += 50;
-  storage.RecordLong(40, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), expected_total_get_requests);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.value_), expected_total_put_requests);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestLong,
-                         WritableMetricStorageTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
-
-TEST_P(WritableMetricStorageTestFixture, DoubleCounterSumAggregation)
-{
-  AggregationTemporality temporality = GetParam();
-  auto sdk_start_ts                  = std::chrono::system_clock::now();
-  double expected_total_get_requests = 0;
-  double expected_total_put_requests = 0;
-  InstrumentDescriptor instr_desc    = {"name", "desc", "1unit", InstrumentType::kCounter,
-                                        InstrumentValueType::kDouble};
-  std::map<std::string, std::string> attributes_get = {{"RequestType", "GET"}};
-  std::map<std::string, std::string> attributes_put = {{"RequestType", "PUT"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kSum, default_attributes_processor.get(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-
-  storage.RecordDouble(10.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 10;
-
-  storage.RecordDouble(30.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 30;
-
-  storage.RecordDouble(20.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 20;
-
-  storage.RecordDouble(40.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.value_), expected_total_get_requests);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.value_), expected_total_put_requests);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-
-  // In case of delta temporarily, subsequent collection would contain new data points, so resetting
-  // the counts
-  if (temporality == AggregationTemporality::kDelta)
-  {
-    expected_total_get_requests = 0;
-    expected_total_put_requests = 0;
-  }
-
-  // collect one more time.
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        if (temporality == AggregationTemporality::kCumulative)
-        {
-          EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
-        }
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            count_attributes++;
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.value_), expected_total_get_requests);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            count_attributes++;
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.value_), expected_total_put_requests);
-          }
-        }
-        return true;
-      });
-  if (temporality == AggregationTemporality::kCumulative)
-  {
-    EXPECT_EQ(count_attributes, 2);  // GET AND PUT
-  }
-
-  storage.RecordDouble(50.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 50;
-  storage.RecordDouble(40.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.value_), expected_total_get_requests);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.value_), expected_total_put_requests);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-}
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestDouble,
-                         WritableMetricStorageTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_gauge_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_gauge_test.cc
deleted file mode 100644
index 4ab04eeae..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_gauge_test.cc
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-#  include <map>
-#  include <memory>
-#  include "common.h"
-
-#  include "opentelemetry/common/key_value_iterable_view.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/sdk/metrics/data/point_data.h"
-#  include "opentelemetry/sdk/metrics/state/sync_metric_storage.h"
-#  include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-#endif
-
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::common;
-namespace nostd = opentelemetry::nostd;
-
-class WritableMetricStorageTestFixture : public ::testing::TestWithParam<AggregationTemporality>
-{};
-
-TEST_P(WritableMetricStorageTestFixture, LongGaugeLastValueAggregation)
-{
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  AggregationTemporality temporality = GetParam();
-  auto sdk_start_ts                  = std::chrono::system_clock::now();
-  InstrumentDescriptor instr_desc    = {"name", "desc", "1unit", InstrumentType::kGauge,
-                                        InstrumentValueType::kLong};
-  std::map<std::string, std::string> attributes_roomA = {{"Room.id", "Rack A"}};
-  std::map<std::string, std::string> attributes_roomB = {{"Room.id", "Rack B"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kLastValue, default_attributes_processor.get(),
-#  ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#  endif
-      nullptr);
-
-  int64_t bg_noise_level_1_roomA = 10;
-  int64_t bg_noise_level_1_roomB = 20;
-
-  storage.RecordLong(bg_noise_level_1_roomA,
-                     KeyValueIterableView<std::map<std::string, std::string>>(attributes_roomA),
-                     opentelemetry::context::Context{});
-  storage.RecordLong(bg_noise_level_1_roomB,
-                     KeyValueIterableView<std::map<std::string, std::string>>(attributes_roomB),
-                     opentelemetry::context::Context{});
-
-  int64_t bg_noise_level_2_roomA = 43;
-  int64_t bg_noise_level_2_roomB = 25;
-
-  storage.RecordLong(bg_noise_level_2_roomA,
-                     KeyValueIterableView<std::map<std::string, std::string>>(attributes_roomA),
-                     opentelemetry::context::Context{});
-  storage.RecordLong(bg_noise_level_2_roomB,
-                     KeyValueIterableView<std::map<std::string, std::string>>(attributes_roomB),
-                     opentelemetry::context::Context{});
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          auto lastvalue_data = opentelemetry::nostd::get<LastValuePointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("Room.id")->second) == "Rack A")
-          {
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(lastvalue_data.value_),
-                        bg_noise_level_2_roomA);
-            }
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("Room.id")->second) == "Rack B")
-          {
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_EQ(opentelemetry::nostd::get<int64_t>(lastvalue_data.value_),
-                        bg_noise_level_2_roomB);
-            }
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // RackA and RackB
-#else
-  EXPECT_TRUE(true);
-#endif
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestLong,
-                         WritableMetricStorageTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative));
-
-TEST_P(WritableMetricStorageTestFixture, DoubleGaugeLastValueAggregation)
-{
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  AggregationTemporality temporality = GetParam();
-  auto sdk_start_ts                  = std::chrono::system_clock::now();
-  InstrumentDescriptor instr_desc    = {"name", "desc", "1unit", InstrumentType::kGauge,
-                                        InstrumentValueType::kDouble};
-  std::map<std::string, std::string> attributes_roomA = {{"Room.id", "Rack A"}};
-  std::map<std::string, std::string> attributes_roomB = {{"Room.id", "Rack B"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kLastValue, default_attributes_processor.get(),
-#  ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#  endif
-      nullptr);
-
-  double bg_noise_level_1_roomA = 4.3;
-  double bg_noise_level_1_roomB = 2.5;
-
-  storage.RecordDouble(bg_noise_level_1_roomA,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_roomA),
-                       opentelemetry::context::Context{});
-  storage.RecordDouble(bg_noise_level_1_roomB,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_roomB),
-                       opentelemetry::context::Context{});
-
-  double bg_noise_level_2_roomA = 10.5;
-  double bg_noise_level_2_roomB = 20.5;
-
-  storage.RecordDouble(bg_noise_level_2_roomA,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_roomA),
-                       opentelemetry::context::Context{});
-  storage.RecordDouble(bg_noise_level_2_roomB,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_roomB),
-                       opentelemetry::context::Context{});
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          auto lastvalue_data = opentelemetry::nostd::get<LastValuePointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("Room.id")->second) == "Rack A")
-          {
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_DOUBLE_EQ(opentelemetry::nostd::get<double>(lastvalue_data.value_),
-                               bg_noise_level_2_roomA);
-            }
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("Room.id")->second) == "Rack B")
-          {
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_DOUBLE_EQ(opentelemetry::nostd::get<double>(lastvalue_data.value_),
-                               bg_noise_level_2_roomB);
-            }
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // RackA and RackB
-#else
-  EXPECT_TRUE(true);
-#endif
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestDouble,
-                         WritableMetricStorageTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_histogram_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_histogram_test.cc
deleted file mode 100644
index 89dedb397..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_histogram_test.cc
+++ /dev/null
@@ -1,542 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <chrono>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/data/circular_buffer.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/sync_metric_storage.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#  include "opentelemetry/sdk/metrics/exemplar/reservoir.h"
-#endif
-
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::common;
-using M         = std::map<std::string, std::string>;
-namespace nostd = opentelemetry::nostd;
-
-class WritableMetricStorageHistogramTestFixture
-    : public ::testing::TestWithParam<AggregationTemporality>
-{};
-
-TEST_P(WritableMetricStorageHistogramTestFixture, LongHistogram)
-{
-  AggregationTemporality temporality  = GetParam();
-  auto sdk_start_ts                   = std::chrono::system_clock::now();
-  int64_t expected_total_get_requests = 0;
-  int64_t expected_total_put_requests = 0;
-  InstrumentDescriptor instr_desc     = {"name", "desc", "1unit", InstrumentType::kHistogram,
-                                         InstrumentValueType::kLong};
-  std::map<std::string, std::string> attributes_get = {{"RequestType", "GET"}};
-  std::map<std::string, std::string> attributes_put = {{"RequestType", "PUT"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kHistogram, default_attributes_processor.get(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-
-  storage.RecordLong(10, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_get_requests += 10;
-
-  storage.RecordLong(30, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_put_requests += 30;
-
-  storage.RecordLong(20, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_get_requests += 20;
-
-  storage.RecordLong(40, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.sum_), expected_total_get_requests);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.sum_), expected_total_put_requests);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-  // In case of delta temporarily, subsequent collection would contain new data points, so resetting
-  // the counts
-  if (temporality == AggregationTemporality::kDelta)
-  {
-    expected_total_get_requests = 0;
-    expected_total_put_requests = 0;
-  }
-
-  // collect one more time.
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        if (temporality == AggregationTemporality::kCumulative)
-        {
-          EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
-        }
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            count_attributes++;
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.sum_), expected_total_get_requests);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            count_attributes++;
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.sum_), expected_total_put_requests);
-          }
-        }
-        return true;
-      });
-  if (temporality == AggregationTemporality::kCumulative)
-  {
-    EXPECT_EQ(count_attributes, 2);  // GET AND PUT
-  }
-
-  storage.RecordLong(50, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_get_requests += 50;
-  storage.RecordLong(40, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.sum_), expected_total_get_requests);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.sum_), expected_total_put_requests);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageHistogramTestLong,
-                         WritableMetricStorageHistogramTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
-
-TEST_P(WritableMetricStorageHistogramTestFixture, DoubleHistogram)
-{
-  AggregationTemporality temporality = GetParam();
-  auto sdk_start_ts                  = std::chrono::system_clock::now();
-  double expected_total_get_requests = 0;
-  double expected_total_put_requests = 0;
-  InstrumentDescriptor instr_desc    = {"name", "desc", "1unit", InstrumentType::kHistogram,
-                                        InstrumentValueType::kDouble};
-  std::map<std::string, std::string> attributes_get = {{"RequestType", "GET"}};
-  std::map<std::string, std::string> attributes_put = {{"RequestType", "PUT"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kHistogram, default_attributes_processor.get(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-
-  storage.RecordDouble(10.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 10;
-
-  storage.RecordDouble(30.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 30;
-
-  storage.RecordDouble(20.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 20;
-
-  storage.RecordDouble(40.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.sum_), expected_total_get_requests);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.sum_), expected_total_put_requests);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-
-  // In case of delta temporarily, subsequent collection would contain new data points, so resetting
-  // the counts
-  if (temporality == AggregationTemporality::kDelta)
-  {
-    expected_total_get_requests = 0;
-    expected_total_put_requests = 0;
-  }
-
-  // collect one more time.
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        if (temporality == AggregationTemporality::kCumulative)
-        {
-          EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
-        }
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            count_attributes++;
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.sum_), expected_total_get_requests);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            count_attributes++;
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.sum_), expected_total_put_requests);
-          }
-        }
-        return true;
-      });
-  if (temporality == AggregationTemporality::kCumulative)
-  {
-    EXPECT_EQ(count_attributes, 2);  // GET AND PUT
-  }
-
-  storage.RecordDouble(50.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 50;
-  storage.RecordDouble(40.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.sum_), expected_total_get_requests);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(opentelemetry::nostd::get<double>(data.sum_), expected_total_put_requests);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageHistogramTestDouble,
-                         WritableMetricStorageHistogramTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
-
-TEST_P(WritableMetricStorageHistogramTestFixture, Base2ExponentialDoubleHistogram)
-{
-  AggregationTemporality temporality = GetParam();
-  auto sdk_start_ts                  = std::chrono::system_clock::now();
-  double expected_total_get_requests = 0;
-  double expected_total_put_requests = 0;
-  InstrumentDescriptor instr_desc    = {"name", "desc", "1unit", InstrumentType::kHistogram,
-                                        InstrumentValueType::kDouble};
-  std::map<std::string, std::string> attributes_get = {{"RequestType", "GET"}};
-  std::map<std::string, std::string> attributes_put = {{"RequestType", "PUT"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kBase2ExponentialHistogram, default_attributes_processor.get(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-
-  storage.RecordDouble(10.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 10;
-
-  storage.RecordDouble(30.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 30;
-
-  storage.RecordDouble(20.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 20;
-
-  storage.RecordDouble(40.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data =
-              opentelemetry::nostd::get<Base2ExponentialHistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(data.sum_, expected_total_get_requests);
-            EXPECT_EQ(data.count_, 2);
-            EXPECT_EQ(data.min_, 10);
-            EXPECT_EQ(data.max_, 20);
-            EXPECT_EQ(data.negative_buckets_->Empty(), true);
-            auto start_index = data.positive_buckets_->StartIndex();
-            auto end_index   = data.positive_buckets_->EndIndex();
-            EXPECT_EQ(data.positive_buckets_->Get(start_index), 1);
-            EXPECT_EQ(data.positive_buckets_->Get(end_index), 1);
-            count_attributes++;
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(data.sum_, expected_total_put_requests);
-            EXPECT_EQ(data.count_, 2);
-            EXPECT_EQ(data.min_, 30);
-            EXPECT_EQ(data.max_, 40);
-            auto start_index = data.positive_buckets_->StartIndex();
-            auto end_index   = data.positive_buckets_->EndIndex();
-            EXPECT_EQ(data.positive_buckets_->Get(start_index), 1);
-            EXPECT_EQ(data.positive_buckets_->Get(end_index), 1);
-            EXPECT_EQ(data.negative_buckets_->Empty(), true);
-            count_attributes++;
-          }
-        }
-        return true;
-      });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-
-  // In case of delta temporarily, subsequent collection would contain new data points, so resetting
-  // the counts
-  if (temporality == AggregationTemporality::kDelta)
-  {
-    expected_total_get_requests = 0;
-    expected_total_put_requests = 0;
-  }
-
-  // collect one more time.
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        if (temporality == AggregationTemporality::kCumulative)
-        {
-          EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
-        }
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          const auto &data =
-              opentelemetry::nostd::get<Base2ExponentialHistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            count_attributes++;
-            EXPECT_EQ(data.sum_, expected_total_get_requests);
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            count_attributes++;
-            EXPECT_EQ(data.sum_, expected_total_put_requests);
-          }
-        }
-        return true;
-      });
-  if (temporality == AggregationTemporality::kCumulative)
-  {
-    EXPECT_EQ(count_attributes, 2);  // GET AND PUT
-  }
-
-  storage.RecordDouble(50.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_get_requests += 50;
-  storage.RecordDouble(40.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_put_requests += 40;
-
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(
-      collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
-        for (const auto &data_attr : metric_data.point_data_attr_)
-        {
-          auto &data =
-              opentelemetry::nostd::get<Base2ExponentialHistogramPointData>(data_attr.point_data);
-          if (opentelemetry::nostd::get<std::string>(
-                  data_attr.attributes.find("RequestType")->second) == "GET")
-          {
-            EXPECT_EQ(data.sum_, expected_total_get_requests);
-            count_attributes++;
-            auto start_index = data.positive_buckets_->StartIndex();
-            auto end_index   = data.positive_buckets_->EndIndex();
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_EQ(data.count_, 3);
-              EXPECT_EQ(data.min_, 10);
-              EXPECT_EQ(data.max_, 50);
-              uint64_t count = 0;
-              for (auto i = start_index; i <= end_index; ++i)
-              {
-                count += data.positive_buckets_->Get(i);
-              }
-              EXPECT_EQ(count, 3);
-            }
-            if (temporality == AggregationTemporality::kDelta)
-            {
-              EXPECT_EQ(data.count_, 1);
-              EXPECT_EQ(data.min_, 50);
-              EXPECT_EQ(data.max_, 50);
-              EXPECT_EQ(data.positive_buckets_->Get(start_index), 1);
-              EXPECT_EQ(end_index, start_index);
-            }
-          }
-          else if (opentelemetry::nostd::get<std::string>(
-                       data_attr.attributes.find("RequestType")->second) == "PUT")
-          {
-            EXPECT_EQ(data.sum_, expected_total_put_requests);
-            count_attributes++;
-            auto start_index = data.positive_buckets_->StartIndex();
-            auto end_index   = data.positive_buckets_->EndIndex();
-            if (temporality == AggregationTemporality::kCumulative)
-            {
-              EXPECT_EQ(data.count_, 3);
-              EXPECT_EQ(data.min_, 30);
-              EXPECT_EQ(data.max_, 40);
-              uint64_t count = 0;
-              for (auto i = start_index; i <= end_index; ++i)
-              {
-                count += data.positive_buckets_->Get(i);
-              }
-              EXPECT_EQ(count, 3);
-            }
-            if (temporality == AggregationTemporality::kDelta)
-            {
-              EXPECT_EQ(data.count_, 1);
-              EXPECT_EQ(data.min_, 40);
-              EXPECT_EQ(data.max_, 40);
-              EXPECT_EQ(data.positive_buckets_->Get(start_index), 1);
-              EXPECT_EQ(end_index, start_index);
-            }
-          }
-        }
-        return true;
-      });
-
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageHistogramTestBase2ExponentialDouble,
-                         WritableMetricStorageHistogramTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc
deleted file mode 100644
index b7b549051..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <algorithm>
-#include <chrono>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-#include "common.h"
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/metrics/data/metric_data.h"
-#include "opentelemetry/sdk/metrics/data/point_data.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/state/metric_collector.h"
-#include "opentelemetry/sdk/metrics/state/sync_metric_storage.h"
-#include "opentelemetry/sdk/metrics/view/attributes_processor.h"
-
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-#  include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
-#endif
-
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::common;
-using M         = std::map<std::string, std::string>;
-namespace nostd = opentelemetry::nostd;
-
-class WritableMetricStorageTestFixture : public ::testing::TestWithParam<AggregationTemporality>
-{};
-
-TEST_P(WritableMetricStorageTestFixture, LongUpDownCounterSumAggregation)
-{
-  AggregationTemporality temporality         = GetParam();
-  auto sdk_start_ts                          = std::chrono::system_clock::now();
-  int64_t expected_total_active_get_requests = 0;
-  int64_t expected_total_active_put_requests = 0;
-  InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kUpDownCounter,
-                                     InstrumentValueType::kLong};
-  std::map<std::string, std::string> attributes_get = {{"RequestType", "GET"}};
-  std::map<std::string, std::string> attributes_put = {{"RequestType", "PUT"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kSum, default_attributes_processor.get(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-
-  int64_t val1 = 10, val2 = 30, val3 = -5, val4 = -10;
-  storage.RecordLong(val1, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_active_get_requests += val1;
-
-  storage.RecordLong(val2, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_active_put_requests += val2;
-
-  storage.RecordLong(val3, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_active_get_requests += val3;
-
-  storage.RecordLong(val4, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_active_put_requests += val4;
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData &data) {
-                    for (auto data_attr : data.point_data_attr_)
-                    {
-                      auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-                      if (opentelemetry::nostd::get<std::string>(
-                              data_attr.attributes.find("RequestType")->second) == "GET")
-                      {
-                        EXPECT_EQ(opentelemetry::nostd::get<int64_t>(sum_data.value_),
-                                  expected_total_active_get_requests);
-                        count_attributes++;
-                      }
-                      else if (opentelemetry::nostd::get<std::string>(
-                                   data_attr.attributes.find("RequestType")->second) == "PUT")
-                      {
-                        EXPECT_EQ(opentelemetry::nostd::get<int64_t>(sum_data.value_),
-                                  expected_total_active_put_requests);
-                        count_attributes++;
-                      }
-                    }
-                    return true;
-                  });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-  // In case of delta temporarily, subsequent collection would contain new data points, so resetting
-  // the counts
-  if (temporality == AggregationTemporality::kDelta)
-  {
-    expected_total_active_get_requests = 0;
-    expected_total_active_put_requests = 0;
-  }
-
-  // collect one more time.
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData &data) {
-                    if (temporality == AggregationTemporality::kCumulative)
-                    {
-                      EXPECT_EQ(data.start_ts, sdk_start_ts);
-                    }
-                    for (auto data_attr : data.point_data_attr_)
-                    {
-                      auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-                      if (opentelemetry::nostd::get<std::string>(
-                              data_attr.attributes.find("RequestType")->second) == "GET")
-                      {
-                        count_attributes++;
-                        EXPECT_EQ(opentelemetry::nostd::get<int64_t>(sum_data.value_),
-                                  expected_total_active_get_requests);
-                      }
-                      else if (opentelemetry::nostd::get<std::string>(
-                                   data_attr.attributes.find("RequestType")->second) == "PUT")
-                      {
-                        count_attributes++;
-                        EXPECT_EQ(opentelemetry::nostd::get<int64_t>(sum_data.value_),
-                                  expected_total_active_put_requests);
-                      }
-                    }
-                    return true;
-                  });
-  if (temporality == AggregationTemporality::kCumulative)
-  {
-    EXPECT_EQ(count_attributes, 2);  // GET AND PUT
-  }
-
-  val1 = 50;
-  val2 = 40;
-  storage.RecordLong(val1, KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                     opentelemetry::context::Context{});
-  expected_total_active_get_requests += val1;
-  storage.RecordLong(val2, KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                     opentelemetry::context::Context{});
-  expected_total_active_put_requests += val2;
-
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData &data) {
-                    for (auto data_attr : data.point_data_attr_)
-                    {
-                      auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-                      if (opentelemetry::nostd::get<std::string>(
-                              data_attr.attributes.find("RequestType")->second) == "GET")
-                      {
-                        EXPECT_EQ(opentelemetry::nostd::get<int64_t>(sum_data.value_),
-                                  expected_total_active_get_requests);
-                        count_attributes++;
-                      }
-                      else if (opentelemetry::nostd::get<std::string>(
-                                   data_attr.attributes.find("RequestType")->second) == "PUT")
-                      {
-                        EXPECT_EQ(opentelemetry::nostd::get<int64_t>(sum_data.value_),
-                                  expected_total_active_put_requests);
-                        count_attributes++;
-                      }
-                    }
-                    return true;
-                  });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-}
-
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestLong,
-                         WritableMetricStorageTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
-
-TEST_P(WritableMetricStorageTestFixture, DoubleUpDownCounterSumAggregation)
-{
-  AggregationTemporality temporality        = GetParam();
-  auto sdk_start_ts                         = std::chrono::system_clock::now();
-  double expected_total_active_get_requests = 0;
-  double expected_total_active_put_requests = 0;
-  InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kUpDownCounter,
-                                     InstrumentValueType::kDouble};
-  std::map<std::string, std::string> attributes_get = {{"RequestType", "GET"}};
-  std::map<std::string, std::string> attributes_put = {{"RequestType", "PUT"}};
-
-  std::unique_ptr<DefaultAttributesProcessor> default_attributes_processor{
-      new DefaultAttributesProcessor{}};
-  opentelemetry::sdk::metrics::SyncMetricStorage storage(
-      instr_desc, AggregationType::kSum, default_attributes_processor.get(),
-#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
-      ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(),
-#endif
-      nullptr);
-
-  storage.RecordDouble(10.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_active_get_requests += 10;
-
-  storage.RecordDouble(30.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_active_put_requests += 30;
-
-  storage.RecordDouble(-5.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_active_get_requests -= 5;
-
-  storage.RecordDouble(-10.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_active_put_requests -= 10;
-
-  std::shared_ptr<CollectorHandle> collector(new MockCollectorHandle(temporality));
-  std::vector<std::shared_ptr<CollectorHandle>> collectors;
-  collectors.push_back(collector);
-
-  // Some computation here
-  auto collection_ts      = std::chrono::system_clock::now();
-  size_t count_attributes = 0;
-  storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData &data) {
-                    for (auto data_attr : data.point_data_attr_)
-                    {
-                      auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-                      if (opentelemetry::nostd::get<std::string>(
-                              data_attr.attributes.find("RequestType")->second) == "GET")
-                      {
-                        EXPECT_EQ(opentelemetry::nostd::get<double>(sum_data.value_),
-                                  expected_total_active_get_requests);
-                        count_attributes++;
-                      }
-                      else if (opentelemetry::nostd::get<std::string>(
-                                   data_attr.attributes.find("RequestType")->second) == "PUT")
-                      {
-                        EXPECT_EQ(opentelemetry::nostd::get<double>(sum_data.value_),
-                                  expected_total_active_put_requests);
-                        count_attributes++;
-                      }
-                    }
-                    return true;
-                  });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-
-  // In case of delta temporarily, subsequent collection would contain new data points, so resetting
-  // the counts
-  if (temporality == AggregationTemporality::kDelta)
-  {
-    expected_total_active_get_requests = 0;
-    expected_total_active_put_requests = 0;
-  }
-
-  // collect one more time.
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData &data) {
-                    if (temporality == AggregationTemporality::kCumulative)
-                    {
-                      EXPECT_EQ(data.start_ts, sdk_start_ts);
-                    }
-                    for (auto data_attr : data.point_data_attr_)
-                    {
-                      auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-                      if (opentelemetry::nostd::get<std::string>(
-                              data_attr.attributes.find("RequestType")->second) == "GET")
-                      {
-                        count_attributes++;
-                        EXPECT_EQ(opentelemetry::nostd::get<double>(sum_data.value_),
-                                  expected_total_active_get_requests);
-                      }
-                      else if (opentelemetry::nostd::get<std::string>(
-                                   data_attr.attributes.find("RequestType")->second) == "PUT")
-                      {
-                        count_attributes++;
-                        EXPECT_EQ(opentelemetry::nostd::get<double>(sum_data.value_),
-                                  expected_total_active_put_requests);
-                      }
-                    }
-                    return true;
-                  });
-  if (temporality == AggregationTemporality::kCumulative)
-  {
-    EXPECT_EQ(count_attributes, 2);  // GET AND PUT
-  }
-
-  storage.RecordDouble(50.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_get),
-                       opentelemetry::context::Context{});
-  expected_total_active_get_requests += 50;
-  storage.RecordDouble(40.0,
-                       KeyValueIterableView<std::map<std::string, std::string>>(attributes_put),
-                       opentelemetry::context::Context{});
-  expected_total_active_put_requests += 40;
-
-  collection_ts    = std::chrono::system_clock::now();
-  count_attributes = 0;
-  storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
-                  [&](const MetricData &data) {
-                    for (auto data_attr : data.point_data_attr_)
-                    {
-                      auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
-                      if (opentelemetry::nostd::get<std::string>(
-                              data_attr.attributes.find("RequestType")->second) == "GET")
-                      {
-                        EXPECT_EQ(opentelemetry::nostd::get<double>(sum_data.value_),
-                                  expected_total_active_get_requests);
-                        count_attributes++;
-                      }
-                      else if (opentelemetry::nostd::get<std::string>(
-                                   data_attr.attributes.find("RequestType")->second) == "PUT")
-                      {
-                        EXPECT_EQ(opentelemetry::nostd::get<double>(sum_data.value_),
-                                  expected_total_active_put_requests);
-                        count_attributes++;
-                      }
-                    }
-                    return true;
-                  });
-  EXPECT_EQ(count_attributes, 2);  // GET and PUT
-}
-INSTANTIATE_TEST_SUITE_P(WritableMetricStorageTestDouble,
-                         WritableMetricStorageTestFixture,
-                         ::testing::Values(AggregationTemporality::kCumulative,
-                                           AggregationTemporality::kDelta));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/view_registry_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/view_registry_test.cc
deleted file mode 100644
index 8ede7385a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/metrics/view_registry_test.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/instruments.h"
-#include "opentelemetry/sdk/metrics/view/instrument_selector.h"
-#include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/view.h"
-#include "opentelemetry/sdk/metrics/view/view_registry.h"
-
-using namespace opentelemetry::sdk::metrics;
-using namespace opentelemetry::sdk::instrumentationscope;
-
-TEST(ViewRegistry, FindViewsEmptyRegistry)
-{
-  InstrumentDescriptor default_instrument_descriptor = {
-      "test_name",               // name
-      "test_descr",              // description
-      "1",                       // unit
-      InstrumentType::kCounter,  // instrument type
-      InstrumentValueType::kLong};
-
-  auto default_instrumentation_scope =
-      InstrumentationScope::Create("default", "1.0.0", "https://opentelemetry.io/schemas/1.7.0");
-  int count = 0;
-  ViewRegistry registry;
-  auto status =
-      registry.FindViews(default_instrument_descriptor, *default_instrumentation_scope.get(),
-                         [&count](const View &view) {
-                           count++;
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-                           EXPECT_EQ(view.GetName(), "");
-                           EXPECT_EQ(view.GetDescription(), "");
-#endif
-                           EXPECT_EQ(view.GetAggregationType(), AggregationType::kDefault);
-                           return true;
-                         });
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  EXPECT_EQ(count, 1);
-  EXPECT_EQ(status, true);
-#endif
-}
-
-TEST(ViewRegistry, FindNonExistingView)
-{
-  // Add view
-  const std::string view_name               = "test_view";
-  const std::string view_description        = "test description";
-  const std::string instrumentation_name    = "name1";
-  const std::string instrumentation_version = "version1";
-  const std::string instrumentation_schema  = "schema1";
-  const std::string instrument_name         = "testname";
-  const InstrumentType instrument_type      = InstrumentType::kCounter;
-  const std::string instrument_unit         = "ms";
-
-  std::unique_ptr<InstrumentSelector> instrument_selector{
-      new InstrumentSelector(instrument_type, instrument_name, instrument_unit)};
-  std::unique_ptr<MeterSelector> meter_selector{
-      new MeterSelector(instrumentation_name, instrumentation_version, instrumentation_schema)};
-  std::unique_ptr<View> view = std::unique_ptr<View>(new View(view_name, view_description));
-
-  ViewRegistry registry;
-  registry.AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view));
-  InstrumentDescriptor default_instrument_descriptor = {instrument_name,  // name
-                                                        "test_descr",     // description
-                                                        instrument_unit,  // unit
-                                                        instrument_type,  // instrument type
-                                                        InstrumentValueType::kLong};
-
-  auto default_instrumentation_scope = InstrumentationScope::Create(
-      instrumentation_name, instrumentation_version, instrumentation_schema);
-  int count = 0;
-  auto status =
-      registry.FindViews(default_instrument_descriptor, *default_instrumentation_scope.get(),
-                         [&count, &view_name, &view_description](const View &view) {
-                           count++;
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-                           EXPECT_EQ(view.GetName(), view_name);
-                           EXPECT_EQ(view.GetDescription(), view_description);
-#endif
-                           return true;
-                         });
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  EXPECT_EQ(count, 1);
-  EXPECT_EQ(status, true);
-#endif
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/BUILD
deleted file mode 100644
index 145ecf0b5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-cc_test(
-    name = "resource_test",
-    srcs = [
-        "resource_test.cc",
-    ],
-    tags = ["test"],
-    deps = [
-        "//api",
-        "//sdk/src/resource",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/CMakeLists.txt
deleted file mode 100644
index dfe78589f..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(testname resource_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                        ${CMAKE_THREAD_LIBS_INIT} opentelemetry_resources)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX resources.
-    TEST_LIST ${testname})
-endforeach()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/resource_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/resource_test.cc
deleted file mode 100644
index e6f1af244..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/resource/resource_test.cc
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <cstdlib>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/resource/resource_detector.h"
-#include "opentelemetry/sdk/version/version.h"
-#include "opentelemetry/semconv/service_attributes.h"
-#include "opentelemetry/semconv/telemetry_attributes.h"
-
-#if defined(_MSC_VER)
-#  include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#endif
-
-using namespace opentelemetry::sdk::resource;
-namespace nostd   = opentelemetry::nostd;
-namespace semconv = opentelemetry::semconv;
-
-class TestResource : public Resource
-{
-public:
-  TestResource(const ResourceAttributes &attributes = ResourceAttributes(),
-               const std::string &schema_url        = {})
-      : Resource(attributes, schema_url)
-  {}
-};
-
-class TestResourceDetector : public ResourceDetector
-{
-public:
-  TestResourceDetector() = default;
-  Resource Detect() noexcept override { return Create(attributes, schema_url); }
-  ResourceAttributes attributes;
-  std::string schema_url;
-};
-
-TEST(ResourceTest, create_without_servicename)
-{
-  ResourceAttributes expected_attributes = {
-      {"service", "backend"},
-      {"version", static_cast<uint32_t>(1)},
-      {"cost", 234.23},
-      {semconv::telemetry::kTelemetrySdkLanguage, "cpp"},
-      {semconv::telemetry::kTelemetrySdkName, "opentelemetry"},
-      {semconv::telemetry::kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION},
-      {semconv::service::kServiceName, "unknown_service"}};
-
-  ResourceAttributes attributes = {
-      {"service", "backend"}, {"version", static_cast<uint32_t>(1)}, {"cost", 234.23}};
-  auto resource            = Resource::Create(attributes);
-  auto received_attributes = resource.GetAttributes();
-  for (auto &e : received_attributes)
-  {
-    EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
-    if (expected_attributes.find(e.first) != expected_attributes.end())
-    {
-      if (e.first == "version")
-        EXPECT_EQ(nostd::get<uint32_t>(expected_attributes.find(e.first)->second),
-                  nostd::get<uint32_t>(e.second));
-      else if (e.first == "cost")
-        EXPECT_EQ(nostd::get<double>(expected_attributes.find(e.first)->second),
-                  nostd::get<double>(e.second));
-      else
-        EXPECT_EQ(opentelemetry::nostd::get<std::string>(expected_attributes.find(e.first)->second),
-                  opentelemetry::nostd::get<std::string>(e.second));
-    }
-  }
-  EXPECT_EQ(received_attributes.size(), expected_attributes.size());  // for missing service.name
-}
-
-TEST(ResourceTest, create_with_servicename)
-{
-  ResourceAttributes expected_attributes = {
-      {"version", static_cast<uint32_t>(1)},
-      {"cost", 234.23},
-      {semconv::telemetry::kTelemetrySdkLanguage, "cpp"},
-      {semconv::telemetry::kTelemetrySdkName, "opentelemetry"},
-      {semconv::telemetry::kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION},
-      {semconv::service::kServiceName, "backend"},
-  };
-  ResourceAttributes attributes = {
-      {"service.name", "backend"}, {"version", static_cast<uint32_t>(1)}, {"cost", 234.23}};
-  auto resource            = Resource::Create(attributes);
-  auto received_attributes = resource.GetAttributes();
-  for (auto &e : received_attributes)
-  {
-    EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
-    if (expected_attributes.find(e.first) != expected_attributes.end())
-    {
-      if (e.first == "version")
-        EXPECT_EQ(nostd::get<uint32_t>(expected_attributes.find(e.first)->second),
-                  nostd::get<uint32_t>(e.second));
-      else if (e.first == "cost")
-        EXPECT_EQ(nostd::get<double>(expected_attributes.find(e.first)->second),
-                  nostd::get<double>(e.second));
-      else
-        EXPECT_EQ(nostd::get<std::string>(expected_attributes.find(e.first)->second),
-                  nostd::get<std::string>(e.second));
-    }
-  }
-  EXPECT_EQ(received_attributes.size(), expected_attributes.size());  // for missing service.name
-}
-
-TEST(ResourceTest, create_with_emptyatrributes)
-{
-  ResourceAttributes expected_attributes = {
-      {semconv::telemetry::kTelemetrySdkLanguage, "cpp"},
-      {semconv::telemetry::kTelemetrySdkName, "opentelemetry"},
-      {semconv::telemetry::kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION},
-      {semconv::service::kServiceName, "unknown_service"},
-  };
-  ResourceAttributes attributes = {};
-  auto resource                 = Resource::Create(attributes);
-  auto received_attributes      = resource.GetAttributes();
-  for (auto &e : received_attributes)
-  {
-    EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
-    if (expected_attributes.find(e.first) != expected_attributes.end())
-    {
-      EXPECT_EQ(opentelemetry::nostd::get<std::string>(expected_attributes.find(e.first)->second),
-                opentelemetry::nostd::get<std::string>(e.second));
-    }
-  }
-  EXPECT_EQ(received_attributes.size(), expected_attributes.size());  // for missing service.name
-}
-
-TEST(ResourceTest, create_with_schemaurl)
-{
-  const std::string schema_url    = "https://opentelemetry.io/schemas/1.2.0";
-  ResourceAttributes attributes   = {};
-  auto resource                   = Resource::Create(attributes, schema_url);
-  const auto &received_schema_url = resource.GetSchemaURL();
-
-  EXPECT_EQ(received_schema_url, schema_url);
-}
-
-TEST(ResourceTest, Merge)
-{
-  TestResource resource1(ResourceAttributes({{"service", "backend"}}));
-  TestResource resource2(ResourceAttributes({{"host", "service-host"}}));
-  std::map<std::string, std::string> expected_attributes = {{"service", "backend"},
-                                                            {"host", "service-host"}};
-
-  auto merged_resource     = resource1.Merge(resource2);
-  auto received_attributes = merged_resource.GetAttributes();
-  for (auto &e : received_attributes)
-  {
-    EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
-    if (expected_attributes.find(e.first) != expected_attributes.end())
-    {
-      EXPECT_EQ(expected_attributes.find(e.first)->second, nostd::get<std::string>(e.second));
-    }
-  }
-  EXPECT_EQ(received_attributes.size(), expected_attributes.size());
-}
-
-TEST(ResourceTest, MergeEmptyString)
-{
-  TestResource resource1({{"service", "backend"}, {"host", "service-host"}});
-  TestResource resource2({{"service", ""}, {"host", "another-service-host"}});
-  std::map<std::string, std::string> expected_attributes = {{"service", ""},
-                                                            {"host", "another-service-host"}};
-
-  auto merged_resource     = resource1.Merge(resource2);
-  auto received_attributes = merged_resource.GetAttributes();
-
-  for (auto &e : received_attributes)
-  {
-    EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
-    if (expected_attributes.find(e.first) != expected_attributes.end())
-    {
-      EXPECT_EQ(expected_attributes.find(e.first)->second, nostd::get<std::string>(e.second));
-    }
-  }
-  EXPECT_EQ(received_attributes.size(), expected_attributes.size());
-}
-
-TEST(ResourceTest, MergeSchemaUrl)
-{
-  const std::string url = "https://opentelemetry.io/schemas/v3.1.4";
-
-  TestResource resource_empty_url({}, "");
-  TestResource resource_some_url({}, url);
-  TestResource resource_different_url({}, "different");
-
-  // Specified behavior:
-  auto merged_both_empty = resource_empty_url.Merge(resource_empty_url);
-  EXPECT_TRUE(merged_both_empty.GetSchemaURL().empty());
-
-  auto merged_old_empty = resource_empty_url.Merge(resource_some_url);
-  EXPECT_EQ(merged_old_empty.GetSchemaURL(), url);
-
-  auto merged_updating_empty = resource_some_url.Merge(resource_empty_url);
-  EXPECT_EQ(merged_updating_empty.GetSchemaURL(), url);
-
-  auto merged_same_url = resource_some_url.Merge(resource_some_url);
-  EXPECT_EQ(merged_same_url.GetSchemaURL(), url);
-
-  // Implementation-defined behavior:
-  auto merged_different_url = resource_different_url.Merge(resource_some_url);
-  EXPECT_EQ(merged_different_url.GetSchemaURL(), url);
-}
-
-#ifndef NO_GETENV
-TEST(ResourceTest, OtelResourceDetector)
-{
-  std::map<std::string, std::string> expected_attributes = {{"k", "v"}};
-
-  setenv("OTEL_RESOURCE_ATTRIBUTES", "k=v", 1);
-
-  OTELResourceDetector detector;
-  auto resource            = detector.Detect();
-  auto received_attributes = resource.GetAttributes();
-  for (auto &e : received_attributes)
-  {
-    EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
-    if (expected_attributes.find(e.first) != expected_attributes.end())
-    {
-      EXPECT_EQ(expected_attributes.find(e.first)->second, nostd::get<std::string>(e.second));
-    }
-  }
-  EXPECT_EQ(received_attributes.size(), expected_attributes.size());
-
-  unsetenv("OTEL_RESOURCE_ATTRIBUTES");
-}
-
-TEST(ResourceTest, OtelResourceDetectorServiceNameOverride)
-{
-  std::map<std::string, std::string> expected_attributes = {{"service.name", "new_name"}};
-
-  setenv("OTEL_RESOURCE_ATTRIBUTES", "service.name=old_name", 1);
-  setenv("OTEL_SERVICE_NAME", "new_name", 1);
-
-  OTELResourceDetector detector;
-  auto resource            = detector.Detect();
-  auto received_attributes = resource.GetAttributes();
-  for (auto &e : received_attributes)
-  {
-    EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
-    if (expected_attributes.find(e.first) != expected_attributes.end())
-    {
-      EXPECT_EQ(expected_attributes.find(e.first)->second, nostd::get<std::string>(e.second));
-    }
-  }
-  EXPECT_EQ(received_attributes.size(), expected_attributes.size());
-
-  unsetenv("OTEL_SERVICE_NAME");
-  unsetenv("OTEL_RESOURCE_ATTRIBUTES");
-}
-
-TEST(ResourceTest, OtelResourceDetectorEmptyEnv)
-{
-  std::map<std::string, std::string> expected_attributes = {};
-  unsetenv("OTEL_RESOURCE_ATTRIBUTES");
-  OTELResourceDetector detector;
-  auto resource            = detector.Detect();
-  auto received_attributes = resource.GetAttributes();
-  for (auto &e : received_attributes)
-  {
-    EXPECT_TRUE(expected_attributes.find(e.first) != expected_attributes.end());
-    if (expected_attributes.find(e.first) != expected_attributes.end())
-    {
-      EXPECT_EQ(expected_attributes.find(e.first)->second, nostd::get<std::string>(e.second));
-    }
-  }
-  EXPECT_EQ(received_attributes.size(), expected_attributes.size());
-}
-
-#endif
-
-TEST(ResourceTest, DerivedResourceDetector)
-{
-  TestResourceDetector detector;
-
-  detector.attributes            = {{"key", "value"}};
-  detector.schema_url            = "https://opentelemetry.io/schemas/v3.1.4";
-  const auto resource            = detector.Detect();
-  const auto received_attributes = resource.GetAttributes();
-
-  EXPECT_EQ(received_attributes.size(), 1);
-  EXPECT_EQ(resource.GetSchemaURL(), detector.schema_url);
-  EXPECT_TRUE(received_attributes.find("key") != received_attributes.end());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/BUILD b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/BUILD
deleted file mode 100644
index 18a750a33..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/BUILD
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
-
-cc_test(
-    name = "tracer_provider_test",
-    srcs = [
-        "tracer_provider_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/resource",
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "tracer_provider_set_test",
-    srcs = [
-        "tracer_provider_set_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/resource",
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "span_data_test",
-    srcs = [
-        "span_data_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "simple_processor_test",
-    srcs = [
-        "simple_processor_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//exporters/memory:in_memory_span_exporter",
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "batch_span_processor_test",
-    srcs = [
-        "batch_span_processor_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "tracer_test",
-    srcs = [
-        "tracer_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//exporters/memory:in_memory_span_exporter",
-        "//sdk/src/resource",
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "always_on_sampler_test",
-    srcs = [
-        "always_on_sampler_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "always_off_sampler_test",
-    srcs = [
-        "always_off_sampler_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "parent_sampler_test",
-    srcs = [
-        "parent_sampler_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "trace_id_ratio_sampler_test",
-    srcs = [
-        "trace_id_ratio_sampler_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/common:random",
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "tracer_config_test",
-    srcs = [
-        "tracer_config_test.cc",
-    ],
-    tags = [
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//sdk/src/trace",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-otel_cc_benchmark(
-    name = "sampler_benchmark",
-    srcs = ["sampler_benchmark.cc"],
-    tags = [
-        "benchmark",
-        "test",
-        "trace",
-    ],
-    deps = [
-        "//exporters/memory:in_memory_span_exporter",
-        "//sdk/src/resource",
-        "//sdk/src/trace",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/CMakeLists.txt
deleted file mode 100644
index de8dee234..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-foreach(
-  testname
-  tracer_provider_set_test
-  tracer_provider_test
-  span_data_test
-  simple_processor_test
-  tracer_test
-  always_off_sampler_test
-  always_on_sampler_test
-  parent_sampler_test
-  trace_id_ratio_sampler_test
-  batch_span_processor_test
-  tracer_config_test)
-  add_executable(${testname} "${testname}.cc")
-  target_link_libraries(
-    ${testname}
-    ${GTEST_BOTH_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_common
-    opentelemetry_trace
-    opentelemetry_resources
-    opentelemetry_exporter_in_memory)
-  gtest_add_tests(
-    TARGET ${testname}
-    TEST_PREFIX trace.
-    TEST_LIST ${testname})
-endforeach()
-
-if(WITH_BENCHMARK)
-  add_executable(sampler_benchmark sampler_benchmark.cc)
-  target_link_libraries(
-    sampler_benchmark benchmark::benchmark ${CMAKE_THREAD_LIBS_INIT}
-    opentelemetry_trace opentelemetry_resources
-    opentelemetry_exporter_in_memory)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/always_off_sampler_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/always_off_sampler_test.cc
deleted file mode 100644
index 5680e22c7..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/always_off_sampler_test.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_off.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-
-using opentelemetry::sdk::trace::AlwaysOffSampler;
-using opentelemetry::sdk::trace::Decision;
-using opentelemetry::trace::SpanContext;
-namespace trace_api = opentelemetry::trace;
-
-TEST(AlwaysOffSampler, ShouldSample)
-{
-  AlwaysOffSampler sampler;
-
-  trace_api::TraceId trace_id;
-  trace_api::SpanKind span_kind = trace_api::SpanKind::kInternal;
-
-  using M = std::map<std::string, int>;
-  M m1    = {{}};
-
-  using L = std::vector<std::pair<SpanContext, std::map<std::string, std::string>>>;
-  L l1    = {{SpanContext(false, false), {}}, {SpanContext(false, false), {}}};
-
-  opentelemetry::common::KeyValueIterableView<M> view{m1};
-  trace_api::SpanContextKeyValueIterableView<L> links{l1};
-
-  auto sampling_result =
-      sampler.ShouldSample(SpanContext::GetInvalid(), trace_id, "", span_kind, view, links);
-
-  ASSERT_EQ(Decision::DROP, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-  ASSERT_EQ("", sampling_result.trace_state->ToHeader());
-}
-
-TEST(AlwaysOffSampler, GetDescription)
-{
-  AlwaysOffSampler sampler;
-
-  ASSERT_EQ("AlwaysOffSampler", sampler.GetDescription());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/always_on_sampler_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/always_on_sampler_test.cc
deleted file mode 100644
index e4f09c549..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/always_on_sampler_test.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-
-using namespace opentelemetry::sdk::trace;
-using namespace opentelemetry::nostd;
-using opentelemetry::trace::SpanContext;
-namespace trace_api = opentelemetry::trace;
-
-TEST(AlwaysOnSampler, ShouldSample)
-{
-  AlwaysOnSampler sampler;
-
-  // A buffer of trace_id with no specific meaning
-  constexpr uint8_t buf[] = {0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7};
-
-  trace_api::TraceId trace_id_invalid;
-  trace_api::TraceId trace_id_valid(buf);
-  std::map<std::string, int> key_value_container = {{"key", 0}};
-
-  using L = std::vector<std::pair<trace_api::SpanContext, std::map<std::string, std::string>>>;
-  L l1 = {{trace_api::SpanContext(false, false), {}}, {trace_api::SpanContext(false, false), {}}};
-
-  opentelemetry::trace::SpanContextKeyValueIterableView<L> links{l1};
-
-  // Test with invalid (empty) trace id and empty parent context
-  auto sampling_result = sampler.ShouldSample(
-      SpanContext::GetInvalid(), trace_id_invalid, "invalid trace id test",
-      trace_api::SpanKind::kServer,
-      opentelemetry::common::KeyValueIterableView<std::map<std::string, int>>(key_value_container),
-      links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-  ASSERT_EQ("", sampling_result.trace_state->ToHeader());
-
-  // Test with a valid trace id and empty parent context
-  sampling_result = sampler.ShouldSample(
-      SpanContext::GetInvalid(), trace_id_valid, "valid trace id test",
-      trace_api::SpanKind::kServer,
-      opentelemetry::common::KeyValueIterableView<std::map<std::string, int>>(key_value_container),
-      links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-  ASSERT_EQ("", sampling_result.trace_state->ToHeader());
-}
-
-TEST(AlwaysOnSampler, GetDescription)
-{
-  AlwaysOnSampler sampler;
-
-  ASSERT_EQ("AlwaysOnSampler", sampler.GetDescription());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/batch_span_processor_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/batch_span_processor_test.cc
deleted file mode 100644
index 293747350..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/batch_span_processor_test.cc
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <cstddef>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/attribute_utils.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
-#include "opentelemetry/sdk/trace/batch_span_processor.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-/**
- * Returns a mock span exporter meant exclusively for testing only
- */
-class MockSpanExporter final : public sdk::trace::SpanExporter
-{
-public:
-  MockSpanExporter(
-      std::shared_ptr<std::vector<std::unique_ptr<sdk::trace::SpanData>>> spans_received,
-      std::shared_ptr<std::atomic<std::size_t>> shut_down_counter,
-      std::shared_ptr<std::atomic<bool>> is_shutdown,
-      std::shared_ptr<std::atomic<bool>> is_export_completed =
-          std::shared_ptr<std::atomic<bool>>(new std::atomic<bool>(false)),
-      const std::chrono::milliseconds export_delay = std::chrono::milliseconds(0)) noexcept
-      : spans_received_(std::move(spans_received)),
-        shut_down_counter_(std::move(shut_down_counter)),
-        is_shutdown_(std::move(is_shutdown)),
-        is_export_completed_(std::move(is_export_completed)),
-        export_delay_(export_delay)
-  {}
-
-  std::unique_ptr<sdk::trace::Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<sdk::trace::Recordable>(new sdk::trace::SpanData);
-  }
-
-  sdk::common::ExportResult Export(
-      const nostd::span<std::unique_ptr<sdk::trace::Recordable>> &recordables) noexcept override
-  {
-    *is_export_completed_ = false;
-
-    std::this_thread::sleep_for(export_delay_);
-
-    for (auto &recordable : recordables)
-    {
-      auto span = std::unique_ptr<sdk::trace::SpanData>(
-          static_cast<sdk::trace::SpanData *>(recordable.release()));
-
-      if (span != nullptr)
-      {
-        spans_received_->push_back(std::move(span));
-      }
-    }
-
-    *is_export_completed_ = true;
-    return sdk::common::ExportResult::kSuccess;
-  }
-
-  bool ForceFlush(std::chrono::microseconds /*timeout*/) noexcept override
-  {
-    ++(*shut_down_counter_);
-    return true;
-  }
-
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    *is_shutdown_ = true;
-    return true;
-  }
-
-  bool IsExportCompleted() { return is_export_completed_->load(); }
-
-private:
-  std::shared_ptr<std::vector<std::unique_ptr<sdk::trace::SpanData>>> spans_received_;
-  std::shared_ptr<std::atomic<std::size_t>> shut_down_counter_;
-  std::shared_ptr<std::atomic<bool>> is_shutdown_;
-  std::shared_ptr<std::atomic<bool>> is_export_completed_;
-  // Meant exclusively to test force flush timeout
-  const std::chrono::milliseconds export_delay_;
-};
-
-/**
- * Fixture Class
- */
-class BatchSpanProcessorTestPeer : public testing::Test
-{
-public:
-  std::unique_ptr<std::vector<std::unique_ptr<sdk::trace::Recordable>>> GetTestSpans(
-      const std::shared_ptr<sdk::trace::SpanProcessor> &processor,
-      const int num_spans)
-  {
-    std::unique_ptr<std::vector<std::unique_ptr<sdk::trace::Recordable>>> test_spans(
-        new std::vector<std::unique_ptr<sdk::trace::Recordable>>);
-
-    for (int i = 0; i < num_spans; ++i)
-    {
-      test_spans->push_back(processor->MakeRecordable());
-      static_cast<sdk::trace::SpanData *>(test_spans->at(i).get())
-          ->SetName("Span " + std::to_string(i));
-    }
-
-    return test_spans;
-  }
-};
-
-/* ##################################   TESTS   ############################################ */
-
-TEST_F(BatchSpanProcessorTestPeer, TestShutdown)
-{
-  std::shared_ptr<std::atomic<std::size_t>> shut_down_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<sdk::trace::SpanData>>> spans_received(
-      new std::vector<std::unique_ptr<sdk::trace::SpanData>>);
-
-  auto batch_processor =
-      std::shared_ptr<sdk::trace::BatchSpanProcessor>(new sdk::trace::BatchSpanProcessor(
-          std::unique_ptr<sdk::trace::SpanExporter>(
-              new MockSpanExporter(spans_received, shut_down_counter, is_shutdown)),
-          sdk::trace::BatchSpanProcessorOptions()));
-  const int num_spans = 3;
-
-  auto test_spans = GetTestSpans(batch_processor, num_spans);
-
-  for (int i = 0; i < num_spans; ++i)
-  {
-    batch_processor->OnEnd(std::move(test_spans->at(i)));
-  }
-
-  EXPECT_TRUE(batch_processor->Shutdown());
-  // It's safe to shutdown again
-  EXPECT_TRUE(batch_processor->Shutdown());
-
-  EXPECT_EQ(num_spans, spans_received->size());
-  for (int i = 0; i < num_spans; ++i)
-  {
-    EXPECT_EQ("Span " + std::to_string(i), spans_received->at(i)->GetName());
-  }
-
-  EXPECT_TRUE(is_shutdown->load());
-}
-
-TEST_F(BatchSpanProcessorTestPeer, TestForceFlush)
-{
-  std::shared_ptr<std::atomic<std::size_t>> shut_down_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<sdk::trace::SpanData>>> spans_received(
-      new std::vector<std::unique_ptr<sdk::trace::SpanData>>);
-
-  auto batch_processor =
-      std::shared_ptr<sdk::trace::BatchSpanProcessor>(new sdk::trace::BatchSpanProcessor(
-          std::unique_ptr<sdk::trace::SpanExporter>(
-              new MockSpanExporter(spans_received, shut_down_counter, is_shutdown)),
-          sdk::trace::BatchSpanProcessorOptions()));
-  const int num_spans = 2048;
-
-  auto test_spans = GetTestSpans(batch_processor, num_spans);
-
-  for (int i = 0; i < num_spans; ++i)
-  {
-    batch_processor->OnEnd(std::move(test_spans->at(i)));
-  }
-
-  // Give some time to export
-  std::this_thread::sleep_for(std::chrono::milliseconds(50));
-
-  EXPECT_TRUE(batch_processor->ForceFlush());
-  EXPECT_GE(shut_down_counter->load(), 1);
-
-  EXPECT_EQ(num_spans, spans_received->size());
-  for (int i = 0; i < num_spans; ++i)
-  {
-    EXPECT_EQ("Span " + std::to_string(i), spans_received->at(i)->GetName());
-  }
-
-  // Create some more spans to make sure that the processor still works
-  auto more_test_spans = GetTestSpans(batch_processor, num_spans);
-  for (int i = 0; i < num_spans; ++i)
-  {
-    batch_processor->OnEnd(std::move(more_test_spans->at(i)));
-  }
-
-  // Give some time to export the spans
-  std::this_thread::sleep_for(std::chrono::milliseconds(50));
-
-  auto shut_down_counter_before = shut_down_counter->load();
-  EXPECT_TRUE(batch_processor->ForceFlush());
-  EXPECT_GT(shut_down_counter->load(), shut_down_counter_before);
-
-  EXPECT_EQ(num_spans * 2, spans_received->size());
-  for (int i = 0; i < num_spans; ++i)
-  {
-    EXPECT_EQ("Span " + std::to_string(i % num_spans),
-              spans_received->at(num_spans + i)->GetName());
-  }
-}
-
-// A mock log handler to check whether log messages with a specific level were emitted.
-struct MockLogHandler : public sdk::common::internal_log::LogHandler
-{
-  using Message = std::pair<sdk::common::internal_log::LogLevel, std::string>;
-
-  void Handle(sdk::common::internal_log::LogLevel level,
-              const char * /*file*/,
-              int /*line*/,
-              const char *msg,
-              const sdk::common::AttributeMap & /*attributes*/) noexcept override
-  {
-    messages.emplace_back(level, msg);
-  }
-
-  std::vector<Message> messages;
-};
-
-TEST_F(BatchSpanProcessorTestPeer, TestManySpansLoss)
-{
-  /* Test that when exporting more than max_queue_size spans, some are most likely lost*/
-
-  // Set up a log handler to verify a warning is generated.
-  auto log_handler = nostd::shared_ptr<sdk::common::internal_log::LogHandler>(new MockLogHandler());
-  sdk::common::internal_log::GlobalLogHandler::SetLogHandler(log_handler);
-
-  std::shared_ptr<std::atomic<std::size_t>> shut_down_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<sdk::trace::SpanData>>> spans_received(
-      new std::vector<std::unique_ptr<sdk::trace::SpanData>>);
-
-  const int max_queue_size = 4096;
-
-  auto batch_processor =
-      std::shared_ptr<sdk::trace::BatchSpanProcessor>(new sdk::trace::BatchSpanProcessor(
-          std::unique_ptr<sdk::trace::SpanExporter>(
-              new MockSpanExporter(spans_received, shut_down_counter, is_shutdown)),
-          sdk::trace::BatchSpanProcessorOptions()));
-
-  auto test_spans = GetTestSpans(batch_processor, max_queue_size);
-
-  for (int i = 0; i < max_queue_size; ++i)
-  {
-    batch_processor->OnEnd(std::move(test_spans->at(i)));
-  }
-
-  // Give some time to export the spans
-  std::this_thread::sleep_for(std::chrono::milliseconds(700));
-
-  EXPECT_TRUE(batch_processor->ForceFlush());
-
-  // Span should be exported by now
-  EXPECT_GE(max_queue_size, spans_received->size());
-
-  // If we haven't received all spans, some must have dropped, verify a warning was logged.
-  // Only do this when the log level is warning or above.
-#if OTEL_INTERNAL_LOG_LEVEL >= OTEL_INTERNAL_LOG_LEVEL_WARN
-  if (max_queue_size > spans_received->size())
-  {
-    auto &messages = static_cast<MockLogHandler *>(log_handler.get())->messages;
-    EXPECT_TRUE(
-        std::find(messages.begin(), messages.end(),
-                  MockLogHandler::Message(sdk::common::internal_log::LogLevel::Warning,
-                                          "BatchSpanProcessor queue is full - dropping span.")) !=
-        messages.end());
-  }
-#endif
-
-  // Reinstate the default log handler.
-  sdk::common::internal_log::GlobalLogHandler::SetLogHandler(
-      nostd::shared_ptr<sdk::common::internal_log::LogHandler>(
-          new sdk::common::internal_log::DefaultLogHandler()));
-}
-
-TEST_F(BatchSpanProcessorTestPeer, TestManySpansLossLess)
-{
-  /* Test that no spans are lost when sending max_queue_size spans */
-
-  std::shared_ptr<std::atomic<std::size_t>> shut_down_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<sdk::trace::SpanData>>> spans_received(
-      new std::vector<std::unique_ptr<sdk::trace::SpanData>>);
-
-  const int num_spans = 2048;
-
-  auto batch_processor =
-      std::shared_ptr<sdk::trace::BatchSpanProcessor>(new sdk::trace::BatchSpanProcessor(
-          std::unique_ptr<sdk::trace::SpanExporter>(
-              new MockSpanExporter(spans_received, shut_down_counter, is_shutdown)),
-          sdk::trace::BatchSpanProcessorOptions()));
-
-  auto test_spans = GetTestSpans(batch_processor, num_spans);
-
-  for (int i = 0; i < num_spans; ++i)
-  {
-    batch_processor->OnEnd(std::move(test_spans->at(i)));
-  }
-
-  // Give some time to export the spans
-  std::this_thread::sleep_for(std::chrono::milliseconds(50));
-
-  EXPECT_TRUE(batch_processor->ForceFlush());
-
-  EXPECT_EQ(num_spans, spans_received->size());
-  for (int i = 0; i < num_spans; ++i)
-  {
-    EXPECT_EQ("Span " + std::to_string(i), spans_received->at(i)->GetName());
-  }
-}
-
-TEST_F(BatchSpanProcessorTestPeer, TestScheduleDelayMillis)
-{
-  /* Test that max_export_batch_size spans are exported every schedule_delay_millis
-     seconds */
-
-  std::shared_ptr<std::atomic<std::size_t>> shut_down_counter(new std::atomic<std::size_t>(0));
-  std::shared_ptr<std::atomic<bool>> is_shutdown(new std::atomic<bool>(false));
-  std::shared_ptr<std::atomic<bool>> is_export_completed(new std::atomic<bool>(false));
-  std::shared_ptr<std::vector<std::unique_ptr<sdk::trace::SpanData>>> spans_received(
-      new std::vector<std::unique_ptr<sdk::trace::SpanData>>);
-  const std::chrono::milliseconds export_delay(0);
-  const size_t max_export_batch_size = 512;
-  sdk::trace::BatchSpanProcessorOptions options{};
-  options.schedule_delay_millis = std::chrono::milliseconds(2000);
-
-  auto batch_processor =
-      std::shared_ptr<sdk::trace::BatchSpanProcessor>(new sdk::trace::BatchSpanProcessor(
-          std::unique_ptr<sdk::trace::SpanExporter>(new MockSpanExporter(
-              spans_received, shut_down_counter, is_shutdown, is_export_completed, export_delay)),
-          options));
-
-  auto test_spans = GetTestSpans(batch_processor, max_export_batch_size);
-
-  for (size_t i = 0; i < max_export_batch_size; ++i)
-  {
-    batch_processor->OnEnd(std::move(test_spans->at(i)));
-  }
-
-  // Sleep for schedule_delay_millis milliseconds
-  std::this_thread::sleep_for(options.schedule_delay_millis);
-
-  // small delay to give time to export
-  std::this_thread::sleep_for(std::chrono::milliseconds(50));
-
-  // Spans should be exported by now
-  EXPECT_TRUE(is_export_completed->load());
-  EXPECT_EQ(max_export_batch_size, spans_received->size());
-  for (size_t i = 0; i < max_export_batch_size; ++i)
-  {
-    EXPECT_EQ("Span " + std::to_string(i), spans_received->at(i)->GetName());
-  }
-}
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/parent_sampler_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/parent_sampler_test.cc
deleted file mode 100644
index 17fcdd146..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/parent_sampler_test.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_off.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-#include "opentelemetry/sdk/trace/samplers/parent.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-
-using opentelemetry::sdk::trace::AlwaysOffSampler;
-using opentelemetry::sdk::trace::AlwaysOnSampler;
-using opentelemetry::sdk::trace::Decision;
-using opentelemetry::sdk::trace::ParentBasedSampler;
-namespace trace_api = opentelemetry::trace;
-
-TEST(ParentBasedSampler, ShouldSample)
-{
-  ParentBasedSampler sampler_off(std::make_shared<AlwaysOffSampler>());
-  ParentBasedSampler sampler_on(std::make_shared<AlwaysOnSampler>());
-
-  // Set up parameters
-  uint8_t trace_id_buffer[trace_api::TraceId::kSize] = {1};
-  trace_api::TraceId trace_id{trace_id_buffer};
-  uint8_t span_id_buffer[trace_api::SpanId::kSize] = {1};
-  trace_api::SpanId span_id{span_id_buffer};
-
-  trace_api::SpanKind span_kind = trace_api::SpanKind::kInternal;
-  using M                       = std::map<std::string, int>;
-  M m1                          = {{}};
-
-  using L = std::vector<std::pair<trace_api::SpanContext, std::map<std::string, std::string>>>;
-  L l1 = {{trace_api::SpanContext(false, false), {}}, {trace_api::SpanContext(false, false), {}}};
-
-  opentelemetry::common::KeyValueIterableView<M> view{m1};
-  trace_api::SpanContextKeyValueIterableView<L> links{l1};
-  auto trace_state = trace_api::TraceState::FromHeader("congo=t61rcWkgMzE");
-  trace_api::SpanContext parent_context_sampled(trace_id, span_id, trace_api::TraceFlags{1}, false,
-                                                trace_state);
-  trace_api::SpanContext parent_context_nonsampled(trace_id, span_id, trace_api::TraceFlags{0},
-                                                   false, trace_state);
-
-  // Case 1: Parent doesn't exist. Return result of delegateSampler()
-  auto sampling_result  = sampler_off.ShouldSample(trace_api::SpanContext::GetInvalid(), trace_id,
-                                                   "", span_kind, view, links);
-  auto sampling_result2 = sampler_on.ShouldSample(trace_api::SpanContext::GetInvalid(), trace_id,
-                                                  "", span_kind, view, links);
-
-  ASSERT_EQ(Decision::DROP, sampling_result.decision);
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result2.decision);
-  ASSERT_EQ("", sampling_result.trace_state->ToHeader());
-  ASSERT_EQ("", sampling_result2.trace_state->ToHeader());
-
-  // Case 2: Parent exists and SampledFlag is true
-  auto sampling_result3 =
-      sampler_off.ShouldSample(parent_context_sampled, trace_id, "", span_kind, view, links);
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result3.decision);
-  ASSERT_EQ("congo=t61rcWkgMzE", sampling_result3.trace_state->ToHeader());
-
-  // Case 3: Parent exists and SampledFlag is false
-  auto sampling_result4 =
-      sampler_on.ShouldSample(parent_context_nonsampled, trace_id, "", span_kind, view, links);
-  ASSERT_EQ(Decision::DROP, sampling_result4.decision);
-  ASSERT_EQ("congo=t61rcWkgMzE", sampling_result4.trace_state->ToHeader());
-}
-
-TEST(ParentBasedSampler, GetDescription)
-{
-  ParentBasedSampler sampler(std::make_shared<AlwaysOffSampler>());
-  ASSERT_EQ("ParentBased{AlwaysOffSampler}", sampler.GetDescription());
-  ParentBasedSampler sampler2(std::make_shared<AlwaysOnSampler>());
-  ASSERT_EQ("ParentBased{AlwaysOnSampler}", sampler2.GetDescription());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/sampler_benchmark.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/sampler_benchmark.cc
deleted file mode 100644
index 196a00fb1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/sampler_benchmark.cc
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <benchmark/benchmark.h>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context_value.h"  // IWYU pragma: keep
-#include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_off.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-#include "opentelemetry/sdk/trace/samplers/parent.h"
-#include "opentelemetry/sdk/trace/samplers/trace_id_ratio.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/tracer.h"
-
-using namespace opentelemetry::sdk::trace;
-using opentelemetry::exporter::memory::InMemorySpanExporter;
-using opentelemetry::trace::SpanContext;
-
-namespace
-{
-// Sampler constructor used as a baseline to compare with other samplers
-void BM_AlwaysOffSamplerConstruction(benchmark::State &state)
-{
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(AlwaysOffSampler());
-  }
-}
-BENCHMARK(BM_AlwaysOffSamplerConstruction);
-
-// Sampler constructor used as a baseline to compare with other samplers
-void BM_AlwaysOnSamplerConstruction(benchmark::State &state)
-{
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(AlwaysOnSampler());
-  }
-}
-BENCHMARK(BM_AlwaysOnSamplerConstruction);
-
-/*
-  Fails to build with GCC.
-  See upstream bug: https://github.com/google/benchmark/issues/1675
-*/
-#if 0
-void BM_ParentBasedSamplerConstruction(benchmark::State &state)
-{
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(ParentBasedSampler(std::make_shared<AlwaysOnSampler>()));
-  }
-}
-BENCHMARK(BM_ParentBasedSamplerConstruction);
-
-void BM_TraceIdRatioBasedSamplerConstruction(benchmark::State &state)
-{
-  while (state.KeepRunning())
-  {
-    benchmark::DoNotOptimize(TraceIdRatioBasedSampler(0.01));
-  }
-}
-BENCHMARK(BM_TraceIdRatioBasedSamplerConstruction);
-#endif
-
-// Sampler Helper Function
-void BenchmarkShouldSampler(Sampler &sampler, benchmark::State &state)
-{
-  opentelemetry::trace::TraceId trace_id;
-  opentelemetry::trace::SpanKind span_kind = opentelemetry::trace::SpanKind::kInternal;
-
-  using M = std::map<std::string, int>;
-  M m1    = {{}};
-
-  using L =
-      std::vector<std::pair<opentelemetry::trace::SpanContext, std::map<std::string, std::string>>>;
-  L l1 = {{opentelemetry::trace::SpanContext(false, false), {}},
-          {opentelemetry::trace::SpanContext(false, false), {}}};
-
-  opentelemetry::common::KeyValueIterableView<M> view{m1};
-  opentelemetry::trace::SpanContextKeyValueIterableView<L> links{l1};
-
-  while (state.KeepRunning())
-  {
-    auto invalid_ctx = SpanContext::GetInvalid();
-    benchmark::DoNotOptimize(
-        sampler.ShouldSample(invalid_ctx, trace_id, "", span_kind, view, links));
-  }
-}
-
-// Sampler used as a baseline to compare with other samplers
-void BM_AlwaysOffSamplerShouldSample(benchmark::State &state)
-{
-  AlwaysOffSampler sampler;
-
-  BenchmarkShouldSampler(sampler, state);
-}
-BENCHMARK(BM_AlwaysOffSamplerShouldSample);
-
-// Sampler used as a baseline to compare with other samplers
-void BM_AlwaysOnSamplerShouldSample(benchmark::State &state)
-{
-  AlwaysOnSampler sampler;
-
-  BenchmarkShouldSampler(sampler, state);
-}
-BENCHMARK(BM_AlwaysOnSamplerShouldSample);
-
-void BM_ParentBasedSamplerShouldSample(benchmark::State &state)
-{
-  ParentBasedSampler sampler(std::make_shared<AlwaysOnSampler>());
-
-  BenchmarkShouldSampler(sampler, state);
-}
-BENCHMARK(BM_ParentBasedSamplerShouldSample);
-
-void BM_TraceIdRatioBasedSamplerShouldSample(benchmark::State &state)
-{
-  TraceIdRatioBasedSampler sampler(0.01);
-
-  BenchmarkShouldSampler(sampler, state);
-}
-BENCHMARK(BM_TraceIdRatioBasedSamplerShouldSample);
-
-// Sampler Helper Function
-void BenchmarkSpanCreation(std::unique_ptr<Sampler> &&sampler, benchmark::State &state)
-{
-  std::unique_ptr<SpanExporter> exporter(new InMemorySpanExporter());
-  std::unique_ptr<SpanProcessor> processor(new SimpleSpanProcessor(std::move(exporter)));
-  std::vector<std::unique_ptr<SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  auto resource = opentelemetry::sdk::resource::Resource::Create({});
-  auto context =
-      std::make_shared<TracerContext>(std::move(processors), resource, std::move(sampler));
-  auto tracer = std::shared_ptr<opentelemetry::trace::Tracer>(new Tracer(context));
-
-  while (state.KeepRunning())
-  {
-    auto span = tracer->StartSpan("span");
-
-    span->SetAttribute("attr1", 3.1);
-
-    span->End();
-  }
-}
-
-// Test to measure performance for span creation
-void BM_SpanCreation(benchmark::State &state)
-{
-  std::unique_ptr<Sampler> sampler(new AlwaysOnSampler());
-  BenchmarkSpanCreation(std::move(sampler), state);
-}
-BENCHMARK(BM_SpanCreation);
-
-// Test to measure performance overhead for no-op span creation
-void BM_NoopSpanCreation(benchmark::State &state)
-{
-  std::unique_ptr<Sampler> sampler(new AlwaysOffSampler());
-  BenchmarkSpanCreation(std::move(sampler), state);
-}
-BENCHMARK(BM_NoopSpanCreation);
-
-}  // namespace
-BENCHMARK_MAIN();
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/simple_processor_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/simple_processor_test.cc
deleted file mode 100644
index d0c840fc5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/simple_processor_test.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <chrono>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/exporters/memory/in_memory_span_data.h"
-#include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/common/exporter_utils.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/recordable.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/trace/span_context.h"
-
-using namespace opentelemetry::sdk::trace;
-using namespace opentelemetry::sdk::common;
-using opentelemetry::exporter::memory::InMemorySpanData;
-using opentelemetry::exporter::memory::InMemorySpanExporter;
-using opentelemetry::trace::SpanContext;
-
-TEST(SimpleProcessor, ToInMemorySpanExporter)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  SimpleSpanProcessor processor(std::unique_ptr<SpanExporter>{exporter});
-
-  auto recordable = processor.MakeRecordable();
-
-  processor.OnStart(*recordable, SpanContext::GetInvalid());
-
-  ASSERT_EQ(0, span_data->GetSpans().size());
-
-  processor.OnEnd(std::move(recordable));
-
-  ASSERT_EQ(1, span_data->GetSpans().size());
-
-  EXPECT_TRUE(processor.Shutdown());
-}
-
-// An exporter that does nothing but record (and give back ) the # of times Shutdown was called.
-class RecordShutdownExporter final : public SpanExporter
-{
-public:
-  RecordShutdownExporter(int *force_flush_counter, int *shutdown_counter)
-      : force_flush_counter_(force_flush_counter), shutdown_counter_(shutdown_counter)
-  {}
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<Recordable>(new SpanData());
-  }
-
-  ExportResult Export(const opentelemetry::nostd::span<std::unique_ptr<Recordable>>
-                          & /* recordables */) noexcept override
-  {
-    return ExportResult::kSuccess;
-  }
-
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    *force_flush_counter_ += 1;
-    return true;
-  }
-
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override
-  {
-    *shutdown_counter_ += 1;
-    return true;
-  }
-
-private:
-  int *force_flush_counter_;
-  int *shutdown_counter_;
-};
-
-TEST(SimpleSpanProcessor, ShutdownCalledOnce)
-{
-  int force_flush                  = 0;
-  int shutdowns                    = 0;
-  RecordShutdownExporter *exporter = new RecordShutdownExporter(&force_flush, &shutdowns);
-  SimpleSpanProcessor processor(std::unique_ptr<SpanExporter>{exporter});
-  EXPECT_EQ(0, shutdowns);
-  processor.Shutdown();
-  EXPECT_EQ(1, shutdowns);
-  processor.Shutdown();
-  EXPECT_EQ(1, shutdowns);
-
-  EXPECT_EQ(0, force_flush);
-}
-
-TEST(SimpleSpanProcessor, ForceFlush)
-{
-  int force_flush                  = 0;
-  int shutdowns                    = 0;
-  RecordShutdownExporter *exporter = new RecordShutdownExporter(&force_flush, &shutdowns);
-  SimpleSpanProcessor processor(std::unique_ptr<SpanExporter>{exporter});
-  processor.ForceFlush();
-  EXPECT_EQ(0, shutdowns);
-  EXPECT_EQ(1, force_flush);
-  processor.ForceFlush();
-  EXPECT_EQ(2, force_flush);
-}
-
-// An exporter that does nothing but record (and give back ) the # of times Shutdown was called.
-class FailShutDownForceFlushExporter final : public SpanExporter
-{
-public:
-  FailShutDownForceFlushExporter() {}
-
-  std::unique_ptr<Recordable> MakeRecordable() noexcept override
-  {
-    return std::unique_ptr<Recordable>(new SpanData());
-  }
-
-  ExportResult Export(const opentelemetry::nostd::span<std::unique_ptr<Recordable>>
-                          & /* recordables */) noexcept override
-  {
-    return ExportResult::kSuccess;
-  }
-
-  bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return false; }
-
-  bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override { return false; }
-};
-
-TEST(SimpleSpanProcessor, ShutdownFail)
-{
-  SimpleSpanProcessor processor(
-      std::unique_ptr<SpanExporter>{new FailShutDownForceFlushExporter()});
-  EXPECT_EQ(false, processor.Shutdown());
-}
-
-TEST(SimpleSpanProcessor, ForceFlushFail)
-{
-  SimpleSpanProcessor processor(
-      std::unique_ptr<SpanExporter>{new FailShutDownForceFlushExporter()});
-  EXPECT_EQ(false, processor.ForceFlush());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/span_data_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/span_data_test.cc
deleted file mode 100644
index 99b8e3164..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/span_data_test.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <chrono>
-#include <cstdint>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-
-using opentelemetry::sdk::trace::SpanData;
-namespace trace_api = opentelemetry::trace;
-namespace common    = opentelemetry::common;
-
-TEST(SpanData, DefaultValues)
-{
-  trace_api::SpanContext empty_span_context{false, false};
-  trace_api::SpanId zero_span_id;
-  SpanData data;
-
-  ASSERT_EQ(data.GetTraceId(), empty_span_context.trace_id());
-  ASSERT_EQ(data.GetSpanId(), empty_span_context.span_id());
-  ASSERT_EQ(data.GetSpanContext(), empty_span_context);
-  ASSERT_EQ(data.GetParentSpanId(), zero_span_id);
-  ASSERT_EQ(data.GetName(), "");
-  ASSERT_EQ(data.GetStatus(), trace_api::StatusCode::kUnset);
-  ASSERT_EQ(data.GetDescription(), "");
-  ASSERT_EQ(data.GetStartTime().time_since_epoch(), std::chrono::nanoseconds(0));
-  ASSERT_EQ(data.GetDuration(), std::chrono::nanoseconds(0));
-  ASSERT_EQ(data.GetAttributes().size(), 0);
-  ASSERT_EQ(data.GetEvents().size(), 0);
-}
-
-TEST(SpanData, Set)
-{
-  constexpr uint8_t trace_id_buf[]       = {1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t span_id_buf[]        = {1, 2, 3, 4, 5, 6, 7, 8};
-  constexpr uint8_t parent_span_id_buf[] = {8, 7, 6, 5, 4, 3, 2, 1};
-  trace_api::TraceId trace_id{trace_id_buf};
-  trace_api::SpanId span_id{span_id_buf};
-  trace_api::SpanId parent_span_id{parent_span_id_buf};
-  const auto trace_state = trace_api::TraceState::GetDefault()->Set("key1", "value");
-  const trace_api::SpanContext span_context{
-      trace_id, span_id, trace_api::TraceFlags{trace_api::TraceFlags::kIsSampled}, true,
-      trace_state};
-  common::SystemTimestamp now(std::chrono::system_clock::now());
-
-  SpanData data;
-  data.SetIdentity(span_context, parent_span_id);
-  data.SetName("span name");
-  data.SetSpanKind(trace_api::SpanKind::kServer);
-  data.SetStatus(trace_api::StatusCode::kOk, "description");
-  data.SetStartTime(now);
-  data.SetDuration(std::chrono::nanoseconds(1000000));
-  data.SetAttribute("attr1", static_cast<int64_t>(314159));
-  data.AddEvent("event1", now);
-
-  ASSERT_EQ(data.GetTraceId(), trace_id);
-  ASSERT_EQ(data.GetSpanId(), span_id);
-  ASSERT_EQ(data.GetSpanContext(), span_context);
-  std::string trace_state_key1_value;
-  ASSERT_EQ(data.GetSpanContext().trace_state()->Get("key1", trace_state_key1_value), true);
-  ASSERT_EQ(trace_state_key1_value, "value");
-  ASSERT_EQ(data.GetParentSpanId(), parent_span_id);
-  ASSERT_EQ(data.GetName(), "span name");
-  ASSERT_EQ(data.GetSpanKind(), trace_api::SpanKind::kServer);
-  ASSERT_EQ(data.GetStatus(), trace_api::StatusCode::kOk);
-  ASSERT_EQ(data.GetDescription(), "description");
-  ASSERT_EQ(data.GetStartTime().time_since_epoch(), now.time_since_epoch());
-  ASSERT_EQ(data.GetDuration(), std::chrono::nanoseconds(1000000));
-  ASSERT_EQ(opentelemetry::nostd::get<int64_t>(data.GetAttributes().at("attr1")), 314159);
-  ASSERT_EQ(data.GetEvents().at(0).GetName(), "event1");
-  ASSERT_EQ(data.GetEvents().at(0).GetTimestamp(), now);
-}
-
-TEST(SpanData, EventAttributes)
-{
-  SpanData data;
-  const int kNumAttributes                  = 3;
-  std::string keys[kNumAttributes]          = {"attr1", "attr2", "attr3"};
-  int64_t values[kNumAttributes]            = {3, 5, 20};
-  std::map<std::string, int64_t> attributes = {
-      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
-
-  data.AddEvent("Test Event", std::chrono::system_clock::now(),
-                common::KeyValueIterableView<std::map<std::string, int64_t>>(attributes));
-
-  for (int i = 0; i < kNumAttributes; i++)
-  {
-    EXPECT_EQ(
-        opentelemetry::nostd::get<int64_t>(data.GetEvents().at(0).GetAttributes().at(keys[i])),
-        values[i]);
-  }
-}
-
-TEST(SpanData, Resources)
-{
-  SpanData data;
-  auto resource          = opentelemetry::sdk::resource::Resource::Create({});
-  const auto &input_attr = resource.GetAttributes();
-  data.SetResource(resource);
-  auto output_attr = data.GetResource().GetAttributes();
-  EXPECT_EQ(input_attr, output_attr);
-}
-
-TEST(SpanData, Links)
-{
-  SpanData data;
-  const int kNumAttributes                  = 3;
-  std::string keys[kNumAttributes]          = {"attr1", "attr2", "attr3"};
-  int64_t values[kNumAttributes]            = {4, 12, 33};
-  std::map<std::string, int64_t> attributes = {
-      {keys[0], values[0]}, {keys[1], values[1]}, {keys[2], values[2]}};
-
-  // produce valid SpanContext with pseudo span and trace Id.
-  uint8_t span_id_buf[trace_api::SpanId::kSize] = {
-      1,
-  };
-  trace_api::SpanId span_id{span_id_buf};
-  uint8_t trace_id_buf[trace_api::TraceId::kSize] = {
-      2,
-  };
-  trace_api::TraceId trace_id{trace_id_buf};
-  const auto span_context = trace_api::SpanContext(
-      trace_id, span_id, trace_api::TraceFlags{trace_api::TraceFlags::kIsSampled}, true);
-
-  data.AddLink(span_context,
-               common::KeyValueIterableView<std::map<std::string, int64_t>>(attributes));
-
-  EXPECT_EQ(data.GetLinks().at(0).GetSpanContext(), span_context);
-  for (int i = 0; i < kNumAttributes; i++)
-  {
-    EXPECT_EQ(opentelemetry::nostd::get<int64_t>(data.GetLinks().at(0).GetAttributes().at(keys[i])),
-              values[i]);
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/trace_id_ratio_sampler_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/trace_id_ratio_sampler_test.cc
deleted file mode 100644
index 97beb5c05..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/trace_id_ratio_sampler_test.cc
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/trace_id_ratio.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "src/common/random.h"
-
-using opentelemetry::sdk::common::Random;
-using opentelemetry::sdk::trace::Decision;
-using opentelemetry::sdk::trace::TraceIdRatioBasedSampler;
-namespace trace_api = opentelemetry::trace;
-namespace common    = opentelemetry::common;
-
-namespace
-{
-/*
- * Helper function for running TraceIdBased sampler tests.
- * Given a span context, sampler, and number of iterations this function
- * will return the number of RECORD_AND_SAMPLE decision based on randomly
- * generated traces.
- *
- * @param context a required valid span context
- * @param sampler a required valid sampler
- * @param iterations a required number specifying the number of times to
- * generate a random trace_id and check if it should sample using the provided
- * provider and context
- */
-int RunShouldSampleCountDecision(trace_api::SpanContext &context,
-                                 TraceIdRatioBasedSampler &sampler,
-                                 int iterations)
-{
-  int actual_count = 0;
-
-  trace_api::SpanKind span_kind = trace_api::SpanKind::kInternal;
-
-  using M = std::map<std::string, int>;
-  M m1    = {{}};
-
-  using L = std::vector<std::pair<trace_api::SpanContext, std::map<std::string, std::string>>>;
-  L l1 = {{trace_api::SpanContext(false, false), {}}, {trace_api::SpanContext(false, false), {}}};
-
-  common::KeyValueIterableView<M> view{m1};
-  trace_api::SpanContextKeyValueIterableView<L> links{l1};
-
-  for (int i = 0; i < iterations; ++i)
-  {
-    uint8_t buf[16] = {0};
-    Random::GenerateRandomBuffer(buf);
-
-    trace_api::TraceId trace_id(buf);
-
-    auto result = sampler.ShouldSample(context, trace_id, "", span_kind, view, links);
-    if (result.decision == Decision::RECORD_AND_SAMPLE)
-    {
-      ++actual_count;
-    }
-  }
-
-  return actual_count;
-}
-}  // namespace
-
-TEST(TraceIdRatioBasedSampler, ShouldSampleWithoutContext)
-{
-  trace_api::TraceId invalid_trace_id;
-
-  trace_api::SpanKind span_kind = trace_api::SpanKind::kInternal;
-
-  using M = std::map<std::string, int>;
-  M m1    = {{}};
-
-  using L = std::vector<std::pair<trace_api::SpanContext, std::map<std::string, std::string>>>;
-  L l1 = {{trace_api::SpanContext(false, false), {}}, {trace_api::SpanContext(false, false), {}}};
-
-  common::KeyValueIterableView<M> view{m1};
-  trace_api::SpanContextKeyValueIterableView<L> links{l1};
-
-  TraceIdRatioBasedSampler s1(0.01);
-
-  auto sampling_result = s1.ShouldSample(trace_api::SpanContext::GetInvalid(), invalid_trace_id, "",
-                                         span_kind, view, links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-
-  constexpr uint8_t buf[] = {0, 0, 0, 0, 0, 0, 0, 0x80, 0, 0, 0, 0, 0, 0, 0, 0};
-  trace_api::TraceId valid_trace_id(buf);
-
-  sampling_result = s1.ShouldSample(trace_api::SpanContext::GetInvalid(), valid_trace_id, "",
-                                    span_kind, view, links);
-
-  ASSERT_EQ(Decision::DROP, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-
-  TraceIdRatioBasedSampler s2(0.50000001);
-
-  sampling_result = s2.ShouldSample(trace_api::SpanContext::GetInvalid(), valid_trace_id, "",
-                                    span_kind, view, links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-
-  TraceIdRatioBasedSampler s3(0.49999999);
-
-  sampling_result = s3.ShouldSample(trace_api::SpanContext::GetInvalid(), valid_trace_id, "",
-                                    span_kind, view, links);
-
-  ASSERT_EQ(Decision::DROP, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-
-  TraceIdRatioBasedSampler s4(0.50000000);
-
-  sampling_result = s4.ShouldSample(trace_api::SpanContext::GetInvalid(), valid_trace_id, "",
-                                    span_kind, view, links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-}
-
-TEST(TraceIdRatioBasedSampler, ShouldSampleWithContext)
-{
-
-  uint8_t trace_id_buffer[trace_api::TraceId::kSize] = {1};
-  trace_api::TraceId trace_id{trace_id_buffer};
-  uint8_t span_id_buffer[trace_api::SpanId::kSize] = {1};
-  trace_api::SpanId span_id{span_id_buffer};
-
-  trace_api::SpanKind span_kind = trace_api::SpanKind::kInternal;
-  trace_api::SpanContext c1(trace_id, span_id, trace_api::TraceFlags{0}, false);
-  trace_api::SpanContext c2(trace_id, span_id, trace_api::TraceFlags{1}, false);
-  trace_api::SpanContext c3(trace_id, span_id, trace_api::TraceFlags{0}, true);
-  trace_api::SpanContext c4(trace_id, span_id, trace_api::TraceFlags{1}, true);
-
-  using M = std::map<std::string, int>;
-  M m1    = {{}};
-
-  using L = std::vector<std::pair<trace_api::SpanContext, std::map<std::string, std::string>>>;
-  L l1 = {{trace_api::SpanContext(false, false), {}}, {trace_api::SpanContext(false, false), {}}};
-
-  common::KeyValueIterableView<M> view{m1};
-  trace_api::SpanContextKeyValueIterableView<L> links{l1};
-
-  TraceIdRatioBasedSampler s1(0.01);
-
-  auto sampling_result = s1.ShouldSample(c1, trace_id, "", span_kind, view, links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-
-  sampling_result = s1.ShouldSample(c2, trace_id, "", span_kind, view, links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-
-  sampling_result = s1.ShouldSample(c3, trace_id, "", span_kind, view, links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-
-  sampling_result = s1.ShouldSample(c4, trace_id, "", span_kind, view, links);
-
-  ASSERT_EQ(Decision::RECORD_AND_SAMPLE, sampling_result.decision);
-  ASSERT_EQ(nullptr, sampling_result.attributes);
-}
-
-TEST(TraceIdRatioBasedSampler, TraceIdRatioBasedSamplerHalf)
-{
-  double ratio       = 0.5;
-  int iterations     = 100000;
-  int expected_count = static_cast<int>(iterations * ratio);
-  int variance       = static_cast<int>(iterations * 0.01);
-
-  trace_api::SpanContext c(true, true);
-  TraceIdRatioBasedSampler s(ratio);
-
-  int actual_count = RunShouldSampleCountDecision(c, s, iterations);
-
-  ASSERT_TRUE(actual_count < (expected_count + variance));
-  ASSERT_TRUE(actual_count > (expected_count - variance));
-}
-
-TEST(TraceIdRatioBasedSampler, TraceIdRatioBasedSamplerOnePercent)
-{
-  double ratio       = 0.01;
-  int iterations     = 100000;
-  int expected_count = static_cast<int>(iterations * ratio);
-  int variance       = static_cast<int>(iterations * 0.01);
-
-  trace_api::SpanContext c(true, true);
-  TraceIdRatioBasedSampler s(ratio);
-
-  int actual_count = RunShouldSampleCountDecision(c, s, iterations);
-
-  ASSERT_TRUE(actual_count < (expected_count + variance));
-  ASSERT_TRUE(actual_count > (expected_count - variance));
-}
-
-TEST(TraceIdRatioBasedSampler, TraceIdRatioBasedSamplerAll)
-{
-  double ratio       = 1.0;
-  int iterations     = 100000;
-  int expected_count = static_cast<int>(iterations * ratio);
-
-  trace_api::SpanContext c(true, true);
-  TraceIdRatioBasedSampler s(ratio);
-
-  int actual_count = RunShouldSampleCountDecision(c, s, iterations);
-
-  ASSERT_EQ(actual_count, expected_count);
-}
-
-TEST(TraceIdRatioBasedSampler, TraceIdRatioBasedSamplerNone)
-{
-  double ratio       = 0.0;
-  int iterations     = 100000;
-  int expected_count = static_cast<int>(iterations * ratio);
-
-  trace_api::SpanContext c(true, true);
-  TraceIdRatioBasedSampler s(ratio);
-
-  int actual_count = RunShouldSampleCountDecision(c, s, iterations);
-
-  ASSERT_EQ(actual_count, expected_count);
-}
-
-TEST(TraceIdRatioBasedSampler, GetDescription)
-{
-  TraceIdRatioBasedSampler s1(0.01);
-  ASSERT_EQ("TraceIdRatioBasedSampler{0.010000}", s1.GetDescription());
-
-  TraceIdRatioBasedSampler s2(0.00);
-  ASSERT_EQ("TraceIdRatioBasedSampler{0.000000}", s2.GetDescription());
-
-  TraceIdRatioBasedSampler s3(1.00);
-  ASSERT_EQ("TraceIdRatioBasedSampler{1.000000}", s3.GetDescription());
-
-  TraceIdRatioBasedSampler s4(0.102030405);
-  ASSERT_EQ("TraceIdRatioBasedSampler{0.102030}", s4.GetDescription());
-
-  TraceIdRatioBasedSampler s5(3.00);
-  ASSERT_EQ("TraceIdRatioBasedSampler{1.000000}", s5.GetDescription());
-
-  TraceIdRatioBasedSampler s6(-3.00);
-  ASSERT_EQ("TraceIdRatioBasedSampler{0.000000}", s6.GetDescription());
-
-  TraceIdRatioBasedSampler s7(1.00000000001);
-  ASSERT_EQ("TraceIdRatioBasedSampler{1.000000}", s7.GetDescription());
-
-  TraceIdRatioBasedSampler s8(-1.00000000001);
-  ASSERT_EQ("TraceIdRatioBasedSampler{0.000000}", s8.GetDescription());
-
-  TraceIdRatioBasedSampler s9(0.50);
-  ASSERT_EQ("TraceIdRatioBasedSampler{0.500000}", s9.GetDescription());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_config_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_config_test.cc
deleted file mode 100644
index 27f845d54..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_config_test.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include <gtest/gtest.h>
-#include <array>
-#include <string>
-#include <utility>
-#include <vector>
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-
-namespace trace_sdk             = opentelemetry::sdk::trace;
-namespace instrumentation_scope = opentelemetry::sdk::instrumentationscope;
-
-/** Tests to verify the basic behavior of trace_sdk::TracerConfig */
-
-TEST(TracerConfig, CheckDisabledWorksAsExpected)
-{
-  trace_sdk::TracerConfig disabled_config = trace_sdk::TracerConfig::Disabled();
-  ASSERT_FALSE(disabled_config.IsEnabled());
-}
-
-TEST(TracerConfig, CheckEnabledWorksAsExpected)
-{
-  trace_sdk::TracerConfig enabled_config = trace_sdk::TracerConfig::Enabled();
-  ASSERT_TRUE(enabled_config.IsEnabled());
-}
-
-TEST(TracerConfig, CheckDefaultConfigWorksAccToSpec)
-{
-  trace_sdk::TracerConfig default_config = trace_sdk::TracerConfig::Default();
-  ASSERT_TRUE(default_config.IsEnabled());
-}
-
-/** Tests to verify the behavior of trace_sdk::TracerConfig::DefaultConfigurator */
-
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr1 = {
-    "accept_single_attr", true};
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr2 = {
-    "accept_second_attr", "some other attr"};
-static std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr3 = {
-    "accept_third_attr", 3};
-
-static instrumentation_scope::InstrumentationScope test_scope_1 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_1");
-static instrumentation_scope::InstrumentationScope test_scope_2 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_2", "1.0");
-static instrumentation_scope::InstrumentationScope test_scope_3 =
-    *instrumentation_scope::InstrumentationScope::Create(
-        "test_scope_3",
-        "0",
-        "https://opentelemetry.io/schemas/v1.18.0");
-static instrumentation_scope::InstrumentationScope test_scope_4 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_4",
-                                                         "0",
-                                                         "https://opentelemetry.io/schemas/v1.18.0",
-                                                         {attr1});
-static instrumentation_scope::InstrumentationScope test_scope_5 =
-    *instrumentation_scope::InstrumentationScope::Create("test_scope_5",
-                                                         "0",
-                                                         "https://opentelemetry.io/schemas/v1.18.0",
-                                                         {attr1, attr2, attr3});
-
-// This array could also directly contain the reference types, but that  leads to 'uninitialized
-// value was created by heap allocation' errors in Valgrind memcheck. This is a bug in Googletest
-// library, see https://github.com/google/googletest/issues/3805#issuecomment-1397301790 for more
-// details. Using pointers is a workaround to prevent the Valgrind warnings.
-const std::array<instrumentation_scope::InstrumentationScope *, 5> instrumentation_scopes = {
-    &test_scope_1, &test_scope_2, &test_scope_3, &test_scope_4, &test_scope_5,
-};
-
-// Test fixture for VerifyDefaultConfiguratorBehavior
-class DefaultTracerConfiguratorTestFixture
-    : public ::testing::TestWithParam<instrumentation_scope::InstrumentationScope *>
-{};
-
-// verifies that the default configurator always returns the default tracer config
-TEST_P(DefaultTracerConfiguratorTestFixture, VerifyDefaultConfiguratorBehavior)
-{
-  instrumentation_scope::InstrumentationScope *scope = GetParam();
-  instrumentation_scope::ScopeConfigurator<trace_sdk::TracerConfig> default_configurator =
-      instrumentation_scope::ScopeConfigurator<trace_sdk::TracerConfig>::Builder(
-          trace_sdk::TracerConfig::Default())
-          .Build();
-
-  ASSERT_EQ(default_configurator.ComputeConfig(*scope), trace_sdk::TracerConfig::Default());
-}
-
-INSTANTIATE_TEST_SUITE_P(InstrumentationScopes,
-                         DefaultTracerConfiguratorTestFixture,
-                         ::testing::ValuesIn(instrumentation_scopes));
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_provider_set_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_provider_set_test.cc
deleted file mode 100644
index d8aebe708..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_provider_set_test.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <stdlib.h>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-
-#if defined(_MSC_VER)
-#  include "opentelemetry/sdk/common/env_variables.h"
-using opentelemetry::sdk::common::setenv;
-using opentelemetry::sdk::common::unsetenv;
-#endif
-
-using opentelemetry::trace::Tracer;
-using opentelemetry::trace::TracerProvider;
-
-namespace nostd     = opentelemetry::nostd;
-namespace trace_api = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
-
-class TestProvider : public TracerProvider
-{
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<Tracer> GetTracer(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */,
-      const opentelemetry::common::KeyValueIterable * /* attributes */) noexcept override
-  {
-    return nostd::shared_ptr<Tracer>(nullptr);
-  }
-#else
-  nostd::shared_ptr<Tracer> GetTracer(nostd::string_view /* name */,
-                                      nostd::string_view /* version */,
-                                      nostd::string_view /* schema_url */) noexcept override
-  {
-    return nostd::shared_ptr<Tracer>(nullptr);
-  }
-#endif
-};
-
-TEST(Provider, SetTracerProviderDefault)
-{
-#ifndef NO_GETENV
-  unsetenv("OTEL_SDK_DISABLED");
-#endif
-
-  auto tf = nostd::shared_ptr<TracerProvider>(new TestProvider());
-  trace_sdk::Provider::SetTracerProvider(tf);
-  ASSERT_EQ(tf, trace_api::Provider::GetTracerProvider());
-}
-
-#ifndef NO_GETENV
-TEST(Provider, SetTracerProviderEnabled)
-{
-  setenv("OTEL_SDK_DISABLED", "false", 1);
-
-  auto tf = nostd::shared_ptr<TracerProvider>(new TestProvider());
-  trace_sdk::Provider::SetTracerProvider(tf);
-  ASSERT_EQ(tf, trace_api::Provider::GetTracerProvider());
-
-  unsetenv("OTEL_SDK_DISABLED");
-}
-
-TEST(Provider, SetTracerProviderDisabled)
-{
-  setenv("OTEL_SDK_DISABLED", "true", 1);
-
-  auto tf = nostd::shared_ptr<TracerProvider>(new TestProvider());
-  trace_sdk::Provider::SetTracerProvider(tf);
-  ASSERT_NE(tf, trace_api::Provider::GetTracerProvider());
-
-  unsetenv("OTEL_SDK_DISABLED");
-}
-#endif
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_provider_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_provider_test.cc
deleted file mode 100644
index 98a64fc02..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_provider_test.cc
+++ /dev/null
@@ -1,334 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/random_id_generator.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_off.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
-#include "opentelemetry/trace/tracer.h"
-
-using namespace opentelemetry::sdk::trace;
-using namespace opentelemetry::sdk::resource;
-
-TEST(TracerProvider, GetTracer)
-{
-  std::unique_ptr<SpanProcessor> processor(new SimpleSpanProcessor(nullptr));
-  std::vector<std::unique_ptr<SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  std::unique_ptr<TracerContext> context1(
-      new TracerContext(std::move(processors), Resource::Create({})));
-  TracerProvider tp1(std::move(context1));
-  auto t1 = tp1.GetTracer("test");
-  auto t2 = tp1.GetTracer("test");
-  auto t3 = tp1.GetTracer("different", "1.0.0");
-  auto t4 = tp1.GetTracer("");
-  auto t5 = tp1.GetTracer(opentelemetry::nostd::string_view{});
-  auto t6 = tp1.GetTracer("different", "1.0.0", "https://opentelemetry.io/schemas/1.2.0");
-  ASSERT_NE(nullptr, t1);
-  ASSERT_NE(nullptr, t2);
-  ASSERT_NE(nullptr, t3);
-  ASSERT_NE(nullptr, t6);
-
-  // Should return the same instance each time.
-  ASSERT_EQ(t1, t2);
-  ASSERT_NE(t1, t3);
-  ASSERT_EQ(t4, t5);
-  ASSERT_NE(t3, t6);
-
-  // Should be an sdk::trace::Tracer with the processor attached.
-#ifdef OPENTELEMETRY_RTTI_ENABLED
-  auto sdkTracer1 = dynamic_cast<Tracer *>(t1.get());
-#else
-  auto sdkTracer1 = static_cast<Tracer *>(t1.get());
-#endif
-  ASSERT_NE(nullptr, sdkTracer1);
-  ASSERT_EQ("AlwaysOnSampler", sdkTracer1->GetSampler().GetDescription());
-  std::unique_ptr<SpanProcessor> processor2(new SimpleSpanProcessor(nullptr));
-  std::vector<std::unique_ptr<SpanProcessor>> processors2;
-  processors2.push_back(std::move(processor2));
-  std::unique_ptr<TracerContext> context2(
-      new TracerContext(std::move(processors2), Resource::Create({}),
-                        std::unique_ptr<Sampler>(new AlwaysOffSampler()),
-                        std::unique_ptr<IdGenerator>(new RandomIdGenerator)));
-  TracerProvider tp2(std::move(context2));
-#ifdef OPENTELEMETRY_RTTI_ENABLED
-  auto sdkTracer2 = dynamic_cast<Tracer *>(tp2.GetTracer("test").get());
-#else
-  auto sdkTracer2 = static_cast<Tracer *>(tp2.GetTracer("test").get());
-#endif
-  ASSERT_EQ("AlwaysOffSampler", sdkTracer2->GetSampler().GetDescription());
-
-  auto instrumentation_scope1 = sdkTracer1->GetInstrumentationScope();
-  ASSERT_EQ(instrumentation_scope1.GetName(), "test");
-  ASSERT_EQ(instrumentation_scope1.GetVersion(), "");
-
-  // Should be an sdk::trace::Tracer with the processor attached.
-#ifdef OPENTELEMETRY_RTTI_ENABLED
-  auto sdkTracer3 = dynamic_cast<Tracer *>(t3.get());
-#else
-  auto sdkTracer3 = static_cast<Tracer *>(t3.get());
-#endif
-  auto instrumentation_scope3 = sdkTracer3->GetInstrumentationScope();
-  ASSERT_EQ(instrumentation_scope3.GetName(), "different");
-  ASSERT_EQ(instrumentation_scope3.GetVersion(), "1.0.0");
-}
-
-TEST(TracerProvider, GetTracerEqualityCheck)
-{
-  auto processor = SimpleSpanProcessorFactory::Create(nullptr);
-  auto provider  = TracerProviderFactory::Create(std::move(processor));
-
-  // providing the same scope names should return the same tracer
-  auto tracer_1a = provider->GetTracer("library_name");
-  auto tracer_1b = provider->GetTracer("library_name");
-  EXPECT_EQ(tracer_1a, tracer_1b);
-
-  // providing the same scope name and version should return the same tracer
-  auto tracer_version1a = provider->GetTracer("library_name", "v1.0");
-  auto tracer_version1b = provider->GetTracer("library_name", "v1.0");
-  EXPECT_EQ(tracer_version1a, tracer_version1b);
-
-  // providing the same name, version, and schema urls should return the same tracer
-  auto tracer_urla = provider->GetTracer("library_name", "v1.0", "url");
-  auto tracer_urlb = provider->GetTracer("library_name", "v1.0", "url");
-  EXPECT_EQ(tracer_urla, tracer_urlb);
-}
-
-TEST(TracerProvider, GetTracerInequalityCheck)
-{
-  auto processor = SimpleSpanProcessorFactory::Create(nullptr);
-  auto provider  = TracerProviderFactory::Create(std::move(processor));
-
-  auto tracer_library_1 = provider->GetTracer("library_1");
-  auto tracer_library_2 = provider->GetTracer("library_2");
-  auto tracer_version_1 = provider->GetTracer("library_1", "v1.0");
-  auto tracer_version_2 = provider->GetTracer("library_1", "v2.0");
-  auto tracer_url_1     = provider->GetTracer("library_1", "v1.0", "url_1");
-  auto tracer_url_2     = provider->GetTracer("library_1", "v1.0", "url_2");
-
-  // different scope names should return distinct tracers
-  EXPECT_NE(tracer_library_1, tracer_library_2);
-
-  // different scope versions should return distinct tracers
-  EXPECT_NE(tracer_version_1, tracer_library_1);
-  EXPECT_NE(tracer_version_1, tracer_version_2);
-
-  // different scope schema urls should return distinct tracers
-  EXPECT_NE(tracer_url_1, tracer_library_1);
-  EXPECT_NE(tracer_url_1, tracer_version_1);
-  EXPECT_NE(tracer_url_1, tracer_url_2);
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-TEST(TracerProvider, GetTracerEqualityCheckAbiv2)
-{
-  auto processor = SimpleSpanProcessorFactory::Create(nullptr);
-  auto provider  = TracerProviderFactory::Create(std::move(processor));
-
-  auto tracer_attribute1a = provider->GetTracer("library_name", "v1.0", "url", {{"key", "one"}});
-  auto tracer_attribute1b = provider->GetTracer("library_name", "v1.0", "url", {{"key", "one"}});
-
-  // providing the same name, version, schema url and attributes should return the same tracer
-  EXPECT_EQ(tracer_attribute1a, tracer_attribute1b);
-}
-
-TEST(TracerProvider, GetTracerInequalityCheckAbiv2)
-{
-  auto processor = SimpleSpanProcessorFactory::Create(nullptr);
-  auto provider  = TracerProviderFactory::Create(std::move(processor));
-
-  auto tracer_1          = provider->GetTracer("library_name", "v1.0", "url");
-  auto tracer_attribute1 = provider->GetTracer("library_name", "v1.0", "url", {{"key", "one"}});
-  auto tracer_attribute2 = provider->GetTracer("library_name", "v1.0", "url", {{"key", "two"}});
-
-  // different scope attributes should return distinct tracers
-  EXPECT_NE(tracer_attribute1, tracer_1);
-  EXPECT_NE(tracer_attribute1, tracer_attribute2);
-}
-
-TEST(TracerProvider, GetTracerAbiv2)
-{
-  std::unique_ptr<SpanProcessor> processor(new SimpleSpanProcessor(nullptr));
-  std::vector<std::unique_ptr<SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  std::unique_ptr<TracerContext> context1(
-      new TracerContext(std::move(processors), Resource::Create({})));
-  TracerProvider tp(std::move(context1));
-
-  auto t1 = tp.GetTracer("name1", "version1", "url1");
-  ASSERT_NE(nullptr, t1);
-
-  auto t2 = tp.GetTracer("name2", "version2", "url2", nullptr);
-  ASSERT_NE(nullptr, t2);
-
-  auto t3 = tp.GetTracer("name3", "version3", "url3", {{"accept_single_attr", true}});
-  ASSERT_NE(nullptr, t3);
-  {
-    auto tracer = static_cast<opentelemetry::sdk::trace::Tracer *>(t3.get());
-    auto scope  = tracer->GetInstrumentationScope();
-    auto attrs  = scope.GetAttributes();
-    ASSERT_EQ(attrs.size(), 1);
-    auto attr = attrs.find("accept_single_attr");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<bool>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<bool>(attr->second), true);
-  }
-
-  std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> attr4 = {
-      "accept_single_attr", true};
-  auto t4 = tp.GetTracer("name4", "version4", "url4", {attr4});
-  ASSERT_NE(nullptr, t4);
-  {
-    auto tracer = static_cast<opentelemetry::sdk::trace::Tracer *>(t4.get());
-    auto scope  = tracer->GetInstrumentationScope();
-    auto attrs  = scope.GetAttributes();
-    ASSERT_EQ(attrs.size(), 1);
-    auto attr = attrs.find("accept_single_attr");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<bool>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<bool>(attr->second), true);
-  }
-
-  auto t5 = tp.GetTracer("name5", "version5", "url5", {{"foo", "1"}, {"bar", "2"}});
-  ASSERT_NE(nullptr, t5);
-  {
-    auto tracer = static_cast<opentelemetry::sdk::trace::Tracer *>(t5.get());
-    auto scope  = tracer->GetInstrumentationScope();
-    auto attrs  = scope.GetAttributes();
-    ASSERT_EQ(attrs.size(), 2);
-    auto attr = attrs.find("bar");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<std::string>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<std::string>(attr->second), "2");
-  }
-
-  std::initializer_list<
-      std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue>>
-      attrs6 = {{"foo", "1"}, {"bar", 42}};
-
-  auto t6 = tp.GetTracer("name6", "version6", "url6", attrs6);
-  ASSERT_NE(nullptr, t6);
-  {
-    auto tracer = static_cast<opentelemetry::sdk::trace::Tracer *>(t6.get());
-    auto scope  = tracer->GetInstrumentationScope();
-    auto attrs  = scope.GetAttributes();
-    ASSERT_EQ(attrs.size(), 2);
-    auto attr = attrs.find("bar");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<int>(attr->second), 42);
-  }
-
-  typedef std::pair<opentelemetry::nostd::string_view, opentelemetry::common::AttributeValue> KV;
-
-  std::initializer_list<KV> attrs7 = {{"foo", 3.14}, {"bar", "2"}};
-  auto t7                          = tp.GetTracer("name7", "version7", "url7", attrs7);
-  ASSERT_NE(nullptr, t7);
-  {
-    auto tracer = static_cast<opentelemetry::sdk::trace::Tracer *>(t7.get());
-    auto scope  = tracer->GetInstrumentationScope();
-    auto attrs  = scope.GetAttributes();
-    ASSERT_EQ(attrs.size(), 2);
-    auto attr = attrs.find("foo");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<double>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<double>(attr->second), 3.14);
-  }
-
-  auto t8 = tp.GetTracer("name8", "version8", "url8",
-                         {{"a", "string"},
-                          {"b", false},
-                          {"c", 314159},
-                          {"d", static_cast<unsigned int>(314159)},
-                          {"e", static_cast<int32_t>(-20)},
-                          {"f", static_cast<uint32_t>(20)},
-                          {"g", static_cast<int64_t>(-20)},
-                          {"h", static_cast<uint64_t>(20)},
-                          {"i", 3.1},
-                          {"j", "string"}});
-  ASSERT_NE(nullptr, t8);
-  {
-    auto tracer = static_cast<opentelemetry::sdk::trace::Tracer *>(t8.get());
-    auto scope  = tracer->GetInstrumentationScope();
-    auto attrs  = scope.GetAttributes();
-    ASSERT_EQ(attrs.size(), 10);
-    auto attr = attrs.find("e");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<int32_t>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<int32_t>(attr->second), -20);
-  }
-
-  std::map<std::string, opentelemetry::common::AttributeValue> attr9{
-      {"a", "string"},
-      {"b", false},
-      {"c", 314159},
-      {"d", static_cast<unsigned int>(314159)},
-      {"e", static_cast<int32_t>(-20)},
-      {"f", static_cast<uint32_t>(20)},
-      {"g", static_cast<int64_t>(-20)},
-      {"h", static_cast<uint64_t>(20)},
-      {"i", 3.1},
-      {"j", "string"}};
-
-  auto t9 = tp.GetTracer("name9", "version9", "url9", attr9);
-  ASSERT_NE(nullptr, t9);
-  {
-    auto tracer = static_cast<opentelemetry::sdk::trace::Tracer *>(t9.get());
-    auto scope  = tracer->GetInstrumentationScope();
-    auto attrs  = scope.GetAttributes();
-    ASSERT_EQ(attrs.size(), 10);
-    auto attr = attrs.find("h");
-    ASSERT_FALSE(attr == attrs.end());
-    ASSERT_TRUE(opentelemetry::nostd::holds_alternative<uint64_t>(attr->second));
-    EXPECT_EQ(opentelemetry::nostd::get<uint64_t>(attr->second), 20);
-  }
-
-  // cleanup properly without crash
-  tp.ForceFlush();
-  tp.Shutdown();
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */
-
-TEST(TracerProvider, Shutdown)
-{
-  std::unique_ptr<SpanProcessor> processor(new SimpleSpanProcessor(nullptr));
-  std::vector<std::unique_ptr<SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-
-  std::unique_ptr<TracerContext> context1(new TracerContext(std::move(processors)));
-  TracerProvider tp1(std::move(context1));
-
-  EXPECT_TRUE(tp1.Shutdown());
-
-  // It's safe to shutdown again
-  EXPECT_TRUE(tp1.Shutdown());
-}
-
-TEST(TracerProvider, ForceFlush)
-{
-  std::unique_ptr<SpanProcessor> processor1(new SimpleSpanProcessor(nullptr));
-
-  TracerProvider tp1(std::move(processor1));
-
-  EXPECT_TRUE(tp1.ForceFlush());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_test.cc b/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_test.cc
deleted file mode 100644
index 00c92ec68..000000000
--- a/ext/opentelemetry-cpp-1.21.0/sdk/test/trace/tracer_test.cc
+++ /dev/null
@@ -1,1334 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <assert.h>
-#include <gtest/gtest.h>
-#include <algorithm>
-#include <chrono>
-#include <cstdint>
-#include <functional>
-#include <initializer_list>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/exporters/memory/in_memory_span_data.h"
-#include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/instrumentationscope/scope_configurator.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/sdk/trace/id_generator.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/random_id_generator.h"
-#include "opentelemetry/sdk/trace/sampler.h"
-#include "opentelemetry/sdk/trace/samplers/always_off.h"
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
-#include "opentelemetry/sdk/trace/samplers/parent.h"
-#include "opentelemetry/sdk/trace/simple_processor.h"
-#include "opentelemetry/sdk/trace/span_data.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-#include "opentelemetry/sdk/trace/tracer_config.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "opentelemetry/trace/tracer.h"
-
-using namespace opentelemetry::sdk::trace;
-using namespace opentelemetry::sdk::resource;
-using namespace opentelemetry::sdk::instrumentationscope;
-using opentelemetry::common::SteadyTimestamp;
-using opentelemetry::common::SystemTimestamp;
-namespace nostd     = opentelemetry::nostd;
-namespace common    = opentelemetry::common;
-namespace trace_api = opentelemetry::trace;
-using opentelemetry::exporter::memory::InMemorySpanData;
-using opentelemetry::exporter::memory::InMemorySpanExporter;
-using opentelemetry::trace::SpanContext;
-
-/**
- * A mock sampler with ShouldSample returning:
- *  Decision::RECORD_AND_SAMPLE if trace_id is valid
- *  Decision::DROP otherwise.
- */
-class MockSampler final : public Sampler
-{
-public:
-  SamplingResult ShouldSample(
-      const SpanContext & /*parent_context*/,
-      trace_api::TraceId trace_id,
-      nostd::string_view /*name*/,
-      trace_api::SpanKind /*span_kind*/,
-      const opentelemetry::common::KeyValueIterable & /*attributes*/,
-      const opentelemetry::trace::SpanContextKeyValueIterable & /*links*/) noexcept override
-  {
-    // Sample only if valid trace_id ( This is to test Sampler get's valid trace id)
-    if (trace_id.IsValid())
-    {
-      // Return two pairs of attributes. These attributes should be added to the
-      // span attributes
-      return {Decision::RECORD_AND_SAMPLE,
-              nostd::unique_ptr<const std::map<std::string, opentelemetry::common::AttributeValue>>(
-                  new const std::map<std::string, opentelemetry::common::AttributeValue>(
-                      {{"sampling_attr1", 123}, {"sampling_attr2", "string"}})),
-              nostd::shared_ptr<opentelemetry::trace::TraceState>(nullptr)};
-    }
-    else
-    {
-      // we should never reach here
-      assert(false);
-      return {Decision::DROP,
-              nostd::unique_ptr<const std::map<std::string, opentelemetry::common::AttributeValue>>(
-                  nullptr),
-              nostd::shared_ptr<opentelemetry::trace::TraceState>(nullptr)};
-    }
-  }
-
-  nostd::string_view GetDescription() const noexcept override { return "MockSampler"; }
-};
-
-/**
- * A Mock Custom ID Generator
- */
-class MockIdGenerator : public IdGenerator
-{
-public:
-  MockIdGenerator() : IdGenerator(false) {}
-
-  opentelemetry::trace::SpanId GenerateSpanId() noexcept override
-  {
-    return opentelemetry::trace::SpanId(buf_span);
-  }
-
-  opentelemetry::trace::TraceId GenerateTraceId() noexcept override
-  {
-    return opentelemetry::trace::TraceId(buf_trace);
-  }
-  uint8_t buf_span[8]   = {1, 2, 3, 4, 5, 6, 7, 8};
-  uint8_t buf_trace[16] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1};
-};
-
-namespace
-{
-std::shared_ptr<opentelemetry::trace::Tracer> initTracer(std::unique_ptr<SpanExporter> &&exporter)
-{
-  auto processor = std::unique_ptr<SpanProcessor>(new SimpleSpanProcessor(std::move(exporter)));
-  std::vector<std::unique_ptr<SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  auto context = std::make_shared<TracerContext>(std::move(processors));
-  return std::shared_ptr<opentelemetry::trace::Tracer>(new Tracer(context));
-}
-
-std::shared_ptr<opentelemetry::trace::Tracer> initTracer(
-    std::unique_ptr<SpanExporter> &&exporter,
-    // For testing, just shove a pointer over, we'll take it over.
-    Sampler *sampler,
-    IdGenerator *id_generator = new RandomIdGenerator,
-    const ScopeConfigurator<TracerConfig> &tracer_configurator =
-        ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Default()).Build(),
-    std::unique_ptr<InstrumentationScope> scope = InstrumentationScope::Create(""))
-{
-  auto processor = std::unique_ptr<SpanProcessor>(new SimpleSpanProcessor(std::move(exporter)));
-  std::vector<std::unique_ptr<SpanProcessor>> processors;
-  processors.push_back(std::move(processor));
-  auto resource = Resource::Create({});
-  auto context  = std::make_shared<TracerContext>(
-      std::move(processors), resource, std::unique_ptr<Sampler>(sampler),
-      std::unique_ptr<IdGenerator>(id_generator),
-      std::make_unique<ScopeConfigurator<TracerConfig>>(tracer_configurator));
-  return std::shared_ptr<opentelemetry::trace::Tracer>(new Tracer(context, std::move(scope)));
-}
-
-}  // namespace
-
-TEST(Tracer, ToInMemorySpanExporter)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  auto span_first  = tracer->StartSpan("span 1");
-  auto scope_first = tracer->WithActiveSpan(span_first);
-  auto span_second = tracer->StartSpan("span 2");
-
-  ASSERT_EQ(0, span_data->GetSpans().size());
-
-  span_second->End();
-
-  auto span2 = span_data->GetSpans();
-  ASSERT_EQ(1, span2.size());
-  ASSERT_EQ("span 2", span2.at(0)->GetName());
-  EXPECT_TRUE(span2.at(0)->GetTraceId().IsValid());
-  EXPECT_TRUE(span2.at(0)->GetSpanId().IsValid());
-  EXPECT_TRUE(span2.at(0)->GetParentSpanId().IsValid());
-
-  span_first->End();
-
-  auto span1 = span_data->GetSpans();
-  ASSERT_EQ(1, span1.size());
-  ASSERT_EQ("span 1", span1.at(0)->GetName());
-  EXPECT_TRUE(span1.at(0)->GetTraceId().IsValid());
-  EXPECT_TRUE(span1.at(0)->GetSpanId().IsValid());
-  EXPECT_FALSE(span1.at(0)->GetParentSpanId().IsValid());
-
-  // Verify trace and parent span id propagation
-  EXPECT_EQ(span1.at(0)->GetTraceId(), span2.at(0)->GetTraceId());
-  EXPECT_EQ(span2.at(0)->GetParentSpanId(), span1.at(0)->GetSpanId());
-}
-
-TEST(Tracer, StartSpanSampleOn)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer_on                              = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  tracer_on->StartSpan("span 1")->End();
-
-  auto spans = span_data->GetSpans();
-  ASSERT_EQ(1, spans.size());
-
-  auto &cur_span_data = spans.at(0);
-  ASSERT_LT(std::chrono::nanoseconds(0), cur_span_data->GetStartTime().time_since_epoch());
-  ASSERT_LT(std::chrono::nanoseconds(0), cur_span_data->GetDuration());
-}
-
-TEST(Tracer, StartSpanSampleOff)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer_off = initTracer(std::unique_ptr<SpanExporter>{exporter}, new AlwaysOffSampler());
-
-  // This span will not be recorded.
-  auto span = tracer_off->StartSpan("span 2");
-
-  // Always generate a valid span-context (span-id)
-  auto context = span->GetContext();
-  EXPECT_TRUE(context.IsValid());
-  EXPECT_FALSE(context.IsSampled());
-
-  span->End();
-  // The span doesn't write any span data because the sampling decision is alway
-  // DROP.
-  ASSERT_EQ(0, span_data->GetSpans().size());
-}
-
-TEST(Tracer, StartSpanCustomIdGenerator)
-{
-  IdGenerator *id_generator                   = new MockIdGenerator();
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer =
-      initTracer(std::unique_ptr<SpanExporter>{exporter}, new AlwaysOnSampler(), id_generator);
-
-  tracer->StartSpan("span 1")->End();
-  auto spans          = span_data->GetSpans();
-  auto &cur_span_data = spans.at(0);
-
-  EXPECT_EQ(cur_span_data->GetTraceId(), id_generator->GenerateTraceId());
-  EXPECT_EQ(cur_span_data->GetSpanId(), id_generator->GenerateSpanId());
-}
-
-TEST(Tracer, StartSpanWithOptionsTime)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  opentelemetry::trace::StartSpanOptions start;
-  start.start_system_time = SystemTimestamp(std::chrono::nanoseconds(300));
-  start.start_steady_time = SteadyTimestamp(std::chrono::nanoseconds(10));
-
-  opentelemetry::trace::EndSpanOptions end;
-  end.end_steady_time = SteadyTimestamp(std::chrono::nanoseconds(40));
-
-  tracer->StartSpan("span 1", start)->End(end);
-
-  auto spans = span_data->GetSpans();
-  ASSERT_EQ(1, spans.size());
-
-  auto &cur_span_data = spans.at(0);
-  ASSERT_EQ(std::chrono::nanoseconds(300), cur_span_data->GetStartTime().time_since_epoch());
-  ASSERT_EQ(std::chrono::nanoseconds(30), cur_span_data->GetDuration());
-}
-
-TEST(Tracer, StartSpanWithAttributes)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  // Start a span with all supported scalar attribute types.
-  tracer
-      ->StartSpan("span 1", {{"attr1", "string"},
-                             {"attr2", false},
-                             {"attr1", 314159},
-                             {"attr3", static_cast<unsigned int>(314159)},
-                             {"attr4", static_cast<int32_t>(-20)},
-                             {"attr5", static_cast<uint32_t>(20)},
-                             {"attr6", static_cast<int64_t>(-20)},
-                             {"attr7", static_cast<uint64_t>(20)},
-                             {"attr8", 3.1},
-                             {"attr9", "string"}})
-      ->End();
-
-  // Start a span with all supported array attribute types.
-  int listInt[]                       = {1, 2, 3};
-  unsigned int listUInt[]             = {1, 2, 3};
-  int32_t listInt32[]                 = {1, -2, 3};
-  uint32_t listUInt32[]               = {1, 2, 3};
-  int64_t listInt64[]                 = {1, -2, 3};
-  uint64_t listUInt64[]               = {1, 2, 3};
-  double listDouble[]                 = {1.1, 2.1, 3.1};
-  bool listBool[]                     = {true, false};
-  nostd::string_view listStringView[] = {"a", "b"};
-  std::map<std::string, common::AttributeValue> m;
-  m["attr1"] = nostd::span<int>(listInt);
-  m["attr2"] = nostd::span<unsigned int>(listUInt);
-  m["attr3"] = nostd::span<int32_t>(listInt32);
-  m["attr4"] = nostd::span<uint32_t>(listUInt32);
-  m["attr5"] = nostd::span<int64_t>(listInt64);
-  m["attr6"] = nostd::span<uint64_t>(listUInt64);
-  m["attr7"] = nostd::span<double>(listDouble);
-  m["attr8"] = nostd::span<bool>(listBool);
-  m["attr9"] = nostd::span<nostd::string_view>(listStringView);
-
-  tracer->StartSpan("span 2", m)->End();
-
-  auto spans = span_data->GetSpans();
-  ASSERT_EQ(2, spans.size());
-
-  auto &cur_span_data = spans.at(0);
-  ASSERT_EQ(9, cur_span_data->GetAttributes().size());
-  ASSERT_EQ(314159, nostd::get<int32_t>(cur_span_data->GetAttributes().at("attr1")));
-  ASSERT_EQ(false, nostd::get<bool>(cur_span_data->GetAttributes().at("attr2")));
-  ASSERT_EQ(static_cast<uint32_t>(314159),
-            nostd::get<uint32_t>(cur_span_data->GetAttributes().at("attr3")));
-  ASSERT_EQ(-20, nostd::get<int32_t>(cur_span_data->GetAttributes().at("attr4")));
-  ASSERT_EQ(static_cast<uint32_t>(20),
-            nostd::get<uint32_t>(cur_span_data->GetAttributes().at("attr5")));
-  ASSERT_EQ(-20, nostd::get<int64_t>(cur_span_data->GetAttributes().at("attr6")));
-  ASSERT_EQ(static_cast<uint64_t>(20),
-            nostd::get<uint64_t>(cur_span_data->GetAttributes().at("attr7")));
-  ASSERT_EQ(3.1, nostd::get<double>(cur_span_data->GetAttributes().at("attr8")));
-  ASSERT_EQ("string", nostd::get<std::string>(cur_span_data->GetAttributes().at("attr9")));
-
-  auto &cur_span_data2 = spans.at(1);
-  ASSERT_EQ(9, cur_span_data2->GetAttributes().size());
-  ASSERT_EQ(std::vector<int32_t>({1, 2, 3}),
-            nostd::get<std::vector<int32_t>>(cur_span_data2->GetAttributes().at("attr1")));
-  ASSERT_EQ(std::vector<uint32_t>({1, 2, 3}),
-            nostd::get<std::vector<uint32_t>>(cur_span_data2->GetAttributes().at("attr2")));
-  ASSERT_EQ(std::vector<int32_t>({1, -2, 3}),
-            nostd::get<std::vector<int32_t>>(cur_span_data2->GetAttributes().at("attr3")));
-  ASSERT_EQ(std::vector<uint32_t>({1, 2, 3}),
-            nostd::get<std::vector<uint32_t>>(cur_span_data2->GetAttributes().at("attr4")));
-  ASSERT_EQ(std::vector<int64_t>({1, -2, 3}),
-            nostd::get<std::vector<int64_t>>(cur_span_data2->GetAttributes().at("attr5")));
-  ASSERT_EQ(std::vector<uint64_t>({1, 2, 3}),
-            nostd::get<std::vector<uint64_t>>(cur_span_data2->GetAttributes().at("attr6")));
-  ASSERT_EQ(std::vector<double>({1.1, 2.1, 3.1}),
-            nostd::get<std::vector<double>>(cur_span_data2->GetAttributes().at("attr7")));
-  ASSERT_EQ(std::vector<bool>({true, false}),
-            nostd::get<std::vector<bool>>(cur_span_data2->GetAttributes().at("attr8")));
-  ASSERT_EQ(std::vector<std::string>({"a", "b"}),
-            nostd::get<std::vector<std::string>>(cur_span_data2->GetAttributes().at("attr9")));
-}
-
-TEST(Tracer, StartSpanWithAttributesCopy)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  {
-    std::unique_ptr<std::vector<int64_t>> numbers(new std::vector<int64_t>);
-    numbers->push_back(1);
-    numbers->push_back(2);
-    numbers->push_back(3);
-
-    std::unique_ptr<std::vector<nostd::string_view>> strings(new std::vector<nostd::string_view>);
-    std::string s1("a");
-    std::string s2("b");
-    std::string s3("c");
-    strings->push_back(s1);
-    strings->push_back(s2);
-    strings->push_back(s3);
-    tracer
-        ->StartSpan("span 1",
-                    {{"attr1", *numbers}, {"attr2", nostd::span<nostd::string_view>(*strings)}})
-        ->End();
-  }
-
-  auto spans = span_data->GetSpans();
-  ASSERT_EQ(1, spans.size());
-
-  auto &cur_span_data = spans.at(0);
-  ASSERT_EQ(2, cur_span_data->GetAttributes().size());
-
-  auto numbers = nostd::get<std::vector<int64_t>>(cur_span_data->GetAttributes().at("attr1"));
-  ASSERT_EQ(3, numbers.size());
-  ASSERT_EQ(1, numbers[0]);
-  ASSERT_EQ(2, numbers[1]);
-  ASSERT_EQ(3, numbers[2]);
-
-  auto strings = nostd::get<std::vector<std::string>>(cur_span_data->GetAttributes().at("attr2"));
-  ASSERT_EQ(3, strings.size());
-  ASSERT_EQ("a", strings[0]);
-  ASSERT_EQ("b", strings[1]);
-  ASSERT_EQ("c", strings[2]);
-}
-
-TEST(Tracer, GetSampler)
-{
-  auto resource = Resource::Create({});
-  // Create a Tracer with a default AlwaysOnSampler
-  auto tracer_on = initTracer(nullptr);
-
-#ifdef OPENTELEMETRY_RTTI_ENABLED
-  auto &t1 = std::dynamic_pointer_cast<Tracer>(tracer_on)->GetSampler();
-#else
-  auto &t1 = std::static_pointer_cast<Tracer>(tracer_on)->GetSampler();
-#endif
-  ASSERT_EQ("AlwaysOnSampler", t1.GetDescription());
-
-  // Create a Tracer with a AlwaysOffSampler
-  auto tracer_off = initTracer(nullptr, new AlwaysOffSampler());
-
-#ifdef OPENTELEMETRY_RTTI_ENABLED
-  auto &t2 = std::dynamic_pointer_cast<Tracer>(tracer_off)->GetSampler();
-#else
-  auto &t2 = std::static_pointer_cast<Tracer>(tracer_off)->GetSampler();
-#endif
-  ASSERT_EQ("AlwaysOffSampler", t2.GetDescription());
-}
-
-TEST(Tracer, SpanSetAttribute)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  auto span = tracer->StartSpan("span 1");
-
-  span->SetAttribute("abc", 3.1);
-
-  span->End();
-
-  auto spans = span_data->GetSpans();
-  ASSERT_EQ(1, spans.size());
-  auto &cur_span_data = spans.at(0);
-  ASSERT_EQ(3.1, nostd::get<double>(cur_span_data->GetAttributes().at("abc")));
-}
-
-TEST(Tracer, TestAfterEnd)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-  auto span                                   = tracer->StartSpan("span 1");
-  span->SetAttribute("abc", 3.1);
-
-  span->End();
-
-  // test after end
-  span->SetAttribute("testing null recordable", 3.1);
-  span->AddEvent("event 1");
-  span->AddEvent("event 2", std::chrono::system_clock::now());
-  span->AddEvent("event 3", std::chrono::system_clock::now(), {{"attr1", 1}});
-  std::string new_name{"new name"};
-  span->UpdateName(new_name);
-  span->SetAttribute("attr1", 3.1);
-  std::string description{"description"};
-  span->SetStatus(opentelemetry::trace::StatusCode::kError, description);
-  span->End();
-
-  auto spans = span_data->GetSpans();
-  ASSERT_EQ(1, spans.size());
-  auto &cur_span_data = spans.at(0);
-  ASSERT_EQ(3.1, nostd::get<double>(cur_span_data->GetAttributes().at("abc")));
-}
-
-TEST(Tracer, SpanSetEvents)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  auto span = tracer->StartSpan("span 1");
-  span->AddEvent("event 1");
-  span->AddEvent("event 2", std::chrono::system_clock::now());
-  span->AddEvent("event 3", std::chrono::system_clock::now(), {{"attr1", 1}});
-  span->End();
-
-  auto spans = span_data->GetSpans();
-  ASSERT_EQ(1, spans.size());
-
-  auto &span_data_events = spans.at(0)->GetEvents();
-  ASSERT_EQ(3, span_data_events.size());
-  ASSERT_EQ("event 1", span_data_events[0].GetName());
-  ASSERT_EQ("event 2", span_data_events[1].GetName());
-  ASSERT_EQ("event 3", span_data_events[2].GetName());
-  ASSERT_EQ(0, span_data_events[0].GetAttributes().size());
-  ASSERT_EQ(0, span_data_events[1].GetAttributes().size());
-  ASSERT_EQ(1, span_data_events[2].GetAttributes().size());
-}
-
-TEST(Tracer, StartSpanWithDisabledConfig)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  ScopeConfigurator<TracerConfig> disable_tracer =
-      ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Disabled()).Build();
-  auto tracer = initTracer(std::unique_ptr<SpanExporter>{exporter}, new AlwaysOnSampler(),
-                           new RandomIdGenerator(), disable_tracer);
-  auto span   = tracer->StartSpan("span 1");
-
-  std::shared_ptr<opentelemetry::trace::Tracer> noop_tracer =
-      std::make_shared<opentelemetry::trace::NoopTracer>();
-  auto noop_span = noop_tracer->StartSpan("noop");
-  EXPECT_TRUE(span.get() == noop_span.get());
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  EXPECT_FALSE(noop_tracer->Enabled());
-  EXPECT_FALSE(tracer->Enabled());
-#endif
-}
-
-TEST(Tracer, StartSpanWithEnabledConfig)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  ScopeConfigurator<TracerConfig> enable_tracer =
-      ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Enabled()).Build();
-  auto tracer = initTracer(std::unique_ptr<SpanExporter>{exporter}, new AlwaysOnSampler(),
-                           new RandomIdGenerator(), enable_tracer);
-  auto span   = tracer->StartSpan("span 1");
-
-  std::shared_ptr<opentelemetry::trace::Tracer> noop_tracer =
-      std::make_shared<opentelemetry::trace::NoopTracer>();
-  auto noop_span = noop_tracer->StartSpan("noop");
-  EXPECT_FALSE(span.get() == noop_span.get());
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  EXPECT_FALSE(noop_tracer->Enabled());
-  EXPECT_TRUE(tracer->Enabled());
-#endif
-}
-
-TEST(Tracer, StartSpanWithCustomConfig)
-{
-  std::shared_ptr<opentelemetry::trace::Tracer> noop_tracer =
-      std::make_shared<opentelemetry::trace::NoopTracer>();
-  auto noop_span                = noop_tracer->StartSpan("noop");
-  auto check_if_version_present = [](const InstrumentationScope &scope_info) {
-    return !scope_info.GetVersion().empty();
-  };
-  ScopeConfigurator<TracerConfig> custom_configurator =
-      ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Enabled())
-          .AddCondition(check_if_version_present, TracerConfig::Enabled())
-          .AddConditionNameEquals("foo_library", TracerConfig::Disabled())
-          .AddConditionNameEquals("", TracerConfig::Disabled())
-          .Build();
-
-  const auto tracer_default_scope =
-      initTracer(std::unique_ptr<SpanExporter>{new InMemorySpanExporter()}, new AlwaysOnSampler(),
-                 new RandomIdGenerator(), custom_configurator);
-  const auto span_default_scope = tracer_default_scope->StartSpan("span 1");
-  EXPECT_TRUE(span_default_scope == noop_span);
-
-  auto foo_scope = InstrumentationScope::Create("foo_library");
-  const auto tracer_foo_scope =
-      initTracer(std::unique_ptr<SpanExporter>{new InMemorySpanExporter()}, new AlwaysOnSampler(),
-                 new RandomIdGenerator(), custom_configurator, std::move(foo_scope));
-  const auto span_foo_scope = tracer_foo_scope->StartSpan("span 1");
-  EXPECT_TRUE(span_foo_scope == noop_span);
-
-  auto foo_scope_with_version = InstrumentationScope::Create("foo_library", "1.0.0");
-  const auto tracer_foo_scope_with_version =
-      initTracer(std::unique_ptr<SpanExporter>{new InMemorySpanExporter()}, new AlwaysOnSampler(),
-                 new RandomIdGenerator(), custom_configurator, std::move(foo_scope_with_version));
-  const auto span_foo_scope_with_version = tracer_foo_scope_with_version->StartSpan("span 1");
-  EXPECT_FALSE(span_foo_scope_with_version == noop_span);
-
-  auto bar_scope = InstrumentationScope::Create("bar_library");
-  auto tracer_bar_scope =
-      initTracer(std::unique_ptr<SpanExporter>{new InMemorySpanExporter()}, new AlwaysOnSampler(),
-                 new RandomIdGenerator(), custom_configurator, std::move(bar_scope));
-  auto span_bar_scope = tracer_bar_scope->StartSpan("span 1");
-  EXPECT_FALSE(span_bar_scope == noop_span);
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  EXPECT_FALSE(noop_tracer->Enabled());
-  EXPECT_FALSE(tracer_default_scope->Enabled());
-  EXPECT_FALSE(tracer_foo_scope->Enabled());
-  EXPECT_TRUE(tracer_foo_scope_with_version->Enabled());
-  EXPECT_TRUE(tracer_bar_scope->Enabled());
-#endif
-}
-
-TEST(Tracer, StartSpanWithCustomConfigDifferingConditionOrder)
-{
-  std::shared_ptr<opentelemetry::trace::Tracer> noop_tracer =
-      std::make_shared<opentelemetry::trace::NoopTracer>();
-  auto noop_span                = noop_tracer->StartSpan("noop");
-  auto check_if_version_present = [](const InstrumentationScope &scope_info) {
-    return !scope_info.GetVersion().empty();
-  };
-  // 2 configurators with same conditions, but different order
-  ScopeConfigurator<TracerConfig> custom_configurator_1 =
-      ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Enabled())
-          .AddCondition(check_if_version_present, TracerConfig::Enabled())
-          .AddConditionNameEquals("foo_library", TracerConfig::Disabled())
-          .Build();
-  ScopeConfigurator<TracerConfig> custom_configurator_2 =
-      ScopeConfigurator<TracerConfig>::Builder(TracerConfig::Enabled())
-          .AddConditionNameEquals("foo_library", TracerConfig::Disabled())
-          .AddCondition(check_if_version_present, TracerConfig::Enabled())
-          .Build();
-
-  auto foo_scope_with_version_1 = InstrumentationScope::Create("foo_library", "1.0.0");
-  auto foo_scope_with_version_2 = InstrumentationScope::Create("foo_library", "1.0.0");
-
-  const auto tracer_foo_scope_with_version_1 = initTracer(
-      std::unique_ptr<SpanExporter>{new InMemorySpanExporter()}, new AlwaysOnSampler(),
-      new RandomIdGenerator(), custom_configurator_1, std::move(foo_scope_with_version_1));
-
-  const auto tracer_foo_scope_with_version_2 = initTracer(
-      std::unique_ptr<SpanExporter>{new InMemorySpanExporter()}, new AlwaysOnSampler(),
-      new RandomIdGenerator(), custom_configurator_2, std::move(foo_scope_with_version_2));
-
-  // Custom configurator 1 evaluates version first and enables the tracer
-  const auto span_foo_scope_with_version_1 = tracer_foo_scope_with_version_1->StartSpan("span 1");
-  EXPECT_FALSE(span_foo_scope_with_version_1 == noop_span);
-
-  // Custom configurator 2 evaluates the name first and therefore disables the tracer without
-  // evaluating other condition
-  const auto span_foo_scope_with_version_2 = tracer_foo_scope_with_version_2->StartSpan("span 1");
-  EXPECT_TRUE(span_foo_scope_with_version_2 == noop_span);
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  EXPECT_TRUE(tracer_foo_scope_with_version_1->Enabled());
-  EXPECT_FALSE(tracer_foo_scope_with_version_2->Enabled());
-#endif
-}
-
-TEST(Tracer, SpanSetLinks)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  {
-
-    // Single span link passed through Initialization list
-    tracer->StartSpan("efg", {{"attr1", 1}}, {{SpanContext(false, false), {{"attr2", 2}}}})->End();
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(1, span_data_links.size());
-    auto link = span_data_links.at(0);
-    ASSERT_EQ(nostd::get<int>(link.GetAttributes().at("attr2")), 2);
-  }
-  {
-
-    // Multiple span links passed through Initialization list
-    tracer
-        ->StartSpan("efg", {{"attr1", 1}},
-                    {{SpanContext(false, false), {{"attr2", 2}}},
-                     {SpanContext(false, false), {{"attr3", 3}}}})
-        ->End();
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(2, span_data_links.size());
-    auto link1 = span_data_links.at(0);
-    ASSERT_EQ(nostd::get<int>(link1.GetAttributes().at("attr2")), 2);
-    auto link2 = span_data_links.at(1);
-    ASSERT_EQ(nostd::get<int>(link2.GetAttributes().at("attr3")), 3);
-  }
-
-  {
-
-    // Multiple links, each with multiple attributes passed through Initialization list
-    tracer
-        ->StartSpan("efg", {{"attr1", 1}},
-                    {{SpanContext(false, false), {{"attr2", 2}, {"attr3", 3}}},
-                     {SpanContext(false, false), {{"attr4", 4}}}})
-        ->End();
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(2, span_data_links.size());
-    auto link1 = span_data_links.at(0);
-    ASSERT_EQ(nostd::get<int>(link1.GetAttributes().at("attr2")), 2);
-    ASSERT_EQ(nostd::get<int>(link1.GetAttributes().at("attr3")), 3);
-    auto link2 = span_data_links.at(1);
-    ASSERT_EQ(nostd::get<int>(link2.GetAttributes().at("attr4")), 4);
-  }
-
-  {
-    std::map<std::string, std::string> attrs1 = {{"attr1", "1"}, {"attr2", "2"}};
-    std::map<std::string, std::string> attrs2 = {{"attr3", "3"}, {"attr4", "4"}};
-
-    std::vector<std::pair<SpanContext, std::map<std::string, std::string>>> links = {
-        {SpanContext(false, false), attrs1}, {SpanContext(false, false), attrs2}};
-    tracer->StartSpan("efg", attrs1, links)->End();
-    auto spans = span_data->GetSpans();
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(2, span_data_links.size());
-    auto link1 = span_data_links.at(0);
-    ASSERT_EQ(nostd::get<std::string>(link1.GetAttributes().at("attr1")), "1");
-    ASSERT_EQ(nostd::get<std::string>(link1.GetAttributes().at("attr2")), "2");
-    auto link2 = span_data_links.at(1);
-    ASSERT_EQ(nostd::get<std::string>(link2.GetAttributes().at("attr3")), "3");
-    ASSERT_EQ(nostd::get<std::string>(link2.GetAttributes().at("attr4")), "4");
-  }
-}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-TEST(Tracer, SpanAddLinkAbiv2)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  {
-    auto span = tracer->StartSpan("span");
-    SpanContext target(false, false);
-    // Single link attribute passed through Initialization list
-    span->AddLink(target, {{"attr2", 2}});
-    span->End();
-
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(1, span_data_links.size());
-    auto link  = span_data_links.at(0);
-    auto attrs = link.GetAttributes();
-    ASSERT_EQ(nostd::get<int>(attrs.at("attr2")), 2);
-  }
-
-  {
-    auto span = tracer->StartSpan("span");
-    SpanContext target(false, false);
-    // Multiple link attributes passed through Initialization list
-    span->AddLink(target, {{"attr2", 2}, {"attr3", 3}});
-    span->End();
-
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(1, span_data_links.size());
-    auto link  = span_data_links.at(0);
-    auto attrs = link.GetAttributes();
-    ASSERT_EQ(nostd::get<int>(attrs.at("attr2")), 2);
-    ASSERT_EQ(nostd::get<int>(attrs.at("attr3")), 3);
-  }
-
-  {
-    std::map<std::string, std::string> attrs_map = {{"attr1", "1"}, {"attr2", "2"}};
-
-    auto span = tracer->StartSpan("span");
-    SpanContext target(false, false);
-    span->AddLink(target, attrs_map);
-    span->End();
-
-    auto spans = span_data->GetSpans();
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(1, span_data_links.size());
-    auto link  = span_data_links.at(0);
-    auto attrs = link.GetAttributes();
-    ASSERT_EQ(nostd::get<std::string>(attrs.at("attr1")), "1");
-    ASSERT_EQ(nostd::get<std::string>(attrs.at("attr2")), "2");
-  }
-
-  {
-    auto span = tracer->StartSpan("span");
-    SpanContext target(false, false);
-
-    // Single link attribute passed through Initialization list
-    span->AddLink(target, {{"attr1", 1}});
-
-    // Multiple link attributes passed through Initialization list
-    span->AddLink(target, {{"attr2", 2}, {"attr3", 3}});
-
-    std::map<std::string, std::string> attrs_map = {{"attr4", "4"}, {"attr5", "5"}};
-    span->AddLink(target, attrs_map);
-
-    span->End();
-
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(3, span_data_links.size());
-
-    {
-      auto link  = span_data_links.at(0);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr1")), 1);
-    }
-
-    {
-      auto link  = span_data_links.at(1);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 2);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr2")), 2);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr3")), 3);
-    }
-
-    {
-      auto link  = span_data_links.at(2);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 2);
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attr4")), "4");
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attr5")), "5");
-    }
-  }
-}
-
-TEST(Tracer, SpanAddLinksAbiv2)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  {
-    auto span = tracer->StartSpan("span");
-    // Single span link passed through Initialization list
-    span->AddLinks({{SpanContext(false, false), {{"attr2", 2}}}});
-    span->End();
-
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(1, span_data_links.size());
-    auto link = span_data_links.at(0);
-    ASSERT_EQ(nostd::get<int>(link.GetAttributes().at("attr2")), 2);
-  }
-
-  {
-    auto span = tracer->StartSpan("span");
-    // Multiple span links passed through Initialization list
-    span->AddLinks(
-        {{SpanContext(false, false), {{"attr2", 2}}}, {SpanContext(false, false), {{"attr3", 3}}}});
-    span->End();
-
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(2, span_data_links.size());
-    auto link1 = span_data_links.at(0);
-    ASSERT_EQ(nostd::get<int>(link1.GetAttributes().at("attr2")), 2);
-    auto link2 = span_data_links.at(1);
-    ASSERT_EQ(nostd::get<int>(link2.GetAttributes().at("attr3")), 3);
-  }
-
-  {
-    auto span = tracer->StartSpan("span");
-    // Multiple links, each with multiple attributes passed through Initialization list
-    span->AddLinks({{SpanContext(false, false), {{"attr2", 2}, {"attr3", 3}}},
-                    {SpanContext(false, false), {{"attr4", 4}}}});
-    span->End();
-
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(2, span_data_links.size());
-    auto link1 = span_data_links.at(0);
-    ASSERT_EQ(nostd::get<int>(link1.GetAttributes().at("attr2")), 2);
-    ASSERT_EQ(nostd::get<int>(link1.GetAttributes().at("attr3")), 3);
-    auto link2 = span_data_links.at(1);
-    ASSERT_EQ(nostd::get<int>(link2.GetAttributes().at("attr4")), 4);
-  }
-
-  {
-    std::map<std::string, std::string> attrs1 = {{"attr1", "1"}, {"attr2", "2"}};
-    std::map<std::string, std::string> attrs2 = {{"attr3", "3"}, {"attr4", "4"}};
-
-    std::vector<std::pair<SpanContext, std::map<std::string, std::string>>> links = {
-        {SpanContext(false, false), attrs1}, {SpanContext(false, false), attrs2}};
-
-    auto span = tracer->StartSpan("span");
-    span->AddLinks(links);
-    span->End();
-
-    auto spans = span_data->GetSpans();
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(2, span_data_links.size());
-    auto link1 = span_data_links.at(0);
-    ASSERT_EQ(nostd::get<std::string>(link1.GetAttributes().at("attr1")), "1");
-    ASSERT_EQ(nostd::get<std::string>(link1.GetAttributes().at("attr2")), "2");
-    auto link2 = span_data_links.at(1);
-    ASSERT_EQ(nostd::get<std::string>(link2.GetAttributes().at("attr3")), "3");
-    ASSERT_EQ(nostd::get<std::string>(link2.GetAttributes().at("attr4")), "4");
-  }
-
-  {
-    auto span = tracer->StartSpan("span");
-
-    // Single span link passed through Initialization list
-    span->AddLinks({{SpanContext(false, false), {{"attr10", 10}}}});
-    span->AddLinks({{SpanContext(false, false), {{"attr11", 11}}}});
-
-    // Multiple span links passed through Initialization list
-    span->AddLinks({{SpanContext(false, false), {{"attr12", 12}}},
-                    {SpanContext(false, false), {{"attr13", 13}}}});
-    span->AddLinks({{SpanContext(false, false), {{"attr14", 14}}},
-                    {SpanContext(false, false), {{"attr15", 15}}}});
-
-    // Multiple links, each with multiple attributes passed through Initialization list
-    span->AddLinks({{SpanContext(false, false), {{"attr16", 16}, {"attr17", 17}}},
-                    {SpanContext(false, false), {{"attr18", 18}}}});
-    span->AddLinks({{SpanContext(false, false), {{"attr19", 19}, {"attr20", 20}}},
-                    {SpanContext(false, false), {{"attr21", 21}}}});
-
-    std::map<std::string, std::string> attrsa1 = {{"attra1", "1"}, {"attra2", "2"}};
-    std::map<std::string, std::string> attrsa2 = {{"attra3", "3"}, {"attra4", "4"}};
-
-    std::vector<std::pair<SpanContext, std::map<std::string, std::string>>> linksa = {
-        {SpanContext(false, false), attrsa1}, {SpanContext(false, false), attrsa2}};
-
-    span->AddLinks(linksa);
-
-    std::map<std::string, std::string> attrsb1 = {{"attrb1", "1"}, {"attrb2", "2"}};
-    std::map<std::string, std::string> attrsb2 = {{"attrb3", "3"}, {"attrb4", "4"}};
-
-    std::vector<std::pair<SpanContext, std::map<std::string, std::string>>> linksb = {
-        {SpanContext(false, false), attrsb1}, {SpanContext(false, false), attrsb2}};
-
-    span->AddLinks(linksb);
-
-    span->End();
-
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(14, span_data_links.size());
-
-    {
-      auto link  = span_data_links.at(0);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr10")), 10);
-    }
-
-    {
-      auto link  = span_data_links.at(1);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr11")), 11);
-    }
-
-    {
-      auto link  = span_data_links.at(2);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr12")), 12);
-    }
-
-    {
-      auto link  = span_data_links.at(3);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr13")), 13);
-    }
-
-    {
-      auto link  = span_data_links.at(4);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr14")), 14);
-    }
-
-    {
-      auto link  = span_data_links.at(5);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr15")), 15);
-    }
-
-    {
-      auto link  = span_data_links.at(6);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 2);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr16")), 16);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr17")), 17);
-    }
-
-    {
-      auto link  = span_data_links.at(7);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr18")), 18);
-    }
-
-    {
-      auto link  = span_data_links.at(8);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 2);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr19")), 19);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr20")), 20);
-    }
-
-    {
-      auto link  = span_data_links.at(9);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr21")), 21);
-    }
-
-    {
-      auto link  = span_data_links.at(10);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 2);
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attra1")), "1");
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attra2")), "2");
-    }
-
-    {
-      auto link  = span_data_links.at(11);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 2);
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attra3")), "3");
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attra4")), "4");
-    }
-
-    {
-      auto link  = span_data_links.at(12);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 2);
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attrb1")), "1");
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attrb2")), "2");
-    }
-
-    {
-      auto link  = span_data_links.at(13);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 2);
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attrb3")), "3");
-      ASSERT_EQ(nostd::get<std::string>(attrs.at("attrb4")), "4");
-    }
-  }
-}
-
-TEST(Tracer, SpanMixLinksAbiv2)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  {
-    // Link 1 added at StartSpan
-    auto span =
-        tracer->StartSpan("span", {{"attr1", 1}}, {{SpanContext(false, false), {{"attr2", 2}}}});
-
-    SpanContext target(false, false);
-    // Link 2 added with AddLink
-    span->AddLink(target, {{"attr3", 3}});
-
-    // Link 3 added with AddLinks
-    span->AddLinks({{SpanContext(false, false), {{"attr4", 4}}}});
-
-    span->End();
-
-    auto spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-
-    auto &span_data_links = spans.at(0)->GetLinks();
-    ASSERT_EQ(3, span_data_links.size());
-
-    {
-      auto link  = span_data_links.at(0);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr2")), 2);
-    }
-
-    {
-      auto link  = span_data_links.at(1);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr3")), 3);
-    }
-
-    {
-      auto link  = span_data_links.at(2);
-      auto attrs = link.GetAttributes();
-      ASSERT_EQ(attrs.size(), 1);
-      ASSERT_EQ(nostd::get<int>(attrs.at("attr4")), 4);
-    }
-  }
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */
-
-TEST(Tracer, TestAlwaysOnSampler)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer_on                              = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  // Testing AlwaysOn sampler.
-  // Create two spans for each tracer. Check the exported result.
-  auto span_on_1 = tracer_on->StartSpan("span 1");
-  auto span_on_2 = tracer_on->StartSpan("span 2");
-  span_on_2->End();
-  span_on_1->End();
-
-  auto spans = span_data->GetSpans();
-  ASSERT_EQ(2, spans.size());
-  ASSERT_EQ("span 2", spans.at(0)->GetName());  // span 2 ends first.
-  ASSERT_EQ("span 1", spans.at(1)->GetName());
-}
-
-TEST(Tracer, TestAlwaysOffSampler)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer_off = initTracer(std::unique_ptr<SpanExporter>{exporter}, new AlwaysOffSampler());
-  auto span_off_1 = tracer_off->StartSpan("span 1");
-  auto span_off_2 = tracer_off->StartSpan("span 2");
-
-  span_off_1->SetAttribute("attr1", 3.1);  // Not recorded.
-
-  span_off_2->End();
-  span_off_1->End();
-
-  // The tracer export nothing with an AlwaysOff sampler
-  ASSERT_EQ(0, span_data->GetSpans().size());
-}
-
-TEST(Tracer, TestParentBasedSampler)
-{
-  // Current ShouldSample always pass an empty ParentContext,
-  // so this sampler will work as an AlwaysOnSampler.
-  InMemorySpanExporter *exporter                        = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data_parent_on = exporter->GetData();
-  auto tracer_parent_on = initTracer(std::unique_ptr<SpanExporter>{exporter},
-                                     new ParentBasedSampler(std::make_shared<AlwaysOnSampler>()));
-
-  auto span_parent_on_1 = tracer_parent_on->StartSpan("span 1");
-  auto span_parent_on_2 = tracer_parent_on->StartSpan("span 2");
-
-  span_parent_on_1->SetAttribute("attr1", 3.1);
-
-  span_parent_on_2->End();
-  span_parent_on_1->End();
-
-  auto spans = span_data_parent_on->GetSpans();
-  ASSERT_EQ(2, spans.size());
-  ASSERT_EQ("span 2", spans.at(0)->GetName());
-  ASSERT_EQ("span 1", spans.at(1)->GetName());
-
-  // Current ShouldSample always pass an empty ParentContext,
-  // so this sampler will work as an AlwaysOnSampler.
-  InMemorySpanExporter *exporter2                        = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data_parent_off = exporter2->GetData();
-  auto tracer_parent_off =
-      initTracer(std::unique_ptr<SpanExporter>{exporter2},
-                 // Add this to avoid different results for old and new version of clang-format
-                 new ParentBasedSampler(std::make_shared<AlwaysOffSampler>()));
-
-  auto span_parent_off_1 = tracer_parent_off->StartSpan("span 1");
-  auto span_parent_off_2 = tracer_parent_off->StartSpan("span 2");
-
-  span_parent_off_1->SetAttribute("attr1", 3.1);
-
-  span_parent_off_1->End();
-  span_parent_off_2->End();
-  ASSERT_EQ(0, span_data_parent_off->GetSpans().size());
-}
-
-TEST(Tracer, WithActiveSpan)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-  auto spans                                  = span_data.get()->GetSpans();
-
-  ASSERT_EQ(0, spans.size());
-
-  {
-    auto span_first  = tracer->StartSpan("span 1");
-    auto scope_first = tracer->WithActiveSpan(span_first);
-
-    {
-      auto span_second  = tracer->StartSpan("span 2");
-      auto scope_second = tracer->WithActiveSpan(span_second);
-
-      spans = span_data->GetSpans();
-      ASSERT_EQ(0, spans.size());
-
-      span_second->End();
-    }
-
-    spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-    EXPECT_EQ("span 2", spans.at(0)->GetName());
-    EXPECT_EQ(spans.at(0).get()->GetParentSpanId(), span_first->GetContext().span_id());
-    EXPECT_EQ(spans.at(0).get()->GetTraceId(), span_first->GetContext().trace_id());
-
-    {
-      trace_api::StartSpanOptions options;
-      opentelemetry::context::Context c1;
-      c1             = c1.SetValue(opentelemetry::trace::kIsRootSpanKey, true);
-      options.parent = c1;
-      auto root_span = tracer->StartSpan("span root", options);
-
-      spans = span_data->GetSpans();
-      ASSERT_EQ(0, spans.size());
-
-      root_span->End();
-    }
-    spans = span_data->GetSpans();
-    ASSERT_EQ(1, spans.size());
-    EXPECT_EQ("span root", spans.at(0)->GetName());
-    EXPECT_EQ(spans.at(0).get()->GetParentSpanId(), opentelemetry::trace::SpanId());
-    EXPECT_NE(spans.at(0).get()->GetTraceId(), span_first->GetContext().trace_id());
-
-    span_first->End();
-  }
-
-  spans = span_data->GetSpans();
-  ASSERT_EQ(1, spans.size());
-  EXPECT_EQ("span 1", spans.at(0)->GetName());
-}
-
-TEST(Tracer, ExpectParent)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-  auto spans                                  = span_data.get()->GetSpans();
-
-  ASSERT_EQ(0, spans.size());
-
-  auto span_first = tracer->StartSpan("span 1");
-
-  trace_api::StartSpanOptions options;
-  options.parent   = span_first->GetContext();
-  auto span_second = tracer->StartSpan("span 2", options);
-
-  options.parent  = span_second->GetContext();
-  auto span_third = tracer->StartSpan("span 3", options);
-
-  span_third->End();
-  span_second->End();
-  span_first->End();
-
-  spans = span_data->GetSpans();
-  ASSERT_EQ(3, spans.size());
-  auto spandata_first  = std::move(spans.at(2));
-  auto spandata_second = std::move(spans.at(1));
-  auto spandata_third  = std::move(spans.at(0));
-  EXPECT_EQ("span 1", spandata_first->GetName());
-  EXPECT_EQ("span 2", spandata_second->GetName());
-  EXPECT_EQ("span 3", spandata_third->GetName());
-
-  EXPECT_EQ(spandata_first->GetSpanId(), spandata_second->GetParentSpanId());
-  EXPECT_EQ(spandata_second->GetSpanId(), spandata_third->GetParentSpanId());
-}
-
-TEST(Tracer, ExpectParentAsContext)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-  auto spans                                  = span_data.get()->GetSpans();
-
-  ASSERT_EQ(0, spans.size());
-
-  auto span_first = tracer->StartSpan("span 1");
-
-  opentelemetry::context::Context c1;
-  auto c2 = trace_api::SetSpan(c1, span_first);
-  trace_api::StartSpanOptions options;
-  options.parent   = c2;
-  auto span_second = tracer->StartSpan("span 2", options);
-
-  auto c3         = trace_api::SetSpan(c2, span_second);
-  options.parent  = c3;
-  auto span_third = tracer->StartSpan("span 3", options);
-
-  span_third->End();
-  span_second->End();
-  span_first->End();
-
-  spans = span_data->GetSpans();
-  ASSERT_EQ(3, spans.size());
-  auto spandata_first  = std::move(spans.at(2));
-  auto spandata_second = std::move(spans.at(1));
-  auto spandata_third  = std::move(spans.at(0));
-  EXPECT_EQ("span 1", spandata_first->GetName());
-  EXPECT_EQ("span 2", spandata_second->GetName());
-  EXPECT_EQ("span 3", spandata_third->GetName());
-
-  EXPECT_EQ(spandata_first->GetSpanId(), spandata_second->GetParentSpanId());
-  EXPECT_EQ(spandata_second->GetSpanId(), spandata_third->GetParentSpanId());
-}
-
-TEST(Tracer, ValidTraceIdToSampler)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer                                 = initTracer(std::unique_ptr<SpanExporter>{exporter});
-
-  auto span = tracer->StartSpan("span 1");
-  // sampler was fed with valid trace_id, so span shouldn't be NoOp Span.
-  EXPECT_TRUE(span->IsRecording());
-  EXPECT_TRUE(span->GetContext().IsValid());
-}
-
-TEST(Tracer, SpanCleanupWithScope)
-{
-  InMemorySpanExporter *exporter              = new InMemorySpanExporter();
-  std::shared_ptr<InMemorySpanData> span_data = exporter->GetData();
-  auto tracer = initTracer(std::unique_ptr<SpanExporter>{exporter}, new MockSampler());
-  {
-    auto span0 = tracer->StartSpan("Span0");
-    auto span1 = tracer->StartSpan("span1");
-    {
-      trace_api::Scope scope1(span1);
-      auto span2 = tracer->StartSpan("span2");
-      {
-        trace_api::Scope scope2(span2);
-        auto span3 = tracer->StartSpan("span3");
-      }
-    }
-  }
-  EXPECT_EQ(4, span_data->GetSpans().size());
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/BUILD b/ext/opentelemetry-cpp-1.21.0/test_common/BUILD
deleted file mode 100644
index b19ae921e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "headers",
-    hdrs = glob(["include/**/*.h"]),
-    strip_include_prefix = "include",
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/test_common/CMakeLists.txt
deleted file mode 100644
index 5e939bae2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(BUILD_TESTING)
-  add_library(opentelemetry_test_common INTERFACE)
-  target_include_directories(
-    opentelemetry_test_common
-    INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-              "$<INSTALL_INTERFACE:include>")
-
-  set_target_properties(opentelemetry_test_common PROPERTIES EXPORT_NAME
-                                                             "teset_common")
-  target_link_libraries(opentelemetry_test_common INTERFACE opentelemetry_api)
-
-  add_subdirectory(src)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/include/opentelemetry/test_common/ext/http/client/http_client_test_factory.h b/ext/opentelemetry-cpp-1.21.0/test_common/include/opentelemetry/test_common/ext/http/client/http_client_test_factory.h
deleted file mode 100644
index eb56b5980..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/include/opentelemetry/test_common/ext/http/client/http_client_test_factory.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-class HttpClientTestFactory
-{
-public:
-  static std::shared_ptr<HttpClient> Create();
-};
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/include/opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h b/ext/opentelemetry-cpp-1.21.0/test_common/include/opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h
deleted file mode 100644
index 6a30e4fd2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/include/opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <gmock/gmock.h>
-#include <stdint.h>
-#include <chrono>
-#include <cstddef>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-namespace nosend
-{
-
-const opentelemetry::ext::http::client::StatusCode Http_Ok = 200;
-
-class Request : public opentelemetry::ext::http::client::Request
-{
-public:
-  Request() : method_(opentelemetry::ext::http::client::Method::Get), uri_("/") {}
-
-  void SetMethod(opentelemetry::ext::http::client::Method method) noexcept override
-  {
-    method_ = method;
-  }
-
-  void SetSslOptions(const HttpSslOptions &ssl_options) noexcept override
-  {
-    ssl_options_ = ssl_options;
-  }
-
-  void SetBody(opentelemetry::ext::http::client::Body &body) noexcept override
-  {
-    body_ = std::move(body);
-  }
-
-  void AddHeader(nostd::string_view name, nostd::string_view value) noexcept override
-  {
-    headers_.insert(std::pair<std::string, std::string>(static_cast<std::string>(name),
-                                                        static_cast<std::string>(value)));
-  }
-
-  void ReplaceHeader(nostd::string_view name, nostd::string_view value) noexcept override;
-
-  void SetUri(nostd::string_view uri) noexcept override { uri_ = static_cast<std::string>(uri); }
-
-  void SetTimeoutMs(std::chrono::milliseconds timeout_ms) noexcept override
-  {
-    timeout_ms_ = timeout_ms;
-  }
-
-  void SetCompression(
-      const opentelemetry::ext::http::client::Compression &compression) noexcept override
-  {
-    compression_ = compression;
-  }
-
-  void EnableLogging(bool is_log_enabled) noexcept override { is_log_enabled_ = is_log_enabled; }
-
-  void SetRetryPolicy(
-      const opentelemetry::ext::http::client::RetryPolicy &retry_policy) noexcept override
-  {
-    retry_policy_ = retry_policy;
-  }
-
-public:
-  opentelemetry::ext::http::client::Method method_;
-  opentelemetry::ext::http::client::HttpSslOptions ssl_options_;
-  opentelemetry::ext::http::client::Body body_;
-  opentelemetry::ext::http::client::Headers headers_;
-  std::string uri_;
-  std::chrono::milliseconds timeout_ms_{5000};  // ms
-  opentelemetry::ext::http::client::Compression compression_{
-      opentelemetry::ext::http::client::Compression::kNone};
-  bool is_log_enabled_{false};
-  opentelemetry::ext::http::client::RetryPolicy retry_policy_;
-};
-
-class Response : public opentelemetry::ext::http::client::Response
-{
-public:
-  Response() : status_code_(Http_Ok) {}
-
-  const opentelemetry::ext::http::client::Body &GetBody() const noexcept override { return body_; }
-
-  bool ForEachHeader(nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)>
-                         callable) const noexcept override;
-
-  bool ForEachHeader(const nostd::string_view &name,
-                     nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)>
-                         callable) const noexcept override;
-
-  opentelemetry::ext::http::client::StatusCode GetStatusCode() const noexcept override
-  {
-    return status_code_;
-  }
-
-  void Finish(opentelemetry::ext::http::client::EventHandler &callback) noexcept
-  {
-    callback.OnEvent(opentelemetry::ext::http::client::SessionState::Created, "");
-    callback.OnEvent(opentelemetry::ext::http::client::SessionState::Connecting, "");
-    callback.OnEvent(opentelemetry::ext::http::client::SessionState::Connected, "");
-    callback.OnEvent(opentelemetry::ext::http::client::SessionState::Sending, "");
-
-    // let the otlp_http_client to continue
-    callback.OnResponse(*this);
-
-    callback.OnEvent(opentelemetry::ext::http::client::SessionState::Response, "");
-  }
-
-public:
-  Headers headers_;
-  opentelemetry::ext::http::client::Body body_;
-  opentelemetry::ext::http::client::StatusCode status_code_;
-};
-
-class HttpClient;  // IWYU pragma: keep
-
-class Session : public opentelemetry::ext::http::client::Session
-{
-public:
-  Session(HttpClient &http_client,
-          std::string scheme      = "http",
-          const std::string &host = "",
-          uint16_t port           = 80)
-      : http_client_(http_client), is_session_active_(false)
-  {
-    host_ = scheme + "://" + host + ":" + std::to_string(port) + "/";
-  }
-
-  std::shared_ptr<opentelemetry::ext::http::client::Request> CreateRequest() noexcept override
-  {
-    http_request_.reset(new Request());
-    return http_request_;
-  }
-
-  MOCK_METHOD(void,
-              SendRequest,
-              (std::shared_ptr<opentelemetry::ext::http::client::EventHandler>),
-              (noexcept, override));
-
-  bool CancelSession() noexcept override;
-
-  bool FinishSession() noexcept override;
-
-  bool IsSessionActive() noexcept override { return is_session_active_; }
-
-  void SetId(uint64_t session_id) { session_id_ = session_id; }
-
-  /**
-   * Returns the base URI.
-   * @return the base URI as a string consisting of scheme, host and port.
-   */
-  const std::string &GetBaseUri() const { return host_; }
-
-  std::shared_ptr<Request> GetRequest() { return http_request_; }
-
-private:
-  std::shared_ptr<Request> http_request_;
-  std::string host_;
-  uint64_t session_id_;
-  HttpClient &http_client_;
-  bool is_session_active_;
-};
-
-class HttpClient : public opentelemetry::ext::http::client::HttpClient
-{
-public:
-  HttpClient();
-
-  std::shared_ptr<opentelemetry::ext::http::client::Session> CreateSession(
-      nostd::string_view) noexcept override;
-
-  bool CancelAllSessions() noexcept override;
-
-  bool FinishAllSessions() noexcept override;
-
-  void SetMaxSessionsPerConnection(std::size_t max_requests_per_connection) noexcept override;
-
-  void CleanupSession(uint64_t session_id);
-
-  std::shared_ptr<Session> session_;
-};
-
-}  // namespace nosend
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/src/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/test_common/src/CMakeLists.txt
deleted file mode 100644
index b4243cafb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/src/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(BUILD_TESTING)
-  add_subdirectory(http/client/nosend)
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/BUILD b/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/BUILD
deleted file mode 100644
index fa7ba623a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "http_client_nosend",
-    srcs = [
-        "http_client_nosend.cc",
-        "http_client_test_factory.cc",
-    ],
-    include_prefix = "src/http/client/nosend",
-    tags = [
-        "test",
-    ],
-    deps = [
-        "//api",
-        "//ext:headers",
-        "//sdk:headers",
-        "//test_common:headers",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/CMakeLists.txt b/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/CMakeLists.txt
deleted file mode 100644
index 3f2b4c82b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if(${BUILD_TESTING})
-  add_library(opentelemetry_http_client_nosend http_client_test_factory.cc
-                                               http_client_nosend.cc)
-
-  set_target_properties(opentelemetry_http_client_nosend
-                        PROPERTIES EXPORT_NAME opentelemetry_http_client_nosend)
-
-  target_link_libraries(
-    opentelemetry_http_client_nosend opentelemetry_ext
-    opentelemetry_test_common ${GMOCK_LIB} ${GTEST_BOTH_LIBRARIES})
-
-endif()
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/http_client_nosend.cc b/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/http_client_nosend.cc
deleted file mode 100644
index 46784869c..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/http_client_nosend.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include <stdint.h>
-#include <cstddef>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace ext
-{
-namespace http
-{
-namespace client
-{
-namespace nosend
-{
-void Request::ReplaceHeader(nostd::string_view name, nostd::string_view value) noexcept
-{
-  // erase matching headers
-  auto range = headers_.equal_range(static_cast<std::string>(name));
-  headers_.erase(range.first, range.second);
-  AddHeader(name, value);
-}
-
-bool Response::ForEachHeader(
-    nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)> callable)
-    const noexcept
-{
-  for (const auto &header : headers_)
-  {
-    if (!callable(header.first, header.second))
-    {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool Response::ForEachHeader(
-    const nostd::string_view &name,
-    nostd::function_ref<bool(nostd::string_view name, nostd::string_view value)> callable)
-    const noexcept
-{
-  auto range = headers_.equal_range(static_cast<std::string>(name));
-  for (auto it = range.first; it != range.second; ++it)
-  {
-    if (!callable(it->first, it->second))
-    {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool Session::CancelSession() noexcept
-{
-  http_client_.CleanupSession(session_id_);
-  return true;
-}
-
-bool Session::FinishSession() noexcept
-{
-  http_client_.CleanupSession(session_id_);
-  return true;
-}
-
-HttpClient::HttpClient()
-{
-  session_ = std::shared_ptr<Session>{new Session(*this)};
-}
-
-std::shared_ptr<opentelemetry::ext::http::client::Session> HttpClient::CreateSession(
-    nostd::string_view) noexcept
-{
-  return session_;
-}
-
-bool HttpClient::CancelAllSessions() noexcept
-{
-  session_->CancelSession();
-  return true;
-}
-
-bool HttpClient::FinishAllSessions() noexcept
-{
-  session_->FinishSession();
-  return true;
-}
-
-void HttpClient::SetMaxSessionsPerConnection(std::size_t /* max_requests_per_connection */) noexcept
-{}
-
-void HttpClient::CleanupSession(uint64_t /* session_id */) {}
-
-}  // namespace nosend
-}  // namespace client
-}  // namespace http
-}  // namespace ext
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/http_client_test_factory.cc b/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/http_client_test_factory.cc
deleted file mode 100644
index 215c17354..000000000
--- a/ext/opentelemetry-cpp-1.21.0/test_common/src/http/client/nosend/http_client_test_factory.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#include "opentelemetry/test_common/ext/http/client/http_client_test_factory.h"
-#include "opentelemetry/ext/http/client/http_client.h"
-#include "opentelemetry/test_common/ext/http/client/nosend/http_client_nosend.h"
-
-namespace http_client = opentelemetry::ext::http::client;
-
-std::shared_ptr<http_client::HttpClient> http_client::HttpClientTestFactory::Create()
-{
-  return std::make_shared<http_client::nosend::HttpClient>();
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/third_party/BUILD b/ext/opentelemetry-cpp-1.21.0/third_party/BUILD
deleted file mode 100644
index c039f4798..000000000
--- a/ext/opentelemetry-cpp-1.21.0/third_party/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-licenses(["notice"])  # Apache 2.0
-
-package(default_visibility = ["//:__subpackages__"])
diff --git a/ext/opentelemetry-cpp-1.21.0/third_party_release b/ext/opentelemetry-cpp-1.21.0/third_party_release
deleted file mode 100644
index 8761dc933..000000000
--- a/ext/opentelemetry-cpp-1.21.0/third_party_release
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-#
-# MAINTAINER
-#
-# This file is used for the CMake build.
-#
-# When changing (add, upgrade, remove) dependencies
-# please update:
-# - the Bazel build, see file
-#   <root>/bazel/repository.bzl
-# - git submodule, see command
-#   git submodule status
-#
-
-gRPC=v1.49.2
-abseil=20240116.1
-benchmark=v1.8.3
-googletest=1.14.0
-ms-gsl=v3.1.0-67-g6f45293
-nlohmann-json=v3.12.0
-opentelemetry-proto=v1.6.0
-opentracing-cpp=v1.6.0
-prometheus-cpp=v1.3.0
-vcpkg=2024.02.14
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/WORKSPACE b/ext/opentelemetry-cpp-1.21.0/tools/WORKSPACE
deleted file mode 100644
index 3e90ba0c4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/WORKSPACE
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-local_repository(
-  name = "vcpkg",
-  path = "./vcpkg",
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-bazel.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-bazel.cmd
deleted file mode 100644
index 884fe3f0d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-bazel.cmd
+++ /dev/null
@@ -1,9 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-pushd "%~dp0"
-set "PATH=%CD%;%PATH%"
-cd ..
-bazel.exe build %* //...
-bazel.exe test %* //...
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-benchmark.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-benchmark.cmd
deleted file mode 100644
index fca818806..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-benchmark.cmd
+++ /dev/null
@@ -1,38 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-set BUILDTOOLS_VERSION=vs2019
-set CMAKE_GEN="Visual Studio 16 2019"
-echo Building Google Benchmark (test only dependency)...
-@setlocal ENABLEEXTENSIONS
-
-echo Auto-detecting Visual Studio version...
-call "%~dp0\vcvars.cmd"
-
-pushd "%~dp0\.."
-set "ROOT=%CD%"
-
-set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
-set platform=
-
-if not exist "%ROOT%\third_party\benchmark\" (
-  echo "Google Benchmark library is not available, skipping benchmark build."
-  call skip_the_build
-)
-
-cd "%ROOT%\third_party\benchmark\"
-set "GOOGLETEST_PATH=%ROOT%\third_party\googletest"
-if not exist "build" (
-  mkdir build
-)
-cd build
-
-REM By default we generate the project for the older Visual Studio 2017 even if we have newer version installed
-cmake ../ -G %CMAKE_GEN% -Ax64 -DBENCHMARK_ENABLE_TESTING=OFF
-set SOLUTION=%ROOT%\third_party\benchmark\build\benchmark.sln
-msbuild %SOLUTION% /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=x64
-msbuild %SOLUTION% /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=x64
-popd
-
-:skip_the_build
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-benchmark.sh b/ext/opentelemetry-cpp-1.21.0/tools/build-benchmark.sh
deleted file mode 100755
index accb453ca..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-benchmark.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-# Switch to workspace root directory first
-DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-WORKSPACE_ROOT=$DIR/..
-pushd $WORKSPACE_ROOT
-
-BUILD_ROOT=${BUILD_ROOT:-/tmp/build}
-[[ ! -d "${BUILD_ROOT}"           ]] && mkdir -p "${BUILD_ROOT}"           || echo "Output directory already exists: BUILD_ROOT=${BUILD_ROOT}"
-
-BENCHMARK_BUILD_ROOT=${BUILD_ROOT}/benchmark
-[[ ! -d "${BENCHMARK_BUILD_ROOT}" ]] && mkdir -p "${BENCHMARK_BUILD_ROOT}" || echo "Output directory already exists: BENCHMARK_BUILD_ROOT=${BENCHMARK_BUILD_ROOT}"
-
-# Build Google Benchmark with given Google Test
-export BENCHMARK_SRC_PATH=${WORKSPACE_ROOT}/third_party/benchmark
-if [ ! -d "${BENCHMARK_SRC_PATH}" ]; then
-  echo "Google Benchmark not found!"
-  exit 1
-fi
-
-pushd ${BENCHMARK_BUILD_ROOT}
-cmake $BENCHMARK_SRC_PATH -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_INSTALL_PREFIX=$BUILD_ROOT
-make install
-popd
-
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-clang-12.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-clang-12.cmd
deleted file mode 100644
index 74864da47..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-clang-12.cmd
+++ /dev/null
@@ -1,10 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-pushd %~dp0
-set "PATH=%ProgramFiles%\LLVM-12\bin;%PATH%"
-set BUILDTOOLS_VERSION=clang-12
-set CMAKE_GEN=Ninja
-call build.cmd %*
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-clang.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-clang.cmd
deleted file mode 100644
index b721ca4c1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-clang.cmd
+++ /dev/null
@@ -1,10 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-pushd %~dp0
-set "PATH=%ProgramFiles%\LLVM\bin;%PATH%"
-set BUILDTOOLS_VERSION=clang
-set CMAKE_GEN=Ninja
-call build.cmd %*
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-docker.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-docker.cmd
deleted file mode 100644
index 452795c19..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-docker.cmd
+++ /dev/null
@@ -1,72 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-pushd %~dp0
-REM Default arguments
-set A1="/build/tools/build.sh"
-set A2=clean
-if "%~1"=="" goto help
-
-REM Image name is always the first argument
-set IMAGE_NAME=%1
-
-REM Process other optional arguments
-shift
-if NOT "%1"=="" (
-  set A1=%1
-  set A2=%2
-  set A3=%3
-  set A4=%4
-  set A5=%5
-  set A6=%6
-  set A7=%7
-  set A8=%8
-  set A9=%9
-  set A10=%10
-)
-
-WHERE choco >NUL 2>NUL
-if %ERRORLEVEL% NEQ 0 (
-  echo This script requires Chocolatey to install Docker: https://chocolatey.org/
-)
-
-WHERE docker >NUL 2>NUL
-if "%ERRORLEVEL%"=="0" goto docker_ok
-choco install -y docker-desktop
-choco install -y docker-cli
-:docker_ok
-
-docker info
-docker version
-
-echo Running in container %IMAGE_NAME%
-sc query com.docker.service
-
-REM Force reinstallation of build tools
-del ..\.buildtools 2>NUL
-echo Building docker image in %CD%...
-copy /Y setup-cmake.sh ..\docker\%IMAGE_NAME%\
-copy /Y setup-protobuf.sh ..\docker\%IMAGE_NAME%\
-docker build --rm -t %IMAGE_NAME% ../docker/%IMAGE_NAME%
-
-cd ..
-echo Starting build...
-docker run -it -v %CD%:/build %IMAGE_NAME% %A1% %A2%
-
-popd
-exit
-
-:help
-cd ..
-echo.
-echo Usage: build-docker.cmd [image_name] [arguments...]
-echo. 
-echo Default command:
-echo. 
-echo  docker run -it -v $WORKSPACE_ROOT:/build IMAGE_NAME %A1% %A2%
-echo.
-echo Supported images:
-echo =================
-dir /B docker
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-gtest.sh b/ext/opentelemetry-cpp-1.21.0/tools/build-gtest.sh
deleted file mode 100755
index 6fb635436..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-gtest.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-# Switch to workspace root directory first
-DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-WORKSPACE_ROOT=$DIR/..
-pushd $WORKSPACE_ROOT
-
-BUILD_ROOT=${BUILD_ROOT:-/tmp/build}
-[[ ! -d "${BUILD_ROOT}"           ]] && mkdir -p "${BUILD_ROOT}"           || echo "Output directory already exists: BUILD_ROOT=${BUILD_ROOT}"
-
-GTEST_BUILD_ROOT=${BUILD_ROOT}/gtest
-[[ ! -d "${GTEST_BUILD_ROOT}"     ]] && mkdir -p "${GTEST_BUILD_ROOT}"     || echo "Output directory already exists: GTEST_BUILD_ROOT=${GTEST_BUILD_ROOT}"
-
-# Path to Google Test source. Prefer Google Test from submodule if available:
-export GTEST_SRC_PATH=${WORKSPACE_ROOT}/third_party/googletest
-if [ ! -d "${GTEST_SRC_PATH}" ]; then
-  # If not available, then use Google Test that is installed by OS package:
-  export GTEST_SRC_PATH=/usr/src/gtest
-  if [ ! -d "${GTEST_SRC_PATH}" ]; then
-    echo "GTest not found!"
-    exit 1
-  fi
-  echo Building GTest from source: ${GTEST_SRC_PATH} ...
-fi
-
-pushd $GTEST_BUILD_ROOT
-cmake -Dgtest_build_samples=OFF \
-      -Dgmock_build_samples=OFF \
-      -Dgtest_build_tests=OFF \
-      -Dgmock_build_tests=OFF \
-      -DCMAKE_CXX_FLAGS="-fPIC $CXX_FLAGS -Wno-return-type" \
-      -DCMAKE_INSTALL_PREFIX=$BUILD_ROOT \
-      "${GTEST_SRC_PATH}"
-make install
-popd
-
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-nuget.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-nuget.cmd
deleted file mode 100644
index 8045d446e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-nuget.cmd
+++ /dev/null
@@ -1,14 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-pushd "%~dp0"
-set "PATH=%CD%;%PATH%"
-if not exist "..\packages" mkdir "..\packages"
-if not defined PackageVersion (
- for /F "tokens=*" %%i in ('git describe --tags') do (
-   set PackageVersion=%%i
- )
-)
-powershell .\build-nuget.ps1
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-nuget.ps1 b/ext/opentelemetry-cpp-1.21.0/tools/build-nuget.ps1
deleted file mode 100644
index 31e548e75..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-nuget.ps1
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Function returns 4-part 'classic' version string from SemVer 2.0 string
-function GenVer4Part([String] $Version)
-{
-  if ($Version[0] -eq 'v')
-  {
-    # If tag contains 'v' then strip it
-    $Version = $Version.substring(1)
-  }
-  # Converts from 1.2.3-build4 to 1.2.3.4
-  $Version = $Version -replace "-build", "."
-  $Version = $Version -replace "-", "."
-
-  $parts = $Version.Split('.');
-  # Add missing tuples
-  $i = $parts.Count
-  while($i -lt 4)
-  {
-    $parts += "0"
-    $i++
-  }
-
-  ,$parts
-}
-
-function New-TemporaryDirectory
-{
-  $parent = [System.IO.Path]::GetTempPath()
-  [string] $name = [System.Guid]::NewGuid()
-  New-Item -ItemType Directory -Path (Join-Path $parent $name)
-}
-
-function GetGitWorkTree()
-{
-  # TODO: presently we assume that GIT_WORK_TREE is 1-level up.
-  # Uncomment the following line if this is not the case:
-  # $result = (git rev-parse --show-toplevel) -join ''
-  $result = ( Get-Item -Path .. ).Fullname
-  $result = $result -replace '[\\/]', '\'
-  return $result
-}
-
-function CopyAll([String] $src, [String] $dest)
-{
-  $what = @("/COPYALL","/B","/SEC","/MIR")
-  $options = @("/R:0","/W:0","/NFL","/NDL","/NJH","/NJS","/NC","/NS")
-  $cmdArgs = @("$src","$dest",$what,$options)
-  robocopy @cmdArgs
-}
-
-$tempDir = New-TemporaryDirectory
-$gitWorktree = GetGitWorkTree
-
-$items = Get-ChildItem .\nuget -include *.nuspec -Recurse
-foreach ($item in $items)
-{
-  $nugetName = $item.Basename
-  $v = GenVer4Part $env:PackageVersion
-  $version = [string]::Join(".", $v, 0, 3)
-
-  Write-Output "Creating nuget $nugetName-$version ..."
-  # Copy all files from Git
-  CopyAll $gitWorkTree $tempDir.Fullname
-  # Append extra nuget package file
-  Copy-Item -Path ".\nuget\$nugetName.nuspec" -Destination $tempDir.Fullname
-  Copy-Item -Path ".\nuget\opentelemetry-icon-color.png" -Destination $tempDir.Fullname
-  # Change to temporary directory
-  Push-Location -Path $tempDir.Fullname
-  # Pack the nuget package
-  nuget pack $nugetName.nuspec -Version $version -NoDefaultExcludes
-  Pop-Location
-  $nupkgFileName = "$tempDir\$nugetName.$version.nupkg"
-  Get-Item $nupkgFileName | Copy-Item -Destination "..\packages"
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-vcpkg.sh b/ext/opentelemetry-cpp-1.21.0/tools/build-vcpkg.sh
deleted file mode 100755
index 1d62c5d31..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-vcpkg.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-export PATH=/usr/local/bin:$PATH
-DIR="$(
-  cd "$(dirname "$0")" >/dev/null 2>&1
-  pwd -P
-)"
-WORKSPACE_ROOT=$DIR/..
-
-export VCPKG_ROOT=$WORKSPACE_ROOT/tools/vcpkg
-export PATH=$VCPKG_ROOT:$PATH
-
-if [[ ! -f $DIR/vcpkg/vcpkg ]]; then
-  pushd $DIR/vcpkg
-  ./bootstrap-vcpkg.sh
-  popd
-fi
-
-vcpkg "--vcpkg-root=$VCPKG_ROOT" install gtest
-vcpkg "--vcpkg-root=$VCPKG_ROOT" install benchmark
-vcpkg "--vcpkg-root=$VCPKG_ROOT" install ms-gsl
-vcpkg "--vcpkg-root=$VCPKG_ROOT" install nlohmann-json
-vcpkg "--vcpkg-root=$VCPKG_ROOT" install abseil
-vcpkg "--vcpkg-root=$VCPKG_ROOT" install protobuf
-
-cd $WORKSPACE_ROOT
-export USE_VCPKG=1
-./tools/build.sh ${1-nostd} ${2--DCMAKE_TOOLCHAIN_FILE=$WORKSPACE_ROOT/tools/vcpkg/scripts/buildsystems/vcpkg.cmake}
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-vs2015.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-vs2015.cmd
deleted file mode 100644
index ce3f0791a..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-vs2015.cmd
+++ /dev/null
@@ -1,36 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-REM Build with Visual Studio 2015
-set "PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\bin;%PATH%"
-
-REM ### Note that vcpkg built with 2019/2017 can't be used with 2015!
-REM ### Consider to specify custom VCPKG_ROOT for 2015 as follows:
-REM
-REM set VCPKG_ROOT=C:\vcpkg.2015
-REM
-
-set BUILDTOOLS_VERSION=vs2015
-set ARCH=x64
-if NOT "%1"=="" (
-  set ARCH=%1
-)
-set "CMAKE_GEN=Ninja"
-set "VCPKG_VISUAL_STUDIO_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0"
-
-REM Building with Windows SDK 8.1
-set "PATH=%ProgramFiles(x86)%\Windows Kits\8.1\bin\%ARCH%;%PATH%"
-set WINSDK_VERSION=8.1
-set CMAKE_SYSTEM_VERSION=8.1
-set VCPKG_PLATFORM_TOOLSET=v140
-
-REM ### Replace above Windows SDK 8.1 by Windows 10 SDK if necessary.
-REM ### Resulting binaries may not be compatible with Windows 8
-REM
-REM set WINSDK_VERSION=10.0.19041.0
-REM set "PATH=%ProgramFiles(x86)%\Windows Kits\10\bin\10.0.19041.0\%ARCH%\;%PATH%"
-REM
-
-cd %~dp0
-call setup-buildtools.cmd
-call build.cmd -DMSVC_TOOLSET_VERSION=140
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-vs2017.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-vs2017.cmd
deleted file mode 100644
index 91049a5c0..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-vs2017.cmd
+++ /dev/null
@@ -1,20 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-REM Build with Visual Studio 2017
-set "BUILDTOOLS_VERSION=vs2017"
-set ARCH=x64
-if NOT "%1"=="" (
-  set ARCH=%1
-)
-
-REM ### Uncomment below to use Visual Studio MSBuild solution.
-REM ### Ninja generator produces much faster builds. But it is
-REM ### easier to debug MSBuild solution in vs2017 IDE :
-REM
-REM set "CMAKE_GEN=Visual Studio 15 2017"
-REM
-
-cd %~dp0
-call setup-buildtools.cmd
-call build.cmd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-vs2019.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-vs2019.cmd
deleted file mode 100644
index 752604b82..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-vs2019.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-REM Build with Visual Studio 2019
-set "BUILDTOOLS_VERSION=vs2019"
-set ARCH=x64
-if NOT "%1"=="" (
-  set ARCH=%1
-)
-if "%ARCH%"=="x64" (
-  REM Parameter needed for CMake Visual Studio 2019 generator
-  set CMAKE_ARCH=x64
-)
-cd %~dp0
-call setup-buildtools.cmd
-call build.cmd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build-vs2022.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build-vs2022.cmd
deleted file mode 100644
index cfe750113..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build-vs2022.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-REM Build with Visual Studio 2022
-set "BUILDTOOLS_VERSION=vs2022"
-set ARCH=x64
-if NOT "%1"=="" (
-  set ARCH=%1
-)
-if "%ARCH%"=="x64" (
-  REM Parameter needed for CMake Visual Studio 2022 generator
-  set CMAKE_ARCH=x64
-)
-cd %~dp0
-call setup-buildtools.cmd
-call build.cmd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build.cmd b/ext/opentelemetry-cpp-1.21.0/tools/build.cmd
deleted file mode 100644
index ad18ba2a9..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build.cmd
+++ /dev/null
@@ -1,177 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-REM ##########################################################################################
-REM # Build SDK with (msvc or clang) + CMake + (MSBuild or Ninja).                           #
-REM #                                                                                        #
-REM # CMake arguments may be passed as parameters to this script.                            #
-REM # If Visual Studio is not installed, then this script falls back to LLVM-CLang,          #
-REM # Emscripten or any other C++ compiler of your choice.                                   #
-REM #                                                                                        #
-REM ##########################################################################################
-REM #                                                                                        #
-REM # Options passed as environment variables:                                               #
-REM #                                                                                        #
-REM # BUILDTOOLS_VERSION - specify build tools version. See `vcvars.cmd` for details.        #
-REM # CMAKE_GEN          - specify CMake generator.                                          #
-REM # VCPKG_ROOT         - path to vcpkg root                                                #
-REM # ARCH               - architecture to build for (default: x64)                          #
-REM #                                                                                        #
-REM ##########################################################################################
-set "PATH=%PATH%;%ProgramFiles%\CMake\bin"
-pushd %~dp0
-setlocal enableextensions
-setlocal enabledelayedexpansion
-if not defined BUILDTOOLS_VERSION (
-  set BUILDTOOLS_VERSION=vs2019
-)
-
-REM ##########################################################################################
-REM Set up CMake generator. Use Ninja if available.
-REM ##########################################################################################
-for /f "tokens=*" %%F in ('where ninja') do (
-  set NINJA=%%F
-)
-
-if defined VCPKG_ROOT (
-  if not defined NINJA (
-    for /f "tokens=*" %%F in ('where /R %VCPKG_ROOT%\vcpkg\downloads\tools ninja') do (
-      set NINJA=%%F
-    )
-    popd
-  )
-)
-
-if not defined NINJA (
-  for /f "tokens=*" %%F in ('where /R %CD%\vcpkg\downloads\tools ninja') do (
-    set NINJA=%%F
-  )
-)
-
-if defined NINJA (
-  echo Found ninja: !NINJA!
-  if not defined CMAKE_GEN (
-    set CMAKE_GEN=Ninja
-  )
-)
-
-if not defined CMAKE_GEN (
-  set CMAKE_GEN=Visual Studio 16 2019
-)
-
-set "ROOT=%~dp0\.."
-if not defined ARCH (
-  set ARCH=x64
-)
-
-REM ##########################################################################################
-REM Use preinstalled vcpkg from %VCPKG_ROOT% if installed or use our local snapshot of it.
-REM ##########################################################################################
-if defined VCPKG_ROOT (
-  set "VCPKG_CMAKE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake"
-) else (
-  set "VCPKG_CMAKE=%CD%\vcpkg\scripts\buildsystems\vcpkg.cmake"
-)
-
-REM ##########################################################################################
-REM Setup Microsoft Visual C++ compiler environment (if found, if not - fallback to alternate)
-REM ##########################################################################################
-call "%~dp0\vcvars.cmd"
-
-REM Prefer Visual Studio C++ compiler if found
-for /f "tokens=*" %%F in ('where cl.exe') do (
-  set CONFIG=!CONFIG! -DCMAKE_C_COMPILER:FILEPATH="%%F" -DCMAKE_CXX_COMPILER:FILEPATH="%%F"
-  echo !CONFIG!
-)
-
-REM ##########################################################################################
-REM The following two configurations are built below:
-REM - nostd            - build with OpenTelemetry C++ Template library
-REM - stl              - build with Standard Template Library
-REM ##########################################################################################
-REM Build with nostd implementation.
-REM ##########################################################################################
-set CONFIG=-DWITH_STL:BOOL=OFF %*
-set "OUTDIR=%ROOT%\out\%BUILDTOOLS_VERSION%\nostd"
-call :build_config
-
-REM ##########################################################################################
-REM Build with STL implementation. This option does not yield benefits for vs2015 build.
-REM ##########################################################################################
-if "%BUILDTOOLS_VERSION%" neq "vs2015" (
-  set CONFIG=-DWITH_STL:BOOL=ON %*
-  set "OUTDIR=%ROOT%\out\%BUILDTOOLS_VERSION%\stl"
-  call :build_config
-)
-
-popd
-exit
-REM ##########################################################################################
-REM Function that allows to build given build configuration with MSBuild or Ninja
-REM ##########################################################################################
-:build_config
-REM TODO: consider rmdir for clean builds
-if not exist "%OUTDIR%" mkdir "%OUTDIR%"
-cd "%OUTDIR%"
-
-REM Prefer ninja if available
-if "!CMAKE_GEN!" == "Ninja" (
-  call :build_config_ninja
-  exit /b
-)
-
-if "!BUILDTOOLS_VERSION!" == "vs2015" (
-  cmake -G "!CMAKE_GEN!" -A !ARCH! -DCMAKE_TOOLCHAIN_FILE="!VCPKG_CMAKE!" !CONFIG! "!ROOT!"
-  call :build_msbuild
-  exit /b
-)
-
-if "!BUILDTOOLS_VERSION!" == "vs2017" (
-  cmake -G "!CMAKE_GEN!" -A !ARCH! -DCMAKE_TOOLCHAIN_FILE="!VCPKG_CMAKE!" !CONFIG! "!ROOT!"
-  call :build_msbuild
-  exit /b
-)
-
-if "!BUILDTOOLS_VERSION!" == "vs2019" (
-  cmake -G "!CMAKE_GEN!" -A !ARCH! -DCMAKE_TOOLCHAIN_FILE="!VCPKG_CMAKE!" !CONFIG! "!ROOT!"
-  call :build_msbuild
-  exit /b
-)
-
-REM ##########################################################################################
-REM Exotic CMake generators, like MSYS and MinGW MAY work, but untested
-REM ##########################################################################################
-cmake -G "!CMAKE_GEN!" -DCMAKE_TOOLCHAIN_FILE="!VCPKG_CMAKE!" !CONFIG! "!ROOT!"
-
-:build_msbuild
-set "SOLUTION=%OUTDIR%\opentelemetry-cpp.sln"
-msbuild "%SOLUTION%" /p:Configuration=Release /p:VcpkgEnabled=true
-exit /b
-
-REM ##########################################################################################
-REM Build using CMake+ninja: vs2019 is known to work well. vs2017 was not tested.
-REM ##########################################################################################
-REM
-REM Optional parameters may be passed to `build.cmd ARG1 ARG2 .. ARGN`.
-REM
-REM These arguments get appended to CONFIG and passed to CMake.
-REM 
-REM To build for Debug:
-REM -DCMAKE_BUILD_TYPE:STRING="Debug"
-REM 
-REM To specify alternate installation path:
-REM -DCMAKE_INSTALL_PREFIX:PATH=C:\path\to\install
-REM 
-REM To specify alternate toolchain version:
-REM -DCMAKE_C_COMPILER:FILEPATH="C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.28.29910/bin/Hostx64/x64/cl.exe"
-REM -DCMAKE_CXX_COMPILER:FILEPATH="C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.28.29910/bin/Hostx64/x64/cl.exe"
-REM 
-REM To specify alternate version of Ninja.exe:
-REM -DCMAKE_MAKE_PROGRAM="C:\PROGRAM FILES (X86)\MICROSOFT VISUAL STUDIO\2019\ENTERPRISE\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\Ninja\ninja.exe"
-REM 
-REM ##########################################################################################
-:build_config_ninja
-cmake -G "Ninja" -DCMAKE_MAKE_PROGRAM="!NINJA!" -DCMAKE_TOOLCHAIN_FILE="!VCPKG_CMAKE!" !CONFIG! "!ROOT!"
-"%NINJA%"
-exit /b
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/build.sh b/ext/opentelemetry-cpp-1.21.0/tools/build.sh
deleted file mode 100755
index 712145383..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/build.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-export PATH=/usr/local/bin:$PATH
-
-##
-## Install all build tools and dependencies on Mac
-##
-function install_mac_tools {
-  if [ ! -f $BUILDTOOLS_FILE ] ; then
-    $WORKSPACE_ROOT/tools/setup-buildtools-mac.sh
-    echo > $BUILDTOOLS_FILE
-  else
-    echo "Build tools already installed. Skipping build tools installation."
-  fi
-}
-
-##
-## Install all build tools and dependencies on Linux
-##
-function install_linux_tools {
-  if [ ! -f $BUILDTOOLS_FILE ] ; then
-    sudo $WORKSPACE_ROOT/tools/setup-buildtools.sh
-    echo > $BUILDTOOLS_FILE
-  else
-    echo "Build tools already installed. Skipping build tools installation."
-  fi
-}
-
-##
-## Build dependencies
-##
-function build_dependencies {
-  # Build Google Benchmark
-  $WORKSPACE_ROOT/tools/build-benchmark.sh
-  # Build Google Test
-  $WORKSPACE_ROOT/tools/build-gtest.sh
-}
-
-##
-## Build specific configuration for a given platform
-##
-function build {
-  echo "Build configuration: $BUILD_CONFIG"
-  cd $WORKSPACE_ROOT
-  
-  export BUILD_ROOT=`pwd`/out/$PLATFORM_NAME/$BUILD_CONFIG
-  mkdir -p $BUILD_ROOT
-  if [ ! -w $BUILD_ROOT ] ; then
-    echo "Unable to create output directory: $BUILD_ROOT"
-    exit 1
-  fi
-
-  if [ -z ${USE_VCPKG} ] ; then
-    # TODO: consider that dependencies may also be coming from OS or brew
-    build_dependencies
-  else
-    echo VCPKG_ROOT=${VCPKG_ROOT}
-    # Prefer ninja from VCPKG if available
-    NINJA=$WORKSPACE_ROOT/`find tools/vcpkg -name ninja -type f -print -quit`
-    if [ -z ${NINJA} ] ; then
-      NINJA=`which ninja`
-    fi
-  fi
-
-  # Build OpenTelemetry SDK
-  pushd $BUILD_ROOT
-  if [ -z ${NINJA} ] ; then 
-    cmake $BUILD_OPTIONS $WORKSPACE_ROOT
-    make
-  else
-    cmake -G "Ninja" $BUILD_OPTIONS $WORKSPACE_ROOT
-    echo Building with NINJA=$NINJA
-    $NINJA
-  fi
-  popd
-}
-
-function runtests {
-  pushd $BUILD_ROOT
-  ctest
-  popd
-}
-
-##
-## Clean
-##
-function clean {
-  rm -f CMakeCache.txt *.cmake
-  rm -rf out
-  rm -rf .buildtools
-# make clean
-}
-
-##
-## Detect compiler
-##
-function detect_compiler {
-  if [ -z "${CC}" ] ; then
-    # Compiler autodetection
-    if [ -z "${APPLE}" ] ; then
-      # Prefer gcc for non-Apple
-      if [ -f /usr/bin/gcc ] ; then
-        echo "gcc   version: `gcc --version`"
-        PLATFORM_NAME=`gcc -dumpmachine`-gcc-`gcc -dumpversion`
-      fi
-    else
-      # Prefer clang on Appple platforms
-      if [ -f /usr/bin/clang ] ; then
-        echo "clang version: `clang --version`"
-        PLATFORM_NAME=`clang -dumpmachine`-clang-`clang -dumpversion`
-      fi
-    fi
-  else
-    # Use compiler specified by ${CC} environment variable
-    IFS=- read $PLATFORM_NAME $COMPILER_VERSION <<< "${CC}"
-    echo "CC version: `${CC} --version`"
-    PLATFORM_NAME=$PLATFORM_NAME-`${CC} -dumpversion`
-  fi
-
-  if [ -z "${PLATFORM_NAME}" ] ; then
-    # Default configuration name for unknown compiler
-    # could be overridden by setting env var explicitly
-    PLATFORM_NAME=unknown-0
-  fi
-}
-
-##
-## Detect Host OS, install tools and detect compiler
-##
-function install_tools {
-
-  # Marker file to signal that the tools have been already installed (save build time for incremental builds)
-  BUILDTOOLS_FILE=`pwd`/.buildtools
-
-  # Host OS detection
-  OS_NAME=`uname -a`
-  case "$OS_NAME" in
-    *Darwin*)
-      export APPLE=1
-      # Set target MacOS minver
-      export MACOSX_DEPLOYMENT_TARGET=10.10
-      install_mac_tools ;;
-
-    *Linux*)
-      export LINUX=1
-      [[ -z "$NOROOT" ]] && install_linux_tools || echo "No root. Skipping build tools installation." ;;
-
-    *)
-      echo "WARNING: unsupported OS $OS_NAME. Skipping build tools installation." ;;
-  esac
-
-  detect_compiler
-}
-
-##
-## Parse arguments
-##
-function parse_args {
-  # Build debug build by default
-  if [ "$1" == "release" ] ; then
-    BUILD_TYPE="release"
-  else
-    BUILD_TYPE="debug"
-  fi
-}
-
-################################################################################################################
-
-## Switch to workspace root directory first
-DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-WORKSPACE_ROOT=$DIR/..
-cd $WORKSPACE_ROOT
-echo "Current directory is `pwd`"
-
-# Parse command line arguments
-parse_args
-
-# Install the necessary build tools if needed
-[[ -z "$NOROOT" ]] && install_tools || echo "No root: skipping build tools installation."
-
-# Build given configuration. Default configuration is ABI-stable 'nostd::' classes.
-# Please refer to CMakeLists.txt for the list of supported build configurations.
-BUILD_CONFIG=${1-nostd}
-
-shift
-BUILD_OPTIONS="$@"
-build
-runtests
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/check_copyright.sh b/ext/opentelemetry-cpp-1.21.0/tools/check_copyright.sh
deleted file mode 100755
index 69f0298c5..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/check_copyright.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if [[ ! -e tools/check_copyright.sh ]]; then
-  echo "This tool must be run from the topmost directory." >&2
-  exit 1
-fi
-
-set -e
-
-#
-# Process input file .copyright-ignore,
-# - remove comments
-# - remove blank lines
-# to create file /tmp/all_ignored
-#
-
-grep -v "^#" < .copyright-ignore | \
-grep -v "^[[:space:]]*$" > /tmp/all_ignored
-
-#
-# Find all files from the repository
-# to create file /tmp/all_checked
-#
-
-find . -type f -print | sort -u > /tmp/all_checked
-
-#
-# Filter out /tmp/all_checked,
-# remove all ignored patterns from /tmp/all_ignored
-# When the pattern is *.md,
-# make sure to filter *\.md to avoid hiding *.cmd
-# Then, *\.md needs to be escaped to *\\.md,
-# to be given to egrep, hence the sed.
-# 
-
-while IFS= read -r PATTERN; do
-  SAFE_PATTERN=`echo "${PATTERN}" | sed "s!\.!\\\\\.!g"`
-  echo "Filtering out ${SAFE_PATTERN}"
-  egrep -v "${SAFE_PATTERN}" < /tmp/all_checked > /tmp/all_checked-tmp
-  mv /tmp/all_checked-tmp /tmp/all_checked
-done < /tmp/all_ignored
-
-#
-# For all files in /tmp/all_checked
-# - verify there is copyright
-# - verify there is a license
-# and append to /tmp/all_missing
-#
-# Valid copyright strings are:
-# - Copyright The OpenTelemetry Authors
-#
-# Valid license strings are:
-# - SPDX-License-Identifier: Apache-2.0
-#
-
-rm -rf /tmp/all_missing
-touch /tmp/all_missing
-
-for FILE in `cat /tmp/all_checked`
-do
-  echo "Checking ${FILE}"
-  export COPYRIGHT=`head -10 ${FILE} | grep -c "Copyright The OpenTelemetry Authors"`
-  export LICENSE=`head -10 ${FILE} | grep -c "SPDX-License-Identifier: Apache-2.0"`
-  if [ "$COPYRIGHT" == "0" ]; then
-    echo "Missing copyright in ${FILE}" >> /tmp/all_missing
-  fi;
-  if [ "${LICENSE}" == "0" ]; then
-    echo "Missing license in ${FILE}" >> /tmp/all_missing
-  fi;
-done
-
-#
-# Final report
-#
-
-FAIL_COUNT=`wc -l < /tmp/all_missing`
-
-if [ ${FAIL_COUNT} != "0" ]; then
-  #
-  # CI FAILED
-  #
-
-  cat /tmp/all_missing
-
-  echo "Total number of failed checks: ${FAIL_COUNT}"
-  exit 1
-fi;
-
-#
-# CI PASSED
-#
-
-exit 0
-
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/download.cmd b/ext/opentelemetry-cpp-1.21.0/tools/download.cmd
deleted file mode 100644
index 266149f47..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/download.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@REM This script allows to download a file to local machine. First argument is URL
-set "PATH=%SystemRoot%;%SystemRoot%\System32;%SystemRoot%\System32\WindowsPowerShell\v1.0\;%ProgramFiles%\Git\bin"
-@powershell -File Download.ps1 %1
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/download.ps1 b/ext/opentelemetry-cpp-1.21.0/tools/download.ps1
deleted file mode 100644
index eadd46725..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/download.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-$url=$args[0]
-$arr=$args[0].Split("/")
-$fileName=$arr[$arr.Count-1]
-Invoke-WebRequest -Uri $url -OutFile $fileName -UseBasicParsing
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/format.sh b/ext/opentelemetry-cpp-1.21.0/tools/format.sh
deleted file mode 100755
index 3a3863a8e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/format.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if [[ ! -e tools/format.sh ]]; then
-  echo "This tool must be run from the topmost directory." >&2
-  exit 1
-fi
-
-set -e
-
-FIND="find . -name third_party -prune -o -name tools -prune -o -name .git -prune -o -name _deps -prune -o -name .build -prune -o -name out -prune -o -name .vs -prune -o -name opentelemetry_logo.png -prune -o -name TraceLoggingDynamic.h -prune -o"
-
-# GNU syntax.
-SED=(sed -i)
-if [[ "$(uname)" = "Darwin" ]]; then
-  SED=(sed -i "")
-fi
-
-# Correct common miscapitalizations.
-"${SED[@]}" 's/Open[t]elemetry/OpenTelemetry/g' $($FIND -type f -print)
-# No CRLF line endings, except Windows files.
-"${SED[@]}" 's/\r$//' $($FIND -name '*.ps1' -prune -o \
-  -name '*.cmd' -prune -o -type f -print)
-# No trailing spaces, except in patch.
-"${SED[@]}" 's/ \+$//' $($FIND -name "*.patch" -prune -o -type f -print)
-
-# If not overridden, try to use clang-format-18 or clang-format.
-if [[ -z "$CLANG_FORMAT" ]]; then
-  CLANG_FORMAT=clang-format
-  if which clang-format-18 >/dev/null; then
-    CLANG_FORMAT=clang-format-18
-  fi
-fi
-
-$CLANG_FORMAT -version
-$CLANG_FORMAT -i -style=file \
-  $($FIND -name '*.cc' -print -o -name '*.h' -print)
-
-if which cmake-format >/dev/null; then
-  echo "Running cmake-format $(cmake-format --version 2>&1)."
-  cmake-format -i $($FIND -name 'CMakeLists.txt' -print -name '*.cmake' -print -name '*.cmake.in' -print)
-else
-  echo "Can't find cmake-format. It can be installed with:"
-  echo "  pip install --user cmake_format"
-  exit 1
-fi
-
-if [[ -z "$BUILDIFIER" ]]; then
-  BUILDIFIER="$HOME/go/bin/buildifier"
-  if ! which "$BUILDIFIER" >/dev/null; then
-    BUILDIFIER=buildifier
-  fi
-fi
-if which "$BUILDIFIER" >/dev/null; then
-  echo "Running $BUILDIFIER"
-  "$BUILDIFIER" $($FIND -name WORKSPACE -print -o -name BUILD -print -o \
-    -name '*.BUILD' -o -name '*.bzl' -print)
-else
-  echo "Can't find buildifier. It can be installed with:"
-  echo "  go get github.com/bazelbuild/buildtools/buildifier"
-  exit 1
-fi
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/git-cl.cmd b/ext/opentelemetry-cpp-1.21.0/tools/git-cl.cmd
deleted file mode 100644
index bb25f26d1..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/git-cl.cmd
+++ /dev/null
@@ -1,23 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-setlocal enabledelayedexpansion
-if "%1" == "format" (
-  if NOT "%2" == "" (
-    where clang-format > NUL
-    if %ERRORLEVEL% neq 0 (
-      echo clang-format.exe not found in PATH!
-      echo Assuming default path for LLVM tools...
-      set PATH="C:\Program Files\LLVM\bin;!PATH!"
-    )
-    REM Assume if file exists - it's a full path, else - it's a path relative to git root.
-    if exist %2 (
-      set "FILEPATH=%2"
-    ) else (
-      set "FILEPATH=%GIT_PREFIX%%2"
-    )
-    clang-format -style=file -i --verbose !FILEPATH!
-  )
-)
-endlocal
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/git-cl.sh b/ext/opentelemetry-cpp-1.21.0/tools/git-cl.sh
deleted file mode 100755
index 53cac0a8e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/git-cl.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-if [ "format" = "$1" ]; then
-  if [ -z "$2" ]; then
-    echo Please specify file name.
-    exit
-  fi
-
-  if [ -f "$2" ]; then
-    FILEPATH=$2
-  else
-    FILEPATH=${GIT_PREFIX}$2
-  fi
-  echo Formatting $FILEPATH
-  clang-format -style=file -i $FILEPATH
-fi
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/install-vs-addons.cmd b/ext/opentelemetry-cpp-1.21.0/tools/install-vs-addons.cmd
deleted file mode 100644
index 8ae592ec3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/install-vs-addons.cmd
+++ /dev/null
@@ -1,42 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-set "PATH=%SystemRoot%;%SystemRoot%\System32;%SystemRoot%\System32\WindowsPowerShell\v1.0\;%ProgramFiles%\Git\bin"
-cd %~dp0
-call powershell -File .\install_llvm-win64.ps1
-
-REM Download Visual Studio LLVM extension required for clang build to succeed
-call download.cmd https://llvmextensions.gallerycdn.vsassets.io/extensions/llvmextensions/llvm-toolchain/1.0.363769/1560930595399/llvm.vsix
-
-REM Install optional components required for ARM build - vs2017-BuildTools
-IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" (
-"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vs_installer.exe" ^
-	modify --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" -q ^
-	--add Microsoft.VisualStudio.Component.VC.ATL ^
-	--add Microsoft.VisualStudio.Component.VC.ATL.ARM ^
-	--add Microsoft.VisualStudio.Component.VC.ATL.ARM64
-"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VSIXInstaller.exe" /q /a llvm.vsix
-)
-
-REM Install optional components required for ARM build - vs2017-Enterprise
-IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise" (
-"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vs_installer.exe" ^
-	modify --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise" -q ^
-	--add Microsoft.VisualStudio.Component.VC.ATL ^
-	--add Microsoft.VisualStudio.Component.VC.ATL.ARM ^
-	--add Microsoft.VisualStudio.Component.VC.ATL.ARM64
-"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VSIXInstaller.exe" /q /a llvm.vsix
-)
-
-REM Install optional components required for ARM build - vs2019-Enterprise
-IF EXIST %ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise (
-"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" ^
-	modify --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise" -q ^
-	--add Microsoft.VisualStudio.Component.VC.ATL ^
-	--add Microsoft.VisualStudio.Component.VC.ATL.ARM ^
-	--add Microsoft.VisualStudio.Component.VC.ATL.ARM64
-"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\VSIXInstaller.exe" /q /a llvm.vsix
-)
-
-REM Ignore failures if components have been already installed
-EXIT /b 0
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/install.sh b/ext/opentelemetry-cpp-1.21.0/tools/install.sh
deleted file mode 100755
index 58ef710cf..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/install.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-WORKSPACE_ROOT=$DIR/..
-pushd $WORKSPACE_ROOT
-OPENTELEMETRY_INSTALL_DIR=${1-/usr/local}
-echo "Install SDK to $OPENTELEMETRY_INSTALL_DIR"
-mkdir -p $OPENTELEMETRY_INSTALL_DIR/lib
-# TODO: install libraries?
-cp -R api/include $OPENTELEMETRY_INSTALL_DIR
-cp -R sdk/include/opentelemetry/sdk $OPENTELEMETRY_INSTALL_DIR/include/opentelemetry
-mkdir -p $OPENTELEMETRY_INSTALL_DIR/lib
-echo dummy > $OPENTELEMETRY_INSTALL_DIR/lib/libopentelemetry.stub
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/install_llvm-win32.ps1 b/ext/opentelemetry-cpp-1.21.0/tools/install_llvm-win32.ps1
deleted file mode 100644
index 27345a97e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/install_llvm-win32.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-$llvmVersion = "10.0.0"
-Write-Host "Installing LLVM $llvmVersion ..." -ForegroundColor Cyan
-Write-Host "Downloading..."
-$exePath = "$env:temp\LLVM-$llvmVersion-win32.exe"
-(New-Object Net.WebClient).DownloadFile("https://github.com/llvm/llvm-project/releases/download/llvmorg-$llvmVersion/LLVM-$llvmVersion-win32.exe", $exePath)
-Write-Host "Installing..."
-cmd /c start /wait $exePath /S
-Write-Host "Installed" -ForegroundColor Green
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/install_llvm-win64.ps1 b/ext/opentelemetry-cpp-1.21.0/tools/install_llvm-win64.ps1
deleted file mode 100644
index 35ab64351..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/install_llvm-win64.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-$llvmVersion = "10.0.0"
-Write-Host "Installing LLVM $llvmVersion ..." -ForegroundColor Cyan
-Write-Host "Downloading..."
-$exePath = "$env:temp\LLVM-$llvmVersion-win64.exe"
-(New-Object Net.WebClient).DownloadFile("https://github.com/llvm/llvm-project/releases/download/llvmorg-$llvmVersion/LLVM-$llvmVersion-win64.exe", $exePath)
-Write-Host "Installing..."
-cmd /c start /wait $exePath /S
-Write-Host "Installed" -ForegroundColor Green
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/nuget/OpenTelemetry.Cpp.Dev.nuspec b/ext/opentelemetry-cpp-1.21.0/tools/nuget/OpenTelemetry.Cpp.Dev.nuspec
deleted file mode 100644
index 20cf2e359..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/nuget/OpenTelemetry.Cpp.Dev.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    <id>OpenTelemetry.Cpp.Dev</id>
-    <version>0.0.0</version>
-    <authors>OpenTelemetry Authors</authors>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <license type="expression">Apache-2.0</license>
-    <licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
-    <icon>opentelemetry-icon-color.png</icon>
-    <projectUrl>https://opentelemetry.io/</projectUrl>
-    <description>OpenTelemetry C++ SDK - Development snapshot</description>
-    <tags>Observability OpenTelemetry Monitoring Telemetry Tracing native C++ v140 v141 winapp dyn rt-dyn msvcstl windesktop</tags>
-    <repository type="git" url="http://github.com/open-telemetry/opentelemetry-cpp"/>
-    <dependencies>
-    </dependencies>
-  </metadata>
-  <files>
-      <file src="api\**\*.*" target="api" />
-      <file src="examples\**\*.*" target="examples" exclude=".vs\*.*" />
-      <file src="exporters\**\*.*" target="exporters" />
-      <file src="sdk\**\*.*" target="sdk" />
-      <file src="opentelemetry-icon-color.png" target="\" />
-  </files>
-</package>
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/nuget/README.md b/ext/opentelemetry-cpp-1.21.0/tools/nuget/README.md
deleted file mode 100644
index 860aac25d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/nuget/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# NuGet package creation process
-
-This directory contains NuGet specification files (.nuspec).
-
-Creating nuget packages:
-
-1. Set `PackageVersion` environment variable that defines the package version.
-
-```console
-set PackageVersion=0.2.0
-```
-
-If environment variable is not set, then the version is automatically obtained from git tag:
-
-```console
-git describe --tags
-```
-
-2. Run `tools/build-nuget.cmd` script to create the package(s). Packages are copied to `.\packages` directory.
-
-3. Push selected package to nuget feed.
-
-Learn more about native code NuGet packages [here](https://docs.microsoft.com/en-us/nuget/guides/native-packages).
-
-## Proposed NuGet package flavors
-
-This section is a `DRAFT` - Work-in-Progress. The following packages MAY be created and published at nuget.org :
-
-| Package Name                 | Desription                                                  | Notes |
-|------------------------------|-------------------------------------------------------------|-------|
-| OpenTelemetry.Cpp.Source     | Complete recursive source code snapshot with dependencies.  |       |
-| OpenTelemetry.Cpp.Dev        | Source code snapshot excluding 3rd party dependencies.      |       |
-| OpenTelemetry.Cpp.Api        | API headers package.                                        |       |
-| OpenTelemetry.Cpp.Sdk        | SDK headers and source package.                             |       |
-| OpenTelemetry.Cpp.Ext        | Extended functionality.                                     |       |
-| OpenTelemetry.Cpp.Exporters  | Exporters.                                                  |       |
-
-Prebuilt libraries MAY be provided in future in `OpenTelemetry.Cpp.${CompilerABI}` package for each compiler.
-
-Refer to [Boost library](https://www.nuget.org/packages?q=boost) nuget packages for example how to create
-a nuget package for a given compiler and runtime, using [Fuget Package Explorer](https://www.fuget.org/)
-that allows to see the original nuget spec for each package.
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/nuget/opentelemetry-icon-color.png b/ext/opentelemetry-cpp-1.21.0/tools/nuget/opentelemetry-icon-color.png
deleted file mode 100644
index c08946be7..000000000
Binary files a/ext/opentelemetry-cpp-1.21.0/tools/nuget/opentelemetry-icon-color.png and /dev/null differ
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/CONTROL b/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/CONTROL
deleted file mode 100644
index b55440df4..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: benchmark
-Version: 1.5.3
-Homepage: https://github.com/google/benchmark
-Description: A library to support the benchmarking of functions, similar to unit-tests.
-Supports: !(arm|uwp)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/portfile.cmake b/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/portfile.cmake
deleted file mode 100644
index 9541b61de..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/portfile.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
-  set(CMAKE_C_COMPILER cl.exe)
-  set(CMAKE_CXX_COMPILER cl.exe)
-  set(MSVC_TOOLSET_VERSION 140)
-else()
-  # Make sure vs2019 compiled binaries are compat with vs2017
-  set(VCPKG_CXX_FLAGS "/Zc:__cplusplus /d2FH4-")
-  set(VCPKG_C_FLAGS "/Zc:__cplusplus /d2FH4-")
-  set(PREFER PREFER_NINJA)
-endif()
-
-#https://github.com/google/benchmark/issues/661
-vcpkg_fail_port_install(ON_TARGET "uwp") 
-
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/benchmark
-    REF c05843a9f622db08ad59804c190f98879b76beba # v1.5.3
-    SHA512 4e4b793ff6d7a4b12ce4b98cf5faa6d5d27a0a1d7be630c0c4a2a4bca5168fd94585e5e3e1a9c43603e42145ddcded8e5a3688528bf073a068f53054b86ce774
-    HEAD_REF master
-    PATCHES "version.patch"
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    ${PREFER}
-    OPTIONS
-        -DBENCHMARK_ENABLE_TESTING=OFF
-        -DCMAKE_DEBUG_POSTFIX=d
-)
-
-vcpkg_install_cmake()
-
-vcpkg_copy_pdbs()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark)
-
-vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/version.patch b/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/version.patch
deleted file mode 100644
index 067dc5892..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/benchmark/version.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1007254..47e4a1b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,8 +78,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- 
- 
- # Read the git tags to determine the project version
--include(GetGitVersion)
--get_git_version(GIT_VERSION)
-+# include(GetGitVersion)
-+# get_git_version(GIT_VERSION)
-+set(GIT_VERSION 1.5.3)
- 
- # Tell the user what versions we are using
- string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 35d559e..e9dec6d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -77,9 +77,13 @@ set(targets_export_name "${PROJECT_NAME}Targets")
- set(namespace "${PROJECT_NAME}::")
- 
- include(CMakePackageConfigHelpers)
-+# Avoid architecture compatibility check
-+set(DOCTEST_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
-+unset(CMAKE_SIZEOF_VOID_P)
- write_basic_package_version_file(
-   "${version_config}" VERSION ${GENERIC_LIB_VERSION} COMPATIBILITY SameMajorVersion
- )
-+set(CMAKE_SIZEOF_VOID_P ${DOCTEST_SIZEOF_VOID_P})
- 
- configure_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${project_config}" @ONLY)
- configure_file("${PROJECT_SOURCE_DIR}/cmake/benchmark.pc.in" "${pkg_config}" @ONLY)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/CONTROL b/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/CONTROL
deleted file mode 100644
index d766249fb..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/CONTROL
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: opentelemetry
-Version: 0.0.1
-Homepage: https://github.com/open-telemetry/opentelemetry-cpp
-Description: OpenTelemetry C++ SDK
-
-Feature: stdlib
-Description: Build OpenTelemetry with Standard Library classes
-
-Feature: abseil
-Description: Build OpenTelemetry with Abseil classes
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/TODO.md b/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/TODO.md
deleted file mode 100644
index 15414ff0b..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/TODO.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# TODO
-
-* Consider adding the following line to portfile.cmake
-
-```text
-Build-Depends: curl[ssl], nlohmann-json
-```
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/get_repo_name.sh b/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/get_repo_name.sh
deleted file mode 100644
index e98b382ba..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/get_repo_name.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-pushd $DIR/../../ > /dev/null
-basename -s .git `git config --get remote.origin.url`
-popd > /dev/null
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/portfile.cmake b/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/portfile.cmake
deleted file mode 100644
index 23a8b8799..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/portfile.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-include(vcpkg_common_functions)
-
-message("CURRENT_PACKAGES_DIR     = ${CURRENT_PACKAGES_DIR}")
-
-message("CMAKE_CURRENT_SOURCE_DIR = ${CMAKE_CURRENT_SOURCE_DIR}")
-message("CMAKE_MODULE_PATH        = ${CMAKE_MODULE_PATH}")
-message("CMAKE_CURRENT_LIST_DIR   = ${CMAKE_CURRENT_LIST_DIR}")
-
-message("VCPKG_TARGET_TRIPLET     = ${VCPKG_TARGET_TRIPLET}")
-message("VCPKG_CMAKE_SYSTEM_NAME  = ${VCPKG_CMAKE_SYSTEM_NAME}")
-message("VCPKG_LIBRARY_LINKAGE    = ${VCPKG_LIBRARY_LINKAGE}")
-
-vcpkg_check_features(
-    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    stdlib WITH_STDLIB
-)
-
-# TODO: if building dynamic, use portable ABI. if building static, use STDLIB
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  BUILD_STATIC)
-
-if (NOT DEFINED WIN32)
-  execute_process(COMMAND "${CMAKE_CURRENT_LIST_DIR}/get_repo_name.sh" OUTPUT_VARIABLE REPO_NAME ERROR_QUIET)
-  message("REPO_NAME=${REPO_NAME}")
-endif()
-
-if (DEFINED REPO_NAME)
-  # Use local snapshot since we already cloned the code
-  get_filename_component(SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
-  message("Using local source snapshot from ${SOURCE_PATH}")
-else()
-  # Fetch from GitHub master
-  message("Fetching source code from GitHub...")
-  vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO open-telemetry/opentelemetry-cpp
-    HEAD_REF master
-  )
-endif()
-
-# TODO: it will be slightly cleaner to perform pure CMake or Ninja build, by describing all possible variable options
-# as separate triplets. Since we have a fairly non-trivial build logic in build.sh script - we use it as-is for now.
-# build.sh itself should check if we are building under vcpkg and avoid installing deps that are coming from vcpkg.
-if (UNIX)
-  set(ENV{USE_VCPKG} 1)
-  set(ENV{NOROOT} 1)
-
-  # Custom options could be passed to COMMAND, e.g.
-  # vcpkg_execute_build_process(
-  #   COMMAND ${SOURCE_PATH}/tools/build.sh nostd-vcpkg -DBUILD_TESTING=OFF
-  #   ...
-  # 
-  vcpkg_execute_build_process(
-    COMMAND ${SOURCE_PATH}/tools/build.sh nostd-vcpkg ${FEATURE_OPTIONS}
-    WORKING_DIRECTORY ${SOURCE_PATH}/
-    LOGNAME build
-  )
-
-  vcpkg_execute_build_process(
-    COMMAND ${SOURCE_PATH}/tools/install.sh ${CURRENT_PACKAGES_DIR}
-    WORKING_DIRECTORY ${SOURCE_PATH}/
-    LOGNAME install
-  )
-
-else()
-  # TODO: verify Windows build
-  vcpkg_execute_build_process(
-    COMMAND ${SOURCE_PATH}/tools/build.cmd
-    WORKING_DIRECTORY ${SOURCE_PATH}/
-    LOGNAME build
-  # TODO: add Windows headers installation step
- )
-endif()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/response_file_linux.txt b/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/response_file_linux.txt
deleted file mode 100644
index 528b04a26..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/response_file_linux.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---head
---overlay-ports=tools/ports
-gtest
-benchmark
-ms-gsl
-nlohmann-json
-abseil
-protobuf
-opentelemetry
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/response_file_mac.txt b/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/response_file_mac.txt
deleted file mode 100644
index 528b04a26..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/opentelemetry/response_file_mac.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---head
---overlay-ports=tools/ports
-gtest
-benchmark
-ms-gsl
-nlohmann-json
-abseil
-protobuf
-opentelemetry
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/fix-default-proto-file-path.patch b/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/fix-default-proto-file-path.patch
deleted file mode 100644
index a5af918b3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/fix-default-proto-file-path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc
-index f192ae6..22900ed 100644
---- a/src/google/protobuf/compiler/command_line_interface.cc
-+++ b/src/google/protobuf/compiler/command_line_interface.cc
-@@ -260,11 +260,15 @@ void AddDefaultProtoPaths(
-     return;
-   }
-   // Check if the upper level directory has an "include" subdirectory.
-+  // change "'$/bin' is next to 'include'" assumption to "'$/bin/tools' is next to 'include'"
-+  for (int i = 0; i < 2; i++)
-+  {
-   pos = path.find_last_of("/\\");
-   if (pos == std::string::npos || pos == 0) {
-     return;
-   }
-   path = path.substr(0, pos);
-+  }
-   if (IsInstalledProtoPath(path + "/include")) {
-     paths->push_back(
-         std::pair<std::string, std::string>("", path + "/include"));
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/fix-static-build.patch b/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/fix-static-build.patch
deleted file mode 100644
index 0ba4982fe..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/fix-static-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/install.cmake b/cmake/install.cmake
-index 4091bc8..9850018 100644
---- a/cmake/install.cmake
-+++ b/cmake/install.cmake
-@@ -31,7 +31,7 @@ endforeach()
- if (protobuf_BUILD_PROTOC_BINARIES)
-   install(TARGETS protoc EXPORT protobuf-targets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
--  if (UNIX AND NOT APPLE)
-+  if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME)
-     set_property(TARGET protoc
-       PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-   elseif (APPLE)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/port_def.patch b/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/port_def.patch
deleted file mode 100644
index 31d71531d..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/port_def.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
-index f7b64a080..3493d9082 100644
---- a/src/google/protobuf/port_def.inc
-+++ b/src/google/protobuf/port_def.inc
-@@ -564,7 +564,8 @@
- 
- // Our use of constinit does not yet work with GCC:
- // https://github.com/protocolbuffers/protobuf/issues/8310
--#if defined(__cpp_constinit) && !defined(__GNUC__)
-+// Does not work yet with Visual Studio 2019 Update 16.10
-+#if defined(__cpp_constinit) && !defined(__GNUC__) && !defined(_MSC_VER)
- #define PROTOBUF_CONSTINIT constinit
- #elif defined(__has_cpp_attribute)
- #if __has_cpp_attribute(clang::require_constant_initialization)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/portfile.cmake b/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/portfile.cmake
deleted file mode 100644
index 8f7c3b119..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/portfile.cmake
+++ /dev/null
@@ -1,127 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO protocolbuffers/protobuf
-    REF 436bd7880e458532901c58f4d9d1ea23fa7edd52    #v3.15.8
-    SHA512 88bb9a965bccfe11a07aee2c0c16eb9cc1845ea2d7500ef6def3e1c0a8155ac4eadd0ceef4b12552960dffe95a0fc82549d1abba71ca073ab86ec5de57d9cafb
-    HEAD_REF master
-    PATCHES
-        fix-static-build.patch
-        fix-default-proto-file-path.patch
-        port_def.patch
-)
-
-string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" protobuf_BUILD_SHARED_LIBS)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" protobuf_MSVC_STATIC_RUNTIME)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        zlib protobuf_WITH_ZLIB
-)
-
-if(VCPKG_TARGET_IS_UWP)
-    set(protobuf_BUILD_LIBPROTOC OFF)
-else()
-    set(protobuf_BUILD_LIBPROTOC ON)
-endif()
-
-if (VCPKG_DOWNLOAD_MODE)
-    # download PKGCONFIG in download mode which is used in `vcpkg_fixup_pkgconfig()` at the end of this script.
-    # download it here because `vcpkg_configure_cmake()` halts execution in download mode when running configure process.
-    vcpkg_find_acquire_program(PKGCONFIG)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/cmake
-    PREFER_NINJA
-    OPTIONS
-        -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS}
-        -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME}
-        -Dprotobuf_BUILD_TESTS=OFF
-        -DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf
-        -Dprotobuf_BUILD_PROTOC_BINARIES=${protobuf_BUILD_PROTOC_BINARIES}
-        -Dprotobuf_BUILD_LIBPROTOC=${protobuf_BUILD_LIBPROTOC}
-        ${FEATURE_OPTIONS}
-)
-
-vcpkg_install_cmake()
-
-# It appears that at this point the build hasn't actually finished. There is probably
-# a process spawned by the build, therefore we need to wait a bit.
-
-function(protobuf_try_remove_recurse_wait PATH_TO_REMOVE)
-    file(REMOVE_RECURSE ${PATH_TO_REMOVE})
-    if (EXISTS "${PATH_TO_REMOVE}")
-        execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5)
-        file(REMOVE_RECURSE ${PATH_TO_REMOVE})
-    endif()
-endfunction()
-
-protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/include)
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake
-        "\${_IMPORT_PREFIX}/bin/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
-        "\${_IMPORT_PREFIX}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
-    )
-endif()
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(READ ${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake DEBUG_MODULE)
-    string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
-    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}" DEBUG_MODULE "${DEBUG_MODULE}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake "${DEBUG_MODULE}")
-endif()
-
-protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share)
-
-if(protobuf_BUILD_PROTOC_BINARIES)
-    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
-        vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN)
-    else()
-        vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.15.8.0 AUTO_CLEAN)
-    endif()
-else()
-    file(COPY ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-endif()
-
-vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake
-    "if(protobuf_MODULE_COMPATIBLE)"
-    "if(ON)"
-)
-if(NOT protobuf_BUILD_LIBPROTOC)
-    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake
-        "_protobuf_find_libraries(Protobuf_PROTOC protoc)"
-        ""
-    )
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
-    protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h
-        "\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_"
-        "\#ifndef PROTOBUF_USE_DLLS\n\#define PROTOBUF_USE_DLLS\n\#endif // PROTOBUF_USE_DLLS\n\n\#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_"
-    )
-endif()
-
-vcpkg_copy_pdbs()
-set(packages protobuf protobuf-lite)
-foreach(_package IN LISTS packages)
-    set(_file ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_package}.pc)
-    if(EXISTS "${_file}")
-        vcpkg_replace_string(${_file} "-l${_package}" "-l${_package}d")
-    endif()
-endforeach()
-
-vcpkg_fixup_pkgconfig()
-
-if(NOT protobuf_BUILD_PROTOC_BINARIES)
-    configure_file(${CMAKE_CURRENT_LIST_DIR}/protobuf-targets-vcpkg-protoc.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-targets-vcpkg-protoc.cmake COPYONLY)
-endif()
-
-configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake b/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake
deleted file mode 100644
index 149e6587e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-# Create imported target protobuf::protoc
-add_executable(protobuf::protoc IMPORTED)
-
-# Import target "protobuf::protoc" for configuration "Release"
-set_property(TARGET protobuf::protoc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-set_target_properties(protobuf::protoc PROPERTIES
-    IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}"
-)
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/vcpkg-cmake-wrapper.cmake b/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 3cdf93012..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
-    cmake_policy(PUSH)
-    cmake_policy(SET CMP0057 NEW)
-    if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS)
-        if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
-            set(Protobuf_USE_STATIC_LIBS ON)
-        else()
-            set(Protobuf_USE_STATIC_LIBS OFF)
-        endif()
-    endif()
-    cmake_policy(POP)
-endif()
-
-find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH)
-
-_find_package(${ARGS})
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/vcpkg.json b/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/vcpkg.json
deleted file mode 100644
index 5f1926a08..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/ports/protobuf/vcpkg.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "protobuf",
-  "version-semver": "3.15.8",
-  "port-version": 2,
-  "description": "Protocol Buffers - Google's data interchange format",
-  "homepage": "https://github.com/protocolbuffers/protobuf",
-  "dependencies": [
-    {
-      "name": "protobuf",
-      "host": true
-    }
-  ],
-  "features": {
-    "zlib": {
-      "description": "ZLib based features like Gzip streams",
-      "dependencies": [
-        "zlib"
-      ]
-    }
-  }
-}
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools-mac.sh b/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools-mac.sh
deleted file mode 100755
index c73d5ecd2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools-mac.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-
-# TODO: it's not ideal experience, but we use have to use brew-provided deps.
-# Sometimes we might run into a situation where a different user takes over
-# control of the brew dirs. That causes the brew update to fail.
-# Temporarily allow the user to take over control of brew files.
-
-echo ***
-echo *** You may need to enter your admin password to update the brew files:
-echo ***
-
-which -s brew
-if [[ $? != 0 ]] ; then
-    # Install Homebrew
-    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-else
-    # FIXME: do we always require the brew update??
-    brew update
-fi
-
-sudo chown -R $(whoami) /usr/local/Cellar
-sudo chown -R $(whoami) /usr/local/Homebrew
-sudo chown -R $(whoami) /usr/local/var/homebrew
-sudo chown -R $(whoami) /usr/local/etc/bash_completion.d /usr/local/include /usr/local/lib/pkgconfig /usr/local/share/aclocal /usr/local/share/locale /usr/local/share/zsh /usr/local/share/zsh/site-functions /usr/local/var/homebrew/locks
-
-brew install cmake
-brew install coreutils
-brew install wget
-brew install clang-format
-brew install google-benchmark
-brew tap nlohmann/json
-brew install nlohmann-json
-brew install abseil
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools.cmd b/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools.cmd
deleted file mode 100644
index c9a9d9ca2..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools.cmd
+++ /dev/null
@@ -1,76 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-setlocal enableextensions
-setlocal enabledelayedexpansion
-set "PATH=%ProgramFiles%\CMake\bin;%~dp0;%ProgramData%\chocolatey\bin;%PATH%"
-if defined VCPKG_ROOT (
-  set "PATH=%VCPKG_ROOT%;%PATH%"
-) else (
-  set "PATH=%~dp0vcpkg;%PATH%"
-  set "VCPKG_ROOT=%~dp0vcpkg"
-)
-pushd %~dp0
-
-net session >nul 2>&1
-if %errorLevel% == 0 (
-  echo Running with Administrative privilege...
-  REM Fail if chocolatey is not installed
-  where /Q choco
-  if %ERRORLEVEL% == 1 (
-    echo This script requires chocolatey. Installation instructions: https://chocolatey.org/docs/installation
-    exit -1
-  )
-  REM Install tools needed for building, but only if not installed yet
-  where /Q vswhere || choco install -y vswhere
-  where /Q cmake || choco install -y cmake
-  where /Q git || choco install -y git
-) else (
-  echo Running without Administrative privilege...
-)
-
-if not defined BUILDTOOLS_VERSION (
-  REM Print current Visual Studio installations detected
-  where /Q vswhere
-  if %ERRORLEVEL% == 0 (
-    echo Visual Studio installations detected:
-    vswhere -property installationPath
-  )
-)
-
-REM This script allows to pass architecture in ARCH env var
-if not defined ARCH (
-  set ARCH=x64
-)
-
-REM Try to autodetect Visual Studio
-call "%~dp0vcvars.cmd"
-if "%TOOLS_VS_NOTFOUND%" == "1" (
-  echo WARNING: cannot autodetect Visual Studio installation!
-)
-
-where /Q vcpkg.exe
-if %ERRORLEVEL% == 1 (
-  REM Build our own vcpkg from source
-  REM Prefer building in VCPKG_ROOT
-  pushd "!VCPKG_ROOT!"
-  call bootstrap-vcpkg.bat
-  popd
-) else (
-  echo Using existing vcpkg installation...
-)
-
-REM Install dependencies
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install gtest:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install --overlay-ports=%~dp0ports benchmark:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install --overlay-ports=%~dp0ports protobuf:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install ms-gsl:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install nlohmann-json:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install abseil:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install gRPC:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install prometheus-cpp:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install curl:%ARCH%-windows
-vcpkg "--vcpkg-root=%VCPKG_ROOT%" install thrift:%ARCH%-windows
-popd
-exit /b 0
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools.sh b/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools.sh
deleted file mode 100755
index 06eba04ac..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-buildtools.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-# Switch to workspace root directory first
-DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-if [ -f /bin/yum ] ; then
-# Prefer yum over apt-get
-yum -y install automake
-yum -y install autoconf
-yum -y install libtool
-yum -y install make gcc gcc-c++
-yum -y install wget
-yum -y install libcurl
-yum -y install zlib-devel
-yum -y install git
-yum -y install gperftools-libs
-yum -y install libcurl-devel
-yum -y install rpm-build
-
-# Install gcc-7
-# FIXME: current tooling is CentOS-centric :-/
-yum -y install centos-release-scl
-yum -y install devtoolset-7
-yum -y install devtoolset-7-valgrind
-
-yum-config-manager --enable rhel-server-rhscl-7-rpms
-
-else
-# Use apt-get
-export DEBIAN_FRONTEND=noninteractive
-apt-get update -y
-apt-get install -qq automake
-apt-get install -qq bc
-apt-get install -qq libtool-bin
-apt-get install -qq cmake
-apt-get install -qq curl
-apt-get install -qq libcurl4-openssl-dev
-apt-get install -qq zlib1g-dev
-apt-get install -qq git
-apt-get install -qq build-essential
-apt-get install -qq libssl-dev
-apt-get install -qq libsqlite3-dev
-# Stock sqlite may be too old
-#apt install libsqlite3-dev
-apt-get install -qq wget
-apt-get install -qq clang-format
-apt-get install -qq libgtest-dev
-apt-get install -qq libbenchmark-dev
-apt-get install -qq nlohmann-json-dev
-fi
-
-# Build and install latest CMake
-$DIR/setup-cmake.sh
-
-## Change owner from root to current dir owner
-chown -R `stat . -c %u:%g` *
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-cfssl.sh b/ext/opentelemetry-cpp-1.21.0/tools/setup-cfssl.sh
deleted file mode 100755
index 0a4303ce3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-cfssl.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-[ -z "${CFSSL_VERSION}" ] && export CFSSL_VERSION="1.6.3"
-
-curl -s -L -o /bin/cfssl https://github.com/cloudflare/cfssl/releases/download/v${CFSSL_VERSION}/cfssl_${CFSSL_VERSION}_linux_amd64
-curl -s -L -o /bin/cfssljson https://github.com/cloudflare/cfssl/releases/download/v${CFSSL_VERSION}/cfssljson_${CFSSL_VERSION}_linux_amd64
-chmod +x /bin/cfssl
-chmod +x /bin/cfssljson
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-cmake.sh b/ext/opentelemetry-cpp-1.21.0/tools/setup-cmake.sh
deleted file mode 100755
index d6c4a5b6e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-cmake.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#
-# This script installs latest CMake on Linux machine
-#
-set -e
-
-export PATH=/usr/local/bin:$PATH
-# Min required CMake version
-export CMAKE_MIN_VERSION=${1:-3.1.0}
-# Target version to install if min required is not found
-export CMAKE_VERSION=${2:-3.18.4}
-
-UPGRADE_NEEDED=no
-
-function splitVersion {
-  pattern='([^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]'
-  v1=$(cut -d '.' -f 1 <<< $ver )
-  v2=$(cut -d '.' -f 2 <<< $ver )
-  v3=$(cut -d '.' -f 3 <<< $ver )
-}
-
-function checkVersion {
-  # Current CMake version
-  currVer=`cmake --version | grep version | cut -d' ' -f 3`
-  ver=$currVer splitVersion
-  cv1=$v1
-  cv2=$v2
-  cv3=$v3
-  cv=`echo "65536*$v1+256*$v2+$v3" | bc`
-
-  # New CMake version
-  ver=$CMAKE_MIN_VERSION splitVersion
-  nv=`echo "65536*$v1+256*$v2+$v3" | bc`
-  if [ "$cv" -ge "$nv" ]; then
-    echo "CMake is already installed: $currVer"
-  else
-    UPGRADE_NEEDED=yes
-  fi
-}
-
-checkVersion
-
-if [[ "$UPGRADE_NEEDED" == "no" ]]; then
-  echo "Skipping CMake installation"
-  exit 0
-fi
-
-# Download cmake to /tmp
-pushd /tmp
-if [[ ! -f "/tmp/cmake.tar.gz" ]]; then
-  wget -O /tmp/cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz
-  tar -zxvf /tmp/cmake.tar.gz
-fi
-# Bootstrap CMake
-cd cmake-${CMAKE_VERSION}
-./bootstrap --prefix=/usr/local
-# Build CMake without CMake and without Ninja (slow)
-make
-make install
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-devenv.cmd b/ext/opentelemetry-cpp-1.21.0/tools/setup-devenv.cmd
deleted file mode 100644
index e6088c2d3..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-devenv.cmd
+++ /dev/null
@@ -1,9 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-endlocal
-set "PATH=%~dp0;%PATH%"
-set "TOOLS_PATH=%~dp0"
-set "TOOLS_PATH_UNIX=%TOOLS_PATH:\=/%"
-git config alias.cl !%TOOLS_PATH_UNIX%git-cl.cmd
-exit /b 0
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-devenv.sh b/ext/opentelemetry-cpp-1.21.0/tools/setup-devenv.sh
deleted file mode 100755
index 6fd3a254e..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-devenv.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-# Try to autodetect the tools dir
-if [ "$BASH_SOURCE" != "" ]; then
-TOOLS_PATH=`dirname ${BASH_SOURCE[0]}`
-else
-TOOLS_PATH=`pwd`/tools
-fi
-echo "Tools directory: $TOOLS_PATH"
-
-# Install build tools if not installed yet
-FILE=.buildtools
-OS_NAME=`uname -a`
-if [ ! -f $FILE ]; then
-case "$OS_NAME" in
- *Darwin*) tools/setup-buildtools-mac.sh ;;
- *Linux*)  [[ -z "$NOROOT" ]] && sudo $TOOLS_PATH/setup-buildtools.sh || echo "No root: skipping build tools installation." ;;
- *)        echo "WARNING: unsupported OS $OS_NAME , skipping build tools installation.."
-esac
-# Assume that the build tools have been successfully installed
-echo > $FILE
-else
-echo Build tools have been already installed, skipping installation.
-fi
-
-# Configure git aliases for current session
-export PATH=$TOOLS_PATH:$PATH
-git config alias.cl '!git-cl.sh'
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-ninja.sh b/ext/opentelemetry-cpp-1.21.0/tools/setup-ninja.sh
deleted file mode 100755
index b6a9ee767..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-ninja.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-set -e
-
-# TODO: add support for Ninja on Mac OS X
-wget -O /tmp/ninja.zip https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-linux.zip
-sudo unzip /tmp/ninja.zip -d /usr/local/bin/
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/setup-protobuf.sh b/ext/opentelemetry-cpp-1.21.0/tools/setup-protobuf.sh
deleted file mode 100755
index 2549c5aa8..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/setup-protobuf.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-pushd /tmp
-curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protoc-3.14.0-linux-x86_64.zip
-unzip -o protoc-3.14.0-linux-x86_64.zip -d /usr/local/
-update-alternatives --install /usr/bin/protoc protoc /usr/local/bin/protoc 1 --force
-popd
diff --git a/ext/opentelemetry-cpp-1.21.0/tools/vcvars.cmd b/ext/opentelemetry-cpp-1.21.0/tools/vcvars.cmd
deleted file mode 100644
index 5b78a1706..000000000
--- a/ext/opentelemetry-cpp-1.21.0/tools/vcvars.cmd
+++ /dev/null
@@ -1,200 +0,0 @@
-REM Copyright The OpenTelemetry Authors
-REM SPDX-License-Identifier: Apache-2.0
-
-@echo off
-REM +-------------------------------------------------------------------+
-REM | Autodetect and set up the build environment.                      |
-REM | Build Tools version may be specified as 1st argument.             |
-REM +-------------------------------------------------------------------+
-REM | Description                             | Argument value          |
-REM +-----------------------------------------+-------------------------+
-REM | Autodetect Visual Studio 2022           | vs2022                  |
-REM | Visual Studio 2022 Enterprise           | vs2022_enterprise       |
-REM | Visual Studio 2022 Professional         | vs2022_professional     |
-REM | Visual Studio 2022 Community            | vs2022_community        |
-REM | Visual Studio 2022 Build Tools (no IDE) | vs2022_buildtools       |
-REM |                                         |                         |
-REM | Autodetect Visual Studio 2019           | vs2019                  |
-REM | Visual Studio 2019 Enterprise           | vs2019_enterprise       |
-REM | Visual Studio 2019 Professional         | vs2019_professional     |
-REM | Visual Studio 2019 Community            | vs2019_community        |
-REM | Visual Studio 2019 Build Tools (no IDE) | vs2019_buildtools       |
-REM |                                         |                         |
-REM | Autodetect Visual Studio 2017           | vs2017                  |
-REM | Visual Studio 2017 Enterprise           | vs2017_enterprise       |
-REM | Visual Studio 2017 Professional         | vs2017_professional     |
-REM | Visual Studio 2017 Community            | vs2017_community        |
-REM | Visual Studio 2017 Build Tools (no IDE) | vs2017_buildtools       |
-REM |                                         |                         |
-REM | Visual Studio 2015 Build Tools (no IDE) | vs2015                  |
-REM |                                         |                         |
-REM | LLVM Clang (any version)                | clang                   |
-REM | LLVM Clang 9                            | clang-9                 |
-REM | LLVM Clang 10                           | clang-10                |
-REM | LLVM Clang 11                           | clang-11                |
-REM | LLVM Clang 11                           | clang-12                |
-REM +-----------------------------------------+-------------------------+
-set "VSCMD_START_DIR=%CD%"
-
-if not defined ARCH (
-  set ARCH=x64
-)
-
-if "%1" neq "" (
-  goto %1
-)
-
-if defined BUILDTOOLS_VERSION (
-  goto %BUILDTOOLS_VERSION%
-)
-
-:vs2022
-:vs2022_enterprise
-set TOOLS_VS2022_ENTERPRISE="%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2022_ENTERPRISE% (
-  echo Building with vs2022 Enterprise...
-  call %TOOLS_VS2022_ENTERPRISE% %ARCH%
-  goto tools_configured
-)
-
-:vs2022_professional
-set TOOLS_VS2022_PRO="%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2022_PRO% (
-  echo Building with vs2022 Professional...
-  call %TOOLS_VS2022_PRO% %ARCH%
-  goto tools_configured
-)
-
-:vs2022_community
-set TOOLS_VS2022_COMMUNITY="%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2022_COMMUNITY% (
-  echo Building with vs2022 Community...
-  call %TOOLS_VS2022_COMMUNITY% %ARCH%
-  goto tools_configured
-)
-
-:vs2022_buildtools
-set TOOLS_VS2022="%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2022% (
-  echo Building with vs2022 BuildTools...
-  call %TOOLS_VS2022% %ARCH%
-  goto tools_configured
-)
-
-:vs2019
-:vs2019_enterprise
-set TOOLS_VS2019_ENTERPRISE="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2019_ENTERPRISE% (
-  echo Building with vs2019 Enterprise...
-  call %TOOLS_VS2019_ENTERPRISE% %ARCH%
-  goto tools_configured
-)
-
-:vs2019_professional
-set TOOLS_VS2019_PRO="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2019_PRO% (
-  echo Building with vs2019 Professional...
-  call %TOOLS_VS2019_PRO% %ARCH%
-  goto tools_configured
-)
-
-:vs2019_community
-set TOOLS_VS2019_COMMUNITY="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2019_COMMUNITY% (
-  echo Building with vs2019 Community...
-  call %TOOLS_VS2019_COMMUNITY% %ARCH%
-  goto tools_configured
-)
-
-:vs2019_buildtools
-set TOOLS_VS2019="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2019% (
-  echo Building with vs2019 BuildTools...
-  call %TOOLS_VS2019% %ARCH%
-  goto tools_configured
-)
-
-:vs2017
-:vs2017_enterprise
-set TOOLS_VS2017_ENTERPRISE="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2017_ENTERPRISE% (
-  echo Building with vs2017 Enterprise...
-  call %TOOLS_VS2017_ENTERPRISE% %ARCH%
-  goto tools_configured
-)
-
-:vs2017_professional
-set TOOLS_VS2017_PRO="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2017_PRO% (
-  echo Building with vs2017 Professional...
-  call %TOOLS_VS2017_PRO% %ARCH%
-  goto tools_configured
-)
-
-:vs2017_community
-set TOOLS_VS2017_COMMUNITY="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2017_COMMUNITY% (
-  echo Building with vs2017 Community...
-  call %TOOLS_VS2017_COMMUNITY% %ARCH%
-  goto tools_configured
-)
-
-:vs2017_buildtools
-set TOOLS_VS2017="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"
-if exist %TOOLS_VS2017% (
-  echo Building with vs2017 BuildTools...
-  call %TOOLS_VS2017% %ARCH%
-  goto tools_configured
-)
-
-:vs2015
-set TOOLS_VS2015="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
-if exist %TOOLS_VS2015% (
-  echo Building with vs2015 BuildTools...
-  call %TOOLS_VS2015% %ARCH% %WINSDK_VERSION%
-  set "VCPKG_VISUAL_STUDIO_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0"
-  set VCPKG_PLATFORM_TOOLSET=v140
-  goto tools_configured
-)
-
-echo WARNING: cannot auto-detect Visual Studio version !!!
-REM Caller may decide what to do if Visual Studio environment
-REM is not set up by checking TOOLS_VS_NOTFOUND
-set TOOLS_VS_NOTFOUND=1
-exit /b 0
-
-REM +-------------------------------------------------------------------+
-REM | There is no auto-detection of LLVM Clang version.                 |
-REM | LLVM Clang of any version is installed in the same directory      |
-REM | at %ProgramFiles%\LLVM\bin . Developers choose their own custom   |
-REM | layout for installing multiple clang toolchains side-by-side.     |
-REM |                                                                   |
-REM | Example layout (merely a guideline, layout could differ):         |
-REM |                                                                   |
-REM | %ProgramFiles%\LLVM-9\bin                                         |
-REM | %ProgramFiles%\LLVM-10\bin                                        |
-REM | %ProgramFiles%\LLVM-11\bin                                        |
-REM | %ProgramFiles%\LLVM-12\bin                                        |
-REM +-------------------------------------------------------------------+
-REM
-REM ## Example 1: use clang-10 located in LLVM-10 directory:
-REM set BUILDTOOLS_VERSION=clang-10
-REM set "PATH=%ProgramFiles%\LLVM-10\bin;%PATH%"
-REM tools\build.cmd
-REM
-REM ## Example 2: use whatever clang located in LLVM directory:
-REM set BUILDTOOLS_VERSION=clang
-REM set "PATH=%ProgramFiles%\LLVM\bin;%PATH%"
-REM tools\build.cmd
-REM
-REM BUILDTOOLS_VERSION determines the output directory location.
-REM Store build artifacts produced by different toolchains -
-REM side-by-side, each in its own separate output directory.
-REM
-:clang
-:clang-9
-:clang-10
-:clang-11
-:clang-12
-
-:tools_configured
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/baggage.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/baggage.h
deleted file mode 100644
index 6c799cda2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/baggage.h
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cctype>
-
-#include "opentelemetry/common/kv_properties.h"
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace baggage
-{
-
-class OPENTELEMETRY_EXPORT Baggage
-{
-public:
-  static constexpr size_t kMaxKeyValuePairs = 180;
-  static constexpr size_t kMaxKeyValueSize  = 4096;
-  static constexpr size_t kMaxSize          = 8192;
-  static constexpr char kKeyValueSeparator  = '=';
-  static constexpr char kMembersSeparator   = ',';
-  static constexpr char kMetadataSeparator  = ';';
-
-  Baggage() noexcept : kv_properties_(new common::KeyValueProperties()) {}
-  Baggage(size_t size) noexcept : kv_properties_(new common::KeyValueProperties(size)) {}
-
-  template <class T>
-  Baggage(const T &keys_and_values) noexcept
-      : kv_properties_(new common::KeyValueProperties(keys_and_values))
-  {}
-
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<Baggage> GetDefault()
-  {
-    static nostd::shared_ptr<Baggage> baggage{new Baggage()};
-    return baggage;
-  }
-
-  /* Get value for key in the baggage
-     @returns true if key is found, false otherwise
-  */
-  bool GetValue(nostd::string_view key, std::string &value) const noexcept
-  {
-    return kv_properties_->GetValue(key, value);
-  }
-
-  /* Returns shared_ptr of new baggage object which contains new key-value pair. If key or value is
-     invalid, copy of current baggage is returned
-  */
-  nostd::shared_ptr<Baggage> Set(const nostd::string_view &key,
-                                 const nostd::string_view &value) noexcept
-  {
-
-    nostd::shared_ptr<Baggage> baggage(new Baggage(kv_properties_->Size() + 1));
-    const bool valid_kv = IsValidKey(key) && IsValidValue(value);
-
-    if (valid_kv)
-    {
-      baggage->kv_properties_->AddEntry(key, value);
-    }
-
-    // add rest of the fields.
-    kv_properties_->GetAllEntries(
-        [&baggage, &key, &valid_kv](nostd::string_view e_key, nostd::string_view e_value) {
-          // if key or value was not valid, add all the entries. Add only remaining entries
-          // otherwise.
-          if (!valid_kv || key != e_key)
-          {
-            baggage->kv_properties_->AddEntry(e_key, e_value);
-          }
-
-          return true;
-        });
-
-    return baggage;
-  }
-
-  // @return all key-values entries by repeatedly invoking the function reference passed as argument
-  // for each entry
-  bool GetAllEntries(
-      nostd::function_ref<bool(nostd::string_view, nostd::string_view)> callback) const noexcept
-  {
-    return kv_properties_->GetAllEntries(callback);
-  }
-
-  // delete key from the baggage if it exists. Returns shared_ptr of new baggage object.
-  // if key does not exist, copy of current baggage is returned.
-  // Validity of key is not checked as invalid keys should never be populated in baggage in the
-  // first place.
-  nostd::shared_ptr<Baggage> Delete(nostd::string_view key) noexcept
-  {
-    // keeping size of baggage same as key might not be found in it
-    nostd::shared_ptr<Baggage> baggage(new Baggage(kv_properties_->Size()));
-    kv_properties_->GetAllEntries(
-        [&baggage, &key](nostd::string_view e_key, nostd::string_view e_value) {
-          if (key != e_key)
-            baggage->kv_properties_->AddEntry(e_key, e_value);
-          return true;
-        });
-    return baggage;
-  }
-
-  // Returns shared_ptr of baggage after extracting key-value pairs from header
-  static nostd::shared_ptr<Baggage> FromHeader(nostd::string_view header) noexcept
-  {
-    if (header.size() > kMaxSize)
-    {
-      // header size exceeds maximum threshold, return empty baggage
-      return GetDefault();
-    }
-
-    common::KeyValueStringTokenizer kv_str_tokenizer(header);
-    size_t cnt = kv_str_tokenizer.NumTokens();  // upper bound on number of kv pairs
-    if (cnt > kMaxKeyValuePairs)
-    {
-      cnt = kMaxKeyValuePairs;
-    }
-
-    nostd::shared_ptr<Baggage> baggage(new Baggage(cnt));
-    bool kv_valid;
-    nostd::string_view key, value;
-
-    while (kv_str_tokenizer.next(kv_valid, key, value) && baggage->kv_properties_->Size() < cnt)
-    {
-      if (!kv_valid || (key.size() + value.size() > kMaxKeyValueSize))
-      {
-        // if kv pair is not valid, skip it
-        continue;
-      }
-
-      // NOTE : metadata is kept as part of value only as it does not have any semantic meaning.
-      // but, we need to extract it (else Decode on value will return error)
-      nostd::string_view metadata;
-      auto metadata_separator = value.find(kMetadataSeparator);
-      if (metadata_separator != std::string::npos)
-      {
-        metadata = value.substr(metadata_separator);
-        value    = value.substr(0, metadata_separator);
-      }
-
-      bool err       = 0;
-      auto key_str   = UrlDecode(common::StringUtil::Trim(key), err);
-      auto value_str = UrlDecode(common::StringUtil::Trim(value), err);
-
-      if (err == false && IsValidKey(key_str) && IsValidValue(value_str))
-      {
-        if (!metadata.empty())
-        {
-          value_str.append(metadata.data(), metadata.size());
-        }
-        baggage->kv_properties_->AddEntry(key_str, value_str);
-      }
-    }
-
-    return baggage;
-  }
-
-  // Creates string from baggage object.
-  std::string ToHeader() const noexcept
-  {
-    std::string header_s;
-    bool first = true;
-    kv_properties_->GetAllEntries([&](nostd::string_view key, nostd::string_view value) {
-      if (!first)
-      {
-        header_s.push_back(kMembersSeparator);
-      }
-      else
-      {
-        first = false;
-      }
-      header_s.append(UrlEncode(key));
-      header_s.push_back(kKeyValueSeparator);
-
-      // extracting metadata from value. We do not encode metadata
-      auto metadata_separator = value.find(kMetadataSeparator);
-      if (metadata_separator != std::string::npos)
-      {
-        header_s.append(UrlEncode(value.substr(0, metadata_separator)));
-        auto metadata = value.substr(metadata_separator);
-        header_s.append(std::string(metadata.data(), metadata.size()));
-      }
-      else
-      {
-        header_s.append(UrlEncode(value));
-      }
-      return true;
-    });
-    return header_s;
-  }
-
-private:
-  static bool IsPrintableString(nostd::string_view str)
-  {
-    for (const auto ch : str)
-    {
-      if (ch < ' ' || ch > '~')
-      {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  static bool IsValidKey(nostd::string_view key) { return key.size() && IsPrintableString(key); }
-
-  static bool IsValidValue(nostd::string_view value) { return IsPrintableString(value); }
-
-  // Uri encode key value pairs before injecting into header
-  // Implementation inspired from : https://golang.org/src/net/url/url.go?s=7851:7884#L264
-  static std::string UrlEncode(nostd::string_view str)
-  {
-    auto to_hex = [](char c) -> char {
-      static const char *hex = "0123456789ABCDEF";
-      return hex[c & 15];
-    };
-
-    std::string ret;
-
-    for (auto c : str)
-    {
-      if (std::isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
-      {
-        ret.push_back(c);
-      }
-      else if (c == ' ')
-      {
-        ret.push_back('+');
-      }
-      else
-      {
-        ret.push_back('%');
-        ret.push_back(to_hex(c >> 4));
-        ret.push_back(to_hex(c & 15));
-      }
-    }
-
-    return ret;
-  }
-
-  // Uri decode key value pairs after extracting from header
-  static std::string UrlDecode(nostd::string_view str, bool &err)
-  {
-    auto IsHex = [](char c) {
-      return std::isdigit(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
-    };
-
-    auto from_hex = [](char c) -> char {
-      // c - '0' produces integer type which could trigger error/warning when casting to char,
-      // but the cast is safe here.
-      return static_cast<char>(std::isdigit(c) ? c - '0' : std::toupper(c) - 'A' + 10);
-    };
-
-    std::string ret;
-
-    for (size_t i = 0; i < str.size(); i++)
-    {
-      if (str[i] == '%')
-      {
-        if (i + 2 >= str.size() || !IsHex(str[i + 1]) || !IsHex(str[i + 2]))
-        {
-          err = 1;
-          return "";
-        }
-        ret.push_back(from_hex(str[i + 1]) << 4 | from_hex(str[i + 2]));
-        i += 2;
-      }
-      else if (str[i] == '+')
-      {
-        ret.push_back(' ');
-      }
-      else if (std::isalnum(str[i]) || str[i] == '-' || str[i] == '_' || str[i] == '.' ||
-               str[i] == '~')
-      {
-        ret.push_back(str[i]);
-      }
-      else
-      {
-        err = 1;
-        return "";
-      }
-    }
-
-    return ret;
-  }
-
-private:
-  // Store entries in a C-style array to avoid using std::array or std::vector.
-  nostd::unique_ptr<common::KeyValueProperties> kv_properties_;
-};
-
-}  // namespace baggage
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/baggage_context.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/baggage_context.h
deleted file mode 100644
index a0016353b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/baggage_context.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-
-namespace baggage
-{
-
-static const std::string kBaggageHeader = "baggage";
-
-inline nostd::shared_ptr<Baggage> GetBaggage(const context::Context &context) noexcept
-{
-  context::ContextValue context_value = context.GetValue(kBaggageHeader);
-  if (nostd::holds_alternative<nostd::shared_ptr<Baggage>>(context_value))
-  {
-    return nostd::get<nostd::shared_ptr<Baggage>>(context_value);
-  }
-  static nostd::shared_ptr<Baggage> empty_baggage{new Baggage()};
-  return empty_baggage;
-}
-
-inline context::Context SetBaggage(context::Context &context,
-                                   const nostd::shared_ptr<Baggage> &baggage) noexcept
-{
-  return context.SetValue(kBaggageHeader, baggage);
-}
-
-}  // namespace baggage
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/propagation/baggage_propagator.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/propagation/baggage_propagator.h
deleted file mode 100644
index d75409ed6..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/baggage/propagation/baggage_propagator.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/baggage/baggage.h"
-#include "opentelemetry/baggage/baggage_context.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace baggage
-{
-namespace propagation
-{
-
-class BaggagePropagator : public context::propagation::TextMapPropagator
-{
-public:
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    auto baggage = baggage::GetBaggage(context);
-    auto header  = baggage->ToHeader();
-    if (header.size())
-    {
-      carrier.Set(kBaggageHeader, header);
-    }
-  }
-
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    nostd::string_view baggage_str = carrier.Get(baggage::kBaggageHeader);
-    auto baggage                   = baggage::Baggage::FromHeader(baggage_str);
-
-    if (baggage->ToHeader().size())
-    {
-      return baggage::SetBaggage(context, baggage);
-    }
-    else
-    {
-      return context;
-    }
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return callback(kBaggageHeader);
-  }
-};
-}  // namespace propagation
-}  // namespace baggage
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/attribute_value.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/attribute_value.h
deleted file mode 100644
index af4cc83d4..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/attribute_value.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-/// OpenTelemetry signals can be enriched by adding attributes. The
-/// \c AttributeValue type is defined as a variant of all attribute value
-/// types the OpenTelemetry C++ API supports.
-///
-/// The following attribute value types are supported by the OpenTelemetry
-/// specification:
-///  - Primitive types: string, boolean, double precision floating point
-///    (IEEE 754-1985) or signed 64 bit integer.
-///  - Homogenous arrays of primitive type values.
-///
-/// \warning
-/// \parblock The OpenTelemetry C++ API currently supports several attribute
-/// value types that are not covered by the OpenTelemetry specification:
-///  - \c uint64_t
-///  - \c nostd::span<const uint64_t>
-///  - \c nostd::span<uint8_t>
-///
-/// Those types are reserved for future use and currently should not be
-/// used. There are no guarantees around how those values are handled by
-/// exporters.
-/// \endparblock
-using AttributeValue =
-    nostd::variant<bool,
-                   int32_t,
-                   int64_t,
-                   uint32_t,
-                   double,
-                   const char *,
-                   nostd::string_view,
-                   nostd::span<const bool>,
-                   nostd::span<const int32_t>,
-                   nostd::span<const int64_t>,
-                   nostd::span<const uint32_t>,
-                   nostd::span<const double>,
-                   nostd::span<const nostd::string_view>,
-                   // Not currently supported by the specification, but reserved for future use.
-                   // Added to provide support for all primitive C++ types.
-                   uint64_t,
-                   // Not currently supported by the specification, but reserved for future use.
-                   // Added to provide support for all primitive C++ types.
-                   nostd::span<const uint64_t>,
-                   // Not currently supported by the specification, but reserved for future use.
-                   // See https://github.com/open-telemetry/opentelemetry-specification/issues/780
-                   nostd::span<const uint8_t>>;
-
-enum AttributeType
-{
-  kTypeBool,
-  kTypeInt,
-  kTypeInt64,
-  kTypeUInt,
-  kTypeDouble,
-  kTypeCString,
-  kTypeString,
-  kTypeSpanBool,
-  kTypeSpanInt,
-  kTypeSpanInt64,
-  kTypeSpanUInt,
-  kTypeSpanDouble,
-  kTypeSpanString,
-  kTypeUInt64,
-  kTypeSpanUInt64,
-  kTypeSpanByte
-};
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/key_value_iterable.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/key_value_iterable.h
deleted file mode 100644
index 9d43e1571..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/key_value_iterable.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-/**
- * Supports internal iteration over a collection of key-value pairs.
- */
-class KeyValueIterable
-{
-public:
-  virtual ~KeyValueIterable() = default;
-
-  /**
-   * Iterate over key-value pairs
-   * @param callback a callback to invoke for each key-value. If the callback returns false,
-   * the iteration is aborted.
-   * @return true if every key-value pair was iterated over
-   */
-  virtual bool ForEachKeyValue(nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>
-                                   callback) const noexcept = 0;
-
-  /**
-   * @return the number of key-value pairs
-   */
-  virtual size_t size() const noexcept = 0;
-};
-
-/**
- * Supports internal iteration over a collection of key-value pairs.
- */
-class NoopKeyValueIterable : public KeyValueIterable
-{
-public:
-  ~NoopKeyValueIterable() override = default;
-
-  /**
-   * Iterate over key-value pairs
-   * @param callback a callback to invoke for each key-value. If the callback returns false,
-   * the iteration is aborted.
-   * @return true if every key-value pair was iterated over
-   */
-  bool ForEachKeyValue(
-      nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>) const noexcept override
-  {
-    return true;
-  }
-
-  /**
-   * @return the number of key-value pairs
-   */
-  size_t size() const noexcept override { return 0; }
-};
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/key_value_iterable_view.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/key_value_iterable_view.h
deleted file mode 100644
index e22fb6f06..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/key_value_iterable_view.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <initializer_list>
-#include <iterator>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-// NOTE - code within `detail` namespace implements internal details, and not part
-// of the public interface.
-namespace detail
-{
-inline void take_key_value(nostd::string_view, common::AttributeValue) {}
-
-template <class T>
-auto is_key_value_iterable_impl(T iterable)
-    -> decltype(take_key_value(std::begin(iterable)->first, std::begin(iterable)->second),
-                nostd::size(iterable),
-                std::true_type{});
-
-std::false_type is_key_value_iterable_impl(...);
-
-template <class T>
-struct is_key_value_iterable
-{
-  static const bool value = decltype(detail::is_key_value_iterable_impl(std::declval<T>()))::value;
-};
-}  // namespace detail
-
-/**
- * @brief Container for key-value pairs that can transform every value in it to one of types
- * listed in common::AttributeValue. It may contain value types that are not directly map'able
- * to primitive value types. In that case the `ForEachKeyValue` method acts as a transform to
- * convert the value type to one listed under AtributeValue (bool, int32_t, int64_t, uint32_t,
- * uint64_t, double, nostd::string_view, or arrays of primite types). For example, if UUID,
- * GUID, or UTF-16 string type is passed as one of values stored inside this container, the
- * container itself may provide a custom implementation of `ForEachKeyValue` to transform the
- * 'non-standard' type to one of the standard types.
- */
-template <class T>
-class KeyValueIterableView final : public KeyValueIterable
-{
-
-public:
-  explicit KeyValueIterableView(const T &container) noexcept : container_{&container} {}
-
-  // KeyValueIterable
-  bool ForEachKeyValue(nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>
-                           callback) const noexcept override
-  {
-    auto iter = std::begin(*container_);
-    auto last = std::end(*container_);
-    for (; iter != last; ++iter)
-    {
-      if (!callback(iter->first, iter->second))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  size_t size() const noexcept override { return nostd::size(*container_); }
-
-private:
-  const T *container_;
-};
-
-template <class T, nostd::enable_if_t<detail::is_key_value_iterable<T>::value> * = nullptr>
-KeyValueIterableView<T> MakeKeyValueIterableView(const T &container) noexcept
-{
-  return KeyValueIterableView<T>(container);
-}
-
-/**
- * Utility function to help to make a attribute view from initializer_list
- *
- * @param attributes
- * @return nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
- */
-inline static nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
-MakeAttributes(std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                   attributes) noexcept
-{
-  return nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-      attributes.begin(), attributes.end()};
-}
-
-/**
- * Utility function to help to make a attribute view from a span
- *
- * @param attributes
- * @return nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
- */
-inline static nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
-MakeAttributes(
-    nostd::span<const std::pair<nostd::string_view, common::AttributeValue>> attributes) noexcept
-{
-  return attributes;
-}
-
-/**
- * Utility function to help to make a attribute view from a KeyValueIterable
- *
- * @param attributes
- * @return common::KeyValueIterable
- */
-inline static const common::KeyValueIterable &MakeAttributes(
-    const common::KeyValueIterable &attributes) noexcept
-{
-  return attributes;
-}
-
-/**
- * Utility function to help to make a attribute view from a key-value iterable object
- *
- * @param attributes
- * @return nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>
- */
-template <
-    class ArgumentType,
-    nostd::enable_if_t<common::detail::is_key_value_iterable<ArgumentType>::value> * = nullptr>
-inline static common::KeyValueIterableView<ArgumentType> MakeAttributes(
-    const ArgumentType &arg) noexcept
-{
-  return common::KeyValueIterableView<ArgumentType>(arg);
-}
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/kv_properties.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/kv_properties.h
deleted file mode 100644
index b5accab40..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/kv_properties.h
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/string_util.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-#include <cstring>
-#include <string>
-#include <type_traits>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-
-// Constructor parameter for KeyValueStringTokenizer
-struct KeyValueStringTokenizerOptions
-{
-  char member_separator     = ',';
-  char key_value_separator  = '=';
-  bool ignore_empty_members = true;
-};
-
-// Tokenizer for key-value headers
-class KeyValueStringTokenizer
-{
-public:
-  KeyValueStringTokenizer(
-      nostd::string_view str,
-      const KeyValueStringTokenizerOptions &opts = KeyValueStringTokenizerOptions()) noexcept
-      : str_(str), opts_(opts), index_(0)
-  {}
-
-  static nostd::string_view GetDefaultKeyOrValue()
-  {
-    static std::string default_str = "";
-    return default_str;
-  }
-
-  // Returns next key value in the string header
-  // @param valid_kv : if the found kv pair is valid or not
-  // @param key : key in kv pair
-  // @param key : value in kv pair
-  // @returns true if next kv pair was found, false otherwise.
-  bool next(bool &valid_kv, nostd::string_view &key, nostd::string_view &value) noexcept
-  {
-    valid_kv = true;
-    while (index_ < str_.size())
-    {
-      bool is_empty_pair = false;
-      size_t end         = str_.find(opts_.member_separator, index_);
-      if (end == std::string::npos)
-      {
-        end = str_.size() - 1;
-      }
-      else if (end == index_)  // empty pair. do not update end
-      {
-        is_empty_pair = true;
-      }
-      else
-      {
-        end--;
-      }
-
-      auto list_member = StringUtil::Trim(str_, index_, end);
-      if (list_member.size() == 0 || is_empty_pair)
-      {
-        // empty list member
-        index_ = end + 2 - is_empty_pair;
-        if (opts_.ignore_empty_members)
-        {
-          continue;
-        }
-
-        valid_kv = true;
-        key      = GetDefaultKeyOrValue();
-        value    = GetDefaultKeyOrValue();
-        return true;
-      }
-
-      auto key_end_pos = list_member.find(opts_.key_value_separator);
-      if (key_end_pos == std::string::npos)
-      {
-        // invalid member
-        valid_kv = false;
-      }
-      else
-      {
-        key   = list_member.substr(0, key_end_pos);
-        value = list_member.substr(key_end_pos + 1);
-      }
-
-      index_ = end + 2;
-
-      return true;
-    }
-
-    // no more entries remaining
-    return false;
-  }
-
-  // Returns total number of tokens in header string
-  size_t NumTokens() const noexcept
-  {
-    size_t cnt = 0, begin = 0;
-    while (begin < str_.size())
-    {
-      ++cnt;
-      size_t end = str_.find(opts_.member_separator, begin);
-      if (end == std::string::npos)
-      {
-        break;
-      }
-
-      begin = end + 1;
-    }
-
-    return cnt;
-  }
-
-  // Resets the iterator
-  void reset() noexcept { index_ = 0; }
-
-private:
-  nostd::string_view str_;
-  KeyValueStringTokenizerOptions opts_;
-  size_t index_;
-};
-
-// Class to store fixed size array of key-value pairs of string type
-class KeyValueProperties
-{
-  // Class to store key-value pairs of string types
-public:
-  class Entry
-  {
-  public:
-    Entry() : key_(nullptr), value_(nullptr) {}
-
-    // Copy constructor
-    Entry(const Entry &copy)
-    {
-      key_   = CopyStringToPointer(copy.key_.get());
-      value_ = CopyStringToPointer(copy.value_.get());
-    }
-
-    // Copy assignment operator
-    Entry &operator=(Entry &other)
-    {
-      key_   = CopyStringToPointer(other.key_.get());
-      value_ = CopyStringToPointer(other.value_.get());
-      return *this;
-    }
-
-    // Move contructor and assignment operator
-    Entry(Entry &&other)            = default;
-    Entry &operator=(Entry &&other) = default;
-
-    // Creates an Entry for a given key-value pair.
-    Entry(nostd::string_view key, nostd::string_view value)
-    {
-      key_   = CopyStringToPointer(key);
-      value_ = CopyStringToPointer(value);
-    }
-
-    // Gets the key associated with this entry.
-    nostd::string_view GetKey() const noexcept { return key_.get(); }
-
-    // Gets the value associated with this entry.
-    nostd::string_view GetValue() const noexcept { return value_.get(); }
-
-    // Sets the value for this entry. This overrides the previous value.
-    void SetValue(nostd::string_view value) noexcept { value_ = CopyStringToPointer(value); }
-
-  private:
-    // Store key and value as raw char pointers to avoid using std::string.
-    nostd::unique_ptr<const char[]> key_;
-    nostd::unique_ptr<const char[]> value_;
-
-    // Copies string into a buffer and returns a unique_ptr to the buffer.
-    // This is a workaround for the fact that memcpy doesn't accept a const destination.
-    nostd::unique_ptr<const char[]> CopyStringToPointer(nostd::string_view str)
-    {
-      char *temp = new char[str.size() + 1];
-      memcpy(temp, str.data(), str.size());
-      temp[str.size()] = '\0';
-      return nostd::unique_ptr<const char[]>(temp);
-    }
-  };
-
-  // Maintain the number of entries in entries_.
-  size_t num_entries_;
-
-  // Max size of allocated array
-  size_t max_num_entries_;
-
-  // Store entries in a C-style array to avoid using std::array or std::vector.
-  nostd::unique_ptr<Entry[]> entries_;
-
-public:
-  // Create Key-value list of given size
-  // @param size : Size of list.
-  KeyValueProperties(size_t size) noexcept
-      : num_entries_(0), max_num_entries_(size), entries_(new Entry[size])
-  {}
-
-  // Create Empty Key-Value list
-  KeyValueProperties() noexcept : num_entries_(0), max_num_entries_(0), entries_(nullptr) {}
-
-  template <class T, class = typename std::enable_if<detail::is_key_value_iterable<T>::value>::type>
-  KeyValueProperties(const T &keys_and_values) noexcept
-      : num_entries_(0),
-        max_num_entries_(keys_and_values.size()),
-        entries_(new Entry[max_num_entries_])
-  {
-    for (auto &e : keys_and_values)
-    {
-      Entry entry(e.first, e.second);
-      (entries_.get())[num_entries_++] = std::move(entry);
-    }
-  }
-
-  // Adds new kv pair into kv properties
-  void AddEntry(nostd::string_view key, nostd::string_view value) noexcept
-  {
-    if (num_entries_ < max_num_entries_)
-    {
-      Entry entry(key, value);
-      (entries_.get())[num_entries_++] = std::move(entry);
-    }
-  }
-
-  // Returns all kv pair entries
-  bool GetAllEntries(
-      nostd::function_ref<bool(nostd::string_view, nostd::string_view)> callback) const noexcept
-  {
-    for (size_t i = 0; i < num_entries_; i++)
-    {
-      auto &entry = (entries_.get())[i];
-      if (!callback(entry.GetKey(), entry.GetValue()))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  // Return value for key if exists, return false otherwise
-  bool GetValue(nostd::string_view key, std::string &value) const noexcept
-  {
-    for (size_t i = 0; i < num_entries_; i++)
-    {
-      auto &entry = (entries_.get())[i];
-      if (entry.GetKey() == key)
-      {
-        const auto &entry_value = entry.GetValue();
-        value                   = std::string(entry_value.data(), entry_value.size());
-        return true;
-      }
-    }
-    return false;
-  }
-
-  size_t Size() const noexcept { return num_entries_; }
-};
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/macros.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/macros.h
deleted file mode 100644
index 71d12a57b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/macros.h
+++ /dev/null
@@ -1,523 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-/*
-   OPENTELEMETRY_HAVE_BUILTIN&OPENTELEMETRY_HAVE_FEATURE
-
-   Checks whether the compiler supports a Clang Feature Checking Macro, and if
-   so, checks whether it supports the provided builtin function "x" where x
-   is one of the functions noted in
-   https://clang.llvm.org/docs/LanguageExtensions.html
-
-   Note: Use this macro to avoid an extra level of #ifdef __has_builtin check.
-   http://releases.llvm.org/3.3/tools/clang/docs/LanguageExtensions.html
-*/
-#if !defined(OPENTELEMETRY_HAVE_BUILTIN)
-#  ifdef __has_builtin
-#    define OPENTELEMETRY_HAVE_BUILTIN(x) __has_builtin(x)
-#  else
-#    define OPENTELEMETRY_HAVE_BUILTIN(x) 0
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_FEATURE)
-#  ifdef __has_feature
-#    define OPENTELEMETRY_HAVE_FEATURE(f) __has_feature(f)
-#  else
-#    define OPENTELEMETRY_HAVE_FEATURE(f) 0
-#  endif
-#endif
-
-/*
-   has feature
-
-   OPENTELEMETRY_HAVE_ATTRIBUTE
-
-   A function-like feature checking macro that is a wrapper around
-   `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
-   nonzero constant integer if the attribute is supported or 0 if not.
-
-   It evaluates to zero if `__has_attribute` is not defined by the compiler.
-
-   GCC: https://gcc.gnu.org/gcc-5/changes.html
-   Clang: https://clang.llvm.org/docs/LanguageExtensions.html
-*/
-#if !defined(OPENTELEMETRY_HAVE_ATTRIBUTE)
-#  ifdef __has_attribute
-#    define OPENTELEMETRY_HAVE_ATTRIBUTE(x) __has_attribute(x)
-#  else
-#    define OPENTELEMETRY_HAVE_ATTRIBUTE(x) 0
-#  endif
-#endif
-
-/*
-   OPENTELEMETRY_HAVE_CPP_ATTRIBUTE
-
-   A function-like feature checking macro that accepts C++11 style attributes.
-   It's a wrapper around `__has_cpp_attribute`, defined by ISO C++ SD-6
-   (https://en.cppreference.com/w/cpp/experimental/feature_test). If we don't
-   find `__has_cpp_attribute`, will evaluate to 0.
-*/
-#if !defined(OPENTELEMETRY_HAVE_CPP_ATTRIBUTE)
-#  if defined(__cplusplus) && defined(__has_cpp_attribute)
-// NOTE: requiring __cplusplus above should not be necessary, but
-// works around https://bugs.llvm.org/show_bug.cgi?id=23435.
-#    define OPENTELEMETRY_HAVE_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#  else
-#    define OPENTELEMETRY_HAVE_CPP_ATTRIBUTE(x) 0
-#  endif
-#endif
-
-/*
-   Expected usage pattern:
-
-   if OPENTELEMETRY_LIKELY_CONDITION (ptr != nullptr)
-   {
-     do_something_likely();
-   } else {
-     do_something_unlikely();
-   }
-
-   This pattern works with gcc/clang and __builtin_expect(),
-   as well as with C++20.
-   It is unclear if __builtin_expect() will be deprecated
-   in favor of C++20 [[likely]] or not.
-
-   OPENTELEMETRY_LIKELY_CONDITION is preferred over OPENTELEMETRY_LIKELY,
-   to be revisited when C++20 is required.
-*/
-
-#if !defined(OPENTELEMETRY_LIKELY_CONDITION) && defined(__cplusplus)
-// Only use likely with C++20
-#  if __cplusplus >= 202002L
-// GCC 9 has likely attribute but do not support declare it at the beginning of statement
-#    if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
-#      if __has_cpp_attribute(likely)
-#        define OPENTELEMETRY_LIKELY_CONDITION(C) (C) [[likely]]
-#      endif
-#    endif
-#  endif
-#endif
-#if !defined(OPENTELEMETRY_LIKELY_CONDITION) && (defined(__clang__) || defined(__GNUC__))
-// Only use if supported by the compiler
-#  define OPENTELEMETRY_LIKELY_CONDITION(C) (__builtin_expect(!!(C), true))
-#endif
-#ifndef OPENTELEMETRY_LIKELY_CONDITION
-// Do not use likely annotations
-#  define OPENTELEMETRY_LIKELY_CONDITION(C) (C)
-#endif
-
-#if !defined(OPENTELEMETRY_UNLIKELY_CONDITION) && defined(__cplusplus)
-// Only use unlikely with C++20
-#  if __cplusplus >= 202002L
-// GCC 9 has unlikely attribute but do not support declare it at the beginning of statement
-#    if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
-#      if __has_cpp_attribute(unlikely)
-#        define OPENTELEMETRY_UNLIKELY_CONDITION(C) (C) [[unlikely]]
-#      endif
-#    endif
-#  endif
-#endif
-#if !defined(OPENTELEMETRY_UNLIKELY_CONDITION) && (defined(__clang__) || defined(__GNUC__))
-// Only use if supported by the compiler
-#  define OPENTELEMETRY_UNLIKELY_CONDITION(C) (__builtin_expect(!!(C), false))
-#endif
-#ifndef OPENTELEMETRY_UNLIKELY_CONDITION
-// Do not use unlikely annotations
-#  define OPENTELEMETRY_UNLIKELY_CONDITION(C) (C)
-#endif
-
-/*
-   Expected usage pattern:
-
-   if (ptr != nullptr)
-   OPENTELEMETRY_LIKELY
-   {
-     do_something_likely();
-   } else {
-     do_something_unlikely();
-   }
-
-   This pattern works starting with C++20.
-   See https://en.cppreference.com/w/cpp/language/attributes/likely
-
-   Please use OPENTELEMETRY_LIKELY_CONDITION instead for now.
-*/
-
-#if !defined(OPENTELEMETRY_LIKELY) && defined(__cplusplus)
-// Only use likely with C++20
-#  if __cplusplus >= 202002L
-// GCC 9 has likely attribute but do not support declare it at the beginning of statement
-#    if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
-#      if __has_cpp_attribute(likely)
-#        define OPENTELEMETRY_LIKELY [[likely]]
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifndef OPENTELEMETRY_LIKELY
-#  define OPENTELEMETRY_LIKELY
-#endif
-
-#if !defined(OPENTELEMETRY_UNLIKELY) && defined(__cplusplus)
-// Only use unlikely with C++20
-#  if __cplusplus >= 202002L
-// GCC 9 has unlikely attribute but do not support declare it at the beginning of statement
-#    if defined(__has_cpp_attribute) && (defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 9)
-#      if __has_cpp_attribute(unlikely)
-#        define OPENTELEMETRY_UNLIKELY [[unlikely]]
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifndef OPENTELEMETRY_UNLIKELY
-#  define OPENTELEMETRY_UNLIKELY
-#endif
-
-/// \brief Declare variable as maybe unused
-/// usage:
-///   OPENTELEMETRY_MAYBE_UNUSED int a;
-///   class OPENTELEMETRY_MAYBE_UNUSED a;
-///   OPENTELEMETRY_MAYBE_UNUSED int a();
-///
-#if defined(__cplusplus) && __cplusplus >= 201703L
-#  define OPENTELEMETRY_MAYBE_UNUSED [[maybe_unused]]
-#elif defined(__clang__)
-#  define OPENTELEMETRY_MAYBE_UNUSED __attribute__((unused))
-#elif defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
-#  define OPENTELEMETRY_MAYBE_UNUSED __attribute__((unused))
-#elif (defined(_MSC_VER) && _MSC_VER >= 1910) && (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-#  define OPENTELEMETRY_MAYBE_UNUSED [[maybe_unused]]
-#else
-#  define OPENTELEMETRY_MAYBE_UNUSED
-#endif
-
-#ifndef OPENTELEMETRY_RTTI_ENABLED
-#  if defined(__clang__)
-#    if __has_feature(cxx_rtti)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  elif defined(__GNUG__)
-#    if defined(__GXX_RTTI)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  elif defined(_MSC_VER)
-#    if defined(_CPPRTTI)
-#      define OPENTELEMETRY_RTTI_ENABLED
-#    endif
-#  endif
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201402L
-#  define OPENTELEMETRY_DEPRECATED [[deprecated]]
-#elif defined(__clang__)
-#  define OPENTELEMETRY_DEPRECATED __attribute__((deprecated))
-#elif defined(__GNUC__)
-#  define OPENTELEMETRY_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#  if _MSC_VER >= 1910 && defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
-#    define OPENTELEMETRY_DEPRECATED [[deprecated]]
-#  else
-#    define OPENTELEMETRY_DEPRECATED __declspec(deprecated)
-#  endif
-#else
-#  define OPENTELEMETRY_DEPRECATED
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201402L
-#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) [[deprecated(msg)]]
-#elif defined(__clang__)
-#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __attribute__((deprecated(msg)))
-#elif defined(__GNUC__)
-#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __attribute__((deprecated(msg)))
-#elif defined(_MSC_VER)
-#  if _MSC_VER >= 1910 && defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
-#    define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) [[deprecated(msg)]]
-#  else
-#    define OPENTELEMETRY_DEPRECATED_MESSAGE(msg) __declspec(deprecated(msg))
-#  endif
-#else
-#  define OPENTELEMETRY_DEPRECATED_MESSAGE(msg)
-#endif
-
-// Regex support
-#if (__GNUC__ == 4 && (__GNUC_MINOR__ == 8 || __GNUC_MINOR__ == 9))
-#  define OPENTELEMETRY_HAVE_WORKING_REGEX 0
-#else
-#  define OPENTELEMETRY_HAVE_WORKING_REGEX 1
-#endif
-
-/* clang-format off */
-
-/**
-  @page HEADER_ONLY_SINGLETON Header only singleton.
-
-  @section ELF_SINGLETON
-
-  For clang and gcc, the desired coding pattern is as follows.
-
-  @verbatim
-  class Foo
-  {
-    // (a)
-    __attribute__((visibility("default")))
-    // (b)
-    T& get_singleton()
-    {
-      // (c)
-      static T singleton;
-      return singleton;
-    }
-  };
-  @endverbatim
-
-  (a) is needed when the code is build with
-  @code -fvisibility="hidden" @endcode
-  to ensure that all instances of (b) are visible to the linker.
-
-  What is duplicated in the binary is @em code, in (b).
-
-  The linker will make sure only one instance
-  of all the (b) methods is used.
-
-  (c) is a singleton implemented inside a method.
-
-  This is very desirable, because:
-
-  - the C++ compiler guarantees that construction
-    of the variable (c) is thread safe.
-
-  - constructors for (c) singletons are executed in code path order,
-    or not at all if the singleton is never used.
-
-  @section OTHER_SINGLETON
-
-  For other platforms, header only singletons are not supported at this
-point.
-
-  @section CODING_PATTERN
-
-  The coding pattern to use in the source code is as follows
-
-  @verbatim
-  class Foo
-  {
-    OPENTELEMETRY_API_SINGLETON
-    T& get_singleton()
-    {
-      static T singleton;
-      return singleton;
-    }
-  };
-  @endverbatim
-*/
-
-/* clang-format on */
-
-#if defined(__clang__)
-
-#  define OPENTELEMETRY_API_SINGLETON __attribute__((visibility("default")))
-#  define OPENTELEMETRY_LOCAL_SYMBOL __attribute__((visibility("hidden")))
-
-#elif defined(__GNUC__)
-
-#  define OPENTELEMETRY_API_SINGLETON __attribute__((visibility("default")))
-#  define OPENTELEMETRY_LOCAL_SYMBOL __attribute__((visibility("hidden")))
-
-#else
-
-/* Add support for other compilers here. */
-
-#  define OPENTELEMETRY_API_SINGLETON
-#  define OPENTELEMETRY_LOCAL_SYMBOL
-
-#endif
-
-//
-// Atomic wrappers based on compiler intrinsics for memory read/write.
-// The tailing number is read/write length in bits.
-//
-// N.B. Compiler intrinsic is used because the usage of C++ standard library is restricted in the
-// OpenTelemetry C++ API.
-//
-#if defined(__GNUC__)
-
-#  define OPENTELEMETRY_ATOMIC_READ_8(ptr) __atomic_load_n(ptr, __ATOMIC_SEQ_CST)
-#  define OPENTELEMETRY_ATOMIC_WRITE_8(ptr, value) __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST)
-
-#elif defined(_MSC_VER)
-
-#  include <intrin.h>
-
-#  define OPENTELEMETRY_ATOMIC_READ_8(ptr) \
-    static_cast<uint8_t>(_InterlockedCompareExchange8(reinterpret_cast<char *>(ptr), 0, 0))
-#  define OPENTELEMETRY_ATOMIC_WRITE_8(ptr, value) \
-    _InterlockedExchange8(reinterpret_cast<char *>(ptr), static_cast<char>(value))
-
-#else
-#  error port atomics read/write for the current platform
-#endif
-
-/* clang-format on */
-//
-// The if/elif order matters here. If both OPENTELEMETRY_BUILD_IMPORT_DLL and
-// OPENTELEMETRY_BUILD_EXPORT_DLL are defined, the former takes precedence.
-//
-// TODO: consider define OPENTELEMETRY_EXPORT for cygwin/gcc, see below link.
-// https://gcc.gnu.org/wiki/Visibility#How_to_use_the_new_C.2B-.2B-_visibility_support
-//
-#if defined(_MSC_VER) && defined(OPENTELEMETRY_BUILD_IMPORT_DLL)
-
-#  define OPENTELEMETRY_EXPORT __declspec(dllimport)
-
-#elif defined(_MSC_VER) && defined(OPENTELEMETRY_BUILD_EXPORT_DLL)
-
-#  define OPENTELEMETRY_EXPORT __declspec(dllexport)
-
-#else
-
-//
-// build OpenTelemetry as static library or not on Windows.
-//
-#  define OPENTELEMETRY_EXPORT
-
-#endif
-
-// OPENTELEMETRY_HAVE_EXCEPTIONS
-//
-// Checks whether the compiler both supports and enables exceptions. Many
-// compilers support a "no exceptions" mode that disables exceptions.
-//
-// Generally, when OPENTELEMETRY_HAVE_EXCEPTIONS is not defined:
-//
-// * Code using `throw` and `try` may not compile.
-// * The `noexcept` specifier will still compile and behave as normal.
-// * The `noexcept` operator may still return `false`.
-//
-// For further details, consult the compiler's documentation.
-#ifndef OPENTELEMETRY_HAVE_EXCEPTIONS
-#  if defined(__clang__) && ((__clang_major__ * 100) + __clang_minor__) < 306
-// Clang < 3.6
-// http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html#the-exceptions-macro
-#    if defined(__EXCEPTIONS) && OPENTELEMETRY_HAVE_FEATURE(cxx_exceptions)
-#      define OPENTELEMETRY_HAVE_EXCEPTIONS 1
-#    endif  // defined(__EXCEPTIONS) && OPENTELEMETRY_HAVE_FEATURE(cxx_exceptions)
-#  elif OPENTELEMETRY_HAVE_FEATURE(cxx_exceptions)
-#    define OPENTELEMETRY_HAVE_EXCEPTIONS 1
-// Handle remaining special cases and default to exceptions being supported.
-#  elif !(defined(__GNUC__) && !defined(__EXCEPTIONS) && !defined(__cpp_exceptions)) && \
-      !(defined(_MSC_VER) && !defined(_CPPUNWIND))
-#    define OPENTELEMETRY_HAVE_EXCEPTIONS 1
-#  endif
-#endif
-#ifndef OPENTELEMETRY_HAVE_EXCEPTIONS
-#  define OPENTELEMETRY_HAVE_EXCEPTIONS 0
-#endif
-
-/*
-   OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND indicates that a resource owned by a function
-   parameter or implicit object parameter is retained by the return value of the
-   annotated function (or, for a parameter of a constructor, in the value of the
-   constructed object). This attribute causes warnings to be produced if a
-   temporary object does not live long enough.
-
-   When applied to a reference parameter, the referenced object is assumed to be
-   retained by the return value of the function. When applied to a non-reference
-   parameter (for example, a pointer or a class type), all temporaries
-   referenced by the parameter are assumed to be retained by the return value of
-   the function.
-
-   See also the upstream documentation:
-   https://clang.llvm.org/docs/AttributeReference.html#lifetimebound
-*/
-#ifndef OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND
-#  if OPENTELEMETRY_HAVE_CPP_ATTRIBUTE(clang::lifetimebound)
-#    define OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND [[clang::lifetimebound]]
-#  elif OPENTELEMETRY_HAVE_ATTRIBUTE(lifetimebound)
-#    define OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND __attribute__((lifetimebound))
-#  else
-#    define OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND
-#  endif
-#endif
-
-// OPENTELEMETRY_HAVE_MEMORY_SANITIZER
-//
-// MemorySanitizer (MSan) is a detector of uninitialized reads. It consists of
-// a compiler instrumentation module and a run-time library.
-#ifndef OPENTELEMETRY_HAVE_MEMORY_SANITIZER
-#  if !defined(__native_client__) && OPENTELEMETRY_HAVE_FEATURE(memory_sanitizer)
-#    define OPENTELEMETRY_HAVE_MEMORY_SANITIZER 1
-#  else
-#    define OPENTELEMETRY_HAVE_MEMORY_SANITIZER 0
-#  endif
-#endif
-
-#if OPENTELEMETRY_HAVE_MEMORY_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize_memory)
-#  define OPENTELEMETRY_SANITIZER_NO_MEMORY \
-    __attribute__((no_sanitize_memory))  // __attribute__((no_sanitize("memory")))
-#else
-#  define OPENTELEMETRY_SANITIZER_NO_MEMORY
-#endif
-
-// OPENTELEMETRY_HAVE_THREAD_SANITIZER
-//
-// ThreadSanitizer (TSan) is a fast data race detector.
-#ifndef OPENTELEMETRY_HAVE_THREAD_SANITIZER
-#  if defined(__SANITIZE_THREAD__)
-#    define OPENTELEMETRY_HAVE_THREAD_SANITIZER 1
-#  elif OPENTELEMETRY_HAVE_FEATURE(thread_sanitizer)
-#    define OPENTELEMETRY_HAVE_THREAD_SANITIZER 1
-#  else
-#    define OPENTELEMETRY_HAVE_THREAD_SANITIZER 0
-#  endif
-#endif
-
-#if OPENTELEMETRY_HAVE_THREAD_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize_thread)
-#  define OPENTELEMETRY_SANITIZER_NO_THREAD \
-    __attribute__((no_sanitize_thread))  // __attribute__((no_sanitize("thread")))
-#else
-#  define OPENTELEMETRY_SANITIZER_NO_THREAD
-#endif
-
-// OPENTELEMETRY_HAVE_ADDRESS_SANITIZER
-//
-// AddressSanitizer (ASan) is a fast memory error detector.
-#ifndef OPENTELEMETRY_HAVE_ADDRESS_SANITIZER
-#  if defined(__SANITIZE_ADDRESS__)
-#    define OPENTELEMETRY_HAVE_ADDRESS_SANITIZER 1
-#  elif OPENTELEMETRY_HAVE_FEATURE(address_sanitizer)
-#    define OPENTELEMETRY_HAVE_ADDRESS_SANITIZER 1
-#  else
-#    define OPENTELEMETRY_HAVE_ADDRESS_SANITIZER 0
-#  endif
-#endif
-
-// OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER
-//
-// Hardware-Assisted AddressSanitizer (or HWASAN) is even faster than asan
-// memory error detector which can use CPU features like ARM TBI, Intel LAM or
-// AMD UAI.
-#ifndef OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER
-#  if defined(__SANITIZE_HWADDRESS__)
-#    define OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER 1
-#  elif OPENTELEMETRY_HAVE_FEATURE(hwaddress_sanitizer)
-#    define OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER 1
-#  else
-#    define OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER 0
-#  endif
-#endif
-
-#if OPENTELEMETRY_HAVE_ADDRESS_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize_address)
-#  define OPENTELEMETRY_SANITIZER_NO_ADDRESS \
-    __attribute__((no_sanitize_address))  // __attribute__((no_sanitize("address")))
-#elif OPENTELEMETRY_HAVE_ADDRESS_SANITIZER && defined(_MSC_VER) && _MSC_VER >= 1928
-#  define OPENTELEMETRY_SANITIZER_NO_ADDRESS __declspec(no_sanitize_address)
-#elif OPENTELEMETRY_HAVE_HWADDRESS_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize)
-#  define OPENTELEMETRY_SANITIZER_NO_ADDRESS __attribute__((no_sanitize("hwaddress")))
-#else
-#  define OPENTELEMETRY_SANITIZER_NO_ADDRESS
-#endif
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/spin_lock_mutex.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/spin_lock_mutex.h
deleted file mode 100644
index 7031fa4d2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/spin_lock_mutex.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <thread>
-
-#include "opentelemetry/version.h"
-
-#if defined(_MSC_VER)
-#  define _WINSOCKAPI_  // stops including winsock.h
-#  include <windows.h>
-#elif defined(__i386__) || defined(__x86_64__)
-#  if defined(__clang__)
-#    include <emmintrin.h>
-#  elif defined(__INTEL_COMPILER)
-#    include <immintrin.h>
-#  endif
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-
-constexpr int SPINLOCK_FAST_ITERATIONS = 100;
-constexpr int SPINLOCK_SLEEP_MS        = 1;
-
-/**
- * A Mutex which uses atomic flags and spin-locks instead of halting threads.
- *
- * This mutex uses an incremental back-off strategy with the following phases:
- * 1. A tight spin-lock loop (pending: using hardware PAUSE/YIELD instructions)
- * 2. A loop where the current thread yields control after checking the lock.
- * 3. Issuing a thread-sleep call before starting back in phase 1.
- *
- * This is meant to give a good balance of perofrmance and CPU consumption in
- * practice.
- *
- * This mutex uses an incremental back-off strategy with the following phases:
- * 1. A tight spin-lock loop (pending: using hardware PAUSE/YIELD instructions)
- * 2. A loop where the current thread yields control after checking the lock.
- * 3. Issuing a thread-sleep call before starting back in phase 1.
- *
- * This is meant to give a good balance of perofrmance and CPU consumption in
- * practice.
- *
- * This class implements the `BasicLockable` specification:
- * https://en.cppreference.com/w/cpp/named_req/BasicLockable
- */
-class SpinLockMutex
-{
-public:
-  SpinLockMutex() noexcept {}
-  ~SpinLockMutex() noexcept                       = default;
-  SpinLockMutex(const SpinLockMutex &)            = delete;
-  SpinLockMutex &operator=(const SpinLockMutex &) = delete;
-
-  static inline void fast_yield() noexcept
-  {
-// Issue a Pause/Yield instruction while spinning.
-#if defined(_MSC_VER)
-    YieldProcessor();
-#elif defined(__i386__) || defined(__x86_64__)
-#  if defined(__clang__) || defined(__INTEL_COMPILER)
-    _mm_pause();
-#  else
-    __builtin_ia32_pause();
-#  endif
-#elif defined(__armel__) || defined(__ARMEL__)
-    asm volatile("nop" ::: "memory");
-#elif defined(__arm__) || defined(__aarch64__)  // arm big endian / arm64
-    __asm__ __volatile__("yield" ::: "memory");
-#else
-    // TODO: Issue PAGE/YIELD on other architectures.
-#endif
-  }
-
-  /**
-   * Attempts to lock the mutex.  Return immediately with `true` (success) or `false` (failure).
-   */
-  bool try_lock() noexcept
-  {
-    return !flag_.load(std::memory_order_relaxed) &&
-           !flag_.exchange(true, std::memory_order_acquire);
-  }
-
-  /**
-   * Blocks until a lock can be obtained for the current thread.
-   *
-   * This mutex will spin the current CPU waiting for the lock to be available.  This can have
-   * decent performance in scenarios where there is low lock contention and lock-holders achieve
-   * their work quickly.  It degrades in scenarios where locked tasks take a long time.
-   */
-  void lock() noexcept
-  {
-    for (;;)
-    {
-      // Try once
-      if (!flag_.exchange(true, std::memory_order_acquire))
-      {
-        return;
-      }
-      // Spin-Fast (goal ~10ns)
-      for (std::size_t i = 0; i < SPINLOCK_FAST_ITERATIONS; ++i)
-      {
-        if (try_lock())
-        {
-          return;
-        }
-        fast_yield();
-      }
-      // Yield then try again (goal ~100ns)
-      std::this_thread::yield();
-      if (try_lock())
-      {
-        return;
-      }
-      // Sleep and then start the whole process again. (goal ~1000ns)
-      std::this_thread::sleep_for(std::chrono::milliseconds(SPINLOCK_SLEEP_MS));
-    }
-    return;
-  }
-  /** Releases the lock held by the execution agent. Throws no exceptions. */
-  void unlock() noexcept { flag_.store(false, std::memory_order_release); }
-
-private:
-  std::atomic<bool> flag_{false};
-};
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/string_util.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/string_util.h
deleted file mode 100644
index 273a65272..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/string_util.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-
-class StringUtil
-{
-public:
-  static nostd::string_view Trim(nostd::string_view str, size_t left, size_t right) noexcept
-  {
-    while (left <= right && isspace(str[left]))
-    {
-      left++;
-    }
-    while (left <= right && isspace(str[right]))
-    {
-      right--;
-    }
-    return str.substr(left, 1 + right - left);
-  }
-
-  static nostd::string_view Trim(nostd::string_view str) noexcept
-  {
-    if (str.empty())
-    {
-      return str;
-    }
-
-    return Trim(str, 0, str.size() - 1);
-  }
-};
-
-}  // namespace common
-
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/timestamp.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/timestamp.h
deleted file mode 100644
index f7c79b8b5..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/common/timestamp.h
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <cstdint>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-/**
- * @brief A timepoint relative to the system clock epoch.
- *
- * This is used for marking the beginning and end of an operation.
- */
-class SystemTimestamp
-{
-public:
-  /**
-   * @brief Initializes a system timestamp pointing to the start of the epoch.
-   */
-  SystemTimestamp() noexcept : nanos_since_epoch_{0} {}
-
-  /**
-   * @brief Initializes a system timestamp from a duration.
-   *
-   * @param time_since_epoch Time elapsed since the beginning of the epoch.
-   */
-  template <class Rep, class Period>
-  explicit SystemTimestamp(const std::chrono::duration<Rep, Period> &time_since_epoch) noexcept
-      : nanos_since_epoch_{static_cast<int64_t>(
-            std::chrono::duration_cast<std::chrono::nanoseconds>(time_since_epoch).count())}
-  {}
-
-  /**
-   * @brief Initializes a system timestamp based on a point in time.
-   *
-   * @param time_point A point in time.
-   */
-  /*implicit*/ SystemTimestamp(const std::chrono::system_clock::time_point &time_point) noexcept
-      : SystemTimestamp{time_point.time_since_epoch()}
-  {}
-
-  /**
-   * @brief Returns a time point for the time stamp.
-   *
-   * @return A time point corresponding to the time stamp.
-   */
-  operator std::chrono::system_clock::time_point() const noexcept
-  {
-    return std::chrono::system_clock::time_point{
-        std::chrono::duration_cast<std::chrono::system_clock::duration>(
-            std::chrono::nanoseconds{nanos_since_epoch_})};
-  }
-
-  /**
-   * @brief Returns the nanoseconds since the beginning of the epoch.
-   *
-   * @return Elapsed nanoseconds since the beginning of the epoch for this timestamp.
-   */
-  std::chrono::nanoseconds time_since_epoch() const noexcept
-  {
-    return std::chrono::nanoseconds{nanos_since_epoch_};
-  }
-
-  /**
-   * @brief Compare two steady time stamps.
-   *
-   * @return true if the two time stamps are equal.
-   */
-  bool operator==(const SystemTimestamp &other) const noexcept
-  {
-    return nanos_since_epoch_ == other.nanos_since_epoch_;
-  }
-
-  /**
-   * @brief Compare two steady time stamps for inequality.
-   *
-   * @return true if the two time stamps are not equal.
-   */
-  bool operator!=(const SystemTimestamp &other) const noexcept
-  {
-    return nanos_since_epoch_ != other.nanos_since_epoch_;
-  }
-
-private:
-  int64_t nanos_since_epoch_;
-};
-
-/**
- * @brief A timepoint relative to the monotonic clock epoch
- *
- * This is used for calculating the duration of an operation.
- */
-class SteadyTimestamp
-{
-public:
-  /**
-   * @brief Initializes a monotonic timestamp pointing to the start of the epoch.
-   */
-  SteadyTimestamp() noexcept : nanos_since_epoch_{0} {}
-
-  /**
-   * @brief Initializes a monotonic timestamp from a duration.
-   *
-   * @param time_since_epoch Time elapsed since the beginning of the epoch.
-   */
-  template <class Rep, class Period>
-  explicit SteadyTimestamp(const std::chrono::duration<Rep, Period> &time_since_epoch) noexcept
-      : nanos_since_epoch_{static_cast<int64_t>(
-            std::chrono::duration_cast<std::chrono::nanoseconds>(time_since_epoch).count())}
-  {}
-
-  /**
-   * @brief Initializes a monotonic timestamp based on a point in time.
-   *
-   * @param time_point A point in time.
-   */
-  /*implicit*/ SteadyTimestamp(const std::chrono::steady_clock::time_point &time_point) noexcept
-      : SteadyTimestamp{time_point.time_since_epoch()}
-  {}
-
-  /**
-   * @brief Returns a time point for the time stamp.
-   *
-   * @return A time point corresponding to the time stamp.
-   */
-  operator std::chrono::steady_clock::time_point() const noexcept
-  {
-    return std::chrono::steady_clock::time_point{
-        std::chrono::duration_cast<std::chrono::steady_clock::duration>(
-            std::chrono::nanoseconds{nanos_since_epoch_})};
-  }
-
-  /**
-   * @brief Returns the nanoseconds since the beginning of the epoch.
-   *
-   * @return Elapsed nanoseconds since the beginning of the epoch for this timestamp.
-   */
-  std::chrono::nanoseconds time_since_epoch() const noexcept
-  {
-    return std::chrono::nanoseconds{nanos_since_epoch_};
-  }
-
-  /**
-   * @brief Compare two steady time stamps.
-   *
-   * @return true if the two time stamps are equal.
-   */
-  bool operator==(const SteadyTimestamp &other) const noexcept
-  {
-    return nanos_since_epoch_ == other.nanos_since_epoch_;
-  }
-
-  /**
-   * @brief Compare two steady time stamps for inequality.
-   *
-   * @return true if the two time stamps are not equal.
-   */
-  bool operator!=(const SteadyTimestamp &other) const noexcept
-  {
-    return nanos_since_epoch_ != other.nanos_since_epoch_;
-  }
-
-private:
-  int64_t nanos_since_epoch_;
-};
-
-class DurationUtil
-{
-public:
-  template <class Rep, class Period>
-  static std::chrono::duration<Rep, Period> AdjustWaitForTimeout(
-      std::chrono::duration<Rep, Period> timeout,
-      std::chrono::duration<Rep, Period> indefinite_value) noexcept
-  {
-    // Do not call now() when this duration is max value, now() may have a expensive cost.
-    if (timeout == (std::chrono::duration<Rep, Period>::max)())
-    {
-      return indefinite_value;
-    }
-
-    // std::future<T>::wait_for, std::this_thread::sleep_for, and std::condition_variable::wait_for
-    // may use steady_clock or system_clock.We need make sure now() + timeout do not overflow.
-    auto max_timeout = std::chrono::duration_cast<std::chrono::duration<Rep, Period>>(
-        (std::chrono::steady_clock::time_point::max)() - std::chrono::steady_clock::now());
-    if (timeout >= max_timeout)
-    {
-      return indefinite_value;
-    }
-    max_timeout = std::chrono::duration_cast<std::chrono::duration<Rep, Period>>(
-        (std::chrono::system_clock::time_point::max)() - std::chrono::system_clock::now());
-    if (timeout >= max_timeout)
-    {
-      return indefinite_value;
-    }
-
-    return timeout;
-  }
-};
-
-}  // namespace common
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/config.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/config.h
deleted file mode 100644
index cb52f3b5d..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>  // IWYU pragma: keep
-
-#if defined(OPENTELEMETRY_ABI_VERSION_NO) && OPENTELEMETRY_ABI_VERSION_NO >= 2
-#  error \
-      "opentelemetry/config.h is removed in ABI version 2 and later. Please use opentelemetry/version.h instead."
-#else
-#  if defined(__clang__) || defined(__GNUC__)
-#    pragma GCC warning \
-        "opentelemetry/config.h is deprecated. Please use opentelemetry/version.h instead."
-#  elif defined(_MSC_VER)
-#    pragma message( \
-        "[WARNING]: opentelemetry/config.h is deprecated. Please use opentelemetry/version.h instead.")
-#  endif
-#endif
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/context.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/context.h
deleted file mode 100644
index 924036efa..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/context.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstring>
-#include <utility>
-
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-
-// The context class provides a context identifier. Is built as a linked list
-// of DataList nodes and each context holds a shared_ptr to a place within
-// the list that determines which keys and values it has access to. All that
-// come before and none that come after.
-class Context
-{
-
-public:
-  Context() = default;
-  // Creates a context object from a map of keys and identifiers, this will
-  // hold a shared_ptr to the head of the DataList linked list
-  template <class T>
-  Context(const T &keys_and_values) noexcept
-      : head_{nostd::shared_ptr<DataList>{new DataList(keys_and_values)}}
-  {}
-
-  // Creates a context object from a key and value, this will
-  // hold a shared_ptr to the head of the DataList linked list
-  Context(nostd::string_view key, ContextValue value) noexcept
-      : head_{nostd::shared_ptr<DataList>{new DataList(key, value)}}
-  {}
-
-  // Accepts a new iterable and then returns a new context that
-  // contains the new key and value data. It attaches the
-  // exisiting list to the end of the new list.
-  template <class T>
-  Context SetValues(T &values) noexcept
-  {
-    Context context                  = Context(values);
-    nostd::shared_ptr<DataList> last = context.head_;
-    while (last->next_ != nullptr)
-    {
-      last = last->next_;
-    }
-    last->next_ = head_;
-    return context;
-  }
-
-  // Accepts a new iterable and then returns a new context that
-  // contains the new key and value data. It attaches the
-  // exisiting list to the end of the new list.
-  Context SetValue(nostd::string_view key, ContextValue value) noexcept
-  {
-    Context context      = Context(key, value);
-    context.head_->next_ = head_;
-    return context;
-  }
-
-  // Returns the value associated with the passed in key.
-  context::ContextValue GetValue(const nostd::string_view key) const noexcept
-  {
-    for (DataList *data = head_.get(); data != nullptr; data = data->next_.get())
-    {
-      if (key.size() == data->key_length_)
-      {
-        if (std::memcmp(key.data(), data->key_, data->key_length_) == 0)
-        {
-          return data->value_;
-        }
-      }
-    }
-    return ContextValue{};
-  }
-
-  // Checks for key and returns true if found
-  bool HasKey(const nostd::string_view key) const noexcept
-  {
-    return !nostd::holds_alternative<nostd::monostate>(GetValue(key));
-  }
-
-  bool operator==(const Context &other) const noexcept { return (head_ == other.head_); }
-
-private:
-  // A linked list to contain the keys and values of this context node
-  struct DataList
-  {
-    char *key_ = nullptr;
-
-    nostd::shared_ptr<DataList> next_{nullptr};
-
-    size_t key_length_ = 0UL;
-
-    ContextValue value_;
-
-    DataList() = default;
-
-    // Builds a data list off of a key and value iterable and returns the head
-    template <class T>
-    DataList(const T &keys_and_vals)
-    {
-      bool first = true;
-      auto *node = this;
-      for (auto &iter : keys_and_vals)
-      {
-        if (first)
-        {
-          *node = DataList(iter.first, iter.second);
-          first = false;
-        }
-        else
-        {
-          node->next_ = nostd::shared_ptr<DataList>(new DataList(iter.first, iter.second));
-          node        = node->next_.get();
-        }
-      }
-    }
-
-    // Builds a data list with just a key and value, so it will just be the head
-    // and returns that head.
-    DataList(nostd::string_view key, const ContextValue &value)
-    {
-      key_        = new char[key.size()];
-      key_length_ = key.size();
-      std::memcpy(key_, key.data(), key.size() * sizeof(char));
-      next_  = nostd::shared_ptr<DataList>{nullptr};
-      value_ = value;
-    }
-
-    DataList(const DataList &other)
-        : key_(new char[other.key_length_]),
-          next_(other.next_),
-          key_length_(other.key_length_),
-          value_(other.value_)
-    {
-      std::memcpy(key_, other.key_, other.key_length_ * sizeof(char));
-    }
-
-    DataList &operator=(DataList &&other) noexcept
-    {
-      key_length_ = other.key_length_;
-      value_      = std::move(other.value_);
-      next_       = std::move(other.next_);
-
-      key_       = other.key_;
-      other.key_ = nullptr;
-
-      return *this;
-    }
-
-    ~DataList()
-    {
-      if (key_ != nullptr)
-      {
-        delete[] key_;
-      }
-    }
-  };
-
-  // Head of the list which holds the keys and values of this context
-  nostd::shared_ptr<DataList> head_;
-};
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/context_value.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/context_value.h
deleted file mode 100644
index 27bd40fb0..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/context_value.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace baggage
-{
-class Baggage;
-}  // namespace baggage
-
-namespace trace
-{
-class Span;
-class SpanContext;
-}  // namespace trace
-
-namespace context
-{
-using ContextValue = nostd::variant<nostd::monostate,
-                                    bool,
-                                    int64_t,
-                                    uint64_t,
-                                    double,
-                                    nostd::shared_ptr<trace::Span>,
-                                    nostd::shared_ptr<trace::SpanContext>,
-                                    nostd::shared_ptr<baggage::Baggage>>;
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/composite_propagator.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/composite_propagator.h
deleted file mode 100644
index f7afe23bf..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/composite_propagator.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-namespace propagation
-{
-
-class CompositePropagator : public TextMapPropagator
-{
-public:
-  CompositePropagator(std::vector<std::unique_ptr<TextMapPropagator>> propagators)
-      : propagators_(std::move(propagators))
-  {}
-
-  /**
-   * Run each of the configured propagators with the given context and carrier.
-   * Propagators are run in the order they are configured, so if multiple
-   * propagators write the same carrier key, the propagator later in the list
-   * will "win".
-   *
-   * @param carrier Carrier into which context will be injected
-   * @param context Context to inject
-   *
-   */
-
-  void Inject(TextMapCarrier &carrier, const context::Context &context) noexcept override
-  {
-    for (auto &p : propagators_)
-    {
-      p->Inject(carrier, context);
-    }
-  }
-
-  /**
-   * Run each of the configured propagators with the given context and carrier.
-   * Propagators are run in the order they are configured, so if multiple
-   * propagators write the same context key, the propagator later in the list
-   * will "win".
-   *
-   * @param carrier Carrier from which to extract context
-   * @param context Context to add values to
-   */
-  context::Context Extract(const TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    auto first = true;
-    context::Context tmp_context;
-    for (auto &p : propagators_)
-    {
-      if (first)
-      {
-        tmp_context = p->Extract(carrier, context);
-        first       = false;
-      }
-      else
-      {
-        tmp_context = p->Extract(carrier, tmp_context);
-      }
-    }
-    return propagators_.size() ? tmp_context : context;
-  }
-
-  /**
-   * Invoke callback with  fields set to carrier by `inject` method for all the
-   * configured propagators
-   * Returns true if all invocation return true
-   */
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    bool status = true;
-    for (auto &p : propagators_)
-    {
-      status = status && p->Fields(callback);
-    }
-    return status;
-  }
-
-private:
-  std::vector<std::unique_ptr<TextMapPropagator>> propagators_;
-};
-}  // namespace propagation
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/global_propagator.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/global_propagator.h
deleted file mode 100644
index 85293202f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/global_propagator.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/context/propagation/noop_propagator.h"
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-namespace propagation
-{
-
-class TextMapPropagator;
-
-/* Stores the singleton TextMapPropagator */
-
-class OPENTELEMETRY_EXPORT GlobalTextMapPropagator
-{
-public:
-  static nostd::shared_ptr<TextMapPropagator> GetGlobalPropagator() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<TextMapPropagator>(GetPropagator());
-  }
-
-  static void SetGlobalPropagator(const nostd::shared_ptr<TextMapPropagator> &prop) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetPropagator() = prop;
-  }
-
-private:
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<TextMapPropagator> &GetPropagator() noexcept
-  {
-    static nostd::shared_ptr<TextMapPropagator> propagator(new NoOpPropagator());
-    return propagator;
-  }
-
-  OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
-  {
-    static common::SpinLockMutex lock;
-    return lock;
-  }
-};
-
-}  // namespace propagation
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/noop_propagator.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/noop_propagator.h
deleted file mode 100644
index 4e1b30c17..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/noop_propagator.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-namespace propagation
-{
-
-/**
- * No-op implementation TextMapPropagator
- */
-class NoOpPropagator : public TextMapPropagator
-{
-public:
-  /** Noop extract function does nothing and returns the input context */
-  context::Context Extract(const TextMapCarrier & /*carrier*/,
-                           context::Context &context) noexcept override
-  {
-    return context;
-  }
-
-  /** Noop inject function does nothing */
-  void Inject(TextMapCarrier & /*carrier*/,
-              const context::Context & /* context */) noexcept override
-  {}
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> /* callback */) const noexcept override
-  {
-    return true;
-  }
-};
-}  // namespace propagation
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/text_map_propagator.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/text_map_propagator.h
deleted file mode 100644
index 21bc29361..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/propagation/text_map_propagator.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-namespace propagation
-{
-
-// TextMapCarrier is the storage medium used by TextMapPropagator.
-class TextMapCarrier
-{
-public:
-  // returns the value associated with the passed key.
-  virtual nostd::string_view Get(nostd::string_view key) const noexcept = 0;
-
-  // stores the key-value pair.
-  virtual void Set(nostd::string_view key, nostd::string_view value) noexcept = 0;
-
-  /* list of all the keys in the carrier.
-   By default, it returns true without invoking callback */
-  virtual bool Keys(nostd::function_ref<bool(nostd::string_view)> /* callback */) const noexcept
-  {
-    return true;
-  }
-  virtual ~TextMapCarrier() = default;
-};
-
-// The TextMapPropagator class provides an interface that enables extracting and injecting
-// context into carriers that travel in-band across process boundaries. HTTP frameworks and clients
-// can integrate with TextMapPropagator by providing the object containing the
-// headers, and a getter and setter function for the extraction and
-// injection of values, respectively.
-
-class TextMapPropagator
-{
-public:
-  // Returns the context that is stored in the carrier with the TextMapCarrier as extractor.
-  virtual context::Context Extract(const TextMapCarrier &carrier,
-                                   context::Context &context) noexcept = 0;
-
-  // Sets the context for carrier with self defined rules.
-  virtual void Inject(TextMapCarrier &carrier, const context::Context &context) noexcept = 0;
-
-  // Gets the fields set in the carrier by the `inject` method
-  virtual bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept = 0;
-
-  virtual ~TextMapPropagator() = default;
-};
-}  // namespace propagation
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/runtime_context.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/runtime_context.h
deleted file mode 100644
index e3f88254c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/context/runtime_context.h
+++ /dev/null
@@ -1,340 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stddef.h>
-#include <algorithm>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace context
-{
-// The Token object provides is returned when attaching objects to the
-// RuntimeContext object and is associated with a context object, and
-// can be provided to the RuntimeContext Detach method to remove the
-// associated context from the RuntimeContext.
-class Token
-{
-public:
-  bool operator==(const Context &other) const noexcept { return context_ == other; }
-
-  ~Token() noexcept;
-
-private:
-  friend class RuntimeContextStorage;
-
-  // A constructor that sets the token's Context object to the
-  // one that was passed in.
-  Token(const Context &context) : context_(context) {}
-
-  const Context context_;
-};
-
-/**
- * RuntimeContextStorage is used by RuntimeContext to store Context frames.
- *
- * Custom context management strategies can be implemented by deriving from
- * this class and passing an initialized RuntimeContextStorage object to
- * RuntimeContext::SetRuntimeContextStorage.
- */
-class OPENTELEMETRY_EXPORT RuntimeContextStorage
-{
-public:
-  /**
-   * Return the current context.
-   * @return the current context
-   */
-  virtual Context GetCurrent() noexcept = 0;
-
-  /**
-   * Set the current context.
-   * @param the new current context
-   * @return a token for the new current context. This never returns a nullptr.
-   */
-  virtual nostd::unique_ptr<Token> Attach(const Context &context) noexcept = 0;
-
-  /**
-   * Detach the context related to the given token.
-   * @param token a token related to a context
-   * @return true if the context could be detached
-   */
-  virtual bool Detach(Token &token) noexcept = 0;
-
-  virtual ~RuntimeContextStorage() {}
-
-protected:
-  nostd::unique_ptr<Token> CreateToken(const Context &context) noexcept
-  {
-    return nostd::unique_ptr<Token>(new Token(context));
-  }
-};
-
-/**
- * Construct and return the default RuntimeContextStorage
- * @return a ThreadLocalContextStorage
- */
-static RuntimeContextStorage *GetDefaultStorage() noexcept;
-
-// Provides a wrapper for propagating the context object globally.
-//
-// By default, a thread-local runtime context storage is used.
-class OPENTELEMETRY_EXPORT RuntimeContext
-{
-public:
-  // Return the current context.
-  static Context GetCurrent() noexcept { return GetRuntimeContextStorage()->GetCurrent(); }
-
-  // Sets the current 'Context' object. Returns a token
-  // that can be used to reset to the previous Context.
-  static nostd::unique_ptr<Token> Attach(const Context &context) noexcept
-  {
-    return GetRuntimeContextStorage()->Attach(context);
-  }
-
-  // Resets the context to a previous value stored in the
-  // passed in token. Returns true if successful, false otherwise
-  static bool Detach(Token &token) noexcept { return GetRuntimeContextStorage()->Detach(token); }
-
-  // Sets the Key and Value into the passed in context or if a context is not
-  // passed in, the RuntimeContext.
-  // Should be used to SetValues to the current RuntimeContext, is essentially
-  // equivalent to RuntimeContext::GetCurrent().SetValue(key,value). Keep in
-  // mind that the current RuntimeContext will not be changed, and the new
-  // context will be returned.
-  static Context SetValue(nostd::string_view key,
-                          const ContextValue &value,
-                          Context *context = nullptr) noexcept
-  {
-    Context temp_context;
-    if (context == nullptr)
-    {
-      temp_context = GetCurrent();
-    }
-    else
-    {
-      temp_context = *context;
-    }
-    return temp_context.SetValue(key, value);
-  }
-
-  // Returns the value associated with the passed in key and either the
-  // passed in context* or the runtime context if a context is not passed in.
-  // Should be used to get values from the current RuntimeContext, is
-  // essentially equivalent to RuntimeContext::GetCurrent().GetValue(key).
-  static ContextValue GetValue(nostd::string_view key, Context *context = nullptr) noexcept
-  {
-    Context temp_context;
-    if (context == nullptr)
-    {
-      temp_context = GetCurrent();
-    }
-    else
-    {
-      temp_context = *context;
-    }
-    return temp_context.GetValue(key);
-  }
-
-  /**
-   * Provide a custom runtime context storage.
-   *
-   * This provides a possibility to override the default thread-local runtime
-   * context storage. This has to be set before any spans are created by the
-   * application, otherwise the behavior is undefined.
-   *
-   * @param storage a custom runtime context storage
-   */
-  static void SetRuntimeContextStorage(
-      const nostd::shared_ptr<RuntimeContextStorage> &storage) noexcept
-  {
-    GetStorage() = storage;
-  }
-
-  /**
-   * Provide a pointer to const runtime context storage.
-   *
-   * The returned pointer can only be used for extending the lifetime of the runtime context
-   * storage.
-   *
-   */
-  static nostd::shared_ptr<const RuntimeContextStorage> GetConstRuntimeContextStorage() noexcept
-  {
-    return GetRuntimeContextStorage();
-  }
-
-private:
-  static nostd::shared_ptr<RuntimeContextStorage> GetRuntimeContextStorage() noexcept
-  {
-    return GetStorage();
-  }
-
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<RuntimeContextStorage> &GetStorage() noexcept
-  {
-    static nostd::shared_ptr<RuntimeContextStorage> context(GetDefaultStorage());
-    return context;
-  }
-};
-
-inline Token::~Token() noexcept
-{
-  context::RuntimeContext::Detach(*this);
-}
-
-// The ThreadLocalContextStorage class is a derived class from
-// RuntimeContextStorage and provides a wrapper for propagating context through
-// cpp thread locally. This file must be included to use the RuntimeContext
-// class if another implementation has not been registered.
-class ThreadLocalContextStorage : public RuntimeContextStorage
-{
-public:
-  ThreadLocalContextStorage() noexcept = default;
-
-  // Return the current context.
-  Context GetCurrent() noexcept override { return GetStack().Top(); }
-
-  // Resets the context to the value previous to the passed in token. This will
-  // also detach all child contexts of the passed in token.
-  // Returns true if successful, false otherwise.
-  bool Detach(Token &token) noexcept override
-  {
-    // In most cases, the context to be detached is on the top of the stack.
-    if (token == GetStack().Top())
-    {
-      GetStack().Pop();
-      return true;
-    }
-
-    if (!GetStack().Contains(token))
-    {
-      return false;
-    }
-
-    while (!(token == GetStack().Top()))
-    {
-      GetStack().Pop();
-    }
-
-    GetStack().Pop();
-
-    return true;
-  }
-
-  // Sets the current 'Context' object. Returns a token
-  // that can be used to reset to the previous Context.
-  nostd::unique_ptr<Token> Attach(const Context &context) noexcept override
-  {
-    GetStack().Push(context);
-    return CreateToken(context);
-  }
-
-private:
-  // A nested class to store the attached contexts in a stack.
-  class Stack
-  {
-    friend class ThreadLocalContextStorage;
-
-    Stack() noexcept : size_(0), capacity_(0), base_(nullptr) {}
-
-    // Pops the top Context off the stack.
-    void Pop() noexcept
-    {
-      if (size_ == 0)
-      {
-        return;
-      }
-      // Store empty Context before decrementing `size`, to ensure
-      // the shared_ptr object (if stored in prev context object ) are released.
-      // The stack is not resized, and the unused memory would be reutilised
-      // for subsequent context storage.
-      base_[size_ - 1] = Context();
-      size_ -= 1;
-    }
-
-    bool Contains(const Token &token) const noexcept
-    {
-      for (size_t pos = size_; pos > 0; --pos)
-      {
-        if (token == base_[pos - 1])
-        {
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    // Returns the Context at the top of the stack.
-    Context Top() const noexcept
-    {
-      if (size_ == 0)
-      {
-        return Context();
-      }
-      return base_[size_ - 1];
-    }
-
-    // Pushes the passed in context pointer to the top of the stack
-    // and resizes if necessary.
-    void Push(const Context &context) noexcept
-    {
-      size_++;
-      if (size_ > capacity_)
-      {
-        Resize(size_ * 2);
-      }
-      base_[size_ - 1] = context;
-    }
-
-    // Reallocates the storage array to the pass in new capacity size.
-    void Resize(size_t new_capacity) noexcept
-    {
-      size_t old_size = size_ - 1;
-      if (new_capacity == 0)
-      {
-        new_capacity = 2;
-      }
-      Context *temp = new Context[new_capacity];
-      if (base_ != nullptr)
-      {
-        // vs2015 does not like this construct considering it unsafe:
-        // - std::copy(base_, base_ + old_size, temp);
-        // Ref.
-        // https://stackoverflow.com/questions/12270224/xutility2227-warning-c4996-std-copy-impl
-        for (size_t i = 0; i < (std::min)(old_size, new_capacity); i++)
-        {
-          temp[i] = base_[i];
-        }
-        delete[] base_;
-      }
-      base_     = temp;
-      capacity_ = new_capacity;
-    }
-
-    ~Stack() noexcept { delete[] base_; }
-
-    size_t size_;
-    size_t capacity_;
-    Context *base_;
-  };
-
-  OPENTELEMETRY_API_SINGLETON Stack &GetStack()
-  {
-    static thread_local Stack stack_ = Stack();
-    return stack_;
-  }
-};
-
-static RuntimeContextStorage *GetDefaultStorage() noexcept
-{
-  return new ThreadLocalContextStorage();
-}
-}  // namespace context
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/detail/preprocessor.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/detail/preprocessor.h
deleted file mode 100644
index acdf02eb0..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/detail/preprocessor.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// NOTE - code within detail namespace implements internal details, and not part
-// of the public interface.
-
-#pragma once
-
-#define OPENTELEMETRY_STRINGIFY(S) OPENTELEMETRY_STRINGIFY_(S)
-#define OPENTELEMETRY_STRINGIFY_(S) #S
-
-#define OPENTELEMETRY_CONCAT(A, B) OPENTELEMETRY_CONCAT_(A, B)
-#define OPENTELEMETRY_CONCAT_(A, B) A##B
-
-// Import the C++20 feature-test macros
-#ifdef __has_include
-#  if __has_include(<version>)
-#    include <version>
-#  endif
-#elif defined(_MSC_VER) && ((defined(__cplusplus) && __cplusplus >= 202002L) || \
-                            (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L))
-#  if _MSC_VER >= 1922
-#    include <version>
-#  endif
-#endif
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_id.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_id.h
deleted file mode 100644
index 65306ef79..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_id.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-/**
- * EventId class which acts the Id of the event with an optional name.
- */
-class EventId
-{
-public:
-  EventId(int64_t id, nostd::string_view name) noexcept
-      : id_{id}, name_{nostd::unique_ptr<char[]>{new char[name.length() + 1]}}
-  {
-    std::copy(name.begin(), name.end(), name_.get());
-    name_.get()[name.length()] = 0;
-  }
-
-  EventId(int64_t id) noexcept : id_{id}, name_{nullptr} {}
-
-public:
-  int64_t id_;
-  nostd::unique_ptr<char[]> name_;
-};
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_logger.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_logger.h
deleted file mode 100644
index bcc103562..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_logger.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_type_traits.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-/**
- * Handles event log record creation.
- **/
-class OPENTELEMETRY_DEPRECATED EventLogger
-{
-public:
-  virtual ~EventLogger() = default;
-
-  /* Returns the name of the logger */
-  virtual const nostd::string_view GetName() noexcept = 0;
-
-  /* Returns the delegate logger of this event logger */
-  virtual nostd::shared_ptr<Logger> GetDelegateLogger() noexcept = 0;
-
-  /**
-   * Emit a event Log Record object
-   *
-   * @param event_name Event name
-   * @param log_record Log record
-   */
-  virtual void EmitEvent(nostd::string_view event_name,
-                         nostd::unique_ptr<LogRecord> &&log_record) noexcept = 0;
-
-  /**
-   * Emit a event Log Record object with arguments
-   *
-   * @param event_name Event name
-   * @tparam args Arguments which can be used to set data of log record by type.
-   *  Severity                                -> severity, severity_text
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,tace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> tace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void EmitEvent(nostd::string_view event_name, ArgumentType &&...args)
-  {
-    nostd::shared_ptr<Logger> delegate_logger = GetDelegateLogger();
-    if (!delegate_logger)
-    {
-      return;
-    }
-    nostd::unique_ptr<LogRecord> log_record = delegate_logger->CreateLogRecord();
-
-    IgnoreTraitResult(detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::Set(
-        log_record.get(), std::forward<ArgumentType>(args))...);
-
-    EmitEvent(event_name, std::move(log_record));
-  }
-
-private:
-  template <class... ValueType>
-  void IgnoreTraitResult(ValueType &&...)
-  {}
-};
-#endif
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_logger_provider.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_logger_provider.h
deleted file mode 100644
index 9eea0ca23..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/event_logger_provider.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-class EventLogger;
-class Logger;
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-/**
- * Creates new EventLogger instances.
- */
-class OPENTELEMETRY_DEPRECATED EventLoggerProvider
-{
-public:
-  virtual ~EventLoggerProvider() = default;
-
-  /**
-   * Creates a named EventLogger instance.
-   *
-   */
-
-  virtual nostd::shared_ptr<EventLogger> CreateEventLogger(
-      nostd::shared_ptr<Logger> delegate_logger,
-      nostd::string_view event_domain) noexcept = 0;
-};
-#endif
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/log_record.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/log_record.h
deleted file mode 100644
index 81dec568e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/log_record.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-class SpanId;
-class TraceId;
-class TraceFlags;
-}  // namespace trace
-
-namespace logs
-{
-
-enum class Severity : uint8_t;
-
-/**
- * Maintains a representation of a log in a format that can be processed by a recorder.
- *
- * This class is thread-compatible.
- */
-class LogRecord
-{
-public:
-  virtual ~LogRecord() = default;
-
-  /**
-   * Set the timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  virtual void SetTimestamp(common::SystemTimestamp timestamp) noexcept = 0;
-
-  /**
-   * Set the observed timestamp for this log.
-   * @param timestamp the timestamp to set
-   */
-  virtual void SetObservedTimestamp(common::SystemTimestamp timestamp) noexcept = 0;
-
-  /**
-   * Set the severity for this log.
-   * @param severity the severity of the event
-   */
-  virtual void SetSeverity(logs::Severity severity) noexcept = 0;
-
-  /**
-   * Set body field for this log.
-   * @param message the body to set
-   */
-  virtual void SetBody(const common::AttributeValue &message) noexcept = 0;
-
-  /**
-   * Set an attribute of a log.
-   * @param key the name of the attribute
-   * @param value the attribute value
-   */
-  virtual void SetAttribute(nostd::string_view key,
-                            const common::AttributeValue &value) noexcept = 0;
-
-  /**
-   * Set the Event Id.
-   * @param id The event id to set
-   * @param name Optional event name to set
-   */
-  // TODO: mark this as pure virtual once all exporters have been updated
-  virtual void SetEventId(int64_t id, nostd::string_view name = {}) noexcept = 0;
-
-  /**
-   * Set the trace id for this log.
-   * @param trace_id the trace id to set
-   */
-  virtual void SetTraceId(const trace::TraceId &trace_id) noexcept = 0;
-
-  /**
-   * Set the span id for this log.
-   * @param span_id the span id to set
-   */
-  virtual void SetSpanId(const trace::SpanId &span_id) noexcept = 0;
-
-  /**
-   * Inject trace_flags for this log.
-   * @param trace_flags the trace flags to set
-   */
-  virtual void SetTraceFlags(const trace::TraceFlags &trace_flags) noexcept = 0;
-};
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger.h
deleted file mode 100644
index 52f403b0a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger.h
+++ /dev/null
@@ -1,492 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/logs/logger_type_traits.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class KeyValueIterable;
-}  // namespace common
-
-namespace logs
-{
-
-class EventId;
-class LogRecord;
-
-/**
- * Handles log record creation.
- **/
-class Logger
-{
-public:
-  virtual ~Logger() = default;
-
-  /* Returns the name of the logger */
-  virtual const nostd::string_view GetName() noexcept = 0;
-
-  /**
-   * Create a Log Record object
-   *
-   * @return nostd::unique_ptr<LogRecord>
-   */
-  virtual nostd::unique_ptr<LogRecord> CreateLogRecord() noexcept = 0;
-
-  /**
-   * Emit a Log Record object
-   *
-   * @param log_record Log record
-   */
-  virtual void EmitLogRecord(nostd::unique_ptr<LogRecord> &&log_record) noexcept = 0;
-
-  /**
-   * Emit a Log Record object with arguments
-   *
-   * @param log_record Log record
-   * @param args Arguments which can be used to set data of log record by type.
-   *  Severity                                -> severity, severity_text
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void EmitLogRecord(nostd::unique_ptr<LogRecord> &&log_record, ArgumentType &&...args)
-  {
-    if (!log_record)
-    {
-      return;
-    }
-
-    //
-    // Keep the parameter pack unpacking order from left to right because left
-    // ones are usually more important like severity and event_id than the
-    // attributes. The left to right unpack order could pass the more important
-    // data to processors to avoid caching and memory allocating.
-    //
-#if __cplusplus <= 201402L
-    // C++14 does not support fold expressions for parameter pack expansion.
-    int dummy[] = {(detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::Set(
-                        log_record.get(), std::forward<ArgumentType>(args)),
-                    0)...};
-    IgnoreTraitResult(dummy);
-#else
-    IgnoreTraitResult((detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::Set(
-                           log_record.get(), std::forward<ArgumentType>(args)),
-                       ...));
-#endif
-
-    EmitLogRecord(std::move(log_record));
-  }
-
-  /**
-   * Emit a Log Record object with arguments
-   *
-   * @param args Arguments which can be used to set data of log record by type.
-   *  Severity                                -> severity, severity_text
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void EmitLogRecord(ArgumentType &&...args)
-  {
-    nostd::unique_ptr<LogRecord> log_record = CreateLogRecord();
-
-    EmitLogRecord(std::move(log_record), std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of trace.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Trace(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kTrace, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of debug.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Debug(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kDebug, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of info.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Info(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kInfo, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of warn.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Warn(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kWarn, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of error.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Error(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kError, std::forward<ArgumentType>(args)...);
-  }
-
-  /**
-   * Writes a log with a severity of fatal.
-   * @param args Arguments which can be used to set data of log record by type.
-   *  string_view                             -> body
-   *  AttributeValue                          -> body
-   *  SpanContext                             -> span_id,trace_id and trace_flags
-   *  SpanId                                  -> span_id
-   *  TraceId                                 -> trace_id
-   *  TraceFlags                              -> trace_flags
-   *  SystemTimestamp                         -> timestamp
-   *  system_clock::time_point                -> timestamp
-   *  KeyValueIterable                        -> attributes
-   *  Key value iterable container            -> attributes
-   *  span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
-   */
-  template <class... ArgumentType>
-  void Fatal(ArgumentType &&...args) noexcept
-  {
-    static_assert(
-        !detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
-        "Severity is already set.");
-    this->EmitLogRecord(Severity::kFatal, std::forward<ArgumentType>(args)...);
-  }
-
-  //
-  // OpenTelemetry C++ user-facing Logs API
-  //
-
-  inline bool Enabled(Severity severity, const EventId &event_id) const noexcept
-  {
-    if OPENTELEMETRY_LIKELY_CONDITION (!Enabled(severity))
-    {
-      return false;
-    }
-    return EnabledImplementation(severity, event_id);
-  }
-
-  inline bool Enabled(Severity severity, int64_t event_id) const noexcept
-  {
-    if OPENTELEMETRY_LIKELY_CONDITION (!Enabled(severity))
-    {
-      return false;
-    }
-    return EnabledImplementation(severity, event_id);
-  }
-
-  inline bool Enabled(Severity severity) const noexcept
-  {
-    return static_cast<uint8_t>(severity) >= OPENTELEMETRY_ATOMIC_READ_8(&minimum_severity_);
-  }
-
-  /**
-   * Log an event
-   *
-   * @severity severity of the log
-   * @event_id event identifier of the log
-   * @format an utf-8 string following https://messagetemplates.org/
-   * @attributes key value pairs of the log
-   */
-  virtual void Log(Severity severity,
-                   const EventId &event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->EmitLogRecord(severity, event_id, format, attributes);
-  }
-
-  virtual void Log(Severity severity,
-                   int64_t event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->EmitLogRecord(severity, EventId{event_id}, format, attributes);
-  }
-
-  virtual void Log(Severity severity,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->EmitLogRecord(severity, format, attributes);
-  }
-
-  virtual void Log(Severity severity, nostd::string_view message) noexcept
-  {
-    this->EmitLogRecord(severity, message);
-  }
-
-  // Convenient wrappers based on virtual methods Log().
-  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#field-severitynumber
-
-  inline void Trace(const EventId &event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kTrace, event_id, format, attributes);
-  }
-
-  inline void Trace(int64_t event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kTrace, EventId{event_id}, format, attributes);
-  }
-
-  inline void Trace(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kTrace, format, attributes);
-  }
-
-  inline void Trace(nostd::string_view message) noexcept { this->Log(Severity::kTrace, message); }
-
-  inline void Debug(const EventId &event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kDebug, event_id, format, attributes);
-  }
-
-  inline void Debug(int64_t event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kDebug, EventId{event_id}, format, attributes);
-  }
-
-  inline void Debug(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kDebug, format, attributes);
-  }
-
-  inline void Debug(nostd::string_view message) noexcept { this->Log(Severity::kDebug, message); }
-
-  inline void Info(const EventId &event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kInfo, event_id, format, attributes);
-  }
-
-  inline void Info(int64_t event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kInfo, EventId{event_id}, format, attributes);
-  }
-
-  inline void Info(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kInfo, format, attributes);
-  }
-
-  inline void Info(nostd::string_view message) noexcept { this->Log(Severity::kInfo, message); }
-
-  inline void Warn(const EventId &event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kWarn, event_id, format, attributes);
-  }
-
-  inline void Warn(int64_t event_id,
-                   nostd::string_view format,
-                   const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kWarn, EventId{event_id}, format, attributes);
-  }
-
-  inline void Warn(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kWarn, format, attributes);
-  }
-
-  inline void Warn(nostd::string_view message) noexcept { this->Log(Severity::kWarn, message); }
-
-  inline void Error(const EventId &event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kError, event_id, format, attributes);
-  }
-
-  inline void Error(int64_t event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kError, EventId{event_id}, format, attributes);
-  }
-
-  inline void Error(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kError, format, attributes);
-  }
-
-  inline void Error(nostd::string_view message) noexcept { this->Log(Severity::kError, message); }
-
-  inline void Fatal(const EventId &event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kFatal, event_id, format, attributes);
-  }
-
-  inline void Fatal(int64_t event_id,
-                    nostd::string_view format,
-                    const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kFatal, EventId{event_id}, format, attributes);
-  }
-
-  inline void Fatal(nostd::string_view format, const common::KeyValueIterable &attributes) noexcept
-  {
-    this->Log(Severity::kFatal, format, attributes);
-  }
-
-  inline void Fatal(nostd::string_view message) noexcept { this->Log(Severity::kFatal, message); }
-
-  //
-  // End of OpenTelemetry C++ user-facing Log API.
-  //
-
-protected:
-  // TODO: discuss with community about naming for internal methods.
-  virtual bool EnabledImplementation(Severity /*severity*/,
-                                     const EventId & /*event_id*/) const noexcept
-  {
-    return false;
-  }
-
-  virtual bool EnabledImplementation(Severity /*severity*/, int64_t /*event_id*/) const noexcept
-  {
-    return false;
-  }
-
-  void SetMinimumSeverity(uint8_t severity_or_max) noexcept
-  {
-    OPENTELEMETRY_ATOMIC_WRITE_8(&minimum_severity_, severity_or_max);
-  }
-
-private:
-  template <class... ValueType>
-  void IgnoreTraitResult(ValueType &&...)
-  {}
-
-  //
-  // minimum_severity_ can be updated concurrently by multiple threads/cores, so race condition on
-  // read/write should be handled. And std::atomic can not be used here because it is not ABI
-  // compatible for OpenTelemetry C++ API.
-  //
-  mutable uint8_t minimum_severity_{kMaxSeverity};
-};
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger_provider.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger_provider.h
deleted file mode 100644
index ab1493c5c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger_provider.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-class Logger;
-
-/**
- * Creates new Logger instances.
- */
-class OPENTELEMETRY_EXPORT LoggerProvider
-{
-public:
-  virtual ~LoggerProvider() = default;
-
-  /**
-   * Gets or creates a named Logger instance.
-   *
-   * Optionally a version can be passed to create a named and versioned Logger
-   * instance.
-   *
-   * Optionally a configuration file name can be passed to create a configuration for
-   * the Logger instance.
-   *
-   */
-
-  virtual nostd::shared_ptr<Logger> GetLogger(
-      nostd::string_view logger_name,
-      nostd::string_view library_name            = "",
-      nostd::string_view library_version         = "",
-      nostd::string_view schema_url              = "",
-      const common::KeyValueIterable &attributes = common::NoopKeyValueIterable()) = 0;
-
-  nostd::shared_ptr<Logger> GetLogger(
-      nostd::string_view logger_name,
-      nostd::string_view library_name,
-      nostd::string_view library_version,
-      nostd::string_view schema_url,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes)
-  {
-    return GetLogger(logger_name, library_name, library_version, schema_url,
-                     nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                         attributes.begin(), attributes.end()});
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view logger_name,
-                                      nostd::string_view library_name,
-                                      nostd::string_view library_version,
-                                      nostd::string_view schema_url,
-                                      const T &attributes)
-  {
-    return GetLogger(logger_name, library_name, library_version, schema_url,
-                     common::KeyValueIterableView<T>(attributes));
-  }
-};
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger_type_traits.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger_type_traits.h
deleted file mode 100644
index d88a6ffbd..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/logger_type_traits.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-#include <memory>
-#include <type_traits>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/logs/event_id.h"
-#include "opentelemetry/logs/log_record.h"
-#include "opentelemetry/logs/severity.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-namespace detail
-{
-template <class ValueType>
-struct LogRecordSetterTrait;
-
-template <>
-struct LogRecordSetterTrait<Severity>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetSeverity(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<EventId>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetEventId(arg.id_, nostd::string_view{arg.name_.get()});
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<trace::SpanContext>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetSpanId(arg.span_id());
-    log_record->SetTraceId(arg.trace_id());
-    log_record->SetTraceFlags(arg.trace_flags());
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<trace::SpanId>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetSpanId(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<trace::TraceId>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetTraceId(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<trace::TraceFlags>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetTraceFlags(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<common::SystemTimestamp>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetTimestamp(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<std::chrono::system_clock::time_point>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetTimestamp(common::SystemTimestamp(std::forward<ArgumentType>(arg)));
-
-    return log_record;
-  }
-};
-
-template <>
-struct LogRecordSetterTrait<common::KeyValueIterable>
-{
-  template <class ArgumentType>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    arg.ForEachKeyValue(
-        [&log_record](nostd::string_view key, common::AttributeValue value) noexcept {
-          log_record->SetAttribute(key, value);
-          return true;
-        });
-
-    return log_record;
-  }
-};
-
-template <class ValueType>
-struct LogRecordSetterTrait
-{
-  static_assert(!std::is_same<nostd::unique_ptr<LogRecord>, ValueType>::value &&
-                    !std::is_same<std::unique_ptr<LogRecord>, ValueType>::value,
-                "unique_ptr<LogRecord> is not allowed, please use std::move()");
-
-  template <class ArgumentType,
-            nostd::enable_if_t<std::is_convertible<ArgumentType, nostd::string_view>::value ||
-                                   std::is_convertible<ArgumentType, common::AttributeValue>::value,
-                               void> * = nullptr>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    log_record->SetBody(std::forward<ArgumentType>(arg));
-
-    return log_record;
-  }
-
-  template <class ArgumentType,
-            nostd::enable_if_t<std::is_base_of<common::KeyValueIterable, ArgumentType>::value, bool>
-                * = nullptr>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    return LogRecordSetterTrait<common::KeyValueIterable>::Set(log_record,
-                                                               std::forward<ArgumentType>(arg));
-  }
-
-  template <class ArgumentType,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<ArgumentType>::value, int> * =
-                nullptr>
-  inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept
-  {
-    for (auto &argv : arg)
-    {
-      log_record->SetAttribute(argv.first, argv.second);
-    }
-
-    return log_record;
-  }
-};
-
-template <class ValueType, class... ArgumentType>
-struct LogRecordHasType;
-
-template <class ValueType>
-struct LogRecordHasType<ValueType> : public std::false_type
-{};
-
-template <class ValueType, class TargetType, class... ArgumentType>
-struct LogRecordHasType<ValueType, TargetType, ArgumentType...>
-    : public std::conditional<std::is_same<ValueType, TargetType>::value,
-                              std::true_type,
-                              LogRecordHasType<ValueType, ArgumentType...>>::type
-{};
-
-}  // namespace detail
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/noop.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/noop.h
deleted file mode 100644
index 24312f061..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/noop.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// Please refer to provider.h for documentation on how to obtain a Logger object.
-//
-// This file is part of the internal implementation of OpenTelemetry. Nothing in this file should be
-// used directly. Please refer to logger.h for documentation on these interfaces.
-
-#include "opentelemetry/logs/event_logger.h"
-#include "opentelemetry/logs/event_logger_provider.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/logs/logger_provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace common
-{
-class KeyValueIterable;
-}  // namespace common
-
-namespace logs
-{
-/**
- * No-op implementation of Logger. This class should not be used directly. It should only be
- * instantiated using a LoggerProvider's GetLogger() call.
- */
-class NoopLogger final : public Logger
-{
-public:
-  const nostd::string_view GetName() noexcept override { return "noop logger"; }
-
-  nostd::unique_ptr<LogRecord> CreateLogRecord() noexcept override
-  {
-    /*
-     * Do not return memory shared between threads,
-     * a `new` + `delete` for each noop record can not be avoided,
-     * due to the semantic of unique_ptr.
-     */
-    return nostd::unique_ptr<LogRecord>(new NoopLogRecord());
-  }
-
-  using Logger::EmitLogRecord;
-
-  void EmitLogRecord(nostd::unique_ptr<LogRecord> &&) noexcept override {}
-
-private:
-  class NoopLogRecord : public LogRecord
-  {
-  public:
-    NoopLogRecord()           = default;
-    ~NoopLogRecord() override = default;
-
-    void SetTimestamp(common::SystemTimestamp /* timestamp */) noexcept override {}
-    void SetObservedTimestamp(common::SystemTimestamp /* timestamp */) noexcept override {}
-    void SetSeverity(logs::Severity /* severity */) noexcept override {}
-    void SetBody(const common::AttributeValue & /* message */) noexcept override {}
-    void SetAttribute(nostd::string_view /* key */,
-                      const common::AttributeValue & /* value */) noexcept override
-    {}
-    void SetEventId(int64_t /* id */, nostd::string_view /* name */) noexcept override {}
-    void SetTraceId(const trace::TraceId & /* trace_id */) noexcept override {}
-    void SetSpanId(const trace::SpanId & /* span_id */) noexcept override {}
-    void SetTraceFlags(const trace::TraceFlags & /* trace_flags */) noexcept override {}
-  };
-};
-
-/**
- * No-op implementation of a LoggerProvider.
- */
-class NoopLoggerProvider final : public LoggerProvider
-{
-public:
-  NoopLoggerProvider() : logger_{nostd::shared_ptr<NoopLogger>(new NoopLogger())} {}
-
-  nostd::shared_ptr<Logger> GetLogger(nostd::string_view /* logger_name */,
-                                      nostd::string_view /* library_name */,
-                                      nostd::string_view /* library_version */,
-                                      nostd::string_view /* schema_url */,
-                                      const common::KeyValueIterable & /* attributes */) override
-  {
-    return logger_;
-  }
-
-private:
-  nostd::shared_ptr<Logger> logger_;
-};
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-class NoopEventLogger final : public EventLogger
-{
-public:
-  NoopEventLogger() : logger_{nostd::shared_ptr<NoopLogger>(new NoopLogger())} {}
-
-  const nostd::string_view GetName() noexcept override { return "noop event logger"; }
-
-  nostd::shared_ptr<Logger> GetDelegateLogger() noexcept override { return logger_; }
-
-  void EmitEvent(nostd::string_view, nostd::unique_ptr<LogRecord> &&) noexcept override {}
-
-private:
-  nostd::shared_ptr<Logger> logger_;
-};
-
-/**
- * No-op implementation of a EventLoggerProvider.
- */
-class NoopEventLoggerProvider final : public EventLoggerProvider
-{
-public:
-  NoopEventLoggerProvider() : event_logger_{nostd::shared_ptr<EventLogger>(new NoopEventLogger())}
-  {}
-
-  nostd::shared_ptr<EventLogger> CreateEventLogger(
-      nostd::shared_ptr<Logger> /*delegate_logger*/,
-      nostd::string_view /*event_domain*/) noexcept override
-  {
-    return event_logger_;
-  }
-
-private:
-  nostd::shared_ptr<EventLogger> event_logger_;
-};
-#endif
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/provider.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/provider.h
deleted file mode 100644
index 0c1b4deea..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/provider.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/logs/noop.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-class EventLoggerProvider;
-#endif
-class LoggerProvider;
-
-/**
- * Stores the singleton global LoggerProvider.
- */
-class OPENTELEMETRY_EXPORT Provider
-{
-public:
-  /**
-   * Returns the singleton LoggerProvider.
-   *
-   * By default, a no-op LoggerProvider is returned. This will never return a
-   * nullptr LoggerProvider.
-   */
-  static nostd::shared_ptr<LoggerProvider> GetLoggerProvider() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<LoggerProvider>(GetProvider());
-  }
-
-  /**
-   * Changes the singleton LoggerProvider.
-   */
-  static void SetLoggerProvider(const nostd::shared_ptr<LoggerProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetProvider() = tp;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-  /**
-   * Returns the singleton EventLoggerProvider.
-   *
-   * By default, a no-op EventLoggerProvider is returned. This will never return a
-   * nullptr EventLoggerProvider.
-   */
-  OPENTELEMETRY_DEPRECATED static nostd::shared_ptr<EventLoggerProvider>
-  GetEventLoggerProvider() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<EventLoggerProvider>(GetEventProvider());
-  }
-
-  /**
-   * Changes the singleton EventLoggerProvider.
-   */
-  OPENTELEMETRY_DEPRECATED static void SetEventLoggerProvider(
-      const nostd::shared_ptr<EventLoggerProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetEventProvider() = tp;
-  }
-#endif
-
-private:
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<LoggerProvider> &GetProvider() noexcept
-  {
-    static nostd::shared_ptr<LoggerProvider> provider(new NoopLoggerProvider);
-    return provider;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-  OPENTELEMETRY_DEPRECATED
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<EventLoggerProvider> &
-  GetEventProvider() noexcept
-  {
-    static nostd::shared_ptr<EventLoggerProvider> provider(new NoopEventLoggerProvider);
-    return provider;
-  }
-#endif
-
-  OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
-  {
-    static common::SpinLockMutex lock;
-    return lock;
-  }
-};
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/severity.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/severity.h
deleted file mode 100644
index f4d961615..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/logs/severity.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace logs
-{
-
-/**
- * Severity Levels assigned to log events, based on Log Data Model,
- * with the addition of kInvalid (mapped to a severity number of 0).
- *
- * See
- * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#field-severitynumber
- */
-enum class Severity : uint8_t
-{
-  kInvalid = 0,
-  kTrace   = 1,
-  kTrace2  = 2,
-  kTrace3  = 3,
-  kTrace4  = 4,
-  kDebug   = 5,
-  kDebug2  = 6,
-  kDebug3  = 7,
-  kDebug4  = 8,
-  kInfo    = 9,
-  kInfo2   = 10,
-  kInfo3   = 11,
-  kInfo4   = 12,
-  kWarn    = 13,
-  kWarn2   = 14,
-  kWarn3   = 15,
-  kWarn4   = 16,
-  kError   = 17,
-  kError2  = 18,
-  kError3  = 19,
-  kError4  = 20,
-  kFatal   = 21,
-  kFatal2  = 22,
-  kFatal3  = 23,
-  kFatal4  = 24
-};
-
-const uint8_t kMaxSeverity = 255;
-
-/**
- * Mapping of the severity enum above, to a severity text string (in all caps).
- * This severity text can be printed out by exporters. Capital letters follow the
- * spec naming convention.
- *
- * Included to follow the specification's recommendation to print both
- * severity number and text in each log record.
- */
-const nostd::string_view SeverityNumToText[25] = {
-    "INVALID", "TRACE",  "TRACE2", "TRACE3", "TRACE4", "DEBUG",  "DEBUG2", "DEBUG3", "DEBUG4",
-    "INFO",    "INFO2",  "INFO3",  "INFO4",  "WARN",   "WARN2",  "WARN3",  "WARN4",  "ERROR",
-    "ERROR2",  "ERROR3", "ERROR4", "FATAL",  "FATAL2", "FATAL3", "FATAL4"};
-
-}  // namespace logs
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/async_instruments.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/async_instruments.h
deleted file mode 100644
index f73eb2f51..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/async_instruments.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-using ObservableCallbackPtr = void (*)(ObserverResult, void *);
-
-class ObservableInstrument
-{
-public:
-  ObservableInstrument()          = default;
-  virtual ~ObservableInstrument() = default;
-
-  /**
-   * Sets up a function that will be called whenever a metric collection is initiated.
-   */
-  virtual void AddCallback(ObservableCallbackPtr, void *state) noexcept = 0;
-
-  /**
-   * Remove a function that was configured to be called whenever a metric collection is initiated.
-   */
-  virtual void RemoveCallback(ObservableCallbackPtr, void *state) noexcept = 0;
-};
-
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/meter.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/meter.h
deleted file mode 100644
index 59cfb8782..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/meter.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-template <typename T>
-class Counter;
-
-template <typename T>
-class Histogram;
-
-template <typename T>
-class UpDownCounter;
-
-template <typename T>
-class Gauge;
-
-class ObservableInstrument;
-
-/**
- * Handles instrument creation and provides a facility for batch recording.
- *
- * This class provides methods to create new metric instruments, record a
- * batch of values to a specified set of instruments, and collect
- * measurements from all instruments.
- *
- */
-class Meter
-{
-public:
-  virtual ~Meter() = default;
-
-  /**
-   * Creates a Counter with the passed characteristics and returns a unique_ptr to that Counter.
-   *
-   * @param name the name of the new Counter.
-   * @param description a brief description of what the Counter is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   * @return a shared pointer to the created Counter.
-   */
-
-  virtual nostd::unique_ptr<Counter<uint64_t>> CreateUInt64Counter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::unique_ptr<Counter<double>> CreateDoubleCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  /**
-   * Creates a Asynchronous (Observable) counter with the passed characteristics and returns a
-   * shared_ptr to that Observable Counter
-   *
-   * @param name the name of the new Observable Counter.
-   * @param description a brief description of what the Observable Counter is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   */
-  virtual nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  /**
-   * Creates a Histogram with the passed characteristics and returns a unique_ptr to that Histogram.
-   *
-   * @param name the name of the new Histogram.
-   * @param description a brief description of what the Histogram is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   * @return a shared pointer to the created Histogram.
-   */
-  virtual nostd::unique_ptr<Histogram<uint64_t>> CreateUInt64Histogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::unique_ptr<Histogram<double>> CreateDoubleHistogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * Creates a Gauge with the passed characteristics and returns a unique_ptr to that Gauge.
-   *
-   * @param name the name of the new Gauge.
-   * @param description a brief description of what the Gauge is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   * @return a unique pointer to the created Gauge.
-   */
-
-  virtual nostd::unique_ptr<Gauge<int64_t>> CreateInt64Gauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::unique_ptr<Gauge<double>> CreateDoubleGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-#endif
-
-  /**
-   * Creates a Asynchronous (Observable) Gauge with the passed characteristics and returns a
-   * shared_ptr to that Observable Gauge
-   *
-   * @param name the name of the new Observable Gauge.
-   * @param description a brief description of what the Observable Gauge is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   */
-  virtual nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  /**
-   * Creates an UpDownCounter with the passed characteristics and returns a unique_ptr to that
-   * UpDownCounter.
-   *
-   * @param name the name of the new UpDownCounter.
-   * @param description a brief description of what the UpDownCounter is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   * @return a shared pointer to the created UpDownCounter.
-   */
-  virtual nostd::unique_ptr<UpDownCounter<int64_t>> CreateInt64UpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::unique_ptr<UpDownCounter<double>> CreateDoubleUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  /**
-   * Creates a Asynchronous (Observable) UpDownCounter with the passed characteristics and returns
-   * a shared_ptr to that Observable UpDownCounter
-   *
-   * @param name the name of the new Observable UpDownCounter.
-   * @param description a brief description of what the Observable UpDownCounter is used for.
-   * @param unit the unit of metric values following https://unitsofmeasure.org/ucum.html.
-   */
-  virtual nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-
-  virtual nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept = 0;
-};
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/meter_provider.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/meter_provider.h
deleted file mode 100644
index fca960bb8..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/meter_provider.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-class Meter;
-
-/**
- * Creates new Meter instances.
- */
-class MeterProvider
-{
-public:
-  virtual ~MeterProvider() = default;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Gets or creates a named Meter instance (ABI).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes (optional, may be nullptr)
-   */
-  virtual nostd::shared_ptr<Meter> GetMeter(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      const common::KeyValueIterable *attributes) noexcept = 0;
-
-  /**
-   * Gets or creates a named Meter instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version, optional
-   * @param[in] schema_url Instrumentation scope schema URL, optional
-   */
-  nostd::shared_ptr<Meter> GetMeter(nostd::string_view name,
-                                    nostd::string_view version    = "",
-                                    nostd::string_view schema_url = "")
-  {
-    return GetMeter(name, version, schema_url, nullptr);
-  }
-
-  /**
-   * Gets or creates a named Meter instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes
-   */
-  nostd::shared_ptr<Meter> GetMeter(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes)
-  {
-    /* Build a container from std::initializer_list. */
-    nostd::span<const std::pair<nostd::string_view, common::AttributeValue>> attributes_span{
-        attributes.begin(), attributes.end()};
-
-    /* Build a view on the container. */
-    common::KeyValueIterableView<
-        nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>>
-        iterable_attributes{attributes_span};
-
-    /* Add attributes using the view. */
-    return GetMeter(name, version, schema_url, &iterable_attributes);
-  }
-
-  /**
-   * Gets or creates a named Meter instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes container
-   */
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Meter> GetMeter(nostd::string_view name,
-                                    nostd::string_view version,
-                                    nostd::string_view schema_url,
-                                    const T &attributes)
-  {
-    /* Build a view on the container. */
-    common::KeyValueIterableView<T> iterable_attributes(attributes);
-
-    /* Add attributes using the view. */
-    return GetMeter(name, version, schema_url, &iterable_attributes);
-  }
-
-#else
-  /**
-   * Gets or creates a named Meter instance (ABI)
-   *
-   * @since ABI_VERSION 1
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version, optional
-   * @param[in] schema_url Instrumentation scope schema URL, optional
-   */
-  virtual nostd::shared_ptr<Meter> GetMeter(nostd::string_view name,
-                                            nostd::string_view version    = "",
-                                            nostd::string_view schema_url = "") noexcept = 0;
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * Remove a named Meter instance (ABI).
-   *
-   * This API is experimental, see
-   * https://github.com/open-telemetry/opentelemetry-specification/issues/2232
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Meter instrumentation scope
-   * @param[in] version Instrumentation scope version, optional
-   * @param[in] schema_url Instrumentation scope schema URL, optional
-   */
-  virtual void RemoveMeter(nostd::string_view name,
-                           nostd::string_view version    = "",
-                           nostd::string_view schema_url = "") noexcept = 0;
-#endif
-};
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/noop.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/noop.h
deleted file mode 100644
index 1d508b938..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/noop.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/metrics/async_instruments.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/observer_result.h"
-#include "opentelemetry/metrics/sync_instruments.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-template <class T>
-class NoopCounter : public Counter<T>
-{
-public:
-  NoopCounter(nostd::string_view /* name */,
-              nostd::string_view /* description */,
-              nostd::string_view /* unit */) noexcept
-  {}
-  void Add(T /* value */) noexcept override {}
-  void Add(T /* value */, const context::Context & /* context */) noexcept override {}
-  void Add(T /* value */, const common::KeyValueIterable & /* attributes */) noexcept override {}
-  void Add(T /* value */,
-           const common::KeyValueIterable & /* attributes */,
-           const context::Context & /* context */) noexcept override
-  {}
-};
-
-template <class T>
-class NoopHistogram : public Histogram<T>
-{
-public:
-  NoopHistogram(nostd::string_view /* name */,
-                nostd::string_view /* description */,
-                nostd::string_view /* unit */) noexcept
-  {}
-  void Record(T /* value */, const context::Context & /* context */) noexcept override {}
-  void Record(T /* value */,
-              const common::KeyValueIterable & /* attributes */,
-              const context::Context & /* context */) noexcept override
-  {}
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void Record(T /*value*/,
-              const opentelemetry::common::KeyValueIterable & /*attributes*/) noexcept override
-  {}
-
-  void Record(T /*value*/) noexcept override {}
-#endif
-};
-
-template <class T>
-class NoopUpDownCounter : public UpDownCounter<T>
-{
-public:
-  NoopUpDownCounter(nostd::string_view /* name */,
-                    nostd::string_view /* description */,
-                    nostd::string_view /* unit */) noexcept
-  {}
-  ~NoopUpDownCounter() override = default;
-  void Add(T /* value */) noexcept override {}
-  void Add(T /* value */, const context::Context & /* context */) noexcept override {}
-  void Add(T /* value */, const common::KeyValueIterable & /* attributes */) noexcept override {}
-  void Add(T /* value */,
-           const common::KeyValueIterable & /* attributes */,
-           const context::Context & /* context */) noexcept override
-  {}
-};
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-template <class T>
-class NoopGauge : public Gauge<T>
-{
-public:
-  NoopGauge(nostd::string_view /* name */,
-            nostd::string_view /* description */,
-            nostd::string_view /* unit */) noexcept
-  {}
-  ~NoopGauge() override = default;
-  void Record(T /* value */) noexcept override {}
-  void Record(T /* value */, const context::Context & /* context */) noexcept override {}
-  void Record(T /* value */, const common::KeyValueIterable & /* attributes */) noexcept override {}
-  void Record(T /* value */,
-              const common::KeyValueIterable & /* attributes */,
-              const context::Context & /* context */) noexcept override
-  {}
-};
-#endif
-
-class NoopObservableInstrument : public ObservableInstrument
-{
-public:
-  NoopObservableInstrument(nostd::string_view /* name */,
-                           nostd::string_view /* description */,
-                           nostd::string_view /* unit */) noexcept
-  {}
-
-  void AddCallback(ObservableCallbackPtr, void * /* state */) noexcept override {}
-  void RemoveCallback(ObservableCallbackPtr, void * /* state */) noexcept override {}
-};
-
-/**
- * No-op implementation of Meter.
- */
-class NoopMeter final : public Meter
-{
-public:
-  nostd::unique_ptr<Counter<uint64_t>> CreateUInt64Counter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<Counter<uint64_t>>{new NoopCounter<uint64_t>(name, description, unit)};
-  }
-
-  nostd::unique_ptr<Counter<double>> CreateDoubleCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<Counter<double>>{new NoopCounter<double>(name, description, unit)};
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::unique_ptr<Histogram<uint64_t>> CreateUInt64Histogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<Histogram<uint64_t>>{
-        new NoopHistogram<uint64_t>(name, description, unit)};
-  }
-
-  nostd::unique_ptr<Histogram<double>> CreateDoubleHistogram(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<Histogram<double>>{new NoopHistogram<double>(name, description, unit)};
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::unique_ptr<Gauge<int64_t>> CreateInt64Gauge(nostd::string_view name,
-                                                     nostd::string_view description = "",
-                                                     nostd::string_view unit = "") noexcept override
-  {
-    return nostd::unique_ptr<Gauge<int64_t>>{new NoopGauge<int64_t>(name, description, unit)};
-  }
-
-  nostd::unique_ptr<Gauge<double>> CreateDoubleGauge(nostd::string_view name,
-                                                     nostd::string_view description = "",
-                                                     nostd::string_view unit = "") noexcept override
-  {
-    return nostd::unique_ptr<Gauge<double>>{new NoopGauge<double>(name, description, unit)};
-  }
-#endif
-
-  nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableGauge(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::unique_ptr<UpDownCounter<int64_t>> CreateInt64UpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<UpDownCounter<int64_t>>{
-        new NoopUpDownCounter<int64_t>(name, description, unit)};
-  }
-
-  nostd::unique_ptr<UpDownCounter<double>> CreateDoubleUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::unique_ptr<UpDownCounter<double>>{
-        new NoopUpDownCounter<double>(name, description, unit)};
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateInt64ObservableUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-
-  nostd::shared_ptr<ObservableInstrument> CreateDoubleObservableUpDownCounter(
-      nostd::string_view name,
-      nostd::string_view description = "",
-      nostd::string_view unit        = "") noexcept override
-  {
-    return nostd::shared_ptr<ObservableInstrument>(
-        new NoopObservableInstrument(name, description, unit));
-  }
-};
-
-/**
- * No-op implementation of a MeterProvider.
- */
-class NoopMeterProvider final : public MeterProvider
-{
-public:
-  NoopMeterProvider() : meter_{nostd::shared_ptr<Meter>(new NoopMeter)} {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<Meter> GetMeter(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */,
-      const common::KeyValueIterable * /* attributes */) noexcept override
-  {
-    return meter_;
-  }
-#else
-  nostd::shared_ptr<Meter> GetMeter(nostd::string_view /* name */,
-                                    nostd::string_view /* version */,
-                                    nostd::string_view /* schema_url */) noexcept override
-  {
-    return meter_;
-  }
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void RemoveMeter(nostd::string_view /* name */,
-                   nostd::string_view /* version */,
-                   nostd::string_view /* schema_url */) noexcept override
-  {}
-#endif
-
-private:
-  nostd::shared_ptr<Meter> meter_;
-};
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/observer_result.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/observer_result.h
deleted file mode 100644
index 56c42bc20..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/observer_result.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-/**
- * ObserverResultT class is necessary for the callback recording asynchronous
- * instrument use.
- */
-template <class T>
-class ObserverResultT
-{
-
-public:
-  virtual ~ObserverResultT() = default;
-
-  virtual void Observe(T value) noexcept = 0;
-
-  virtual void Observe(T value, const common::KeyValueIterable &attributes) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Observe(T value, const U &attributes) noexcept
-  {
-    this->Observe(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  void Observe(T value,
-               std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                   attributes) noexcept
-  {
-    this->Observe(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                             attributes.begin(), attributes.end()});
-  }
-};
-
-using ObserverResult = nostd::variant<nostd::shared_ptr<ObserverResultT<int64_t>>,
-                                      nostd::shared_ptr<ObserverResultT<double>>>;
-
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/provider.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/provider.h
deleted file mode 100644
index 20a606a77..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/provider.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/metrics/meter_provider.h"
-#include "opentelemetry/metrics/noop.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-/**
- * Stores the singleton global MeterProvider.
- */
-class Provider
-{
-public:
-  /**
-   * Returns the singleton MeterProvider.
-   *
-   * By default, a no-op MeterProvider is returned. This will never return a
-   * nullptr MeterProvider.
-   */
-  static nostd::shared_ptr<MeterProvider> GetMeterProvider() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<MeterProvider>(GetProvider());
-  }
-
-  /**
-   * Changes the singleton MeterProvider.
-   */
-  static void SetMeterProvider(const nostd::shared_ptr<MeterProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetProvider() = tp;
-  }
-
-private:
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<MeterProvider> &GetProvider() noexcept
-  {
-    static nostd::shared_ptr<MeterProvider> provider(new NoopMeterProvider);
-    return provider;
-  }
-
-  OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
-  {
-    static common::SpinLockMutex lock;
-    return lock;
-  }
-};
-
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/sync_instruments.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/sync_instruments.h
deleted file mode 100644
index 9eaec3352..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/metrics/sync_instruments.h
+++ /dev/null
@@ -1,328 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace metrics
-{
-
-class SynchronousInstrument
-{
-public:
-  SynchronousInstrument()          = default;
-  virtual ~SynchronousInstrument() = default;
-};
-
-/* A Counter instrument that adds values. */
-template <class T>
-class Counter : public SynchronousInstrument
-{
-
-public:
-  /**
-   * Record a value
-   *
-   * @param value The increment amount. MUST be non-negative.
-   */
-  virtual void Add(T value) noexcept = 0;
-
-  /**
-   * Record a value
-   *
-   * @param value The increment amount. MUST be non-negative.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Add(T value, const context::Context &context) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The increment amount. MUST be non-negative.
-   * @param attributes A set of attributes to associate with the value.
-   */
-
-  virtual void Add(T value, const common::KeyValueIterable &attributes) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The increment amount. MUST be non-negative.
-   * @param attributes A set of attributes to associate with the value.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Add(T value,
-                   const common::KeyValueIterable &attributes,
-                   const context::Context &context) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Add(T value, const U &attributes) noexcept
-  {
-    this->Add(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Add(T value, const U &attributes, const context::Context &context) noexcept
-  {
-    this->Add(value, common::KeyValueIterableView<U>{attributes}, context);
-  }
-
-  void Add(T value,
-           std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-               attributes) noexcept
-  {
-    this->Add(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                         attributes.begin(), attributes.end()});
-  }
-
-  void Add(T value,
-           std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-           const context::Context &context) noexcept
-  {
-    this->Add(value,
-              nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                  attributes.begin(), attributes.end()},
-              context);
-  }
-};
-
-/** A histogram instrument that records values. */
-
-template <class T>
-class Histogram : public SynchronousInstrument
-{
-public:
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * @since ABI_VERSION 2
-   * Records a value.
-   *
-   * @param value The measurement value. MUST be non-negative.
-   */
-  virtual void Record(T value) noexcept = 0;
-
-  /**
-   * @since ABI_VERSION 2
-   * Records a value with a set of attributes.
-   *
-   * @param value The measurement value. MUST be non-negative.
-   * @param attribute A set of attributes to associate with the value.
-   */
-  virtual void Record(T value, const common::KeyValueIterable &attribute) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Record(T value, const U &attributes) noexcept
-  {
-    this->Record(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  void Record(T value,
-              std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                  attributes) noexcept
-  {
-    this->Record(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                            attributes.begin(), attributes.end()});
-  }
-#endif
-
-  /**
-   * Records a value.
-   *
-   * @param value The measurement value. MUST be non-negative.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Record(T value, const context::Context &context) noexcept = 0;
-
-  /**
-   * Records a value with a set of attributes.
-   *
-   * @param value The measurement value. MUST be non-negative.
-   * @param attributes A set of attributes to associate with the value..
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Record(T value,
-                      const common::KeyValueIterable &attributes,
-                      const context::Context &context) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Record(T value, const U &attributes, const context::Context &context) noexcept
-  {
-    this->Record(value, common::KeyValueIterableView<U>{attributes}, context);
-  }
-
-  void Record(
-      T value,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      const context::Context &context) noexcept
-  {
-    this->Record(value,
-                 nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                     attributes.begin(), attributes.end()},
-                 context);
-  }
-};
-
-/** An up-down-counter instrument that adds or reduce values. */
-
-template <class T>
-class UpDownCounter : public SynchronousInstrument
-{
-public:
-  /**
-   * Record a value.
-   *
-   * @param value The increment amount. May be positive, negative or zero.
-   */
-  virtual void Add(T value) noexcept = 0;
-
-  /**
-   * Record a value.
-   *
-   * @param value The increment amount. May be positive, negative or zero.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Add(T value, const context::Context &context) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The increment amount. May be positive, negative or zero.
-   * @param attributes A set of attributes to associate with the count.
-   */
-  virtual void Add(T value, const common::KeyValueIterable &attributes) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The increment amount. May be positive, negative or zero.
-   * @param attributes A set of attributes to associate with the count.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Add(T value,
-                   const common::KeyValueIterable &attributes,
-                   const context::Context &context) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Add(T value, const U &attributes) noexcept
-  {
-    this->Add(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Add(T value, const U &attributes, const context::Context &context) noexcept
-  {
-    this->Add(value, common::KeyValueIterableView<U>{attributes}, context);
-  }
-
-  void Add(T value,
-           std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-               attributes) noexcept
-  {
-    this->Add(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                         attributes.begin(), attributes.end()});
-  }
-
-  void Add(T value,
-           std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-           const context::Context &context) noexcept
-  {
-    this->Add(value,
-              nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                  attributes.begin(), attributes.end()},
-              context);
-  }
-};
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-/* A Gauge instrument that records values. */
-template <class T>
-class Gauge : public SynchronousInstrument
-{
-
-public:
-  /**
-   * Record a value
-   *
-   * @param value The measurement value. May be positive, negative or zero.
-   */
-  virtual void Record(T value) noexcept = 0;
-
-  /**
-   * Record a value
-   *
-   * @param value The measurement value. May be positive, negative or zero.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Record(T value, const context::Context &context) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The measurement value. May be positive, negative or zero.
-   * @param attributes A set of attributes to associate with the value.
-   */
-
-  virtual void Record(T value, const common::KeyValueIterable &attributes) noexcept = 0;
-
-  /**
-   * Record a value with a set of attributes.
-   *
-   * @param value The measurement value. May be positive, negative or zero.
-   * @param attributes A set of attributes to associate with the value.
-   * @param context The explicit context to associate with this measurement.
-   */
-  virtual void Record(T value,
-                      const common::KeyValueIterable &attributes,
-                      const context::Context &context) noexcept = 0;
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Record(T value, const U &attributes) noexcept
-  {
-    this->Record(value, common::KeyValueIterableView<U>{attributes});
-  }
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void Record(T value, const U &attributes, const context::Context &context) noexcept
-  {
-    this->Record(value, common::KeyValueIterableView<U>{attributes}, context);
-  }
-
-  void Record(T value,
-              std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                  attributes) noexcept
-  {
-    this->Record(value, nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                            attributes.begin(), attributes.end()});
-  }
-
-  void Record(
-      T value,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      const context::Context &context) noexcept
-  {
-    this->Record(value,
-                 nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                     attributes.begin(), attributes.end()},
-                 context);
-  }
-};
-#endif
-
-}  // namespace metrics
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/all.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/all.h
deleted file mode 100644
index deaf3ac6f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/all.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <bool... Bs>
-using all = std::is_same<integer_sequence<bool, true, Bs...>, integer_sequence<bool, Bs..., true>>;
-
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/decay.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/decay.h
deleted file mode 100644
index a6cb11124..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/decay.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <class T>
-using decay_t = typename std::decay<T>::type;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/dependent_type.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/dependent_type.h
deleted file mode 100644
index 5bba09ff8..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/dependent_type.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <typename T, bool>
-struct dependent_type : T
-{};
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/functional.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/functional.h
deleted file mode 100644
index 0da58dd18..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/functional.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <utility>
-
-#include "opentelemetry/version.h"
-
-#define OPENTELEMETRY_RETURN(...)                        \
-  noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) \
-  {                                                      \
-    return __VA_ARGS__;                                  \
-  }
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-struct equal_to
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) == std::forward<Rhs>(rhs))
-};
-
-struct not_equal_to
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) != std::forward<Rhs>(rhs))
-};
-
-struct less
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) < std::forward<Rhs>(rhs))
-};
-
-struct greater
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) > std::forward<Rhs>(rhs))
-};
-
-struct less_equal
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) <= std::forward<Rhs>(rhs))
-};
-
-struct greater_equal
-{
-  template <typename Lhs, typename Rhs>
-  inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-      OPENTELEMETRY_RETURN(std::forward<Lhs>(lhs) >= std::forward<Rhs>(rhs))
-};
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-
-#undef OPENTELEMETRY_RETURN
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/invoke.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/invoke.h
deleted file mode 100644
index 55a943ed1..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/invoke.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-#include <utility>
-
-#include "opentelemetry/nostd/detail/decay.h"
-#include "opentelemetry/nostd/detail/void.h"
-#include "opentelemetry/version.h"
-
-#define OPENTELEMETRY_RETURN(...)                        \
-  noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) \
-  {                                                      \
-    return __VA_ARGS__;                                  \
-  }
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-
-template <typename T>
-struct is_reference_wrapper : std::false_type
-{};
-
-template <typename T>
-struct is_reference_wrapper<std::reference_wrapper<T>> : std::true_type
-{};
-
-template <bool, int>
-struct Invoke;
-
-template <>
-struct Invoke<true /* pmf */, 0 /* is_base_of */>
-{
-  template <typename R, typename T, typename Arg, typename... Args>
-  inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
-      OPENTELEMETRY_RETURN((std::forward<Arg>(arg).*pmf)(std::forward<Args>(args)...))
-};
-
-template <>
-struct Invoke<true /* pmf */, 1 /* is_reference_wrapper */>
-{
-  template <typename R, typename T, typename Arg, typename... Args>
-  inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
-      OPENTELEMETRY_RETURN((std::forward<Arg>(arg).get().*pmf)(std::forward<Args>(args)...))
-};
-
-template <>
-struct Invoke<true /* pmf */, 2 /* otherwise */>
-{
-  template <typename R, typename T, typename Arg, typename... Args>
-  inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
-      OPENTELEMETRY_RETURN(((*std::forward<Arg>(arg)).*pmf)(std::forward<Args>(args)...))
-};
-
-template <>
-struct Invoke<false /* pmo */, 0 /* is_base_of */>
-{
-  template <typename R, typename T, typename Arg>
-  inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-      OPENTELEMETRY_RETURN(std::forward<Arg>(arg).*pmo)
-};
-
-template <>
-struct Invoke<false /* pmo */, 1 /* is_reference_wrapper */>
-{
-  template <typename R, typename T, typename Arg>
-  inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-      OPENTELEMETRY_RETURN(std::forward<Arg>(arg).get().*pmo)
-};
-
-template <>
-struct Invoke<false /* pmo */, 2 /* otherwise */>
-{
-  template <typename R, typename T, typename Arg>
-  inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-      OPENTELEMETRY_RETURN((*std::forward<Arg>(arg)).*pmo)
-};
-
-template <typename R, typename T, typename Arg, typename... Args>
-inline constexpr auto invoke_impl(R T::*f, Arg &&arg, Args &&...args) OPENTELEMETRY_RETURN(
-    Invoke<std::is_function<R>::value,
-           (std::is_base_of<T, decay_t<Arg>>::value     ? 0
-            : is_reference_wrapper<decay_t<Arg>>::value ? 1
-                                                        : 2)>::invoke(f,
-                                                                      std::forward<Arg>(arg),
-                                                                      std::forward<Args>(args)...))
-
-#ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable : 4100)
-#endif
-    template <typename F, typename... Args>
-    inline constexpr auto invoke_impl(F &&f, Args &&...args)
-        OPENTELEMETRY_RETURN(std::forward<F>(f)(std::forward<Args>(args)...))
-#ifdef _MSC_VER
-#  pragma warning(pop)
-#endif
-}  // namespace detail
-
-/* clang-format off */
-template <typename F, typename... Args>
-inline constexpr auto invoke(F &&f, Args &&... args)
-    OPENTELEMETRY_RETURN(detail::invoke_impl(std::forward<F>(f), std::forward<Args>(args)...))
-
-namespace detail
-/* clang-format on */
-{
-
-  template <typename Void, typename, typename...>
-  struct invoke_result
-  {};
-
-  template <typename F, typename... Args>
-  struct invoke_result<void_t<decltype(nostd::invoke(std::declval<F>(), std::declval<Args>()...))>,
-                       F, Args...>
-  {
-    using type = decltype(nostd::invoke(std::declval<F>(), std::declval<Args>()...));
-  };
-
-}  // namespace detail
-
-template <typename F, typename... Args>
-using invoke_result = detail::invoke_result<void, F, Args...>;
-
-template <typename F, typename... Args>
-using invoke_result_t = typename invoke_result<F, Args...>::type;
-
-namespace detail
-{
-
-template <typename Void, typename, typename...>
-struct is_invocable : std::false_type
-{};
-
-template <typename F, typename... Args>
-struct is_invocable<void_t<invoke_result_t<F, Args...>>, F, Args...> : std::true_type
-{};
-
-template <typename Void, typename, typename, typename...>
-struct is_invocable_r : std::false_type
-{};
-
-template <typename R, typename F, typename... Args>
-struct is_invocable_r<void_t<invoke_result_t<F, Args...>>, R, F, Args...>
-    : std::is_convertible<invoke_result_t<F, Args...>, R>
-{};
-
-}  // namespace detail
-
-template <typename F, typename... Args>
-using is_invocable = detail::is_invocable<void, F, Args...>;
-
-template <typename R, typename F, typename... Args>
-using is_invocable_r = detail::is_invocable_r<void, R, F, Args...>;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-
-#undef OPENTELEMETRY_RETURN
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/trait.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/trait.h
deleted file mode 100644
index 8f76fdec8..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/trait.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-enum class Trait
-{
-  TriviallyAvailable,
-  Available,
-  Unavailable
-};
-
-template <typename T,
-          template <typename>
-          class IsTriviallyAvailable,
-          template <typename>
-          class IsAvailable>
-inline constexpr Trait trait()
-{
-  return IsTriviallyAvailable<T>::value ? Trait::TriviallyAvailable
-         : IsAvailable<T>::value        ? Trait::Available
-                                        : Trait::Unavailable;
-}
-
-inline constexpr Trait common_trait_impl(Trait result)
-{
-  return result;
-}
-
-template <typename... Traits>
-inline constexpr Trait common_trait_impl(Trait result, Trait t, Traits... ts)
-{
-  return static_cast<int>(t) > static_cast<int>(result) ? common_trait_impl(t, ts...)
-                                                        : common_trait_impl(result, ts...);
-}
-
-template <typename... Traits>
-inline constexpr Trait common_trait(Traits... ts)
-{
-  return common_trait_impl(Trait::TriviallyAvailable, ts...);
-}
-
-template <typename... Ts>
-struct traits
-{
-  static constexpr Trait copy_constructible_trait =
-      common_trait(trait<Ts, is_trivially_copy_constructible, std::is_copy_constructible>()...);
-
-  static constexpr Trait move_constructible_trait =
-      common_trait(trait<Ts, is_trivially_move_constructible, std::is_move_constructible>()...);
-
-  static constexpr Trait copy_assignable_trait =
-      common_trait(copy_constructible_trait,
-                   trait<Ts, is_trivially_copy_assignable, std::is_copy_assignable>()...);
-
-  static constexpr Trait move_assignable_trait =
-      common_trait(move_constructible_trait,
-                   trait<Ts, is_trivially_move_assignable, std::is_move_assignable>()...);
-
-  static constexpr Trait destructible_trait =
-      common_trait(trait<Ts, std::is_trivially_destructible, std::is_destructible>()...);
-};
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/type_pack_element.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/type_pack_element.h
deleted file mode 100644
index 280d24e94..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/type_pack_element.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstddef>
-#include <type_traits>
-
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <std::size_t N>
-using size_constant = std::integral_constant<std::size_t, N>;
-
-template <std::size_t I, typename T>
-struct indexed_type : size_constant<I>
-{
-  using type = T;
-};
-
-template <std::size_t I, typename... Ts>
-struct type_pack_element_impl
-{
-private:
-  template <typename>
-  struct set;
-
-  template <std::size_t... Is>
-  struct set<index_sequence<Is...>> : indexed_type<Is, Ts>...
-  {};
-
-  template <typename T>
-  inline static std::enable_if<true, T> impl(indexed_type<I, T>);
-
-  inline static std::enable_if<false> impl(...);
-
-public:
-  using type = decltype(impl(set<index_sequence_for<Ts...>>{}));
-};
-
-template <std::size_t I, typename... Ts>
-using type_pack_element = typename type_pack_element_impl<I, Ts...>::type;
-
-template <std::size_t I, typename... Ts>
-using type_pack_element_t = typename type_pack_element<I, Ts...>::type;
-}  // namespace detail
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/valueless.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/valueless.h
deleted file mode 100644
index 3b2ca7f7c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/valueless.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-struct valueless_t
-{};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_alternative.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_alternative.h
deleted file mode 100644
index cc0da9c8c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_alternative.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/nostd/detail/type_pack_element.h"
-#include "opentelemetry/nostd/detail/variant_fwd.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <std::size_t I, typename T>
-struct variant_alternative;
-
-template <std::size_t I, typename T>
-using variant_alternative_t = typename variant_alternative<I, T>::type;
-
-template <std::size_t I, typename T>
-struct variant_alternative<I, const T> : std::add_const<variant_alternative_t<I, T>>
-{};
-
-template <std::size_t I, typename T>
-struct variant_alternative<I, volatile T> : std::add_volatile<variant_alternative_t<I, T>>
-{};
-
-template <std::size_t I, typename T>
-struct variant_alternative<I, const volatile T> : std::add_cv<variant_alternative_t<I, T>>
-{};
-
-template <std::size_t I, typename... Ts>
-struct variant_alternative<I, variant<Ts...>>
-{
-  static_assert(I < sizeof...(Ts), "index out of bounds in `std::variant_alternative<>`");
-  using type = detail::type_pack_element_t<I, Ts...>;
-};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_fwd.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_fwd.h
deleted file mode 100644
index 6bae9659e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_fwd.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <typename... Ts>
-class variant;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_size.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_size.h
deleted file mode 100644
index d8986a222..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/variant_size.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <type_traits>
-
-#include "opentelemetry/nostd/detail/variant_fwd.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <typename T>
-struct variant_size;
-
-template <typename T>
-struct variant_size<const T> : variant_size<T>
-{};
-
-template <typename T>
-struct variant_size<volatile T> : variant_size<T>
-{};
-
-template <typename T>
-struct variant_size<const volatile T> : variant_size<T>
-{};
-
-template <typename... Ts>
-struct variant_size<variant<Ts...>> : std::integral_constant<size_t, sizeof...(Ts)>
-{};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/void.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/void.h
deleted file mode 100644
index 1b4c3b4f7..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/detail/void.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <class...>
-struct voider
-{
-  using type = void;
-};
-}  // namespace detail
-
-/**
- * Back port of std::void_t
- *
- * Note: voider workaround is required for gcc-4.8 to make SFINAE work
- */
-template <class... Tx>
-using void_t = typename detail::voider<Tx...>::type;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/function_ref.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/function_ref.h
deleted file mode 100644
index 6f0c2dd33..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/function_ref.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <iosfwd>
-#include <memory>  // IWYU pragma: keep
-#include <type_traits>
-#include <utility>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-template <class Sig>
-class function_ref;  // IWYU pragma: keep
-
-/**
- * Non-owning function reference that can be used as a more performant
- * replacement for std::function when ownership sematics aren't needed.
- *
- * See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0792r0.html
- *
- * Based off of https://stackoverflow.com/a/39087660/4447365
- */
-template <class R, class... Args>
-class function_ref<R(Args...)>
-{
-  void *callable_                = nullptr;
-  R (*invoker_)(void *, Args...) = nullptr;
-
-  template <class F>
-  using FunctionPointer = decltype(std::addressof(std::declval<F &>()));
-
-  template <class F>
-  void BindTo(F &f) noexcept
-  {
-    callable_ = static_cast<void *>(std::addressof(f));
-    invoker_  = [](void *callable, Args... args) -> R {
-      return (*static_cast<FunctionPointer<F>>(callable))(std::forward<Args>(args)...);
-    };
-  }
-
-  template <class R_in, class... Args_in>
-  void BindTo(R_in (*f)(Args_in...)) noexcept
-  {
-    using F = decltype(f);
-    if (f == nullptr)
-    {
-      return BindTo(nullptr);
-    }
-    callable_ = reinterpret_cast<void *>(f);
-    invoker_  = [](void *callable, Args... args) -> R {
-      return (F(callable))(std::forward<Args>(args)...);
-    };
-  }
-
-  void BindTo(std::nullptr_t) noexcept
-  {
-    callable_ = nullptr;
-    invoker_  = nullptr;
-  }
-
-public:
-  template <
-      class F,
-      typename std::enable_if<!std::is_same<function_ref, typename std::decay<F>::type>::value,
-                              int>::type = 0,
-      typename std::enable_if<
-#if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && (_MSVC_LANG > 201402))
-          // std::result_of deprecated in C++17, removed in C++20
-          std::is_convertible<typename std::invoke_result<F, Args...>::type, R>::value,
-#else
-          // std::result_of since C++11
-          std::is_convertible<typename std::result_of<F &(Args...)>::type, R>::value,
-#endif
-          int>::type = 0>
-  function_ref(F &&f)
-  {
-    BindTo(f);  // not forward
-  }
-
-  function_ref(std::nullptr_t) {}
-
-  function_ref(const function_ref &) noexcept = default;
-  function_ref(function_ref &&) noexcept      = default;
-
-  R operator()(Args... args) const { return invoker_(callable_, std::forward<Args>(args)...); }
-
-  explicit operator bool() const { return invoker_; }
-};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/attributes.h
deleted file mode 100644
index 72901a84c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/attributes.h
+++ /dev/null
@@ -1,621 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This header file defines macros for declaring attributes for functions,
-// types, and variables.
-//
-// These macros are used within Abseil and allow the compiler to optimize, where
-// applicable, certain function calls.
-//
-// This file is used for both C and C++!
-//
-// Most macros here are exposing GCC or Clang features, and are stubbed out for
-// other compilers.
-//
-// GCC attributes documentation:
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Function-Attributes.html
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Variable-Attributes.html
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Type-Attributes.html
-//
-// Most attributes in this file are already supported by GCC 4.7. However, some
-// of them are not supported in older version of Clang. Thus, we check
-// `__has_attribute()` first. If the check fails, we check if we are on GCC and
-// assume the attribute exists on GCC (which is verified on GCC 4.7).
-//
-// -----------------------------------------------------------------------------
-// Sanitizer Attributes
-// -----------------------------------------------------------------------------
-//
-// Sanitizer-related attributes are not "defined" in this file (and indeed
-// are not defined as such in any file). To utilize the following
-// sanitizer-related attributes within your builds, define the following macros
-// within your build using a `-D` flag, along with the given value for
-// `-fsanitize`:
-//
-//   * `ADDRESS_SANITIZER` + `-fsanitize=address` (Clang, GCC 4.8)
-//   * `MEMORY_SANITIZER` + `-fsanitize=memory` (Clang-only)
-//   * `THREAD_SANITIZER + `-fsanitize=thread` (Clang, GCC 4.8+)
-//   * `UNDEFINED_BEHAVIOR_SANITIZER` + `-fsanitize=undefined` (Clang, GCC 4.9+)
-//   * `CONTROL_FLOW_INTEGRITY` + -fsanitize=cfi (Clang-only)
-//
-// Example:
-//
-//   // Enable branches in the Abseil code that are tagged for ASan:
-//   $ bazel build --copt=-DADDRESS_SANITIZER --copt=-fsanitize=address
-//     --linkopt=-fsanitize=address *target*
-//
-// Since these macro names are only supported by GCC and Clang, we only check
-// for `__GNUC__` (GCC or Clang) and the above macros.
-#ifndef OTABSL_BASE_ATTRIBUTES_H_
-#define OTABSL_BASE_ATTRIBUTES_H_
-
-// OTABSL_HAVE_ATTRIBUTE
-//
-// A function-like feature checking macro that is a wrapper around
-// `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
-// nonzero constant integer if the attribute is supported or 0 if not.
-//
-// It evaluates to zero if `__has_attribute` is not defined by the compiler.
-//
-// GCC: https://gcc.gnu.org/gcc-5/changes.html
-// Clang: https://clang.llvm.org/docs/LanguageExtensions.html
-#ifdef __has_attribute
-#define OTABSL_HAVE_ATTRIBUTE(x) __has_attribute(x)
-#else
-#define OTABSL_HAVE_ATTRIBUTE(x) 0
-#endif
-
-// OTABSL_HAVE_CPP_ATTRIBUTE
-//
-// A function-like feature checking macro that accepts C++11 style attributes.
-// It's a wrapper around `__has_cpp_attribute`, defined by ISO C++ SD-6
-// (https://en.cppreference.com/w/cpp/experimental/feature_test). If we don't
-// find `__has_cpp_attribute`, will evaluate to 0.
-#if defined(__cplusplus) && defined(__has_cpp_attribute)
-// NOTE: requiring __cplusplus above should not be necessary, but
-// works around https://bugs.llvm.org/show_bug.cgi?id=23435.
-#define OTABSL_HAVE_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-#define OTABSL_HAVE_CPP_ATTRIBUTE(x) 0
-#endif
-
-// -----------------------------------------------------------------------------
-// Function Attributes
-// -----------------------------------------------------------------------------
-//
-// GCC: https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
-// Clang: https://clang.llvm.org/docs/AttributeReference.html
-
-// OTABSL_PRINTF_ATTRIBUTE
-// OTABSL_SCANF_ATTRIBUTE
-//
-// Tells the compiler to perform `printf` format string checking if the
-// compiler supports it; see the 'format' attribute in
-// <https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Function-Attributes.html>.
-//
-// Note: As the GCC manual states, "[s]ince non-static C++ methods
-// have an implicit 'this' argument, the arguments of such methods
-// should be counted from two, not one."
-#if OTABSL_HAVE_ATTRIBUTE(format) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_PRINTF_ATTRIBUTE(string_index, first_to_check) \
-  __attribute__((__format__(__printf__, string_index, first_to_check)))
-#define OTABSL_SCANF_ATTRIBUTE(string_index, first_to_check) \
-  __attribute__((__format__(__scanf__, string_index, first_to_check)))
-#else
-#define OTABSL_PRINTF_ATTRIBUTE(string_index, first_to_check)
-#define OTABSL_SCANF_ATTRIBUTE(string_index, first_to_check)
-#endif
-
-// OTABSL_ATTRIBUTE_ALWAYS_INLINE
-// OTABSL_ATTRIBUTE_NOINLINE
-//
-// Forces functions to either inline or not inline. Introduced in gcc 3.1.
-#if OTABSL_HAVE_ATTRIBUTE(always_inline) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_ALWAYS_INLINE __attribute__((always_inline))
-#define OTABSL_HAVE_ATTRIBUTE_ALWAYS_INLINE 1
-#else
-#define OTABSL_ATTRIBUTE_ALWAYS_INLINE
-#endif
-
-#if OTABSL_HAVE_ATTRIBUTE(noinline) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_NOINLINE __attribute__((noinline))
-#define OTABSL_HAVE_ATTRIBUTE_NOINLINE 1
-#else
-#define OTABSL_ATTRIBUTE_NOINLINE
-#endif
-
-// OTABSL_ATTRIBUTE_NO_TAIL_CALL
-//
-// Prevents the compiler from optimizing away stack frames for functions which
-// end in a call to another function.
-#if OTABSL_HAVE_ATTRIBUTE(disable_tail_calls)
-#define OTABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 1
-#define OTABSL_ATTRIBUTE_NO_TAIL_CALL __attribute__((disable_tail_calls))
-#elif defined(__GNUC__) && !defined(__clang__)
-#define OTABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 1
-#define OTABSL_ATTRIBUTE_NO_TAIL_CALL \
-  __attribute__((optimize("no-optimize-sibling-calls")))
-#else
-#define OTABSL_ATTRIBUTE_NO_TAIL_CALL
-#define OTABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 0
-#endif
-
-// OTABSL_ATTRIBUTE_WEAK
-//
-// Tags a function as weak for the purposes of compilation and linking.
-// Weak attributes currently do not work properly in LLVM's Windows backend,
-// so disable them there. See https://bugs.llvm.org/show_bug.cgi?id=37598
-// for further information.
-// The MinGW compiler doesn't complain about the weak attribute until the link
-// step, presumably because Windows doesn't use ELF binaries.
-#if (OTABSL_HAVE_ATTRIBUTE(weak) ||                   \
-     (defined(__GNUC__) && !defined(__clang__))) && \
-    !(defined(__llvm__) && defined(_WIN32)) && !defined(__MINGW32__)
-#undef OTABSL_ATTRIBUTE_WEAK
-#define OTABSL_ATTRIBUTE_WEAK __attribute__((weak))
-#define OTABSL_HAVE_ATTRIBUTE_WEAK 1
-#else
-#define OTABSL_ATTRIBUTE_WEAK
-#define OTABSL_HAVE_ATTRIBUTE_WEAK 0
-#endif
-
-// OTABSL_ATTRIBUTE_NONNULL
-//
-// Tells the compiler either (a) that a particular function parameter
-// should be a non-null pointer, or (b) that all pointer arguments should
-// be non-null.
-//
-// Note: As the GCC manual states, "[s]ince non-static C++ methods
-// have an implicit 'this' argument, the arguments of such methods
-// should be counted from two, not one."
-//
-// Args are indexed starting at 1.
-//
-// For non-static class member functions, the implicit `this` argument
-// is arg 1, and the first explicit argument is arg 2. For static class member
-// functions, there is no implicit `this`, and the first explicit argument is
-// arg 1.
-//
-// Example:
-//
-//   /* arg_a cannot be null, but arg_b can */
-//   void Function(void* arg_a, void* arg_b) OTABSL_ATTRIBUTE_NONNULL(1);
-//
-//   class C {
-//     /* arg_a cannot be null, but arg_b can */
-//     void Method(void* arg_a, void* arg_b) OTABSL_ATTRIBUTE_NONNULL(2);
-//
-//     /* arg_a cannot be null, but arg_b can */
-//     static void StaticMethod(void* arg_a, void* arg_b)
-//     OTABSL_ATTRIBUTE_NONNULL(1);
-//   };
-//
-// If no arguments are provided, then all pointer arguments should be non-null.
-//
-//  /* No pointer arguments may be null. */
-//  void Function(void* arg_a, void* arg_b, int arg_c) OTABSL_ATTRIBUTE_NONNULL();
-//
-// NOTE: The GCC nonnull attribute actually accepts a list of arguments, but
-// OTABSL_ATTRIBUTE_NONNULL does not.
-#if OTABSL_HAVE_ATTRIBUTE(nonnull) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_NONNULL(arg_index) __attribute__((nonnull(arg_index)))
-#else
-#define OTABSL_ATTRIBUTE_NONNULL(...)
-#endif
-
-// OTABSL_ATTRIBUTE_NORETURN
-//
-// Tells the compiler that a given function never returns.
-#if OTABSL_HAVE_ATTRIBUTE(noreturn) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_NORETURN __attribute__((noreturn))
-#elif defined(_MSC_VER)
-#define OTABSL_ATTRIBUTE_NORETURN __declspec(noreturn)
-#else
-#define OTABSL_ATTRIBUTE_NORETURN
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS
-//
-// Tells the AddressSanitizer (or other memory testing tools) to ignore a given
-// function. Useful for cases when a function reads random locations on stack,
-// calls _exit from a cloned subprocess, deliberately accesses buffer
-// out of bounds or does other scary things with memory.
-// NOTE: GCC supports AddressSanitizer(asan) since 4.8.
-// https://gcc.gnu.org/gcc-4.8/changes.html
-#if defined(__GNUC__)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_MEMORY
-//
-// Tells the  MemorySanitizer to relax the handling of a given function. All
-// "Use of uninitialized value" warnings from such functions will be suppressed,
-// and all values loaded from memory will be considered fully initialized.
-// This attribute is similar to the ADDRESS_SANITIZER attribute above, but deals
-// with initialized-ness rather than addressability issues.
-// NOTE: MemorySanitizer(msan) is supported by Clang but not GCC.
-#if defined(__clang__)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_MEMORY __attribute__((no_sanitize_memory))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_MEMORY
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_THREAD
-//
-// Tells the ThreadSanitizer to not instrument a given function.
-// NOTE: GCC supports ThreadSanitizer(tsan) since 4.8.
-// https://gcc.gnu.org/gcc-4.8/changes.html
-#if defined(__GNUC__)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_THREAD __attribute__((no_sanitize_thread))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_THREAD
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED
-//
-// Tells the UndefinedSanitizer to ignore a given function. Useful for cases
-// where certain behavior (eg. division by zero) is being used intentionally.
-// NOTE: GCC supports UndefinedBehaviorSanitizer(ubsan) since 4.9.
-// https://gcc.gnu.org/gcc-4.9/changes.html
-#if defined(__GNUC__) && \
-    (defined(UNDEFINED_BEHAVIOR_SANITIZER) || defined(ADDRESS_SANITIZER))
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED \
-  __attribute__((no_sanitize("undefined")))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_CFI
-//
-// Tells the ControlFlowIntegrity sanitizer to not instrument a given function.
-// See https://clang.llvm.org/docs/ControlFlowIntegrity.html for details.
-#if defined(__GNUC__) && defined(CONTROL_FLOW_INTEGRITY)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_CFI __attribute__((no_sanitize("cfi")))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_CFI
-#endif
-
-// OTABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK
-//
-// Tells the SafeStack to not instrument a given function.
-// See https://clang.llvm.org/docs/SafeStack.html for details.
-#if defined(__GNUC__) && defined(SAFESTACK_SANITIZER)
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK \
-  __attribute__((no_sanitize("safe-stack")))
-#else
-#define OTABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK
-#endif
-
-// OTABSL_ATTRIBUTE_RETURNS_NONNULL
-//
-// Tells the compiler that a particular function never returns a null pointer.
-#if OTABSL_HAVE_ATTRIBUTE(returns_nonnull) || \
-    (defined(__GNUC__) && \
-     (__GNUC__ > 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && \
-     !defined(__clang__))
-#define OTABSL_ATTRIBUTE_RETURNS_NONNULL __attribute__((returns_nonnull))
-#else
-#define OTABSL_ATTRIBUTE_RETURNS_NONNULL
-#endif
-
-// OTABSL_HAVE_ATTRIBUTE_SECTION
-//
-// Indicates whether labeled sections are supported. Weak symbol support is
-// a prerequisite. Labeled sections are not supported on Darwin/iOS.
-#ifdef OTABSL_HAVE_ATTRIBUTE_SECTION
-#error OTABSL_HAVE_ATTRIBUTE_SECTION cannot be directly set
-#elif (OTABSL_HAVE_ATTRIBUTE(section) ||                \
-       (defined(__GNUC__) && !defined(__clang__))) && \
-    !defined(__APPLE__) && OTABSL_HAVE_ATTRIBUTE_WEAK
-#define OTABSL_HAVE_ATTRIBUTE_SECTION 1
-
-// OTABSL_ATTRIBUTE_SECTION
-//
-// Tells the compiler/linker to put a given function into a section and define
-// `__start_ ## name` and `__stop_ ## name` symbols to bracket the section.
-// This functionality is supported by GNU linker.  Any function annotated with
-// `OTABSL_ATTRIBUTE_SECTION` must not be inlined, or it will be placed into
-// whatever section its caller is placed into.
-//
-#ifndef OTABSL_ATTRIBUTE_SECTION
-#define OTABSL_ATTRIBUTE_SECTION(name) \
-  __attribute__((section(#name))) __attribute__((noinline))
-#endif
-
-
-// OTABSL_ATTRIBUTE_SECTION_VARIABLE
-//
-// Tells the compiler/linker to put a given variable into a section and define
-// `__start_ ## name` and `__stop_ ## name` symbols to bracket the section.
-// This functionality is supported by GNU linker.
-#ifndef OTABSL_ATTRIBUTE_SECTION_VARIABLE
-#define OTABSL_ATTRIBUTE_SECTION_VARIABLE(name) __attribute__((section(#name)))
-#endif
-
-// OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS
-//
-// A weak section declaration to be used as a global declaration
-// for OTABSL_ATTRIBUTE_SECTION_START|STOP(name) to compile and link
-// even without functions with OTABSL_ATTRIBUTE_SECTION(name).
-// OTABSL_DEFINE_ATTRIBUTE_SECTION should be in the exactly one file; it's
-// a no-op on ELF but not on Mach-O.
-//
-#ifndef OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS
-#define OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name) \
-  extern char __start_##name[] OTABSL_ATTRIBUTE_WEAK;    \
-  extern char __stop_##name[] OTABSL_ATTRIBUTE_WEAK
-#endif
-#ifndef OTABSL_DEFINE_ATTRIBUTE_SECTION_VARS
-#define OTABSL_INIT_ATTRIBUTE_SECTION_VARS(name)
-#define OTABSL_DEFINE_ATTRIBUTE_SECTION_VARS(name)
-#endif
-
-// OTABSL_ATTRIBUTE_SECTION_START
-//
-// Returns `void*` pointers to start/end of a section of code with
-// functions having OTABSL_ATTRIBUTE_SECTION(name).
-// Returns 0 if no such functions exist.
-// One must OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name) for this to compile and
-// link.
-//
-#define OTABSL_ATTRIBUTE_SECTION_START(name) \
-  (reinterpret_cast<void *>(__start_##name))
-#define OTABSL_ATTRIBUTE_SECTION_STOP(name) \
-  (reinterpret_cast<void *>(__stop_##name))
-
-#else  // !OTABSL_HAVE_ATTRIBUTE_SECTION
-
-#define OTABSL_HAVE_ATTRIBUTE_SECTION 0
-
-// provide dummy definitions
-#define OTABSL_ATTRIBUTE_SECTION(name)
-#define OTABSL_ATTRIBUTE_SECTION_VARIABLE(name)
-#define OTABSL_INIT_ATTRIBUTE_SECTION_VARS(name)
-#define OTABSL_DEFINE_ATTRIBUTE_SECTION_VARS(name)
-#define OTABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name)
-#define OTABSL_ATTRIBUTE_SECTION_START(name) (reinterpret_cast<void *>(0))
-#define OTABSL_ATTRIBUTE_SECTION_STOP(name) (reinterpret_cast<void *>(0))
-
-#endif  // OTABSL_ATTRIBUTE_SECTION
-
-// OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-//
-// Support for aligning the stack on 32-bit x86.
-#if OTABSL_HAVE_ATTRIBUTE(force_align_arg_pointer) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#if defined(__i386__)
-#define OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC \
-  __attribute__((force_align_arg_pointer))
-#define OTABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#elif defined(__x86_64__)
-#define OTABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (1)
-#define OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#else  // !__i386__ && !__x86_64
-#define OTABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#define OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#endif  // __i386__
-#else
-#define OTABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#define OTABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#endif
-
-// OTABSL_MUST_USE_RESULT
-//
-// Tells the compiler to warn about unused results.
-//
-// When annotating a function, it must appear as the first part of the
-// declaration or definition. The compiler will warn if the return value from
-// such a function is unused:
-//
-//   OTABSL_MUST_USE_RESULT Sprocket* AllocateSprocket();
-//   AllocateSprocket();  // Triggers a warning.
-//
-// When annotating a class, it is equivalent to annotating every function which
-// returns an instance.
-//
-//   class OTABSL_MUST_USE_RESULT Sprocket {};
-//   Sprocket();  // Triggers a warning.
-//
-//   Sprocket MakeSprocket();
-//   MakeSprocket();  // Triggers a warning.
-//
-// Note that references and pointers are not instances:
-//
-//   Sprocket* SprocketPointer();
-//   SprocketPointer();  // Does *not* trigger a warning.
-//
-// OTABSL_MUST_USE_RESULT allows using cast-to-void to suppress the unused result
-// warning. For that, warn_unused_result is used only for clang but not for gcc.
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425
-//
-// Note: past advice was to place the macro after the argument list.
-#if OTABSL_HAVE_ATTRIBUTE(nodiscard)
-#define OTABSL_MUST_USE_RESULT [[nodiscard]]
-#elif defined(__clang__) && OTABSL_HAVE_ATTRIBUTE(warn_unused_result)
-#define OTABSL_MUST_USE_RESULT __attribute__((warn_unused_result))
-#else
-#define OTABSL_MUST_USE_RESULT
-#endif
-
-// OTABSL_ATTRIBUTE_HOT, OTABSL_ATTRIBUTE_COLD
-//
-// Tells GCC that a function is hot or cold. GCC can use this information to
-// improve static analysis, i.e. a conditional branch to a cold function
-// is likely to be not-taken.
-// This annotation is used for function declarations.
-//
-// Example:
-//
-//   int foo() OTABSL_ATTRIBUTE_HOT;
-#if OTABSL_HAVE_ATTRIBUTE(hot) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_HOT __attribute__((hot))
-#else
-#define OTABSL_ATTRIBUTE_HOT
-#endif
-
-#if OTABSL_HAVE_ATTRIBUTE(cold) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_COLD __attribute__((cold))
-#else
-#define OTABSL_ATTRIBUTE_COLD
-#endif
-
-// OTABSL_XRAY_ALWAYS_INSTRUMENT, OTABSL_XRAY_NEVER_INSTRUMENT, OTABSL_XRAY_LOG_ARGS
-//
-// We define the OTABSL_XRAY_ALWAYS_INSTRUMENT and OTABSL_XRAY_NEVER_INSTRUMENT
-// macro used as an attribute to mark functions that must always or never be
-// instrumented by XRay. Currently, this is only supported in Clang/LLVM.
-//
-// For reference on the LLVM XRay instrumentation, see
-// http://llvm.org/docs/XRay.html.
-//
-// A function with the XRAY_ALWAYS_INSTRUMENT macro attribute in its declaration
-// will always get the XRay instrumentation sleds. These sleds may introduce
-// some binary size and runtime overhead and must be used sparingly.
-//
-// These attributes only take effect when the following conditions are met:
-//
-//   * The file/target is built in at least C++11 mode, with a Clang compiler
-//     that supports XRay attributes.
-//   * The file/target is built with the -fxray-instrument flag set for the
-//     Clang/LLVM compiler.
-//   * The function is defined in the translation unit (the compiler honors the
-//     attribute in either the definition or the declaration, and must match).
-//
-// There are cases when, even when building with XRay instrumentation, users
-// might want to control specifically which functions are instrumented for a
-// particular build using special-case lists provided to the compiler. These
-// special case lists are provided to Clang via the
-// -fxray-always-instrument=... and -fxray-never-instrument=... flags. The
-// attributes in source take precedence over these special-case lists.
-//
-// To disable the XRay attributes at build-time, users may define
-// OTABSL_NO_XRAY_ATTRIBUTES. Do NOT define OTABSL_NO_XRAY_ATTRIBUTES on specific
-// packages/targets, as this may lead to conflicting definitions of functions at
-// link-time.
-//
-#if OTABSL_HAVE_CPP_ATTRIBUTE(clang::xray_always_instrument) && \
-    !defined(OTABSL_NO_XRAY_ATTRIBUTES)
-#define OTABSL_XRAY_ALWAYS_INSTRUMENT [[clang::xray_always_instrument]]
-#define OTABSL_XRAY_NEVER_INSTRUMENT [[clang::xray_never_instrument]]
-#if OTABSL_HAVE_CPP_ATTRIBUTE(clang::xray_log_args)
-#define OTABSL_XRAY_LOG_ARGS(N) \
-    [[clang::xray_always_instrument, clang::xray_log_args(N)]]
-#else
-#define OTABSL_XRAY_LOG_ARGS(N) [[clang::xray_always_instrument]]
-#endif
-#else
-#define OTABSL_XRAY_ALWAYS_INSTRUMENT
-#define OTABSL_XRAY_NEVER_INSTRUMENT
-#define OTABSL_XRAY_LOG_ARGS(N)
-#endif
-
-// OTABSL_ATTRIBUTE_REINITIALIZES
-//
-// Indicates that a member function reinitializes the entire object to a known
-// state, independent of the previous state of the object.
-//
-// The clang-tidy check bugprone-use-after-move allows member functions marked
-// with this attribute to be called on objects that have been moved from;
-// without the attribute, this would result in a use-after-move warning.
-#if OTABSL_HAVE_CPP_ATTRIBUTE(clang::reinitializes)
-#define OTABSL_ATTRIBUTE_REINITIALIZES [[clang::reinitializes]]
-#else
-#define OTABSL_ATTRIBUTE_REINITIALIZES
-#endif
-
-// -----------------------------------------------------------------------------
-// Variable Attributes
-// -----------------------------------------------------------------------------
-
-// OTABSL_ATTRIBUTE_UNUSED
-//
-// Prevents the compiler from complaining about variables that appear unused.
-#if OTABSL_HAVE_ATTRIBUTE(unused) || (defined(__GNUC__) && !defined(__clang__))
-#undef OTABSL_ATTRIBUTE_UNUSED
-#define OTABSL_ATTRIBUTE_UNUSED __attribute__((__unused__))
-#else
-#define OTABSL_ATTRIBUTE_UNUSED
-#endif
-
-// OTABSL_ATTRIBUTE_INITIAL_EXEC
-//
-// Tells the compiler to use "initial-exec" mode for a thread-local variable.
-// See http://people.redhat.com/drepper/tls.pdf for the gory details.
-#if OTABSL_HAVE_ATTRIBUTE(tls_model) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_INITIAL_EXEC __attribute__((tls_model("initial-exec")))
-#else
-#define OTABSL_ATTRIBUTE_INITIAL_EXEC
-#endif
-
-// OTABSL_ATTRIBUTE_PACKED
-//
-// Instructs the compiler not to use natural alignment for a tagged data
-// structure, but instead to reduce its alignment to 1. This attribute can
-// either be applied to members of a structure or to a structure in its
-// entirety. Applying this attribute (judiciously) to a structure in its
-// entirety to optimize the memory footprint of very commonly-used structs is
-// fine. Do not apply this attribute to a structure in its entirety if the
-// purpose is to control the offsets of the members in the structure. Instead,
-// apply this attribute only to structure members that need it.
-//
-// When applying OTABSL_ATTRIBUTE_PACKED only to specific structure members the
-// natural alignment of structure members not annotated is preserved. Aligned
-// member accesses are faster than non-aligned member accesses even if the
-// targeted microprocessor supports non-aligned accesses.
-#if OTABSL_HAVE_ATTRIBUTE(packed) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_PACKED __attribute__((__packed__))
-#else
-#define OTABSL_ATTRIBUTE_PACKED
-#endif
-
-// OTABSL_ATTRIBUTE_FUNC_ALIGN
-//
-// Tells the compiler to align the function start at least to certain
-// alignment boundary
-#if OTABSL_HAVE_ATTRIBUTE(aligned) || (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_ATTRIBUTE_FUNC_ALIGN(bytes) __attribute__((aligned(bytes)))
-#else
-#define OTABSL_ATTRIBUTE_FUNC_ALIGN(bytes)
-#endif
-
-// OTABSL_CONST_INIT
-//
-// A variable declaration annotated with the `OTABSL_CONST_INIT` attribute will
-// not compile (on supported platforms) unless the variable has a constant
-// initializer. This is useful for variables with static and thread storage
-// duration, because it guarantees that they will not suffer from the so-called
-// "static init order fiasco".  Prefer to put this attribute on the most visible
-// declaration of the variable, if there's more than one, because code that
-// accesses the variable can then use the attribute for optimization.
-//
-// Example:
-//
-//   class MyClass {
-//    public:
-//     OTABSL_CONST_INIT static MyType my_var;
-//   };
-//
-//   MyType MyClass::my_var = MakeMyType(...);
-//
-// Note that this attribute is redundant if the variable is declared constexpr.
-#if OTABSL_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
-#define OTABSL_CONST_INIT [[clang::require_constant_initialization]]
-#else
-#define OTABSL_CONST_INIT
-#endif  // OTABSL_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
-
-#endif  // OTABSL_BASE_ATTRIBUTES_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/config.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/config.h
deleted file mode 100644
index e0836b9b3..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/config.h
+++ /dev/null
@@ -1,671 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: config.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines a set of macros for checking the presence of
-// important compiler and platform features. Such macros can be used to
-// produce portable code by parameterizing compilation based on the presence or
-// lack of a given feature.
-//
-// We define a "feature" as some interface we wish to program to: for example,
-// a library function or system call. A value of `1` indicates support for
-// that feature; any other value indicates the feature support is undefined.
-//
-// Example:
-//
-// Suppose a programmer wants to write a program that uses the 'mmap()' system
-// call. The Abseil macro for that feature (`OTABSL_HAVE_MMAP`) allows you to
-// selectively include the `mmap.h` header and bracket code using that feature
-// in the macro:
-//
-//   #include "absl/base/config.h"
-//
-//   #ifdef OTABSL_HAVE_MMAP
-//   #include "sys/mman.h"
-//   #endif  //OTABSL_HAVE_MMAP
-//
-//   ...
-//   #ifdef OTABSL_HAVE_MMAP
-//   void *ptr = mmap(...);
-//   ...
-//   #endif  // OTABSL_HAVE_MMAP
-
-#ifndef OTABSL_BASE_CONFIG_H_
-#define OTABSL_BASE_CONFIG_H_
-
-// Included for the __GLIBC__ macro (or similar macros on other systems).
-#include <limits.h>
-
-#ifdef __cplusplus
-// Included for __GLIBCXX__, _LIBCPP_VERSION
-#include <cstddef>
-#endif  // __cplusplus
-
-#if defined(__APPLE__)
-// Included for TARGET_OS_IPHONE, __IPHONE_OS_VERSION_MIN_REQUIRED,
-// __IPHONE_8_0.
-#include <Availability.h>
-#include <TargetConditionals.h>
-#endif
-
-#include "options.h"
-#include "policy_checks.h"
-
-// Helper macro to convert a CPP variable to a string literal.
-#define OTABSL_INTERNAL_DO_TOKEN_STR(x) #x
-#define OTABSL_INTERNAL_TOKEN_STR(x) OTABSL_INTERNAL_DO_TOKEN_STR(x)
-
-// -----------------------------------------------------------------------------
-// Abseil namespace annotations
-// -----------------------------------------------------------------------------
-
-// OTABSL_NAMESPACE_BEGIN/OTABSL_NAMESPACE_END
-//
-// An annotation placed at the beginning/end of each `namespace absl` scope.
-// This is used to inject an inline namespace.
-//
-// The proper way to write Abseil code in the `absl` namespace is:
-//
-// namespace absl {
-// OTABSL_NAMESPACE_BEGIN
-//
-// void Foo();  // absl::OTABSL_OPTION_NAMESPACE_NAME::Foo().
-//
-// OTABSL_NAMESPACE_END
-// }  // namespace absl
-//
-// Users of Abseil should not use these macros, because users of Abseil should
-// not write `namespace absl {` in their own code for any reason.  (Abseil does
-// not support forward declarations of its own types, nor does it support
-// user-provided specialization of Abseil templates.  Code that violates these
-// rules may be broken without warning.)
-#if !defined(OTABSL_OPTION_NAMESPACE_NAME)
-#error options.h is misconfigured.
-#endif
-
-// Check that OTABSL_OPTION_NAMESPACE_NAME is neither "head" nor ""
-#if defined(__cplusplus)
-
-#define OTABSL_INTERNAL_INLINE_NAMESPACE_STR \
-  OTABSL_INTERNAL_TOKEN_STR(OTABSL_OPTION_NAMESPACE_NAME)
-
-static_assert(OTABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != '\0',
-              "options.h misconfigured: OTABSL_OPTION_NAMESPACE_NAME must "
-              "not be empty.");
-static_assert(OTABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
-                  OTABSL_INTERNAL_INLINE_NAMESPACE_STR[1] != 'e' ||
-                  OTABSL_INTERNAL_INLINE_NAMESPACE_STR[2] != 'a' ||
-                  OTABSL_INTERNAL_INLINE_NAMESPACE_STR[3] != 'd' ||
-                  OTABSL_INTERNAL_INLINE_NAMESPACE_STR[4] != '\0',
-              "options.h misconfigured: OTABSL_OPTION_NAMESPACE_NAME must "
-              "be changed to a new, unique identifier name.");
-
-#endif
-
-
-#define OTABSL_NAMESPACE_BEGIN namespace OTABSL_OPTION_NAMESPACE_NAME {
-#define OTABSL_NAMESPACE_END }
-
-// -----------------------------------------------------------------------------
-// Compiler Feature Checks
-// -----------------------------------------------------------------------------
-
-// OTABSL_HAVE_BUILTIN()
-//
-// Checks whether the compiler supports a Clang Feature Checking Macro, and if
-// so, checks whether it supports the provided builtin function "x" where x
-// is one of the functions noted in
-// https://clang.llvm.org/docs/LanguageExtensions.html
-//
-// Note: Use this macro to avoid an extra level of #ifdef __has_builtin check.
-// http://releases.llvm.org/3.3/tools/clang/docs/LanguageExtensions.html
-#ifdef __has_builtin
-#define OTABSL_HAVE_BUILTIN(x) __has_builtin(x)
-#else
-#define OTABSL_HAVE_BUILTIN(x) 0
-#endif
-
-#if defined(__is_identifier)
-#define OTABSL_INTERNAL_HAS_KEYWORD(x) !(__is_identifier(x))
-#else
-#define OTABSL_INTERNAL_HAS_KEYWORD(x) 0
-#endif
-
-// OTABSL_HAVE_TLS is defined to 1 when __thread should be supported.
-// We assume __thread is supported on Linux when compiled with Clang or compiled
-// against libstdc++ with _GLIBCXX_HAVE_TLS defined.
-#ifdef OTABSL_HAVE_TLS
-#error OTABSL_HAVE_TLS cannot be directly set
-#elif defined(__linux__) && (defined(__clang__) || defined(_GLIBCXX_HAVE_TLS))
-#define OTABSL_HAVE_TLS 1
-#endif
-
-// OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-//
-// Checks whether `std::is_trivially_destructible<T>` is supported.
-//
-// Notes: All supported compilers using libc++ support this feature, as does
-// gcc >= 4.8.1 using libstdc++, and Visual Studio.
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-#error OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE cannot be directly set
-#elif defined(_LIBCPP_VERSION) ||                                        \
-    (defined(__clang__) && __clang_major__ >= 15) ||                     \
-    (!defined(__clang__) && defined(__GNUC__) && defined(__GLIBCXX__) && \
-     (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) ||        \
-    defined(_MSC_VER)
-#define OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE 1
-#endif
-
-// OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-//
-// Checks whether `std::is_trivially_default_constructible<T>` and
-// `std::is_trivially_copy_constructible<T>` are supported.
-
-// OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-//
-// Checks whether `std::is_trivially_copy_assignable<T>` is supported.
-
-// Notes: Clang with libc++ supports these features, as does gcc >= 5.1 with
-// either libc++ or libstdc++, and Visual Studio (but not NVCC).
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
-#error OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE cannot be directly set
-#elif defined(OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE)
-#error OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE cannot directly set
-#elif (defined(__clang__) && defined(_LIBCPP_VERSION)) ||        \
-    (defined(__clang__) && __clang_major__ >= 15) ||             \
-    (!defined(__clang__) && defined(__GNUC__) &&                 \
-     (__GNUC__ > 7 || (__GNUC__ == 7 && __GNUC_MINOR__ >= 4)) && \
-     (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) ||      \
-    (defined(_MSC_VER) && !defined(__NVCC__))
-#define OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE 1
-#define OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1
-#endif
-
-// OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE
-//
-// Checks whether `std::is_trivially_copyable<T>` is supported.
-//
-// Notes: Clang 15+ with libc++ supports these features, GCC hasn't been tested.
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE)
-#error OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE cannot be directly set
-#elif defined(__clang__) && (__clang_major__ >= 15)
-#define OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE 1
-#endif
-
-// OTABSL_HAVE_SOURCE_LOCATION_CURRENT
-//
-// Indicates whether `absl::OTABSL_OPTION_NAMESPACE_NAME::SourceLocation::current()` will return useful
-// information in some contexts.
-#ifndef OTABSL_HAVE_SOURCE_LOCATION_CURRENT
-#if OTABSL_INTERNAL_HAS_KEYWORD(__builtin_LINE) && \
-    OTABSL_INTERNAL_HAS_KEYWORD(__builtin_FILE)
-#define OTABSL_HAVE_SOURCE_LOCATION_CURRENT 1
-#endif
-#endif
-
-// OTABSL_HAVE_THREAD_LOCAL
-//
-// Checks whether C++11's `thread_local` storage duration specifier is
-// supported.
-#ifdef OTABSL_HAVE_THREAD_LOCAL
-#error OTABSL_HAVE_THREAD_LOCAL cannot be directly set
-#elif defined(__APPLE__)
-// Notes:
-// * Xcode's clang did not support `thread_local` until version 8, and
-//   even then not for all iOS < 9.0.
-// * Xcode 9.3 started disallowing `thread_local` for 32-bit iOS simulator
-//   targeting iOS 9.x.
-// * Xcode 10 moves the deployment target check for iOS < 9.0 to link time
-//   making __has_feature unreliable there.
-//
-// Otherwise, `__has_feature` is only supported by Clang so it has be inside
-// `defined(__APPLE__)` check.
-#if __has_feature(cxx_thread_local) && \
-    !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
-#define OTABSL_HAVE_THREAD_LOCAL 1
-#endif
-#else  // !defined(__APPLE__)
-#define OTABSL_HAVE_THREAD_LOCAL 1
-#endif
-
-// There are platforms for which TLS should not be used even though the compiler
-// makes it seem like it's supported (Android NDK < r12b for example).
-// This is primarily because of linker problems and toolchain misconfiguration:
-// Abseil does not intend to support this indefinitely. Currently, the newest
-// toolchain that we intend to support that requires this behavior is the
-// r11 NDK - allowing for a 5 year support window on that means this option
-// is likely to be removed around June of 2021.
-// TLS isn't supported until NDK r12b per
-// https://developer.android.com/ndk/downloads/revision_history.html
-// Since NDK r16, `__NDK_MAJOR__` and `__NDK_MINOR__` are defined in
-// <android/ndk-version.h>. For NDK < r16, users should define these macros,
-// e.g. `-D__NDK_MAJOR__=11 -D__NKD_MINOR__=0` for NDK r11.
-#if defined(__ANDROID__) && defined(__clang__)
-#if __has_include(<android/ndk-version.h>)
-#include <android/ndk-version.h>
-#endif  // __has_include(<android/ndk-version.h>)
-#if defined(__ANDROID__) && defined(__clang__) && defined(__NDK_MAJOR__) && \
-    defined(__NDK_MINOR__) &&                                               \
-    ((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))
-#undef OTABSL_HAVE_TLS
-#undef OTABSL_HAVE_THREAD_LOCAL
-#endif
-#endif  // defined(__ANDROID__) && defined(__clang__)
-
-// Emscripten doesn't yet support `thread_local` or `__thread`.
-// https://github.com/emscripten-core/emscripten/issues/3502
-#if defined(__EMSCRIPTEN__)
-#undef OTABSL_HAVE_TLS
-#undef OTABSL_HAVE_THREAD_LOCAL
-#endif  // defined(__EMSCRIPTEN__)
-
-// OTABSL_HAVE_INTRINSIC_INT128
-//
-// Checks whether the __int128 compiler extension for a 128-bit integral type is
-// supported.
-//
-// Note: __SIZEOF_INT128__ is defined by Clang and GCC when __int128 is
-// supported, but we avoid using it in certain cases:
-// * On Clang:
-//   * Building using Clang for Windows, where the Clang runtime library has
-//     128-bit support only on LP64 architectures, but Windows is LLP64.
-// * On Nvidia's nvcc:
-//   * nvcc also defines __GNUC__ and __SIZEOF_INT128__, but not all versions
-//     actually support __int128.
-#ifdef OTABSL_HAVE_INTRINSIC_INT128
-#error OTABSL_HAVE_INTRINSIC_INT128 cannot be directly set
-#elif defined(__SIZEOF_INT128__)
-#if (defined(__clang__) && !defined(_WIN32)) || \
-    (defined(__CUDACC__) && __CUDACC_VER_MAJOR__ >= 9) ||                \
-    (defined(__GNUC__) && !defined(__clang__) && !defined(__CUDACC__))
-#define OTABSL_HAVE_INTRINSIC_INT128 1
-#elif defined(__CUDACC__)
-// __CUDACC_VER__ is a full version number before CUDA 9, and is defined to a
-// string explaining that it has been removed starting with CUDA 9. We use
-// nested #ifs because there is no short-circuiting in the preprocessor.
-// NOTE: `__CUDACC__` could be undefined while `__CUDACC_VER__` is defined.
-#if __CUDACC_VER__ >= 70000
-#define OTABSL_HAVE_INTRINSIC_INT128 1
-#endif  // __CUDACC_VER__ >= 70000
-#endif  // defined(__CUDACC__)
-#endif  // OTABSL_HAVE_INTRINSIC_INT128
-
-// OTABSL_HAVE_EXCEPTIONS
-//
-// Checks whether the compiler both supports and enables exceptions. Many
-// compilers support a "no exceptions" mode that disables exceptions.
-//
-// Generally, when OTABSL_HAVE_EXCEPTIONS is not defined:
-//
-// * Code using `throw` and `try` may not compile.
-// * The `noexcept` specifier will still compile and behave as normal.
-// * The `noexcept` operator may still return `false`.
-//
-// For further details, consult the compiler's documentation.
-#ifdef OTABSL_HAVE_EXCEPTIONS
-#error OTABSL_HAVE_EXCEPTIONS cannot be directly set.
-
-#elif defined(__clang__)
-
-#if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
-// Clang >= 3.6
-#if __has_feature(cxx_exceptions)
-#define OTABSL_HAVE_EXCEPTIONS 1
-#endif  // __has_feature(cxx_exceptions)
-#else
-// Clang < 3.6
-// http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html#the-exceptions-macro
-#if defined(__EXCEPTIONS) && __has_feature(cxx_exceptions)
-#define OTABSL_HAVE_EXCEPTIONS 1
-#endif  // defined(__EXCEPTIONS) && __has_feature(cxx_exceptions)
-#endif  // __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
-
-// Handle remaining special cases and default to exceptions being supported.
-#elif !(defined(__GNUC__) && (__GNUC__ < 5) && !defined(__EXCEPTIONS)) &&    \
-    !(defined(__GNUC__) && (__GNUC__ >= 5) && !defined(__cpp_exceptions)) && \
-    !(defined(_MSC_VER) && !defined(_CPPUNWIND))
-#define OTABSL_HAVE_EXCEPTIONS 1
-#endif
-
-// -----------------------------------------------------------------------------
-// Platform Feature Checks
-// -----------------------------------------------------------------------------
-
-// Currently supported operating systems and associated preprocessor
-// symbols:
-//
-//   Linux and Linux-derived           __linux__
-//   Android                           __ANDROID__ (implies __linux__)
-//   Linux (non-Android)               __linux__ && !__ANDROID__
-//   Darwin (macOS and iOS)            __APPLE__
-//   Akaros (http://akaros.org)        __ros__
-//   Windows                           _WIN32
-//   NaCL                              __native_client__
-//   AsmJS                             __asmjs__
-//   WebAssembly                       __wasm__
-//   Fuchsia                           __Fuchsia__
-//
-// Note that since Android defines both __ANDROID__ and __linux__, one
-// may probe for either Linux or Android by simply testing for __linux__.
-
-// OTABSL_HAVE_MMAP
-//
-// Checks whether the platform has an mmap(2) implementation as defined in
-// POSIX.1-2001.
-#ifdef OTABSL_HAVE_MMAP
-#error OTABSL_HAVE_MMAP cannot be directly set
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||   \
-    defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \
-    defined(__wasm__) || defined(__Fuchsia__) || defined(__sun) || \
-    defined(__ASYLO__)
-#define OTABSL_HAVE_MMAP 1
-#endif
-
-// OTABSL_HAVE_PTHREAD_GETSCHEDPARAM
-//
-// Checks whether the platform implements the pthread_(get|set)schedparam(3)
-// functions as defined in POSIX.1-2001.
-#ifdef OTABSL_HAVE_PTHREAD_GETSCHEDPARAM
-#error OTABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
-    defined(__ros__)
-#define OTABSL_HAVE_PTHREAD_GETSCHEDPARAM 1
-#endif
-
-// OTABSL_HAVE_SCHED_YIELD
-//
-// Checks whether the platform implements sched_yield(2) as defined in
-// POSIX.1-2001.
-#ifdef OTABSL_HAVE_SCHED_YIELD
-#error OTABSL_HAVE_SCHED_YIELD cannot be directly set
-#elif defined(__linux__) || defined(__ros__) || defined(__native_client__)
-#define OTABSL_HAVE_SCHED_YIELD 1
-#endif
-
-// OTABSL_HAVE_SEMAPHORE_H
-//
-// Checks whether the platform supports the <semaphore.h> header and sem_init(3)
-// family of functions as standardized in POSIX.1-2001.
-//
-// Note: While Apple provides <semaphore.h> for both iOS and macOS, it is
-// explicitly deprecated and will cause build failures if enabled for those
-// platforms.  We side-step the issue by not defining it here for Apple
-// platforms.
-#ifdef OTABSL_HAVE_SEMAPHORE_H
-#error OTABSL_HAVE_SEMAPHORE_H cannot be directly set
-#elif defined(__linux__) || defined(__ros__)
-#define OTABSL_HAVE_SEMAPHORE_H 1
-#endif
-
-// OTABSL_HAVE_ALARM
-//
-// Checks whether the platform supports the <signal.h> header and alarm(2)
-// function as standardized in POSIX.1-2001.
-#ifdef OTABSL_HAVE_ALARM
-#error OTABSL_HAVE_ALARM cannot be directly set
-#elif defined(__GOOGLE_GRTE_VERSION__)
-// feature tests for Google's GRTE
-#define OTABSL_HAVE_ALARM 1
-#elif defined(__GLIBC__)
-// feature test for glibc
-#define OTABSL_HAVE_ALARM 1
-#elif defined(_MSC_VER)
-// feature tests for Microsoft's library
-#elif defined(__MINGW32__)
-// mingw32 doesn't provide alarm(2):
-// https://osdn.net/projects/mingw/scm/git/mingw-org-wsl/blobs/5.2-trunk/mingwrt/include/unistd.h
-// mingw-w64 provides a no-op implementation:
-// https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-crt/misc/alarm.c
-#elif defined(__EMSCRIPTEN__)
-// emscripten doesn't support signals
-#elif defined(__Fuchsia__)
-// Signals don't exist on fuchsia.
-#elif defined(__native_client__)
-#else
-// other standard libraries
-#define OTABSL_HAVE_ALARM 1
-#endif
-
-// OTABSL_IS_LITTLE_ENDIAN
-// OTABSL_IS_BIG_ENDIAN
-//
-// Checks the endianness of the platform.
-//
-// Notes: uses the built in endian macros provided by GCC (since 4.6) and
-// Clang (since 3.2); see
-// https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html.
-// Otherwise, if _WIN32, assume little endian. Otherwise, bail with an error.
-#if defined(OTABSL_IS_BIG_ENDIAN)
-#error "OTABSL_IS_BIG_ENDIAN cannot be directly set."
-#endif
-#if defined(OTABSL_IS_LITTLE_ENDIAN)
-#error "OTABSL_IS_LITTLE_ENDIAN cannot be directly set."
-#endif
-
-#if (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-     __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define OTABSL_IS_LITTLE_ENDIAN 1
-#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
-    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define OTABSL_IS_BIG_ENDIAN 1
-#elif defined(_WIN32)
-#define OTABSL_IS_LITTLE_ENDIAN 1
-#else
-#error "absl endian detection needs to be set up for your compiler"
-#endif
-
-// macOS 10.13 and iOS 10.11 don't let you use <any>, <optional>, or <variant>
-// even though the headers exist and are publicly noted to work.  See
-// https://github.com/abseil/abseil-cpp/issues/207 and
-// https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
-// libc++ spells out the availability requirements in the file
-// llvm-project/libcxx/include/__config via the #define
-// _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS.
-#if defined(__APPLE__) && defined(_LIBCPP_VERSION) && \
-  ((defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
-   __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101400) || \
-  (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && \
-   __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 120000) || \
-  (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && \
-   __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 120000) || \
-  (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && \
-   __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 50000))
-#define OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1
-#else
-#define OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0
-#endif
-
-// OTABSL_HAVE_STD_ANY
-//
-// Checks whether C++17 std::any is available by checking whether <any> exists.
-#ifdef OTABSL_HAVE_STD_ANY
-#error "OTABSL_HAVE_STD_ANY cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<any>) && __cplusplus >= 201703L && \
-    !OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
-#define OTABSL_HAVE_STD_ANY 1
-#endif
-#endif
-
-// OTABSL_HAVE_STD_OPTIONAL
-//
-// Checks whether C++17 std::optional is available.
-#ifdef OTABSL_HAVE_STD_OPTIONAL
-#error "OTABSL_HAVE_STD_OPTIONAL cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L && \
-    !OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
-#define OTABSL_HAVE_STD_OPTIONAL 1
-#endif
-#endif
-
-// OTABSL_HAVE_STD_VARIANT
-//
-// Checks whether C++17 std::variant is available.
-#ifdef OTABSL_HAVE_STD_VARIANT
-#error "OTABSL_HAVE_STD_VARIANT cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<variant>) && __cplusplus >= 201703L && \
-    !OTABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
-#define OTABSL_HAVE_STD_VARIANT 1
-#endif
-#endif
-
-// OTABSL_HAVE_STD_STRING_VIEW
-//
-// Checks whether C++17 std::string_view is available.
-#ifdef OTABSL_HAVE_STD_STRING_VIEW
-#error "OTABSL_HAVE_STD_STRING_VIEW cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<string_view>) && __cplusplus >= 201703L
-#define OTABSL_HAVE_STD_STRING_VIEW 1
-#endif
-#endif
-
-// For MSVC, `__has_include` is supported in VS 2017 15.3, which is later than
-// the support for <optional>, <any>, <string_view>, <variant>. So we use
-// _MSC_VER to check whether we have VS 2017 RTM (when <optional>, <any>,
-// <string_view>, <variant> is implemented) or higher. Also, `__cplusplus` is
-// not correctly set by MSVC, so we use `_MSVC_LANG` to check the language
-// version.
-// TODO(zhangxy): fix tests before enabling aliasing for `std::any`.
-#if defined(_MSC_VER) && _MSC_VER >= 1910 && \
-    ((defined(_MSVC_LANG) && _MSVC_LANG > 201402) || __cplusplus > 201402)
-// #define OTABSL_HAVE_STD_ANY 1
-#define OTABSL_HAVE_STD_OPTIONAL 1
-#define OTABSL_HAVE_STD_VARIANT 1
-#define OTABSL_HAVE_STD_STRING_VIEW 1
-#endif
-
-// OTABSL_USES_STD_ANY
-//
-// Indicates whether absl::OTABSL_OPTION_NAMESPACE_NAME::any is an alias for std::any.
-#if !defined(OTABSL_OPTION_USE_STD_ANY)
-#error options.h is misconfigured.
-#elif OTABSL_OPTION_USE_STD_ANY == 0 || \
-    (OTABSL_OPTION_USE_STD_ANY == 2 && !defined(OTABSL_HAVE_STD_ANY))
-#undef OTABSL_USES_STD_ANY
-#elif OTABSL_OPTION_USE_STD_ANY == 1 || \
-    (OTABSL_OPTION_USE_STD_ANY == 2 && defined(OTABSL_HAVE_STD_ANY))
-#define OTABSL_USES_STD_ANY 1
-#else
-#error options.h is misconfigured.
-#endif
-
-// OTABSL_USES_STD_OPTIONAL
-//
-// Indicates whether absl::OTABSL_OPTION_NAMESPACE_NAME::optional is an alias for std::optional.
-#if !defined(OTABSL_OPTION_USE_STD_OPTIONAL)
-#error options.h is misconfigured.
-#elif OTABSL_OPTION_USE_STD_OPTIONAL == 0 || \
-    (OTABSL_OPTION_USE_STD_OPTIONAL == 2 && !defined(OTABSL_HAVE_STD_OPTIONAL))
-#undef OTABSL_USES_STD_OPTIONAL
-#elif OTABSL_OPTION_USE_STD_OPTIONAL == 1 || \
-    (OTABSL_OPTION_USE_STD_OPTIONAL == 2 && defined(OTABSL_HAVE_STD_OPTIONAL))
-#define OTABSL_USES_STD_OPTIONAL 1
-#else
-#error options.h is misconfigured.
-#endif
-
-// OTABSL_USES_STD_VARIANT
-//
-// Indicates whether absl::OTABSL_OPTION_NAMESPACE_NAME::variant is an alias for std::variant.
-#if !defined(OTABSL_OPTION_USE_STD_VARIANT)
-#error options.h is misconfigured.
-#elif OTABSL_OPTION_USE_STD_VARIANT == 0 || \
-    (OTABSL_OPTION_USE_STD_VARIANT == 2 && !defined(OTABSL_HAVE_STD_VARIANT))
-#undef OTABSL_USES_STD_VARIANT
-#elif OTABSL_OPTION_USE_STD_VARIANT == 1 || \
-    (OTABSL_OPTION_USE_STD_VARIANT == 2 && defined(OTABSL_HAVE_STD_VARIANT))
-#define OTABSL_USES_STD_VARIANT 1
-#else
-#error options.h is misconfigured.
-#endif
-
-// OTABSL_USES_STD_STRING_VIEW
-//
-// Indicates whether absl::OTABSL_OPTION_NAMESPACE_NAME::string_view is an alias for std::string_view.
-#if !defined(OTABSL_OPTION_USE_STD_STRING_VIEW)
-#error options.h is misconfigured.
-#elif OTABSL_OPTION_USE_STD_STRING_VIEW == 0 || \
-    (OTABSL_OPTION_USE_STD_STRING_VIEW == 2 &&  \
-     !defined(OTABSL_HAVE_STD_STRING_VIEW))
-#undef OTABSL_USES_STD_STRING_VIEW
-#elif OTABSL_OPTION_USE_STD_STRING_VIEW == 1 || \
-    (OTABSL_OPTION_USE_STD_STRING_VIEW == 2 &&  \
-     defined(OTABSL_HAVE_STD_STRING_VIEW))
-#define OTABSL_USES_STD_STRING_VIEW 1
-#else
-#error options.h is misconfigured.
-#endif
-
-// In debug mode, MSVC 2017's std::variant throws a EXCEPTION_ACCESS_VIOLATION
-// SEH exception from emplace for variant<SomeStruct> when constructing the
-// struct can throw. This defeats some of variant_test and
-// variant_exception_safety_test.
-#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_DEBUG)
-#define OTABSL_INTERNAL_MSVC_2017_DBG_MODE
-#endif
-
-// OTABSL_INTERNAL_MANGLED_NS
-// OTABSL_INTERNAL_MANGLED_BACKREFERENCE
-//
-// Internal macros for building up mangled names in our internal fork of CCTZ.
-// This implementation detail is only needed and provided for the MSVC build.
-//
-// These macros both expand to string literals.  OTABSL_INTERNAL_MANGLED_NS is
-// the mangled spelling of the `absl` namespace, and
-// OTABSL_INTERNAL_MANGLED_BACKREFERENCE is a back-reference integer representing
-// the proper count to skip past the CCTZ fork namespace names.  (This number
-// is one larger when there is an inline namespace name to skip.)
-#if defined(_MSC_VER)
-#define OTABSL_INTERNAL_MANGLED_NS \
-  OTABSL_INTERNAL_TOKEN_STR(OTABSL_OPTION_NAMESPACE_NAME) "@absl"
-#define OTABSL_INTERNAL_MANGLED_BACKREFERENCE "6"
-#endif
-
-#undef OTABSL_INTERNAL_HAS_KEYWORD
-
-// OTABSL_DLL
-//
-// When building Abseil as a DLL, this macro expands to `__declspec(dllexport)`
-// so we can annotate symbols appropriately as being exported. When used in
-// headers consuming a DLL, this macro expands to `__declspec(dllimport)` so
-// that consumers know the symbol is defined inside the DLL. In all other cases,
-// the macro expands to nothing.
-#if defined(_MSC_VER)
-#if defined(OTABSL_BUILD_DLL)
-#define OTABSL_DLL __declspec(dllexport)
-#elif 1
-#define OTABSL_DLL __declspec(dllimport)
-#else
-#define OTABSL_DLL
-#endif
-#else
-#define OTABSL_DLL
-#endif  // defined(_MSC_VER)
-
-#endif  // OTABSL_BASE_CONFIG_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/identity.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/identity.h
deleted file mode 100644
index 4afba3179..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/identity.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef OTABSL_BASE_INTERNAL_IDENTITY_H_
-#define OTABSL_BASE_INTERNAL_IDENTITY_H_
-
-#include "../config.h"
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace internal {
-
-template <typename T>
-struct identity {
-  typedef T type;
-};
-
-template <typename T>
-using identity_t = typename identity<T>::type;
-
-}  // namespace internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_BASE_INTERNAL_IDENTITY_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/inline_variable.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/inline_variable.h
deleted file mode 100644
index dd66e9f22..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/inline_variable.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef OTABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
-#define OTABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
-
-#include <type_traits>
-
-#include "identity.h"
-
-// File:
-//   This file define a macro that allows the creation of or emulation of C++17
-//   inline variables based on whether or not the feature is supported.
-
-////////////////////////////////////////////////////////////////////////////////
-// Macro: OTABSL_INTERNAL_INLINE_CONSTEXPR(type, name, init)
-//
-// Description:
-//   Expands to the equivalent of an inline constexpr instance of the specified
-//   `type` and `name`, initialized to the value `init`. If the compiler being
-//   used is detected as supporting actual inline variables as a language
-//   feature, then the macro expands to an actual inline variable definition.
-//
-// Requires:
-//   `type` is a type that is usable in an extern variable declaration.
-//
-// Requires: `name` is a valid identifier
-//
-// Requires:
-//   `init` is an expression that can be used in the following definition:
-//     constexpr type name = init;
-//
-// Usage:
-//
-//   // Equivalent to: `inline constexpr size_t variant_npos = -1;`
-//   OTABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, -1);
-//
-// Differences in implementation:
-//   For a direct, language-level inline variable, decltype(name) will be the
-//   type that was specified along with const qualification, whereas for
-//   emulated inline variables, decltype(name) may be different (in practice
-//   it will likely be a reference type).
-////////////////////////////////////////////////////////////////////////////////
-
-#ifdef __cpp_inline_variables
-
-// Clang's -Wmissing-variable-declarations option erroneously warned that
-// inline constexpr objects need to be pre-declared. This has now been fixed,
-// but we will need to support this workaround for people building with older
-// versions of clang.
-//
-// Bug: https://bugs.llvm.org/show_bug.cgi?id=35862
-//
-// Note:
-//   identity_t is used here so that the const and name are in the
-//   appropriate place for pointer types, reference types, function pointer
-//   types, etc..
-#if defined(__clang__)
-#define OTABSL_INTERNAL_EXTERN_DECL(type, name) \
-  extern const ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<type> name;
-#else  // Otherwise, just define the macro to do nothing.
-#define OTABSL_INTERNAL_EXTERN_DECL(type, name)
-#endif  // defined(__clang__)
-
-// See above comment at top of file for details.
-#define OTABSL_INTERNAL_INLINE_CONSTEXPR(type, name, init) \
-  OTABSL_INTERNAL_EXTERN_DECL(type, name)                  \
-  inline constexpr ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<type> name = init
-
-#else
-
-// See above comment at top of file for details.
-//
-// Note:
-//   identity_t is used here so that the const and name are in the
-//   appropriate place for pointer types, reference types, function pointer
-//   types, etc..
-#define OTABSL_INTERNAL_INLINE_CONSTEXPR(var_type, name, init)                  \
-  template <class /*AbslInternalDummy*/ = void>                               \
-  struct AbslInternalInlineVariableHolder##name {                             \
-    static constexpr ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<var_type> kInstance = init; \
-  };                                                                          \
-                                                                              \
-  template <class AbslInternalDummy>                                          \
-  constexpr ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<var_type>                            \
-      AbslInternalInlineVariableHolder##name<AbslInternalDummy>::kInstance;   \
-                                                                              \
-  static constexpr const ::absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity_t<var_type>&              \
-      name = /* NOLINT */                                                     \
-      AbslInternalInlineVariableHolder##name<>::kInstance;                    \
-  static_assert(sizeof(void (*)(decltype(name))) != 0,                        \
-                "Silence unused variable warnings.")
-
-#endif  // __cpp_inline_variables
-
-#endif  // OTABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/invoke.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/invoke.h
deleted file mode 100644
index c37f43cfc..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/internal/invoke.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(f, args...) is an implementation of
-// INVOKE(f, args...) from section [func.require] of the C++ standard.
-//
-// [func.require]
-// Define INVOKE (f, t1, t2, ..., tN) as follows:
-// 1. (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
-//    and t1 is an object of type T or a reference to an object of type T or a
-//    reference to an object of a type derived from T;
-// 2. ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
-//    class T and t1 is not one of the types described in the previous item;
-// 3. t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
-//    an object of type T or a reference to an object of type T or a reference
-//    to an object of a type derived from T;
-// 4. (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
-//    is not one of the types described in the previous item;
-// 5. f(t1, t2, ..., tN) in all other cases.
-//
-// The implementation is SFINAE-friendly: substitution failure within Invoke()
-// isn't an error.
-
-#ifndef OTABSL_BASE_INTERNAL_INVOKE_H_
-#define OTABSL_BASE_INTERNAL_INVOKE_H_
-
-#include <algorithm>
-#include <type_traits>
-#include <utility>
-
-#include "../../meta/type_traits.h"
-
-// The following code is internal implementation detail.  See the comment at the
-// top of this file for the API documentation.
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace base_internal {
-
-// The five classes below each implement one of the clauses from the definition
-// of INVOKE. The inner class template Accept<F, Args...> checks whether the
-// clause is applicable; static function template Invoke(f, args...) does the
-// invocation.
-//
-// By separating the clause selection logic from invocation we make sure that
-// Invoke() does exactly what the standard says.
-
-template <typename Derived>
-struct StrippedAccept {
-  template <typename... Args>
-  struct Accept : Derived::template AcceptImpl<typename std::remove_cv<
-                      typename std::remove_reference<Args>::type>::type...> {};
-};
-
-// (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
-// and t1 is an object of type T or a reference to an object of type T or a
-// reference to an object of a type derived from T.
-struct MemFunAndRef : StrippedAccept<MemFunAndRef> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename MemFunType, typename C, typename Obj, typename... Args>
-  struct AcceptImpl<MemFunType C::*, Obj, Args...>
-      : std::integral_constant<bool, std::is_base_of<C, Obj>::value &&
-                                         absl::OTABSL_OPTION_NAMESPACE_NAME::is_function<MemFunType>::value> {
-  };
-
-  template <typename MemFun, typename Obj, typename... Args>
-  static decltype((std::declval<Obj>().*
-                   std::declval<MemFun>())(std::declval<Args>()...))
-  Invoke(MemFun&& mem_fun, Obj&& obj, Args&&... args) {
-    return (std::forward<Obj>(obj).*
-            std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
-  }
-};
-
-// ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
-// class T and t1 is not one of the types described in the previous item.
-struct MemFunAndPtr : StrippedAccept<MemFunAndPtr> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename MemFunType, typename C, typename Ptr, typename... Args>
-  struct AcceptImpl<MemFunType C::*, Ptr, Args...>
-      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value &&
-                                         absl::OTABSL_OPTION_NAMESPACE_NAME::is_function<MemFunType>::value> {
-  };
-
-  template <typename MemFun, typename Ptr, typename... Args>
-  static decltype(((*std::declval<Ptr>()).*
-                   std::declval<MemFun>())(std::declval<Args>()...))
-  Invoke(MemFun&& mem_fun, Ptr&& ptr, Args&&... args) {
-    return ((*std::forward<Ptr>(ptr)).*
-            std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
-  }
-};
-
-// t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
-// an object of type T or a reference to an object of type T or a reference
-// to an object of a type derived from T.
-struct DataMemAndRef : StrippedAccept<DataMemAndRef> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename R, typename C, typename Obj>
-  struct AcceptImpl<R C::*, Obj>
-      : std::integral_constant<bool, std::is_base_of<C, Obj>::value &&
-                                         !absl::OTABSL_OPTION_NAMESPACE_NAME::is_function<R>::value> {};
-
-  template <typename DataMem, typename Ref>
-  static decltype(std::declval<Ref>().*std::declval<DataMem>()) Invoke(
-      DataMem&& data_mem, Ref&& ref) {
-    return std::forward<Ref>(ref).*std::forward<DataMem>(data_mem);
-  }
-};
-
-// (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
-// is not one of the types described in the previous item.
-struct DataMemAndPtr : StrippedAccept<DataMemAndPtr> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename R, typename C, typename Ptr>
-  struct AcceptImpl<R C::*, Ptr>
-      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value &&
-                                         !absl::OTABSL_OPTION_NAMESPACE_NAME::is_function<R>::value> {};
-
-  template <typename DataMem, typename Ptr>
-  static decltype((*std::declval<Ptr>()).*std::declval<DataMem>()) Invoke(
-      DataMem&& data_mem, Ptr&& ptr) {
-    return (*std::forward<Ptr>(ptr)).*std::forward<DataMem>(data_mem);
-  }
-};
-
-// f(t1, t2, ..., tN) in all other cases.
-struct Callable {
-  // Callable doesn't have Accept because it's the last clause that gets picked
-  // when none of the previous clauses are applicable.
-  template <typename F, typename... Args>
-  static decltype(std::declval<F>()(std::declval<Args>()...)) Invoke(
-      F&& f, Args&&... args) {
-    return std::forward<F>(f)(std::forward<Args>(args)...);
-  }
-};
-
-// Resolves to the first matching clause.
-template <typename... Args>
-struct Invoker {
-  typedef typename std::conditional<
-      MemFunAndRef::Accept<Args...>::value, MemFunAndRef,
-      typename std::conditional<
-          MemFunAndPtr::Accept<Args...>::value, MemFunAndPtr,
-          typename std::conditional<
-              DataMemAndRef::Accept<Args...>::value, DataMemAndRef,
-              typename std::conditional<DataMemAndPtr::Accept<Args...>::value,
-                                        DataMemAndPtr, Callable>::type>::type>::
-          type>::type type;
-};
-
-// The result type of Invoke<F, Args...>.
-template <typename F, typename... Args>
-using InvokeT = decltype(Invoker<F, Args...>::type::Invoke(
-    std::declval<F>(), std::declval<Args>()...));
-
-// Invoke(f, args...) is an implementation of INVOKE(f, args...) from section
-// [func.require] of the C++ standard.
-template <typename F, typename... Args>
-InvokeT<F, Args...> Invoke(F&& f, Args&&... args) {
-  return Invoker<F, Args...>::type::Invoke(std::forward<F>(f),
-                                           std::forward<Args>(args)...);
-}
-
-}  // namespace base_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_BASE_INTERNAL_INVOKE_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/macros.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/macros.h
deleted file mode 100644
index 707c375ed..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/macros.h
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: macros.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines the set of language macros used within Abseil code.
-// For the set of macros used to determine supported compilers and platforms,
-// see absl/base/config.h instead.
-//
-// This code is compiled directly on many platforms, including client
-// platforms like Windows, Mac, and embedded systems.  Before making
-// any changes here, make sure that you're not breaking any platforms.
-
-#ifndef OTABSL_BASE_MACROS_H_
-#define OTABSL_BASE_MACROS_H_
-
-#include <cassert>
-#include <cstddef>
-
-#include "attributes.h"
-#include "optimization.h"
-#include "port.h"
-
-// OTABSL_ARRAYSIZE()
-//
-// Returns the number of elements in an array as a compile-time constant, which
-// can be used in defining new arrays. If you use this macro on a pointer by
-// mistake, you will get a compile-time error.
-#define OTABSL_ARRAYSIZE(array) \
-  (sizeof(::absl::OTABSL_OPTION_NAMESPACE_NAME::macros_internal::ArraySizeHelper(array)))
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace macros_internal {
-// Note: this internal template function declaration is used by OTABSL_ARRAYSIZE.
-// The function doesn't need a definition, as we only use its type.
-template <typename T, size_t N>
-auto ArraySizeHelper(const T (&array)[N]) -> char (&)[N];
-}  // namespace macros_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-// kLinkerInitialized
-//
-// An enum used only as a constructor argument to indicate that a variable has
-// static storage duration, and that the constructor should do nothing to its
-// state. Use of this macro indicates to the reader that it is legal to
-// declare a static instance of the class, provided the constructor is given
-// the absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::kLinkerInitialized argument.
-//
-// Normally, it is unsafe to declare a static variable that has a constructor or
-// a destructor because invocation order is undefined. However, if the type can
-// be zero-initialized (which the loader does for static variables) into a valid
-// state and the type's destructor does not affect storage, then a constructor
-// for static initialization can be declared.
-//
-// Example:
-//       // Declaration
-//       explicit MyClass(absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal:LinkerInitialized x) {}
-//
-//       // Invocation
-//       static MyClass my_global(absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::kLinkerInitialized);
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace base_internal {
-enum LinkerInitialized {
-  kLinkerInitialized = 0,
-};
-}  // namespace base_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-// OTABSL_FALLTHROUGH_INTENDED
-//
-// Annotates implicit fall-through between switch labels, allowing a case to
-// indicate intentional fallthrough and turn off warnings about any lack of a
-// `break` statement. The OTABSL_FALLTHROUGH_INTENDED macro should be followed by
-// a semicolon and can be used in most places where `break` can, provided that
-// no statements exist between it and the next switch label.
-//
-// Example:
-//
-//  switch (x) {
-//    case 40:
-//    case 41:
-//      if (truth_is_out_there) {
-//        ++x;
-//        OTABSL_FALLTHROUGH_INTENDED;  // Use instead of/along with annotations
-//                                    // in comments
-//      } else {
-//        return x;
-//      }
-//    case 42:
-//      ...
-//
-// Notes: when compiled with clang in C++11 mode, the OTABSL_FALLTHROUGH_INTENDED
-// macro is expanded to the [[clang::fallthrough]] attribute, which is analysed
-// when  performing switch labels fall-through diagnostic
-// (`-Wimplicit-fallthrough`). See clang documentation on language extensions
-// for details:
-// https://clang.llvm.org/docs/AttributeReference.html#fallthrough-clang-fallthrough
-//
-// When used with unsupported compilers, the OTABSL_FALLTHROUGH_INTENDED macro
-// has no effect on diagnostics. In any case this macro has no effect on runtime
-// behavior and performance of code.
-#ifdef OTABSL_FALLTHROUGH_INTENDED
-#error "OTABSL_FALLTHROUGH_INTENDED should not be defined."
-#endif
-
-// TODO(zhangxy): Use c++17 standard [[fallthrough]] macro, when supported.
-#if defined(__clang__) && defined(__has_warning)
-#if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
-#define OTABSL_FALLTHROUGH_INTENDED [[clang::fallthrough]]
-#endif
-#elif defined(__GNUC__) && __GNUC__ >= 7
-#define OTABSL_FALLTHROUGH_INTENDED [[gnu::fallthrough]]
-#endif
-
-#ifndef OTABSL_FALLTHROUGH_INTENDED
-#define OTABSL_FALLTHROUGH_INTENDED \
-  do {                            \
-  } while (0)
-#endif
-
-// OTABSL_DEPRECATED()
-//
-// Marks a deprecated class, struct, enum, function, method and variable
-// declarations. The macro argument is used as a custom diagnostic message (e.g.
-// suggestion of a better alternative).
-//
-// Examples:
-//
-//   class OTABSL_DEPRECATED("Use Bar instead") Foo {...};
-//
-//   OTABSL_DEPRECATED("Use Baz() instead") void Bar() {...}
-//
-//   template <typename T>
-//   OTABSL_DEPRECATED("Use DoThat() instead")
-//   void DoThis();
-//
-// Every usage of a deprecated entity will trigger a warning when compiled with
-// clang's `-Wdeprecated-declarations` option. This option is turned off by
-// default, but the warnings will be reported by clang-tidy.
-#if defined(__clang__) && __cplusplus >= 201103L
-#define OTABSL_DEPRECATED(message) __attribute__((deprecated(message)))
-#endif
-
-#ifndef OTABSL_DEPRECATED
-#define OTABSL_DEPRECATED(message)
-#endif
-
-// OTABSL_BAD_CALL_IF()
-//
-// Used on a function overload to trap bad calls: any call that matches the
-// overload will cause a compile-time error. This macro uses a clang-specific
-// "enable_if" attribute, as described at
-// https://clang.llvm.org/docs/AttributeReference.html#enable-if
-//
-// Overloads which use this macro should be bracketed by
-// `#ifdef OTABSL_BAD_CALL_IF`.
-//
-// Example:
-//
-//   int isdigit(int c);
-//   #ifdef OTABSL_BAD_CALL_IF
-//   int isdigit(int c)
-//     OTABSL_BAD_CALL_IF(c <= -1 || c > 255,
-//                       "'c' must have the value of an unsigned char or EOF");
-//   #endif // OTABSL_BAD_CALL_IF
-#if OTABSL_HAVE_ATTRIBUTE(enable_if)
-#define OTABSL_BAD_CALL_IF(expr, msg) \
-  __attribute__((enable_if(expr, "Bad call trap"), unavailable(msg)))
-#endif
-
-// OTABSL_ASSERT()
-//
-// In C++11, `assert` can't be used portably within constexpr functions.
-// OTABSL_ASSERT functions as a runtime assert but works in C++11 constexpr
-// functions.  Example:
-//
-// constexpr double Divide(double a, double b) {
-//   return OTABSL_ASSERT(b != 0), a / b;
-// }
-//
-// This macro is inspired by
-// https://akrzemi1.wordpress.com/2017/05/18/asserts-in-constexpr-functions/
-#if defined(NDEBUG)
-#define OTABSL_ASSERT(expr) \
-  (false ? static_cast<void>(expr) : static_cast<void>(0))
-#else
-#define OTABSL_ASSERT(expr)                           \
-  (OTABSL_PREDICT_TRUE((expr)) ? static_cast<void>(0) \
-                             : [] { assert(false && #expr); }())  // NOLINT
-#endif
-
-#ifdef OTABSL_HAVE_EXCEPTIONS
-#define OTABSL_INTERNAL_TRY try
-#define OTABSL_INTERNAL_CATCH_ANY catch (...)
-#define OTABSL_INTERNAL_RETHROW do { throw; } while (false)
-#else  // OTABSL_HAVE_EXCEPTIONS
-#define OTABSL_INTERNAL_TRY if (true)
-#define OTABSL_INTERNAL_CATCH_ANY else if (false)
-#define OTABSL_INTERNAL_RETHROW do {} while (false)
-#endif  // OTABSL_HAVE_EXCEPTIONS
-
-#endif  // OTABSL_BASE_MACROS_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/optimization.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/optimization.h
deleted file mode 100644
index 69713654a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/optimization.h
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: optimization.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines portable macros for performance optimization.
-
-#ifndef OTABSL_BASE_OPTIMIZATION_H_
-#define OTABSL_BASE_OPTIMIZATION_H_
-
-#include "config.h"
-
-// OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION
-//
-// Instructs the compiler to avoid optimizing tail-call recursion. Use of this
-// macro is useful when you wish to preserve the existing function order within
-// a stack trace for logging, debugging, or profiling purposes.
-//
-// Example:
-//
-//   int f() {
-//     int result = g();
-//     OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION();
-//     return result;
-//   }
-#if defined(__pnacl__)
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() if (volatile int x = 0) { (void)x; }
-#elif defined(__clang__)
-// Clang will not tail call given inline volatile assembly.
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
-#elif defined(__GNUC__)
-// GCC will not tail call given inline volatile assembly.
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
-#elif defined(_MSC_VER)
-#include <intrin.h>
-// The __nop() intrinsic blocks the optimisation.
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __nop()
-#else
-#define OTABSL_BLOCK_TAIL_CALL_OPTIMIZATION() if (volatile int x = 0) { (void)x; }
-#endif
-
-// OTABSL_CACHELINE_SIZE
-//
-// Explicitly defines the size of the L1 cache for purposes of alignment.
-// Setting the cacheline size allows you to specify that certain objects be
-// aligned on a cacheline boundary with `OTABSL_CACHELINE_ALIGNED` declarations.
-// (See below.)
-//
-// NOTE: this macro should be replaced with the following C++17 features, when
-// those are generally available:
-//
-//   * `std::hardware_constructive_interference_size`
-//   * `std::hardware_destructive_interference_size`
-//
-// See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0154r1.html
-// for more information.
-#if defined(__GNUC__)
-// Cache line alignment
-#if defined(__i386__) || defined(__x86_64__)
-#define OTABSL_CACHELINE_SIZE 64
-#elif defined(__powerpc64__)
-#define OTABSL_CACHELINE_SIZE 128
-#elif defined(__aarch64__)
-// We would need to read special register ctr_el0 to find out L1 dcache size.
-// This value is a good estimate based on a real aarch64 machine.
-#define OTABSL_CACHELINE_SIZE 64
-#elif defined(__arm__)
-// Cache line sizes for ARM: These values are not strictly correct since
-// cache line sizes depend on implementations, not architectures.  There
-// are even implementations with cache line sizes configurable at boot
-// time.
-#if defined(__ARM_ARCH_5T__)
-#define OTABSL_CACHELINE_SIZE 32
-#elif defined(__ARM_ARCH_7A__)
-#define OTABSL_CACHELINE_SIZE 64
-#endif
-#endif
-
-#ifndef OTABSL_CACHELINE_SIZE
-// A reasonable default guess.  Note that overestimates tend to waste more
-// space, while underestimates tend to waste more time.
-#define OTABSL_CACHELINE_SIZE 64
-#endif
-
-// OTABSL_CACHELINE_ALIGNED
-//
-// Indicates that the declared object be cache aligned using
-// `OTABSL_CACHELINE_SIZE` (see above). Cacheline aligning objects allows you to
-// load a set of related objects in the L1 cache for performance improvements.
-// Cacheline aligning objects properly allows constructive memory sharing and
-// prevents destructive (or "false") memory sharing.
-//
-// NOTE: this macro should be replaced with usage of `alignas()` using
-// `std::hardware_constructive_interference_size` and/or
-// `std::hardware_destructive_interference_size` when available within C++17.
-//
-// See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0154r1.html
-// for more information.
-//
-// On some compilers, `OTABSL_CACHELINE_ALIGNED` expands to an `__attribute__`
-// or `__declspec` attribute. For compilers where this is not known to work,
-// the macro expands to nothing.
-//
-// No further guarantees are made here. The result of applying the macro
-// to variables and types is always implementation-defined.
-//
-// WARNING: It is easy to use this attribute incorrectly, even to the point
-// of causing bugs that are difficult to diagnose, crash, etc. It does not
-// of itself guarantee that objects are aligned to a cache line.
-//
-// NOTE: Some compilers are picky about the locations of annotations such as
-// this attribute, so prefer to put it at the beginning of your declaration.
-// For example,
-//
-//   OTABSL_CACHELINE_ALIGNED static Foo* foo = ...
-//
-//   class OTABSL_CACHELINE_ALIGNED Bar { ...
-//
-// Recommendations:
-//
-// 1) Consult compiler documentation; this comment is not kept in sync as
-//    toolchains evolve.
-// 2) Verify your use has the intended effect. This often requires inspecting
-//    the generated machine code.
-// 3) Prefer applying this attribute to individual variables. Avoid
-//    applying it to types. This tends to localize the effect.
-#define OTABSL_CACHELINE_ALIGNED __attribute__((aligned(OTABSL_CACHELINE_SIZE)))
-#elif defined(_MSC_VER)
-#define OTABSL_CACHELINE_SIZE 64
-#define OTABSL_CACHELINE_ALIGNED __declspec(align(OTABSL_CACHELINE_SIZE))
-#else
-#define OTABSL_CACHELINE_SIZE 64
-#define OTABSL_CACHELINE_ALIGNED
-#endif
-
-// OTABSL_PREDICT_TRUE, OTABSL_PREDICT_FALSE
-//
-// Enables the compiler to prioritize compilation using static analysis for
-// likely paths within a boolean branch.
-//
-// Example:
-//
-//   if (OTABSL_PREDICT_TRUE(expression)) {
-//     return result;                        // Faster if more likely
-//   } else {
-//     return 0;
-//   }
-//
-// Compilers can use the information that a certain branch is not likely to be
-// taken (for instance, a CHECK failure) to optimize for the common case in
-// the absence of better information (ie. compiling gcc with `-fprofile-arcs`).
-//
-// Recommendation: Modern CPUs dynamically predict branch execution paths,
-// typically with accuracy greater than 97%. As a result, annotating every
-// branch in a codebase is likely counterproductive; however, annotating
-// specific branches that are both hot and consistently mispredicted is likely
-// to yield performance improvements.
-#if OTABSL_HAVE_BUILTIN(__builtin_expect) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#define OTABSL_PREDICT_FALSE(x) (__builtin_expect(x, 0))
-#define OTABSL_PREDICT_TRUE(x) (__builtin_expect(false || (x), true))
-#else
-#define OTABSL_PREDICT_FALSE(x) (x)
-#define OTABSL_PREDICT_TRUE(x) (x)
-#endif
-
-#endif  // OTABSL_BASE_OPTIMIZATION_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/options.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/options.h
deleted file mode 100644
index c4b00a3d3..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/options.h
+++ /dev/null
@@ -1,216 +0,0 @@
-#ifndef OTABSL_BASE_OPTIONS_H_
-#define OTABSL_BASE_OPTIONS_H_
-
-// Copyright 2019 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: options.h
-// -----------------------------------------------------------------------------
-//
-// This file contains Abseil configuration options for setting specific
-// implementations instead of letting Abseil determine which implementation to
-// use at compile-time. Setting these options may be useful for package or build
-// managers who wish to guarantee ABI stability within binary builds (which are
-// otherwise difficult to enforce).
-//
-// *** IMPORTANT NOTICE FOR PACKAGE MANAGERS:  It is important that
-// maintainers of package managers who wish to package Abseil read and
-// understand this file! ***
-//
-// Abseil contains a number of possible configuration endpoints, based on
-// parameters such as the detected platform, language version, or command-line
-// flags used to invoke the underlying binary. As is the case with all
-// libraries, binaries which contain Abseil code must ensure that separate
-// packages use the same compiled copy of Abseil to avoid a diamond dependency
-// problem, which can occur if two packages built with different Abseil
-// configuration settings are linked together. Diamond dependency problems in
-// C++ may manifest as violations to the One Definition Rule (ODR) (resulting in
-// linker errors), or undefined behavior (resulting in crashes).
-//
-// Diamond dependency problems can be avoided if all packages utilize the same
-// exact version of Abseil. Building from source code with the same compilation
-// parameters is the easiest way to avoid such dependency problems. However, for
-// package managers who cannot control such compilation parameters, we are
-// providing the file to allow you to inject ABI (Application Binary Interface)
-// stability across builds. Settings options in this file will neither change
-// API nor ABI, providing a stable copy of Abseil between packages.
-//
-// Care must be taken to keep options within these configurations isolated
-// from any other dynamic settings, such as command-line flags which could alter
-// these options. This file is provided specifically to help build and package
-// managers provide a stable copy of Abseil within their libraries and binaries;
-// other developers should not have need to alter the contents of this file.
-//
-// -----------------------------------------------------------------------------
-// Usage
-// -----------------------------------------------------------------------------
-//
-// For any particular package release, set the appropriate definitions within
-// this file to whatever value makes the most sense for your package(s). Note
-// that, by default, most of these options, at the moment, affect the
-// implementation of types; future options may affect other implementation
-// details.
-//
-// NOTE: the defaults within this file all assume that Abseil can select the
-// proper Abseil implementation at compile-time, which will not be sufficient
-// to guarantee ABI stability to package managers.
-
-// Include a standard library header to allow configuration based on the
-// standard library in use.
-// Using C++20 feature-test macros when possible, otherwise fall back to
-// ciso646/iso646.h.There are warnings when including ciso646 in C++17 mode
-#ifdef __has_include
-#  if __has_include(<version>)
-#    include <version>
-#  endif
-#elif defined(_MSC_VER) && \
-    ((defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L))
-#  if _MSC_VER >= 1922
-#    include <version>
-#  endif
-#else
-#  if defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wcpp"
-#  elif defined(__clang__) || defined(__apple_build_version__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wcpp"
-#  endif
-#  include <ciso646>
-#  if defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__)
-#      pragma GCC diagnostic pop
-#  elif defined(__clang__) || defined(__apple_build_version__)
-#    pragma clang diagnostic pop
-#  endif
-#endif
-
-// -----------------------------------------------------------------------------
-// Type Compatibility Options
-// -----------------------------------------------------------------------------
-//
-// OTABSL_OPTION_USE_STD_ANY
-//
-// This option controls whether absl::OTABSL_OPTION_NAMESPACE_NAME::any is implemented as an alias to
-// std::any, or as an independent implementation.
-//
-// A value of 0 means to use Abseil's implementation.  This requires only C++11
-// support, and is expected to work on every toolchain we support.
-//
-// A value of 1 means to use an alias to std::any.  This requires that all code
-// using Abseil is built in C++17 mode or later.
-//
-// A value of 2 means to detect the C++ version being used to compile Abseil,
-// and use an alias only if a working std::any is available.  This option is
-// useful when you are building your entire program, including all of its
-// dependencies, from source.  It should not be used otherwise -- for example,
-// if you are distributing Abseil in a binary package manager -- since in
-// mode 2, absl::OTABSL_OPTION_NAMESPACE_NAME::any will name a different type, with a different mangled name
-// and binary layout, depending on the compiler flags passed by the end user.
-// For more info, see https://abseil.io/about/design/dropin-types.
-//
-// User code should not inspect this macro.  To check in the preprocessor if
-// absl::OTABSL_OPTION_NAMESPACE_NAME::any is a typedef of std::any, use the feature macro OTABSL_USES_STD_ANY.
-
-#define OTABSL_OPTION_USE_STD_ANY 0
-
-
-// OTABSL_OPTION_USE_STD_OPTIONAL
-//
-// This option controls whether absl::OTABSL_OPTION_NAMESPACE_NAME::optional is implemented as an alias to
-// std::optional, or as an independent implementation.
-//
-// A value of 0 means to use Abseil's implementation.  This requires only C++11
-// support, and is expected to work on every toolchain we support.
-//
-// A value of 1 means to use an alias to std::optional.  This requires that all
-// code using Abseil is built in C++17 mode or later.
-//
-// A value of 2 means to detect the C++ version being used to compile Abseil,
-// and use an alias only if a working std::optional is available.  This option
-// is useful when you are building your program from source.  It should not be
-// used otherwise -- for example, if you are distributing Abseil in a binary
-// package manager -- since in mode 2, absl::OTABSL_OPTION_NAMESPACE_NAME::optional will name a different
-// type, with a different mangled name and binary layout, depending on the
-// compiler flags passed by the end user.  For more info, see
-// https://abseil.io/about/design/dropin-types.
-
-// User code should not inspect this macro.  To check in the preprocessor if
-// absl::OTABSL_OPTION_NAMESPACE_NAME::optional is a typedef of std::optional, use the feature macro
-// OTABSL_USES_STD_OPTIONAL.
-
-#define OTABSL_OPTION_USE_STD_OPTIONAL 0
-
-
-// OTABSL_OPTION_USE_STD_STRING_VIEW
-//
-// This option controls whether absl::OTABSL_OPTION_NAMESPACE_NAME::string_view is implemented as an alias to
-// std::string_view, or as an independent implementation.
-//
-// A value of 0 means to use Abseil's implementation.  This requires only C++11
-// support, and is expected to work on every toolchain we support.
-//
-// A value of 1 means to use an alias to std::string_view.  This requires that
-// all code using Abseil is built in C++17 mode or later.
-//
-// A value of 2 means to detect the C++ version being used to compile Abseil,
-// and use an alias only if a working std::string_view is available.  This
-// option is useful when you are building your program from source.  It should
-// not be used otherwise -- for example, if you are distributing Abseil in a
-// binary package manager -- since in mode 2, absl::OTABSL_OPTION_NAMESPACE_NAME::string_view will name a
-// different type, with a different mangled name and binary layout, depending on
-// the compiler flags passed by the end user.  For more info, see
-// https://abseil.io/about/design/dropin-types.
-//
-// User code should not inspect this macro.  To check in the preprocessor if
-// absl::OTABSL_OPTION_NAMESPACE_NAME::string_view is a typedef of std::string_view, use the feature macro
-// OTABSL_USES_STD_STRING_VIEW.
-
-#define OTABSL_OPTION_USE_STD_STRING_VIEW 0
-
-// OTABSL_OPTION_USE_STD_VARIANT
-//
-// This option controls whether absl::OTABSL_OPTION_NAMESPACE_NAME::variant is implemented as an alias to
-// std::variant, or as an independent implementation.
-//
-// A value of 0 means to use Abseil's implementation.  This requires only C++11
-// support, and is expected to work on every toolchain we support.
-//
-// A value of 1 means to use an alias to std::variant.  This requires that all
-// code using Abseil is built in C++17 mode or later.
-//
-// A value of 2 means to detect the C++ version being used to compile Abseil,
-// and use an alias only if a working std::variant is available.  This option
-// is useful when you are building your program from source.  It should not be
-// used otherwise -- for example, if you are distributing Abseil in a binary
-// package manager -- since in mode 2, absl::OTABSL_OPTION_NAMESPACE_NAME::variant will name a different
-// type, with a different mangled name and binary layout, depending on the
-// compiler flags passed by the end user.  For more info, see
-// https://abseil.io/about/design/dropin-types.
-//
-// User code should not inspect this macro.  To check in the preprocessor if
-// absl::OTABSL_OPTION_NAMESPACE_NAME::variant is a typedef of std::variant, use the feature macro
-// OTABSL_USES_STD_VARIANT.
-
-#define OTABSL_OPTION_USE_STD_VARIANT 0
-
-
-// OTABSL_OPTION_NAMESPACE_NAME
-//
-// All codes in otabsl are under OTABSL_OPTION_NAMESPACE_NAME, we do not use inline namespace to avoid
-// conlict with external Abseil.
-
-#define OTABSL_OPTION_NAMESPACE_NAME otel_v1
-
-#endif  // OTABSL_BASE_OPTIONS_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/policy_checks.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/policy_checks.h
deleted file mode 100644
index f86c264fc..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/policy_checks.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: policy_checks.h
-// -----------------------------------------------------------------------------
-//
-// This header enforces a minimum set of policies at build time, such as the
-// supported compiler and library versions. Unsupported configurations are
-// reported with `#error`. This enforcement is best effort, so successfully
-// compiling this header does not guarantee a supported configuration.
-
-#ifndef OTABSL_BASE_POLICY_CHECKS_H_
-#define OTABSL_BASE_POLICY_CHECKS_H_
-
-// Included for the __GLIBC_PREREQ macro used below.
-#include <limits.h>
-
-// Included for the _STLPORT_VERSION macro used below.
-#if defined(__cplusplus)
-#include <cstddef>
-#endif
-
-// -----------------------------------------------------------------------------
-// Operating System Check
-// -----------------------------------------------------------------------------
-
-#if defined(__CYGWIN__)
-#error "Cygwin is not supported."
-#endif
-
-// -----------------------------------------------------------------------------
-// Compiler Check
-// -----------------------------------------------------------------------------
-
-#if 0 /* FIXME: MG */
-// We support MSVC++ 14.0 update 2 and later.
-// This minimum will go up.
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER < 190023918 && !defined(__clang__)
-#error "This package requires Visual Studio 2015 Update 2 or higher."
-#endif
-#endif
-
-// We support gcc 4.7 and later.
-// This minimum will go up.
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
-#error "This package requires gcc 4.7 or higher."
-#endif
-#endif
-
-// We support Apple Xcode clang 4.2.1 (version 421.11.65) and later.
-// This corresponds to Apple Xcode version 4.5.
-// This minimum will go up.
-#if defined(__apple_build_version__) && __apple_build_version__ < 4211165
-#error "This package requires __apple_build_version__ of 4211165 or higher."
-#endif
-
-// -----------------------------------------------------------------------------
-// C++ Version Check
-// -----------------------------------------------------------------------------
-
-// Enforce C++11 as the minimum.
-#if defined(_MSVC_LANG)
-#if _MSVC_LANG < 201103L
-#error "C++ versions less than C++11 are not supported."
-#endif  // _MSVC_LANG < 201103L
-#elif defined(__cplusplus)
-#if __cplusplus < 201103L
-#error "C++ versions less than C++11 are not supported."
-#endif  // __cplusplus < 201103L
-#endif
-
-// -----------------------------------------------------------------------------
-// Standard Library Check
-// -----------------------------------------------------------------------------
-
-#if defined(_STLPORT_VERSION)
-#error "STLPort is not supported."
-#endif
-
-// -----------------------------------------------------------------------------
-// `char` Size Check
-// -----------------------------------------------------------------------------
-
-// Abseil currently assumes CHAR_BIT == 8. If you would like to use Abseil on a
-// platform where this is not the case, please provide us with the details about
-// your platform so we can consider relaxing this requirement.
-#if CHAR_BIT != 8
-#error "Abseil assumes CHAR_BIT == 8."
-#endif
-
-// -----------------------------------------------------------------------------
-// `int` Size Check
-// -----------------------------------------------------------------------------
-
-// Abseil currently assumes that an int is 4 bytes. If you would like to use
-// Abseil on a platform where this is not the case, please provide us with the
-// details about your platform so we can consider relaxing this requirement.
-#if INT_MAX < 2147483647
-#error "Abseil assumes that int is at least 4 bytes. "
-#endif
-
-#endif  // OTABSL_BASE_POLICY_CHECKS_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/port.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/port.h
deleted file mode 100644
index aaba551b5..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/base/port.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This files is a forwarding header for other headers containing various
-// portability macros and functions.
-// This file is used for both C and C++!
-
-#ifndef OTABSL_BASE_PORT_H_
-#define OTABSL_BASE_PORT_H_
-
-#include "attributes.h"
-#include "config.h"
-#include "optimization.h"
-
-#endif  // OTABSL_BASE_PORT_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/meta/type_traits.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/meta/type_traits.h
deleted file mode 100644
index dbd034887..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/meta/type_traits.h
+++ /dev/null
@@ -1,779 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// type_traits.h
-// -----------------------------------------------------------------------------
-//
-// This file contains C++11-compatible versions of standard <type_traits> API
-// functions for determining the characteristics of types. Such traits can
-// support type inference, classification, and transformation, as well as
-// make it easier to write templates based on generic type behavior.
-//
-// See https://en.cppreference.com/w/cpp/header/type_traits
-//
-// WARNING: use of many of the constructs in this header will count as "complex
-// template metaprogramming", so before proceeding, please carefully consider
-// https://google.github.io/styleguide/cppguide.html#Template_metaprogramming
-//
-// WARNING: using template metaprogramming to detect or depend on API
-// features is brittle and not guaranteed. Neither the standard library nor
-// Abseil provides any guarantee that APIs are stable in the face of template
-// metaprogramming. Use with caution.
-#ifndef OTABSL_META_TYPE_TRAITS_H_
-#define OTABSL_META_TYPE_TRAITS_H_
-
-#include <stddef.h>
-#include <functional>
-#include <type_traits>
-
-#include "../base/config.h"
-
-// MSVC constructibility traits do not detect destructor properties and so our
-// implementations should not use them as a source-of-truth.
-#if defined(_MSC_VER) && !defined(__clang__) && !defined(__GNUC__)
-#define OTABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION 1
-#endif
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-// Defined and documented later on in this file.
-template <typename T>
-struct is_trivially_destructible;
-
-// Defined and documented later on in this file.
-template <typename T>
-struct is_trivially_move_assignable;
-
-namespace type_traits_internal {
-
-// Silence MSVC warnings about the destructor being defined as deleted.
-#if defined(_MSC_VER) && !defined(__GNUC__)
-#pragma warning(push)
-#pragma warning(disable : 4624)
-#endif  // defined(_MSC_VER) && !defined(__GNUC__)
-
-template <class T>
-union SingleMemberUnion {
-  T t;
-};
-
-// Restore the state of the destructor warning that was silenced above.
-#if defined(_MSC_VER) && !defined(__GNUC__)
-#pragma warning(pop)
-#endif  // defined(_MSC_VER) && !defined(__GNUC__)
-
-template <class T>
-struct IsTriviallyMoveConstructibleObject
-    : std::integral_constant<
-          bool, std::is_move_constructible<
-                    type_traits_internal::SingleMemberUnion<T>>::value &&
-                    absl::OTABSL_OPTION_NAMESPACE_NAME::is_trivially_destructible<T>::value> {};
-
-template <class T>
-struct IsTriviallyCopyConstructibleObject
-    : std::integral_constant<
-          bool, std::is_copy_constructible<
-                    type_traits_internal::SingleMemberUnion<T>>::value &&
-                    absl::OTABSL_OPTION_NAMESPACE_NAME::is_trivially_destructible<T>::value> {};
-
-template <class T>
-struct IsTriviallyMoveAssignableReference : std::false_type {};
-
-template <class T>
-struct IsTriviallyMoveAssignableReference<T&>
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::is_trivially_move_assignable<T>::type {};
-
-template <class T>
-struct IsTriviallyMoveAssignableReference<T&&>
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::is_trivially_move_assignable<T>::type {};
-
-template <typename... Ts>
-struct VoidTImpl {
-  using type = void;
-};
-
-////////////////////////////////
-// Library Fundamentals V2 TS //
-////////////////////////////////
-
-// NOTE: The `is_detected` family of templates here differ from the library
-// fundamentals specification in that for library fundamentals, `Op<Args...>` is
-// evaluated as soon as the type `is_detected<Op, Args...>` undergoes
-// substitution, regardless of whether or not the `::value` is accessed. That
-// is inconsistent with all other standard traits and prevents lazy evaluation
-// in larger contexts (such as if the `is_detected` check is a trailing argument
-// of a `conjunction`. This implementation opts to instead be lazy in the same
-// way that the standard traits are (this "defect" of the detection idiom
-// specifications has been reported).
-
-template <class Enabler, template <class...> class Op, class... Args>
-struct is_detected_impl {
-  using type = std::false_type;
-};
-
-template <template <class...> class Op, class... Args>
-struct is_detected_impl<typename VoidTImpl<Op<Args...>>::type, Op, Args...> {
-  using type = std::true_type;
-};
-
-template <template <class...> class Op, class... Args>
-struct is_detected : is_detected_impl<void, Op, Args...>::type {};
-
-template <class Enabler, class To, template <class...> class Op, class... Args>
-struct is_detected_convertible_impl {
-  using type = std::false_type;
-};
-
-template <class To, template <class...> class Op, class... Args>
-struct is_detected_convertible_impl<
-    typename std::enable_if<std::is_convertible<Op<Args...>, To>::value>::type,
-    To, Op, Args...> {
-  using type = std::true_type;
-};
-
-template <class To, template <class...> class Op, class... Args>
-struct is_detected_convertible
-    : is_detected_convertible_impl<void, To, Op, Args...>::type {};
-
-template <typename T>
-using IsCopyAssignableImpl =
-    decltype(std::declval<T&>() = std::declval<const T&>());
-
-template <typename T>
-using IsMoveAssignableImpl = decltype(std::declval<T&>() = std::declval<T&&>());
-
-}  // namespace type_traits_internal
-
-// MSVC 19.10 and higher have a regression that causes our workarounds to fail, but their
-// std forms now appear to be compliant.
-#if defined(_MSC_VER) && !defined(__clang__) && (_MSC_VER >= 1910)
-
-template <typename T>
-using is_copy_assignable = std::is_copy_assignable<T>;
-
-template <typename T>
-using is_move_assignable = std::is_move_assignable<T>;
-
-#else
-
-template <typename T>
-struct is_copy_assignable : type_traits_internal::is_detected<
-                                type_traits_internal::IsCopyAssignableImpl, T> {
-};
-
-template <typename T>
-struct is_move_assignable : type_traits_internal::is_detected<
-                                type_traits_internal::IsMoveAssignableImpl, T> {
-};
-
-#endif
-
-// void_t()
-//
-// Ignores the type of any its arguments and returns `void`. In general, this
-// metafunction allows you to create a general case that maps to `void` while
-// allowing specializations that map to specific types.
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::void_t` metafunction.
-//
-// NOTE: `absl::OTABSL_OPTION_NAMESPACE_NAME::void_t` does not use the standard-specified implementation so
-// that it can remain compatible with gcc < 5.1. This can introduce slightly
-// different behavior, such as when ordering partial specializations.
-template <typename... Ts>
-using void_t = typename type_traits_internal::VoidTImpl<Ts...>::type;
-
-// conjunction
-//
-// Performs a compile-time logical AND operation on the passed types (which
-// must have  `::value` members convertible to `bool`. Short-circuits if it
-// encounters any `false` members (and does not compare the `::value` members
-// of any remaining arguments).
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::conjunction` metafunction.
-template <typename... Ts>
-struct conjunction;
-
-template <typename T, typename... Ts>
-struct conjunction<T, Ts...>
-    : std::conditional<T::value, conjunction<Ts...>, T>::type {};
-
-template <typename T>
-struct conjunction<T> : T {};
-
-template <>
-struct conjunction<> : std::true_type {};
-
-// disjunction
-//
-// Performs a compile-time logical OR operation on the passed types (which
-// must have  `::value` members convertible to `bool`. Short-circuits if it
-// encounters any `true` members (and does not compare the `::value` members
-// of any remaining arguments).
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::disjunction` metafunction.
-template <typename... Ts>
-struct disjunction;
-
-template <typename T, typename... Ts>
-struct disjunction<T, Ts...> :
-      std::conditional<T::value, T, disjunction<Ts...>>::type {};
-
-template <typename T>
-struct disjunction<T> : T {};
-
-template <>
-struct disjunction<> : std::false_type {};
-
-// negation
-//
-// Performs a compile-time logical NOT operation on the passed type (which
-// must have  `::value` members convertible to `bool`.
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::negation` metafunction.
-template <typename T>
-struct negation : std::integral_constant<bool, !T::value> {};
-
-// is_function()
-//
-// Determines whether the passed type `T` is a function type.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_function()` metafunction for platforms that have incomplete C++11
-// support (such as libstdc++ 4.x).
-//
-// This metafunction works because appending `const` to a type does nothing to
-// function types and reference types (and forms a const-qualified type
-// otherwise).
-template <typename T>
-struct is_function
-    : std::integral_constant<
-          bool, !(std::is_reference<T>::value ||
-                  std::is_const<typename std::add_const<T>::type>::value)> {};
-
-// is_trivially_destructible()
-//
-// Determines whether the passed type `T` is trivially destructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_destructible()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: the extensions (__has_trivial_xxx) are implemented in gcc (version >=
-// 4.3) and clang. Since we are supporting libstdc++ > 4.7, they should always
-// be present. These  extensions are documented at
-// https://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html#Type-Traits.
-template <typename T>
-struct is_trivially_destructible
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-    : std::is_trivially_destructible<T> {
-#else
-    : std::integral_constant<bool, __has_trivial_destructor(T) &&
-                                   std::is_destructible<T>::value> {
-#endif
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
- private:
-  static constexpr bool compliant = std::is_trivially_destructible<T>::value ==
-                                    is_trivially_destructible::value;
-  static_assert(compliant || std::is_trivially_destructible<T>::value,
-                "Not compliant with std::is_trivially_destructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_destructible<T>::value,
-                "Not compliant with std::is_trivially_destructible; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-};
-
-// is_trivially_default_constructible()
-//
-// Determines whether the passed type `T` is trivially default constructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_default_constructible()` metafunction for platforms that
-// have incomplete C++11 support (such as libstdc++ 4.x). On any platforms that
-// do fully support C++11, we check whether this yields the same result as the
-// std implementation.
-//
-// NOTE: according to the C++ standard, Section: 20.15.4.3 [meta.unary.prop]
-// "The predicate condition for a template specialization is_constructible<T,
-// Args...> shall be satisfied if and only if the following variable
-// definition would be well-formed for some invented variable t:
-//
-// T t(declval<Args>()...);
-//
-// is_trivially_constructible<T, Args...> additionally requires that the
-// variable definition does not call any operation that is not trivial.
-// For the purposes of this check, the call to std::declval is considered
-// trivial."
-//
-// Notes from https://en.cppreference.com/w/cpp/types/is_constructible:
-// In many implementations, is_nothrow_constructible also checks if the
-// destructor throws because it is effectively noexcept(T(arg)). Same
-// applies to is_trivially_constructible, which, in these implementations, also
-// requires that the destructor is trivial.
-// GCC bug 51452: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51452
-// LWG issue 2116: http://cplusplus.github.io/LWG/lwg-active.html#2116.
-//
-// "T obj();" need to be well-formed and not call any nontrivial operation.
-// Nontrivially destructible types will cause the expression to be nontrivial.
-template <typename T>
-struct is_trivially_default_constructible
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
-    : std::is_trivially_default_constructible<T> {
-#else
-    : std::integral_constant<bool, __has_trivial_constructor(T) &&
-                                   std::is_default_constructible<T>::value &&
-                                   is_trivially_destructible<T>::value> {
-#endif
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
-    !defined(                                            \
-        OTABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
- private:
-  static constexpr bool compliant =
-      std::is_trivially_default_constructible<T>::value ==
-      is_trivially_default_constructible::value;
-  static_assert(compliant || std::is_trivially_default_constructible<T>::value,
-                "Not compliant with std::is_trivially_default_constructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_default_constructible<T>::value,
-                "Not compliant with std::is_trivially_default_constructible; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-};
-
-// is_trivially_move_constructible()
-//
-// Determines whether the passed type `T` is trivially move constructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_move_constructible()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `T obj(declval<T>());` needs to be well-formed and not call any
-// nontrivial operation.  Nontrivially destructible types will cause the
-// expression to be nontrivial.
-template <typename T>
-struct is_trivially_move_constructible
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
-    : std::is_trivially_move_constructible<T> {
-#else
-    : std::conditional<
-          std::is_object<T>::value && !std::is_array<T>::value,
-          type_traits_internal::IsTriviallyMoveConstructibleObject<T>,
-          std::is_reference<T>>::type::type {
-#endif
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
-    !defined(                                            \
-        OTABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
- private:
-  static constexpr bool compliant =
-      std::is_trivially_move_constructible<T>::value ==
-      is_trivially_move_constructible::value;
-  static_assert(compliant || std::is_trivially_move_constructible<T>::value,
-                "Not compliant with std::is_trivially_move_constructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_move_constructible<T>::value,
-                "Not compliant with std::is_trivially_move_constructible; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-};
-
-// is_trivially_copy_constructible()
-//
-// Determines whether the passed type `T` is trivially copy constructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_copy_constructible()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `T obj(declval<const T&>());` needs to be well-formed and not call any
-// nontrivial operation.  Nontrivially destructible types will cause the
-// expression to be nontrivial.
-template <typename T>
-struct is_trivially_copy_constructible
-    : std::conditional<
-          std::is_object<T>::value && !std::is_array<T>::value,
-          type_traits_internal::IsTriviallyCopyConstructibleObject<T>,
-          std::is_lvalue_reference<T>>::type::type {
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
-    !defined(                                            \
-        OTABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
- private:
-  static constexpr bool compliant =
-      std::is_trivially_copy_constructible<T>::value ==
-      is_trivially_copy_constructible::value;
-  static_assert(compliant || std::is_trivially_copy_constructible<T>::value,
-                "Not compliant with std::is_trivially_copy_constructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_copy_constructible<T>::value,
-                "Not compliant with std::is_trivially_copy_constructible; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-};
-
-// is_trivially_move_assignable()
-//
-// Determines whether the passed type `T` is trivially move assignable.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_move_assignable()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `is_assignable<T, U>::value` is `true` if the expression
-// `declval<T>() = declval<U>()` is well-formed when treated as an unevaluated
-// operand. `is_trivially_assignable<T, U>` requires the assignment to call no
-// operation that is not trivial. `is_trivially_copy_assignable<T>` is simply
-// `is_trivially_assignable<T&, T>`.
-template <typename T>
-struct is_trivially_move_assignable
-    : std::conditional<
-          std::is_object<T>::value && !std::is_array<T>::value &&
-              std::is_move_assignable<T>::value,
-          std::is_move_assignable<type_traits_internal::SingleMemberUnion<T>>,
-          type_traits_internal::IsTriviallyMoveAssignableReference<T>>::type::
-          type {
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
- private:
-  static constexpr bool compliant =
-      std::is_trivially_move_assignable<T>::value ==
-      is_trivially_move_assignable::value;
-  static_assert(compliant || std::is_trivially_move_assignable<T>::value,
-                "Not compliant with std::is_trivially_move_assignable; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_move_assignable<T>::value,
-                "Not compliant with std::is_trivially_move_assignable; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-};
-
-// is_trivially_copy_assignable()
-//
-// Determines whether the passed type `T` is trivially copy assignable.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_copy_assignable()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `is_assignable<T, U>::value` is `true` if the expression
-// `declval<T>() = declval<U>()` is well-formed when treated as an unevaluated
-// operand. `is_trivially_assignable<T, U>` requires the assignment to call no
-// operation that is not trivial. `is_trivially_copy_assignable<T>` is simply
-// `is_trivially_assignable<T&, const T&>`.
-template <typename T>
-struct is_trivially_copy_assignable
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-    : std::is_trivially_copy_assignable<T> {
-#else
-    : std::integral_constant<
-          bool, __has_trivial_assign(typename std::remove_reference<T>::type) &&
-                    absl::OTABSL_OPTION_NAMESPACE_NAME::is_copy_assignable<T>::value> {
-#endif
-#ifdef OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
- private:
-  static constexpr bool compliant =
-      std::is_trivially_copy_assignable<T>::value ==
-      is_trivially_copy_assignable::value;
-  static_assert(compliant || std::is_trivially_copy_assignable<T>::value,
-                "Not compliant with std::is_trivially_copy_assignable; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_copy_assignable<T>::value,
-                "Not compliant with std::is_trivially_copy_assignable; "
-                "Standard: true, Implementation: false");
-#endif  // OTABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-};
-
-namespace type_traits_internal {
-// is_trivially_copyable()
-//
-// Determines whether the passed type `T` is trivially copyable.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_copyable()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). We use the C++17 definition
-// of TriviallyCopyable.
-//
-// NOTE: `is_trivially_copyable<T>::value` is `true` if all of T's copy/move
-// constructors/assignment operators are trivial or deleted, T has at least
-// one non-deleted copy/move constructor/assignment operator, and T is trivially
-// destructible. Arrays of trivially copyable types are trivially copyable.
-//
-// We expose this metafunction only for internal use within absl.
-
-#if defined(OTABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE)
-template <typename T>
-struct is_trivially_copyable : std::is_trivially_copyable<T> {};
-#else
-template <typename T>
-class is_trivially_copyable_impl {
-  using ExtentsRemoved = typename std::remove_all_extents<T>::type;
-  static constexpr bool kIsCopyOrMoveConstructible =
-      std::is_copy_constructible<ExtentsRemoved>::value ||
-      std::is_move_constructible<ExtentsRemoved>::value;
-  static constexpr bool kIsCopyOrMoveAssignable =
-      absl::OTABSL_OPTION_NAMESPACE_NAME::is_copy_assignable<ExtentsRemoved>::value ||
-      absl::OTABSL_OPTION_NAMESPACE_NAME::is_move_assignable<ExtentsRemoved>::value;
-
- public:
-  static constexpr bool kValue =
-      (__has_trivial_copy(ExtentsRemoved) || !kIsCopyOrMoveConstructible) &&
-      (__has_trivial_assign(ExtentsRemoved) || !kIsCopyOrMoveAssignable) &&
-      (kIsCopyOrMoveConstructible || kIsCopyOrMoveAssignable) &&
-      is_trivially_destructible<ExtentsRemoved>::value &&
-      // We need to check for this explicitly because otherwise we'll say
-      // references are trivial copyable when compiled by MSVC.
-      !std::is_reference<ExtentsRemoved>::value;
-};
-
-template <typename T>
-struct is_trivially_copyable
-    : std::integral_constant<
-          bool, type_traits_internal::is_trivially_copyable_impl<T>::kValue> {};
-#endif
-}  // namespace type_traits_internal
-
-// -----------------------------------------------------------------------------
-// C++14 "_t" trait aliases
-// -----------------------------------------------------------------------------
-
-template <typename T>
-using remove_cv_t = typename std::remove_cv<T>::type;
-
-template <typename T>
-using remove_const_t = typename std::remove_const<T>::type;
-
-template <typename T>
-using remove_volatile_t = typename std::remove_volatile<T>::type;
-
-template <typename T>
-using add_cv_t = typename std::add_cv<T>::type;
-
-template <typename T>
-using add_const_t = typename std::add_const<T>::type;
-
-template <typename T>
-using add_volatile_t = typename std::add_volatile<T>::type;
-
-template <typename T>
-using remove_reference_t = typename std::remove_reference<T>::type;
-
-template <typename T>
-using add_lvalue_reference_t = typename std::add_lvalue_reference<T>::type;
-
-template <typename T>
-using add_rvalue_reference_t = typename std::add_rvalue_reference<T>::type;
-
-template <typename T>
-using remove_pointer_t = typename std::remove_pointer<T>::type;
-
-template <typename T>
-using add_pointer_t = typename std::add_pointer<T>::type;
-
-template <typename T>
-using make_signed_t = typename std::make_signed<T>::type;
-
-template <typename T>
-using make_unsigned_t = typename std::make_unsigned<T>::type;
-
-template <typename T>
-using remove_extent_t = typename std::remove_extent<T>::type;
-
-template <typename T>
-using remove_all_extents_t = typename std::remove_all_extents<T>::type;
-
-template <typename T>
-using decay_t = typename std::decay<T>::type;
-
-template <bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-template <bool B, typename T, typename F>
-using conditional_t = typename std::conditional<B, T, F>::type;
-
-template <typename... T>
-using common_type_t = typename std::common_type<T...>::type;
-
-template <typename T>
-using underlying_type_t = typename std::underlying_type<T>::type;
-
-namespace type_traits_internal {
-
-#if (!defined(_MSVC_LANG) && (__cplusplus >= 201703L)) || \
-    (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L))
-// std::result_of is deprecated (C++17) or removed (C++20)
-template<typename> struct result_of;
-template<typename F, typename... Args>
-struct result_of<F(Args...)> : std::invoke_result<F, Args...> {};
-#else
-template<typename F> using result_of = std::result_of<F>;
-#endif
-
-}  // namespace type_traits_internal
-
-template<typename F>
-using result_of_t = typename type_traits_internal::result_of<F>::type;
-
-namespace type_traits_internal {
-// In MSVC we can't probe std::hash or stdext::hash because it triggers a
-// static_assert instead of failing substitution. Libc++ prior to 4.0
-// also used a static_assert.
-//
-#if defined(_MSC_VER) || (defined(_LIBCPP_VERSION) && \
-                          _LIBCPP_VERSION < 4000 && _LIBCPP_STD_VER > 11)
-#define OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_ 0
-#else
-#define OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_ 1
-#endif
-
-#if !OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
-template <typename Key, typename = size_t>
-struct IsHashable : std::true_type {};
-#else   // OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
-template <typename Key, typename = void>
-struct IsHashable : std::false_type {};
-
-template <typename Key>
-struct IsHashable<
-    Key,
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<std::is_convertible<
-        decltype(std::declval<std::hash<Key>&>()(std::declval<Key const&>())),
-        std::size_t>::value>> : std::true_type {};
-#endif  // !OTABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
-
-struct AssertHashEnabledHelper {
- private:
-  static void Sink(...) {}
-  struct NAT {};
-
-  template <class Key>
-  static auto GetReturnType(int)
-      -> decltype(std::declval<std::hash<Key>>()(std::declval<Key const&>()));
-  template <class Key>
-  static NAT GetReturnType(...);
-
-  template <class Key>
-  static std::nullptr_t DoIt() {
-    static_assert(IsHashable<Key>::value,
-                  "std::hash<Key> does not provide a call operator");
-    static_assert(
-        std::is_default_constructible<std::hash<Key>>::value,
-        "std::hash<Key> must be default constructible when it is enabled");
-    static_assert(
-        std::is_copy_constructible<std::hash<Key>>::value,
-        "std::hash<Key> must be copy constructible when it is enabled");
-    static_assert(absl::OTABSL_OPTION_NAMESPACE_NAME::is_copy_assignable<std::hash<Key>>::value,
-                  "std::hash<Key> must be copy assignable when it is enabled");
-    // is_destructible is unchecked as it's implied by each of the
-    // is_constructible checks.
-    using ReturnType = decltype(GetReturnType<Key>(0));
-    static_assert(std::is_same<ReturnType, NAT>::value ||
-                      std::is_same<ReturnType, size_t>::value,
-                  "std::hash<Key> must return size_t");
-    return nullptr;
-  }
-
-  template <class... Ts>
-  friend void AssertHashEnabled();
-};
-
-template <class... Ts>
-inline void AssertHashEnabled() {
-  using Helper = AssertHashEnabledHelper;
-  Helper::Sink(Helper::DoIt<Ts>()...);
-}
-
-}  // namespace type_traits_internal
-
-// An internal namespace that is required to implement the C++17 swap traits.
-// It is not further nested in type_traits_internal to avoid long symbol names.
-namespace swap_internal {
-
-// Necessary for the traits.
-using std::swap;
-
-// This declaration prevents global `swap` and `absl::OTABSL_OPTION_NAMESPACE_NAME::swap` overloads from being
-// considered unless ADL picks them up.
-void swap();
-
-template <class T>
-using IsSwappableImpl = decltype(swap(std::declval<T&>(), std::declval<T&>()));
-
-// NOTE: This dance with the default template parameter is for MSVC.
-template <class T,
-          class IsNoexcept = std::integral_constant<
-              bool, noexcept(swap(std::declval<T&>(), std::declval<T&>()))>>
-using IsNothrowSwappableImpl = typename std::enable_if<IsNoexcept::value>::type;
-
-// IsSwappable
-//
-// Determines whether the standard swap idiom is a valid expression for
-// arguments of type `T`.
-template <class T>
-struct IsSwappable
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::type_traits_internal::is_detected<IsSwappableImpl, T> {};
-
-// IsNothrowSwappable
-//
-// Determines whether the standard swap idiom is a valid expression for
-// arguments of type `T` and is noexcept.
-template <class T>
-struct IsNothrowSwappable
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::type_traits_internal::is_detected<IsNothrowSwappableImpl, T> {};
-
-// Swap()
-//
-// Performs the swap idiom from a namespace where valid candidates may only be
-// found in `std` or via ADL.
-template <class T, absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<IsSwappable<T>::value, int> = 0>
-void Swap(T& lhs, T& rhs) noexcept(IsNothrowSwappable<T>::value) {
-  swap(lhs, rhs);
-}
-
-// StdSwapIsUnconstrained
-//
-// Some standard library implementations are broken in that they do not
-// constrain `std::swap`. This will effectively tell us if we are dealing with
-// one of those implementations.
-using StdSwapIsUnconstrained = IsSwappable<void()>;
-
-}  // namespace swap_internal
-
-namespace type_traits_internal {
-
-// Make the swap-related traits/function accessible from this namespace.
-using swap_internal::IsNothrowSwappable;
-using swap_internal::IsSwappable;
-using swap_internal::Swap;
-using swap_internal::StdSwapIsUnconstrained;
-
-}  // namespace type_traits_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_META_TYPE_TRAITS_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/bad_variant_access.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/bad_variant_access.h
deleted file mode 100644
index 89fe750db..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/bad_variant_access.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2018 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// bad_variant_access.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines the `absl::OTABSL_OPTION_NAMESPACE_NAME::bad_variant_access` type.
-
-#ifndef OTABSL_TYPES_BAD_VARIANT_ACCESS_H_
-#define OTABSL_TYPES_BAD_VARIANT_ACCESS_H_
-
-#include <stdexcept>
-
-#include "../base/config.h"
-
-#ifdef OTABSL_USES_STD_VARIANT
-
-#include <variant>
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-using std::bad_variant_access;
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#else  // OTABSL_USES_STD_VARIANT
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-// -----------------------------------------------------------------------------
-// bad_variant_access
-// -----------------------------------------------------------------------------
-//
-// An `absl::OTABSL_OPTION_NAMESPACE_NAME::bad_variant_access` type is an exception type that is thrown in
-// the following cases:
-//
-//   * Calling `absl::OTABSL_OPTION_NAMESPACE_NAME::get(absl::OTABSL_OPTION_NAMESPACE_NAME::variant) with an index or type that does not
-//     match the currently selected alternative type
-//   * Calling `absl::OTABSL_OPTION_NAMESPACE_NAME::visit on an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` that is in the
-//     `variant::valueless_by_exception` state.
-//
-// Example:
-//
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string> v;
-//   v = 1;
-//   try {
-//     absl::OTABSL_OPTION_NAMESPACE_NAME::get<std::string>(v);
-//   } catch(const absl::OTABSL_OPTION_NAMESPACE_NAME::bad_variant_access& e) {
-//     std::cout << "Bad variant access: " << e.what() << '\n';
-//   }
-class bad_variant_access : public std::exception {
- public:
-  bad_variant_access() noexcept = default;
-  ~bad_variant_access() override;
-  const char* what() const noexcept override;
-};
-
-namespace variant_internal {
-#ifdef THROW_BAD_VARIANT_ACCESS
-// Header-only implementation with static throw implementation.
-// No need to link against Abseil library.
-[[noreturn]] static inline void ThrowBadVariantAccess()
-{
-  THROW_BAD_VARIANT_ACCESS;
-}
-//[[noreturn]] static inline void Rethrow()
-//{
-//  THROW_BAD_VARIANT_ACCESS; // Unused!
-//};
-#else
-// Original implementation requires linking Abseil library!
-[[noreturn]] void ThrowBadVariantAccess();
-[[noreturn]] void Rethrow();
-#endif
-}  // namespace variant_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_USES_STD_VARIANT
-
-#endif  // OTABSL_TYPES_BAD_VARIANT_ACCESS_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/internal/variant.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/internal/variant.h
deleted file mode 100644
index 43e7285b2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/internal/variant.h
+++ /dev/null
@@ -1,1649 +0,0 @@
-// Copyright 2018 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Implementation details of absl/types/variant.h, pulled into a
-// separate file to avoid cluttering the top of the API header with
-// implementation details.
-
-#ifndef OTABSL_TYPES_variant_internal_H_
-#define OTABSL_TYPES_variant_internal_H_
-
-#include <cassert>
-#include <cstddef>
-#include <cstdlib>
-#include <memory>
-#include <stdexcept>
-#include <tuple>
-#include <type_traits>
-
-#include "../../base/config.h"
-#include "../../base/internal/identity.h"
-#include "../../base/internal/inline_variable.h"
-#include "../../base/internal/invoke.h"
-#include "../../base/macros.h"
-#include "../../base/optimization.h"
-#include "../../meta/type_traits.h"
-#include "../../types/bad_variant_access.h"
-#include "../../utility/utility.h"
-
-#if !defined(OTABSL_USES_STD_VARIANT)
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-template <class... Types>
-class variant;
-
-OTABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, -1);
-
-template <class T>
-struct variant_size;
-
-template <std::size_t I, class T>
-struct variant_alternative;
-
-namespace variant_internal {
-
-// NOTE: See specializations below for details.
-template <std::size_t I, class T>
-struct VariantAlternativeSfinae {};
-
-// Requires: I < variant_size_v<T>.
-//
-// Value: The Ith type of Types...
-template <std::size_t I, class T0, class... Tn>
-struct VariantAlternativeSfinae<I, variant<T0, Tn...>>
-    : VariantAlternativeSfinae<I - 1, variant<Tn...>> {};
-
-// Value: T0
-template <class T0, class... Ts>
-struct VariantAlternativeSfinae<0, variant<T0, Ts...>> {
-  using type = T0;
-};
-
-template <std::size_t I, class T>
-using VariantAlternativeSfinaeT = typename VariantAlternativeSfinae<I, T>::type;
-
-// NOTE: Requires T to be a reference type.
-template <class T, class U>
-struct GiveQualsTo;
-
-template <class T, class U>
-struct GiveQualsTo<T&, U> {
-  using type = U&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<T&&, U> {
-  using type = U&&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<const T&, U> {
-  using type = const U&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<const T&&, U> {
-  using type = const U&&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<volatile T&, U> {
-  using type = volatile U&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<volatile T&&, U> {
-  using type = volatile U&&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<volatile const T&, U> {
-  using type = volatile const U&;
-};
-
-template <class T, class U>
-struct GiveQualsTo<volatile const T&&, U> {
-  using type = volatile const U&&;
-};
-
-template <class T, class U>
-using GiveQualsToT = typename GiveQualsTo<T, U>::type;
-
-// Convenience alias, since size_t integral_constant is used a lot in this file.
-template <std::size_t I>
-using SizeT = std::integral_constant<std::size_t, I>;
-
-using NPos = SizeT<variant_npos>;
-
-template <class Variant, class T, class = void>
-struct IndexOfConstructedType {};
-
-template <std::size_t I, class Variant>
-struct VariantAccessResultImpl;
-
-template <std::size_t I, template <class...> class Variantemplate, class... T>
-struct VariantAccessResultImpl<I, Variantemplate<T...>&> {
-  using type = typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type&;
-};
-
-template <std::size_t I, template <class...> class Variantemplate, class... T>
-struct VariantAccessResultImpl<I, const Variantemplate<T...>&> {
-  using type =
-      const typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type&;
-};
-
-template <std::size_t I, template <class...> class Variantemplate, class... T>
-struct VariantAccessResultImpl<I, Variantemplate<T...>&&> {
-  using type = typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type&&;
-};
-
-template <std::size_t I, template <class...> class Variantemplate, class... T>
-struct VariantAccessResultImpl<I, const Variantemplate<T...>&&> {
-  using type =
-      const typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type&&;
-};
-
-template <std::size_t I, class Variant>
-using VariantAccessResult =
-    typename VariantAccessResultImpl<I, Variant&&>::type;
-
-// NOTE: This is used instead of std::array to reduce instantiation overhead.
-template <class T, std::size_t Size>
-struct SimpleArray {
-  static_assert(Size != 0, "");
-  T value[Size];
-};
-
-template <class T>
-struct AccessedType {
-  using type = T;
-};
-
-template <class T>
-using AccessedTypeT = typename AccessedType<T>::type;
-
-template <class T, std::size_t Size>
-struct AccessedType<SimpleArray<T, Size>> {
-  using type = AccessedTypeT<T>;
-};
-
-template <class T>
-constexpr T AccessSimpleArray(const T& value) {
-  return value;
-}
-
-template <class T, std::size_t Size, class... SizeT>
-constexpr AccessedTypeT<T> AccessSimpleArray(const SimpleArray<T, Size>& table,
-                                             std::size_t head_index,
-                                             SizeT... tail_indices) {
-  return AccessSimpleArray(table.value[head_index], tail_indices...);
-}
-
-// Note: Intentionally is an alias.
-template <class T>
-using AlwaysZero = SizeT<0>;
-
-template <class Op, class... Vs>
-struct VisitIndicesResultImpl {
-  using type = absl::OTABSL_OPTION_NAMESPACE_NAME::result_of_t<Op(AlwaysZero<Vs>...)>;
-};
-
-template <class Op, class... Vs>
-using VisitIndicesResultT = typename VisitIndicesResultImpl<Op, Vs...>::type;
-
-template <class ReturnType, class FunctionObject, class EndIndices,
-          class BoundIndices>
-struct MakeVisitationMatrix;
-
-template <class ReturnType, class FunctionObject, std::size_t... Indices>
-constexpr ReturnType call_with_indices(FunctionObject&& function) {
-  static_assert(
-      std::is_same<ReturnType, decltype(std::declval<FunctionObject>()(
-                                   SizeT<Indices>()...))>::value,
-      "Not all visitation overloads have the same return type.");
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::forward<FunctionObject>(function)(SizeT<Indices>()...);
-}
-
-template <class ReturnType, class FunctionObject, std::size_t... BoundIndices>
-struct MakeVisitationMatrix<ReturnType, FunctionObject, index_sequence<>,
-                            index_sequence<BoundIndices...>> {
-  using ResultType = ReturnType (*)(FunctionObject&&);
-  // cppcheck-suppress [duplInheritedMember]
-  static constexpr ResultType Run() {
-    return &call_with_indices<ReturnType, FunctionObject,
-                              (BoundIndices - 1)...>;
-  }
-};
-
-template <typename Is, std::size_t J>
-struct AppendToIndexSequence;
-
-template <typename Is, std::size_t J>
-using AppendToIndexSequenceT = typename AppendToIndexSequence<Is, J>::type;
-
-template <std::size_t... Is, std::size_t J>
-struct AppendToIndexSequence<index_sequence<Is...>, J> {
-  using type = index_sequence<Is..., J>;
-};
-
-template <class ReturnType, class FunctionObject, class EndIndices,
-          class CurrIndices, class BoundIndices>
-struct MakeVisitationMatrixImpl;
-
-template <class ReturnType, class FunctionObject, class EndIndices,
-          std::size_t... CurrIndices, class BoundIndices>
-struct MakeVisitationMatrixImpl<ReturnType, FunctionObject, EndIndices,
-                                index_sequence<CurrIndices...>, BoundIndices> {
-  using ResultType = SimpleArray<
-      typename MakeVisitationMatrix<ReturnType, FunctionObject, EndIndices,
-                                    index_sequence<>>::ResultType,
-      sizeof...(CurrIndices)>;
-
-  static constexpr ResultType Run() {
-    return {{MakeVisitationMatrix<
-        ReturnType, FunctionObject, EndIndices,
-        AppendToIndexSequenceT<BoundIndices, CurrIndices>>::Run()...}};
-  }
-};
-
-template <class ReturnType, class FunctionObject, std::size_t HeadEndIndex,
-          std::size_t... TailEndIndices, std::size_t... BoundIndices>
-struct MakeVisitationMatrix<ReturnType, FunctionObject,
-                            index_sequence<HeadEndIndex, TailEndIndices...>,
-                            index_sequence<BoundIndices...>>
-    : MakeVisitationMatrixImpl<ReturnType, FunctionObject,
-                               index_sequence<TailEndIndices...>,
-                               absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<HeadEndIndex>,
-                               index_sequence<BoundIndices...>> {};
-
-struct UnreachableSwitchCase {
-  template <class Op>
-  [[noreturn]] static VisitIndicesResultT<Op, std::size_t> Run(
-      Op&& /*ignored*/) {
-#if OTABSL_HAVE_BUILTIN(__builtin_unreachable) || \
-    (defined(__GNUC__) && !defined(__clang__))
-    __builtin_unreachable();
-#elif defined(_MSC_VER)
-    __assume(false);
-#else
-    // Try to use assert of false being identified as an unreachable intrinsic.
-    // NOTE: We use assert directly to increase chances of exploiting an assume
-    //       intrinsic.
-    assert(false);  // NOLINT
-
-    // Hack to silence potential no return warning -- cause an infinite loop.
-    return Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-#endif  // Checks for __builtin_unreachable
-  }
-};
-
-template <class Op, std::size_t I>
-struct ReachableSwitchCase {
-  static VisitIndicesResultT<Op, std::size_t> Run(Op&& op) {
-    return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op), SizeT<I>());
-  }
-};
-
-// The number 33 is just a guess at a reasonable maximum to our switch. It is
-// not based on any analysis. The reason it is a power of 2 plus 1 instead of a
-// power of 2 is because the number was picked to correspond to a power of 2
-// amount of "normal" alternatives, plus one for the possibility of the user
-// providing "monostate" in addition to the more natural alternatives.
-OTABSL_INTERNAL_INLINE_CONSTEXPR(std::size_t, MaxUnrolledVisitCases, 33);
-
-// Note: The default-definition is for unreachable cases.
-template <bool IsReachable>
-struct PickCaseImpl {
-  template <class Op, std::size_t I>
-  using Apply = UnreachableSwitchCase;
-};
-
-template <>
-struct PickCaseImpl</*IsReachable =*/true> {
-  template <class Op, std::size_t I>
-  using Apply = ReachableSwitchCase<Op, I>;
-};
-
-// Note: This form of dance with template aliases is to make sure that we
-//       instantiate a number of templates proportional to the number of variant
-//       alternatives rather than a number of templates proportional to our
-//       maximum unrolled amount of visitation cases (aliases are effectively
-//       "free" whereas other template instantiations are costly).
-template <class Op, std::size_t I, std::size_t EndIndex>
-using PickCase = typename PickCaseImpl<(I < EndIndex)>::template Apply<Op, I>;
-
-template <class ReturnType>
-[[noreturn]] ReturnType TypedThrowBadVariantAccess() {
-  absl::OTABSL_OPTION_NAMESPACE_NAME::variant_internal::ThrowBadVariantAccess();
-}
-
-// Given N variant sizes, determine the number of cases there would need to be
-// in a single switch-statement that would cover every possibility in the
-// corresponding N-ary visit operation.
-template <std::size_t... NumAlternatives>
-struct NumCasesOfSwitch;
-
-template <std::size_t HeadNumAlternatives, std::size_t... TailNumAlternatives>
-struct NumCasesOfSwitch<HeadNumAlternatives, TailNumAlternatives...> {
-  static constexpr std::size_t value =
-      (HeadNumAlternatives + 1) *
-      NumCasesOfSwitch<TailNumAlternatives...>::value;
-};
-
-template <>
-struct NumCasesOfSwitch<> {
-  static constexpr std::size_t value = 1;
-};
-
-// A switch statement optimizes better than the table of function pointers.
-template <std::size_t EndIndex>
-struct VisitIndicesSwitch {
-  static_assert(EndIndex <= MaxUnrolledVisitCases,
-                "Maximum unrolled switch size exceeded.");
-
-  template <class Op>
-  static VisitIndicesResultT<Op, std::size_t> Run(Op&& op, std::size_t i) {
-    switch (i) {
-      case 0:
-        return PickCase<Op, 0, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 1:
-        return PickCase<Op, 1, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 2:
-        return PickCase<Op, 2, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 3:
-        return PickCase<Op, 3, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 4:
-        return PickCase<Op, 4, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 5:
-        return PickCase<Op, 5, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 6:
-        return PickCase<Op, 6, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 7:
-        return PickCase<Op, 7, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 8:
-        return PickCase<Op, 8, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 9:
-        return PickCase<Op, 9, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 10:
-        return PickCase<Op, 10, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 11:
-        return PickCase<Op, 11, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 12:
-        return PickCase<Op, 12, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 13:
-        return PickCase<Op, 13, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 14:
-        return PickCase<Op, 14, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 15:
-        return PickCase<Op, 15, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 16:
-        return PickCase<Op, 16, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 17:
-        return PickCase<Op, 17, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 18:
-        return PickCase<Op, 18, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 19:
-        return PickCase<Op, 19, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 20:
-        return PickCase<Op, 20, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 21:
-        return PickCase<Op, 21, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 22:
-        return PickCase<Op, 22, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 23:
-        return PickCase<Op, 23, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 24:
-        return PickCase<Op, 24, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 25:
-        return PickCase<Op, 25, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 26:
-        return PickCase<Op, 26, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 27:
-        return PickCase<Op, 27, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 28:
-        return PickCase<Op, 28, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 29:
-        return PickCase<Op, 29, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 30:
-        return PickCase<Op, 30, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 31:
-        return PickCase<Op, 31, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      case 32:
-        return PickCase<Op, 32, EndIndex>::Run(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-      default:
-        OTABSL_ASSERT(i == variant_npos);
-        return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op), NPos());
-    }
-  }
-};
-
-template <std::size_t... EndIndices>
-struct VisitIndicesFallback {
-  template <class Op, class... SizeT>
-  static VisitIndicesResultT<Op, SizeT...> Run(Op&& op, SizeT... indices) {
-    return AccessSimpleArray(
-        MakeVisitationMatrix<VisitIndicesResultT<Op, SizeT...>, Op,
-                             index_sequence<(EndIndices + 1)...>,
-                             index_sequence<>>::Run(),
-        (indices + 1)...)(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op));
-  }
-};
-
-// Take an N-dimensional series of indices and convert them into a single index
-// without loss of information. The purpose of this is to be able to convert an
-// N-ary visit operation into a single switch statement.
-template <std::size_t...>
-struct FlattenIndices;
-
-template <std::size_t HeadSize, std::size_t... TailSize>
-struct FlattenIndices<HeadSize, TailSize...> {
-  template<class... SizeType>
-  static constexpr std::size_t Run(std::size_t head, SizeType... tail) {
-    return head + HeadSize * FlattenIndices<TailSize...>::Run(tail...);
-  }
-};
-
-template <>
-struct FlattenIndices<> {
-  static constexpr std::size_t Run() { return 0; }
-};
-
-// Take a single "flattened" index (flattened by FlattenIndices) and determine
-// the value of the index of one of the logically represented dimensions.
-template <std::size_t I, std::size_t IndexToGet, std::size_t HeadSize,
-          std::size_t... TailSize>
-struct UnflattenIndex {
-  static constexpr std::size_t value =
-      UnflattenIndex<I / HeadSize, IndexToGet - 1, TailSize...>::value;
-};
-
-template <std::size_t I, std::size_t HeadSize, std::size_t... TailSize>
-struct UnflattenIndex<I, 0, HeadSize, TailSize...> {
-  static constexpr std::size_t value = (I % HeadSize);
-};
-
-// The backend for converting an N-ary visit operation into a unary visit.
-template <class IndexSequence, std::size_t... EndIndices>
-struct VisitIndicesVariadicImpl;
-
-template <std::size_t... N, std::size_t... EndIndices>
-struct VisitIndicesVariadicImpl<absl::OTABSL_OPTION_NAMESPACE_NAME::index_sequence<N...>, EndIndices...> {
-  // A type that can take an N-ary function object and converts it to a unary
-  // function object that takes a single, flattened index, and "unflattens" it
-  // into its individual dimensions when forwarding to the wrapped object.
-  template <class Op>
-  struct FlattenedOp {
-    template <std::size_t I>
-    VisitIndicesResultT<Op, decltype(EndIndices)...> operator()(
-        SizeT<I> /*index*/) && {
-      return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(
-          absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op),
-          SizeT<UnflattenIndex<I, N, (EndIndices + 1)...>::value -
-                std::size_t{1}>()...);
-    }
-
-    Op&& op;
-  };
-
-  template <class Op, class... SizeType>
-  static VisitIndicesResultT<Op, decltype(EndIndices)...> Run(
-      Op&& op, SizeType... i) {
-    return VisitIndicesSwitch<NumCasesOfSwitch<EndIndices...>::value>::Run(
-        FlattenedOp<Op>{absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op)},
-        FlattenIndices<(EndIndices + std::size_t{1})...>::Run(
-            (i + std::size_t{1})...));
-  }
-};
-
-template <std::size_t... EndIndices>
-struct VisitIndicesVariadic
-    : VisitIndicesVariadicImpl<absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<sizeof...(EndIndices)>,
-                               EndIndices...> {};
-
-// This implementation will flatten N-ary visit operations into a single switch
-// statement when the number of cases would be less than our maximum specified
-// switch-statement size.
-// TODO(calabrese)
-//   Based on benchmarks, determine whether the function table approach actually
-//   does optimize better than a chain of switch statements and possibly update
-//   the implementation accordingly. Also consider increasing the maximum switch
-//   size.
-template <std::size_t... EndIndices>
-struct VisitIndices
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<(NumCasesOfSwitch<EndIndices...>::value <=
-                           MaxUnrolledVisitCases),
-                          VisitIndicesVariadic<EndIndices...>,
-                          VisitIndicesFallback<EndIndices...>> {};
-
-template <std::size_t EndIndex>
-struct VisitIndices<EndIndex>
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<(EndIndex <= MaxUnrolledVisitCases),
-                          VisitIndicesSwitch<EndIndex>,
-                          VisitIndicesFallback<EndIndex>> {};
-
-// Suppress bogus warning on MSVC: MSVC complains that the `reinterpret_cast`
-// below is returning the address of a temporary or local object.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4172)
-#endif  // _MSC_VER
-
-// TODO(calabrese) std::launder
-// TODO(calabrese) constexpr
-// NOTE: DO NOT REMOVE the `inline` keyword as it is necessary to work around a
-// MSVC bug. See https://github.com/abseil/abseil-cpp/issues/129 for details.
-template <class Self, std::size_t I>
-inline VariantAccessResult<I, Self> AccessUnion(Self&& self, SizeT<I> /*i*/) {
-  return reinterpret_cast<VariantAccessResult<I, Self>>(self);
-}
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif  // _MSC_VER
-
-template <class T>
-void DeducedDestroy(T& self) {  // NOLINT
-  self.~T();
-}
-
-// NOTE: This type exists as a single entity for variant and its bases to
-// befriend. It contains helper functionality that manipulates the state of the
-// variant, such as the implementation of things like assignment and emplace
-// operations.
-struct VariantCoreAccess {
-  template <class VariantType>
-  static typename VariantType::Variant& Derived(VariantType& self) {  // NOLINT
-    return static_cast<typename VariantType::Variant&>(self);
-  }
-
-  template <class VariantType>
-  static const typename VariantType::Variant& Derived(
-      const VariantType& self) {  // NOLINT
-    return static_cast<const typename VariantType::Variant&>(self);
-  }
-
-  template <class VariantType>
-  static void Destroy(VariantType& self) {  // NOLINT
-    Derived(self).destroy();
-    self.index_ = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos;
-  }
-
-  template <class Variant>
-  static void SetIndex(Variant& self, std::size_t i) {  // NOLINT
-    self.index_ = i;
-  }
-
-  template <class Variant>
-  static void InitFrom(Variant& self, Variant&& other) {  // NOLINT
-    VisitIndices<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size<Variant>::value>::Run(
-        InitFromVisitor<Variant, Variant&&>{&self,
-                                            std::forward<Variant>(other)},
-        other.index());
-    self.index_ = other.index();
-  }
-
-  // Access a variant alternative, assuming the index is correct.
-  template <std::size_t I, class Variant>
-  static VariantAccessResult<I, Variant> Access(Variant&& self) {
-    // This cast instead of invocation of AccessUnion with an rvalue is a
-    // workaround for msvc. Without this there is a runtime failure when dealing
-    // with rvalues.
-    // TODO(calabrese) Reduce test case and find a simpler workaround.
-    return static_cast<VariantAccessResult<I, Variant>>(
-        variant_internal::AccessUnion(self.state_, SizeT<I>()));
-  }
-
-  // Access a variant alternative, throwing if the index is incorrect.
-  template <std::size_t I, class Variant>
-  static VariantAccessResult<I, Variant> CheckedAccess(Variant&& self) {
-    if (OTABSL_PREDICT_FALSE(self.index_ != I)) {
-      TypedThrowBadVariantAccess<VariantAccessResult<I, Variant>>();
-    }
-
-    return Access<I>(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Variant>(self));
-  }
-
-  // The implementation of the move-assignment operation for a variant.
-  template <class VType>
-  struct MoveAssignVisitor {
-    using DerivedType = typename VType::Variant;
-    template <std::size_t NewIndex>
-    void operator()(SizeT<NewIndex> /*new_i*/) const {
-      if (left->index_ == NewIndex) {
-        Access<NewIndex>(*left) = std::move(Access<NewIndex>(*right));
-      } else {
-        Derived(*left).template emplace<NewIndex>(
-            std::move(Access<NewIndex>(*right)));
-      }
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*new_i*/) const {
-      Destroy(*left);
-    }
-
-    VType* left;
-    VType* right;
-  };
-
-  template <class VType>
-  static MoveAssignVisitor<VType> MakeMoveAssignVisitor(VType* left,
-                                                        VType* other) {
-    return {left, other};
-  }
-
-  // The implementation of the assignment operation for a variant.
-  template <class VType>
-  struct CopyAssignVisitor {
-    using DerivedType = typename VType::Variant;
-    template <std::size_t NewIndex>
-    void operator()(SizeT<NewIndex> /*new_i*/) const {
-      using New =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex, DerivedType>::type;
-
-      if (left->index_ == NewIndex) {
-        Access<NewIndex>(*left) = Access<NewIndex>(*right);
-      } else if (std::is_nothrow_copy_constructible<New>::value ||
-                 !std::is_nothrow_move_constructible<New>::value) {
-        Derived(*left).template emplace<NewIndex>(Access<NewIndex>(*right));
-      } else {
-        Derived(*left) = DerivedType(Derived(*right));
-      }
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*new_i*/) const {
-      Destroy(*left);
-    }
-
-    VType* left;
-    const VType* right;
-  };
-
-  template <class VType>
-  static CopyAssignVisitor<VType> MakeCopyAssignVisitor(VType* left,
-                                                        const VType& other) {
-    return {left, &other};
-  }
-
-  // The implementation of conversion-assignment operations for variant.
-  template <class Left, class QualifiedNew>
-  struct ConversionAssignVisitor {
-    using NewIndex =
-        variant_internal::IndexOfConstructedType<Left, QualifiedNew>;
-
-    void operator()(SizeT<NewIndex::value> /*old_i*/
-                    ) const {
-      Access<NewIndex::value>(*left) = absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedNew>(other);
-    }
-
-    template <std::size_t OldIndex>
-    void operator()(SizeT<OldIndex> /*old_i*/
-                    ) const {
-      using New =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex::value, Left>::type;
-      if (std::is_nothrow_constructible<New, QualifiedNew>::value ||
-          !std::is_nothrow_move_constructible<New>::value) {
-        left->template emplace<NewIndex::value>(
-            absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedNew>(other));
-      } else {
-        // the standard says "equivalent to
-        // operator=(variant(std::forward<T>(t)))", but we use `emplace` here
-        // because the variant's move assignment operator could be deleted.
-        left->template emplace<NewIndex::value>(
-            New(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedNew>(other)));
-      }
-    }
-
-    Left* left;
-    QualifiedNew&& other;
-  };
-
-  template <class Left, class QualifiedNew>
-  static ConversionAssignVisitor<Left, QualifiedNew>
-  MakeConversionAssignVisitor(Left* left, QualifiedNew&& qual) {
-    return {left, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedNew>(qual)};
-  }
-
-  // Backend for operations for `emplace()` which destructs `*self` then
-  // construct a new alternative with `Args...`.
-  template <std::size_t NewIndex, class Self, class... Args>
-  static typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex, Self>::type& Replace(
-      Self* self, Args&&... args) {
-    Destroy(*self);
-    using New = typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<NewIndex, Self>::type;
-    // cppcheck-suppress [legacyUninitvar]
-    New* const result = ::new (static_cast<void*>(&self->state_))
-        New(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-    self->index_ = NewIndex;
-    return *result;
-  }
-
-  template <class LeftVariant, class QualifiedRightVariant>
-  struct InitFromVisitor {
-    template <std::size_t NewIndex>
-    void operator()(SizeT<NewIndex> /*new_i*/) const {
-      using Alternative =
-          typename variant_alternative<NewIndex, LeftVariant>::type;
-      ::new (static_cast<void*>(&left->state_)) Alternative(
-          Access<NewIndex>(std::forward<QualifiedRightVariant>(right)));
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*new_i*/) const {
-      // This space intentionally left blank.
-    }
-    LeftVariant* left;
-    QualifiedRightVariant&& right;
-  };
-};
-
-template <class Expected, class... T>
-struct IndexOfImpl;
-
-template <class Expected>
-struct IndexOfImpl<Expected> {
-  using IndexFromEnd = SizeT<0>;
-  using MatchedIndexFromEnd = IndexFromEnd;
-  using MultipleMatches = std::false_type;
-};
-
-template <class Expected, class Head, class... Tail>
-struct IndexOfImpl<Expected, Head, Tail...> : IndexOfImpl<Expected, Tail...> {
-  using IndexFromEnd =
-      SizeT<IndexOfImpl<Expected, Tail...>::IndexFromEnd::value + 1>;
-};
-
-template <class Expected, class... Tail>
-struct IndexOfImpl<Expected, Expected, Tail...>
-    : IndexOfImpl<Expected, Tail...> {
-  using IndexFromEnd =
-      SizeT<IndexOfImpl<Expected, Tail...>::IndexFromEnd::value + 1>;
-  using MatchedIndexFromEnd = IndexFromEnd;
-  using MultipleMatches = std::integral_constant<
-      bool, IndexOfImpl<Expected, Tail...>::MatchedIndexFromEnd::value != 0>;
-};
-
-template <class Expected, class... Types>
-struct IndexOfMeta {
-  using Results = IndexOfImpl<Expected, Types...>;
-  static_assert(!Results::MultipleMatches::value,
-                "Attempted to access a variant by specifying a type that "
-                "matches more than one alternative.");
-  static_assert(Results::MatchedIndexFromEnd::value != 0,
-                "Attempted to access a variant by specifying a type that does "
-                "not match any alternative.");
-  using type = SizeT<sizeof...(Types) - Results::MatchedIndexFromEnd::value>;
-};
-
-template <class Expected, class... Types>
-using IndexOf = typename IndexOfMeta<Expected, Types...>::type;
-
-template <class Variant, class T, std::size_t CurrIndex>
-struct UnambiguousIndexOfImpl;
-
-// Terminating case encountered once we've checked all of the alternatives
-template <class T, std::size_t CurrIndex>
-struct UnambiguousIndexOfImpl<variant<>, T, CurrIndex> : SizeT<CurrIndex> {};
-
-// Case where T is not Head
-template <class Head, class... Tail, class T, std::size_t CurrIndex>
-struct UnambiguousIndexOfImpl<variant<Head, Tail...>, T, CurrIndex>
-    : UnambiguousIndexOfImpl<variant<Tail...>, T, CurrIndex + 1>::type {};
-
-// Case where T is Head
-template <class Head, class... Tail, std::size_t CurrIndex>
-struct UnambiguousIndexOfImpl<variant<Head, Tail...>, Head, CurrIndex>
-    : SizeT<UnambiguousIndexOfImpl<variant<Tail...>, Head, 0>::value ==
-                    sizeof...(Tail)
-                ? CurrIndex
-                : CurrIndex + sizeof...(Tail) + 1> {};
-
-template <class Variant, class T>
-struct UnambiguousIndexOf;
-
-struct NoMatch {
-  struct type {};
-};
-
-template <class... Alts, class T>
-struct UnambiguousIndexOf<variant<Alts...>, T>
-    : std::conditional<UnambiguousIndexOfImpl<variant<Alts...>, T, 0>::value !=
-                           sizeof...(Alts),
-                       UnambiguousIndexOfImpl<variant<Alts...>, T, 0>,
-                       NoMatch>::type::type {};
-
-template <class T, std::size_t /*Dummy*/>
-using UnambiguousTypeOfImpl = T;
-
-template <class Variant, class T>
-using UnambiguousTypeOfT =
-    UnambiguousTypeOfImpl<T, UnambiguousIndexOf<Variant, T>::value>;
-
-template <class H, class... T>
-class VariantStateBase;
-
-// This is an implementation of the "imaginary function" that is described in
-// [variant.ctor]
-// It is used in order to determine which alternative to construct during
-// initialization from some type T.
-template <class Variant, std::size_t I = 0>
-struct ImaginaryFun;
-
-template <std::size_t I>
-struct ImaginaryFun<variant<>, I> {
-  static void Run() = delete;
-};
-
-template <class H, class... T, std::size_t I>
-struct ImaginaryFun<variant<H, T...>, I> : ImaginaryFun<variant<T...>, I + 1> {
-  using ImaginaryFun<variant<T...>, I + 1>::Run;
-
-  // NOTE: const& and && are used instead of by-value due to lack of guaranteed
-  // move elision of C++17. This may have other minor differences, but tests
-  // pass.
-  static SizeT<I> Run(const H&, SizeT<I>);
-  static SizeT<I> Run(H&&, SizeT<I>);
-};
-
-// The following metafunctions are used in constructor and assignment
-// constraints.
-template <class Self, class T>
-struct IsNeitherSelfNorInPlace : std::true_type {};
-
-template <class Self>
-struct IsNeitherSelfNorInPlace<Self, Self> : std::false_type {};
-
-template <class Self, class T>
-struct IsNeitherSelfNorInPlace<Self, in_place_type_t<T>> : std::false_type {};
-
-template <class Self, std::size_t I>
-struct IsNeitherSelfNorInPlace<Self, in_place_index_t<I>> : std::false_type {};
-
-template <class Variant, class T, class = void>
-struct ConversionIsPossibleImpl : std::false_type {};
-
-template <class Variant, class T>
-struct ConversionIsPossibleImpl<
-    Variant, T,
-    void_t<decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {}))>>
-    : std::true_type {};
-
-template <class Variant, class T>
-struct ConversionIsPossible : ConversionIsPossibleImpl<Variant, T>::type {};
-
-template <class Variant, class T>
-struct IndexOfConstructedType<
-    Variant, T,
-    void_t<decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {}))>>
-    : decltype(ImaginaryFun<Variant>::Run(std::declval<T>(), {})) {};
-
-template <std::size_t... Is>
-struct ContainsVariantNPos
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::negation<std::is_same<  // NOLINT
-          absl::OTABSL_OPTION_NAMESPACE_NAME::integer_sequence<bool, 0 <= Is...>,
-          absl::OTABSL_OPTION_NAMESPACE_NAME::integer_sequence<bool, Is != absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos...>>> {};
-
-template <class Op, class... QualifiedVariants>
-using RawVisitResult =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::result_of_t<Op(VariantAccessResult<0, QualifiedVariants>...)>;
-
-// NOTE: The spec requires that all return-paths yield the same type and is not
-// SFINAE-friendly, so we can deduce the return type by examining the first
-// result. If it's not callable, then we get an error, but are compliant and
-// fast to compile.
-// TODO(calabrese) Possibly rewrite in a way that yields better compile errors
-// at the cost of longer compile-times.
-template <class Op, class... QualifiedVariants>
-struct VisitResultImpl {
-  using type =
-      absl::OTABSL_OPTION_NAMESPACE_NAME::result_of_t<Op(VariantAccessResult<0, QualifiedVariants>...)>;
-};
-
-// Done in two steps intentionally so that we don't cause substitution to fail.
-template <class Op, class... QualifiedVariants>
-using VisitResult = typename VisitResultImpl<Op, QualifiedVariants...>::type;
-
-template <class Op, class... QualifiedVariants>
-struct PerformVisitation {
-  using ReturnType = VisitResult<Op, QualifiedVariants...>;
-
-  template <std::size_t... Is>
-  constexpr ReturnType operator()(SizeT<Is>... indices) const {
-    return Run(typename ContainsVariantNPos<Is...>::type{},
-               absl::OTABSL_OPTION_NAMESPACE_NAME::index_sequence_for<QualifiedVariants...>(), indices...);
-  }
-
-  template <std::size_t... TupIs, std::size_t... Is>
-  constexpr ReturnType Run(std::false_type /*has_valueless*/,
-                           index_sequence<TupIs...>, SizeT<Is>...) const {
-    static_assert(
-        std::is_same<ReturnType,
-                     absl::OTABSL_OPTION_NAMESPACE_NAME::result_of_t<Op(VariantAccessResult<
-                                          Is, QualifiedVariants>...)>>::value,
-        "All visitation overloads must have the same return type.");
-    return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(
-        absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Op>(op),
-        VariantCoreAccess::Access<Is>(
-            absl::OTABSL_OPTION_NAMESPACE_NAME::forward<QualifiedVariants>(std::get<TupIs>(variant_tup)))...);
-  }
-
-  template <std::size_t... TupIs, std::size_t... Is>
-  [[noreturn]] ReturnType Run(std::true_type /*has_valueless*/,
-                              index_sequence<TupIs...>, SizeT<Is>...) const {
-    absl::OTABSL_OPTION_NAMESPACE_NAME::variant_internal::ThrowBadVariantAccess();
-  }
-
-  // TODO(calabrese) Avoid using a tuple, which causes lots of instantiations
-  // Attempts using lambda variadic captures fail on current GCC.
-  std::tuple<QualifiedVariants&&...> variant_tup;
-  Op&& op;
-};
-
-template <class... T>
-union Union;
-
-// We want to allow for variant<> to be trivial. For that, we need the default
-// constructor to be trivial, which means we can't define it ourselves.
-// Instead, we use a non-default constructor that takes NoopConstructorTag
-// that doesn't affect the triviality of the types.
-struct NoopConstructorTag {};
-
-template <std::size_t I>
-struct EmplaceTag {};
-
-template <>
-union Union<> {
-  constexpr explicit Union(NoopConstructorTag) noexcept {}
-};
-
-// Suppress bogus warning on MSVC: MSVC complains that Union<T...> has a defined
-// deleted destructor from the `std::is_destructible` check below.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4624)
-#endif  // _MSC_VER
-
-template <class Head, class... Tail>
-union Union<Head, Tail...> {
-  using TailUnion = Union<Tail...>;
-
-  explicit constexpr Union(NoopConstructorTag /*tag*/) noexcept
-      : tail(NoopConstructorTag()) {}
-
-  template <class... P>
-  explicit constexpr Union(EmplaceTag<0>, P&&... args)
-      : head(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...) {}
-
-  template <std::size_t I, class... P>
-  explicit constexpr Union(EmplaceTag<I>, P&&... args)
-      : tail(EmplaceTag<I - 1>{}, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...) {}
-
-  Head head;
-  TailUnion tail;
-};
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif  // _MSC_VER
-
-// TODO(calabrese) Just contain a Union in this union (certain configs fail).
-template <class... T>
-union DestructibleUnionImpl;
-
-template <>
-union DestructibleUnionImpl<> {
-  constexpr explicit DestructibleUnionImpl(NoopConstructorTag) noexcept {}
-};
-
-template <class Head, class... Tail>
-union DestructibleUnionImpl<Head, Tail...> {
-  using TailUnion = DestructibleUnionImpl<Tail...>;
-
-  explicit constexpr DestructibleUnionImpl(NoopConstructorTag /*tag*/) noexcept
-      : tail(NoopConstructorTag()) {}
-
-  template <class... P>
-  explicit constexpr DestructibleUnionImpl(EmplaceTag<0>, P&&... args)
-      : head(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...) {}
-
-  template <std::size_t I, class... P>
-  explicit constexpr DestructibleUnionImpl(EmplaceTag<I>, P&&... args)
-      : tail(EmplaceTag<I - 1>{}, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...) {}
-
-  ~DestructibleUnionImpl() {}
-
-  Head head;
-  TailUnion tail;
-};
-
-// This union type is destructible even if one or more T are not trivially
-// destructible. In the case that all T are trivially destructible, then so is
-// this resultant type.
-template <class... T>
-using DestructibleUnion =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<std::is_destructible<Union<T...>>::value, Union<T...>,
-                        DestructibleUnionImpl<T...>>;
-
-// Deepest base, containing the actual union and the discriminator
-template <class H, class... T>
-class VariantStateBase {
- protected:
-  using Variant = variant<H, T...>;
-
-  template <class LazyH = H,
-            class ConstructibleH = absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<
-                std::is_default_constructible<LazyH>::value, LazyH>>
-  constexpr VariantStateBase() noexcept(
-      std::is_nothrow_default_constructible<ConstructibleH>::value)
-      : state_(EmplaceTag<0>()), index_(0) {}
-
-  template <std::size_t I, class... P>
-  explicit constexpr VariantStateBase(EmplaceTag<I> tag, P&&... args)
-      : state_(tag, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<P>(args)...), index_(I) {}
-
-  explicit constexpr VariantStateBase(NoopConstructorTag)
-      : state_(NoopConstructorTag()), index_(variant_npos) {}
-
-  void destroy() {}  // Does nothing (shadowed in child if non-trivial)
-
-  DestructibleUnion<H, T...> state_;
-  std::size_t index_;
-};
-
-using absl::OTABSL_OPTION_NAMESPACE_NAME::internal::identity;
-
-// OverloadSet::Overload() is a unary function which is overloaded to
-// take any of the element types of the variant, by reference-to-const.
-// The return type of the overload on T is identity<T>, so that you
-// can statically determine which overload was called.
-//
-// Overload() is not defined, so it can only be called in unevaluated
-// contexts.
-template <typename... Ts>
-struct OverloadSet;
-
-template <typename T, typename... Ts>
-struct OverloadSet<T, Ts...> : OverloadSet<Ts...> {
-  using Base = OverloadSet<Ts...>;
-  static identity<T> Overload(const T&);
-  using Base::Overload;
-};
-
-template <>
-struct OverloadSet<> {
-  // For any case not handled above.
-  static void Overload(...);
-};
-
-template <class T>
-using LessThanResult = decltype(std::declval<T>() < std::declval<T>());
-
-template <class T>
-using GreaterThanResult = decltype(std::declval<T>() > std::declval<T>());
-
-template <class T>
-using LessThanOrEqualResult = decltype(std::declval<T>() <= std::declval<T>());
-
-template <class T>
-using GreaterThanOrEqualResult =
-    decltype(std::declval<T>() >= std::declval<T>());
-
-template <class T>
-using EqualResult = decltype(std::declval<T>() == std::declval<T>());
-
-template <class T>
-using NotEqualResult = decltype(std::declval<T>() != std::declval<T>());
-
-using type_traits_internal::is_detected_convertible;
-
-template <class... T>
-using RequireAllHaveEqualT = absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<bool, EqualResult, T>...>::value,
-    bool>;
-
-template <class... T>
-using RequireAllHaveNotEqualT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, NotEqualResult, T>...>::value,
-                      bool>;
-
-template <class... T>
-using RequireAllHaveLessThanT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, LessThanResult, T>...>::value,
-                      bool>;
-
-template <class... T>
-using RequireAllHaveLessThanOrEqualT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, LessThanOrEqualResult, T>...>::value,
-                      bool>;
-
-template <class... T>
-using RequireAllHaveGreaterThanOrEqualT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, GreaterThanOrEqualResult, T>...>::value,
-                      bool>;
-
-template <class... T>
-using RequireAllHaveGreaterThanT =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<is_detected_convertible<
-                          bool, GreaterThanResult, T>...>::value,
-                      bool>;
-
-// Helper template containing implementations details of variant that can't go
-// in the private section. For convenience, this takes the variant type as a
-// single template parameter.
-template <typename T>
-struct VariantHelper;
-
-template <typename... Ts>
-struct VariantHelper<variant<Ts...>> {
-  // Type metafunction which returns the element type selected if
-  // OverloadSet::Overload() is well-formed when called with argument type U.
-  template <typename U>
-  using BestMatch = decltype(
-      variant_internal::OverloadSet<Ts...>::Overload(std::declval<U>()));
-
-  // Type metafunction which returns true if OverloadSet::Overload() is
-  // well-formed when called with argument type U.
-  // CanAccept can't be just an alias because there is a MSVC bug on parameter
-  // pack expansion involving decltype.
-  template <typename U>
-  struct CanAccept :
-      std::integral_constant<bool, !std::is_void<BestMatch<U>>::value> {};
-
-  // Type metafunction which returns true if Other is an instantiation of
-  // variant, and variants's converting constructor from Other will be
-  // well-formed. We will use this to remove constructors that would be
-  // ill-formed from the overload set.
-  template <typename Other>
-  struct CanConvertFrom;
-
-  template <typename... Us>
-  struct CanConvertFrom<variant<Us...>>
-      : public absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<CanAccept<Us>...> {};
-};
-
-// A type with nontrivial copy ctor and trivial move ctor.
-struct TrivialMoveOnly {
-  TrivialMoveOnly(TrivialMoveOnly&&) = default;
-};
-
-// Trait class to detect whether a type is trivially move constructible.
-// A union's defaulted copy/move constructor is deleted if any variant member's
-// copy/move constructor is nontrivial.
-template <typename T>
-struct IsTriviallyMoveConstructible:
-  std::is_move_constructible<Union<T, TrivialMoveOnly>> {};
-
-// To guarantee triviality of all special-member functions that can be trivial,
-// we use a chain of conditional bases for each one.
-// The order of inheritance of bases from child to base are logically:
-//
-// variant
-// VariantCopyAssignBase
-// VariantMoveAssignBase
-// VariantCopyBase
-// VariantMoveBase
-// VariantStateBaseDestructor
-// VariantStateBase
-//
-// Note that there is a separate branch at each base that is dependent on
-// whether or not that corresponding special-member-function can be trivial in
-// the resultant variant type.
-
-template <class... T>
-class VariantStateBaseDestructorNontrivial;
-
-template <class... T>
-class VariantMoveBaseNontrivial;
-
-template <class... T>
-class VariantCopyBaseNontrivial;
-
-template <class... T>
-class VariantMoveAssignBaseNontrivial;
-
-template <class... T>
-class VariantCopyAssignBaseNontrivial;
-
-// Base that is dependent on whether or not the destructor can be trivial.
-template <class... T>
-using VariantStateBaseDestructor =
-    absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<std::is_destructible<Union<T...>>::value,
-                        VariantStateBase<T...>,
-                        VariantStateBaseDestructorNontrivial<T...>>;
-
-// Base that is dependent on whether or not the move-constructor can be
-// implicitly generated by the compiler (trivial or deleted).
-// Previously we were using `std::is_move_constructible<Union<T...>>` to check
-// whether all Ts have trivial move constructor, but it ran into a GCC bug:
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84866
-// So we have to use a different approach (i.e. `HasTrivialMoveConstructor`) to
-// work around the bug.
-template <class... T>
-using VariantMoveBase = absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::disjunction<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::negation<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_move_constructible<T>...>>,
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<IsTriviallyMoveConstructible<T>...>>::value,
-    VariantStateBaseDestructor<T...>, VariantMoveBaseNontrivial<T...>>;
-
-// Base that is dependent on whether or not the copy-constructor can be trivial.
-template <class... T>
-using VariantCopyBase = absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::disjunction<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::negation<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_copy_constructible<T>...>>,
-        std::is_copy_constructible<Union<T...>>>::value,
-    VariantMoveBase<T...>, VariantCopyBaseNontrivial<T...>>;
-
-// Base that is dependent on whether or not the move-assign can be trivial.
-template <class... T>
-using VariantMoveAssignBase = absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::disjunction<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<absl::OTABSL_OPTION_NAMESPACE_NAME::is_move_assignable<Union<T...>>,
-                          std::is_move_constructible<Union<T...>>,
-                          std::is_destructible<Union<T...>>>,
-        absl::OTABSL_OPTION_NAMESPACE_NAME::negation<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_move_constructible<T>...,
-                                         // Note: We're not qualifying this with
-                                         // absl::OTABSL_OPTION_NAMESPACE_NAME:: because it doesn't compile
-                                         // under MSVC.
-                                         is_move_assignable<T>...>>>::value,
-    VariantCopyBase<T...>, VariantMoveAssignBaseNontrivial<T...>>;
-
-// Base that is dependent on whether or not the copy-assign can be trivial.
-template <class... T>
-using VariantCopyAssignBase = absl::OTABSL_OPTION_NAMESPACE_NAME::conditional_t<
-    absl::OTABSL_OPTION_NAMESPACE_NAME::disjunction<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<absl::OTABSL_OPTION_NAMESPACE_NAME::is_copy_assignable<Union<T...>>,
-                          std::is_copy_constructible<Union<T...>>,
-                          std::is_destructible<Union<T...>>>,
-        absl::OTABSL_OPTION_NAMESPACE_NAME::negation<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_copy_constructible<T>...,
-                                         // Note: We're not qualifying this with
-                                         // absl::OTABSL_OPTION_NAMESPACE_NAME:: because it doesn't compile
-                                         // under MSVC.
-                                         is_copy_assignable<T>...>>>::value,
-    VariantMoveAssignBase<T...>, VariantCopyAssignBaseNontrivial<T...>>;
-
-template <class... T>
-using VariantBase = VariantCopyAssignBase<T...>;
-
-template <class... T>
-class VariantStateBaseDestructorNontrivial : protected VariantStateBase<T...> {
- private:
-  using Base = VariantStateBase<T...>;
-
- protected:
-  using Base::Base;
-
-  VariantStateBaseDestructorNontrivial() = default;
-  VariantStateBaseDestructorNontrivial(VariantStateBaseDestructorNontrivial&&) =
-      default;
-  VariantStateBaseDestructorNontrivial(
-      const VariantStateBaseDestructorNontrivial&) = default;
-  VariantStateBaseDestructorNontrivial& operator=(
-      VariantStateBaseDestructorNontrivial&&) = default;
-  VariantStateBaseDestructorNontrivial& operator=(
-      const VariantStateBaseDestructorNontrivial&) = default;
-
-  struct Destroyer {
-    template <std::size_t I>
-    void operator()(SizeT<I> i) const {
-      using Alternative =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type;
-      variant_internal::AccessUnion(self->state_, i).~Alternative();
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*i*/) const {
-      // This space intentionally left blank
-    }
-
-    VariantStateBaseDestructorNontrivial* self;
-  };
-
-  // cppcheck-suppress [duplInheritedMember]
-  void destroy() { VisitIndices<sizeof...(T)>::Run(Destroyer{this}, index_); }
-
-  ~VariantStateBaseDestructorNontrivial() { destroy(); }
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-template <class... T>
-class VariantMoveBaseNontrivial : protected VariantStateBaseDestructor<T...> {
- private:
-  using Base = VariantStateBaseDestructor<T...>;
-
- protected:
-  using Base::Base;
-
-  struct Construct {
-    template <std::size_t I>
-    void operator()(SizeT<I> i) const {
-      using Alternative =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type;
-      ::new (static_cast<void*>(&self->state_)) Alternative(
-          variant_internal::AccessUnion(absl::OTABSL_OPTION_NAMESPACE_NAME::move(other->state_), i));
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*i*/) const {}
-
-    VariantMoveBaseNontrivial* self;
-    VariantMoveBaseNontrivial* other;
-  };
-
-  VariantMoveBaseNontrivial() = default;
-  VariantMoveBaseNontrivial(VariantMoveBaseNontrivial&& other) noexcept(
-      absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_nothrow_move_constructible<T>...>::value)
-      : Base(NoopConstructorTag()) {
-    VisitIndices<sizeof...(T)>::Run(Construct{this, &other}, other.index_);
-    index_ = other.index_;
-  }
-
-  VariantMoveBaseNontrivial(VariantMoveBaseNontrivial const&) = default;
-
-  VariantMoveBaseNontrivial& operator=(VariantMoveBaseNontrivial&&) = default;
-  VariantMoveBaseNontrivial& operator=(VariantMoveBaseNontrivial const&) =
-      default;
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-template <class... T>
-class VariantCopyBaseNontrivial : protected VariantMoveBase<T...> {
- private:
-  using Base = VariantMoveBase<T...>;
-
- protected:
-  using Base::Base;
-
-  VariantCopyBaseNontrivial() = default;
-  VariantCopyBaseNontrivial(VariantCopyBaseNontrivial&&) = default;
-
-  struct Construct {
-    template <std::size_t I>
-    void operator()(SizeT<I> i) const {
-      using Alternative =
-          typename absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<I, variant<T...>>::type;
-      ::new (static_cast<void*>(&self->state_))
-          Alternative(variant_internal::AccessUnion(other->state_, i));
-    }
-
-    void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*i*/) const {}
-
-    VariantCopyBaseNontrivial* self;
-    const VariantCopyBaseNontrivial* other;
-  };
-
-  VariantCopyBaseNontrivial(VariantCopyBaseNontrivial const& other)
-      : Base(NoopConstructorTag()) {
-    VisitIndices<sizeof...(T)>::Run(Construct{this, &other}, other.index_);
-    index_ = other.index_;
-  }
-
-  VariantCopyBaseNontrivial& operator=(VariantCopyBaseNontrivial&&) = default;
-  VariantCopyBaseNontrivial& operator=(VariantCopyBaseNontrivial const&) =
-      default;
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-template <class... T>
-class VariantMoveAssignBaseNontrivial : protected VariantCopyBase<T...> {
-  friend struct VariantCoreAccess;
-
- private:
-  using Base = VariantCopyBase<T...>;
-
- protected:
-  using Base::Base;
-
-  VariantMoveAssignBaseNontrivial() = default;
-  VariantMoveAssignBaseNontrivial(VariantMoveAssignBaseNontrivial&&) = default;
-  VariantMoveAssignBaseNontrivial(const VariantMoveAssignBaseNontrivial&) =
-      default;
-  VariantMoveAssignBaseNontrivial& operator=(
-      VariantMoveAssignBaseNontrivial const&) = default;
-
-    VariantMoveAssignBaseNontrivial&
-    operator=(VariantMoveAssignBaseNontrivial&& other) noexcept(
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_nothrow_move_constructible<T>...,
-                          std::is_nothrow_move_assignable<T>...>::value) {
-      VisitIndices<sizeof...(T)>::Run(
-          VariantCoreAccess::MakeMoveAssignVisitor(this, &other), other.index_);
-      return *this;
-    }
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-template <class... T>
-class VariantCopyAssignBaseNontrivial : protected VariantMoveAssignBase<T...> {
-  friend struct VariantCoreAccess;
-
- private:
-  using Base = VariantMoveAssignBase<T...>;
-
- protected:
-  using Base::Base;
-
-  VariantCopyAssignBaseNontrivial() = default;
-  VariantCopyAssignBaseNontrivial(VariantCopyAssignBaseNontrivial&&) = default;
-  VariantCopyAssignBaseNontrivial(const VariantCopyAssignBaseNontrivial&) =
-      default;
-  VariantCopyAssignBaseNontrivial& operator=(
-      VariantCopyAssignBaseNontrivial&&) = default;
-
-    VariantCopyAssignBaseNontrivial& operator=(
-        const VariantCopyAssignBaseNontrivial& other) {
-      VisitIndices<sizeof...(T)>::Run(
-          VariantCoreAccess::MakeCopyAssignVisitor(this, other), other.index_);
-      return *this;
-    }
-
- protected:
-  using Base::index_;
-  using Base::state_;
-};
-
-////////////////////////////////////////
-// Visitors for Comparison Operations //
-////////////////////////////////////////
-
-template <class... Types>
-struct EqualsOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return true;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) == VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct NotEqualsOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return false;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) != VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct LessThanOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return false;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) < VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct GreaterThanOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return false;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) > VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct LessThanOrEqualsOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return true;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) <= VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-template <class... Types>
-struct GreaterThanOrEqualsOp {
-  const variant<Types...>* v;
-  const variant<Types...>* w;
-
-  constexpr bool operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*v_i*/) const {
-    return true;
-  }
-
-  template <std::size_t I>
-  constexpr bool operator()(SizeT<I> /*v_i*/) const {
-    return VariantCoreAccess::Access<I>(*v) >= VariantCoreAccess::Access<I>(*w);
-  }
-};
-
-// Precondition: v.index() == w.index();
-template <class... Types>
-struct SwapSameIndex {
-  variant<Types...>* v;
-  variant<Types...>* w;
-  template <std::size_t I>
-  void operator()(SizeT<I>) const {
-    type_traits_internal::Swap(VariantCoreAccess::Access<I>(*v),
-                               VariantCoreAccess::Access<I>(*w));
-  }
-
-  void operator()(SizeT<variant_npos>) const {}
-};
-
-// TODO(calabrese) do this from a different namespace for proper adl usage
-template <class... Types>
-struct Swap {
-  variant<Types...>* v;
-  variant<Types...>* w;
-
-  void generic_swap() const {
-    variant<Types...> tmp(std::move(*w));
-    VariantCoreAccess::Destroy(*w);
-    VariantCoreAccess::InitFrom(*w, std::move(*v));
-    VariantCoreAccess::Destroy(*v);
-    VariantCoreAccess::InitFrom(*v, std::move(tmp));
-  }
-
-  void operator()(SizeT<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos> /*w_i*/) const {
-    if (!v->valueless_by_exception()) {
-      generic_swap();
-    }
-  }
-
-  template <std::size_t Wi>
-  void operator()(SizeT<Wi> /*w_i*/) {
-    if (v->index() == Wi) {
-      VisitIndices<sizeof...(Types)>::Run(SwapSameIndex<Types...>{v, w}, Wi);
-    } else {
-      generic_swap();
-    }
-  }
-};
-
-template <typename Variant, typename = void, typename... Ts>
-struct VariantHashBase {
-  VariantHashBase() = delete;
-  VariantHashBase(const VariantHashBase&) = delete;
-  VariantHashBase(VariantHashBase&&) = delete;
-  VariantHashBase& operator=(const VariantHashBase&) = delete;
-  VariantHashBase& operator=(VariantHashBase&&) = delete;
-};
-
-struct VariantHashVisitor {
-  template <typename T>
-  size_t operator()(const T& t) {
-    return std::hash<T>{}(t);
-  }
-};
-
-template <typename Variant, typename... Ts>
-struct VariantHashBase<Variant,
-                       absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<
-                           type_traits_internal::IsHashable<Ts>...>::value>,
-                       Ts...> {
-  using argument_type = Variant;
-  using result_type = size_t;
-  size_t operator()(const Variant& var) const {
-    type_traits_internal::AssertHashEnabled<Ts...>();
-    if (var.valueless_by_exception()) {
-      return 239799884;
-    }
-    size_t result = VisitIndices<variant_size<Variant>::value>::Run(
-        PerformVisitation<VariantHashVisitor, const Variant&>{
-            std::forward_as_tuple(var), VariantHashVisitor{}},
-        var.index());
-    // Combine the index and the hash result in order to distinguish
-    // std::variant<int, int> holding the same value as different alternative.
-    return result ^ var.index();
-  }
-};
-
-}  // namespace variant_internal
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // !defined(OTABSL_USES_STD_VARIANT)
-#endif  // OTABSL_TYPES_variant_internal_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/variant.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/variant.h
deleted file mode 100644
index cbce326c2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/types/variant.h
+++ /dev/null
@@ -1,866 +0,0 @@
-// Copyright 2018 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// variant.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` type for holding a type-safe
-// value of some prescribed set of types (noted as alternative types), and
-// associated functions for managing variants.
-//
-// The `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` type is a form of type-safe union. An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`
-// should always hold a value of one of its alternative types (except in the
-// "valueless by exception state" -- see below). A default-constructed
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` will hold the value of its first alternative type, provided
-// it is default-constructible.
-//
-// In exceptional cases due to error, an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` can hold no
-// value (known as a "valueless by exception" state), though this is not the
-// norm.
-//
-// As with `absl::OTABSL_OPTION_NAMESPACE_NAME::optional`, an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` -- when it holds a value --
-// allocates a value of that type directly within the `variant` itself; it
-// cannot hold a reference, array, or the type `void`; it can, however, hold a
-// pointer to externally managed memory.
-//
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` is a C++11 compatible version of the C++17 `std::variant`
-// abstraction and is designed to be a drop-in replacement for code compliant
-// with C++17.
-
-#ifndef OTABSL_TYPES_VARIANT_H_
-#define OTABSL_TYPES_VARIANT_H_
-
-#include "../base/config.h"
-#include "../utility/utility.h"
-
-#ifdef OTABSL_USES_STD_VARIANT
-
-#include <variant>  // IWYU pragma: export
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-using std::bad_variant_access;
-using std::get;
-using std::get_if;
-using std::holds_alternative;
-using std::monostate;
-using std::variant;
-using std::variant_alternative;
-using std::variant_alternative_t;
-using std::variant_npos;
-using std::variant_size;
-using std::variant_size_v;
-using std::visit;
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#else  // OTABSL_USES_STD_VARIANT
-
-#include <functional>
-#include <new>
-#include <type_traits>
-#include <utility>
-
-#include "../base/macros.h"
-#include "../base/port.h"
-#include "../meta/type_traits.h"
-#include "../types/internal/variant.h"
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-// -----------------------------------------------------------------------------
-// absl::OTABSL_OPTION_NAMESPACE_NAME::variant
-// -----------------------------------------------------------------------------
-//
-// An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` type is a form of type-safe union. An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` --
-// except in exceptional cases -- always holds a value of one of its alternative
-// types.
-//
-// Example:
-//
-//   // Construct a variant that holds either an integer or a std::string and
-//   // assign it to a std::string.
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string> v = std::string("abc");
-//
-//   // A default-constructed variant will hold a value-initialized value of
-//   // the first alternative type.
-//   auto a = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>();   // Holds an int of value '0'.
-//
-//   // variants are assignable.
-//
-//   // copy assignment
-//   auto v1 = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>("abc");
-//   auto v2 = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>(10);
-//   v2 = v1;  // copy assign
-//
-//   // move assignment
-//   auto v1 = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>("abc");
-//   v1 = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>(10);
-//
-//   // assignment through type conversion
-//   a = 128;         // variant contains int
-//   a = "128";       // variant contains std::string
-//
-// An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` holding a value of one of its alternative types `T` holds
-// an allocation of `T` directly within the variant itself. An `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`
-// is not allowed to allocate additional storage, such as dynamic memory, to
-// allocate the contained value. The contained value shall be allocated in a
-// region of the variant storage suitably aligned for all alternative types.
-template <typename... Ts>
-class variant;
-
-// swap()
-//
-// Swaps two `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` values. This function is equivalent to `v.swap(w)`
-// where `v` and `w` are `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` types.
-//
-// Note that this function requires all alternative types to be both swappable
-// and move-constructible, because any two variants may refer to either the same
-// type (in which case, they will be swapped) or to two different types (in
-// which case the values will need to be moved).
-//
-template <
-    typename... Ts,
-    absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<
-        absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_move_constructible<Ts>...,
-                          type_traits_internal::IsSwappable<Ts>...>::value,
-        int> = 0>
-void swap(variant<Ts...>& v, variant<Ts...>& w) noexcept(noexcept(v.swap(w))) {
-  v.swap(w);
-}
-
-// variant_size
-//
-// Returns the number of alternative types available for a given `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`
-// type as a compile-time constant expression. As this is a class template, it
-// is not generally useful for accessing the number of alternative types of
-// any given `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` instance.
-//
-// Example:
-//
-//   auto a = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>;
-//   constexpr int num_types =
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>>();
-//
-//   // You can also use the member constant `value`.
-//   constexpr int num_types =
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>>::value;
-//
-//   // `absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size` is more valuable for use in generic code:
-//   template <typename Variant>
-//   constexpr bool IsVariantMultivalue() {
-//       return absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size<Variant>() > 1;
-//   }
-//
-// Note that the set of cv-qualified specializations of `variant_size` are
-// provided to ensure that those specializations compile (especially when passed
-// within template logic).
-template <class T>
-struct variant_size;
-
-template <class... Ts>
-struct variant_size<variant<Ts...>>
-    : std::integral_constant<std::size_t, sizeof...(Ts)> {};
-
-// Specialization of `variant_size` for const qualified variants.
-template <class T>
-struct variant_size<const T> : variant_size<T>::type {};
-
-// Specialization of `variant_size` for volatile qualified variants.
-template <class T>
-struct variant_size<volatile T> : variant_size<T>::type {};
-
-// Specialization of `variant_size` for const volatile qualified variants.
-template <class T>
-struct variant_size<const volatile T> : variant_size<T>::type {};
-
-// variant_alternative
-//
-// Returns the alternative type for a given `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` at the passed
-// index value as a compile-time constant expression. As this is a class
-// template resulting in a type, it is not useful for access of the run-time
-// value of any given `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` variable.
-//
-// Example:
-//
-//   // The type of the 0th alternative is "int".
-//   using alternative_type_0
-//     = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative<0, absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>>::type;
-//
-//   static_assert(std::is_same<alternative_type_0, int>::value, "");
-//
-//   // `absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative` is more valuable for use in generic code:
-//   template <typename Variant>
-//   constexpr bool IsFirstElementTrivial() {
-//       return std::is_trivial_v<variant_alternative<0, Variant>::type>;
-//   }
-//
-// Note that the set of cv-qualified specializations of `variant_alternative`
-// are provided to ensure that those specializations compile (especially when
-// passed within template logic).
-template <std::size_t I, class T>
-struct variant_alternative;
-
-template <std::size_t I, class... Types>
-struct variant_alternative<I, variant<Types...>> {
-  using type =
-      variant_internal::VariantAlternativeSfinaeT<I, variant<Types...>>;
-};
-
-// Specialization of `variant_alternative` for const qualified variants.
-template <std::size_t I, class T>
-struct variant_alternative<I, const T> {
-  using type = const typename variant_alternative<I, T>::type;
-};
-
-// Specialization of `variant_alternative` for volatile qualified variants.
-template <std::size_t I, class T>
-struct variant_alternative<I, volatile T> {
-  using type = volatile typename variant_alternative<I, T>::type;
-};
-
-// Specialization of `variant_alternative` for const volatile qualified
-// variants.
-template <std::size_t I, class T>
-struct variant_alternative<I, const volatile T> {
-  using type = const volatile typename variant_alternative<I, T>::type;
-};
-
-// Template type alias for variant_alternative<I, T>::type.
-//
-// Example:
-//
-//   using alternative_type_0
-//     = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<0, absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>>;
-//   static_assert(std::is_same<alternative_type_0, int>::value, "");
-template <std::size_t I, class T>
-using variant_alternative_t = typename variant_alternative<I, T>::type;
-
-// holds_alternative()
-//
-// Checks whether the given variant currently holds a given alternative type,
-// returning `true` if so.
-//
-// Example:
-//
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string> foo = 42;
-//   if (absl::OTABSL_OPTION_NAMESPACE_NAME::holds_alternative<int>(foo)) {
-//       std::cout << "The variant holds an integer";
-//   }
-template <class T, class... Types>
-constexpr bool holds_alternative(const variant<Types...>& v) noexcept {
-  static_assert(
-      variant_internal::UnambiguousIndexOfImpl<variant<Types...>, T,
-                                               0>::value != sizeof...(Types),
-      "The type T must occur exactly once in Types...");
-  return v.index() ==
-         variant_internal::UnambiguousIndexOf<variant<Types...>, T>::value;
-}
-
-// get()
-//
-// Returns a reference to the value currently within a given variant, using
-// either a unique alternative type amongst the variant's set of alternative
-// types, or the variant's index value. Attempting to get a variant's value
-// using a type that is not unique within the variant's set of alternative types
-// is a compile-time error. If the index of the alternative being specified is
-// different from the index of the alternative that is currently stored, throws
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::bad_variant_access`.
-//
-// Example:
-//
-//   auto a = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string>;
-//
-//   // Get the value by type (if unique).
-//   int i = absl::OTABSL_OPTION_NAMESPACE_NAME::get<int>(a);
-//
-//   auto b = absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, int>;
-//
-//   // Getting the value by a type that is not unique is ill-formed.
-//   int j = absl::OTABSL_OPTION_NAMESPACE_NAME::get<int>(b);     // Compile Error!
-//
-//   // Getting value by index not ambiguous and allowed.
-//   int k = absl::OTABSL_OPTION_NAMESPACE_NAME::get<1>(b);
-
-// Overload for getting a variant's lvalue by type.
-template <class T, class... Types>
-constexpr T& get(variant<Types...>& v) {  // NOLINT
-  return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(v);
-}
-
-// Overload for getting a variant's rvalue by type.
-// Note: `absl::OTABSL_OPTION_NAMESPACE_NAME::move()` is required to allow use of constexpr in C++11.
-template <class T, class... Types>
-constexpr T&& get(variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(absl::OTABSL_OPTION_NAMESPACE_NAME::move(v));
-}
-
-// Overload for getting a variant's const lvalue by type.
-template <class T, class... Types>
-constexpr const T& get(const variant<Types...>& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(v);
-}
-
-// Overload for getting a variant's const rvalue by type.
-// Note: `absl::OTABSL_OPTION_NAMESPACE_NAME::move()` is required to allow use of constexpr in C++11.
-template <class T, class... Types>
-constexpr const T&& get(const variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(absl::OTABSL_OPTION_NAMESPACE_NAME::move(v));
-}
-
-// Overload for getting a variant's lvalue by index.
-template <std::size_t I, class... Types>
-constexpr variant_alternative_t<I, variant<Types...>>& get(
-    variant<Types...>& v) {  // NOLINT
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(v);
-}
-
-// Overload for getting a variant's rvalue by index.
-// Note: `absl::OTABSL_OPTION_NAMESPACE_NAME::move()` is required to allow use of constexpr in C++11.
-template <std::size_t I, class... Types>
-constexpr variant_alternative_t<I, variant<Types...>>&& get(
-    variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(absl::OTABSL_OPTION_NAMESPACE_NAME::move(v));
-}
-
-// Overload for getting a variant's const lvalue by index.
-template <std::size_t I, class... Types>
-constexpr const variant_alternative_t<I, variant<Types...>>& get(
-    const variant<Types...>& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(v);
-}
-
-// Overload for getting a variant's const rvalue by index.
-// Note: `absl::OTABSL_OPTION_NAMESPACE_NAME::move()` is required to allow use of constexpr in C++11.
-template <std::size_t I, class... Types>
-constexpr const variant_alternative_t<I, variant<Types...>>&& get(
-    const variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(absl::OTABSL_OPTION_NAMESPACE_NAME::move(v));
-}
-
-// get_if()
-//
-// Returns a pointer to the value currently stored within a given variant, if
-// present, using either a unique alternative type amongst the variant's set of
-// alternative types, or the variant's index value. If such a value does not
-// exist, returns `nullptr`.
-//
-// As with `get`, attempting to get a variant's value using a type that is not
-// unique within the variant's set of alternative types is a compile-time error.
-
-// Overload for getting a pointer to the value stored in the given variant by
-// index.
-template <std::size_t I, class... Types>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::add_pointer_t<variant_alternative_t<I, variant<Types...>>>
-get_if(variant<Types...>* v) noexcept {
-  return (v != nullptr && v->index() == I)
-             ? std::addressof(
-                   variant_internal::VariantCoreAccess::Access<I>(*v))
-             : nullptr;
-}
-
-// Overload for getting a pointer to the const value stored in the given
-// variant by index.
-template <std::size_t I, class... Types>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::add_pointer_t<const variant_alternative_t<I, variant<Types...>>>
-get_if(const variant<Types...>* v) noexcept {
-  return (v != nullptr && v->index() == I)
-             ? std::addressof(
-                   variant_internal::VariantCoreAccess::Access<I>(*v))
-             : nullptr;
-}
-
-// Overload for getting a pointer to the value stored in the given variant by
-// type.
-template <class T, class... Types>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::add_pointer_t<T> get_if(variant<Types...>* v) noexcept {
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::get_if<variant_internal::IndexOf<T, Types...>::value>(v);
-}
-
-// Overload for getting a pointer to the const value stored in the given variant
-// by type.
-template <class T, class... Types>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::add_pointer_t<const T> get_if(
-    const variant<Types...>* v) noexcept {
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::get_if<variant_internal::IndexOf<T, Types...>::value>(v);
-}
-
-// visit()
-//
-// Calls a provided functor on a given set of variants. `absl::OTABSL_OPTION_NAMESPACE_NAME::visit()` is
-// commonly used to conditionally inspect the state of a given variant (or set
-// of variants).
-//
-// The functor must return the same type when called with any of the variants'
-// alternatives.
-//
-// Example:
-//
-//   // Define a visitor functor
-//   struct GetVariant {
-//       template<typename T>
-//       void operator()(const T& i) const {
-//         std::cout << "The variant's value is: " << i;
-//       }
-//   };
-//
-//   // Declare our variant, and call `absl::OTABSL_OPTION_NAMESPACE_NAME::visit()` on it.
-//   // Note that `GetVariant()` returns void in either case.
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<int, std::string> foo = std::string("foo");
-//   GetVariant visitor;
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::visit(visitor, foo);  // Prints `The variant's value is: foo'
-template <typename Visitor, typename... Variants>
-variant_internal::VisitResult<Visitor, Variants...> visit(Visitor&& vis,
-                                                          Variants&&... vars) {
-  return variant_internal::
-      VisitIndices<variant_size<absl::OTABSL_OPTION_NAMESPACE_NAME::decay_t<Variants> >::value...>::Run(
-          variant_internal::PerformVisitation<Visitor, Variants...>{
-              std::forward_as_tuple(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Variants>(vars)...),
-              absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Visitor>(vis)},
-          vars.index()...);
-}
-
-// monostate
-//
-// The monostate class serves as a first alternative type for a variant for
-// which the first variant type is otherwise not default-constructible.
-struct monostate {};
-
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::monostate` Relational Operators
-
-constexpr bool operator<(monostate, monostate) noexcept { return false; }
-constexpr bool operator>(monostate, monostate) noexcept { return false; }
-constexpr bool operator<=(monostate, monostate) noexcept { return true; }
-constexpr bool operator>=(monostate, monostate) noexcept { return true; }
-constexpr bool operator==(monostate, monostate) noexcept { return true; }
-constexpr bool operator!=(monostate, monostate) noexcept { return false; }
-
-
-//------------------------------------------------------------------------------
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` Template Definition
-//------------------------------------------------------------------------------
-template <typename T0, typename... Tn>
-class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
-  static_assert(absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_object<T0>,
-                                  std::is_object<Tn>...>::value,
-                "Attempted to instantiate a variant containing a non-object "
-                "type.");
-  // Intentionally not qualifying `negation` with `absl::OTABSL_OPTION_NAMESPACE_NAME::` to work around a bug
-  // in MSVC 2015 with inline namespace and variadic template.
-  static_assert(absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<negation<std::is_array<T0> >,
-                                  negation<std::is_array<Tn> >...>::value,
-                "Attempted to instantiate a variant containing an array type.");
-  static_assert(absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<std::is_nothrow_destructible<T0>,
-                                  std::is_nothrow_destructible<Tn>...>::value,
-                "Attempted to instantiate a variant containing a non-nothrow "
-                "destructible type.");
-
-  friend struct variant_internal::VariantCoreAccess;
-
- private:
-  using Base = variant_internal::VariantBase<T0, Tn...>;
-
- public:
-  // Constructors
-
-  // Constructs a variant holding a default-initialized value of the first
-  // alternative type.
-  constexpr variant() /*noexcept(see 111above)*/ = default;
-
-  // Copy constructor, standard semantics
-  variant(const variant& other) = default;
-
-  // Move constructor, standard semantics
-  variant(variant&& other) /*noexcept(see above)*/ = default;
-
-  // Constructs a variant of an alternative type specified by overload
-  // resolution of the provided forwarding arguments through
-  // direct-initialization.
-  //
-  // Note: If the selected constructor is a constexpr constructor, this
-  // constructor shall be a constexpr constructor.
-  //
-  // NOTE: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0608r1.html
-  // has been voted passed the design phase in the C++ standard meeting in Mar
-  // 2018. It will be implemented and integrated into `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`.
-  template <
-      class T,
-      std::size_t I = std::enable_if<
-          variant_internal::IsNeitherSelfNorInPlace<variant,
-                                                    absl::OTABSL_OPTION_NAMESPACE_NAME::decay_t<T>>::value,
-          variant_internal::IndexOfConstructedType<variant, T>>::type::value,
-      class Tj = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>,
-      absl::OTABSL_OPTION_NAMESPACE_NAME::enable_if_t<std::is_constructible<Tj, T>::value>* =
-          nullptr>
-  constexpr variant(T&& t) noexcept(std::is_nothrow_constructible<Tj, T>::value)
-      : Base(variant_internal::EmplaceTag<I>(), absl::OTABSL_OPTION_NAMESPACE_NAME::forward<T>(t)) {}
-
-  // Constructs a variant of an alternative type from the arguments through
-  // direct-initialization.
-  //
-  // Note: If the selected constructor is a constexpr constructor, this
-  // constructor shall be a constexpr constructor.
-  template <class T, class... Args,
-            typename std::enable_if<std::is_constructible<
-                variant_internal::UnambiguousTypeOfT<variant, T>,
-                Args...>::value>::type* = nullptr>
-  constexpr explicit variant(in_place_type_t<T>, Args&&... args)
-      : Base(variant_internal::EmplaceTag<
-                 variant_internal::UnambiguousIndexOf<variant, T>::value>(),
-             absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...) {}
-
-  // Constructs a variant of an alternative type from an initializer list
-  // and other arguments through direct-initialization.
-  //
-  // Note: If the selected constructor is a constexpr constructor, this
-  // constructor shall be a constexpr constructor.
-  template <class T, class U, class... Args,
-            typename std::enable_if<std::is_constructible<
-                variant_internal::UnambiguousTypeOfT<variant, T>,
-                std::initializer_list<U>&, Args...>::value>::type* = nullptr>
-  constexpr explicit variant(in_place_type_t<T>, std::initializer_list<U> il,
-                             Args&&... args)
-      : Base(variant_internal::EmplaceTag<
-                 variant_internal::UnambiguousIndexOf<variant, T>::value>(),
-             il, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...) {}
-
-  // Constructs a variant of an alternative type from a provided index,
-  // through value-initialization using the provided forwarded arguments.
-  template <std::size_t I, class... Args,
-            typename std::enable_if<std::is_constructible<
-                variant_internal::VariantAlternativeSfinaeT<I, variant>,
-                Args...>::value>::type* = nullptr>
-  constexpr explicit variant(in_place_index_t<I>, Args&&... args)
-      : Base(variant_internal::EmplaceTag<I>(), absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...) {}
-
-  // Constructs a variant of an alternative type from a provided index,
-  // through value-initialization of an initializer list and the provided
-  // forwarded arguments.
-  template <std::size_t I, class U, class... Args,
-            typename std::enable_if<std::is_constructible<
-                variant_internal::VariantAlternativeSfinaeT<I, variant>,
-                std::initializer_list<U>&, Args...>::value>::type* = nullptr>
-  constexpr explicit variant(in_place_index_t<I>, std::initializer_list<U> il,
-                             Args&&... args)
-      : Base(variant_internal::EmplaceTag<I>(), il,
-             absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...) {}
-
-  // Destructors
-
-  // Destroys the variant's currently contained value, provided that
-  // `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false.
-  ~variant() = default;
-
-  // Assignment Operators
-
-  // Copy assignment operator
-  variant& operator=(const variant& other) = default;
-
-  // Move assignment operator
-  variant& operator=(variant&& other) /*noexcept(see above)*/ = default;
-
-  // Converting assignment operator
-  //
-  // NOTE: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0608r1.html
-  // has been voted passed the design phase in the C++ standard meeting in Mar
-  // 2018. It will be implemented and integrated into `absl::OTABSL_OPTION_NAMESPACE_NAME::variant`.
-  template <
-      class T,
-      std::size_t I = std::enable_if<
-          !std::is_same<absl::OTABSL_OPTION_NAMESPACE_NAME::decay_t<T>, variant>::value,
-          variant_internal::IndexOfConstructedType<variant, T>>::type::value,
-      class Tj = absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>,
-      typename std::enable_if<std::is_assignable<Tj&, T>::value &&
-                              std::is_constructible<Tj, T>::value>::type* =
-          nullptr>
-  variant& operator=(T&& t) noexcept(
-      std::is_nothrow_assignable<Tj&, T>::value&&
-          std::is_nothrow_constructible<Tj, T>::value) {
-    variant_internal::VisitIndices<sizeof...(Tn) + 1>::Run(
-        variant_internal::VariantCoreAccess::MakeConversionAssignVisitor(
-            this, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<T>(t)),
-        index());
-
-    return *this;
-  }
-
-
-  // emplace() Functions
-
-  // Constructs a value of the given alternative type T within the variant. The
-  // existing value of the variant is destroyed first (provided that
-  // `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false). Requires that T is unambiguous
-  // in the variant.
-  //
-  // Example:
-  //
-  //   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<std::vector<int>, int, std::string> v;
-  //   v.emplace<int>(99);
-  //   v.emplace<std::string>("abc");
-  template <
-      class T, class... Args,
-      typename std::enable_if<std::is_constructible<
-          absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<
-              variant_internal::UnambiguousIndexOf<variant, T>::value, variant>,
-          Args...>::value>::type* = nullptr>
-  T& emplace(Args&&... args) {
-    return variant_internal::VariantCoreAccess::Replace<
-        variant_internal::UnambiguousIndexOf<variant, T>::value>(
-        this, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-  }
-
-  // Constructs a value of the given alternative type T within the variant using
-  // an initializer list. The existing value of the variant is destroyed first
-  // (provided that `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false). Requires that T
-  // is unambiguous in the variant.
-  //
-  // Example:
-  //
-  //   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<std::vector<int>, int, std::string> v;
-  //   v.emplace<std::vector<int>>({0, 1, 2});
-  template <
-      class T, class U, class... Args,
-      typename std::enable_if<std::is_constructible<
-          absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<
-              variant_internal::UnambiguousIndexOf<variant, T>::value, variant>,
-          std::initializer_list<U>&, Args...>::value>::type* = nullptr>
-  T& emplace(std::initializer_list<U> il, Args&&... args) {
-    return variant_internal::VariantCoreAccess::Replace<
-        variant_internal::UnambiguousIndexOf<variant, T>::value>(
-        this, il, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-  }
-
-  // Destroys the current value of the variant (provided that
-  // `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false) and constructs a new value at
-  // the given index.
-  //
-  // Example:
-  //
-  //   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<std::vector<int>, int, int> v;
-  //   v.emplace<1>(99);
-  //   v.emplace<2>(98);
-  //   v.emplace<int>(99);  // Won't compile. 'int' isn't a unique type.
-  template <std::size_t I, class... Args,
-            typename std::enable_if<
-                std::is_constructible<absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>,
-                                      Args...>::value>::type* = nullptr>
-  absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>& emplace(Args&&... args) {
-    return variant_internal::VariantCoreAccess::Replace<I>(
-        this, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-  }
-
-  // Destroys the current value of the variant (provided that
-  // `absl::OTABSL_OPTION_NAMESPACE_NAME::valueless_by_exception()` is false) and constructs a new value at
-  // the given index using an initializer list and the provided arguments.
-  //
-  // Example:
-  //
-  //   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<std::vector<int>, int, int> v;
-  //   v.emplace<0>({0, 1, 2});
-  template <std::size_t I, class U, class... Args,
-            typename std::enable_if<std::is_constructible<
-                absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>,
-                std::initializer_list<U>&, Args...>::value>::type* = nullptr>
-  absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t<I, variant>& emplace(std::initializer_list<U> il,
-                                                   Args&&... args) {
-    return variant_internal::VariantCoreAccess::Replace<I>(
-        this, il, absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Args>(args)...);
-  }
-
-  // variant::valueless_by_exception()
-  //
-  // Returns false if and only if the variant currently holds a valid value.
-  constexpr bool valueless_by_exception() const noexcept {
-    return this->index_ == absl::OTABSL_OPTION_NAMESPACE_NAME::variant_npos;
-  }
-
-  // variant::index()
-  //
-  // Returns the index value of the variant's currently selected alternative
-  // type.
-  constexpr std::size_t index() const noexcept { return this->index_; }
-
-  // variant::swap()
-  //
-  // Swaps the values of two variant objects.
-  //
-  void swap(variant& rhs) noexcept(
-      absl::OTABSL_OPTION_NAMESPACE_NAME::conjunction<
-          std::is_nothrow_move_constructible<T0>,
-          std::is_nothrow_move_constructible<Tn>...,
-          type_traits_internal::IsNothrowSwappable<T0>,
-          type_traits_internal::IsNothrowSwappable<Tn>...>::value) {
-    return variant_internal::VisitIndices<sizeof...(Tn) + 1>::Run(
-        variant_internal::Swap<T0, Tn...>{this, &rhs}, rhs.index());
-  }
-};
-
-// We need a valid declaration of variant<> for SFINAE and overload resolution
-// to work properly above, but we don't need a full declaration since this type
-// will never be constructed. This declaration, though incomplete, suffices.
-template <>
-class variant<>;
-
-//------------------------------------------------------------------------------
-// Relational Operators
-//------------------------------------------------------------------------------
-//
-// If neither operand is in the `variant::valueless_by_exception` state:
-//
-//   * If the index of both variants is the same, the relational operator
-//     returns the result of the corresponding relational operator for the
-//     corresponding alternative type.
-//   * If the index of both variants is not the same, the relational operator
-//     returns the result of that operation applied to the value of the left
-//     operand's index and the value of the right operand's index.
-//   * If at least one operand is in the valueless_by_exception state:
-//     - A variant in the valueless_by_exception state is only considered equal
-//       to another variant in the valueless_by_exception state.
-//     - If exactly one operand is in the valueless_by_exception state, the
-//       variant in the valueless_by_exception state is less than the variant
-//       that is not in the valueless_by_exception state.
-//
-// Note: The value 1 is added to each index in the relational comparisons such
-// that the index corresponding to the valueless_by_exception state wraps around
-// to 0 (the lowest value for the index type), and the remaining indices stay in
-// the same relative order.
-
-// Equal-to operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveEqualT<Types...> operator==(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() == b.index()) &&
-         variant_internal::VisitIndices<sizeof...(Types)>::Run(
-             variant_internal::EqualsOp<Types...>{&a, &b}, a.index());
-}
-
-// Not equal operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveNotEqualT<Types...> operator!=(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index()) ||
-         variant_internal::VisitIndices<sizeof...(Types)>::Run(
-             variant_internal::NotEqualsOp<Types...>{&a, &b}, a.index());
-}
-
-// Less-than operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveLessThanT<Types...> operator<(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index())
-             ? (a.index() + 1) < (b.index() + 1)
-             : variant_internal::VisitIndices<sizeof...(Types)>::Run(
-                   variant_internal::LessThanOp<Types...>{&a, &b}, a.index());
-}
-
-// Greater-than operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveGreaterThanT<Types...> operator>(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index())
-             ? (a.index() + 1) > (b.index() + 1)
-             : variant_internal::VisitIndices<sizeof...(Types)>::Run(
-                   variant_internal::GreaterThanOp<Types...>{&a, &b},
-                   a.index());
-}
-
-// Less-than or equal-to operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveLessThanOrEqualT<Types...> operator<=(
-    const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index())
-             ? (a.index() + 1) < (b.index() + 1)
-             : variant_internal::VisitIndices<sizeof...(Types)>::Run(
-                   variant_internal::LessThanOrEqualsOp<Types...>{&a, &b},
-                   a.index());
-}
-
-// Greater-than or equal-to operator
-template <typename... Types>
-constexpr variant_internal::RequireAllHaveGreaterThanOrEqualT<Types...>
-operator>=(const variant<Types...>& a, const variant<Types...>& b) {
-  return (a.index() != b.index())
-             ? (a.index() + 1) > (b.index() + 1)
-             : variant_internal::VisitIndices<sizeof...(Types)>::Run(
-                   variant_internal::GreaterThanOrEqualsOp<Types...>{&a, &b},
-                   a.index());
-}
-
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-namespace std {
-
-// hash()
-template <>  // NOLINT
-struct hash<absl::OTABSL_OPTION_NAMESPACE_NAME::monostate> {
-  std::size_t operator()(absl::OTABSL_OPTION_NAMESPACE_NAME::monostate) const { return 0; }
-};
-
-template <class... T>  // NOLINT
-struct hash<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<T...>>
-    : absl::OTABSL_OPTION_NAMESPACE_NAME::variant_internal::VariantHashBase<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<T...>, void,
-                                              absl::OTABSL_OPTION_NAMESPACE_NAME::remove_const_t<T>...> {};
-
-}  // namespace std
-
-#endif  // OTABSL_USES_STD_VARIANT
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-namespace variant_internal {
-
-// Helper visitor for converting a variant<Ts...>` into another type (mostly
-// variant) that can be constructed from any type.
-template <typename To>
-struct ConversionVisitor {
-  template <typename T>
-  To operator()(T&& v) const {
-    return To(std::forward<T>(v));
-  }
-};
-
-}  // namespace variant_internal
-
-// ConvertVariantTo()
-//
-// Helper functions to convert an `absl::OTABSL_OPTION_NAMESPACE_NAME::variant` to a variant of another set of
-// types, provided that the alternative type of the new variant type can be
-// converted from any type in the source variant.
-//
-// Example:
-//
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<name1, name2, float> InternalReq(const Req&);
-//
-//   // name1 and name2 are convertible to name
-//   absl::OTABSL_OPTION_NAMESPACE_NAME::variant<name, float> ExternalReq(const Req& req) {
-//     return absl::OTABSL_OPTION_NAMESPACE_NAME::ConvertVariantTo<absl::OTABSL_OPTION_NAMESPACE_NAME::variant<name, float>>(
-//              InternalReq(req));
-//   }
-template <typename To, typename Variant>
-To ConvertVariantTo(Variant&& variant) {
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::visit(variant_internal::ConversionVisitor<To>{},
-                     std::forward<Variant>(variant));
-}
-
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_TYPES_VARIANT_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/utility/utility.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/utility/utility.h
deleted file mode 100644
index 62580cc5a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/internal/absl/utility/utility.h
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This header file contains C++11 versions of standard <utility> header
-// abstractions available within C++14 and C++17, and are designed to be drop-in
-// replacement for code compliant with C++14 and C++17.
-//
-// The following abstractions are defined:
-//
-//   * integer_sequence<T, Ints...>  == std::integer_sequence<T, Ints...>
-//   * index_sequence<Ints...>       == std::index_sequence<Ints...>
-//   * make_integer_sequence<T, N>   == std::make_integer_sequence<T, N>
-//   * make_index_sequence<N>        == std::make_index_sequence<N>
-//   * index_sequence_for<Ts...>     == std::index_sequence_for<Ts...>
-//   * apply<Functor, Tuple>         == std::apply<Functor, Tuple>
-//   * exchange<T>                   == std::exchange<T>
-//   * make_from_tuple<T>            == std::make_from_tuple<T>
-//
-// This header file also provides the tag types `in_place_t`, `in_place_type_t`,
-// and `in_place_index_t`, as well as the constant `in_place`, and
-// `constexpr` `std::move()` and `std::forward()` implementations in C++11.
-//
-// References:
-//
-//  https://en.cppreference.com/w/cpp/utility/integer_sequence
-//  https://en.cppreference.com/w/cpp/utility/apply
-//  http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html
-
-#ifndef OTABSL_UTILITY_UTILITY_H_
-#define OTABSL_UTILITY_UTILITY_H_
-
-#include <cstddef>
-#include <cstdlib>
-#include <tuple>
-#include <utility>
-
-#include "../base/config.h"
-#include "../base/internal/inline_variable.h"
-#include "../base/internal/invoke.h"
-#include "../meta/type_traits.h"
-
-namespace absl {
-OTABSL_NAMESPACE_BEGIN
-
-// integer_sequence
-//
-// Class template representing a compile-time integer sequence. An instantiation
-// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
-// type through its template arguments (which is a common need when
-// working with C++11 variadic templates). `absl::OTABSL_OPTION_NAMESPACE_NAME::integer_sequence` is designed
-// to be a drop-in replacement for C++14's `std::integer_sequence`.
-//
-// Example:
-//
-//   template< class T, T... Ints >
-//   void user_function(integer_sequence<T, Ints...>);
-//
-//   int main()
-//   {
-//     // user_function's `T` will be deduced to `int` and `Ints...`
-//     // will be deduced to `0, 1, 2, 3, 4`.
-//     user_function(make_integer_sequence<int, 5>());
-//   }
-template <typename T, T... Ints>
-struct integer_sequence {
-  using value_type = T;
-  static constexpr size_t size() noexcept { return sizeof...(Ints); }
-};
-
-// index_sequence
-//
-// A helper template for an `integer_sequence` of `size_t`,
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::index_sequence` is designed to be a drop-in replacement for C++14's
-// `std::index_sequence`.
-template <size_t... Ints>
-using index_sequence = integer_sequence<size_t, Ints...>;
-
-namespace utility_internal {
-
-template <typename Seq, size_t SeqSize, size_t Rem>
-struct Extend;
-
-// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 0> {
-  using type = integer_sequence<T, Ints..., (Ints + SeqSize)...>;
-};
-
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 1> {
-  using type = integer_sequence<T, Ints..., (Ints + SeqSize)..., 2 * SeqSize>;
-};
-
-// Recursion helper for 'make_integer_sequence<T, N>'.
-// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
-template <typename T, size_t N>
-struct Gen {
-  using type =
-      typename Extend<typename Gen<T, N / 2>::type, N / 2, N % 2>::type;
-};
-
-template <typename T>
-struct Gen<T, 0> {
-  using type = integer_sequence<T>;
-};
-
-template <typename T>
-struct InPlaceTypeTag {
-  explicit InPlaceTypeTag() = delete;
-  InPlaceTypeTag(const InPlaceTypeTag&) = delete;
-  InPlaceTypeTag& operator=(const InPlaceTypeTag&) = delete;
-};
-
-template <size_t I>
-struct InPlaceIndexTag {
-  explicit InPlaceIndexTag() = delete;
-  InPlaceIndexTag(const InPlaceIndexTag&) = delete;
-  InPlaceIndexTag& operator=(const InPlaceIndexTag&) = delete;
-};
-
-}  // namespace utility_internal
-
-// Compile-time sequences of integers
-
-// make_integer_sequence
-//
-// This template alias is equivalent to
-// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
-// replacement for C++14's `std::make_integer_sequence`.
-template <typename T, T N>
-using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
-
-// make_index_sequence
-//
-// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
-// and is designed to be a drop-in replacement for C++14's
-// `std::make_index_sequence`.
-template <size_t N>
-using make_index_sequence = make_integer_sequence<size_t, N>;
-
-// index_sequence_for
-//
-// Converts a typename pack into an index sequence of the same length, and
-// is designed to be a drop-in replacement for C++14's
-// `std::index_sequence_for()`
-template <typename... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-// Tag types
-
-#ifdef OTABSL_USES_STD_OPTIONAL
-
-using std::in_place_t;
-using std::in_place;
-
-#else  // OTABSL_USES_STD_OPTIONAL
-
-// in_place_t
-//
-// Tag type used to specify in-place construction, such as with
-// `absl::OTABSL_OPTION_NAMESPACE_NAME::optional`, designed to be a drop-in replacement for C++17's
-// `std::in_place_t`.
-struct in_place_t {};
-
-OTABSL_INTERNAL_INLINE_CONSTEXPR(in_place_t, in_place, {});
-
-#endif  // OTABSL_USES_STD_OPTIONAL
-
-#if defined(OTABSL_USES_STD_ANY) || defined(OTABSL_USES_STD_VARIANT)
-using std::in_place_type;
-using std::in_place_type_t;
-#else
-
-// in_place_type_t
-//
-// Tag type used for in-place construction when the type to construct needs to
-// be specified, such as with `absl::OTABSL_OPTION_NAMESPACE_NAME::any`, designed to be a drop-in replacement
-// for C++17's `std::in_place_type_t`.
-template <typename T>
-using in_place_type_t = void (*)(utility_internal::InPlaceTypeTag<T>);
-
-template <typename T>
-void in_place_type(utility_internal::InPlaceTypeTag<T>) {}
-#endif  // OTABSL_USES_STD_ANY || OTABSL_USES_STD_VARIANT
-
-#ifdef OTABSL_USES_STD_VARIANT
-using std::in_place_index;
-using std::in_place_index_t;
-#else
-
-// in_place_index_t
-//
-// Tag type used for in-place construction when the type to construct needs to
-// be specified, such as with `absl::OTABSL_OPTION_NAMESPACE_NAME::any`, designed to be a drop-in replacement
-// for C++17's `std::in_place_index_t`.
-template <size_t I>
-using in_place_index_t = void (*)(utility_internal::InPlaceIndexTag<I>);
-
-template <size_t I>
-void in_place_index(utility_internal::InPlaceIndexTag<I>) {}
-#endif  // OTABSL_USES_STD_VARIANT
-
-// Constexpr move and forward
-
-// move()
-//
-// A constexpr version of `std::move()`, designed to be a drop-in replacement
-// for C++14's `std::move()`.
-template <typename T>
-constexpr absl::OTABSL_OPTION_NAMESPACE_NAME::remove_reference_t<T>&& move(T&& t) noexcept {
-  return static_cast<absl::OTABSL_OPTION_NAMESPACE_NAME::remove_reference_t<T>&&>(t);
-}
-
-// forward()
-//
-// A constexpr version of `std::forward()`, designed to be a drop-in replacement
-// for C++14's `std::forward()`.
-template <typename T>
-constexpr T&& forward(
-    absl::OTABSL_OPTION_NAMESPACE_NAME::remove_reference_t<T>& t) noexcept {  // NOLINT(runtime/references)
-  return static_cast<T&&>(t);
-}
-
-namespace utility_internal {
-// Helper method for expanding tuple into a called method.
-template <typename Functor, typename Tuple, std::size_t... Indexes>
-auto apply_helper(Functor&& functor, Tuple&& t, index_sequence<Indexes...>)
-    -> decltype(absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(
-        absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Functor>(functor),
-        std::get<Indexes>(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Tuple>(t))...)) {
-  return absl::OTABSL_OPTION_NAMESPACE_NAME::base_internal::Invoke(
-      absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Functor>(functor),
-      std::get<Indexes>(absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Tuple>(t))...);
-}
-
-}  // namespace utility_internal
-
-// apply
-//
-// Invokes a Callable using elements of a tuple as its arguments.
-// Each element of the tuple corresponds to an argument of the call (in order).
-// Both the Callable argument and the tuple argument are perfect-forwarded.
-// For member-function Callables, the first tuple element acts as the `this`
-// pointer. `absl::OTABSL_OPTION_NAMESPACE_NAME::apply` is designed to be a drop-in replacement for C++17's
-// `std::apply`. Unlike C++17's `std::apply`, this is not currently `constexpr`.
-//
-// Example:
-//
-//   class Foo {
-//    public:
-//     void Bar(int);
-//   };
-//   void user_function1(int, std::string);
-//   void user_function2(std::unique_ptr<Foo>);
-//   auto user_lambda = [](int, int) {};
-//
-//   int main()
-//   {
-//       std::tuple<int, std::string> tuple1(42, "bar");
-//       // Invokes the first user function on int, std::string.
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::apply(&user_function1, tuple1);
-//
-//       std::tuple<std::unique_ptr<Foo>> tuple2(absl::OTABSL_OPTION_NAMESPACE_NAME::make_unique<Foo>());
-//       // Invokes the user function that takes ownership of the unique
-//       // pointer.
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::apply(&user_function2, std::move(tuple2));
-//
-//       auto foo = absl::OTABSL_OPTION_NAMESPACE_NAME::make_unique<Foo>();
-//       std::tuple<Foo*, int> tuple3(foo.get(), 42);
-//       // Invokes the method Bar on foo with one argument, 42.
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::apply(&Foo::Bar, tuple3);
-//
-//       std::tuple<int, int> tuple4(8, 9);
-//       // Invokes a lambda.
-//       absl::OTABSL_OPTION_NAMESPACE_NAME::apply(user_lambda, tuple4);
-//   }
-template <typename Functor, typename Tuple>
-auto apply(Functor&& functor, Tuple&& t)
-    -> decltype(utility_internal::apply_helper(
-        absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Functor>(functor), absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Tuple>(t),
-        absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<std::tuple_size<
-            typename std::remove_reference<Tuple>::type>::value>{})) {
-  return utility_internal::apply_helper(
-      absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Functor>(functor), absl::OTABSL_OPTION_NAMESPACE_NAME::forward<Tuple>(t),
-      absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<std::tuple_size<
-          typename std::remove_reference<Tuple>::type>::value>{});
-}
-
-// exchange
-//
-// Replaces the value of `obj` with `new_value` and returns the old value of
-// `obj`.  `absl::OTABSL_OPTION_NAMESPACE_NAME::exchange` is designed to be a drop-in replacement for C++14's
-// `std::exchange`.
-//
-// Example:
-//
-//   Foo& operator=(Foo&& other) {
-//     ptr1_ = absl::OTABSL_OPTION_NAMESPACE_NAME::exchange(other.ptr1_, nullptr);
-//     int1_ = absl::OTABSL_OPTION_NAMESPACE_NAME::exchange(other.int1_, -1);
-//     return *this;
-//   }
-template <typename T, typename U = T>
-T exchange(T& obj, U&& new_value) {
-  T old_value = absl::OTABSL_OPTION_NAMESPACE_NAME::move(obj);
-  obj = absl::OTABSL_OPTION_NAMESPACE_NAME::forward<U>(new_value);
-  return old_value;
-}
-
-namespace utility_internal {
-template <typename T, typename Tuple, size_t... I>
-T make_from_tuple_impl(Tuple&& tup, absl::OTABSL_OPTION_NAMESPACE_NAME::index_sequence<I...>) {
-  return T(std::get<I>(std::forward<Tuple>(tup))...);
-}
-}  // namespace utility_internal
-
-// make_from_tuple
-//
-// Given the template parameter type `T` and a tuple of arguments
-// `std::tuple(arg0, arg1, ..., argN)` constructs an object of type `T` as if by
-// calling `T(arg0, arg1, ..., argN)`.
-//
-// Example:
-//
-//   std::tuple<const char*, size_t> args("hello world", 5);
-//   auto s = absl::OTABSL_OPTION_NAMESPACE_NAME::make_from_tuple<std::string>(args);
-//   assert(s == "hello");
-//
-template <typename T, typename Tuple>
-constexpr T make_from_tuple(Tuple&& tup) {
-  return utility_internal::make_from_tuple_impl<T>(
-      std::forward<Tuple>(tup),
-      absl::OTABSL_OPTION_NAMESPACE_NAME::make_index_sequence<
-          std::tuple_size<absl::OTABSL_OPTION_NAMESPACE_NAME::decay_t<Tuple>>::value>{});
-}
-
-OTABSL_NAMESPACE_END
-}  // namespace absl
-
-#endif  // OTABSL_UTILITY_UTILITY_H_
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/shared_ptr.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/shared_ptr.h
deleted file mode 100644
index 681c4eb37..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/shared_ptr.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2011
-#    include "opentelemetry/std/shared_ptr.h"
-#    define OPENTELEMETRY_HAVE_STD_SHARED_PTR
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_SHARED_PTR)
-#  include <cstdlib>
-#  include <memory>
-#  include <utility>
-
-#  include "opentelemetry/nostd/unique_ptr.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-/**
- * Provide a type-erased version of std::shared_ptr that has ABI stability.
- */
-template <class T>
-class shared_ptr
-{
-public:
-  using element_type = T;
-  using pointer      = element_type *;
-
-private:
-  static constexpr size_t kMaxSize   = 32;
-  static constexpr size_t kAlignment = 8;
-
-  struct alignas(kAlignment) PlacementBuffer
-  {
-    char data[kMaxSize]{};
-  };
-
-  class shared_ptr_wrapper
-  {
-  public:
-    shared_ptr_wrapper() noexcept = default;
-
-    shared_ptr_wrapper(std::shared_ptr<T> &&ptr) noexcept : ptr_{std::move(ptr)} {}
-
-    virtual ~shared_ptr_wrapper() {}
-
-    virtual void CopyTo(PlacementBuffer &buffer) const noexcept
-    {
-      new (buffer.data) shared_ptr_wrapper{*this};
-    }
-
-    virtual void MoveTo(PlacementBuffer &buffer) noexcept
-    {
-      new (buffer.data) shared_ptr_wrapper{std::move(this->ptr_)};
-    }
-
-    template <class U,
-              typename std::enable_if<std::is_convertible<pointer, U *>::value>::type * = nullptr>
-    void MoveTo(typename shared_ptr<U>::PlacementBuffer &buffer) noexcept
-    {
-      using other_shared_ptr_wrapper = typename shared_ptr<U>::shared_ptr_wrapper;
-      new (buffer.data) other_shared_ptr_wrapper{std::move(this->ptr_)};
-    }
-
-    virtual pointer Get() const noexcept { return ptr_.get(); }
-
-    virtual void Reset() noexcept { ptr_.reset(); }
-
-  private:
-    std::shared_ptr<T> ptr_;
-  };
-
-  static_assert(sizeof(shared_ptr_wrapper) <= kMaxSize, "Placement buffer is too small");
-  static_assert(alignof(shared_ptr_wrapper) <= kAlignment, "Placement buffer not properly aligned");
-
-public:
-  shared_ptr() noexcept { new (buffer_.data) shared_ptr_wrapper{}; }
-
-  explicit shared_ptr(pointer ptr)
-  {
-    std::shared_ptr<T> ptr_(ptr);
-    new (buffer_.data) shared_ptr_wrapper{std::move(ptr_)};
-  }
-
-  shared_ptr(std::shared_ptr<T> ptr) noexcept
-  {
-    new (buffer_.data) shared_ptr_wrapper{std::move(ptr)};
-  }
-
-  shared_ptr(shared_ptr &&other) noexcept { other.wrapper().MoveTo(buffer_); }
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  shared_ptr(shared_ptr<U> &&other) noexcept
-  {
-    other.wrapper().template MoveTo<T>(buffer_);
-  }
-
-  shared_ptr(const shared_ptr &other) noexcept { other.wrapper().CopyTo(buffer_); }
-
-  shared_ptr(unique_ptr<T> &&other) noexcept
-  {
-    std::shared_ptr<T> ptr_(other.release());
-    new (buffer_.data) shared_ptr_wrapper{std::move(ptr_)};
-  }
-
-  shared_ptr(std::unique_ptr<T> &&other) noexcept
-  {
-    std::shared_ptr<T> ptr_(other.release());
-    new (buffer_.data) shared_ptr_wrapper{std::move(ptr_)};
-  }
-
-  ~shared_ptr() { wrapper().~shared_ptr_wrapper(); }
-
-  shared_ptr &operator=(shared_ptr &&other) noexcept
-  {
-    wrapper().~shared_ptr_wrapper();
-    other.wrapper().MoveTo(buffer_);
-    return *this;
-  }
-
-  shared_ptr &operator=(std::nullptr_t) noexcept
-  {
-    wrapper().Reset();
-    return *this;
-  }
-
-  shared_ptr &operator=(const shared_ptr &other) noexcept
-  {
-    wrapper().~shared_ptr_wrapper();
-    other.wrapper().CopyTo(buffer_);
-    return *this;
-  }
-
-  element_type &operator*() const noexcept { return *wrapper().Get(); }
-
-  pointer operator->() const noexcept { return wrapper().Get(); }
-
-  operator bool() const noexcept { return wrapper().Get() != nullptr; }
-
-  pointer get() const noexcept { return wrapper().Get(); }
-
-  void swap(shared_ptr<T> &other) noexcept
-  {
-    shared_ptr<T> tmp{std::move(other)};
-
-    wrapper().MoveTo(other.buffer_);
-    tmp.wrapper().MoveTo(buffer_);
-  }
-
-  template <typename U>
-  friend class shared_ptr;
-
-private:
-  PlacementBuffer buffer_;
-
-  shared_ptr_wrapper &wrapper() noexcept
-  {
-    return *reinterpret_cast<shared_ptr_wrapper *>(buffer_.data);
-  }
-
-  const shared_ptr_wrapper &wrapper() const noexcept
-  {
-    return *reinterpret_cast<const shared_ptr_wrapper *>(buffer_.data);
-  }
-};
-
-template <class T1, class T2>
-bool operator!=(const shared_ptr<T1> &lhs, const shared_ptr<T2> &rhs) noexcept
-{
-  return lhs.get() != rhs.get();
-}
-
-template <class T1, class T2>
-bool operator==(const shared_ptr<T1> &lhs, const shared_ptr<T2> &rhs) noexcept
-{
-  return lhs.get() == rhs.get();
-}
-
-template <class T>
-inline bool operator==(const shared_ptr<T> &lhs, std::nullptr_t) noexcept
-{
-  return lhs.get() == nullptr;
-}
-
-template <class T>
-inline bool operator==(std::nullptr_t, const shared_ptr<T> &rhs) noexcept
-{
-  return nullptr == rhs.get();
-}
-
-template <class T>
-inline bool operator!=(const shared_ptr<T> &lhs, std::nullptr_t) noexcept
-{
-  return lhs.get() != nullptr;
-}
-
-template <class T>
-inline bool operator!=(std::nullptr_t, const shared_ptr<T> &rhs) noexcept
-{
-  return nullptr != rhs.get();
-}
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_HAVE_STD_SHARED_PTR */
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/span.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/span.h
deleted file mode 100644
index da0f385cf..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/span.h
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// Try to use either `std::span` or `gsl::span`
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2020
-#    include <array>
-#    include <cstddef>
-#    include <iterator>
-#    include <type_traits>
-
-/**
- * @brief Clang 14.0.0 with libc++ do not support implicitly construct a span
- * for a range. We just use our fallback version.
- *
- */
-#    if !defined(OPENTELEMETRY_OPTION_USE_STD_SPAN) && defined(_LIBCPP_VERSION)
-#      if _LIBCPP_VERSION <= 14000
-#        define OPENTELEMETRY_OPTION_USE_STD_SPAN 0
-#      endif
-#    endif
-#    ifndef OPENTELEMETRY_OPTION_USE_STD_SPAN
-#      define OPENTELEMETRY_OPTION_USE_STD_SPAN 1
-#    endif
-#    if OPENTELEMETRY_OPTION_USE_STD_SPAN
-#      include "opentelemetry/std/span.h"
-#    endif
-#  endif /* OPENTELEMETRY_STL_VERSION >= 2020 */
-#endif   /* OPENTELEMETRY_STL_VERSION */
-
-// Fallback to `nostd::span` if necessary
-#if !defined(OPENTELEMETRY_HAVE_SPAN)
-#  include <array>
-#  include <cassert>
-#  include <cstddef>
-#  include <exception>
-#  include <iterator>
-#  include <type_traits>
-
-#  include "opentelemetry/nostd/utility.h"
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-constexpr size_t dynamic_extent = static_cast<size_t>(-1);
-
-template <class T, size_t Extent = dynamic_extent>
-class span;
-
-namespace detail
-{
-/**
- * Helper class to resolve overloaded constructors
- */
-template <class T>
-struct is_specialized_span_convertible : std::false_type
-{};
-
-template <class T, size_t N>
-struct is_specialized_span_convertible<std::array<T, N>> : std::true_type
-{};
-
-template <class T, size_t N>
-struct is_specialized_span_convertible<T[N]> : std::true_type
-{};
-
-template <class T, size_t Extent>
-struct is_specialized_span_convertible<span<T, Extent>> : std::true_type
-{};
-}  // namespace detail
-
-/**
- * Back port of std::span.
- *
- * See https://en.cppreference.com/w/cpp/container/span for interface documentation.
- *
- * Note: This provides a subset of the methods available on std::span.
- *
- * Note: The std::span API specifies error cases to have undefined behavior, so this implementation
- * chooses to terminate or assert rather than throw exceptions.
- */
-template <class T, size_t Extent>
-class span
-{
-public:
-  static constexpr size_t extent = Extent;
-
-  // This arcane code is how we make default-construction result in an SFINAE error
-  // with C++11 when Extent != 0 as specified by the std::span API.
-  //
-  // See https://stackoverflow.com/a/10309720/4447365
-  template <bool B = Extent == 0, typename std::enable_if<B>::type * = nullptr>
-  span() noexcept : data_{nullptr}
-  {}
-
-  span(T *data, size_t count) noexcept : data_{data}
-  {
-    if (count != Extent)
-    {
-      std::terminate();
-    }
-  }
-
-  span(T *first, T *last) noexcept : data_{first}
-  {
-    if (std::distance(first, last) != Extent)
-    {
-      std::terminate();
-    }
-  }
-
-  template <size_t N, typename std::enable_if<Extent == N>::type * = nullptr>
-  span(T (&array)[N]) noexcept : data_{array}
-  {}
-
-  template <size_t N, typename std::enable_if<Extent == N>::type * = nullptr>
-  span(std::array<T, N> &array) noexcept : data_{array.data()}
-  {}
-
-  template <size_t N, typename std::enable_if<Extent == N>::type * = nullptr>
-  span(const std::array<T, N> &array) noexcept : data_{array.data()}
-  {}
-
-  template <
-      class C,
-      typename std::enable_if<!detail::is_specialized_span_convertible<C>::value &&
-                              std::is_convertible<typename std::remove_pointer<decltype(nostd::data(
-                                                      std::declval<C &>()))>::type (*)[],
-                                                  T (*)[]>::value &&
-                              std::is_convertible<decltype(nostd::size(std::declval<const C &>())),
-                                                  size_t>::value>::type * = nullptr>
-  span(C &c) noexcept(noexcept(nostd::data(c), nostd::size(c))) : data_{nostd::data(c)}
-  {
-    if (nostd::size(c) != Extent)
-    {
-      std::terminate();
-    }
-  }
-
-  template <
-      class C,
-      typename std::enable_if<!detail::is_specialized_span_convertible<C>::value &&
-                              std::is_convertible<typename std::remove_pointer<decltype(nostd::data(
-                                                      std::declval<const C &>()))>::type (*)[],
-                                                  T (*)[]>::value &&
-                              std::is_convertible<decltype(nostd::size(std::declval<const C &>())),
-                                                  size_t>::value>::type * = nullptr>
-  span(const C &c) noexcept(noexcept(nostd::data(c), nostd::size(c))) : data_{nostd::data(c)}
-  {
-    if (nostd::size(c) != Extent)
-    {
-      std::terminate();
-    }
-  }
-
-  template <class U,
-            size_t N,
-            typename std::enable_if<N == Extent &&
-                                    std::is_convertible<U (*)[], T (*)[]>::value>::type * = nullptr>
-  span(const span<U, N> &other) noexcept : data_{other.data()}
-  {}
-
-  span(const span &) noexcept = default;
-
-  span &operator=(const span &) noexcept = default;
-
-  bool empty() const noexcept { return Extent == 0; }
-
-  T *data() const noexcept { return data_; }
-
-  size_t size() const noexcept { return Extent; }
-
-  T &operator[](size_t index) const noexcept
-  {
-    assert(index < Extent);
-    return data_[index];
-  }
-
-  T *begin() const noexcept { return data_; }
-
-  T *end() const noexcept { return data_ + Extent; }
-
-private:
-  T *data_;
-};
-
-template <class T>
-class span<T, dynamic_extent>
-{
-public:
-  static constexpr size_t extent = dynamic_extent;
-
-  span() noexcept : extent_{0}, data_{nullptr} {}
-
-  span(T *data, size_t count) noexcept : extent_{count}, data_{data} {}
-
-  span(T *first, T *last) noexcept
-      : extent_{static_cast<size_t>(std::distance(first, last))}, data_{first}
-  {
-    assert(first <= last);
-  }
-
-  template <size_t N>
-  span(T (&array)[N]) noexcept : extent_{N}, data_{array}
-  {}
-
-  template <size_t N>
-  span(std::array<T, N> &array) noexcept : extent_{N}, data_{array.data()}
-  {}
-
-  template <size_t N>
-  span(const std::array<T, N> &array) noexcept : extent_{N}, data_{array.data()}
-  {}
-
-  template <
-      class C,
-      typename std::enable_if<!detail::is_specialized_span_convertible<C>::value &&
-                              std::is_convertible<typename std::remove_pointer<decltype(nostd::data(
-                                                      std::declval<C &>()))>::type (*)[],
-                                                  T (*)[]>::value &&
-                              std::is_convertible<decltype(nostd::size(std::declval<const C &>())),
-                                                  size_t>::value>::type * = nullptr>
-  span(C &c) noexcept(noexcept(nostd::data(c), nostd::size(c)))
-      : extent_{nostd::size(c)}, data_{nostd::data(c)}
-  {}
-
-  template <
-      class C,
-      typename std::enable_if<!detail::is_specialized_span_convertible<C>::value &&
-                              std::is_convertible<typename std::remove_pointer<decltype(nostd::data(
-                                                      std::declval<const C &>()))>::type (*)[],
-                                                  T (*)[]>::value &&
-                              std::is_convertible<decltype(nostd::size(std::declval<const C &>())),
-                                                  size_t>::value>::type * = nullptr>
-  span(const C &c) noexcept(noexcept(nostd::data(c), nostd::size(c)))
-      : extent_{nostd::size(c)}, data_{nostd::data(c)}
-  {}
-
-  template <class U,
-            size_t N,
-            typename std::enable_if<std::is_convertible<U (*)[], T (*)[]>::value>::type * = nullptr>
-  span(const span<U, N> &other) noexcept : extent_{other.size()}, data_{other.data()}
-  {}
-
-  span(const span &) noexcept = default;
-
-  span &operator=(const span &) noexcept = default;
-
-  bool empty() const noexcept { return extent_ == 0; }
-
-  T *data() const noexcept { return data_; }
-
-  size_t size() const noexcept { return extent_; }
-
-  T &operator[](size_t index) const noexcept
-  {
-    assert(index < extent_);
-    return data_[index];
-  }
-
-  T *begin() const noexcept { return data_; }
-
-  T *end() const noexcept { return data_ + extent_; }
-
-private:
-  size_t extent_;
-  T *data_;
-};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/string_view.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/string_view.h
deleted file mode 100644
index f0e5bd9e2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/string_view.h
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2017
-#    include "opentelemetry/std/string_view.h"
-#    define OPENTELEMETRY_HAVE_STD_STRING_VIEW
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_STRING_VIEW)
-#  include <algorithm>
-#  include <cstring>
-#  include <functional>
-#  include <ostream>
-#  include <stdexcept>
-#  include <string>
-#  include <type_traits>
-#  include <utility>
-
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-
-using Traits = std::char_traits<char>;
-
-/**
- * Back port of std::string_view to work with pre-cpp-17 compilers.
- *
- * Note: This provides a subset of the methods available on std::string_view but
- * tries to be as compatible as possible with the std::string_view interface.
- */
-class string_view
-{
-public:
-  typedef std::size_t size_type;
-
-  static constexpr size_type npos = static_cast<size_type>(-1);
-
-  string_view() noexcept : length_(0), data_(nullptr) {}
-
-  string_view(const char *str) noexcept : length_(std::strlen(str)), data_(str) {}
-
-  string_view(const std::basic_string<char> &str OPENTELEMETRY_ATTRIBUTE_LIFETIME_BOUND) noexcept
-      : length_(str.length()), data_(str.c_str())
-  {}
-
-  string_view(const char *str, size_type len) noexcept : length_(len), data_(str) {}
-
-  explicit operator std::string() const { return {data_, length_}; }
-
-  const char *data() const noexcept { return data_; }
-
-  bool empty() const noexcept { return length_ == 0; }
-
-  size_type length() const noexcept { return length_; }
-
-  size_type size() const noexcept { return length_; }
-
-  const char *begin() const noexcept { return data(); }
-
-  const char *end() const noexcept { return data() + length(); }
-
-  const char &operator[](size_type i) { return *(data() + i); }
-
-  string_view substr(size_type pos, size_type n = npos) const
-  {
-    if (pos > length_)
-    {
-#  if __EXCEPTIONS
-      throw std::out_of_range{"opentelemetry::nostd::string_view"};
-#  else
-      std::terminate();
-#  endif
-    }
-    n = (std::min)(n, length_ - pos);
-    return string_view(data_ + pos, n);
-  }
-
-  int compare(string_view v) const noexcept
-  {
-    size_type len = (std::min)(size(), v.size());
-    int result    = Traits::compare(data(), v.data(), len);
-    if (result == 0)
-      result = size() == v.size() ? 0 : (size() < v.size() ? -1 : 1);
-    return result;
-  }
-
-  int compare(size_type pos1, size_type count1, string_view v) const
-  {
-    return substr(pos1, count1).compare(v);
-  }
-
-  int compare(size_type pos1,
-              size_type count1,
-              string_view v,
-              size_type pos2,
-              size_type count2) const
-  {
-    return substr(pos1, count1).compare(v.substr(pos2, count2));
-  }
-
-  int compare(const char *s) const { return compare(string_view(s)); }
-
-  int compare(size_type pos1, size_type count1, const char *s) const
-  {
-    return substr(pos1, count1).compare(string_view(s));
-  }
-
-  int compare(size_type pos1, size_type count1, const char *s, size_type count2) const
-  {
-    return substr(pos1, count1).compare(string_view(s, count2));
-  }
-
-  size_type find(char ch, size_type pos = 0) const noexcept
-  {
-    size_type res = npos;
-    if (pos < length())
-    {
-      auto found = Traits::find(data() + pos, length() - pos, ch);
-      if (found)
-      {
-        res = found - data();
-      }
-    }
-    return res;
-  }
-
-  bool operator<(const string_view v) const noexcept { return compare(v) < 0; }
-
-  bool operator>(const string_view v) const noexcept { return compare(v) > 0; }
-
-private:
-  // Note: uses the same binary layout as libstdc++'s std::string_view
-  // See
-  // https://github.com/gcc-mirror/gcc/blob/e0c554e4da7310df83bb1dcc7b8e6c4c9c5a2a4f/libstdc%2B%2B-v3/include/std/string_view#L466-L467
-  size_type length_;
-  const char *data_;
-};
-
-inline bool operator==(string_view lhs, string_view rhs) noexcept
-{
-  return lhs.length() == rhs.length() &&
-#  if defined(_MSC_VER)
-#    if _MSC_VER >= 1900 && _MSC_VER <= 1911
-         // Avoid SCL error in Visual Studio 2015, VS2017 update 1 to update 4
-         (std::memcmp(lhs.data(), rhs.data(), lhs.length()) == 0);
-#    else
-         std::equal(lhs.data(), lhs.data() + lhs.length(), rhs.data());
-#    endif
-#  else
-         std::equal(lhs.data(), lhs.data() + lhs.length(), rhs.data());
-#  endif
-}
-
-inline bool operator==(string_view lhs, const std::string &rhs) noexcept
-{
-  return lhs == string_view(rhs);
-}
-
-inline bool operator==(const std::string &lhs, string_view rhs) noexcept
-{
-  return string_view(lhs) == rhs;
-}
-
-inline bool operator==(string_view lhs, const char *rhs) noexcept
-{
-  return lhs == string_view(rhs);
-}
-
-inline bool operator==(const char *lhs, string_view rhs) noexcept
-{
-  return string_view(lhs) == rhs;
-}
-
-inline bool operator!=(string_view lhs, string_view rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(string_view lhs, const std::string &rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const std::string &lhs, string_view rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(string_view lhs, const char *rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline bool operator!=(const char *lhs, string_view rhs) noexcept
-{
-  return !(lhs == rhs);
-}
-
-inline std::ostream &operator<<(std::ostream &os, string_view s)
-{
-  return os.write(s.data(), static_cast<std::streamsize>(s.length()));
-}
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-
-namespace std
-{
-template <>
-struct hash<OPENTELEMETRY_NAMESPACE::nostd::string_view>
-{
-  std::size_t operator()(const OPENTELEMETRY_NAMESPACE::nostd::string_view &k) const
-  {
-    // TODO: for C++17 that has native support for std::basic_string_view it would
-    // be more performance-efficient to provide a zero-copy hash.
-    auto s = std::string(k.data(), k.size());
-    return std::hash<std::string>{}(s);
-  }
-};
-}  // namespace std
-#endif /* OPENTELEMETRY_HAVE_STD_STRING_VIEW */
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/type_traits.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/type_traits.h
deleted file mode 100644
index a797c1ea0..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/type_traits.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2011
-#    include "opentelemetry/std/type_traits.h"
-#    define OPENTELEMETRY_HAVE_STD_TYPE_TRAITS
-#  endif
-#endif
-
-#include <type_traits>
-
-#if !defined(OPENTELEMETRY_HAVE_STD_TYPE_TRAITS)
-#  include <array>
-
-#  include "opentelemetry/nostd/detail/void.h"  // IWYU pragma: export
-#  include "opentelemetry/version.h"
-#endif
-
-#if !defined(__GLIBCXX__) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7) || \
-    (defined(__GLIBCXX__) && __GLIBCXX__ >= 20150422)  // >= libstdc++-5
-#  define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-/**
- * Back port of std::add_pointer_t
- */
-template <class T>
-using add_pointer_t = typename std::add_pointer<T>::type;
-
-/**
- * Back port of std::enable_if_t
- */
-template <bool B, class T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-/**
- * Back port of std::remove_const_t
- */
-template <typename T>
-using remove_const_t = typename std::remove_const<T>::type;
-
-/**
- * Back port of std::remove_reference_t
- */
-template <typename T>
-using remove_reference_t = typename std::remove_reference<T>::type;
-
-/**
- * Back port of std::remove_cvref_t
- */
-template <typename T>
-using remove_cvref_t = typename std::remove_cv<remove_reference_t<T>>::type;
-
-/**
- * Back port of std::remove_all_extents
- */
-template <typename T>
-struct remove_all_extents
-{
-  using type = T;
-};
-
-template <typename T, std::size_t N>
-struct remove_all_extents<std::array<T, N>> : remove_all_extents<T>
-{};
-
-/**
- * Back port of std::remove_all_extents_t
- */
-template <typename T>
-using remove_all_extents_t = typename remove_all_extents<T>::type;
-
-#if defined(OPENTELEMETRY_STL_VERSION) && OPENTELEMETRY_STL_VERSION >= 2017
-using std::is_nothrow_swappable;
-using std::is_swappable;
-#else
-/**
- * Back port of std::is_swappable
- */
-namespace detail
-{
-namespace swappable
-{
-
-using std::swap;
-
-template <typename T>
-struct is_swappable
-{
-private:
-  template <typename U, typename = decltype(swap(std::declval<U &>(), std::declval<U &>()))>
-  inline static std::true_type test(int);
-
-  template <typename U>
-  inline static std::false_type test(...);
-
-public:
-  static constexpr bool value = decltype(test<T>(0))::value;
-};
-
-}  // namespace swappable
-}  // namespace detail
-
-using detail::swappable::is_swappable;
-
-/**
- * Back port of std::is_swappable
- */
-namespace detail
-{
-namespace swappable
-{
-template <bool IsSwappable, typename T>
-struct is_nothrow_swappable
-{
-  static constexpr bool value = noexcept(swap(std::declval<T &>(), std::declval<T &>()));
-};
-
-template <typename T>
-struct is_nothrow_swappable<false, T> : std::false_type
-{};
-}  // namespace swappable
-}  // namespace detail
-template <typename T>
-using is_nothrow_swappable = detail::swappable::is_nothrow_swappable<is_swappable<T>::value, T>;
-#endif
-
-/**
- * Back port of
- *  std::is_trivialy_copy_constructible
- *  std::is_trivialy_move_constructible
- *  std::is_trivialy_copy_assignable
- *  std::is_trivialy_move_assignable
- */
-#ifdef OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
-using std::is_trivially_copy_assignable;
-using std::is_trivially_copy_constructible;
-using std::is_trivially_move_assignable;
-using std::is_trivially_move_constructible;
-#else
-template <typename T>
-struct is_trivially_copy_constructible
-{
-  static constexpr bool value = std::is_copy_constructible<T>::value && __has_trivial_copy(T);
-};
-
-template <typename T>
-struct is_trivially_move_constructible
-{
-  static constexpr bool value = __is_trivial(T);
-};
-
-template <typename T>
-struct is_trivially_copy_assignable
-{
-  static constexpr bool value = std::is_copy_assignable<T>::value && __has_trivial_assign(T);
-};
-
-template <typename T>
-struct is_trivially_move_assignable
-{
-  static constexpr bool value = __is_trivial(T);
-};
-#endif
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/unique_ptr.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/unique_ptr.h
deleted file mode 100644
index b3f5e6199..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/unique_ptr.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2011
-#    include "opentelemetry/std/unique_ptr.h"
-#    define OPENTELEMETRY_HAVE_STD_UNIQUE_PTR
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_UNIQUE_PTR)
-#  include <cstddef>
-#  include <memory>
-#  include <type_traits>
-#  include <utility>
-
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-namespace detail
-{
-template <class T>
-struct unique_ptr_element_type
-{
-  using type = T;
-};
-
-template <class T>
-struct unique_ptr_element_type<T[]>
-{
-  using type = T;
-};
-}  // namespace detail
-
-/**
- * Provide a simplified port of std::unique_ptr that has ABI stability.
- *
- * Note: This implementation doesn't allow for a custom deleter.
- */
-template <class T>
-class unique_ptr
-{
-public:
-  using element_type = typename detail::unique_ptr_element_type<T>::type;
-  using pointer      = element_type *;
-
-  unique_ptr() noexcept : ptr_{nullptr} {}
-
-  unique_ptr(std::nullptr_t) noexcept : ptr_{nullptr} {}
-
-  explicit unique_ptr(pointer ptr) noexcept : ptr_{ptr} {}
-
-  unique_ptr(unique_ptr &&other) noexcept : ptr_{other.release()} {}
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  unique_ptr(unique_ptr<U> &&other) noexcept : ptr_{other.release()}
-  {}
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  unique_ptr(std::unique_ptr<U> &&other) noexcept : ptr_{other.release()}
-  {}
-
-  ~unique_ptr() { reset(); }
-
-  unique_ptr &operator=(unique_ptr &&other) noexcept
-  {
-    reset(other.release());
-    return *this;
-  }
-
-  unique_ptr &operator=(std::nullptr_t) noexcept
-  {
-    reset();
-    return *this;
-  }
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  unique_ptr &operator=(unique_ptr<U> &&other) noexcept
-  {
-    reset(other.release());
-    return *this;
-  }
-
-  template <class U,
-            typename std::enable_if<std::is_convertible<U *, pointer>::value>::type * = nullptr>
-  unique_ptr &operator=(std::unique_ptr<U> &&other) noexcept
-  {
-    reset(other.release());
-    return *this;
-  }
-
-  operator std::unique_ptr<T>() && noexcept { return std::unique_ptr<T>{release()}; }
-
-  operator bool() const noexcept { return ptr_ != nullptr; }
-
-  element_type &operator*() const noexcept { return *ptr_; }
-
-  pointer operator->() const noexcept { return get(); }
-
-  pointer get() const noexcept { return ptr_; }
-
-  void reset(pointer ptr = nullptr) noexcept
-  {
-    if (ptr_ != nullptr)
-    {
-      this->delete_ptr();
-    }
-    ptr_ = ptr;
-  }
-
-  pointer release() noexcept
-  {
-    auto result = ptr_;
-    ptr_        = nullptr;
-    return result;
-  }
-
-  void swap(unique_ptr &other) noexcept { std::swap(ptr_, other.ptr_); }
-
-private:
-  pointer ptr_;
-
-  void delete_ptr() noexcept
-  {
-    if (std::is_array<T>::value)
-    {
-      delete[] ptr_;
-    }
-    else
-    {
-      delete ptr_;
-    }
-  }
-};
-
-template <class T1, class T2>
-bool operator==(const unique_ptr<T1> &lhs, const unique_ptr<T2> &rhs) noexcept
-{
-  return lhs.get() == rhs.get();
-}
-
-template <class T>
-bool operator==(const unique_ptr<T> &lhs, std::nullptr_t) noexcept
-{
-  return lhs.get() == nullptr;
-}
-
-template <class T>
-bool operator==(std::nullptr_t, const unique_ptr<T> &rhs) noexcept
-{
-  return nullptr == rhs.get();
-}
-
-template <class T1, class T2>
-bool operator!=(const unique_ptr<T1> &lhs, const unique_ptr<T2> &rhs) noexcept
-{
-  return lhs.get() != rhs.get();
-}
-
-template <class T>
-bool operator!=(const unique_ptr<T> &lhs, std::nullptr_t) noexcept
-{
-  return lhs.get() != nullptr;
-}
-
-template <class T>
-bool operator!=(std::nullptr_t, const unique_ptr<T> &rhs) noexcept
-{
-  return nullptr != rhs.get();
-}
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_HAVE_STD_UNIQUE_PTR */
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/utility.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/utility.h
deleted file mode 100644
index de4f47e4c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/utility.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2014
-#    include "opentelemetry/std/utility.h"
-#    define OPENTELEMETRY_HAVE_STD_UTILITY
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_UTILITY)
-#  include <cstddef>
-#  include <initializer_list>
-#  include <type_traits>
-
-#  include "opentelemetry/nostd/detail/decay.h"   // IWYU pragma: export
-#  include "opentelemetry/nostd/detail/invoke.h"  // IWYU pragma: export
-#  include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-/**
- * Back port of std::data
- *
- * See https://en.cppreference.com/w/cpp/iterator/data
- */
-template <class C>
-auto data(C &c) noexcept(noexcept(c.data())) -> decltype(c.data())
-{
-  return c.data();
-}
-
-template <class C>
-auto data(const C &c) noexcept(noexcept(c.data())) -> decltype(c.data())
-{
-  return c.data();
-}
-
-template <class T, size_t N>
-T *data(T (&array)[N]) noexcept
-{
-  return array;
-}
-
-template <class E>
-const E *data(std::initializer_list<E> list) noexcept
-{
-  return list.begin();
-}
-
-/**
- * Back port of std::size
- *
- * See https://en.cppreference.com/w/cpp/iterator/size
- */
-template <class C>
-auto size(const C &c) noexcept(noexcept(c.size())) -> decltype(c.size())
-{
-  return c.size();
-}
-
-template <class T, size_t N>
-size_t size(T (& /* array */)[N]) noexcept
-{
-  return N;
-}
-
-/**
- * Back port of std::bool_constant
- */
-template <bool B>
-using bool_constant = std::integral_constant<bool, B>;
-
-/**
- * Back port of std::integer_sequence
- */
-template <typename T, T... Is>
-struct integer_sequence
-{
-  using value_type = T;
-  static constexpr std::size_t size() noexcept { return sizeof...(Is); }
-};
-
-/**
- * Back port of std::index_sequence
- */
-template <std::size_t... Is>
-using index_sequence = integer_sequence<std::size_t, Is...>;
-
-/**
- * Back port of std::make_index_sequence
- */
-namespace detail
-{
-template <class, size_t>
-struct index_sequence_push_back
-{};
-
-template <size_t... Indexes, size_t I>
-struct index_sequence_push_back<index_sequence<Indexes...>, I>
-{
-  using type = index_sequence<Indexes..., I>;
-};
-
-template <class T, size_t I>
-using index_sequence_push_back_t = typename index_sequence_push_back<T, I>::type;
-
-template <size_t N>
-struct make_index_sequence_impl
-{
-  using type = index_sequence_push_back_t<typename make_index_sequence_impl<N - 1>::type, N - 1>;
-};
-
-template <>
-struct make_index_sequence_impl<0>
-{
-  using type = index_sequence<>;
-};
-}  // namespace detail
-
-template <size_t N>
-using make_index_sequence = typename detail::make_index_sequence_impl<N>::type;
-
-/**
- * Back port of std::index_sequence_for
- */
-template <class... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-/**
- * Back port of std::in_place_t
- */
-struct in_place_t
-{
-  explicit in_place_t() = default;
-};
-
-/**
- * Back port of std::in_place_index_t
- */
-template <std::size_t I>
-struct in_place_index_t
-{
-  explicit in_place_index_t() = default;
-};
-
-/**
- * Back port of std::in_place_type_t
- */
-template <typename T>
-struct in_place_type_t
-{
-  explicit in_place_type_t() = default;
-};
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif /* OPENTELEMETRY_HAVE_STD_UTILITY */
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/variant.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/variant.h
deleted file mode 100644
index 4abac7766..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/nostd/variant.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-#if defined(OPENTELEMETRY_STL_VERSION)
-#  if OPENTELEMETRY_STL_VERSION >= 2017
-#    include "opentelemetry/std/variant.h"
-#    define OPENTELEMETRY_HAVE_STD_VARIANT
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_STD_VARIANT)
-
-// We use a LOCAL snapshot of Abseil that is known to compile with Visual Studio 2015.
-// Header-only. Without compiling the actual Abseil binary. As Abseil moves on to new
-// toolchains, it may drop support for Visual Studio 2015 in future versions.
-
-#  if defined(__EXCEPTIONS)
-#    include <exception>
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-
-class bad_variant_access : public std::exception
-{
-public:
-  virtual const char *what() const noexcept override { return "bad_variant_access"; }
-};
-
-[[noreturn]] inline void throw_bad_variant_access()
-{
-  throw bad_variant_access{};
-}
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#    define THROW_BAD_VARIANT_ACCESS opentelemetry::nostd::throw_bad_variant_access()
-#  else
-#    define THROW_BAD_VARIANT_ACCESS std::terminate()
-#  endif
-
-#  ifdef _MSC_VER
-// Abseil variant implementation contains some benign non-impacting warnings
-// that should be suppressed if compiling with Visual Studio 2017 and above.
-#    pragma warning(push)
-#    pragma warning(disable : 4245)  // conversion from int to const unsigned _int64
-#    pragma warning(disable : 4127)  // conditional expression is constant
-#  endif
-
-#  include "opentelemetry/nostd/internal/absl/base/options.h"
-
-namespace absl
-{
-namespace OTABSL_OPTION_NAMESPACE_NAME
-{
-template <class T>
-struct variant_size;
-template <typename... Ts>
-class variant;
-}  // namespace OTABSL_OPTION_NAMESPACE_NAME
-}  // namespace absl
-
-#  include "opentelemetry/nostd/internal/absl/types/variant.h"
-
-#  ifdef _MSC_VER
-#    pragma warning(pop)
-#  endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-using absl::OTABSL_OPTION_NAMESPACE_NAME::get;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::get_if;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::holds_alternative;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::monostate;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::variant;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::variant_alternative_t;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::variant_size;
-using absl::OTABSL_OPTION_NAMESPACE_NAME::visit;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-
-#endif /* OPENTELEMETRY_HAVE_STD_VARIANT */
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_library_handle.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_library_handle.h
deleted file mode 100644
index 9ffe076ad..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_library_handle.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-/**
- * Manage the ownership of a dynamically loaded library.
- */
-class DynamicLibraryHandle
-{
-public:
-  virtual ~DynamicLibraryHandle() = default;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_load_unix.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_load_unix.h
deleted file mode 100644
index 83522c56e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_load_unix.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <dlfcn.h>
-#include <algorithm>
-#include <memory>
-
-#include "opentelemetry/plugin/detail/dynamic_library_handle.h"
-#include "opentelemetry/plugin/detail/loader_info.h"
-#include "opentelemetry/plugin/detail/utility.h"
-#include "opentelemetry/plugin/factory.h"
-#include "opentelemetry/plugin/hook.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-class DynamicLibraryHandleUnix final : public DynamicLibraryHandle
-{
-public:
-  explicit DynamicLibraryHandleUnix(void *handle) noexcept : handle_{handle} {}
-
-  ~DynamicLibraryHandleUnix() override { ::dlclose(handle_); }
-
-private:
-  void *handle_;
-};
-
-inline std::unique_ptr<Factory> LoadFactory(const char *plugin, std::string &error_message) noexcept
-{
-  dlerror();  // Clear any existing error.
-
-  auto handle = ::dlopen(plugin, RTLD_NOW | RTLD_LOCAL);
-  if (handle == nullptr)
-  {
-    detail::CopyErrorMessage(dlerror(), error_message);
-    return nullptr;
-  }
-
-  std::shared_ptr<DynamicLibraryHandle> library_handle{new (std::nothrow)
-                                                           DynamicLibraryHandleUnix{handle}};
-  if (library_handle == nullptr)
-  {
-    return nullptr;
-  }
-
-  auto make_factory_impl =
-      reinterpret_cast<OpenTelemetryHook *>(::dlsym(handle, "OpenTelemetryMakeFactoryImpl"));
-  if (make_factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage(dlerror(), error_message);
-    return nullptr;
-  }
-  if (*make_factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage("Invalid plugin hook", error_message);
-    return nullptr;
-  }
-  LoaderInfo loader_info;
-  nostd::unique_ptr<char[]> plugin_error_message;
-  auto factory_impl = (**make_factory_impl)(loader_info, plugin_error_message);
-  if (factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage(plugin_error_message.get(), error_message);
-    return nullptr;
-  }
-  return std::unique_ptr<Factory>{new (std::nothrow)
-                                      Factory{std::move(library_handle), std::move(factory_impl)}};
-}
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_load_windows.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_load_windows.h
deleted file mode 100644
index 5ed283375..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/dynamic_load_windows.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/plugin/detail/dynamic_library_handle.h"
-#include "opentelemetry/plugin/detail/loader_info.h"
-#include "opentelemetry/plugin/detail/utility.h"
-#include "opentelemetry/plugin/factory.h"
-#include "opentelemetry/plugin/hook.h"
-#include "opentelemetry/version.h"
-
-#include <Windows.h>
-
-#include <WinBase.h>
-#include <errhandlingapi.h>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-namespace detail
-{
-inline void GetLastErrorMessage(std::string &error_message) noexcept
-{
-  auto error_code = ::GetLastError();
-  // See https://stackoverflow.com/a/455533/4447365
-  LPTSTR error_text = nullptr;
-  auto size         = ::FormatMessage(
-      FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS,
-      nullptr, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-      reinterpret_cast<LPTSTR>(&error_text), 0, nullptr);
-  if (size == 0)
-  {
-    return;
-  }
-  CopyErrorMessage(error_text, error_message);
-  ::LocalFree(error_text);
-}
-}  // namespace detail
-
-class DynamicLibraryHandleWindows final : public DynamicLibraryHandle
-{
-public:
-  explicit DynamicLibraryHandleWindows(HINSTANCE handle) : handle_{handle} {}
-
-  ~DynamicLibraryHandleWindows() override { ::FreeLibrary(handle_); }
-
-private:
-  HINSTANCE handle_;
-};
-
-inline std::unique_ptr<Factory> LoadFactory(const char *plugin, std::string &error_message) noexcept
-{
-  auto handle = ::LoadLibrary(plugin);
-  if (handle == nullptr)
-  {
-    detail::GetLastErrorMessage(error_message);
-    return nullptr;
-  }
-
-  std::shared_ptr<DynamicLibraryHandle> library_handle{new (std::nothrow)
-                                                           DynamicLibraryHandleWindows{handle}};
-  if (library_handle == nullptr)
-  {
-    detail::CopyErrorMessage("Allocation failure", error_message);
-    return nullptr;
-  }
-
-  auto make_factory_impl = reinterpret_cast<OpenTelemetryHook *>(
-      ::GetProcAddress(handle, "OpenTelemetryMakeFactoryImpl"));
-  if (make_factory_impl == nullptr)
-  {
-    detail::GetLastErrorMessage(error_message);
-    return nullptr;
-  }
-  if (*make_factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage("Invalid plugin hook", error_message);
-    return nullptr;
-  }
-
-  LoaderInfo loader_info;
-  nostd::unique_ptr<char[]> plugin_error_message;
-  auto factory_impl = (**make_factory_impl)(loader_info, plugin_error_message);
-  if (factory_impl == nullptr)
-  {
-    detail::CopyErrorMessage(plugin_error_message.get(), error_message);
-    return nullptr;
-  }
-  return std::unique_ptr<Factory>{new (std::nothrow)
-                                      Factory{std::move(library_handle), std::move(factory_impl)}};
-}
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/loader_info.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/loader_info.h
deleted file mode 100644
index ca8c9f0a1..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/loader_info.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-/**
- * LoaderInfo describes the versioning of the loader.
- *
- * Plugins can check against this information and properly error out if they were built against an
- * incompatible OpenTelemetry API.
- */
-struct LoaderInfo
-{
-  nostd::string_view opentelemetry_version     = OPENTELEMETRY_VERSION;
-  nostd::string_view opentelemetry_abi_version = OPENTELEMETRY_ABI_VERSION;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/tracer_handle.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/tracer_handle.h
deleted file mode 100644
index 46b128106..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/tracer_handle.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-class Tracer;
-}  // namespace trace
-
-namespace plugin
-{
-/**
- * Manage the ownership of a dynamically loaded tracer.
- */
-class TracerHandle
-{
-public:
-  virtual ~TracerHandle() = default;
-
-  virtual trace::Tracer &tracer() const noexcept = 0;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/utility.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/utility.h
deleted file mode 100644
index 8007f285d..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/detail/utility.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#if __EXCEPTIONS
-#  include <new>
-#endif  // __EXCEPTIONS
-
-#include <string>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-namespace detail
-{
-inline void CopyErrorMessage(const char *source, std::string &destination) noexcept
-#if __EXCEPTIONS
-try
-#endif
-{
-  if (source == nullptr)
-  {
-    return;
-  }
-  destination.assign(source);
-}
-#if __EXCEPTIONS
-catch (const std::bad_alloc &)
-{}
-#endif
-}  // namespace detail
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/dynamic_load.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/dynamic_load.h
deleted file mode 100644
index 2da271355..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/dynamic_load.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/plugin/factory.h"
-#include "opentelemetry/version.h"
-
-#ifdef _WIN32
-#  include "opentelemetry/plugin/detail/dynamic_load_windows.h"  // IWYU pragma: export
-#else
-#  include "opentelemetry/plugin/detail/dynamic_load_unix.h"  // IWYU pragma: export
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-
-/**
- * Load an OpenTelemetry implementation as a plugin.
- * @param plugin the path to the plugin to load
- * @param error_message on failure this is set to an error message
- * @return a Factory that can be used to create OpenTelemetry objects or nullptr on failure.
- */
-std::unique_ptr<Factory> LoadFactory(const char *plugin, std::string &error_message) noexcept;
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/factory.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/factory.h
deleted file mode 100644
index d9df30e48..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "opentelemetry/plugin/detail/utility.h"  // IWYU pragma: export
-#include "opentelemetry/plugin/tracer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-/**
- * Factory creates OpenTelemetry objects from configuration strings.
- */
-class Factory final
-{
-public:
-  class FactoryImpl
-  {
-  public:
-    virtual ~FactoryImpl() {}
-
-    virtual nostd::unique_ptr<TracerHandle> MakeTracerHandle(
-        nostd::string_view tracer_config,
-        nostd::unique_ptr<char[]> &error_message) const noexcept = 0;
-  };
-
-  Factory(std::shared_ptr<DynamicLibraryHandle> library_handle,
-          std::unique_ptr<FactoryImpl> &&factory_impl) noexcept
-      : library_handle_{std::move(library_handle)}, factory_impl_{std::move(factory_impl)}
-  {}
-
-  /**
-   * Construct a tracer from a configuration string.
-   * @param tracer_config a representation of the tracer's config as a string.
-   * @param error_message on failure this will contain an error message.
-   * @return a Tracer on success or nullptr on failure.
-   */
-  std::shared_ptr<trace::Tracer> MakeTracer(nostd::string_view tracer_config,
-                                            std::string &error_message) const noexcept
-  {
-    nostd::unique_ptr<char[]> plugin_error_message;
-    auto tracer_handle = factory_impl_->MakeTracerHandle(tracer_config, plugin_error_message);
-    if (tracer_handle == nullptr)
-    {
-      detail::CopyErrorMessage(plugin_error_message.get(), error_message);
-      return nullptr;
-    }
-    return std::shared_ptr<trace::Tracer>{new (std::nothrow)
-                                              Tracer{library_handle_, std::move(tracer_handle)}};
-  }
-
-private:
-  // Note: The order is important here.
-  //
-  // It's undefined behavior to close the library while a loaded FactoryImpl is still active.
-  std::shared_ptr<DynamicLibraryHandle> library_handle_;
-  std::unique_ptr<FactoryImpl> factory_impl_;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/hook.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/hook.h
deleted file mode 100644
index 9b18e2a6a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/hook.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-#ifdef _WIN32
-
-/**
- * Cross-platform helper macro to declare the symbol used to load an OpenTelemetry implementation
- * as a plugin.
- *
- * Note: The symbols use weak linkage so as to support using an OpenTelemetry both as a regular
- * library and a dynamically loaded plugin. The weak linkage allows for multiple implementations to
- * be linked in without getting multiple definition errors.
- */
-#  define OPENTELEMETRY_DEFINE_PLUGIN_HOOK(X)                                   \
-    extern "C" {                                                                \
-    extern __declspec(dllexport) opentelemetry::plugin::OpenTelemetryHook const \
-        OpenTelemetryMakeFactoryImpl;                                           \
-                                                                                \
-    __declspec(selectany) opentelemetry::plugin::OpenTelemetryHook const        \
-        OpenTelemetryMakeFactoryImpl = X;                                       \
-    }  // extern "C"
-
-#else
-
-#  define OPENTELEMETRY_DEFINE_PLUGIN_HOOK(X)                                                      \
-    extern "C" {                                                                                   \
-    __attribute((                                                                                  \
-        weak)) extern opentelemetry::plugin::OpenTelemetryHook const OpenTelemetryMakeFactoryImpl; \
-                                                                                                   \
-    opentelemetry::plugin::OpenTelemetryHook const OpenTelemetryMakeFactoryImpl = X;               \
-    }  // extern "C"
-
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-
-struct LoaderInfo;
-class FactoryImpl;
-
-using OpenTelemetryHook =
-    nostd::unique_ptr<Factory::FactoryImpl> (*)(const LoaderInfo &loader_info,
-                                                nostd::unique_ptr<char[]> &error_message);
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/tracer.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/tracer.h
deleted file mode 100644
index 99d1fc4c2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/plugin/tracer.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <memory>
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/plugin/detail/tracer_handle.h"  // IWYU pragma: export
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace plugin
-{
-
-class DynamicLibraryHandle;
-
-class Span final : public trace::Span
-{
-public:
-  Span(std::shared_ptr<trace::Tracer> &&tracer, const nostd::shared_ptr<trace::Span> &span) noexcept
-      : tracer_{std::move(tracer)}, span_{span}
-  {}
-
-  // trace::Span
-  void SetAttribute(nostd::string_view name, const common::AttributeValue &value) noexcept override
-  {
-    span_->SetAttribute(name, value);
-  }
-
-  void AddEvent(nostd::string_view name) noexcept override { span_->AddEvent(name); }
-
-  void AddEvent(nostd::string_view name, common::SystemTimestamp timestamp) noexcept override
-  {
-    span_->AddEvent(name, timestamp);
-  }
-
-  void AddEvent(nostd::string_view name,
-                const common::KeyValueIterable &attributes) noexcept override
-  {
-    span_->AddEvent(name, attributes);
-  }
-
-  void AddEvent(nostd::string_view name,
-                common::SystemTimestamp timestamp,
-                const common::KeyValueIterable &attributes) noexcept override
-  {
-    span_->AddEvent(name, timestamp, attributes);
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void AddLink(const trace::SpanContext &target,
-               const common::KeyValueIterable &attrs) noexcept override
-  {
-    span_->AddLink(target, attrs);
-  }
-
-  void AddLinks(const trace::SpanContextKeyValueIterable &links) noexcept override
-  {
-    span_->AddLinks(links);
-  }
-#endif
-
-  void SetStatus(trace::StatusCode code, nostd::string_view description) noexcept override
-  {
-    span_->SetStatus(code, description);
-  }
-
-  void UpdateName(nostd::string_view name) noexcept override { span_->UpdateName(name); }
-
-  void End(const trace::EndSpanOptions &options = {}) noexcept override { span_->End(options); }
-
-  bool IsRecording() const noexcept override { return span_->IsRecording(); }
-
-  trace::SpanContext GetContext() const noexcept override { return span_->GetContext(); }
-
-private:
-  std::shared_ptr<trace::Tracer> tracer_;
-  nostd::shared_ptr<trace::Span> span_;
-};
-
-class Tracer final : public trace::Tracer, public std::enable_shared_from_this<Tracer>
-{
-public:
-  Tracer(std::shared_ptr<DynamicLibraryHandle> library_handle,
-         std::unique_ptr<TracerHandle> &&tracer_handle) noexcept
-      : library_handle_{std::move(library_handle)}, tracer_handle_{std::move(tracer_handle)}
-  {
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    UpdateEnabled(true);
-#endif
-  }
-
-  // trace::Tracer
-  nostd::shared_ptr<trace::Span> StartSpan(
-      nostd::string_view name,
-      const common::KeyValueIterable &attributes,
-      const trace::SpanContextKeyValueIterable &links,
-      const trace::StartSpanOptions &options = {}) noexcept override
-  {
-    auto span = tracer_handle_->tracer().StartSpan(name, attributes, links, options);
-    if (span == nullptr)
-    {
-      return nostd::shared_ptr<trace::Span>(nullptr);
-    }
-    return nostd::shared_ptr<trace::Span>{new (std::nothrow) Span{this->shared_from_this(), span}};
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-
-  void ForceFlushWithMicroseconds(uint64_t timeout) noexcept override
-  {
-    tracer_handle_->tracer().ForceFlushWithMicroseconds(timeout);
-  }
-
-  void CloseWithMicroseconds(uint64_t timeout) noexcept override
-  {
-    tracer_handle_->tracer().CloseWithMicroseconds(timeout);
-  }
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-private:
-  // Note: The order is important here.
-  //
-  // It's undefined behavior to close the library while a loaded tracer is still active.
-  std::shared_ptr<DynamicLibraryHandle> library_handle_;
-  std::unique_ptr<TracerHandle> tracer_handle_;
-};
-}  // namespace plugin
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/azure_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/azure_metrics.h
deleted file mode 100644
index 63f4556b0..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/azure_metrics.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace azure
-{
-
-/**
- * Number of active client instances
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricAzureCosmosdbClientActiveInstanceCount =
-    "azure.cosmosdb.client.active_instance.count";
-static constexpr const char *descrMetricAzureCosmosdbClientActiveInstanceCount =
-    "Number of active client instances";
-static constexpr const char *unitMetricAzureCosmosdbClientActiveInstanceCount = "{instance}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricAzureCosmosdbClientActiveInstanceCount,
-                                         descrMetricAzureCosmosdbClientActiveInstanceCount,
-                                         unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricAzureCosmosdbClientActiveInstanceCount,
-                                          descrMetricAzureCosmosdbClientActiveInstanceCount,
-                                          unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricAzureCosmosdbClientActiveInstanceCount,
-      descrMetricAzureCosmosdbClientActiveInstanceCount,
-      unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricAzureCosmosdbClientActiveInstanceCount,
-      descrMetricAzureCosmosdbClientActiveInstanceCount,
-      unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-/**
- * <a href="https://learn.microsoft.com/azure/cosmos-db/request-units">Request units</a> consumed by
- * the operation <p> histogram
- */
-static constexpr const char *kMetricAzureCosmosdbClientOperationRequestCharge =
-    "azure.cosmosdb.client.operation.request_charge";
-static constexpr const char *descrMetricAzureCosmosdbClientOperationRequestCharge =
-    "[Request units](https://learn.microsoft.com/azure/cosmos-db/request-units) consumed by the "
-    "operation";
-static constexpr const char *unitMetricAzureCosmosdbClientOperationRequestCharge = "{request_unit}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricAzureCosmosdbClientOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricAzureCosmosdbClientOperationRequestCharge,
-                                      descrMetricAzureCosmosdbClientOperationRequestCharge,
-                                      unitMetricAzureCosmosdbClientOperationRequestCharge);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricAzureCosmosdbClientOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricAzureCosmosdbClientOperationRequestCharge,
-                                      descrMetricAzureCosmosdbClientOperationRequestCharge,
-                                      unitMetricAzureCosmosdbClientOperationRequestCharge);
-}
-
-}  // namespace azure
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/cicd_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/cicd_metrics.h
deleted file mode 100644
index 993c2636f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/cicd_metrics.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cicd
-{
-
-/**
- * The number of pipeline runs currently active in the system by state.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricCicdPipelineRunActive = "cicd.pipeline.run.active";
-static constexpr const char *descrMetricCicdPipelineRunActive =
-    "The number of pipeline runs currently active in the system by state.";
-static constexpr const char *unitMetricCicdPipelineRunActive = "{run}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricCicdPipelineRunActive,
-                                         descrMetricCicdPipelineRunActive,
-                                         unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricCicdPipelineRunActive,
-                                          descrMetricCicdPipelineRunActive,
-                                          unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricCicdPipelineRunActive,
-                                                   descrMetricCicdPipelineRunActive,
-                                                   unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricCicdPipelineRunActive,
-                                                    descrMetricCicdPipelineRunActive,
-                                                    unitMetricCicdPipelineRunActive);
-}
-
-/**
- * Duration of a pipeline run grouped by pipeline, state and result.
- * <p>
- * histogram
- */
-static constexpr const char *kMetricCicdPipelineRunDuration = "cicd.pipeline.run.duration";
-static constexpr const char *descrMetricCicdPipelineRunDuration =
-    "Duration of a pipeline run grouped by pipeline, state and result.";
-static constexpr const char *unitMetricCicdPipelineRunDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricCicdPipelineRunDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricCicdPipelineRunDuration,
-                                      descrMetricCicdPipelineRunDuration,
-                                      unitMetricCicdPipelineRunDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricCicdPipelineRunDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricCicdPipelineRunDuration,
-                                      descrMetricCicdPipelineRunDuration,
-                                      unitMetricCicdPipelineRunDuration);
-}
-
-/**
- * The number of errors encountered in pipeline runs (eg. compile, test failures).
- * <p>
- * There might be errors in a pipeline run that are non fatal (eg. they are suppressed) or in a
- * parallel stage multiple stages could have a fatal error. This means that this error count might
- * not be the same as the count of metric @code cicd.pipeline.run.duration @endcode with run result
- * @code failure @endcode. <p> counter
- */
-static constexpr const char *kMetricCicdPipelineRunErrors = "cicd.pipeline.run.errors";
-static constexpr const char *descrMetricCicdPipelineRunErrors =
-    "The number of errors encountered in pipeline runs (eg. compile, test failures).";
-static constexpr const char *unitMetricCicdPipelineRunErrors = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCicdPipelineRunErrors, descrMetricCicdPipelineRunErrors,
-                                    unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCicdPipelineRunErrors, descrMetricCicdPipelineRunErrors,
-                                    unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCicdPipelineRunErrors,
-                                             descrMetricCicdPipelineRunErrors,
-                                             unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCicdPipelineRunErrors,
-                                              descrMetricCicdPipelineRunErrors,
-                                              unitMetricCicdPipelineRunErrors);
-}
-
-/**
- * The number of errors in a component of the CICD system (eg. controller, scheduler, agent).
- * <p>
- * Errors in pipeline run execution are explicitly excluded. Ie a test failure is not counted in
- * this metric. <p> counter
- */
-static constexpr const char *kMetricCicdSystemErrors = "cicd.system.errors";
-static constexpr const char *descrMetricCicdSystemErrors =
-    "The number of errors in a component of the CICD system (eg. controller, scheduler, agent).";
-static constexpr const char *unitMetricCicdSystemErrors = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricCicdSystemErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                    unitMetricCicdSystemErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricCicdSystemErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                    unitMetricCicdSystemErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdSystemErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                             unitMetricCicdSystemErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdSystemErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                              unitMetricCicdSystemErrors);
-}
-
-/**
- * The number of workers on the CICD system by state.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricCicdWorkerCount = "cicd.worker.count";
-static constexpr const char *descrMetricCicdWorkerCount =
-    "The number of workers on the CICD system by state.";
-static constexpr const char *unitMetricCicdWorkerCount = "{count}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricCicdWorkerCount, descrMetricCicdWorkerCount,
-                                         unitMetricCicdWorkerCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricCicdWorkerCount, descrMetricCicdWorkerCount,
-                                          unitMetricCicdWorkerCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricCicdWorkerCount, descrMetricCicdWorkerCount, unitMetricCicdWorkerCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricCicdWorkerCount, descrMetricCicdWorkerCount, unitMetricCicdWorkerCount);
-}
-
-}  // namespace cicd
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/client_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/client_attributes.h
deleted file mode 100644
index 7f944176d..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/client_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace client
-{
-
-/**
-  Client address - domain name if available without reverse DNS lookup; otherwise, IP address or
-  Unix domain socket name. <p> When observed from the server side, and when communicating through an
-  intermediary, @code client.address @endcode SHOULD represent the client address behind any
-  intermediaries,  for example proxies, if it's available.
- */
-static constexpr const char *kClientAddress = "client.address";
-
-/**
-  Client port number.
-  <p>
-  When observed from the server side, and when communicating through an intermediary, @code
-  client.port @endcode SHOULD represent the client port behind any intermediaries,  for example
-  proxies, if it's available.
- */
-static constexpr const char *kClientPort = "client.port";
-
-}  // namespace client
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/code_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/code_attributes.h
deleted file mode 100644
index cec6ae554..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/code_attributes.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace code
-{
-
-/**
-  The column number in @code code.file.path @endcode best representing the operation. It SHOULD
-  point within the code unit named in @code code.function.name @endcode. This attribute MUST NOT be
-  used on the Profile signal since the data is already captured in 'message Line'. This constraint
-  is imposed to prevent redundancy and maintain data integrity.
- */
-static constexpr const char *kCodeColumnNumber = "code.column.number";
-
-/**
-  The source code file name that identifies the code unit as uniquely as possible (preferably an
-  absolute file path). This attribute MUST NOT be used on the Profile signal since the data is
-  already captured in 'message Function'. This constraint is imposed to prevent redundancy and
-  maintain data integrity.
- */
-static constexpr const char *kCodeFilePath = "code.file.path";
-
-/**
-  The method or function fully-qualified name without arguments. The value should fit the natural
-  representation of the language runtime, which is also likely the same used within @code
-  code.stacktrace @endcode attribute value. This attribute MUST NOT be used on the Profile signal
-  since the data is already captured in 'message Function'. This constraint is imposed to prevent
-  redundancy and maintain data integrity. <p> Values and format depends on each language runtime,
-  thus it is impossible to provide an exhaustive list of examples. The values are usually the same
-  (or prefixes of) the ones found in native stack trace representation stored in
-  @code code.stacktrace @endcode without information on arguments.
-  <p>
-  Examples:
-  <ul>
-    <li>Java method: @code com.example.MyHttpService.serveRequest @endcode</li>
-    <li>Java anonymous class method: @code com.mycompany.Main$1.myMethod @endcode</li>
-    <li>Java lambda method: @code com.mycompany.Main$$Lambda/0x0000748ae4149c00.myMethod
-  @endcode</li> <li>PHP function: @code GuzzleHttp\Client::transfer @endcode</li> <li>Go function:
-  @code github.com/my/repo/pkg.foo.func5 @endcode</li> <li>Elixir: @code OpenTelemetry.Ctx.new
-  @endcode</li> <li>Erlang: @code opentelemetry_ctx:new @endcode</li> <li>Rust: @code
-  playground::my_module::my_cool_func @endcode</li> <li>C function: @code fopen @endcode</li>
-  </ul>
- */
-static constexpr const char *kCodeFunctionName = "code.function.name";
-
-/**
-  The line number in @code code.file.path @endcode best representing the operation. It SHOULD point
-  within the code unit named in @code code.function.name @endcode. This attribute MUST NOT be used
-  on the Profile signal since the data is already captured in 'message Line'. This constraint is
-  imposed to prevent redundancy and maintain data integrity.
- */
-static constexpr const char *kCodeLineNumber = "code.line.number";
-
-/**
-  A stacktrace as a string in the natural representation for the language runtime. The
-  representation is identical to <a
-  href="/docs/exceptions/exceptions-spans.md#stacktrace-representation">@code exception.stacktrace
-  @endcode</a>. This attribute MUST NOT be used on the Profile signal since the data is already
-  captured in 'message Location'. This constraint is imposed to prevent redundancy and maintain data
-  integrity.
- */
-static constexpr const char *kCodeStacktrace = "code.stacktrace";
-
-}  // namespace code
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/container_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/container_metrics.h
deleted file mode 100644
index d3fef8b91..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/container_metrics.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace container
-{
-
-/**
- * Total CPU time consumed
- * <p>
- * Total CPU time consumed by the specific container on all available CPU cores
- * <p>
- * counter
- */
-static constexpr const char *kMetricContainerCpuTime     = "container.cpu.time";
-static constexpr const char *descrMetricContainerCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricContainerCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                    unitMetricContainerCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                    unitMetricContainerCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                             unitMetricContainerCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                              unitMetricContainerCpuTime);
-}
-
-/**
- * Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
- * <p>
- * CPU usage of the specific container on all available CPU cores, averaged over the sample window
- * <p>
- * gauge
- */
-static constexpr const char *kMetricContainerCpuUsage = "container.cpu.usage";
-static constexpr const char *descrMetricContainerCpuUsage =
-    "Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricContainerCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricContainerCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                 unitMetricContainerCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricContainerCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                  unitMetricContainerCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                           unitMetricContainerCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                            unitMetricContainerCpuUsage);
-}
-
-/**
- * Disk bytes for the container.
- * <p>
- * The total number of bytes read/written successfully (aggregated from all disks).
- * <p>
- * counter
- */
-static constexpr const char *kMetricContainerDiskIo     = "container.disk.io";
-static constexpr const char *descrMetricContainerDiskIo = "Disk bytes for the container.";
-static constexpr const char *unitMetricContainerDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                    unitMetricContainerDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                    unitMetricContainerDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerDiskIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                             unitMetricContainerDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerDiskIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                              unitMetricContainerDiskIo);
-}
-
-/**
- * Memory usage of the container.
- * <p>
- * Memory usage of the container.
- * <p>
- * counter
- */
-static constexpr const char *kMetricContainerMemoryUsage     = "container.memory.usage";
-static constexpr const char *descrMetricContainerMemoryUsage = "Memory usage of the container.";
-static constexpr const char *unitMetricContainerMemoryUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage,
-                                    unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage,
-                                    unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
-}
-
-/**
- * Network bytes for the container.
- * <p>
- * The number of bytes sent/received on all network interfaces by the container.
- * <p>
- * counter
- */
-static constexpr const char *kMetricContainerNetworkIo     = "container.network.io";
-static constexpr const char *descrMetricContainerNetworkIo = "Network bytes for the container.";
-static constexpr const char *unitMetricContainerNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerNetworkIo, descrMetricContainerNetworkIo,
-                                    unitMetricContainerNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerNetworkIo, descrMetricContainerNetworkIo,
-                                    unitMetricContainerNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricContainerNetworkIo, descrMetricContainerNetworkIo, unitMetricContainerNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricContainerNetworkIo, descrMetricContainerNetworkIo, unitMetricContainerNetworkIo);
-}
-
-/**
- * The time the container has been running
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricContainerUptime     = "container.uptime";
-static constexpr const char *descrMetricContainerUptime = "The time the container has been running";
-static constexpr const char *unitMetricContainerUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricContainerUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                 unitMetricContainerUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricContainerUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                  unitMetricContainerUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerUptime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                           unitMetricContainerUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerUptime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                            unitMetricContainerUptime);
-}
-
-}  // namespace container
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/cpu_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/cpu_metrics.h
deleted file mode 100644
index f9e6de5eb..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/cpu_metrics.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpu
-{
-
-/**
- * Operating frequency of the logical CPU in Hertz.
- * <p>
- * gauge
- */
-static constexpr const char *kMetricCpuFrequency = "cpu.frequency";
-static constexpr const char *descrMetricCpuFrequency =
-    "Operating frequency of the logical CPU in Hertz.";
-static constexpr const char *unitMetricCpuFrequency = "Hz";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                 unitMetricCpuFrequency);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                  unitMetricCpuFrequency);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                           unitMetricCpuFrequency);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                            unitMetricCpuFrequency);
-}
-
-/**
- * Seconds each logical CPU spent on each mode
- * <p>
- * counter
- */
-static constexpr const char *kMetricCpuTime     = "cpu.time";
-static constexpr const char *descrMetricCpuTime = "Seconds each logical CPU spent on each mode";
-static constexpr const char *unitMetricCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCpuTime, descrMetricCpuTime,
-                                              unitMetricCpuTime);
-}
-
-/**
- * For each logical CPU, the utilization is calculated as the change in cumulative CPU time
- * (cpu.time) over a measurement interval, divided by the elapsed time. <p> gauge
- */
-static constexpr const char *kMetricCpuUtilization = "cpu.utilization";
-static constexpr const char *descrMetricCpuUtilization =
-    "For each logical CPU, the utilization is calculated as the change in cumulative CPU time "
-    "(cpu.time) over a measurement interval, divided by the elapsed time.";
-static constexpr const char *unitMetricCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                 unitMetricCpuUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                  unitMetricCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                           unitMetricCpuUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                            unitMetricCpuUtilization);
-}
-
-}  // namespace cpu
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/db_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/db_attributes.h
deleted file mode 100644
index 0e6e51c51..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/db_attributes.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace db
-{
-
-/**
-  The name of a collection (table, container) within the database.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  The collection name SHOULD NOT be extracted from @code db.query.text @endcode,
-  when the database system supports query text with multiple collections
-  in non-batch operations.
-  <p>
-  For batch operations, if the individual operations are known to have the same
-  collection name then that collection name SHOULD be used.
- */
-static constexpr const char *kDbCollectionName = "db.collection.name";
-
-/**
-  The name of the database, fully qualified within the server address and port.
-  <p>
-  If a database system has multiple namespace components, they SHOULD be concatenated from the most
-  general to the most specific namespace component, using @code | @endcode as a separator between
-  the components. Any missing components (and their associated separators) SHOULD be omitted.
-  Semantic conventions for individual database systems SHOULD document what @code db.namespace
-  @endcode means in the context of that system. It is RECOMMENDED to capture the value as provided
-  by the application without attempting to do any case normalization.
- */
-static constexpr const char *kDbNamespace = "db.namespace";
-
-/**
-  The number of queries included in a batch operation.
-  <p>
-  Operations are only considered batches when they contain two or more operations, and so @code
-  db.operation.batch.size @endcode SHOULD never be @code 1 @endcode.
- */
-static constexpr const char *kDbOperationBatchSize = "db.operation.batch.size";
-
-/**
-  The name of the operation or command being executed.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  The operation name SHOULD NOT be extracted from @code db.query.text @endcode,
-  when the database system supports query text with multiple operations
-  in non-batch operations.
-  <p>
-  If spaces can occur in the operation name, multiple consecutive spaces
-  SHOULD be normalized to a single space.
-  <p>
-  For batch operations, if the individual operations are known to have the same operation name
-  then that operation name SHOULD be used prepended by @code BATCH  @endcode,
-  otherwise @code db.operation.name @endcode SHOULD be @code BATCH @endcode or some other database
-  system specific term if more applicable.
- */
-static constexpr const char *kDbOperationName = "db.operation.name";
-
-/**
-  Low cardinality summary of a database query.
-  <p>
-  The query summary describes a class of database queries and is useful
-  as a grouping key, especially when analyzing telemetry for database
-  calls involving complex queries.
-  <p>
-  Summary may be available to the instrumentation through
-  instrumentation hooks or other means. If it is not available, instrumentations
-  that support query parsing SHOULD generate a summary following
-  <a href="/docs/database/database-spans.md#generating-a-summary-of-the-query">Generating query
-  summary</a> section.
- */
-static constexpr const char *kDbQuerySummary = "db.query.summary";
-
-/**
-  The database query being executed.
-  <p>
-  For sanitization see <a
-  href="/docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of @code
-  db.query.text @endcode</a>. For batch operations, if the individual operations are known to have
-  the same query text then that query text SHOULD be used, otherwise all of the individual query
-  texts SHOULD be concatenated with separator @code ;  @endcode or some other database system
-  specific separator if more applicable. Parameterized query text SHOULD NOT be sanitized. Even
-  though parameterized query text can potentially have sensitive data, by using a parameterized
-  query the user is giving a strong signal that any sensitive data will be passed as parameter
-  values, and the benefit to observability of capturing the static part of the query text by default
-  outweighs the risk.
- */
-static constexpr const char *kDbQueryText = "db.query.text";
-
-/**
-  Database response status code.
-  <p>
-  The status code returned by the database. Usually it represents an error code, but may also
-  represent partial success, warning, or differentiate between various types of successful outcomes.
-  Semantic conventions for individual database systems SHOULD document what @code
-  db.response.status_code @endcode means in the context of that system.
- */
-static constexpr const char *kDbResponseStatusCode = "db.response.status_code";
-
-/**
-  The name of a stored procedure within the database.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  For batch operations, if the individual operations are known to have the same
-  stored procedure name then that stored procedure name SHOULD be used.
- */
-static constexpr const char *kDbStoredProcedureName = "db.stored_procedure.name";
-
-/**
-  The database management system (DBMS) product as identified by the client instrumentation.
-  <p>
-  The actual DBMS may differ from the one identified by the client. For example, when using
-  PostgreSQL client libraries to connect to a CockroachDB, the @code db.system.name @endcode is set
-  to @code postgresql @endcode based on the instrumentation's best knowledge.
- */
-static constexpr const char *kDbSystemName = "db.system.name";
-
-namespace DbSystemNameValues
-{
-/**
-  Some other SQL database. Fallback only.
- */
-static constexpr const char *kOtherSql = "other_sql";
-
-/**
-  <a href="https://documentation.softwareag.com/?pf=adabas">Adabas (Adaptable Database System)</a>
- */
-static constexpr const char *kSoftwareagAdabas = "softwareag.adabas";
-
-/**
-  <a href="https://www.actian.com/databases/ingres/">Actian Ingres</a>
- */
-static constexpr const char *kActianIngres = "actian.ingres";
-
-/**
-  <a href="https://aws.amazon.com/pm/dynamodb/">Amazon DynamoDB</a>
- */
-static constexpr const char *kAwsDynamodb = "aws.dynamodb";
-
-/**
-  <a href="https://aws.amazon.com/redshift/">Amazon Redshift</a>
- */
-static constexpr const char *kAwsRedshift = "aws.redshift";
-
-/**
-  <a href="https://learn.microsoft.com/azure/cosmos-db">Azure Cosmos DB</a>
- */
-static constexpr const char *kAzureCosmosdb = "azure.cosmosdb";
-
-/**
-  <a href="https://www.intersystems.com/products/cache/">InterSystems Caché</a>
- */
-static constexpr const char *kIntersystemsCache = "intersystems.cache";
-
-/**
-  <a href="https://cassandra.apache.org/">Apache Cassandra</a>
- */
-static constexpr const char *kCassandra = "cassandra";
-
-/**
-  <a href="https://clickhouse.com/">ClickHouse</a>
- */
-static constexpr const char *kClickhouse = "clickhouse";
-
-/**
-  <a href="https://www.cockroachlabs.com/">CockroachDB</a>
- */
-static constexpr const char *kCockroachdb = "cockroachdb";
-
-/**
-  <a href="https://www.couchbase.com/">Couchbase</a>
- */
-static constexpr const char *kCouchbase = "couchbase";
-
-/**
-  <a href="https://couchdb.apache.org/">Apache CouchDB</a>
- */
-static constexpr const char *kCouchdb = "couchdb";
-
-/**
-  <a href="https://db.apache.org/derby/">Apache Derby</a>
- */
-static constexpr const char *kDerby = "derby";
-
-/**
-  <a href="https://www.elastic.co/elasticsearch">Elasticsearch</a>
- */
-static constexpr const char *kElasticsearch = "elasticsearch";
-
-/**
-  <a href="https://www.firebirdsql.org/">Firebird</a>
- */
-static constexpr const char *kFirebirdsql = "firebirdsql";
-
-/**
-  <a href="https://cloud.google.com/spanner">Google Cloud Spanner</a>
- */
-static constexpr const char *kGcpSpanner = "gcp.spanner";
-
-/**
-  <a href="https://geode.apache.org/">Apache Geode</a>
- */
-static constexpr const char *kGeode = "geode";
-
-/**
-  <a href="https://h2database.com/">H2 Database</a>
- */
-static constexpr const char *kH2database = "h2database";
-
-/**
-  <a href="https://hbase.apache.org/">Apache HBase</a>
- */
-static constexpr const char *kHbase = "hbase";
-
-/**
-  <a href="https://hive.apache.org/">Apache Hive</a>
- */
-static constexpr const char *kHive = "hive";
-
-/**
-  <a href="https://hsqldb.org/">HyperSQL Database</a>
- */
-static constexpr const char *kHsqldb = "hsqldb";
-
-/**
-  <a href="https://www.ibm.com/db2">IBM Db2</a>
- */
-static constexpr const char *kIbmDb2 = "ibm.db2";
-
-/**
-  <a href="https://www.ibm.com/products/informix">IBM Informix</a>
- */
-static constexpr const char *kIbmInformix = "ibm.informix";
-
-/**
-  <a href="https://www.ibm.com/products/netezza">IBM Netezza</a>
- */
-static constexpr const char *kIbmNetezza = "ibm.netezza";
-
-/**
-  <a href="https://www.influxdata.com/">InfluxDB</a>
- */
-static constexpr const char *kInfluxdb = "influxdb";
-
-/**
-  <a href="https://www.instantdb.com/">Instant</a>
- */
-static constexpr const char *kInstantdb = "instantdb";
-
-/**
-  <a href="https://mariadb.org/">MariaDB</a>
- */
-static constexpr const char *kMariadb = "mariadb";
-
-/**
-  <a href="https://memcached.org/">Memcached</a>
- */
-static constexpr const char *kMemcached = "memcached";
-
-/**
-  <a href="https://www.mongodb.com/">MongoDB</a>
- */
-static constexpr const char *kMongodb = "mongodb";
-
-/**
-  <a href="https://www.microsoft.com/sql-server">Microsoft SQL Server</a>
- */
-static constexpr const char *kMicrosoftSqlServer = "microsoft.sql_server";
-
-/**
-  <a href="https://www.mysql.com/">MySQL</a>
- */
-static constexpr const char *kMysql = "mysql";
-
-/**
-  <a href="https://neo4j.com/">Neo4j</a>
- */
-static constexpr const char *kNeo4j = "neo4j";
-
-/**
-  <a href="https://opensearch.org/">OpenSearch</a>
- */
-static constexpr const char *kOpensearch = "opensearch";
-
-/**
-  <a href="https://www.oracle.com/database/">Oracle Database</a>
- */
-static constexpr const char *kOracleDb = "oracle.db";
-
-/**
-  <a href="https://www.postgresql.org/">PostgreSQL</a>
- */
-static constexpr const char *kPostgresql = "postgresql";
-
-/**
-  <a href="https://redis.io/">Redis</a>
- */
-static constexpr const char *kRedis = "redis";
-
-/**
-  <a href="https://www.sap.com/products/technology-platform/hana/what-is-sap-hana.html">SAP HANA</a>
- */
-static constexpr const char *kSapHana = "sap.hana";
-
-/**
-  <a href="https://maxdb.sap.com/">SAP MaxDB</a>
- */
-static constexpr const char *kSapMaxdb = "sap.maxdb";
-
-/**
-  <a href="https://www.sqlite.org/">SQLite</a>
- */
-static constexpr const char *kSqlite = "sqlite";
-
-/**
-  <a href="https://www.teradata.com/">Teradata</a>
- */
-static constexpr const char *kTeradata = "teradata";
-
-/**
-  <a href="https://trino.io/">Trino</a>
- */
-static constexpr const char *kTrino = "trino";
-
-}  // namespace DbSystemNameValues
-
-}  // namespace db
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/db_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/db_metrics.h
deleted file mode 100644
index 5748dc4cb..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/db_metrics.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace db
-{
-
-/**
-  Duration of database client operations.
-  <p>
-  Batch operations SHOULD be recorded as a single operation.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientOperationDuration = "db.client.operation.duration";
-static constexpr const char *descrMetricDbClientOperationDuration =
-    "Duration of database client operations.";
-static constexpr const char *unitMetricDbClientOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientOperationDuration,
-                                      descrMetricDbClientOperationDuration,
-                                      unitMetricDbClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientOperationDuration,
-                                      descrMetricDbClientOperationDuration,
-                                      unitMetricDbClientOperationDuration);
-}
-
-}  // namespace db
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/dns_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/dns_metrics.h
deleted file mode 100644
index 019fea674..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/dns_metrics.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace dns
-{
-
-/**
- * Measures the time taken to perform a DNS lookup.
- * <p>
- * histogram
- */
-static constexpr const char *kMetricDnsLookupDuration = "dns.lookup.duration";
-static constexpr const char *descrMetricDnsLookupDuration =
-    "Measures the time taken to perform a DNS lookup.";
-static constexpr const char *unitMetricDnsLookupDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDnsLookupDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDnsLookupDuration, descrMetricDnsLookupDuration,
-                                      unitMetricDnsLookupDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricDnsLookupDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDnsLookupDuration, descrMetricDnsLookupDuration,
-                                      unitMetricDnsLookupDuration);
-}
-
-}  // namespace dns
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/error_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/error_attributes.h
deleted file mode 100644
index e0ef3c925..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/error_attributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace error
-{
-
-/**
-  Describes a class of error the operation ended with.
-  <p>
-  The @code error.type @endcode SHOULD be predictable, and SHOULD have low cardinality.
-  <p>
-  When @code error.type @endcode is set to a type (e.g., an exception type), its
-  canonical class name identifying the type within the artifact SHOULD be used.
-  <p>
-  Instrumentations SHOULD document the list of errors they report.
-  <p>
-  The cardinality of @code error.type @endcode within one instrumentation library SHOULD be low.
-  Telemetry consumers that aggregate data from multiple instrumentation libraries and applications
-  should be prepared for @code error.type @endcode to have high cardinality at query time when no
-  additional filters are applied.
-  <p>
-  If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
-  @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
-  status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
-  error.type @endcode to capture all errors, regardless of whether they are defined within the
-  domain-specific set or not.</li>
-  </ul>
- */
-static constexpr const char *kErrorType = "error.type";
-
-namespace ErrorTypeValues
-{
-/**
-  A fallback error value to be used when the instrumentation doesn't define a custom value.
- */
-static constexpr const char *kOther = "_OTHER";
-
-}  // namespace ErrorTypeValues
-
-}  // namespace error
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/exception_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/exception_attributes.h
deleted file mode 100644
index 8947d711f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/exception_attributes.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace exception
-{
-
-/**
-  Indicates that the exception is escaping the scope of the span.
-
-  @deprecated
-  {"note": "It's no longer recommended to record exceptions that are handled and do not escape the
-  scope of a span.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped";
-
-/**
-  The exception message.
- */
-static constexpr const char *kExceptionMessage = "exception.message";
-
-/**
-  A stacktrace as a string in the natural representation for the language runtime. The
-  representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kExceptionStacktrace = "exception.stacktrace";
-
-/**
-  The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the
-  exception should be preferred over the static type in languages that support it.
- */
-static constexpr const char *kExceptionType = "exception.type";
-
-}  // namespace exception
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/faas_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/faas_metrics.h
deleted file mode 100644
index 72109d887..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/faas_metrics.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace faas
-{
-
-/**
- * Number of invocation cold starts
- * <p>
- * counter
- */
-static constexpr const char *kMetricFaasColdstarts     = "faas.coldstarts";
-static constexpr const char *descrMetricFaasColdstarts = "Number of invocation cold starts";
-static constexpr const char *unitMetricFaasColdstarts  = "{coldstart}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                    unitMetricFaasColdstarts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                    unitMetricFaasColdstarts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                             unitMetricFaasColdstarts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricFaasColdstarts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                              unitMetricFaasColdstarts);
-}
-
-/**
- * Distribution of CPU usage per invocation
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasCpuUsage     = "faas.cpu_usage";
-static constexpr const char *descrMetricFaasCpuUsage = "Distribution of CPU usage per invocation";
-static constexpr const char *unitMetricFaasCpuUsage  = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
-                                      unitMetricFaasCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
-                                      unitMetricFaasCpuUsage);
-}
-
-/**
- * Number of invocation errors
- * <p>
- * counter
- */
-static constexpr const char *kMetricFaasErrors     = "faas.errors";
-static constexpr const char *descrMetricFaasErrors = "Number of invocation errors";
-static constexpr const char *unitMetricFaasErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasErrors, descrMetricFaasErrors, unitMetricFaasErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasErrors, descrMetricFaasErrors, unitMetricFaasErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasErrors, descrMetricFaasErrors,
-                                             unitMetricFaasErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasErrors, descrMetricFaasErrors,
-                                              unitMetricFaasErrors);
-}
-
-/**
- * Measures the duration of the function's initialization, such as a cold start
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasInitDuration = "faas.init_duration";
-static constexpr const char *descrMetricFaasInitDuration =
-    "Measures the duration of the function's initialization, such as a cold start";
-static constexpr const char *unitMetricFaasInitDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasInitDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
-                                      unitMetricFaasInitDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasInitDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
-                                      unitMetricFaasInitDuration);
-}
-
-/**
- * Number of successful invocations
- * <p>
- * counter
- */
-static constexpr const char *kMetricFaasInvocations     = "faas.invocations";
-static constexpr const char *descrMetricFaasInvocations = "Number of successful invocations";
-static constexpr const char *unitMetricFaasInvocations  = "{invocation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasInvocations(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                    unitMetricFaasInvocations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasInvocations(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                    unitMetricFaasInvocations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricFaasInvocations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                             unitMetricFaasInvocations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricFaasInvocations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                              unitMetricFaasInvocations);
-}
-
-/**
- * Measures the duration of the function's logic execution
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasInvokeDuration = "faas.invoke_duration";
-static constexpr const char *descrMetricFaasInvokeDuration =
-    "Measures the duration of the function's logic execution";
-static constexpr const char *unitMetricFaasInvokeDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricFaasInvokeDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration,
-                                      unitMetricFaasInvokeDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricFaasInvokeDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration,
-                                      unitMetricFaasInvokeDuration);
-}
-
-/**
- * Distribution of max memory usage per invocation
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasMemUsage = "faas.mem_usage";
-static constexpr const char *descrMetricFaasMemUsage =
-    "Distribution of max memory usage per invocation";
-static constexpr const char *unitMetricFaasMemUsage = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasMemUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
-                                      unitMetricFaasMemUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasMemUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
-                                      unitMetricFaasMemUsage);
-}
-
-/**
- * Distribution of net I/O usage per invocation
- * <p>
- * histogram
- */
-static constexpr const char *kMetricFaasNetIo     = "faas.net_io";
-static constexpr const char *descrMetricFaasNetIo = "Distribution of net I/O usage per invocation";
-static constexpr const char *unitMetricFaasNetIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasNetIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasNetIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
-}
-
-/**
- * Number of invocation timeouts
- * <p>
- * counter
- */
-static constexpr const char *kMetricFaasTimeouts     = "faas.timeouts";
-static constexpr const char *descrMetricFaasTimeouts = "Number of invocation timeouts";
-static constexpr const char *unitMetricFaasTimeouts  = "{timeout}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                    unitMetricFaasTimeouts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                    unitMetricFaasTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                             unitMetricFaasTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                              unitMetricFaasTimeouts);
-}
-
-}  // namespace faas
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/gen_ai_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/gen_ai_metrics.h
deleted file mode 100644
index 437ba4af4..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/gen_ai_metrics.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace gen_ai
-{
-
-/**
- * GenAI operation duration
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiClientOperationDuration =
-    "gen_ai.client.operation.duration";
-static constexpr const char *descrMetricGenAiClientOperationDuration = "GenAI operation duration";
-static constexpr const char *unitMetricGenAiClientOperationDuration  = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiClientOperationDuration,
-                                      descrMetricGenAiClientOperationDuration,
-                                      unitMetricGenAiClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiClientOperationDuration,
-                                      descrMetricGenAiClientOperationDuration,
-                                      unitMetricGenAiClientOperationDuration);
-}
-
-/**
- * Measures number of input and output tokens used
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiClientTokenUsage = "gen_ai.client.token.usage";
-static constexpr const char *descrMetricGenAiClientTokenUsage =
-    "Measures number of input and output tokens used";
-static constexpr const char *unitMetricGenAiClientTokenUsage = "{token}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiClientTokenUsage(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiClientTokenUsage,
-                                      descrMetricGenAiClientTokenUsage,
-                                      unitMetricGenAiClientTokenUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiClientTokenUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiClientTokenUsage,
-                                      descrMetricGenAiClientTokenUsage,
-                                      unitMetricGenAiClientTokenUsage);
-}
-
-/**
- * Generative AI server request duration such as time-to-last byte or last output token
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiServerRequestDuration = "gen_ai.server.request.duration";
-static constexpr const char *descrMetricGenAiServerRequestDuration =
-    "Generative AI server request duration such as time-to-last byte or last output token";
-static constexpr const char *unitMetricGenAiServerRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerRequestDuration,
-                                      descrMetricGenAiServerRequestDuration,
-                                      unitMetricGenAiServerRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerRequestDuration,
-                                      descrMetricGenAiServerRequestDuration,
-                                      unitMetricGenAiServerRequestDuration);
-}
-
-/**
- * Time per output token generated after the first token for successful responses
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiServerTimePerOutputToken =
-    "gen_ai.server.time_per_output_token";
-static constexpr const char *descrMetricGenAiServerTimePerOutputToken =
-    "Time per output token generated after the first token for successful responses";
-static constexpr const char *unitMetricGenAiServerTimePerOutputToken = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerTimePerOutputToken(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerTimePerOutputToken,
-                                      descrMetricGenAiServerTimePerOutputToken,
-                                      unitMetricGenAiServerTimePerOutputToken);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerTimePerOutputToken(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerTimePerOutputToken,
-                                      descrMetricGenAiServerTimePerOutputToken,
-                                      unitMetricGenAiServerTimePerOutputToken);
-}
-
-/**
- * Time to generate first token for successful responses
- * <p>
- * histogram
- */
-static constexpr const char *kMetricGenAiServerTimeToFirstToken =
-    "gen_ai.server.time_to_first_token";
-static constexpr const char *descrMetricGenAiServerTimeToFirstToken =
-    "Time to generate first token for successful responses";
-static constexpr const char *unitMetricGenAiServerTimeToFirstToken = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerTimeToFirstToken(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerTimeToFirstToken,
-                                      descrMetricGenAiServerTimeToFirstToken,
-                                      unitMetricGenAiServerTimeToFirstToken);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerTimeToFirstToken(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerTimeToFirstToken,
-                                      descrMetricGenAiServerTimeToFirstToken,
-                                      unitMetricGenAiServerTimeToFirstToken);
-}
-
-}  // namespace gen_ai
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/http_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/http_attributes.h
deleted file mode 100644
index 85e5244b0..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/http_attributes.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace http
-{
-
-/**
-  HTTP request headers, @code <key> @endcode being the normalized HTTP Header name (lowercase), the
-  value being the header values. <p> Instrumentations SHOULD require an explicit configuration of
-  which headers are to be captured. Including all request headers can be a security risk - explicit
-  configuration helps avoid leaking sensitive information. <p> The @code User-Agent @endcode header
-  is already captured in the @code user_agent.original @endcode attribute. Users MAY explicitly
-  configure instrumentations to capture them even though it is not recommended. <p> The attribute
-  value MUST consist of either multiple header values as an array of strings or a single-item array
-  containing a possibly comma-concatenated string, depending on the way the HTTP library provides
-  access to headers. <p> Examples: <ul> <li>A header @code Content-Type: application/json @endcode
-  SHOULD be recorded as the @code http.request.header.content-type @endcode attribute with value
-  @code ["application/json"] @endcode.</li> <li>A header @code X-Forwarded-For: 1.2.3.4, 1.2.3.5
-  @endcode SHOULD be recorded as the @code http.request.header.x-forwarded-for @endcode attribute
-  with value @code ["1.2.3.4", "1.2.3.5"] @endcode or @code ["1.2.3.4, 1.2.3.5"] @endcode depending
-  on the HTTP library.</li>
-  </ul>
- */
-static constexpr const char *kHttpRequestHeader = "http.request.header";
-
-/**
-  HTTP request method.
-  <p>
-  HTTP request method value SHOULD be "known" to the instrumentation.
-  By default, this convention defines "known" methods as the ones listed in <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-  defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>. <p> If the HTTP
-  request method is not known to instrumentation, it MUST set the @code http.request.method @endcode
-  attribute to @code _OTHER @endcode. <p> If the HTTP instrumentation could end up converting valid
-  HTTP request methods to @code _OTHER @endcode, then it MUST provide a way to override the list of
-  known HTTP methods. If this override is done via environment variable, then the environment
-  variable MUST be named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list
-  of case-sensitive known HTTP methods (this list MUST be a full override of the default known
-  method, it is not a list of known methods in addition to the defaults). <p> HTTP method names are
-  case-sensitive and @code http.request.method @endcode attribute value MUST match a known HTTP
-  method name exactly. Instrumentations for specific web frameworks that consider HTTP methods to be
-  case insensitive, SHOULD populate a canonical equivalent. Tracing instrumentations that do so,
-  MUST also set @code http.request.method_original @endcode to the original value.
- */
-static constexpr const char *kHttpRequestMethod = "http.request.method";
-
-/**
-  Original HTTP method sent by the client in the request line.
- */
-static constexpr const char *kHttpRequestMethodOriginal = "http.request.method_original";
-
-/**
-  The ordinal number of request resending attempt (for any reason, including redirects).
-  <p>
-  The resend count SHOULD be updated each time an HTTP request gets resent by the client, regardless
-  of what was the cause of the resending (e.g. redirection, authorization failure, 503 Server
-  Unavailable, network issues, or any other).
- */
-static constexpr const char *kHttpRequestResendCount = "http.request.resend_count";
-
-/**
-  HTTP response headers, @code <key> @endcode being the normalized HTTP Header name (lowercase), the
-  value being the header values. <p> Instrumentations SHOULD require an explicit configuration of
-  which headers are to be captured. Including all response headers can be a security risk - explicit
-  configuration helps avoid leaking sensitive information. <p> Users MAY explicitly configure
-  instrumentations to capture them even though it is not recommended. <p> The attribute value MUST
-  consist of either multiple header values as an array of strings or a single-item array containing
-  a possibly comma-concatenated string, depending on the way the HTTP library provides access to
-  headers. <p> Examples: <ul> <li>A header @code Content-Type: application/json @endcode header
-  SHOULD be recorded as the @code http.request.response.content-type @endcode attribute with value
-  @code ["application/json"] @endcode.</li> <li>A header @code My-custom-header: abc, def @endcode
-  header SHOULD be recorded as the @code http.response.header.my-custom-header @endcode attribute
-  with value @code ["abc", "def"] @endcode or @code ["abc, def"] @endcode depending on the HTTP
-  library.</li>
-  </ul>
- */
-static constexpr const char *kHttpResponseHeader = "http.response.header";
-
-/**
-  <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>.
- */
-static constexpr const char *kHttpResponseStatusCode = "http.response.status_code";
-
-/**
-  The matched route, that is, the path template in the format used by the respective server
-  framework. <p> MUST NOT be populated when this is not supported by the HTTP server framework as
-  the route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD
-  include the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if
-  there is one.
- */
-static constexpr const char *kHttpRoute = "http.route";
-
-namespace HttpRequestMethodValues
-{
-/**
-  CONNECT method.
- */
-static constexpr const char *kConnect = "CONNECT";
-
-/**
-  DELETE method.
- */
-static constexpr const char *kDelete = "DELETE";
-
-/**
-  GET method.
- */
-static constexpr const char *kGet = "GET";
-
-/**
-  HEAD method.
- */
-static constexpr const char *kHead = "HEAD";
-
-/**
-  OPTIONS method.
- */
-static constexpr const char *kOptions = "OPTIONS";
-
-/**
-  PATCH method.
- */
-static constexpr const char *kPatch = "PATCH";
-
-/**
-  POST method.
- */
-static constexpr const char *kPost = "POST";
-
-/**
-  PUT method.
- */
-static constexpr const char *kPut = "PUT";
-
-/**
-  TRACE method.
- */
-static constexpr const char *kTrace = "TRACE";
-
-/**
-  Any HTTP method that the instrumentation has no prior knowledge of.
- */
-static constexpr const char *kOther = "_OTHER";
-
-}  // namespace HttpRequestMethodValues
-
-}  // namespace http
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/http_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/http_metrics.h
deleted file mode 100644
index f480fb4c2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/http_metrics.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace http
-{
-
-/**
-  Duration of HTTP client requests.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpClientRequestDuration = "http.client.request.duration";
-static constexpr const char *descrMetricHttpClientRequestDuration =
-    "Duration of HTTP client requests.";
-static constexpr const char *unitMetricHttpClientRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientRequestDuration,
-                                      descrMetricHttpClientRequestDuration,
-                                      unitMetricHttpClientRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientRequestDuration,
-                                      descrMetricHttpClientRequestDuration,
-                                      unitMetricHttpClientRequestDuration);
-}
-
-/**
-  Duration of HTTP server requests.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpServerRequestDuration = "http.server.request.duration";
-static constexpr const char *descrMetricHttpServerRequestDuration =
-    "Duration of HTTP server requests.";
-static constexpr const char *unitMetricHttpServerRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpServerRequestDuration,
-                                      descrMetricHttpServerRequestDuration,
-                                      unitMetricHttpServerRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpServerRequestDuration,
-                                      descrMetricHttpServerRequestDuration,
-                                      unitMetricHttpServerRequestDuration);
-}
-
-}  // namespace http
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/hw_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/hw_metrics.h
deleted file mode 100644
index 225b939e8..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/hw_metrics.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace hw
-{
-
-/**
- * Energy consumed by the component
- * <p>
- * counter
- */
-static constexpr const char *kMetricHwEnergy     = "hw.energy";
-static constexpr const char *descrMetricHwEnergy = "Energy consumed by the component";
-static constexpr const char *unitMetricHwEnergy  = "J";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwEnergy, descrMetricHwEnergy, unitMetricHwEnergy);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwEnergy, descrMetricHwEnergy, unitMetricHwEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwEnergy, descrMetricHwEnergy,
-                                             unitMetricHwEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwEnergy, descrMetricHwEnergy,
-                                              unitMetricHwEnergy);
-}
-
-/**
- * Number of errors encountered by the component
- * <p>
- * counter
- */
-static constexpr const char *kMetricHwErrors     = "hw.errors";
-static constexpr const char *descrMetricHwErrors = "Number of errors encountered by the component";
-static constexpr const char *unitMetricHwErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwErrors, descrMetricHwErrors, unitMetricHwErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwErrors, descrMetricHwErrors, unitMetricHwErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwErrors, descrMetricHwErrors,
-                                             unitMetricHwErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwErrors, descrMetricHwErrors,
-                                              unitMetricHwErrors);
-}
-
-/**
- * Ambient (external) temperature of the physical host
- * <p>
- * gauge
- */
-static constexpr const char *kMetricHwHostAmbientTemperature = "hw.host.ambient_temperature";
-static constexpr const char *descrMetricHwHostAmbientTemperature =
-    "Ambient (external) temperature of the physical host";
-static constexpr const char *unitMetricHwHostAmbientTemperature = "Cel";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostAmbientTemperature,
-                                 descrMetricHwHostAmbientTemperature,
-                                 unitMetricHwHostAmbientTemperature);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostAmbientTemperature,
-                                  descrMetricHwHostAmbientTemperature,
-                                  unitMetricHwHostAmbientTemperature);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwHostAmbientTemperature,
-                                           descrMetricHwHostAmbientTemperature,
-                                           unitMetricHwHostAmbientTemperature);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwHostAmbientTemperature,
-                                            descrMetricHwHostAmbientTemperature,
-                                            unitMetricHwHostAmbientTemperature);
-}
-
-/**
- * Total energy consumed by the entire physical host, in joules
- * <p>
- * The overall energy usage of a host MUST be reported using the specific @code hw.host.energy
- * @endcode and @code hw.host.power @endcode metrics <strong>only</strong>, instead of the generic
- * @code hw.energy @endcode and @code hw.power @endcode described in the previous section, to
- * prevent summing up overlapping values. <p> counter
- */
-static constexpr const char *kMetricHwHostEnergy = "hw.host.energy";
-static constexpr const char *descrMetricHwHostEnergy =
-    "Total energy consumed by the entire physical host, in joules";
-static constexpr const char *unitMetricHwHostEnergy = "J";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                    unitMetricHwHostEnergy);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                    unitMetricHwHostEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                             unitMetricHwHostEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                              unitMetricHwHostEnergy);
-}
-
-/**
- * By how many degrees Celsius the temperature of the physical host can be increased, before
- * reaching a warning threshold on one of the internal sensors <p> gauge
- */
-static constexpr const char *kMetricHwHostHeatingMargin = "hw.host.heating_margin";
-static constexpr const char *descrMetricHwHostHeatingMargin =
-    "By how many degrees Celsius the temperature of the physical host can be increased, before reaching a warning threshold on one of the internal sensors
-    ";
-    static constexpr const char *unitMetricHwHostHeatingMargin = "Cel";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwHostHeatingMargin(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin,
-                                 unitMetricHwHostHeatingMargin);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwHostHeatingMargin(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin,
-                                  unitMetricHwHostHeatingMargin);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHwHostHeatingMargin(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin, unitMetricHwHostHeatingMargin);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHwHostHeatingMargin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin, unitMetricHwHostHeatingMargin);
-}
-
-/**
- * Instantaneous power consumed by the entire physical host in Watts (@code hw.host.energy @endcode
- * is preferred) <p> The overall energy usage of a host MUST be reported using the specific @code
- * hw.host.energy @endcode and @code hw.host.power @endcode metrics <strong>only</strong>, instead
- * of the generic @code hw.energy @endcode and @code hw.power @endcode described in the previous
- * section, to prevent summing up overlapping values. <p> gauge
- */
-static constexpr const char *kMetricHwHostPower = "hw.host.power";
-static constexpr const char *descrMetricHwHostPower =
-    "Instantaneous power consumed by the entire physical host in Watts (`hw.host.energy` is preferred)
-    ";
-    static constexpr const char *unitMetricHwHostPower = "W";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostPower, descrMetricHwHostPower, unitMetricHwHostPower);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                  unitMetricHwHostPower);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                           unitMetricHwHostPower);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                            unitMetricHwHostPower);
-}
-
-/**
- * Instantaneous power consumed by the component
- * <p>
- * It is recommended to report @code hw.energy @endcode instead of @code hw.power @endcode when
- * possible. <p> gauge
- */
-static constexpr const char *kMetricHwPower     = "hw.power";
-static constexpr const char *descrMetricHwPower = "Instantaneous power consumed by the component";
-static constexpr const char *unitMetricHwPower  = "W";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-/**
- * Operational status: @code 1 @endcode (true) or @code 0 @endcode (false) for each of the possible
- * states <p>
- * @code hw.status @endcode is currently specified as an <em>UpDownCounter</em> but would ideally be
- * represented using a <a
- * href="https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#stateset"><em>StateSet</em>
- * as defined in OpenMetrics</a>. This semantic convention will be updated once <em>StateSet</em> is
- * specified in OpenTelemetry. This planned change is not expected to have any consequence on the
- * way users query their timeseries backend to retrieve the values of @code hw.status @endcode over
- * time. <p> updowncounter
- */
-static constexpr const char *kMetricHwStatus = "hw.status";
-static constexpr const char *descrMetricHwStatus =
-    "Operational status: `1` (true) or `0` (false) for each of the possible states";
-static constexpr const char *unitMetricHwStatus = "1";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHwStatus, descrMetricHwStatus, unitMetricHwStatus);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHwStatus, descrMetricHwStatus, unitMetricHwStatus);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHwStatus, descrMetricHwStatus,
-                                                   unitMetricHwStatus);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHwStatus, descrMetricHwStatus,
-                                                    unitMetricHwStatus);
-}
-
-}  // namespace hw
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/app_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/app_attributes.h
deleted file mode 100644
index fdbad251b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/app_attributes.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace app
-{
-
-/**
-  A unique identifier representing the installation of an application on a specific device
-  <p>
-  Its value SHOULD persist across launches of the same application installation, including through
-  application upgrades. It SHOULD change if the application is uninstalled or if all applications of
-  the vendor are uninstalled. Additionally, users might be able to reset this value (e.g. by
-  clearing application data). If an app is installed multiple times on the same device (e.g. in
-  different accounts on Android), each @code app.installation.id @endcode SHOULD have a different
-  value. If multiple OpenTelemetry SDKs are used within the same application, they SHOULD use the
-  same value for @code app.installation.id @endcode. Hardware IDs (e.g. serial number, IMEI, MAC
-  address) MUST NOT be used as the @code app.installation.id @endcode. <p> For iOS, this value
-  SHOULD be equal to the <a
-  href="https://developer.apple.com/documentation/uikit/uidevice/identifierforvendor">vendor
-  identifier</a>. <p> For Android, examples of @code app.installation.id @endcode implementations
-  include: <ul> <li><a
-  href="https://firebase.google.com/docs/projects/manage-installations">Firebase Installation
-  ID</a>.</li> <li>A globally unique UUID which is persisted across sessions in your
-  application.</li> <li><a href="https://developer.android.com/identity/app-set-id">App set
-  ID</a>.</li> <li><a
-  href="https://developer.android.com/reference/android/provider/Settings.Secure#ANDROID_ID">@code
-  Settings.getString(Settings.Secure.ANDROID_ID) @endcode</a>.</li>
-  </ul>
-  <p>
-  More information about Android identifier best practices can be found <a
-  href="https://developer.android.com/training/articles/user-data-ids">here</a>.
- */
-static constexpr const char *kAppInstallationId = "app.installation.id";
-
-/**
-  The x (horizontal) coordinate of a screen coordinate, in screen pixels.
- */
-static constexpr const char *kAppScreenCoordinateX = "app.screen.coordinate.x";
-
-/**
-  The y (vertical) component of a screen coordinate, in screen pixels.
- */
-static constexpr const char *kAppScreenCoordinateY = "app.screen.coordinate.y";
-
-/**
-  An identifier that uniquely differentiates this widget from other widgets in the same application.
-  <p>
-  A widget is an application component, typically an on-screen visual GUI element.
- */
-static constexpr const char *kAppWidgetId = "app.widget.id";
-
-/**
-  The name of an application widget.
-  <p>
-  A widget is an application component, typically an on-screen visual GUI element.
- */
-static constexpr const char *kAppWidgetName = "app.widget.name";
-
-}  // namespace app
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/artifact_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/artifact_attributes.h
deleted file mode 100644
index 09e000ba3..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/artifact_attributes.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace artifact
-{
-
-/**
-  The provenance filename of the built attestation which directly relates to the build artifact
-  filename. This filename SHOULD accompany the artifact at publish time. See the <a
-  href="https://slsa.dev/spec/v1.0/distributing-provenance#relationship-between-artifacts-and-attestations">SLSA
-  Relationship</a> specification for more information.
- */
-static constexpr const char *kArtifactAttestationFilename = "artifact.attestation.filename";
-
-/**
-  The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
-  glossary)</a>, of the built attestation. Some envelopes in the <a
-  href="https://github.com/in-toto/attestation/tree/main/spec">software attestation space</a> also
-  refer to this as the <strong>digest</strong>.
- */
-static constexpr const char *kArtifactAttestationHash = "artifact.attestation.hash";
-
-/**
-  The id of the build <a href="https://slsa.dev/attestation-model">software attestation</a>.
- */
-static constexpr const char *kArtifactAttestationId = "artifact.attestation.id";
-
-/**
-  The human readable file name of the artifact, typically generated during build and release
-  processes. Often includes the package name and version in the file name. <p> This file name can
-  also act as the <a href="https://slsa.dev/spec/v1.0/terminology#package-model">Package Name</a> in
-  cases where the package ecosystem maps accordingly. Additionally, the artifact <a
-  href="https://slsa.dev/spec/v1.0/terminology#software-supply-chain">can be published</a> for
-  others, but that is not a guarantee.
- */
-static constexpr const char *kArtifactFilename = "artifact.filename";
-
-/**
-  The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
-  glossary)</a>, often found in checksum.txt on a release of the artifact and used to verify package
-  integrity. <p> The specific algorithm used to create the cryptographic hash value is not defined.
-  In situations where an artifact has multiple cryptographic hashes, it is up to the implementer to
-  choose which hash value to set here; this should be the most secure hash algorithm that is
-  suitable for the situation and consistent with the corresponding attestation. The implementer can
-  then provide the other hash values through an additional set of attribute extensions as they deem
-  necessary.
- */
-static constexpr const char *kArtifactHash = "artifact.hash";
-
-/**
-  The <a href="https://github.com/package-url/purl-spec">Package URL</a> of the <a
-  href="https://slsa.dev/spec/v1.0/terminology#package-model">package artifact</a> provides a
-  standard way to identify and locate the packaged artifact.
- */
-static constexpr const char *kArtifactPurl = "artifact.purl";
-
-/**
-  The version of the artifact.
- */
-static constexpr const char *kArtifactVersion = "artifact.version";
-
-}  // namespace artifact
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/aws_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/aws_attributes.h
deleted file mode 100644
index 2abf1b762..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/aws_attributes.h
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace aws
-{
-
-/**
-  The unique identifier of the AWS Bedrock Guardrail. A <a
-  href="https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails.html">guardrail</a> helps
-  safeguard and prevent unwanted behavior from model responses or user messages.
- */
-static constexpr const char *kAwsBedrockGuardrailId = "aws.bedrock.guardrail.id";
-
-/**
-  The unique identifier of the AWS Bedrock Knowledge base. A <a
-  href="https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base.html">knowledge base</a>
-  is a bank of information that can be queried by models to generate more relevant responses and
-  augment prompts.
- */
-static constexpr const char *kAwsBedrockKnowledgeBaseId = "aws.bedrock.knowledge_base.id";
-
-/**
-  The JSON-serialized value of each item in the @code AttributeDefinitions @endcode request field.
- */
-static constexpr const char *kAwsDynamodbAttributeDefinitions =
-    "aws.dynamodb.attribute_definitions";
-
-/**
-  The value of the @code AttributesToGet @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbAttributesToGet = "aws.dynamodb.attributes_to_get";
-
-/**
-  The value of the @code ConsistentRead @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbConsistentRead = "aws.dynamodb.consistent_read";
-
-/**
-  The JSON-serialized value of each item in the @code ConsumedCapacity @endcode response field.
- */
-static constexpr const char *kAwsDynamodbConsumedCapacity = "aws.dynamodb.consumed_capacity";
-
-/**
-  The value of the @code Count @endcode response parameter.
- */
-static constexpr const char *kAwsDynamodbCount = "aws.dynamodb.count";
-
-/**
-  The value of the @code ExclusiveStartTableName @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbExclusiveStartTable = "aws.dynamodb.exclusive_start_table";
-
-/**
-  The JSON-serialized value of each item in the @code GlobalSecondaryIndexUpdates @endcode request
-  field.
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexUpdates =
-    "aws.dynamodb.global_secondary_index_updates";
-
-/**
-  The JSON-serialized value of each item of the @code GlobalSecondaryIndexes @endcode request field
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexes =
-    "aws.dynamodb.global_secondary_indexes";
-
-/**
-  The value of the @code IndexName @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbIndexName = "aws.dynamodb.index_name";
-
-/**
-  The JSON-serialized value of the @code ItemCollectionMetrics @endcode response field.
- */
-static constexpr const char *kAwsDynamodbItemCollectionMetrics =
-    "aws.dynamodb.item_collection_metrics";
-
-/**
-  The value of the @code Limit @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbLimit = "aws.dynamodb.limit";
-
-/**
-  The JSON-serialized value of each item of the @code LocalSecondaryIndexes @endcode request field.
- */
-static constexpr const char *kAwsDynamodbLocalSecondaryIndexes =
-    "aws.dynamodb.local_secondary_indexes";
-
-/**
-  The value of the @code ProjectionExpression @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbProjection = "aws.dynamodb.projection";
-
-/**
-  The value of the @code ProvisionedThroughput.ReadCapacityUnits @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedReadCapacity =
-    "aws.dynamodb.provisioned_read_capacity";
-
-/**
-  The value of the @code ProvisionedThroughput.WriteCapacityUnits @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedWriteCapacity =
-    "aws.dynamodb.provisioned_write_capacity";
-
-/**
-  The value of the @code ScanIndexForward @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbScanForward = "aws.dynamodb.scan_forward";
-
-/**
-  The value of the @code ScannedCount @endcode response parameter.
- */
-static constexpr const char *kAwsDynamodbScannedCount = "aws.dynamodb.scanned_count";
-
-/**
-  The value of the @code Segment @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbSegment = "aws.dynamodb.segment";
-
-/**
-  The value of the @code Select @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbSelect = "aws.dynamodb.select";
-
-/**
-  The number of items in the @code TableNames @endcode response parameter.
- */
-static constexpr const char *kAwsDynamodbTableCount = "aws.dynamodb.table_count";
-
-/**
-  The keys in the @code RequestItems @endcode object field.
- */
-static constexpr const char *kAwsDynamodbTableNames = "aws.dynamodb.table_names";
-
-/**
-  The value of the @code TotalSegments @endcode request parameter.
- */
-static constexpr const char *kAwsDynamodbTotalSegments = "aws.dynamodb.total_segments";
-
-/**
-  The ARN of an <a
-  href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html">ECS cluster</a>.
- */
-static constexpr const char *kAwsEcsClusterArn = "aws.ecs.cluster.arn";
-
-/**
-  The Amazon Resource Name (ARN) of an <a
-  href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html">ECS
-  container instance</a>.
- */
-static constexpr const char *kAwsEcsContainerArn = "aws.ecs.container.arn";
-
-/**
-  The <a href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html">launch
-  type</a> for an ECS task.
- */
-static constexpr const char *kAwsEcsLaunchtype = "aws.ecs.launchtype";
-
-/**
-  The ARN of a running <a
-  href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids">ECS
-  task</a>.
- */
-static constexpr const char *kAwsEcsTaskArn = "aws.ecs.task.arn";
-
-/**
-  The family name of the <a
-  href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html">ECS task
-  definition</a> used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskFamily = "aws.ecs.task.family";
-
-/**
-  The ID of a running ECS task. The ID MUST be extracted from @code task.arn @endcode.
- */
-static constexpr const char *kAwsEcsTaskId = "aws.ecs.task.id";
-
-/**
-  The revision for the task definition used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskRevision = "aws.ecs.task.revision";
-
-/**
-  The ARN of an EKS cluster.
- */
-static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn";
-
-/**
-  The AWS extended request ID as returned in the response header @code x-amz-id-2 @endcode.
- */
-static constexpr const char *kAwsExtendedRequestId = "aws.extended_request_id";
-
-/**
-  The name of the AWS Kinesis <a
-  href="https://docs.aws.amazon.com/streams/latest/dev/introduction.html">stream</a> the request
-  refers to. Corresponds to the @code --stream-name @endcode parameter of the Kinesis <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/kinesis/describe-stream.html">describe-stream</a>
-  operation.
- */
-static constexpr const char *kAwsKinesisStreamName = "aws.kinesis.stream_name";
-
-/**
-  The full invoked ARN as provided on the @code Context @endcode passed to the function (@code
-  Lambda-Runtime-Invoked-Function-Arn @endcode header on the @code /runtime/invocation/next @endcode
-  applicable). <p> This may be different from @code cloud.resource_id @endcode if an alias is
-  involved.
- */
-static constexpr const char *kAwsLambdaInvokedArn = "aws.lambda.invoked_arn";
-
-/**
-  The UUID of the <a
-  href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html">AWS
-  Lambda EvenSource Mapping</a>. An event source is mapped to a lambda function. It's contents are
-  read by Lambda and used to trigger a function. This isn't available in the lambda execution
-  context or the lambda runtime environtment. This is going to be populated by the AWS SDK for each
-  language when that UUID is present. Some of these operations are Create/Delete/Get/List/Update
-  EventSourceMapping.
- */
-static constexpr const char *kAwsLambdaResourceMappingId = "aws.lambda.resource_mapping.id";
-
-/**
-  The Amazon Resource Name(s) (ARN) of the AWS log group(s).
-  <p>
-  See the <a
-  href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
-  group ARN format documentation</a>.
- */
-static constexpr const char *kAwsLogGroupArns = "aws.log.group.arns";
-
-/**
-  The name(s) of the AWS log group(s) an application is writing to.
-  <p>
-  Multiple log groups must be supported for cases like multi-container applications, where a single
-  application has sidecar containers, and each write to their own log group.
- */
-static constexpr const char *kAwsLogGroupNames = "aws.log.group.names";
-
-/**
-  The ARN(s) of the AWS log stream(s).
-  <p>
-  See the <a
-  href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
-  stream ARN format documentation</a>. One log group can contain several log streams, so these ARNs
-  necessarily identify both a log group and a log stream.
- */
-static constexpr const char *kAwsLogStreamArns = "aws.log.stream.arns";
-
-/**
-  The name(s) of the AWS log stream(s) an application is writing to.
- */
-static constexpr const char *kAwsLogStreamNames = "aws.log.stream.names";
-
-/**
-  The AWS request ID as returned in the response headers @code x-amzn-requestid @endcode, @code
-  x-amzn-request-id @endcode or @code x-amz-request-id @endcode.
- */
-static constexpr const char *kAwsRequestId = "aws.request_id";
-
-/**
-  The S3 bucket name the request refers to. Corresponds to the @code --bucket @endcode parameter of
-  the <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a>
-  operations. <p> The @code bucket @endcode attribute is applicable to all S3 operations that
-  reference a bucket, i.e. that require the bucket name as a mandatory parameter. This applies to
-  almost all S3 operations except @code list-buckets @endcode.
- */
-static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
-
-/**
-  The source object (in the form @code bucket @endcode/@code key @endcode) for the copy operation.
-  <p>
-  The @code copy_source @endcode attribute applies to S3 copy operations and corresponds to the
-  @code --copy-source @endcode parameter of the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
-  operation within the S3 API</a>. This applies in particular to the following operations: <ul>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
-  </ul>
- */
-static constexpr const char *kAwsS3CopySource = "aws.s3.copy_source";
-
-/**
-  The delete request container that specifies the objects to be deleted.
-  <p>
-  The @code delete @endcode attribute is only applicable to the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a>
-  operation. The @code delete @endcode attribute corresponds to the @code --delete @endcode
-  parameter of the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-objects.html">delete-objects
-  operation within the S3 API</a>.
- */
-static constexpr const char *kAwsS3Delete = "aws.s3.delete";
-
-/**
-  The S3 object key the request refers to. Corresponds to the @code --key @endcode parameter of the
-  <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
-  <p>
-  The @code key @endcode attribute is applicable to all object-related S3 operations, i.e. that
-  require the object key as a mandatory parameter. This applies in particular to the following
-  operations: <ul> <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/get-object.html">get-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/head-object.html">head-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/put-object.html">put-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html">restore-object</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/select-object-content.html">select-object-content</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/create-multipart-upload.html">create-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
-  </ul>
- */
-static constexpr const char *kAwsS3Key = "aws.s3.key";
-
-/**
-  The part number of the part being uploaded in a multipart-upload operation. This is a positive
-  integer between 1 and 10,000. <p> The @code part_number @endcode attribute is only applicable to
-  the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a> and
-  <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a>
-  operations. The @code part_number @endcode attribute corresponds to the @code --part-number
-  @endcode parameter of the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part
-  operation within the S3 API</a>.
- */
-static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
-
-/**
-  Upload ID that identifies the multipart upload.
-  <p>
-  The @code upload_id @endcode attribute applies to S3 multipart-upload operations and corresponds
-  to the @code --upload-id @endcode parameter of the <a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
-  operations. This applies in particular to the following operations: <ul> <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-    <li><a
-  href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
-  </ul>
- */
-static constexpr const char *kAwsS3UploadId = "aws.s3.upload_id";
-
-/**
-  The ARN of the Secret stored in the Secrets Mangger
- */
-static constexpr const char *kAwsSecretsmanagerSecretArn = "aws.secretsmanager.secret.arn";
-
-/**
-  The ARN of the AWS SNS Topic. An Amazon SNS <a
-  href="https://docs.aws.amazon.com/sns/latest/dg/sns-create-topic.html">topic</a> is a logical
-  access point that acts as a communication channel.
- */
-static constexpr const char *kAwsSnsTopicArn = "aws.sns.topic.arn";
-
-/**
-  The URL of the AWS SQS Queue. It's a unique identifier for a queue in Amazon Simple Queue Service
-  (SQS) and is used to access the queue and perform actions on it.
- */
-static constexpr const char *kAwsSqsQueueUrl = "aws.sqs.queue.url";
-
-/**
-  The ARN of the AWS Step Functions Activity.
- */
-static constexpr const char *kAwsStepFunctionsActivityArn = "aws.step_functions.activity.arn";
-
-/**
-  The ARN of the AWS Step Functions State Machine.
- */
-static constexpr const char *kAwsStepFunctionsStateMachineArn =
-    "aws.step_functions.state_machine.arn";
-
-namespace AwsEcsLaunchtypeValues
-{
-/**
-  none
- */
-static constexpr const char *kEc2 = "ec2";
-
-/**
-  none
- */
-static constexpr const char *kFargate = "fargate";
-
-}  // namespace AwsEcsLaunchtypeValues
-
-}  // namespace aws
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/az_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/az_attributes.h
deleted file mode 100644
index e396476f9..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/az_attributes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace az
-{
-
-/**
-  <a
-  href="https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers">Azure
-  Resource Provider Namespace</a> as recognized by the client.
- */
-static constexpr const char *kAzNamespace = "az.namespace";
-
-/**
-  The unique identifier of the service request. It's generated by the Azure service and returned
-  with the response.
- */
-static constexpr const char *kAzServiceRequestId = "az.service_request_id";
-
-}  // namespace az
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/azure_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/azure_attributes.h
deleted file mode 100644
index 421f3e65d..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/azure_attributes.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace azure
-{
-
-/**
-  The unique identifier of the client instance.
- */
-static constexpr const char *kAzureClientId = "azure.client.id";
-
-/**
-  Cosmos client connection mode.
- */
-static constexpr const char *kAzureCosmosdbConnectionMode = "azure.cosmosdb.connection.mode";
-
-/**
-  Account or request <a
-  href="https://learn.microsoft.com/azure/cosmos-db/consistency-levels">consistency level</a>.
- */
-static constexpr const char *kAzureCosmosdbConsistencyLevel = "azure.cosmosdb.consistency.level";
-
-/**
-  List of regions contacted during operation in the order that they were contacted. If there is more
-  than one region listed, it indicates that the operation was performed on multiple regions i.e.
-  cross-regional call. <p> Region name matches the format of @code displayName @endcode in <a
-  href="https://learn.microsoft.com/rest/api/subscription/subscriptions/list-locations?view=rest-subscription-2021-10-01&tabs=HTTP#location">Azure
-  Location API</a>
- */
-static constexpr const char *kAzureCosmosdbOperationContactedRegions =
-    "azure.cosmosdb.operation.contacted_regions";
-
-/**
-  The number of request units consumed by the operation.
- */
-static constexpr const char *kAzureCosmosdbOperationRequestCharge =
-    "azure.cosmosdb.operation.request_charge";
-
-/**
-  Request payload size in bytes.
- */
-static constexpr const char *kAzureCosmosdbRequestBodySize = "azure.cosmosdb.request.body.size";
-
-/**
-  Cosmos DB sub status code.
- */
-static constexpr const char *kAzureCosmosdbResponseSubStatusCode =
-    "azure.cosmosdb.response.sub_status_code";
-
-namespace AzureCosmosdbConnectionModeValues
-{
-/**
-  Gateway (HTTP) connection.
- */
-static constexpr const char *kGateway = "gateway";
-
-/**
-  Direct connection.
- */
-static constexpr const char *kDirect = "direct";
-
-}  // namespace AzureCosmosdbConnectionModeValues
-
-namespace AzureCosmosdbConsistencyLevelValues
-{
-/**
-  none
- */
-static constexpr const char *kStrong = "Strong";
-
-/**
-  none
- */
-static constexpr const char *kBoundedStaleness = "BoundedStaleness";
-
-/**
-  none
- */
-static constexpr const char *kSession = "Session";
-
-/**
-  none
- */
-static constexpr const char *kEventual = "Eventual";
-
-/**
-  none
- */
-static constexpr const char *kConsistentPrefix = "ConsistentPrefix";
-
-}  // namespace AzureCosmosdbConsistencyLevelValues
-
-}  // namespace azure
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/azure_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/azure_metrics.h
deleted file mode 100644
index fb60c3ce5..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/azure_metrics.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace azure
-{
-
-/**
-  Number of active client instances
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricAzureCosmosdbClientActiveInstanceCount =
-    "azure.cosmosdb.client.active_instance.count";
-static constexpr const char *descrMetricAzureCosmosdbClientActiveInstanceCount =
-    "Number of active client instances";
-static constexpr const char *unitMetricAzureCosmosdbClientActiveInstanceCount = "{instance}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricAzureCosmosdbClientActiveInstanceCount,
-                                         descrMetricAzureCosmosdbClientActiveInstanceCount,
-                                         unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricAzureCosmosdbClientActiveInstanceCount,
-                                          descrMetricAzureCosmosdbClientActiveInstanceCount,
-                                          unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricAzureCosmosdbClientActiveInstanceCount,
-      descrMetricAzureCosmosdbClientActiveInstanceCount,
-      unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricAzureCosmosdbClientActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricAzureCosmosdbClientActiveInstanceCount,
-      descrMetricAzureCosmosdbClientActiveInstanceCount,
-      unitMetricAzureCosmosdbClientActiveInstanceCount);
-}
-
-/**
-  <a href="https://learn.microsoft.com/azure/cosmos-db/request-units">Request units</a> consumed by
-  the operation <p> histogram
- */
-static constexpr const char *kMetricAzureCosmosdbClientOperationRequestCharge =
-    "azure.cosmosdb.client.operation.request_charge";
-static constexpr const char *descrMetricAzureCosmosdbClientOperationRequestCharge =
-    "[Request units](https://learn.microsoft.com/azure/cosmos-db/request-units) consumed by the "
-    "operation";
-static constexpr const char *unitMetricAzureCosmosdbClientOperationRequestCharge = "{request_unit}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricAzureCosmosdbClientOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricAzureCosmosdbClientOperationRequestCharge,
-                                      descrMetricAzureCosmosdbClientOperationRequestCharge,
-                                      unitMetricAzureCosmosdbClientOperationRequestCharge);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricAzureCosmosdbClientOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricAzureCosmosdbClientOperationRequestCharge,
-                                      descrMetricAzureCosmosdbClientOperationRequestCharge,
-                                      unitMetricAzureCosmosdbClientOperationRequestCharge);
-}
-
-}  // namespace azure
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/browser_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/browser_attributes.h
deleted file mode 100644
index e166ed495..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/browser_attributes.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace browser
-{
-
-/**
-  Array of brand name and version separated by a space
-  <p>
-  This value is intended to be taken from the <a
-  href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> (@code
-  navigator.userAgentData.brands @endcode).
- */
-static constexpr const char *kBrowserBrands = "browser.brands";
-
-/**
-  Preferred language of the user using the browser
-  <p>
-  This value is intended to be taken from the Navigator API @code navigator.language @endcode.
- */
-static constexpr const char *kBrowserLanguage = "browser.language";
-
-/**
-  A boolean that is true if the browser is running on a mobile device
-  <p>
-  This value is intended to be taken from the <a
-  href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> (@code
-  navigator.userAgentData.mobile @endcode). If unavailable, this attribute SHOULD be left unset.
- */
-static constexpr const char *kBrowserMobile = "browser.mobile";
-
-/**
-  The platform on which the browser is running
-  <p>
-  This value is intended to be taken from the <a
-  href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> (@code
-  navigator.userAgentData.platform @endcode). If unavailable, the legacy @code navigator.platform
-  @endcode API SHOULD NOT be used instead and this attribute SHOULD be left unset in order for the
-  values to be consistent. The list of possible values is defined in the <a
-  href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-platform">W3C User-Agent Client Hints
-  specification</a>. Note that some (but not all) of these values can overlap with values in the <a
-  href="./os.md">@code os.type @endcode and @code os.name @endcode attributes</a>. However, for
-  consistency, the values in the @code browser.platform @endcode attribute should capture the exact
-  value that the user agent provides.
- */
-static constexpr const char *kBrowserPlatform = "browser.platform";
-
-}  // namespace browser
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cassandra_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cassandra_attributes.h
deleted file mode 100644
index 88a71ba5d..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cassandra_attributes.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cassandra
-{
-
-/**
-  The consistency level of the query. Based on consistency values from <a
-  href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
- */
-static constexpr const char *kCassandraConsistencyLevel = "cassandra.consistency.level";
-
-/**
-  The data center of the coordinating node for a query.
- */
-static constexpr const char *kCassandraCoordinatorDc = "cassandra.coordinator.dc";
-
-/**
-  The ID of the coordinating node for a query.
- */
-static constexpr const char *kCassandraCoordinatorId = "cassandra.coordinator.id";
-
-/**
-  The fetch size used for paging, i.e. how many rows will be returned at once.
- */
-static constexpr const char *kCassandraPageSize = "cassandra.page.size";
-
-/**
-  Whether or not the query is idempotent.
- */
-static constexpr const char *kCassandraQueryIdempotent = "cassandra.query.idempotent";
-
-/**
-  The number of times a query was speculatively executed. Not set or @code 0 @endcode if the query
-  was not executed speculatively.
- */
-static constexpr const char *kCassandraSpeculativeExecutionCount =
-    "cassandra.speculative_execution.count";
-
-namespace CassandraConsistencyLevelValues
-{
-/**
-  none
- */
-static constexpr const char *kAll = "all";
-
-/**
-  none
- */
-static constexpr const char *kEachQuorum = "each_quorum";
-
-/**
-  none
- */
-static constexpr const char *kQuorum = "quorum";
-
-/**
-  none
- */
-static constexpr const char *kLocalQuorum = "local_quorum";
-
-/**
-  none
- */
-static constexpr const char *kOne = "one";
-
-/**
-  none
- */
-static constexpr const char *kTwo = "two";
-
-/**
-  none
- */
-static constexpr const char *kThree = "three";
-
-/**
-  none
- */
-static constexpr const char *kLocalOne = "local_one";
-
-/**
-  none
- */
-static constexpr const char *kAny = "any";
-
-/**
-  none
- */
-static constexpr const char *kSerial = "serial";
-
-/**
-  none
- */
-static constexpr const char *kLocalSerial = "local_serial";
-
-}  // namespace CassandraConsistencyLevelValues
-
-}  // namespace cassandra
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cicd_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cicd_attributes.h
deleted file mode 100644
index a9555a2d2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cicd_attributes.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cicd
-{
-
-/**
-  The kind of action a pipeline run is performing.
- */
-static constexpr const char *kCicdPipelineActionName = "cicd.pipeline.action.name";
-
-/**
-  The human readable name of the pipeline within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineName = "cicd.pipeline.name";
-
-/**
-  The result of a pipeline run.
- */
-static constexpr const char *kCicdPipelineResult = "cicd.pipeline.result";
-
-/**
-  The unique identifier of a pipeline run within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineRunId = "cicd.pipeline.run.id";
-
-/**
-  The pipeline run goes through these states during its lifecycle.
- */
-static constexpr const char *kCicdPipelineRunState = "cicd.pipeline.run.state";
-
-/**
-  The <a href="https://wikipedia.org/wiki/URL">URL</a> of the pipeline run, providing the complete
-  address in order to locate and identify the pipeline run.
- */
-static constexpr const char *kCicdPipelineRunUrlFull = "cicd.pipeline.run.url.full";
-
-/**
-  The human readable name of a task within a pipeline. Task here most closely aligns with a <a
-  href="https://wikipedia.org/wiki/Pipeline_(computing)">computing process</a> in a pipeline. Other
-  terms for tasks include commands, steps, and procedures.
- */
-static constexpr const char *kCicdPipelineTaskName = "cicd.pipeline.task.name";
-
-/**
-  The unique identifier of a task run within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskRunId = "cicd.pipeline.task.run.id";
-
-/**
-  The result of a task run.
- */
-static constexpr const char *kCicdPipelineTaskRunResult = "cicd.pipeline.task.run.result";
-
-/**
-  The <a href="https://wikipedia.org/wiki/URL">URL</a> of the pipeline task run, providing the
-  complete address in order to locate and identify the pipeline task run.
- */
-static constexpr const char *kCicdPipelineTaskRunUrlFull = "cicd.pipeline.task.run.url.full";
-
-/**
-  The type of the task within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskType = "cicd.pipeline.task.type";
-
-/**
-  The name of a component of the CICD system.
- */
-static constexpr const char *kCicdSystemComponent = "cicd.system.component";
-
-/**
-  The unique identifier of a worker within a CICD system.
- */
-static constexpr const char *kCicdWorkerId = "cicd.worker.id";
-
-/**
-  The name of a worker within a CICD system.
- */
-static constexpr const char *kCicdWorkerName = "cicd.worker.name";
-
-/**
-  The state of a CICD worker / agent.
- */
-static constexpr const char *kCicdWorkerState = "cicd.worker.state";
-
-/**
-  The <a href="https://wikipedia.org/wiki/URL">URL</a> of the worker, providing the complete address
-  in order to locate and identify the worker.
- */
-static constexpr const char *kCicdWorkerUrlFull = "cicd.worker.url.full";
-
-namespace CicdPipelineActionNameValues
-{
-/**
-  The pipeline run is executing a build.
- */
-static constexpr const char *kBuild = "BUILD";
-
-/**
-  The pipeline run is executing.
- */
-static constexpr const char *kRun = "RUN";
-
-/**
-  The pipeline run is executing a sync.
- */
-static constexpr const char *kSync = "SYNC";
-
-}  // namespace CicdPipelineActionNameValues
-
-namespace CicdPipelineResultValues
-{
-/**
-  The pipeline run finished successfully.
- */
-static constexpr const char *kSuccess = "success";
-
-/**
-  The pipeline run did not finish successfully, eg. due to a compile error or a failing test. Such
-  failures are usually detected by non-zero exit codes of the tools executed in the pipeline run.
- */
-static constexpr const char *kFailure = "failure";
-
-/**
-  The pipeline run failed due to an error in the CICD system, eg. due to the worker being killed.
- */
-static constexpr const char *kError = "error";
-
-/**
-  A timeout caused the pipeline run to be interrupted.
- */
-static constexpr const char *kTimeout = "timeout";
-
-/**
-  The pipeline run was cancelled, eg. by a user manually cancelling the pipeline run.
- */
-static constexpr const char *kCancellation = "cancellation";
-
-/**
-  The pipeline run was skipped, eg. due to a precondition not being met.
- */
-static constexpr const char *kSkip = "skip";
-
-}  // namespace CicdPipelineResultValues
-
-namespace CicdPipelineRunStateValues
-{
-/**
-  The run pending state spans from the event triggering the pipeline run until the execution of the
-  run starts (eg. time spent in a queue, provisioning agents, creating run resources).
- */
-static constexpr const char *kPending = "pending";
-
-/**
-  The executing state spans the execution of any run tasks (eg. build, test).
- */
-static constexpr const char *kExecuting = "executing";
-
-/**
-  The finalizing state spans from when the run has finished executing (eg. cleanup of run
-  resources).
- */
-static constexpr const char *kFinalizing = "finalizing";
-
-}  // namespace CicdPipelineRunStateValues
-
-namespace CicdPipelineTaskRunResultValues
-{
-/**
-  The task run finished successfully.
- */
-static constexpr const char *kSuccess = "success";
-
-/**
-  The task run did not finish successfully, eg. due to a compile error or a failing test. Such
-  failures are usually detected by non-zero exit codes of the tools executed in the task run.
- */
-static constexpr const char *kFailure = "failure";
-
-/**
-  The task run failed due to an error in the CICD system, eg. due to the worker being killed.
- */
-static constexpr const char *kError = "error";
-
-/**
-  A timeout caused the task run to be interrupted.
- */
-static constexpr const char *kTimeout = "timeout";
-
-/**
-  The task run was cancelled, eg. by a user manually cancelling the task run.
- */
-static constexpr const char *kCancellation = "cancellation";
-
-/**
-  The task run was skipped, eg. due to a precondition not being met.
- */
-static constexpr const char *kSkip = "skip";
-
-}  // namespace CicdPipelineTaskRunResultValues
-
-namespace CicdPipelineTaskTypeValues
-{
-/**
-  build
- */
-static constexpr const char *kBuild = "build";
-
-/**
-  test
- */
-static constexpr const char *kTest = "test";
-
-/**
-  deploy
- */
-static constexpr const char *kDeploy = "deploy";
-
-}  // namespace CicdPipelineTaskTypeValues
-
-namespace CicdWorkerStateValues
-{
-/**
-  The worker is not performing work for the CICD system. It is available to the CICD system to
-  perform work on (online / idle).
- */
-static constexpr const char *kAvailable = "available";
-
-/**
-  The worker is performing work for the CICD system.
- */
-static constexpr const char *kBusy = "busy";
-
-/**
-  The worker is not available to the CICD system (disconnected / down).
- */
-static constexpr const char *kOffline = "offline";
-
-}  // namespace CicdWorkerStateValues
-
-}  // namespace cicd
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cicd_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cicd_metrics.h
deleted file mode 100644
index 18752b53a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cicd_metrics.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cicd
-{
-
-/**
-  The number of pipeline runs currently active in the system by state.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricCicdPipelineRunActive = "cicd.pipeline.run.active";
-static constexpr const char *descrMetricCicdPipelineRunActive =
-    "The number of pipeline runs currently active in the system by state.";
-static constexpr const char *unitMetricCicdPipelineRunActive = "{run}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricCicdPipelineRunActive,
-                                         descrMetricCicdPipelineRunActive,
-                                         unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricCicdPipelineRunActive,
-                                          descrMetricCicdPipelineRunActive,
-                                          unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricCicdPipelineRunActive,
-                                                   descrMetricCicdPipelineRunActive,
-                                                   unitMetricCicdPipelineRunActive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdPipelineRunActive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricCicdPipelineRunActive,
-                                                    descrMetricCicdPipelineRunActive,
-                                                    unitMetricCicdPipelineRunActive);
-}
-
-/**
-  Duration of a pipeline run grouped by pipeline, state and result.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricCicdPipelineRunDuration = "cicd.pipeline.run.duration";
-static constexpr const char *descrMetricCicdPipelineRunDuration =
-    "Duration of a pipeline run grouped by pipeline, state and result.";
-static constexpr const char *unitMetricCicdPipelineRunDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricCicdPipelineRunDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricCicdPipelineRunDuration,
-                                      descrMetricCicdPipelineRunDuration,
-                                      unitMetricCicdPipelineRunDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricCicdPipelineRunDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricCicdPipelineRunDuration,
-                                      descrMetricCicdPipelineRunDuration,
-                                      unitMetricCicdPipelineRunDuration);
-}
-
-/**
-  The number of errors encountered in pipeline runs (eg. compile, test failures).
-  <p>
-  There might be errors in a pipeline run that are non fatal (eg. they are suppressed) or in a
-  parallel stage multiple stages could have a fatal error. This means that this error count might
-  not be the same as the count of metric @code cicd.pipeline.run.duration @endcode with run result
-  @code failure @endcode. <p> counter
- */
-static constexpr const char *kMetricCicdPipelineRunErrors = "cicd.pipeline.run.errors";
-static constexpr const char *descrMetricCicdPipelineRunErrors =
-    "The number of errors encountered in pipeline runs (eg. compile, test failures).";
-static constexpr const char *unitMetricCicdPipelineRunErrors = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCicdPipelineRunErrors, descrMetricCicdPipelineRunErrors,
-                                    unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCicdPipelineRunErrors, descrMetricCicdPipelineRunErrors,
-                                    unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCicdPipelineRunErrors,
-                                             descrMetricCicdPipelineRunErrors,
-                                             unitMetricCicdPipelineRunErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdPipelineRunErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCicdPipelineRunErrors,
-                                              descrMetricCicdPipelineRunErrors,
-                                              unitMetricCicdPipelineRunErrors);
-}
-
-/**
-  The number of errors in a component of the CICD system (eg. controller, scheduler, agent).
-  <p>
-  Errors in pipeline run execution are explicitly excluded. Ie a test failure is not counted in this
-  metric. <p> counter
- */
-static constexpr const char *kMetricCicdSystemErrors = "cicd.system.errors";
-static constexpr const char *descrMetricCicdSystemErrors =
-    "The number of errors in a component of the CICD system (eg. controller, scheduler, agent).";
-static constexpr const char *unitMetricCicdSystemErrors = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricCicdSystemErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                    unitMetricCicdSystemErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricCicdSystemErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                    unitMetricCicdSystemErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdSystemErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                             unitMetricCicdSystemErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdSystemErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCicdSystemErrors, descrMetricCicdSystemErrors,
-                                              unitMetricCicdSystemErrors);
-}
-
-/**
-  The number of workers on the CICD system by state.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricCicdWorkerCount = "cicd.worker.count";
-static constexpr const char *descrMetricCicdWorkerCount =
-    "The number of workers on the CICD system by state.";
-static constexpr const char *unitMetricCicdWorkerCount = "{count}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricCicdWorkerCount, descrMetricCicdWorkerCount,
-                                         unitMetricCicdWorkerCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricCicdWorkerCount, descrMetricCicdWorkerCount,
-                                          unitMetricCicdWorkerCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricCicdWorkerCount, descrMetricCicdWorkerCount, unitMetricCicdWorkerCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCicdWorkerCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricCicdWorkerCount, descrMetricCicdWorkerCount, unitMetricCicdWorkerCount);
-}
-
-}  // namespace cicd
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/client_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/client_attributes.h
deleted file mode 100644
index 7f944176d..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/client_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace client
-{
-
-/**
-  Client address - domain name if available without reverse DNS lookup; otherwise, IP address or
-  Unix domain socket name. <p> When observed from the server side, and when communicating through an
-  intermediary, @code client.address @endcode SHOULD represent the client address behind any
-  intermediaries,  for example proxies, if it's available.
- */
-static constexpr const char *kClientAddress = "client.address";
-
-/**
-  Client port number.
-  <p>
-  When observed from the server side, and when communicating through an intermediary, @code
-  client.port @endcode SHOULD represent the client port behind any intermediaries,  for example
-  proxies, if it's available.
- */
-static constexpr const char *kClientPort = "client.port";
-
-}  // namespace client
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloud_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloud_attributes.h
deleted file mode 100644
index f00c204a5..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloud_attributes.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cloud
-{
-
-/**
-  The cloud account ID the resource is assigned to.
- */
-static constexpr const char *kCloudAccountId = "cloud.account.id";
-
-/**
-  Cloud regions often have multiple, isolated locations known as zones to increase availability.
-  Availability zone represents the zone where the resource is running. <p> Availability zones are
-  called "zones" on Alibaba Cloud and Google Cloud.
- */
-static constexpr const char *kCloudAvailabilityZone = "cloud.availability_zone";
-
-/**
-  The cloud platform in use.
-  <p>
-  The prefix of the service SHOULD match the one specified in @code cloud.provider @endcode.
- */
-static constexpr const char *kCloudPlatform = "cloud.platform";
-
-/**
-  Name of the cloud provider.
- */
-static constexpr const char *kCloudProvider = "cloud.provider";
-
-/**
-  The geographical region within a cloud provider. When associated with a resource, this attribute
-  specifies the region where the resource operates. When calling services or APIs deployed on a
-  cloud, this attribute identifies the region where the called destination is deployed. <p> Refer to
-  your provider's docs to see the available regions, for example <a
-  href="https://www.alibabacloud.com/help/doc-detail/40654.htm">Alibaba Cloud regions</a>, <a
-  href="https://aws.amazon.com/about-aws/global-infrastructure/regions_az/">AWS regions</a>, <a
-  href="https://azure.microsoft.com/global-infrastructure/geographies/">Azure regions</a>, <a
-  href="https://cloud.google.com/about/locations">Google Cloud regions</a>, or <a
-  href="https://www.tencentcloud.com/document/product/213/6091">Tencent Cloud regions</a>.
- */
-static constexpr const char *kCloudRegion = "cloud.region";
-
-/**
-  Cloud provider-specific native identifier of the monitored cloud resource (e.g. an <a
-  href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a> on AWS,
-  a <a href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">fully qualified
-  resource ID</a> on Azure, a <a href="https://google.aip.dev/122#full-resource-names">full resource
-  name</a> on GCP) <p> On some cloud providers, it may not be possible to determine the full ID at
-  startup, so it may be necessary to set @code cloud.resource_id @endcode as a span attribute
-  instead. <p> The exact value to use for @code cloud.resource_id @endcode depends on the cloud
-  provider. The following well-known definitions MUST be used if you set this attribute and they
-  apply: <ul> <li><strong>AWS Lambda:</strong> The function <a
-  href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take
-  care not to use the "invoked ARN" directly but replace any <a
-  href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a>
-  with the resolved function version, as the same runtime instance may be invocable with
-  multiple different aliases.</li>
-    <li><strong>GCP:</strong> The <a
-  href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a></li>
-    <li><strong>Azure:</strong> The <a
-  href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
-  ID</a> of the invoked function, <em>not</em> the function app, having the form
-  @code
-  /subscriptions/<SUBSCRIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC>
-  @endcode. This means that a span attribute MUST be used, as an Azure function app can host
-  multiple functions that would usually share a TracerProvider.</li>
-  </ul>
- */
-static constexpr const char *kCloudResourceId = "cloud.resource_id";
-
-namespace CloudPlatformValues
-{
-/**
-  Alibaba Cloud Elastic Compute Service
- */
-static constexpr const char *kAlibabaCloudEcs = "alibaba_cloud_ecs";
-
-/**
-  Alibaba Cloud Function Compute
- */
-static constexpr const char *kAlibabaCloudFc = "alibaba_cloud_fc";
-
-/**
-  Red Hat OpenShift on Alibaba Cloud
- */
-static constexpr const char *kAlibabaCloudOpenshift = "alibaba_cloud_openshift";
-
-/**
-  AWS Elastic Compute Cloud
- */
-static constexpr const char *kAwsEc2 = "aws_ec2";
-
-/**
-  AWS Elastic Container Service
- */
-static constexpr const char *kAwsEcs = "aws_ecs";
-
-/**
-  AWS Elastic Kubernetes Service
- */
-static constexpr const char *kAwsEks = "aws_eks";
-
-/**
-  AWS Lambda
- */
-static constexpr const char *kAwsLambda = "aws_lambda";
-
-/**
-  AWS Elastic Beanstalk
- */
-static constexpr const char *kAwsElasticBeanstalk = "aws_elastic_beanstalk";
-
-/**
-  AWS App Runner
- */
-static constexpr const char *kAwsAppRunner = "aws_app_runner";
-
-/**
-  Red Hat OpenShift on AWS (ROSA)
- */
-static constexpr const char *kAwsOpenshift = "aws_openshift";
-
-/**
-  Azure Virtual Machines
- */
-static constexpr const char *kAzureVm = "azure_vm";
-
-/**
-  Azure Container Apps
- */
-static constexpr const char *kAzureContainerApps = "azure_container_apps";
-
-/**
-  Azure Container Instances
- */
-static constexpr const char *kAzureContainerInstances = "azure_container_instances";
-
-/**
-  Azure Kubernetes Service
- */
-static constexpr const char *kAzureAks = "azure_aks";
-
-/**
-  Azure Functions
- */
-static constexpr const char *kAzureFunctions = "azure_functions";
-
-/**
-  Azure App Service
- */
-static constexpr const char *kAzureAppService = "azure_app_service";
-
-/**
-  Azure Red Hat OpenShift
- */
-static constexpr const char *kAzureOpenshift = "azure_openshift";
-
-/**
-  Google Bare Metal Solution (BMS)
- */
-static constexpr const char *kGcpBareMetalSolution = "gcp_bare_metal_solution";
-
-/**
-  Google Cloud Compute Engine (GCE)
- */
-static constexpr const char *kGcpComputeEngine = "gcp_compute_engine";
-
-/**
-  Google Cloud Run
- */
-static constexpr const char *kGcpCloudRun = "gcp_cloud_run";
-
-/**
-  Google Cloud Kubernetes Engine (GKE)
- */
-static constexpr const char *kGcpKubernetesEngine = "gcp_kubernetes_engine";
-
-/**
-  Google Cloud Functions (GCF)
- */
-static constexpr const char *kGcpCloudFunctions = "gcp_cloud_functions";
-
-/**
-  Google Cloud App Engine (GAE)
- */
-static constexpr const char *kGcpAppEngine = "gcp_app_engine";
-
-/**
-  Red Hat OpenShift on Google Cloud
- */
-static constexpr const char *kGcpOpenshift = "gcp_openshift";
-
-/**
-  Red Hat OpenShift on IBM Cloud
- */
-static constexpr const char *kIbmCloudOpenshift = "ibm_cloud_openshift";
-
-/**
-  Compute on Oracle Cloud Infrastructure (OCI)
- */
-static constexpr const char *kOracleCloudCompute = "oracle_cloud_compute";
-
-/**
-  Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI)
- */
-static constexpr const char *kOracleCloudOke = "oracle_cloud_oke";
-
-/**
-  Tencent Cloud Cloud Virtual Machine (CVM)
- */
-static constexpr const char *kTencentCloudCvm = "tencent_cloud_cvm";
-
-/**
-  Tencent Cloud Elastic Kubernetes Service (EKS)
- */
-static constexpr const char *kTencentCloudEks = "tencent_cloud_eks";
-
-/**
-  Tencent Cloud Serverless Cloud Function (SCF)
- */
-static constexpr const char *kTencentCloudScf = "tencent_cloud_scf";
-
-}  // namespace CloudPlatformValues
-
-namespace CloudProviderValues
-{
-/**
-  Alibaba Cloud
- */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-
-/**
-  Amazon Web Services
- */
-static constexpr const char *kAws = "aws";
-
-/**
-  Microsoft Azure
- */
-static constexpr const char *kAzure = "azure";
-
-/**
-  Google Cloud Platform
- */
-static constexpr const char *kGcp = "gcp";
-
-/**
-  Heroku Platform as a Service
- */
-static constexpr const char *kHeroku = "heroku";
-
-/**
-  IBM Cloud
- */
-static constexpr const char *kIbmCloud = "ibm_cloud";
-
-/**
-  Oracle Cloud Infrastructure (OCI)
- */
-static constexpr const char *kOracleCloud = "oracle_cloud";
-
-/**
-  Tencent Cloud
- */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-
-}  // namespace CloudProviderValues
-
-}  // namespace cloud
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloudevents_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloudevents_attributes.h
deleted file mode 100644
index 539653c48..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloudevents_attributes.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cloudevents
-{
-
-/**
-  The <a href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id">event_id</a>
-  uniquely identifies the event.
- */
-static constexpr const char *kCloudeventsEventId = "cloudevents.event_id";
-
-/**
-  The <a
-  href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#source-1">source</a>
-  identifies the context in which an event happened.
- */
-static constexpr const char *kCloudeventsEventSource = "cloudevents.event_source";
-
-/**
-  The <a
-  href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#specversion">version of
-  the CloudEvents specification</a> which the event uses.
- */
-static constexpr const char *kCloudeventsEventSpecVersion = "cloudevents.event_spec_version";
-
-/**
-  The <a
-  href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#subject">subject</a> of
-  the event in the context of the event producer (identified by source).
- */
-static constexpr const char *kCloudeventsEventSubject = "cloudevents.event_subject";
-
-/**
-  The <a
-  href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type">event_type</a>
-  contains a value describing the type of event related to the originating occurrence.
- */
-static constexpr const char *kCloudeventsEventType = "cloudevents.event_type";
-
-}  // namespace cloudevents
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloudfoundry_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloudfoundry_attributes.h
deleted file mode 100644
index 58dc50d69..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cloudfoundry_attributes.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cloudfoundry
-{
-
-/**
-  The guid of the application.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.application_id @endcode. This is the same value as
-  reported by @code cf app <app-name> --guid @endcode.
- */
-static constexpr const char *kCloudfoundryAppId = "cloudfoundry.app.id";
-
-/**
-  The index of the application instance. 0 when just one instance is active.
-  <p>
-  CloudFoundry defines the @code instance_id @endcode in the <a
-  href="https://github.com/cloudfoundry/loggregator-api#v2-envelope">Loggregator v2 envelope</a>. It
-  is used for logs and metrics emitted by CloudFoundry. It is supposed to contain the application
-  instance index for applications deployed on the runtime. <p> Application instrumentation should
-  use the value from environment variable @code CF_INSTANCE_INDEX @endcode.
- */
-static constexpr const char *kCloudfoundryAppInstanceId = "cloudfoundry.app.instance.id";
-
-/**
-  The name of the application.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.application_name @endcode. This is the same value
-  as reported by @code cf apps @endcode.
- */
-static constexpr const char *kCloudfoundryAppName = "cloudfoundry.app.name";
-
-/**
-  The guid of the CloudFoundry org the application is running in.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.org_id @endcode. This is the same value as
-  reported by @code cf org <org-name> --guid @endcode.
- */
-static constexpr const char *kCloudfoundryOrgId = "cloudfoundry.org.id";
-
-/**
-  The name of the CloudFoundry organization the app is running in.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.org_name @endcode. This is the same value as
-  reported by @code cf orgs @endcode.
- */
-static constexpr const char *kCloudfoundryOrgName = "cloudfoundry.org.name";
-
-/**
-  The UID identifying the process.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.process_id @endcode. It is supposed to be equal to
-  @code VCAP_APPLICATION.app_id @endcode for applications deployed to the runtime.
-  For system components, this could be the actual PID.
- */
-static constexpr const char *kCloudfoundryProcessId = "cloudfoundry.process.id";
-
-/**
-  The type of process.
-  <p>
-  CloudFoundry applications can consist of multiple jobs. Usually the
-  main process will be of type @code web @endcode. There can be additional background
-  tasks or side-cars with different process types.
- */
-static constexpr const char *kCloudfoundryProcessType = "cloudfoundry.process.type";
-
-/**
-  The guid of the CloudFoundry space the application is running in.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.space_id @endcode. This is the same value as
-  reported by @code cf space <space-name> --guid @endcode.
- */
-static constexpr const char *kCloudfoundrySpaceId = "cloudfoundry.space.id";
-
-/**
-  The name of the CloudFoundry space the application is running in.
-  <p>
-  Application instrumentation should use the value from environment
-  variable @code VCAP_APPLICATION.space_name @endcode. This is the same value as
-  reported by @code cf spaces @endcode.
- */
-static constexpr const char *kCloudfoundrySpaceName = "cloudfoundry.space.name";
-
-/**
-  A guid or another name describing the event source.
-  <p>
-  CloudFoundry defines the @code source_id @endcode in the <a
-  href="https://github.com/cloudfoundry/loggregator-api#v2-envelope">Loggregator v2 envelope</a>. It
-  is used for logs and metrics emitted by CloudFoundry. It is supposed to contain the component
-  name, e.g. "gorouter", for CloudFoundry components. <p> When system components are instrumented,
-  values from the <a href="https://bosh.io/docs/jobs/#properties-spec">Bosh spec</a> should be used.
-  The @code system.id @endcode should be set to
-  @code spec.deployment/spec.name @endcode.
- */
-static constexpr const char *kCloudfoundrySystemId = "cloudfoundry.system.id";
-
-/**
-  A guid describing the concrete instance of the event source.
-  <p>
-  CloudFoundry defines the @code instance_id @endcode in the <a
-  href="https://github.com/cloudfoundry/loggregator-api#v2-envelope">Loggregator v2 envelope</a>. It
-  is used for logs and metrics emitted by CloudFoundry. It is supposed to contain the vm id for
-  CloudFoundry components. <p> When system components are instrumented, values from the <a
-  href="https://bosh.io/docs/jobs/#properties-spec">Bosh spec</a> should be used. The @code
-  system.instance.id @endcode should be set to @code spec.id @endcode.
- */
-static constexpr const char *kCloudfoundrySystemInstanceId = "cloudfoundry.system.instance.id";
-
-}  // namespace cloudfoundry
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/code_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/code_attributes.h
deleted file mode 100644
index 58b7a12bc..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/code_attributes.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace code
-{
-
-/**
-  Deprecated, use @code code.column.number @endcode
-
-  @deprecated
-  {"note": "Replaced by @code code.column.number @endcode.", "reason": "renamed", "renamed_to":
-  "code.column.number"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeColumn = "code.column";
-
-/**
-  The column number in @code code.file.path @endcode best representing the operation. It SHOULD
-  point within the code unit named in @code code.function.name @endcode. This attribute MUST NOT be
-  used on the Profile signal since the data is already captured in 'message Line'. This constraint
-  is imposed to prevent redundancy and maintain data integrity.
- */
-static constexpr const char *kCodeColumnNumber = "code.column.number";
-
-/**
-  The source code file name that identifies the code unit as uniquely as possible (preferably an
-  absolute file path). This attribute MUST NOT be used on the Profile signal since the data is
-  already captured in 'message Function'. This constraint is imposed to prevent redundancy and
-  maintain data integrity.
- */
-static constexpr const char *kCodeFilePath = "code.file.path";
-
-/**
-  Deprecated, use @code code.file.path @endcode instead
-
-  @deprecated
-  {"note": "Replaced by @code code.file.path @endcode.", "reason": "renamed", "renamed_to":
-  "code.file.path"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeFilepath = "code.filepath";
-
-/**
-  Deprecated, use @code code.function.name @endcode instead
-
-  @deprecated
-  {"note": "Value should be included in @code code.function.name @endcode which is expected to be a
-  fully-qualified name.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeFunction = "code.function";
-
-/**
-  The method or function fully-qualified name without arguments. The value should fit the natural
-  representation of the language runtime, which is also likely the same used within @code
-  code.stacktrace @endcode attribute value. This attribute MUST NOT be used on the Profile signal
-  since the data is already captured in 'message Function'. This constraint is imposed to prevent
-  redundancy and maintain data integrity. <p> Values and format depends on each language runtime,
-  thus it is impossible to provide an exhaustive list of examples. The values are usually the same
-  (or prefixes of) the ones found in native stack trace representation stored in
-  @code code.stacktrace @endcode without information on arguments.
-  <p>
-  Examples:
-  <ul>
-    <li>Java method: @code com.example.MyHttpService.serveRequest @endcode</li>
-    <li>Java anonymous class method: @code com.mycompany.Main$1.myMethod @endcode</li>
-    <li>Java lambda method: @code com.mycompany.Main$$Lambda/0x0000748ae4149c00.myMethod
-  @endcode</li> <li>PHP function: @code GuzzleHttp\Client::transfer @endcode</li> <li>Go function:
-  @code github.com/my/repo/pkg.foo.func5 @endcode</li> <li>Elixir: @code OpenTelemetry.Ctx.new
-  @endcode</li> <li>Erlang: @code opentelemetry_ctx:new @endcode</li> <li>Rust: @code
-  playground::my_module::my_cool_func @endcode</li> <li>C function: @code fopen @endcode</li>
-  </ul>
- */
-static constexpr const char *kCodeFunctionName = "code.function.name";
-
-/**
-  The line number in @code code.file.path @endcode best representing the operation. It SHOULD point
-  within the code unit named in @code code.function.name @endcode. This attribute MUST NOT be used
-  on the Profile signal since the data is already captured in 'message Line'. This constraint is
-  imposed to prevent redundancy and maintain data integrity.
- */
-static constexpr const char *kCodeLineNumber = "code.line.number";
-
-/**
-  Deprecated, use @code code.line.number @endcode instead
-
-  @deprecated
-  {"note": "Replaced by @code code.line.number @endcode.", "reason": "renamed", "renamed_to":
-  "code.line.number"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeLineno = "code.lineno";
-
-/**
-  Deprecated, namespace is now included into @code code.function.name @endcode
-
-  @deprecated
-  {"note": "Value should be included in @code code.function.name @endcode which is expected to be a
-  fully-qualified name.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kCodeNamespace = "code.namespace";
-
-/**
-  A stacktrace as a string in the natural representation for the language runtime. The
-  representation is identical to <a
-  href="/docs/exceptions/exceptions-spans.md#stacktrace-representation">@code exception.stacktrace
-  @endcode</a>. This attribute MUST NOT be used on the Profile signal since the data is already
-  captured in 'message Location'. This constraint is imposed to prevent redundancy and maintain data
-  integrity.
- */
-static constexpr const char *kCodeStacktrace = "code.stacktrace";
-
-}  // namespace code
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/container_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/container_attributes.h
deleted file mode 100644
index 92213a1e6..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/container_attributes.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace container
-{
-
-/**
-  The command used to run the container (i.e. the command name).
-  <p>
-  If using embedded credentials or sensitive data, it is recommended to remove them to prevent
-  potential leakage.
- */
-static constexpr const char *kContainerCommand = "container.command";
-
-/**
-  All the command arguments (including the command/executable itself) run by the container.
- */
-static constexpr const char *kContainerCommandArgs = "container.command_args";
-
-/**
-  The full command run by the container as a single string representing the full command.
- */
-static constexpr const char *kContainerCommandLine = "container.command_line";
-
-/**
-  Deprecated, use @code cpu.mode @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
-
-/**
-  The name of the CSI (<a href="https://github.com/container-storage-interface/spec">Container
-  Storage Interface</a>) plugin used by the volume. <p> This can sometimes be referred to as a
-  "driver" in CSI implementations. This should represent the @code name @endcode field of the
-  GetPluginInfo RPC.
- */
-static constexpr const char *kContainerCsiPluginName = "container.csi.plugin.name";
-
-/**
-  The unique volume ID returned by the CSI (<a
-  href="https://github.com/container-storage-interface/spec">Container Storage Interface</a>)
-  plugin. <p> This can sometimes be referred to as a "volume handle" in CSI implementations. This
-  should represent the @code Volume.volume_id @endcode field in CSI spec.
- */
-static constexpr const char *kContainerCsiVolumeId = "container.csi.volume.id";
-
-/**
-  Container ID. Usually a UUID, as for example used to <a
-  href="https://docs.docker.com/engine/containers/run/#container-identification">identify Docker
-  containers</a>. The UUID might be abbreviated.
- */
-static constexpr const char *kContainerId = "container.id";
-
-/**
-  Runtime specific image identifier. Usually a hash algorithm followed by a UUID.
-  <p>
-  Docker defines a sha256 of the image id; @code container.image.id @endcode corresponds to the
-  @code Image @endcode field from the Docker container inspect <a
-  href="https://docs.docker.com/engine/api/v1.43/#tag/Container/operation/ContainerInspect">API</a>
-  endpoint. K8s defines a link to the container registry repository with digest @code "imageID":
-  "registry.azurecr.io
-  /namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"
-  @endcode. The ID is assigned by the container runtime and can vary in different environments.
-  Consider using @code oci.manifest.digest @endcode if it is important to identify the same image in
-  different environments/runtimes.
- */
-static constexpr const char *kContainerImageId = "container.image.id";
-
-/**
-  Name of the image the container was built on.
- */
-static constexpr const char *kContainerImageName = "container.image.name";
-
-/**
-  Repo digests of the container image as provided by the container runtime.
-  <p>
-  <a href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker</a>
-  and <a
-  href="https://github.com/kubernetes/cri-api/blob/c75ef5b473bbe2d0a4fc92f82235efd665ea8e9f/pkg/apis/runtime/v1/api.proto#L1237-L1238">CRI</a>
-  report those under the @code RepoDigests @endcode field.
- */
-static constexpr const char *kContainerImageRepoDigests = "container.image.repo_digests";
-
-/**
-  Container image tags. An example can be found in <a
-  href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker Image
-  Inspect</a>. Should be only the @code <tag> @endcode section of the full name for example from
-  @code registry.example.com/my-org/my-image:<tag> @endcode.
- */
-static constexpr const char *kContainerImageTags = "container.image.tags";
-
-/**
-  Container labels, @code <key> @endcode being the label name, the value being the label value.
-  <p>
-  For example, a docker container label @code app @endcode with value @code nginx @endcode SHOULD be
-  recorded as the @code container.label.app @endcode attribute with value @code "nginx" @endcode.
- */
-static constexpr const char *kContainerLabel = "container.label";
-
-/**
-  Deprecated, use @code container.label @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code container.label @endcode.", "reason": "renamed", "renamed_to":
-  "container.label"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerLabels = "container.labels";
-
-/**
-  Container name used by container runtime.
- */
-static constexpr const char *kContainerName = "container.name";
-
-/**
-  The container runtime managing this container.
- */
-static constexpr const char *kContainerRuntime = "container.runtime";
-
-namespace ContainerCpuStateValues
-{
-/**
-  When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode
-  (Windows).
- */
-static constexpr const char *kUser = "user";
-
-/**
-  When CPU is used by the system (host OS)
- */
-static constexpr const char *kSystem = "system";
-
-/**
-  When tasks of the cgroup are in kernel mode (Linux). When all container processes are in kernel
-  mode (Windows).
- */
-static constexpr const char *kKernel = "kernel";
-
-}  // namespace ContainerCpuStateValues
-
-}  // namespace container
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/container_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/container_metrics.h
deleted file mode 100644
index 69853e777..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/container_metrics.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace container
-{
-
-/**
-  Total CPU time consumed
-  <p>
-  Total CPU time consumed by the specific container on all available CPU cores
-  <p>
-  counter
- */
-static constexpr const char *kMetricContainerCpuTime     = "container.cpu.time";
-static constexpr const char *descrMetricContainerCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricContainerCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                    unitMetricContainerCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                    unitMetricContainerCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                             unitMetricContainerCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricContainerCpuTime, descrMetricContainerCpuTime,
-                                              unitMetricContainerCpuTime);
-}
-
-/**
-  Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
-  <p>
-  CPU usage of the specific container on all available CPU cores, averaged over the sample window
-  <p>
-  gauge
- */
-static constexpr const char *kMetricContainerCpuUsage = "container.cpu.usage";
-static constexpr const char *descrMetricContainerCpuUsage =
-    "Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricContainerCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricContainerCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                 unitMetricContainerCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricContainerCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                  unitMetricContainerCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                           unitMetricContainerCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricContainerCpuUsage, descrMetricContainerCpuUsage,
-                                            unitMetricContainerCpuUsage);
-}
-
-/**
-  Disk bytes for the container.
-  <p>
-  The total number of bytes read/written successfully (aggregated from all disks).
-  <p>
-  counter
- */
-static constexpr const char *kMetricContainerDiskIo     = "container.disk.io";
-static constexpr const char *descrMetricContainerDiskIo = "Disk bytes for the container.";
-static constexpr const char *unitMetricContainerDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                    unitMetricContainerDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                    unitMetricContainerDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerDiskIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                             unitMetricContainerDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerDiskIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricContainerDiskIo, descrMetricContainerDiskIo,
-                                              unitMetricContainerDiskIo);
-}
-
-/**
-  Memory usage of the container.
-  <p>
-  Memory usage of the container.
-  <p>
-  counter
- */
-static constexpr const char *kMetricContainerMemoryUsage     = "container.memory.usage";
-static constexpr const char *descrMetricContainerMemoryUsage = "Memory usage of the container.";
-static constexpr const char *unitMetricContainerMemoryUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage,
-                                    unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage,
-                                    unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricContainerMemoryUsage, descrMetricContainerMemoryUsage, unitMetricContainerMemoryUsage);
-}
-
-/**
-  Network bytes for the container.
-  <p>
-  The number of bytes sent/received on all network interfaces by the container.
-  <p>
-  counter
- */
-static constexpr const char *kMetricContainerNetworkIo     = "container.network.io";
-static constexpr const char *descrMetricContainerNetworkIo = "Network bytes for the container.";
-static constexpr const char *unitMetricContainerNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricContainerNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricContainerNetworkIo, descrMetricContainerNetworkIo,
-                                    unitMetricContainerNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricContainerNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricContainerNetworkIo, descrMetricContainerNetworkIo,
-                                    unitMetricContainerNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricContainerNetworkIo, descrMetricContainerNetworkIo, unitMetricContainerNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricContainerNetworkIo, descrMetricContainerNetworkIo, unitMetricContainerNetworkIo);
-}
-
-/**
-  The time the container has been running
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricContainerUptime     = "container.uptime";
-static constexpr const char *descrMetricContainerUptime = "The time the container has been running";
-static constexpr const char *unitMetricContainerUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricContainerUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                 unitMetricContainerUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricContainerUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                  unitMetricContainerUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricContainerUptime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                           unitMetricContainerUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricContainerUptime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricContainerUptime, descrMetricContainerUptime,
-                                            unitMetricContainerUptime);
-}
-
-}  // namespace container
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpu_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpu_attributes.h
deleted file mode 100644
index c3c3ef58a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpu_attributes.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpu
-{
-
-/**
-  The logical CPU number [0..n-1]
- */
-static constexpr const char *kCpuLogicalNumber = "cpu.logical_number";
-
-/**
-  The mode of the CPU
- */
-static constexpr const char *kCpuMode = "cpu.mode";
-
-namespace CpuModeValues
-{
-/**
-  none
- */
-static constexpr const char *kUser = "user";
-
-/**
-  none
- */
-static constexpr const char *kSystem = "system";
-
-/**
-  none
- */
-static constexpr const char *kNice = "nice";
-
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kIowait = "iowait";
-
-/**
-  none
- */
-static constexpr const char *kInterrupt = "interrupt";
-
-/**
-  none
- */
-static constexpr const char *kSteal = "steal";
-
-/**
-  none
- */
-static constexpr const char *kKernel = "kernel";
-
-}  // namespace CpuModeValues
-
-}  // namespace cpu
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpu_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpu_metrics.h
deleted file mode 100644
index e82f7e2fc..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpu_metrics.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpu
-{
-
-/**
-  Operating frequency of the logical CPU in Hertz.
-  <p>
-  gauge
- */
-static constexpr const char *kMetricCpuFrequency = "cpu.frequency";
-static constexpr const char *descrMetricCpuFrequency =
-    "Operating frequency of the logical CPU in Hertz.";
-static constexpr const char *unitMetricCpuFrequency = "Hz";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                 unitMetricCpuFrequency);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                  unitMetricCpuFrequency);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                           unitMetricCpuFrequency);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricCpuFrequency(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricCpuFrequency, descrMetricCpuFrequency,
-                                            unitMetricCpuFrequency);
-}
-
-/**
-  Seconds each logical CPU spent on each mode
-  <p>
-  counter
- */
-static constexpr const char *kMetricCpuTime     = "cpu.time";
-static constexpr const char *descrMetricCpuTime = "Seconds each logical CPU spent on each mode";
-static constexpr const char *unitMetricCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCpuTime, descrMetricCpuTime, unitMetricCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCpuTime, descrMetricCpuTime,
-                                              unitMetricCpuTime);
-}
-
-/**
-  For each logical CPU, the utilization is calculated as the change in cumulative CPU time
-  (cpu.time) over a measurement interval, divided by the elapsed time. <p> gauge
- */
-static constexpr const char *kMetricCpuUtilization = "cpu.utilization";
-static constexpr const char *descrMetricCpuUtilization =
-    "For each logical CPU, the utilization is calculated as the change in cumulative CPU time "
-    "(cpu.time) over a measurement interval, divided by the elapsed time.";
-static constexpr const char *unitMetricCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                 unitMetricCpuUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                  unitMetricCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                           unitMetricCpuUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricCpuUtilization, descrMetricCpuUtilization,
-                                            unitMetricCpuUtilization);
-}
-
-}  // namespace cpu
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpython_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpython_attributes.h
deleted file mode 100644
index e02e67bac..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpython_attributes.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpython
-{
-
-/**
-  Value of the garbage collector collection generation.
- */
-static constexpr const char *kCpythonGcGeneration = "cpython.gc.generation";
-
-namespace CpythonGcGenerationValues
-{
-/**
-  Generation 0
- */
-static constexpr int kGeneration0 = 0;
-
-/**
-  Generation 1
- */
-static constexpr int kGeneration1 = 1;
-
-/**
-  Generation 2
- */
-static constexpr int kGeneration2 = 2;
-
-}  // namespace CpythonGcGenerationValues
-
-}  // namespace cpython
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpython_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpython_metrics.h
deleted file mode 100644
index 3125b388e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/cpython_metrics.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace cpython
-{
-
-/**
-  The total number of objects collected inside a generation since interpreter start.
-  <p>
-  This metric reports data from <a
-  href="https://docs.python.org/3/library/gc.html#gc.get_stats">@code gc.stats() @endcode</a>. <p>
-  counter
- */
-static constexpr const char *kMetricCpythonGcCollectedObjects = "cpython.gc.collected_objects";
-static constexpr const char *descrMetricCpythonGcCollectedObjects =
-    "The total number of objects collected inside a generation since interpreter start.";
-static constexpr const char *unitMetricCpythonGcCollectedObjects = "{object}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCpythonGcCollectedObjects(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpythonGcCollectedObjects,
-                                    descrMetricCpythonGcCollectedObjects,
-                                    unitMetricCpythonGcCollectedObjects);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCpythonGcCollectedObjects(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpythonGcCollectedObjects,
-                                    descrMetricCpythonGcCollectedObjects,
-                                    unitMetricCpythonGcCollectedObjects);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCpythonGcCollectedObjects(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCpythonGcCollectedObjects,
-                                             descrMetricCpythonGcCollectedObjects,
-                                             unitMetricCpythonGcCollectedObjects);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpythonGcCollectedObjects(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCpythonGcCollectedObjects,
-                                              descrMetricCpythonGcCollectedObjects,
-                                              unitMetricCpythonGcCollectedObjects);
-}
-
-/**
-  The number of times a generation was collected since interpreter start.
-  <p>
-  This metric reports data from <a
-  href="https://docs.python.org/3/library/gc.html#gc.get_stats">@code gc.stats() @endcode</a>. <p>
-  counter
- */
-static constexpr const char *kMetricCpythonGcCollections = "cpython.gc.collections";
-static constexpr const char *descrMetricCpythonGcCollections =
-    "The number of times a generation was collected since interpreter start.";
-static constexpr const char *unitMetricCpythonGcCollections = "{collection}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCpythonGcCollections(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpythonGcCollections, descrMetricCpythonGcCollections,
-                                    unitMetricCpythonGcCollections);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCpythonGcCollections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpythonGcCollections, descrMetricCpythonGcCollections,
-                                    unitMetricCpythonGcCollections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCpythonGcCollections(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricCpythonGcCollections, descrMetricCpythonGcCollections, unitMetricCpythonGcCollections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpythonGcCollections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricCpythonGcCollections, descrMetricCpythonGcCollections, unitMetricCpythonGcCollections);
-}
-
-/**
-  The total number of objects which were found to be uncollectable inside a generation since
-  interpreter start. <p> This metric reports data from <a
-  href="https://docs.python.org/3/library/gc.html#gc.get_stats">@code gc.stats() @endcode</a>. <p>
-  counter
- */
-static constexpr const char *kMetricCpythonGcUncollectableObjects =
-    "cpython.gc.uncollectable_objects";
-static constexpr const char *descrMetricCpythonGcUncollectableObjects =
-    "The total number of objects which were found to be uncollectable inside a generation since "
-    "interpreter start.";
-static constexpr const char *unitMetricCpythonGcUncollectableObjects = "{object}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricCpythonGcUncollectableObjects(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricCpythonGcUncollectableObjects,
-                                    descrMetricCpythonGcUncollectableObjects,
-                                    unitMetricCpythonGcUncollectableObjects);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricCpythonGcUncollectableObjects(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricCpythonGcUncollectableObjects,
-                                    descrMetricCpythonGcUncollectableObjects,
-                                    unitMetricCpythonGcUncollectableObjects);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricCpythonGcUncollectableObjects(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricCpythonGcUncollectableObjects,
-                                             descrMetricCpythonGcUncollectableObjects,
-                                             unitMetricCpythonGcUncollectableObjects);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricCpythonGcUncollectableObjects(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricCpythonGcUncollectableObjects,
-                                              descrMetricCpythonGcUncollectableObjects,
-                                              unitMetricCpythonGcUncollectableObjects);
-}
-
-}  // namespace cpython
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/db_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/db_attributes.h
deleted file mode 100644
index c0c44276b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/db_attributes.h
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace db
-{
-
-/**
-  Deprecated, use @code cassandra.consistency.level @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.consistency.level @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.consistency.level"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraConsistencyLevel =
-    "db.cassandra.consistency_level";
-
-/**
-  Deprecated, use @code cassandra.coordinator.dc @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.coordinator.dc @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.coordinator.dc"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraCoordinatorDc =
-    "db.cassandra.coordinator.dc";
-
-/**
-  Deprecated, use @code cassandra.coordinator.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.coordinator.id @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.coordinator.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraCoordinatorId =
-    "db.cassandra.coordinator.id";
-
-/**
-  Deprecated, use @code cassandra.query.idempotent @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.query.idempotent @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.query.idempotent"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraIdempotence =
-    "db.cassandra.idempotence";
-
-/**
-  Deprecated, use @code cassandra.page.size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.page.size @endcode.", "reason": "renamed", "renamed_to":
-  "cassandra.page.size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraPageSize =
-    "db.cassandra.page_size";
-
-/**
-  Deprecated, use @code cassandra.speculative_execution.count @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cassandra.speculative_execution.count @endcode.", "reason": "renamed",
-  "renamed_to": "cassandra.speculative_execution.count"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraSpeculativeExecutionCount =
-    "db.cassandra.speculative_execution_count";
-
-/**
-  Deprecated, use @code db.collection.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.collection.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.collection.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraTable = "db.cassandra.table";
-
-/**
-  The name of the connection pool; unique within the instrumented application. In case the
-  connection pool implementation doesn't provide a name, instrumentation SHOULD use a combination of
-  parameters that would make the name unique, for example, combining attributes @code server.address
-  @endcode, @code server.port @endcode, and @code db.namespace @endcode, formatted as @code
-  server.address:server.port/db.namespace @endcode. Instrumentations that generate connection pool
-  name following different patterns SHOULD document it.
- */
-static constexpr const char *kDbClientConnectionPoolName = "db.client.connection.pool.name";
-
-/**
-  The state of a connection in the pool
- */
-static constexpr const char *kDbClientConnectionState = "db.client.connection.state";
-
-/**
-  Deprecated, use @code db.client.connection.pool.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.pool.name @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.pool.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsPoolName =
-    "db.client.connections.pool.name";
-
-/**
-  Deprecated, use @code db.client.connection.state @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.state @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.state"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsState =
-    "db.client.connections.state";
-
-/**
-  The name of a collection (table, container) within the database.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  The collection name SHOULD NOT be extracted from @code db.query.text @endcode,
-  when the database system supports query text with multiple collections
-  in non-batch operations.
-  <p>
-  For batch operations, if the individual operations are known to have the same
-  collection name then that collection name SHOULD be used.
- */
-static constexpr const char *kDbCollectionName = "db.collection.name";
-
-/**
-  Deprecated, use @code server.address @endcode, @code server.port @endcode attributes instead.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode and @code server.port @endcode.\n", "reason":
-  "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbConnectionString = "db.connection_string";
-
-/**
-  Deprecated, use @code azure.client.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.client.id @endcode.", "reason": "renamed", "renamed_to":
-  "azure.client.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbClientId = "db.cosmosdb.client_id";
-
-/**
-  Deprecated, use @code azure.cosmosdb.connection.mode @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.connection.mode @endcode.", "reason": "renamed",
-  "renamed_to": "azure.cosmosdb.connection.mode"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbConnectionMode =
-    "db.cosmosdb.connection_mode";
-
-/**
-  Deprecated, use @code cosmosdb.consistency.level @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.consistency.level @endcode.", "reason": "renamed",
-  "renamed_to": "azure.cosmosdb.consistency.level"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbConsistencyLevel =
-    "db.cosmosdb.consistency_level";
-
-/**
-  Deprecated, use @code db.collection.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.collection.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.collection.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbContainer =
-    "db.cosmosdb.container";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbOperationType =
-    "db.cosmosdb.operation_type";
-
-/**
-  Deprecated, use @code azure.cosmosdb.operation.contacted_regions @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.operation.contacted_regions @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.operation.contacted_regions"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRegionsContacted =
-    "db.cosmosdb.regions_contacted";
-
-/**
-  Deprecated, use @code azure.cosmosdb.operation.request_charge @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.operation.request_charge @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.operation.request_charge"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRequestCharge =
-    "db.cosmosdb.request_charge";
-
-/**
-  Deprecated, use @code azure.cosmosdb.request.body.size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.request.body.size @endcode.", "reason": "renamed",
-  "renamed_to": "azure.cosmosdb.request.body.size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbRequestContentLength =
-    "db.cosmosdb.request_content_length";
-
-/**
-  Deprecated, use @code db.response.status_code @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.response.status_code @endcode.", "reason": "renamed", "renamed_to":
-  "db.response.status_code"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbStatusCode =
-    "db.cosmosdb.status_code";
-
-/**
-  Deprecated, use @code azure.cosmosdb.response.sub_status_code @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.response.sub_status_code @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.response.sub_status_code"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbSubStatusCode =
-    "db.cosmosdb.sub_status_code";
-
-/**
-  Deprecated, use @code db.namespace @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.namespace @endcode.", "reason": "renamed", "renamed_to":
-  "db.namespace"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchClusterName =
-    "db.elasticsearch.cluster.name";
-
-/**
-  Deprecated, use @code elasticsearch.node.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code elasticsearch.node.name @endcode.", "reason": "renamed", "renamed_to":
-  "elasticsearch.node.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchNodeName =
-    "db.elasticsearch.node.name";
-
-/**
-  Deprecated, use @code db.operation.parameter @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.operation.parameter @endcode.", "reason": "renamed", "renamed_to":
-  "db.operation.parameter"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchPathParts =
-    "db.elasticsearch.path_parts";
-
-/**
-  Deprecated, no general replacement at this time. For Elasticsearch, use @code
-  db.elasticsearch.node.name @endcode instead.
-
-  @deprecated
-  {"note": "Removed, no general replacement at this time. For Elasticsearch, use @code
-  db.elasticsearch.node.name @endcode instead.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbInstanceId = "db.instance.id";
-
-/**
-  Removed, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbJdbcDriverClassname =
-    "db.jdbc.driver_classname";
-
-/**
-  Deprecated, use @code db.collection.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.collection.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.collection.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMongodbCollection =
-    "db.mongodb.collection";
-
-/**
-  Deprecated, SQL Server instance is now populated as a part of @code db.namespace @endcode
-  attribute.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMssqlInstanceName =
-    "db.mssql.instance_name";
-
-/**
-  Deprecated, use @code db.namespace @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.namespace @endcode.", "reason": "renamed", "renamed_to":
-  "db.namespace"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbName = "db.name";
-
-/**
-  The name of the database, fully qualified within the server address and port.
-  <p>
-  If a database system has multiple namespace components, they SHOULD be concatenated from the most
-  general to the most specific namespace component, using @code | @endcode as a separator between
-  the components. Any missing components (and their associated separators) SHOULD be omitted.
-  Semantic conventions for individual database systems SHOULD document what @code db.namespace
-  @endcode means in the context of that system. It is RECOMMENDED to capture the value as provided
-  by the application without attempting to do any case normalization.
- */
-static constexpr const char *kDbNamespace = "db.namespace";
-
-/**
-  Deprecated, use @code db.operation.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.operation.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.operation.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbOperation = "db.operation";
-
-/**
-  The number of queries included in a batch operation.
-  <p>
-  Operations are only considered batches when they contain two or more operations, and so @code
-  db.operation.batch.size @endcode SHOULD never be @code 1 @endcode.
- */
-static constexpr const char *kDbOperationBatchSize = "db.operation.batch.size";
-
-/**
-  The name of the operation or command being executed.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  The operation name SHOULD NOT be extracted from @code db.query.text @endcode,
-  when the database system supports query text with multiple operations
-  in non-batch operations.
-  <p>
-  If spaces can occur in the operation name, multiple consecutive spaces
-  SHOULD be normalized to a single space.
-  <p>
-  For batch operations, if the individual operations are known to have the same operation name
-  then that operation name SHOULD be used prepended by @code BATCH  @endcode,
-  otherwise @code db.operation.name @endcode SHOULD be @code BATCH @endcode or some other database
-  system specific term if more applicable.
- */
-static constexpr const char *kDbOperationName = "db.operation.name";
-
-/**
-  A database operation parameter, with @code <key> @endcode being the parameter name, and the
-  attribute value being a string representation of the parameter value. <p> For example, a
-  client-side maximum number of rows to read from the database MAY be recorded as the @code
-  db.operation.parameter.max_rows @endcode attribute. <p>
-  @code db.query.text @endcode parameters SHOULD be captured using @code db.query.parameter.<key>
-  @endcode instead of @code db.operation.parameter.<key> @endcode.
- */
-static constexpr const char *kDbOperationParameter = "db.operation.parameter";
-
-/**
-  A database query parameter, with @code <key> @endcode being the parameter name, and the attribute
-  value being a string representation of the parameter value. <p> If a query parameter has no name
-  and instead is referenced only by index, then @code <key> @endcode SHOULD be the 0-based index.
-  <p>
-  @code db.query.parameter.<key> @endcode SHOULD match
-  up with the parameterized placeholders present in @code db.query.text @endcode.
-  <p>
-  @code db.query.parameter.<key> @endcode SHOULD NOT be captured on batch operations.
-  <p>
-  Examples:
-  <ul>
-    <li>For a query @code SELECT * FROM users where username =  %s @endcode with the parameter @code
-  "jdoe" @endcode, the attribute @code db.query.parameter.0 @endcode SHOULD be set to @code "jdoe"
-  @endcode.</li> <li>For a query @code "SELECT * FROM users WHERE username = %(username)s; @endcode
-  with parameter
-  @code username = "jdoe" @endcode, the attribute @code db.query.parameter.username @endcode SHOULD
-  be set to @code "jdoe" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kDbQueryParameter = "db.query.parameter";
-
-/**
-  Low cardinality summary of a database query.
-  <p>
-  The query summary describes a class of database queries and is useful
-  as a grouping key, especially when analyzing telemetry for database
-  calls involving complex queries.
-  <p>
-  Summary may be available to the instrumentation through
-  instrumentation hooks or other means. If it is not available, instrumentations
-  that support query parsing SHOULD generate a summary following
-  <a href="/docs/database/database-spans.md#generating-a-summary-of-the-query">Generating query
-  summary</a> section.
- */
-static constexpr const char *kDbQuerySummary = "db.query.summary";
-
-/**
-  The database query being executed.
-  <p>
-  For sanitization see <a
-  href="/docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of @code
-  db.query.text @endcode</a>. For batch operations, if the individual operations are known to have
-  the same query text then that query text SHOULD be used, otherwise all of the individual query
-  texts SHOULD be concatenated with separator @code ;  @endcode or some other database system
-  specific separator if more applicable. Parameterized query text SHOULD NOT be sanitized. Even
-  though parameterized query text can potentially have sensitive data, by using a parameterized
-  query the user is giving a strong signal that any sensitive data will be passed as parameter
-  values, and the benefit to observability of capturing the static part of the query text by default
-  outweighs the risk.
- */
-static constexpr const char *kDbQueryText = "db.query.text";
-
-/**
-  Deprecated, use @code db.namespace @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.namespace @endcode.", "reason": "renamed", "renamed_to":
-  "db.namespace"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
-    "db.redis.database_index";
-
-/**
-  Number of rows returned by the operation.
- */
-static constexpr const char *kDbResponseReturnedRows = "db.response.returned_rows";
-
-/**
-  Database response status code.
-  <p>
-  The status code returned by the database. Usually it represents an error code, but may also
-  represent partial success, warning, or differentiate between various types of successful outcomes.
-  Semantic conventions for individual database systems SHOULD document what @code
-  db.response.status_code @endcode means in the context of that system.
- */
-static constexpr const char *kDbResponseStatusCode = "db.response.status_code";
-
-/**
-  Deprecated, use @code db.collection.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.collection.name @endcode, but only if not extracting the value from
-  @code db.query.text @endcode.", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSqlTable = "db.sql.table";
-
-/**
-  The database statement being executed.
-
-  @deprecated
-  {"note": "Replaced by @code db.query.text @endcode.", "reason": "renamed", "renamed_to":
-  "db.query.text"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbStatement = "db.statement";
-
-/**
-  The name of a stored procedure within the database.
-  <p>
-  It is RECOMMENDED to capture the value as provided by the application
-  without attempting to do any case normalization.
-  <p>
-  For batch operations, if the individual operations are known to have the same
-  stored procedure name then that stored procedure name SHOULD be used.
- */
-static constexpr const char *kDbStoredProcedureName = "db.stored_procedure.name";
-
-/**
-  Deprecated, use @code db.system.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.system.name @endcode.", "reason": "renamed", "renamed_to":
-  "db.system.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSystem = "db.system";
-
-/**
-  The database management system (DBMS) product as identified by the client instrumentation.
-  <p>
-  The actual DBMS may differ from the one identified by the client. For example, when using
-  PostgreSQL client libraries to connect to a CockroachDB, the @code db.system.name @endcode is set
-  to @code postgresql @endcode based on the instrumentation's best knowledge.
- */
-static constexpr const char *kDbSystemName = "db.system.name";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbUser = "db.user";
-
-namespace DbCassandraConsistencyLevelValues
-{
-/**
-  none
- */
-static constexpr const char *kAll = "all";
-
-/**
-  none
- */
-static constexpr const char *kEachQuorum = "each_quorum";
-
-/**
-  none
- */
-static constexpr const char *kQuorum = "quorum";
-
-/**
-  none
- */
-static constexpr const char *kLocalQuorum = "local_quorum";
-
-/**
-  none
- */
-static constexpr const char *kOne = "one";
-
-/**
-  none
- */
-static constexpr const char *kTwo = "two";
-
-/**
-  none
- */
-static constexpr const char *kThree = "three";
-
-/**
-  none
- */
-static constexpr const char *kLocalOne = "local_one";
-
-/**
-  none
- */
-static constexpr const char *kAny = "any";
-
-/**
-  none
- */
-static constexpr const char *kSerial = "serial";
-
-/**
-  none
- */
-static constexpr const char *kLocalSerial = "local_serial";
-
-}  // namespace DbCassandraConsistencyLevelValues
-
-namespace DbClientConnectionStateValues
-{
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-}  // namespace DbClientConnectionStateValues
-
-namespace DbClientConnectionsStateValues
-{
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-}  // namespace DbClientConnectionsStateValues
-
-namespace DbCosmosdbConnectionModeValues
-{
-/**
-  Gateway (HTTP) connection.
- */
-static constexpr const char *kGateway = "gateway";
-
-/**
-  Direct connection.
- */
-static constexpr const char *kDirect = "direct";
-
-}  // namespace DbCosmosdbConnectionModeValues
-
-namespace DbCosmosdbConsistencyLevelValues
-{
-/**
-  none
- */
-static constexpr const char *kStrong = "Strong";
-
-/**
-  none
- */
-static constexpr const char *kBoundedStaleness = "BoundedStaleness";
-
-/**
-  none
- */
-static constexpr const char *kSession = "Session";
-
-/**
-  none
- */
-static constexpr const char *kEventual = "Eventual";
-
-/**
-  none
- */
-static constexpr const char *kConsistentPrefix = "ConsistentPrefix";
-
-}  // namespace DbCosmosdbConsistencyLevelValues
-
-namespace DbCosmosdbOperationTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kBatch = "batch";
-
-/**
-  none
- */
-static constexpr const char *kCreate = "create";
-
-/**
-  none
- */
-static constexpr const char *kDelete = "delete";
-
-/**
-  none
- */
-static constexpr const char *kExecute = "execute";
-
-/**
-  none
- */
-static constexpr const char *kExecuteJavascript = "execute_javascript";
-
-/**
-  none
- */
-static constexpr const char *kInvalid = "invalid";
-
-/**
-  none
- */
-static constexpr const char *kHead = "head";
-
-/**
-  none
- */
-static constexpr const char *kHeadFeed = "head_feed";
-
-/**
-  none
- */
-static constexpr const char *kPatch = "patch";
-
-/**
-  none
- */
-static constexpr const char *kQuery = "query";
-
-/**
-  none
- */
-static constexpr const char *kQueryPlan = "query_plan";
-
-/**
-  none
- */
-static constexpr const char *kRead = "read";
-
-/**
-  none
- */
-static constexpr const char *kReadFeed = "read_feed";
-
-/**
-  none
- */
-static constexpr const char *kReplace = "replace";
-
-/**
-  none
- */
-static constexpr const char *kUpsert = "upsert";
-
-}  // namespace DbCosmosdbOperationTypeValues
-
-namespace DbSystemValues
-{
-/**
-  Some other SQL database. Fallback only. See notes.
- */
-static constexpr const char *kOtherSql = "other_sql";
-
-/**
-  Adabas (Adaptable Database System)
- */
-static constexpr const char *kAdabas = "adabas";
-
-/**
-  Deprecated, use @code intersystems_cache @endcode instead.
- */
-static constexpr const char *kCache = "cache";
-
-/**
-  InterSystems Caché
- */
-static constexpr const char *kIntersystemsCache = "intersystems_cache";
-
-/**
-  Apache Cassandra
- */
-static constexpr const char *kCassandra = "cassandra";
-
-/**
-  ClickHouse
- */
-static constexpr const char *kClickhouse = "clickhouse";
-
-/**
-  Deprecated, use @code other_sql @endcode instead.
- */
-static constexpr const char *kCloudscape = "cloudscape";
-
-/**
-  CockroachDB
- */
-static constexpr const char *kCockroachdb = "cockroachdb";
-
-/**
-  Deprecated, no replacement at this time.
- */
-static constexpr const char *kColdfusion = "coldfusion";
-
-/**
-  Microsoft Azure Cosmos DB
- */
-static constexpr const char *kCosmosdb = "cosmosdb";
-
-/**
-  Couchbase
- */
-static constexpr const char *kCouchbase = "couchbase";
-
-/**
-  CouchDB
- */
-static constexpr const char *kCouchdb = "couchdb";
-
-/**
-  IBM Db2
- */
-static constexpr const char *kDb2 = "db2";
-
-/**
-  Apache Derby
- */
-static constexpr const char *kDerby = "derby";
-
-/**
-  Amazon DynamoDB
- */
-static constexpr const char *kDynamodb = "dynamodb";
-
-/**
-  EnterpriseDB
- */
-static constexpr const char *kEdb = "edb";
-
-/**
-  Elasticsearch
- */
-static constexpr const char *kElasticsearch = "elasticsearch";
-
-/**
-  FileMaker
- */
-static constexpr const char *kFilemaker = "filemaker";
-
-/**
-  Firebird
- */
-static constexpr const char *kFirebird = "firebird";
-
-/**
-  Deprecated, use @code other_sql @endcode instead.
- */
-static constexpr const char *kFirstsql = "firstsql";
-
-/**
-  Apache Geode
- */
-static constexpr const char *kGeode = "geode";
-
-/**
-  H2
- */
-static constexpr const char *kH2 = "h2";
-
-/**
-  SAP HANA
- */
-static constexpr const char *kHanadb = "hanadb";
-
-/**
-  Apache HBase
- */
-static constexpr const char *kHbase = "hbase";
-
-/**
-  Apache Hive
- */
-static constexpr const char *kHive = "hive";
-
-/**
-  HyperSQL DataBase
- */
-static constexpr const char *kHsqldb = "hsqldb";
-
-/**
-  InfluxDB
- */
-static constexpr const char *kInfluxdb = "influxdb";
-
-/**
-  Informix
- */
-static constexpr const char *kInformix = "informix";
-
-/**
-  Ingres
- */
-static constexpr const char *kIngres = "ingres";
-
-/**
-  InstantDB
- */
-static constexpr const char *kInstantdb = "instantdb";
-
-/**
-  InterBase
- */
-static constexpr const char *kInterbase = "interbase";
-
-/**
-  MariaDB
- */
-static constexpr const char *kMariadb = "mariadb";
-
-/**
-  SAP MaxDB
- */
-static constexpr const char *kMaxdb = "maxdb";
-
-/**
-  Memcached
- */
-static constexpr const char *kMemcached = "memcached";
-
-/**
-  MongoDB
- */
-static constexpr const char *kMongodb = "mongodb";
-
-/**
-  Microsoft SQL Server
- */
-static constexpr const char *kMssql = "mssql";
-
-/**
-  Deprecated, Microsoft SQL Server Compact is discontinued.
- */
-static constexpr const char *kMssqlcompact = "mssqlcompact";
-
-/**
-  MySQL
- */
-static constexpr const char *kMysql = "mysql";
-
-/**
-  Neo4j
- */
-static constexpr const char *kNeo4j = "neo4j";
-
-/**
-  Netezza
- */
-static constexpr const char *kNetezza = "netezza";
-
-/**
-  OpenSearch
- */
-static constexpr const char *kOpensearch = "opensearch";
-
-/**
-  Oracle Database
- */
-static constexpr const char *kOracle = "oracle";
-
-/**
-  Pervasive PSQL
- */
-static constexpr const char *kPervasive = "pervasive";
-
-/**
-  PointBase
- */
-static constexpr const char *kPointbase = "pointbase";
-
-/**
-  PostgreSQL
- */
-static constexpr const char *kPostgresql = "postgresql";
-
-/**
-  Progress Database
- */
-static constexpr const char *kProgress = "progress";
-
-/**
-  Redis
- */
-static constexpr const char *kRedis = "redis";
-
-/**
-  Amazon Redshift
- */
-static constexpr const char *kRedshift = "redshift";
-
-/**
-  Cloud Spanner
- */
-static constexpr const char *kSpanner = "spanner";
-
-/**
-  SQLite
- */
-static constexpr const char *kSqlite = "sqlite";
-
-/**
-  Sybase
- */
-static constexpr const char *kSybase = "sybase";
-
-/**
-  Teradata
- */
-static constexpr const char *kTeradata = "teradata";
-
-/**
-  Trino
- */
-static constexpr const char *kTrino = "trino";
-
-/**
-  Vertica
- */
-static constexpr const char *kVertica = "vertica";
-
-}  // namespace DbSystemValues
-
-namespace DbSystemNameValues
-{
-/**
-  Some other SQL database. Fallback only.
- */
-static constexpr const char *kOtherSql = "other_sql";
-
-/**
-  <a href="https://documentation.softwareag.com/?pf=adabas">Adabas (Adaptable Database System)</a>
- */
-static constexpr const char *kSoftwareagAdabas = "softwareag.adabas";
-
-/**
-  <a href="https://www.actian.com/databases/ingres/">Actian Ingres</a>
- */
-static constexpr const char *kActianIngres = "actian.ingres";
-
-/**
-  <a href="https://aws.amazon.com/pm/dynamodb/">Amazon DynamoDB</a>
- */
-static constexpr const char *kAwsDynamodb = "aws.dynamodb";
-
-/**
-  <a href="https://aws.amazon.com/redshift/">Amazon Redshift</a>
- */
-static constexpr const char *kAwsRedshift = "aws.redshift";
-
-/**
-  <a href="https://learn.microsoft.com/azure/cosmos-db">Azure Cosmos DB</a>
- */
-static constexpr const char *kAzureCosmosdb = "azure.cosmosdb";
-
-/**
-  <a href="https://www.intersystems.com/products/cache/">InterSystems Caché</a>
- */
-static constexpr const char *kIntersystemsCache = "intersystems.cache";
-
-/**
-  <a href="https://cassandra.apache.org/">Apache Cassandra</a>
- */
-static constexpr const char *kCassandra = "cassandra";
-
-/**
-  <a href="https://clickhouse.com/">ClickHouse</a>
- */
-static constexpr const char *kClickhouse = "clickhouse";
-
-/**
-  <a href="https://www.cockroachlabs.com/">CockroachDB</a>
- */
-static constexpr const char *kCockroachdb = "cockroachdb";
-
-/**
-  <a href="https://www.couchbase.com/">Couchbase</a>
- */
-static constexpr const char *kCouchbase = "couchbase";
-
-/**
-  <a href="https://couchdb.apache.org/">Apache CouchDB</a>
- */
-static constexpr const char *kCouchdb = "couchdb";
-
-/**
-  <a href="https://db.apache.org/derby/">Apache Derby</a>
- */
-static constexpr const char *kDerby = "derby";
-
-/**
-  <a href="https://www.elastic.co/elasticsearch">Elasticsearch</a>
- */
-static constexpr const char *kElasticsearch = "elasticsearch";
-
-/**
-  <a href="https://www.firebirdsql.org/">Firebird</a>
- */
-static constexpr const char *kFirebirdsql = "firebirdsql";
-
-/**
-  <a href="https://cloud.google.com/spanner">Google Cloud Spanner</a>
- */
-static constexpr const char *kGcpSpanner = "gcp.spanner";
-
-/**
-  <a href="https://geode.apache.org/">Apache Geode</a>
- */
-static constexpr const char *kGeode = "geode";
-
-/**
-  <a href="https://h2database.com/">H2 Database</a>
- */
-static constexpr const char *kH2database = "h2database";
-
-/**
-  <a href="https://hbase.apache.org/">Apache HBase</a>
- */
-static constexpr const char *kHbase = "hbase";
-
-/**
-  <a href="https://hive.apache.org/">Apache Hive</a>
- */
-static constexpr const char *kHive = "hive";
-
-/**
-  <a href="https://hsqldb.org/">HyperSQL Database</a>
- */
-static constexpr const char *kHsqldb = "hsqldb";
-
-/**
-  <a href="https://www.ibm.com/db2">IBM Db2</a>
- */
-static constexpr const char *kIbmDb2 = "ibm.db2";
-
-/**
-  <a href="https://www.ibm.com/products/informix">IBM Informix</a>
- */
-static constexpr const char *kIbmInformix = "ibm.informix";
-
-/**
-  <a href="https://www.ibm.com/products/netezza">IBM Netezza</a>
- */
-static constexpr const char *kIbmNetezza = "ibm.netezza";
-
-/**
-  <a href="https://www.influxdata.com/">InfluxDB</a>
- */
-static constexpr const char *kInfluxdb = "influxdb";
-
-/**
-  <a href="https://www.instantdb.com/">Instant</a>
- */
-static constexpr const char *kInstantdb = "instantdb";
-
-/**
-  <a href="https://mariadb.org/">MariaDB</a>
- */
-static constexpr const char *kMariadb = "mariadb";
-
-/**
-  <a href="https://memcached.org/">Memcached</a>
- */
-static constexpr const char *kMemcached = "memcached";
-
-/**
-  <a href="https://www.mongodb.com/">MongoDB</a>
- */
-static constexpr const char *kMongodb = "mongodb";
-
-/**
-  <a href="https://www.microsoft.com/sql-server">Microsoft SQL Server</a>
- */
-static constexpr const char *kMicrosoftSqlServer = "microsoft.sql_server";
-
-/**
-  <a href="https://www.mysql.com/">MySQL</a>
- */
-static constexpr const char *kMysql = "mysql";
-
-/**
-  <a href="https://neo4j.com/">Neo4j</a>
- */
-static constexpr const char *kNeo4j = "neo4j";
-
-/**
-  <a href="https://opensearch.org/">OpenSearch</a>
- */
-static constexpr const char *kOpensearch = "opensearch";
-
-/**
-  <a href="https://www.oracle.com/database/">Oracle Database</a>
- */
-static constexpr const char *kOracleDb = "oracle.db";
-
-/**
-  <a href="https://www.postgresql.org/">PostgreSQL</a>
- */
-static constexpr const char *kPostgresql = "postgresql";
-
-/**
-  <a href="https://redis.io/">Redis</a>
- */
-static constexpr const char *kRedis = "redis";
-
-/**
-  <a href="https://www.sap.com/products/technology-platform/hana/what-is-sap-hana.html">SAP HANA</a>
- */
-static constexpr const char *kSapHana = "sap.hana";
-
-/**
-  <a href="https://maxdb.sap.com/">SAP MaxDB</a>
- */
-static constexpr const char *kSapMaxdb = "sap.maxdb";
-
-/**
-  <a href="https://www.sqlite.org/">SQLite</a>
- */
-static constexpr const char *kSqlite = "sqlite";
-
-/**
-  <a href="https://www.teradata.com/">Teradata</a>
- */
-static constexpr const char *kTeradata = "teradata";
-
-/**
-  <a href="https://trino.io/">Trino</a>
- */
-static constexpr const char *kTrino = "trino";
-
-}  // namespace DbSystemNameValues
-
-}  // namespace db
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/db_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/db_metrics.h
deleted file mode 100644
index 8b74c62bc..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/db_metrics.h
+++ /dev/null
@@ -1,861 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace db
-{
-
-/**
-  The number of connections that are currently in state described by the @code state @endcode
-  attribute <p> updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionCount = "db.client.connection.count";
-static constexpr const char *descrMetricDbClientConnectionCount =
-    "The number of connections that are currently in state described by the `state` attribute";
-static constexpr const char *unitMetricDbClientConnectionCount = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionCount,
-                                         descrMetricDbClientConnectionCount,
-                                         unitMetricDbClientConnectionCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionCount,
-                                          descrMetricDbClientConnectionCount,
-                                          unitMetricDbClientConnectionCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionCount,
-                                                   descrMetricDbClientConnectionCount,
-                                                   unitMetricDbClientConnectionCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionCount,
-                                                    descrMetricDbClientConnectionCount,
-                                                    unitMetricDbClientConnectionCount);
-}
-
-/**
-  The time it took to create a new connection
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientConnectionCreateTime =
-    "db.client.connection.create_time";
-static constexpr const char *descrMetricDbClientConnectionCreateTime =
-    "The time it took to create a new connection";
-static constexpr const char *unitMetricDbClientConnectionCreateTime = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionCreateTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionCreateTime,
-                                      descrMetricDbClientConnectionCreateTime,
-                                      unitMetricDbClientConnectionCreateTime);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionCreateTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionCreateTime,
-                                      descrMetricDbClientConnectionCreateTime,
-                                      unitMetricDbClientConnectionCreateTime);
-}
-
-/**
-  The maximum number of idle open connections allowed
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionIdleMax = "db.client.connection.idle.max";
-static constexpr const char *descrMetricDbClientConnectionIdleMax =
-    "The maximum number of idle open connections allowed";
-static constexpr const char *unitMetricDbClientConnectionIdleMax = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionIdleMax,
-                                         descrMetricDbClientConnectionIdleMax,
-                                         unitMetricDbClientConnectionIdleMax);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionIdleMax,
-                                          descrMetricDbClientConnectionIdleMax,
-                                          unitMetricDbClientConnectionIdleMax);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionIdleMax,
-                                                   descrMetricDbClientConnectionIdleMax,
-                                                   unitMetricDbClientConnectionIdleMax);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionIdleMax,
-                                                    descrMetricDbClientConnectionIdleMax,
-                                                    unitMetricDbClientConnectionIdleMax);
-}
-
-/**
-  The minimum number of idle open connections allowed
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionIdleMin = "db.client.connection.idle.min";
-static constexpr const char *descrMetricDbClientConnectionIdleMin =
-    "The minimum number of idle open connections allowed";
-static constexpr const char *unitMetricDbClientConnectionIdleMin = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionIdleMin,
-                                         descrMetricDbClientConnectionIdleMin,
-                                         unitMetricDbClientConnectionIdleMin);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionIdleMin,
-                                          descrMetricDbClientConnectionIdleMin,
-                                          unitMetricDbClientConnectionIdleMin);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionIdleMin,
-                                                   descrMetricDbClientConnectionIdleMin,
-                                                   unitMetricDbClientConnectionIdleMin);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionIdleMin,
-                                                    descrMetricDbClientConnectionIdleMin,
-                                                    unitMetricDbClientConnectionIdleMin);
-}
-
-/**
-  The maximum number of open connections allowed
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionMax = "db.client.connection.max";
-static constexpr const char *descrMetricDbClientConnectionMax =
-    "The maximum number of open connections allowed";
-static constexpr const char *unitMetricDbClientConnectionMax = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionMax,
-                                         descrMetricDbClientConnectionMax,
-                                         unitMetricDbClientConnectionMax);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionMax,
-                                          descrMetricDbClientConnectionMax,
-                                          unitMetricDbClientConnectionMax);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionMax,
-                                                   descrMetricDbClientConnectionMax,
-                                                   unitMetricDbClientConnectionMax);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionMax,
-                                                    descrMetricDbClientConnectionMax,
-                                                    unitMetricDbClientConnectionMax);
-}
-
-/**
-  The number of current pending requests for an open connection
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricDbClientConnectionPendingRequests =
-    "db.client.connection.pending_requests";
-static constexpr const char *descrMetricDbClientConnectionPendingRequests =
-    "The number of current pending requests for an open connection";
-static constexpr const char *unitMetricDbClientConnectionPendingRequests = "{request}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionPendingRequests,
-                                         descrMetricDbClientConnectionPendingRequests,
-                                         unitMetricDbClientConnectionPendingRequests);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionPendingRequests,
-                                          descrMetricDbClientConnectionPendingRequests,
-                                          unitMetricDbClientConnectionPendingRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionPendingRequests,
-                                                   descrMetricDbClientConnectionPendingRequests,
-                                                   unitMetricDbClientConnectionPendingRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionPendingRequests,
-                                                    descrMetricDbClientConnectionPendingRequests,
-                                                    unitMetricDbClientConnectionPendingRequests);
-}
-
-/**
-  The number of connection timeouts that have occurred trying to obtain a connection from the pool
-  <p>
-  counter
- */
-static constexpr const char *kMetricDbClientConnectionTimeouts = "db.client.connection.timeouts";
-static constexpr const char *descrMetricDbClientConnectionTimeouts =
-    "The number of connection timeouts that have occurred trying to obtain a connection from the "
-    "pool";
-static constexpr const char *unitMetricDbClientConnectionTimeouts = "{timeout}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricDbClientConnectionTimeouts,
-                                    descrMetricDbClientConnectionTimeouts,
-                                    unitMetricDbClientConnectionTimeouts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricDbClientConnectionTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricDbClientConnectionTimeouts,
-                                    descrMetricDbClientConnectionTimeouts,
-                                    unitMetricDbClientConnectionTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricDbClientConnectionTimeouts,
-                                             descrMetricDbClientConnectionTimeouts,
-                                             unitMetricDbClientConnectionTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricDbClientConnectionTimeouts,
-                                              descrMetricDbClientConnectionTimeouts,
-                                              unitMetricDbClientConnectionTimeouts);
-}
-
-/**
-  The time between borrowing a connection and returning it to the pool
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientConnectionUseTime = "db.client.connection.use_time";
-static constexpr const char *descrMetricDbClientConnectionUseTime =
-    "The time between borrowing a connection and returning it to the pool";
-static constexpr const char *unitMetricDbClientConnectionUseTime = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionUseTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionUseTime,
-                                      descrMetricDbClientConnectionUseTime,
-                                      unitMetricDbClientConnectionUseTime);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionUseTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionUseTime,
-                                      descrMetricDbClientConnectionUseTime,
-                                      unitMetricDbClientConnectionUseTime);
-}
-
-/**
-  The time it took to obtain an open connection from the pool
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientConnectionWaitTime = "db.client.connection.wait_time";
-static constexpr const char *descrMetricDbClientConnectionWaitTime =
-    "The time it took to obtain an open connection from the pool";
-static constexpr const char *unitMetricDbClientConnectionWaitTime = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionWaitTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionWaitTime,
-                                      descrMetricDbClientConnectionWaitTime,
-                                      unitMetricDbClientConnectionWaitTime);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionWaitTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionWaitTime,
-                                      descrMetricDbClientConnectionWaitTime,
-                                      unitMetricDbClientConnectionWaitTime);
-}
-
-/**
-  Deprecated, use @code db.client.connection.create_time @endcode instead. Note: the unit also
-  changed from @code ms @endcode to @code s @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.create_time @endcode with unit @code s
-  @endcode.", "reason": "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsCreateTime =
-    "db.client.connections.create_time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsCreateTime =
-    "Deprecated, use `db.client.connection.create_time` instead. Note: the unit also changed from "
-    "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsCreateTime =
-    "ms";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionsCreateTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionsCreateTime,
-                                      descrMetricDbClientConnectionsCreateTime,
-                                      unitMetricDbClientConnectionsCreateTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionsCreateTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionsCreateTime,
-                                      descrMetricDbClientConnectionsCreateTime,
-                                      unitMetricDbClientConnectionsCreateTime);
-}
-
-/**
-  Deprecated, use @code db.client.connection.idle.max @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.idle.max @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.idle.max"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsIdleMax =
-    "db.client.connections.idle.max";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsIdleMax =
-    "Deprecated, use `db.client.connection.idle.max` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsIdleMax =
-    "{connection}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsIdleMax,
-                                         descrMetricDbClientConnectionsIdleMax,
-                                         unitMetricDbClientConnectionsIdleMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsIdleMax,
-                                          descrMetricDbClientConnectionsIdleMax,
-                                          unitMetricDbClientConnectionsIdleMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsIdleMax,
-                                                   descrMetricDbClientConnectionsIdleMax,
-                                                   unitMetricDbClientConnectionsIdleMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsIdleMax,
-                                                    descrMetricDbClientConnectionsIdleMax,
-                                                    unitMetricDbClientConnectionsIdleMax);
-}
-
-/**
-  Deprecated, use @code db.client.connection.idle.min @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.idle.min @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.idle.min"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsIdleMin =
-    "db.client.connections.idle.min";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsIdleMin =
-    "Deprecated, use `db.client.connection.idle.min` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsIdleMin =
-    "{connection}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsIdleMin,
-                                         descrMetricDbClientConnectionsIdleMin,
-                                         unitMetricDbClientConnectionsIdleMin);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsIdleMin,
-                                          descrMetricDbClientConnectionsIdleMin,
-                                          unitMetricDbClientConnectionsIdleMin);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsIdleMin,
-                                                   descrMetricDbClientConnectionsIdleMin,
-                                                   unitMetricDbClientConnectionsIdleMin);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsIdleMin,
-                                                    descrMetricDbClientConnectionsIdleMin,
-                                                    unitMetricDbClientConnectionsIdleMin);
-}
-
-/**
-  Deprecated, use @code db.client.connection.max @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.max @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.max"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsMax =
-    "db.client.connections.max";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsMax =
-    "Deprecated, use `db.client.connection.max` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsMax =
-    "{connection}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsMax,
-                                         descrMetricDbClientConnectionsMax,
-                                         unitMetricDbClientConnectionsMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsMax,
-                                          descrMetricDbClientConnectionsMax,
-                                          unitMetricDbClientConnectionsMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsMax(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsMax,
-                                                   descrMetricDbClientConnectionsMax,
-                                                   unitMetricDbClientConnectionsMax);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsMax,
-                                                    descrMetricDbClientConnectionsMax,
-                                                    unitMetricDbClientConnectionsMax);
-}
-
-/**
-  Deprecated, use @code db.client.connection.pending_requests @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.pending_requests @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.pending_requests"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsPendingRequests =
-    "db.client.connections.pending_requests";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricDbClientConnectionsPendingRequests =
-        "Deprecated, use `db.client.connection.pending_requests` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsPendingRequests =
-    "{request}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsPendingRequests,
-                                         descrMetricDbClientConnectionsPendingRequests,
-                                         unitMetricDbClientConnectionsPendingRequests);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsPendingRequests,
-                                          descrMetricDbClientConnectionsPendingRequests,
-                                          unitMetricDbClientConnectionsPendingRequests);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsPendingRequests,
-                                                   descrMetricDbClientConnectionsPendingRequests,
-                                                   unitMetricDbClientConnectionsPendingRequests);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsPendingRequests,
-                                                    descrMetricDbClientConnectionsPendingRequests,
-                                                    unitMetricDbClientConnectionsPendingRequests);
-}
-
-/**
-  Deprecated, use @code db.client.connection.timeouts @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.timeouts @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.timeouts"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsTimeouts =
-    "db.client.connections.timeouts";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsTimeouts =
-    "Deprecated, use `db.client.connection.timeouts` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsTimeouts =
-    "{timeout}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionsTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricDbClientConnectionsTimeouts,
-                                    descrMetricDbClientConnectionsTimeouts,
-                                    unitMetricDbClientConnectionsTimeouts);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricDbClientConnectionsTimeouts,
-                                    descrMetricDbClientConnectionsTimeouts,
-                                    unitMetricDbClientConnectionsTimeouts);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricDbClientConnectionsTimeouts,
-                                             descrMetricDbClientConnectionsTimeouts,
-                                             unitMetricDbClientConnectionsTimeouts);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricDbClientConnectionsTimeouts,
-                                              descrMetricDbClientConnectionsTimeouts,
-                                              unitMetricDbClientConnectionsTimeouts);
-}
-
-/**
-  Deprecated, use @code db.client.connection.count @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.count @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.count"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsUsage =
-    "db.client.connections.usage";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsUsage =
-    "Deprecated, use `db.client.connection.count` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsUsage =
-    "{connection}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientConnectionsUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientConnectionsUsage,
-                                         descrMetricDbClientConnectionsUsage,
-                                         unitMetricDbClientConnectionsUsage);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientConnectionsUsage,
-                                          descrMetricDbClientConnectionsUsage,
-                                          unitMetricDbClientConnectionsUsage);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientConnectionsUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientConnectionsUsage,
-                                                   descrMetricDbClientConnectionsUsage,
-                                                   unitMetricDbClientConnectionsUsage);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientConnectionsUsage,
-                                                    descrMetricDbClientConnectionsUsage,
-                                                    unitMetricDbClientConnectionsUsage);
-}
-
-/**
-  Deprecated, use @code db.client.connection.use_time @endcode instead. Note: the unit also changed
-  from @code ms @endcode to @code s @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.use_time @endcode with unit @code s @endcode.",
-  "reason": "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsUseTime =
-    "db.client.connections.use_time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsUseTime =
-    "Deprecated, use `db.client.connection.use_time` instead. Note: the unit also changed from "
-    "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsUseTime = "ms";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionsUseTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionsUseTime,
-                                      descrMetricDbClientConnectionsUseTime,
-                                      unitMetricDbClientConnectionsUseTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionsUseTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionsUseTime,
-                                      descrMetricDbClientConnectionsUseTime,
-                                      unitMetricDbClientConnectionsUseTime);
-}
-
-/**
-  Deprecated, use @code db.client.connection.wait_time @endcode instead. Note: the unit also changed
-  from @code ms @endcode to @code s @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.wait_time @endcode with unit @code s @endcode.",
-  "reason": "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientConnectionsWaitTime =
-    "db.client.connections.wait_time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricDbClientConnectionsWaitTime =
-    "Deprecated, use `db.client.connection.wait_time` instead. Note: the unit also changed from "
-    "`ms` to `s`.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricDbClientConnectionsWaitTime = "ms";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientConnectionsWaitTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientConnectionsWaitTime,
-                                      descrMetricDbClientConnectionsWaitTime,
-                                      unitMetricDbClientConnectionsWaitTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientConnectionsWaitTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientConnectionsWaitTime,
-                                      descrMetricDbClientConnectionsWaitTime,
-                                      unitMetricDbClientConnectionsWaitTime);
-}
-
-/**
-  Deprecated, use @code azure.cosmosdb.client.active_instance.count @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.client.active_instance.count @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.client.active_instance.count"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricDbClientCosmosdbActiveInstanceCount =
-    "db.client.cosmosdb.active_instance.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricDbClientCosmosdbActiveInstanceCount =
-        "Deprecated, use `azure.cosmosdb.client.active_instance.count` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricDbClientCosmosdbActiveInstanceCount = "{instance}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
-                                         descrMetricDbClientCosmosdbActiveInstanceCount,
-                                         unitMetricDbClientCosmosdbActiveInstanceCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
-                                          descrMetricDbClientCosmosdbActiveInstanceCount,
-                                          unitMetricDbClientCosmosdbActiveInstanceCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
-                                                   descrMetricDbClientCosmosdbActiveInstanceCount,
-                                                   unitMetricDbClientCosmosdbActiveInstanceCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricDbClientCosmosdbActiveInstanceCount,
-                                                    descrMetricDbClientCosmosdbActiveInstanceCount,
-                                                    unitMetricDbClientCosmosdbActiveInstanceCount);
-}
-
-/**
-  Deprecated, use @code azure.cosmosdb.client.operation.request_charge @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code azure.cosmosdb.client.operation.request_charge @endcode.", "reason":
-  "renamed", "renamed_to": "azure.cosmosdb.client.operation.request_charge"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *kMetricDbClientCosmosdbOperationRequestCharge = "db.client.cosmosdb.operation.request_charge";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricDbClientCosmosdbOperationRequestCharge =
-        "Deprecated, use `azure.cosmosdb.client.operation.request_charge` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricDbClientCosmosdbOperationRequestCharge = "{request_unit}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientCosmosdbOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientCosmosdbOperationRequestCharge,
-                                      descrMetricDbClientCosmosdbOperationRequestCharge,
-                                      unitMetricDbClientCosmosdbOperationRequestCharge);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientCosmosdbOperationRequestCharge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientCosmosdbOperationRequestCharge,
-                                      descrMetricDbClientCosmosdbOperationRequestCharge,
-                                      unitMetricDbClientCosmosdbOperationRequestCharge);
-}
-
-/**
-  Duration of database client operations.
-  <p>
-  Batch operations SHOULD be recorded as a single operation.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientOperationDuration = "db.client.operation.duration";
-static constexpr const char *descrMetricDbClientOperationDuration =
-    "Duration of database client operations.";
-static constexpr const char *unitMetricDbClientOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientOperationDuration,
-                                      descrMetricDbClientOperationDuration,
-                                      unitMetricDbClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientOperationDuration,
-                                      descrMetricDbClientOperationDuration,
-                                      unitMetricDbClientOperationDuration);
-}
-
-/**
-  The actual number of records returned by the database operation.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDbClientResponseReturnedRows =
-    "db.client.response.returned_rows";
-static constexpr const char *descrMetricDbClientResponseReturnedRows =
-    "The actual number of records returned by the database operation.";
-static constexpr const char *unitMetricDbClientResponseReturnedRows = "{row}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDbClientResponseReturnedRows(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDbClientResponseReturnedRows,
-                                      descrMetricDbClientResponseReturnedRows,
-                                      unitMetricDbClientResponseReturnedRows);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricDbClientResponseReturnedRows(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDbClientResponseReturnedRows,
-                                      descrMetricDbClientResponseReturnedRows,
-                                      unitMetricDbClientResponseReturnedRows);
-}
-
-}  // namespace db
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/deployment_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/deployment_attributes.h
deleted file mode 100644
index 33209ebbf..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/deployment_attributes.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace deployment
-{
-
-/**
-  'Deprecated, use @code deployment.environment.name @endcode instead.'
-
-  @deprecated
-  {"note": "Replaced by @code deployment.environment.name @endcode.", "reason": "renamed",
-  "renamed_to": "deployment.environment.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment =
-    "deployment.environment";
-
-/**
-  Name of the <a href="https://wikipedia.org/wiki/Deployment_environment">deployment environment</a>
-  (aka deployment tier). <p>
-  @code deployment.environment.name @endcode does not affect the uniqueness constraints defined
-  through the @code service.namespace @endcode, @code service.name @endcode and @code
-  service.instance.id @endcode resource attributes. This implies that resources carrying the
-  following attribute combinations MUST be considered to be identifying the same service: <ul>
-    <li>@code service.name=frontend @endcode, @code deployment.environment.name=production
-  @endcode</li> <li>@code service.name=frontend @endcode, @code deployment.environment.name=staging
-  @endcode.</li>
-  </ul>
- */
-static constexpr const char *kDeploymentEnvironmentName = "deployment.environment.name";
-
-/**
-  The id of the deployment.
- */
-static constexpr const char *kDeploymentId = "deployment.id";
-
-/**
-  The name of the deployment.
- */
-static constexpr const char *kDeploymentName = "deployment.name";
-
-/**
-  The status of the deployment.
- */
-static constexpr const char *kDeploymentStatus = "deployment.status";
-
-namespace DeploymentStatusValues
-{
-/**
-  failed
- */
-static constexpr const char *kFailed = "failed";
-
-/**
-  succeeded
- */
-static constexpr const char *kSucceeded = "succeeded";
-
-}  // namespace DeploymentStatusValues
-
-}  // namespace deployment
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/destination_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/destination_attributes.h
deleted file mode 100644
index e4f01b357..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/destination_attributes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace destination
-{
-
-/**
-  Destination address - domain name if available without reverse DNS lookup; otherwise, IP address
-  or Unix domain socket name. <p> When observed from the source side, and when communicating through
-  an intermediary, @code destination.address @endcode SHOULD represent the destination address
-  behind any intermediaries, for example proxies, if it's available.
- */
-static constexpr const char *kDestinationAddress = "destination.address";
-
-/**
-  Destination port number
- */
-static constexpr const char *kDestinationPort = "destination.port";
-
-}  // namespace destination
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/device_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/device_attributes.h
deleted file mode 100644
index f69856ee4..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/device_attributes.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace device
-{
-
-/**
-  A unique identifier representing the device
-  <p>
-  Its value SHOULD be identical for all apps on a device and it SHOULD NOT change if an app is
-  uninstalled and re-installed. However, it might be resettable by the user for all apps on a
-  device. Hardware IDs (e.g. vendor-specific serial number, IMEI or MAC address) MAY be used as
-  values. <p> More information about Android identifier best practices can be found <a
-  href="https://developer.android.com/training/articles/user-data-ids">here</a>. <blockquote>
-  [!WARNING]
-  <p>
-  This attribute may contain sensitive (PII) information. Caution should be taken when storing
-  personal data or anything which can identify a user. GDPR and data protection laws may apply,
-  ensure you do your own due diligence.
-  <p>
-  Due to these reasons, this identifier is not recommended for consumer applications and will likely
-  result in rejection from both Google Play and App Store. However, it may be appropriate for
-  specific enterprise scenarios, such as kiosk devices or enterprise-managed devices, with
-  appropriate compliance clearance. Any instrumentation providing this identifier MUST implement it
-  as an opt-in feature. <p> See <a href="/docs/registry/attributes/app.md#app-installation-id">@code
-  app.installation.id @endcode</a> for a more privacy-preserving alternative.</blockquote>
- */
-static constexpr const char *kDeviceId = "device.id";
-
-/**
-  The name of the device manufacturer
-  <p>
-  The Android OS provides this field via <a
-  href="https://developer.android.com/reference/android/os/Build#MANUFACTURER">Build</a>. iOS apps
-  SHOULD hardcode the value @code Apple @endcode.
- */
-static constexpr const char *kDeviceManufacturer = "device.manufacturer";
-
-/**
-  The model identifier for the device
-  <p>
-  It's recommended this value represents a machine-readable version of the model identifier rather
-  than the market or consumer-friendly name of the device.
- */
-static constexpr const char *kDeviceModelIdentifier = "device.model.identifier";
-
-/**
-  The marketing name for the device model
-  <p>
-  It's recommended this value represents a human-readable version of the device model rather than a
-  machine-readable alternative.
- */
-static constexpr const char *kDeviceModelName = "device.model.name";
-
-}  // namespace device
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/disk_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/disk_attributes.h
deleted file mode 100644
index c2504d75f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/disk_attributes.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace disk
-{
-
-/**
-  The disk IO operation direction.
- */
-static constexpr const char *kDiskIoDirection = "disk.io.direction";
-
-namespace DiskIoDirectionValues
-{
-/**
-  none
- */
-static constexpr const char *kRead = "read";
-
-/**
-  none
- */
-static constexpr const char *kWrite = "write";
-
-}  // namespace DiskIoDirectionValues
-
-}  // namespace disk
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/dns_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/dns_attributes.h
deleted file mode 100644
index 030828ab9..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/dns_attributes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace dns
-{
-
-/**
-  The name being queried.
-  <p>
-  If the name field contains non-printable characters (below 32 or above 126), those characters
-  should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should be
-  escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n
-  respectively.
- */
-static constexpr const char *kDnsQuestionName = "dns.question.name";
-
-}  // namespace dns
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/dns_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/dns_metrics.h
deleted file mode 100644
index 11a9d4ba8..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/dns_metrics.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace dns
-{
-
-/**
-  Measures the time taken to perform a DNS lookup.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricDnsLookupDuration = "dns.lookup.duration";
-static constexpr const char *descrMetricDnsLookupDuration =
-    "Measures the time taken to perform a DNS lookup.";
-static constexpr const char *unitMetricDnsLookupDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricDnsLookupDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricDnsLookupDuration, descrMetricDnsLookupDuration,
-                                      unitMetricDnsLookupDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricDnsLookupDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricDnsLookupDuration, descrMetricDnsLookupDuration,
-                                      unitMetricDnsLookupDuration);
-}
-
-}  // namespace dns
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/elasticsearch_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/elasticsearch_attributes.h
deleted file mode 100644
index e0c9c5a22..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/elasticsearch_attributes.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace elasticsearch
-{
-
-/**
-  Represents the human-readable identifier of the node/instance to which a request was routed.
- */
-static constexpr const char *kElasticsearchNodeName = "elasticsearch.node.name";
-
-}  // namespace elasticsearch
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/enduser_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/enduser_attributes.h
deleted file mode 100644
index 9120aa2c0..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/enduser_attributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace enduser
-{
-
-/**
-  Unique identifier of an end user in the system. It maybe a username, email address, or other
-  identifier. <p> Unique identifier of an end user in the system. <blockquote>
-  [!Warning]
-  This field contains sensitive (PII) information.</blockquote>
- */
-static constexpr const char *kEnduserId = "enduser.id";
-
-/**
-  Pseudonymous identifier of an end user. This identifier should be a random value that is not
-  directly linked or associated with the end user's actual identity. <p> Pseudonymous identifier of
-  an end user. <blockquote>
-  [!Warning]
-  This field contains sensitive (linkable PII) information.</blockquote>
- */
-static constexpr const char *kEnduserPseudoId = "enduser.pseudo.id";
-
-/**
-  Deprecated, use @code user.roles @endcode instead.
-
-  @deprecated
-  {"note": "Use @code user.roles @endcode attribute instead.", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope";
-
-}  // namespace enduser
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/error_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/error_attributes.h
deleted file mode 100644
index 439ae7bb1..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/error_attributes.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace error
-{
-
-/**
-  A message providing more detail about an error in human-readable form.
-  <p>
-  @code error.message @endcode should provide additional context and detail about an error.
-  It is NOT RECOMMENDED to duplicate the value of @code error.type @endcode in @code error.message
-  @endcode. It is also NOT RECOMMENDED to duplicate the value of @code exception.message @endcode in
-  @code error.message @endcode. <p>
-  @code error.message @endcode is NOT RECOMMENDED for metrics or spans due to its unbounded
-  cardinality and overlap with span status.
- */
-static constexpr const char *kErrorMessage = "error.message";
-
-/**
-  Describes a class of error the operation ended with.
-  <p>
-  The @code error.type @endcode SHOULD be predictable, and SHOULD have low cardinality.
-  <p>
-  When @code error.type @endcode is set to a type (e.g., an exception type), its
-  canonical class name identifying the type within the artifact SHOULD be used.
-  <p>
-  Instrumentations SHOULD document the list of errors they report.
-  <p>
-  The cardinality of @code error.type @endcode within one instrumentation library SHOULD be low.
-  Telemetry consumers that aggregate data from multiple instrumentation libraries and applications
-  should be prepared for @code error.type @endcode to have high cardinality at query time when no
-  additional filters are applied.
-  <p>
-  If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
-  @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
-  status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
-  error.type @endcode to capture all errors, regardless of whether they are defined within the
-  domain-specific set or not.</li>
-  </ul>
- */
-static constexpr const char *kErrorType = "error.type";
-
-namespace ErrorTypeValues
-{
-/**
-  A fallback error value to be used when the instrumentation doesn't define a custom value.
- */
-static constexpr const char *kOther = "_OTHER";
-
-}  // namespace ErrorTypeValues
-
-}  // namespace error
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/event_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/event_attributes.h
deleted file mode 100644
index de4d30a57..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/event_attributes.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace event
-{
-
-/**
-  Identifies the class / type of event.
-
-  @deprecated
-  {"note": "Replaced by EventName top-level field on the LogRecord.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEventName = "event.name";
-
-}  // namespace event
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/exception_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/exception_attributes.h
deleted file mode 100644
index 8947d711f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/exception_attributes.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace exception
-{
-
-/**
-  Indicates that the exception is escaping the scope of the span.
-
-  @deprecated
-  {"note": "It's no longer recommended to record exceptions that are handled and do not escape the
-  scope of a span.\n", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kExceptionEscaped = "exception.escaped";
-
-/**
-  The exception message.
- */
-static constexpr const char *kExceptionMessage = "exception.message";
-
-/**
-  A stacktrace as a string in the natural representation for the language runtime. The
-  representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kExceptionStacktrace = "exception.stacktrace";
-
-/**
-  The type of the exception (its fully-qualified class name, if applicable). The dynamic type of the
-  exception should be preferred over the static type in languages that support it.
- */
-static constexpr const char *kExceptionType = "exception.type";
-
-}  // namespace exception
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/faas_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/faas_attributes.h
deleted file mode 100644
index 9f9690824..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/faas_attributes.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace faas
-{
-
-/**
-  A boolean that is true if the serverless function is executed for the first time (aka cold-start).
- */
-static constexpr const char *kFaasColdstart = "faas.coldstart";
-
-/**
-  A string containing the schedule period as <a
-  href="https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm">Cron
-  Expression</a>.
- */
-static constexpr const char *kFaasCron = "faas.cron";
-
-/**
-  The name of the source on which the triggering operation was performed. For example, in Cloud
-  Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name.
- */
-static constexpr const char *kFaasDocumentCollection = "faas.document.collection";
-
-/**
-  The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the
-  name of the file, and in Cosmos DB the table name.
- */
-static constexpr const char *kFaasDocumentName = "faas.document.name";
-
-/**
-  Describes the type of the operation that was performed on the data.
- */
-static constexpr const char *kFaasDocumentOperation = "faas.document.operation";
-
-/**
-  A string containing the time when the data was accessed in the <a
-  href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
-  href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasDocumentTime = "faas.document.time";
-
-/**
-  The execution environment ID as a string, that will be potentially reused for other invocations to
-  the same function/function version. <ul> <li><strong>AWS Lambda:</strong> Use the (full) log
-  stream name.</li>
-  </ul>
- */
-static constexpr const char *kFaasInstance = "faas.instance";
-
-/**
-  The invocation ID of the current function invocation.
- */
-static constexpr const char *kFaasInvocationId = "faas.invocation_id";
-
-/**
-  The name of the invoked function.
-  <p>
-  SHOULD be equal to the @code faas.name @endcode resource attribute of the invoked function.
- */
-static constexpr const char *kFaasInvokedName = "faas.invoked_name";
-
-/**
-  The cloud provider of the invoked function.
-  <p>
-  SHOULD be equal to the @code cloud.provider @endcode resource attribute of the invoked function.
- */
-static constexpr const char *kFaasInvokedProvider = "faas.invoked_provider";
-
-/**
-  The cloud region of the invoked function.
-  <p>
-  SHOULD be equal to the @code cloud.region @endcode resource attribute of the invoked function.
- */
-static constexpr const char *kFaasInvokedRegion = "faas.invoked_region";
-
-/**
-  The amount of memory available to the serverless function converted to Bytes.
-  <p>
-  It's recommended to set this attribute since e.g. too little memory can easily stop a Java AWS
-  Lambda function from working correctly. On AWS Lambda, the environment variable @code
-  AWS_LAMBDA_FUNCTION_MEMORY_SIZE @endcode provides this information (which must be multiplied by
-  1,048,576).
- */
-static constexpr const char *kFaasMaxMemory = "faas.max_memory";
-
-/**
-  The name of the single function that this runtime instance executes.
-  <p>
-  This is the name of the function as configured/deployed on the FaaS
-  platform and is usually different from the name of the callback
-  function (which may be stored in the
-  <a href="/docs/general/attributes.md#source-code-attributes">@code code.namespace @endcode/@code
-  code.function.name @endcode</a> span attributes). <p> For some cloud providers, the above
-  definition is ambiguous. The following definition of function name MUST be used for this attribute
-  (and consequently the span name) for the listed cloud providers/products:
-  <ul>
-    <li><strong>Azure:</strong>  The full name @code <FUNCAPP>/<FUNC> @endcode, i.e., function app
-  name followed by a forward slash followed by the function name (this form can also be seen in the
-  resource JSON for the function). This means that a span attribute MUST be used, as an Azure
-  function app can host multiple functions that would usually share a TracerProvider (see also the
-  @code cloud.resource_id @endcode attribute).</li>
-  </ul>
- */
-static constexpr const char *kFaasName = "faas.name";
-
-/**
-  A string containing the function invocation time in the <a
-  href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
-  href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasTime = "faas.time";
-
-/**
-  Type of the trigger which caused this function invocation.
- */
-static constexpr const char *kFaasTrigger = "faas.trigger";
-
-/**
-  The immutable version of the function being executed.
-  <p>
-  Depending on the cloud provider and platform, use:
-  <ul>
-    <li><strong>AWS Lambda:</strong> The <a
-  href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function
-  version</a> (an integer represented as a decimal string).</li> <li><strong>Google Cloud Run
-  (Services):</strong> The <a
-  href="https://cloud.google.com/run/docs/managing/revisions">revision</a> (i.e., the function name
-  plus the revision suffix).</li> <li><strong>Google Cloud Functions:</strong> The value of the <a
-  href="https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically">@code
-  K_REVISION @endcode environment variable</a>.</li> <li><strong>Azure Functions:</strong> Not
-  applicable. Do not set this attribute.</li>
-  </ul>
- */
-static constexpr const char *kFaasVersion = "faas.version";
-
-namespace FaasDocumentOperationValues
-{
-/**
-  When a new object is created.
- */
-static constexpr const char *kInsert = "insert";
-
-/**
-  When an object is modified.
- */
-static constexpr const char *kEdit = "edit";
-
-/**
-  When an object is deleted.
- */
-static constexpr const char *kDelete = "delete";
-
-}  // namespace FaasDocumentOperationValues
-
-namespace FaasInvokedProviderValues
-{
-/**
-  Alibaba Cloud
- */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-
-/**
-  Amazon Web Services
- */
-static constexpr const char *kAws = "aws";
-
-/**
-  Microsoft Azure
- */
-static constexpr const char *kAzure = "azure";
-
-/**
-  Google Cloud Platform
- */
-static constexpr const char *kGcp = "gcp";
-
-/**
-  Tencent Cloud
- */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-
-}  // namespace FaasInvokedProviderValues
-
-namespace FaasTriggerValues
-{
-/**
-  A response to some data source operation such as a database or filesystem read/write
- */
-static constexpr const char *kDatasource = "datasource";
-
-/**
-  To provide an answer to an inbound HTTP request
- */
-static constexpr const char *kHttp = "http";
-
-/**
-  A function is set to be executed when messages are sent to a messaging system
- */
-static constexpr const char *kPubsub = "pubsub";
-
-/**
-  A function is scheduled to be executed regularly
- */
-static constexpr const char *kTimer = "timer";
-
-/**
-  If none of the others apply
- */
-static constexpr const char *kOther = "other";
-
-}  // namespace FaasTriggerValues
-
-}  // namespace faas
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/faas_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/faas_metrics.h
deleted file mode 100644
index 99888cde9..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/faas_metrics.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace faas
-{
-
-/**
-  Number of invocation cold starts
-  <p>
-  counter
- */
-static constexpr const char *kMetricFaasColdstarts     = "faas.coldstarts";
-static constexpr const char *descrMetricFaasColdstarts = "Number of invocation cold starts";
-static constexpr const char *unitMetricFaasColdstarts  = "{coldstart}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                    unitMetricFaasColdstarts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                    unitMetricFaasColdstarts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasColdstarts(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                             unitMetricFaasColdstarts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricFaasColdstarts(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasColdstarts, descrMetricFaasColdstarts,
-                                              unitMetricFaasColdstarts);
-}
-
-/**
-  Distribution of CPU usage per invocation
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasCpuUsage     = "faas.cpu_usage";
-static constexpr const char *descrMetricFaasCpuUsage = "Distribution of CPU usage per invocation";
-static constexpr const char *unitMetricFaasCpuUsage  = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
-                                      unitMetricFaasCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
-                                      unitMetricFaasCpuUsage);
-}
-
-/**
-  Number of invocation errors
-  <p>
-  counter
- */
-static constexpr const char *kMetricFaasErrors     = "faas.errors";
-static constexpr const char *descrMetricFaasErrors = "Number of invocation errors";
-static constexpr const char *unitMetricFaasErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasErrors, descrMetricFaasErrors, unitMetricFaasErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasErrors, descrMetricFaasErrors, unitMetricFaasErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasErrors, descrMetricFaasErrors,
-                                             unitMetricFaasErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasErrors, descrMetricFaasErrors,
-                                              unitMetricFaasErrors);
-}
-
-/**
-  Measures the duration of the function's initialization, such as a cold start
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasInitDuration = "faas.init_duration";
-static constexpr const char *descrMetricFaasInitDuration =
-    "Measures the duration of the function's initialization, such as a cold start";
-static constexpr const char *unitMetricFaasInitDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasInitDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
-                                      unitMetricFaasInitDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasInitDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
-                                      unitMetricFaasInitDuration);
-}
-
-/**
-  Number of successful invocations
-  <p>
-  counter
- */
-static constexpr const char *kMetricFaasInvocations     = "faas.invocations";
-static constexpr const char *descrMetricFaasInvocations = "Number of successful invocations";
-static constexpr const char *unitMetricFaasInvocations  = "{invocation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasInvocations(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                    unitMetricFaasInvocations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasInvocations(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                    unitMetricFaasInvocations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricFaasInvocations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                             unitMetricFaasInvocations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricFaasInvocations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasInvocations, descrMetricFaasInvocations,
-                                              unitMetricFaasInvocations);
-}
-
-/**
-  Measures the duration of the function's logic execution
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasInvokeDuration = "faas.invoke_duration";
-static constexpr const char *descrMetricFaasInvokeDuration =
-    "Measures the duration of the function's logic execution";
-static constexpr const char *unitMetricFaasInvokeDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricFaasInvokeDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration,
-                                      unitMetricFaasInvokeDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricFaasInvokeDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration,
-                                      unitMetricFaasInvokeDuration);
-}
-
-/**
-  Distribution of max memory usage per invocation
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasMemUsage = "faas.mem_usage";
-static constexpr const char *descrMetricFaasMemUsage =
-    "Distribution of max memory usage per invocation";
-static constexpr const char *unitMetricFaasMemUsage = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasMemUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
-                                      unitMetricFaasMemUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasMemUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
-                                      unitMetricFaasMemUsage);
-}
-
-/**
-  Distribution of net I/O usage per invocation
-  <p>
-  histogram
- */
-static constexpr const char *kMetricFaasNetIo     = "faas.net_io";
-static constexpr const char *descrMetricFaasNetIo = "Distribution of net I/O usage per invocation";
-static constexpr const char *unitMetricFaasNetIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>> CreateSyncInt64MetricFaasNetIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricFaasNetIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
-}
-
-/**
-  Number of invocation timeouts
-  <p>
-  counter
- */
-static constexpr const char *kMetricFaasTimeouts     = "faas.timeouts";
-static constexpr const char *descrMetricFaasTimeouts = "Number of invocation timeouts";
-static constexpr const char *unitMetricFaasTimeouts  = "{timeout}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                    unitMetricFaasTimeouts);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                    unitMetricFaasTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                             unitMetricFaasTimeouts);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasTimeouts(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricFaasTimeouts, descrMetricFaasTimeouts,
-                                              unitMetricFaasTimeouts);
-}
-
-}  // namespace faas
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/feature_flag_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/feature_flag_attributes.h
deleted file mode 100644
index f80c0ad4c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/feature_flag_attributes.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace feature_flag
-{
-
-/**
-  The unique identifier for the flag evaluation context. For example, the targeting key.
- */
-static constexpr const char *kFeatureFlagContextId = "feature_flag.context.id";
-
-/**
-  Deprecated, use @code error.message @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code error.message @endcode.", "reason": "renamed", "renamed_to":
-  "error.message"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagEvaluationErrorMessage =
-    "feature_flag.evaluation.error.message";
-
-/**
-  Deprecated, use @code feature_flag.result.reason @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code feature_flag.result.reason @endcode.", "reason": "renamed",
-  "renamed_to": "feature_flag.result.reason"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagEvaluationReason =
-    "feature_flag.evaluation.reason";
-
-/**
-  The lookup key of the feature flag.
- */
-static constexpr const char *kFeatureFlagKey = "feature_flag.key";
-
-/**
-  Identifies the feature flag provider.
- */
-static constexpr const char *kFeatureFlagProviderName = "feature_flag.provider.name";
-
-/**
-  The reason code which shows how a feature flag value was determined.
- */
-static constexpr const char *kFeatureFlagResultReason = "feature_flag.result.reason";
-
-/**
-  The evaluated value of the feature flag.
-  <p>
-  With some feature flag providers, feature flag results can be quite large or contain private or
-  sensitive details. Because of this, @code feature_flag.result.variant @endcode is often the
-  preferred attribute if it is available. <p> It may be desirable to redact or otherwise limit the
-  size and scope of @code feature_flag.result.value @endcode if possible. Because the evaluated flag
-  value is unstructured and may be any type, it is left to the instrumentation author to determine
-  how best to achieve this.
- */
-static constexpr const char *kFeatureFlagResultValue = "feature_flag.result.value";
-
-/**
-  A semantic identifier for an evaluated flag value.
-  <p>
-  A semantic identifier, commonly referred to as a variant, provides a means
-  for referring to a value without including the value itself. This can
-  provide additional context for understanding the meaning behind a value.
-  For example, the variant @code red @endcode maybe be used for the value @code #c05543 @endcode.
- */
-static constexpr const char *kFeatureFlagResultVariant = "feature_flag.result.variant";
-
-/**
-  The identifier of the <a href="https://openfeature.dev/specification/glossary/#flag-set">flag
-  set</a> to which the feature flag belongs.
- */
-static constexpr const char *kFeatureFlagSetId = "feature_flag.set.id";
-
-/**
-  Deprecated, use @code feature_flag.result.variant @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code feature_flag.result.variant @endcode.", "reason": "renamed",
-  "renamed_to": "feature_flag.result.variant"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kFeatureFlagVariant = "feature_flag.variant";
-
-/**
-  The version of the ruleset used during the evaluation. This may be any stable value which uniquely
-  identifies the ruleset.
- */
-static constexpr const char *kFeatureFlagVersion = "feature_flag.version";
-
-namespace FeatureFlagEvaluationReasonValues
-{
-/**
-  The resolved value is static (no dynamic evaluation).
- */
-static constexpr const char *kStatic = "static";
-
-/**
-  The resolved value fell back to a pre-configured value (no dynamic evaluation occurred or dynamic
-  evaluation yielded no result).
- */
-static constexpr const char *kDefault = "default";
-
-/**
-  The resolved value was the result of a dynamic evaluation, such as a rule or specific
-  user-targeting.
- */
-static constexpr const char *kTargetingMatch = "targeting_match";
-
-/**
-  The resolved value was the result of pseudorandom assignment.
- */
-static constexpr const char *kSplit = "split";
-
-/**
-  The resolved value was retrieved from cache.
- */
-static constexpr const char *kCached = "cached";
-
-/**
-  The resolved value was the result of the flag being disabled in the management system.
- */
-static constexpr const char *kDisabled = "disabled";
-
-/**
-  The reason for the resolved value could not be determined.
- */
-static constexpr const char *kUnknown = "unknown";
-
-/**
-  The resolved value is non-authoritative or possibly out of date
- */
-static constexpr const char *kStale = "stale";
-
-/**
-  The resolved value was the result of an error.
- */
-static constexpr const char *kError = "error";
-
-}  // namespace FeatureFlagEvaluationReasonValues
-
-namespace FeatureFlagResultReasonValues
-{
-/**
-  The resolved value is static (no dynamic evaluation).
- */
-static constexpr const char *kStatic = "static";
-
-/**
-  The resolved value fell back to a pre-configured value (no dynamic evaluation occurred or dynamic
-  evaluation yielded no result).
- */
-static constexpr const char *kDefault = "default";
-
-/**
-  The resolved value was the result of a dynamic evaluation, such as a rule or specific
-  user-targeting.
- */
-static constexpr const char *kTargetingMatch = "targeting_match";
-
-/**
-  The resolved value was the result of pseudorandom assignment.
- */
-static constexpr const char *kSplit = "split";
-
-/**
-  The resolved value was retrieved from cache.
- */
-static constexpr const char *kCached = "cached";
-
-/**
-  The resolved value was the result of the flag being disabled in the management system.
- */
-static constexpr const char *kDisabled = "disabled";
-
-/**
-  The reason for the resolved value could not be determined.
- */
-static constexpr const char *kUnknown = "unknown";
-
-/**
-  The resolved value is non-authoritative or possibly out of date
- */
-static constexpr const char *kStale = "stale";
-
-/**
-  The resolved value was the result of an error.
- */
-static constexpr const char *kError = "error";
-
-}  // namespace FeatureFlagResultReasonValues
-
-}  // namespace feature_flag
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/file_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/file_attributes.h
deleted file mode 100644
index 09d1b2c90..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/file_attributes.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace file
-{
-
-/**
-  Time when the file was last accessed, in ISO 8601 format.
-  <p>
-  This attribute might not be supported by some file systems — NFS, FAT32, in embedded OS, etc.
- */
-static constexpr const char *kFileAccessed = "file.accessed";
-
-/**
-  Array of file attributes.
-  <p>
-  Attributes names depend on the OS or file system. Here’s a non-exhaustive list of values expected
-  for this attribute: @code archive @endcode, @code compressed @endcode, @code directory @endcode,
-  @code encrypted @endcode, @code execute @endcode, @code hidden @endcode, @code immutable @endcode,
-  @code journaled @endcode, @code read @endcode, @code readonly @endcode, @code symbolic link
-  @endcode, @code system @endcode, @code temporary @endcode, @code write @endcode.
- */
-static constexpr const char *kFileAttributes = "file.attributes";
-
-/**
-  Time when the file attributes or metadata was last changed, in ISO 8601 format.
-  <p>
-  @code file.changed @endcode captures the time when any of the file's properties or attributes
-  (including the content) are changed, while @code file.modified @endcode captures the timestamp
-  when the file content is modified.
- */
-static constexpr const char *kFileChanged = "file.changed";
-
-/**
-  Time when the file was created, in ISO 8601 format.
-  <p>
-  This attribute might not be supported by some file systems — NFS, FAT32, in embedded OS, etc.
- */
-static constexpr const char *kFileCreated = "file.created";
-
-/**
-  Directory where the file is located. It should include the drive letter, when appropriate.
- */
-static constexpr const char *kFileDirectory = "file.directory";
-
-/**
-  File extension, excluding the leading dot.
-  <p>
-  When the file name has multiple extensions (example.tar.gz), only the last one should be captured
-  ("gz", not "tar.gz").
- */
-static constexpr const char *kFileExtension = "file.extension";
-
-/**
-  Name of the fork. A fork is additional data associated with a filesystem object.
-  <p>
-  On Linux, a resource fork is used to store additional data with a filesystem object. A file always
-  has at least one fork for the data portion, and additional forks may exist. On NTFS, this is
-  analogous to an Alternate Data Stream (ADS), and the default data stream for a file is just called
-  $DATA. Zone.Identifier is commonly used by Windows to track contents downloaded from the Internet.
-  An ADS is typically of the form: C:\path\to\filename.extension:some_fork_name, and some_fork_name
-  is the value that should populate @code fork_name @endcode. @code filename.extension @endcode
-  should populate @code file.name @endcode, and @code extension @endcode should populate @code
-  file.extension @endcode. The full path, @code file.path @endcode, will include the fork name.
- */
-static constexpr const char *kFileForkName = "file.fork_name";
-
-/**
-  Primary Group ID (GID) of the file.
- */
-static constexpr const char *kFileGroupId = "file.group.id";
-
-/**
-  Primary group name of the file.
- */
-static constexpr const char *kFileGroupName = "file.group.name";
-
-/**
-  Inode representing the file in the filesystem.
- */
-static constexpr const char *kFileInode = "file.inode";
-
-/**
-  Mode of the file in octal representation.
- */
-static constexpr const char *kFileMode = "file.mode";
-
-/**
-  Time when the file content was last modified, in ISO 8601 format.
- */
-static constexpr const char *kFileModified = "file.modified";
-
-/**
-  Name of the file including the extension, without the directory.
- */
-static constexpr const char *kFileName = "file.name";
-
-/**
-  The user ID (UID) or security identifier (SID) of the file owner.
- */
-static constexpr const char *kFileOwnerId = "file.owner.id";
-
-/**
-  Username of the file owner.
- */
-static constexpr const char *kFileOwnerName = "file.owner.name";
-
-/**
-  Full path to the file, including the file name. It should include the drive letter, when
-  appropriate.
- */
-static constexpr const char *kFilePath = "file.path";
-
-/**
-  File size in bytes.
- */
-static constexpr const char *kFileSize = "file.size";
-
-/**
-  Path to the target of a symbolic link.
-  <p>
-  This attribute is only applicable to symbolic links.
- */
-static constexpr const char *kFileSymbolicLinkTargetPath = "file.symbolic_link.target_path";
-
-}  // namespace file
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gcp_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gcp_attributes.h
deleted file mode 100644
index 7be353eb7..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gcp_attributes.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace gcp
-{
-
-/**
-  The container within GCP where the AppHub application is defined.
- */
-static constexpr const char *kGcpApphubApplicationContainer = "gcp.apphub.application.container";
-
-/**
-  The name of the application as configured in AppHub.
- */
-static constexpr const char *kGcpApphubApplicationId = "gcp.apphub.application.id";
-
-/**
-  The GCP zone or region where the application is defined.
- */
-static constexpr const char *kGcpApphubApplicationLocation = "gcp.apphub.application.location";
-
-/**
-  Criticality of a service indicates its importance to the business.
-  <p>
-  <a href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type">See AppHub type
-  enum</a>
- */
-static constexpr const char *kGcpApphubServiceCriticalityType =
-    "gcp.apphub.service.criticality_type";
-
-/**
-  Environment of a service is the stage of a software lifecycle.
-  <p>
-  <a href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type_1">See AppHub
-  environment type</a>
- */
-static constexpr const char *kGcpApphubServiceEnvironmentType =
-    "gcp.apphub.service.environment_type";
-
-/**
-  The name of the service as configured in AppHub.
- */
-static constexpr const char *kGcpApphubServiceId = "gcp.apphub.service.id";
-
-/**
-  Criticality of a workload indicates its importance to the business.
-  <p>
-  <a href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type">See AppHub type
-  enum</a>
- */
-static constexpr const char *kGcpApphubWorkloadCriticalityType =
-    "gcp.apphub.workload.criticality_type";
-
-/**
-  Environment of a workload is the stage of a software lifecycle.
-  <p>
-  <a href="https://cloud.google.com/app-hub/docs/reference/rest/v1/Attributes#type_1">See AppHub
-  environment type</a>
- */
-static constexpr const char *kGcpApphubWorkloadEnvironmentType =
-    "gcp.apphub.workload.environment_type";
-
-/**
-  The name of the workload as configured in AppHub.
- */
-static constexpr const char *kGcpApphubWorkloadId = "gcp.apphub.workload.id";
-
-/**
-  Identifies the Google Cloud service for which the official client library is intended.
-  <p>
-  Intended to be a stable identifier for Google Cloud client libraries that is uniform across
-  implementation languages. The value should be derived from the canonical service domain for the
-  service; for example, 'foo.googleapis.com' should result in a value of 'foo'.
- */
-static constexpr const char *kGcpClientService = "gcp.client.service";
-
-/**
-  The name of the Cloud Run <a
-  href="https://cloud.google.com/run/docs/managing/job-executions">execution</a> being run for the
-  Job, as set by the <a
-  href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">@code
-  CLOUD_RUN_EXECUTION @endcode</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobExecution = "gcp.cloud_run.job.execution";
-
-/**
-  The index for a task within an execution as provided by the <a
-  href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">@code
-  CLOUD_RUN_TASK_INDEX @endcode</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobTaskIndex = "gcp.cloud_run.job.task_index";
-
-/**
-  The hostname of a GCE instance. This is the full value of the default or <a
-  href="https://cloud.google.com/compute/docs/instances/custom-hostname-vm">custom hostname</a>.
- */
-static constexpr const char *kGcpGceInstanceHostname = "gcp.gce.instance.hostname";
-
-/**
-  The instance name of a GCE instance. This is the value provided by @code host.name @endcode, the
-  visible name of the instance in the Cloud Console UI, and the prefix for the default hostname of
-  the instance as defined by the <a
-  href="https://cloud.google.com/compute/docs/internal-dns#instance-fully-qualified-domain-names">default
-  internal DNS name</a>.
- */
-static constexpr const char *kGcpGceInstanceName = "gcp.gce.instance.name";
-
-namespace GcpApphubServiceCriticalityTypeValues
-{
-/**
-  Mission critical service.
- */
-static constexpr const char *kMissionCritical = "MISSION_CRITICAL";
-
-/**
-  High impact.
- */
-static constexpr const char *kHigh = "HIGH";
-
-/**
-  Medium impact.
- */
-static constexpr const char *kMedium = "MEDIUM";
-
-/**
-  Low impact.
- */
-static constexpr const char *kLow = "LOW";
-
-}  // namespace GcpApphubServiceCriticalityTypeValues
-
-namespace GcpApphubServiceEnvironmentTypeValues
-{
-/**
-  Production environment.
- */
-static constexpr const char *kProduction = "PRODUCTION";
-
-/**
-  Staging environment.
- */
-static constexpr const char *kStaging = "STAGING";
-
-/**
-  Test environment.
- */
-static constexpr const char *kTest = "TEST";
-
-/**
-  Development environment.
- */
-static constexpr const char *kDevelopment = "DEVELOPMENT";
-
-}  // namespace GcpApphubServiceEnvironmentTypeValues
-
-namespace GcpApphubWorkloadCriticalityTypeValues
-{
-/**
-  Mission critical service.
- */
-static constexpr const char *kMissionCritical = "MISSION_CRITICAL";
-
-/**
-  High impact.
- */
-static constexpr const char *kHigh = "HIGH";
-
-/**
-  Medium impact.
- */
-static constexpr const char *kMedium = "MEDIUM";
-
-/**
-  Low impact.
- */
-static constexpr const char *kLow = "LOW";
-
-}  // namespace GcpApphubWorkloadCriticalityTypeValues
-
-namespace GcpApphubWorkloadEnvironmentTypeValues
-{
-/**
-  Production environment.
- */
-static constexpr const char *kProduction = "PRODUCTION";
-
-/**
-  Staging environment.
- */
-static constexpr const char *kStaging = "STAGING";
-
-/**
-  Test environment.
- */
-static constexpr const char *kTest = "TEST";
-
-/**
-  Development environment.
- */
-static constexpr const char *kDevelopment = "DEVELOPMENT";
-
-}  // namespace GcpApphubWorkloadEnvironmentTypeValues
-
-}  // namespace gcp
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gen_ai_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
deleted file mode 100644
index 32ece010a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gen_ai_attributes.h
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace gen_ai
-{
-
-/**
-  Free-form description of the GenAI agent provided by the application.
- */
-static constexpr const char *kGenAiAgentDescription = "gen_ai.agent.description";
-
-/**
-  The unique identifier of the GenAI agent.
- */
-static constexpr const char *kGenAiAgentId = "gen_ai.agent.id";
-
-/**
-  Human-readable name of the GenAI agent provided by the application.
- */
-static constexpr const char *kGenAiAgentName = "gen_ai.agent.name";
-
-/**
-  Deprecated, use Event API to report completions contents.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiCompletion = "gen_ai.completion";
-
-/**
-  The unique identifier for a conversation (session, thread), used to store and correlate messages
-  within this conversation.
- */
-static constexpr const char *kGenAiConversationId = "gen_ai.conversation.id";
-
-/**
-  The data source identifier.
-  <p>
-  Data sources are used by AI agents and RAG applications to store grounding data. A data source may
-  be an external database, object store, document collection, website, or any other storage system
-  used by the GenAI agent or application. The @code gen_ai.data_source.id @endcode SHOULD match the
-  identifier used by the GenAI system rather than a name specific to the external storage, such as a
-  database or object store. Semantic conventions referencing @code gen_ai.data_source.id @endcode
-  MAY also leverage additional attributes, such as @code db.* @endcode, to further identify and
-  describe the data source.
- */
-static constexpr const char *kGenAiDataSourceId = "gen_ai.data_source.id";
-
-/**
-  Deprecated, use @code gen_ai.output.type @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code gen_ai.output.type @endcode.", "reason": "renamed", "renamed_to":
-  "gen_ai.output.type"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiOpenaiRequestResponseFormat =
-    "gen_ai.openai.request.response_format";
-
-/**
-  Deprecated, use @code gen_ai.request.seed @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code gen_ai.request.seed @endcode.", "reason": "renamed", "renamed_to":
-  "gen_ai.request.seed"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiOpenaiRequestSeed =
-    "gen_ai.openai.request.seed";
-
-/**
-  The service tier requested. May be a specific tier, default, or auto.
- */
-static constexpr const char *kGenAiOpenaiRequestServiceTier = "gen_ai.openai.request.service_tier";
-
-/**
-  The service tier used for the response.
- */
-static constexpr const char *kGenAiOpenaiResponseServiceTier =
-    "gen_ai.openai.response.service_tier";
-
-/**
-  A fingerprint to track any eventual change in the Generative AI environment.
- */
-static constexpr const char *kGenAiOpenaiResponseSystemFingerprint =
-    "gen_ai.openai.response.system_fingerprint";
-
-/**
-  The name of the operation being performed.
-  <p>
-  If one of the predefined values applies, but specific system uses a different name it's
-  RECOMMENDED to document it in the semantic conventions for specific GenAI system and use
-  system-specific name in the instrumentation. If a different name is not documented,
-  instrumentation libraries SHOULD use applicable predefined value.
- */
-static constexpr const char *kGenAiOperationName = "gen_ai.operation.name";
-
-/**
-  Represents the content type requested by the client.
-  <p>
-  This attribute SHOULD be used when the client requests output of a specific type. The model may
-  return zero or more outputs of this type. This attribute specifies the output modality and not the
-  actual output format. For example, if an image is requested, the actual output could be a URL
-  pointing to an image file. Additional output format details may be recorded in the future in the
-  @code gen_ai.output.{type}.* @endcode attributes.
- */
-static constexpr const char *kGenAiOutputType = "gen_ai.output.type";
-
-/**
-  Deprecated, use Event API to report prompt contents.
-
-  @deprecated
-  {"note": "Removed, no replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiPrompt = "gen_ai.prompt";
-
-/**
-  The target number of candidate completions to return.
- */
-static constexpr const char *kGenAiRequestChoiceCount = "gen_ai.request.choice.count";
-
-/**
-  The encoding formats requested in an embeddings operation, if specified.
-  <p>
-  In some GenAI systems the encoding formats are called embedding types. Also, some GenAI systems
-  only accept a single format per request.
- */
-static constexpr const char *kGenAiRequestEncodingFormats = "gen_ai.request.encoding_formats";
-
-/**
-  The frequency penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestFrequencyPenalty = "gen_ai.request.frequency_penalty";
-
-/**
-  The maximum number of tokens the model generates for a request.
- */
-static constexpr const char *kGenAiRequestMaxTokens = "gen_ai.request.max_tokens";
-
-/**
-  The name of the GenAI model a request is being made to.
- */
-static constexpr const char *kGenAiRequestModel = "gen_ai.request.model";
-
-/**
-  The presence penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestPresencePenalty = "gen_ai.request.presence_penalty";
-
-/**
-  Requests with same seed value more likely to return same result.
- */
-static constexpr const char *kGenAiRequestSeed = "gen_ai.request.seed";
-
-/**
-  List of sequences that the model will use to stop generating further tokens.
- */
-static constexpr const char *kGenAiRequestStopSequences = "gen_ai.request.stop_sequences";
-
-/**
-  The temperature setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTemperature = "gen_ai.request.temperature";
-
-/**
-  The top_k sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopK = "gen_ai.request.top_k";
-
-/**
-  The top_p sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopP = "gen_ai.request.top_p";
-
-/**
-  Array of reasons the model stopped generating tokens, corresponding to each generation received.
- */
-static constexpr const char *kGenAiResponseFinishReasons = "gen_ai.response.finish_reasons";
-
-/**
-  The unique identifier for the completion.
- */
-static constexpr const char *kGenAiResponseId = "gen_ai.response.id";
-
-/**
-  The name of the model that generated the response.
- */
-static constexpr const char *kGenAiResponseModel = "gen_ai.response.model";
-
-/**
-  The Generative AI product as identified by the client or server instrumentation.
-  <p>
-  The @code gen_ai.system @endcode describes a family of GenAI models with specific model identified
-  by @code gen_ai.request.model @endcode and @code gen_ai.response.model @endcode attributes.
-  <p>
-  The actual GenAI product may differ from the one identified by the client.
-  Multiple systems, including Azure OpenAI and Gemini, are accessible by OpenAI client
-  libraries. In such cases, the @code gen_ai.system @endcode is set to @code openai @endcode based
-  on the instrumentation's best knowledge, instead of the actual system. The @code server.address
-  @endcode attribute may help identify the actual system in use for @code openai @endcode. <p> For
-  custom model, a custom friendly name SHOULD be used. If none of these options apply, the @code
-  gen_ai.system @endcode SHOULD be set to @code _OTHER @endcode.
- */
-static constexpr const char *kGenAiSystem = "gen_ai.system";
-
-/**
-  The type of token being counted.
- */
-static constexpr const char *kGenAiTokenType = "gen_ai.token.type";
-
-/**
-  The tool call identifier.
- */
-static constexpr const char *kGenAiToolCallId = "gen_ai.tool.call.id";
-
-/**
-  The tool description.
- */
-static constexpr const char *kGenAiToolDescription = "gen_ai.tool.description";
-
-/**
-  Name of the tool utilized by the agent.
- */
-static constexpr const char *kGenAiToolName = "gen_ai.tool.name";
-
-/**
-  Type of the tool utilized by the agent
-  <p>
-  Extension: A tool executed on the agent-side to directly call external APIs, bridging the gap
-  between the agent and real-world systems. Agent-side operations involve actions that are performed
-  by the agent on the server or within the agent's controlled environment. Function: A tool executed
-  on the client-side, where the agent generates parameters for a predefined function, and the client
-  executes the logic. Client-side operations are actions taken on the user's end or within the
-  client application. Datastore: A tool used by the agent to access and query structured or
-  unstructured external data for retrieval-augmented tasks or knowledge updates.
- */
-static constexpr const char *kGenAiToolType = "gen_ai.tool.type";
-
-/**
-  Deprecated, use @code gen_ai.usage.output_tokens @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code gen_ai.usage.output_tokens @endcode.", "reason": "renamed",
-  "renamed_to": "gen_ai.usage.output_tokens"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens =
-    "gen_ai.usage.completion_tokens";
-
-/**
-  The number of tokens used in the GenAI input (prompt).
- */
-static constexpr const char *kGenAiUsageInputTokens = "gen_ai.usage.input_tokens";
-
-/**
-  The number of tokens used in the GenAI response (completion).
- */
-static constexpr const char *kGenAiUsageOutputTokens = "gen_ai.usage.output_tokens";
-
-/**
-  Deprecated, use @code gen_ai.usage.input_tokens @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code gen_ai.usage.input_tokens @endcode.", "reason": "renamed",
-  "renamed_to": "gen_ai.usage.input_tokens"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens =
-    "gen_ai.usage.prompt_tokens";
-
-namespace GenAiOpenaiRequestResponseFormatValues
-{
-/**
-  Text response format
- */
-static constexpr const char *kText = "text";
-
-/**
-  JSON object response format
- */
-static constexpr const char *kJsonObject = "json_object";
-
-/**
-  JSON schema response format
- */
-static constexpr const char *kJsonSchema = "json_schema";
-
-}  // namespace GenAiOpenaiRequestResponseFormatValues
-
-namespace GenAiOpenaiRequestServiceTierValues
-{
-/**
-  The system will utilize scale tier credits until they are exhausted.
- */
-static constexpr const char *kAuto = "auto";
-
-/**
-  The system will utilize the default scale tier.
- */
-static constexpr const char *kDefault = "default";
-
-}  // namespace GenAiOpenaiRequestServiceTierValues
-
-namespace GenAiOperationNameValues
-{
-/**
-  Chat completion operation such as <a
-  href="https://platform.openai.com/docs/api-reference/chat">OpenAI Chat API</a>
- */
-static constexpr const char *kChat = "chat";
-
-/**
-  Multimodal content generation operation such as <a
-  href="https://ai.google.dev/api/generate-content">Gemini Generate Content</a>
- */
-static constexpr const char *kGenerateContent = "generate_content";
-
-/**
-  Text completions operation such as <a
-  href="https://platform.openai.com/docs/api-reference/completions">OpenAI Completions API
-  (Legacy)</a>
- */
-static constexpr const char *kTextCompletion = "text_completion";
-
-/**
-  Embeddings operation such as <a
-  href="https://platform.openai.com/docs/api-reference/embeddings/create">OpenAI Create embeddings
-  API</a>
- */
-static constexpr const char *kEmbeddings = "embeddings";
-
-/**
-  Create GenAI agent
- */
-static constexpr const char *kCreateAgent = "create_agent";
-
-/**
-  Invoke GenAI agent
- */
-static constexpr const char *kInvokeAgent = "invoke_agent";
-
-/**
-  Execute a tool
- */
-static constexpr const char *kExecuteTool = "execute_tool";
-
-}  // namespace GenAiOperationNameValues
-
-namespace GenAiOutputTypeValues
-{
-/**
-  Plain text
- */
-static constexpr const char *kText = "text";
-
-/**
-  JSON object with known or unknown schema
- */
-static constexpr const char *kJson = "json";
-
-/**
-  Image
- */
-static constexpr const char *kImage = "image";
-
-/**
-  Speech
- */
-static constexpr const char *kSpeech = "speech";
-
-}  // namespace GenAiOutputTypeValues
-
-namespace GenAiSystemValues
-{
-/**
-  OpenAI
- */
-static constexpr const char *kOpenai = "openai";
-
-/**
-  Any Google generative AI endpoint
- */
-static constexpr const char *kGcpGenAi = "gcp.gen_ai";
-
-/**
-  Vertex AI
- */
-static constexpr const char *kGcpVertexAi = "gcp.vertex_ai";
-
-/**
-  Gemini
- */
-static constexpr const char *kGcpGemini = "gcp.gemini";
-
-/**
-  Vertex AI
- */
-static constexpr const char *kVertexAi = "vertex_ai";
-
-/**
-  Gemini
- */
-static constexpr const char *kGemini = "gemini";
-
-/**
-  Anthropic
- */
-static constexpr const char *kAnthropic = "anthropic";
-
-/**
-  Cohere
- */
-static constexpr const char *kCohere = "cohere";
-
-/**
-  Azure AI Inference
- */
-static constexpr const char *kAzAiInference = "az.ai.inference";
-
-/**
-  Azure OpenAI
- */
-static constexpr const char *kAzAiOpenai = "az.ai.openai";
-
-/**
-  IBM Watsonx AI
- */
-static constexpr const char *kIbmWatsonxAi = "ibm.watsonx.ai";
-
-/**
-  AWS Bedrock
- */
-static constexpr const char *kAwsBedrock = "aws.bedrock";
-
-/**
-  Perplexity
- */
-static constexpr const char *kPerplexity = "perplexity";
-
-/**
-  xAI
- */
-static constexpr const char *kXai = "xai";
-
-/**
-  DeepSeek
- */
-static constexpr const char *kDeepseek = "deepseek";
-
-/**
-  Groq
- */
-static constexpr const char *kGroq = "groq";
-
-/**
-  Mistral AI
- */
-static constexpr const char *kMistralAi = "mistral_ai";
-
-}  // namespace GenAiSystemValues
-
-namespace GenAiTokenTypeValues
-{
-/**
-  Input tokens (prompt, input, etc.)
- */
-static constexpr const char *kInput = "input";
-
-/**
-  Output tokens (completion, response, etc.)
- */
-static constexpr const char *kCompletion = "output";
-
-/**
-  Output tokens (completion, response, etc.)
- */
-static constexpr const char *kOutput = "output";
-
-}  // namespace GenAiTokenTypeValues
-
-}  // namespace gen_ai
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gen_ai_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gen_ai_metrics.h
deleted file mode 100644
index 2cd11bd54..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/gen_ai_metrics.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace gen_ai
-{
-
-/**
-  GenAI operation duration
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiClientOperationDuration =
-    "gen_ai.client.operation.duration";
-static constexpr const char *descrMetricGenAiClientOperationDuration = "GenAI operation duration";
-static constexpr const char *unitMetricGenAiClientOperationDuration  = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiClientOperationDuration,
-                                      descrMetricGenAiClientOperationDuration,
-                                      unitMetricGenAiClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiClientOperationDuration,
-                                      descrMetricGenAiClientOperationDuration,
-                                      unitMetricGenAiClientOperationDuration);
-}
-
-/**
-  Measures number of input and output tokens used
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiClientTokenUsage = "gen_ai.client.token.usage";
-static constexpr const char *descrMetricGenAiClientTokenUsage =
-    "Measures number of input and output tokens used";
-static constexpr const char *unitMetricGenAiClientTokenUsage = "{token}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiClientTokenUsage(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiClientTokenUsage,
-                                      descrMetricGenAiClientTokenUsage,
-                                      unitMetricGenAiClientTokenUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiClientTokenUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiClientTokenUsage,
-                                      descrMetricGenAiClientTokenUsage,
-                                      unitMetricGenAiClientTokenUsage);
-}
-
-/**
-  Generative AI server request duration such as time-to-last byte or last output token
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiServerRequestDuration = "gen_ai.server.request.duration";
-static constexpr const char *descrMetricGenAiServerRequestDuration =
-    "Generative AI server request duration such as time-to-last byte or last output token";
-static constexpr const char *unitMetricGenAiServerRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerRequestDuration,
-                                      descrMetricGenAiServerRequestDuration,
-                                      unitMetricGenAiServerRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerRequestDuration,
-                                      descrMetricGenAiServerRequestDuration,
-                                      unitMetricGenAiServerRequestDuration);
-}
-
-/**
-  Time per output token generated after the first token for successful responses
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiServerTimePerOutputToken =
-    "gen_ai.server.time_per_output_token";
-static constexpr const char *descrMetricGenAiServerTimePerOutputToken =
-    "Time per output token generated after the first token for successful responses";
-static constexpr const char *unitMetricGenAiServerTimePerOutputToken = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerTimePerOutputToken(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerTimePerOutputToken,
-                                      descrMetricGenAiServerTimePerOutputToken,
-                                      unitMetricGenAiServerTimePerOutputToken);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerTimePerOutputToken(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerTimePerOutputToken,
-                                      descrMetricGenAiServerTimePerOutputToken,
-                                      unitMetricGenAiServerTimePerOutputToken);
-}
-
-/**
-  Time to generate first token for successful responses
-  <p>
-  histogram
- */
-static constexpr const char *kMetricGenAiServerTimeToFirstToken =
-    "gen_ai.server.time_to_first_token";
-static constexpr const char *descrMetricGenAiServerTimeToFirstToken =
-    "Time to generate first token for successful responses";
-static constexpr const char *unitMetricGenAiServerTimeToFirstToken = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricGenAiServerTimeToFirstToken(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricGenAiServerTimeToFirstToken,
-                                      descrMetricGenAiServerTimeToFirstToken,
-                                      unitMetricGenAiServerTimeToFirstToken);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricGenAiServerTimeToFirstToken(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricGenAiServerTimeToFirstToken,
-                                      descrMetricGenAiServerTimeToFirstToken,
-                                      unitMetricGenAiServerTimeToFirstToken);
-}
-
-}  // namespace gen_ai
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/geo_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/geo_attributes.h
deleted file mode 100644
index 9f19fcc9e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/geo_attributes.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace geo
-{
-
-/**
-  Two-letter code representing continent’s name.
- */
-static constexpr const char *kGeoContinentCode = "geo.continent.code";
-
-/**
-  Two-letter ISO Country Code (<a href="https://wikipedia.org/wiki/ISO_3166-1#Codes">ISO 3166-1
-  alpha2</a>).
- */
-static constexpr const char *kGeoCountryIsoCode = "geo.country.iso_code";
-
-/**
-  Locality name. Represents the name of a city, town, village, or similar populated place.
- */
-static constexpr const char *kGeoLocalityName = "geo.locality.name";
-
-/**
-  Latitude of the geo location in <a
-  href="https://wikipedia.org/wiki/World_Geodetic_System#WGS84">WGS84</a>.
- */
-static constexpr const char *kGeoLocationLat = "geo.location.lat";
-
-/**
-  Longitude of the geo location in <a
-  href="https://wikipedia.org/wiki/World_Geodetic_System#WGS84">WGS84</a>.
- */
-static constexpr const char *kGeoLocationLon = "geo.location.lon";
-
-/**
-  Postal code associated with the location. Values appropriate for this field may also be known as a
-  postcode or ZIP code and will vary widely from country to country.
- */
-static constexpr const char *kGeoPostalCode = "geo.postal_code";
-
-/**
-  Region ISO code (<a href="https://wikipedia.org/wiki/ISO_3166-2">ISO 3166-2</a>).
- */
-static constexpr const char *kGeoRegionIsoCode = "geo.region.iso_code";
-
-namespace GeoContinentCodeValues
-{
-/**
-  Africa
- */
-static constexpr const char *kAf = "AF";
-
-/**
-  Antarctica
- */
-static constexpr const char *kAn = "AN";
-
-/**
-  Asia
- */
-static constexpr const char *kAs = "AS";
-
-/**
-  Europe
- */
-static constexpr const char *kEu = "EU";
-
-/**
-  North America
- */
-static constexpr const char *kNa = "NA";
-
-/**
-  Oceania
- */
-static constexpr const char *kOc = "OC";
-
-/**
-  South America
- */
-static constexpr const char *kSa = "SA";
-
-}  // namespace GeoContinentCodeValues
-
-}  // namespace geo
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/graphql_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/graphql_attributes.h
deleted file mode 100644
index d442704dd..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/graphql_attributes.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace graphql
-{
-
-/**
-  The GraphQL document being executed.
-  <p>
-  The value may be sanitized to exclude sensitive information.
- */
-static constexpr const char *kGraphqlDocument = "graphql.document";
-
-/**
-  The name of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationName = "graphql.operation.name";
-
-/**
-  The type of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationType = "graphql.operation.type";
-
-namespace GraphqlOperationTypeValues
-{
-/**
-  GraphQL query
- */
-static constexpr const char *kQuery = "query";
-
-/**
-  GraphQL mutation
- */
-static constexpr const char *kMutation = "mutation";
-
-/**
-  GraphQL subscription
- */
-static constexpr const char *kSubscription = "subscription";
-
-}  // namespace GraphqlOperationTypeValues
-
-}  // namespace graphql
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/heroku_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/heroku_attributes.h
deleted file mode 100644
index 4bba1ec2c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/heroku_attributes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace heroku
-{
-
-/**
-  Unique identifier for the application
- */
-static constexpr const char *kHerokuAppId = "heroku.app.id";
-
-/**
-  Commit hash for the current release
- */
-static constexpr const char *kHerokuReleaseCommit = "heroku.release.commit";
-
-/**
-  Time and date the release was created
- */
-static constexpr const char *kHerokuReleaseCreationTimestamp = "heroku.release.creation_timestamp";
-
-}  // namespace heroku
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/host_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/host_attributes.h
deleted file mode 100644
index 5d1ca93e2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/host_attributes.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace host
-{
-
-/**
-  The CPU architecture the host system is running on.
- */
-static constexpr const char *kHostArch = "host.arch";
-
-/**
-  The amount of level 2 memory cache available to the processor (in Bytes).
- */
-static constexpr const char *kHostCpuCacheL2Size = "host.cpu.cache.l2.size";
-
-/**
-  Family or generation of the CPU.
- */
-static constexpr const char *kHostCpuFamily = "host.cpu.family";
-
-/**
-  Model identifier. It provides more granular information about the CPU, distinguishing it from
-  other CPUs within the same family.
- */
-static constexpr const char *kHostCpuModelId = "host.cpu.model.id";
-
-/**
-  Model designation of the processor.
- */
-static constexpr const char *kHostCpuModelName = "host.cpu.model.name";
-
-/**
-  Stepping or core revisions.
- */
-static constexpr const char *kHostCpuStepping = "host.cpu.stepping";
-
-/**
-  Processor manufacturer identifier. A maximum 12-character string.
-  <p>
-  <a href="https://wiki.osdev.org/CPUID">CPUID</a> command returns the vendor ID string in EBX, EDX
-  and ECX registers. Writing these to memory in this order results in a 12-character string.
- */
-static constexpr const char *kHostCpuVendorId = "host.cpu.vendor.id";
-
-/**
-  Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For
-  non-containerized systems, this should be the @code machine-id @endcode. See the table below for
-  the sources to use to determine the @code machine-id @endcode based on operating system.
- */
-static constexpr const char *kHostId = "host.id";
-
-/**
-  VM image ID or host OS image ID. For Cloud, this value is from the provider.
- */
-static constexpr const char *kHostImageId = "host.image.id";
-
-/**
-  Name of the VM image or OS install the host was instantiated from.
- */
-static constexpr const char *kHostImageName = "host.image.name";
-
-/**
-  The version string of the VM image or host OS as defined in <a
-  href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kHostImageVersion = "host.image.version";
-
-/**
-  Available IP addresses of the host, excluding loopback interfaces.
-  <p>
-  IPv4 Addresses MUST be specified in dotted-quad notation. IPv6 addresses MUST be specified in the
-  <a href="https://www.rfc-editor.org/rfc/rfc5952.html">RFC 5952</a> format.
- */
-static constexpr const char *kHostIp = "host.ip";
-
-/**
-  Available MAC addresses of the host, excluding loopback interfaces.
-  <p>
-  MAC Addresses MUST be represented in <a
-  href="https://standards.ieee.org/wp-content/uploads/import/documents/tutorials/eui.pdf">IEEE RA
-  hexadecimal form</a>: as hyphen-separated octets in uppercase hexadecimal form from most to least
-  significant.
- */
-static constexpr const char *kHostMac = "host.mac";
-
-/**
-  Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully
-  qualified hostname, or another name specified by the user.
- */
-static constexpr const char *kHostName = "host.name";
-
-/**
-  Type of host. For Cloud, this must be the machine type.
- */
-static constexpr const char *kHostType = "host.type";
-
-namespace HostArchValues
-{
-/**
-  AMD64
- */
-static constexpr const char *kAmd64 = "amd64";
-
-/**
-  ARM32
- */
-static constexpr const char *kArm32 = "arm32";
-
-/**
-  ARM64
- */
-static constexpr const char *kArm64 = "arm64";
-
-/**
-  Itanium
- */
-static constexpr const char *kIa64 = "ia64";
-
-/**
-  32-bit PowerPC
- */
-static constexpr const char *kPpc32 = "ppc32";
-
-/**
-  64-bit PowerPC
- */
-static constexpr const char *kPpc64 = "ppc64";
-
-/**
-  IBM z/Architecture
- */
-static constexpr const char *kS390x = "s390x";
-
-/**
-  32-bit x86
- */
-static constexpr const char *kX86 = "x86";
-
-}  // namespace HostArchValues
-
-}  // namespace host
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/http_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/http_attributes.h
deleted file mode 100644
index c9c42ad6e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/http_attributes.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace http
-{
-
-/**
-  Deprecated, use @code client.address @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code client.address @endcode.", "reason": "renamed", "renamed_to":
-  "client.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip";
-
-/**
-  State of the HTTP connection in the HTTP connection pool.
- */
-static constexpr const char *kHttpConnectionState = "http.connection.state";
-
-/**
-  Deprecated, use @code network.protocol.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "renamed", "renamed_to":
-  "network.protocol.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
-
-/**
-  Deprecated, use one of @code server.address @endcode, @code client.address @endcode or @code
-  http.request.header.host @endcode instead, depending on the usage.
-
-  @deprecated
-  {"note": "Replaced by one of @code server.address @endcode, @code client.address @endcode or @code
-  http.request.header.host @endcode, depending on the usage.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host";
-
-/**
-  Deprecated, use @code http.request.method @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.request.method @endcode.", "reason": "renamed", "renamed_to":
-  "http.request.method"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method";
-
-/**
-  The size of the request payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpRequestBodySize = "http.request.body.size";
-
-/**
-  HTTP request headers, @code <key> @endcode being the normalized HTTP Header name (lowercase), the
-  value being the header values. <p> Instrumentations SHOULD require an explicit configuration of
-  which headers are to be captured. Including all request headers can be a security risk - explicit
-  configuration helps avoid leaking sensitive information. <p> The @code User-Agent @endcode header
-  is already captured in the @code user_agent.original @endcode attribute. Users MAY explicitly
-  configure instrumentations to capture them even though it is not recommended. <p> The attribute
-  value MUST consist of either multiple header values as an array of strings or a single-item array
-  containing a possibly comma-concatenated string, depending on the way the HTTP library provides
-  access to headers. <p> Examples: <ul> <li>A header @code Content-Type: application/json @endcode
-  SHOULD be recorded as the @code http.request.header.content-type @endcode attribute with value
-  @code ["application/json"] @endcode.</li> <li>A header @code X-Forwarded-For: 1.2.3.4, 1.2.3.5
-  @endcode SHOULD be recorded as the @code http.request.header.x-forwarded-for @endcode attribute
-  with value @code ["1.2.3.4", "1.2.3.5"] @endcode or @code ["1.2.3.4, 1.2.3.5"] @endcode depending
-  on the HTTP library.</li>
-  </ul>
- */
-static constexpr const char *kHttpRequestHeader = "http.request.header";
-
-/**
-  HTTP request method.
-  <p>
-  HTTP request method value SHOULD be "known" to the instrumentation.
-  By default, this convention defines "known" methods as the ones listed in <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-  defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>. <p> If the HTTP
-  request method is not known to instrumentation, it MUST set the @code http.request.method @endcode
-  attribute to @code _OTHER @endcode. <p> If the HTTP instrumentation could end up converting valid
-  HTTP request methods to @code _OTHER @endcode, then it MUST provide a way to override the list of
-  known HTTP methods. If this override is done via environment variable, then the environment
-  variable MUST be named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list
-  of case-sensitive known HTTP methods (this list MUST be a full override of the default known
-  method, it is not a list of known methods in addition to the defaults). <p> HTTP method names are
-  case-sensitive and @code http.request.method @endcode attribute value MUST match a known HTTP
-  method name exactly. Instrumentations for specific web frameworks that consider HTTP methods to be
-  case insensitive, SHOULD populate a canonical equivalent. Tracing instrumentations that do so,
-  MUST also set @code http.request.method_original @endcode to the original value.
- */
-static constexpr const char *kHttpRequestMethod = "http.request.method";
-
-/**
-  Original HTTP method sent by the client in the request line.
- */
-static constexpr const char *kHttpRequestMethodOriginal = "http.request.method_original";
-
-/**
-  The ordinal number of request resending attempt (for any reason, including redirects).
-  <p>
-  The resend count SHOULD be updated each time an HTTP request gets resent by the client, regardless
-  of what was the cause of the resending (e.g. redirection, authorization failure, 503 Server
-  Unavailable, network issues, or any other).
- */
-static constexpr const char *kHttpRequestResendCount = "http.request.resend_count";
-
-/**
-  The total size of the request in bytes. This should be the total number of bytes sent over the
-  wire, including the request line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and request
-  body if any.
- */
-static constexpr const char *kHttpRequestSize = "http.request.size";
-
-/**
-  Deprecated, use @code http.request.header.content-length @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.request.header.content-length @endcode.", "reason":
-  "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength =
-    "http.request_content_length";
-
-/**
-  Deprecated, use @code http.request.body.size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.request.body.size @endcode.", "reason": "renamed", "renamed_to":
-  "http.request.body.size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed =
-    "http.request_content_length_uncompressed";
-
-/**
-  The size of the response payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpResponseBodySize = "http.response.body.size";
-
-/**
-  HTTP response headers, @code <key> @endcode being the normalized HTTP Header name (lowercase), the
-  value being the header values. <p> Instrumentations SHOULD require an explicit configuration of
-  which headers are to be captured. Including all response headers can be a security risk - explicit
-  configuration helps avoid leaking sensitive information. <p> Users MAY explicitly configure
-  instrumentations to capture them even though it is not recommended. <p> The attribute value MUST
-  consist of either multiple header values as an array of strings or a single-item array containing
-  a possibly comma-concatenated string, depending on the way the HTTP library provides access to
-  headers. <p> Examples: <ul> <li>A header @code Content-Type: application/json @endcode header
-  SHOULD be recorded as the @code http.request.response.content-type @endcode attribute with value
-  @code ["application/json"] @endcode.</li> <li>A header @code My-custom-header: abc, def @endcode
-  header SHOULD be recorded as the @code http.response.header.my-custom-header @endcode attribute
-  with value @code ["abc", "def"] @endcode or @code ["abc, def"] @endcode depending on the HTTP
-  library.</li>
-  </ul>
- */
-static constexpr const char *kHttpResponseHeader = "http.response.header";
-
-/**
-  The total size of the response in bytes. This should be the total number of bytes sent over the
-  wire, including the status line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and response
-  body and trailers if any.
- */
-static constexpr const char *kHttpResponseSize = "http.response.size";
-
-/**
-  <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>.
- */
-static constexpr const char *kHttpResponseStatusCode = "http.response.status_code";
-
-/**
-  Deprecated, use @code http.response.header.content-length @endcode instead.
-
-  @deprecated
-  {"note": "hp.response.header.content-length", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength =
-    "http.response_content_length";
-
-/**
-  Deprecated, use @code http.response.body.size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.response.body.size @endcode.", "reason": "renamed", "renamed_to":
-  "http.response.body.size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed =
-    "http.response_content_length_uncompressed";
-
-/**
-  The matched route, that is, the path template in the format used by the respective server
-  framework. <p> MUST NOT be populated when this is not supported by the HTTP server framework as
-  the route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD
-  include the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if
-  there is one.
- */
-static constexpr const char *kHttpRoute = "http.route";
-
-/**
-  Deprecated, use @code url.scheme @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code url.scheme @endcode.", "reason": "renamed", "renamed_to":
-  "url.scheme"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme";
-
-/**
-  Deprecated, use @code server.address @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to":
-  "server.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name";
-
-/**
-  Deprecated, use @code http.response.status_code @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code http.response.status_code @endcode.", "reason": "renamed",
-  "renamed_to": "http.response.status_code"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code";
-
-/**
-  Deprecated, use @code url.path @endcode and @code url.query @endcode instead.
-
-  @deprecated
-  {"note": "Split to @code url.path @endcode and @code url.query @endcode.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target";
-
-/**
-  Deprecated, use @code url.full @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code url.full @endcode.", "reason": "renamed", "renamed_to": "url.full"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url";
-
-/**
-  Deprecated, use @code user_agent.original @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code user_agent.original @endcode.", "reason": "renamed", "renamed_to":
-  "user_agent.original"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent";
-
-namespace HttpConnectionStateValues
-{
-/**
-  active state.
- */
-static constexpr const char *kActive = "active";
-
-/**
-  idle state.
- */
-static constexpr const char *kIdle = "idle";
-
-}  // namespace HttpConnectionStateValues
-
-namespace HttpFlavorValues
-{
-/**
-  HTTP/1.0
- */
-static constexpr const char *kHttp10 = "1.0";
-
-/**
-  HTTP/1.1
- */
-static constexpr const char *kHttp11 = "1.1";
-
-/**
-  HTTP/2
- */
-static constexpr const char *kHttp20 = "2.0";
-
-/**
-  HTTP/3
- */
-static constexpr const char *kHttp30 = "3.0";
-
-/**
-  SPDY protocol.
- */
-static constexpr const char *kSpdy = "SPDY";
-
-/**
-  QUIC protocol.
- */
-static constexpr const char *kQuic = "QUIC";
-
-}  // namespace HttpFlavorValues
-
-namespace HttpRequestMethodValues
-{
-/**
-  CONNECT method.
- */
-static constexpr const char *kConnect = "CONNECT";
-
-/**
-  DELETE method.
- */
-static constexpr const char *kDelete = "DELETE";
-
-/**
-  GET method.
- */
-static constexpr const char *kGet = "GET";
-
-/**
-  HEAD method.
- */
-static constexpr const char *kHead = "HEAD";
-
-/**
-  OPTIONS method.
- */
-static constexpr const char *kOptions = "OPTIONS";
-
-/**
-  PATCH method.
- */
-static constexpr const char *kPatch = "PATCH";
-
-/**
-  POST method.
- */
-static constexpr const char *kPost = "POST";
-
-/**
-  PUT method.
- */
-static constexpr const char *kPut = "PUT";
-
-/**
-  TRACE method.
- */
-static constexpr const char *kTrace = "TRACE";
-
-/**
-  Any HTTP method that the instrumentation has no prior knowledge of.
- */
-static constexpr const char *kOther = "_OTHER";
-
-}  // namespace HttpRequestMethodValues
-
-}  // namespace http
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/http_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/http_metrics.h
deleted file mode 100644
index 5c725ae19..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/http_metrics.h
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace http
-{
-
-/**
-  Number of active HTTP requests.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricHttpClientActiveRequests = "http.client.active_requests";
-static constexpr const char *descrMetricHttpClientActiveRequests =
-    "Number of active HTTP requests.";
-static constexpr const char *unitMetricHttpClientActiveRequests = "{request}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricHttpClientActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHttpClientActiveRequests,
-                                         descrMetricHttpClientActiveRequests,
-                                         unitMetricHttpClientActiveRequests);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricHttpClientActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHttpClientActiveRequests,
-                                          descrMetricHttpClientActiveRequests,
-                                          unitMetricHttpClientActiveRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHttpClientActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHttpClientActiveRequests,
-                                                   descrMetricHttpClientActiveRequests,
-                                                   unitMetricHttpClientActiveRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHttpClientActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHttpClientActiveRequests,
-                                                    descrMetricHttpClientActiveRequests,
-                                                    unitMetricHttpClientActiveRequests);
-}
-
-/**
-  The duration of the successfully established outbound HTTP connections.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpClientConnectionDuration =
-    "http.client.connection.duration";
-static constexpr const char *descrMetricHttpClientConnectionDuration =
-    "The duration of the successfully established outbound HTTP connections.";
-static constexpr const char *unitMetricHttpClientConnectionDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientConnectionDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientConnectionDuration,
-                                      descrMetricHttpClientConnectionDuration,
-                                      unitMetricHttpClientConnectionDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientConnectionDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientConnectionDuration,
-                                      descrMetricHttpClientConnectionDuration,
-                                      unitMetricHttpClientConnectionDuration);
-}
-
-/**
-  Number of outbound HTTP connections that are currently active or idle on the client.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricHttpClientOpenConnections = "http.client.open_connections";
-static constexpr const char *descrMetricHttpClientOpenConnections =
-    "Number of outbound HTTP connections that are currently active or idle on the client.";
-static constexpr const char *unitMetricHttpClientOpenConnections = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricHttpClientOpenConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHttpClientOpenConnections,
-                                         descrMetricHttpClientOpenConnections,
-                                         unitMetricHttpClientOpenConnections);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricHttpClientOpenConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHttpClientOpenConnections,
-                                          descrMetricHttpClientOpenConnections,
-                                          unitMetricHttpClientOpenConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHttpClientOpenConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHttpClientOpenConnections,
-                                                   descrMetricHttpClientOpenConnections,
-                                                   unitMetricHttpClientOpenConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHttpClientOpenConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHttpClientOpenConnections,
-                                                    descrMetricHttpClientOpenConnections,
-                                                    unitMetricHttpClientOpenConnections);
-}
-
-/**
-  Size of HTTP client request bodies.
-  <p>
-  The size of the request payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size. <p> histogram
- */
-static constexpr const char *kMetricHttpClientRequestBodySize = "http.client.request.body.size";
-static constexpr const char *descrMetricHttpClientRequestBodySize =
-    "Size of HTTP client request bodies.";
-static constexpr const char *unitMetricHttpClientRequestBodySize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientRequestBodySize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientRequestBodySize,
-                                      descrMetricHttpClientRequestBodySize,
-                                      unitMetricHttpClientRequestBodySize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientRequestBodySize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientRequestBodySize,
-                                      descrMetricHttpClientRequestBodySize,
-                                      unitMetricHttpClientRequestBodySize);
-}
-
-/**
-  Duration of HTTP client requests.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpClientRequestDuration = "http.client.request.duration";
-static constexpr const char *descrMetricHttpClientRequestDuration =
-    "Duration of HTTP client requests.";
-static constexpr const char *unitMetricHttpClientRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientRequestDuration,
-                                      descrMetricHttpClientRequestDuration,
-                                      unitMetricHttpClientRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientRequestDuration,
-                                      descrMetricHttpClientRequestDuration,
-                                      unitMetricHttpClientRequestDuration);
-}
-
-/**
-  Size of HTTP client response bodies.
-  <p>
-  The size of the response payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size. <p> histogram
- */
-static constexpr const char *kMetricHttpClientResponseBodySize = "http.client.response.body.size";
-static constexpr const char *descrMetricHttpClientResponseBodySize =
-    "Size of HTTP client response bodies.";
-static constexpr const char *unitMetricHttpClientResponseBodySize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpClientResponseBodySize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpClientResponseBodySize,
-                                      descrMetricHttpClientResponseBodySize,
-                                      unitMetricHttpClientResponseBodySize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpClientResponseBodySize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpClientResponseBodySize,
-                                      descrMetricHttpClientResponseBodySize,
-                                      unitMetricHttpClientResponseBodySize);
-}
-
-/**
-  Number of active HTTP server requests.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricHttpServerActiveRequests = "http.server.active_requests";
-static constexpr const char *descrMetricHttpServerActiveRequests =
-    "Number of active HTTP server requests.";
-static constexpr const char *unitMetricHttpServerActiveRequests = "{request}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricHttpServerActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHttpServerActiveRequests,
-                                         descrMetricHttpServerActiveRequests,
-                                         unitMetricHttpServerActiveRequests);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricHttpServerActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHttpServerActiveRequests,
-                                          descrMetricHttpServerActiveRequests,
-                                          unitMetricHttpServerActiveRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHttpServerActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHttpServerActiveRequests,
-                                                   descrMetricHttpServerActiveRequests,
-                                                   unitMetricHttpServerActiveRequests);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHttpServerActiveRequests(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHttpServerActiveRequests,
-                                                    descrMetricHttpServerActiveRequests,
-                                                    unitMetricHttpServerActiveRequests);
-}
-
-/**
-  Size of HTTP server request bodies.
-  <p>
-  The size of the request payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size. <p> histogram
- */
-static constexpr const char *kMetricHttpServerRequestBodySize = "http.server.request.body.size";
-static constexpr const char *descrMetricHttpServerRequestBodySize =
-    "Size of HTTP server request bodies.";
-static constexpr const char *unitMetricHttpServerRequestBodySize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpServerRequestBodySize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpServerRequestBodySize,
-                                      descrMetricHttpServerRequestBodySize,
-                                      unitMetricHttpServerRequestBodySize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpServerRequestBodySize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpServerRequestBodySize,
-                                      descrMetricHttpServerRequestBodySize,
-                                      unitMetricHttpServerRequestBodySize);
-}
-
-/**
-  Duration of HTTP server requests.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricHttpServerRequestDuration = "http.server.request.duration";
-static constexpr const char *descrMetricHttpServerRequestDuration =
-    "Duration of HTTP server requests.";
-static constexpr const char *unitMetricHttpServerRequestDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpServerRequestDuration,
-                                      descrMetricHttpServerRequestDuration,
-                                      unitMetricHttpServerRequestDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpServerRequestDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpServerRequestDuration,
-                                      descrMetricHttpServerRequestDuration,
-                                      unitMetricHttpServerRequestDuration);
-}
-
-/**
-  Size of HTTP server response bodies.
-  <p>
-  The size of the response payload body in bytes. This is the number of bytes transferred excluding
-  headers and is often, but not always, present as the <a
-  href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a> header.
-  For requests using transport encoding, this should be the compressed size. <p> histogram
- */
-static constexpr const char *kMetricHttpServerResponseBodySize = "http.server.response.body.size";
-static constexpr const char *descrMetricHttpServerResponseBodySize =
-    "Size of HTTP server response bodies.";
-static constexpr const char *unitMetricHttpServerResponseBodySize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricHttpServerResponseBodySize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricHttpServerResponseBodySize,
-                                      descrMetricHttpServerResponseBodySize,
-                                      unitMetricHttpServerResponseBodySize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricHttpServerResponseBodySize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricHttpServerResponseBodySize,
-                                      descrMetricHttpServerResponseBodySize,
-                                      unitMetricHttpServerResponseBodySize);
-}
-
-}  // namespace http
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/hw_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/hw_attributes.h
deleted file mode 100644
index 04c8a7638..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/hw_attributes.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace hw
-{
-
-/**
-  An identifier for the hardware component, unique within the monitored host
- */
-static constexpr const char *kHwId = "hw.id";
-
-/**
-  An easily-recognizable name for the hardware component
- */
-static constexpr const char *kHwName = "hw.name";
-
-/**
-  Unique identifier of the parent component (typically the @code hw.id @endcode attribute of the
-  enclosure, or disk controller)
- */
-static constexpr const char *kHwParent = "hw.parent";
-
-/**
-  The current state of the component
- */
-static constexpr const char *kHwState = "hw.state";
-
-/**
-  Type of the component
-  <p>
-  Describes the category of the hardware component for which @code hw.state @endcode is being
-  reported. For example, @code hw.type=temperature @endcode along with @code hw.state=degraded
-  @endcode would indicate that the temperature of the hardware component has been reported as @code
-  degraded @endcode.
- */
-static constexpr const char *kHwType = "hw.type";
-
-namespace HwStateValues
-{
-/**
-  Ok
- */
-static constexpr const char *kOk = "ok";
-
-/**
-  Degraded
- */
-static constexpr const char *kDegraded = "degraded";
-
-/**
-  Failed
- */
-static constexpr const char *kFailed = "failed";
-
-}  // namespace HwStateValues
-
-namespace HwTypeValues
-{
-/**
-  Battery
- */
-static constexpr const char *kBattery = "battery";
-
-/**
-  CPU
- */
-static constexpr const char *kCpu = "cpu";
-
-/**
-  Disk controller
- */
-static constexpr const char *kDiskController = "disk_controller";
-
-/**
-  Enclosure
- */
-static constexpr const char *kEnclosure = "enclosure";
-
-/**
-  Fan
- */
-static constexpr const char *kFan = "fan";
-
-/**
-  GPU
- */
-static constexpr const char *kGpu = "gpu";
-
-/**
-  Logical disk
- */
-static constexpr const char *kLogicalDisk = "logical_disk";
-
-/**
-  Memory
- */
-static constexpr const char *kMemory = "memory";
-
-/**
-  Network
- */
-static constexpr const char *kNetwork = "network";
-
-/**
-  Physical disk
- */
-static constexpr const char *kPhysicalDisk = "physical_disk";
-
-/**
-  Power supply
- */
-static constexpr const char *kPowerSupply = "power_supply";
-
-/**
-  Tape drive
- */
-static constexpr const char *kTapeDrive = "tape_drive";
-
-/**
-  Temperature
- */
-static constexpr const char *kTemperature = "temperature";
-
-/**
-  Voltage
- */
-static constexpr const char *kVoltage = "voltage";
-
-}  // namespace HwTypeValues
-
-}  // namespace hw
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/hw_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/hw_metrics.h
deleted file mode 100644
index e73e9edeb..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/hw_metrics.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace hw
-{
-
-/**
-  Energy consumed by the component
-  <p>
-  counter
- */
-static constexpr const char *kMetricHwEnergy     = "hw.energy";
-static constexpr const char *descrMetricHwEnergy = "Energy consumed by the component";
-static constexpr const char *unitMetricHwEnergy  = "J";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwEnergy, descrMetricHwEnergy, unitMetricHwEnergy);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwEnergy, descrMetricHwEnergy, unitMetricHwEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwEnergy, descrMetricHwEnergy,
-                                             unitMetricHwEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwEnergy, descrMetricHwEnergy,
-                                              unitMetricHwEnergy);
-}
-
-/**
-  Number of errors encountered by the component
-  <p>
-  counter
- */
-static constexpr const char *kMetricHwErrors     = "hw.errors";
-static constexpr const char *descrMetricHwErrors = "Number of errors encountered by the component";
-static constexpr const char *unitMetricHwErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwErrors, descrMetricHwErrors, unitMetricHwErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwErrors, descrMetricHwErrors, unitMetricHwErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwErrors, descrMetricHwErrors,
-                                             unitMetricHwErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwErrors, descrMetricHwErrors,
-                                              unitMetricHwErrors);
-}
-
-/**
-  Ambient (external) temperature of the physical host
-  <p>
-  gauge
- */
-static constexpr const char *kMetricHwHostAmbientTemperature = "hw.host.ambient_temperature";
-static constexpr const char *descrMetricHwHostAmbientTemperature =
-    "Ambient (external) temperature of the physical host";
-static constexpr const char *unitMetricHwHostAmbientTemperature = "Cel";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostAmbientTemperature,
-                                 descrMetricHwHostAmbientTemperature,
-                                 unitMetricHwHostAmbientTemperature);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostAmbientTemperature,
-                                  descrMetricHwHostAmbientTemperature,
-                                  unitMetricHwHostAmbientTemperature);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwHostAmbientTemperature,
-                                           descrMetricHwHostAmbientTemperature,
-                                           unitMetricHwHostAmbientTemperature);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHwHostAmbientTemperature(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwHostAmbientTemperature,
-                                            descrMetricHwHostAmbientTemperature,
-                                            unitMetricHwHostAmbientTemperature);
-}
-
-/**
-  Total energy consumed by the entire physical host, in joules
-  <p>
-  The overall energy usage of a host MUST be reported using the specific @code hw.host.energy
-  @endcode and @code hw.host.power @endcode metrics <strong>only</strong>, instead of the generic
-  @code hw.energy @endcode and @code hw.power @endcode described in the previous section, to prevent
-  summing up overlapping values. <p> counter
- */
-static constexpr const char *kMetricHwHostEnergy = "hw.host.energy";
-static constexpr const char *descrMetricHwHostEnergy =
-    "Total energy consumed by the entire physical host, in joules";
-static constexpr const char *unitMetricHwHostEnergy = "J";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                    unitMetricHwHostEnergy);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                    unitMetricHwHostEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                             unitMetricHwHostEnergy);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwHostEnergy(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricHwHostEnergy, descrMetricHwHostEnergy,
-                                              unitMetricHwHostEnergy);
-}
-
-/**
-  By how many degrees Celsius the temperature of the physical host can be increased, before reaching
-  a warning threshold on one of the internal sensors <p> gauge
- */
-static constexpr const char *kMetricHwHostHeatingMargin = "hw.host.heating_margin";
-static constexpr const char *descrMetricHwHostHeatingMargin =
-    "By how many degrees Celsius the temperature of the physical host can be increased, before reaching a warning threshold on one of the internal sensors
-    ";
-    static constexpr const char *unitMetricHwHostHeatingMargin = "Cel";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwHostHeatingMargin(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin,
-                                 unitMetricHwHostHeatingMargin);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwHostHeatingMargin(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin,
-                                  unitMetricHwHostHeatingMargin);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricHwHostHeatingMargin(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin, unitMetricHwHostHeatingMargin);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricHwHostHeatingMargin(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricHwHostHeatingMargin, descrMetricHwHostHeatingMargin, unitMetricHwHostHeatingMargin);
-}
-
-/**
-  Instantaneous power consumed by the entire physical host in Watts (@code hw.host.energy @endcode
-  is preferred) <p> The overall energy usage of a host MUST be reported using the specific @code
-  hw.host.energy @endcode and @code hw.host.power @endcode metrics <strong>only</strong>, instead of
-  the generic @code hw.energy @endcode and @code hw.power @endcode described in the previous
-  section, to prevent summing up overlapping values. <p> gauge
- */
-static constexpr const char *kMetricHwHostPower = "hw.host.power";
-static constexpr const char *descrMetricHwHostPower =
-    "Instantaneous power consumed by the entire physical host in Watts (`hw.host.energy` is preferred)
-    ";
-    static constexpr const char *unitMetricHwHostPower = "W";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwHostPower, descrMetricHwHostPower, unitMetricHwHostPower);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                  unitMetricHwHostPower);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                           unitMetricHwHostPower);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwHostPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwHostPower, descrMetricHwHostPower,
-                                            unitMetricHwHostPower);
-}
-
-/**
-  Instantaneous power consumed by the component
-  <p>
-  It is recommended to report @code hw.energy @endcode instead of @code hw.power @endcode when
-  possible. <p> gauge
- */
-static constexpr const char *kMetricHwPower     = "hw.power";
-static constexpr const char *descrMetricHwPower = "Instantaneous power consumed by the component";
-static constexpr const char *unitMetricHwPower  = "W";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwPower(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricHwPower, descrMetricHwPower, unitMetricHwPower);
-}
-
-/**
-  Operational status: @code 1 @endcode (true) or @code 0 @endcode (false) for each of the possible
-  states <p>
-  @code hw.status @endcode is currently specified as an <em>UpDownCounter</em> but would ideally be
-  represented using a <a
-  href="https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#stateset"><em>StateSet</em>
-  as defined in OpenMetrics</a>. This semantic convention will be updated once <em>StateSet</em> is
-  specified in OpenTelemetry. This planned change is not expected to have any consequence on the way
-  users query their timeseries backend to retrieve the values of @code hw.status @endcode over time.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricHwStatus = "hw.status";
-static constexpr const char *descrMetricHwStatus =
-    "Operational status: `1` (true) or `0` (false) for each of the possible states";
-static constexpr const char *unitMetricHwStatus = "1";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricHwStatus, descrMetricHwStatus, unitMetricHwStatus);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricHwStatus, descrMetricHwStatus, unitMetricHwStatus);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricHwStatus, descrMetricHwStatus,
-                                                   unitMetricHwStatus);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricHwStatus(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricHwStatus, descrMetricHwStatus,
-                                                    unitMetricHwStatus);
-}
-
-}  // namespace hw
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/k8s_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/k8s_attributes.h
deleted file mode 100644
index 05f406498..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/k8s_attributes.h
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace k8s
-{
-
-/**
-  The name of the cluster.
- */
-static constexpr const char *kK8sClusterName = "k8s.cluster.name";
-
-/**
-  A pseudo-ID for the cluster, set to the UID of the @code kube-system @endcode namespace.
-  <p>
-  K8s doesn't have support for obtaining a cluster ID. If this is ever
-  added, we will recommend collecting the @code k8s.cluster.uid @endcode through the
-  official APIs. In the meantime, we are able to use the @code uid @endcode of the
-  @code kube-system @endcode namespace as a proxy for cluster ID. Read on for the
-  rationale.
-  <p>
-  Every object created in a K8s cluster is assigned a distinct UID. The
-  @code kube-system @endcode namespace is used by Kubernetes itself and will exist
-  for the lifetime of the cluster. Using the @code uid @endcode of the @code kube-system @endcode
-  namespace is a reasonable proxy for the K8s ClusterID as it will only
-  change if the cluster is rebuilt. Furthermore, Kubernetes UIDs are
-  UUIDs as standardized by
-  <a href="https://www.itu.int/ITU-T/studygroups/com17/oid.html">ISO/IEC 9834-8 and ITU-T X.667</a>.
-  Which states:
-  <blockquote>
-  If generated according to one of the mechanisms defined in Rec.
-  ITU-T X.667 | ISO/IEC 9834-8, a UUID is either guaranteed to be
-  different from all other UUIDs generated before 3603 A.D., or is
-  extremely likely to be different (depending on the mechanism chosen).</blockquote>
-  <p>
-  Therefore, UIDs between clusters should be extremely unlikely to
-  conflict.
- */
-static constexpr const char *kK8sClusterUid = "k8s.cluster.uid";
-
-/**
-  The name of the Container from Pod specification, must be unique within a Pod. Container runtime
-  usually uses different globally unique name (@code container.name @endcode).
- */
-static constexpr const char *kK8sContainerName = "k8s.container.name";
-
-/**
-  Number of times the container was restarted. This attribute can be used to identify a particular
-  container (running or stopped) within a container spec.
- */
-static constexpr const char *kK8sContainerRestartCount = "k8s.container.restart_count";
-
-/**
-  Last terminated reason of the Container.
- */
-static constexpr const char *kK8sContainerStatusLastTerminatedReason =
-    "k8s.container.status.last_terminated_reason";
-
-/**
-  The cronjob annotation placed on the CronJob, the @code <key> @endcode being the annotation name,
-  the value being the annotation value. <p> Examples: <ul> <li>An annotation @code retries @endcode
-  with value @code 4 @endcode SHOULD be recorded as the
-  @code k8s.cronjob.annotation.retries @endcode attribute with value @code "4" @endcode.</li>
-    <li>An annotation @code data @endcode with empty string value SHOULD be recorded as
-  the @code k8s.cronjob.annotation.data @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sCronjobAnnotation = "k8s.cronjob.annotation";
-
-/**
-  The label placed on the CronJob, the @code <key> @endcode being the label name, the value being
-  the label value. <p> Examples: <ul> <li>A label @code type @endcode with value @code weekly
-  @endcode SHOULD be recorded as the
-  @code k8s.cronjob.label.type @endcode attribute with value @code "weekly" @endcode.</li>
-    <li>A label @code automated @endcode with empty string value SHOULD be recorded as
-  the @code k8s.cronjob.label.automated @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sCronjobLabel = "k8s.cronjob.label";
-
-/**
-  The name of the CronJob.
- */
-static constexpr const char *kK8sCronjobName = "k8s.cronjob.name";
-
-/**
-  The UID of the CronJob.
- */
-static constexpr const char *kK8sCronjobUid = "k8s.cronjob.uid";
-
-/**
-  The annotation key-value pairs placed on the DaemonSet.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sDaemonsetAnnotation = "k8s.daemonset.annotation";
-
-/**
-  The label key-value pairs placed on the DaemonSet.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sDaemonsetLabel = "k8s.daemonset.label";
-
-/**
-  The name of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetName = "k8s.daemonset.name";
-
-/**
-  The UID of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetUid = "k8s.daemonset.uid";
-
-/**
-  The annotation key-value pairs placed on the Deployment.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sDeploymentAnnotation = "k8s.deployment.annotation";
-
-/**
-  The label key-value pairs placed on the Deployment.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sDeploymentLabel = "k8s.deployment.label";
-
-/**
-  The name of the Deployment.
- */
-static constexpr const char *kK8sDeploymentName = "k8s.deployment.name";
-
-/**
-  The UID of the Deployment.
- */
-static constexpr const char *kK8sDeploymentUid = "k8s.deployment.uid";
-
-/**
-  The name of the horizontal pod autoscaler.
- */
-static constexpr const char *kK8sHpaName = "k8s.hpa.name";
-
-/**
-  The UID of the horizontal pod autoscaler.
- */
-static constexpr const char *kK8sHpaUid = "k8s.hpa.uid";
-
-/**
-  The annotation key-value pairs placed on the Job.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sJobAnnotation = "k8s.job.annotation";
-
-/**
-  The label key-value pairs placed on the Job.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sJobLabel = "k8s.job.label";
-
-/**
-  The name of the Job.
- */
-static constexpr const char *kK8sJobName = "k8s.job.name";
-
-/**
-  The UID of the Job.
- */
-static constexpr const char *kK8sJobUid = "k8s.job.uid";
-
-/**
-  The annotation key-value pairs placed on the Namespace.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sNamespaceAnnotation = "k8s.namespace.annotation";
-
-/**
-  The label key-value pairs placed on the Namespace.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sNamespaceLabel = "k8s.namespace.label";
-
-/**
-  The name of the namespace that the pod is running in.
- */
-static constexpr const char *kK8sNamespaceName = "k8s.namespace.name";
-
-/**
-  The phase of the K8s namespace.
-  <p>
-  This attribute aligns with the @code phase @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#namespacestatus-v1-core">K8s
-  NamespaceStatus</a>
- */
-static constexpr const char *kK8sNamespacePhase = "k8s.namespace.phase";
-
-/**
-  The annotation placed on the Node, the @code <key> @endcode being the annotation name, the value
-  being the annotation value, even if the value is empty. <p> Examples: <ul> <li>An annotation @code
-  node.alpha.kubernetes.io/ttl @endcode with value @code 0 @endcode SHOULD be recorded as the @code
-  k8s.node.annotation.node.alpha.kubernetes.io/ttl @endcode attribute with value @code "0"
-  @endcode.</li> <li>An annotation @code data @endcode with empty string value SHOULD be recorded as
-  the @code k8s.node.annotation.data @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sNodeAnnotation = "k8s.node.annotation";
-
-/**
-  The label placed on the Node, the @code <key> @endcode being the label name, the value being the
-  label value, even if the value is empty. <p> Examples: <ul> <li>A label @code kubernetes.io/arch
-  @endcode with value @code arm64 @endcode SHOULD be recorded as the @code
-  k8s.node.label.kubernetes.io/arch @endcode attribute with value @code "arm64" @endcode.</li> <li>A
-  label @code data @endcode with empty string value SHOULD be recorded as the @code
-  k8s.node.label.data @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sNodeLabel = "k8s.node.label";
-
-/**
-  The name of the Node.
- */
-static constexpr const char *kK8sNodeName = "k8s.node.name";
-
-/**
-  The UID of the Node.
- */
-static constexpr const char *kK8sNodeUid = "k8s.node.uid";
-
-/**
-  The annotation placed on the Pod, the @code <key> @endcode being the annotation name, the value
-  being the annotation value. <p> Examples: <ul> <li>An annotation @code
-  kubernetes.io/enforce-mountable-secrets @endcode with value @code true @endcode SHOULD be recorded
-  as the @code k8s.pod.annotation.kubernetes.io/enforce-mountable-secrets @endcode attribute with
-  value @code "true" @endcode.</li> <li>An annotation @code mycompany.io/arch @endcode with value
-  @code x64 @endcode SHOULD be recorded as the @code k8s.pod.annotation.mycompany.io/arch @endcode
-  attribute with value @code "x64" @endcode.</li> <li>An annotation @code data @endcode with empty
-  string value SHOULD be recorded as the @code k8s.pod.annotation.data @endcode attribute with value
-  @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sPodAnnotation = "k8s.pod.annotation";
-
-/**
-  The label placed on the Pod, the @code <key> @endcode being the label name, the value being the
-  label value. <p> Examples: <ul> <li>A label @code app @endcode with value @code my-app @endcode
-  SHOULD be recorded as the @code k8s.pod.label.app @endcode attribute with value @code "my-app"
-  @endcode.</li> <li>A label @code mycompany.io/arch @endcode with value @code x64 @endcode SHOULD
-  be recorded as the @code k8s.pod.label.mycompany.io/arch @endcode attribute with value @code "x64"
-  @endcode.</li> <li>A label @code data @endcode with empty string value SHOULD be recorded as the
-  @code k8s.pod.label.data @endcode attribute with value @code "" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kK8sPodLabel = "k8s.pod.label";
-
-/**
-  Deprecated, use @code k8s.pod.label @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code k8s.pod.label @endcode.", "reason": "renamed", "renamed_to":
-  "k8s.pod.label"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kK8sPodLabels = "k8s.pod.labels";
-
-/**
-  The name of the Pod.
- */
-static constexpr const char *kK8sPodName = "k8s.pod.name";
-
-/**
-  The UID of the Pod.
- */
-static constexpr const char *kK8sPodUid = "k8s.pod.uid";
-
-/**
-  The annotation key-value pairs placed on the ReplicaSet.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sReplicasetAnnotation = "k8s.replicaset.annotation";
-
-/**
-  The label key-value pairs placed on the ReplicaSet.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sReplicasetLabel = "k8s.replicaset.label";
-
-/**
-  The name of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetName = "k8s.replicaset.name";
-
-/**
-  The UID of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetUid = "k8s.replicaset.uid";
-
-/**
-  The name of the replication controller.
- */
-static constexpr const char *kK8sReplicationcontrollerName = "k8s.replicationcontroller.name";
-
-/**
-  The UID of the replication controller.
- */
-static constexpr const char *kK8sReplicationcontrollerUid = "k8s.replicationcontroller.uid";
-
-/**
-  The name of the resource quota.
- */
-static constexpr const char *kK8sResourcequotaName = "k8s.resourcequota.name";
-
-/**
-  The UID of the resource quota.
- */
-static constexpr const char *kK8sResourcequotaUid = "k8s.resourcequota.uid";
-
-/**
-  The annotation key-value pairs placed on the StatefulSet.
-  <p>
-  The @code <key> @endcode being the annotation name, the value being the annotation value, even if
-  the value is empty.
- */
-static constexpr const char *kK8sStatefulsetAnnotation = "k8s.statefulset.annotation";
-
-/**
-  The label key-value pairs placed on the StatefulSet.
-  <p>
-  The @code <key> @endcode being the label name, the value being the label value, even if the value
-  is empty.
- */
-static constexpr const char *kK8sStatefulsetLabel = "k8s.statefulset.label";
-
-/**
-  The name of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetName = "k8s.statefulset.name";
-
-/**
-  The UID of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetUid = "k8s.statefulset.uid";
-
-/**
-  The name of the K8s volume.
- */
-static constexpr const char *kK8sVolumeName = "k8s.volume.name";
-
-/**
-  The type of the K8s volume.
- */
-static constexpr const char *kK8sVolumeType = "k8s.volume.type";
-
-namespace K8sNamespacePhaseValues
-{
-/**
-  Active namespace phase as described by <a
-  href="https://pkg.go.dev/k8s.io/api@v0.31.3/core/v1#NamespacePhase">K8s API</a>
- */
-static constexpr const char *kActive = "active";
-
-/**
-  Terminating namespace phase as described by <a
-  href="https://pkg.go.dev/k8s.io/api@v0.31.3/core/v1#NamespacePhase">K8s API</a>
- */
-static constexpr const char *kTerminating = "terminating";
-
-}  // namespace K8sNamespacePhaseValues
-
-namespace K8sVolumeTypeValues
-{
-/**
-  A <a
-  href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#persistentvolumeclaim">persistentVolumeClaim</a>
-  volume
- */
-static constexpr const char *kPersistentVolumeClaim = "persistentVolumeClaim";
-
-/**
-  A <a
-  href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#configmap">configMap</a>
-  volume
- */
-static constexpr const char *kConfigMap = "configMap";
-
-/**
-  A <a
-  href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#downwardapi">downwardAPI</a>
-  volume
- */
-static constexpr const char *kDownwardApi = "downwardAPI";
-
-/**
-  An <a href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#emptydir">emptyDir</a>
-  volume
- */
-static constexpr const char *kEmptyDir = "emptyDir";
-
-/**
-  A <a href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#secret">secret</a>
-  volume
- */
-static constexpr const char *kSecret = "secret";
-
-/**
-  A <a href="https://v1-30.docs.kubernetes.io/docs/concepts/storage/volumes/#local">local</a> volume
- */
-static constexpr const char *kLocal = "local";
-
-}  // namespace K8sVolumeTypeValues
-
-}  // namespace k8s
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/k8s_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/k8s_metrics.h
deleted file mode 100644
index 3a5f25b27..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/k8s_metrics.h
+++ /dev/null
@@ -1,1723 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace k8s
-{
-
-/**
-  The number of actively running jobs for a cronjob
-  <p>
-  This metric aligns with the @code active @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch">K8s
-  CronJobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#cronjob">@code k8s.cronjob @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sCronjobActiveJobs = "k8s.cronjob.active_jobs";
-static constexpr const char *descrMetricK8sCronjobActiveJobs =
-    "The number of actively running jobs for a cronjob";
-static constexpr const char *unitMetricK8sCronjobActiveJobs = "{job}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-/**
-  Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod
-  <p>
-  This metric aligns with the @code currentNumberScheduled @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
-  DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetCurrentScheduledNodes =
-    "k8s.daemonset.current_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetCurrentScheduledNodes =
-    "Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod";
-static constexpr const char *unitMetricK8sDaemonsetCurrentScheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                         descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                         unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                          descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                          unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                                   descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                                   unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                                    descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                                    unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-/**
-  Number of nodes that should be running the daemon pod (including nodes currently running the
-  daemon pod) <p> This metric aligns with the @code desiredNumberScheduled @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
-  DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetDesiredScheduledNodes =
-    "k8s.daemonset.desired_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetDesiredScheduledNodes =
-    "Number of nodes that should be running the daemon pod (including nodes currently running the "
-    "daemon pod)";
-static constexpr const char *unitMetricK8sDaemonsetDesiredScheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                         descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                         unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                          descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                          unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                                   descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                                   unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                                    descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                                    unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-/**
-  Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod
-  <p>
-  This metric aligns with the @code numberMisscheduled @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
-  DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetMisscheduledNodes =
-    "k8s.daemonset.misscheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetMisscheduledNodes =
-    "Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod";
-static constexpr const char *unitMetricK8sDaemonsetMisscheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                         descrMetricK8sDaemonsetMisscheduledNodes,
-                                         unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                          descrMetricK8sDaemonsetMisscheduledNodes,
-                                          unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                                   descrMetricK8sDaemonsetMisscheduledNodes,
-                                                   unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                                    descrMetricK8sDaemonsetMisscheduledNodes,
-                                                    unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-/**
-  Number of nodes that should be running the daemon pod and have one or more of the daemon pod
-  running and ready <p> This metric aligns with the @code numberReady @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
-  DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetReadyNodes = "k8s.daemonset.ready_nodes";
-static constexpr const char *descrMetricK8sDaemonsetReadyNodes =
-    "Number of nodes that should be running the daemon pod and have one or more of the daemon pod "
-    "running and ready";
-static constexpr const char *unitMetricK8sDaemonsetReadyNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                         descrMetricK8sDaemonsetReadyNodes,
-                                         unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                          descrMetricK8sDaemonsetReadyNodes,
-                                          unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                   descrMetricK8sDaemonsetReadyNodes,
-                                                   unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                    descrMetricK8sDaemonsetReadyNodes,
-                                                    unitMetricK8sDaemonsetReadyNodes);
-}
-
-/**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  deployment <p> This metric aligns with the @code availableReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentstatus-v1-apps">K8s
-  DeploymentStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#deployment">@code k8s.deployment @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDeploymentAvailablePods = "k8s.deployment.available_pods";
-static constexpr const char *descrMetricK8sDeploymentAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "deployment";
-static constexpr const char *unitMetricK8sDeploymentAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                         descrMetricK8sDeploymentAvailablePods,
-                                         unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                          descrMetricK8sDeploymentAvailablePods,
-                                          unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                   descrMetricK8sDeploymentAvailablePods,
-                                                   unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                    descrMetricK8sDeploymentAvailablePods,
-                                                    unitMetricK8sDeploymentAvailablePods);
-}
-
-/**
-  Number of desired replica pods in this deployment
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentspec-v1-apps">K8s
-  DeploymentSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#deployment">@code k8s.deployment @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDeploymentDesiredPods = "k8s.deployment.desired_pods";
-static constexpr const char *descrMetricK8sDeploymentDesiredPods =
-    "Number of desired replica pods in this deployment";
-static constexpr const char *unitMetricK8sDeploymentDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                         descrMetricK8sDeploymentDesiredPods,
-                                         unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                          descrMetricK8sDeploymentDesiredPods,
-                                          unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                   descrMetricK8sDeploymentDesiredPods,
-                                                   unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                    descrMetricK8sDeploymentDesiredPods,
-                                                    unitMetricK8sDeploymentDesiredPods);
-}
-
-/**
-  Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the
-  autoscaler <p> This metric aligns with the @code currentReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
-  HorizontalPodAutoscalerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sHpaCurrentPods = "k8s.hpa.current_pods";
-static constexpr const char *descrMetricK8sHpaCurrentPods =
-    "Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the "
-    "autoscaler";
-static constexpr const char *unitMetricK8sHpaCurrentPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                         unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                          unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
-}
-
-/**
-  Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated by
-  the autoscaler <p> This metric aligns with the @code desiredReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
-  HorizontalPodAutoscalerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sHpaDesiredPods = "k8s.hpa.desired_pods";
-static constexpr const char *descrMetricK8sHpaDesiredPods =
-    "Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated "
-    "by the autoscaler";
-static constexpr const char *unitMetricK8sHpaDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                         unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                          unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
-}
-
-/**
-  The upper limit for the number of replica pods to which the autoscaler can scale up
-  <p>
-  This metric aligns with the @code maxReplicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
-  HorizontalPodAutoscalerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sHpaMaxPods = "k8s.hpa.max_pods";
-static constexpr const char *descrMetricK8sHpaMaxPods =
-    "The upper limit for the number of replica pods to which the autoscaler can scale up";
-static constexpr const char *unitMetricK8sHpaMaxPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                         unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                          unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                                   unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                                    unitMetricK8sHpaMaxPods);
-}
-
-/**
-  The lower limit for the number of replica pods to which the autoscaler can scale down
-  <p>
-  This metric aligns with the @code minReplicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
-  HorizontalPodAutoscalerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sHpaMinPods = "k8s.hpa.min_pods";
-static constexpr const char *descrMetricK8sHpaMinPods =
-    "The lower limit for the number of replica pods to which the autoscaler can scale down";
-static constexpr const char *unitMetricK8sHpaMinPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                         unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                          unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                                   unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                                    unitMetricK8sHpaMinPods);
-}
-
-/**
-  The number of pending and actively running pods for a job
-  <p>
-  This metric aligns with the @code active @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
-  JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobActivePods = "k8s.job.active_pods";
-static constexpr const char *descrMetricK8sJobActivePods =
-    "The number of pending and actively running pods for a job";
-static constexpr const char *unitMetricK8sJobActivePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                         unitMetricK8sJobActivePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                          unitMetricK8sJobActivePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
-}
-
-/**
-  The desired number of successfully finished pods the job should be run with
-  <p>
-  This metric aligns with the @code completions @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
-  JobSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobDesiredSuccessfulPods = "k8s.job.desired_successful_pods";
-static constexpr const char *descrMetricK8sJobDesiredSuccessfulPods =
-    "The desired number of successfully finished pods the job should be run with";
-static constexpr const char *unitMetricK8sJobDesiredSuccessfulPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                         descrMetricK8sJobDesiredSuccessfulPods,
-                                         unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                          descrMetricK8sJobDesiredSuccessfulPods,
-                                          unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                                   descrMetricK8sJobDesiredSuccessfulPods,
-                                                   unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                                    descrMetricK8sJobDesiredSuccessfulPods,
-                                                    unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-/**
-  The number of pods which reached phase Failed for a job
-  <p>
-  This metric aligns with the @code failed @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
-  JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobFailedPods = "k8s.job.failed_pods";
-static constexpr const char *descrMetricK8sJobFailedPods =
-    "The number of pods which reached phase Failed for a job";
-static constexpr const char *unitMetricK8sJobFailedPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
-                                         unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
-                                          unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
-}
-
-/**
-  The max desired number of pods the job should run at any given time
-  <p>
-  This metric aligns with the @code parallelism @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
-  JobSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobMaxParallelPods = "k8s.job.max_parallel_pods";
-static constexpr const char *descrMetricK8sJobMaxParallelPods =
-    "The max desired number of pods the job should run at any given time";
-static constexpr const char *unitMetricK8sJobMaxParallelPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobMaxParallelPods,
-                                         descrMetricK8sJobMaxParallelPods,
-                                         unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                          descrMetricK8sJobMaxParallelPods,
-                                          unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                   descrMetricK8sJobMaxParallelPods,
-                                                   unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                    descrMetricK8sJobMaxParallelPods,
-                                                    unitMetricK8sJobMaxParallelPods);
-}
-
-/**
-  The number of pods which reached phase Succeeded for a job
-  <p>
-  This metric aligns with the @code succeeded @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
-  JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobSuccessfulPods = "k8s.job.successful_pods";
-static constexpr const char *descrMetricK8sJobSuccessfulPods =
-    "The number of pods which reached phase Succeeded for a job";
-static constexpr const char *unitMetricK8sJobSuccessfulPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-/**
-  Describes number of K8s namespaces that are currently in a given phase.
-  <p>
-  This metric SHOULD, at a minimum, be reported against a
-  <a href="../resource/k8s.md#namespace">@code k8s.namespace @endcode</a> resource.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sNamespacePhase = "k8s.namespace.phase";
-static constexpr const char *descrMetricK8sNamespacePhase =
-    "Describes number of K8s namespaces that are currently in a given phase.";
-static constexpr const char *unitMetricK8sNamespacePhase = "{namespace}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase,
-                                         unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase,
-                                          unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase, unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase, unitMetricK8sNamespacePhase);
-}
-
-/**
-  Total CPU time consumed
-  <p>
-  Total CPU time consumed by the specific Node on all available CPU cores
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sNodeCpuTime     = "k8s.node.cpu.time";
-static constexpr const char *descrMetricK8sNodeCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricK8sNodeCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                    unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                    unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                             unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                              unitMetricK8sNodeCpuTime);
-}
-
-/**
-  Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
-  <p>
-  CPU usage of the specific Node on all available CPU cores, averaged over the sample window
-  <p>
-  gauge
- */
-static constexpr const char *kMetricK8sNodeCpuUsage = "k8s.node.cpu.usage";
-static constexpr const char *descrMetricK8sNodeCpuUsage =
-    "Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricK8sNodeCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                 unitMetricK8sNodeCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                  unitMetricK8sNodeCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                           unitMetricK8sNodeCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                            unitMetricK8sNodeCpuUsage);
-}
-
-/**
-  Memory usage of the Node
-  <p>
-  Total memory usage of the Node
-  <p>
-  gauge
- */
-static constexpr const char *kMetricK8sNodeMemoryUsage     = "k8s.node.memory.usage";
-static constexpr const char *descrMetricK8sNodeMemoryUsage = "Memory usage of the Node";
-static constexpr const char *unitMetricK8sNodeMemoryUsage  = "By";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                 unitMetricK8sNodeMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                  unitMetricK8sNodeMemoryUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                           unitMetricK8sNodeMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage, unitMetricK8sNodeMemoryUsage);
-}
-
-/**
-  Node network errors
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sNodeNetworkErrors     = "k8s.node.network.errors";
-static constexpr const char *descrMetricK8sNodeNetworkErrors = "Node network errors";
-static constexpr const char *unitMetricK8sNodeNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors,
-                                    unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors,
-                                    unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors, unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors, unitMetricK8sNodeNetworkErrors);
-}
-
-/**
-  Network bytes for the Node
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sNodeNetworkIo     = "k8s.node.network.io";
-static constexpr const char *descrMetricK8sNodeNetworkIo = "Network bytes for the Node";
-static constexpr const char *unitMetricK8sNodeNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sNodeNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                    unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sNodeNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                    unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                             unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                              unitMetricK8sNodeNetworkIo);
-}
-
-/**
-  The time the Node has been running
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricK8sNodeUptime     = "k8s.node.uptime";
-static constexpr const char *descrMetricK8sNodeUptime = "The time the Node has been running";
-static constexpr const char *unitMetricK8sNodeUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                 unitMetricK8sNodeUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                  unitMetricK8sNodeUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                           unitMetricK8sNodeUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                            unitMetricK8sNodeUptime);
-}
-
-/**
-  Total CPU time consumed
-  <p>
-  Total CPU time consumed by the specific Pod on all available CPU cores
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sPodCpuTime     = "k8s.pod.cpu.time";
-static constexpr const char *descrMetricK8sPodCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricK8sPodCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                    unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                    unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                             unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                              unitMetricK8sPodCpuTime);
-}
-
-/**
-  Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
-  <p>
-  CPU usage of the specific Pod on all available CPU cores, averaged over the sample window
-  <p>
-  gauge
- */
-static constexpr const char *kMetricK8sPodCpuUsage = "k8s.pod.cpu.usage";
-static constexpr const char *descrMetricK8sPodCpuUsage =
-    "Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricK8sPodCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                 unitMetricK8sPodCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                  unitMetricK8sPodCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                           unitMetricK8sPodCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                            unitMetricK8sPodCpuUsage);
-}
-
-/**
-  Memory usage of the Pod
-  <p>
-  Total memory usage of the Pod
-  <p>
-  gauge
- */
-static constexpr const char *kMetricK8sPodMemoryUsage     = "k8s.pod.memory.usage";
-static constexpr const char *descrMetricK8sPodMemoryUsage = "Memory usage of the Pod";
-static constexpr const char *unitMetricK8sPodMemoryUsage  = "By";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                 unitMetricK8sPodMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                  unitMetricK8sPodMemoryUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                           unitMetricK8sPodMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                            unitMetricK8sPodMemoryUsage);
-}
-
-/**
-  Pod network errors
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sPodNetworkErrors     = "k8s.pod.network.errors";
-static constexpr const char *descrMetricK8sPodNetworkErrors = "Pod network errors";
-static constexpr const char *unitMetricK8sPodNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors,
-                                    unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodNetworkErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors,
-                                    unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors, unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors, unitMetricK8sPodNetworkErrors);
-}
-
-/**
-  Network bytes for the Pod
-  <p>
-  counter
- */
-static constexpr const char *kMetricK8sPodNetworkIo     = "k8s.pod.network.io";
-static constexpr const char *descrMetricK8sPodNetworkIo = "Network bytes for the Pod";
-static constexpr const char *unitMetricK8sPodNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sPodNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                    unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                    unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                             unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                              unitMetricK8sPodNetworkIo);
-}
-
-/**
-  The time the Pod has been running
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricK8sPodUptime     = "k8s.pod.uptime";
-static constexpr const char *descrMetricK8sPodUptime = "The time the Pod has been running";
-static constexpr const char *unitMetricK8sPodUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                 unitMetricK8sPodUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                  unitMetricK8sPodUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                           unitMetricK8sPodUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                            unitMetricK8sPodUptime);
-}
-
-/**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  replicaset <p> This metric aligns with the @code availableReplicas @endcode field of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetstatus-v1-apps">K8s
-  ReplicaSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#replicaset">@code k8s.replicaset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicasetAvailablePods = "k8s.replicaset.available_pods";
-static constexpr const char *descrMetricK8sReplicasetAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replicaset";
-static constexpr const char *unitMetricK8sReplicasetAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                         descrMetricK8sReplicasetAvailablePods,
-                                         unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                          descrMetricK8sReplicasetAvailablePods,
-                                          unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                                   descrMetricK8sReplicasetAvailablePods,
-                                                   unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                                    descrMetricK8sReplicasetAvailablePods,
-                                                    unitMetricK8sReplicasetAvailablePods);
-}
-
-/**
-  Number of desired replica pods in this replicaset
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetspec-v1-apps">K8s
-  ReplicaSetSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#replicaset">@code k8s.replicaset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicasetDesiredPods = "k8s.replicaset.desired_pods";
-static constexpr const char *descrMetricK8sReplicasetDesiredPods =
-    "Number of desired replica pods in this replicaset";
-static constexpr const char *unitMetricK8sReplicasetDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                         descrMetricK8sReplicasetDesiredPods,
-                                         unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                          descrMetricK8sReplicasetDesiredPods,
-                                          unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                   descrMetricK8sReplicasetDesiredPods,
-                                                   unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                    descrMetricK8sReplicasetDesiredPods,
-                                                    unitMetricK8sReplicasetDesiredPods);
-}
-
-/**
-  Deprecated, use @code k8s.replicationcontroller.available_pods @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code k8s.replicationcontroller.available_pods @endcode.", "reason":
-  "renamed", "renamed_to": "k8s.replicationcontroller.available_pods"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerAvailablePods =
-    "k8s.replication_controller.available_pods";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricK8sReplicationControllerAvailablePods =
-        "Deprecated, use `k8s.replicationcontroller.available_pods` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricK8sReplicationControllerAvailablePods = "{pod}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                         descrMetricK8sReplicationControllerAvailablePods,
-                                         unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                          descrMetricK8sReplicationControllerAvailablePods,
-                                          unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                                   descrMetricK8sReplicationControllerAvailablePods,
-                                                   unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sReplicationControllerAvailablePods,
-      descrMetricK8sReplicationControllerAvailablePods,
-      unitMetricK8sReplicationControllerAvailablePods);
-}
-
-/**
-  Deprecated, use @code k8s.replicationcontroller.desired_pods @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code k8s.replicationcontroller.desired_pods @endcode.", "reason":
-  "renamed", "renamed_to": "k8s.replicationcontroller.desired_pods"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerDesiredPods =
-    "k8s.replication_controller.desired_pods";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricK8sReplicationControllerDesiredPods =
-        "Deprecated, use `k8s.replicationcontroller.desired_pods` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricK8sReplicationControllerDesiredPods = "{pod}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                         descrMetricK8sReplicationControllerDesiredPods,
-                                         unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                          descrMetricK8sReplicationControllerDesiredPods,
-                                          unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                                   descrMetricK8sReplicationControllerDesiredPods,
-                                                   unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                                    descrMetricK8sReplicationControllerDesiredPods,
-                                                    unitMetricK8sReplicationControllerDesiredPods);
-}
-
-/**
-  Total number of available replica pods (ready for at least minReadySeconds) targeted by this
-  replication controller <p> This metric aligns with the @code availableReplicas @endcode field of
-  the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core">K8s
-  ReplicationControllerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
-  resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicationcontrollerAvailablePods =
-    "k8s.replicationcontroller.available_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replication controller";
-static constexpr const char *unitMetricK8sReplicationcontrollerAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                         descrMetricK8sReplicationcontrollerAvailablePods,
-                                         unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                          descrMetricK8sReplicationcontrollerAvailablePods,
-                                          unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                                   descrMetricK8sReplicationcontrollerAvailablePods,
-                                                   unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sReplicationcontrollerAvailablePods,
-      descrMetricK8sReplicationcontrollerAvailablePods,
-      unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-/**
-  Number of desired replica pods in this replication controller
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core">K8s
-  ReplicationControllerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
-  resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicationcontrollerDesiredPods =
-    "k8s.replicationcontroller.desired_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerDesiredPods =
-    "Number of desired replica pods in this replication controller";
-static constexpr const char *unitMetricK8sReplicationcontrollerDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                         descrMetricK8sReplicationcontrollerDesiredPods,
-                                         unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                          descrMetricK8sReplicationcontrollerDesiredPods,
-                                          unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                                   descrMetricK8sReplicationcontrollerDesiredPods,
-                                                   unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                                    descrMetricK8sReplicationcontrollerDesiredPods,
-                                                    unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-/**
-  The number of replica pods created by the statefulset controller from the statefulset version
-  indicated by currentRevision <p> This metric aligns with the @code currentReplicas @endcode field
-  of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
-  StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetCurrentPods = "k8s.statefulset.current_pods";
-static constexpr const char *descrMetricK8sStatefulsetCurrentPods =
-    "The number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by currentRevision";
-static constexpr const char *unitMetricK8sStatefulsetCurrentPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                         descrMetricK8sStatefulsetCurrentPods,
-                                         unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                          descrMetricK8sStatefulsetCurrentPods,
-                                          unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                                   descrMetricK8sStatefulsetCurrentPods,
-                                                   unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                                    descrMetricK8sStatefulsetCurrentPods,
-                                                    unitMetricK8sStatefulsetCurrentPods);
-}
-
-/**
-  Number of desired replica pods in this statefulset
-  <p>
-  This metric aligns with the @code replicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetspec-v1-apps">K8s
-  StatefulSetSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetDesiredPods = "k8s.statefulset.desired_pods";
-static constexpr const char *descrMetricK8sStatefulsetDesiredPods =
-    "Number of desired replica pods in this statefulset";
-static constexpr const char *unitMetricK8sStatefulsetDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                         descrMetricK8sStatefulsetDesiredPods,
-                                         unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                          descrMetricK8sStatefulsetDesiredPods,
-                                          unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                                   descrMetricK8sStatefulsetDesiredPods,
-                                                   unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                                    descrMetricK8sStatefulsetDesiredPods,
-                                                    unitMetricK8sStatefulsetDesiredPods);
-}
-
-/**
-  The number of replica pods created for this statefulset with a Ready Condition
-  <p>
-  This metric aligns with the @code readyReplicas @endcode field of the
-  <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
-  StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetReadyPods = "k8s.statefulset.ready_pods";
-static constexpr const char *descrMetricK8sStatefulsetReadyPods =
-    "The number of replica pods created for this statefulset with a Ready Condition";
-static constexpr const char *unitMetricK8sStatefulsetReadyPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                         descrMetricK8sStatefulsetReadyPods,
-                                         unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                          descrMetricK8sStatefulsetReadyPods,
-                                          unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                                   descrMetricK8sStatefulsetReadyPods,
-                                                   unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                                    descrMetricK8sStatefulsetReadyPods,
-                                                    unitMetricK8sStatefulsetReadyPods);
-}
-
-/**
-  Number of replica pods created by the statefulset controller from the statefulset version
-  indicated by updateRevision <p> This metric aligns with the @code updatedReplicas @endcode field
-  of the <a
-  href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
-  StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
-  href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
-  updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetUpdatedPods = "k8s.statefulset.updated_pods";
-static constexpr const char *descrMetricK8sStatefulsetUpdatedPods =
-    "Number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by updateRevision";
-static constexpr const char *unitMetricK8sStatefulsetUpdatedPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                         descrMetricK8sStatefulsetUpdatedPods,
-                                         unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                          descrMetricK8sStatefulsetUpdatedPods,
-                                          unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                                   descrMetricK8sStatefulsetUpdatedPods,
-                                                   unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                                    descrMetricK8sStatefulsetUpdatedPods,
-                                                    unitMetricK8sStatefulsetUpdatedPods);
-}
-
-}  // namespace k8s
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/linux_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/linux_attributes.h
deleted file mode 100644
index c3f90337a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/linux_attributes.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace linux
-{
-
-/**
-  The Linux Slab memory state
- */
-static constexpr const char *kLinuxMemorySlabState = "linux.memory.slab.state";
-
-namespace LinuxMemorySlabStateValues
-{
-/**
-  none
- */
-static constexpr const char *kReclaimable = "reclaimable";
-
-/**
-  none
- */
-static constexpr const char *kUnreclaimable = "unreclaimable";
-
-}  // namespace LinuxMemorySlabStateValues
-
-}  // namespace linux
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/log_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/log_attributes.h
deleted file mode 100644
index 7655a4008..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/log_attributes.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace log
-{
-
-/**
-  The basename of the file.
- */
-static constexpr const char *kLogFileName = "log.file.name";
-
-/**
-  The basename of the file, with symlinks resolved.
- */
-static constexpr const char *kLogFileNameResolved = "log.file.name_resolved";
-
-/**
-  The full path to the file.
- */
-static constexpr const char *kLogFilePath = "log.file.path";
-
-/**
-  The full path to the file, with symlinks resolved.
- */
-static constexpr const char *kLogFilePathResolved = "log.file.path_resolved";
-
-/**
-  The stream associated with the log. See below for a list of well-known values.
- */
-static constexpr const char *kLogIostream = "log.iostream";
-
-/**
-  The complete original Log Record.
-  <p>
-  This value MAY be added when processing a Log Record which was originally transmitted as a string
-  or equivalent data type AND the Body field of the Log Record does not contain the same value.
-  (e.g. a syslog or a log record read from a file.)
- */
-static constexpr const char *kLogRecordOriginal = "log.record.original";
-
-/**
-  A unique identifier for the Log Record.
-  <p>
-  If an id is provided, other log records with the same id will be considered duplicates and can be
-  removed safely. This means, that two distinguishable log records MUST have different values. The
-  id MAY be an <a href="https://github.com/ulid/spec">Universally Unique Lexicographically Sortable
-  Identifier (ULID)</a>, but other identifiers (e.g. UUID) may be used as needed.
- */
-static constexpr const char *kLogRecordUid = "log.record.uid";
-
-namespace LogIostreamValues
-{
-/**
-  Logs from stdout stream
- */
-static constexpr const char *kStdout = "stdout";
-
-/**
-  Events from stderr stream
- */
-static constexpr const char *kStderr = "stderr";
-
-}  // namespace LogIostreamValues
-
-}  // namespace log
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/message_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/message_attributes.h
deleted file mode 100644
index 05941248c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/message_attributes.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace message
-{
-
-/**
-  Deprecated, use @code rpc.message.compressed_size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code rpc.message.compressed_size @endcode.", "reason": "renamed",
-  "renamed_to": "rpc.message.compressed_size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize =
-    "message.compressed_size";
-
-/**
-  Deprecated, use @code rpc.message.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code rpc.message.id @endcode.", "reason": "renamed", "renamed_to":
-  "rpc.message.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id";
-
-/**
-  Deprecated, use @code rpc.message.type @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code rpc.message.type @endcode.", "reason": "renamed", "renamed_to":
-  "rpc.message.type"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type";
-
-/**
-  Deprecated, use @code rpc.message.uncompressed_size @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code rpc.message.uncompressed_size @endcode.", "reason": "renamed",
-  "renamed_to": "rpc.message.uncompressed_size"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize =
-    "message.uncompressed_size";
-
-namespace MessageTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kSent = "SENT";
-
-/**
-  none
- */
-static constexpr const char *kReceived = "RECEIVED";
-
-}  // namespace MessageTypeValues
-
-}  // namespace message
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/messaging_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/messaging_attributes.h
deleted file mode 100644
index f036c3654..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/messaging_attributes.h
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace messaging
-{
-
-/**
-  The number of messages sent, received, or processed in the scope of the batching operation.
-  <p>
-  Instrumentations SHOULD NOT set @code messaging.batch.message_count @endcode on spans that operate
-  with a single message. When a messaging client library supports both batch and single-message API
-  for the same operation, instrumentations SHOULD use @code messaging.batch.message_count @endcode
-  for batching APIs and SHOULD NOT use it for single-message APIs.
- */
-static constexpr const char *kMessagingBatchMessageCount = "messaging.batch.message_count";
-
-/**
-  A unique identifier for the client that consumes or produces a message.
- */
-static constexpr const char *kMessagingClientId = "messaging.client.id";
-
-/**
-  The name of the consumer group with which a consumer is associated.
-  <p>
-  Semantic conventions for individual messaging systems SHOULD document whether @code
-  messaging.consumer.group.name @endcode is applicable and what it means in the context of that
-  system.
- */
-static constexpr const char *kMessagingConsumerGroupName = "messaging.consumer.group.name";
-
-/**
-  A boolean that is true if the message destination is anonymous (could be unnamed or have
-  auto-generated name).
- */
-static constexpr const char *kMessagingDestinationAnonymous = "messaging.destination.anonymous";
-
-/**
-  The message destination name
-  <p>
-  Destination name SHOULD uniquely identify a specific queue, topic or other entity within the
-  broker. If the broker doesn't have such notion, the destination name SHOULD uniquely identify the
-  broker.
- */
-static constexpr const char *kMessagingDestinationName = "messaging.destination.name";
-
-/**
-  The identifier of the partition messages are sent to or received from, unique within the @code
-  messaging.destination.name @endcode.
- */
-static constexpr const char *kMessagingDestinationPartitionId =
-    "messaging.destination.partition.id";
-
-/**
-  The name of the destination subscription from which a message is consumed.
-  <p>
-  Semantic conventions for individual messaging systems SHOULD document whether @code
-  messaging.destination.subscription.name @endcode is applicable and what it means in the context of
-  that system.
- */
-static constexpr const char *kMessagingDestinationSubscriptionName =
-    "messaging.destination.subscription.name";
-
-/**
-  Low cardinality representation of the messaging destination name
-  <p>
-  Destination names could be constructed from templates. An example would be a destination name
-  involving a user name or product id. Although the destination name in this case is of high
-  cardinality, the underlying template is of low cardinality and can be effectively used for
-  grouping and aggregation.
- */
-static constexpr const char *kMessagingDestinationTemplate = "messaging.destination.template";
-
-/**
-  A boolean that is true if the message destination is temporary and might not exist anymore after
-  messages are processed.
- */
-static constexpr const char *kMessagingDestinationTemporary = "messaging.destination.temporary";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed. No replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous =
-    "messaging.destination_publish.anonymous";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed. No replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName =
-    "messaging.destination_publish.name";
-
-/**
-  Deprecated, use @code messaging.consumer.group.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.consumer.group.name @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.consumer.group.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup =
-    "messaging.eventhubs.consumer.group";
-
-/**
-  The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingEventhubsMessageEnqueuedTime =
-    "messaging.eventhubs.message.enqueued_time";
-
-/**
-  The ack deadline in seconds set for the modify ack deadline request.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckDeadline =
-    "messaging.gcp_pubsub.message.ack_deadline";
-
-/**
-  The ack id for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckId =
-    "messaging.gcp_pubsub.message.ack_id";
-
-/**
-  The delivery attempt for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageDeliveryAttempt =
-    "messaging.gcp_pubsub.message.delivery_attempt";
-
-/**
-  The ordering key for a given message. If the attribute is not present, the message does not have
-  an ordering key.
- */
-static constexpr const char *kMessagingGcpPubsubMessageOrderingKey =
-    "messaging.gcp_pubsub.message.ordering_key";
-
-/**
-  Deprecated, use @code messaging.consumer.group.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.consumer.group.name @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.consumer.group.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup =
-    "messaging.kafka.consumer.group";
-
-/**
-  Deprecated, use @code messaging.destination.partition.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.destination.partition.id @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.destination.partition.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
-    "messaging.kafka.destination.partition";
-
-/**
-  Message keys in Kafka are used for grouping alike messages to ensure they're processed on the same
-  partition. They differ from @code messaging.message.id @endcode in that they're not unique. If the
-  key is @code null @endcode, the attribute MUST NOT be set. <p> If the key type is not string, it's
-  string representation has to be supplied for the attribute. If the key has no unambiguous,
-  canonical string form, don't include its value.
- */
-static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.message.key";
-
-/**
-  Deprecated, use @code messaging.kafka.offset @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.kafka.offset @endcode.", "reason": "renamed", "renamed_to":
-  "messaging.kafka.offset"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset =
-    "messaging.kafka.message.offset";
-
-/**
-  A boolean that is true if the message is a tombstone.
- */
-static constexpr const char *kMessagingKafkaMessageTombstone = "messaging.kafka.message.tombstone";
-
-/**
-  The offset of a record in the corresponding Kafka partition.
- */
-static constexpr const char *kMessagingKafkaOffset = "messaging.kafka.offset";
-
-/**
-  The size of the message body in bytes.
-  <p>
-  This can refer to both the compressed or uncompressed body size. If both sizes are known, the
-  uncompressed body size should be used.
- */
-static constexpr const char *kMessagingMessageBodySize = "messaging.message.body.size";
-
-/**
-  The conversation ID identifying the conversation to which the message belongs, represented as a
-  string. Sometimes called "Correlation ID".
- */
-static constexpr const char *kMessagingMessageConversationId = "messaging.message.conversation_id";
-
-/**
-  The size of the message body and metadata in bytes.
-  <p>
-  This can refer to both the compressed or uncompressed size. If both sizes are known, the
-  uncompressed size should be used.
- */
-static constexpr const char *kMessagingMessageEnvelopeSize = "messaging.message.envelope.size";
-
-/**
-  A value used by the messaging system as an identifier for the message, represented as a string.
- */
-static constexpr const char *kMessagingMessageId = "messaging.message.id";
-
-/**
-  Deprecated, use @code messaging.operation.type @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.operation.type @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.operation.type"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation";
-
-/**
-  The system-specific name of the messaging operation.
- */
-static constexpr const char *kMessagingOperationName = "messaging.operation.name";
-
-/**
-  A string identifying the type of the messaging operation.
-  <p>
-  If a custom value is used, it MUST be of low cardinality.
- */
-static constexpr const char *kMessagingOperationType = "messaging.operation.type";
-
-/**
-  RabbitMQ message routing key.
- */
-static constexpr const char *kMessagingRabbitmqDestinationRoutingKey =
-    "messaging.rabbitmq.destination.routing_key";
-
-/**
-  RabbitMQ message delivery tag
- */
-static constexpr const char *kMessagingRabbitmqMessageDeliveryTag =
-    "messaging.rabbitmq.message.delivery_tag";
-
-/**
-  Deprecated, use @code messaging.consumer.group.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.consumer.group.name @endcode on the consumer spans. No
-  replacement for producer spans.\n", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup =
-    "messaging.rocketmq.client_group";
-
-/**
-  Model of message consumption. This only applies to consumer spans.
- */
-static constexpr const char *kMessagingRocketmqConsumptionModel =
-    "messaging.rocketmq.consumption_model";
-
-/**
-  The delay time level for delay message, which determines the message delay time.
- */
-static constexpr const char *kMessagingRocketmqMessageDelayTimeLevel =
-    "messaging.rocketmq.message.delay_time_level";
-
-/**
-  The timestamp in milliseconds that the delay message is expected to be delivered to consumer.
- */
-static constexpr const char *kMessagingRocketmqMessageDeliveryTimestamp =
-    "messaging.rocketmq.message.delivery_timestamp";
-
-/**
-  It is essential for FIFO message. Messages that belong to the same message group are always
-  processed one by one within the same consumer group.
- */
-static constexpr const char *kMessagingRocketmqMessageGroup = "messaging.rocketmq.message.group";
-
-/**
-  Key(s) of message, another way to mark message besides message id.
- */
-static constexpr const char *kMessagingRocketmqMessageKeys = "messaging.rocketmq.message.keys";
-
-/**
-  The secondary classifier of message besides topic.
- */
-static constexpr const char *kMessagingRocketmqMessageTag = "messaging.rocketmq.message.tag";
-
-/**
-  Type of message.
- */
-static constexpr const char *kMessagingRocketmqMessageType = "messaging.rocketmq.message.type";
-
-/**
-  Namespace of RocketMQ resources, resources in different namespaces are individual.
- */
-static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.namespace";
-
-/**
-  Deprecated, use @code messaging.destination.subscription.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.destination.subscription.name @endcode.", "reason":
-  "renamed", "renamed_to": "messaging.destination.subscription.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *kMessagingServicebusDestinationSubscriptionName =
-        "messaging.servicebus.destination.subscription_name";
-
-/**
-  Describes the <a
-  href="https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock">settlement
-  type</a>.
- */
-static constexpr const char *kMessagingServicebusDispositionStatus =
-    "messaging.servicebus.disposition_status";
-
-/**
-  Number of deliveries that have been attempted for this message.
- */
-static constexpr const char *kMessagingServicebusMessageDeliveryCount =
-    "messaging.servicebus.message.delivery_count";
-
-/**
-  The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingServicebusMessageEnqueuedTime =
-    "messaging.servicebus.message.enqueued_time";
-
-/**
-  The messaging system as identified by the client instrumentation.
-  <p>
-  The actual messaging system may differ from the one known by the client. For example, when using
-  Kafka client libraries to communicate with Azure Event Hubs, the @code messaging.system @endcode
-  is set to @code kafka @endcode based on the instrumentation's best knowledge.
- */
-static constexpr const char *kMessagingSystem = "messaging.system";
-
-namespace MessagingOperationTypeValues
-{
-/**
-  A message is created. "Create" spans always refer to a single message and are used to provide a
-  unique creation context for messages in batch sending scenarios.
- */
-static constexpr const char *kCreate = "create";
-
-/**
-  One or more messages are provided for sending to an intermediary. If a single message is sent, the
-  context of the "Send" span can be used as the creation context and no "Create" span needs to be
-  created.
- */
-static constexpr const char *kSend = "send";
-
-/**
-  One or more messages are requested by a consumer. This operation refers to pull-based scenarios,
-  where consumers explicitly call methods of messaging SDKs to receive messages.
- */
-static constexpr const char *kReceive = "receive";
-
-/**
-  One or more messages are processed by a consumer.
- */
-static constexpr const char *kProcess = "process";
-
-/**
-  One or more messages are settled.
- */
-static constexpr const char *kSettle = "settle";
-
-/**
-  Deprecated. Use @code process @endcode instead.
- */
-static constexpr const char *kDeliver = "deliver";
-
-/**
-  Deprecated. Use @code send @endcode instead.
- */
-static constexpr const char *kPublish = "publish";
-
-}  // namespace MessagingOperationTypeValues
-
-namespace MessagingRocketmqConsumptionModelValues
-{
-/**
-  Clustering consumption model
- */
-static constexpr const char *kClustering = "clustering";
-
-/**
-  Broadcasting consumption model
- */
-static constexpr const char *kBroadcasting = "broadcasting";
-
-}  // namespace MessagingRocketmqConsumptionModelValues
-
-namespace MessagingRocketmqMessageTypeValues
-{
-/**
-  Normal message
- */
-static constexpr const char *kNormal = "normal";
-
-/**
-  FIFO message
- */
-static constexpr const char *kFifo = "fifo";
-
-/**
-  Delay message
- */
-static constexpr const char *kDelay = "delay";
-
-/**
-  Transaction message
- */
-static constexpr const char *kTransaction = "transaction";
-
-}  // namespace MessagingRocketmqMessageTypeValues
-
-namespace MessagingServicebusDispositionStatusValues
-{
-/**
-  Message is completed
- */
-static constexpr const char *kComplete = "complete";
-
-/**
-  Message is abandoned
- */
-static constexpr const char *kAbandon = "abandon";
-
-/**
-  Message is sent to dead letter queue
- */
-static constexpr const char *kDeadLetter = "dead_letter";
-
-/**
-  Message is deferred
- */
-static constexpr const char *kDefer = "defer";
-
-}  // namespace MessagingServicebusDispositionStatusValues
-
-namespace MessagingSystemValues
-{
-/**
-  Apache ActiveMQ
- */
-static constexpr const char *kActivemq = "activemq";
-
-/**
-  Amazon Simple Queue Service (SQS)
- */
-static constexpr const char *kAwsSqs = "aws_sqs";
-
-/**
-  Azure Event Grid
- */
-static constexpr const char *kEventgrid = "eventgrid";
-
-/**
-  Azure Event Hubs
- */
-static constexpr const char *kEventhubs = "eventhubs";
-
-/**
-  Azure Service Bus
- */
-static constexpr const char *kServicebus = "servicebus";
-
-/**
-  Google Cloud Pub/Sub
- */
-static constexpr const char *kGcpPubsub = "gcp_pubsub";
-
-/**
-  Java Message Service
- */
-static constexpr const char *kJms = "jms";
-
-/**
-  Apache Kafka
- */
-static constexpr const char *kKafka = "kafka";
-
-/**
-  RabbitMQ
- */
-static constexpr const char *kRabbitmq = "rabbitmq";
-
-/**
-  Apache RocketMQ
- */
-static constexpr const char *kRocketmq = "rocketmq";
-
-/**
-  Apache Pulsar
- */
-static constexpr const char *kPulsar = "pulsar";
-
-}  // namespace MessagingSystemValues
-
-}  // namespace messaging
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/messaging_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/messaging_metrics.h
deleted file mode 100644
index e9bdcf32e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/messaging_metrics.h
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace messaging
-{
-
-/**
-  Number of messages that were delivered to the application.
-  <p>
-  Records the number of messages pulled from the broker or number of messages dispatched to the
-  application in push-based scenarios. The metric SHOULD be reported once per message delivery. For
-  example, if receiving and processing operations are both instrumented for a single message
-  delivery, this counter is incremented when the message is received and not reported when it is
-  processed. <p> counter
- */
-static constexpr const char *kMetricMessagingClientConsumedMessages =
-    "messaging.client.consumed.messages";
-static constexpr const char *descrMetricMessagingClientConsumedMessages =
-    "Number of messages that were delivered to the application.";
-static constexpr const char *unitMetricMessagingClientConsumedMessages = "{message}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientConsumedMessages,
-                                    descrMetricMessagingClientConsumedMessages,
-                                    unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientConsumedMessages,
-                                    descrMetricMessagingClientConsumedMessages,
-                                    unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientConsumedMessages,
-                                             descrMetricMessagingClientConsumedMessages,
-                                             unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientConsumedMessages,
-                                              descrMetricMessagingClientConsumedMessages,
-                                              unitMetricMessagingClientConsumedMessages);
-}
-
-/**
-  Duration of messaging operation initiated by a producer or consumer client.
-  <p>
-  This metric SHOULD NOT be used to report processing duration - processing duration is reported in
-  @code messaging.process.duration @endcode metric. <p> histogram
- */
-static constexpr const char *kMetricMessagingClientOperationDuration =
-    "messaging.client.operation.duration";
-static constexpr const char *descrMetricMessagingClientOperationDuration =
-    "Duration of messaging operation initiated by a producer or consumer client.";
-static constexpr const char *unitMetricMessagingClientOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingClientOperationDuration,
-                                      descrMetricMessagingClientOperationDuration,
-                                      unitMetricMessagingClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingClientOperationDuration,
-                                      descrMetricMessagingClientOperationDuration,
-                                      unitMetricMessagingClientOperationDuration);
-}
-
-/**
-  Deprecated. Use @code messaging.client.sent.messages @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.sent.messages"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingClientPublishedMessages =
-    "messaging.client.published.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingClientPublishedMessages =
-    "Deprecated. Use `messaging.client.sent.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingClientPublishedMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientPublishedMessages,
-                                    descrMetricMessagingClientPublishedMessages,
-                                    unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientPublishedMessages,
-                                    descrMetricMessagingClientPublishedMessages,
-                                    unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientPublishedMessages,
-                                             descrMetricMessagingClientPublishedMessages,
-                                             unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientPublishedMessages,
-                                              descrMetricMessagingClientPublishedMessages,
-                                              unitMetricMessagingClientPublishedMessages);
-}
-
-/**
-  Number of messages producer attempted to send to the broker.
-  <p>
-  This metric MUST NOT count messages that were created but haven't yet been sent.
-  <p>
-  counter
- */
-static constexpr const char *kMetricMessagingClientSentMessages = "messaging.client.sent.messages";
-static constexpr const char *descrMetricMessagingClientSentMessages =
-    "Number of messages producer attempted to send to the broker.";
-static constexpr const char *unitMetricMessagingClientSentMessages = "{message}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientSentMessages,
-                                    descrMetricMessagingClientSentMessages,
-                                    unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientSentMessages,
-                                    descrMetricMessagingClientSentMessages,
-                                    unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientSentMessages,
-                                             descrMetricMessagingClientSentMessages,
-                                             unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientSentMessages,
-                                              descrMetricMessagingClientSentMessages,
-                                              unitMetricMessagingClientSentMessages);
-}
-
-/**
-  Duration of processing operation.
-  <p>
-  This metric MUST be reported for operations with @code messaging.operation.type @endcode that
-  matches @code process @endcode. <p> histogram
- */
-static constexpr const char *kMetricMessagingProcessDuration = "messaging.process.duration";
-static constexpr const char *descrMetricMessagingProcessDuration =
-    "Duration of processing operation.";
-static constexpr const char *unitMetricMessagingProcessDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingProcessDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingProcessDuration,
-                                      descrMetricMessagingProcessDuration,
-                                      unitMetricMessagingProcessDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingProcessDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingProcessDuration,
-                                      descrMetricMessagingProcessDuration,
-                                      unitMetricMessagingProcessDuration);
-}
-
-/**
-  Deprecated. Use @code messaging.client.consumed.messages @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.consumed.messages"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingProcessMessages =
-    "messaging.process.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingProcessMessages =
-    "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingProcessMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingProcessMessages,
-                                    descrMetricMessagingProcessMessages,
-                                    unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingProcessMessages,
-                                    descrMetricMessagingProcessMessages,
-                                    unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingProcessMessages,
-                                             descrMetricMessagingProcessMessages,
-                                             unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingProcessMessages,
-                                              descrMetricMessagingProcessMessages,
-                                              unitMetricMessagingProcessMessages);
-}
-
-/**
-  Deprecated. Use @code messaging.client.operation.duration @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.operation.duration"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishDuration =
-    "messaging.publish.duration";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishDuration =
-    "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishDuration = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingPublishDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingPublishDuration,
-                                      descrMetricMessagingPublishDuration,
-                                      unitMetricMessagingPublishDuration);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingPublishDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingPublishDuration,
-                                      descrMetricMessagingPublishDuration,
-                                      unitMetricMessagingPublishDuration);
-}
-
-/**
-  Deprecated. Use @code messaging.client.sent.messages @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.sent.messages"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishMessages =
-    "messaging.publish.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishMessages =
-    "Deprecated. Use `messaging.client.sent.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingPublishMessages,
-                                    descrMetricMessagingPublishMessages,
-                                    unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingPublishMessages,
-                                    descrMetricMessagingPublishMessages,
-                                    unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingPublishMessages,
-                                             descrMetricMessagingPublishMessages,
-                                             unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingPublishMessages,
-                                              descrMetricMessagingPublishMessages,
-                                              unitMetricMessagingPublishMessages);
-}
-
-/**
-  Deprecated. Use @code messaging.client.operation.duration @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.operation.duration"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveDuration =
-    "messaging.receive.duration";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveDuration =
-    "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveDuration = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingReceiveDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingReceiveDuration,
-                                      descrMetricMessagingReceiveDuration,
-                                      unitMetricMessagingReceiveDuration);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingReceiveDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingReceiveDuration,
-                                      descrMetricMessagingReceiveDuration,
-                                      unitMetricMessagingReceiveDuration);
-}
-
-/**
-  Deprecated. Use @code messaging.client.consumed.messages @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason": "renamed",
-  "renamed_to": "messaging.client.consumed.messages"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveMessages =
-    "messaging.receive.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveMessages =
-    "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingReceiveMessages,
-                                    descrMetricMessagingReceiveMessages,
-                                    unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingReceiveMessages,
-                                    descrMetricMessagingReceiveMessages,
-                                    unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingReceiveMessages,
-                                             descrMetricMessagingReceiveMessages,
-                                             unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingReceiveMessages,
-                                              descrMetricMessagingReceiveMessages,
-                                              unitMetricMessagingReceiveMessages);
-}
-
-}  // namespace messaging
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/net_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/net_attributes.h
deleted file mode 100644
index 951217616..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/net_attributes.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace net
-{
-
-/**
-  Deprecated, use @code network.local.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.local.address @endcode.", "reason": "renamed", "renamed_to":
-  "network.local.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip";
-
-/**
-  Deprecated, use @code server.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to":
-  "server.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name";
-
-/**
-  Deprecated, use @code server.port @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code server.port @endcode.", "reason": "renamed", "renamed_to":
-  "server.port"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port";
-
-/**
-  Deprecated, use @code network.peer.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.peer.address @endcode.", "reason": "renamed", "renamed_to":
-  "network.peer.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip";
-
-/**
-  Deprecated, use @code server.address @endcode on client spans and @code client.address @endcode on
-  server spans.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode on client spans and @code client.address
-  @endcode on server spans.", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerName = "net.peer.name";
-
-/**
-  Deprecated, use @code server.port @endcode on client spans and @code client.port @endcode on
-  server spans.
-
-  @deprecated
-  {"note": "Replaced by @code server.port @endcode on client spans and @code client.port @endcode on
-  server spans.", "reason": "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.port";
-
-/**
-  Deprecated, use @code network.protocol.name @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.protocol.name @endcode.", "reason": "renamed", "renamed_to":
-  "network.protocol.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name";
-
-/**
-  Deprecated, use @code network.protocol.version @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.protocol.version @endcode.", "reason": "renamed",
-  "renamed_to": "network.protocol.version"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version";
-
-/**
-  Deprecated, use @code network.transport @endcode and @code network.type @endcode.
-
-  @deprecated
-  {"note": "Split to @code network.transport @endcode and @code network.type @endcode.", "reason":
-  "uncategorized"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock.family";
-
-/**
-  Deprecated, use @code network.local.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.local.address @endcode.", "reason": "renamed", "renamed_to":
-  "network.local.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
-
-/**
-  Deprecated, use @code network.local.port @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.local.port @endcode.", "reason": "renamed", "renamed_to":
-  "network.local.port"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port";
-
-/**
-  Deprecated, use @code network.peer.address @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.peer.address @endcode.", "reason": "renamed", "renamed_to":
-  "network.peer.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
-
-/**
-  Deprecated, no replacement at this time.
-
-  @deprecated
-  {"note": "Removed. No replacement at this time.", "reason": "obsoleted"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
-
-/**
-  Deprecated, use @code network.peer.port @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.peer.port @endcode.", "reason": "renamed", "renamed_to":
-  "network.peer.port"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
-
-/**
-  Deprecated, use @code network.transport @endcode.
-
-  @deprecated
-  {"note": "Replaced by @code network.transport @endcode.", "reason": "renamed", "renamed_to":
-  "network.transport"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport";
-
-namespace NetSockFamilyValues
-{
-/**
-  IPv4 address
- */
-static constexpr const char *kInet = "inet";
-
-/**
-  IPv6 address
- */
-static constexpr const char *kInet6 = "inet6";
-
-/**
-  Unix domain socket path
- */
-static constexpr const char *kUnix = "unix";
-
-}  // namespace NetSockFamilyValues
-
-namespace NetTransportValues
-{
-/**
-  none
- */
-static constexpr const char *kIpTcp = "ip_tcp";
-
-/**
-  none
- */
-static constexpr const char *kIpUdp = "ip_udp";
-
-/**
-  Named or anonymous pipe.
- */
-static constexpr const char *kPipe = "pipe";
-
-/**
-  In-process communication.
- */
-static constexpr const char *kInproc = "inproc";
-
-/**
-  Something else (non IP-based).
- */
-static constexpr const char *kOther = "other";
-
-}  // namespace NetTransportValues
-
-}  // namespace net
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/network_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/network_attributes.h
deleted file mode 100644
index 7b8404b2c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/network_attributes.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace network
-{
-
-/**
-  The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network.
- */
-static constexpr const char *kNetworkCarrierIcc = "network.carrier.icc";
-
-/**
-  The mobile carrier country code.
- */
-static constexpr const char *kNetworkCarrierMcc = "network.carrier.mcc";
-
-/**
-  The mobile carrier network code.
- */
-static constexpr const char *kNetworkCarrierMnc = "network.carrier.mnc";
-
-/**
-  The name of the mobile carrier.
- */
-static constexpr const char *kNetworkCarrierName = "network.carrier.name";
-
-/**
-  The state of network connection
-  <p>
-  Connection states are defined as part of the <a
-  href="https://datatracker.ietf.org/doc/html/rfc9293#section-3.3.2">rfc9293</a>
- */
-static constexpr const char *kNetworkConnectionState = "network.connection.state";
-
-/**
-  This describes more details regarding the connection.type. It may be the type of cell technology
-  connection, but it could be used for describing details about a wifi connection.
- */
-static constexpr const char *kNetworkConnectionSubtype = "network.connection.subtype";
-
-/**
-  The internet connection type.
- */
-static constexpr const char *kNetworkConnectionType = "network.connection.type";
-
-/**
-  The network interface name.
- */
-static constexpr const char *kNetworkInterfaceName = "network.interface.name";
-
-/**
-  The network IO operation direction.
- */
-static constexpr const char *kNetworkIoDirection = "network.io.direction";
-
-/**
-  Local address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkLocalAddress = "network.local.address";
-
-/**
-  Local port number of the network connection.
- */
-static constexpr const char *kNetworkLocalPort = "network.local.port";
-
-/**
-  Peer address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkPeerAddress = "network.peer.address";
-
-/**
-  Peer port number of the network connection.
- */
-static constexpr const char *kNetworkPeerPort = "network.peer.port";
-
-/**
-  <a href="https://wikipedia.org/wiki/Application_layer">OSI application layer</a> or non-OSI
-  equivalent. <p> The value SHOULD be normalized to lowercase.
- */
-static constexpr const char *kNetworkProtocolName = "network.protocol.name";
-
-/**
-  The actual version of the protocol used for network communication.
-  <p>
-  If protocol version is subject to negotiation (for example using <a
-  href="https://www.rfc-editor.org/rfc/rfc7301.html">ALPN</a>), this attribute SHOULD be set to the
-  negotiated version. If the actual protocol version is not known, this attribute SHOULD NOT be set.
- */
-static constexpr const char *kNetworkProtocolVersion = "network.protocol.version";
-
-/**
-  <a href="https://wikipedia.org/wiki/Transport_layer">OSI transport layer</a> or <a
-  href="https://wikipedia.org/wiki/Inter-process_communication">inter-process communication
-  method</a>. <p> The value SHOULD be normalized to lowercase. <p> Consider always setting the
-  transport when setting a port number, since a port number is ambiguous without knowing the
-  transport. For example different processes could be listening on TCP port 12345 and UDP port
-  12345.
- */
-static constexpr const char *kNetworkTransport = "network.transport";
-
-/**
-  <a href="https://wikipedia.org/wiki/Network_layer">OSI network layer</a> or non-OSI equivalent.
-  <p>
-  The value SHOULD be normalized to lowercase.
- */
-static constexpr const char *kNetworkType = "network.type";
-
-namespace NetworkConnectionStateValues
-{
-/**
-  none
- */
-static constexpr const char *kClosed = "closed";
-
-/**
-  none
- */
-static constexpr const char *kCloseWait = "close_wait";
-
-/**
-  none
- */
-static constexpr const char *kClosing = "closing";
-
-/**
-  none
- */
-static constexpr const char *kEstablished = "established";
-
-/**
-  none
- */
-static constexpr const char *kFinWait1 = "fin_wait_1";
-
-/**
-  none
- */
-static constexpr const char *kFinWait2 = "fin_wait_2";
-
-/**
-  none
- */
-static constexpr const char *kLastAck = "last_ack";
-
-/**
-  none
- */
-static constexpr const char *kListen = "listen";
-
-/**
-  none
- */
-static constexpr const char *kSynReceived = "syn_received";
-
-/**
-  none
- */
-static constexpr const char *kSynSent = "syn_sent";
-
-/**
-  none
- */
-static constexpr const char *kTimeWait = "time_wait";
-
-}  // namespace NetworkConnectionStateValues
-
-namespace NetworkConnectionSubtypeValues
-{
-/**
-  GPRS
- */
-static constexpr const char *kGprs = "gprs";
-
-/**
-  EDGE
- */
-static constexpr const char *kEdge = "edge";
-
-/**
-  UMTS
- */
-static constexpr const char *kUmts = "umts";
-
-/**
-  CDMA
- */
-static constexpr const char *kCdma = "cdma";
-
-/**
-  EVDO Rel. 0
- */
-static constexpr const char *kEvdo0 = "evdo_0";
-
-/**
-  EVDO Rev. A
- */
-static constexpr const char *kEvdoA = "evdo_a";
-
-/**
-  CDMA2000 1XRTT
- */
-static constexpr const char *kCdma20001xrtt = "cdma2000_1xrtt";
-
-/**
-  HSDPA
- */
-static constexpr const char *kHsdpa = "hsdpa";
-
-/**
-  HSUPA
- */
-static constexpr const char *kHsupa = "hsupa";
-
-/**
-  HSPA
- */
-static constexpr const char *kHspa = "hspa";
-
-/**
-  IDEN
- */
-static constexpr const char *kIden = "iden";
-
-/**
-  EVDO Rev. B
- */
-static constexpr const char *kEvdoB = "evdo_b";
-
-/**
-  LTE
- */
-static constexpr const char *kLte = "lte";
-
-/**
-  EHRPD
- */
-static constexpr const char *kEhrpd = "ehrpd";
-
-/**
-  HSPAP
- */
-static constexpr const char *kHspap = "hspap";
-
-/**
-  GSM
- */
-static constexpr const char *kGsm = "gsm";
-
-/**
-  TD-SCDMA
- */
-static constexpr const char *kTdScdma = "td_scdma";
-
-/**
-  IWLAN
- */
-static constexpr const char *kIwlan = "iwlan";
-
-/**
-  5G NR (New Radio)
- */
-static constexpr const char *kNr = "nr";
-
-/**
-  5G NRNSA (New Radio Non-Standalone)
- */
-static constexpr const char *kNrnsa = "nrnsa";
-
-/**
-  LTE CA
- */
-static constexpr const char *kLteCa = "lte_ca";
-
-}  // namespace NetworkConnectionSubtypeValues
-
-namespace NetworkConnectionTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kWifi = "wifi";
-
-/**
-  none
- */
-static constexpr const char *kWired = "wired";
-
-/**
-  none
- */
-static constexpr const char *kCell = "cell";
-
-/**
-  none
- */
-static constexpr const char *kUnavailable = "unavailable";
-
-/**
-  none
- */
-static constexpr const char *kUnknown = "unknown";
-
-}  // namespace NetworkConnectionTypeValues
-
-namespace NetworkIoDirectionValues
-{
-/**
-  none
- */
-static constexpr const char *kTransmit = "transmit";
-
-/**
-  none
- */
-static constexpr const char *kReceive = "receive";
-
-}  // namespace NetworkIoDirectionValues
-
-namespace NetworkTransportValues
-{
-/**
-  TCP
- */
-static constexpr const char *kTcp = "tcp";
-
-/**
-  UDP
- */
-static constexpr const char *kUdp = "udp";
-
-/**
-  Named or anonymous pipe.
- */
-static constexpr const char *kPipe = "pipe";
-
-/**
-  Unix domain socket
- */
-static constexpr const char *kUnix = "unix";
-
-/**
-  QUIC
- */
-static constexpr const char *kQuic = "quic";
-
-}  // namespace NetworkTransportValues
-
-namespace NetworkTypeValues
-{
-/**
-  IPv4
- */
-static constexpr const char *kIpv4 = "ipv4";
-
-/**
-  IPv6
- */
-static constexpr const char *kIpv6 = "ipv6";
-
-}  // namespace NetworkTypeValues
-
-}  // namespace network
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/oci_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/oci_attributes.h
deleted file mode 100644
index 431b84607..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/oci_attributes.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace oci
-{
-
-/**
-  The digest of the OCI image manifest. For container images specifically is the digest by which the
-  container image is known. <p> Follows <a
-  href="https://github.com/opencontainers/image-spec/blob/main/manifest.md">OCI Image Manifest
-  Specification</a>, and specifically the <a
-  href="https://github.com/opencontainers/image-spec/blob/main/descriptor.md#digests">Digest
-  property</a>. An example can be found in <a
-  href="https://github.com/opencontainers/image-spec/blob/main/manifest.md#example-image-manifest">Example
-  Image Manifest</a>.
- */
-static constexpr const char *kOciManifestDigest = "oci.manifest.digest";
-
-}  // namespace oci
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/opentracing_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/opentracing_attributes.h
deleted file mode 100644
index fba932be4..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/opentracing_attributes.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace opentracing
-{
-
-/**
-  Parent-child Reference type
-  <p>
-  The causal relationship between a child Span and a parent Span.
- */
-static constexpr const char *kOpentracingRefType = "opentracing.ref_type";
-
-namespace OpentracingRefTypeValues
-{
-/**
-  The parent Span depends on the child Span in some capacity
- */
-static constexpr const char *kChildOf = "child_of";
-
-/**
-  The parent Span doesn't depend in any way on the result of the child Span
- */
-static constexpr const char *kFollowsFrom = "follows_from";
-
-}  // namespace OpentracingRefTypeValues
-
-}  // namespace opentracing
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/os_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/os_attributes.h
deleted file mode 100644
index 69dded814..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/os_attributes.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace os
-{
-
-/**
-  Unique identifier for a particular build or compilation of the operating system.
- */
-static constexpr const char *kOsBuildId = "os.build_id";
-
-/**
-  Human readable (not intended to be parsed) OS version information, like e.g. reported by @code ver
-  @endcode or @code lsb_release -a @endcode commands.
- */
-static constexpr const char *kOsDescription = "os.description";
-
-/**
-  Human readable operating system name.
- */
-static constexpr const char *kOsName = "os.name";
-
-/**
-  The operating system type.
- */
-static constexpr const char *kOsType = "os.type";
-
-/**
-  The version string of the operating system as defined in <a
-  href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kOsVersion = "os.version";
-
-namespace OsTypeValues
-{
-/**
-  Microsoft Windows
- */
-static constexpr const char *kWindows = "windows";
-
-/**
-  Linux
- */
-static constexpr const char *kLinux = "linux";
-
-/**
-  Apple Darwin
- */
-static constexpr const char *kDarwin = "darwin";
-
-/**
-  FreeBSD
- */
-static constexpr const char *kFreebsd = "freebsd";
-
-/**
-  NetBSD
- */
-static constexpr const char *kNetbsd = "netbsd";
-
-/**
-  OpenBSD
- */
-static constexpr const char *kOpenbsd = "openbsd";
-
-/**
-  DragonFly BSD
- */
-static constexpr const char *kDragonflybsd = "dragonflybsd";
-
-/**
-  HP-UX (Hewlett Packard Unix)
- */
-static constexpr const char *kHpux = "hpux";
-
-/**
-  AIX (Advanced Interactive eXecutive)
- */
-static constexpr const char *kAix = "aix";
-
-/**
-  SunOS, Oracle Solaris
- */
-static constexpr const char *kSolaris = "solaris";
-
-/**
-  IBM z/OS
- */
-static constexpr const char *kZOs = "z_os";
-
-}  // namespace OsTypeValues
-
-}  // namespace os
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/otel_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/otel_attributes.h
deleted file mode 100644
index df1f165b8..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/otel_attributes.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace otel
-{
-
-/**
-  A name uniquely identifying the instance of the OpenTelemetry component within its containing SDK
-  instance. <p> Implementations SHOULD ensure a low cardinality for this attribute, even across
-  application or SDK restarts. E.g. implementations MUST NOT use UUIDs as values for this attribute.
-  <p>
-  Implementations MAY achieve these goals by following a @code
-  <otel.component.type>/<instance-counter> @endcode pattern, e.g. @code batching_span_processor/0
-  @endcode. Hereby @code otel.component.type @endcode refers to the corresponding attribute value of
-  the component. <p> The value of @code instance-counter @endcode MAY be automatically assigned by
-  the component and uniqueness within the enclosing SDK instance MUST be guaranteed. For example,
-  @code <instance-counter> @endcode MAY be implemented by using a monotonically increasing counter
-  (starting with @code 0 @endcode), which is incremented every time an instance of the given
-  component type is started. <p> With this implementation, for example the first Batching Span
-  Processor would have @code batching_span_processor/0 @endcode as @code otel.component.name
-  @endcode, the second one @code batching_span_processor/1 @endcode and so on. These values will
-  therefore be reused in the case of an application restart.
- */
-static constexpr const char *kOtelComponentName = "otel.component.name";
-
-/**
-  A name identifying the type of the OpenTelemetry component.
-  <p>
-  If none of the standardized values apply, implementations SHOULD use the language-defined name of
-  the type. E.g. for Java the fully qualified classname SHOULD be used in this case.
- */
-static constexpr const char *kOtelComponentType = "otel.component.type";
-
-/**
-  Deprecated. Use the @code otel.scope.name @endcode attribute
-
-  @deprecated
-  {"note": "Replaced by @code otel.scope.name @endcode.", "reason": "renamed", "renamed_to":
-  "otel.scope.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name";
-
-/**
-  Deprecated. Use the @code otel.scope.version @endcode attribute.
-
-  @deprecated
-  {"note": "Replaced by @code otel.scope.version @endcode.", "reason": "renamed", "renamed_to":
-  "otel.scope.version"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version";
-
-/**
-  The name of the instrumentation scope - (@code InstrumentationScope.Name @endcode in OTLP).
- */
-static constexpr const char *kOtelScopeName = "otel.scope.name";
-
-/**
-  The version of the instrumentation scope - (@code InstrumentationScope.Version @endcode in OTLP).
- */
-static constexpr const char *kOtelScopeVersion = "otel.scope.version";
-
-/**
-  The result value of the sampler for this span
- */
-static constexpr const char *kOtelSpanSamplingResult = "otel.span.sampling_result";
-
-/**
-  Name of the code, either "OK" or "ERROR". MUST NOT be set if the status code is UNSET.
- */
-static constexpr const char *kOtelStatusCode = "otel.status_code";
-
-/**
-  Description of the Status if it has a value, otherwise not set.
- */
-static constexpr const char *kOtelStatusDescription = "otel.status_description";
-
-namespace OtelComponentTypeValues
-{
-/**
-  The builtin SDK batching span processor
- */
-static constexpr const char *kBatchingSpanProcessor = "batching_span_processor";
-
-/**
-  The builtin SDK simple span processor
- */
-static constexpr const char *kSimpleSpanProcessor = "simple_span_processor";
-
-/**
-  The builtin SDK batching log record processor
- */
-static constexpr const char *kBatchingLogProcessor = "batching_log_processor";
-
-/**
-  The builtin SDK simple log record processor
- */
-static constexpr const char *kSimpleLogProcessor = "simple_log_processor";
-
-/**
-  OTLP span exporter over gRPC with protobuf serialization
- */
-static constexpr const char *kOtlpGrpcSpanExporter = "otlp_grpc_span_exporter";
-
-/**
-  OTLP span exporter over HTTP with protobuf serialization
- */
-static constexpr const char *kOtlpHttpSpanExporter = "otlp_http_span_exporter";
-
-/**
-  OTLP span exporter over HTTP with JSON serialization
- */
-static constexpr const char *kOtlpHttpJsonSpanExporter = "otlp_http_json_span_exporter";
-
-/**
-  OTLP log record exporter over gRPC with protobuf serialization
- */
-static constexpr const char *kOtlpGrpcLogExporter = "otlp_grpc_log_exporter";
-
-/**
-  OTLP log record exporter over HTTP with protobuf serialization
- */
-static constexpr const char *kOtlpHttpLogExporter = "otlp_http_log_exporter";
-
-/**
-  OTLP log record exporter over HTTP with JSON serialization
- */
-static constexpr const char *kOtlpHttpJsonLogExporter = "otlp_http_json_log_exporter";
-
-/**
-  The builtin SDK periodically exporting metric reader
- */
-static constexpr const char *kPeriodicMetricReader = "periodic_metric_reader";
-
-/**
-  OTLP metric exporter over gRPC with protobuf serialization
- */
-static constexpr const char *kOtlpGrpcMetricExporter = "otlp_grpc_metric_exporter";
-
-/**
-  OTLP metric exporter over HTTP with protobuf serialization
- */
-static constexpr const char *kOtlpHttpMetricExporter = "otlp_http_metric_exporter";
-
-/**
-  OTLP metric exporter over HTTP with JSON serialization
- */
-static constexpr const char *kOtlpHttpJsonMetricExporter = "otlp_http_json_metric_exporter";
-
-}  // namespace OtelComponentTypeValues
-
-namespace OtelSpanSamplingResultValues
-{
-/**
-  The span is not sampled and not recording
- */
-static constexpr const char *kDrop = "DROP";
-
-/**
-  The span is not sampled, but recording
- */
-static constexpr const char *kRecordOnly = "RECORD_ONLY";
-
-/**
-  The span is sampled and recording
- */
-static constexpr const char *kRecordAndSample = "RECORD_AND_SAMPLE";
-
-}  // namespace OtelSpanSamplingResultValues
-
-namespace OtelStatusCodeValues
-{
-/**
-  The operation has been validated by an Application developer or Operator to have completed
-  successfully.
- */
-static constexpr const char *kOk = "OK";
-
-/**
-  The operation contains an error.
- */
-static constexpr const char *kError = "ERROR";
-
-}  // namespace OtelStatusCodeValues
-
-}  // namespace otel
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/otel_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/otel_metrics.h
deleted file mode 100644
index a02b814c0..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/otel_metrics.h
+++ /dev/null
@@ -1,976 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace otel
-{
-
-/**
-  The number of log records for which the export has finished, either successful or failed
-  <p>
-  For successful exports, @code error.type @endcode MUST NOT be set. For failed exports, @code
-  error.type @endcode MUST contain the failure cause. For exporters with partial success semantics
-  (e.g. OTLP with @code rejected_log_records @endcode), rejected log records MUST count as failed
-  and only non-rejected log records count as success. If no rejection reason is available, @code
-  rejected @endcode SHOULD be used as value for @code error.type @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkExporterLogExported = "otel.sdk.exporter.log.exported";
-static constexpr const char *descrMetricOtelSdkExporterLogExported =
-    "The number of log records for which the export has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkExporterLogExported = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterLogExported(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkExporterLogExported,
-                                    descrMetricOtelSdkExporterLogExported,
-                                    unitMetricOtelSdkExporterLogExported);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkExporterLogExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkExporterLogExported,
-                                    descrMetricOtelSdkExporterLogExported,
-                                    unitMetricOtelSdkExporterLogExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterLogExported(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkExporterLogExported,
-                                             descrMetricOtelSdkExporterLogExported,
-                                             unitMetricOtelSdkExporterLogExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterLogExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkExporterLogExported,
-                                              descrMetricOtelSdkExporterLogExported,
-                                              unitMetricOtelSdkExporterLogExported);
-}
-
-/**
-  The number of log records which were passed to the exporter, but that have not been exported yet
-  (neither successful, nor failed) <p> For successful exports, @code error.type @endcode MUST NOT be
-  set. For failed exports, @code error.type @endcode MUST contain the failure cause. <p>
-  updowncounter
- */
-static constexpr const char *kMetricOtelSdkExporterLogInflight = "otel.sdk.exporter.log.inflight";
-static constexpr const char *descrMetricOtelSdkExporterLogInflight =
-    "The number of log records which were passed to the exporter, but that have not been exported "
-    "yet (neither successful, nor failed)";
-static constexpr const char *unitMetricOtelSdkExporterLogInflight = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterLogInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterLogInflight,
-                                         descrMetricOtelSdkExporterLogInflight,
-                                         unitMetricOtelSdkExporterLogInflight);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterLogInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterLogInflight,
-                                          descrMetricOtelSdkExporterLogInflight,
-                                          unitMetricOtelSdkExporterLogInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterLogInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterLogInflight,
-                                                   descrMetricOtelSdkExporterLogInflight,
-                                                   unitMetricOtelSdkExporterLogInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterLogInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterLogInflight,
-                                                    descrMetricOtelSdkExporterLogInflight,
-                                                    unitMetricOtelSdkExporterLogInflight);
-}
-
-/**
-  The number of metric data points for which the export has finished, either successful or failed
-  <p>
-  For successful exports, @code error.type @endcode MUST NOT be set. For failed exports, @code
-  error.type @endcode MUST contain the failure cause. For exporters with partial success semantics
-  (e.g. OTLP with @code rejected_data_points @endcode), rejected data points MUST count as failed
-  and only non-rejected data points count as success. If no rejection reason is available, @code
-  rejected @endcode SHOULD be used as value for @code error.type @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkExporterMetricDataPointExported =
-    "otel.sdk.exporter.metric_data_point.exported";
-static constexpr const char *descrMetricOtelSdkExporterMetricDataPointExported =
-    "The number of metric data points for which the export has finished, either successful or "
-    "failed";
-static constexpr const char *unitMetricOtelSdkExporterMetricDataPointExported = "{data_point}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterMetricDataPointExported(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkExporterMetricDataPointExported,
-                                    descrMetricOtelSdkExporterMetricDataPointExported,
-                                    unitMetricOtelSdkExporterMetricDataPointExported);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkExporterMetricDataPointExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkExporterMetricDataPointExported,
-                                    descrMetricOtelSdkExporterMetricDataPointExported,
-                                    unitMetricOtelSdkExporterMetricDataPointExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterMetricDataPointExported(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkExporterMetricDataPointExported,
-                                             descrMetricOtelSdkExporterMetricDataPointExported,
-                                             unitMetricOtelSdkExporterMetricDataPointExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterMetricDataPointExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkExporterMetricDataPointExported,
-                                              descrMetricOtelSdkExporterMetricDataPointExported,
-                                              unitMetricOtelSdkExporterMetricDataPointExported);
-}
-
-/**
-  The number of metric data points which were passed to the exporter, but that have not been
-  exported yet (neither successful, nor failed) <p> For successful exports, @code error.type
-  @endcode MUST NOT be set. For failed exports, @code error.type @endcode MUST contain the failure
-  cause. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkExporterMetricDataPointInflight =
-    "otel.sdk.exporter.metric_data_point.inflight";
-static constexpr const char *descrMetricOtelSdkExporterMetricDataPointInflight =
-    "The number of metric data points which were passed to the exporter, but that have not been "
-    "exported yet (neither successful, nor failed)";
-static constexpr const char *unitMetricOtelSdkExporterMetricDataPointInflight = "{data_point}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterMetricDataPointInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterMetricDataPointInflight,
-                                         descrMetricOtelSdkExporterMetricDataPointInflight,
-                                         unitMetricOtelSdkExporterMetricDataPointInflight);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterMetricDataPointInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterMetricDataPointInflight,
-                                          descrMetricOtelSdkExporterMetricDataPointInflight,
-                                          unitMetricOtelSdkExporterMetricDataPointInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterMetricDataPointInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricOtelSdkExporterMetricDataPointInflight,
-      descrMetricOtelSdkExporterMetricDataPointInflight,
-      unitMetricOtelSdkExporterMetricDataPointInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterMetricDataPointInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricOtelSdkExporterMetricDataPointInflight,
-      descrMetricOtelSdkExporterMetricDataPointInflight,
-      unitMetricOtelSdkExporterMetricDataPointInflight);
-}
-
-/**
-  The duration of exporting a batch of telemetry records.
-  <p>
-  This metric defines successful operations using the full success definitions for <a
-  href="https://github.com/open-telemetry/opentelemetry-proto/blob/v1.5.0/docs/specification.md#full-success-1">http</a>
-  and <a
-  href="https://github.com/open-telemetry/opentelemetry-proto/blob/v1.5.0/docs/specification.md#full-success">grpc</a>.
-  Anything else is defined as an unsuccessful operation. For successful operations, @code error.type
-  @endcode MUST NOT be set. For unsuccessful export operations, @code error.type @endcode MUST
-  contain a relevant failure cause. <p> histogram
- */
-static constexpr const char *kMetricOtelSdkExporterOperationDuration =
-    "otel.sdk.exporter.operation.duration";
-static constexpr const char *descrMetricOtelSdkExporterOperationDuration =
-    "The duration of exporting a batch of telemetry records.";
-static constexpr const char *unitMetricOtelSdkExporterOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricOtelSdkExporterOperationDuration,
-                                      descrMetricOtelSdkExporterOperationDuration,
-                                      unitMetricOtelSdkExporterOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricOtelSdkExporterOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricOtelSdkExporterOperationDuration,
-                                      descrMetricOtelSdkExporterOperationDuration,
-                                      unitMetricOtelSdkExporterOperationDuration);
-}
-
-/**
-  The number of spans for which the export has finished, either successful or failed
-  <p>
-  For successful exports, @code error.type @endcode MUST NOT be set. For failed exports, @code
-  error.type @endcode MUST contain the failure cause. For exporters with partial success semantics
-  (e.g. OTLP with @code rejected_spans @endcode), rejected spans MUST count as failed and only
-  non-rejected spans count as success. If no rejection reason is available, @code rejected @endcode
-  SHOULD be used as value for @code error.type @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkExporterSpanExported = "otel.sdk.exporter.span.exported";
-static constexpr const char *descrMetricOtelSdkExporterSpanExported =
-    "The number of spans for which the export has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkExporterSpanExported = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanExported(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkExporterSpanExported,
-                                    descrMetricOtelSdkExporterSpanExported,
-                                    unitMetricOtelSdkExporterSpanExported);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkExporterSpanExported,
-                                    descrMetricOtelSdkExporterSpanExported,
-                                    unitMetricOtelSdkExporterSpanExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanExported(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkExporterSpanExported,
-                                             descrMetricOtelSdkExporterSpanExported,
-                                             unitMetricOtelSdkExporterSpanExported);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanExported(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkExporterSpanExported,
-                                              descrMetricOtelSdkExporterSpanExported,
-                                              unitMetricOtelSdkExporterSpanExported);
-}
-
-/**
-  Deprecated, use @code otel.sdk.exporter.span.exported @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.exporter.span.exported @endcode.", "reason": "renamed",
-  "renamed_to": "otel.sdk.exporter.span.exported"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkExporterSpanExportedCount =
-    "otel.sdk.exporter.span.exported.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricOtelSdkExporterSpanExportedCount =
-    "Deprecated, use `otel.sdk.exporter.span.exported` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkExporterSpanExportedCount =
-    "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                         descrMetricOtelSdkExporterSpanExportedCount,
-                                         unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                          descrMetricOtelSdkExporterSpanExportedCount,
-                                          unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                                   descrMetricOtelSdkExporterSpanExportedCount,
-                                                   unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                                    descrMetricOtelSdkExporterSpanExportedCount,
-                                                    unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-/**
-  The number of spans which were passed to the exporter, but that have not been exported yet
-  (neither successful, nor failed) <p> For successful exports, @code error.type @endcode MUST NOT be
-  set. For failed exports, @code error.type @endcode MUST contain the failure cause. <p>
-  updowncounter
- */
-static constexpr const char *kMetricOtelSdkExporterSpanInflight = "otel.sdk.exporter.span.inflight";
-static constexpr const char *descrMetricOtelSdkExporterSpanInflight =
-    "The number of spans which were passed to the exporter, but that have not been exported yet "
-    "(neither successful, nor failed)";
-static constexpr const char *unitMetricOtelSdkExporterSpanInflight = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterSpanInflight,
-                                         descrMetricOtelSdkExporterSpanInflight,
-                                         unitMetricOtelSdkExporterSpanInflight);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterSpanInflight,
-                                          descrMetricOtelSdkExporterSpanInflight,
-                                          unitMetricOtelSdkExporterSpanInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanInflight(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterSpanInflight,
-                                                   descrMetricOtelSdkExporterSpanInflight,
-                                                   unitMetricOtelSdkExporterSpanInflight);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanInflight(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterSpanInflight,
-                                                    descrMetricOtelSdkExporterSpanInflight,
-                                                    unitMetricOtelSdkExporterSpanInflight);
-}
-
-/**
-  Deprecated, use @code otel.sdk.exporter.span.inflight @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.exporter.span.inflight @endcode.", "reason": "renamed",
-  "renamed_to": "otel.sdk.exporter.span.inflight"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkExporterSpanInflightCount =
-    "otel.sdk.exporter.span.inflight.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricOtelSdkExporterSpanInflightCount =
-    "Deprecated, use `otel.sdk.exporter.span.inflight` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkExporterSpanInflightCount =
-    "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                         descrMetricOtelSdkExporterSpanInflightCount,
-                                         unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                          descrMetricOtelSdkExporterSpanInflightCount,
-                                          unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                                   descrMetricOtelSdkExporterSpanInflightCount,
-                                                   unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                                    descrMetricOtelSdkExporterSpanInflightCount,
-                                                    unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-/**
-  The number of logs submitted to enabled SDK Loggers
-  <p>
-  counter
- */
-static constexpr const char *kMetricOtelSdkLogCreated = "otel.sdk.log.created";
-static constexpr const char *descrMetricOtelSdkLogCreated =
-    "The number of logs submitted to enabled SDK Loggers";
-static constexpr const char *unitMetricOtelSdkLogCreated = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricOtelSdkLogCreated(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkLogCreated, descrMetricOtelSdkLogCreated,
-                                    unitMetricOtelSdkLogCreated);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricOtelSdkLogCreated(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkLogCreated, descrMetricOtelSdkLogCreated,
-                                    unitMetricOtelSdkLogCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkLogCreated(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkLogCreated, descrMetricOtelSdkLogCreated,
-                                             unitMetricOtelSdkLogCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkLogCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricOtelSdkLogCreated, descrMetricOtelSdkLogCreated, unitMetricOtelSdkLogCreated);
-}
-
-/**
-  The duration of the collect operation of the metric reader.
-  <p>
-  For successful collections, @code error.type @endcode MUST NOT be set. For failed collections,
-  @code error.type @endcode SHOULD contain the failure cause. It can happen that metrics collection
-  is successful for some MetricProducers, while others fail. In that case @code error.type @endcode
-  SHOULD be set to any of the failure causes. <p> histogram
- */
-static constexpr const char *kMetricOtelSdkMetricReaderCollectionDuration =
-    "otel.sdk.metric_reader.collection.duration";
-static constexpr const char *descrMetricOtelSdkMetricReaderCollectionDuration =
-    "The duration of the collect operation of the metric reader.";
-static constexpr const char *unitMetricOtelSdkMetricReaderCollectionDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricOtelSdkMetricReaderCollectionDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricOtelSdkMetricReaderCollectionDuration,
-                                      descrMetricOtelSdkMetricReaderCollectionDuration,
-                                      unitMetricOtelSdkMetricReaderCollectionDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricOtelSdkMetricReaderCollectionDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricOtelSdkMetricReaderCollectionDuration,
-                                      descrMetricOtelSdkMetricReaderCollectionDuration,
-                                      unitMetricOtelSdkMetricReaderCollectionDuration);
-}
-
-/**
-  The number of log records for which the processing has finished, either successful or failed
-  <p>
-  For successful processing, @code error.type @endcode MUST NOT be set. For failed processing, @code
-  error.type @endcode MUST contain the failure cause. For the SDK Simple and Batching Log Record
-  Processor a log record is considered to be processed already when it has been submitted to the
-  exporter, not when the corresponding export call has finished. <p> counter
- */
-static constexpr const char *kMetricOtelSdkProcessorLogProcessed =
-    "otel.sdk.processor.log.processed";
-static constexpr const char *descrMetricOtelSdkProcessorLogProcessed =
-    "The number of log records for which the processing has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkProcessorLogProcessed = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkProcessorLogProcessed(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkProcessorLogProcessed,
-                                    descrMetricOtelSdkProcessorLogProcessed,
-                                    unitMetricOtelSdkProcessorLogProcessed);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorLogProcessed(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkProcessorLogProcessed,
-                                    descrMetricOtelSdkProcessorLogProcessed,
-                                    unitMetricOtelSdkProcessorLogProcessed);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorLogProcessed(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkProcessorLogProcessed,
-                                             descrMetricOtelSdkProcessorLogProcessed,
-                                             unitMetricOtelSdkProcessorLogProcessed);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorLogProcessed(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkProcessorLogProcessed,
-                                              descrMetricOtelSdkProcessorLogProcessed,
-                                              unitMetricOtelSdkProcessorLogProcessed);
-}
-
-/**
-  The maximum number of log records the queue of a given instance of an SDK Log Record processor can
-  hold <p> Only applies to Log Record processors which use a queue, e.g. the SDK Batching Log Record
-  Processor. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorLogQueueCapacity =
-    "otel.sdk.processor.log.queue.capacity";
-static constexpr const char *descrMetricOtelSdkProcessorLogQueueCapacity =
-    "The maximum number of log records the queue of a given instance of an SDK Log Record "
-    "processor can hold";
-static constexpr const char *unitMetricOtelSdkProcessorLogQueueCapacity = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorLogQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorLogQueueCapacity,
-                                         descrMetricOtelSdkProcessorLogQueueCapacity,
-                                         unitMetricOtelSdkProcessorLogQueueCapacity);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorLogQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorLogQueueCapacity,
-                                          descrMetricOtelSdkProcessorLogQueueCapacity,
-                                          unitMetricOtelSdkProcessorLogQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorLogQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorLogQueueCapacity,
-                                                   descrMetricOtelSdkProcessorLogQueueCapacity,
-                                                   unitMetricOtelSdkProcessorLogQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorLogQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorLogQueueCapacity,
-                                                    descrMetricOtelSdkProcessorLogQueueCapacity,
-                                                    unitMetricOtelSdkProcessorLogQueueCapacity);
-}
-
-/**
-  The number of log records in the queue of a given instance of an SDK log processor
-  <p>
-  Only applies to log record processors which use a queue, e.g. the SDK Batching Log Record
-  Processor. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorLogQueueSize =
-    "otel.sdk.processor.log.queue.size";
-static constexpr const char *descrMetricOtelSdkProcessorLogQueueSize =
-    "The number of log records in the queue of a given instance of an SDK log processor";
-static constexpr const char *unitMetricOtelSdkProcessorLogQueueSize = "{log_record}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorLogQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorLogQueueSize,
-                                         descrMetricOtelSdkProcessorLogQueueSize,
-                                         unitMetricOtelSdkProcessorLogQueueSize);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorLogQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorLogQueueSize,
-                                          descrMetricOtelSdkProcessorLogQueueSize,
-                                          unitMetricOtelSdkProcessorLogQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorLogQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorLogQueueSize,
-                                                   descrMetricOtelSdkProcessorLogQueueSize,
-                                                   unitMetricOtelSdkProcessorLogQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorLogQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorLogQueueSize,
-                                                    descrMetricOtelSdkProcessorLogQueueSize,
-                                                    unitMetricOtelSdkProcessorLogQueueSize);
-}
-
-/**
-  The number of spans for which the processing has finished, either successful or failed
-  <p>
-  For successful processing, @code error.type @endcode MUST NOT be set. For failed processing, @code
-  error.type @endcode MUST contain the failure cause. For the SDK Simple and Batching Span Processor
-  a span is considered to be processed already when it has been submitted to the exporter, not when
-  the corresponding export call has finished. <p> counter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanProcessed =
-    "otel.sdk.processor.span.processed";
-static constexpr const char *descrMetricOtelSdkProcessorSpanProcessed =
-    "The number of spans for which the processing has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkProcessorSpanProcessed = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkProcessorSpanProcessed,
-                                    descrMetricOtelSdkProcessorSpanProcessed,
-                                    unitMetricOtelSdkProcessorSpanProcessed);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkProcessorSpanProcessed,
-                                    descrMetricOtelSdkProcessorSpanProcessed,
-                                    unitMetricOtelSdkProcessorSpanProcessed);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkProcessorSpanProcessed,
-                                             descrMetricOtelSdkProcessorSpanProcessed,
-                                             unitMetricOtelSdkProcessorSpanProcessed);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanProcessed(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkProcessorSpanProcessed,
-                                              descrMetricOtelSdkProcessorSpanProcessed,
-                                              unitMetricOtelSdkProcessorSpanProcessed);
-}
-
-/**
-  Deprecated, use @code otel.sdk.processor.span.processed @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.processor.span.processed @endcode.", "reason": "renamed",
-  "renamed_to": "otel.sdk.processor.span.processed"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkProcessorSpanProcessedCount =
-    "otel.sdk.processor.span.processed.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricOtelSdkProcessorSpanProcessedCount =
-        "Deprecated, use `otel.sdk.processor.span.processed` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkProcessorSpanProcessedCount =
-    "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                         descrMetricOtelSdkProcessorSpanProcessedCount,
-                                         unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                          descrMetricOtelSdkProcessorSpanProcessedCount,
-                                          unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                                   descrMetricOtelSdkProcessorSpanProcessedCount,
-                                                   unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                                    descrMetricOtelSdkProcessorSpanProcessedCount,
-                                                    unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-/**
-  The maximum number of spans the queue of a given instance of an SDK span processor can hold
-  <p>
-  Only applies to span processors which use a queue, e.g. the SDK Batching Span Processor.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanQueueCapacity =
-    "otel.sdk.processor.span.queue.capacity";
-static constexpr const char *descrMetricOtelSdkProcessorSpanQueueCapacity =
-    "The maximum number of spans the queue of a given instance of an SDK span processor can hold";
-static constexpr const char *unitMetricOtelSdkProcessorSpanQueueCapacity = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                         descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                         unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                          descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                          unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                                   descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                                   unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                                    descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                                    unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-/**
-  The number of spans in the queue of a given instance of an SDK span processor
-  <p>
-  Only applies to span processors which use a queue, e.g. the SDK Batching Span Processor.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanQueueSize =
-    "otel.sdk.processor.span.queue.size";
-static constexpr const char *descrMetricOtelSdkProcessorSpanQueueSize =
-    "The number of spans in the queue of a given instance of an SDK span processor";
-static constexpr const char *unitMetricOtelSdkProcessorSpanQueueSize = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                         descrMetricOtelSdkProcessorSpanQueueSize,
-                                         unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                          descrMetricOtelSdkProcessorSpanQueueSize,
-                                          unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                                   descrMetricOtelSdkProcessorSpanQueueSize,
-                                                   unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                                    descrMetricOtelSdkProcessorSpanQueueSize,
-                                                    unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-/**
-  The number of created spans for which the end operation was called
-  <p>
-  For spans with @code recording=true @endcode: Implementations MUST record both @code
-  otel.sdk.span.live @endcode and @code otel.sdk.span.ended @endcode. For spans with @code
-  recording=false @endcode: If implementations decide to record this metric, they MUST also record
-  @code otel.sdk.span.live @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkSpanEnded = "otel.sdk.span.ended";
-static constexpr const char *descrMetricOtelSdkSpanEnded =
-    "The number of created spans for which the end operation was called";
-static constexpr const char *unitMetricOtelSdkSpanEnded = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricOtelSdkSpanEnded(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkSpanEnded, descrMetricOtelSdkSpanEnded,
-                                    unitMetricOtelSdkSpanEnded);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricOtelSdkSpanEnded(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkSpanEnded, descrMetricOtelSdkSpanEnded,
-                                    unitMetricOtelSdkSpanEnded);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanEnded(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkSpanEnded, descrMetricOtelSdkSpanEnded,
-                                             unitMetricOtelSdkSpanEnded);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanEnded(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkSpanEnded, descrMetricOtelSdkSpanEnded,
-                                              unitMetricOtelSdkSpanEnded);
-}
-
-/**
-  Deprecated, use @code otel.sdk.span.ended @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.span.ended @endcode.", "reason": "renamed", "renamed_to":
-  "otel.sdk.span.ended"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkSpanEndedCount =
-    "otel.sdk.span.ended.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricOtelSdkSpanEndedCount =
-    "Deprecated, use `otel.sdk.span.ended` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkSpanEndedCount = "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkSpanEndedCount, descrMetricOtelSdkSpanEndedCount,
-                                    unitMetricOtelSdkSpanEndedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkSpanEndedCount, descrMetricOtelSdkSpanEndedCount,
-                                    unitMetricOtelSdkSpanEndedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkSpanEndedCount,
-                                             descrMetricOtelSdkSpanEndedCount,
-                                             unitMetricOtelSdkSpanEndedCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkSpanEndedCount,
-                                              descrMetricOtelSdkSpanEndedCount,
-                                              unitMetricOtelSdkSpanEndedCount);
-}
-
-/**
-  The number of created spans for which the end operation has not been called yet
-  <p>
-  For spans with @code recording=true @endcode: Implementations MUST record both @code
-  otel.sdk.span.live @endcode and @code otel.sdk.span.ended @endcode. For spans with @code
-  recording=false @endcode: If implementations decide to record this metric, they MUST also record
-  @code otel.sdk.span.ended @endcode. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkSpanLive = "otel.sdk.span.live";
-static constexpr const char *descrMetricOtelSdkSpanLive =
-    "The number of created spans for which the end operation has not been called yet";
-static constexpr const char *unitMetricOtelSdkSpanLive = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkSpanLive(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkSpanLive, descrMetricOtelSdkSpanLive,
-                                         unitMetricOtelSdkSpanLive);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkSpanLive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkSpanLive, descrMetricOtelSdkSpanLive,
-                                          unitMetricOtelSdkSpanLive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanLive(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricOtelSdkSpanLive, descrMetricOtelSdkSpanLive, unitMetricOtelSdkSpanLive);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanLive(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricOtelSdkSpanLive, descrMetricOtelSdkSpanLive, unitMetricOtelSdkSpanLive);
-}
-
-/**
-  Deprecated, use @code otel.sdk.span.live @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code otel.sdk.span.live @endcode.", "reason": "renamed", "renamed_to":
-  "otel.sdk.span.live"} <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricOtelSdkSpanLiveCount =
-    "otel.sdk.span.live.count";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricOtelSdkSpanLiveCount =
-    "Deprecated, use `otel.sdk.span.live` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricOtelSdkSpanLiveCount = "{span}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-}  // namespace otel
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/other_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/other_attributes.h
deleted file mode 100644
index ab0939606..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/other_attributes.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace other
-{
-
-/**
-  Deprecated, use @code db.client.connection.state @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.state @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.state"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state";
-
-namespace StateValues
-{
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-}  // namespace StateValues
-
-}  // namespace other
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/peer_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/peer_attributes.h
deleted file mode 100644
index acc6621d2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/peer_attributes.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace peer
-{
-
-/**
-  The <a href="/docs/resource/README.md#service">@code service.name @endcode</a> of the remote
-  service. SHOULD be equal to the actual @code service.name @endcode resource attribute of the
-  remote service if any.
- */
-static constexpr const char *kPeerService = "peer.service";
-
-}  // namespace peer
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/pool_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/pool_attributes.h
deleted file mode 100644
index f2ecb1246..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/pool_attributes.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace pool
-{
-
-/**
-  Deprecated, use @code db.client.connection.pool.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code db.client.connection.pool.name @endcode.", "reason": "renamed",
-  "renamed_to": "db.client.connection.pool.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name";
-
-}  // namespace pool
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/process_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/process_attributes.h
deleted file mode 100644
index 7cee8fc70..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/process_attributes.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace process
-{
-
-/**
-  Length of the process.command_args array
-  <p>
-  This field can be useful for querying or performing bucket analysis on how many arguments were
-  provided to start a process. More arguments may be an indication of suspicious activity.
- */
-static constexpr const char *kProcessArgsCount = "process.args_count";
-
-/**
-  The command used to launch the process (i.e. the command name). On Linux based systems, can be set
-  to the zeroth string in @code proc/[pid]/cmdline @endcode. On Windows, can be set to the first
-  parameter extracted from @code GetCommandLineW @endcode.
- */
-static constexpr const char *kProcessCommand = "process.command";
-
-/**
-  All the command arguments (including the command/executable itself) as received by the process. On
-  Linux-based systems (and some other Unixoid systems supporting procfs), can be set according to
-  the list of null-delimited strings extracted from @code proc/[pid]/cmdline @endcode. For
-  libc-based executables, this would be the full argv vector passed to @code main @endcode. SHOULD
-  NOT be collected by default unless there is sanitization that excludes sensitive data.
- */
-static constexpr const char *kProcessCommandArgs = "process.command_args";
-
-/**
-  The full command used to launch the process as a single string representing the full command. On
-  Windows, can be set to the result of @code GetCommandLineW @endcode. Do not set this if you have
-  to assemble it just for monitoring; use @code process.command_args @endcode instead. SHOULD NOT be
-  collected by default unless there is sanitization that excludes sensitive data.
- */
-static constexpr const char *kProcessCommandLine = "process.command_line";
-
-/**
-  Specifies whether the context switches for this data point were voluntary or involuntary.
- */
-static constexpr const char *kProcessContextSwitchType = "process.context_switch_type";
-
-/**
-  Deprecated, use @code cpu.mode @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state";
-
-/**
-  The date and time the process was created, in ISO 8601 format.
- */
-static constexpr const char *kProcessCreationTime = "process.creation.time";
-
-/**
-  Process environment variables, <key> being the environment variable name, the value being the
-  environment variable value. <p> Examples: <ul> <li>an environment variable @code USER @endcode
-  with value @code "ubuntu" @endcode SHOULD be recorded as the @code
-  process.environment_variable.USER @endcode attribute with value @code "ubuntu" @endcode.</li>
-    <li>an environment variable @code PATH @endcode with value @code "/usr/local/bin:/usr/bin"
-  @endcode SHOULD be recorded as the @code process.environment_variable.PATH @endcode attribute with
-  value @code "/usr/local/bin:/usr/bin" @endcode.</li>
-  </ul>
- */
-static constexpr const char *kProcessEnvironmentVariable = "process.environment_variable";
-
-/**
-  The GNU build ID as found in the @code .note.gnu.build-id @endcode ELF section (hex string).
- */
-static constexpr const char *kProcessExecutableBuildIdGnu = "process.executable.build_id.gnu";
-
-/**
-  The Go build ID as retrieved by @code go tool buildid <go executable> @endcode.
- */
-static constexpr const char *kProcessExecutableBuildIdGo = "process.executable.build_id.go";
-
-/**
-  Profiling specific build ID for executables. See the OTel specification for Profiles for more
-  information.
- */
-static constexpr const char *kProcessExecutableBuildIdHtlhash =
-    "process.executable.build_id.htlhash";
-
-/**
-  "Deprecated, use @code process.executable.build_id.htlhash @endcode instead."
-
-  @deprecated
-  {"note": "Replaced by @code process.executable.build_id.htlhash @endcode.", "reason": "renamed",
-  "renamed_to": "process.executable.build_id.htlhash"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessExecutableBuildIdProfiling =
-    "process.executable.build_id.profiling";
-
-/**
-  The name of the process executable. On Linux based systems, this SHOULD be set to the base name of
-  the target of @code /proc/[pid]/exe @endcode. On Windows, this SHOULD be set to the base name of
-  @code GetProcessImageFileNameW @endcode.
- */
-static constexpr const char *kProcessExecutableName = "process.executable.name";
-
-/**
-  The full path to the process executable. On Linux based systems, can be set to the target of @code
-  proc/[pid]/exe @endcode. On Windows, can be set to the result of @code GetProcessImageFileNameW
-  @endcode.
- */
-static constexpr const char *kProcessExecutablePath = "process.executable.path";
-
-/**
-  The exit code of the process.
- */
-static constexpr const char *kProcessExitCode = "process.exit.code";
-
-/**
-  The date and time the process exited, in ISO 8601 format.
- */
-static constexpr const char *kProcessExitTime = "process.exit.time";
-
-/**
-  The PID of the process's group leader. This is also the process group ID (PGID) of the process.
- */
-static constexpr const char *kProcessGroupLeaderPid = "process.group_leader.pid";
-
-/**
-  Whether the process is connected to an interactive shell.
- */
-static constexpr const char *kProcessInteractive = "process.interactive";
-
-/**
-  The control group associated with the process.
-  <p>
-  Control groups (cgroups) are a kernel feature used to organize and manage process resources. This
-  attribute provides the path(s) to the cgroup(s) associated with the process, which should match
-  the contents of the <a
-  href="https://man7.org/linux/man-pages/man7/cgroups.7.html">/proc/[PID]/cgroup</a> file.
- */
-static constexpr const char *kProcessLinuxCgroup = "process.linux.cgroup";
-
-/**
-  The username of the user that owns the process.
- */
-static constexpr const char *kProcessOwner = "process.owner";
-
-/**
-  The type of page fault for this data point. Type @code major @endcode is for major/hard page
-  faults, and @code minor @endcode is for minor/soft page faults.
- */
-static constexpr const char *kProcessPagingFaultType = "process.paging.fault_type";
-
-/**
-  Parent Process identifier (PPID).
- */
-static constexpr const char *kProcessParentPid = "process.parent_pid";
-
-/**
-  Process identifier (PID).
- */
-static constexpr const char *kProcessPid = "process.pid";
-
-/**
-  The real user ID (RUID) of the process.
- */
-static constexpr const char *kProcessRealUserId = "process.real_user.id";
-
-/**
-  The username of the real user of the process.
- */
-static constexpr const char *kProcessRealUserName = "process.real_user.name";
-
-/**
-  An additional description about the runtime of the process, for example a specific vendor
-  customization of the runtime environment.
- */
-static constexpr const char *kProcessRuntimeDescription = "process.runtime.description";
-
-/**
-  The name of the runtime of this process.
- */
-static constexpr const char *kProcessRuntimeName = "process.runtime.name";
-
-/**
-  The version of the runtime of this process, as returned by the runtime without modification.
- */
-static constexpr const char *kProcessRuntimeVersion = "process.runtime.version";
-
-/**
-  The saved user ID (SUID) of the process.
- */
-static constexpr const char *kProcessSavedUserId = "process.saved_user.id";
-
-/**
-  The username of the saved user.
- */
-static constexpr const char *kProcessSavedUserName = "process.saved_user.name";
-
-/**
-  The PID of the process's session leader. This is also the session ID (SID) of the process.
- */
-static constexpr const char *kProcessSessionLeaderPid = "process.session_leader.pid";
-
-/**
-  Process title (proctitle)
-  <p>
-  In many Unix-like systems, process title (proctitle), is the string that represents the name or
-  command line of a running process, displayed by system monitoring tools like ps, top, and htop.
- */
-static constexpr const char *kProcessTitle = "process.title";
-
-/**
-  The effective user ID (EUID) of the process.
- */
-static constexpr const char *kProcessUserId = "process.user.id";
-
-/**
-  The username of the effective user of the process.
- */
-static constexpr const char *kProcessUserName = "process.user.name";
-
-/**
-  Virtual process identifier.
-  <p>
-  The process ID within a PID namespace. This is not necessarily unique across all processes on the
-  host but it is unique within the process namespace that the process exists within.
- */
-static constexpr const char *kProcessVpid = "process.vpid";
-
-/**
-  The working directory of the process.
- */
-static constexpr const char *kProcessWorkingDirectory = "process.working_directory";
-
-namespace ProcessContextSwitchTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kVoluntary = "voluntary";
-
-/**
-  none
- */
-static constexpr const char *kInvoluntary = "involuntary";
-
-}  // namespace ProcessContextSwitchTypeValues
-
-namespace ProcessCpuStateValues
-{
-/**
-  none
- */
-static constexpr const char *kSystem = "system";
-
-/**
-  none
- */
-static constexpr const char *kUser = "user";
-
-/**
-  none
- */
-static constexpr const char *kWait = "wait";
-
-}  // namespace ProcessCpuStateValues
-
-namespace ProcessPagingFaultTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kMajor = "major";
-
-/**
-  none
- */
-static constexpr const char *kMinor = "minor";
-
-}  // namespace ProcessPagingFaultTypeValues
-
-}  // namespace process
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/process_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/process_metrics.h
deleted file mode 100644
index 0f1a783f7..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/process_metrics.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace process
-{
-
-/**
-  Number of times the process has been context switched.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessContextSwitches = "process.context_switches";
-static constexpr const char *descrMetricProcessContextSwitches =
-    "Number of times the process has been context switched.";
-static constexpr const char *unitMetricProcessContextSwitches = "{context_switch}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessContextSwitches,
-                                    descrMetricProcessContextSwitches,
-                                    unitMetricProcessContextSwitches);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessContextSwitches,
-                                    descrMetricProcessContextSwitches,
-                                    unitMetricProcessContextSwitches);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessContextSwitches,
-                                             descrMetricProcessContextSwitches,
-                                             unitMetricProcessContextSwitches);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessContextSwitches,
-                                              descrMetricProcessContextSwitches,
-                                              unitMetricProcessContextSwitches);
-}
-
-/**
-  Total CPU seconds broken down by different states.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessCpuTime = "process.cpu.time";
-static constexpr const char *descrMetricProcessCpuTime =
-    "Total CPU seconds broken down by different states.";
-static constexpr const char *unitMetricProcessCpuTime = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                    unitMetricProcessCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                    unitMetricProcessCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                             unitMetricProcessCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                              unitMetricProcessCpuTime);
-}
-
-/**
-  Difference in process.cpu.time since the last measurement, divided by the elapsed time and number
-  of CPUs available to the process. <p> gauge
- */
-static constexpr const char *kMetricProcessCpuUtilization = "process.cpu.utilization";
-static constexpr const char *descrMetricProcessCpuUtilization =
-    "Difference in process.cpu.time since the last measurement, divided by the elapsed time and "
-    "number of CPUs available to the process.";
-static constexpr const char *unitMetricProcessCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricProcessCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricProcessCpuUtilization, descrMetricProcessCpuUtilization,
-                                 unitMetricProcessCpuUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricProcessCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricProcessCpuUtilization, descrMetricProcessCpuUtilization,
-                                  unitMetricProcessCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricProcessCpuUtilization,
-                                           descrMetricProcessCpuUtilization,
-                                           unitMetricProcessCpuUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricProcessCpuUtilization,
-                                            descrMetricProcessCpuUtilization,
-                                            unitMetricProcessCpuUtilization);
-}
-
-/**
-  Disk bytes transferred.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessDiskIo     = "process.disk.io";
-static constexpr const char *descrMetricProcessDiskIo = "Disk bytes transferred.";
-static constexpr const char *unitMetricProcessDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                    unitMetricProcessDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                    unitMetricProcessDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                             unitMetricProcessDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                              unitMetricProcessDiskIo);
-}
-
-/**
-  The amount of physical memory in use.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricProcessMemoryUsage = "process.memory.usage";
-static constexpr const char *descrMetricProcessMemoryUsage =
-    "The amount of physical memory in use.";
-static constexpr const char *unitMetricProcessMemoryUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage,
-                                         unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage,
-                                          unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage, unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage, unitMetricProcessMemoryUsage);
-}
-
-/**
-  The amount of committed virtual memory.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricProcessMemoryVirtual = "process.memory.virtual";
-static constexpr const char *descrMetricProcessMemoryVirtual =
-    "The amount of committed virtual memory.";
-static constexpr const char *unitMetricProcessMemoryVirtual = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-/**
-  Network bytes transferred.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessNetworkIo     = "process.network.io";
-static constexpr const char *descrMetricProcessNetworkIo = "Network bytes transferred.";
-static constexpr const char *unitMetricProcessNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                    unitMetricProcessNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                    unitMetricProcessNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                             unitMetricProcessNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                              unitMetricProcessNetworkIo);
-}
-
-/**
-  Number of file descriptors in use by the process.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricProcessOpenFileDescriptorCount =
-    "process.open_file_descriptor.count";
-static constexpr const char *descrMetricProcessOpenFileDescriptorCount =
-    "Number of file descriptors in use by the process.";
-static constexpr const char *unitMetricProcessOpenFileDescriptorCount = "{file_descriptor}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                         descrMetricProcessOpenFileDescriptorCount,
-                                         unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                          descrMetricProcessOpenFileDescriptorCount,
-                                          unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                                   descrMetricProcessOpenFileDescriptorCount,
-                                                   unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                                    descrMetricProcessOpenFileDescriptorCount,
-                                                    unitMetricProcessOpenFileDescriptorCount);
-}
-
-/**
-  Number of page faults the process has made.
-  <p>
-  counter
- */
-static constexpr const char *kMetricProcessPagingFaults = "process.paging.faults";
-static constexpr const char *descrMetricProcessPagingFaults =
-    "Number of page faults the process has made.";
-static constexpr const char *unitMetricProcessPagingFaults = "{fault}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessPagingFaults, descrMetricProcessPagingFaults,
-                                    unitMetricProcessPagingFaults);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessPagingFaults, descrMetricProcessPagingFaults,
-                                    unitMetricProcessPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricProcessPagingFaults, descrMetricProcessPagingFaults, unitMetricProcessPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricProcessPagingFaults, descrMetricProcessPagingFaults, unitMetricProcessPagingFaults);
-}
-
-/**
-  Process threads count.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricProcessThreadCount     = "process.thread.count";
-static constexpr const char *descrMetricProcessThreadCount = "Process threads count.";
-static constexpr const char *unitMetricProcessThreadCount  = "{thread}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessThreadCount, descrMetricProcessThreadCount,
-                                         unitMetricProcessThreadCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessThreadCount, descrMetricProcessThreadCount,
-                                          unitMetricProcessThreadCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
-}
-
-/**
-  The time the process has been running.
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricProcessUptime     = "process.uptime";
-static constexpr const char *descrMetricProcessUptime = "The time the process has been running.";
-static constexpr const char *unitMetricProcessUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                 unitMetricProcessUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                  unitMetricProcessUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                           unitMetricProcessUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                            unitMetricProcessUptime);
-}
-
-}  // namespace process
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/profile_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/profile_attributes.h
deleted file mode 100644
index 0e022c433..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/profile_attributes.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace profile
-{
-
-/**
-  Describes the interpreter or compiler of a single frame.
- */
-static constexpr const char *kProfileFrameType = "profile.frame.type";
-
-namespace ProfileFrameTypeValues
-{
-/**
-  <a href="https://wikipedia.org/wiki/.NET">.NET</a>
- */
-static constexpr const char *kDotnet = "dotnet";
-
-/**
-  <a href="https://wikipedia.org/wiki/Java_virtual_machine">JVM</a>
- */
-static constexpr const char *kJvm = "jvm";
-
-/**
-  <a href="https://wikipedia.org/wiki/Kernel_(operating_system)">Kernel</a>
- */
-static constexpr const char *kKernel = "kernel";
-
-/**
-  Can be one of but not limited to <a
-  href="https://wikipedia.org/wiki/C_(programming_language)">C</a>, <a
-  href="https://wikipedia.org/wiki/C%2B%2B">C++</a>, <a
-  href="https://wikipedia.org/wiki/Go_(programming_language)">Go</a> or <a
-  href="https://wikipedia.org/wiki/Rust_(programming_language)">Rust</a>. If possible, a more
-  precise value MUST be used.
- */
-static constexpr const char *kNative = "native";
-
-/**
-  <a href="https://wikipedia.org/wiki/Perl">Perl</a>
- */
-static constexpr const char *kPerl = "perl";
-
-/**
-  <a href="https://wikipedia.org/wiki/PHP">PHP</a>
- */
-static constexpr const char *kPhp = "php";
-
-/**
-  <a href="https://wikipedia.org/wiki/Python_(programming_language)">Python</a>
- */
-static constexpr const char *kCpython = "cpython";
-
-/**
-  <a href="https://wikipedia.org/wiki/Ruby_(programming_language)">Ruby</a>
- */
-static constexpr const char *kRuby = "ruby";
-
-/**
-  <a href="https://wikipedia.org/wiki/V8_(JavaScript_engine)">V8JS</a>
- */
-static constexpr const char *kV8js = "v8js";
-
-/**
-  <a href="https://en.wikipedia.org/wiki/BEAM_(Erlang_virtual_machine)">Erlang</a>
- */
-static constexpr const char *kBeam = "beam";
-
-/**
-  <a href="https://wikipedia.org/wiki/Go_(programming_language)">Go</a>,
- */
-static constexpr const char *kGo = "go";
-
-/**
-  <a href="https://wikipedia.org/wiki/Rust_(programming_language)">Rust</a>
- */
-static constexpr const char *kRust = "rust";
-
-}  // namespace ProfileFrameTypeValues
-
-}  // namespace profile
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/rpc_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/rpc_attributes.h
deleted file mode 100644
index daf36ce67..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/rpc_attributes.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace rpc
-{
-
-/**
-  The <a href="https://connectrpc.com//docs/protocol/#error-codes">error codes</a> of the Connect
-  request. Error codes are always string values.
- */
-static constexpr const char *kRpcConnectRpcErrorCode = "rpc.connect_rpc.error_code";
-
-/**
-  Connect request metadata, @code <key> @endcode being the normalized Connect Metadata key
-  (lowercase), the value being the metadata values. <p> Instrumentations SHOULD require an explicit
-  configuration of which metadata values are to be captured. Including all request metadata values
-  can be a security risk - explicit configuration helps avoid leaking sensitive information. <p> For
-  example, a property @code my-custom-key @endcode with value @code ["1.2.3.4", "1.2.3.5"] @endcode
-  SHOULD be recorded as the @code rpc.connect_rpc.request.metadata.my-custom-key @endcode attribute
-  with value @code ["1.2.3.4", "1.2.3.5"] @endcode
- */
-static constexpr const char *kRpcConnectRpcRequestMetadata = "rpc.connect_rpc.request.metadata";
-
-/**
-  Connect response metadata, @code <key> @endcode being the normalized Connect Metadata key
-  (lowercase), the value being the metadata values. <p> Instrumentations SHOULD require an explicit
-  configuration of which metadata values are to be captured. Including all response metadata values
-  can be a security risk - explicit configuration helps avoid leaking sensitive information. <p> For
-  example, a property @code my-custom-key @endcode with value @code "attribute_value" @endcode
-  SHOULD be recorded as the @code rpc.connect_rpc.response.metadata.my-custom-key @endcode attribute
-  with value @code ["attribute_value"] @endcode
- */
-static constexpr const char *kRpcConnectRpcResponseMetadata = "rpc.connect_rpc.response.metadata";
-
-/**
-  gRPC request metadata, @code <key> @endcode being the normalized gRPC Metadata key (lowercase),
-  the value being the metadata values. <p> Instrumentations SHOULD require an explicit configuration
-  of which metadata values are to be captured. Including all request metadata values can be a
-  security risk - explicit configuration helps avoid leaking sensitive information. <p> For example,
-  a property @code my-custom-key @endcode with value @code ["1.2.3.4", "1.2.3.5"] @endcode SHOULD be
-  recorded as
-  @code rpc.grpc.request.metadata.my-custom-key @endcode attribute with value @code ["1.2.3.4",
-  "1.2.3.5"] @endcode
- */
-static constexpr const char *kRpcGrpcRequestMetadata = "rpc.grpc.request.metadata";
-
-/**
-  gRPC response metadata, @code <key> @endcode being the normalized gRPC Metadata key (lowercase),
-  the value being the metadata values. <p> Instrumentations SHOULD require an explicit configuration
-  of which metadata values are to be captured. Including all response metadata values can be a
-  security risk - explicit configuration helps avoid leaking sensitive information. <p> For example,
-  a property @code my-custom-key @endcode with value @code ["attribute_value"] @endcode SHOULD be
-  recorded as the @code rpc.grpc.response.metadata.my-custom-key @endcode attribute with value @code
-  ["attribute_value"] @endcode
- */
-static constexpr const char *kRpcGrpcResponseMetadata = "rpc.grpc.response.metadata";
-
-/**
-  The <a href="https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md">numeric status code</a>
-  of the gRPC request.
- */
-static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
-
-/**
-  @code error.code @endcode property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
-
-/**
-  @code error.message @endcode property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
-
-/**
-  @code id @endcode property of request or response. Since protocol allows id to be int, string,
-  @code null @endcode or missing (for notifications), value is expected to be cast to string for
-  simplicity. Use empty string in case of @code null @endcode value. Omit entirely if this is a
-  notification.
- */
-static constexpr const char *kRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
-
-/**
-  Protocol version as in @code jsonrpc @endcode property of request/response. Since JSON-RPC 1.0
-  doesn't specify this, the value can be omitted.
- */
-static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
-
-/**
-  Compressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageCompressedSize = "rpc.message.compressed_size";
-
-/**
-  MUST be calculated as two different counters starting from @code 1 @endcode one for sent messages
-  and one for received message. <p> This way we guarantee that the values will be consistent between
-  different implementations.
- */
-static constexpr const char *kRpcMessageId = "rpc.message.id";
-
-/**
-  Whether this is a received or sent message.
- */
-static constexpr const char *kRpcMessageType = "rpc.message.type";
-
-/**
-  Uncompressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageUncompressedSize = "rpc.message.uncompressed_size";
-
-/**
-  The name of the (logical) method being called, must be equal to the $method part in the span name.
-  <p>
-  This is the logical name of the method from the RPC interface perspective, which can be different
-  from the name of any implementing method/function. The @code code.function.name @endcode attribute
-  may be used to store the latter (e.g., method actually executing the call on the server side, RPC
-  client stub method on the client side).
- */
-static constexpr const char *kRpcMethod = "rpc.method";
-
-/**
-  The full (logical) name of the service being called, including its package name, if applicable.
-  <p>
-  This is the logical name of the service from the RPC interface perspective, which can be different
-  from the name of any implementing class. The @code code.namespace @endcode attribute may be used
-  to store the latter (despite the attribute name, it may include a class name; e.g., class with
-  method actually executing the call on the server side, RPC client stub class on the client side).
- */
-static constexpr const char *kRpcService = "rpc.service";
-
-/**
-  A string identifying the remoting system. See below for a list of well-known identifiers.
- */
-static constexpr const char *kRpcSystem = "rpc.system";
-
-namespace RpcConnectRpcErrorCodeValues
-{
-/**
-  none
- */
-static constexpr const char *kCancelled = "cancelled";
-
-/**
-  none
- */
-static constexpr const char *kUnknown = "unknown";
-
-/**
-  none
- */
-static constexpr const char *kInvalidArgument = "invalid_argument";
-
-/**
-  none
- */
-static constexpr const char *kDeadlineExceeded = "deadline_exceeded";
-
-/**
-  none
- */
-static constexpr const char *kNotFound = "not_found";
-
-/**
-  none
- */
-static constexpr const char *kAlreadyExists = "already_exists";
-
-/**
-  none
- */
-static constexpr const char *kPermissionDenied = "permission_denied";
-
-/**
-  none
- */
-static constexpr const char *kResourceExhausted = "resource_exhausted";
-
-/**
-  none
- */
-static constexpr const char *kFailedPrecondition = "failed_precondition";
-
-/**
-  none
- */
-static constexpr const char *kAborted = "aborted";
-
-/**
-  none
- */
-static constexpr const char *kOutOfRange = "out_of_range";
-
-/**
-  none
- */
-static constexpr const char *kUnimplemented = "unimplemented";
-
-/**
-  none
- */
-static constexpr const char *kInternal = "internal";
-
-/**
-  none
- */
-static constexpr const char *kUnavailable = "unavailable";
-
-/**
-  none
- */
-static constexpr const char *kDataLoss = "data_loss";
-
-/**
-  none
- */
-static constexpr const char *kUnauthenticated = "unauthenticated";
-
-}  // namespace RpcConnectRpcErrorCodeValues
-
-namespace RpcGrpcStatusCodeValues
-{
-/**
-  OK
- */
-static constexpr int kOk = 0;
-
-/**
-  CANCELLED
- */
-static constexpr int kCancelled = 1;
-
-/**
-  UNKNOWN
- */
-static constexpr int kUnknown = 2;
-
-/**
-  INVALID_ARGUMENT
- */
-static constexpr int kInvalidArgument = 3;
-
-/**
-  DEADLINE_EXCEEDED
- */
-static constexpr int kDeadlineExceeded = 4;
-
-/**
-  NOT_FOUND
- */
-static constexpr int kNotFound = 5;
-
-/**
-  ALREADY_EXISTS
- */
-static constexpr int kAlreadyExists = 6;
-
-/**
-  PERMISSION_DENIED
- */
-static constexpr int kPermissionDenied = 7;
-
-/**
-  RESOURCE_EXHAUSTED
- */
-static constexpr int kResourceExhausted = 8;
-
-/**
-  FAILED_PRECONDITION
- */
-static constexpr int kFailedPrecondition = 9;
-
-/**
-  ABORTED
- */
-static constexpr int kAborted = 10;
-
-/**
-  OUT_OF_RANGE
- */
-static constexpr int kOutOfRange = 11;
-
-/**
-  UNIMPLEMENTED
- */
-static constexpr int kUnimplemented = 12;
-
-/**
-  INTERNAL
- */
-static constexpr int kInternal = 13;
-
-/**
-  UNAVAILABLE
- */
-static constexpr int kUnavailable = 14;
-
-/**
-  DATA_LOSS
- */
-static constexpr int kDataLoss = 15;
-
-/**
-  UNAUTHENTICATED
- */
-static constexpr int kUnauthenticated = 16;
-
-}  // namespace RpcGrpcStatusCodeValues
-
-namespace RpcMessageTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kSent = "SENT";
-
-/**
-  none
- */
-static constexpr const char *kReceived = "RECEIVED";
-
-}  // namespace RpcMessageTypeValues
-
-namespace RpcSystemValues
-{
-/**
-  gRPC
- */
-static constexpr const char *kGrpc = "grpc";
-
-/**
-  Java RMI
- */
-static constexpr const char *kJavaRmi = "java_rmi";
-
-/**
-  .NET WCF
- */
-static constexpr const char *kDotnetWcf = "dotnet_wcf";
-
-/**
-  Apache Dubbo
- */
-static constexpr const char *kApacheDubbo = "apache_dubbo";
-
-/**
-  Connect RPC
- */
-static constexpr const char *kConnectRpc = "connect_rpc";
-
-}  // namespace RpcSystemValues
-
-}  // namespace rpc
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/rpc_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/rpc_metrics.h
deleted file mode 100644
index a337142ef..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/rpc_metrics.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace rpc
-{
-
-/**
-  Measures the duration of outbound RPC.
-  <p>
-  While streaming RPCs may record this metric as start-of-batch
-  to end-of-batch, it's hard to interpret in practice.
-  <p>
-  <strong>Streaming</strong>: N/A.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientDuration = "rpc.client.duration";
-static constexpr const char *descrMetricRpcClientDuration =
-    "Measures the duration of outbound RPC.";
-static constexpr const char *unitMetricRpcClientDuration = "ms";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
-                                      unitMetricRpcClientDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcClientDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
-                                      unitMetricRpcClientDuration);
-}
-
-/**
-  Measures the size of RPC request messages (uncompressed).
-  <p>
-  <strong>Streaming</strong>: Recorded per message in a streaming batch
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientRequestSize = "rpc.client.request.size";
-static constexpr const char *descrMetricRpcClientRequestSize =
-    "Measures the size of RPC request messages (uncompressed).";
-static constexpr const char *unitMetricRpcClientRequestSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientRequestSize, descrMetricRpcClientRequestSize,
-                                      unitMetricRpcClientRequestSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientRequestSize, descrMetricRpcClientRequestSize,
-                                      unitMetricRpcClientRequestSize);
-}
-
-/**
-  Measures the number of messages received per RPC.
-  <p>
-  Should be 1 for all non-streaming RPCs.
-  <p>
-  <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientRequestsPerRpc = "rpc.client.requests_per_rpc";
-static constexpr const char *descrMetricRpcClientRequestsPerRpc =
-    "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcClientRequestsPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientRequestsPerRpc,
-                                      descrMetricRpcClientRequestsPerRpc,
-                                      unitMetricRpcClientRequestsPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientRequestsPerRpc,
-                                      descrMetricRpcClientRequestsPerRpc,
-                                      unitMetricRpcClientRequestsPerRpc);
-}
-
-/**
-  Measures the size of RPC response messages (uncompressed).
-  <p>
-  <strong>Streaming</strong>: Recorded per response in a streaming batch
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientResponseSize = "rpc.client.response.size";
-static constexpr const char *descrMetricRpcClientResponseSize =
-    "Measures the size of RPC response messages (uncompressed).";
-static constexpr const char *unitMetricRpcClientResponseSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientResponseSize,
-                                      descrMetricRpcClientResponseSize,
-                                      unitMetricRpcClientResponseSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientResponseSize,
-                                      descrMetricRpcClientResponseSize,
-                                      unitMetricRpcClientResponseSize);
-}
-
-/**
-  Measures the number of messages sent per RPC.
-  <p>
-  Should be 1 for all non-streaming RPCs.
-  <p>
-  <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcClientResponsesPerRpc = "rpc.client.responses_per_rpc";
-static constexpr const char *descrMetricRpcClientResponsesPerRpc =
-    "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcClientResponsesPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientResponsesPerRpc,
-                                      descrMetricRpcClientResponsesPerRpc,
-                                      unitMetricRpcClientResponsesPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientResponsesPerRpc,
-                                      descrMetricRpcClientResponsesPerRpc,
-                                      unitMetricRpcClientResponsesPerRpc);
-}
-
-/**
-  Measures the duration of inbound RPC.
-  <p>
-  While streaming RPCs may record this metric as start-of-batch
-  to end-of-batch, it's hard to interpret in practice.
-  <p>
-  <strong>Streaming</strong>: N/A.
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerDuration     = "rpc.server.duration";
-static constexpr const char *descrMetricRpcServerDuration = "Measures the duration of inbound RPC.";
-static constexpr const char *unitMetricRpcServerDuration  = "ms";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
-                                      unitMetricRpcServerDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcServerDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
-                                      unitMetricRpcServerDuration);
-}
-
-/**
-  Measures the size of RPC request messages (uncompressed).
-  <p>
-  <strong>Streaming</strong>: Recorded per message in a streaming batch
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerRequestSize = "rpc.server.request.size";
-static constexpr const char *descrMetricRpcServerRequestSize =
-    "Measures the size of RPC request messages (uncompressed).";
-static constexpr const char *unitMetricRpcServerRequestSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerRequestSize, descrMetricRpcServerRequestSize,
-                                      unitMetricRpcServerRequestSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerRequestSize, descrMetricRpcServerRequestSize,
-                                      unitMetricRpcServerRequestSize);
-}
-
-/**
-  Measures the number of messages received per RPC.
-  <p>
-  Should be 1 for all non-streaming RPCs.
-  <p>
-  <strong>Streaming</strong> : This metric is required for server and client streaming RPCs
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerRequestsPerRpc = "rpc.server.requests_per_rpc";
-static constexpr const char *descrMetricRpcServerRequestsPerRpc =
-    "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcServerRequestsPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerRequestsPerRpc,
-                                      descrMetricRpcServerRequestsPerRpc,
-                                      unitMetricRpcServerRequestsPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerRequestsPerRpc,
-                                      descrMetricRpcServerRequestsPerRpc,
-                                      unitMetricRpcServerRequestsPerRpc);
-}
-
-/**
-  Measures the size of RPC response messages (uncompressed).
-  <p>
-  <strong>Streaming</strong>: Recorded per response in a streaming batch
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerResponseSize = "rpc.server.response.size";
-static constexpr const char *descrMetricRpcServerResponseSize =
-    "Measures the size of RPC response messages (uncompressed).";
-static constexpr const char *unitMetricRpcServerResponseSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerResponseSize,
-                                      descrMetricRpcServerResponseSize,
-                                      unitMetricRpcServerResponseSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerResponseSize,
-                                      descrMetricRpcServerResponseSize,
-                                      unitMetricRpcServerResponseSize);
-}
-
-/**
-  Measures the number of messages sent per RPC.
-  <p>
-  Should be 1 for all non-streaming RPCs.
-  <p>
-  <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
-  <p>
-  histogram
- */
-static constexpr const char *kMetricRpcServerResponsesPerRpc = "rpc.server.responses_per_rpc";
-static constexpr const char *descrMetricRpcServerResponsesPerRpc =
-    "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcServerResponsesPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerResponsesPerRpc,
-                                      descrMetricRpcServerResponsesPerRpc,
-                                      unitMetricRpcServerResponsesPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerResponsesPerRpc,
-                                      descrMetricRpcServerResponsesPerRpc,
-                                      unitMetricRpcServerResponsesPerRpc);
-}
-
-}  // namespace rpc
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/security_rule_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/security_rule_attributes.h
deleted file mode 100644
index c010ebc0b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/security_rule_attributes.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace security_rule
-{
-
-/**
-  A categorization value keyword used by the entity using the rule for detection of this event
- */
-static constexpr const char *kSecurityRuleCategory = "security_rule.category";
-
-/**
-  The description of the rule generating the event.
- */
-static constexpr const char *kSecurityRuleDescription = "security_rule.description";
-
-/**
-  Name of the license under which the rule used to generate this event is made available.
- */
-static constexpr const char *kSecurityRuleLicense = "security_rule.license";
-
-/**
-  The name of the rule or signature generating the event.
- */
-static constexpr const char *kSecurityRuleName = "security_rule.name";
-
-/**
-  Reference URL to additional information about the rule used to generate this event.
-  <p>
-  The URL can point to the vendor’s documentation about the rule. If that’s not available, it can
-  also be a link to a more general page describing this type of alert.
- */
-static constexpr const char *kSecurityRuleReference = "security_rule.reference";
-
-/**
-  Name of the ruleset, policy, group, or parent category in which the rule used to generate this
-  event is a member.
- */
-static constexpr const char *kSecurityRuleRulesetName = "security_rule.ruleset.name";
-
-/**
-  A rule ID that is unique within the scope of a set or group of agents, observers, or other
-  entities using the rule for detection of this event.
- */
-static constexpr const char *kSecurityRuleUuid = "security_rule.uuid";
-
-/**
-  The version / revision of the rule being used for analysis.
- */
-static constexpr const char *kSecurityRuleVersion = "security_rule.version";
-
-}  // namespace security_rule
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/server_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/server_attributes.h
deleted file mode 100644
index 2d307614b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/server_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace server
-{
-
-/**
-  Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain
-  socket name. <p> When observed from the client side, and when communicating through an
-  intermediary, @code server.address @endcode SHOULD represent the server address behind any
-  intermediaries, for example proxies, if it's available.
- */
-static constexpr const char *kServerAddress = "server.address";
-
-/**
-  Server port number.
-  <p>
-  When observed from the client side, and when communicating through an intermediary, @code
-  server.port @endcode SHOULD represent the server port behind any intermediaries, for example
-  proxies, if it's available.
- */
-static constexpr const char *kServerPort = "server.port";
-
-}  // namespace server
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/service_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/service_attributes.h
deleted file mode 100644
index 3cc3f8940..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/service_attributes.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace service
-{
-
-/**
-  The string ID of the service instance.
-  <p>
-  MUST be unique for each instance of the same @code service.namespace,service.name @endcode pair
-  (in other words
-  @code service.namespace,service.name,service.instance.id @endcode triplet MUST be globally
-  unique). The ID helps to distinguish instances of the same service that exist at the same time
-  (e.g. instances of a horizontally scaled service). <p> Implementations, such as SDKs, are
-  recommended to generate a random Version 1 or Version 4 <a
-  href="https://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a> UUID, but are free to use an inherent
-  unique ID as the source of this value if stability is desirable. In that case, the ID SHOULD be
-  used as source of a UUID Version 5 and SHOULD use the following UUID as the namespace: @code
-  4d63009a-8d0f-11ee-aad7-4c796ed8e320 @endcode. <p> UUIDs are typically recommended, as only an
-  opaque value for the purposes of identifying a service instance is needed. Similar to what can be
-  seen in the man page for the <a
-  href="https://www.freedesktop.org/software/systemd/man/latest/machine-id.html">@code
-  /etc/machine-id @endcode</a> file, the underlying data, such as pod name and namespace should be
-  treated as confidential, being the user's choice to expose it or not via another resource
-  attribute. <p> For applications running behind an application server (like unicorn), we do not
-  recommend using one identifier for all processes participating in the application. Instead, it's
-  recommended each division (e.g. a worker thread in unicorn) to have its own instance.id. <p> It's
-  not recommended for a Collector to set @code service.instance.id @endcode if it can't
-  unambiguously determine the service instance that is generating that telemetry. For instance,
-  creating an UUID based on @code pod.name @endcode will likely be wrong, as the Collector might not
-  know from which container within that pod the telemetry originated. However, Collectors can set
-  the @code service.instance.id @endcode if they can unambiguously determine the service instance
-  for that telemetry. This is typically the case for scraping receivers, as they know the target
-  address and port.
- */
-static constexpr const char *kServiceInstanceId = "service.instance.id";
-
-/**
-  Logical name of the service.
-  <p>
-  MUST be the same for all instances of horizontally scaled services. If the value was not
-  specified, SDKs MUST fallback to @code unknown_service: @endcode concatenated with <a
-  href="process.md">@code process.executable.name @endcode</a>, e.g. @code unknown_service:bash
-  @endcode. If @code process.executable.name @endcode is not available, the value MUST be set to
-  @code unknown_service @endcode.
- */
-static constexpr const char *kServiceName = "service.name";
-
-/**
-  A namespace for @code service.name @endcode.
-  <p>
-  A string value having a meaning that helps to distinguish a group of services, for example the
-  team name that owns a group of services. @code service.name @endcode is expected to be unique
-  within the same namespace. If @code service.namespace @endcode is not specified in the Resource
-  then @code service.name @endcode is expected to be unique for all services that have no explicit
-  namespace defined (so the empty/unspecified namespace is simply one more valid namespace).
-  Zero-length namespace string is assumed equal to unspecified namespace.
- */
-static constexpr const char *kServiceNamespace = "service.namespace";
-
-/**
-  The version string of the service API or implementation. The format is not defined by these
-  conventions.
- */
-static constexpr const char *kServiceVersion = "service.version";
-
-}  // namespace service
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/session_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/session_attributes.h
deleted file mode 100644
index 06c23d8ce..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/session_attributes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace session
-{
-
-/**
-  A unique id to identify a session.
- */
-static constexpr const char *kSessionId = "session.id";
-
-/**
-  The previous @code session.id @endcode for this user, when known.
- */
-static constexpr const char *kSessionPreviousId = "session.previous_id";
-
-}  // namespace session
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/source_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/source_attributes.h
deleted file mode 100644
index ae52b27bc..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/source_attributes.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace source
-{
-
-/**
-  Source address - domain name if available without reverse DNS lookup; otherwise, IP address or
-  Unix domain socket name. <p> When observed from the destination side, and when communicating
-  through an intermediary, @code source.address @endcode SHOULD represent the source address behind
-  any intermediaries, for example proxies, if it's available.
- */
-static constexpr const char *kSourceAddress = "source.address";
-
-/**
-  Source port number
- */
-static constexpr const char *kSourcePort = "source.port";
-
-}  // namespace source
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/system_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/system_attributes.h
deleted file mode 100644
index 917d507b3..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/system_attributes.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace system
-{
-
-/**
-  Deprecated, use @code cpu.logical_number @endcode instead.
- */
-static constexpr const char *kSystemCpuLogicalNumber = "system.cpu.logical_number";
-
-/**
-  Deprecated, use @code cpu.mode @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.mode @endcode.", "reason": "renamed", "renamed_to": "cpu.mode"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state";
-
-/**
-  The device identifier
- */
-static constexpr const char *kSystemDevice = "system.device";
-
-/**
-  The filesystem mode
- */
-static constexpr const char *kSystemFilesystemMode = "system.filesystem.mode";
-
-/**
-  The filesystem mount path
- */
-static constexpr const char *kSystemFilesystemMountpoint = "system.filesystem.mountpoint";
-
-/**
-  The filesystem state
- */
-static constexpr const char *kSystemFilesystemState = "system.filesystem.state";
-
-/**
-  The filesystem type
- */
-static constexpr const char *kSystemFilesystemType = "system.filesystem.type";
-
-/**
-  The memory state
- */
-static constexpr const char *kSystemMemoryState = "system.memory.state";
-
-/**
-  Deprecated, use @code network.connection.state @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code network.connection.state @endcode.", "reason": "renamed",
-  "renamed_to": "network.connection.state"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemNetworkState = "system.network.state";
-
-/**
-  The paging access direction
- */
-static constexpr const char *kSystemPagingDirection = "system.paging.direction";
-
-/**
-  The memory paging state
- */
-static constexpr const char *kSystemPagingState = "system.paging.state";
-
-/**
-  The memory paging type
- */
-static constexpr const char *kSystemPagingType = "system.paging.type";
-
-/**
-  The process state, e.g., <a
-  href="https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES">Linux Process State
-  Codes</a>
- */
-static constexpr const char *kSystemProcessStatus = "system.process.status";
-
-/**
-  Deprecated, use @code system.process.status @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code system.process.status @endcode.", "reason": "renamed", "renamed_to":
-  "system.process.status"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
-    "system.processes.status";
-
-namespace SystemCpuStateValues
-{
-/**
-  none
- */
-static constexpr const char *kUser = "user";
-
-/**
-  none
- */
-static constexpr const char *kSystem = "system";
-
-/**
-  none
- */
-static constexpr const char *kNice = "nice";
-
-/**
-  none
- */
-static constexpr const char *kIdle = "idle";
-
-/**
-  none
- */
-static constexpr const char *kIowait = "iowait";
-
-/**
-  none
- */
-static constexpr const char *kInterrupt = "interrupt";
-
-/**
-  none
- */
-static constexpr const char *kSteal = "steal";
-
-}  // namespace SystemCpuStateValues
-
-namespace SystemFilesystemStateValues
-{
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-/**
-  none
- */
-static constexpr const char *kFree = "free";
-
-/**
-  none
- */
-static constexpr const char *kReserved = "reserved";
-
-}  // namespace SystemFilesystemStateValues
-
-namespace SystemFilesystemTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kFat32 = "fat32";
-
-/**
-  none
- */
-static constexpr const char *kExfat = "exfat";
-
-/**
-  none
- */
-static constexpr const char *kNtfs = "ntfs";
-
-/**
-  none
- */
-static constexpr const char *kRefs = "refs";
-
-/**
-  none
- */
-static constexpr const char *kHfsplus = "hfsplus";
-
-/**
-  none
- */
-static constexpr const char *kExt4 = "ext4";
-
-}  // namespace SystemFilesystemTypeValues
-
-namespace SystemMemoryStateValues
-{
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-/**
-  none
- */
-static constexpr const char *kFree = "free";
-
-/**
-  none
- */
-static constexpr const char *kShared = "shared";
-
-/**
-  none
- */
-static constexpr const char *kBuffers = "buffers";
-
-/**
-  none
- */
-static constexpr const char *kCached = "cached";
-
-}  // namespace SystemMemoryStateValues
-
-namespace SystemNetworkStateValues
-{
-/**
-  none
- */
-static constexpr const char *kClose = "close";
-
-/**
-  none
- */
-static constexpr const char *kCloseWait = "close_wait";
-
-/**
-  none
- */
-static constexpr const char *kClosing = "closing";
-
-/**
-  none
- */
-static constexpr const char *kDelete = "delete";
-
-/**
-  none
- */
-static constexpr const char *kEstablished = "established";
-
-/**
-  none
- */
-static constexpr const char *kFinWait1 = "fin_wait_1";
-
-/**
-  none
- */
-static constexpr const char *kFinWait2 = "fin_wait_2";
-
-/**
-  none
- */
-static constexpr const char *kLastAck = "last_ack";
-
-/**
-  none
- */
-static constexpr const char *kListen = "listen";
-
-/**
-  none
- */
-static constexpr const char *kSynRecv = "syn_recv";
-
-/**
-  none
- */
-static constexpr const char *kSynSent = "syn_sent";
-
-/**
-  none
- */
-static constexpr const char *kTimeWait = "time_wait";
-
-}  // namespace SystemNetworkStateValues
-
-namespace SystemPagingDirectionValues
-{
-/**
-  none
- */
-static constexpr const char *kIn = "in";
-
-/**
-  none
- */
-static constexpr const char *kOut = "out";
-
-}  // namespace SystemPagingDirectionValues
-
-namespace SystemPagingStateValues
-{
-/**
-  none
- */
-static constexpr const char *kUsed = "used";
-
-/**
-  none
- */
-static constexpr const char *kFree = "free";
-
-}  // namespace SystemPagingStateValues
-
-namespace SystemPagingTypeValues
-{
-/**
-  none
- */
-static constexpr const char *kMajor = "major";
-
-/**
-  none
- */
-static constexpr const char *kMinor = "minor";
-
-}  // namespace SystemPagingTypeValues
-
-namespace SystemProcessStatusValues
-{
-/**
-  none
- */
-static constexpr const char *kRunning = "running";
-
-/**
-  none
- */
-static constexpr const char *kSleeping = "sleeping";
-
-/**
-  none
- */
-static constexpr const char *kStopped = "stopped";
-
-/**
-  none
- */
-static constexpr const char *kDefunct = "defunct";
-
-}  // namespace SystemProcessStatusValues
-
-namespace SystemProcessesStatusValues
-{
-/**
-  none
- */
-static constexpr const char *kRunning = "running";
-
-/**
-  none
- */
-static constexpr const char *kSleeping = "sleeping";
-
-/**
-  none
- */
-static constexpr const char *kStopped = "stopped";
-
-/**
-  none
- */
-static constexpr const char *kDefunct = "defunct";
-
-}  // namespace SystemProcessesStatusValues
-
-}  // namespace system
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/system_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/system_metrics.h
deleted file mode 100644
index a6e01ea75..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/system_metrics.h
+++ /dev/null
@@ -1,1338 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace system
-{
-
-/**
-  Deprecated. Use @code cpu.frequency @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.frequency @endcode.", "reason": "renamed", "renamed_to":
-  "cpu.frequency"} <p> gauge
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuFrequency =
-    "system.cpu.frequency";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuFrequency =
-    "Deprecated. Use `cpu.frequency` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuFrequency = "{Hz}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                 unitMetricSystemCpuFrequency);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                  unitMetricSystemCpuFrequency);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                           unitMetricSystemCpuFrequency);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency, unitMetricSystemCpuFrequency);
-}
-
-/**
-  Reports the number of logical (virtual) processor cores created by the operating system to manage
-  multitasking <p> Calculated by multiplying the number of sockets by the number of cores per
-  socket, and then by the number of threads per core <p> updowncounter
- */
-static constexpr const char *kMetricSystemCpuLogicalCount = "system.cpu.logical.count";
-static constexpr const char *descrMetricSystemCpuLogicalCount =
-    "Reports the number of logical (virtual) processor cores created by the operating system to "
-    "manage multitasking";
-static constexpr const char *unitMetricSystemCpuLogicalCount = "{cpu}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemCpuLogicalCount,
-                                         descrMetricSystemCpuLogicalCount,
-                                         unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemCpuLogicalCount,
-                                          descrMetricSystemCpuLogicalCount,
-                                          unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemCpuLogicalCount,
-                                                   descrMetricSystemCpuLogicalCount,
-                                                   unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemCpuLogicalCount,
-                                                    descrMetricSystemCpuLogicalCount,
-                                                    unitMetricSystemCpuLogicalCount);
-}
-
-/**
-  Reports the number of actual physical processor cores on the hardware
-  <p>
-  Calculated by multiplying the number of sockets by the number of cores per socket
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemCpuPhysicalCount = "system.cpu.physical.count";
-static constexpr const char *descrMetricSystemCpuPhysicalCount =
-    "Reports the number of actual physical processor cores on the hardware";
-static constexpr const char *unitMetricSystemCpuPhysicalCount = "{cpu}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemCpuPhysicalCount,
-                                         descrMetricSystemCpuPhysicalCount,
-                                         unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                          descrMetricSystemCpuPhysicalCount,
-                                          unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                                   descrMetricSystemCpuPhysicalCount,
-                                                   unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                                    descrMetricSystemCpuPhysicalCount,
-                                                    unitMetricSystemCpuPhysicalCount);
-}
-
-/**
-  Deprecated. Use @code cpu.time @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.time @endcode.", "reason": "renamed", "renamed_to": "cpu.time"}
-  <p>
-  counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuTime = "system.cpu.time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuTime =
-    "Deprecated. Use `cpu.time` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuTime = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                    unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                    unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                             unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                              unitMetricSystemCpuTime);
-}
-
-/**
-  Deprecated. Use @code cpu.utilization @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code cpu.utilization @endcode.", "reason": "renamed", "renamed_to":
-  "cpu.utilization"} <p> gauge
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuUtilization =
-    "system.cpu.utilization";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuUtilization =
-    "Deprecated. Use `cpu.utilization` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization,
-                                 unitMetricSystemCpuUtilization);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization,
-                                  unitMetricSystemCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization, unitMetricSystemCpuUtilization);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization, unitMetricSystemCpuUtilization);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemDiskIo     = "system.disk.io";
-static constexpr const char *descrMetricSystemDiskIo = "";
-static constexpr const char *unitMetricSystemDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                    unitMetricSystemDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                    unitMetricSystemDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                             unitMetricSystemDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                              unitMetricSystemDiskIo);
-}
-
-/**
-  Time disk spent activated
-  <p>
-  The real elapsed time ("wall clock") used in the I/O path (time from operations running in
-  parallel are not counted). Measured as: <ul> <li>Linux: Field 13 from <a
-  href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
-    <li>Windows: The complement of
-  <a
-  href="https://learn.microsoft.com/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained">"Disk%
-  Idle Time"</a> performance counter: @code uptime * (100 - "Disk\% Idle Time") / 100 @endcode</li>
-  </ul>
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemDiskIoTime     = "system.disk.io_time";
-static constexpr const char *descrMetricSystemDiskIoTime = "Time disk spent activated";
-static constexpr const char *unitMetricSystemDiskIoTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIoTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                    unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskIoTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                    unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskIoTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                             unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskIoTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                              unitMetricSystemDiskIoTime);
-}
-
-/**
-  The total storage capacity of the disk
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemDiskLimit     = "system.disk.limit";
-static constexpr const char *descrMetricSystemDiskLimit = "The total storage capacity of the disk";
-static constexpr const char *unitMetricSystemDiskLimit  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemDiskLimit, descrMetricSystemDiskLimit,
-                                         unitMetricSystemDiskLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemDiskLimit, descrMetricSystemDiskLimit,
-                                          unitMetricSystemDiskLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemDiskLimit, descrMetricSystemDiskLimit, unitMetricSystemDiskLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemDiskLimit, descrMetricSystemDiskLimit, unitMetricSystemDiskLimit);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemDiskMerged     = "system.disk.merged";
-static constexpr const char *descrMetricSystemDiskMerged = "";
-static constexpr const char *unitMetricSystemDiskMerged  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskMerged(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                    unitMetricSystemDiskMerged);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskMerged(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                    unitMetricSystemDiskMerged);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskMerged(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                             unitMetricSystemDiskMerged);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskMerged(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                              unitMetricSystemDiskMerged);
-}
-
-/**
-  Sum of the time each operation took to complete
-  <p>
-  Because it is the sum of time each request took, parallel-issued requests each contribute to make
-  the count grow. Measured as: <ul> <li>Linux: Fields 7 & 11 from <a
-  href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
-    <li>Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter
-  (similar for Writes)</li>
-  </ul>
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemDiskOperationTime = "system.disk.operation_time";
-static constexpr const char *descrMetricSystemDiskOperationTime =
-    "Sum of the time each operation took to complete";
-static constexpr const char *unitMetricSystemDiskOperationTime = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskOperationTime,
-                                    descrMetricSystemDiskOperationTime,
-                                    unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskOperationTime,
-                                    descrMetricSystemDiskOperationTime,
-                                    unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskOperationTime,
-                                             descrMetricSystemDiskOperationTime,
-                                             unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskOperationTime,
-                                              descrMetricSystemDiskOperationTime,
-                                              unitMetricSystemDiskOperationTime);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemDiskOperations     = "system.disk.operations";
-static constexpr const char *descrMetricSystemDiskOperations = "";
-static constexpr const char *unitMetricSystemDiskOperations  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskOperations, descrMetricSystemDiskOperations,
-                                    unitMetricSystemDiskOperations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskOperations, descrMetricSystemDiskOperations,
-                                    unitMetricSystemDiskOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemDiskOperations, descrMetricSystemDiskOperations, unitMetricSystemDiskOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemDiskOperations, descrMetricSystemDiskOperations, unitMetricSystemDiskOperations);
-}
-
-/**
-  The total storage capacity of the filesystem
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemFilesystemLimit = "system.filesystem.limit";
-static constexpr const char *descrMetricSystemFilesystemLimit =
-    "The total storage capacity of the filesystem";
-static constexpr const char *unitMetricSystemFilesystemLimit = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemFilesystemLimit,
-                                         descrMetricSystemFilesystemLimit,
-                                         unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemFilesystemLimit,
-                                          descrMetricSystemFilesystemLimit,
-                                          unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemFilesystemLimit,
-                                                   descrMetricSystemFilesystemLimit,
-                                                   unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemFilesystemLimit,
-                                                    descrMetricSystemFilesystemLimit,
-                                                    unitMetricSystemFilesystemLimit);
-}
-
-/**
-  Reports a filesystem's space usage across different states.
-  <p>
-  The sum of all @code system.filesystem.usage @endcode values over the different @code
-  system.filesystem.state @endcode attributes SHOULD equal the total storage capacity of the
-  filesystem, that is @code system.filesystem.limit @endcode. <p> updowncounter
- */
-static constexpr const char *kMetricSystemFilesystemUsage = "system.filesystem.usage";
-static constexpr const char *descrMetricSystemFilesystemUsage =
-    "Reports a filesystem's space usage across different states.";
-static constexpr const char *unitMetricSystemFilesystemUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemFilesystemUsage,
-                                         descrMetricSystemFilesystemUsage,
-                                         unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemFilesystemUsage,
-                                          descrMetricSystemFilesystemUsage,
-                                          unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemFilesystemUsage,
-                                                   descrMetricSystemFilesystemUsage,
-                                                   unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemFilesystemUsage,
-                                                    descrMetricSystemFilesystemUsage,
-                                                    unitMetricSystemFilesystemUsage);
-}
-
-/**
-  gauge
- */
-static constexpr const char *kMetricSystemFilesystemUtilization = "system.filesystem.utilization";
-static constexpr const char *descrMetricSystemFilesystemUtilization = "";
-static constexpr const char *unitMetricSystemFilesystemUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemFilesystemUtilization,
-                                 descrMetricSystemFilesystemUtilization,
-                                 unitMetricSystemFilesystemUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemFilesystemUtilization,
-                                  descrMetricSystemFilesystemUtilization,
-                                  unitMetricSystemFilesystemUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemFilesystemUtilization,
-                                           descrMetricSystemFilesystemUtilization,
-                                           unitMetricSystemFilesystemUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemFilesystemUtilization,
-                                            descrMetricSystemFilesystemUtilization,
-                                            unitMetricSystemFilesystemUtilization);
-}
-
-/**
-  An estimate of how much memory is available for starting new applications, without causing
-  swapping <p> This is an alternative to @code system.memory.usage @endcode metric with @code
-  state=free @endcode. Linux starting from 3.14 exports "available" memory. It takes "free" memory
-  as a baseline, and then factors in kernel-specific values. This is supposed to be more accurate
-  than just "free" memory. For reference, see the calculations <a
-  href="https://superuser.com/a/980821">here</a>. See also @code MemAvailable @endcode in <a
-  href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemoryAvailable = "system.linux.memory.available";
-static constexpr const char *descrMetricSystemLinuxMemoryAvailable =
-    "An estimate of how much memory is available for starting new applications, without causing "
-    "swapping";
-static constexpr const char *unitMetricSystemLinuxMemoryAvailable = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                         descrMetricSystemLinuxMemoryAvailable,
-                                         unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                          descrMetricSystemLinuxMemoryAvailable,
-                                          unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                   descrMetricSystemLinuxMemoryAvailable,
-                                                   unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                    descrMetricSystemLinuxMemoryAvailable,
-                                                    unitMetricSystemLinuxMemoryAvailable);
-}
-
-/**
-  Reports the memory used by the Linux kernel for managing caches of frequently used objects.
-  <p>
-  The sum over the @code reclaimable @endcode and @code unreclaimable @endcode state values in @code
-  linux.memory.slab.usage @endcode SHOULD be equal to the total slab memory available on the system.
-  Note that the total slab memory is not constant and may vary over time.
-  See also the <a
-  href="https://blogs.oracle.com/linux/post/understanding-linux-kernel-memory-statistics">Slab
-  allocator</a> and @code Slab @endcode in <a
-  href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemorySlabUsage = "system.linux.memory.slab.usage";
-static constexpr const char *descrMetricSystemLinuxMemorySlabUsage =
-    "Reports the memory used by the Linux kernel for managing caches of frequently used objects.";
-static constexpr const char *unitMetricSystemLinuxMemorySlabUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                         descrMetricSystemLinuxMemorySlabUsage,
-                                         unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                          descrMetricSystemLinuxMemorySlabUsage,
-                                          unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                   descrMetricSystemLinuxMemorySlabUsage,
-                                                   unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                    descrMetricSystemLinuxMemorySlabUsage,
-                                                    unitMetricSystemLinuxMemorySlabUsage);
-}
-
-/**
-  Total memory available in the system.
-  <p>
-  Its value SHOULD equal the sum of @code system.memory.state @endcode over all states.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemMemoryLimit     = "system.memory.limit";
-static constexpr const char *descrMetricSystemMemoryLimit = "Total memory available in the system.";
-static constexpr const char *unitMetricSystemMemoryLimit  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit,
-                                         unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit,
-                                          unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
-}
-
-/**
-  Shared memory used (mostly by tmpfs).
-  <p>
-  Equivalent of @code shared @endcode from <a
-  href="https://man7.org/linux/man-pages/man1/free.1.html">@code free @endcode command</a> or
-  @code Shmem @endcode from <a href="https://man7.org/linux/man-pages/man5/proc.5.html">@code
-  /proc/meminfo @endcode</a>" <p> updowncounter
- */
-static constexpr const char *kMetricSystemMemoryShared = "system.memory.shared";
-static constexpr const char *descrMetricSystemMemoryShared =
-    "Shared memory used (mostly by tmpfs).";
-static constexpr const char *unitMetricSystemMemoryShared = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryShared, descrMetricSystemMemoryShared,
-                                         unitMetricSystemMemoryShared);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryShared, descrMetricSystemMemoryShared,
-                                          unitMetricSystemMemoryShared);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryShared, descrMetricSystemMemoryShared, unitMetricSystemMemoryShared);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryShared, descrMetricSystemMemoryShared, unitMetricSystemMemoryShared);
-}
-
-/**
-  Reports memory in use by state.
-  <p>
-  The sum over all @code system.memory.state @endcode values SHOULD equal the total memory
-  available on the system, that is @code system.memory.limit @endcode.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemMemoryUsage     = "system.memory.usage";
-static constexpr const char *descrMetricSystemMemoryUsage = "Reports memory in use by state.";
-static constexpr const char *unitMetricSystemMemoryUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage,
-                                         unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage,
-                                          unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage, unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage, unitMetricSystemMemoryUsage);
-}
-
-/**
-  gauge
- */
-static constexpr const char *kMetricSystemMemoryUtilization     = "system.memory.utilization";
-static constexpr const char *descrMetricSystemMemoryUtilization = "";
-static constexpr const char *unitMetricSystemMemoryUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemMemoryUtilization, descrMetricSystemMemoryUtilization,
-                                 unitMetricSystemMemoryUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemMemoryUtilization,
-                                  descrMetricSystemMemoryUtilization,
-                                  unitMetricSystemMemoryUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemMemoryUtilization,
-                                           descrMetricSystemMemoryUtilization,
-                                           unitMetricSystemMemoryUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemMemoryUtilization,
-                                            descrMetricSystemMemoryUtilization,
-                                            unitMetricSystemMemoryUtilization);
-}
-
-/**
-  updowncounter
- */
-static constexpr const char *kMetricSystemNetworkConnections     = "system.network.connections";
-static constexpr const char *descrMetricSystemNetworkConnections = "";
-static constexpr const char *unitMetricSystemNetworkConnections  = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemNetworkConnections,
-                                         descrMetricSystemNetworkConnections,
-                                         unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemNetworkConnections,
-                                          descrMetricSystemNetworkConnections,
-                                          unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemNetworkConnections,
-                                                   descrMetricSystemNetworkConnections,
-                                                   unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemNetworkConnections,
-                                                    descrMetricSystemNetworkConnections,
-                                                    unitMetricSystemNetworkConnections);
-}
-
-/**
-  Count of packets that are dropped or discarded even though there was no error
-  <p>
-  Measured as:
-  <ul>
-    <li>Linux: the @code drop @endcode column in @code /proc/dev/net @endcode (<a
-  href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
-    <li>Windows: <a
-  href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
-  InDiscards @endcode/@code OutDiscards @endcode</a> from <a
-  href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
-  GetIfEntry2 @endcode</a></li>
-  </ul>
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemNetworkDropped = "system.network.dropped";
-static constexpr const char *descrMetricSystemNetworkDropped =
-    "Count of packets that are dropped or discarded even though there was no error";
-static constexpr const char *unitMetricSystemNetworkDropped = "{packet}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
-                                    unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
-                                    unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
-}
-
-/**
-  Count of network errors detected
-  <p>
-  Measured as:
-  <ul>
-    <li>Linux: the @code errs @endcode column in @code /proc/dev/net @endcode (<a
-  href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>).</li>
-    <li>Windows: <a
-  href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
-  InErrors @endcode/@code OutErrors @endcode</a> from <a
-  href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
-  GetIfEntry2 @endcode</a>.</li>
-  </ul>
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemNetworkErrors     = "system.network.errors";
-static constexpr const char *descrMetricSystemNetworkErrors = "Count of network errors detected";
-static constexpr const char *unitMetricSystemNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors,
-                                    unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemNetworkErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors,
-                                    unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors, unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors, unitMetricSystemNetworkErrors);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemNetworkIo     = "system.network.io";
-static constexpr const char *descrMetricSystemNetworkIo = "";
-static constexpr const char *unitMetricSystemNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                    unitMetricSystemNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                    unitMetricSystemNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                             unitMetricSystemNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                              unitMetricSystemNetworkIo);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemNetworkPackets     = "system.network.packets";
-static constexpr const char *descrMetricSystemNetworkPackets = "";
-static constexpr const char *unitMetricSystemNetworkPackets  = "{packet}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
-                                    unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
-                                    unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemPagingFaults     = "system.paging.faults";
-static constexpr const char *descrMetricSystemPagingFaults = "";
-static constexpr const char *unitMetricSystemPagingFaults  = "{fault}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemPagingFaults, descrMetricSystemPagingFaults,
-                                    unitMetricSystemPagingFaults);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemPagingFaults, descrMetricSystemPagingFaults,
-                                    unitMetricSystemPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemPagingFaults, descrMetricSystemPagingFaults, unitMetricSystemPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemPagingFaults, descrMetricSystemPagingFaults, unitMetricSystemPagingFaults);
-}
-
-/**
-  counter
- */
-static constexpr const char *kMetricSystemPagingOperations     = "system.paging.operations";
-static constexpr const char *descrMetricSystemPagingOperations = "";
-static constexpr const char *unitMetricSystemPagingOperations  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemPagingOperations,
-                                    descrMetricSystemPagingOperations,
-                                    unitMetricSystemPagingOperations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemPagingOperations,
-                                    descrMetricSystemPagingOperations,
-                                    unitMetricSystemPagingOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemPagingOperations,
-                                             descrMetricSystemPagingOperations,
-                                             unitMetricSystemPagingOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemPagingOperations,
-                                              descrMetricSystemPagingOperations,
-                                              unitMetricSystemPagingOperations);
-}
-
-/**
-  Unix swap or windows pagefile usage
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemPagingUsage     = "system.paging.usage";
-static constexpr const char *descrMetricSystemPagingUsage = "Unix swap or windows pagefile usage";
-static constexpr const char *unitMetricSystemPagingUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemPagingUsage, descrMetricSystemPagingUsage,
-                                         unitMetricSystemPagingUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemPagingUsage, descrMetricSystemPagingUsage,
-                                          unitMetricSystemPagingUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemPagingUsage, descrMetricSystemPagingUsage, unitMetricSystemPagingUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemPagingUsage, descrMetricSystemPagingUsage, unitMetricSystemPagingUsage);
-}
-
-/**
-  gauge
- */
-static constexpr const char *kMetricSystemPagingUtilization     = "system.paging.utilization";
-static constexpr const char *descrMetricSystemPagingUtilization = "";
-static constexpr const char *unitMetricSystemPagingUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemPagingUtilization, descrMetricSystemPagingUtilization,
-                                 unitMetricSystemPagingUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemPagingUtilization,
-                                  descrMetricSystemPagingUtilization,
-                                  unitMetricSystemPagingUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemPagingUtilization,
-                                           descrMetricSystemPagingUtilization,
-                                           unitMetricSystemPagingUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemPagingUtilization,
-                                            descrMetricSystemPagingUtilization,
-                                            unitMetricSystemPagingUtilization);
-}
-
-/**
-  Total number of processes in each state
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricSystemProcessCount = "system.process.count";
-static constexpr const char *descrMetricSystemProcessCount =
-    "Total number of processes in each state";
-static constexpr const char *unitMetricSystemProcessCount = "{process}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemProcessCount, descrMetricSystemProcessCount,
-                                         unitMetricSystemProcessCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemProcessCount, descrMetricSystemProcessCount,
-                                          unitMetricSystemProcessCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemProcessCount, descrMetricSystemProcessCount, unitMetricSystemProcessCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemProcessCount, descrMetricSystemProcessCount, unitMetricSystemProcessCount);
-}
-
-/**
-  Total number of processes created over uptime of the host
-  <p>
-  counter
- */
-static constexpr const char *kMetricSystemProcessCreated = "system.process.created";
-static constexpr const char *descrMetricSystemProcessCreated =
-    "Total number of processes created over uptime of the host";
-static constexpr const char *unitMetricSystemProcessCreated = "{process}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemProcessCreated, descrMetricSystemProcessCreated,
-                                    unitMetricSystemProcessCreated);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemProcessCreated, descrMetricSystemProcessCreated,
-                                    unitMetricSystemProcessCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemProcessCreated, descrMetricSystemProcessCreated, unitMetricSystemProcessCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemProcessCreated, descrMetricSystemProcessCreated, unitMetricSystemProcessCreated);
-}
-
-/**
-  The time the system has been running
-  <p>
-  Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
-  as a floating point number with the highest precision available. The actual accuracy would depend
-  on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricSystemUptime     = "system.uptime";
-static constexpr const char *descrMetricSystemUptime = "The time the system has been running";
-static constexpr const char *unitMetricSystemUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                 unitMetricSystemUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                  unitMetricSystemUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                           unitMetricSystemUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                            unitMetricSystemUptime);
-}
-
-}  // namespace system
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/telemetry_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/telemetry_attributes.h
deleted file mode 100644
index 7a34acefe..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/telemetry_attributes.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace telemetry
-{
-
-/**
-  The name of the auto instrumentation agent or distribution, if used.
-  <p>
-  Official auto instrumentation agents and distributions SHOULD set the @code telemetry.distro.name
-  @endcode attribute to a string starting with @code opentelemetry- @endcode, e.g. @code
-  opentelemetry-java-instrumentation @endcode.
- */
-static constexpr const char *kTelemetryDistroName = "telemetry.distro.name";
-
-/**
-  The version string of the auto instrumentation agent or distribution, if used.
- */
-static constexpr const char *kTelemetryDistroVersion = "telemetry.distro.version";
-
-/**
-  The language of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
-
-/**
-  The name of the telemetry SDK as defined above.
-  <p>
-  The OpenTelemetry SDK MUST set the @code telemetry.sdk.name @endcode attribute to @code
-  opentelemetry @endcode. If another SDK, like a fork or a vendor-provided implementation, is used,
-  this SDK MUST set the
-  @code telemetry.sdk.name @endcode attribute to the fully-qualified class or module name of this
-  SDK's main entry point or another suitable identifier depending on the language. The identifier
-  @code opentelemetry @endcode is reserved and MUST NOT be used in this case. All custom identifiers
-  SHOULD be stable across different versions of an implementation.
- */
-static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
-
-/**
-  The version string of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
-
-namespace TelemetrySdkLanguageValues
-{
-/**
-  none
- */
-static constexpr const char *kCpp = "cpp";
-
-/**
-  none
- */
-static constexpr const char *kDotnet = "dotnet";
-
-/**
-  none
- */
-static constexpr const char *kErlang = "erlang";
-
-/**
-  none
- */
-static constexpr const char *kGo = "go";
-
-/**
-  none
- */
-static constexpr const char *kJava = "java";
-
-/**
-  none
- */
-static constexpr const char *kNodejs = "nodejs";
-
-/**
-  none
- */
-static constexpr const char *kPhp = "php";
-
-/**
-  none
- */
-static constexpr const char *kPython = "python";
-
-/**
-  none
- */
-static constexpr const char *kRuby = "ruby";
-
-/**
-  none
- */
-static constexpr const char *kRust = "rust";
-
-/**
-  none
- */
-static constexpr const char *kSwift = "swift";
-
-/**
-  none
- */
-static constexpr const char *kWebjs = "webjs";
-
-}  // namespace TelemetrySdkLanguageValues
-
-}  // namespace telemetry
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/test_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/test_attributes.h
deleted file mode 100644
index ede4e2348..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/test_attributes.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace test
-{
-
-/**
-  The fully qualified human readable name of the <a href="https://wikipedia.org/wiki/Test_case">test
-  case</a>.
- */
-static constexpr const char *kTestCaseName = "test.case.name";
-
-/**
-  The status of the actual test case result from test execution.
- */
-static constexpr const char *kTestCaseResultStatus = "test.case.result.status";
-
-/**
-  The human readable name of a <a href="https://wikipedia.org/wiki/Test_suite">test suite</a>.
- */
-static constexpr const char *kTestSuiteName = "test.suite.name";
-
-/**
-  The status of the test suite run.
- */
-static constexpr const char *kTestSuiteRunStatus = "test.suite.run.status";
-
-namespace TestCaseResultStatusValues
-{
-/**
-  pass
- */
-static constexpr const char *kPass = "pass";
-
-/**
-  fail
- */
-static constexpr const char *kFail = "fail";
-
-}  // namespace TestCaseResultStatusValues
-
-namespace TestSuiteRunStatusValues
-{
-/**
-  success
- */
-static constexpr const char *kSuccess = "success";
-
-/**
-  failure
- */
-static constexpr const char *kFailure = "failure";
-
-/**
-  skipped
- */
-static constexpr const char *kSkipped = "skipped";
-
-/**
-  aborted
- */
-static constexpr const char *kAborted = "aborted";
-
-/**
-  timed_out
- */
-static constexpr const char *kTimedOut = "timed_out";
-
-/**
-  in_progress
- */
-static constexpr const char *kInProgress = "in_progress";
-
-}  // namespace TestSuiteRunStatusValues
-
-}  // namespace test
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/thread_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/thread_attributes.h
deleted file mode 100644
index 2d0c29065..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/thread_attributes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace thread
-{
-
-/**
-  Current "managed" thread ID (as opposed to OS thread ID).
- */
-static constexpr const char *kThreadId = "thread.id";
-
-/**
-  Current thread name.
- */
-static constexpr const char *kThreadName = "thread.name";
-
-}  // namespace thread
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/tls_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/tls_attributes.h
deleted file mode 100644
index 0deee289d..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/tls_attributes.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace tls
-{
-
-/**
-  String indicating the <a
-  href="https://datatracker.ietf.org/doc/html/rfc5246#appendix-A.5">cipher</a> used during the
-  current connection. <p> The values allowed for @code tls.cipher @endcode MUST be one of the @code
-  Descriptions @endcode of the <a
-  href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#table-tls-parameters-4">registered
-  TLS Cipher Suits</a>.
- */
-static constexpr const char *kTlsCipher = "tls.cipher";
-
-/**
-  PEM-encoded stand-alone certificate offered by the client. This is usually mutually-exclusive of
-  @code client.certificate_chain @endcode since this value also exists in that list.
- */
-static constexpr const char *kTlsClientCertificate = "tls.client.certificate";
-
-/**
-  Array of PEM-encoded certificates that make up the certificate chain offered by the client. This
-  is usually mutually-exclusive of @code client.certificate @endcode since that value should be the
-  first certificate in the chain.
- */
-static constexpr const char *kTlsClientCertificateChain = "tls.client.certificate_chain";
-
-/**
-  Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
-  client. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsClientHashMd5 = "tls.client.hash.md5";
-
-/**
-  Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by the
-  client. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsClientHashSha1 = "tls.client.hash.sha1";
-
-/**
-  Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
-  the client. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsClientHashSha256 = "tls.client.hash.sha256";
-
-/**
-  Distinguished name of <a
-  href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
-  the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientIssuer = "tls.client.issuer";
-
-/**
-  A hash that identifies clients based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsClientJa3 = "tls.client.ja3";
-
-/**
-  Date/Time indicating when client certificate is no longer considered valid.
- */
-static constexpr const char *kTlsClientNotAfter = "tls.client.not_after";
-
-/**
-  Date/Time indicating when client certificate is first considered valid.
- */
-static constexpr const char *kTlsClientNotBefore = "tls.client.not_before";
-
-/**
-  Deprecated, use @code server.address @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code server.address @endcode.", "reason": "renamed", "renamed_to":
-  "server.address"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName =
-    "tls.client.server_name";
-
-/**
-  Distinguished name of subject of the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientSubject = "tls.client.subject";
-
-/**
-  Array of ciphers offered by the client during the client hello.
- */
-static constexpr const char *kTlsClientSupportedCiphers = "tls.client.supported_ciphers";
-
-/**
-  String indicating the curve used for the given cipher, when applicable
- */
-static constexpr const char *kTlsCurve = "tls.curve";
-
-/**
-  Boolean flag indicating if the TLS negotiation was successful and transitioned to an encrypted
-  tunnel.
- */
-static constexpr const char *kTlsEstablished = "tls.established";
-
-/**
-  String indicating the protocol being tunneled. Per the values in the <a
-  href="https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids">IANA
-  registry</a>, this string should be lower case.
- */
-static constexpr const char *kTlsNextProtocol = "tls.next_protocol";
-
-/**
-  Normalized lowercase protocol name parsed from original string of the negotiated <a
-  href="https://docs.openssl.org/1.1.1/man3/SSL_get_version/#return-values">SSL/TLS protocol
-  version</a>
- */
-static constexpr const char *kTlsProtocolName = "tls.protocol.name";
-
-/**
-  Numeric part of the version parsed from the original string of the negotiated <a
-  href="https://docs.openssl.org/1.1.1/man3/SSL_get_version/#return-values">SSL/TLS protocol
-  version</a>
- */
-static constexpr const char *kTlsProtocolVersion = "tls.protocol.version";
-
-/**
-  Boolean flag indicating if this TLS connection was resumed from an existing TLS negotiation.
- */
-static constexpr const char *kTlsResumed = "tls.resumed";
-
-/**
-  PEM-encoded stand-alone certificate offered by the server. This is usually mutually-exclusive of
-  @code server.certificate_chain @endcode since this value also exists in that list.
- */
-static constexpr const char *kTlsServerCertificate = "tls.server.certificate";
-
-/**
-  Array of PEM-encoded certificates that make up the certificate chain offered by the server. This
-  is usually mutually-exclusive of @code server.certificate @endcode since that value should be the
-  first certificate in the chain.
- */
-static constexpr const char *kTlsServerCertificateChain = "tls.server.certificate_chain";
-
-/**
-  Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
-  server. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsServerHashMd5 = "tls.server.hash.md5";
-
-/**
-  Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by the
-  server. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsServerHashSha1 = "tls.server.hash.sha1";
-
-/**
-  Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
-  the server. For consistency with other hash values, this value should be formatted as an uppercase
-  hash.
- */
-static constexpr const char *kTlsServerHashSha256 = "tls.server.hash.sha256";
-
-/**
-  Distinguished name of <a
-  href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
-  the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsServerIssuer = "tls.server.issuer";
-
-/**
-  A hash that identifies servers based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsServerJa3s = "tls.server.ja3s";
-
-/**
-  Date/Time indicating when server certificate is no longer considered valid.
- */
-static constexpr const char *kTlsServerNotAfter = "tls.server.not_after";
-
-/**
-  Date/Time indicating when server certificate is first considered valid.
- */
-static constexpr const char *kTlsServerNotBefore = "tls.server.not_before";
-
-/**
-  Distinguished name of subject of the x.509 certificate presented by the server.
- */
-static constexpr const char *kTlsServerSubject = "tls.server.subject";
-
-namespace TlsProtocolNameValues
-{
-/**
-  none
- */
-static constexpr const char *kSsl = "ssl";
-
-/**
-  none
- */
-static constexpr const char *kTls = "tls";
-
-}  // namespace TlsProtocolNameValues
-
-}  // namespace tls
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/url_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/url_attributes.h
deleted file mode 100644
index ed307e66c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/url_attributes.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace url
-{
-
-/**
-  Domain extracted from the @code url.full @endcode, such as "opentelemetry.io".
-  <p>
-  In some cases a URL may refer to an IP and/or port directly, without a domain name. In this case,
-  the IP address would go to the domain field. If the URL contains a <a
-  href="https://www.rfc-editor.org/rfc/rfc2732#section-2">literal IPv6 address</a> enclosed by @code
-  [ @endcode and @code ] @endcode, the @code [ @endcode and @code ] @endcode characters should also
-  be captured in the domain field.
- */
-static constexpr const char *kUrlDomain = "url.domain";
-
-/**
-  The file extension extracted from the @code url.full @endcode, excluding the leading dot.
-  <p>
-  The file extension is only set if it exists, as not every url has a file extension. When the file
-  name has multiple extensions @code example.tar.gz @endcode, only the last one should be captured
-  @code gz @endcode, not @code tar.gz @endcode.
- */
-static constexpr const char *kUrlExtension = "url.extension";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component
- */
-static constexpr const char *kUrlFragment = "url.fragment";
-
-/**
-  Absolute URL describing a network resource according to <a
-  href="https://www.rfc-editor.org/rfc/rfc3986">RFC3986</a> <p> For network calls, URL usually has
-  @code scheme://host[:port][path][?query][#fragment] @endcode format, where the fragment is not
-  transmitted over HTTP, but if it is known, it SHOULD be included nevertheless. <p>
-  @code url.full @endcode MUST NOT contain credentials passed via URL in form of @code
-  https://username:password@www.example.com/ @endcode. In such case username and password SHOULD be
-  redacted and attribute's value SHOULD be @code https://REDACTED:REDACTED@www.example.com/
-  @endcode. <p>
-  @code url.full @endcode SHOULD capture the absolute URL when it is available (or can be
-  reconstructed). <p> Sensitive content provided in @code url.full @endcode SHOULD be scrubbed when
-  instrumentations can identify it. <p>
-
-  Query string values for the following keys SHOULD be redacted by default and replaced by the
-  value @code REDACTED @endcode:
-  <ul>
-    <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  AWSAccessKeyId @endcode</a></li> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  Signature @endcode</a></li> <li><a
-  href="https://learn.microsoft.com/azure/storage/common/storage-sas-overview#sas-token">@code sig
-  @endcode</a></li> <li><a
-  href="https://cloud.google.com/storage/docs/access-control/signed-urls">@code X-Goog-Signature
-  @endcode</a></li>
-  </ul>
-  <p>
-  This list is subject to change over time.
-  <p>
-  When a query string value is redacted, the query string key SHOULD still be preserved, e.g.
-  @code https://www.example.com/path?color=blue&sig=REDACTED @endcode.
- */
-static constexpr const char *kUrlFull = "url.full";
-
-/**
-  Unmodified original URL as seen in the event source.
-  <p>
-  In network monitoring, the observed URL may be a full URL, whereas in access logs, the URL is
-  often just represented as a path. This field is meant to represent the URL as it was observed,
-  complete or not.
-  @code url.original @endcode might contain credentials passed via URL in form of @code
-  https://username:password@www.example.com/ @endcode. In such case password and username SHOULD NOT
-  be redacted and attribute's value SHOULD remain the same.
- */
-static constexpr const char *kUrlOriginal = "url.original";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.3">URI path</a> component
-  <p>
-  Sensitive content provided in @code url.path @endcode SHOULD be scrubbed when instrumentations can
-  identify it.
- */
-static constexpr const char *kUrlPath = "url.path";
-
-/**
-  Port extracted from the @code url.full @endcode
- */
-static constexpr const char *kUrlPort = "url.port";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.4">URI query</a> component
-  <p>
-  Sensitive content provided in @code url.query @endcode SHOULD be scrubbed when instrumentations
-  can identify it. <p>
-
-  Query string values for the following keys SHOULD be redacted by default and replaced by the value
-  @code REDACTED @endcode: <ul> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  AWSAccessKeyId @endcode</a></li> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  Signature @endcode</a></li> <li><a
-  href="https://learn.microsoft.com/azure/storage/common/storage-sas-overview#sas-token">@code sig
-  @endcode</a></li> <li><a
-  href="https://cloud.google.com/storage/docs/access-control/signed-urls">@code X-Goog-Signature
-  @endcode</a></li>
-  </ul>
-  <p>
-  This list is subject to change over time.
-  <p>
-  When a query string value is redacted, the query string key SHOULD still be preserved, e.g.
-  @code q=OpenTelemetry&sig=REDACTED @endcode.
- */
-static constexpr const char *kUrlQuery = "url.query";
-
-/**
-  The highest registered url domain, stripped of the subdomain.
-  <p>
-  This value can be determined precisely with the <a href="https://publicsuffix.org/">public suffix
-  list</a>. For example, the registered domain for @code foo.example.com @endcode is @code
-  example.com @endcode. Trying to approximate this by simply taking the last two labels will not
-  work well for TLDs such as @code co.uk @endcode.
- */
-static constexpr const char *kUrlRegisteredDomain = "url.registered_domain";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
-  identifying the used protocol.
- */
-static constexpr const char *kUrlScheme = "url.scheme";
-
-/**
-  The subdomain portion of a fully qualified domain name includes all of the names except the host
-  name under the registered_domain. In a partially qualified domain, or if the qualification level
-  of the full name cannot be determined, subdomain contains all of the names below the registered
-  domain. <p> The subdomain portion of @code www.east.mydomain.co.uk @endcode is @code east
-  @endcode. If the domain has multiple levels of subdomain, such as @code sub2.sub1.example.com
-  @endcode, the subdomain field should contain @code sub2.sub1 @endcode, with no trailing period.
- */
-static constexpr const char *kUrlSubdomain = "url.subdomain";
-
-/**
-  The low-cardinality template of an <a
-  href="https://www.rfc-editor.org/rfc/rfc3986#section-4.2">absolute path reference</a>.
- */
-static constexpr const char *kUrlTemplate = "url.template";
-
-/**
-  The effective top level domain (eTLD), also known as the domain suffix, is the last part of the
-  domain name. For example, the top level domain for example.com is @code com @endcode. <p> This
-  value can be determined precisely with the <a href="https://publicsuffix.org/">public suffix
-  list</a>.
- */
-static constexpr const char *kUrlTopLevelDomain = "url.top_level_domain";
-
-}  // namespace url
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/user_agent_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/user_agent_attributes.h
deleted file mode 100644
index f3c59a691..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/user_agent_attributes.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace user_agent
-{
-
-/**
-  Name of the user-agent extracted from original. Usually refers to the browser's name.
-  <p>
-  <a href="https://www.whatsmyua.info">Example</a> of extracting browser's name from original
-  string. In the case of using a user-agent for non-browser products, such as microservices with
-  multiple names/versions inside the @code user_agent.original @endcode, the most significant name
-  SHOULD be selected. In such a scenario it should align with @code user_agent.version @endcode
- */
-static constexpr const char *kUserAgentName = "user_agent.name";
-
-/**
-  Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
-  User-Agent</a> header sent by the client.
- */
-static constexpr const char *kUserAgentOriginal = "user_agent.original";
-
-/**
-  Human readable operating system name.
-  <p>
-  For mapping user agent strings to OS names, libraries such as <a
-  href="https://github.com/ua-parser">ua-parser</a> can be utilized.
- */
-static constexpr const char *kUserAgentOsName = "user_agent.os.name";
-
-/**
-  The version string of the operating system as defined in <a
-  href="/docs/resource/README.md#version-attributes">Version Attributes</a>. <p> For mapping user
-  agent strings to OS versions, libraries such as <a
-  href="https://github.com/ua-parser">ua-parser</a> can be utilized.
- */
-static constexpr const char *kUserAgentOsVersion = "user_agent.os.version";
-
-/**
-  Specifies the category of synthetic traffic, such as tests or bots.
-  <p>
-  This attribute MAY be derived from the contents of the @code user_agent.original @endcode
-  attribute. Components that populate the attribute are responsible for determining what they
-  consider to be synthetic bot or test traffic. This attribute can either be set for
-  self-identification purposes, or on telemetry detected to be generated as a result of a synthetic
-  request. This attribute is useful for distinguishing between genuine client traffic and synthetic
-  traffic generated by bots or tests.
- */
-static constexpr const char *kUserAgentSyntheticType = "user_agent.synthetic.type";
-
-/**
-  Version of the user-agent extracted from original. Usually refers to the browser's version
-  <p>
-  <a href="https://www.whatsmyua.info">Example</a> of extracting browser's version from original
-  string. In the case of using a user-agent for non-browser products, such as microservices with
-  multiple names/versions inside the @code user_agent.original @endcode, the most significant
-  version SHOULD be selected. In such a scenario it should align with @code user_agent.name @endcode
- */
-static constexpr const char *kUserAgentVersion = "user_agent.version";
-
-namespace UserAgentSyntheticTypeValues
-{
-/**
-  Bot source.
- */
-static constexpr const char *kBot = "bot";
-
-/**
-  Synthetic test source.
- */
-static constexpr const char *kTest = "test";
-
-}  // namespace UserAgentSyntheticTypeValues
-
-}  // namespace user_agent
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/user_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/user_attributes.h
deleted file mode 100644
index c1cc752bd..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/user_attributes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace user
-{
-
-/**
-  User email address.
- */
-static constexpr const char *kUserEmail = "user.email";
-
-/**
-  User's full name
- */
-static constexpr const char *kUserFullName = "user.full_name";
-
-/**
-  Unique user hash to correlate information for a user in anonymized form.
-  <p>
-  Useful if @code user.id @endcode or @code user.name @endcode contain confidential information and
-  cannot be used.
- */
-static constexpr const char *kUserHash = "user.hash";
-
-/**
-  Unique identifier of the user.
- */
-static constexpr const char *kUserId = "user.id";
-
-/**
-  Short name or login/username of the user.
- */
-static constexpr const char *kUserName = "user.name";
-
-/**
-  Array of user roles at the time of the event.
- */
-static constexpr const char *kUserRoles = "user.roles";
-
-}  // namespace user
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/vcs_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/vcs_attributes.h
deleted file mode 100644
index 5a0f31952..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/vcs_attributes.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace vcs
-{
-
-/**
-  The ID of the change (pull request/merge request/changelist) if applicable. This is usually a
-  unique (within repository) identifier generated by the VCS system.
- */
-static constexpr const char *kVcsChangeId = "vcs.change.id";
-
-/**
-  The state of the change (pull request/merge request/changelist).
- */
-static constexpr const char *kVcsChangeState = "vcs.change.state";
-
-/**
-  The human readable title of the change (pull request/merge request/changelist). This title is
-  often a brief summary of the change and may get merged in to a ref as the commit summary.
- */
-static constexpr const char *kVcsChangeTitle = "vcs.change.title";
-
-/**
-  The type of line change being measured on a branch or change.
- */
-static constexpr const char *kVcsLineChangeType = "vcs.line_change.type";
-
-/**
-  The group owner within the version control system.
- */
-static constexpr const char *kVcsOwnerName = "vcs.owner.name";
-
-/**
-  The name of the version control system provider.
- */
-static constexpr const char *kVcsProviderName = "vcs.provider.name";
-
-/**
-  The name of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> such as
-  <strong>branch</strong> or <strong>tag</strong> in the repository. <p>
-  @code base @endcode refers to the starting point of a change. For example, @code main @endcode
-  would be the base reference of type branch if you've created a new
-  reference of type branch from it and created new commits.
- */
-static constexpr const char *kVcsRefBaseName = "vcs.ref.base.name";
-
-/**
-  The revision, literally <a href="https://www.merriam-webster.com/dictionary/revision">revised
-  version</a>, The revision most often refers to a commit object in Git, or a revision number in
-  SVN. <p>
-  @code base @endcode refers to the starting point of a change. For example, @code main @endcode
-  would be the base reference of type branch if you've created a new
-  reference of type branch from it and created new commits. The
-  revision can be a full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash
-  value (see glossary)</a>, of the recorded change to a ref within a repository pointing to a commit
-  <a href="https://git-scm.com/docs/git-commit">commit</a> object. It does not necessarily have to
-  be a hash; it can simply define a <a
-  href="https://svnbook.red-bean.com/en/1.7/svn.tour.revs.specifiers.html">revision number</a> which
-  is an integer that is monotonically increasing. In cases where it is identical to the @code
-  ref.base.name @endcode, it SHOULD still be included. It is up to the implementer to decide which
-  value to set as the revision based on the VCS system and situational context.
- */
-static constexpr const char *kVcsRefBaseRevision = "vcs.ref.base.revision";
-
-/**
-  The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
-  repository. <p>
-  @code base @endcode refers to the starting point of a change. For example, @code main @endcode
-  would be the base reference of type branch if you've created a new
-  reference of type branch from it and created new commits.
- */
-static constexpr const char *kVcsRefBaseType = "vcs.ref.base.type";
-
-/**
-  The name of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> such as
-  <strong>branch</strong> or <strong>tag</strong> in the repository. <p>
-  @code head @endcode refers to where you are right now; the current reference at a
-  given time.
- */
-static constexpr const char *kVcsRefHeadName = "vcs.ref.head.name";
-
-/**
-  The revision, literally <a href="https://www.merriam-webster.com/dictionary/revision">revised
-  version</a>, The revision most often refers to a commit object in Git, or a revision number in
-  SVN. <p>
-  @code head @endcode refers to where you are right now; the current reference at a
-  given time.The revision can be a full <a
-  href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see glossary)</a>,
-  of the recorded change to a ref within a repository pointing to a
-  commit <a href="https://git-scm.com/docs/git-commit">commit</a> object. It does
-  not necessarily have to be a hash; it can simply define a <a
-  href="https://svnbook.red-bean.com/en/1.7/svn.tour.revs.specifiers.html">revision number</a> which
-  is an integer that is monotonically increasing. In cases where it is identical to the @code
-  ref.head.name @endcode, it SHOULD still be included. It is up to the implementer to decide which
-  value to set as the revision based on the VCS system and situational context.
- */
-static constexpr const char *kVcsRefHeadRevision = "vcs.ref.head.revision";
-
-/**
-  The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
-  repository. <p>
-  @code head @endcode refers to where you are right now; the current reference at a
-  given time.
- */
-static constexpr const char *kVcsRefHeadType = "vcs.ref.head.type";
-
-/**
-  The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
-  repository.
- */
-static constexpr const char *kVcsRefType = "vcs.ref.type";
-
-/**
-  Deprecated, use @code vcs.change.id @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.change.id @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.change.id"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeId =
-    "vcs.repository.change.id";
-
-/**
-  Deprecated, use @code vcs.change.title @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.change.title @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.change.title"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryChangeTitle =
-    "vcs.repository.change.title";
-
-/**
-  The human readable name of the repository. It SHOULD NOT include any additional identifier like
-  Group/SubGroup in GitLab or organization in GitHub. <p> Due to it only being the name, it can
-  clash with forks of the same repository if collecting telemetry across multiple orgs or groups in
-  the same backends.
- */
-static constexpr const char *kVcsRepositoryName = "vcs.repository.name";
-
-/**
-  Deprecated, use @code vcs.ref.head.name @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.ref.head.name @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.ref.head.name"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefName =
-    "vcs.repository.ref.name";
-
-/**
-  Deprecated, use @code vcs.ref.head.revision @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.ref.head.revision @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.ref.head.revision"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefRevision =
-    "vcs.repository.ref.revision";
-
-/**
-  Deprecated, use @code vcs.ref.head.type @endcode instead.
-
-  @deprecated
-  {"note": "Replaced by @code vcs.ref.head.type @endcode.", "reason": "renamed", "renamed_to":
-  "vcs.ref.head.type"}
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kVcsRepositoryRefType =
-    "vcs.repository.ref.type";
-
-/**
-  The <a
-  href="https://support.google.com/webmasters/answer/10347851?hl=en#:~:text=A%20canonical%20URL%20is%20the,Google%20chooses%20one%20as%20canonical.">canonical
-  URL</a> of the repository providing the complete HTTP(S) address in order to locate and identify
-  the repository through a browser. <p> In Git Version Control Systems, the canonical URL SHOULD NOT
-  include the @code .git @endcode extension.
- */
-static constexpr const char *kVcsRepositoryUrlFull = "vcs.repository.url.full";
-
-/**
-  The type of revision comparison.
- */
-static constexpr const char *kVcsRevisionDeltaDirection = "vcs.revision_delta.direction";
-
-namespace VcsChangeStateValues
-{
-/**
-  Open means the change is currently active and under review. It hasn't been merged into the target
-  branch yet, and it's still possible to make changes or add comments.
- */
-static constexpr const char *kOpen = "open";
-
-/**
-  WIP (work-in-progress, draft) means the change is still in progress and not yet ready for a full
-  review. It might still undergo significant changes.
- */
-static constexpr const char *kWip = "wip";
-
-/**
-  Closed means the merge request has been closed without merging. This can happen for various
-  reasons, such as the changes being deemed unnecessary, the issue being resolved in another way, or
-  the author deciding to withdraw the request.
- */
-static constexpr const char *kClosed = "closed";
-
-/**
-  Merged indicates that the change has been successfully integrated into the target codebase.
- */
-static constexpr const char *kMerged = "merged";
-
-}  // namespace VcsChangeStateValues
-
-namespace VcsLineChangeTypeValues
-{
-/**
-  How many lines were added.
- */
-static constexpr const char *kAdded = "added";
-
-/**
-  How many lines were removed.
- */
-static constexpr const char *kRemoved = "removed";
-
-}  // namespace VcsLineChangeTypeValues
-
-namespace VcsProviderNameValues
-{
-/**
-  <a href="https://github.com">GitHub</a>
- */
-static constexpr const char *kGithub = "github";
-
-/**
-  <a href="https://gitlab.com">GitLab</a>
- */
-static constexpr const char *kGitlab = "gitlab";
-
-/**
-  Deprecated, use @code gitea @endcode instead.
- */
-static constexpr const char *kGittea = "gittea";
-
-/**
-  <a href="https://gitea.io">Gitea</a>
- */
-static constexpr const char *kGitea = "gitea";
-
-/**
-  <a href="https://bitbucket.org">Bitbucket</a>
- */
-static constexpr const char *kBitbucket = "bitbucket";
-
-}  // namespace VcsProviderNameValues
-
-namespace VcsRefBaseTypeValues
-{
-/**
-  <a
-  href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch">branch</a>
- */
-static constexpr const char *kBranch = "branch";
-
-/**
-  <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag">tag</a>
- */
-static constexpr const char *kTag = "tag";
-
-}  // namespace VcsRefBaseTypeValues
-
-namespace VcsRefHeadTypeValues
-{
-/**
-  <a
-  href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch">branch</a>
- */
-static constexpr const char *kBranch = "branch";
-
-/**
-  <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag">tag</a>
- */
-static constexpr const char *kTag = "tag";
-
-}  // namespace VcsRefHeadTypeValues
-
-namespace VcsRefTypeValues
-{
-/**
-  <a
-  href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch">branch</a>
- */
-static constexpr const char *kBranch = "branch";
-
-/**
-  <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag">tag</a>
- */
-static constexpr const char *kTag = "tag";
-
-}  // namespace VcsRefTypeValues
-
-namespace VcsRepositoryRefTypeValues
-{
-/**
-  <a
-  href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch">branch</a>
- */
-static constexpr const char *kBranch = "branch";
-
-/**
-  <a href="https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag">tag</a>
- */
-static constexpr const char *kTag = "tag";
-
-}  // namespace VcsRepositoryRefTypeValues
-
-namespace VcsRevisionDeltaDirectionValues
-{
-/**
-  How many revisions the change is behind the target ref.
- */
-static constexpr const char *kBehind = "behind";
-
-/**
-  How many revisions the change is ahead of the target ref.
- */
-static constexpr const char *kAhead = "ahead";
-
-}  // namespace VcsRevisionDeltaDirectionValues
-
-}  // namespace vcs
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/vcs_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/vcs_metrics.h
deleted file mode 100644
index c38dce26a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/vcs_metrics.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace vcs
-{
-
-/**
-  The number of changes (pull requests/merge requests/changelists) in a repository, categorized by
-  their state (e.g. open or merged) <p> updowncounter
- */
-static constexpr const char *kMetricVcsChangeCount = "vcs.change.count";
-static constexpr const char *descrMetricVcsChangeCount =
-    "The number of changes (pull requests/merge requests/changelists) in a repository, categorized "
-    "by their state (e.g. open or merged)";
-static constexpr const char *unitMetricVcsChangeCount = "{change}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                         unitMetricVcsChangeCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                          unitMetricVcsChangeCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsChangeCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                                   unitMetricVcsChangeCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricVcsChangeCount, descrMetricVcsChangeCount, unitMetricVcsChangeCount);
-}
-
-/**
-  The time duration a change (pull request/merge request/changelist) has been in a given state.
-  <p>
-  gauge
- */
-static constexpr const char *kMetricVcsChangeDuration = "vcs.change.duration";
-static constexpr const char *descrMetricVcsChangeDuration =
-    "The time duration a change (pull request/merge request/changelist) has been in a given state.";
-static constexpr const char *unitMetricVcsChangeDuration = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsChangeDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                 unitMetricVcsChangeDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsChangeDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                  unitMetricVcsChangeDuration);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeDuration(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                           unitMetricVcsChangeDuration);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                            unitMetricVcsChangeDuration);
-}
-
-/**
-  The amount of time since its creation it took a change (pull request/merge request/changelist) to
-  get the first approval. <p> gauge
- */
-static constexpr const char *kMetricVcsChangeTimeToApproval = "vcs.change.time_to_approval";
-static constexpr const char *descrMetricVcsChangeTimeToApproval =
-    "The amount of time since its creation it took a change (pull request/merge "
-    "request/changelist) to get the first approval.";
-static constexpr const char *unitMetricVcsChangeTimeToApproval = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeTimeToApproval, descrMetricVcsChangeTimeToApproval,
-                                 unitMetricVcsChangeTimeToApproval);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeTimeToApproval,
-                                  descrMetricVcsChangeTimeToApproval,
-                                  unitMetricVcsChangeTimeToApproval);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsChangeTimeToApproval,
-                                           descrMetricVcsChangeTimeToApproval,
-                                           unitMetricVcsChangeTimeToApproval);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsChangeTimeToApproval,
-                                            descrMetricVcsChangeTimeToApproval,
-                                            unitMetricVcsChangeTimeToApproval);
-}
-
-/**
-  The amount of time since its creation it took a change (pull request/merge request/changelist) to
-  get merged into the target(base) ref. <p> gauge
- */
-static constexpr const char *kMetricVcsChangeTimeToMerge = "vcs.change.time_to_merge";
-static constexpr const char *descrMetricVcsChangeTimeToMerge =
-    "The amount of time since its creation it took a change (pull request/merge "
-    "request/changelist) to get merged into the target(base) ref.";
-static constexpr const char *unitMetricVcsChangeTimeToMerge = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsChangeTimeToMerge(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge,
-                                 unitMetricVcsChangeTimeToMerge);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsChangeTimeToMerge(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge,
-                                  unitMetricVcsChangeTimeToMerge);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeTimeToMerge(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge, unitMetricVcsChangeTimeToMerge);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeTimeToMerge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge, unitMetricVcsChangeTimeToMerge);
-}
-
-/**
-  The number of unique contributors to a repository
-  <p>
-  gauge
- */
-static constexpr const char *kMetricVcsContributorCount = "vcs.contributor.count";
-static constexpr const char *descrMetricVcsContributorCount =
-    "The number of unique contributors to a repository";
-static constexpr const char *unitMetricVcsContributorCount = "{contributor}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsContributorCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsContributorCount, descrMetricVcsContributorCount,
-                                 unitMetricVcsContributorCount);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsContributorCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsContributorCount, descrMetricVcsContributorCount,
-                                  unitMetricVcsContributorCount);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsContributorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsContributorCount, descrMetricVcsContributorCount, unitMetricVcsContributorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsContributorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsContributorCount, descrMetricVcsContributorCount, unitMetricVcsContributorCount);
-}
-
-/**
-  The number of refs of type branch or tag in a repository.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricVcsRefCount = "vcs.ref.count";
-static constexpr const char *descrMetricVcsRefCount =
-    "The number of refs of type branch or tag in a repository.";
-static constexpr const char *unitMetricVcsRefCount = "{ref}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                         unitMetricVcsRefCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                          unitMetricVcsRefCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                                   unitMetricVcsRefCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                                    unitMetricVcsRefCount);
-}
-
-/**
-  The number of lines added/removed in a ref (branch) relative to the ref from the @code
-  vcs.ref.base.name @endcode attribute. <p> This metric should be reported for each @code
-  vcs.line_change.type @endcode value. For example if a ref added 3 lines and removed 2 lines,
-  instrumentation SHOULD report two measurements: 3 and 2 (both positive numbers).
-  If number of lines added/removed should be calculated from the start of time, then @code
-  vcs.ref.base.name @endcode SHOULD be set to an empty string. <p> gauge
- */
-static constexpr const char *kMetricVcsRefLinesDelta = "vcs.ref.lines_delta";
-static constexpr const char *descrMetricVcsRefLinesDelta =
-    "The number of lines added/removed in a ref (branch) relative to the ref from the "
-    "`vcs.ref.base.name` attribute.";
-static constexpr const char *unitMetricVcsRefLinesDelta = "{line}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefLinesDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                 unitMetricVcsRefLinesDelta);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefLinesDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                  unitMetricVcsRefLinesDelta);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRefLinesDelta(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                           unitMetricVcsRefLinesDelta);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRefLinesDelta(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                            unitMetricVcsRefLinesDelta);
-}
-
-/**
-  The number of revisions (commits) a ref (branch) is ahead/behind the branch from the @code
-  vcs.ref.base.name @endcode attribute <p> This metric should be reported for each @code
-  vcs.revision_delta.direction @endcode value. For example if branch @code a @endcode is 3 commits
-  behind and 2 commits ahead of @code trunk @endcode, instrumentation SHOULD report two
-  measurements: 3 and 2 (both positive numbers) and @code vcs.ref.base.name @endcode is set to @code
-  trunk @endcode. <p> gauge
- */
-static constexpr const char *kMetricVcsRefRevisionsDelta = "vcs.ref.revisions_delta";
-static constexpr const char *descrMetricVcsRefRevisionsDelta =
-    "The number of revisions (commits) a ref (branch) is ahead/behind the branch from the "
-    "`vcs.ref.base.name` attribute";
-static constexpr const char *unitMetricVcsRefRevisionsDelta = "{revision}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefRevisionsDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta,
-                                 unitMetricVcsRefRevisionsDelta);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefRevisionsDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta,
-                                  unitMetricVcsRefRevisionsDelta);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRefRevisionsDelta(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta, unitMetricVcsRefRevisionsDelta);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRefRevisionsDelta(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta, unitMetricVcsRefRevisionsDelta);
-}
-
-/**
-  Time a ref (branch) created from the default branch (trunk) has existed. The @code ref.type
-  @endcode attribute will always be @code branch @endcode <p> gauge
- */
-static constexpr const char *kMetricVcsRefTime = "vcs.ref.time";
-static constexpr const char *descrMetricVcsRefTime =
-    "Time a ref (branch) created from the default branch (trunk) has existed. The `ref.type` "
-    "attribute will always be `branch`";
-static constexpr const char *unitMetricVcsRefTime = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefTime, descrMetricVcsRefTime, unitMetricVcsRefTime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefTime, descrMetricVcsRefTime, unitMetricVcsRefTime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsRefTime, descrMetricVcsRefTime,
-                                           unitMetricVcsRefTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsRefTime, descrMetricVcsRefTime,
-                                            unitMetricVcsRefTime);
-}
-
-/**
-  The number of repositories in an organization.
-  <p>
-  updowncounter
- */
-static constexpr const char *kMetricVcsRepositoryCount = "vcs.repository.count";
-static constexpr const char *descrMetricVcsRepositoryCount =
-    "The number of repositories in an organization.";
-static constexpr const char *unitMetricVcsRepositoryCount = "{repository}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount,
-                                         unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount,
-                                          unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount, unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount, unitMetricVcsRepositoryCount);
-}
-
-}  // namespace vcs
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/webengine_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/webengine_attributes.h
deleted file mode 100644
index 920890f76..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/incubating/webengine_attributes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace webengine
-{
-
-/**
-  Additional description of the web engine (e.g. detailed version and edition information).
- */
-static constexpr const char *kWebengineDescription = "webengine.description";
-
-/**
-  The name of the web engine.
- */
-static constexpr const char *kWebengineName = "webengine.name";
-
-/**
-  The version of the web engine.
- */
-static constexpr const char *kWebengineVersion = "webengine.version";
-
-}  // namespace webengine
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/k8s_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/k8s_metrics.h
deleted file mode 100644
index 0c2a18ea2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/k8s_metrics.h
+++ /dev/null
@@ -1,1735 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace k8s
-{
-
-/**
- * The number of actively running jobs for a cronjob
- * <p>
- * This metric aligns with the @code active @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch">K8s
- * CronJobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#cronjob">@code k8s.cronjob @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sCronjobActiveJobs = "k8s.cronjob.active_jobs";
-static constexpr const char *descrMetricK8sCronjobActiveJobs =
-    "The number of actively running jobs for a cronjob";
-static constexpr const char *unitMetricK8sCronjobActiveJobs = "{job}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sCronjobActiveJobs(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sCronjobActiveJobs, descrMetricK8sCronjobActiveJobs, unitMetricK8sCronjobActiveJobs);
-}
-
-/**
- * Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod
- * <p>
- * This metric aligns with the @code currentNumberScheduled @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
- * DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetCurrentScheduledNodes =
-    "k8s.daemonset.current_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetCurrentScheduledNodes =
-    "Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod";
-static constexpr const char *unitMetricK8sDaemonsetCurrentScheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                         descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                         unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                          descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                          unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                                   descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                                   unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetCurrentScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetCurrentScheduledNodes,
-                                                    descrMetricK8sDaemonsetCurrentScheduledNodes,
-                                                    unitMetricK8sDaemonsetCurrentScheduledNodes);
-}
-
-/**
- * Number of nodes that should be running the daemon pod (including nodes currently running the
- * daemon pod) <p> This metric aligns with the @code desiredNumberScheduled @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
- * DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetDesiredScheduledNodes =
-    "k8s.daemonset.desired_scheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetDesiredScheduledNodes =
-    "Number of nodes that should be running the daemon pod (including nodes currently running the "
-    "daemon pod)";
-static constexpr const char *unitMetricK8sDaemonsetDesiredScheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                         descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                         unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                          descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                          unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                                   descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                                   unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetDesiredScheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetDesiredScheduledNodes,
-                                                    descrMetricK8sDaemonsetDesiredScheduledNodes,
-                                                    unitMetricK8sDaemonsetDesiredScheduledNodes);
-}
-
-/**
- * Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod
- * <p>
- * This metric aligns with the @code numberMisscheduled @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
- * DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetMisscheduledNodes =
-    "k8s.daemonset.misscheduled_nodes";
-static constexpr const char *descrMetricK8sDaemonsetMisscheduledNodes =
-    "Number of nodes that are running the daemon pod, but are not supposed to run the daemon pod";
-static constexpr const char *unitMetricK8sDaemonsetMisscheduledNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                         descrMetricK8sDaemonsetMisscheduledNodes,
-                                         unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                          descrMetricK8sDaemonsetMisscheduledNodes,
-                                          unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                                   descrMetricK8sDaemonsetMisscheduledNodes,
-                                                   unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetMisscheduledNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetMisscheduledNodes,
-                                                    descrMetricK8sDaemonsetMisscheduledNodes,
-                                                    unitMetricK8sDaemonsetMisscheduledNodes);
-}
-
-/**
- * Number of nodes that should be running the daemon pod and have one or more of the daemon pod
- * running and ready <p> This metric aligns with the @code numberReady @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#daemonsetstatus-v1-apps">K8s
- * DaemonSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#daemonset">@code k8s.daemonset @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sDaemonsetReadyNodes = "k8s.daemonset.ready_nodes";
-static constexpr const char *descrMetricK8sDaemonsetReadyNodes =
-    "Number of nodes that should be running the daemon pod and have one or more of the daemon pod "
-    "running and ready";
-static constexpr const char *unitMetricK8sDaemonsetReadyNodes = "{node}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                         descrMetricK8sDaemonsetReadyNodes,
-                                         unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                          descrMetricK8sDaemonsetReadyNodes,
-                                          unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                   descrMetricK8sDaemonsetReadyNodes,
-                                                   unitMetricK8sDaemonsetReadyNodes);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDaemonsetReadyNodes(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDaemonsetReadyNodes,
-                                                    descrMetricK8sDaemonsetReadyNodes,
-                                                    unitMetricK8sDaemonsetReadyNodes);
-}
-
-/**
- * Total number of available replica pods (ready for at least minReadySeconds) targeted by this
- * deployment <p> This metric aligns with the @code availableReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentstatus-v1-apps">K8s
- * DeploymentStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#deployment">@code k8s.deployment @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sDeploymentAvailablePods = "k8s.deployment.available_pods";
-static constexpr const char *descrMetricK8sDeploymentAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "deployment";
-static constexpr const char *unitMetricK8sDeploymentAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                         descrMetricK8sDeploymentAvailablePods,
-                                         unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                          descrMetricK8sDeploymentAvailablePods,
-                                          unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                   descrMetricK8sDeploymentAvailablePods,
-                                                   unitMetricK8sDeploymentAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentAvailablePods,
-                                                    descrMetricK8sDeploymentAvailablePods,
-                                                    unitMetricK8sDeploymentAvailablePods);
-}
-
-/**
- * Number of desired replica pods in this deployment
- * <p>
- * This metric aligns with the @code replicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#deploymentspec-v1-apps">K8s
- * DeploymentSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#deployment">@code k8s.deployment @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sDeploymentDesiredPods = "k8s.deployment.desired_pods";
-static constexpr const char *descrMetricK8sDeploymentDesiredPods =
-    "Number of desired replica pods in this deployment";
-static constexpr const char *unitMetricK8sDeploymentDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                         descrMetricK8sDeploymentDesiredPods,
-                                         unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                          descrMetricK8sDeploymentDesiredPods,
-                                          unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                   descrMetricK8sDeploymentDesiredPods,
-                                                   unitMetricK8sDeploymentDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sDeploymentDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sDeploymentDesiredPods,
-                                                    descrMetricK8sDeploymentDesiredPods,
-                                                    unitMetricK8sDeploymentDesiredPods);
-}
-
-/**
- * Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the
- * autoscaler <p> This metric aligns with the @code currentReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
- * HorizontalPodAutoscalerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sHpaCurrentPods = "k8s.hpa.current_pods";
-static constexpr const char *descrMetricK8sHpaCurrentPods =
-    "Current number of replica pods managed by this horizontal pod autoscaler, as last seen by the "
-    "autoscaler";
-static constexpr const char *unitMetricK8sHpaCurrentPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                         unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods,
-                                          unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaCurrentPods, descrMetricK8sHpaCurrentPods, unitMetricK8sHpaCurrentPods);
-}
-
-/**
- * Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated by
- * the autoscaler <p> This metric aligns with the @code desiredReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerstatus-v2-autoscaling">K8s
- * HorizontalPodAutoscalerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sHpaDesiredPods = "k8s.hpa.desired_pods";
-static constexpr const char *descrMetricK8sHpaDesiredPods =
-    "Desired number of replica pods managed by this horizontal pod autoscaler, as last calculated "
-    "by the autoscaler";
-static constexpr const char *unitMetricK8sHpaDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                         unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods,
-                                          unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sHpaDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sHpaDesiredPods, descrMetricK8sHpaDesiredPods, unitMetricK8sHpaDesiredPods);
-}
-
-/**
- * The upper limit for the number of replica pods to which the autoscaler can scale up
- * <p>
- * This metric aligns with the @code maxReplicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
- * HorizontalPodAutoscalerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sHpaMaxPods = "k8s.hpa.max_pods";
-static constexpr const char *descrMetricK8sHpaMaxPods =
-    "The upper limit for the number of replica pods to which the autoscaler can scale up";
-static constexpr const char *unitMetricK8sHpaMaxPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                         unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                          unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                                   unitMetricK8sHpaMaxPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMaxPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMaxPods, descrMetricK8sHpaMaxPods,
-                                                    unitMetricK8sHpaMaxPods);
-}
-
-/**
- * The lower limit for the number of replica pods to which the autoscaler can scale down
- * <p>
- * This metric aligns with the @code minReplicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#horizontalpodautoscalerspec-v2-autoscaling">K8s
- * HorizontalPodAutoscalerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#horizontalpodautoscaler">@code k8s.hpa @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sHpaMinPods = "k8s.hpa.min_pods";
-static constexpr const char *descrMetricK8sHpaMinPods =
-    "The lower limit for the number of replica pods to which the autoscaler can scale down";
-static constexpr const char *unitMetricK8sHpaMinPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                         unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                          unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                                   unitMetricK8sHpaMinPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sHpaMinPods(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sHpaMinPods, descrMetricK8sHpaMinPods,
-                                                    unitMetricK8sHpaMinPods);
-}
-
-/**
- * The number of pending and actively running pods for a job
- * <p>
- * This metric aligns with the @code active @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
- * JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobActivePods = "k8s.job.active_pods";
-static constexpr const char *descrMetricK8sJobActivePods =
-    "The number of pending and actively running pods for a job";
-static constexpr const char *unitMetricK8sJobActivePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                         unitMetricK8sJobActivePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobActivePods, descrMetricK8sJobActivePods,
-                                          unitMetricK8sJobActivePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobActivePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobActivePods, descrMetricK8sJobActivePods, unitMetricK8sJobActivePods);
-}
-
-/**
- * The desired number of successfully finished pods the job should be run with
- * <p>
- * This metric aligns with the @code completions @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
- * JobSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobDesiredSuccessfulPods = "k8s.job.desired_successful_pods";
-static constexpr const char *descrMetricK8sJobDesiredSuccessfulPods =
-    "The desired number of successfully finished pods the job should be run with";
-static constexpr const char *unitMetricK8sJobDesiredSuccessfulPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                         descrMetricK8sJobDesiredSuccessfulPods,
-                                         unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                          descrMetricK8sJobDesiredSuccessfulPods,
-                                          unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                                   descrMetricK8sJobDesiredSuccessfulPods,
-                                                   unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobDesiredSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobDesiredSuccessfulPods,
-                                                    descrMetricK8sJobDesiredSuccessfulPods,
-                                                    unitMetricK8sJobDesiredSuccessfulPods);
-}
-
-/**
- * The number of pods which reached phase Failed for a job
- * <p>
- * This metric aligns with the @code failed @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
- * JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobFailedPods = "k8s.job.failed_pods";
-static constexpr const char *descrMetricK8sJobFailedPods =
-    "The number of pods which reached phase Failed for a job";
-static constexpr const char *unitMetricK8sJobFailedPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
-                                         unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods,
-                                          unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobFailedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobFailedPods, descrMetricK8sJobFailedPods, unitMetricK8sJobFailedPods);
-}
-
-/**
- * The max desired number of pods the job should run at any given time
- * <p>
- * This metric aligns with the @code parallelism @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch">K8s
- * JobSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobMaxParallelPods = "k8s.job.max_parallel_pods";
-static constexpr const char *descrMetricK8sJobMaxParallelPods =
-    "The max desired number of pods the job should run at any given time";
-static constexpr const char *unitMetricK8sJobMaxParallelPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sJobMaxParallelPods,
-                                         descrMetricK8sJobMaxParallelPods,
-                                         unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                          descrMetricK8sJobMaxParallelPods,
-                                          unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                   descrMetricK8sJobMaxParallelPods,
-                                                   unitMetricK8sJobMaxParallelPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobMaxParallelPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sJobMaxParallelPods,
-                                                    descrMetricK8sJobMaxParallelPods,
-                                                    unitMetricK8sJobMaxParallelPods);
-}
-
-/**
- * The number of pods which reached phase Succeeded for a job
- * <p>
- * This metric aligns with the @code succeeded @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch">K8s
- * JobStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#job">@code k8s.job @endcode</a> resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sJobSuccessfulPods = "k8s.job.successful_pods";
-static constexpr const char *descrMetricK8sJobSuccessfulPods =
-    "The number of pods which reached phase Succeeded for a job";
-static constexpr const char *unitMetricK8sJobSuccessfulPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sJobSuccessfulPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sJobSuccessfulPods, descrMetricK8sJobSuccessfulPods, unitMetricK8sJobSuccessfulPods);
-}
-
-/**
- * Describes number of K8s namespaces that are currently in a given phase.
- * <p>
- * This metric SHOULD, at a minimum, be reported against a
- * <a href="../resource/k8s.md#namespace">@code k8s.namespace @endcode</a> resource.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sNamespacePhase = "k8s.namespace.phase";
-static constexpr const char *descrMetricK8sNamespacePhase =
-    "Describes number of K8s namespaces that are currently in a given phase.";
-static constexpr const char *unitMetricK8sNamespacePhase = "{namespace}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase,
-                                         unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase,
-                                          unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase, unitMetricK8sNamespacePhase);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNamespacePhase(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sNamespacePhase, descrMetricK8sNamespacePhase, unitMetricK8sNamespacePhase);
-}
-
-/**
- * Total CPU time consumed
- * <p>
- * Total CPU time consumed by the specific Node on all available CPU cores
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sNodeCpuTime     = "k8s.node.cpu.time";
-static constexpr const char *descrMetricK8sNodeCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricK8sNodeCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                    unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                    unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sNodeCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                             unitMetricK8sNodeCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sNodeCpuTime, descrMetricK8sNodeCpuTime,
-                                              unitMetricK8sNodeCpuTime);
-}
-
-/**
- * Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
- * <p>
- * CPU usage of the specific Node on all available CPU cores, averaged over the sample window
- * <p>
- * gauge
- */
-static constexpr const char *kMetricK8sNodeCpuUsage = "k8s.node.cpu.usage";
-static constexpr const char *descrMetricK8sNodeCpuUsage =
-    "Node's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricK8sNodeCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                 unitMetricK8sNodeCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                  unitMetricK8sNodeCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                           unitMetricK8sNodeCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sNodeCpuUsage, descrMetricK8sNodeCpuUsage,
-                                            unitMetricK8sNodeCpuUsage);
-}
-
-/**
- * Memory usage of the Node
- * <p>
- * Total memory usage of the Node
- * <p>
- * gauge
- */
-static constexpr const char *kMetricK8sNodeMemoryUsage     = "k8s.node.memory.usage";
-static constexpr const char *descrMetricK8sNodeMemoryUsage = "Memory usage of the Node";
-static constexpr const char *unitMetricK8sNodeMemoryUsage  = "By";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                 unitMetricK8sNodeMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                  unitMetricK8sNodeMemoryUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage,
-                                           unitMetricK8sNodeMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricK8sNodeMemoryUsage, descrMetricK8sNodeMemoryUsage, unitMetricK8sNodeMemoryUsage);
-}
-
-/**
- * Node network errors
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sNodeNetworkErrors     = "k8s.node.network.errors";
-static constexpr const char *descrMetricK8sNodeNetworkErrors = "Node network errors";
-static constexpr const char *unitMetricK8sNodeNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors,
-                                    unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors,
-                                    unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors, unitMetricK8sNodeNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricK8sNodeNetworkErrors, descrMetricK8sNodeNetworkErrors, unitMetricK8sNodeNetworkErrors);
-}
-
-/**
- * Network bytes for the Node
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sNodeNetworkIo     = "k8s.node.network.io";
-static constexpr const char *descrMetricK8sNodeNetworkIo = "Network bytes for the Node";
-static constexpr const char *unitMetricK8sNodeNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sNodeNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                    unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sNodeNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                    unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sNodeNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                             unitMetricK8sNodeNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sNodeNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sNodeNetworkIo, descrMetricK8sNodeNetworkIo,
-                                              unitMetricK8sNodeNetworkIo);
-}
-
-/**
- * The time the Node has been running
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricK8sNodeUptime     = "k8s.node.uptime";
-static constexpr const char *descrMetricK8sNodeUptime = "The time the Node has been running";
-static constexpr const char *unitMetricK8sNodeUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                 unitMetricK8sNodeUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                  unitMetricK8sNodeUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                           unitMetricK8sNodeUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sNodeUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sNodeUptime, descrMetricK8sNodeUptime,
-                                            unitMetricK8sNodeUptime);
-}
-
-/**
- * Total CPU time consumed
- * <p>
- * Total CPU time consumed by the specific Pod on all available CPU cores
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sPodCpuTime     = "k8s.pod.cpu.time";
-static constexpr const char *descrMetricK8sPodCpuTime = "Total CPU time consumed";
-static constexpr const char *unitMetricK8sPodCpuTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                    unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                    unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                             unitMetricK8sPodCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sPodCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sPodCpuTime, descrMetricK8sPodCpuTime,
-                                              unitMetricK8sPodCpuTime);
-}
-
-/**
- * Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs
- * <p>
- * CPU usage of the specific Pod on all available CPU cores, averaged over the sample window
- * <p>
- * gauge
- */
-static constexpr const char *kMetricK8sPodCpuUsage = "k8s.pod.cpu.usage";
-static constexpr const char *descrMetricK8sPodCpuUsage =
-    "Pod's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
-static constexpr const char *unitMetricK8sPodCpuUsage = "{cpu}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                 unitMetricK8sPodCpuUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                  unitMetricK8sPodCpuUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodCpuUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                           unitMetricK8sPodCpuUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodCpuUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodCpuUsage, descrMetricK8sPodCpuUsage,
-                                            unitMetricK8sPodCpuUsage);
-}
-
-/**
- * Memory usage of the Pod
- * <p>
- * Total memory usage of the Pod
- * <p>
- * gauge
- */
-static constexpr const char *kMetricK8sPodMemoryUsage     = "k8s.pod.memory.usage";
-static constexpr const char *descrMetricK8sPodMemoryUsage = "Memory usage of the Pod";
-static constexpr const char *unitMetricK8sPodMemoryUsage  = "By";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                 unitMetricK8sPodMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodMemoryUsage(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                  unitMetricK8sPodMemoryUsage);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                           unitMetricK8sPodMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodMemoryUsage, descrMetricK8sPodMemoryUsage,
-                                            unitMetricK8sPodMemoryUsage);
-}
-
-/**
- * Pod network errors
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sPodNetworkErrors     = "k8s.pod.network.errors";
-static constexpr const char *descrMetricK8sPodNetworkErrors = "Pod network errors";
-static constexpr const char *unitMetricK8sPodNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors,
-                                    unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodNetworkErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors,
-                                    unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors, unitMetricK8sPodNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricK8sPodNetworkErrors, descrMetricK8sPodNetworkErrors, unitMetricK8sPodNetworkErrors);
-}
-
-/**
- * Network bytes for the Pod
- * <p>
- * counter
- */
-static constexpr const char *kMetricK8sPodNetworkIo     = "k8s.pod.network.io";
-static constexpr const char *descrMetricK8sPodNetworkIo = "Network bytes for the Pod";
-static constexpr const char *unitMetricK8sPodNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricK8sPodNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                    unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricK8sPodNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                    unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sPodNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                             unitMetricK8sPodNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sPodNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricK8sPodNetworkIo, descrMetricK8sPodNetworkIo,
-                                              unitMetricK8sPodNetworkIo);
-}
-
-/**
- * The time the Pod has been running
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricK8sPodUptime     = "k8s.pod.uptime";
-static constexpr const char *descrMetricK8sPodUptime = "The time the Pod has been running";
-static constexpr const char *unitMetricK8sPodUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                 unitMetricK8sPodUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                  unitMetricK8sPodUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                           unitMetricK8sPodUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricK8sPodUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricK8sPodUptime, descrMetricK8sPodUptime,
-                                            unitMetricK8sPodUptime);
-}
-
-/**
- * Total number of available replica pods (ready for at least minReadySeconds) targeted by this
- * replicaset <p> This metric aligns with the @code availableReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetstatus-v1-apps">K8s
- * ReplicaSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicaset">@code k8s.replicaset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sReplicasetAvailablePods = "k8s.replicaset.available_pods";
-static constexpr const char *descrMetricK8sReplicasetAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replicaset";
-static constexpr const char *unitMetricK8sReplicasetAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                         descrMetricK8sReplicasetAvailablePods,
-                                         unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                          descrMetricK8sReplicasetAvailablePods,
-                                          unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                                   descrMetricK8sReplicasetAvailablePods,
-                                                   unitMetricK8sReplicasetAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetAvailablePods,
-                                                    descrMetricK8sReplicasetAvailablePods,
-                                                    unitMetricK8sReplicasetAvailablePods);
-}
-
-/**
- * Number of desired replica pods in this replicaset
- * <p>
- * This metric aligns with the @code replicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicasetspec-v1-apps">K8s
- * ReplicaSetSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicaset">@code k8s.replicaset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sReplicasetDesiredPods = "k8s.replicaset.desired_pods";
-static constexpr const char *descrMetricK8sReplicasetDesiredPods =
-    "Number of desired replica pods in this replicaset";
-static constexpr const char *unitMetricK8sReplicasetDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                         descrMetricK8sReplicasetDesiredPods,
-                                         unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                          descrMetricK8sReplicasetDesiredPods,
-                                          unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                   descrMetricK8sReplicasetDesiredPods,
-                                                   unitMetricK8sReplicasetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicasetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicasetDesiredPods,
-                                                    descrMetricK8sReplicasetDesiredPods,
-                                                    unitMetricK8sReplicasetDesiredPods);
-}
-
-/**
- * Deprecated, use @code k8s.replicationcontroller.available_pods @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code k8s.replicationcontroller.available_pods @endcode.", "reason":
- * "uncategorized"} <p> This metric aligns with the @code availableReplicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core">K8s
- * ReplicationControllerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
- * resource. <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerAvailablePods =
-    "k8s.replication_controller.available_pods";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricK8sReplicationControllerAvailablePods =
-        "Deprecated, use `k8s.replicationcontroller.available_pods` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricK8sReplicationControllerAvailablePods = "{pod}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                         descrMetricK8sReplicationControllerAvailablePods,
-                                         unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                          descrMetricK8sReplicationControllerAvailablePods,
-                                          unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationControllerAvailablePods,
-                                                   descrMetricK8sReplicationControllerAvailablePods,
-                                                   unitMetricK8sReplicationControllerAvailablePods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationControllerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sReplicationControllerAvailablePods,
-      descrMetricK8sReplicationControllerAvailablePods,
-      unitMetricK8sReplicationControllerAvailablePods);
-}
-
-/**
- * Deprecated, use @code k8s.replicationcontroller.desired_pods @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code k8s.replicationcontroller.desired_pods @endcode.", "reason":
- * "uncategorized"} <p> This metric aligns with the @code replicas @endcode field of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core">K8s
- * ReplicationControllerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
- * resource. <p> updowncounter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricK8sReplicationControllerDesiredPods =
-    "k8s.replication_controller.desired_pods";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *descrMetricK8sReplicationControllerDesiredPods =
-        "Deprecated, use `k8s.replicationcontroller.desired_pods` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *unitMetricK8sReplicationControllerDesiredPods = "{pod}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                         descrMetricK8sReplicationControllerDesiredPods,
-                                         unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                          descrMetricK8sReplicationControllerDesiredPods,
-                                          unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                                   descrMetricK8sReplicationControllerDesiredPods,
-                                                   unitMetricK8sReplicationControllerDesiredPods);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationControllerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationControllerDesiredPods,
-                                                    descrMetricK8sReplicationControllerDesiredPods,
-                                                    unitMetricK8sReplicationControllerDesiredPods);
-}
-
-/**
- * Total number of available replica pods (ready for at least minReadySeconds) targeted by this
- * replication controller <p> This metric aligns with the @code availableReplicas @endcode field of
- * the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerstatus-v1-core">K8s
- * ReplicationControllerStatus</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
- * resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicationcontrollerAvailablePods =
-    "k8s.replicationcontroller.available_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerAvailablePods =
-    "Total number of available replica pods (ready for at least minReadySeconds) targeted by this "
-    "replication controller";
-static constexpr const char *unitMetricK8sReplicationcontrollerAvailablePods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                         descrMetricK8sReplicationcontrollerAvailablePods,
-                                         unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                          descrMetricK8sReplicationcontrollerAvailablePods,
-                                          unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerAvailablePods,
-                                                   descrMetricK8sReplicationcontrollerAvailablePods,
-                                                   unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationcontrollerAvailablePods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricK8sReplicationcontrollerAvailablePods,
-      descrMetricK8sReplicationcontrollerAvailablePods,
-      unitMetricK8sReplicationcontrollerAvailablePods);
-}
-
-/**
- * Number of desired replica pods in this replication controller
- * <p>
- * This metric aligns with the @code replicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#replicationcontrollerspec-v1-core">K8s
- * ReplicationControllerSpec</a> <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#replicationcontroller">@code k8s.replicationcontroller @endcode</a>
- * resource. <p> updowncounter
- */
-static constexpr const char *kMetricK8sReplicationcontrollerDesiredPods =
-    "k8s.replicationcontroller.desired_pods";
-static constexpr const char *descrMetricK8sReplicationcontrollerDesiredPods =
-    "Number of desired replica pods in this replication controller";
-static constexpr const char *unitMetricK8sReplicationcontrollerDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                         descrMetricK8sReplicationcontrollerDesiredPods,
-                                         unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                          descrMetricK8sReplicationcontrollerDesiredPods,
-                                          unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                                   descrMetricK8sReplicationcontrollerDesiredPods,
-                                                   unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sReplicationcontrollerDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sReplicationcontrollerDesiredPods,
-                                                    descrMetricK8sReplicationcontrollerDesiredPods,
-                                                    unitMetricK8sReplicationcontrollerDesiredPods);
-}
-
-/**
- * The number of replica pods created by the statefulset controller from the statefulset version
- * indicated by currentRevision <p> This metric aligns with the @code currentReplicas @endcode field
- * of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
- * StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetCurrentPods = "k8s.statefulset.current_pods";
-static constexpr const char *descrMetricK8sStatefulsetCurrentPods =
-    "The number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by currentRevision";
-static constexpr const char *unitMetricK8sStatefulsetCurrentPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                         descrMetricK8sStatefulsetCurrentPods,
-                                         unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                          descrMetricK8sStatefulsetCurrentPods,
-                                          unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                                   descrMetricK8sStatefulsetCurrentPods,
-                                                   unitMetricK8sStatefulsetCurrentPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetCurrentPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetCurrentPods,
-                                                    descrMetricK8sStatefulsetCurrentPods,
-                                                    unitMetricK8sStatefulsetCurrentPods);
-}
-
-/**
- * Number of desired replica pods in this statefulset
- * <p>
- * This metric aligns with the @code replicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetspec-v1-apps">K8s
- * StatefulSetSpec</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetDesiredPods = "k8s.statefulset.desired_pods";
-static constexpr const char *descrMetricK8sStatefulsetDesiredPods =
-    "Number of desired replica pods in this statefulset";
-static constexpr const char *unitMetricK8sStatefulsetDesiredPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                         descrMetricK8sStatefulsetDesiredPods,
-                                         unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                          descrMetricK8sStatefulsetDesiredPods,
-                                          unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                                   descrMetricK8sStatefulsetDesiredPods,
-                                                   unitMetricK8sStatefulsetDesiredPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetDesiredPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetDesiredPods,
-                                                    descrMetricK8sStatefulsetDesiredPods,
-                                                    unitMetricK8sStatefulsetDesiredPods);
-}
-
-/**
- * The number of replica pods created for this statefulset with a Ready Condition
- * <p>
- * This metric aligns with the @code readyReplicas @endcode field of the
- * <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
- * StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetReadyPods = "k8s.statefulset.ready_pods";
-static constexpr const char *descrMetricK8sStatefulsetReadyPods =
-    "The number of replica pods created for this statefulset with a Ready Condition";
-static constexpr const char *unitMetricK8sStatefulsetReadyPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                         descrMetricK8sStatefulsetReadyPods,
-                                         unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                          descrMetricK8sStatefulsetReadyPods,
-                                          unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                                   descrMetricK8sStatefulsetReadyPods,
-                                                   unitMetricK8sStatefulsetReadyPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetReadyPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetReadyPods,
-                                                    descrMetricK8sStatefulsetReadyPods,
-                                                    unitMetricK8sStatefulsetReadyPods);
-}
-
-/**
- * Number of replica pods created by the statefulset controller from the statefulset version
- * indicated by updateRevision <p> This metric aligns with the @code updatedReplicas @endcode field
- * of the <a
- * href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetstatus-v1-apps">K8s
- * StatefulSetStatus</a>. <p> This metric SHOULD, at a minimum, be reported against a <a
- * href="../resource/k8s.md#statefulset">@code k8s.statefulset @endcode</a> resource. <p>
- * updowncounter
- */
-static constexpr const char *kMetricK8sStatefulsetUpdatedPods = "k8s.statefulset.updated_pods";
-static constexpr const char *descrMetricK8sStatefulsetUpdatedPods =
-    "Number of replica pods created by the statefulset controller from the statefulset version "
-    "indicated by updateRevision";
-static constexpr const char *unitMetricK8sStatefulsetUpdatedPods = "{pod}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                         descrMetricK8sStatefulsetUpdatedPods,
-                                         unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                          descrMetricK8sStatefulsetUpdatedPods,
-                                          unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                                   descrMetricK8sStatefulsetUpdatedPods,
-                                                   unitMetricK8sStatefulsetUpdatedPods);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricK8sStatefulsetUpdatedPods(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricK8sStatefulsetUpdatedPods,
-                                                    descrMetricK8sStatefulsetUpdatedPods,
-                                                    unitMetricK8sStatefulsetUpdatedPods);
-}
-
-}  // namespace k8s
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/messaging_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/messaging_metrics.h
deleted file mode 100644
index 91cb19f72..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/messaging_metrics.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace messaging
-{
-
-/**
- * Number of messages that were delivered to the application.
- * <p>
- * Records the number of messages pulled from the broker or number of messages dispatched to the
- * application in push-based scenarios. The metric SHOULD be reported once per message delivery. For
- * example, if receiving and processing operations are both instrumented for a single message
- * delivery, this counter is incremented when the message is received and not reported when it is
- * processed. <p> counter
- */
-static constexpr const char *kMetricMessagingClientConsumedMessages =
-    "messaging.client.consumed.messages";
-static constexpr const char *descrMetricMessagingClientConsumedMessages =
-    "Number of messages that were delivered to the application.";
-static constexpr const char *unitMetricMessagingClientConsumedMessages = "{message}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientConsumedMessages,
-                                    descrMetricMessagingClientConsumedMessages,
-                                    unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientConsumedMessages,
-                                    descrMetricMessagingClientConsumedMessages,
-                                    unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientConsumedMessages,
-                                             descrMetricMessagingClientConsumedMessages,
-                                             unitMetricMessagingClientConsumedMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientConsumedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientConsumedMessages,
-                                              descrMetricMessagingClientConsumedMessages,
-                                              unitMetricMessagingClientConsumedMessages);
-}
-
-/**
- * Duration of messaging operation initiated by a producer or consumer client.
- * <p>
- * This metric SHOULD NOT be used to report processing duration - processing duration is reported in
- * @code messaging.process.duration @endcode metric. <p> histogram
- */
-static constexpr const char *kMetricMessagingClientOperationDuration =
-    "messaging.client.operation.duration";
-static constexpr const char *descrMetricMessagingClientOperationDuration =
-    "Duration of messaging operation initiated by a producer or consumer client.";
-static constexpr const char *unitMetricMessagingClientOperationDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingClientOperationDuration,
-                                      descrMetricMessagingClientOperationDuration,
-                                      unitMetricMessagingClientOperationDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingClientOperationDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingClientOperationDuration,
-                                      descrMetricMessagingClientOperationDuration,
-                                      unitMetricMessagingClientOperationDuration);
-}
-
-/**
- * Deprecated. Use @code messaging.client.sent.messages @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.sent.messages @endcode.", "reason": "uncategorized"}
- * <p>
- * counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingClientPublishedMessages =
-    "messaging.client.published.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingClientPublishedMessages =
-    "Deprecated. Use `messaging.client.sent.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingClientPublishedMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientPublishedMessages,
-                                    descrMetricMessagingClientPublishedMessages,
-                                    unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientPublishedMessages,
-                                    descrMetricMessagingClientPublishedMessages,
-                                    unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientPublishedMessages,
-                                             descrMetricMessagingClientPublishedMessages,
-                                             unitMetricMessagingClientPublishedMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientPublishedMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientPublishedMessages,
-                                              descrMetricMessagingClientPublishedMessages,
-                                              unitMetricMessagingClientPublishedMessages);
-}
-
-/**
- * Number of messages producer attempted to send to the broker.
- * <p>
- * This metric MUST NOT count messages that were created but haven't yet been sent.
- * <p>
- * counter
- */
-static constexpr const char *kMetricMessagingClientSentMessages = "messaging.client.sent.messages";
-static constexpr const char *descrMetricMessagingClientSentMessages =
-    "Number of messages producer attempted to send to the broker.";
-static constexpr const char *unitMetricMessagingClientSentMessages = "{message}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingClientSentMessages,
-                                    descrMetricMessagingClientSentMessages,
-                                    unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingClientSentMessages,
-                                    descrMetricMessagingClientSentMessages,
-                                    unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingClientSentMessages,
-                                             descrMetricMessagingClientSentMessages,
-                                             unitMetricMessagingClientSentMessages);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingClientSentMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingClientSentMessages,
-                                              descrMetricMessagingClientSentMessages,
-                                              unitMetricMessagingClientSentMessages);
-}
-
-/**
- * Duration of processing operation.
- * <p>
- * This metric MUST be reported for operations with @code messaging.operation.type @endcode that
- * matches @code process @endcode. <p> histogram
- */
-static constexpr const char *kMetricMessagingProcessDuration = "messaging.process.duration";
-static constexpr const char *descrMetricMessagingProcessDuration =
-    "Duration of processing operation.";
-static constexpr const char *unitMetricMessagingProcessDuration = "s";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingProcessDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingProcessDuration,
-                                      descrMetricMessagingProcessDuration,
-                                      unitMetricMessagingProcessDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingProcessDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingProcessDuration,
-                                      descrMetricMessagingProcessDuration,
-                                      unitMetricMessagingProcessDuration);
-}
-
-/**
- * Deprecated. Use @code messaging.client.consumed.messages @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason":
- * "uncategorized"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingProcessMessages =
-    "messaging.process.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingProcessMessages =
-    "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingProcessMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingProcessMessages,
-                                    descrMetricMessagingProcessMessages,
-                                    unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingProcessMessages,
-                                    descrMetricMessagingProcessMessages,
-                                    unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingProcessMessages,
-                                             descrMetricMessagingProcessMessages,
-                                             unitMetricMessagingProcessMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingProcessMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingProcessMessages,
-                                              descrMetricMessagingProcessMessages,
-                                              unitMetricMessagingProcessMessages);
-}
-
-/**
- * Deprecated. Use @code messaging.client.operation.duration @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason":
- * "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishDuration =
-    "messaging.publish.duration";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishDuration =
-    "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishDuration = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingPublishDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingPublishDuration,
-                                      descrMetricMessagingPublishDuration,
-                                      unitMetricMessagingPublishDuration);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingPublishDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingPublishDuration,
-                                      descrMetricMessagingPublishDuration,
-                                      unitMetricMessagingPublishDuration);
-}
-
-/**
- * Deprecated. Use @code messaging.client.produced.messages @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.produced.messages @endcode.", "reason":
- * "uncategorized"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingPublishMessages =
-    "messaging.publish.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingPublishMessages =
-    "Deprecated. Use `messaging.client.produced.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingPublishMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingPublishMessages,
-                                    descrMetricMessagingPublishMessages,
-                                    unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingPublishMessages,
-                                    descrMetricMessagingPublishMessages,
-                                    unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingPublishMessages,
-                                             descrMetricMessagingPublishMessages,
-                                             unitMetricMessagingPublishMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingPublishMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingPublishMessages,
-                                              descrMetricMessagingPublishMessages,
-                                              unitMetricMessagingPublishMessages);
-}
-
-/**
- * Deprecated. Use @code messaging.client.operation.duration @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.operation.duration @endcode.", "reason":
- * "uncategorized"} <p> histogram
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveDuration =
-    "messaging.receive.duration";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveDuration =
-    "Deprecated. Use `messaging.client.operation.duration` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveDuration = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricMessagingReceiveDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricMessagingReceiveDuration,
-                                      descrMetricMessagingReceiveDuration,
-                                      unitMetricMessagingReceiveDuration);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricMessagingReceiveDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricMessagingReceiveDuration,
-                                      descrMetricMessagingReceiveDuration,
-                                      unitMetricMessagingReceiveDuration);
-}
-
-/**
- * Deprecated. Use @code messaging.client.consumed.messages @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code messaging.client.consumed.messages @endcode.", "reason":
- * "uncategorized"} <p> counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricMessagingReceiveMessages =
-    "messaging.receive.messages";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricMessagingReceiveMessages =
-    "Deprecated. Use `messaging.client.consumed.messages` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricMessagingReceiveMessages =
-    "{message}";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricMessagingReceiveMessages,
-                                    descrMetricMessagingReceiveMessages,
-                                    unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricMessagingReceiveMessages,
-                                    descrMetricMessagingReceiveMessages,
-                                    unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricMessagingReceiveMessages,
-                                             descrMetricMessagingReceiveMessages,
-                                             unitMetricMessagingReceiveMessages);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricMessagingReceiveMessages(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricMessagingReceiveMessages,
-                                              descrMetricMessagingReceiveMessages,
-                                              unitMetricMessagingReceiveMessages);
-}
-
-}  // namespace messaging
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/network_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/network_attributes.h
deleted file mode 100644
index 54ba378f2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/network_attributes.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace network
-{
-
-/**
-  Local address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkLocalAddress = "network.local.address";
-
-/**
-  Local port number of the network connection.
- */
-static constexpr const char *kNetworkLocalPort = "network.local.port";
-
-/**
-  Peer address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkPeerAddress = "network.peer.address";
-
-/**
-  Peer port number of the network connection.
- */
-static constexpr const char *kNetworkPeerPort = "network.peer.port";
-
-/**
-  <a href="https://wikipedia.org/wiki/Application_layer">OSI application layer</a> or non-OSI
-  equivalent. <p> The value SHOULD be normalized to lowercase.
- */
-static constexpr const char *kNetworkProtocolName = "network.protocol.name";
-
-/**
-  The actual version of the protocol used for network communication.
-  <p>
-  If protocol version is subject to negotiation (for example using <a
-  href="https://www.rfc-editor.org/rfc/rfc7301.html">ALPN</a>), this attribute SHOULD be set to the
-  negotiated version. If the actual protocol version is not known, this attribute SHOULD NOT be set.
- */
-static constexpr const char *kNetworkProtocolVersion = "network.protocol.version";
-
-/**
-  <a href="https://wikipedia.org/wiki/Transport_layer">OSI transport layer</a> or <a
-  href="https://wikipedia.org/wiki/Inter-process_communication">inter-process communication
-  method</a>. <p> The value SHOULD be normalized to lowercase. <p> Consider always setting the
-  transport when setting a port number, since a port number is ambiguous without knowing the
-  transport. For example different processes could be listening on TCP port 12345 and UDP port
-  12345.
- */
-static constexpr const char *kNetworkTransport = "network.transport";
-
-/**
-  <a href="https://wikipedia.org/wiki/Network_layer">OSI network layer</a> or non-OSI equivalent.
-  <p>
-  The value SHOULD be normalized to lowercase.
- */
-static constexpr const char *kNetworkType = "network.type";
-
-namespace NetworkTransportValues
-{
-/**
-  TCP
- */
-static constexpr const char *kTcp = "tcp";
-
-/**
-  UDP
- */
-static constexpr const char *kUdp = "udp";
-
-/**
-  Named or anonymous pipe.
- */
-static constexpr const char *kPipe = "pipe";
-
-/**
-  Unix domain socket
- */
-static constexpr const char *kUnix = "unix";
-
-/**
-  QUIC
- */
-static constexpr const char *kQuic = "quic";
-
-}  // namespace NetworkTransportValues
-
-namespace NetworkTypeValues
-{
-/**
-  IPv4
- */
-static constexpr const char *kIpv4 = "ipv4";
-
-/**
-  IPv6
- */
-static constexpr const char *kIpv6 = "ipv6";
-
-}  // namespace NetworkTypeValues
-
-}  // namespace network
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/otel_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/otel_attributes.h
deleted file mode 100644
index a82d72553..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/otel_attributes.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace otel
-{
-
-/**
-  The name of the instrumentation scope - (@code InstrumentationScope.Name @endcode in OTLP).
- */
-static constexpr const char *kOtelScopeName = "otel.scope.name";
-
-/**
-  The version of the instrumentation scope - (@code InstrumentationScope.Version @endcode in OTLP).
- */
-static constexpr const char *kOtelScopeVersion = "otel.scope.version";
-
-/**
-  Name of the code, either "OK" or "ERROR". MUST NOT be set if the status code is UNSET.
- */
-static constexpr const char *kOtelStatusCode = "otel.status_code";
-
-/**
-  Description of the Status if it has a value, otherwise not set.
- */
-static constexpr const char *kOtelStatusDescription = "otel.status_description";
-
-namespace OtelStatusCodeValues
-{
-/**
-  The operation has been validated by an Application developer or Operator to have completed
-  successfully.
- */
-static constexpr const char *kOk = "OK";
-
-/**
-  The operation contains an error.
- */
-static constexpr const char *kError = "ERROR";
-
-}  // namespace OtelStatusCodeValues
-
-}  // namespace otel
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/otel_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/otel_metrics.h
deleted file mode 100644
index 0308a324b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/otel_metrics.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace otel
-{
-
-/**
- * The number of spans for which the export has finished, either successful or failed
- * <p>
- * For successful exports, @code error.type @endcode MUST NOT be set. For failed exports, @code
- * error.type @endcode must contain the failure cause. For exporters with partial success semantics
- * (e.g. OTLP with @code rejected_spans @endcode), rejected spans must count as failed and only
- * non-rejected spans count as success. If no rejection reason is available, @code rejected @endcode
- * SHOULD be used as value for @code error.type @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkExporterSpanExportedCount =
-    "otel.sdk.exporter.span.exported.count";
-static constexpr const char *descrMetricOtelSdkExporterSpanExportedCount =
-    "The number of spans for which the export has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkExporterSpanExportedCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkExporterSpanExportedCount,
-                                    descrMetricOtelSdkExporterSpanExportedCount,
-                                    unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                    descrMetricOtelSdkExporterSpanExportedCount,
-                                    unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                             descrMetricOtelSdkExporterSpanExportedCount,
-                                             unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanExportedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkExporterSpanExportedCount,
-                                              descrMetricOtelSdkExporterSpanExportedCount,
-                                              unitMetricOtelSdkExporterSpanExportedCount);
-}
-
-/**
- * The number of spans which were passed to the exporter, but that have not been exported yet
- * (neither successful, nor failed) <p> For successful exports, @code error.type @endcode MUST NOT
- * be set. For failed exports, @code error.type @endcode must contain the failure cause. <p>
- * updowncounter
- */
-static constexpr const char *kMetricOtelSdkExporterSpanInflightCount =
-    "otel.sdk.exporter.span.inflight.count";
-static constexpr const char *descrMetricOtelSdkExporterSpanInflightCount =
-    "The number of spans which were passed to the exporter, but that have not been exported yet "
-    "(neither successful, nor failed)";
-static constexpr const char *unitMetricOtelSdkExporterSpanInflightCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                         descrMetricOtelSdkExporterSpanInflightCount,
-                                         unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                          descrMetricOtelSdkExporterSpanInflightCount,
-                                          unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                                   descrMetricOtelSdkExporterSpanInflightCount,
-                                                   unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkExporterSpanInflightCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkExporterSpanInflightCount,
-                                                    descrMetricOtelSdkExporterSpanInflightCount,
-                                                    unitMetricOtelSdkExporterSpanInflightCount);
-}
-
-/**
- * The number of spans for which the processing has finished, either successful or failed
- * <p>
- * For successful processing, @code error.type @endcode MUST NOT be set. For failed processing,
- * @code error.type @endcode must contain the failure cause. For the SDK Simple and Batching Span
- * Processor a span is considered to be processed already when it has been submitted to the
- * exporter, not when the corresponding export call has finished. <p> counter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanProcessedCount =
-    "otel.sdk.processor.span.processed.count";
-static constexpr const char *descrMetricOtelSdkProcessorSpanProcessedCount =
-    "The number of spans for which the processing has finished, either successful or failed";
-static constexpr const char *unitMetricOtelSdkProcessorSpanProcessedCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                    descrMetricOtelSdkProcessorSpanProcessedCount,
-                                    unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                    descrMetricOtelSdkProcessorSpanProcessedCount,
-                                    unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                             descrMetricOtelSdkProcessorSpanProcessedCount,
-                                             unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanProcessedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkProcessorSpanProcessedCount,
-                                              descrMetricOtelSdkProcessorSpanProcessedCount,
-                                              unitMetricOtelSdkProcessorSpanProcessedCount);
-}
-
-/**
- * The maximum number of spans the queue of a given instance of an SDK span processor can hold
- * <p>
- * Only applies to span processors which use a queue, e.g. the SDK Batching Span Processor.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanQueueCapacity =
-    "otel.sdk.processor.span.queue.capacity";
-static constexpr const char *descrMetricOtelSdkProcessorSpanQueueCapacity =
-    "The maximum number of spans the queue of a given instance of an SDK span processor can hold";
-static constexpr const char *unitMetricOtelSdkProcessorSpanQueueCapacity = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                         descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                         unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                          descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                          unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                                   descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                                   unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanQueueCapacity(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueCapacity,
-                                                    descrMetricOtelSdkProcessorSpanQueueCapacity,
-                                                    unitMetricOtelSdkProcessorSpanQueueCapacity);
-}
-
-/**
- * The number of spans in the queue of a given instance of an SDK span processor
- * <p>
- * Only applies to span processors which use a queue, e.g. the SDK Batching Span Processor.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricOtelSdkProcessorSpanQueueSize =
-    "otel.sdk.processor.span.queue.size";
-static constexpr const char *descrMetricOtelSdkProcessorSpanQueueSize =
-    "The number of spans in the queue of a given instance of an SDK span processor";
-static constexpr const char *unitMetricOtelSdkProcessorSpanQueueSize = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                         descrMetricOtelSdkProcessorSpanQueueSize,
-                                         unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                          descrMetricOtelSdkProcessorSpanQueueSize,
-                                          unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                                   descrMetricOtelSdkProcessorSpanQueueSize,
-                                                   unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkProcessorSpanQueueSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricOtelSdkProcessorSpanQueueSize,
-                                                    descrMetricOtelSdkProcessorSpanQueueSize,
-                                                    unitMetricOtelSdkProcessorSpanQueueSize);
-}
-
-/**
- * The number of created spans for which the end operation was called
- * <p>
- * For spans with @code recording=true @endcode: Implementations MUST record both @code
- * otel.sdk.span.live.count @endcode and @code otel.sdk.span.ended.count @endcode. For spans with
- * @code recording=false @endcode: If implementations decide to record this metric, they MUST also
- * record @code otel.sdk.span.live.count @endcode. <p> counter
- */
-static constexpr const char *kMetricOtelSdkSpanEndedCount = "otel.sdk.span.ended.count";
-static constexpr const char *descrMetricOtelSdkSpanEndedCount =
-    "The number of created spans for which the end operation was called";
-static constexpr const char *unitMetricOtelSdkSpanEndedCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricOtelSdkSpanEndedCount, descrMetricOtelSdkSpanEndedCount,
-                                    unitMetricOtelSdkSpanEndedCount);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricOtelSdkSpanEndedCount, descrMetricOtelSdkSpanEndedCount,
-                                    unitMetricOtelSdkSpanEndedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricOtelSdkSpanEndedCount,
-                                             descrMetricOtelSdkSpanEndedCount,
-                                             unitMetricOtelSdkSpanEndedCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanEndedCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricOtelSdkSpanEndedCount,
-                                              descrMetricOtelSdkSpanEndedCount,
-                                              unitMetricOtelSdkSpanEndedCount);
-}
-
-/**
- * The number of created spans for which the end operation has not been called yet
- * <p>
- * For spans with @code recording=true @endcode: Implementations MUST record both @code
- * otel.sdk.span.live.count @endcode and @code otel.sdk.span.ended.count @endcode. For spans with
- * @code recording=false @endcode: If implementations decide to record this metric, they MUST also
- * record @code otel.sdk.span.ended.count @endcode. <p> updowncounter
- */
-static constexpr const char *kMetricOtelSdkSpanLiveCount = "otel.sdk.span.live.count";
-static constexpr const char *descrMetricOtelSdkSpanLiveCount =
-    "The number of created spans for which the end operation has not been called yet";
-static constexpr const char *unitMetricOtelSdkSpanLiveCount = "{span}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricOtelSdkSpanLiveCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricOtelSdkSpanLiveCount, descrMetricOtelSdkSpanLiveCount, unitMetricOtelSdkSpanLiveCount);
-}
-
-}  // namespace otel
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/process_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/process_metrics.h
deleted file mode 100644
index d76db55c9..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/process_metrics.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace process
-{
-
-/**
- * Number of times the process has been context switched.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessContextSwitches = "process.context_switches";
-static constexpr const char *descrMetricProcessContextSwitches =
-    "Number of times the process has been context switched.";
-static constexpr const char *unitMetricProcessContextSwitches = "{context_switch}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessContextSwitches,
-                                    descrMetricProcessContextSwitches,
-                                    unitMetricProcessContextSwitches);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessContextSwitches,
-                                    descrMetricProcessContextSwitches,
-                                    unitMetricProcessContextSwitches);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessContextSwitches,
-                                             descrMetricProcessContextSwitches,
-                                             unitMetricProcessContextSwitches);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessContextSwitches(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessContextSwitches,
-                                              descrMetricProcessContextSwitches,
-                                              unitMetricProcessContextSwitches);
-}
-
-/**
- * Total CPU seconds broken down by different states.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessCpuTime = "process.cpu.time";
-static constexpr const char *descrMetricProcessCpuTime =
-    "Total CPU seconds broken down by different states.";
-static constexpr const char *unitMetricProcessCpuTime = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                    unitMetricProcessCpuTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                    unitMetricProcessCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessCpuTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                             unitMetricProcessCpuTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessCpuTime, descrMetricProcessCpuTime,
-                                              unitMetricProcessCpuTime);
-}
-
-/**
- * Difference in process.cpu.time since the last measurement, divided by the elapsed time and number
- * of CPUs available to the process. <p> gauge
- */
-static constexpr const char *kMetricProcessCpuUtilization = "process.cpu.utilization";
-static constexpr const char *descrMetricProcessCpuUtilization =
-    "Difference in process.cpu.time since the last measurement, divided by the elapsed time and "
-    "number of CPUs available to the process.";
-static constexpr const char *unitMetricProcessCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricProcessCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricProcessCpuUtilization, descrMetricProcessCpuUtilization,
-                                 unitMetricProcessCpuUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricProcessCpuUtilization(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricProcessCpuUtilization, descrMetricProcessCpuUtilization,
-                                  unitMetricProcessCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricProcessCpuUtilization,
-                                           descrMetricProcessCpuUtilization,
-                                           unitMetricProcessCpuUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricProcessCpuUtilization,
-                                            descrMetricProcessCpuUtilization,
-                                            unitMetricProcessCpuUtilization);
-}
-
-/**
- * Disk bytes transferred.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessDiskIo     = "process.disk.io";
-static constexpr const char *descrMetricProcessDiskIo = "Disk bytes transferred.";
-static constexpr const char *unitMetricProcessDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                    unitMetricProcessDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                    unitMetricProcessDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                             unitMetricProcessDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricProcessDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessDiskIo, descrMetricProcessDiskIo,
-                                              unitMetricProcessDiskIo);
-}
-
-/**
- * The amount of physical memory in use.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricProcessMemoryUsage = "process.memory.usage";
-static constexpr const char *descrMetricProcessMemoryUsage =
-    "The amount of physical memory in use.";
-static constexpr const char *unitMetricProcessMemoryUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage,
-                                         unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage,
-                                          unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage, unitMetricProcessMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessMemoryUsage, descrMetricProcessMemoryUsage, unitMetricProcessMemoryUsage);
-}
-
-/**
- * The amount of committed virtual memory.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricProcessMemoryVirtual = "process.memory.virtual";
-static constexpr const char *descrMetricProcessMemoryVirtual =
-    "The amount of committed virtual memory.";
-static constexpr const char *unitMetricProcessMemoryVirtual = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessMemoryVirtual(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessMemoryVirtual, descrMetricProcessMemoryVirtual, unitMetricProcessMemoryVirtual);
-}
-
-/**
- * Network bytes transferred.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessNetworkIo     = "process.network.io";
-static constexpr const char *descrMetricProcessNetworkIo = "Network bytes transferred.";
-static constexpr const char *unitMetricProcessNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricProcessNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                    unitMetricProcessNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                    unitMetricProcessNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                             unitMetricProcessNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricProcessNetworkIo, descrMetricProcessNetworkIo,
-                                              unitMetricProcessNetworkIo);
-}
-
-/**
- * Number of file descriptors in use by the process.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricProcessOpenFileDescriptorCount =
-    "process.open_file_descriptor.count";
-static constexpr const char *descrMetricProcessOpenFileDescriptorCount =
-    "Number of file descriptors in use by the process.";
-static constexpr const char *unitMetricProcessOpenFileDescriptorCount = "{file_descriptor}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                         descrMetricProcessOpenFileDescriptorCount,
-                                         unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                          descrMetricProcessOpenFileDescriptorCount,
-                                          unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                                   descrMetricProcessOpenFileDescriptorCount,
-                                                   unitMetricProcessOpenFileDescriptorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessOpenFileDescriptorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricProcessOpenFileDescriptorCount,
-                                                    descrMetricProcessOpenFileDescriptorCount,
-                                                    unitMetricProcessOpenFileDescriptorCount);
-}
-
-/**
- * Number of page faults the process has made.
- * <p>
- * counter
- */
-static constexpr const char *kMetricProcessPagingFaults = "process.paging.faults";
-static constexpr const char *descrMetricProcessPagingFaults =
-    "Number of page faults the process has made.";
-static constexpr const char *unitMetricProcessPagingFaults = "{fault}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricProcessPagingFaults, descrMetricProcessPagingFaults,
-                                    unitMetricProcessPagingFaults);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricProcessPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricProcessPagingFaults, descrMetricProcessPagingFaults,
-                                    unitMetricProcessPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricProcessPagingFaults, descrMetricProcessPagingFaults, unitMetricProcessPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricProcessPagingFaults, descrMetricProcessPagingFaults, unitMetricProcessPagingFaults);
-}
-
-/**
- * Process threads count.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricProcessThreadCount     = "process.thread.count";
-static constexpr const char *descrMetricProcessThreadCount = "Process threads count.";
-static constexpr const char *unitMetricProcessThreadCount  = "{thread}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricProcessThreadCount, descrMetricProcessThreadCount,
-                                         unitMetricProcessThreadCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricProcessThreadCount, descrMetricProcessThreadCount,
-                                          unitMetricProcessThreadCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricProcessThreadCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricProcessThreadCount, descrMetricProcessThreadCount, unitMetricProcessThreadCount);
-}
-
-/**
- * The time the process has been running.
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricProcessUptime     = "process.uptime";
-static constexpr const char *descrMetricProcessUptime = "The time the process has been running.";
-static constexpr const char *unitMetricProcessUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                 unitMetricProcessUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                  unitMetricProcessUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                           unitMetricProcessUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricProcessUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricProcessUptime, descrMetricProcessUptime,
-                                            unitMetricProcessUptime);
-}
-
-}  // namespace process
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/rpc_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/rpc_metrics.h
deleted file mode 100644
index 4996ebf85..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/rpc_metrics.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace rpc
-{
-
-/**
- * Measures the duration of outbound RPC.
- * <p>
- * While streaming RPCs may record this metric as start-of-batch
- * to end-of-batch, it's hard to interpret in practice.
- * <p>
- * <strong>Streaming</strong>: N/A.
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientDuration = "rpc.client.duration";
-static constexpr const char *descrMetricRpcClientDuration =
-    "Measures the duration of outbound RPC.";
-static constexpr const char *unitMetricRpcClientDuration = "ms";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
-                                      unitMetricRpcClientDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcClientDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientDuration, descrMetricRpcClientDuration,
-                                      unitMetricRpcClientDuration);
-}
-
-/**
- * Measures the size of RPC request messages (uncompressed).
- * <p>
- * <strong>Streaming</strong>: Recorded per message in a streaming batch
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientRequestSize = "rpc.client.request.size";
-static constexpr const char *descrMetricRpcClientRequestSize =
-    "Measures the size of RPC request messages (uncompressed).";
-static constexpr const char *unitMetricRpcClientRequestSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientRequestSize, descrMetricRpcClientRequestSize,
-                                      unitMetricRpcClientRequestSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientRequestSize, descrMetricRpcClientRequestSize,
-                                      unitMetricRpcClientRequestSize);
-}
-
-/**
- * Measures the number of messages received per RPC.
- * <p>
- * Should be 1 for all non-streaming RPCs.
- * <p>
- * <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientRequestsPerRpc = "rpc.client.requests_per_rpc";
-static constexpr const char *descrMetricRpcClientRequestsPerRpc =
-    "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcClientRequestsPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientRequestsPerRpc,
-                                      descrMetricRpcClientRequestsPerRpc,
-                                      unitMetricRpcClientRequestsPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientRequestsPerRpc,
-                                      descrMetricRpcClientRequestsPerRpc,
-                                      unitMetricRpcClientRequestsPerRpc);
-}
-
-/**
- * Measures the size of RPC response messages (uncompressed).
- * <p>
- * <strong>Streaming</strong>: Recorded per response in a streaming batch
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientResponseSize = "rpc.client.response.size";
-static constexpr const char *descrMetricRpcClientResponseSize =
-    "Measures the size of RPC response messages (uncompressed).";
-static constexpr const char *unitMetricRpcClientResponseSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientResponseSize,
-                                      descrMetricRpcClientResponseSize,
-                                      unitMetricRpcClientResponseSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientResponseSize,
-                                      descrMetricRpcClientResponseSize,
-                                      unitMetricRpcClientResponseSize);
-}
-
-/**
- * Measures the number of messages sent per RPC.
- * <p>
- * Should be 1 for all non-streaming RPCs.
- * <p>
- * <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcClientResponsesPerRpc = "rpc.client.responses_per_rpc";
-static constexpr const char *descrMetricRpcClientResponsesPerRpc =
-    "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcClientResponsesPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcClientResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcClientResponsesPerRpc,
-                                      descrMetricRpcClientResponsesPerRpc,
-                                      unitMetricRpcClientResponsesPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcClientResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcClientResponsesPerRpc,
-                                      descrMetricRpcClientResponsesPerRpc,
-                                      unitMetricRpcClientResponsesPerRpc);
-}
-
-/**
- * Measures the duration of inbound RPC.
- * <p>
- * While streaming RPCs may record this metric as start-of-batch
- * to end-of-batch, it's hard to interpret in practice.
- * <p>
- * <strong>Streaming</strong>: N/A.
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerDuration     = "rpc.server.duration";
-static constexpr const char *descrMetricRpcServerDuration = "Measures the duration of inbound RPC.";
-static constexpr const char *unitMetricRpcServerDuration  = "ms";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerDuration(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
-                                      unitMetricRpcServerDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetricRpcServerDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerDuration, descrMetricRpcServerDuration,
-                                      unitMetricRpcServerDuration);
-}
-
-/**
- * Measures the size of RPC request messages (uncompressed).
- * <p>
- * <strong>Streaming</strong>: Recorded per message in a streaming batch
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerRequestSize = "rpc.server.request.size";
-static constexpr const char *descrMetricRpcServerRequestSize =
-    "Measures the size of RPC request messages (uncompressed).";
-static constexpr const char *unitMetricRpcServerRequestSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerRequestSize, descrMetricRpcServerRequestSize,
-                                      unitMetricRpcServerRequestSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerRequestSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerRequestSize, descrMetricRpcServerRequestSize,
-                                      unitMetricRpcServerRequestSize);
-}
-
-/**
- * Measures the number of messages received per RPC.
- * <p>
- * Should be 1 for all non-streaming RPCs.
- * <p>
- * <strong>Streaming</strong> : This metric is required for server and client streaming RPCs
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerRequestsPerRpc = "rpc.server.requests_per_rpc";
-static constexpr const char *descrMetricRpcServerRequestsPerRpc =
-    "Measures the number of messages received per RPC.";
-static constexpr const char *unitMetricRpcServerRequestsPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerRequestsPerRpc,
-                                      descrMetricRpcServerRequestsPerRpc,
-                                      unitMetricRpcServerRequestsPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerRequestsPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerRequestsPerRpc,
-                                      descrMetricRpcServerRequestsPerRpc,
-                                      unitMetricRpcServerRequestsPerRpc);
-}
-
-/**
- * Measures the size of RPC response messages (uncompressed).
- * <p>
- * <strong>Streaming</strong>: Recorded per response in a streaming batch
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerResponseSize = "rpc.server.response.size";
-static constexpr const char *descrMetricRpcServerResponseSize =
-    "Measures the size of RPC response messages (uncompressed).";
-static constexpr const char *unitMetricRpcServerResponseSize = "By";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerResponseSize,
-                                      descrMetricRpcServerResponseSize,
-                                      unitMetricRpcServerResponseSize);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerResponseSize(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerResponseSize,
-                                      descrMetricRpcServerResponseSize,
-                                      unitMetricRpcServerResponseSize);
-}
-
-/**
- * Measures the number of messages sent per RPC.
- * <p>
- * Should be 1 for all non-streaming RPCs.
- * <p>
- * <strong>Streaming</strong>: This metric is required for server and client streaming RPCs
- * <p>
- * histogram
- */
-static constexpr const char *kMetricRpcServerResponsesPerRpc = "rpc.server.responses_per_rpc";
-static constexpr const char *descrMetricRpcServerResponsesPerRpc =
-    "Measures the number of messages sent per RPC.";
-static constexpr const char *unitMetricRpcServerResponsesPerRpc = "{count}";
-
-static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
-CreateSyncInt64MetricRpcServerResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Histogram(kMetricRpcServerResponsesPerRpc,
-                                      descrMetricRpcServerResponsesPerRpc,
-                                      unitMetricRpcServerResponsesPerRpc);
-}
-
-static inline nostd::unique_ptr<metrics::Histogram<double>>
-CreateSyncDoubleMetricRpcServerResponsesPerRpc(metrics::Meter *meter)
-{
-  return meter->CreateDoubleHistogram(kMetricRpcServerResponsesPerRpc,
-                                      descrMetricRpcServerResponsesPerRpc,
-                                      unitMetricRpcServerResponsesPerRpc);
-}
-
-}  // namespace rpc
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/schema_url.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/schema_url.h
deleted file mode 100644
index bc36ae235..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/schema_url.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/schema_url-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-/**
- * The URL of the OpenTelemetry schema for these keys and values.
- */
-static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.34.0";
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/server_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/server_attributes.h
deleted file mode 100644
index 2d307614b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/server_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace server
-{
-
-/**
-  Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain
-  socket name. <p> When observed from the client side, and when communicating through an
-  intermediary, @code server.address @endcode SHOULD represent the server address behind any
-  intermediaries, for example proxies, if it's available.
- */
-static constexpr const char *kServerAddress = "server.address";
-
-/**
-  Server port number.
-  <p>
-  When observed from the client side, and when communicating through an intermediary, @code
-  server.port @endcode SHOULD represent the server port behind any intermediaries, for example
-  proxies, if it's available.
- */
-static constexpr const char *kServerPort = "server.port";
-
-}  // namespace server
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/service_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/service_attributes.h
deleted file mode 100644
index 1f335ca26..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/service_attributes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace service
-{
-
-/**
-  Logical name of the service.
-  <p>
-  MUST be the same for all instances of horizontally scaled services. If the value was not
-  specified, SDKs MUST fallback to @code unknown_service: @endcode concatenated with <a
-  href="process.md">@code process.executable.name @endcode</a>, e.g. @code unknown_service:bash
-  @endcode. If @code process.executable.name @endcode is not available, the value MUST be set to
-  @code unknown_service @endcode.
- */
-static constexpr const char *kServiceName = "service.name";
-
-/**
-  The version string of the service API or implementation. The format is not defined by these
-  conventions.
- */
-static constexpr const char *kServiceVersion = "service.version";
-
-}  // namespace service
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/system_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/system_metrics.h
deleted file mode 100644
index a985dac90..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/system_metrics.h
+++ /dev/null
@@ -1,1339 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace system
-{
-
-/**
- * Deprecated. Use @code cpu.frequency @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code cpu.frequency @endcode.", "reason": "uncategorized"}
- * <p>
- * gauge
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuFrequency =
-    "system.cpu.frequency";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuFrequency =
-    "Deprecated. Use `cpu.frequency` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuFrequency = "{Hz}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                 unitMetricSystemCpuFrequency);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                  unitMetricSystemCpuFrequency);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency,
-                                           unitMetricSystemCpuFrequency);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuFrequency(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricSystemCpuFrequency, descrMetricSystemCpuFrequency, unitMetricSystemCpuFrequency);
-}
-
-/**
- * Reports the number of logical (virtual) processor cores created by the operating system to manage
- * multitasking <p> Calculated by multiplying the number of sockets by the number of cores per
- * socket, and then by the number of threads per core <p> updowncounter
- */
-static constexpr const char *kMetricSystemCpuLogicalCount = "system.cpu.logical.count";
-static constexpr const char *descrMetricSystemCpuLogicalCount =
-    "Reports the number of logical (virtual) processor cores created by the operating system to "
-    "manage multitasking";
-static constexpr const char *unitMetricSystemCpuLogicalCount = "{cpu}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemCpuLogicalCount,
-                                         descrMetricSystemCpuLogicalCount,
-                                         unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemCpuLogicalCount,
-                                          descrMetricSystemCpuLogicalCount,
-                                          unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemCpuLogicalCount,
-                                                   descrMetricSystemCpuLogicalCount,
-                                                   unitMetricSystemCpuLogicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuLogicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemCpuLogicalCount,
-                                                    descrMetricSystemCpuLogicalCount,
-                                                    unitMetricSystemCpuLogicalCount);
-}
-
-/**
- * Reports the number of actual physical processor cores on the hardware
- * <p>
- * Calculated by multiplying the number of sockets by the number of cores per socket
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemCpuPhysicalCount = "system.cpu.physical.count";
-static constexpr const char *descrMetricSystemCpuPhysicalCount =
-    "Reports the number of actual physical processor cores on the hardware";
-static constexpr const char *unitMetricSystemCpuPhysicalCount = "{cpu}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemCpuPhysicalCount,
-                                         descrMetricSystemCpuPhysicalCount,
-                                         unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                          descrMetricSystemCpuPhysicalCount,
-                                          unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                                   descrMetricSystemCpuPhysicalCount,
-                                                   unitMetricSystemCpuPhysicalCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuPhysicalCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemCpuPhysicalCount,
-                                                    descrMetricSystemCpuPhysicalCount,
-                                                    unitMetricSystemCpuPhysicalCount);
-}
-
-/**
- * Deprecated. Use @code cpu.time @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code cpu.time @endcode.", "reason": "uncategorized"}
- * <p>
- * counter
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuTime = "system.cpu.time";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuTime =
-    "Deprecated. Use `cpu.time` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuTime = "s";
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                    unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                    unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                             unitMetricSystemCpuTime);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemCpuTime, descrMetricSystemCpuTime,
-                                              unitMetricSystemCpuTime);
-}
-
-/**
- * Deprecated. Use @code cpu.utilization @endcode instead.
- *
- * @deprecated
- * {"note": "Replaced by @code cpu.utilization @endcode.", "reason": "uncategorized"}
- * <p>
- * gauge
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMetricSystemCpuUtilization =
-    "system.cpu.utilization";
-OPENTELEMETRY_DEPRECATED static constexpr const char *descrMetricSystemCpuUtilization =
-    "Deprecated. Use `cpu.utilization` instead.";
-OPENTELEMETRY_DEPRECATED static constexpr const char *unitMetricSystemCpuUtilization = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization,
-                                 unitMetricSystemCpuUtilization);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization,
-                                  unitMetricSystemCpuUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization, unitMetricSystemCpuUtilization);
-}
-
-OPENTELEMETRY_DEPRECATED static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemCpuUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricSystemCpuUtilization, descrMetricSystemCpuUtilization, unitMetricSystemCpuUtilization);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemDiskIo     = "system.disk.io";
-static constexpr const char *descrMetricSystemDiskIo = "";
-static constexpr const char *unitMetricSystemDiskIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                    unitMetricSystemDiskIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                    unitMetricSystemDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                             unitMetricSystemDiskIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricSystemDiskIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskIo, descrMetricSystemDiskIo,
-                                              unitMetricSystemDiskIo);
-}
-
-/**
- * Time disk spent activated
- * <p>
- * The real elapsed time ("wall clock") used in the I/O path (time from operations running in
- * parallel are not counted). Measured as: <ul> <li>Linux: Field 13 from <a
- * href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
- *   <li>Windows: The complement of
- * <a
- * href="https://learn.microsoft.com/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained">"Disk%
- * Idle Time"</a> performance counter: @code uptime * (100 - "Disk\% Idle Time") / 100 @endcode</li>
- * </ul>
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemDiskIoTime     = "system.disk.io_time";
-static constexpr const char *descrMetricSystemDiskIoTime = "Time disk spent activated";
-static constexpr const char *unitMetricSystemDiskIoTime  = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskIoTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                    unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskIoTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                    unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskIoTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                             unitMetricSystemDiskIoTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskIoTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskIoTime, descrMetricSystemDiskIoTime,
-                                              unitMetricSystemDiskIoTime);
-}
-
-/**
- * The total storage capacity of the disk
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemDiskLimit     = "system.disk.limit";
-static constexpr const char *descrMetricSystemDiskLimit = "The total storage capacity of the disk";
-static constexpr const char *unitMetricSystemDiskLimit  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemDiskLimit, descrMetricSystemDiskLimit,
-                                         unitMetricSystemDiskLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemDiskLimit, descrMetricSystemDiskLimit,
-                                          unitMetricSystemDiskLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemDiskLimit, descrMetricSystemDiskLimit, unitMetricSystemDiskLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemDiskLimit, descrMetricSystemDiskLimit, unitMetricSystemDiskLimit);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemDiskMerged     = "system.disk.merged";
-static constexpr const char *descrMetricSystemDiskMerged = "";
-static constexpr const char *unitMetricSystemDiskMerged  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemDiskMerged(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                    unitMetricSystemDiskMerged);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemDiskMerged(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                    unitMetricSystemDiskMerged);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskMerged(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                             unitMetricSystemDiskMerged);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskMerged(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskMerged, descrMetricSystemDiskMerged,
-                                              unitMetricSystemDiskMerged);
-}
-
-/**
- * Sum of the time each operation took to complete
- * <p>
- * Because it is the sum of time each request took, parallel-issued requests each contribute to make
- * the count grow. Measured as: <ul> <li>Linux: Fields 7 & 11 from <a
- * href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
- *   <li>Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter
- * (similar for Writes)</li>
- * </ul>
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemDiskOperationTime = "system.disk.operation_time";
-static constexpr const char *descrMetricSystemDiskOperationTime =
-    "Sum of the time each operation took to complete";
-static constexpr const char *unitMetricSystemDiskOperationTime = "s";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskOperationTime,
-                                    descrMetricSystemDiskOperationTime,
-                                    unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskOperationTime,
-                                    descrMetricSystemDiskOperationTime,
-                                    unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemDiskOperationTime,
-                                             descrMetricSystemDiskOperationTime,
-                                             unitMetricSystemDiskOperationTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskOperationTime(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemDiskOperationTime,
-                                              descrMetricSystemDiskOperationTime,
-                                              unitMetricSystemDiskOperationTime);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemDiskOperations     = "system.disk.operations";
-static constexpr const char *descrMetricSystemDiskOperations = "";
-static constexpr const char *unitMetricSystemDiskOperations  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemDiskOperations, descrMetricSystemDiskOperations,
-                                    unitMetricSystemDiskOperations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemDiskOperations, descrMetricSystemDiskOperations,
-                                    unitMetricSystemDiskOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemDiskOperations, descrMetricSystemDiskOperations, unitMetricSystemDiskOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemDiskOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemDiskOperations, descrMetricSystemDiskOperations, unitMetricSystemDiskOperations);
-}
-
-/**
- * The total storage capacity of the filesystem
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemFilesystemLimit = "system.filesystem.limit";
-static constexpr const char *descrMetricSystemFilesystemLimit =
-    "The total storage capacity of the filesystem";
-static constexpr const char *unitMetricSystemFilesystemLimit = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemFilesystemLimit,
-                                         descrMetricSystemFilesystemLimit,
-                                         unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemFilesystemLimit,
-                                          descrMetricSystemFilesystemLimit,
-                                          unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemFilesystemLimit,
-                                                   descrMetricSystemFilesystemLimit,
-                                                   unitMetricSystemFilesystemLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemFilesystemLimit,
-                                                    descrMetricSystemFilesystemLimit,
-                                                    unitMetricSystemFilesystemLimit);
-}
-
-/**
- * Reports a filesystem's space usage across different states.
- * <p>
- * The sum of all @code system.filesystem.usage @endcode values over the different @code
- * system.filesystem.state @endcode attributes SHOULD equal the total storage capacity of the
- * filesystem, that is @code system.filesystem.limit @endcode. <p> updowncounter
- */
-static constexpr const char *kMetricSystemFilesystemUsage = "system.filesystem.usage";
-static constexpr const char *descrMetricSystemFilesystemUsage =
-    "Reports a filesystem's space usage across different states.";
-static constexpr const char *unitMetricSystemFilesystemUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemFilesystemUsage,
-                                         descrMetricSystemFilesystemUsage,
-                                         unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemFilesystemUsage,
-                                          descrMetricSystemFilesystemUsage,
-                                          unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemFilesystemUsage,
-                                                   descrMetricSystemFilesystemUsage,
-                                                   unitMetricSystemFilesystemUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemFilesystemUsage,
-                                                    descrMetricSystemFilesystemUsage,
-                                                    unitMetricSystemFilesystemUsage);
-}
-
-/**
- * gauge
- */
-static constexpr const char *kMetricSystemFilesystemUtilization = "system.filesystem.utilization";
-static constexpr const char *descrMetricSystemFilesystemUtilization = "";
-static constexpr const char *unitMetricSystemFilesystemUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemFilesystemUtilization,
-                                 descrMetricSystemFilesystemUtilization,
-                                 unitMetricSystemFilesystemUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemFilesystemUtilization,
-                                  descrMetricSystemFilesystemUtilization,
-                                  unitMetricSystemFilesystemUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemFilesystemUtilization,
-                                           descrMetricSystemFilesystemUtilization,
-                                           unitMetricSystemFilesystemUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemFilesystemUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemFilesystemUtilization,
-                                            descrMetricSystemFilesystemUtilization,
-                                            unitMetricSystemFilesystemUtilization);
-}
-
-/**
- * An estimate of how much memory is available for starting new applications, without causing
- * swapping <p> This is an alternative to @code system.memory.usage @endcode metric with @code
- * state=free @endcode. Linux starting from 3.14 exports "available" memory. It takes "free" memory
- * as a baseline, and then factors in kernel-specific values. This is supposed to be more accurate
- * than just "free" memory. For reference, see the calculations <a
- * href="https://superuser.com/a/980821">here</a>. See also @code MemAvailable @endcode in <a
- * href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemoryAvailable = "system.linux.memory.available";
-static constexpr const char *descrMetricSystemLinuxMemoryAvailable =
-    "An estimate of how much memory is available for starting new applications, without causing "
-    "swapping";
-static constexpr const char *unitMetricSystemLinuxMemoryAvailable = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                         descrMetricSystemLinuxMemoryAvailable,
-                                         unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                          descrMetricSystemLinuxMemoryAvailable,
-                                          unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                   descrMetricSystemLinuxMemoryAvailable,
-                                                   unitMetricSystemLinuxMemoryAvailable);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemLinuxMemoryAvailable(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemoryAvailable,
-                                                    descrMetricSystemLinuxMemoryAvailable,
-                                                    unitMetricSystemLinuxMemoryAvailable);
-}
-
-/**
- * Reports the memory used by the Linux kernel for managing caches of frequently used objects.
- * <p>
- * The sum over the @code reclaimable @endcode and @code unreclaimable @endcode state values in
- * @code linux.memory.slab.usage @endcode SHOULD be equal to the total slab memory available on the
- * system. Note that the total slab memory is not constant and may vary over time. See also the <a
- * href="https://blogs.oracle.com/linux/post/understanding-linux-kernel-memory-statistics">Slab
- * allocator</a> and @code Slab @endcode in <a
- * href="https://man7.org/linux/man-pages/man5/proc.5.html">/proc/meminfo</a>. <p> updowncounter
- */
-static constexpr const char *kMetricSystemLinuxMemorySlabUsage = "system.linux.memory.slab.usage";
-static constexpr const char *descrMetricSystemLinuxMemorySlabUsage =
-    "Reports the memory used by the Linux kernel for managing caches of frequently used objects.";
-static constexpr const char *unitMetricSystemLinuxMemorySlabUsage = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                         descrMetricSystemLinuxMemorySlabUsage,
-                                         unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                          descrMetricSystemLinuxMemorySlabUsage,
-                                          unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                   descrMetricSystemLinuxMemorySlabUsage,
-                                                   unitMetricSystemLinuxMemorySlabUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemLinuxMemorySlabUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemLinuxMemorySlabUsage,
-                                                    descrMetricSystemLinuxMemorySlabUsage,
-                                                    unitMetricSystemLinuxMemorySlabUsage);
-}
-
-/**
- * Total memory available in the system.
- * <p>
- * Its value SHOULD equal the sum of @code system.memory.state @endcode over all states.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemMemoryLimit     = "system.memory.limit";
-static constexpr const char *descrMetricSystemMemoryLimit = "Total memory available in the system.";
-static constexpr const char *unitMetricSystemMemoryLimit  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit,
-                                         unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit,
-                                          unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryLimit(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryLimit, descrMetricSystemMemoryLimit, unitMetricSystemMemoryLimit);
-}
-
-/**
- * Shared memory used (mostly by tmpfs).
- * <p>
- * Equivalent of @code shared @endcode from <a
- * href="https://man7.org/linux/man-pages/man1/free.1.html">@code free @endcode command</a> or
- * @code Shmem @endcode from <a href="https://man7.org/linux/man-pages/man5/proc.5.html">@code
- * /proc/meminfo @endcode</a>" <p> updowncounter
- */
-static constexpr const char *kMetricSystemMemoryShared = "system.memory.shared";
-static constexpr const char *descrMetricSystemMemoryShared =
-    "Shared memory used (mostly by tmpfs).";
-static constexpr const char *unitMetricSystemMemoryShared = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryShared, descrMetricSystemMemoryShared,
-                                         unitMetricSystemMemoryShared);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryShared, descrMetricSystemMemoryShared,
-                                          unitMetricSystemMemoryShared);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryShared, descrMetricSystemMemoryShared, unitMetricSystemMemoryShared);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryShared(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryShared, descrMetricSystemMemoryShared, unitMetricSystemMemoryShared);
-}
-
-/**
- * Reports memory in use by state.
- * <p>
- * The sum over all @code system.memory.state @endcode values SHOULD equal the total memory
- * available on the system, that is @code system.memory.limit @endcode.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemMemoryUsage     = "system.memory.usage";
-static constexpr const char *descrMetricSystemMemoryUsage = "Reports memory in use by state.";
-static constexpr const char *unitMetricSystemMemoryUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage,
-                                         unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage,
-                                          unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage, unitMetricSystemMemoryUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemMemoryUsage, descrMetricSystemMemoryUsage, unitMetricSystemMemoryUsage);
-}
-
-/**
- * gauge
- */
-static constexpr const char *kMetricSystemMemoryUtilization     = "system.memory.utilization";
-static constexpr const char *descrMetricSystemMemoryUtilization = "";
-static constexpr const char *unitMetricSystemMemoryUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemMemoryUtilization, descrMetricSystemMemoryUtilization,
-                                 unitMetricSystemMemoryUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemMemoryUtilization,
-                                  descrMetricSystemMemoryUtilization,
-                                  unitMetricSystemMemoryUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemMemoryUtilization,
-                                           descrMetricSystemMemoryUtilization,
-                                           unitMetricSystemMemoryUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemMemoryUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemMemoryUtilization,
-                                            descrMetricSystemMemoryUtilization,
-                                            unitMetricSystemMemoryUtilization);
-}
-
-/**
- * updowncounter
- */
-static constexpr const char *kMetricSystemNetworkConnections     = "system.network.connections";
-static constexpr const char *descrMetricSystemNetworkConnections = "";
-static constexpr const char *unitMetricSystemNetworkConnections  = "{connection}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemNetworkConnections,
-                                         descrMetricSystemNetworkConnections,
-                                         unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemNetworkConnections,
-                                          descrMetricSystemNetworkConnections,
-                                          unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricSystemNetworkConnections,
-                                                   descrMetricSystemNetworkConnections,
-                                                   unitMetricSystemNetworkConnections);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricSystemNetworkConnections,
-                                                    descrMetricSystemNetworkConnections,
-                                                    unitMetricSystemNetworkConnections);
-}
-
-/**
- * Count of packets that are dropped or discarded even though there was no error
- * <p>
- * Measured as:
- * <ul>
- *   <li>Linux: the @code drop @endcode column in @code /proc/dev/net @endcode (<a
- * href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
- *   <li>Windows: <a
- * href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
- * InDiscards @endcode/@code OutDiscards @endcode</a> from <a
- * href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
- * GetIfEntry2 @endcode</a></li>
- * </ul>
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemNetworkDropped = "system.network.dropped";
-static constexpr const char *descrMetricSystemNetworkDropped =
-    "Count of packets that are dropped or discarded even though there was no error";
-static constexpr const char *unitMetricSystemNetworkDropped = "{packet}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
-                                    unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped,
-                                    unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkDropped, descrMetricSystemNetworkDropped, unitMetricSystemNetworkDropped);
-}
-
-/**
- * Count of network errors detected
- * <p>
- * Measured as:
- * <ul>
- *   <li>Linux: the @code errs @endcode column in @code /proc/dev/net @endcode (<a
- * href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>).</li>
- *   <li>Windows: <a
- * href="https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2">@code
- * InErrors @endcode/@code OutErrors @endcode</a> from <a
- * href="https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2">@code
- * GetIfEntry2 @endcode</a>.</li>
- * </ul>
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemNetworkErrors     = "system.network.errors";
-static constexpr const char *descrMetricSystemNetworkErrors = "Count of network errors detected";
-static constexpr const char *unitMetricSystemNetworkErrors  = "{error}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors,
-                                    unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemNetworkErrors(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors,
-                                    unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors, unitMetricSystemNetworkErrors);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkErrors(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkErrors, descrMetricSystemNetworkErrors, unitMetricSystemNetworkErrors);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemNetworkIo     = "system.network.io";
-static constexpr const char *descrMetricSystemNetworkIo = "";
-static constexpr const char *unitMetricSystemNetworkIo  = "By";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                    unitMetricSystemNetworkIo);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemNetworkIo(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                    unitMetricSystemNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                             unitMetricSystemNetworkIo);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkIo(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemNetworkIo, descrMetricSystemNetworkIo,
-                                              unitMetricSystemNetworkIo);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemNetworkPackets     = "system.network.packets";
-static constexpr const char *descrMetricSystemNetworkPackets = "";
-static constexpr const char *unitMetricSystemNetworkPackets  = "{packet}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
-                                    unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets,
-                                    unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemNetworkPackets(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemNetworkPackets, descrMetricSystemNetworkPackets, unitMetricSystemNetworkPackets);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemPagingFaults     = "system.paging.faults";
-static constexpr const char *descrMetricSystemPagingFaults = "";
-static constexpr const char *unitMetricSystemPagingFaults  = "{fault}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>> CreateSyncInt64MetricSystemPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemPagingFaults, descrMetricSystemPagingFaults,
-                                    unitMetricSystemPagingFaults);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>> CreateSyncDoubleMetricSystemPagingFaults(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemPagingFaults, descrMetricSystemPagingFaults,
-                                    unitMetricSystemPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemPagingFaults, descrMetricSystemPagingFaults, unitMetricSystemPagingFaults);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingFaults(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemPagingFaults, descrMetricSystemPagingFaults, unitMetricSystemPagingFaults);
-}
-
-/**
- * counter
- */
-static constexpr const char *kMetricSystemPagingOperations     = "system.paging.operations";
-static constexpr const char *descrMetricSystemPagingOperations = "";
-static constexpr const char *unitMetricSystemPagingOperations  = "{operation}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemPagingOperations,
-                                    descrMetricSystemPagingOperations,
-                                    unitMetricSystemPagingOperations);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemPagingOperations,
-                                    descrMetricSystemPagingOperations,
-                                    unitMetricSystemPagingOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(kMetricSystemPagingOperations,
-                                             descrMetricSystemPagingOperations,
-                                             unitMetricSystemPagingOperations);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingOperations(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(kMetricSystemPagingOperations,
-                                              descrMetricSystemPagingOperations,
-                                              unitMetricSystemPagingOperations);
-}
-
-/**
- * Unix swap or windows pagefile usage
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemPagingUsage     = "system.paging.usage";
-static constexpr const char *descrMetricSystemPagingUsage = "Unix swap or windows pagefile usage";
-static constexpr const char *unitMetricSystemPagingUsage  = "By";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemPagingUsage, descrMetricSystemPagingUsage,
-                                         unitMetricSystemPagingUsage);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemPagingUsage, descrMetricSystemPagingUsage,
-                                          unitMetricSystemPagingUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemPagingUsage, descrMetricSystemPagingUsage, unitMetricSystemPagingUsage);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingUsage(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemPagingUsage, descrMetricSystemPagingUsage, unitMetricSystemPagingUsage);
-}
-
-/**
- * gauge
- */
-static constexpr const char *kMetricSystemPagingUtilization     = "system.paging.utilization";
-static constexpr const char *descrMetricSystemPagingUtilization = "";
-static constexpr const char *unitMetricSystemPagingUtilization  = "1";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemPagingUtilization, descrMetricSystemPagingUtilization,
-                                 unitMetricSystemPagingUtilization);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemPagingUtilization,
-                                  descrMetricSystemPagingUtilization,
-                                  unitMetricSystemPagingUtilization);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemPagingUtilization,
-                                           descrMetricSystemPagingUtilization,
-                                           unitMetricSystemPagingUtilization);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemPagingUtilization(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemPagingUtilization,
-                                            descrMetricSystemPagingUtilization,
-                                            unitMetricSystemPagingUtilization);
-}
-
-/**
- * Total number of processes in each state
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricSystemProcessCount = "system.process.count";
-static constexpr const char *descrMetricSystemProcessCount =
-    "Total number of processes in each state";
-static constexpr const char *unitMetricSystemProcessCount = "{process}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricSystemProcessCount, descrMetricSystemProcessCount,
-                                         unitMetricSystemProcessCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricSystemProcessCount, descrMetricSystemProcessCount,
-                                          unitMetricSystemProcessCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricSystemProcessCount, descrMetricSystemProcessCount, unitMetricSystemProcessCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemProcessCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricSystemProcessCount, descrMetricSystemProcessCount, unitMetricSystemProcessCount);
-}
-
-/**
- * Total number of processes created over uptime of the host
- * <p>
- * counter
- */
-static constexpr const char *kMetricSystemProcessCreated = "system.process.created";
-static constexpr const char *descrMetricSystemProcessCreated =
-    "Total number of processes created over uptime of the host";
-static constexpr const char *unitMetricSystemProcessCreated = "{process}";
-
-static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
-CreateSyncInt64MetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateUInt64Counter(kMetricSystemProcessCreated, descrMetricSystemProcessCreated,
-                                    unitMetricSystemProcessCreated);
-}
-
-static inline nostd::unique_ptr<metrics::Counter<double>>
-CreateSyncDoubleMetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleCounter(kMetricSystemProcessCreated, descrMetricSystemProcessCreated,
-                                    unitMetricSystemProcessCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableCounter(
-      kMetricSystemProcessCreated, descrMetricSystemProcessCreated, unitMetricSystemProcessCreated);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricSystemProcessCreated(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableCounter(
-      kMetricSystemProcessCreated, descrMetricSystemProcessCreated, unitMetricSystemProcessCreated);
-}
-
-/**
- * The time the system has been running
- * <p>
- * Instrumentations SHOULD use a gauge with type @code double @endcode and measure uptime in seconds
- * as a floating point number with the highest precision available. The actual accuracy would depend
- * on the instrumentation and operating system. <p> gauge
- */
-static constexpr const char *kMetricSystemUptime     = "system.uptime";
-static constexpr const char *descrMetricSystemUptime = "The time the system has been running";
-static constexpr const char *unitMetricSystemUptime  = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                 unitMetricSystemUptime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                  unitMetricSystemUptime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                           unitMetricSystemUptime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricSystemUptime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricSystemUptime, descrMetricSystemUptime,
-                                            unitMetricSystemUptime);
-}
-
-}  // namespace system
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/telemetry_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/telemetry_attributes.h
deleted file mode 100644
index 1722398dd..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/telemetry_attributes.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace telemetry
-{
-
-/**
-  The language of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
-
-/**
-  The name of the telemetry SDK as defined above.
-  <p>
-  The OpenTelemetry SDK MUST set the @code telemetry.sdk.name @endcode attribute to @code
-  opentelemetry @endcode. If another SDK, like a fork or a vendor-provided implementation, is used,
-  this SDK MUST set the
-  @code telemetry.sdk.name @endcode attribute to the fully-qualified class or module name of this
-  SDK's main entry point or another suitable identifier depending on the language. The identifier
-  @code opentelemetry @endcode is reserved and MUST NOT be used in this case. All custom identifiers
-  SHOULD be stable across different versions of an implementation.
- */
-static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
-
-/**
-  The version string of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
-
-namespace TelemetrySdkLanguageValues
-{
-/**
-  none
- */
-static constexpr const char *kCpp = "cpp";
-
-/**
-  none
- */
-static constexpr const char *kDotnet = "dotnet";
-
-/**
-  none
- */
-static constexpr const char *kErlang = "erlang";
-
-/**
-  none
- */
-static constexpr const char *kGo = "go";
-
-/**
-  none
- */
-static constexpr const char *kJava = "java";
-
-/**
-  none
- */
-static constexpr const char *kNodejs = "nodejs";
-
-/**
-  none
- */
-static constexpr const char *kPhp = "php";
-
-/**
-  none
- */
-static constexpr const char *kPython = "python";
-
-/**
-  none
- */
-static constexpr const char *kRuby = "ruby";
-
-/**
-  none
- */
-static constexpr const char *kRust = "rust";
-
-/**
-  none
- */
-static constexpr const char *kSwift = "swift";
-
-/**
-  none
- */
-static constexpr const char *kWebjs = "webjs";
-
-}  // namespace TelemetrySdkLanguageValues
-
-}  // namespace telemetry
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/url_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/url_attributes.h
deleted file mode 100644
index 316b60e9a..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/url_attributes.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace url
-{
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component
- */
-static constexpr const char *kUrlFragment = "url.fragment";
-
-/**
-  Absolute URL describing a network resource according to <a
-  href="https://www.rfc-editor.org/rfc/rfc3986">RFC3986</a> <p> For network calls, URL usually has
-  @code scheme://host[:port][path][?query][#fragment] @endcode format, where the fragment is not
-  transmitted over HTTP, but if it is known, it SHOULD be included nevertheless. <p>
-  @code url.full @endcode MUST NOT contain credentials passed via URL in form of @code
-  https://username:password@www.example.com/ @endcode. In such case username and password SHOULD be
-  redacted and attribute's value SHOULD be @code https://REDACTED:REDACTED@www.example.com/
-  @endcode. <p>
-  @code url.full @endcode SHOULD capture the absolute URL when it is available (or can be
-  reconstructed). <p> Sensitive content provided in @code url.full @endcode SHOULD be scrubbed when
-  instrumentations can identify it. <p>
-
-  Query string values for the following keys SHOULD be redacted by default and replaced by the
-  value @code REDACTED @endcode:
-  <ul>
-    <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  AWSAccessKeyId @endcode</a></li> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  Signature @endcode</a></li> <li><a
-  href="https://learn.microsoft.com/azure/storage/common/storage-sas-overview#sas-token">@code sig
-  @endcode</a></li> <li><a
-  href="https://cloud.google.com/storage/docs/access-control/signed-urls">@code X-Goog-Signature
-  @endcode</a></li>
-  </ul>
-  <p>
-  This list is subject to change over time.
-  <p>
-  When a query string value is redacted, the query string key SHOULD still be preserved, e.g.
-  @code https://www.example.com/path?color=blue&sig=REDACTED @endcode.
- */
-static constexpr const char *kUrlFull = "url.full";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.3">URI path</a> component
-  <p>
-  Sensitive content provided in @code url.path @endcode SHOULD be scrubbed when instrumentations can
-  identify it.
- */
-static constexpr const char *kUrlPath = "url.path";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.4">URI query</a> component
-  <p>
-  Sensitive content provided in @code url.query @endcode SHOULD be scrubbed when instrumentations
-  can identify it. <p>
-
-  Query string values for the following keys SHOULD be redacted by default and replaced by the value
-  @code REDACTED @endcode: <ul> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  AWSAccessKeyId @endcode</a></li> <li><a
-  href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
-  Signature @endcode</a></li> <li><a
-  href="https://learn.microsoft.com/azure/storage/common/storage-sas-overview#sas-token">@code sig
-  @endcode</a></li> <li><a
-  href="https://cloud.google.com/storage/docs/access-control/signed-urls">@code X-Goog-Signature
-  @endcode</a></li>
-  </ul>
-  <p>
-  This list is subject to change over time.
-  <p>
-  When a query string value is redacted, the query string key SHOULD still be preserved, e.g.
-  @code q=OpenTelemetry&sig=REDACTED @endcode.
- */
-static constexpr const char *kUrlQuery = "url.query";
-
-/**
-  The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
-  identifying the used protocol.
- */
-static constexpr const char *kUrlScheme = "url.scheme";
-
-}  // namespace url
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/user_agent_attributes.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/user_agent_attributes.h
deleted file mode 100644
index c738d0c6e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/user_agent_attributes.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_attributes-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace user_agent
-{
-
-/**
-  Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
-  User-Agent</a> header sent by the client.
- */
-static constexpr const char *kUserAgentOriginal = "user_agent.original";
-
-}  // namespace user_agent
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/vcs_metrics.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/vcs_metrics.h
deleted file mode 100644
index 1f2885b8f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/semconv/vcs_metrics.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * DO NOT EDIT, this is an Auto-generated file from:
- * buildscripts/semantic-convention/templates/registry/semantic_metrics-h.j2
- */
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/metrics/meter.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace semconv
-{
-namespace vcs
-{
-
-/**
- * The number of changes (pull requests/merge requests/changelists) in a repository, categorized by
- * their state (e.g. open or merged) <p> updowncounter
- */
-static constexpr const char *kMetricVcsChangeCount = "vcs.change.count";
-static constexpr const char *descrMetricVcsChangeCount =
-    "The number of changes (pull requests/merge requests/changelists) in a repository, categorized "
-    "by their state (e.g. open or merged)";
-static constexpr const char *unitMetricVcsChangeCount = "{change}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                         unitMetricVcsChangeCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                          unitMetricVcsChangeCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsChangeCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricVcsChangeCount, descrMetricVcsChangeCount,
-                                                   unitMetricVcsChangeCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricVcsChangeCount, descrMetricVcsChangeCount, unitMetricVcsChangeCount);
-}
-
-/**
- * The time duration a change (pull request/merge request/changelist) has been in a given state.
- * <p>
- * gauge
- */
-static constexpr const char *kMetricVcsChangeDuration = "vcs.change.duration";
-static constexpr const char *descrMetricVcsChangeDuration =
-    "The time duration a change (pull request/merge request/changelist) has been in a given state.";
-static constexpr const char *unitMetricVcsChangeDuration = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsChangeDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                 unitMetricVcsChangeDuration);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsChangeDuration(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                  unitMetricVcsChangeDuration);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeDuration(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                           unitMetricVcsChangeDuration);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeDuration(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsChangeDuration, descrMetricVcsChangeDuration,
-                                            unitMetricVcsChangeDuration);
-}
-
-/**
- * The amount of time since its creation it took a change (pull request/merge request/changelist) to
- * get the first approval. <p> gauge
- */
-static constexpr const char *kMetricVcsChangeTimeToApproval = "vcs.change.time_to_approval";
-static constexpr const char *descrMetricVcsChangeTimeToApproval =
-    "The amount of time since its creation it took a change (pull request/merge "
-    "request/changelist) to get the first approval.";
-static constexpr const char *unitMetricVcsChangeTimeToApproval = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>>
-CreateSyncInt64MetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeTimeToApproval, descrMetricVcsChangeTimeToApproval,
-                                 unitMetricVcsChangeTimeToApproval);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>>
-CreateSyncDoubleMetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeTimeToApproval,
-                                  descrMetricVcsChangeTimeToApproval,
-                                  unitMetricVcsChangeTimeToApproval);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsChangeTimeToApproval,
-                                           descrMetricVcsChangeTimeToApproval,
-                                           unitMetricVcsChangeTimeToApproval);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeTimeToApproval(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsChangeTimeToApproval,
-                                            descrMetricVcsChangeTimeToApproval,
-                                            unitMetricVcsChangeTimeToApproval);
-}
-
-/**
- * The amount of time since its creation it took a change (pull request/merge request/changelist) to
- * get merged into the target(base) ref. <p> gauge
- */
-static constexpr const char *kMetricVcsChangeTimeToMerge = "vcs.change.time_to_merge";
-static constexpr const char *descrMetricVcsChangeTimeToMerge =
-    "The amount of time since its creation it took a change (pull request/merge "
-    "request/changelist) to get merged into the target(base) ref.";
-static constexpr const char *unitMetricVcsChangeTimeToMerge = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsChangeTimeToMerge(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge,
-                                 unitMetricVcsChangeTimeToMerge);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsChangeTimeToMerge(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge,
-                                  unitMetricVcsChangeTimeToMerge);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsChangeTimeToMerge(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge, unitMetricVcsChangeTimeToMerge);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsChangeTimeToMerge(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsChangeTimeToMerge, descrMetricVcsChangeTimeToMerge, unitMetricVcsChangeTimeToMerge);
-}
-
-/**
- * The number of unique contributors to a repository
- * <p>
- * gauge
- */
-static constexpr const char *kMetricVcsContributorCount = "vcs.contributor.count";
-static constexpr const char *descrMetricVcsContributorCount =
-    "The number of unique contributors to a repository";
-static constexpr const char *unitMetricVcsContributorCount = "{contributor}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsContributorCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsContributorCount, descrMetricVcsContributorCount,
-                                 unitMetricVcsContributorCount);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsContributorCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsContributorCount, descrMetricVcsContributorCount,
-                                  unitMetricVcsContributorCount);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsContributorCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsContributorCount, descrMetricVcsContributorCount, unitMetricVcsContributorCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsContributorCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsContributorCount, descrMetricVcsContributorCount, unitMetricVcsContributorCount);
-}
-
-/**
- * The number of refs of type branch or tag in a repository.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricVcsRefCount = "vcs.ref.count";
-static constexpr const char *descrMetricVcsRefCount =
-    "The number of refs of type branch or tag in a repository.";
-static constexpr const char *unitMetricVcsRefCount = "{ref}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>> CreateSyncInt64MetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                         unitMetricVcsRefCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>> CreateSyncDoubleMetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                          unitMetricVcsRefCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                                   unitMetricVcsRefCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricVcsRefCount(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(kMetricVcsRefCount, descrMetricVcsRefCount,
-                                                    unitMetricVcsRefCount);
-}
-
-/**
- * The number of lines added/removed in a ref (branch) relative to the ref from the @code
- * vcs.ref.base.name @endcode attribute. <p> This metric should be reported for each @code
- * vcs.line_change.type @endcode value. For example if a ref added 3 lines and removed 2 lines,
- * instrumentation SHOULD report two measurements: 3 and 2 (both positive numbers).
- * If number of lines added/removed should be calculated from the start of time, then @code
- * vcs.ref.base.name @endcode SHOULD be set to an empty string. <p> gauge
- */
-static constexpr const char *kMetricVcsRefLinesDelta = "vcs.ref.lines_delta";
-static constexpr const char *descrMetricVcsRefLinesDelta =
-    "The number of lines added/removed in a ref (branch) relative to the ref from the "
-    "`vcs.ref.base.name` attribute.";
-static constexpr const char *unitMetricVcsRefLinesDelta = "{line}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefLinesDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                 unitMetricVcsRefLinesDelta);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefLinesDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                  unitMetricVcsRefLinesDelta);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRefLinesDelta(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                           unitMetricVcsRefLinesDelta);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRefLinesDelta(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsRefLinesDelta, descrMetricVcsRefLinesDelta,
-                                            unitMetricVcsRefLinesDelta);
-}
-
-/**
- * The number of revisions (commits) a ref (branch) is ahead/behind the branch from the @code
- * vcs.ref.base.name @endcode attribute <p> This metric should be reported for each @code
- * vcs.revision_delta.direction @endcode value. For example if branch @code a @endcode is 3 commits
- * behind and 2 commits ahead of @code trunk @endcode, instrumentation SHOULD report two
- * measurements: 3 and 2 (both positive numbers) and @code vcs.ref.base.name @endcode is set to
- * @code trunk @endcode. <p> gauge
- */
-static constexpr const char *kMetricVcsRefRevisionsDelta = "vcs.ref.revisions_delta";
-static constexpr const char *descrMetricVcsRefRevisionsDelta =
-    "The number of revisions (commits) a ref (branch) is ahead/behind the branch from the "
-    "`vcs.ref.base.name` attribute";
-static constexpr const char *unitMetricVcsRefRevisionsDelta = "{revision}";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefRevisionsDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta,
-                                 unitMetricVcsRefRevisionsDelta);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefRevisionsDelta(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta,
-                                  unitMetricVcsRefRevisionsDelta);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRefRevisionsDelta(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(
-      kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta, unitMetricVcsRefRevisionsDelta);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRefRevisionsDelta(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(
-      kMetricVcsRefRevisionsDelta, descrMetricVcsRefRevisionsDelta, unitMetricVcsRefRevisionsDelta);
-}
-
-/**
- * Time a ref (branch) created from the default branch (trunk) has existed. The @code ref.type
- * @endcode attribute will always be @code branch @endcode <p> gauge
- */
-static constexpr const char *kMetricVcsRefTime = "vcs.ref.time";
-static constexpr const char *descrMetricVcsRefTime =
-    "Time a ref (branch) created from the default branch (trunk) has existed. The `ref.type` "
-    "attribute will always be `branch`";
-static constexpr const char *unitMetricVcsRefTime = "s";
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-static inline nostd::unique_ptr<metrics::Gauge<int64_t>> CreateSyncInt64MetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64Gauge(kMetricVcsRefTime, descrMetricVcsRefTime, unitMetricVcsRefTime);
-}
-
-static inline nostd::unique_ptr<metrics::Gauge<double>> CreateSyncDoubleMetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleGauge(kMetricVcsRefTime, descrMetricVcsRefTime, unitMetricVcsRefTime);
-}
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableGauge(kMetricVcsRefTime, descrMetricVcsRefTime,
-                                           unitMetricVcsRefTime);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricVcsRefTime(
-    metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableGauge(kMetricVcsRefTime, descrMetricVcsRefTime,
-                                            unitMetricVcsRefTime);
-}
-
-/**
- * The number of repositories in an organization.
- * <p>
- * updowncounter
- */
-static constexpr const char *kMetricVcsRepositoryCount = "vcs.repository.count";
-static constexpr const char *descrMetricVcsRepositoryCount =
-    "The number of repositories in an organization.";
-static constexpr const char *unitMetricVcsRepositoryCount = "{repository}";
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
-CreateSyncInt64MetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64UpDownCounter(kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount,
-                                         unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
-CreateSyncDoubleMetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleUpDownCounter(kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount,
-                                          unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncInt64MetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateInt64ObservableUpDownCounter(
-      kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount, unitMetricVcsRepositoryCount);
-}
-
-static inline nostd::shared_ptr<metrics::ObservableInstrument>
-CreateAsyncDoubleMetricVcsRepositoryCount(metrics::Meter *meter)
-{
-  return meter->CreateDoubleObservableUpDownCounter(
-      kMetricVcsRepositoryCount, descrMetricVcsRepositoryCount, unitMetricVcsRepositoryCount);
-}
-
-}  // namespace vcs
-}  // namespace semconv
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/shared_ptr.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/shared_ptr.h
deleted file mode 100644
index 8b855b08c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/shared_ptr.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/shared_ptr.h"
-
-#include <memory>  // IWYU pragma: export
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-
-// nostd::shared_ptr<T...>
-template <class... _Types>
-using shared_ptr = std::shared_ptr<_Types...>;
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/span.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/span.h
deleted file mode 100644
index 5d20e0227..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/span.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/span.h"
-
-#include "opentelemetry/version.h"
-
-// Standard library implementation requires at least C++17 compiler.
-// Older C++14 compilers may provide support for __has_include as a
-// conforming extension.
-#if defined __has_include
-#  if __has_include(<version>)  // Check for __cpp_{feature}
-#    include <version>
-#    if defined(__cpp_lib_span) && __cplusplus > 201703L
-#      define OPENTELEMETRY_HAVE_SPAN
-#    endif
-#  endif
-#  if !defined(OPENTELEMETRY_HAVE_SPAN)
-#    // Check for Visual Studio span
-#    if defined(_MSVC_LANG) && _HAS_CXX20
-#      define OPENTELEMETRY_HAVE_SPAN
-#    endif
-#    // Check for other compiler span implementation
-#    if !defined(_MSVC_LANG) && __has_include(<span>) && __cplusplus > 201703L
-// This works as long as compiler standard is set to C++20
-#      define OPENTELEMETRY_HAVE_SPAN
-#    endif
-#  endif
-#  if !__has_include(<gsl/gsl>)
-#    undef HAVE_GSL
-#  endif
-#endif
-
-#if !defined(OPENTELEMETRY_HAVE_SPAN)
-#  if defined(HAVE_GSL)
-#    include <type_traits>
-// Guidelines Support Library provides an implementation of std::span
-#    include <gsl/gsl>
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-using gsl::dynamic_extent;
-template <class ElementType, std::size_t Extent = gsl::dynamic_extent>
-using span = gsl::span<ElementType, Extent>;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#    define OPENTELEMETRY_HAVE_SPAN
-#  else
-// No `gsl::span`, no `std::span`, fallback to `nostd::span`
-#  endif
-
-#else  // OPENTELEMETRY_HAVE_SPAN
-// Using std::span (https://wg21.link/P0122R7) from Standard Library available in C++20 :
-// - GCC libstdc++ 10+
-// - Clang libc++ 7
-// - MSVC Standard Library 19.26*
-// - Apple Clang 10.0.0*
-#  include <limits>
-#  include <span>
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace nostd
-{
-constexpr std::size_t dynamic_extent = (std::numeric_limits<std::size_t>::max)();
-
-template <class ElementType, std::size_t Extent = nostd::dynamic_extent>
-using span = std::span<ElementType, Extent>;
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
-#endif  // if OPENTELEMETRY_HAVE_SPAN
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/string_view.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/string_view.h
deleted file mode 100644
index d0f0c0812..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/string_view.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/string_view.h"
-
-#include <string_view>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-
-// nostd::string_view
-using string_view = std::string_view;
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/type_traits.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/type_traits.h
deleted file mode 100644
index 2d75f49fd..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/type_traits.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/type_traits.h"
-
-#include <type_traits>  // IWYU pragma: keep
-
-#include "opentelemetry/version.h"  // IWYU pragma: keep
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/unique_ptr.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/unique_ptr.h
deleted file mode 100644
index 4b25b7c38..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/unique_ptr.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/unique_ptr.h"
-
-#include <memory>  // IWYU pragma: export
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-
-// nostd::unique_ptr<T...>
-template <class... _Types>
-using unique_ptr = std::unique_ptr<_Types...>;
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/utility.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/utility.h
deleted file mode 100644
index d1f5614d7..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/utility.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/utility.h"
-
-#include <cstddef>
-#include <utility>
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-
-//
-// Backport of std::data
-//
-// See https://en.cppreference.com/w/cpp/iterator/data
-//
-template <class C>
-auto data(C &c) noexcept(noexcept(c.data())) -> decltype(c.data())
-{
-  return c.data();
-}
-
-template <class C>
-auto data(const C &c) noexcept(noexcept(c.data())) -> decltype(c.data())
-{
-  return c.data();
-}
-
-template <class T, std::size_t N>
-T *data(T (&array)[N]) noexcept
-{
-  return array;
-}
-
-template <class E>
-const E *data(std::initializer_list<E> list) noexcept
-{
-  return list.begin();
-}
-
-//
-// Backport of std::size
-//
-// See https://en.cppreference.com/w/cpp/iterator/size
-//
-template <class C>
-auto size(const C &c) noexcept(noexcept(c.size())) -> decltype(c.size())
-{
-  return c.size();
-}
-
-template <class T, std::size_t N>
-std::size_t size(T (& /* array */)[N]) noexcept
-{
-  return N;
-}
-
-template <std::size_t N>
-using make_index_sequence = std::make_index_sequence<N>;
-
-template <std::size_t... Ints>
-using index_sequence = std::index_sequence<Ints...>;
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/variant.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/variant.h
deleted file mode 100644
index 58bc510c5..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/std/variant.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-// IWYU pragma: private, include "opentelemetry/nostd/variant.h"
-
-#include "opentelemetry/version.h"
-
-#include <cstddef>
-#include <memory>
-#include <utility>
-#include <variant>
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-// Standard Type aliases in nostd namespace
-namespace nostd
-{
-using std::get_if;
-using std::monostate;
-using std::variant_alternative_t;
-
-// nostd::variant<...>
-template <class... _Types>
-using variant = std::variant<_Types...>;
-
-template <class... _Types>
-using variant_size = std::variant_size<_Types...>;
-
-using monostate = std::monostate;
-
-#if defined(__APPLE__) && defined(_LIBCPP_USE_AVAILABILITY_APPLE)
-// Apple Platforms provide std::bad_variant_access only in newer versions of OS.
-// To keep API compatible with any version of OS - we are providing our own
-// implementation of nostd::bad_variant_access exception.
-#  if __EXCEPTIONS
-
-// nostd::bad_variant_access
-class bad_variant_access : public std::exception
-{
-public:
-  virtual const char *what() const noexcept override { return "bad_variant_access"; }
-};
-
-[[noreturn]] inline void throw_bad_variant_access()
-{
-  throw bad_variant_access{};
-}
-#  endif
-
-#  if __EXCEPTIONS
-#    define THROW_BAD_VARIANT_ACCESS throw_bad_variant_access()
-#  else
-#    define THROW_BAD_VARIANT_ACCESS std::terminate()
-#  endif
-
-//
-// nostd::get<...> for Apple Clang
-//
-template <typename T, class... Types>
-constexpr auto get_type = [](auto &&t) constexpr -> decltype(auto) {
-  auto v      = t;
-  auto result = std::get_if<T>(&v);  // TODO: optimize with std::forward(t) if t is not rvalue
-  if (result)
-  {
-    return *result;
-  }
-  THROW_BAD_VARIANT_ACCESS;
-  return *result;
-};
-
-template <std::size_t I, class... Types>
-constexpr auto get_index = [](auto &&t) constexpr -> decltype(auto) {
-  auto v      = t;
-  auto result = std::get_if<I>(&v);  // TODO: optimize with std::forward(t) if t is not rvalue
-  if (result)
-  {
-    return *result;
-  }
-  THROW_BAD_VARIANT_ACCESS;
-  return *result;
-};
-
-template <std::size_t I, class... Types>
-constexpr std::variant_alternative_t<I, std::variant<Types...>> &get(std::variant<Types...> &v)
-{
-  return get_index<I, Types...>(v);
-};
-
-template <std::size_t I, class... Types>
-constexpr std::variant_alternative_t<I, std::variant<Types...>> &&get(std::variant<Types...> &&v)
-{
-  return get_index<I, Types...>(std::forward<decltype(v)>(v));
-};
-
-template <std::size_t I, class... Types>
-constexpr const std::variant_alternative_t<I, std::variant<Types...>> &get(
-    const std::variant<Types...> &v)
-{
-  return get_index<I, Types...>(v);
-};
-
-template <std::size_t I, class... Types>
-constexpr const std::variant_alternative_t<I, std::variant<Types...>> &&get(
-    const std::variant<Types...> &&v)
-{
-  return get_index<I, Types...>(std::forward<decltype(v)>(v));
-};
-
-template <class T, class... Types>
-constexpr T &get(std::variant<Types...> &v)
-{
-  return get_type<T, Types...>(v);
-};
-
-template <class T, class... Types>
-constexpr T /*&&*/ get(std::variant<Types...> &&v)
-{
-  return get_type<T, Types...>(v);
-};
-
-template <class T, class... Types>
-constexpr const T &get(const std::variant<Types...> &v)
-{
-  return get_type<T, Types...>(v);
-};
-
-template <class T, class... Types>
-constexpr const T &&get(const std::variant<Types...> &&v)
-{
-  return get_type<T, Types...>(std::forward<decltype(v)>(v));
-};
-
-template <class _Callable, class... _Variants>
-constexpr auto visit(_Callable &&_Obj, _Variants &&..._Args)
-{
-  // Ref:
-  // https://stackoverflow.com/questions/52310835/xcode-10-call-to-unavailable-function-stdvisit
-  return std::__variant_detail::__visitation::__variant::__visit_value(_Obj, _Args...);
-};
-
-#else
-using std::bad_variant_access;
-
-template <std::size_t I, class... Types>
-constexpr std::variant_alternative_t<I, std::variant<Types...>> &get(std::variant<Types...> &v)
-{
-  return std::get<I, Types...>(v);
-}
-
-template <std::size_t I, class... Types>
-constexpr std::variant_alternative_t<I, std::variant<Types...>> &&get(std::variant<Types...> &&v)
-{
-  return std::get<I, Types...>(std::forward<decltype(v)>(v));
-}
-
-template <std::size_t I, class... Types>
-constexpr const std::variant_alternative_t<I, std::variant<Types...>> &get(
-    const std::variant<Types...> &v)
-{
-  return std::get<I, Types...>(v);
-}
-
-template <std::size_t I, class... Types>
-constexpr const std::variant_alternative_t<I, std::variant<Types...>> &&get(
-    const std::variant<Types...> &&v)
-{
-  return std::get<I, Types...>(std::forward<decltype(v)>(v));
-}
-
-template <class T, class... Types>
-constexpr T &get(std::variant<Types...> &v)
-{
-  return std::get<T, Types...>(v);
-}
-
-template <class T, class... Types>
-constexpr T &&get(std::variant<Types...> &&v)
-{
-  return std::get<T, Types...>(std::forward<decltype(v)>(v));
-}
-
-template <class T, class... Types>
-constexpr const T &get(const std::variant<Types...> &v)
-{
-  return std::get<T, Types...>(v);
-}
-
-template <class T, class... Types>
-constexpr const T &&get(const std::variant<Types...> &&v)
-{
-  return std::get<T, Types...>(std::forward<decltype(v)>(v));
-}
-
-template <class _Callable, class... _Variants>
-constexpr auto visit(_Callable &&_Obj, _Variants &&..._Args)
-{
-  return std::visit<_Callable, _Variants...>(static_cast<_Callable &&>(_Obj),
-                                             static_cast<_Variants &&>(_Args)...);
-}
-
-#endif
-
-/*
-# if _HAS_CXX20
-template <class _Ret, class _Callable, class... _Variants>
-constexpr _Ret visit(_Callable &&_Obj, _Variants &&... _Args)
-{
-  return std::visit<_Ret, _Callable, _Variants...>(
-      static_cast<_Callable &&>(_Obj),
-      static_cast<_Variants &&>(_Args)...);
-};
-# endif
-*/
-
-// nostd::holds_alternative
-template <std::size_t I, typename... Ts>
-inline constexpr bool holds_alternative(const variant<Ts...> &v) noexcept
-{
-  return v.index() == I;
-}
-
-template <typename T, typename... Ts>
-inline constexpr bool holds_alternative(const variant<Ts...> &v) noexcept
-{
-  return std::holds_alternative<T, Ts...>(v);
-}
-
-}  // namespace nostd
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/context.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/context.h
deleted file mode 100644
index 08b1e327c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/context.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-// Get Span from explicit context
-inline nostd::shared_ptr<Span> GetSpan(const context::Context &context) noexcept
-{
-  context::ContextValue span = context.GetValue(kSpanKey);
-  if (nostd::holds_alternative<nostd::shared_ptr<Span>>(span))
-  {
-    return nostd::get<nostd::shared_ptr<Span>>(span);
-  }
-  return nostd::shared_ptr<Span>(new DefaultSpan(SpanContext::GetInvalid()));
-}
-
-inline bool IsRootSpan(const context::Context &context) noexcept
-{
-  context::ContextValue is_root_span = context.GetValue(kIsRootSpanKey);
-  if (nostd::holds_alternative<bool>(is_root_span))
-  {
-    return nostd::get<bool>(is_root_span);
-  }
-  return false;
-}
-
-// Set Span into explicit context
-inline context::Context SetSpan(context::Context &context,
-                                const nostd::shared_ptr<Span> &span) noexcept
-{
-  return context.SetValue(kSpanKey, span);
-}
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/default_span.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/default_span.h
deleted file mode 100644
index 1677a32ea..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/default_span.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * DefaultSpan provides a non-operational Span that propagates
- * the tracer context by wrapping it inside the Span object.
- */
-
-class DefaultSpan : public Span
-{
-public:
-  // Returns an invalid span.
-  static DefaultSpan GetInvalid() { return DefaultSpan(SpanContext::GetInvalid()); }
-
-  trace::SpanContext GetContext() const noexcept override { return span_context_; }
-
-  bool IsRecording() const noexcept override { return false; }
-
-  void SetAttribute(nostd::string_view /* key */,
-                    const common::AttributeValue & /* value */) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /* name */) noexcept override {}
-
-  void AddEvent(nostd::string_view /* name */,
-                common::SystemTimestamp /* timestamp */) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /* name */,
-                const common::KeyValueIterable & /* attributes */) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /* name */,
-                common::SystemTimestamp /* timestamp */,
-                const common::KeyValueIterable & /* attributes */) noexcept override
-  {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void AddLink(const SpanContext & /* target */,
-               const common::KeyValueIterable & /* attrs */) noexcept override
-  {}
-
-  void AddLinks(const SpanContextKeyValueIterable & /* links */) noexcept override {}
-#endif
-
-  void SetStatus(StatusCode /* status */, nostd::string_view /* description */) noexcept override {}
-
-  void UpdateName(nostd::string_view /* name */) noexcept override {}
-
-  void End(const EndSpanOptions & /* options */) noexcept override {}
-
-  nostd::string_view ToString() const noexcept { return "DefaultSpan"; }
-
-  DefaultSpan(SpanContext span_context) noexcept : span_context_(std::move(span_context)) {}
-
-  // movable and copiable
-  DefaultSpan(DefaultSpan &&spn) noexcept : Span(), span_context_(spn.GetContext()) {}
-  DefaultSpan(const DefaultSpan &spn) noexcept : Span(), span_context_(spn.GetContext()) {}
-
-private:
-  SpanContext span_context_;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/noop.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/noop.h
deleted file mode 100644
index 14e7c9c33..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/noop.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-// Please refer to provider.h for documentation on how to obtain a Tracer object.
-//
-// This file is part of the internal implementation of OpenTelemetry. Nothing in this file should be
-// used directly. Please refer to span.h and tracer.h for documentation on these interfaces.
-
-#include <stdint.h>
-#include <utility>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/trace/tracer.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-namespace trace_api = opentelemetry::trace;
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-/**
- * No-op implementation of Span. This class should not be used directly.
- */
-class OPENTELEMETRY_EXPORT NoopSpan final : public Span
-{
-public:
-  explicit NoopSpan(const std::shared_ptr<Tracer> &tracer) noexcept
-      : tracer_{tracer}, span_context_{new SpanContext(false, false)}
-  {}
-
-  explicit NoopSpan(const std::shared_ptr<Tracer> &tracer,
-                    nostd::unique_ptr<SpanContext> span_context) noexcept
-      : tracer_{tracer}, span_context_{std::move(span_context)}
-  {}
-
-  void SetAttribute(nostd::string_view /*key*/,
-                    const common::AttributeValue & /*value*/) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /*name*/) noexcept override {}
-
-  void AddEvent(nostd::string_view /*name*/,
-                common::SystemTimestamp /*timestamp*/) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /* name */,
-                const common::KeyValueIterable & /* attributes */) noexcept override
-  {}
-
-  void AddEvent(nostd::string_view /*name*/,
-                common::SystemTimestamp /*timestamp*/,
-                const common::KeyValueIterable & /*attributes*/) noexcept override
-  {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  void AddLink(const SpanContext & /* target */,
-               const common::KeyValueIterable & /* attrs */) noexcept override
-  {}
-
-  void AddLinks(const SpanContextKeyValueIterable & /* links */) noexcept override {}
-#endif
-
-  void SetStatus(StatusCode /*code*/, nostd::string_view /*description*/) noexcept override {}
-
-  void UpdateName(nostd::string_view /*name*/) noexcept override {}
-
-  void End(const EndSpanOptions & /*options*/) noexcept override {}
-
-  bool IsRecording() const noexcept override { return false; }
-
-  SpanContext GetContext() const noexcept override { return *span_context_.get(); }
-
-private:
-  std::shared_ptr<Tracer> tracer_;
-  nostd::unique_ptr<SpanContext> span_context_;
-};
-
-/**
- * No-op implementation of Tracer.
- */
-class OPENTELEMETRY_EXPORT NoopTracer final : public Tracer,
-                                              public std::enable_shared_from_this<NoopTracer>
-{
-public:
-  // Tracer
-  NoopTracer()
-  {
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-    UpdateEnabled(false);
-#endif
-  }
-
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view /*name*/,
-                                    const common::KeyValueIterable & /*attributes*/,
-                                    const SpanContextKeyValueIterable & /*links*/,
-                                    const StartSpanOptions & /*options*/) noexcept override
-  {
-    // Don't allocate a no-op span for every StartSpan call, but use a static
-    // singleton for this case.
-    static nostd::shared_ptr<trace::Span> noop_span(new trace::NoopSpan{this->shared_from_this()});
-
-    return noop_span;
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-
-  void ForceFlushWithMicroseconds(uint64_t /*timeout*/) noexcept override {}
-
-  void CloseWithMicroseconds(uint64_t /*timeout*/) noexcept override {}
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-};
-
-/**
- * No-op implementation of a TracerProvider.
- */
-class OPENTELEMETRY_EXPORT NoopTracerProvider final : public trace::TracerProvider
-{
-public:
-  NoopTracerProvider() noexcept
-      : tracer_{nostd::shared_ptr<trace::NoopTracer>(new trace::NoopTracer)}
-  {}
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  nostd::shared_ptr<trace::Tracer> GetTracer(
-      nostd::string_view /* name */,
-      nostd::string_view /* version */,
-      nostd::string_view /* schema_url */,
-      const common::KeyValueIterable * /* attributes */) noexcept override
-  {
-    return tracer_;
-  }
-#else
-  nostd::shared_ptr<trace::Tracer> GetTracer(nostd::string_view /* name */,
-                                             nostd::string_view /* version */,
-                                             nostd::string_view /* schema_url */) noexcept override
-  {
-    return tracer_;
-  }
-#endif
-
-private:
-  nostd::shared_ptr<trace::Tracer> tracer_;
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/b3_propagator.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/b3_propagator.h
deleted file mode 100644
index a13d2f076..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/b3_propagator.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <array>
-
-#include "detail/hex.h"
-#include "detail/string.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-
-static const nostd::string_view kB3CombinedHeader = "b3";
-
-static const nostd::string_view kB3TraceIdHeader = "X-B3-TraceId";
-static const nostd::string_view kB3SpanIdHeader  = "X-B3-SpanId";
-static const nostd::string_view kB3SampledHeader = "X-B3-Sampled";
-
-/*
-     B3, single header:
-                   b3: 80f198ee56343ba864fe8b2a57d3eff7-e457b5a2e4d86bd1-1-05e3ac9a4f6e3b90
-                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^ ^ ^^^^^^^^^^^^^^^^
-                       0          TraceId            31 33  SpanId    48 | 52 ParentSpanId 68
-                                                                        50 Debug flag
-     Multiheader version:                                           X-B3-Sampled
-                             X-B3-TraceId                X-B3-SpanId    X-B3-ParentSpanId (ignored)
-*/
-
-static const int kTraceIdHexStrLength = 32;
-static const int kSpanIdHexStrLength  = 16;
-
-// The B3PropagatorExtractor class provides an interface that enables extracting context from
-// headers of HTTP requests. HTTP frameworks and clients can integrate with B3Propagator by
-// providing the object containing the headers, and a getter function for the extraction. Based on:
-// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/context/api-propagators.md#b3-extract
-
-class B3PropagatorExtractor : public context::propagation::TextMapPropagator
-{
-public:
-  // Returns the context that is stored in the HTTP header carrier.
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    SpanContext span_context = ExtractImpl(carrier);
-    nostd::shared_ptr<Span> sp{new DefaultSpan(span_context)};
-    if (span_context.IsValid())
-    {
-      return trace::SetSpan(context, sp);
-    }
-    else
-    {
-      return context;
-    }
-  }
-
-  static TraceId TraceIdFromHex(nostd::string_view trace_id)
-  {
-    uint8_t buf[kTraceIdHexStrLength / 2];
-    detail::HexToBinary(trace_id, buf, sizeof(buf));
-    return TraceId(buf);
-  }
-
-  static SpanId SpanIdFromHex(nostd::string_view span_id)
-  {
-    uint8_t buf[kSpanIdHexStrLength / 2];
-    detail::HexToBinary(span_id, buf, sizeof(buf));
-    return SpanId(buf);
-  }
-
-  static TraceFlags TraceFlagsFromHex(nostd::string_view trace_flags)
-  {
-    if (trace_flags.length() != 1 || (trace_flags[0] != '1' && trace_flags[0] != 'd'))
-    {  // check for invalid length of flags and treat 'd' as sampled
-      return TraceFlags(0);
-    }
-    return TraceFlags(TraceFlags::kIsSampled);
-  }
-
-private:
-  static SpanContext ExtractImpl(const context::propagation::TextMapCarrier &carrier)
-  {
-    nostd::string_view trace_id_hex;
-    nostd::string_view span_id_hex;
-    nostd::string_view trace_flags_hex;
-
-    // first let's try a single-header variant
-    auto singleB3Header = carrier.Get(kB3CombinedHeader);
-    if (!singleB3Header.empty())
-    {
-      std::array<nostd::string_view, 3> fields{};
-      // https://github.com/openzipkin/b3-propagation/blob/master/RATIONALE.md
-      if (detail::SplitString(singleB3Header, '-', fields.data(), 3) < 2)
-      {
-        return SpanContext::GetInvalid();
-      }
-
-      trace_id_hex    = fields[0];
-      span_id_hex     = fields[1];
-      trace_flags_hex = fields[2];
-    }
-    else
-    {
-      trace_id_hex    = carrier.Get(kB3TraceIdHeader);
-      span_id_hex     = carrier.Get(kB3SpanIdHeader);
-      trace_flags_hex = carrier.Get(kB3SampledHeader);
-    }
-
-    if (!detail::IsValidHex(trace_id_hex) || !detail::IsValidHex(span_id_hex))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    TraceId trace_id = TraceIdFromHex(trace_id_hex);
-    SpanId span_id   = SpanIdFromHex(span_id_hex);
-
-    if (!trace_id.IsValid() || !span_id.IsValid())
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    return SpanContext(trace_id, span_id, TraceFlagsFromHex(trace_flags_hex), true);
-  }
-};
-
-// The B3Propagator class provides interface that enables extracting and injecting context into
-// single header of HTTP Request.
-class B3Propagator : public B3PropagatorExtractor
-{
-public:
-  // Sets the context for a HTTP header carrier with self defined rules.
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    SpanContext span_context = trace::GetSpan(context)->GetContext();
-    if (!span_context.IsValid())
-    {
-      return;
-    }
-
-    char trace_identity[kTraceIdHexStrLength + kSpanIdHexStrLength + 3];
-    static_assert(sizeof(trace_identity) == 51, "b3 trace identity buffer size mismatch");
-    span_context.trace_id().ToLowerBase16(nostd::span<char, 2 * TraceId::kSize>{
-        &trace_identity[0], static_cast<std::size_t>(kTraceIdHexStrLength)});
-    trace_identity[kTraceIdHexStrLength] = '-';
-    span_context.span_id().ToLowerBase16(nostd::span<char, 2 * SpanId::kSize>{
-        &trace_identity[kTraceIdHexStrLength + 1], static_cast<std::size_t>(kSpanIdHexStrLength)});
-    trace_identity[kTraceIdHexStrLength + kSpanIdHexStrLength + 1] = '-';
-    trace_identity[kTraceIdHexStrLength + kSpanIdHexStrLength + 2] =
-        span_context.trace_flags().IsSampled() ? '1' : '0';
-
-    carrier.Set(kB3CombinedHeader, nostd::string_view(trace_identity, sizeof(trace_identity)));
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return callback(kB3CombinedHeader);
-  }
-};
-
-class B3PropagatorMultiHeader : public B3PropagatorExtractor
-{
-public:
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    SpanContext span_context = GetSpan(context)->GetContext();
-    if (!span_context.IsValid())
-    {
-      return;
-    }
-    char trace_id[32];
-    TraceId(span_context.trace_id()).ToLowerBase16(trace_id);
-    char span_id[16];
-    SpanId(span_context.span_id()).ToLowerBase16(span_id);
-    char trace_flags[2];
-    TraceFlags(span_context.trace_flags()).ToLowerBase16(trace_flags);
-    carrier.Set(kB3TraceIdHeader, nostd::string_view(trace_id, sizeof(trace_id)));
-    carrier.Set(kB3SpanIdHeader, nostd::string_view(span_id, sizeof(span_id)));
-    carrier.Set(kB3SampledHeader, nostd::string_view(trace_flags + 1, 1));
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return callback(kB3TraceIdHeader) && callback(kB3SpanIdHeader) && callback(kB3SampledHeader);
-  }
-};
-
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/detail/hex.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/detail/hex.h
deleted file mode 100644
index 3bf66e84b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/detail/hex.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <algorithm>
-#include <cstdint>
-#include <cstring>
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-// NOTE - code within `detail` namespace implements internal details, and not part
-// of the public interface.
-namespace detail
-{
-
-constexpr int8_t kHexDigits[256] = {
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  -1, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-};
-
-inline int8_t HexToInt(char c)
-{
-  return kHexDigits[uint8_t(c)];
-}
-
-inline bool IsValidHex(nostd::string_view s)
-{
-  return std::all_of(s.begin(), s.end(), [](char c) { return HexToInt(c) != -1; });
-}
-
-/**
- * Converts a hexadecimal to binary format if the hex string will fit the buffer.
- * Smaller hex strings are left padded with zeroes.
- */
-inline bool HexToBinary(nostd::string_view hex, uint8_t *buffer, size_t buffer_size)
-{
-  std::memset(buffer, 0, buffer_size);
-
-  if (hex.size() > buffer_size * 2)
-  {
-    return false;
-  }
-
-  int64_t hex_size     = int64_t(hex.size());
-  int64_t buffer_pos   = int64_t(buffer_size) - (hex_size + 1) / 2;
-  int64_t last_hex_pos = hex_size - 1;
-
-  bool is_hex_size_odd = (hex_size % 2) == 1;
-  int64_t i            = 0;
-
-  if (is_hex_size_odd)
-  {
-    buffer[buffer_pos++] = HexToInt(hex[i++]);
-  }
-
-  for (; i < last_hex_pos; i += 2)
-  {
-    buffer[buffer_pos++] = (HexToInt(hex[i]) << 4) | HexToInt(hex[i + 1]);
-  }
-
-  return true;
-}
-
-}  // namespace detail
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/detail/string.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/detail/string.h
deleted file mode 100644
index de4699952..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/detail/string.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-// NOTE - code within `detail` namespace implements internal details, and not part
-// of the public interface.
-namespace detail
-{
-
-/**
- * Splits a string by separator, up to given buffer count words.
- * Returns the amount of words the input was split into.
- */
-inline size_t SplitString(nostd::string_view s,
-                          char separator,
-                          nostd::string_view *results,
-                          size_t count)
-{
-  if (count == 0)
-  {
-    return count;
-  }
-
-  size_t filled      = 0;
-  size_t token_start = 0;
-  for (size_t i = 0; i < s.size(); i++)
-  {
-    if (s[i] != separator)
-    {
-      continue;
-    }
-
-    results[filled++] = s.substr(token_start, i - token_start);
-
-    if (filled == count)
-    {
-      return count;
-    }
-
-    token_start = i + 1;
-  }
-
-  if (filled < count)
-  {
-    results[filled++] = s.substr(token_start);
-  }
-
-  return filled;
-}
-
-}  // namespace detail
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/http_trace_context.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/http_trace_context.h
deleted file mode 100644
index 81d4c308e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/http_trace_context.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <array>
-
-#include "detail/hex.h"
-#include "detail/string.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-static const nostd::string_view kTraceParent = "traceparent";
-static const nostd::string_view kTraceState  = "tracestate";
-static const size_t kVersionSize             = 2;
-static const size_t kTraceIdSize             = 32;
-static const size_t kSpanIdSize              = 16;
-static const size_t kTraceFlagsSize          = 2;
-static const size_t kTraceParentSize         = 55;
-
-// The HttpTraceContext provides methods to extract and inject
-// context into headers of HTTP requests with traces.
-// Example:
-//    HttpTraceContext().Inject(carrier, context);
-//    HttpTraceContext().Extract(carrier, context);
-
-class HttpTraceContext : public context::propagation::TextMapPropagator
-{
-public:
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    SpanContext span_context = trace::GetSpan(context)->GetContext();
-    if (!span_context.IsValid())
-    {
-      return;
-    }
-    InjectImpl(carrier, span_context);
-  }
-
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    SpanContext span_context = ExtractImpl(carrier);
-    nostd::shared_ptr<Span> sp{new DefaultSpan(span_context)};
-    if (span_context.IsValid())
-    {
-      return trace::SetSpan(context, sp);
-    }
-    else
-    {
-      return context;
-    }
-  }
-
-  static TraceId TraceIdFromHex(nostd::string_view trace_id)
-  {
-    uint8_t buf[kTraceIdSize / 2];
-    detail::HexToBinary(trace_id, buf, sizeof(buf));
-    return TraceId(buf);
-  }
-
-  static SpanId SpanIdFromHex(nostd::string_view span_id)
-  {
-    uint8_t buf[kSpanIdSize / 2];
-    detail::HexToBinary(span_id, buf, sizeof(buf));
-    return SpanId(buf);
-  }
-
-  static TraceFlags TraceFlagsFromHex(nostd::string_view trace_flags)
-  {
-    uint8_t flags;
-    detail::HexToBinary(trace_flags, &flags, sizeof(flags));
-    return TraceFlags(flags);
-  }
-
-private:
-  static constexpr uint8_t kInvalidVersion        = 0xFF;
-  static constexpr uint8_t kDefaultAssumedVersion = 0x00;
-
-  static void InjectImpl(context::propagation::TextMapCarrier &carrier,
-                         const SpanContext &span_context)
-  {
-    char trace_parent[kTraceParentSize];
-    trace_parent[0] = '0';
-    trace_parent[1] = '0';
-    trace_parent[2] = '-';
-    span_context.trace_id().ToLowerBase16(
-        nostd::span<char, 2 * TraceId::kSize>{&trace_parent[3], kTraceIdSize});
-    trace_parent[kTraceIdSize + 3] = '-';
-    span_context.span_id().ToLowerBase16(
-        nostd::span<char, 2 * SpanId::kSize>{&trace_parent[kTraceIdSize + 4], kSpanIdSize});
-    trace_parent[kTraceIdSize + kSpanIdSize + 4] = '-';
-    span_context.trace_flags().ToLowerBase16(
-        nostd::span<char, 2>{&trace_parent[kTraceIdSize + kSpanIdSize + 5], 2});
-
-    carrier.Set(kTraceParent, nostd::string_view(trace_parent, sizeof(trace_parent)));
-    const auto trace_state = span_context.trace_state()->ToHeader();
-    if (!trace_state.empty())
-    {
-      carrier.Set(kTraceState, trace_state);
-    }
-  }
-
-  static SpanContext ExtractContextFromTraceHeaders(nostd::string_view trace_parent,
-                                                    nostd::string_view trace_state)
-  {
-    std::array<nostd::string_view, 4> fields{};
-    if (detail::SplitString(trace_parent, '-', fields.data(), 4) != 4)
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    nostd::string_view version_hex     = fields[0];
-    nostd::string_view trace_id_hex    = fields[1];
-    nostd::string_view span_id_hex     = fields[2];
-    nostd::string_view trace_flags_hex = fields[3];
-
-    if (version_hex.size() != kVersionSize || trace_id_hex.size() != kTraceIdSize ||
-        span_id_hex.size() != kSpanIdSize || trace_flags_hex.size() != kTraceFlagsSize)
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    if (!detail::IsValidHex(version_hex) || !detail::IsValidHex(trace_id_hex) ||
-        !detail::IsValidHex(span_id_hex) || !detail::IsValidHex(trace_flags_hex))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    // hex is valid, convert it to binary
-    uint8_t version_binary;
-    detail::HexToBinary(version_hex, &version_binary, sizeof(version_binary));
-    if (version_binary == kInvalidVersion)
-    {
-      // invalid version encountered
-      return SpanContext::GetInvalid();
-    }
-
-    // See https://www.w3.org/TR/trace-context/#versioning-of-traceparent
-    if (version_binary > kDefaultAssumedVersion)
-    {
-      // higher than default version detected
-      if (trace_parent.size() < kTraceParentSize)
-      {
-        return SpanContext::GetInvalid();
-      }
-    }
-    else
-    {
-      // version is either lower or same as the default version
-      if (trace_parent.size() != kTraceParentSize)
-      {
-        return SpanContext::GetInvalid();
-      }
-    }
-
-    TraceId trace_id = TraceIdFromHex(trace_id_hex);
-    SpanId span_id   = SpanIdFromHex(span_id_hex);
-
-    if (!trace_id.IsValid() || !span_id.IsValid())
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    return SpanContext(trace_id, span_id, TraceFlagsFromHex(trace_flags_hex), true,
-                       trace::TraceState::FromHeader(trace_state));
-  }
-
-  static SpanContext ExtractImpl(const context::propagation::TextMapCarrier &carrier)
-  {
-    // Get trace_parent after trimming the leading and trailing whitespaces
-    nostd::string_view trace_parent = common::StringUtil::Trim(carrier.Get(kTraceParent));
-    nostd::string_view trace_state  = carrier.Get(kTraceState);
-    if (trace_parent == "")
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    return ExtractContextFromTraceHeaders(trace_parent, trace_state);
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return (callback(kTraceParent) && callback(kTraceState));
-  }
-};
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/jaeger.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/jaeger.h
deleted file mode 100644
index 45a937091..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/propagation/jaeger.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "detail/hex.h"
-#include "detail/string.h"
-#include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/trace/context.h"
-#include "opentelemetry/trace/default_span.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-namespace propagation
-{
-
-static const nostd::string_view kJaegerTraceHeader = "uber-trace-id";
-
-class JaegerPropagator : public context::propagation::TextMapPropagator
-{
-public:
-  void Inject(context::propagation::TextMapCarrier &carrier,
-              const context::Context &context) noexcept override
-  {
-    SpanContext span_context = trace::GetSpan(context)->GetContext();
-    if (!span_context.IsValid())
-    {
-      return;
-    }
-
-    const size_t trace_id_length = 32;
-    const size_t span_id_length  = 16;
-
-    // trace-id(32):span-id(16):0:debug(2)
-    char trace_identity[trace_id_length + span_id_length + 6];
-    span_context.trace_id().ToLowerBase16(
-        nostd::span<char, 2 * TraceId::kSize>{&trace_identity[0], trace_id_length});
-    trace_identity[trace_id_length] = ':';
-    span_context.span_id().ToLowerBase16(
-        nostd::span<char, 2 * SpanId::kSize>{&trace_identity[trace_id_length + 1], span_id_length});
-    trace_identity[trace_id_length + span_id_length + 1] = ':';
-    trace_identity[trace_id_length + span_id_length + 2] = '0';
-    trace_identity[trace_id_length + span_id_length + 3] = ':';
-    trace_identity[trace_id_length + span_id_length + 4] = '0';
-    trace_identity[trace_id_length + span_id_length + 5] = span_context.IsSampled() ? '1' : '0';
-
-    carrier.Set(kJaegerTraceHeader, nostd::string_view(trace_identity, sizeof(trace_identity)));
-  }
-
-  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
-                           context::Context &context) noexcept override
-  {
-    SpanContext span_context = ExtractImpl(carrier);
-    nostd::shared_ptr<Span> sp{new DefaultSpan(span_context)};
-    if (span_context.IsValid())
-    {
-      return trace::SetSpan(context, sp);
-    }
-    else
-    {
-      return context;
-    }
-  }
-
-  bool Fields(nostd::function_ref<bool(nostd::string_view)> callback) const noexcept override
-  {
-    return callback(kJaegerTraceHeader);
-  }
-
-private:
-  static constexpr uint8_t kIsSampled = 0x01;
-
-  static TraceFlags GetTraceFlags(uint8_t jaeger_flags)
-  {
-    uint8_t sampled = jaeger_flags & kIsSampled;
-    return TraceFlags(sampled);
-  }
-
-  static SpanContext ExtractImpl(const context::propagation::TextMapCarrier &carrier)
-  {
-    nostd::string_view trace_identity = carrier.Get(kJaegerTraceHeader);
-
-    const size_t trace_field_count = 4;
-    nostd::string_view trace_fields[trace_field_count];
-
-    if (detail::SplitString(trace_identity, ':', trace_fields, trace_field_count) !=
-        trace_field_count)
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    nostd::string_view trace_id_hex = trace_fields[0];
-    nostd::string_view span_id_hex  = trace_fields[1];
-    nostd::string_view flags_hex    = trace_fields[3];
-
-    if (!detail::IsValidHex(trace_id_hex) || !detail::IsValidHex(span_id_hex) ||
-        !detail::IsValidHex(flags_hex))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    uint8_t trace_id[16];
-    if (!detail::HexToBinary(trace_id_hex, trace_id, sizeof(trace_id)))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    uint8_t span_id[8];
-    if (!detail::HexToBinary(span_id_hex, span_id, sizeof(span_id)))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    uint8_t flags;
-    if (!detail::HexToBinary(flags_hex, &flags, sizeof(flags)))
-    {
-      return SpanContext::GetInvalid();
-    }
-
-    return SpanContext(TraceId(trace_id), SpanId(span_id), GetTraceFlags(flags), true);
-  }
-};
-
-}  // namespace propagation
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/provider.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/provider.h
deleted file mode 100644
index 7e22dc69f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/provider.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <mutex>
-
-#include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/noop.h"
-#include "opentelemetry/trace/tracer_provider.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * Stores the singleton global TracerProvider.
- */
-class OPENTELEMETRY_EXPORT Provider
-{
-public:
-  /**
-   * Returns the singleton TracerProvider.
-   *
-   * By default, a no-op TracerProvider is returned. This will never return a
-   * nullptr TracerProvider.
-   */
-  static nostd::shared_ptr<TracerProvider> GetTracerProvider() noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    return nostd::shared_ptr<TracerProvider>(GetProvider());
-  }
-
-  /**
-   * Changes the singleton TracerProvider.
-   */
-  static void SetTracerProvider(const nostd::shared_ptr<TracerProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetProvider() = tp;
-  }
-
-private:
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<TracerProvider> &GetProvider() noexcept
-  {
-    static nostd::shared_ptr<TracerProvider> provider(new NoopTracerProvider);
-    return provider;
-  }
-
-  OPENTELEMETRY_API_SINGLETON static common::SpinLockMutex &GetLock() noexcept
-  {
-    static common::SpinLockMutex lock;
-    return lock;
-  }
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/scope.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/scope.h
deleted file mode 100644
index 20c415cc7..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/scope.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * Controls how long a span is active.
- *
- * On creation of the Scope object, the given span is set to the currently
- * active span. On destruction, the given span is ended and the previously
- * active span will be the currently active span again.
- */
-class Scope final
-{
-public:
-  /**
-   * Initialize a new scope.
-   * @param span the given span will be set as the currently active span.
-   */
-  Scope(const nostd::shared_ptr<Span> &span) noexcept
-      : token_(context::RuntimeContext::Attach(
-            context::RuntimeContext::GetCurrent().SetValue(kSpanKey, span)))
-  {}
-
-private:
-  nostd::unique_ptr<context::Token> token_;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/semantic_conventions.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/semantic_conventions.h
deleted file mode 100644
index 2f043dcf5..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/semantic_conventions.h
+++ /dev/null
@@ -1,5111 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * This file is DEPRECATED, and no longer updated.
- * See file DEPRECATED.md for details.
- */
-
-#ifdef OPENTELEMETRY_NO_DEPRECATED_CODE
-#  error "header <trace/semantic_conventions.h> is deprecated."
-#endif
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-namespace SemanticConventions
-{
-/**
- * The URL of the OpenTelemetry schema for these keys and values.
- */
-static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.27.0";
-
-/**
- * Uniquely identifies the framework API revision offered by a version ({@code os.version}) of the
- * android operating system. More information can be found <a
- * href="https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels">here</a>.
- */
-static constexpr const char *kAndroidOsApiLevel = "android.os.api_level";
-
-/**
- * The provenance filename of the built attestation which directly relates to the build artifact
- * filename. This filename SHOULD accompany the artifact at publish time. See the <a
- * href="https://slsa.dev/spec/v1.0/distributing-provenance#relationship-between-artifacts-and-attestations">SLSA
- * Relationship</a> specification for more information.
- */
-static constexpr const char *kArtifactAttestationFilename = "artifact.attestation.filename";
-
-/**
- * The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
- * glossary)</a>, of the built attestation. Some envelopes in the software attestation space also
- * refer to this as the <a
- * href="https://github.com/in-toto/attestation/blob/main/spec/README.md#in-toto-attestation-framework-spec">digest</a>.
- */
-static constexpr const char *kArtifactAttestationHash = "artifact.attestation.hash";
-
-/**
- * The id of the build <a href="https://slsa.dev/attestation-model">software attestation</a>.
- */
-static constexpr const char *kArtifactAttestationId = "artifact.attestation.id";
-
-/**
- * The human readable file name of the artifact, typically generated during build and release
-processes. Often includes the package name and version in the file name.
- *
- * <p>Notes:
-  <ul> <li>This file name can also act as the <a
-href="https://slsa.dev/spec/v1.0/terminology#package-model">Package Name</a> in cases where the
-package ecosystem maps accordingly. Additionally, the artifact <a
-href="https://slsa.dev/spec/v1.0/terminology#software-supply-chain">can be published</a> for others,
-but that is not a guarantee.</li> </ul>
- */
-static constexpr const char *kArtifactFilename = "artifact.filename";
-
-/**
- * The full <a href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see
-glossary)</a>, often found in checksum.txt on a release of the artifact and used to verify package
-integrity.
- *
- * <p>Notes:
-  <ul> <li>The specific algorithm used to create the cryptographic hash value is
-not defined. In situations where an artifact has multiple
-cryptographic hashes, it is up to the implementer to choose which
-hash value to set here; this should be the most secure hash algorithm
-that is suitable for the situation and consistent with the
-corresponding attestation. The implementer can then provide the other
-hash values through an additional set of attribute extensions as they
-deem necessary.</li> </ul>
- */
-static constexpr const char *kArtifactHash = "artifact.hash";
-
-/**
- * The <a href="https://github.com/package-url/purl-spec">Package URL</a> of the <a
- * href="https://slsa.dev/spec/v1.0/terminology#package-model">package artifact</a> provides a
- * standard way to identify and locate the packaged artifact.
- */
-static constexpr const char *kArtifactPurl = "artifact.purl";
-
-/**
- * The version of the artifact.
- */
-static constexpr const char *kArtifactVersion = "artifact.version";
-
-/**
- * Rate-limiting result, shows whether the lease was acquired or contains a rejection reason
- */
-static constexpr const char *kAspnetcoreRateLimitingResult = "aspnetcore.rate_limiting.result";
-
-/**
- * Full type name of the <a
- * href="https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.diagnostics.iexceptionhandler">{@code
- * IExceptionHandler}</a> implementation that handled the exception.
- */
-static constexpr const char *kAspnetcoreDiagnosticsHandlerType =
-    "aspnetcore.diagnostics.handler.type";
-
-/**
- * ASP.NET Core exception middleware handling result
- */
-static constexpr const char *kAspnetcoreDiagnosticsExceptionResult =
-    "aspnetcore.diagnostics.exception.result";
-
-/**
- * Rate limiting policy name.
- */
-static constexpr const char *kAspnetcoreRateLimitingPolicy = "aspnetcore.rate_limiting.policy";
-
-/**
- * Flag indicating if request was handled by the application pipeline.
- */
-static constexpr const char *kAspnetcoreRequestIsUnhandled = "aspnetcore.request.is_unhandled";
-
-/**
- * A value that indicates whether the matched route is a fallback route.
- */
-static constexpr const char *kAspnetcoreRoutingIsFallback = "aspnetcore.routing.is_fallback";
-
-/**
- * Match result - success or failure
- */
-static constexpr const char *kAspnetcoreRoutingMatchStatus = "aspnetcore.routing.match_status";
-
-/**
- * The AWS request ID as returned in the response headers {@code x-amz-request-id} or {@code
- * x-amz-requestid}.
- */
-static constexpr const char *kAwsRequestId = "aws.request_id";
-
-/**
- * The JSON-serialized value of each item in the {@code AttributeDefinitions} request field.
- */
-static constexpr const char *kAwsDynamodbAttributeDefinitions =
-    "aws.dynamodb.attribute_definitions";
-
-/**
- * The value of the {@code AttributesToGet} request parameter.
- */
-static constexpr const char *kAwsDynamodbAttributesToGet = "aws.dynamodb.attributes_to_get";
-
-/**
- * The value of the {@code ConsistentRead} request parameter.
- */
-static constexpr const char *kAwsDynamodbConsistentRead = "aws.dynamodb.consistent_read";
-
-/**
- * The JSON-serialized value of each item in the {@code ConsumedCapacity} response field.
- */
-static constexpr const char *kAwsDynamodbConsumedCapacity = "aws.dynamodb.consumed_capacity";
-
-/**
- * The value of the {@code Count} response parameter.
- */
-static constexpr const char *kAwsDynamodbCount = "aws.dynamodb.count";
-
-/**
- * The value of the {@code ExclusiveStartTableName} request parameter.
- */
-static constexpr const char *kAwsDynamodbExclusiveStartTable = "aws.dynamodb.exclusive_start_table";
-
-/**
- * The JSON-serialized value of each item in the {@code GlobalSecondaryIndexUpdates} request field.
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexUpdates =
-    "aws.dynamodb.global_secondary_index_updates";
-
-/**
- * The JSON-serialized value of each item of the {@code GlobalSecondaryIndexes} request field
- */
-static constexpr const char *kAwsDynamodbGlobalSecondaryIndexes =
-    "aws.dynamodb.global_secondary_indexes";
-
-/**
- * The value of the {@code IndexName} request parameter.
- */
-static constexpr const char *kAwsDynamodbIndexName = "aws.dynamodb.index_name";
-
-/**
- * The JSON-serialized value of the {@code ItemCollectionMetrics} response field.
- */
-static constexpr const char *kAwsDynamodbItemCollectionMetrics =
-    "aws.dynamodb.item_collection_metrics";
-
-/**
- * The value of the {@code Limit} request parameter.
- */
-static constexpr const char *kAwsDynamodbLimit = "aws.dynamodb.limit";
-
-/**
- * The JSON-serialized value of each item of the {@code LocalSecondaryIndexes} request field.
- */
-static constexpr const char *kAwsDynamodbLocalSecondaryIndexes =
-    "aws.dynamodb.local_secondary_indexes";
-
-/**
- * The value of the {@code ProjectionExpression} request parameter.
- */
-static constexpr const char *kAwsDynamodbProjection = "aws.dynamodb.projection";
-
-/**
- * The value of the {@code ProvisionedThroughput.ReadCapacityUnits} request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedReadCapacity =
-    "aws.dynamodb.provisioned_read_capacity";
-
-/**
- * The value of the {@code ProvisionedThroughput.WriteCapacityUnits} request parameter.
- */
-static constexpr const char *kAwsDynamodbProvisionedWriteCapacity =
-    "aws.dynamodb.provisioned_write_capacity";
-
-/**
- * The value of the {@code ScanIndexForward} request parameter.
- */
-static constexpr const char *kAwsDynamodbScanForward = "aws.dynamodb.scan_forward";
-
-/**
- * The value of the {@code ScannedCount} response parameter.
- */
-static constexpr const char *kAwsDynamodbScannedCount = "aws.dynamodb.scanned_count";
-
-/**
- * The value of the {@code Segment} request parameter.
- */
-static constexpr const char *kAwsDynamodbSegment = "aws.dynamodb.segment";
-
-/**
- * The value of the {@code Select} request parameter.
- */
-static constexpr const char *kAwsDynamodbSelect = "aws.dynamodb.select";
-
-/**
- * The number of items in the {@code TableNames} response parameter.
- */
-static constexpr const char *kAwsDynamodbTableCount = "aws.dynamodb.table_count";
-
-/**
- * The keys in the {@code RequestItems} object field.
- */
-static constexpr const char *kAwsDynamodbTableNames = "aws.dynamodb.table_names";
-
-/**
- * The value of the {@code TotalSegments} request parameter.
- */
-static constexpr const char *kAwsDynamodbTotalSegments = "aws.dynamodb.total_segments";
-
-/**
- * The ID of a running ECS task. The ID MUST be extracted from {@code task.arn}.
- */
-static constexpr const char *kAwsEcsTaskId = "aws.ecs.task.id";
-
-/**
- * The ARN of an <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/clusters.html">ECS cluster</a>.
- */
-static constexpr const char *kAwsEcsClusterArn = "aws.ecs.cluster.arn";
-
-/**
- * The Amazon Resource Name (ARN) of an <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_instances.html">ECS
- * container instance</a>.
- */
-static constexpr const char *kAwsEcsContainerArn = "aws.ecs.container.arn";
-
-/**
- * The <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html">launch
- * type</a> for an ECS task.
- */
-static constexpr const char *kAwsEcsLaunchtype = "aws.ecs.launchtype";
-
-/**
- * The ARN of a running <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids">ECS
- * task</a>.
- */
-static constexpr const char *kAwsEcsTaskArn = "aws.ecs.task.arn";
-
-/**
- * The family name of the <a
- * href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html">ECS task
- * definition</a> used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskFamily = "aws.ecs.task.family";
-
-/**
- * The revision for the task definition used to create the ECS task.
- */
-static constexpr const char *kAwsEcsTaskRevision = "aws.ecs.task.revision";
-
-/**
- * The ARN of an EKS cluster.
- */
-static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn";
-
-/**
- * The Amazon Resource Name(s) (ARN) of the AWS log group(s).
- *
- * <p>Notes:
-  <ul> <li>See the <a
- href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
- group ARN format documentation</a>.</li> </ul>
- */
-static constexpr const char *kAwsLogGroupArns = "aws.log.group.arns";
-
-/**
- * The name(s) of the AWS log group(s) an application is writing to.
- *
- * <p>Notes:
-  <ul> <li>Multiple log groups must be supported for cases like multi-container applications, where
- a single application has sidecar containers, and each write to their own log group.</li> </ul>
- */
-static constexpr const char *kAwsLogGroupNames = "aws.log.group.names";
-
-/**
- * The ARN(s) of the AWS log stream(s).
- *
- * <p>Notes:
-  <ul> <li>See the <a
- href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/iam-access-control-overview-cwl.html#CWL_ARN_Format">log
- stream ARN format documentation</a>. One log group can contain several log streams, so these ARNs
- necessarily identify both a log group and a log stream.</li> </ul>
- */
-static constexpr const char *kAwsLogStreamArns = "aws.log.stream.arns";
-
-/**
- * The name(s) of the AWS log stream(s) an application is writing to.
- */
-static constexpr const char *kAwsLogStreamNames = "aws.log.stream.names";
-
-/**
- * The full invoked ARN as provided on the {@code Context} passed to the function ({@code
- Lambda-Runtime-Invoked-Function-Arn} header on the {@code /runtime/invocation/next} applicable).
- *
- * <p>Notes:
-  <ul> <li>This may be different from {@code cloud.resource_id} if an alias is involved.</li> </ul>
- */
-static constexpr const char *kAwsLambdaInvokedArn = "aws.lambda.invoked_arn";
-
-/**
- * The S3 bucket name the request refers to. Corresponds to the {@code --bucket} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
- *
- * <p>Notes:
-  <ul> <li>The {@code bucket} attribute is applicable to all S3 operations that reference a bucket,
-i.e. that require the bucket name as a mandatory parameter. This applies to almost all S3 operations
-except {@code list-buckets}.</li> </ul>
- */
-static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
-
-/**
- * The source object (in the form {@code bucket}/{@code key}) for the copy operation.
- *
- * <p>Notes:
-  <ul> <li>The {@code copy_source} attribute applies to S3 copy operations and corresponds to the
-{@code --copy-source} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object operation
-within the S3 API</a>. This applies in particular to the following operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3CopySource = "aws.s3.copy_source";
-
-/**
- * The delete request container that specifies the objects to be deleted.
- *
- * <p>Notes:
-  <ul> <li>The {@code delete} attribute is only applicable to the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a>
-operation. The {@code delete} attribute corresponds to the {@code --delete} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-objects.html">delete-objects
-operation within the S3 API</a>.</li> </ul>
- */
-static constexpr const char *kAwsS3Delete = "aws.s3.delete";
-
-/**
- * The S3 object key the request refers to. Corresponds to the {@code --key} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> operations.
- *
- * <p>Notes:
-  <ul> <li>The {@code key} attribute is applicable to all object-related S3 operations, i.e. that
-require the object key as a mandatory parameter. This applies in particular to the following
-operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/get-object.html">get-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/head-object.html">head-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/put-object.html">put-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/restore-object.html">restore-object</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/select-object-content.html">select-object-content</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/create-multipart-upload.html">create-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3Key = "aws.s3.key";
-
-/**
- * The part number of the part being uploaded in a multipart-upload operation. This is a positive
-integer between 1 and 10,000.
- *
- * <p>Notes:
-  <ul> <li>The {@code part_number} attribute is only applicable to the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a> and
-<a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a>
-operations. The {@code part_number} attribute corresponds to the {@code --part-number} parameter of
-the <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part
-operation within the S3 API</a>.</li> </ul>
- */
-static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
-
-/**
- * Upload ID that identifies the multipart upload.
- *
- * <p>Notes:
-  <ul> <li>The {@code upload_id} attribute applies to S3 multipart-upload operations and corresponds
-to the {@code --upload-id} parameter of the <a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
-operations. This applies in particular to the following operations:</li><li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/list-parts.html">list-parts</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part.html">upload-part</a></li>
-<li><a
-href="https://docs.aws.amazon.com/cli/latest/reference/s3api/upload-part-copy.html">upload-part-copy</a></li>
- </ul>
- */
-static constexpr const char *kAwsS3UploadId = "aws.s3.upload_id";
-
-/**
- * The unique identifier of the service request. It's generated by the Azure service and returned
- * with the response.
- */
-static constexpr const char *kAzServiceRequestId = "az.service_request_id";
-
-/**
- * Array of brand name and version separated by a space
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
- href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
- navigator.userAgentData.brands}).</li> </ul>
- */
-static constexpr const char *kBrowserBrands = "browser.brands";
-
-/**
- * Preferred language of the user using the browser
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the Navigator API {@code
- navigator.language}.</li> </ul>
- */
-static constexpr const char *kBrowserLanguage = "browser.language";
-
-/**
- * A boolean that is true if the browser is running on a mobile device
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
- href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
- navigator.userAgentData.mobile}). If unavailable, this attribute SHOULD be left unset.</li> </ul>
- */
-static constexpr const char *kBrowserMobile = "browser.mobile";
-
-/**
- * The platform on which the browser is running
- *
- * <p>Notes:
-  <ul> <li>This value is intended to be taken from the <a
-href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API</a> ({@code
-navigator.userAgentData.platform}). If unavailable, the legacy {@code navigator.platform} API SHOULD
-NOT be used instead and this attribute SHOULD be left unset in order for the values to be
-consistent. The list of possible values is defined in the <a
-href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-platform">W3C User-Agent Client Hints
-specification</a>. Note that some (but not all) of these values can overlap with values in the <a
-href="./os.md">{@code os.type} and {@code os.name} attributes</a>. However, for consistency, the
-values in the {@code browser.platform} attribute should capture the exact value that the user agent
-provides.</li> </ul>
- */
-static constexpr const char *kBrowserPlatform = "browser.platform";
-
-/**
- * The human readable name of the pipeline within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineName = "cicd.pipeline.name";
-
-/**
- * The unique identifier of a pipeline run within a CI/CD system.
- */
-static constexpr const char *kCicdPipelineRunId = "cicd.pipeline.run.id";
-
-/**
- * The human readable name of a task within a pipeline. Task here most closely aligns with a <a
- * href="https://en.wikipedia.org/wiki/Pipeline_(computing)">computing process</a> in a pipeline.
- * Other terms for tasks include commands, steps, and procedures.
- */
-static constexpr const char *kCicdPipelineTaskName = "cicd.pipeline.task.name";
-
-/**
- * The unique identifier of a task run within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskRunId = "cicd.pipeline.task.run.id";
-
-/**
- * The <a href="https://en.wikipedia.org/wiki/URL">URL</a> of the pipeline run providing the
- * complete address in order to locate and identify the pipeline run.
- */
-static constexpr const char *kCicdPipelineTaskRunUrlFull = "cicd.pipeline.task.run.url.full";
-
-/**
- * The type of the task within a pipeline.
- */
-static constexpr const char *kCicdPipelineTaskType = "cicd.pipeline.task.type";
-
-/**
- * Client address - domain name if available without reverse DNS lookup; otherwise, IP address or
- Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the server side, and when communicating through an intermediary,
- {@code client.address} SHOULD represent the client address behind any intermediaries,  for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kClientAddress = "client.address";
-
-/**
- * Client port number.
- *
- * <p>Notes:
-  <ul> <li>When observed from the server side, and when communicating through an intermediary,
- {@code client.port} SHOULD represent the client port behind any intermediaries,  for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kClientPort = "client.port";
-
-/**
- * The cloud account ID the resource is assigned to.
- */
-static constexpr const char *kCloudAccountId = "cloud.account.id";
-
-/**
- * Cloud regions often have multiple, isolated locations known as zones to increase availability.
- Availability zone represents the zone where the resource is running.
- *
- * <p>Notes:
-  <ul> <li>Availability zones are called &quot;zones&quot; on Alibaba Cloud and Google Cloud.</li>
- </ul>
- */
-static constexpr const char *kCloudAvailabilityZone = "cloud.availability_zone";
-
-/**
- * The cloud platform in use.
- *
- * <p>Notes:
-  <ul> <li>The prefix of the service SHOULD match the one specified in {@code cloud.provider}.</li>
- </ul>
- */
-static constexpr const char *kCloudPlatform = "cloud.platform";
-
-/**
- * Name of the cloud provider.
- */
-static constexpr const char *kCloudProvider = "cloud.provider";
-
-/**
- * The geographical region the resource is running.
- *
- * <p>Notes:
-  <ul> <li>Refer to your provider's docs to see the available regions, for example <a
- href="https://www.alibabacloud.com/help/doc-detail/40654.htm">Alibaba Cloud regions</a>, <a
- href="https://aws.amazon.com/about-aws/global-infrastructure/regions_az/">AWS regions</a>, <a
- href="https://azure.microsoft.com/global-infrastructure/geographies/">Azure regions</a>, <a
- href="https://cloud.google.com/about/locations">Google Cloud regions</a>, or <a
- href="https://www.tencentcloud.com/document/product/213/6091">Tencent Cloud regions</a>.</li> </ul>
- */
-static constexpr const char *kCloudRegion = "cloud.region";
-
-/**
- * Cloud provider-specific native identifier of the monitored cloud resource (e.g. an <a
-href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a> on AWS, a
-<a href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">fully qualified
-resource ID</a> on Azure, a <a
-href="https://cloud.google.com/apis/design/resource_names#full_resource_name">full resource name</a>
-on GCP)
- *
- * <p>Notes:
-  <ul> <li>On some cloud providers, it may not be possible to determine the full ID at startup,
-so it may be necessary to set {@code cloud.resource_id} as a span attribute instead.</li><li>The
-exact value to use for {@code cloud.resource_id} depends on the cloud provider. The following
-well-known definitions MUST be used if you set this attribute and they apply:</li><li><strong>AWS
-Lambda:</strong> The function <a
-href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take care
-not to use the &quot;invoked ARN&quot; directly but replace any <a
-href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a> with
-the resolved function version, as the same runtime instance may be invocable with multiple different
-aliases.</li> <li><strong>GCP:</strong> The <a
-href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a></li>
-<li><strong>Azure:</strong> The <a
-href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
-ID</a> of the invoked function, <em>not</em> the function app, having the form
-{@code
-/subscriptions/<SUBSCIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC>}.
-This means that a span attribute MUST be used, as an Azure function app can host multiple functions
-that would usually share a TracerProvider.</li>
- </ul>
- */
-static constexpr const char *kCloudResourceId = "cloud.resource_id";
-
-/**
- * The <a href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#id">event_id</a>
- * uniquely identifies the event.
- */
-static constexpr const char *kCloudeventsEventId = "cloudevents.event_id";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#source-1">source</a>
- * identifies the context in which an event happened.
- */
-static constexpr const char *kCloudeventsEventSource = "cloudevents.event_source";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#specversion">version of
- * the CloudEvents specification</a> which the event uses.
- */
-static constexpr const char *kCloudeventsEventSpecVersion = "cloudevents.event_spec_version";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#subject">subject</a> of
- * the event in the context of the event producer (identified by source).
- */
-static constexpr const char *kCloudeventsEventSubject = "cloudevents.event_subject";
-
-/**
- * The <a
- * href="https://github.com/cloudevents/spec/blob/v1.0.2/cloudevents/spec.md#type">event_type</a>
- * contains a value describing the type of event related to the originating occurrence.
- */
-static constexpr const char *kCloudeventsEventType = "cloudevents.event_type";
-
-/**
- * The column number in {@code code.filepath} best representing the operation. It SHOULD point
- * within the code unit named in {@code code.function}.
- */
-static constexpr const char *kCodeColumn = "code.column";
-
-/**
- * The source code file name that identifies the code unit as uniquely as possible (preferably an
- * absolute file path).
- */
-static constexpr const char *kCodeFilepath = "code.filepath";
-
-/**
- * The method or function name, or equivalent (usually rightmost part of the code unit's name).
- */
-static constexpr const char *kCodeFunction = "code.function";
-
-/**
- * The line number in {@code code.filepath} best representing the operation. It SHOULD point within
- * the code unit named in {@code code.function}.
- */
-static constexpr const char *kCodeLineno = "code.lineno";
-
-/**
- * The &quot;namespace&quot; within which {@code code.function} is defined. Usually the qualified
- * class or module name, such that {@code code.namespace} + some separator + {@code code.function}
- * form a unique identifier for the code unit.
- */
-static constexpr const char *kCodeNamespace = "code.namespace";
-
-/**
- * A stacktrace as a string in the natural representation for the language runtime. The
- * representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kCodeStacktrace = "code.stacktrace";
-
-/**
- * The command used to run the container (i.e. the command name).
- *
- * <p>Notes:
-  <ul> <li>If using embedded credentials or sensitive data, it is recommended to remove them to
- prevent potential leakage.</li> </ul>
- */
-static constexpr const char *kContainerCommand = "container.command";
-
-/**
- * All the command arguments (including the command/executable itself) run by the container. [2]
- */
-static constexpr const char *kContainerCommandArgs = "container.command_args";
-
-/**
- * The full command run by the container as a single string representing the full command. [2]
- */
-static constexpr const char *kContainerCommandLine = "container.command_line";
-
-/**
- * Container ID. Usually a UUID, as for example used to <a
- * href="https://docs.docker.com/engine/reference/run/#container-identification">identify Docker
- * containers</a>. The UUID might be abbreviated.
- */
-static constexpr const char *kContainerId = "container.id";
-
-/**
- * Runtime specific image identifier. Usually a hash algorithm followed by a UUID.
- *
- * <p>Notes:
-  <ul> <li>Docker defines a sha256 of the image id; {@code container.image.id} corresponds to the
-{@code Image} field from the Docker container inspect <a
-href="https://docs.docker.com/engine/api/v1.43/#tag/Container/operation/ContainerInspect">API</a>
-endpoint. K8s defines a link to the container registry repository with digest {@code "imageID":
-"registry.azurecr.io
-/namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"}.
-The ID is assigned by the container runtime and can vary in different environments. Consider using
-{@code oci.manifest.digest} if it is important to identify the same image in different
-environments/runtimes.</li> </ul>
- */
-static constexpr const char *kContainerImageId = "container.image.id";
-
-/**
- * Name of the image the container was built on.
- */
-static constexpr const char *kContainerImageName = "container.image.name";
-
-/**
- * Repo digests of the container image as provided by the container runtime.
- *
- * <p>Notes:
-  <ul> <li><a
- href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker</a> and <a
- href="https://github.com/kubernetes/cri-api/blob/c75ef5b473bbe2d0a4fc92f82235efd665ea8e9f/pkg/apis/runtime/v1/api.proto#L1237-L1238">CRI</a>
- report those under the {@code RepoDigests} field.</li> </ul>
- */
-static constexpr const char *kContainerImageRepoDigests = "container.image.repo_digests";
-
-/**
- * Container image tags. An example can be found in <a
- * href="https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect">Docker Image
- * Inspect</a>. Should be only the {@code <tag>} section of the full name for example from {@code
- * registry.example.com/my-org/my-image:<tag>}.
- */
-static constexpr const char *kContainerImageTags = "container.image.tags";
-
-/**
- * Container name used by container runtime.
- */
-static constexpr const char *kContainerName = "container.name";
-
-/**
- * The container runtime managing this container.
- */
-static constexpr const char *kContainerRuntime = "container.runtime";
-
-/**
- * The mode of the CPU
- */
-static constexpr const char *kCpuMode = "cpu.mode";
-
-/**
- * The name of the connection pool; unique within the instrumented application. In case the
- * connection pool implementation doesn't provide a name, instrumentation SHOULD use a combination
- * of parameters that would make the name unique, for example, combining attributes {@code
- * server.address}, {@code server.port}, and {@code db.namespace}, formatted as {@code
- * server.address:server.port/db.namespace}. Instrumentations that generate connection pool name
- * following different patterns SHOULD document it.
- */
-static constexpr const char *kDbClientConnectionPoolName = "db.client.connection.pool.name";
-
-/**
- * The state of a connection in the pool
- */
-static constexpr const char *kDbClientConnectionState = "db.client.connection.state";
-
-/**
- * The name of a collection (table, container) within the database.
- *
- * <p>Notes:
-  <ul> <li>It is RECOMMENDED to capture the value as provided by the application without attempting
-to do any case normalization. If the collection name is parsed from the query text, it SHOULD be the
-first collection name found in the query and it SHOULD match the value provided in the query text
-including any schema and database name prefix. For batch operations, if the individual operations
-are known to have the same collection name then that collection name SHOULD be used, otherwise
-{@code db.collection.name} SHOULD NOT be captured.</li> </ul>
- */
-static constexpr const char *kDbCollectionName = "db.collection.name";
-
-/**
- * The name of the database, fully qualified within the server address and port.
- *
- * <p>Notes:
-  <ul> <li>If a database system has multiple namespace components, they SHOULD be concatenated
-(potentially using database system specific conventions) from most general to most specific
-namespace component, and more specific namespaces SHOULD NOT be captured without the more general
-namespaces, to ensure that &quot;startswith&quot; queries for the more general namespaces will be
-valid. Semantic conventions for individual database systems SHOULD document what {@code
-db.namespace} means in the context of that system. It is RECOMMENDED to capture the value as
-provided by the application without attempting to do any case normalization.</li> </ul>
- */
-static constexpr const char *kDbNamespace = "db.namespace";
-
-/**
- * The number of queries included in a <a
- href="/docs/database/database-spans.md#batch-operations">batch operation</a>.
- *
- * <p>Notes:
-  <ul> <li>Operations are only considered batches when they contain two or more operations, and so
- {@code db.operation.batch.size} SHOULD never be {@code 1}.</li> </ul>
- */
-static constexpr const char *kDbOperationBatchSize = "db.operation.batch.size";
-
-/**
- * The name of the operation or command being executed.
- *
- * <p>Notes:
-  <ul> <li>It is RECOMMENDED to capture the value as provided by the application without attempting
-to do any case normalization. If the operation name is parsed from the query text, it SHOULD be the
-first operation name found in the query. For batch operations, if the individual operations are
-known to have the same operation name then that operation name SHOULD be used prepended by {@code
-BATCH}, otherwise {@code db.operation.name} SHOULD be {@code BATCH} or some other database system
-specific term if more applicable.</li> </ul>
- */
-static constexpr const char *kDbOperationName = "db.operation.name";
-
-/**
- * The database query being executed.
- *
- * <p>Notes:
-  <ul> <li>For sanitization see <a
-href="../../docs/database/database-spans.md#sanitization-of-dbquerytext">Sanitization of {@code
-db.query.text}</a>. For batch operations, if the individual operations are known to have the same
-query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD
-be concatenated with separator {@code ;} or some other database system specific separator if more
-applicable. Even though parameterized query text can potentially have sensitive data, by using a
-parameterized query the user is giving a strong signal that any sensitive data will be passed as
-parameter values, and the benefit to observability of capturing the static part of the query text by
-default outweighs the risk.</li> </ul>
- */
-static constexpr const char *kDbQueryText = "db.query.text";
-
-/**
- * The database management system (DBMS) product as identified by the client instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The actual DBMS may differ from the one identified by the client. For example, when using
- PostgreSQL client libraries to connect to a CockroachDB, the {@code db.system} is set to {@code
- postgresql} based on the instrumentation's best knowledge.</li> </ul>
- */
-static constexpr const char *kDbSystem = "db.system";
-
-/**
- * The consistency level of the query. Based on consistency values from <a
- * href="https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html">CQL</a>.
- */
-static constexpr const char *kDbCassandraConsistencyLevel = "db.cassandra.consistency_level";
-
-/**
- * The data center of the coordinating node for a query.
- */
-static constexpr const char *kDbCassandraCoordinatorDc = "db.cassandra.coordinator.dc";
-
-/**
- * The ID of the coordinating node for a query.
- */
-static constexpr const char *kDbCassandraCoordinatorId = "db.cassandra.coordinator.id";
-
-/**
- * Whether or not the query is idempotent.
- */
-static constexpr const char *kDbCassandraIdempotence = "db.cassandra.idempotence";
-
-/**
- * The fetch size used for paging, i.e. how many rows will be returned at once.
- */
-static constexpr const char *kDbCassandraPageSize = "db.cassandra.page_size";
-
-/**
- * The number of times a query was speculatively executed. Not set or {@code 0} if the query was not
- * executed speculatively.
- */
-static constexpr const char *kDbCassandraSpeculativeExecutionCount =
-    "db.cassandra.speculative_execution_count";
-
-/**
- * Unique Cosmos client instance id.
- */
-static constexpr const char *kDbCosmosdbClientId = "db.cosmosdb.client_id";
-
-/**
- * Cosmos client connection mode.
- */
-static constexpr const char *kDbCosmosdbConnectionMode = "db.cosmosdb.connection_mode";
-
-/**
- * CosmosDB Operation Type.
- */
-static constexpr const char *kDbCosmosdbOperationType = "db.cosmosdb.operation_type";
-
-/**
- * RU consumed for that operation
- */
-static constexpr const char *kDbCosmosdbRequestCharge = "db.cosmosdb.request_charge";
-
-/**
- * Request payload size in bytes
- */
-static constexpr const char *kDbCosmosdbRequestContentLength = "db.cosmosdb.request_content_length";
-
-/**
- * Cosmos DB status code.
- */
-static constexpr const char *kDbCosmosdbStatusCode = "db.cosmosdb.status_code";
-
-/**
- * Cosmos DB sub status code.
- */
-static constexpr const char *kDbCosmosdbSubStatusCode = "db.cosmosdb.sub_status_code";
-
-/**
- * Represents the human-readable identifier of the node/instance to which a request was routed.
- */
-static constexpr const char *kDbElasticsearchNodeName = "db.elasticsearch.node.name";
-
-/**
- * Name of the <a href="https://wikipedia.org/wiki/Deployment_environment">deployment
-environment</a> (aka deployment tier).
- *
- * <p>Notes:
-  <ul> <li>{@code deployment.environment.name} does not affect the uniqueness constraints defined
-through the {@code service.namespace}, {@code service.name} and {@code service.instance.id} resource
-attributes. This implies that resources carrying the following attribute combinations MUST be
-considered to be identifying the same service:</li><li>{@code service.name=frontend}, {@code
-deployment.environment.name=production}</li> <li>{@code service.name=frontend}, {@code
-deployment.environment.name=staging}.</li>
- </ul>
- */
-static constexpr const char *kDeploymentEnvironmentName = "deployment.environment.name";
-
-/**
- * The id of the deployment.
- */
-static constexpr const char *kDeploymentId = "deployment.id";
-
-/**
- * The name of the deployment.
- */
-static constexpr const char *kDeploymentName = "deployment.name";
-
-/**
- * The status of the deployment.
- */
-static constexpr const char *kDeploymentStatus = "deployment.status";
-
-/**
- * Deprecated use the {@code device.app.lifecycle} event definition including {@code android.state}
- as a payload field instead.
- *
- * <p>Notes:
-  <ul> <li>The Android lifecycle states are defined in <a
- href="https://developer.android.com/guide/components/activities/activity-lifecycle#lc">Activity
- lifecycle callbacks</a>, and from which the {@code OS identifiers} are derived.</li> </ul>
- */
-static constexpr const char *kAndroidState = "android.state";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kContainerCpuState = "container.cpu.state";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCassandraTable = "db.cassandra.table";
-
-/**
- * Deprecated, use {@code server.address}, {@code server.port} attributes instead.
- *
- * @deprecated Deprecated, use `server.address`, `server.port` attributes instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbConnectionString = "db.connection_string";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbCosmosdbContainer =
-    "db.cosmosdb.container";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbElasticsearchClusterName =
-    "db.elasticsearch.cluster.name";
-
-/**
- * Deprecated, no general replacement at this time. For Elasticsearch, use {@code
- * db.elasticsearch.node.name} instead.
- *
- * @deprecated Deprecated, no general replacement at this time. For Elasticsearch, use
- * `db.elasticsearch.node.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbInstanceId = "db.instance.id";
-
-/**
- * Removed, no replacement at this time.
- *
- * @deprecated Removed, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbJdbcDriverClassname =
-    "db.jdbc.driver_classname";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMongodbCollection =
-    "db.mongodb.collection";
-
-/**
- * Deprecated, SQL Server instance is now populated as a part of {@code db.namespace} attribute.
- *
- * @deprecated Deprecated, SQL Server instance is now populated as a part of `db.namespace`
- * attribute.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbMssqlInstanceName =
-    "db.mssql.instance_name";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbName = "db.name";
-
-/**
- * Deprecated, use {@code db.operation.name} instead.
- *
- * @deprecated Deprecated, use `db.operation.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbOperation = "db.operation";
-
-/**
- * Deprecated, use {@code db.namespace} instead.
- *
- * @deprecated Deprecated, use `db.namespace` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbRedisDatabaseIndex =
-    "db.redis.database_index";
-
-/**
- * Deprecated, use {@code db.collection.name} instead.
- *
- * @deprecated Deprecated, use `db.collection.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbSqlTable = "db.sql.table";
-
-/**
- * The database statement being executed.
- *
- * @deprecated The database statement being executed.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbStatement = "db.statement";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbUser = "db.user";
-
-/**
- * Deprecated, use {@code db.client.connection.pool.name} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsPoolName =
-    "db.client.connections.pool.name";
-
-/**
- * Deprecated, use {@code db.client.connection.state} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.state` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDbClientConnectionsState =
-    "db.client.connections.state";
-
-/**
- * Deprecated, use {@code db.client.connection.pool.name} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.pool.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kPoolName = "pool.name";
-
-/**
- * Deprecated, use {@code db.client.connection.state} instead.
- *
- * @deprecated Deprecated, use `db.client.connection.state` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kState = "state";
-
-/**
- * 'Deprecated, use {@code deployment.environment.name} instead.'
- *
- * @deprecated 'Deprecated, use `deployment.environment.name` instead.'.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kDeploymentEnvironment =
-    "deployment.environment";
-
-/**
- * Deprecated, use {@code user.id} instead.
- *
- * @deprecated Deprecated, use `user.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserId = "enduser.id";
-
-/**
- * Deprecated, use {@code user.roles} instead.
- *
- * @deprecated Deprecated, use `user.roles` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserRole = "enduser.role";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kEnduserScope = "enduser.scope";
-
-/**
- * Deprecated, use {@code gen_ai.usage.output_tokens} instead.
- *
- * @deprecated Deprecated, use `gen_ai.usage.output_tokens` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsageCompletionTokens =
-    "gen_ai.usage.completion_tokens";
-
-/**
- * Deprecated, use {@code gen_ai.usage.input_tokens} instead.
- *
- * @deprecated Deprecated, use `gen_ai.usage.input_tokens` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kGenAiUsagePromptTokens =
-    "gen_ai.usage.prompt_tokens";
-
-/**
- * Deprecated, use {@code client.address} instead.
- *
- * @deprecated Deprecated, use `client.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpClientIp = "http.client_ip";
-
-/**
- * Deprecated, use {@code network.protocol.name} instead.
- *
- * @deprecated Deprecated, use `network.protocol.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpFlavor = "http.flavor";
-
-/**
- * Deprecated, use one of {@code server.address}, {@code client.address} or {@code
- * http.request.header.host} instead, depending on the usage.
- *
- * @deprecated Deprecated, use one of `server.address`, `client.address` or
- * `http.request.header.host` instead, depending on the usage.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpHost = "http.host";
-
-/**
- * Deprecated, use {@code http.request.method} instead.
- *
- * @deprecated Deprecated, use `http.request.method` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpMethod = "http.method";
-
-/**
- * Deprecated, use {@code http.request.header.content-length} instead.
- *
- * @deprecated Deprecated, use `http.request.header.content-length` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLength =
-    "http.request_content_length";
-
-/**
- * Deprecated, use {@code http.request.body.size} instead.
- *
- * @deprecated Deprecated, use `http.request.body.size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpRequestContentLengthUncompressed =
-    "http.request_content_length_uncompressed";
-
-/**
- * Deprecated, use {@code http.response.header.content-length} instead.
- *
- * @deprecated Deprecated, use `http.response.header.content-length` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLength =
-    "http.response_content_length";
-
-/**
- * Deprecated, use {@code http.response.body.size} instead.
- *
- * @deprecated Deprecated, use `http.response.body.size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpResponseContentLengthUncompressed =
-    "http.response_content_length_uncompressed";
-
-/**
- * Deprecated, use {@code url.scheme} instead.
- *
- * @deprecated Deprecated, use `url.scheme` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpScheme = "http.scheme";
-
-/**
- * Deprecated, use {@code server.address} instead.
- *
- * @deprecated Deprecated, use `server.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpServerName = "http.server_name";
-
-/**
- * Deprecated, use {@code http.response.status_code} instead.
- *
- * @deprecated Deprecated, use `http.response.status_code` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpStatusCode = "http.status_code";
-
-/**
- * Deprecated, use {@code url.path} and {@code url.query} instead.
- *
- * @deprecated Deprecated, use `url.path` and `url.query` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpTarget = "http.target";
-
-/**
- * Deprecated, use {@code url.full} instead.
- *
- * @deprecated Deprecated, use `url.full` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUrl = "http.url";
-
-/**
- * Deprecated, use {@code user_agent.original} instead.
- *
- * @deprecated Deprecated, use `user_agent.original` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kHttpUserAgent = "http.user_agent";
-
-/**
- * Deprecated use the {@code device.app.lifecycle} event definition including {@code ios.state} as a
- payload field instead.
- *
- * <p>Notes:
-  <ul> <li>The iOS lifecycle states are defined in the <a
- href="https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902">UIApplicationDelegate
- documentation</a>, and from which the {@code OS terminology} column values are derived.</li> </ul>
- *
- * @deprecated Deprecated use the `device.app.lifecycle` event definition including `ios.state` as a
- payload field instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kIosState = "ios.state";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishAnonymous =
-    "messaging.destination_publish.anonymous";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingDestinationPublishName =
-    "messaging.destination_publish.name";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingEventhubsConsumerGroup =
-    "messaging.eventhubs.consumer.group";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaConsumerGroup =
-    "messaging.kafka.consumer.group";
-
-/**
- * Deprecated, use {@code messaging.destination.partition.id} instead.
- *
- * @deprecated Deprecated, use `messaging.destination.partition.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaDestinationPartition =
-    "messaging.kafka.destination.partition";
-
-/**
- * Deprecated, use {@code messaging.kafka.offset} instead.
- *
- * @deprecated Deprecated, use `messaging.kafka.offset` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingKafkaMessageOffset =
-    "messaging.kafka.message.offset";
-
-/**
- * Deprecated, use {@code messaging.operation.type} instead.
- *
- * @deprecated Deprecated, use `messaging.operation.type` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingOperation = "messaging.operation";
-
-/**
- * Deprecated, use {@code messaging.consumer.group.name} instead.
- *
- * @deprecated Deprecated, use `messaging.consumer.group.name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessagingRocketmqClientGroup =
-    "messaging.rocketmq.client_group";
-
-/**
- * Deprecated, use {@code messaging.servicebus.destination.subscription_name} instead.
- *
- * @deprecated Deprecated, use `messaging.servicebus.destination.subscription_name` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char
-    *kMessagingServicebusDestinationSubscriptionName =
-        "messaging.servicebus.destination.subscription_name";
-
-/**
- * Deprecated, use {@code network.local.address}.
- *
- * @deprecated Deprecated, use `network.local.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostIp = "net.host.ip";
-
-/**
- * Deprecated, use {@code server.address}.
- *
- * @deprecated Deprecated, use `server.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostName = "net.host.name";
-
-/**
- * Deprecated, use {@code server.port}.
- *
- * @deprecated Deprecated, use `server.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetHostPort = "net.host.port";
-
-/**
- * Deprecated, use {@code network.peer.address}.
- *
- * @deprecated Deprecated, use `network.peer.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerIp = "net.peer.ip";
-
-/**
- * Deprecated, use {@code server.address} on client spans and {@code client.address} on server
- * spans.
- *
- * @deprecated Deprecated, use `server.address` on client spans and `client.address` on server
- * spans.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerName = "net.peer.name";
-
-/**
- * Deprecated, use {@code server.port} on client spans and {@code client.port} on server spans.
- *
- * @deprecated Deprecated, use `server.port` on client spans and `client.port` on server spans.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetPeerPort = "net.peer.port";
-
-/**
- * Deprecated, use {@code network.protocol.name}.
- *
- * @deprecated Deprecated, use `network.protocol.name`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolName = "net.protocol.name";
-
-/**
- * Deprecated, use {@code network.protocol.version}.
- *
- * @deprecated Deprecated, use `network.protocol.version`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetProtocolVersion = "net.protocol.version";
-
-/**
- * Deprecated, use {@code network.transport} and {@code network.type}.
- *
- * @deprecated Deprecated, use `network.transport` and `network.type`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockFamily = "net.sock.family";
-
-/**
- * Deprecated, use {@code network.local.address}.
- *
- * @deprecated Deprecated, use `network.local.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
-
-/**
- * Deprecated, use {@code network.local.port}.
- *
- * @deprecated Deprecated, use `network.local.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockHostPort = "net.sock.host.port";
-
-/**
- * Deprecated, use {@code network.peer.address}.
- *
- * @deprecated Deprecated, use `network.peer.address`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
-
-/**
- * Deprecated, no replacement at this time.
- *
- * @deprecated Deprecated, no replacement at this time.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
-
-/**
- * Deprecated, use {@code network.peer.port}.
- *
- * @deprecated Deprecated, use `network.peer.port`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
-
-/**
- * Deprecated, use {@code network.transport}.
- *
- * @deprecated Deprecated, use `network.transport`.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kNetTransport = "net.transport";
-
-/**
- *
- *
- * @deprecated .
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryName = "otel.library.name";
-
-/**
- *
- *
- * @deprecated .
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kOtelLibraryVersion = "otel.library.version";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kProcessCpuState = "process.cpu.state";
-
-/**
- * Deprecated, use {@code rpc.message.compressed_size} instead.
- *
- * @deprecated Deprecated, use `rpc.message.compressed_size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageCompressedSize =
-    "message.compressed_size";
-
-/**
- * Deprecated, use {@code rpc.message.id} instead.
- *
- * @deprecated Deprecated, use `rpc.message.id` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageId = "message.id";
-
-/**
- * Deprecated, use {@code rpc.message.type} instead.
- *
- * @deprecated Deprecated, use `rpc.message.type` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageType = "message.type";
-
-/**
- * Deprecated, use {@code rpc.message.uncompressed_size} instead.
- *
- * @deprecated Deprecated, use `rpc.message.uncompressed_size` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kMessageUncompressedSize =
-    "message.uncompressed_size";
-
-/**
- * Deprecated, use {@code cpu.mode} instead.
- *
- * @deprecated Deprecated, use `cpu.mode` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemCpuState = "system.cpu.state";
-
-/**
- * Deprecated, use {@code system.process.status} instead.
- *
- * @deprecated Deprecated, use `system.process.status` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kSystemProcessesStatus =
-    "system.processes.status";
-
-/**
- * Deprecated, use {@code server.address} instead.
- *
- * @deprecated Deprecated, use `server.address` instead.
- */
-OPENTELEMETRY_DEPRECATED static constexpr const char *kTlsClientServerName =
-    "tls.client.server_name";
-
-/**
- * Destination address - domain name if available without reverse DNS lookup; otherwise, IP address
- or Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the source side, and when communicating through an intermediary,
- {@code destination.address} SHOULD represent the destination address behind any intermediaries, for
- example proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kDestinationAddress = "destination.address";
-
-/**
- * Destination port number
- */
-static constexpr const char *kDestinationPort = "destination.port";
-
-/**
- * A unique identifier representing the device
- *
- * <p>Notes:
-  <ul> <li>The device identifier MUST only be defined using the values outlined below. This value is
- not an advertising identifier and MUST NOT be used as such. On iOS (Swift or Objective-C), this
- value MUST be equal to the <a
- href="https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor">vendor
- identifier</a>. On Android (Java or Kotlin), this value MUST be equal to the Firebase Installation
- ID or a globally unique UUID which is persisted across sessions in your application. More
- information can be found <a
- href="https://developer.android.com/training/articles/user-data-ids">here</a> on best practices and
- exact implementation details. Caution should be taken when storing personal data or anything which
- can identify a user. GDPR and data protection laws may apply, ensure you do your own due
- diligence.</li> </ul>
- */
-static constexpr const char *kDeviceId = "device.id";
-
-/**
- * The name of the device manufacturer
- *
- * <p>Notes:
-  <ul> <li>The Android OS provides this field via <a
- href="https://developer.android.com/reference/android/os/Build#MANUFACTURER">Build</a>. iOS apps
- SHOULD hardcode the value {@code Apple}.</li> </ul>
- */
-static constexpr const char *kDeviceManufacturer = "device.manufacturer";
-
-/**
- * The model identifier for the device
- *
- * <p>Notes:
-  <ul> <li>It's recommended this value represents a machine-readable version of the model identifier
- rather than the market or consumer-friendly name of the device.</li> </ul>
- */
-static constexpr const char *kDeviceModelIdentifier = "device.model.identifier";
-
-/**
- * The marketing name for the device model
- *
- * <p>Notes:
-  <ul> <li>It's recommended this value represents a human-readable version of the device model
- rather than a machine-readable alternative.</li> </ul>
- */
-static constexpr const char *kDeviceModelName = "device.model.name";
-
-/**
- * The disk IO operation direction.
- */
-static constexpr const char *kDiskIoDirection = "disk.io.direction";
-
-/**
- * The name being queried.
- *
- * <p>Notes:
-  <ul> <li>If the name field contains non-printable characters (below 32 or above 126), those
- characters should be represented as escaped base 10 integers (\DDD). Back slashes and quotes should
- be escaped. Tabs, carriage returns, and line feeds should be converted to \t, \r, and \n
- respectively.</li> </ul>
- */
-static constexpr const char *kDnsQuestionName = "dns.question.name";
-
-/**
- * Describes a class of error the operation ended with.
- *
- * <p>Notes:
-  <ul> <li>The {@code error.type} SHOULD be predictable, and SHOULD have low
-cardinality.</li><li>When {@code error.type} is set to a type (e.g., an exception type), its
-canonical class name identifying the type within the artifact SHOULD be
-used.</li><li>Instrumentations SHOULD document the list of errors they report.</li><li>The
-cardinality of {@code error.type} within one instrumentation library SHOULD be low. Telemetry
-consumers that aggregate data from multiple instrumentation libraries and applications should be
-prepared for {@code error.type} to have high cardinality at query time when no additional filters
-are applied.</li><li>If the operation has completed successfully, instrumentations SHOULD NOT set
-{@code error.type}.</li><li>If a specific domain defines its own set of error identifiers (such as
-HTTP or gRPC status codes), it's RECOMMENDED to:</li><li>Use a domain-specific attribute</li>
-<li>Set {@code error.type} to capture all errors, regardless of whether they are defined within the
-domain-specific set or not.</li>
- </ul>
- */
-static constexpr const char *kErrorType = "error.type";
-
-/**
- * Identifies the class / type of event.
- *
- * <p>Notes:
-  <ul> <li>Event names are subject to the same rules as <a
- href="/docs/general/attribute-naming.md">attribute names</a>. Notably, event names are namespaced
- to avoid collisions and provide a clean separation of semantics for events in separate domains like
- browser, mobile, and kubernetes.</li> </ul>
- */
-static constexpr const char *kEventName = "event.name";
-
-/**
- * SHOULD be set to true if the exception event is recorded at a point where it is known that the
-exception is escaping the scope of the span.
- *
- * <p>Notes:
-  <ul> <li>An exception is considered to have escaped (or left) the scope of a span,
-if that span is ended while the exception is still logically &quot;in flight&quot;.
-This may be actually &quot;in flight&quot; in some languages (e.g. if the exception
-is passed to a Context manager's {@code __exit__} method in Python) but will
-usually be caught at the point of recording the exception in most languages.</li><li>It is usually
-not possible to determine at the point where an exception is thrown whether it will escape the scope
-of a span. However, it is trivial to know that an exception will escape, if one checks for an active
-exception just before ending the span, as done in the <a
-href="https://opentelemetry.io/docs/specs/semconv/exceptions/exceptions-spans/#recording-an-exception">example
-for recording span exceptions</a>.</li><li>It follows that an exception may still escape the scope
-of the span even if the {@code exception.escaped} attribute was not set or set to false, since the
-event might have been recorded at a time where it was not clear whether the exception will
-escape.</li> </ul>
- */
-static constexpr const char *kExceptionEscaped = "exception.escaped";
-
-/**
- * The exception message.
- */
-static constexpr const char *kExceptionMessage = "exception.message";
-
-/**
- * A stacktrace as a string in the natural representation for the language runtime. The
- * representation is to be determined and documented by each language SIG.
- */
-static constexpr const char *kExceptionStacktrace = "exception.stacktrace";
-
-/**
- * The type of the exception (its fully-qualified class name, if applicable). The dynamic type of
- * the exception should be preferred over the static type in languages that support it.
- */
-static constexpr const char *kExceptionType = "exception.type";
-
-/**
- * A boolean that is true if the serverless function is executed for the first time (aka
- * cold-start).
- */
-static constexpr const char *kFaasColdstart = "faas.coldstart";
-
-/**
- * A string containing the schedule period as <a
- * href="https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm">Cron
- * Expression</a>.
- */
-static constexpr const char *kFaasCron = "faas.cron";
-
-/**
- * The name of the source on which the triggering operation was performed. For example, in Cloud
- * Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name.
- */
-static constexpr const char *kFaasDocumentCollection = "faas.document.collection";
-
-/**
- * The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the
- * name of the file, and in Cosmos DB the table name.
- */
-static constexpr const char *kFaasDocumentName = "faas.document.name";
-
-/**
- * Describes the type of the operation that was performed on the data.
- */
-static constexpr const char *kFaasDocumentOperation = "faas.document.operation";
-
-/**
- * A string containing the time when the data was accessed in the <a
- * href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
- * href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasDocumentTime = "faas.document.time";
-
-/**
- * The execution environment ID as a string, that will be potentially reused for other invocations
- to the same function/function version.
- *
- * <p>Notes:
-  <ul> <li><strong>AWS Lambda:</strong> Use the (full) log stream name.</li>
- </ul>
- */
-static constexpr const char *kFaasInstance = "faas.instance";
-
-/**
- * The invocation ID of the current function invocation.
- */
-static constexpr const char *kFaasInvocationId = "faas.invocation_id";
-
-/**
- * The name of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code faas.name} resource attribute of the invoked function.</li>
- </ul>
- */
-static constexpr const char *kFaasInvokedName = "faas.invoked_name";
-
-/**
- * The cloud provider of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code cloud.provider} resource attribute of the invoked
- function.</li> </ul>
- */
-static constexpr const char *kFaasInvokedProvider = "faas.invoked_provider";
-
-/**
- * The cloud region of the invoked function.
- *
- * <p>Notes:
-  <ul> <li>SHOULD be equal to the {@code cloud.region} resource attribute of the invoked
- function.</li> </ul>
- */
-static constexpr const char *kFaasInvokedRegion = "faas.invoked_region";
-
-/**
- * The amount of memory available to the serverless function converted to Bytes.
- *
- * <p>Notes:
-  <ul> <li>It's recommended to set this attribute since e.g. too little memory can easily stop a
- Java AWS Lambda function from working correctly. On AWS Lambda, the environment variable {@code
- AWS_LAMBDA_FUNCTION_MEMORY_SIZE} provides this information (which must be multiplied by
- 1,048,576).</li> </ul>
- */
-static constexpr const char *kFaasMaxMemory = "faas.max_memory";
-
-/**
- * The name of the single function that this runtime instance executes.
- *
- * <p>Notes:
-  <ul> <li>This is the name of the function as configured/deployed on the FaaS
-platform and is usually different from the name of the callback
-function (which may be stored in the
-<a href="/docs/general/attributes.md#source-code-attributes">{@code code.namespace}/{@code
-code.function}</a> span attributes).</li><li>For some cloud providers, the above definition is
-ambiguous. The following definition of function name MUST be used for this attribute (and
-consequently the span name) for the listed cloud providers/products:</li><li><strong>Azure:</strong>
-The full name {@code <FUNCAPP>/<FUNC>}, i.e., function app name followed by a forward slash followed
-by the function name (this form can also be seen in the resource JSON for the function). This means
-that a span attribute MUST be used, as an Azure function app can host multiple functions that would
-usually share a TracerProvider (see also the {@code cloud.resource_id} attribute).</li>
- </ul>
- */
-static constexpr const char *kFaasName = "faas.name";
-
-/**
- * A string containing the function invocation time in the <a
- * href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO 8601</a> format expressed in <a
- * href="https://www.w3.org/TR/NOTE-datetime">UTC</a>.
- */
-static constexpr const char *kFaasTime = "faas.time";
-
-/**
- * Type of the trigger which caused this function invocation.
- */
-static constexpr const char *kFaasTrigger = "faas.trigger";
-
-/**
- * The immutable version of the function being executed.
- *
- * <p>Notes:
-  <ul> <li>Depending on the cloud provider and platform, use:</li><li><strong>AWS Lambda:</strong>
-The <a href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function
-version</a> (an integer represented as a decimal string).</li> <li><strong>Google Cloud Run
-(Services):</strong> The <a href="https://cloud.google.com/run/docs/managing/revisions">revision</a>
-(i.e., the function name plus the revision suffix).</li>
-<li><strong>Google Cloud Functions:</strong> The value of the
-<a
-href="https://cloud.google.com/functions/docs/env-var#runtime_environment_variables_set_automatically">{@code
-K_REVISION} environment variable</a>.</li> <li><strong>Azure Functions:</strong> Not applicable. Do
-not set this attribute.</li>
- </ul>
- */
-static constexpr const char *kFaasVersion = "faas.version";
-
-/**
- * The unique identifier of the feature flag.
- */
-static constexpr const char *kFeatureFlagKey = "feature_flag.key";
-
-/**
- * The name of the service provider that performs the flag evaluation.
- */
-static constexpr const char *kFeatureFlagProviderName = "feature_flag.provider_name";
-
-/**
- * SHOULD be a semantic identifier for a value. If one is unavailable, a stringified version of the
-value can be used.
- *
- * <p>Notes:
-  <ul> <li>A semantic identifier, commonly referred to as a variant, provides a means
-for referring to a value without including the value itself. This can
-provide additional context for understanding the meaning behind a value.
-For example, the variant {@code red} maybe be used for the value {@code #c05543}.</li><li>A
-stringified version of the value can be used in situations where a semantic identifier is
-unavailable. String representation of the value should be determined by the implementer.</li> </ul>
- */
-static constexpr const char *kFeatureFlagVariant = "feature_flag.variant";
-
-/**
- * Directory where the file is located. It should include the drive letter, when appropriate.
- */
-static constexpr const char *kFileDirectory = "file.directory";
-
-/**
- * File extension, excluding the leading dot.
- *
- * <p>Notes:
-  <ul> <li>When the file name has multiple extensions (example.tar.gz), only the last one should be
- captured (&quot;gz&quot;, not &quot;tar.gz&quot;).</li> </ul>
- */
-static constexpr const char *kFileExtension = "file.extension";
-
-/**
- * Name of the file including the extension, without the directory.
- */
-static constexpr const char *kFileName = "file.name";
-
-/**
- * Full path to the file, including the file name. It should include the drive letter, when
- * appropriate.
- */
-static constexpr const char *kFilePath = "file.path";
-
-/**
- * File size in bytes.
- */
-static constexpr const char *kFileSize = "file.size";
-
-/**
- * Identifies the Google Cloud service for which the official client library is intended.
- *
- * <p>Notes:
-  <ul> <li>Intended to be a stable identifier for Google Cloud client libraries that is uniform
- across implementation languages. The value should be derived from the canonical service domain for
- the service; for example, 'foo.googleapis.com' should result in a value of 'foo'.</li> </ul>
- */
-static constexpr const char *kGcpClientService = "gcp.client.service";
-
-/**
- * The name of the Cloud Run <a
- * href="https://cloud.google.com/run/docs/managing/job-executions">execution</a> being run for the
- * Job, as set by the <a
- * href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">{@code
- * CLOUD_RUN_EXECUTION}</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobExecution = "gcp.cloud_run.job.execution";
-
-/**
- * The index for a task within an execution as provided by the <a
- * href="https://cloud.google.com/run/docs/container-contract#jobs-env-vars">{@code
- * CLOUD_RUN_TASK_INDEX}</a> environment variable.
- */
-static constexpr const char *kGcpCloudRunJobTaskIndex = "gcp.cloud_run.job.task_index";
-
-/**
- * The hostname of a GCE instance. This is the full value of the default or <a
- * href="https://cloud.google.com/compute/docs/instances/custom-hostname-vm">custom hostname</a>.
- */
-static constexpr const char *kGcpGceInstanceHostname = "gcp.gce.instance.hostname";
-
-/**
- * The instance name of a GCE instance. This is the value provided by {@code host.name}, the visible
- * name of the instance in the Cloud Console UI, and the prefix for the default hostname of the
- * instance as defined by the <a
- * href="https://cloud.google.com/compute/docs/internal-dns#instance-fully-qualified-domain-names">default
- * internal DNS name</a>.
- */
-static constexpr const char *kGcpGceInstanceName = "gcp.gce.instance.name";
-
-/**
- * The full response received from the GenAI model.
- *
- * <p>Notes:
-  <ul> <li>It's RECOMMENDED to format completions as JSON string matching <a
- href="https://platform.openai.com/docs/guides/text-generation">OpenAI messages format</a></li>
- </ul>
- */
-static constexpr const char *kGenAiCompletion = "gen_ai.completion";
-
-/**
- * The name of the operation being performed.
- *
- * <p>Notes:
-  <ul> <li>If one of the predefined values applies, but specific system uses a different name it's
- RECOMMENDED to document it in the semantic conventions for specific GenAI system and use
- system-specific name in the instrumentation. If a different name is not documented, instrumentation
- libraries SHOULD use applicable predefined value.</li> </ul>
- */
-static constexpr const char *kGenAiOperationName = "gen_ai.operation.name";
-
-/**
- * The full prompt sent to the GenAI model.
- *
- * <p>Notes:
-  <ul> <li>It's RECOMMENDED to format prompts as JSON string matching <a
- href="https://platform.openai.com/docs/guides/text-generation">OpenAI messages format</a></li>
- </ul>
- */
-static constexpr const char *kGenAiPrompt = "gen_ai.prompt";
-
-/**
- * The frequency penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestFrequencyPenalty = "gen_ai.request.frequency_penalty";
-
-/**
- * The maximum number of tokens the model generates for a request.
- */
-static constexpr const char *kGenAiRequestMaxTokens = "gen_ai.request.max_tokens";
-
-/**
- * The name of the GenAI model a request is being made to.
- */
-static constexpr const char *kGenAiRequestModel = "gen_ai.request.model";
-
-/**
- * The presence penalty setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestPresencePenalty = "gen_ai.request.presence_penalty";
-
-/**
- * List of sequences that the model will use to stop generating further tokens.
- */
-static constexpr const char *kGenAiRequestStopSequences = "gen_ai.request.stop_sequences";
-
-/**
- * The temperature setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTemperature = "gen_ai.request.temperature";
-
-/**
- * The top_k sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopK = "gen_ai.request.top_k";
-
-/**
- * The top_p sampling setting for the GenAI request.
- */
-static constexpr const char *kGenAiRequestTopP = "gen_ai.request.top_p";
-
-/**
- * Array of reasons the model stopped generating tokens, corresponding to each generation received.
- */
-static constexpr const char *kGenAiResponseFinishReasons = "gen_ai.response.finish_reasons";
-
-/**
- * The unique identifier for the completion.
- */
-static constexpr const char *kGenAiResponseId = "gen_ai.response.id";
-
-/**
- * The name of the model that generated the response.
- */
-static constexpr const char *kGenAiResponseModel = "gen_ai.response.model";
-
-/**
- * The Generative AI product as identified by the client or server instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The {@code gen_ai.system} describes a family of GenAI models with specific model
-identified by {@code gen_ai.request.model} and {@code gen_ai.response.model} attributes.</li><li>The
-actual GenAI product may differ from the one identified by the client. For example, when using
-OpenAI client libraries to communicate with Mistral, the {@code gen_ai.system} is set to {@code
-openai} based on the instrumentation's best knowledge.</li><li>For custom model, a custom friendly
-name SHOULD be used. If none of these options apply, the {@code gen_ai.system} SHOULD be set to
-{@code _OTHER}.</li> </ul>
- */
-static constexpr const char *kGenAiSystem = "gen_ai.system";
-
-/**
- * The type of token being counted.
- */
-static constexpr const char *kGenAiTokenType = "gen_ai.token.type";
-
-/**
- * The number of tokens used in the GenAI input (prompt).
- */
-static constexpr const char *kGenAiUsageInputTokens = "gen_ai.usage.input_tokens";
-
-/**
- * The number of tokens used in the GenAI response (completion).
- */
-static constexpr const char *kGenAiUsageOutputTokens = "gen_ai.usage.output_tokens";
-
-/**
- * The type of memory.
- */
-static constexpr const char *kGoMemoryType = "go.memory.type";
-
-/**
- * The GraphQL document being executed.
- *
- * <p>Notes:
-  <ul> <li>The value may be sanitized to exclude sensitive information.</li> </ul>
- */
-static constexpr const char *kGraphqlDocument = "graphql.document";
-
-/**
- * The name of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationName = "graphql.operation.name";
-
-/**
- * The type of the operation being executed.
- */
-static constexpr const char *kGraphqlOperationType = "graphql.operation.type";
-
-/**
- * Unique identifier for the application
- */
-static constexpr const char *kHerokuAppId = "heroku.app.id";
-
-/**
- * Commit hash for the current release
- */
-static constexpr const char *kHerokuReleaseCommit = "heroku.release.commit";
-
-/**
- * Time and date the release was created
- */
-static constexpr const char *kHerokuReleaseCreationTimestamp = "heroku.release.creation_timestamp";
-
-/**
- * The CPU architecture the host system is running on.
- */
-static constexpr const char *kHostArch = "host.arch";
-
-/**
- * The amount of level 2 memory cache available to the processor (in Bytes).
- */
-static constexpr const char *kHostCpuCacheL2Size = "host.cpu.cache.l2.size";
-
-/**
- * Family or generation of the CPU.
- */
-static constexpr const char *kHostCpuFamily = "host.cpu.family";
-
-/**
- * Model identifier. It provides more granular information about the CPU, distinguishing it from
- * other CPUs within the same family.
- */
-static constexpr const char *kHostCpuModelId = "host.cpu.model.id";
-
-/**
- * Model designation of the processor.
- */
-static constexpr const char *kHostCpuModelName = "host.cpu.model.name";
-
-/**
- * Stepping or core revisions.
- */
-static constexpr const char *kHostCpuStepping = "host.cpu.stepping";
-
-/**
- * Processor manufacturer identifier. A maximum 12-character string.
- *
- * <p>Notes:
-  <ul> <li><a href="https://wiki.osdev.org/CPUID">CPUID</a> command returns the vendor ID string in
- EBX, EDX and ECX registers. Writing these to memory in this order results in a 12-character
- string.</li> </ul>
- */
-static constexpr const char *kHostCpuVendorId = "host.cpu.vendor.id";
-
-/**
- * Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider. For
- * non-containerized systems, this should be the {@code machine-id}. See the table below for the
- * sources to use to determine the {@code machine-id} based on operating system.
- */
-static constexpr const char *kHostId = "host.id";
-
-/**
- * VM image ID or host OS image ID. For Cloud, this value is from the provider.
- */
-static constexpr const char *kHostImageId = "host.image.id";
-
-/**
- * Name of the VM image or OS install the host was instantiated from.
- */
-static constexpr const char *kHostImageName = "host.image.name";
-
-/**
- * The version string of the VM image or host OS as defined in <a
- * href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kHostImageVersion = "host.image.version";
-
-/**
- * Available IP addresses of the host, excluding loopback interfaces.
- *
- * <p>Notes:
-  <ul> <li>IPv4 Addresses MUST be specified in dotted-quad notation. IPv6 addresses MUST be
- specified in the <a href="https://www.rfc-editor.org/rfc/rfc5952.html">RFC 5952</a> format.</li>
- </ul>
- */
-static constexpr const char *kHostIp = "host.ip";
-
-/**
- * Available MAC addresses of the host, excluding loopback interfaces.
- *
- * <p>Notes:
-  <ul> <li>MAC Addresses MUST be represented in <a
- href="https://standards.ieee.org/wp-content/uploads/import/documents/tutorials/eui.pdf">IEEE RA
- hexadecimal form</a>: as hyphen-separated octets in uppercase hexadecimal form from most to least
- significant.</li> </ul>
- */
-static constexpr const char *kHostMac = "host.mac";
-
-/**
- * Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully
- * qualified hostname, or another name specified by the user.
- */
-static constexpr const char *kHostName = "host.name";
-
-/**
- * Type of host. For Cloud, this must be the machine type.
- */
-static constexpr const char *kHostType = "host.type";
-
-/**
- * State of the HTTP connection in the HTTP connection pool.
- */
-static constexpr const char *kHttpConnectionState = "http.connection.state";
-
-/**
- * The size of the request payload body in bytes. This is the number of bytes transferred excluding
- * headers and is often, but not always, present as the <a
- * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
- * header. For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpRequestBodySize = "http.request.body.size";
-
-/**
- * HTTP request method.
- *
- * <p>Notes:
-  <ul> <li>HTTP request method value SHOULD be &quot;known&quot; to the instrumentation.
-By default, this convention defines &quot;known&quot; methods as the ones listed in <a
-href="https://www.rfc-editor.org/rfc/rfc9110.html#name-methods">RFC9110</a> and the PATCH method
-defined in <a href="https://www.rfc-editor.org/rfc/rfc5789.html">RFC5789</a>.</li><li>If the HTTP
-request method is not known to instrumentation, it MUST set the {@code http.request.method}
-attribute to {@code _OTHER}.</li><li>If the HTTP instrumentation could end up converting valid HTTP
-request methods to {@code _OTHER}, then it MUST provide a way to override the list of known HTTP
-methods. If this override is done via environment variable, then the environment variable MUST be
-named OTEL_INSTRUMENTATION_HTTP_KNOWN_METHODS and support a comma-separated list of case-sensitive
-known HTTP methods (this list MUST be a full override of the default known method, it is not a list
-of known methods in addition to the defaults).</li><li>HTTP method names are case-sensitive and
-{@code http.request.method} attribute value MUST match a known HTTP method name exactly.
-Instrumentations for specific web frameworks that consider HTTP methods to be case insensitive,
-SHOULD populate a canonical equivalent. Tracing instrumentations that do so, MUST also set {@code
-http.request.method_original} to the original value.</li> </ul>
- */
-static constexpr const char *kHttpRequestMethod = "http.request.method";
-
-/**
- * Original HTTP method sent by the client in the request line.
- */
-static constexpr const char *kHttpRequestMethodOriginal = "http.request.method_original";
-
-/**
- * The ordinal number of request resending attempt (for any reason, including redirects).
- *
- * <p>Notes:
-  <ul> <li>The resend count SHOULD be updated each time an HTTP request gets resent by the client,
- regardless of what was the cause of the resending (e.g. redirection, authorization failure, 503
- Server Unavailable, network issues, or any other).</li> </ul>
- */
-static constexpr const char *kHttpRequestResendCount = "http.request.resend_count";
-
-/**
- * The total size of the request in bytes. This should be the total number of bytes sent over the
- * wire, including the request line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and request
- * body if any.
- */
-static constexpr const char *kHttpRequestSize = "http.request.size";
-
-/**
- * The size of the response payload body in bytes. This is the number of bytes transferred excluding
- * headers and is often, but not always, present as the <a
- * href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length</a>
- * header. For requests using transport encoding, this should be the compressed size.
- */
-static constexpr const char *kHttpResponseBodySize = "http.response.body.size";
-
-/**
- * The total size of the response in bytes. This should be the total number of bytes sent over the
- * wire, including the status line (HTTP/1.1), framing (HTTP/2 and HTTP/3), headers, and response
- * body and trailers if any.
- */
-static constexpr const char *kHttpResponseSize = "http.response.size";
-
-/**
- * <a href="https://tools.ietf.org/html/rfc7231#section-6">HTTP response status code</a>.
- */
-static constexpr const char *kHttpResponseStatusCode = "http.response.status_code";
-
-/**
- * The matched route, that is, the path template in the format used by the respective server
-framework.
- *
- * <p>Notes:
-  <ul> <li>MUST NOT be populated when this is not supported by the HTTP server framework as the
-route attribute should have low-cardinality and the URI path can NOT substitute it. SHOULD include
-the <a href="/docs/http/http-spans.md#http-server-definitions">application root</a> if there is
-one.</li> </ul>
- */
-static constexpr const char *kHttpRoute = "http.route";
-
-/**
- * Name of the buffer pool.
- *
- * <p>Notes:
-  <ul> <li>Pool names are generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/BufferPoolMXBean.html#getName()">BufferPoolMXBean#getName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmBufferPoolName = "jvm.buffer.pool.name";
-
-/**
- * Name of the garbage collector action.
- *
- * <p>Notes:
-  <ul> <li>Garbage collector action is generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcAction()">GarbageCollectionNotificationInfo#getGcAction()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmGcAction = "jvm.gc.action";
-
-/**
- * Name of the garbage collector.
- *
- * <p>Notes:
-  <ul> <li>Garbage collector name is generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/GarbageCollectionNotificationInfo.html#getGcName()">GarbageCollectionNotificationInfo#getGcName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmGcName = "jvm.gc.name";
-
-/**
- * Name of the memory pool.
- *
- * <p>Notes:
-  <ul> <li>Pool names are generally obtained via <a
- href="https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html#getName()">MemoryPoolMXBean#getName()</a>.</li>
- </ul>
- */
-static constexpr const char *kJvmMemoryPoolName = "jvm.memory.pool.name";
-
-/**
- * The type of memory.
- */
-static constexpr const char *kJvmMemoryType = "jvm.memory.type";
-
-/**
- * Whether the thread is daemon or not.
- */
-static constexpr const char *kJvmThreadDaemon = "jvm.thread.daemon";
-
-/**
- * State of the thread.
- */
-static constexpr const char *kJvmThreadState = "jvm.thread.state";
-
-/**
- * The name of the cluster.
- */
-static constexpr const char *kK8sClusterName = "k8s.cluster.name";
-
-/**
- * A pseudo-ID for the cluster, set to the UID of the {@code kube-system} namespace.
- *
- * <p>Notes:
-  <ul> <li>K8s doesn't have support for obtaining a cluster ID. If this is ever
-added, we will recommend collecting the {@code k8s.cluster.uid} through the
-official APIs. In the meantime, we are able to use the {@code uid} of the
-{@code kube-system} namespace as a proxy for cluster ID. Read on for the
-rationale.</li><li>Every object created in a K8s cluster is assigned a distinct UID. The
-{@code kube-system} namespace is used by Kubernetes itself and will exist
-for the lifetime of the cluster. Using the {@code uid} of the {@code kube-system}
-namespace is a reasonable proxy for the K8s ClusterID as it will only
-change if the cluster is rebuilt. Furthermore, Kubernetes UIDs are
-UUIDs as standardized by
-<a href="https://www.itu.int/ITU-T/studygroups/com17/oid.html">ISO/IEC 9834-8 and ITU-T X.667</a>.
-Which states:</li><blockquote>
-<li>If generated according to one of the mechanisms defined in Rec.</li></blockquote>
-<li>ITU-T X.667 | ISO/IEC 9834-8, a UUID is either guaranteed to be
-  different from all other UUIDs generated before 3603 A.D., or is
-  extremely likely to be different (depending on the mechanism chosen).</li><li>Therefore, UIDs
-between clusters should be extremely unlikely to conflict.</li> </ul>
- */
-static constexpr const char *kK8sClusterUid = "k8s.cluster.uid";
-
-/**
- * The name of the Container from Pod specification, must be unique within a Pod. Container runtime
- * usually uses different globally unique name ({@code container.name}).
- */
-static constexpr const char *kK8sContainerName = "k8s.container.name";
-
-/**
- * Number of times the container was restarted. This attribute can be used to identify a particular
- * container (running or stopped) within a container spec.
- */
-static constexpr const char *kK8sContainerRestartCount = "k8s.container.restart_count";
-
-/**
- * Last terminated reason of the Container.
- */
-static constexpr const char *kK8sContainerStatusLastTerminatedReason =
-    "k8s.container.status.last_terminated_reason";
-
-/**
- * The name of the CronJob.
- */
-static constexpr const char *kK8sCronjobName = "k8s.cronjob.name";
-
-/**
- * The UID of the CronJob.
- */
-static constexpr const char *kK8sCronjobUid = "k8s.cronjob.uid";
-
-/**
- * The name of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetName = "k8s.daemonset.name";
-
-/**
- * The UID of the DaemonSet.
- */
-static constexpr const char *kK8sDaemonsetUid = "k8s.daemonset.uid";
-
-/**
- * The name of the Deployment.
- */
-static constexpr const char *kK8sDeploymentName = "k8s.deployment.name";
-
-/**
- * The UID of the Deployment.
- */
-static constexpr const char *kK8sDeploymentUid = "k8s.deployment.uid";
-
-/**
- * The name of the Job.
- */
-static constexpr const char *kK8sJobName = "k8s.job.name";
-
-/**
- * The UID of the Job.
- */
-static constexpr const char *kK8sJobUid = "k8s.job.uid";
-
-/**
- * The name of the namespace that the pod is running in.
- */
-static constexpr const char *kK8sNamespaceName = "k8s.namespace.name";
-
-/**
- * The name of the Node.
- */
-static constexpr const char *kK8sNodeName = "k8s.node.name";
-
-/**
- * The UID of the Node.
- */
-static constexpr const char *kK8sNodeUid = "k8s.node.uid";
-
-/**
- * The name of the Pod.
- */
-static constexpr const char *kK8sPodName = "k8s.pod.name";
-
-/**
- * The UID of the Pod.
- */
-static constexpr const char *kK8sPodUid = "k8s.pod.uid";
-
-/**
- * The name of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetName = "k8s.replicaset.name";
-
-/**
- * The UID of the ReplicaSet.
- */
-static constexpr const char *kK8sReplicasetUid = "k8s.replicaset.uid";
-
-/**
- * The name of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetName = "k8s.statefulset.name";
-
-/**
- * The UID of the StatefulSet.
- */
-static constexpr const char *kK8sStatefulsetUid = "k8s.statefulset.uid";
-
-/**
- * The Linux Slab memory state
- */
-static constexpr const char *kLinuxMemorySlabState = "linux.memory.slab.state";
-
-/**
- * The stream associated with the log. See below for a list of well-known values.
- */
-static constexpr const char *kLogIostream = "log.iostream";
-
-/**
- * The basename of the file.
- */
-static constexpr const char *kLogFileName = "log.file.name";
-
-/**
- * The basename of the file, with symlinks resolved.
- */
-static constexpr const char *kLogFileNameResolved = "log.file.name_resolved";
-
-/**
- * The full path to the file.
- */
-static constexpr const char *kLogFilePath = "log.file.path";
-
-/**
- * The full path to the file, with symlinks resolved.
- */
-static constexpr const char *kLogFilePathResolved = "log.file.path_resolved";
-
-/**
- * The complete orignal Log Record.
- *
- * <p>Notes:
-  <ul> <li>This value MAY be added when processing a Log Record which was originally transmitted as
- a string or equivalent data type AND the Body field of the Log Record does not contain the same
- value. (e.g. a syslog or a log record read from a file.)</li> </ul>
- */
-static constexpr const char *kLogRecordOriginal = "log.record.original";
-
-/**
- * A unique identifier for the Log Record.
- *
- * <p>Notes:
-  <ul> <li>If an id is provided, other log records with the same id will be considered duplicates
-and can be removed safely. This means, that two distinguishable log records MUST have different
-values. The id MAY be an <a href="https://github.com/ulid/spec">Universally Unique Lexicographically
-Sortable Identifier (ULID)</a>, but other identifiers (e.g. UUID) may be used as needed.</li> </ul>
- */
-static constexpr const char *kLogRecordUid = "log.record.uid";
-
-/**
- * The number of messages sent, received, or processed in the scope of the batching operation.
- *
- * <p>Notes:
-  <ul> <li>Instrumentations SHOULD NOT set {@code messaging.batch.message_count} on spans that
- operate with a single message. When a messaging client library supports both batch and
- single-message API for the same operation, instrumentations SHOULD use {@code
- messaging.batch.message_count} for batching APIs and SHOULD NOT use it for single-message
- APIs.</li> </ul>
- */
-static constexpr const char *kMessagingBatchMessageCount = "messaging.batch.message_count";
-
-/**
- * A unique identifier for the client that consumes or produces a message.
- */
-static constexpr const char *kMessagingClientId = "messaging.client.id";
-
-/**
- * The name of the consumer group with which a consumer is associated.
- *
- * <p>Notes:
-  <ul> <li>Semantic conventions for individual messaging systems SHOULD document whether {@code
- messaging.consumer.group.name} is applicable and what it means in the context of that system.</li>
- </ul>
- */
-static constexpr const char *kMessagingConsumerGroupName = "messaging.consumer.group.name";
-
-/**
- * A boolean that is true if the message destination is anonymous (could be unnamed or have
- * auto-generated name).
- */
-static constexpr const char *kMessagingDestinationAnonymous = "messaging.destination.anonymous";
-
-/**
- * The message destination name
- *
- * <p>Notes:
-  <ul> <li>Destination name SHOULD uniquely identify a specific queue, topic or other entity within
-the broker. If the broker doesn't have such notion, the destination name SHOULD uniquely identify
-the broker.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationName = "messaging.destination.name";
-
-/**
- * The identifier of the partition messages are sent to or received from, unique within the {@code
- * messaging.destination.name}.
- */
-static constexpr const char *kMessagingDestinationPartitionId =
-    "messaging.destination.partition.id";
-
-/**
- * The name of the destination subscription from which a message is consumed.
- *
- * <p>Notes:
-  <ul> <li>Semantic conventions for individual messaging systems SHOULD document whether {@code
- messaging.destination.subscription.name} is applicable and what it means in the context of that
- system.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationSubscriptionName =
-    "messaging.destination.subscription.name";
-
-/**
- * Low cardinality representation of the messaging destination name
- *
- * <p>Notes:
-  <ul> <li>Destination names could be constructed from templates. An example would be a destination
- name involving a user name or product id. Although the destination name in this case is of high
- cardinality, the underlying template is of low cardinality and can be effectively used for grouping
- and aggregation.</li> </ul>
- */
-static constexpr const char *kMessagingDestinationTemplate = "messaging.destination.template";
-
-/**
- * A boolean that is true if the message destination is temporary and might not exist anymore after
- * messages are processed.
- */
-static constexpr const char *kMessagingDestinationTemporary = "messaging.destination.temporary";
-
-/**
- * The size of the message body in bytes.
- *
- * <p>Notes:
-  <ul> <li>This can refer to both the compressed or uncompressed body size. If both sizes are known,
-the uncompressed body size should be used.</li> </ul>
- */
-static constexpr const char *kMessagingMessageBodySize = "messaging.message.body.size";
-
-/**
- * The conversation ID identifying the conversation to which the message belongs, represented as a
- * string. Sometimes called &quot;Correlation ID&quot;.
- */
-static constexpr const char *kMessagingMessageConversationId = "messaging.message.conversation_id";
-
-/**
- * The size of the message body and metadata in bytes.
- *
- * <p>Notes:
-  <ul> <li>This can refer to both the compressed or uncompressed size. If both sizes are known, the
-uncompressed size should be used.</li> </ul>
- */
-static constexpr const char *kMessagingMessageEnvelopeSize = "messaging.message.envelope.size";
-
-/**
- * A value used by the messaging system as an identifier for the message, represented as a string.
- */
-static constexpr const char *kMessagingMessageId = "messaging.message.id";
-
-/**
- * The system-specific name of the messaging operation.
- */
-static constexpr const char *kMessagingOperationName = "messaging.operation.name";
-
-/**
- * A string identifying the type of the messaging operation.
- *
- * <p>Notes:
-  <ul> <li>If a custom value is used, it MUST be of low cardinality.</li> </ul>
- */
-static constexpr const char *kMessagingOperationType = "messaging.operation.type";
-
-/**
- * The messaging system as identified by the client instrumentation.
- *
- * <p>Notes:
-  <ul> <li>The actual messaging system may differ from the one known by the client. For example,
- when using Kafka client libraries to communicate with Azure Event Hubs, the {@code
- messaging.system} is set to {@code kafka} based on the instrumentation's best knowledge.</li> </ul>
- */
-static constexpr const char *kMessagingSystem = "messaging.system";
-
-/**
- * Message keys in Kafka are used for grouping alike messages to ensure they're processed on the
- same partition. They differ from {@code messaging.message.id} in that they're not unique. If the
- key is {@code null}, the attribute MUST NOT be set.
- *
- * <p>Notes:
-  <ul> <li>If the key type is not string, it's string representation has to be supplied for the
- attribute. If the key has no unambiguous, canonical string form, don't include its value.</li>
- </ul>
- */
-static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.message.key";
-
-/**
- * A boolean that is true if the message is a tombstone.
- */
-static constexpr const char *kMessagingKafkaMessageTombstone = "messaging.kafka.message.tombstone";
-
-/**
- * The offset of a record in the corresponding Kafka partition.
- */
-static constexpr const char *kMessagingKafkaOffset = "messaging.kafka.offset";
-
-/**
- * RabbitMQ message routing key.
- */
-static constexpr const char *kMessagingRabbitmqDestinationRoutingKey =
-    "messaging.rabbitmq.destination.routing_key";
-
-/**
- * RabbitMQ message delivery tag
- */
-static constexpr const char *kMessagingRabbitmqMessageDeliveryTag =
-    "messaging.rabbitmq.message.delivery_tag";
-
-/**
- * Model of message consumption. This only applies to consumer spans.
- */
-static constexpr const char *kMessagingRocketmqConsumptionModel =
-    "messaging.rocketmq.consumption_model";
-
-/**
- * The delay time level for delay message, which determines the message delay time.
- */
-static constexpr const char *kMessagingRocketmqMessageDelayTimeLevel =
-    "messaging.rocketmq.message.delay_time_level";
-
-/**
- * The timestamp in milliseconds that the delay message is expected to be delivered to consumer.
- */
-static constexpr const char *kMessagingRocketmqMessageDeliveryTimestamp =
-    "messaging.rocketmq.message.delivery_timestamp";
-
-/**
- * It is essential for FIFO message. Messages that belong to the same message group are always
- * processed one by one within the same consumer group.
- */
-static constexpr const char *kMessagingRocketmqMessageGroup = "messaging.rocketmq.message.group";
-
-/**
- * Key(s) of message, another way to mark message besides message id.
- */
-static constexpr const char *kMessagingRocketmqMessageKeys = "messaging.rocketmq.message.keys";
-
-/**
- * The secondary classifier of message besides topic.
- */
-static constexpr const char *kMessagingRocketmqMessageTag = "messaging.rocketmq.message.tag";
-
-/**
- * Type of message.
- */
-static constexpr const char *kMessagingRocketmqMessageType = "messaging.rocketmq.message.type";
-
-/**
- * Namespace of RocketMQ resources, resources in different namespaces are individual.
- */
-static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.namespace";
-
-/**
- * The ack deadline in seconds set for the modify ack deadline request.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckDeadline =
-    "messaging.gcp_pubsub.message.ack_deadline";
-
-/**
- * The ack id for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageAckId =
-    "messaging.gcp_pubsub.message.ack_id";
-
-/**
- * The delivery attempt for a given message.
- */
-static constexpr const char *kMessagingGcpPubsubMessageDeliveryAttempt =
-    "messaging.gcp_pubsub.message.delivery_attempt";
-
-/**
- * The ordering key for a given message. If the attribute is not present, the message does not have
- * an ordering key.
- */
-static constexpr const char *kMessagingGcpPubsubMessageOrderingKey =
-    "messaging.gcp_pubsub.message.ordering_key";
-
-/**
- * Describes the <a
- * href="https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock">settlement
- * type</a>.
- */
-static constexpr const char *kMessagingServicebusDispositionStatus =
-    "messaging.servicebus.disposition_status";
-
-/**
- * Number of deliveries that have been attempted for this message.
- */
-static constexpr const char *kMessagingServicebusMessageDeliveryCount =
-    "messaging.servicebus.message.delivery_count";
-
-/**
- * The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingServicebusMessageEnqueuedTime =
-    "messaging.servicebus.message.enqueued_time";
-
-/**
- * The UTC epoch seconds at which the message has been accepted and stored in the entity.
- */
-static constexpr const char *kMessagingEventhubsMessageEnqueuedTime =
-    "messaging.eventhubs.message.enqueued_time";
-
-/**
- * The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network.
- */
-static constexpr const char *kNetworkCarrierIcc = "network.carrier.icc";
-
-/**
- * The mobile carrier country code.
- */
-static constexpr const char *kNetworkCarrierMcc = "network.carrier.mcc";
-
-/**
- * The mobile carrier network code.
- */
-static constexpr const char *kNetworkCarrierMnc = "network.carrier.mnc";
-
-/**
- * The name of the mobile carrier.
- */
-static constexpr const char *kNetworkCarrierName = "network.carrier.name";
-
-/**
- * This describes more details regarding the connection.type. It may be the type of cell technology
- * connection, but it could be used for describing details about a wifi connection.
- */
-static constexpr const char *kNetworkConnectionSubtype = "network.connection.subtype";
-
-/**
- * The internet connection type.
- */
-static constexpr const char *kNetworkConnectionType = "network.connection.type";
-
-/**
- * The network IO operation direction.
- */
-static constexpr const char *kNetworkIoDirection = "network.io.direction";
-
-/**
- * Local address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkLocalAddress = "network.local.address";
-
-/**
- * Local port number of the network connection.
- */
-static constexpr const char *kNetworkLocalPort = "network.local.port";
-
-/**
- * Peer address of the network connection - IP address or Unix domain socket name.
- */
-static constexpr const char *kNetworkPeerAddress = "network.peer.address";
-
-/**
- * Peer port number of the network connection.
- */
-static constexpr const char *kNetworkPeerPort = "network.peer.port";
-
-/**
- * <a href="https://osi-model.com/application-layer/">OSI application layer</a> or non-OSI
- equivalent.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li> </ul>
- */
-static constexpr const char *kNetworkProtocolName = "network.protocol.name";
-
-/**
- * The actual version of the protocol used for network communication.
- *
- * <p>Notes:
-  <ul> <li>If protocol version is subject to negotiation (for example using <a
- href="https://www.rfc-editor.org/rfc/rfc7301.html">ALPN</a>), this attribute SHOULD be set to the
- negotiated version. If the actual protocol version is not known, this attribute SHOULD NOT be
- set.</li> </ul>
- */
-static constexpr const char *kNetworkProtocolVersion = "network.protocol.version";
-
-/**
- * <a href="https://osi-model.com/transport-layer/">OSI transport layer</a> or <a
-href="https://wikipedia.org/wiki/Inter-process_communication">inter-process communication
-method</a>.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li><li>Consider always setting the
-transport when setting a port number, since a port number is ambiguous without knowing the
-transport. For example different processes could be listening on TCP port 12345 and UDP port
-12345.</li> </ul>
- */
-static constexpr const char *kNetworkTransport = "network.transport";
-
-/**
- * <a href="https://osi-model.com/network-layer/">OSI network layer</a> or non-OSI equivalent.
- *
- * <p>Notes:
-  <ul> <li>The value SHOULD be normalized to lowercase.</li> </ul>
- */
-static constexpr const char *kNetworkType = "network.type";
-
-/**
- * The digest of the OCI image manifest. For container images specifically is the digest by which
-the container image is known.
- *
- * <p>Notes:
-  <ul> <li>Follows <a href="https://github.com/opencontainers/image-spec/blob/main/manifest.md">OCI
-Image Manifest Specification</a>, and specifically the <a
-href="https://github.com/opencontainers/image-spec/blob/main/descriptor.md#digests">Digest
-property</a>. An example can be found in <a
-href="https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest">Example Image
-Manifest</a>.</li> </ul>
- */
-static constexpr const char *kOciManifestDigest = "oci.manifest.digest";
-
-/**
- * Parent-child Reference type
- *
- * <p>Notes:
-  <ul> <li>The causal relationship between a child Span and a parent Span.</li> </ul>
- */
-static constexpr const char *kOpentracingRefType = "opentracing.ref_type";
-
-/**
- * Unique identifier for a particular build or compilation of the operating system.
- */
-static constexpr const char *kOsBuildId = "os.build_id";
-
-/**
- * Human readable (not intended to be parsed) OS version information, like e.g. reported by {@code
- * ver} or {@code lsb_release -a} commands.
- */
-static constexpr const char *kOsDescription = "os.description";
-
-/**
- * Human readable operating system name.
- */
-static constexpr const char *kOsName = "os.name";
-
-/**
- * The operating system type.
- */
-static constexpr const char *kOsType = "os.type";
-
-/**
- * The version string of the operating system as defined in <a
- * href="/docs/resource/README.md#version-attributes">Version Attributes</a>.
- */
-static constexpr const char *kOsVersion = "os.version";
-
-/**
- * Name of the code, either &quot;OK&quot; or &quot;ERROR&quot;. MUST NOT be set if the status code
- * is UNSET.
- */
-static constexpr const char *kOtelStatusCode = "otel.status_code";
-
-/**
- * Description of the Status if it has a value, otherwise not set.
- */
-static constexpr const char *kOtelStatusDescription = "otel.status_description";
-
-/**
- * The name of the instrumentation scope - ({@code InstrumentationScope.Name} in OTLP).
- */
-static constexpr const char *kOtelScopeName = "otel.scope.name";
-
-/**
- * The version of the instrumentation scope - ({@code InstrumentationScope.Version} in OTLP).
- */
-static constexpr const char *kOtelScopeVersion = "otel.scope.version";
-
-/**
- * The <a href="/docs/resource/README.md#service">{@code service.name}</a> of the remote service.
- * SHOULD be equal to the actual {@code service.name} resource attribute of the remote service if
- * any.
- */
-static constexpr const char *kPeerService = "peer.service";
-
-/**
- * The command used to launch the process (i.e. the command name). On Linux based systems, can be
- * set to the zeroth string in {@code proc/[pid]/cmdline}. On Windows, can be set to the first
- * parameter extracted from {@code GetCommandLineW}.
- */
-static constexpr const char *kProcessCommand = "process.command";
-
-/**
- * All the command arguments (including the command/executable itself) as received by the process.
- * On Linux-based systems (and some other Unixoid systems supporting procfs), can be set according
- * to the list of null-delimited strings extracted from {@code proc/[pid]/cmdline}. For libc-based
- * executables, this would be the full argv vector passed to {@code main}.
- */
-static constexpr const char *kProcessCommandArgs = "process.command_args";
-
-/**
- * The full command used to launch the process as a single string representing the full command. On
- * Windows, can be set to the result of {@code GetCommandLineW}. Do not set this if you have to
- * assemble it just for monitoring; use {@code process.command_args} instead.
- */
-static constexpr const char *kProcessCommandLine = "process.command_line";
-
-/**
- * Specifies whether the context switches for this data point were voluntary or involuntary.
- */
-static constexpr const char *kProcessContextSwitchType = "process.context_switch_type";
-
-/**
- * The date and time the process was created, in ISO 8601 format.
- */
-static constexpr const char *kProcessCreationTime = "process.creation.time";
-
-/**
- * The name of the process executable. On Linux based systems, can be set to the {@code Name} in
- * {@code proc/[pid]/status}. On Windows, can be set to the base name of {@code
- * GetProcessImageFileNameW}.
- */
-static constexpr const char *kProcessExecutableName = "process.executable.name";
-
-/**
- * The full path to the process executable. On Linux based systems, can be set to the target of
- * {@code proc/[pid]/exe}. On Windows, can be set to the result of {@code GetProcessImageFileNameW}.
- */
-static constexpr const char *kProcessExecutablePath = "process.executable.path";
-
-/**
- * The exit code of the process.
- */
-static constexpr const char *kProcessExitCode = "process.exit.code";
-
-/**
- * The date and time the process exited, in ISO 8601 format.
- */
-static constexpr const char *kProcessExitTime = "process.exit.time";
-
-/**
- * The PID of the process's group leader. This is also the process group ID (PGID) of the process.
- */
-static constexpr const char *kProcessGroupLeaderPid = "process.group_leader.pid";
-
-/**
- * Whether the process is connected to an interactive shell.
- */
-static constexpr const char *kProcessInteractive = "process.interactive";
-
-/**
- * The username of the user that owns the process.
- */
-static constexpr const char *kProcessOwner = "process.owner";
-
-/**
- * The type of page fault for this data point. Type {@code major} is for major/hard page faults, and
- * {@code minor} is for minor/soft page faults.
- */
-static constexpr const char *kProcessPagingFaultType = "process.paging.fault_type";
-
-/**
- * Parent Process identifier (PPID).
- */
-static constexpr const char *kProcessParentPid = "process.parent_pid";
-
-/**
- * Process identifier (PID).
- */
-static constexpr const char *kProcessPid = "process.pid";
-
-/**
- * The real user ID (RUID) of the process.
- */
-static constexpr const char *kProcessRealUserId = "process.real_user.id";
-
-/**
- * The username of the real user of the process.
- */
-static constexpr const char *kProcessRealUserName = "process.real_user.name";
-
-/**
- * An additional description about the runtime of the process, for example a specific vendor
- * customization of the runtime environment.
- */
-static constexpr const char *kProcessRuntimeDescription = "process.runtime.description";
-
-/**
- * The name of the runtime of this process.
- */
-static constexpr const char *kProcessRuntimeName = "process.runtime.name";
-
-/**
- * The version of the runtime of this process, as returned by the runtime without modification.
- */
-static constexpr const char *kProcessRuntimeVersion = "process.runtime.version";
-
-/**
- * The saved user ID (SUID) of the process.
- */
-static constexpr const char *kProcessSavedUserId = "process.saved_user.id";
-
-/**
- * The username of the saved user.
- */
-static constexpr const char *kProcessSavedUserName = "process.saved_user.name";
-
-/**
- * The PID of the process's session leader. This is also the session ID (SID) of the process.
- */
-static constexpr const char *kProcessSessionLeaderPid = "process.session_leader.pid";
-
-/**
- * The effective user ID (EUID) of the process.
- */
-static constexpr const char *kProcessUserId = "process.user.id";
-
-/**
- * The username of the effective user of the process.
- */
-static constexpr const char *kProcessUserName = "process.user.name";
-
-/**
- * Virtual process identifier.
- *
- * <p>Notes:
-  <ul> <li>The process ID within a PID namespace. This is not necessarily unique across all
- processes on the host but it is unique within the process namespace that the process exists
- within.</li> </ul>
- */
-static constexpr const char *kProcessVpid = "process.vpid";
-
-/**
- * The <a href="https://connect.build/docs/protocol/#error-codes">error codes</a> of the Connect
- * request. Error codes are always string values.
- */
-static constexpr const char *kRpcConnectRpcErrorCode = "rpc.connect_rpc.error_code";
-
-/**
- * The <a href="https://github.com/grpc/grpc/blob/v1.33.2/doc/statuscodes.md">numeric status
- * code</a> of the gRPC request.
- */
-static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
-
-/**
- * {@code error.code} property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
-
-/**
- * {@code error.message} property of response if it is an error response.
- */
-static constexpr const char *kRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
-
-/**
- * {@code id} property of request or response. Since protocol allows id to be int, string, {@code
- * null} or missing (for notifications), value is expected to be cast to string for simplicity. Use
- * empty string in case of {@code null} value. Omit entirely if this is a notification.
- */
-static constexpr const char *kRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
-
-/**
- * Protocol version as in {@code jsonrpc} property of request/response. Since JSON-RPC 1.0 doesn't
- * specify this, the value can be omitted.
- */
-static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
-
-/**
- * Compressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageCompressedSize = "rpc.message.compressed_size";
-
-/**
- * MUST be calculated as two different counters starting from {@code 1} one for sent messages and
- one for received message.
- *
- * <p>Notes:
-  <ul> <li>This way we guarantee that the values will be consistent between different
- implementations.</li> </ul>
- */
-static constexpr const char *kRpcMessageId = "rpc.message.id";
-
-/**
- * Whether this is a received or sent message.
- */
-static constexpr const char *kRpcMessageType = "rpc.message.type";
-
-/**
- * Uncompressed size of the message in bytes.
- */
-static constexpr const char *kRpcMessageUncompressedSize = "rpc.message.uncompressed_size";
-
-/**
- * The name of the (logical) method being called, must be equal to the $method part in the span
- name.
- *
- * <p>Notes:
-  <ul> <li>This is the logical name of the method from the RPC interface perspective, which can be
- different from the name of any implementing method/function. The {@code code.function} attribute
- may be used to store the latter (e.g., method actually executing the call on the server side, RPC
- client stub method on the client side).</li> </ul>
- */
-static constexpr const char *kRpcMethod = "rpc.method";
-
-/**
- * The full (logical) name of the service being called, including its package name, if applicable.
- *
- * <p>Notes:
-  <ul> <li>This is the logical name of the service from the RPC interface perspective, which can be
- different from the name of any implementing class. The {@code code.namespace} attribute may be used
- to store the latter (despite the attribute name, it may include a class name; e.g., class with
- method actually executing the call on the server side, RPC client stub class on the client
- side).</li> </ul>
- */
-static constexpr const char *kRpcService = "rpc.service";
-
-/**
- * A string identifying the remoting system. See below for a list of well-known identifiers.
- */
-static constexpr const char *kRpcSystem = "rpc.system";
-
-/**
- * Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain
- socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the client side, and when communicating through an intermediary,
- {@code server.address} SHOULD represent the server address behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kServerAddress = "server.address";
-
-/**
- * Server port number.
- *
- * <p>Notes:
-  <ul> <li>When observed from the client side, and when communicating through an intermediary,
- {@code server.port} SHOULD represent the server port behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kServerPort = "server.port";
-
-/**
- * The string ID of the service instance.
- *
- * <p>Notes:
-  <ul> <li>MUST be unique for each instance of the same {@code service.namespace,service.name} pair
-(in other words
-{@code service.namespace,service.name,service.instance.id} triplet MUST be globally unique). The ID
-helps to distinguish instances of the same service that exist at the same time (e.g. instances of a
-horizontally scaled service).</li><li>Implementations, such as SDKs, are recommended to generate a
-random Version 1 or Version 4 <a href="https://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a> UUID, but
-are free to use an inherent unique ID as the source of this value if stability is desirable. In that
-case, the ID SHOULD be used as source of a UUID Version 5 and SHOULD use the following UUID as the
-namespace: {@code 4d63009a-8d0f-11ee-aad7-4c796ed8e320}.</li><li>UUIDs are typically recommended, as
-only an opaque value for the purposes of identifying a service instance is needed. Similar to what
-can be seen in the man page for the <a
-href="https://www.freedesktop.org/software/systemd/man/machine-id.html">{@code /etc/machine-id}</a>
-file, the underlying data, such as pod name and namespace should be treated as confidential, being
-the user's choice to expose it or not via another resource attribute.</li><li>For applications
-running behind an application server (like unicorn), we do not recommend using one identifier for
-all processes participating in the application. Instead, it's recommended each division (e.g. a
-worker thread in unicorn) to have its own instance.id.</li><li>It's not recommended for a Collector
-to set {@code service.instance.id} if it can't unambiguously determine the service instance that is
-generating that telemetry. For instance, creating an UUID based on {@code pod.name} will likely be
-wrong, as the Collector might not know from which container within that pod the telemetry
-originated. However, Collectors can set the {@code service.instance.id} if they can unambiguously
-determine the service instance for that telemetry. This is typically the case for scraping
-receivers, as they know the target address and port.</li> </ul>
- */
-static constexpr const char *kServiceInstanceId = "service.instance.id";
-
-/**
- * Logical name of the service.
- *
- * <p>Notes:
-  <ul> <li>MUST be the same for all instances of horizontally scaled services. If the value was not
- specified, SDKs MUST fallback to {@code unknown_service:} concatenated with <a
- href="process.md">{@code process.executable.name}</a>, e.g. {@code unknown_service:bash}. If {@code
- process.executable.name} is not available, the value MUST be set to {@code unknown_service}.</li>
- </ul>
- */
-static constexpr const char *kServiceName = "service.name";
-
-/**
- * A namespace for {@code service.name}.
- *
- * <p>Notes:
-  <ul> <li>A string value having a meaning that helps to distinguish a group of services, for
- example the team name that owns a group of services. {@code service.name} is expected to be unique
- within the same namespace. If {@code service.namespace} is not specified in the Resource then
- {@code service.name} is expected to be unique for all services that have no explicit namespace
- defined (so the empty/unspecified namespace is simply one more valid namespace). Zero-length
- namespace string is assumed equal to unspecified namespace.</li> </ul>
- */
-static constexpr const char *kServiceNamespace = "service.namespace";
-
-/**
- * The version string of the service API or implementation. The format is not defined by these
- * conventions.
- */
-static constexpr const char *kServiceVersion = "service.version";
-
-/**
- * A unique id to identify a session.
- */
-static constexpr const char *kSessionId = "session.id";
-
-/**
- * The previous {@code session.id} for this user, when known.
- */
-static constexpr const char *kSessionPreviousId = "session.previous_id";
-
-/**
- * SignalR HTTP connection closure status.
- */
-static constexpr const char *kSignalrConnectionStatus = "signalr.connection.status";
-
-/**
- * <a
- * href="https://github.com/dotnet/aspnetcore/blob/main/src/SignalR/docs/specs/TransportProtocols.md">SignalR
- * transport type</a>
- */
-static constexpr const char *kSignalrTransport = "signalr.transport";
-
-/**
- * Source address - domain name if available without reverse DNS lookup; otherwise, IP address or
- Unix domain socket name.
- *
- * <p>Notes:
-  <ul> <li>When observed from the destination side, and when communicating through an intermediary,
- {@code source.address} SHOULD represent the source address behind any intermediaries, for example
- proxies, if it's available.</li> </ul>
- */
-static constexpr const char *kSourceAddress = "source.address";
-
-/**
- * Source port number
- */
-static constexpr const char *kSourcePort = "source.port";
-
-/**
- * The device identifier
- */
-static constexpr const char *kSystemDevice = "system.device";
-
-/**
- * The logical CPU number [0..n-1]
- */
-static constexpr const char *kSystemCpuLogicalNumber = "system.cpu.logical_number";
-
-/**
- * The memory state
- */
-static constexpr const char *kSystemMemoryState = "system.memory.state";
-
-/**
- * The paging access direction
- */
-static constexpr const char *kSystemPagingDirection = "system.paging.direction";
-
-/**
- * The memory paging state
- */
-static constexpr const char *kSystemPagingState = "system.paging.state";
-
-/**
- * The memory paging type
- */
-static constexpr const char *kSystemPagingType = "system.paging.type";
-
-/**
- * The filesystem mode
- */
-static constexpr const char *kSystemFilesystemMode = "system.filesystem.mode";
-
-/**
- * The filesystem mount path
- */
-static constexpr const char *kSystemFilesystemMountpoint = "system.filesystem.mountpoint";
-
-/**
- * The filesystem state
- */
-static constexpr const char *kSystemFilesystemState = "system.filesystem.state";
-
-/**
- * The filesystem type
- */
-static constexpr const char *kSystemFilesystemType = "system.filesystem.type";
-
-/**
- * A stateless protocol MUST NOT set this attribute
- */
-static constexpr const char *kSystemNetworkState = "system.network.state";
-
-/**
- * The process state, e.g., <a
- * href="https://man7.org/linux/man-pages/man1/ps.1.html#PROCESS_STATE_CODES">Linux Process State
- * Codes</a>
- */
-static constexpr const char *kSystemProcessStatus = "system.process.status";
-
-/**
- * The language of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
-
-/**
- * The name of the telemetry SDK as defined above.
- *
- * <p>Notes:
-  <ul> <li>The OpenTelemetry SDK MUST set the {@code telemetry.sdk.name} attribute to {@code
-opentelemetry}. If another SDK, like a fork or a vendor-provided implementation, is used, this SDK
-MUST set the
-{@code telemetry.sdk.name} attribute to the fully-qualified class or module name of this SDK's main
-entry point or another suitable identifier depending on the language. The identifier {@code
-opentelemetry} is reserved and MUST NOT be used in this case. All custom identifiers SHOULD be
-stable across different versions of an implementation.</li> </ul>
- */
-static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
-
-/**
- * The version string of the telemetry SDK.
- */
-static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
-
-/**
- * The name of the auto instrumentation agent or distribution, if used.
- *
- * <p>Notes:
-  <ul> <li>Official auto instrumentation agents and distributions SHOULD set the {@code
-telemetry.distro.name} attribute to a string starting with {@code opentelemetry-}, e.g. {@code
-opentelemetry-java-instrumentation}.</li> </ul>
- */
-static constexpr const char *kTelemetryDistroName = "telemetry.distro.name";
-
-/**
- * The version string of the auto instrumentation agent or distribution, if used.
- */
-static constexpr const char *kTelemetryDistroVersion = "telemetry.distro.version";
-
-/**
- * The fully qualified human readable name of the <a
- * href="https://en.wikipedia.org/wiki/Test_case">test case</a>.
- */
-static constexpr const char *kTestCaseName = "test.case.name";
-
-/**
- * The status of the actual test case result from test execution.
- */
-static constexpr const char *kTestCaseResultStatus = "test.case.result.status";
-
-/**
- * The human readable name of a <a href="https://en.wikipedia.org/wiki/Test_suite">test suite</a>.
- */
-static constexpr const char *kTestSuiteName = "test.suite.name";
-
-/**
- * The status of the test suite run.
- */
-static constexpr const char *kTestSuiteRunStatus = "test.suite.run.status";
-
-/**
- * Current &quot;managed&quot; thread ID (as opposed to OS thread ID).
- */
-static constexpr const char *kThreadId = "thread.id";
-
-/**
- * Current thread name.
- */
-static constexpr const char *kThreadName = "thread.name";
-
-/**
- * String indicating the <a
- href="https://datatracker.ietf.org/doc/html/rfc5246#appendix-A.5">cipher</a> used during the
- current connection.
- *
- * <p>Notes:
-  <ul> <li>The values allowed for {@code tls.cipher} MUST be one of the {@code Descriptions} of the
- <a
- href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#table-tls-parameters-4">registered
- TLS Cipher Suits</a>.</li> </ul>
- */
-static constexpr const char *kTlsCipher = "tls.cipher";
-
-/**
- * PEM-encoded stand-alone certificate offered by the client. This is usually mutually-exclusive of
- * {@code client.certificate_chain} since this value also exists in that list.
- */
-static constexpr const char *kTlsClientCertificate = "tls.client.certificate";
-
-/**
- * Array of PEM-encoded certificates that make up the certificate chain offered by the client. This
- * is usually mutually-exclusive of {@code client.certificate} since that value should be the first
- * certificate in the chain.
- */
-static constexpr const char *kTlsClientCertificateChain = "tls.client.certificate_chain";
-
-/**
- * Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
- * client. For consistency with other hash values, this value should be formatted as an uppercase
- * hash.
- */
-static constexpr const char *kTlsClientHashMd5 = "tls.client.hash.md5";
-
-/**
- * Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by
- * the client. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsClientHashSha1 = "tls.client.hash.sha1";
-
-/**
- * Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
- * the client. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsClientHashSha256 = "tls.client.hash.sha256";
-
-/**
- * Distinguished name of <a
- * href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
- * the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientIssuer = "tls.client.issuer";
-
-/**
- * A hash that identifies clients based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsClientJa3 = "tls.client.ja3";
-
-/**
- * Date/Time indicating when client certificate is no longer considered valid.
- */
-static constexpr const char *kTlsClientNotAfter = "tls.client.not_after";
-
-/**
- * Date/Time indicating when client certificate is first considered valid.
- */
-static constexpr const char *kTlsClientNotBefore = "tls.client.not_before";
-
-/**
- * Distinguished name of subject of the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsClientSubject = "tls.client.subject";
-
-/**
- * Array of ciphers offered by the client during the client hello.
- */
-static constexpr const char *kTlsClientSupportedCiphers = "tls.client.supported_ciphers";
-
-/**
- * String indicating the curve used for the given cipher, when applicable
- */
-static constexpr const char *kTlsCurve = "tls.curve";
-
-/**
- * Boolean flag indicating if the TLS negotiation was successful and transitioned to an encrypted
- * tunnel.
- */
-static constexpr const char *kTlsEstablished = "tls.established";
-
-/**
- * String indicating the protocol being tunneled. Per the values in the <a
- * href="https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids">IANA
- * registry</a>, this string should be lower case.
- */
-static constexpr const char *kTlsNextProtocol = "tls.next_protocol";
-
-/**
- * Normalized lowercase protocol name parsed from original string of the negotiated <a
- * href="https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES">SSL/TLS
- * protocol version</a>
- */
-static constexpr const char *kTlsProtocolName = "tls.protocol.name";
-
-/**
- * Numeric part of the version parsed from the original string of the negotiated <a
- * href="https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES">SSL/TLS
- * protocol version</a>
- */
-static constexpr const char *kTlsProtocolVersion = "tls.protocol.version";
-
-/**
- * Boolean flag indicating if this TLS connection was resumed from an existing TLS negotiation.
- */
-static constexpr const char *kTlsResumed = "tls.resumed";
-
-/**
- * PEM-encoded stand-alone certificate offered by the server. This is usually mutually-exclusive of
- * {@code server.certificate_chain} since this value also exists in that list.
- */
-static constexpr const char *kTlsServerCertificate = "tls.server.certificate";
-
-/**
- * Array of PEM-encoded certificates that make up the certificate chain offered by the server. This
- * is usually mutually-exclusive of {@code server.certificate} since that value should be the first
- * certificate in the chain.
- */
-static constexpr const char *kTlsServerCertificateChain = "tls.server.certificate_chain";
-
-/**
- * Certificate fingerprint using the MD5 digest of DER-encoded version of certificate offered by the
- * server. For consistency with other hash values, this value should be formatted as an uppercase
- * hash.
- */
-static constexpr const char *kTlsServerHashMd5 = "tls.server.hash.md5";
-
-/**
- * Certificate fingerprint using the SHA1 digest of DER-encoded version of certificate offered by
- * the server. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsServerHashSha1 = "tls.server.hash.sha1";
-
-/**
- * Certificate fingerprint using the SHA256 digest of DER-encoded version of certificate offered by
- * the server. For consistency with other hash values, this value should be formatted as an
- * uppercase hash.
- */
-static constexpr const char *kTlsServerHashSha256 = "tls.server.hash.sha256";
-
-/**
- * Distinguished name of <a
- * href="https://datatracker.ietf.org/doc/html/rfc5280#section-4.1.2.6">subject</a> of the issuer of
- * the x.509 certificate presented by the client.
- */
-static constexpr const char *kTlsServerIssuer = "tls.server.issuer";
-
-/**
- * A hash that identifies servers based on how they perform an SSL/TLS handshake.
- */
-static constexpr const char *kTlsServerJa3s = "tls.server.ja3s";
-
-/**
- * Date/Time indicating when server certificate is no longer considered valid.
- */
-static constexpr const char *kTlsServerNotAfter = "tls.server.not_after";
-
-/**
- * Date/Time indicating when server certificate is first considered valid.
- */
-static constexpr const char *kTlsServerNotBefore = "tls.server.not_before";
-
-/**
- * Distinguished name of subject of the x.509 certificate presented by the server.
- */
-static constexpr const char *kTlsServerSubject = "tls.server.subject";
-
-/**
- * Domain extracted from the {@code url.full}, such as &quot;opentelemetry.io&quot;.
- *
- * <p>Notes:
-  <ul> <li>In some cases a URL may refer to an IP and/or port directly, without a domain name. In
- this case, the IP address would go to the domain field. If the URL contains a <a
- href="https://www.rfc-editor.org/rfc/rfc2732#section-2">literal IPv6 address</a> enclosed by {@code
- [} and {@code ]}, the {@code [} and {@code ]} characters should also be captured in the domain
- field.</li> </ul>
- */
-static constexpr const char *kUrlDomain = "url.domain";
-
-/**
- * The file extension extracted from the {@code url.full}, excluding the leading dot.
- *
- * <p>Notes:
-  <ul> <li>The file extension is only set if it exists, as not every url has a file extension. When
- the file name has multiple extensions {@code example.tar.gz}, only the last one should be captured
- {@code gz}, not {@code tar.gz}.</li> </ul>
- */
-static constexpr const char *kUrlExtension = "url.extension";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">URI fragment</a> component
- */
-static constexpr const char *kUrlFragment = "url.fragment";
-
-/**
- * Absolute URL describing a network resource according to <a
-href="https://www.rfc-editor.org/rfc/rfc3986">RFC3986</a>
- *
- * <p>Notes:
-  <ul> <li>For network calls, URL usually has {@code scheme://host[:port][path][?query][#fragment]}
-format, where the fragment is not transmitted over HTTP, but if it is known, it SHOULD be included
-nevertheless.
-{@code url.full} MUST NOT contain credentials passed via URL in form of {@code
-https://username:password@www.example.com/}. In such case username and password SHOULD be redacted
-and attribute's value SHOULD be {@code https://REDACTED:REDACTED@www.example.com/}.
-{@code url.full} SHOULD capture the absolute URL when it is available (or can be reconstructed).
-Sensitive content provided in {@code url.full} SHOULD be scrubbed when instrumentations can identify
-it.</li> </ul>
- */
-static constexpr const char *kUrlFull = "url.full";
-
-/**
- * Unmodified original URL as seen in the event source.
- *
- * <p>Notes:
-  <ul> <li>In network monitoring, the observed URL may be a full URL, whereas in access logs, the
-URL is often just represented as a path. This field is meant to represent the URL as it was
-observed, complete or not.
-{@code url.original} might contain credentials passed via URL in form of {@code
-https://username:password@www.example.com/}. In such case password and username SHOULD NOT be
-redacted and attribute's value SHOULD remain the same.</li> </ul>
- */
-static constexpr const char *kUrlOriginal = "url.original";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.3">URI path</a> component
- *
- * <p>Notes:
-  <ul> <li>Sensitive content provided in {@code url.path} SHOULD be scrubbed when instrumentations
- can identify it.</li> </ul>
- */
-static constexpr const char *kUrlPath = "url.path";
-
-/**
- * Port extracted from the {@code url.full}
- */
-static constexpr const char *kUrlPort = "url.port";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.4">URI query</a> component
- *
- * <p>Notes:
-  <ul> <li>Sensitive content provided in {@code url.query} SHOULD be scrubbed when instrumentations
- can identify it.</li> </ul>
- */
-static constexpr const char *kUrlQuery = "url.query";
-
-/**
- * The highest registered url domain, stripped of the subdomain.
- *
- * <p>Notes:
-  <ul> <li>This value can be determined precisely with the <a href="http://publicsuffix.org">public
- suffix list</a>. For example, the registered domain for {@code foo.example.com} is {@code
- example.com}. Trying to approximate this by simply taking the last two labels will not work well
- for TLDs such as {@code co.uk}.</li> </ul>
- */
-static constexpr const char *kUrlRegisteredDomain = "url.registered_domain";
-
-/**
- * The <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.1">URI scheme</a> component
- * identifying the used protocol.
- */
-static constexpr const char *kUrlScheme = "url.scheme";
-
-/**
- * The subdomain portion of a fully qualified domain name includes all of the names except the host
- name under the registered_domain. In a partially qualified domain, or if the qualification level of
- the full name cannot be determined, subdomain contains all of the names below the registered
- domain.
- *
- * <p>Notes:
-  <ul> <li>The subdomain portion of {@code www.east.mydomain.co.uk} is {@code east}. If the domain
- has multiple levels of subdomain, such as {@code sub2.sub1.example.com}, the subdomain field should
- contain {@code sub2.sub1}, with no trailing period.</li> </ul>
- */
-static constexpr const char *kUrlSubdomain = "url.subdomain";
-
-/**
- * The low-cardinality template of an <a
- * href="https://www.rfc-editor.org/rfc/rfc3986#section-4.2">absolute path reference</a>.
- */
-static constexpr const char *kUrlTemplate = "url.template";
-
-/**
- * The effective top level domain (eTLD), also known as the domain suffix, is the last part of the
- domain name. For example, the top level domain for example.com is {@code com}.
- *
- * <p>Notes:
-  <ul> <li>This value can be determined precisely with the <a href="http://publicsuffix.org">public
- suffix list</a>.</li> </ul>
- */
-static constexpr const char *kUrlTopLevelDomain = "url.top_level_domain";
-
-/**
- * Name of the user-agent extracted from original. Usually refers to the browser's name.
- *
- * <p>Notes:
-  <ul> <li><a href="https://www.whatsmyua.info">Example</a> of extracting browser's name from
- original string. In the case of using a user-agent for non-browser products, such as microservices
- with multiple names/versions inside the {@code user_agent.original}, the most significant name
- SHOULD be selected. In such a scenario it should align with {@code user_agent.version}</li> </ul>
- */
-static constexpr const char *kUserAgentName = "user_agent.name";
-
-/**
- * Value of the <a href="https://www.rfc-editor.org/rfc/rfc9110.html#field.user-agent">HTTP
- * User-Agent</a> header sent by the client.
- */
-static constexpr const char *kUserAgentOriginal = "user_agent.original";
-
-/**
- * Version of the user-agent extracted from original. Usually refers to the browser's version
- *
- * <p>Notes:
-  <ul> <li><a href="https://www.whatsmyua.info">Example</a> of extracting browser's version from
- original string. In the case of using a user-agent for non-browser products, such as microservices
- with multiple names/versions inside the {@code user_agent.original}, the most significant version
- SHOULD be selected. In such a scenario it should align with {@code user_agent.name}</li> </ul>
- */
-static constexpr const char *kUserAgentVersion = "user_agent.version";
-
-/**
- * User email address.
- */
-static constexpr const char *kUserEmail = "user.email";
-
-/**
- * User's full name
- */
-static constexpr const char *kUserFullName = "user.full_name";
-
-/**
- * Unique user hash to correlate information for a user in anonymized form.
- *
- * <p>Notes:
-  <ul> <li>Useful if {@code user.id} or {@code user.name} contain confidential information and
- cannot be used.</li> </ul>
- */
-static constexpr const char *kUserHash = "user.hash";
-
-/**
- * Unique identifier of the user.
- */
-static constexpr const char *kUserId = "user.id";
-
-/**
- * Short name or login/username of the user.
- */
-static constexpr const char *kUserName = "user.name";
-
-/**
- * Array of user roles at the time of the event.
- */
-static constexpr const char *kUserRoles = "user.roles";
-
-/**
- * The type of garbage collection.
- */
-static constexpr const char *kV8jsGcType = "v8js.gc.type";
-
-/**
- * The name of the space type of heap memory.
- *
- * <p>Notes:
-  <ul> <li>Value can be retrieved from value {@code space_name} of <a
- href="https://nodejs.org/api/v8.html#v8getheapspacestatistics">{@code
- v8.getHeapSpaceStatistics()}</a></li> </ul>
- */
-static constexpr const char *kV8jsHeapSpaceName = "v8js.heap.space.name";
-
-/**
- * The ID of the change (pull request/merge request) if applicable. This is usually a unique (within
- * repository) identifier generated by the VCS system.
- */
-static constexpr const char *kVcsRepositoryChangeId = "vcs.repository.change.id";
-
-/**
- * The human readable title of the change (pull request/merge request). This title is often a brief
- * summary of the change and may get merged in to a ref as the commit summary.
- */
-static constexpr const char *kVcsRepositoryChangeTitle = "vcs.repository.change.title";
-
-/**
- * The name of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> such as
- * <strong>branch</strong> or <strong>tag</strong> in the repository.
- */
-static constexpr const char *kVcsRepositoryRefName = "vcs.repository.ref.name";
-
-/**
- * The revision, literally <a href="https://www.merriam-webster.com/dictionary/revision">revised
-version</a>, The revision most often refers to a commit object in Git, or a revision number in SVN.
- *
- * <p>Notes:
-  <ul> <li>The revision can be a full <a
-href="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf">hash value (see glossary)</a>, of
-the recorded change to a ref within a repository pointing to a commit <a
-href="https://git-scm.com/docs/git-commit">commit</a> object. It does not necessarily have to be a
-hash; it can simply define a <a
-href="https://svnbook.red-bean.com/en/1.7/svn.tour.revs.specifiers.html">revision number</a> which
-is an integer that is monotonically increasing. In cases where it is identical to the {@code
-ref.name}, it SHOULD still be included. It is up to the implementer to decide which value to set as
-the revision based on the VCS system and situational context.</li> </ul>
- */
-static constexpr const char *kVcsRepositoryRefRevision = "vcs.repository.ref.revision";
-
-/**
- * The type of the <a href="https://git-scm.com/docs/gitglossary#def_ref">reference</a> in the
- * repository.
- */
-static constexpr const char *kVcsRepositoryRefType = "vcs.repository.ref.type";
-
-/**
- * The <a href="https://en.wikipedia.org/wiki/URL">URL</a> of the repository providing the complete
- * address in order to locate and identify the repository.
- */
-static constexpr const char *kVcsRepositoryUrlFull = "vcs.repository.url.full";
-
-/**
- * Additional description of the web engine (e.g. detailed version and edition information).
- */
-static constexpr const char *kWebengineDescription = "webengine.description";
-
-/**
- * The name of the web engine.
- */
-static constexpr const char *kWebengineName = "webengine.name";
-
-/**
- * The version of the web engine.
- */
-static constexpr const char *kWebengineVersion = "webengine.version";
-
-// Enum definitions
-namespace AspnetcoreRateLimitingResultValues
-{
-/** Lease was acquired. */
-static constexpr const char *kAcquired = "acquired";
-/** Lease request was rejected by the endpoint limiter. */
-static constexpr const char *kEndpointLimiter = "endpoint_limiter";
-/** Lease request was rejected by the global limiter. */
-static constexpr const char *kGlobalLimiter = "global_limiter";
-/** Lease request was canceled. */
-static constexpr const char *kRequestCanceled = "request_canceled";
-}  // namespace AspnetcoreRateLimitingResultValues
-
-namespace AspnetcoreDiagnosticsExceptionResultValues
-{
-/** Exception was handled by the exception handling middleware. */
-static constexpr const char *kHandled = "handled";
-/** Exception was not handled by the exception handling middleware. */
-static constexpr const char *kUnhandled = "unhandled";
-/** Exception handling was skipped because the response had started. */
-static constexpr const char *kSkipped = "skipped";
-/** Exception handling didn&#39;t run because the request was aborted. */
-static constexpr const char *kAborted = "aborted";
-}  // namespace AspnetcoreDiagnosticsExceptionResultValues
-
-namespace AspnetcoreRoutingMatchStatusValues
-{
-/** Match succeeded. */
-static constexpr const char *kSuccess = "success";
-/** Match failed. */
-static constexpr const char *kFailure = "failure";
-}  // namespace AspnetcoreRoutingMatchStatusValues
-
-namespace AwsEcsLaunchtypeValues
-{
-/** ec2. */
-static constexpr const char *kEc2 = "ec2";
-/** fargate. */
-static constexpr const char *kFargate = "fargate";
-}  // namespace AwsEcsLaunchtypeValues
-
-namespace CicdPipelineTaskTypeValues
-{
-/** build. */
-static constexpr const char *kBuild = "build";
-/** test. */
-static constexpr const char *kTest = "test";
-/** deploy. */
-static constexpr const char *kDeploy = "deploy";
-}  // namespace CicdPipelineTaskTypeValues
-
-namespace CloudPlatformValues
-{
-/** Alibaba Cloud Elastic Compute Service. */
-static constexpr const char *kAlibabaCloudEcs = "alibaba_cloud_ecs";
-/** Alibaba Cloud Function Compute. */
-static constexpr const char *kAlibabaCloudFc = "alibaba_cloud_fc";
-/** Red Hat OpenShift on Alibaba Cloud. */
-static constexpr const char *kAlibabaCloudOpenshift = "alibaba_cloud_openshift";
-/** AWS Elastic Compute Cloud. */
-static constexpr const char *kAwsEc2 = "aws_ec2";
-/** AWS Elastic Container Service. */
-static constexpr const char *kAwsEcs = "aws_ecs";
-/** AWS Elastic Kubernetes Service. */
-static constexpr const char *kAwsEks = "aws_eks";
-/** AWS Lambda. */
-static constexpr const char *kAwsLambda = "aws_lambda";
-/** AWS Elastic Beanstalk. */
-static constexpr const char *kAwsElasticBeanstalk = "aws_elastic_beanstalk";
-/** AWS App Runner. */
-static constexpr const char *kAwsAppRunner = "aws_app_runner";
-/** Red Hat OpenShift on AWS (ROSA). */
-static constexpr const char *kAwsOpenshift = "aws_openshift";
-/** Azure Virtual Machines. */
-static constexpr const char *kAzureVm = "azure_vm";
-/** Azure Container Apps. */
-static constexpr const char *kAzureContainerApps = "azure_container_apps";
-/** Azure Container Instances. */
-static constexpr const char *kAzureContainerInstances = "azure_container_instances";
-/** Azure Kubernetes Service. */
-static constexpr const char *kAzureAks = "azure_aks";
-/** Azure Functions. */
-static constexpr const char *kAzureFunctions = "azure_functions";
-/** Azure App Service. */
-static constexpr const char *kAzureAppService = "azure_app_service";
-/** Azure Red Hat OpenShift. */
-static constexpr const char *kAzureOpenshift = "azure_openshift";
-/** Google Bare Metal Solution (BMS). */
-static constexpr const char *kGcpBareMetalSolution = "gcp_bare_metal_solution";
-/** Google Cloud Compute Engine (GCE). */
-static constexpr const char *kGcpComputeEngine = "gcp_compute_engine";
-/** Google Cloud Run. */
-static constexpr const char *kGcpCloudRun = "gcp_cloud_run";
-/** Google Cloud Kubernetes Engine (GKE). */
-static constexpr const char *kGcpKubernetesEngine = "gcp_kubernetes_engine";
-/** Google Cloud Functions (GCF). */
-static constexpr const char *kGcpCloudFunctions = "gcp_cloud_functions";
-/** Google Cloud App Engine (GAE). */
-static constexpr const char *kGcpAppEngine = "gcp_app_engine";
-/** Red Hat OpenShift on Google Cloud. */
-static constexpr const char *kGcpOpenshift = "gcp_openshift";
-/** Red Hat OpenShift on IBM Cloud. */
-static constexpr const char *kIbmCloudOpenshift = "ibm_cloud_openshift";
-/** Tencent Cloud Cloud Virtual Machine (CVM). */
-static constexpr const char *kTencentCloudCvm = "tencent_cloud_cvm";
-/** Tencent Cloud Elastic Kubernetes Service (EKS). */
-static constexpr const char *kTencentCloudEks = "tencent_cloud_eks";
-/** Tencent Cloud Serverless Cloud Function (SCF). */
-static constexpr const char *kTencentCloudScf = "tencent_cloud_scf";
-}  // namespace CloudPlatformValues
-
-namespace CloudProviderValues
-{
-/** Alibaba Cloud. */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-/** Amazon Web Services. */
-static constexpr const char *kAws = "aws";
-/** Microsoft Azure. */
-static constexpr const char *kAzure = "azure";
-/** Google Cloud Platform. */
-static constexpr const char *kGcp = "gcp";
-/** Heroku Platform as a Service. */
-static constexpr const char *kHeroku = "heroku";
-/** IBM Cloud. */
-static constexpr const char *kIbmCloud = "ibm_cloud";
-/** Tencent Cloud. */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-}  // namespace CloudProviderValues
-
-namespace CpuModeValues
-{
-/** user. */
-static constexpr const char *kUser = "user";
-/** system. */
-static constexpr const char *kSystem = "system";
-/** nice. */
-static constexpr const char *kNice = "nice";
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** iowait. */
-static constexpr const char *kIowait = "iowait";
-/** interrupt. */
-static constexpr const char *kInterrupt = "interrupt";
-/** steal. */
-static constexpr const char *kSteal = "steal";
-/** kernel. */
-static constexpr const char *kKernel = "kernel";
-}  // namespace CpuModeValues
-
-namespace DbClientConnectionStateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace DbClientConnectionStateValues
-
-namespace DbSystemValues
-{
-/** Some other SQL database. Fallback only. See notes. */
-static constexpr const char *kOtherSql = "other_sql";
-/** Adabas (Adaptable Database System). */
-static constexpr const char *kAdabas = "adabas";
-/** Deprecated, use `intersystems_cache` instead. */
-static constexpr const char *kCache = "cache";
-/** InterSystems Caché. */
-static constexpr const char *kIntersystemsCache = "intersystems_cache";
-/** Apache Cassandra. */
-static constexpr const char *kCassandra = "cassandra";
-/** ClickHouse. */
-static constexpr const char *kClickhouse = "clickhouse";
-/** Deprecated, use `other_sql` instead. */
-static constexpr const char *kCloudscape = "cloudscape";
-/** CockroachDB. */
-static constexpr const char *kCockroachdb = "cockroachdb";
-/** Deprecated, no replacement at this time. */
-static constexpr const char *kColdfusion = "coldfusion";
-/** Microsoft Azure Cosmos DB. */
-static constexpr const char *kCosmosdb = "cosmosdb";
-/** Couchbase. */
-static constexpr const char *kCouchbase = "couchbase";
-/** CouchDB. */
-static constexpr const char *kCouchdb = "couchdb";
-/** IBM Db2. */
-static constexpr const char *kDb2 = "db2";
-/** Apache Derby. */
-static constexpr const char *kDerby = "derby";
-/** Amazon DynamoDB. */
-static constexpr const char *kDynamodb = "dynamodb";
-/** EnterpriseDB. */
-static constexpr const char *kEdb = "edb";
-/** Elasticsearch. */
-static constexpr const char *kElasticsearch = "elasticsearch";
-/** FileMaker. */
-static constexpr const char *kFilemaker = "filemaker";
-/** Firebird. */
-static constexpr const char *kFirebird = "firebird";
-/** Deprecated, use `other_sql` instead. */
-static constexpr const char *kFirstsql = "firstsql";
-/** Apache Geode. */
-static constexpr const char *kGeode = "geode";
-/** H2. */
-static constexpr const char *kH2 = "h2";
-/** SAP HANA. */
-static constexpr const char *kHanadb = "hanadb";
-/** Apache HBase. */
-static constexpr const char *kHbase = "hbase";
-/** Apache Hive. */
-static constexpr const char *kHive = "hive";
-/** HyperSQL DataBase. */
-static constexpr const char *kHsqldb = "hsqldb";
-/** InfluxDB. */
-static constexpr const char *kInfluxdb = "influxdb";
-/** Informix. */
-static constexpr const char *kInformix = "informix";
-/** Ingres. */
-static constexpr const char *kIngres = "ingres";
-/** InstantDB. */
-static constexpr const char *kInstantdb = "instantdb";
-/** InterBase. */
-static constexpr const char *kInterbase = "interbase";
-/** MariaDB. */
-static constexpr const char *kMariadb = "mariadb";
-/** SAP MaxDB. */
-static constexpr const char *kMaxdb = "maxdb";
-/** Memcached. */
-static constexpr const char *kMemcached = "memcached";
-/** MongoDB. */
-static constexpr const char *kMongodb = "mongodb";
-/** Microsoft SQL Server. */
-static constexpr const char *kMssql = "mssql";
-/** Deprecated, Microsoft SQL Server Compact is discontinued. */
-static constexpr const char *kMssqlcompact = "mssqlcompact";
-/** MySQL. */
-static constexpr const char *kMysql = "mysql";
-/** Neo4j. */
-static constexpr const char *kNeo4j = "neo4j";
-/** Netezza. */
-static constexpr const char *kNetezza = "netezza";
-/** OpenSearch. */
-static constexpr const char *kOpensearch = "opensearch";
-/** Oracle Database. */
-static constexpr const char *kOracle = "oracle";
-/** Pervasive PSQL. */
-static constexpr const char *kPervasive = "pervasive";
-/** PointBase. */
-static constexpr const char *kPointbase = "pointbase";
-/** PostgreSQL. */
-static constexpr const char *kPostgresql = "postgresql";
-/** Progress Database. */
-static constexpr const char *kProgress = "progress";
-/** Redis. */
-static constexpr const char *kRedis = "redis";
-/** Amazon Redshift. */
-static constexpr const char *kRedshift = "redshift";
-/** Cloud Spanner. */
-static constexpr const char *kSpanner = "spanner";
-/** SQLite. */
-static constexpr const char *kSqlite = "sqlite";
-/** Sybase. */
-static constexpr const char *kSybase = "sybase";
-/** Teradata. */
-static constexpr const char *kTeradata = "teradata";
-/** Trino. */
-static constexpr const char *kTrino = "trino";
-/** Vertica. */
-static constexpr const char *kVertica = "vertica";
-}  // namespace DbSystemValues
-
-namespace DbCassandraConsistencyLevelValues
-{
-/** all. */
-static constexpr const char *kAll = "all";
-/** each_quorum. */
-static constexpr const char *kEachQuorum = "each_quorum";
-/** quorum. */
-static constexpr const char *kQuorum = "quorum";
-/** local_quorum. */
-static constexpr const char *kLocalQuorum = "local_quorum";
-/** one. */
-static constexpr const char *kOne = "one";
-/** two. */
-static constexpr const char *kTwo = "two";
-/** three. */
-static constexpr const char *kThree = "three";
-/** local_one. */
-static constexpr const char *kLocalOne = "local_one";
-/** any. */
-static constexpr const char *kAny = "any";
-/** serial. */
-static constexpr const char *kSerial = "serial";
-/** local_serial. */
-static constexpr const char *kLocalSerial = "local_serial";
-}  // namespace DbCassandraConsistencyLevelValues
-
-namespace DbCosmosdbConnectionModeValues
-{
-/** Gateway (HTTP) connections mode. */
-static constexpr const char *kGateway = "gateway";
-/** Direct connection. */
-static constexpr const char *kDirect = "direct";
-}  // namespace DbCosmosdbConnectionModeValues
-
-namespace DbCosmosdbOperationTypeValues
-{
-/** invalid. */
-static constexpr const char *kInvalid = "Invalid";
-/** create. */
-static constexpr const char *kCreate = "Create";
-/** patch. */
-static constexpr const char *kPatch = "Patch";
-/** read. */
-static constexpr const char *kRead = "Read";
-/** read_feed. */
-static constexpr const char *kReadFeed = "ReadFeed";
-/** delete. */
-static constexpr const char *kDelete = "Delete";
-/** replace. */
-static constexpr const char *kReplace = "Replace";
-/** execute. */
-static constexpr const char *kExecute = "Execute";
-/** query. */
-static constexpr const char *kQuery = "Query";
-/** head. */
-static constexpr const char *kHead = "Head";
-/** head_feed. */
-static constexpr const char *kHeadFeed = "HeadFeed";
-/** upsert. */
-static constexpr const char *kUpsert = "Upsert";
-/** batch. */
-static constexpr const char *kBatch = "Batch";
-/** query_plan. */
-static constexpr const char *kQueryPlan = "QueryPlan";
-/** execute_javascript. */
-static constexpr const char *kExecuteJavascript = "ExecuteJavaScript";
-}  // namespace DbCosmosdbOperationTypeValues
-
-namespace DeploymentStatusValues
-{
-/** failed. */
-static constexpr const char *kFailed = "failed";
-/** succeeded. */
-static constexpr const char *kSucceeded = "succeeded";
-}  // namespace DeploymentStatusValues
-
-namespace AndroidStateValues
-{
-/** Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has
- * been called in the app for the first time. */
-static constexpr const char *kCreated = "created";
-/** Any time after Activity.onPause() or, if the app has no Activity, Context.stopService() has been
- * called when the app was in the foreground state. */
-static constexpr const char *kBackground = "background";
-/** Any time after Activity.onResume() or, if the app has no Activity, Context.startService() has
- * been called when the app was in either the created or background states. */
-static constexpr const char *kForeground = "foreground";
-}  // namespace AndroidStateValues
-
-namespace ContainerCpuStateValues
-{
-/** When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode
- * (Windows). */
-static constexpr const char *kUser = "user";
-/** When CPU is used by the system (host OS). */
-static constexpr const char *kSystem = "system";
-/** When tasks of the cgroup are in kernel mode (Linux). When all container processes are in kernel
- * mode (Windows). */
-static constexpr const char *kKernel = "kernel";
-}  // namespace ContainerCpuStateValues
-
-namespace DbClientConnectionsStateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace DbClientConnectionsStateValues
-
-namespace StateValues
-{
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** used. */
-static constexpr const char *kUsed = "used";
-}  // namespace StateValues
-
-namespace HttpFlavorValues
-{
-/** HTTP/1.0. */
-static constexpr const char *kHttp10 = "1.0";
-/** HTTP/1.1. */
-static constexpr const char *kHttp11 = "1.1";
-/** HTTP/2. */
-static constexpr const char *kHttp20 = "2.0";
-/** HTTP/3. */
-static constexpr const char *kHttp30 = "3.0";
-/** SPDY protocol. */
-static constexpr const char *kSpdy = "SPDY";
-/** QUIC protocol. */
-static constexpr const char *kQuic = "QUIC";
-}  // namespace HttpFlavorValues
-
-namespace IosStateValues
-{
-/** The app has become `active`. Associated with UIKit notification `applicationDidBecomeActive`. */
-static constexpr const char *kActive = "active";
-/** The app is now `inactive`. Associated with UIKit notification `applicationWillResignActive`. */
-static constexpr const char *kInactive = "inactive";
-/** The app is now in the background. This value is associated with UIKit notification
- * `applicationDidEnterBackground`. */
-static constexpr const char *kBackground = "background";
-/** The app is now in the foreground. This value is associated with UIKit notification
- * `applicationWillEnterForeground`. */
-static constexpr const char *kForeground = "foreground";
-/** The app is about to terminate. Associated with UIKit notification `applicationWillTerminate`. */
-static constexpr const char *kTerminate = "terminate";
-}  // namespace IosStateValues
-
-namespace NetSockFamilyValues
-{
-/** IPv4 address. */
-static constexpr const char *kInet = "inet";
-/** IPv6 address. */
-static constexpr const char *kInet6 = "inet6";
-/** Unix domain socket path. */
-static constexpr const char *kUnix = "unix";
-}  // namespace NetSockFamilyValues
-
-namespace NetTransportValues
-{
-/** ip_tcp. */
-static constexpr const char *kIpTcp = "ip_tcp";
-/** ip_udp. */
-static constexpr const char *kIpUdp = "ip_udp";
-/** Named or anonymous pipe. */
-static constexpr const char *kPipe = "pipe";
-/** In-process communication. */
-static constexpr const char *kInproc = "inproc";
-/** Something else (non IP-based). */
-static constexpr const char *kOther = "other";
-}  // namespace NetTransportValues
-
-namespace ProcessCpuStateValues
-{
-/** system. */
-static constexpr const char *kSystem = "system";
-/** user. */
-static constexpr const char *kUser = "user";
-/** wait. */
-static constexpr const char *kWait = "wait";
-}  // namespace ProcessCpuStateValues
-
-namespace MessageTypeValues
-{
-/** sent. */
-static constexpr const char *kSent = "SENT";
-/** received. */
-static constexpr const char *kReceived = "RECEIVED";
-}  // namespace MessageTypeValues
-
-namespace SystemCpuStateValues
-{
-/** user. */
-static constexpr const char *kUser = "user";
-/** system. */
-static constexpr const char *kSystem = "system";
-/** nice. */
-static constexpr const char *kNice = "nice";
-/** idle. */
-static constexpr const char *kIdle = "idle";
-/** iowait. */
-static constexpr const char *kIowait = "iowait";
-/** interrupt. */
-static constexpr const char *kInterrupt = "interrupt";
-/** steal. */
-static constexpr const char *kSteal = "steal";
-}  // namespace SystemCpuStateValues
-
-namespace SystemProcessesStatusValues
-{
-/** running. */
-static constexpr const char *kRunning = "running";
-/** sleeping. */
-static constexpr const char *kSleeping = "sleeping";
-/** stopped. */
-static constexpr const char *kStopped = "stopped";
-/** defunct. */
-static constexpr const char *kDefunct = "defunct";
-}  // namespace SystemProcessesStatusValues
-
-namespace DiskIoDirectionValues
-{
-/** read. */
-static constexpr const char *kRead = "read";
-/** write. */
-static constexpr const char *kWrite = "write";
-}  // namespace DiskIoDirectionValues
-
-namespace ErrorTypeValues
-{
-/** A fallback error value to be used when the instrumentation doesn&#39;t define a custom value. */
-static constexpr const char *kOther = "_OTHER";
-}  // namespace ErrorTypeValues
-
-namespace FaasDocumentOperationValues
-{
-/** When a new object is created. */
-static constexpr const char *kInsert = "insert";
-/** When an object is modified. */
-static constexpr const char *kEdit = "edit";
-/** When an object is deleted. */
-static constexpr const char *kDelete = "delete";
-}  // namespace FaasDocumentOperationValues
-
-namespace FaasInvokedProviderValues
-{
-/** Alibaba Cloud. */
-static constexpr const char *kAlibabaCloud = "alibaba_cloud";
-/** Amazon Web Services. */
-static constexpr const char *kAws = "aws";
-/** Microsoft Azure. */
-static constexpr const char *kAzure = "azure";
-/** Google Cloud Platform. */
-static constexpr const char *kGcp = "gcp";
-/** Tencent Cloud. */
-static constexpr const char *kTencentCloud = "tencent_cloud";
-}  // namespace FaasInvokedProviderValues
-
-namespace FaasTriggerValues
-{
-/** A response to some data source operation such as a database or filesystem read/write. */
-static constexpr const char *kDatasource = "datasource";
-/** To provide an answer to an inbound HTTP request. */
-static constexpr const char *kHttp = "http";
-/** A function is set to be executed when messages are sent to a messaging system. */
-static constexpr const char *kPubsub = "pubsub";
-/** A function is scheduled to be executed regularly. */
-static constexpr const char *kTimer = "timer";
-/** If none of the others apply. */
-static constexpr const char *kOther = "other";
-}  // namespace FaasTriggerValues
-
-namespace GenAiOperationNameValues
-{
-/** Chat completion operation such as [OpenAI Chat
- * API](https://platform.openai.com/docs/api-reference/chat). */
-static constexpr const char *kChat = "chat";
-/** Text completions operation such as [OpenAI Completions API
- * (Legacy)](https://platform.openai.com/docs/api-reference/completions). */
-static constexpr const char *kTextCompletion = "text_completion";
-}  // namespace GenAiOperationNameValues
-
-namespace GenAiSystemValues
-{
-/** OpenAI. */
-static constexpr const char *kOpenai = "openai";
-/** Vertex AI. */
-static constexpr const char *kVertexAi = "vertex_ai";
-/** Anthropic. */
-static constexpr const char *kAnthropic = "anthropic";
-/** Cohere. */
-static constexpr const char *kCohere = "cohere";
-}  // namespace GenAiSystemValues
-
-namespace GenAiTokenTypeValues
-{
-/** Input tokens (prompt, input, etc.). */
-static constexpr const char *kInput = "input";
-/** Output tokens (completion, response, etc.). */
-static constexpr const char *kCompletion = "output";
-}  // namespace GenAiTokenTypeValues
-
-namespace GoMemoryTypeValues
-{
-/** Memory allocated from the heap that is reserved for stack space, whether or not it is currently
- * in-use. */
-static constexpr const char *kStack = "stack";
-/** Memory used by the Go runtime, excluding other categories of memory usage described in this
- * enumeration. */
-static constexpr const char *kOther = "other";
-}  // namespace GoMemoryTypeValues
-
-namespace GraphqlOperationTypeValues
-{
-/** GraphQL query. */
-static constexpr const char *kQuery = "query";
-/** GraphQL mutation. */
-static constexpr const char *kMutation = "mutation";
-/** GraphQL subscription. */
-static constexpr const char *kSubscription = "subscription";
-}  // namespace GraphqlOperationTypeValues
-
-namespace HostArchValues
-{
-/** AMD64. */
-static constexpr const char *kAmd64 = "amd64";
-/** ARM32. */
-static constexpr const char *kArm32 = "arm32";
-/** ARM64. */
-static constexpr const char *kArm64 = "arm64";
-/** Itanium. */
-static constexpr const char *kIa64 = "ia64";
-/** 32-bit PowerPC. */
-static constexpr const char *kPpc32 = "ppc32";
-/** 64-bit PowerPC. */
-static constexpr const char *kPpc64 = "ppc64";
-/** IBM z/Architecture. */
-static constexpr const char *kS390x = "s390x";
-/** 32-bit x86. */
-static constexpr const char *kX86 = "x86";
-}  // namespace HostArchValues
-
-namespace HttpConnectionStateValues
-{
-/** active state. */
-static constexpr const char *kActive = "active";
-/** idle state. */
-static constexpr const char *kIdle = "idle";
-}  // namespace HttpConnectionStateValues
-
-namespace HttpRequestMethodValues
-{
-/** CONNECT method. */
-static constexpr const char *kConnect = "CONNECT";
-/** DELETE method. */
-static constexpr const char *kDelete = "DELETE";
-/** GET method. */
-static constexpr const char *kGet = "GET";
-/** HEAD method. */
-static constexpr const char *kHead = "HEAD";
-/** OPTIONS method. */
-static constexpr const char *kOptions = "OPTIONS";
-/** PATCH method. */
-static constexpr const char *kPatch = "PATCH";
-/** POST method. */
-static constexpr const char *kPost = "POST";
-/** PUT method. */
-static constexpr const char *kPut = "PUT";
-/** TRACE method. */
-static constexpr const char *kTrace = "TRACE";
-/** Any HTTP method that the instrumentation has no prior knowledge of. */
-static constexpr const char *kOther = "_OTHER";
-}  // namespace HttpRequestMethodValues
-
-namespace JvmMemoryTypeValues
-{
-/** Heap memory. */
-static constexpr const char *kHeap = "heap";
-/** Non-heap memory. */
-static constexpr const char *kNonHeap = "non_heap";
-}  // namespace JvmMemoryTypeValues
-
-namespace JvmThreadStateValues
-{
-/** A thread that has not yet started is in this state. */
-static constexpr const char *kNew = "new";
-/** A thread executing in the Java virtual machine is in this state. */
-static constexpr const char *kRunnable = "runnable";
-/** A thread that is blocked waiting for a monitor lock is in this state. */
-static constexpr const char *kBlocked = "blocked";
-/** A thread that is waiting indefinitely for another thread to perform a particular action is in
- * this state. */
-static constexpr const char *kWaiting = "waiting";
-/** A thread that is waiting for another thread to perform an action for up to a specified waiting
- * time is in this state. */
-static constexpr const char *kTimedWaiting = "timed_waiting";
-/** A thread that has exited is in this state. */
-static constexpr const char *kTerminated = "terminated";
-}  // namespace JvmThreadStateValues
-
-namespace LinuxMemorySlabStateValues
-{
-/** reclaimable. */
-static constexpr const char *kReclaimable = "reclaimable";
-/** unreclaimable. */
-static constexpr const char *kUnreclaimable = "unreclaimable";
-}  // namespace LinuxMemorySlabStateValues
-
-namespace LogIostreamValues
-{
-/** Logs from stdout stream. */
-static constexpr const char *kStdout = "stdout";
-/** Events from stderr stream. */
-static constexpr const char *kStderr = "stderr";
-}  // namespace LogIostreamValues
-
-namespace MessagingOperationTypeValues
-{
-/** One or more messages are provided for publishing to an intermediary. If a single message is
- * published, the context of the &#34;Publish&#34; span can be used as the creation context and no
- * &#34;Create&#34; span needs to be created. */
-static constexpr const char *kPublish = "publish";
-/** A message is created. &#34;Create&#34; spans always refer to a single message and are used to
- * provide a unique creation context for messages in batch publishing scenarios. */
-static constexpr const char *kCreate = "create";
-/** One or more messages are requested by a consumer. This operation refers to pull-based scenarios,
- * where consumers explicitly call methods of messaging SDKs to receive messages. */
-static constexpr const char *kReceive = "receive";
-/** One or more messages are processed by a consumer. */
-static constexpr const char *kProcess = "process";
-/** One or more messages are settled. */
-static constexpr const char *kSettle = "settle";
-/** Deprecated. Use `process` instead. */
-static constexpr const char *kDeliver = "deliver";
-}  // namespace MessagingOperationTypeValues
-
-namespace MessagingSystemValues
-{
-/** Apache ActiveMQ. */
-static constexpr const char *kActivemq = "activemq";
-/** Amazon Simple Queue Service (SQS). */
-static constexpr const char *kAwsSqs = "aws_sqs";
-/** Azure Event Grid. */
-static constexpr const char *kEventgrid = "eventgrid";
-/** Azure Event Hubs. */
-static constexpr const char *kEventhubs = "eventhubs";
-/** Azure Service Bus. */
-static constexpr const char *kServicebus = "servicebus";
-/** Google Cloud Pub/Sub. */
-static constexpr const char *kGcpPubsub = "gcp_pubsub";
-/** Java Message Service. */
-static constexpr const char *kJms = "jms";
-/** Apache Kafka. */
-static constexpr const char *kKafka = "kafka";
-/** RabbitMQ. */
-static constexpr const char *kRabbitmq = "rabbitmq";
-/** Apache RocketMQ. */
-static constexpr const char *kRocketmq = "rocketmq";
-/** Apache Pulsar. */
-static constexpr const char *kPulsar = "pulsar";
-}  // namespace MessagingSystemValues
-
-namespace MessagingRocketmqConsumptionModelValues
-{
-/** Clustering consumption model. */
-static constexpr const char *kClustering = "clustering";
-/** Broadcasting consumption model. */
-static constexpr const char *kBroadcasting = "broadcasting";
-}  // namespace MessagingRocketmqConsumptionModelValues
-
-namespace MessagingRocketmqMessageTypeValues
-{
-/** Normal message. */
-static constexpr const char *kNormal = "normal";
-/** FIFO message. */
-static constexpr const char *kFifo = "fifo";
-/** Delay message. */
-static constexpr const char *kDelay = "delay";
-/** Transaction message. */
-static constexpr const char *kTransaction = "transaction";
-}  // namespace MessagingRocketmqMessageTypeValues
-
-namespace MessagingServicebusDispositionStatusValues
-{
-/** Message is completed. */
-static constexpr const char *kComplete = "complete";
-/** Message is abandoned. */
-static constexpr const char *kAbandon = "abandon";
-/** Message is sent to dead letter queue. */
-static constexpr const char *kDeadLetter = "dead_letter";
-/** Message is deferred. */
-static constexpr const char *kDefer = "defer";
-}  // namespace MessagingServicebusDispositionStatusValues
-
-namespace NetworkConnectionSubtypeValues
-{
-/** GPRS. */
-static constexpr const char *kGprs = "gprs";
-/** EDGE. */
-static constexpr const char *kEdge = "edge";
-/** UMTS. */
-static constexpr const char *kUmts = "umts";
-/** CDMA. */
-static constexpr const char *kCdma = "cdma";
-/** EVDO Rel. 0. */
-static constexpr const char *kEvdo0 = "evdo_0";
-/** EVDO Rev. A. */
-static constexpr const char *kEvdoA = "evdo_a";
-/** CDMA2000 1XRTT. */
-static constexpr const char *kCdma20001xrtt = "cdma2000_1xrtt";
-/** HSDPA. */
-static constexpr const char *kHsdpa = "hsdpa";
-/** HSUPA. */
-static constexpr const char *kHsupa = "hsupa";
-/** HSPA. */
-static constexpr const char *kHspa = "hspa";
-/** IDEN. */
-static constexpr const char *kIden = "iden";
-/** EVDO Rev. B. */
-static constexpr const char *kEvdoB = "evdo_b";
-/** LTE. */
-static constexpr const char *kLte = "lte";
-/** EHRPD. */
-static constexpr const char *kEhrpd = "ehrpd";
-/** HSPAP. */
-static constexpr const char *kHspap = "hspap";
-/** GSM. */
-static constexpr const char *kGsm = "gsm";
-/** TD-SCDMA. */
-static constexpr const char *kTdScdma = "td_scdma";
-/** IWLAN. */
-static constexpr const char *kIwlan = "iwlan";
-/** 5G NR (New Radio). */
-static constexpr const char *kNr = "nr";
-/** 5G NRNSA (New Radio Non-Standalone). */
-static constexpr const char *kNrnsa = "nrnsa";
-/** LTE CA. */
-static constexpr const char *kLteCa = "lte_ca";
-}  // namespace NetworkConnectionSubtypeValues
-
-namespace NetworkConnectionTypeValues
-{
-/** wifi. */
-static constexpr const char *kWifi = "wifi";
-/** wired. */
-static constexpr const char *kWired = "wired";
-/** cell. */
-static constexpr const char *kCell = "cell";
-/** unavailable. */
-static constexpr const char *kUnavailable = "unavailable";
-/** unknown. */
-static constexpr const char *kUnknown = "unknown";
-}  // namespace NetworkConnectionTypeValues
-
-namespace NetworkIoDirectionValues
-{
-/** transmit. */
-static constexpr const char *kTransmit = "transmit";
-/** receive. */
-static constexpr const char *kReceive = "receive";
-}  // namespace NetworkIoDirectionValues
-
-namespace NetworkTransportValues
-{
-/** TCP. */
-static constexpr const char *kTcp = "tcp";
-/** UDP. */
-static constexpr const char *kUdp = "udp";
-/** Named or anonymous pipe. */
-static constexpr const char *kPipe = "pipe";
-/** Unix domain socket. */
-static constexpr const char *kUnix = "unix";
-/** QUIC. */
-static constexpr const char *kQuic = "quic";
-}  // namespace NetworkTransportValues
-
-namespace NetworkTypeValues
-{
-/** IPv4. */
-static constexpr const char *kIpv4 = "ipv4";
-/** IPv6. */
-static constexpr const char *kIpv6 = "ipv6";
-}  // namespace NetworkTypeValues
-
-namespace OpentracingRefTypeValues
-{
-/** The parent Span depends on the child Span in some capacity. */
-static constexpr const char *kChildOf = "child_of";
-/** The parent Span doesn&#39;t depend in any way on the result of the child Span. */
-static constexpr const char *kFollowsFrom = "follows_from";
-}  // namespace OpentracingRefTypeValues
-
-namespace OsTypeValues
-{
-/** Microsoft Windows. */
-static constexpr const char *kWindows = "windows";
-/** Linux. */
-static constexpr const char *kLinux = "linux";
-/** Apple Darwin. */
-static constexpr const char *kDarwin = "darwin";
-/** FreeBSD. */
-static constexpr const char *kFreebsd = "freebsd";
-/** NetBSD. */
-static constexpr const char *kNetbsd = "netbsd";
-/** OpenBSD. */
-static constexpr const char *kOpenbsd = "openbsd";
-/** DragonFly BSD. */
-static constexpr const char *kDragonflybsd = "dragonflybsd";
-/** HP-UX (Hewlett Packard Unix). */
-static constexpr const char *kHpux = "hpux";
-/** AIX (Advanced Interactive eXecutive). */
-static constexpr const char *kAix = "aix";
-/** SunOS, Oracle Solaris. */
-static constexpr const char *kSolaris = "solaris";
-/** IBM z/OS. */
-static constexpr const char *kZOs = "z_os";
-}  // namespace OsTypeValues
-
-namespace OtelStatusCodeValues
-{
-/** The operation has been validated by an Application developer or Operator to have completed
- * successfully. */
-static constexpr const char *kOk = "OK";
-/** The operation contains an error. */
-static constexpr const char *kError = "ERROR";
-}  // namespace OtelStatusCodeValues
-
-namespace ProcessContextSwitchTypeValues
-{
-/** voluntary. */
-static constexpr const char *kVoluntary = "voluntary";
-/** involuntary. */
-static constexpr const char *kInvoluntary = "involuntary";
-}  // namespace ProcessContextSwitchTypeValues
-
-namespace ProcessPagingFaultTypeValues
-{
-/** major. */
-static constexpr const char *kMajor = "major";
-/** minor. */
-static constexpr const char *kMinor = "minor";
-}  // namespace ProcessPagingFaultTypeValues
-
-namespace RpcConnectRpcErrorCodeValues
-{
-/** cancelled. */
-static constexpr const char *kCancelled = "cancelled";
-/** unknown. */
-static constexpr const char *kUnknown = "unknown";
-/** invalid_argument. */
-static constexpr const char *kInvalidArgument = "invalid_argument";
-/** deadline_exceeded. */
-static constexpr const char *kDeadlineExceeded = "deadline_exceeded";
-/** not_found. */
-static constexpr const char *kNotFound = "not_found";
-/** already_exists. */
-static constexpr const char *kAlreadyExists = "already_exists";
-/** permission_denied. */
-static constexpr const char *kPermissionDenied = "permission_denied";
-/** resource_exhausted. */
-static constexpr const char *kResourceExhausted = "resource_exhausted";
-/** failed_precondition. */
-static constexpr const char *kFailedPrecondition = "failed_precondition";
-/** aborted. */
-static constexpr const char *kAborted = "aborted";
-/** out_of_range. */
-static constexpr const char *kOutOfRange = "out_of_range";
-/** unimplemented. */
-static constexpr const char *kUnimplemented = "unimplemented";
-/** internal. */
-static constexpr const char *kInternal = "internal";
-/** unavailable. */
-static constexpr const char *kUnavailable = "unavailable";
-/** data_loss. */
-static constexpr const char *kDataLoss = "data_loss";
-/** unauthenticated. */
-static constexpr const char *kUnauthenticated = "unauthenticated";
-}  // namespace RpcConnectRpcErrorCodeValues
-
-namespace RpcGrpcStatusCodeValues
-{
-/** OK. */
-static constexpr const int kOk = 0;
-/** CANCELLED. */
-static constexpr const int kCancelled = 1;
-/** UNKNOWN. */
-static constexpr const int kUnknown = 2;
-/** INVALID_ARGUMENT. */
-static constexpr const int kInvalidArgument = 3;
-/** DEADLINE_EXCEEDED. */
-static constexpr const int kDeadlineExceeded = 4;
-/** NOT_FOUND. */
-static constexpr const int kNotFound = 5;
-/** ALREADY_EXISTS. */
-static constexpr const int kAlreadyExists = 6;
-/** PERMISSION_DENIED. */
-static constexpr const int kPermissionDenied = 7;
-/** RESOURCE_EXHAUSTED. */
-static constexpr const int kResourceExhausted = 8;
-/** FAILED_PRECONDITION. */
-static constexpr const int kFailedPrecondition = 9;
-/** ABORTED. */
-static constexpr const int kAborted = 10;
-/** OUT_OF_RANGE. */
-static constexpr const int kOutOfRange = 11;
-/** UNIMPLEMENTED. */
-static constexpr const int kUnimplemented = 12;
-/** INTERNAL. */
-static constexpr const int kInternal = 13;
-/** UNAVAILABLE. */
-static constexpr const int kUnavailable = 14;
-/** DATA_LOSS. */
-static constexpr const int kDataLoss = 15;
-/** UNAUTHENTICATED. */
-static constexpr const int kUnauthenticated = 16;
-}  // namespace RpcGrpcStatusCodeValues
-
-namespace RpcMessageTypeValues
-{
-/** sent. */
-static constexpr const char *kSent = "SENT";
-/** received. */
-static constexpr const char *kReceived = "RECEIVED";
-}  // namespace RpcMessageTypeValues
-
-namespace RpcSystemValues
-{
-/** gRPC. */
-static constexpr const char *kGrpc = "grpc";
-/** Java RMI. */
-static constexpr const char *kJavaRmi = "java_rmi";
-/** .NET WCF. */
-static constexpr const char *kDotnetWcf = "dotnet_wcf";
-/** Apache Dubbo. */
-static constexpr const char *kApacheDubbo = "apache_dubbo";
-/** Connect RPC. */
-static constexpr const char *kConnectRpc = "connect_rpc";
-}  // namespace RpcSystemValues
-
-namespace SignalrConnectionStatusValues
-{
-/** The connection was closed normally. */
-static constexpr const char *kNormalClosure = "normal_closure";
-/** The connection was closed due to a timeout. */
-static constexpr const char *kTimeout = "timeout";
-/** The connection was closed because the app is shutting down. */
-static constexpr const char *kAppShutdown = "app_shutdown";
-}  // namespace SignalrConnectionStatusValues
-
-namespace SignalrTransportValues
-{
-/** ServerSentEvents protocol. */
-static constexpr const char *kServerSentEvents = "server_sent_events";
-/** LongPolling protocol. */
-static constexpr const char *kLongPolling = "long_polling";
-/** WebSockets protocol. */
-static constexpr const char *kWebSockets = "web_sockets";
-}  // namespace SignalrTransportValues
-
-namespace SystemMemoryStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-/** shared. */
-static constexpr const char *kShared = "shared";
-/** buffers. */
-static constexpr const char *kBuffers = "buffers";
-/** cached. */
-static constexpr const char *kCached = "cached";
-}  // namespace SystemMemoryStateValues
-
-namespace SystemPagingDirectionValues
-{
-/** in. */
-static constexpr const char *kIn = "in";
-/** out. */
-static constexpr const char *kOut = "out";
-}  // namespace SystemPagingDirectionValues
-
-namespace SystemPagingStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-}  // namespace SystemPagingStateValues
-
-namespace SystemPagingTypeValues
-{
-/** major. */
-static constexpr const char *kMajor = "major";
-/** minor. */
-static constexpr const char *kMinor = "minor";
-}  // namespace SystemPagingTypeValues
-
-namespace SystemFilesystemStateValues
-{
-/** used. */
-static constexpr const char *kUsed = "used";
-/** free. */
-static constexpr const char *kFree = "free";
-/** reserved. */
-static constexpr const char *kReserved = "reserved";
-}  // namespace SystemFilesystemStateValues
-
-namespace SystemFilesystemTypeValues
-{
-/** fat32. */
-static constexpr const char *kFat32 = "fat32";
-/** exfat. */
-static constexpr const char *kExfat = "exfat";
-/** ntfs. */
-static constexpr const char *kNtfs = "ntfs";
-/** refs. */
-static constexpr const char *kRefs = "refs";
-/** hfsplus. */
-static constexpr const char *kHfsplus = "hfsplus";
-/** ext4. */
-static constexpr const char *kExt4 = "ext4";
-}  // namespace SystemFilesystemTypeValues
-
-namespace SystemNetworkStateValues
-{
-/** close. */
-static constexpr const char *kClose = "close";
-/** close_wait. */
-static constexpr const char *kCloseWait = "close_wait";
-/** closing. */
-static constexpr const char *kClosing = "closing";
-/** delete. */
-static constexpr const char *kDelete = "delete";
-/** established. */
-static constexpr const char *kEstablished = "established";
-/** fin_wait_1. */
-static constexpr const char *kFinWait1 = "fin_wait_1";
-/** fin_wait_2. */
-static constexpr const char *kFinWait2 = "fin_wait_2";
-/** last_ack. */
-static constexpr const char *kLastAck = "last_ack";
-/** listen. */
-static constexpr const char *kListen = "listen";
-/** syn_recv. */
-static constexpr const char *kSynRecv = "syn_recv";
-/** syn_sent. */
-static constexpr const char *kSynSent = "syn_sent";
-/** time_wait. */
-static constexpr const char *kTimeWait = "time_wait";
-}  // namespace SystemNetworkStateValues
-
-namespace SystemProcessStatusValues
-{
-/** running. */
-static constexpr const char *kRunning = "running";
-/** sleeping. */
-static constexpr const char *kSleeping = "sleeping";
-/** stopped. */
-static constexpr const char *kStopped = "stopped";
-/** defunct. */
-static constexpr const char *kDefunct = "defunct";
-}  // namespace SystemProcessStatusValues
-
-namespace TelemetrySdkLanguageValues
-{
-/** cpp. */
-static constexpr const char *kCpp = "cpp";
-/** dotnet. */
-static constexpr const char *kDotnet = "dotnet";
-/** erlang. */
-static constexpr const char *kErlang = "erlang";
-/** go. */
-static constexpr const char *kGo = "go";
-/** java. */
-static constexpr const char *kJava = "java";
-/** nodejs. */
-static constexpr const char *kNodejs = "nodejs";
-/** php. */
-static constexpr const char *kPhp = "php";
-/** python. */
-static constexpr const char *kPython = "python";
-/** ruby. */
-static constexpr const char *kRuby = "ruby";
-/** rust. */
-static constexpr const char *kRust = "rust";
-/** swift. */
-static constexpr const char *kSwift = "swift";
-/** webjs. */
-static constexpr const char *kWebjs = "webjs";
-}  // namespace TelemetrySdkLanguageValues
-
-namespace TestCaseResultStatusValues
-{
-/** pass. */
-static constexpr const char *kPass = "pass";
-/** fail. */
-static constexpr const char *kFail = "fail";
-}  // namespace TestCaseResultStatusValues
-
-namespace TestSuiteRunStatusValues
-{
-/** success. */
-static constexpr const char *kSuccess = "success";
-/** failure. */
-static constexpr const char *kFailure = "failure";
-/** skipped. */
-static constexpr const char *kSkipped = "skipped";
-/** aborted. */
-static constexpr const char *kAborted = "aborted";
-/** timed_out. */
-static constexpr const char *kTimedOut = "timed_out";
-/** in_progress. */
-static constexpr const char *kInProgress = "in_progress";
-}  // namespace TestSuiteRunStatusValues
-
-namespace TlsProtocolNameValues
-{
-/** ssl. */
-static constexpr const char *kSsl = "ssl";
-/** tls. */
-static constexpr const char *kTls = "tls";
-}  // namespace TlsProtocolNameValues
-
-namespace V8jsGcTypeValues
-{
-/** Major (Mark Sweep Compact). */
-static constexpr const char *kMajor = "major";
-/** Minor (Scavenge). */
-static constexpr const char *kMinor = "minor";
-/** Incremental (Incremental Marking). */
-static constexpr const char *kIncremental = "incremental";
-/** Weak Callbacks (Process Weak Callbacks). */
-static constexpr const char *kWeakcb = "weakcb";
-}  // namespace V8jsGcTypeValues
-
-namespace V8jsHeapSpaceNameValues
-{
-/** New memory space. */
-static constexpr const char *kNewSpace = "new_space";
-/** Old memory space. */
-static constexpr const char *kOldSpace = "old_space";
-/** Code memory space. */
-static constexpr const char *kCodeSpace = "code_space";
-/** Map memory space. */
-static constexpr const char *kMapSpace = "map_space";
-/** Large object memory space. */
-static constexpr const char *kLargeObjectSpace = "large_object_space";
-}  // namespace V8jsHeapSpaceNameValues
-
-namespace VcsRepositoryRefTypeValues
-{
-/** [branch](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefbranchabranch). */
-static constexpr const char *kBranch = "branch";
-/** [tag](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddeftagatag). */
-static constexpr const char *kTag = "tag";
-}  // namespace VcsRepositoryRefTypeValues
-
-}  // namespace SemanticConventions
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span.h
deleted file mode 100644
index f26e38e4e..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span.h
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_metadata.h"
-
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-class Tracer;
-
-/**
- * A Span represents a single operation within a Trace.
- *
- * Span attributes can be provided:
- * - at span creation time, using Tracer::StartSpan(),
- * - during the span lifetime, using Span::SetAttribute()
- *
- * Please note that head samplers,
- * in the SDK (@ref opentelemetry::sdk::trace::Sampler),
- * can only make sampling decisions based on data known
- * at span creation time.
- *
- * When attributes are known early, adding attributes
- * with @ref opentelemetry::trace::Tracer::StartSpan() is preferable.
- *
- * Attributes added or changed with Span::SetAttribute()
- * can not change a sampler decision.
- *
- * Likewise, links can be provided:
- * - at span creation time, using Tracer::StartSpan(),
- * - during the span lifetime, using Span::AddLink() or Span::AddLinks().
- *
- * When links are known early, adding links
- * with @ref opentelemetry::trace::Tracer::StartSpan() is preferable.
- *
- * Links added with Span::AddLink() or Span::AddLinks()
- * can not change a sampler decision.
- */
-class Span
-{
-public:
-  // Note that Spans should be created using the Tracer class. Please refer to
-  // tracer.h for documentation.
-  Span() = default;
-
-  // The Span destructor End()s the Span, if it hasn't been ended already.
-  virtual ~Span() = default;
-
-  // Not copiable or movable.
-  Span(const Span &)            = delete;
-  Span(Span &&)                 = delete;
-  Span &operator=(const Span &) = delete;
-  Span &operator=(Span &&)      = delete;
-
-  /**
-   * Sets an attribute on the Span (ABI).
-   *
-   * If the Span previously contained a mapping for the key,
-   * the old value is replaced.
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   */
-  virtual void SetAttribute(nostd::string_view key,
-                            const common::AttributeValue &value) noexcept = 0;
-
-  // Adds an event to the Span.
-  virtual void AddEvent(nostd::string_view name) noexcept = 0;
-
-  // Adds an event to the Span, with a custom timestamp.
-  virtual void AddEvent(nostd::string_view name, common::SystemTimestamp timestamp) noexcept = 0;
-
-  // Adds an event to the Span, with a custom timestamp, and attributes.
-  virtual void AddEvent(nostd::string_view name,
-                        common::SystemTimestamp timestamp,
-                        const common::KeyValueIterable &attributes) noexcept = 0;
-
-  virtual void AddEvent(nostd::string_view name,
-                        const common::KeyValueIterable &attributes) noexcept
-  {
-    this->AddEvent(name, std::chrono::system_clock::now(), attributes);
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  void AddEvent(nostd::string_view name,
-                common::SystemTimestamp timestamp,
-                const T &attributes) noexcept
-  {
-    this->AddEvent(name, timestamp, common::KeyValueIterableView<T>{attributes});
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  void AddEvent(nostd::string_view name, const T &attributes) noexcept
-  {
-    this->AddEvent(name, common::KeyValueIterableView<T>{attributes});
-  }
-
-  void AddEvent(nostd::string_view name,
-                common::SystemTimestamp timestamp,
-                std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                    attributes) noexcept
-  {
-    this->AddEvent(name, timestamp,
-                   nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                       attributes.begin(), attributes.end()});
-  }
-
-  void AddEvent(nostd::string_view name,
-                std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>
-                    attributes) noexcept
-  {
-    this->AddEvent(name, std::chrono::system_clock::now(),
-                   nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                       attributes.begin(), attributes.end()});
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Add link (ABI).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  virtual void AddLink(const SpanContext &target,
-                       const common::KeyValueIterable &attrs) noexcept = 0;
-
-  /**
-   * Add links (ABI).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  virtual void AddLinks(const SpanContextKeyValueIterable &links) noexcept = 0;
-
-  /**
-   * Add link (API helper).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  void AddLink(const SpanContext &target, const U &attrs)
-  {
-    common::KeyValueIterableView<U> view(attrs);
-    this->AddLink(target, view);
-  }
-
-  /**
-   * Add link (API helper).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  void AddLink(const SpanContext &target,
-               std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attrs)
-  {
-    /* Build a container from std::initializer_list. */
-    nostd::span<const std::pair<nostd::string_view, common::AttributeValue>> container{
-        attrs.begin(), attrs.end()};
-
-    /* Build a view on the container. */
-    common::KeyValueIterableView<
-        nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>>
-        view(container);
-
-    return this->AddLink(target, view);
-  }
-
-  /**
-   * Add links (API helper).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  template <class U, nostd::enable_if_t<detail::is_span_context_kv_iterable<U>::value> * = nullptr>
-  void AddLinks(const U &links)
-  {
-    SpanContextKeyValueIterableView<U> view(links);
-    this->AddLinks(view);
-  }
-
-  /**
-   * Add links (API helper).
-   *
-   * See comments about sampling in @ref opentelemetry::trace::Span
-   *
-   * @since ABI_VERSION 2
-   */
-  void AddLinks(
-      std::initializer_list<
-          std::pair<SpanContext,
-                    std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>
-          links)
-  {
-    /* Build a container from std::initializer_list. */
-    nostd::span<const std::pair<
-        SpanContext, std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>
-        container{links.begin(), links.end()};
-
-    /* Build a view on the container. */
-    SpanContextKeyValueIterableView<nostd::span<const std::pair<
-        SpanContext, std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>>
-        view(container);
-
-    return this->AddLinks(view);
-  }
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-  // Sets the status of the span. The default status is Unset. Only the value of
-  // the last call will be
-  // recorded, and implementations are free to ignore previous calls.
-  virtual void SetStatus(StatusCode code, nostd::string_view description = "") noexcept = 0;
-
-  // Updates the name of the Span. If used, this will override the name provided
-  // during creation.
-  virtual void UpdateName(nostd::string_view name) noexcept = 0;
-
-  /**
-   * Mark the end of the Span.
-   * Only the timing of the first End call for a given Span will be recorded,
-   * and implementations are free to ignore all further calls.
-   * @param options can be used to manually define span properties like the end
-   * timestamp
-   */
-  virtual void End(const trace::EndSpanOptions &options = {}) noexcept = 0;
-
-  virtual trace::SpanContext GetContext() const noexcept = 0;
-
-  // Returns true if this Span is recording tracing events (e.g. SetAttribute,
-  // AddEvent).
-  virtual bool IsRecording() const noexcept = 0;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context.h
deleted file mode 100644
index a1948231b..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <stdint.h>
-
-#include <utility>
-
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/span_id.h"
-#include "opentelemetry/trace/trace_flags.h"
-#include "opentelemetry/trace/trace_id.h"
-#include "opentelemetry/trace/trace_state.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-/* SpanContext contains the state that must propagate to child Spans and across
- * process boundaries. It contains TraceId and SpanId, TraceFlags, TraceState
- * and whether it was propagated from a remote parent.
- */
-class SpanContext final
-{
-public:
-  /* A temporary constructor for an invalid SpanContext.
-   * Trace id and span id are set to invalid (all zeros).
-   *
-   * @param sampled_flag a required parameter specifying if child spans should be
-   * sampled
-   * @param is_remote true if this context was propagated from a remote parent.
-   */
-  SpanContext(bool sampled_flag, bool is_remote) noexcept
-      : trace_id_(),
-        span_id_(),
-        trace_flags_(trace::TraceFlags(static_cast<uint8_t>(sampled_flag))),
-        is_remote_(is_remote),
-        trace_state_(TraceState::GetDefault())
-  {}
-
-  SpanContext(TraceId trace_id,
-              SpanId span_id,
-              TraceFlags trace_flags,
-              bool is_remote,
-              nostd::shared_ptr<TraceState> trace_state = TraceState::GetDefault()) noexcept
-      : trace_id_(trace_id),
-        span_id_(span_id),
-        trace_flags_(trace_flags),
-        is_remote_(is_remote),
-        trace_state_(std::move(trace_state))
-  {}
-
-  SpanContext(const SpanContext &ctx) = default;
-
-  // @returns whether this context is valid
-  bool IsValid() const noexcept { return trace_id_.IsValid() && span_id_.IsValid(); }
-
-  // @returns the trace_flags associated with this span_context
-  const trace::TraceFlags &trace_flags() const noexcept { return trace_flags_; }
-
-  // @returns the trace_id associated with this span_context
-  const trace::TraceId &trace_id() const noexcept { return trace_id_; }
-
-  // @returns the span_id associated with this span_context
-  const trace::SpanId &span_id() const noexcept { return span_id_; }
-
-  // @returns the trace_state associated with this span_context
-  const nostd::shared_ptr<trace::TraceState> &trace_state() const noexcept { return trace_state_; }
-
-  /*
-   * @param that SpanContext for comparing.
-   * @return true if `that` equals the current SpanContext.
-   * N.B. trace_state is ignored for the comparison.
-   */
-  bool operator==(const SpanContext &that) const noexcept
-  {
-    return trace_id() == that.trace_id() && span_id() == that.span_id() &&
-           trace_flags() == that.trace_flags();
-  }
-
-  SpanContext &operator=(const SpanContext &ctx) = default;
-
-  bool IsRemote() const noexcept { return is_remote_; }
-
-  static SpanContext GetInvalid() noexcept { return SpanContext(false, false); }
-
-  bool IsSampled() const noexcept { return trace_flags_.IsSampled(); }
-
-private:
-  trace::TraceId trace_id_;
-  trace::SpanId span_id_;
-  trace::TraceFlags trace_flags_;
-  bool is_remote_;
-  nostd::shared_ptr<trace::TraceState> trace_state_;
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context_kv_iterable.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context_kv_iterable.h
deleted file mode 100644
index aed347427..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context_kv_iterable.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/attribute_value.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-/**
- * Supports internal iteration over a collection of SpanContext/key-value pairs.
- */
-class SpanContextKeyValueIterable
-{
-public:
-  virtual ~SpanContextKeyValueIterable() = default;
-
-  /**
-   * Iterate over SpanContext/key-value pairs
-   * @param callback a callback to invoke for each key-value for each SpanContext.
-   * If the callback returns false, the iteration is aborted.
-   * @return true if every SpanContext/key-value pair was iterated over
-   */
-  virtual bool ForEachKeyValue(
-      nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)> callback)
-      const noexcept = 0;
-  /**
-   * @return the number of key-value pairs
-   */
-  virtual size_t size() const noexcept = 0;
-};
-
-/**
- * @brief Null Span context that does not carry any information.
- */
-class NullSpanContext : public SpanContextKeyValueIterable
-{
-public:
-  bool ForEachKeyValue(nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)>
-                       /* callback */) const noexcept override
-  {
-    return true;
-  }
-
-  size_t size() const noexcept override { return 0; }
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context_kv_iterable_view.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context_kv_iterable_view.h
deleted file mode 100644
index 8c4584dc2..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_context_kv_iterable_view.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <iterator>
-#include <type_traits>
-#include <utility>
-
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/utility.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_context_kv_iterable.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-// NOTE - code within `detail` namespace implements internal details, and not part
-// of the public interface.
-namespace detail
-{
-template <class T>
-inline void take_span_context_kv(SpanContext, opentelemetry::common::KeyValueIterableView<T>)
-{}
-
-template <class T, nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-inline void take_span_context_kv(SpanContext, T &)
-{}
-
-inline void take_span_context_kv(
-    SpanContext,
-    std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>)
-{}
-
-template <class T>
-auto is_span_context_kv_iterable_impl(T iterable)
-    -> decltype(take_span_context_kv(std::begin(iterable)->first, std::begin(iterable)->second),
-                nostd::size(iterable),
-                std::true_type{});
-
-std::false_type is_span_context_kv_iterable_impl(...);
-
-template <class T>
-struct is_span_context_kv_iterable
-{
-  static const bool value =
-      decltype(detail::is_span_context_kv_iterable_impl(std::declval<T>()))::value;
-};
-}  // namespace detail
-
-template <class T>
-class SpanContextKeyValueIterableView final : public SpanContextKeyValueIterable
-{
-  static_assert(detail::is_span_context_kv_iterable<T>::value,
-                "Must be a context/key-value iterable");
-
-public:
-  explicit SpanContextKeyValueIterableView(const T &links) noexcept : container_{&links} {}
-
-  bool ForEachKeyValue(nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)>
-                           callback) const noexcept override
-  {
-    auto iter = std::begin(*container_);
-    auto last = std::end(*container_);
-    for (; iter != last; ++iter)
-    {
-      if (!this->do_callback(iter->first, iter->second, callback))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  size_t size() const noexcept override { return nostd::size(*container_); }
-
-private:
-  const T *container_;
-
-  bool do_callback(SpanContext span_context,
-                   const common::KeyValueIterable &attributes,
-                   nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)>
-                       callback) const noexcept
-  {
-    if (!callback(span_context, attributes))
-    {
-      return false;
-    }
-    return true;
-  }
-
-  template <class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<U>::value> * = nullptr>
-  bool do_callback(SpanContext span_context,
-                   const U &attributes,
-                   nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)>
-                       callback) const noexcept
-  {
-    return do_callback(span_context, common::KeyValueIterableView<U>(attributes), callback);
-  }
-
-  bool do_callback(
-      SpanContext span_context,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      nostd::function_ref<bool(SpanContext, const common::KeyValueIterable &)> callback)
-      const noexcept
-  {
-    return do_callback(span_context,
-                       nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                           attributes.begin(), attributes.end()},
-                       callback);
-  }
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_id.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_id.h
deleted file mode 100644
index 19511040d..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_id.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-#include <cstring>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-class SpanId final
-{
-public:
-  // The size in bytes of the SpanId.
-  static constexpr int kSize = 8;
-
-  // An invalid SpanId (all zeros).
-  SpanId() noexcept : rep_{0} {}
-
-  // Creates a SpanId with the given ID.
-  explicit SpanId(nostd::span<const uint8_t, kSize> id) noexcept { memcpy(rep_, id.data(), kSize); }
-
-  // Populates the buffer with the lowercase base16 representation of the ID.
-  void ToLowerBase16(nostd::span<char, 2 * kSize> buffer) const noexcept
-  {
-    constexpr char kHex[] = "0123456789abcdef";
-    for (int i = 0; i < kSize; ++i)
-    {
-      buffer[i * 2 + 0] = kHex[(rep_[i] >> 4) & 0xF];
-      buffer[i * 2 + 1] = kHex[(rep_[i] >> 0) & 0xF];
-    }
-  }
-
-  // Returns a nostd::span of the ID.
-  nostd::span<const uint8_t, kSize> Id() const noexcept
-  {
-    return nostd::span<const uint8_t, kSize>(rep_);
-  }
-
-  bool operator==(const SpanId &that) const noexcept { return memcmp(rep_, that.rep_, kSize) == 0; }
-
-  bool operator!=(const SpanId &that) const noexcept { return !(*this == that); }
-
-  // Returns false if the SpanId is all zeros.
-  bool IsValid() const noexcept
-  {
-    static constexpr uint8_t kEmptyRep[kSize] = {0};
-    return memcmp(rep_, kEmptyRep, kSize) != 0;
-  }
-
-  // Copies the opaque SpanId data to dest.
-  void CopyBytesTo(nostd::span<uint8_t, kSize> dest) const noexcept
-  {
-    memcpy(dest.data(), rep_, kSize);
-  }
-
-private:
-  uint8_t rep_[kSize];
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_metadata.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_metadata.h
deleted file mode 100644
index d2d6a9f85..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_metadata.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-enum class SpanKind
-{
-  kInternal,
-  kServer,
-  kClient,
-  kProducer,
-  kConsumer,
-};
-
-// The key identifies the active span in the current context.
-constexpr char kSpanKey[]       = "active_span";
-constexpr char kIsRootSpanKey[] = "is_root_span";
-
-// StatusCode - Represents the canonical set of status codes of a finished Span.
-enum class StatusCode
-{
-  kUnset,  // default status
-  kOk,     // Operation has completed successfully.
-  kError   // The operation contains an error
-};
-
-/**
- * EndSpanOptions provides options to set properties of a Span when it is
- * ended.
- */
-struct EndSpanOptions
-{
-  // Optionally sets the end time of a Span.
-  common::SteadyTimestamp end_steady_time;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_startoptions.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_startoptions.h
deleted file mode 100644
index 8a2165b0f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/span_startoptions.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/variant.h"
-#include "opentelemetry/trace/span_context.h"
-#include "opentelemetry/trace/span_metadata.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * StartSpanOptions provides options to set properties of a Span at the time of
- * its creation
- */
-struct StartSpanOptions
-{
-  // Optionally sets the start time of a Span.
-  //
-  // If the start time of a Span is set, timestamps from both the system clock
-  // and steady clock must be provided.
-  //
-  // Timestamps from the steady clock can be used to most accurately measure a
-  // Span's duration, while timestamps from the system clock can be used to most
-  // accurately place a Span's
-  // time point relative to other Spans collected across a distributed system.
-  common::SystemTimestamp start_system_time;
-  common::SteadyTimestamp start_steady_time;
-
-  // Explicitly set the parent of a Span.
-  //
-  // The `parent` field is designed to establish  parent-child relationships
-  // in tracing spans. It can be set to either a `SpanContext` or a
-  // `context::Context` object.
-  //
-  // - When set to valid `SpanContext`, it directly assigns a specific Span as the parent
-  // of the newly created Span.
-  //
-  // - Alternatively, setting the `parent` field to a `context::Context` allows for
-  // more nuanced parent identification:
-  //   1. If the `Context` contains a Span object, this Span is treated as the parent.
-  //   2. If the `Context` contains the boolean flag `is_root_span` set to `true`,
-  //      it indicates that the new Span should be treated as a root Span, i.e., it
-  //      does not have a parent Span.
-  //   Example Usage:
-  //   ```cpp
-  //   trace_api::StartSpanOptions options;
-  //   opentelemetry::context::Context root;
-  //   root                    = root.SetValue(kIsRootSpanKey, true);
-  //   options.parent = root;
-  //   auto root_span = tracer->StartSpan("span root", options);
-  //  ```
-  //
-  // - If the `parent` field is not set, the newly created Span will inherit the
-  // parent of the currently active Span (if any) in the current context.
-  //
-  nostd::variant<SpanContext, context::Context> parent = SpanContext::GetInvalid();
-
-  // TODO:
-  // SpanContext remote_parent;
-  // Links
-  SpanKind kind = SpanKind::kInternal;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_flags.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_flags.h
deleted file mode 100644
index 0ad9dc136..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_flags.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-// TraceFlags represents options for a Trace. These options are propagated to all child Spans
-// and determine features such as whether a Span should be traced. TraceFlags
-// are implemented as a bitmask.
-class TraceFlags final
-{
-public:
-  static constexpr uint8_t kIsSampled = 1;
-  static constexpr uint8_t kIsRandom  = 2;
-
-  /**
-   * Valid flags in W3C Trace Context version 1.
-   * See https://www.w3.org/TR/trace-context-1/#trace-flags
-   */
-  static constexpr uint8_t kAllW3CTraceContext1Flags = kIsSampled;
-
-  /**
-   * Valid flags in W3C Trace Context version 2.
-   * See https://www.w3.org/TR/trace-context-1/#trace-flags
-   */
-  static constexpr uint8_t kAllW3CTraceContext2Flags = kIsSampled | kIsRandom;
-
-  TraceFlags() noexcept : rep_{0} {}
-
-  explicit TraceFlags(uint8_t flags) noexcept : rep_(flags) {}
-
-  bool IsSampled() const noexcept { return rep_ & kIsSampled; }
-
-  bool IsRandom() const noexcept { return rep_ & kIsRandom; }
-
-  // Populates the buffer with the lowercase base16 representation of the flags.
-  void ToLowerBase16(nostd::span<char, 2> buffer) const noexcept
-  {
-    constexpr char kHex[] = "0123456789ABCDEF";
-    buffer[0]             = kHex[(rep_ >> 4) & 0xF];
-    buffer[1]             = kHex[(rep_ >> 0) & 0xF];
-  }
-
-  uint8_t flags() const noexcept { return rep_; }
-
-  bool operator==(const TraceFlags &that) const noexcept { return rep_ == that.rep_; }
-
-  bool operator!=(const TraceFlags &that) const noexcept { return !(*this == that); }
-
-  // Copies the TraceFlags to dest.
-  void CopyBytesTo(nostd::span<uint8_t, 1> dest) const noexcept { dest[0] = rep_; }
-
-private:
-  uint8_t rep_;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_id.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_id.h
deleted file mode 100644
index 3a262c7a6..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_id.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <cstdint>
-#include <cstring>
-
-#include "opentelemetry/nostd/span.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-// TraceId represents an opaque 128-bit trace identifier. The trace identifier
-// remains constant across the trace. A valid trace identifier is a 16-byte array with at
-// least one non-zero byte.
-class TraceId final
-{
-public:
-  // The size in bytes of the TraceId.
-  static constexpr int kSize = 16;
-
-  // An invalid TraceId (all zeros).
-  TraceId() noexcept : rep_{0} {}
-
-  // Creates a TraceId with the given ID.
-  explicit TraceId(nostd::span<const uint8_t, kSize> id) noexcept
-  {
-    memcpy(rep_, id.data(), kSize);
-  }
-
-  // Populates the buffer with the lowercase base16 representation of the ID.
-  void ToLowerBase16(nostd::span<char, 2 * kSize> buffer) const noexcept
-  {
-    constexpr char kHex[] = "0123456789abcdef";
-    for (int i = 0; i < kSize; ++i)
-    {
-      buffer[i * 2 + 0] = kHex[(rep_[i] >> 4) & 0xF];
-      buffer[i * 2 + 1] = kHex[(rep_[i] >> 0) & 0xF];
-    }
-  }
-
-  // Returns a nostd::span of the ID.
-  nostd::span<const uint8_t, kSize> Id() const noexcept
-  {
-    return nostd::span<const uint8_t, kSize>(rep_);
-  }
-
-  bool operator==(const TraceId &that) const noexcept
-  {
-    return memcmp(rep_, that.rep_, kSize) == 0;
-  }
-
-  bool operator!=(const TraceId &that) const noexcept { return !(*this == that); }
-
-  // Returns false if the TraceId is all zeros.
-  bool IsValid() const noexcept { return *this != TraceId(); }
-
-  // Copies the opaque TraceId data to dest.
-  void CopyBytesTo(nostd::span<uint8_t, kSize> dest) const noexcept
-  {
-    memcpy(dest.data(), rep_, kSize);
-  }
-
-private:
-  uint8_t rep_[kSize];
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_state.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_state.h
deleted file mode 100644
index df7a0e0fe..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/trace_state.h
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <ctype.h>
-#include <cstddef>
-#include <string>
-#include <vector>
-
-#include "opentelemetry/common/kv_properties.h"
-#include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/version.h"
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-#  include <regex>
-#endif
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-/**
- * TraceState carries tracing-system specific context in a list of key-value pairs. TraceState
- * allows different vendors to propagate additional information and inter-operate with their legacy
- * id formats.
- *
- * For more information, see the W3C Trace Context specification:
- * https://www.w3.org/TR/trace-context
- */
-class OPENTELEMETRY_EXPORT TraceState
-{
-public:
-  static constexpr int kKeyMaxSize         = 256;
-  static constexpr int kValueMaxSize       = 256;
-  static constexpr int kMaxKeyValuePairs   = 32;
-  static constexpr auto kKeyValueSeparator = '=';
-  static constexpr auto kMembersSeparator  = ',';
-
-  OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<TraceState> GetDefault()
-  {
-    static nostd::shared_ptr<TraceState> ts{new TraceState()};
-    return ts;
-  }
-
-  /**
-   * Returns shared_ptr to a newly created TraceState parsed from the header provided.
-   * @param header Encoding of the tracestate header defined by
-   * the W3C Trace Context specification https://www.w3.org/TR/trace-context/
-   * @return TraceState A new TraceState instance or DEFAULT
-   */
-  static nostd::shared_ptr<TraceState> FromHeader(nostd::string_view header) noexcept
-  {
-
-    common::KeyValueStringTokenizer kv_str_tokenizer(header);
-    size_t cnt = kv_str_tokenizer.NumTokens();  // upper bound on number of kv pairs
-    if (cnt > kMaxKeyValuePairs)
-    {
-      // trace state should be discarded if count exceeds
-      return GetDefault();
-    }
-
-    nostd::shared_ptr<TraceState> ts(new TraceState(cnt));
-    bool kv_valid;
-    nostd::string_view key, value;
-    while (kv_str_tokenizer.next(kv_valid, key, value) && ts->kv_properties_->Size() < cnt)
-    {
-      if (kv_valid == false)
-      {
-        return GetDefault();
-      }
-
-      if (!IsValidKey(key) || !IsValidValue(value))
-      {
-        // invalid header. return empty TraceState
-        ts->kv_properties_.reset(new common::KeyValueProperties());
-        break;
-      }
-
-      ts->kv_properties_->AddEntry(key, value);
-    }
-
-    return ts;
-  }
-
-  /**
-   * Creates a w3c tracestate header from TraceState object
-   */
-  std::string ToHeader() const noexcept
-  {
-    std::string header_s;
-    bool first = true;
-    kv_properties_->GetAllEntries(
-        [&header_s, &first](nostd::string_view key, nostd::string_view value) noexcept {
-          if (!first)
-          {
-            header_s.append(1, kMembersSeparator);
-          }
-          else
-          {
-            first = false;
-          }
-          header_s.append(std::string(key.data(), key.size()));
-          header_s.append(1, kKeyValueSeparator);
-          header_s.append(std::string(value.data(), value.size()));
-          return true;
-        });
-    return header_s;
-  }
-
-  /**
-   *  Returns `value` associated with `key` passed as argument
-   *  Returns empty string if key is invalid  or not found
-   */
-  bool Get(nostd::string_view key, std::string &value) const noexcept
-  {
-    if (!IsValidKey(key))
-    {
-      return false;
-    }
-
-    return kv_properties_->GetValue(key, value);
-  }
-
-  /**
-   * Returns shared_ptr of `new` TraceState object with following mutations applied to the existing
-   * instance: Update Key value: The updated value must be moved to beginning of List Add : The new
-   * key-value pair SHOULD be added to beginning of List
-   *
-   * If the provided key-value pair is invalid, or results in transtate that violates the
-   * tracecontext specification, empty TraceState instance will be returned.
-   *
-   * If the existing object has maximum list members, it's copy is returned.
-   */
-  nostd::shared_ptr<TraceState> Set(const nostd::string_view &key,
-                                    const nostd::string_view &value) noexcept
-  {
-    auto curr_size = kv_properties_->Size();
-    if (!IsValidKey(key) || !IsValidValue(value))
-    {
-      // max size reached or invalid key/value. Returning empty TraceState
-      return TraceState::GetDefault();
-    }
-    auto allocate_size = curr_size;
-    if (curr_size < kMaxKeyValuePairs)
-    {
-      allocate_size += 1;
-    }
-    nostd::shared_ptr<TraceState> ts(new TraceState(allocate_size));
-    if (curr_size < kMaxKeyValuePairs)
-    {
-      // add new field first
-      ts->kv_properties_->AddEntry(key, value);
-    }
-    // add rest of the fields.
-    kv_properties_->GetAllEntries([&ts](nostd::string_view key, nostd::string_view value) {
-      ts->kv_properties_->AddEntry(key, value);
-      return true;
-    });
-    return ts;
-  }
-
-  /**
-   * Returns shared_ptr to a `new` TraceState object after removing the attribute with given key (
-   * if present )
-   * @returns empty TraceState object if key is invalid
-   * @returns copy of original TraceState object if key is not present (??)
-   */
-  nostd::shared_ptr<TraceState> Delete(const nostd::string_view &key) noexcept
-  {
-    if (!IsValidKey(key))
-    {
-      return TraceState::GetDefault();
-    }
-    auto curr_size     = kv_properties_->Size();
-    auto allocate_size = curr_size;
-    std::string unused;
-    if (kv_properties_->GetValue(key, unused))
-    {
-      allocate_size -= 1;
-    }
-    nostd::shared_ptr<TraceState> ts(new TraceState(allocate_size));
-    kv_properties_->GetAllEntries(
-        [&ts, &key](nostd::string_view e_key, nostd::string_view e_value) {
-          if (key != e_key)
-            ts->kv_properties_->AddEntry(e_key, e_value);
-          return true;
-        });
-    return ts;
-  }
-
-  // Returns true if there are no keys, false otherwise.
-  bool Empty() const noexcept { return kv_properties_->Size() == 0; }
-
-  // @return all key-values entris by repeatedly invoking the function reference passed as argument
-  // for each entry
-  bool GetAllEntries(
-      nostd::function_ref<bool(nostd::string_view, nostd::string_view)> callback) const noexcept
-  {
-    return kv_properties_->GetAllEntries(callback);
-  }
-  /** Returns whether key is a valid key. See https://www.w3.org/TR/trace-context/#key
-   * Identifiers MUST begin with a lowercase letter or a digit, and can only contain
-   * lowercase letters (a-z), digits (0-9), underscores (_), dashes (-), asterisks (*),
-   * and forward slashes (/).
-   * For multi-tenant vendor scenarios, an at sign (@) can be used to prefix the vendor name.
-   *
-   */
-  static bool IsValidKey(nostd::string_view key)
-  {
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-    return IsValidKeyRegEx(key);
-#else
-    return IsValidKeyNonRegEx(key);
-#endif
-  }
-
-  /** Returns whether value is a valid value. See https://www.w3.org/TR/trace-context/#value
-   * The value is an opaque string containing up to 256 printable ASCII (RFC0020)
-   *  characters ((i.e., the range 0x20 to 0x7E) except comma , and equal =)
-   */
-  static bool IsValidValue(nostd::string_view value)
-  {
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-    return IsValidValueRegEx(value);
-#else
-    return IsValidValueNonRegEx(value);
-#endif
-  }
-
-private:
-  TraceState() : kv_properties_(new common::KeyValueProperties()) {}
-  TraceState(size_t size) : kv_properties_(new common::KeyValueProperties(size)) {}
-
-  static nostd::string_view TrimString(nostd::string_view str, size_t left, size_t right)
-  {
-    while (str[static_cast<std::size_t>(right)] == ' ' && left < right)
-    {
-      right--;
-    }
-    while (str[static_cast<std::size_t>(left)] == ' ' && left < right)
-    {
-      left++;
-    }
-    return str.substr(left, right - left + 1);
-  }
-
-#if OPENTELEMETRY_HAVE_WORKING_REGEX
-  static bool IsValidKeyRegEx(nostd::string_view key)
-  {
-    static std::regex reg_key("^[a-z0-9][a-z0-9*_\\-/]{0,255}$");
-    static std::regex reg_key_multitenant(
-        "^[a-z0-9][a-z0-9*_\\-/]{0,240}(@)[a-z0-9][a-z0-9*_\\-/]{0,13}$");
-    std::string key_s(key.data(), key.size());
-    if (std::regex_match(key_s, reg_key) || std::regex_match(key_s, reg_key_multitenant))
-    {
-      return true;
-    }
-    return false;
-  }
-
-  static bool IsValidValueRegEx(nostd::string_view value)
-  {
-    // Hex 0x20 to 0x2B, 0x2D to 0x3C, 0x3E to 0x7E
-    static std::regex reg_value(
-        "^[\\x20-\\x2B\\x2D-\\x3C\\x3E-\\x7E]{0,255}[\\x21-\\x2B\\x2D-\\x3C\\x3E-\\x7E]$");
-    // Need to benchmark without regex, as a string object is created here.
-    return std::regex_match(std::string(value.data(), value.size()), reg_value);
-  }
-#else
-  static bool IsValidKeyNonRegEx(nostd::string_view key)
-  {
-    if (key.empty() || key.size() > kKeyMaxSize || !IsLowerCaseAlphaOrDigit(key[0]))
-    {
-      return false;
-    }
-
-    int ats = 0;
-
-    for (const char c : key)
-    {
-      if (!IsLowerCaseAlphaOrDigit(c) && c != '_' && c != '-' && c != '@' && c != '*' && c != '/')
-      {
-        return false;
-      }
-      if ((c == '@') && (++ats > 1))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  static bool IsValidValueNonRegEx(nostd::string_view value)
-  {
-    if (value.empty() || value.size() > kValueMaxSize)
-    {
-      return false;
-    }
-
-    for (const char c : value)
-    {
-      if (c < ' ' || c > '~' || c == ',' || c == '=')
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-#endif
-
-  static bool IsLowerCaseAlphaOrDigit(char c) { return isdigit(c) || islower(c); }
-
-private:
-  // Store entries in a C-style array to avoid using std::array or std::vector.
-  nostd::unique_ptr<common::KeyValueProperties> kv_properties_;
-};
-
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/tracer.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/tracer.h
deleted file mode 100644
index a3792668c..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/tracer.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include <chrono>
-
-#include "opentelemetry/context/context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/trace/default_span.h"
-#include "opentelemetry/trace/scope.h"
-#include "opentelemetry/trace/span.h"
-#include "opentelemetry/trace/span_context_kv_iterable_view.h"
-#include "opentelemetry/trace/span_startoptions.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-/**
- * Handles span creation and in-process context propagation.
- *
- * This class provides methods for manipulating the context, creating spans, and controlling spans'
- * lifecycles.
- */
-class Tracer
-{
-public:
-  virtual ~Tracer() = default;
-  /**
-   * Starts a span.
-   *
-   * Optionally sets attributes at Span creation from the given key/value pairs.
-   *
-   * Attributes will be processed in order, previous attributes with the same
-   * key will be overwritten.
-   */
-  virtual nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                            const common::KeyValueIterable &attributes,
-                                            const SpanContextKeyValueIterable &links,
-                                            const StartSpanOptions &options = {}) noexcept = 0;
-
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                    const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name, {}, {}, options);
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                    const T &attributes,
-                                    const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name, attributes, {}, options);
-  }
-
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                    const common::KeyValueIterable &attributes,
-                                    const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name, attributes, NullSpanContext(), options);
-  }
-
-  template <class T,
-            class U,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr,
-            nostd::enable_if_t<detail::is_span_context_kv_iterable<U>::value> *   = nullptr>
-  nostd::shared_ptr<Span> StartSpan(nostd::string_view name,
-                                    const T &attributes,
-                                    const U &links,
-                                    const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name, common::KeyValueIterableView<T>(attributes),
-                           SpanContextKeyValueIterableView<U>(links), options);
-  }
-
-  nostd::shared_ptr<Span> StartSpan(
-      nostd::string_view name,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      const StartSpanOptions &options = {}) noexcept
-  {
-
-    return this->StartSpan(name, attributes, {}, options);
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Span> StartSpan(
-      nostd::string_view name,
-      const T &attributes,
-      std::initializer_list<
-          std::pair<SpanContext,
-                    std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>
-          links,
-      const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(
-        name, attributes,
-        nostd::span<const std::pair<SpanContext, std::initializer_list<std::pair<
-                                                     nostd::string_view, common::AttributeValue>>>>{
-            links.begin(), links.end()},
-        options);
-  }
-
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Span> StartSpan(
-      nostd::string_view name,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      const T &links,
-      const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(name,
-                           nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{
-                               attributes.begin(), attributes.end()},
-                           links, options);
-  }
-
-  nostd::shared_ptr<Span> StartSpan(
-      nostd::string_view name,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes,
-      std::initializer_list<
-          std::pair<SpanContext,
-                    std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>>>>
-          links,
-      const StartSpanOptions &options = {}) noexcept
-  {
-    return this->StartSpan(
-        name,
-        nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>{attributes.begin(),
-                                                                                 attributes.end()},
-        nostd::span<const std::pair<SpanContext, std::initializer_list<std::pair<
-                                                     nostd::string_view, common::AttributeValue>>>>{
-            links.begin(), links.end()},
-        options);
-  }
-
-  /**
-   * Set the active span. The span will remain active until the returned Scope
-   * object is destroyed.
-   * @param span the span that should be set as the new active span.
-   * @return a Scope that controls how long the span will be active.
-   */
-  static Scope WithActiveSpan(nostd::shared_ptr<Span> &span) noexcept { return Scope{span}; }
-
-  /**
-   * Get the currently active span.
-   * @return the currently active span, or an invalid default span if no span
-   * is active.
-   */
-  static nostd::shared_ptr<Span> GetCurrentSpan() noexcept
-  {
-    context::ContextValue active_span = context::RuntimeContext::GetValue(kSpanKey);
-    if (nostd::holds_alternative<nostd::shared_ptr<Span>>(active_span))
-    {
-      return nostd::get<nostd::shared_ptr<Span>>(active_span);
-    }
-    else
-    {
-      return nostd::shared_ptr<Span>(new DefaultSpan(SpanContext::GetInvalid()));
-    }
-  }
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  /**
-   * Reports if the tracer is enabled or not. A disabled tracer will not create spans.
-   *
-   * The instrumentation authors should call this method before creating a spans to
-   * potentially avoid performing computationally expensive operations for disabled tracers.
-   *
-   * @since ABI_VERSION 2
-   */
-  bool Enabled() const noexcept { return OPENTELEMETRY_ATOMIC_READ_8(&this->enabled_) != 0; }
-#endif
-
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
-
-  /*
-   * The following is removed from the API in ABI version 2.
-   * It belongs to the SDK.
-   */
-
-  /**
-   * Force any buffered spans to flush.
-   * @param timeout to complete the flush
-   */
-  template <class Rep, class Period>
-  void ForceFlush(std::chrono::duration<Rep, Period> timeout) noexcept
-  {
-    this->ForceFlushWithMicroseconds(static_cast<uint64_t>(
-        std::chrono::duration_cast<std::chrono::microseconds>(timeout).count()));
-  }
-
-  virtual void ForceFlushWithMicroseconds(uint64_t timeout) noexcept = 0;
-
-  /**
-   * ForceFlush any buffered spans and stop reporting spans.
-   * @param timeout to complete the flush
-   */
-  template <class Rep, class Period>
-  void Close(std::chrono::duration<Rep, Period> timeout) noexcept
-  {
-    this->CloseWithMicroseconds(static_cast<uint64_t>(
-        std::chrono::duration_cast<std::chrono::microseconds>(timeout).count()));
-  }
-
-  virtual void CloseWithMicroseconds(uint64_t timeout) noexcept = 0;
-
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-protected:
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Updates the enabled state of the tracer. Calling this method will affect the result of the
-   * subsequent calls to {@code opentelemetry::v2::trace::Tracer::Enabled()}.
-   *
-   * This method should be used by SDK implementations to indicate the tracer's updated state
-   * whenever a tracer transitions from enabled to disabled state and vice versa.
-   *
-   * @param enabled The new state of the tracer. False would indicate that the tracer is no longer
-   * enabled and will not produce as
-   *
-   * @since ABI_VERSION 2
-   */
-  void UpdateEnabled(const bool enabled) noexcept
-  {
-    OPENTELEMETRY_ATOMIC_WRITE_8(&this->enabled_, enabled);
-  }
-#endif
-
-private:
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-  // Variable to support implementation of Enabled method introduced in ABI V2.
-  // Mutable allows enabled_ to be used as 'bool *' (instead of 'const bool *'), with the
-  // OPENTELEMETRY_ATOMIC_READ_8 macro's internal casts when used from a const function.
-  // std::atomic can not be used here because it is not ABI compatible for OpenTelemetry C++ API.
-  mutable bool enabled_ = true;
-#endif
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/tracer_provider.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/tracer_provider.h
deleted file mode 100644
index 059298d39..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/trace/tracer_provider.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/key_value_iterable.h"
-#include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/version.h"
-
-OPENTELEMETRY_BEGIN_NAMESPACE
-namespace trace
-{
-
-class Tracer;
-
-/**
- * Creates new Tracer instances.
- */
-class OPENTELEMETRY_EXPORT TracerProvider
-{
-public:
-  virtual ~TracerProvider() = default;
-
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-
-  /**
-   * Gets or creates a named Tracer instance (ABI).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Tracer instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes (optional, may be nullptr)
-   */
-  virtual nostd::shared_ptr<Tracer> GetTracer(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      const common::KeyValueIterable *attributes) noexcept = 0;
-
-  /**
-   * Gets or creates a named Tracer instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Tracer instrumentation scope
-   * @param[in] version Instrumentation scope version, optional
-   * @param[in] schema_url Instrumentation scope schema URL, optional
-   */
-  nostd::shared_ptr<Tracer> GetTracer(nostd::string_view name,
-                                      nostd::string_view version    = "",
-                                      nostd::string_view schema_url = "")
-  {
-    return GetTracer(name, version, schema_url, nullptr);
-  }
-
-  /**
-   * Gets or creates a named Tracer instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Tracer instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes
-   */
-  nostd::shared_ptr<Tracer> GetTracer(
-      nostd::string_view name,
-      nostd::string_view version,
-      nostd::string_view schema_url,
-      std::initializer_list<std::pair<nostd::string_view, common::AttributeValue>> attributes)
-  {
-    /* Build a container from std::initializer_list. */
-    nostd::span<const std::pair<nostd::string_view, common::AttributeValue>> attributes_span{
-        attributes.begin(), attributes.end()};
-
-    /* Build a view on the container. */
-    common::KeyValueIterableView<
-        nostd::span<const std::pair<nostd::string_view, common::AttributeValue>>>
-        iterable_attributes{attributes_span};
-
-    /* Add attributes using the view. */
-    return GetTracer(name, version, schema_url, &iterable_attributes);
-  }
-
-  /**
-   * Gets or creates a named Tracer instance (API helper).
-   *
-   * @since ABI_VERSION 2
-   *
-   * @param[in] name Tracer instrumentation scope
-   * @param[in] version Instrumentation scope version
-   * @param[in] schema_url Instrumentation scope schema URL
-   * @param[in] attributes Instrumentation scope attributes container
-   */
-  template <class T,
-            nostd::enable_if_t<common::detail::is_key_value_iterable<T>::value> * = nullptr>
-  nostd::shared_ptr<Tracer> GetTracer(nostd::string_view name,
-                                      nostd::string_view version,
-                                      nostd::string_view schema_url,
-                                      const T &attributes)
-  {
-    /* Build a view on the container. */
-    common::KeyValueIterableView<T> iterable_attributes(attributes);
-
-    /* Add attributes using the view. */
-    return GetTracer(name, version, schema_url, &iterable_attributes);
-  }
-
-#else
-
-  /**
-   * Gets or creates a named tracer instance.
-   *
-   * Optionally a version can be passed to create a named and versioned tracer
-   * instance.
-   */
-  virtual nostd::shared_ptr<Tracer> GetTracer(nostd::string_view name,
-                                              nostd::string_view version    = "",
-                                              nostd::string_view schema_url = "") noexcept = 0;
-#endif
-};
-}  // namespace trace
-OPENTELEMETRY_END_NAMESPACE
diff --git a/ext/opentelemetry-cpp-api-only/include/opentelemetry/version.h b/ext/opentelemetry-cpp-api-only/include/opentelemetry/version.h
deleted file mode 100644
index 0efd4334f..000000000
--- a/ext/opentelemetry-cpp-api-only/include/opentelemetry/version.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-#pragma once
-
-#include "opentelemetry/common/macros.h"  // IWYU pragma: export
-#include "opentelemetry/detail/preprocessor.h"
-
-#ifndef OPENTELEMETRY_ABI_VERSION_NO
-#  define OPENTELEMETRY_ABI_VERSION_NO 1
-#endif
-
-#define OPENTELEMETRY_VERSION "1.21.0"
-#define OPENTELEMETRY_VERSION_MAJOR 1
-#define OPENTELEMETRY_VERSION_MINOR 21
-#define OPENTELEMETRY_VERSION_PATCH 0
-
-#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
-
-// clang-format off
-#define OPENTELEMETRY_BEGIN_NAMESPACE \
-  namespace opentelemetry { inline namespace OPENTELEMETRY_CONCAT(v, OPENTELEMETRY_ABI_VERSION_NO) {
-
-#define OPENTELEMETRY_END_NAMESPACE \
-  }}
-
-#define OPENTELEMETRY_NAMESPACE opentelemetry :: OPENTELEMETRY_CONCAT(v, OPENTELEMETRY_ABI_VERSION_NO)
-
-// clang-format on
diff --git a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/component-definitions.cmake b/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/component-definitions.cmake
deleted file mode 100644
index 8ed4a8e47..000000000
--- a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/component-definitions.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Configured from opentelemetry-cpp/cmake/component-definitions.cmake.in
-
-# ----------------------------------------------------------------------
-# opentelmetry-cpp Built COMPONENT list
-# ----------------------------------------------------------------------
-set(OTEL_BUILT_COMPONENTS_LIST api)
-
-# ----------------------------------------------------------------------
-# COMPONENT to TARGET lists
-# ----------------------------------------------------------------------
-
-# COMPONENT api
-set(COMPONENT_api_TARGETS
-    opentelemetry-cpp::api
-)
-
-
-
-#-----------------------------------------------------------------------
-# COMPONENT to COMPONENT dependencies
-#-----------------------------------------------------------------------
-
-# COMPONENT api internal dependencies
-set(COMPONENT_api_COMPONENT_DEPENDS
-)
-
-
-
-
-#-----------------------------------------------------------------------
-# COMPONENT to THIRDPARTY dependencies
-#-----------------------------------------------------------------------
-
-# COMPONENT api thirdparty dependencies
-set(COMPONENT_api_THIRDPARTY_DEPENDS
-)
-
-
diff --git a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/find-package-support-functions.cmake b/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/find-package-support-functions.cmake
deleted file mode 100644
index f74d029d2..000000000
--- a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/find-package-support-functions.cmake
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-include("${CMAKE_CURRENT_LIST_DIR}/component-definitions.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/thirdparty-dependency-definitions.cmake")
-
-#-------------------------------------------------------------------------
-# Function to get installed components.
-#-------------------------------------------------------------------------
-function(get_installed_components installed_components_out)
-  set(result "")
-  foreach(_COMPONENT IN LISTS OTEL_BUILT_COMPONENTS_LIST)
-      set(_COMPONENT_TARGET_FILE "${CMAKE_CURRENT_LIST_DIR}/opentelemetry-cpp-${_COMPONENT}-target.cmake")
-      if(EXISTS "${_COMPONENT_TARGET_FILE}")
-          list(APPEND result ${_COMPONENT})
-          message(DEBUG "get_installed_components: component = ${_COMPONENT},  installed = TRUE")
-      else()
-          message(DEBUG "get_installed_components: component = ${_COMPONENT},  installed = FALSE")
-      endif()
-  endforeach()
-  set(${installed_components_out} ${result} PARENT_SCOPE)
-endfunction()
-
-#-------------------------------------------------------------------------
-# Function to get dependent components.
-#-------------------------------------------------------------------------
-function(get_dependent_components component_in dependent_components_out)
-  set(result "")
-  set(depends_var "COMPONENT_${component_in}_COMPONENT_DEPENDS")
-  if(DEFINED ${depends_var})
-    set(result ${${depends_var}})
-  endif()
-  set(${dependent_components_out} ${result} PARENT_SCOPE)
-endfunction()
-
-
-#-------------------------------------------------------------------------
-# Function to get requested components.
-#-------------------------------------------------------------------------
-function(get_requested_components installed_components_in requested_components_out)
-  set(result "")
-  if (NOT opentelemetry-cpp_FIND_COMPONENTS)
-    set(result ${${installed_components_in}})
-    message(DEBUG "get_requested_components: No components explicitly requested. Importing all installed components including: ${result}")
-    set(${requested_components_out} ${result} PARENT_SCOPE)
-  else()
-    message(DEBUG "get_requested_components: Components requested: ${opentelemetry-cpp_FIND_COMPONENTS}")
-    foreach(_COMPONENT IN LISTS opentelemetry-cpp_FIND_COMPONENTS)
-        if(NOT ${_COMPONENT} IN_LIST OTEL_BUILT_COMPONENTS_LIST)
-            message(ERROR " get_requested_components: Component `${_COMPONENT}` is not a built component of the opentelemetry-cpp package. Built components include: ${OTEL_BUILT_COMPONENTS_LIST}")
-            return()
-        endif()
-        if(NOT ${_COMPONENT} IN_LIST ${installed_components_in})
-            message(ERROR " get_requested_components: Component `${_COMPONENT}` is supported by opentelemetry-cpp but not installed. Installed components include: ${${installed_components_in}}")
-            return()
-        endif()
-        get_dependent_components(${_COMPONENT} _DEPENDENT_COMPONENTS)
-        list(APPEND result ${_DEPENDENT_COMPONENTS})
-        list(APPEND result ${_COMPONENT})
-    endforeach()
-    list(REMOVE_DUPLICATES result)
-    set(${requested_components_out} ${result} PARENT_SCOPE)
-  endif()
-endfunction()
-
-
-#-------------------------------------------------------------------------
-# Function to get the targets for a component.
-#-------------------------------------------------------------------------
-function(get_component_targets component_in targets_out)
-  set(result "")
-  if(NOT ${component_in} IN_LIST OTEL_BUILT_COMPONENTS_LIST)
-      message(ERROR " get_component_targets: Component `${component_in}` component is not a built component of the opentelemetry-cpp package.")
-  else()
-    set(targets_var "COMPONENT_${component_in}_TARGETS")
-    if(DEFINED ${targets_var})
-      set(result ${${targets_var}})
-    endif()
-  endif()
-  set(${targets_out} ${result} PARENT_SCOPE)
-endfunction()
-
-#-------------------------------------------------------------------------
-# Get targets for a list of components.
-#-------------------------------------------------------------------------
-function(get_targets components_in targets_out)
-  set(result "")
-  foreach(_comp IN LISTS ${components_in})
-    get_component_targets(${_comp} comp_targets)
-    foreach(target IN LISTS comp_targets)
-      list(APPEND result ${target})
-    endforeach()
-  endforeach()
-  set(${targets_out} ${result} PARENT_SCOPE)
-endfunction()
-
-
-#-------------------------------------------------------------------------
-# Check if a target is imported for a list of targets.
-#-------------------------------------------------------------------------
-function(check_targets_imported targets_in)
-  set(result TRUE)
-  foreach(_target IN LISTS ${targets_in})
-    if(TARGET ${_target})
-      message(DEBUG "check_targets_imported: imported target `${_target}`")
-    else()
-      message(FATAL_ERROR " check_targets_imported: failed to import target `${_target}`")
-      set(result FALSE)
-    endif()
-  endforeach()
-  set(${result_bool_out} ${result} PARENT_SCOPE)
-endfunction()
-
-#-------------------------------------------------------------------------
-# Check if a dependency is expected and required
-#-------------------------------------------------------------------------
-function (is_dependency_required dependency_in components_in is_required_out)
-  foreach(_component IN LISTS ${components_in})
-    if(${dependency_in} IN_LIST COMPONENT_${_component}_THIRDPARTY_DEPENDS)
-      set(${is_required_out} TRUE PARENT_SCOPE)
-      return()
-    endif()
-  endforeach()
-endfunction()
-
-#-------------------------------------------------------------------------
-# Find all required and expected dependencies
-#-------------------------------------------------------------------------
-include(CMakeFindDependencyMacro)
-
-function(find_required_dependencies components_in)
-  foreach(_dependency IN LISTS OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED)
-    if(${_dependency}_FOUND)
-      # The dependency is already found by another component. Continue.
-      continue()
-    endif()
-    set(is_required FALSE)
-    is_dependency_required(${_dependency} ${components_in} is_required)
-    message(DEBUG "find_required_dependencies: dependency = ${_dependency}, is_required = ${is_required}")
-    if(is_required)
-        message(DEBUG "find_required_dependencies: calling find_dependency(${_dependency} ${OTEL_${_dependency}_SEARCH_MODE} )...")
-        find_dependency(${_dependency} ${OTEL_${_dependency}_SEARCH_MODE})
-    endif()
-  endforeach()
-endfunction()
\ No newline at end of file
diff --git a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-api-target.cmake b/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-api-target.cmake
deleted file mode 100644
index 11da63073..000000000
--- a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-api-target.cmake
+++ /dev/null
@@ -1,108 +0,0 @@
-# Generated by CMake
-
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
-   message(FATAL_ERROR "CMake >= 3.0.0 required")
-endif()
-if(CMAKE_VERSION VERSION_LESS "3.0.0")
-   message(FATAL_ERROR "CMake >= 3.0.0 required")
-endif()
-cmake_policy(PUSH)
-cmake_policy(VERSION 3.0.0...3.30)
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Protect against multiple inclusion, which would fail when already imported targets are added once more.
-set(_cmake_targets_defined "")
-set(_cmake_targets_not_defined "")
-set(_cmake_expected_targets "")
-foreach(_cmake_expected_target IN ITEMS opentelemetry-cpp::api)
-  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
-  if(TARGET "${_cmake_expected_target}")
-    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
-  else()
-    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
-  endif()
-endforeach()
-unset(_cmake_expected_target)
-if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
-  unset(_cmake_targets_defined)
-  unset(_cmake_targets_not_defined)
-  unset(_cmake_expected_targets)
-  unset(CMAKE_IMPORT_FILE_VERSION)
-  cmake_policy(POP)
-  return()
-endif()
-if(NOT _cmake_targets_defined STREQUAL "")
-  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
-  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
-  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
-endif()
-unset(_cmake_targets_defined)
-unset(_cmake_targets_not_defined)
-unset(_cmake_expected_targets)
-
-
-# Compute the installation prefix relative to this file.
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-if(_IMPORT_PREFIX STREQUAL "/")
-  set(_IMPORT_PREFIX "")
-endif()
-
-# Create imported target opentelemetry-cpp::api
-add_library(opentelemetry-cpp::api INTERFACE IMPORTED)
-
-set_target_properties(opentelemetry-cpp::api PROPERTIES
-  INTERFACE_COMPILE_DEFINITIONS "OPENTELEMETRY_ABI_VERSION_NO=1"
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "-framework CoreFoundation"
-)
-
-# Load information for each installed configuration.
-file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/opentelemetry-cpp-api-target-*.cmake")
-foreach(_cmake_config_file IN LISTS _cmake_config_files)
-  include("${_cmake_config_file}")
-endforeach()
-unset(_cmake_config_file)
-unset(_cmake_config_files)
-
-# Cleanup temporary variables.
-set(_IMPORT_PREFIX)
-
-# Loop over all imported files and verify that they actually exist
-foreach(_cmake_target IN LISTS _cmake_import_check_targets)
-  if(CMAKE_VERSION VERSION_LESS "3.28"
-      OR NOT DEFINED _cmake_import_check_xcframework_for_${_cmake_target}
-      OR NOT IS_DIRECTORY "${_cmake_import_check_xcframework_for_${_cmake_target}}")
-    foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
-      if(NOT EXISTS "${_cmake_file}")
-        message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
-   \"${_cmake_file}\"
-but this file does not exist.  Possible reasons include:
-* The file was deleted, renamed, or moved to another location.
-* An install or uninstall procedure did not complete successfully.
-* The installation package was faulty and contained
-   \"${CMAKE_CURRENT_LIST_FILE}\"
-but not all the files it references.
-")
-      endif()
-    endforeach()
-  endif()
-  unset(_cmake_file)
-  unset("_cmake_import_check_files_for_${_cmake_target}")
-endforeach()
-unset(_cmake_target)
-unset(_cmake_import_check_targets)
-
-# This file does not depend on other imported targets which have
-# been exported from the same project but in a separate export set.
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-cmake_policy(POP)
diff --git a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config-version.cmake b/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config-version.cmake
deleted file mode 100644
index 8a325b258..000000000
--- a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config-version.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-# This is a basic version file for the Config-mode of find_package().
-# It is used by write_basic_package_version_file() as input file for configure_file()
-# to create a version-file which can be installed along a config.cmake file.
-#
-# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-# the requested version string are exactly the same and it sets
-# PACKAGE_VERSION_COMPATIBLE if the current version is equal to the requested version.
-# The tweak version component is ignored.
-# The variable CVF_VERSION must be set before calling configure_file().
-
-
-if (PACKAGE_FIND_VERSION_RANGE)
-  message(AUTHOR_WARNING
-    "`find_package()` specify a version range but the version strategy "
-    "(ExactVersion) of the module `${PACKAGE_FIND_NAME}` is incompatible "
-    "with this request. Only the lower endpoint of the range will be used.")
-endif()
-
-set(PACKAGE_VERSION "1.21.0")
-
-if("1.21.0" MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)") # strip the tweak version
-  set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
-  set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
-  set(CVF_VERSION_PATCH "${CMAKE_MATCH_3}")
-
-  if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
-    string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
-  endif()
-  if(NOT CVF_VERSION_MINOR VERSION_EQUAL 0)
-    string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
-  endif()
-  if(NOT CVF_VERSION_PATCH VERSION_EQUAL 0)
-    string(REGEX REPLACE "^0+" "" CVF_VERSION_PATCH "${CVF_VERSION_PATCH}")
-  endif()
-
-  set(CVF_VERSION_NO_TWEAK "${CVF_VERSION_MAJOR}.${CVF_VERSION_MINOR}.${CVF_VERSION_PATCH}")
-else()
-  set(CVF_VERSION_NO_TWEAK "1.21.0")
-endif()
-
-if(PACKAGE_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)") # strip the tweak version
-  set(REQUESTED_VERSION_MAJOR "${CMAKE_MATCH_1}")
-  set(REQUESTED_VERSION_MINOR "${CMAKE_MATCH_2}")
-  set(REQUESTED_VERSION_PATCH "${CMAKE_MATCH_3}")
-
-  if(NOT REQUESTED_VERSION_MAJOR VERSION_EQUAL 0)
-    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_MAJOR "${REQUESTED_VERSION_MAJOR}")
-  endif()
-  if(NOT REQUESTED_VERSION_MINOR VERSION_EQUAL 0)
-    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_MINOR "${REQUESTED_VERSION_MINOR}")
-  endif()
-  if(NOT REQUESTED_VERSION_PATCH VERSION_EQUAL 0)
-    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_PATCH "${REQUESTED_VERSION_PATCH}")
-  endif()
-
-  set(REQUESTED_VERSION_NO_TWEAK
-      "${REQUESTED_VERSION_MAJOR}.${REQUESTED_VERSION_MINOR}.${REQUESTED_VERSION_PATCH}")
-else()
-  set(REQUESTED_VERSION_NO_TWEAK "${PACKAGE_FIND_VERSION}")
-endif()
-
-if(REQUESTED_VERSION_NO_TWEAK STREQUAL CVF_VERSION_NO_TWEAK)
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-endif()
-
-if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-  set(PACKAGE_VERSION_EXACT TRUE)
-endif()
-
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
-  return()
-endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
-  math(EXPR installedBits "8 * 8")
-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
diff --git a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config.cmake b/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config.cmake
deleted file mode 100644
index 281e1496d..000000000
--- a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/opentelemetry-cpp-config.cmake
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-#.rst:
-# opentelemetry-cpp-config.cmake
-# --------
-# Finding opentelemetry-cpp in CMake projects
-# ========================================
-#
-#  - find_package(opentelemetry-cpp CONFIG REQUIRED) to import all installed targets and dependencies
-#  - find_package(opentelemetry-cpp CONFIG COMPONENTS ...) to import specific components' targets and dependencies
-#
-# Example usage
-# -------------------
-#
-# 1. **No Components Specified**
-#
-#    When no components are provided, all components and their targets are imported.
-#
-#    .. code-block:: cmake
-#
-#       find_package(opentelemetry-cpp CONFIG REQUIRED)
-#
-#
-# 2. **Components Specified**
-#
-#    When a component is specified, its third-party dependencies are found;
-#    then, targets from that component, along with the components on which it depends, are imported.
-#
-#    .. code-block:: cmake
-#
-#       find_package(opentelemetry-cpp CONFIG REQUIRED COMPONENTS exporters_otlp_grpc)
-#
-#
-#.. note::
-#   To troubleshoot issues with ``find_package(opentelemetry-cpp CONFIG REQUIRED)``, run CMake with debug logging enabled:
-#
-#   .. code-block:: bash
-#
-#      cmake --log-level=DEBUG -S <source_dir> -B <build_dir>
-#
-#   To get more verbose output from CMake’s package search, run CMake with the following flag:
-#
-#   .. code-block:: bash
-#
-#      cmake -DCMAKE_FIND_DEBUG_MODE=ON -S <source_dir> -B <build_dir>
-#
-#
-# CMake Variables Defined
-# --------------------
-#
-# This module defines the following variables:
-#
-# ::
-#
-#   OPENTELEMETRY_CPP_INCLUDE_DIRS  - Include directories of opentelemetry-cpp.
-#   OPENTELEMETRY_CPP_LIBRARY_DIRS  - Link directories of opentelemetry-cpp.
-#   OPENTELEMETRY_CPP_LIBRARIES     - List of libraries when using opentelemetry-cpp.
-#   OPENTELEMETRY_CPP_FOUND         - True if opentelemetry-cpp found.
-#   OPENTELEMETRY_ABI_VERSION_NO    - ABI version of opentelemetry-cpp.
-#   OPENTELEMETRY_VERSION           - Version of opentelemetry-cpp.
-#   OPENTELEMETRY_CPP_COMPONENTS_INSTALLED - List of components installed.
-#   opentelemetry-cpp_FOUND         - True if opentelemetry-cpp found.
-#   opentelemetry-cpp_<component>_FOUND - True if the requested component is found.
-# ::
-#
-#
-# CMake Components and Targets Supported
-# --------------------
-# opentelemetry-cpp supports the following components and targets. This install may include a subset.
-#
-# COMPONENTS
-#   api
-#   sdk
-#   ext_common
-#   ext_http_curl
-#   ext_dll
-#   exporters_in_memory
-#   exporters_ostream
-#   exporters_otlp_common
-#   exporters_otlp_file
-#   exporters_otlp_grpc
-#   exporters_otlp_http
-#   exporters_prometheus
-#   exporters_elasticsearch
-#   exporters_etw
-#   exporters_zipkin
-#   shims_opentracing
-#
-# ::
-#
-# TARGETS
-#   opentelemetry-cpp::api                               - Imported target of COMPONENT api
-#   opentelemetry-cpp::sdk                               - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::version                           - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::common                            - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::resources                         - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::trace                             - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::metrics                           - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::logs                              - Imported target of COMPONENT sdk
-#   opentelemetry-cpp::ext                               - Imported target of COMPONENT ext_common
-#   opentelemetry-cpp::http_client_curl                  - Imported target of COMPONENT ext_http_curl
-#   opentelemetry-cpp::opentelemetry_cpp                 - Imported target of COMPONENT ext_dll
-#   opentelemetry-cpp::in_memory_span_exporter           - Imported target of COMPONENT exporters_in_memory
-#   opentelemetry-cpp::in_memory_metric_exporter         - Imported target of COMPONENT exporters_in_memory
-#   opentelemetry-cpp::ostream_log_record_exporter       - Imported target of COMPONENT exporters_ostream
-#   opentelemetry-cpp::ostream_metrics_exporter          - Imported target of COMPONENT exporters_ostream
-#   opentelemetry-cpp::ostream_span_exporter             - Imported target of COMPONENT exporters_ostream
-#   opentelemetry-cpp::proto                             - Imported target of COMPONENT exporters_otlp_common
-#   opentelemetry-cpp::otlp_recordable                   - Imported target of COMPONENT exporters_otlp_common
-#   opentelemetry-cpp::otlp_file_client                  - Imported target of COMPONENT exporters_otlp_file
-#   opentelemetry-cpp::otlp_file_exporter                - Imported target of COMPONENT exporters_otlp_file
-#   opentelemetry-cpp::otlp_file_log_record_exporter     - Imported target of COMPONENT exporters_otlp_file
-#   opentelemetry-cpp::otlp_file_metric_exporter         - Imported target of COMPONENT exporters_otlp_file
-#   opentelemetry-cpp::proto_grpc                        - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_grpc_client                  - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_grpc_exporter                - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_grpc_log_record_exporter     - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_grpc_metrics_exporter        - Imported target of COMPONENT exporters_otlp_grpc
-#   opentelemetry-cpp::otlp_http_client                  - Imported target of COMPONENT exporters_otlp_http
-#   opentelemetry-cpp::otlp_http_exporter                - Imported target of COMPONENT exporters_otlp_http
-#   opentelemetry-cpp::otlp_http_log_record_exporter     - Imported target of COMPONENT exporters_otlp_http
-#   opentelemetry-cpp::otlp_http_metric_exporter         - Imported target of COMPONENT exporters_otlp_http
-#   opentelemetry-cpp::prometheus_exporter               - Imported target of COMPONENT exporters_prometheus
-#   opentelemetry-cpp::elasticsearch_log_record_exporter - Imported target of COMPONENT exporters_elasticsearch
-#   opentelemetry-cpp::etw_exporter                      - Imported target of COMPONENT exporters_etw
-#   opentelemetry-cpp::zipkin_trace_exporter             - Imported target of COMPONENT exporters_zipkin
-#   opentelemetry-cpp::opentracing_shim                  - Imported target of COMPONENT shims_opentracing
-#
-# Additional Files Used in Component to Component and Third-Party Dependency Resolution
-# --------------------------------------------------------
-#
-# - **thirdparty-dependency-definitions.cmake**
-#   This file lists the third-party dependencies supported by opentelemetry-cpp and components that may require them.
-#   Dependencies are found in the order defined in this file when find_package(opentelemetry-cpp …) is invoked.
-#
-#   **Found using CMake CONFIG search mode:**
-#
-#   - **absl**
-#   - **nlohmann_json**
-#   - **Protobuf**
-#   - **gRPC**
-#   - **prometheus-cpp**
-#   - **OpenTracing**
-#
-#   **Found using the CMake MODULE search mode:**
-#
-#   - **Threads**
-#   - **ZLIB**
-#   - **CURL**
-#
-# - **component-definitions.cmake**
-#   This file defines the available opentelemetry-cpp components, the targets associated with each
-#   component, and the inter-component dependencies.
-#
-
-
-# =============================================================================
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-# =============================================================================
-
-set(OPENTELEMETRY_ABI_VERSION_NO
-    "1"
-    CACHE STRING "opentelemetry-cpp ABI version" FORCE)
-set(OPENTELEMETRY_VERSION
-    "1.21.0"
-    CACHE STRING "opentelemetry-cpp version" FORCE)
-
-
-####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
-####### Any changes to this file will be overwritten by the next CMake run ####
-####### The input file was opentelemetry-cpp-config.cmake.in                            ########
-
-get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
-
-macro(set_and_check _var _file)
-  set(${_var} "${_file}")
-  if(NOT EXISTS "${_file}")
-    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif()
-endmacro()
-
-macro(check_required_components _NAME)
-  foreach(comp ${${_NAME}_FIND_COMPONENTS})
-    if(NOT ${_NAME}_${comp}_FOUND)
-      if(${_NAME}_FIND_REQUIRED_${comp})
-        set(${_NAME}_FOUND FALSE)
-      endif()
-    endif()
-  endforeach()
-endmacro()
-
-####################################################################################
-
-# Include the opentelemetry-cpp file that includes component defintions, thirdparty definitons and functions to support finding this package and dependencies.
-include("${CMAKE_CURRENT_LIST_DIR}/find-package-support-functions.cmake")
-
-set(_INSTALLED_COMPONENTS "")
-get_installed_components(_INSTALLED_COMPONENTS)
-
-set(OPENTELEMETRY_CPP_COMPONENTS_INSTALLED ${_INSTALLED_COMPONENTS} CACHE STRING "opentelemetry-cpp components installed" FORCE)
-
-set(_REQUESTED_COMPONENTS "")
-get_requested_components(_INSTALLED_COMPONENTS _REQUESTED_COMPONENTS)
-
-find_required_dependencies(_REQUESTED_COMPONENTS)
-
-set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include")
-set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/lib")
-
-# include the target files selected and set the component found flag
-foreach(_COMPONENT IN LISTS _REQUESTED_COMPONENTS)
-  include("${CMAKE_CURRENT_LIST_DIR}/opentelemetry-cpp-${_COMPONENT}-target.cmake")
-  set(${CMAKE_FIND_PACKAGE_NAME}_${_COMPONENT}_FOUND TRUE
-    CACHE BOOL "whether ${CMAKE_FIND_PACKAGE_NAME} component ${_COMPONENT} is found" FORCE)
-endforeach()
-
-# get installed and requested targets
-set(_OPENTELEMETRY_CPP_TARGETS "")
-get_targets(_REQUESTED_COMPONENTS _OPENTELEMETRY_CPP_TARGETS)
-check_targets_imported(_OPENTELEMETRY_CPP_TARGETS)
-
-# Set OPENTELEMETRY_CPP_* variables
-set(OPENTELEMETRY_CPP_LIBRARIES)
-
-set(DLL_TARGET "opentelemetry-cpp::opentelemetry_cpp")
-
-foreach(_TARGET IN LISTS _OPENTELEMETRY_CPP_TARGETS)
-  if(TARGET "${_TARGET}" AND NOT "${_TARGET}" STREQUAL "${DLL_TARGET}")
-    list(APPEND OPENTELEMETRY_CPP_LIBRARIES "${_TARGET}")
-  endif()
-endforeach()
-
-# handle the QUIETLY and REQUIRED arguments and set opentelemetry-cpp_FOUND to
-# TRUE if all variables listed contain valid results, e.g. valid file paths.
-include("FindPackageHandleStandardArgs")
-find_package_handle_standard_args(
-  ${CMAKE_FIND_PACKAGE_NAME}
-  FOUND_VAR ${CMAKE_FIND_PACKAGE_NAME}_FOUND
-  REQUIRED_VARS OPENTELEMETRY_CPP_INCLUDE_DIRS OPENTELEMETRY_CPP_LIBRARIES)
-
-if(${CMAKE_FIND_PACKAGE_NAME}_FOUND)
-  set(OPENTELEMETRY_CPP_FOUND
-      ${${CMAKE_FIND_PACKAGE_NAME}_FOUND}
-      CACHE BOOL "whether opentelemetry-cpp is found" FORCE)
-else()
-  unset(OPENTELEMETRY_CPP_FOUND)
-  unset(OPENTELEMETRY_CPP_FOUND CACHE)
-endif()
-
-check_required_components(${CMAKE_FIND_PACKAGE_NAME})
diff --git a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/thirdparty-dependency-definitions.cmake b/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/thirdparty-dependency-definitions.cmake
deleted file mode 100644
index edecf9ba0..000000000
--- a/ext/opentelemetry-cpp-api-only/lib/cmake/opentelemetry-cpp/thirdparty-dependency-definitions.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-# Configured from opentelmetry-cpp/cmake/thirdparty-dependency-definitions.cmake.in
-
-#-----------------------------------------------------------------------
-# Third party dependencies supported by opentelemetry-cpp
-#    Dependencies will be found in this order when find_package(opentelemetry-cpp ...)  is called.
-#-----------------------------------------------------------------------
-set(OTEL_THIRDPARTY_DEPENDENCIES_SUPPORTED Threads;ZLIB;CURL;nlohmann_json;Protobuf;gRPC;prometheus-cpp;OpenTracing)
-
-#-----------------------------------------------------------------------
-# Third party dependency versions used to build opentelemetry-cpp
-#-----------------------------------------------------------------------
-set(OTEL_Threads_VERSION "")
-set(OTEL_ZLIB_VERSION "")
-set(OTEL_CURL_VERSION "")
-set(OTEL_nlohmann_json_VERSION "")
-set(OTEL_Protobuf_VERSION "")
-set(OTEL_gRPC_VERSION "")
-set(OTEL_prometheus-cpp_VERSION "")
-set(OTEL_OpenTracing_VERSION "")
-
-
-#-----------------------------------------------------------------------
-# Set the find_dependecy search mode - empty is default. Options MODULE or CONFIG
-#-----------------------------------------------------------------------
-set(OTEL_Threads_SEARCH_MODE "")
-set(OTEL_ZLIB_SEARCH_MODE "")
-set(OTEL_CURL_SEARCH_MODE "")
-set(OTEL_nlohmann_json_SEARCH_MODE "CONFIG")
-set(OTEL_Protobuf_SEARCH_MODE "")
-set(OTEL_gRPC_SEARCH_MODE "CONFIG")
-set(OTEL_prometheus-cpp_SEARCH_MODE "CONFIG")
-set(OTEL_OpenTracing_SEARCH_MODE "CONFIG")
-
diff --git a/ext/opentelemetry-cpp-api-only/lib/pkgconfig/opentelemetry_api.pc b/ext/opentelemetry-cpp-api-only/lib/pkgconfig/opentelemetry_api.pc
deleted file mode 100644
index 0acb47673..000000000
--- a/ext/opentelemetry-cpp-api-only/lib/pkgconfig/opentelemetry_api.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright The OpenTelemetry Authors
-# SPDX-License-Identifier: Apache-2.0
-
-prefix=${pcfiledir}/../..
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: OpenTelemetry API
-Description: A header-only library to support instrumentation with OpenTelemetry.
-Requires: 
-Version: 1.21.0
-
-Libs: -L${libdir} 
-Cflags: -I${includedir}  -DOPENTELEMETRY_ABI_VERSION_NO=1
diff --git a/ext/prometheus-cpp-lite-1.0/.gitignore b/ext/prometheus-cpp-lite-1.0/.gitignore
deleted file mode 100644
index c18a70b25..000000000
--- a/ext/prometheus-cpp-lite-1.0/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.vs
-bin/
-out/
\ No newline at end of file
diff --git a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/CMakeLists.txt b/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/CMakeLists.txt
deleted file mode 100644
index 177cdb974..000000000
--- a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021... by Maxim Gusev
-#
-# https://github.com/John-Jasper-Doe/http-client-lite
-#
-# Distributed under the MIT License.
-# (See accompanying file LICENSE or copy at https://mit-license.org/)
-
-cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-project(http-client-lite)
-
-## Set output binary
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-
-## Set property
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-add_compile_options(-Wall -Werror -Wextra -Wpedantic -g -O0)
-
-
-option(HTTP_CLIENT_LITE_OPT_BUILD_EXAMPLES "Build examples" OFF )
-
-if(HTTP_CLIENT_LITE_OPT_BUILD_EXAMPLES)
-  add_subdirectory(examples)
-endif()
-
-# Interface library:
-add_library(${PROJECT_NAME} INTERFACE)
-target_sources(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include/jdl/httpclientlite.h)
-add_custom_target(${PROJECT_NAME}.hdr SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/include/jdl/httpclientlite.h)
-target_include_directories(
-    ${PROJECT_NAME}
-    INTERFACE
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
diff --git a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/LICENSE b/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/LICENSE
deleted file mode 100644
index c2dd18535..000000000
--- a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License
-
-Copyright (c) 2016 Christian C. Sachs
-Copyright (c) 2021 Maxim Gusev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/README.md b/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/README.md
deleted file mode 100644
index 96b1d1504..000000000
--- a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# HTTP Client lite: C++ Cross-platform library only from single-file header-only
-
-This is a lite, C++ cross-platform header-only client library for http request based 
-on [csachs/picohttpclient](https://github.com/csachs/picohttpclient) project.
-
-A Lightweight HTTP 1.1 client where to quickly do very simple HTTP requests, 
-without adding larger dependencies to a project.
-
-
-## License
-
-http client lite  is distributed under the [MIT License](https://github.com/john-jasper-doe/http-client-lite/blob/master/LICENSE).
-
-
-## Example usage
-
-To see how this can be used see the examples folders.
-
-
-**Example:**
-```C++
-#include <jdl/httpclientlite.hpp>
-...
-using namespace jdl;
-...
-HTTPResponse response = HTTPClient::request(HTTPClient::GET, URI("http://example.com"));
-cout << response.body << endl;
-...
-```
-
diff --git a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/examples/CMakeLists.txt b/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/examples/CMakeLists.txt
deleted file mode 100644
index 2f983f892..000000000
--- a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/examples/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
-project(http-client-lite-examples)
-
-add_executable(${PROJECT_NAME}_simple_request simple_request.cpp)
-target_link_libraries(${PROJECT_NAME}_simple_request PRIVATE http_client_lite)
diff --git a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/examples/simple_request.cpp b/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/examples/simple_request.cpp
deleted file mode 100644
index c0a5e6739..000000000
--- a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/examples/simple_request.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  example for httpclientlite.hxx
- */
-
-#include <iostream>
-#include <map>
-#include <string>
-
-#include <jdl/httpclientlite.h>
-
-
-using namespace jdl;
-
-
-int main(int argc, char *argv[]) {
-  if (argc == 1) {
-    std::cout << "Use " << argv[0] << " http://example.org" << std::endl;
-    return EXIT_SUCCESS;
-  }
-
-  HTTPResponse response = HTTPClient::request(HTTPClient::POST, URI(argv[1]));
-
-  if (!response.success) {
-    std::cout << "Request failed!" << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  std::cout << "Request success" << endl;
-
-  std::cout << "Server protocol: " << response.protocol << std::endl;
-  std::cout << "Response code: " << response.response << std::endl;
-  std::cout << "Response string: " << response.responseString << std::endl;
-
-  std::cout << "Headers:" << std::endl;
-
-  for (stringMap::iterator it = response.header.begin(); it != response.header.end(); ++it) {
-    std::cout << "\t" << it->first << "=" << it->second << std::endl;
-  }
-
-  std::cout << response.body << std::endl;
-
-  return EXIT_SUCCESS;
-}
diff --git a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include/jdl/httpclientlite.h b/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include/jdl/httpclientlite.h
deleted file mode 100644
index 4432308a4..000000000
--- a/ext/prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include/jdl/httpclientlite.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *   httpclientlite.hpp
- *   ===========================================================================================
- *
- *   The MIT License
- *
- *   Copyright (c) 2016 Christian C. Sachs
- *   Copyright (c) 2021 Maxim G.
- *
- *   Permission is hereby granted, free of charge, to any person obtaining a copy
- *   of this software and associated documentation files (the "Software"), to deal
- *   in the Software without restriction, including without limitation the rights
- *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *   copies of the Software, and to permit persons to whom the Software is
- *   furnished to do so, subject to the following conditions:
- *
- *   The above copyright notice and this permission notice shall be included in all
- *   copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- *   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *   SOFTWARE.
- */
-
-
-#pragma once
-
-#if defined (__linux__)
-# define PLATFORM_LINUX
-#elif defined (_WIN32) || defined (_WIN64)
-# define PLATFORM_WINDOWS
-#else
-/* TODO:
- *  - Added Apple OS */
-
-/* warning: Unknown OS */
-#endif
-
-
-#include <iostream>
-#include <string>
-#include <map>
-#include <vector>
-#include <cstring>
-#include <sstream>
-
-#include <sys/types.h>
-
-#if defined (PLATFORM_WINDOWS)
-# include <WinSock2.h>
-# include <WS2tcpip.h>
-
-  typedef SOCKET socktype_t;
-  typedef int socklen_t;
-
-# pragma comment(lib, "ws2_32.lib")
-
-#elif defined (PLATFORM_LINUX)
-# include <unistd.h>
-# include <sys/socket.h>
-# include <netdb.h>
-
-# define INVALID_SOCKET -1
-# define closesocket(__sock) close(__sock)
-
-typedef int socktype_t;
-
-#endif /* PLATFORM_WINDOWS or PLATFORM_LINUX */
-
-
-
-const std::string content_type = "Content-Type: text/plain; version=0.0.4; charset=utf-8";
-
-
-
-
-namespace jdl {
-
-  void init_socket() {
-#if defined (PLATFORM_WINDOWS)
-    WSADATA wsa_data;
-    WSAStartup(MAKEWORD(2, 2), &wsa_data);
-#endif /* PLATFORM_WINDOWS */
-  }
-
-  void deinit_socket() {
-#if defined (PLATFORM_WINDOWS)
-    WSACleanup();
-#endif /* PLATFORM_WINDOWS */
-  }
-
-
-  class tokenizer {
-  public:
-    inline tokenizer(std::string &str) : str(str), position(0){}
-
-    inline std::string next(std::string search, bool returnTail = false) {
-      size_t hit = str.find(search, position);
-      if (hit == std::string::npos) {
-        if (returnTail) {
-          return tail();
-        } else {
-          return "";
-        }
-      }
-
-      size_t oldPosition = position;
-      position = hit + search.length();
-
-      return str.substr(oldPosition, hit - oldPosition);
-    }
-
-    inline std::string tail() {
-      size_t oldPosition = position;
-      position = str.length();
-      return str.substr(oldPosition);
-    }
-
-  private:
-    std::string str;
-    std::size_t position;
-  };
-
-  typedef std::map<std::string, std::string> stringMap;
-
-  struct URI {
-    inline void parseParameters() {
-      tokenizer qt(querystring);
-      do {
-        std::string key = qt.next("=");
-        if (key == "")
-          break;
-        parameters[key] = qt.next("&", true);
-      } while (true);
-    }
-
-    inline URI(std::string input, bool shouldParseParameters = false) {
-      tokenizer t = tokenizer(input);
-      protocol = t.next("://");
-      std::string hostPortString = t.next("/");
-
-      tokenizer hostPort(hostPortString);
-
-      host = hostPort.next(hostPortString[0] == '[' ? "]:" : ":", true);
-
-      if (host[0] == '[')
-        host = host.substr(1, host.size() - 1);
-
-      port = hostPort.tail();
-      if (port.empty())
-        port = "80";
-
-      address = t.next("?", true);
-      querystring = t.next("#", true);
-
-      hash = t.tail();
-
-      if (shouldParseParameters) {
-        parseParameters();
-      }
-    }
-
-    std::string protocol, host, port, address, querystring, hash;
-    stringMap parameters;
-  };
-
-  struct HTTPResponse {
-    bool success;
-    std::string protocol;
-    std::string response;
-    std::string responseString;
-
-    stringMap header;
-
-    std::string body;
-
-    inline HTTPResponse() : success(true){}
-    inline static HTTPResponse fail() {
-      HTTPResponse result;
-      result.success = false;
-      return result;
-    }
-  };
-
-  struct HTTPClient {
-    typedef enum {
-      m_options = 0,
-      m_get,
-      m_head,
-      m_post,
-      m_put,
-      m_delete,
-      m_trace,
-      m_connect
-    } HTTPMethod;
-
-    inline static const char *method2string(HTTPMethod method) {
-      const char *methods[] = {"OPTIONS", "GET",   "HEAD",    "POST", "PUT",
-                               "DELETE",  "TRACE", "CONNECT", nullptr};
-      return methods[method];
-    }
-
-    inline static socktype_t connectToURI(const URI& uri) {
-      struct addrinfo hints, *result, *rp;
-
-      memset(&hints, 0, sizeof(addrinfo));
-
-      hints.ai_family = AF_UNSPEC;
-      hints.ai_socktype = SOCK_STREAM;
-
-      int getaddrinfo_result =
-          getaddrinfo(uri.host.c_str(), uri.port.c_str(), &hints, &result);
-
-      if (getaddrinfo_result != 0)
-        return -1;
-
-      socktype_t fd = INVALID_SOCKET;
-
-      for (rp = result; rp != nullptr; rp = rp->ai_next) {
-
-        fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-
-        if (fd == INVALID_SOCKET) {
-          continue;
-        }
-
-        int connect_result = connect(fd, rp->ai_addr, static_cast<socklen_t>(rp->ai_addrlen));
-
-        if (connect_result == -1) {
-          // successfully created a socket, but connection failed. close it!
-          closesocket(fd);
-          fd = INVALID_SOCKET;
-          continue;
-        }
-
-        break;
-      }
-
-      freeaddrinfo(result);
-
-      return fd;
-    }
-
-    inline static std::string bufferedRead(socktype_t fd) {
-      size_t initial_factor = 4, buffer_increment_size = 8192, buffer_size = 0,
-             bytes_read = 0;
-      std::string buffer;
-
-      buffer.resize(initial_factor * buffer_increment_size);
-
-  //    do {
-        bytes_read = recv(fd, ((char*)buffer.c_str()) + buffer_size,
-                          static_cast<socklen_t>(buffer.size() - buffer_size), 0);
-
-        buffer_size += bytes_read;
-
-  //      if (bytes_read > 0 &&
-  //          (buffer.size() - buffer_size) < buffer_increment_size) {
-  //        buffer.resize(buffer.size() + buffer_increment_size);
-  //      }
-  //    } while (bytes_read > 0);
-
-      buffer.resize(buffer_size);
-      return buffer;
-    }
-
-  #define HTTP_NEWLINE "\r\n"
-  #define HTTP_SPACE " "
-  #define HTTP_HEADER_SEPARATOR ": "
-
-    inline static HTTPResponse request(HTTPMethod method, const URI& uri, const std::string& body = "") {
-
-      socktype_t fd = connectToURI(uri);
-      if (fd < 0)
-        return HTTPResponse::fail();
-
-  //    string request = string(method2string(method)) + string(" /") +
-  //                     uri.address + ((uri.querystring == "") ? "" : "?") +
-  //                     uri.querystring + " HTTP/1.1" HTTP_NEWLINE "Host: " +
-  //                     uri.host + HTTP_NEWLINE
-  //                     "Accept: */*" HTTP_NEWLINE
-  //                     "Connection: close" HTTP_NEWLINE HTTP_NEWLINE;
-
-      std::string request = std::string(method2string(method)) + std::string(" /") +
-                            uri.address + ((uri.querystring == "") ? "" : "?") + uri.querystring + " HTTP/1.1" + HTTP_NEWLINE +
-                            "Host: " + uri.host + ":" + uri.port + HTTP_NEWLINE +
-                            "Accept: */*" + HTTP_NEWLINE +
-                            content_type + HTTP_NEWLINE +
-                            "Content-Length: " + std::to_string(body.size()) + HTTP_NEWLINE + HTTP_NEWLINE +
-                            body;
-
-      /*int bytes_written = */send(fd, request.c_str(), static_cast<socklen_t>(request.size()), 0);
-
-      std::string buffer = bufferedRead(fd);
-
-      closesocket(fd);
-
-      HTTPResponse result;
-
-      tokenizer bt(buffer);
-
-      result.protocol = bt.next(HTTP_SPACE);
-      result.response = bt.next(HTTP_SPACE);
-      result.responseString = bt.next(HTTP_NEWLINE);
-
-      std::string header = bt.next(HTTP_NEWLINE HTTP_NEWLINE);
-
-      result.body = bt.tail();
-
-      tokenizer ht(header);
-
-      do {
-        std::string key = ht.next(HTTP_HEADER_SEPARATOR);
-        if (key == "")
-          break;
-        result.header[key] = ht.next(HTTP_NEWLINE, true);
-      } while (true);
-
-      return result;
-    }
-  };
-
-} /* jdl:: */
diff --git a/ext/prometheus-cpp-lite-1.0/CMakeLists.txt b/ext/prometheus-cpp-lite-1.0/CMakeLists.txt
deleted file mode 100644
index 899eca89d..000000000
--- a/ext/prometheus-cpp-lite-1.0/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-project(prometheus-cpp-lite)
-cmake_minimum_required(VERSION 3.2)
-
-option(PROMETHEUS_BUILD_EXAMPLES "Build with examples" OFF)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
-
-if(WIN32)
-
-  # it prevent create Debug/ and Release folders in Visual Studio
-  foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
-    string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
-    set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_SOURCE_DIR}/bin )
-  endforeach()
-
-  set (INSTALL_PATH_BIN "${PROJECT_SOURCE_DIR}/installed/bin/")
-
-else() # not WIN32
-
-  set (INSTALL_PATH_BIN "bin/")
-
-endif()
-
-add_subdirectory("./core")
-
-add_subdirectory("./simpleapi")
-
-add_subdirectory("./3rdparty/http-client-lite")
-
-if(PROMETHEUS_BUILD_EXAMPLES)
-  add_subdirectory("./examples")
-endif()
-
-
diff --git a/ext/prometheus-cpp-lite-1.0/LICENSE b/ext/prometheus-cpp-lite-1.0/LICENSE
deleted file mode 100644
index 266f827c8..000000000
--- a/ext/prometheus-cpp-lite-1.0/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 biaks (ianiskr@gmail.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/ext/prometheus-cpp-lite-1.0/README.md b/ext/prometheus-cpp-lite-1.0/README.md
deleted file mode 100644
index 997e787d3..000000000
--- a/ext/prometheus-cpp-lite-1.0/README.md
+++ /dev/null
@@ -1,211 +0,0 @@
-# C++ Header-only Prometheus client library
-
-It is a tool for quickly adding metrics (and profiling) functionality to C++ projects.
-
-## Advantages:
-
-1. Written in pure C++,
-2. Header-only,
-3. Cross-platform,
-4. Compiles with C ++ 11, C ++ 14, C ++ 17 standards,
-5. Has no third-party dependencies,
-6. Several APIs for use in your projects,
-7. Saving metrics to a file (and then works with node_exporter) or sending via http (uses built-in header-only http-client-lite library),
-8. Possiblity to use different types for storing metrics data (default is uint32_t, but you can use double or uint64_t types if you want),
-9. Five types of metrics are supported: counter, gauge, summary, histogram and benchmark,
-10. Has detailed examples of use (see examples folder)
-
-## How it differs from the [jupp0r/prometheus-cpp](https://github.com/jupp0r/prometheus-cpp) project:
-
-1. I need a simple header only wariant library without dependencies to write metrics to a .prom file,
-2. I need the fastest possible work using integer values of counters (original project use only floating pointer values),
-3. The origianl project have problems on compilers that do not know how to do LTO optimization,
-4. I did not like the python style of the original project and the large amount of extra code in it and I wanted to make it lighter and more c++ classic.
-
-## How to use it:
-
-The library has two API:
-
-1. Complex API for those who want to control everything,
-2. Simple API for those who want to quickly add metrics to their C ++ (and it is actually just a wrapper around the complex API).
-
-### Let's start with a simple API because it's simple:
-
-To add it to your C++ project add these lines to your CMakeLists.txt file:
-
-```
-add_subdirectory("prometheus-cpp-lite/core")
-add_subdirectory("prometheus-cpp-lite/3rdparty/http-client-lite")
-add_subdirectory("prometheus-cpp-lite/simpleapi")
-target_link_libraries(your_target prometheus-cpp-simpleapi)
-```
-
-The simplest way to create a metric would be like this:
-
-```c++
-prometheus::simpleapi::METRIC_metric_t metric1 { "metric1", "first simple metric without any tag" };
-prometheus::simpleapi::METRIC_metric_t metric2 { "metric2", "second simple metric without any tag" };
-```
-
-where `METRIC` can be `counter`, `gauge`, `summary`, `histogram` or `benchmark`.
-
-If you want to access an existing metric again elsewhere in the code, you can do this:
-
-```c++
-prometheus::simpleapi::METRIC_metric_t metric2_yet_another_link { "metric2", "" };
-```
-
-this works because when adding a metric, it checks whether there is already a metric with the same name and, if there is one, a link to it is returned.
-
-You can create a family of metrics (metrics with tags) as follows:
-
-```c++
-prometheus::simpleapi::METRIC_family_t family  { "metric_family", "metric family" };
-prometheus::simpleapi::METRIC_metric_t metric1 { family.Add({{"name", "metric1"}}) };
-prometheus::simpleapi::METRIC_metric_t metric2 { family.Add({{"name", "metric2"}}) };
-```
-
-where METRIC can be `counter`, `gauge`, `summary`, `histogram` or `benchmark`.
-
-Next, you can do the following things with metrics:
-
-```c++
-metric++; // for increment it (only for counter and gauge metrics)
-metric += value; // for add value to metric (only for gauge metric)
-metric -= value; // for sub value from metric (only for gauge metric)
-metric = value;  // save current value (only gauge metrics)
-metric.start();  // start calculate time (only for benchmark metric)
-metric.stop();   // stop calculate time (only for benchmark metric)
-```
-
-You can change the settings of save (or send) metrics data as follows:
-
-```c++
-prometheus::simpleapi::saver.set_delay(period_in_seconds); // change the period of saving (or sending) metrics data in seconds (5 seconds by default)
-prometheus::simpleapi::saver.set_out_file(filename);       // change the name of the output file (metrics.prom by default)
-prometheus::simpleapi::saver.set_server_url(url);          // change the name of prometheus server (unset by default)
-```
-
-### Simple API complex example 1 (examples/simpleapi_example.cpp):
-
-```c++
-#include <prometheus/simpleapi.h>
-
-void main() {
-
-  using namespace prometheus::simpleapi;
-
-  counter_family_t family  { "simple_family", "simple family example" };
-  counter_metric_t metric1 { family.Add({{"name", "counter1"}}) };
-  counter_metric_t metric2 { family.Add({{"name", "counter2"}}) };
-
-  counter_metric_t metric3 { "simple_counter_1", "simple counter 1 without labels example" };
-  counter_metric_t metric4 { "simple_counter_2", "simple counter 2 without labels example" };
-
-  for (;; ) {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    const int random_value = std::rand();
-    if (random_value & 1) metric1++;
-    if (random_value & 2) metric2++;
-    if (random_value & 4) metric3++;
-    if (random_value & 8) metric4++;
-  }
-
-}
-```
-
-Output in "metrics.prom" file (by default) will be:
-
-```
-# HELP simple_family simple family example
-# TYPE simple_family counter
-simple_family{name="counter1"} 10
-simple_family{name="counter2"} 9
-# HELP simple_counter_1 simple counter 1 without labels example
-# TYPE simple_counter_1 counter
-simple_counter_1 6
-# HELP simple_counter_2 simple counter 2 without labels example
-# TYPE simple_counter_2 counter
-simple_counter_2 8
-```
-
-### Simple API complex example 2 (examples/simpleapi_use_in_class_example.cpp):
-
-```c++
-#include <prometheus/simpleapi.h>
-
-using namespace prometheus::simpleapi;
-
-class MyClass {
-
-  counter_family_t metric_family { "simple_family", "simple family example" };
-  counter_metric_t metric1 { metric_family.Add({{"name", "counter1"}}) };
-  counter_metric_t metric2 { metric_family.Add({{"name", "counter2"}}) };
-
-  counter_metric_t metric3 { "simple_counter_1", "simple counter 1 without labels example" };
-  counter_metric_t metric4 { "simple_counter_2", "simple counter 2 without labels example" };
-
-  benchmark_family_t benchmark_family { "simple_benchmark_family", "simple benchmark family example" };
-  benchmark_metric_t benchmark1 { benchmark_family.Add({{"benchmark", "1"}}) };
-  benchmark_metric_t benchmark2 { benchmark_family.Add({{"benchmark", "2"}}) };
-
-public:
-
-  MyClass() = default;
-
-  void member_to_do_something() {
-
-    benchmark1.start();
-    const int random_value = std::rand();
-    benchmark1.stop();
-
-    benchmark2.start();
-    if (random_value & 1)  metric1++;
-    if (random_value & 2)  metric2++;
-    if (random_value & 4)  metric3++;
-    if (random_value & 8)  metric4++;
-    benchmark2.stop();
-
-  }
-
-};
-
-void main() {
-
-  MyClass myClass;
-  benchmark_metric_t benchmark { "simple_benchmark", "simple benchmark example" };
-
-  for (;; ) {
-
-    benchmark.start();
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    benchmark.stop();
-
-    myClass.member_to_do_something();
-
-  }
-
-}
-```
-
-Output in "metrics.prom" file (by default) will be:
-
-```
-# HELP simple_family simple family example
-# TYPE simple_family counter
-simple_family{name="counter1"} 3
-simple_family{name="counter2"} 2
-# HELP simple_counter_1 simple counter 1 without labels example
-# TYPE simple_counter_1 counter
-simple_counter_1 3
-# HELP simple_counter_2 simple counter 2 without labels example
-# TYPE simple_counter_2 counter
-simple_counter_2 3
-# HELP simple_benchmark_family simple benchmark family example
-# TYPE simple_benchmark_family counter
-simple_benchmark_family{benchmark="1"} 0.0001088
-simple_benchmark_family{benchmark="2"} 1.48e-05
-# HELP simple_benchmark simple benchmark example
-# TYPE simple_benchmark counter
-simple_benchmark 6.0503248
-```
diff --git a/ext/prometheus-cpp-lite-1.0/core/CMakeLists.txt b/ext/prometheus-cpp-lite-1.0/core/CMakeLists.txt
deleted file mode 100644
index 70c932218..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-project(prometheus-cpp-lite-core)
-cmake_minimum_required(VERSION 3.2)
-
-file(GLOB_RECURSE PROMETHEUS_CPP_LITE_HEADERS *.h)
-
-# it is header only target
-
-add_library               (${PROJECT_NAME}     INTERFACE)
-target_sources            (${PROJECT_NAME}     INTERFACE ${PROMETHEUS_CPP_LITE_HEADERS})
-target_include_directories(${PROJECT_NAME}     INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-add_custom_target         (${PROJECT_NAME}-ide SOURCES   ${PROMETHEUS_CPP_LITE_HEADERS})
-target_link_libraries     (${PROJECT_NAME}     INTERFACE http-client-lite)
-
-set                       (${PROJECT_NAME}_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
-
-# it need for save_to_file_t
-if(NOT WIN32)
-  find_package(Threads)
-  target_link_libraries(${PROJECT_NAME} INTERFACE ${CMAKE_THREAD_LIBS_INIT})
-endif()
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/atomic_floating.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/atomic_floating.h
deleted file mode 100644
index 9cc7ff0fe..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/atomic_floating.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <type_traits>
-#include <atomic>
-
-namespace prometheus {
-
-  template <typename FloatingType>
-  inline std::atomic<FloatingType>& atomic_add_for_floating_types(std::atomic<FloatingType>& value,
-    const FloatingType& add) {
-    FloatingType desired;
-    FloatingType expected = value.load(std::memory_order_relaxed);
-    do {
-      desired = expected + add;
-    } while (!value.compare_exchange_weak(expected, desired));
-    return value;
-  }
-
-
-  template <typename FloatingType, class = typename std::enable_if<std::is_floating_point<FloatingType>::value, int>::type>
-  inline std::atomic<FloatingType>& operator++(std::atomic<FloatingType>& value) {
-    return atomic_add_for_floating_types(value, 1.0);
-  }
-
-  template <typename FloatingType, class = typename std::enable_if<std::is_floating_point<FloatingType>::value, int>::type>
-  inline std::atomic<FloatingType>& operator+=(std::atomic<FloatingType>& value, const FloatingType& val) {
-    return atomic_add_for_floating_types(value, val);
-  }
-
-  template <typename FloatingType, class = typename std::enable_if<std::is_floating_point<FloatingType>::value, int>::type>
-  inline std::atomic<FloatingType>& operator--(std::atomic<FloatingType>& value) {
-    return atomic_add_for_floating_types(value, -1.0);
-  }
-
-  template <typename FloatingType, class = typename std::enable_if<std::is_floating_point<FloatingType>::value, int>::type>
-  inline std::atomic<FloatingType>& operator-=(std::atomic<FloatingType>& value, const FloatingType& val) {
-    return atomic_add_for_floating_types(value, -val);
-  }
-
-}
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/benchmark.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/benchmark.h
deleted file mode 100644
index 166801ba8..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/benchmark.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-
-#include "prometheus/metric.h"
-#include "prometheus/family.h"
-
-#include <chrono>
-
-namespace prometheus {
-
-  class Benchmark : public Metric {
-
-    #ifndef NDEBUG
-      bool already_started = false;
-    #endif
-
-    std::chrono::time_point<std::chrono::high_resolution_clock>           start_;
-    std::chrono::time_point<std::chrono::high_resolution_clock>::duration elapsed = std::chrono::time_point<std::chrono::high_resolution_clock>::duration::zero(); // elapsed time
-
-  public:
-
-    using Value  = double;
-    using Family = CustomFamily<Benchmark>;
-
-    static const Metric::Type static_type = Metric::Type::Counter;
-
-    Benchmark() : Metric(Metric::Type::Counter) {}
-
-    void start() {
-
-      #ifndef NDEBUG
-        if (already_started)
-          throw std::runtime_error("try to start already started counter");
-        else
-          already_started = true;
-      #endif
-
-      start_ = std::chrono::high_resolution_clock::now();
-
-    }
-
-    void stop() {
-
-      #ifndef NDEBUG
-        if (already_started == false)
-          throw std::runtime_error("try to stop already stoped counter");
-      #endif
-
-      std::chrono::time_point<std::chrono::high_resolution_clock> stop;
-      stop = std::chrono::high_resolution_clock::now();
-      elapsed += stop - start_;
-
-      #ifndef NDEBUG
-        already_started = false;
-      #endif
-
-    }
-
-    double Get() const {
-      return std::chrono::duration_cast<std::chrono::duration<double>>(elapsed).count();
-    }
-
-    virtual ClientMetric Collect() const {
-      ClientMetric metric;
-      metric.counter.value = Get();
-      return metric;
-    }
-
-  };
-
-
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/builder.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/builder.h
deleted file mode 100644
index 74f22b97d..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/builder.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <string>
-#include <map>
-#include "registry.h"
-
-namespace prometheus {
-
-  template <typename CustomMetric>
-  class Builder {
-
-    Family::Labels labels_;
-    std::string name_;
-    std::string help_;
-
-  public:
-    Builder& Labels(const std::map<const std::string, const std::string>& labels) {
-      labels_ = labels;
-      return *this;
-    }
-    Builder& Name(const std::string& name) {
-      name_ = name;
-      return *this;
-    }
-    Builder& Help(const std::string& help) {
-      help_ = help;
-      return *this;
-    }
-    CustomFamily<CustomMetric>& Register(Registry& registry) {
-      return registry.Add<CustomFamily<CustomMetric>>(name_, help_, labels_);
-    }
-
-  };
-
-}
\ No newline at end of file
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/ckms_quantiles.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/ckms_quantiles.h
deleted file mode 100644
index 267d442ae..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/ckms_quantiles.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#pragma once
-
-#include <array>
-#include <cstddef>
-#include <functional>
-#include <vector>
-
-namespace prometheus {
-
-  namespace detail {
-
-    class CKMSQuantiles {
-
-      public:
-
-        struct Quantile {
-
-          double quantile;
-          double error;
-          double u;
-          double v;
-
-          Quantile(double quantile, double error)
-          : quantile(quantile),
-            error(error),
-            u(2.0 * error / (1.0 - quantile)),
-            v(2.0 * error / quantile) {}
-
-        };
-
-      private:
-
-        struct Item {
-
-          double value;
-          int    g;
-          int    delta;
-
-          Item(double value, int lower_delta, int delta)
-            : value(value), g(lower_delta), delta(delta) {}
-
-        };
-
-     public:
-
-      explicit CKMSQuantiles(const std::vector<Quantile>& quantiles)
-        : quantiles_(quantiles), count_(0), buffer_{}, buffer_count_(0) {}
-
-      void insert(double value) {
-        buffer_[buffer_count_] = value;
-        ++buffer_count_;
-
-        if (buffer_count_ == buffer_.size()) {
-          insertBatch();
-          compress();
-        }
-      }
-
-      double get(double q) {
-        insertBatch();
-        compress();
-
-        if (sample_.empty()) {
-          return std::numeric_limits<double>::quiet_NaN();
-        }
-
-        int rankMin = 0;
-        const auto desired = static_cast<int>(q * static_cast<double>(count_));
-        const auto bound = desired + (allowableError(desired) / 2);
-
-        auto it = sample_.begin();
-        decltype(it) prev;
-        auto cur = it++;
-
-        while (it != sample_.end()) {
-          prev = cur;
-          cur = it++;
-
-          rankMin += prev->g;
-
-          if (rankMin + cur->g + cur->delta > bound) {
-            return prev->value;
-          }
-        }
-
-        return sample_.back().value;
-      }
-
-      void reset() {
-        count_ = 0;
-        sample_.clear();
-        buffer_count_ = 0;
-      }
-
-     private:
-
-      double allowableError(int rank) {
-        auto size = sample_.size();
-        double minError = static_cast<double>(size + 1);
-
-        for (const auto& q : quantiles_.get()) {
-          double error;
-          if (static_cast<double>(rank) <= q.quantile * static_cast<double>(size)) {
-            error = q.u * static_cast<double>(size - rank);
-          }
-          else {
-            error = q.v * rank;
-          }
-          if (error < minError) {
-            minError = error;
-          }
-        }
-
-        return minError;
-      }
-
-      bool insertBatch() {
-        if (buffer_count_ == 0) {
-          return false;
-        }
-
-        std::sort(buffer_.begin(), buffer_.begin() + buffer_count_);
-
-        std::size_t start = 0;
-        if (sample_.empty()) {
-          sample_.emplace_back(buffer_[0], 1, 0);
-          ++start;
-          ++count_;
-        }
-
-        std::size_t idx = 0;
-        std::size_t item = idx++;
-
-        for (std::size_t i = start; i < buffer_count_; ++i) {
-          double v = buffer_[i];
-          while (idx < sample_.size() && sample_[item].value < v) {
-            item = idx++;
-          }
-
-          if (sample_[item].value > v) {
-            --idx;
-          }
-
-          int delta;
-          if (idx - 1 == 0 || idx + 1 == sample_.size()) {
-            delta = 0;
-          }
-          else {
-            delta = static_cast<int>(std::floor(allowableError(static_cast<int>(idx + 1)))) + 1;
-          }
-
-          sample_.emplace(sample_.begin() + idx, v, 1, delta);
-          count_++;
-          item = idx++;
-        }
-
-        buffer_count_ = 0;
-        return true;
-      }
-
-      void compress() {
-        if (sample_.size() < 2) {
-          return;
-        }
-
-        std::size_t idx = 0;
-        std::size_t prev;
-        std::size_t next = idx++;
-
-        while (idx < sample_.size()) {
-          prev = next;
-          next = idx++;
-
-          if (sample_[prev].g + sample_[next].g + sample_[next].delta <=
-            allowableError(static_cast<int>(idx - 1))) {
-            sample_[next].g += sample_[prev].g;
-            sample_.erase(sample_.begin() + prev);
-          }
-        }
-      }
-
-    private:
-
-      const std::reference_wrapper<const std::vector<Quantile>> quantiles_;
-
-      std::size_t             count_;
-      std::vector<Item>       sample_;
-      std::array<double, 500> buffer_;
-      std::size_t             buffer_count_;
-    };
-
-  }  // namespace detail
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/client_metric.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/client_metric.h
deleted file mode 100644
index 10e12ff7e..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/client_metric.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-#include <tuple>
-#include <vector>
-
-namespace prometheus {
-
-  // ���������, � ������� ���������� �������� ������ ����� �� �������������
-  
-  struct ClientMetric {
-
-    // Label
-
-    struct Label {
-
-      std::string name;
-      std::string value;
-
-      Label(const std::string name_, const std::string value_) : name(name_), value(value_) {}
-
-      bool operator<(const Label& rhs) const {
-        return std::tie(name, value) < std::tie(rhs.name, rhs.value);
-      }
-
-      bool operator==(const Label& rhs) const {
-        return std::tie(name, value) == std::tie(rhs.name, rhs.value);
-      }
-
-    };
-
-    std::vector<Label> label;
-
-    // Counter
-
-    struct Counter {
-      double value = 0.0;
-    };
-
-    Counter counter;
-
-    // Gauge
-
-    struct Gauge {
-      double value = 0.0;
-    };
-
-    Gauge gauge;
-
-    // Summary
-
-    struct Quantile {
-      double quantile = 0.0;
-      double value    = 0.0;
-    };
-
-    struct Summary {
-      std::uint64_t         sample_count = 0;
-      double                sample_sum   = 0.0;
-      std::vector<Quantile> quantile;
-    };
-
-    Summary summary;
-
-    // Histogram
-
-    struct Bucket {
-      std::uint64_t cumulative_count = 0;
-      double        upper_bound      = 0.0;
-    };
-
-    struct Histogram {
-      std::uint64_t       sample_count = 0;
-      double              sample_sum   = 0.0;
-      std::vector<Bucket> bucket;
-    };
-
-    Histogram histogram;
-
-    // Untyped
-
-    struct Untyped {
-      double value = 0;
-    };
-
-    Untyped untyped;
-
-    // Timestamp
-
-    std::int64_t timestamp_ms = 0;
-
-  };
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/collectable.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/collectable.h
deleted file mode 100644
index a2e11be17..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/collectable.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include "prometheus/metric_family.h"
-
-namespace prometheus {
-
-  /// @brief Interface implemented by anything that can be used by Prometheus to
-  /// collect metrics.
-  ///
-  /// A Collectable has to be registered for collection. See Registry.
-  class Collectable {
-
-    public:
-
-      //Collectable() = default;
-
-      virtual ~Collectable() = default;
-
-      using MetricFamilies = std::vector<MetricFamily>;
-
-      /// \brief Returns a list of metrics and their samples.
-      virtual MetricFamilies Collect() const = 0;
-  };
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/counter.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/counter.h
deleted file mode 100644
index bd309c43a..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/counter.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma once
-
-#include "prometheus/atomic_floating.h"
-#include "prometheus/metric.h"
-#include "prometheus/family.h"
-
-#include "prometheus/builder.h"
-
-#include <atomic>
-
-namespace prometheus {
-
-  /// \brief A counter metric to represent a monotonically increasing value.
-  ///
-  /// This class represents the metric type counter:
-  /// https://prometheus.io/docs/concepts/metric_types/#counter
-  ///
-  /// The value of the counter can only increase. Example of counters are:
-  /// - the number of requests served
-  /// - tasks completed
-  /// - errors
-  ///
-  /// Do not use a counter to expose a value that can decrease - instead use a
-  /// Gauge.
-  ///
-  /// The class is thread-safe. No concurrent call to any API of this type causes
-  /// a data race.
-
-#include <stdint.h>
-
-#if UINTPTR_MAX == 0xffFFffFF
-// 32-bit platform
-template <typename Value_ = uint32_t>
-#elif UINTPTR_MAX == 0xffFFffFFffFFffFF
-// 64-bit platform
-template <typename Value_ = uint64_t>
-#else
-#error Unknown platform - does not look either like 32-bit or 64-bit
-#endif
-  class Counter : public Metric {
-
-    std::atomic<Value_> value{ 0 };
-
-  public:
-
-    using Value  = Value_;
-    using Family = CustomFamily<Counter<Value>>;
-
-    static const Metric::Type static_type = Metric::Type::Counter;
-
-    Counter() : Metric (Metric::Type::Counter) {}  ///< \brief Create a counter that starts at 0.
-    Counter(const Counter<Value_> &rhs) : Metric(static_type), value{rhs.value.load()} {}
-    
-    // original API
-
-    void Increment() { ///< \brief Increment the counter by 1.
-      ++value;
-    }
-
-    void Increment(const Value& val) { ///< \brief Increment the counter by a given amount. The counter will not change if the given amount is negative.
-      if (val > 0)
-        value += val;
-    }
-
-    const Value Get() const { ///< \brief Get the current value of the counter.
-      return value;
-    }
-
-    virtual ClientMetric Collect() const { ///< /// \brief Get the current value of the counter. Collect is called by the Registry when collecting metrics.
-      ClientMetric metric;
-      metric.counter.value = static_cast<double>(value);
-      return metric;
-    }
-
-    // new API
-
-    Counter& operator ++() {
-      ++value;
-      return *this;
-    }
-
-    Counter& operator++ (int) {
-      ++value;
-      return *this;
-    }
-
-    Counter& operator += (const Value& val) {
-      value += val;
-      return *this;
-    }
-
-  };
-
-  /// \brief Return a builder to configure and register a Counter metric.
-  ///
-  /// @copydetails Family<>::Family()
-  ///
-  /// Example usage:
-  ///
-  /// \code
-  /// auto registry = std::make_shared<Registry>();
-  /// auto& counter_family = prometheus::BuildCounter()
-  ///                            .Name("some_name")
-  ///                            .Help("Additional description.")
-  ///                            .Labels({{"key", "value"}})
-  ///                            .Register(*registry);
-  ///
-  /// ...
-  /// \endcode
-  ///
-  /// \return An object of unspecified type T, i.e., an implementation detail
-  /// except that it has the following members:
-  ///
-  /// - Name(const std::string&) to set the metric name,
-  /// - Help(const std::string&) to set an additional description.
-  /// - Label(const std::map<std::string, std::string>&) to assign a set of
-  ///   key-value pairs (= labels) to the metric.
-  ///
-  /// To finish the configuration of the Counter metric, register it with
-  /// Register(Registry&).
-  using BuildCounter = Builder<Counter<double>>;
-
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/family.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/family.h
deleted file mode 100644
index 0ad2ed714..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/family.h
+++ /dev/null
@@ -1,356 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <cassert>
-#include <stdexcept>
-
-#include "prometheus/collectable.h"
-#include "prometheus/metric.h"
-#include "prometheus/hash.h"
-
-namespace prometheus {
-
-  /// \brief A metric of type T with a set of labeled dimensions.
-  ///
-  /// One of Prometheus main feature is a multi-dimensional data model with time
-  /// series data identified by metric name and key/value pairs, also known as
-  /// labels. A time series is a series of data points indexed (or listed or
-  /// graphed) in time order (https://en.wikipedia.org/wiki/Time_series).
-  ///
-  /// An instance of this class is exposed as multiple time series during
-  /// scrape, i.e., one time series for each set of labels provided to Add().
-  ///
-  /// For example it is possible to collect data for a metric
-  /// `http_requests_total`, with two time series:
-  ///
-  /// - all HTTP requests that used the method POST
-  /// - all HTTP requests that used the method GET
-  ///
-  /// The metric name specifies the general feature of a system that is
-  /// measured, e.g., `http_requests_total`. Labels enable Prometheus's
-  /// dimensional data model: any given combination of labels for the same
-  /// metric name identifies a particular dimensional instantiation of that
-  /// metric. For example a label for 'all HTTP requests that used the method
-  /// POST' can be assigned with `method= "POST"`.
-  ///
-  /// Given a metric name and a set of labels, time series are frequently
-  /// identified using this notation:
-  ///
-  ///     <metric name> { < label name >= <label value>, ... }
-  ///
-  /// It is required to follow the syntax of metric names and labels given by:
-  /// https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
-  ///
-  /// The following metric and label conventions are not required for using
-  /// Prometheus, but can serve as both a style-guide and a collection of best
-  /// practices: https://prometheus.io/docs/practices/naming/
-  ///
-  /// tparam T One of the metric types Counter, Gauge, Histogram or Summary.
-  class Family : public Collectable {
-
-    public:
-
-      using Hash      = std::size_t;
-      using Label     = std::pair<const std::string, const std::string>;
-      using Labels    = std::map <const std::string, const std::string>;
-      using MetricPtr = std::unique_ptr<Metric>;
-
-      const   Metric::Type                 type;
-      const   std::string                  name;
-      const   std::string                  help;
-      const   Labels                       constant_labels;
-      mutable std::mutex                   mutex;
-
-      std::unordered_map<Hash, MetricPtr>  metrics;
-      std::unordered_map<Hash, Labels>     labels;
-      std::unordered_map<Metric*, Hash>    labels_reverse_lookup;
-
-
-      /// \brief Compute the hash value of a map of labels.
-      ///
-      /// \param labels The map that will be computed the hash value.
-      ///
-      /// \returns The hash value of the given labels.
-      static Hash hash_labels (const Labels& labels) {
-        size_t seed = 0;
-        for (const Label& label : labels)
-          detail::hash_combine (&seed, label.first, label.second);
-
-        return seed;
-      }
-
-      static bool isLocaleIndependentDigit        (char c) { return '0' <= c && c <= '9'; }
-      static bool isLocaleIndependentAlphaNumeric (char c) { return isLocaleIndependentDigit(c) || ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'); }
-
-      bool nameStartsValid (const std::string& name) {
-        if (name.empty())                           return false; // must not be empty
-        if (isLocaleIndependentDigit(name.front())) return false; // must not start with a digit
-        if (name.compare(0, 2, "__") == 0)          return false; // must not start with "__"
-        return true;
-      }
-
-      /// \brief Check if the metric name is valid
-      ///
-      /// The metric name regex is "[a-zA-Z_:][a-zA-Z0-9_:]*"
-      ///
-      /// \see https://prometheus.io/docs/concepts/data_model/
-      ///
-      /// \param name metric name
-      /// \return true is valid, false otherwise
-      bool CheckMetricName (const std::string& name) {
-
-        if (!nameStartsValid(name))
-          return false;
-
-        for (const char& c : name)
-          if ( !isLocaleIndependentAlphaNumeric(c) && c != '_' && c != ':' )
-            return false;
-
-        return true;
-
-      }
-
-      /// \brief Check if the label name is valid
-      ///
-      /// The label name regex is "[a-zA-Z_][a-zA-Z0-9_]*"
-      ///
-      /// \see https://prometheus.io/docs/concepts/data_model/
-      ///
-      /// \param name label name
-      /// \return true is valid, false otherwise
-      bool CheckLabelName (const std::string& name) {
-
-        if (!nameStartsValid(name))
-          return false;
-
-        for (const char& c : name)
-          if (!isLocaleIndependentAlphaNumeric(c) && c != '_')
-            return false;
-
-        return true;
-
-      }
-
-      /// \brief Create a new metric.
-      ///
-      /// Every metric is uniquely identified by its name and a set of key-value
-      /// pairs, also known as labels. Prometheus's query language allows filtering
-      /// and aggregation based on metric name and these labels.
-      ///
-      /// This example selects all time series that have the `http_requests_total`
-      /// metric name:
-      ///
-      ///     http_requests_total
-      ///
-      /// It is possible to assign labels to the metric name. These labels are
-      /// propagated to each dimensional data added with Add(). For example if a
-      /// label `job= "prometheus"` is provided to this constructor, it is possible
-      /// to filter this time series with Prometheus's query language by appending
-      /// a set of labels to match in curly braces ({})
-      ///
-      ///     http_requests_total{job= "prometheus"}
-      ///
-      /// For further information see: [Quering Basics]
-      /// (https://prometheus.io/docs/prometheus/latest/querying/basics/)
-      ///
-      /// \param name Set the metric name.
-      /// \param help Set an additional description.
-      /// \param constant_labels Assign a set of key-value pairs (= labels) to the
-      /// metric. All these labels are propagated to each time series within the
-      /// metric.
-      /// \throw std::runtime_exception on invalid metric or label names.
-      Family (Metric::Type type_, const std::string& name_, const std::string& help_, const Labels& constant_labels_)
-      : type(type_), name(name_), help(help_), constant_labels(constant_labels_) {
-
-        if (!CheckMetricName(name_))
-          throw std::invalid_argument("Invalid metric name");
-
-        for (const Label& label_pair : constant_labels) {
-          const std::string& label_name = label_pair.first;
-          if (!CheckLabelName(label_name))
-            throw std::invalid_argument("Invalid label name");
-        }
-
-      }
-
-      /// \brief Remove the given dimensional data.
-      ///
-      /// \param metric Dimensional data to be removed. The function does nothing,
-      /// if the given metric was not returned by Add().
-      void Remove (Metric* metric) {
-        std::lock_guard<std::mutex> lock{ mutex };
-
-        if (labels_reverse_lookup.count(metric) == 0)
-          return;
-
-        const Hash hash = labels_reverse_lookup.at(metric);
-        metrics.erase(hash);
-        labels.erase(hash);
-        labels_reverse_lookup.erase(metric);
-
-      }
-
-      /// \brief Returns true if the dimensional data with the given labels exist
-      ///
-      /// \param labels A set of key-value pairs (= labels) of the dimensional data.
-      bool Has (const Labels& labels) const {
-        const Hash hash = hash_labels (labels);
-        std::lock_guard<std::mutex> lock{ mutex };
-        return metrics.find(hash) != metrics.end();
-      }
-
-      /// \brief Returns the name for this family.
-      ///
-      /// \return The family name.
-      const std::string& GetName() const {
-        return name;
-      }
-
-      /// \brief Returns the constant labels for this family.
-      ///
-      /// \return All constant labels as key-value pairs.
-      const Labels& GetConstantLabels() const {
-        return constant_labels;
-      }
-
-      /// \brief Returns the current value of each dimensional data.
-      ///
-      /// Collect is called by the Registry when collecting metrics.
-      ///
-      /// \return Zero or more samples for each dimensional data.
-      MetricFamilies Collect() const override {
-        std::lock_guard<std::mutex> lock{ mutex };
-
-        if (metrics.empty())
-          return {};
-
-        MetricFamily family = MetricFamily{};
-        family.type = type;
-        family.name = name;
-        family.help = help;
-        family.metric.reserve(metrics.size());
-
-        for (const std::pair<const Hash, MetricPtr>& metric_pair : metrics) {
-
-          ClientMetric collected = metric_pair.second->Collect();
-          for (const Label& constant_label : constant_labels)
-            collected.label.emplace_back(ClientMetric::Label(constant_label.first, constant_label.second));
-
-          const Labels& metric_labels = labels.at(metric_pair.first);
-          for (const Label& metric_label : metric_labels)
-            collected.label.emplace_back(ClientMetric::Label(metric_label.first, metric_label.second));
-
-          family.metric.push_back(std::move(collected));
-
-        }
-
-        return { family };
-      }
-
-  };
-
-
-  template <typename CustomMetric>
-  class CustomFamily : public Family {
-
-    public:
-
-      static const Metric::Type static_type = CustomMetric::static_type;
-
-      CustomFamily(const std::string& name, const std::string& help, const Family::Labels& constant_labels)
-        : Family(static_type, name, help, constant_labels) {}
-
-      /// \brief Add a new dimensional data.
-      ///
-      /// Each new set of labels adds a new dimensional data and is exposed in
-      /// Prometheus as a time series. It is possible to filter the time series
-      /// with Prometheus's query language by appending a set of labels to match in
-      /// curly braces ({})
-      ///
-      ///     http_requests_total{job= "prometheus",method= "POST"}
-      ///
-      /// \param labels Assign a set of key-value pairs (= labels) to the
-      /// dimensional data. The function does nothing, if the same set of labels
-      /// already exists.
-      /// \param args Arguments are passed to the constructor of metric type T. See
-      /// Counter, Gauge, Histogram or Summary for required constructor arguments.
-      /// \return Return the newly created dimensional data or - if a same set of
-      /// labels already exists - the already existing dimensional data.
-      /// \throw std::runtime_exception on invalid label names.
-      template <typename... Args>
-      CustomMetric& Add (const Labels& new_labels, Args&&... args) {
-        const Hash hash = hash_labels (new_labels);
-        std::lock_guard<std::mutex> lock{ mutex };
-
-        // try to find existing one
-        auto metrics_iter = metrics.find(hash);
-        if (metrics_iter != metrics.end()) {
-          #ifndef NDEBUG
-            // check that we have stored labels for this existing metric
-            auto labels_iter = labels.find(hash);
-            assert(labels_iter != labels.end());
-            const Labels& stored_labels = labels_iter->second;
-            assert(new_labels == stored_labels);
-          #endif
-          return dynamic_cast<CustomMetric&>(*metrics_iter->second);
-        }
-
-        // check labels before create the new one
-        for (const Label& label_pair : new_labels) {
-          const std::string& label_name = label_pair.first;
-          if (!CheckLabelName(label_name))
-            throw std::invalid_argument("Invalid label name");
-          if (constant_labels.count(label_name))
-            throw std::invalid_argument("Label name already present in constant labels");
-        }
-
-        // create new one
-        std::unique_ptr<CustomMetric> metric_ptr (new CustomMetric(std::forward<Args>(args)...));
-        CustomMetric& metric = *metric_ptr;
-
-        const auto stored_metric = metrics.insert(std::make_pair(hash, std::move(metric_ptr)));
-        assert(stored_metric.second);
-        labels.insert({ hash, new_labels });
-        labels_reverse_lookup.insert({ stored_metric.first->second.get(), hash });
-        
-        return metric;
-      }
-
-      /// \brief Return a builder to configure and register a Counter metric.
-      ///
-      /// @copydetails family_base_t<>::family_base_t()
-      ///
-      /// Example usage:
-      ///
-      /// \code
-      /// auto registry = std::make_shared<Registry>();
-      /// auto& counter_family = prometheus::Counter_family::build("some_name", "Additional description.", {{"key", "value"}}, *registry);
-      ///
-      /// ...
-      /// \endcode
-      ///
-      /// \return An object of unspecified type T, i.e., an implementation detail
-      /// except that it has the following members:
-      ///
-      /// - Name(const std::string&) to set the metric name,
-      /// - Help(const std::string&) to set an additional description.
-      /// - Label(const std::map<std::string, std::string>&) to assign a set of
-      ///   key-value pairs (= labels) to the metric.
-      ///
-      /// To finish the configuration of the Counter metric, register it with
-      /// Register(Registry&).
-      template <typename Registry>
-      static CustomFamily& Build(Registry& registry, const std::string& name, const std::string& help, const Family::Labels& labels = Family::Labels()) {
-        return registry.template Add<CustomFamily>(name, help, labels);
-      }
-
-  };
-
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/gateway.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/gateway.h
deleted file mode 100644
index 71f9fc0b3..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/gateway.h
+++ /dev/null
@@ -1,205 +0,0 @@
-#pragma once
-
-#include "prometheus/collectable.h"
-#include "prometheus/text_serializer.h"
-#include "prometheus/metric_family.h"
-
-#include <jdl/httpclientlite.h>
-
-#include <memory>
-#include <mutex>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <map>
-#include <future>
-#include <algorithm>
-#include <utility>
-
-
-namespace prometheus {
-
-  class  Gateway {
-    using CollectableEntry = std::pair<std::weak_ptr<Collectable>, std::string>;
-
-    std::string job_uri_;
-    std::string labels_;
-
-    std::mutex mutex_;
-
-    std::vector<CollectableEntry> collectables_;
-
-    enum class HttpMethod : uint8_t{
-      Post,
-      Put,
-      Delete,
-    };
-
-  public:
-    using Labels = std::map<std::string, std::string>;
-
-    Gateway(const std::string host, const std::string port,
-            const std::string jobname, const Labels& labels = {})
-      : job_uri_(host + ':' + port + std::string("/metrics/job/") + jobname)
-      , labels_{}
-    {
-      std::stringstream label_strm;
-      for (const auto& label : labels) {
-        label_strm << "/" << label.first << "/" << label.second;
-      }
-      labels_ = label_strm.str();
-    }
-
-    void RegisterCollectable(const std::weak_ptr<Collectable>& collectable,
-                             const Labels* labels = nullptr) {
-      std::stringstream label_strm;
-
-      if (labels != nullptr) {
-        for (const auto& label : *labels) {
-          label_strm << "/" << label.first << "/" << label.second;
-        }
-      }
-
-      CleanupStalePointers(collectables_);
-      collectables_.emplace_back(std::make_pair(collectable, label_strm.str()));
-    }
-
-
-    static const Labels GetInstanceLabel(const std::string& hostname) {
-      if (hostname.empty()) {
-        return Gateway::Labels{};
-      }
-
-      return Gateway::Labels{{"instance", hostname}};
-    }
-
-
-    // Push metrics to the given pushgateway.
-    int Push() {
-      return push(HttpMethod::Post);
-    }
-
-
-    std::future<int> AsyncPush() {
-      return async_push(HttpMethod::Post);
-    }
-
-
-    // PushAdd metrics to the given pushgateway.
-    int PushAdd() {
-      return push(HttpMethod::Put);
-    }
-
-
-    std::future<int> AsyncPushAdd() {
-      return async_push(HttpMethod::Put);
-    }
-
-
-    // Delete metrics from the given pushgateway.
-    int Delete() {
-      return performHttpRequest(HttpMethod::Delete, job_uri_, {});
-    }
-
-    // Delete metrics from the given pushgateway.
-    std::future<int> AsyncDelete() {
-      return std::async(std::launch::async, [&] { return Delete(); });
-    }
-
-
-  private:
-    std::string getUri(const CollectableEntry& collectable) const {
-      return (job_uri_ + labels_ + collectable.second);
-    }
-
-
-    int performHttpRequest(HttpMethod /*method*/, const std::string& uri_str, const std::string& body) {
-      std::lock_guard<std::mutex> l(mutex_);
-
-      /* Stub function. The implementation will be later, after connecting the
-       * additional library of HTTP requests. */
-
-      jdl::URI uri(uri_str);
-      jdl::HTTPResponse response = jdl::HTTPClient::request(jdl::HTTPClient::m_post, uri, body);
-
-      return std::stoi(response.response);
-    }
-
-
-    int push(HttpMethod method) {
-      const auto serializer = TextSerializer{};
-
-      for (const auto& wcollectable : collectables_) {
-        auto collectable = wcollectable.first.lock();
-        if (!collectable) {
-          continue;
-        }
-
-        auto metrics = collectable->Collect();
-        auto uri = getUri(wcollectable);
-
-        std::stringstream body;
-        serializer.Serialize(body, metrics);
-        std::string body_str = body.str();
-
-        auto status_code = performHttpRequest(method, uri, body_str);
-
-        if (status_code < 100 || status_code >= 400) {
-          return status_code;
-        }
-      }
-
-      return 200;
-    }
-
-
-    std::future<int> async_push(HttpMethod method) {
-      const auto serializer = TextSerializer{};
-      std::vector<std::future<int>> futures;
-
-      for (const auto& wcollectable : collectables_) {
-        auto collectable = wcollectable.first.lock();
-        if (!collectable) {
-          continue;
-        }
-
-        auto metrics = collectable->Collect();
-        auto uri = getUri(wcollectable);
-
-        std::stringstream body;
-        serializer.Serialize(body, metrics);
-        auto body_ptr = std::make_shared<std::string>(body.str());
-
-        futures.emplace_back(std::async(std::launch::async, [method, &uri, &body_ptr, this] {
-          return performHttpRequest(method, uri, *body_ptr);
-        }));
-      }
-
-      const auto reduceFutures = [](std::vector<std::future<int>> lfutures) {
-        auto final_status_code = 200;
-
-        for (auto& future : lfutures) {
-          auto status_code = future.get();
-
-          if (status_code < 100 || status_code >= 400) {
-            final_status_code = status_code;
-          }
-        }
-
-        return final_status_code;
-      };
-
-      return std::async(std::launch::async, reduceFutures, std::move(futures));
-    }
-
-
-    static void CleanupStalePointers(std::vector<CollectableEntry>& collectables) {
-      collectables.erase(std::remove_if(std::begin(collectables), std::end(collectables),
-                                        [](const CollectableEntry& candidate) {
-                                          return candidate.first.expired();
-                                        }),
-                         std::end(collectables));
-    }
-  };
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/gauge.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/gauge.h
deleted file mode 100644
index 2e4a4db8b..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/gauge.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#pragma once
-
-#include "prometheus/atomic_floating.h"
-#include "prometheus/metric.h"
-#include "prometheus/family.h"
-
-#include "prometheus/builder.h"
-
-#include <atomic>
-#include <ctime>
-
-namespace prometheus {
-
-  /// \brief A gauge metric to represent a value that can arbitrarily go up and
-  /// down.
-  ///
-  /// The class represents the metric type gauge:
-  /// https://prometheus.io/docs/concepts/metric_types/#gauge
-  ///
-  /// Gauges are typically used for measured values like temperatures or current
-  /// memory usage, but also "counts" that can go up and down, like the number of
-  /// running processes.
-  ///
-  /// The class is thread-safe. No concurrent call to any API of this type causes
-  /// a data race.
-  #include <stdint.h>
-
-  #if UINTPTR_MAX == 0xffFFffFF
-  // 32-bit
-  template <typename Value_ = uint32_t>
-  #elif UINTPTR_MAX == 0xffFFffFFffFFffFF
-  // 64-bit
-  template <typename Value_ = uint64_t>
-  #else
-  #error Unknown platform - does not look either like 32-bit or 64-bit
-  #endif
-  class Gauge : public Metric {
-
-    std::atomic<Value_> value { 0 };
-
-    public:
-
-      using Value  = Value_;
-      using Family = CustomFamily<Gauge<Value>>;
-
-      static const Metric::Type static_type = Metric::Type::Gauge;
-
-
-      Gauge()                   : Metric (static_type) {}                  ///< \brief Create a gauge that starts at 0.
-      Gauge(const Value value_) : Metric(static_type), value{ value_ } {}  ///< \brief Create a gauge that starts at the given amount.
-      Gauge(const Gauge<Value_> &rhs) : Metric(rhs.static_type), value{rhs.value.load()} {}
-
-      // original API
-
-      void Increment() { ++value; }                      ///< \brief Increment the gauge by 1.
-      void Increment(const Value& val) { value += val; } ///< \brief Increment the gauge by the given amount.
-
-      void Decrement() { --value; }                      ///< \brief Decrement the gauge by 1.
-      void Decrement(const Value& val) { value -= val; } ///< \brief Decrement the gauge by the given amount.
-
-      void SetToCurrentTime() {                          ///< \brief Set the gauge to the current unixtime in seconds.
-        const time_t time = std::time(nullptr);
-        value = static_cast<Value>(time);
-      }
-      void Set(const Value& val) { value = val; }        ///< \brief Set the gauge to the given value.
-      const Value Get() const { return value; }          ///< \brief Get the current value of the gauge.
-
-      virtual ClientMetric Collect() const {             ///< \brief Get the current value of the gauge. Collect is called by the Registry when collecting metrics.
-        ClientMetric metric;
-        metric.gauge.value = static_cast<double>(value);
-        return metric;
-      }
-
-      // new API
-
-      Gauge& operator ++() {
-        ++value;
-        return *this;
-      }
-
-      Gauge& operator++ (int) {
-        ++value;
-        return *this;
-      }
-
-      Gauge& operator --() {
-        --value;
-        return *this;
-      }
-
-      Gauge& operator-- (int) {
-        --value;
-        return *this;
-      }
-
-      Gauge& operator+=(const Value& val) {
-        value += val;
-        return *this;
-      }
-
-      Gauge& operator-=(const Value& val) {
-        value -= val;
-        return *this;
-      }
-
-  };
-
-
-  /// \brief Return a builder to configure and register a Gauge metric.
-  ///
-  /// @copydetails Family<>::Family()
-  ///
-  /// Example usage:
-  ///
-  /// \code
-  /// auto registry = std::make_shared<Registry>();
-  /// auto& gauge_family = prometheus::BuildGauge()
-  ///                          .Name("some_name")
-  ///                          .Help("Additional description.")
-  ///                          .Labels({{"key", "value"}})
-  ///                          .Register(*registry);
-  ///
-  /// ...
-  /// \endcode
-  ///
-  /// \return An object of unspecified type T, i.e., an implementation detail
-  /// except that it has the following members:
-  ///
-  /// - Name(const std::string&) to set the metric name,
-  /// - Help(const std::string&) to set an additional description.
-  /// - Label(const std::map<std::string, std::string>&) to assign a set of
-  ///   key-value pairs (= labels) to the metric.
-  ///
-  /// To finish the configuration of the Gauge metric register it with
-  /// Register(Registry&).
-  using BuildGauge = Builder<Gauge<double>>;
-
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/hash.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/hash.h
deleted file mode 100644
index 52a947b08..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/hash.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <functional>
-
-namespace prometheus {
-
-  namespace detail {
-
-    /// \brief Combine a hash value with nothing.
-    /// It's the boundary condition of this serial functions.
-    ///
-    /// \param seed Not effect.
-    inline void hash_combine(std::size_t *) {}
-
-    /// \brief Combine the given hash value with another obeject.
-    ///
-    /// \param seed The given hash value. It's a input/output parameter.
-    /// \param value The object that will be combined with the given hash value.
-    template <typename T>
-    inline void hash_combine(std::size_t *seed, const T &value) {
-      *seed ^= std::hash<T>{}(value) + 0x9e3779b9 + (*seed << 6) + (*seed >> 2);
-    }
-
-    /// \brief Combine the given hash value with another objects. It's a recursion。
-    ///
-    /// \param seed The give hash value. It's a input/output parameter.
-    /// \param value The object that will be combined with the given hash value.
-    /// \param args The objects that will be combined with the given hash value.
-    template <typename T, typename... Types>
-    inline void hash_combine(std::size_t *seed, const T &value,
-                             const Types &...args) {
-      hash_combine(seed, value);
-      hash_combine(seed, args...);
-    }
-
-    /// \brief Compute a hash value of the given args.
-    ///
-    /// \param args The arguments that will be computed hash value.
-    /// \return The hash value of the given args.
-    template <typename... Types>
-    inline std::size_t hash_value(const Types &...args) {
-      std::size_t seed = 0;
-      hash_combine(&seed, args...);
-      return seed;
-    }
-
-  }  // namespace detail
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/histogram.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/histogram.h
deleted file mode 100644
index 0afe41758..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/histogram.h
+++ /dev/null
@@ -1,154 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <cassert>
-#include <algorithm>
-
-#include "prometheus/metric.h"
-#include "prometheus/family.h"
-#include "prometheus/counter.h"
-
-namespace prometheus {
-
-  /// \brief A histogram metric to represent aggregatable distributions of events.
-  ///
-  /// This class represents the metric type histogram:
-  /// https://prometheus.io/docs/concepts/metric_types/#histogram
-  ///
-  /// A histogram tracks the number of observations and the sum of the observed
-  /// values, allowing to calculate the average of the observed values.
-  ///
-  /// At its core a histogram has a counter per bucket. The sum of observations
-  /// also behaves like a counter as long as there are no negative observations.
-  ///
-  /// See https://prometheus.io/docs/practices/histograms/ for detailed
-  /// explanations of histogram usage and differences to summaries.
-  ///
-  /// The class is thread-safe. No concurrent call to any API of this type causes
-  /// a data race.
-  template <typename Value_ = uint64_t>
-  class Histogram : public Metric {
-    public:
-      using Value  = Value_;
-      using BucketBoundaries = std::vector<Value_>;
-      using Family = CustomFamily<Histogram<Value>>;
-
-      static const Metric::Type static_type = Metric::Type::Histogram;
-
-      /// \brief Create a histogram with manually chosen buckets.
-      ///
-      /// The BucketBoundaries are a list of monotonically increasing values
-      /// representing the bucket boundaries. Each consecutive pair of values is
-      /// interpreted as a half-open interval [b_n, b_n+1) which defines one bucket.
-      ///
-      /// There is no limitation on how the buckets are divided, i.e, equal size,
-      /// exponential etc..
-      ///
-      /// The bucket boundaries cannot be changed once the histogram is created.
-      Histogram (const BucketBoundaries& buckets)
-        : Metric(static_type), bucket_boundaries_{ buckets }, bucket_counts_{ buckets.size() + 1 }, sum_{} {
-          assert(std::is_sorted(std::begin(bucket_boundaries_),
-          std::end(bucket_boundaries_)));
-      }
-
-      /// \brief Observe the given amount.
-      ///
-      /// The given amount selects the 'observed' bucket. The observed bucket is
-      /// chosen for which the given amount falls into the half-open interval [b_n,
-      /// b_n+1). The counter of the observed bucket is incremented. Also the total
-      /// sum of all observations is incremented.
-      void Observe(const Value value) {
-        // TODO: determine bucket list size at which binary search would be faster
-        const auto bucket_index = static_cast<std::size_t>(std::distance(
-          bucket_boundaries_.begin(),
-          std::find_if(
-            std::begin(bucket_boundaries_), std::end(bucket_boundaries_),
-            [value](const Value boundary) { return boundary >= value; })));
-        sum_.Increment(value);
-        bucket_counts_[bucket_index].Increment();
-      }
-
-      /// \brief Observe multiple data points.
-      ///
-      /// Increments counters given a count for each bucket. (i.e. the caller of
-      /// this function must have already sorted the values into buckets).
-      /// Also increments the total sum of all observations by the given value.
-      void ObserveMultiple(const std::vector<Value>& bucket_increments,
-                           const Value               sum_of_values) {
-
-        if (bucket_increments.size() != bucket_counts_.size()) {
-          throw std::length_error(
-            "The size of bucket_increments was not equal to"
-            "the number of buckets in the histogram.");
-        }
-
-        sum_.Increment(sum_of_values);
-
-        for (std::size_t i{ 0 }; i < bucket_counts_.size(); ++i) {
-          bucket_counts_[i].Increment(bucket_increments[i]);
-        }
-
-      }
-
-      /// \brief Get the current value of the counter.
-      ///
-      /// Collect is called by the Registry when collecting metrics.
-      virtual ClientMetric Collect() const {
-        auto metric = ClientMetric{};
-
-        auto cumulative_count = 0ULL;
-        metric.histogram.bucket.reserve(bucket_counts_.size());
-        for (std::size_t i{0}; i < bucket_counts_.size(); ++i) {
-          cumulative_count += static_cast<std::size_t>(bucket_counts_[i].Get());
-          auto bucket = ClientMetric::Bucket{};
-          bucket.cumulative_count = cumulative_count;
-          bucket.upper_bound = (i == bucket_boundaries_.size()
-                                    ? std::numeric_limits<double>::infinity()
-                                    : static_cast<double>(bucket_boundaries_[i]));
-          metric.histogram.bucket.push_back(std::move(bucket));
-        }
-        metric.histogram.sample_count = cumulative_count;
-        metric.histogram.sample_sum = sum_.Get();
-
-        return metric;
-      }
-
-    private:
-      const BucketBoundaries       bucket_boundaries_;
-      std::vector<Counter<Value_>> bucket_counts_;
-      Gauge<Value_>                sum_;
-
-
-  };
-
-  /// \brief Return a builder to configure and register a Histogram metric.
-  ///
-  /// @copydetails Family<>::Family()
-  ///
-  /// Example usage:
-  ///
-  /// \code
-  /// auto registry = std::make_shared<Registry>();
-  /// auto& histogram_family = prometheus::BuildHistogram()
-  ///                              .Name("some_name")
-  ///                              .Help("Additional description.")
-  ///                              .Labels({{"key", "value"}})
-  ///                              .Register(*registry);
-  ///
-  /// ...
-  /// \endcode
-  ///
-  /// \return An object of unspecified type T, i.e., an implementation detail
-  /// except that it has the following members:
-  ///
-  /// - Name(const std::string&) to set the metric name,
-  /// - Help(const std::string&) to set an additional description.
-  /// - Label(const std::map<std::string, std::string>&) to assign a set of
-  ///   key-value pairs (= labels) to the metric.
-  ///
-  /// To finish the configuration of the Histogram metric register it with
-  /// Register(Registry&).
-  using BuildHistogram = Builder<Histogram<double>>;
-
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/metric.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/metric.h
deleted file mode 100644
index f1631a03c..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/metric.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#include "client_metric.h"
-
-namespace prometheus {
-
-  class Metric {
-
-    public:
-      enum class Type {
-        Counter,
-        Gauge,
-        Summary,
-        Histogram,
-        Untyped,
-      };
-
-      Type type;
-
-      Metric (Type type_) : type(type_) {}
-      virtual ~Metric() = default;
-
-      virtual ClientMetric Collect() const = 0;
-
-  };
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/metric_family.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/metric_family.h
deleted file mode 100644
index 6fe870086..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/metric_family.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-
-#include "metric.h"
-#include "prometheus/client_metric.h"
-
-namespace prometheus {
-
-  struct MetricFamily {
-    Metric::Type              type;
-    std::string               name;
-    std::string               help;
-    std::vector<ClientMetric> metric;
-  };
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/push_to_server.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/push_to_server.h
deleted file mode 100644
index 4fc54d4c8..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/push_to_server.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#pragma once
-
-#include <thread>
-#include <chrono>
-#include <string>
-
-#include "registry.h"
-#include "text_serializer.h"
-
-#include <jdl/httpclientlite.h>
-
-
-namespace prometheus {
-  class PushToServer {
-    std::chrono::seconds      period { 1 };
-    std::string               uri { "" };
-    std::thread               worker_thread { &PushToServer::worker_function, this };
-    std::shared_ptr<Registry> registry_ptr  { nullptr };
-    bool                      must_die      { false };
-
-    void push_data() {
-      if (registry_ptr) {
-        if (!uri.empty()) {
-          std::stringstream body_strm;
-          TextSerializer::Serialize(body_strm, registry_ptr->Collect());
-
-          std::string body = body_strm.str();
-          jdl::HTTPResponse response = jdl::HTTPClient::request(jdl::HTTPClient::m_post, jdl::URI(uri), body);
-        }
-      }
-    }
-
-    void worker_function() {
-      // it need for fast shutdown this thread when SaveToFile destructor is called
-      const uint64_t divider = 100;
-      uint64_t fraction = divider;
-
-      for (;;) {
-        std::chrono::milliseconds period_ms
-          = std::chrono::duration_cast<std::chrono::milliseconds>(period);
-        std::this_thread::sleep_for( period_ms / divider );
-
-        if (must_die) {
-          push_data();
-          return;
-        }
-
-        if (--fraction == 0) {
-          fraction = divider;
-          push_data();
-        }
-      }
-    }
-
-  public:
-    PushToServer() {
-      jdl::init_socket();
-    }
-
-    ~PushToServer() {
-      must_die = true;
-      worker_thread.join();
-      jdl::deinit_socket();
-    }
-
-    PushToServer(std::shared_ptr<Registry>& registry_, const std::chrono::seconds& period_, const std::string& uri_) {
-      set_registry(registry_);
-      set_delay(period_);
-      set_uri(uri_);
-    }
-
-    void set_delay (const std::chrono::seconds& new_period) {
-      period = new_period;
-    }
-
-
-    void set_uri (const std::string& uri_) {
-      uri = std::move(uri_);
-    }
-
-    void set_registry (std::shared_ptr<Registry>& new_registry_ptr) {
-      registry_ptr = new_registry_ptr;
-    }
-
-  };
-}
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/registry.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/registry.h
deleted file mode 100644
index 6346742b6..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/registry.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#pragma once
-
-#include <map>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <vector>
-
-#include "prometheus/collectable.h"
-#include "prometheus/family.h"
-
-namespace prometheus {
-
-  /// \brief Manages the collection of a number of metrics.
-  ///
-  /// The Registry is responsible to expose data to a class/method/function
-  /// "bridge", which returns the metrics in a format Prometheus supports.
-  ///
-  /// The key class is the Collectable. This has a method - called Collect() -
-  /// that returns zero or more metrics and their samples. The metrics are
-  /// represented by the class Family<>, which implements the Collectable
-  /// interface. A new metric is registered with BuildCounter(), BuildGauge(),
-  /// BuildHistogram() or BuildSummary().
-  ///
-  /// The class is thread-safe. No concurrent call to any API of this type causes
-  /// a data race.
-  class Registry : public Collectable {
-
-    public:
-
-      /// \brief How to deal with repeatedly added family names for a type.
-      ///
-      /// Adding a family with the same name but different types is always an error
-      /// and will lead to an exception.
-      enum class InsertBehavior {
-        /// \brief If a family with the same name and labels already exists return
-        /// the existing one. If no family with that name exists create it.
-        /// Otherwise throw.
-        Merge,
-        /// \brief Throws if a family with the same name already exists.
-        Throw,
-        /// \brief Never merge and always create a new family. This violates the
-        /// prometheus specification but was the default behavior in earlier
-        /// versions
-        NonStandardAppend,
-      };
-
-      using FamilyPtr = std::unique_ptr<Family>;
-      using Families  = std::vector<FamilyPtr>;
-
-      const InsertBehavior insert_behavior;
-      mutable std::mutex   mutex;
-      Families             families;
-
-      /// \brief name Create a new registry.
-      ///
-      /// \param insert_behavior How to handle families with the same name.
-      Registry (InsertBehavior insert_behavior_ = InsertBehavior::Merge)
-        : insert_behavior(insert_behavior_) {}
-
-      /// \brief Returns a list of metrics and their samples.
-      ///
-      /// Every time the Registry is scraped it calls each of the metrics Collect
-      /// function.
-      ///
-      /// \return Zero or more metrics and their samples.
-      virtual MetricFamilies Collect() const {
-
-        std::lock_guard<std::mutex> lock{ mutex };
-
-        MetricFamilies results;
-
-        for (const FamilyPtr& family_ptr : families) {
-          MetricFamilies metrics = family_ptr->Collect();
-          results.insert(results.end(), std::make_move_iterator(metrics.begin()), std::make_move_iterator(metrics.end()));
-        }
-
-        return results;
-
-      }
-
-      template <typename CustomFamily>
-      CustomFamily& Add (const std::string& name, const std::string& help, const Family::Labels& labels) {
-
-        std::lock_guard<std::mutex> lock{ mutex };
-
-        bool found_one_but_not_merge = false;
-        for (const FamilyPtr& family_ptr : families) {
-          if (family_ptr->GetName() == name) {
-
-            if (family_ptr->type != CustomFamily::static_type) // found family with this name and with different type
-              throw std::invalid_argument("Family name already exists with different type");
-
-            else {                                 // found family with this name and the same type
-              switch (insert_behavior) {
-                case InsertBehavior::Throw:
-                  throw std::invalid_argument("Family name already exists");
-                case InsertBehavior::Merge:
-                  if (family_ptr->GetConstantLabels() == labels)
-                    return dynamic_cast<CustomFamily&>(*family_ptr);
-                  else                               // this strange rule was in previos version prometheus cpp
-                    found_one_but_not_merge = true;
-                case InsertBehavior::NonStandardAppend:
-                  continue;
-              }
-            }
-
-          }
-        }
-
-        if (found_one_but_not_merge)               // this strange rule was in previos version prometheus cpp
-          throw std::invalid_argument("Family name already exists with different labels");
-
-        std::unique_ptr<CustomFamily> new_family_ptr (new CustomFamily(name, help, labels));
-        CustomFamily& new_family = *new_family_ptr;
-        families.push_back(std::move(new_family_ptr));
-        return new_family;
-
-      }
-
-  };
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/save_to_file.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/save_to_file.h
deleted file mode 100644
index 26bd0c95c..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/save_to_file.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-
-#include <thread>
-#include <chrono>
-#include <string>
-#include <fstream>
-#include <memory>
-
-#include "registry.h"
-#include "text_serializer.h"
-
-namespace prometheus {
-  class SaveToFile {
-    std::chrono::seconds      period        { 1 };
-    std::string               filename;
-    std::thread               worker_thread { &SaveToFile::worker_function, this };
-    std::shared_ptr<Registry> registry_ptr  { nullptr };
-    bool                      must_die      { false };
-
-    void save_data() {
-      if (registry_ptr) {
-        std::fstream out_file_stream;
-        out_file_stream.open(filename, std::fstream::out | std::fstream::binary);
-        if (out_file_stream.is_open()) {
-          TextSerializer::Serialize(out_file_stream, registry_ptr->Collect());
-          out_file_stream.close();
-        }
-      }
-    }
-
-    void worker_function() {
-      // it need for fast shutdown this thread when SaveToFile destructor is called
-      const uint64_t divider = 100;
-      uint64_t fraction = divider;
-      for (;;) {
-        std::chrono::milliseconds period_ms
-          = std::chrono::duration_cast<std::chrono::milliseconds>(period);
-        std::this_thread::sleep_for( period_ms / divider );
-        if (must_die) {
-          save_data();
-          return;
-        }
-        if (--fraction == 0) {
-          fraction = divider;
-          save_data();
-        }
-      }
-    }
-    
-  public:
-    SaveToFile() = default;
-
-    ~SaveToFile() {
-      must_die = true;
-      worker_thread.join();
-    }
-
-    SaveToFile(std::shared_ptr<Registry>& registry_, const std::chrono::seconds& period_, const std::string& filename_) {
-      set_registry(registry_);
-      set_delay(period_);
-      set_out_file(filename_);
-    }
-
-    void set_delay (const std::chrono::seconds& new_period) {
-      period = new_period;
-    }
-
-
-    bool set_out_file (const std::string& filename_) {
-      filename = filename_;
-      std::fstream out_file_stream;
-      out_file_stream.open(filename, std::fstream::out | std::fstream::binary);
-      bool open_success = out_file_stream.is_open();
-      out_file_stream.close();
-      return open_success;
-    }
-
-    void set_registry (std::shared_ptr<Registry>& new_registry_ptr) {
-      registry_ptr = new_registry_ptr;
-    }
-
-  };
-}
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/summary.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/summary.h
deleted file mode 100644
index ed2e8bd47..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/summary.h
+++ /dev/null
@@ -1,154 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <cstdint>
-#include <mutex>
-#include <vector>
-
-#include "prometheus/metric.h"
-#include "prometheus/family.h"
-
-#include "prometheus/detail/ckms_quantiles.h"
-#include "prometheus/detail/time_window_quantiles.h"
-
-#include "prometheus/builder.h"
-
-namespace prometheus {
-
-  /// \brief A summary metric samples observations over a sliding window of time.
-  ///
-  /// This class represents the metric type summary:
-  /// https://prometheus.io/docs/instrumenting/writing_clientlibs/#summary
-  ///
-  /// A summary provides a total count of observations and a sum of all observed
-  /// values. In contrast to a histogram metric it also calculates configurable
-  /// Phi-quantiles over a sliding window of time.
-  ///
-  /// The essential difference between summaries and histograms is that summaries
-  /// calculate streaming Phi-quantiles on the client side and expose them
-  /// directly, while histograms expose bucketed observation counts and the
-  /// calculation of quantiles from the buckets of a histogram happens on the
-  /// server side:
-  /// https://prometheus.io/docs/prometheus/latest/querying/functions/#histogram_quantile.
-  ///
-  /// Note that Phi designates the probability density function of the standard
-  /// Gaussian distribution.
-  ///
-  /// See https://prometheus.io/docs/practices/histograms/ for detailed
-  /// explanations of Phi-quantiles, summary usage, and differences to histograms.
-  ///
-  /// The class is thread-safe. No concurrent call to any API of this type causes
-  /// a data race.
-  class Summary : Metric {
-
-  public:
-
-    using Value  = double;
-    using Family = CustomFamily<Summary>;
-
-    static const Metric::Type static_type = Metric::Type::Summary;
-
-    using Quantiles = std::vector<detail::CKMSQuantiles::Quantile>;
-
-    const Quantiles             quantiles_;
-    mutable std::mutex          mutex_;
-    std::uint64_t               count_;
-    double                      sum_;
-    detail::TimeWindowQuantiles quantile_values_;
-
-  public:
-
-    /// \brief Create a summary metric.
-    ///
-    /// \param quantiles A list of 'targeted' Phi-quantiles. A targeted
-    /// Phi-quantile is specified in the form of a Phi-quantile and tolerated
-    /// error. For example a Quantile{0.5, 0.1} means that the median (= 50th
-    /// percentile) should be returned with 10 percent error or a Quantile{0.2,
-    /// 0.05} means the 20th percentile with 5 percent tolerated error. Note that
-    /// percentiles and quantiles are the same concept, except percentiles are
-    /// expressed as percentages. The Phi-quantile must be in the interval [0, 1].
-    /// Note that a lower tolerated error for a Phi-quantile results in higher
-    /// usage of resources (memory and cpu) to calculate the summary.
-    ///
-    /// The Phi-quantiles are calculated over a sliding window of time. The
-    /// sliding window of time is configured by max_age and age_buckets.
-    ///
-    /// \param max_age Set the duration of the time window, i.e., how long
-    /// observations are kept before they are discarded. The default value is 60
-    /// seconds.
-    ///
-    /// \param age_buckets Set the number of buckets of the time window. It
-    /// determines the number of buckets used to exclude observations that are
-    /// older than max_age from the summary, e.g., if max_age is 60 seconds and
-    /// age_buckets is 5, buckets will be switched every 12 seconds. The value is
-    /// a trade-off between resources (memory and cpu for maintaining the bucket)
-    /// and how smooth the time window is moved. With only one age bucket it
-    /// effectively results in a complete reset of the summary each time max_age
-    /// has passed. The default value is 5.
-    Summary(const Quantiles& quantiles, std::chrono::milliseconds max_age = std::chrono::seconds{ 60 }, int age_buckets = 5)
-      : Metric(static_type), quantiles_{ quantiles }, count_{ 0 }, sum_{ 0 }, quantile_values_(quantiles_, max_age, age_buckets) {}
-
-    /// \brief Observe the given amount.
-    void Observe(const double value) {
-      std::lock_guard<std::mutex> lock(mutex_);
-
-      count_ += 1;
-      sum_ += value;
-      quantile_values_.insert(value);
-
-    }
-
-    /// \brief Get the current value of the summary.
-    ///
-    /// Collect is called by the Registry when collecting metrics.
-    virtual ClientMetric Collect() const {
-      auto metric = ClientMetric{};
-
-      std::lock_guard<std::mutex> lock(mutex_);
-
-      metric.summary.quantile.reserve(quantiles_.size());
-      for (const auto& quantile : quantiles_) {
-        auto metricQuantile = ClientMetric::Quantile{};
-        metricQuantile.quantile = quantile.quantile;
-        metricQuantile.value = quantile_values_.get(quantile.quantile);
-        metric.summary.quantile.push_back(std::move(metricQuantile));
-      }
-      metric.summary.sample_count = count_;
-      metric.summary.sample_sum = sum_;
-
-      return metric;
-    }
-  };
-
-
-  /// \brief Return a builder to configure and register a Summary metric.
-  ///
-  /// @copydetails Family<>::Family()
-  ///
-  /// Example usage:
-  ///
-  /// \code
-  /// auto registry = std::make_shared<Registry>();
-  /// auto& summary_family = prometheus::BuildSummary()
-  ///                            .Name("some_name")
-  ///                            .Help("Additional description.")
-  ///                            .Labels({{"key", "value"}})
-  ///                            .Register(*registry);
-  ///
-  /// ...
-  /// \endcode
-  ///
-  /// \return An object of unspecified type T, i.e., an implementation detail
-  /// except that it has the following members:
-  ///
-  /// - Name(const std::string&) to set the metric name,
-  /// - Help(const std::string&) to set an additional description.
-  /// - Label(const std::map<std::string, std::string>&) to assign a set of
-  ///   key-value pairs (= labels) to the metric.
-  ///
-  /// To finish the configuration of the Summary metric register it with
-  /// Register(Registry&).
-  using BuildSummary = Builder<Summary>;
-
-
-} // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/text_serializer.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/text_serializer.h
deleted file mode 100644
index 019729b62..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/text_serializer.h
+++ /dev/null
@@ -1,211 +0,0 @@
-#pragma once
-
-#include <iosfwd>
-#include <vector>
-#include <array>
-#include <math.h>
-#include <ostream>
-
-#include "prometheus/metric_family.h"
-
-#if __cpp_lib_to_chars >= 201611L
-  #include <charconv>
-#endif
-
-namespace prometheus {
-
-class TextSerializer {
-
-  // Write a double as a string, with proper formatting for infinity and NaN
-  static void WriteValue (std::ostream& out, double value) {
-    if (std::isnan(value))
-      out << "Nan";
-    else if (std::isinf(value))
-      out << (value < 0 ? "-Inf" : "+Inf");
-
-    else {
-
-      std::array<char, 128> buffer;
-
-#if __cpp_lib_to_chars >= 201611L
-      auto [ptr, ec] = std::to_chars(buffer.data(), buffer.data() + buffer.size(), value);
-      if (ec != std::errc()) {
-        throw std::runtime_error("Could not convert double to string: " +
-          std::make_error_code(ec).message());
-      }
-      out.write(buffer.data(), ptr - buffer.data());
-#else
-      int wouldHaveWritten = std::snprintf(buffer.data(), buffer.size(), "%.*g", std::numeric_limits<double>::max_digits10 - 1, value);
-      if (wouldHaveWritten <= 0 || static_cast<std::size_t>(wouldHaveWritten) >= buffer.size()) {
-        throw std::runtime_error("Could not convert double to string");
-      }
-      out.write(buffer.data(), wouldHaveWritten);
-#endif
-
-    }
-  }
-
-  static void WriteValue(std::ostream& out, const std::string& value) {
-    for (auto c : value) {
-      switch (c) {
-        case '\n': out << '\\' << 'n'; break;
-        case '\\': out << '\\' << c;   break;
-        case '"':  out << '\\' << c;   break;
-        default:   out << c;           break;
-      }
-    }
-  }
-
-  // Write a line header: metric name and labels
-  template <typename T = std::string>
-  static void WriteHead(
-    std::ostream& out,
-    const MetricFamily& family,
-    const ClientMetric& metric,
-    const std::string&  suffix = "",
-    const std::string&  extraLabelName = "",
-    const T&            extraLabelValue = T()) {
-
-    out << family.name << suffix;
-
-    if (!metric.label.empty() || !extraLabelName.empty()) {
-
-      out << "{";
-      const char* prefix = "";
-
-      for (auto& lp : metric.label) {
-        out << prefix << lp.name << "=\"";
-        WriteValue(out, lp.value);
-        out << "\"";
-        prefix = ",";
-      }
-      if (!extraLabelName.empty()) {
-        out << prefix << extraLabelName << "=\"";
-        WriteValue(out, extraLabelValue);
-        out << "\"";
-      }
-      out << "}";
-    }
-    out << " ";
-  }
-
-  // Write a line trailer: timestamp
-  static void WriteTail(std::ostream& out, const ClientMetric& metric) {
-    if (metric.timestamp_ms != 0) {
-      out << " " << metric.timestamp_ms;
-    }
-    out << "\n";
-  }
-
-  static void SerializeCounter(std::ostream& out, const MetricFamily& family, const ClientMetric& metric) {
-    WriteHead(out, family, metric);
-    WriteValue(out, metric.counter.value);
-    WriteTail(out, metric);
-  }
-
-  static void SerializeGauge(std::ostream& out, const MetricFamily& family, const ClientMetric& metric) {
-    WriteHead(out, family, metric);
-    WriteValue(out, metric.gauge.value);
-    WriteTail(out, metric);
-  }
-
-  static void SerializeSummary(std::ostream& out, const MetricFamily& family, const ClientMetric& metric) {
-    auto& sum = metric.summary;
-    WriteHead(out, family, metric, "_count");
-    out << sum.sample_count;
-    WriteTail(out, metric);
-
-    WriteHead(out, family, metric, "_sum");
-    WriteValue(out, sum.sample_sum);
-    WriteTail(out, metric);
-
-    for (auto& q : sum.quantile) {
-      WriteHead(out, family, metric, "", "quantile", q.quantile);
-      WriteValue(out, q.value);
-      WriteTail(out, metric);
-    }
-  }
-
-  static void SerializeUntyped(std::ostream& out, const MetricFamily& family, const ClientMetric& metric) {
-    WriteHead(out, family, metric);
-    WriteValue(out, metric.untyped.value);
-    WriteTail(out, metric);
-  }
-
-  static void SerializeHistogram(std::ostream& out, const MetricFamily& family, const ClientMetric& metric) {
-    auto& hist = metric.histogram;
-    WriteHead(out, family, metric, "_count");
-    out << hist.sample_count;
-    WriteTail(out, metric);
-
-    WriteHead(out, family, metric, "_sum");
-    WriteValue(out, hist.sample_sum);
-    WriteTail(out, metric);
-
-    double last = -std::numeric_limits<double>::infinity();
-    for (auto& b : hist.bucket) {
-      WriteHead(out, family, metric, "_bucket", "le", b.upper_bound);
-      last = b.upper_bound;
-      out << b.cumulative_count;
-      WriteTail(out, metric);
-    }
-
-    if (last != std::numeric_limits<double>::infinity()) {
-      WriteHead(out, family, metric, "_bucket", "le", "+Inf");
-      out << hist.sample_count;
-      WriteTail(out, metric);
-    }
-  }
-
-  static void SerializeFamily(std::ostream& out, const MetricFamily& family) {
-    if (!family.help.empty()) {
-      out << "# HELP " << family.name << " " << family.help << "\n";
-    }
-    switch (family.type) {
-    case Metric::Type::Counter:
-      out << "# TYPE " << family.name << " counter\n";
-      for (auto& metric : family.metric) {
-        SerializeCounter(out, family, metric);
-      }
-      break;
-    case Metric::Type::Gauge:
-      out << "# TYPE " << family.name << " gauge\n";
-      for (auto& metric : family.metric) {
-        SerializeGauge(out, family, metric);
-      }
-      break;
-    case Metric::Type::Summary:
-      out << "# TYPE " << family.name << " summary\n";
-      for (auto& metric : family.metric) {
-        SerializeSummary(out, family, metric);
-      }
-      break;
-    case Metric::Type::Untyped:
-      out << "# TYPE " << family.name << " untyped\n";
-      for (auto& metric : family.metric) {
-        SerializeUntyped(out, family, metric);
-      }
-      break;
-    case Metric::Type::Histogram:
-      out << "# TYPE " << family.name << " histogram\n";
-      for (auto& metric : family.metric) {
-        SerializeHistogram(out, family, metric);
-      }
-      break;
-    }
-  }
-
-  public:
-
-  static void Serialize (std::ostream& out, const std::vector<MetricFamily>& metrics) {
-    std::locale saved_locale = out.getloc();
-    out.imbue(std::locale::classic());
-    for (auto& family : metrics) {
-      SerializeFamily(out, family);
-    }
-    out.imbue(saved_locale);
-  }
-
-};
-
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/time_window_quantiles.h b/ext/prometheus-cpp-lite-1.0/core/include/prometheus/time_window_quantiles.h
deleted file mode 100644
index 9eb6df322..000000000
--- a/ext/prometheus-cpp-lite-1.0/core/include/prometheus/time_window_quantiles.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <cstddef>
-#include <vector>
-
-#include "prometheus/detail/ckms_quantiles.h"
-
-namespace prometheus {
-  namespace detail {
-
-    class TimeWindowQuantiles {
-
-      using Clock = std::chrono::steady_clock;
-
-       public:
-        TimeWindowQuantiles(const std::vector<CKMSQuantiles::Quantile>& quantiles,
-                            const Clock::duration max_age, const int age_buckets)
-          : quantiles_(quantiles),
-            ckms_quantiles_(age_buckets, CKMSQuantiles(quantiles_)),
-            current_bucket_(0),
-            last_rotation_(Clock::now()),
-            rotation_interval_(max_age / age_buckets) {}
-
-        double get(double q) const {
-          CKMSQuantiles& current_bucket = rotate();
-          return current_bucket.get(q);
-        }
-
-        void insert(double value) {
-          rotate();
-          for (auto& bucket : ckms_quantiles_) {
-            bucket.insert(value);
-          }
-        }
-
-       private:
-        CKMSQuantiles& rotate() const {
-          auto delta = Clock::now() - last_rotation_;
-          while (delta > rotation_interval_) {
-            ckms_quantiles_[current_bucket_].reset();
-
-            if (++current_bucket_ >= ckms_quantiles_.size()) {
-              current_bucket_ = 0;
-            }
-
-            delta -= rotation_interval_;
-            last_rotation_ += rotation_interval_;
-          }
-          return ckms_quantiles_[current_bucket_];
-        }
-
-        const std::vector<CKMSQuantiles::Quantile>& quantiles_;
-        mutable std::vector<CKMSQuantiles> ckms_quantiles_;
-        mutable std::size_t current_bucket_;
-
-        mutable Clock::time_point last_rotation_;
-        const Clock::duration rotation_interval_;
-      };
-
-  }  // namespace detail
-}  // namespace prometheus
diff --git a/ext/prometheus-cpp-lite-1.0/examples/CMakeLists.txt b/ext/prometheus-cpp-lite-1.0/examples/CMakeLists.txt
deleted file mode 100644
index 84ac1a74d..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-add_executable       (original_example               "original_example.cpp" )
-target_link_libraries(original_example               prometheus-cpp-lite-core)
-
-add_executable       (modern_example                 "modern_example.cpp" )
-target_link_libraries(modern_example                 prometheus-cpp-lite-core)
-
-add_executable       (use_counters_in_class_example  "use_counters_in_class_example.cpp" )
-target_link_libraries(use_counters_in_class_example  prometheus-cpp-lite-core)
-
-add_executable       (use_gauge_in_class_example     "use_gauge_in_class_example.cpp" )
-target_link_libraries(use_gauge_in_class_example     prometheus-cpp-lite-core)
-
-add_executable       (use_benchmark_in_class_example "use_benchmark_in_class_example.cpp" )
-target_link_libraries(use_benchmark_in_class_example prometheus-cpp-lite-core)
-
-add_executable       (save_to_file_example           "save_to_file_example.cpp" )
-target_link_libraries(save_to_file_example           prometheus-cpp-lite-core)
-
-add_executable       (push_to_server_example         "push_to_server_example.cpp" )
-target_link_libraries(push_to_server_example         prometheus-cpp-lite-core)
-
-add_executable       (gateway_example                "gateway_example.cpp" )
-target_link_libraries(gateway_example                prometheus-cpp-lite-core)
-
-
-add_executable       (simpleapi_example              "simpleapi_example.cpp")
-target_link_libraries(simpleapi_example              prometheus-cpp-simpleapi)
-
-add_executable       (simpleapi_use_in_class_example "simpleapi_use_in_class_example.cpp")
-target_link_libraries(simpleapi_use_in_class_example prometheus-cpp-simpleapi)
diff --git a/ext/prometheus-cpp-lite-1.0/examples/gateway_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/gateway_example.cpp
deleted file mode 100644
index cc231da05..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/gateway_example.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <chrono>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-
-#include "prometheus/client_metric.h"
-#include "prometheus/counter.h"
-#include "prometheus/family.h"
-#include "prometheus/gateway.h"
-#include "prometheus/registry.h"
-
-#ifdef _WIN32
-#include <Winsock2.h>
-#else
-#include <unistd.h>
-#endif
-
-static std::string GetHostName() {
-  char hostname[1024];
-
-  if (::gethostname(hostname, sizeof(hostname))) {
-    return {};
-  }
-  return hostname;
-}
-
-int main() {
-  using namespace prometheus;
-
-  // create a push gateway
-  const auto labels = Gateway::GetInstanceLabel(GetHostName());
-
-  Gateway gateway{"127.0.0.1", "9091", "sample_client", labels};
-
-  // create a metrics registry with component=main labels applied to all its
-  // metrics
-  auto registry = std::make_shared<Registry>();
-
-  // add a new counter family to the registry (families combine values with the
-  // same name, but distinct label dimensions)
-  auto& counter_family = BuildCounter()
-                             .Name("time_running_seconds_total")
-                             .Help("How many seconds is this server running?")
-                             .Labels({{"label", "value"}})
-                             .Register(*registry);
-
-  // add a counter to the metric family
-  auto& second_counter = counter_family.Add(
-      {{"another_label", "value"}, {"yet_another_label", "value"}});
-
-  // ask the pusher to push the metrics to the pushgateway
-  gateway.RegisterCollectable(registry);
-
-  for (;;) {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    // increment the counter by one (second)
-    second_counter.Increment();
-
-    // push metrics
-    auto returnCode = gateway.Push();
-    std::cout << "returnCode is " << returnCode << std::endl;
-  }
-}
diff --git a/ext/prometheus-cpp-lite-1.0/examples/modern_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/modern_example.cpp
deleted file mode 100644
index dcec559ef..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/modern_example.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <prometheus/registry.h>
-#include <prometheus/counter.h>
-#include <prometheus/text_serializer.h>
-
-#include <array>
-#include <chrono>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <thread>
-#include <iostream>
-
-int main() {
-
-  using namespace prometheus;
-
-  // for clarity, we deduce the required types
-  using IntegerCounter  = Counter<uint64_t>;
-  using FloatingCounter = Counter<double>;
-
-  using IntegerCounterFamily  = CustomFamily<IntegerCounter>;
-  using FloatingCounterFamily = CustomFamily<FloatingCounter>;
-
-  // create a metrics registry
-  // @note it's the users responsibility to keep the object alive
-  Registry registry;
-
-  // add a new counter family to the registry (families combine values with the
-  // same name, but distinct label dimensions)
-  //
-  // @note please follow the metric-naming best-practices:
-  // https://prometheus.io/docs/practices/naming/
-  FloatingCounterFamily& packet_counter{ FloatingCounter::Family::Build(registry, "observed_packets_total", "Number of observed packets") };
-
-  // add and remember dimensional data, incrementing those is very cheap
-  FloatingCounter& tcp_rx_counter{ packet_counter.Add({ {"protocol", "tcp"}, {"direction", "rx"} }) };
-  FloatingCounter& tcp_tx_counter{ packet_counter.Add({ {"protocol", "tcp"}, {"direction", "tx"} }) };
-  FloatingCounter& udp_rx_counter{ packet_counter.Add({ {"protocol", "udp"}, {"direction", "rx"} }) };
-  FloatingCounter& udp_tx_counter{ packet_counter.Add({ {"protocol", "udp"}, {"direction", "tx"} }) };
-
-  // add a counter whose dimensional data is not known at compile time
-  // nevertheless dimensional values should only occur in low cardinality:
-  // https://prometheus.io/docs/practices/naming/#labels
-  IntegerCounterFamily& http_requests_counter = IntegerCounter::Family::Build(registry, "http_requests_total", "Number of HTTP requests");
-
-  for (;; ) {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    const int random_value = std::rand();
-
-    if (random_value & 1)   tcp_rx_counter++;
-    if (random_value & 2) ++tcp_tx_counter;
-    if (random_value & 4) udp_rx_counter += 0.5;
-    if (random_value & 8) udp_tx_counter += 0.7;
-
-    const std::array<std::string, 4> methods = { "GET", "PUT", "POST", "HEAD" };
-    const std::string& method = methods.at(static_cast<std::size_t>(random_value) % methods.size());
-
-    // dynamically calling Family<T>.Add() works but is slow and should be avoided
-    http_requests_counter.Add({ {"method", method} }) += 10;
-
-    TextSerializer text_serializer;
-    text_serializer.Serialize(std::cout, registry.Collect());
-
-  }
-}
diff --git a/ext/prometheus-cpp-lite-1.0/examples/original_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/original_example.cpp
deleted file mode 100644
index 09b2569d7..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/original_example.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-
-#include <prometheus/registry.h>
-#include <prometheus/counter.h>
-#include <prometheus/text_serializer.h>
-
-#include <array>
-#include <chrono>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <thread>
-#include <iostream>
-
-int main() {
-
-  using namespace prometheus;
-
-  // create a metrics registry
-  // @note it's the users responsibility to keep the object alive
-  auto registry = std::make_shared<Registry>();
-
-  // add a new counter family to the registry (families combine values with the
-  // same name, but distinct label dimensions)
-  //
-  // @note please follow the metric-naming best-practices:
-  // https://prometheus.io/docs/practices/naming/
-  auto& packet_counter = BuildCounter()
-                             .Name("observed_packets_total")
-                             .Help("Number of observed packets")
-                             .Register(*registry);
-
-  // add and remember dimensional data, incrementing those is very cheap
-  auto& tcp_rx_counter = packet_counter.Add({ {"protocol", "tcp"}, {"direction", "rx"} });
-  auto& tcp_tx_counter = packet_counter.Add({ {"protocol", "tcp"}, {"direction", "tx"} });
-  auto& udp_rx_counter = packet_counter.Add({ {"protocol", "udp"}, {"direction", "rx"} });
-  auto& udp_tx_counter = packet_counter.Add({ {"protocol", "udp"}, {"direction", "tx"} });
-
-  // add a counter whose dimensional data is not known at compile time
-  // nevertheless dimensional values should only occur in low cardinality:
-  // https://prometheus.io/docs/practices/naming/#labels
-  auto& http_requests_counter = BuildCounter()
-                                    .Name("http_requests_total")
-                                    .Help("Number of HTTP requests")
-                                    .Register(*registry);
-
-  // ask the exposer to scrape the registry on incoming HTTP requests
-  //exposer.RegisterCollectable(registry);
-
-  for ( ;; ) {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    const auto random_value = std::rand();
-
-    if (random_value & 1) tcp_rx_counter.Increment();
-    if (random_value & 2) tcp_tx_counter.Increment();
-    if (random_value & 4) udp_rx_counter.Increment(10);
-    if (random_value & 8) udp_tx_counter.Increment(10);
-
-    const std::array<std::string, 4> methods = { "GET", "PUT", "POST", "HEAD" };
-    auto method = methods.at(static_cast<std::size_t>(random_value) % methods.size());
-    // dynamically calling Family<T>.Add() works but is slow and should be avoided
-    http_requests_counter.Add({ {"method", method} }).Increment();
-
-    TextSerializer text_serializer;
-    text_serializer.Serialize(std::cout, registry->Collect());
-
-  }
-}
diff --git a/ext/prometheus-cpp-lite-1.0/examples/push_to_server_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/push_to_server_example.cpp
deleted file mode 100644
index eda0b0025..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/push_to_server_example.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <prometheus/registry.h>
-#include <prometheus/counter.h>
-#include <prometheus/push_to_server.h>
-
-#include <array>
-#include <chrono>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <thread>
-#include <iostream>
-
-int main() {
-
-  using namespace prometheus;
-
-  // for clarity, we deduce the required types
-  using Metric = Counter<uint64_t>;
-
-  using Family = Metric::Family;
-
-  // create a metrics registry
-  // @note it's the users responsibility to keep the object alive
-  std::shared_ptr<Registry> registry_ptr = std::make_shared<Registry>();
-
-  PushToServer pusher(registry_ptr, std::chrono::seconds(5),
-                      std::string("http://127.0.0.1:9091/metrics/job/samples/instance/test") );
-
-  // add a new counter family to the registry (families combine values with the
-  // same name, but distinct label dimensions)
-  //
-  // @note please follow the metric-naming best-practices:
-  // https://prometheus.io/docs/practices/naming/
-  Family& family { Family::Build(*registry_ptr, "our_metric", "some metric") };
-
-  // add and remember dimensional data, incrementing those is very cheap
-  Metric& metric { family.Add({}) };
-
-  for (;; ) {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    const int random_value = std::rand();
-    metric += random_value % 10;
-  }
-}
diff --git a/ext/prometheus-cpp-lite-1.0/examples/save_to_file_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/save_to_file_example.cpp
deleted file mode 100644
index 119b4998a..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/save_to_file_example.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <prometheus/registry.h>
-#include <prometheus/counter.h>
-#include <prometheus/save_to_file.h>
-
-#include <array>
-#include <chrono>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <thread>
-#include <iostream>
-
-int main() {
-
-  using namespace prometheus;
-
-  // for clarity, we deduce the required types
-  using Metric = Counter<uint64_t>;
-
-  using Family = Metric::Family;
-
-  // create a metrics registry
-  // @note it's the users responsibility to keep the object alive
-  std::shared_ptr<Registry> registry_ptr = std::make_shared<Registry>();
-
-  SaveToFile saver( registry_ptr, std::chrono::seconds(5), "./metrics.prom" );
-
-  // add a new counter family to the registry (families combine values with the
-  // same name, but distinct label dimensions)
-  //
-  // @note please follow the metric-naming best-practices:
-  // https://prometheus.io/docs/practices/naming/
-  Family& family { Family::Build(*registry_ptr, "our_metric", "some metric") };
-
-  // add and remember dimensional data, incrementing those is very cheap
-  Metric& metric { family.Add({}) };
-
-  for (;; ) {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    const int random_value = std::rand();
-    metric += random_value % 10;
-  }
-}
diff --git a/ext/prometheus-cpp-lite-1.0/examples/simpleapi_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/simpleapi_example.cpp
deleted file mode 100644
index 811140789..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/simpleapi_example.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#include <prometheus/simpleapi.h>
-
-int main() {
-
-  using namespace prometheus::simpleapi;
-
-  counter_family_t family  { "simple_family", "simple family example" };
-  counter_metric_t metric1 { family.Add({{"name", "counter1"}}) };
-  counter_metric_t metric2 { family.Add({{"name", "counter2"}}) };
-
-  counter_metric_t metric3 { "simple_counter_1", "simple counter 1 without labels example" };
-  counter_metric_t metric4 { "simple_counter_2", "simple counter 2 without labels example" };
-
-  for (;; ) {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    const int random_value = std::rand();
-    if (random_value & 1) metric1++;
-    if (random_value & 2) metric2++;
-    if (random_value & 4) metric3++;
-    if (random_value & 8) metric4++;
-  }
-
-  //return 0;
-
-}
\ No newline at end of file
diff --git a/ext/prometheus-cpp-lite-1.0/examples/simpleapi_use_in_class_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/simpleapi_use_in_class_example.cpp
deleted file mode 100644
index d97eeeeae..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/simpleapi_use_in_class_example.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-
-#include <prometheus/simpleapi.h>
-
-// use prometheus namespace
-using namespace prometheus::simpleapi;
-
-class MyClass {
-
-  counter_family_t metric_family { "simple_family", "simple family example" };
-  counter_metric_t metric1 { metric_family.Add({{"name", "counter1"}}) };
-  counter_metric_t metric2 { metric_family.Add({{"name", "counter2"}}) };
-
-  counter_metric_t metric3 { "simple_counter_1", "simple counter 1 without labels example" };
-  counter_metric_t metric4 { "simple_counter_2", "simple counter 2 without labels example" };
-
-  benchmark_family_t benchmark_family { "simple_benchmark_family", "simple benchmark family example" };
-  benchmark_metric_t benchmark1 { benchmark_family.Add({{"benchmark", "1"}}) };
-  benchmark_metric_t benchmark2 { benchmark_family.Add({{"benchmark", "2"}}) };
-
-public:
-
-  MyClass() = default;
-
-  void member_to_do_something() {
-
-    benchmark1.start();
-    const int random_value = std::rand();
-    benchmark1.stop();
-
-    benchmark2.start();
-    if (random_value & 1)  metric1++;
-    if (random_value & 2)  metric2++;
-    if (random_value & 4)  metric3++;
-    if (random_value & 8)  metric4++;
-    benchmark2.stop();
-
-  }
-
-};
-
-int main() {
-
-  MyClass myClass;
-  benchmark_metric_t benchmark { "simple_benchmark", "simple benchmark example" };
-
-  for (;; ) {
-
-    benchmark.start();
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    benchmark.stop();
-
-    myClass.member_to_do_something();
-
-  }
-
-}
-
diff --git a/ext/prometheus-cpp-lite-1.0/examples/use_benchmark_in_class_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/use_benchmark_in_class_example.cpp
deleted file mode 100644
index ae44017cf..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/use_benchmark_in_class_example.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <prometheus/registry.h>
-#include <prometheus/benchmark.h>
-#include <prometheus/text_serializer.h>
-
-#include <array>
-#include <chrono>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <thread>
-#include <iostream>
-
-// use prometheus namespace
-using namespace prometheus;
-
-// create global registry for use it from our classes
-static Registry globalRegistry;
-
-class MyClass {
-
-  Benchmark::Family& benchmarkFamily { Benchmark::Family::Build(globalRegistry,
-                                         "benchmark_family", "family for check benchmark functionality") };
-
-  Benchmark& benchmark1 { benchmarkFamily.Add({{"number", "1"}}) };
-  Benchmark& benchmark2 { benchmarkFamily.Add({{"number", "2"}}) };
-
-public:
-
-  MyClass() = default;
-
-  void member_to_do_something() {
-
-    benchmark1.start();
-    benchmark2.start();
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-    benchmark1.stop();
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-    benchmark2.stop();
-
-  }
-
-};
-
-int main() {
-
-  MyClass myClass;
-
-  for (;; ) {
-
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-
-    myClass.member_to_do_something();
-
-    TextSerializer text_serializer;
-    text_serializer.Serialize(std::cout, globalRegistry.Collect());
-
-  }
-}
-
diff --git a/ext/prometheus-cpp-lite-1.0/examples/use_counters_in_class_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/use_counters_in_class_example.cpp
deleted file mode 100644
index fbe8b6198..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/use_counters_in_class_example.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include <prometheus/registry.h>
-#include <prometheus/counter.h>
-#include <prometheus/text_serializer.h>
-
-#include <array>
-#include <chrono>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <thread>
-#include <iostream>
-
-// use prometheus namespace
-using namespace prometheus;
-
-// for clarity, we deduce the required types
-using IntegerCounter  = Counter<uint64_t>;
-using FloatingCounter = Counter<double>;
-
-using IntegerCounterFamily  = CustomFamily<IntegerCounter>;
-using FloatingCounterFamily = CustomFamily<FloatingCounter>;
-
-// create global registry for use it from our classes
-static Registry globalRegistry;
-
-class MyClass {
-
-  IntegerCounterFamily& counterFamily1 { IntegerCounter::Family::Build(globalRegistry,
-                                         "counter_family_1", "counter for check integer functionality",
-                                         {{"type","integer"}} ) };
-  
-  IntegerCounter& counter11{ counterFamily1.Add({{"number", "1"}}) };
-  IntegerCounter& counter12{ counterFamily1.Add({{"number", "2"}}) };
-  IntegerCounter& counter13{ counterFamily1.Add({{"number", "3"}}) };
-  
-  
-  FloatingCounterFamily& counterFamily2 { FloatingCounter::Family::Build(globalRegistry,
-                                          "counter_family_2", "counter for check floating functionality",
-                                          {{"type","float"}} ) };
-  
-  FloatingCounter& counter21{ counterFamily2.Add({{"number", "1"}}) };
-  FloatingCounter& counter22{ counterFamily2.Add({{"number", "2"}}) };
-  FloatingCounter& counter23{ counterFamily2.Add({{"number", "3"}}) };
-
-public:
-
-  MyClass() = default;
-
-  void member_to_do_something() {
-
-    const int random_value = std::rand();
-
-    if (random_value & 1)  counter11++;
-    if (random_value & 2)  counter12++;
-    if (random_value & 4)  counter13++;
-    if (random_value & 8)  counter21++;
-    if (random_value & 16) counter22++;
-    if (random_value & 32) counter23++;
-
-  }
-
-};
-
-int main() {
-
-  MyClass myClass;
-
-  for (;; ) {
-
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-
-    myClass.member_to_do_something();
-
-    TextSerializer text_serializer;
-    text_serializer.Serialize(std::cout, globalRegistry.Collect());
-
-  }
-}
-
diff --git a/ext/prometheus-cpp-lite-1.0/examples/use_gauge_in_class_example.cpp b/ext/prometheus-cpp-lite-1.0/examples/use_gauge_in_class_example.cpp
deleted file mode 100644
index c66da8a67..000000000
--- a/ext/prometheus-cpp-lite-1.0/examples/use_gauge_in_class_example.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include <prometheus/registry.h>
-#include <prometheus/gauge.h>
-#include <prometheus/text_serializer.h>
-
-#include <array>
-#include <chrono>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <thread>
-#include <iostream>
-
-// use prometheus namespace
-using namespace prometheus;
-
-// for clarity, we deduce the required types
-using IntegerGauge  = Gauge<int64_t>;
-using FloatingGauge = Gauge<double>;
-
-using IntegerGaugeFamily  = CustomFamily<IntegerGauge>;
-using FloatingGaugeFamily = CustomFamily<FloatingGauge>;
-
-// create global registry for use it from our classes
-static Registry globalRegistry;
-
-class MyClass {
-
-  IntegerGaugeFamily& gaugeFamily1  { IntegerGauge::Family::Build(globalRegistry,
-                                      "gauge_family_1", "gauge for check integer functionality",
-                                      {{"type","integer"}} ) };
-  
-  IntegerGauge& gauge11{ gaugeFamily1.Add({{"number", "1"}}) };
-  IntegerGauge& gauge12{ gaugeFamily1.Add({{"number", "2"}}) };
-  IntegerGauge& gauge13{ gaugeFamily1.Add({{"number", "3"}}) };
-  
-  
-  FloatingGaugeFamily& gaugeFamily2 { FloatingGauge::Family::Build(globalRegistry,
-                                      "gauge_family_2", "gauge for check floating functionality",
-                                      {{"type","float"}} ) };
-  
-  FloatingGauge& gauge21{ gaugeFamily2.Add({{"number", "1"}}) };
-  FloatingGauge& gauge22{ gaugeFamily2.Add({{"number", "2"}}) };
-  FloatingGauge& gauge23{ gaugeFamily2.Add({{"number", "3"}}) };
-
-public:
-
-  MyClass() = default;
-
-  void member_to_do_something() {
-
-    const int random_value = std::rand();
-
-    if (random_value &  1      ) gauge11++; else gauge11--;
-    if (random_value & (1 << 1)) gauge12++; else gauge12--;
-    if (random_value & (1 << 2)) gauge13++; else gauge13--;
-    if (random_value & (1 << 3)) gauge21++; else gauge21--;
-    if (random_value & (1 << 4)) gauge22++; else gauge22--;
-    if (random_value & (1 << 5)) gauge23++; else gauge23--;
-
-  }
-
-};
-
-int main() {
-
-  MyClass myClass;
-
-  for (;; ) {
-
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-
-    myClass.member_to_do_something();
-
-    TextSerializer text_serializer;
-    text_serializer.Serialize(std::cout, globalRegistry.Collect());
-
-  }
-}
-
diff --git a/ext/prometheus-cpp-lite-1.0/simpleapi/CMakeLists.txt b/ext/prometheus-cpp-lite-1.0/simpleapi/CMakeLists.txt
deleted file mode 100644
index 19dc9e1f3..000000000
--- a/ext/prometheus-cpp-lite-1.0/simpleapi/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-project(prometheus-cpp-simpleapi)
-cmake_minimum_required(VERSION 3.2)
-
-add_library               (${PROJECT_NAME} STATIC "./src/simpleapi.cpp" )
-target_sources            (${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/prometheus/simpleapi.h")
-target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_link_libraries     (${PROJECT_NAME} PUBLIC prometheus-cpp-lite-core)
diff --git a/ext/prometheus-cpp-lite-1.0/simpleapi/include/prometheus/simpleapi.h b/ext/prometheus-cpp-lite-1.0/simpleapi/include/prometheus/simpleapi.h
deleted file mode 100644
index 73c340979..000000000
--- a/ext/prometheus-cpp-lite-1.0/simpleapi/include/prometheus/simpleapi.h
+++ /dev/null
@@ -1,168 +0,0 @@
-
-#pragma once
-
-#include <prometheus/family.h>
-#include <prometheus/registry.h>
-#include <prometheus/counter.h>
-#include <prometheus/gauge.h>
-#include <prometheus/benchmark.h>
-
-#include <prometheus/registry.h>
-#include <prometheus/save_to_file.h>
-
-#include <thread>
-#include <iostream>
-#include <memory>
-#include <functional>
-#include <stdexcept>
-#include <stdint.h>
-
-#if UINTPTR_MAX == 0xffFFffFF
-// 32-bit
-typedef uint32_t metric_size;
-#elif UINTPTR_MAX == 0xffFFffFFffFFffFF
-// 64-bit
-typedef uint64_t metric_size;
-#else
-#error Unknown platform - does not look either like 32-bit or 64-bit
-#endif
-
-namespace prometheus {
-  namespace simpleapi {
-
-    extern Registry&  registry;
-    extern SaveToFile saver;
-
-
-    template <typename CustomWrapper>
-    class family_wrapper_t {
-
-      typename CustomWrapper::Family* family_{ nullptr };
-
-    public:
-
-      // make new family: family_t family {"family_name", "Family description"}
-      family_wrapper_t(const std::string& name, const std::string& description)
-        : family_(&CustomWrapper::Family::Build(registry, name, description)) {}
-
-      // make new metric into existing family: metric_t metric {family.Add({{"tag_name", "tag_value"}})}
-      CustomWrapper Add(const typename CustomWrapper::Family::Labels& labels) {
-        return CustomWrapper(family_, family_->Add(labels));
-      }
-
-    };
-
-
-    class counter_metric_t {
-
-    public:
-
-      using Metric = Counter<metric_size>;
-      using Family = Metric::Family;
-
-    private:
-
-      Family*  family_ { nullptr };
-      Metric*  metric_ { nullptr };
-
-      friend family_wrapper_t<counter_metric_t>;
-      counter_metric_t(typename Metric::Family* family, Metric& metric)
-        : family_(family), metric_(&metric) {}
-
-    public:
-
-      // fake empty metric
-      counter_metric_t() = default;
-
-      // make new counter as simple metric without tags and with hidden family included: metric_t metric {"counter_name", "Counter description"}
-      counter_metric_t(const std::string& name, const std::string& description)
-        : family_(&Metric::Family::Build(registry, name, description)), metric_(&family_->Add({})) {}
-
-      void operator++ ()                           { metric_->Increment();    }
-      void operator++ (int)                        { metric_->Increment();    }
-      void operator+= (typename Metric::Value val) { metric_->Increment(val); }
-
-      uint64_t value() const { return metric_->Get(); }
-
-    };
-
-    using counter_family_t = family_wrapper_t<counter_metric_t>;
-
-
-    class gauge_metric_t {
-
-    public:
-
-      using Metric = Gauge<metric_size>;
-      using Family = Metric::Family;
-
-    private:
-
-      Family*  family_ { nullptr };
-      Metric*  metric_ { nullptr };
-
-      friend family_wrapper_t<gauge_metric_t>;
-      gauge_metric_t(typename Metric::Family* family, Metric& metric)
-        : family_(family), metric_(&metric) {}
-
-    public:
-
-      // fake empty metric
-      gauge_metric_t() = default;
-
-      // make new gauge as simple metric without tags and with hidden family included: metric {"counter_name", "Counter description"}
-      gauge_metric_t(const std::string& name, const std::string& description)
-        : family_(&Metric::Family::Build(registry, name, description)), metric_(&family_->Add({})) {}
-
-      void operator++ ()                           { metric_->Increment();    }
-      void operator++ (int)                        { metric_->Increment();    }
-      void operator+= (typename Metric::Value val) { metric_->Increment(val); }
-
-      void operator-- ()                           { metric_->Decrement();    }
-      void operator-- (int)                        { metric_->Decrement();    }
-      void operator-= (typename Metric::Value val) { metric_->Decrement(val); }
-      void operator=  (typename Metric::Value val) { metric_->Set(val);       }
-
-      int64_t value() const { return metric_->Get(); }
-
-    };
-
-    using gauge_family_t = family_wrapper_t<gauge_metric_t>;
-
-
-    class benchmark_metric_t {
-
-    public:
-
-      using Metric = Benchmark;
-      using Family = Metric::Family;
-
-    private:
-
-      Family*  family_ { nullptr };
-      Metric*  metric_ { nullptr };
-
-      friend family_wrapper_t<benchmark_metric_t>;
-      benchmark_metric_t(typename Metric::Family* family, Metric& metric)
-        : family_(family), metric_(&metric) {}
-
-    public:
-
-      // fake empty metric
-      benchmark_metric_t() = default;
-
-      // make new benchmark as simple metric without tags and with hidden family included: metric {"counter_name", "Counter description"}
-      benchmark_metric_t(const std::string& name, const std::string& description)
-        : family_(&Metric::Family::Build(registry, name, description)), metric_(&family_->Add({})) {}
-
-      void start() { metric_->start(); }
-      void stop()  { metric_->stop();  }
-
-      double value() const { return metric_->Get(); }
-
-    };
-
-    using benchmark_family_t = family_wrapper_t<benchmark_metric_t>;
-
-  }
-}
diff --git a/ext/prometheus-cpp-lite-1.0/simpleapi/src/simpleapi.cpp b/ext/prometheus-cpp-lite-1.0/simpleapi/src/simpleapi.cpp
deleted file mode 100644
index 3ab9d292c..000000000
--- a/ext/prometheus-cpp-lite-1.0/simpleapi/src/simpleapi.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "prometheus/simpleapi.h"
-
-#include <memory>
-
-namespace prometheus {
-  namespace simpleapi {
-
-    std::shared_ptr<Registry> registry_ptr = std::make_shared<Registry>();
-    Registry&                 registry = *registry_ptr;
-    SaveToFile saver(registry_ptr, std::chrono::seconds(5), std::string("./metrics.prom"));
-
-  }
-}
diff --git a/ext/redis-plus-plus-1.1.1/.gitignore b/ext/redis-plus-plus-1.1.1/.gitignore
deleted file mode 100644
index 259148fa1..000000000
--- a/ext/redis-plus-plus-1.1.1/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
diff --git a/ext/redis-plus-plus-1.1.1/CMakeLists.txt b/ext/redis-plus-plus-1.1.1/CMakeLists.txt
deleted file mode 100644
index ba069a62a..000000000
--- a/ext/redis-plus-plus-1.1.1/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-project(redis++)
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    cmake_minimum_required(VERSION 3.0.0)
-else()
-    cmake_minimum_required(VERSION 2.8.0)
-endif()
-
-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -W -Werror -fPIC")
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-
-set(PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src/sw/redis++)
-
-file(GLOB PROJECT_SOURCE_FILES "${PROJECT_SOURCE_DIR}/*.cpp")
-
-set(STATIC_LIB static)
-#set(SHARED_LIB shared)
-
-add_library(${STATIC_LIB} STATIC ${PROJECT_SOURCE_FILES})
-# add_library(${SHARED_LIB} SHARED ${PROJECT_SOURCE_FILES})
-
-# hiredis dependency
-find_path(HIREDIS_HEADER hiredis)
-target_include_directories(${STATIC_LIB} PUBLIC ${HIREDIS_HEADER})
-# target_include_directories(${SHARED_LIB} PUBLIC ${HIREDIS_HEADER})
-
-#find_library(HIREDIS_LIB hiredis)
-#target_link_libraries(${SHARED_LIB} ${HIREDIS_LIB})
-
-set_target_properties(${STATIC_LIB} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
-#set_target_properties(${SHARED_LIB} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
-
-set_target_properties(${STATIC_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-#set_target_properties(${SHARED_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-
-# add_subdirectory(test)
-
-
-# Install static lib.
-install(TARGETS ${STATIC_LIB}
-        ARCHIVE DESTINATION lib)
-
-# Install shared lib.
-#install(TARGETS ${SHARED_LIB}
-#        LIBRARY DESTINATION lib)
-
-#Install headers.
-set(HEADER_PATH "sw/redis++")
-file(GLOB HEADERS "${PROJECT_SOURCE_DIR}/*.h*")
-install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${HEADER_PATH})
diff --git a/ext/redis-plus-plus-1.1.1/LICENSE b/ext/redis-plus-plus-1.1.1/LICENSE
deleted file mode 100644
index 261eeb9e9..000000000
--- a/ext/redis-plus-plus-1.1.1/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/ext/redis-plus-plus-1.1.1/README.md b/ext/redis-plus-plus-1.1.1/README.md
deleted file mode 100644
index 8d2fd7d28..000000000
--- a/ext/redis-plus-plus-1.1.1/README.md
+++ /dev/null
@@ -1,1776 +0,0 @@
-# redis-plus-plus
-
-- [Overview](#overview)
-    - [Features](#features)
-- [Installation](#installation)
-    - [Install hiredis](#install-hiredis)
-    - [Install redis-plus-plus](#install-redis-plus-plus)
-    - [Run Tests (Optional)](#run-tests-optional)
-    - [Use redis-plus-plus In Your Project](#use-redis-plus-plus-in-your-project)
-- [Getting Started](#getting-started)
-- [API Reference](#api-reference)
-    - [Connection](#connection)
-    - [Send Command to Redis Server](#send-command-to-redis-server)
-    - [Generic Command Interface](#generic-command-interface)
-    - [Publish/Subscribe](#publishsubscribe)
-    - [Pipeline](#pipeline)
-    - [Transaction](#transaction)
-    - [Redis Cluster](#redis-cluster)
-    - [Redis Sentinel](#redis-sentinel)
-    - [Redis Stream](#redis-stream)
-- [Author](#author)
-
-## Overview
-
-This is a C++ client for Redis. It's based on [hiredis](https://github.com/redis/hiredis), and written in C++ 11.
-
-**NOTE**: I'm not a native speaker. So if the documentation is unclear, please feel free to open an issue or pull request. I'll response ASAP.
-
-### Features
-- Most commands for Redis.
-- Connection pool.
-- Redis scripting.
-- Thread safe unless otherwise stated.
-- Redis publish/subscribe.
-- Redis pipeline.
-- Redis transaction.
-- Redis Cluster.
-- Redis Sentinel.
-- STL-like interfaces.
-- Generic command interface.
-
-## Installation
-
-### Install hiredis
-
-Since *redis-plus-plus* is based on *hiredis*, you should install *hiredis* first. The minimum version requirement for *hiredis* is **v0.12.1**, and you'd better use the latest release of *hiredis*.
-
-```
-git clone https://github.com/redis/hiredis.git
-
-cd hiredis
-
-make
-
-make install
-```
-
-By default, *hiredis* is installed at */usr/local*. If you want to install *hiredis* at non-default location, use the following commands to specify the installation path.
-
-```
-make PREFIX=/non/default/path
-
-make PREFIX=/non/default/path install
-```
-
-### Install redis-plus-plus
-
-*redis-plus-plus* is built with [CMAKE](https://cmake.org).
-
-```
-git clone https://github.com/sewenew/redis-plus-plus.git
-
-cd redis-plus-plus
-
-mkdir compile
-
-cd compile
-
-cmake -DCMAKE_BUILD_TYPE=Release ..
-
-make
-
-make install
-
-cd ..
-```
-
-If *hiredis* is installed at non-default location, you should use `CMAKE_PREFIX_PATH` to specify the installation path of *hiredis*. By default, *redis-plus-plus* is installed at */usr/local*. However, you can use `CMAKE_INSTALL_PREFIX` to install *redis-plus-plus* at non-default location.
-
-```
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/path/to/hiredis -DCMAKE_INSTALL_PREFIX=/path/to/install/redis-plus-plus ..
-```
-
-### Run Tests (Optional)
-
-*redis-plus-plus* has been fully tested with the following compilers:
-
-```
-gcc version 4.8.5 20150623 (Red Hat 4.8.5-39) (GCC)
-gcc version 5.5.0 20171010 (Ubuntu 5.5.0-12ubuntu1)
-gcc version 6.5.0 20181026 (Ubuntu 6.5.0-2ubuntu1~18.04)
-gcc version 7.4.0 (Ubuntu 7.4.0-1ubuntu1~18.04.1)
-gcc version 8.3.0 (Ubuntu 8.3.0-6ubuntu1~18.04.1)
-clang version 3.9.1-19ubuntu1 (tags/RELEASE_391/rc2)
-clang version 4.0.1-10 (tags/RELEASE_401/final)
-clang version 5.0.1-4 (tags/RELEASE_501/final)
-clang version 6.0.0-1ubuntu2 (tags/RELEASE_600/final)
-clang version 7.0.0-3~ubuntu0.18.04.1 (tags/RELEASE_700/final)
-Apple clang version 11.0.0 (clang-1100.0.33.8)
-```
-
-After compiling with cmake, you'll get a test program in *compile/test* directory: *compile/test/test_redis++*.
-
-In order to run the tests, you need to set up a Redis instance, and a Redis Cluster. Since the test program will send most of Redis commands to the server and cluster, you need to set up Redis of the latest version (by now, it's 5.0). Otherwise, the tests might fail. For example, if you set up Redis 4.0 for testing, the test program will fail when it tries to send the `ZPOPMAX` command (a Redis 5.0 command) to the server. If you want to run the tests with other Redis versions, you have to comment out commands that haven't been supported by your Redis, from test source files in *redis-plus-plus/test/src/sw/redis++/* directory. Sorry for the inconvenience, and I'll fix this problem to make the test program work with any version of Redis in the future.
-
-**NOTE**: The latest version of Redis is only a requirement for running the tests. In fact, you can use *redis-plus-plus* with Redis of any version, e.g. Redis 2.0, Redis 3.0, Redis 4.0, Redis 5.0.
-
-**NEVER** run the test program in production envronment, since the keys, which the test program reads or writes, might conflict with your application.
-
-In order to run tests with both Redis and Redis Cluster, you can run the test program with the following command:
-
-```
-./compile/test/test_redis++ -h host -p port -a auth -n cluster_node -c cluster_port
-```
-
-- *host* and *port* are the host and port number of the Redis instance.
-- *cluster_node* and *cluster_port* are the host and port number of Redis Cluster. You only need to set the host and port number of a single node in the cluster, *redis-plus-plus* will find other nodes automatically.
-- *auth* is the password of the Redis instance and Redis Cluster. The Redis instance and Redis Cluster must be configured with the same password. If there's no password configured, don't set this option.
-
-If you only want to run tests with Redis, you only need to specify *host*, *port* and *auth* options:
-
-```
-./compile/test/test_redis++ -h host -p port -a auth
-```
-
-Similarly, if you only want to run tests with Redis Cluster, just specify *cluster_node*, *cluster_port* and *auth* options:
-
-```
-./compile/test/test_redis++ -a auth -n cluster_node -c cluster_port
-```
-
-The test program will test running *redis-plus-plus* in multi-threads environment, and this test will cost a long time. If you want to skip it (not recommended), just comment out the following lines in *test/src/sw/redis++/test_main.cpp* file.
-
-```C++
-sw::redis::test::ThreadsTest threads_test(opts, cluster_node_opts);
-threads_test.run();
-```
-
-If all tests have been passed, the test program will print the following message:
-
-```
-Pass all tests
-```
-
-Otherwise, it prints the error message.
-
-#### Performance
-
-*redis-plus-plus* runs as fast as *hiredis*, since it's a wrapper of *hiredis*. You can run *test_redis++* in benchmark mode to check the performance in your environment.
-
-```
-./compile/test/test_redis++ -h host -p port -a auth -n cluster_node -c cluster_port -b -t thread_num -s connection_pool_size -r request_num -k key_len -v val_len
-```
-
-- *-b* option turns the test program into benchmark mode.
-- *thread_num* specifies the number of worker threads. `10` by default.
-- *connection_pool_size* specifies the size of the connection pool. `5` by default.
-- *request_num* specifies the total number of requests sent to server for each test. `100000` by default.
-- *key_len* specifies the length of the key for each operation. `10` by default.
-- *val_len* specifies the length of the value. `10` by default.
-
-The bechmark will generate `100` random binary keys for testing, and the size of these keys is specified by *key_len*. When the benchmark runs, it will read/write with these keys. So **NEVER** run the test program in your production environment, otherwise, it might inaccidently delete your data.
-
-### Use redis-plus-plus In Your Project
-
-After compiling the code, you'll get both shared library and static library. Since *redis-plus-plus* depends on *hiredis*, you need to link both libraries to your Application. Also don't forget to specify the `-std=c++11` and thread-related option.
-
-#### Use Static Libraries
-
-Take gcc as an example.
-
-```
-g++ -std=c++11 -o app app.cpp /path/to/libredis++.a /path/to/libhiredis.a -pthread
-```
-
-If *hiredis* and *redis-plus-plus* are installed at non-default location, you should use `-I` option to specify the header path.
-
-```
-g++ -std=c++11 -I/non-default/install/include/path -o app app.cpp /path/to/libredis++.a /path/to/libhiredis.a -pthread
-```
-
-#### Use Shared Libraries
-
-```
-g++ -std=c++11 -o app app.cpp -lredis++ -lhiredis -pthread
-```
-
-If *hiredis* and *redis-plus-plus* are installed at non-default location, you should use `-I` and `-L` options to specify the header and library paths.
-
-```
-g++ -std=c++11 -I/non-default/install/include/path -L/non-default/install/lib/path -o app app.cpp -lredis++ -lhiredis -pthread
-```
-
-When linking with shared libraries, and running your application, you might get the following error message:
-
-```
-error while loading shared libraries: xxx: cannot open shared object file: No such file or directory.
-```
-
-That's because the linker cannot find the shared libraries. In order to solve the problem, you can add the path where you installed *hiredis* and *redis-plus-plus* libraries, to `LD_LIBRARY_PATH` environment variable. For example:
-
-```
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-```
-
-Check [this StackOverflow question](https://stackoverflow.com/questions/480764) for details on how to solve the problem.
-
-#### Build With Cmake
-
-If you're using cmake to build your application, you need to add *hiredis* and *redis-plus-plus* dependencies in your *CMakeLists.txt*:
-
-```CMake
-# <------------ add hiredis dependency --------------->
-find_path(HIREDIS_HEADER hiredis)
-target_include_directories(target PUBLIC ${HIREDIS_HEADER})
-
-find_library(HIREDIS_LIB hiredis)
-target_link_libraries(target ${HIREDIS_LIB})
-
-# <------------ add redis-plus-plus dependency -------------->
-# NOTE: this should be *sw* NOT *redis++*
-find_path(REDIS_PLUS_PLUS_HEADER sw)
-target_include_directories(target PUBLIC ${REDIS_PLUS_PLUS_HEADER})
-
-find_library(REDIS_PLUS_PLUS_LIB redis++)
-target_link_libraries(target ${REDIS_PLUS_PLUS_LIB})
-```
-
-See [this issue](https://github.com/sewenew/redis-plus-plus/issues/5) for a complete example of *CMakeLists.txt*.
-
-Also, if you installed *hiredis* and *redis-plus-plus* at non-default location, you need to run cmake with `CMAKE_PREFIX_PATH` option to specify the installation path of these two libraries.
-
-```
-cmake -DCMAKE_PREFIX_PATH=/installation/path/to/the/two/libs ..
-```
-
-## Getting Started
-
-```C++
-#include <sw/redis++/redis++.h>
-
-using namespace sw::redis;
-
-try {
-    // Create an Redis object, which is movable but NOT copyable.
-    auto redis = Redis("tcp://127.0.0.1:6379");
-
-    // ***** STRING commands *****
-
-    redis.set("key", "val");
-    auto val = redis.get("key");    // val is of type OptionalString. See 'API Reference' section for details.
-    if (val) {
-        // Dereference val to get the returned value of std::string type.
-        std::cout << *val << std::endl;
-    }   // else key doesn't exist.
-
-    // ***** LIST commands *****
-
-    // std::vector<std::string> to Redis LIST.
-    std::vector<std::string> vec = {"a", "b", "c"};
-    redis.rpush("list", vec.begin(), vec.end());
-
-    // std::initializer_list to Redis LIST.
-    redis.rpush("list", {"a", "b", "c"});
-
-    // Redis LIST to std::vector<std::string>.
-    vec.clear();
-    redis.lrange("list", 0, -1, std::back_inserter(vec));
-
-    // ***** HASH commands *****
-
-    redis.hset("hash", "field", "val");
-
-    // Another way to do the same job.
-    redis.hset("hash", std::make_pair("field", "val"));
-
-    // std::unordered_map<std::string, std::string> to Redis HASH.
-    std::unordered_map<std::string, std::string> m = {
-        {"field1", "val1"},
-        {"field2", "val2"}
-    };
-    redis.hmset("hash", m.begin(), m.end());
-
-    // Redis HASH to std::unordered_map<std::string, std::string>.
-    m.clear();
-    redis.hgetall("hash", std::inserter(m, m.begin()));
-
-    // Get value only.
-    // NOTE: since field might NOT exist, so we need to parse it to OptionalString.
-    std::vector<OptionalString> vals;
-    redis.hmget("hash", {"field1", "field2"}, std::back_inserter(vals));
-
-    // ***** SET commands *****
-
-    redis.sadd("set", "m1");
-
-    // std::unordered_set<std::string> to Redis SET.
-    std::unordered_set<std::string> set = {"m2", "m3"};
-    redis.sadd("set", set.begin(), set.end());
-
-    // std::initializer_list to Redis SET.
-    redis.sadd("set", {"m2", "m3"});
-
-    // Redis SET to std::unordered_set<std::string>.
-    set.clear();
-    redis.smembers("set", std::inserter(set, set.begin()));
-
-    if (redis.sismember("set", "m1")) {
-        std::cout << "m1 exists" << std::endl;
-    }   // else NOT exist.
-
-    // ***** SORTED SET commands *****
-
-    redis.zadd("sorted_set", "m1", 1.3);
-
-    // std::unordered_map<std::string, double> to Redis SORTED SET.
-    std::unordered_map<std::string, double> scores = {
-        {"m2", 2.3},
-        {"m3", 4.5}
-    };
-    redis.zadd("sorted_set", scores.begin(), scores.end());
-
-    // Redis SORTED SET to std::unordered_map<std::string, double>.
-    scores.clear();
-    redis.zrangebyscore("sorted_set",
-            UnboundedInterval<double>{},            // (-inf, +inf)
-            std::inserter(scores, scores.begin()));
-
-    // Only get member names:
-    // pass an inserter of std::vector<std::string> type as output parameter.
-    std::vector<std::string> without_score;
-    redis.zrangebyscore("sorted_set",
-            BoundedInterval<double>(1.5, 3.4, BoundType::CLOSED),   // [1.5, 3.4]
-            std::back_inserter(without_score));
-
-    // Get both member names and scores:
-    // pass an inserter of std::unordered_map<std::string, double> as output parameter.
-    std::unordered_map<std::string, double> with_score;
-    redis.zrangebyscore("sorted_set",
-            BoundedInterval<double>(1.5, 3.4, BoundType::LEFT_OPEN),    // (1.5, 3.4]
-            std::inserter(with_score, with_score.end()));
-
-    // ***** SCRIPTING commands *****
-
-    // Script returns a single element.
-    auto num = redis.eval<long long>("return 1", {}, {});
-
-    // Script returns an array of elements.
-    std::vector<long long> nums;
-    redis.eval("return {ARGV[1], ARGV[2]}", {}, {"1", "2"}, std::back_inserter(nums));
-
-    // ***** Pipeline *****
-
-    // Create a pipeline.
-    auto pipe = redis.pipeline();
-
-    // Send mulitple commands and get all replies.
-    auto pipe_replies = pipe.set("key", "value")
-                            .get("key")
-                            .rename("key", "new-key")
-                            .rpush("list", {"a", "b", "c"})
-                            .lrange("list", 0, -1)
-                            .exec();
-
-    // Parse reply with reply type and index.
-    auto set_cmd_result = pipe_replies.get<bool>(0);
-
-    auto get_cmd_result = pipe_replies.get<OptionalString>(1);
-
-    // rename command result
-    pipe_replies.get<void>(2);
-
-    auto rpush_cmd_result = pipe_replies.get<long long>(3);
-
-    std::vector<std::string> lrange_cmd_result;
-    pipe_replies.get(4, back_inserter(lrange_cmd_result));
-
-    // ***** Transaction *****
-
-    // Create a transaction.
-    auto tx = redis.transaction();
-
-    // Run multiple commands in a transaction, and get all replies.
-    auto tx_replies = tx.incr("num0")
-                        .incr("num1")
-                        .mget({"num0", "num1"})
-                        .exec();
-
-    // Parse reply with reply type and index.
-    auto incr_result0 = tx_replies.get<long long>(0);
-
-    auto incr_result1 = tx_replies.get<long long>(1);
-
-    std::vector<OptionalString> mget_cmd_result;
-    tx_replies.get(2, back_inserter(mget_cmd_result));
-
-    // ***** Generic Command Interface *****
-
-    // There's no *Redis::client_getname* interface.
-    // But you can use *Redis::command* to get the client name.
-    val = redis.command<OptionalString>("client", "getname");
-    if (val) {
-        std::cout << *val << std::endl;
-    }
-
-    // Same as above.
-    auto getname_cmd_str = {"client", "getname"};
-    val = redis.command<OptionalString>(getname_cmd_str.begin(), getname_cmd_str.end());
-
-    // There's no *Redis::sort* interface.
-    // But you can use *Redis::command* to send sort the list.
-    std::vector<std::string> sorted_list;
-    redis.command("sort", "list", "ALPHA", std::back_inserter(sorted_list));
-
-    // Another *Redis::command* to do the same work.
-    auto sort_cmd_str = {"sort", "list", "ALPHA"};
-    redis.command(sort_cmd_str.begin(), sort_cmd_str.end(), std::back_inserter(sorted_list));
-
-    // ***** Redis Cluster *****
-
-    // Create a RedisCluster object, which is movable but NOT copyable.
-    auto redis_cluster = RedisCluster("tcp://127.0.0.1:7000");
-
-    // RedisCluster has similar interfaces as Redis.
-    redis_cluster.set("key", "value");
-    val = redis_cluster.get("key");
-    if (val) {
-        std::cout << *val << std::endl;
-    }   // else key doesn't exist.
-
-    // Keys with hash-tag.
-    redis_cluster.set("key{tag}1", "val1");
-    redis_cluster.set("key{tag}2", "val2");
-    redis_cluster.set("key{tag}3", "val3");
-
-    std::vector<OptionalString> hash_tag_res;
-    redis_cluster.mget({"key{tag}1", "key{tag}2", "key{tag}3"},
-            std::back_inserter(hash_tag_res));
-
-} catch (const Error &e) {
-    // Error handling.
-}
-```
-
-## API Reference
-
-### Connection
-
-`Redis` class maintains a connection pool to Redis server. If the connection is broken, `Redis` reconnects to Redis server automatically.
-
-You can initialize a `Redis` instance with `ConnectionOptions` and `ConnectionPoolOptions`. `ConnectionOptions` specifies options for connection to Redis server, and `ConnectionPoolOptions` specifies options for conneciton pool. `ConnectionPoolOptions` is optional. If not specified, `Redis` maintains a single connection to Redis server.
-
-```C++
-ConnectionOptions connection_options;
-connection_options.host = "127.0.0.1";  // Required.
-connection_options.port = 6666; // Optional. The default port is 6379.
-connection_options.password = "auth";   // Optional. No password by default.
-connection_options.db = 1;  // Optional. Use the 0th database by default.
-
-// Optional. Timeout before we successfully send request to or receive response from redis.
-// By default, the timeout is 0ms, i.e. never timeout and block until we send or receive successfuly.
-// NOTE: if any command is timed out, we throw a TimeoutError exception.
-connection_options.socket_timeout = std::chrono::milliseconds(200);
-
-// Connect to Redis server with a single connection.
-Redis redis1(connection_options);
-
-ConnectionPoolOptions pool_options;
-pool_options.size = 3;  // Pool size, i.e. max number of connections.
-
-// Connect to Redis server with a connection pool.
-Redis redis2(connection_options, pool_options);
-```
-
-See [ConnectionOptions](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/connection.h#L40) and [ConnectionPoolOptions](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/connection_pool.h#L30) for more options.
-
-**NOTE**: `Redis` class is movable but NOT copyable.
-
-```C++
-// auto redis3 = redis1;    // this won't compile.
-
-// But it's movable.
-auto redis3 = std::move(redis1);
-```
-
-*redis-plus-plus* also supports connecting to Redis server with Unix Domain Socket.
-
-```C++
-ConnectionOptions options;
-options.type = ConnectionType::UNIX;
-options.path = "/path/to/socket";
-Redis redis(options);
-```
-
-You can also connect to Redis server with a URI. However, in this case, you can only specify *host* and *port*, or *Unix Domain Socket path*. In order to specify other options, you need to use `ConnectionOptions` and `ConnectionPoolOptions`.
-
-```C++
-// Single connection to the given host and port.
-Redis redis1("tcp://127.0.0.1:6666");
-
-// Use default port, i.e. 6379.
-Redis redis2("tcp://127.0.0.1");
-
-// Connect to Unix Domain Socket.
-Redis redis3("unix://path/to/socket");
-```
-
-#### Lazily Create Connection
-
-Connections in the pool are lazily created. When the connection pool is initialized, i.e. the constructor of `Redis`, `Redis` does NOT connect to the server. Instead, it connects to the server only when you try to send command. In this way, we can avoid unnecessary connections. So if the pool size is 5, but the number of max concurrent connections is 3, there will be only 3 connections in the pool.
-
-#### Connection Failure
-
-You don't need to check whether `Redis` object connects to server successfully. If `Redis` fails to create a connection to Redis server, or the connection is broken at some time, it throws an exception of type `Error` when you try to send command with `Redis`. Even when you get an exception, i.e. the connection is broken, you don't need to create a new `Redis` object. You can reuse the `Redis` object to send commands, and the `Redis` object will try to reconnect to server automatically. If it reconnects successfully, it sends command to server. Otherwise, it throws an exception again.
-
-See the [Exception section](#exception) for details on exceptions.
-
-#### Reuse Redis object As Much As Possible
-
-It's NOT cheap to create a `Redis` object, since it will create new connections to Redis server. So you'd better reuse `Redis` object as much as possible. Also, it's safe to call `Redis`' member functions in multi-thread environment, and you can share `Redis` object in multiple threads.
-
-```C++
-// This is GOOD practice.
-auto redis = Redis("tcp://127.0.0.1");
-for (auto idx = 0; idx < 100; ++idx) {
-    // Reuse the Redis object in the loop.
-    redis.set("key", "val");
-}
-
-// This is VERY BAD! It's very inefficient.
-// NEVER DO IT!!!
-for (auto idx = 0; idx < 100; ++idx) {
-    // Create a new Redis object for each iteration.
-    auto redis = Redis("tcp://127.0.0.1");
-    redis.set("key", "val");
-}
-```
-
-### Send Command to Redis Server
-
-You can send [Redis commands](https://redis.io/commands) through `Redis` object. `Redis` has one or more (overloaded) methods for each Redis command. The method has the same (lowercased) name as the corresponding command. For example, we have 3 overload methods for the `DEL key [key ...]` command:
-
-```C++
-// Delete a single key.
-long long Redis::del(const StringView &key);
-
-// Delete a batch of keys: [first, last).
-template <typename Input>
-long long Redis::del(Input first, Input last);
-
-// Delete keys in the initializer_list.
-template <typename T>
-long long Redis::del(std::initializer_list<T> il);
-```
-
-With input parameters, these methods build a Redis command based on [Redis protocol](https://redis.io/topics/protocol), and send the command to Redis server. Then synchronously receive the reply, parse it, and return to the caller.
-
-Let's take a closer look at these methods' parameters and return values.
-
-#### Parameter Type
-
-Most of these methods have the same parameters as the corresponding commands. The following is a list of parameter types:
-
-| Parameter Type | Explaination | Example | Note |
-| :------------: | ------------ | ------- | ---- |
-| **StringView** | Parameters of string type. Normally used for key, value, member name, field name and so on | ***bool Redis::hset(const StringView &key, const StringView &field, const StringView &val)*** | See the [StringView section](#stringview) for details on `StringView` |
-| **long long** | Parameters of integer type. Normally used for index (e.g. list commands) or integer | ***void ltrim(const StringView &key, long long start, long long stop)*** <br> ***long long decrby(const StringView &key, long long decrement)*** | |
-| **double** | Parameters of floating-point type. Normally used for score (e.g. sorted set commands) or number of floating-point type | ***double incrbyfloat(const StringView &key, double increment)*** | |
-| **std::chrono::duration** <br> **std::chrono::time_point** | Time-related parameters | ***bool expire(const StringView &key, const std::chrono::seconds &timeout)*** <br> ***bool expireat(const StringView &key, const std::chrono::time_point<std::chrono::system_clock, std::chrono::seconds> &tp)*** | |
-| **std::pair<StringView, StringView>** | Used for Redis hash's (field, value) pair | ***bool hset(const StringView &key, const std::pair<StringView, StringView> &item)*** | |
-| **std::pair<double, double>** | Used for Redis geo's (longitude, latitude) pair | ***OptionalLongLong georadius(const StringView &key, const std::pair<double, double> &location, double radius, GeoUnit unit, const StringView &destination, bool store_dist, long long count)*** | |
-| **pair of iterators** | Use a pair of iterators to specify a range of input, so that we can pass the data in a STL container to these methods | ***template < typename Input >*** <br> ***long long del(Input first, Input last)*** | Throw an exception, if it's an empty range, i.e. *first == last* |
-| **std::initializer_list< T >** | Use an initializer list to specify a batch of input | ***template < typename T >*** <br> ***long long del(std::initializer_list< T > il)*** | |
-| **some options** | Options for some commands | ***UpdateType***, ***template < typename T > class BoundedInterval*** | See [command_options.h](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/command_options.h) for details |
-
-##### StringView
-
-[std::string_view](http://en.cppreference.com/w/cpp/string/basic_string_view) is a good option for the type of string parameters. However, by now, not all compilers support `std::string_view`. So we wrote a [simple version](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/utils.h#L48), i.e. `StringView`. Since there are conversions from `std::string` and c-style string to `StringView`, you can just pass `std::string` or c-style string to methods that need a `StringView` parameter.
-
-```C++
-// bool Redis::hset(const StringView &key, const StringView &field, const StringView &val)
-
-// Pass c-style string to StringView.
-redis.hset("key", "field", "value");
-
-// Pass std::string to StringView.
-std::string key = "key";
-std::string field = "field";
-std::string val = "val";
-redis.hset(key, field, val);
-
-// Mix std::string and c-style string.
-redis.hset(key, field, "value");
-```
-
-#### Return Type
-
-[Redis protocol](https://redis.io/topics/protocol) defines 5 kinds of replies:
-- *Status Reply*: Also known as *Simple String Reply*. It's a non-binary string reply.
-- *Bulk String Reply*: Binary safe string reply.
-- *Integer Reply*: Signed integer reply. Large enough to hold `long long`.
-- *Array Reply*: (Nested) Array reply.
-- *Error Reply*: Non-binary string reply that gives error info.
-
-Also these replies might be *NULL*. For instance, when you try to `GET` the value of a nonexistent key, Redis returns a *NULL Bulk String Reply*.
-
-As we mentioned above, replies are parsed into return values of these methods. The following is a list of return types:
-
-| Return Type | Explaination | Example | Note |
-| :---------: | ------------ | ------- | ---- |
-| **void** | *Status Reply* that should always return a string of "OK" | *RENAME*, *SETEX* | |
-| **std::string** | *Status Reply* that NOT always return "OK", and *Bulk String Reply* | *PING*, *INFO* | |
-| **bool** | *Integer Reply* that always returns 0 or 1 | *EXPIRE*, *HSET* | See the [Boolean Return Value section](#boolean-return-value) for the meaning of a boolean return value |
-| **long long** | *Integer Reply* that not always return 0 or 1 | *DEL*, *APPEND* | |
-| **double** | *Bulk String Reply* that represents a double | *INCRBYFLOAT*, *ZINCRBY* | |
-| **std::pair** | *Array Reply* with exactly 2 elements. Since the return value is always an array of 2 elements, we return the 2 elements as a `std::pair`'s first and second elements | *BLPOP* | |
-| **std::tuple** | *Array Reply* with fixed length and has more than 2 elements. Since length of the returned array is fixed, we return the array as a `std::tuple` | *BZPOPMAX* | |
-| **output iterator** | General *Array Reply* with non-fixed/dynamic length. We use STL-like interface to return this kind of array replies, so that you can insert the return value into a STL container easily | *MGET*, *LRANGE* | Also, sometimes the type of output iterator decides which options to send with the command. See the [Examples section](#command-overloads) for details |
-| **Optional< T >** | For any reply of type `T` that might be *NULL* | *GET*, *LPOP*, *BLPOP*, *BZPOPMAX* | See the [Optional section](#optional) for details on `Optional<T>` |
-
-##### Boolean Return Value
-
-The return type of some methods, e.g. `EXPIRE`, `HSET`, is `bool`. If the method returns `false`, it DOES NOT mean that `Redis` failed to send the command to Redis server. Instead, it means that Redis server returns an *Integer Reply*, and the value of the reply is `0`. Accordingly, if the method returns `true`, it means that Redis server returns an *Integer Reply*, and the value of the reply is `1`. You can 
-check [Redis commands manual](http://redis.io/commands) for what do `0` and `1` stand for.
-
-For example, when we send `EXPIRE` command to Redis server, it returns `1` if the timeout was set, and it returns `0` if the key doesn't exist. Accordingly, if the timeout was set, `Redis::expire` returns `true`, and if the key doesn't exist, `Redis::expire` returns `false`.
-
-So, never use the return value to check if the command has been successfully sent to Redis server. Instead, if `Redis` failed to send command to server, it throws an exception of type `Error`. See the [Exception section](#exception) for details on exceptions.
-
-##### Optional
-
-[std::optional](http://en.cppreference.com/w/cpp/utility/optional) is a good option for return type, if Redis might return *NULL REPLY*. Again, since not all compilers support `std::optional` so far, we implement our own [simple version](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/utils.h#L85), i.e. `Optional<T>`.
-
-Take the [GET](https://redis.io/commands/get) and [MGET](https://redis.io/commands/mget) commands for example:
-
-```C++
-// Or just: auto val = redis.get("key");
-Optional<std::string> val = redis.get("key");
-
-// Optional<T> has a conversion to bool.
-// If it's NOT a null Optional<T> object, it's converted to true.
-// Otherwise, it's converted to false.
-if (val) {
-    // Key exists. Dereference val to get the string result.
-    std::cout << *val << std::endl;
-} else {
-    // Redis server returns a NULL Bulk String Reply.
-    // It's invalid to dereference a null Optional<T> object.
-    std::cout << "key doesn't exist." << std::endl;
-}
-
-std::vector<Optional<std::string>> values;
-redis.mget({"key1", "key2", "key3"}, std::back_inserter(values));
-for (const auto &val : values) {
-    if (val) {
-        // Key exist, process the value.
-    }
-}
-```
-
-We also have some typedefs for some commonly used `Optional<T>`:
-
-```C++
-using OptionalString = Optional<std::string>;
-
-using OptionalLongLong = Optional<long long>;
-
-using OptionalDouble = Optional<double>;
-
-using OptionalStringPair = Optional<std::pair<std::string, std::string>>;
-```
-
-#### Exception
-
-`Redis` throws exceptions if it receives an *Error Reply* or something bad happens, e.g. failed to create a connection to server, or connection to server is broken. All exceptions derived from `Error` class. See [errors.h](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/errors.h) for details.
-
-- `Error`: Generic error. It's also the base class of other exceptions.
-- `IoError`: There's some IO error with the connection.
-- `TimeoutError`: Read or write operation was timed out. It's a derived class of `IoError`.
-- `ClosedError`: Redis server closed the connection.
-- `ProtoError`: The command or reply is invalid, and we cannot process it with Redis protocol.
-- `OomError`: *hiredis* library got an out-of-memory error.
-- `ReplyError`: Redis server returned an error reply, e.g. we try to call `redis::lrange` on a Redis hash.
-- `WatchError`: Watched key has been modified. See [Watch section](#watch) for details.
-
-**NOTE**: *NULL REPLY*` is not taken as an exception. For example, if we try to `GET` a non-existent key, we'll get a *NULL Bulk String Reply*. Instead of throwing an exception, we return the *NULL REPLY* as a null `Optional<T>` object. Also see [Optional section](#optional).
-
-#### Examples
-
-Let's see some examples on how to send commands to Redis server.
-
-##### Various Parameter Types
-
-```C++
-// ***** Parameters of StringView type *****
-
-// Implicitly construct StringView with c-style string.
-redis.set("key", "value");
-
-// Implicitly construct StringView with std::string.
-std::string key("key");
-std::string val("value");
-redis.set(key, val);
-
-// Explicitly pass StringView as parameter.
-std::vector<char> large_data;
-// Avoid copying.
-redis.set("key", StringView(large_data.data(), large_data.size()));
-
-// ***** Parameters of long long type *****
-
-// For index.
-redis.bitcount(key, 1, 3);
-
-// For number.
-redis.incrby("num", 100);
-
-// ***** Parameters of double type *****
-
-// For score.
-redis.zadd("zset", "m1", 2.5);
-redis.zadd("zset", "m2", 3.5);
-redis.zadd("zset", "m3", 5);
-
-// For (longitude, latitude).
-redis.geoadd("geo", std::make_tuple("member", 13.5, 15.6));
-
-// ***** Time-related parameters *****
-
-using namespace std::chrono;
-
-redis.expire(key, seconds(1000));
-
-auto tp = time_point_cast<seconds>(system_clock::now() + seconds(100));
-redis.expireat(key, tp);
-
-// ***** Some options for commands *****
-
-if (redis.set(key, "value", milliseconds(100), UpdateType::NOT_EXIST)) {
-    std::cout << "set OK" << std::endl;
-}
-
-redis.linsert("list", InsertPosition::BEFORE, "pivot", "val");
-
-std::vector<std::string> res;
-
-// (-inf, inf)
-redis.zrangebyscore("zset", UnboundedInterval<double>{}, std::back_inserter(res));
-
-// [3, 6]
-redis.zrangebyscore("zset",
-    BoundedInterval<double>(3, 6, BoundType::CLOSED),
-    std::back_inserter(res));
-
-// (3, 6]
-redis.zrangebyscore("zset",
-    BoundedInterval<double>(3, 6, BoundType::LEFT_OPEN),
-    std::back_inserter(res));
-
-// (3, 6)
-redis.zrangebyscore("zset",
-    BoundedInterval<double>(3, 6, BoundType::OPEN),
-    std::back_inserter(res));
-
-// [3, 6)
-redis.zrangebyscore("zset",
-    BoundedInterval<double>(3, 6, BoundType::RIGHT_OPEN),
-    std::back_inserter(res));
-
-// [3, +inf)
-redis.zrangebyscore("zset",
-    LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    std::back_inserter(res));
-
-// (3, +inf)
-redis.zrangebyscore("zset",
-    LeftBoundedInterval<double>(3, BoundType::OPEN),
-    std::back_inserter(res));
-
-// (-inf, 6]
-redis.zrangebyscore("zset",
-    RightBoundedInterval<double>(6, BoundType::LEFT_OPEN),
-    std::back_inserter(res));
-
-// (-inf, 6)
-redis.zrangebyscore("zset",
-    RightBoundedInterval<double>(6, BoundType::OPEN),
-    std::back_inserter(res));
-
-// ***** Pair of iterators *****
-
-std::vector<std::pair<std::string, std::string>> kvs = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
-redis.mset(kvs.begin(), kvs.end());
-
-std::unordered_map<std::string, std::string> kv_map = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
-redis.mset(kv_map.begin(), kv_map.end());
-
-std::unordered_map<std::string, std::string> str_map = {{"f1", "v1"}, {"f2", "v2"}, {"f3", "v3"}};
-redis.hmset("hash", str_map.begin(), str_map.end());
-
-std::unordered_map<std::string, double> score_map = {{"m1", 20}, {"m2", 12.5}, {"m3", 3.14}};
-redis.zadd("zset", score_map.begin(), score_map.end());
-
-std::vector<std::string> keys = {"k1", "k2", "k3"};
-redis.del(keys.begin(), keys.end());
-
-// ***** Parameters of initializer_list type *****
-
-redis.mset({
-    std::make_pair("k1", "v1"),
-    std::make_pair("k2", "v2"),
-    std::make_pair("k3", "v3")
-});
-
-redis.hmset("hash",
-    {
-        std::make_pair("f1", "v1"),
-        std::make_pair("f2", "v2"),
-        std::make_pair("f3", "v3")
-    });
-
-redis.zadd("zset",
-    {
-        std::make_pair("m1", 20.0),
-        std::make_pair("m2", 34.5),
-        std::make_pair("m3", 23.4)
-    });
-
-redis.del({"k1", "k2", "k3"});
-```
-
-##### Various Return Types
-
-```C++
-// ***** Return void *****
-
-redis.save();
-
-// ***** Return std::string *****
-
-auto info = redis.info();
-
-// ***** Return bool *****
-
-if (!redis.expire("nonexistent", std::chrono::seconds(100))) {
-    std::cerr << "key doesn't exist" << std::endl;
-}
-
-if (redis.setnx("key", "val")) {
-    std::cout << "set OK" << std::endl;
-}
-
-// ***** Return long long *****
-
-auto len = redis.strlen("key");
-auto num = redis.del({"a", "b", "c"});
-num = redis.incr("a");
-
-// ***** Return double *****
-
-auto real = redis.incrbyfloat("b", 23.4);
-real = redis.hincrbyfloat("c", "f", 34.5);
-
-// ***** Return Optional<std::string>, i.e. OptionalString *****
-
-auto os = redis.get("kk");
-if (os) {
-    std::cout << *os << std::endl;
-} else {
-    std::cerr << "key doesn't exist" << std::endl;
-}
-
-os = redis.spop("set");
-if (os) {
-    std::cout << *os << std::endl;
-} else {
-    std::cerr << "set is empty" << std::endl;
-}
-
-// ***** Return Optional<long long>, i.e. OptionalLongLong *****
-
-auto oll = redis.zrank("zset", "mem");
-if (oll) {
-    std::cout << "rank is " << *oll << std::endl;
-} else {
-    std::cerr << "member doesn't exist" << std::endl;
-}
-
-// ***** Return Optional<double>, i.e. OptionalDouble *****
-
-auto ob = redis.zscore("zset", "m1");
-if (ob) {
-    std::cout << "score is " << *ob << std::endl;
-} else {
-    std::cerr << "member doesn't exist" << std::endl;
-}
-
-// ***** Return Optional<pair<string, string>> *****
-
-auto op = redis.blpop({"list1", "list2"}, std::chrono::seconds(2));
-if (op) {
-    std::cout << "key is " << op->first << ", value is " << op->second << std::endl;
-} else {
-    std::cerr << "timeout" << std::endl;
-}
-
-// ***** Output iterators *****
-
-std::vector<OptionalString> os_vec;
-redis.mget({"k1", "k2", "k3"}, std::back_inserter(os_vec));
-
-std::vector<std::string> s_vec;
-redis.lrange("list", 0, -1, std::back_inserter(s_vec));
-
-std::unordered_map<std::string, std::string> hash;
-redis.hgetall("hash", std::inserter(hash, hash.end()));
-// You can also save the result in a vecotr of string pair.
-std::vector<std::pair<std::string, std::string>> hash_vec;
-redis.hgetall("hash", std::back_inserter(hash_vec));
-
-std::unordered_set<std::string> str_set;
-redis.smembers("s1", std::inserter(str_set, str_set.end()));
-// You can also save the result in a vecotr of string.
-s_vec.clear();
-redis.smembers("s1", std::back_inserter(s_vec));
-```
-
-##### SCAN Commands
-
-```C++
-auto cursor = 0LL;
-auto pattern = "*pattern*";
-auto count = 5;
-std::vector<std::string> scan_vec;
-while (true) {
-    cursor = redis.scan(cursor, pattern, count, std::back_inserter(scan_vec));
-    // Default pattern is "*", and default count is 10
-    // cursor = redis.scan(cursor, std::back_inserter(scan_vec));
-
-    if (cursor == 0) {
-        break;
-    }
-}
-```
-
-##### Command Overloads
-
-Sometimes the type of output iterator decides which options to send with the command.
-
-```C++
-// If the output iterator is an iterator of a container of string,
-// we send *ZRANGE* command without the *WITHSCORES* option.
-std::vector<std::string> members;
-redis.zrange("list", 0, -1, std::back_inserter(members));
-
-// If it's an iterator of a container of a <string, double> pair,
-// we send *ZRANGE* command with *WITHSCORES* option.
-std::unordered_map<std::string, double> res_with_score;
-redis.zrange("list", 0, -1, std::inserter(res_with_score, res_with_score.end()));
-
-// The above examples also apply to other command with the *WITHSCORES* options,
-// e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-
-// Another example is the *GEORADIUS* command.
-
-// Only get members.
-members.clear();
-redis.georadius("geo",
-            std::make_pair(10.1, 11.1),
-            100,
-            GeoUnit::KM,
-            10,
-            true,
-            std::back_inserter(members));
-
-// If the iterator is an iterator of a container of tuple<string, double>,
-// we send the *GEORADIUS* command with *WITHDIST* option.
-std::vector<std::tuple<std::string, double>> mem_with_dist;
-redis.georadius("geo",
-            std::make_pair(10.1, 11.1),
-            100,
-            GeoUnit::KM,
-            10,
-            true,
-            std::back_inserter(mem_with_dist));
-
-// If the iterator is an iterator of a container of tuple<string, double, string>,
-// we send the *GEORADIUS* command with *WITHDIST* and *WITHHASH* options.
-std::vector<std::tuple<std::string, double, std::string>> mem_with_dist_hash;
-redis.georadius("geo",
-            std::make_pair(10.1, 11.1),
-            100,
-            GeoUnit::KM,
-            10,
-            true,
-            std::back_inserter(mem_with_dist_hash));
-
-// If the iterator is an iterator of a container of
-// tuple<string, string, pair<double, double>, double>,
-// we send the *GEORADIUS* command with *WITHHASH*, *WITHCOORD* and *WITHDIST* options.
-std::vector<std::tuple<std::string, double, std::string>> mem_with_hash_coord_dist;
-redis.georadius("geo",
-            std::make_pair(10.1, 11.1),
-            100,
-            GeoUnit::KM,
-            10,
-            true,
-            std::back_inserter(mem_with_hash_coord_dist));
-```
-
-Please see [redis.h](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/redis.h) for more API references, and see the [tests](https://github.com/sewenew/redis-plus-plus/tree/master/test/src/sw/redis%2B%2B) for more examples.
-
-### Generic Command Interface
-
-There're too many Redis commands, we haven't implemented all of them. However, you can use the generic `Redis::command` methods to send any commands to Redis. Unlike other client libraries, `Redis::command` doesn't use format string to combine command arguments into a command string. Instead, you can directly pass command arguments of `StringView` type or arithmetic type as parameters of `Redis::command`. For the reason why we don't use format string, please see [this discussion](https://github.com/sewenew/redis-plus-plus/pull/2).
-
-```C++
-auto redis = Redis("tcp://127.0.0.1");
-
-// Redis class doesn't have built-in *CLIENT SETNAME* method.
-// However, you can use Redis::command to send the command manually.
-redis.command<void>("client", "setname", "name");
-auto val = redis.command<OptionalString>("client", "getname");
-if (val) {
-    std::cout << *val << std::endl;
-}
-
-// NOTE: the following code is for example only. In fact, Redis has built-in
-// methods for the following commands.
-
-// Arguments of the command can be strings.
-// NOTE: for SET command, the return value is NOT always void, I'll explain latter.
-redis.command<void>("set", "key", "100");
-
-// Arguments of the command can be a combination of strings and integers.
-auto num = redis.command<long long>("incrby", "key", 1);
-
-// Argument can also be double.
-auto real = redis.command<double>("incrbyfloat", "key", 2.3);
-
-// Even the key of the command can be of arithmetic type.
-redis.command<void>("set", 100, "value");
-
-val = redis.command<OptionalString>("get", 100);
-
-// If the command returns an array of elements.
-std::vector<OptionalString> result;
-redis.command("mget", "k1", "k2", "k3", std::back_inserter(result));
-
-// Or just parse it into a vector.
-result = redis.command<std::vector<OptionalString>>("mget", "k1", "k2", "k3");
-
-// Arguments of the command can be a range of strings.
-auto set_cmd_strs = {"set", "key", "value"};
-redis.command<void>(set_cmd_strs.begin(), set_cmd_strs.end());
-
-auto get_cmd_strs = {"get", "key"};
-val = redis.command<OptionalString>(get_cmd_strs.begin(), get_cmd_strs.end());
-
-// If it returns an array of elements.
-result.clear();
-auto mget_cmd_strs = {"mget", "key1", "key2"};
-redis.command(mget_cmd_strs.begin(), mget_cmd_strs.end(), std::back_inserter(result));
-```
-
-**NOTE**: The name of some Redis commands is composed with two strings, e.g. *CLIENT SETNAME*. In this case, you need to pass these two strings as two arguments for `Redis::command`.
-
-```C++
-// This is GOOD.
-redis.command<void>("client", "setname", "name");
-
-// This is BAD, and will fail to send command to Redis server.
-// redis.command<void>("client setname", "name");
-```
-
-As I mentioned in the comments, the `SET` command not always returns `void`. Because if you try to set a (key, value) pair with *NX* or *XX* option, you might fail, and Redis will return a *NULL REPLY*. Besides the `SET` command, there're other commands whose return value is NOT a fixed type, you need to parse it by yourself. For example, `Redis::set` method rewrite the reply of `SET` command, and make it return `bool` type, i.e. if no *NX* or *XX* option specified, Redis server will always return an "OK" string, and `Redis::set` returns `true`; if *NX* or *XX* specified, and Redis server returns a *NULL REPLY*, `Redis::set` returns `false`.
-
-So `Redis` class also has other overloaded `command` methods, these methods return a `ReplyUPtr`, i.e. `std::unique_ptr<redisReply, ReplyDeleter>`, object. Normally you don't need to parse it manually. Instead, you only need to pass the reply to `template <typename T> T reply::parse(redisReply &)` to get a value of type `T`. Check the [Return Type section](#return-type) for valid `T` types. If the command returns an array of elements, besides calling `reply::parse` to parse the reply to an STL container, you can also call `template <typename Output> reply::to_array(redisReply &reply, Output output)` to parse the result into an array or STL container with an output iterator.
-
-Let's rewrite the above examples:
-
-```C++
-auto redis = Redis("tcp://127.0.0.1");
-
-redis.command("client", "setname", "name");
-auto r = redis.command("client", "getname");
-assert(r);
-
-// If the command returns a single element,
-// use `reply::parse<T>(redisReply&)` to parse it.
-auto val = reply::parse<OptionalString>(*r);
-if (val) {
-    std::cout << *val << std::endl;
-}
-
-// Arguments of the command can be strings.
-redis.command("set", "key", "100");
-
-// Arguments of the command can be a combination of strings and integers.
-r = redis.command("incrby", "key", 1);
-auto num = reply::parse<long long>(*r);
-
-// Argument can also be double.
-r = redis.command("incrbyfloat", "key", 2.3);
-auto real = reply::parse<double>(*r);
-
-// Even the key of the command can be of arithmetic type.
-redis.command("set", 100, "value");
-
-r = redis.command("get", 100);
-val = reply::parse<OptionalString>(*r);
-
-// If the command returns an array of elements.
-r = redis.command("mget", "k1", "k2", "k3");
-// Use `reply::to_array(redisReply&, OutputIterator)` to parse the result into an STL container.
-std::vector<OptionalString> result;
-reply::to_array(*r, std::back_inserter(result));
-
-// Or just call `reply::parse` to parse it into vector.
-result = reply::parse<std::vector<OptionalString>>(*r);
-
-// Arguments of the command can be a range of strings.
-auto get_cmd_strs = {"get", "key"};
-r = redis.command(get_cmd_strs.begin(), get_cmd_strs.end());
-val = reply::parse<OptionalString>(*r);
-
-// If it returns an array of elements.
-result.clear();
-auto mget_cmd_strs = {"mget", "key1", "key2"};
-r = redis.command(mget_cmd_strs.begin(), mget_cmd_strs.end());
-reply::to_array(*r, std::back_inserter(result));
-```
-
-In fact, there's one more `Redis::command` method:
-
-```C++
-template <typename Cmd, typename ...Args>
-auto command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-```
-
-However, this method exposes some implementation details, and is only for internal use. You should NOT use this method.
-
-### Publish/Subscribe
-
-You can use `Redis::publish` to publish messages to channels. `Redis` randomly picks a connection from the underlying connection pool, and publishes message with that connection. So you might publish two messages with two different connections.
-
-When you subscribe to a channel with a connection, all messages published to the channel are sent back to that connection. So there's NO `Redis::subscribe` method. Instead, you can call `Redis::subscriber` to create a `Subscriber` and the `Subscriber` maintains a connection to Redis. The underlying connection is a new connection, NOT picked from the connection pool. This new connection has the same `ConnectionOptions` as the `Redis` object.
-
-With `Subscriber`, you can call `Subscriber::subscribe`, `Subscriber::unsubscribe`, `Subscriber::psubscribe` and `Subscriber::punsubscribe` to send *SUBSCRIBE*, *UNSUBSCRIBE*, *PSUBSCRIBE* and *PUNSUBSCRIBE* commands to Redis.
-
-#### Thread Safety
-
-`Subscriber` is NOT thread-safe. If you want to call its member functions in multi-thread environment, you need to synchronize between threads manually.
-
-#### Subscriber Callbacks
-
-There are 6 kinds of messages:
-- *MESSAGE*: message sent to a channel.
-- *PMESSAGE*: message sent to channels of a given pattern.
-- *SUBSCRIBE*: message sent when we successfully subscribe to a channel.
-- *UNSUBSCRIBE*: message sent when we successfully unsubscribe to a channel.
-- *PSUBSCRIBE*: message sent when we successfully subscribe to a channel pattern.
-- *PUNSUBSCRIBE*: message sent when we successfully unsubscribe to a channel pattern.
-
-We call messages of *SUBSCRIBE*, *UNSUBSCRIBE*, *PSUBSCRIBE* and *PUNSUBSCRIBE* types as *META MESSAGE*s.
-
-In order to process these messages, you can set callback functions on `Subscriber`:
-- `Subscriber::on_message(MsgCallback)`: set callback function for messages of *MESSAGE* type, and the callback interface is: `void (std::string channel, std::string msg)`.
-- `Subscriber::on_pmessage(PatternMsgCallback)`: set the callback function for messages of *PMESSAGE* type, and the callback interface is: `void (std::string pattern, std::string channel, std::string msg)`.
-- `Subscriber::on_meta(MetaCallback)`: set callback function for messages of *META MESSAGE* type, and the callback interface is: `void (Subscriber::MsgType type, OptionalString channel, long long num)`. `type` is an enum, it can be one of the following enum: `Subscriber::MsgType::SUBSCRIBE`, `Subscriber::MsgType::UNSUBSCRIBE`, `Subscriber::MsgType::PSUBSCRIBE`, `Subscriber::MsgType::PUNSUBSCRIBE`, `Subscriber::MsgType::MESSAGE`, and `Subscriber::MsgType::PMESSAGE`. If you haven't subscribe/psubscribe to any channel/pattern, and try to unsubscribe/punsubscribe without any parameter, i.e. unsubscribe/punsubscribe all channels/patterns, *channel* will be null. So the second parameter of meta callback is of type `OptionalString`.
-
-All these callback interfaces pass `std::string` by value, and you can take their ownership (i.e. `std::move`) safely.
-
-#### Consume Messages
-
-You can call `Subscriber::consume` to consume messages published to channels/patterns that the `Subscriber` has been subscribed.
-
-`Subscriber::consume` waits for message from the underlying connection. If the `ConnectionOptions::socket_timeout` is reached, and there's no message sent to this connection, `Subscriber::consume` throws a `TimeoutError` exception. If `ConnectionOptions::socket_timeout` is `0ms`, `Subscriber::consume` blocks until it receives a message.
-
-After receiving the message, `Subscriber::consume` calls the callback function to process the message based on message type. However, if you don't set callback for a specific kind of message, `Subscriber::consume` will ignore the received message, i.e. no callback will be called.
-
-#### Examples
-
-The following example is a common pattern for using `Subscriber`:
-
-```C++
-// Create a Subscriber.
-auto sub = redis.subscriber();
-
-// Set callback functions.
-sub.on_message([](std::string channel, std::string msg) {
-            // Process message of MESSAGE type.
-        });
-
-sub.on_pmessage([](std::string pattern, std::string channel, std::string msg) {
-            // Process message of PMESSAGE type.
-        });
-
-sub.on_meta([](Subscriber::MsgType type, OptionalString channel, long long num) {
-            // Process message of META type.
-        });
-
-// Subscribe to channels and patterns.
-sub.subscribe("channel1");
-sub.subscribe({"channel2", "channel3"});
-
-sub.psubscribe("pattern1*");
-
-// Consume messages in a loop.
-while (true) {
-    try {
-        sub.consume();
-    } catch (const Error &err) {
-        // Handle exceptions.
-    }
-}
-```
-
-If `ConnectionOptions::socket_timeout` is set, you might get `TimeoutError` exception before receiving a message:
-
-```C++
-while (true) {
-    try {
-        sub.consume();
-    } catch (const TimeoutError &e) {
-        // Try again.
-        continue;
-    } catch (const Error &err) {
-        // Handle other exceptions.
-    }
-}
-```
-
-The above examples use lambda as callback. If you're not familiar with lambda, you can also set a free function as callback. Check [this issue](https://github.com/sewenew/redis-plus-plus/issues/16) for detail.
-
-### Pipeline
-
-[Pipeline](https://redis.io/topics/pipelining) is used to reduce *RTT* (Round Trip Time), and speed up Redis queries. *redis-plus-plus* supports pipeline with the `Pipeline` class.
-
-#### Create Pipeline
-
-You can create a pipeline with `Redis::pipeline` method, which returns a `Pipeline` object.
-
-```C++
-ConnectionOptions connection_options;
-ConnectionPoolOptions pool_options;
-
-Redis redis(connection_options, pool_options);
-
-auto pipe = redis.pipeline();
-```
-
-When creating a `Pipeline` object, `Redis::pipeline` method creates a new connection to Redis server. This connection is NOT picked from the connection pool, but a newly created connection. This connection has the same `ConnectionOptions` as other connections in the connection pool. `Pipeline` object maintains the new connection, and all piped commands are sent through this connection.
-
-**NOTE**: Creating a `Pipeline` object is NOT cheap, since it creates a new connection. So you'd better reuse the `Pipeline` object as much as possible.
-
-#### Send Commands
-
-You can send Redis commands through the `Pipeline` object. Just like the `Redis` class, `Pipeline` has one or more (overloaded) methods for each Redis command. However, you CANNOT get the replies until you call `Pipeline::exec`. So these methods do NOT return the reply, instead they return the `Pipeline` object itself. And you can chain these methods calls.
-
-```C++
-pipe.set("key", "val").incr("num").rpush("list", {0, 1, 2}).command("hset", "key", "field", "value");
-```
-
-#### Get Replies
-
-Once you finish sending commands to Redis, you can call `Pipeline::exec` to get replies of these commands. You can also chain `Pipeline::exec` with other commands.
-
-```C++
-pipe.set("key", "val").incr("num");
-auto replies = pipe.exec();
-
-// The same as:
-replies = pipe.set("key", "val").incr("num).exec();
-```
-
-In fact, these commands won't be sent to Redis, until you call `Pipeline::exec`. So `Pipeline::exec` does 2 work in order: send all piped commands, then get all replies from Redis.
-
-Also you can call `Pipeline::discard` to discard those piped commands.
-
-```C++
-pipe.set("key", "val").incr("num");
-
-pipe.discard();
-```
-
-#### Parse Replies
-
-`Pipeline::exec` returns a `QueuedReplies` object, which contains replies of all commands that have been sent to Redis. You can use `QueuedReplies::get` method to get and parse the `ith` reply. It has 3 overloads:
-
-- `template <typename Result> Result get(std::size_t idx)`: Return the `ith` reply as a return value, and you need to specify the return type as tempalte parameter.
-- `template <typename Output> void get(std::size_t idx, Output output)`: If the reply is of type *Array Reply*, you can call this method to write the `ith` reply to an output iterator. Normally, compiler will deduce the type of the output iterator, and you don't need to specify the type parameter explicitly.
-- `redisReply& get(std::size_t idx)`: If the reply is NOT a fixed type, call this method to get a reference to `redisReply` object. In this case, you need to call `template <typename T> T reply::parse(redisReply &)` to parse the reply manually.
-
-Check the [Return Type section](#return-type) for details on the return types of the result.
-
-```C++
-auto replies = pipe.set("key", "val").incr("num").lrange("list", 0, -1).exec();
-
-auto set_cmd_result = replies.get<bool>(0);
-
-auto incr_cmd_result = replies.get<long long>(1);
-
-std::vector<std::string> list_cmd_result;
-replies.get(2, std::back_inserter(list_cmd_result));
-```
-
-#### Exception
-
-If any of `Pipeline`'s method throws an exception, the `Pipeline` object enters an invalid state. You CANNOT use it any more, but only destroy the object, and create a new one.
-
-#### Thread Safety
-
-`Pipeline` is NOT thread-safe. If you want to call its member functions in multi-thread environment, you need to synchronize between threads manually.
-
-### Transaction
-
-[Transaction](https://redis.io/topics/transactions) is used to make multiple commands runs atomically.
-
-#### Create Transaction
-
-You can create a transaction with `Redis::transaction` method, which returns a `Transaction` object.
-
-```C++
-ConnectionOptions connection_options;
-ConnectionPoolOptions pool_options;
-
-Redis redis(connection_options, pool_options);
-
-auto tx = redis.transaction();
-```
-
-As the `Pipeline` class, `Transaction` maintains a newly created connection to Redis. This connection has the same `ConnectionOptions` as the `Redis` object.
-
-**NOTE**: Creating a `Transaction` object is NOT cheap, since it creates a new connection. So you'd better reuse the `Transaction` as much as possible.
-
-Also you don't need to send [MULTI](https://redis.io/commands/multi) command to Redis. `Transaction` will do that for you automatically.
-
-#### Send Commands
-
-`Transaction` shares most of implementation with `Pipeline`. It has the same interfaces as `Pipeline`. You can send commands as what you do with `Pipeline` object.
-
-```C++
-tx.set("key", "val").incr("num").lpush("list", {0, 1, 2}).command("hset", "key", "field", "val");
-```
-
-#### Execute Transaction
-
-When you call `Transaction::exec`, you explicitly ask Redis to execute those queued commands, and return the replies. Otherwise, these commands won't be executed. Also, you can call `Transaction::discard` to discard the execution, i.e. no command will be executed. Both `Transaction::exec` and `Transaction::discard` can be chained with other commands.
-
-```C++
-auto replies = tx.set("key", "val").incr("num").exec();
-
-tx.set("key", "val").incr("num");
-
-// Discard the transaction.
-tx.discard();
-```
-
-#### Parse Replies
-
-See [Pipeline's Parse Replies section](#parse-replies) for how to parse the replies.
-
-#### Piped Transaction
-
-Normally, we always send multiple commnds in a transaction. In order to improve the performance, you can send these commands in a pipeline. You can create a piped transaction by passing `true` as parameter of `Redis::transaction` method.
-
-```C++
-// Create a piped transaction
-auto tx = redis.transaction(true);
-```
-
-With this piped transaction, all commands are sent to Redis in a pipeline.
-
-#### Exception
-
-If any of `Transaction`'s method throws an exception other than `WatchError`, the `Transaction` object enters an invalid state. You CANNOT use it any more, but only destroy the object and create a new one.
-
-#### Thread Safety
-
-`Transacation` is NOT thread-safe. If you want to call its member functions in multi-thread environment, you need to synchronize between threads manually.
-
-#### Watch
-
-[WATCH is used to provide a check-and-set(CAS) behavior to Redis transactions](https://redis.io/topics/transactions#optimistic-locking-using-check-and-set).
-
-The `WATCH` command must be sent in the same connection as the transaction. And normally after the `WATCH` command, we also need to send some other commands to get data from Redis before executing the transaction. Take the following check-and-set case as an example:
-
-```
-WATCH key           // watch a key
-val = GET key       // get value of the key
-new_val = val + 1   // incr the value
-MULTI               // begin the transaction
-SET key new_val     // set value only if the value is NOT modified by others
-EXEC                // try to execute the transaction.
-                    // if val has been modified, the transaction won't be executed.
-```
-
-However, with `Transaction` object, you CANNOT get the result of commands until the whole transaction has been finished. Instead, you need to create a `Redis` object from the `Transaction` object. The created `Redis` object shares the connection with `Transaction` object. With this created `Redis` object, you can send `WATCH` command and any other Redis commands to Redis server, and get the result immediately.
-
-Let's see how to implement the above example with *redis-plus-plus*:
-
-```C++
-auto redis = Redis("tcp://127.0.0.1");
-
-// Create a transaction.
-auto tx = redis.transaction();
-
-// Create a Redis object from the Transaction object. Both objects share the same connection.
-auto r = tx.redis();
-
-// If the watched key has been modified by other clients, the transaction might fail.
-// So we need to retry the transaction in a loop.
-while (true) {
-    try {
-        // Watch a key.
-        r.watch("key");
-
-        // Get the old value.
-        auto val = r.get("key");
-        auto num = 0;
-        if (val) {
-            num = std::stoi(*val);
-        } // else use default value, i.e. 0.
-
-        // Incr value.
-        ++num;
-
-        // Execute the transaction.
-        auto replies = tx.set("key", std::to_string(num)).exec();
-
-        // Transaction has been executed successfully. Check the result and break.
-
-        assert(replies.size() == 1 && replies.get<bool>(0) == true);
-
-        break;
-    } catch (const WatchError &err) {
-        // Key has been modified by other clients, retry.
-        continue;
-    } catch (const Error &err) {
-        // Something bad happens, and the Transaction object is no longer valid.
-        throw;
-    }
-}
-```
-
-### Redis Cluster
-
-*redis-plus-plus* supports [Redis Cluster](https://redis.io/topics/cluster-tutorial). You can use `RedisCluster` class to send commands to Redis Cluster. It has similar interfaces as `Redis` class.
-
-#### Connection
-
-`RedisCluster` connects to all master nodes in the cluster. For each master node, it maintains a connection pool. By now, it doesn't connect to slave nodes.
-
-You can initialize a `RedisCluster` instance with `ConnectionOptions` and `ConnectionPoolOptions`. You only need to set one master node's host & port in `ConnectionOptions`, and `RedisCluster` will get other nodes' info automatically (with the *CLUSTER SLOTS* command). For each master node, it creates a connection pool with the specified `ConnectionPoolOptions`. If `ConnectionPoolOptions` is not specified, `RedisCluster` maintains a single connection to every master node.
-
-```C++
-// Set a master node's host & port.
-ConnectionOptions connection_options;
-connection_options.host = "127.0.0.1";  // Required.
-connection_options.port = 7000; // Optional. The default port is 6379.
-connection_options.password = "auth"; // Optional. No password by default.
-
-// Automatically get other nodes' info,
-// and connect to every master node with a single connection.
-RedisCluster cluster1(connection_options);
-
-ConnectionPoolOptions pool_options;
-pool_options.size = 3;
-
-// For each master node, maintains a connection pool of size 3.
-RedisCluster cluster2(connection_options, pool_options);
-```
-
-You can also specify connection option with an URI. However, in this way, you can only use default `ConnectionPoolOptions`, i.e. pool of size 1, and CANNOT specify password.
-
-```C++
-// Specify a master node's host & port.
-RedisCluster cluster3("tcp://127.0.0.1:7000");
-
-// Use default port, i.e. 6379.
-RedisCluster cluster4("tcp://127.0.0.1");
-```
-
-##### Note
-
-- `RedisCluster` only works with tcp connection. It CANNOT connect to Unix Domain Socket. If you specify Unix Domain Socket in `ConnectionOptions`, it throws an exception.
-- All nodes in the cluster should have the same password.
-- Since [Redis Cluster does NOT support multiple databses](https://redis.io/topics/cluster-spec#implemented-subset), `ConnectionOptions::db` is ignored.
-
-#### Interfaces
-
-As we mentioned above, `RedisCluster`'s interfaces are similar to `Redis`. It supports most of `Redis`' interfaces, including the [generic command interface](#generic-command-interface) (see `Redis`' [API Reference section](#api-reference) for details), except the following:
-
-- Not support commands without key as argument, e.g. `PING`, `INFO`.
-- Not support Lua script without key parameters.
-
-Since there's no key parameter, `RedisCluster` has no idea on to which node these commands should be sent. However there're 2 workarounds for this problem:
-
-- If you want to send these commands to a specific node, you can create a `Redis` object with that node's host and port, and use the `Redis` object to do the work.
-- Instead of host and port, you can also call `Redis RedisCluster::redis(const StringView &hash_tag)` to create a `Redis` object with a hash-tag specifying the node. In this case, the returned `Redis` object creates a new connection to Redis server.
-
-Also you can use the [hash tags](https://redis.io/topics/cluster-spec#keys-hash-tags) to send multiple-key commands.
-
-See the [example section](#examples-2) for details.
-
-##### Publish/Subscribe
-
-You can publish and subscribe messages with `RedisCluster`. The interfaces are exactly the same as `Redis`, i.e. use `RedisCluster::publish` to publish messages, and use `RedisCluster::subscriber` to create a subscriber to consume messages. See [Publish/Subscribe section](#publishsubscribe) for details.
-
-##### Pipeline and Transaction
-
-You can also create `Pipeline` and `Transaction` objects with `RedisCluster`, but the interfaces are different from `Redis`. Since all commands in the pipeline and transaction should be sent to a single node in a single connection, we need to tell `RedisCluster` with which node the pipeline or transaction should be created.
-
-Instead of specifing the node's IP and port, `RedisCluster`'s pipeline and transaction interfaces allow you to specify the node with a *hash tag*. `RedisCluster` will calculate the slot number with the given *hash tag*, and create a pipeline or transaction with the node holding the slot.
-
-```C++
-Pipeline RedisCluster::pipeline(const StringView &hash_tag);
-
-Transaction RedisCluster::transaction(const StringView &hash_tag, bool piped = false);
-```
-
-With the created `Pipeline` or `Transaction` object, you can send commands with keys located on the same node as the given *hash_tag*. See [Examples section](#examples-2) for an example.
-
-#### Examples
-
-```C++
-#include <sw/redis++/redis++.h>
-
-using namespace sw::redis;
-
-auto redis_cluster = RedisCluster("tcp://127.0.0.1:7000");
-
-redis_cluster.set("key", "value");
-auto val = redis_cluster.get("key");
-if (val) {
-    std::cout << *val << std::endl;
-}
-
-// With hash-tag.
-redis_cluster.set("key{tag}1", "val1");
-redis_cluster.set("key{tag}2", "val2");
-redis_cluster.set("key{tag}3", "val3");
-std::vector<OptionalString> hash_tag_res;
-redis_cluster.mget({"key{tag}1", "key{tag}2", "key{tag}3"},
-        std::back_inserter(hash_tag_res));
-
-redis_cluster.lpush("list", {"1", "2", "3"});
-std::vector<std::string> list;
-redis_cluster.lrange("list", 0, -1, std::back_inserter(list));
-
-// Pipline.
-auto pipe = redis_cluster.pipeline("counter");
-auto replies = pipe.incr("{counter}:1").incr("{counter}:2").exec();
-
-// Transaction.
-auto tx = redis_cluster.transaction("key");
-replies = tx.incr("key").get("key").exec();
-
-// Create a Redis object with hash-tag.
-// It connects to the Redis instance that holds the given key, i.e. hash-tag.
-auto r = redis_cluster.redis("hash-tag");
-
-// And send command without key parameter to the server.
-r.command("client", "setname", "connection-name");
-```
-
-**NOTE**: When you use `RedisCluster::redis(const StringView &hash_tag)` to create a `Redis` object, instead of picking a connection from the underlying connection pool, it creates a new connection to the corresponding Redis server. So this is NOT a cheap operation, and you should try to reuse this newly created `Redis` object as much as possible.
-
-```C++
-// This is BAD! It's very inefficient.
-// NEVER DO IT!!!
-// After sending PING command, the newly created Redis object will be destroied.
-cluster.redis("key").ping();
-
-// Then it creates a connection to Redis, and closes the connection after sending the command.
-cluster.redis("key").command("client", "setname", "hello");
-
-// Instead you should reuse the Redis object.
-// This is GOOD!
-auto redis = cluster.redis("key");
-
-redis.ping();
-redis.command("client", "setname", "hello");
-```
-
-#### Details
-
-`RedisCluster` maintains the newest slot-node mapping, and sends command directly to the right node. Normally it works as fast as `Redis`. If the cluster reshards, `RedisCluster` will follow the redirection, and it will finally update the slot-node mapping. It can correctly handle the following resharding cases:
-
-- Data migration between exist nodes.
-- Add new node to the cluster.
-- Remove node from the cluster.
-
-`redis-plus-plus` is able to handle both [MOVED](https://redis.io/topics/cluster-spec#moved-redirection) and [ASK](https://redis.io/topics/cluster-spec#ask-redirection) redirections, so it's a complete Redis Cluster client.
-
-If master is down, the cluster will promote one of its replicas to be the new master. *redis-plus-plus* can also handle this case:
-
-- When the master is down, *redis-plus-plus* losts connection to it. In this case, if you try to send commands to this master, *redis-plus-plus* will try to update slot-node mapping from other nodes. If the mapping remains unchanged, i.e. new master hasn't been elected yet, it fails to send command to Redis Cluster and throws exception.
-- When the new master has been elected, the slot-node mapping will be updated by the cluster. In this case, if you send commands to the cluster, *redis-plus-plus* can get an update-to-date mapping, and sends commands to the new master.
-
-### Redis Sentinel
-
-[Redis Sentinel provides high availability for Redis](https://redis.io/topics/sentinel). If Redis master is down, Redis Sentinels will elect a new master from slaves, i.e. failover. Besides, Redis Sentinel can also act like a configuration provider for clients, and clients can query master or slave address from Redis Sentinel. So that if a failover occurs, clients can ask the new master address from Redis Sentinel.
-
-*redis-plus-plus* supports getting Redis master or slave's IP and port from Redis Sentinel. In order to use this feature, you only need to initialize `Redis` object with Redis Sentinel info, which is composed with 3 parts: `std::shared_ptr<Sentinel>`, master name and role (master or slave).
-
-Before using Redis Sentinel with *redis-plus-plus*, ensure that you have read Redis Sentinel's [doc](https://redis.io/topics/sentinel).
-
-#### Sentinel
-
-You can create a `std::shared_ptr<Sentinel>` object with `SentinelOptions`.
-
-```C++
-SentinelOptions sentinel_opts;
-sentinel_opts.nodes = {{"127.0.0.1", 9000},
-                        {"127.0.0.1", 9001},
-                        {"127.0.0.1", 9002}};   // Required. List of Redis Sentinel nodes.
-
-// Optional. Timeout before we successfully connect to Redis Sentinel.
-// By default, the timeout is 100ms.
-sentinel_opts.connect_timeout = std::chrono::milliseconds(200);
-
-// Optional. Timeout before we successfully send request to or receive response from Redis Sentinel.
-// By default, the timeout is 100ms.
-sentinel_opts.socket_timeout = std::chrono::milliseconds(200);
-
-auto sentinel = std::make_shared<Sentinel>(sentinel_opts);
-```
-
-`SentinelOptions::connect_timeout` and `SentinelOptions::socket_timeout` CANNOT be 0ms, i.e. no timeout and block forever. Otherwise, *redis-plus-plus* will throw an exception.
-
-See [SentinelOptions](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/sentinel.h#L33) for more options.
-
-#### Role
-
-Besides `std::shared_ptr<Sentinel>` and master name, you also need to specify a role. There are two roles: `Role::MASTER`, and `Role::SLAVE`.
-
-With `Role::MASTER`, *redis-plus-plus* will always connect to current master instance, even if a failover occurs. Each time when *redis-plus-plus* needs to create a new connection to master, or a connection is broken, and it needs to reconnect to master, *redis-plus-plus* will ask master address from Redis Sentinel, and connects to current master. If a failover occurs, *redis-plus-plus* can automatically get the address of the new master, and refresh all connections in the underlying connection pool.
-
-Similarly, with `Role::SLAVE`, *redis-plus-plus* will always connect to a slave instance. A master might have several slaves, *redis-plus-plus* will randomly pick one, and connect to it, i.e. all connections in the underlying connection pool, connect to the same slave instance. If the connection is broken, while this slave instance is still an alive slave, *redis-plus-plus* will reconnect to this slave. However, if this slave instance is down, or it has been promoted to be the master, *redis-plus-plus* will randomly connect to another slave. If there's no slave alive, it throws an exception.
-
-#### Create Redis With Sentinel
-
-When creating a `Redis` object with sentinel, besides the sentinel info, you should also provide `ConnectionOptions` and `ConnectionPoolOptions`. These two options are used to connect to Redis instance. `ConnectionPoolOptions` is optional, if not specified, it creates a single connection the instance.
-
-```C++
-ConnectionOptions connection_opts;
-connection_opts.password = "auth";  // Optional. No password by default.
-connection_opts.connect_timeout = std::chrono::milliseconds(100);   // Required.
-connection_opts.socket_timeout = std::chrono::milliseconds(100);    // Required.
-
-ConnectionPoolOptions pool_opts;
-pool_opts.size = 3; // Optional. The default size is 1.
-
-auto redis = Redis(sentinel, "master_name", Role::MASTER, connection_opts, pool_opts);
-```
-
-You might have noticed that we didn't specify the `host` and `port` fields for `ConnectionOptions`. Because, `Redis` will get these info from Redis Sentinel. Also, in this case, `ConnectionOptions::connect_timeout` and `ConnectionOptions::socket_timeout` CANNOT be 0ms, otherwise, it throws an exception. So you always need to specify these two timeouts manually.
-
-After creating the `Redis` object with sentinel, you can send commands with it, just like an ordinary `Redis` object.
-
-If you want to write to master, and scale read with slaves. You can use the following pattern:
-
-```C++
-auto sentinel = std::make_shared<Sentinel>(sentinel_opts);
-
-auto master = Redis(sentinel, "master_name", Role::MASTER, connection_opts, pool_opts);
-
-auto slave = Redis(sentinel, "master_name", Role::SLAVE, connection_opts, pool_opts);
-
-// Write to master.
-master.set("key", "value");
-
-// Read from slave.
-slave.get("key");
-```
-
-### Redis Stream
-
-Since Redis 5.0, it introduces a new data type: *Redis Stream*. *redis-plus-plus* has built-in methods for all stream commands except the *XINFO* command (of course, you can use the [Generic Command Interface](#generic-command-interface) to send *XINFO* command).
-
-However, the replies of some streams commands, i.e. *XPENDING*, *XREAD*, are complex. So I'll give some examples to show you how to work with these built-in methods.
-
-#### Examples
-
-```C++
-auto redis = Redis("tcp://127.0.0.1");
-
-using Attrs = std::vector<std::pair<std::string, std::string>>;
-
-// You can also use std::unordered_map, if you don't care the order of attributes:
-// using Attrs = std::unordered_map<std::string, std::string>;
-
-Attrs attrs = { {"f1", "v1"}, {"f2", "v2"} };
-
-// Add an item into the stream. This method returns the auto generated id.
-auto id = redis.xadd("key", "*", attrs.begin(), attrs.end());
-
-// Each item is assigned with an id: pair<id, attributes>.
-using Item = std::pair<std::string, Attrs>;
-using ItemStream = std::vector<Item>;
-
-// If you don't care the order of items in the stream, you can also use unordered_map:
-// using ItemStream = std::unordered_map<std::string, Attrs>;
-
-// Read items from a stream, and return at most 10 items.
-// You need to specify a key and an id (timestamp + offset).
-std::unordered_map<std::string, ItemStream> result;
-redis.xread("key", id, 10, std::inserter(result, result.end()));
-
-// Read from multiple streams. For each stream, you need to specify a key and an id.
-std::unordered_map<std::string, std::string> keys = { {"key", id}, {"another-key", "0-0"} };
-redis.xread(keys.begin(), keys.end(), 10, std::inserter(result, result.end()));
-
-// Block for at most 1 second if currently there's no data in the stream.
-redis.xread("key", id, std::chrono::seconds(1), 10, std::inserter(result, result.end()));
-
-// Block for multiple streams.
-redis.xread(keys.begin(), keys.end(), std::chrono::seconds(1), 10, std::inserter(result, result.end()));
-
-// Read items in a range:
-ItemStream item_stream;
-redis.xrange("key", "-", "+", std::back_inserter(item_stream));
-
-// Trim the stream to a given number of items. After the operation, the stream length is NOT exactly
-// 10. Instead, it might be much larger than 10.
-// `XTRIM key MAXLEN 10`
-redis.xtrim("key", 10);
-
-// In order to trim the stream to exactly 10 items, specify the third argument, i.e. approx, as false.
-// `XTRIM key MAXLEN ~ 10`
-redis.xtrim("key", 10, false);
-
-// Delete an item from the stream.
-redis.xdel("key", id);
-
-// Create a consumer group.
-redis.xgroup_create("key", "group", "$");
-
-// If the stream doesn't exist, you can set the fourth argument, i.e. MKSTREAM, to be true.
-// redis.xgroup_create("key", "group", "$", true);
-
-id = redis.xadd("key", "*", attrs.begin(), attrs.end());
-
-// Read item by a consumer of a consumer group.
-redis.xreadgroup("group", "consumer", "key", ">", 1, std::inserter(result, result.end()));
-
-using PendingItem = std::tuple<std::string, std::string, long long, long long>;
-std::vector<PendingItem> pending_items;
-
-// Get pending items of a speicified consumer.
-redis.xpending("key", "group", "-", "+", 1, "consumer", std::back_inserter(pending_items));
-
-redis.xack("key", "group", id);
-
-redis.xgroup_delconsumer("key", "group", "consumer");
-redis.xgroup_destroy("key", "group");
-```
-
-If you have any problem on sending stream commands to Redis, please feel free to let me know.
-
-## Author
-
-*redis-plus-plus* is written by sewenew, who is also active on [StackOverflow](https://stackoverflow.com/users/5384363/for-stack).
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command.h
deleted file mode 100644
index 3a4b24c5e..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command.h
+++ /dev/null
@@ -1,2233 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_H
-
-#include <cassert>
-#include <ctime>
-#include <string>
-#include <chrono>
-#include "connection.h"
-#include "command_options.h"
-#include "command_args.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-// CONNECTION command.
-inline void auth(Connection &connection, const StringView &password) {
-    connection.send("AUTH %b", password.data(), password.size());
-}
-
-inline void echo(Connection &connection, const StringView &msg) {
-    connection.send("ECHO %b", msg.data(), msg.size());
-}
-
-inline void ping(Connection &connection) {
-    connection.send("PING");
-}
-
-inline void quit(Connection &connection) {
-    connection.send("QUIT");
-}
-
-inline void ping(Connection &connection, const StringView &msg) {
-    // If *msg* is empty, Redis returns am empty reply of REDIS_REPLY_STRING type.
-    connection.send("PING %b", msg.data(), msg.size());
-}
-
-inline void select(Connection &connection, long long idx) {
-    connection.send("SELECT %lld", idx);
-}
-
-inline void swapdb(Connection &connection, long long idx1, long long idx2) {
-    connection.send("SWAPDB %lld %lld", idx1, idx2);
-}
-
-// SERVER commands.
-
-inline void bgrewriteaof(Connection &connection) {
-    connection.send("BGREWRITEAOF");
-}
-
-inline void bgsave(Connection &connection) {
-    connection.send("BGSAVE");
-}
-
-inline void dbsize(Connection &connection) {
-    connection.send("DBSIZE");
-}
-
-inline void flushall(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHALL ASYNC");
-    } else {
-        connection.send("FLUSHALL");
-    }
-}
-
-inline void flushdb(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHDB ASYNC");
-    } else {
-        connection.send("FLUSHDB");
-    }
-}
-
-inline void info(Connection &connection) {
-    connection.send("INFO");
-}
-
-inline void info(Connection &connection, const StringView &section) {
-    connection.send("INFO %b", section.data(), section.size());
-}
-
-inline void lastsave(Connection &connection) {
-    connection.send("LASTSAVE");
-}
-
-inline void save(Connection &connection) {
-    connection.send("SAVE");
-}
-
-// KEY commands.
-
-inline void del(Connection &connection, const StringView &key) {
-    connection.send("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void del_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void dump(Connection &connection, const StringView &key) {
-    connection.send("DUMP %b", key.data(), key.size());
-}
-
-inline void exists(Connection &connection, const StringView &key) {
-    connection.send("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void expire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("EXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void expireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("EXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void keys(Connection &connection, const StringView &pattern) {
-    connection.send("KEYS %b", pattern.data(), pattern.size());
-}
-
-inline void move(Connection &connection, const StringView &key, long long db) {
-    connection.send("MOVE %b %lld",
-                    key.data(), key.size(),
-                    db);
-}
-
-inline void persist(Connection &connection, const StringView &key) {
-    connection.send("PERSIST %b", key.data(), key.size());
-}
-
-inline void pexpire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("PEXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void pexpireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("PEXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void pttl(Connection &connection, const StringView &key) {
-    connection.send("PTTL %b", key.data(), key.size());
-}
-
-inline void randomkey(Connection &connection) {
-    connection.send("RANDOMKEY");
-}
-
-inline void rename(Connection &connection,
-                    const StringView &key,
-                    const StringView &newkey) {
-    connection.send("RENAME %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-inline void renamenx(Connection &connection,
-                        const StringView &key,
-                        const StringView &newkey) {
-    connection.send("RENAMENX %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-void restore(Connection &connection,
-                const StringView &key,
-                const StringView &val,
-                long long ttl,
-                bool replace);
-
-inline void scan(Connection &connection,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SCAN %lld MATCH %b COUNT %lld",
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void touch(Connection &connection, const StringView &key) {
-    connection.send("TOUCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void touch_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "TOUCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void ttl(Connection &connection, const StringView &key) {
-    connection.send("TTL %b", key.data(), key.size());
-}
-
-inline void type(Connection &connection, const StringView &key) {
-    connection.send("TYPE %b", key.data(), key.size());
-}
-
-inline void unlink(Connection &connection, const StringView &key) {
-    connection.send("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unlink_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void wait(Connection &connection, long long numslave, long long timeout) {
-    connection.send("WAIT %lld %lld", numslave, timeout);
-}
-
-// STRING commands.
-
-inline void append(Connection &connection, const StringView &key, const StringView &str) {
-    connection.send("APPEND %b %b",
-                    key.data(), key.size(),
-                    str.data(), str.size());
-}
-
-inline void bitcount(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("BITCOUNT %b %lld %lld",
-                    key.data(), key.size(),
-                    start, end);
-}
-
-void bitop(Connection &connection,
-            BitOp op,
-            const StringView &destination,
-            const StringView &key);
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last);
-
-inline void bitpos(Connection &connection,
-                    const StringView &key,
-                    long long bit,
-                    long long start,
-                    long long end) {
-    connection.send("BITPOS %b %lld %lld %lld",
-                    key.data(), key.size(),
-                    bit,
-                    start,
-                    end);
-}
-
-inline void decr(Connection &connection, const StringView &key) {
-    connection.send("DECR %b", key.data(), key.size());
-}
-
-inline void decrby(Connection &connection, const StringView &key, long long decrement) {
-    connection.send("DECRBY %b %lld",
-                    key.data(), key.size(),
-                    decrement);
-}
-
-inline void get(Connection &connection, const StringView &key) {
-    connection.send("GET %b",
-                    key.data(), key.size());
-}
-
-inline void getbit(Connection &connection, const StringView &key, long long offset) {
-    connection.send("GETBIT %b %lld",
-                    key.data(), key.size(),
-                    offset);
-}
-
-inline void getrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("GETRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    end);
-}
-
-inline void getset(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("GETSET %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void incr(Connection &connection, const StringView &key) {
-    connection.send("INCR %b", key.data(), key.size());
-}
-
-inline void incrby(Connection &connection, const StringView &key, long long increment) {
-    connection.send("INCRBY %b %lld",
-                    key.data(), key.size(),
-                    increment);
-}
-
-inline void incrbyfloat(Connection &connection, const StringView &key, double increment) {
-    connection.send("INCRBYFLOAT %b %f",
-                    key.data(), key.size(),
-                    increment);
-}
-
-template <typename Input>
-inline void mget(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void mset(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void msetnx(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void psetex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("PSETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-void set(Connection &connection,
-            const StringView &key,
-            const StringView &val,
-            long long ttl,
-            UpdateType type);
-
-inline void setex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("SETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-inline void setnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("SETNX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void setrange(Connection &connection,
-                        const StringView &key,
-                        long long offset,
-                        const StringView &val) {
-    connection.send("SETRANGE %b %lld %b",
-                    key.data(), key.size(),
-                    offset,
-                    val.data(), val.size());
-}
-
-inline void strlen(Connection &connection, const StringView &key) {
-    connection.send("STRLEN %b", key.data(), key.size());
-}
-
-// LIST commands.
-
-inline void blpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BLPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void blpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BRPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void brpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination,
-                        long long timeout) {
-    connection.send("BRPOPLPUSH %b %b %lld",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    timeout);
-}
-
-inline void lindex(Connection &connection, const StringView &key, long long index) {
-    connection.send("LINDEX %b %lld",
-                    key.data(), key.size(),
-                    index);
-}
-
-void linsert(Connection &connection,
-                const StringView &key,
-                InsertPosition position,
-                const StringView &pivot,
-                const StringView &val);
-
-inline void llen(Connection &connection,
-                    const StringView &key) {
-    connection.send("LLEN %b", key.data(), key.size());
-}
-
-inline void lpop(Connection &connection, const StringView &key) {
-    connection.send("LPOP %b",
-                    key.data(), key.size());
-}
-
-inline void lpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void lpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void lpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void lrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void lrem(Connection &connection,
-                    const StringView &key,
-                    long long count,
-                    const StringView &val) {
-    connection.send("LREM %b %lld %b",
-                    key.data(), key.size(),
-                    count,
-                    val.data(), val.size());
-}
-
-inline void lset(Connection &connection,
-                    const StringView &key,
-                    long long index,
-                    const StringView &val) {
-    connection.send("LSET %b %lld %b",
-                    key.data(), key.size(),
-                    index,
-                    val.data(), val.size());
-}
-
-inline void ltrim(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LTRIM %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void rpop(Connection &connection, const StringView &key) {
-    connection.send("RPOP %b", key.data(), key.size());
-}
-
-inline void rpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination) {
-    connection.send("RPOPLPUSH %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size());
-}
-
-inline void rpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void rpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void rpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-// HASH commands.
-
-inline void hdel(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HDEL %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-template <typename Input>
-inline void hdel_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hexists(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HEXISTS %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hget(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HGET %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hgetall(Connection &connection, const StringView &key) {
-    connection.send("HGETALL %b", key.data(), key.size());
-}
-
-inline void hincrby(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    long long increment) {
-    connection.send("HINCRBY %b %b %lld",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hincrbyfloat(Connection &connection,
-                            const StringView &key,
-                            const StringView &field,
-                            double increment) {
-    connection.send("HINCRBYFLOAT %b %b %f",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hkeys(Connection &connection, const StringView &key) {
-    connection.send("HKEYS %b", key.data(), key.size());
-}
-
-inline void hlen(Connection &connection, const StringView &key) {
-    connection.send("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void hmget(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void hmset(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("HSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void hset(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSET %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hsetnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSETNX %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hstrlen(Connection &connection,
-                    const StringView &key,
-                    const StringView &field) {
-    connection.send("HSTRLEN %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hvals(Connection &connection, const StringView &key) {
-    connection.send("HVALS %b", key.data(), key.size());
-}
-
-// SET commands
-
-inline void sadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SADD %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void sadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void scard(Connection &connection, const StringView &key) {
-    connection.send("SCARD %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiff(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFF" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sdiffstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SDIFFSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiffstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFFSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void sinter(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTER" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SINTERSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sinterstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTERSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sismember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("SISMEMBER %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void smembers(Connection &connection, const StringView &key) {
-    connection.send("SMEMBERS %b", key.data(), key.size());
-}
-
-inline void smove(Connection &connection,
-                    const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    connection.send("SMOVE %b %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    member.data(), member.size());
-}
-
-inline void spop(Connection &connection, const StringView &key) {
-    connection.send("SPOP %b", key.data(), key.size());
-}
-
-inline void spop_range(Connection &connection, const StringView &key, long long count) {
-    connection.send("SPOP %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srandmember(Connection &connection, const StringView &key) {
-    connection.send("SRANDMEMBER %b", key.data(), key.size());
-}
-
-inline void srandmember_range(Connection &connection,
-                                const StringView &key,
-                                long long count) {
-    connection.send("SRANDMEMBER %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void srem_range(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-template <typename Input>
-inline void sunion(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNION" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SUNIONSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sunionstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNIONSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Sorted Set commands.
-
-inline void bzpopmax(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMAX %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmax_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void bzpopmin(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMIN %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmin_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed);
-
-inline void zadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type,
-                    bool changed) {
-    auto tmp = {std::make_pair(member, score)};
-
-    zadd_range(connection, key, tmp.begin(), tmp.end(), type, changed);
-}
-
-inline void zcard(Connection &connection, const StringView &key) {
-    connection.send("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-inline void zcount(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval) {
-    connection.send("ZCOUNT %b %s %s",
-                    key.data(), key.size(),
-                    interval.min().c_str(),
-                    interval.max().c_str());
-}
-
-inline void zincrby(Connection &connection,
-                    const StringView &key,
-                    double increment,
-                    const StringView &member) {
-    connection.send("ZINCRBY %b %f %b",
-                    key.data(), key.size(),
-                    increment,
-                    member.data(), member.size());
-}
-
-inline void zinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZINTERSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-template <typename Interval>
-inline void zlexcount(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zpopmax(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMAX %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zpopmin(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMIN %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop,
-                    bool with_scores) {
-    if (with_scores) {
-        connection.send("ZRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrangebylex(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrangebyscore(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval,
-                    const LimitOptions &opts,
-                    bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrank(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zrem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void zrem_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Interval>
-inline void zremrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zremrangebyrank(Connection &connection,
-                            const StringView &key,
-                            long long start,
-                            long long stop) {
-    connection.send("zremrangebyrank %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-template <typename Interval>
-inline void zremrangebyscore(Connection &connection,
-                                const StringView &key,
-                                const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zrevrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores) {
-    if (with_scores) {
-        connection.send("ZREVRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZREVRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrevrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrevrangebyscore(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZREVRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZREVRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrevrank(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("ZREVRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("ZSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void zscore(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZSCORE %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZUNIONSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-// HYPERLOGLOG commands.
-
-inline void pfadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &element) {
-    connection.send("PFADD %b %b",
-                    key.data(), key.size(),
-                    element.data(), element.size());
-}
-
-template <typename Input>
-inline void pfadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfcount(Connection &connection, const StringView &key) {
-    connection.send("PFCOUNT %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfcount_range(Connection &connection,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFCOUNT" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfmerge(Connection &connection, const StringView &destination, const StringView &key) {
-    connection.send("PFMERGE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfmerge_range(Connection &connection,
-                            const StringView &destination,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFMERGE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// GEO commands.
-
-inline void geoadd(Connection &connection,
-                    const StringView &key,
-                    const std::tuple<StringView, double, double> &member) {
-    const auto &mem = std::get<0>(member);
-
-    connection.send("GEOADD %b %f %f %b",
-                    key.data(), key.size(),
-                    std::get<1>(member),
-                    std::get<2>(member),
-                    mem.data(), mem.size());
-}
-
-template <typename Input>
-inline void geoadd_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOADD" << key;
-
-    while (first != last) {
-        const auto &member = *first;
-        args << std::get<1>(member) << std::get<2>(member) << std::get<0>(member);
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-void geodist(Connection &connection,
-                const StringView &key,
-                const StringView &member1,
-                const StringView &member2,
-                GeoUnit unit);
-
-template <typename Input>
-inline void geohash_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOHASH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void geopos_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOPOS" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-void georadius(Connection &connection,
-                const StringView &key,
-                const std::pair<double, double> &loc,
-                double radius,
-                GeoUnit unit,
-                long long count,
-                bool asc,
-                bool with_coord,
-                bool with_dist,
-                bool with_hash);
-
-void georadius_store(Connection &connection,
-                        const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        const StringView &destination,
-                        bool store_dist,
-                        long long count);
-
-void georadiusbymember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        bool with_coord,
-                        bool with_dist,
-                        bool with_hash);
-
-void georadiusbymember_store(Connection &connection,
-                                const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-// SCRIPTING commands.
-
-inline void eval(Connection &connection,
-                    const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    CmdArgs cmd_args;
-
-    cmd_args << "EVAL" << script << keys.size()
-            << std::make_pair(keys.begin(), keys.end())
-            << std::make_pair(args.begin(), args.end());
-
-    connection.send(cmd_args);
-}
-
-inline void evalsha(Connection &connection,
-                    const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    CmdArgs cmd_args;
-
-    cmd_args << "EVALSHA" << script << keys.size()
-            << std::make_pair(keys.begin(), keys.end())
-            << std::make_pair(args.begin(), args.end());
-
-    connection.send(cmd_args);
-}
-
-inline void script_exists(Connection &connection, const StringView &sha) {
-    connection.send("SCRIPT EXISTS %b", sha.data(), sha.size());
-}
-
-template <typename Input>
-inline void script_exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SCRIPT" << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void script_flush(Connection &connection) {
-    connection.send("SCRIPT FLUSH");
-}
-
-inline void script_kill(Connection &connection) {
-    connection.send("SCRIPT KILL");
-}
-
-inline void script_load(Connection &connection, const StringView &script) {
-    connection.send("SCRIPT LOAD %b", script.data(), script.size());
-}
-
-// PUBSUB commands.
-
-inline void psubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void psubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void publish(Connection &connection,
-                    const StringView &channel,
-                    const StringView &message) {
-    connection.send("PUBLISH %b %b",
-                    channel.data(), channel.size(),
-                    message.data(), message.size());
-}
-
-inline void punsubscribe(Connection &connection) {
-    connection.send("PUNSUBSCRIBE");
-}
-
-inline void punsubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PUNSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void punsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PUNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PUNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void subscribe(Connection &connection, const StringView &channel) {
-    connection.send("SUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void subscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "SUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void unsubscribe(Connection &connection) {
-    connection.send("UNSUBSCRIBE");
-}
-
-inline void unsubscribe(Connection &connection, const StringView &channel) {
-    connection.send("UNSUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void unsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Transaction commands.
-
-inline void discard(Connection &connection) {
-    connection.send("DISCARD");
-}
-
-inline void exec(Connection &connection) {
-    connection.send("EXEC");
-}
-
-inline void multi(Connection &connection) {
-    connection.send("MULTI");
-}
-
-inline void unwatch(Connection &connection, const StringView &key) {
-    connection.send("UNWATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unwatch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNWATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNWATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void watch(Connection &connection, const StringView &key) {
-    connection.send("WATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void watch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("WATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "WATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Stream commands.
-
-inline void xack(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &id) {
-    connection.send("XACK %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xack_range(Connection &connection,
-                const StringView &key,
-                const StringView &group,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XACK" << key << group << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_range(Connection &connection,
-                const StringView &key,
-                const StringView &id,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XADD" << key << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_maxlen_range(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    CmdArgs args;
-    args << "XADD" << key << "MAXLEN";
-
-    if (approx) {
-        args << "~";
-    }
-
-    args << count << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xclaim(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    const StringView &id) {
-    connection.send("XCLAIM %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size(),
-                    min_idle_time,
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xclaim_range(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    Input first,
-                    Input last) {
-    CmdArgs args;
-    args << "XCLAIM" << key << group << consumer << min_idle_time << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xdel(Connection &connection, const StringView &key, const StringView &id) {
-    connection.send("XDEL %b %b", key.data(), key.size(), id.data(), id.size());
-}
-
-template <typename Input>
-void xdel_range(Connection &connection, const StringView &key, Input first, Input last) {
-    CmdArgs args;
-    args << "XDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xgroup_create(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id,
-                            bool mkstream) {
-    CmdArgs args;
-    args << "XGROUP" << "CREATE" << key << group << id;
-
-    if (mkstream) {
-        args << "MKSTREAM";
-    }
-
-    connection.send(args);
-}
-
-inline void xgroup_setid(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id) {
-    connection.send("XGROUP SETID %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-inline void xgroup_destroy(Connection &connection,
-                            const StringView &key,
-                            const StringView &group) {
-    connection.send("XGROUP DESTROY %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xgroup_delconsumer(Connection &connection,
-                                const StringView &key,
-                                const StringView &group,
-                                const StringView &consumer) {
-    connection.send("XGROUP DELCONSUMER %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size());
-}
-
-inline void xlen(Connection &connection, const StringView &key) {
-    connection.send("XLEN %b", key.data(), key.size());
-}
-
-inline void xpending(Connection &connection, const StringView &key, const StringView &group) {
-    connection.send("XPENDING %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xpending_detail(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XPENDING %b %b %b %b %lld",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xpending_per_consumer(Connection &connection,
-                                    const StringView &key,
-                                    const StringView &group,
-                                    const StringView &start,
-                                    const StringView &end,
-                                    long long count,
-                                    const StringView &consumer) {
-    connection.send("XPENDING %b %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count,
-                    consumer.data(), consumer.size());
-}
-
-inline void xrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &start,
-                    const StringView &end) {
-    connection.send("XRANGE %b %b %b",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size());
-}
-
-inline void xrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xread(Connection &connection,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count) {
-    connection.send("XREAD COUNT %lld STREAMS %b %b",
-                    count,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_range(Connection &connection, Input first, Input last, long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xread_block(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        long long timeout,
-                        long long count) {
-    connection.send("XREAD COUNT %lld BLOCK %lld STREAMS %b %b",
-                    count,
-                    timeout,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_block_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout,
-                        long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "BLOCK" << timeout << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_range(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup_block(Connection &connection,
-                                const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long timeout,
-                                long long count,
-                                bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_block_range(Connection &connection,
-                            const StringView &group,
-                            const StringView &consumer,
-                            Input first,
-                            Input last,
-                            long long timeout,
-                            long long count,
-                            bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xrevrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &end,
-                    const StringView &start) {
-    connection.send("XREVRANGE %b %b %b",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size());
-}
-
-inline void xrevrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-    connection.send("XREVRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size(),
-                    count);
-}
-
-void xtrim(Connection &connection, const StringView &key, long long count, bool approx);
-
-namespace detail {
-
-void set_bitop(CmdArgs &args, BitOp op);
-
-void set_update_type(CmdArgs &args, UpdateType type);
-
-void set_aggregation_type(CmdArgs &args, Aggregation type);
-
-template <typename Input>
-void zinterstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-void set_geo_unit(CmdArgs &args, GeoUnit unit);
-
-void set_georadius_store_parameters(CmdArgs &args,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count);
-
-void set_georadius_parameters(CmdArgs &args,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                bool with_coord,
-                                bool with_dist,
-                                bool with_hash);
-
-}
-
-}
-
-}
-
-}
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    detail::set_bitop(args, op);
-
-    args << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    args << "ZADD" << key;
-
-    detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zinterstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zunionstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command_args.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command_args.h
deleted file mode 100644
index 0beb71e5c..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command_args.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-
-#include <vector>
-#include <list>
-#include <string>
-#include <tuple>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-class CmdArgs {
-public:
-    template <typename Arg>
-    CmdArgs& append(Arg &&arg);
-
-    template <typename Arg, typename ...Args>
-    CmdArgs& append(Arg &&arg, Args &&...args);
-
-    // All overloads of operator<< are for internal use only.
-    CmdArgs& operator<<(const StringView &arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& operator<<(T &&arg);
-
-    template <typename Iter>
-    CmdArgs& operator<<(const std::pair<Iter, Iter> &range);
-
-    template <std::size_t N, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &) ->
-        typename std::enable_if<N == sizeof...(Args), CmdArgs&>::type {
-        return *this;
-    }
-
-    template <std::size_t N = 0, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &arg) ->
-        typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type;
-
-    const char** argv() {
-        return _argv.data();
-    }
-
-    const std::size_t* argv_len() {
-        return _argv_len.data();
-    }
-
-    std::size_t size() const {
-        return _argv.size();
-    }
-
-private:
-    // Deep copy.
-    CmdArgs& _append(std::string arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const StringView &arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const char *arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& _append(T &&arg) {
-        return operator<<(std::forward<T>(arg));
-    }
-
-    template <typename Iter>
-    CmdArgs& _append(std::true_type, const std::pair<Iter, Iter> &range);
-
-    template <typename Iter>
-    CmdArgs& _append(std::false_type, const std::pair<Iter, Iter> &range);
-
-    std::vector<const char *> _argv;
-    std::vector<std::size_t> _argv_len;
-
-    std::list<std::string> _args;
-};
-
-template <typename Arg>
-inline CmdArgs& CmdArgs::append(Arg &&arg) {
-    return _append(std::forward<Arg>(arg));
-}
-
-template <typename Arg, typename ...Args>
-inline CmdArgs& CmdArgs::append(Arg &&arg, Args &&...args) {
-    _append(std::forward<Arg>(arg));
-
-    return append(std::forward<Args>(args)...);
-}
-
-inline CmdArgs& CmdArgs::operator<<(const StringView &arg) {
-    _argv.push_back(arg.data());
-    _argv_len.push_back(arg.size());
-
-    return *this;
-}
-
-template <typename Iter>
-inline CmdArgs& CmdArgs::operator<<(const std::pair<Iter, Iter> &range) {
-    return _append(IsKvPair<typename std::decay<decltype(*std::declval<Iter>())>::type>(), range);
-}
-
-template <typename T,
-             typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                    int>::type>
-inline CmdArgs& CmdArgs::operator<<(T &&arg) {
-    return _append(std::to_string(std::forward<T>(arg)));
-}
-
-template <std::size_t N, typename ...Args>
-auto CmdArgs::operator<<(const std::tuple<Args...> &arg) ->
-    typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type {
-    operator<<(std::get<N>(arg));
-
-    return operator<<<N + 1, Args...>(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(std::string arg) {
-    _args.push_back(std::move(arg));
-    return operator<<(_args.back());
-}
-
-inline CmdArgs& CmdArgs::_append(const StringView &arg) {
-    return operator<<(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(const char *arg) {
-    return operator<<(arg);
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::false_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << *first;
-        ++first;
-    }
-
-    return *this;
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::true_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << first->first << first->second;
-        ++first;
-    }
-
-    return *this;
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command_options.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command_options.h
deleted file mode 100644
index ca766c086..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/command_options.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-
-#include <string>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class UpdateType {
-    EXIST,
-    NOT_EXIST,
-    ALWAYS
-};
-
-enum class InsertPosition {
-    BEFORE,
-    AFTER
-};
-
-enum class BoundType {
-    CLOSED,
-    OPEN,
-    LEFT_OPEN,
-    RIGHT_OPEN
-};
-
-// (-inf, +inf)
-template <typename T>
-class UnboundedInterval;
-
-// [min, max], (min, max), (min, max], [min, max)
-template <typename T>
-class BoundedInterval;
-
-// [min, +inf), (min, +inf)
-template <typename T>
-class LeftBoundedInterval;
-
-// (-inf, max], (-inf, max)
-template <typename T>
-class RightBoundedInterval;
-
-template <>
-class UnboundedInterval<double> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<double> {
-public:
-    BoundedInterval(double min, double max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<double> {
-public:
-    LeftBoundedInterval(double min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<double> {
-public:
-    RightBoundedInterval(double max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-template <>
-class UnboundedInterval<std::string> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<std::string> {
-public:
-    BoundedInterval(const std::string &min, const std::string &max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<std::string> {
-public:
-    LeftBoundedInterval(const std::string &min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<std::string> {
-public:
-    RightBoundedInterval(const std::string &max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-struct LimitOptions {
-    long long offset = 0;
-    long long count = -1;
-};
-
-enum class Aggregation {
-    SUM,
-    MIN,
-    MAX
-};
-
-enum class BitOp {
-    AND,
-    OR,
-    XOR,
-    NOT
-};
-
-enum class GeoUnit {
-    M,
-    KM,
-    MI,
-    FT
-};
-
-template <typename T>
-struct WithCoord : TupleWithType<std::pair<double, double>, T> {};
-
-template <typename T>
-struct WithDist : TupleWithType<double, T> {};
-
-template <typename T>
-struct WithHash : TupleWithType<long long, T> {};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/connection.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/connection.h
deleted file mode 100644
index 5ad419225..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/connection.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_H
-
-#include <cerrno>
-#include <cstring>
-#include <memory>
-#include <string>
-#include <sstream>
-#include <chrono>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "reply.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class ConnectionType {
-    TCP = 0,
-    UNIX
-};
-
-struct ConnectionOptions {
-public:
-    ConnectionOptions() = default;
-
-    explicit ConnectionOptions(const std::string &uri);
-
-    ConnectionOptions(const ConnectionOptions &) = default;
-    ConnectionOptions& operator=(const ConnectionOptions &) = default;
-
-    ConnectionOptions(ConnectionOptions &&) = default;
-    ConnectionOptions& operator=(ConnectionOptions &&) = default;
-
-    ~ConnectionOptions() = default;
-
-    ConnectionType type = ConnectionType::TCP;
-
-    std::string host;
-
-    int port = 6379;
-
-    std::string path;
-
-    std::string password;
-
-    int db = 0;
-
-    bool keep_alive = false;
-
-    std::chrono::milliseconds connect_timeout{0};
-
-    std::chrono::milliseconds socket_timeout{0};
-
-private:
-    ConnectionOptions _parse_options(const std::string &uri) const;
-
-    ConnectionOptions _parse_tcp_options(const std::string &path) const;
-
-    ConnectionOptions _parse_unix_options(const std::string &path) const;
-
-    auto _split_string(const std::string &str, const std::string &delimiter) const ->
-            std::pair<std::string, std::string>;
-};
-
-class CmdArgs;
-
-class Connection {
-public:
-    explicit Connection(const ConnectionOptions &opts);
-
-    Connection(const Connection &) = delete;
-    Connection& operator=(const Connection &) = delete;
-
-    Connection(Connection &&) = default;
-    Connection& operator=(Connection &&) = default;
-
-    ~Connection() = default;
-
-    // Check if the connection is broken. Client needs to do this check
-    // before sending some command to the connection. If it's broken,
-    // client needs to reconnect it.
-    bool broken() const noexcept {
-        return _ctx->err != REDIS_OK;
-    }
-
-    void reset() noexcept {
-        _ctx->err = 0;
-    }
-
-    void reconnect();
-
-    auto last_active() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _last_active;
-    }
-
-    template <typename ...Args>
-    void send(const char *format, Args &&...args);
-
-    void send(int argc, const char **argv, const std::size_t *argv_len);
-
-    void send(CmdArgs &args);
-
-    ReplyUPtr recv();
-
-    const ConnectionOptions& options() const {
-        return _opts;
-    }
-
-    friend void swap(Connection &lhs, Connection &rhs) noexcept;
-
-private:
-    class Connector;
-
-    struct ContextDeleter {
-        void operator()(redisContext *context) const {
-            if (context != nullptr) {
-                redisFree(context);
-            }
-        };
-    };
-
-    using ContextUPtr = std::unique_ptr<redisContext, ContextDeleter>;
-
-    void _set_options();
-
-    void _auth();
-
-    void _select_db();
-
-    redisContext* _context();
-
-    ContextUPtr _ctx;
-
-    // The time that the connection is created or the time that
-    // the connection is used, i.e. *context()* is called.
-    std::chrono::time_point<std::chrono::steady_clock> _last_active{};
-
-    ConnectionOptions _opts;
-};
-
-using ConnectionSPtr = std::shared_ptr<Connection>;
-
-enum class Role {
-    MASTER,
-    SLAVE
-};
-
-// Inline implementaions.
-
-template <typename ...Args>
-inline void Connection::send(const char *format, Args &&...args) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommand(ctx,
-                format,
-                std::forward<Args>(args)...) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-inline redisContext* Connection::_context() {
-    _last_active = std::chrono::steady_clock::now();
-
-    return _ctx.get();
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/connection_pool.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/connection_pool.h
deleted file mode 100644
index 6f2663ad7..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/connection_pool.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-
-#include <chrono>
-#include <mutex>
-#include <memory>
-#include <condition_variable>
-#include <deque>
-#include "connection.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ConnectionPoolOptions {
-    // Max number of connections, including both in-use and idle ones.
-    std::size_t size = 1;
-
-    // Max time to wait for a connection. 0ms means client waits forever.
-    std::chrono::milliseconds wait_timeout{0};
-
-    // Max lifetime of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_lifetime{0};
-};
-
-class ConnectionPool {
-public:
-    ConnectionPool(const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool(SimpleSentinel sentinel,
-                    const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool() = default;
-
-    ConnectionPool(ConnectionPool &&that);
-    ConnectionPool& operator=(ConnectionPool &&that);
-
-    ConnectionPool(const ConnectionPool &) = delete;
-    ConnectionPool& operator=(const ConnectionPool &) = delete;
-
-    ~ConnectionPool() = default;
-
-    // Fetch a connection from pool.
-    Connection fetch();
-
-    ConnectionOptions connection_options();
-
-    void release(Connection connection);
-
-    // Create a new connection.
-    Connection create();
-
-private:
-    void _move(ConnectionPool &&that);
-
-    // NOT thread-safe
-    Connection _create();
-
-    Connection _create(SimpleSentinel &sentinel, const ConnectionOptions &opts, bool locked);
-
-    Connection _fetch();
-
-    void _wait_for_connection(std::unique_lock<std::mutex> &lock);
-
-    bool _need_reconnect(const Connection &connection,
-                            const std::chrono::milliseconds &connection_lifetime) const;
-
-    void _update_connection_opts(const std::string &host, int port) {
-        _opts.host = host;
-        _opts.port = port;
-    }
-
-    bool _role_changed(const ConnectionOptions &opts) const {
-        return opts.port != _opts.port || opts.host != _opts.host;
-    }
-
-    ConnectionOptions _opts;
-
-    ConnectionPoolOptions _pool_opts;
-
-    std::deque<Connection> _pool;
-
-    std::size_t _used_connections = 0;
-
-    std::mutex _mutex;
-
-    std::condition_variable _cv;
-
-    SimpleSentinel _sentinel;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/errors.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/errors.h
deleted file mode 100644
index 44d629e50..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/errors.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ERRORS_H
-#define SEWENEW_REDISPLUSPLUS_ERRORS_H
-
-#include <exception>
-#include <string>
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-enum ReplyErrorType {
-    ERR,
-    MOVED,
-    ASK
-};
-
-class Error : public std::exception {
-public:
-    explicit Error(const std::string &msg) : _msg(msg) {}
-
-    Error(const Error &) = default;
-    Error& operator=(const Error &) = default;
-
-    Error(Error &&) = default;
-    Error& operator=(Error &&) = default;
-
-    virtual ~Error() = default;
-
-    virtual const char* what() const noexcept {
-        return _msg.data();
-    }
-
-private:
-    std::string _msg;
-};
-
-class IoError : public Error {
-public:
-    explicit IoError(const std::string &msg) : Error(msg) {}
-
-    IoError(const IoError &) = default;
-    IoError& operator=(const IoError &) = default;
-
-    IoError(IoError &&) = default;
-    IoError& operator=(IoError &&) = default;
-
-    virtual ~IoError() = default;
-};
-
-class TimeoutError : public IoError {
-public:
-    explicit TimeoutError(const std::string &msg) : IoError(msg) {}
-
-    TimeoutError(const TimeoutError &) = default;
-    TimeoutError& operator=(const TimeoutError &) = default;
-
-    TimeoutError(TimeoutError &&) = default;
-    TimeoutError& operator=(TimeoutError &&) = default;
-
-    virtual ~TimeoutError() = default;
-};
-
-class ClosedError : public Error {
-public:
-    explicit ClosedError(const std::string &msg) : Error(msg) {}
-
-    ClosedError(const ClosedError &) = default;
-    ClosedError& operator=(const ClosedError &) = default;
-
-    ClosedError(ClosedError &&) = default;
-    ClosedError& operator=(ClosedError &&) = default;
-
-    virtual ~ClosedError() = default;
-};
-
-class ProtoError : public Error {
-public:
-    explicit ProtoError(const std::string &msg) : Error(msg) {}
-
-    ProtoError(const ProtoError &) = default;
-    ProtoError& operator=(const ProtoError &) = default;
-
-    ProtoError(ProtoError &&) = default;
-    ProtoError& operator=(ProtoError &&) = default;
-
-    virtual ~ProtoError() = default;
-};
-
-class OomError : public Error {
-public:
-    explicit OomError(const std::string &msg) : Error(msg) {}
-
-    OomError(const OomError &) = default;
-    OomError& operator=(const OomError &) = default;
-
-    OomError(OomError &&) = default;
-    OomError& operator=(OomError &&) = default;
-
-    virtual ~OomError() = default;
-};
-
-class ReplyError : public Error {
-public:
-    explicit ReplyError(const std::string &msg) : Error(msg) {}
-
-    ReplyError(const ReplyError &) = default;
-    ReplyError& operator=(const ReplyError &) = default;
-
-    ReplyError(ReplyError &&) = default;
-    ReplyError& operator=(ReplyError &&) = default;
-
-    virtual ~ReplyError() = default;
-};
-
-class WatchError : public Error {
-public:
-    explicit WatchError() : Error("Watched key has been modified") {}
-
-    WatchError(const WatchError &) = default;
-    WatchError& operator=(const WatchError &) = default;
-
-    WatchError(WatchError &&) = default;
-    WatchError& operator=(WatchError &&) = default;
-
-    virtual ~WatchError() = default;
-};
-
-
-// MovedError and AskError are defined in shards.h
-class MovedError;
-
-class AskError;
-
-void throw_error(redisContext &context, const std::string &err_info);
-
-void throw_error(const redisReply &reply);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ERRORS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/pipeline.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/pipeline.h
deleted file mode 100644
index 52b01253f..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/pipeline.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_PIPELINE_H
-#define SEWENEW_REDISPLUSPLUS_PIPELINE_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-class PipelineImpl {
-public:
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args) {
-        assert(!connection.broken());
-
-        cmd(connection, std::forward<Args>(args)...);
-    }
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t /*cmd_num*/) {
-        // Reconnect to Redis to discard all commands.
-        connection.reconnect();
-    }
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_PIPELINE_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/queued_redis.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/queued_redis.h
deleted file mode 100644
index 71d975ee3..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/queued_redis.h
+++ /dev/null
@@ -1,1844 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-
-#include <cassert>
-#include <chrono>
-#include <initializer_list>
-#include <vector>
-#include "connection.h"
-#include "utils.h"
-#include "reply.h"
-#include "command.h"
-#include "redis.h"
-
-namespace sw {
-
-namespace redis {
-
-class QueuedReplies;
-
-// If any command throws, QueuedRedis resets the connection, and becomes invalid.
-// In this case, the only thing we can do is to destory the QueuedRedis object.
-template <typename Impl>
-class QueuedRedis {
-public:
-    QueuedRedis(QueuedRedis &&) = default;
-    QueuedRedis& operator=(QueuedRedis &&) = default;
-
-    // When it destructs, the underlying *Connection* will be closed,
-    // and any command that has NOT been executed will be ignored.
-    ~QueuedRedis() = default;
-
-    Redis redis();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                    QueuedRedis&>::type;
-
-    template <typename ...Args>
-    QueuedRedis& command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, QueuedRedis&>::type;
-
-    QueuedReplies exec();
-
-    void discard();
-
-    // CONNECTION commands.
-
-    QueuedRedis& auth(const StringView &password) {
-        return command(cmd::auth, password);
-    }
-
-    QueuedRedis& echo(const StringView &msg) {
-        return command(cmd::echo, msg);
-    }
-
-    QueuedRedis& ping() {
-        return command<void (*)(Connection &)>(cmd::ping);
-    }
-
-    QueuedRedis& ping(const StringView &msg) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::ping, msg);
-    }
-
-    // We DO NOT support the QUIT command. See *Redis::quit* doc for details.
-    //
-    // QueuedRedis& quit();
-
-    QueuedRedis& select(long long idx) {
-        return command(cmd::select, idx);
-    }
-
-    QueuedRedis& swapdb(long long idx1, long long idx2) {
-        return command(cmd::swapdb, idx1, idx2);
-    }
-
-    // SERVER commands.
-
-    QueuedRedis& bgrewriteaof() {
-        return command(cmd::bgrewriteaof);
-    }
-
-    QueuedRedis& bgsave() {
-        return command(cmd::bgsave);
-    }
-
-    QueuedRedis& dbsize() {
-        return command(cmd::dbsize);
-    }
-
-    QueuedRedis& flushall(bool async = false) {
-        return command(cmd::flushall, async);
-    }
-
-    QueuedRedis& flushdb(bool async = false) {
-        return command(cmd::flushdb, async);
-    }
-
-    QueuedRedis& info() {
-        return command<void (*)(Connection &)>(cmd::info);
-    }
-
-    QueuedRedis& info(const StringView &section) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::info, section);
-    }
-
-    QueuedRedis& lastsave() {
-        return command(cmd::lastsave);
-    }
-
-    QueuedRedis& save() {
-        return command(cmd::save);
-    }
-
-    // KEY commands.
-
-    QueuedRedis& del(const StringView &key) {
-        return command(cmd::del, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& del(Input first, Input last) {
-        return command(cmd::del_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    QueuedRedis& dump(const StringView &key) {
-        return command(cmd::dump, key);
-    }
-
-    QueuedRedis& exists(const StringView &key) {
-        return command(cmd::exists, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& exists(Input first, Input last) {
-        return command(cmd::exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& expire(const StringView &key, long long timeout) {
-        return command(cmd::expire, key, timeout);
-    }
-
-    QueuedRedis& expire(const StringView &key,
-                        const std::chrono::seconds &timeout) {
-        return expire(key, timeout.count());
-    }
-
-    QueuedRedis& expireat(const StringView &key, long long timestamp) {
-        return command(cmd::expireat, key, timestamp);
-    }
-
-    QueuedRedis& expireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::seconds> &tp) {
-        return expireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& keys(const StringView &pattern) {
-        return command(cmd::keys, pattern);
-    }
-
-    QueuedRedis& move(const StringView &key, long long db) {
-        return command(cmd::move, key, db);
-    }
-
-    QueuedRedis& persist(const StringView &key) {
-        return command(cmd::persist, key);
-    }
-
-    QueuedRedis& pexpire(const StringView &key, long long timeout) {
-        return command(cmd::pexpire, key, timeout);
-    }
-
-    QueuedRedis& pexpire(const StringView &key,
-                            const std::chrono::milliseconds &timeout) {
-        return pexpire(key, timeout.count());
-    }
-
-    QueuedRedis& pexpireat(const StringView &key, long long timestamp) {
-        return command(cmd::pexpireat, key, timestamp);
-    }
-
-    QueuedRedis& pexpireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::milliseconds> &tp) {
-        return pexpireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& pttl(const StringView &key) {
-        return command(cmd::pttl, key);
-    }
-
-    QueuedRedis& randomkey() {
-        return command(cmd::randomkey);
-    }
-
-    QueuedRedis& rename(const StringView &key, const StringView &newkey) {
-        return command(cmd::rename, key, newkey);
-    }
-
-    QueuedRedis& renamenx(const StringView &key, const StringView &newkey) {
-        return command(cmd::renamenx, key, newkey);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                                const StringView &val,
-                                long long ttl,
-                                bool replace = false) {
-        return command(cmd::restore, key, val, ttl, replace);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                            bool replace = false) {
-        return restore(key, val, ttl.count(), replace);
-    }
-
-    // TODO: sort
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::scan, cursor, pattern, count);
-    }
-
-    QueuedRedis& scan(long long cursor) {
-        return scan(cursor, "*", 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern) {
-        return scan(cursor, pattern, 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        long long count) {
-        return scan(cursor, "*", count);
-    }
-
-    QueuedRedis& touch(const StringView &key) {
-        return command(cmd::touch, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& touch(Input first, Input last) {
-        return command(cmd::touch_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    QueuedRedis& ttl(const StringView &key) {
-        return command(cmd::ttl, key);
-    }
-
-    QueuedRedis& type(const StringView &key) {
-        return command(cmd::type, key);
-    }
-
-    QueuedRedis& unlink(const StringView &key) {
-        return command(cmd::unlink, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& unlink(Input first, Input last) {
-        return command(cmd::unlink_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    QueuedRedis& wait(long long numslaves, long long timeout) {
-        return command(cmd::wait, numslaves, timeout);
-    }
-
-    QueuedRedis& wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-        return wait(numslaves, timeout.count());
-    }
-
-    // STRING commands.
-
-    QueuedRedis& append(const StringView &key, const StringView &str) {
-        return command(cmd::append, key, str);
-    }
-
-    QueuedRedis& bitcount(const StringView &key,
-                            long long start = 0,
-                            long long end = -1) {
-        return command(cmd::bitcount, key, start, end);
-    }
-
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        const StringView &key) {
-        return command(cmd::bitop, op, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        Input first,
-                        Input last) {
-        return command(cmd::bitop_range<Input>, op, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1) {
-        return command(cmd::bitpos, key, bit, start, end);
-    }
-
-    QueuedRedis& decr(const StringView &key) {
-        return command(cmd::decr, key);
-    }
-
-    QueuedRedis& decrby(const StringView &key, long long decrement) {
-        return command(cmd::decrby, key, decrement);
-    }
-
-    QueuedRedis& get(const StringView &key) {
-        return command(cmd::get, key);
-    }
-
-    QueuedRedis& getbit(const StringView &key, long long offset) {
-        return command(cmd::getbit, key, offset);
-    }
-
-    QueuedRedis& getrange(const StringView &key, long long start, long long end) {
-        return command(cmd::getrange, key, start, end);
-    }
-
-    QueuedRedis& getset(const StringView &key, const StringView &val) {
-        return command(cmd::getset, key, val);
-    }
-
-    QueuedRedis& incr(const StringView &key) {
-        return command(cmd::incr, key);
-    }
-
-    QueuedRedis& incrby(const StringView &key, long long increment) {
-        return command(cmd::incrby, key, increment);
-    }
-
-    QueuedRedis& incrbyfloat(const StringView &key, double increment) {
-        return command(cmd::incrbyfloat, key, increment);
-    }
-
-    template <typename Input>
-    QueuedRedis& mget(Input first, Input last) {
-        return command(cmd::mget<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mget(std::initializer_list<T> il) {
-        return mget(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& mset(Input first, Input last) {
-        return command(cmd::mset<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mset(std::initializer_list<T> il) {
-        return mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& msetnx(Input first, Input last) {
-        return command(cmd::msetnx<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::psetex, key, ttl, val);
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        const std::chrono::milliseconds &ttl,
-                        const StringView &val) {
-        return psetex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& set(const StringView &key,
-                        const StringView &val,
-                        const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                        UpdateType type = UpdateType::ALWAYS) {
-        _set_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::set, key, val, ttl.count(), type);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::setex, key, ttl, val);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        const std::chrono::seconds &ttl,
-                        const StringView &val) {
-        return setex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& setnx(const StringView &key, const StringView &val) {
-        return command(cmd::setnx, key, val);
-    }
-
-    QueuedRedis& setrange(const StringView &key,
-                            long long offset,
-                            const StringView &val) {
-        return command(cmd::setrange, key, offset, val);
-    }
-
-    QueuedRedis& strlen(const StringView &key) {
-        return command(cmd::strlen, key);
-    }
-
-    // LIST commands.
-
-    QueuedRedis& blpop(const StringView &key, long long timeout) {
-        return command(cmd::blpop, key, timeout);
-    }
-
-    QueuedRedis& blpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first, Input last, long long timeout) {
-        return command(cmd::blpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key, long long timeout) {
-        return command(cmd::brpop, key, timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first, Input last, long long timeout) {
-        return command(cmd::brpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            long long timeout) {
-        return command(cmd::brpoplpush, source, destination, timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpoplpush(source, destination, timeout.count());
-    }
-
-    QueuedRedis& lindex(const StringView &key, long long index) {
-        return command(cmd::lindex, key, index);
-    }
-
-    QueuedRedis& linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-        return command(cmd::linsert, key, position, pivot, val);
-    }
-
-    QueuedRedis& llen(const StringView &key) {
-        return command(cmd::llen, key);
-    }
-
-    QueuedRedis& lpop(const StringView &key) {
-        return command(cmd::lpop, key);
-    }
-
-    QueuedRedis& lpush(const StringView &key, const StringView &val) {
-        return command(cmd::lpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& lpush(const StringView &key, Input first, Input last) {
-        return command(cmd::lpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& lpushx(const StringView &key, const StringView &val) {
-        return command(cmd::lpushx, key, val);
-    }
-
-    QueuedRedis& lrange(const StringView &key,
-                        long long start,
-                        long long stop) {
-        return command(cmd::lrange, key, start, stop);
-    }
-
-    QueuedRedis& lrem(const StringView &key, long long count, const StringView &val) {
-        return command(cmd::lrem, key, count, val);
-    }
-
-    QueuedRedis& lset(const StringView &key, long long index, const StringView &val) {
-        return command(cmd::lset, key, index, val);
-    }
-
-    QueuedRedis& ltrim(const StringView &key, long long start, long long stop) {
-        return command(cmd::ltrim, key, start, stop);
-    }
-
-    QueuedRedis& rpop(const StringView &key) {
-        return command(cmd::rpop, key);
-    }
-
-    QueuedRedis& rpoplpush(const StringView &source, const StringView &destination) {
-        return command(cmd::rpoplpush, source, destination);
-    }
-
-    QueuedRedis& rpush(const StringView &key, const StringView &val) {
-        return command(cmd::rpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& rpush(const StringView &key, Input first, Input last) {
-        return command(cmd::rpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& rpushx(const StringView &key, const StringView &val) {
-        return command(cmd::rpushx, key, val);
-    }
-
-    // HASH commands.
-
-    QueuedRedis& hdel(const StringView &key, const StringView &field) {
-        return command(cmd::hdel, key, field);
-    }
-
-    template <typename Input>
-    QueuedRedis& hdel(const StringView &key, Input first, Input last) {
-        return command(cmd::hdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hexists(const StringView &key, const StringView &field) {
-        return command(cmd::hexists, key, field);
-    }
-
-    QueuedRedis& hget(const StringView &key, const StringView &field) {
-        return command(cmd::hget, key, field);
-    }
-
-    QueuedRedis& hgetall(const StringView &key) {
-        return command(cmd::hgetall, key);
-    }
-
-    QueuedRedis& hincrby(const StringView &key,
-                            const StringView &field,
-                            long long increment) {
-        return command(cmd::hincrby, key, field, increment);
-    }
-
-    QueuedRedis& hincrbyfloat(const StringView &key,
-                                const StringView &field,
-                                double increment) {
-        return command(cmd::hincrbyfloat, key, field, increment);
-    }
-
-    QueuedRedis& hkeys(const StringView &key) {
-        return command(cmd::hkeys, key);
-    }
-
-    QueuedRedis& hlen(const StringView &key) {
-        return command(cmd::hlen, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& hmget(const StringView &key, Input first, Input last) {
-        return command(cmd::hmget<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmget(const StringView &key, std::initializer_list<T> il) {
-        return hmget(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& hmset(const StringView &key, Input first, Input last) {
-        return command(cmd::hmset<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmset(const StringView &key, std::initializer_list<T> il) {
-        return hmset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::hscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return hscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return hscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor) {
-        return hscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& hset(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hset, key, field, val);
-    }
-
-    QueuedRedis& hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hset(key, item.first, item.second);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hsetnx, key, field, val);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hsetnx(key, item.first, item.second);
-    }
-
-    QueuedRedis& hstrlen(const StringView &key, const StringView &field) {
-        return command(cmd::hstrlen, key, field);
-    }
-
-    QueuedRedis& hvals(const StringView &key) {
-        return command(cmd::hvals, key);
-    }
-
-    // SET commands.
-
-    QueuedRedis& sadd(const StringView &key, const StringView &member) {
-        return command(cmd::sadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& sadd(const StringView &key, Input first, Input last) {
-        return command(cmd::sadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& scard(const StringView &key) {
-        return command(cmd::scard, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiff(Input first, Input last) {
-        return command(cmd::sdiff<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiff(std::initializer_list<T> il) {
-        return sdiff(il.begin(), il.end());
-    }
-
-    QueuedRedis& sdiffstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sdiffstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-        return command(cmd::sdiffstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiffstore(const StringView &destination, std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& sinter(Input first, Input last) {
-        return command(cmd::sinter<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinter(std::initializer_list<T> il) {
-        return sinter(il.begin(), il.end());
-    }
-
-    QueuedRedis& sinterstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sinterstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sinterstore(const StringView &destination,
-                                Input first,
-                                Input last) {
-        return command(cmd::sinterstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinterstore(const StringView &destination, std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& sismember(const StringView &key, const StringView &member) {
-        return command(cmd::sismember, key, member);
-    }
-
-    QueuedRedis& smembers(const StringView &key) {
-        return command(cmd::smembers, key);
-    }
-
-    QueuedRedis& smove(const StringView &source,
-                        const StringView &destination,
-                        const StringView &member) {
-        return command(cmd::smove, source, destination, member);
-    }
-
-    QueuedRedis& spop(const StringView &key) {
-        return command(cmd::spop, key);
-    }
-
-    QueuedRedis& spop(const StringView &key, long long count) {
-        return command(cmd::spop_range, key, count);
-    }
-
-    QueuedRedis& srandmember(const StringView &key) {
-        return command(cmd::srandmember, key);
-    }
-
-    QueuedRedis& srandmember(const StringView &key, long long count) {
-        return command(cmd::srandmember_range, key, count);
-    }
-
-    QueuedRedis& srem(const StringView &key, const StringView &member) {
-        return command(cmd::srem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& srem(const StringView &key, Input first, Input last) {
-        return command(cmd::srem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::sscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern) {
-        return sscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return sscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor) {
-        return sscan(key, cursor, "*", 10);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunion(Input first, Input last) {
-        return command(cmd::sunion<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunion(std::initializer_list<T> il) {
-        return sunion(il.begin(), il.end());
-    }
-
-    QueuedRedis& sunionstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sunionstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunionstore(const StringView &destination, Input first, Input last) {
-        return command(cmd::sunionstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    QueuedRedis& bzpopmax(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmax, key, timeout);
-    }
-
-    QueuedRedis& bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first, Input last, long long timeout) {
-        return command(cmd::bzpopmax_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il, long long timeout) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmin, key, timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first, Input last, long long timeout) {
-        return command(cmd::bzpopmin_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il, long long timeout) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    QueuedRedis& zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd, key, member, score, type, changed);
-    }
-
-    template <typename Input>
-    QueuedRedis& zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd_range<Input>, key, first, last, type, changed);
-    }
-
-    QueuedRedis& zcard(const StringView &key) {
-        return command(cmd::zcard, key);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zincrby(const StringView &key, double increment, const StringView &member) {
-        return command(cmd::zincrby, key, increment, member);
-    }
-
-    QueuedRedis& zinterstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zinterstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        return command(cmd::zinterstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zlexcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zlexcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key) {
-        return command(cmd::zpopmax, key, 1);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key, long long count) {
-        return command(cmd::zpopmax, key, count);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key) {
-        return command(cmd::zpopmin, key, 1);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key, long long count) {
-        return command(cmd::zpopmin, key, count);
-    }
-
-    // NOTE: *QueuedRedis::zrange*'s parameters are different from *Redis::zrange*.
-    // *Redis::zrange* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::zrange*. So we have to use an extra parameter: *with_scores*,
-    // to decide whether we should send *WITHSCORES* option to Redis. This also applies to
-    // other commands with the *WITHSCORES* option, e.g. *ZRANGEBYSCORE*, *ZREVRANGE*,
-    // *ZREVRANGEBYSCORE*.
-    QueuedRedis& zrange(const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores = false) {
-        return command(cmd::zrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key, const Interval &interval) {
-        return zrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                bool with_scores = false) {
-        return command(cmd::zrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                bool with_scores = false) {
-        return zrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrank, key, member);
-    }
-
-    QueuedRedis& zrem(const StringView &key, const StringView &member) {
-        return command(cmd::zrem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& zrem(const StringView &key, Input first, Input last) {
-        return command(cmd::zrem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebylex(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebylex<Interval>, key, interval);
-    }
-
-    QueuedRedis& zremrangebyrank(const StringView &key, long long start, long long stop) {
-        return command(cmd::zremrangebyrank, key, start, stop);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebyscore(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebyscore<Interval>, key, interval);
-    }
-
-    // See comments on *ZRANGE*.
-    QueuedRedis& zrevrange(const StringView &key,
-                            long long start,
-                            long long stop,
-                            bool with_scores = false) {
-        return command(cmd::zrevrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key, const Interval &interval) {
-        return zrevrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    const LimitOptions &opts,
-                                    bool with_scores = false) {
-        return command(cmd::zrevrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    bool with_scores = false) {
-        return zrevrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrevrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrevrank, key, member);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::zscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return zscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return zscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor) {
-        return zscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& zscore(const StringView &key, const StringView &member) {
-        return command(cmd::zscore, key, member);
-    }
-
-    QueuedRedis& zunionstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zunionstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        return command(cmd::zunionstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    QueuedRedis& pfadd(const StringView &key, const StringView &element) {
-        return command(cmd::pfadd, key, element);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfadd(const StringView &key, Input first, Input last) {
-        return command(cmd::pfadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& pfcount(const StringView &key) {
-        return command(cmd::pfcount, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfcount(Input first, Input last) {
-        return command(cmd::pfcount_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    QueuedRedis& pfmerge(const StringView &destination, const StringView &key) {
-        return command(cmd::pfmerge, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfmerge(const StringView &destination, Input first, Input last) {
-        return command(cmd::pfmerge_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        return pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    QueuedRedis& geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-        return command(cmd::geoadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geoadd(const StringView &key,
-                        Input first,
-                        Input last) {
-        return command(cmd::geoadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geoadd(const StringView &key, std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M) {
-        return command(cmd::geodist, key, member1, member2, unit);
-    }
-
-    template <typename Input>
-    QueuedRedis& geohash(const StringView &key, Input first, Input last) {
-        return command(cmd::geohash_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geohash(const StringView &key, std::initializer_list<T> il) {
-        return geohash(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& geopos(const StringView &key, Input first, Input last) {
-        return command(cmd::geopos_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geopos(const StringView &key, std::initializer_list<T> il) {
-        return geopos(key, il.begin(), il.end());
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            const StringView &destination,
-                            bool store_dist,
-                            long long count) {
-        _georadius_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadius_store,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // NOTE: *QueuedRedis::georadius*'s parameters are different from *Redis::georadius*.
-    // *Redis::georadius* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::georadius*. So we have to use extra parameters to decide
-    // whether we should send options to Redis. This also applies to *GEORADIUSBYMEMBER*.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            bool with_coord,
-                            bool with_dist,
-                            bool with_hash) {
-        return command(cmd::georadius,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-        _georadius_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // See the comments on *GEORADIUS*.
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    long long count,
-                                    bool asc,
-                                    bool with_coord,
-                                    bool with_dist,
-                                    bool with_hash) {
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    // SCRIPTING commands.
-
-    QueuedRedis& eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-        return command(cmd::eval, script, keys, args);
-    }
-
-    QueuedRedis& evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-        return command(cmd::evalsha, script, keys, args);
-    }
-
-    template <typename Input>
-    QueuedRedis& script_exists(Input first, Input last) {
-        return command(cmd::script_exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& script_exists(std::initializer_list<T> il) {
-        return script_exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& script_flush() {
-        return command(cmd::script_flush);
-    }
-
-    QueuedRedis& script_kill() {
-        return command(cmd::script_kill);
-    }
-
-    QueuedRedis& script_load(const StringView &script) {
-        return command(cmd::script_load, script);
-    }
-
-    // PUBSUB commands.
-
-    QueuedRedis& publish(const StringView &channel, const StringView &message) {
-        return command(cmd::publish, channel, message);
-    }
-
-    // Stream commands.
-
-    QueuedRedis& xack(const StringView &key, const StringView &group, const StringView &id) {
-        return command(cmd::xack, key, group, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xack(const StringView &key, const StringView &group, Input first, Input last) {
-        return command(cmd::xack_range<Input>, key, group, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, Input first, Input last) {
-        return command(cmd::xadd_range<Input>, key, id, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true) {
-        return command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    QueuedRedis& xclaim(const StringView &key,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const std::chrono::milliseconds &min_idle_time,
-                        const StringView &id) {
-        return command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last) {
-        return command(cmd::xclaim_range<Input>,
-                        key,
-                        group,
-                        consumer,
-                        min_idle_time.count(),
-                        first,
-                        last);
-    }
-
-    template <typename T>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il) {
-        return xclaim(key, group, consumer, min_idle_time, il.begin(), il.end());
-    }
-
-    QueuedRedis& xdel(const StringView &key, const StringView &id) {
-        return command(cmd::xdel, key, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xdel(const StringView &key, Input first, Input last) {
-        return command(cmd::xdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& xgroup_create(const StringView &key,
-                                const StringView &group,
-                                const StringView &id,
-                                bool mkstream = false) {
-        return command(cmd::xgroup_create, key, group, id, mkstream);
-    }
-
-    QueuedRedis& xgroup_setid(const StringView &key,
-                                const StringView &group,
-                                const StringView &id) {
-        return command(cmd::xgroup_setid, key, group, id);
-    }
-
-    QueuedRedis& xgroup_destroy(const StringView &key, const StringView &group) {
-        return command(cmd::xgroup_destroy, key, group);
-    }
-
-    QueuedRedis& xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer) {
-        return command(cmd::xgroup_delconsumer, key, group, consumer);
-    }
-
-    QueuedRedis& xlen(const StringView &key) {
-        return command(cmd::xlen, key);
-    }
-
-    QueuedRedis& xpending(const StringView &key, const StringView &group) {
-        return command(cmd::xpending, key, group);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-        return command(cmd::xpending_detail, key, group, start, end, count);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer) {
-        return command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end) {
-        return command(cmd::xrange, key, start, end);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count) {
-        return command(cmd::xrange, key, start, end, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id, long long count) {
-        return command(cmd::xread, key, id, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id) {
-        return xread(key, id, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last, long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xread_range<Input>, first, last, count);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, 0);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count) {
-        return command(cmd::xread_block, key, id, timeout.count(), count);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout) {
-        return xread(key, id, timeout, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, timeout, 0);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, 0, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup_block,
-                        group,
-                        consumer,
-                        key,
-                        id,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xreadgroup_block_range<Input>,
-                        group,
-                        consumer,
-                        first,
-                        last,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, 0, false);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start) {
-        return command(cmd::xrevrange, key, end, start);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-        return command(cmd::xrevrange, key, end, start, count);
-    }
-
-    QueuedRedis& xtrim(const StringView &key, long long count, bool approx = true) {
-        return command(cmd::xtrim, key, count, approx);
-    }
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    template <typename ...Args>
-    QueuedRedis(const ConnectionSPtr &connection, Args &&...args);
-
-    void _sanity_check() const;
-
-    void _reset();
-
-    void _invalidate();
-
-    void _rewrite_replies(std::vector<ReplyUPtr> &replies) const;
-
-    template <typename Func>
-    void _rewrite_replies(const std::vector<std::size_t> &indexes,
-                            Func rewriter,
-                            std::vector<ReplyUPtr> &replies) const;
-
-    ConnectionSPtr _connection;
-
-    Impl _impl;
-
-    std::size_t _cmd_num = 0;
-
-    std::vector<std::size_t> _set_cmd_indexes;
-
-    std::vector<std::size_t> _georadius_cmd_indexes;
-
-    bool _valid = true;
-};
-
-class QueuedReplies {
-public:
-    std::size_t size() const;
-
-    redisReply& get(std::size_t idx);
-
-    template <typename Result>
-    Result get(std::size_t idx);
-
-    template <typename Output>
-    void get(std::size_t idx, Output output);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    explicit QueuedReplies(std::vector<ReplyUPtr> replies) : _replies(std::move(replies)) {}
-
-    void _index_check(std::size_t idx) const;
-
-    std::vector<ReplyUPtr> _replies;
-};
-
-}
-
-}
-
-#include "queued_redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/queued_redis.hpp b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/queued_redis.hpp
deleted file mode 100644
index 409f48aca..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/queued_redis.hpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>::QueuedRedis(const ConnectionSPtr &connection, Args &&...args) :
-            _connection(connection),
-            _impl(std::forward<Args>(args)...) {
-    assert(_connection);
-}
-
-template <typename Impl>
-Redis QueuedRedis<Impl>::redis() {
-    return Redis(_connection);
-}
-
-template <typename Impl>
-template <typename Cmd, typename ...Args>
-auto QueuedRedis<Impl>::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                QueuedRedis<Impl>&>::type {
-    try {
-        _sanity_check();
-
-        _impl.command(*_connection, cmd, std::forward<Args>(args)...);
-
-        ++_cmd_num;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-
-    return *this;
-}
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>& QueuedRedis<Impl>::command(const StringView &cmd_name, Args &&...args) {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Impl>
-template <typename Input>
-auto QueuedRedis<Impl>::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, QueuedRedis<Impl>&>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Impl>
-QueuedReplies QueuedRedis<Impl>::exec() {
-    try {
-        _sanity_check();
-
-        auto replies = _impl.exec(*_connection, _cmd_num);
-
-        _rewrite_replies(replies);
-
-        _reset();
-
-        return QueuedReplies(std::move(replies));
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::discard() {
-    try {
-        _sanity_check();
-
-        _impl.discard(*_connection, _cmd_num);
-
-        _reset();
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_sanity_check() const {
-    if (!_valid) {
-        throw Error("Not in valid state");
-    }
-
-    if (_connection->broken()) {
-        throw Error("Connection is broken");
-    }
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_reset() {
-    _cmd_num = 0;
-
-    _set_cmd_indexes.clear();
-
-    _georadius_cmd_indexes.clear();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_invalidate() {
-    _valid = false;
-
-    _reset();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_rewrite_replies(std::vector<ReplyUPtr> &replies) const {
-    _rewrite_replies(_set_cmd_indexes, reply::rewrite_set_reply, replies);
-
-    _rewrite_replies(_georadius_cmd_indexes, reply::rewrite_georadius_reply, replies);
-}
-
-template <typename Impl>
-template <typename Func>
-void QueuedRedis<Impl>::_rewrite_replies(const std::vector<std::size_t> &indexes,
-                                            Func rewriter,
-                                            std::vector<ReplyUPtr> &replies) const {
-    for (auto idx : indexes) {
-        assert(idx < replies.size());
-
-        auto &reply = replies[idx];
-
-        assert(reply);
-
-        rewriter(*reply);
-    }
-}
-
-inline std::size_t QueuedReplies::size() const {
-    return _replies.size();
-}
-
-inline redisReply& QueuedReplies::get(std::size_t idx) {
-    _index_check(idx);
-
-    auto &reply = _replies[idx];
-
-    assert(reply);
-
-    return *reply;
-}
-
-template <typename Result>
-inline Result QueuedReplies::get(std::size_t idx) {
-    auto &reply = get(idx);
-
-    return reply::parse<Result>(reply);
-}
-
-template <typename Output>
-inline void QueuedReplies::get(std::size_t idx, Output output) {
-    auto &reply = get(idx);
-
-    reply::to_array(reply, output);
-}
-
-inline void QueuedReplies::_index_check(std::size_t idx) const {
-    if (idx >= size()) {
-        throw Error("Out of range");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis++.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis++.h
deleted file mode 100644
index 0da0ebb16..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis++.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-#define SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-
-#include "redis.h"
-#include "redis_cluster.h"
-#include "queued_redis.h"
-#include "sentinel.h"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis.h
deleted file mode 100644
index b54afb96b..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis.h
+++ /dev/null
@@ -1,1523 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_H
-
-#include <string>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <tuple>
-#include "connection_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class Redis {
-public:
-    Redis(const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) : _pool(pool_opts, connection_opts) {}
-
-    // Construct Redis instance with URI:
-    // "tcp://127.0.0.1", "tcp://127.0.0.1:6379", or "unix://path/to/socket"
-    explicit Redis(const std::string &uri);
-
-    Redis(const std::shared_ptr<Sentinel> &sentinel,
-            const std::string &master_name,
-            Role role,
-            const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(SimpleSentinel(sentinel, master_name, role), pool_opts, connection_opts) {}
-
-    Redis(const Redis &) = delete;
-    Redis& operator=(const Redis &) = delete;
-
-    Redis(Redis &&) = default;
-    Redis& operator=(Redis &&) = default;
-
-    Pipeline pipeline();
-
-    Transaction transaction(bool piped = false);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type;
-
-    template <typename Result, typename ...Args>
-    Result command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // CONNECTION commands.
-
-    void auth(const StringView &password);
-
-    std::string echo(const StringView &msg);
-
-    std::string ping();
-
-    std::string ping(const StringView &msg);
-
-    // After sending QUIT, only the current connection will be close, while
-    // other connections in the pool is still open. This is a strange behavior.
-    // So we DO NOT support the QUIT command. If you want to quit connection to
-    // server, just destroy the Redis object.
-    //
-    // void quit();
-
-    // We get a connection from the pool, and send the SELECT command to switch
-    // to a specified DB. However, when we try to send other commands to the
-    // given DB, we might get a different connection from the pool, and these
-    // commands, in fact, work on other DB. e.g.
-    //
-    // redis.select(1); // get a connection from the pool and switch to the 1th DB
-    // redis.get("key"); // might get another connection from the pool,
-    //                   // and try to get 'key' on the default DB
-    //
-    // Obviously, this is NOT what we expect. So we DO NOT support SELECT command.
-    // In order to select a DB, we can specify the DB index with the ConnectionOptions.
-    //
-    // However, since Pipeline and Transaction always send multiple commands on a
-    // single connection, these two classes have a *select* method.
-    //
-    // void select(long long idx);
-
-    void swapdb(long long idx1, long long idx2);
-
-    // SERVER commands.
-
-    void bgrewriteaof();
-
-    void bgsave();
-
-    long long dbsize();
-
-    void flushall(bool async = false);
-
-    void flushdb(bool async = false);
-
-    std::string info();
-
-    std::string info(const StringView &section);
-
-    long long lastsave();
-
-    void save();
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    template <typename Output>
-    void keys(const StringView &pattern, Output output);
-
-    bool move(const StringView &key, long long db);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    OptionalString randomkey();
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    long long count,
-                    Output output);
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    long long wait(long long numslaves, long long timeout);
-
-    long long wait(long long numslaves, const std::chrono::milliseconds &timeout);
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    // There's no aggregation type parameter for single key overload, since these 3 types
-    // have the same effect.
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    // If *Input* is an iterator of a container of string,
-    // we use the default weight, i.e. 1, and send
-    // *ZINTERSTORE destination numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    // If *Input* is an iterator of a container of pair<string, double>, i.e. key-weight pair,
-    // we send the command with the given weights:
-    // *ZINTERSTORE destination numkeys key [key ...]
-    // [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*
-    //
-    // The following code use the default weight:
-    //
-    // vector<string> keys = {"k1", "k2", "k3"};
-    // redis.zinterstore(destination, keys.begin(), keys.end());
-    //
-    // On the other hand, the following code use the given weights:
-    //
-    // vector<pair<string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}, {"k3", 3}};
-    // redis.zinterstore(destination, keys_with_weights.begin(), keys_with_weights.end());
-    //
-    // NOTE: `keys_with_weights` can also be of type `unordered_map<string, double>`.
-    // However, it will be slower than vector<pair<string, double>>, since we use
-    // `distance(first, last)` to calculate the *numkeys* parameter.
-    //
-    // This also applies to *ZUNIONSTORE* command.
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    // There's no aggregation type parameter for single key overload, since these 3 types
-    // have the same effect.
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    // See *zinterstore* comment for how to use this method.
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void script_exists(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void script_exists(std::initializer_list<T> il, Output output) {
-        script_exists(il.begin(), il.end(), output);
-    }
-
-    void script_flush();
-
-    void script_kill();
-
-    std::string script_load(const StringView &script);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Transaction commands.
-    void watch(const StringView &key);
-
-    template <typename Input>
-    void watch(Input first, Input last);
-
-    template <typename T>
-    void watch(std::initializer_list<T> il) {
-        watch(il.begin(), il.end());
-    }
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first ,last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class ConnectionPoolGuard {
-    public:
-        ConnectionPoolGuard(ConnectionPool &pool,
-                            Connection &connection) : _pool(pool), _connection(connection) {}
-
-        ~ConnectionPoolGuard() {
-            _pool.release(std::move(_connection));
-        }
-
-    private:
-        ConnectionPool &_pool;
-        Connection &_connection;
-    };
-
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    friend class RedisCluster;
-
-    // For internal use.
-    explicit Redis(const ConnectionSPtr &connection);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Connection &connection, Cmd cmd, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    // Pool Mode.
-    // Public constructors create a *Redis* instance with a pool.
-    // In this case, *_connection* is a null pointer, and is never used.
-    ConnectionPool _pool;
-
-    // Single Connection Mode.
-    // Private constructor creats a *Redis* instance with a single connection.
-    // This is used when we create Transaction, Pipeline and Subscriber.
-    // In this case, *_pool* is empty, and is never used.
-    ConnectionSPtr _connection;
-};
-
-}
-
-}
-
-#include "redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis.hpp b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis.hpp
deleted file mode 100644
index 3a227a6f1..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis.hpp
+++ /dev/null
@@ -1,1365 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_HPP
-
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename ...Args>
-auto Redis::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    if (_connection) {
-        // Single Connection Mode.
-        // TODO: In this case, should we reconnect?
-        if (_connection->broken()) {
-            throw Error("Connection is broken");
-        }
-
-        return _command(*_connection, cmd, std::forward<Args>(args)...);
-    } else {
-        // Pool Mode, i.e. get connection from pool.
-        auto connection = _pool.fetch();
-
-        assert(!connection.broken());
-
-        ConnectionPoolGuard guard(_pool, connection);
-
-        return _command(connection, cmd, std::forward<Args>(args)...);
-    }
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename ...Args>
-Result Redis::command(const StringView &cmd_name, Args &&...args) {
-    auto r = command(cmd_name, std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args) - 1>(),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Result, typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto Redis::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long Redis::del(Input first, Input last) {
-    if (first == last) {
-        throw Error("DEL: no key specified");
-    }
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::exists(Input first, Input last) {
-    if (first == last) {
-        throw Error("EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool Redis::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool Redis::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-template <typename Output>
-void Redis::keys(const StringView &pattern, Output output) {
-    auto reply = command(cmd::keys, pattern);
-
-    reply::to_array(*reply, output);
-}
-
-inline bool Redis::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool Redis::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void Redis::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Output>
-long long Redis::scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::scan, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return scan(cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                long long count,
-                                Output output) {
-    return scan(cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                Output output) {
-    return scan(cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::touch(Input first, Input last) {
-    if (first == last) {
-        throw Error("TOUCH: no key specified");
-    }
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::unlink(Input first, Input last) {
-    if (first == last) {
-        throw Error("UNLINK: no key specified");
-    }
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline long long Redis::wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-    return wait(numslaves, timeout.count());
-}
-
-// STRING commands.
-
-template <typename Input>
-long long Redis::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("BITOP: no key specified");
-    }
-
-    auto reply = command(cmd::bitop_range<Input>, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::mget(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("MGET: no key specified");
-    }
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void Redis::mset(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSET: no key specified");
-    }
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool Redis::msetnx(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSETNX: no key specified");
-    }
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void Redis::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void Redis::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BLPOP: no key specified");
-    }
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BRPOP: no key specified");
-    }
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString Redis::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long Redis::lpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("LPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long Redis::rpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("RPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long Redis::hdel(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HDEL: no key specified");
-    }
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void Redis::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void Redis::hmget(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("HMGET: no key specified");
-    }
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void Redis::hmset(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HMSET: no key specified");
-    }
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long Redis::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Output>
-inline void Redis::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long Redis::sadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SADD: no key specified");
-    }
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sdiff(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SDIFF: no key specified");
-    }
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    if (first == last) {
-        throw Error("SDIFFSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sinter(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SINTER: no key specified");
-    }
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sinterstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    if (first == last) {
-        throw Error("SINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::srem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SREM: no key specified");
-    }
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long Redis::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void Redis::sunion(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SUNION: no key specified");
-    }
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sunionstore(const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto Redis::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto Redis::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long Redis::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    if (first == last) {
-        throw Error("ZADD: no key specified");
-    }
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    if (first == last) {
-        throw Error("ZINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::zrem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("ZREM: no key specified");
-    }
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void Redis::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long Redis::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    if (first == last) {
-        throw Error("ZUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool Redis::pfadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("PFADD: no key specified");
-    }
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long Redis::pfcount(Input first, Input last) {
-    if (first == last) {
-        throw Error("PFCOUNT: no key specified");
-    }
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void Redis::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    if (first == last) {
-        throw Error("PFMERGE: no key specified");
-    }
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long Redis::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    if (first == last) {
-        throw Error("GEOADD: no key specified");
-    }
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::geohash(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOHASH: no key specified");
-    }
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::geopos(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOPOS: no key specified");
-    }
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result>
-Result Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    auto reply = command(cmd::eval, script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output) {
-    auto reply = command(cmd::eval, script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Result>
-Result Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-    auto reply = command(cmd::evalsha, script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    auto reply = command(cmd::evalsha, script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::script_exists(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SCRIPT EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::script_exists_range<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-// Transaction commands.
-
-template <typename Input>
-void Redis::watch(Input first, Input last) {
-    auto reply = command(cmd::watch_range<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long Redis::xack(const StringView &key, const StringView &group, Input first, Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key, const StringView &id, Input first, Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    const StringView &id,
-                    Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    Input first,
-                    Input last,
-                    Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto Redis::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        const StringView &consumer,
-                        Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup_block,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = command(cmd::xreadgroup_block_range<Input>,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr Redis::_command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    auto reply = connection.recv();
-
-    return reply;
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis_cluster.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis_cluster.h
deleted file mode 100644
index 50a221367..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis_cluster.h
+++ /dev/null
@@ -1,1395 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-
-#include <string>
-#include <chrono>
-#include <initializer_list>
-#include <tuple>
-#include "shards_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "redis.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class RedisCluster {
-public:
-    RedisCluster(const ConnectionOptions &connection_opts,
-                    const ConnectionPoolOptions &pool_opts = {}) :
-                        _pool(pool_opts, connection_opts) {}
-
-    // Construct RedisCluster with URI:
-    // "tcp://127.0.0.1" or "tcp://127.0.0.1:6379"
-    // Only need to specify one URI.
-    explicit RedisCluster(const std::string &uri);
-
-    RedisCluster(const RedisCluster &) = delete;
-    RedisCluster& operator=(const RedisCluster &) = delete;
-
-    RedisCluster(RedisCluster &&) = default;
-    RedisCluster& operator=(RedisCluster &&) = default;
-
-    Redis redis(const StringView &hash_tag);
-
-    Pipeline pipeline(const StringView &hash_tag);
-
-    Transaction transaction(const StringView &hash_tag, bool piped = false);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && IsIter<typename LastType<Key, Args...>::type>::value, void>::type;
-
-    template <typename Result, typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type;
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class Command {
-    public:
-        explicit Command(const StringView &cmd_name) : _cmd_name(cmd_name) {}
-
-        template <typename ...Args>
-        void operator()(Connection &connection, Args &&...args) const {
-            CmdArgs cmd_args;
-            cmd_args.append(_cmd_name, std::forward<Args>(args)...);
-            connection.send(cmd_args);
-        }
-
-    private:
-        StringView _cmd_name;
-    };
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, Connection &connection, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::true_type, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::false_type, Input &&first, Args &&...args);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::true_type, Input input, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::false_type, Input input, Args &&...args);
-
-    void _asking(Connection &connection);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    ShardsPool _pool;
-};
-
-}
-
-}
-
-#include "redis_cluster.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis_cluster.hpp b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis_cluster.hpp
deleted file mode 100644
index 61da3f062..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/redis_cluster.hpp
+++ /dev/null
@@ -1,1415 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-
-#include <utility>
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-#include "shards_pool.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    return _command(cmd,
-                    std::is_convertible<typename std::decay<Key>::type, StringView>(),
-                    std::forward<Key>(key),
-                    std::forward<Args>(args)...);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-        || std::is_arithmetic<typename std::decay<Key>::type>::value)
-        && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = Command(cmd_name);
-
-    return _generic_command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Result, typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type {
-    auto r = command(cmd_name, std::forward<Key>(key), std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value)
-            && IsIter<typename LastType<Key, Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args)>(),
-                        std::forward<Key>(key),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last || std::next(first) == last) {
-        throw Error("command: invalid range");
-    }
-
-    const auto &key = *first;
-    ++first;
-
-    auto cmd = [&key](Connection &connection, Input first, Input last) {
-                        CmdArgs cmd_args;
-                        cmd_args.append(key);
-                        while (first != last) {
-                            cmd_args.append(*first);
-                            ++first;
-                        }
-                        connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long RedisCluster::del(Input first, Input last) {
-    if (first == last) {
-        throw Error("DEL: no key specified");
-    }
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::exists(Input first, Input last) {
-    if (first == last) {
-        throw Error("EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool RedisCluster::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool RedisCluster::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-inline bool RedisCluster::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool RedisCluster::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void RedisCluster::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Input>
-long long RedisCluster::touch(Input first, Input last) {
-    if (first == last) {
-        throw Error("TOUCH: no key specified");
-    }
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::unlink(Input first, Input last) {
-    if (first == last) {
-        throw Error("UNLINK: no key specified");
-    }
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-template <typename Input>
-long long RedisCluster::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("BITOP: no key specified");
-    }
-
-    auto reply = _command(cmd::bitop_range<Input>, destination, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::mget(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("MGET: no key specified");
-    }
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void RedisCluster::mset(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSET: no key specified");
-    }
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool RedisCluster::msetnx(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSETNX: no key specified");
-    }
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void RedisCluster::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void RedisCluster::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BLPOP: no key specified");
-    }
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BRPOP: no key specified");
-    }
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString RedisCluster::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long RedisCluster::lpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("LPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long RedisCluster::rpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("RPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long RedisCluster::hdel(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HDEL: no key specified");
-    }
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void RedisCluster::hmget(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("HMGET: no key specified");
-    }
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void RedisCluster::hmset(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HMSET: no key specified");
-    }
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long RedisCluster::sadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SADD: no key specified");
-    }
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sdiff(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SDIFF: no key specified");
-    }
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sdiffstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    if (first == last) {
-        throw Error("SDIFFSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sinter(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SINTER: no key specified");
-    }
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sinterstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    if (first == last) {
-        throw Error("SINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::srem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SREM: no key specified");
-    }
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sunion(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SUNION: no key specified");
-    }
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sunionstore(const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto RedisCluster::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmax(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto RedisCluster::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmin(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long RedisCluster::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    if (first == last) {
-        throw Error("ZADD: no key specified");
-    }
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    if (first == last) {
-        throw Error("ZINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::zrem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("ZREM: no key specified");
-    }
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void RedisCluster::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long RedisCluster::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long RedisCluster::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    if (first == last) {
-        throw Error("ZUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool RedisCluster::pfadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("PFADD: no key specified");
-    }
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::pfcount(Input first, Input last) {
-    if (first == last) {
-        throw Error("PFCOUNT: no key specified");
-    }
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void RedisCluster::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    if (first == last) {
-        throw Error("PFMERGE: no key specified");
-    }
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long RedisCluster::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    if (first == last) {
-        throw Error("GEOADD: no key specified");
-    }
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geohash(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOHASH: no key specified");
-    }
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geopos(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOPOS: no key specified");
-    }
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result>
-Result RedisCluster::eval(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval, *keys.begin(), script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval, *keys.begin(), script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Result>
-Result RedisCluster::evalsha(const StringView &script,
-                                std::initializer_list<StringView> keys,
-                                std::initializer_list<StringView> args) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha, *keys.begin(), script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args,
-                            Output output) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = command(cmd::evalsha, *keys.begin(), script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long RedisCluster::xack(const StringView &key,
-                                const StringView &group,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            const StringView &id,
-                            Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            Input first,
-                            Input last,
-                            Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto RedisCluster::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer,
-                            Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first,
-                            Input last,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup, key, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = _command(cmd::xreadgroup_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup_block,
-                            key,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = _command(cmd::xreadgroup_block_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                                const StringView &end,
-                                const StringView &start,
-                                long long count,
-                                Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                ReplyUPtr>::type {
-    return command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                ReplyUPtr>::type {
-    auto k = std::to_string(std::forward<Key>(key));
-    return command(cmd, k, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::true_type, const StringView &key, Args &&...args) {
-    return _command(cmd, key, key, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::false_type, Input &&first, Args &&...args) {
-    return _range_command(cmd,
-                            std::is_convertible<
-                                typename std::decay<
-                                    decltype(*std::declval<Input>())>::type, StringView>(),
-                            std::forward<Input>(first),
-                            std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::true_type, Input input, Args &&...args) {
-    return _command(cmd, *input, input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::false_type, Input input, Args &&...args) {
-    return _command(cmd, std::get<0>(*input), input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, Connection &connection, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    return connection.recv();
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, const StringView &key, Args &&...args) {
-    for (auto idx = 0; idx < 2; ++idx) {
-        try {
-            auto guarded_connection = _pool.fetch(key);
-
-            return _command(cmd, guarded_connection.connection(), std::forward<Args>(args)...);
-        } catch (const IoError &err) {
-            // When master is down, one of its replicas will be promoted to be the new master.
-            // If we try to send command to the old master, we'll get an *IoError*.
-            // In this case, we need to update the slots mapping.
-            _pool.update();
-        } catch (const ClosedError &err) {
-            // Node might be removed.
-            // 1. Get up-to-date slot mapping to check if the node still exists.
-            _pool.update();
-
-            // TODO:
-            // 2. If it's NOT exist, update slot mapping, and retry.
-            // 3. If it's still exist, that means the node is down, NOT removed, throw exception.
-        } catch (const MovedError &err) {
-            // Slot mapping has been changed, update it and try again.
-            _pool.update();
-        } catch (const AskError &err) {
-            auto guarded_connection = _pool.fetch(err.node());
-            auto &connection = guarded_connection.connection();
-
-            // 1. send ASKING command.
-            _asking(connection);
-
-            // 2. resend last command.
-            try {
-                return _command(cmd, connection, std::forward<Args>(args)...);
-            } catch (const MovedError &err) {
-                throw Error("Slot migrating... ASKING node hasn't been set to IMPORTING state");
-            }
-        } // For other exceptions, just throw it.
-    }
-
-    // Possible failures:
-    // 1. Source node has already run 'CLUSTER SETSLOT xxx NODE xxx',
-    //    while the destination node has NOT run it.
-    //    In this case, client will be redirected by both nodes with MovedError.
-    // 2. Other failures...
-    throw Error("Failed to send command with key: " + std::string(key.data(), key.size()));
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/reply.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/reply.h
deleted file mode 100644
index b309de5bb..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/reply.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REPLY_H
-#define SEWENEW_REDISPLUSPLUS_REPLY_H
-
-#include <cassert>
-#include <string>
-#include <memory>
-#include <functional>
-#include <tuple>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ReplyDeleter {
-    void operator()(redisReply *reply) const {
-        if (reply != nullptr) {
-            freeReplyObject(reply);
-        }
-    }
-};
-
-using ReplyUPtr = std::unique_ptr<redisReply, ReplyDeleter>;
-
-namespace reply {
-
-template <typename T>
-struct ParseTag {};
-
-template <typename T>
-inline T parse(redisReply &reply) {
-    return parse(ParseTag<T>(), reply);
-}
-
-void parse(ParseTag<void>, redisReply &reply);
-
-std::string parse(ParseTag<std::string>, redisReply &reply);
-
-long long parse(ParseTag<long long>, redisReply &reply);
-
-double parse(ParseTag<double>, redisReply &reply);
-
-bool parse(ParseTag<bool>, redisReply &reply);
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply);
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply);
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output);
-
-inline bool is_error(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ERROR;
-}
-
-inline bool is_nil(redisReply &reply) {
-    return reply.type == REDIS_REPLY_NIL;
-}
-
-inline bool is_string(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STRING;
-}
-
-inline bool is_status(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STATUS;
-}
-
-inline bool is_integer(redisReply &reply) {
-    return reply.type == REDIS_REPLY_INTEGER;
-}
-
-inline bool is_array(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ARRAY;
-}
-
-std::string to_status(redisReply &reply);
-
-template <typename Output>
-void to_array(redisReply &reply, Output output);
-
-// Rewrite set reply to bool type
-void rewrite_set_reply(redisReply &reply);
-
-// Rewrite georadius reply to OptionalLongLong type
-void rewrite_georadius_reply(redisReply &reply);
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString>;
-
-}
-
-// Inline implementations.
-
-namespace reply {
-
-namespace detail {
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        auto *sub_reply = reply.element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null array element reply");
-        }
-
-        *output = parse<typename IterType<Output>::type>(*sub_reply);
-
-        ++output;
-    }
-}
-
-bool is_flat_array(redisReply &reply);
-
-template <typename Output>
-void to_flat_array(redisReply &reply, Output output) {
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    if (reply.elements % 2 != 0) {
-        throw ProtoError("Not string pair array reply");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; idx += 2) {
-        auto *key_reply = reply.element[idx];
-        auto *val_reply = reply.element[idx + 1];
-        if (key_reply == nullptr || val_reply == nullptr) {
-            throw ProtoError("Null string array reply");
-        }
-
-        using Pair = typename IterType<Output>::type;
-        using FirstType = typename std::decay<typename Pair::first_type>::type;
-        using SecondType = typename std::decay<typename Pair::second_type>::type;
-        *output = std::make_pair(parse<FirstType>(*key_reply),
-                                    parse<SecondType>(*val_reply));
-
-        ++output;
-    }
-}
-
-template <typename Output>
-void to_array(std::true_type, redisReply &reply, Output output) {
-    if (is_flat_array(reply)) {
-        to_flat_array(reply, output);
-    } else {
-        to_array(reply, output);
-    }
-}
-
-template <typename Output>
-void to_array(std::false_type, redisReply &reply, Output output) {
-    to_array(reply, output);
-}
-
-template <typename T>
-std::tuple<T> parse_tuple(redisReply **reply, std::size_t idx) {
-    assert(reply != nullptr);
-
-    auto *sub_reply = reply[idx];
-    if (sub_reply == nullptr) {
-        throw ProtoError("Null reply");
-    }
-
-    return std::make_tuple(parse<T>(*sub_reply));
-}
-
-template <typename T, typename ...Args>
-auto parse_tuple(redisReply **reply, std::size_t idx) ->
-    typename std::enable_if<sizeof...(Args) != 0, std::tuple<T, Args...>>::type {
-    assert(reply != nullptr);
-
-    return std::tuple_cat(parse_tuple<T>(reply, idx),
-                            parse_tuple<Args...>(reply, idx + 1));
-}
-
-}
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply) {
-    if (reply::is_nil(reply)) {
-        return {};
-    }
-
-    return Optional<T>(parse<T>(reply));
-}
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != 2) {
-        throw ProtoError("NOT key-value PAIR reply");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null PAIR reply");
-    }
-
-    auto *first = reply.element[0];
-    auto *second = reply.element[1];
-    if (first == nullptr || second == nullptr) {
-        throw ProtoError("Null pair reply");
-    }
-
-    return std::make_pair(parse<typename std::decay<T>::type>(*first),
-                            parse<typename std::decay<U>::type>(*second));
-}
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply) {
-    constexpr auto size = sizeof...(Args);
-
-    static_assert(size > 0, "DO NOT support parsing tuple with 0 element");
-
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != size) {
-        throw ProtoError("Expect tuple reply with " + std::to_string(size) + "elements");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null TUPLE reply");
-    }
-
-    return detail::parse_tuple<Args...>(reply.element, 0);
-}
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::back_inserter(container));
-
-    return container;
-}
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::inserter(container, container.end()));
-
-    return container;
-}
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output) {
-    if (reply.elements != 2 || reply.element == nullptr) {
-        throw ProtoError("Invalid scan reply");
-    }
-
-    auto *cursor_reply = reply.element[0];
-    auto *data_reply = reply.element[1];
-    if (cursor_reply == nullptr || data_reply == nullptr) {
-        throw ProtoError("Invalid cursor reply or data reply");
-    }
-
-    auto cursor_str = reply::parse<std::string>(*cursor_reply);
-    auto new_cursor = 0;
-    try {
-        new_cursor = std::stoll(cursor_str);
-    } catch (const std::exception &e) {
-        throw ProtoError("Invalid cursor reply: " + cursor_str);
-    }
-
-    reply::to_array(*data_reply, output);
-
-    return new_cursor;
-}
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    detail::to_array(typename IsKvPairIter<Output>::type(), reply, output);
-}
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    if (!is_array(reply) || reply.elements != 4) {
-        throw ProtoError("expect array reply with 4 elements");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        if (reply.element[idx] == nullptr) {
-            throw ProtoError("null array reply");
-        }
-    }
-
-    auto num = parse<long long>(*(reply.element[0]));
-    auto start = parse<OptionalString>(*(reply.element[1]));
-    auto end = parse<OptionalString>(*(reply.element[2]));
-
-    auto &entry_reply = *(reply.element[3]);
-    if (!is_nil(entry_reply)) {
-        to_array(entry_reply, output);
-    }
-
-    return std::make_tuple(num, std::move(start), std::move(end));
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REPLY_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/sentinel.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/sentinel.h
deleted file mode 100644
index e80d1e56a..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/sentinel.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SENTINEL_H
-#define SEWENEW_REDISPLUSPLUS_SENTINEL_H
-
-#include <string>
-#include <list>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include "connection.h"
-#include "shards.h"
-#include "reply.h"
-
-namespace sw {
-
-namespace redis {
-
-struct SentinelOptions {
-    std::vector<std::pair<std::string, int>> nodes;
-
-    std::string password;
-
-    bool keep_alive = true;
-
-    std::chrono::milliseconds connect_timeout{100};
-
-    std::chrono::milliseconds socket_timeout{100};
-
-    std::chrono::milliseconds retry_interval{100};
-
-    std::size_t max_retry = 2;
-};
-
-class Sentinel {
-public:
-    explicit Sentinel(const SentinelOptions &sentinel_opts);
-
-    Sentinel(const Sentinel &) = delete;
-    Sentinel& operator=(const Sentinel &) = delete;
-
-    Sentinel(Sentinel &&) = delete;
-    Sentinel& operator=(Sentinel &&) = delete;
-
-    ~Sentinel() = default;
-
-private:
-    Connection master(const std::string &master_name, const ConnectionOptions &opts);
-
-    Connection slave(const std::string &master_name, const ConnectionOptions &opts);
-
-    class Iterator;
-
-    friend class SimpleSentinel;
-
-    std::list<ConnectionOptions> _parse_options(const SentinelOptions &opts) const;
-
-    Optional<Node> _get_master_addr_by_name(Connection &connection, const StringView &name);
-
-    std::vector<Node> _get_slave_addr_by_name(Connection &connection, const StringView &name);
-
-    Connection _connect_redis(const Node &node, ConnectionOptions opts);
-
-    Role _get_role(Connection &connection);
-
-    std::vector<Node> _parse_slave_info(redisReply &reply) const;
-
-    std::list<Connection> _healthy_sentinels;
-
-    std::list<ConnectionOptions> _broken_sentinels;
-
-    SentinelOptions _sentinel_opts;
-
-    std::mutex _mutex;
-};
-
-class SimpleSentinel {
-public:
-    SimpleSentinel(const std::shared_ptr<Sentinel> &sentinel,
-                    const std::string &master_name,
-                    Role role);
-
-    SimpleSentinel() = default;
-
-    SimpleSentinel(const SimpleSentinel &) = default;
-    SimpleSentinel& operator=(const SimpleSentinel &) = default;
-
-    SimpleSentinel(SimpleSentinel &&) = default;
-    SimpleSentinel& operator=(SimpleSentinel &&) = default;
-
-    ~SimpleSentinel() = default;
-
-    explicit operator bool() const {
-        return bool(_sentinel);
-    }
-
-    Connection create(const ConnectionOptions &opts);
-
-private:
-    std::shared_ptr<Sentinel> _sentinel;
-
-    std::string _master_name;
-
-    Role _role = Role::MASTER;
-};
-
-class StopIterError : public Error {
-public:
-    StopIterError() : Error("StopIterError") {}
-
-    StopIterError(const StopIterError &) = default;
-    StopIterError& operator=(const StopIterError &) = default;
-
-    StopIterError(StopIterError &&) = default;
-    StopIterError& operator=(StopIterError &&) = default;
-
-    virtual ~StopIterError() = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SENTINEL_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/shards.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/shards.h
deleted file mode 100644
index a0593acbc..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/shards.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_H
-
-#include <string>
-#include <map>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-using Slot = std::size_t;
-
-struct SlotRange {
-    Slot min;
-    Slot max;
-};
-
-inline bool operator<(const SlotRange &lhs, const SlotRange &rhs) {
-    return lhs.max < rhs.max;
-}
-
-struct Node {
-    std::string host;
-    int port;
-};
-
-inline bool operator==(const Node &lhs, const Node &rhs) {
-    return lhs.host == rhs.host && lhs.port == rhs.port;
-}
-
-struct NodeHash {
-    std::size_t operator()(const Node &node) const noexcept {
-        auto host_hash = std::hash<std::string>{}(node.host);
-        auto port_hash = std::hash<int>{}(node.port);
-        return host_hash ^ (port_hash << 1);
-    }
-};
-
-using Shards = std::map<SlotRange, Node>;
-
-class RedirectionError : public ReplyError {
-public:
-    RedirectionError(const std::string &msg);
-
-    RedirectionError(const RedirectionError &) = default;
-    RedirectionError& operator=(const RedirectionError &) = default;
-
-    RedirectionError(RedirectionError &&) = default;
-    RedirectionError& operator=(RedirectionError &&) = default;
-
-    virtual ~RedirectionError() = default;
-
-    Slot slot() const {
-        return _slot;
-    }
-
-    const Node& node() const {
-        return _node;
-    }
-
-private:
-    std::pair<Slot, Node> _parse_error(const std::string &msg) const;
-
-    Slot _slot = 0;
-    Node _node;
-};
-
-class MovedError : public RedirectionError {
-public:
-    explicit MovedError(const std::string &msg) : RedirectionError(msg) {}
-
-    MovedError(const MovedError &) = default;
-    MovedError& operator=(const MovedError &) = default;
-
-    MovedError(MovedError &&) = default;
-    MovedError& operator=(MovedError &&) = default;
-
-    virtual ~MovedError() = default;
-};
-
-class AskError : public RedirectionError {
-public:
-    explicit AskError(const std::string &msg) : RedirectionError(msg) {}
-
-    AskError(const AskError &) = default;
-    AskError& operator=(const AskError &) = default;
-
-    AskError(AskError &&) = default;
-    AskError& operator=(AskError &&) = default;
-
-    virtual ~AskError() = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/shards_pool.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/shards_pool.h
deleted file mode 100644
index 1184806e9..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/shards_pool.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-
-#include <cassert>
-#include <unordered_map>
-#include <string>
-#include <random>
-#include <memory>
-#include "reply.h"
-#include "connection_pool.h"
-#include "shards.h"
-
-namespace sw {
-
-namespace redis {
-
-using ConnectionPoolSPtr = std::shared_ptr<ConnectionPool>;
-
-class GuardedConnection {
-public:
-    GuardedConnection(const ConnectionPoolSPtr &pool) : _pool(pool),
-                                                        _connection(_pool->fetch()) {
-        assert(!_connection.broken());
-    }
-
-    GuardedConnection(const GuardedConnection &) = delete;
-    GuardedConnection& operator=(const GuardedConnection &) = delete;
-
-    GuardedConnection(GuardedConnection &&) = default;
-    GuardedConnection& operator=(GuardedConnection &&) = default;
-
-    ~GuardedConnection() {
-        _pool->release(std::move(_connection));
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPoolSPtr _pool;
-    Connection _connection;
-};
-
-class ShardsPool {
-public:
-    ShardsPool() = default;
-
-    ShardsPool(const ShardsPool &that) = delete;
-    ShardsPool& operator=(const ShardsPool &that) = delete;
-
-    ShardsPool(ShardsPool &&that);
-    ShardsPool& operator=(ShardsPool &&that);
-
-    ~ShardsPool() = default;
-
-    ShardsPool(const ConnectionPoolOptions &pool_opts,
-                const ConnectionOptions &connection_opts);
-
-    // Fetch a connection by key.
-    GuardedConnection fetch(const StringView &key);
-
-    // Randomly pick a connection.
-    GuardedConnection fetch();
-
-    // Fetch a connection by node.
-    GuardedConnection fetch(const Node &node);
-
-    void update();
-
-    ConnectionOptions connection_options(const StringView &key);
-
-    ConnectionOptions connection_options();
-
-private:
-    void _move(ShardsPool &&that);
-
-    void _init_pool(const Shards &shards);
-
-    Shards _cluster_slots(Connection &connection) const;
-
-    ReplyUPtr _cluster_slots_command(Connection &connection) const;
-
-    Shards _parse_reply(redisReply &reply) const;
-
-    std::pair<SlotRange, Node> _parse_slot_info(redisReply &reply) const;
-
-    // Get slot by key.
-    std::size_t _slot(const StringView &key) const;
-
-    // Randomly pick a slot.
-    std::size_t _slot() const;
-
-    ConnectionPoolSPtr& _get_pool(Slot slot);
-
-    GuardedConnection _fetch(Slot slot);
-
-    ConnectionOptions _connection_options(Slot slot);
-
-    using NodeMap = std::unordered_map<Node, ConnectionPoolSPtr, NodeHash>;
-
-    NodeMap::iterator _add_node(const Node &node);
-
-    ConnectionPoolOptions _pool_opts;
-
-    ConnectionOptions _connection_opts;
-
-    Shards _shards;
-
-    NodeMap _pools;
-
-    std::mutex _mutex;
-
-    static const std::size_t SHARDS = 16383;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/subscriber.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/subscriber.h
deleted file mode 100644
index 8b7c5cfb4..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/subscriber.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-#define SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-
-#include <unordered_map>
-#include <string>
-#include <functional>
-#include "connection.h"
-#include "reply.h"
-#include "command.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-// @NOTE: Subscriber is NOT thread-safe.
-// Subscriber uses callbacks to handle messages. There are 6 kinds of messages:
-// 1) MESSAGE: message sent to a channel.
-// 2) PMESSAGE: message sent to channels of a given pattern.
-// 3) SUBSCRIBE: meta message sent when we successfully subscribe to a channel.
-// 4) UNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel.
-// 5) PSUBSCRIBE: meta message sent when we successfully subscribe to a channel pattern.
-// 6) PUNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel pattern.
-//
-// Use Subscriber::on_message(MsgCallback) to set the callback function for message of
-// *MESSAGE* type, and the callback interface is:
-// void (std::string channel, std::string msg)
-//
-// Use Subscriber::on_pmessage(PatternMsgCallback) to set the callback function for message of
-// *PMESSAGE* type, and the callback interface is:
-// void (std::string pattern, std::string channel, std::string msg)
-//
-// Messages of other types are called *META MESSAGE*, they have the same callback interface.
-// Use Subscriber::on_meta(MetaCallback) to set the callback function:
-// void (Subscriber::MsgType type, OptionalString channel, long long num)
-//
-// NOTE: If we haven't subscribe/psubscribe to any channel/pattern, and try to
-// unsubscribe/punsubscribe without any parameter, i.e. unsubscribe/punsubscribe all
-// channels/patterns, *channel* will be null. So the second parameter of meta callback
-// is of type *OptionalString*.
-//
-// All these callback interfaces pass std::string by value, and you can take their ownership
-// (i.e. std::move) safely.
-//
-// If you don't set callback for a specific kind of message, Subscriber::consume() will
-// receive the message, and ignore it, i.e. no callback will be called.
-class Subscriber {
-public:
-    Subscriber(const Subscriber &) = delete;
-    Subscriber& operator=(const Subscriber &) = delete;
-
-    Subscriber(Subscriber &&) = default;
-    Subscriber& operator=(Subscriber &&) = default;
-
-    ~Subscriber() = default;
-
-    enum class MsgType {
-        SUBSCRIBE,
-        UNSUBSCRIBE,
-        PSUBSCRIBE,
-        PUNSUBSCRIBE,
-        MESSAGE,
-        PMESSAGE
-    };
-
-    template <typename MsgCb>
-    void on_message(MsgCb msg_callback);
-
-    template <typename PMsgCb>
-    void on_pmessage(PMsgCb pmsg_callback);
-
-    template <typename MetaCb>
-    void on_meta(MetaCb meta_callback);
-
-    void subscribe(const StringView &channel);
-
-    template <typename Input>
-    void subscribe(Input first, Input last);
-
-    template <typename T>
-    void subscribe(std::initializer_list<T> channels) {
-        subscribe(channels.begin(), channels.end());
-    }
-
-    void unsubscribe();
-
-    void unsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void unsubscribe(Input first, Input last);
-
-    template <typename T>
-    void unsubscribe(std::initializer_list<T> channels) {
-        unsubscribe(channels.begin(), channels.end());
-    }
-
-    void psubscribe(const StringView &pattern);
-
-    template <typename Input>
-    void psubscribe(Input first, Input last);
-
-    template <typename T>
-    void psubscribe(std::initializer_list<T> channels) {
-        psubscribe(channels.begin(), channels.end());
-    }
-
-    void punsubscribe();
-
-    void punsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void punsubscribe(Input first, Input last);
-
-    template <typename T>
-    void punsubscribe(std::initializer_list<T> channels) {
-        punsubscribe(channels.begin(), channels.end());
-    }
-
-    void consume();
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    explicit Subscriber(Connection connection);
-
-    MsgType _msg_type(redisReply *reply) const;
-
-    void _check_connection();
-
-    void _handle_message(redisReply &reply);
-
-    void _handle_pmessage(redisReply &reply);
-
-    void _handle_meta(MsgType type, redisReply &reply);
-
-    using MsgCallback = std::function<void (std::string channel, std::string msg)>;
-
-    using PatternMsgCallback = std::function<void (std::string pattern,
-                                                    std::string channel,
-                                                    std::string msg)>;
-
-    using MetaCallback = std::function<void (MsgType type,
-                                                OptionalString channel,
-                                                long long num)>;
-
-    using TypeIndex = std::unordered_map<std::string, MsgType>;
-    static const TypeIndex _msg_type_index;
-
-    Connection _connection;
-
-    MsgCallback _msg_callback = nullptr;
-
-    PatternMsgCallback _pmsg_callback = nullptr;
-
-    MetaCallback _meta_callback = nullptr;
-};
-
-template <typename MsgCb>
-void Subscriber::on_message(MsgCb msg_callback) {
-    _msg_callback = msg_callback;
-}
-
-template <typename PMsgCb>
-void Subscriber::on_pmessage(PMsgCb pmsg_callback) {
-    _pmsg_callback = pmsg_callback;
-}
-
-template <typename MetaCb>
-void Subscriber::on_meta(MetaCb meta_callback) {
-    _meta_callback = meta_callback;
-}
-
-template <typename Input>
-void Subscriber::subscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::subscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::unsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::unsubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::psubscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::psubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::punsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::punsubscribe_range(_connection, first, last);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/transaction.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/transaction.h
deleted file mode 100644
index f19f24889..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/transaction.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-#define SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class TransactionImpl {
-public:
-    explicit TransactionImpl(bool piped) : _piped(piped) {}
-
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args);
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t cmd_num);
-
-private:
-    void _open_transaction(Connection &connection);
-
-    void _close_transaction();
-
-    void _get_queued_reply(Connection &connection);
-
-    void _get_queued_replies(Connection &connection, std::size_t cmd_num);
-
-    std::vector<ReplyUPtr> _exec(Connection &connection);
-
-    void _discard(Connection &connection);
-
-    bool _in_transaction = false;
-
-    bool _piped;
-};
-
-template <typename Cmd, typename ...Args>
-void TransactionImpl::command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    if (!_in_transaction) {
-        _open_transaction(connection);
-    }
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    if (!_piped) {
-        _get_queued_reply(connection);
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TRANSACTION_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/utils.h b/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/utils.h
deleted file mode 100644
index e29e64e14..000000000
--- a/ext/redis-plus-plus-1.1.1/install/centos8/include/sw/redis++/utils.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_UTILS_H
-
-#include <cstring>
-#include <string>
-#include <type_traits>
-
-namespace sw {
-
-namespace redis {
-
-// By now, not all compilers support std::string_view,
-// so we make our own implementation.
-class StringView {
-public:
-    constexpr StringView() noexcept = default;
-
-    constexpr StringView(const char *data, std::size_t size) : _data(data), _size(size) {}
-
-    StringView(const char *data) : _data(data), _size(std::strlen(data)) {}
-
-    StringView(const std::string &str) : _data(str.data()), _size(str.size()) {}
-
-    constexpr StringView(const StringView &) noexcept = default;
-
-    StringView& operator=(const StringView &) noexcept = default;
-
-    constexpr const char* data() const noexcept {
-        return _data;
-    }
-
-    constexpr std::size_t size() const noexcept {
-        return _size;
-    }
-
-private:
-    const char *_data = nullptr;
-    std::size_t _size = 0;
-};
-
-template <typename T>
-class Optional {
-public:
-    Optional() = default;
-
-    Optional(const Optional &) = default;
-    Optional& operator=(const Optional &) = default;
-
-    Optional(Optional &&) = default;
-    Optional& operator=(Optional &&) = default;
-
-    ~Optional() = default;
-
-    template <typename ...Args>
-    explicit Optional(Args &&...args) : _value(true, T(std::forward<Args>(args)...)) {}
-
-    explicit operator bool() const {
-        return _value.first;
-    }
-
-    T& value() {
-        return _value.second;
-    }
-
-    const T& value() const {
-        return _value.second;
-    }
-
-    T* operator->() {
-        return &(_value.second);
-    }
-
-    const T* operator->() const {
-        return &(_value.second);
-    }
-
-    T& operator*() {
-        return _value.second;
-    }
-
-    const T& operator*() const {
-        return _value.second;
-    }
-
-private:
-    std::pair<bool, T> _value;
-};
-
-using OptionalString = Optional<std::string>;
-
-using OptionalLongLong = Optional<long long>;
-
-using OptionalDouble = Optional<double>;
-
-using OptionalStringPair = Optional<std::pair<std::string, std::string>>;
-
-template <typename ...>
-struct IsKvPair : std::false_type {};
-
-template <typename T, typename U>
-struct IsKvPair<std::pair<T, U>> : std::true_type {};
-
-template <typename ...>
-using Void = void;
-
-template <typename T, typename U = Void<>>
-struct IsInserter : std::false_type {};
-
-template <typename T>
-//struct IsInserter<T, Void<typename T::container_type>> : std::true_type {};
-struct IsInserter<T,
-    typename std::enable_if<!std::is_void<typename T::container_type>::value>::type>
-        : std::true_type {};
-
-template <typename Iter, typename T = Void<>>
-struct IterType {
-    using type = typename std::iterator_traits<Iter>::value_type;
-};
-
-template <typename Iter>
-//struct IterType<Iter, Void<typename Iter::container_type>> {
-struct IterType<Iter,
-    //typename std::enable_if<std::is_void<typename Iter::value_type>::value>::type> {
-    typename std::enable_if<IsInserter<Iter>::value>::type> {
-    using type = typename std::decay<typename Iter::container_type::value_type>::type;
-};
-
-template <typename Iter, typename T = Void<>>
-struct IsIter : std::false_type {};
-
-template <typename Iter>
-struct IsIter<Iter, typename std::enable_if<IsInserter<Iter>::value>::type> : std::true_type {};
-
-template <typename Iter>
-//struct IsIter<Iter, Void<typename std::iterator_traits<Iter>::iterator_category>>
-struct IsIter<Iter,
-    typename std::enable_if<!std::is_void<
-        typename std::iterator_traits<Iter>::value_type>::value>::type>
-            : std::integral_constant<bool, !std::is_convertible<Iter, StringView>::value> {};
-
-template <typename T>
-struct IsKvPairIter : IsKvPair<typename IterType<T>::type> {};
-
-template <typename T, typename Tuple>
-struct TupleWithType : std::false_type {};
-
-template <typename T>
-struct TupleWithType<T, std::tuple<>> : std::false_type {};
-
-template <typename T, typename U, typename ...Args>
-struct TupleWithType<T, std::tuple<U, Args...>> : TupleWithType<T, std::tuple<Args...>> {};
-
-template <typename T, typename ...Args>
-struct TupleWithType<T, std::tuple<T, Args...>> : std::true_type {};
-
-template <std::size_t ...Is>
-struct IndexSequence {};
-
-template <std::size_t I, std::size_t ...Is>
-struct MakeIndexSequence : MakeIndexSequence<I - 1, I - 1, Is...> {};
-
-template <std::size_t ...Is>
-struct MakeIndexSequence<0, Is...> : IndexSequence<Is...> {};
-
-// NthType and NthValue are taken from
-// https://stackoverflow.com/questions/14261183
-template <std::size_t I, typename ...Args>
-struct NthType {};
-
-template <typename Arg, typename ...Args>
-struct NthType<0, Arg, Args...> {
-    using type = Arg;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-struct NthType<I, Arg, Args...> {
-    using type = typename NthType<I - 1, Args...>::type;
-};
-
-template <typename ...Args>
-struct LastType {
-    using type = typename NthType<sizeof...(Args) - 1, Args...>::type;
-};
-
-struct InvalidLastType {};
-
-template <>
-struct LastType<> {
-    using type = InvalidLastType;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&arg, Args &&...)
-    -> typename std::enable_if<(I == 0), decltype(std::forward<Arg>(arg))>::type {
-    return std::forward<Arg>(arg);
-}
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&, Args &&...args)
-    -> typename std::enable_if<(I > 0),
-            decltype(std::forward<typename NthType<I, Arg, Args...>::type>(
-                    std::declval<typename NthType<I, Arg, Args...>::type>()))>::type {
-    return std::forward<typename NthType<I, Arg, Args...>::type>(
-            NthValue<I - 1>(std::forward<Args>(args)...));
-}
-
-template <typename ...Args>
-auto LastValue(Args &&...args)
-    -> decltype(std::forward<typename LastType<Args...>::type>(
-            std::declval<typename LastType<Args...>::type>())) {
-    return std::forward<typename LastType<Args...>::type>(
-            NthValue<sizeof...(Args) - 1>(std::forward<Args>(args)...));
-}
-
-template <typename T, typename = Void<>>
-struct HasPushBack : std::false_type {};
-
-template <typename T>
-struct HasPushBack<T,
-    typename std::enable_if<
-        std::is_void<decltype(
-            std::declval<T>().push_back(std::declval<typename T::value_type>())
-                )>::value>::type> : std::true_type {};
-
-template <typename T, typename = Void<>>
-struct HasInsert : std::false_type {};
-
-template <typename T>
-struct HasInsert<T,
-    typename std::enable_if<
-        std::is_same<
-            decltype(std::declval<T>().insert(std::declval<typename T::const_iterator>(),
-                                                std::declval<typename T::value_type>())),
-            typename T::iterator>::value>::type> : std::true_type {};
-
-template <typename T>
-struct IsSequenceContainer
-    : std::integral_constant<bool,
-        HasPushBack<T>::value
-            && !std::is_same<typename std::decay<T>::type, std::string>::value> {};
-
-template <typename T>
-struct IsAssociativeContainer
-    : std::integral_constant<bool,
-        HasInsert<T>::value && !HasPushBack<T>::value> {};
-
-uint16_t crc16(const char *buf, int len);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_UTILS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/centos8/lib/libredis++.a b/ext/redis-plus-plus-1.1.1/install/centos8/lib/libredis++.a
deleted file mode 100644
index fbf88b667..000000000
Binary files a/ext/redis-plus-plus-1.1.1/install/centos8/lib/libredis++.a and /dev/null differ
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command.h
deleted file mode 100644
index 3a4b24c5e..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command.h
+++ /dev/null
@@ -1,2233 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_H
-
-#include <cassert>
-#include <ctime>
-#include <string>
-#include <chrono>
-#include "connection.h"
-#include "command_options.h"
-#include "command_args.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-// CONNECTION command.
-inline void auth(Connection &connection, const StringView &password) {
-    connection.send("AUTH %b", password.data(), password.size());
-}
-
-inline void echo(Connection &connection, const StringView &msg) {
-    connection.send("ECHO %b", msg.data(), msg.size());
-}
-
-inline void ping(Connection &connection) {
-    connection.send("PING");
-}
-
-inline void quit(Connection &connection) {
-    connection.send("QUIT");
-}
-
-inline void ping(Connection &connection, const StringView &msg) {
-    // If *msg* is empty, Redis returns am empty reply of REDIS_REPLY_STRING type.
-    connection.send("PING %b", msg.data(), msg.size());
-}
-
-inline void select(Connection &connection, long long idx) {
-    connection.send("SELECT %lld", idx);
-}
-
-inline void swapdb(Connection &connection, long long idx1, long long idx2) {
-    connection.send("SWAPDB %lld %lld", idx1, idx2);
-}
-
-// SERVER commands.
-
-inline void bgrewriteaof(Connection &connection) {
-    connection.send("BGREWRITEAOF");
-}
-
-inline void bgsave(Connection &connection) {
-    connection.send("BGSAVE");
-}
-
-inline void dbsize(Connection &connection) {
-    connection.send("DBSIZE");
-}
-
-inline void flushall(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHALL ASYNC");
-    } else {
-        connection.send("FLUSHALL");
-    }
-}
-
-inline void flushdb(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHDB ASYNC");
-    } else {
-        connection.send("FLUSHDB");
-    }
-}
-
-inline void info(Connection &connection) {
-    connection.send("INFO");
-}
-
-inline void info(Connection &connection, const StringView &section) {
-    connection.send("INFO %b", section.data(), section.size());
-}
-
-inline void lastsave(Connection &connection) {
-    connection.send("LASTSAVE");
-}
-
-inline void save(Connection &connection) {
-    connection.send("SAVE");
-}
-
-// KEY commands.
-
-inline void del(Connection &connection, const StringView &key) {
-    connection.send("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void del_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void dump(Connection &connection, const StringView &key) {
-    connection.send("DUMP %b", key.data(), key.size());
-}
-
-inline void exists(Connection &connection, const StringView &key) {
-    connection.send("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void expire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("EXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void expireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("EXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void keys(Connection &connection, const StringView &pattern) {
-    connection.send("KEYS %b", pattern.data(), pattern.size());
-}
-
-inline void move(Connection &connection, const StringView &key, long long db) {
-    connection.send("MOVE %b %lld",
-                    key.data(), key.size(),
-                    db);
-}
-
-inline void persist(Connection &connection, const StringView &key) {
-    connection.send("PERSIST %b", key.data(), key.size());
-}
-
-inline void pexpire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("PEXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void pexpireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("PEXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void pttl(Connection &connection, const StringView &key) {
-    connection.send("PTTL %b", key.data(), key.size());
-}
-
-inline void randomkey(Connection &connection) {
-    connection.send("RANDOMKEY");
-}
-
-inline void rename(Connection &connection,
-                    const StringView &key,
-                    const StringView &newkey) {
-    connection.send("RENAME %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-inline void renamenx(Connection &connection,
-                        const StringView &key,
-                        const StringView &newkey) {
-    connection.send("RENAMENX %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-void restore(Connection &connection,
-                const StringView &key,
-                const StringView &val,
-                long long ttl,
-                bool replace);
-
-inline void scan(Connection &connection,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SCAN %lld MATCH %b COUNT %lld",
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void touch(Connection &connection, const StringView &key) {
-    connection.send("TOUCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void touch_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "TOUCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void ttl(Connection &connection, const StringView &key) {
-    connection.send("TTL %b", key.data(), key.size());
-}
-
-inline void type(Connection &connection, const StringView &key) {
-    connection.send("TYPE %b", key.data(), key.size());
-}
-
-inline void unlink(Connection &connection, const StringView &key) {
-    connection.send("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unlink_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void wait(Connection &connection, long long numslave, long long timeout) {
-    connection.send("WAIT %lld %lld", numslave, timeout);
-}
-
-// STRING commands.
-
-inline void append(Connection &connection, const StringView &key, const StringView &str) {
-    connection.send("APPEND %b %b",
-                    key.data(), key.size(),
-                    str.data(), str.size());
-}
-
-inline void bitcount(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("BITCOUNT %b %lld %lld",
-                    key.data(), key.size(),
-                    start, end);
-}
-
-void bitop(Connection &connection,
-            BitOp op,
-            const StringView &destination,
-            const StringView &key);
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last);
-
-inline void bitpos(Connection &connection,
-                    const StringView &key,
-                    long long bit,
-                    long long start,
-                    long long end) {
-    connection.send("BITPOS %b %lld %lld %lld",
-                    key.data(), key.size(),
-                    bit,
-                    start,
-                    end);
-}
-
-inline void decr(Connection &connection, const StringView &key) {
-    connection.send("DECR %b", key.data(), key.size());
-}
-
-inline void decrby(Connection &connection, const StringView &key, long long decrement) {
-    connection.send("DECRBY %b %lld",
-                    key.data(), key.size(),
-                    decrement);
-}
-
-inline void get(Connection &connection, const StringView &key) {
-    connection.send("GET %b",
-                    key.data(), key.size());
-}
-
-inline void getbit(Connection &connection, const StringView &key, long long offset) {
-    connection.send("GETBIT %b %lld",
-                    key.data(), key.size(),
-                    offset);
-}
-
-inline void getrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("GETRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    end);
-}
-
-inline void getset(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("GETSET %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void incr(Connection &connection, const StringView &key) {
-    connection.send("INCR %b", key.data(), key.size());
-}
-
-inline void incrby(Connection &connection, const StringView &key, long long increment) {
-    connection.send("INCRBY %b %lld",
-                    key.data(), key.size(),
-                    increment);
-}
-
-inline void incrbyfloat(Connection &connection, const StringView &key, double increment) {
-    connection.send("INCRBYFLOAT %b %f",
-                    key.data(), key.size(),
-                    increment);
-}
-
-template <typename Input>
-inline void mget(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void mset(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void msetnx(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void psetex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("PSETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-void set(Connection &connection,
-            const StringView &key,
-            const StringView &val,
-            long long ttl,
-            UpdateType type);
-
-inline void setex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("SETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-inline void setnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("SETNX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void setrange(Connection &connection,
-                        const StringView &key,
-                        long long offset,
-                        const StringView &val) {
-    connection.send("SETRANGE %b %lld %b",
-                    key.data(), key.size(),
-                    offset,
-                    val.data(), val.size());
-}
-
-inline void strlen(Connection &connection, const StringView &key) {
-    connection.send("STRLEN %b", key.data(), key.size());
-}
-
-// LIST commands.
-
-inline void blpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BLPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void blpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BRPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void brpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination,
-                        long long timeout) {
-    connection.send("BRPOPLPUSH %b %b %lld",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    timeout);
-}
-
-inline void lindex(Connection &connection, const StringView &key, long long index) {
-    connection.send("LINDEX %b %lld",
-                    key.data(), key.size(),
-                    index);
-}
-
-void linsert(Connection &connection,
-                const StringView &key,
-                InsertPosition position,
-                const StringView &pivot,
-                const StringView &val);
-
-inline void llen(Connection &connection,
-                    const StringView &key) {
-    connection.send("LLEN %b", key.data(), key.size());
-}
-
-inline void lpop(Connection &connection, const StringView &key) {
-    connection.send("LPOP %b",
-                    key.data(), key.size());
-}
-
-inline void lpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void lpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void lpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void lrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void lrem(Connection &connection,
-                    const StringView &key,
-                    long long count,
-                    const StringView &val) {
-    connection.send("LREM %b %lld %b",
-                    key.data(), key.size(),
-                    count,
-                    val.data(), val.size());
-}
-
-inline void lset(Connection &connection,
-                    const StringView &key,
-                    long long index,
-                    const StringView &val) {
-    connection.send("LSET %b %lld %b",
-                    key.data(), key.size(),
-                    index,
-                    val.data(), val.size());
-}
-
-inline void ltrim(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LTRIM %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void rpop(Connection &connection, const StringView &key) {
-    connection.send("RPOP %b", key.data(), key.size());
-}
-
-inline void rpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination) {
-    connection.send("RPOPLPUSH %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size());
-}
-
-inline void rpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void rpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void rpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-// HASH commands.
-
-inline void hdel(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HDEL %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-template <typename Input>
-inline void hdel_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hexists(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HEXISTS %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hget(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HGET %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hgetall(Connection &connection, const StringView &key) {
-    connection.send("HGETALL %b", key.data(), key.size());
-}
-
-inline void hincrby(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    long long increment) {
-    connection.send("HINCRBY %b %b %lld",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hincrbyfloat(Connection &connection,
-                            const StringView &key,
-                            const StringView &field,
-                            double increment) {
-    connection.send("HINCRBYFLOAT %b %b %f",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hkeys(Connection &connection, const StringView &key) {
-    connection.send("HKEYS %b", key.data(), key.size());
-}
-
-inline void hlen(Connection &connection, const StringView &key) {
-    connection.send("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void hmget(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void hmset(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("HSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void hset(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSET %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hsetnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSETNX %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hstrlen(Connection &connection,
-                    const StringView &key,
-                    const StringView &field) {
-    connection.send("HSTRLEN %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hvals(Connection &connection, const StringView &key) {
-    connection.send("HVALS %b", key.data(), key.size());
-}
-
-// SET commands
-
-inline void sadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SADD %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void sadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void scard(Connection &connection, const StringView &key) {
-    connection.send("SCARD %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiff(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFF" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sdiffstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SDIFFSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiffstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFFSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void sinter(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTER" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SINTERSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sinterstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTERSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sismember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("SISMEMBER %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void smembers(Connection &connection, const StringView &key) {
-    connection.send("SMEMBERS %b", key.data(), key.size());
-}
-
-inline void smove(Connection &connection,
-                    const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    connection.send("SMOVE %b %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    member.data(), member.size());
-}
-
-inline void spop(Connection &connection, const StringView &key) {
-    connection.send("SPOP %b", key.data(), key.size());
-}
-
-inline void spop_range(Connection &connection, const StringView &key, long long count) {
-    connection.send("SPOP %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srandmember(Connection &connection, const StringView &key) {
-    connection.send("SRANDMEMBER %b", key.data(), key.size());
-}
-
-inline void srandmember_range(Connection &connection,
-                                const StringView &key,
-                                long long count) {
-    connection.send("SRANDMEMBER %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void srem_range(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-template <typename Input>
-inline void sunion(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNION" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SUNIONSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sunionstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNIONSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Sorted Set commands.
-
-inline void bzpopmax(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMAX %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmax_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void bzpopmin(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMIN %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmin_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed);
-
-inline void zadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type,
-                    bool changed) {
-    auto tmp = {std::make_pair(member, score)};
-
-    zadd_range(connection, key, tmp.begin(), tmp.end(), type, changed);
-}
-
-inline void zcard(Connection &connection, const StringView &key) {
-    connection.send("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-inline void zcount(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval) {
-    connection.send("ZCOUNT %b %s %s",
-                    key.data(), key.size(),
-                    interval.min().c_str(),
-                    interval.max().c_str());
-}
-
-inline void zincrby(Connection &connection,
-                    const StringView &key,
-                    double increment,
-                    const StringView &member) {
-    connection.send("ZINCRBY %b %f %b",
-                    key.data(), key.size(),
-                    increment,
-                    member.data(), member.size());
-}
-
-inline void zinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZINTERSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-template <typename Interval>
-inline void zlexcount(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zpopmax(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMAX %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zpopmin(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMIN %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop,
-                    bool with_scores) {
-    if (with_scores) {
-        connection.send("ZRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrangebylex(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrangebyscore(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval,
-                    const LimitOptions &opts,
-                    bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrank(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zrem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void zrem_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Interval>
-inline void zremrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zremrangebyrank(Connection &connection,
-                            const StringView &key,
-                            long long start,
-                            long long stop) {
-    connection.send("zremrangebyrank %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-template <typename Interval>
-inline void zremrangebyscore(Connection &connection,
-                                const StringView &key,
-                                const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zrevrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores) {
-    if (with_scores) {
-        connection.send("ZREVRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZREVRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrevrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrevrangebyscore(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZREVRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZREVRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrevrank(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("ZREVRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("ZSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void zscore(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZSCORE %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZUNIONSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-// HYPERLOGLOG commands.
-
-inline void pfadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &element) {
-    connection.send("PFADD %b %b",
-                    key.data(), key.size(),
-                    element.data(), element.size());
-}
-
-template <typename Input>
-inline void pfadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfcount(Connection &connection, const StringView &key) {
-    connection.send("PFCOUNT %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfcount_range(Connection &connection,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFCOUNT" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfmerge(Connection &connection, const StringView &destination, const StringView &key) {
-    connection.send("PFMERGE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfmerge_range(Connection &connection,
-                            const StringView &destination,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFMERGE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// GEO commands.
-
-inline void geoadd(Connection &connection,
-                    const StringView &key,
-                    const std::tuple<StringView, double, double> &member) {
-    const auto &mem = std::get<0>(member);
-
-    connection.send("GEOADD %b %f %f %b",
-                    key.data(), key.size(),
-                    std::get<1>(member),
-                    std::get<2>(member),
-                    mem.data(), mem.size());
-}
-
-template <typename Input>
-inline void geoadd_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOADD" << key;
-
-    while (first != last) {
-        const auto &member = *first;
-        args << std::get<1>(member) << std::get<2>(member) << std::get<0>(member);
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-void geodist(Connection &connection,
-                const StringView &key,
-                const StringView &member1,
-                const StringView &member2,
-                GeoUnit unit);
-
-template <typename Input>
-inline void geohash_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOHASH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void geopos_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOPOS" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-void georadius(Connection &connection,
-                const StringView &key,
-                const std::pair<double, double> &loc,
-                double radius,
-                GeoUnit unit,
-                long long count,
-                bool asc,
-                bool with_coord,
-                bool with_dist,
-                bool with_hash);
-
-void georadius_store(Connection &connection,
-                        const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        const StringView &destination,
-                        bool store_dist,
-                        long long count);
-
-void georadiusbymember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        bool with_coord,
-                        bool with_dist,
-                        bool with_hash);
-
-void georadiusbymember_store(Connection &connection,
-                                const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-// SCRIPTING commands.
-
-inline void eval(Connection &connection,
-                    const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    CmdArgs cmd_args;
-
-    cmd_args << "EVAL" << script << keys.size()
-            << std::make_pair(keys.begin(), keys.end())
-            << std::make_pair(args.begin(), args.end());
-
-    connection.send(cmd_args);
-}
-
-inline void evalsha(Connection &connection,
-                    const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    CmdArgs cmd_args;
-
-    cmd_args << "EVALSHA" << script << keys.size()
-            << std::make_pair(keys.begin(), keys.end())
-            << std::make_pair(args.begin(), args.end());
-
-    connection.send(cmd_args);
-}
-
-inline void script_exists(Connection &connection, const StringView &sha) {
-    connection.send("SCRIPT EXISTS %b", sha.data(), sha.size());
-}
-
-template <typename Input>
-inline void script_exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SCRIPT" << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void script_flush(Connection &connection) {
-    connection.send("SCRIPT FLUSH");
-}
-
-inline void script_kill(Connection &connection) {
-    connection.send("SCRIPT KILL");
-}
-
-inline void script_load(Connection &connection, const StringView &script) {
-    connection.send("SCRIPT LOAD %b", script.data(), script.size());
-}
-
-// PUBSUB commands.
-
-inline void psubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void psubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void publish(Connection &connection,
-                    const StringView &channel,
-                    const StringView &message) {
-    connection.send("PUBLISH %b %b",
-                    channel.data(), channel.size(),
-                    message.data(), message.size());
-}
-
-inline void punsubscribe(Connection &connection) {
-    connection.send("PUNSUBSCRIBE");
-}
-
-inline void punsubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PUNSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void punsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PUNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PUNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void subscribe(Connection &connection, const StringView &channel) {
-    connection.send("SUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void subscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "SUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void unsubscribe(Connection &connection) {
-    connection.send("UNSUBSCRIBE");
-}
-
-inline void unsubscribe(Connection &connection, const StringView &channel) {
-    connection.send("UNSUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void unsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Transaction commands.
-
-inline void discard(Connection &connection) {
-    connection.send("DISCARD");
-}
-
-inline void exec(Connection &connection) {
-    connection.send("EXEC");
-}
-
-inline void multi(Connection &connection) {
-    connection.send("MULTI");
-}
-
-inline void unwatch(Connection &connection, const StringView &key) {
-    connection.send("UNWATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unwatch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNWATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNWATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void watch(Connection &connection, const StringView &key) {
-    connection.send("WATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void watch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("WATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "WATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Stream commands.
-
-inline void xack(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &id) {
-    connection.send("XACK %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xack_range(Connection &connection,
-                const StringView &key,
-                const StringView &group,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XACK" << key << group << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_range(Connection &connection,
-                const StringView &key,
-                const StringView &id,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XADD" << key << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_maxlen_range(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    CmdArgs args;
-    args << "XADD" << key << "MAXLEN";
-
-    if (approx) {
-        args << "~";
-    }
-
-    args << count << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xclaim(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    const StringView &id) {
-    connection.send("XCLAIM %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size(),
-                    min_idle_time,
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xclaim_range(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    Input first,
-                    Input last) {
-    CmdArgs args;
-    args << "XCLAIM" << key << group << consumer << min_idle_time << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xdel(Connection &connection, const StringView &key, const StringView &id) {
-    connection.send("XDEL %b %b", key.data(), key.size(), id.data(), id.size());
-}
-
-template <typename Input>
-void xdel_range(Connection &connection, const StringView &key, Input first, Input last) {
-    CmdArgs args;
-    args << "XDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xgroup_create(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id,
-                            bool mkstream) {
-    CmdArgs args;
-    args << "XGROUP" << "CREATE" << key << group << id;
-
-    if (mkstream) {
-        args << "MKSTREAM";
-    }
-
-    connection.send(args);
-}
-
-inline void xgroup_setid(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id) {
-    connection.send("XGROUP SETID %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-inline void xgroup_destroy(Connection &connection,
-                            const StringView &key,
-                            const StringView &group) {
-    connection.send("XGROUP DESTROY %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xgroup_delconsumer(Connection &connection,
-                                const StringView &key,
-                                const StringView &group,
-                                const StringView &consumer) {
-    connection.send("XGROUP DELCONSUMER %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size());
-}
-
-inline void xlen(Connection &connection, const StringView &key) {
-    connection.send("XLEN %b", key.data(), key.size());
-}
-
-inline void xpending(Connection &connection, const StringView &key, const StringView &group) {
-    connection.send("XPENDING %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xpending_detail(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XPENDING %b %b %b %b %lld",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xpending_per_consumer(Connection &connection,
-                                    const StringView &key,
-                                    const StringView &group,
-                                    const StringView &start,
-                                    const StringView &end,
-                                    long long count,
-                                    const StringView &consumer) {
-    connection.send("XPENDING %b %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count,
-                    consumer.data(), consumer.size());
-}
-
-inline void xrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &start,
-                    const StringView &end) {
-    connection.send("XRANGE %b %b %b",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size());
-}
-
-inline void xrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xread(Connection &connection,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count) {
-    connection.send("XREAD COUNT %lld STREAMS %b %b",
-                    count,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_range(Connection &connection, Input first, Input last, long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xread_block(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        long long timeout,
-                        long long count) {
-    connection.send("XREAD COUNT %lld BLOCK %lld STREAMS %b %b",
-                    count,
-                    timeout,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_block_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout,
-                        long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "BLOCK" << timeout << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_range(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup_block(Connection &connection,
-                                const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long timeout,
-                                long long count,
-                                bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_block_range(Connection &connection,
-                            const StringView &group,
-                            const StringView &consumer,
-                            Input first,
-                            Input last,
-                            long long timeout,
-                            long long count,
-                            bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xrevrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &end,
-                    const StringView &start) {
-    connection.send("XREVRANGE %b %b %b",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size());
-}
-
-inline void xrevrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-    connection.send("XREVRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size(),
-                    count);
-}
-
-void xtrim(Connection &connection, const StringView &key, long long count, bool approx);
-
-namespace detail {
-
-void set_bitop(CmdArgs &args, BitOp op);
-
-void set_update_type(CmdArgs &args, UpdateType type);
-
-void set_aggregation_type(CmdArgs &args, Aggregation type);
-
-template <typename Input>
-void zinterstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-void set_geo_unit(CmdArgs &args, GeoUnit unit);
-
-void set_georadius_store_parameters(CmdArgs &args,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count);
-
-void set_georadius_parameters(CmdArgs &args,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                bool with_coord,
-                                bool with_dist,
-                                bool with_hash);
-
-}
-
-}
-
-}
-
-}
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    detail::set_bitop(args, op);
-
-    args << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    args << "ZADD" << key;
-
-    detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zinterstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zunionstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command_args.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command_args.h
deleted file mode 100644
index 0beb71e5c..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command_args.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-
-#include <vector>
-#include <list>
-#include <string>
-#include <tuple>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-class CmdArgs {
-public:
-    template <typename Arg>
-    CmdArgs& append(Arg &&arg);
-
-    template <typename Arg, typename ...Args>
-    CmdArgs& append(Arg &&arg, Args &&...args);
-
-    // All overloads of operator<< are for internal use only.
-    CmdArgs& operator<<(const StringView &arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& operator<<(T &&arg);
-
-    template <typename Iter>
-    CmdArgs& operator<<(const std::pair<Iter, Iter> &range);
-
-    template <std::size_t N, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &) ->
-        typename std::enable_if<N == sizeof...(Args), CmdArgs&>::type {
-        return *this;
-    }
-
-    template <std::size_t N = 0, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &arg) ->
-        typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type;
-
-    const char** argv() {
-        return _argv.data();
-    }
-
-    const std::size_t* argv_len() {
-        return _argv_len.data();
-    }
-
-    std::size_t size() const {
-        return _argv.size();
-    }
-
-private:
-    // Deep copy.
-    CmdArgs& _append(std::string arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const StringView &arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const char *arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& _append(T &&arg) {
-        return operator<<(std::forward<T>(arg));
-    }
-
-    template <typename Iter>
-    CmdArgs& _append(std::true_type, const std::pair<Iter, Iter> &range);
-
-    template <typename Iter>
-    CmdArgs& _append(std::false_type, const std::pair<Iter, Iter> &range);
-
-    std::vector<const char *> _argv;
-    std::vector<std::size_t> _argv_len;
-
-    std::list<std::string> _args;
-};
-
-template <typename Arg>
-inline CmdArgs& CmdArgs::append(Arg &&arg) {
-    return _append(std::forward<Arg>(arg));
-}
-
-template <typename Arg, typename ...Args>
-inline CmdArgs& CmdArgs::append(Arg &&arg, Args &&...args) {
-    _append(std::forward<Arg>(arg));
-
-    return append(std::forward<Args>(args)...);
-}
-
-inline CmdArgs& CmdArgs::operator<<(const StringView &arg) {
-    _argv.push_back(arg.data());
-    _argv_len.push_back(arg.size());
-
-    return *this;
-}
-
-template <typename Iter>
-inline CmdArgs& CmdArgs::operator<<(const std::pair<Iter, Iter> &range) {
-    return _append(IsKvPair<typename std::decay<decltype(*std::declval<Iter>())>::type>(), range);
-}
-
-template <typename T,
-             typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                    int>::type>
-inline CmdArgs& CmdArgs::operator<<(T &&arg) {
-    return _append(std::to_string(std::forward<T>(arg)));
-}
-
-template <std::size_t N, typename ...Args>
-auto CmdArgs::operator<<(const std::tuple<Args...> &arg) ->
-    typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type {
-    operator<<(std::get<N>(arg));
-
-    return operator<<<N + 1, Args...>(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(std::string arg) {
-    _args.push_back(std::move(arg));
-    return operator<<(_args.back());
-}
-
-inline CmdArgs& CmdArgs::_append(const StringView &arg) {
-    return operator<<(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(const char *arg) {
-    return operator<<(arg);
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::false_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << *first;
-        ++first;
-    }
-
-    return *this;
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::true_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << first->first << first->second;
-        ++first;
-    }
-
-    return *this;
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command_options.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command_options.h
deleted file mode 100644
index ca766c086..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/command_options.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-
-#include <string>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class UpdateType {
-    EXIST,
-    NOT_EXIST,
-    ALWAYS
-};
-
-enum class InsertPosition {
-    BEFORE,
-    AFTER
-};
-
-enum class BoundType {
-    CLOSED,
-    OPEN,
-    LEFT_OPEN,
-    RIGHT_OPEN
-};
-
-// (-inf, +inf)
-template <typename T>
-class UnboundedInterval;
-
-// [min, max], (min, max), (min, max], [min, max)
-template <typename T>
-class BoundedInterval;
-
-// [min, +inf), (min, +inf)
-template <typename T>
-class LeftBoundedInterval;
-
-// (-inf, max], (-inf, max)
-template <typename T>
-class RightBoundedInterval;
-
-template <>
-class UnboundedInterval<double> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<double> {
-public:
-    BoundedInterval(double min, double max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<double> {
-public:
-    LeftBoundedInterval(double min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<double> {
-public:
-    RightBoundedInterval(double max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-template <>
-class UnboundedInterval<std::string> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<std::string> {
-public:
-    BoundedInterval(const std::string &min, const std::string &max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<std::string> {
-public:
-    LeftBoundedInterval(const std::string &min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<std::string> {
-public:
-    RightBoundedInterval(const std::string &max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-struct LimitOptions {
-    long long offset = 0;
-    long long count = -1;
-};
-
-enum class Aggregation {
-    SUM,
-    MIN,
-    MAX
-};
-
-enum class BitOp {
-    AND,
-    OR,
-    XOR,
-    NOT
-};
-
-enum class GeoUnit {
-    M,
-    KM,
-    MI,
-    FT
-};
-
-template <typename T>
-struct WithCoord : TupleWithType<std::pair<double, double>, T> {};
-
-template <typename T>
-struct WithDist : TupleWithType<double, T> {};
-
-template <typename T>
-struct WithHash : TupleWithType<long long, T> {};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/connection.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/connection.h
deleted file mode 100644
index 5ad419225..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/connection.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_H
-
-#include <cerrno>
-#include <cstring>
-#include <memory>
-#include <string>
-#include <sstream>
-#include <chrono>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "reply.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class ConnectionType {
-    TCP = 0,
-    UNIX
-};
-
-struct ConnectionOptions {
-public:
-    ConnectionOptions() = default;
-
-    explicit ConnectionOptions(const std::string &uri);
-
-    ConnectionOptions(const ConnectionOptions &) = default;
-    ConnectionOptions& operator=(const ConnectionOptions &) = default;
-
-    ConnectionOptions(ConnectionOptions &&) = default;
-    ConnectionOptions& operator=(ConnectionOptions &&) = default;
-
-    ~ConnectionOptions() = default;
-
-    ConnectionType type = ConnectionType::TCP;
-
-    std::string host;
-
-    int port = 6379;
-
-    std::string path;
-
-    std::string password;
-
-    int db = 0;
-
-    bool keep_alive = false;
-
-    std::chrono::milliseconds connect_timeout{0};
-
-    std::chrono::milliseconds socket_timeout{0};
-
-private:
-    ConnectionOptions _parse_options(const std::string &uri) const;
-
-    ConnectionOptions _parse_tcp_options(const std::string &path) const;
-
-    ConnectionOptions _parse_unix_options(const std::string &path) const;
-
-    auto _split_string(const std::string &str, const std::string &delimiter) const ->
-            std::pair<std::string, std::string>;
-};
-
-class CmdArgs;
-
-class Connection {
-public:
-    explicit Connection(const ConnectionOptions &opts);
-
-    Connection(const Connection &) = delete;
-    Connection& operator=(const Connection &) = delete;
-
-    Connection(Connection &&) = default;
-    Connection& operator=(Connection &&) = default;
-
-    ~Connection() = default;
-
-    // Check if the connection is broken. Client needs to do this check
-    // before sending some command to the connection. If it's broken,
-    // client needs to reconnect it.
-    bool broken() const noexcept {
-        return _ctx->err != REDIS_OK;
-    }
-
-    void reset() noexcept {
-        _ctx->err = 0;
-    }
-
-    void reconnect();
-
-    auto last_active() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _last_active;
-    }
-
-    template <typename ...Args>
-    void send(const char *format, Args &&...args);
-
-    void send(int argc, const char **argv, const std::size_t *argv_len);
-
-    void send(CmdArgs &args);
-
-    ReplyUPtr recv();
-
-    const ConnectionOptions& options() const {
-        return _opts;
-    }
-
-    friend void swap(Connection &lhs, Connection &rhs) noexcept;
-
-private:
-    class Connector;
-
-    struct ContextDeleter {
-        void operator()(redisContext *context) const {
-            if (context != nullptr) {
-                redisFree(context);
-            }
-        };
-    };
-
-    using ContextUPtr = std::unique_ptr<redisContext, ContextDeleter>;
-
-    void _set_options();
-
-    void _auth();
-
-    void _select_db();
-
-    redisContext* _context();
-
-    ContextUPtr _ctx;
-
-    // The time that the connection is created or the time that
-    // the connection is used, i.e. *context()* is called.
-    std::chrono::time_point<std::chrono::steady_clock> _last_active{};
-
-    ConnectionOptions _opts;
-};
-
-using ConnectionSPtr = std::shared_ptr<Connection>;
-
-enum class Role {
-    MASTER,
-    SLAVE
-};
-
-// Inline implementaions.
-
-template <typename ...Args>
-inline void Connection::send(const char *format, Args &&...args) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommand(ctx,
-                format,
-                std::forward<Args>(args)...) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-inline redisContext* Connection::_context() {
-    _last_active = std::chrono::steady_clock::now();
-
-    return _ctx.get();
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/connection_pool.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/connection_pool.h
deleted file mode 100644
index 6f2663ad7..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/connection_pool.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-
-#include <chrono>
-#include <mutex>
-#include <memory>
-#include <condition_variable>
-#include <deque>
-#include "connection.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ConnectionPoolOptions {
-    // Max number of connections, including both in-use and idle ones.
-    std::size_t size = 1;
-
-    // Max time to wait for a connection. 0ms means client waits forever.
-    std::chrono::milliseconds wait_timeout{0};
-
-    // Max lifetime of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_lifetime{0};
-};
-
-class ConnectionPool {
-public:
-    ConnectionPool(const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool(SimpleSentinel sentinel,
-                    const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool() = default;
-
-    ConnectionPool(ConnectionPool &&that);
-    ConnectionPool& operator=(ConnectionPool &&that);
-
-    ConnectionPool(const ConnectionPool &) = delete;
-    ConnectionPool& operator=(const ConnectionPool &) = delete;
-
-    ~ConnectionPool() = default;
-
-    // Fetch a connection from pool.
-    Connection fetch();
-
-    ConnectionOptions connection_options();
-
-    void release(Connection connection);
-
-    // Create a new connection.
-    Connection create();
-
-private:
-    void _move(ConnectionPool &&that);
-
-    // NOT thread-safe
-    Connection _create();
-
-    Connection _create(SimpleSentinel &sentinel, const ConnectionOptions &opts, bool locked);
-
-    Connection _fetch();
-
-    void _wait_for_connection(std::unique_lock<std::mutex> &lock);
-
-    bool _need_reconnect(const Connection &connection,
-                            const std::chrono::milliseconds &connection_lifetime) const;
-
-    void _update_connection_opts(const std::string &host, int port) {
-        _opts.host = host;
-        _opts.port = port;
-    }
-
-    bool _role_changed(const ConnectionOptions &opts) const {
-        return opts.port != _opts.port || opts.host != _opts.host;
-    }
-
-    ConnectionOptions _opts;
-
-    ConnectionPoolOptions _pool_opts;
-
-    std::deque<Connection> _pool;
-
-    std::size_t _used_connections = 0;
-
-    std::mutex _mutex;
-
-    std::condition_variable _cv;
-
-    SimpleSentinel _sentinel;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/errors.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/errors.h
deleted file mode 100644
index 44d629e50..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/errors.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ERRORS_H
-#define SEWENEW_REDISPLUSPLUS_ERRORS_H
-
-#include <exception>
-#include <string>
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-enum ReplyErrorType {
-    ERR,
-    MOVED,
-    ASK
-};
-
-class Error : public std::exception {
-public:
-    explicit Error(const std::string &msg) : _msg(msg) {}
-
-    Error(const Error &) = default;
-    Error& operator=(const Error &) = default;
-
-    Error(Error &&) = default;
-    Error& operator=(Error &&) = default;
-
-    virtual ~Error() = default;
-
-    virtual const char* what() const noexcept {
-        return _msg.data();
-    }
-
-private:
-    std::string _msg;
-};
-
-class IoError : public Error {
-public:
-    explicit IoError(const std::string &msg) : Error(msg) {}
-
-    IoError(const IoError &) = default;
-    IoError& operator=(const IoError &) = default;
-
-    IoError(IoError &&) = default;
-    IoError& operator=(IoError &&) = default;
-
-    virtual ~IoError() = default;
-};
-
-class TimeoutError : public IoError {
-public:
-    explicit TimeoutError(const std::string &msg) : IoError(msg) {}
-
-    TimeoutError(const TimeoutError &) = default;
-    TimeoutError& operator=(const TimeoutError &) = default;
-
-    TimeoutError(TimeoutError &&) = default;
-    TimeoutError& operator=(TimeoutError &&) = default;
-
-    virtual ~TimeoutError() = default;
-};
-
-class ClosedError : public Error {
-public:
-    explicit ClosedError(const std::string &msg) : Error(msg) {}
-
-    ClosedError(const ClosedError &) = default;
-    ClosedError& operator=(const ClosedError &) = default;
-
-    ClosedError(ClosedError &&) = default;
-    ClosedError& operator=(ClosedError &&) = default;
-
-    virtual ~ClosedError() = default;
-};
-
-class ProtoError : public Error {
-public:
-    explicit ProtoError(const std::string &msg) : Error(msg) {}
-
-    ProtoError(const ProtoError &) = default;
-    ProtoError& operator=(const ProtoError &) = default;
-
-    ProtoError(ProtoError &&) = default;
-    ProtoError& operator=(ProtoError &&) = default;
-
-    virtual ~ProtoError() = default;
-};
-
-class OomError : public Error {
-public:
-    explicit OomError(const std::string &msg) : Error(msg) {}
-
-    OomError(const OomError &) = default;
-    OomError& operator=(const OomError &) = default;
-
-    OomError(OomError &&) = default;
-    OomError& operator=(OomError &&) = default;
-
-    virtual ~OomError() = default;
-};
-
-class ReplyError : public Error {
-public:
-    explicit ReplyError(const std::string &msg) : Error(msg) {}
-
-    ReplyError(const ReplyError &) = default;
-    ReplyError& operator=(const ReplyError &) = default;
-
-    ReplyError(ReplyError &&) = default;
-    ReplyError& operator=(ReplyError &&) = default;
-
-    virtual ~ReplyError() = default;
-};
-
-class WatchError : public Error {
-public:
-    explicit WatchError() : Error("Watched key has been modified") {}
-
-    WatchError(const WatchError &) = default;
-    WatchError& operator=(const WatchError &) = default;
-
-    WatchError(WatchError &&) = default;
-    WatchError& operator=(WatchError &&) = default;
-
-    virtual ~WatchError() = default;
-};
-
-
-// MovedError and AskError are defined in shards.h
-class MovedError;
-
-class AskError;
-
-void throw_error(redisContext &context, const std::string &err_info);
-
-void throw_error(const redisReply &reply);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ERRORS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/pipeline.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/pipeline.h
deleted file mode 100644
index 52b01253f..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/pipeline.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_PIPELINE_H
-#define SEWENEW_REDISPLUSPLUS_PIPELINE_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-class PipelineImpl {
-public:
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args) {
-        assert(!connection.broken());
-
-        cmd(connection, std::forward<Args>(args)...);
-    }
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t /*cmd_num*/) {
-        // Reconnect to Redis to discard all commands.
-        connection.reconnect();
-    }
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_PIPELINE_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/queued_redis.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/queued_redis.h
deleted file mode 100644
index 71d975ee3..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/queued_redis.h
+++ /dev/null
@@ -1,1844 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-
-#include <cassert>
-#include <chrono>
-#include <initializer_list>
-#include <vector>
-#include "connection.h"
-#include "utils.h"
-#include "reply.h"
-#include "command.h"
-#include "redis.h"
-
-namespace sw {
-
-namespace redis {
-
-class QueuedReplies;
-
-// If any command throws, QueuedRedis resets the connection, and becomes invalid.
-// In this case, the only thing we can do is to destory the QueuedRedis object.
-template <typename Impl>
-class QueuedRedis {
-public:
-    QueuedRedis(QueuedRedis &&) = default;
-    QueuedRedis& operator=(QueuedRedis &&) = default;
-
-    // When it destructs, the underlying *Connection* will be closed,
-    // and any command that has NOT been executed will be ignored.
-    ~QueuedRedis() = default;
-
-    Redis redis();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                    QueuedRedis&>::type;
-
-    template <typename ...Args>
-    QueuedRedis& command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, QueuedRedis&>::type;
-
-    QueuedReplies exec();
-
-    void discard();
-
-    // CONNECTION commands.
-
-    QueuedRedis& auth(const StringView &password) {
-        return command(cmd::auth, password);
-    }
-
-    QueuedRedis& echo(const StringView &msg) {
-        return command(cmd::echo, msg);
-    }
-
-    QueuedRedis& ping() {
-        return command<void (*)(Connection &)>(cmd::ping);
-    }
-
-    QueuedRedis& ping(const StringView &msg) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::ping, msg);
-    }
-
-    // We DO NOT support the QUIT command. See *Redis::quit* doc for details.
-    //
-    // QueuedRedis& quit();
-
-    QueuedRedis& select(long long idx) {
-        return command(cmd::select, idx);
-    }
-
-    QueuedRedis& swapdb(long long idx1, long long idx2) {
-        return command(cmd::swapdb, idx1, idx2);
-    }
-
-    // SERVER commands.
-
-    QueuedRedis& bgrewriteaof() {
-        return command(cmd::bgrewriteaof);
-    }
-
-    QueuedRedis& bgsave() {
-        return command(cmd::bgsave);
-    }
-
-    QueuedRedis& dbsize() {
-        return command(cmd::dbsize);
-    }
-
-    QueuedRedis& flushall(bool async = false) {
-        return command(cmd::flushall, async);
-    }
-
-    QueuedRedis& flushdb(bool async = false) {
-        return command(cmd::flushdb, async);
-    }
-
-    QueuedRedis& info() {
-        return command<void (*)(Connection &)>(cmd::info);
-    }
-
-    QueuedRedis& info(const StringView &section) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::info, section);
-    }
-
-    QueuedRedis& lastsave() {
-        return command(cmd::lastsave);
-    }
-
-    QueuedRedis& save() {
-        return command(cmd::save);
-    }
-
-    // KEY commands.
-
-    QueuedRedis& del(const StringView &key) {
-        return command(cmd::del, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& del(Input first, Input last) {
-        return command(cmd::del_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    QueuedRedis& dump(const StringView &key) {
-        return command(cmd::dump, key);
-    }
-
-    QueuedRedis& exists(const StringView &key) {
-        return command(cmd::exists, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& exists(Input first, Input last) {
-        return command(cmd::exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& expire(const StringView &key, long long timeout) {
-        return command(cmd::expire, key, timeout);
-    }
-
-    QueuedRedis& expire(const StringView &key,
-                        const std::chrono::seconds &timeout) {
-        return expire(key, timeout.count());
-    }
-
-    QueuedRedis& expireat(const StringView &key, long long timestamp) {
-        return command(cmd::expireat, key, timestamp);
-    }
-
-    QueuedRedis& expireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::seconds> &tp) {
-        return expireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& keys(const StringView &pattern) {
-        return command(cmd::keys, pattern);
-    }
-
-    QueuedRedis& move(const StringView &key, long long db) {
-        return command(cmd::move, key, db);
-    }
-
-    QueuedRedis& persist(const StringView &key) {
-        return command(cmd::persist, key);
-    }
-
-    QueuedRedis& pexpire(const StringView &key, long long timeout) {
-        return command(cmd::pexpire, key, timeout);
-    }
-
-    QueuedRedis& pexpire(const StringView &key,
-                            const std::chrono::milliseconds &timeout) {
-        return pexpire(key, timeout.count());
-    }
-
-    QueuedRedis& pexpireat(const StringView &key, long long timestamp) {
-        return command(cmd::pexpireat, key, timestamp);
-    }
-
-    QueuedRedis& pexpireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::milliseconds> &tp) {
-        return pexpireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& pttl(const StringView &key) {
-        return command(cmd::pttl, key);
-    }
-
-    QueuedRedis& randomkey() {
-        return command(cmd::randomkey);
-    }
-
-    QueuedRedis& rename(const StringView &key, const StringView &newkey) {
-        return command(cmd::rename, key, newkey);
-    }
-
-    QueuedRedis& renamenx(const StringView &key, const StringView &newkey) {
-        return command(cmd::renamenx, key, newkey);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                                const StringView &val,
-                                long long ttl,
-                                bool replace = false) {
-        return command(cmd::restore, key, val, ttl, replace);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                            bool replace = false) {
-        return restore(key, val, ttl.count(), replace);
-    }
-
-    // TODO: sort
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::scan, cursor, pattern, count);
-    }
-
-    QueuedRedis& scan(long long cursor) {
-        return scan(cursor, "*", 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern) {
-        return scan(cursor, pattern, 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        long long count) {
-        return scan(cursor, "*", count);
-    }
-
-    QueuedRedis& touch(const StringView &key) {
-        return command(cmd::touch, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& touch(Input first, Input last) {
-        return command(cmd::touch_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    QueuedRedis& ttl(const StringView &key) {
-        return command(cmd::ttl, key);
-    }
-
-    QueuedRedis& type(const StringView &key) {
-        return command(cmd::type, key);
-    }
-
-    QueuedRedis& unlink(const StringView &key) {
-        return command(cmd::unlink, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& unlink(Input first, Input last) {
-        return command(cmd::unlink_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    QueuedRedis& wait(long long numslaves, long long timeout) {
-        return command(cmd::wait, numslaves, timeout);
-    }
-
-    QueuedRedis& wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-        return wait(numslaves, timeout.count());
-    }
-
-    // STRING commands.
-
-    QueuedRedis& append(const StringView &key, const StringView &str) {
-        return command(cmd::append, key, str);
-    }
-
-    QueuedRedis& bitcount(const StringView &key,
-                            long long start = 0,
-                            long long end = -1) {
-        return command(cmd::bitcount, key, start, end);
-    }
-
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        const StringView &key) {
-        return command(cmd::bitop, op, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        Input first,
-                        Input last) {
-        return command(cmd::bitop_range<Input>, op, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1) {
-        return command(cmd::bitpos, key, bit, start, end);
-    }
-
-    QueuedRedis& decr(const StringView &key) {
-        return command(cmd::decr, key);
-    }
-
-    QueuedRedis& decrby(const StringView &key, long long decrement) {
-        return command(cmd::decrby, key, decrement);
-    }
-
-    QueuedRedis& get(const StringView &key) {
-        return command(cmd::get, key);
-    }
-
-    QueuedRedis& getbit(const StringView &key, long long offset) {
-        return command(cmd::getbit, key, offset);
-    }
-
-    QueuedRedis& getrange(const StringView &key, long long start, long long end) {
-        return command(cmd::getrange, key, start, end);
-    }
-
-    QueuedRedis& getset(const StringView &key, const StringView &val) {
-        return command(cmd::getset, key, val);
-    }
-
-    QueuedRedis& incr(const StringView &key) {
-        return command(cmd::incr, key);
-    }
-
-    QueuedRedis& incrby(const StringView &key, long long increment) {
-        return command(cmd::incrby, key, increment);
-    }
-
-    QueuedRedis& incrbyfloat(const StringView &key, double increment) {
-        return command(cmd::incrbyfloat, key, increment);
-    }
-
-    template <typename Input>
-    QueuedRedis& mget(Input first, Input last) {
-        return command(cmd::mget<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mget(std::initializer_list<T> il) {
-        return mget(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& mset(Input first, Input last) {
-        return command(cmd::mset<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mset(std::initializer_list<T> il) {
-        return mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& msetnx(Input first, Input last) {
-        return command(cmd::msetnx<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::psetex, key, ttl, val);
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        const std::chrono::milliseconds &ttl,
-                        const StringView &val) {
-        return psetex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& set(const StringView &key,
-                        const StringView &val,
-                        const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                        UpdateType type = UpdateType::ALWAYS) {
-        _set_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::set, key, val, ttl.count(), type);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::setex, key, ttl, val);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        const std::chrono::seconds &ttl,
-                        const StringView &val) {
-        return setex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& setnx(const StringView &key, const StringView &val) {
-        return command(cmd::setnx, key, val);
-    }
-
-    QueuedRedis& setrange(const StringView &key,
-                            long long offset,
-                            const StringView &val) {
-        return command(cmd::setrange, key, offset, val);
-    }
-
-    QueuedRedis& strlen(const StringView &key) {
-        return command(cmd::strlen, key);
-    }
-
-    // LIST commands.
-
-    QueuedRedis& blpop(const StringView &key, long long timeout) {
-        return command(cmd::blpop, key, timeout);
-    }
-
-    QueuedRedis& blpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first, Input last, long long timeout) {
-        return command(cmd::blpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key, long long timeout) {
-        return command(cmd::brpop, key, timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first, Input last, long long timeout) {
-        return command(cmd::brpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            long long timeout) {
-        return command(cmd::brpoplpush, source, destination, timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpoplpush(source, destination, timeout.count());
-    }
-
-    QueuedRedis& lindex(const StringView &key, long long index) {
-        return command(cmd::lindex, key, index);
-    }
-
-    QueuedRedis& linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-        return command(cmd::linsert, key, position, pivot, val);
-    }
-
-    QueuedRedis& llen(const StringView &key) {
-        return command(cmd::llen, key);
-    }
-
-    QueuedRedis& lpop(const StringView &key) {
-        return command(cmd::lpop, key);
-    }
-
-    QueuedRedis& lpush(const StringView &key, const StringView &val) {
-        return command(cmd::lpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& lpush(const StringView &key, Input first, Input last) {
-        return command(cmd::lpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& lpushx(const StringView &key, const StringView &val) {
-        return command(cmd::lpushx, key, val);
-    }
-
-    QueuedRedis& lrange(const StringView &key,
-                        long long start,
-                        long long stop) {
-        return command(cmd::lrange, key, start, stop);
-    }
-
-    QueuedRedis& lrem(const StringView &key, long long count, const StringView &val) {
-        return command(cmd::lrem, key, count, val);
-    }
-
-    QueuedRedis& lset(const StringView &key, long long index, const StringView &val) {
-        return command(cmd::lset, key, index, val);
-    }
-
-    QueuedRedis& ltrim(const StringView &key, long long start, long long stop) {
-        return command(cmd::ltrim, key, start, stop);
-    }
-
-    QueuedRedis& rpop(const StringView &key) {
-        return command(cmd::rpop, key);
-    }
-
-    QueuedRedis& rpoplpush(const StringView &source, const StringView &destination) {
-        return command(cmd::rpoplpush, source, destination);
-    }
-
-    QueuedRedis& rpush(const StringView &key, const StringView &val) {
-        return command(cmd::rpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& rpush(const StringView &key, Input first, Input last) {
-        return command(cmd::rpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& rpushx(const StringView &key, const StringView &val) {
-        return command(cmd::rpushx, key, val);
-    }
-
-    // HASH commands.
-
-    QueuedRedis& hdel(const StringView &key, const StringView &field) {
-        return command(cmd::hdel, key, field);
-    }
-
-    template <typename Input>
-    QueuedRedis& hdel(const StringView &key, Input first, Input last) {
-        return command(cmd::hdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hexists(const StringView &key, const StringView &field) {
-        return command(cmd::hexists, key, field);
-    }
-
-    QueuedRedis& hget(const StringView &key, const StringView &field) {
-        return command(cmd::hget, key, field);
-    }
-
-    QueuedRedis& hgetall(const StringView &key) {
-        return command(cmd::hgetall, key);
-    }
-
-    QueuedRedis& hincrby(const StringView &key,
-                            const StringView &field,
-                            long long increment) {
-        return command(cmd::hincrby, key, field, increment);
-    }
-
-    QueuedRedis& hincrbyfloat(const StringView &key,
-                                const StringView &field,
-                                double increment) {
-        return command(cmd::hincrbyfloat, key, field, increment);
-    }
-
-    QueuedRedis& hkeys(const StringView &key) {
-        return command(cmd::hkeys, key);
-    }
-
-    QueuedRedis& hlen(const StringView &key) {
-        return command(cmd::hlen, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& hmget(const StringView &key, Input first, Input last) {
-        return command(cmd::hmget<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmget(const StringView &key, std::initializer_list<T> il) {
-        return hmget(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& hmset(const StringView &key, Input first, Input last) {
-        return command(cmd::hmset<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmset(const StringView &key, std::initializer_list<T> il) {
-        return hmset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::hscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return hscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return hscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor) {
-        return hscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& hset(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hset, key, field, val);
-    }
-
-    QueuedRedis& hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hset(key, item.first, item.second);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hsetnx, key, field, val);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hsetnx(key, item.first, item.second);
-    }
-
-    QueuedRedis& hstrlen(const StringView &key, const StringView &field) {
-        return command(cmd::hstrlen, key, field);
-    }
-
-    QueuedRedis& hvals(const StringView &key) {
-        return command(cmd::hvals, key);
-    }
-
-    // SET commands.
-
-    QueuedRedis& sadd(const StringView &key, const StringView &member) {
-        return command(cmd::sadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& sadd(const StringView &key, Input first, Input last) {
-        return command(cmd::sadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& scard(const StringView &key) {
-        return command(cmd::scard, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiff(Input first, Input last) {
-        return command(cmd::sdiff<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiff(std::initializer_list<T> il) {
-        return sdiff(il.begin(), il.end());
-    }
-
-    QueuedRedis& sdiffstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sdiffstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-        return command(cmd::sdiffstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiffstore(const StringView &destination, std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& sinter(Input first, Input last) {
-        return command(cmd::sinter<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinter(std::initializer_list<T> il) {
-        return sinter(il.begin(), il.end());
-    }
-
-    QueuedRedis& sinterstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sinterstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sinterstore(const StringView &destination,
-                                Input first,
-                                Input last) {
-        return command(cmd::sinterstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinterstore(const StringView &destination, std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& sismember(const StringView &key, const StringView &member) {
-        return command(cmd::sismember, key, member);
-    }
-
-    QueuedRedis& smembers(const StringView &key) {
-        return command(cmd::smembers, key);
-    }
-
-    QueuedRedis& smove(const StringView &source,
-                        const StringView &destination,
-                        const StringView &member) {
-        return command(cmd::smove, source, destination, member);
-    }
-
-    QueuedRedis& spop(const StringView &key) {
-        return command(cmd::spop, key);
-    }
-
-    QueuedRedis& spop(const StringView &key, long long count) {
-        return command(cmd::spop_range, key, count);
-    }
-
-    QueuedRedis& srandmember(const StringView &key) {
-        return command(cmd::srandmember, key);
-    }
-
-    QueuedRedis& srandmember(const StringView &key, long long count) {
-        return command(cmd::srandmember_range, key, count);
-    }
-
-    QueuedRedis& srem(const StringView &key, const StringView &member) {
-        return command(cmd::srem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& srem(const StringView &key, Input first, Input last) {
-        return command(cmd::srem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::sscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern) {
-        return sscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return sscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor) {
-        return sscan(key, cursor, "*", 10);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunion(Input first, Input last) {
-        return command(cmd::sunion<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunion(std::initializer_list<T> il) {
-        return sunion(il.begin(), il.end());
-    }
-
-    QueuedRedis& sunionstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sunionstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunionstore(const StringView &destination, Input first, Input last) {
-        return command(cmd::sunionstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    QueuedRedis& bzpopmax(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmax, key, timeout);
-    }
-
-    QueuedRedis& bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first, Input last, long long timeout) {
-        return command(cmd::bzpopmax_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il, long long timeout) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmin, key, timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first, Input last, long long timeout) {
-        return command(cmd::bzpopmin_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il, long long timeout) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    QueuedRedis& zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd, key, member, score, type, changed);
-    }
-
-    template <typename Input>
-    QueuedRedis& zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd_range<Input>, key, first, last, type, changed);
-    }
-
-    QueuedRedis& zcard(const StringView &key) {
-        return command(cmd::zcard, key);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zincrby(const StringView &key, double increment, const StringView &member) {
-        return command(cmd::zincrby, key, increment, member);
-    }
-
-    QueuedRedis& zinterstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zinterstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        return command(cmd::zinterstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zlexcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zlexcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key) {
-        return command(cmd::zpopmax, key, 1);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key, long long count) {
-        return command(cmd::zpopmax, key, count);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key) {
-        return command(cmd::zpopmin, key, 1);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key, long long count) {
-        return command(cmd::zpopmin, key, count);
-    }
-
-    // NOTE: *QueuedRedis::zrange*'s parameters are different from *Redis::zrange*.
-    // *Redis::zrange* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::zrange*. So we have to use an extra parameter: *with_scores*,
-    // to decide whether we should send *WITHSCORES* option to Redis. This also applies to
-    // other commands with the *WITHSCORES* option, e.g. *ZRANGEBYSCORE*, *ZREVRANGE*,
-    // *ZREVRANGEBYSCORE*.
-    QueuedRedis& zrange(const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores = false) {
-        return command(cmd::zrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key, const Interval &interval) {
-        return zrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                bool with_scores = false) {
-        return command(cmd::zrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                bool with_scores = false) {
-        return zrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrank, key, member);
-    }
-
-    QueuedRedis& zrem(const StringView &key, const StringView &member) {
-        return command(cmd::zrem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& zrem(const StringView &key, Input first, Input last) {
-        return command(cmd::zrem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebylex(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebylex<Interval>, key, interval);
-    }
-
-    QueuedRedis& zremrangebyrank(const StringView &key, long long start, long long stop) {
-        return command(cmd::zremrangebyrank, key, start, stop);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebyscore(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebyscore<Interval>, key, interval);
-    }
-
-    // See comments on *ZRANGE*.
-    QueuedRedis& zrevrange(const StringView &key,
-                            long long start,
-                            long long stop,
-                            bool with_scores = false) {
-        return command(cmd::zrevrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key, const Interval &interval) {
-        return zrevrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    const LimitOptions &opts,
-                                    bool with_scores = false) {
-        return command(cmd::zrevrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    bool with_scores = false) {
-        return zrevrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrevrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrevrank, key, member);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::zscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return zscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return zscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor) {
-        return zscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& zscore(const StringView &key, const StringView &member) {
-        return command(cmd::zscore, key, member);
-    }
-
-    QueuedRedis& zunionstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zunionstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        return command(cmd::zunionstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    QueuedRedis& pfadd(const StringView &key, const StringView &element) {
-        return command(cmd::pfadd, key, element);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfadd(const StringView &key, Input first, Input last) {
-        return command(cmd::pfadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& pfcount(const StringView &key) {
-        return command(cmd::pfcount, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfcount(Input first, Input last) {
-        return command(cmd::pfcount_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    QueuedRedis& pfmerge(const StringView &destination, const StringView &key) {
-        return command(cmd::pfmerge, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfmerge(const StringView &destination, Input first, Input last) {
-        return command(cmd::pfmerge_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        return pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    QueuedRedis& geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-        return command(cmd::geoadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geoadd(const StringView &key,
-                        Input first,
-                        Input last) {
-        return command(cmd::geoadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geoadd(const StringView &key, std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M) {
-        return command(cmd::geodist, key, member1, member2, unit);
-    }
-
-    template <typename Input>
-    QueuedRedis& geohash(const StringView &key, Input first, Input last) {
-        return command(cmd::geohash_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geohash(const StringView &key, std::initializer_list<T> il) {
-        return geohash(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& geopos(const StringView &key, Input first, Input last) {
-        return command(cmd::geopos_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geopos(const StringView &key, std::initializer_list<T> il) {
-        return geopos(key, il.begin(), il.end());
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            const StringView &destination,
-                            bool store_dist,
-                            long long count) {
-        _georadius_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadius_store,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // NOTE: *QueuedRedis::georadius*'s parameters are different from *Redis::georadius*.
-    // *Redis::georadius* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::georadius*. So we have to use extra parameters to decide
-    // whether we should send options to Redis. This also applies to *GEORADIUSBYMEMBER*.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            bool with_coord,
-                            bool with_dist,
-                            bool with_hash) {
-        return command(cmd::georadius,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-        _georadius_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // See the comments on *GEORADIUS*.
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    long long count,
-                                    bool asc,
-                                    bool with_coord,
-                                    bool with_dist,
-                                    bool with_hash) {
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    // SCRIPTING commands.
-
-    QueuedRedis& eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-        return command(cmd::eval, script, keys, args);
-    }
-
-    QueuedRedis& evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-        return command(cmd::evalsha, script, keys, args);
-    }
-
-    template <typename Input>
-    QueuedRedis& script_exists(Input first, Input last) {
-        return command(cmd::script_exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& script_exists(std::initializer_list<T> il) {
-        return script_exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& script_flush() {
-        return command(cmd::script_flush);
-    }
-
-    QueuedRedis& script_kill() {
-        return command(cmd::script_kill);
-    }
-
-    QueuedRedis& script_load(const StringView &script) {
-        return command(cmd::script_load, script);
-    }
-
-    // PUBSUB commands.
-
-    QueuedRedis& publish(const StringView &channel, const StringView &message) {
-        return command(cmd::publish, channel, message);
-    }
-
-    // Stream commands.
-
-    QueuedRedis& xack(const StringView &key, const StringView &group, const StringView &id) {
-        return command(cmd::xack, key, group, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xack(const StringView &key, const StringView &group, Input first, Input last) {
-        return command(cmd::xack_range<Input>, key, group, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, Input first, Input last) {
-        return command(cmd::xadd_range<Input>, key, id, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true) {
-        return command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    QueuedRedis& xclaim(const StringView &key,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const std::chrono::milliseconds &min_idle_time,
-                        const StringView &id) {
-        return command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last) {
-        return command(cmd::xclaim_range<Input>,
-                        key,
-                        group,
-                        consumer,
-                        min_idle_time.count(),
-                        first,
-                        last);
-    }
-
-    template <typename T>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il) {
-        return xclaim(key, group, consumer, min_idle_time, il.begin(), il.end());
-    }
-
-    QueuedRedis& xdel(const StringView &key, const StringView &id) {
-        return command(cmd::xdel, key, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xdel(const StringView &key, Input first, Input last) {
-        return command(cmd::xdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& xgroup_create(const StringView &key,
-                                const StringView &group,
-                                const StringView &id,
-                                bool mkstream = false) {
-        return command(cmd::xgroup_create, key, group, id, mkstream);
-    }
-
-    QueuedRedis& xgroup_setid(const StringView &key,
-                                const StringView &group,
-                                const StringView &id) {
-        return command(cmd::xgroup_setid, key, group, id);
-    }
-
-    QueuedRedis& xgroup_destroy(const StringView &key, const StringView &group) {
-        return command(cmd::xgroup_destroy, key, group);
-    }
-
-    QueuedRedis& xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer) {
-        return command(cmd::xgroup_delconsumer, key, group, consumer);
-    }
-
-    QueuedRedis& xlen(const StringView &key) {
-        return command(cmd::xlen, key);
-    }
-
-    QueuedRedis& xpending(const StringView &key, const StringView &group) {
-        return command(cmd::xpending, key, group);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-        return command(cmd::xpending_detail, key, group, start, end, count);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer) {
-        return command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end) {
-        return command(cmd::xrange, key, start, end);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count) {
-        return command(cmd::xrange, key, start, end, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id, long long count) {
-        return command(cmd::xread, key, id, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id) {
-        return xread(key, id, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last, long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xread_range<Input>, first, last, count);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, 0);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count) {
-        return command(cmd::xread_block, key, id, timeout.count(), count);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout) {
-        return xread(key, id, timeout, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, timeout, 0);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, 0, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup_block,
-                        group,
-                        consumer,
-                        key,
-                        id,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xreadgroup_block_range<Input>,
-                        group,
-                        consumer,
-                        first,
-                        last,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, 0, false);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start) {
-        return command(cmd::xrevrange, key, end, start);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-        return command(cmd::xrevrange, key, end, start, count);
-    }
-
-    QueuedRedis& xtrim(const StringView &key, long long count, bool approx = true) {
-        return command(cmd::xtrim, key, count, approx);
-    }
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    template <typename ...Args>
-    QueuedRedis(const ConnectionSPtr &connection, Args &&...args);
-
-    void _sanity_check() const;
-
-    void _reset();
-
-    void _invalidate();
-
-    void _rewrite_replies(std::vector<ReplyUPtr> &replies) const;
-
-    template <typename Func>
-    void _rewrite_replies(const std::vector<std::size_t> &indexes,
-                            Func rewriter,
-                            std::vector<ReplyUPtr> &replies) const;
-
-    ConnectionSPtr _connection;
-
-    Impl _impl;
-
-    std::size_t _cmd_num = 0;
-
-    std::vector<std::size_t> _set_cmd_indexes;
-
-    std::vector<std::size_t> _georadius_cmd_indexes;
-
-    bool _valid = true;
-};
-
-class QueuedReplies {
-public:
-    std::size_t size() const;
-
-    redisReply& get(std::size_t idx);
-
-    template <typename Result>
-    Result get(std::size_t idx);
-
-    template <typename Output>
-    void get(std::size_t idx, Output output);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    explicit QueuedReplies(std::vector<ReplyUPtr> replies) : _replies(std::move(replies)) {}
-
-    void _index_check(std::size_t idx) const;
-
-    std::vector<ReplyUPtr> _replies;
-};
-
-}
-
-}
-
-#include "queued_redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/queued_redis.hpp b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/queued_redis.hpp
deleted file mode 100644
index 409f48aca..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/queued_redis.hpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>::QueuedRedis(const ConnectionSPtr &connection, Args &&...args) :
-            _connection(connection),
-            _impl(std::forward<Args>(args)...) {
-    assert(_connection);
-}
-
-template <typename Impl>
-Redis QueuedRedis<Impl>::redis() {
-    return Redis(_connection);
-}
-
-template <typename Impl>
-template <typename Cmd, typename ...Args>
-auto QueuedRedis<Impl>::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                QueuedRedis<Impl>&>::type {
-    try {
-        _sanity_check();
-
-        _impl.command(*_connection, cmd, std::forward<Args>(args)...);
-
-        ++_cmd_num;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-
-    return *this;
-}
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>& QueuedRedis<Impl>::command(const StringView &cmd_name, Args &&...args) {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Impl>
-template <typename Input>
-auto QueuedRedis<Impl>::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, QueuedRedis<Impl>&>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Impl>
-QueuedReplies QueuedRedis<Impl>::exec() {
-    try {
-        _sanity_check();
-
-        auto replies = _impl.exec(*_connection, _cmd_num);
-
-        _rewrite_replies(replies);
-
-        _reset();
-
-        return QueuedReplies(std::move(replies));
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::discard() {
-    try {
-        _sanity_check();
-
-        _impl.discard(*_connection, _cmd_num);
-
-        _reset();
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_sanity_check() const {
-    if (!_valid) {
-        throw Error("Not in valid state");
-    }
-
-    if (_connection->broken()) {
-        throw Error("Connection is broken");
-    }
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_reset() {
-    _cmd_num = 0;
-
-    _set_cmd_indexes.clear();
-
-    _georadius_cmd_indexes.clear();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_invalidate() {
-    _valid = false;
-
-    _reset();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_rewrite_replies(std::vector<ReplyUPtr> &replies) const {
-    _rewrite_replies(_set_cmd_indexes, reply::rewrite_set_reply, replies);
-
-    _rewrite_replies(_georadius_cmd_indexes, reply::rewrite_georadius_reply, replies);
-}
-
-template <typename Impl>
-template <typename Func>
-void QueuedRedis<Impl>::_rewrite_replies(const std::vector<std::size_t> &indexes,
-                                            Func rewriter,
-                                            std::vector<ReplyUPtr> &replies) const {
-    for (auto idx : indexes) {
-        assert(idx < replies.size());
-
-        auto &reply = replies[idx];
-
-        assert(reply);
-
-        rewriter(*reply);
-    }
-}
-
-inline std::size_t QueuedReplies::size() const {
-    return _replies.size();
-}
-
-inline redisReply& QueuedReplies::get(std::size_t idx) {
-    _index_check(idx);
-
-    auto &reply = _replies[idx];
-
-    assert(reply);
-
-    return *reply;
-}
-
-template <typename Result>
-inline Result QueuedReplies::get(std::size_t idx) {
-    auto &reply = get(idx);
-
-    return reply::parse<Result>(reply);
-}
-
-template <typename Output>
-inline void QueuedReplies::get(std::size_t idx, Output output) {
-    auto &reply = get(idx);
-
-    reply::to_array(reply, output);
-}
-
-inline void QueuedReplies::_index_check(std::size_t idx) const {
-    if (idx >= size()) {
-        throw Error("Out of range");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis++.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis++.h
deleted file mode 100644
index 0da0ebb16..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis++.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-#define SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-
-#include "redis.h"
-#include "redis_cluster.h"
-#include "queued_redis.h"
-#include "sentinel.h"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis.h
deleted file mode 100644
index b54afb96b..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis.h
+++ /dev/null
@@ -1,1523 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_H
-
-#include <string>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <tuple>
-#include "connection_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class Redis {
-public:
-    Redis(const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) : _pool(pool_opts, connection_opts) {}
-
-    // Construct Redis instance with URI:
-    // "tcp://127.0.0.1", "tcp://127.0.0.1:6379", or "unix://path/to/socket"
-    explicit Redis(const std::string &uri);
-
-    Redis(const std::shared_ptr<Sentinel> &sentinel,
-            const std::string &master_name,
-            Role role,
-            const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(SimpleSentinel(sentinel, master_name, role), pool_opts, connection_opts) {}
-
-    Redis(const Redis &) = delete;
-    Redis& operator=(const Redis &) = delete;
-
-    Redis(Redis &&) = default;
-    Redis& operator=(Redis &&) = default;
-
-    Pipeline pipeline();
-
-    Transaction transaction(bool piped = false);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type;
-
-    template <typename Result, typename ...Args>
-    Result command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // CONNECTION commands.
-
-    void auth(const StringView &password);
-
-    std::string echo(const StringView &msg);
-
-    std::string ping();
-
-    std::string ping(const StringView &msg);
-
-    // After sending QUIT, only the current connection will be close, while
-    // other connections in the pool is still open. This is a strange behavior.
-    // So we DO NOT support the QUIT command. If you want to quit connection to
-    // server, just destroy the Redis object.
-    //
-    // void quit();
-
-    // We get a connection from the pool, and send the SELECT command to switch
-    // to a specified DB. However, when we try to send other commands to the
-    // given DB, we might get a different connection from the pool, and these
-    // commands, in fact, work on other DB. e.g.
-    //
-    // redis.select(1); // get a connection from the pool and switch to the 1th DB
-    // redis.get("key"); // might get another connection from the pool,
-    //                   // and try to get 'key' on the default DB
-    //
-    // Obviously, this is NOT what we expect. So we DO NOT support SELECT command.
-    // In order to select a DB, we can specify the DB index with the ConnectionOptions.
-    //
-    // However, since Pipeline and Transaction always send multiple commands on a
-    // single connection, these two classes have a *select* method.
-    //
-    // void select(long long idx);
-
-    void swapdb(long long idx1, long long idx2);
-
-    // SERVER commands.
-
-    void bgrewriteaof();
-
-    void bgsave();
-
-    long long dbsize();
-
-    void flushall(bool async = false);
-
-    void flushdb(bool async = false);
-
-    std::string info();
-
-    std::string info(const StringView &section);
-
-    long long lastsave();
-
-    void save();
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    template <typename Output>
-    void keys(const StringView &pattern, Output output);
-
-    bool move(const StringView &key, long long db);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    OptionalString randomkey();
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    long long count,
-                    Output output);
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    long long wait(long long numslaves, long long timeout);
-
-    long long wait(long long numslaves, const std::chrono::milliseconds &timeout);
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    // There's no aggregation type parameter for single key overload, since these 3 types
-    // have the same effect.
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    // If *Input* is an iterator of a container of string,
-    // we use the default weight, i.e. 1, and send
-    // *ZINTERSTORE destination numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    // If *Input* is an iterator of a container of pair<string, double>, i.e. key-weight pair,
-    // we send the command with the given weights:
-    // *ZINTERSTORE destination numkeys key [key ...]
-    // [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*
-    //
-    // The following code use the default weight:
-    //
-    // vector<string> keys = {"k1", "k2", "k3"};
-    // redis.zinterstore(destination, keys.begin(), keys.end());
-    //
-    // On the other hand, the following code use the given weights:
-    //
-    // vector<pair<string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}, {"k3", 3}};
-    // redis.zinterstore(destination, keys_with_weights.begin(), keys_with_weights.end());
-    //
-    // NOTE: `keys_with_weights` can also be of type `unordered_map<string, double>`.
-    // However, it will be slower than vector<pair<string, double>>, since we use
-    // `distance(first, last)` to calculate the *numkeys* parameter.
-    //
-    // This also applies to *ZUNIONSTORE* command.
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    // There's no aggregation type parameter for single key overload, since these 3 types
-    // have the same effect.
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    // See *zinterstore* comment for how to use this method.
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void script_exists(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void script_exists(std::initializer_list<T> il, Output output) {
-        script_exists(il.begin(), il.end(), output);
-    }
-
-    void script_flush();
-
-    void script_kill();
-
-    std::string script_load(const StringView &script);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Transaction commands.
-    void watch(const StringView &key);
-
-    template <typename Input>
-    void watch(Input first, Input last);
-
-    template <typename T>
-    void watch(std::initializer_list<T> il) {
-        watch(il.begin(), il.end());
-    }
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first ,last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class ConnectionPoolGuard {
-    public:
-        ConnectionPoolGuard(ConnectionPool &pool,
-                            Connection &connection) : _pool(pool), _connection(connection) {}
-
-        ~ConnectionPoolGuard() {
-            _pool.release(std::move(_connection));
-        }
-
-    private:
-        ConnectionPool &_pool;
-        Connection &_connection;
-    };
-
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    friend class RedisCluster;
-
-    // For internal use.
-    explicit Redis(const ConnectionSPtr &connection);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Connection &connection, Cmd cmd, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    // Pool Mode.
-    // Public constructors create a *Redis* instance with a pool.
-    // In this case, *_connection* is a null pointer, and is never used.
-    ConnectionPool _pool;
-
-    // Single Connection Mode.
-    // Private constructor creats a *Redis* instance with a single connection.
-    // This is used when we create Transaction, Pipeline and Subscriber.
-    // In this case, *_pool* is empty, and is never used.
-    ConnectionSPtr _connection;
-};
-
-}
-
-}
-
-#include "redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis.hpp b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis.hpp
deleted file mode 100644
index 3a227a6f1..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis.hpp
+++ /dev/null
@@ -1,1365 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_HPP
-
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename ...Args>
-auto Redis::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    if (_connection) {
-        // Single Connection Mode.
-        // TODO: In this case, should we reconnect?
-        if (_connection->broken()) {
-            throw Error("Connection is broken");
-        }
-
-        return _command(*_connection, cmd, std::forward<Args>(args)...);
-    } else {
-        // Pool Mode, i.e. get connection from pool.
-        auto connection = _pool.fetch();
-
-        assert(!connection.broken());
-
-        ConnectionPoolGuard guard(_pool, connection);
-
-        return _command(connection, cmd, std::forward<Args>(args)...);
-    }
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename ...Args>
-Result Redis::command(const StringView &cmd_name, Args &&...args) {
-    auto r = command(cmd_name, std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args) - 1>(),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Result, typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto Redis::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long Redis::del(Input first, Input last) {
-    if (first == last) {
-        throw Error("DEL: no key specified");
-    }
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::exists(Input first, Input last) {
-    if (first == last) {
-        throw Error("EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool Redis::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool Redis::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-template <typename Output>
-void Redis::keys(const StringView &pattern, Output output) {
-    auto reply = command(cmd::keys, pattern);
-
-    reply::to_array(*reply, output);
-}
-
-inline bool Redis::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool Redis::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void Redis::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Output>
-long long Redis::scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::scan, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return scan(cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                long long count,
-                                Output output) {
-    return scan(cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                Output output) {
-    return scan(cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::touch(Input first, Input last) {
-    if (first == last) {
-        throw Error("TOUCH: no key specified");
-    }
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::unlink(Input first, Input last) {
-    if (first == last) {
-        throw Error("UNLINK: no key specified");
-    }
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline long long Redis::wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-    return wait(numslaves, timeout.count());
-}
-
-// STRING commands.
-
-template <typename Input>
-long long Redis::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("BITOP: no key specified");
-    }
-
-    auto reply = command(cmd::bitop_range<Input>, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::mget(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("MGET: no key specified");
-    }
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void Redis::mset(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSET: no key specified");
-    }
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool Redis::msetnx(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSETNX: no key specified");
-    }
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void Redis::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void Redis::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BLPOP: no key specified");
-    }
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BRPOP: no key specified");
-    }
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString Redis::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long Redis::lpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("LPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long Redis::rpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("RPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long Redis::hdel(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HDEL: no key specified");
-    }
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void Redis::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void Redis::hmget(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("HMGET: no key specified");
-    }
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void Redis::hmset(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HMSET: no key specified");
-    }
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long Redis::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Output>
-inline void Redis::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long Redis::sadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SADD: no key specified");
-    }
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sdiff(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SDIFF: no key specified");
-    }
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    if (first == last) {
-        throw Error("SDIFFSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sinter(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SINTER: no key specified");
-    }
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sinterstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    if (first == last) {
-        throw Error("SINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::srem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SREM: no key specified");
-    }
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long Redis::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void Redis::sunion(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SUNION: no key specified");
-    }
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sunionstore(const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto Redis::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto Redis::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long Redis::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    if (first == last) {
-        throw Error("ZADD: no key specified");
-    }
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    if (first == last) {
-        throw Error("ZINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::zrem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("ZREM: no key specified");
-    }
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void Redis::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long Redis::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    if (first == last) {
-        throw Error("ZUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool Redis::pfadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("PFADD: no key specified");
-    }
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long Redis::pfcount(Input first, Input last) {
-    if (first == last) {
-        throw Error("PFCOUNT: no key specified");
-    }
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void Redis::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    if (first == last) {
-        throw Error("PFMERGE: no key specified");
-    }
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long Redis::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    if (first == last) {
-        throw Error("GEOADD: no key specified");
-    }
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::geohash(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOHASH: no key specified");
-    }
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::geopos(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOPOS: no key specified");
-    }
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result>
-Result Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    auto reply = command(cmd::eval, script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output) {
-    auto reply = command(cmd::eval, script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Result>
-Result Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-    auto reply = command(cmd::evalsha, script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    auto reply = command(cmd::evalsha, script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::script_exists(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SCRIPT EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::script_exists_range<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-// Transaction commands.
-
-template <typename Input>
-void Redis::watch(Input first, Input last) {
-    auto reply = command(cmd::watch_range<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long Redis::xack(const StringView &key, const StringView &group, Input first, Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key, const StringView &id, Input first, Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    const StringView &id,
-                    Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    Input first,
-                    Input last,
-                    Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto Redis::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        const StringView &consumer,
-                        Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup_block,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = command(cmd::xreadgroup_block_range<Input>,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr Redis::_command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    auto reply = connection.recv();
-
-    return reply;
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis_cluster.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis_cluster.h
deleted file mode 100644
index 50a221367..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis_cluster.h
+++ /dev/null
@@ -1,1395 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-
-#include <string>
-#include <chrono>
-#include <initializer_list>
-#include <tuple>
-#include "shards_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "redis.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class RedisCluster {
-public:
-    RedisCluster(const ConnectionOptions &connection_opts,
-                    const ConnectionPoolOptions &pool_opts = {}) :
-                        _pool(pool_opts, connection_opts) {}
-
-    // Construct RedisCluster with URI:
-    // "tcp://127.0.0.1" or "tcp://127.0.0.1:6379"
-    // Only need to specify one URI.
-    explicit RedisCluster(const std::string &uri);
-
-    RedisCluster(const RedisCluster &) = delete;
-    RedisCluster& operator=(const RedisCluster &) = delete;
-
-    RedisCluster(RedisCluster &&) = default;
-    RedisCluster& operator=(RedisCluster &&) = default;
-
-    Redis redis(const StringView &hash_tag);
-
-    Pipeline pipeline(const StringView &hash_tag);
-
-    Transaction transaction(const StringView &hash_tag, bool piped = false);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && IsIter<typename LastType<Key, Args...>::type>::value, void>::type;
-
-    template <typename Result, typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type;
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class Command {
-    public:
-        explicit Command(const StringView &cmd_name) : _cmd_name(cmd_name) {}
-
-        template <typename ...Args>
-        void operator()(Connection &connection, Args &&...args) const {
-            CmdArgs cmd_args;
-            cmd_args.append(_cmd_name, std::forward<Args>(args)...);
-            connection.send(cmd_args);
-        }
-
-    private:
-        StringView _cmd_name;
-    };
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, Connection &connection, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::true_type, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::false_type, Input &&first, Args &&...args);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::true_type, Input input, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::false_type, Input input, Args &&...args);
-
-    void _asking(Connection &connection);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    ShardsPool _pool;
-};
-
-}
-
-}
-
-#include "redis_cluster.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis_cluster.hpp b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis_cluster.hpp
deleted file mode 100644
index 61da3f062..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/redis_cluster.hpp
+++ /dev/null
@@ -1,1415 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-
-#include <utility>
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-#include "shards_pool.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    return _command(cmd,
-                    std::is_convertible<typename std::decay<Key>::type, StringView>(),
-                    std::forward<Key>(key),
-                    std::forward<Args>(args)...);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-        || std::is_arithmetic<typename std::decay<Key>::type>::value)
-        && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = Command(cmd_name);
-
-    return _generic_command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Result, typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type {
-    auto r = command(cmd_name, std::forward<Key>(key), std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value)
-            && IsIter<typename LastType<Key, Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args)>(),
-                        std::forward<Key>(key),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last || std::next(first) == last) {
-        throw Error("command: invalid range");
-    }
-
-    const auto &key = *first;
-    ++first;
-
-    auto cmd = [&key](Connection &connection, Input first, Input last) {
-                        CmdArgs cmd_args;
-                        cmd_args.append(key);
-                        while (first != last) {
-                            cmd_args.append(*first);
-                            ++first;
-                        }
-                        connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long RedisCluster::del(Input first, Input last) {
-    if (first == last) {
-        throw Error("DEL: no key specified");
-    }
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::exists(Input first, Input last) {
-    if (first == last) {
-        throw Error("EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool RedisCluster::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool RedisCluster::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-inline bool RedisCluster::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool RedisCluster::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void RedisCluster::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Input>
-long long RedisCluster::touch(Input first, Input last) {
-    if (first == last) {
-        throw Error("TOUCH: no key specified");
-    }
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::unlink(Input first, Input last) {
-    if (first == last) {
-        throw Error("UNLINK: no key specified");
-    }
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-template <typename Input>
-long long RedisCluster::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("BITOP: no key specified");
-    }
-
-    auto reply = _command(cmd::bitop_range<Input>, destination, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::mget(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("MGET: no key specified");
-    }
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void RedisCluster::mset(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSET: no key specified");
-    }
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool RedisCluster::msetnx(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSETNX: no key specified");
-    }
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void RedisCluster::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void RedisCluster::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BLPOP: no key specified");
-    }
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BRPOP: no key specified");
-    }
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString RedisCluster::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long RedisCluster::lpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("LPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long RedisCluster::rpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("RPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long RedisCluster::hdel(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HDEL: no key specified");
-    }
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void RedisCluster::hmget(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("HMGET: no key specified");
-    }
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void RedisCluster::hmset(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HMSET: no key specified");
-    }
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long RedisCluster::sadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SADD: no key specified");
-    }
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sdiff(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SDIFF: no key specified");
-    }
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sdiffstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    if (first == last) {
-        throw Error("SDIFFSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sinter(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SINTER: no key specified");
-    }
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sinterstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    if (first == last) {
-        throw Error("SINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::srem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SREM: no key specified");
-    }
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sunion(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SUNION: no key specified");
-    }
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sunionstore(const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto RedisCluster::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmax(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto RedisCluster::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmin(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long RedisCluster::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    if (first == last) {
-        throw Error("ZADD: no key specified");
-    }
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    if (first == last) {
-        throw Error("ZINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::zrem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("ZREM: no key specified");
-    }
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void RedisCluster::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long RedisCluster::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long RedisCluster::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    if (first == last) {
-        throw Error("ZUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool RedisCluster::pfadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("PFADD: no key specified");
-    }
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::pfcount(Input first, Input last) {
-    if (first == last) {
-        throw Error("PFCOUNT: no key specified");
-    }
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void RedisCluster::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    if (first == last) {
-        throw Error("PFMERGE: no key specified");
-    }
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long RedisCluster::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    if (first == last) {
-        throw Error("GEOADD: no key specified");
-    }
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geohash(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOHASH: no key specified");
-    }
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geopos(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOPOS: no key specified");
-    }
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result>
-Result RedisCluster::eval(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval, *keys.begin(), script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval, *keys.begin(), script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Result>
-Result RedisCluster::evalsha(const StringView &script,
-                                std::initializer_list<StringView> keys,
-                                std::initializer_list<StringView> args) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha, *keys.begin(), script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args,
-                            Output output) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = command(cmd::evalsha, *keys.begin(), script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long RedisCluster::xack(const StringView &key,
-                                const StringView &group,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            const StringView &id,
-                            Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            Input first,
-                            Input last,
-                            Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto RedisCluster::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer,
-                            Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first,
-                            Input last,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup, key, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = _command(cmd::xreadgroup_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup_block,
-                            key,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = _command(cmd::xreadgroup_block_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                                const StringView &end,
-                                const StringView &start,
-                                long long count,
-                                Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                ReplyUPtr>::type {
-    return command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                ReplyUPtr>::type {
-    auto k = std::to_string(std::forward<Key>(key));
-    return command(cmd, k, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::true_type, const StringView &key, Args &&...args) {
-    return _command(cmd, key, key, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::false_type, Input &&first, Args &&...args) {
-    return _range_command(cmd,
-                            std::is_convertible<
-                                typename std::decay<
-                                    decltype(*std::declval<Input>())>::type, StringView>(),
-                            std::forward<Input>(first),
-                            std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::true_type, Input input, Args &&...args) {
-    return _command(cmd, *input, input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::false_type, Input input, Args &&...args) {
-    return _command(cmd, std::get<0>(*input), input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, Connection &connection, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    return connection.recv();
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, const StringView &key, Args &&...args) {
-    for (auto idx = 0; idx < 2; ++idx) {
-        try {
-            auto guarded_connection = _pool.fetch(key);
-
-            return _command(cmd, guarded_connection.connection(), std::forward<Args>(args)...);
-        } catch (const IoError &err) {
-            // When master is down, one of its replicas will be promoted to be the new master.
-            // If we try to send command to the old master, we'll get an *IoError*.
-            // In this case, we need to update the slots mapping.
-            _pool.update();
-        } catch (const ClosedError &err) {
-            // Node might be removed.
-            // 1. Get up-to-date slot mapping to check if the node still exists.
-            _pool.update();
-
-            // TODO:
-            // 2. If it's NOT exist, update slot mapping, and retry.
-            // 3. If it's still exist, that means the node is down, NOT removed, throw exception.
-        } catch (const MovedError &err) {
-            // Slot mapping has been changed, update it and try again.
-            _pool.update();
-        } catch (const AskError &err) {
-            auto guarded_connection = _pool.fetch(err.node());
-            auto &connection = guarded_connection.connection();
-
-            // 1. send ASKING command.
-            _asking(connection);
-
-            // 2. resend last command.
-            try {
-                return _command(cmd, connection, std::forward<Args>(args)...);
-            } catch (const MovedError &err) {
-                throw Error("Slot migrating... ASKING node hasn't been set to IMPORTING state");
-            }
-        } // For other exceptions, just throw it.
-    }
-
-    // Possible failures:
-    // 1. Source node has already run 'CLUSTER SETSLOT xxx NODE xxx',
-    //    while the destination node has NOT run it.
-    //    In this case, client will be redirected by both nodes with MovedError.
-    // 2. Other failures...
-    throw Error("Failed to send command with key: " + std::string(key.data(), key.size()));
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/reply.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/reply.h
deleted file mode 100644
index b309de5bb..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/reply.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REPLY_H
-#define SEWENEW_REDISPLUSPLUS_REPLY_H
-
-#include <cassert>
-#include <string>
-#include <memory>
-#include <functional>
-#include <tuple>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ReplyDeleter {
-    void operator()(redisReply *reply) const {
-        if (reply != nullptr) {
-            freeReplyObject(reply);
-        }
-    }
-};
-
-using ReplyUPtr = std::unique_ptr<redisReply, ReplyDeleter>;
-
-namespace reply {
-
-template <typename T>
-struct ParseTag {};
-
-template <typename T>
-inline T parse(redisReply &reply) {
-    return parse(ParseTag<T>(), reply);
-}
-
-void parse(ParseTag<void>, redisReply &reply);
-
-std::string parse(ParseTag<std::string>, redisReply &reply);
-
-long long parse(ParseTag<long long>, redisReply &reply);
-
-double parse(ParseTag<double>, redisReply &reply);
-
-bool parse(ParseTag<bool>, redisReply &reply);
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply);
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply);
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output);
-
-inline bool is_error(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ERROR;
-}
-
-inline bool is_nil(redisReply &reply) {
-    return reply.type == REDIS_REPLY_NIL;
-}
-
-inline bool is_string(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STRING;
-}
-
-inline bool is_status(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STATUS;
-}
-
-inline bool is_integer(redisReply &reply) {
-    return reply.type == REDIS_REPLY_INTEGER;
-}
-
-inline bool is_array(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ARRAY;
-}
-
-std::string to_status(redisReply &reply);
-
-template <typename Output>
-void to_array(redisReply &reply, Output output);
-
-// Rewrite set reply to bool type
-void rewrite_set_reply(redisReply &reply);
-
-// Rewrite georadius reply to OptionalLongLong type
-void rewrite_georadius_reply(redisReply &reply);
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString>;
-
-}
-
-// Inline implementations.
-
-namespace reply {
-
-namespace detail {
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        auto *sub_reply = reply.element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null array element reply");
-        }
-
-        *output = parse<typename IterType<Output>::type>(*sub_reply);
-
-        ++output;
-    }
-}
-
-bool is_flat_array(redisReply &reply);
-
-template <typename Output>
-void to_flat_array(redisReply &reply, Output output) {
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    if (reply.elements % 2 != 0) {
-        throw ProtoError("Not string pair array reply");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; idx += 2) {
-        auto *key_reply = reply.element[idx];
-        auto *val_reply = reply.element[idx + 1];
-        if (key_reply == nullptr || val_reply == nullptr) {
-            throw ProtoError("Null string array reply");
-        }
-
-        using Pair = typename IterType<Output>::type;
-        using FirstType = typename std::decay<typename Pair::first_type>::type;
-        using SecondType = typename std::decay<typename Pair::second_type>::type;
-        *output = std::make_pair(parse<FirstType>(*key_reply),
-                                    parse<SecondType>(*val_reply));
-
-        ++output;
-    }
-}
-
-template <typename Output>
-void to_array(std::true_type, redisReply &reply, Output output) {
-    if (is_flat_array(reply)) {
-        to_flat_array(reply, output);
-    } else {
-        to_array(reply, output);
-    }
-}
-
-template <typename Output>
-void to_array(std::false_type, redisReply &reply, Output output) {
-    to_array(reply, output);
-}
-
-template <typename T>
-std::tuple<T> parse_tuple(redisReply **reply, std::size_t idx) {
-    assert(reply != nullptr);
-
-    auto *sub_reply = reply[idx];
-    if (sub_reply == nullptr) {
-        throw ProtoError("Null reply");
-    }
-
-    return std::make_tuple(parse<T>(*sub_reply));
-}
-
-template <typename T, typename ...Args>
-auto parse_tuple(redisReply **reply, std::size_t idx) ->
-    typename std::enable_if<sizeof...(Args) != 0, std::tuple<T, Args...>>::type {
-    assert(reply != nullptr);
-
-    return std::tuple_cat(parse_tuple<T>(reply, idx),
-                            parse_tuple<Args...>(reply, idx + 1));
-}
-
-}
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply) {
-    if (reply::is_nil(reply)) {
-        return {};
-    }
-
-    return Optional<T>(parse<T>(reply));
-}
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != 2) {
-        throw ProtoError("NOT key-value PAIR reply");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null PAIR reply");
-    }
-
-    auto *first = reply.element[0];
-    auto *second = reply.element[1];
-    if (first == nullptr || second == nullptr) {
-        throw ProtoError("Null pair reply");
-    }
-
-    return std::make_pair(parse<typename std::decay<T>::type>(*first),
-                            parse<typename std::decay<U>::type>(*second));
-}
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply) {
-    constexpr auto size = sizeof...(Args);
-
-    static_assert(size > 0, "DO NOT support parsing tuple with 0 element");
-
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != size) {
-        throw ProtoError("Expect tuple reply with " + std::to_string(size) + "elements");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null TUPLE reply");
-    }
-
-    return detail::parse_tuple<Args...>(reply.element, 0);
-}
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::back_inserter(container));
-
-    return container;
-}
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::inserter(container, container.end()));
-
-    return container;
-}
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output) {
-    if (reply.elements != 2 || reply.element == nullptr) {
-        throw ProtoError("Invalid scan reply");
-    }
-
-    auto *cursor_reply = reply.element[0];
-    auto *data_reply = reply.element[1];
-    if (cursor_reply == nullptr || data_reply == nullptr) {
-        throw ProtoError("Invalid cursor reply or data reply");
-    }
-
-    auto cursor_str = reply::parse<std::string>(*cursor_reply);
-    auto new_cursor = 0;
-    try {
-        new_cursor = std::stoll(cursor_str);
-    } catch (const std::exception &e) {
-        throw ProtoError("Invalid cursor reply: " + cursor_str);
-    }
-
-    reply::to_array(*data_reply, output);
-
-    return new_cursor;
-}
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    detail::to_array(typename IsKvPairIter<Output>::type(), reply, output);
-}
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    if (!is_array(reply) || reply.elements != 4) {
-        throw ProtoError("expect array reply with 4 elements");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        if (reply.element[idx] == nullptr) {
-            throw ProtoError("null array reply");
-        }
-    }
-
-    auto num = parse<long long>(*(reply.element[0]));
-    auto start = parse<OptionalString>(*(reply.element[1]));
-    auto end = parse<OptionalString>(*(reply.element[2]));
-
-    auto &entry_reply = *(reply.element[3]);
-    if (!is_nil(entry_reply)) {
-        to_array(entry_reply, output);
-    }
-
-    return std::make_tuple(num, std::move(start), std::move(end));
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REPLY_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/sentinel.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/sentinel.h
deleted file mode 100644
index e80d1e56a..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/sentinel.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SENTINEL_H
-#define SEWENEW_REDISPLUSPLUS_SENTINEL_H
-
-#include <string>
-#include <list>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include "connection.h"
-#include "shards.h"
-#include "reply.h"
-
-namespace sw {
-
-namespace redis {
-
-struct SentinelOptions {
-    std::vector<std::pair<std::string, int>> nodes;
-
-    std::string password;
-
-    bool keep_alive = true;
-
-    std::chrono::milliseconds connect_timeout{100};
-
-    std::chrono::milliseconds socket_timeout{100};
-
-    std::chrono::milliseconds retry_interval{100};
-
-    std::size_t max_retry = 2;
-};
-
-class Sentinel {
-public:
-    explicit Sentinel(const SentinelOptions &sentinel_opts);
-
-    Sentinel(const Sentinel &) = delete;
-    Sentinel& operator=(const Sentinel &) = delete;
-
-    Sentinel(Sentinel &&) = delete;
-    Sentinel& operator=(Sentinel &&) = delete;
-
-    ~Sentinel() = default;
-
-private:
-    Connection master(const std::string &master_name, const ConnectionOptions &opts);
-
-    Connection slave(const std::string &master_name, const ConnectionOptions &opts);
-
-    class Iterator;
-
-    friend class SimpleSentinel;
-
-    std::list<ConnectionOptions> _parse_options(const SentinelOptions &opts) const;
-
-    Optional<Node> _get_master_addr_by_name(Connection &connection, const StringView &name);
-
-    std::vector<Node> _get_slave_addr_by_name(Connection &connection, const StringView &name);
-
-    Connection _connect_redis(const Node &node, ConnectionOptions opts);
-
-    Role _get_role(Connection &connection);
-
-    std::vector<Node> _parse_slave_info(redisReply &reply) const;
-
-    std::list<Connection> _healthy_sentinels;
-
-    std::list<ConnectionOptions> _broken_sentinels;
-
-    SentinelOptions _sentinel_opts;
-
-    std::mutex _mutex;
-};
-
-class SimpleSentinel {
-public:
-    SimpleSentinel(const std::shared_ptr<Sentinel> &sentinel,
-                    const std::string &master_name,
-                    Role role);
-
-    SimpleSentinel() = default;
-
-    SimpleSentinel(const SimpleSentinel &) = default;
-    SimpleSentinel& operator=(const SimpleSentinel &) = default;
-
-    SimpleSentinel(SimpleSentinel &&) = default;
-    SimpleSentinel& operator=(SimpleSentinel &&) = default;
-
-    ~SimpleSentinel() = default;
-
-    explicit operator bool() const {
-        return bool(_sentinel);
-    }
-
-    Connection create(const ConnectionOptions &opts);
-
-private:
-    std::shared_ptr<Sentinel> _sentinel;
-
-    std::string _master_name;
-
-    Role _role = Role::MASTER;
-};
-
-class StopIterError : public Error {
-public:
-    StopIterError() : Error("StopIterError") {}
-
-    StopIterError(const StopIterError &) = default;
-    StopIterError& operator=(const StopIterError &) = default;
-
-    StopIterError(StopIterError &&) = default;
-    StopIterError& operator=(StopIterError &&) = default;
-
-    virtual ~StopIterError() = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SENTINEL_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/shards.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/shards.h
deleted file mode 100644
index a0593acbc..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/shards.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_H
-
-#include <string>
-#include <map>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-using Slot = std::size_t;
-
-struct SlotRange {
-    Slot min;
-    Slot max;
-};
-
-inline bool operator<(const SlotRange &lhs, const SlotRange &rhs) {
-    return lhs.max < rhs.max;
-}
-
-struct Node {
-    std::string host;
-    int port;
-};
-
-inline bool operator==(const Node &lhs, const Node &rhs) {
-    return lhs.host == rhs.host && lhs.port == rhs.port;
-}
-
-struct NodeHash {
-    std::size_t operator()(const Node &node) const noexcept {
-        auto host_hash = std::hash<std::string>{}(node.host);
-        auto port_hash = std::hash<int>{}(node.port);
-        return host_hash ^ (port_hash << 1);
-    }
-};
-
-using Shards = std::map<SlotRange, Node>;
-
-class RedirectionError : public ReplyError {
-public:
-    RedirectionError(const std::string &msg);
-
-    RedirectionError(const RedirectionError &) = default;
-    RedirectionError& operator=(const RedirectionError &) = default;
-
-    RedirectionError(RedirectionError &&) = default;
-    RedirectionError& operator=(RedirectionError &&) = default;
-
-    virtual ~RedirectionError() = default;
-
-    Slot slot() const {
-        return _slot;
-    }
-
-    const Node& node() const {
-        return _node;
-    }
-
-private:
-    std::pair<Slot, Node> _parse_error(const std::string &msg) const;
-
-    Slot _slot = 0;
-    Node _node;
-};
-
-class MovedError : public RedirectionError {
-public:
-    explicit MovedError(const std::string &msg) : RedirectionError(msg) {}
-
-    MovedError(const MovedError &) = default;
-    MovedError& operator=(const MovedError &) = default;
-
-    MovedError(MovedError &&) = default;
-    MovedError& operator=(MovedError &&) = default;
-
-    virtual ~MovedError() = default;
-};
-
-class AskError : public RedirectionError {
-public:
-    explicit AskError(const std::string &msg) : RedirectionError(msg) {}
-
-    AskError(const AskError &) = default;
-    AskError& operator=(const AskError &) = default;
-
-    AskError(AskError &&) = default;
-    AskError& operator=(AskError &&) = default;
-
-    virtual ~AskError() = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/shards_pool.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/shards_pool.h
deleted file mode 100644
index 1184806e9..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/shards_pool.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-
-#include <cassert>
-#include <unordered_map>
-#include <string>
-#include <random>
-#include <memory>
-#include "reply.h"
-#include "connection_pool.h"
-#include "shards.h"
-
-namespace sw {
-
-namespace redis {
-
-using ConnectionPoolSPtr = std::shared_ptr<ConnectionPool>;
-
-class GuardedConnection {
-public:
-    GuardedConnection(const ConnectionPoolSPtr &pool) : _pool(pool),
-                                                        _connection(_pool->fetch()) {
-        assert(!_connection.broken());
-    }
-
-    GuardedConnection(const GuardedConnection &) = delete;
-    GuardedConnection& operator=(const GuardedConnection &) = delete;
-
-    GuardedConnection(GuardedConnection &&) = default;
-    GuardedConnection& operator=(GuardedConnection &&) = default;
-
-    ~GuardedConnection() {
-        _pool->release(std::move(_connection));
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPoolSPtr _pool;
-    Connection _connection;
-};
-
-class ShardsPool {
-public:
-    ShardsPool() = default;
-
-    ShardsPool(const ShardsPool &that) = delete;
-    ShardsPool& operator=(const ShardsPool &that) = delete;
-
-    ShardsPool(ShardsPool &&that);
-    ShardsPool& operator=(ShardsPool &&that);
-
-    ~ShardsPool() = default;
-
-    ShardsPool(const ConnectionPoolOptions &pool_opts,
-                const ConnectionOptions &connection_opts);
-
-    // Fetch a connection by key.
-    GuardedConnection fetch(const StringView &key);
-
-    // Randomly pick a connection.
-    GuardedConnection fetch();
-
-    // Fetch a connection by node.
-    GuardedConnection fetch(const Node &node);
-
-    void update();
-
-    ConnectionOptions connection_options(const StringView &key);
-
-    ConnectionOptions connection_options();
-
-private:
-    void _move(ShardsPool &&that);
-
-    void _init_pool(const Shards &shards);
-
-    Shards _cluster_slots(Connection &connection) const;
-
-    ReplyUPtr _cluster_slots_command(Connection &connection) const;
-
-    Shards _parse_reply(redisReply &reply) const;
-
-    std::pair<SlotRange, Node> _parse_slot_info(redisReply &reply) const;
-
-    // Get slot by key.
-    std::size_t _slot(const StringView &key) const;
-
-    // Randomly pick a slot.
-    std::size_t _slot() const;
-
-    ConnectionPoolSPtr& _get_pool(Slot slot);
-
-    GuardedConnection _fetch(Slot slot);
-
-    ConnectionOptions _connection_options(Slot slot);
-
-    using NodeMap = std::unordered_map<Node, ConnectionPoolSPtr, NodeHash>;
-
-    NodeMap::iterator _add_node(const Node &node);
-
-    ConnectionPoolOptions _pool_opts;
-
-    ConnectionOptions _connection_opts;
-
-    Shards _shards;
-
-    NodeMap _pools;
-
-    std::mutex _mutex;
-
-    static const std::size_t SHARDS = 16383;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/subscriber.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/subscriber.h
deleted file mode 100644
index 8b7c5cfb4..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/subscriber.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-#define SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-
-#include <unordered_map>
-#include <string>
-#include <functional>
-#include "connection.h"
-#include "reply.h"
-#include "command.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-// @NOTE: Subscriber is NOT thread-safe.
-// Subscriber uses callbacks to handle messages. There are 6 kinds of messages:
-// 1) MESSAGE: message sent to a channel.
-// 2) PMESSAGE: message sent to channels of a given pattern.
-// 3) SUBSCRIBE: meta message sent when we successfully subscribe to a channel.
-// 4) UNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel.
-// 5) PSUBSCRIBE: meta message sent when we successfully subscribe to a channel pattern.
-// 6) PUNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel pattern.
-//
-// Use Subscriber::on_message(MsgCallback) to set the callback function for message of
-// *MESSAGE* type, and the callback interface is:
-// void (std::string channel, std::string msg)
-//
-// Use Subscriber::on_pmessage(PatternMsgCallback) to set the callback function for message of
-// *PMESSAGE* type, and the callback interface is:
-// void (std::string pattern, std::string channel, std::string msg)
-//
-// Messages of other types are called *META MESSAGE*, they have the same callback interface.
-// Use Subscriber::on_meta(MetaCallback) to set the callback function:
-// void (Subscriber::MsgType type, OptionalString channel, long long num)
-//
-// NOTE: If we haven't subscribe/psubscribe to any channel/pattern, and try to
-// unsubscribe/punsubscribe without any parameter, i.e. unsubscribe/punsubscribe all
-// channels/patterns, *channel* will be null. So the second parameter of meta callback
-// is of type *OptionalString*.
-//
-// All these callback interfaces pass std::string by value, and you can take their ownership
-// (i.e. std::move) safely.
-//
-// If you don't set callback for a specific kind of message, Subscriber::consume() will
-// receive the message, and ignore it, i.e. no callback will be called.
-class Subscriber {
-public:
-    Subscriber(const Subscriber &) = delete;
-    Subscriber& operator=(const Subscriber &) = delete;
-
-    Subscriber(Subscriber &&) = default;
-    Subscriber& operator=(Subscriber &&) = default;
-
-    ~Subscriber() = default;
-
-    enum class MsgType {
-        SUBSCRIBE,
-        UNSUBSCRIBE,
-        PSUBSCRIBE,
-        PUNSUBSCRIBE,
-        MESSAGE,
-        PMESSAGE
-    };
-
-    template <typename MsgCb>
-    void on_message(MsgCb msg_callback);
-
-    template <typename PMsgCb>
-    void on_pmessage(PMsgCb pmsg_callback);
-
-    template <typename MetaCb>
-    void on_meta(MetaCb meta_callback);
-
-    void subscribe(const StringView &channel);
-
-    template <typename Input>
-    void subscribe(Input first, Input last);
-
-    template <typename T>
-    void subscribe(std::initializer_list<T> channels) {
-        subscribe(channels.begin(), channels.end());
-    }
-
-    void unsubscribe();
-
-    void unsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void unsubscribe(Input first, Input last);
-
-    template <typename T>
-    void unsubscribe(std::initializer_list<T> channels) {
-        unsubscribe(channels.begin(), channels.end());
-    }
-
-    void psubscribe(const StringView &pattern);
-
-    template <typename Input>
-    void psubscribe(Input first, Input last);
-
-    template <typename T>
-    void psubscribe(std::initializer_list<T> channels) {
-        psubscribe(channels.begin(), channels.end());
-    }
-
-    void punsubscribe();
-
-    void punsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void punsubscribe(Input first, Input last);
-
-    template <typename T>
-    void punsubscribe(std::initializer_list<T> channels) {
-        punsubscribe(channels.begin(), channels.end());
-    }
-
-    void consume();
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    explicit Subscriber(Connection connection);
-
-    MsgType _msg_type(redisReply *reply) const;
-
-    void _check_connection();
-
-    void _handle_message(redisReply &reply);
-
-    void _handle_pmessage(redisReply &reply);
-
-    void _handle_meta(MsgType type, redisReply &reply);
-
-    using MsgCallback = std::function<void (std::string channel, std::string msg)>;
-
-    using PatternMsgCallback = std::function<void (std::string pattern,
-                                                    std::string channel,
-                                                    std::string msg)>;
-
-    using MetaCallback = std::function<void (MsgType type,
-                                                OptionalString channel,
-                                                long long num)>;
-
-    using TypeIndex = std::unordered_map<std::string, MsgType>;
-    static const TypeIndex _msg_type_index;
-
-    Connection _connection;
-
-    MsgCallback _msg_callback = nullptr;
-
-    PatternMsgCallback _pmsg_callback = nullptr;
-
-    MetaCallback _meta_callback = nullptr;
-};
-
-template <typename MsgCb>
-void Subscriber::on_message(MsgCb msg_callback) {
-    _msg_callback = msg_callback;
-}
-
-template <typename PMsgCb>
-void Subscriber::on_pmessage(PMsgCb pmsg_callback) {
-    _pmsg_callback = pmsg_callback;
-}
-
-template <typename MetaCb>
-void Subscriber::on_meta(MetaCb meta_callback) {
-    _meta_callback = meta_callback;
-}
-
-template <typename Input>
-void Subscriber::subscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::subscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::unsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::unsubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::psubscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::psubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::punsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::punsubscribe_range(_connection, first, last);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/transaction.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/transaction.h
deleted file mode 100644
index f19f24889..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/transaction.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-#define SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class TransactionImpl {
-public:
-    explicit TransactionImpl(bool piped) : _piped(piped) {}
-
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args);
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t cmd_num);
-
-private:
-    void _open_transaction(Connection &connection);
-
-    void _close_transaction();
-
-    void _get_queued_reply(Connection &connection);
-
-    void _get_queued_replies(Connection &connection, std::size_t cmd_num);
-
-    std::vector<ReplyUPtr> _exec(Connection &connection);
-
-    void _discard(Connection &connection);
-
-    bool _in_transaction = false;
-
-    bool _piped;
-};
-
-template <typename Cmd, typename ...Args>
-void TransactionImpl::command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    if (!_in_transaction) {
-        _open_transaction(connection);
-    }
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    if (!_piped) {
-        _get_queued_reply(connection);
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TRANSACTION_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/utils.h b/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/utils.h
deleted file mode 100644
index e29e64e14..000000000
--- a/ext/redis-plus-plus-1.1.1/install/macos/include/sw/redis++/utils.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_UTILS_H
-
-#include <cstring>
-#include <string>
-#include <type_traits>
-
-namespace sw {
-
-namespace redis {
-
-// By now, not all compilers support std::string_view,
-// so we make our own implementation.
-class StringView {
-public:
-    constexpr StringView() noexcept = default;
-
-    constexpr StringView(const char *data, std::size_t size) : _data(data), _size(size) {}
-
-    StringView(const char *data) : _data(data), _size(std::strlen(data)) {}
-
-    StringView(const std::string &str) : _data(str.data()), _size(str.size()) {}
-
-    constexpr StringView(const StringView &) noexcept = default;
-
-    StringView& operator=(const StringView &) noexcept = default;
-
-    constexpr const char* data() const noexcept {
-        return _data;
-    }
-
-    constexpr std::size_t size() const noexcept {
-        return _size;
-    }
-
-private:
-    const char *_data = nullptr;
-    std::size_t _size = 0;
-};
-
-template <typename T>
-class Optional {
-public:
-    Optional() = default;
-
-    Optional(const Optional &) = default;
-    Optional& operator=(const Optional &) = default;
-
-    Optional(Optional &&) = default;
-    Optional& operator=(Optional &&) = default;
-
-    ~Optional() = default;
-
-    template <typename ...Args>
-    explicit Optional(Args &&...args) : _value(true, T(std::forward<Args>(args)...)) {}
-
-    explicit operator bool() const {
-        return _value.first;
-    }
-
-    T& value() {
-        return _value.second;
-    }
-
-    const T& value() const {
-        return _value.second;
-    }
-
-    T* operator->() {
-        return &(_value.second);
-    }
-
-    const T* operator->() const {
-        return &(_value.second);
-    }
-
-    T& operator*() {
-        return _value.second;
-    }
-
-    const T& operator*() const {
-        return _value.second;
-    }
-
-private:
-    std::pair<bool, T> _value;
-};
-
-using OptionalString = Optional<std::string>;
-
-using OptionalLongLong = Optional<long long>;
-
-using OptionalDouble = Optional<double>;
-
-using OptionalStringPair = Optional<std::pair<std::string, std::string>>;
-
-template <typename ...>
-struct IsKvPair : std::false_type {};
-
-template <typename T, typename U>
-struct IsKvPair<std::pair<T, U>> : std::true_type {};
-
-template <typename ...>
-using Void = void;
-
-template <typename T, typename U = Void<>>
-struct IsInserter : std::false_type {};
-
-template <typename T>
-//struct IsInserter<T, Void<typename T::container_type>> : std::true_type {};
-struct IsInserter<T,
-    typename std::enable_if<!std::is_void<typename T::container_type>::value>::type>
-        : std::true_type {};
-
-template <typename Iter, typename T = Void<>>
-struct IterType {
-    using type = typename std::iterator_traits<Iter>::value_type;
-};
-
-template <typename Iter>
-//struct IterType<Iter, Void<typename Iter::container_type>> {
-struct IterType<Iter,
-    //typename std::enable_if<std::is_void<typename Iter::value_type>::value>::type> {
-    typename std::enable_if<IsInserter<Iter>::value>::type> {
-    using type = typename std::decay<typename Iter::container_type::value_type>::type;
-};
-
-template <typename Iter, typename T = Void<>>
-struct IsIter : std::false_type {};
-
-template <typename Iter>
-struct IsIter<Iter, typename std::enable_if<IsInserter<Iter>::value>::type> : std::true_type {};
-
-template <typename Iter>
-//struct IsIter<Iter, Void<typename std::iterator_traits<Iter>::iterator_category>>
-struct IsIter<Iter,
-    typename std::enable_if<!std::is_void<
-        typename std::iterator_traits<Iter>::value_type>::value>::type>
-            : std::integral_constant<bool, !std::is_convertible<Iter, StringView>::value> {};
-
-template <typename T>
-struct IsKvPairIter : IsKvPair<typename IterType<T>::type> {};
-
-template <typename T, typename Tuple>
-struct TupleWithType : std::false_type {};
-
-template <typename T>
-struct TupleWithType<T, std::tuple<>> : std::false_type {};
-
-template <typename T, typename U, typename ...Args>
-struct TupleWithType<T, std::tuple<U, Args...>> : TupleWithType<T, std::tuple<Args...>> {};
-
-template <typename T, typename ...Args>
-struct TupleWithType<T, std::tuple<T, Args...>> : std::true_type {};
-
-template <std::size_t ...Is>
-struct IndexSequence {};
-
-template <std::size_t I, std::size_t ...Is>
-struct MakeIndexSequence : MakeIndexSequence<I - 1, I - 1, Is...> {};
-
-template <std::size_t ...Is>
-struct MakeIndexSequence<0, Is...> : IndexSequence<Is...> {};
-
-// NthType and NthValue are taken from
-// https://stackoverflow.com/questions/14261183
-template <std::size_t I, typename ...Args>
-struct NthType {};
-
-template <typename Arg, typename ...Args>
-struct NthType<0, Arg, Args...> {
-    using type = Arg;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-struct NthType<I, Arg, Args...> {
-    using type = typename NthType<I - 1, Args...>::type;
-};
-
-template <typename ...Args>
-struct LastType {
-    using type = typename NthType<sizeof...(Args) - 1, Args...>::type;
-};
-
-struct InvalidLastType {};
-
-template <>
-struct LastType<> {
-    using type = InvalidLastType;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&arg, Args &&...)
-    -> typename std::enable_if<(I == 0), decltype(std::forward<Arg>(arg))>::type {
-    return std::forward<Arg>(arg);
-}
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&, Args &&...args)
-    -> typename std::enable_if<(I > 0),
-            decltype(std::forward<typename NthType<I, Arg, Args...>::type>(
-                    std::declval<typename NthType<I, Arg, Args...>::type>()))>::type {
-    return std::forward<typename NthType<I, Arg, Args...>::type>(
-            NthValue<I - 1>(std::forward<Args>(args)...));
-}
-
-template <typename ...Args>
-auto LastValue(Args &&...args)
-    -> decltype(std::forward<typename LastType<Args...>::type>(
-            std::declval<typename LastType<Args...>::type>())) {
-    return std::forward<typename LastType<Args...>::type>(
-            NthValue<sizeof...(Args) - 1>(std::forward<Args>(args)...));
-}
-
-template <typename T, typename = Void<>>
-struct HasPushBack : std::false_type {};
-
-template <typename T>
-struct HasPushBack<T,
-    typename std::enable_if<
-        std::is_void<decltype(
-            std::declval<T>().push_back(std::declval<typename T::value_type>())
-                )>::value>::type> : std::true_type {};
-
-template <typename T, typename = Void<>>
-struct HasInsert : std::false_type {};
-
-template <typename T>
-struct HasInsert<T,
-    typename std::enable_if<
-        std::is_same<
-            decltype(std::declval<T>().insert(std::declval<typename T::const_iterator>(),
-                                                std::declval<typename T::value_type>())),
-            typename T::iterator>::value>::type> : std::true_type {};
-
-template <typename T>
-struct IsSequenceContainer
-    : std::integral_constant<bool,
-        HasPushBack<T>::value
-            && !std::is_same<typename std::decay<T>::type, std::string>::value> {};
-
-template <typename T>
-struct IsAssociativeContainer
-    : std::integral_constant<bool,
-        HasInsert<T>::value && !HasPushBack<T>::value> {};
-
-uint16_t crc16(const char *buf, int len);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_UTILS_H
diff --git a/ext/redis-plus-plus-1.1.1/install/macos/lib/libredis++.a b/ext/redis-plus-plus-1.1.1/install/macos/lib/libredis++.a
deleted file mode 100644
index 4092eae77..000000000
Binary files a/ext/redis-plus-plus-1.1.1/install/macos/lib/libredis++.a and /dev/null differ
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/command.cpp
deleted file mode 100644
index bb1afb2a9..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "command.h"
-#include <cassert>
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-// KEY commands.
-
-void restore(Connection &connection,
-                const StringView &key,
-                const StringView &val,
-                long long ttl,
-                bool replace) {
-    CmdArgs args;
-    args << "RESTORE" << key << ttl << val;
-
-    if (replace) {
-        args << "REPLACE";
-    }
-
-    connection.send(args);
-}
-
-// STRING commands.
-
-void bitop(Connection &connection,
-            BitOp op,
-            const StringView &destination,
-            const StringView &key) {
-    CmdArgs args;
-
-    detail::set_bitop(args, op);
-
-    args << destination << key;
-
-    connection.send(args);
-}
-
-void set(Connection &connection,
-            const StringView &key,
-            const StringView &val,
-            long long ttl,
-            UpdateType type) {
-    CmdArgs args;
-    args << "SET" << key << val;
-
-    if (ttl > 0) {
-        args << "PX" << ttl;
-    }
-
-    detail::set_update_type(args, type);
-
-    connection.send(args);
-}
-
-// LIST commands.
-
-void linsert(Connection &connection,
-                const StringView &key,
-                InsertPosition position,
-                const StringView &pivot,
-                const StringView &val) {
-    std::string pos;
-    switch (position) {
-    case InsertPosition::BEFORE:
-        pos = "BEFORE";
-        break;
-
-    case InsertPosition::AFTER:
-        pos = "AFTER";
-        break;
-
-    default:
-        assert(false);
-    }
-
-    connection.send("LINSERT %b %s %b %b",
-                    key.data(), key.size(),
-                    pos.c_str(),
-                    pivot.data(), pivot.size(),
-                    val.data(), val.size());
-}
-
-// GEO commands.
-
-void geodist(Connection &connection,
-                const StringView &key,
-                const StringView &member1,
-                const StringView &member2,
-                GeoUnit unit) {
-    CmdArgs args;
-    args << "GEODIST" << key << member1 << member2;
-
-    detail::set_geo_unit(args, unit);
-
-    connection.send(args);
-}
-
-void georadius_store(Connection &connection,
-                        const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        const StringView &destination,
-                        bool store_dist,
-                        long long count) {
-    CmdArgs args;
-    args << "GEORADIUS" << key << loc.first << loc.second;
-
-    detail::set_georadius_store_parameters(args,
-                                            radius,
-                                            unit,
-                                            destination,
-                                            store_dist,
-                                            count);
-
-    connection.send(args);
-}
-
-void georadius(Connection &connection,
-                const StringView &key,
-                const std::pair<double, double> &loc,
-                double radius,
-                GeoUnit unit,
-                long long count,
-                bool asc,
-                bool with_coord,
-                bool with_dist,
-                bool with_hash) {
-    CmdArgs args;
-    args << "GEORADIUS" << key << loc.first << loc.second;
-
-    detail::set_georadius_parameters(args,
-                                        radius,
-                                        unit,
-                                        count,
-                                        asc,
-                                        with_coord,
-                                        with_dist,
-                                        with_hash);
-
-    connection.send(args);
-}
-
-void georadiusbymember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        bool with_coord,
-                        bool with_dist,
-                        bool with_hash) {
-    CmdArgs args;
-    args << "GEORADIUSBYMEMBER" << key << member;
-
-    detail::set_georadius_parameters(args,
-                                        radius,
-                                        unit,
-                                        count,
-                                        asc,
-                                        with_coord,
-                                        with_dist,
-                                        with_hash);
-
-    connection.send(args);
-}
-
-void georadiusbymember_store(Connection &connection,
-                                const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count) {
-    CmdArgs args;
-    args << "GEORADIUSBYMEMBER" << key << member;
-
-    detail::set_georadius_store_parameters(args,
-                                            radius,
-                                            unit,
-                                            destination,
-                                            store_dist,
-                                            count);
-
-    connection.send(args);
-}
-
-// Stream commands.
-
-void xtrim(Connection &connection, const StringView &key, long long count, bool approx) {
-    CmdArgs args;
-    args << "XTRIM" << key << "MAXLEN";
-
-    if (approx) {
-        args << "~";
-    }
-
-    args << count;
-
-    connection.send(args);
-}
-
-namespace detail {
-
-void set_bitop(CmdArgs &args, BitOp op) {
-    args << "BITOP";
-
-    switch (op) {
-    case BitOp::AND:
-        args << "AND";
-        break;
-
-    case BitOp::OR:
-        args << "OR";
-        break;
-
-    case BitOp::XOR:
-        args << "XOR";
-        break;
-
-    case BitOp::NOT:
-        args << "NOT";
-        break;
-
-    default:
-        throw Error("Unknown bit operations");
-    }
-}
-
-void set_update_type(CmdArgs &args, UpdateType type) {
-    switch (type) {
-    case UpdateType::EXIST:
-        args << "XX";
-        break;
-
-    case UpdateType::NOT_EXIST:
-        args << "NX";
-        break;
-
-    case UpdateType::ALWAYS:
-        // Do nothing.
-        break;
-
-    default:
-        throw Error("Unknown update type");
-    }
-}
-
-void set_aggregation_type(CmdArgs &args, Aggregation aggr) {
-    args << "AGGREGATE";
-
-    switch (aggr) {
-    case Aggregation::SUM:
-        args << "SUM";
-        break;
-
-    case Aggregation::MIN:
-        args << "MIN";
-        break;
-
-    case Aggregation::MAX:
-        args << "MAX";
-        break;
-
-    default:
-        throw Error("Unknown aggregation type");
-    }
-}
-
-void set_geo_unit(CmdArgs &args, GeoUnit unit) {
-    switch (unit) {
-    case GeoUnit::M:
-        args << "m";
-        break;
-
-    case GeoUnit::KM:
-        args << "km";
-        break;
-
-    case GeoUnit::MI:
-        args << "mi";
-        break;
-
-    case GeoUnit::FT:
-        args << "ft";
-        break;
-
-    default:
-        throw Error("Unknown geo unit type");
-        break;
-    }
-}
-
-void set_georadius_store_parameters(CmdArgs &args,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-    args << radius;
-
-    detail::set_geo_unit(args, unit);
-
-    args << "COUNT" << count;
-
-    if (store_dist) {
-        args << "STOREDIST";
-    } else {
-        args << "STORE";
-    }
-
-    args << destination;
-}
-
-void set_georadius_parameters(CmdArgs &args,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                bool with_coord,
-                                bool with_dist,
-                                bool with_hash) {
-    args << radius;
-
-    detail::set_geo_unit(args, unit);
-
-    if (with_coord) {
-        args << "WITHCOORD";
-    }
-
-    if (with_dist) {
-        args << "WITHDIST";
-    }
-
-    if (with_hash) {
-        args << "WITHHASH";
-    }
-
-    args << "COUNT" << count;
-
-    if (asc) {
-        args << "ASC";
-    } else {
-        args << "DESC";
-    }
-}
-
-}
-
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/command.h
deleted file mode 100644
index 3a4b24c5e..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command.h
+++ /dev/null
@@ -1,2233 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_H
-
-#include <cassert>
-#include <ctime>
-#include <string>
-#include <chrono>
-#include "connection.h"
-#include "command_options.h"
-#include "command_args.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-// CONNECTION command.
-inline void auth(Connection &connection, const StringView &password) {
-    connection.send("AUTH %b", password.data(), password.size());
-}
-
-inline void echo(Connection &connection, const StringView &msg) {
-    connection.send("ECHO %b", msg.data(), msg.size());
-}
-
-inline void ping(Connection &connection) {
-    connection.send("PING");
-}
-
-inline void quit(Connection &connection) {
-    connection.send("QUIT");
-}
-
-inline void ping(Connection &connection, const StringView &msg) {
-    // If *msg* is empty, Redis returns am empty reply of REDIS_REPLY_STRING type.
-    connection.send("PING %b", msg.data(), msg.size());
-}
-
-inline void select(Connection &connection, long long idx) {
-    connection.send("SELECT %lld", idx);
-}
-
-inline void swapdb(Connection &connection, long long idx1, long long idx2) {
-    connection.send("SWAPDB %lld %lld", idx1, idx2);
-}
-
-// SERVER commands.
-
-inline void bgrewriteaof(Connection &connection) {
-    connection.send("BGREWRITEAOF");
-}
-
-inline void bgsave(Connection &connection) {
-    connection.send("BGSAVE");
-}
-
-inline void dbsize(Connection &connection) {
-    connection.send("DBSIZE");
-}
-
-inline void flushall(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHALL ASYNC");
-    } else {
-        connection.send("FLUSHALL");
-    }
-}
-
-inline void flushdb(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHDB ASYNC");
-    } else {
-        connection.send("FLUSHDB");
-    }
-}
-
-inline void info(Connection &connection) {
-    connection.send("INFO");
-}
-
-inline void info(Connection &connection, const StringView &section) {
-    connection.send("INFO %b", section.data(), section.size());
-}
-
-inline void lastsave(Connection &connection) {
-    connection.send("LASTSAVE");
-}
-
-inline void save(Connection &connection) {
-    connection.send("SAVE");
-}
-
-// KEY commands.
-
-inline void del(Connection &connection, const StringView &key) {
-    connection.send("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void del_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void dump(Connection &connection, const StringView &key) {
-    connection.send("DUMP %b", key.data(), key.size());
-}
-
-inline void exists(Connection &connection, const StringView &key) {
-    connection.send("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void expire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("EXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void expireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("EXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void keys(Connection &connection, const StringView &pattern) {
-    connection.send("KEYS %b", pattern.data(), pattern.size());
-}
-
-inline void move(Connection &connection, const StringView &key, long long db) {
-    connection.send("MOVE %b %lld",
-                    key.data(), key.size(),
-                    db);
-}
-
-inline void persist(Connection &connection, const StringView &key) {
-    connection.send("PERSIST %b", key.data(), key.size());
-}
-
-inline void pexpire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("PEXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void pexpireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("PEXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void pttl(Connection &connection, const StringView &key) {
-    connection.send("PTTL %b", key.data(), key.size());
-}
-
-inline void randomkey(Connection &connection) {
-    connection.send("RANDOMKEY");
-}
-
-inline void rename(Connection &connection,
-                    const StringView &key,
-                    const StringView &newkey) {
-    connection.send("RENAME %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-inline void renamenx(Connection &connection,
-                        const StringView &key,
-                        const StringView &newkey) {
-    connection.send("RENAMENX %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-void restore(Connection &connection,
-                const StringView &key,
-                const StringView &val,
-                long long ttl,
-                bool replace);
-
-inline void scan(Connection &connection,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SCAN %lld MATCH %b COUNT %lld",
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void touch(Connection &connection, const StringView &key) {
-    connection.send("TOUCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void touch_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "TOUCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void ttl(Connection &connection, const StringView &key) {
-    connection.send("TTL %b", key.data(), key.size());
-}
-
-inline void type(Connection &connection, const StringView &key) {
-    connection.send("TYPE %b", key.data(), key.size());
-}
-
-inline void unlink(Connection &connection, const StringView &key) {
-    connection.send("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unlink_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void wait(Connection &connection, long long numslave, long long timeout) {
-    connection.send("WAIT %lld %lld", numslave, timeout);
-}
-
-// STRING commands.
-
-inline void append(Connection &connection, const StringView &key, const StringView &str) {
-    connection.send("APPEND %b %b",
-                    key.data(), key.size(),
-                    str.data(), str.size());
-}
-
-inline void bitcount(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("BITCOUNT %b %lld %lld",
-                    key.data(), key.size(),
-                    start, end);
-}
-
-void bitop(Connection &connection,
-            BitOp op,
-            const StringView &destination,
-            const StringView &key);
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last);
-
-inline void bitpos(Connection &connection,
-                    const StringView &key,
-                    long long bit,
-                    long long start,
-                    long long end) {
-    connection.send("BITPOS %b %lld %lld %lld",
-                    key.data(), key.size(),
-                    bit,
-                    start,
-                    end);
-}
-
-inline void decr(Connection &connection, const StringView &key) {
-    connection.send("DECR %b", key.data(), key.size());
-}
-
-inline void decrby(Connection &connection, const StringView &key, long long decrement) {
-    connection.send("DECRBY %b %lld",
-                    key.data(), key.size(),
-                    decrement);
-}
-
-inline void get(Connection &connection, const StringView &key) {
-    connection.send("GET %b",
-                    key.data(), key.size());
-}
-
-inline void getbit(Connection &connection, const StringView &key, long long offset) {
-    connection.send("GETBIT %b %lld",
-                    key.data(), key.size(),
-                    offset);
-}
-
-inline void getrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("GETRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    end);
-}
-
-inline void getset(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("GETSET %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void incr(Connection &connection, const StringView &key) {
-    connection.send("INCR %b", key.data(), key.size());
-}
-
-inline void incrby(Connection &connection, const StringView &key, long long increment) {
-    connection.send("INCRBY %b %lld",
-                    key.data(), key.size(),
-                    increment);
-}
-
-inline void incrbyfloat(Connection &connection, const StringView &key, double increment) {
-    connection.send("INCRBYFLOAT %b %f",
-                    key.data(), key.size(),
-                    increment);
-}
-
-template <typename Input>
-inline void mget(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void mset(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void msetnx(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void psetex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("PSETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-void set(Connection &connection,
-            const StringView &key,
-            const StringView &val,
-            long long ttl,
-            UpdateType type);
-
-inline void setex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("SETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-inline void setnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("SETNX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void setrange(Connection &connection,
-                        const StringView &key,
-                        long long offset,
-                        const StringView &val) {
-    connection.send("SETRANGE %b %lld %b",
-                    key.data(), key.size(),
-                    offset,
-                    val.data(), val.size());
-}
-
-inline void strlen(Connection &connection, const StringView &key) {
-    connection.send("STRLEN %b", key.data(), key.size());
-}
-
-// LIST commands.
-
-inline void blpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BLPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void blpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BRPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void brpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination,
-                        long long timeout) {
-    connection.send("BRPOPLPUSH %b %b %lld",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    timeout);
-}
-
-inline void lindex(Connection &connection, const StringView &key, long long index) {
-    connection.send("LINDEX %b %lld",
-                    key.data(), key.size(),
-                    index);
-}
-
-void linsert(Connection &connection,
-                const StringView &key,
-                InsertPosition position,
-                const StringView &pivot,
-                const StringView &val);
-
-inline void llen(Connection &connection,
-                    const StringView &key) {
-    connection.send("LLEN %b", key.data(), key.size());
-}
-
-inline void lpop(Connection &connection, const StringView &key) {
-    connection.send("LPOP %b",
-                    key.data(), key.size());
-}
-
-inline void lpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void lpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void lpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void lrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void lrem(Connection &connection,
-                    const StringView &key,
-                    long long count,
-                    const StringView &val) {
-    connection.send("LREM %b %lld %b",
-                    key.data(), key.size(),
-                    count,
-                    val.data(), val.size());
-}
-
-inline void lset(Connection &connection,
-                    const StringView &key,
-                    long long index,
-                    const StringView &val) {
-    connection.send("LSET %b %lld %b",
-                    key.data(), key.size(),
-                    index,
-                    val.data(), val.size());
-}
-
-inline void ltrim(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LTRIM %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void rpop(Connection &connection, const StringView &key) {
-    connection.send("RPOP %b", key.data(), key.size());
-}
-
-inline void rpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination) {
-    connection.send("RPOPLPUSH %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size());
-}
-
-inline void rpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void rpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void rpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-// HASH commands.
-
-inline void hdel(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HDEL %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-template <typename Input>
-inline void hdel_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hexists(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HEXISTS %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hget(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HGET %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hgetall(Connection &connection, const StringView &key) {
-    connection.send("HGETALL %b", key.data(), key.size());
-}
-
-inline void hincrby(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    long long increment) {
-    connection.send("HINCRBY %b %b %lld",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hincrbyfloat(Connection &connection,
-                            const StringView &key,
-                            const StringView &field,
-                            double increment) {
-    connection.send("HINCRBYFLOAT %b %b %f",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hkeys(Connection &connection, const StringView &key) {
-    connection.send("HKEYS %b", key.data(), key.size());
-}
-
-inline void hlen(Connection &connection, const StringView &key) {
-    connection.send("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void hmget(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void hmset(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("HSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void hset(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSET %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hsetnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSETNX %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hstrlen(Connection &connection,
-                    const StringView &key,
-                    const StringView &field) {
-    connection.send("HSTRLEN %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hvals(Connection &connection, const StringView &key) {
-    connection.send("HVALS %b", key.data(), key.size());
-}
-
-// SET commands
-
-inline void sadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SADD %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void sadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void scard(Connection &connection, const StringView &key) {
-    connection.send("SCARD %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiff(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFF" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sdiffstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SDIFFSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiffstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFFSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void sinter(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTER" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SINTERSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sinterstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTERSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sismember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("SISMEMBER %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void smembers(Connection &connection, const StringView &key) {
-    connection.send("SMEMBERS %b", key.data(), key.size());
-}
-
-inline void smove(Connection &connection,
-                    const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    connection.send("SMOVE %b %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    member.data(), member.size());
-}
-
-inline void spop(Connection &connection, const StringView &key) {
-    connection.send("SPOP %b", key.data(), key.size());
-}
-
-inline void spop_range(Connection &connection, const StringView &key, long long count) {
-    connection.send("SPOP %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srandmember(Connection &connection, const StringView &key) {
-    connection.send("SRANDMEMBER %b", key.data(), key.size());
-}
-
-inline void srandmember_range(Connection &connection,
-                                const StringView &key,
-                                long long count) {
-    connection.send("SRANDMEMBER %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void srem_range(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-template <typename Input>
-inline void sunion(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNION" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SUNIONSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sunionstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNIONSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Sorted Set commands.
-
-inline void bzpopmax(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMAX %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmax_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void bzpopmin(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMIN %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmin_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed);
-
-inline void zadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type,
-                    bool changed) {
-    auto tmp = {std::make_pair(member, score)};
-
-    zadd_range(connection, key, tmp.begin(), tmp.end(), type, changed);
-}
-
-inline void zcard(Connection &connection, const StringView &key) {
-    connection.send("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-inline void zcount(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval) {
-    connection.send("ZCOUNT %b %s %s",
-                    key.data(), key.size(),
-                    interval.min().c_str(),
-                    interval.max().c_str());
-}
-
-inline void zincrby(Connection &connection,
-                    const StringView &key,
-                    double increment,
-                    const StringView &member) {
-    connection.send("ZINCRBY %b %f %b",
-                    key.data(), key.size(),
-                    increment,
-                    member.data(), member.size());
-}
-
-inline void zinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZINTERSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-template <typename Interval>
-inline void zlexcount(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zpopmax(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMAX %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zpopmin(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMIN %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop,
-                    bool with_scores) {
-    if (with_scores) {
-        connection.send("ZRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrangebylex(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrangebyscore(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval,
-                    const LimitOptions &opts,
-                    bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrank(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zrem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void zrem_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Interval>
-inline void zremrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zremrangebyrank(Connection &connection,
-                            const StringView &key,
-                            long long start,
-                            long long stop) {
-    connection.send("zremrangebyrank %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-template <typename Interval>
-inline void zremrangebyscore(Connection &connection,
-                                const StringView &key,
-                                const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zrevrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores) {
-    if (with_scores) {
-        connection.send("ZREVRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZREVRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrevrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrevrangebyscore(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZREVRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZREVRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrevrank(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("ZREVRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("ZSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void zscore(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZSCORE %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZUNIONSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-// HYPERLOGLOG commands.
-
-inline void pfadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &element) {
-    connection.send("PFADD %b %b",
-                    key.data(), key.size(),
-                    element.data(), element.size());
-}
-
-template <typename Input>
-inline void pfadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfcount(Connection &connection, const StringView &key) {
-    connection.send("PFCOUNT %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfcount_range(Connection &connection,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFCOUNT" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfmerge(Connection &connection, const StringView &destination, const StringView &key) {
-    connection.send("PFMERGE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfmerge_range(Connection &connection,
-                            const StringView &destination,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFMERGE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// GEO commands.
-
-inline void geoadd(Connection &connection,
-                    const StringView &key,
-                    const std::tuple<StringView, double, double> &member) {
-    const auto &mem = std::get<0>(member);
-
-    connection.send("GEOADD %b %f %f %b",
-                    key.data(), key.size(),
-                    std::get<1>(member),
-                    std::get<2>(member),
-                    mem.data(), mem.size());
-}
-
-template <typename Input>
-inline void geoadd_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOADD" << key;
-
-    while (first != last) {
-        const auto &member = *first;
-        args << std::get<1>(member) << std::get<2>(member) << std::get<0>(member);
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-void geodist(Connection &connection,
-                const StringView &key,
-                const StringView &member1,
-                const StringView &member2,
-                GeoUnit unit);
-
-template <typename Input>
-inline void geohash_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOHASH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void geopos_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOPOS" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-void georadius(Connection &connection,
-                const StringView &key,
-                const std::pair<double, double> &loc,
-                double radius,
-                GeoUnit unit,
-                long long count,
-                bool asc,
-                bool with_coord,
-                bool with_dist,
-                bool with_hash);
-
-void georadius_store(Connection &connection,
-                        const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        const StringView &destination,
-                        bool store_dist,
-                        long long count);
-
-void georadiusbymember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        bool with_coord,
-                        bool with_dist,
-                        bool with_hash);
-
-void georadiusbymember_store(Connection &connection,
-                                const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-// SCRIPTING commands.
-
-inline void eval(Connection &connection,
-                    const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    CmdArgs cmd_args;
-
-    cmd_args << "EVAL" << script << keys.size()
-            << std::make_pair(keys.begin(), keys.end())
-            << std::make_pair(args.begin(), args.end());
-
-    connection.send(cmd_args);
-}
-
-inline void evalsha(Connection &connection,
-                    const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    CmdArgs cmd_args;
-
-    cmd_args << "EVALSHA" << script << keys.size()
-            << std::make_pair(keys.begin(), keys.end())
-            << std::make_pair(args.begin(), args.end());
-
-    connection.send(cmd_args);
-}
-
-inline void script_exists(Connection &connection, const StringView &sha) {
-    connection.send("SCRIPT EXISTS %b", sha.data(), sha.size());
-}
-
-template <typename Input>
-inline void script_exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SCRIPT" << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void script_flush(Connection &connection) {
-    connection.send("SCRIPT FLUSH");
-}
-
-inline void script_kill(Connection &connection) {
-    connection.send("SCRIPT KILL");
-}
-
-inline void script_load(Connection &connection, const StringView &script) {
-    connection.send("SCRIPT LOAD %b", script.data(), script.size());
-}
-
-// PUBSUB commands.
-
-inline void psubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void psubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void publish(Connection &connection,
-                    const StringView &channel,
-                    const StringView &message) {
-    connection.send("PUBLISH %b %b",
-                    channel.data(), channel.size(),
-                    message.data(), message.size());
-}
-
-inline void punsubscribe(Connection &connection) {
-    connection.send("PUNSUBSCRIBE");
-}
-
-inline void punsubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PUNSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void punsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PUNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PUNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void subscribe(Connection &connection, const StringView &channel) {
-    connection.send("SUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void subscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "SUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void unsubscribe(Connection &connection) {
-    connection.send("UNSUBSCRIBE");
-}
-
-inline void unsubscribe(Connection &connection, const StringView &channel) {
-    connection.send("UNSUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void unsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Transaction commands.
-
-inline void discard(Connection &connection) {
-    connection.send("DISCARD");
-}
-
-inline void exec(Connection &connection) {
-    connection.send("EXEC");
-}
-
-inline void multi(Connection &connection) {
-    connection.send("MULTI");
-}
-
-inline void unwatch(Connection &connection, const StringView &key) {
-    connection.send("UNWATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unwatch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNWATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNWATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void watch(Connection &connection, const StringView &key) {
-    connection.send("WATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void watch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("WATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "WATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Stream commands.
-
-inline void xack(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &id) {
-    connection.send("XACK %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xack_range(Connection &connection,
-                const StringView &key,
-                const StringView &group,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XACK" << key << group << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_range(Connection &connection,
-                const StringView &key,
-                const StringView &id,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XADD" << key << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_maxlen_range(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    CmdArgs args;
-    args << "XADD" << key << "MAXLEN";
-
-    if (approx) {
-        args << "~";
-    }
-
-    args << count << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xclaim(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    const StringView &id) {
-    connection.send("XCLAIM %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size(),
-                    min_idle_time,
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xclaim_range(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    Input first,
-                    Input last) {
-    CmdArgs args;
-    args << "XCLAIM" << key << group << consumer << min_idle_time << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xdel(Connection &connection, const StringView &key, const StringView &id) {
-    connection.send("XDEL %b %b", key.data(), key.size(), id.data(), id.size());
-}
-
-template <typename Input>
-void xdel_range(Connection &connection, const StringView &key, Input first, Input last) {
-    CmdArgs args;
-    args << "XDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xgroup_create(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id,
-                            bool mkstream) {
-    CmdArgs args;
-    args << "XGROUP" << "CREATE" << key << group << id;
-
-    if (mkstream) {
-        args << "MKSTREAM";
-    }
-
-    connection.send(args);
-}
-
-inline void xgroup_setid(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id) {
-    connection.send("XGROUP SETID %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-inline void xgroup_destroy(Connection &connection,
-                            const StringView &key,
-                            const StringView &group) {
-    connection.send("XGROUP DESTROY %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xgroup_delconsumer(Connection &connection,
-                                const StringView &key,
-                                const StringView &group,
-                                const StringView &consumer) {
-    connection.send("XGROUP DELCONSUMER %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size());
-}
-
-inline void xlen(Connection &connection, const StringView &key) {
-    connection.send("XLEN %b", key.data(), key.size());
-}
-
-inline void xpending(Connection &connection, const StringView &key, const StringView &group) {
-    connection.send("XPENDING %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xpending_detail(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XPENDING %b %b %b %b %lld",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xpending_per_consumer(Connection &connection,
-                                    const StringView &key,
-                                    const StringView &group,
-                                    const StringView &start,
-                                    const StringView &end,
-                                    long long count,
-                                    const StringView &consumer) {
-    connection.send("XPENDING %b %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count,
-                    consumer.data(), consumer.size());
-}
-
-inline void xrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &start,
-                    const StringView &end) {
-    connection.send("XRANGE %b %b %b",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size());
-}
-
-inline void xrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xread(Connection &connection,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count) {
-    connection.send("XREAD COUNT %lld STREAMS %b %b",
-                    count,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_range(Connection &connection, Input first, Input last, long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xread_block(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        long long timeout,
-                        long long count) {
-    connection.send("XREAD COUNT %lld BLOCK %lld STREAMS %b %b",
-                    count,
-                    timeout,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_block_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout,
-                        long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "BLOCK" << timeout << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_range(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup_block(Connection &connection,
-                                const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long timeout,
-                                long long count,
-                                bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_block_range(Connection &connection,
-                            const StringView &group,
-                            const StringView &consumer,
-                            Input first,
-                            Input last,
-                            long long timeout,
-                            long long count,
-                            bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xrevrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &end,
-                    const StringView &start) {
-    connection.send("XREVRANGE %b %b %b",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size());
-}
-
-inline void xrevrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-    connection.send("XREVRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size(),
-                    count);
-}
-
-void xtrim(Connection &connection, const StringView &key, long long count, bool approx);
-
-namespace detail {
-
-void set_bitop(CmdArgs &args, BitOp op);
-
-void set_update_type(CmdArgs &args, UpdateType type);
-
-void set_aggregation_type(CmdArgs &args, Aggregation type);
-
-template <typename Input>
-void zinterstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-void set_geo_unit(CmdArgs &args, GeoUnit unit);
-
-void set_georadius_store_parameters(CmdArgs &args,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count);
-
-void set_georadius_parameters(CmdArgs &args,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                bool with_coord,
-                                bool with_dist,
-                                bool with_hash);
-
-}
-
-}
-
-}
-
-}
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    detail::set_bitop(args, op);
-
-    args << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    args << "ZADD" << key;
-
-    detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zinterstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zunionstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_args.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_args.h
deleted file mode 100644
index 0beb71e5c..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_args.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-
-#include <vector>
-#include <list>
-#include <string>
-#include <tuple>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-class CmdArgs {
-public:
-    template <typename Arg>
-    CmdArgs& append(Arg &&arg);
-
-    template <typename Arg, typename ...Args>
-    CmdArgs& append(Arg &&arg, Args &&...args);
-
-    // All overloads of operator<< are for internal use only.
-    CmdArgs& operator<<(const StringView &arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& operator<<(T &&arg);
-
-    template <typename Iter>
-    CmdArgs& operator<<(const std::pair<Iter, Iter> &range);
-
-    template <std::size_t N, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &) ->
-        typename std::enable_if<N == sizeof...(Args), CmdArgs&>::type {
-        return *this;
-    }
-
-    template <std::size_t N = 0, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &arg) ->
-        typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type;
-
-    const char** argv() {
-        return _argv.data();
-    }
-
-    const std::size_t* argv_len() {
-        return _argv_len.data();
-    }
-
-    std::size_t size() const {
-        return _argv.size();
-    }
-
-private:
-    // Deep copy.
-    CmdArgs& _append(std::string arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const StringView &arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const char *arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& _append(T &&arg) {
-        return operator<<(std::forward<T>(arg));
-    }
-
-    template <typename Iter>
-    CmdArgs& _append(std::true_type, const std::pair<Iter, Iter> &range);
-
-    template <typename Iter>
-    CmdArgs& _append(std::false_type, const std::pair<Iter, Iter> &range);
-
-    std::vector<const char *> _argv;
-    std::vector<std::size_t> _argv_len;
-
-    std::list<std::string> _args;
-};
-
-template <typename Arg>
-inline CmdArgs& CmdArgs::append(Arg &&arg) {
-    return _append(std::forward<Arg>(arg));
-}
-
-template <typename Arg, typename ...Args>
-inline CmdArgs& CmdArgs::append(Arg &&arg, Args &&...args) {
-    _append(std::forward<Arg>(arg));
-
-    return append(std::forward<Args>(args)...);
-}
-
-inline CmdArgs& CmdArgs::operator<<(const StringView &arg) {
-    _argv.push_back(arg.data());
-    _argv_len.push_back(arg.size());
-
-    return *this;
-}
-
-template <typename Iter>
-inline CmdArgs& CmdArgs::operator<<(const std::pair<Iter, Iter> &range) {
-    return _append(IsKvPair<typename std::decay<decltype(*std::declval<Iter>())>::type>(), range);
-}
-
-template <typename T,
-             typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                    int>::type>
-inline CmdArgs& CmdArgs::operator<<(T &&arg) {
-    return _append(std::to_string(std::forward<T>(arg)));
-}
-
-template <std::size_t N, typename ...Args>
-auto CmdArgs::operator<<(const std::tuple<Args...> &arg) ->
-    typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type {
-    operator<<(std::get<N>(arg));
-
-    return operator<<<N + 1, Args...>(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(std::string arg) {
-    _args.push_back(std::move(arg));
-    return operator<<(_args.back());
-}
-
-inline CmdArgs& CmdArgs::_append(const StringView &arg) {
-    return operator<<(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(const char *arg) {
-    return operator<<(arg);
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::false_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << *first;
-        ++first;
-    }
-
-    return *this;
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::true_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << first->first << first->second;
-        ++first;
-    }
-
-    return *this;
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_options.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_options.cpp
deleted file mode 100644
index 0c9254e86..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_options.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "command_options.h"
-#include "errors.h"
-
-namespace {
-
-const std::string NEGATIVE_INFINITY_NUMERIC = "-inf";
-const std::string POSITIVE_INFINITY_NUMERIC = "+inf";
-
-const std::string NEGATIVE_INFINITY_STRING = "-";
-const std::string POSITIVE_INFINITY_STRING = "+";
-
-std::string unbound(const std::string &bnd);
-
-std::string bound(const std::string &bnd);
-
-}
-
-namespace sw {
-
-namespace redis {
-
-const std::string& UnboundedInterval<double>::min() const {
-    return NEGATIVE_INFINITY_NUMERIC;
-}
-
-const std::string& UnboundedInterval<double>::max() const {
-    return POSITIVE_INFINITY_NUMERIC;
-}
-
-BoundedInterval<double>::BoundedInterval(double min, double max, BoundType type) :
-                                            _min(std::to_string(min)),
-                                            _max(std::to_string(max)) {
-    switch (type) {
-    case BoundType::CLOSED:
-        // Do nothing
-        break;
-
-    case BoundType::OPEN:
-        _min = unbound(_min);
-        _max = unbound(_max);
-        break;
-
-    case BoundType::LEFT_OPEN:
-        _min = unbound(_min);
-        break;
-
-    case BoundType::RIGHT_OPEN:
-        _max = unbound(_max);
-        break;
-
-    default:
-        throw Error("Unknow BoundType");
-    }
-}
-
-LeftBoundedInterval<double>::LeftBoundedInterval(double min, BoundType type) :
-                                                    _min(std::to_string(min)) {
-    switch (type) {
-    case BoundType::OPEN:
-        _min = unbound(_min);
-        break;
-
-    case BoundType::RIGHT_OPEN:
-        // Do nothing.
-        break;
-
-    default:
-        throw Error("Bound type can only be OPEN or RIGHT_OPEN");
-    }
-}
-
-const std::string& LeftBoundedInterval<double>::max() const {
-    return POSITIVE_INFINITY_NUMERIC;
-}
-
-RightBoundedInterval<double>::RightBoundedInterval(double max, BoundType type) :
-                                                    _max(std::to_string(max)) {
-    switch (type) {
-    case BoundType::OPEN:
-        _max = unbound(_max);
-        break;
-
-    case BoundType::LEFT_OPEN:
-        // Do nothing.
-        break;
-
-    default:
-        throw Error("Bound type can only be OPEN or LEFT_OPEN");
-    }
-}
-
-const std::string& RightBoundedInterval<double>::min() const {
-    return NEGATIVE_INFINITY_NUMERIC;
-}
-
-const std::string& UnboundedInterval<std::string>::min() const {
-    return NEGATIVE_INFINITY_STRING;
-}
-
-const std::string& UnboundedInterval<std::string>::max() const {
-    return POSITIVE_INFINITY_STRING;
-}
-
-BoundedInterval<std::string>::BoundedInterval(const std::string &min,
-                                                const std::string &max,
-                                                BoundType type) {
-    switch (type) {
-    case BoundType::CLOSED:
-        _min = bound(min);
-        _max = bound(max);
-        break;
-
-    case BoundType::OPEN:
-        _min = unbound(min);
-        _max = unbound(max);
-        break;
-
-    case BoundType::LEFT_OPEN:
-        _min = unbound(min);
-        _max = bound(max);
-        break;
-
-    case BoundType::RIGHT_OPEN:
-        _min = bound(min);
-        _max = unbound(max);
-        break;
-
-    default:
-        throw Error("Unknow BoundType");
-    }
-}
-
-LeftBoundedInterval<std::string>::LeftBoundedInterval(const std::string &min, BoundType type) {
-    switch (type) {
-    case BoundType::OPEN:
-        _min = unbound(min);
-        break;
-
-    case BoundType::RIGHT_OPEN:
-        _min = bound(min);
-        break;
-
-    default:
-        throw Error("Bound type can only be OPEN or RIGHT_OPEN");
-    }
-}
-
-const std::string& LeftBoundedInterval<std::string>::max() const {
-    return POSITIVE_INFINITY_STRING;
-}
-
-RightBoundedInterval<std::string>::RightBoundedInterval(const std::string &max, BoundType type) {
-    switch (type) {
-    case BoundType::OPEN:
-        _max = unbound(max);
-        break;
-
-    case BoundType::LEFT_OPEN:
-        _max = bound(max);
-        break;
-
-    default:
-        throw Error("Bound type can only be OPEN or LEFT_OPEN");
-    }
-}
-
-const std::string& RightBoundedInterval<std::string>::min() const {
-    return NEGATIVE_INFINITY_STRING;
-}
-
-}
-
-}
-
-namespace {
-
-std::string unbound(const std::string &bnd) {
-    return "(" + bnd;
-}
-
-std::string bound(const std::string &bnd) {
-    return "[" + bnd;
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_options.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_options.h
deleted file mode 100644
index ca766c086..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/command_options.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-
-#include <string>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class UpdateType {
-    EXIST,
-    NOT_EXIST,
-    ALWAYS
-};
-
-enum class InsertPosition {
-    BEFORE,
-    AFTER
-};
-
-enum class BoundType {
-    CLOSED,
-    OPEN,
-    LEFT_OPEN,
-    RIGHT_OPEN
-};
-
-// (-inf, +inf)
-template <typename T>
-class UnboundedInterval;
-
-// [min, max], (min, max), (min, max], [min, max)
-template <typename T>
-class BoundedInterval;
-
-// [min, +inf), (min, +inf)
-template <typename T>
-class LeftBoundedInterval;
-
-// (-inf, max], (-inf, max)
-template <typename T>
-class RightBoundedInterval;
-
-template <>
-class UnboundedInterval<double> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<double> {
-public:
-    BoundedInterval(double min, double max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<double> {
-public:
-    LeftBoundedInterval(double min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<double> {
-public:
-    RightBoundedInterval(double max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-template <>
-class UnboundedInterval<std::string> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<std::string> {
-public:
-    BoundedInterval(const std::string &min, const std::string &max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<std::string> {
-public:
-    LeftBoundedInterval(const std::string &min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<std::string> {
-public:
-    RightBoundedInterval(const std::string &max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-struct LimitOptions {
-    long long offset = 0;
-    long long count = -1;
-};
-
-enum class Aggregation {
-    SUM,
-    MIN,
-    MAX
-};
-
-enum class BitOp {
-    AND,
-    OR,
-    XOR,
-    NOT
-};
-
-enum class GeoUnit {
-    M,
-    KM,
-    MI,
-    FT
-};
-
-template <typename T>
-struct WithCoord : TupleWithType<std::pair<double, double>, T> {};
-
-template <typename T>
-struct WithDist : TupleWithType<double, T> {};
-
-template <typename T>
-struct WithHash : TupleWithType<long long, T> {};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection.cpp
deleted file mode 100644
index 87c204084..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "connection.h"
-#include <cassert>
-#include "reply.h"
-#include "command.h"
-#include "command_args.h"
-
-namespace sw {
-
-namespace redis {
-
-ConnectionOptions::ConnectionOptions(const std::string &uri) :
-                                        ConnectionOptions(_parse_options(uri)) {}
-
-ConnectionOptions ConnectionOptions::_parse_options(const std::string &uri) const {
-    std::string type;
-    std::string path;
-    std::tie(type, path) = _split_string(uri, "://");
-
-    if (path.empty()) {
-        throw Error("Invalid URI: no path");
-    }
-
-    if (type == "tcp") {
-        return _parse_tcp_options(path);
-    } else if (type == "unix") {
-        return _parse_unix_options(path);
-    } else {
-        throw Error("Invalid URI: invalid type");
-    }
-}
-
-ConnectionOptions ConnectionOptions::_parse_tcp_options(const std::string &path) const {
-    ConnectionOptions options;
-
-    options.type = ConnectionType::TCP;
-
-    std::string host;
-    std::string port;
-    std::tie(host, port) = _split_string(path, ":");
-
-    options.host = host;
-    try {
-        if (!port.empty()) {
-            options.port = std::stoi(port);
-        } // else use default port, i.e. 6379.
-    } catch (const std::exception &) {
-        throw Error("Invalid URL: invalid port");
-    }
-
-    return options;
-}
-
-ConnectionOptions ConnectionOptions::_parse_unix_options(const std::string &path) const {
-    ConnectionOptions options;
-
-    options.type = ConnectionType::UNIX;
-    options.path = path;
-
-    return options;
-}
-
-auto ConnectionOptions::_split_string(const std::string &str, const std::string &delimiter) const ->
-        std::pair<std::string, std::string> {
-    auto pos = str.rfind(delimiter);
-    if (pos == std::string::npos) {
-        return {str, ""};
-    }
-
-    return {str.substr(0, pos), str.substr(pos + delimiter.size())};
-}
-
-class Connection::Connector {
-public:
-    explicit Connector(const ConnectionOptions &opts);
-
-    ContextUPtr connect() const;
-
-private:
-    ContextUPtr _connect() const;
-
-    redisContext* _connect_tcp() const;
-
-    redisContext* _connect_unix() const;
-
-    void _set_socket_timeout(redisContext &ctx) const;
-
-    void _enable_keep_alive(redisContext &ctx) const;
-
-    timeval _to_timeval(const std::chrono::milliseconds &dur) const;
-
-    const ConnectionOptions &_opts;
-};
-
-Connection::Connector::Connector(const ConnectionOptions &opts) : _opts(opts) {}
-
-Connection::ContextUPtr Connection::Connector::connect() const {
-    auto ctx = _connect();
-
-    assert(ctx);
-
-    if (ctx->err != REDIS_OK) {
-        throw_error(*ctx, "Failed to connect to Redis");
-    }
-
-    _set_socket_timeout(*ctx);
-
-    _enable_keep_alive(*ctx);
-
-    return ctx;
-}
-
-Connection::ContextUPtr Connection::Connector::_connect() const {
-    redisContext *context = nullptr;
-    switch (_opts.type) {
-    case ConnectionType::TCP:
-        context = _connect_tcp();
-        break;
-
-    case ConnectionType::UNIX:
-        context = _connect_unix();
-        break;
-
-    default:
-        // Never goes here.
-        throw Error("Unkonw connection type");
-    }
-
-    if (context == nullptr) {
-        throw Error("Failed to allocate memory for connection.");
-    }
-
-    return ContextUPtr(context);
-}
-
-redisContext* Connection::Connector::_connect_tcp() const {
-    if (_opts.connect_timeout > std::chrono::milliseconds(0)) {
-        return redisConnectWithTimeout(_opts.host.c_str(),
-                    _opts.port,
-                    _to_timeval(_opts.connect_timeout));
-    } else {
-        return redisConnect(_opts.host.c_str(), _opts.port);
-    }
-}
-
-redisContext* Connection::Connector::_connect_unix() const {
-    if (_opts.connect_timeout > std::chrono::milliseconds(0)) {
-        return redisConnectUnixWithTimeout(
-                    _opts.path.c_str(),
-                    _to_timeval(_opts.connect_timeout));
-    } else {
-        return redisConnectUnix(_opts.path.c_str());
-    }
-}
-
-void Connection::Connector::_set_socket_timeout(redisContext &ctx) const {
-    if (_opts.socket_timeout <= std::chrono::milliseconds(0)) {
-        return;
-    }
-
-    if (redisSetTimeout(&ctx, _to_timeval(_opts.socket_timeout)) != REDIS_OK) {
-        throw_error(ctx, "Failed to set socket timeout");
-    }
-}
-
-void Connection::Connector::_enable_keep_alive(redisContext &ctx) const {
-    if (!_opts.keep_alive) {
-        return;
-    }
-
-    if (redisEnableKeepAlive(&ctx) != REDIS_OK) {
-        throw_error(ctx, "Failed to enable keep alive option");
-    }
-}
-
-timeval Connection::Connector::_to_timeval(const std::chrono::milliseconds &dur) const {
-    auto sec = std::chrono::duration_cast<std::chrono::seconds>(dur);
-    auto msec = std::chrono::duration_cast<std::chrono::microseconds>(dur - sec);
-
-    return {
-            static_cast<std::time_t>(sec.count()),
-            static_cast<suseconds_t>(msec.count())
-    };
-}
-
-void swap(Connection &lhs, Connection &rhs) noexcept {
-    std::swap(lhs._ctx, rhs._ctx);
-    std::swap(lhs._last_active, rhs._last_active);
-    std::swap(lhs._opts, rhs._opts);
-}
-
-Connection::Connection(const ConnectionOptions &opts) :
-            _ctx(Connector(opts).connect()),
-            _last_active(std::chrono::steady_clock::now()),
-            _opts(opts) {
-    assert(_ctx && !broken());
-
-    _set_options();
-}
-
-void Connection::reconnect() {
-    Connection connection(_opts);
-
-    swap(*this, connection);
-}
-
-void Connection::send(int argc, const char **argv, const std::size_t *argv_len) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommandArgv(ctx,
-                                argc,
-                                argv,
-                                argv_len) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-void Connection::send(CmdArgs &args) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommandArgv(ctx,
-                                args.size(),
-                                args.argv(),
-                                args.argv_len()) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-ReplyUPtr Connection::recv() {
-    auto *ctx = _context();
-
-    assert(ctx != nullptr);
-
-    void *r = nullptr;
-    if (redisGetReply(ctx, &r) != REDIS_OK) {
-        throw_error(*ctx, "Failed to get reply");
-    }
-
-    assert(!broken() && r != nullptr);
-
-    auto reply = ReplyUPtr(static_cast<redisReply*>(r));
-
-    if (reply::is_error(*reply)) {
-        throw_error(*reply);
-    }
-
-    return reply;
-}
-
-void Connection::_set_options() {
-    _auth();
-
-    _select_db();
-}
-
-void Connection::_auth() {
-    if (_opts.password.empty()) {
-        return;
-    }
-
-    cmd::auth(*this, _opts.password);
-
-    auto reply = recv();
-
-    reply::parse<void>(*reply);
-}
-
-void Connection::_select_db() {
-    if (_opts.db == 0) {
-        return;
-    }
-
-    cmd::select(*this, _opts.db);
-
-    auto reply = recv();
-
-    reply::parse<void>(*reply);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection.h
deleted file mode 100644
index 5ad419225..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_H
-
-#include <cerrno>
-#include <cstring>
-#include <memory>
-#include <string>
-#include <sstream>
-#include <chrono>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "reply.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class ConnectionType {
-    TCP = 0,
-    UNIX
-};
-
-struct ConnectionOptions {
-public:
-    ConnectionOptions() = default;
-
-    explicit ConnectionOptions(const std::string &uri);
-
-    ConnectionOptions(const ConnectionOptions &) = default;
-    ConnectionOptions& operator=(const ConnectionOptions &) = default;
-
-    ConnectionOptions(ConnectionOptions &&) = default;
-    ConnectionOptions& operator=(ConnectionOptions &&) = default;
-
-    ~ConnectionOptions() = default;
-
-    ConnectionType type = ConnectionType::TCP;
-
-    std::string host;
-
-    int port = 6379;
-
-    std::string path;
-
-    std::string password;
-
-    int db = 0;
-
-    bool keep_alive = false;
-
-    std::chrono::milliseconds connect_timeout{0};
-
-    std::chrono::milliseconds socket_timeout{0};
-
-private:
-    ConnectionOptions _parse_options(const std::string &uri) const;
-
-    ConnectionOptions _parse_tcp_options(const std::string &path) const;
-
-    ConnectionOptions _parse_unix_options(const std::string &path) const;
-
-    auto _split_string(const std::string &str, const std::string &delimiter) const ->
-            std::pair<std::string, std::string>;
-};
-
-class CmdArgs;
-
-class Connection {
-public:
-    explicit Connection(const ConnectionOptions &opts);
-
-    Connection(const Connection &) = delete;
-    Connection& operator=(const Connection &) = delete;
-
-    Connection(Connection &&) = default;
-    Connection& operator=(Connection &&) = default;
-
-    ~Connection() = default;
-
-    // Check if the connection is broken. Client needs to do this check
-    // before sending some command to the connection. If it's broken,
-    // client needs to reconnect it.
-    bool broken() const noexcept {
-        return _ctx->err != REDIS_OK;
-    }
-
-    void reset() noexcept {
-        _ctx->err = 0;
-    }
-
-    void reconnect();
-
-    auto last_active() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _last_active;
-    }
-
-    template <typename ...Args>
-    void send(const char *format, Args &&...args);
-
-    void send(int argc, const char **argv, const std::size_t *argv_len);
-
-    void send(CmdArgs &args);
-
-    ReplyUPtr recv();
-
-    const ConnectionOptions& options() const {
-        return _opts;
-    }
-
-    friend void swap(Connection &lhs, Connection &rhs) noexcept;
-
-private:
-    class Connector;
-
-    struct ContextDeleter {
-        void operator()(redisContext *context) const {
-            if (context != nullptr) {
-                redisFree(context);
-            }
-        };
-    };
-
-    using ContextUPtr = std::unique_ptr<redisContext, ContextDeleter>;
-
-    void _set_options();
-
-    void _auth();
-
-    void _select_db();
-
-    redisContext* _context();
-
-    ContextUPtr _ctx;
-
-    // The time that the connection is created or the time that
-    // the connection is used, i.e. *context()* is called.
-    std::chrono::time_point<std::chrono::steady_clock> _last_active{};
-
-    ConnectionOptions _opts;
-};
-
-using ConnectionSPtr = std::shared_ptr<Connection>;
-
-enum class Role {
-    MASTER,
-    SLAVE
-};
-
-// Inline implementaions.
-
-template <typename ...Args>
-inline void Connection::send(const char *format, Args &&...args) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommand(ctx,
-                format,
-                std::forward<Args>(args)...) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-inline redisContext* Connection::_context() {
-    _last_active = std::chrono::steady_clock::now();
-
-    return _ctx.get();
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection_pool.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection_pool.cpp
deleted file mode 100644
index f00edb027..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection_pool.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "connection_pool.h"
-#include <cassert>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-ConnectionPool::ConnectionPool(const ConnectionPoolOptions &pool_opts,
-        const ConnectionOptions &connection_opts) :
-            _opts(connection_opts),
-            _pool_opts(pool_opts) {
-    if (_pool_opts.size == 0) {
-        throw Error("CANNOT create an empty pool");
-    }
-
-    // Lazily create connections.
-}
-
-ConnectionPool::ConnectionPool(SimpleSentinel sentinel,
-                                const ConnectionPoolOptions &pool_opts,
-                                const ConnectionOptions &connection_opts) :
-                                    _opts(connection_opts),
-                                    _pool_opts(pool_opts),
-                                    _sentinel(std::move(sentinel)) {
-    // In this case, the connection must be of TCP type.
-    if (_opts.type != ConnectionType::TCP) {
-        throw Error("Sentinel only supports TCP connection");
-    }
-
-    if (_opts.connect_timeout == std::chrono::milliseconds(0)
-            || _opts.socket_timeout == std::chrono::milliseconds(0)) {
-        throw Error("With sentinel, connection timeout and socket timeout cannot be 0");
-    }
-
-    // Cleanup connection options.
-    _update_connection_opts("", -1);
-
-    assert(_sentinel);
-}
-
-ConnectionPool::ConnectionPool(ConnectionPool &&that) {
-    std::lock_guard<std::mutex> lock(that._mutex);
-
-    _move(std::move(that));
-}
-
-ConnectionPool& ConnectionPool::operator=(ConnectionPool &&that) {
-    if (this != &that) {
-        std::lock(_mutex, that._mutex);
-        std::lock_guard<std::mutex> lock_this(_mutex, std::adopt_lock);
-        std::lock_guard<std::mutex> lock_that(that._mutex, std::adopt_lock);
-
-        _move(std::move(that));
-    }
-
-    return *this;
-}
-
-Connection ConnectionPool::fetch() {
-    std::unique_lock<std::mutex> lock(_mutex);
-
-    if (_pool.empty()) {
-        if (_used_connections == _pool_opts.size) {
-            _wait_for_connection(lock);
-        } else {
-            // Lazily create a new connection.
-            auto connection = _create();
-
-            ++_used_connections;
-
-            return connection;
-        }
-    }
-
-    // _pool is NOT empty.
-    auto connection = _fetch();
-
-    auto connection_lifetime = _pool_opts.connection_lifetime;
-
-    if (_sentinel) {
-        auto opts = _opts;
-        auto role_changed = _role_changed(connection.options());
-        auto sentinel = _sentinel;
-
-        lock.unlock();
-
-        if (role_changed || _need_reconnect(connection, connection_lifetime)) {
-            try {
-                connection = _create(sentinel, opts, false);
-            } catch (const Error &e) {
-                // Failed to reconnect, return it to the pool, and retry latter.
-                release(std::move(connection));
-                throw;
-            }
-        }
-
-        return connection;
-    }
-
-    lock.unlock();
-
-    if (_need_reconnect(connection, connection_lifetime)) {
-        try {
-            connection.reconnect();
-        } catch (const Error &e) {
-            // Failed to reconnect, return it to the pool, and retry latter.
-            release(std::move(connection));
-            throw;
-        }
-    }
-
-    return connection;
-}
-
-ConnectionOptions ConnectionPool::connection_options() {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    return _opts;
-}
-
-void ConnectionPool::release(Connection connection) {
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        _pool.push_back(std::move(connection));
-    }
-
-    _cv.notify_one();
-}
-
-Connection ConnectionPool::create() {
-    std::unique_lock<std::mutex> lock(_mutex);
-
-    auto opts = _opts;
-
-    if (_sentinel) {
-        auto sentinel = _sentinel;
-
-        lock.unlock();
-
-        return _create(sentinel, opts, false);
-    } else {
-        lock.unlock();
-
-        return Connection(opts);
-    }
-}
-
-void ConnectionPool::_move(ConnectionPool &&that) {
-    _opts = std::move(that._opts);
-    _pool_opts = std::move(that._pool_opts);
-    _pool = std::move(that._pool);
-    _used_connections = that._used_connections;
-    _sentinel = std::move(that._sentinel);
-}
-
-Connection ConnectionPool::_create() {
-    if (_sentinel) {
-        // Get Redis host and port info from sentinel.
-        return _create(_sentinel, _opts, true);
-    }
-
-    return Connection(_opts);
-}
-
-Connection ConnectionPool::_create(SimpleSentinel &sentinel,
-                                    const ConnectionOptions &opts,
-                                    bool locked) {
-    try {
-        auto connection = sentinel.create(opts);
-
-        std::unique_lock<std::mutex> lock(_mutex, std::defer_lock);
-        if (!locked) {
-            lock.lock();
-        }
-
-        const auto &connection_opts = connection.options();
-        if (_role_changed(connection_opts)) {
-            // Master/Slave has been changed, reconnect all connections.
-            _update_connection_opts(connection_opts.host, connection_opts.port);
-        }
-
-        return connection;
-    } catch (const StopIterError &e) {
-        throw Error("Failed to create connection with sentinel");
-    }
-}
-
-Connection ConnectionPool::_fetch() {
-    assert(!_pool.empty());
-
-    auto connection = std::move(_pool.front());
-    _pool.pop_front();
-
-    return connection;
-}
-
-void ConnectionPool::_wait_for_connection(std::unique_lock<std::mutex> &lock) {
-    auto timeout = _pool_opts.wait_timeout;
-    if (timeout > std::chrono::milliseconds(0)) {
-        // Wait until _pool is no longer empty or timeout.
-        if (!_cv.wait_for(lock,
-                    timeout,
-                    [this] { return !(this->_pool).empty(); })) {
-            throw Error("Failed to fetch a connection in "
-                    + std::to_string(timeout.count()) + " milliseconds");
-        }
-    } else {
-        // Wait forever.
-        _cv.wait(lock, [this] { return !(this->_pool).empty(); });
-    }
-}
-
-bool ConnectionPool::_need_reconnect(const Connection &connection,
-                                    const std::chrono::milliseconds &connection_lifetime) const {
-    if (connection.broken()) {
-        return true;
-    }
-
-    if (connection_lifetime > std::chrono::milliseconds(0)) {
-        auto now = std::chrono::steady_clock::now();
-        if (now - connection.last_active() > connection_lifetime) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection_pool.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection_pool.h
deleted file mode 100644
index 6f2663ad7..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/connection_pool.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-
-#include <chrono>
-#include <mutex>
-#include <memory>
-#include <condition_variable>
-#include <deque>
-#include "connection.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ConnectionPoolOptions {
-    // Max number of connections, including both in-use and idle ones.
-    std::size_t size = 1;
-
-    // Max time to wait for a connection. 0ms means client waits forever.
-    std::chrono::milliseconds wait_timeout{0};
-
-    // Max lifetime of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_lifetime{0};
-};
-
-class ConnectionPool {
-public:
-    ConnectionPool(const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool(SimpleSentinel sentinel,
-                    const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool() = default;
-
-    ConnectionPool(ConnectionPool &&that);
-    ConnectionPool& operator=(ConnectionPool &&that);
-
-    ConnectionPool(const ConnectionPool &) = delete;
-    ConnectionPool& operator=(const ConnectionPool &) = delete;
-
-    ~ConnectionPool() = default;
-
-    // Fetch a connection from pool.
-    Connection fetch();
-
-    ConnectionOptions connection_options();
-
-    void release(Connection connection);
-
-    // Create a new connection.
-    Connection create();
-
-private:
-    void _move(ConnectionPool &&that);
-
-    // NOT thread-safe
-    Connection _create();
-
-    Connection _create(SimpleSentinel &sentinel, const ConnectionOptions &opts, bool locked);
-
-    Connection _fetch();
-
-    void _wait_for_connection(std::unique_lock<std::mutex> &lock);
-
-    bool _need_reconnect(const Connection &connection,
-                            const std::chrono::milliseconds &connection_lifetime) const;
-
-    void _update_connection_opts(const std::string &host, int port) {
-        _opts.host = host;
-        _opts.port = port;
-    }
-
-    bool _role_changed(const ConnectionOptions &opts) const {
-        return opts.port != _opts.port || opts.host != _opts.host;
-    }
-
-    ConnectionOptions _opts;
-
-    ConnectionPoolOptions _pool_opts;
-
-    std::deque<Connection> _pool;
-
-    std::size_t _used_connections = 0;
-
-    std::mutex _mutex;
-
-    std::condition_variable _cv;
-
-    SimpleSentinel _sentinel;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/crc16.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/crc16.cpp
deleted file mode 100644
index c94a08d30..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/crc16.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2001-2010 Georges Menie (www.menie.org)
- * Copyright 2010-2012 Salvatore Sanfilippo (adapted to Redis coding style)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the University of California, Berkeley nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* CRC16 implementation according to CCITT standards.
- *
- * Note by @antirez: this is actually the XMODEM CRC 16 algorithm, using the
- * following parameters:
- *
- * Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
- * Width                      : 16 bit
- * Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
- * Initialization             : 0000
- * Reflect Input byte         : False
- * Reflect Output CRC         : False
- * Xor constant to output CRC : 0000
- * Output for "123456789"     : 31C3
- */
-
-#include <cstdint>
-
-namespace sw {
-
-namespace redis {
-
-static const uint16_t crc16tab[256]= {
-    0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
-    0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
-    0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
-    0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
-    0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
-    0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
-    0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
-    0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
-    0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
-    0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
-    0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
-    0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
-    0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
-    0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
-    0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
-    0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
-    0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
-    0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
-    0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
-    0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
-    0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
-    0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
-    0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
-    0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
-    0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
-    0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
-    0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
-    0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
-    0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
-    0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
-    0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
-    0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
-};
-
-uint16_t crc16(const char *buf, int len) {
-    int counter;
-    uint16_t crc = 0;
-    for (counter = 0; counter < len; counter++)
-            crc = (crc<<8) ^ crc16tab[((crc>>8) ^ *buf++)&0x00FF];
-    return crc;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/errors.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/errors.cpp
deleted file mode 100644
index 5d5fe7dc9..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/errors.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "errors.h"
-#include <cassert>
-#include <cerrno>
-#include <unordered_map>
-#include <tuple>
-#include "shards.h"
-
-namespace {
-
-using namespace sw::redis;
-
-std::pair<ReplyErrorType, std::string> parse_error(const std::string &msg);
-
-std::unordered_map<std::string, ReplyErrorType> error_map = {
-    {"MOVED", ReplyErrorType::MOVED},
-    {"ASK", ReplyErrorType::ASK}
-};
-
-}
-
-namespace sw {
-
-namespace redis {
-
-void throw_error(redisContext &context, const std::string &err_info) {
-    auto err_code = context.err;
-    const auto *err_str = context.errstr;
-    if (err_str == nullptr) {
-        throw Error(err_info + ": null error message: " + std::to_string(err_code));
-    }
-
-    auto err_msg = err_info + ": " + err_str;
-
-    switch (err_code) {
-    case REDIS_ERR_IO:
-        if (errno == EAGAIN || errno == EINTR) {
-            throw TimeoutError(err_msg);
-        } else {
-            throw IoError(err_msg);
-        }
-        break;
-
-    case REDIS_ERR_EOF:
-        throw ClosedError(err_msg);
-        break;
-
-    case REDIS_ERR_PROTOCOL:
-        throw ProtoError(err_msg);
-        break;
-
-    case REDIS_ERR_OOM:
-        throw OomError(err_msg);
-        break;
-
-    case REDIS_ERR_OTHER:
-        throw Error(err_msg);
-        break;
-
-    default:
-        throw Error(err_info + ": Unknown error code");
-    }
-}
-
-void throw_error(const redisReply &reply) {
-    assert(reply.type == REDIS_REPLY_ERROR);
-
-    if (reply.str == nullptr) {
-        throw Error("Null error reply");
-    }
-
-    auto err_str = std::string(reply.str, reply.len);
-
-    auto err_type = ReplyErrorType::ERR;
-    std::string err_msg;
-    std::tie(err_type, err_msg) = parse_error(err_str);
-
-    switch (err_type) {
-    case ReplyErrorType::MOVED:
-        throw MovedError(err_msg);
-        break;
-
-    case ReplyErrorType::ASK:
-        throw AskError(err_msg);
-        break;
-
-    default:
-        throw ReplyError(err_str);
-        break;
-    }
-}
-
-}
-
-}
-
-namespace {
-
-using namespace sw::redis;
-
-std::pair<ReplyErrorType, std::string> parse_error(const std::string &err) {
-    // The error contains an Error Prefix, and an optional error message.
-    auto idx = err.find_first_of(" \n");
-
-    if (idx == std::string::npos) {
-        throw ProtoError("No Error Prefix: " + err);
-    }
-
-    auto err_prefix = err.substr(0, idx);
-    auto err_type = ReplyErrorType::ERR;
-
-    auto iter = error_map.find(err_prefix);
-    if (iter != error_map.end()) {
-        // Specific error.
-        err_type = iter->second;
-    } // else Generic error.
-
-    return {err_type, err.substr(idx + 1)};
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/errors.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/errors.h
deleted file mode 100644
index 44d629e50..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/errors.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ERRORS_H
-#define SEWENEW_REDISPLUSPLUS_ERRORS_H
-
-#include <exception>
-#include <string>
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-enum ReplyErrorType {
-    ERR,
-    MOVED,
-    ASK
-};
-
-class Error : public std::exception {
-public:
-    explicit Error(const std::string &msg) : _msg(msg) {}
-
-    Error(const Error &) = default;
-    Error& operator=(const Error &) = default;
-
-    Error(Error &&) = default;
-    Error& operator=(Error &&) = default;
-
-    virtual ~Error() = default;
-
-    virtual const char* what() const noexcept {
-        return _msg.data();
-    }
-
-private:
-    std::string _msg;
-};
-
-class IoError : public Error {
-public:
-    explicit IoError(const std::string &msg) : Error(msg) {}
-
-    IoError(const IoError &) = default;
-    IoError& operator=(const IoError &) = default;
-
-    IoError(IoError &&) = default;
-    IoError& operator=(IoError &&) = default;
-
-    virtual ~IoError() = default;
-};
-
-class TimeoutError : public IoError {
-public:
-    explicit TimeoutError(const std::string &msg) : IoError(msg) {}
-
-    TimeoutError(const TimeoutError &) = default;
-    TimeoutError& operator=(const TimeoutError &) = default;
-
-    TimeoutError(TimeoutError &&) = default;
-    TimeoutError& operator=(TimeoutError &&) = default;
-
-    virtual ~TimeoutError() = default;
-};
-
-class ClosedError : public Error {
-public:
-    explicit ClosedError(const std::string &msg) : Error(msg) {}
-
-    ClosedError(const ClosedError &) = default;
-    ClosedError& operator=(const ClosedError &) = default;
-
-    ClosedError(ClosedError &&) = default;
-    ClosedError& operator=(ClosedError &&) = default;
-
-    virtual ~ClosedError() = default;
-};
-
-class ProtoError : public Error {
-public:
-    explicit ProtoError(const std::string &msg) : Error(msg) {}
-
-    ProtoError(const ProtoError &) = default;
-    ProtoError& operator=(const ProtoError &) = default;
-
-    ProtoError(ProtoError &&) = default;
-    ProtoError& operator=(ProtoError &&) = default;
-
-    virtual ~ProtoError() = default;
-};
-
-class OomError : public Error {
-public:
-    explicit OomError(const std::string &msg) : Error(msg) {}
-
-    OomError(const OomError &) = default;
-    OomError& operator=(const OomError &) = default;
-
-    OomError(OomError &&) = default;
-    OomError& operator=(OomError &&) = default;
-
-    virtual ~OomError() = default;
-};
-
-class ReplyError : public Error {
-public:
-    explicit ReplyError(const std::string &msg) : Error(msg) {}
-
-    ReplyError(const ReplyError &) = default;
-    ReplyError& operator=(const ReplyError &) = default;
-
-    ReplyError(ReplyError &&) = default;
-    ReplyError& operator=(ReplyError &&) = default;
-
-    virtual ~ReplyError() = default;
-};
-
-class WatchError : public Error {
-public:
-    explicit WatchError() : Error("Watched key has been modified") {}
-
-    WatchError(const WatchError &) = default;
-    WatchError& operator=(const WatchError &) = default;
-
-    WatchError(WatchError &&) = default;
-    WatchError& operator=(WatchError &&) = default;
-
-    virtual ~WatchError() = default;
-};
-
-
-// MovedError and AskError are defined in shards.h
-class MovedError;
-
-class AskError;
-
-void throw_error(redisContext &context, const std::string &err_info);
-
-void throw_error(const redisReply &reply);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ERRORS_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/pipeline.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/pipeline.cpp
deleted file mode 100644
index 141f96ea2..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/pipeline.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "pipeline.h"
-
-namespace sw {
-
-namespace redis {
-
-std::vector<ReplyUPtr> PipelineImpl::exec(Connection &connection, std::size_t cmd_num) {
-    std::vector<ReplyUPtr> replies;
-    while (cmd_num > 0) {
-        replies.push_back(connection.recv());
-        --cmd_num;
-    }
-
-    return replies;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/pipeline.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/pipeline.h
deleted file mode 100644
index 52b01253f..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/pipeline.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_PIPELINE_H
-#define SEWENEW_REDISPLUSPLUS_PIPELINE_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-class PipelineImpl {
-public:
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args) {
-        assert(!connection.broken());
-
-        cmd(connection, std::forward<Args>(args)...);
-    }
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t /*cmd_num*/) {
-        // Reconnect to Redis to discard all commands.
-        connection.reconnect();
-    }
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_PIPELINE_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/queued_redis.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/queued_redis.h
deleted file mode 100644
index 71d975ee3..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/queued_redis.h
+++ /dev/null
@@ -1,1844 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-
-#include <cassert>
-#include <chrono>
-#include <initializer_list>
-#include <vector>
-#include "connection.h"
-#include "utils.h"
-#include "reply.h"
-#include "command.h"
-#include "redis.h"
-
-namespace sw {
-
-namespace redis {
-
-class QueuedReplies;
-
-// If any command throws, QueuedRedis resets the connection, and becomes invalid.
-// In this case, the only thing we can do is to destory the QueuedRedis object.
-template <typename Impl>
-class QueuedRedis {
-public:
-    QueuedRedis(QueuedRedis &&) = default;
-    QueuedRedis& operator=(QueuedRedis &&) = default;
-
-    // When it destructs, the underlying *Connection* will be closed,
-    // and any command that has NOT been executed will be ignored.
-    ~QueuedRedis() = default;
-
-    Redis redis();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                    QueuedRedis&>::type;
-
-    template <typename ...Args>
-    QueuedRedis& command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, QueuedRedis&>::type;
-
-    QueuedReplies exec();
-
-    void discard();
-
-    // CONNECTION commands.
-
-    QueuedRedis& auth(const StringView &password) {
-        return command(cmd::auth, password);
-    }
-
-    QueuedRedis& echo(const StringView &msg) {
-        return command(cmd::echo, msg);
-    }
-
-    QueuedRedis& ping() {
-        return command<void (*)(Connection &)>(cmd::ping);
-    }
-
-    QueuedRedis& ping(const StringView &msg) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::ping, msg);
-    }
-
-    // We DO NOT support the QUIT command. See *Redis::quit* doc for details.
-    //
-    // QueuedRedis& quit();
-
-    QueuedRedis& select(long long idx) {
-        return command(cmd::select, idx);
-    }
-
-    QueuedRedis& swapdb(long long idx1, long long idx2) {
-        return command(cmd::swapdb, idx1, idx2);
-    }
-
-    // SERVER commands.
-
-    QueuedRedis& bgrewriteaof() {
-        return command(cmd::bgrewriteaof);
-    }
-
-    QueuedRedis& bgsave() {
-        return command(cmd::bgsave);
-    }
-
-    QueuedRedis& dbsize() {
-        return command(cmd::dbsize);
-    }
-
-    QueuedRedis& flushall(bool async = false) {
-        return command(cmd::flushall, async);
-    }
-
-    QueuedRedis& flushdb(bool async = false) {
-        return command(cmd::flushdb, async);
-    }
-
-    QueuedRedis& info() {
-        return command<void (*)(Connection &)>(cmd::info);
-    }
-
-    QueuedRedis& info(const StringView &section) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::info, section);
-    }
-
-    QueuedRedis& lastsave() {
-        return command(cmd::lastsave);
-    }
-
-    QueuedRedis& save() {
-        return command(cmd::save);
-    }
-
-    // KEY commands.
-
-    QueuedRedis& del(const StringView &key) {
-        return command(cmd::del, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& del(Input first, Input last) {
-        return command(cmd::del_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    QueuedRedis& dump(const StringView &key) {
-        return command(cmd::dump, key);
-    }
-
-    QueuedRedis& exists(const StringView &key) {
-        return command(cmd::exists, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& exists(Input first, Input last) {
-        return command(cmd::exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& expire(const StringView &key, long long timeout) {
-        return command(cmd::expire, key, timeout);
-    }
-
-    QueuedRedis& expire(const StringView &key,
-                        const std::chrono::seconds &timeout) {
-        return expire(key, timeout.count());
-    }
-
-    QueuedRedis& expireat(const StringView &key, long long timestamp) {
-        return command(cmd::expireat, key, timestamp);
-    }
-
-    QueuedRedis& expireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::seconds> &tp) {
-        return expireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& keys(const StringView &pattern) {
-        return command(cmd::keys, pattern);
-    }
-
-    QueuedRedis& move(const StringView &key, long long db) {
-        return command(cmd::move, key, db);
-    }
-
-    QueuedRedis& persist(const StringView &key) {
-        return command(cmd::persist, key);
-    }
-
-    QueuedRedis& pexpire(const StringView &key, long long timeout) {
-        return command(cmd::pexpire, key, timeout);
-    }
-
-    QueuedRedis& pexpire(const StringView &key,
-                            const std::chrono::milliseconds &timeout) {
-        return pexpire(key, timeout.count());
-    }
-
-    QueuedRedis& pexpireat(const StringView &key, long long timestamp) {
-        return command(cmd::pexpireat, key, timestamp);
-    }
-
-    QueuedRedis& pexpireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::milliseconds> &tp) {
-        return pexpireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& pttl(const StringView &key) {
-        return command(cmd::pttl, key);
-    }
-
-    QueuedRedis& randomkey() {
-        return command(cmd::randomkey);
-    }
-
-    QueuedRedis& rename(const StringView &key, const StringView &newkey) {
-        return command(cmd::rename, key, newkey);
-    }
-
-    QueuedRedis& renamenx(const StringView &key, const StringView &newkey) {
-        return command(cmd::renamenx, key, newkey);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                                const StringView &val,
-                                long long ttl,
-                                bool replace = false) {
-        return command(cmd::restore, key, val, ttl, replace);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                            bool replace = false) {
-        return restore(key, val, ttl.count(), replace);
-    }
-
-    // TODO: sort
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::scan, cursor, pattern, count);
-    }
-
-    QueuedRedis& scan(long long cursor) {
-        return scan(cursor, "*", 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern) {
-        return scan(cursor, pattern, 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        long long count) {
-        return scan(cursor, "*", count);
-    }
-
-    QueuedRedis& touch(const StringView &key) {
-        return command(cmd::touch, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& touch(Input first, Input last) {
-        return command(cmd::touch_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    QueuedRedis& ttl(const StringView &key) {
-        return command(cmd::ttl, key);
-    }
-
-    QueuedRedis& type(const StringView &key) {
-        return command(cmd::type, key);
-    }
-
-    QueuedRedis& unlink(const StringView &key) {
-        return command(cmd::unlink, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& unlink(Input first, Input last) {
-        return command(cmd::unlink_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    QueuedRedis& wait(long long numslaves, long long timeout) {
-        return command(cmd::wait, numslaves, timeout);
-    }
-
-    QueuedRedis& wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-        return wait(numslaves, timeout.count());
-    }
-
-    // STRING commands.
-
-    QueuedRedis& append(const StringView &key, const StringView &str) {
-        return command(cmd::append, key, str);
-    }
-
-    QueuedRedis& bitcount(const StringView &key,
-                            long long start = 0,
-                            long long end = -1) {
-        return command(cmd::bitcount, key, start, end);
-    }
-
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        const StringView &key) {
-        return command(cmd::bitop, op, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        Input first,
-                        Input last) {
-        return command(cmd::bitop_range<Input>, op, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1) {
-        return command(cmd::bitpos, key, bit, start, end);
-    }
-
-    QueuedRedis& decr(const StringView &key) {
-        return command(cmd::decr, key);
-    }
-
-    QueuedRedis& decrby(const StringView &key, long long decrement) {
-        return command(cmd::decrby, key, decrement);
-    }
-
-    QueuedRedis& get(const StringView &key) {
-        return command(cmd::get, key);
-    }
-
-    QueuedRedis& getbit(const StringView &key, long long offset) {
-        return command(cmd::getbit, key, offset);
-    }
-
-    QueuedRedis& getrange(const StringView &key, long long start, long long end) {
-        return command(cmd::getrange, key, start, end);
-    }
-
-    QueuedRedis& getset(const StringView &key, const StringView &val) {
-        return command(cmd::getset, key, val);
-    }
-
-    QueuedRedis& incr(const StringView &key) {
-        return command(cmd::incr, key);
-    }
-
-    QueuedRedis& incrby(const StringView &key, long long increment) {
-        return command(cmd::incrby, key, increment);
-    }
-
-    QueuedRedis& incrbyfloat(const StringView &key, double increment) {
-        return command(cmd::incrbyfloat, key, increment);
-    }
-
-    template <typename Input>
-    QueuedRedis& mget(Input first, Input last) {
-        return command(cmd::mget<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mget(std::initializer_list<T> il) {
-        return mget(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& mset(Input first, Input last) {
-        return command(cmd::mset<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mset(std::initializer_list<T> il) {
-        return mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& msetnx(Input first, Input last) {
-        return command(cmd::msetnx<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::psetex, key, ttl, val);
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        const std::chrono::milliseconds &ttl,
-                        const StringView &val) {
-        return psetex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& set(const StringView &key,
-                        const StringView &val,
-                        const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                        UpdateType type = UpdateType::ALWAYS) {
-        _set_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::set, key, val, ttl.count(), type);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::setex, key, ttl, val);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        const std::chrono::seconds &ttl,
-                        const StringView &val) {
-        return setex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& setnx(const StringView &key, const StringView &val) {
-        return command(cmd::setnx, key, val);
-    }
-
-    QueuedRedis& setrange(const StringView &key,
-                            long long offset,
-                            const StringView &val) {
-        return command(cmd::setrange, key, offset, val);
-    }
-
-    QueuedRedis& strlen(const StringView &key) {
-        return command(cmd::strlen, key);
-    }
-
-    // LIST commands.
-
-    QueuedRedis& blpop(const StringView &key, long long timeout) {
-        return command(cmd::blpop, key, timeout);
-    }
-
-    QueuedRedis& blpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first, Input last, long long timeout) {
-        return command(cmd::blpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key, long long timeout) {
-        return command(cmd::brpop, key, timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first, Input last, long long timeout) {
-        return command(cmd::brpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            long long timeout) {
-        return command(cmd::brpoplpush, source, destination, timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpoplpush(source, destination, timeout.count());
-    }
-
-    QueuedRedis& lindex(const StringView &key, long long index) {
-        return command(cmd::lindex, key, index);
-    }
-
-    QueuedRedis& linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-        return command(cmd::linsert, key, position, pivot, val);
-    }
-
-    QueuedRedis& llen(const StringView &key) {
-        return command(cmd::llen, key);
-    }
-
-    QueuedRedis& lpop(const StringView &key) {
-        return command(cmd::lpop, key);
-    }
-
-    QueuedRedis& lpush(const StringView &key, const StringView &val) {
-        return command(cmd::lpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& lpush(const StringView &key, Input first, Input last) {
-        return command(cmd::lpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& lpushx(const StringView &key, const StringView &val) {
-        return command(cmd::lpushx, key, val);
-    }
-
-    QueuedRedis& lrange(const StringView &key,
-                        long long start,
-                        long long stop) {
-        return command(cmd::lrange, key, start, stop);
-    }
-
-    QueuedRedis& lrem(const StringView &key, long long count, const StringView &val) {
-        return command(cmd::lrem, key, count, val);
-    }
-
-    QueuedRedis& lset(const StringView &key, long long index, const StringView &val) {
-        return command(cmd::lset, key, index, val);
-    }
-
-    QueuedRedis& ltrim(const StringView &key, long long start, long long stop) {
-        return command(cmd::ltrim, key, start, stop);
-    }
-
-    QueuedRedis& rpop(const StringView &key) {
-        return command(cmd::rpop, key);
-    }
-
-    QueuedRedis& rpoplpush(const StringView &source, const StringView &destination) {
-        return command(cmd::rpoplpush, source, destination);
-    }
-
-    QueuedRedis& rpush(const StringView &key, const StringView &val) {
-        return command(cmd::rpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& rpush(const StringView &key, Input first, Input last) {
-        return command(cmd::rpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& rpushx(const StringView &key, const StringView &val) {
-        return command(cmd::rpushx, key, val);
-    }
-
-    // HASH commands.
-
-    QueuedRedis& hdel(const StringView &key, const StringView &field) {
-        return command(cmd::hdel, key, field);
-    }
-
-    template <typename Input>
-    QueuedRedis& hdel(const StringView &key, Input first, Input last) {
-        return command(cmd::hdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hexists(const StringView &key, const StringView &field) {
-        return command(cmd::hexists, key, field);
-    }
-
-    QueuedRedis& hget(const StringView &key, const StringView &field) {
-        return command(cmd::hget, key, field);
-    }
-
-    QueuedRedis& hgetall(const StringView &key) {
-        return command(cmd::hgetall, key);
-    }
-
-    QueuedRedis& hincrby(const StringView &key,
-                            const StringView &field,
-                            long long increment) {
-        return command(cmd::hincrby, key, field, increment);
-    }
-
-    QueuedRedis& hincrbyfloat(const StringView &key,
-                                const StringView &field,
-                                double increment) {
-        return command(cmd::hincrbyfloat, key, field, increment);
-    }
-
-    QueuedRedis& hkeys(const StringView &key) {
-        return command(cmd::hkeys, key);
-    }
-
-    QueuedRedis& hlen(const StringView &key) {
-        return command(cmd::hlen, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& hmget(const StringView &key, Input first, Input last) {
-        return command(cmd::hmget<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmget(const StringView &key, std::initializer_list<T> il) {
-        return hmget(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& hmset(const StringView &key, Input first, Input last) {
-        return command(cmd::hmset<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmset(const StringView &key, std::initializer_list<T> il) {
-        return hmset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::hscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return hscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return hscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor) {
-        return hscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& hset(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hset, key, field, val);
-    }
-
-    QueuedRedis& hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hset(key, item.first, item.second);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hsetnx, key, field, val);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hsetnx(key, item.first, item.second);
-    }
-
-    QueuedRedis& hstrlen(const StringView &key, const StringView &field) {
-        return command(cmd::hstrlen, key, field);
-    }
-
-    QueuedRedis& hvals(const StringView &key) {
-        return command(cmd::hvals, key);
-    }
-
-    // SET commands.
-
-    QueuedRedis& sadd(const StringView &key, const StringView &member) {
-        return command(cmd::sadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& sadd(const StringView &key, Input first, Input last) {
-        return command(cmd::sadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& scard(const StringView &key) {
-        return command(cmd::scard, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiff(Input first, Input last) {
-        return command(cmd::sdiff<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiff(std::initializer_list<T> il) {
-        return sdiff(il.begin(), il.end());
-    }
-
-    QueuedRedis& sdiffstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sdiffstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-        return command(cmd::sdiffstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiffstore(const StringView &destination, std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& sinter(Input first, Input last) {
-        return command(cmd::sinter<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinter(std::initializer_list<T> il) {
-        return sinter(il.begin(), il.end());
-    }
-
-    QueuedRedis& sinterstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sinterstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sinterstore(const StringView &destination,
-                                Input first,
-                                Input last) {
-        return command(cmd::sinterstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinterstore(const StringView &destination, std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& sismember(const StringView &key, const StringView &member) {
-        return command(cmd::sismember, key, member);
-    }
-
-    QueuedRedis& smembers(const StringView &key) {
-        return command(cmd::smembers, key);
-    }
-
-    QueuedRedis& smove(const StringView &source,
-                        const StringView &destination,
-                        const StringView &member) {
-        return command(cmd::smove, source, destination, member);
-    }
-
-    QueuedRedis& spop(const StringView &key) {
-        return command(cmd::spop, key);
-    }
-
-    QueuedRedis& spop(const StringView &key, long long count) {
-        return command(cmd::spop_range, key, count);
-    }
-
-    QueuedRedis& srandmember(const StringView &key) {
-        return command(cmd::srandmember, key);
-    }
-
-    QueuedRedis& srandmember(const StringView &key, long long count) {
-        return command(cmd::srandmember_range, key, count);
-    }
-
-    QueuedRedis& srem(const StringView &key, const StringView &member) {
-        return command(cmd::srem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& srem(const StringView &key, Input first, Input last) {
-        return command(cmd::srem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::sscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern) {
-        return sscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return sscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor) {
-        return sscan(key, cursor, "*", 10);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunion(Input first, Input last) {
-        return command(cmd::sunion<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunion(std::initializer_list<T> il) {
-        return sunion(il.begin(), il.end());
-    }
-
-    QueuedRedis& sunionstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sunionstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunionstore(const StringView &destination, Input first, Input last) {
-        return command(cmd::sunionstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    QueuedRedis& bzpopmax(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmax, key, timeout);
-    }
-
-    QueuedRedis& bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first, Input last, long long timeout) {
-        return command(cmd::bzpopmax_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il, long long timeout) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmin, key, timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first, Input last, long long timeout) {
-        return command(cmd::bzpopmin_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il, long long timeout) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    QueuedRedis& zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd, key, member, score, type, changed);
-    }
-
-    template <typename Input>
-    QueuedRedis& zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd_range<Input>, key, first, last, type, changed);
-    }
-
-    QueuedRedis& zcard(const StringView &key) {
-        return command(cmd::zcard, key);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zincrby(const StringView &key, double increment, const StringView &member) {
-        return command(cmd::zincrby, key, increment, member);
-    }
-
-    QueuedRedis& zinterstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zinterstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        return command(cmd::zinterstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zlexcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zlexcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key) {
-        return command(cmd::zpopmax, key, 1);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key, long long count) {
-        return command(cmd::zpopmax, key, count);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key) {
-        return command(cmd::zpopmin, key, 1);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key, long long count) {
-        return command(cmd::zpopmin, key, count);
-    }
-
-    // NOTE: *QueuedRedis::zrange*'s parameters are different from *Redis::zrange*.
-    // *Redis::zrange* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::zrange*. So we have to use an extra parameter: *with_scores*,
-    // to decide whether we should send *WITHSCORES* option to Redis. This also applies to
-    // other commands with the *WITHSCORES* option, e.g. *ZRANGEBYSCORE*, *ZREVRANGE*,
-    // *ZREVRANGEBYSCORE*.
-    QueuedRedis& zrange(const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores = false) {
-        return command(cmd::zrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key, const Interval &interval) {
-        return zrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                bool with_scores = false) {
-        return command(cmd::zrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                bool with_scores = false) {
-        return zrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrank, key, member);
-    }
-
-    QueuedRedis& zrem(const StringView &key, const StringView &member) {
-        return command(cmd::zrem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& zrem(const StringView &key, Input first, Input last) {
-        return command(cmd::zrem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebylex(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebylex<Interval>, key, interval);
-    }
-
-    QueuedRedis& zremrangebyrank(const StringView &key, long long start, long long stop) {
-        return command(cmd::zremrangebyrank, key, start, stop);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebyscore(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebyscore<Interval>, key, interval);
-    }
-
-    // See comments on *ZRANGE*.
-    QueuedRedis& zrevrange(const StringView &key,
-                            long long start,
-                            long long stop,
-                            bool with_scores = false) {
-        return command(cmd::zrevrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key, const Interval &interval) {
-        return zrevrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    const LimitOptions &opts,
-                                    bool with_scores = false) {
-        return command(cmd::zrevrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    bool with_scores = false) {
-        return zrevrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrevrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrevrank, key, member);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::zscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return zscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return zscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor) {
-        return zscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& zscore(const StringView &key, const StringView &member) {
-        return command(cmd::zscore, key, member);
-    }
-
-    QueuedRedis& zunionstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zunionstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        return command(cmd::zunionstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    QueuedRedis& pfadd(const StringView &key, const StringView &element) {
-        return command(cmd::pfadd, key, element);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfadd(const StringView &key, Input first, Input last) {
-        return command(cmd::pfadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& pfcount(const StringView &key) {
-        return command(cmd::pfcount, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfcount(Input first, Input last) {
-        return command(cmd::pfcount_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    QueuedRedis& pfmerge(const StringView &destination, const StringView &key) {
-        return command(cmd::pfmerge, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfmerge(const StringView &destination, Input first, Input last) {
-        return command(cmd::pfmerge_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        return pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    QueuedRedis& geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-        return command(cmd::geoadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geoadd(const StringView &key,
-                        Input first,
-                        Input last) {
-        return command(cmd::geoadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geoadd(const StringView &key, std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M) {
-        return command(cmd::geodist, key, member1, member2, unit);
-    }
-
-    template <typename Input>
-    QueuedRedis& geohash(const StringView &key, Input first, Input last) {
-        return command(cmd::geohash_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geohash(const StringView &key, std::initializer_list<T> il) {
-        return geohash(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& geopos(const StringView &key, Input first, Input last) {
-        return command(cmd::geopos_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geopos(const StringView &key, std::initializer_list<T> il) {
-        return geopos(key, il.begin(), il.end());
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            const StringView &destination,
-                            bool store_dist,
-                            long long count) {
-        _georadius_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadius_store,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // NOTE: *QueuedRedis::georadius*'s parameters are different from *Redis::georadius*.
-    // *Redis::georadius* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::georadius*. So we have to use extra parameters to decide
-    // whether we should send options to Redis. This also applies to *GEORADIUSBYMEMBER*.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            bool with_coord,
-                            bool with_dist,
-                            bool with_hash) {
-        return command(cmd::georadius,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-        _georadius_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // See the comments on *GEORADIUS*.
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    long long count,
-                                    bool asc,
-                                    bool with_coord,
-                                    bool with_dist,
-                                    bool with_hash) {
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    // SCRIPTING commands.
-
-    QueuedRedis& eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-        return command(cmd::eval, script, keys, args);
-    }
-
-    QueuedRedis& evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-        return command(cmd::evalsha, script, keys, args);
-    }
-
-    template <typename Input>
-    QueuedRedis& script_exists(Input first, Input last) {
-        return command(cmd::script_exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& script_exists(std::initializer_list<T> il) {
-        return script_exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& script_flush() {
-        return command(cmd::script_flush);
-    }
-
-    QueuedRedis& script_kill() {
-        return command(cmd::script_kill);
-    }
-
-    QueuedRedis& script_load(const StringView &script) {
-        return command(cmd::script_load, script);
-    }
-
-    // PUBSUB commands.
-
-    QueuedRedis& publish(const StringView &channel, const StringView &message) {
-        return command(cmd::publish, channel, message);
-    }
-
-    // Stream commands.
-
-    QueuedRedis& xack(const StringView &key, const StringView &group, const StringView &id) {
-        return command(cmd::xack, key, group, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xack(const StringView &key, const StringView &group, Input first, Input last) {
-        return command(cmd::xack_range<Input>, key, group, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, Input first, Input last) {
-        return command(cmd::xadd_range<Input>, key, id, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true) {
-        return command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    QueuedRedis& xclaim(const StringView &key,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const std::chrono::milliseconds &min_idle_time,
-                        const StringView &id) {
-        return command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last) {
-        return command(cmd::xclaim_range<Input>,
-                        key,
-                        group,
-                        consumer,
-                        min_idle_time.count(),
-                        first,
-                        last);
-    }
-
-    template <typename T>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il) {
-        return xclaim(key, group, consumer, min_idle_time, il.begin(), il.end());
-    }
-
-    QueuedRedis& xdel(const StringView &key, const StringView &id) {
-        return command(cmd::xdel, key, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xdel(const StringView &key, Input first, Input last) {
-        return command(cmd::xdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& xgroup_create(const StringView &key,
-                                const StringView &group,
-                                const StringView &id,
-                                bool mkstream = false) {
-        return command(cmd::xgroup_create, key, group, id, mkstream);
-    }
-
-    QueuedRedis& xgroup_setid(const StringView &key,
-                                const StringView &group,
-                                const StringView &id) {
-        return command(cmd::xgroup_setid, key, group, id);
-    }
-
-    QueuedRedis& xgroup_destroy(const StringView &key, const StringView &group) {
-        return command(cmd::xgroup_destroy, key, group);
-    }
-
-    QueuedRedis& xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer) {
-        return command(cmd::xgroup_delconsumer, key, group, consumer);
-    }
-
-    QueuedRedis& xlen(const StringView &key) {
-        return command(cmd::xlen, key);
-    }
-
-    QueuedRedis& xpending(const StringView &key, const StringView &group) {
-        return command(cmd::xpending, key, group);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-        return command(cmd::xpending_detail, key, group, start, end, count);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer) {
-        return command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end) {
-        return command(cmd::xrange, key, start, end);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count) {
-        return command(cmd::xrange, key, start, end, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id, long long count) {
-        return command(cmd::xread, key, id, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id) {
-        return xread(key, id, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last, long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xread_range<Input>, first, last, count);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, 0);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count) {
-        return command(cmd::xread_block, key, id, timeout.count(), count);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout) {
-        return xread(key, id, timeout, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, timeout, 0);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, 0, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup_block,
-                        group,
-                        consumer,
-                        key,
-                        id,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return command(cmd::xreadgroup_block_range<Input>,
-                        group,
-                        consumer,
-                        first,
-                        last,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, 0, false);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start) {
-        return command(cmd::xrevrange, key, end, start);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-        return command(cmd::xrevrange, key, end, start, count);
-    }
-
-    QueuedRedis& xtrim(const StringView &key, long long count, bool approx = true) {
-        return command(cmd::xtrim, key, count, approx);
-    }
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    template <typename ...Args>
-    QueuedRedis(const ConnectionSPtr &connection, Args &&...args);
-
-    void _sanity_check() const;
-
-    void _reset();
-
-    void _invalidate();
-
-    void _rewrite_replies(std::vector<ReplyUPtr> &replies) const;
-
-    template <typename Func>
-    void _rewrite_replies(const std::vector<std::size_t> &indexes,
-                            Func rewriter,
-                            std::vector<ReplyUPtr> &replies) const;
-
-    ConnectionSPtr _connection;
-
-    Impl _impl;
-
-    std::size_t _cmd_num = 0;
-
-    std::vector<std::size_t> _set_cmd_indexes;
-
-    std::vector<std::size_t> _georadius_cmd_indexes;
-
-    bool _valid = true;
-};
-
-class QueuedReplies {
-public:
-    std::size_t size() const;
-
-    redisReply& get(std::size_t idx);
-
-    template <typename Result>
-    Result get(std::size_t idx);
-
-    template <typename Output>
-    void get(std::size_t idx, Output output);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    explicit QueuedReplies(std::vector<ReplyUPtr> replies) : _replies(std::move(replies)) {}
-
-    void _index_check(std::size_t idx) const;
-
-    std::vector<ReplyUPtr> _replies;
-};
-
-}
-
-}
-
-#include "queued_redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/queued_redis.hpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/queued_redis.hpp
deleted file mode 100644
index 409f48aca..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/queued_redis.hpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>::QueuedRedis(const ConnectionSPtr &connection, Args &&...args) :
-            _connection(connection),
-            _impl(std::forward<Args>(args)...) {
-    assert(_connection);
-}
-
-template <typename Impl>
-Redis QueuedRedis<Impl>::redis() {
-    return Redis(_connection);
-}
-
-template <typename Impl>
-template <typename Cmd, typename ...Args>
-auto QueuedRedis<Impl>::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                QueuedRedis<Impl>&>::type {
-    try {
-        _sanity_check();
-
-        _impl.command(*_connection, cmd, std::forward<Args>(args)...);
-
-        ++_cmd_num;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-
-    return *this;
-}
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>& QueuedRedis<Impl>::command(const StringView &cmd_name, Args &&...args) {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Impl>
-template <typename Input>
-auto QueuedRedis<Impl>::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, QueuedRedis<Impl>&>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Impl>
-QueuedReplies QueuedRedis<Impl>::exec() {
-    try {
-        _sanity_check();
-
-        auto replies = _impl.exec(*_connection, _cmd_num);
-
-        _rewrite_replies(replies);
-
-        _reset();
-
-        return QueuedReplies(std::move(replies));
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::discard() {
-    try {
-        _sanity_check();
-
-        _impl.discard(*_connection, _cmd_num);
-
-        _reset();
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_sanity_check() const {
-    if (!_valid) {
-        throw Error("Not in valid state");
-    }
-
-    if (_connection->broken()) {
-        throw Error("Connection is broken");
-    }
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_reset() {
-    _cmd_num = 0;
-
-    _set_cmd_indexes.clear();
-
-    _georadius_cmd_indexes.clear();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_invalidate() {
-    _valid = false;
-
-    _reset();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_rewrite_replies(std::vector<ReplyUPtr> &replies) const {
-    _rewrite_replies(_set_cmd_indexes, reply::rewrite_set_reply, replies);
-
-    _rewrite_replies(_georadius_cmd_indexes, reply::rewrite_georadius_reply, replies);
-}
-
-template <typename Impl>
-template <typename Func>
-void QueuedRedis<Impl>::_rewrite_replies(const std::vector<std::size_t> &indexes,
-                                            Func rewriter,
-                                            std::vector<ReplyUPtr> &replies) const {
-    for (auto idx : indexes) {
-        assert(idx < replies.size());
-
-        auto &reply = replies[idx];
-
-        assert(reply);
-
-        rewriter(*reply);
-    }
-}
-
-inline std::size_t QueuedReplies::size() const {
-    return _replies.size();
-}
-
-inline redisReply& QueuedReplies::get(std::size_t idx) {
-    _index_check(idx);
-
-    auto &reply = _replies[idx];
-
-    assert(reply);
-
-    return *reply;
-}
-
-template <typename Result>
-inline Result QueuedReplies::get(std::size_t idx) {
-    auto &reply = get(idx);
-
-    return reply::parse<Result>(reply);
-}
-
-template <typename Output>
-inline void QueuedReplies::get(std::size_t idx, Output output) {
-    auto &reply = get(idx);
-
-    reply::to_array(reply, output);
-}
-
-inline void QueuedReplies::_index_check(std::size_t idx) const {
-    if (idx >= size()) {
-        throw Error("Out of range");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis++.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis++.h
deleted file mode 100644
index 0da0ebb16..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis++.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-#define SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-
-#include "redis.h"
-#include "redis_cluster.h"
-#include "queued_redis.h"
-#include "sentinel.h"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.cpp
deleted file mode 100644
index be96967fe..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.cpp
+++ /dev/null
@@ -1,882 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "redis.h"
-#include <hiredis/hiredis.h>
-#include "command.h"
-#include "errors.h"
-#include "queued_redis.h"
-
-namespace sw {
-
-namespace redis {
-
-Redis::Redis(const std::string &uri) : Redis(ConnectionOptions(uri)) {}
-
-Redis::Redis(const ConnectionSPtr &connection) : _connection(connection) {
-    assert(_connection);
-}
-
-Pipeline Redis::pipeline() {
-    return Pipeline(std::make_shared<Connection>(_pool.create()));
-}
-
-Transaction Redis::transaction(bool piped) {
-    return Transaction(std::make_shared<Connection>(_pool.create()), piped);
-}
-
-Subscriber Redis::subscriber() {
-    return Subscriber(_pool.create());
-}
-
-// CONNECTION commands.
-
-void Redis::auth(const StringView &password) {
-    auto reply = command(cmd::auth, password);
-
-    reply::parse<void>(*reply);
-}
-
-std::string Redis::echo(const StringView &msg) {
-    auto reply = command(cmd::echo, msg);
-
-    return reply::parse<std::string>(*reply);
-}
-
-std::string Redis::ping() {
-    auto reply = command<void (*)(Connection &)>(cmd::ping);
-
-    return reply::to_status(*reply);
-}
-
-std::string Redis::ping(const StringView &msg) {
-    auto reply = command<void (*)(Connection &, const StringView &)>(cmd::ping, msg);
-
-    return reply::parse<std::string>(*reply);
-}
-
-void Redis::swapdb(long long idx1, long long idx2) {
-    auto reply = command(cmd::swapdb, idx1, idx2);
-
-    reply::parse<void>(*reply);
-}
-
-// SERVER commands.
-
-void Redis::bgrewriteaof() {
-    auto reply = command(cmd::bgrewriteaof);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::bgsave() {
-    auto reply = command(cmd::bgsave);
-
-    reply::parse<void>(*reply);
-}
-
-long long Redis::dbsize() {
-    auto reply = command(cmd::dbsize);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::flushall(bool async) {
-    auto reply = command(cmd::flushall, async);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::flushdb(bool async) {
-    auto reply = command(cmd::flushdb, async);
-
-    reply::parse<void>(*reply);
-}
-
-std::string Redis::info() {
-    auto reply = command<void (*)(Connection &)>(cmd::info);
-
-    return reply::parse<std::string>(*reply);
-}
-
-std::string Redis::info(const StringView &section) {
-    auto reply = command<void (*)(Connection &, const StringView &)>(cmd::info, section);
-
-    return reply::parse<std::string>(*reply);
-}
-
-long long Redis::lastsave() {
-    auto reply = command(cmd::lastsave);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::save() {
-    auto reply = command(cmd::save);
-
-    reply::parse<void>(*reply);
-}
-
-// KEY commands.
-
-long long Redis::del(const StringView &key) {
-    auto reply = command(cmd::del, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString Redis::dump(const StringView &key) {
-    auto reply = command(cmd::dump, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::exists(const StringView &key) {
-    auto reply = command(cmd::exists, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool Redis::expire(const StringView &key, long long timeout) {
-    auto reply = command(cmd::expire, key, timeout);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::expireat(const StringView &key, long long timestamp) {
-    auto reply = command(cmd::expireat, key, timestamp);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::move(const StringView &key, long long db) {
-    auto reply = command(cmd::move, key, db);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::persist(const StringView &key) {
-    auto reply = command(cmd::persist, key);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::pexpire(const StringView &key, long long timeout) {
-    auto reply = command(cmd::pexpire, key, timeout);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::pexpireat(const StringView &key, long long timestamp) {
-    auto reply = command(cmd::pexpireat, key, timestamp);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long Redis::pttl(const StringView &key) {
-    auto reply = command(cmd::pttl, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString Redis::randomkey() {
-    auto reply = command(cmd::randomkey);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-void Redis::rename(const StringView &key, const StringView &newkey) {
-    auto reply = command(cmd::rename, key, newkey);
-
-    reply::parse<void>(*reply);
-}
-
-bool Redis::renamenx(const StringView &key, const StringView &newkey) {
-    auto reply = command(cmd::renamenx, key, newkey);
-
-    return reply::parse<bool>(*reply);
-}
-
-void Redis::restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace) {
-    auto reply = command(cmd::restore, key, val, ttl, replace);
-
-    reply::parse<void>(*reply);
-}
-
-long long Redis::touch(const StringView &key) {
-    auto reply = command(cmd::touch, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::ttl(const StringView &key) {
-    auto reply = command(cmd::ttl, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-std::string Redis::type(const StringView &key) {
-    auto reply = command(cmd::type, key);
-
-    return reply::parse<std::string>(*reply);
-}
-
-long long Redis::unlink(const StringView &key) {
-    auto reply = command(cmd::unlink, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::wait(long long numslaves, long long timeout) {
-    auto reply = command(cmd::wait, numslaves, timeout);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-long long Redis::append(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::append, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::bitcount(const StringView &key, long long start, long long end) {
-    auto reply = command(cmd::bitcount, key, start, end);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::bitop(BitOp op, const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::bitop, op, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::bitpos(const StringView &key,
-                            long long bit,
-                            long long start,
-                            long long end) {
-    auto reply = command(cmd::bitpos, key, bit, start, end);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::decr(const StringView &key) {
-    auto reply = command(cmd::decr, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::decrby(const StringView &key, long long decrement) {
-    auto reply = command(cmd::decrby, key, decrement);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString Redis::get(const StringView &key) {
-    auto reply = command(cmd::get, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::getbit(const StringView &key, long long offset) {
-    auto reply = command(cmd::getbit, key, offset);
-
-    return reply::parse<long long>(*reply);
-}
-
-std::string Redis::getrange(const StringView &key, long long start, long long end) {
-    auto reply = command(cmd::getrange, key, start, end);
-
-    return reply::parse<std::string>(*reply);
-}
-
-OptionalString Redis::getset(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::getset, key, val);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::incr(const StringView &key) {
-    auto reply = command(cmd::incr, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::incrby(const StringView &key, long long increment) {
-    auto reply = command(cmd::incrby, key, increment);
-
-    return reply::parse<long long>(*reply);
-}
-
-double Redis::incrbyfloat(const StringView &key, double increment) {
-    auto reply = command(cmd::incrbyfloat, key, increment);
-
-    return reply::parse<double>(*reply);
-}
-
-void Redis::psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-    auto reply = command(cmd::psetex, key, ttl, val);
-
-    reply::parse<void>(*reply);
-}
-
-bool Redis::set(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl,
-                    UpdateType type) {
-    auto reply = command(cmd::set, key, val, ttl.count(), type);
-
-    reply::rewrite_set_reply(*reply);
-
-    return reply::parse<bool>(*reply);
-}
-
-void Redis::setex(const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    auto reply = command(cmd::setex, key, ttl, val);
-
-    reply::parse<void>(*reply);
-}
-
-bool Redis::setnx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::setnx, key, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long Redis::setrange(const StringView &key, long long offset, const StringView &val) {
-    auto reply = command(cmd::setrange, key, offset, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::strlen(const StringView &key) {
-    auto reply = command(cmd::strlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// LIST commands.
-
-OptionalStringPair Redis::blpop(const StringView &key, long long timeout) {
-    auto reply = command(cmd::blpop, key, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-OptionalStringPair Redis::blpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return blpop(key, timeout.count());
-}
-
-OptionalStringPair Redis::brpop(const StringView &key, long long timeout) {
-    auto reply = command(cmd::brpop, key, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-OptionalStringPair Redis::brpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return brpop(key, timeout.count());
-}
-
-OptionalString Redis::brpoplpush(const StringView &source,
-                                    const StringView &destination,
-                                    long long timeout) {
-    auto reply = command(cmd::brpoplpush, source, destination, timeout);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString Redis::lindex(const StringView &key, long long index) {
-    auto reply = command(cmd::lindex, key, index);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-    auto reply = command(cmd::linsert, key, position, pivot, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::llen(const StringView &key) {
-    auto reply = command(cmd::llen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString Redis::lpop(const StringView &key) {
-    auto reply = command(cmd::lpop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::lpush(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::lpush, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::lpushx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::lpushx, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::lrem(const StringView &key, long long count, const StringView &val) {
-    auto reply = command(cmd::lrem, key, count, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::lset(const StringView &key, long long index, const StringView &val) {
-    auto reply = command(cmd::lset, key, index, val);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::ltrim(const StringView &key, long long start, long long stop) {
-    auto reply = command(cmd::ltrim, key, start, stop);
-
-    reply::parse<void>(*reply);
-}
-
-OptionalString Redis::rpop(const StringView &key) {
-    auto reply = command(cmd::rpop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString Redis::rpoplpush(const StringView &source, const StringView &destination) {
-    auto reply = command(cmd::rpoplpush, source, destination);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::rpush(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::rpush, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::rpushx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::rpushx, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::hdel(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hdel, key, field);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool Redis::hexists(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hexists, key, field);
-
-    return reply::parse<bool>(*reply);
-}
-
-OptionalString Redis::hget(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hget, key, field);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::hincrby(const StringView &key, const StringView &field, long long increment) {
-    auto reply = command(cmd::hincrby, key, field, increment);
-
-    return reply::parse<long long>(*reply);
-}
-
-double Redis::hincrbyfloat(const StringView &key, const StringView &field, double increment) {
-    auto reply = command(cmd::hincrbyfloat, key, field, increment);
-
-    return reply::parse<double>(*reply);
-}
-
-long long Redis::hlen(const StringView &key) {
-    auto reply = command(cmd::hlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool Redis::hset(const StringView &key, const StringView &field, const StringView &val) {
-    auto reply = command(cmd::hset, key, field, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-    return hset(key, item.first, item.second);
-}
-
-bool Redis::hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-    auto reply = command(cmd::hsetnx, key, field, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-    return hsetnx(key, item.first, item.second);
-}
-
-long long Redis::hstrlen(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hstrlen, key, field);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SET commands.
-
-long long Redis::sadd(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::sadd, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::scard(const StringView &key) {
-    auto reply = command(cmd::scard, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::sdiffstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sdiffstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::sinterstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sinterstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool Redis::sismember(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::sismember, key, member);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::smove(const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    auto reply = command(cmd::smove, source, destination, member);
-
-    return reply::parse<bool>(*reply);
-}
-
-OptionalString Redis::spop(const StringView &key) {
-    auto reply = command(cmd::spop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString Redis::srandmember(const StringView &key) {
-    auto reply = command(cmd::srandmember, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::srem(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::srem, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::sunionstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sunionstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-auto Redis::bzpopmax(const StringView &key, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax, key, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-auto Redis::bzpopmin(const StringView &key, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin, key, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-long long Redis::zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type,
-                        bool changed) {
-    auto reply = command(cmd::zadd, key, member, score, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::zcard(const StringView &key) {
-    auto reply = command(cmd::zcard, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-double Redis::zincrby(const StringView &key, double increment, const StringView &member) {
-    auto reply = command(cmd::zincrby, key, increment, member);
-
-    return reply::parse<double>(*reply);
-}
-
-long long Redis::zinterstore(const StringView &destination, const StringView &key, double weight) {
-    auto reply = command(cmd::zinterstore, destination, key, weight);
-
-    return reply::parse<long long>(*reply);
-}
-
-Optional<std::pair<std::string, double>> Redis::zpopmax(const StringView &key) {
-    auto reply = command(cmd::zpopmax, key, 1);
-
-    return reply::parse<Optional<std::pair<std::string, double>>>(*reply);
-}
-
-Optional<std::pair<std::string, double>> Redis::zpopmin(const StringView &key) {
-    auto reply = command(cmd::zpopmin, key, 1);
-
-    return reply::parse<Optional<std::pair<std::string, double>>>(*reply);
-}
-
-OptionalLongLong Redis::zrank(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrank, key, member);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-long long Redis::zrem(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrem, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::zremrangebyrank(const StringView &key, long long start, long long stop) {
-    auto reply = command(cmd::zremrangebyrank, key, start, stop);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalLongLong Redis::zrevrank(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrevrank, key, member);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-OptionalDouble Redis::zscore(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zscore, key, member);
-
-    return reply::parse<OptionalDouble>(*reply);
-}
-
-long long Redis::zunionstore(const StringView &destination, const StringView &key, double weight) {
-    auto reply = command(cmd::zunionstore, destination, key, weight);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-bool Redis::pfadd(const StringView &key, const StringView &element) {
-    auto reply = command(cmd::pfadd, key, element);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long Redis::pfcount(const StringView &key) {
-    auto reply = command(cmd::pfcount, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::pfmerge(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::pfmerge, destination, key);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-long long Redis::geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-    auto reply = command(cmd::geoadd, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalDouble Redis::geodist(const StringView &key,
-                                const StringView &member1,
-                                const StringView &member2,
-                                GeoUnit unit) {
-    auto reply = command(cmd::geodist, key, member1, member2, unit);
-
-    return reply::parse<OptionalDouble>(*reply);
-}
-
-OptionalLongLong Redis::georadius(const StringView &key,
-                                    const std::pair<double, double> &loc,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-    auto reply = command(cmd::georadius_store,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            destination,
-                            store_dist,
-                            count);
-
-    reply::rewrite_georadius_reply(*reply);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-OptionalLongLong Redis::georadiusbymember(const StringView &key,
-                                            const StringView &member,
-                                            double radius,
-                                            GeoUnit unit,
-                                            const StringView &destination,
-                                            bool store_dist,
-                                            long long count) {
-    auto reply = command(cmd::georadiusbymember_store,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            destination,
-                            store_dist,
-                            count);
-
-    reply::rewrite_georadius_reply(*reply);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-// SCRIPTING commands.
-
-void Redis::script_flush() {
-    auto reply = command(cmd::script_flush);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::script_kill() {
-    auto reply = command(cmd::script_kill);
-
-    reply::parse<void>(*reply);
-}
-
-std::string Redis::script_load(const StringView &script) {
-    auto reply = command(cmd::script_load, script);
-
-    return reply::parse<std::string>(*reply);
-}
-
-// PUBSUB commands.
-
-long long Redis::publish(const StringView &channel, const StringView &message) {
-    auto reply = command(cmd::publish, channel, message);
-
-    return reply::parse<long long>(*reply);
-}
-
-// Transaction commands.
-
-void Redis::watch(const StringView &key) {
-    auto reply = command(cmd::watch, key);
-
-    reply::parse<void>(*reply);
-}
-
-// Stream commands.
-
-long long Redis::xack(const StringView &key, const StringView &group, const StringView &id) {
-    auto reply = command(cmd::xack, key, group, id);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::xdel(const StringView &key, const StringView &id) {
-    auto reply = command(cmd::xdel, key, id);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::xgroup_create(const StringView &key,
-                            const StringView &group,
-                            const StringView &id,
-                            bool mkstream) {
-    auto reply = command(cmd::xgroup_create, key, group, id, mkstream);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::xgroup_setid(const StringView &key, const StringView &group, const StringView &id) {
-    auto reply = command(cmd::xgroup_setid, key, group, id);
-
-    reply::parse<void>(*reply);
-}
-
-long long Redis::xgroup_destroy(const StringView &key, const StringView &group) {
-    auto reply = command(cmd::xgroup_destroy, key, group);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::xgroup_delconsumer(const StringView &key,
-                                const StringView &group,
-                                const StringView &consumer) {
-    auto reply = command(cmd::xgroup_delconsumer, key, group, consumer);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::xlen(const StringView &key) {
-    auto reply = command(cmd::xlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::xtrim(const StringView &key, long long count, bool approx) {
-    auto reply = command(cmd::xtrim, key, count, approx);
-
-    return reply::parse<long long>(*reply);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.h
deleted file mode 100644
index b54afb96b..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.h
+++ /dev/null
@@ -1,1523 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_H
-
-#include <string>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <tuple>
-#include "connection_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class Redis {
-public:
-    Redis(const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) : _pool(pool_opts, connection_opts) {}
-
-    // Construct Redis instance with URI:
-    // "tcp://127.0.0.1", "tcp://127.0.0.1:6379", or "unix://path/to/socket"
-    explicit Redis(const std::string &uri);
-
-    Redis(const std::shared_ptr<Sentinel> &sentinel,
-            const std::string &master_name,
-            Role role,
-            const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(SimpleSentinel(sentinel, master_name, role), pool_opts, connection_opts) {}
-
-    Redis(const Redis &) = delete;
-    Redis& operator=(const Redis &) = delete;
-
-    Redis(Redis &&) = default;
-    Redis& operator=(Redis &&) = default;
-
-    Pipeline pipeline();
-
-    Transaction transaction(bool piped = false);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type;
-
-    template <typename Result, typename ...Args>
-    Result command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // CONNECTION commands.
-
-    void auth(const StringView &password);
-
-    std::string echo(const StringView &msg);
-
-    std::string ping();
-
-    std::string ping(const StringView &msg);
-
-    // After sending QUIT, only the current connection will be close, while
-    // other connections in the pool is still open. This is a strange behavior.
-    // So we DO NOT support the QUIT command. If you want to quit connection to
-    // server, just destroy the Redis object.
-    //
-    // void quit();
-
-    // We get a connection from the pool, and send the SELECT command to switch
-    // to a specified DB. However, when we try to send other commands to the
-    // given DB, we might get a different connection from the pool, and these
-    // commands, in fact, work on other DB. e.g.
-    //
-    // redis.select(1); // get a connection from the pool and switch to the 1th DB
-    // redis.get("key"); // might get another connection from the pool,
-    //                   // and try to get 'key' on the default DB
-    //
-    // Obviously, this is NOT what we expect. So we DO NOT support SELECT command.
-    // In order to select a DB, we can specify the DB index with the ConnectionOptions.
-    //
-    // However, since Pipeline and Transaction always send multiple commands on a
-    // single connection, these two classes have a *select* method.
-    //
-    // void select(long long idx);
-
-    void swapdb(long long idx1, long long idx2);
-
-    // SERVER commands.
-
-    void bgrewriteaof();
-
-    void bgsave();
-
-    long long dbsize();
-
-    void flushall(bool async = false);
-
-    void flushdb(bool async = false);
-
-    std::string info();
-
-    std::string info(const StringView &section);
-
-    long long lastsave();
-
-    void save();
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    template <typename Output>
-    void keys(const StringView &pattern, Output output);
-
-    bool move(const StringView &key, long long db);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    OptionalString randomkey();
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long scan(long long cursor,
-                    long long count,
-                    Output output);
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    long long wait(long long numslaves, long long timeout);
-
-    long long wait(long long numslaves, const std::chrono::milliseconds &timeout);
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    // There's no aggregation type parameter for single key overload, since these 3 types
-    // have the same effect.
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    // If *Input* is an iterator of a container of string,
-    // we use the default weight, i.e. 1, and send
-    // *ZINTERSTORE destination numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    // If *Input* is an iterator of a container of pair<string, double>, i.e. key-weight pair,
-    // we send the command with the given weights:
-    // *ZINTERSTORE destination numkeys key [key ...]
-    // [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*
-    //
-    // The following code use the default weight:
-    //
-    // vector<string> keys = {"k1", "k2", "k3"};
-    // redis.zinterstore(destination, keys.begin(), keys.end());
-    //
-    // On the other hand, the following code use the given weights:
-    //
-    // vector<pair<string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}, {"k3", 3}};
-    // redis.zinterstore(destination, keys_with_weights.begin(), keys_with_weights.end());
-    //
-    // NOTE: `keys_with_weights` can also be of type `unordered_map<string, double>`.
-    // However, it will be slower than vector<pair<string, double>>, since we use
-    // `distance(first, last)` to calculate the *numkeys* parameter.
-    //
-    // This also applies to *ZUNIONSTORE* command.
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    // There's no aggregation type parameter for single key overload, since these 3 types
-    // have the same effect.
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    // See *zinterstore* comment for how to use this method.
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void script_exists(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void script_exists(std::initializer_list<T> il, Output output) {
-        script_exists(il.begin(), il.end(), output);
-    }
-
-    void script_flush();
-
-    void script_kill();
-
-    std::string script_load(const StringView &script);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Transaction commands.
-    void watch(const StringView &key);
-
-    template <typename Input>
-    void watch(Input first, Input last);
-
-    template <typename T>
-    void watch(std::initializer_list<T> il) {
-        watch(il.begin(), il.end());
-    }
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first ,last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class ConnectionPoolGuard {
-    public:
-        ConnectionPoolGuard(ConnectionPool &pool,
-                            Connection &connection) : _pool(pool), _connection(connection) {}
-
-        ~ConnectionPoolGuard() {
-            _pool.release(std::move(_connection));
-        }
-
-    private:
-        ConnectionPool &_pool;
-        Connection &_connection;
-    };
-
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    friend class RedisCluster;
-
-    // For internal use.
-    explicit Redis(const ConnectionSPtr &connection);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Connection &connection, Cmd cmd, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    // Pool Mode.
-    // Public constructors create a *Redis* instance with a pool.
-    // In this case, *_connection* is a null pointer, and is never used.
-    ConnectionPool _pool;
-
-    // Single Connection Mode.
-    // Private constructor creats a *Redis* instance with a single connection.
-    // This is used when we create Transaction, Pipeline and Subscriber.
-    // In this case, *_pool* is empty, and is never used.
-    ConnectionSPtr _connection;
-};
-
-}
-
-}
-
-#include "redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.hpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.hpp
deleted file mode 100644
index 3a227a6f1..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis.hpp
+++ /dev/null
@@ -1,1365 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_HPP
-
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename ...Args>
-auto Redis::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    if (_connection) {
-        // Single Connection Mode.
-        // TODO: In this case, should we reconnect?
-        if (_connection->broken()) {
-            throw Error("Connection is broken");
-        }
-
-        return _command(*_connection, cmd, std::forward<Args>(args)...);
-    } else {
-        // Pool Mode, i.e. get connection from pool.
-        auto connection = _pool.fetch();
-
-        assert(!connection.broken());
-
-        ConnectionPoolGuard guard(_pool, connection);
-
-        return _command(connection, cmd, std::forward<Args>(args)...);
-    }
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename ...Args>
-Result Redis::command(const StringView &cmd_name, Args &&...args) {
-    auto r = command(cmd_name, std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args) - 1>(),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Result, typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto Redis::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long Redis::del(Input first, Input last) {
-    if (first == last) {
-        throw Error("DEL: no key specified");
-    }
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::exists(Input first, Input last) {
-    if (first == last) {
-        throw Error("EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool Redis::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool Redis::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-template <typename Output>
-void Redis::keys(const StringView &pattern, Output output) {
-    auto reply = command(cmd::keys, pattern);
-
-    reply::to_array(*reply, output);
-}
-
-inline bool Redis::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool Redis::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void Redis::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Output>
-long long Redis::scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::scan, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return scan(cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                long long count,
-                                Output output) {
-    return scan(cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                Output output) {
-    return scan(cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::touch(Input first, Input last) {
-    if (first == last) {
-        throw Error("TOUCH: no key specified");
-    }
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::unlink(Input first, Input last) {
-    if (first == last) {
-        throw Error("UNLINK: no key specified");
-    }
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline long long Redis::wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-    return wait(numslaves, timeout.count());
-}
-
-// STRING commands.
-
-template <typename Input>
-long long Redis::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("BITOP: no key specified");
-    }
-
-    auto reply = command(cmd::bitop_range<Input>, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::mget(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("MGET: no key specified");
-    }
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void Redis::mset(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSET: no key specified");
-    }
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool Redis::msetnx(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSETNX: no key specified");
-    }
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void Redis::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void Redis::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BLPOP: no key specified");
-    }
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BRPOP: no key specified");
-    }
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString Redis::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long Redis::lpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("LPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long Redis::rpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("RPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long Redis::hdel(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HDEL: no key specified");
-    }
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void Redis::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void Redis::hmget(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("HMGET: no key specified");
-    }
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void Redis::hmset(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HMSET: no key specified");
-    }
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long Redis::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Output>
-inline void Redis::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long Redis::sadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SADD: no key specified");
-    }
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sdiff(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SDIFF: no key specified");
-    }
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    if (first == last) {
-        throw Error("SDIFFSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sinter(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SINTER: no key specified");
-    }
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sinterstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    if (first == last) {
-        throw Error("SINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::srem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SREM: no key specified");
-    }
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long Redis::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void Redis::sunion(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SUNION: no key specified");
-    }
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sunionstore(const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto Redis::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto Redis::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long Redis::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    if (first == last) {
-        throw Error("ZADD: no key specified");
-    }
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    if (first == last) {
-        throw Error("ZINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::zrem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("ZREM: no key specified");
-    }
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void Redis::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long Redis::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    if (first == last) {
-        throw Error("ZUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool Redis::pfadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("PFADD: no key specified");
-    }
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long Redis::pfcount(Input first, Input last) {
-    if (first == last) {
-        throw Error("PFCOUNT: no key specified");
-    }
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void Redis::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    if (first == last) {
-        throw Error("PFMERGE: no key specified");
-    }
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long Redis::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    if (first == last) {
-        throw Error("GEOADD: no key specified");
-    }
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::geohash(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOHASH: no key specified");
-    }
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::geopos(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOPOS: no key specified");
-    }
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result>
-Result Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    auto reply = command(cmd::eval, script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output) {
-    auto reply = command(cmd::eval, script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Result>
-Result Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-    auto reply = command(cmd::evalsha, script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    auto reply = command(cmd::evalsha, script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::script_exists(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SCRIPT EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::script_exists_range<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-// Transaction commands.
-
-template <typename Input>
-void Redis::watch(Input first, Input last) {
-    auto reply = command(cmd::watch_range<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long Redis::xack(const StringView &key, const StringView &group, Input first, Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key, const StringView &id, Input first, Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    const StringView &id,
-                    Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    Input first,
-                    Input last,
-                    Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto Redis::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        const StringView &consumer,
-                        Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup_block,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = command(cmd::xreadgroup_block_range<Input>,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr Redis::_command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    auto reply = connection.recv();
-
-    return reply;
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.cpp
deleted file mode 100644
index 6950f5730..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.cpp
+++ /dev/null
@@ -1,769 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "redis_cluster.h"
-#include <hiredis/hiredis.h>
-#include "command.h"
-#include "errors.h"
-#include "queued_redis.h"
-
-namespace sw {
-
-namespace redis {
-
-RedisCluster::RedisCluster(const std::string &uri) : RedisCluster(ConnectionOptions(uri)) {}
-
-Redis RedisCluster::redis(const StringView &hash_tag) {
-    auto opts = _pool.connection_options(hash_tag);
-    return Redis(std::make_shared<Connection>(opts));
-}
-
-Pipeline RedisCluster::pipeline(const StringView &hash_tag) {
-    auto opts = _pool.connection_options(hash_tag);
-    return Pipeline(std::make_shared<Connection>(opts));
-}
-
-Transaction RedisCluster::transaction(const StringView &hash_tag, bool piped) {
-    auto opts = _pool.connection_options(hash_tag);
-    return Transaction(std::make_shared<Connection>(opts), piped);
-}
-
-Subscriber RedisCluster::subscriber() {
-    auto opts = _pool.connection_options();
-    return Subscriber(Connection(opts));
-}
-
-// KEY commands.
-
-long long RedisCluster::del(const StringView &key) {
-    auto reply = command(cmd::del, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString RedisCluster::dump(const StringView &key) {
-    auto reply = command(cmd::dump, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::exists(const StringView &key) {
-    auto reply = command(cmd::exists, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool RedisCluster::expire(const StringView &key, long long timeout) {
-    auto reply = command(cmd::expire, key, timeout);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::expireat(const StringView &key, long long timestamp) {
-    auto reply = command(cmd::expireat, key, timestamp);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::persist(const StringView &key) {
-    auto reply = command(cmd::persist, key);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::pexpire(const StringView &key, long long timeout) {
-    auto reply = command(cmd::pexpire, key, timeout);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::pexpireat(const StringView &key, long long timestamp) {
-    auto reply = command(cmd::pexpireat, key, timestamp);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long RedisCluster::pttl(const StringView &key) {
-    auto reply = command(cmd::pttl, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::rename(const StringView &key, const StringView &newkey) {
-    auto reply = command(cmd::rename, key, newkey);
-
-    reply::parse<void>(*reply);
-}
-
-bool RedisCluster::renamenx(const StringView &key, const StringView &newkey) {
-    auto reply = command(cmd::renamenx, key, newkey);
-
-    return reply::parse<bool>(*reply);
-}
-
-void RedisCluster::restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace) {
-    auto reply = command(cmd::restore, key, val, ttl, replace);
-
-    reply::parse<void>(*reply);
-}
-
-long long RedisCluster::touch(const StringView &key) {
-    auto reply = command(cmd::touch, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::ttl(const StringView &key) {
-    auto reply = command(cmd::ttl, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-std::string RedisCluster::type(const StringView &key) {
-    auto reply = command(cmd::type, key);
-
-    return reply::parse<std::string>(*reply);
-}
-
-long long RedisCluster::unlink(const StringView &key) {
-    auto reply = command(cmd::unlink, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-long long RedisCluster::append(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::append, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::bitcount(const StringView &key, long long start, long long end) {
-    auto reply = command(cmd::bitcount, key, start, end);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::bitop(BitOp op, const StringView &destination, const StringView &key) {
-    auto reply = _command(cmd::bitop, destination, op, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::bitpos(const StringView &key,
-                            long long bit,
-                            long long start,
-                            long long end) {
-    auto reply = command(cmd::bitpos, key, bit, start, end);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::decr(const StringView &key) {
-    auto reply = command(cmd::decr, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::decrby(const StringView &key, long long decrement) {
-    auto reply = command(cmd::decrby, key, decrement);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString RedisCluster::get(const StringView &key) {
-    auto reply = command(cmd::get, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::getbit(const StringView &key, long long offset) {
-    auto reply = command(cmd::getbit, key, offset);
-
-    return reply::parse<long long>(*reply);
-}
-
-std::string RedisCluster::getrange(const StringView &key, long long start, long long end) {
-    auto reply = command(cmd::getrange, key, start, end);
-
-    return reply::parse<std::string>(*reply);
-}
-
-OptionalString RedisCluster::getset(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::getset, key, val);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::incr(const StringView &key) {
-    auto reply = command(cmd::incr, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::incrby(const StringView &key, long long increment) {
-    auto reply = command(cmd::incrby, key, increment);
-
-    return reply::parse<long long>(*reply);
-}
-
-double RedisCluster::incrbyfloat(const StringView &key, double increment) {
-    auto reply = command(cmd::incrbyfloat, key, increment);
-
-    return reply::parse<double>(*reply);
-}
-
-void RedisCluster::psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-    auto reply = command(cmd::psetex, key, ttl, val);
-
-    reply::parse<void>(*reply);
-}
-
-bool RedisCluster::set(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl,
-                    UpdateType type) {
-    auto reply = command(cmd::set, key, val, ttl.count(), type);
-
-    reply::rewrite_set_reply(*reply);
-
-    return reply::parse<bool>(*reply);
-}
-
-void RedisCluster::setex(const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    auto reply = command(cmd::setex, key, ttl, val);
-
-    reply::parse<void>(*reply);
-}
-
-bool RedisCluster::setnx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::setnx, key, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long RedisCluster::setrange(const StringView &key, long long offset, const StringView &val) {
-    auto reply = command(cmd::setrange, key, offset, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::strlen(const StringView &key) {
-    auto reply = command(cmd::strlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// LIST commands.
-
-OptionalStringPair RedisCluster::blpop(const StringView &key, long long timeout) {
-    auto reply = command(cmd::blpop, key, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-OptionalStringPair RedisCluster::blpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return blpop(key, timeout.count());
-}
-
-OptionalStringPair RedisCluster::brpop(const StringView &key, long long timeout) {
-    auto reply = command(cmd::brpop, key, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-OptionalStringPair RedisCluster::brpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return brpop(key, timeout.count());
-}
-
-OptionalString RedisCluster::brpoplpush(const StringView &source,
-                                    const StringView &destination,
-                                    long long timeout) {
-    auto reply = command(cmd::brpoplpush, source, destination, timeout);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString RedisCluster::lindex(const StringView &key, long long index) {
-    auto reply = command(cmd::lindex, key, index);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-    auto reply = command(cmd::linsert, key, position, pivot, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::llen(const StringView &key) {
-    auto reply = command(cmd::llen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString RedisCluster::lpop(const StringView &key) {
-    auto reply = command(cmd::lpop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::lpush(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::lpush, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::lpushx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::lpushx, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::lrem(const StringView &key, long long count, const StringView &val) {
-    auto reply = command(cmd::lrem, key, count, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::lset(const StringView &key, long long index, const StringView &val) {
-    auto reply = command(cmd::lset, key, index, val);
-
-    reply::parse<void>(*reply);
-}
-
-void RedisCluster::ltrim(const StringView &key, long long start, long long stop) {
-    auto reply = command(cmd::ltrim, key, start, stop);
-
-    reply::parse<void>(*reply);
-}
-
-OptionalString RedisCluster::rpop(const StringView &key) {
-    auto reply = command(cmd::rpop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString RedisCluster::rpoplpush(const StringView &source, const StringView &destination) {
-    auto reply = command(cmd::rpoplpush, source, destination);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::rpush(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::rpush, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::rpushx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::rpushx, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::hdel(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hdel, key, field);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool RedisCluster::hexists(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hexists, key, field);
-
-    return reply::parse<bool>(*reply);
-}
-
-OptionalString RedisCluster::hget(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hget, key, field);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::hincrby(const StringView &key, const StringView &field, long long increment) {
-    auto reply = command(cmd::hincrby, key, field, increment);
-
-    return reply::parse<long long>(*reply);
-}
-
-double RedisCluster::hincrbyfloat(const StringView &key, const StringView &field, double increment) {
-    auto reply = command(cmd::hincrbyfloat, key, field, increment);
-
-    return reply::parse<double>(*reply);
-}
-
-long long RedisCluster::hlen(const StringView &key) {
-    auto reply = command(cmd::hlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool RedisCluster::hset(const StringView &key, const StringView &field, const StringView &val) {
-    auto reply = command(cmd::hset, key, field, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-    return hset(key, item.first, item.second);
-}
-
-bool RedisCluster::hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-    auto reply = command(cmd::hsetnx, key, field, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-    return hsetnx(key, item.first, item.second);
-}
-
-long long RedisCluster::hstrlen(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hstrlen, key, field);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SET commands.
-
-long long RedisCluster::sadd(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::sadd, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::scard(const StringView &key) {
-    auto reply = command(cmd::scard, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::sdiffstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sdiffstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::sinterstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sinterstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool RedisCluster::sismember(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::sismember, key, member);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::smove(const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    auto reply = command(cmd::smove, source, destination, member);
-
-    return reply::parse<bool>(*reply);
-}
-
-OptionalString RedisCluster::spop(const StringView &key) {
-    auto reply = command(cmd::spop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString RedisCluster::srandmember(const StringView &key) {
-    auto reply = command(cmd::srandmember, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::srem(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::srem, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::sunionstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sunionstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-auto RedisCluster::bzpopmax(const StringView &key, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax, key, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-auto RedisCluster::bzpopmin(const StringView &key, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin, key, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-long long RedisCluster::zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type,
-                        bool changed) {
-    auto reply = command(cmd::zadd, key, member, score, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::zcard(const StringView &key) {
-    auto reply = command(cmd::zcard, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-double RedisCluster::zincrby(const StringView &key, double increment, const StringView &member) {
-    auto reply = command(cmd::zincrby, key, increment, member);
-
-    return reply::parse<double>(*reply);
-}
-
-long long RedisCluster::zinterstore(const StringView &destination,
-                                    const StringView &key,
-                                    double weight) {
-    auto reply = command(cmd::zinterstore, destination, key, weight);
-
-    return reply::parse<long long>(*reply);
-}
-
-Optional<std::pair<std::string, double>> RedisCluster::zpopmax(const StringView &key) {
-    auto reply = command(cmd::zpopmax, key, 1);
-
-    return reply::parse<Optional<std::pair<std::string, double>>>(*reply);
-}
-
-Optional<std::pair<std::string, double>> RedisCluster::zpopmin(const StringView &key) {
-    auto reply = command(cmd::zpopmin, key, 1);
-
-    return reply::parse<Optional<std::pair<std::string, double>>>(*reply);
-}
-
-OptionalLongLong RedisCluster::zrank(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrank, key, member);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-long long RedisCluster::zrem(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrem, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::zremrangebyrank(const StringView &key, long long start, long long stop) {
-    auto reply = command(cmd::zremrangebyrank, key, start, stop);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalLongLong RedisCluster::zrevrank(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrevrank, key, member);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-OptionalDouble RedisCluster::zscore(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zscore, key, member);
-
-    return reply::parse<OptionalDouble>(*reply);
-}
-
-long long RedisCluster::zunionstore(const StringView &destination,
-                                    const StringView &key,
-                                    double weight) {
-    auto reply = command(cmd::zunionstore, destination, key, weight);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-bool RedisCluster::pfadd(const StringView &key, const StringView &element) {
-    auto reply = command(cmd::pfadd, key, element);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long RedisCluster::pfcount(const StringView &key) {
-    auto reply = command(cmd::pfcount, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::pfmerge(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::pfmerge, destination, key);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-long long RedisCluster::geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-    auto reply = command(cmd::geoadd, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalDouble RedisCluster::geodist(const StringView &key,
-                                const StringView &member1,
-                                const StringView &member2,
-                                GeoUnit unit) {
-    auto reply = command(cmd::geodist, key, member1, member2, unit);
-
-    return reply::parse<OptionalDouble>(*reply);
-}
-
-OptionalLongLong RedisCluster::georadius(const StringView &key,
-                                    const std::pair<double, double> &loc,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-    auto reply = command(cmd::georadius_store,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            destination,
-                            store_dist,
-                            count);
-
-    reply::rewrite_georadius_reply(*reply);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-OptionalLongLong RedisCluster::georadiusbymember(const StringView &key,
-                                            const StringView &member,
-                                            double radius,
-                                            GeoUnit unit,
-                                            const StringView &destination,
-                                            bool store_dist,
-                                            long long count) {
-    auto reply = command(cmd::georadiusbymember_store,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            destination,
-                            store_dist,
-                            count);
-
-    reply::rewrite_georadius_reply(*reply);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-// PUBSUB commands.
-
-long long RedisCluster::publish(const StringView &channel, const StringView &message) {
-    auto reply = command(cmd::publish, channel, message);
-
-    return reply::parse<long long>(*reply);
-}
-
-// Stream commands.
-
-long long RedisCluster::xack(const StringView &key, const StringView &group, const StringView &id) {
-    auto reply = command(cmd::xack, key, group, id);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::xdel(const StringView &key, const StringView &id) {
-    auto reply = command(cmd::xdel, key, id);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::xgroup_create(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &id,
-                                    bool mkstream) {
-    auto reply = command(cmd::xgroup_create, key, group, id, mkstream);
-
-    reply::parse<void>(*reply);
-}
-
-void RedisCluster::xgroup_setid(const StringView &key,
-                                const StringView &group,
-                                const StringView &id) {
-    auto reply = command(cmd::xgroup_setid, key, group, id);
-
-    reply::parse<void>(*reply);
-}
-
-long long RedisCluster::xgroup_destroy(const StringView &key, const StringView &group) {
-    auto reply = command(cmd::xgroup_destroy, key, group);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::xgroup_delconsumer(const StringView &key,
-                                            const StringView &group,
-                                            const StringView &consumer) {
-    auto reply = command(cmd::xgroup_delconsumer, key, group, consumer);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::xlen(const StringView &key) {
-    auto reply = command(cmd::xlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::xtrim(const StringView &key, long long count, bool approx) {
-    auto reply = command(cmd::xtrim, key, count, approx);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::_asking(Connection &connection) {
-    // Send ASKING command.
-    connection.send("ASKING");
-
-    auto reply = connection.recv();
-
-    assert(reply);
-
-    reply::parse<void>(*reply);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.h
deleted file mode 100644
index 50a221367..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.h
+++ /dev/null
@@ -1,1395 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-
-#include <string>
-#include <chrono>
-#include <initializer_list>
-#include <tuple>
-#include "shards_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "redis.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class RedisCluster {
-public:
-    RedisCluster(const ConnectionOptions &connection_opts,
-                    const ConnectionPoolOptions &pool_opts = {}) :
-                        _pool(pool_opts, connection_opts) {}
-
-    // Construct RedisCluster with URI:
-    // "tcp://127.0.0.1" or "tcp://127.0.0.1:6379"
-    // Only need to specify one URI.
-    explicit RedisCluster(const std::string &uri);
-
-    RedisCluster(const RedisCluster &) = delete;
-    RedisCluster& operator=(const RedisCluster &) = delete;
-
-    RedisCluster(RedisCluster &&) = default;
-    RedisCluster& operator=(RedisCluster &&) = default;
-
-    Redis redis(const StringView &hash_tag);
-
-    Pipeline pipeline(const StringView &hash_tag);
-
-    Transaction transaction(const StringView &hash_tag, bool piped = false);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && IsIter<typename LastType<Key, Args...>::type>::value, void>::type;
-
-    template <typename Result, typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type;
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class Command {
-    public:
-        explicit Command(const StringView &cmd_name) : _cmd_name(cmd_name) {}
-
-        template <typename ...Args>
-        void operator()(Connection &connection, Args &&...args) const {
-            CmdArgs cmd_args;
-            cmd_args.append(_cmd_name, std::forward<Args>(args)...);
-            connection.send(cmd_args);
-        }
-
-    private:
-        StringView _cmd_name;
-    };
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, Connection &connection, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::true_type, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::false_type, Input &&first, Args &&...args);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::true_type, Input input, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::false_type, Input input, Args &&...args);
-
-    void _asking(Connection &connection);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    ShardsPool _pool;
-};
-
-}
-
-}
-
-#include "redis_cluster.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.hpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.hpp
deleted file mode 100644
index 61da3f062..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/redis_cluster.hpp
+++ /dev/null
@@ -1,1415 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-
-#include <utility>
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-#include "shards_pool.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    return _command(cmd,
-                    std::is_convertible<typename std::decay<Key>::type, StringView>(),
-                    std::forward<Key>(key),
-                    std::forward<Args>(args)...);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-        || std::is_arithmetic<typename std::decay<Key>::type>::value)
-        && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = Command(cmd_name);
-
-    return _generic_command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Result, typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type {
-    auto r = command(cmd_name, std::forward<Key>(key), std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value)
-            && IsIter<typename LastType<Key, Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args)>(),
-                        std::forward<Key>(key),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last || std::next(first) == last) {
-        throw Error("command: invalid range");
-    }
-
-    const auto &key = *first;
-    ++first;
-
-    auto cmd = [&key](Connection &connection, Input first, Input last) {
-                        CmdArgs cmd_args;
-                        cmd_args.append(key);
-                        while (first != last) {
-                            cmd_args.append(*first);
-                            ++first;
-                        }
-                        connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long RedisCluster::del(Input first, Input last) {
-    if (first == last) {
-        throw Error("DEL: no key specified");
-    }
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::exists(Input first, Input last) {
-    if (first == last) {
-        throw Error("EXISTS: no key specified");
-    }
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool RedisCluster::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool RedisCluster::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-inline bool RedisCluster::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool RedisCluster::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void RedisCluster::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Input>
-long long RedisCluster::touch(Input first, Input last) {
-    if (first == last) {
-        throw Error("TOUCH: no key specified");
-    }
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::unlink(Input first, Input last) {
-    if (first == last) {
-        throw Error("UNLINK: no key specified");
-    }
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-template <typename Input>
-long long RedisCluster::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("BITOP: no key specified");
-    }
-
-    auto reply = _command(cmd::bitop_range<Input>, destination, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::mget(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("MGET: no key specified");
-    }
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void RedisCluster::mset(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSET: no key specified");
-    }
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool RedisCluster::msetnx(Input first, Input last) {
-    if (first == last) {
-        throw Error("MSETNX: no key specified");
-    }
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void RedisCluster::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void RedisCluster::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BLPOP: no key specified");
-    }
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first, Input last, long long timeout) {
-    if (first == last) {
-        throw Error("BRPOP: no key specified");
-    }
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString RedisCluster::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long RedisCluster::lpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("LPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long RedisCluster::rpush(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("RPUSH: no key specified");
-    }
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long RedisCluster::hdel(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HDEL: no key specified");
-    }
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void RedisCluster::hmget(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("HMGET: no key specified");
-    }
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void RedisCluster::hmset(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("HMSET: no key specified");
-    }
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long RedisCluster::sadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SADD: no key specified");
-    }
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sdiff(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SDIFF: no key specified");
-    }
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sdiffstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    if (first == last) {
-        throw Error("SDIFFSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sinter(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SINTER: no key specified");
-    }
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sinterstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    if (first == last) {
-        throw Error("SINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::srem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("SREM: no key specified");
-    }
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sunion(Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("SUNION: no key specified");
-    }
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sunionstore(const StringView &destination, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto RedisCluster::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmax(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto RedisCluster::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmin(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long RedisCluster::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    if (first == last) {
-        throw Error("ZADD: no key specified");
-    }
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    if (first == last) {
-        throw Error("ZINTERSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::zrem(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("ZREM: no key specified");
-    }
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void RedisCluster::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long RedisCluster::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long RedisCluster::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    if (first == last) {
-        throw Error("ZUNIONSTORE: no key specified");
-    }
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool RedisCluster::pfadd(const StringView &key, Input first, Input last) {
-    if (first == last) {
-        throw Error("PFADD: no key specified");
-    }
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::pfcount(Input first, Input last) {
-    if (first == last) {
-        throw Error("PFCOUNT: no key specified");
-    }
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void RedisCluster::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    if (first == last) {
-        throw Error("PFMERGE: no key specified");
-    }
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long RedisCluster::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    if (first == last) {
-        throw Error("GEOADD: no key specified");
-    }
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geohash(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOHASH: no key specified");
-    }
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geopos(const StringView &key, Input first, Input last, Output output) {
-    if (first == last) {
-        throw Error("GEOPOS: no key specified");
-    }
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result>
-Result RedisCluster::eval(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval, *keys.begin(), script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval, *keys.begin(), script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Result>
-Result RedisCluster::evalsha(const StringView &script,
-                                std::initializer_list<StringView> keys,
-                                std::initializer_list<StringView> args) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha, *keys.begin(), script, keys, args);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args,
-                            Output output) {
-    if (keys.size() == 0) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = command(cmd::evalsha, *keys.begin(), script, keys, args);
-
-    reply::to_array(*reply, output);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long RedisCluster::xack(const StringView &key,
-                                const StringView &group,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            const StringView &id,
-                            Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            Input first,
-                            Input last,
-                            Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto RedisCluster::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer,
-                            Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first,
-                            Input last,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREAD: no key specified");
-    }
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup, key, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = _command(cmd::xreadgroup_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup_block,
-                            key,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    if (first == last) {
-        throw Error("XREADGROUP: no key specified");
-    }
-
-    auto reply = _command(cmd::xreadgroup_block_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                                const StringView &end,
-                                const StringView &start,
-                                long long count,
-                                Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                ReplyUPtr>::type {
-    return command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                ReplyUPtr>::type {
-    auto k = std::to_string(std::forward<Key>(key));
-    return command(cmd, k, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::true_type, const StringView &key, Args &&...args) {
-    return _command(cmd, key, key, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::false_type, Input &&first, Args &&...args) {
-    return _range_command(cmd,
-                            std::is_convertible<
-                                typename std::decay<
-                                    decltype(*std::declval<Input>())>::type, StringView>(),
-                            std::forward<Input>(first),
-                            std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::true_type, Input input, Args &&...args) {
-    return _command(cmd, *input, input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::false_type, Input input, Args &&...args) {
-    return _command(cmd, std::get<0>(*input), input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, Connection &connection, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    return connection.recv();
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, const StringView &key, Args &&...args) {
-    for (auto idx = 0; idx < 2; ++idx) {
-        try {
-            auto guarded_connection = _pool.fetch(key);
-
-            return _command(cmd, guarded_connection.connection(), std::forward<Args>(args)...);
-        } catch (const IoError &err) {
-            // When master is down, one of its replicas will be promoted to be the new master.
-            // If we try to send command to the old master, we'll get an *IoError*.
-            // In this case, we need to update the slots mapping.
-            _pool.update();
-        } catch (const ClosedError &err) {
-            // Node might be removed.
-            // 1. Get up-to-date slot mapping to check if the node still exists.
-            _pool.update();
-
-            // TODO:
-            // 2. If it's NOT exist, update slot mapping, and retry.
-            // 3. If it's still exist, that means the node is down, NOT removed, throw exception.
-        } catch (const MovedError &err) {
-            // Slot mapping has been changed, update it and try again.
-            _pool.update();
-        } catch (const AskError &err) {
-            auto guarded_connection = _pool.fetch(err.node());
-            auto &connection = guarded_connection.connection();
-
-            // 1. send ASKING command.
-            _asking(connection);
-
-            // 2. resend last command.
-            try {
-                return _command(cmd, connection, std::forward<Args>(args)...);
-            } catch (const MovedError &err) {
-                throw Error("Slot migrating... ASKING node hasn't been set to IMPORTING state");
-            }
-        } // For other exceptions, just throw it.
-    }
-
-    // Possible failures:
-    // 1. Source node has already run 'CLUSTER SETSLOT xxx NODE xxx',
-    //    while the destination node has NOT run it.
-    //    In this case, client will be redirected by both nodes with MovedError.
-    // 2. Other failures...
-    throw Error("Failed to send command with key: " + std::string(key.data(), key.size()));
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/reply.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/reply.cpp
deleted file mode 100644
index dc70d30cc..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/reply.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "reply.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace reply {
-
-std::string to_status(redisReply &reply) {
-    if (!reply::is_status(reply)) {
-        throw ProtoError("Expect STATUS reply");
-    }
-
-    if (reply.str == nullptr) {
-        throw ProtoError("A null status reply");
-    }
-
-    // Old version hiredis' *redisReply::len* is of type int.
-    // So we CANNOT have something like: *return {reply.str, reply.len}*.
-    return std::string(reply.str, reply.len);
-}
-
-std::string parse(ParseTag<std::string>, redisReply &reply) {
-    if (!reply::is_string(reply) && !reply::is_status(reply)) {
-        throw ProtoError("Expect STRING reply");
-    }
-
-    if (reply.str == nullptr) {
-        throw ProtoError("A null string reply");
-    }
-
-    // Old version hiredis' *redisReply::len* is of type int.
-    // So we CANNOT have something like: *return {reply.str, reply.len}*.
-    return std::string(reply.str, reply.len);
-}
-
-long long parse(ParseTag<long long>, redisReply &reply) {
-    if (!reply::is_integer(reply)) {
-        throw ProtoError("Expect INTEGER reply");
-    }
-
-    return reply.integer;
-}
-
-double parse(ParseTag<double>, redisReply &reply) {
-    return std::stod(parse<std::string>(reply));
-}
-
-bool parse(ParseTag<bool>, redisReply &reply) {
-    auto ret = parse<long long>(reply);
-
-    if (ret == 1) {
-        return true;
-    } else if (ret == 0) {
-        return false;
-    } else {
-        throw ProtoError("Invalid bool reply: " + std::to_string(ret));
-    }
-}
-
-void parse(ParseTag<void>, redisReply &reply) {
-    if (!reply::is_status(reply)) {
-        throw ProtoError("Expect STATUS reply");
-    }
-
-    if (reply.str == nullptr) {
-        throw ProtoError("A null status reply");
-    }
-
-    static const std::string OK = "OK";
-
-    // Old version hiredis' *redisReply::len* is of type int.
-    // So we have to cast it to an unsigned int.
-    if (static_cast<std::size_t>(reply.len) != OK.size()
-            || OK.compare(0, OK.size(), reply.str, reply.len) != 0) {
-        throw ProtoError("NOT ok status reply: " + reply::to_status(reply));
-    }
-}
-
-void rewrite_set_reply(redisReply &reply) {
-    if (is_nil(reply)) {
-        // Failed to set, and make it a FALSE reply.
-        reply.type = REDIS_REPLY_INTEGER;
-        reply.integer = 0;
-
-        return;
-    }
-
-    // Check if it's a "OK" status reply.
-    reply::parse<void>(reply);
-
-    assert(is_status(reply) && reply.str != nullptr);
-
-    free(reply.str);
-
-    // Make it a TRUE reply.
-    reply.type = REDIS_REPLY_INTEGER;
-    reply.integer = 1;
-}
-
-void rewrite_georadius_reply(redisReply &reply) {
-    if (is_array(reply) && reply.element == nullptr) {
-        // Make it a nil reply.
-        reply.type = REDIS_REPLY_NIL;
-    }
-}
-
-namespace detail {
-
-bool is_flat_array(redisReply &reply) {
-    assert(reply::is_array(reply));
-
-    // Empty array reply.
-    if (reply.element == nullptr || reply.elements == 0) {
-        return false;
-    }
-
-    auto *sub_reply = reply.element[0];
-
-    // Null element.
-    if (sub_reply == nullptr) {
-        return false;
-    }
-
-    return !reply::is_array(*sub_reply);
-}
-
-}
-
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/reply.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/reply.h
deleted file mode 100644
index b309de5bb..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/reply.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REPLY_H
-#define SEWENEW_REDISPLUSPLUS_REPLY_H
-
-#include <cassert>
-#include <string>
-#include <memory>
-#include <functional>
-#include <tuple>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ReplyDeleter {
-    void operator()(redisReply *reply) const {
-        if (reply != nullptr) {
-            freeReplyObject(reply);
-        }
-    }
-};
-
-using ReplyUPtr = std::unique_ptr<redisReply, ReplyDeleter>;
-
-namespace reply {
-
-template <typename T>
-struct ParseTag {};
-
-template <typename T>
-inline T parse(redisReply &reply) {
-    return parse(ParseTag<T>(), reply);
-}
-
-void parse(ParseTag<void>, redisReply &reply);
-
-std::string parse(ParseTag<std::string>, redisReply &reply);
-
-long long parse(ParseTag<long long>, redisReply &reply);
-
-double parse(ParseTag<double>, redisReply &reply);
-
-bool parse(ParseTag<bool>, redisReply &reply);
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply);
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply);
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output);
-
-inline bool is_error(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ERROR;
-}
-
-inline bool is_nil(redisReply &reply) {
-    return reply.type == REDIS_REPLY_NIL;
-}
-
-inline bool is_string(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STRING;
-}
-
-inline bool is_status(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STATUS;
-}
-
-inline bool is_integer(redisReply &reply) {
-    return reply.type == REDIS_REPLY_INTEGER;
-}
-
-inline bool is_array(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ARRAY;
-}
-
-std::string to_status(redisReply &reply);
-
-template <typename Output>
-void to_array(redisReply &reply, Output output);
-
-// Rewrite set reply to bool type
-void rewrite_set_reply(redisReply &reply);
-
-// Rewrite georadius reply to OptionalLongLong type
-void rewrite_georadius_reply(redisReply &reply);
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString>;
-
-}
-
-// Inline implementations.
-
-namespace reply {
-
-namespace detail {
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        auto *sub_reply = reply.element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null array element reply");
-        }
-
-        *output = parse<typename IterType<Output>::type>(*sub_reply);
-
-        ++output;
-    }
-}
-
-bool is_flat_array(redisReply &reply);
-
-template <typename Output>
-void to_flat_array(redisReply &reply, Output output) {
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    if (reply.elements % 2 != 0) {
-        throw ProtoError("Not string pair array reply");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; idx += 2) {
-        auto *key_reply = reply.element[idx];
-        auto *val_reply = reply.element[idx + 1];
-        if (key_reply == nullptr || val_reply == nullptr) {
-            throw ProtoError("Null string array reply");
-        }
-
-        using Pair = typename IterType<Output>::type;
-        using FirstType = typename std::decay<typename Pair::first_type>::type;
-        using SecondType = typename std::decay<typename Pair::second_type>::type;
-        *output = std::make_pair(parse<FirstType>(*key_reply),
-                                    parse<SecondType>(*val_reply));
-
-        ++output;
-    }
-}
-
-template <typename Output>
-void to_array(std::true_type, redisReply &reply, Output output) {
-    if (is_flat_array(reply)) {
-        to_flat_array(reply, output);
-    } else {
-        to_array(reply, output);
-    }
-}
-
-template <typename Output>
-void to_array(std::false_type, redisReply &reply, Output output) {
-    to_array(reply, output);
-}
-
-template <typename T>
-std::tuple<T> parse_tuple(redisReply **reply, std::size_t idx) {
-    assert(reply != nullptr);
-
-    auto *sub_reply = reply[idx];
-    if (sub_reply == nullptr) {
-        throw ProtoError("Null reply");
-    }
-
-    return std::make_tuple(parse<T>(*sub_reply));
-}
-
-template <typename T, typename ...Args>
-auto parse_tuple(redisReply **reply, std::size_t idx) ->
-    typename std::enable_if<sizeof...(Args) != 0, std::tuple<T, Args...>>::type {
-    assert(reply != nullptr);
-
-    return std::tuple_cat(parse_tuple<T>(reply, idx),
-                            parse_tuple<Args...>(reply, idx + 1));
-}
-
-}
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply) {
-    if (reply::is_nil(reply)) {
-        return {};
-    }
-
-    return Optional<T>(parse<T>(reply));
-}
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != 2) {
-        throw ProtoError("NOT key-value PAIR reply");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null PAIR reply");
-    }
-
-    auto *first = reply.element[0];
-    auto *second = reply.element[1];
-    if (first == nullptr || second == nullptr) {
-        throw ProtoError("Null pair reply");
-    }
-
-    return std::make_pair(parse<typename std::decay<T>::type>(*first),
-                            parse<typename std::decay<U>::type>(*second));
-}
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply) {
-    constexpr auto size = sizeof...(Args);
-
-    static_assert(size > 0, "DO NOT support parsing tuple with 0 element");
-
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != size) {
-        throw ProtoError("Expect tuple reply with " + std::to_string(size) + "elements");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null TUPLE reply");
-    }
-
-    return detail::parse_tuple<Args...>(reply.element, 0);
-}
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::back_inserter(container));
-
-    return container;
-}
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::inserter(container, container.end()));
-
-    return container;
-}
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output) {
-    if (reply.elements != 2 || reply.element == nullptr) {
-        throw ProtoError("Invalid scan reply");
-    }
-
-    auto *cursor_reply = reply.element[0];
-    auto *data_reply = reply.element[1];
-    if (cursor_reply == nullptr || data_reply == nullptr) {
-        throw ProtoError("Invalid cursor reply or data reply");
-    }
-
-    auto cursor_str = reply::parse<std::string>(*cursor_reply);
-    auto new_cursor = 0;
-    try {
-        new_cursor = std::stoll(cursor_str);
-    } catch (const std::exception &e) {
-        throw ProtoError("Invalid cursor reply: " + cursor_str);
-    }
-
-    reply::to_array(*data_reply, output);
-
-    return new_cursor;
-}
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    detail::to_array(typename IsKvPairIter<Output>::type(), reply, output);
-}
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    if (!is_array(reply) || reply.elements != 4) {
-        throw ProtoError("expect array reply with 4 elements");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        if (reply.element[idx] == nullptr) {
-            throw ProtoError("null array reply");
-        }
-    }
-
-    auto num = parse<long long>(*(reply.element[0]));
-    auto start = parse<OptionalString>(*(reply.element[1]));
-    auto end = parse<OptionalString>(*(reply.element[2]));
-
-    auto &entry_reply = *(reply.element[3]);
-    if (!is_nil(entry_reply)) {
-        to_array(entry_reply, output);
-    }
-
-    return std::make_tuple(num, std::move(start), std::move(end));
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REPLY_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/sentinel.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/sentinel.cpp
deleted file mode 100644
index a7d88a181..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/sentinel.cpp
+++ /dev/null
@@ -1,361 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "sentinel.h"
-#include <cassert>
-#include <thread>
-#include <random>
-#include <algorithm>
-#include "redis.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class Sentinel::Iterator {
-public:
-    Iterator(std::list<Connection> &healthy_sentinels,
-                std::list<ConnectionOptions> &broken_sentinels) :
-                    _healthy_sentinels(healthy_sentinels),
-                    _broken_sentinels(broken_sentinels) {
-        reset();
-    }
-
-    Connection& next();
-
-    void reset();
-
-private:
-    std::list<Connection> &_healthy_sentinels;
-
-    std::size_t _healthy_size = 0;
-
-    std::list<ConnectionOptions> &_broken_sentinels;
-
-    std::size_t _broken_size = 0;
-};
-
-Connection& Sentinel::Iterator::next() {
-    while (_healthy_size > 0) {
-        assert(_healthy_sentinels.size() >= _healthy_size);
-
-        --_healthy_size;
-
-        auto &connection = _healthy_sentinels.front();
-        if (connection.broken()) {
-            _broken_sentinels.push_front(connection.options());
-            ++_broken_size;
-
-            _healthy_sentinels.pop_front();
-        } else {
-            _healthy_sentinels.splice(_healthy_sentinels.end(),
-                                        _healthy_sentinels,
-                                        _healthy_sentinels.begin());
-
-            return _healthy_sentinels.back();
-        }
-    }
-
-    while (_broken_size > 0) {
-        assert(_broken_sentinels.size() >= _broken_size);
-
-        --_broken_size;
-
-        try {
-            const auto &opt = _broken_sentinels.front();
-            Connection connection(opt);
-            _healthy_sentinels.push_back(std::move(connection));
-
-            _broken_sentinels.pop_front();
-
-            return _healthy_sentinels.back();
-        } catch (const Error &e) {
-            // Failed to connect to sentinel.
-            _broken_sentinels.splice(_broken_sentinels.end(),
-                                        _broken_sentinels,
-                                        _broken_sentinels.begin());
-        }
-    }
-
-    throw StopIterError();
-}
-
-void Sentinel::Iterator::reset() {
-    _healthy_size = _healthy_sentinels.size();
-    _broken_size = _broken_sentinels.size();
-}
-
-Sentinel::Sentinel(const SentinelOptions &sentinel_opts) :
-                    _broken_sentinels(_parse_options(sentinel_opts)),
-                    _sentinel_opts(sentinel_opts) {
-    if (_sentinel_opts.connect_timeout == std::chrono::milliseconds(0)
-            || _sentinel_opts.socket_timeout == std::chrono::milliseconds(0)) {
-        throw Error("With sentinel, connection timeout and socket timeout cannot be 0");
-    }
-}
-
-Connection Sentinel::master(const std::string &master_name, const ConnectionOptions &opts) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    Iterator iter(_healthy_sentinels, _broken_sentinels);
-    std::size_t retries = 0;
-    while (true) {
-        try {
-            auto &sentinel = iter.next();
-
-            auto master = _get_master_addr_by_name(sentinel, master_name);
-            if (!master) {
-                // Try the next sentinel.
-                continue;
-            }
-
-            auto connection = _connect_redis(*master, opts);
-            if (_get_role(connection) != Role::MASTER) {
-                // Retry the whole process at most SentinelOptions::max_retry times.
-                ++retries;
-                if (retries > _sentinel_opts.max_retry) {
-                    throw Error("Failed to get master from sentinel");
-                }
-
-                std::this_thread::sleep_for(_sentinel_opts.retry_interval);
-
-                // Restart the iteration.
-                iter.reset();
-                continue;
-            }
-
-            return connection;
-        } catch (const StopIterError &e) {
-            throw;
-        } catch (const Error &e) {
-            continue;
-        }
-    }
-}
-
-Connection Sentinel::slave(const std::string &master_name, const ConnectionOptions &opts) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    Iterator iter(_healthy_sentinels, _broken_sentinels);
-    std::size_t retries = 0;
-    while (true) {
-        try {
-            auto &sentinel = iter.next();
-
-            auto slaves = _get_slave_addr_by_name(sentinel, master_name);
-            if (slaves.empty()) {
-                // Try the next sentinel.
-                continue;
-            }
-
-            // Normally slaves list is NOT very large, so there won't be a performance problem.
-            auto slave_iter = std::find(slaves.begin(),
-                                        slaves.end(),
-                                        Node{opts.host, opts.port});
-            if (slave_iter != slaves.end() && slave_iter != slaves.begin()) {
-                // The given node is still a valid slave. Try it first.
-                std::swap(*(slaves.begin()), *slave_iter);
-            }
-
-            for (const auto &slave : slaves) {
-                try {
-                    auto connection = _connect_redis(slave, opts);
-                    if (_get_role(connection) != Role::SLAVE) {
-                        // Retry the whole process at most SentinelOptions::max_retry times.
-                        ++retries;
-                        if (retries > _sentinel_opts.max_retry) {
-                            throw Error("Failed to get slave from sentinel");
-                        }
-
-                        std::this_thread::sleep_for(_sentinel_opts.retry_interval);
-
-                        // Restart the iteration.
-                        iter.reset();
-                        break;
-                    }
-
-                    return connection;
-                } catch (const Error &e) {
-                    // Try the next slave.
-                    continue;
-                }
-            }
-        } catch (const StopIterError &e) {
-            throw;
-        } catch (const Error &e) {
-            continue;
-        }
-    }
-}
-
-Optional<Node> Sentinel::_get_master_addr_by_name(Connection &connection, const StringView &name) {
-    connection.send("SENTINEL GET-MASTER-ADDR-BY-NAME %b", name.data(), name.size());
-
-    auto reply = connection.recv();
-
-    assert(reply);
-
-    auto master = reply::parse<Optional<std::pair<std::string, std::string>>>(*reply);
-    if (!master) {
-        return {};
-    }
-
-    int port = 0;
-    try {
-        port = std::stoi(master->second);
-    } catch (const std::exception &) {
-        throw ProtoError("Master port is invalid: " + master->second);
-    }
-
-    return Optional<Node>{Node{master->first, port}};
-}
-
-std::vector<Node> Sentinel::_get_slave_addr_by_name(Connection &connection,
-                                                    const StringView &name) {
-    try {
-        connection.send("SENTINEL SLAVES %b", name.data(), name.size());
-
-        auto reply = connection.recv();
-
-        assert(reply);
-
-        auto slaves = _parse_slave_info(*reply);
-
-        // Make slave list random.
-        std::mt19937 gen(std::random_device{}());
-        std::shuffle(slaves.begin(), slaves.end(), gen);
-
-        return slaves;
-    } catch (const ReplyError &e) {
-        // Unknown master name.
-        return {};
-    }
-}
-
-std::vector<Node> Sentinel::_parse_slave_info(redisReply &reply) const {
-    using SlaveInfo = std::unordered_map<std::string, std::string>;
-
-    auto slaves = reply::parse<std::vector<SlaveInfo>>(reply);
-
-    std::vector<Node> nodes;
-    for (const auto &slave : slaves) {
-        auto flags_iter = slave.find("flags");
-        auto ip_iter = slave.find("ip");
-        auto port_iter = slave.find("port");
-        if (flags_iter == slave.end() || ip_iter == slave.end() || port_iter == slave.end()) {
-            throw ProtoError("Invalid slave info");
-        }
-
-        // This slave is down, e.g. 's_down,slave,disconnected'
-        if (flags_iter->second != "slave") {
-            continue;
-        }
-
-        int port = 0;
-        try {
-            port = std::stoi(port_iter->second);
-        } catch (const std::exception &) {
-            throw ProtoError("Slave port is invalid: " + port_iter->second);
-        }
-
-        nodes.push_back(Node{ip_iter->second, port});
-    }
-
-    return nodes;
-}
-
-Connection Sentinel::_connect_redis(const Node &node, ConnectionOptions opts) {
-    opts.host = node.host;
-    opts.port = node.port;
-
-    return Connection(opts);
-}
-
-Role Sentinel::_get_role(Connection &connection) {
-    connection.send("INFO REPLICATION");
-    auto reply = connection.recv();
-
-    assert(reply);
-    auto info = reply::parse<std::string>(*reply);
-
-    auto start = info.find("role:");
-    if (start == std::string::npos) {
-        throw ProtoError("Invalid INFO REPLICATION reply");
-    }
-    start += 5;
-    auto stop = info.find("\r\n", start);
-    if (stop == std::string::npos) {
-        throw ProtoError("Invalid INFO REPLICATION reply");
-    }
-
-    auto role = info.substr(start, stop - start);
-    if (role == "master") {
-        return Role::MASTER;
-    } else if (role == "slave") {
-        return Role::SLAVE;
-    } else {
-        throw Error("Invalid role: " + role);
-    }
-}
-
-std::list<ConnectionOptions> Sentinel::_parse_options(const SentinelOptions &opts) const {
-    std::list<ConnectionOptions> options;
-    for (const auto &node : opts.nodes) {
-        ConnectionOptions opt;
-        opt.host = node.first;
-        opt.port = node.second;
-        opt.password = opts.password;
-        opt.keep_alive = opts.keep_alive;
-        opt.connect_timeout = opts.connect_timeout;
-        opt.socket_timeout = opts.socket_timeout;
-
-        options.push_back(opt);
-    }
-
-    return options;
-}
-
-SimpleSentinel::SimpleSentinel(const std::shared_ptr<Sentinel> &sentinel,
-                                const std::string &master_name,
-                                Role role) :
-                                    _sentinel(sentinel),
-                                    _master_name(master_name),
-                                    _role(role) {
-    if (!_sentinel) {
-        throw Error("Sentinel cannot be null");
-    }
-
-    if (_role != Role::MASTER && _role != Role::SLAVE) {
-        throw Error("Role must be Role::MASTER or Role::SLAVE");
-    }
-}
-
-Connection SimpleSentinel::create(const ConnectionOptions &opts) {
-    assert(_sentinel);
-
-    if (_role == Role::MASTER) {
-        return _sentinel->master(_master_name, opts);
-    }
-
-    assert(_role == Role::SLAVE);
-
-    return _sentinel->slave(_master_name, opts);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/sentinel.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/sentinel.h
deleted file mode 100644
index e80d1e56a..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/sentinel.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SENTINEL_H
-#define SEWENEW_REDISPLUSPLUS_SENTINEL_H
-
-#include <string>
-#include <list>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include "connection.h"
-#include "shards.h"
-#include "reply.h"
-
-namespace sw {
-
-namespace redis {
-
-struct SentinelOptions {
-    std::vector<std::pair<std::string, int>> nodes;
-
-    std::string password;
-
-    bool keep_alive = true;
-
-    std::chrono::milliseconds connect_timeout{100};
-
-    std::chrono::milliseconds socket_timeout{100};
-
-    std::chrono::milliseconds retry_interval{100};
-
-    std::size_t max_retry = 2;
-};
-
-class Sentinel {
-public:
-    explicit Sentinel(const SentinelOptions &sentinel_opts);
-
-    Sentinel(const Sentinel &) = delete;
-    Sentinel& operator=(const Sentinel &) = delete;
-
-    Sentinel(Sentinel &&) = delete;
-    Sentinel& operator=(Sentinel &&) = delete;
-
-    ~Sentinel() = default;
-
-private:
-    Connection master(const std::string &master_name, const ConnectionOptions &opts);
-
-    Connection slave(const std::string &master_name, const ConnectionOptions &opts);
-
-    class Iterator;
-
-    friend class SimpleSentinel;
-
-    std::list<ConnectionOptions> _parse_options(const SentinelOptions &opts) const;
-
-    Optional<Node> _get_master_addr_by_name(Connection &connection, const StringView &name);
-
-    std::vector<Node> _get_slave_addr_by_name(Connection &connection, const StringView &name);
-
-    Connection _connect_redis(const Node &node, ConnectionOptions opts);
-
-    Role _get_role(Connection &connection);
-
-    std::vector<Node> _parse_slave_info(redisReply &reply) const;
-
-    std::list<Connection> _healthy_sentinels;
-
-    std::list<ConnectionOptions> _broken_sentinels;
-
-    SentinelOptions _sentinel_opts;
-
-    std::mutex _mutex;
-};
-
-class SimpleSentinel {
-public:
-    SimpleSentinel(const std::shared_ptr<Sentinel> &sentinel,
-                    const std::string &master_name,
-                    Role role);
-
-    SimpleSentinel() = default;
-
-    SimpleSentinel(const SimpleSentinel &) = default;
-    SimpleSentinel& operator=(const SimpleSentinel &) = default;
-
-    SimpleSentinel(SimpleSentinel &&) = default;
-    SimpleSentinel& operator=(SimpleSentinel &&) = default;
-
-    ~SimpleSentinel() = default;
-
-    explicit operator bool() const {
-        return bool(_sentinel);
-    }
-
-    Connection create(const ConnectionOptions &opts);
-
-private:
-    std::shared_ptr<Sentinel> _sentinel;
-
-    std::string _master_name;
-
-    Role _role = Role::MASTER;
-};
-
-class StopIterError : public Error {
-public:
-    StopIterError() : Error("StopIterError") {}
-
-    StopIterError(const StopIterError &) = default;
-    StopIterError& operator=(const StopIterError &) = default;
-
-    StopIterError(StopIterError &&) = default;
-    StopIterError& operator=(StopIterError &&) = default;
-
-    virtual ~StopIterError() = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SENTINEL_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards.cpp
deleted file mode 100644
index e06d2a732..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "shards.h"
-
-namespace sw {
-
-namespace redis {
-
-RedirectionError::RedirectionError(const std::string &msg): ReplyError(msg) {
-    std::tie(_slot, _node) = _parse_error(msg);
-}
-
-std::pair<Slot, Node> RedirectionError::_parse_error(const std::string &msg) const {
-    // "slot ip:port"
-    auto space_pos = msg.find(" ");
-    auto colon_pos = msg.find(":");
-    if (space_pos == std::string::npos
-            || colon_pos == std::string::npos
-            || colon_pos < space_pos) {
-        throw ProtoError("Invalid ASK error message: " + msg);
-    }
-
-    try {
-        auto slot = std::stoull(msg.substr(0, space_pos));
-        auto host = msg.substr(space_pos + 1, colon_pos - space_pos - 1);
-        auto port = std::stoi(msg.substr(colon_pos + 1));
-
-        return {slot, {host, port}};
-    } catch (const std::exception &e) {
-        throw ProtoError("Invalid ASK error message: " + msg);
-    }
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards.h
deleted file mode 100644
index a0593acbc..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_H
-
-#include <string>
-#include <map>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-using Slot = std::size_t;
-
-struct SlotRange {
-    Slot min;
-    Slot max;
-};
-
-inline bool operator<(const SlotRange &lhs, const SlotRange &rhs) {
-    return lhs.max < rhs.max;
-}
-
-struct Node {
-    std::string host;
-    int port;
-};
-
-inline bool operator==(const Node &lhs, const Node &rhs) {
-    return lhs.host == rhs.host && lhs.port == rhs.port;
-}
-
-struct NodeHash {
-    std::size_t operator()(const Node &node) const noexcept {
-        auto host_hash = std::hash<std::string>{}(node.host);
-        auto port_hash = std::hash<int>{}(node.port);
-        return host_hash ^ (port_hash << 1);
-    }
-};
-
-using Shards = std::map<SlotRange, Node>;
-
-class RedirectionError : public ReplyError {
-public:
-    RedirectionError(const std::string &msg);
-
-    RedirectionError(const RedirectionError &) = default;
-    RedirectionError& operator=(const RedirectionError &) = default;
-
-    RedirectionError(RedirectionError &&) = default;
-    RedirectionError& operator=(RedirectionError &&) = default;
-
-    virtual ~RedirectionError() = default;
-
-    Slot slot() const {
-        return _slot;
-    }
-
-    const Node& node() const {
-        return _node;
-    }
-
-private:
-    std::pair<Slot, Node> _parse_error(const std::string &msg) const;
-
-    Slot _slot = 0;
-    Node _node;
-};
-
-class MovedError : public RedirectionError {
-public:
-    explicit MovedError(const std::string &msg) : RedirectionError(msg) {}
-
-    MovedError(const MovedError &) = default;
-    MovedError& operator=(const MovedError &) = default;
-
-    MovedError(MovedError &&) = default;
-    MovedError& operator=(MovedError &&) = default;
-
-    virtual ~MovedError() = default;
-};
-
-class AskError : public RedirectionError {
-public:
-    explicit AskError(const std::string &msg) : RedirectionError(msg) {}
-
-    AskError(const AskError &) = default;
-    AskError& operator=(const AskError &) = default;
-
-    AskError(AskError &&) = default;
-    AskError& operator=(AskError &&) = default;
-
-    virtual ~AskError() = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards_pool.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards_pool.cpp
deleted file mode 100644
index 436cc265c..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards_pool.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "shards_pool.h"
-#include <unordered_set>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-const std::size_t ShardsPool::SHARDS;
-
-ShardsPool::ShardsPool(const ConnectionPoolOptions &pool_opts,
-                        const ConnectionOptions &connection_opts) :
-                            _pool_opts(pool_opts),
-                            _connection_opts(connection_opts) {
-    if (_connection_opts.type != ConnectionType::TCP) {
-        throw Error("Only support TCP connection for Redis Cluster");
-    }
-
-    Connection connection(_connection_opts);
-
-    _shards = _cluster_slots(connection);
-
-    _init_pool(_shards);
-}
-
-ShardsPool::ShardsPool(ShardsPool &&that) {
-    std::lock_guard<std::mutex> lock(that._mutex);
-
-    _move(std::move(that));
-}
-
-ShardsPool& ShardsPool::operator=(ShardsPool &&that) {
-    if (this != &that) {
-        std::lock(_mutex, that._mutex);
-        std::lock_guard<std::mutex> lock_this(_mutex, std::adopt_lock);
-        std::lock_guard<std::mutex> lock_that(that._mutex, std::adopt_lock);
-
-        _move(std::move(that));
-    }
-
-    return *this;
-}
-
-GuardedConnection ShardsPool::fetch(const StringView &key) {
-    auto slot = _slot(key);
-
-    return _fetch(slot);
-}
-
-GuardedConnection ShardsPool::fetch() {
-    auto slot = _slot();
-
-    return _fetch(slot);
-}
-
-GuardedConnection ShardsPool::fetch(const Node &node) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    auto iter = _pools.find(node);
-    if (iter == _pools.end()) {
-        // Node doesn't exist, and it should be a newly created node.
-        // So add a new connection pool.
-        iter = _add_node(node);
-    }
-
-    assert(iter != _pools.end());
-
-    return GuardedConnection(iter->second);
-}
-
-void ShardsPool::update() {
-    // My might send command to a removed node.
-    // Try at most 3 times.
-    for (auto idx = 0; idx < 3; ++idx) {
-        try {
-            // Randomly pick a connection.
-            auto guarded_connection = fetch();
-            auto shards = _cluster_slots(guarded_connection.connection());
-
-            std::unordered_set<Node, NodeHash> nodes;
-            for (const auto &shard : shards) {
-                nodes.insert(shard.second);
-            }
-
-            std::lock_guard<std::mutex> lock(_mutex);
-
-            // TODO: If shards is unchanged, no need to update, and return immediately.
-
-            _shards = std::move(shards);
-
-            // Remove non-existent nodes.
-            for (auto iter = _pools.begin(); iter != _pools.end(); ) {
-                if (nodes.find(iter->first) == nodes.end()) {
-                    // Node has been removed.
-                    _pools.erase(iter++);
-                } else {
-                    ++iter;
-                }
-            }
-
-            // Add connection pool for new nodes.
-            // In fact, connections will be created lazily.
-            for (const auto &node : nodes) {
-                if (_pools.find(node) == _pools.end()) {
-                    _add_node(node);
-                }
-            }
-
-            // Update successfully.
-            return;
-        } catch (const Error &) {
-            // continue;
-        }
-    }
-
-    throw Error("Failed to update shards info");
-}
-
-ConnectionOptions ShardsPool::connection_options(const StringView &key) {
-    auto slot = _slot(key);
-
-    return _connection_options(slot);
-}
-
-ConnectionOptions ShardsPool::connection_options() {
-    auto slot = _slot();
-
-    return _connection_options(slot);
-}
-void ShardsPool::_move(ShardsPool &&that) {
-    _pool_opts = that._pool_opts;
-    _connection_opts = that._connection_opts;
-    _shards = std::move(that._shards);
-    _pools = std::move(that._pools);
-}
-
-void ShardsPool::_init_pool(const Shards &shards) {
-    for (const auto &shard : shards) {
-        _add_node(shard.second);
-    }
-}
-
-Shards ShardsPool::_cluster_slots(Connection &connection) const {
-    auto reply = _cluster_slots_command(connection);
-
-    assert(reply);
-
-    return _parse_reply(*reply);
-}
-
-ReplyUPtr ShardsPool::_cluster_slots_command(Connection &connection) const {
-    connection.send("CLUSTER SLOTS");
-
-    return connection.recv();
-}
-
-Shards ShardsPool::_parse_reply(redisReply &reply) const {
-    if (!reply::is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.element == nullptr || reply.elements == 0) {
-        throw Error("Empty slots");
-    }
-
-    Shards shards;
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        auto *sub_reply = reply.element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null slot info");
-        }
-
-        shards.emplace(_parse_slot_info(*sub_reply));
-    }
-
-    return shards;
-}
-
-std::pair<SlotRange, Node> ShardsPool::_parse_slot_info(redisReply &reply) const {
-    if (reply.elements < 3 || reply.element == nullptr) {
-        throw ProtoError("Invalid slot info");
-    }
-
-    // Min slot id
-    auto *min_slot_reply = reply.element[0];
-    if (min_slot_reply == nullptr) {
-        throw ProtoError("Invalid min slot");
-    }
-    std::size_t min_slot = reply::parse<long long>(*min_slot_reply);
-
-    // Max slot id
-    auto *max_slot_reply = reply.element[1];
-    if (max_slot_reply == nullptr) {
-        throw ProtoError("Invalid max slot");
-    }
-    std::size_t max_slot = reply::parse<long long>(*max_slot_reply);
-
-    if (min_slot > max_slot) {
-        throw ProtoError("Invalid slot range");
-    }
-
-    // Master node info
-    auto *node_reply = reply.element[2];
-    if (node_reply == nullptr
-            || !reply::is_array(*node_reply)
-            || node_reply->element == nullptr
-            || node_reply->elements < 2) {
-        throw ProtoError("Invalid node info");
-    }
-
-    auto master_host = reply::parse<std::string>(*(node_reply->element[0]));
-    int master_port = reply::parse<long long>(*(node_reply->element[1]));
-
-    // By now, we ignore node id and other replicas' info.
-
-    return {SlotRange{min_slot, max_slot}, Node{master_host, master_port}};
-}
-
-Slot ShardsPool::_slot(const StringView &key) const {
-    // The following code is copied from: https://redis.io/topics/cluster-spec
-    // And I did some minor changes.
-
-    const auto *k = key.data();
-    auto keylen = key.size();
-
-    // start-end indexes of { and }.
-    std::size_t s = 0;
-    std::size_t e = 0;
-
-    // Search the first occurrence of '{'.
-    for (s = 0; s < keylen; s++)
-        if (k[s] == '{') break;
-
-    // No '{' ? Hash the whole key. This is the base case.
-    if (s == keylen) return crc16(k, keylen) & SHARDS;
-
-    // '{' found? Check if we have the corresponding '}'.
-    for (e = s + 1; e < keylen; e++)
-        if (k[e] == '}') break;
-
-    // No '}' or nothing between {} ? Hash the whole key.
-    if (e == keylen || e == s + 1) return crc16(k, keylen) & SHARDS;
-
-    // If we are here there is both a { and a } on its right. Hash
-    // what is in the middle between { and }.
-    return crc16(k + s + 1, e - s - 1) & SHARDS;
-}
-
-Slot ShardsPool::_slot() const {
-    static thread_local std::default_random_engine engine;
-
-    std::uniform_int_distribution<std::size_t> uniform_dist(0, SHARDS);
-
-    return uniform_dist(engine);
-}
-
-ConnectionPoolSPtr& ShardsPool::_get_pool(Slot slot) {
-    auto shards_iter = _shards.lower_bound(SlotRange{slot, slot});
-    if (shards_iter == _shards.end() || slot < shards_iter->first.min) {
-        throw Error("Slot is out of range: " + std::to_string(slot));
-    }
-
-    const auto &node = shards_iter->second;
-
-    auto node_iter = _pools.find(node);
-    if (node_iter == _pools.end()) {
-        throw Error("Slot is NOT covered: " + std::to_string(slot));
-    }
-
-    return node_iter->second;
-}
-
-GuardedConnection ShardsPool::_fetch(Slot slot) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    auto &pool = _get_pool(slot);
-
-    assert(pool);
-
-    return GuardedConnection(pool);
-}
-
-ConnectionOptions ShardsPool::_connection_options(Slot slot) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    auto &pool = _get_pool(slot);
-
-    assert(pool);
-
-    return pool->connection_options();
-}
-
-auto ShardsPool::_add_node(const Node &node) -> NodeMap::iterator {
-    auto opts = _connection_opts;
-    opts.host = node.host;
-    opts.port = node.port;
-
-    return _pools.emplace(node, std::make_shared<ConnectionPool>(_pool_opts, opts)).first;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards_pool.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards_pool.h
deleted file mode 100644
index 1184806e9..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/shards_pool.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-
-#include <cassert>
-#include <unordered_map>
-#include <string>
-#include <random>
-#include <memory>
-#include "reply.h"
-#include "connection_pool.h"
-#include "shards.h"
-
-namespace sw {
-
-namespace redis {
-
-using ConnectionPoolSPtr = std::shared_ptr<ConnectionPool>;
-
-class GuardedConnection {
-public:
-    GuardedConnection(const ConnectionPoolSPtr &pool) : _pool(pool),
-                                                        _connection(_pool->fetch()) {
-        assert(!_connection.broken());
-    }
-
-    GuardedConnection(const GuardedConnection &) = delete;
-    GuardedConnection& operator=(const GuardedConnection &) = delete;
-
-    GuardedConnection(GuardedConnection &&) = default;
-    GuardedConnection& operator=(GuardedConnection &&) = default;
-
-    ~GuardedConnection() {
-        _pool->release(std::move(_connection));
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPoolSPtr _pool;
-    Connection _connection;
-};
-
-class ShardsPool {
-public:
-    ShardsPool() = default;
-
-    ShardsPool(const ShardsPool &that) = delete;
-    ShardsPool& operator=(const ShardsPool &that) = delete;
-
-    ShardsPool(ShardsPool &&that);
-    ShardsPool& operator=(ShardsPool &&that);
-
-    ~ShardsPool() = default;
-
-    ShardsPool(const ConnectionPoolOptions &pool_opts,
-                const ConnectionOptions &connection_opts);
-
-    // Fetch a connection by key.
-    GuardedConnection fetch(const StringView &key);
-
-    // Randomly pick a connection.
-    GuardedConnection fetch();
-
-    // Fetch a connection by node.
-    GuardedConnection fetch(const Node &node);
-
-    void update();
-
-    ConnectionOptions connection_options(const StringView &key);
-
-    ConnectionOptions connection_options();
-
-private:
-    void _move(ShardsPool &&that);
-
-    void _init_pool(const Shards &shards);
-
-    Shards _cluster_slots(Connection &connection) const;
-
-    ReplyUPtr _cluster_slots_command(Connection &connection) const;
-
-    Shards _parse_reply(redisReply &reply) const;
-
-    std::pair<SlotRange, Node> _parse_slot_info(redisReply &reply) const;
-
-    // Get slot by key.
-    std::size_t _slot(const StringView &key) const;
-
-    // Randomly pick a slot.
-    std::size_t _slot() const;
-
-    ConnectionPoolSPtr& _get_pool(Slot slot);
-
-    GuardedConnection _fetch(Slot slot);
-
-    ConnectionOptions _connection_options(Slot slot);
-
-    using NodeMap = std::unordered_map<Node, ConnectionPoolSPtr, NodeHash>;
-
-    NodeMap::iterator _add_node(const Node &node);
-
-    ConnectionPoolOptions _pool_opts;
-
-    ConnectionOptions _connection_opts;
-
-    Shards _shards;
-
-    NodeMap _pools;
-
-    std::mutex _mutex;
-
-    static const std::size_t SHARDS = 16383;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/subscriber.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/subscriber.cpp
deleted file mode 100644
index b699b02f0..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/subscriber.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "subscriber.h"
-#include <cassert>
-
-namespace sw {
-
-namespace redis {
-
-const Subscriber::TypeIndex Subscriber::_msg_type_index = {
-    {"message", MsgType::MESSAGE},
-    {"pmessage", MsgType::PMESSAGE},
-    {"subscribe", MsgType::SUBSCRIBE},
-    {"unsubscribe", MsgType::UNSUBSCRIBE},
-    {"psubscribe", MsgType::PSUBSCRIBE},
-    {"punsubscribe", MsgType::PUNSUBSCRIBE}
-};
-
-Subscriber::Subscriber(Connection connection) : _connection(std::move(connection)) {}
-
-void Subscriber::subscribe(const StringView &channel) {
-    _check_connection();
-
-    // TODO: cmd::subscribe DOES NOT send the subscribe message to Redis.
-    // In fact, it puts the command to network buffer.
-    // So we need a queue to record these sub or unsub commands, and
-    // ensure that before stopping the subscriber, all these commands
-    // have really been sent to Redis.
-    cmd::subscribe(_connection, channel);
-}
-
-void Subscriber::unsubscribe() {
-    _check_connection();
-
-    cmd::unsubscribe(_connection);
-}
-
-void Subscriber::unsubscribe(const StringView &channel) {
-    _check_connection();
-
-    cmd::unsubscribe(_connection, channel);
-}
-
-void Subscriber::psubscribe(const StringView &pattern) {
-    _check_connection();
-
-    cmd::psubscribe(_connection, pattern);
-}
-
-void Subscriber::punsubscribe() {
-    _check_connection();
-
-    cmd::punsubscribe(_connection);
-}
-
-void Subscriber::punsubscribe(const StringView &pattern) {
-    _check_connection();
-
-    cmd::punsubscribe(_connection, pattern);
-}
-
-void Subscriber::consume() {
-    _check_connection();
-
-    ReplyUPtr reply;
-    try {
-        reply = _connection.recv();
-    } catch (const TimeoutError &) {
-        _connection.reset();
-        throw;
-    }
-
-    assert(reply);
-
-    if (!reply::is_array(*reply) || reply->elements < 1 || reply->element == nullptr) {
-        throw ProtoError("Invalid subscribe message");
-    }
-
-    auto type = _msg_type(reply->element[0]);
-    switch (type) {
-    case MsgType::MESSAGE:
-        _handle_message(*reply);
-        break;
-
-    case MsgType::PMESSAGE:
-        _handle_pmessage(*reply);
-        break;
-
-    case MsgType::SUBSCRIBE:
-    case MsgType::UNSUBSCRIBE:
-    case MsgType::PSUBSCRIBE:
-    case MsgType::PUNSUBSCRIBE:
-        _handle_meta(type, *reply);
-        break;
-
-    default:
-        assert(false);
-    }
-}
-
-Subscriber::MsgType Subscriber::_msg_type(redisReply *reply) const {
-    if (reply == nullptr) {
-        throw ProtoError("Null type reply.");
-    }
-
-    auto type = reply::parse<std::string>(*reply);
-
-    auto iter = _msg_type_index.find(type);
-    if (iter == _msg_type_index.end()) {
-        throw ProtoError("Invalid message type.");
-    }
-
-    return iter->second;
-}
-
-void Subscriber::_check_connection() {
-    if (_connection.broken()) {
-        throw Error("Connection is broken");
-    }
-}
-
-void Subscriber::_handle_message(redisReply &reply) {
-    if (_msg_callback == nullptr) {
-        return;
-    }
-
-    if (reply.elements != 3) {
-        throw ProtoError("Expect 3 sub replies");
-    }
-
-    assert(reply.element != nullptr);
-
-    auto *channel_reply = reply.element[1];
-    if (channel_reply == nullptr) {
-        throw ProtoError("Null channel reply");
-    }
-    auto channel = reply::parse<std::string>(*channel_reply);
-
-    auto *msg_reply = reply.element[2];
-    if (msg_reply == nullptr) {
-        throw ProtoError("Null message reply");
-    }
-    auto msg = reply::parse<std::string>(*msg_reply);
-
-    _msg_callback(std::move(channel), std::move(msg));
-}
-
-void Subscriber::_handle_pmessage(redisReply &reply) {
-    if (_pmsg_callback == nullptr) {
-        return;
-    }
-
-    if (reply.elements != 4) {
-        throw ProtoError("Expect 4 sub replies");
-    }
-
-    assert(reply.element != nullptr);
-
-    auto *pattern_reply = reply.element[1];
-    if (pattern_reply == nullptr) {
-        throw ProtoError("Null pattern reply");
-    }
-    auto pattern = reply::parse<std::string>(*pattern_reply);
-
-    auto *channel_reply = reply.element[2];
-    if (channel_reply == nullptr) {
-        throw ProtoError("Null channel reply");
-    }
-    auto channel = reply::parse<std::string>(*channel_reply);
-
-    auto *msg_reply = reply.element[3];
-    if (msg_reply == nullptr) {
-        throw ProtoError("Null message reply");
-    }
-    auto msg = reply::parse<std::string>(*msg_reply);
-
-    _pmsg_callback(std::move(pattern), std::move(channel), std::move(msg));
-}
-
-void Subscriber::_handle_meta(MsgType type, redisReply &reply) {
-    if (_meta_callback == nullptr) {
-        return;
-    }
-
-    if (reply.elements != 3) {
-        throw ProtoError("Expect 3 sub replies");
-    }
-
-    assert(reply.element != nullptr);
-
-    auto *channel_reply = reply.element[1];
-    if (channel_reply == nullptr) {
-        throw ProtoError("Null channel reply");
-    }
-    auto channel = reply::parse<OptionalString>(*channel_reply);
-
-    auto *num_reply = reply.element[2];
-    if (num_reply == nullptr) {
-        throw ProtoError("Null num reply");
-    }
-    auto num = reply::parse<long long>(*num_reply);
-
-    _meta_callback(type, std::move(channel), num);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/subscriber.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/subscriber.h
deleted file mode 100644
index 8b7c5cfb4..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/subscriber.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-#define SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-
-#include <unordered_map>
-#include <string>
-#include <functional>
-#include "connection.h"
-#include "reply.h"
-#include "command.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-// @NOTE: Subscriber is NOT thread-safe.
-// Subscriber uses callbacks to handle messages. There are 6 kinds of messages:
-// 1) MESSAGE: message sent to a channel.
-// 2) PMESSAGE: message sent to channels of a given pattern.
-// 3) SUBSCRIBE: meta message sent when we successfully subscribe to a channel.
-// 4) UNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel.
-// 5) PSUBSCRIBE: meta message sent when we successfully subscribe to a channel pattern.
-// 6) PUNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel pattern.
-//
-// Use Subscriber::on_message(MsgCallback) to set the callback function for message of
-// *MESSAGE* type, and the callback interface is:
-// void (std::string channel, std::string msg)
-//
-// Use Subscriber::on_pmessage(PatternMsgCallback) to set the callback function for message of
-// *PMESSAGE* type, and the callback interface is:
-// void (std::string pattern, std::string channel, std::string msg)
-//
-// Messages of other types are called *META MESSAGE*, they have the same callback interface.
-// Use Subscriber::on_meta(MetaCallback) to set the callback function:
-// void (Subscriber::MsgType type, OptionalString channel, long long num)
-//
-// NOTE: If we haven't subscribe/psubscribe to any channel/pattern, and try to
-// unsubscribe/punsubscribe without any parameter, i.e. unsubscribe/punsubscribe all
-// channels/patterns, *channel* will be null. So the second parameter of meta callback
-// is of type *OptionalString*.
-//
-// All these callback interfaces pass std::string by value, and you can take their ownership
-// (i.e. std::move) safely.
-//
-// If you don't set callback for a specific kind of message, Subscriber::consume() will
-// receive the message, and ignore it, i.e. no callback will be called.
-class Subscriber {
-public:
-    Subscriber(const Subscriber &) = delete;
-    Subscriber& operator=(const Subscriber &) = delete;
-
-    Subscriber(Subscriber &&) = default;
-    Subscriber& operator=(Subscriber &&) = default;
-
-    ~Subscriber() = default;
-
-    enum class MsgType {
-        SUBSCRIBE,
-        UNSUBSCRIBE,
-        PSUBSCRIBE,
-        PUNSUBSCRIBE,
-        MESSAGE,
-        PMESSAGE
-    };
-
-    template <typename MsgCb>
-    void on_message(MsgCb msg_callback);
-
-    template <typename PMsgCb>
-    void on_pmessage(PMsgCb pmsg_callback);
-
-    template <typename MetaCb>
-    void on_meta(MetaCb meta_callback);
-
-    void subscribe(const StringView &channel);
-
-    template <typename Input>
-    void subscribe(Input first, Input last);
-
-    template <typename T>
-    void subscribe(std::initializer_list<T> channels) {
-        subscribe(channels.begin(), channels.end());
-    }
-
-    void unsubscribe();
-
-    void unsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void unsubscribe(Input first, Input last);
-
-    template <typename T>
-    void unsubscribe(std::initializer_list<T> channels) {
-        unsubscribe(channels.begin(), channels.end());
-    }
-
-    void psubscribe(const StringView &pattern);
-
-    template <typename Input>
-    void psubscribe(Input first, Input last);
-
-    template <typename T>
-    void psubscribe(std::initializer_list<T> channels) {
-        psubscribe(channels.begin(), channels.end());
-    }
-
-    void punsubscribe();
-
-    void punsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void punsubscribe(Input first, Input last);
-
-    template <typename T>
-    void punsubscribe(std::initializer_list<T> channels) {
-        punsubscribe(channels.begin(), channels.end());
-    }
-
-    void consume();
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    explicit Subscriber(Connection connection);
-
-    MsgType _msg_type(redisReply *reply) const;
-
-    void _check_connection();
-
-    void _handle_message(redisReply &reply);
-
-    void _handle_pmessage(redisReply &reply);
-
-    void _handle_meta(MsgType type, redisReply &reply);
-
-    using MsgCallback = std::function<void (std::string channel, std::string msg)>;
-
-    using PatternMsgCallback = std::function<void (std::string pattern,
-                                                    std::string channel,
-                                                    std::string msg)>;
-
-    using MetaCallback = std::function<void (MsgType type,
-                                                OptionalString channel,
-                                                long long num)>;
-
-    using TypeIndex = std::unordered_map<std::string, MsgType>;
-    static const TypeIndex _msg_type_index;
-
-    Connection _connection;
-
-    MsgCallback _msg_callback = nullptr;
-
-    PatternMsgCallback _pmsg_callback = nullptr;
-
-    MetaCallback _meta_callback = nullptr;
-};
-
-template <typename MsgCb>
-void Subscriber::on_message(MsgCb msg_callback) {
-    _msg_callback = msg_callback;
-}
-
-template <typename PMsgCb>
-void Subscriber::on_pmessage(PMsgCb pmsg_callback) {
-    _pmsg_callback = pmsg_callback;
-}
-
-template <typename MetaCb>
-void Subscriber::on_meta(MetaCb meta_callback) {
-    _meta_callback = meta_callback;
-}
-
-template <typename Input>
-void Subscriber::subscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::subscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::unsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::unsubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::psubscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::psubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::punsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::punsubscribe_range(_connection, first, last);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/transaction.cpp b/ext/redis-plus-plus-1.1.1/src/sw/redis++/transaction.cpp
deleted file mode 100644
index faa1bd178..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/transaction.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "transaction.h"
-#include "command.h"
-
-namespace sw {
-
-namespace redis {
-
-std::vector<ReplyUPtr> TransactionImpl::exec(Connection &connection, std::size_t cmd_num) {
-    _close_transaction();
-
-    _get_queued_replies(connection, cmd_num);
-
-    return _exec(connection);
-}
-
-void TransactionImpl::discard(Connection &connection, std::size_t cmd_num) {
-    _close_transaction();
-
-    _get_queued_replies(connection, cmd_num);
-
-    _discard(connection);
-}
-
-void TransactionImpl::_open_transaction(Connection &connection) {
-    assert(!_in_transaction);
-
-    cmd::multi(connection);
-    auto reply = connection.recv();
-    auto status = reply::to_status(*reply);
-    if (status != "OK") {
-        throw Error("Failed to open transaction: " + status);
-    }
-
-    _in_transaction = true;
-}
-
-void TransactionImpl::_close_transaction() {
-    if (!_in_transaction) {
-        throw Error("No command in transaction");
-    }
-
-    _in_transaction = false;
-}
-
-void TransactionImpl::_get_queued_reply(Connection &connection) {
-    auto reply = connection.recv();
-    auto status = reply::to_status(*reply);
-    if (status != "QUEUED") {
-        throw Error("Invalid QUEUED reply: " + status);
-    }
-}
-
-void TransactionImpl::_get_queued_replies(Connection &connection, std::size_t cmd_num) {
-    if (_piped) {
-        // Get all QUEUED reply
-        while (cmd_num > 0) {
-            _get_queued_reply(connection);
-
-            --cmd_num;
-        }
-    }
-}
-
-std::vector<ReplyUPtr> TransactionImpl::_exec(Connection &connection) {
-    cmd::exec(connection);
-
-    auto reply = connection.recv();
-
-    if (reply::is_nil(*reply)) {
-        // Execution has been aborted, i.e. watched key has been modified.
-        throw WatchError();
-    }
-
-    if (!reply::is_array(*reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply->element == nullptr || reply->elements == 0) {
-        // Since we don't allow EXEC without any command, this ARRAY reply
-        // should NOT be null or empty.
-        throw ProtoError("Null ARRAY reply");
-    }
-
-    std::vector<ReplyUPtr> replies;
-    for (std::size_t idx = 0; idx != reply->elements; ++idx) {
-        auto *sub_reply = reply->element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null sub reply");
-        }
-
-        auto r = ReplyUPtr(sub_reply);
-        reply->element[idx] = nullptr;
-        replies.push_back(std::move(r));
-    }
-
-    return replies;
-}
-
-void TransactionImpl::_discard(Connection &connection) {
-    cmd::discard(connection);
-    auto reply = connection.recv();
-    reply::parse<void>(*reply);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/transaction.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/transaction.h
deleted file mode 100644
index f19f24889..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/transaction.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-#define SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class TransactionImpl {
-public:
-    explicit TransactionImpl(bool piped) : _piped(piped) {}
-
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args);
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t cmd_num);
-
-private:
-    void _open_transaction(Connection &connection);
-
-    void _close_transaction();
-
-    void _get_queued_reply(Connection &connection);
-
-    void _get_queued_replies(Connection &connection, std::size_t cmd_num);
-
-    std::vector<ReplyUPtr> _exec(Connection &connection);
-
-    void _discard(Connection &connection);
-
-    bool _in_transaction = false;
-
-    bool _piped;
-};
-
-template <typename Cmd, typename ...Args>
-void TransactionImpl::command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    if (!_in_transaction) {
-        _open_transaction(connection);
-    }
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    if (!_piped) {
-        _get_queued_reply(connection);
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TRANSACTION_H
diff --git a/ext/redis-plus-plus-1.1.1/src/sw/redis++/utils.h b/ext/redis-plus-plus-1.1.1/src/sw/redis++/utils.h
deleted file mode 100644
index e29e64e14..000000000
--- a/ext/redis-plus-plus-1.1.1/src/sw/redis++/utils.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_UTILS_H
-
-#include <cstring>
-#include <string>
-#include <type_traits>
-
-namespace sw {
-
-namespace redis {
-
-// By now, not all compilers support std::string_view,
-// so we make our own implementation.
-class StringView {
-public:
-    constexpr StringView() noexcept = default;
-
-    constexpr StringView(const char *data, std::size_t size) : _data(data), _size(size) {}
-
-    StringView(const char *data) : _data(data), _size(std::strlen(data)) {}
-
-    StringView(const std::string &str) : _data(str.data()), _size(str.size()) {}
-
-    constexpr StringView(const StringView &) noexcept = default;
-
-    StringView& operator=(const StringView &) noexcept = default;
-
-    constexpr const char* data() const noexcept {
-        return _data;
-    }
-
-    constexpr std::size_t size() const noexcept {
-        return _size;
-    }
-
-private:
-    const char *_data = nullptr;
-    std::size_t _size = 0;
-};
-
-template <typename T>
-class Optional {
-public:
-    Optional() = default;
-
-    Optional(const Optional &) = default;
-    Optional& operator=(const Optional &) = default;
-
-    Optional(Optional &&) = default;
-    Optional& operator=(Optional &&) = default;
-
-    ~Optional() = default;
-
-    template <typename ...Args>
-    explicit Optional(Args &&...args) : _value(true, T(std::forward<Args>(args)...)) {}
-
-    explicit operator bool() const {
-        return _value.first;
-    }
-
-    T& value() {
-        return _value.second;
-    }
-
-    const T& value() const {
-        return _value.second;
-    }
-
-    T* operator->() {
-        return &(_value.second);
-    }
-
-    const T* operator->() const {
-        return &(_value.second);
-    }
-
-    T& operator*() {
-        return _value.second;
-    }
-
-    const T& operator*() const {
-        return _value.second;
-    }
-
-private:
-    std::pair<bool, T> _value;
-};
-
-using OptionalString = Optional<std::string>;
-
-using OptionalLongLong = Optional<long long>;
-
-using OptionalDouble = Optional<double>;
-
-using OptionalStringPair = Optional<std::pair<std::string, std::string>>;
-
-template <typename ...>
-struct IsKvPair : std::false_type {};
-
-template <typename T, typename U>
-struct IsKvPair<std::pair<T, U>> : std::true_type {};
-
-template <typename ...>
-using Void = void;
-
-template <typename T, typename U = Void<>>
-struct IsInserter : std::false_type {};
-
-template <typename T>
-//struct IsInserter<T, Void<typename T::container_type>> : std::true_type {};
-struct IsInserter<T,
-    typename std::enable_if<!std::is_void<typename T::container_type>::value>::type>
-        : std::true_type {};
-
-template <typename Iter, typename T = Void<>>
-struct IterType {
-    using type = typename std::iterator_traits<Iter>::value_type;
-};
-
-template <typename Iter>
-//struct IterType<Iter, Void<typename Iter::container_type>> {
-struct IterType<Iter,
-    //typename std::enable_if<std::is_void<typename Iter::value_type>::value>::type> {
-    typename std::enable_if<IsInserter<Iter>::value>::type> {
-    using type = typename std::decay<typename Iter::container_type::value_type>::type;
-};
-
-template <typename Iter, typename T = Void<>>
-struct IsIter : std::false_type {};
-
-template <typename Iter>
-struct IsIter<Iter, typename std::enable_if<IsInserter<Iter>::value>::type> : std::true_type {};
-
-template <typename Iter>
-//struct IsIter<Iter, Void<typename std::iterator_traits<Iter>::iterator_category>>
-struct IsIter<Iter,
-    typename std::enable_if<!std::is_void<
-        typename std::iterator_traits<Iter>::value_type>::value>::type>
-            : std::integral_constant<bool, !std::is_convertible<Iter, StringView>::value> {};
-
-template <typename T>
-struct IsKvPairIter : IsKvPair<typename IterType<T>::type> {};
-
-template <typename T, typename Tuple>
-struct TupleWithType : std::false_type {};
-
-template <typename T>
-struct TupleWithType<T, std::tuple<>> : std::false_type {};
-
-template <typename T, typename U, typename ...Args>
-struct TupleWithType<T, std::tuple<U, Args...>> : TupleWithType<T, std::tuple<Args...>> {};
-
-template <typename T, typename ...Args>
-struct TupleWithType<T, std::tuple<T, Args...>> : std::true_type {};
-
-template <std::size_t ...Is>
-struct IndexSequence {};
-
-template <std::size_t I, std::size_t ...Is>
-struct MakeIndexSequence : MakeIndexSequence<I - 1, I - 1, Is...> {};
-
-template <std::size_t ...Is>
-struct MakeIndexSequence<0, Is...> : IndexSequence<Is...> {};
-
-// NthType and NthValue are taken from
-// https://stackoverflow.com/questions/14261183
-template <std::size_t I, typename ...Args>
-struct NthType {};
-
-template <typename Arg, typename ...Args>
-struct NthType<0, Arg, Args...> {
-    using type = Arg;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-struct NthType<I, Arg, Args...> {
-    using type = typename NthType<I - 1, Args...>::type;
-};
-
-template <typename ...Args>
-struct LastType {
-    using type = typename NthType<sizeof...(Args) - 1, Args...>::type;
-};
-
-struct InvalidLastType {};
-
-template <>
-struct LastType<> {
-    using type = InvalidLastType;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&arg, Args &&...)
-    -> typename std::enable_if<(I == 0), decltype(std::forward<Arg>(arg))>::type {
-    return std::forward<Arg>(arg);
-}
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&, Args &&...args)
-    -> typename std::enable_if<(I > 0),
-            decltype(std::forward<typename NthType<I, Arg, Args...>::type>(
-                    std::declval<typename NthType<I, Arg, Args...>::type>()))>::type {
-    return std::forward<typename NthType<I, Arg, Args...>::type>(
-            NthValue<I - 1>(std::forward<Args>(args)...));
-}
-
-template <typename ...Args>
-auto LastValue(Args &&...args)
-    -> decltype(std::forward<typename LastType<Args...>::type>(
-            std::declval<typename LastType<Args...>::type>())) {
-    return std::forward<typename LastType<Args...>::type>(
-            NthValue<sizeof...(Args) - 1>(std::forward<Args>(args)...));
-}
-
-template <typename T, typename = Void<>>
-struct HasPushBack : std::false_type {};
-
-template <typename T>
-struct HasPushBack<T,
-    typename std::enable_if<
-        std::is_void<decltype(
-            std::declval<T>().push_back(std::declval<typename T::value_type>())
-                )>::value>::type> : std::true_type {};
-
-template <typename T, typename = Void<>>
-struct HasInsert : std::false_type {};
-
-template <typename T>
-struct HasInsert<T,
-    typename std::enable_if<
-        std::is_same<
-            decltype(std::declval<T>().insert(std::declval<typename T::const_iterator>(),
-                                                std::declval<typename T::value_type>())),
-            typename T::iterator>::value>::type> : std::true_type {};
-
-template <typename T>
-struct IsSequenceContainer
-    : std::integral_constant<bool,
-        HasPushBack<T>::value
-            && !std::is_same<typename std::decay<T>::type, std::string>::value> {};
-
-template <typename T>
-struct IsAssociativeContainer
-    : std::integral_constant<bool,
-        HasInsert<T>::value && !HasPushBack<T>::value> {};
-
-uint16_t crc16(const char *buf, int len);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_UTILS_H
diff --git a/ext/redis-plus-plus-1.1.1/test/CMakeLists.txt b/ext/redis-plus-plus-1.1.1/test/CMakeLists.txt
deleted file mode 100644
index 861e6ff88..000000000
--- a/ext/redis-plus-plus-1.1.1/test/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-project(test_redis++)
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    cmake_minimum_required(VERSION 3.0.0)
-else()
-    cmake_minimum_required(VERSION 2.8.0)
-endif()
-
-set(PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src/sw/redis++)
-
-file(GLOB PROJECT_SOURCE_FILES "${PROJECT_SOURCE_DIR}/*.cpp")
-
-add_executable(${PROJECT_NAME} ${PROJECT_SOURCE_FILES})
-
-# hiredis dependency
-find_path(HIREDIS_HEADER hiredis)
-target_include_directories(${PROJECT_NAME} PUBLIC ${HIREDIS_HEADER})
-
-find_library(HIREDIS_STATIC_LIB libhiredis.a)
-target_link_libraries(${PROJECT_NAME} ${HIREDIS_STATIC_LIB})
-
-# redis++ dependency
-target_include_directories(${PROJECT_NAME} PUBLIC ../src)
-set(REDIS_PLUS_PLUS_LIB ${CMAKE_CURRENT_BINARY_DIR}/../lib/libredis++.a)
-
-## solaris socket dependency
-IF (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)" )
-    target_link_libraries(${PROJECT_NAME} -lsocket)
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)" )
-
-find_package(Threads REQUIRED)
-
-target_link_libraries(${PROJECT_NAME} ${REDIS_PLUS_PLUS_LIB} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/benchmark_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/benchmark_test.h
deleted file mode 100644
index 309bc6863..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/benchmark_test.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-struct BenchmarkOptions {
-    std::size_t pool_size = 5;
-    std::size_t thread_num = 10;
-    std::size_t total_request_num = 100000;
-    std::size_t key_len = 10;
-    std::size_t val_len = 10;
-};
-
-template <typename RedisInstance>
-class BenchmarkTest {
-public:
-    BenchmarkTest(const BenchmarkOptions &opts, RedisInstance &instance);
-
-    ~BenchmarkTest() {
-        _cleanup();
-    }
-
-    void run();
-
-private:
-    template <typename Func>
-    void _run(const std::string &title, Func &&func);
-
-    template <typename Func>
-    std::size_t _run(Func &&func, std::size_t request_num);
-
-    void _test_get();
-
-    std::vector<std::string> _gen_keys() const;
-
-    std::string _gen_value() const;
-
-    void _cleanup();
-
-    const std::string& _key(std::size_t idx) const {
-        return _keys[idx % _keys.size()];
-    }
-
-    BenchmarkOptions _opts;
-
-    RedisInstance &_redis;
-
-    std::vector<std::string> _keys;
-
-    std::string _value;
-};
-
-}
-
-}
-
-}
-
-#include "benchmark_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/benchmark_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/benchmark_test.hpp
deleted file mode 100644
index eaf50ec50..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/benchmark_test.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_HPP
-
-#include <chrono>
-#include <random>
-#include <future>
-#include <algorithm>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-BenchmarkTest<RedisInstance>::BenchmarkTest(const BenchmarkOptions &opts,
-        RedisInstance &instance) : _opts(opts), _redis(instance) {
-    REDIS_ASSERT(_opts.pool_size > 0
-            && _opts.thread_num > 0
-            && _opts.total_request_num > 0
-            && _opts.key_len > 0
-            && _opts.val_len > 0,
-                "Invalid benchmark test options.");
-
-    _keys = _gen_keys();
-    _value = _gen_value();
-}
-
-template <typename RedisInstance>
-void BenchmarkTest<RedisInstance>::run() {
-    _cleanup();
-
-    _run("SET key value", [this](std::size_t idx) { this->_redis.set(this->_key(idx), _value); });
-
-    _run("GET key", [this](std::size_t idx) {
-                        auto res = this->_redis.get(this->_key(idx));
-                        (void)res;
-                    });
-
-    _cleanup();
-
-    _run("LPUSH key value", [this](std::size_t idx) {
-                                this->_redis.lpush(this->_key(idx), _value);
-                            });
-
-    _run("LRANGE key 0 10", [this](std::size_t idx) {
-                std::vector<std::string> res;
-                res.reserve(10);
-                this->_redis.lrange(this->_key(idx), 0, 10, std::back_inserter(res));
-            });
-
-    _run("LPOP key", [this](std::size_t idx) {
-                        auto res = this->_redis.lpop(this->_key(idx));
-                        (void)res;
-                     });
-
-    _cleanup();
-
-    _run("INCR key", [this](std::size_t idx) {
-                        auto num = this->_redis.incr(this->_key(idx));
-                        (void)num;
-                     });
-
-    _cleanup();
-
-    _run("SADD key member", [this](std::size_t idx) {
-                                auto num = this->_redis.sadd(this->_key(idx), _value);
-                                (void)num;
-                            });
-
-    _run("SPOP key", [this](std::size_t idx) {
-                        auto res = this->_redis.spop(this->_key(idx));
-                        (void)res;
-                     });
-
-    _cleanup();
-}
-
-template <typename RedisInstance>
-template <typename Func>
-void BenchmarkTest<RedisInstance>::_run(const std::string &title, Func &&func) {
-    auto thread_num = _opts.thread_num;
-    auto requests_per_thread = _opts.total_request_num / thread_num;
-    auto total_request_num = requests_per_thread * thread_num;
-    std::vector<std::future<std::size_t>> res;
-    res.reserve(thread_num);
-    res.push_back(std::async(std::launch::async,
-                    [this](Func &&func, std::size_t request_num) {
-                        return this->_run(std::forward<Func>(func), request_num);
-                    },
-                    std::forward<Func>(func),
-                    requests_per_thread));
-
-    auto total_in_msec = 0;
-    for (auto &fut : res) {
-        total_in_msec += fut.get();
-    }
-
-    auto total_in_sec = total_in_msec * 1.0 / 1000;
-
-    auto avg = total_in_msec * 1.0 / total_request_num;
-
-    auto ops = static_cast<std::size_t>(1000 / avg);
-
-    std::cout << "-----" << title << "-----" << std::endl;
-    std::cout << total_request_num << " requests cost " << total_in_sec << " seconds" << std::endl;
-    std::cout << ops << " requests per second" << std::endl;
-}
-
-template <typename RedisInstance>
-template <typename Func>
-std::size_t BenchmarkTest<RedisInstance>::_run(Func &&func, std::size_t request_num) {
-    auto start = std::chrono::steady_clock::now();
-
-    for (auto idx = 0U; idx != request_num; ++idx) {
-        func(idx);
-    }
-
-    auto stop = std::chrono::steady_clock::now();
-
-    return std::chrono::duration_cast<std::chrono::milliseconds>(stop - start).count();
-}
-
-template <typename RedisInstance>
-std::vector<std::string> BenchmarkTest<RedisInstance>::_gen_keys() const {
-    const auto KEY_NUM = 100;
-    std::vector<std::string> res;
-    res.reserve(KEY_NUM);
-    std::default_random_engine engine(std::random_device{}());
-    std::uniform_int_distribution<int> uniform_dist(0, 255);
-    for (auto i = 0; i != KEY_NUM; ++i) {
-        std::string str;
-        str.reserve(_opts.key_len);
-        for (std::size_t j = 0; j != _opts.key_len; ++j) {
-            str.push_back(static_cast<char>(uniform_dist(engine)));
-        }
-        res.push_back(str);
-    }
-
-    return res;
-}
-
-template <typename RedisInstance>
-std::string BenchmarkTest<RedisInstance>::_gen_value() const {
-    return std::string(_opts.val_len, 'x');
-}
-
-template <typename RedisInstance>
-void BenchmarkTest<RedisInstance>::_cleanup() {
-    for (const auto &key : _keys) {
-        _redis.del(key);
-    }
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/connection_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/connection_cmds_test.h
deleted file mode 100644
index 2127257c3..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/connection_cmds_test.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ConnectionCmdTest {
-public:
-    explicit ConnectionCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _run(Redis &redis);
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "connection_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/connection_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/connection_cmds_test.hpp
deleted file mode 100644
index 90e7c313b..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/connection_cmds_test.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_HPP
-
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ConnectionCmdTest<RedisInstance>::run() {
-    cluster_specializing_test(*this, &ConnectionCmdTest<RedisInstance>::_run, _redis);
-}
-
-template <typename RedisInstance>
-void ConnectionCmdTest<RedisInstance>::_run(Redis &instance) {
-    auto message = std::string("hello");
-
-    REDIS_ASSERT(instance.echo(message) == message, "failed to test echo");
-
-    REDIS_ASSERT(instance.ping() == "PONG", "failed to test ping");
-
-    REDIS_ASSERT(instance.ping(message) == message, "failed to test ping");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/geo_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/geo_cmds_test.h
deleted file mode 100644
index 41b9795fa..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/geo_cmds_test.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class GeoCmdTest {
-public:
-    explicit GeoCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "geo_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/geo_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/geo_cmds_test.hpp
deleted file mode 100644
index 866fafe10..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/geo_cmds_test.hpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_HPP
-
-#include <vector>
-#include <tuple>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void GeoCmdTest<RedisInstance>::run() {
-    auto key = test_key("geo");
-    auto dest = test_key("dest");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key, dest});
-
-    auto members = {
-        std::make_tuple("m1", 10.0, 11.0),
-        std::make_tuple("m2", 10.1, 11.1),
-        std::make_tuple("m3", 10.2, 11.2)
-    };
-
-    REDIS_ASSERT(_redis.geoadd(key, std::make_tuple("m1", 10.0, 11.0)) == 1,
-            "failed to test geoadd");
-    REDIS_ASSERT(_redis.geoadd(key, members) == 2, "failed to test geoadd");
-
-    auto dist = _redis.geodist(key, "m1", "m4", GeoUnit::KM);
-    REDIS_ASSERT(!dist, "failed to test geodist with nonexistent member");
-
-    std::vector<OptionalString> hashes;
-    _redis.geohash(key, {"m1", "m4"}, std::back_inserter(hashes));
-    REDIS_ASSERT(hashes.size() == 2, "failed to test geohash");
-    REDIS_ASSERT(bool(hashes[0]) && *(hashes[0]) == "s1zned3z8u0" && !(hashes[1]),
-            "failed to test geohash");
-    hashes.clear();
-    _redis.geohash(key, {"m4"}, std::back_inserter(hashes));
-    REDIS_ASSERT(hashes.size() == 1 && !(hashes[0]), "failed to test geohash");
-
-    std::vector<Optional<std::pair<double, double>>> pos;
-    _redis.geopos(key, {"m4"}, std::back_inserter(pos));
-    REDIS_ASSERT(pos.size() == 1 && !(pos[0]), "failed to test geopos");
-
-    auto num = _redis.georadius(key,
-                                std::make_pair(10.1, 11.1),
-                                100,
-                                GeoUnit::KM,
-                                dest,
-                                false,
-                                10);
-    REDIS_ASSERT(bool(num) && *num == 3, "failed to test georadius with store option");
-
-    std::vector<std::string> mems;
-    _redis.georadius(key,
-                    std::make_pair(10.1, 11.1),
-                    100,
-                    GeoUnit::KM,
-                    10,
-                    true,
-                    std::back_inserter(mems));
-    REDIS_ASSERT(mems.size() == 3, "failed to test georadius with no option");
-
-    std::vector<std::tuple<std::string, double>> with_dist;
-    _redis.georadius(key,
-                    std::make_pair(10.1, 11.1),
-                    100,
-                    GeoUnit::KM,
-                    10,
-                    true,
-                    std::back_inserter(with_dist));
-    REDIS_ASSERT(with_dist.size() == 3, "failed to test georadius with dist");
-
-    std::vector<std::tuple<std::string, double, std::pair<double, double>>> with_dist_coord;
-    _redis.georadius(key,
-                    std::make_pair(10.1, 11.1),
-                    100,
-                    GeoUnit::KM,
-                    10,
-                    true,
-                    std::back_inserter(with_dist_coord));
-    REDIS_ASSERT(with_dist_coord.size() == 3, "failed to test georadius with dist and coord");
-
-    num = _redis.georadiusbymember(key,
-                                    "m1",
-                                    100,
-                                    GeoUnit::KM,
-                                    dest,
-                                    false,
-                                    10);
-    REDIS_ASSERT(bool(num) && *num == 3, "failed to test georadiusbymember with store option");
-
-    mems.clear();
-    _redis.georadiusbymember(key,
-                            "m1",
-                            100,
-                            GeoUnit::KM,
-                            10,
-                            true,
-                            std::back_inserter(mems));
-    REDIS_ASSERT(mems.size() == 3, "failed to test georadiusbymember with no option");
-
-    with_dist.clear();
-    _redis.georadiusbymember(key,
-                            "m1",
-                            100,
-                            GeoUnit::KM,
-                            10,
-                            true,
-                            std::back_inserter(with_dist));
-    REDIS_ASSERT(with_dist.size() == 3, "failed to test georadiusbymember with dist");
-
-    with_dist_coord.clear();
-    _redis.georadiusbymember(key,
-                            "m1",
-                            100,
-                            GeoUnit::KM,
-                            10,
-                            true,
-                            std::back_inserter(with_dist_coord));
-    REDIS_ASSERT(with_dist_coord.size() == 3,
-            "failed to test georadiusbymember with dist and coord");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hash_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hash_cmds_test.h
deleted file mode 100644
index 60791c8b9..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hash_cmds_test.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class HashCmdTest {
-public:
-    explicit HashCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_hash();
-
-    void _test_hash_batch();
-
-    void _test_numeric();
-
-    void _test_hscan();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "hash_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hash_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hash_cmds_test.hpp
deleted file mode 100644
index 42c309f4e..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hash_cmds_test.hpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_HPP
-
-#include <unordered_map>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::run() {
-    _test_hash();
-
-    _test_hash_batch();
-
-    _test_numeric();
-
-    _test_hscan();
-}
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::_test_hash() {
-    auto key = test_key("hash");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto f1 = std::string("f1");
-    auto v1 = std::string("v1");
-    auto f2 = std::string("f2");
-    auto v2 = std::string("v2");
-    auto f3 = std::string("f3");
-    auto v3 = std::string("v3");
-
-    REDIS_ASSERT(_redis.hset(key, f1, v1), "failed to test hset");
-    REDIS_ASSERT(!_redis.hset(key, f1, v2), "failed to test hset with exist field");
-
-    auto res = _redis.hget(key, f1);
-    REDIS_ASSERT(res && *res == v2, "failed to test hget");
-
-    REDIS_ASSERT(_redis.hsetnx(key, f2, v1), "failed to test hsetnx");
-    REDIS_ASSERT(!_redis.hsetnx(key, f2, v2), "failed to test hsetnx with exist field");
-
-    res = _redis.hget(key, f2);
-    REDIS_ASSERT(res && *res == v1, "failed to test hget");
-
-    REDIS_ASSERT(!_redis.hexists(key, f3), "failed to test hexists");
-    REDIS_ASSERT(_redis.hset(key, std::make_pair(f3, v3)), "failed to test hset");
-    REDIS_ASSERT(_redis.hexists(key, f3), "failed to test hexists");
-
-    REDIS_ASSERT(_redis.hlen(key) == 3, "failed to test hlen");
-    REDIS_ASSERT(_redis.hstrlen(key, f1) == static_cast<long long>(v1.size()),
-            "failed to test hstrlen");
-
-    REDIS_ASSERT(_redis.hdel(key, f1) == 1, "failed to test hdel");
-    REDIS_ASSERT(_redis.hdel(key, {f1, f2, f3}) == 2, "failed to test hdel range");
-}
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::_test_hash_batch() {
-    auto key = test_key("hash");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto f1 = std::string("f1");
-    auto v1 = std::string("v1");
-    auto f2 = std::string("f2");
-    auto v2 = std::string("v2");
-    auto f3 = std::string("f3");
-
-    _redis.hmset(key, {std::make_pair(f1, v1),
-                        std::make_pair(f2, v2)});
-
-    std::vector<std::string> fields;
-    _redis.hkeys(key, std::back_inserter(fields));
-    REDIS_ASSERT(fields.size() == 2, "failed to test hkeys");
-
-    std::vector<std::string> vals;
-    _redis.hvals(key, std::back_inserter(vals));
-    REDIS_ASSERT(vals.size() == 2, "failed to test hvals");
-
-    std::unordered_map<std::string, std::string> items;
-    _redis.hgetall(key, std::inserter(items, items.end()));
-    REDIS_ASSERT(items.size() == 2 && items[f1] == v1 && items[f2] == v2,
-            "failed to test hgetall");
-
-    std::vector<std::pair<std::string, std::string>> item_vec;
-    _redis.hgetall(key, std::back_inserter(item_vec));
-    REDIS_ASSERT(item_vec.size() == 2, "failed to test hgetall");
-
-    std::vector<OptionalString> res;
-    _redis.hmget(key, {f1, f2, f3}, std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 3
-            && bool(res[0]) && *(res[0]) == v1
-            && bool(res[1]) && *(res[1]) == v2
-            && !res[2],
-                "failed to test hmget");
-}
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::_test_numeric() {
-    auto key = test_key("numeric");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto field = "field";
-
-    REDIS_ASSERT(_redis.hincrby(key, field, 1) == 1, "failed to test hincrby");
-    REDIS_ASSERT(_redis.hincrby(key, field, -1) == 0, "failed to test hincrby");
-    REDIS_ASSERT(_redis.hincrbyfloat(key, field, 1.5) == 1.5, "failed to test hincrbyfloat");
-}
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::_test_hscan() {
-    auto key = test_key("hscan");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto items = std::unordered_map<std::string, std::string>{
-        std::make_pair("f1", "v1"),
-        std::make_pair("f2", "v2"),
-        std::make_pair("f3", "v3"),
-    };
-
-    _redis.hmset(key, items.begin(), items.end());
-
-    std::unordered_map<std::string, std::string> item_map;
-    auto cursor = 0;
-    while (true) {
-        cursor = _redis.hscan(key, cursor, "f*", 2, std::inserter(item_map, item_map.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-
-    REDIS_ASSERT(item_map == items, "failed to test hscan with pattern and count");
-
-    std::vector<std::pair<std::string, std::string>> item_vec;
-    cursor = 0;
-    while (true) {
-        cursor = _redis.hscan(key, cursor, std::back_inserter(item_vec));
-        if (cursor == 0) {
-            break;
-        }
-    }
-
-    REDIS_ASSERT(item_vec.size() == items.size(), "failed to test hscan");
-    for (const auto &ele : item_vec) {
-        REDIS_ASSERT(items.find(ele.first) != items.end(), "failed to test hscan");
-    }
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hyperloglog_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hyperloglog_cmds_test.h
deleted file mode 100644
index 50e454b23..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hyperloglog_cmds_test.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class HyperloglogCmdTest {
-public:
-    explicit HyperloglogCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "hyperloglog_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hyperloglog_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hyperloglog_cmds_test.hpp
deleted file mode 100644
index 09775255f..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/hyperloglog_cmds_test.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_HPP
-
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void HyperloglogCmdTest<RedisInstance>::run() {
-    auto k1 = test_key("k1");
-    auto k2 = test_key("k2");
-    auto k3 = test_key("k3");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {k1, k2, k3});
-
-    _redis.pfadd(k1, "a");
-    auto members1 = {"b", "c", "d", "e", "f", "g"};
-    _redis.pfadd(k1, members1);
-
-    auto cnt = _redis.pfcount(k1);
-    auto err = cnt * 1.0 / (1 + members1.size());
-    REDIS_ASSERT(err < 1.02 && err > 0.98, "failed to test pfadd and pfcount");
-
-    auto members2 = {"a", "b", "c", "h", "i", "j", "k"};
-    _redis.pfadd(k2, members2);
-    auto total = 1 + members1.size() + members2.size() - 3;
-
-    cnt = _redis.pfcount({k1, k2});
-    err = cnt * 1.0 / total;
-    REDIS_ASSERT(err < 1.02 && err > 0.98, "failed to test pfcount");
-
-    _redis.pfmerge(k3, {k1, k2});
-    cnt = _redis.pfcount(k3);
-    err = cnt * 1.0 / total;
-    REDIS_ASSERT(err < 1.02 && err > 0.98, "failed to test pfcount");
-
-    _redis.pfmerge(k3, k1);
-    REDIS_ASSERT(cnt == _redis.pfcount(k3), "failed to test pfmerge");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/keys_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/keys_cmds_test.h
deleted file mode 100644
index 54d25ca28..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/keys_cmds_test.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class KeysCmdTest {
-public:
-    explicit KeysCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_key();
-
-    void _test_randomkey(Redis &instance);
-
-    void _test_ttl();
-
-    void _test_scan(Redis &instance);
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "keys_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/keys_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/keys_cmds_test.hpp
deleted file mode 100644
index de21f8d18..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/keys_cmds_test.hpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_HPP
-
-#include <vector>
-#include <unordered_set>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::run() {
-    _test_key();
-
-    cluster_specializing_test(*this, &KeysCmdTest<RedisInstance>::_test_randomkey, _redis);
-
-    _test_ttl();
-
-    cluster_specializing_test(*this, &KeysCmdTest<RedisInstance>::_test_scan, _redis);
-}
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::_test_key() {
-    auto key = test_key("key");
-    auto dest = test_key("dest");
-    auto new_key_name = test_key("new-key");
-    auto not_exist_key = test_key("not-exist");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key, dest, new_key_name});
-
-    REDIS_ASSERT(_redis.exists(key) == 0, "failed to test exists");
-
-    auto val = std::string("val");
-    _redis.set(key, val);
-
-    REDIS_ASSERT(_redis.exists({key, not_exist_key}) == 1, "failed to test exists");
-
-    auto new_val = _redis.dump(key);
-    REDIS_ASSERT(bool(new_val), "failed to test dump");
-
-    _redis.restore(dest, *new_val, std::chrono::seconds(1000));
-
-    new_val = _redis.get(dest);
-    REDIS_ASSERT(bool(new_val) && *new_val == val, "failed to test dump and restore");
-
-    _redis.rename(dest, new_key_name);
-
-    bool not_exist = false;
-    try {
-        _redis.rename(not_exist_key, new_key_name);
-    } catch (const Error &e) {
-        not_exist = true;
-    }
-    REDIS_ASSERT(not_exist, "failed to test rename with nonexistent key");
-
-    REDIS_ASSERT(_redis.renamenx(new_key_name, dest), "failed to test renamenx");
-
-    REDIS_ASSERT(_redis.touch(not_exist_key) == 0, "failed to test touch");
-    REDIS_ASSERT(_redis.touch({key, dest, new_key_name}) == 2, "failed to test touch");
-
-    REDIS_ASSERT(_redis.type(key) == "string", "failed to test type");
-
-    REDIS_ASSERT(_redis.del({new_key_name, dest}) == 1, "failed to test del");
-    REDIS_ASSERT(_redis.unlink({new_key_name, key}) == 1, "failed to test unlink");
-}
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::_test_randomkey(Redis &instance) {
-    auto key = test_key("randomkey");
-
-    KeyDeleter<Redis> deleter(instance, key);
-
-    instance.set(key, "value");
-
-    auto rand_key = instance.randomkey();
-    REDIS_ASSERT(bool(rand_key), "failed to test randomkey");
-}
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::_test_ttl() {
-    using namespace std::chrono;
-
-    auto key = test_key("ttl");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    _redis.set(key, "val", seconds(100));
-    auto ttl = _redis.ttl(key);
-    REDIS_ASSERT(ttl > 0 && ttl <= 100, "failed to test ttl");
-
-    REDIS_ASSERT(_redis.persist(key), "failed to test persist");
-    ttl = _redis.ttl(key);
-    REDIS_ASSERT(ttl == -1, "failed to test ttl");
-
-    REDIS_ASSERT(_redis.expire(key, seconds(100)),
-            "failed to test expire");
-
-    auto tp = time_point_cast<seconds>(system_clock::now() + seconds(100));
-    REDIS_ASSERT(_redis.expireat(key, tp), "failed to test expireat");
-    ttl = _redis.ttl(key);
-    REDIS_ASSERT(ttl > 0, "failed to test expireat");
-
-    REDIS_ASSERT(_redis.pexpire(key, milliseconds(100000)), "failed to test expire");
-
-    auto pttl = _redis.pttl(key);
-    REDIS_ASSERT(pttl > 0 && pttl <= 100000, "failed to test pttl");
-
-    auto tp_milli = time_point_cast<milliseconds>(system_clock::now() + milliseconds(100000));
-    REDIS_ASSERT(_redis.pexpireat(key, tp_milli), "failed to test pexpireat");
-    pttl = _redis.pttl(key);
-    REDIS_ASSERT(pttl > 0, "failed to test pexpireat");
-}
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::_test_scan(Redis &instance) {
-    std::string key_pattern = "!@#$%^&()_+alseufoawhnlkszd";
-    auto k1 = test_key(key_pattern + "k1");
-    auto k2 = test_key(key_pattern + "k2");
-    auto k3 = test_key(key_pattern + "k3");
-
-    auto keys = {k1, k2, k3};
-
-    KeyDeleter<Redis> deleter(instance, keys);
-
-    instance.set(k1, "v");
-    instance.set(k2, "v");
-    instance.set(k3, "v");
-
-    auto cursor = 0;
-    std::unordered_set<std::string> res;
-    while (true) {
-        cursor = instance.scan(cursor, "*" + key_pattern + "*", 2, std::inserter(res, res.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-    REDIS_ASSERT(res == std::unordered_set<std::string>(keys),
-            "failed to test scan");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/list_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/list_cmds_test.h
deleted file mode 100644
index 2092fe9e4..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/list_cmds_test.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ListCmdTest {
-public:
-    explicit ListCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_lpoppush();
-
-    void _test_rpoppush();
-
-    void _test_list();
-
-    void _test_blocking();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "list_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/list_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/list_cmds_test.hpp
deleted file mode 100644
index fd26d8fde..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/list_cmds_test.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_HPP
-
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::run() {
-    _test_lpoppush();
-
-    _test_rpoppush();
-
-    _test_list();
-
-    _test_blocking();
-}
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::_test_lpoppush() {
-    auto key = test_key("lpoppush");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto item = _redis.lpop(key);
-    REDIS_ASSERT(!item, "failed to test lpop");
-
-    REDIS_ASSERT(_redis.lpushx(key, "1") == 0, "failed to test lpushx");
-    REDIS_ASSERT(_redis.lpush(key, "1") == 1, "failed to test lpush");
-    REDIS_ASSERT(_redis.lpushx(key, "2") == 2, "failed to test lpushx");
-    REDIS_ASSERT(_redis.lpush(key, {"3", "4", "5"}) == 5, "failed to test lpush");
-
-    item = _redis.lpop(key);
-    REDIS_ASSERT(item && *item == "5", "failed to test lpop");
-}
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::_test_rpoppush() {
-    auto key = test_key("rpoppush");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto item = _redis.rpop(key);
-    REDIS_ASSERT(!item, "failed to test rpop");
-
-    REDIS_ASSERT(_redis.rpushx(key, "1") == 0, "failed to test rpushx");
-    REDIS_ASSERT(_redis.rpush(key, "1") == 1, "failed to test rpush");
-    REDIS_ASSERT(_redis.rpushx(key, "2") == 2, "failed to test rpushx");
-    REDIS_ASSERT(_redis.rpush(key, {"3", "4", "5"}) == 5, "failed to test rpush");
-
-    item = _redis.rpop(key);
-    REDIS_ASSERT(item && *item == "5", "failed to test rpop");
-}
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::_test_list() {
-    auto key = test_key("list");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto item = _redis.lindex(key, 0);
-    REDIS_ASSERT(!item, "failed to test lindex");
-
-    _redis.lpush(key, {"1", "2", "3", "4", "5"});
-
-    REDIS_ASSERT(_redis.lrem(key, 0, "3") == 1, "failed to test lrem");
-
-    REDIS_ASSERT(_redis.linsert(key, InsertPosition::BEFORE, "2", "3") == 5,
-            "failed to test lindex");
-
-    REDIS_ASSERT(_redis.llen(key) == 5, "failed to test llen");
-
-    _redis.lset(key, 0, "6");
-    item = _redis.lindex(key, 0);
-    REDIS_ASSERT(item && *item == "6", "failed to test lindex");
-
-    _redis.ltrim(key, 0, 2);
-
-    std::vector<std::string> res;
-    _redis.lrange(key, 0, -1, std::back_inserter(res));
-    REDIS_ASSERT(res == std::vector<std::string>({"6", "4", "3"}), "failed to test ltrim");
-}
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::_test_blocking() {
-    auto k1 = test_key("k1");
-    auto k2 = test_key("k2");
-    auto k3 = test_key("k3");
-
-    auto keys = {k1, k2, k3};
-
-    KeyDeleter<RedisInstance> deleter(_redis, keys);
-
-    std::string val("value");
-    _redis.lpush(k1, val);
-
-    auto res = _redis.blpop(keys.begin(), keys.end());
-    REDIS_ASSERT(res && *res == std::make_pair(k1, val), "failed to test blpop");
-
-    res = _redis.brpop(keys, std::chrono::seconds(1));
-    REDIS_ASSERT(!res, "failed to test brpop with timeout");
-
-    _redis.lpush(k1, val);
-    res = _redis.blpop(k1);
-    REDIS_ASSERT(res && *res == std::make_pair(k1, val), "failed to test blpop");
-
-    res = _redis.blpop(k1, std::chrono::seconds(1));
-    REDIS_ASSERT(!res, "failed to test blpop with timeout");
-
-    _redis.lpush(k1, val);
-    res = _redis.brpop(k1);
-    REDIS_ASSERT(res && *res == std::make_pair(k1, val), "failed to test brpop");
-
-    res = _redis.brpop(k1, std::chrono::seconds(1));
-    REDIS_ASSERT(!res, "failed to test brpop with timeout");
-
-    auto str = _redis.brpoplpush(k2, k3, std::chrono::seconds(1));
-    REDIS_ASSERT(!str, "failed to test brpoplpush with timeout");
-
-    _redis.lpush(k2, val);
-    str = _redis.brpoplpush(k2, k3);
-    REDIS_ASSERT(str && *str == val, "failed to test brpoplpush");
-
-    str = _redis.rpoplpush(k3, k2);
-    REDIS_ASSERT(str && *str == val, "failed to test rpoplpush");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pipeline_transaction_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pipeline_transaction_test.h
deleted file mode 100644
index fc6b80dde..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pipeline_transaction_test.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class PipelineTransactionTest {
-public:
-    explicit PipelineTransactionTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    Pipeline _pipeline(const StringView &key);
-
-    Transaction _transaction(const StringView &key, bool piped);
-
-    void _test_pipeline(const StringView &key, Pipeline &pipe);
-
-    void _test_transaction(const StringView &key, Transaction &tx);
-
-    void _test_watch();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "pipeline_transaction_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pipeline_transaction_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pipeline_transaction_test.hpp
deleted file mode 100644
index 4e6a745cb..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pipeline_transaction_test.hpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_HPP
-
-#include <string>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::run() {
-    {
-        auto key = test_key("pipeline");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto pipe = _pipeline(key);
-        _test_pipeline(key, pipe);
-    }
-
-    {
-        auto key = test_key("transaction");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto tx = _transaction(key, true);
-        _test_transaction(key, tx);
-    }
-
-    {
-        auto key = test_key("transaction");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto tx = _transaction(key, false);
-        _test_transaction(key, tx);
-    }
-
-    _test_watch();
-}
-
-template <typename RedisInstance>
-Pipeline PipelineTransactionTest<RedisInstance>::_pipeline(const StringView &) {
-    return _redis.pipeline();
-}
-
-template <>
-inline Pipeline PipelineTransactionTest<RedisCluster>::_pipeline(const StringView &key) {
-    return _redis.pipeline(key);
-}
-
-template <typename RedisInstance>
-Transaction PipelineTransactionTest<RedisInstance>::_transaction(const StringView &, bool piped) {
-    return _redis.transaction(piped);
-}
-
-template <>
-inline Transaction PipelineTransactionTest<RedisCluster>::_transaction(const StringView &key,
-        bool piped) {
-    return _redis.transaction(key, piped);
-}
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::_test_pipeline(const StringView &key,
-        Pipeline &pipe) {
-    std::string val("value");
-    auto replies = pipe.set(key, val)
-                        .get(key)
-                        .strlen(key)
-                        .exec();
-
-    REDIS_ASSERT(replies.get<bool>(0), "failed to test pipeline with set operation");
-
-    auto new_val = replies.get<OptionalString>(1);
-    std::size_t len = replies.get<long long>(2);
-    REDIS_ASSERT(bool(new_val) && *new_val == val && len == val.size(),
-            "failed to test pipeline with string operations");
-
-    REDIS_ASSERT(reply::parse<bool>(replies.get(0)), "failed to test pipeline with set operation");
-
-    new_val = reply::parse<OptionalString>(replies.get(1));
-    len = reply::parse<long long>(replies.get(2));
-    REDIS_ASSERT(bool(new_val) && *new_val == val && len == val.size(),
-            "failed to test pipeline with string operations");
-}
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::_test_transaction(const StringView &key,
-        Transaction &tx) {
-    std::unordered_map<std::string, std::string> m = {
-        std::make_pair("f1", "v1"),
-        std::make_pair("f2", "v2"),
-        std::make_pair("f3", "v3")
-    };
-    auto replies = tx.hmset(key, m.begin(), m.end())
-                        .hgetall(key)
-                        .hdel(key, "f1")
-                        .exec();
-
-    replies.get<void>(0);
-
-    decltype(m) mm;
-    replies.get(1, std::inserter(mm, mm.end()));
-    REDIS_ASSERT(mm == m, "failed to test transaction");
-
-    REDIS_ASSERT(replies.get<long long>(2) == 1, "failed to test transaction");
-
-    tx.set(key, "value")
-        .get(key)
-        .incr(key);
-
-    tx.discard();
-
-    replies = tx.del(key)
-                .set(key, "value")
-                .exec();
-
-    REDIS_ASSERT(replies.get<long long>(0) == 1, "failed to test transaction");
-
-    REDIS_ASSERT(replies.get<bool>(1), "failed to test transaction");
-}
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::_test_watch() {
-    auto key = test_key("watch");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    {
-        auto tx = _transaction(key, false);
-
-        auto redis = tx.redis();
-
-        redis.watch(key);
-
-        auto replies = tx.set(key, "1").get(key).exec();
-
-        REDIS_ASSERT(replies.size() == 2
-                && replies.template get<bool>(0) == true, "failed to test watch");
-
-        auto val = replies.template get<sw::redis::OptionalString>(1);
-
-        REDIS_ASSERT(val && *val == "1", "failed to test watch");
-    }
-
-    try {
-        auto tx = _transaction(key, false);
-
-        auto redis = tx.redis();
-
-        redis.watch(key);
-
-        // Key has been modified by other client.
-        _redis.set(key, "val");
-
-        // Transaction should fail, and throw WatchError
-        tx.set(key, "1").exec();
-
-        REDIS_ASSERT(false, "failed to test watch");
-    } catch (const sw::redis::WatchError &err) {
-        // Catch the error.
-    }
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pubsub_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pubsub_test.h
deleted file mode 100644
index f816eaecc..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pubsub_test.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class PubSubTest {
-public:
-    explicit PubSubTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_sub_channel();
-
-    void _test_sub_pattern();
-
-    void _test_unsubscribe();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "pubsub_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pubsub_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pubsub_test.hpp
deleted file mode 100644
index 4530c0788..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/pubsub_test.hpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_HPP
-
-#include <unordered_map>
-#include <unordered_set>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void PubSubTest<RedisInstance>::run() {
-    _test_sub_channel();
-
-    _test_sub_pattern();
-
-    _test_unsubscribe();
-}
-
-template <typename RedisInstance>
-void PubSubTest<RedisInstance>::_test_sub_channel() {
-    auto sub = _redis.subscriber();
-
-    auto msgs = {"msg1", "msg2"};
-    auto channel1 = test_key("c1");
-    sub.on_message([&msgs, &channel1](std::string channel, std::string msg) {
-                        static std::size_t idx = 0;
-                        REDIS_ASSERT(channel == channel1 && msg == *(msgs.begin() + idx),
-                                        "failed to test subscribe");
-                        ++idx;
-                    });
-
-    sub.subscribe(channel1);
-
-    // Consume the SUBSCRIBE message.
-    sub.consume();
-
-    for (const auto &msg : msgs) {
-        _redis.publish(channel1, msg);
-        sub.consume();
-    }
-
-    sub.unsubscribe(channel1);
-
-    // Consume the UNSUBSCRIBE message.
-    sub.consume();
-
-    auto channel2 = test_key("c2");
-    auto channel3 = test_key("c3");
-    auto channel4 = test_key("c4");
-    std::unordered_set<std::string> channels;
-    sub.on_meta([&channels](Subscriber::MsgType type,
-                            OptionalString channel,
-                            long long num) {
-                    REDIS_ASSERT(bool(channel), "failed to test subscribe");
-
-                    if (type == Subscriber::MsgType::SUBSCRIBE) {
-                        auto iter = channels.find(*channel);
-                        REDIS_ASSERT(iter == channels.end(), "failed to test subscribe");
-                        channels.insert(*channel);
-                        REDIS_ASSERT(static_cast<std::size_t>(num) == channels.size(),
-                                        "failed to test subscribe");
-                    } else if (type == Subscriber::MsgType::UNSUBSCRIBE) {
-                        auto iter = channels.find(*channel);
-                        REDIS_ASSERT(iter != channels.end(), "failed to test subscribe");
-                        channels.erase(*channel);
-                        REDIS_ASSERT(static_cast<std::size_t>(num) == channels.size(),
-                                        "failed to test subscribe");
-                    } else {
-                        REDIS_ASSERT(false, "Unknown message type");
-                    }
-                });
-
-    std::unordered_map<std::string, std::string> messages = {
-        {channel2, "msg2"},
-        {channel3, "msg3"},
-        {channel4, "msg4"},
-    };
-    sub.on_message([&messages](std::string channel, std::string msg) {
-                        REDIS_ASSERT(messages.find(channel) != messages.end(),
-                                        "failed to test subscribe");
-                        REDIS_ASSERT(messages[channel] == msg, "failed to test subscribe");
-                   });
-
-    sub.subscribe({channel2, channel3, channel4});
-
-    for (std::size_t idx = 0; idx != channels.size(); ++idx) {
-        sub.consume();
-    }
-
-    for (const auto &ele : messages) {
-        _redis.publish(ele.first, ele.second);
-        sub.consume();
-    }
-
-    auto tmp = {channel2, channel3, channel4};
-    sub.unsubscribe(tmp);
-
-    for (std::size_t idx = 0; idx != tmp.size(); ++idx) {
-        sub.consume();
-    }
-}
-
-template <typename RedisInstance>
-void PubSubTest<RedisInstance>::_test_sub_pattern() {
-    auto sub = _redis.subscriber();
-
-    auto msgs = {"msg1", "msg2"};
-    auto pattern1 = test_key("pattern*");
-    std::string channel1 = test_key("pattern1");
-    sub.on_pmessage([&msgs, &pattern1, &channel1](std::string pattern,
-                                                    std::string channel,
-                                                    std::string msg) {
-                        static std::size_t idx = 0;
-                        REDIS_ASSERT(pattern == pattern1
-                                        && channel == channel1
-                                        && msg == *(msgs.begin() + idx),
-                                        "failed to test psubscribe");
-                        ++idx;
-                    });
-
-    sub.psubscribe(pattern1);
-
-    // Consume the PSUBSCRIBE message.
-    sub.consume();
-
-    for (const auto &msg : msgs) {
-        _redis.publish(channel1, msg);
-        sub.consume();
-    }
-
-    sub.punsubscribe(pattern1);
-
-    // Consume the PUNSUBSCRIBE message.
-    sub.consume();
-
-    auto channel2 = test_key("pattern22");
-    auto channel3 = test_key("pattern33");
-    auto channel4 = test_key("pattern44");
-    std::unordered_set<std::string> channels;
-    sub.on_meta([&channels](Subscriber::MsgType type,
-                            OptionalString channel,
-                            long long num) {
-                    REDIS_ASSERT(bool(channel), "failed to test psubscribe");
-
-                    if (type == Subscriber::MsgType::PSUBSCRIBE) {
-                        auto iter = channels.find(*channel);
-                        REDIS_ASSERT(iter == channels.end(), "failed to test psubscribe");
-                        channels.insert(*channel);
-                        REDIS_ASSERT(static_cast<std::size_t>(num) == channels.size(),
-                                        "failed to test psubscribe");
-                    } else if (type == Subscriber::MsgType::PUNSUBSCRIBE) {
-                        auto iter = channels.find(*channel);
-                        REDIS_ASSERT(iter != channels.end(), "failed to test psubscribe");
-                        channels.erase(*channel);
-                        REDIS_ASSERT(static_cast<std::size_t>(num) == channels.size(),
-                                        "failed to test psubscribe");
-                    } else {
-                        REDIS_ASSERT(false, "Unknown message type");
-                    }
-                });
-
-    auto pattern2 = test_key("pattern2*");
-    auto pattern3 = test_key("pattern3*");
-    auto pattern4 = test_key("pattern4*");
-    std::unordered_set<std::string> patterns = {pattern2, pattern3, pattern4};
-
-    std::unordered_map<std::string, std::string> messages = {
-        {channel2, "msg2"},
-        {channel3, "msg3"},
-        {channel4, "msg4"},
-    };
-    sub.on_pmessage([&patterns, &messages](std::string pattern,
-                                            std::string channel,
-                                            std::string msg) {
-                        REDIS_ASSERT(patterns.find(pattern) != patterns.end(),
-                                        "failed to test psubscribe");
-                        REDIS_ASSERT(messages[channel] == msg, "failed to test psubscribe");
-                    });
-
-    sub.psubscribe({pattern2, pattern3, pattern4});
-
-    for (std::size_t idx = 0; idx != channels.size(); ++idx) {
-        sub.consume();
-    }
-
-    for (const auto &ele : messages) {
-        _redis.publish(ele.first, ele.second);
-        sub.consume();
-    }
-
-    auto tmp = {pattern2, pattern3, pattern4};
-    sub.punsubscribe(tmp);
-
-    for (std::size_t idx = 0; idx != tmp.size(); ++idx) {
-        sub.consume();
-    }
-}
-
-template <typename RedisInstance>
-void PubSubTest<RedisInstance>::_test_unsubscribe() {
-    auto sub = _redis.subscriber();
-
-    sub.on_meta([](Subscriber::MsgType type,
-                        OptionalString channel,
-                        long long num) {
-                        REDIS_ASSERT(type == Subscriber::MsgType::UNSUBSCRIBE,
-                                        "failed to test unsub");
-
-                        REDIS_ASSERT(!channel, "failed to test unsub");
-
-                        REDIS_ASSERT(num == 0, "failed to test unsub");
-                    });
-
-    sub.unsubscribe();
-    sub.consume();
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/sanity_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/sanity_test.h
deleted file mode 100644
index e41fdef9d..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/sanity_test.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class SanityTest {
-public:
-    SanityTest(const ConnectionOptions &opts, RedisInstance &instance)
-        : _opts(opts), _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_uri_ctor();
-
-    void _ping(Redis &instance);
-
-    void _test_move_ctor();
-
-    void _test_cmdargs();
-
-    void _test_generic_command();
-
-    void _test_hash_tag();
-
-    void _test_hash_tag(std::initializer_list<std::string> keys);
-
-    std::string _test_key(const std::string &key);
-
-    void _test_ping(Redis &instance);
-
-    void _test_pipeline(const StringView &key, Pipeline &pipeline);
-
-    void _test_transaction(const StringView &key, Transaction &transaction);
-
-    Pipeline _pipeline(const StringView &key);
-
-    Transaction _transaction(const StringView &key);
-
-    ConnectionOptions _opts;
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "sanity_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/sanity_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/sanity_test.hpp
deleted file mode 100644
index cff992ecb..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/sanity_test.hpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_HPP
-
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::run() {
-    _test_uri_ctor();
-
-    _test_move_ctor();
-
-    cluster_specializing_test(*this, &SanityTest<RedisInstance>::_test_ping, _redis);
-
-    auto pipe_key = test_key("pipeline");
-    auto tx_key = test_key("transaction");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {pipe_key, tx_key});
-
-    auto pipeline = _pipeline(pipe_key);
-    _test_pipeline(pipe_key, pipeline);
-
-    auto transaction = _transaction(tx_key);
-    _test_transaction(tx_key, transaction);
-
-    _test_cmdargs();
-
-    _test_generic_command();
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_uri_ctor() {
-    std::string uri;
-    switch (_opts.type) {
-    case sw::redis::ConnectionType::TCP:
-        uri = "tcp://" + _opts.host + ":" + std::to_string(_opts.port);
-        break;
-
-    case sw::redis::ConnectionType::UNIX:
-        REDIS_ASSERT(false, "NO test for UNIX Domain Socket");
-        break;
-
-    default:
-        REDIS_ASSERT(false, "Unknown connection type");
-    }
-
-    auto instance = RedisInstance(uri);
-
-    cluster_specializing_test(*this, &SanityTest<RedisInstance>::_ping, instance);
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_ping(Redis &instance) {
-    try {
-        auto pong = instance.ping();
-        REDIS_ASSERT(pong == "PONG", "Failed to test constructing Redis with uri");
-    } catch (const sw::redis::ReplyError &e) {
-        REDIS_ASSERT(e.what() == std::string("NOAUTH Authentication required."),
-                "Failed to test constructing Redis with uri");
-    }
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_move_ctor() {
-    auto test_move_ctor = std::move(_redis);
-
-    _redis = std::move(test_move_ctor);
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_cmdargs() {
-    auto lpush_num = [](Connection &connection, const StringView &key, long long num) {
-        connection.send("LPUSH %b %lld",
-                        key.data(), key.size(),
-                        num);
-    };
-
-    auto lpush_nums = [](Connection &connection,
-                            const StringView &key,
-                            const std::vector<long long> &nums) {
-        CmdArgs args;
-        args.append("LPUSH").append(key);
-        for (auto num : nums) {
-            args.append(std::to_string(num));
-        }
-
-        connection.send(args);
-    };
-
-    auto key = test_key("lpush_num");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto reply = _redis.command(lpush_num, key, 1);
-    REDIS_ASSERT(reply::parse<long long>(*reply) == 1, "failed to test cmdargs");
-
-    std::vector<long long> nums = {2, 3, 4, 5};
-    reply = _redis.command(lpush_nums, key, nums);
-    REDIS_ASSERT(reply::parse<long long>(*reply) == 5, "failed to test cmdargs");
-
-    std::vector<std::string> res;
-    _redis.lrange(key, 0, -1, std::back_inserter(res));
-    REDIS_ASSERT((res == std::vector<std::string>{"5", "4", "3", "2", "1"}),
-            "failed to test cmdargs");
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_generic_command() {
-    auto key = test_key("key");
-    auto not_exist_key = test_key("not_exist_key");
-    auto k1 = test_key("k1");
-    auto k2 = test_key("k2");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key, not_exist_key, k1, k2});
-
-    std::string cmd("set");
-    _redis.command(cmd, key, 123);
-    auto reply = _redis.command("get", key);
-    auto val = reply::parse<OptionalString>(*reply);
-    REDIS_ASSERT(val && *val == "123", "failed to test generic command");
-
-    val = _redis.template command<OptionalString>("get", key);
-    REDIS_ASSERT(val && *val == "123", "failed to test generic command");
-
-    std::vector<OptionalString> res;
-    _redis.command("mget", key, not_exist_key, std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 2 && res[0] && *res[0] == "123" && !res[1],
-            "failed to test generic command");
-
-    reply = _redis.command("incr", key);
-    REDIS_ASSERT(reply::parse<long long>(*reply) == 124, "failed to test generic command");
-
-    _redis.command("mset", k1.c_str(), "v", k2.c_str(), "v");
-    reply = _redis.command("mget", k1, k2);
-    res.clear();
-    reply::to_array(*reply, std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 2 && res[0] && *(res[0]) == "v" && res[1] && *(res[1]) == "v",
-            "failed to test generic command");
-
-    res = _redis.template command<std::vector<OptionalString>>("mget", k1, k2);
-    REDIS_ASSERT(res.size() == 2 && res[0] && *(res[0]) == "v" && res[1] && *(res[1]) == "v",
-            "failed to test generic command");
-
-    res.clear();
-    _redis.command("mget", k1, k2, std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 2 && res[0] && *(res[0]) == "v" && res[1] && *(res[1]) == "v",
-            "failed to test generic command");
-
-    auto set_cmd_str = {"set", key.c_str(), "new_value"};
-    _redis.command(set_cmd_str.begin(), set_cmd_str.end());
-
-    auto get_cmd_str = {"get", key.c_str()};
-    reply = _redis.command(get_cmd_str.begin(), get_cmd_str.end());
-    val = reply::parse<OptionalString>(*reply);
-    REDIS_ASSERT(val && *val == "new_value", "failed to test generic command");
-
-    val = _redis.template command<OptionalString>(get_cmd_str.begin(), get_cmd_str.end());
-    REDIS_ASSERT(val && *val == "new_value", "failed to test generic command");
-
-    auto mget_cmd_str = {"mget", key.c_str(), not_exist_key.c_str()};
-    res.clear();
-    _redis.command(mget_cmd_str.begin(), mget_cmd_str.end(), std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 2 && res[0] && *res[0] == "new_value" && !res[1],
-            "failed to test generic command");
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_hash_tag() {
-    _test_hash_tag({_test_key("{tag}postfix1"),
-                    _test_key("{tag}postfix2"),
-                    _test_key("{tag}postfix3")});
-
-    _test_hash_tag({_test_key("prefix1{tag}postfix1"),
-                    _test_key("prefix2{tag}postfix2"),
-                    _test_key("prefix3{tag}postfix3")});
-
-    _test_hash_tag({_test_key("prefix1{tag}"),
-                    _test_key("prefix2{tag}"),
-                    _test_key("prefix3{tag}")});
-
-    _test_hash_tag({_test_key("prefix{}postfix"),
-                    _test_key("prefix{}postfix"),
-                    _test_key("prefix{}postfix")});
-
-    _test_hash_tag({_test_key("prefix1{tag}post}fix1"),
-                    _test_key("prefix2{tag}pos}tfix2"),
-                    _test_key("prefix3{tag}postfi}x3")});
-
-    _test_hash_tag({_test_key("prefix1{t{ag}postfix1"),
-                    _test_key("prefix2{t{ag}postfix2"),
-                    _test_key("prefix3{t{ag}postfix3")});
-
-    _test_hash_tag({_test_key("prefix1{t{ag}postfi}x1"),
-                    _test_key("prefix2{t{ag}post}fix2"),
-                    _test_key("prefix3{t{ag}po}stfix3")});
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_hash_tag(std::initializer_list<std::string> keys) {
-    KeyDeleter<RedisInstance> deleter(_redis, keys.begin(), keys.end());
-
-    std::string value = "value";
-    std::vector<std::pair<std::string, std::string>> kvs;
-    for (const auto &key : keys) {
-        kvs.emplace_back(key, value);
-    }
-
-    _redis.mset(kvs.begin(), kvs.end());
-
-    std::vector<OptionalString> res;
-    res.reserve(keys.size());
-    _redis.mget(keys.begin(), keys.end(), std::back_inserter(res));
-
-    REDIS_ASSERT(res.size() == keys.size(), "failed to test hash tag");
-
-    for (const auto &ele : res) {
-        REDIS_ASSERT(ele && *ele == value, "failed to test hash tag");
-    }
-}
-
-template <typename RedisInstance>
-std::string SanityTest<RedisInstance>::_test_key(const std::string &key) {
-    REDIS_ASSERT(key.size() > 1, "failed to generate key");
-
-    // Ensure that key prefix has NO hash tag. Also see the implementation of test_key.
-    return key.substr(1);
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_ping(Redis &instance) {
-    auto reply = instance.command("ping");
-    REDIS_ASSERT(reply && reply::parse<std::string>(*reply) == "PONG",
-            "failed to test generic command");
-
-    auto pong = instance.command<std::string>("ping");
-    REDIS_ASSERT(pong == "PONG", "failed to test generic command");
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_pipeline(const StringView &key, Pipeline &pipeline) {
-    auto pipe_replies = pipeline.command("set", key, "value").command("get", key).exec();
-    auto val = pipe_replies.get<OptionalString>(1);
-    REDIS_ASSERT(val && *val == "value", "failed to test generic command");
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_transaction(const StringView &key, Transaction &transaction) {
-    auto tx_replies = transaction.command("set", key, 456).command("incr", key).exec();
-    REDIS_ASSERT(tx_replies.get<long long>(1) == 457, "failed to test generic command");
-}
-
-template <typename RedisInstance>
-Pipeline SanityTest<RedisInstance>::_pipeline(const StringView &) {
-    return _redis.pipeline();
-}
-
-template <>
-inline Pipeline SanityTest<RedisCluster>::_pipeline(const StringView &key) {
-    return _redis.pipeline(key);
-}
-
-template <typename RedisInstance>
-Transaction SanityTest<RedisInstance>::_transaction(const StringView &) {
-    return _redis.transaction();
-}
-
-template <>
-inline Transaction SanityTest<RedisCluster>::_transaction(const StringView &key) {
-    return _redis.transaction(key);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/script_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/script_cmds_test.h
deleted file mode 100644
index f7adb11b6..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/script_cmds_test.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ScriptCmdTest {
-public:
-    explicit ScriptCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _run(Redis &instance);
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "script_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/script_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/script_cmds_test.hpp
deleted file mode 100644
index 76e07fda2..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/script_cmds_test.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_HPP
-
-#include <list>
-#include <vector>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ScriptCmdTest<RedisInstance>::run() {
-    cluster_specializing_test(*this,
-            &ScriptCmdTest<RedisInstance>::_run,
-            _redis);
-}
-
-template <typename RedisInstance>
-void ScriptCmdTest<RedisInstance>::_run(Redis &instance) {
-    auto key1 = test_key("k1");
-    auto key2 = test_key("k2");
-
-    KeyDeleter<Redis> deleter(instance, {key1, key2});
-
-    std::string script = "redis.call('set', KEYS[1], 1);"
-                    "redis.call('set', KEYS[2], 2);"
-                    "local first = redis.call('get', KEYS[1]);"
-                    "local second = redis.call('get', KEYS[2]);"
-                    "return first + second";
-
-    auto num = instance.eval<long long>(script, {key1, key2}, {});
-    REDIS_ASSERT(num == 3, "failed to test scripting for cluster");
-
-    script = "return 1";
-    num = instance.eval<long long>(script, {}, {});
-    REDIS_ASSERT(num == 1, "failed to test eval");
-
-    auto script_with_args = "return {ARGV[1] + 1, ARGV[2] + 2, ARGV[3] + 3}";
-    std::vector<long long> res;
-    instance.eval(script_with_args,
-                {"k"},
-                {"1", "2", "3"},
-                std::back_inserter(res));
-    REDIS_ASSERT(res == std::vector<long long>({2, 4, 6}),
-            "failed to test eval with array reply");
-
-    auto sha1 = instance.script_load(script);
-    num = instance.evalsha<long long>(sha1, {}, {});
-    REDIS_ASSERT(num == 1, "failed to test evalsha");
-
-    auto sha2 = instance.script_load(script_with_args);
-    res.clear();
-    instance.evalsha(sha2,
-                    {"k"},
-                    {"1", "2", "3"},
-                    std::back_inserter(res));
-    REDIS_ASSERT(res == std::vector<long long>({2, 4, 6}),
-            "failed to test evalsha with array reply");
-
-    std::list<bool> exist_res;
-    instance.script_exists({sha1, sha2, std::string("not exist")}, std::back_inserter(exist_res));
-    REDIS_ASSERT(exist_res == std::list<bool>({true, true, false}),
-            "failed to test script exists");
-
-    instance.script_flush();
-    exist_res.clear();
-    instance.script_exists({sha1, sha2, std::string("not exist")}, std::back_inserter(exist_res));
-    REDIS_ASSERT(exist_res == std::list<bool>({false, false, false}),
-            "failed to test script flush");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/set_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/set_cmds_test.h
deleted file mode 100644
index c5320d793..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/set_cmds_test.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class SetCmdTest {
-public:
-    explicit SetCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_set();
-
-    void _test_multi_set();
-
-    void _test_sscan();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "set_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/set_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/set_cmds_test.hpp
deleted file mode 100644
index 1a4c24bfd..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/set_cmds_test.hpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_HPP
-
-#include <unordered_set>
-#include <vector>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void SetCmdTest<RedisInstance>::run() {
-    _test_set();
-
-    _test_multi_set();
-
-    _test_sscan();
-}
-
-template <typename RedisInstance>
-void SetCmdTest<RedisInstance>::_test_set() {
-    auto key = test_key("set");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::string m1("m1");
-    std::string m2("m2");
-    std::string m3("m3");
-
-    REDIS_ASSERT(_redis.sadd(key, m1) == 1, "failed to test sadd");
-
-    auto members = {m1, m2, m3};
-    REDIS_ASSERT(_redis.sadd(key, members) == 2, "failed to test sadd with multiple members");
-
-    REDIS_ASSERT(_redis.scard(key) == 3, "failed to test scard");
-
-    REDIS_ASSERT(_redis.sismember(key, m1), "failed to test sismember");
-
-    std::unordered_set<std::string> res;
-    _redis.smembers(key, std::inserter(res, res.end()));
-    REDIS_ASSERT(res.find(m1) != res.end()
-            && res.find(m2) != res.end()
-            && res.find(m3) != res.end(),
-                "failed to test smembers");
-
-    auto ele = _redis.srandmember(key);
-    REDIS_ASSERT(bool(ele) && res.find(*ele) != res.end(), "failed to test srandmember");
-
-    std::vector<std::string> rand_members;
-    _redis.srandmember(key, 2, std::back_inserter(rand_members));
-    REDIS_ASSERT(rand_members.size() == 2, "failed to test srandmember");
-
-    ele = _redis.spop(key);
-    REDIS_ASSERT(bool(ele) && res.find(*ele) != res.end(), "failed to test spop");
-
-    rand_members.clear();
-    _redis.spop(key, 3, std::back_inserter(rand_members));
-    REDIS_ASSERT(rand_members.size() == 2, "failed to test srandmember");
-
-    rand_members.clear();
-    _redis.srandmember(key, 2, std::back_inserter(rand_members));
-    REDIS_ASSERT(rand_members.empty(), "failed to test srandmember with empty set");
-
-    _redis.spop(key, 2, std::back_inserter(rand_members));
-    REDIS_ASSERT(rand_members.empty(), "failed to test spop with empty set");
-
-    _redis.sadd(key, members);
-    REDIS_ASSERT(_redis.srem(key, m1) == 1, "failed to test srem");
-    REDIS_ASSERT(_redis.srem(key, members) == 2, "failed to test srem with mulitple members");
-    REDIS_ASSERT(_redis.srem(key, members) == 0, "failed to test srem with mulitple members");
-}
-
-template <typename RedisInstance>
-void SetCmdTest<RedisInstance>::_test_multi_set() {
-    auto k1 = test_key("s1");
-    auto k2 = test_key("s2");
-    auto k3 = test_key("s3");
-    auto k4 = test_key("s4");
-    auto k5 = test_key("s5");
-    auto k6 = test_key("s6");
-
-    KeyDeleter<RedisInstance> keys(_redis, {k1, k2, k3, k4, k5, k6});
-
-    _redis.sadd(k1, {"a", "c"});
-    _redis.sadd(k2, {"a", "b"});
-    std::vector<std::string> sdiff;
-    _redis.sdiff({k1, k1}, std::back_inserter(sdiff));
-    REDIS_ASSERT(sdiff.empty(), "failed to test sdiff");
-
-    _redis.sdiff({k1, k2}, std::back_inserter(sdiff));
-    REDIS_ASSERT(sdiff == std::vector<std::string>({"c"}), "failed to test sdiff");
-
-    _redis.sdiffstore(k3, {k1, k2});
-    sdiff.clear();
-    _redis.smembers(k3, std::back_inserter(sdiff));
-    REDIS_ASSERT(sdiff == std::vector<std::string>({"c"}), "failed to test sdiffstore");
-
-    REDIS_ASSERT(_redis.sdiffstore(k3, k1) == 2, "failed to test sdiffstore");
-
-    REDIS_ASSERT(_redis.sinterstore(k3, k1) == 2, "failed to test sinterstore");
-
-    REDIS_ASSERT(_redis.sunionstore(k3, k1) == 2, "failed to test sunionstore");
-
-    std::vector<std::string> sinter;
-    _redis.sinter({k1, k2}, std::back_inserter(sinter));
-    REDIS_ASSERT(sinter == std::vector<std::string>({"a"}), "failed to test sinter");
-
-    _redis.sinterstore(k4, {k1, k2});
-    sinter.clear();
-    _redis.smembers(k4, std::back_inserter(sinter));
-    REDIS_ASSERT(sinter == std::vector<std::string>({"a"}), "failed to test sinterstore");
-
-    std::unordered_set<std::string> sunion;
-    _redis.sunion({k1, k2}, std::inserter(sunion, sunion.end()));
-    REDIS_ASSERT(sunion == std::unordered_set<std::string>({"a", "b", "c"}),
-            "failed to test sunion");
-
-    _redis.sunionstore(k5, {k1, k2});
-    sunion.clear();
-    _redis.smembers(k5, std::inserter(sunion, sunion.end()));
-    REDIS_ASSERT(sunion == std::unordered_set<std::string>({"a", "b", "c"}),
-            "failed to test sunionstore");
-
-    REDIS_ASSERT(_redis.smove(k5, k6, "a"), "failed to test smove");
-}
-
-template <typename RedisInstance>
-void SetCmdTest<RedisInstance>::_test_sscan() {
-    auto key = test_key("sscan");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::unordered_set<std::string> members = {"m1", "m2", "m3"};
-    _redis.sadd(key, members.begin(), members.end());
-
-    std::unordered_set<std::string> res;
-    long long cursor = 0;
-    while (true) {
-        cursor = _redis.sscan(key, cursor, "m*", 1, std::inserter(res, res.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-
-    REDIS_ASSERT(res == members, "failed to test sscan");
-
-    res.clear();
-    cursor = 0;
-    while (true) {
-        cursor = _redis.sscan(key, cursor, std::inserter(res, res.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-
-    REDIS_ASSERT(res == members, "failed to test sscan");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/stream_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/stream_cmds_test.h
deleted file mode 100644
index 24873a8b4..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/stream_cmds_test.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class StreamCmdsTest {
-public:
-    explicit StreamCmdsTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    using Item = std::pair<std::string, std::unordered_map<std::string, std::string>>;
-    using Result = std::unordered_map<std::string, std::vector<Item>>;
-
-    void _test_stream_cmds();
-
-    void _test_group_cmds();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "stream_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/stream_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/stream_cmds_test.hpp
deleted file mode 100644
index df6f57690..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/stream_cmds_test.hpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_HPP
-
-#include <vector>
-#include <string>
-#include <thread>
-#include <chrono>
-#include <unordered_map>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void StreamCmdsTest<RedisInstance>::run() {
-    _test_stream_cmds();
-
-    _test_group_cmds();
-}
-
-template <typename RedisInstance>
-void StreamCmdsTest<RedisInstance>::_test_stream_cmds() {
-    auto key = test_key("stream");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::vector<std::pair<std::string, std::string>> attrs = {
-        {"f1", "v1"},
-        {"f2", "v2"}
-    };
-    auto id = "1565427842-0";
-    REDIS_ASSERT(_redis.xadd(key, id, attrs.begin(), attrs.end()) == id,
-            "failed to test xadd");
-
-    std::vector<std::pair<std::string, std::string>> keys = {std::make_pair(key, "0-0")};
-    Result result;
-    _redis.xread(keys.begin(), keys.end(), 1, std::inserter(result, result.end()));
-
-    REDIS_ASSERT(result.size() == 1
-            && result.find(key) != result.end()
-            && result[key].size() == 1
-            && result[key][0].first == id
-            && result[key][0].second.size() == 2,
-            "failed to test xread");
-
-    result.clear();
-    _redis.xread(key, std::string("0-0"), 1, std::inserter(result, result.end()));
-
-    REDIS_ASSERT(result.size() == 1
-            && result.find(key) != result.end()
-            && result[key].size() == 1
-            && result[key][0].first == id
-            && result[key][0].second.size() == 2,
-            "failed to test xread");
-
-    result.clear();
-    keys = {std::make_pair(key, id)};
-    _redis.xread(keys.begin(),
-                    keys.end(),
-                    std::chrono::seconds(1),
-                    2,
-                    std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xread");
-
-    _redis.xread(key,
-                    id,
-                    std::chrono::seconds(1),
-                    2,
-                    std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xread");
-
-    id = "1565427842-1";
-    REDIS_ASSERT(_redis.xadd(key, id, attrs.begin(), attrs.end()) == id,
-            "failed to test xadd");
-
-    REDIS_ASSERT(_redis.xlen(key) == 2, "failed to test xlen");
-
-    REDIS_ASSERT(_redis.xtrim(key, 1, false) == 1, "failed to test xtrim");
-
-    std::vector<Item> items;
-    _redis.xrange(key, "-", "+", std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 && items[0].first == id, "failed to test xrange");
-
-    items.clear();
-    _redis.xrevrange(key, "+", "-", std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 && items[0].first == id, "failed to test xrevrange");
-
-    REDIS_ASSERT(_redis.xdel(key, {id, "111-111"}) == 1, "failed to test xdel");
-}
-
-template <typename RedisInstance>
-void StreamCmdsTest<RedisInstance>::_test_group_cmds() {
-    auto key = test_key("stream");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto group = "group";
-    auto consumer1 = "consumer1";
-
-    _redis.xgroup_create(key, group, "$", true);
-
-    std::vector<std::pair<std::string, std::string>> attrs = {
-        {"f1", "v1"},
-        {"f2", "v2"}
-    };
-    auto id = _redis.xadd(key, "*", attrs.begin(), attrs.end());
-    auto keys = {std::make_pair(key, ">")};
-
-    Result result;
-    _redis.xreadgroup(group,
-            consumer1,
-            keys.begin(),
-            keys.end(),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 1
-            && result.find(key) != result.end()
-            && result[key].size() == 1
-            && result[key][0].first == id,
-            "failed to test xreadgroup");
-
-    result.clear();
-    _redis.xreadgroup(group,
-            consumer1,
-            key,
-            std::string(">"),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xreadgroup");
-
-    result.clear();
-    _redis.xreadgroup(group,
-            "not-exist-consumer",
-            keys.begin(),
-            keys.end(),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xreadgroup");
-
-    result.clear();
-    _redis.xreadgroup(group,
-            consumer1,
-            keys.begin(),
-            keys.end(),
-            std::chrono::seconds(1),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xreadgroup");
-
-    result.clear();
-    _redis.xreadgroup(group,
-            consumer1,
-            key,
-            ">",
-            std::chrono::seconds(1),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xreadgroup");
-
-    using PendingResult = std::vector<std::tuple<std::string, std::string, long long, long long>>;
-    PendingResult pending_result;
-    _redis.xpending(key, group, "-", "+", 1, consumer1, std::back_inserter(pending_result));
-
-    REDIS_ASSERT(pending_result.size() == 1
-            && std::get<0>(pending_result[0]) == id
-            && std::get<1>(pending_result[0]) == consumer1,
-            "failed to test xpending");
-
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-
-    auto consumer2 = "consumer2";
-    std::vector<Item> items;
-    auto ids = {id};
-    _redis.xclaim(key,
-            group,
-            consumer2,
-            std::chrono::milliseconds(10),
-            ids,
-            std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 && items[0].first == id, "failed to test xclaim");
-
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-
-    items.clear();
-    _redis.xclaim(key, group, consumer1, std::chrono::milliseconds(10), id, std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 && items[0].first == id, "failed to test xclaim: " + std::to_string(items.size()));
-
-    _redis.xack(key, group, id);
-
-    REDIS_ASSERT(_redis.xgroup_delconsumer(key, group, consumer1) == 0,
-            "failed to test xgroup_delconsumer");
-
-    REDIS_ASSERT(_redis.xgroup_delconsumer(key, group, consumer2) == 0,
-            "failed to test xgroup_delconsumer");
-
-    REDIS_ASSERT(_redis.xgroup_destroy(key, group) == 1,
-            "failed to test xgroup_destroy");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/string_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/string_cmds_test.h
deleted file mode 100644
index 86788b2bc..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/string_cmds_test.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class StringCmdTest {
-public:
-    explicit StringCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_str();
-
-    void _test_bit();
-
-    void _test_numeric();
-
-    void _test_getset();
-
-    void _test_mgetset();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "string_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/string_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/string_cmds_test.hpp
deleted file mode 100644
index b8a0aa3c1..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/string_cmds_test.hpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_HPP
-
-#include <vector>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::run() {
-    _test_str();
-
-    _test_bit();
-
-    _test_numeric();
-
-    _test_getset();
-
-    _test_mgetset();
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_str() {
-    auto key = test_key("str");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::string val("value");
-
-    long long val_size = val.size();
-
-    auto len1 = _redis.append(key, val);
-    REDIS_ASSERT(len1 == val_size, "failed to append to non-existent key");
-
-    auto len2 = _redis.append(key, val);
-    REDIS_ASSERT(len2 == len1 + val_size, "failed to append to non-empty string");
-
-    auto len3 = _redis.append(key, {});
-    REDIS_ASSERT(len3 == len2, "failed to append empty string");
-
-    auto len4 = _redis.strlen(key);
-    REDIS_ASSERT(len4 == len3, "failed to test strlen");
-
-    REDIS_ASSERT(_redis.del(key) == 1, "failed to remove key");
-
-    auto len5 = _redis.append(key, {});
-    REDIS_ASSERT(len5 == 0, "failed to append empty string to non-existent key");
-
-    _redis.del(key);
-
-    REDIS_ASSERT(_redis.getrange(key, 0, 2) == "", "failed to test getrange on non-existent key");
-
-    _redis.set(key, val);
-
-    REDIS_ASSERT(_redis.getrange(key, 1, 2) == val.substr(1, 2), "failed to test getrange");
-
-    long long new_size = val.size() * 2;
-    REDIS_ASSERT(_redis.setrange(key, val.size(), val) == new_size, "failed to test setrange");
-    REDIS_ASSERT(_redis.getrange(key, 0, -1) == val + val, "failed to test setrange");
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_bit() {
-    auto key = test_key("bit");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    REDIS_ASSERT(_redis.bitcount(key) == 0, "failed to test bitcount on non-existent key");
-
-    REDIS_ASSERT(_redis.getbit(key, 5) == 0, "failed to test getbit");
-
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 1, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 3, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 7, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 10, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 10, 0) == 1,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 11, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 21, 1) == 0,
-            "failed to test setbit");
-
-    // key -> 01010001, 00010000, 00000100
-
-    REDIS_ASSERT(_redis.getbit(key, 1) == 1, "failed to test getbit");
-    REDIS_ASSERT(_redis.getbit(key, 2) == 0, "failed to test getbit");
-    REDIS_ASSERT(_redis.getbit(key, 7) == 1, "failed to test getbit");
-    REDIS_ASSERT(_redis.getbit(key, 10) == 0, "failed to test getbit");
-    REDIS_ASSERT(_redis.getbit(key, 100) == 0, "failed to test getbit");
-
-    REDIS_ASSERT(_redis.bitcount(key) == 5, "failed to test bitcount");
-    REDIS_ASSERT(_redis.bitcount(key, 0, 0) == 3, "failed to test bitcount");
-    REDIS_ASSERT(_redis.bitcount(key, 0, 1) == 4, "failed to test bitcount");
-    REDIS_ASSERT(_redis.bitcount(key, -2, -1) == 2, "failed to test bitcount");
-
-    REDIS_ASSERT(_redis.bitpos(key, 1) == 1, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 0) == 0, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 1, 1, 1) == 11, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 0, 1, 1) == 8, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 1, -1, -1) == 21, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 0, -1, -1) == 16, "failed to test bitpos");
-
-    auto dest_key = test_key("bitop_dest");
-    auto src_key1 = test_key("bitop_src1");
-    auto src_key2 = test_key("bitop_src2");
-
-    KeyDeleter<RedisInstance> deleters(_redis, {dest_key, src_key1, src_key2});
-
-    // src_key1 -> 00010000
-    _redis.template command<long long>("SETBIT", src_key1, 3, 1);
-
-    // src_key2 -> 00000000, 00001000
-    _redis.template command<long long>("SETBIT", src_key2, 12, 1);
-
-    REDIS_ASSERT(_redis.bitop(BitOp::AND, dest_key, {src_key1, src_key2}) == 2,
-            "failed to test bitop");
-
-    // dest_key -> 00000000, 00000000
-    auto v = _redis.get(dest_key);
-    REDIS_ASSERT(v && *v == std::string(2, 0), "failed to test bitop");
-
-    REDIS_ASSERT(_redis.bitop(BitOp::NOT, dest_key, src_key1) == 1,
-            "failed to test bitop");
-
-    // dest_key -> 11101111
-    v = _redis.get(dest_key);
-    REDIS_ASSERT(v && *v == std::string(1, 0xEF), "failed to test bitop");
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_numeric() {
-    auto key = test_key("numeric");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    REDIS_ASSERT(_redis.incr(key) == 1, "failed to test incr");
-    REDIS_ASSERT(_redis.decr(key) == 0, "failed to test decr");
-    REDIS_ASSERT(_redis.incrby(key, 3) == 3, "failed to test incrby");
-    REDIS_ASSERT(_redis.decrby(key, 3) == 0, "failed to test decrby");
-    REDIS_ASSERT(_redis.incrby(key, -3) == -3, "failed to test incrby");
-    REDIS_ASSERT(_redis.decrby(key, -3) == 0, "failed to test incrby");
-    REDIS_ASSERT(_redis.incrbyfloat(key, 1.5) == 1.5, "failed to test incrbyfloat");
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_getset() {
-    auto key = test_key("getset");
-    auto non_exist_key = test_key("non-existent");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key, non_exist_key});
-
-    std::string val("value");
-    REDIS_ASSERT(_redis.set(key, val), "failed to test set");
-
-    auto v = _redis.get(key);
-    REDIS_ASSERT(v && *v == val, "failed to test get");
-
-    v = _redis.getset(key, val + val);
-    REDIS_ASSERT(v && *v == val, "failed to test get");
-
-    REDIS_ASSERT(!_redis.set(key, val, std::chrono::milliseconds(0), UpdateType::NOT_EXIST),
-            "failed to test set with NOT_EXIST type");
-    REDIS_ASSERT(!_redis.set(non_exist_key, val, std::chrono::milliseconds(0), UpdateType::EXIST),
-            "failed to test set with EXIST type");
-
-    REDIS_ASSERT(!_redis.setnx(key, val), "failed to test setnx");
-    REDIS_ASSERT(_redis.setnx(non_exist_key, val), "failed to test setnx");
-
-    auto ttl = std::chrono::seconds(10);
-
-    _redis.set(key, val, ttl);
-    REDIS_ASSERT(_redis.ttl(key) <= ttl.count(), "failed to test set key with ttl");
-
-    _redis.setex(key, ttl, val);
-    REDIS_ASSERT(_redis.ttl(key) <= ttl.count(), "failed to test setex");
-
-    auto pttl = std::chrono::milliseconds(10000);
-
-    _redis.psetex(key, ttl, val);
-    REDIS_ASSERT(_redis.pttl(key) <= pttl.count(), "failed to test psetex");
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_mgetset() {
-    auto kvs = {std::make_pair(test_key("k1"), "v1"),
-                std::make_pair(test_key("k2"), "v2"),
-                std::make_pair(test_key("k3"), "v3")};
-
-    std::vector<std::string> keys;
-    std::vector<std::string> vals;
-    for (const auto &kv : kvs) {
-        keys.push_back(kv.first);
-        vals.push_back(kv.second);
-    }
-
-    KeyDeleter<RedisInstance> deleter(_redis, keys.begin(), keys.end());
-
-    _redis.mset(kvs);
-
-    std::vector<OptionalString> res;
-    _redis.mget(keys.begin(), keys.end(), std::back_inserter(res));
-
-    REDIS_ASSERT(res.size() == kvs.size(), "failed to test mget");
-
-    std::vector<std::string> res_vals;
-    for (const auto &ele : res) {
-        REDIS_ASSERT(bool(ele), "failed to test mget");
-
-        res_vals.push_back(*ele);
-    }
-
-    REDIS_ASSERT(vals == res_vals, "failed to test mget");
-
-    REDIS_ASSERT(!_redis.msetnx(kvs), "failed to test msetnx");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/test_main.cpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/test_main.cpp
deleted file mode 100644
index dd2880d1a..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/test_main.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include <unistd.h>
-#include <chrono>
-#include <tuple>
-#include <iostream>
-#include <sw/redis++/redis++.h>
-#include "sanity_test.h"
-#include "connection_cmds_test.h"
-#include "keys_cmds_test.h"
-#include "string_cmds_test.h"
-#include "list_cmds_test.h"
-#include "hash_cmds_test.h"
-#include "set_cmds_test.h"
-#include "zset_cmds_test.h"
-#include "hyperloglog_cmds_test.h"
-#include "geo_cmds_test.h"
-#include "script_cmds_test.h"
-#include "pubsub_test.h"
-#include "pipeline_transaction_test.h"
-#include "threads_test.h"
-#include "stream_cmds_test.h"
-#include "benchmark_test.h"
-
-namespace {
-
-void print_help();
-
-auto parse_options(int argc, char **argv)
-    -> std::tuple<sw::redis::Optional<sw::redis::ConnectionOptions>,
-                    sw::redis::Optional<sw::redis::ConnectionOptions>,
-                    sw::redis::Optional<sw::redis::test::BenchmarkOptions>>;
-
-template <typename RedisInstance>
-void run_test(const sw::redis::ConnectionOptions &opts);
-
-template <typename RedisInstance>
-void run_benchmark(const sw::redis::ConnectionOptions &opts,
-        const sw::redis::test::BenchmarkOptions &benchmark_opts);
-
-}
-
-int main(int argc, char **argv) {
-    try {
-        sw::redis::Optional<sw::redis::ConnectionOptions> opts;
-        sw::redis::Optional<sw::redis::ConnectionOptions> cluster_node_opts;
-        sw::redis::Optional<sw::redis::test::BenchmarkOptions> benchmark_opts;
-        std::tie(opts, cluster_node_opts, benchmark_opts) = parse_options(argc, argv);
-
-        if (opts) {
-            std::cout << "Testing Redis..." << std::endl;
-
-            if (benchmark_opts) {
-                run_benchmark<sw::redis::Redis>(*opts, *benchmark_opts);
-            } else {
-                run_test<sw::redis::Redis>(*opts);
-            }
-        }
-
-        if (cluster_node_opts) {
-            std::cout << "Testing RedisCluster..." << std::endl;
-
-            if (benchmark_opts) {
-                run_benchmark<sw::redis::RedisCluster>(*cluster_node_opts, *benchmark_opts);
-            } else {
-                run_test<sw::redis::RedisCluster>(*cluster_node_opts);
-            }
-        }
-
-        std::cout << "Pass all tests" << std::endl;
-    } catch (const sw::redis::Error &e) {
-        std::cerr << "Test failed: " << e.what() << std::endl;
-        return -1;
-    }
-
-    return 0;
-}
-
-namespace {
-
-void print_help() {
-    std::cerr << "Usage: test_redis++ -h host -p port"
-        << " -n cluster_node -c cluster_port [-a auth] [-b]\n\n";
-    std::cerr << "See https://github.com/sewenew/redis-plus-plus#run-tests-optional"
-        << " for details on how to run test" << std::endl;
-}
-
-auto parse_options(int argc, char **argv)
-    -> std::tuple<sw::redis::Optional<sw::redis::ConnectionOptions>,
-                    sw::redis::Optional<sw::redis::ConnectionOptions>,
-                    sw::redis::Optional<sw::redis::test::BenchmarkOptions>> {
-    std::string host;
-    int port = 0;
-    std::string auth;
-    std::string cluster_node;
-    int cluster_port = 0;
-    bool benchmark = false;
-    sw::redis::test::BenchmarkOptions tmp_benchmark_opts;
-
-    int opt = 0;
-    while ((opt = getopt(argc, argv, "h:p:a:n:c:k:v:r:t:bs:")) != -1) {
-        try {
-            switch (opt) {
-            case 'h':
-                host = optarg;
-                break;
-
-            case 'p':
-                port = std::stoi(optarg);
-                break;
-
-            case 'a':
-                auth = optarg;
-                break;
-
-            case 'n':
-                cluster_node = optarg;
-                break;
-
-            case 'c':
-                cluster_port = std::stoi(optarg);
-                break;
-
-            case 'b':
-                benchmark = true;
-                break;
-
-            case 'k':
-                tmp_benchmark_opts.key_len = std::stoi(optarg);
-                break;
-
-            case 'v':
-                tmp_benchmark_opts.val_len = std::stoi(optarg);
-                break;
-
-            case 'r':
-                tmp_benchmark_opts.total_request_num = std::stoi(optarg);
-                break;
-
-            case 't':
-                tmp_benchmark_opts.thread_num = std::stoi(optarg);
-                break;
-
-            case 's':
-                tmp_benchmark_opts.pool_size = std::stoi(optarg);
-                break;
-
-            default:
-                throw sw::redis::Error("Unknow command line option");
-                break;
-            }
-        } catch (const sw::redis::Error &e) {
-            print_help();
-            throw;
-        } catch (const std::exception &e) {
-            print_help();
-            throw sw::redis::Error("Invalid command line option");
-        }
-    }
-
-    sw::redis::Optional<sw::redis::ConnectionOptions> opts;
-    if (!host.empty() && port > 0) {
-        sw::redis::ConnectionOptions tmp;
-        tmp.host = host;
-        tmp.port = port;
-        tmp.password = auth;
-
-        opts = sw::redis::Optional<sw::redis::ConnectionOptions>(tmp);
-    }
-
-    sw::redis::Optional<sw::redis::ConnectionOptions> cluster_opts;
-    if (!cluster_node.empty() && cluster_port > 0) {
-        sw::redis::ConnectionOptions tmp;
-        tmp.host = cluster_node;
-        tmp.port = cluster_port;
-        tmp.password = auth;
-
-        cluster_opts = sw::redis::Optional<sw::redis::ConnectionOptions>(tmp);
-    }
-
-    if (!opts && !cluster_opts) {
-        print_help();
-        throw sw::redis::Error("Invalid connection options");
-    }
-
-    sw::redis::Optional<sw::redis::test::BenchmarkOptions> benchmark_opts;
-    if (benchmark) {
-        benchmark_opts = sw::redis::Optional<sw::redis::test::BenchmarkOptions>(tmp_benchmark_opts);
-    }
-
-    return std::make_tuple(std::move(opts), std::move(cluster_opts), std::move(benchmark_opts));
-}
-
-template <typename RedisInstance>
-void run_test(const sw::redis::ConnectionOptions &opts) {
-    auto instance = RedisInstance(opts);
-
-    sw::redis::test::SanityTest<RedisInstance> sanity_test(opts, instance);
-    sanity_test.run();
-
-    std::cout << "Pass sanity tests" << std::endl;
-
-    sw::redis::test::ConnectionCmdTest<RedisInstance> connection_test(instance);
-    connection_test.run();
-
-    std::cout << "Pass connection commands tests" << std::endl;
-
-    sw::redis::test::KeysCmdTest<RedisInstance> keys_test(instance);
-    keys_test.run();
-
-    std::cout << "Pass keys commands tests" << std::endl;
-
-    sw::redis::test::StringCmdTest<RedisInstance> string_test(instance);
-    string_test.run();
-
-    std::cout << "Pass string commands tests" << std::endl;
-
-    sw::redis::test::ListCmdTest<RedisInstance> list_test(instance);
-    list_test.run();
-
-    std::cout << "Pass list commands tests" << std::endl;
-
-    sw::redis::test::HashCmdTest<RedisInstance> hash_test(instance);
-    hash_test.run();
-
-    std::cout << "Pass hash commands tests" << std::endl;
-
-    sw::redis::test::SetCmdTest<RedisInstance> set_test(instance);
-    set_test.run();
-
-    std::cout << "Pass set commands tests" << std::endl;
-
-    sw::redis::test::ZSetCmdTest<RedisInstance> zset_test(instance);
-    zset_test.run();
-
-    std::cout << "Pass zset commands tests" << std::endl;
-
-    sw::redis::test::HyperloglogCmdTest<RedisInstance> hll_test(instance);
-    hll_test.run();
-
-    std::cout << "Pass hyperloglog commands tests" << std::endl;
-
-    sw::redis::test::GeoCmdTest<RedisInstance> geo_test(instance);
-    geo_test.run();
-
-    std::cout << "Pass geo commands tests" << std::endl;
-
-    sw::redis::test::ScriptCmdTest<RedisInstance> script_test(instance);
-    script_test.run();
-
-    std::cout << "Pass script commands tests" << std::endl;
-
-    sw::redis::test::PubSubTest<RedisInstance> pubsub_test(instance);
-    pubsub_test.run();
-
-    std::cout << "Pass pubsub tests" << std::endl;
-
-    sw::redis::test::PipelineTransactionTest<RedisInstance> pipe_tx_test(instance);
-    pipe_tx_test.run();
-
-    std::cout << "Pass pipeline and transaction tests" << std::endl;
-
-    sw::redis::test::ThreadsTest<RedisInstance> threads_test(opts);
-    threads_test.run();
-
-    std::cout << "Pass threads tests" << std::endl;
-
-    sw::redis::test::StreamCmdsTest<RedisInstance> stream_test(instance);
-    stream_test.run();
-
-    std::cout << "Pass stream commands tests" << std::endl;
-}
-
-template <typename RedisInstance>
-void run_benchmark(const sw::redis::ConnectionOptions &opts,
-        const sw::redis::test::BenchmarkOptions &benchmark_opts) {
-    std::cout << "Benchmark test options:" << std::endl;
-    std::cout << "  Thread number: " << benchmark_opts.thread_num << std::endl;
-    std::cout << "  Connection pool size: " << benchmark_opts.pool_size << std::endl;
-    std::cout << "  Length of key: " << benchmark_opts.key_len << std::endl;
-    std::cout << "  Length of value: " << benchmark_opts.val_len << std::endl;
-
-    auto instance = RedisInstance(opts);
-
-    sw::redis::test::BenchmarkTest<RedisInstance> benchmark_test(benchmark_opts, instance);
-    benchmark_test.run();
-}
-
-}
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/threads_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/threads_test.h
deleted file mode 100644
index aee307ec2..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/threads_test.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ThreadsTest {
-public:
-    explicit ThreadsTest(const ConnectionOptions &opts) : _opts(opts) {}
-
-    void run();
-
-private:
-    void _test_multithreads(RedisInstance redis, int threads_num, int times);
-
-    void _test_timeout();
-
-    ConnectionOptions _opts;
-};
-
-}
-
-}
-
-}
-
-#include "threads_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/threads_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/threads_test.hpp
deleted file mode 100644
index 24bee9454..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/threads_test.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_HPP
-
-#include <thread>
-#include <chrono>
-#include <atomic>
-#include <memory>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ThreadsTest<RedisInstance>::run() {
-    // 100 * 10000 = 1 million writes
-    auto thread_num = 100;
-    auto times = 10000;
-
-    // Default pool options: single connection and wait forever.
-    _test_multithreads(RedisInstance(_opts), thread_num, times);
-
-    // Pool with 10 connections.
-    ConnectionPoolOptions pool_opts;
-    pool_opts.size = 10;
-    _test_multithreads(RedisInstance(_opts, pool_opts), thread_num, times);
-
-    _test_timeout();
-}
-
-template <typename RedisInstance>
-void ThreadsTest<RedisInstance>::_test_multithreads(RedisInstance redis,
-        int thread_num,
-        int times) {
-    std::vector<std::string> keys;
-    keys.reserve(thread_num);
-    for (auto idx = 0; idx != thread_num; ++idx) {
-        auto key = test_key("multi-threads::" + std::to_string(idx));
-        keys.push_back(key);
-    }
-
-    using DeleterUPtr = std::unique_ptr<KeyDeleter<RedisInstance>>;
-    std::vector<DeleterUPtr> deleters;
-    for (const auto &key : keys) {
-        deleters.emplace_back(new KeyDeleter<RedisInstance>(redis, key));
-    }
-
-    std::vector<std::thread> workers;
-    workers.reserve(thread_num);
-    for (const auto &key : keys) {
-        workers.emplace_back([&redis, key, times]() {
-                                try {
-                                    for (auto i = 0; i != times; ++i) {
-                                        redis.incr(key);
-                                    }
-                                } catch (...) {
-                                    // Something bad happens.
-                                    return;
-                                }
-                            });
-    }
-
-    for (auto &worker : workers) {
-        worker.join();
-    }
-
-    for (const auto &key : keys) {
-        auto val = redis.get(key);
-        REDIS_ASSERT(bool(val), "failed to test multithreads, cannot get value of " + key);
-
-        auto num = std::stoi(*val);
-        REDIS_ASSERT(num == times, "failed to test multithreads, num: "
-                + *val + ", times: " + std::to_string(times));
-    }
-}
-
-template <typename RedisInstance>
-void ThreadsTest<RedisInstance>::_test_timeout() {
-    using namespace std::chrono;
-
-    ConnectionPoolOptions pool_opts;
-    pool_opts.size = 1;
-    pool_opts.wait_timeout = milliseconds(100);
-
-    auto redis = RedisInstance(_opts, pool_opts);
-
-    auto key = test_key("key");
-
-    std::atomic<bool> slow_get_is_running{false};
-    auto slow_get = [&slow_get_is_running](Connection &connection, const StringView &key) {
-                        slow_get_is_running = true;
-
-                        // Sleep a while to simulate a slow get.
-                        std::this_thread::sleep_for(seconds(5));
-
-                        connection.send("GET %b", key.data(), key.size());
-                    };
-    auto slow_get_thread = std::thread([&redis, slow_get, &key]() {
-                                            redis.command(slow_get, key);
-                                        });
-
-    auto get_thread = std::thread([&redis, &slow_get_is_running, &key]() {
-                                        try {
-                                            while (!slow_get_is_running) {
-                                                std::this_thread::sleep_for(milliseconds(10));
-                                            }
-
-                                            redis.get(key);
-
-                                            // Slow get is running, this thread should
-                                            // timeout before obtaining the connection.
-                                            // So it never reaches here.
-                                            REDIS_ASSERT(false, "failed to test pool timeout");
-                                        } catch (const Error &err) {
-                                            // This thread timeout.
-                                        }
-                                    });
-
-    slow_get_thread.join();
-    get_thread.join();
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/utils.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/utils.h
deleted file mode 100644
index 7c430e2d4..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/utils.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_TEST_UTILS_H
-
-#include <string>
-#include <vector>
-#include <sw/redis++/redis++.h>
-
-#define REDIS_ASSERT(condition, msg) \
-    sw::redis::test::redis_assert((condition), (msg), __FILE__, __LINE__)
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-inline void redis_assert(bool condition,
-                            const std::string &msg,
-                            const std::string &file,
-                            int line) {
-    if (!condition) {
-        auto err_msg = "ASSERT: " + msg + ". " + file + ":" + std::to_string(line);
-        throw Error(err_msg);
-    }
-}
-
-inline std::string test_key(const std::string &k) {
-    // Key prefix with hash tag,
-    // so that we can call multiple-key commands on RedisCluster.
-    return "{sw::redis::test}::" + k;
-}
-
-template <typename Test>
-void cluster_specializing_test(Test &test, void (Test::*func)(Redis &instance), Redis &instance) {
-    (test.*func)(instance);
-}
-
-template <typename Test>
-void cluster_specializing_test(Test &test,
-        void (Test::*func)(Redis &instance),
-        RedisCluster &cluster) {
-    auto instance = cluster.redis("hash-tag");
-    (test.*func)(instance);
-}
-
-template <typename RedisInstance>
-class KeyDeleter {
-public:
-    template <typename Input>
-    KeyDeleter(RedisInstance &redis, Input first, Input last) : _redis(redis), _keys(first, last) {
-        _delete();
-    }
-
-    KeyDeleter(RedisInstance &redis, std::initializer_list<std::string> il) :
-                KeyDeleter(redis, il.begin(), il.end()) {}
-
-    KeyDeleter(RedisInstance &redis, const std::string &key) : KeyDeleter(redis, {key}) {}
-
-    ~KeyDeleter() {
-        _delete();
-    }
-
-private:
-    void _delete() {
-        if (!_keys.empty()) {
-            _redis.del(_keys.begin(), _keys.end());
-        }
-    }
-
-    RedisInstance &_redis;
-    std::vector<std::string> _keys;
-};
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_UTILS_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/zset_cmds_test.h b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/zset_cmds_test.h
deleted file mode 100644
index 56fd0b96f..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/zset_cmds_test.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ZSetCmdTest {
-public:
-    explicit ZSetCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_zset();
-
-    void _test_zscan();
-
-    void _test_range();
-
-    void _test_lex();
-
-    void _test_multi_zset();
-
-    void _test_zpop();
-
-    void _test_bzpop();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "zset_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/zset_cmds_test.hpp b/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/zset_cmds_test.hpp
deleted file mode 100644
index fb331bb0a..000000000
--- a/ext/redis-plus-plus-1.1.1/test/src/sw/redis++/zset_cmds_test.hpp
+++ /dev/null
@@ -1,350 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_HPP
-
-#include <map>
-#include <unordered_map>
-#include <vector>
-#include <algorithm>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::run() {
-    _test_zset();
-
-    _test_zscan();
-
-    _test_range();
-
-    _test_lex();
-
-    _test_multi_zset();
-
-    _test_zpop();
-
-    _test_bzpop();
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_zset() {
-    auto key = test_key("zset");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::map<std::string, double> s = {
-        std::make_pair("m1", 1.2),
-        std::make_pair("m2", 2),
-        std::make_pair("m3", 3),
-    };
-
-    const auto &ele = *(s.begin());
-    REDIS_ASSERT(_redis.zadd(key, ele.first, ele.second, UpdateType::EXIST) == 0,
-            "failed to test zadd with noexistent member");
-
-    REDIS_ASSERT(_redis.zadd(key, s.begin(), s.end()) == 3, "failed to test zadd");
-
-    REDIS_ASSERT(_redis.zadd(key, ele.first, ele.second, UpdateType::NOT_EXIST) == 0,
-            "failed to test zadd with exist member");
-
-    REDIS_ASSERT(_redis.zadd(key, s.begin(), s.end(), UpdateType::ALWAYS, true) == 0,
-            "failed to test zadd");
-
-    REDIS_ASSERT(_redis.zcard(key) == 3, "failed to test zcard");
-
-    auto rank = _redis.zrank(key, "m2");
-    REDIS_ASSERT(bool(rank) && *rank == 1, "failed to test zrank");
-    rank = _redis.zrevrank(key, "m4");
-    REDIS_ASSERT(!rank, "failed to test zrevrank with nonexistent member");
-
-    auto score = _redis.zscore(key, "m4");
-    REDIS_ASSERT(!score, "failed to test zscore with nonexistent member");
-
-    REDIS_ASSERT(_redis.zincrby(key, 1, "m3") == 4, "failed to test zincrby");
-
-    score = _redis.zscore(key, "m3");
-    REDIS_ASSERT(score && *score == 4, "failed to test zscore");
-
-    REDIS_ASSERT(_redis.zrem(key, "m1") == 1, "failed to test zrem");
-    REDIS_ASSERT(_redis.zrem(key, {"m1", "m2", "m3", "m4"}) == 2, "failed to test zrem");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_zscan() {
-    auto key = test_key("zscan");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::map<std::string, double> s = {
-        std::make_pair("m1", 1.2),
-        std::make_pair("m2", 2),
-        std::make_pair("m3", 3),
-    };
-    _redis.zadd(key, s.begin(), s.end());
-
-    std::map<std::string, double> res;
-    auto cursor = 0;
-    while (true) {
-        cursor = _redis.zscan(key, cursor, "m*", 2, std::inserter(res, res.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-    REDIS_ASSERT(res == s, "failed to test zscan");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_range() {
-    auto key = test_key("range");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::map<std::string, double> s = {
-        std::make_pair("m1", 1),
-        std::make_pair("m2", 2),
-        std::make_pair("m3", 3),
-    };
-    _redis.zadd(key, s.begin(), s.end());
-
-    REDIS_ASSERT(_redis.zcount(key, UnboundedInterval<double>{}) == 3, "failed to test zcount");
-
-    std::vector<std::string> members;
-    _redis.zrange(key, 0, -1, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == s.size(), "failed to test zrange");
-    for (const auto &mem : {"m1", "m2", "m3"}) {
-        REDIS_ASSERT(std::find(members.begin(), members.end(), mem) != members.end(),
-                "failed to test zrange");
-    }
-
-    std::map<std::string, double> res;
-    _redis.zrange(key, 0, -1, std::inserter(res, res.end()));
-    REDIS_ASSERT(s == res, "failed to test zrange with score");
-
-    members.clear();
-    _redis.zrevrange(key, 0, 0, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 && members[0] == "m3", "failed to test zrevrange");
-
-    res.clear();
-    _redis.zrevrange(key, 0, 0, std::inserter(res, res.end()));
-    REDIS_ASSERT(res.size() == 1 && res.find("m3") != res.end() && res["m3"] == 3,
-            "failed to test zrevrange with score");
-
-    members.clear();
-    _redis.zrangebyscore(key, UnboundedInterval<double>{}, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == s.size(), "failed to test zrangebyscore");
-    for (const auto &mem : {"m1", "m2", "m3"}) {
-        REDIS_ASSERT(std::find(members.begin(), members.end(), mem) != members.end(),
-                "failed to test zrangebyscore");
-    }
-
-    members.clear();
-    _redis.zrangebyscore(key,
-            BoundedInterval<double>(1, 2, BoundType::RIGHT_OPEN),
-            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 && members[0] == "m1", "failed to test zrangebyscore");
-
-    res.clear();
-    _redis.zrangebyscore(key,
-            LeftBoundedInterval<double>(2, BoundType::OPEN),
-            std::inserter(res, res.end()));
-    REDIS_ASSERT(res.size() == 1 && res.find("m3") != res.end() && res["m3"] == 3,
-            "failed to test zrangebyscore");
-
-    members.clear();
-    _redis.zrevrangebyscore(key,
-            BoundedInterval<double>(1, 3, BoundType::CLOSED),
-            std::back_inserter(members));
-    REDIS_ASSERT(members == std::vector<std::string>({"m3", "m2", "m1"}),
-            "failed to test zrevrangebyscore");
-
-    res.clear();
-    _redis.zrevrangebyscore(key,
-            RightBoundedInterval<double>(1, BoundType::LEFT_OPEN),
-            std::inserter(res, res.end()));
-    REDIS_ASSERT(res.size() == 1 && res.find("m1") != res.end() && res["m1"] == 1,
-            "failed to test zrevrangebyscore");
-
-    REDIS_ASSERT(_redis.zremrangebyrank(key, 0, 0) == 1, "failed to test zremrangebyrank");
-
-    REDIS_ASSERT(_redis.zremrangebyscore(key,
-                BoundedInterval<double>(2, 3, BoundType::LEFT_OPEN)) == 1,
-            "failed to test zremrangebyscore");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_lex() {
-    auto key = test_key("lex");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto s = {
-        std::make_pair("m1", 0),
-        std::make_pair("m2", 0),
-        std::make_pair("m3", 0),
-    };
-    _redis.zadd(key, s.begin(), s.end());
-
-    REDIS_ASSERT(_redis.zlexcount(key, UnboundedInterval<std::string>{}) == 3,
-            "failed to test zlexcount");
-
-    std::vector<std::string> members;
-    _redis.zrangebylex(key,
-            LeftBoundedInterval<std::string>("m2", BoundType::OPEN),
-            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 && members[0] == "m3",
-            "failed to test zrangebylex");
-
-    members.clear();
-    _redis.zrevrangebylex(key,
-            RightBoundedInterval<std::string>("m1", BoundType::LEFT_OPEN),
-            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 && members[0] == "m1",
-            "failed to test zrevrangebylex");
-
-    REDIS_ASSERT(_redis.zremrangebylex(key,
-                BoundedInterval<std::string>("m1", "m3", BoundType::OPEN)) == 1,
-            "failed to test zremrangebylex");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_multi_zset() {
-    auto k1 = test_key("k1");
-    auto k2 = test_key("k2");
-    auto k3 = test_key("k3");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {k1, k2, k3});
-
-    _redis.zadd(k1, {std::make_pair("a", 1), std::make_pair("b", 2)});
-    _redis.zadd(k2, {std::make_pair("a", 2), std::make_pair("c", 3)});
-
-    REDIS_ASSERT(_redis.zinterstore(k3, {k1, k2}) == 1, "failed to test zinterstore");
-    auto score = _redis.zscore(k3, "a");
-    REDIS_ASSERT(bool(score) && *score == 3, "failed to test zinterstore");
-
-    REDIS_ASSERT(_redis.zinterstore(k3, k1, 2) == 2, "failed to test zinterstore");
-
-    _redis.del(k3);
-
-    REDIS_ASSERT(_redis.zinterstore(k3, {k1, k2}, Aggregation::MAX) == 1,
-            "failed to test zinterstore");
-    score = _redis.zscore(k3, "a");
-    REDIS_ASSERT(bool(score) && *score == 2, "failed to test zinterstore");
-
-    _redis.del(k3);
-
-    REDIS_ASSERT(_redis.zunionstore(k3,
-                {std::make_pair(k1, 1), std::make_pair(k2, 2)},
-                Aggregation::MIN) == 3,
-            "failed to test zunionstore");
-    std::vector<std::pair<std::string, double>> res;
-    _redis.zrange(k3, 0, -1, std::back_inserter(res));
-    for (const auto &ele : res) {
-        if (ele.first == "a") {
-            REDIS_ASSERT(ele.second == 1, "failed to test zunionstore");
-        } else if (ele.first == "b") {
-            REDIS_ASSERT(ele.second == 2, "failed to test zunionstore");
-        } else if (ele.first == "c") {
-            REDIS_ASSERT(ele.second == 6, "failed to test zunionstore");
-        } else {
-            REDIS_ASSERT(false, "failed to test zuionstore");
-        }
-    }
-
-    REDIS_ASSERT(_redis.zunionstore(k3, k1, 2) == 2, "failed to test zunionstore");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_zpop() {
-    auto key = test_key("zpop");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    _redis.zadd(key, {std::make_pair("m1", 1.1),
-                        std::make_pair("m2", 2.2),
-                        std::make_pair("m3", 3.3),
-                        std::make_pair("m4", 4.4),
-                        std::make_pair("m5", 5.5),
-                        std::make_pair("m6", 6.6)});
-
-    auto item = _redis.zpopmax(key);
-    REDIS_ASSERT(item && item->first == "m6", "failed to test zpopmax");
-
-    item = _redis.zpopmin(key);
-    REDIS_ASSERT(item && item->first == "m1", "failed to test zpopmin");
-
-    std::vector<std::pair<std::string, double>> vec;
-    _redis.zpopmax(key, 2, std::back_inserter(vec));
-    REDIS_ASSERT(vec.size() == 2 && vec[0].first == "m5" && vec[1].first == "m4",
-            "failed to test zpopmax");
-
-    std::unordered_map<std::string, double> m;
-    _redis.zpopmin(key, 2, std::inserter(m, m.end()));
-    REDIS_ASSERT(m.size() == 2 && m.find("m3") != m.end() && m.find("m2") != m.end(),
-            "failed to test zpopmin");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_bzpop() {
-    auto key1 = test_key("bzpop1");
-    auto key2 = test_key("bzpop2");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key1, key2});
-
-    _redis.zadd(key1, {std::make_pair("m1", 1.1),
-                        std::make_pair("m2", 2.2),
-                        std::make_pair("m3", 3.3),
-                        std::make_pair("m4", 4.4),
-                        std::make_pair("m5", 5.5),
-                        std::make_pair("m6", 6.6)});
-
-    _redis.zadd(key2, {std::make_pair("m1", 1.1),
-                        std::make_pair("m2", 2.2),
-                        std::make_pair("m3", 3.3),
-                        std::make_pair("m4", 4.4),
-                        std::make_pair("m5", 5.5),
-                        std::make_pair("m6", 6.6)});
-
-    auto item = _redis.bzpopmax(key1);
-    REDIS_ASSERT(item && std::get<0>(*item) == key1 && std::get<1>(*item) == "m6",
-            "failed to test bzpopmax");
-
-    item = _redis.bzpopmin(key1, std::chrono::seconds(1));
-    REDIS_ASSERT(item && std::get<0>(*item) == key1 && std::get<1>(*item) == "m1",
-            "failed to test zpopmin");
-
-    item = _redis.bzpopmax({key1, key2}, std::chrono::seconds(1));
-    REDIS_ASSERT(item && std::get<0>(*item) == key1 && std::get<1>(*item) == "m5",
-            "failed to test zpopmax");
-
-    item = _redis.bzpopmin({key2, key1});
-    REDIS_ASSERT(item && std::get<0>(*item) == key2 && std::get<1>(*item) == "m1",
-            "failed to test zpopmin");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/bug_report.md b/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 3d4069bbd..000000000
--- a/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG]"
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Minimal code to reproduce the bug.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Environment:**
- - OS: [e.g. ubuntu]
- - Compiler: [e.g. gcc 7.3.1, clang 3.9.1]
- - hiredis version: [e.g. v1.0.0, master]
- - redis-plus-plus version: [e.g. 1.3.2, master, commit b0a42e]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/feature_request.md b/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index e0c0168b2..000000000
--- a/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEATURE]"
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/question.md b/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index acaab024e..000000000
--- a/ext/redis-plus-plus-1.3.3/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Question
-about: Ask a question
-title: "[QUESTION]"
-labels: ''
-assignees: ''
-
----
-
-**Before Asking A Question**
-The [README.md file](https://github.com/sewenew/redis-plus-plus/blob/master/README.md) has a detailed introduction with examples on how to use redis-plus-plus, and [redis.h](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/redis.h) has doxgen style comments for most commands. Before asking a question, please try to find answers with these two files.
-
-For general questions on redis-plus-plus, you can ask questions at StackOverflow with [redis tag](https://stackoverflow.com/questions/tagged/redis), and normally, you'll get faster response on StackOverflow.
-
-However, if you still don't get answers, feel free to ask a question here.
-
-**Describe the problem**
-A clear and concise description of the problem, with minimal code to reproduce the problem.
-
-**Environment:**
- - OS: [e.g. ubuntu]
- - Compiler: [e.g. gcc 7.3.1, clang 3.9.1]
- - hiredis version: [e.g. v1.0.0, master]
- - redis-plus-plus version: [e.g. 1.3.2, master, commit b0a42e]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/ext/redis-plus-plus-1.3.3/.gitignore b/ext/redis-plus-plus-1.3.3/.gitignore
deleted file mode 100644
index 259148fa1..000000000
--- a/ext/redis-plus-plus-1.3.3/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
diff --git a/ext/redis-plus-plus-1.3.3/.travis.yml b/ext/redis-plus-plus-1.3.3/.travis.yml
deleted file mode 100644
index ddcbe3a3e..000000000
--- a/ext/redis-plus-plus-1.3.3/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-language: cpp
-
-os:
-  - linux
-  - osx
-
-dist: bionic
-
-compiler:
-  - gcc
-  - clang
-
-before_install:
-  - wget -L https://github.com/redis/redis/archive/6.0.8.tar.gz -O redis-6.0.8.tar.gz
-  - tar xfz redis-6.0.8.tar.gz
-  - wget -L https://github.com/redis/hiredis/archive/master.zip -O hiredis-master.zip
-  - unzip hiredis-master.zip
-  - mkdir -p $TRAVIS_BUILD_DIR/install
-
-install:
-  - cd redis-6.0.8 && make -j2 && cd ..
-  - ./redis-6.0.8/src/redis-server &
-  - cd hiredis-master && make PREFIX=$TRAVIS_BUILD_DIR/install -j2 install && cd ..
-
-script:
-  - mkdir compile && cd compile && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/install .. && make -j2 && cd ..
-  - ./compile/test/test_redis++ -h 127.0.0.1 -p 6379
-
-branches:
-  only:
-    - master
-    - dev
diff --git a/ext/redis-plus-plus-1.3.3/CMakeLists.txt b/ext/redis-plus-plus-1.3.3/CMakeLists.txt
deleted file mode 100644
index 29b8bfe32..000000000
--- a/ext/redis-plus-plus-1.3.3/CMakeLists.txt
+++ /dev/null
@@ -1,307 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-
-set(REDIS_PLUS_PLUS_VERSION "1.3.3")
-message(STATUS "redis-plus-plus version: ${REDIS_PLUS_PLUS_VERSION}")
-
-project(redis++ LANGUAGES CXX VERSION ${REDIS_PLUS_PLUS_VERSION})
-
-set(REDIS_PLUS_PLUS_DEFAULT_BUILD_TYPE "Release")
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set(CMAKE_BUILD_TYPE ${REDIS_PLUS_PLUS_DEFAULT_BUILD_TYPE} CACHE STRING "Set build type" FORCE)
-    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo" "MinSizeRel")
-endif()
-message(STATUS "redis-plus-plus build type: ${CMAKE_BUILD_TYPE}")
-
-set(REDIS_PLUS_PLUS_DEFAULT_CXX_STANDARD 17)
-if(NOT REDIS_PLUS_PLUS_CXX_STANDARD)
-    set(REDIS_PLUS_PLUS_CXX_STANDARD ${REDIS_PLUS_PLUS_DEFAULT_CXX_STANDARD} CACHE STRING "Set CXX standard" FORCE)
-    set_property(CACHE REDIS_PLUS_PLUS_CXX_STANDARD PROPERTY STRINGS "11" "14" "17" "20")
-endif()
-message(STATUS "redis-plus-plus build with CXX standard: c++${REDIS_PLUS_PLUS_CXX_STANDARD}")
-
-if(NOT WIN32)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${REDIS_PLUS_PLUS_CXX_STANDARD}")
-else()
-    if(MSVC)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++${REDIS_PLUS_PLUS_CXX_STANDARD}")
-    else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${REDIS_PLUS_PLUS_CXX_STANDARD}")
-    endif()
-endif()
-
-if(REDIS_PLUS_PLUS_BUILD_ASYNC)
-    if(REDIS_PLUS_PLUS_BUILD_ASYNC STREQUAL "libuv")
-        message(STATUS "redis-plus-plus build async interface with libuv")
-
-        # libuv dependency
-        find_path(REDIS_PLUS_PLUS_ASYNC_LIB_HEADER NAMES uv.h)
-        find_library(REDIS_PLUS_PLUS_ASYNC_LIB uv)
-    else()
-        message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_BUILD_ASYNC")
-    endif()
-endif()
-
-set(REDIS_PLUS_PLUS_SOURCE_DIR src/sw/redis++)
-
-set(REDIS_PLUS_PLUS_SOURCES
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/command.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/command_options.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/connection.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/connection_pool.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/crc16.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/errors.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/pipeline.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/redis.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/redis_cluster.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/reply.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/sentinel.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/shards.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/shards_pool.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/subscriber.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/transaction.cpp"
-)
-
-if(REDIS_PLUS_PLUS_BUILD_ASYNC)
-    list(APPEND REDIS_PLUS_PLUS_SOURCES
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/async_connection.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/async_connection_pool.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/async_redis.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/event_loop.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/async_sentinel.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/async_redis_cluster.cpp"
-        "${REDIS_PLUS_PLUS_SOURCE_DIR}/async_shards_pool.cpp"
-    )
-
-    if(NOT REDIS_PLUS_PLUS_ASYNC_FUTURE)
-        set(REDIS_PLUS_PLUS_ASYNC_FUTURE "std")
-    endif()
-
-    if(REDIS_PLUS_PLUS_ASYNC_FUTURE STREQUAL "std")
-        set(REDIS_PLUS_PLUS_ASYNC_FUTURE_HEADER "${REDIS_PLUS_PLUS_SOURCE_DIR}/future/std")
-    elseif(REDIS_PLUS_PLUS_ASYNC_FUTURE STREQUAL "boost")
-        set(REDIS_PLUS_PLUS_ASYNC_FUTURE_HEADER "${REDIS_PLUS_PLUS_SOURCE_DIR}/future/boost")
-        find_package(Boost REQUIRED COMPONENTS system thread)
-    else()
-        message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_ASYNC_FUTURE")
-    endif()
-endif()
-
-# cxx utils
-if(REDIS_PLUS_PLUS_CXX_STANDARD LESS 17)
-    set(CXX_UTILS_DIR "${REDIS_PLUS_PLUS_SOURCE_DIR}/cxx11")
-else()
-    set(CXX_UTILS_DIR "${REDIS_PLUS_PLUS_SOURCE_DIR}/cxx17")
-endif()
-
-# TLS support
-option(REDIS_PLUS_PLUS_USE_TLS "Build with TLS support" OFF)
-message(STATUS "redis-plus-plus TLS support: ${REDIS_PLUS_PLUS_USE_TLS}")
-
-if(REDIS_PLUS_PLUS_USE_TLS)
-    set(TLS_SUB_DIR "${REDIS_PLUS_PLUS_SOURCE_DIR}/tls")
-
-    list(APPEND REDIS_PLUS_PLUS_SOURCES "${TLS_SUB_DIR}/tls.cpp")
-
-    set(REDIS_PLUS_PLUS_DEPENDS "hiredis,hiredis_ssl")
-else()
-    set(TLS_SUB_DIR "${REDIS_PLUS_PLUS_SOURCE_DIR}/no_tls")
-
-    set(REDIS_PLUS_PLUS_DEPENDS "hiredis")
-endif()
-
-# hiredis dependency
-find_package(hiredis QUIET)
-if(hiredis_FOUND)
-    list(APPEND REDIS_PLUS_PLUS_HIREDIS_LIBS hiredis::hiredis)
-
-    if(REDIS_PLUS_PLUS_USE_TLS)
-        find_package(hiredis_ssl REQUIRED)
-        list(APPEND REDIS_PLUS_PLUS_HIREDIS_LIBS hiredis::hiredis_ssl)
-    endif()
-else()
-    find_path(HIREDIS_HEADER hiredis)
-    find_library(HIREDIS_LIB hiredis)
-    list(APPEND REDIS_PLUS_PLUS_HIREDIS_LIBS ${HIREDIS_LIB})
-
-    if(REDIS_PLUS_PLUS_USE_TLS)
-        find_library(HIREDIS_TLS_LIB hiredis_ssl)
-        list(APPEND REDIS_PLUS_PLUS_HIREDIS_LIBS ${HIREDIS_TLS_LIB})
-    endif()
-endif()
-
-# Build static library
-option(REDIS_PLUS_PLUS_BUILD_STATIC "Build static library" ON)
-message(STATUS "redis-plus-plus build static library: ${REDIS_PLUS_PLUS_BUILD_STATIC}")
-
-if(REDIS_PLUS_PLUS_BUILD_STATIC)
-    set(STATIC_LIB redis++_static)
-
-    add_library(${STATIC_LIB} STATIC ${REDIS_PLUS_PLUS_SOURCES})
-    add_library(redis++::${STATIC_LIB} ALIAS ${STATIC_LIB})
-
-    list(APPEND REDIS_PLUS_PLUS_TARGETS ${STATIC_LIB})
-
-    target_include_directories(${STATIC_LIB} PUBLIC
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}>
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${TLS_SUB_DIR}>
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${CXX_UTILS_DIR}>
-            $<INSTALL_INTERFACE:include>)
-
-    if(hiredis_FOUND)
-        target_link_libraries(${STATIC_LIB} PUBLIC ${REDIS_PLUS_PLUS_HIREDIS_LIBS})
-    else()
-        target_include_directories(${STATIC_LIB} PUBLIC $<BUILD_INTERFACE:${HIREDIS_HEADER}>)
-    endif()
-
-    if(REDIS_PLUS_PLUS_BUILD_ASYNC)
-        target_include_directories(${STATIC_LIB} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_ASYNC_FUTURE_HEADER}>)
-        target_include_directories(${STATIC_LIB} PUBLIC $<BUILD_INTERFACE:${REDIS_PLUS_PLUS_ASYNC_LIB_HEADER}>)
-        if(REDIS_PLUS_PLUS_ASYNC_FUTURE STREQUAL "boost")
-            target_include_directories(${STATIC_LIB} SYSTEM PUBLIC $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>)
-        endif()
-    endif()
-
-    if (WIN32)
-        target_compile_definitions(${STATIC_LIB} PRIVATE NOMINMAX)
-        set_target_properties(${STATIC_LIB} PROPERTIES CXX_STANDARD ${REDIS_PLUS_PLUS_CXX_STANDARD})
-        set_target_properties(${STATIC_LIB} PROPERTIES OUTPUT_NAME redis++_static)
-    else()
-        target_compile_options(${STATIC_LIB} PRIVATE "-Wall" "-W" "-Werror")
-        set_target_properties(${STATIC_LIB} PROPERTIES OUTPUT_NAME redis++)
-    endif()
-
-    set_target_properties(${STATIC_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-    set_target_properties(${STATIC_LIB} PROPERTIES CXX_EXTENSIONS OFF)
-
-    option(REDIS_PLUS_PLUS_BUILD_STATIC_WITH_PIC "Build static library with position independent code" ON)
-    message(STATUS "redis-plus-plus build static library with position independent code: ${REDIS_PLUS_PLUS_BUILD_STATIC_WITH_PIC}")
-
-    if(REDIS_PLUS_PLUS_BUILD_STATIC_WITH_PIC)
-        set_target_properties(${STATIC_LIB} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    endif()
-endif()
-
-# Build shared library
-option(REDIS_PLUS_PLUS_BUILD_SHARED "Build shared library" ON)
-message(STATUS "redis-plus-plus build shared library: ${REDIS_PLUS_PLUS_BUILD_SHARED}")
-
-if(REDIS_PLUS_PLUS_BUILD_SHARED)
-    set(SHARED_LIB redis++)
-
-    add_library(${SHARED_LIB} SHARED ${REDIS_PLUS_PLUS_SOURCES})
-    add_library(redis++::${SHARED_LIB} ALIAS ${SHARED_LIB})
-    
-    list(APPEND REDIS_PLUS_PLUS_TARGETS ${SHARED_LIB})
-
-    target_include_directories(${SHARED_LIB} PUBLIC
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}>
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${TLS_SUB_DIR}>
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${CXX_UTILS_DIR}>
-            $<INSTALL_INTERFACE:include>)
-
-    if(hiredis_FOUND)
-        target_link_libraries(${SHARED_LIB} PUBLIC ${REDIS_PLUS_PLUS_HIREDIS_LIBS})
-    else()
-        target_include_directories(${SHARED_LIB} PUBLIC $<BUILD_INTERFACE:${HIREDIS_HEADER}>)
-        target_link_libraries(${SHARED_LIB} PUBLIC ${REDIS_PLUS_PLUS_HIREDIS_LIBS})
-    endif()
-
-    if(REDIS_PLUS_PLUS_BUILD_ASYNC)
-        target_include_directories(${SHARED_LIB} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_ASYNC_FUTURE_HEADER}>)
-        target_include_directories(${SHARED_LIB} PUBLIC $<BUILD_INTERFACE:${REDIS_PLUS_PLUS_ASYNC_LIB_HEADER}>)
-        target_link_libraries(${SHARED_LIB} PUBLIC ${REDIS_PLUS_PLUS_ASYNC_LIB})
-        if(REDIS_PLUS_PLUS_ASYNC_FUTURE STREQUAL "boost")
-            target_include_directories(${SHARED_LIB} SYSTEM PUBLIC $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>)
-        endif()
-    endif()
-
-    if(WIN32)
-        target_compile_definitions(${SHARED_LIB} PRIVATE NOMINMAX)
-        set_target_properties(${SHARED_LIB} PROPERTIES CXX_STANDARD ${REDIS_PLUS_PLUS_CXX_STANDARD})
-        set_target_properties(${SHARED_LIB} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-    else()
-        target_compile_options(${SHARED_LIB} PRIVATE "-Wall" "-W" "-Werror")
-    endif()
-
-    set_target_properties(${SHARED_LIB} PROPERTIES OUTPUT_NAME redis++)
-    set_target_properties(${SHARED_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-    set_target_properties(${SHARED_LIB} PROPERTIES CXX_EXTENSIONS OFF)
-    set_target_properties(${SHARED_LIB} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    set_target_properties(${SHARED_LIB} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-endif()
-
-option(REDIS_PLUS_PLUS_BUILD_TEST "Build tests for redis++" ON)
-message(STATUS "redis-plus-plus build test: ${REDIS_PLUS_PLUS_BUILD_TEST}")
-
-if(REDIS_PLUS_PLUS_BUILD_TEST)
-    add_subdirectory(test)
-endif()
-
-install(TARGETS ${REDIS_PLUS_PLUS_TARGETS}
-        EXPORT redis++-targets
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib
-        RUNTIME DESTINATION bin
-        INCLUDES DESTINATION include)
-
-set(REDIS_PLUS_PLUS_CMAKE_DESTINATION share/cmake/redis++)
-
-install(EXPORT redis++-targets
-        FILE redis++-targets.cmake
-        NAMESPACE redis++::
-        DESTINATION ${REDIS_PLUS_PLUS_CMAKE_DESTINATION})
-
-# Install headers.
-set(HEADER_PATH "sw/redis++")
-file(GLOB HEADERS "${REDIS_PLUS_PLUS_SOURCE_DIR}/*.h*" "${TLS_SUB_DIR}/*.h" "${CXX_UTILS_DIR}/*.h" "${REDIS_PLUS_PLUS_ASYNC_FUTURE_HEADER}/*.h")
-if(NOT REDIS_PLUS_PLUS_BUILD_ASYNC)
-    file(GLOB ASYNC_HEADERS "${REDIS_PLUS_PLUS_SOURCE_DIR}/async_*.h" "${REDIS_PLUS_PLUS_SOURCE_DIR}/event_*.h")
-    list(REMOVE_ITEM HEADERS ${ASYNC_HEADERS})
-endif()
-install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${HEADER_PATH})
-
-include(CMakePackageConfigHelpers)
-
-write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++-config-version.cmake"
-        VERSION ${PROJECT_VERSION}
-        COMPATIBILITY AnyNewerVersion)
-
-configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/redis++-config.cmake.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++-config.cmake"
-        INSTALL_DESTINATION ${REDIS_PLUS_PLUS_CMAKE_DESTINATION})
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++-config-version.cmake"
-        DESTINATION ${REDIS_PLUS_PLUS_CMAKE_DESTINATION})
-
-export(EXPORT redis++-targets
-        FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++-targets.cmake"
-        NAMESPACE redis++::)
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/redis++.pc.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" @ONLY)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc"
-        DESTINATION "lib/pkgconfig")
-
-# All the Debian-specific cpack defines.
-if(${CMAKE_VERSION} VERSION_GREATER 3.6)
-  SET(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS "ON")
-endif()
-if(NOT DEFINED CPACK_DEBIAN_PACKAGE_DEPENDS)
-  SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6, libhiredis-dev")
-endif()
-SET(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
-SET(CPACK_DEBIAN_PACKAGE_VERSION "${REDIS_PLUS_PLUS_VERSION}")
-SET(CPACK_DEBIAN_PACKAGE_SOURCE "https://github.com/sewenew/redis-plus-plus")
-message(STATUS "Debian package name: ${CPACK_PACKAGE_FILE_NAME}.deb")
-
-# All the common cpack defines.
-if(NOT DEFINED CPACK_PACKAGE_NAME)
-    SET(CPACK_PACKAGE_NAME "libredis++-dev")
-endif()
-SET(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-SET(CPACK_PACKAGE_DESCRIPTION "A pure C++ client for Redis, based on hiredis.")
-SET(CPACK_PACKAGE_CONTACT "anonymous")
-SET(CPACK_GENERATOR "DEB")
-INCLUDE(CPack)
diff --git a/ext/redis-plus-plus-1.3.3/LICENSE b/ext/redis-plus-plus-1.3.3/LICENSE
deleted file mode 100644
index 261eeb9e9..000000000
--- a/ext/redis-plus-plus-1.3.3/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/ext/redis-plus-plus-1.3.3/README.md b/ext/redis-plus-plus-1.3.3/README.md
deleted file mode 100644
index 79aee8cef..000000000
--- a/ext/redis-plus-plus-1.3.3/README.md
+++ /dev/null
@@ -1,2604 +0,0 @@
-# redis-plus-plus
-
-[![Build Status](https://travis-ci.org/sewenew/redis-plus-plus.svg?branch=master)](https://travis-ci.org/sewenew/redis-plus-plus)
-
-- [Overview](#overview)
-    - [Features](#features)
-    - [Branches](#branches)
-- [Installation](#installation)
-    - [Install hiredis](#install-hiredis)
-    - [Install redis-plus-plus](#install-redis-plus-plus)
-    - [Run Tests (Optional)](#run-tests-optional)
-    - [Use redis-plus-plus In Your Project](#use-redis-plus-plus-in-your-project)
-- [Getting Started](#getting-started)
-- [API Reference](#api-reference)
-    - [Connection](#connection)
-    - [Send Command to Redis Server](#send-command-to-redis-server)
-    - [Exception](#exception)
-    - [Generic Command Interface](#generic-command-interface)
-    - [Publish/Subscribe](#publishsubscribe)
-    - [Pipeline](#pipeline)
-    - [Transaction](#transaction)
-    - [Redis Cluster](#redis-cluster)
-    - [Redis Sentinel](#redis-sentinel)
-    - [Redis Stream](#redis-stream)
-    - [Redis Modules](#redis-modules)
-    - [Async Interface](#async-interface)
-- [Redis Recipes](#redis-recipes)
-    - [Redlock](#redlock)
-- [Author](#author)
-
-## Overview
-
-This is a C++ client library for Redis. It's based on [hiredis](https://github.com/redis/hiredis), and is compatible with C++ 17, C++ 14, and C++ 11.
-
-**NOTE**: I'm not a native speaker. So if the documentation is unclear, please feel free to open an issue or pull request. I'll response ASAP.
-
-### Features
-- Most commands for Redis.
-- Connection pool.
-- Redis scripting.
-- Thread safe unless otherwise stated.
-- Redis publish/subscribe.
-- Redis pipeline.
-- Redis transaction.
-- Redis Cluster.
-- Redis Sentinel.
-- STL-like interfaces.
-- Generic command interface.
-- Redis Stream.
-- Redlock.
-- Redis ACL.
-- TLS/SSL support.
-
-### Branches
-
-The master branch is the stable branch, which passes all tests. The dev branch is unstable. If you want to contribute, please create pull request on dev branch.
-
-## Installation
-
-### Install hiredis
-
-Since *redis-plus-plus* is based on *hiredis*, you should install *hiredis* first. The minimum version requirement for *hiredis* is **v0.12.1**. However, [the latest stable release](https://github.com/redis/hiredis/releases) of *hiredis* is always recommended.
-
-**NOTE**: You must ensure that there's only 1 version of hiredis is installed. Otherwise, you might get some wired problems. Check the following issues for example: [issue 135](https://github.com/sewenew/redis-plus-plus/issues/135), [issue 140](https://github.com/sewenew/redis-plus-plus/issues/140) and [issue 158](https://github.com/sewenew/redis-plus-plus/issues/158).
-
-Normally, you can install *hiredis* with a C++ package manager, and that's the easiest way to do it, e.g. `sudo apt-get install libhiredis-dev`. However, if you want to install the latest code of hiredis, or a specified version (e.g. async support needs hiredis v1.0.0 or later), you can install it from source.
-
-Note again: DO NOT INSTALL MULTIPLE VERSIONS OF HIREDIS.
-
-```
-git clone https://github.com/redis/hiredis.git
-
-cd hiredis
-
-make
-
-make install
-```
-
-By default, *hiredis* is installed at */usr/local*. If you want to install *hiredis* at non-default location, use the following commands to specify the installation path.
-
-```
-make PREFIX=/non/default/path
-
-make PREFIX=/non/default/path install
-```
-
-### Install redis-plus-plus
-
-*redis-plus-plus* is built with [CMAKE](https://cmake.org).
-
-```
-git clone https://github.com/sewenew/redis-plus-plus.git
-
-cd redis-plus-plus
-
-mkdir build
-
-cd build
-
-cmake -DREDIS_PLUS_PLUS_CXX_STANDARD=17 ..
-
-make
-
-make install
-
-cd ..
-```
-
-If *hiredis* is installed at non-default location, you should use `CMAKE_PREFIX_PATH` to specify the installation path of *hiredis*. By default, *redis-plus-plus* is installed at */usr/local*. However, you can use `CMAKE_INSTALL_PREFIX` to install *redis-plus-plus* at non-default location.
-
-```
-cmake -DCMAKE_PREFIX_PATH=/path/to/hiredis -DCMAKE_INSTALL_PREFIX=/path/to/install/redis-plus-plus ..
-```
-
-Since version 1.3.0, by default, *redis-plus-plus* is built with the `-std=c++17` standard. So that we can use the [std::string_view](#stringview) and [std::optional](#optional) features. However, it can also be built with the `-std=c++11` or `-std=c++14` standard, and in that case, we have our own simple implementation of `std::string_view` and `std::optional`. In order to explicitly specify c++ standard, you can use the following cmake flag: `-DREDIS_PLUS_PLUS_CXX_STANDARD=11`.
-
-```
-cmake -DCMAKE_PREFIX_PATH=/path/to/hiredis -DCMAKE_INSTALL_PREFIX=/path/to/install/redis-plus-plus -DREDIS_PLUS_PLUS_CXX_STANDARD=11 ..
-```
-
-**NOTE**: You should build *redis-plus-plus* and your application with the same standard, e.g. if you build *redis-plus-plus* with C++17 standard, you MUST also build your application code with C++17 standard.
-
-When compiling *redis-plus-plus*, it also compiles a test program, which might take a while. However, you can disable building test with the following cmake option: `-DREDIS_PLUS_PLUS_BUILD_TEST=OFF`.
-
-```
-cmake -DCMAKE_PREFIX_PATH=/path/to/hiredis -DCMAKE_INSTALL_PREFIX=/path/to/install/redis-plus-plus -DREDIS_PLUS_PLUS_BUILD_TEST=OFF ..
-```
-
-By default, *redis-plus-plus* builds both a static library and a shared library. If you only want to build one of them, you can disable the other with `-DREDIS_PLUS_PLUS_BUILD_STATIC=OFF` or `-DREDIS_PLUS_PLUS_BUILD_SHARED=OFF`.
-
-*redis-plus-plus* builds static library with `-fPIC` option, i.e. Position Independent Code, by default. However, you can disable it with `-DREDIS_PLUS_PLUS_BUILD_STATIC_WITH_PIC=OFF`.
-
-#### Windows Support
-
-Now *hiredis* has Windows support, and since Visual Studio 2017, Visual Studio has built-in support for CMake. So *redis-plus-plus* also supports Windows platform now. It has been fully tested with Visual Studio 2017 and later on Win 10. I'm not familiar with Visual Studio environment, and the following doc might not be accurate. If you're familiar with the Windows platform, feel free to update this doc on how to install *redis-plus-plus* on Windows.
-
-##### CMake Support On Visual Studio
-
-The following are some links on how to build CMake project with Visual Studio 2017 or later. If you're not familiar with it, you'd better read these instructions first:
-
-- [CMake support in Visual Studio](https://devblogs.microsoft.com/cppblog/cmake-support-in-visual-studio/)
-- [CMake projects in Visual Studio](https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=vs-2017)
-- [CMakeSettings.json schema reference](https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=vs-2017)
-- [Open a project from a GitHub repo](https://docs.microsoft.com/en-us/visualstudio/get-started/tutorial-open-project-from-repo?view=vs-2019#open-a-project-from-a-github-repo)
-
-**NOTE**: IMHO, Visual Studio 2017's support for CMake project is not very mature, and I recommend you to build *hiredis* and *redis-plus-plus with Visual Studio 2019.
-
-##### Build hiredis
-
-First of all, you need to get the latest code of *hiredis* on master branch. Older version might not support Windows platform. *hiredis*' CMakeLists.txt uses `add_compile_definitions` method, which is only supported by cmake 3.12 or later. However, Visual Studio 2017's cmake version is older than that. So if you're using Visual Studio 2017, you need to comment the following line in the CMakeLists.txt file:
-
-```
-#IF(WIN32)
-#    ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN)
-#ENDIF()
-```
-
-You can use the **Open Folder** feature to open *hiredis* project, and build it with the instructions (links) mentioned above.
-
-##### Build redis-plus-plus
-
-Since *redis-plus-plus* depends on *hiredis*, we need to specify the installation paths of *hiredis* before building it. You can use the **Open Folder** feature to open *redis-plus-plus* project. You need to edit the *CMakeSetting.json* file (automatically generated by Visual Studio) to set *HIREDIS_HEADER*, *HIREDIS_LIB* and *TEST_HIREDIS_LIB* variables to specify the installation path of hiredis headers, installation path of hiredis dynamic library and installation path of hiredis static library. The following is an example of *CMakeSetting.json* file:
-
-```
-{
-    "configurations": [
-      {
-        "name": "x64-Release",
-        "generator": "Visual Studio 15 2017 Win64",
-        "configurationType": "Release",
-        "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
-        "cmakeCommandArgs": "",
-        "buildCommandArgs": "-m -v:minimal",
-        "variables": [
-          {
-            "name": "HIREDIS_HEADER",
-            "value": "installation path of hiredis header files",
-            "type": "PATH"
-          },
-          {
-            "name": "HIREDIS_LIB",
-            "value": "installation path of dynamic library of hiredis",
-            "type": "FILEPATH"
-          },
-          {
-            "name": "TEST_HIREDIS_LIB",
-            "value": "installation path of static library of hiredis",
-            "type": "FILEPATH"
-          }
-        ]
-      }
-    ]
-}
-```
-
-Then you can build it the instructions (links) mentioned above. If you're building with Visual Studio 2017 in debug mode, you might get [/bigobj error](https://docs.microsoft.com/en-us/cpp/build/reference/bigobj-increase-number-of-sections-in-dot-obj-file?view=vs-2017) when building the test. In this case, you can disable building test by setting `-DREDIS_PLUS_PLUS_BUILD_TEST=OFF` or build it in Release mode.
-
-**NOTE**:
-
-- Since 1.3.0, *redis-puls-plus* is built with C++17 by default, and you should also set your application code to be built with C++17. If you still want to build the *redis-plus-plus* with C++11, you can set the `REDIS_PLUS_PLUS_CXX_STANDARD` cmake option to 11.
-- TLS/SSL support has not been tested on Windows yet.
-
-##### The Order of Header Files
-
-On Windows platform, if your application code also needs to include *windows.h*. You must ensure that *sw/redis++/redis++.h* is included before *windows.h*. Check [this issue](https://github.com/sewenew/redis-plus-plus/issues/194) for detail.
-
-#### Building a redis-plus-plus Debian Package (Optional)
-
-Basic support for building a GNU/Debian package is supplied with the use of cmake.
-The following example shows how to build the Debian package:
-
-```
-mkdir build; cd build
-cmake ..
-cpack -G DEB
-```
-
-The install prefix may be modified as follows:
-
-```
-mkdir build; cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-cpack -G DEB
-```
-
-### Run Tests (Optional)
-
-*redis-plus-plus* has been fully tested with the following compilers:
-
-```
-gcc version 4.8.5 20150623 (Red Hat 4.8.5-39) (GCC)
-gcc version 5.5.0 20171010 (Ubuntu 5.5.0-12ubuntu1)
-gcc version 6.5.0 20181026 (Ubuntu 6.5.0-2ubuntu1~18.04)
-gcc version 7.4.0 (Ubuntu 7.4.0-1ubuntu1~18.04.1)
-gcc version 8.3.0 (Ubuntu 8.3.0-6ubuntu1~18.04.1)
-gcc version 9.2.1 20191008 (Ubuntu 9.2.1-9ubuntu2)
-gcc version 10.2.1 20210110 (Debian 10.2.1-6)
-clang version 3.9.1-19ubuntu1 (tags/RELEASE_391/rc2)
-clang version 4.0.1-10 (tags/RELEASE_401/final)
-clang version 5.0.1-4 (tags/RELEASE_501/final)
-clang version 6.0.0-1ubuntu2 (tags/RELEASE_600/final)
-clang version 7.0.0-3~ubuntu0.18.04.1 (tags/RELEASE_700/final)
-clang version 8.0.1-3build1 (tags/RELEASE_801/final)
-Apple clang version 11.0.0 (clang-1100.0.33.12)
-Visual Studio 2017 (Win 10)
-Visual Studio 2019 (Win 10)
-```
-
-If you build *redis-plus-plus* with `-DREDIS_PLUS_PLUS_BUILD_TEST=ON` (the default behavior, and you can disable building test with `-DREDIS_PLUS_PLUS_BUILD_TEST=OFF`), you'll get a test program in *compile/test* directory: *compile/test/test_redis++*.
-
-In order to run the tests, you need to set up a Redis instance, and a Redis Cluster. Since the test program will send most of Redis commands to the server and cluster, you need to set up Redis of the latest version (by now, it's 5.0). Otherwise, the tests might fail. For example, if you set up Redis 4.0 for testing, the test program will fail when it tries to send the `ZPOPMAX` command (a Redis 5.0 command) to the server. If you want to run the tests with other Redis versions, you have to comment out commands that haven't been supported by your Redis, from test source files in *redis-plus-plus/test/src/sw/redis++/* directory. Sorry for the inconvenience, and I'll fix this problem to make the test program work with any version of Redis in the future.
-
-**NOTE**: The latest version of Redis is only a requirement for running the tests. In fact, you can use *redis-plus-plus* with Redis of any version, e.g. Redis 2.0, Redis 3.0, Redis 4.0, Redis 5.0.
-
-**NEVER** run the test program in production envronment, since the keys, which the test program reads or writes, might conflict with your application.
-
-In order to run tests with both Redis and Redis Cluster, you can run the test program with the following command:
-
-```
-./compile/test/test_redis++ -h host -p port -a auth -n cluster_node -c cluster_port
-```
-
-- *host* and *port* are the host and port number of the Redis instance.
-- *cluster_node* and *cluster_port* are the host and port number of Redis Cluster. You only need to set the host and port number of a single node in the cluster, *redis-plus-plus* will find other nodes automatically.
-- *auth* is the password of the Redis instance and Redis Cluster. The Redis instance and Redis Cluster must be configured with the same password. If there's no password configured, don't set this option.
-
-If you only want to run tests with Redis, you only need to specify *host*, *port* and *auth* options:
-
-```
-./compile/test/test_redis++ -h host -p port -a auth
-```
-
-Similarly, if you only want to run tests with Redis Cluster, just specify *cluster_node*, *cluster_port* and *auth* options:
-
-```
-./compile/test/test_redis++ -a auth -n cluster_node -c cluster_port
-```
-
-By default, the test program will not test running *redis-plus-plus* in multi-threads environment. If you want to do multi-threads test, which might cost a long time, you can specify the *-m* option:
-
-```
-./compile/test/test_redis++ -h host -p port -a auth -n cluster_node -c cluster_port -m
-```
-
-If all tests have been passed, the test program will print the following message:
-
-```
-Pass all tests
-```
-
-Otherwise, it prints the error message.
-
-#### Performance
-
-*redis-plus-plus* runs as fast as *hiredis*, since it's a wrapper of *hiredis*. You can run *test_redis++* in benchmark mode to check the performance in your environment.
-
-```
-./compile/test/test_redis++ -h host -p port -a auth -n cluster_node -c cluster_port -b -t thread_num -s connection_pool_size -r request_num -k key_len -v val_len
-```
-
-- *-b* option turns the test program into benchmark mode.
-- *thread_num* specifies the number of worker threads. `10` by default.
-- *connection_pool_size* specifies the size of the connection pool. `5` by default.
-- *request_num* specifies the total number of requests sent to server for each test. `100000` by default.
-- *key_len* specifies the length of the key for each operation. `10` by default.
-- *val_len* specifies the length of the value. `10` by default.
-
-The bechmark will generate `100` random binary keys for testing, and the size of these keys is specified by *key_len*. When the benchmark runs, it will read/write with these keys. So **NEVER** run the test program in your production environment, otherwise, it might inaccidently delete your data.
-
-### Use redis-plus-plus In Your Project
-
-After compiling the code, you'll get both shared library and static library. Since *redis-plus-plus* depends on *hiredis*, you need to link both libraries to your Application. Also don't forget to specify the c++ standard, `-std=c++17`, `-std=c++14` or `-std=c++11`, as well as the thread-related option.
-
-#### Use Static Libraries
-
-Take gcc as an example.
-
-```
-g++ -std=c++17 -o app app.cpp /path/to/libredis++.a /path/to/libhiredis.a -pthread
-```
-
-If *hiredis* and *redis-plus-plus* are installed at non-default location, you should use `-I` option to specify the header path.
-
-```
-g++ -std=c++17 -I/non-default/install/include/path -o app app.cpp /path/to/libredis++.a /path/to/libhiredis.a -pthread
-```
-
-#### Use Shared Libraries
-
-```
-g++ -std=c++17 -o app app.cpp -lredis++ -lhiredis -pthread
-```
-
-If *hiredis* and *redis-plus-plus* are installed at non-default location, you should use `-I` and `-L` options to specify the header and library paths.
-
-```
-g++ -std=c++17 -I/non-default/install/include/path -L/non-default/install/lib/path -o app app.cpp -lredis++ -lhiredis -pthread
-```
-
-When linking with shared libraries, and running your application, you might get the following error message:
-
-```
-error while loading shared libraries: xxx: cannot open shared object file: No such file or directory.
-```
-
-That's because the linker cannot find the shared libraries. In order to solve the problem, you can add the path where you installed *hiredis* and *redis-plus-plus* libraries, to `LD_LIBRARY_PATH` environment variable. For example:
-
-```
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-```
-
-Check [this StackOverflow question](https://stackoverflow.com/questions/480764) for details on how to solve the problem.
-
-#### Build With Cmake
-
-If you're using cmake to build your application, you need to add *hiredis* and *redis-plus-plus* dependencies in your *CMakeLists.txt*:
-
-```CMake
-# <---------- set c++ standard ------------->
-# NOTE: you must build redis-plus-plus and your application code with the same standard.
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# <------------ add hiredis dependency --------------->
-find_path(HIREDIS_HEADER hiredis)
-target_include_directories(target PUBLIC ${HIREDIS_HEADER})
-
-find_library(HIREDIS_LIB hiredis)
-target_link_libraries(target ${HIREDIS_LIB})
-
-# <------------ add redis-plus-plus dependency -------------->
-# NOTE: this should be *sw* NOT *redis++*
-find_path(REDIS_PLUS_PLUS_HEADER sw)
-target_include_directories(target PUBLIC ${REDIS_PLUS_PLUS_HEADER})
-
-find_library(REDIS_PLUS_PLUS_LIB redis++)
-target_link_libraries(target ${REDIS_PLUS_PLUS_LIB})
-```
-
-See [this issue](https://github.com/sewenew/redis-plus-plus/issues/5) for a complete example of *CMakeLists.txt*.
-
-Also, if you installed *hiredis* and *redis-plus-plus* at non-default location, you need to run cmake with `CMAKE_PREFIX_PATH` option to specify the installation path of these two libraries.
-
-```
-cmake -DCMAKE_PREFIX_PATH=/installation/path/to/the/two/libs ..
-```
-
-## Getting Started
-
-```C++
-#include <sw/redis++/redis++.h>
-
-using namespace sw::redis;
-
-try {
-    // Create an Redis object, which is movable but NOT copyable.
-    auto redis = Redis("tcp://127.0.0.1:6379");
-
-    // ***** STRING commands *****
-
-    redis.set("key", "val");
-    auto val = redis.get("key");    // val is of type OptionalString. See 'API Reference' section for details.
-    if (val) {
-        // Dereference val to get the returned value of std::string type.
-        std::cout << *val << std::endl;
-    }   // else key doesn't exist.
-
-    // ***** LIST commands *****
-
-    // std::vector<std::string> to Redis LIST.
-    std::vector<std::string> vec = {"a", "b", "c"};
-    redis.rpush("list", vec.begin(), vec.end());
-
-    // std::initializer_list to Redis LIST.
-    redis.rpush("list", {"a", "b", "c"});
-
-    // Redis LIST to std::vector<std::string>.
-    vec.clear();
-    redis.lrange("list", 0, -1, std::back_inserter(vec));
-
-    // ***** HASH commands *****
-
-    redis.hset("hash", "field", "val");
-
-    // Another way to do the same job.
-    redis.hset("hash", std::make_pair("field", "val"));
-
-    // std::unordered_map<std::string, std::string> to Redis HASH.
-    std::unordered_map<std::string, std::string> m = {
-        {"field1", "val1"},
-        {"field2", "val2"}
-    };
-    redis.hmset("hash", m.begin(), m.end());
-
-    // Redis HASH to std::unordered_map<std::string, std::string>.
-    m.clear();
-    redis.hgetall("hash", std::inserter(m, m.begin()));
-
-    // Get value only.
-    // NOTE: since field might NOT exist, so we need to parse it to OptionalString.
-    std::vector<OptionalString> vals;
-    redis.hmget("hash", {"field1", "field2"}, std::back_inserter(vals));
-
-    // ***** SET commands *****
-
-    redis.sadd("set", "m1");
-
-    // std::unordered_set<std::string> to Redis SET.
-    std::unordered_set<std::string> set = {"m2", "m3"};
-    redis.sadd("set", set.begin(), set.end());
-
-    // std::initializer_list to Redis SET.
-    redis.sadd("set", {"m2", "m3"});
-
-    // Redis SET to std::unordered_set<std::string>.
-    set.clear();
-    redis.smembers("set", std::inserter(set, set.begin()));
-
-    if (redis.sismember("set", "m1")) {
-        std::cout << "m1 exists" << std::endl;
-    }   // else NOT exist.
-
-    // ***** SORTED SET commands *****
-
-    redis.zadd("sorted_set", "m1", 1.3);
-
-    // std::unordered_map<std::string, double> to Redis SORTED SET.
-    std::unordered_map<std::string, double> scores = {
-        {"m2", 2.3},
-        {"m3", 4.5}
-    };
-    redis.zadd("sorted_set", scores.begin(), scores.end());
-
-    // Redis SORTED SET to std::vector<std::pair<std::string, double>>.
-    // NOTE: The return results of zrangebyscore are ordered, if you save the results
-    // in to `std::unordered_map<std::string, double>`, you'll lose the order.
-    std::vector<std::pair<std::string, double>> zset_result;
-    redis.zrangebyscore("sorted_set",
-            UnboundedInterval<double>{},            // (-inf, +inf)
-            std::back_inserter(zset_result));
-
-    // Only get member names:
-    // pass an inserter of std::vector<std::string> type as output parameter.
-    std::vector<std::string> without_score;
-    redis.zrangebyscore("sorted_set",
-            BoundedInterval<double>(1.5, 3.4, BoundType::CLOSED),   // [1.5, 3.4]
-            std::back_inserter(without_score));
-
-    // Get both member names and scores:
-    // pass an back_inserter of std::vector<std::pair<std::string, double>> as output parameter.
-    std::vector<std::pair<std::string, double>> with_score;
-    redis.zrangebyscore("sorted_set",
-            BoundedInterval<double>(1.5, 3.4, BoundType::LEFT_OPEN),    // (1.5, 3.4]
-            std::back_inserter(with_score));
-
-    // ***** SCRIPTING commands *****
-
-    // Script returns a single element.
-    auto num = redis.eval<long long>("return 1", {}, {});
-
-    // Script returns an array of elements.
-    std::vector<long long> nums;
-    redis.eval("return {ARGV[1], ARGV[2]}", {}, {"1", "2"}, std::back_inserter(nums));
-
-    // mset with TTL
-    auto mset_with_ttl_script = R"(
-        local len = #KEYS
-        if (len == 0 or len + 1 ~= #ARGV) then return 0 end
-        local ttl = tonumber(ARGV[len + 1])
-        if (not ttl or ttl <= 0) then return 0 end
-        for i = 1, len do redis.call("SET", KEYS[i], ARGV[i], "EX", ttl) end
-        return 1
-    )";
-
-    // Set multiple key-value pairs with TTL of 60 seconds.
-    auto keys = {"key1", "key2", "key3"};
-    std::vector<std::string> args = {"val1", "val2", "val3", "60"};
-    redis.eval<long long>(mset_with_ttl_script, keys.begin(), keys.end(), vals.begin(), vals.end());
-
-    // ***** Pipeline *****
-
-    // Create a pipeline.
-    auto pipe = redis.pipeline();
-
-    // Send mulitple commands and get all replies.
-    auto pipe_replies = pipe.set("key", "value")
-                            .get("key")
-                            .rename("key", "new-key")
-                            .rpush("list", {"a", "b", "c"})
-                            .lrange("list", 0, -1)
-                            .exec();
-
-    // Parse reply with reply type and index.
-    auto set_cmd_result = pipe_replies.get<bool>(0);
-
-    auto get_cmd_result = pipe_replies.get<OptionalString>(1);
-
-    // rename command result
-    pipe_replies.get<void>(2);
-
-    auto rpush_cmd_result = pipe_replies.get<long long>(3);
-
-    std::vector<std::string> lrange_cmd_result;
-    pipe_replies.get(4, back_inserter(lrange_cmd_result));
-
-    // ***** Transaction *****
-
-    // Create a transaction.
-    auto tx = redis.transaction();
-
-    // Run multiple commands in a transaction, and get all replies.
-    auto tx_replies = tx.incr("num0")
-                        .incr("num1")
-                        .mget({"num0", "num1"})
-                        .exec();
-
-    // Parse reply with reply type and index.
-    auto incr_result0 = tx_replies.get<long long>(0);
-
-    auto incr_result1 = tx_replies.get<long long>(1);
-
-    std::vector<OptionalString> mget_cmd_result;
-    tx_replies.get(2, back_inserter(mget_cmd_result));
-
-    // ***** Generic Command Interface *****
-
-    // There's no *Redis::client_getname* interface.
-    // But you can use *Redis::command* to get the client name.
-    val = redis.command<OptionalString>("client", "getname");
-    if (val) {
-        std::cout << *val << std::endl;
-    }
-
-    // Same as above.
-    auto getname_cmd_str = {"client", "getname"};
-    val = redis.command<OptionalString>(getname_cmd_str.begin(), getname_cmd_str.end());
-
-    // There's no *Redis::sort* interface.
-    // But you can use *Redis::command* to send sort the list.
-    std::vector<std::string> sorted_list;
-    redis.command("sort", "list", "ALPHA", std::back_inserter(sorted_list));
-
-    // Another *Redis::command* to do the same work.
-    auto sort_cmd_str = {"sort", "list", "ALPHA"};
-    redis.command(sort_cmd_str.begin(), sort_cmd_str.end(), std::back_inserter(sorted_list));
-
-    // ***** Redis Cluster *****
-
-    // Create a RedisCluster object, which is movable but NOT copyable.
-    auto redis_cluster = RedisCluster("tcp://127.0.0.1:7000");
-
-    // RedisCluster has similar interfaces as Redis.
-    redis_cluster.set("key", "value");
-    val = redis_cluster.get("key");
-    if (val) {
-        std::cout << *val << std::endl;
-    }   // else key doesn't exist.
-
-    // Keys with hash-tag.
-    redis_cluster.set("key{tag}1", "val1");
-    redis_cluster.set("key{tag}2", "val2");
-    redis_cluster.set("key{tag}3", "val3");
-
-    std::vector<OptionalString> hash_tag_res;
-    redis_cluster.mget({"key{tag}1", "key{tag}2", "key{tag}3"},
-            std::back_inserter(hash_tag_res));
-
-} catch (const Error &e) {
-    // Error handling.
-}
-```
-
-## API Reference
-
-You can also see [redis.h](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/redis.h) for doxygen style documentation.
-
-### Connection
-
-`Redis` class maintains a connection pool to Redis server. If the connection is broken, `Redis` reconnects to Redis server automatically.
-
-You can initialize a `Redis` instance with `ConnectionOptions` and `ConnectionPoolOptions`. `ConnectionOptions` specifies options for connection to Redis server, and `ConnectionPoolOptions` specifies options for conneciton pool. `ConnectionPoolOptions` is optional. If not specified, `Redis` maintains a single connection to Redis server.
-
-```C++
-ConnectionOptions connection_options;
-connection_options.host = "127.0.0.1";  // Required.
-connection_options.port = 6666; // Optional. The default port is 6379.
-connection_options.password = "auth";   // Optional. No password by default.
-connection_options.db = 1;  // Optional. Use the 0th database by default.
-
-// Optional. Timeout before we successfully send request to or receive response from redis.
-// By default, the timeout is 0ms, i.e. never timeout and block until we send or receive successfuly.
-// NOTE: if any command is timed out, we throw a TimeoutError exception.
-connection_options.socket_timeout = std::chrono::milliseconds(200);
-
-// Connect to Redis server with a single connection.
-Redis redis1(connection_options);
-
-ConnectionPoolOptions pool_options;
-pool_options.size = 3;  // Pool size, i.e. max number of connections.
-
-// Optional. Max time to wait for a connection. 0ms by default, which means wait forever.
-// Say, the pool size is 3, while 4 threds try to fetch the connection, one of them will be blocked.
-pool_options.wait_timeout = std::chrono::milliseconds(100);
-
-// Optional. Max lifetime of a connection. 0ms by default, which means never expire the connection.
-// If the connection has been created for a long time, i.e. more than `connection_lifetime`,
-// it will be expired and reconnected.
-pool_options.connection_lifetime = std::chrono::minutes(10);
-
-// Connect to Redis server with a connection pool.
-Redis redis2(connection_options, pool_options);
-```
-
-**NOTE**: if you set `ConnectionOptions::socket_timeout`, and try to call blocking commands, e.g. `Redis::brpop`, `Redis::blpop`, `Redis::bzpopmax`, `Redis::bzpopmin`, you must ensure that `ConnectionOptions::socket_timeout` is larger than the timeout specified with these blocking commands. Otherwise, you might get `TimeoutError`, and lose message.
-
-See [ConnectionOptions](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/connection.h#L40) and [ConnectionPoolOptions](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/connection_pool.h#L30) for more options. Also see [issue 80](https://github.com/sewenew/redis-plus-plus/issues/80) for discussion on connection pool.
-
-**NOTE**: `Redis` class is movable but NOT copyable.
-
-```C++
-// auto redis3 = redis1;    // this won't compile.
-
-// But it's movable.
-auto redis3 = std::move(redis1);
-```
-
-*redis-plus-plus* also supports connecting to Redis server with Unix Domain Socket.
-
-```C++
-ConnectionOptions options;
-options.type = ConnectionType::UNIX;
-options.path = "/path/to/socket";
-Redis redis(options);
-```
-
-You can also connect to Redis server with a URI:
-
-```
-tcp://[[username:]password@]host[:port][/db]
-
-unix://[[username:]password@]path-to-unix-domain-socket[/db]
-```
-
-The *scheme* and *host* parts are required, and others are optional. If you're connecting to Redis with Unix Domain Socket, you should use the *unix* scheme, otherwise, you should use *tcp* scheme. The following is a list of default values for those optional parts:
-
-- username: *default*
-- password: empty string, i.e. no password
-- port: 6379
-- db: 0
-
-**NOTE**: If your password or username contains '@', or your username contains ':', you cannot construct `Redis` object with URI. Because *redis-plus-plus* will incorrectly parse the URI. In this case, you need to use `ConnectionOptions` to construct `Redis` object.
-
-**NOTE**: [Redis 6.0 supports ACL](https://redis.io/topics/acl), and you can specify a username for the connection. However, before Redis 6.0, you cannot do that.
-
-Also, the following connection options can be specified with the query string of URI, e.g. *tcp://127.0.0.1?keep_alive=true&socket_timeout=100ms&connect_timeout=100ms*:
-
-- `ConnectionOptions::keep_alive`: *false* by default.
-- `ConnectionOptions::socket_timeout`: *0ms* by default.
-- `ConnectionOptions::connect_timeout`: *0ms* by default.
-
-**NOTE**: Options specified in query string are case-sensitive, i.e. all key-value pairs must be in lowercase.
-
-So far, you cannot specify connection pool options with URI, e.g. `ConnectionPoolOptions::size`.
-
-```C++
-// Single connection to the given host and port.
-Redis redis1("tcp://127.0.0.1:6666");
-
-// Use default port, i.e. 6379.
-Redis redis2("tcp://127.0.0.1");
-
-// Connect to Redis with password, and default port.
-Redis redis3("tcp://pass@127.0.0.1");
-
-// Connect to Redis and select the 2nd (db number starts from 0) database.
-Redis redis4("tcp://127.0.0.1:6379/2");
-
-// Set keep_alive option to true with query string.
-Redis redis5("tcp://127.0.0.1:6379/2?keep_alive=true");
-
-// Set socket_timeout to 50 milliseconds, and connect_timeout to 1 second with query string.
-Redis redis6("tcp://127.0.0.1?socket_timeout=50ms&connect_timeout=1s");
-
-// Connect to Unix Domain Socket.
-Redis redis7("unix://path/to/socket");
-```
-
-#### Lazily Create Connection
-
-Connections in the pool are lazily created. When the connection pool is initialized, i.e. the constructor of `Redis`, `Redis` does NOT connect to the server. Instead, it connects to the server only when you try to send command. In this way, we can avoid unnecessary connections. So if the pool size is 5, but the number of max concurrent connections is 3, there will be only 3 connections in the pool.
-
-#### Connection Failure
-
-You don't need to check whether `Redis` object connects to server successfully. If `Redis` fails to create a connection to Redis server, or the connection is broken at some time, it throws an exception of type `Error` when you try to send command with `Redis`. Even when you get an exception, i.e. the connection is broken, you don't need to create a new `Redis` object. You can reuse the `Redis` object to send commands, and the `Redis` object will try to reconnect to server automatically. If it reconnects successfully, it sends command to server. Otherwise, it throws an exception again.
-
-See the [Exception section](#exception) for details on exceptions.
-
-#### Reuse Redis object As Much As Possible
-
-It's NOT cheap to create a `Redis` object, since it will create new connections to Redis server. So you'd better reuse `Redis` object as much as possible. Also, it's safe to call `Redis`' member functions in multi-thread environment, and you can share `Redis` object in multiple threads.
-
-```C++
-// This is GOOD practice.
-auto redis = Redis("tcp://127.0.0.1");
-for (auto idx = 0; idx < 100; ++idx) {
-    // Reuse the Redis object in the loop.
-    redis.set("key", "val");
-}
-
-// This is VERY BAD! It's very inefficient.
-// NEVER DO IT!!!
-for (auto idx = 0; idx < 100; ++idx) {
-    // Create a new Redis object for each iteration.
-    auto redis = Redis("tcp://127.0.0.1");
-    redis.set("key", "val");
-}
-```
-
-#### TLS/SSL Support
-
-*redis-plus-plus* also has TLS support. However, in order to use this feature, you need to enable it when building *hiredis* and *redis-plus-plus*.
-
-**NOTE**: So far, TLS feature has not been tested on Windows platform. I'll fix it in the future.
-
-##### Enable TLS/SSL support
-
-When building *hiredis* with TLS support, you need to download *hiredis* of version *v1.0.0* or latter, and specify `USE_SSL=1` flag:
-
-```
-make PREFIX=/non/default/path USE_SSL=1
-
-make PREFIX=/non/default/path USE_SSL=1 install
-```
-
-Then you can build *redis-plus-plus* to enable TLS support by specifying the `-DREDIS_PLUS_PLUS_USE_TLS=ON` option:
-
-```
-cmake -DREDIS_PLUS_PLUS_USE_TLS=ON ..
-```
-
-##### Connection Options
-
-In order to connect to Redis with TLS support, you need to specify the following connection options:
-
-```
-ConnectionOptions opts;
-opts.host = "127.0.0.1";
-opts.port = 6379;
-
-opts.tls.enabled = true;    // Required. `false` by default.
-opts.tls.cert = "/path/to/client/certificate";  // Optional
-opts.tls.key = "/path/to/private/key/file"; // Optional
-opts.tls.cacert = "/path/to/CA/certificate/file";   // You can also set `opts.tls.cacertdir` instead.
-opts.tls.sni = "server-name-indication";    // Optional
-```
-
-Although `tls.cert` and `tls.key` are optional, if you specify one of them, you must also specify the other. Instead of specifying `tls.cacert`, you can also specify `tls.cacertdir` to the directory where certificates are stored.
-
-These options are the same as `redis-cli`'s TLS related command line arguments, so you can also run `redis-cli --help` to get the detailed explanation of these options.
-
-Then you can use this `ConnectionOptions` to create a `Redis` object to connect to Redis server with TLS support.
-
-**NOTE**: When building your application code, you also need to link it with `libhiredis.a`, `libhiredis_ssl.a`, `libredis++.a` (or the corresponding shared libraries), `-lssl` and `-lcrypto`.
-
-##### Automatically Initialize OpenSSL Library
-
-By default, *redis-plus-plus* automatically initializes OpenSSL library, i.e. calls `SSL_library_init` and initializes locks if needed. However, your application code might already initialize OpenSSL library. In this case, you can call `tls::disable_auto_init()` to disable the initialization. You should call this function only once and call it before any other *redis-plus-plus* operation. Otherwise, the behavior is undefined.
-
-### Send Command to Redis Server
-
-You can send [Redis commands](https://redis.io/commands) through `Redis` object. `Redis` has one or more (overloaded) methods for each Redis command. The method has the same (lowercased) name as the corresponding command. For example, we have 3 overload methods for the `DEL key [key ...]` command:
-
-```C++
-// Delete a single key.
-long long Redis::del(const StringView &key);
-
-// Delete a batch of keys: [first, last).
-template <typename Input>
-long long Redis::del(Input first, Input last);
-
-// Delete keys in the initializer_list.
-template <typename T>
-long long Redis::del(std::initializer_list<T> il);
-```
-
-With input parameters, these methods build a Redis command based on [Redis protocol](https://redis.io/topics/protocol), and send the command to Redis server. Then synchronously receive the reply, parse it, and return to the caller.
-
-Let's take a closer look at these methods' parameters and return values.
-
-#### Parameter Type
-
-Most of these methods have the same parameters as the corresponding commands. The following is a list of parameter types:
-
-| Parameter Type | Explaination | Example | Note |
-| :------------: | ------------ | ------- | ---- |
-| **StringView** | Parameters of string type. Normally used for key, value, member name, field name and so on | ***bool Redis::hset(const StringView &key, const StringView &field, const StringView &val)*** | See the [StringView section](#stringview) for details on `StringView` |
-| **long long** | Parameters of integer type. Normally used for index (e.g. list commands) or integer | ***void ltrim(const StringView &key, long long start, long long stop)*** <br> ***long long decrby(const StringView &key, long long decrement)*** | |
-| **double** | Parameters of floating-point type. Normally used for score (e.g. sorted set commands) or number of floating-point type | ***double incrbyfloat(const StringView &key, double increment)*** | |
-| **std::chrono::duration** <br> **std::chrono::time_point** | Time-related parameters | ***bool expire(const StringView &key, const std::chrono::seconds &timeout)*** <br> ***bool expireat(const StringView &key, const std::chrono::time_point<std::chrono::system_clock, std::chrono::seconds> &tp)*** | |
-| **std::pair<StringView, StringView>** | Used for Redis hash's (field, value) pair | ***bool hset(const StringView &key, const std::pair<StringView, StringView> &item)*** | |
-| **std::pair<double, double>** | Used for Redis geo's (longitude, latitude) pair | ***OptionalLongLong georadius(const StringView &key, const std::pair<double, double> &location, double radius, GeoUnit unit, const StringView &destination, bool store_dist, long long count)*** | |
-| **pair of iterators** | Use a pair of iterators to specify a range of input, so that we can pass the data in a STL container to these methods | ***template < typename Input >*** <br> ***long long del(Input first, Input last)*** | Throw an exception, if it's an empty range, i.e. *first == last* |
-| **std::initializer_list< T >** | Use an initializer list to specify a batch of input | ***template < typename T >*** <br> ***long long del(std::initializer_list< T > il)*** | |
-| **some options** | Options for some commands | ***UpdateType***, ***template < typename T > class BoundedInterval*** | See [command_options.h](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/command_options.h) for details |
-
-##### StringView
-
-[std::string_view](http://en.cppreference.com/w/cpp/string/basic_string_view) is a good choice for read-only string parameter types. `std::string_view` was however only introduced in the C++ 17 standard, so if you build *redis-plus-plus* with the `-std=c++11` (i.e. by specifying `-DREDIS_PLUS_PLUS_CXX_STANDARD=11` with cmake command) or the `-std=c++14` standard, a [simple implementation](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/cxx11/cxx_utils.h) of `std::string_view`, called `StringView`, is available. You could build *redis-plus-plus* with the `-std=c++17` standard (i.e. the default behavior), which will supply `std::string_view` natively. The `StringView` implementation will then be disregarded by aliasing it to `std::string_view`. This is done inside the *redis-plus-plus* library with: `using StringView = std::string_view`.
-
-Since there are conversions from `std::string` and c-style string to `StringView`, you can just pass `std::string` or c-style string to methods that need a `StringView` parameter.
-
-```C++
-// bool Redis::hset(const StringView &key, const StringView &field, const StringView &val)
-
-// Pass c-style string to StringView.
-redis.hset("key", "field", "value");
-
-// Pass std::string to StringView.
-std::string key = "key";
-std::string field = "field";
-std::string val = "val";
-redis.hset(key, field, val);
-
-// Mix std::string and c-style string.
-redis.hset(key, field, "value");
-```
-
-#### Return Type
-
-[Redis protocol](https://redis.io/topics/protocol) defines 5 kinds of replies:
-- *Status Reply*: Also known as *Simple String Reply*. It's a non-binary string reply.
-- *Bulk String Reply*: Binary safe string reply.
-- *Integer Reply*: Signed integer reply. Large enough to hold `long long`.
-- *Array Reply*: (Nested) Array reply.
-- *Error Reply*: Non-binary string reply that gives error info.
-
-Also these replies might be *NULL*. For instance, when you try to `GET` the value of a nonexistent key, Redis returns a *NULL Bulk String Reply*.
-
-As we mentioned above, replies are parsed into return values of these methods. The following is a list of return types:
-
-| Return Type | Explaination | Example | Note |
-| :---------: | ------------ | ------- | ---- |
-| **void** | *Status Reply* that should always return a string of "OK" | *RENAME*, *SETEX* | |
-| **std::string** | *Status Reply* that NOT always return "OK", and *Bulk String Reply* | *PING*, *INFO* | |
-| **bool** | *Integer Reply* that always returns 0 or 1 | *EXPIRE*, *HSET* | See the [Boolean Return Value section](#boolean-return-value) for the meaning of a boolean return value |
-| **long long** | *Integer Reply* that not always return 0 or 1 | *DEL*, *APPEND* | |
-| **double** | *Bulk String Reply* that represents a double | *INCRBYFLOAT*, *ZINCRBY* | |
-| **std::pair** | *Array Reply* with exactly 2 elements. Since the return value is always an array of 2 elements, we return the 2 elements as a `std::pair`'s first and second elements | *BLPOP* | |
-| **std::tuple** | *Array Reply* with fixed length and has more than 2 elements. Since length of the returned array is fixed, we return the array as a `std::tuple` | *BZPOPMAX* | |
-| **output iterator** | General *Array Reply* with non-fixed/dynamic length. We use STL-like interface to return this kind of array replies, so that you can insert the return value into a STL container easily | *MGET*, *LRANGE* | Also, sometimes the type of output iterator decides which options to send with the command. See the [Examples section](#command-overloads) for details |
-| **Optional< T >** | For any reply of type `T` that might be *NULL* | *GET*, *LPOP*, *BLPOP*, *BZPOPMAX* | See the [Optional section](#optional) for details on `Optional<T>` |
-| **Variant< Args... >** | For reply that might be of serval different types | *MEMORY STATS* | NOTE: so far, this type is only supported when compiling redis-plus-plus with C++ 17 standard. This is normally used with [generic command interface](https://github.com/sewenew/redis-plus-plus#generic-command-interface). See the [Variant section](#variant) for details on `Variant<Args...>` |
-| **STL container** | General *Array Reply* | *CONFIG GET* | Both *output iterator* and *STL container* are used for array reply. The difference is that *STL container* is normally used with [generic command interface](https://github.com/sewenew/redis-plus-plus#generic-command-interface). See the [STL container section](#stl-container) for example |
-
-##### Boolean Return Value
-
-The return type of some methods, e.g. `EXPIRE`, `HSET`, is `bool`. If the method returns `false`, it DOES NOT mean that `Redis` failed to send the command to Redis server. Instead, it means that Redis server returns an *Integer Reply*, and the value of the reply is `0`. Accordingly, if the method returns `true`, it means that Redis server returns an *Integer Reply*, and the value of the reply is `1`. You can 
-check [Redis commands manual](http://redis.io/commands) for what do `0` and `1` stand for.
-
-For example, when we send `EXPIRE` command to Redis server, it returns `1` if the timeout was set, and it returns `0` if the key doesn't exist. Accordingly, if the timeout was set, `Redis::expire` returns `true`, and if the key doesn't exist, `Redis::expire` returns `false`.
-
-So, never use the return value to check if the command has been successfully sent to Redis server. Instead, if `Redis` failed to send command to server, it throws an exception of type `Error`. See the [Exception section](#exception) for details on exceptions.
-
-##### Optional
-
-[std::optional](http://en.cppreference.com/w/cpp/utility/optional) is a good option for return type, if Redis might return *NULL REPLY*. However, `std::optional` is introduced in C++ 17 standard, and if you build *redis-plus-plus* with `-std=c++11` standard (i.e. by specifying `-DREDIS_PLUS_PLUS_CXX_STANDARD=11` with cmake command), we implement our own [simple version](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/cxx11/cxx_utils.h), i.e. `template Optional<T>`. Instead, if you build *redis-plus-plus* with `-std=c++17` standard (i.e. the default behavior), you can use `std::optional`, and we have an alias for it: `template <typename T> using Optional = std::optional<T>`.
-
-Take the [GET](https://redis.io/commands/get) and [MGET](https://redis.io/commands/mget) commands for example:
-
-```C++
-// Or just: auto val = redis.get("key");
-Optional<std::string> val = redis.get("key");
-
-// Optional<T> has a conversion to bool.
-// If it's NOT a null Optional<T> object, it's converted to true.
-// Otherwise, it's converted to false.
-if (val) {
-    // Key exists. Dereference val to get the string result.
-    std::cout << *val << std::endl;
-} else {
-    // Redis server returns a NULL Bulk String Reply.
-    // It's invalid to dereference a null Optional<T> object.
-    std::cout << "key doesn't exist." << std::endl;
-}
-
-std::vector<Optional<std::string>> values;
-redis.mget({"key1", "key2", "key3"}, std::back_inserter(values));
-for (const auto &val : values) {
-    if (val) {
-        // Key exist, process the value.
-    }
-}
-```
-
-We also have some typedefs for some commonly used `Optional<T>`:
-
-```C++
-using OptionalString = Optional<std::string>;
-
-using OptionalLongLong = Optional<long long>;
-
-using OptionalDouble = Optional<double>;
-
-using OptionalStringPair = Optional<std::pair<std::string, std::string>>;
-```
-
-##### Variant
-
-[std::variant](https://en.cppreference.com/w/cpp/utility/variant) is a good option for return type, if the reply might be of different types. For example, the `MEMORY STATS` command returns an array reply, which is, in fact, a map of key-value pairs of configurations:
-
-```
-127.0.0.1:6379> memory stats
- 1) "peak.allocated"
- 2) (integer) 4471104
- ...
-17) "db.0"
-18) 1) "overhead.hashtable.main"
-    2) (integer) 104
-    3) "overhead.hashtable.expires"
-    4) (integer) 32
-...
-27) "dataset.percentage"
-28) "9.70208740234375"
-...
-```
-
-However, as you can see, the value part of the result might be of type long long (key: *peak.allocated*), double (key: *dataset.percentage*) or even a map (key: *db.0*). So you cannot simply parse the result into a `std::unordered_map<std::string, long long>` or `std::unordered_map<std::string, double>`. A workaround is to parse the result into a `tuple`, however, this tuple solution is ugly and error-prone. Check [this issue](https://github.com/sewenew/redis-plus-plus/issues/138) for detail.
-
-In this case, `Variant`, which is a typedef of `std::variant` if you build redis-plus-plus with C++17 standard, is very helpful. You can parse the result into a `std::unordered_map<std::string, Variant<double, long long, std::unordered_map<std::string, long long>>>`.
-
-```
-using Var = Variant<double, long long, std::unordered_map<std::string, long long>>;
-auto r = Redis("tcp://127.0.0.1");
-auto v = r.command<std::unordered_map<std::string, Var>>("memory", "stats");
-```
-
-There're some limitations on `Variant` support:
-
-- The type arguments of `Variant`, cannot have duplicate items, e.g. `Variant<double, long long, double>` won't work.
-- `double` must be placed before `std::string`. Because `double` reply is, in fact, string reply, and when parsing variant, we try to parse the reply into the first matched type, specified with the type arguments from left to right. So if `double` is placed after `std::string`, i.e. on the right side of `std::string`, the reply will always be parsed into `std::string`.
-
-Also check the [generic command section](https://github.com/sewenew/redis-plus-plus#generic-command-interface) for more examples on generic command interface.
-
-##### STL container
-
-When using generic command interface, instead of parsing the reply to output iterator, you can also parse it into a STL container.
-
-```
-auto r = Redis("tcp://127.0.0.1");
-auto v = r.command<std::unordered_map<std::string, std::string>>("config", "get", "*");
-```
-
-Also check the [generic command section](https://github.com/sewenew/redis-plus-plus#generic-command-interface) for more examples on generic command interface.
-
-#### Examples
-
-Let's see some examples on how to send commands to Redis server.
-
-##### Various Parameter Types
-
-```C++
-// ***** Parameters of StringView type *****
-
-// Implicitly construct StringView with c-style string.
-redis.set("key", "value");
-
-// Implicitly construct StringView with std::string.
-std::string key("key");
-std::string val("value");
-redis.set(key, val);
-
-// Explicitly pass StringView as parameter.
-std::vector<char> large_data;
-// Avoid copying.
-redis.set("key", StringView(large_data.data(), large_data.size()));
-
-// ***** Parameters of long long type *****
-
-// For index.
-redis.bitcount(key, 1, 3);
-
-// For number.
-redis.incrby("num", 100);
-
-// ***** Parameters of double type *****
-
-// For score.
-redis.zadd("zset", "m1", 2.5);
-redis.zadd("zset", "m2", 3.5);
-redis.zadd("zset", "m3", 5);
-
-// For (longitude, latitude).
-redis.geoadd("geo", std::make_tuple("member", 13.5, 15.6));
-
-// ***** Time-related parameters *****
-
-using namespace std::chrono;
-
-redis.expire(key, seconds(1000));
-
-auto tp = time_point_cast<seconds>(system_clock::now() + seconds(100));
-redis.expireat(key, tp);
-
-// ***** Some options for commands *****
-
-if (redis.set(key, "value", milliseconds(100), UpdateType::NOT_EXIST)) {
-    std::cout << "set OK" << std::endl;
-}
-
-redis.linsert("list", InsertPosition::BEFORE, "pivot", "val");
-
-std::vector<std::string> res;
-
-// (-inf, inf)
-redis.zrangebyscore("zset", UnboundedInterval<double>{}, std::back_inserter(res));
-
-// [3, 6]
-redis.zrangebyscore("zset",
-    BoundedInterval<double>(3, 6, BoundType::CLOSED),
-    std::back_inserter(res));
-
-// (3, 6]
-redis.zrangebyscore("zset",
-    BoundedInterval<double>(3, 6, BoundType::LEFT_OPEN),
-    std::back_inserter(res));
-
-// (3, 6)
-redis.zrangebyscore("zset",
-    BoundedInterval<double>(3, 6, BoundType::OPEN),
-    std::back_inserter(res));
-
-// [3, 6)
-redis.zrangebyscore("zset",
-    BoundedInterval<double>(3, 6, BoundType::RIGHT_OPEN),
-    std::back_inserter(res));
-
-// [3, +inf)
-redis.zrangebyscore("zset",
-    LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    std::back_inserter(res));
-
-// (3, +inf)
-redis.zrangebyscore("zset",
-    LeftBoundedInterval<double>(3, BoundType::OPEN),
-    std::back_inserter(res));
-
-// (-inf, 6]
-redis.zrangebyscore("zset",
-    RightBoundedInterval<double>(6, BoundType::LEFT_OPEN),
-    std::back_inserter(res));
-
-// (-inf, 6)
-redis.zrangebyscore("zset",
-    RightBoundedInterval<double>(6, BoundType::OPEN),
-    std::back_inserter(res));
-
-// ***** Pair of iterators *****
-
-std::vector<std::pair<std::string, std::string>> kvs = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
-redis.mset(kvs.begin(), kvs.end());
-
-std::unordered_map<std::string, std::string> kv_map = {{"k1", "v1"}, {"k2", "v2"}, {"k3", "v3"}};
-redis.mset(kv_map.begin(), kv_map.end());
-
-std::unordered_map<std::string, std::string> str_map = {{"f1", "v1"}, {"f2", "v2"}, {"f3", "v3"}};
-redis.hmset("hash", str_map.begin(), str_map.end());
-
-std::unordered_map<std::string, double> score_map = {{"m1", 20}, {"m2", 12.5}, {"m3", 3.14}};
-redis.zadd("zset", score_map.begin(), score_map.end());
-
-std::vector<std::string> keys = {"k1", "k2", "k3"};
-redis.del(keys.begin(), keys.end());
-
-// ***** Parameters of initializer_list type *****
-
-redis.mset({
-    std::make_pair("k1", "v1"),
-    std::make_pair("k2", "v2"),
-    std::make_pair("k3", "v3")
-});
-
-redis.hmset("hash",
-    {
-        std::make_pair("f1", "v1"),
-        std::make_pair("f2", "v2"),
-        std::make_pair("f3", "v3")
-    });
-
-redis.zadd("zset",
-    {
-        std::make_pair("m1", 20.0),
-        std::make_pair("m2", 34.5),
-        std::make_pair("m3", 23.4)
-    });
-
-redis.del({"k1", "k2", "k3"});
-```
-
-##### Various Return Types
-
-```C++
-// ***** Return void *****
-
-redis.save();
-
-// ***** Return std::string *****
-
-auto info = redis.info();
-
-// ***** Return bool *****
-
-if (!redis.expire("nonexistent", std::chrono::seconds(100))) {
-    std::cerr << "key doesn't exist" << std::endl;
-}
-
-if (redis.setnx("key", "val")) {
-    std::cout << "set OK" << std::endl;
-}
-
-// ***** Return long long *****
-
-auto len = redis.strlen("key");
-auto num = redis.del({"a", "b", "c"});
-num = redis.incr("a");
-
-// ***** Return double *****
-
-auto real = redis.incrbyfloat("b", 23.4);
-real = redis.hincrbyfloat("c", "f", 34.5);
-
-// ***** Return Optional<std::string>, i.e. OptionalString *****
-
-auto os = redis.get("kk");
-if (os) {
-    std::cout << *os << std::endl;
-} else {
-    std::cerr << "key doesn't exist" << std::endl;
-}
-
-os = redis.spop("set");
-if (os) {
-    std::cout << *os << std::endl;
-} else {
-    std::cerr << "set is empty" << std::endl;
-}
-
-// ***** Return Optional<long long>, i.e. OptionalLongLong *****
-
-auto oll = redis.zrank("zset", "mem");
-if (oll) {
-    std::cout << "rank is " << *oll << std::endl;
-} else {
-    std::cerr << "member doesn't exist" << std::endl;
-}
-
-// ***** Return Optional<double>, i.e. OptionalDouble *****
-
-auto ob = redis.zscore("zset", "m1");
-if (ob) {
-    std::cout << "score is " << *ob << std::endl;
-} else {
-    std::cerr << "member doesn't exist" << std::endl;
-}
-
-// ***** Return Optional<pair<string, string>> *****
-
-auto op = redis.blpop({"list1", "list2"}, std::chrono::seconds(2));
-if (op) {
-    std::cout << "key is " << op->first << ", value is " << op->second << std::endl;
-} else {
-    std::cerr << "timeout" << std::endl;
-}
-
-// ***** Output iterators *****
-
-std::vector<OptionalString> os_vec;
-redis.mget({"k1", "k2", "k3"}, std::back_inserter(os_vec));
-
-std::vector<std::string> s_vec;
-redis.lrange("list", 0, -1, std::back_inserter(s_vec));
-
-std::unordered_map<std::string, std::string> hash;
-redis.hgetall("hash", std::inserter(hash, hash.end()));
-// You can also save the result in a vecotr of string pair.
-std::vector<std::pair<std::string, std::string>> hash_vec;
-redis.hgetall("hash", std::back_inserter(hash_vec));
-
-std::unordered_set<std::string> str_set;
-redis.smembers("s1", std::inserter(str_set, str_set.end()));
-// You can also save the result in a vecotr of string.
-s_vec.clear();
-redis.smembers("s1", std::back_inserter(s_vec));
-```
-
-##### SCAN Commands
-
-```C++
-auto cursor = 0LL;
-auto pattern = "*pattern*";
-auto count = 5;
-std::unordered_set<std::string> keys;
-while (true) {
-    cursor = redis.scan(cursor, pattern, count, std::inserter(keys, keys.begin()));
-    // Default pattern is "*", and default count is 10
-    // cursor = redis.scan(cursor, std::inserter(keys, keys.begin()));
-
-    if (cursor == 0) {
-        break;
-    }
-}
-```
-
-##### Command Overloads
-
-Sometimes the type of output iterator decides which options to send with the command.
-
-```C++
-// If the output iterator is an iterator of a container of string,
-// we send *ZRANGE* command without the *WITHSCORES* option.
-std::vector<std::string> members;
-redis.zrange("list", 0, -1, std::back_inserter(members));
-
-// If it's an iterator of a container of a <string, double> pair,
-// we send *ZRANGE* command with *WITHSCORES* option.
-std::vector<std::pair<std::string, double>> res_with_score;
-redis.zrange("list", 0, -1, std::back_inserter(res_with_score));
-
-// The above examples also apply to other command with the *WITHSCORES* options,
-// e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-
-// Another example is the *GEORADIUS* command.
-
-// Only get members.
-members.clear();
-redis.georadius("geo",
-            std::make_pair(10.1, 11.1),
-            100,
-            GeoUnit::KM,
-            10,
-            true,
-            std::back_inserter(members));
-
-// If the iterator is an iterator of a container of tuple<string, double>,
-// we send the *GEORADIUS* command with *WITHDIST* option.
-std::vector<std::tuple<std::string, double>> mem_with_dist;
-redis.georadius("geo",
-            std::make_pair(10.1, 11.1),
-            100,
-            GeoUnit::KM,
-            10,
-            true,
-            std::back_inserter(mem_with_dist));
-
-// If the iterator is an iterator of a container of tuple<string, double, string>,
-// we send the *GEORADIUS* command with *WITHDIST* and *WITHHASH* options.
-std::vector<std::tuple<std::string, double, std::string>> mem_with_dist_hash;
-redis.georadius("geo",
-            std::make_pair(10.1, 11.1),
-            100,
-            GeoUnit::KM,
-            10,
-            true,
-            std::back_inserter(mem_with_dist_hash));
-
-// If the iterator is an iterator of a container of
-// tuple<string, string, pair<double, double>, double>,
-// we send the *GEORADIUS* command with *WITHHASH*, *WITHCOORD* and *WITHDIST* options.
-std::vector<std::tuple<std::string, double, std::string>> mem_with_hash_coord_dist;
-redis.georadius("geo",
-            std::make_pair(10.1, 11.1),
-            100,
-            GeoUnit::KM,
-            10,
-            true,
-            std::back_inserter(mem_with_hash_coord_dist));
-```
-
-Please see [redis.h](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/redis.h) for doxygen style API references and examples, and see the [tests](https://github.com/sewenew/redis-plus-plus/tree/master/test/src/sw/redis%2B%2B) for other examples.
-
-### Exception
-
-`Redis` throws exceptions if it receives an *Error Reply* or something bad happens, e.g. failed to create a connection to server, or connection to server is broken. All exceptions derived from `Error` class. See [errors.h](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/errors.h) for details.
-
-- `Error`: Generic error. It's derived from `std::exception`, and it's also the base class of other exceptions.
-- `IoError`: There's some IO error with the connection.
-- `TimeoutError`: Read or write operation was timed out. It's a derived class of `IoError`.
-- `ClosedError`: Redis server closed the connection.
-- `ProtoError`: The command or reply is invalid, and we cannot process it with Redis protocol.
-- `OomError`: *hiredis* library got an out-of-memory error.
-- `ReplyError`: Redis server returned an error reply, e.g. we try to call `redis::lrange` on a Redis hash.
-- `WatchError`: Watched key has been modified. See [Watch section](#watch) for details.
-
-**NOTE**: *NULL REPLY* is not taken as an exception. For example, if we try to `GET` a non-existent key, we'll get a *NULL Bulk String Reply*. Instead of throwing an exception, we return the *NULL REPLY* as a null `Optional<T>` object. Also see [Optional section](#optional).
-
-Normally, when exception happens, you don't need to create a `Redis` object. It's exception safe, and you can reuse the `Redis` object. Even if the connection to Redis server is broken, and it throws some exception, say, `IoError`. The next time when you send command with the `Redis` object, it will try to reconnect to Redis server automatically. This rule also applies to `RedisCluster`. However, if `Pipeline`, `Transcation` and `Subscriber` throws exception, you need to destroy the object, and create a new one. See the corresponding documentation for details.
-
-#### Examples
-
-The following is an example on how to catch these exceptions:
-
-```
-try {
-    redis.set("key", "value");
-
-    // Wrong type error
-    redis.lpush("key", {"a", "b", "c"});
-} catch (const ReplyError &err) {
-    // WRONGTYPE Operation against a key holding the wrong kind of value
-    cout << err.what() << endl;
-} catch (const TimeoutError &err) {
-    // reading or writing timeout
-} catch (const ClosedError &err) {
-    // the connection has been closed.
-} catch (const IoError &err) {
-    // there's an IO error on the connection.
-} catch (const Error &err) {
-   // other errors
-}
-```
-
-### Generic Command Interface
-
-There're too many Redis commands, we haven't implemented all of them. However, you can use the generic `Redis::command` methods to send any commands to Redis. Unlike other client libraries, `Redis::command` doesn't use format string to combine command arguments into a command string. Instead, you can directly pass command arguments of `StringView` type or arithmetic type as parameters of `Redis::command`. For the reason why we don't use format string, please see [this discussion](https://github.com/sewenew/redis-plus-plus/pull/2).
-
-```C++
-auto redis = Redis("tcp://127.0.0.1");
-
-// Redis class doesn't have built-in *CLIENT SETNAME* method.
-// However, you can use Redis::command to send the command manually.
-redis.command<void>("client", "setname", "name");
-auto val = redis.command<OptionalString>("client", "getname");
-if (val) {
-    std::cout << *val << std::endl;
-}
-
-// NOTE: the following code is for example only. In fact, Redis has built-in
-// methods for the following commands.
-
-// Arguments of the command can be strings.
-// NOTE: for SET command, the return value is NOT always void, I'll explain latter.
-redis.command<void>("set", "key", "100");
-
-// Arguments of the command can be a combination of strings and integers.
-auto num = redis.command<long long>("incrby", "key", 1);
-
-// Argument can also be double.
-auto real = redis.command<double>("incrbyfloat", "key", 2.3);
-
-// Even the key of the command can be of arithmetic type.
-redis.command<void>("set", 100, "value");
-
-val = redis.command<OptionalString>("get", 100);
-
-// If the command returns an array of elements.
-std::vector<OptionalString> result;
-redis.command("mget", "k1", "k2", "k3", std::back_inserter(result));
-
-// Or just parse it into a vector.
-result = redis.command<std::vector<OptionalString>>("mget", "k1", "k2", "k3");
-
-// Arguments of the command can be a range of strings.
-auto set_cmd_strs = {"set", "key", "value"};
-redis.command<void>(set_cmd_strs.begin(), set_cmd_strs.end());
-
-auto get_cmd_strs = {"get", "key"};
-val = redis.command<OptionalString>(get_cmd_strs.begin(), get_cmd_strs.end());
-
-// If it returns an array of elements.
-result.clear();
-auto mget_cmd_strs = {"mget", "key1", "key2"};
-redis.command(mget_cmd_strs.begin(), mget_cmd_strs.end(), std::back_inserter(result));
-```
-
-**NOTE**: The name of some Redis commands is composed with two strings, e.g. *CLIENT SETNAME*. In this case, you need to pass these two strings as two arguments for `Redis::command`.
-
-```C++
-// This is GOOD.
-redis.command<void>("client", "setname", "name");
-
-// This is BAD, and will fail to send command to Redis server.
-// redis.command<void>("client setname", "name");
-```
-
-As I mentioned in the comments, the `SET` command not always returns `void`. Because if you try to set a (key, value) pair with *NX* or *XX* option, you might fail, and Redis will return a *NULL REPLY*. Besides the `SET` command, there're other commands whose return value is NOT a fixed type, you need to parse it by yourself. For example, `Redis::set` method rewrite the reply of `SET` command, and make it return `bool` type, i.e. if no *NX* or *XX* option specified, Redis server will always return an "OK" string, and `Redis::set` returns `true`; if *NX* or *XX* specified, and Redis server returns a *NULL REPLY*, `Redis::set` returns `false`.
-
-So `Redis` class also has other overloaded `command` methods, these methods return a `ReplyUPtr`, i.e. `std::unique_ptr<redisReply, ReplyDeleter>`, object. Normally you don't need to parse it manually. Instead, you only need to pass the reply to `template <typename T> T reply::parse(redisReply &)` to get a value of type `T`. Check the [Return Type section](#return-type) for valid `T` types. If the command returns an array of elements, besides calling `reply::parse` to parse the reply to an STL container, you can also call `template <typename Output> reply::to_array(redisReply &reply, Output output)` to parse the result into an array or STL container with an output iterator.
-
-Let's rewrite the above examples:
-
-```C++
-auto redis = Redis("tcp://127.0.0.1");
-
-redis.command("client", "setname", "name");
-auto r = redis.command("client", "getname");
-assert(r);
-
-// If the command returns a single element,
-// use `reply::parse<T>(redisReply&)` to parse it.
-auto val = reply::parse<OptionalString>(*r);
-if (val) {
-    std::cout << *val << std::endl;
-}
-
-// Arguments of the command can be strings.
-redis.command("set", "key", "100");
-
-// Arguments of the command can be a combination of strings and integers.
-r = redis.command("incrby", "key", 1);
-auto num = reply::parse<long long>(*r);
-
-// Argument can also be double.
-r = redis.command("incrbyfloat", "key", 2.3);
-auto real = reply::parse<double>(*r);
-
-// Even the key of the command can be of arithmetic type.
-redis.command("set", 100, "value");
-
-r = redis.command("get", 100);
-val = reply::parse<OptionalString>(*r);
-
-// If the command returns an array of elements.
-r = redis.command("mget", "k1", "k2", "k3");
-// Use `reply::to_array(redisReply&, OutputIterator)` to parse the result into an STL container.
-std::vector<OptionalString> result;
-reply::to_array(*r, std::back_inserter(result));
-
-// Or just call `reply::parse` to parse it into vector.
-result = reply::parse<std::vector<OptionalString>>(*r);
-
-// Arguments of the command can be a range of strings.
-auto get_cmd_strs = {"get", "key"};
-r = redis.command(get_cmd_strs.begin(), get_cmd_strs.end());
-val = reply::parse<OptionalString>(*r);
-
-// If it returns an array of elements.
-result.clear();
-auto mget_cmd_strs = {"mget", "key1", "key2"};
-r = redis.command(mget_cmd_strs.begin(), mget_cmd_strs.end());
-reply::to_array(*r, std::back_inserter(result));
-```
-
-In fact, there's one more `Redis::command` method:
-
-```C++
-template <typename Cmd, typename ...Args>
-auto command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-```
-
-However, this method exposes some implementation details, and is only for internal use. You should NOT use this method.
-
-### Publish/Subscribe
-
-You can use `Redis::publish` to publish messages to channels. `Redis` randomly picks a connection from the underlying connection pool, and publishes message with that connection. So you might publish two messages with two different connections.
-
-When you subscribe to a channel with a connection, all messages published to the channel are sent back to that connection. So there's NO `Redis::subscribe` method. Instead, you can call `Redis::subscriber` to create a `Subscriber` and the `Subscriber` maintains a connection to Redis. The underlying connection is a new connection, NOT picked from the connection pool. This new connection has the same `ConnectionOptions` as the `Redis` object.
-
-With `Subscriber`, you can call `Subscriber::subscribe`, `Subscriber::unsubscribe`, `Subscriber::psubscribe` and `Subscriber::punsubscribe` to send *SUBSCRIBE*, *UNSUBSCRIBE*, *PSUBSCRIBE* and *PUNSUBSCRIBE* commands to Redis.
-
-#### Thread Safety
-
-`Subscriber` is NOT thread-safe. If you want to call its member functions in multi-thread environment, you need to synchronize between threads manually.
-
-#### Exception
-
-If any of the `Subscriber`'s method throws an exception other than `ReplyError` or `TimeoutError`, you CANNOT use it any more. Instead, you have to destroy the `Subscriber` object, and create a new one.
-
-#### Subscriber Callbacks
-
-There are 6 kinds of messages:
-- *MESSAGE*: message sent to a channel.
-- *PMESSAGE*: message sent to channels of a given pattern.
-- *SUBSCRIBE*: message sent when we successfully subscribe to a channel.
-- *UNSUBSCRIBE*: message sent when we successfully unsubscribe to a channel.
-- *PSUBSCRIBE*: message sent when we successfully subscribe to a channel pattern.
-- *PUNSUBSCRIBE*: message sent when we successfully unsubscribe to a channel pattern.
-
-We call messages of *SUBSCRIBE*, *UNSUBSCRIBE*, *PSUBSCRIBE* and *PUNSUBSCRIBE* types as *META MESSAGE*s.
-
-In order to process these messages, you can set callback functions on `Subscriber`:
-- `Subscriber::on_message(MsgCallback)`: set callback function for messages of *MESSAGE* type, and the callback interface is: `void (std::string channel, std::string msg)`.
-- `Subscriber::on_pmessage(PatternMsgCallback)`: set the callback function for messages of *PMESSAGE* type, and the callback interface is: `void (std::string pattern, std::string channel, std::string msg)`.
-- `Subscriber::on_meta(MetaCallback)`: set callback function for messages of *META MESSAGE* type, and the callback interface is: `void (Subscriber::MsgType type, OptionalString channel, long long num)`. `type` is an enum, it can be one of the following enum: `Subscriber::MsgType::SUBSCRIBE`, `Subscriber::MsgType::UNSUBSCRIBE`, `Subscriber::MsgType::PSUBSCRIBE`, `Subscriber::MsgType::PUNSUBSCRIBE`, `Subscriber::MsgType::MESSAGE`, and `Subscriber::MsgType::PMESSAGE`. If you haven't subscribe/psubscribe to any channel/pattern, and try to unsubscribe/punsubscribe without any parameter, i.e. unsubscribe/punsubscribe all channels/patterns, *channel* will be null. So the second parameter of meta callback is of type `OptionalString`.
-
-All these callback interfaces pass `std::string` by value, and you can take their ownership (i.e. `std::move`) safely.
-
-#### Consume Messages
-
-You can call `Subscriber::consume` to consume messages published to channels/patterns that the `Subscriber` has been subscribed.
-
-`Subscriber::consume` waits for message from the underlying connection. If the `ConnectionOptions::socket_timeout` is reached, and there's no message sent to this connection, `Subscriber::consume` throws a `TimeoutError` exception. If `ConnectionOptions::socket_timeout` is `0ms`, `Subscriber::consume` blocks until it receives a message.
-
-After receiving the message, `Subscriber::consume` calls the callback function to process the message based on message type. However, if you don't set callback for a specific kind of message, `Subscriber::consume` will consume the received message and discard it, i.e. `Subscriber::consume` returns without running the callback.
-
-#### Examples
-
-The following example is a common pattern for using `Subscriber`:
-
-```C++
-// Create a Subscriber.
-auto sub = redis.subscriber();
-
-// Set callback functions.
-sub.on_message([](std::string channel, std::string msg) {
-            // Process message of MESSAGE type.
-        });
-
-sub.on_pmessage([](std::string pattern, std::string channel, std::string msg) {
-            // Process message of PMESSAGE type.
-        });
-
-sub.on_meta([](Subscriber::MsgType type, OptionalString channel, long long num) {
-            // Process message of META type.
-        });
-
-// Subscribe to channels and patterns.
-sub.subscribe("channel1");
-sub.subscribe({"channel2", "channel3"});
-
-sub.psubscribe("pattern1*");
-
-// Consume messages in a loop.
-while (true) {
-    try {
-        sub.consume();
-    } catch (const Error &err) {
-        // Handle exceptions.
-    }
-}
-```
-
-If `ConnectionOptions::socket_timeout` is set, you might get `TimeoutError` exception before receiving a message:
-
-```C++
-while (true) {
-    try {
-        sub.consume();
-    } catch (const TimeoutError &e) {
-        // Try again.
-        continue;
-    } catch (const Error &err) {
-        // Handle other exceptions.
-    }
-}
-```
-
-The above examples use lambda as callback. If you're not familiar with lambda, you can also set a free function as callback. Check [this issue](https://github.com/sewenew/redis-plus-plus/issues/16) for detail.
-
-### Pipeline
-
-[Pipeline](https://redis.io/topics/pipelining) is used to reduce *RTT* (Round Trip Time), and speed up Redis queries. *redis-plus-plus* supports pipeline with the `Pipeline` class.
-
-#### Create Pipeline
-
-You can create a pipeline with `Redis::pipeline` method, which returns a `Pipeline` object.
-
-```C++
-ConnectionOptions connection_options;
-ConnectionPoolOptions pool_options;
-
-Redis redis(connection_options, pool_options);
-
-auto pipe = redis.pipeline();
-```
-
-When creating a `Pipeline` object, by default, `Redis::pipeline` method creates a new connection to Redis server. This connection is NOT picked from the connection pool, but a newly created connection. This connection has the same `ConnectionOptions` as other connections in the connection pool. `Pipeline` object maintains the new connection, and all piped commands are sent through this connection.
-
-**NOTE**: By default, creating a `Pipeline` object is NOT cheap, since it creates a new connection. So you'd better reuse the `Pipeline` object as much as possible. Check [this](#create-pipeline-without-creating-new-connection) to see how to create a `Pipeline` object without creating a new connection.
-
-#### Send Commands
-
-You can send Redis commands through the `Pipeline` object. Just like the `Redis` class, `Pipeline` has one or more (overloaded) methods for each Redis command. However, you CANNOT get the replies until you call `Pipeline::exec`. So these methods do NOT return the reply, instead they return the `Pipeline` object itself. And you can chain these methods calls.
-
-```C++
-pipe.set("key", "val").incr("num").rpush("list", {0, 1, 2}).command("hset", "key", "field", "value");
-```
-
-#### Get Replies
-
-Once you finish sending commands to Redis, you can call `Pipeline::exec` to get replies of these commands. You can also chain `Pipeline::exec` with other commands.
-
-```C++
-pipe.set("key", "val").incr("num");
-auto replies = pipe.exec();
-
-// The same as:
-replies = pipe.set("key", "val").incr("num).exec();
-```
-
-In fact, these commands won't be sent to Redis, until you call `Pipeline::exec`. So `Pipeline::exec` does 2 work in order: send all piped commands, then get all replies from Redis.
-
-Also you can call `Pipeline::discard` to discard those piped commands.
-
-```C++
-pipe.set("key", "val").incr("num");
-
-pipe.discard();
-```
-
-#### Parse Replies
-
-`Pipeline::exec` returns a `QueuedReplies` object, which contains replies of all commands that have been sent to Redis. You can use `QueuedReplies::get` method to get and parse the `ith` reply. It has 3 overloads:
-
-- `template <typename Result> Result get(std::size_t idx)`: Return the `ith` reply as a return value, and you need to specify the return type as tempalte parameter.
-- `template <typename Output> void get(std::size_t idx, Output output)`: If the reply is of type *Array Reply*, you can call this method to write the `ith` reply to an output iterator. Normally, compiler will deduce the type of the output iterator, and you don't need to specify the type parameter explicitly.
-- `redisReply& get(std::size_t idx)`: If the reply is NOT a fixed type, call this method to get a reference to `redisReply` object. In this case, you need to call `template <typename T> T reply::parse(redisReply &)` to parse the reply manually.
-
-Check the [Return Type section](#return-type) for details on the return types of the result.
-
-```C++
-auto replies = pipe.set("key", "val").incr("num").lrange("list", 0, -1).exec();
-
-auto set_cmd_result = replies.get<bool>(0);
-
-auto incr_cmd_result = replies.get<long long>(1);
-
-std::vector<std::string> list_cmd_result;
-replies.get(2, std::back_inserter(list_cmd_result));
-```
-
-#### Exception
-
-If any of `Pipeline`'s method throws an exception other than `ReplyError`, the `Pipeline` object enters an invalid state. You CANNOT use it any more, but only destroy the object, and create a new one.
-
-#### Thread Safety
-
-`Pipeline` is NOT thread-safe. If you want to call its member functions in multi-thread environment, you need to synchronize between threads manually.
-
-#### Create Pipeline Without Creating New Connection
-
-**YOU MUST CAREFULLY READ ALL WORDS IN THIS SECTION AND THE VERY IMPORTANT NOTES BEFORE USING THIS FEATURE!!!**
-
-In fact, you can also create a `Pipeline` object with a connection from the underlying connection pool, so that calling `Redis::pipeline` method can be much cheaper (since it doesn't need to create a new connection).
-
-The prototype of `Redis::pipeline` is as follows: `Pipeline pipeline(bool new_connection = true);`. If `new_connection` is false, the `Pipeline` object will be created with a connection from the underlying pool.
-
-```
-ConnectionOptions connection_options;
-ConnectionPoolOptions pool_options;
-
-Redis redis(connection_options, pool_options);
-
-// Create a Pipeline without creating a new connection.
-auto pipe = redis.pipeline(false);
-```
-
-##### VERY IMPORTANT NOTES
-
-However, in this case, you MUST be very careful, otherwise, you might get bad performance or even dead lock. Because when you run command with `Pipeline` object, it will hold the connection until `Pipeline::exec`, `Pipeline::discard` or `Pipeline`'s destructor is called (the connection will also be released if any method of `Pipeline` throws `Exception`). If the `Pipeline` object holds the connection for a long time, other `Redis` methods might not be able to get a connection from the underlying pool.
-
-Check the following dead lock example:
-
-```
-// By defaul, create a `Redis` object with only ONE connection in pool.
-// Also by default, the `ConnectionPoolOptions::wait_timeout` is 0ms,
-// which means if the pool is empty, `Redis` method will be blocked until
-// the pool is not empty.
-Redis redis("tcp://127.0.0.1");
-
-// Create a `Pipeline` with a connection in the underlying pool.
-// In fact, the connection hasn't been fetched from the pool
-// until some method of `Pipeline` has been called.
-auto pipe = redis.pipeline(false);
-
-// Now the `Pipeline` object fetches a connection from the pool.
-pipe.set("key1", "val");
-
-// `Pipeline` object still holds the connection until `Pipeline::exec`,
-// `Pipeline::discard` or the destructor is called.
-pipe.set("key2", "val");
-
-// Try to send a command with `Redis` object.
-// However, the pool is empty, since the `Pipeline` object still holds
-// the connection, and this call will be blocked forever.
-// DEAD LOCK!!!
-redis.get("key");
-
-// NEVER goes here.
-pipe.exec();
-```
-
-**BEST PRACTICE**:
-
-When creating `Pipeline` without creating a new connection:
-
-- Always set `ConnectionPoolOptions::wait_timeout` larger than 0ms (i.e. when pool is empty, never block forever).
-- Avoid doing slow operation between `Pipeline`'s methods.
-- Better chain `Pipeline` methods and the `Pipeline::exec` in one statements.
-- Better leave `Pipeline` related code in a block scope.
-
-```
-ConnectionOptions opts;
-opts.host = "127.0.0.1";
-opts.port = 6379;
-opts.socket_timeout = std::chrono::milliseconds(50);
-
-ConnectionPoolOptions pool_opts;
-pool_opts.size = 3;
-
-// Always set `wait_timeout` larger than 0ms.
-pool_opts.wait_timeout = std::chrono::milliseconds(50);
-
-auto redis = Redis(opts, pool_opts);
-
-{
-    // Better put `Pipeline` related code in a block scope.
-    auto pipe = redis.pipeline(false);
-
-    pipe.set("key1", "val");
-
-    // DON'T run slow operations here, since `Pipeline` object still holds
-    // the connection, other threads using this `Redis` object, might be blocked.
-
-    pipe.set("key2", "val");
-
-    // When `Pipeline::exec` finishes, `Pipeline` releases the connection, and returns it to pool.
-    auto replies = pipe.exec();
-
-    // This is even better, i.e. chain `Pipeline` methods with `Pipeline::exec`.
-    replies = pipe.set("key1", "val").set("key2", "val").exec();
-}
-
-for (auto i = 0; i < 10; ++i) {
-    // This operation, i.e. creating a `Pipeline` object with connection in pool, is cheap
-    auto pipe = redis.pipeline(false);
-
-    // Fetch a connection from the underlying pool, and hold it.
-    pipe.set("key1", "val").set("key2", "val");
-
-    // Although `Pipeline::exec` and `Pipeline::discard` haven't been called,
-    // when `Pipeline`'s destructor is called, the connection will also be
-    // returned to the pool.
-}
-```
-
-### Transaction
-
-[Transaction](https://redis.io/topics/transactions) is used to make multiple commands runs atomically.
-
-#### Create Transaction
-
-You can create a transaction with `Redis::transaction` method, which returns a `Transaction` object.
-
-```C++
-ConnectionOptions connection_options;
-ConnectionPoolOptions pool_options;
-
-Redis redis(connection_options, pool_options);
-
-auto tx = redis.transaction();
-```
-
-As the `Pipeline` class, `Transaction` maintains a newly created connection to Redis. This connection has the same `ConnectionOptions` as the `Redis` object.
-
-**NOTE**: Creating a `Transaction` object is NOT cheap, since it creates a new connection. So you'd better reuse the `Transaction` as much as possible. Check [this](#create-transaction-without-creating-new-connection) to see how to create a `Transaction` object without creating a new connection.
-
-Also you don't need to send [MULTI](https://redis.io/commands/multi) command to Redis. `Transaction` will do that for you automatically.
-
-#### Send Commands
-
-`Transaction` shares most of implementation with `Pipeline`. It has the same interfaces as `Pipeline`. You can send commands as what you do with `Pipeline` object.
-
-```C++
-tx.set("key", "val").incr("num").lpush("list", {0, 1, 2}).command("hset", "key", "field", "val");
-```
-
-#### Execute Transaction
-
-When you call `Transaction::exec`, you explicitly ask Redis to execute those queued commands, and return the replies. Otherwise, these commands won't be executed. Also, you can call `Transaction::discard` to discard the execution, i.e. no command will be executed. Both `Transaction::exec` and `Transaction::discard` can be chained with other commands.
-
-```C++
-auto replies = tx.set("key", "val").incr("num").exec();
-
-tx.set("key", "val").incr("num");
-
-// Discard the transaction.
-tx.discard();
-```
-
-#### Parse Replies
-
-See [Pipeline's Parse Replies section](#parse-replies) for how to parse the replies.
-
-#### Piped Transaction
-
-Normally, we always send multiple commnds in a transaction. In order to improve the performance, you can send these commands in a pipeline. You can create a piped transaction by passing `true` as parameter of `Redis::transaction` method.
-
-```C++
-// Create a piped transaction
-auto tx = redis.transaction(true);
-```
-
-With this piped transaction, all commands are sent to Redis in a pipeline.
-
-#### Exception
-
-If any of `Transaction`'s method throws an exception other than `WatchError` or `ReplyError`, the `Transaction` object enters an invalid state. You CANNOT use it any more, but only destroy the object and create a new one.
-
-#### Thread Safety
-
-`Transacation` is NOT thread-safe. If you want to call its member functions in multi-thread environment, you need to synchronize between threads manually.
-
-#### Watch
-
-[WATCH is used to provide a check-and-set(CAS) behavior to Redis transactions](https://redis.io/topics/transactions#optimistic-locking-using-check-and-set).
-
-The `WATCH` command must be sent in the same connection as the transaction. And normally after the `WATCH` command, we also need to send some other commands to get data from Redis before executing the transaction. Take the following check-and-set case as an example:
-
-```
-WATCH key           // watch a key
-val = GET key       // get value of the key
-new_val = val + 1   // incr the value
-MULTI               // begin the transaction
-SET key new_val     // set value only if the value is NOT modified by others
-EXEC                // try to execute the transaction.
-                    // if val has been modified, the transaction won't be executed.
-```
-
-However, with `Transaction` object, you CANNOT get the result of commands until the whole transaction has been finished. Instead, you need to create a `Redis` object from the `Transaction` object. The created `Redis` object shares the connection with `Transaction` object. With this created `Redis` object, you can send `WATCH` command and any other Redis commands to Redis server, and get the result immediately.
-
-Let's see how to implement the above example with *redis-plus-plus*:
-
-```C++
-auto redis = Redis("tcp://127.0.0.1");
-
-// Create a transaction.
-auto tx = redis.transaction();
-
-// Create a Redis object from the Transaction object. Both objects share the same connection.
-auto r = tx.redis();
-
-// If the watched key has been modified by other clients, the transaction might fail.
-// So we need to retry the transaction in a loop.
-while (true) {
-    try {
-        // Watch a key.
-        r.watch("key");
-
-        // Get the old value.
-        auto val = r.get("key");
-        auto num = 0;
-        if (val) {
-            num = std::stoi(*val);
-        } // else use default value, i.e. 0.
-
-        // Incr value.
-        ++num;
-
-        // Execute the transaction.
-        auto replies = tx.set("key", std::to_string(num)).exec();
-
-        // Transaction has been executed successfully. Check the result and break.
-
-        assert(replies.size() == 1 && replies.get<bool>(0) == true);
-
-        break;
-    } catch (const WatchError &err) {
-        // Key has been modified by other clients, retry.
-        continue;
-    } catch (const Error &err) {
-        // Something bad happens, and the Transaction object is no longer valid.
-        throw;
-    }
-}
-```
-
-**NOTE**: in the example above, we create `Transaction` object outside the while loop, in order to avoid creating new connection again and again.
-
-#### Create Transaction Without Creating New Connection
-
-**NOTE**: YOU MUST CAREFULLY READ ALL WORDS AND THE VERY IMPORTANT NOTES LINK IN THIS SECTION BEFORE USING THIS FEATURE!!!
-
-In fact, you can also create a `transaction` object with a connection from the underlying connection pool, so that calling `Redis::transaction` method can be much cheaper (since it doesn't need to create a new connection).
-
-The prototype of `Redis::transaction` is as follows: `Transaction transaction(bool piped = false, bool new_connection = true);`. If `new_connection` is false, the `Transaction` object will be created with a connection from the underlying pool.
-
-```
-ConnectionOptions connection_options;
-ConnectionPoolOptions pool_options;
-
-Redis redis(connection_options, pool_options);
-
-// Create a Transaction without creating a new connection.
-auto tx = redis.transaction(false, false);
-```
-
-However, in this case, you MUST be very careful, otherwise, you might get bad performance or even dead lock. Please carefully check the similar pipeline's [VERY IMPORTANT NOTES section](#very-important-notes), before you use it!
-
-Besides those very important notes, there's another important note for `Transaction`:
-
-- Limit the scope of `Redis` object created by `Transaction::Redis`, i.e. destroy it ASAP.
-
-Check the following example:
-
-```C++
-auto redis = Redis(opts, pool_opts);
-
-// Create a `Transaction` object without creating a new connection.
-auto tx = redis.Transaction(false, false);
-
-// Create a `Redis`, and this `Redis` object shares the same connection with the `Transaction` object.
-auto r = tx.redis();
-
-// Other code here...
-
-// Execute the transaction.
-auto replies = tx.set("key", "val").exec();
-
-// Although `Transaction::exec` has been called, the connection has not been returned to pool.
-// Because the `Redis` object, i.e. `r`, still holds the connection.
-```
-
-So the above watch example should be modified as follows:
-
-```C++
-auto redis = Redis(opts, pool_opts);
-
-// If the watched key has been modified by other clients, the transaction might fail.
-// So we need to retry the transaction in a loop.
-while (true) {
-    try {
-        // Create a transaction without creating a new connection.
-        auto tx = redis.transaction(false, false);
-
-        // Create a Redis object from the Transaction object. Both objects share the same connection.
-        auto r = tx.redis();
-
-        // Watch a key.
-        r.watch("key");
-
-        // Get the old value.
-        auto val = r.get("key");
-        auto num = 0;
-        if (val) {
-            num = std::stoi(*val);
-        } // else use default value, i.e. 0.
-
-        // Incr value.
-        ++num;
-
-        // Execute the transaction.
-        auto replies = tx.set("key", std::to_string(num)).exec();
-
-        // Transaction has been executed successfully. Check the result and break.
-
-        assert(replies.size() == 1 && replies.get<bool>(0) == true);
-
-        break;
-    } catch (const WatchError &err) {
-        // Key has been modified by other clients, retry.
-        continue;
-    } catch (const Error &err) {
-        // Something bad happens, and the Transaction object is no longer valid.
-        throw;
-    }
-}
-```
-
-**NOTE**: The difference is that we create the `Transaction` object in the while loop (it's cheap, since it doesn't need to create a new connection). When the `Transaction` object and the `Redis` object created by `Transaction::redis` have been destroyed, the connection will be return to pool.
-
-### Redis Cluster
-
-*redis-plus-plus* supports [Redis Cluster](https://redis.io/topics/cluster-tutorial). You can use `RedisCluster` class to send commands to Redis Cluster. It has similar interfaces as `Redis` class.
-
-#### Connection
-
-By default, `RedisCluster` connects to all master nodes in the cluster. For each master node, it maintains a connection pool. If you want to read from slave nodes, you need to explicitly set an option (see [below](#read-from-replica) for reference).
-
-You can initialize a `RedisCluster` instance with `ConnectionOptions` and `ConnectionPoolOptions`. You only need to set one master node's host & port in `ConnectionOptions`, and `RedisCluster` will get other nodes' info automatically (with the *CLUSTER SLOTS* command). For each master node, it creates a connection pool with the specified `ConnectionPoolOptions`. If `ConnectionPoolOptions` is not specified, `RedisCluster` maintains a single connection to every master node.
-
-```C++
-// Set a master node's host & port.
-ConnectionOptions connection_options;
-connection_options.host = "127.0.0.1";  // Required.
-connection_options.port = 7000; // Optional. The default port is 6379.
-connection_options.password = "auth"; // Optional. No password by default.
-
-// Automatically get other nodes' info,
-// and connect to every master node with a single connection.
-RedisCluster cluster1(connection_options);
-
-ConnectionPoolOptions pool_options;
-pool_options.size = 3;
-
-// For each master node, maintains a connection pool of size 3.
-RedisCluster cluster2(connection_options, pool_options);
-```
-
-You can also specify connection option with an URI. However, in this way, you can only use default `ConnectionPoolOptions`, i.e. pool of size 1, and CANNOT specify password.
-
-```C++
-// Specify a master node's host & port.
-RedisCluster cluster3("tcp://127.0.0.1:7000");
-
-// Use default port, i.e. 6379.
-RedisCluster cluster4("tcp://127.0.0.1");
-```
-
-##### Read From Replica
-
-If you want to scale read by reading (possible stale) data from slave nodes, you can specifiy `Role::SLAVE` as the third parameter of `RedisCluster`'s constructor. In this case, *redis-plus-plus* will randomly pick a replica node for each master node of the cluster, and create a connection pool for the replica node.
-
-```C++
-RedisCluster cluster(connection_options, pool_options, Role::SLAVE);
-
-auto val = cluster.get("key");
-```
-
-In this case, you can only send readonly commands to Redis Cluster. If you try to send a write command, e.g. `set`, `hset`, *redis-plus-plus* will throw an exception. Currently, *redis-plus-plus* doesn't handle this case, i.e. sending write command in `Role::SLAVE` mode, elegantly, and you might get some performance problem. So, NEVER send write command in `Role::SLAVE` mode. I'll fix this issue in the future.
-
-**NOTE**: In `Role::SLAVE` mode, you don't need to manually send [READONLY](https://redis.io/commands/readonly) command to slave nodes. Instead, *redis-plus-plus* will send *READONLY* command to slave nodes automatically.
-
-##### Note
-
-- `RedisCluster` only works with tcp connection. It CANNOT connect to Unix Domain Socket. If you specify Unix Domain Socket in `ConnectionOptions`, it throws an exception.
-- All nodes in the cluster should have the same password.
-- Since [Redis Cluster does NOT support multiple databses](https://redis.io/topics/cluster-spec#implemented-subset), `ConnectionOptions::db` is ignored.
-
-#### Interfaces
-
-As we mentioned above, `RedisCluster`'s interfaces are similar to `Redis`. It supports most of `Redis`' interfaces, including the [generic command interface](#generic-command-interface) (see `Redis`' [API Reference section](#api-reference) for details), except the following:
-
-- Not support commands without key as argument, e.g. `PING`, `INFO`.
-- Not support Lua script without key parameters.
-
-Since there's no key parameter, `RedisCluster` has no idea on to which node these commands should be sent. However there're 2 workarounds for this problem:
-
-- If you want to send these commands to a specific node, you can create a `Redis` object with that node's host and port, and use the `Redis` object to do the work.
-- Instead of host and port, you can also call `Redis RedisCluster::redis(const StringView &hash_tag)` to create a `Redis` object with a hash-tag specifying the node. In this case, the returned `Redis` object creates a new connection to Redis server. **NOTE**: the returned `Redis` object, **IS NOT THREAD SAFE!**. Also, when using the returned `Redis` object, if it throws exception, you need to destroy it, and create a new one with the `RedisCluster::redis` method.
-
-Also you can use the [hash tags](https://redis.io/topics/cluster-spec#keys-hash-tags) to send multiple-key commands.
-
-See the [example section](#examples-2) for details.
-
-##### Publish/Subscribe
-
-You can publish and subscribe messages with `RedisCluster`. The interfaces are exactly the same as `Redis`, i.e. use `RedisCluster::publish` to publish messages, and use `RedisCluster::subscriber` to create a subscriber to consume messages. See [Publish/Subscribe section](#publishsubscribe) for details.
-
-##### Pipeline and Transaction
-
-You can also create `Pipeline` and `Transaction` objects with `RedisCluster`, but the interfaces are different from `Redis`. Since all commands in the pipeline and transaction should be sent to a single node in a single connection, we need to tell `RedisCluster` with which node the pipeline or transaction should be created.
-
-Instead of specifying the node's IP and port, `RedisCluster`'s pipeline and transaction interfaces allow you to specify the node with a *hash tag*. `RedisCluster` will calculate the slot number with the given *hash tag*, and create a pipeline or transaction with the node holding the slot.
-
-```C++
-Pipeline RedisCluster::pipeline(const StringView &hash_tag, bool new_connection = true);
-
-Transaction RedisCluster::transaction(const StringView &hash_tag, bool piped = false, bool new_connection = true);
-```
-
-With the created `Pipeline` or `Transaction` object, you can send commands with keys located on the same node as the given *hash_tag*. See [Examples section](#examples-2) for an example.
-
-**NOTE**: By default, `Pipeline` and `Transaction` will be created with a new connection. In order to avoid creating new connection, you can pass `false` as the last parameter. However, in this case, you MUST be very careful, otherwise, you might get bad performance or even dead lock. Please carefully check the related [pipeline section](#very-important-notes) before using this feature.
-
-#### Examples
-
-```C++
-#include <sw/redis++/redis++.h>
-
-using namespace sw::redis;
-
-auto redis_cluster = RedisCluster("tcp://127.0.0.1:7000");
-
-redis_cluster.set("key", "value");
-auto val = redis_cluster.get("key");
-if (val) {
-    std::cout << *val << std::endl;
-}
-
-// With hash-tag.
-redis_cluster.set("key{tag}1", "val1");
-redis_cluster.set("key{tag}2", "val2");
-redis_cluster.set("key{tag}3", "val3");
-std::vector<OptionalString> hash_tag_res;
-redis_cluster.mget({"key{tag}1", "key{tag}2", "key{tag}3"},
-        std::back_inserter(hash_tag_res));
-
-redis_cluster.lpush("list", {"1", "2", "3"});
-std::vector<std::string> list;
-redis_cluster.lrange("list", 0, -1, std::back_inserter(list));
-
-// Pipeline.
-auto pipe = redis_cluster.pipeline("counter");
-auto replies = pipe.incr("{counter}:1").incr("{counter}:2").exec();
-
-// Transaction.
-auto tx = redis_cluster.transaction("key");
-replies = tx.incr("key").get("key").exec();
-
-// Create a Redis object with hash-tag.
-// It connects to the Redis instance that holds the given key, i.e. hash-tag.
-auto r = redis_cluster.redis("hash-tag");
-
-// And send command without key parameter to the server.
-r.command("client", "setname", "connection-name");
-```
-
-**NOTE**: By default, when you use `RedisCluster::redis(const StringView &hash_tag, bool new_connection = true)` to create a `Redis` object, instead of picking a connection from the underlying connection pool, it creates a new connection to the corresponding Redis server. So this is NOT a cheap operation, and you should try to reuse this newly created `Redis` object as much as possible. If you pass `false` as the second parameter, you can create a `Redis` object without creating a new connection. However, in this case, you should be very careful, otherwise, you might get bad performance or even dead lock. Please carefully check the related [pipeline section](#very-important-notes) before using this feature.
-
-```C++
-// This is BAD! It's very inefficient.
-// NEVER DO IT!!!
-// After sending PING command, the newly created Redis object will be destroied.
-cluster.redis("key").ping();
-
-// Then it creates a connection to Redis, and closes the connection after sending the command.
-cluster.redis("key").command("client", "setname", "hello");
-
-// Instead you should reuse the Redis object.
-// This is GOOD!
-auto redis = cluster.redis("key");
-
-redis.ping();
-redis.command("client", "setname", "hello");
-
-// This is GOOD! Create `Redis` object without creating a new connection. Use it, and destroy it ASAP.
-cluster.redis("key", false).ping();
-```
-
-#### Details
-
-`RedisCluster` maintains the newest slot-node mapping, and sends command directly to the right node. Normally it works as fast as `Redis`. If the cluster reshards, `RedisCluster` will follow the redirection, and it will finally update the slot-node mapping. It can correctly handle the following resharding cases:
-
-- Data migration between exist nodes.
-- Add new node to the cluster.
-- Remove node from the cluster.
-
-`redis-plus-plus` is able to handle both [MOVED](https://redis.io/topics/cluster-spec#moved-redirection) and [ASK](https://redis.io/topics/cluster-spec#ask-redirection) redirections, so it's a complete Redis Cluster client.
-
-If master is down, the cluster will promote one of its replicas to be the new master. *redis-plus-plus* can also handle this case:
-
-- When the master is down, *redis-plus-plus* losts connection to it. In this case, if you try to send commands to this master, *redis-plus-plus* will try to update slot-node mapping from other nodes. If the mapping remains unchanged, i.e. new master hasn't been elected yet, it fails to send command to Redis Cluster and throws exception.
-- When the new master has been elected, the slot-node mapping will be updated by the cluster. In this case, if you send commands to the cluster, *redis-plus-plus* can get an update-to-date mapping, and sends commands to the new master.
-
-### Redis Sentinel
-
-[Redis Sentinel provides high availability for Redis](https://redis.io/topics/sentinel). If Redis master is down, Redis Sentinels will elect a new master from slaves, i.e. failover. Besides, Redis Sentinel can also act like a configuration provider for clients, and clients can query master or slave address from Redis Sentinel. So that if a failover occurs, clients can ask the new master address from Redis Sentinel.
-
-*redis-plus-plus* supports getting Redis master or slave's IP and port from Redis Sentinel. In order to use this feature, you only need to initialize `Redis` object with Redis Sentinel info, which is composed with 3 parts: `std::shared_ptr<Sentinel>`, master name and role (master or slave).
-
-Before using Redis Sentinel with *redis-plus-plus*, ensure that you have read Redis Sentinel's [doc](https://redis.io/topics/sentinel).
-
-#### Sentinel
-
-You can create a `std::shared_ptr<Sentinel>` object with `SentinelOptions`.
-
-```C++
-SentinelOptions sentinel_opts;
-sentinel_opts.nodes = {{"127.0.0.1", 9000},
-                        {"127.0.0.1", 9001},
-                        {"127.0.0.1", 9002}};   // Required. List of Redis Sentinel nodes.
-
-// Optional. Timeout before we successfully connect to Redis Sentinel.
-// By default, the timeout is 100ms.
-sentinel_opts.connect_timeout = std::chrono::milliseconds(200);
-
-// Optional. Timeout before we successfully send request to or receive response from Redis Sentinel.
-// By default, the timeout is 100ms.
-sentinel_opts.socket_timeout = std::chrono::milliseconds(200);
-
-auto sentinel = std::make_shared<Sentinel>(sentinel_opts);
-```
-
-`SentinelOptions::connect_timeout` and `SentinelOptions::socket_timeout` CANNOT be 0ms, i.e. no timeout and block forever. Otherwise, *redis-plus-plus* will throw an exception.
-
-See [SentinelOptions](https://github.com/sewenew/redis-plus-plus/blob/master/src/sw/redis%2B%2B/sentinel.h#L33) for more options.
-
-#### Role
-
-Besides `std::shared_ptr<Sentinel>` and master name, you also need to specify a role. There are two roles: `Role::MASTER`, and `Role::SLAVE`.
-
-With `Role::MASTER`, *redis-plus-plus* will always connect to current master instance, even if a failover occurs. Each time when *redis-plus-plus* needs to create a new connection to master, or a connection is broken, and it needs to reconnect to master, *redis-plus-plus* will ask master address from Redis Sentinel, and connects to current master. If a failover occurs, *redis-plus-plus* can automatically get the address of the new master, and refresh all connections in the underlying connection pool.
-
-Similarly, with `Role::SLAVE`, *redis-plus-plus* will always connect to a slave instance. A master might have several slaves, *redis-plus-plus* will randomly pick one, and connect to it, i.e. all connections in the underlying connection pool, connect to the same slave instance (check [this discussion](https://github.com/sewenew/redis-plus-plus/issues/99) on why *redis-plus-plus* not connect to all slaves). If the connection is broken, while this slave instance is still an alive slave, *redis-plus-plus* will reconnect to this slave. However, if this slave instance is down, or it has been promoted to be the master, *redis-plus-plus* will randomly connect to another slave. If there's no slave alive, it throws an exception.
-
-#### Create Redis With Sentinel
-
-When creating a `Redis` object with sentinel, besides the sentinel info, you should also provide `ConnectionOptions` and `ConnectionPoolOptions`. These two options are used to connect to Redis instance. `ConnectionPoolOptions` is optional, if not specified, it creates a single connection the instance.
-
-```C++
-ConnectionOptions connection_opts;
-connection_opts.password = "auth";  // Optional. No password by default.
-connection_opts.connect_timeout = std::chrono::milliseconds(100);   // Required.
-connection_opts.socket_timeout = std::chrono::milliseconds(100);    // Required.
-
-ConnectionPoolOptions pool_opts;
-pool_opts.size = 3; // Optional. The default size is 1.
-
-auto redis = Redis(sentinel, "master_name", Role::MASTER, connection_opts, pool_opts);
-```
-
-You might have noticed that we didn't specify the `host` and `port` fields for `ConnectionOptions`. Because, `Redis` will get these info from Redis Sentinel. Also, in this case, `ConnectionOptions::connect_timeout` and `ConnectionOptions::socket_timeout` CANNOT be 0ms, otherwise, it throws an exception. So you always need to specify these two timeouts manually.
-
-After creating the `Redis` object with sentinel, you can send commands with it, just like an ordinary `Redis` object.
-
-If you want to write to master, and scale read with slaves. You can use the following pattern:
-
-```C++
-auto sentinel = std::make_shared<Sentinel>(sentinel_opts);
-
-auto master = Redis(sentinel, "master_name", Role::MASTER, connection_opts, pool_opts);
-
-auto slave = Redis(sentinel, "master_name", Role::SLAVE, connection_opts, pool_opts);
-
-// Write to master.
-master.set("key", "value");
-
-// Read from slave.
-slave.get("key");
-```
-
-### Redis Stream
-
-Since Redis 5.0, it introduces a new data type: *Redis Stream*. *redis-plus-plus* has built-in methods for all stream commands except the *XINFO* command (of course, you can use the [Generic Command Interface](#generic-command-interface) to send *XINFO* command).
-
-However, the replies of some streams commands, i.e. *XPENDING*, *XREAD*, are complex. So I'll give some examples to show you how to work with these built-in methods.
-
-#### Examples
-
-```C++
-auto redis = Redis("tcp://127.0.0.1");
-
-using Attrs = std::vector<std::pair<std::string, std::string>>;
-
-// You can also use std::unordered_map, if you don't care the order of attributes:
-// using Attrs = std::unordered_map<std::string, std::string>;
-
-Attrs attrs = { {"f1", "v1"}, {"f2", "v2"} };
-
-// Add an item into the stream. This method returns the auto generated id.
-auto id = redis.xadd("key", "*", attrs.begin(), attrs.end());
-
-// Each item is assigned with an id: pair<id, Optional<attributes>>.
-// NOTE: the attribute part might be nil reply, check [this issue](https://github.com/sewenew/redis-plus-plus/issues/283) for detail.
-using Item = std::pair<std::string, Optional<Attrs>>;
-using ItemStream = std::vector<Item>;
-
-// If you don't care the order of items in the stream, you can also use unordered_map:
-// using ItemStream = std::unordered_map<std::string, Attrs>;
-
-// Read items from a stream, and return at most 10 items.
-// You need to specify a key and an id (timestamp + offset).
-std::unordered_map<std::string, ItemStream> result;
-redis.xread("key", id, 10, std::inserter(result, result.end()));
-
-// Read from multiple streams. For each stream, you need to specify a key and an id.
-std::unordered_map<std::string, std::string> keys = { {"key", id}, {"another-key", "0-0"} };
-redis.xread(keys.begin(), keys.end(), 10, std::inserter(result, result.end()));
-
-// Block for at most 1 second if currently there's no data in the stream.
-redis.xread("key", id, std::chrono::seconds(1), 10, std::inserter(result, result.end()));
-
-// Block for multiple streams.
-redis.xread(keys.begin(), keys.end(), std::chrono::seconds(1), 10, std::inserter(result, result.end()));
-
-// Read items in a range:
-ItemStream item_stream;
-redis.xrange("key", "-", "+", std::back_inserter(item_stream));
-
-// Trim the stream to a given number of items. After the operation, the stream length is NOT exactly
-// 10. Instead, it might be much larger than 10.
-// `XTRIM key MAXLEN 10`
-redis.xtrim("key", 10);
-
-// In order to trim the stream to exactly 10 items, specify the third argument, i.e. approx, as false.
-// `XTRIM key MAXLEN ~ 10`
-redis.xtrim("key", 10, false);
-
-// Delete an item from the stream.
-redis.xdel("key", id);
-
-// Create a consumer group.
-redis.xgroup_create("key", "group", "$");
-
-// If the stream doesn't exist, you can set the fourth argument, i.e. MKSTREAM, to be true.
-// redis.xgroup_create("key", "group", "$", true);
-
-id = redis.xadd("key", "*", attrs.begin(), attrs.end());
-
-// Read item by a consumer of a consumer group.
-redis.xreadgroup("group", "consumer", "key", ">", 1, std::inserter(result, result.end()));
-
-using PendingItem = std::tuple<std::string, std::string, long long, long long>;
-std::vector<PendingItem> pending_items;
-
-// Get pending items of a speicified consumer.
-redis.xpending("key", "group", "-", "+", 1, "consumer", std::back_inserter(pending_items));
-
-redis.xack("key", "group", id);
-
-redis.xgroup_delconsumer("key", "group", "consumer");
-redis.xgroup_destroy("key", "group");
-```
-
-If you have any problem on sending stream commands to Redis, please feel free to let me know.
-
-### Redis Modules
-
-[Redis Modules](https://redis.io/modules) enrich Redis. However, *redis-plus-plus* does not have built-in support/method for these modules, although you can use the [generic interface](#generic-command-interface) to send commands related to these modules.
-
-Fortunately, [@wingunder](https://github.com/wingunder) did a great job to make the work easier. He wrote [redis-plus-plus-modules](https://github.com/wingunder/redis-plus-plus-modules), which is a header only project that has built-in support for some popular modules. If you need to work with Redis Modules, you should have a try.
-
-@wingunder also contributes a lot to *redis-plus-plus*. Many thanks to @wingunder!
-
-### Async Interface
-
-*redis-plus-plus* also supports async interface, however, async support for Transaction and Subscriber is still on the way.
-
-The async interface depends on third-party event library, and so far, only libuv is supported.
-
-#### Installation
-
-You must install *libuv*(e.g. *apt-get install libuv1-dev*) before install *hiredis* and *redis-plus-plus*.
-
-*hiredis* v1.0.0's async interface is different from older version, and *redis-plus-plus* only supports *hiredis* v1.0.0 or later. So you need to ensure you've installed the right version of hiredis before installing *redis-plus-plus*. Also, you should NEVER install multiple versions of *hiredis*, otherwise, you'll get some wired problems. If you already installed an older version, remove it, and install a newer version.
-
-When installing *redis-plus-plus*, you should specify the following command line option: `-DREDIS_PLUS_PLUS_BUILD_ASYNC=libuv`.
-
-```
-cmake -DCMAKE_PREFIX_PATH=/installation/path/to/libuv/and/hiredis -DREDIS_PLUS_PLUS_BUILD_ASYNC=libuv ..
-
-make
-
-make install
-```
-
-#### Getting Started
-
-The async interface is similar to sync interface, except that you should include *sw/redis++/async_redis++.h*, and define an object of `sw::redis::AsyncRedis`, and the related methods return `Future` object (so far, only `std::future` and `boost::future` are supported, support for other implementations of *future* is on the way).
-
-**NOTE**: When building your application code, don't forget to link libuv.
-
-```
-#include <sw/redis++/async_redis++.h>
-
-ConnectionOptions opts;
-opts.host = "127.0.0.1";
-opts.port = 6379;
-
-ConnectionPoolOptions pool_opts;
-pool_opts.size = 3;
-
-auto async_redis = AsyncRedis(opts, pool_opts);
-
-Future<string> ping_res = async_redis.ping();
-
-Future<bool> set_res = async_redis.set("key", "val");
-
-Future<Optional<string>> get_res = async_redis.get("key");
-
-unordered_map<string, string> m = {{"a", "b"}, {"c", "d"}};
-Future<void> hmset_res = async_redis.hmset("hash", m.begin(), m.end());
-
-auto hgetall_res = async_redis.hgetall<vector<string>>("hash");
-
-cout << ping_res.get() << endl;
-cout << set_res.get() << endl;
-auto val = get_res.get();
-if (val)
-    cout << *val << endl;
-else
-    cout << "not exist" << endl;
-
-hmset_res.get();
-
-for (const auto &ele : hgetall_res.get())
-    cout << ele << endl;
-
-// Generic interface.
-
-// There's no *AsyncRedis::client_getname* interface.
-// But you can use *Redis::command* to get the client name.
-auto getname_res = redis.command<OptionalString>("client", "getname");
-val = getname_res.get();
-if (val) {
-    std::cout << *val << std::endl;
-}
-```
-
-#### Redis Sentinel
-
-Aysnc interface also supports Redis Sentinel.
-
-```
-#include <sw/redis++/async_redis++.h>
-
-SentinelOptions sentinel_opts;
-sentinel_opts.nodes = {
-    {"127.0.0.1", 8000},
-    {"127.0.0.1", 8001},
-    {"127.0.0.1", 8002}
-};
-
-sentinel_opts.connect_timeout = std::chrono::milliseconds(100);
-sentinel_opts.socket_timeout = std::chrono::milliseconds(100);
-
-auto sentinel = std::make_shared<AsyncSentinel>(sentinel_opts);
-
-onnectionOptions connection_opts;
-connection_opts.connect_timeout = std::chrono::milliseconds(100);   // Required.
-connection_opts.socket_timeout = std::chrono::milliseconds(100);   // Required.
-
-ConnectionPoolOptions pool_opts;
-pool_opts.size = 3; // Optional. The default size is 1.
-
-// Connect to master node.
-AsyncRedis redis(sentinel, "mymaster", Role::MASTER, connection_opts, pool_opts);
-
-// The following code randomly connects to one of the slave nodes.
-// AsyncRedis redis(sentinel, "mymaster", Role::SLAVE, connection_opts, pool_opts);
-
-redis.set("key", "value");
-
-auto value = redis.get("key").get();
-```
-
-The async support for sentinel is similar with the sync one, except that you need to create an `AsyncSentinel` object instead of a `Sentinel` object. Check [Redis Sentinel](#redis-sentinel) for more details on `SentinelOptions`, `ConnectionOptions` and `Role`.
-
-#### Redis Cluster
-
-Aysnc interface also supports Redis Cluster. Instead of `AsyncRedis`, you need to create an `AsyncRedisCluster` object.
-
-```
-ConnectionOptions opts;
-opts.host = "127.0.0.1";
-opts.port = 6379;
-
-ConnectionPoolOptions pool_opts;
-pool_opts.size = 3;
-
-auto async_cluster = AsyncRedisCluster(opts, pool_opts);
-
-Future<bool> set_res = async_cluster.set("key", "val");
-
-Future<Optional<string>> get_res = async_cluster.get("key");
-
-auto mget_res = async_cluster.mget<std::vector<OptionalString>>({"{hashtag}key1", "{hashhag}key2", "{hashtag}key3"});
-
-unordered_map<string, string> m = {{"a", "b"}, {"c", "d"}};
-Future<void> hmset_res = async_redis.hmset("hash", m.begin(), m.end());
-```
-
-#### Event Loop
-
-By default, `AsyncRedis` and `AsyncRedisCluster` create a default event loop, and runs the loop in a dedicated thread to handle read and write operations. However, you can also share the underlying event loop with multiple `AsyncRedis` and `AsyncRedisCluster` objects. In order to do that, you need to create a `std::shared_ptr<EventLoop>`, and pass it to the constructors of `AsyncRedis` and `AsyncRedisCluster`.
-
-```
-auto event_loop = std::make_shared<EventLoop>();
-
-auto redis = AsyncRedis(connection_opts, pool_opts, loop);
-
-auto cluster = AsyncRedisCluster(connection_opts, pool_opts, Role::MASTER, loop);
-```
-
-#### Future with Continuation
-
-Unfortunately, `std::future` doesn't support [continuation](https://en.cppreference.com/w/cpp/experimental/future/then) so far, which is inconvenient. However, some other libraries, e.g. boost and folly, have continuation support.
-
-By default, *redis-plus-plus* returns `std::future` for async interface. However, you can also make it return `boost::future` by specifying `-DREDIS_PLUS_PLUS_ASYNC_FUTURE=boost` when running cmake (`folly` and other libraries might be supported in the future). Of course, in this case, you need to install boost first.
-
-```
-cmake -DREDIS_PLUS_PLUS_BUILD_ASYNC=libuv -DREDIS_PLUS_PLUS_ASYNC_FUTURE=boost ..
-```
-
-**NOTE**: When building your application code, don't forget to link boost related libs, e.g. -lboost_thread, -lboost_system.
-
-Then you can take advantage of `boost::future`'s continuation support:
-
-```
-#include <sw/redis++/async_redis++.h>
-
-ConnectionOptions opts;
-opts.host = "127.0.0.1";
-opts.port = 6379;
-auto redis = AsyncRedis(opts);
-auto fut = redis.get("key").then([](sw::redis::Future<sw::redis::Optional<std::string>> fut) {
-                                    auto val = fut.get();
-                                    if (val) cout << *val << endl;
-                                });
-// Do other things
-
-// Wait for the continuation finishes.
-fut.get();
-```
-
-You can also use a thread pool to run the continuation:
-
-```
-#define BOOST_THREAD_PROVIDES_EXECUTORS
-
-// You might also need to `#define BOOST_THREAD_USES_MOVE` with some version of Boost.
-// See [this issue](https://github.com/sewenew/redis-plus-plus/issues/272) for detail.
-
-#include <sw/redis++/async_redis++.h>
-#include <boost/thread/executors/basic_thread_pool.hpp>
-
-boost::executors::basic_thread_pool pool(3);
-auto fut = redis.get("key").then(pool,
-        [](sw::redis::Future<sw::redis::Optional<std::string>> fut) {
-            auto val = fut.get();
-            if (val) cout << *val << endl;
-        });
-
-// Do other things
-
-fut.get();
-```
-
-## Redis Recipes
-
-We can create many interesting data structures and algorithms based on Redis, such as [Redlock](https://redis.io/topics/distlock). We call these data structures and algorithms as **Redis Recipes**. *redis-plus-plus* will support some of these recipes.
-
-**NOTE**: These recipes will be first implemented on the [recipes branch](https://github.com/sewenew/redis-plus-plus/tree/recipes). I'd like to hear your feedback on the API of these recipes, and when these APIs become stable, I'll merge the code into the master branch. So APIs on the *recipes* branch are NOT stable, and might be changed in the future.
-
-### Redlock
-
-[Redlock](https://redis.io/topics/distlock) is a distributed lock based on Redis. Thanks to @wingunder's [suggestion](https://github.com/sewenew/redis-plus-plus/issues/24), *redis-plus-plus* supports Redlock now. @wingunder and I made two different implementation of Redlock: one based on Lua script, and the other based on transaction. The Lua script version should be faster, and also it has many other parameters to control the behavior. However, if you are not allowed to, or don't want to run Lua scripts inside Redis, you could try using the transaction version.
-
-#### Examples
-
-```
-auto redis1 = Redis("tcp://127.0.0.1:7000");
-auto redis2 = Redis("tcp://127.0.0.1:7001");
-auto redis3 = Redis("tcp://127.0.0.1:7002");
-
-// Lua script version:
-{
-    RedLockMutex mtx({redis1, redis2, redis3}, "resource");
-
-    // Not locked.
-    RedLock<RedLockMutex> lock(mtx, std::defer_lock);
-
-    // Try to get the lock, and keep 30 seconds.
-    // It returns the validity time of the lock, i.e. the lock is only
-    // valid in *validity_time*, after that the lock might be acquired by others.
-    // If failed to acquire the lock, throw an exception of Error type.
-    auto validity_time = lock.try_lock(std::chrono::seconds(30));
-
-    // Extend the lock before the lock expired.
-    validity_time = lock.extend_lock(std::chrono::seconds(10));
-
-    // You can unlock explicitly.
-    lock.unlock();
-} // If unlock() is not called, the lock will be unlocked automatically when it's destroied.
-
-// Transaction version:
-{
-    RedMutex mtx({redis1, redis2, redis3}, "resource");
-
-    RedLock<RedMutex> lock(mtx, std::defer_lock);
-    auto validity_time = lock.try_lock(std::chrono::seconds(30));
-    validity_time = lock.extend_lock(std::chrono::seconds(30));
-
-    // You can unlock explicitly.
-    lock.unlock();
-}
-```
-
-Please refer to the [code](https://github.com/sewenew/redis-plus-plus/blob/recipes/src/sw/redis%2B%2B/recipes/redlock.h) for detail. I'll enhance the doc in the future.
-
-## Author
-
-*redis-plus-plus* is written by sewenew, who is also active on [StackOverflow](https://stackoverflow.com/users/5384363/for-stack).
diff --git a/ext/redis-plus-plus-1.3.3/cmake/redis++-config.cmake.in b/ext/redis-plus-plus-1.3.3/cmake/redis++-config.cmake.in
deleted file mode 100644
index 242f4734d..000000000
--- a/ext/redis-plus-plus-1.3.3/cmake/redis++-config.cmake.in
+++ /dev/null
@@ -1,12 +0,0 @@
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-
-string(REPLACE "," ";" REDIS_PLUS_PLUS_DEPENDS_LIST @REDIS_PLUS_PLUS_DEPENDS@)
-foreach(REDIS_PLUS_PLUS_DEP ${REDIS_PLUS_PLUS_DEPENDS_LIST})
-    find_dependency(${REDIS_PLUS_PLUS_DEP} REQUIRED)
-endforeach()
-
-include("${CMAKE_CURRENT_LIST_DIR}/redis++-targets.cmake")
-
-check_required_components(redis++)
diff --git a/ext/redis-plus-plus-1.3.3/cmake/redis++.pc.in b/ext/redis-plus-plus-1.3.3/cmake/redis++.pc.in
deleted file mode 100644
index 42a27c378..000000000
--- a/ext/redis-plus-plus-1.3.3/cmake/redis++.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: redis++
-Description: This is a Redis client, based on hiredis and written in C++11. It supports scritpting, pub/sub, pipeline, transaction, Redis Cluster, Redis Sentinel, connection pool, ACL, SSL and thread safety.
-Version: @PROJECT_VERSION@
-URL: https://github.com/sewenew/redis-plus-plus
-Requires: @REDIS_PLUS_PLUS_DEPENDS@
-Cflags: -I${includedir}
-Libs: -L${libdir} -lredis++
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/cmd_formatter.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/cmd_formatter.h
deleted file mode 100644
index 85efdf347..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/cmd_formatter.h
+++ /dev/null
@@ -1,775 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
-#define SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
-
-#include <hiredis/hiredis.h>
-#include "command_options.h"
-#include "command_args.h"
-#include "command.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class FormattedCommand {
-public:
-    FormattedCommand(char *data, int len) : _data(data), _size(len) {
-        if (data == nullptr || len < 0) {
-            throw Error("failed to format command");
-        }
-    }
-
-    FormattedCommand(const FormattedCommand &) = delete;
-    FormattedCommand& operator=(const FormattedCommand &) = delete;
-
-    FormattedCommand(FormattedCommand &&that) noexcept {
-        _move(std::move(that));
-    }
-
-    FormattedCommand& operator=(FormattedCommand &&that) noexcept {
-        if (this != &that) {
-            _move(std::move(that));
-        }
-
-        return *this;
-    }
-
-    ~FormattedCommand() noexcept {
-        if (_data != nullptr) {
-            redisFreeCommand(_data);
-        }
-    }
-
-    const char* data() const noexcept {
-        return _data;
-    }
-
-    int size() const noexcept {
-        return _size;
-    }
-
-private:
-    void _move(FormattedCommand &&that) noexcept {
-        _data = that._data;
-        _size = that._size;
-        that._data = nullptr;
-        that._size = 0;
-    }
-
-    char *_data = nullptr;
-    int _size = 0;
-};
-
-namespace fmt {
-
-template <typename ...Args>
-FormattedCommand format_cmd(const char *format, Args &&...args) {
-    char *data = nullptr;
-    auto len = redisFormatCommand(&data, format, std::forward<Args>(args)...);
-
-    return FormattedCommand(data, len);
-}
-
-inline FormattedCommand format_cmd(int argc, const char **argv, const std::size_t *argv_len) {
-    char *data = nullptr;
-    auto len = redisFormatCommandArgv(&data, argc, argv, argv_len);
-
-    return FormattedCommand(data, len);
-}
-
-inline FormattedCommand format_cmd(CmdArgs &args) {
-    char *data = nullptr;
-    auto len = redisFormatCommandArgv(&data, args.size(), args.argv(), args.argv_len());
-
-    return FormattedCommand(data, len);
-}
-
-struct SetResultParser {
-    bool operator()(redisReply &reply) const {
-        sw::redis::reply::rewrite_set_reply(reply);
-        return sw::redis::reply::parse<bool>(reply);
-    }
-};
-
-// CONNECTION commands.
-
-inline FormattedCommand echo(const StringView &msg) {
-    return format_cmd("ECHO %b", msg.data(), msg.size());
-}
-
-inline FormattedCommand ping() {
-    return format_cmd("PING");
-}
-
-inline FormattedCommand ping(const StringView &msg) {
-    return format_cmd("PING %b", msg.data(), msg.size());
-}
-
-inline FormattedCommand del(const StringView &key) {
-    return format_cmd("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand del_range(Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand exists(const StringView &key) {
-    return format_cmd("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand exists_range(Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("EXPIRE %b %lld", key.data(), key.size(), timeout.count());
-}
-
-inline FormattedCommand expireat(const StringView &key,
-        const std::chrono::time_point<std::chrono::system_clock,
-                                        std::chrono::seconds> &tp) {
-    return format_cmd("EXPIREAT %b %lld", key.data(), key.size(), tp.time_since_epoch().count());
-}
-
-inline FormattedCommand pexpire(const StringView &key,
-        const std::chrono::milliseconds &timeout) {
-    return format_cmd("PEXPIRE %b %lld", key.data(), key.size(), timeout.count());
-}
-
-inline FormattedCommand pexpireat(const StringView &key,
-        const std::chrono::time_point<std::chrono::system_clock,
-                                            std::chrono::milliseconds> &tp) {
-    return format_cmd("PEXPIREAT %b %lld", key.data(), key.size(), tp.time_since_epoch().count());
-}
-
-inline FormattedCommand pttl(const StringView &key) {
-    return format_cmd("PTTL %b", key.data(), key.size());
-}
-
-inline FormattedCommand rename(const StringView &key, const StringView &newkey) {
-    return format_cmd("RENAME %b %b", key.data(), key.size(), newkey.data(), newkey.size());
-}
-
-inline FormattedCommand renamenx(const StringView &key, const StringView &newkey) {
-    return format_cmd("RENAMENX %b %b", key.data(), key.size(), newkey.data(), newkey.size());
-}
-
-inline FormattedCommand ttl(const StringView &key) {
-    return format_cmd("TTL %b", key.data(), key.size());
-}
-
-inline FormattedCommand unlink(const StringView &key) {
-    return format_cmd("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand unlink_range(Input first, Input last) {
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// STRING commands.
-
-inline FormattedCommand get(const StringView &key) {
-    return format_cmd("GET %b", key.data(), key.size());
-}
-
-inline FormattedCommand incr(const StringView &key) {
-    return format_cmd("INCR %b", key.data(), key.size());
-}
-
-inline FormattedCommand incrby(const StringView &key, long long increment) {
-    return format_cmd("INCRBY %b %lld", key.data(), key.size(), increment);
-}
-
-inline FormattedCommand incrbyfloat(const StringView &key, double increment) {
-    return format_cmd("INCRBYFLOAT %b %f", key.data(), key.size(), increment);
-}
-
-template <typename Input>
-FormattedCommand mget(Input first, Input last) {
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand mset(Input first, Input last) {
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand msetnx(Input first, Input last) {
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand set(const StringView &key,
-        const StringView &val,
-        const std::chrono::milliseconds &ttl,
-        UpdateType type) {
-    CmdArgs args;
-    args << "SET" << key << val;
-
-    if (ttl > std::chrono::milliseconds(0)) {
-        args << "PX" << ttl.count();
-    }
-
-    cmd::detail::set_update_type(args, type);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand strlen(const StringView &key) {
-    return format_cmd("STRLEN %b", key.data(), key.size());
-}
-
-inline FormattedCommand blpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BLPOP %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand blpop_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand brpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BRPOP %b %lld", key.data(), key.size(), timeout.count());
-}
-
-
-template <typename Input>
-FormattedCommand brpop_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand brpoplpush(const StringView &source,
-        const StringView &destination,
-        const std::chrono::seconds &timeout) {
-    return format_cmd("BRPOPLPUSH %b %b %lld",
-            source.data(), source.size(),
-            destination.data(), destination.size(),
-            timeout.count());
-}
-
-inline FormattedCommand llen(const StringView &key) {
-    return format_cmd("LLEN %b", key.data(), key.size());
-}
-
-inline FormattedCommand lpop(const StringView &key) {
-    return format_cmd("LPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand lpush(const StringView &key, const StringView &val) {
-    return format_cmd("LPUSH %b %b", key.data(), key.size(), val.data(), val.size());
-}
-
-template <typename Input>
-FormattedCommand lpush_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand lrange(const StringView &key, long long start, long long stop) {
-    return format_cmd("LRANGE %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-inline FormattedCommand lrem(const StringView &key, long long count, const StringView &val) {
-    return format_cmd("LREM %b %lld %b", key.data(), key.size(), count, val.data(), val.size());
-}
-
-inline FormattedCommand ltrim(const StringView &key, long long start, long long stop) {
-    return format_cmd("LTRIM %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-inline FormattedCommand rpop(const StringView &key) {
-    return format_cmd("RPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand rpoplpush(const StringView &source, const StringView &destination) {
-    return format_cmd("RPOPLPUSH %b %b",
-            source.data(), source.size(),
-            destination.data(), destination.size());
-}
-
-inline FormattedCommand rpush(const StringView &key, const StringView &val) {
-    return format_cmd("RPUSH %b %b", key.data(), key.size(), val.data(), val.size());
-}
-
-template <typename Input>
-FormattedCommand rpush_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// HASH commands.
-
-inline FormattedCommand hdel(const StringView &key, const StringView &field) {
-    return format_cmd("HDEL %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-template <typename Input>
-FormattedCommand hdel_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hexists(const StringView &key, const StringView &field) {
-    return format_cmd("HEXISTS %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-inline FormattedCommand hget(const StringView &key, const StringView &field) {
-    return format_cmd("HGET %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-inline FormattedCommand hgetall(const StringView &key) {
-    return format_cmd("HGETALL %b", key.data(), key.size());
-}
-
-inline FormattedCommand hincrby(const StringView &key,
-        const StringView &field,
-        long long increment) {
-    return format_cmd("HINCRBY %b %b %lld",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            increment);
-}
-
-inline FormattedCommand hincrbyfloat(const StringView &key,
-        const StringView &field,
-        double increment) {
-    return format_cmd("HINCRBYFLOAT %b %b %f",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            increment);
-}
-
-inline FormattedCommand hkeys(const StringView &key) {
-    return format_cmd("HKEYS %b", key.data(), key.size());
-}
-
-inline FormattedCommand hlen(const StringView &key) {
-    return format_cmd("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand hmget(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand hmset(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hset(const StringView &key,
-        const StringView &field,
-        const StringView &val) {
-    return format_cmd("HSET %b %b %b",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            val.data(), val.size());
-}
-
-template <typename Input>
-auto hset_range(const StringView &key,
-        Input first,
-        Input last)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                FormattedCommand>::type {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HSET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hvals(const StringView &key) {
-    return format_cmd("HVALS %b", key.data(), key.size());
-}
-
-// SET commands.
-
-inline FormattedCommand sadd(const StringView &key, const StringView &member) {
-    return format_cmd("SADD %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand sadd_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand scard(const StringView &key) {
-    return format_cmd("SCARD %b", key.data(), key.size());
-}
-
-inline FormattedCommand sismember(const StringView &key, const StringView &member) {
-    return format_cmd("SISMEMBER %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand smembers(const StringView &key) {
-    return format_cmd("SMEMBERS %b", key.data(), key.size());
-}
-
-inline FormattedCommand spop(const StringView &key) {
-    return format_cmd("SPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand spop(const StringView &key, long long count) {
-    return format_cmd("SPOP %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand srem(const StringView &key, const StringView &member) {
-    return format_cmd("SREM %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand srem_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// SORTED SET commands.
-
-inline FormattedCommand bzpopmax(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BZPOPMAX %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand bzpopmax_range(Input first,
-        Input last,
-        const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand bzpopmin(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BZPOPMIN %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand bzpopmin_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand zadd(const StringView &key,
-        const StringView &member,
-        double score,
-        UpdateType type,
-        bool changed) {
-    CmdArgs args;
-    args << "ZADD" << key;
-
-    cmd::detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    args << score << member;
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand zadd_range(const StringView &key,
-        Input first,
-        Input last,
-        UpdateType type,
-        bool changed) {
-    CmdArgs args;
-    args << "ZADD" << key;
-
-    cmd::detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand zcard(const StringView &key) {
-    return format_cmd("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-FormattedCommand zcount(const StringView &key, const Interval &interval) {
-    return format_cmd("ZCOUNT %b %s %s",
-            key.data(), key.size(),
-            interval.min().c_str(),
-            interval.max().c_str());
-}
-
-inline FormattedCommand zincrby(const StringView &key,
-        double increment,
-        const StringView &member) {
-    return format_cmd("ZINCRBY %b %f %b",
-            key.data(), key.size(),
-            increment,
-            member.data(), member.size());
-}
-
-template <typename Interval>
-FormattedCommand zlexcount(const StringView &key,
-        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline FormattedCommand zpopmax(const StringView &key) {
-    return format_cmd("ZPOPMAX %b", key.data(), key.size());
-}
-
-inline FormattedCommand zpopmax(const StringView &key, long long count) {
-    return format_cmd("ZPOPMAX %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand zpopmin(const StringView &key) {
-    return format_cmd("ZPOPMIN %b", key.data(), key.size());
-}
-
-inline FormattedCommand zpopmin_count(const StringView &key, long long count) {
-    return format_cmd("ZPOPMIN %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand zrange(const StringView &key, long long start, long long stop) {
-    return format_cmd("ZRANGE %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-template <typename Interval>
-FormattedCommand zrangebylex(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-FormattedCommand zrangebyscore(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-inline FormattedCommand zrank(const StringView &key, const StringView &member) {
-    return format_cmd("ZRANK %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand zrem(const StringView &key, const StringView &member) {
-    return format_cmd("ZREM %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand zrem_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Interval>
-FormattedCommand zremrangebylex(const StringView &key, const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline FormattedCommand zremrangebyrank(const StringView &key, long long start, long long stop) {
-    return format_cmd("ZREMRANGEBYRANK %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-template <typename Interval>
-FormattedCommand zremrangebyscore(const StringView &key,
-        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-template <typename Interval>
-FormattedCommand zrevrangebylex(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-inline FormattedCommand zrevrank(const StringView &key, const StringView &member) {
-    return format_cmd("ZREVRANK %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand zscore(const StringView &key, const StringView &member) {
-    return format_cmd("ZSCORE %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-// SCRIPTING commands.
-template <typename Keys, typename Args>
-FormattedCommand eval(const StringView &script,
-        Keys keys_first,
-        Keys keys_last,
-        Args args_first,
-        Args args_last) {
-    CmdArgs args;
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    args << "EVAL" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    return format_cmd(args);
-}
-
-template <typename Keys, typename Args>
-FormattedCommand evalsha(const StringView &script,
-        Keys keys_first,
-        Keys keys_last,
-        Args args_first,
-        Args args_last) {
-    CmdArgs args;
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    args << "EVALSHA" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    return format_cmd(args);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command.h
deleted file mode 100644
index 81857dd9b..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command.h
+++ /dev/null
@@ -1,2271 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_H
-
-#include <cassert>
-#include <ctime>
-#include <string>
-#include <chrono>
-#include "connection.h"
-#include "command_options.h"
-#include "command_args.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-// CONNECTION command.
-inline void auth(Connection &connection, const StringView &password) {
-    connection.send("AUTH %b", password.data(), password.size());
-}
-
-inline void auth(Connection &connection, const StringView &user, const StringView &password) {
-    connection.send("AUTH %b %b",
-                    user.data(), user.size(),
-                    password.data(), password.size());
-}
-
-inline void echo(Connection &connection, const StringView &msg) {
-    connection.send("ECHO %b", msg.data(), msg.size());
-}
-
-inline void ping(Connection &connection) {
-    connection.send("PING");
-}
-
-inline void quit(Connection &connection) {
-    connection.send("QUIT");
-}
-
-inline void ping(Connection &connection, const StringView &msg) {
-    // If *msg* is empty, Redis returns am empty reply of REDIS_REPLY_STRING type.
-    connection.send("PING %b", msg.data(), msg.size());
-}
-
-inline void select(Connection &connection, long long idx) {
-    connection.send("SELECT %lld", idx);
-}
-
-inline void swapdb(Connection &connection, long long idx1, long long idx2) {
-    connection.send("SWAPDB %lld %lld", idx1, idx2);
-}
-
-// SERVER commands.
-
-inline void bgrewriteaof(Connection &connection) {
-    connection.send("BGREWRITEAOF");
-}
-
-inline void bgsave(Connection &connection) {
-    connection.send("BGSAVE");
-}
-
-inline void dbsize(Connection &connection) {
-    connection.send("DBSIZE");
-}
-
-inline void flushall(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHALL ASYNC");
-    } else {
-        connection.send("FLUSHALL");
-    }
-}
-
-inline void flushdb(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHDB ASYNC");
-    } else {
-        connection.send("FLUSHDB");
-    }
-}
-
-inline void info(Connection &connection) {
-    connection.send("INFO");
-}
-
-inline void info(Connection &connection, const StringView &section) {
-    connection.send("INFO %b", section.data(), section.size());
-}
-
-inline void lastsave(Connection &connection) {
-    connection.send("LASTSAVE");
-}
-
-inline void save(Connection &connection) {
-    connection.send("SAVE");
-}
-
-// KEY commands.
-
-inline void del(Connection &connection, const StringView &key) {
-    connection.send("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void del_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void dump(Connection &connection, const StringView &key) {
-    connection.send("DUMP %b", key.data(), key.size());
-}
-
-inline void exists(Connection &connection, const StringView &key) {
-    connection.send("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void expire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("EXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void expireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("EXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void keys(Connection &connection, const StringView &pattern) {
-    connection.send("KEYS %b", pattern.data(), pattern.size());
-}
-
-inline void move(Connection &connection, const StringView &key, long long db) {
-    connection.send("MOVE %b %lld",
-                    key.data(), key.size(),
-                    db);
-}
-
-inline void persist(Connection &connection, const StringView &key) {
-    connection.send("PERSIST %b", key.data(), key.size());
-}
-
-inline void pexpire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("PEXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void pexpireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("PEXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void pttl(Connection &connection, const StringView &key) {
-    connection.send("PTTL %b", key.data(), key.size());
-}
-
-inline void randomkey(Connection &connection) {
-    connection.send("RANDOMKEY");
-}
-
-inline void rename(Connection &connection,
-                    const StringView &key,
-                    const StringView &newkey) {
-    connection.send("RENAME %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-inline void renamenx(Connection &connection,
-                        const StringView &key,
-                        const StringView &newkey) {
-    connection.send("RENAMENX %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-void restore(Connection &connection,
-                const StringView &key,
-                const StringView &val,
-                long long ttl,
-                bool replace);
-
-inline void scan(Connection &connection,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SCAN %lld MATCH %b COUNT %lld",
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void touch(Connection &connection, const StringView &key) {
-    connection.send("TOUCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void touch_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "TOUCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void ttl(Connection &connection, const StringView &key) {
-    connection.send("TTL %b", key.data(), key.size());
-}
-
-inline void type(Connection &connection, const StringView &key) {
-    connection.send("TYPE %b", key.data(), key.size());
-}
-
-inline void unlink(Connection &connection, const StringView &key) {
-    connection.send("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unlink_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void wait(Connection &connection, long long numslave, long long timeout) {
-    connection.send("WAIT %lld %lld", numslave, timeout);
-}
-
-// STRING commands.
-
-inline void append(Connection &connection, const StringView &key, const StringView &str) {
-    connection.send("APPEND %b %b",
-                    key.data(), key.size(),
-                    str.data(), str.size());
-}
-
-inline void bitcount(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("BITCOUNT %b %lld %lld",
-                    key.data(), key.size(),
-                    start, end);
-}
-
-void bitop(Connection &connection,
-            BitOp op,
-            const StringView &destination,
-            const StringView &key);
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last);
-
-inline void bitpos(Connection &connection,
-                    const StringView &key,
-                    long long bit,
-                    long long start,
-                    long long end) {
-    connection.send("BITPOS %b %lld %lld %lld",
-                    key.data(), key.size(),
-                    bit,
-                    start,
-                    end);
-}
-
-inline void decr(Connection &connection, const StringView &key) {
-    connection.send("DECR %b", key.data(), key.size());
-}
-
-inline void decrby(Connection &connection, const StringView &key, long long decrement) {
-    connection.send("DECRBY %b %lld",
-                    key.data(), key.size(),
-                    decrement);
-}
-
-inline void get(Connection &connection, const StringView &key) {
-    connection.send("GET %b",
-                    key.data(), key.size());
-}
-
-inline void getbit(Connection &connection, const StringView &key, long long offset) {
-    connection.send("GETBIT %b %lld",
-                    key.data(), key.size(),
-                    offset);
-}
-
-inline void getrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("GETRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    end);
-}
-
-inline void getset(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("GETSET %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void incr(Connection &connection, const StringView &key) {
-    connection.send("INCR %b", key.data(), key.size());
-}
-
-inline void incrby(Connection &connection, const StringView &key, long long increment) {
-    connection.send("INCRBY %b %lld",
-                    key.data(), key.size(),
-                    increment);
-}
-
-inline void incrbyfloat(Connection &connection, const StringView &key, double increment) {
-    connection.send("INCRBYFLOAT %b %f",
-                    key.data(), key.size(),
-                    increment);
-}
-
-template <typename Input>
-inline void mget(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void mset(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void msetnx(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void psetex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("PSETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-void set(Connection &connection,
-            const StringView &key,
-            const StringView &val,
-            long long ttl,
-            UpdateType type);
-
-inline void setex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("SETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-inline void setnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("SETNX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void setrange(Connection &connection,
-                        const StringView &key,
-                        long long offset,
-                        const StringView &val) {
-    connection.send("SETRANGE %b %lld %b",
-                    key.data(), key.size(),
-                    offset,
-                    val.data(), val.size());
-}
-
-inline void strlen(Connection &connection, const StringView &key) {
-    connection.send("STRLEN %b", key.data(), key.size());
-}
-
-// LIST commands.
-
-inline void blpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BLPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void blpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BRPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void brpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination,
-                        long long timeout) {
-    connection.send("BRPOPLPUSH %b %b %lld",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    timeout);
-}
-
-inline void lindex(Connection &connection, const StringView &key, long long index) {
-    connection.send("LINDEX %b %lld",
-                    key.data(), key.size(),
-                    index);
-}
-
-void linsert(Connection &connection,
-                const StringView &key,
-                InsertPosition position,
-                const StringView &pivot,
-                const StringView &val);
-
-inline void llen(Connection &connection,
-                    const StringView &key) {
-    connection.send("LLEN %b", key.data(), key.size());
-}
-
-inline void lpop(Connection &connection, const StringView &key) {
-    connection.send("LPOP %b",
-                    key.data(), key.size());
-}
-
-inline void lpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void lpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void lpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void lrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void lrem(Connection &connection,
-                    const StringView &key,
-                    long long count,
-                    const StringView &val) {
-    connection.send("LREM %b %lld %b",
-                    key.data(), key.size(),
-                    count,
-                    val.data(), val.size());
-}
-
-inline void lset(Connection &connection,
-                    const StringView &key,
-                    long long index,
-                    const StringView &val) {
-    connection.send("LSET %b %lld %b",
-                    key.data(), key.size(),
-                    index,
-                    val.data(), val.size());
-}
-
-inline void ltrim(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LTRIM %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void rpop(Connection &connection, const StringView &key) {
-    connection.send("RPOP %b", key.data(), key.size());
-}
-
-inline void rpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination) {
-    connection.send("RPOPLPUSH %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size());
-}
-
-inline void rpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void rpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void rpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-// HASH commands.
-
-inline void hdel(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HDEL %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-template <typename Input>
-inline void hdel_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hexists(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HEXISTS %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hget(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HGET %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hgetall(Connection &connection, const StringView &key) {
-    connection.send("HGETALL %b", key.data(), key.size());
-}
-
-inline void hincrby(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    long long increment) {
-    connection.send("HINCRBY %b %b %lld",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hincrbyfloat(Connection &connection,
-                            const StringView &key,
-                            const StringView &field,
-                            double increment) {
-    connection.send("HINCRBYFLOAT %b %b %f",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hkeys(Connection &connection, const StringView &key) {
-    connection.send("HKEYS %b", key.data(), key.size());
-}
-
-inline void hlen(Connection &connection, const StringView &key) {
-    connection.send("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void hmget(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void hmset(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("HSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void hset(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSET %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-void hset_range(Connection &connection, const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hsetnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSETNX %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hstrlen(Connection &connection,
-                    const StringView &key,
-                    const StringView &field) {
-    connection.send("HSTRLEN %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hvals(Connection &connection, const StringView &key) {
-    connection.send("HVALS %b", key.data(), key.size());
-}
-
-// SET commands
-
-inline void sadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SADD %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void sadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void scard(Connection &connection, const StringView &key) {
-    connection.send("SCARD %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiff(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFF" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sdiffstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SDIFFSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiffstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFFSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void sinter(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTER" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SINTERSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sinterstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTERSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sismember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("SISMEMBER %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void smembers(Connection &connection, const StringView &key) {
-    connection.send("SMEMBERS %b", key.data(), key.size());
-}
-
-inline void smove(Connection &connection,
-                    const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    connection.send("SMOVE %b %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    member.data(), member.size());
-}
-
-inline void spop(Connection &connection, const StringView &key) {
-    connection.send("SPOP %b", key.data(), key.size());
-}
-
-inline void spop_range(Connection &connection, const StringView &key, long long count) {
-    connection.send("SPOP %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srandmember(Connection &connection, const StringView &key) {
-    connection.send("SRANDMEMBER %b", key.data(), key.size());
-}
-
-inline void srandmember_range(Connection &connection,
-                                const StringView &key,
-                                long long count) {
-    connection.send("SRANDMEMBER %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void srem_range(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-template <typename Input>
-inline void sunion(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNION" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SUNIONSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sunionstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNIONSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Sorted Set commands.
-
-inline void bzpopmax(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMAX %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmax_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void bzpopmin(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMIN %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmin_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed);
-
-inline void zadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type,
-                    bool changed) {
-    auto tmp = {std::make_pair(member, score)};
-
-    zadd_range(connection, key, tmp.begin(), tmp.end(), type, changed);
-}
-
-inline void zcard(Connection &connection, const StringView &key) {
-    connection.send("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-inline void zcount(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval) {
-    connection.send("ZCOUNT %b %s %s",
-                    key.data(), key.size(),
-                    interval.min().c_str(),
-                    interval.max().c_str());
-}
-
-inline void zincrby(Connection &connection,
-                    const StringView &key,
-                    double increment,
-                    const StringView &member) {
-    connection.send("ZINCRBY %b %f %b",
-                    key.data(), key.size(),
-                    increment,
-                    member.data(), member.size());
-}
-
-inline void zinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZINTERSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-template <typename Interval>
-inline void zlexcount(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zpopmax(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMAX %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zpopmin(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMIN %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop,
-                    bool with_scores) {
-    if (with_scores) {
-        connection.send("ZRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrangebylex(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrangebyscore(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval,
-                    const LimitOptions &opts,
-                    bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrank(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zrem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void zrem_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Interval>
-inline void zremrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zremrangebyrank(Connection &connection,
-                            const StringView &key,
-                            long long start,
-                            long long stop) {
-    connection.send("zremrangebyrank %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-template <typename Interval>
-inline void zremrangebyscore(Connection &connection,
-                                const StringView &key,
-                                const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zrevrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores) {
-    if (with_scores) {
-        connection.send("ZREVRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZREVRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrevrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrevrangebyscore(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZREVRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZREVRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrevrank(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("ZREVRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("ZSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void zscore(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZSCORE %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZUNIONSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-// HYPERLOGLOG commands.
-
-inline void pfadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &element) {
-    connection.send("PFADD %b %b",
-                    key.data(), key.size(),
-                    element.data(), element.size());
-}
-
-template <typename Input>
-inline void pfadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfcount(Connection &connection, const StringView &key) {
-    connection.send("PFCOUNT %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfcount_range(Connection &connection,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFCOUNT" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfmerge(Connection &connection, const StringView &destination, const StringView &key) {
-    connection.send("PFMERGE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfmerge_range(Connection &connection,
-                            const StringView &destination,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFMERGE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// GEO commands.
-
-inline void geoadd(Connection &connection,
-                    const StringView &key,
-                    const std::tuple<StringView, double, double> &member) {
-    const auto &mem = std::get<0>(member);
-
-    connection.send("GEOADD %b %f %f %b",
-                    key.data(), key.size(),
-                    std::get<1>(member),
-                    std::get<2>(member),
-                    mem.data(), mem.size());
-}
-
-template <typename Input>
-inline void geoadd_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOADD" << key;
-
-    while (first != last) {
-        const auto &member = *first;
-        args << std::get<1>(member) << std::get<2>(member) << std::get<0>(member);
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-void geodist(Connection &connection,
-                const StringView &key,
-                const StringView &member1,
-                const StringView &member2,
-                GeoUnit unit);
-
-inline void geohash(Connection &connection, const StringView &key, const StringView &member) {
-    connection.send("GEOHASH %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void geohash_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOHASH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void geopos(Connection &connection, const StringView &key, const StringView &member) {
-    connection.send("GEOPOS %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void geopos_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOPOS" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-void georadius(Connection &connection,
-                const StringView &key,
-                const std::pair<double, double> &loc,
-                double radius,
-                GeoUnit unit,
-                long long count,
-                bool asc,
-                bool with_coord,
-                bool with_dist,
-                bool with_hash);
-
-void georadius_store(Connection &connection,
-                        const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        const StringView &destination,
-                        bool store_dist,
-                        long long count);
-
-void georadiusbymember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        bool with_coord,
-                        bool with_dist,
-                        bool with_hash);
-
-void georadiusbymember_store(Connection &connection,
-                                const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-// SCRIPTING commands.
-
-template <typename Keys, typename Args>
-inline void eval(Connection &connection,
-                   const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last) {
-    CmdArgs cmd_args;
-
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    cmd_args << "EVAL" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    connection.send(cmd_args);
-}
-
-template <typename Keys, typename Args>
-inline void evalsha(Connection &connection,
-                       const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last) {
-    CmdArgs cmd_args;
-
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    cmd_args << "EVALSHA" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    connection.send(cmd_args);
-}
-
-inline void script_exists(Connection &connection, const StringView &sha) {
-    connection.send("SCRIPT EXISTS %b", sha.data(), sha.size());
-}
-
-template <typename Input>
-inline void script_exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SCRIPT" << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void script_flush(Connection &connection) {
-    connection.send("SCRIPT FLUSH");
-}
-
-inline void script_kill(Connection &connection) {
-    connection.send("SCRIPT KILL");
-}
-
-inline void script_load(Connection &connection, const StringView &script) {
-    connection.send("SCRIPT LOAD %b", script.data(), script.size());
-}
-
-// PUBSUB commands.
-
-inline void psubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void psubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void publish(Connection &connection,
-                    const StringView &channel,
-                    const StringView &message) {
-    connection.send("PUBLISH %b %b",
-                    channel.data(), channel.size(),
-                    message.data(), message.size());
-}
-
-inline void punsubscribe(Connection &connection) {
-    connection.send("PUNSUBSCRIBE");
-}
-
-inline void punsubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PUNSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void punsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PUNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PUNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void subscribe(Connection &connection, const StringView &channel) {
-    connection.send("SUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void subscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "SUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void unsubscribe(Connection &connection) {
-    connection.send("UNSUBSCRIBE");
-}
-
-inline void unsubscribe(Connection &connection, const StringView &channel) {
-    connection.send("UNSUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void unsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Transaction commands.
-
-inline void discard(Connection &connection) {
-    connection.send("DISCARD");
-}
-
-inline void exec(Connection &connection) {
-    connection.send("EXEC");
-}
-
-inline void multi(Connection &connection) {
-    connection.send("MULTI");
-}
-
-inline void unwatch(Connection &connection) {
-    connection.send("UNWATCH");
-}
-
-template <typename Input>
-inline void unwatch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNWATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNWATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void watch(Connection &connection, const StringView &key) {
-    connection.send("WATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void watch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("WATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "WATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Stream commands.
-
-inline void xack(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &id) {
-    connection.send("XACK %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xack_range(Connection &connection,
-                const StringView &key,
-                const StringView &group,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XACK" << key << group << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_range(Connection &connection,
-                const StringView &key,
-                const StringView &id,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XADD" << key << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_maxlen_range(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    CmdArgs args;
-    args << "XADD" << key << "MAXLEN";
-
-    if (approx) {
-        args << "~";
-    }
-
-    args << count << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xclaim(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    const StringView &id) {
-    connection.send("XCLAIM %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size(),
-                    min_idle_time,
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xclaim_range(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    Input first,
-                    Input last) {
-    CmdArgs args;
-    args << "XCLAIM" << key << group << consumer << min_idle_time << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xdel(Connection &connection, const StringView &key, const StringView &id) {
-    connection.send("XDEL %b %b", key.data(), key.size(), id.data(), id.size());
-}
-
-template <typename Input>
-void xdel_range(Connection &connection, const StringView &key, Input first, Input last) {
-    CmdArgs args;
-    args << "XDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xgroup_create(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id,
-                            bool mkstream) {
-    CmdArgs args;
-    args << "XGROUP" << "CREATE" << key << group << id;
-
-    if (mkstream) {
-        args << "MKSTREAM";
-    }
-
-    connection.send(args);
-}
-
-inline void xgroup_setid(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id) {
-    connection.send("XGROUP SETID %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-inline void xgroup_destroy(Connection &connection,
-                            const StringView &key,
-                            const StringView &group) {
-    connection.send("XGROUP DESTROY %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xgroup_delconsumer(Connection &connection,
-                                const StringView &key,
-                                const StringView &group,
-                                const StringView &consumer) {
-    connection.send("XGROUP DELCONSUMER %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size());
-}
-
-inline void xlen(Connection &connection, const StringView &key) {
-    connection.send("XLEN %b", key.data(), key.size());
-}
-
-inline void xpending(Connection &connection, const StringView &key, const StringView &group) {
-    connection.send("XPENDING %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xpending_detail(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XPENDING %b %b %b %b %lld",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xpending_per_consumer(Connection &connection,
-                                    const StringView &key,
-                                    const StringView &group,
-                                    const StringView &start,
-                                    const StringView &end,
-                                    long long count,
-                                    const StringView &consumer) {
-    connection.send("XPENDING %b %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count,
-                    consumer.data(), consumer.size());
-}
-
-inline void xrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &start,
-                    const StringView &end) {
-    connection.send("XRANGE %b %b %b",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size());
-}
-
-inline void xrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xread(Connection &connection,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count) {
-    connection.send("XREAD COUNT %lld STREAMS %b %b",
-                    count,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_range(Connection &connection, Input first, Input last, long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xread_block(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        long long timeout,
-                        long long count) {
-    connection.send("XREAD COUNT %lld BLOCK %lld STREAMS %b %b",
-                    count,
-                    timeout,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_block_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout,
-                        long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "BLOCK" << timeout << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_range(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup_block(Connection &connection,
-                                const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long timeout,
-                                long long count,
-                                bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_block_range(Connection &connection,
-                            const StringView &group,
-                            const StringView &consumer,
-                            Input first,
-                            Input last,
-                            long long timeout,
-                            long long count,
-                            bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xrevrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &end,
-                    const StringView &start) {
-    connection.send("XREVRANGE %b %b %b",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size());
-}
-
-inline void xrevrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-    connection.send("XREVRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size(),
-                    count);
-}
-
-void xtrim(Connection &connection, const StringView &key, long long count, bool approx);
-
-namespace detail {
-
-void set_bitop(CmdArgs &args, BitOp op);
-
-void set_update_type(CmdArgs &args, UpdateType type);
-
-void set_aggregation_type(CmdArgs &args, Aggregation type);
-
-template <typename Input>
-void zinterstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-void set_geo_unit(CmdArgs &args, GeoUnit unit);
-
-void set_georadius_store_parameters(CmdArgs &args,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count);
-
-void set_georadius_parameters(CmdArgs &args,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                bool with_coord,
-                                bool with_dist,
-                                bool with_hash);
-
-}
-
-}
-
-}
-
-}
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    detail::set_bitop(args, op);
-
-    args << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    args << "ZADD" << key;
-
-    detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zinterstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zunionstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command_args.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command_args.h
deleted file mode 100644
index 0beb71e5c..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command_args.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-
-#include <vector>
-#include <list>
-#include <string>
-#include <tuple>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-class CmdArgs {
-public:
-    template <typename Arg>
-    CmdArgs& append(Arg &&arg);
-
-    template <typename Arg, typename ...Args>
-    CmdArgs& append(Arg &&arg, Args &&...args);
-
-    // All overloads of operator<< are for internal use only.
-    CmdArgs& operator<<(const StringView &arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& operator<<(T &&arg);
-
-    template <typename Iter>
-    CmdArgs& operator<<(const std::pair<Iter, Iter> &range);
-
-    template <std::size_t N, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &) ->
-        typename std::enable_if<N == sizeof...(Args), CmdArgs&>::type {
-        return *this;
-    }
-
-    template <std::size_t N = 0, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &arg) ->
-        typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type;
-
-    const char** argv() {
-        return _argv.data();
-    }
-
-    const std::size_t* argv_len() {
-        return _argv_len.data();
-    }
-
-    std::size_t size() const {
-        return _argv.size();
-    }
-
-private:
-    // Deep copy.
-    CmdArgs& _append(std::string arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const StringView &arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const char *arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& _append(T &&arg) {
-        return operator<<(std::forward<T>(arg));
-    }
-
-    template <typename Iter>
-    CmdArgs& _append(std::true_type, const std::pair<Iter, Iter> &range);
-
-    template <typename Iter>
-    CmdArgs& _append(std::false_type, const std::pair<Iter, Iter> &range);
-
-    std::vector<const char *> _argv;
-    std::vector<std::size_t> _argv_len;
-
-    std::list<std::string> _args;
-};
-
-template <typename Arg>
-inline CmdArgs& CmdArgs::append(Arg &&arg) {
-    return _append(std::forward<Arg>(arg));
-}
-
-template <typename Arg, typename ...Args>
-inline CmdArgs& CmdArgs::append(Arg &&arg, Args &&...args) {
-    _append(std::forward<Arg>(arg));
-
-    return append(std::forward<Args>(args)...);
-}
-
-inline CmdArgs& CmdArgs::operator<<(const StringView &arg) {
-    _argv.push_back(arg.data());
-    _argv_len.push_back(arg.size());
-
-    return *this;
-}
-
-template <typename Iter>
-inline CmdArgs& CmdArgs::operator<<(const std::pair<Iter, Iter> &range) {
-    return _append(IsKvPair<typename std::decay<decltype(*std::declval<Iter>())>::type>(), range);
-}
-
-template <typename T,
-             typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                    int>::type>
-inline CmdArgs& CmdArgs::operator<<(T &&arg) {
-    return _append(std::to_string(std::forward<T>(arg)));
-}
-
-template <std::size_t N, typename ...Args>
-auto CmdArgs::operator<<(const std::tuple<Args...> &arg) ->
-    typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type {
-    operator<<(std::get<N>(arg));
-
-    return operator<<<N + 1, Args...>(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(std::string arg) {
-    _args.push_back(std::move(arg));
-    return operator<<(_args.back());
-}
-
-inline CmdArgs& CmdArgs::_append(const StringView &arg) {
-    return operator<<(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(const char *arg) {
-    return operator<<(arg);
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::false_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << *first;
-        ++first;
-    }
-
-    return *this;
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::true_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << first->first << first->second;
-        ++first;
-    }
-
-    return *this;
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command_options.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command_options.h
deleted file mode 100644
index ca766c086..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/command_options.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-
-#include <string>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class UpdateType {
-    EXIST,
-    NOT_EXIST,
-    ALWAYS
-};
-
-enum class InsertPosition {
-    BEFORE,
-    AFTER
-};
-
-enum class BoundType {
-    CLOSED,
-    OPEN,
-    LEFT_OPEN,
-    RIGHT_OPEN
-};
-
-// (-inf, +inf)
-template <typename T>
-class UnboundedInterval;
-
-// [min, max], (min, max), (min, max], [min, max)
-template <typename T>
-class BoundedInterval;
-
-// [min, +inf), (min, +inf)
-template <typename T>
-class LeftBoundedInterval;
-
-// (-inf, max], (-inf, max)
-template <typename T>
-class RightBoundedInterval;
-
-template <>
-class UnboundedInterval<double> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<double> {
-public:
-    BoundedInterval(double min, double max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<double> {
-public:
-    LeftBoundedInterval(double min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<double> {
-public:
-    RightBoundedInterval(double max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-template <>
-class UnboundedInterval<std::string> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<std::string> {
-public:
-    BoundedInterval(const std::string &min, const std::string &max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<std::string> {
-public:
-    LeftBoundedInterval(const std::string &min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<std::string> {
-public:
-    RightBoundedInterval(const std::string &max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-struct LimitOptions {
-    long long offset = 0;
-    long long count = -1;
-};
-
-enum class Aggregation {
-    SUM,
-    MIN,
-    MAX
-};
-
-enum class BitOp {
-    AND,
-    OR,
-    XOR,
-    NOT
-};
-
-enum class GeoUnit {
-    M,
-    KM,
-    MI,
-    FT
-};
-
-template <typename T>
-struct WithCoord : TupleWithType<std::pair<double, double>, T> {};
-
-template <typename T>
-struct WithDist : TupleWithType<double, T> {};
-
-template <typename T>
-struct WithHash : TupleWithType<long long, T> {};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/connection.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/connection.h
deleted file mode 100644
index 340375561..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/connection.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_H
-
-#include <cerrno>
-#include <cstring>
-#include <memory>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <chrono>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "reply.h"
-#include "utils.h"
-#include "tls.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class ConnectionType {
-    TCP = 0,
-    UNIX
-};
-
-struct ConnectionOptions {
-public:
-    ConnectionOptions() = default;
-
-    explicit ConnectionOptions(const std::string &uri);
-
-    ConnectionOptions(const ConnectionOptions &) = default;
-    ConnectionOptions& operator=(const ConnectionOptions &) = default;
-
-    ConnectionOptions(ConnectionOptions &&) = default;
-    ConnectionOptions& operator=(ConnectionOptions &&) = default;
-
-    ~ConnectionOptions() = default;
-
-    ConnectionType type = ConnectionType::TCP;
-
-    std::string host;
-
-    int port = 6379;
-
-    std::string path;
-
-    std::string user = "default";
-
-    std::string password;
-
-    int db = 0;
-
-    bool keep_alive = false;
-
-    std::chrono::milliseconds connect_timeout{0};
-
-    std::chrono::milliseconds socket_timeout{0};
-
-    tls::TlsOptions tls;
-
-    // `readonly` is only used for reading from a slave node in Redis Cluster mode.
-    // Client code should never manually set/get it. This member might be removed in the future.
-    bool readonly = false;
-
-private:
-    ConnectionOptions _parse_uri(const std::string &uri) const;
-
-    auto _split_uri(const std::string &uri) const
-        -> std::tuple<std::string, std::string, std::string>;
-
-    auto _split_path(const std::string &path) const
-        -> std::tuple<std::string, int, std::string>;
-
-    void _parse_parameters(const std::string &parameter_string,
-                            ConnectionOptions &opts) const;
-
-    void _set_option(const std::string &key, const std::string &val, ConnectionOptions &opts) const;
-
-    bool _parse_bool_option(const std::string &str) const;
-
-    std::chrono::milliseconds _parse_timeout_option(const std::string &str) const;
-
-    std::vector<std::string> _split(const std::string &str, const std::string &delimiter) const;
-
-    void _set_auth_opts(const std::string &auth, ConnectionOptions &opts) const;
-
-    void _set_tcp_opts(const std::string &path, ConnectionOptions &opts) const;
-
-    void _set_unix_opts(const std::string &path, ConnectionOptions &opts) const;
-};
-
-class CmdArgs;
-
-class Connection {
-public:
-    explicit Connection(const ConnectionOptions &opts);
-
-    Connection(const Connection &) = delete;
-    Connection& operator=(const Connection &) = delete;
-
-    Connection(Connection &&) = default;
-    Connection& operator=(Connection &&) = default;
-
-    ~Connection() = default;
-
-    // Check if the connection is broken. Client needs to do this check
-    // before sending some command to the connection. If it's broken,
-    // client needs to reconnect it.
-    bool broken() const noexcept {
-        return _ctx->err != REDIS_OK;
-    }
-
-    void reset() noexcept {
-        _ctx->err = 0;
-    }
-
-    void invalidate() noexcept {
-        _ctx->err = REDIS_ERR;
-    }
-
-    void reconnect();
-
-    auto create_time() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _create_time;
-    }
-
-    auto last_active() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _last_active;
-    }
-
-    template <typename ...Args>
-    void send(const char *format, Args &&...args);
-
-    void send(int argc, const char **argv, const std::size_t *argv_len);
-
-    void send(CmdArgs &args);
-
-    ReplyUPtr recv(bool handle_error_reply = true);
-
-    const ConnectionOptions& options() const {
-        return _opts;
-    }
-
-    friend void swap(Connection &lhs, Connection &rhs) noexcept;
-
-private:
-    class Connector;
-
-    struct ContextDeleter {
-        void operator()(redisContext *context) const {
-            if (context != nullptr) {
-                redisFree(context);
-            }
-        };
-    };
-
-    using ContextUPtr = std::unique_ptr<redisContext, ContextDeleter>;
-
-    void _set_options();
-
-    void _auth();
-
-    void _select_db();
-
-    void _enable_readonly();
-
-    redisContext* _context();
-
-    ContextUPtr _ctx;
-
-    // The time that the connection is created.
-    std::chrono::time_point<std::chrono::steady_clock> _create_time{};
-
-    // The time that the connection is created or the time that
-    // the connection is recently used, i.e. `_context()` is called.
-    std::chrono::time_point<std::chrono::steady_clock> _last_active{};
-
-    ConnectionOptions _opts;
-
-    // TODO: define _tls_ctx before _ctx
-    tls::TlsContextUPtr _tls_ctx;
-};
-
-using ConnectionSPtr = std::shared_ptr<Connection>;
-
-enum class Role {
-    MASTER,
-    SLAVE
-};
-
-// Inline implementaions.
-
-template <typename ...Args>
-inline void Connection::send(const char *format, Args &&...args) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommand(ctx,
-                format,
-                std::forward<Args>(args)...) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-inline redisContext* Connection::_context() {
-    _last_active = std::chrono::steady_clock::now();
-
-    return _ctx.get();
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/connection_pool.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/connection_pool.h
deleted file mode 100644
index 30ba5daa2..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/connection_pool.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-
-#include <cassert>
-#include <chrono>
-#include <mutex>
-#include <memory>
-#include <condition_variable>
-#include <deque>
-#include "connection.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ConnectionPoolOptions {
-    // Max number of connections, including both in-use and idle ones.
-    std::size_t size = 1;
-
-    // Max time to wait for a connection. 0ms means client waits forever.
-    std::chrono::milliseconds wait_timeout{0};
-
-    // Max lifetime of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_lifetime{0};
-
-    // Max idle time of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_idle_time{0};
-};
-
-class ConnectionPool {
-public:
-    ConnectionPool(const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool(SimpleSentinel sentinel,
-                    const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool() = default;
-
-    ConnectionPool(ConnectionPool &&that);
-    ConnectionPool& operator=(ConnectionPool &&that);
-
-    ConnectionPool(const ConnectionPool &) = delete;
-    ConnectionPool& operator=(const ConnectionPool &) = delete;
-
-    ~ConnectionPool() = default;
-
-    // Fetch a connection from pool.
-    Connection fetch();
-
-    ConnectionOptions connection_options();
-
-    void release(Connection connection);
-
-    // Create a new connection.
-    Connection create();
-
-    ConnectionPool clone();
-
-private:
-    void _move(ConnectionPool &&that);
-
-    // NOT thread-safe
-    Connection _create();
-
-    Connection _create(SimpleSentinel &sentinel, const ConnectionOptions &opts, bool locked);
-
-    Connection _fetch();
-
-    void _wait_for_connection(std::unique_lock<std::mutex> &lock);
-
-    bool _need_reconnect(const Connection &connection,
-                            const std::chrono::milliseconds &connection_lifetime,
-                            const std::chrono::milliseconds &connection_idle_time) const;
-
-    void _update_connection_opts(const std::string &host, int port) {
-        _opts.host = host;
-        _opts.port = port;
-    }
-
-    bool _role_changed(const ConnectionOptions &opts) const {
-        return opts.port != _opts.port || opts.host != _opts.host;
-    }
-
-    ConnectionOptions _opts;
-
-    ConnectionPoolOptions _pool_opts;
-
-    std::deque<Connection> _pool;
-
-    std::size_t _used_connections = 0;
-
-    std::mutex _mutex;
-
-    std::condition_variable _cv;
-
-    SimpleSentinel _sentinel;
-};
-
-using ConnectionPoolSPtr = std::shared_ptr<ConnectionPool>;
-
-class SafeConnection {
-public:
-    explicit SafeConnection(ConnectionPool &pool) : _pool(pool), _connection(_pool.fetch()) {
-        assert(!_connection.broken());
-    }
-
-    SafeConnection(const SafeConnection &) = delete;
-    SafeConnection& operator=(const SafeConnection &) = delete;
-
-    SafeConnection(SafeConnection &&) = delete;
-    SafeConnection& operator=(SafeConnection &&) = delete;
-
-    ~SafeConnection() {
-        _pool.release(std::move(_connection));
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPool &_pool;
-    Connection _connection;
-};
-
-// NOTE: This class is similar to `SafeConnection`.
-// The difference is that `SafeConnection` tries to avoid copying a std::shared_ptr.
-class GuardedConnection {
-public:
-    explicit GuardedConnection(const ConnectionPoolSPtr &pool) : _pool(pool),
-                                                        _connection(_pool->fetch()) {
-        assert(!_connection.broken());
-    }
-
-    GuardedConnection(const GuardedConnection &) = delete;
-    GuardedConnection& operator=(const GuardedConnection &) = delete;
-
-    GuardedConnection(GuardedConnection &&) = default;
-    GuardedConnection& operator=(GuardedConnection &&) = default;
-
-    ~GuardedConnection() {
-        // If `GuardedConnection` has been moved, `_pool` will be nullptr.
-        if (_pool) {
-            _pool->release(std::move(_connection));
-        }
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPoolSPtr _pool;
-    Connection _connection;
-};
-
-using GuardedConnectionSPtr = std::shared_ptr<GuardedConnection>;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/cxx_utils.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/cxx_utils.h
deleted file mode 100644
index dce51abe9..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/cxx_utils.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
-
-#include <string_view>
-#include <optional>
-#include <variant>
-
-#define REDIS_PLUS_PLUS_HAS_OPTIONAL
-
-#define REDIS_PLUS_PLUS_HAS_VARIANT
-
-namespace sw {
-
-namespace redis {
-
-using StringView = std::string_view;
-
-template <typename T>
-using Optional = std::optional<T>;
-
-template <typename ...Args>
-using Variant = std::variant<Args...>;
-
-using Monostate = std::monostate;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/errors.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/errors.h
deleted file mode 100644
index 7cc19d2f1..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/errors.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ERRORS_H
-#define SEWENEW_REDISPLUSPLUS_ERRORS_H
-
-#include <exception>
-#include <string>
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-enum ReplyErrorType {
-    ERR,
-    MOVED,
-    ASK
-};
-
-class Error : public std::exception {
-public:
-    explicit Error(const std::string &msg) : _msg(msg) {}
-
-    Error(const Error &) = default;
-    Error& operator=(const Error &) = default;
-
-    Error(Error &&) = default;
-    Error& operator=(Error &&) = default;
-
-    virtual ~Error() override = default;
-
-    virtual const char* what() const noexcept override {
-        return _msg.data();
-    }
-
-private:
-    std::string _msg;
-};
-
-class IoError : public Error {
-public:
-    explicit IoError(const std::string &msg) : Error(msg) {}
-
-    IoError(const IoError &) = default;
-    IoError& operator=(const IoError &) = default;
-
-    IoError(IoError &&) = default;
-    IoError& operator=(IoError &&) = default;
-
-    virtual ~IoError() override = default;
-};
-
-class TimeoutError : public IoError {
-public:
-    explicit TimeoutError(const std::string &msg) : IoError(msg) {}
-
-    TimeoutError(const TimeoutError &) = default;
-    TimeoutError& operator=(const TimeoutError &) = default;
-
-    TimeoutError(TimeoutError &&) = default;
-    TimeoutError& operator=(TimeoutError &&) = default;
-
-    virtual ~TimeoutError() override = default;
-};
-
-class ClosedError : public Error {
-public:
-    explicit ClosedError(const std::string &msg) : Error(msg) {}
-
-    ClosedError(const ClosedError &) = default;
-    ClosedError& operator=(const ClosedError &) = default;
-
-    ClosedError(ClosedError &&) = default;
-    ClosedError& operator=(ClosedError &&) = default;
-
-    virtual ~ClosedError() override = default;
-};
-
-class ProtoError : public Error {
-public:
-    explicit ProtoError(const std::string &msg) : Error(msg) {}
-
-    ProtoError(const ProtoError &) = default;
-    ProtoError& operator=(const ProtoError &) = default;
-
-    ProtoError(ProtoError &&) = default;
-    ProtoError& operator=(ProtoError &&) = default;
-
-    virtual ~ProtoError() override = default;
-};
-
-class OomError : public Error {
-public:
-    explicit OomError(const std::string &msg) : Error(msg) {}
-
-    OomError(const OomError &) = default;
-    OomError& operator=(const OomError &) = default;
-
-    OomError(OomError &&) = default;
-    OomError& operator=(OomError &&) = default;
-
-    virtual ~OomError() override = default;
-};
-
-class ReplyError : public Error {
-public:
-    explicit ReplyError(const std::string &msg) : Error(msg) {}
-
-    ReplyError(const ReplyError &) = default;
-    ReplyError& operator=(const ReplyError &) = default;
-
-    ReplyError(ReplyError &&) = default;
-    ReplyError& operator=(ReplyError &&) = default;
-
-    virtual ~ReplyError() override = default;
-};
-
-class WatchError : public Error {
-public:
-    explicit WatchError() : Error("Watched key has been modified") {}
-
-    WatchError(const WatchError &) = default;
-    WatchError& operator=(const WatchError &) = default;
-
-    WatchError(WatchError &&) = default;
-    WatchError& operator=(WatchError &&) = default;
-
-    virtual ~WatchError() override = default;
-};
-
-
-// MovedError and AskError are defined in shards.h
-class MovedError;
-
-class AskError;
-
-void throw_error(const redisContext &context, const std::string &err_info);
-
-void throw_error(const redisReply &reply);
-
-template <typename Input>
-inline void range_check(const char *cmd, Input first, Input last) {
-    if (first == last) {
-        throw Error(std::string(cmd) + ": no key specified");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ERRORS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/pipeline.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/pipeline.h
deleted file mode 100644
index 52b01253f..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/pipeline.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_PIPELINE_H
-#define SEWENEW_REDISPLUSPLUS_PIPELINE_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-class PipelineImpl {
-public:
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args) {
-        assert(!connection.broken());
-
-        cmd(connection, std::forward<Args>(args)...);
-    }
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t /*cmd_num*/) {
-        // Reconnect to Redis to discard all commands.
-        connection.reconnect();
-    }
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_PIPELINE_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/queued_redis.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/queued_redis.h
deleted file mode 100644
index e663c7423..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/queued_redis.h
+++ /dev/null
@@ -1,2013 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-
-#include <cassert>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <vector>
-#include "connection.h"
-#include "connection_pool.h"
-#include "utils.h"
-#include "reply.h"
-#include "command.h"
-#include "redis.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class QueuedReplies;
-
-// If any command throws, QueuedRedis resets the connection, and becomes invalid.
-// In this case, the only thing we can do is to destory the QueuedRedis object.
-template <typename Impl>
-class QueuedRedis {
-public:
-    QueuedRedis(QueuedRedis &&) = default;
-    QueuedRedis& operator=(QueuedRedis &&) = default;
-
-    // When it destructs, the underlying *Connection* will be closed or return to pool,
-    // and any command that has NOT been executed will be ignored.
-    ~QueuedRedis();
-
-    Redis redis();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                    QueuedRedis&>::type;
-
-    template <typename ...Args>
-    QueuedRedis& command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, QueuedRedis&>::type;
-
-    QueuedReplies exec();
-
-    void discard();
-
-    // CONNECTION commands.
-
-    QueuedRedis& auth(const StringView &password) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::auth, password);
-    }
-
-    QueuedRedis& auth(const StringView &user, const StringView &password) {
-        return command<void (*)(Connection &, const StringView &, const StringView &)>(
-                        cmd::auth, user, password);
-    }
-
-    QueuedRedis& echo(const StringView &msg) {
-        return command(cmd::echo, msg);
-    }
-
-    QueuedRedis& ping() {
-        return command<void (*)(Connection &)>(cmd::ping);
-    }
-
-    QueuedRedis& ping(const StringView &msg) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::ping, msg);
-    }
-
-    // We DO NOT support the QUIT command. See *Redis::quit* doc for details.
-    //
-    // QueuedRedis& quit();
-
-    QueuedRedis& select(long long idx) {
-        return command(cmd::select, idx);
-    }
-
-    QueuedRedis& swapdb(long long idx1, long long idx2) {
-        return command(cmd::swapdb, idx1, idx2);
-    }
-
-    // SERVER commands.
-
-    QueuedRedis& bgrewriteaof() {
-        return command(cmd::bgrewriteaof);
-    }
-
-    QueuedRedis& bgsave() {
-        return command(cmd::bgsave);
-    }
-
-    QueuedRedis& dbsize() {
-        return command(cmd::dbsize);
-    }
-
-    QueuedRedis& flushall(bool async = false) {
-        return command(cmd::flushall, async);
-    }
-
-    QueuedRedis& flushdb(bool async = false) {
-        return command(cmd::flushdb, async);
-    }
-
-    QueuedRedis& info() {
-        return command<void (*)(Connection &)>(cmd::info);
-    }
-
-    QueuedRedis& info(const StringView &section) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::info, section);
-    }
-
-    QueuedRedis& lastsave() {
-        return command(cmd::lastsave);
-    }
-
-    QueuedRedis& save() {
-        return command(cmd::save);
-    }
-
-    // KEY commands.
-
-    QueuedRedis& del(const StringView &key) {
-        return command(cmd::del, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& del(Input first, Input last) {
-        range_check("DEL", first, last);
-
-        return command(cmd::del_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    QueuedRedis& dump(const StringView &key) {
-        return command(cmd::dump, key);
-    }
-
-    QueuedRedis& exists(const StringView &key) {
-        return command(cmd::exists, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& exists(Input first, Input last) {
-        range_check("EXISTS", first, last);
-
-        return command(cmd::exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& expire(const StringView &key, long long timeout) {
-        return command(cmd::expire, key, timeout);
-    }
-
-    QueuedRedis& expire(const StringView &key,
-                        const std::chrono::seconds &timeout) {
-        return expire(key, timeout.count());
-    }
-
-    QueuedRedis& expireat(const StringView &key, long long timestamp) {
-        return command(cmd::expireat, key, timestamp);
-    }
-
-    QueuedRedis& expireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::seconds> &tp) {
-        return expireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& keys(const StringView &pattern) {
-        return command(cmd::keys, pattern);
-    }
-
-    QueuedRedis& move(const StringView &key, long long db) {
-        return command(cmd::move, key, db);
-    }
-
-    QueuedRedis& persist(const StringView &key) {
-        return command(cmd::persist, key);
-    }
-
-    QueuedRedis& pexpire(const StringView &key, long long timeout) {
-        return command(cmd::pexpire, key, timeout);
-    }
-
-    QueuedRedis& pexpire(const StringView &key,
-                            const std::chrono::milliseconds &timeout) {
-        return pexpire(key, timeout.count());
-    }
-
-    QueuedRedis& pexpireat(const StringView &key, long long timestamp) {
-        return command(cmd::pexpireat, key, timestamp);
-    }
-
-    QueuedRedis& pexpireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::milliseconds> &tp) {
-        return pexpireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& pttl(const StringView &key) {
-        return command(cmd::pttl, key);
-    }
-
-    QueuedRedis& randomkey() {
-        return command(cmd::randomkey);
-    }
-
-    QueuedRedis& rename(const StringView &key, const StringView &newkey) {
-        return command(cmd::rename, key, newkey);
-    }
-
-    QueuedRedis& renamenx(const StringView &key, const StringView &newkey) {
-        return command(cmd::renamenx, key, newkey);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                                const StringView &val,
-                                long long ttl,
-                                bool replace = false) {
-        return command(cmd::restore, key, val, ttl, replace);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                            bool replace = false) {
-        return restore(key, val, ttl.count(), replace);
-    }
-
-    // TODO: sort
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::scan, cursor, pattern, count);
-    }
-
-    QueuedRedis& scan(long long cursor) {
-        return scan(cursor, "*", 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern) {
-        return scan(cursor, pattern, 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        long long count) {
-        return scan(cursor, "*", count);
-    }
-
-    QueuedRedis& touch(const StringView &key) {
-        return command(cmd::touch, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& touch(Input first, Input last) {
-        range_check("TOUCH", first, last);
-
-        return command(cmd::touch_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    QueuedRedis& ttl(const StringView &key) {
-        return command(cmd::ttl, key);
-    }
-
-    QueuedRedis& type(const StringView &key) {
-        return command(cmd::type, key);
-    }
-
-    QueuedRedis& unlink(const StringView &key) {
-        return command(cmd::unlink, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& unlink(Input first, Input last) {
-        range_check("UNLINK", first, last);
-
-        return command(cmd::unlink_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    QueuedRedis& wait(long long numslaves, long long timeout) {
-        return command(cmd::wait, numslaves, timeout);
-    }
-
-    QueuedRedis& wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-        return wait(numslaves, timeout.count());
-    }
-
-    // STRING commands.
-
-    QueuedRedis& append(const StringView &key, const StringView &str) {
-        return command(cmd::append, key, str);
-    }
-
-    QueuedRedis& bitcount(const StringView &key,
-                            long long start = 0,
-                            long long end = -1) {
-        return command(cmd::bitcount, key, start, end);
-    }
-
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        const StringView &key) {
-        return command(cmd::bitop, op, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        Input first,
-                        Input last) {
-        range_check("BITOP", first, last);
-
-        return command(cmd::bitop_range<Input>, op, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1) {
-        return command(cmd::bitpos, key, bit, start, end);
-    }
-
-    QueuedRedis& decr(const StringView &key) {
-        return command(cmd::decr, key);
-    }
-
-    QueuedRedis& decrby(const StringView &key, long long decrement) {
-        return command(cmd::decrby, key, decrement);
-    }
-
-    QueuedRedis& get(const StringView &key) {
-        return command(cmd::get, key);
-    }
-
-    QueuedRedis& getbit(const StringView &key, long long offset) {
-        return command(cmd::getbit, key, offset);
-    }
-
-    QueuedRedis& getrange(const StringView &key, long long start, long long end) {
-        return command(cmd::getrange, key, start, end);
-    }
-
-    QueuedRedis& getset(const StringView &key, const StringView &val) {
-        return command(cmd::getset, key, val);
-    }
-
-    QueuedRedis& incr(const StringView &key) {
-        return command(cmd::incr, key);
-    }
-
-    QueuedRedis& incrby(const StringView &key, long long increment) {
-        return command(cmd::incrby, key, increment);
-    }
-
-    QueuedRedis& incrbyfloat(const StringView &key, double increment) {
-        return command(cmd::incrbyfloat, key, increment);
-    }
-
-    template <typename Input>
-    QueuedRedis& mget(Input first, Input last) {
-        range_check("MGET", first, last);
-
-        return command(cmd::mget<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mget(std::initializer_list<T> il) {
-        return mget(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& mset(Input first, Input last) {
-        range_check("MSET", first, last);
-
-        return command(cmd::mset<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mset(std::initializer_list<T> il) {
-        return mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& msetnx(Input first, Input last) {
-        range_check("MSETNX", first, last);
-
-        return command(cmd::msetnx<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::psetex, key, ttl, val);
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        const std::chrono::milliseconds &ttl,
-                        const StringView &val) {
-        return psetex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& set(const StringView &key,
-                        const StringView &val,
-                        const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                        UpdateType type = UpdateType::ALWAYS) {
-        _set_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::set, key, val, ttl.count(), type);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::setex, key, ttl, val);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        const std::chrono::seconds &ttl,
-                        const StringView &val) {
-        return setex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& setnx(const StringView &key, const StringView &val) {
-        return command(cmd::setnx, key, val);
-    }
-
-    QueuedRedis& setrange(const StringView &key,
-                            long long offset,
-                            const StringView &val) {
-        return command(cmd::setrange, key, offset, val);
-    }
-
-    QueuedRedis& strlen(const StringView &key) {
-        return command(cmd::strlen, key);
-    }
-
-    // LIST commands.
-
-    QueuedRedis& blpop(const StringView &key, long long timeout) {
-        return command(cmd::blpop, key, timeout);
-    }
-
-    QueuedRedis& blpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first, Input last, long long timeout) {
-        range_check("BLPOP", first, last);
-
-        return command(cmd::blpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key, long long timeout) {
-        return command(cmd::brpop, key, timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first, Input last, long long timeout) {
-        range_check("BRPOP", first, last);
-
-        return command(cmd::brpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            long long timeout) {
-        return command(cmd::brpoplpush, source, destination, timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpoplpush(source, destination, timeout.count());
-    }
-
-    QueuedRedis& lindex(const StringView &key, long long index) {
-        return command(cmd::lindex, key, index);
-    }
-
-    QueuedRedis& linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-        return command(cmd::linsert, key, position, pivot, val);
-    }
-
-    QueuedRedis& llen(const StringView &key) {
-        return command(cmd::llen, key);
-    }
-
-    QueuedRedis& lpop(const StringView &key) {
-        return command(cmd::lpop, key);
-    }
-
-    QueuedRedis& lpush(const StringView &key, const StringView &val) {
-        return command(cmd::lpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& lpush(const StringView &key, Input first, Input last) {
-        range_check("LPUSH", first, last);
-
-        return command(cmd::lpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& lpushx(const StringView &key, const StringView &val) {
-        return command(cmd::lpushx, key, val);
-    }
-
-    QueuedRedis& lrange(const StringView &key,
-                        long long start,
-                        long long stop) {
-        return command(cmd::lrange, key, start, stop);
-    }
-
-    QueuedRedis& lrem(const StringView &key, long long count, const StringView &val) {
-        return command(cmd::lrem, key, count, val);
-    }
-
-    QueuedRedis& lset(const StringView &key, long long index, const StringView &val) {
-        return command(cmd::lset, key, index, val);
-    }
-
-    QueuedRedis& ltrim(const StringView &key, long long start, long long stop) {
-        return command(cmd::ltrim, key, start, stop);
-    }
-
-    QueuedRedis& rpop(const StringView &key) {
-        return command(cmd::rpop, key);
-    }
-
-    QueuedRedis& rpoplpush(const StringView &source, const StringView &destination) {
-        return command(cmd::rpoplpush, source, destination);
-    }
-
-    QueuedRedis& rpush(const StringView &key, const StringView &val) {
-        return command(cmd::rpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& rpush(const StringView &key, Input first, Input last) {
-        range_check("RPUSH", first, last);
-
-        return command(cmd::rpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& rpushx(const StringView &key, const StringView &val) {
-        return command(cmd::rpushx, key, val);
-    }
-
-    // HASH commands.
-
-    QueuedRedis& hdel(const StringView &key, const StringView &field) {
-        return command(cmd::hdel, key, field);
-    }
-
-    template <typename Input>
-    QueuedRedis& hdel(const StringView &key, Input first, Input last) {
-        range_check("HDEL", first, last);
-
-        return command(cmd::hdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hexists(const StringView &key, const StringView &field) {
-        return command(cmd::hexists, key, field);
-    }
-
-    QueuedRedis& hget(const StringView &key, const StringView &field) {
-        return command(cmd::hget, key, field);
-    }
-
-    QueuedRedis& hgetall(const StringView &key) {
-        return command(cmd::hgetall, key);
-    }
-
-    QueuedRedis& hincrby(const StringView &key,
-                            const StringView &field,
-                            long long increment) {
-        return command(cmd::hincrby, key, field, increment);
-    }
-
-    QueuedRedis& hincrbyfloat(const StringView &key,
-                                const StringView &field,
-                                double increment) {
-        return command(cmd::hincrbyfloat, key, field, increment);
-    }
-
-    QueuedRedis& hkeys(const StringView &key) {
-        return command(cmd::hkeys, key);
-    }
-
-    QueuedRedis& hlen(const StringView &key) {
-        return command(cmd::hlen, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& hmget(const StringView &key, Input first, Input last) {
-        range_check("HMGET", first, last);
-
-        return command(cmd::hmget<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmget(const StringView &key, std::initializer_list<T> il) {
-        return hmget(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& hmset(const StringView &key, Input first, Input last) {
-        range_check("HMSET", first, last);
-
-        return command(cmd::hmset<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmset(const StringView &key, std::initializer_list<T> il) {
-        return hmset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::hscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return hscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return hscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor) {
-        return hscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& hset(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hset, key, field, val);
-    }
-
-    QueuedRedis& hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hset(key, item.first, item.second);
-    }
-
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("HSET", first, last);
-
-        return command(cmd::hset_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hsetnx, key, field, val);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hsetnx(key, item.first, item.second);
-    }
-
-    QueuedRedis& hstrlen(const StringView &key, const StringView &field) {
-        return command(cmd::hstrlen, key, field);
-    }
-
-    QueuedRedis& hvals(const StringView &key) {
-        return command(cmd::hvals, key);
-    }
-
-    // SET commands.
-
-    QueuedRedis& sadd(const StringView &key, const StringView &member) {
-        return command(cmd::sadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& sadd(const StringView &key, Input first, Input last) {
-        range_check("SADD", first, last);
-
-        return command(cmd::sadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& scard(const StringView &key) {
-        return command(cmd::scard, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiff(Input first, Input last) {
-        range_check("SDIFF", first, last);
-
-        return command(cmd::sdiff<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiff(std::initializer_list<T> il) {
-        return sdiff(il.begin(), il.end());
-    }
-
-    QueuedRedis& sdiffstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sdiffstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-        range_check("SDIFFSTORE", first, last);
-
-        return command(cmd::sdiffstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiffstore(const StringView &destination, std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& sinter(Input first, Input last) {
-        range_check("SINTER", first, last);
-
-        return command(cmd::sinter<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinter(std::initializer_list<T> il) {
-        return sinter(il.begin(), il.end());
-    }
-
-    QueuedRedis& sinterstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sinterstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sinterstore(const StringView &destination,
-                                Input first,
-                                Input last) {
-        range_check("SINTERSTORE", first, last);
-
-        return command(cmd::sinterstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinterstore(const StringView &destination, std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& sismember(const StringView &key, const StringView &member) {
-        return command(cmd::sismember, key, member);
-    }
-
-    QueuedRedis& smembers(const StringView &key) {
-        return command(cmd::smembers, key);
-    }
-
-    QueuedRedis& smove(const StringView &source,
-                        const StringView &destination,
-                        const StringView &member) {
-        return command(cmd::smove, source, destination, member);
-    }
-
-    QueuedRedis& spop(const StringView &key) {
-        return command(cmd::spop, key);
-    }
-
-    QueuedRedis& spop(const StringView &key, long long count) {
-        return command(cmd::spop_range, key, count);
-    }
-
-    QueuedRedis& srandmember(const StringView &key) {
-        return command(cmd::srandmember, key);
-    }
-
-    QueuedRedis& srandmember(const StringView &key, long long count) {
-        return command(cmd::srandmember_range, key, count);
-    }
-
-    QueuedRedis& srem(const StringView &key, const StringView &member) {
-        return command(cmd::srem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& srem(const StringView &key, Input first, Input last) {
-        range_check("SREM", first, last);
-
-        return command(cmd::srem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::sscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern) {
-        return sscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return sscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor) {
-        return sscan(key, cursor, "*", 10);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunion(Input first, Input last) {
-        range_check("SUNION", first, last);
-
-        return command(cmd::sunion<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunion(std::initializer_list<T> il) {
-        return sunion(il.begin(), il.end());
-    }
-
-    QueuedRedis& sunionstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sunionstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunionstore(const StringView &destination, Input first, Input last) {
-        range_check("SUNIONSTORE", first, last);
-
-        return command(cmd::sunionstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    QueuedRedis& bzpopmax(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmax, key, timeout);
-    }
-
-    QueuedRedis& bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first, Input last, long long timeout) {
-        range_check("BZPOPMAX", first, last);
-
-        return command(cmd::bzpopmax_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il, long long timeout) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmin, key, timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first, Input last, long long timeout) {
-        range_check("BZPOPMIN", first, last);
-
-        return command(cmd::bzpopmin_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il, long long timeout) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    QueuedRedis& zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd, key, member, score, type, changed);
-    }
-
-    template <typename Input>
-    QueuedRedis& zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        range_check("ZADD", first, last);
-
-        return command(cmd::zadd_range<Input>, key, first, last, type, changed);
-    }
-
-    QueuedRedis& zcard(const StringView &key) {
-        return command(cmd::zcard, key);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zincrby(const StringView &key, double increment, const StringView &member) {
-        return command(cmd::zincrby, key, increment, member);
-    }
-
-    QueuedRedis& zinterstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zinterstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        range_check("ZINTERSTORE", first, last);
-
-        return command(cmd::zinterstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zlexcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zlexcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::zpopmax, key, 1);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key, long long count) {
-        return command(cmd::zpopmax, key, count);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::zpopmin, key, 1);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key, long long count) {
-        return command(cmd::zpopmin, key, count);
-    }
-
-    // NOTE: *QueuedRedis::zrange*'s parameters are different from *Redis::zrange*.
-    // *Redis::zrange* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::zrange*. So we have to use an extra parameter: *with_scores*,
-    // to decide whether we should send *WITHSCORES* option to Redis. This also applies to
-    // other commands with the *WITHSCORES* option, e.g. *ZRANGEBYSCORE*, *ZREVRANGE*,
-    // *ZREVRANGEBYSCORE*.
-    QueuedRedis& zrange(const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores = false) {
-        return command(cmd::zrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key, const Interval &interval) {
-        return zrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                bool with_scores = false) {
-        return command(cmd::zrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                bool with_scores = false) {
-        return zrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrank, key, member);
-    }
-
-    QueuedRedis& zrem(const StringView &key, const StringView &member) {
-        return command(cmd::zrem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& zrem(const StringView &key, Input first, Input last) {
-        range_check("ZREM", first, last);
-
-        return command(cmd::zrem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebylex(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebylex<Interval>, key, interval);
-    }
-
-    QueuedRedis& zremrangebyrank(const StringView &key, long long start, long long stop) {
-        return command(cmd::zremrangebyrank, key, start, stop);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebyscore(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebyscore<Interval>, key, interval);
-    }
-
-    // See comments on *ZRANGE*.
-    QueuedRedis& zrevrange(const StringView &key,
-                            long long start,
-                            long long stop,
-                            bool with_scores = false) {
-        return command(cmd::zrevrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key, const Interval &interval) {
-        return zrevrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    const LimitOptions &opts,
-                                    bool with_scores = false) {
-        return command(cmd::zrevrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    bool with_scores = false) {
-        return zrevrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrevrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrevrank, key, member);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::zscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return zscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return zscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor) {
-        return zscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& zscore(const StringView &key, const StringView &member) {
-        return command(cmd::zscore, key, member);
-    }
-
-    QueuedRedis& zunionstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zunionstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        range_check("ZUNIONSTORE", first, last);
-
-        return command(cmd::zunionstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    QueuedRedis& pfadd(const StringView &key, const StringView &element) {
-        return command(cmd::pfadd, key, element);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfadd(const StringView &key, Input first, Input last) {
-        range_check("PFADD", first, last);
-
-        return command(cmd::pfadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& pfcount(const StringView &key) {
-        return command(cmd::pfcount, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfcount(Input first, Input last) {
-        range_check("PFCOUNT", first, last);
-
-        return command(cmd::pfcount_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    QueuedRedis& pfmerge(const StringView &destination, const StringView &key) {
-        return command(cmd::pfmerge, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfmerge(const StringView &destination, Input first, Input last) {
-        range_check("PFMERGE", first, last);
-
-        return command(cmd::pfmerge_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        return pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    QueuedRedis& geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-        return command(cmd::geoadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geoadd(const StringView &key,
-                        Input first,
-                        Input last) {
-        range_check("GEOADD", first, last);
-
-        return command(cmd::geoadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geoadd(const StringView &key, std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M) {
-        return command(cmd::geodist, key, member1, member2, unit);
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& geohash(const StringView &key, const StringView &member) {
-        return command(cmd::geohash, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geohash(const StringView &key, Input first, Input last) {
-        range_check("GEOHASH", first, last);
-
-        return command(cmd::geohash_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geohash(const StringView &key, std::initializer_list<T> il) {
-        return geohash(key, il.begin(), il.end());
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& geopos(const StringView &key, const StringView &member) {
-        return command(cmd::geopos, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geopos(const StringView &key, Input first, Input last) {
-        range_check("GEOPOS", first, last);
-
-        return command(cmd::geopos_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geopos(const StringView &key, std::initializer_list<T> il) {
-        return geopos(key, il.begin(), il.end());
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            const StringView &destination,
-                            bool store_dist,
-                            long long count) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadius_store,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // NOTE: *QueuedRedis::georadius*'s parameters are different from *Redis::georadius*.
-    // *Redis::georadius* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::georadius*. So we have to use extra parameters to decide
-    // whether we should send options to Redis. This also applies to *GEORADIUSBYMEMBER*.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            bool with_coord,
-                            bool with_dist,
-                            bool with_hash) {
-        return command(cmd::georadius,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // See the comments on *GEORADIUS*.
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    long long count,
-                                    bool asc,
-                                    bool with_coord,
-                                    bool with_dist,
-                                    bool with_hash) {
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    // SCRIPTING commands.
-
-    template <typename Keys, typename Args>
-    QueuedRedis& eval(const StringView &script,
-                        Keys keys_first,
-                        Keys keys_last,
-                        Args args_first,
-                        Args args_last) {
-        return command(cmd::eval<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-    }
-
-    QueuedRedis& eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-        return eval(script, keys.begin(), keys.end(), args.begin(), args.end());
-    }
-
-    template <typename Keys, typename Args>
-    QueuedRedis& evalsha(const StringView &script,
-                            Keys keys_first,
-                            Keys keys_last,
-                            Args args_first,
-                            Args args_last) {
-        return command(cmd::evalsha<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-    }
-
-    QueuedRedis& evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-        return evalsha(script, keys.begin(), keys.end(), args.begin(), args.end());
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& script_exists(const StringView &sha1) {
-        return command(cmd::script_exists, sha1);
-    }
-
-    template <typename Input>
-    QueuedRedis& script_exists(Input first, Input last) {
-        range_check("SCRIPT EXISTS", first, last);
-
-        return command(cmd::script_exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& script_exists(std::initializer_list<T> il) {
-        return script_exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& script_flush() {
-        return command(cmd::script_flush);
-    }
-
-    QueuedRedis& script_kill() {
-        return command(cmd::script_kill);
-    }
-
-    QueuedRedis& script_load(const StringView &script) {
-        return command(cmd::script_load, script);
-    }
-
-    // PUBSUB commands.
-
-    QueuedRedis& publish(const StringView &channel, const StringView &message) {
-        return command(cmd::publish, channel, message);
-    }
-
-    // Stream commands.
-
-    QueuedRedis& xack(const StringView &key, const StringView &group, const StringView &id) {
-        return command(cmd::xack, key, group, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xack(const StringView &key, const StringView &group, Input first, Input last) {
-        range_check("XACK", first, last);
-
-        return command(cmd::xack_range<Input>, key, group, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, Input first, Input last) {
-        range_check("XADD", first, last);
-
-        return command(cmd::xadd_range<Input>, key, id, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true) {
-        range_check("XADD", first, last);
-
-        return command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    QueuedRedis& xclaim(const StringView &key,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const std::chrono::milliseconds &min_idle_time,
-                        const StringView &id) {
-        return command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last) {
-        range_check("XCLAIM", first, last);
-
-        return command(cmd::xclaim_range<Input>,
-                        key,
-                        group,
-                        consumer,
-                        min_idle_time.count(),
-                        first,
-                        last);
-    }
-
-    template <typename T>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il) {
-        return xclaim(key, group, consumer, min_idle_time, il.begin(), il.end());
-    }
-
-    QueuedRedis& xdel(const StringView &key, const StringView &id) {
-        return command(cmd::xdel, key, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xdel(const StringView &key, Input first, Input last) {
-        range_check("XDEL", first, last);
-
-        return command(cmd::xdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& xgroup_create(const StringView &key,
-                                const StringView &group,
-                                const StringView &id,
-                                bool mkstream = false) {
-        return command(cmd::xgroup_create, key, group, id, mkstream);
-    }
-
-    QueuedRedis& xgroup_setid(const StringView &key,
-                                const StringView &group,
-                                const StringView &id) {
-        return command(cmd::xgroup_setid, key, group, id);
-    }
-
-    QueuedRedis& xgroup_destroy(const StringView &key, const StringView &group) {
-        return command(cmd::xgroup_destroy, key, group);
-    }
-
-    QueuedRedis& xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer) {
-        return command(cmd::xgroup_delconsumer, key, group, consumer);
-    }
-
-    QueuedRedis& xlen(const StringView &key) {
-        return command(cmd::xlen, key);
-    }
-
-    QueuedRedis& xpending(const StringView &key, const StringView &group) {
-        return command(cmd::xpending, key, group);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-        return command(cmd::xpending_detail, key, group, start, end, count);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer) {
-        return command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end) {
-        return command(cmd::xrange, key, start, end);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count) {
-        return command(cmd::xrange_count, key, start, end, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id, long long count) {
-        return command(cmd::xread, key, id, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id) {
-        return xread(key, id, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last, long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREAD", first, last);
-
-        return command(cmd::xread_range<Input>, first, last, count);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, 0);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count) {
-        return command(cmd::xread_block, key, id, timeout.count(), count);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout) {
-        return xread(key, id, timeout, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREAD", first, last);
-
-        return command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, timeout, 0);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREADGROUP", first, last);
-
-        return command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, 0, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup_block,
-                        group,
-                        consumer,
-                        key,
-                        id,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREADGROUP", first, last);
-
-        return command(cmd::xreadgroup_block_range<Input>,
-                        group,
-                        consumer,
-                        first,
-                        last,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, 0, false);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start) {
-        return command(cmd::xrevrange, key, end, start);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-        return command(cmd::xrevrange_count, key, end, start, count);
-    }
-
-    QueuedRedis& xtrim(const StringView &key, long long count, bool approx = true) {
-        return command(cmd::xtrim, key, count, approx);
-    }
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    template <typename ...Args>
-    QueuedRedis(const ConnectionPoolSPtr &pool, bool new_connection, Args &&...args);
-
-    Connection& _connection();
-
-    void _sanity_check();
-
-    void _reset(bool reset_connection = true);
-
-    void _return_connection();
-
-    void _invalidate();
-
-    void _clean_up();
-
-    void _rewrite_replies(std::vector<ReplyUPtr> &replies) const;
-
-    template <typename Func>
-    void _rewrite_replies(const std::vector<std::size_t> &indexes,
-                            Func rewriter,
-                            std::vector<ReplyUPtr> &replies) const;
-
-    GuardedConnectionSPtr _guarded_connection;
-
-    ConnectionPoolSPtr _connection_pool;
-
-    bool _new_connection = true;
-
-    Impl _impl;
-
-    std::size_t _cmd_num = 0;
-
-    std::vector<std::size_t> _set_cmd_indexes;
-
-    std::vector<std::size_t> _empty_array_cmd_indexes;
-
-    bool _valid = true;
-};
-
-class QueuedReplies {
-public:
-    QueuedReplies() = default;
-
-    QueuedReplies(const QueuedReplies &) = delete;
-    QueuedReplies& operator=(const QueuedReplies &) = delete;
-
-    QueuedReplies(QueuedReplies &&) = default;
-    QueuedReplies& operator=(QueuedReplies &&) = default;
-
-    ~QueuedReplies() = default;
-
-    std::size_t size() const;
-
-    redisReply& get(std::size_t idx);
-
-    template <typename Result>
-    Result get(std::size_t idx);
-
-    template <typename Output>
-    void get(std::size_t idx, Output output);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    explicit QueuedReplies(std::vector<ReplyUPtr> replies) : _replies(std::move(replies)) {}
-
-    void _index_check(std::size_t idx) const;
-
-    std::vector<ReplyUPtr> _replies;
-};
-
-}
-
-}
-
-#include "queued_redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/queued_redis.hpp b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/queued_redis.hpp
deleted file mode 100644
index d2865e46e..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/queued_redis.hpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>::QueuedRedis(const ConnectionPoolSPtr &pool,
-                                bool new_connection,
-                                Args &&...args) :
-            _new_connection(new_connection),
-            _impl(std::forward<Args>(args)...) {
-    assert(pool);
-
-    if (_new_connection) {
-        _connection_pool = std::make_shared<ConnectionPool>(pool->clone());
-    } else {
-        // Create a connection from the origin pool.
-        _connection_pool = pool;
-    }
-}
-
-template <typename Impl>
-QueuedRedis<Impl>::~QueuedRedis() {
-    try {
-        _clean_up();
-    } catch (const Error &e) {
-        // Ensure the destructor does not throw
-    }
-}
-
-template <typename Impl>
-Redis QueuedRedis<Impl>::redis() {
-    _sanity_check();
-
-    assert(_guarded_connection);
-
-    return Redis(_guarded_connection);
-}
-
-template <typename Impl>
-template <typename Cmd, typename ...Args>
-auto QueuedRedis<Impl>::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                QueuedRedis<Impl>&>::type {
-    try {
-        _sanity_check();
-
-        _impl.command(_connection(), cmd, std::forward<Args>(args)...);
-
-        ++_cmd_num;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-
-    return *this;
-}
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>& QueuedRedis<Impl>::command(const StringView &cmd_name, Args &&...args) {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Impl>
-template <typename Input>
-auto QueuedRedis<Impl>::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, QueuedRedis<Impl>&>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Impl>
-QueuedReplies QueuedRedis<Impl>::exec() {
-    try {
-        _sanity_check();
-
-        auto replies = _impl.exec(_connection(), _cmd_num);
-
-        _rewrite_replies(replies);
-
-        _reset();
-
-        return QueuedReplies(std::move(replies));
-    } catch (const WatchError &e) {
-        // In this case, we only clear some states and keep the connection,
-        // so that user can retry the transaction.
-        _reset(false);
-        throw;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::discard() {
-    try {
-        _sanity_check();
-
-        _impl.discard(_connection(), _cmd_num);
-
-        _reset();
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-Connection& QueuedRedis<Impl>::_connection() {
-    assert(_valid);
-
-    if (!_guarded_connection) {
-        _guarded_connection = std::make_shared<GuardedConnection>(_connection_pool);
-    }
-
-    return _guarded_connection->connection();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_sanity_check() {
-    if (!_valid) {
-        throw Error("Not in valid state");
-    }
-
-    if (_connection().broken()) {
-        throw Error("Connection is broken");
-    }
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_reset(bool reset_connection) {
-    if (reset_connection && !_new_connection) {
-        _return_connection();
-    }
-
-    _cmd_num = 0;
-
-    _set_cmd_indexes.clear();
-
-    _empty_array_cmd_indexes.clear();
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_return_connection() {
-    if (_guarded_connection.use_count() == 1) {
-        // If no one else holding the connection, return it back to pool.
-        // Instead, if some other `Redis` object holds the connection,
-        // e.g. `auto redis = transaction.redis();`, we cannot return the connection.
-        _guarded_connection.reset();
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_invalidate() {
-    _valid = false;
-
-    _clean_up();
-
-    _reset();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_clean_up() {
-    if (_guarded_connection && !_new_connection) {
-        // Something bad happened, we need to close the current connection
-        // before returning it back to pool.
-        _guarded_connection->connection().invalidate();
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_rewrite_replies(std::vector<ReplyUPtr> &replies) const {
-    _rewrite_replies(_set_cmd_indexes, reply::rewrite_set_reply, replies);
-
-    _rewrite_replies(_empty_array_cmd_indexes, reply::rewrite_empty_array_reply, replies);
-}
-
-template <typename Impl>
-template <typename Func>
-void QueuedRedis<Impl>::_rewrite_replies(const std::vector<std::size_t> &indexes,
-                                            Func rewriter,
-                                            std::vector<ReplyUPtr> &replies) const {
-    for (auto idx : indexes) {
-        assert(idx < replies.size());
-
-        auto &reply = replies[idx];
-
-        assert(reply);
-
-        rewriter(*reply);
-    }
-}
-
-inline std::size_t QueuedReplies::size() const {
-    return _replies.size();
-}
-
-inline redisReply& QueuedReplies::get(std::size_t idx) {
-    _index_check(idx);
-
-    auto &reply = _replies[idx];
-
-    assert(reply);
-
-    if (reply::is_error(*reply)) {
-        throw_error(*reply);
-    }
-
-    return *reply;
-}
-
-template <typename Result>
-inline Result QueuedReplies::get(std::size_t idx) {
-    auto &reply = get(idx);
-
-    return reply::parse<Result>(reply);
-}
-
-template <typename Output>
-inline void QueuedReplies::get(std::size_t idx, Output output) {
-    auto &reply = get(idx);
-
-    reply::to_array(reply, output);
-}
-
-inline void QueuedReplies::_index_check(std::size_t idx) const {
-    if (idx >= size()) {
-        throw Error("Out of range");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis++.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis++.h
deleted file mode 100644
index 0da0ebb16..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis++.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-#define SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-
-#include "redis.h"
-#include "redis_cluster.h"
-#include "queued_redis.h"
-#include "sentinel.h"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis.h
deleted file mode 100644
index 1333e6b68..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis.h
+++ /dev/null
@@ -1,3631 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_H
-
-#include <string>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <tuple>
-#include "connection_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class Redis {
-public:
-    /// @brief Construct `Redis` instance with connection options and connection pool options.
-    /// @param connection_opts Connection options.
-    /// @param pool_opts Connection pool options.
-    /// @see `ConnectionOptions`
-    /// @see `ConnectionPoolOptions`
-    /// @see https://github.com/sewenew/redis-plus-plus#connection
-    explicit Redis(const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(std::make_shared<ConnectionPool>(pool_opts, connection_opts)) {}
-
-    /// @brief Construct `Redis` instance with URI.
-    /// @param uri URI, e.g. 'tcp://127.0.0.1', 'tcp://127.0.0.1:6379', or 'unix://path/to/socket'.
-    ///            Full URI scheme: 'tcp://[[username:]password@]host[:port][/db]' or
-    ///            unix://[[username:]password@]path-to-unix-domain-socket[/db]
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/37
-    /// @see https://github.com/sewenew/redis-plus-plus#connection
-    explicit Redis(const std::string &uri);
-
-    /// @brief Construct `Redis` instance with Redis sentinel, i.e. get node info from sentinel.
-    /// @param sentinel `Sentinel` instance.
-    /// @param master_name Name of master node.
-    /// @param role Connect to master node or slave node.
-    ///             - Role::MASTER: Connect to master node.
-    ///             - Role::SLAVE: Connect to slave node.
-    /// @param connection_opts Connection options.
-    /// @param pool_opts Connection pool options.
-    /// @see `Sentinel`
-    /// @see `Role`
-    /// @see https://github.com/sewenew/redis-plus-plus#redis-sentinel
-    Redis(const std::shared_ptr<Sentinel> &sentinel,
-            const std::string &master_name,
-            Role role,
-            const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(std::make_shared<ConnectionPool>(SimpleSentinel(sentinel, master_name, role),
-                                                        pool_opts,
-                                                        connection_opts)) {}
-
-    /// @brief `Redis` is not copyable.
-    Redis(const Redis &) = delete;
-
-    /// @brief `Redis` is not copyable.
-    Redis& operator=(const Redis &) = delete;
-
-    /// @brief `Redis` is movable.
-    Redis(Redis &&) = default;
-
-    /// @brief `Redis` is movable.
-    Redis& operator=(Redis &&) = default;
-
-    /// @brief Create a pipeline.
-    /// @param new_connection Whether creating a `Pipeline` object in a new connection.
-    /// @return The created pipeline.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#pipeline
-    Pipeline pipeline(bool new_connection = true);
-
-    /// @brief Create a transaction.
-    /// @param piped Whether commands in a transaction should be sent in a pipeline to reduce RTT.
-    /// @param new_connection Whether creating a `Pipeline` object in a new connection.
-    /// @return The created transaction.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#transaction
-    Transaction transaction(bool piped = false, bool new_connection = true);
-
-    /// @brief Create a subscriber.
-    /// @return The created subscriber.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#publishsubscribe
-    Subscriber subscriber();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type;
-
-    template <typename Result, typename ...Args>
-    Result command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // CONNECTION commands.
-
-    /// @brief Send password to Redis.
-    /// @param password Password.
-    /// @note Normally, you should not call this method.
-    ///       Instead, you should set password with `ConnectionOptions` or URI.
-    /// @see https://redis.io/commands/auth
-    void auth(const StringView &password);
-
-    /// @brief Send user and password to Redis.
-    /// @param user User name.
-    /// @param password Password.
-    /// @note Normally, you should not call this method.
-    ///       Instead, you should set password with `ConnectionOptions` or URI.
-    ///       Also this overload only works with Redis 6.0 or later.
-    /// @see https://redis.io/commands/auth
-    void auth(const StringView &user, const StringView &password);
-
-    /// @brief Ask Redis to return the given message.
-    /// @param msg Message to be sent.
-    /// @return Return the given message.
-    /// @see https://redis.io/commands/echo
-    std::string echo(const StringView &msg);
-
-    /// @brief Test if the connection is alive.
-    /// @return Always return *PONG*.
-    /// @see https://redis.io/commands/ping
-    std::string ping();
-
-    /// @brief Test if the connection is alive.
-    /// @param msg Message sent to Redis.
-    /// @return Return the given message.
-    /// @see https://redis.io/commands/ping
-    std::string ping(const StringView &msg);
-
-    // After sending QUIT, only the current connection will be close, while
-    // other connections in the pool is still open. This is a strange behavior.
-    // So we DO NOT support the QUIT command. If you want to quit connection to
-    // server, just destroy the Redis object.
-    //
-    // void quit();
-
-    // We get a connection from the pool, and send the SELECT command to switch
-    // to a specified DB. However, when we try to send other commands to the
-    // given DB, we might get a different connection from the pool, and these
-    // commands, in fact, work on other DB. e.g.
-    //
-    // redis.select(1); // get a connection from the pool and switch to the 1th DB
-    // redis.get("key"); // might get another connection from the pool,
-    //                   // and try to get 'key' on the default DB
-    //
-    // Obviously, this is NOT what we expect. So we DO NOT support SELECT command.
-    // In order to select a DB, we can specify the DB index with the ConnectionOptions.
-    //
-    // However, since Pipeline and Transaction always send multiple commands on a
-    // single connection, these two classes have a *select* method.
-    //
-    // void select(long long idx);
-
-    /// @brief Swap two Redis databases.
-    /// @param idx1 The index of the first database.
-    /// @param idx2 The index of the second database.
-    /// @see https://redis.io/commands/swapdb
-    void swapdb(long long idx1, long long idx2);
-
-    // SERVER commands.
-
-    /// @brief Rewrite AOF in the background.
-    /// @see https://redis.io/commands/bgrewriteaof
-    void bgrewriteaof();
-
-    /// @brief Save database in the background.
-    /// @see https://redis.io/commands/bgsave
-    void bgsave();
-
-    /// @brief Get the size of the currently selected database.
-    /// @return Number of keys in currently selected database.
-    /// @see https://redis.io/commands/dbsize
-    long long dbsize();
-
-    /// @brief Remove keys of all databases.
-    /// @param async Whether flushing databases asynchronously, i.e. without blocking the server.
-    /// @see https://redis.io/commands/flushall
-    void flushall(bool async = false);
-
-    /// @brief Remove keys of current databases.
-    /// @param async Whether flushing databases asynchronously, i.e. without blocking the server.
-    /// @see https://redis.io/commands/flushdb
-    void flushdb(bool async = false);
-
-    /// @brief Get the info about the server.
-    /// @return Server info.
-    /// @see https://redis.io/commands/info
-    std::string info();
-
-    /// @brief Get the info about the server on the given section.
-    /// @param section Section.
-    /// @return Server info.
-    /// @see https://redis.io/commands/info
-    std::string info(const StringView &section);
-
-    /// @brief Get the UNIX timestamp in seconds, at which the database was saved successfully.
-    /// @return The last saving time.
-    /// @see https://redis.io/commands/lastsave
-    long long lastsave();
-
-    /// @brief Save databases into RDB file **synchronously**, i.e. block the server during saving.
-    /// @see https://redis.io/commands/save
-    void save();
-
-    // KEY commands.
-
-    /// @brief Delete the given key.
-    /// @param key Key.
-    /// @return Number of keys removed.
-    /// @retval 1 If the key exists, and has been removed.
-    /// @retval 0 If the key does not exist.
-    /// @see https://redis.io/commands/del
-    long long del(const StringView &key);
-
-    /// @brief Delete the given list of keys.
-    /// @param first Iterator to the first key in the range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys removed.
-    /// @see https://redis.io/commands/del
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    /// @brief Delete the given list of keys.
-    /// @param il Initializer list of keys to be deleted.
-    /// @return Number of keys removed.
-    /// @see https://redis.io/commands/del
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    /// @brief Get the serialized valued stored at key.
-    /// @param key Key.
-    /// @return The serialized value.
-    /// @note If key does not exist, `dump` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/dump
-    OptionalString dump(const StringView &key);
-
-    /// @brief Check if the given key exists.
-    /// @param key Key.
-    /// @return Whether the given key exists.
-    /// @retval 1 If key exists.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/exists
-    long long exists(const StringView &key);
-
-    /// @brief Check if the given keys exist.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys existing.
-    /// @see https://redis.io/commands/exists
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    /// @brief Check if the given keys exist.
-    /// @param il Initializer list of keys to be checked.
-    /// @return Number of keys existing.
-    /// @see https://redis.io/commands/exists
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in seconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expire
-    bool expire(const StringView &key, long long timeout);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in seconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expire
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in seconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expireat
-    bool expireat(const StringView &key, long long timestamp);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in seconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expireat
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    /// @brief Get keys matching the given pattern.
-    /// @param pattern Pattern.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @note It's always a bad idea to call `keys`, since it might block Redis for a long time,
-    ///       especially when the data set is very big.
-    /// @see `Redis::scan`
-    /// @see https://redis.io/commands/keys
-    template <typename Output>
-    void keys(const StringView &pattern, Output output);
-
-    /// @brief Move a key to the given database.
-    /// @param key Key.
-    /// @param db The destination database.
-    /// @return Whether key has been moved.
-    /// @retval true If key has been moved.
-    /// @retval false If key was not moved.
-    /// @see https://redis.io/commands/move
-    bool move(const StringView &key, long long db);
-
-    /// @brief Remove timeout on key.
-    /// @param key Key.
-    /// @return Whether timeout has been removed.
-    /// @retval true If timeout has been removed.
-    /// @retval false If key does not exist, or does not have an associated timeout.
-    /// @see https://redis.io/commands/persist
-    bool persist(const StringView &key);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in milliseconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpire
-    bool pexpire(const StringView &key, long long timeout);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in milliseconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpire
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in milliseconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpireat
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in milliseconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpireat
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    /// @brief Get the TTL of a key in milliseconds.
-    /// @param key Key.
-    /// @return TTL of the key in milliseconds.
-    /// @see https://redis.io/commands/pttl
-    long long pttl(const StringView &key);
-
-    /// @brief Get a random key from current database.
-    /// @return A random key.
-    /// @note If the database is empty, `randomkey` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/randomkey
-    OptionalString randomkey();
-
-    /// @brief Rename `key` to `newkey`.
-    /// @param key Key to be renamed.
-    /// @param newkey The new name of the key.
-    /// @see https://redis.io/commands/rename
-    void rename(const StringView &key, const StringView &newkey);
-
-    /// @brief Rename `key` to `newkey` if `newkey` does not exist.
-    /// @param key Key to be renamed.
-    /// @param newkey The new name of the key.
-    /// @return Whether key has been renamed.
-    /// @retval true If key has been renamed.
-    /// @retval false If newkey already exists.
-    /// @see https://redis.io/commands/renamenx
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    /// @brief Create a key with the value obtained by `Redis::dump`.
-    /// @param key Key.
-    /// @param val Value obtained by `Redis::dump`.
-    /// @param ttl Timeout of the created key in milliseconds. If `ttl` is 0, set no timeout.
-    /// @param replace Whether to overwrite an existing key.
-    ///                If `replace` is `true` and key already exists, throw an exception.
-    /// @see https://redis.io/commands/restore
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    /// @brief Create a key with the value obtained by `Redis::dump`.
-    /// @param key Key.
-    /// @param val Value obtained by `Redis::dump`.
-    /// @param ttl Timeout of the created key in milliseconds. If `ttl` is 0, set no timeout.
-    /// @param replace Whether to overwrite an existing key.
-    ///                If `replace` is `true` and key already exists, throw an exception.
-    /// @see https://redis.io/commands/restore
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    /// @brief Scan keys of the database matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_set<std::string> keys;
-    /// while (true) {
-    ///     cursor = redis.scan(cursor, "pattern:*", 10, std::inserter(keys, keys.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of the keys to be scanned.
-    /// @param count A hint for how many keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    /// TODO: support the TYPE option for Redis 6.0.
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all keys of the database.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    Output output);
-
-    /// @brief Scan keys of the database matching the given pattern.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of the keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan keys of the database matching the given pattern.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Update the last access time of the given key.
-    /// @param key Key.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    long long touch(const StringView &key);
-
-    /// @brief Update the last access time of the given key.
-    /// @param first Iterator to the first key to be touched.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    /// @brief Update the last access time of the given key.
-    /// @param il Initializer list of keys to be touched.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    /// @brief Get the remaining Time-To-Live of a key.
-    /// @param key Key.
-    /// @return TTL in seconds.
-    /// @retval TTL If the key has a timeout.
-    /// @retval -1 If the key exists but does not have a timeout.
-    /// @retval -2 If the key does not exist.
-    /// @note In Redis 2.6 or older, `ttl` returns -1 if the key does not exist,
-    ///       or if the key exists but does not have a timeout.
-    /// @see https://redis.io/commands/ttl
-    long long ttl(const StringView &key);
-
-    /// @brief Get the type of the value stored at key.
-    /// @param key Key.
-    /// @return The type of the value.
-    /// @see https://redis.io/commands/type
-    std::string type(const StringView &key);
-
-    /// @brief Remove the given key asynchronously, i.e. without blocking Redis.
-    /// @param key Key.
-    /// @return Whether the key has been removed.
-    /// @retval 1 If key exists, and has been removed.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/unlink
-    long long unlink(const StringView &key);
-
-    /// @brief Remove the given keys asynchronously, i.e. without blocking Redis.
-    /// @param first Iterator to the first key in the given range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys that have been removed.
-    /// @see https://redis.io/commands/unlink
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    /// @brief Remove the given keys asynchronously, i.e. without blocking Redis.
-    /// @param il Initializer list of keys to be unlinked.
-    /// @return Number of keys that have been removed.
-    /// @see https://redis.io/commands/unlink
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    /// @brief Wait until previous write commands are successfully replicated to at
-    ///        least the specified number of replicas or the given timeout has been reached.
-    /// @param numslaves Number of replicas.
-    /// @param timeout Timeout in milliseconds. If timeout is 0ms, wait forever.
-    /// @return Number of replicas that have been successfully replicated these write commands.
-    /// @note The return value might be less than `numslaves`, because timeout has been reached.
-    /// @see https://redis.io/commands/wait
-    long long wait(long long numslaves, long long timeout);
-
-    /// @brief Wait until previous write commands are successfully replicated to at
-    ///        least the specified number of replicas or the given timeout has been reached.
-    /// @param numslaves Number of replicas.
-    /// @param timeout Timeout in milliseconds. If timeout is 0ms, wait forever.
-    /// @return Number of replicas that have been successfully replicated these write commands.
-    /// @note The return value might be less than `numslaves`, because timeout has been reached.
-    /// @see https://redis.io/commands/wait
-    /// TODO: Support default parameter for `timeout` to wait forever.
-    long long wait(long long numslaves, const std::chrono::milliseconds &timeout);
-
-    // STRING commands.
-
-    /// @brief Append the given string to the string stored at key.
-    /// @param key Key.
-    /// @param str String to be appended.
-    /// @return The length of the string after the append operation.
-    /// @see https://redis.io/commands/append
-    long long append(const StringView &key, const StringView &str);
-
-    /// @brief Get the number of bits that have been set for the given range of the string.
-    /// @param key Key.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return Number of bits that have been set.
-    /// @note The index can be negative to index from the end of the string.
-    /// @see https://redis.io/commands/bitcount
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    /// @brief Do bit operation on the string stored at `key`, and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param key The key where the string to be operated is stored.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    /// @brief Do bit operations on the strings stored at the given keys,
-    ///        and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param first Iterator to the first key where the string to be operated is stored.
-    /// @param last Off-the-end iterator to the given range of keys.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    /// @brief Do bit operations on the strings stored at the given keys,
-    ///        and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param il Initializer list of keys where the strings are operated.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    /// @brief Get the position of the first bit set to 0 or 1 in the given range of the string.
-    /// @param key Key.
-    /// @param bit 0 or 1.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return The position of the first bit set to 0 or 1.
-    /// @see https://redis.io/commands/bitpos
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    /// @brief Decrement the integer stored at key by 1.
-    /// @param key Key.
-    /// @return The value after the decrement.
-    /// @see https://redis.io/commands/decr
-    long long decr(const StringView &key);
-
-    /// @brief Decrement the integer stored at key by `decrement`.
-    /// @param key Key.
-    /// @param decrement Decrement.
-    /// @return The value after the decrement.
-    /// @see https://redis.io/commands/decrby
-    long long decrby(const StringView &key, long long decrement);
-
-    /// @brief Get the string value stored at key.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto val = redis.get("key");
-    /// if (val)
-    ///     std::cout << *val << std::endl;
-    /// else
-    ///     std::cout << "key not exist" << std::endl;
-    /// @endcode
-    /// @param key Key.
-    /// @return The value stored at key.
-    /// @note If key does not exist, `get` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/get
-    OptionalString get(const StringView &key);
-
-    /// @brief Get the bit value at offset in the string.
-    /// @param key Key.
-    /// @param offset Offset.
-    /// @return The bit value.
-    /// @see https://redis.io/commands/getbit
-    long long getbit(const StringView &key, long long offset);
-
-    /// @brief Get the substring of the string stored at key.
-    /// @param key Key.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return The substring in range [start, end]. If key does not exist, return an empty string.
-    /// @see https://redis.io/commands/getrange
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    /// @brief Atomically set the string stored at `key` to `val`, and return the old value.
-    /// @param key Key.
-    /// @param val Value to be set.
-    /// @return The old value stored at key.
-    /// @note If key does not exist, `getset` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/getset
-    /// @see `OptionalString`
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    /// @brief Increment the integer stored at key by 1.
-    /// @param key Key.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incr
-    long long incr(const StringView &key);
-
-    /// @brief Increment the integer stored at key by `increment`.
-    /// @param key Key.
-    /// @param increment Increment.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incrby
-    long long incrby(const StringView &key, long long increment);
-
-    /// @brief Increment the floating point number stored at key by `increment`.
-    /// @param key Key.
-    /// @param increment Increment.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incrbyfloat
-    double incrbyfloat(const StringView &key, double increment);
-
-    /// @brief Get the values of multiple keys atomically.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// std::vector<OptionalString> vals;
-    /// redis.mget(keys.begin(), keys.end(), std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "key does not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param first Iterator to the first key of the given range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @param output Output iterator to the destination where the values are stored.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given key might not exist (in this case, the value of the corresponding
-    ///       key is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/mget
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    /// @brief Get the values of multiple keys atomically.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<OptionalString> vals;
-    /// redis.mget({"k1", "k2", "k3"}, std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "key does not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param il Initializer list of keys.
-    /// @param output Output iterator to the destination where the values are stored.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given key might not exist (in this case, the value of the corresponding
-    ///       key is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/mget
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    /// @brief Set multiple key-value pairs.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::pair<std::string, std::string>> kvs1 = {{"k1", "v1"}, {"k2", "v2"}};
-    /// redis.mset(kvs1.begin(), kvs1.end());
-    /// std::unordered_map<std::string, std::string> kvs2 = {{"k3", "v3"}, {"k4", "v4"}};
-    /// redis.mset(kvs2.begin(), kvs2.end());
-    /// @endcode
-    /// @param first Iterator to the first key-value pair.
-    /// @param last Off-the-end iterator to the given range.
-    /// @see https://redis.io/commands/mset
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    /// @brief Set multiple key-value pairs.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.mset({std::make_pair("k1", "v1"), std::make_pair("k2", "v2")});
-    /// @endcode
-    /// @param il Initializer list of key-value pairs.
-    /// @see https://redis.io/commands/mset
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    /// @brief Set the given key-value pairs if all specified keys do not exist.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::pair<std::string, std::string>> kvs1;
-    /// redis.msetnx(kvs1.begin(), kvs1.end());
-    /// std::unordered_map<std::string, std::string> kvs2;
-    /// redis.msetnx(kvs2.begin(), kvs2.end());
-    /// @endcode
-    /// @param first Iterator to the first key-value pair.
-    /// @param last Off-the-end iterator of the given range.
-    /// @return Whether all keys have been set.
-    /// @retval true If all keys have been set.
-    /// @retval false If no key was set, i.e. at least one key already exist.
-    /// @see https://redis.io/commands/msetnx
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    /// @brief Set the given key-value pairs if all specified keys do not exist.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.msetnx({make_pair("k1", "v1"), make_pair("k2", "v2")});
-    /// @endcode
-    /// @param il Initializer list of key-value pairs.
-    /// @return Whether all keys have been set.
-    /// @retval true If all keys have been set.
-    /// @retval false If no key was set, i.e. at least one key already exist.
-    /// @see https://redis.io/commands/msetnx
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    /// @brief Set key-value pair with the given timeout in milliseconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in milliseconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/psetex
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    /// @brief Set key-value pair with the given timeout in milliseconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in milliseconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/psetex
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    /// @brief Set a key-value pair.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Set a key-value pair.
-    /// redis.set("key", "value");
-    /// // Set a key-value pair, and expire it after 10 seconds.
-    /// redis.set("key", "value", std::chrono::seconds(10));
-    /// // Set a key-value pair with a timeout, only if the key already exists.
-    /// if (redis.set("key", "value", std::chrono::seconds(10), UpdateType::EXIST))
-    ///     std::cout << "OK" << std::endl;
-    /// else
-    ///     std::cout << "key does not exist" << std::endl;
-    /// @endcode
-    /// @param key Key.
-    /// @param val Value.
-    /// @param ttl Timeout on the key. If `ttl` is 0ms, do not set timeout.
-    /// @param type Options for set command:
-    ///             - UpdateType::EXIST: Set the key only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Set the key only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always set the key no matter whether it exists.
-    /// @return Whether the key has been set.
-    /// @retval true If the key has been set.
-    /// @retval false If the key was not set, because of the given option.
-    /// @see https://redis.io/commands/set
-    // TODO: Support KEEPTTL option for Redis 6.0
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    // TODO: add SETBIT command.
-
-    /// @brief Set key-value pair with the given timeout in seconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in seconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/setex
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    /// @brief Set key-value pair with the given timeout in seconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in seconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/setex
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    /// @brief Set the key if it does not exist.
-    /// @param key Key.
-    /// @param val Value.
-    /// @return Whether the key has been set.
-    /// @retval true If the key has been set.
-    /// @retval false If the key was not set, i.e. the key already exists.
-    /// @see https://redis.io/commands/setnx
-    bool setnx(const StringView &key, const StringView &val);
-
-    /// @brief Set the substring starting from `offset` to the given value.
-    /// @param key Key.
-    /// @param offset Offset.
-    /// @param val Value.
-    /// @return The length of the string after this operation.
-    /// @see https://redis.io/commands/setrange
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    /// @brief Get the length of the string stored at key.
-    /// @param key Key.
-    /// @return The length of the string.
-    /// @note If key does not exist, `strlen` returns 0.
-    /// @see https://redis.io/commands/strlen
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    /// @brief Pop the first element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    /// @brief Pop the first element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param il Initializer list of keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param il Initializer list of keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the last element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    /// @brief Pop the last element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param il Initializer list of lists.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param first Iterator to the first list.
-    /// @param last Off-the-end iterator to the list range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param il Initializer list of list keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop last element of one list and push it to the left of another list in blocking way.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @param timeout Timeout. 0 means block forever.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `brpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::rpoplpush`
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    /// @brief Pop last element of one list and push it to the left of another list in blocking way.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @param timeout Timeout. 0 means block forever.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `brpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::rpoplpush`
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Get the element at the given index of the list.
-    /// @param key Key where the list is stored.
-    /// @param index Zero-base index, and -1 means the last element.
-    /// @return The element at the given index.
-    /// @see https://redis.io/commands/lindex
-    OptionalString lindex(const StringView &key, long long index);
-
-    /// @brief Insert an element to a list before or after the pivot element.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Insert 'hello' before 'world'
-    /// auto len = redis.linsert("list", InsertPosition::BEFORE, "world", "hello");
-    /// if (len == -1)
-    ///     std::cout << "there's no 'world' in the list" << std::endl;
-    /// else
-    ///     std::cout << "after the operation, the length of the list is " << len << std::endl;
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param position Before or after the pivot element.
-    /// @param pivot The pivot value. The `pivot` is the value of the element, not the index.
-    /// @param val Element to be inserted.
-    /// @return The length of the list after the operation.
-    /// @note If the pivot value is not found, `linsert` returns -1.
-    /// @see `InsertPosition`
-    /// @see https://redis.io/commands/linsert
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    /// @brief Get the length of the list.
-    /// @param key Key where the list is stored.
-    /// @return The length of the list.
-    /// @see https://redis.io/commands/llen
-    long long llen(const StringView &key);
-
-    /// @brief Pop the first element of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto element = redis.lpop("list");
-    /// if (element)
-    ///     std::cout << *element << std::endl;
-    /// else
-    ///     std::cout << "list is empty, i.e. list does not exist" << std::endl;
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @return The popped element.
-    /// @note If list is empty, i.e. key does not exist, return `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/lpop
-    OptionalString lpop(const StringView &key);
-
-    /// @brief Push an element to the beginning of the list.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    long long lpush(const StringView &key, const StringView &val);
-
-    /// @brief Push multiple elements to the beginning of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> elements = {"e1", "e2", "e3"};
-    /// redis.lpush("list", elements.begin(), elements.end());
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param first Iterator to the first element to be pushed.
-    /// @param last Off-the-end iterator to the given element range.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    /// @brief Push multiple elements to the beginning of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.lpush("list", {"e1", "e2", "e3"});
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param il Initializer list of elements.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    /// @brief Push an element to the beginning of the list, only if the list already exists.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpushx
-    // TODO: add a multiple elements overload.
-    long long lpushx(const StringView &key, const StringView &val);
-
-    /// @brief Get elements in the given range of the given list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> elements;
-    /// // Save all elements of a Redis list to a vector of string.
-    /// redis.lrange("list", 0, -1, std::back_inserter(elements));
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param start Start index of the range. Index can be negative, which mean index from the end.
-    /// @param stop End index of the range.
-    /// @param output Output iterator to the destination where the results are saved.
-    /// @see https://redis.io/commands/lrange
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Remove the first `count` occurrences of elements equal to `val`.
-    /// @param key Key where the list is stored.
-    /// @param count Number of occurrences to be removed.
-    /// @param val Value.
-    /// @return Number of elements removed.
-    /// @note `count` can be positive, negative and 0. Check the reference for detail.
-    /// @see https://redis.io/commands/lrem
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    /// @brief Set the element at the given index to the specified value.
-    /// @param key Key where the list is stored.
-    /// @param index Index of the element to be set.
-    /// @param val Value.
-    /// @see https://redis.io/commands/lset
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    /// @brief Trim a list to keep only element in the given range.
-    /// @param key Key where the key is stored.
-    /// @param start Start of the index.
-    /// @param stop End of the index.
-    /// @see https://redis.io/commands/ltrim
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    /// @brief Pop the last element of a list.
-    /// @param key Key where the list is stored.
-    /// @return The popped element.
-    /// @note If the list is empty, i.e. key does not exist, `rpop` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/rpop
-    OptionalString rpop(const StringView &key);
-
-    /// @brief Pop last element of one list and push it to the left of another list.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `rpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    /// @brief Push an element to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    long long rpush(const StringView &key, const StringView &val);
-
-    /// @brief Push multiple elements to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param first Iterator to the first element to be pushed.
-    /// @param last Off-the-end iterator to the given element range.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    /// @brief Push multiple elements to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param il Initializer list of elements to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    /// @brief Push an element to the end of the list, only if the list already exists.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpushx
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    /// @brief Remove the given field from hash.
-    /// @param key Key where the hash is stored.
-    /// @param field Field to be removed.
-    /// @return Whether the field has been removed.
-    /// @retval 1 If the field exists, and has been removed.
-    /// @retval 0 If the field does not exist.
-    /// @see https://redis.io/commands/hdel
-    long long hdel(const StringView &key, const StringView &field);
-
-    /// @brief Remove multiple fields from hash.
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field to be removed.
-    /// @param last Off-the-end iterator to the given field range.
-    /// @return Number of fields that has been removed.
-    /// @see https://redis.io/commands/hdel
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple fields from hash.
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of fields.
-    /// @return Number of fields that has been removed.
-    /// @see https://redis.io/commands/hdel
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    /// @brief Check if the given field exists in hash.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Whether the field exists.
-    /// @retval true If the field exists in hash.
-    /// @retval false If the field does not exist.
-    /// @see https://redis.io/commands/hexists
-    bool hexists(const StringView &key, const StringView &field);
-
-    /// @brief Get the value of the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Value of the given field.
-    /// @note If field does not exist, `hget` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/hget
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    /// @brief Get all field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> results;
-    /// // Save all field-value pairs of a Redis hash to an unordered_map<string, string>.
-    /// redis.hgetall("hash", std::inserter(results, results.begin()));
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hgetall` on a large hash, since it will block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hgetall
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    /// @brief Increment the integer stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param increment Increment.
-    /// @return The value of the field after the increment.
-    /// @see https://redis.io/commands/hincrby
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    /// @brief Increment the floating point number stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param increment Increment.
-    /// @return The value of the field after the increment.
-    /// @see https://redis.io/commands/hincrbyfloat
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    /// @brief Get all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hkeys` on a large hash, since it will block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hkeys
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    /// @brief Get the number of fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @return Number of fields.
-    /// @see https://redis.io/commands/hlen
-    long long hlen(const StringView &key);
-
-    /// @brief Get values of multiple fields.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> fields = {"f1", "f2"};
-    /// std::vector<OptionalString> vals;
-    /// redis.hmget("hash", fields.begin(), fields.end(), std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "field not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field.
-    /// @param last Off-the-end iterator to the given field range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given field might not exist (in this case, the value of the corresponding
-    ///       field is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/hmget
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    /// @brief Get values of multiple fields.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<OptionalString> vals;
-    /// redis.hmget("hash", {"f1", "f2"}, std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "field not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of fields.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given field might not exist (in this case, the value of the corresponding
-    ///       field is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/hmget
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    /// @brief Set multiple field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> m = {{"f1", "v1"}, {"f2", "v2"}};
-    /// redis.hmset("hash", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field-value pair.
-    /// @param last Off-the-end iterator to the range.
-    /// @see https://redis.io/commands/hmset
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    /// @brief Set multiple field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.hmset("hash", {std::make_pair("f1", "v1"), std::make_pair("f2", "v2")});
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of field-value pairs.
-    /// @see https://redis.io/commands/hmset
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    /// @brief Scan fields of the given hash matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_map<std::string, std::string> kvs;
-    /// while (true) {
-    ///     cursor = redis.hscan("hash", cursor, "pattern:*", 10, std::inserter(kvs, kvs.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan fields of the given hash matching the given pattern.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Set hash field to value.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param val Value.
-    /// @return Whether the given field is a new field.
-    /// @retval true If the given field didn't exist, and a new field has been added.
-    /// @retval false If the given field already exists, and its value has been overwritten.
-    /// @note When `hset` returns false, it does not mean that the method failed to set the field.
-    ///       Instead, it means that the field already exists, and we've overwritten its value.
-    ///       If `hset` fails, it will throw an exception of `Exception` type.
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/9
-    /// @see https://redis.io/commands/hset
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    /// @brief Set hash field to value.
-    /// @param key Key where the hash is stored.
-    /// @param item The field-value pair to be set.
-    /// @return Whether the given field is a new field.
-    /// @retval true If the given field didn't exist, and a new field has been added.
-    /// @retval false If the given field already exists, and its value has been overwritten.
-    /// @note When `hset` returns false, it does not mean that the method failed to set the field.
-    ///       Instead, it means that the field already exists, and we've overwritten its value.
-    ///       If `hset` fails, it will throw an exception of `Exception` type.
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/9
-    /// @see https://redis.io/commands/hset
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    /// @brief Set multiple fields of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> m = {{"f1", "v1"}, {"f2", "v2"}};
-    /// redis.hset("hash", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field to be set.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of fields that have been added, i.e. fields that not existed before.
-    /// @see https://redis.io/commands/hset
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value, long long>::type;
-
-    /// @brief Set multiple fields of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.hset("hash", {std::make_pair("f1", "v1"), std::make_pair("f2", "v2")});
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of field-value pairs.
-    /// @return Number of fields that have been added, i.e. fields that not existed before.
-    /// @see https://redis.io/commands/hset
-    template <typename T>
-    long long hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    /// @brief Set hash field to value, only if the given field does not exist.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param val Value.
-    /// @return Whether the field has been set.
-    /// @retval true If the field has been set.
-    /// @retval false If failed to set the field, i.e. the field already exists.
-    /// @see https://redis.io/commands/hsetnx
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    /// @brief Set hash field to value, only if the given field does not exist.
-    /// @param key Key where the hash is stored.
-    /// @param item The field-value pair to be set.
-    /// @return Whether the field has been set.
-    /// @retval true If the field has been set.
-    /// @retval false If failed to set the field, i.e. the field already exists.
-    /// @see https://redis.io/commands/hsetnx
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    /// @brief Get the length of the string stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Length of the string.
-    /// @see https://redis.io/commands/hstrlen
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    /// @brief Get values of all fields stored at the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hvals` on a large hash, since it might block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hvals
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    /// @brief Add a member to the given set.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be added.
-    /// @return Whether the given member is a new member.
-    /// @retval 1 The member did not exist before, and it has been added now.
-    /// @retval 0 The member already exists before this operation.
-    /// @see https://redis.io/commands/sadd
-    long long sadd(const StringView &key, const StringView &member);
-
-    /// @brief Add multiple members to the given set.
-    /// @param key Key where the set is stored.
-    /// @param first Iterator to the first member to be added.
-    /// @param last Off-the-end iterator to the member range.
-    /// @return Number of new members that have been added, i.e. members did not exist before.
-    /// @see https://redis.io/commands/sadd
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    /// @brief Add multiple members to the given set.
-    /// @param key Key where the set is stored.
-    /// @param il Initializer list of members to be added.
-    /// @return Number of new members that have been added, i.e. members did not exist before.
-    /// @see https://redis.io/commands/sadd
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    /// @brief Get the number of members in the set.
-    /// @param key Key where the set is stored.
-    /// @return Number of members.
-    /// @see https://redis.io/commands/scard
-    long long scard(const StringView &key);
-
-    /// @brief Get the difference between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sdiff
-    // TODO: `void sdiff(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    /// @brief Get the difference between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sdiff
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sdiffstore
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sdiff`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sdiffstore
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    /// @brief Same as `sdiff`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sdiffstore
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    /// @brief Get the intersection between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sinter
-    // TODO: `void sinter(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    /// @brief Get the intersection between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sinter
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sinter
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sinter`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sinter
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    /// @brief Same as `sinter`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sinter
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    /// @brief Test if `member` exists in the set stored at key.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be checked.
-    /// @return Whether `member` exists in the set.
-    /// @retval true If it exists in the set.
-    /// @retval false If it does not exist in the set, or the given key does not exist.
-    /// @see https://redis.io/commands/sismember
-    bool sismember(const StringView &key, const StringView &member);
-
-    /// @brief Get all members in the given set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_set<std::string> members1;
-    /// redis.smembers("set", std::inserter(members1, members1.begin()));
-    /// std::vector<std::string> members2;
-    /// redis.smembers("set", std::back_inserter(members2));
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param output Iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/smembers
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    /// @brief Move `member` from one set to another.
-    /// @param source Key of the set in which the member currently exists.
-    /// @param destination Key of the destination set.
-    /// @return Whether the member has been moved.
-    /// @retval true If the member has been moved.
-    /// @retval false If `member` does not exist in `source`.
-    /// @see https://redis.io/commands/smove
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    /// @brief Remove a random member from the set.
-    /// @param key Key where the set is stored.
-    /// @return The popped member.
-    /// @note If the set is empty, `spop` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::srandmember`
-    /// @see https://redis.io/commands/spop
-    OptionalString spop(const StringView &key);
-
-    /// @brief Remove multiple random members from the set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> members;
-    /// redis.spop("set", 10, std::back_inserter(members));
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of popped members might be less than `count`.
-    /// @see `Redis::srandmember`
-    /// @see https://redis.io/commands/spop
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    /// @brief Get a random member of the given set.
-    /// @param key Key where the set is stored.
-    /// @return A random member.
-    /// @note If the set is empty, `srandmember` returns `OptionalString{}` (`std::nullopt`).
-    /// @note This method won't remove the member from the set.
-    /// @see `Redis::spop`
-    /// @see https://redis.io/commands/srandmember
-    OptionalString srandmember(const StringView &key);
-
-    /// @brief Get multiple random members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param count Number of members to be returned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method won't remove members from the set.
-    /// @see `Redis::spop`
-    /// @see https://redis.io/commands/srandmember
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    /// @brief Remove a member from set.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be removed.
-    /// @return Whether the member has been removed.
-    /// @retval 1 If the given member exists, and has been removed.
-    /// @retval 0 If the given member does not exist.
-    /// @see https://redis.io/commands/srem
-    long long srem(const StringView &key, const StringView &member);
-
-    /// @brief Remove multiple members from set.
-    /// @param key Key where the set is stored.
-    /// @param first Iterator to the first member to be removed.
-    /// @param last Off-the-end iterator to the range.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/srem
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple members from set.
-    /// @param key Key where the set is stored.
-    /// @param il Initializer list of members to be removed.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/srem
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    /// @brief Scan members of the set matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_set<std::string> members;
-    /// while (true) {
-    ///     cursor = redis.sscan("set", cursor, "pattern:*",
-    ///         10, std::inserter(members, members.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan members of the set matching the given pattern.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Get the union between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sunion
-    // TODO: `void sunion(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    /// @brief Get the union between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sunion
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sunionstore
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sunion`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sunionstore
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    /// @brief Same as `sunion`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sunionstore
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    /// @brief Pop the member with highest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the highest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the highest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with lowest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Add or update a member with score to sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member to be added.
-    /// @param score Score of the member.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    /// @brief Add or update multiple members with score to sorted set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, double> m = {{"m1", 1.2}, {"m2", 2.3}};
-    /// redis.zadd("zset", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member-score pair.
-    /// @param last Off-the-end iterator to the member-score pairs range.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    /// @brief Add or update multiple members with score to sorted set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.zadd("zset", {std::make_pair("m1", 1.4), std::make_pair("m2", 2.3)});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member-score pair.
-    /// @param last Off-the-end iterator to the member-score pairs range.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    /// @brief Get the number of members in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Number of members in the sorted set.
-    /// @see https://redis.io/commands/zcard
-    long long zcard(const StringView &key);
-
-    /// @brief Get the number of members with score between a min-max score range.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Count members with score between (2.3, 5]
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::LEFT_OPEN));
-    /// // Count members with score between [2.3, 5)
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::RIGHT_OPEN));
-    /// // Count members with score between (2.3, 5)
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::OPEN));
-    /// // Count members with score between [2.3, 5]
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::CLOSED));
-    /// // Count members with score between [2.3, +inf)
-    /// redis.zcount("zset", LeftBoundedInterval<double>(2.3, BoundType::RIGHT_OPEN));
-    /// // Count members with score between (2.3, +inf)
-    /// redis.zcount("zset", LeftBoundedInterval<double>(2.3, BoundType::OPEN));
-    /// // Count members with score between (-inf, 5]
-    /// redis.zcount("zset", RightBoundedInterval<double>(5, BoundType::LEFT_OPEN));
-    /// // Count members with score between (-inf, 5)
-    /// redis.zcount("zset", RightBoundedInterval<double>(5, BoundType::OPEN));
-    /// // Count members with score between (-inf, +inf)
-    /// redis.zcount("zset", UnboundedInterval<double>{});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval The min-max score range.
-    /// @return Number of members with score between a min-max score range.
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zcount
-    // TODO: add a string version of Interval: zcount("key", "(2.3", "5").
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    /// @brief Increment the score of given member.
-    /// @param key Key where the sorted set is stored.
-    /// @param increment Increment.
-    /// @param member Member.
-    /// @return The score of the member after the operation.
-    /// @see https://redis.io/commands/zincrby
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    /// @brief Copy a sorted set to another one with the scores being multiplied by a factor.
-    /// @param destination Key of the destination sorted set.
-    /// @param key Key of the source sorted set.
-    /// @param weight Weight to be multiplied to the score of each member.
-    /// @return The number of members in the sorted set.
-    /// @note  There's no aggregation type parameter for single key overload, since these 3 types
-    ///         have the same effect.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    /// @brief Get intersection of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// redis.zinterstore("destination", keys.begin(), keys.end());
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// std::vector<std::pair<std::string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}};
-    /// redis.zinterstore("destination", keys_with_weights.begin(),
-    ///     keys_with_weights.end(), Aggregation::MIN);
-    /// // NOTE: `keys_with_weights` can also be of type `std::unordered_map<std::string, double>`.
-    /// // However, it will be slower than std::vector<std::pair<std::string, double>>, since we use
-    /// // `std::distance(first, last)` to calculate the *numkeys* parameter.
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param first Iterator to the first sorted set (might with weight).
-    /// @param last Off-the-end iterator to the sorted set range.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `Input` is an
-    ///       iterator to a container of `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZINTERSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///        If `Input` is an iterator to a container of `std::pair<std::string, double>`,
-    ///        i.e. key-weight pair, we send the command with the given weights:
-    ///       *ZINTERSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    /// @brief Get intersection of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// redis.zinterstore("destination", {"k1", "k2"});
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// redis.zinterstore("destination",
-    ///     {std::make_pair("k1", 1), std::make_pair("k2", 2)}, Aggregation::MIN);
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param il Initializer list of sorted set.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `T` is
-    ///       of type `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZINTERSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///       If `T` is of type `std::pair<std::string, double>`, i.e. key-weight pair,
-    ///       we send the command with the given weights:
-    ///       *ZINTERSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    /// @brief Get the number of members between a min-max range in lexicographical order.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Count members between (abc, abd]
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::LEFT_OPEN));
-    /// // Count members between [abc, abd)
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::RIGHT_OPEN));
-    /// // Count members between (abc, abd)
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::OPEN));
-    /// // Count members between [abc, abd]
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED));
-    /// // Count members between [abc, +inf)
-    /// redis.zlexcount("zset", LeftBoundedInterval<std::string>("abc", BoundType::RIGHT_OPEN));
-    /// // Count members between (abc, +inf)
-    /// redis.zlexcount("zset", LeftBoundedInterval<std::string>("abc", BoundType::OPEN));
-    /// // Count members between (-inf, "abd"]
-    /// redis.zlexcount("zset", RightBoundedInterval<std::string>("abd", BoundType::LEFT_OPEN));
-    /// // Count members between (-inf, "abd")
-    /// redis.zlexcount("zset", RightBoundedInterval<std::string>("abd", BoundType::OPEN));
-    /// // Count members between (-inf, +inf)
-    /// redis.zlexcount("zset", UnboundedInterval<std::string>{});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval The min-max range in lexicographical order.
-    /// @return Number of members between a min-max range in lexicographical order.
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zlexcount
-    // TODO: add a string version of Interval: zlexcount("key", "(abc", "abd").
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    /// @brief Pop the member with highest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Member-score pair with the highest score.
-    /// @note If sorted set is empty `zpopmax` returns
-    ///       `Optional<std::pair<std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::bzpopmax`
-    /// @see https://redis.io/commands/zpopmax
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    /// @brief Pop multiple members with highest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of returned members might be less than `count`.
-    /// @see `Redis::bzpopmax`
-    /// @see https://redis.io/commands/zpopmax
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    /// @brief Pop the member with lowest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Member-score pair with the lowest score.
-    /// @note If sorted set is empty `zpopmin` returns
-    ///       `Optional<std::pair<std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::bzpopmin`
-    /// @see https://redis.io/commands/zpopmin
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    /// @brief Pop multiple members with lowest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of returned members might be less than `count`.
-    /// @see `Redis::bzpopmin`
-    /// @see https://redis.io/commands/zpopmin
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    /// @brief Get a range of members by rank (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // send *ZRANGE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// redis.zrange("zset", 0, -1, std::back_inserter(result));
-    /// // send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// redis.zrange("zset", 0, -1, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank. Inclusive and can be negative.
-    /// @param stop Stop rank. Inclusive and can be negative.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGE key start stop* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGE key start stop WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @see `Redis::zrevrange`
-    /// @see https://redis.io/commands/zrange
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Get members between [abc, abd].
-    /// redis.zrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `Redis::zrevrangebylex`
-    /// @see https://redis.io/commands/zrangebylex
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Limit the result to at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members between [abc, abd].
-    /// redis.zrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     opts, std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `LimitOptions`
-    /// @see `Redis::zrevrangebylex`
-    /// @see https://redis.io/commands/zrangebylex
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get a range of members by score (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Get members whose score between (3, 6).
-    /// redis.zrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf).
-    /// redis.zrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrevrangebyscore`
-    /// @see https://redis.io/commands/zrangebyscore
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by score (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Only return at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members whose score between (3, 6).
-    /// redis.zrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     opts, std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf).
-    /// redis.zrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     opts, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrevrangebyscore`
-    /// @see https://redis.io/commands/zrangebyscore
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get the rank (from low to high) of the given member in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The rank of the given member.
-    /// @note If the member does not exist, `zrank` returns `OptionalLongLong{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zrank
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    /// @brief Remove the given member from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member to be removed.
-    /// @return Whether the member has been removed.
-    /// @retval 1 If the member exists, and has been removed.
-    /// @retval 0 If the member does not exist.
-    /// @see https://redis.io/commands/zrem
-    long long zrem(const StringView &key, const StringView &member);
-
-    /// @brief Remove multiple members from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/zrem
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple members from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param il Initializer list of members to be removed.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/zrem
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    /// @brief Remove members in the given range of lexicographical order.
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @return Number of members removed.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zremrangebylex
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    /// @brief Remove members in the given range ordered by rank.
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank.
-    /// @param stop Stop rank.
-    /// @return Number of members removed.
-    /// @see https://redis.io/commands/zremrangebyrank
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    /// @brief Remove members in the given range ordered by score.
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @return Number of members removed.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see https://redis.io/commands/zremrangebyscore
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    /// @brief Get a range of members by rank (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // send *ZREVRANGE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// redis.zrevrange("key", 0, -1, std::back_inserter(result));
-    /// // send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// redis.zrevrange("key", 0, -1, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank. Inclusive and can be negative.
-    /// @param stop Stop rank. Inclusive and can be negative.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGE key start stop* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGE key start stop WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @see `Redis::zrange`
-    /// @see https://redis.io/commands/zrevrange
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Get members between [abc, abd] in reverse order.
-    /// redis.zrevrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `Redis::zrangebylex`
-    /// @see https://redis.io/commands/zrevrangebylex
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Limit the result to at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members between [abc, abd] in reverse order.
-    /// redis.zrevrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     opts, std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `LimitOptions`
-    /// @see `Redis::zrangebylex`
-    /// @see https://redis.io/commands/zrevrangebylex
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get a range of members by score (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZREVRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Get members whose score between (3, 6) in reverse order.
-    /// redis.zrevrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf) in reverse order.
-    /// redis.zrevrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrangebyscore`
-    /// @see https://redis.io/commands/zrevrangebyscore
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by score (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZREVRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Only return at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members whose score between (3, 6) in reverse order.
-    /// redis.zrevrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     opts, std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf) in reverse order.
-    /// redis.zrevrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     opts, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrangebyscore`
-    /// @see https://redis.io/commands/zrevrangebyscore
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    /// @brief Get the rank (from high to low) of the given member in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The rank of the given member.
-    /// @note If the member does not exist, `zrevrank` returns `OptionalLongLong{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zrevrank
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    /// @brief Scan members of the given sorted set matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::vector<std::pair<std::string, double>> members;
-    /// while (true) {
-    ///     cursor = redis.zscan("zset", cursor, "pattern:*",
-    ///         10, std::back_inserter(members));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of members to be scanned.
-    /// @param count A hint for how many members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan members of the given sorted set matching the given pattern.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all members of the given sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all members of the given sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Get the score of the given member.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The score of the member.
-    /// @note If member does not exist, `zscore` returns `OptionalDouble{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zscore
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    /// @brief Copy a sorted set to another one with the scores being multiplied by a factor.
-    /// @param destination Key of the destination sorted set.
-    /// @param key Key of the source sorted set.
-    /// @param weight Weight to be multiplied to the score of each member.
-    /// @return The number of members in the sorted set.
-    /// @note  There's no aggregation type parameter for single key overload, since these 3 types
-    ///         have the same effect.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zinterstore
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    /// @brief Get union of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// redis.zunionstore("destination", keys.begin(), keys.end());
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// std::vector<std::pair<std::string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}};
-    /// redis.zunionstore("destination", keys_with_weights.begin(),
-    ///     keys_with_weights.end(), Aggregation::MIN);
-    /// // NOTE: `keys_with_weights` can also be of type `std::unordered_map<std::string, double>`.
-    /// // However, it will be slower than std::vector<std::pair<std::string, double>>, since we use
-    /// // `std::distance(first, last)` to calculate the *numkeys* parameter.
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param first Iterator to the first sorted set (might with weight).
-    /// @param last Off-the-end iterator to the sorted set range.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `Input` is an
-    ///       iterator to a container of `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///        If `Input` is an iterator to a container of `std::pair<std::string, double>`,
-    ///        i.e. key-weight pair, we send the command with the given weights:
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zunionstore
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    /// @brief Get union of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// redis.zunionstore("destination", {"k1", "k2"});
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// redis.zunionstore("destination",
-    ///     {std::make_pair("k1", 1), std::make_pair("k2", 2)}, Aggregation::MIN);
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param il Initializer list of sorted set.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `T` is
-    ///       of type `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///       If `T` is of type `std::pair<std::string, double>`, i.e. key-weight pair,
-    ///       we send the command with the given weights:
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zunionstore
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    /// @brief Add the given element to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param element Element to be added.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    bool pfadd(const StringView &key, const StringView &element);
-
-    /// @brief Add the given elements to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param first Iterator to the first element.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    /// @brief Add the given elements to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param il Initializer list of elements to be added.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    OptionalString geohash(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    Optional<std::pair<double, double>> geopos(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-
-    /// @brief Get members in geo range, i.e. a circle, and store them in a sorted set.
-    /// @param key Key of the GEO set.
-    /// @param loc Location encoded with <longitude, latitude> pair.
-    /// @param radius Radius of the range.
-    /// @param unit Radius unit.
-    /// @param destination Key of the destination sorted set.
-    /// @param store_dist Whether store distance info instead of geo info to destination.
-    /// @param count Limit the first N members.
-    /// @return Number of members stored in destination.
-    /// @note Before Redis 6.2.6, if key does not exist, returns `OptionalLongLong{}` (`std::nullopt`).
-    ///       Since Redis 6.2.6, if key does not exist, returns 0.
-    /// @see `GeoUnit`
-    /// @see `Redis::georadiusbymember`
-    /// @see https://redis.io/commands/georadius
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    /// @brief Get members in geo range, i.e. a circle, and store them in a sorted set.
-    /// @param key Key of the GEO set.
-    /// @param member Member which is the center of the circle.
-    /// @param radius Radius of the range.
-    /// @param unit Radius unit.
-    /// @param destination Key of the destination sorted set.
-    /// @param store_dist Whether store distance info instead of geo info to destination.
-    /// @param count Limit the first N members.
-    /// @return Number of members stored in destination.
-    /// @note Before Redis 6.2.6, if key does not exist, returns `OptionalLongLong{}` (`std::nullopt`).
-    ///       Since Redis 6.2.6, if key does not exist, returns 0.
-    /// @note If member does not exist, throw an `ReplyError`.
-    /// @see `GeoUnit`
-    /// @see `Redis::georadius`
-    /// @see https://redis.io/commands/georadiusbymember
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result, typename Keys, typename Args>
-    Result eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last);
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last,
-                Output output);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result, typename Keys, typename Args>
-    Result evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last,
-                    Output output);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    /// @brief Check if the given script exists.
-    /// @param sha1 SHA1 digest of the script.
-    /// @return Whether the script exists.
-    /// @retval true If the script exists.
-    /// @retval false If the script does not exist.
-    /// @see https://redis.io/commands/script-exists
-    bool script_exists(const StringView &sha1);
-
-    template <typename Input, typename Output>
-    void script_exists(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void script_exists(std::initializer_list<T> il, Output output) {
-        script_exists(il.begin(), il.end(), output);
-    }
-
-    void script_flush();
-
-    void script_kill();
-
-    std::string script_load(const StringView &script);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Transaction commands.
-    void watch(const StringView &key);
-
-    template <typename Input>
-    void watch(Input first, Input last);
-
-    template <typename T>
-    void watch(std::initializer_list<T> il) {
-        watch(il.begin(), il.end());
-    }
-
-    void unwatch();
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first ,last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    friend class RedisCluster;
-
-    // For internal use.
-    explicit Redis(const GuardedConnectionSPtr &connection);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Connection &connection, Cmd cmd, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    // Pool Mode.
-    // Public constructors create a *Redis* instance with a pool.
-    // In this case, *_connection* is a null pointer, and is never used.
-    ConnectionPoolSPtr _pool;
-
-    // Single Connection Mode.
-    // Private constructor creates a *Redis* instance with a single connection.
-    // This is used when we create Transaction, Pipeline and Subscriber.
-    // In this case, *_pool* is empty, and is never used.
-    GuardedConnectionSPtr _connection;
-};
-
-}
-
-}
-
-#include "redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis.hpp b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis.hpp
deleted file mode 100644
index c560ce111..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis.hpp
+++ /dev/null
@@ -1,1342 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_HPP
-
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename ...Args>
-auto Redis::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    if (_connection) {
-        // Single Connection Mode.
-        // TODO: In this case, should we reconnect?
-        auto &connection = _connection->connection();
-        if (connection.broken()) {
-            throw Error("Connection is broken");
-        }
-
-        return _command(connection, cmd, std::forward<Args>(args)...);
-    } else {
-        assert(_pool);
-
-        // Pool Mode, i.e. get connection from pool.
-        SafeConnection connection(*_pool);
-
-        return _command(connection.connection(), cmd, std::forward<Args>(args)...);
-    }
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    range_check("command", first, last);
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename ...Args>
-Result Redis::command(const StringView &cmd_name, Args &&...args) {
-    auto r = command(cmd_name, std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args) - 1>(),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Result, typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto Redis::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long Redis::del(Input first, Input last) {
-    range_check("DEL", first, last);
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::exists(Input first, Input last) {
-    range_check("EXISTS", first, last);
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool Redis::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool Redis::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-template <typename Output>
-void Redis::keys(const StringView &pattern, Output output) {
-    auto reply = command(cmd::keys, pattern);
-
-    reply::to_array(*reply, output);
-}
-
-inline bool Redis::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool Redis::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void Redis::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Output>
-long long Redis::scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::scan, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return scan(cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                long long count,
-                                Output output) {
-    return scan(cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                Output output) {
-    return scan(cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::touch(Input first, Input last) {
-    range_check("TOUCH", first, last);
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::unlink(Input first, Input last) {
-    range_check("UNLINK", first, last);
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline long long Redis::wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-    return wait(numslaves, timeout.count());
-}
-
-// STRING commands.
-
-template <typename Input>
-long long Redis::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    range_check("BITOP", first, last);
-
-    auto reply = command(cmd::bitop_range<Input>, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::mget(Input first, Input last, Output output) {
-    range_check("MGET", first, last);
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void Redis::mset(Input first, Input last) {
-    range_check("MSET", first, last);
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool Redis::msetnx(Input first, Input last) {
-    range_check("MSETNX", first, last);
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void Redis::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void Redis::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first, Input last, long long timeout) {
-    range_check("BLPOP", first, last);
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first, Input last, long long timeout) {
-    range_check("BRPOP", first, last);
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString Redis::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long Redis::lpush(const StringView &key, Input first, Input last) {
-    range_check("LPUSH", first, last);
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long Redis::rpush(const StringView &key, Input first, Input last) {
-    range_check("RPUSH", first, last);
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long Redis::hdel(const StringView &key, Input first, Input last) {
-    range_check("HDEL", first, last);
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void Redis::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void Redis::hmget(const StringView &key, Input first, Input last, Output output) {
-    range_check("HMGET", first, last);
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void Redis::hmset(const StringView &key, Input first, Input last) {
-    range_check("HMSET", first, last);
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long Redis::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-auto Redis::hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    long long>::type {
-    range_check("HSET", first, last);
-
-    auto reply = command(cmd::hset_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long Redis::sadd(const StringView &key, Input first, Input last) {
-    range_check("SADD", first, last);
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sdiff(Input first, Input last, Output output) {
-    range_check("SDIFF", first, last);
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    range_check("SDIFFSTORE", first, last);
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sinter(Input first, Input last, Output output) {
-    range_check("SINTER", first, last);
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sinterstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    range_check("SINTERSTORE", first, last);
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::srem(const StringView &key, Input first, Input last) {
-    range_check("SREM", first, last);
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long Redis::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void Redis::sunion(Input first, Input last, Output output) {
-    range_check("SUNION", first, last);
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sunionstore(const StringView &destination, Input first, Input last) {
-    range_check("SUNIONSTORE", first, last);
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto Redis::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto Redis::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long Redis::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    range_check("ZADD", first, last);
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    range_check("ZINTERSTORE", first, last);
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::zrem(const StringView &key, Input first, Input last) {
-    range_check("ZREM", first, last);
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void Redis::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long Redis::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    range_check("ZUNIONSTORE", first, last);
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool Redis::pfadd(const StringView &key, Input first, Input last) {
-    range_check("PFADD", first, last);
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long Redis::pfcount(Input first, Input last) {
-    range_check("PFCOUNT", first, last);
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void Redis::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    range_check("PFMERGE", first, last);
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long Redis::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    range_check("GEOADD", first, last);
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::geohash(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOHASH", first, last);
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::geopos(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOPOS", first, last);
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result, typename Keys, typename Args>
-Result Redis::eval(const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last) {
-    auto reply = command(cmd::eval<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    return eval<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void Redis::eval(const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last,
-                   Output output) {
-    auto reply = command(cmd::eval<Keys, Args>,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output) {
-    eval(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Result, typename Keys, typename Args>
-Result Redis::evalsha(const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last) {
-    auto reply = command(cmd::evalsha<Keys, Args>, script,
-            keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-    return evalsha<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void Redis::evalsha(const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last,
-                       Output output) {
-    auto reply = command(cmd::evalsha<Keys, Args>,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    evalsha(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Input, typename Output>
-void Redis::script_exists(Input first, Input last, Output output) {
-    range_check("SCRIPT EXISTS", first, last);
-
-    auto reply = command(cmd::script_exists_range<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-// Transaction commands.
-
-template <typename Input>
-void Redis::watch(Input first, Input last) {
-    auto reply = command(cmd::watch_range<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long Redis::xack(const StringView &key, const StringView &group, Input first, Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key, const StringView &id, Input first, Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    const StringView &id,
-                    Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    Input first,
-                    Input last,
-                    Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto Redis::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        const StringView &consumer,
-                        Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup_block,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = command(cmd::xreadgroup_block_range<Input>,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr Redis::_command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    auto reply = connection.recv();
-
-    return reply;
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis_cluster.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis_cluster.h
deleted file mode 100644
index 63c6131c1..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis_cluster.h
+++ /dev/null
@@ -1,1439 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-
-#include <string>
-#include <chrono>
-#include <initializer_list>
-#include <tuple>
-#include "shards_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "redis.h"
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class RedisCluster {
-public:
-    RedisCluster(const ConnectionOptions &connection_opts,
-                    const ConnectionPoolOptions &pool_opts = {},
-                    Role role = Role::MASTER) : _pool(pool_opts, connection_opts, role) {}
-
-    // Construct RedisCluster with URI:
-    // "tcp://127.0.0.1" or "tcp://127.0.0.1:6379"
-    // Only need to specify one URI.
-    explicit RedisCluster(const std::string &uri);
-
-    RedisCluster(const RedisCluster &) = delete;
-    RedisCluster& operator=(const RedisCluster &) = delete;
-
-    RedisCluster(RedisCluster &&) = default;
-    RedisCluster& operator=(RedisCluster &&) = default;
-
-    Redis redis(const StringView &hash_tag, bool new_connection = true);
-
-    Pipeline pipeline(const StringView &hash_tag, bool new_connection = true);
-
-    Transaction transaction(const StringView &hash_tag, bool piped = false, bool new_connection = true);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && IsIter<typename LastType<Key, Args...>::type>::value, void>::type;
-
-    template <typename Result, typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type;
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value, long long>::type;
-
-    template <typename T>
-    long long hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    OptionalString geohash(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    Optional<std::pair<double, double>> geopos(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result, typename Keys, typename Args>
-    Result eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last);
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last,
-                Output output);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result, typename Keys, typename Args>
-    Result evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last,
-                    Output output);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class Command {
-    public:
-        explicit Command(const StringView &cmd_name) : _cmd_name(cmd_name) {}
-
-        template <typename ...Args>
-        void operator()(Connection &connection, Args &&...args) const {
-            CmdArgs cmd_args;
-            cmd_args.append(_cmd_name, std::forward<Args>(args)...);
-            connection.send(cmd_args);
-        }
-
-    private:
-        StringView _cmd_name;
-    };
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, Connection &connection, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::true_type, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::false_type, Input &&first, Args &&...args);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::true_type, Input input, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::false_type, Input input, Args &&...args);
-
-    void _asking(Connection &connection);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    ShardsPool _pool;
-};
-
-}
-
-}
-
-#include "redis_cluster.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis_cluster.hpp b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis_cluster.hpp
deleted file mode 100644
index 2153d181b..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/redis_cluster.hpp
+++ /dev/null
@@ -1,1403 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-
-#include <utility>
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-#include "shards_pool.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    return _command(cmd,
-                    std::is_convertible<typename std::decay<Key>::type, StringView>(),
-                    std::forward<Key>(key),
-                    std::forward<Args>(args)...);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-        || std::is_arithmetic<typename std::decay<Key>::type>::value)
-        && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = Command(cmd_name);
-
-    return _generic_command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Result, typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type {
-    auto r = command(cmd_name, std::forward<Key>(key), std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value)
-            && IsIter<typename LastType<Key, Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args)>(),
-                        std::forward<Key>(key),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last || std::next(first) == last) {
-        throw Error("command: invalid range");
-    }
-
-    const auto &key = *first;
-    ++first;
-
-    auto cmd = [&key](Connection &connection, Input first, Input last) {
-                        CmdArgs cmd_args;
-                        cmd_args.append(key);
-                        while (first != last) {
-                            cmd_args.append(*first);
-                            ++first;
-                        }
-                        connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long RedisCluster::del(Input first, Input last) {
-    range_check("DEL", first, last);
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::exists(Input first, Input last) {
-    range_check("EXISTS", first, last);
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool RedisCluster::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool RedisCluster::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-inline bool RedisCluster::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool RedisCluster::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void RedisCluster::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Input>
-long long RedisCluster::touch(Input first, Input last) {
-    range_check("TOUCH", first, last);
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::unlink(Input first, Input last) {
-    range_check("UNLINK", first, last);
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-template <typename Input>
-long long RedisCluster::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    range_check("BITOP", first, last);
-
-    auto reply = _command(cmd::bitop_range<Input>, destination, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::mget(Input first, Input last, Output output) {
-    range_check("MGET", first, last);
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void RedisCluster::mset(Input first, Input last) {
-    range_check("MSET", first, last);
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool RedisCluster::msetnx(Input first, Input last) {
-    range_check("MSETNX", first, last);
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void RedisCluster::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void RedisCluster::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first, Input last, long long timeout) {
-    range_check("BLPOP", first, last);
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first, Input last, long long timeout) {
-    range_check("BRPOP", first, last);
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString RedisCluster::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long RedisCluster::lpush(const StringView &key, Input first, Input last) {
-    range_check("LPUSH", first, last);
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long RedisCluster::rpush(const StringView &key, Input first, Input last) {
-    range_check("RPUSH", first, last);
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long RedisCluster::hdel(const StringView &key, Input first, Input last) {
-    range_check("HDEL", first, last);
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void RedisCluster::hmget(const StringView &key, Input first, Input last, Output output) {
-    range_check("HMGET", first, last);
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void RedisCluster::hmset(const StringView &key, Input first, Input last) {
-    range_check("HMSET", first, last);
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-auto RedisCluster::hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    long long>::type {
-    range_check("HSET", first, last);
-
-    auto reply = command(cmd::hset_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long RedisCluster::sadd(const StringView &key, Input first, Input last) {
-    range_check("SADD", first, last);
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sdiff(Input first, Input last, Output output) {
-    range_check("SDIFF", first, last);
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sdiffstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    range_check("SDIFFSTORE", first, last);
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sinter(Input first, Input last, Output output) {
-    range_check("SINTER", first, last);
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sinterstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    range_check("SINTERSTORE", first, last);
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::srem(const StringView &key, Input first, Input last) {
-    range_check("SREM", first, last);
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sunion(Input first, Input last, Output output) {
-    range_check("SUNION", first, last);
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sunionstore(const StringView &destination, Input first, Input last) {
-    range_check("SUNIONSTORE", first, last);
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto RedisCluster::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmax(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto RedisCluster::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmin(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long RedisCluster::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    range_check("ZADD", first, last);
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    range_check("ZINTERSTORE", first, last);
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::zrem(const StringView &key, Input first, Input last) {
-    range_check("ZREM", first, last);
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void RedisCluster::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long RedisCluster::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long RedisCluster::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    range_check("ZUNIONSTORE", first, last);
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool RedisCluster::pfadd(const StringView &key, Input first, Input last) {
-    range_check("PFADD", first, last);
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::pfcount(Input first, Input last) {
-    range_check("PFCOUNT", first, last);
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void RedisCluster::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    range_check("PFMERGE", first, last);
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long RedisCluster::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    range_check("GEOADD", first, last);
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geohash(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOHASH", first, last);
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geopos(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOPOS", first, last);
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result, typename Keys, typename Args>
-Result RedisCluster::eval(const StringView &script,
-                          Keys keys_first,
-                          Keys keys_last,
-                          Args args_first,
-                          Args args_last) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval<Keys, Args>, *keys_first, script, keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result RedisCluster::eval(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-    return eval<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void RedisCluster::eval(const StringView &script,
-                          Keys keys_first,
-                          Keys keys_last,
-                          Args args_first,
-                          Args args_last,
-                          Output output) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval<Keys, Args>,
-                            *keys_first,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    eval(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Result, typename Keys, typename Args>
-Result RedisCluster::evalsha(const StringView &script,
-                              Keys keys_first,
-                              Keys keys_last,
-                              Args args_first,
-                              Args args_last) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha<Keys, Args>, *keys_first, script,
-            keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result RedisCluster::evalsha(const StringView &script,
-                                std::initializer_list<StringView> keys,
-                                std::initializer_list<StringView> args) {
-    return evalsha<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                              Keys keys_first,
-                              Keys keys_last,
-                              Args args_first,
-                              Args args_last,
-                              Output output) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha<Keys, Args>,
-                            *keys_first,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args,
-                            Output output) {
-    evalsha(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long RedisCluster::xack(const StringView &key,
-                                const StringView &group,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            const StringView &id,
-                            Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            Input first,
-                            Input last,
-                            Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto RedisCluster::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer,
-                            Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first,
-                            Input last,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup, key, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = _command(cmd::xreadgroup_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup_block,
-                            key,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = _command(cmd::xreadgroup_block_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                                const StringView &end,
-                                const StringView &start,
-                                long long count,
-                                Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                ReplyUPtr>::type {
-    return command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                ReplyUPtr>::type {
-    auto k = std::to_string(std::forward<Key>(key));
-    return command(cmd, k, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::true_type, const StringView &key, Args &&...args) {
-    return _command(cmd, key, key, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::false_type, Input &&first, Args &&...args) {
-    return _range_command(cmd,
-                            std::is_convertible<
-                                typename std::decay<
-                                    decltype(*std::declval<Input>())>::type, StringView>(),
-                            std::forward<Input>(first),
-                            std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::true_type, Input input, Args &&...args) {
-    return _command(cmd, *input, input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::false_type, Input input, Args &&...args) {
-    return _command(cmd, std::get<0>(*input), input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, Connection &connection, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    return connection.recv();
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, const StringView &key, Args &&...args) {
-    for (auto idx = 0; idx < 2; ++idx) {
-        try {
-            auto pool = _pool.fetch(key);
-            assert(pool);
-            SafeConnection safe_connection(*pool);
-
-            return _command(cmd, safe_connection.connection(), std::forward<Args>(args)...);
-        } catch (const IoError &err) {
-            // When master is down, one of its replicas will be promoted to be the new master.
-            // If we try to send command to the old master, we'll get an *IoError*.
-            // In this case, we need to update the slots mapping.
-            _pool.update();
-        } catch (const ClosedError &err) {
-            // Node might be removed.
-            // 1. Get up-to-date slot mapping to check if the node still exists.
-            _pool.update();
-
-            // TODO:
-            // 2. If it's NOT exist, update slot mapping, and retry.
-            // 3. If it's still exist, that means the node is down, NOT removed, throw exception.
-        } catch (const MovedError &err) {
-            // Slot mapping has been changed, update it and try again.
-            _pool.update();
-        } catch (const AskError &err) {
-            auto pool = _pool.fetch(err.node());
-            assert(pool);
-            SafeConnection safe_connection(*pool);
-            auto &connection = safe_connection.connection();
-
-            // 1. send ASKING command.
-            _asking(connection);
-
-            // 2. resend last command.
-            try {
-                return _command(cmd, connection, std::forward<Args>(args)...);
-            } catch (const MovedError &err) {
-                throw Error("Slot migrating... ASKING node hasn't been set to IMPORTING state");
-            }
-        } // For other exceptions, just throw it.
-    }
-
-    // Possible failures:
-    // 1. Source node has already run 'CLUSTER SETSLOT xxx NODE xxx',
-    //    while the destination node has NOT run it.
-    //    In this case, client will be redirected by both nodes with MovedError.
-    // 2. Other failures...
-    throw Error("Failed to send command with key: " + std::string(key.data(), key.size()));
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/reply.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/reply.h
deleted file mode 100644
index d89174329..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/reply.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REPLY_H
-#define SEWENEW_REDISPLUSPLUS_REPLY_H
-
-#include <cassert>
-#include <string>
-#include <iterator>
-#include <memory>
-#include <functional>
-#include <tuple>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ReplyDeleter {
-    void operator()(redisReply *reply) const {
-        if (reply != nullptr) {
-            freeReplyObject(reply);
-        }
-    }
-};
-
-using ReplyUPtr = std::unique_ptr<redisReply, ReplyDeleter>;
-
-namespace reply {
-
-template <typename T>
-struct ParseTag {};
-
-template <typename T>
-inline T parse(redisReply &reply) {
-    return parse(ParseTag<T>(), reply);
-}
-
-template <typename T>
-T parse_leniently(redisReply &reply);
-
-void parse(ParseTag<void>, redisReply &reply);
-
-std::string parse(ParseTag<std::string>, redisReply &reply);
-
-long long parse(ParseTag<long long>, redisReply &reply);
-
-double parse(ParseTag<double>, redisReply &reply);
-
-bool parse(ParseTag<bool>, redisReply &reply);
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply);
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply);
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply);
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-inline Monostate parse(ParseTag<Monostate>, redisReply &) {
-    // Just ignore the reply
-    return {};
-}
-
-template <typename ...Args>
-Variant<Args...> parse(ParseTag<Variant<Args...>>, redisReply &reply);
-
-#endif
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output);
-
-inline bool is_error(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ERROR;
-}
-
-inline bool is_nil(redisReply &reply) {
-    return reply.type == REDIS_REPLY_NIL;
-}
-
-inline bool is_string(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STRING;
-}
-
-inline bool is_status(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STATUS;
-}
-
-inline bool is_integer(redisReply &reply) {
-    return reply.type == REDIS_REPLY_INTEGER;
-}
-
-inline bool is_array(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ARRAY;
-}
-
-std::string to_status(redisReply &reply);
-
-template <typename Output>
-void to_array(redisReply &reply, Output output);
-
-// Rewrite set reply to bool type
-void rewrite_set_reply(redisReply &reply);
-
-// Some command might return an empty array reply as a nil reply,
-// e.g. georadius, zpopmin, zpopmax. In this case, we rewrite the
-// reply to a nil reply.
-void rewrite_empty_array_reply(redisReply &reply);
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString>;
-
-}
-
-// Inline implementations.
-
-namespace reply {
-
-namespace detail {
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        auto *sub_reply = reply.element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null array element reply");
-        }
-
-        *output = parse<typename IterType<Output>::type>(*sub_reply);
-
-        ++output;
-    }
-}
-
-bool is_flat_array(redisReply &reply);
-
-template <typename Output>
-void to_flat_array(redisReply &reply, Output output) {
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    if (reply.elements % 2 != 0) {
-        throw ProtoError("Not string pair array reply");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; idx += 2) {
-        auto *key_reply = reply.element[idx];
-        auto *val_reply = reply.element[idx + 1];
-        if (key_reply == nullptr || val_reply == nullptr) {
-            throw ProtoError("Null string array reply");
-        }
-
-        using Pair = typename IterType<Output>::type;
-        using FirstType = typename std::decay<typename Pair::first_type>::type;
-        using SecondType = typename std::decay<typename Pair::second_type>::type;
-        *output = std::make_pair(parse<FirstType>(*key_reply),
-                                    parse<SecondType>(*val_reply));
-
-        ++output;
-    }
-}
-
-template <typename Output>
-void to_array(std::true_type, redisReply &reply, Output output) {
-    if (is_flat_array(reply)) {
-        to_flat_array(reply, output);
-    } else {
-        to_array(reply, output);
-    }
-}
-
-template <typename Output>
-void to_array(std::false_type, redisReply &reply, Output output) {
-    to_array(reply, output);
-}
-
-template <typename T>
-std::tuple<T> parse_tuple(redisReply **reply, std::size_t idx) {
-    assert(reply != nullptr);
-
-    auto *sub_reply = reply[idx];
-    if (sub_reply == nullptr) {
-        throw ProtoError("Null reply");
-    }
-
-    return std::make_tuple(parse<T>(*sub_reply));
-}
-
-template <typename T, typename ...Args>
-auto parse_tuple(redisReply **reply, std::size_t idx) ->
-    typename std::enable_if<sizeof...(Args) != 0, std::tuple<T, Args...>>::type {
-    assert(reply != nullptr);
-
-    return std::tuple_cat(parse_tuple<T>(reply, idx),
-                            parse_tuple<Args...>(reply, idx + 1));
-}
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-template <typename T>
-Variant<T> parse_variant(redisReply &reply) {
-    return parse<T>(reply);
-}
-
-template <typename T, typename ...Args>
-auto parse_variant(redisReply &reply) ->
-    typename std::enable_if<sizeof...(Args) != 0, Variant<T, Args...>>::type {
-    auto return_var = [](auto &&arg) {
-        return Variant<T, Args...>(std::move(arg));
-    };
-
-    try {
-        return std::visit(return_var, parse_variant<T>(reply));
-    } catch (const ProtoError &) {
-        return std::visit(return_var, parse_variant<Args...>(reply));
-    }
-}
-
-#endif
-
-}
-
-template <typename T>
-T parse_leniently(redisReply &reply) {
-    if (is_array(reply) && reply.elements == 1) {
-        if (reply.element == nullptr) {
-            throw ProtoError("null array reply");
-        }
-
-        auto *ele = reply.element[0];
-        if (ele != nullptr) {
-            return parse<T>(*ele);
-        } // else fall through
-    }
-
-    return parse<T>(reply);
-}
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply) {
-    if (reply::is_nil(reply)) {
-        // Because of a GCC bug, we cannot return {} for -std=c++17
-        // Refer to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86465
-#if defined REDIS_PLUS_PLUS_HAS_OPTIONAL
-        return std::nullopt;
-#else
-        return {};
-#endif
-    }
-
-    return Optional<T>(parse<T>(reply));
-}
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != 2) {
-        throw ProtoError("NOT key-value PAIR reply");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null PAIR reply");
-    }
-
-    auto *first = reply.element[0];
-    auto *second = reply.element[1];
-    if (first == nullptr || second == nullptr) {
-        throw ProtoError("Null pair reply");
-    }
-
-    return std::make_pair(parse<typename std::decay<T>::type>(*first),
-                            parse<typename std::decay<U>::type>(*second));
-}
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply) {
-    constexpr auto size = sizeof...(Args);
-
-    static_assert(size > 0, "DO NOT support parsing tuple with 0 element");
-
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != size) {
-        throw ProtoError("Expect tuple reply with " + std::to_string(size) + "elements");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null TUPLE reply");
-    }
-
-    return detail::parse_tuple<Args...>(reply.element, 0);
-}
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-template <typename ...Args>
-Variant<Args...> parse(ParseTag<Variant<Args...>>, redisReply &reply) {
-    return detail::parse_variant<Args...>(reply);
-}
-
-#endif
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::back_inserter(container));
-
-    return container;
-}
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::inserter(container, container.end()));
-
-    return container;
-}
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output) {
-    if (reply.elements != 2 || reply.element == nullptr) {
-        throw ProtoError("Invalid scan reply");
-    }
-
-    auto *cursor_reply = reply.element[0];
-    auto *data_reply = reply.element[1];
-    if (cursor_reply == nullptr || data_reply == nullptr) {
-        throw ProtoError("Invalid cursor reply or data reply");
-    }
-
-    auto cursor_str = reply::parse<std::string>(*cursor_reply);
-    long long new_cursor = 0;
-    try {
-        new_cursor = std::stoll(cursor_str);
-    } catch (const std::exception &e) {
-        throw ProtoError("Invalid cursor reply: " + cursor_str);
-    }
-
-    reply::to_array(*data_reply, output);
-
-    return new_cursor;
-}
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    detail::to_array(typename IsKvPairIter<Output>::type(), reply, output);
-}
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    if (!is_array(reply) || reply.elements != 4) {
-        throw ProtoError("expect array reply with 4 elements");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        if (reply.element[idx] == nullptr) {
-            throw ProtoError("null array reply");
-        }
-    }
-
-    auto num = parse<long long>(*(reply.element[0]));
-    auto start = parse<OptionalString>(*(reply.element[1]));
-    auto end = parse<OptionalString>(*(reply.element[2]));
-
-    auto &entry_reply = *(reply.element[3]);
-    if (!is_nil(entry_reply)) {
-        to_array(entry_reply, output);
-    }
-
-    return std::make_tuple(num, std::move(start), std::move(end));
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REPLY_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/sentinel.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/sentinel.h
deleted file mode 100644
index 6f998791e..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/sentinel.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SENTINEL_H
-#define SEWENEW_REDISPLUSPLUS_SENTINEL_H
-
-#include <string>
-#include <list>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include "connection.h"
-#include "shards.h"
-#include "reply.h"
-#include "tls.h"
-
-namespace sw {
-
-namespace redis {
-
-struct SentinelOptions {
-    std::vector<std::pair<std::string, int>> nodes;
-
-    std::string password;
-
-    bool keep_alive = true;
-
-    std::chrono::milliseconds connect_timeout{100};
-
-    std::chrono::milliseconds socket_timeout{100};
-
-    std::chrono::milliseconds retry_interval{100};
-
-    std::size_t max_retry = 2;
-
-    tls::TlsOptions tls;
-};
-
-class Sentinel {
-public:
-    explicit Sentinel(const SentinelOptions &sentinel_opts);
-
-    Sentinel(const Sentinel &) = delete;
-    Sentinel& operator=(const Sentinel &) = delete;
-
-    Sentinel(Sentinel &&) = delete;
-    Sentinel& operator=(Sentinel &&) = delete;
-
-    ~Sentinel() = default;
-
-private:
-    Connection master(const std::string &master_name, const ConnectionOptions &opts);
-
-    Connection slave(const std::string &master_name, const ConnectionOptions &opts);
-
-    class Iterator;
-
-    friend class SimpleSentinel;
-
-    std::list<ConnectionOptions> _parse_options(const SentinelOptions &opts) const;
-
-    Optional<Node> _get_master_addr_by_name(Connection &connection, const StringView &name);
-
-    std::vector<Node> _get_slave_addr_by_name(Connection &connection, const StringView &name);
-
-    Connection _connect_redis(const Node &node, ConnectionOptions opts);
-
-    Role _get_role(Connection &connection);
-
-    std::vector<Node> _parse_slave_info(redisReply &reply) const;
-
-    std::list<Connection> _healthy_sentinels;
-
-    std::list<ConnectionOptions> _broken_sentinels;
-
-    SentinelOptions _sentinel_opts;
-
-    std::mutex _mutex;
-};
-
-class SimpleSentinel {
-public:
-    SimpleSentinel(const std::shared_ptr<Sentinel> &sentinel,
-                    const std::string &master_name,
-                    Role role);
-
-    SimpleSentinel() = default;
-
-    SimpleSentinel(const SimpleSentinel &) = default;
-    SimpleSentinel& operator=(const SimpleSentinel &) = default;
-
-    SimpleSentinel(SimpleSentinel &&) = default;
-    SimpleSentinel& operator=(SimpleSentinel &&) = default;
-
-    ~SimpleSentinel() = default;
-
-    explicit operator bool() const {
-        return bool(_sentinel);
-    }
-
-    Connection create(const ConnectionOptions &opts);
-
-private:
-    std::shared_ptr<Sentinel> _sentinel;
-
-    std::string _master_name;
-
-    Role _role = Role::MASTER;
-};
-
-class StopIterError : public Error {
-public:
-    StopIterError() : Error("StopIterError") {}
-
-    StopIterError(const StopIterError &) = default;
-    StopIterError& operator=(const StopIterError &) = default;
-
-    StopIterError(StopIterError &&) = default;
-    StopIterError& operator=(StopIterError &&) = default;
-
-    virtual ~StopIterError() override = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SENTINEL_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/shards.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/shards.h
deleted file mode 100644
index 0d4cd97b3..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/shards.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_H
-
-#include <string>
-#include <map>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-using Slot = std::size_t;
-
-struct SlotRange {
-    Slot min;
-    Slot max;
-};
-
-inline bool operator<(const SlotRange &lhs, const SlotRange &rhs) {
-    return lhs.max < rhs.max;
-}
-
-struct Node {
-    std::string host;
-    int port;
-};
-
-inline bool operator==(const Node &lhs, const Node &rhs) {
-    return lhs.host == rhs.host && lhs.port == rhs.port;
-}
-
-struct NodeHash {
-    std::size_t operator()(const Node &node) const noexcept {
-        auto host_hash = std::hash<std::string>{}(node.host);
-        auto port_hash = std::hash<int>{}(node.port);
-        return host_hash ^ (port_hash << 1);
-    }
-};
-
-using Shards = std::map<SlotRange, Node>;
-
-class RedirectionError : public ReplyError {
-public:
-    RedirectionError(const std::string &msg);
-
-    RedirectionError(const RedirectionError &) = default;
-    RedirectionError& operator=(const RedirectionError &) = default;
-
-    RedirectionError(RedirectionError &&) = default;
-    RedirectionError& operator=(RedirectionError &&) = default;
-
-    virtual ~RedirectionError() override = default;
-
-    Slot slot() const {
-        return _slot;
-    }
-
-    const Node& node() const {
-        return _node;
-    }
-
-private:
-    std::pair<Slot, Node> _parse_error(const std::string &msg) const;
-
-    Slot _slot = 0;
-    Node _node;
-};
-
-class MovedError : public RedirectionError {
-public:
-    explicit MovedError(const std::string &msg) : RedirectionError(msg) {}
-
-    MovedError(const MovedError &) = default;
-    MovedError& operator=(const MovedError &) = default;
-
-    MovedError(MovedError &&) = default;
-    MovedError& operator=(MovedError &&) = default;
-
-    virtual ~MovedError() override = default;
-};
-
-class AskError : public RedirectionError {
-public:
-    explicit AskError(const std::string &msg) : RedirectionError(msg) {}
-
-    AskError(const AskError &) = default;
-    AskError& operator=(const AskError &) = default;
-
-    AskError(AskError &&) = default;
-    AskError& operator=(AskError &&) = default;
-
-    virtual ~AskError() override = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/shards_pool.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/shards_pool.h
deleted file mode 100644
index e6e9e4a52..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/shards_pool.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-
-#include <cassert>
-#include <unordered_map>
-#include <string>
-#include <random>
-#include <memory>
-#include "reply.h"
-#include "connection_pool.h"
-#include "shards.h"
-
-namespace sw {
-
-namespace redis {
-
-class ShardsPool {
-public:
-    ShardsPool() = default;
-
-    ShardsPool(const ShardsPool &that) = delete;
-    ShardsPool& operator=(const ShardsPool &that) = delete;
-
-    ShardsPool(ShardsPool &&that);
-    ShardsPool& operator=(ShardsPool &&that);
-
-    ~ShardsPool() = default;
-
-    ShardsPool(const ConnectionPoolOptions &pool_opts,
-                const ConnectionOptions &connection_opts,
-                Role role);
-
-    // Fetch a connection by key.
-    ConnectionPoolSPtr fetch(const StringView &key);
-
-    // Randomly pick a connection.
-    ConnectionPoolSPtr fetch();
-
-    // Fetch a connection by node.
-    ConnectionPoolSPtr fetch(const Node &node);
-
-    void update();
-
-    ConnectionOptions connection_options(const StringView &key);
-
-    ConnectionOptions connection_options();
-
-    Shards shards();
-
-private:
-    void _move(ShardsPool &&that);
-
-    void _init_pool(const Shards &shards);
-
-    Shards _cluster_slots(Connection &connection) const;
-
-    ReplyUPtr _cluster_slots_command(Connection &connection) const;
-
-    Shards _parse_reply(redisReply &reply) const;
-
-    Slot _parse_slot(redisReply *reply) const;
-
-    Node _parse_node(redisReply *reply) const;
-
-    std::pair<SlotRange, Node> _parse_slot_info(redisReply &reply) const;
-
-    // Get slot by key.
-    std::size_t _slot(const StringView &key) const;
-
-    // Randomly pick a slot.
-    std::size_t _slot() const;
-
-    // Get a random number between [min, max]
-    std::size_t _random(std::size_t min, std::size_t max) const;
-
-    ConnectionPoolSPtr& _get_pool(Slot slot);
-
-    ConnectionPoolSPtr _fetch(Slot slot);
-
-    ConnectionOptions _connection_options(Slot slot);
-
-    using NodeMap = std::unordered_map<Node, ConnectionPoolSPtr, NodeHash>;
-
-    NodeMap::iterator _add_node(const Node &node);
-
-    ConnectionPoolOptions _pool_opts;
-
-    ConnectionOptions _connection_opts;
-
-    Shards _shards;
-
-    NodeMap _pools;
-
-    std::mutex _mutex;
-
-    Role _role = Role::MASTER;
-
-    static const std::size_t SHARDS = 16383;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/subscriber.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/subscriber.h
deleted file mode 100644
index 8b7c5cfb4..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/subscriber.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-#define SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-
-#include <unordered_map>
-#include <string>
-#include <functional>
-#include "connection.h"
-#include "reply.h"
-#include "command.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-// @NOTE: Subscriber is NOT thread-safe.
-// Subscriber uses callbacks to handle messages. There are 6 kinds of messages:
-// 1) MESSAGE: message sent to a channel.
-// 2) PMESSAGE: message sent to channels of a given pattern.
-// 3) SUBSCRIBE: meta message sent when we successfully subscribe to a channel.
-// 4) UNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel.
-// 5) PSUBSCRIBE: meta message sent when we successfully subscribe to a channel pattern.
-// 6) PUNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel pattern.
-//
-// Use Subscriber::on_message(MsgCallback) to set the callback function for message of
-// *MESSAGE* type, and the callback interface is:
-// void (std::string channel, std::string msg)
-//
-// Use Subscriber::on_pmessage(PatternMsgCallback) to set the callback function for message of
-// *PMESSAGE* type, and the callback interface is:
-// void (std::string pattern, std::string channel, std::string msg)
-//
-// Messages of other types are called *META MESSAGE*, they have the same callback interface.
-// Use Subscriber::on_meta(MetaCallback) to set the callback function:
-// void (Subscriber::MsgType type, OptionalString channel, long long num)
-//
-// NOTE: If we haven't subscribe/psubscribe to any channel/pattern, and try to
-// unsubscribe/punsubscribe without any parameter, i.e. unsubscribe/punsubscribe all
-// channels/patterns, *channel* will be null. So the second parameter of meta callback
-// is of type *OptionalString*.
-//
-// All these callback interfaces pass std::string by value, and you can take their ownership
-// (i.e. std::move) safely.
-//
-// If you don't set callback for a specific kind of message, Subscriber::consume() will
-// receive the message, and ignore it, i.e. no callback will be called.
-class Subscriber {
-public:
-    Subscriber(const Subscriber &) = delete;
-    Subscriber& operator=(const Subscriber &) = delete;
-
-    Subscriber(Subscriber &&) = default;
-    Subscriber& operator=(Subscriber &&) = default;
-
-    ~Subscriber() = default;
-
-    enum class MsgType {
-        SUBSCRIBE,
-        UNSUBSCRIBE,
-        PSUBSCRIBE,
-        PUNSUBSCRIBE,
-        MESSAGE,
-        PMESSAGE
-    };
-
-    template <typename MsgCb>
-    void on_message(MsgCb msg_callback);
-
-    template <typename PMsgCb>
-    void on_pmessage(PMsgCb pmsg_callback);
-
-    template <typename MetaCb>
-    void on_meta(MetaCb meta_callback);
-
-    void subscribe(const StringView &channel);
-
-    template <typename Input>
-    void subscribe(Input first, Input last);
-
-    template <typename T>
-    void subscribe(std::initializer_list<T> channels) {
-        subscribe(channels.begin(), channels.end());
-    }
-
-    void unsubscribe();
-
-    void unsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void unsubscribe(Input first, Input last);
-
-    template <typename T>
-    void unsubscribe(std::initializer_list<T> channels) {
-        unsubscribe(channels.begin(), channels.end());
-    }
-
-    void psubscribe(const StringView &pattern);
-
-    template <typename Input>
-    void psubscribe(Input first, Input last);
-
-    template <typename T>
-    void psubscribe(std::initializer_list<T> channels) {
-        psubscribe(channels.begin(), channels.end());
-    }
-
-    void punsubscribe();
-
-    void punsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void punsubscribe(Input first, Input last);
-
-    template <typename T>
-    void punsubscribe(std::initializer_list<T> channels) {
-        punsubscribe(channels.begin(), channels.end());
-    }
-
-    void consume();
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    explicit Subscriber(Connection connection);
-
-    MsgType _msg_type(redisReply *reply) const;
-
-    void _check_connection();
-
-    void _handle_message(redisReply &reply);
-
-    void _handle_pmessage(redisReply &reply);
-
-    void _handle_meta(MsgType type, redisReply &reply);
-
-    using MsgCallback = std::function<void (std::string channel, std::string msg)>;
-
-    using PatternMsgCallback = std::function<void (std::string pattern,
-                                                    std::string channel,
-                                                    std::string msg)>;
-
-    using MetaCallback = std::function<void (MsgType type,
-                                                OptionalString channel,
-                                                long long num)>;
-
-    using TypeIndex = std::unordered_map<std::string, MsgType>;
-    static const TypeIndex _msg_type_index;
-
-    Connection _connection;
-
-    MsgCallback _msg_callback = nullptr;
-
-    PatternMsgCallback _pmsg_callback = nullptr;
-
-    MetaCallback _meta_callback = nullptr;
-};
-
-template <typename MsgCb>
-void Subscriber::on_message(MsgCb msg_callback) {
-    _msg_callback = msg_callback;
-}
-
-template <typename PMsgCb>
-void Subscriber::on_pmessage(PMsgCb pmsg_callback) {
-    _pmsg_callback = pmsg_callback;
-}
-
-template <typename MetaCb>
-void Subscriber::on_meta(MetaCb meta_callback) {
-    _meta_callback = meta_callback;
-}
-
-template <typename Input>
-void Subscriber::subscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::subscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::unsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::unsubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::psubscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::psubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::punsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::punsubscribe_range(_connection, first, last);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/tls.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/tls.h
deleted file mode 100644
index 0f2303db7..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/tls.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2020 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_NO_TLS_H
-#define SEWENEW_REDISPLUSPLUS_NO_TLS_H
-
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace tls {
-
-struct TlsOptions {};
-
-struct TlsContextUPtr {};
-
-inline TlsContextUPtr secure_connection(redisContext &/*ctx*/, const TlsOptions &/*opts*/) {
-    // Do nothing
-    return {};
-}
-
-inline bool enabled(const TlsOptions &/*opts*/) {
-    return false;
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_NO_TLS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/transaction.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/transaction.h
deleted file mode 100644
index f19f24889..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/transaction.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-#define SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class TransactionImpl {
-public:
-    explicit TransactionImpl(bool piped) : _piped(piped) {}
-
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args);
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t cmd_num);
-
-private:
-    void _open_transaction(Connection &connection);
-
-    void _close_transaction();
-
-    void _get_queued_reply(Connection &connection);
-
-    void _get_queued_replies(Connection &connection, std::size_t cmd_num);
-
-    std::vector<ReplyUPtr> _exec(Connection &connection);
-
-    void _discard(Connection &connection);
-
-    bool _in_transaction = false;
-
-    bool _piped;
-};
-
-template <typename Cmd, typename ...Args>
-void TransactionImpl::command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    if (!_in_transaction) {
-        _open_transaction(connection);
-    }
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    if (!_piped) {
-        _get_queued_reply(connection);
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TRANSACTION_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/utils.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/utils.h
deleted file mode 100644
index f77f796d6..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/include/sw/redis++/utils.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_UTILS_H
-
-#include <cstring>
-#include <string>
-#include <type_traits>
-#include "cxx_utils.h"
-
-namespace sw {
-
-namespace redis {
-
-using OptionalString = Optional<std::string>;
-
-using OptionalLongLong = Optional<long long>;
-
-using OptionalDouble = Optional<double>;
-
-using OptionalStringPair = Optional<std::pair<std::string, std::string>>;
-
-template <typename ...>
-struct IsKvPair : std::false_type {};
-
-template <typename T, typename U>
-struct IsKvPair<std::pair<T, U>> : std::true_type {};
-
-template <typename ...>
-using Void = void;
-
-template <typename T, typename U = Void<>>
-struct IsInserter : std::false_type {};
-
-template <typename T>
-//struct IsInserter<T, Void<typename T::container_type>> : std::true_type {};
-struct IsInserter<T,
-    typename std::enable_if<!std::is_void<typename T::container_type>::value>::type>
-        : std::true_type {};
-
-template <typename Iter, typename T = Void<>>
-struct IterType {
-    using type = typename std::iterator_traits<Iter>::value_type;
-};
-
-template <typename Iter>
-//struct IterType<Iter, Void<typename Iter::container_type>> {
-struct IterType<Iter,
-    //typename std::enable_if<std::is_void<typename Iter::value_type>::value>::type> {
-    typename std::enable_if<IsInserter<Iter>::value>::type> {
-    using type = typename std::decay<typename Iter::container_type::value_type>::type;
-};
-
-template <typename Iter, typename T = Void<>>
-struct IsIter : std::false_type {};
-
-template <typename Iter>
-struct IsIter<Iter, typename std::enable_if<IsInserter<Iter>::value>::type> : std::true_type {};
-
-template <typename Iter>
-//struct IsIter<Iter, Void<typename std::iterator_traits<Iter>::iterator_category>>
-struct IsIter<Iter,
-    typename std::enable_if<!std::is_void<
-        typename std::iterator_traits<Iter>::value_type>::value>::type>
-            : std::integral_constant<bool, !std::is_convertible<Iter, StringView>::value> {};
-
-template <typename T>
-struct IsKvPairIter : IsKvPair<typename IterType<T>::type> {};
-
-template <typename T, typename Tuple>
-struct TupleWithType : std::false_type {};
-
-template <typename T>
-struct TupleWithType<T, std::tuple<>> : std::false_type {};
-
-template <typename T, typename U, typename ...Args>
-struct TupleWithType<T, std::tuple<U, Args...>> : TupleWithType<T, std::tuple<Args...>> {};
-
-template <typename T, typename ...Args>
-struct TupleWithType<T, std::tuple<T, Args...>> : std::true_type {};
-
-template <std::size_t ...Is>
-struct IndexSequence {};
-
-template <std::size_t I, std::size_t ...Is>
-struct MakeIndexSequence : MakeIndexSequence<I - 1, I - 1, Is...> {};
-
-template <std::size_t ...Is>
-struct MakeIndexSequence<0, Is...> : IndexSequence<Is...> {};
-
-// NthType and NthValue are taken from
-// https://stackoverflow.com/questions/14261183
-template <std::size_t I, typename ...Args>
-struct NthType {};
-
-template <typename Arg, typename ...Args>
-struct NthType<0, Arg, Args...> {
-    using type = Arg;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-struct NthType<I, Arg, Args...> {
-    using type = typename NthType<I - 1, Args...>::type;
-};
-
-template <typename ...Args>
-struct LastType {
-    using type = typename NthType<sizeof...(Args) - 1, Args...>::type;
-};
-
-struct InvalidLastType {};
-
-template <>
-struct LastType<> {
-    using type = InvalidLastType;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&arg, Args &&...)
-    -> typename std::enable_if<(I == 0), decltype(std::forward<Arg>(arg))>::type {
-    return std::forward<Arg>(arg);
-}
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&, Args &&...args)
-    -> typename std::enable_if<(I > 0),
-            decltype(std::forward<typename NthType<I, Arg, Args...>::type>(
-                    std::declval<typename NthType<I, Arg, Args...>::type>()))>::type {
-    return std::forward<typename NthType<I, Arg, Args...>::type>(
-            NthValue<I - 1>(std::forward<Args>(args)...));
-}
-
-template <typename ...Args>
-auto LastValue(Args &&...args)
-    -> decltype(std::forward<typename LastType<Args...>::type>(
-            std::declval<typename LastType<Args...>::type>())) {
-    return std::forward<typename LastType<Args...>::type>(
-            NthValue<sizeof...(Args) - 1>(std::forward<Args>(args)...));
-}
-
-template <typename T, typename = Void<>>
-struct HasPushBack : std::false_type {};
-
-template <typename T>
-struct HasPushBack<T,
-    typename std::enable_if<
-        std::is_void<decltype(
-            std::declval<T>().push_back(std::declval<typename T::value_type>())
-                )>::value>::type> : std::true_type {};
-
-template <typename T, typename = Void<>>
-struct HasInsert : std::false_type {};
-
-template <typename T>
-struct HasInsert<T,
-    typename std::enable_if<
-        std::is_same<
-            decltype(std::declval<T>().insert(std::declval<typename T::const_iterator>(),
-                                                std::declval<typename T::value_type>())),
-            typename T::iterator>::value>::type> : std::true_type {};
-
-template <typename T>
-struct IsSequenceContainer
-    : std::integral_constant<bool,
-        HasPushBack<T>::value
-            && !std::is_same<typename std::decay<T>::type, std::string>::value> {};
-
-template <typename T>
-struct IsAssociativeContainer
-    : std::integral_constant<bool,
-        HasInsert<T>::value && !HasPushBack<T>::value> {};
-
-uint16_t crc16(const char *buf, int len);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/lib/libredis++.a b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/lib/libredis++.a
deleted file mode 100644
index 3f398e48d..000000000
Binary files a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/lib/libredis++.a and /dev/null differ
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/lib/pkgconfig/redis++.pc b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/lib/pkgconfig/redis++.pc
deleted file mode 100644
index c16ee5f9f..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/lib/pkgconfig/redis++.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/home/grant/dev/ZeroTierOne/ext/redis-plus-plus-1.3.3/install/ubuntu22.04
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: redis++
-Description: This is a Redis client, based on hiredis and written in C++11. It supports scritpting, pub/sub, pipeline, transaction, Redis Cluster, Redis Sentinel, connection pool, ACL, SSL and thread safety.
-Version: 1.3.3
-URL: https://github.com/sewenew/redis-plus-plus
-Requires: hiredis
-Cflags: -I${includedir}
-Libs: -L${libdir} -lredis++
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-config-version.cmake b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-config-version.cmake
deleted file mode 100644
index ef4be219f..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-config-version.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# This is a basic version file for the Config-mode of find_package().
-# It is used by write_basic_package_version_file() as input file for configure_file()
-# to create a version-file which can be installed along a config.cmake file.
-#
-# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-# the requested version string are exactly the same and it sets
-# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
-# The variable CVF_VERSION must be set before calling configure_file().
-
-set(PACKAGE_VERSION "1.3.3")
-
-if (PACKAGE_FIND_VERSION_RANGE)
-  # Package version must be in the requested version range
-  if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
-      OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
-        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
-    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-  else()
-    set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  endif()
-else()
-  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
-    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-  else()
-    set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-      set(PACKAGE_VERSION_EXACT TRUE)
-    endif()
-  endif()
-endif()
-
-
-# if the installed project requested no architecture check, don't perform the check
-if("FALSE")
-  return()
-endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
-  return()
-endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
-  math(EXPR installedBits "8 * 8")
-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-config.cmake b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-config.cmake
deleted file mode 100644
index 580d98613..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-config.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-
-####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
-####### Any changes to this file will be overwritten by the next CMake run ####
-####### The input file was redis++-config.cmake.in                            ########
-
-get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
-
-macro(set_and_check _var _file)
-  set(${_var} "${_file}")
-  if(NOT EXISTS "${_file}")
-    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif()
-endmacro()
-
-macro(check_required_components _NAME)
-  foreach(comp ${${_NAME}_FIND_COMPONENTS})
-    if(NOT ${_NAME}_${comp}_FOUND)
-      if(${_NAME}_FIND_REQUIRED_${comp})
-        set(${_NAME}_FOUND FALSE)
-      endif()
-    endif()
-  endforeach()
-endmacro()
-
-####################################################################################
-
-include(CMakeFindDependencyMacro)
-
-string(REPLACE "," ";" REDIS_PLUS_PLUS_DEPENDS_LIST hiredis)
-foreach(REDIS_PLUS_PLUS_DEP ${REDIS_PLUS_PLUS_DEPENDS_LIST})
-    find_dependency(${REDIS_PLUS_PLUS_DEP} REQUIRED)
-endforeach()
-
-include("${CMAKE_CURRENT_LIST_DIR}/redis++-targets.cmake")
-
-check_required_components(redis++)
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-targets-release.cmake b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-targets-release.cmake
deleted file mode 100644
index b790b539f..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-targets-release.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "Release".
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Import target "redis++::redis++_static" for configuration "Release"
-set_property(TARGET redis++::redis++_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-set_target_properties(redis++::redis++_static PROPERTIES
-  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libredis++.a"
-  )
-
-list(APPEND _IMPORT_CHECK_TARGETS redis++::redis++_static )
-list(APPEND _IMPORT_CHECK_FILES_FOR_redis++::redis++_static "${_IMPORT_PREFIX}/lib/libredis++.a" )
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-targets.cmake b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-targets.cmake
deleted file mode 100644
index 9e87d927e..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/amd64/share/cmake/redis++/redis++-targets.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-# Generated by CMake
-
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
-   message(FATAL_ERROR "CMake >= 2.6.0 required")
-endif()
-cmake_policy(PUSH)
-cmake_policy(VERSION 2.6...3.20)
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Protect against multiple inclusion, which would fail when already imported targets are added once more.
-set(_targetsDefined)
-set(_targetsNotDefined)
-set(_expectedTargets)
-foreach(_expectedTarget redis++::redis++_static)
-  list(APPEND _expectedTargets ${_expectedTarget})
-  if(NOT TARGET ${_expectedTarget})
-    list(APPEND _targetsNotDefined ${_expectedTarget})
-  endif()
-  if(TARGET ${_expectedTarget})
-    list(APPEND _targetsDefined ${_expectedTarget})
-  endif()
-endforeach()
-if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
-  unset(_targetsDefined)
-  unset(_targetsNotDefined)
-  unset(_expectedTargets)
-  set(CMAKE_IMPORT_FILE_VERSION)
-  cmake_policy(POP)
-  return()
-endif()
-if(NOT "${_targetsDefined}" STREQUAL "")
-  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
-endif()
-unset(_targetsDefined)
-unset(_targetsNotDefined)
-unset(_expectedTargets)
-
-
-# Compute the installation prefix relative to this file.
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-if(_IMPORT_PREFIX STREQUAL "/")
-  set(_IMPORT_PREFIX "")
-endif()
-
-# Create imported target redis++::redis++_static
-add_library(redis++::redis++_static STATIC IMPORTED)
-
-set_target_properties(redis++::redis++_static PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
-)
-
-# Load information for each installed configuration.
-get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-file(GLOB CONFIG_FILES "${_DIR}/redis++-targets-*.cmake")
-foreach(f ${CONFIG_FILES})
-  include(${f})
-endforeach()
-
-# Cleanup temporary variables.
-set(_IMPORT_PREFIX)
-
-# Loop over all imported files and verify that they actually exist
-foreach(target ${_IMPORT_CHECK_TARGETS} )
-  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
-    if(NOT EXISTS "${file}" )
-      message(FATAL_ERROR "The imported target \"${target}\" references the file
-   \"${file}\"
-but this file does not exist.  Possible reasons include:
-* The file was deleted, renamed, or moved to another location.
-* An install or uninstall procedure did not complete successfully.
-* The installation package was faulty and contained
-   \"${CMAKE_CURRENT_LIST_FILE}\"
-but not all the files it references.
-")
-    endif()
-  endforeach()
-  unset(_IMPORT_CHECK_FILES_FOR_${target})
-endforeach()
-unset(_IMPORT_CHECK_TARGETS)
-
-# This file does not depend on other imported targets which have
-# been exported from the same project but in a separate export set.
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-cmake_policy(POP)
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/cmd_formatter.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/cmd_formatter.h
deleted file mode 100644
index 85efdf347..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/cmd_formatter.h
+++ /dev/null
@@ -1,775 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
-#define SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
-
-#include <hiredis/hiredis.h>
-#include "command_options.h"
-#include "command_args.h"
-#include "command.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class FormattedCommand {
-public:
-    FormattedCommand(char *data, int len) : _data(data), _size(len) {
-        if (data == nullptr || len < 0) {
-            throw Error("failed to format command");
-        }
-    }
-
-    FormattedCommand(const FormattedCommand &) = delete;
-    FormattedCommand& operator=(const FormattedCommand &) = delete;
-
-    FormattedCommand(FormattedCommand &&that) noexcept {
-        _move(std::move(that));
-    }
-
-    FormattedCommand& operator=(FormattedCommand &&that) noexcept {
-        if (this != &that) {
-            _move(std::move(that));
-        }
-
-        return *this;
-    }
-
-    ~FormattedCommand() noexcept {
-        if (_data != nullptr) {
-            redisFreeCommand(_data);
-        }
-    }
-
-    const char* data() const noexcept {
-        return _data;
-    }
-
-    int size() const noexcept {
-        return _size;
-    }
-
-private:
-    void _move(FormattedCommand &&that) noexcept {
-        _data = that._data;
-        _size = that._size;
-        that._data = nullptr;
-        that._size = 0;
-    }
-
-    char *_data = nullptr;
-    int _size = 0;
-};
-
-namespace fmt {
-
-template <typename ...Args>
-FormattedCommand format_cmd(const char *format, Args &&...args) {
-    char *data = nullptr;
-    auto len = redisFormatCommand(&data, format, std::forward<Args>(args)...);
-
-    return FormattedCommand(data, len);
-}
-
-inline FormattedCommand format_cmd(int argc, const char **argv, const std::size_t *argv_len) {
-    char *data = nullptr;
-    auto len = redisFormatCommandArgv(&data, argc, argv, argv_len);
-
-    return FormattedCommand(data, len);
-}
-
-inline FormattedCommand format_cmd(CmdArgs &args) {
-    char *data = nullptr;
-    auto len = redisFormatCommandArgv(&data, args.size(), args.argv(), args.argv_len());
-
-    return FormattedCommand(data, len);
-}
-
-struct SetResultParser {
-    bool operator()(redisReply &reply) const {
-        sw::redis::reply::rewrite_set_reply(reply);
-        return sw::redis::reply::parse<bool>(reply);
-    }
-};
-
-// CONNECTION commands.
-
-inline FormattedCommand echo(const StringView &msg) {
-    return format_cmd("ECHO %b", msg.data(), msg.size());
-}
-
-inline FormattedCommand ping() {
-    return format_cmd("PING");
-}
-
-inline FormattedCommand ping(const StringView &msg) {
-    return format_cmd("PING %b", msg.data(), msg.size());
-}
-
-inline FormattedCommand del(const StringView &key) {
-    return format_cmd("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand del_range(Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand exists(const StringView &key) {
-    return format_cmd("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand exists_range(Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("EXPIRE %b %lld", key.data(), key.size(), timeout.count());
-}
-
-inline FormattedCommand expireat(const StringView &key,
-        const std::chrono::time_point<std::chrono::system_clock,
-                                        std::chrono::seconds> &tp) {
-    return format_cmd("EXPIREAT %b %lld", key.data(), key.size(), tp.time_since_epoch().count());
-}
-
-inline FormattedCommand pexpire(const StringView &key,
-        const std::chrono::milliseconds &timeout) {
-    return format_cmd("PEXPIRE %b %lld", key.data(), key.size(), timeout.count());
-}
-
-inline FormattedCommand pexpireat(const StringView &key,
-        const std::chrono::time_point<std::chrono::system_clock,
-                                            std::chrono::milliseconds> &tp) {
-    return format_cmd("PEXPIREAT %b %lld", key.data(), key.size(), tp.time_since_epoch().count());
-}
-
-inline FormattedCommand pttl(const StringView &key) {
-    return format_cmd("PTTL %b", key.data(), key.size());
-}
-
-inline FormattedCommand rename(const StringView &key, const StringView &newkey) {
-    return format_cmd("RENAME %b %b", key.data(), key.size(), newkey.data(), newkey.size());
-}
-
-inline FormattedCommand renamenx(const StringView &key, const StringView &newkey) {
-    return format_cmd("RENAMENX %b %b", key.data(), key.size(), newkey.data(), newkey.size());
-}
-
-inline FormattedCommand ttl(const StringView &key) {
-    return format_cmd("TTL %b", key.data(), key.size());
-}
-
-inline FormattedCommand unlink(const StringView &key) {
-    return format_cmd("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand unlink_range(Input first, Input last) {
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// STRING commands.
-
-inline FormattedCommand get(const StringView &key) {
-    return format_cmd("GET %b", key.data(), key.size());
-}
-
-inline FormattedCommand incr(const StringView &key) {
-    return format_cmd("INCR %b", key.data(), key.size());
-}
-
-inline FormattedCommand incrby(const StringView &key, long long increment) {
-    return format_cmd("INCRBY %b %lld", key.data(), key.size(), increment);
-}
-
-inline FormattedCommand incrbyfloat(const StringView &key, double increment) {
-    return format_cmd("INCRBYFLOAT %b %f", key.data(), key.size(), increment);
-}
-
-template <typename Input>
-FormattedCommand mget(Input first, Input last) {
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand mset(Input first, Input last) {
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand msetnx(Input first, Input last) {
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand set(const StringView &key,
-        const StringView &val,
-        const std::chrono::milliseconds &ttl,
-        UpdateType type) {
-    CmdArgs args;
-    args << "SET" << key << val;
-
-    if (ttl > std::chrono::milliseconds(0)) {
-        args << "PX" << ttl.count();
-    }
-
-    cmd::detail::set_update_type(args, type);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand strlen(const StringView &key) {
-    return format_cmd("STRLEN %b", key.data(), key.size());
-}
-
-inline FormattedCommand blpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BLPOP %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand blpop_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand brpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BRPOP %b %lld", key.data(), key.size(), timeout.count());
-}
-
-
-template <typename Input>
-FormattedCommand brpop_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand brpoplpush(const StringView &source,
-        const StringView &destination,
-        const std::chrono::seconds &timeout) {
-    return format_cmd("BRPOPLPUSH %b %b %lld",
-            source.data(), source.size(),
-            destination.data(), destination.size(),
-            timeout.count());
-}
-
-inline FormattedCommand llen(const StringView &key) {
-    return format_cmd("LLEN %b", key.data(), key.size());
-}
-
-inline FormattedCommand lpop(const StringView &key) {
-    return format_cmd("LPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand lpush(const StringView &key, const StringView &val) {
-    return format_cmd("LPUSH %b %b", key.data(), key.size(), val.data(), val.size());
-}
-
-template <typename Input>
-FormattedCommand lpush_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand lrange(const StringView &key, long long start, long long stop) {
-    return format_cmd("LRANGE %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-inline FormattedCommand lrem(const StringView &key, long long count, const StringView &val) {
-    return format_cmd("LREM %b %lld %b", key.data(), key.size(), count, val.data(), val.size());
-}
-
-inline FormattedCommand ltrim(const StringView &key, long long start, long long stop) {
-    return format_cmd("LTRIM %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-inline FormattedCommand rpop(const StringView &key) {
-    return format_cmd("RPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand rpoplpush(const StringView &source, const StringView &destination) {
-    return format_cmd("RPOPLPUSH %b %b",
-            source.data(), source.size(),
-            destination.data(), destination.size());
-}
-
-inline FormattedCommand rpush(const StringView &key, const StringView &val) {
-    return format_cmd("RPUSH %b %b", key.data(), key.size(), val.data(), val.size());
-}
-
-template <typename Input>
-FormattedCommand rpush_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// HASH commands.
-
-inline FormattedCommand hdel(const StringView &key, const StringView &field) {
-    return format_cmd("HDEL %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-template <typename Input>
-FormattedCommand hdel_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hexists(const StringView &key, const StringView &field) {
-    return format_cmd("HEXISTS %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-inline FormattedCommand hget(const StringView &key, const StringView &field) {
-    return format_cmd("HGET %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-inline FormattedCommand hgetall(const StringView &key) {
-    return format_cmd("HGETALL %b", key.data(), key.size());
-}
-
-inline FormattedCommand hincrby(const StringView &key,
-        const StringView &field,
-        long long increment) {
-    return format_cmd("HINCRBY %b %b %lld",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            increment);
-}
-
-inline FormattedCommand hincrbyfloat(const StringView &key,
-        const StringView &field,
-        double increment) {
-    return format_cmd("HINCRBYFLOAT %b %b %f",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            increment);
-}
-
-inline FormattedCommand hkeys(const StringView &key) {
-    return format_cmd("HKEYS %b", key.data(), key.size());
-}
-
-inline FormattedCommand hlen(const StringView &key) {
-    return format_cmd("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand hmget(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand hmset(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hset(const StringView &key,
-        const StringView &field,
-        const StringView &val) {
-    return format_cmd("HSET %b %b %b",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            val.data(), val.size());
-}
-
-template <typename Input>
-auto hset_range(const StringView &key,
-        Input first,
-        Input last)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                FormattedCommand>::type {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HSET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hvals(const StringView &key) {
-    return format_cmd("HVALS %b", key.data(), key.size());
-}
-
-// SET commands.
-
-inline FormattedCommand sadd(const StringView &key, const StringView &member) {
-    return format_cmd("SADD %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand sadd_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand scard(const StringView &key) {
-    return format_cmd("SCARD %b", key.data(), key.size());
-}
-
-inline FormattedCommand sismember(const StringView &key, const StringView &member) {
-    return format_cmd("SISMEMBER %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand smembers(const StringView &key) {
-    return format_cmd("SMEMBERS %b", key.data(), key.size());
-}
-
-inline FormattedCommand spop(const StringView &key) {
-    return format_cmd("SPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand spop(const StringView &key, long long count) {
-    return format_cmd("SPOP %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand srem(const StringView &key, const StringView &member) {
-    return format_cmd("SREM %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand srem_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// SORTED SET commands.
-
-inline FormattedCommand bzpopmax(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BZPOPMAX %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand bzpopmax_range(Input first,
-        Input last,
-        const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand bzpopmin(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BZPOPMIN %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand bzpopmin_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand zadd(const StringView &key,
-        const StringView &member,
-        double score,
-        UpdateType type,
-        bool changed) {
-    CmdArgs args;
-    args << "ZADD" << key;
-
-    cmd::detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    args << score << member;
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand zadd_range(const StringView &key,
-        Input first,
-        Input last,
-        UpdateType type,
-        bool changed) {
-    CmdArgs args;
-    args << "ZADD" << key;
-
-    cmd::detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand zcard(const StringView &key) {
-    return format_cmd("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-FormattedCommand zcount(const StringView &key, const Interval &interval) {
-    return format_cmd("ZCOUNT %b %s %s",
-            key.data(), key.size(),
-            interval.min().c_str(),
-            interval.max().c_str());
-}
-
-inline FormattedCommand zincrby(const StringView &key,
-        double increment,
-        const StringView &member) {
-    return format_cmd("ZINCRBY %b %f %b",
-            key.data(), key.size(),
-            increment,
-            member.data(), member.size());
-}
-
-template <typename Interval>
-FormattedCommand zlexcount(const StringView &key,
-        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline FormattedCommand zpopmax(const StringView &key) {
-    return format_cmd("ZPOPMAX %b", key.data(), key.size());
-}
-
-inline FormattedCommand zpopmax(const StringView &key, long long count) {
-    return format_cmd("ZPOPMAX %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand zpopmin(const StringView &key) {
-    return format_cmd("ZPOPMIN %b", key.data(), key.size());
-}
-
-inline FormattedCommand zpopmin_count(const StringView &key, long long count) {
-    return format_cmd("ZPOPMIN %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand zrange(const StringView &key, long long start, long long stop) {
-    return format_cmd("ZRANGE %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-template <typename Interval>
-FormattedCommand zrangebylex(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-FormattedCommand zrangebyscore(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-inline FormattedCommand zrank(const StringView &key, const StringView &member) {
-    return format_cmd("ZRANK %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand zrem(const StringView &key, const StringView &member) {
-    return format_cmd("ZREM %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand zrem_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Interval>
-FormattedCommand zremrangebylex(const StringView &key, const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline FormattedCommand zremrangebyrank(const StringView &key, long long start, long long stop) {
-    return format_cmd("ZREMRANGEBYRANK %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-template <typename Interval>
-FormattedCommand zremrangebyscore(const StringView &key,
-        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-template <typename Interval>
-FormattedCommand zrevrangebylex(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-inline FormattedCommand zrevrank(const StringView &key, const StringView &member) {
-    return format_cmd("ZREVRANK %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand zscore(const StringView &key, const StringView &member) {
-    return format_cmd("ZSCORE %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-// SCRIPTING commands.
-template <typename Keys, typename Args>
-FormattedCommand eval(const StringView &script,
-        Keys keys_first,
-        Keys keys_last,
-        Args args_first,
-        Args args_last) {
-    CmdArgs args;
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    args << "EVAL" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    return format_cmd(args);
-}
-
-template <typename Keys, typename Args>
-FormattedCommand evalsha(const StringView &script,
-        Keys keys_first,
-        Keys keys_last,
-        Args args_first,
-        Args args_last) {
-    CmdArgs args;
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    args << "EVALSHA" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    return format_cmd(args);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command.h
deleted file mode 100644
index 81857dd9b..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command.h
+++ /dev/null
@@ -1,2271 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_H
-
-#include <cassert>
-#include <ctime>
-#include <string>
-#include <chrono>
-#include "connection.h"
-#include "command_options.h"
-#include "command_args.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-// CONNECTION command.
-inline void auth(Connection &connection, const StringView &password) {
-    connection.send("AUTH %b", password.data(), password.size());
-}
-
-inline void auth(Connection &connection, const StringView &user, const StringView &password) {
-    connection.send("AUTH %b %b",
-                    user.data(), user.size(),
-                    password.data(), password.size());
-}
-
-inline void echo(Connection &connection, const StringView &msg) {
-    connection.send("ECHO %b", msg.data(), msg.size());
-}
-
-inline void ping(Connection &connection) {
-    connection.send("PING");
-}
-
-inline void quit(Connection &connection) {
-    connection.send("QUIT");
-}
-
-inline void ping(Connection &connection, const StringView &msg) {
-    // If *msg* is empty, Redis returns am empty reply of REDIS_REPLY_STRING type.
-    connection.send("PING %b", msg.data(), msg.size());
-}
-
-inline void select(Connection &connection, long long idx) {
-    connection.send("SELECT %lld", idx);
-}
-
-inline void swapdb(Connection &connection, long long idx1, long long idx2) {
-    connection.send("SWAPDB %lld %lld", idx1, idx2);
-}
-
-// SERVER commands.
-
-inline void bgrewriteaof(Connection &connection) {
-    connection.send("BGREWRITEAOF");
-}
-
-inline void bgsave(Connection &connection) {
-    connection.send("BGSAVE");
-}
-
-inline void dbsize(Connection &connection) {
-    connection.send("DBSIZE");
-}
-
-inline void flushall(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHALL ASYNC");
-    } else {
-        connection.send("FLUSHALL");
-    }
-}
-
-inline void flushdb(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHDB ASYNC");
-    } else {
-        connection.send("FLUSHDB");
-    }
-}
-
-inline void info(Connection &connection) {
-    connection.send("INFO");
-}
-
-inline void info(Connection &connection, const StringView &section) {
-    connection.send("INFO %b", section.data(), section.size());
-}
-
-inline void lastsave(Connection &connection) {
-    connection.send("LASTSAVE");
-}
-
-inline void save(Connection &connection) {
-    connection.send("SAVE");
-}
-
-// KEY commands.
-
-inline void del(Connection &connection, const StringView &key) {
-    connection.send("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void del_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void dump(Connection &connection, const StringView &key) {
-    connection.send("DUMP %b", key.data(), key.size());
-}
-
-inline void exists(Connection &connection, const StringView &key) {
-    connection.send("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void expire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("EXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void expireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("EXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void keys(Connection &connection, const StringView &pattern) {
-    connection.send("KEYS %b", pattern.data(), pattern.size());
-}
-
-inline void move(Connection &connection, const StringView &key, long long db) {
-    connection.send("MOVE %b %lld",
-                    key.data(), key.size(),
-                    db);
-}
-
-inline void persist(Connection &connection, const StringView &key) {
-    connection.send("PERSIST %b", key.data(), key.size());
-}
-
-inline void pexpire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("PEXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void pexpireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("PEXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void pttl(Connection &connection, const StringView &key) {
-    connection.send("PTTL %b", key.data(), key.size());
-}
-
-inline void randomkey(Connection &connection) {
-    connection.send("RANDOMKEY");
-}
-
-inline void rename(Connection &connection,
-                    const StringView &key,
-                    const StringView &newkey) {
-    connection.send("RENAME %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-inline void renamenx(Connection &connection,
-                        const StringView &key,
-                        const StringView &newkey) {
-    connection.send("RENAMENX %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-void restore(Connection &connection,
-                const StringView &key,
-                const StringView &val,
-                long long ttl,
-                bool replace);
-
-inline void scan(Connection &connection,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SCAN %lld MATCH %b COUNT %lld",
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void touch(Connection &connection, const StringView &key) {
-    connection.send("TOUCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void touch_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "TOUCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void ttl(Connection &connection, const StringView &key) {
-    connection.send("TTL %b", key.data(), key.size());
-}
-
-inline void type(Connection &connection, const StringView &key) {
-    connection.send("TYPE %b", key.data(), key.size());
-}
-
-inline void unlink(Connection &connection, const StringView &key) {
-    connection.send("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unlink_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void wait(Connection &connection, long long numslave, long long timeout) {
-    connection.send("WAIT %lld %lld", numslave, timeout);
-}
-
-// STRING commands.
-
-inline void append(Connection &connection, const StringView &key, const StringView &str) {
-    connection.send("APPEND %b %b",
-                    key.data(), key.size(),
-                    str.data(), str.size());
-}
-
-inline void bitcount(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("BITCOUNT %b %lld %lld",
-                    key.data(), key.size(),
-                    start, end);
-}
-
-void bitop(Connection &connection,
-            BitOp op,
-            const StringView &destination,
-            const StringView &key);
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last);
-
-inline void bitpos(Connection &connection,
-                    const StringView &key,
-                    long long bit,
-                    long long start,
-                    long long end) {
-    connection.send("BITPOS %b %lld %lld %lld",
-                    key.data(), key.size(),
-                    bit,
-                    start,
-                    end);
-}
-
-inline void decr(Connection &connection, const StringView &key) {
-    connection.send("DECR %b", key.data(), key.size());
-}
-
-inline void decrby(Connection &connection, const StringView &key, long long decrement) {
-    connection.send("DECRBY %b %lld",
-                    key.data(), key.size(),
-                    decrement);
-}
-
-inline void get(Connection &connection, const StringView &key) {
-    connection.send("GET %b",
-                    key.data(), key.size());
-}
-
-inline void getbit(Connection &connection, const StringView &key, long long offset) {
-    connection.send("GETBIT %b %lld",
-                    key.data(), key.size(),
-                    offset);
-}
-
-inline void getrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("GETRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    end);
-}
-
-inline void getset(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("GETSET %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void incr(Connection &connection, const StringView &key) {
-    connection.send("INCR %b", key.data(), key.size());
-}
-
-inline void incrby(Connection &connection, const StringView &key, long long increment) {
-    connection.send("INCRBY %b %lld",
-                    key.data(), key.size(),
-                    increment);
-}
-
-inline void incrbyfloat(Connection &connection, const StringView &key, double increment) {
-    connection.send("INCRBYFLOAT %b %f",
-                    key.data(), key.size(),
-                    increment);
-}
-
-template <typename Input>
-inline void mget(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void mset(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void msetnx(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void psetex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("PSETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-void set(Connection &connection,
-            const StringView &key,
-            const StringView &val,
-            long long ttl,
-            UpdateType type);
-
-inline void setex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("SETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-inline void setnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("SETNX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void setrange(Connection &connection,
-                        const StringView &key,
-                        long long offset,
-                        const StringView &val) {
-    connection.send("SETRANGE %b %lld %b",
-                    key.data(), key.size(),
-                    offset,
-                    val.data(), val.size());
-}
-
-inline void strlen(Connection &connection, const StringView &key) {
-    connection.send("STRLEN %b", key.data(), key.size());
-}
-
-// LIST commands.
-
-inline void blpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BLPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void blpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BRPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void brpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination,
-                        long long timeout) {
-    connection.send("BRPOPLPUSH %b %b %lld",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    timeout);
-}
-
-inline void lindex(Connection &connection, const StringView &key, long long index) {
-    connection.send("LINDEX %b %lld",
-                    key.data(), key.size(),
-                    index);
-}
-
-void linsert(Connection &connection,
-                const StringView &key,
-                InsertPosition position,
-                const StringView &pivot,
-                const StringView &val);
-
-inline void llen(Connection &connection,
-                    const StringView &key) {
-    connection.send("LLEN %b", key.data(), key.size());
-}
-
-inline void lpop(Connection &connection, const StringView &key) {
-    connection.send("LPOP %b",
-                    key.data(), key.size());
-}
-
-inline void lpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void lpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void lpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void lrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void lrem(Connection &connection,
-                    const StringView &key,
-                    long long count,
-                    const StringView &val) {
-    connection.send("LREM %b %lld %b",
-                    key.data(), key.size(),
-                    count,
-                    val.data(), val.size());
-}
-
-inline void lset(Connection &connection,
-                    const StringView &key,
-                    long long index,
-                    const StringView &val) {
-    connection.send("LSET %b %lld %b",
-                    key.data(), key.size(),
-                    index,
-                    val.data(), val.size());
-}
-
-inline void ltrim(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LTRIM %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void rpop(Connection &connection, const StringView &key) {
-    connection.send("RPOP %b", key.data(), key.size());
-}
-
-inline void rpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination) {
-    connection.send("RPOPLPUSH %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size());
-}
-
-inline void rpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void rpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void rpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-// HASH commands.
-
-inline void hdel(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HDEL %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-template <typename Input>
-inline void hdel_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hexists(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HEXISTS %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hget(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HGET %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hgetall(Connection &connection, const StringView &key) {
-    connection.send("HGETALL %b", key.data(), key.size());
-}
-
-inline void hincrby(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    long long increment) {
-    connection.send("HINCRBY %b %b %lld",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hincrbyfloat(Connection &connection,
-                            const StringView &key,
-                            const StringView &field,
-                            double increment) {
-    connection.send("HINCRBYFLOAT %b %b %f",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hkeys(Connection &connection, const StringView &key) {
-    connection.send("HKEYS %b", key.data(), key.size());
-}
-
-inline void hlen(Connection &connection, const StringView &key) {
-    connection.send("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void hmget(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void hmset(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("HSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void hset(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSET %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-void hset_range(Connection &connection, const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hsetnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSETNX %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hstrlen(Connection &connection,
-                    const StringView &key,
-                    const StringView &field) {
-    connection.send("HSTRLEN %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hvals(Connection &connection, const StringView &key) {
-    connection.send("HVALS %b", key.data(), key.size());
-}
-
-// SET commands
-
-inline void sadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SADD %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void sadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void scard(Connection &connection, const StringView &key) {
-    connection.send("SCARD %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiff(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFF" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sdiffstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SDIFFSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiffstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFFSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void sinter(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTER" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SINTERSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sinterstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTERSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sismember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("SISMEMBER %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void smembers(Connection &connection, const StringView &key) {
-    connection.send("SMEMBERS %b", key.data(), key.size());
-}
-
-inline void smove(Connection &connection,
-                    const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    connection.send("SMOVE %b %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    member.data(), member.size());
-}
-
-inline void spop(Connection &connection, const StringView &key) {
-    connection.send("SPOP %b", key.data(), key.size());
-}
-
-inline void spop_range(Connection &connection, const StringView &key, long long count) {
-    connection.send("SPOP %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srandmember(Connection &connection, const StringView &key) {
-    connection.send("SRANDMEMBER %b", key.data(), key.size());
-}
-
-inline void srandmember_range(Connection &connection,
-                                const StringView &key,
-                                long long count) {
-    connection.send("SRANDMEMBER %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void srem_range(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-template <typename Input>
-inline void sunion(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNION" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SUNIONSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sunionstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNIONSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Sorted Set commands.
-
-inline void bzpopmax(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMAX %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmax_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void bzpopmin(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMIN %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmin_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed);
-
-inline void zadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type,
-                    bool changed) {
-    auto tmp = {std::make_pair(member, score)};
-
-    zadd_range(connection, key, tmp.begin(), tmp.end(), type, changed);
-}
-
-inline void zcard(Connection &connection, const StringView &key) {
-    connection.send("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-inline void zcount(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval) {
-    connection.send("ZCOUNT %b %s %s",
-                    key.data(), key.size(),
-                    interval.min().c_str(),
-                    interval.max().c_str());
-}
-
-inline void zincrby(Connection &connection,
-                    const StringView &key,
-                    double increment,
-                    const StringView &member) {
-    connection.send("ZINCRBY %b %f %b",
-                    key.data(), key.size(),
-                    increment,
-                    member.data(), member.size());
-}
-
-inline void zinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZINTERSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-template <typename Interval>
-inline void zlexcount(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zpopmax(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMAX %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zpopmin(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMIN %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop,
-                    bool with_scores) {
-    if (with_scores) {
-        connection.send("ZRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrangebylex(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrangebyscore(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval,
-                    const LimitOptions &opts,
-                    bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrank(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zrem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void zrem_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Interval>
-inline void zremrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zremrangebyrank(Connection &connection,
-                            const StringView &key,
-                            long long start,
-                            long long stop) {
-    connection.send("zremrangebyrank %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-template <typename Interval>
-inline void zremrangebyscore(Connection &connection,
-                                const StringView &key,
-                                const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zrevrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores) {
-    if (with_scores) {
-        connection.send("ZREVRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZREVRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrevrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrevrangebyscore(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZREVRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZREVRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrevrank(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("ZREVRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("ZSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void zscore(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZSCORE %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZUNIONSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-// HYPERLOGLOG commands.
-
-inline void pfadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &element) {
-    connection.send("PFADD %b %b",
-                    key.data(), key.size(),
-                    element.data(), element.size());
-}
-
-template <typename Input>
-inline void pfadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfcount(Connection &connection, const StringView &key) {
-    connection.send("PFCOUNT %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfcount_range(Connection &connection,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFCOUNT" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfmerge(Connection &connection, const StringView &destination, const StringView &key) {
-    connection.send("PFMERGE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfmerge_range(Connection &connection,
-                            const StringView &destination,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFMERGE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// GEO commands.
-
-inline void geoadd(Connection &connection,
-                    const StringView &key,
-                    const std::tuple<StringView, double, double> &member) {
-    const auto &mem = std::get<0>(member);
-
-    connection.send("GEOADD %b %f %f %b",
-                    key.data(), key.size(),
-                    std::get<1>(member),
-                    std::get<2>(member),
-                    mem.data(), mem.size());
-}
-
-template <typename Input>
-inline void geoadd_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOADD" << key;
-
-    while (first != last) {
-        const auto &member = *first;
-        args << std::get<1>(member) << std::get<2>(member) << std::get<0>(member);
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-void geodist(Connection &connection,
-                const StringView &key,
-                const StringView &member1,
-                const StringView &member2,
-                GeoUnit unit);
-
-inline void geohash(Connection &connection, const StringView &key, const StringView &member) {
-    connection.send("GEOHASH %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void geohash_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOHASH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void geopos(Connection &connection, const StringView &key, const StringView &member) {
-    connection.send("GEOPOS %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void geopos_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOPOS" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-void georadius(Connection &connection,
-                const StringView &key,
-                const std::pair<double, double> &loc,
-                double radius,
-                GeoUnit unit,
-                long long count,
-                bool asc,
-                bool with_coord,
-                bool with_dist,
-                bool with_hash);
-
-void georadius_store(Connection &connection,
-                        const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        const StringView &destination,
-                        bool store_dist,
-                        long long count);
-
-void georadiusbymember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        bool with_coord,
-                        bool with_dist,
-                        bool with_hash);
-
-void georadiusbymember_store(Connection &connection,
-                                const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-// SCRIPTING commands.
-
-template <typename Keys, typename Args>
-inline void eval(Connection &connection,
-                   const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last) {
-    CmdArgs cmd_args;
-
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    cmd_args << "EVAL" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    connection.send(cmd_args);
-}
-
-template <typename Keys, typename Args>
-inline void evalsha(Connection &connection,
-                       const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last) {
-    CmdArgs cmd_args;
-
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    cmd_args << "EVALSHA" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    connection.send(cmd_args);
-}
-
-inline void script_exists(Connection &connection, const StringView &sha) {
-    connection.send("SCRIPT EXISTS %b", sha.data(), sha.size());
-}
-
-template <typename Input>
-inline void script_exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SCRIPT" << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void script_flush(Connection &connection) {
-    connection.send("SCRIPT FLUSH");
-}
-
-inline void script_kill(Connection &connection) {
-    connection.send("SCRIPT KILL");
-}
-
-inline void script_load(Connection &connection, const StringView &script) {
-    connection.send("SCRIPT LOAD %b", script.data(), script.size());
-}
-
-// PUBSUB commands.
-
-inline void psubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void psubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void publish(Connection &connection,
-                    const StringView &channel,
-                    const StringView &message) {
-    connection.send("PUBLISH %b %b",
-                    channel.data(), channel.size(),
-                    message.data(), message.size());
-}
-
-inline void punsubscribe(Connection &connection) {
-    connection.send("PUNSUBSCRIBE");
-}
-
-inline void punsubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PUNSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void punsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PUNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PUNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void subscribe(Connection &connection, const StringView &channel) {
-    connection.send("SUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void subscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "SUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void unsubscribe(Connection &connection) {
-    connection.send("UNSUBSCRIBE");
-}
-
-inline void unsubscribe(Connection &connection, const StringView &channel) {
-    connection.send("UNSUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void unsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Transaction commands.
-
-inline void discard(Connection &connection) {
-    connection.send("DISCARD");
-}
-
-inline void exec(Connection &connection) {
-    connection.send("EXEC");
-}
-
-inline void multi(Connection &connection) {
-    connection.send("MULTI");
-}
-
-inline void unwatch(Connection &connection) {
-    connection.send("UNWATCH");
-}
-
-template <typename Input>
-inline void unwatch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNWATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNWATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void watch(Connection &connection, const StringView &key) {
-    connection.send("WATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void watch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("WATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "WATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Stream commands.
-
-inline void xack(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &id) {
-    connection.send("XACK %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xack_range(Connection &connection,
-                const StringView &key,
-                const StringView &group,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XACK" << key << group << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_range(Connection &connection,
-                const StringView &key,
-                const StringView &id,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XADD" << key << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_maxlen_range(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    CmdArgs args;
-    args << "XADD" << key << "MAXLEN";
-
-    if (approx) {
-        args << "~";
-    }
-
-    args << count << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xclaim(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    const StringView &id) {
-    connection.send("XCLAIM %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size(),
-                    min_idle_time,
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xclaim_range(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    Input first,
-                    Input last) {
-    CmdArgs args;
-    args << "XCLAIM" << key << group << consumer << min_idle_time << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xdel(Connection &connection, const StringView &key, const StringView &id) {
-    connection.send("XDEL %b %b", key.data(), key.size(), id.data(), id.size());
-}
-
-template <typename Input>
-void xdel_range(Connection &connection, const StringView &key, Input first, Input last) {
-    CmdArgs args;
-    args << "XDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xgroup_create(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id,
-                            bool mkstream) {
-    CmdArgs args;
-    args << "XGROUP" << "CREATE" << key << group << id;
-
-    if (mkstream) {
-        args << "MKSTREAM";
-    }
-
-    connection.send(args);
-}
-
-inline void xgroup_setid(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id) {
-    connection.send("XGROUP SETID %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-inline void xgroup_destroy(Connection &connection,
-                            const StringView &key,
-                            const StringView &group) {
-    connection.send("XGROUP DESTROY %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xgroup_delconsumer(Connection &connection,
-                                const StringView &key,
-                                const StringView &group,
-                                const StringView &consumer) {
-    connection.send("XGROUP DELCONSUMER %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size());
-}
-
-inline void xlen(Connection &connection, const StringView &key) {
-    connection.send("XLEN %b", key.data(), key.size());
-}
-
-inline void xpending(Connection &connection, const StringView &key, const StringView &group) {
-    connection.send("XPENDING %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xpending_detail(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XPENDING %b %b %b %b %lld",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xpending_per_consumer(Connection &connection,
-                                    const StringView &key,
-                                    const StringView &group,
-                                    const StringView &start,
-                                    const StringView &end,
-                                    long long count,
-                                    const StringView &consumer) {
-    connection.send("XPENDING %b %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count,
-                    consumer.data(), consumer.size());
-}
-
-inline void xrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &start,
-                    const StringView &end) {
-    connection.send("XRANGE %b %b %b",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size());
-}
-
-inline void xrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xread(Connection &connection,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count) {
-    connection.send("XREAD COUNT %lld STREAMS %b %b",
-                    count,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_range(Connection &connection, Input first, Input last, long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xread_block(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        long long timeout,
-                        long long count) {
-    connection.send("XREAD COUNT %lld BLOCK %lld STREAMS %b %b",
-                    count,
-                    timeout,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_block_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout,
-                        long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "BLOCK" << timeout << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_range(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup_block(Connection &connection,
-                                const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long timeout,
-                                long long count,
-                                bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_block_range(Connection &connection,
-                            const StringView &group,
-                            const StringView &consumer,
-                            Input first,
-                            Input last,
-                            long long timeout,
-                            long long count,
-                            bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xrevrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &end,
-                    const StringView &start) {
-    connection.send("XREVRANGE %b %b %b",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size());
-}
-
-inline void xrevrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-    connection.send("XREVRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size(),
-                    count);
-}
-
-void xtrim(Connection &connection, const StringView &key, long long count, bool approx);
-
-namespace detail {
-
-void set_bitop(CmdArgs &args, BitOp op);
-
-void set_update_type(CmdArgs &args, UpdateType type);
-
-void set_aggregation_type(CmdArgs &args, Aggregation type);
-
-template <typename Input>
-void zinterstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-void set_geo_unit(CmdArgs &args, GeoUnit unit);
-
-void set_georadius_store_parameters(CmdArgs &args,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count);
-
-void set_georadius_parameters(CmdArgs &args,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                bool with_coord,
-                                bool with_dist,
-                                bool with_hash);
-
-}
-
-}
-
-}
-
-}
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    detail::set_bitop(args, op);
-
-    args << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    args << "ZADD" << key;
-
-    detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zinterstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zunionstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command_args.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command_args.h
deleted file mode 100644
index 0beb71e5c..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command_args.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-
-#include <vector>
-#include <list>
-#include <string>
-#include <tuple>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-class CmdArgs {
-public:
-    template <typename Arg>
-    CmdArgs& append(Arg &&arg);
-
-    template <typename Arg, typename ...Args>
-    CmdArgs& append(Arg &&arg, Args &&...args);
-
-    // All overloads of operator<< are for internal use only.
-    CmdArgs& operator<<(const StringView &arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& operator<<(T &&arg);
-
-    template <typename Iter>
-    CmdArgs& operator<<(const std::pair<Iter, Iter> &range);
-
-    template <std::size_t N, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &) ->
-        typename std::enable_if<N == sizeof...(Args), CmdArgs&>::type {
-        return *this;
-    }
-
-    template <std::size_t N = 0, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &arg) ->
-        typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type;
-
-    const char** argv() {
-        return _argv.data();
-    }
-
-    const std::size_t* argv_len() {
-        return _argv_len.data();
-    }
-
-    std::size_t size() const {
-        return _argv.size();
-    }
-
-private:
-    // Deep copy.
-    CmdArgs& _append(std::string arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const StringView &arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const char *arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& _append(T &&arg) {
-        return operator<<(std::forward<T>(arg));
-    }
-
-    template <typename Iter>
-    CmdArgs& _append(std::true_type, const std::pair<Iter, Iter> &range);
-
-    template <typename Iter>
-    CmdArgs& _append(std::false_type, const std::pair<Iter, Iter> &range);
-
-    std::vector<const char *> _argv;
-    std::vector<std::size_t> _argv_len;
-
-    std::list<std::string> _args;
-};
-
-template <typename Arg>
-inline CmdArgs& CmdArgs::append(Arg &&arg) {
-    return _append(std::forward<Arg>(arg));
-}
-
-template <typename Arg, typename ...Args>
-inline CmdArgs& CmdArgs::append(Arg &&arg, Args &&...args) {
-    _append(std::forward<Arg>(arg));
-
-    return append(std::forward<Args>(args)...);
-}
-
-inline CmdArgs& CmdArgs::operator<<(const StringView &arg) {
-    _argv.push_back(arg.data());
-    _argv_len.push_back(arg.size());
-
-    return *this;
-}
-
-template <typename Iter>
-inline CmdArgs& CmdArgs::operator<<(const std::pair<Iter, Iter> &range) {
-    return _append(IsKvPair<typename std::decay<decltype(*std::declval<Iter>())>::type>(), range);
-}
-
-template <typename T,
-             typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                    int>::type>
-inline CmdArgs& CmdArgs::operator<<(T &&arg) {
-    return _append(std::to_string(std::forward<T>(arg)));
-}
-
-template <std::size_t N, typename ...Args>
-auto CmdArgs::operator<<(const std::tuple<Args...> &arg) ->
-    typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type {
-    operator<<(std::get<N>(arg));
-
-    return operator<<<N + 1, Args...>(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(std::string arg) {
-    _args.push_back(std::move(arg));
-    return operator<<(_args.back());
-}
-
-inline CmdArgs& CmdArgs::_append(const StringView &arg) {
-    return operator<<(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(const char *arg) {
-    return operator<<(arg);
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::false_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << *first;
-        ++first;
-    }
-
-    return *this;
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::true_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << first->first << first->second;
-        ++first;
-    }
-
-    return *this;
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command_options.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command_options.h
deleted file mode 100644
index ca766c086..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/command_options.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-
-#include <string>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class UpdateType {
-    EXIST,
-    NOT_EXIST,
-    ALWAYS
-};
-
-enum class InsertPosition {
-    BEFORE,
-    AFTER
-};
-
-enum class BoundType {
-    CLOSED,
-    OPEN,
-    LEFT_OPEN,
-    RIGHT_OPEN
-};
-
-// (-inf, +inf)
-template <typename T>
-class UnboundedInterval;
-
-// [min, max], (min, max), (min, max], [min, max)
-template <typename T>
-class BoundedInterval;
-
-// [min, +inf), (min, +inf)
-template <typename T>
-class LeftBoundedInterval;
-
-// (-inf, max], (-inf, max)
-template <typename T>
-class RightBoundedInterval;
-
-template <>
-class UnboundedInterval<double> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<double> {
-public:
-    BoundedInterval(double min, double max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<double> {
-public:
-    LeftBoundedInterval(double min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<double> {
-public:
-    RightBoundedInterval(double max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-template <>
-class UnboundedInterval<std::string> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<std::string> {
-public:
-    BoundedInterval(const std::string &min, const std::string &max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<std::string> {
-public:
-    LeftBoundedInterval(const std::string &min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<std::string> {
-public:
-    RightBoundedInterval(const std::string &max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-struct LimitOptions {
-    long long offset = 0;
-    long long count = -1;
-};
-
-enum class Aggregation {
-    SUM,
-    MIN,
-    MAX
-};
-
-enum class BitOp {
-    AND,
-    OR,
-    XOR,
-    NOT
-};
-
-enum class GeoUnit {
-    M,
-    KM,
-    MI,
-    FT
-};
-
-template <typename T>
-struct WithCoord : TupleWithType<std::pair<double, double>, T> {};
-
-template <typename T>
-struct WithDist : TupleWithType<double, T> {};
-
-template <typename T>
-struct WithHash : TupleWithType<long long, T> {};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/connection.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/connection.h
deleted file mode 100644
index 340375561..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/connection.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_H
-
-#include <cerrno>
-#include <cstring>
-#include <memory>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <chrono>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "reply.h"
-#include "utils.h"
-#include "tls.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class ConnectionType {
-    TCP = 0,
-    UNIX
-};
-
-struct ConnectionOptions {
-public:
-    ConnectionOptions() = default;
-
-    explicit ConnectionOptions(const std::string &uri);
-
-    ConnectionOptions(const ConnectionOptions &) = default;
-    ConnectionOptions& operator=(const ConnectionOptions &) = default;
-
-    ConnectionOptions(ConnectionOptions &&) = default;
-    ConnectionOptions& operator=(ConnectionOptions &&) = default;
-
-    ~ConnectionOptions() = default;
-
-    ConnectionType type = ConnectionType::TCP;
-
-    std::string host;
-
-    int port = 6379;
-
-    std::string path;
-
-    std::string user = "default";
-
-    std::string password;
-
-    int db = 0;
-
-    bool keep_alive = false;
-
-    std::chrono::milliseconds connect_timeout{0};
-
-    std::chrono::milliseconds socket_timeout{0};
-
-    tls::TlsOptions tls;
-
-    // `readonly` is only used for reading from a slave node in Redis Cluster mode.
-    // Client code should never manually set/get it. This member might be removed in the future.
-    bool readonly = false;
-
-private:
-    ConnectionOptions _parse_uri(const std::string &uri) const;
-
-    auto _split_uri(const std::string &uri) const
-        -> std::tuple<std::string, std::string, std::string>;
-
-    auto _split_path(const std::string &path) const
-        -> std::tuple<std::string, int, std::string>;
-
-    void _parse_parameters(const std::string &parameter_string,
-                            ConnectionOptions &opts) const;
-
-    void _set_option(const std::string &key, const std::string &val, ConnectionOptions &opts) const;
-
-    bool _parse_bool_option(const std::string &str) const;
-
-    std::chrono::milliseconds _parse_timeout_option(const std::string &str) const;
-
-    std::vector<std::string> _split(const std::string &str, const std::string &delimiter) const;
-
-    void _set_auth_opts(const std::string &auth, ConnectionOptions &opts) const;
-
-    void _set_tcp_opts(const std::string &path, ConnectionOptions &opts) const;
-
-    void _set_unix_opts(const std::string &path, ConnectionOptions &opts) const;
-};
-
-class CmdArgs;
-
-class Connection {
-public:
-    explicit Connection(const ConnectionOptions &opts);
-
-    Connection(const Connection &) = delete;
-    Connection& operator=(const Connection &) = delete;
-
-    Connection(Connection &&) = default;
-    Connection& operator=(Connection &&) = default;
-
-    ~Connection() = default;
-
-    // Check if the connection is broken. Client needs to do this check
-    // before sending some command to the connection. If it's broken,
-    // client needs to reconnect it.
-    bool broken() const noexcept {
-        return _ctx->err != REDIS_OK;
-    }
-
-    void reset() noexcept {
-        _ctx->err = 0;
-    }
-
-    void invalidate() noexcept {
-        _ctx->err = REDIS_ERR;
-    }
-
-    void reconnect();
-
-    auto create_time() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _create_time;
-    }
-
-    auto last_active() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _last_active;
-    }
-
-    template <typename ...Args>
-    void send(const char *format, Args &&...args);
-
-    void send(int argc, const char **argv, const std::size_t *argv_len);
-
-    void send(CmdArgs &args);
-
-    ReplyUPtr recv(bool handle_error_reply = true);
-
-    const ConnectionOptions& options() const {
-        return _opts;
-    }
-
-    friend void swap(Connection &lhs, Connection &rhs) noexcept;
-
-private:
-    class Connector;
-
-    struct ContextDeleter {
-        void operator()(redisContext *context) const {
-            if (context != nullptr) {
-                redisFree(context);
-            }
-        };
-    };
-
-    using ContextUPtr = std::unique_ptr<redisContext, ContextDeleter>;
-
-    void _set_options();
-
-    void _auth();
-
-    void _select_db();
-
-    void _enable_readonly();
-
-    redisContext* _context();
-
-    ContextUPtr _ctx;
-
-    // The time that the connection is created.
-    std::chrono::time_point<std::chrono::steady_clock> _create_time{};
-
-    // The time that the connection is created or the time that
-    // the connection is recently used, i.e. `_context()` is called.
-    std::chrono::time_point<std::chrono::steady_clock> _last_active{};
-
-    ConnectionOptions _opts;
-
-    // TODO: define _tls_ctx before _ctx
-    tls::TlsContextUPtr _tls_ctx;
-};
-
-using ConnectionSPtr = std::shared_ptr<Connection>;
-
-enum class Role {
-    MASTER,
-    SLAVE
-};
-
-// Inline implementaions.
-
-template <typename ...Args>
-inline void Connection::send(const char *format, Args &&...args) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommand(ctx,
-                format,
-                std::forward<Args>(args)...) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-inline redisContext* Connection::_context() {
-    _last_active = std::chrono::steady_clock::now();
-
-    return _ctx.get();
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/connection_pool.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/connection_pool.h
deleted file mode 100644
index 30ba5daa2..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/connection_pool.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-
-#include <cassert>
-#include <chrono>
-#include <mutex>
-#include <memory>
-#include <condition_variable>
-#include <deque>
-#include "connection.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ConnectionPoolOptions {
-    // Max number of connections, including both in-use and idle ones.
-    std::size_t size = 1;
-
-    // Max time to wait for a connection. 0ms means client waits forever.
-    std::chrono::milliseconds wait_timeout{0};
-
-    // Max lifetime of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_lifetime{0};
-
-    // Max idle time of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_idle_time{0};
-};
-
-class ConnectionPool {
-public:
-    ConnectionPool(const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool(SimpleSentinel sentinel,
-                    const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool() = default;
-
-    ConnectionPool(ConnectionPool &&that);
-    ConnectionPool& operator=(ConnectionPool &&that);
-
-    ConnectionPool(const ConnectionPool &) = delete;
-    ConnectionPool& operator=(const ConnectionPool &) = delete;
-
-    ~ConnectionPool() = default;
-
-    // Fetch a connection from pool.
-    Connection fetch();
-
-    ConnectionOptions connection_options();
-
-    void release(Connection connection);
-
-    // Create a new connection.
-    Connection create();
-
-    ConnectionPool clone();
-
-private:
-    void _move(ConnectionPool &&that);
-
-    // NOT thread-safe
-    Connection _create();
-
-    Connection _create(SimpleSentinel &sentinel, const ConnectionOptions &opts, bool locked);
-
-    Connection _fetch();
-
-    void _wait_for_connection(std::unique_lock<std::mutex> &lock);
-
-    bool _need_reconnect(const Connection &connection,
-                            const std::chrono::milliseconds &connection_lifetime,
-                            const std::chrono::milliseconds &connection_idle_time) const;
-
-    void _update_connection_opts(const std::string &host, int port) {
-        _opts.host = host;
-        _opts.port = port;
-    }
-
-    bool _role_changed(const ConnectionOptions &opts) const {
-        return opts.port != _opts.port || opts.host != _opts.host;
-    }
-
-    ConnectionOptions _opts;
-
-    ConnectionPoolOptions _pool_opts;
-
-    std::deque<Connection> _pool;
-
-    std::size_t _used_connections = 0;
-
-    std::mutex _mutex;
-
-    std::condition_variable _cv;
-
-    SimpleSentinel _sentinel;
-};
-
-using ConnectionPoolSPtr = std::shared_ptr<ConnectionPool>;
-
-class SafeConnection {
-public:
-    explicit SafeConnection(ConnectionPool &pool) : _pool(pool), _connection(_pool.fetch()) {
-        assert(!_connection.broken());
-    }
-
-    SafeConnection(const SafeConnection &) = delete;
-    SafeConnection& operator=(const SafeConnection &) = delete;
-
-    SafeConnection(SafeConnection &&) = delete;
-    SafeConnection& operator=(SafeConnection &&) = delete;
-
-    ~SafeConnection() {
-        _pool.release(std::move(_connection));
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPool &_pool;
-    Connection _connection;
-};
-
-// NOTE: This class is similar to `SafeConnection`.
-// The difference is that `SafeConnection` tries to avoid copying a std::shared_ptr.
-class GuardedConnection {
-public:
-    explicit GuardedConnection(const ConnectionPoolSPtr &pool) : _pool(pool),
-                                                        _connection(_pool->fetch()) {
-        assert(!_connection.broken());
-    }
-
-    GuardedConnection(const GuardedConnection &) = delete;
-    GuardedConnection& operator=(const GuardedConnection &) = delete;
-
-    GuardedConnection(GuardedConnection &&) = default;
-    GuardedConnection& operator=(GuardedConnection &&) = default;
-
-    ~GuardedConnection() {
-        // If `GuardedConnection` has been moved, `_pool` will be nullptr.
-        if (_pool) {
-            _pool->release(std::move(_connection));
-        }
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPoolSPtr _pool;
-    Connection _connection;
-};
-
-using GuardedConnectionSPtr = std::shared_ptr<GuardedConnection>;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/cxx_utils.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/cxx_utils.h
deleted file mode 100644
index dce51abe9..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/cxx_utils.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
-
-#include <string_view>
-#include <optional>
-#include <variant>
-
-#define REDIS_PLUS_PLUS_HAS_OPTIONAL
-
-#define REDIS_PLUS_PLUS_HAS_VARIANT
-
-namespace sw {
-
-namespace redis {
-
-using StringView = std::string_view;
-
-template <typename T>
-using Optional = std::optional<T>;
-
-template <typename ...Args>
-using Variant = std::variant<Args...>;
-
-using Monostate = std::monostate;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/errors.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/errors.h
deleted file mode 100644
index 7cc19d2f1..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/errors.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ERRORS_H
-#define SEWENEW_REDISPLUSPLUS_ERRORS_H
-
-#include <exception>
-#include <string>
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-enum ReplyErrorType {
-    ERR,
-    MOVED,
-    ASK
-};
-
-class Error : public std::exception {
-public:
-    explicit Error(const std::string &msg) : _msg(msg) {}
-
-    Error(const Error &) = default;
-    Error& operator=(const Error &) = default;
-
-    Error(Error &&) = default;
-    Error& operator=(Error &&) = default;
-
-    virtual ~Error() override = default;
-
-    virtual const char* what() const noexcept override {
-        return _msg.data();
-    }
-
-private:
-    std::string _msg;
-};
-
-class IoError : public Error {
-public:
-    explicit IoError(const std::string &msg) : Error(msg) {}
-
-    IoError(const IoError &) = default;
-    IoError& operator=(const IoError &) = default;
-
-    IoError(IoError &&) = default;
-    IoError& operator=(IoError &&) = default;
-
-    virtual ~IoError() override = default;
-};
-
-class TimeoutError : public IoError {
-public:
-    explicit TimeoutError(const std::string &msg) : IoError(msg) {}
-
-    TimeoutError(const TimeoutError &) = default;
-    TimeoutError& operator=(const TimeoutError &) = default;
-
-    TimeoutError(TimeoutError &&) = default;
-    TimeoutError& operator=(TimeoutError &&) = default;
-
-    virtual ~TimeoutError() override = default;
-};
-
-class ClosedError : public Error {
-public:
-    explicit ClosedError(const std::string &msg) : Error(msg) {}
-
-    ClosedError(const ClosedError &) = default;
-    ClosedError& operator=(const ClosedError &) = default;
-
-    ClosedError(ClosedError &&) = default;
-    ClosedError& operator=(ClosedError &&) = default;
-
-    virtual ~ClosedError() override = default;
-};
-
-class ProtoError : public Error {
-public:
-    explicit ProtoError(const std::string &msg) : Error(msg) {}
-
-    ProtoError(const ProtoError &) = default;
-    ProtoError& operator=(const ProtoError &) = default;
-
-    ProtoError(ProtoError &&) = default;
-    ProtoError& operator=(ProtoError &&) = default;
-
-    virtual ~ProtoError() override = default;
-};
-
-class OomError : public Error {
-public:
-    explicit OomError(const std::string &msg) : Error(msg) {}
-
-    OomError(const OomError &) = default;
-    OomError& operator=(const OomError &) = default;
-
-    OomError(OomError &&) = default;
-    OomError& operator=(OomError &&) = default;
-
-    virtual ~OomError() override = default;
-};
-
-class ReplyError : public Error {
-public:
-    explicit ReplyError(const std::string &msg) : Error(msg) {}
-
-    ReplyError(const ReplyError &) = default;
-    ReplyError& operator=(const ReplyError &) = default;
-
-    ReplyError(ReplyError &&) = default;
-    ReplyError& operator=(ReplyError &&) = default;
-
-    virtual ~ReplyError() override = default;
-};
-
-class WatchError : public Error {
-public:
-    explicit WatchError() : Error("Watched key has been modified") {}
-
-    WatchError(const WatchError &) = default;
-    WatchError& operator=(const WatchError &) = default;
-
-    WatchError(WatchError &&) = default;
-    WatchError& operator=(WatchError &&) = default;
-
-    virtual ~WatchError() override = default;
-};
-
-
-// MovedError and AskError are defined in shards.h
-class MovedError;
-
-class AskError;
-
-void throw_error(const redisContext &context, const std::string &err_info);
-
-void throw_error(const redisReply &reply);
-
-template <typename Input>
-inline void range_check(const char *cmd, Input first, Input last) {
-    if (first == last) {
-        throw Error(std::string(cmd) + ": no key specified");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ERRORS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/pipeline.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/pipeline.h
deleted file mode 100644
index 52b01253f..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/pipeline.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_PIPELINE_H
-#define SEWENEW_REDISPLUSPLUS_PIPELINE_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-class PipelineImpl {
-public:
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args) {
-        assert(!connection.broken());
-
-        cmd(connection, std::forward<Args>(args)...);
-    }
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t /*cmd_num*/) {
-        // Reconnect to Redis to discard all commands.
-        connection.reconnect();
-    }
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_PIPELINE_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/queued_redis.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/queued_redis.h
deleted file mode 100644
index e663c7423..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/queued_redis.h
+++ /dev/null
@@ -1,2013 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-
-#include <cassert>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <vector>
-#include "connection.h"
-#include "connection_pool.h"
-#include "utils.h"
-#include "reply.h"
-#include "command.h"
-#include "redis.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class QueuedReplies;
-
-// If any command throws, QueuedRedis resets the connection, and becomes invalid.
-// In this case, the only thing we can do is to destory the QueuedRedis object.
-template <typename Impl>
-class QueuedRedis {
-public:
-    QueuedRedis(QueuedRedis &&) = default;
-    QueuedRedis& operator=(QueuedRedis &&) = default;
-
-    // When it destructs, the underlying *Connection* will be closed or return to pool,
-    // and any command that has NOT been executed will be ignored.
-    ~QueuedRedis();
-
-    Redis redis();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                    QueuedRedis&>::type;
-
-    template <typename ...Args>
-    QueuedRedis& command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, QueuedRedis&>::type;
-
-    QueuedReplies exec();
-
-    void discard();
-
-    // CONNECTION commands.
-
-    QueuedRedis& auth(const StringView &password) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::auth, password);
-    }
-
-    QueuedRedis& auth(const StringView &user, const StringView &password) {
-        return command<void (*)(Connection &, const StringView &, const StringView &)>(
-                        cmd::auth, user, password);
-    }
-
-    QueuedRedis& echo(const StringView &msg) {
-        return command(cmd::echo, msg);
-    }
-
-    QueuedRedis& ping() {
-        return command<void (*)(Connection &)>(cmd::ping);
-    }
-
-    QueuedRedis& ping(const StringView &msg) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::ping, msg);
-    }
-
-    // We DO NOT support the QUIT command. See *Redis::quit* doc for details.
-    //
-    // QueuedRedis& quit();
-
-    QueuedRedis& select(long long idx) {
-        return command(cmd::select, idx);
-    }
-
-    QueuedRedis& swapdb(long long idx1, long long idx2) {
-        return command(cmd::swapdb, idx1, idx2);
-    }
-
-    // SERVER commands.
-
-    QueuedRedis& bgrewriteaof() {
-        return command(cmd::bgrewriteaof);
-    }
-
-    QueuedRedis& bgsave() {
-        return command(cmd::bgsave);
-    }
-
-    QueuedRedis& dbsize() {
-        return command(cmd::dbsize);
-    }
-
-    QueuedRedis& flushall(bool async = false) {
-        return command(cmd::flushall, async);
-    }
-
-    QueuedRedis& flushdb(bool async = false) {
-        return command(cmd::flushdb, async);
-    }
-
-    QueuedRedis& info() {
-        return command<void (*)(Connection &)>(cmd::info);
-    }
-
-    QueuedRedis& info(const StringView &section) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::info, section);
-    }
-
-    QueuedRedis& lastsave() {
-        return command(cmd::lastsave);
-    }
-
-    QueuedRedis& save() {
-        return command(cmd::save);
-    }
-
-    // KEY commands.
-
-    QueuedRedis& del(const StringView &key) {
-        return command(cmd::del, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& del(Input first, Input last) {
-        range_check("DEL", first, last);
-
-        return command(cmd::del_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    QueuedRedis& dump(const StringView &key) {
-        return command(cmd::dump, key);
-    }
-
-    QueuedRedis& exists(const StringView &key) {
-        return command(cmd::exists, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& exists(Input first, Input last) {
-        range_check("EXISTS", first, last);
-
-        return command(cmd::exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& expire(const StringView &key, long long timeout) {
-        return command(cmd::expire, key, timeout);
-    }
-
-    QueuedRedis& expire(const StringView &key,
-                        const std::chrono::seconds &timeout) {
-        return expire(key, timeout.count());
-    }
-
-    QueuedRedis& expireat(const StringView &key, long long timestamp) {
-        return command(cmd::expireat, key, timestamp);
-    }
-
-    QueuedRedis& expireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::seconds> &tp) {
-        return expireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& keys(const StringView &pattern) {
-        return command(cmd::keys, pattern);
-    }
-
-    QueuedRedis& move(const StringView &key, long long db) {
-        return command(cmd::move, key, db);
-    }
-
-    QueuedRedis& persist(const StringView &key) {
-        return command(cmd::persist, key);
-    }
-
-    QueuedRedis& pexpire(const StringView &key, long long timeout) {
-        return command(cmd::pexpire, key, timeout);
-    }
-
-    QueuedRedis& pexpire(const StringView &key,
-                            const std::chrono::milliseconds &timeout) {
-        return pexpire(key, timeout.count());
-    }
-
-    QueuedRedis& pexpireat(const StringView &key, long long timestamp) {
-        return command(cmd::pexpireat, key, timestamp);
-    }
-
-    QueuedRedis& pexpireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::milliseconds> &tp) {
-        return pexpireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& pttl(const StringView &key) {
-        return command(cmd::pttl, key);
-    }
-
-    QueuedRedis& randomkey() {
-        return command(cmd::randomkey);
-    }
-
-    QueuedRedis& rename(const StringView &key, const StringView &newkey) {
-        return command(cmd::rename, key, newkey);
-    }
-
-    QueuedRedis& renamenx(const StringView &key, const StringView &newkey) {
-        return command(cmd::renamenx, key, newkey);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                                const StringView &val,
-                                long long ttl,
-                                bool replace = false) {
-        return command(cmd::restore, key, val, ttl, replace);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                            bool replace = false) {
-        return restore(key, val, ttl.count(), replace);
-    }
-
-    // TODO: sort
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::scan, cursor, pattern, count);
-    }
-
-    QueuedRedis& scan(long long cursor) {
-        return scan(cursor, "*", 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern) {
-        return scan(cursor, pattern, 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        long long count) {
-        return scan(cursor, "*", count);
-    }
-
-    QueuedRedis& touch(const StringView &key) {
-        return command(cmd::touch, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& touch(Input first, Input last) {
-        range_check("TOUCH", first, last);
-
-        return command(cmd::touch_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    QueuedRedis& ttl(const StringView &key) {
-        return command(cmd::ttl, key);
-    }
-
-    QueuedRedis& type(const StringView &key) {
-        return command(cmd::type, key);
-    }
-
-    QueuedRedis& unlink(const StringView &key) {
-        return command(cmd::unlink, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& unlink(Input first, Input last) {
-        range_check("UNLINK", first, last);
-
-        return command(cmd::unlink_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    QueuedRedis& wait(long long numslaves, long long timeout) {
-        return command(cmd::wait, numslaves, timeout);
-    }
-
-    QueuedRedis& wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-        return wait(numslaves, timeout.count());
-    }
-
-    // STRING commands.
-
-    QueuedRedis& append(const StringView &key, const StringView &str) {
-        return command(cmd::append, key, str);
-    }
-
-    QueuedRedis& bitcount(const StringView &key,
-                            long long start = 0,
-                            long long end = -1) {
-        return command(cmd::bitcount, key, start, end);
-    }
-
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        const StringView &key) {
-        return command(cmd::bitop, op, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        Input first,
-                        Input last) {
-        range_check("BITOP", first, last);
-
-        return command(cmd::bitop_range<Input>, op, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1) {
-        return command(cmd::bitpos, key, bit, start, end);
-    }
-
-    QueuedRedis& decr(const StringView &key) {
-        return command(cmd::decr, key);
-    }
-
-    QueuedRedis& decrby(const StringView &key, long long decrement) {
-        return command(cmd::decrby, key, decrement);
-    }
-
-    QueuedRedis& get(const StringView &key) {
-        return command(cmd::get, key);
-    }
-
-    QueuedRedis& getbit(const StringView &key, long long offset) {
-        return command(cmd::getbit, key, offset);
-    }
-
-    QueuedRedis& getrange(const StringView &key, long long start, long long end) {
-        return command(cmd::getrange, key, start, end);
-    }
-
-    QueuedRedis& getset(const StringView &key, const StringView &val) {
-        return command(cmd::getset, key, val);
-    }
-
-    QueuedRedis& incr(const StringView &key) {
-        return command(cmd::incr, key);
-    }
-
-    QueuedRedis& incrby(const StringView &key, long long increment) {
-        return command(cmd::incrby, key, increment);
-    }
-
-    QueuedRedis& incrbyfloat(const StringView &key, double increment) {
-        return command(cmd::incrbyfloat, key, increment);
-    }
-
-    template <typename Input>
-    QueuedRedis& mget(Input first, Input last) {
-        range_check("MGET", first, last);
-
-        return command(cmd::mget<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mget(std::initializer_list<T> il) {
-        return mget(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& mset(Input first, Input last) {
-        range_check("MSET", first, last);
-
-        return command(cmd::mset<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mset(std::initializer_list<T> il) {
-        return mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& msetnx(Input first, Input last) {
-        range_check("MSETNX", first, last);
-
-        return command(cmd::msetnx<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::psetex, key, ttl, val);
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        const std::chrono::milliseconds &ttl,
-                        const StringView &val) {
-        return psetex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& set(const StringView &key,
-                        const StringView &val,
-                        const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                        UpdateType type = UpdateType::ALWAYS) {
-        _set_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::set, key, val, ttl.count(), type);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::setex, key, ttl, val);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        const std::chrono::seconds &ttl,
-                        const StringView &val) {
-        return setex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& setnx(const StringView &key, const StringView &val) {
-        return command(cmd::setnx, key, val);
-    }
-
-    QueuedRedis& setrange(const StringView &key,
-                            long long offset,
-                            const StringView &val) {
-        return command(cmd::setrange, key, offset, val);
-    }
-
-    QueuedRedis& strlen(const StringView &key) {
-        return command(cmd::strlen, key);
-    }
-
-    // LIST commands.
-
-    QueuedRedis& blpop(const StringView &key, long long timeout) {
-        return command(cmd::blpop, key, timeout);
-    }
-
-    QueuedRedis& blpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first, Input last, long long timeout) {
-        range_check("BLPOP", first, last);
-
-        return command(cmd::blpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key, long long timeout) {
-        return command(cmd::brpop, key, timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first, Input last, long long timeout) {
-        range_check("BRPOP", first, last);
-
-        return command(cmd::brpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            long long timeout) {
-        return command(cmd::brpoplpush, source, destination, timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpoplpush(source, destination, timeout.count());
-    }
-
-    QueuedRedis& lindex(const StringView &key, long long index) {
-        return command(cmd::lindex, key, index);
-    }
-
-    QueuedRedis& linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-        return command(cmd::linsert, key, position, pivot, val);
-    }
-
-    QueuedRedis& llen(const StringView &key) {
-        return command(cmd::llen, key);
-    }
-
-    QueuedRedis& lpop(const StringView &key) {
-        return command(cmd::lpop, key);
-    }
-
-    QueuedRedis& lpush(const StringView &key, const StringView &val) {
-        return command(cmd::lpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& lpush(const StringView &key, Input first, Input last) {
-        range_check("LPUSH", first, last);
-
-        return command(cmd::lpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& lpushx(const StringView &key, const StringView &val) {
-        return command(cmd::lpushx, key, val);
-    }
-
-    QueuedRedis& lrange(const StringView &key,
-                        long long start,
-                        long long stop) {
-        return command(cmd::lrange, key, start, stop);
-    }
-
-    QueuedRedis& lrem(const StringView &key, long long count, const StringView &val) {
-        return command(cmd::lrem, key, count, val);
-    }
-
-    QueuedRedis& lset(const StringView &key, long long index, const StringView &val) {
-        return command(cmd::lset, key, index, val);
-    }
-
-    QueuedRedis& ltrim(const StringView &key, long long start, long long stop) {
-        return command(cmd::ltrim, key, start, stop);
-    }
-
-    QueuedRedis& rpop(const StringView &key) {
-        return command(cmd::rpop, key);
-    }
-
-    QueuedRedis& rpoplpush(const StringView &source, const StringView &destination) {
-        return command(cmd::rpoplpush, source, destination);
-    }
-
-    QueuedRedis& rpush(const StringView &key, const StringView &val) {
-        return command(cmd::rpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& rpush(const StringView &key, Input first, Input last) {
-        range_check("RPUSH", first, last);
-
-        return command(cmd::rpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& rpushx(const StringView &key, const StringView &val) {
-        return command(cmd::rpushx, key, val);
-    }
-
-    // HASH commands.
-
-    QueuedRedis& hdel(const StringView &key, const StringView &field) {
-        return command(cmd::hdel, key, field);
-    }
-
-    template <typename Input>
-    QueuedRedis& hdel(const StringView &key, Input first, Input last) {
-        range_check("HDEL", first, last);
-
-        return command(cmd::hdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hexists(const StringView &key, const StringView &field) {
-        return command(cmd::hexists, key, field);
-    }
-
-    QueuedRedis& hget(const StringView &key, const StringView &field) {
-        return command(cmd::hget, key, field);
-    }
-
-    QueuedRedis& hgetall(const StringView &key) {
-        return command(cmd::hgetall, key);
-    }
-
-    QueuedRedis& hincrby(const StringView &key,
-                            const StringView &field,
-                            long long increment) {
-        return command(cmd::hincrby, key, field, increment);
-    }
-
-    QueuedRedis& hincrbyfloat(const StringView &key,
-                                const StringView &field,
-                                double increment) {
-        return command(cmd::hincrbyfloat, key, field, increment);
-    }
-
-    QueuedRedis& hkeys(const StringView &key) {
-        return command(cmd::hkeys, key);
-    }
-
-    QueuedRedis& hlen(const StringView &key) {
-        return command(cmd::hlen, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& hmget(const StringView &key, Input first, Input last) {
-        range_check("HMGET", first, last);
-
-        return command(cmd::hmget<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmget(const StringView &key, std::initializer_list<T> il) {
-        return hmget(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& hmset(const StringView &key, Input first, Input last) {
-        range_check("HMSET", first, last);
-
-        return command(cmd::hmset<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmset(const StringView &key, std::initializer_list<T> il) {
-        return hmset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::hscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return hscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return hscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor) {
-        return hscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& hset(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hset, key, field, val);
-    }
-
-    QueuedRedis& hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hset(key, item.first, item.second);
-    }
-
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("HSET", first, last);
-
-        return command(cmd::hset_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hsetnx, key, field, val);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hsetnx(key, item.first, item.second);
-    }
-
-    QueuedRedis& hstrlen(const StringView &key, const StringView &field) {
-        return command(cmd::hstrlen, key, field);
-    }
-
-    QueuedRedis& hvals(const StringView &key) {
-        return command(cmd::hvals, key);
-    }
-
-    // SET commands.
-
-    QueuedRedis& sadd(const StringView &key, const StringView &member) {
-        return command(cmd::sadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& sadd(const StringView &key, Input first, Input last) {
-        range_check("SADD", first, last);
-
-        return command(cmd::sadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& scard(const StringView &key) {
-        return command(cmd::scard, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiff(Input first, Input last) {
-        range_check("SDIFF", first, last);
-
-        return command(cmd::sdiff<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiff(std::initializer_list<T> il) {
-        return sdiff(il.begin(), il.end());
-    }
-
-    QueuedRedis& sdiffstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sdiffstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-        range_check("SDIFFSTORE", first, last);
-
-        return command(cmd::sdiffstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiffstore(const StringView &destination, std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& sinter(Input first, Input last) {
-        range_check("SINTER", first, last);
-
-        return command(cmd::sinter<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinter(std::initializer_list<T> il) {
-        return sinter(il.begin(), il.end());
-    }
-
-    QueuedRedis& sinterstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sinterstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sinterstore(const StringView &destination,
-                                Input first,
-                                Input last) {
-        range_check("SINTERSTORE", first, last);
-
-        return command(cmd::sinterstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinterstore(const StringView &destination, std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& sismember(const StringView &key, const StringView &member) {
-        return command(cmd::sismember, key, member);
-    }
-
-    QueuedRedis& smembers(const StringView &key) {
-        return command(cmd::smembers, key);
-    }
-
-    QueuedRedis& smove(const StringView &source,
-                        const StringView &destination,
-                        const StringView &member) {
-        return command(cmd::smove, source, destination, member);
-    }
-
-    QueuedRedis& spop(const StringView &key) {
-        return command(cmd::spop, key);
-    }
-
-    QueuedRedis& spop(const StringView &key, long long count) {
-        return command(cmd::spop_range, key, count);
-    }
-
-    QueuedRedis& srandmember(const StringView &key) {
-        return command(cmd::srandmember, key);
-    }
-
-    QueuedRedis& srandmember(const StringView &key, long long count) {
-        return command(cmd::srandmember_range, key, count);
-    }
-
-    QueuedRedis& srem(const StringView &key, const StringView &member) {
-        return command(cmd::srem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& srem(const StringView &key, Input first, Input last) {
-        range_check("SREM", first, last);
-
-        return command(cmd::srem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::sscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern) {
-        return sscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return sscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor) {
-        return sscan(key, cursor, "*", 10);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunion(Input first, Input last) {
-        range_check("SUNION", first, last);
-
-        return command(cmd::sunion<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunion(std::initializer_list<T> il) {
-        return sunion(il.begin(), il.end());
-    }
-
-    QueuedRedis& sunionstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sunionstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunionstore(const StringView &destination, Input first, Input last) {
-        range_check("SUNIONSTORE", first, last);
-
-        return command(cmd::sunionstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    QueuedRedis& bzpopmax(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmax, key, timeout);
-    }
-
-    QueuedRedis& bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first, Input last, long long timeout) {
-        range_check("BZPOPMAX", first, last);
-
-        return command(cmd::bzpopmax_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il, long long timeout) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmin, key, timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first, Input last, long long timeout) {
-        range_check("BZPOPMIN", first, last);
-
-        return command(cmd::bzpopmin_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il, long long timeout) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    QueuedRedis& zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd, key, member, score, type, changed);
-    }
-
-    template <typename Input>
-    QueuedRedis& zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        range_check("ZADD", first, last);
-
-        return command(cmd::zadd_range<Input>, key, first, last, type, changed);
-    }
-
-    QueuedRedis& zcard(const StringView &key) {
-        return command(cmd::zcard, key);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zincrby(const StringView &key, double increment, const StringView &member) {
-        return command(cmd::zincrby, key, increment, member);
-    }
-
-    QueuedRedis& zinterstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zinterstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        range_check("ZINTERSTORE", first, last);
-
-        return command(cmd::zinterstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zlexcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zlexcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::zpopmax, key, 1);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key, long long count) {
-        return command(cmd::zpopmax, key, count);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::zpopmin, key, 1);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key, long long count) {
-        return command(cmd::zpopmin, key, count);
-    }
-
-    // NOTE: *QueuedRedis::zrange*'s parameters are different from *Redis::zrange*.
-    // *Redis::zrange* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::zrange*. So we have to use an extra parameter: *with_scores*,
-    // to decide whether we should send *WITHSCORES* option to Redis. This also applies to
-    // other commands with the *WITHSCORES* option, e.g. *ZRANGEBYSCORE*, *ZREVRANGE*,
-    // *ZREVRANGEBYSCORE*.
-    QueuedRedis& zrange(const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores = false) {
-        return command(cmd::zrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key, const Interval &interval) {
-        return zrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                bool with_scores = false) {
-        return command(cmd::zrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                bool with_scores = false) {
-        return zrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrank, key, member);
-    }
-
-    QueuedRedis& zrem(const StringView &key, const StringView &member) {
-        return command(cmd::zrem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& zrem(const StringView &key, Input first, Input last) {
-        range_check("ZREM", first, last);
-
-        return command(cmd::zrem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebylex(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebylex<Interval>, key, interval);
-    }
-
-    QueuedRedis& zremrangebyrank(const StringView &key, long long start, long long stop) {
-        return command(cmd::zremrangebyrank, key, start, stop);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebyscore(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebyscore<Interval>, key, interval);
-    }
-
-    // See comments on *ZRANGE*.
-    QueuedRedis& zrevrange(const StringView &key,
-                            long long start,
-                            long long stop,
-                            bool with_scores = false) {
-        return command(cmd::zrevrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key, const Interval &interval) {
-        return zrevrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    const LimitOptions &opts,
-                                    bool with_scores = false) {
-        return command(cmd::zrevrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    bool with_scores = false) {
-        return zrevrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrevrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrevrank, key, member);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::zscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return zscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return zscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor) {
-        return zscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& zscore(const StringView &key, const StringView &member) {
-        return command(cmd::zscore, key, member);
-    }
-
-    QueuedRedis& zunionstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zunionstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        range_check("ZUNIONSTORE", first, last);
-
-        return command(cmd::zunionstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    QueuedRedis& pfadd(const StringView &key, const StringView &element) {
-        return command(cmd::pfadd, key, element);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfadd(const StringView &key, Input first, Input last) {
-        range_check("PFADD", first, last);
-
-        return command(cmd::pfadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& pfcount(const StringView &key) {
-        return command(cmd::pfcount, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfcount(Input first, Input last) {
-        range_check("PFCOUNT", first, last);
-
-        return command(cmd::pfcount_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    QueuedRedis& pfmerge(const StringView &destination, const StringView &key) {
-        return command(cmd::pfmerge, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfmerge(const StringView &destination, Input first, Input last) {
-        range_check("PFMERGE", first, last);
-
-        return command(cmd::pfmerge_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        return pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    QueuedRedis& geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-        return command(cmd::geoadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geoadd(const StringView &key,
-                        Input first,
-                        Input last) {
-        range_check("GEOADD", first, last);
-
-        return command(cmd::geoadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geoadd(const StringView &key, std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M) {
-        return command(cmd::geodist, key, member1, member2, unit);
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& geohash(const StringView &key, const StringView &member) {
-        return command(cmd::geohash, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geohash(const StringView &key, Input first, Input last) {
-        range_check("GEOHASH", first, last);
-
-        return command(cmd::geohash_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geohash(const StringView &key, std::initializer_list<T> il) {
-        return geohash(key, il.begin(), il.end());
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& geopos(const StringView &key, const StringView &member) {
-        return command(cmd::geopos, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geopos(const StringView &key, Input first, Input last) {
-        range_check("GEOPOS", first, last);
-
-        return command(cmd::geopos_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geopos(const StringView &key, std::initializer_list<T> il) {
-        return geopos(key, il.begin(), il.end());
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            const StringView &destination,
-                            bool store_dist,
-                            long long count) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadius_store,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // NOTE: *QueuedRedis::georadius*'s parameters are different from *Redis::georadius*.
-    // *Redis::georadius* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::georadius*. So we have to use extra parameters to decide
-    // whether we should send options to Redis. This also applies to *GEORADIUSBYMEMBER*.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            bool with_coord,
-                            bool with_dist,
-                            bool with_hash) {
-        return command(cmd::georadius,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // See the comments on *GEORADIUS*.
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    long long count,
-                                    bool asc,
-                                    bool with_coord,
-                                    bool with_dist,
-                                    bool with_hash) {
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    // SCRIPTING commands.
-
-    template <typename Keys, typename Args>
-    QueuedRedis& eval(const StringView &script,
-                        Keys keys_first,
-                        Keys keys_last,
-                        Args args_first,
-                        Args args_last) {
-        return command(cmd::eval<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-    }
-
-    QueuedRedis& eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-        return eval(script, keys.begin(), keys.end(), args.begin(), args.end());
-    }
-
-    template <typename Keys, typename Args>
-    QueuedRedis& evalsha(const StringView &script,
-                            Keys keys_first,
-                            Keys keys_last,
-                            Args args_first,
-                            Args args_last) {
-        return command(cmd::evalsha<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-    }
-
-    QueuedRedis& evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-        return evalsha(script, keys.begin(), keys.end(), args.begin(), args.end());
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& script_exists(const StringView &sha1) {
-        return command(cmd::script_exists, sha1);
-    }
-
-    template <typename Input>
-    QueuedRedis& script_exists(Input first, Input last) {
-        range_check("SCRIPT EXISTS", first, last);
-
-        return command(cmd::script_exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& script_exists(std::initializer_list<T> il) {
-        return script_exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& script_flush() {
-        return command(cmd::script_flush);
-    }
-
-    QueuedRedis& script_kill() {
-        return command(cmd::script_kill);
-    }
-
-    QueuedRedis& script_load(const StringView &script) {
-        return command(cmd::script_load, script);
-    }
-
-    // PUBSUB commands.
-
-    QueuedRedis& publish(const StringView &channel, const StringView &message) {
-        return command(cmd::publish, channel, message);
-    }
-
-    // Stream commands.
-
-    QueuedRedis& xack(const StringView &key, const StringView &group, const StringView &id) {
-        return command(cmd::xack, key, group, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xack(const StringView &key, const StringView &group, Input first, Input last) {
-        range_check("XACK", first, last);
-
-        return command(cmd::xack_range<Input>, key, group, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, Input first, Input last) {
-        range_check("XADD", first, last);
-
-        return command(cmd::xadd_range<Input>, key, id, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true) {
-        range_check("XADD", first, last);
-
-        return command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    QueuedRedis& xclaim(const StringView &key,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const std::chrono::milliseconds &min_idle_time,
-                        const StringView &id) {
-        return command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last) {
-        range_check("XCLAIM", first, last);
-
-        return command(cmd::xclaim_range<Input>,
-                        key,
-                        group,
-                        consumer,
-                        min_idle_time.count(),
-                        first,
-                        last);
-    }
-
-    template <typename T>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il) {
-        return xclaim(key, group, consumer, min_idle_time, il.begin(), il.end());
-    }
-
-    QueuedRedis& xdel(const StringView &key, const StringView &id) {
-        return command(cmd::xdel, key, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xdel(const StringView &key, Input first, Input last) {
-        range_check("XDEL", first, last);
-
-        return command(cmd::xdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& xgroup_create(const StringView &key,
-                                const StringView &group,
-                                const StringView &id,
-                                bool mkstream = false) {
-        return command(cmd::xgroup_create, key, group, id, mkstream);
-    }
-
-    QueuedRedis& xgroup_setid(const StringView &key,
-                                const StringView &group,
-                                const StringView &id) {
-        return command(cmd::xgroup_setid, key, group, id);
-    }
-
-    QueuedRedis& xgroup_destroy(const StringView &key, const StringView &group) {
-        return command(cmd::xgroup_destroy, key, group);
-    }
-
-    QueuedRedis& xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer) {
-        return command(cmd::xgroup_delconsumer, key, group, consumer);
-    }
-
-    QueuedRedis& xlen(const StringView &key) {
-        return command(cmd::xlen, key);
-    }
-
-    QueuedRedis& xpending(const StringView &key, const StringView &group) {
-        return command(cmd::xpending, key, group);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-        return command(cmd::xpending_detail, key, group, start, end, count);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer) {
-        return command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end) {
-        return command(cmd::xrange, key, start, end);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count) {
-        return command(cmd::xrange_count, key, start, end, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id, long long count) {
-        return command(cmd::xread, key, id, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id) {
-        return xread(key, id, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last, long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREAD", first, last);
-
-        return command(cmd::xread_range<Input>, first, last, count);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, 0);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count) {
-        return command(cmd::xread_block, key, id, timeout.count(), count);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout) {
-        return xread(key, id, timeout, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREAD", first, last);
-
-        return command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, timeout, 0);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREADGROUP", first, last);
-
-        return command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, 0, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup_block,
-                        group,
-                        consumer,
-                        key,
-                        id,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREADGROUP", first, last);
-
-        return command(cmd::xreadgroup_block_range<Input>,
-                        group,
-                        consumer,
-                        first,
-                        last,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, 0, false);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start) {
-        return command(cmd::xrevrange, key, end, start);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-        return command(cmd::xrevrange_count, key, end, start, count);
-    }
-
-    QueuedRedis& xtrim(const StringView &key, long long count, bool approx = true) {
-        return command(cmd::xtrim, key, count, approx);
-    }
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    template <typename ...Args>
-    QueuedRedis(const ConnectionPoolSPtr &pool, bool new_connection, Args &&...args);
-
-    Connection& _connection();
-
-    void _sanity_check();
-
-    void _reset(bool reset_connection = true);
-
-    void _return_connection();
-
-    void _invalidate();
-
-    void _clean_up();
-
-    void _rewrite_replies(std::vector<ReplyUPtr> &replies) const;
-
-    template <typename Func>
-    void _rewrite_replies(const std::vector<std::size_t> &indexes,
-                            Func rewriter,
-                            std::vector<ReplyUPtr> &replies) const;
-
-    GuardedConnectionSPtr _guarded_connection;
-
-    ConnectionPoolSPtr _connection_pool;
-
-    bool _new_connection = true;
-
-    Impl _impl;
-
-    std::size_t _cmd_num = 0;
-
-    std::vector<std::size_t> _set_cmd_indexes;
-
-    std::vector<std::size_t> _empty_array_cmd_indexes;
-
-    bool _valid = true;
-};
-
-class QueuedReplies {
-public:
-    QueuedReplies() = default;
-
-    QueuedReplies(const QueuedReplies &) = delete;
-    QueuedReplies& operator=(const QueuedReplies &) = delete;
-
-    QueuedReplies(QueuedReplies &&) = default;
-    QueuedReplies& operator=(QueuedReplies &&) = default;
-
-    ~QueuedReplies() = default;
-
-    std::size_t size() const;
-
-    redisReply& get(std::size_t idx);
-
-    template <typename Result>
-    Result get(std::size_t idx);
-
-    template <typename Output>
-    void get(std::size_t idx, Output output);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    explicit QueuedReplies(std::vector<ReplyUPtr> replies) : _replies(std::move(replies)) {}
-
-    void _index_check(std::size_t idx) const;
-
-    std::vector<ReplyUPtr> _replies;
-};
-
-}
-
-}
-
-#include "queued_redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/queued_redis.hpp b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/queued_redis.hpp
deleted file mode 100644
index d2865e46e..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/queued_redis.hpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>::QueuedRedis(const ConnectionPoolSPtr &pool,
-                                bool new_connection,
-                                Args &&...args) :
-            _new_connection(new_connection),
-            _impl(std::forward<Args>(args)...) {
-    assert(pool);
-
-    if (_new_connection) {
-        _connection_pool = std::make_shared<ConnectionPool>(pool->clone());
-    } else {
-        // Create a connection from the origin pool.
-        _connection_pool = pool;
-    }
-}
-
-template <typename Impl>
-QueuedRedis<Impl>::~QueuedRedis() {
-    try {
-        _clean_up();
-    } catch (const Error &e) {
-        // Ensure the destructor does not throw
-    }
-}
-
-template <typename Impl>
-Redis QueuedRedis<Impl>::redis() {
-    _sanity_check();
-
-    assert(_guarded_connection);
-
-    return Redis(_guarded_connection);
-}
-
-template <typename Impl>
-template <typename Cmd, typename ...Args>
-auto QueuedRedis<Impl>::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                QueuedRedis<Impl>&>::type {
-    try {
-        _sanity_check();
-
-        _impl.command(_connection(), cmd, std::forward<Args>(args)...);
-
-        ++_cmd_num;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-
-    return *this;
-}
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>& QueuedRedis<Impl>::command(const StringView &cmd_name, Args &&...args) {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Impl>
-template <typename Input>
-auto QueuedRedis<Impl>::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, QueuedRedis<Impl>&>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Impl>
-QueuedReplies QueuedRedis<Impl>::exec() {
-    try {
-        _sanity_check();
-
-        auto replies = _impl.exec(_connection(), _cmd_num);
-
-        _rewrite_replies(replies);
-
-        _reset();
-
-        return QueuedReplies(std::move(replies));
-    } catch (const WatchError &e) {
-        // In this case, we only clear some states and keep the connection,
-        // so that user can retry the transaction.
-        _reset(false);
-        throw;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::discard() {
-    try {
-        _sanity_check();
-
-        _impl.discard(_connection(), _cmd_num);
-
-        _reset();
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-Connection& QueuedRedis<Impl>::_connection() {
-    assert(_valid);
-
-    if (!_guarded_connection) {
-        _guarded_connection = std::make_shared<GuardedConnection>(_connection_pool);
-    }
-
-    return _guarded_connection->connection();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_sanity_check() {
-    if (!_valid) {
-        throw Error("Not in valid state");
-    }
-
-    if (_connection().broken()) {
-        throw Error("Connection is broken");
-    }
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_reset(bool reset_connection) {
-    if (reset_connection && !_new_connection) {
-        _return_connection();
-    }
-
-    _cmd_num = 0;
-
-    _set_cmd_indexes.clear();
-
-    _empty_array_cmd_indexes.clear();
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_return_connection() {
-    if (_guarded_connection.use_count() == 1) {
-        // If no one else holding the connection, return it back to pool.
-        // Instead, if some other `Redis` object holds the connection,
-        // e.g. `auto redis = transaction.redis();`, we cannot return the connection.
-        _guarded_connection.reset();
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_invalidate() {
-    _valid = false;
-
-    _clean_up();
-
-    _reset();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_clean_up() {
-    if (_guarded_connection && !_new_connection) {
-        // Something bad happened, we need to close the current connection
-        // before returning it back to pool.
-        _guarded_connection->connection().invalidate();
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_rewrite_replies(std::vector<ReplyUPtr> &replies) const {
-    _rewrite_replies(_set_cmd_indexes, reply::rewrite_set_reply, replies);
-
-    _rewrite_replies(_empty_array_cmd_indexes, reply::rewrite_empty_array_reply, replies);
-}
-
-template <typename Impl>
-template <typename Func>
-void QueuedRedis<Impl>::_rewrite_replies(const std::vector<std::size_t> &indexes,
-                                            Func rewriter,
-                                            std::vector<ReplyUPtr> &replies) const {
-    for (auto idx : indexes) {
-        assert(idx < replies.size());
-
-        auto &reply = replies[idx];
-
-        assert(reply);
-
-        rewriter(*reply);
-    }
-}
-
-inline std::size_t QueuedReplies::size() const {
-    return _replies.size();
-}
-
-inline redisReply& QueuedReplies::get(std::size_t idx) {
-    _index_check(idx);
-
-    auto &reply = _replies[idx];
-
-    assert(reply);
-
-    if (reply::is_error(*reply)) {
-        throw_error(*reply);
-    }
-
-    return *reply;
-}
-
-template <typename Result>
-inline Result QueuedReplies::get(std::size_t idx) {
-    auto &reply = get(idx);
-
-    return reply::parse<Result>(reply);
-}
-
-template <typename Output>
-inline void QueuedReplies::get(std::size_t idx, Output output) {
-    auto &reply = get(idx);
-
-    reply::to_array(reply, output);
-}
-
-inline void QueuedReplies::_index_check(std::size_t idx) const {
-    if (idx >= size()) {
-        throw Error("Out of range");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis++.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis++.h
deleted file mode 100644
index 0da0ebb16..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis++.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-#define SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-
-#include "redis.h"
-#include "redis_cluster.h"
-#include "queued_redis.h"
-#include "sentinel.h"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis.h
deleted file mode 100644
index 1333e6b68..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis.h
+++ /dev/null
@@ -1,3631 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_H
-
-#include <string>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <tuple>
-#include "connection_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class Redis {
-public:
-    /// @brief Construct `Redis` instance with connection options and connection pool options.
-    /// @param connection_opts Connection options.
-    /// @param pool_opts Connection pool options.
-    /// @see `ConnectionOptions`
-    /// @see `ConnectionPoolOptions`
-    /// @see https://github.com/sewenew/redis-plus-plus#connection
-    explicit Redis(const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(std::make_shared<ConnectionPool>(pool_opts, connection_opts)) {}
-
-    /// @brief Construct `Redis` instance with URI.
-    /// @param uri URI, e.g. 'tcp://127.0.0.1', 'tcp://127.0.0.1:6379', or 'unix://path/to/socket'.
-    ///            Full URI scheme: 'tcp://[[username:]password@]host[:port][/db]' or
-    ///            unix://[[username:]password@]path-to-unix-domain-socket[/db]
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/37
-    /// @see https://github.com/sewenew/redis-plus-plus#connection
-    explicit Redis(const std::string &uri);
-
-    /// @brief Construct `Redis` instance with Redis sentinel, i.e. get node info from sentinel.
-    /// @param sentinel `Sentinel` instance.
-    /// @param master_name Name of master node.
-    /// @param role Connect to master node or slave node.
-    ///             - Role::MASTER: Connect to master node.
-    ///             - Role::SLAVE: Connect to slave node.
-    /// @param connection_opts Connection options.
-    /// @param pool_opts Connection pool options.
-    /// @see `Sentinel`
-    /// @see `Role`
-    /// @see https://github.com/sewenew/redis-plus-plus#redis-sentinel
-    Redis(const std::shared_ptr<Sentinel> &sentinel,
-            const std::string &master_name,
-            Role role,
-            const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(std::make_shared<ConnectionPool>(SimpleSentinel(sentinel, master_name, role),
-                                                        pool_opts,
-                                                        connection_opts)) {}
-
-    /// @brief `Redis` is not copyable.
-    Redis(const Redis &) = delete;
-
-    /// @brief `Redis` is not copyable.
-    Redis& operator=(const Redis &) = delete;
-
-    /// @brief `Redis` is movable.
-    Redis(Redis &&) = default;
-
-    /// @brief `Redis` is movable.
-    Redis& operator=(Redis &&) = default;
-
-    /// @brief Create a pipeline.
-    /// @param new_connection Whether creating a `Pipeline` object in a new connection.
-    /// @return The created pipeline.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#pipeline
-    Pipeline pipeline(bool new_connection = true);
-
-    /// @brief Create a transaction.
-    /// @param piped Whether commands in a transaction should be sent in a pipeline to reduce RTT.
-    /// @param new_connection Whether creating a `Pipeline` object in a new connection.
-    /// @return The created transaction.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#transaction
-    Transaction transaction(bool piped = false, bool new_connection = true);
-
-    /// @brief Create a subscriber.
-    /// @return The created subscriber.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#publishsubscribe
-    Subscriber subscriber();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type;
-
-    template <typename Result, typename ...Args>
-    Result command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // CONNECTION commands.
-
-    /// @brief Send password to Redis.
-    /// @param password Password.
-    /// @note Normally, you should not call this method.
-    ///       Instead, you should set password with `ConnectionOptions` or URI.
-    /// @see https://redis.io/commands/auth
-    void auth(const StringView &password);
-
-    /// @brief Send user and password to Redis.
-    /// @param user User name.
-    /// @param password Password.
-    /// @note Normally, you should not call this method.
-    ///       Instead, you should set password with `ConnectionOptions` or URI.
-    ///       Also this overload only works with Redis 6.0 or later.
-    /// @see https://redis.io/commands/auth
-    void auth(const StringView &user, const StringView &password);
-
-    /// @brief Ask Redis to return the given message.
-    /// @param msg Message to be sent.
-    /// @return Return the given message.
-    /// @see https://redis.io/commands/echo
-    std::string echo(const StringView &msg);
-
-    /// @brief Test if the connection is alive.
-    /// @return Always return *PONG*.
-    /// @see https://redis.io/commands/ping
-    std::string ping();
-
-    /// @brief Test if the connection is alive.
-    /// @param msg Message sent to Redis.
-    /// @return Return the given message.
-    /// @see https://redis.io/commands/ping
-    std::string ping(const StringView &msg);
-
-    // After sending QUIT, only the current connection will be close, while
-    // other connections in the pool is still open. This is a strange behavior.
-    // So we DO NOT support the QUIT command. If you want to quit connection to
-    // server, just destroy the Redis object.
-    //
-    // void quit();
-
-    // We get a connection from the pool, and send the SELECT command to switch
-    // to a specified DB. However, when we try to send other commands to the
-    // given DB, we might get a different connection from the pool, and these
-    // commands, in fact, work on other DB. e.g.
-    //
-    // redis.select(1); // get a connection from the pool and switch to the 1th DB
-    // redis.get("key"); // might get another connection from the pool,
-    //                   // and try to get 'key' on the default DB
-    //
-    // Obviously, this is NOT what we expect. So we DO NOT support SELECT command.
-    // In order to select a DB, we can specify the DB index with the ConnectionOptions.
-    //
-    // However, since Pipeline and Transaction always send multiple commands on a
-    // single connection, these two classes have a *select* method.
-    //
-    // void select(long long idx);
-
-    /// @brief Swap two Redis databases.
-    /// @param idx1 The index of the first database.
-    /// @param idx2 The index of the second database.
-    /// @see https://redis.io/commands/swapdb
-    void swapdb(long long idx1, long long idx2);
-
-    // SERVER commands.
-
-    /// @brief Rewrite AOF in the background.
-    /// @see https://redis.io/commands/bgrewriteaof
-    void bgrewriteaof();
-
-    /// @brief Save database in the background.
-    /// @see https://redis.io/commands/bgsave
-    void bgsave();
-
-    /// @brief Get the size of the currently selected database.
-    /// @return Number of keys in currently selected database.
-    /// @see https://redis.io/commands/dbsize
-    long long dbsize();
-
-    /// @brief Remove keys of all databases.
-    /// @param async Whether flushing databases asynchronously, i.e. without blocking the server.
-    /// @see https://redis.io/commands/flushall
-    void flushall(bool async = false);
-
-    /// @brief Remove keys of current databases.
-    /// @param async Whether flushing databases asynchronously, i.e. without blocking the server.
-    /// @see https://redis.io/commands/flushdb
-    void flushdb(bool async = false);
-
-    /// @brief Get the info about the server.
-    /// @return Server info.
-    /// @see https://redis.io/commands/info
-    std::string info();
-
-    /// @brief Get the info about the server on the given section.
-    /// @param section Section.
-    /// @return Server info.
-    /// @see https://redis.io/commands/info
-    std::string info(const StringView &section);
-
-    /// @brief Get the UNIX timestamp in seconds, at which the database was saved successfully.
-    /// @return The last saving time.
-    /// @see https://redis.io/commands/lastsave
-    long long lastsave();
-
-    /// @brief Save databases into RDB file **synchronously**, i.e. block the server during saving.
-    /// @see https://redis.io/commands/save
-    void save();
-
-    // KEY commands.
-
-    /// @brief Delete the given key.
-    /// @param key Key.
-    /// @return Number of keys removed.
-    /// @retval 1 If the key exists, and has been removed.
-    /// @retval 0 If the key does not exist.
-    /// @see https://redis.io/commands/del
-    long long del(const StringView &key);
-
-    /// @brief Delete the given list of keys.
-    /// @param first Iterator to the first key in the range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys removed.
-    /// @see https://redis.io/commands/del
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    /// @brief Delete the given list of keys.
-    /// @param il Initializer list of keys to be deleted.
-    /// @return Number of keys removed.
-    /// @see https://redis.io/commands/del
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    /// @brief Get the serialized valued stored at key.
-    /// @param key Key.
-    /// @return The serialized value.
-    /// @note If key does not exist, `dump` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/dump
-    OptionalString dump(const StringView &key);
-
-    /// @brief Check if the given key exists.
-    /// @param key Key.
-    /// @return Whether the given key exists.
-    /// @retval 1 If key exists.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/exists
-    long long exists(const StringView &key);
-
-    /// @brief Check if the given keys exist.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys existing.
-    /// @see https://redis.io/commands/exists
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    /// @brief Check if the given keys exist.
-    /// @param il Initializer list of keys to be checked.
-    /// @return Number of keys existing.
-    /// @see https://redis.io/commands/exists
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in seconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expire
-    bool expire(const StringView &key, long long timeout);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in seconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expire
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in seconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expireat
-    bool expireat(const StringView &key, long long timestamp);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in seconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expireat
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    /// @brief Get keys matching the given pattern.
-    /// @param pattern Pattern.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @note It's always a bad idea to call `keys`, since it might block Redis for a long time,
-    ///       especially when the data set is very big.
-    /// @see `Redis::scan`
-    /// @see https://redis.io/commands/keys
-    template <typename Output>
-    void keys(const StringView &pattern, Output output);
-
-    /// @brief Move a key to the given database.
-    /// @param key Key.
-    /// @param db The destination database.
-    /// @return Whether key has been moved.
-    /// @retval true If key has been moved.
-    /// @retval false If key was not moved.
-    /// @see https://redis.io/commands/move
-    bool move(const StringView &key, long long db);
-
-    /// @brief Remove timeout on key.
-    /// @param key Key.
-    /// @return Whether timeout has been removed.
-    /// @retval true If timeout has been removed.
-    /// @retval false If key does not exist, or does not have an associated timeout.
-    /// @see https://redis.io/commands/persist
-    bool persist(const StringView &key);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in milliseconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpire
-    bool pexpire(const StringView &key, long long timeout);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in milliseconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpire
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in milliseconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpireat
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in milliseconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpireat
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    /// @brief Get the TTL of a key in milliseconds.
-    /// @param key Key.
-    /// @return TTL of the key in milliseconds.
-    /// @see https://redis.io/commands/pttl
-    long long pttl(const StringView &key);
-
-    /// @brief Get a random key from current database.
-    /// @return A random key.
-    /// @note If the database is empty, `randomkey` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/randomkey
-    OptionalString randomkey();
-
-    /// @brief Rename `key` to `newkey`.
-    /// @param key Key to be renamed.
-    /// @param newkey The new name of the key.
-    /// @see https://redis.io/commands/rename
-    void rename(const StringView &key, const StringView &newkey);
-
-    /// @brief Rename `key` to `newkey` if `newkey` does not exist.
-    /// @param key Key to be renamed.
-    /// @param newkey The new name of the key.
-    /// @return Whether key has been renamed.
-    /// @retval true If key has been renamed.
-    /// @retval false If newkey already exists.
-    /// @see https://redis.io/commands/renamenx
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    /// @brief Create a key with the value obtained by `Redis::dump`.
-    /// @param key Key.
-    /// @param val Value obtained by `Redis::dump`.
-    /// @param ttl Timeout of the created key in milliseconds. If `ttl` is 0, set no timeout.
-    /// @param replace Whether to overwrite an existing key.
-    ///                If `replace` is `true` and key already exists, throw an exception.
-    /// @see https://redis.io/commands/restore
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    /// @brief Create a key with the value obtained by `Redis::dump`.
-    /// @param key Key.
-    /// @param val Value obtained by `Redis::dump`.
-    /// @param ttl Timeout of the created key in milliseconds. If `ttl` is 0, set no timeout.
-    /// @param replace Whether to overwrite an existing key.
-    ///                If `replace` is `true` and key already exists, throw an exception.
-    /// @see https://redis.io/commands/restore
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    /// @brief Scan keys of the database matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_set<std::string> keys;
-    /// while (true) {
-    ///     cursor = redis.scan(cursor, "pattern:*", 10, std::inserter(keys, keys.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of the keys to be scanned.
-    /// @param count A hint for how many keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    /// TODO: support the TYPE option for Redis 6.0.
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all keys of the database.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    Output output);
-
-    /// @brief Scan keys of the database matching the given pattern.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of the keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan keys of the database matching the given pattern.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Update the last access time of the given key.
-    /// @param key Key.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    long long touch(const StringView &key);
-
-    /// @brief Update the last access time of the given key.
-    /// @param first Iterator to the first key to be touched.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    /// @brief Update the last access time of the given key.
-    /// @param il Initializer list of keys to be touched.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    /// @brief Get the remaining Time-To-Live of a key.
-    /// @param key Key.
-    /// @return TTL in seconds.
-    /// @retval TTL If the key has a timeout.
-    /// @retval -1 If the key exists but does not have a timeout.
-    /// @retval -2 If the key does not exist.
-    /// @note In Redis 2.6 or older, `ttl` returns -1 if the key does not exist,
-    ///       or if the key exists but does not have a timeout.
-    /// @see https://redis.io/commands/ttl
-    long long ttl(const StringView &key);
-
-    /// @brief Get the type of the value stored at key.
-    /// @param key Key.
-    /// @return The type of the value.
-    /// @see https://redis.io/commands/type
-    std::string type(const StringView &key);
-
-    /// @brief Remove the given key asynchronously, i.e. without blocking Redis.
-    /// @param key Key.
-    /// @return Whether the key has been removed.
-    /// @retval 1 If key exists, and has been removed.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/unlink
-    long long unlink(const StringView &key);
-
-    /// @brief Remove the given keys asynchronously, i.e. without blocking Redis.
-    /// @param first Iterator to the first key in the given range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys that have been removed.
-    /// @see https://redis.io/commands/unlink
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    /// @brief Remove the given keys asynchronously, i.e. without blocking Redis.
-    /// @param il Initializer list of keys to be unlinked.
-    /// @return Number of keys that have been removed.
-    /// @see https://redis.io/commands/unlink
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    /// @brief Wait until previous write commands are successfully replicated to at
-    ///        least the specified number of replicas or the given timeout has been reached.
-    /// @param numslaves Number of replicas.
-    /// @param timeout Timeout in milliseconds. If timeout is 0ms, wait forever.
-    /// @return Number of replicas that have been successfully replicated these write commands.
-    /// @note The return value might be less than `numslaves`, because timeout has been reached.
-    /// @see https://redis.io/commands/wait
-    long long wait(long long numslaves, long long timeout);
-
-    /// @brief Wait until previous write commands are successfully replicated to at
-    ///        least the specified number of replicas or the given timeout has been reached.
-    /// @param numslaves Number of replicas.
-    /// @param timeout Timeout in milliseconds. If timeout is 0ms, wait forever.
-    /// @return Number of replicas that have been successfully replicated these write commands.
-    /// @note The return value might be less than `numslaves`, because timeout has been reached.
-    /// @see https://redis.io/commands/wait
-    /// TODO: Support default parameter for `timeout` to wait forever.
-    long long wait(long long numslaves, const std::chrono::milliseconds &timeout);
-
-    // STRING commands.
-
-    /// @brief Append the given string to the string stored at key.
-    /// @param key Key.
-    /// @param str String to be appended.
-    /// @return The length of the string after the append operation.
-    /// @see https://redis.io/commands/append
-    long long append(const StringView &key, const StringView &str);
-
-    /// @brief Get the number of bits that have been set for the given range of the string.
-    /// @param key Key.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return Number of bits that have been set.
-    /// @note The index can be negative to index from the end of the string.
-    /// @see https://redis.io/commands/bitcount
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    /// @brief Do bit operation on the string stored at `key`, and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param key The key where the string to be operated is stored.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    /// @brief Do bit operations on the strings stored at the given keys,
-    ///        and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param first Iterator to the first key where the string to be operated is stored.
-    /// @param last Off-the-end iterator to the given range of keys.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    /// @brief Do bit operations on the strings stored at the given keys,
-    ///        and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param il Initializer list of keys where the strings are operated.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    /// @brief Get the position of the first bit set to 0 or 1 in the given range of the string.
-    /// @param key Key.
-    /// @param bit 0 or 1.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return The position of the first bit set to 0 or 1.
-    /// @see https://redis.io/commands/bitpos
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    /// @brief Decrement the integer stored at key by 1.
-    /// @param key Key.
-    /// @return The value after the decrement.
-    /// @see https://redis.io/commands/decr
-    long long decr(const StringView &key);
-
-    /// @brief Decrement the integer stored at key by `decrement`.
-    /// @param key Key.
-    /// @param decrement Decrement.
-    /// @return The value after the decrement.
-    /// @see https://redis.io/commands/decrby
-    long long decrby(const StringView &key, long long decrement);
-
-    /// @brief Get the string value stored at key.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto val = redis.get("key");
-    /// if (val)
-    ///     std::cout << *val << std::endl;
-    /// else
-    ///     std::cout << "key not exist" << std::endl;
-    /// @endcode
-    /// @param key Key.
-    /// @return The value stored at key.
-    /// @note If key does not exist, `get` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/get
-    OptionalString get(const StringView &key);
-
-    /// @brief Get the bit value at offset in the string.
-    /// @param key Key.
-    /// @param offset Offset.
-    /// @return The bit value.
-    /// @see https://redis.io/commands/getbit
-    long long getbit(const StringView &key, long long offset);
-
-    /// @brief Get the substring of the string stored at key.
-    /// @param key Key.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return The substring in range [start, end]. If key does not exist, return an empty string.
-    /// @see https://redis.io/commands/getrange
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    /// @brief Atomically set the string stored at `key` to `val`, and return the old value.
-    /// @param key Key.
-    /// @param val Value to be set.
-    /// @return The old value stored at key.
-    /// @note If key does not exist, `getset` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/getset
-    /// @see `OptionalString`
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    /// @brief Increment the integer stored at key by 1.
-    /// @param key Key.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incr
-    long long incr(const StringView &key);
-
-    /// @brief Increment the integer stored at key by `increment`.
-    /// @param key Key.
-    /// @param increment Increment.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incrby
-    long long incrby(const StringView &key, long long increment);
-
-    /// @brief Increment the floating point number stored at key by `increment`.
-    /// @param key Key.
-    /// @param increment Increment.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incrbyfloat
-    double incrbyfloat(const StringView &key, double increment);
-
-    /// @brief Get the values of multiple keys atomically.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// std::vector<OptionalString> vals;
-    /// redis.mget(keys.begin(), keys.end(), std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "key does not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param first Iterator to the first key of the given range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @param output Output iterator to the destination where the values are stored.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given key might not exist (in this case, the value of the corresponding
-    ///       key is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/mget
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    /// @brief Get the values of multiple keys atomically.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<OptionalString> vals;
-    /// redis.mget({"k1", "k2", "k3"}, std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "key does not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param il Initializer list of keys.
-    /// @param output Output iterator to the destination where the values are stored.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given key might not exist (in this case, the value of the corresponding
-    ///       key is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/mget
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    /// @brief Set multiple key-value pairs.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::pair<std::string, std::string>> kvs1 = {{"k1", "v1"}, {"k2", "v2"}};
-    /// redis.mset(kvs1.begin(), kvs1.end());
-    /// std::unordered_map<std::string, std::string> kvs2 = {{"k3", "v3"}, {"k4", "v4"}};
-    /// redis.mset(kvs2.begin(), kvs2.end());
-    /// @endcode
-    /// @param first Iterator to the first key-value pair.
-    /// @param last Off-the-end iterator to the given range.
-    /// @see https://redis.io/commands/mset
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    /// @brief Set multiple key-value pairs.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.mset({std::make_pair("k1", "v1"), std::make_pair("k2", "v2")});
-    /// @endcode
-    /// @param il Initializer list of key-value pairs.
-    /// @see https://redis.io/commands/mset
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    /// @brief Set the given key-value pairs if all specified keys do not exist.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::pair<std::string, std::string>> kvs1;
-    /// redis.msetnx(kvs1.begin(), kvs1.end());
-    /// std::unordered_map<std::string, std::string> kvs2;
-    /// redis.msetnx(kvs2.begin(), kvs2.end());
-    /// @endcode
-    /// @param first Iterator to the first key-value pair.
-    /// @param last Off-the-end iterator of the given range.
-    /// @return Whether all keys have been set.
-    /// @retval true If all keys have been set.
-    /// @retval false If no key was set, i.e. at least one key already exist.
-    /// @see https://redis.io/commands/msetnx
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    /// @brief Set the given key-value pairs if all specified keys do not exist.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.msetnx({make_pair("k1", "v1"), make_pair("k2", "v2")});
-    /// @endcode
-    /// @param il Initializer list of key-value pairs.
-    /// @return Whether all keys have been set.
-    /// @retval true If all keys have been set.
-    /// @retval false If no key was set, i.e. at least one key already exist.
-    /// @see https://redis.io/commands/msetnx
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    /// @brief Set key-value pair with the given timeout in milliseconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in milliseconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/psetex
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    /// @brief Set key-value pair with the given timeout in milliseconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in milliseconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/psetex
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    /// @brief Set a key-value pair.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Set a key-value pair.
-    /// redis.set("key", "value");
-    /// // Set a key-value pair, and expire it after 10 seconds.
-    /// redis.set("key", "value", std::chrono::seconds(10));
-    /// // Set a key-value pair with a timeout, only if the key already exists.
-    /// if (redis.set("key", "value", std::chrono::seconds(10), UpdateType::EXIST))
-    ///     std::cout << "OK" << std::endl;
-    /// else
-    ///     std::cout << "key does not exist" << std::endl;
-    /// @endcode
-    /// @param key Key.
-    /// @param val Value.
-    /// @param ttl Timeout on the key. If `ttl` is 0ms, do not set timeout.
-    /// @param type Options for set command:
-    ///             - UpdateType::EXIST: Set the key only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Set the key only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always set the key no matter whether it exists.
-    /// @return Whether the key has been set.
-    /// @retval true If the key has been set.
-    /// @retval false If the key was not set, because of the given option.
-    /// @see https://redis.io/commands/set
-    // TODO: Support KEEPTTL option for Redis 6.0
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    // TODO: add SETBIT command.
-
-    /// @brief Set key-value pair with the given timeout in seconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in seconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/setex
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    /// @brief Set key-value pair with the given timeout in seconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in seconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/setex
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    /// @brief Set the key if it does not exist.
-    /// @param key Key.
-    /// @param val Value.
-    /// @return Whether the key has been set.
-    /// @retval true If the key has been set.
-    /// @retval false If the key was not set, i.e. the key already exists.
-    /// @see https://redis.io/commands/setnx
-    bool setnx(const StringView &key, const StringView &val);
-
-    /// @brief Set the substring starting from `offset` to the given value.
-    /// @param key Key.
-    /// @param offset Offset.
-    /// @param val Value.
-    /// @return The length of the string after this operation.
-    /// @see https://redis.io/commands/setrange
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    /// @brief Get the length of the string stored at key.
-    /// @param key Key.
-    /// @return The length of the string.
-    /// @note If key does not exist, `strlen` returns 0.
-    /// @see https://redis.io/commands/strlen
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    /// @brief Pop the first element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    /// @brief Pop the first element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param il Initializer list of keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param il Initializer list of keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the last element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    /// @brief Pop the last element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param il Initializer list of lists.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param first Iterator to the first list.
-    /// @param last Off-the-end iterator to the list range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param il Initializer list of list keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop last element of one list and push it to the left of another list in blocking way.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @param timeout Timeout. 0 means block forever.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `brpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::rpoplpush`
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    /// @brief Pop last element of one list and push it to the left of another list in blocking way.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @param timeout Timeout. 0 means block forever.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `brpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::rpoplpush`
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Get the element at the given index of the list.
-    /// @param key Key where the list is stored.
-    /// @param index Zero-base index, and -1 means the last element.
-    /// @return The element at the given index.
-    /// @see https://redis.io/commands/lindex
-    OptionalString lindex(const StringView &key, long long index);
-
-    /// @brief Insert an element to a list before or after the pivot element.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Insert 'hello' before 'world'
-    /// auto len = redis.linsert("list", InsertPosition::BEFORE, "world", "hello");
-    /// if (len == -1)
-    ///     std::cout << "there's no 'world' in the list" << std::endl;
-    /// else
-    ///     std::cout << "after the operation, the length of the list is " << len << std::endl;
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param position Before or after the pivot element.
-    /// @param pivot The pivot value. The `pivot` is the value of the element, not the index.
-    /// @param val Element to be inserted.
-    /// @return The length of the list after the operation.
-    /// @note If the pivot value is not found, `linsert` returns -1.
-    /// @see `InsertPosition`
-    /// @see https://redis.io/commands/linsert
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    /// @brief Get the length of the list.
-    /// @param key Key where the list is stored.
-    /// @return The length of the list.
-    /// @see https://redis.io/commands/llen
-    long long llen(const StringView &key);
-
-    /// @brief Pop the first element of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto element = redis.lpop("list");
-    /// if (element)
-    ///     std::cout << *element << std::endl;
-    /// else
-    ///     std::cout << "list is empty, i.e. list does not exist" << std::endl;
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @return The popped element.
-    /// @note If list is empty, i.e. key does not exist, return `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/lpop
-    OptionalString lpop(const StringView &key);
-
-    /// @brief Push an element to the beginning of the list.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    long long lpush(const StringView &key, const StringView &val);
-
-    /// @brief Push multiple elements to the beginning of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> elements = {"e1", "e2", "e3"};
-    /// redis.lpush("list", elements.begin(), elements.end());
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param first Iterator to the first element to be pushed.
-    /// @param last Off-the-end iterator to the given element range.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    /// @brief Push multiple elements to the beginning of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.lpush("list", {"e1", "e2", "e3"});
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param il Initializer list of elements.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    /// @brief Push an element to the beginning of the list, only if the list already exists.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpushx
-    // TODO: add a multiple elements overload.
-    long long lpushx(const StringView &key, const StringView &val);
-
-    /// @brief Get elements in the given range of the given list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> elements;
-    /// // Save all elements of a Redis list to a vector of string.
-    /// redis.lrange("list", 0, -1, std::back_inserter(elements));
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param start Start index of the range. Index can be negative, which mean index from the end.
-    /// @param stop End index of the range.
-    /// @param output Output iterator to the destination where the results are saved.
-    /// @see https://redis.io/commands/lrange
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Remove the first `count` occurrences of elements equal to `val`.
-    /// @param key Key where the list is stored.
-    /// @param count Number of occurrences to be removed.
-    /// @param val Value.
-    /// @return Number of elements removed.
-    /// @note `count` can be positive, negative and 0. Check the reference for detail.
-    /// @see https://redis.io/commands/lrem
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    /// @brief Set the element at the given index to the specified value.
-    /// @param key Key where the list is stored.
-    /// @param index Index of the element to be set.
-    /// @param val Value.
-    /// @see https://redis.io/commands/lset
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    /// @brief Trim a list to keep only element in the given range.
-    /// @param key Key where the key is stored.
-    /// @param start Start of the index.
-    /// @param stop End of the index.
-    /// @see https://redis.io/commands/ltrim
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    /// @brief Pop the last element of a list.
-    /// @param key Key where the list is stored.
-    /// @return The popped element.
-    /// @note If the list is empty, i.e. key does not exist, `rpop` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/rpop
-    OptionalString rpop(const StringView &key);
-
-    /// @brief Pop last element of one list and push it to the left of another list.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `rpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    /// @brief Push an element to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    long long rpush(const StringView &key, const StringView &val);
-
-    /// @brief Push multiple elements to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param first Iterator to the first element to be pushed.
-    /// @param last Off-the-end iterator to the given element range.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    /// @brief Push multiple elements to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param il Initializer list of elements to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    /// @brief Push an element to the end of the list, only if the list already exists.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpushx
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    /// @brief Remove the given field from hash.
-    /// @param key Key where the hash is stored.
-    /// @param field Field to be removed.
-    /// @return Whether the field has been removed.
-    /// @retval 1 If the field exists, and has been removed.
-    /// @retval 0 If the field does not exist.
-    /// @see https://redis.io/commands/hdel
-    long long hdel(const StringView &key, const StringView &field);
-
-    /// @brief Remove multiple fields from hash.
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field to be removed.
-    /// @param last Off-the-end iterator to the given field range.
-    /// @return Number of fields that has been removed.
-    /// @see https://redis.io/commands/hdel
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple fields from hash.
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of fields.
-    /// @return Number of fields that has been removed.
-    /// @see https://redis.io/commands/hdel
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    /// @brief Check if the given field exists in hash.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Whether the field exists.
-    /// @retval true If the field exists in hash.
-    /// @retval false If the field does not exist.
-    /// @see https://redis.io/commands/hexists
-    bool hexists(const StringView &key, const StringView &field);
-
-    /// @brief Get the value of the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Value of the given field.
-    /// @note If field does not exist, `hget` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/hget
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    /// @brief Get all field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> results;
-    /// // Save all field-value pairs of a Redis hash to an unordered_map<string, string>.
-    /// redis.hgetall("hash", std::inserter(results, results.begin()));
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hgetall` on a large hash, since it will block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hgetall
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    /// @brief Increment the integer stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param increment Increment.
-    /// @return The value of the field after the increment.
-    /// @see https://redis.io/commands/hincrby
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    /// @brief Increment the floating point number stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param increment Increment.
-    /// @return The value of the field after the increment.
-    /// @see https://redis.io/commands/hincrbyfloat
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    /// @brief Get all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hkeys` on a large hash, since it will block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hkeys
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    /// @brief Get the number of fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @return Number of fields.
-    /// @see https://redis.io/commands/hlen
-    long long hlen(const StringView &key);
-
-    /// @brief Get values of multiple fields.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> fields = {"f1", "f2"};
-    /// std::vector<OptionalString> vals;
-    /// redis.hmget("hash", fields.begin(), fields.end(), std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "field not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field.
-    /// @param last Off-the-end iterator to the given field range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given field might not exist (in this case, the value of the corresponding
-    ///       field is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/hmget
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    /// @brief Get values of multiple fields.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<OptionalString> vals;
-    /// redis.hmget("hash", {"f1", "f2"}, std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "field not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of fields.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given field might not exist (in this case, the value of the corresponding
-    ///       field is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/hmget
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    /// @brief Set multiple field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> m = {{"f1", "v1"}, {"f2", "v2"}};
-    /// redis.hmset("hash", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field-value pair.
-    /// @param last Off-the-end iterator to the range.
-    /// @see https://redis.io/commands/hmset
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    /// @brief Set multiple field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.hmset("hash", {std::make_pair("f1", "v1"), std::make_pair("f2", "v2")});
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of field-value pairs.
-    /// @see https://redis.io/commands/hmset
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    /// @brief Scan fields of the given hash matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_map<std::string, std::string> kvs;
-    /// while (true) {
-    ///     cursor = redis.hscan("hash", cursor, "pattern:*", 10, std::inserter(kvs, kvs.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan fields of the given hash matching the given pattern.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Set hash field to value.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param val Value.
-    /// @return Whether the given field is a new field.
-    /// @retval true If the given field didn't exist, and a new field has been added.
-    /// @retval false If the given field already exists, and its value has been overwritten.
-    /// @note When `hset` returns false, it does not mean that the method failed to set the field.
-    ///       Instead, it means that the field already exists, and we've overwritten its value.
-    ///       If `hset` fails, it will throw an exception of `Exception` type.
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/9
-    /// @see https://redis.io/commands/hset
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    /// @brief Set hash field to value.
-    /// @param key Key where the hash is stored.
-    /// @param item The field-value pair to be set.
-    /// @return Whether the given field is a new field.
-    /// @retval true If the given field didn't exist, and a new field has been added.
-    /// @retval false If the given field already exists, and its value has been overwritten.
-    /// @note When `hset` returns false, it does not mean that the method failed to set the field.
-    ///       Instead, it means that the field already exists, and we've overwritten its value.
-    ///       If `hset` fails, it will throw an exception of `Exception` type.
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/9
-    /// @see https://redis.io/commands/hset
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    /// @brief Set multiple fields of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> m = {{"f1", "v1"}, {"f2", "v2"}};
-    /// redis.hset("hash", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field to be set.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of fields that have been added, i.e. fields that not existed before.
-    /// @see https://redis.io/commands/hset
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value, long long>::type;
-
-    /// @brief Set multiple fields of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.hset("hash", {std::make_pair("f1", "v1"), std::make_pair("f2", "v2")});
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of field-value pairs.
-    /// @return Number of fields that have been added, i.e. fields that not existed before.
-    /// @see https://redis.io/commands/hset
-    template <typename T>
-    long long hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    /// @brief Set hash field to value, only if the given field does not exist.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param val Value.
-    /// @return Whether the field has been set.
-    /// @retval true If the field has been set.
-    /// @retval false If failed to set the field, i.e. the field already exists.
-    /// @see https://redis.io/commands/hsetnx
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    /// @brief Set hash field to value, only if the given field does not exist.
-    /// @param key Key where the hash is stored.
-    /// @param item The field-value pair to be set.
-    /// @return Whether the field has been set.
-    /// @retval true If the field has been set.
-    /// @retval false If failed to set the field, i.e. the field already exists.
-    /// @see https://redis.io/commands/hsetnx
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    /// @brief Get the length of the string stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Length of the string.
-    /// @see https://redis.io/commands/hstrlen
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    /// @brief Get values of all fields stored at the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hvals` on a large hash, since it might block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hvals
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    /// @brief Add a member to the given set.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be added.
-    /// @return Whether the given member is a new member.
-    /// @retval 1 The member did not exist before, and it has been added now.
-    /// @retval 0 The member already exists before this operation.
-    /// @see https://redis.io/commands/sadd
-    long long sadd(const StringView &key, const StringView &member);
-
-    /// @brief Add multiple members to the given set.
-    /// @param key Key where the set is stored.
-    /// @param first Iterator to the first member to be added.
-    /// @param last Off-the-end iterator to the member range.
-    /// @return Number of new members that have been added, i.e. members did not exist before.
-    /// @see https://redis.io/commands/sadd
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    /// @brief Add multiple members to the given set.
-    /// @param key Key where the set is stored.
-    /// @param il Initializer list of members to be added.
-    /// @return Number of new members that have been added, i.e. members did not exist before.
-    /// @see https://redis.io/commands/sadd
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    /// @brief Get the number of members in the set.
-    /// @param key Key where the set is stored.
-    /// @return Number of members.
-    /// @see https://redis.io/commands/scard
-    long long scard(const StringView &key);
-
-    /// @brief Get the difference between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sdiff
-    // TODO: `void sdiff(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    /// @brief Get the difference between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sdiff
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sdiffstore
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sdiff`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sdiffstore
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    /// @brief Same as `sdiff`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sdiffstore
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    /// @brief Get the intersection between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sinter
-    // TODO: `void sinter(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    /// @brief Get the intersection between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sinter
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sinter
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sinter`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sinter
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    /// @brief Same as `sinter`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sinter
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    /// @brief Test if `member` exists in the set stored at key.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be checked.
-    /// @return Whether `member` exists in the set.
-    /// @retval true If it exists in the set.
-    /// @retval false If it does not exist in the set, or the given key does not exist.
-    /// @see https://redis.io/commands/sismember
-    bool sismember(const StringView &key, const StringView &member);
-
-    /// @brief Get all members in the given set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_set<std::string> members1;
-    /// redis.smembers("set", std::inserter(members1, members1.begin()));
-    /// std::vector<std::string> members2;
-    /// redis.smembers("set", std::back_inserter(members2));
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param output Iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/smembers
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    /// @brief Move `member` from one set to another.
-    /// @param source Key of the set in which the member currently exists.
-    /// @param destination Key of the destination set.
-    /// @return Whether the member has been moved.
-    /// @retval true If the member has been moved.
-    /// @retval false If `member` does not exist in `source`.
-    /// @see https://redis.io/commands/smove
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    /// @brief Remove a random member from the set.
-    /// @param key Key where the set is stored.
-    /// @return The popped member.
-    /// @note If the set is empty, `spop` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::srandmember`
-    /// @see https://redis.io/commands/spop
-    OptionalString spop(const StringView &key);
-
-    /// @brief Remove multiple random members from the set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> members;
-    /// redis.spop("set", 10, std::back_inserter(members));
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of popped members might be less than `count`.
-    /// @see `Redis::srandmember`
-    /// @see https://redis.io/commands/spop
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    /// @brief Get a random member of the given set.
-    /// @param key Key where the set is stored.
-    /// @return A random member.
-    /// @note If the set is empty, `srandmember` returns `OptionalString{}` (`std::nullopt`).
-    /// @note This method won't remove the member from the set.
-    /// @see `Redis::spop`
-    /// @see https://redis.io/commands/srandmember
-    OptionalString srandmember(const StringView &key);
-
-    /// @brief Get multiple random members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param count Number of members to be returned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method won't remove members from the set.
-    /// @see `Redis::spop`
-    /// @see https://redis.io/commands/srandmember
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    /// @brief Remove a member from set.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be removed.
-    /// @return Whether the member has been removed.
-    /// @retval 1 If the given member exists, and has been removed.
-    /// @retval 0 If the given member does not exist.
-    /// @see https://redis.io/commands/srem
-    long long srem(const StringView &key, const StringView &member);
-
-    /// @brief Remove multiple members from set.
-    /// @param key Key where the set is stored.
-    /// @param first Iterator to the first member to be removed.
-    /// @param last Off-the-end iterator to the range.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/srem
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple members from set.
-    /// @param key Key where the set is stored.
-    /// @param il Initializer list of members to be removed.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/srem
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    /// @brief Scan members of the set matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_set<std::string> members;
-    /// while (true) {
-    ///     cursor = redis.sscan("set", cursor, "pattern:*",
-    ///         10, std::inserter(members, members.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan members of the set matching the given pattern.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Get the union between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sunion
-    // TODO: `void sunion(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    /// @brief Get the union between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sunion
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sunionstore
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sunion`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sunionstore
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    /// @brief Same as `sunion`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sunionstore
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    /// @brief Pop the member with highest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the highest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the highest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with lowest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Add or update a member with score to sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member to be added.
-    /// @param score Score of the member.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    /// @brief Add or update multiple members with score to sorted set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, double> m = {{"m1", 1.2}, {"m2", 2.3}};
-    /// redis.zadd("zset", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member-score pair.
-    /// @param last Off-the-end iterator to the member-score pairs range.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    /// @brief Add or update multiple members with score to sorted set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.zadd("zset", {std::make_pair("m1", 1.4), std::make_pair("m2", 2.3)});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member-score pair.
-    /// @param last Off-the-end iterator to the member-score pairs range.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    /// @brief Get the number of members in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Number of members in the sorted set.
-    /// @see https://redis.io/commands/zcard
-    long long zcard(const StringView &key);
-
-    /// @brief Get the number of members with score between a min-max score range.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Count members with score between (2.3, 5]
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::LEFT_OPEN));
-    /// // Count members with score between [2.3, 5)
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::RIGHT_OPEN));
-    /// // Count members with score between (2.3, 5)
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::OPEN));
-    /// // Count members with score between [2.3, 5]
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::CLOSED));
-    /// // Count members with score between [2.3, +inf)
-    /// redis.zcount("zset", LeftBoundedInterval<double>(2.3, BoundType::RIGHT_OPEN));
-    /// // Count members with score between (2.3, +inf)
-    /// redis.zcount("zset", LeftBoundedInterval<double>(2.3, BoundType::OPEN));
-    /// // Count members with score between (-inf, 5]
-    /// redis.zcount("zset", RightBoundedInterval<double>(5, BoundType::LEFT_OPEN));
-    /// // Count members with score between (-inf, 5)
-    /// redis.zcount("zset", RightBoundedInterval<double>(5, BoundType::OPEN));
-    /// // Count members with score between (-inf, +inf)
-    /// redis.zcount("zset", UnboundedInterval<double>{});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval The min-max score range.
-    /// @return Number of members with score between a min-max score range.
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zcount
-    // TODO: add a string version of Interval: zcount("key", "(2.3", "5").
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    /// @brief Increment the score of given member.
-    /// @param key Key where the sorted set is stored.
-    /// @param increment Increment.
-    /// @param member Member.
-    /// @return The score of the member after the operation.
-    /// @see https://redis.io/commands/zincrby
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    /// @brief Copy a sorted set to another one with the scores being multiplied by a factor.
-    /// @param destination Key of the destination sorted set.
-    /// @param key Key of the source sorted set.
-    /// @param weight Weight to be multiplied to the score of each member.
-    /// @return The number of members in the sorted set.
-    /// @note  There's no aggregation type parameter for single key overload, since these 3 types
-    ///         have the same effect.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    /// @brief Get intersection of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// redis.zinterstore("destination", keys.begin(), keys.end());
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// std::vector<std::pair<std::string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}};
-    /// redis.zinterstore("destination", keys_with_weights.begin(),
-    ///     keys_with_weights.end(), Aggregation::MIN);
-    /// // NOTE: `keys_with_weights` can also be of type `std::unordered_map<std::string, double>`.
-    /// // However, it will be slower than std::vector<std::pair<std::string, double>>, since we use
-    /// // `std::distance(first, last)` to calculate the *numkeys* parameter.
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param first Iterator to the first sorted set (might with weight).
-    /// @param last Off-the-end iterator to the sorted set range.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `Input` is an
-    ///       iterator to a container of `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZINTERSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///        If `Input` is an iterator to a container of `std::pair<std::string, double>`,
-    ///        i.e. key-weight pair, we send the command with the given weights:
-    ///       *ZINTERSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    /// @brief Get intersection of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// redis.zinterstore("destination", {"k1", "k2"});
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// redis.zinterstore("destination",
-    ///     {std::make_pair("k1", 1), std::make_pair("k2", 2)}, Aggregation::MIN);
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param il Initializer list of sorted set.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `T` is
-    ///       of type `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZINTERSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///       If `T` is of type `std::pair<std::string, double>`, i.e. key-weight pair,
-    ///       we send the command with the given weights:
-    ///       *ZINTERSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    /// @brief Get the number of members between a min-max range in lexicographical order.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Count members between (abc, abd]
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::LEFT_OPEN));
-    /// // Count members between [abc, abd)
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::RIGHT_OPEN));
-    /// // Count members between (abc, abd)
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::OPEN));
-    /// // Count members between [abc, abd]
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED));
-    /// // Count members between [abc, +inf)
-    /// redis.zlexcount("zset", LeftBoundedInterval<std::string>("abc", BoundType::RIGHT_OPEN));
-    /// // Count members between (abc, +inf)
-    /// redis.zlexcount("zset", LeftBoundedInterval<std::string>("abc", BoundType::OPEN));
-    /// // Count members between (-inf, "abd"]
-    /// redis.zlexcount("zset", RightBoundedInterval<std::string>("abd", BoundType::LEFT_OPEN));
-    /// // Count members between (-inf, "abd")
-    /// redis.zlexcount("zset", RightBoundedInterval<std::string>("abd", BoundType::OPEN));
-    /// // Count members between (-inf, +inf)
-    /// redis.zlexcount("zset", UnboundedInterval<std::string>{});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval The min-max range in lexicographical order.
-    /// @return Number of members between a min-max range in lexicographical order.
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zlexcount
-    // TODO: add a string version of Interval: zlexcount("key", "(abc", "abd").
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    /// @brief Pop the member with highest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Member-score pair with the highest score.
-    /// @note If sorted set is empty `zpopmax` returns
-    ///       `Optional<std::pair<std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::bzpopmax`
-    /// @see https://redis.io/commands/zpopmax
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    /// @brief Pop multiple members with highest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of returned members might be less than `count`.
-    /// @see `Redis::bzpopmax`
-    /// @see https://redis.io/commands/zpopmax
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    /// @brief Pop the member with lowest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Member-score pair with the lowest score.
-    /// @note If sorted set is empty `zpopmin` returns
-    ///       `Optional<std::pair<std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::bzpopmin`
-    /// @see https://redis.io/commands/zpopmin
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    /// @brief Pop multiple members with lowest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of returned members might be less than `count`.
-    /// @see `Redis::bzpopmin`
-    /// @see https://redis.io/commands/zpopmin
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    /// @brief Get a range of members by rank (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // send *ZRANGE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// redis.zrange("zset", 0, -1, std::back_inserter(result));
-    /// // send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// redis.zrange("zset", 0, -1, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank. Inclusive and can be negative.
-    /// @param stop Stop rank. Inclusive and can be negative.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGE key start stop* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGE key start stop WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @see `Redis::zrevrange`
-    /// @see https://redis.io/commands/zrange
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Get members between [abc, abd].
-    /// redis.zrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `Redis::zrevrangebylex`
-    /// @see https://redis.io/commands/zrangebylex
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Limit the result to at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members between [abc, abd].
-    /// redis.zrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     opts, std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `LimitOptions`
-    /// @see `Redis::zrevrangebylex`
-    /// @see https://redis.io/commands/zrangebylex
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get a range of members by score (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Get members whose score between (3, 6).
-    /// redis.zrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf).
-    /// redis.zrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrevrangebyscore`
-    /// @see https://redis.io/commands/zrangebyscore
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by score (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Only return at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members whose score between (3, 6).
-    /// redis.zrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     opts, std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf).
-    /// redis.zrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     opts, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrevrangebyscore`
-    /// @see https://redis.io/commands/zrangebyscore
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get the rank (from low to high) of the given member in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The rank of the given member.
-    /// @note If the member does not exist, `zrank` returns `OptionalLongLong{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zrank
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    /// @brief Remove the given member from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member to be removed.
-    /// @return Whether the member has been removed.
-    /// @retval 1 If the member exists, and has been removed.
-    /// @retval 0 If the member does not exist.
-    /// @see https://redis.io/commands/zrem
-    long long zrem(const StringView &key, const StringView &member);
-
-    /// @brief Remove multiple members from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/zrem
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple members from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param il Initializer list of members to be removed.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/zrem
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    /// @brief Remove members in the given range of lexicographical order.
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @return Number of members removed.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zremrangebylex
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    /// @brief Remove members in the given range ordered by rank.
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank.
-    /// @param stop Stop rank.
-    /// @return Number of members removed.
-    /// @see https://redis.io/commands/zremrangebyrank
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    /// @brief Remove members in the given range ordered by score.
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @return Number of members removed.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see https://redis.io/commands/zremrangebyscore
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    /// @brief Get a range of members by rank (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // send *ZREVRANGE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// redis.zrevrange("key", 0, -1, std::back_inserter(result));
-    /// // send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// redis.zrevrange("key", 0, -1, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank. Inclusive and can be negative.
-    /// @param stop Stop rank. Inclusive and can be negative.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGE key start stop* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGE key start stop WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @see `Redis::zrange`
-    /// @see https://redis.io/commands/zrevrange
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Get members between [abc, abd] in reverse order.
-    /// redis.zrevrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `Redis::zrangebylex`
-    /// @see https://redis.io/commands/zrevrangebylex
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Limit the result to at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members between [abc, abd] in reverse order.
-    /// redis.zrevrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     opts, std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `LimitOptions`
-    /// @see `Redis::zrangebylex`
-    /// @see https://redis.io/commands/zrevrangebylex
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get a range of members by score (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZREVRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Get members whose score between (3, 6) in reverse order.
-    /// redis.zrevrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf) in reverse order.
-    /// redis.zrevrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrangebyscore`
-    /// @see https://redis.io/commands/zrevrangebyscore
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by score (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZREVRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Only return at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members whose score between (3, 6) in reverse order.
-    /// redis.zrevrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     opts, std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf) in reverse order.
-    /// redis.zrevrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     opts, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrangebyscore`
-    /// @see https://redis.io/commands/zrevrangebyscore
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    /// @brief Get the rank (from high to low) of the given member in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The rank of the given member.
-    /// @note If the member does not exist, `zrevrank` returns `OptionalLongLong{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zrevrank
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    /// @brief Scan members of the given sorted set matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::vector<std::pair<std::string, double>> members;
-    /// while (true) {
-    ///     cursor = redis.zscan("zset", cursor, "pattern:*",
-    ///         10, std::back_inserter(members));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of members to be scanned.
-    /// @param count A hint for how many members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan members of the given sorted set matching the given pattern.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all members of the given sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all members of the given sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Get the score of the given member.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The score of the member.
-    /// @note If member does not exist, `zscore` returns `OptionalDouble{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zscore
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    /// @brief Copy a sorted set to another one with the scores being multiplied by a factor.
-    /// @param destination Key of the destination sorted set.
-    /// @param key Key of the source sorted set.
-    /// @param weight Weight to be multiplied to the score of each member.
-    /// @return The number of members in the sorted set.
-    /// @note  There's no aggregation type parameter for single key overload, since these 3 types
-    ///         have the same effect.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zinterstore
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    /// @brief Get union of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// redis.zunionstore("destination", keys.begin(), keys.end());
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// std::vector<std::pair<std::string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}};
-    /// redis.zunionstore("destination", keys_with_weights.begin(),
-    ///     keys_with_weights.end(), Aggregation::MIN);
-    /// // NOTE: `keys_with_weights` can also be of type `std::unordered_map<std::string, double>`.
-    /// // However, it will be slower than std::vector<std::pair<std::string, double>>, since we use
-    /// // `std::distance(first, last)` to calculate the *numkeys* parameter.
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param first Iterator to the first sorted set (might with weight).
-    /// @param last Off-the-end iterator to the sorted set range.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `Input` is an
-    ///       iterator to a container of `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///        If `Input` is an iterator to a container of `std::pair<std::string, double>`,
-    ///        i.e. key-weight pair, we send the command with the given weights:
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zunionstore
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    /// @brief Get union of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// redis.zunionstore("destination", {"k1", "k2"});
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// redis.zunionstore("destination",
-    ///     {std::make_pair("k1", 1), std::make_pair("k2", 2)}, Aggregation::MIN);
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param il Initializer list of sorted set.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `T` is
-    ///       of type `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///       If `T` is of type `std::pair<std::string, double>`, i.e. key-weight pair,
-    ///       we send the command with the given weights:
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zunionstore
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    /// @brief Add the given element to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param element Element to be added.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    bool pfadd(const StringView &key, const StringView &element);
-
-    /// @brief Add the given elements to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param first Iterator to the first element.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    /// @brief Add the given elements to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param il Initializer list of elements to be added.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    OptionalString geohash(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    Optional<std::pair<double, double>> geopos(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-
-    /// @brief Get members in geo range, i.e. a circle, and store them in a sorted set.
-    /// @param key Key of the GEO set.
-    /// @param loc Location encoded with <longitude, latitude> pair.
-    /// @param radius Radius of the range.
-    /// @param unit Radius unit.
-    /// @param destination Key of the destination sorted set.
-    /// @param store_dist Whether store distance info instead of geo info to destination.
-    /// @param count Limit the first N members.
-    /// @return Number of members stored in destination.
-    /// @note Before Redis 6.2.6, if key does not exist, returns `OptionalLongLong{}` (`std::nullopt`).
-    ///       Since Redis 6.2.6, if key does not exist, returns 0.
-    /// @see `GeoUnit`
-    /// @see `Redis::georadiusbymember`
-    /// @see https://redis.io/commands/georadius
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    /// @brief Get members in geo range, i.e. a circle, and store them in a sorted set.
-    /// @param key Key of the GEO set.
-    /// @param member Member which is the center of the circle.
-    /// @param radius Radius of the range.
-    /// @param unit Radius unit.
-    /// @param destination Key of the destination sorted set.
-    /// @param store_dist Whether store distance info instead of geo info to destination.
-    /// @param count Limit the first N members.
-    /// @return Number of members stored in destination.
-    /// @note Before Redis 6.2.6, if key does not exist, returns `OptionalLongLong{}` (`std::nullopt`).
-    ///       Since Redis 6.2.6, if key does not exist, returns 0.
-    /// @note If member does not exist, throw an `ReplyError`.
-    /// @see `GeoUnit`
-    /// @see `Redis::georadius`
-    /// @see https://redis.io/commands/georadiusbymember
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result, typename Keys, typename Args>
-    Result eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last);
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last,
-                Output output);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result, typename Keys, typename Args>
-    Result evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last,
-                    Output output);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    /// @brief Check if the given script exists.
-    /// @param sha1 SHA1 digest of the script.
-    /// @return Whether the script exists.
-    /// @retval true If the script exists.
-    /// @retval false If the script does not exist.
-    /// @see https://redis.io/commands/script-exists
-    bool script_exists(const StringView &sha1);
-
-    template <typename Input, typename Output>
-    void script_exists(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void script_exists(std::initializer_list<T> il, Output output) {
-        script_exists(il.begin(), il.end(), output);
-    }
-
-    void script_flush();
-
-    void script_kill();
-
-    std::string script_load(const StringView &script);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Transaction commands.
-    void watch(const StringView &key);
-
-    template <typename Input>
-    void watch(Input first, Input last);
-
-    template <typename T>
-    void watch(std::initializer_list<T> il) {
-        watch(il.begin(), il.end());
-    }
-
-    void unwatch();
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first ,last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    friend class RedisCluster;
-
-    // For internal use.
-    explicit Redis(const GuardedConnectionSPtr &connection);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Connection &connection, Cmd cmd, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    // Pool Mode.
-    // Public constructors create a *Redis* instance with a pool.
-    // In this case, *_connection* is a null pointer, and is never used.
-    ConnectionPoolSPtr _pool;
-
-    // Single Connection Mode.
-    // Private constructor creates a *Redis* instance with a single connection.
-    // This is used when we create Transaction, Pipeline and Subscriber.
-    // In this case, *_pool* is empty, and is never used.
-    GuardedConnectionSPtr _connection;
-};
-
-}
-
-}
-
-#include "redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis.hpp b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis.hpp
deleted file mode 100644
index c560ce111..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis.hpp
+++ /dev/null
@@ -1,1342 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_HPP
-
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename ...Args>
-auto Redis::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    if (_connection) {
-        // Single Connection Mode.
-        // TODO: In this case, should we reconnect?
-        auto &connection = _connection->connection();
-        if (connection.broken()) {
-            throw Error("Connection is broken");
-        }
-
-        return _command(connection, cmd, std::forward<Args>(args)...);
-    } else {
-        assert(_pool);
-
-        // Pool Mode, i.e. get connection from pool.
-        SafeConnection connection(*_pool);
-
-        return _command(connection.connection(), cmd, std::forward<Args>(args)...);
-    }
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    range_check("command", first, last);
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename ...Args>
-Result Redis::command(const StringView &cmd_name, Args &&...args) {
-    auto r = command(cmd_name, std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args) - 1>(),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Result, typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto Redis::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long Redis::del(Input first, Input last) {
-    range_check("DEL", first, last);
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::exists(Input first, Input last) {
-    range_check("EXISTS", first, last);
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool Redis::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool Redis::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-template <typename Output>
-void Redis::keys(const StringView &pattern, Output output) {
-    auto reply = command(cmd::keys, pattern);
-
-    reply::to_array(*reply, output);
-}
-
-inline bool Redis::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool Redis::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void Redis::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Output>
-long long Redis::scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::scan, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return scan(cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                long long count,
-                                Output output) {
-    return scan(cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                Output output) {
-    return scan(cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::touch(Input first, Input last) {
-    range_check("TOUCH", first, last);
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::unlink(Input first, Input last) {
-    range_check("UNLINK", first, last);
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline long long Redis::wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-    return wait(numslaves, timeout.count());
-}
-
-// STRING commands.
-
-template <typename Input>
-long long Redis::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    range_check("BITOP", first, last);
-
-    auto reply = command(cmd::bitop_range<Input>, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::mget(Input first, Input last, Output output) {
-    range_check("MGET", first, last);
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void Redis::mset(Input first, Input last) {
-    range_check("MSET", first, last);
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool Redis::msetnx(Input first, Input last) {
-    range_check("MSETNX", first, last);
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void Redis::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void Redis::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first, Input last, long long timeout) {
-    range_check("BLPOP", first, last);
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first, Input last, long long timeout) {
-    range_check("BRPOP", first, last);
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString Redis::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long Redis::lpush(const StringView &key, Input first, Input last) {
-    range_check("LPUSH", first, last);
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long Redis::rpush(const StringView &key, Input first, Input last) {
-    range_check("RPUSH", first, last);
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long Redis::hdel(const StringView &key, Input first, Input last) {
-    range_check("HDEL", first, last);
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void Redis::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void Redis::hmget(const StringView &key, Input first, Input last, Output output) {
-    range_check("HMGET", first, last);
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void Redis::hmset(const StringView &key, Input first, Input last) {
-    range_check("HMSET", first, last);
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long Redis::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-auto Redis::hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    long long>::type {
-    range_check("HSET", first, last);
-
-    auto reply = command(cmd::hset_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long Redis::sadd(const StringView &key, Input first, Input last) {
-    range_check("SADD", first, last);
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sdiff(Input first, Input last, Output output) {
-    range_check("SDIFF", first, last);
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    range_check("SDIFFSTORE", first, last);
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sinter(Input first, Input last, Output output) {
-    range_check("SINTER", first, last);
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sinterstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    range_check("SINTERSTORE", first, last);
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::srem(const StringView &key, Input first, Input last) {
-    range_check("SREM", first, last);
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long Redis::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void Redis::sunion(Input first, Input last, Output output) {
-    range_check("SUNION", first, last);
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sunionstore(const StringView &destination, Input first, Input last) {
-    range_check("SUNIONSTORE", first, last);
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto Redis::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto Redis::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long Redis::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    range_check("ZADD", first, last);
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    range_check("ZINTERSTORE", first, last);
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::zrem(const StringView &key, Input first, Input last) {
-    range_check("ZREM", first, last);
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void Redis::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long Redis::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    range_check("ZUNIONSTORE", first, last);
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool Redis::pfadd(const StringView &key, Input first, Input last) {
-    range_check("PFADD", first, last);
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long Redis::pfcount(Input first, Input last) {
-    range_check("PFCOUNT", first, last);
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void Redis::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    range_check("PFMERGE", first, last);
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long Redis::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    range_check("GEOADD", first, last);
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::geohash(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOHASH", first, last);
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::geopos(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOPOS", first, last);
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result, typename Keys, typename Args>
-Result Redis::eval(const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last) {
-    auto reply = command(cmd::eval<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    return eval<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void Redis::eval(const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last,
-                   Output output) {
-    auto reply = command(cmd::eval<Keys, Args>,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output) {
-    eval(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Result, typename Keys, typename Args>
-Result Redis::evalsha(const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last) {
-    auto reply = command(cmd::evalsha<Keys, Args>, script,
-            keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-    return evalsha<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void Redis::evalsha(const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last,
-                       Output output) {
-    auto reply = command(cmd::evalsha<Keys, Args>,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    evalsha(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Input, typename Output>
-void Redis::script_exists(Input first, Input last, Output output) {
-    range_check("SCRIPT EXISTS", first, last);
-
-    auto reply = command(cmd::script_exists_range<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-// Transaction commands.
-
-template <typename Input>
-void Redis::watch(Input first, Input last) {
-    auto reply = command(cmd::watch_range<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long Redis::xack(const StringView &key, const StringView &group, Input first, Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key, const StringView &id, Input first, Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    const StringView &id,
-                    Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    Input first,
-                    Input last,
-                    Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto Redis::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        const StringView &consumer,
-                        Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup_block,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = command(cmd::xreadgroup_block_range<Input>,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr Redis::_command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    auto reply = connection.recv();
-
-    return reply;
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis_cluster.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis_cluster.h
deleted file mode 100644
index 63c6131c1..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis_cluster.h
+++ /dev/null
@@ -1,1439 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-
-#include <string>
-#include <chrono>
-#include <initializer_list>
-#include <tuple>
-#include "shards_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "redis.h"
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class RedisCluster {
-public:
-    RedisCluster(const ConnectionOptions &connection_opts,
-                    const ConnectionPoolOptions &pool_opts = {},
-                    Role role = Role::MASTER) : _pool(pool_opts, connection_opts, role) {}
-
-    // Construct RedisCluster with URI:
-    // "tcp://127.0.0.1" or "tcp://127.0.0.1:6379"
-    // Only need to specify one URI.
-    explicit RedisCluster(const std::string &uri);
-
-    RedisCluster(const RedisCluster &) = delete;
-    RedisCluster& operator=(const RedisCluster &) = delete;
-
-    RedisCluster(RedisCluster &&) = default;
-    RedisCluster& operator=(RedisCluster &&) = default;
-
-    Redis redis(const StringView &hash_tag, bool new_connection = true);
-
-    Pipeline pipeline(const StringView &hash_tag, bool new_connection = true);
-
-    Transaction transaction(const StringView &hash_tag, bool piped = false, bool new_connection = true);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && IsIter<typename LastType<Key, Args...>::type>::value, void>::type;
-
-    template <typename Result, typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type;
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value, long long>::type;
-
-    template <typename T>
-    long long hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    OptionalString geohash(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    Optional<std::pair<double, double>> geopos(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result, typename Keys, typename Args>
-    Result eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last);
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last,
-                Output output);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result, typename Keys, typename Args>
-    Result evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last,
-                    Output output);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class Command {
-    public:
-        explicit Command(const StringView &cmd_name) : _cmd_name(cmd_name) {}
-
-        template <typename ...Args>
-        void operator()(Connection &connection, Args &&...args) const {
-            CmdArgs cmd_args;
-            cmd_args.append(_cmd_name, std::forward<Args>(args)...);
-            connection.send(cmd_args);
-        }
-
-    private:
-        StringView _cmd_name;
-    };
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, Connection &connection, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::true_type, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::false_type, Input &&first, Args &&...args);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::true_type, Input input, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::false_type, Input input, Args &&...args);
-
-    void _asking(Connection &connection);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    ShardsPool _pool;
-};
-
-}
-
-}
-
-#include "redis_cluster.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis_cluster.hpp b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis_cluster.hpp
deleted file mode 100644
index 2153d181b..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/redis_cluster.hpp
+++ /dev/null
@@ -1,1403 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-
-#include <utility>
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-#include "shards_pool.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    return _command(cmd,
-                    std::is_convertible<typename std::decay<Key>::type, StringView>(),
-                    std::forward<Key>(key),
-                    std::forward<Args>(args)...);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-        || std::is_arithmetic<typename std::decay<Key>::type>::value)
-        && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = Command(cmd_name);
-
-    return _generic_command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Result, typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type {
-    auto r = command(cmd_name, std::forward<Key>(key), std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value)
-            && IsIter<typename LastType<Key, Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args)>(),
-                        std::forward<Key>(key),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last || std::next(first) == last) {
-        throw Error("command: invalid range");
-    }
-
-    const auto &key = *first;
-    ++first;
-
-    auto cmd = [&key](Connection &connection, Input first, Input last) {
-                        CmdArgs cmd_args;
-                        cmd_args.append(key);
-                        while (first != last) {
-                            cmd_args.append(*first);
-                            ++first;
-                        }
-                        connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long RedisCluster::del(Input first, Input last) {
-    range_check("DEL", first, last);
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::exists(Input first, Input last) {
-    range_check("EXISTS", first, last);
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool RedisCluster::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool RedisCluster::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-inline bool RedisCluster::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool RedisCluster::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void RedisCluster::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Input>
-long long RedisCluster::touch(Input first, Input last) {
-    range_check("TOUCH", first, last);
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::unlink(Input first, Input last) {
-    range_check("UNLINK", first, last);
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-template <typename Input>
-long long RedisCluster::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    range_check("BITOP", first, last);
-
-    auto reply = _command(cmd::bitop_range<Input>, destination, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::mget(Input first, Input last, Output output) {
-    range_check("MGET", first, last);
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void RedisCluster::mset(Input first, Input last) {
-    range_check("MSET", first, last);
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool RedisCluster::msetnx(Input first, Input last) {
-    range_check("MSETNX", first, last);
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void RedisCluster::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void RedisCluster::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first, Input last, long long timeout) {
-    range_check("BLPOP", first, last);
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first, Input last, long long timeout) {
-    range_check("BRPOP", first, last);
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString RedisCluster::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long RedisCluster::lpush(const StringView &key, Input first, Input last) {
-    range_check("LPUSH", first, last);
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long RedisCluster::rpush(const StringView &key, Input first, Input last) {
-    range_check("RPUSH", first, last);
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long RedisCluster::hdel(const StringView &key, Input first, Input last) {
-    range_check("HDEL", first, last);
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void RedisCluster::hmget(const StringView &key, Input first, Input last, Output output) {
-    range_check("HMGET", first, last);
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void RedisCluster::hmset(const StringView &key, Input first, Input last) {
-    range_check("HMSET", first, last);
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-auto RedisCluster::hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    long long>::type {
-    range_check("HSET", first, last);
-
-    auto reply = command(cmd::hset_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long RedisCluster::sadd(const StringView &key, Input first, Input last) {
-    range_check("SADD", first, last);
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sdiff(Input first, Input last, Output output) {
-    range_check("SDIFF", first, last);
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sdiffstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    range_check("SDIFFSTORE", first, last);
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sinter(Input first, Input last, Output output) {
-    range_check("SINTER", first, last);
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sinterstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    range_check("SINTERSTORE", first, last);
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::srem(const StringView &key, Input first, Input last) {
-    range_check("SREM", first, last);
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sunion(Input first, Input last, Output output) {
-    range_check("SUNION", first, last);
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sunionstore(const StringView &destination, Input first, Input last) {
-    range_check("SUNIONSTORE", first, last);
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto RedisCluster::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmax(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto RedisCluster::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmin(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long RedisCluster::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    range_check("ZADD", first, last);
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    range_check("ZINTERSTORE", first, last);
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::zrem(const StringView &key, Input first, Input last) {
-    range_check("ZREM", first, last);
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void RedisCluster::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long RedisCluster::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long RedisCluster::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    range_check("ZUNIONSTORE", first, last);
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool RedisCluster::pfadd(const StringView &key, Input first, Input last) {
-    range_check("PFADD", first, last);
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::pfcount(Input first, Input last) {
-    range_check("PFCOUNT", first, last);
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void RedisCluster::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    range_check("PFMERGE", first, last);
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long RedisCluster::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    range_check("GEOADD", first, last);
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geohash(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOHASH", first, last);
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geopos(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOPOS", first, last);
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result, typename Keys, typename Args>
-Result RedisCluster::eval(const StringView &script,
-                          Keys keys_first,
-                          Keys keys_last,
-                          Args args_first,
-                          Args args_last) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval<Keys, Args>, *keys_first, script, keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result RedisCluster::eval(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-    return eval<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void RedisCluster::eval(const StringView &script,
-                          Keys keys_first,
-                          Keys keys_last,
-                          Args args_first,
-                          Args args_last,
-                          Output output) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval<Keys, Args>,
-                            *keys_first,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    eval(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Result, typename Keys, typename Args>
-Result RedisCluster::evalsha(const StringView &script,
-                              Keys keys_first,
-                              Keys keys_last,
-                              Args args_first,
-                              Args args_last) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha<Keys, Args>, *keys_first, script,
-            keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result RedisCluster::evalsha(const StringView &script,
-                                std::initializer_list<StringView> keys,
-                                std::initializer_list<StringView> args) {
-    return evalsha<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                              Keys keys_first,
-                              Keys keys_last,
-                              Args args_first,
-                              Args args_last,
-                              Output output) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha<Keys, Args>,
-                            *keys_first,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args,
-                            Output output) {
-    evalsha(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long RedisCluster::xack(const StringView &key,
-                                const StringView &group,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            const StringView &id,
-                            Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            Input first,
-                            Input last,
-                            Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto RedisCluster::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer,
-                            Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first,
-                            Input last,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup, key, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = _command(cmd::xreadgroup_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup_block,
-                            key,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = _command(cmd::xreadgroup_block_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                                const StringView &end,
-                                const StringView &start,
-                                long long count,
-                                Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                ReplyUPtr>::type {
-    return command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                ReplyUPtr>::type {
-    auto k = std::to_string(std::forward<Key>(key));
-    return command(cmd, k, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::true_type, const StringView &key, Args &&...args) {
-    return _command(cmd, key, key, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::false_type, Input &&first, Args &&...args) {
-    return _range_command(cmd,
-                            std::is_convertible<
-                                typename std::decay<
-                                    decltype(*std::declval<Input>())>::type, StringView>(),
-                            std::forward<Input>(first),
-                            std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::true_type, Input input, Args &&...args) {
-    return _command(cmd, *input, input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::false_type, Input input, Args &&...args) {
-    return _command(cmd, std::get<0>(*input), input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, Connection &connection, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    return connection.recv();
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, const StringView &key, Args &&...args) {
-    for (auto idx = 0; idx < 2; ++idx) {
-        try {
-            auto pool = _pool.fetch(key);
-            assert(pool);
-            SafeConnection safe_connection(*pool);
-
-            return _command(cmd, safe_connection.connection(), std::forward<Args>(args)...);
-        } catch (const IoError &err) {
-            // When master is down, one of its replicas will be promoted to be the new master.
-            // If we try to send command to the old master, we'll get an *IoError*.
-            // In this case, we need to update the slots mapping.
-            _pool.update();
-        } catch (const ClosedError &err) {
-            // Node might be removed.
-            // 1. Get up-to-date slot mapping to check if the node still exists.
-            _pool.update();
-
-            // TODO:
-            // 2. If it's NOT exist, update slot mapping, and retry.
-            // 3. If it's still exist, that means the node is down, NOT removed, throw exception.
-        } catch (const MovedError &err) {
-            // Slot mapping has been changed, update it and try again.
-            _pool.update();
-        } catch (const AskError &err) {
-            auto pool = _pool.fetch(err.node());
-            assert(pool);
-            SafeConnection safe_connection(*pool);
-            auto &connection = safe_connection.connection();
-
-            // 1. send ASKING command.
-            _asking(connection);
-
-            // 2. resend last command.
-            try {
-                return _command(cmd, connection, std::forward<Args>(args)...);
-            } catch (const MovedError &err) {
-                throw Error("Slot migrating... ASKING node hasn't been set to IMPORTING state");
-            }
-        } // For other exceptions, just throw it.
-    }
-
-    // Possible failures:
-    // 1. Source node has already run 'CLUSTER SETSLOT xxx NODE xxx',
-    //    while the destination node has NOT run it.
-    //    In this case, client will be redirected by both nodes with MovedError.
-    // 2. Other failures...
-    throw Error("Failed to send command with key: " + std::string(key.data(), key.size()));
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/reply.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/reply.h
deleted file mode 100644
index d89174329..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/reply.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REPLY_H
-#define SEWENEW_REDISPLUSPLUS_REPLY_H
-
-#include <cassert>
-#include <string>
-#include <iterator>
-#include <memory>
-#include <functional>
-#include <tuple>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ReplyDeleter {
-    void operator()(redisReply *reply) const {
-        if (reply != nullptr) {
-            freeReplyObject(reply);
-        }
-    }
-};
-
-using ReplyUPtr = std::unique_ptr<redisReply, ReplyDeleter>;
-
-namespace reply {
-
-template <typename T>
-struct ParseTag {};
-
-template <typename T>
-inline T parse(redisReply &reply) {
-    return parse(ParseTag<T>(), reply);
-}
-
-template <typename T>
-T parse_leniently(redisReply &reply);
-
-void parse(ParseTag<void>, redisReply &reply);
-
-std::string parse(ParseTag<std::string>, redisReply &reply);
-
-long long parse(ParseTag<long long>, redisReply &reply);
-
-double parse(ParseTag<double>, redisReply &reply);
-
-bool parse(ParseTag<bool>, redisReply &reply);
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply);
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply);
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply);
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-inline Monostate parse(ParseTag<Monostate>, redisReply &) {
-    // Just ignore the reply
-    return {};
-}
-
-template <typename ...Args>
-Variant<Args...> parse(ParseTag<Variant<Args...>>, redisReply &reply);
-
-#endif
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output);
-
-inline bool is_error(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ERROR;
-}
-
-inline bool is_nil(redisReply &reply) {
-    return reply.type == REDIS_REPLY_NIL;
-}
-
-inline bool is_string(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STRING;
-}
-
-inline bool is_status(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STATUS;
-}
-
-inline bool is_integer(redisReply &reply) {
-    return reply.type == REDIS_REPLY_INTEGER;
-}
-
-inline bool is_array(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ARRAY;
-}
-
-std::string to_status(redisReply &reply);
-
-template <typename Output>
-void to_array(redisReply &reply, Output output);
-
-// Rewrite set reply to bool type
-void rewrite_set_reply(redisReply &reply);
-
-// Some command might return an empty array reply as a nil reply,
-// e.g. georadius, zpopmin, zpopmax. In this case, we rewrite the
-// reply to a nil reply.
-void rewrite_empty_array_reply(redisReply &reply);
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString>;
-
-}
-
-// Inline implementations.
-
-namespace reply {
-
-namespace detail {
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        auto *sub_reply = reply.element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null array element reply");
-        }
-
-        *output = parse<typename IterType<Output>::type>(*sub_reply);
-
-        ++output;
-    }
-}
-
-bool is_flat_array(redisReply &reply);
-
-template <typename Output>
-void to_flat_array(redisReply &reply, Output output) {
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    if (reply.elements % 2 != 0) {
-        throw ProtoError("Not string pair array reply");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; idx += 2) {
-        auto *key_reply = reply.element[idx];
-        auto *val_reply = reply.element[idx + 1];
-        if (key_reply == nullptr || val_reply == nullptr) {
-            throw ProtoError("Null string array reply");
-        }
-
-        using Pair = typename IterType<Output>::type;
-        using FirstType = typename std::decay<typename Pair::first_type>::type;
-        using SecondType = typename std::decay<typename Pair::second_type>::type;
-        *output = std::make_pair(parse<FirstType>(*key_reply),
-                                    parse<SecondType>(*val_reply));
-
-        ++output;
-    }
-}
-
-template <typename Output>
-void to_array(std::true_type, redisReply &reply, Output output) {
-    if (is_flat_array(reply)) {
-        to_flat_array(reply, output);
-    } else {
-        to_array(reply, output);
-    }
-}
-
-template <typename Output>
-void to_array(std::false_type, redisReply &reply, Output output) {
-    to_array(reply, output);
-}
-
-template <typename T>
-std::tuple<T> parse_tuple(redisReply **reply, std::size_t idx) {
-    assert(reply != nullptr);
-
-    auto *sub_reply = reply[idx];
-    if (sub_reply == nullptr) {
-        throw ProtoError("Null reply");
-    }
-
-    return std::make_tuple(parse<T>(*sub_reply));
-}
-
-template <typename T, typename ...Args>
-auto parse_tuple(redisReply **reply, std::size_t idx) ->
-    typename std::enable_if<sizeof...(Args) != 0, std::tuple<T, Args...>>::type {
-    assert(reply != nullptr);
-
-    return std::tuple_cat(parse_tuple<T>(reply, idx),
-                            parse_tuple<Args...>(reply, idx + 1));
-}
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-template <typename T>
-Variant<T> parse_variant(redisReply &reply) {
-    return parse<T>(reply);
-}
-
-template <typename T, typename ...Args>
-auto parse_variant(redisReply &reply) ->
-    typename std::enable_if<sizeof...(Args) != 0, Variant<T, Args...>>::type {
-    auto return_var = [](auto &&arg) {
-        return Variant<T, Args...>(std::move(arg));
-    };
-
-    try {
-        return std::visit(return_var, parse_variant<T>(reply));
-    } catch (const ProtoError &) {
-        return std::visit(return_var, parse_variant<Args...>(reply));
-    }
-}
-
-#endif
-
-}
-
-template <typename T>
-T parse_leniently(redisReply &reply) {
-    if (is_array(reply) && reply.elements == 1) {
-        if (reply.element == nullptr) {
-            throw ProtoError("null array reply");
-        }
-
-        auto *ele = reply.element[0];
-        if (ele != nullptr) {
-            return parse<T>(*ele);
-        } // else fall through
-    }
-
-    return parse<T>(reply);
-}
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply) {
-    if (reply::is_nil(reply)) {
-        // Because of a GCC bug, we cannot return {} for -std=c++17
-        // Refer to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86465
-#if defined REDIS_PLUS_PLUS_HAS_OPTIONAL
-        return std::nullopt;
-#else
-        return {};
-#endif
-    }
-
-    return Optional<T>(parse<T>(reply));
-}
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != 2) {
-        throw ProtoError("NOT key-value PAIR reply");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null PAIR reply");
-    }
-
-    auto *first = reply.element[0];
-    auto *second = reply.element[1];
-    if (first == nullptr || second == nullptr) {
-        throw ProtoError("Null pair reply");
-    }
-
-    return std::make_pair(parse<typename std::decay<T>::type>(*first),
-                            parse<typename std::decay<U>::type>(*second));
-}
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply) {
-    constexpr auto size = sizeof...(Args);
-
-    static_assert(size > 0, "DO NOT support parsing tuple with 0 element");
-
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != size) {
-        throw ProtoError("Expect tuple reply with " + std::to_string(size) + "elements");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null TUPLE reply");
-    }
-
-    return detail::parse_tuple<Args...>(reply.element, 0);
-}
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-template <typename ...Args>
-Variant<Args...> parse(ParseTag<Variant<Args...>>, redisReply &reply) {
-    return detail::parse_variant<Args...>(reply);
-}
-
-#endif
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::back_inserter(container));
-
-    return container;
-}
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::inserter(container, container.end()));
-
-    return container;
-}
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output) {
-    if (reply.elements != 2 || reply.element == nullptr) {
-        throw ProtoError("Invalid scan reply");
-    }
-
-    auto *cursor_reply = reply.element[0];
-    auto *data_reply = reply.element[1];
-    if (cursor_reply == nullptr || data_reply == nullptr) {
-        throw ProtoError("Invalid cursor reply or data reply");
-    }
-
-    auto cursor_str = reply::parse<std::string>(*cursor_reply);
-    long long new_cursor = 0;
-    try {
-        new_cursor = std::stoll(cursor_str);
-    } catch (const std::exception &e) {
-        throw ProtoError("Invalid cursor reply: " + cursor_str);
-    }
-
-    reply::to_array(*data_reply, output);
-
-    return new_cursor;
-}
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    detail::to_array(typename IsKvPairIter<Output>::type(), reply, output);
-}
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    if (!is_array(reply) || reply.elements != 4) {
-        throw ProtoError("expect array reply with 4 elements");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        if (reply.element[idx] == nullptr) {
-            throw ProtoError("null array reply");
-        }
-    }
-
-    auto num = parse<long long>(*(reply.element[0]));
-    auto start = parse<OptionalString>(*(reply.element[1]));
-    auto end = parse<OptionalString>(*(reply.element[2]));
-
-    auto &entry_reply = *(reply.element[3]);
-    if (!is_nil(entry_reply)) {
-        to_array(entry_reply, output);
-    }
-
-    return std::make_tuple(num, std::move(start), std::move(end));
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REPLY_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/sentinel.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/sentinel.h
deleted file mode 100644
index 6f998791e..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/sentinel.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SENTINEL_H
-#define SEWENEW_REDISPLUSPLUS_SENTINEL_H
-
-#include <string>
-#include <list>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include "connection.h"
-#include "shards.h"
-#include "reply.h"
-#include "tls.h"
-
-namespace sw {
-
-namespace redis {
-
-struct SentinelOptions {
-    std::vector<std::pair<std::string, int>> nodes;
-
-    std::string password;
-
-    bool keep_alive = true;
-
-    std::chrono::milliseconds connect_timeout{100};
-
-    std::chrono::milliseconds socket_timeout{100};
-
-    std::chrono::milliseconds retry_interval{100};
-
-    std::size_t max_retry = 2;
-
-    tls::TlsOptions tls;
-};
-
-class Sentinel {
-public:
-    explicit Sentinel(const SentinelOptions &sentinel_opts);
-
-    Sentinel(const Sentinel &) = delete;
-    Sentinel& operator=(const Sentinel &) = delete;
-
-    Sentinel(Sentinel &&) = delete;
-    Sentinel& operator=(Sentinel &&) = delete;
-
-    ~Sentinel() = default;
-
-private:
-    Connection master(const std::string &master_name, const ConnectionOptions &opts);
-
-    Connection slave(const std::string &master_name, const ConnectionOptions &opts);
-
-    class Iterator;
-
-    friend class SimpleSentinel;
-
-    std::list<ConnectionOptions> _parse_options(const SentinelOptions &opts) const;
-
-    Optional<Node> _get_master_addr_by_name(Connection &connection, const StringView &name);
-
-    std::vector<Node> _get_slave_addr_by_name(Connection &connection, const StringView &name);
-
-    Connection _connect_redis(const Node &node, ConnectionOptions opts);
-
-    Role _get_role(Connection &connection);
-
-    std::vector<Node> _parse_slave_info(redisReply &reply) const;
-
-    std::list<Connection> _healthy_sentinels;
-
-    std::list<ConnectionOptions> _broken_sentinels;
-
-    SentinelOptions _sentinel_opts;
-
-    std::mutex _mutex;
-};
-
-class SimpleSentinel {
-public:
-    SimpleSentinel(const std::shared_ptr<Sentinel> &sentinel,
-                    const std::string &master_name,
-                    Role role);
-
-    SimpleSentinel() = default;
-
-    SimpleSentinel(const SimpleSentinel &) = default;
-    SimpleSentinel& operator=(const SimpleSentinel &) = default;
-
-    SimpleSentinel(SimpleSentinel &&) = default;
-    SimpleSentinel& operator=(SimpleSentinel &&) = default;
-
-    ~SimpleSentinel() = default;
-
-    explicit operator bool() const {
-        return bool(_sentinel);
-    }
-
-    Connection create(const ConnectionOptions &opts);
-
-private:
-    std::shared_ptr<Sentinel> _sentinel;
-
-    std::string _master_name;
-
-    Role _role = Role::MASTER;
-};
-
-class StopIterError : public Error {
-public:
-    StopIterError() : Error("StopIterError") {}
-
-    StopIterError(const StopIterError &) = default;
-    StopIterError& operator=(const StopIterError &) = default;
-
-    StopIterError(StopIterError &&) = default;
-    StopIterError& operator=(StopIterError &&) = default;
-
-    virtual ~StopIterError() override = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SENTINEL_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/shards.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/shards.h
deleted file mode 100644
index 0d4cd97b3..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/shards.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_H
-
-#include <string>
-#include <map>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-using Slot = std::size_t;
-
-struct SlotRange {
-    Slot min;
-    Slot max;
-};
-
-inline bool operator<(const SlotRange &lhs, const SlotRange &rhs) {
-    return lhs.max < rhs.max;
-}
-
-struct Node {
-    std::string host;
-    int port;
-};
-
-inline bool operator==(const Node &lhs, const Node &rhs) {
-    return lhs.host == rhs.host && lhs.port == rhs.port;
-}
-
-struct NodeHash {
-    std::size_t operator()(const Node &node) const noexcept {
-        auto host_hash = std::hash<std::string>{}(node.host);
-        auto port_hash = std::hash<int>{}(node.port);
-        return host_hash ^ (port_hash << 1);
-    }
-};
-
-using Shards = std::map<SlotRange, Node>;
-
-class RedirectionError : public ReplyError {
-public:
-    RedirectionError(const std::string &msg);
-
-    RedirectionError(const RedirectionError &) = default;
-    RedirectionError& operator=(const RedirectionError &) = default;
-
-    RedirectionError(RedirectionError &&) = default;
-    RedirectionError& operator=(RedirectionError &&) = default;
-
-    virtual ~RedirectionError() override = default;
-
-    Slot slot() const {
-        return _slot;
-    }
-
-    const Node& node() const {
-        return _node;
-    }
-
-private:
-    std::pair<Slot, Node> _parse_error(const std::string &msg) const;
-
-    Slot _slot = 0;
-    Node _node;
-};
-
-class MovedError : public RedirectionError {
-public:
-    explicit MovedError(const std::string &msg) : RedirectionError(msg) {}
-
-    MovedError(const MovedError &) = default;
-    MovedError& operator=(const MovedError &) = default;
-
-    MovedError(MovedError &&) = default;
-    MovedError& operator=(MovedError &&) = default;
-
-    virtual ~MovedError() override = default;
-};
-
-class AskError : public RedirectionError {
-public:
-    explicit AskError(const std::string &msg) : RedirectionError(msg) {}
-
-    AskError(const AskError &) = default;
-    AskError& operator=(const AskError &) = default;
-
-    AskError(AskError &&) = default;
-    AskError& operator=(AskError &&) = default;
-
-    virtual ~AskError() override = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/shards_pool.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/shards_pool.h
deleted file mode 100644
index e6e9e4a52..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/shards_pool.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-
-#include <cassert>
-#include <unordered_map>
-#include <string>
-#include <random>
-#include <memory>
-#include "reply.h"
-#include "connection_pool.h"
-#include "shards.h"
-
-namespace sw {
-
-namespace redis {
-
-class ShardsPool {
-public:
-    ShardsPool() = default;
-
-    ShardsPool(const ShardsPool &that) = delete;
-    ShardsPool& operator=(const ShardsPool &that) = delete;
-
-    ShardsPool(ShardsPool &&that);
-    ShardsPool& operator=(ShardsPool &&that);
-
-    ~ShardsPool() = default;
-
-    ShardsPool(const ConnectionPoolOptions &pool_opts,
-                const ConnectionOptions &connection_opts,
-                Role role);
-
-    // Fetch a connection by key.
-    ConnectionPoolSPtr fetch(const StringView &key);
-
-    // Randomly pick a connection.
-    ConnectionPoolSPtr fetch();
-
-    // Fetch a connection by node.
-    ConnectionPoolSPtr fetch(const Node &node);
-
-    void update();
-
-    ConnectionOptions connection_options(const StringView &key);
-
-    ConnectionOptions connection_options();
-
-    Shards shards();
-
-private:
-    void _move(ShardsPool &&that);
-
-    void _init_pool(const Shards &shards);
-
-    Shards _cluster_slots(Connection &connection) const;
-
-    ReplyUPtr _cluster_slots_command(Connection &connection) const;
-
-    Shards _parse_reply(redisReply &reply) const;
-
-    Slot _parse_slot(redisReply *reply) const;
-
-    Node _parse_node(redisReply *reply) const;
-
-    std::pair<SlotRange, Node> _parse_slot_info(redisReply &reply) const;
-
-    // Get slot by key.
-    std::size_t _slot(const StringView &key) const;
-
-    // Randomly pick a slot.
-    std::size_t _slot() const;
-
-    // Get a random number between [min, max]
-    std::size_t _random(std::size_t min, std::size_t max) const;
-
-    ConnectionPoolSPtr& _get_pool(Slot slot);
-
-    ConnectionPoolSPtr _fetch(Slot slot);
-
-    ConnectionOptions _connection_options(Slot slot);
-
-    using NodeMap = std::unordered_map<Node, ConnectionPoolSPtr, NodeHash>;
-
-    NodeMap::iterator _add_node(const Node &node);
-
-    ConnectionPoolOptions _pool_opts;
-
-    ConnectionOptions _connection_opts;
-
-    Shards _shards;
-
-    NodeMap _pools;
-
-    std::mutex _mutex;
-
-    Role _role = Role::MASTER;
-
-    static const std::size_t SHARDS = 16383;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/subscriber.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/subscriber.h
deleted file mode 100644
index 8b7c5cfb4..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/subscriber.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-#define SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-
-#include <unordered_map>
-#include <string>
-#include <functional>
-#include "connection.h"
-#include "reply.h"
-#include "command.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-// @NOTE: Subscriber is NOT thread-safe.
-// Subscriber uses callbacks to handle messages. There are 6 kinds of messages:
-// 1) MESSAGE: message sent to a channel.
-// 2) PMESSAGE: message sent to channels of a given pattern.
-// 3) SUBSCRIBE: meta message sent when we successfully subscribe to a channel.
-// 4) UNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel.
-// 5) PSUBSCRIBE: meta message sent when we successfully subscribe to a channel pattern.
-// 6) PUNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel pattern.
-//
-// Use Subscriber::on_message(MsgCallback) to set the callback function for message of
-// *MESSAGE* type, and the callback interface is:
-// void (std::string channel, std::string msg)
-//
-// Use Subscriber::on_pmessage(PatternMsgCallback) to set the callback function for message of
-// *PMESSAGE* type, and the callback interface is:
-// void (std::string pattern, std::string channel, std::string msg)
-//
-// Messages of other types are called *META MESSAGE*, they have the same callback interface.
-// Use Subscriber::on_meta(MetaCallback) to set the callback function:
-// void (Subscriber::MsgType type, OptionalString channel, long long num)
-//
-// NOTE: If we haven't subscribe/psubscribe to any channel/pattern, and try to
-// unsubscribe/punsubscribe without any parameter, i.e. unsubscribe/punsubscribe all
-// channels/patterns, *channel* will be null. So the second parameter of meta callback
-// is of type *OptionalString*.
-//
-// All these callback interfaces pass std::string by value, and you can take their ownership
-// (i.e. std::move) safely.
-//
-// If you don't set callback for a specific kind of message, Subscriber::consume() will
-// receive the message, and ignore it, i.e. no callback will be called.
-class Subscriber {
-public:
-    Subscriber(const Subscriber &) = delete;
-    Subscriber& operator=(const Subscriber &) = delete;
-
-    Subscriber(Subscriber &&) = default;
-    Subscriber& operator=(Subscriber &&) = default;
-
-    ~Subscriber() = default;
-
-    enum class MsgType {
-        SUBSCRIBE,
-        UNSUBSCRIBE,
-        PSUBSCRIBE,
-        PUNSUBSCRIBE,
-        MESSAGE,
-        PMESSAGE
-    };
-
-    template <typename MsgCb>
-    void on_message(MsgCb msg_callback);
-
-    template <typename PMsgCb>
-    void on_pmessage(PMsgCb pmsg_callback);
-
-    template <typename MetaCb>
-    void on_meta(MetaCb meta_callback);
-
-    void subscribe(const StringView &channel);
-
-    template <typename Input>
-    void subscribe(Input first, Input last);
-
-    template <typename T>
-    void subscribe(std::initializer_list<T> channels) {
-        subscribe(channels.begin(), channels.end());
-    }
-
-    void unsubscribe();
-
-    void unsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void unsubscribe(Input first, Input last);
-
-    template <typename T>
-    void unsubscribe(std::initializer_list<T> channels) {
-        unsubscribe(channels.begin(), channels.end());
-    }
-
-    void psubscribe(const StringView &pattern);
-
-    template <typename Input>
-    void psubscribe(Input first, Input last);
-
-    template <typename T>
-    void psubscribe(std::initializer_list<T> channels) {
-        psubscribe(channels.begin(), channels.end());
-    }
-
-    void punsubscribe();
-
-    void punsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void punsubscribe(Input first, Input last);
-
-    template <typename T>
-    void punsubscribe(std::initializer_list<T> channels) {
-        punsubscribe(channels.begin(), channels.end());
-    }
-
-    void consume();
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    explicit Subscriber(Connection connection);
-
-    MsgType _msg_type(redisReply *reply) const;
-
-    void _check_connection();
-
-    void _handle_message(redisReply &reply);
-
-    void _handle_pmessage(redisReply &reply);
-
-    void _handle_meta(MsgType type, redisReply &reply);
-
-    using MsgCallback = std::function<void (std::string channel, std::string msg)>;
-
-    using PatternMsgCallback = std::function<void (std::string pattern,
-                                                    std::string channel,
-                                                    std::string msg)>;
-
-    using MetaCallback = std::function<void (MsgType type,
-                                                OptionalString channel,
-                                                long long num)>;
-
-    using TypeIndex = std::unordered_map<std::string, MsgType>;
-    static const TypeIndex _msg_type_index;
-
-    Connection _connection;
-
-    MsgCallback _msg_callback = nullptr;
-
-    PatternMsgCallback _pmsg_callback = nullptr;
-
-    MetaCallback _meta_callback = nullptr;
-};
-
-template <typename MsgCb>
-void Subscriber::on_message(MsgCb msg_callback) {
-    _msg_callback = msg_callback;
-}
-
-template <typename PMsgCb>
-void Subscriber::on_pmessage(PMsgCb pmsg_callback) {
-    _pmsg_callback = pmsg_callback;
-}
-
-template <typename MetaCb>
-void Subscriber::on_meta(MetaCb meta_callback) {
-    _meta_callback = meta_callback;
-}
-
-template <typename Input>
-void Subscriber::subscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::subscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::unsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::unsubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::psubscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::psubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::punsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::punsubscribe_range(_connection, first, last);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/tls.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/tls.h
deleted file mode 100644
index 0f2303db7..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/tls.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2020 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_NO_TLS_H
-#define SEWENEW_REDISPLUSPLUS_NO_TLS_H
-
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace tls {
-
-struct TlsOptions {};
-
-struct TlsContextUPtr {};
-
-inline TlsContextUPtr secure_connection(redisContext &/*ctx*/, const TlsOptions &/*opts*/) {
-    // Do nothing
-    return {};
-}
-
-inline bool enabled(const TlsOptions &/*opts*/) {
-    return false;
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_NO_TLS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/transaction.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/transaction.h
deleted file mode 100644
index f19f24889..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/transaction.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-#define SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class TransactionImpl {
-public:
-    explicit TransactionImpl(bool piped) : _piped(piped) {}
-
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args);
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t cmd_num);
-
-private:
-    void _open_transaction(Connection &connection);
-
-    void _close_transaction();
-
-    void _get_queued_reply(Connection &connection);
-
-    void _get_queued_replies(Connection &connection, std::size_t cmd_num);
-
-    std::vector<ReplyUPtr> _exec(Connection &connection);
-
-    void _discard(Connection &connection);
-
-    bool _in_transaction = false;
-
-    bool _piped;
-};
-
-template <typename Cmd, typename ...Args>
-void TransactionImpl::command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    if (!_in_transaction) {
-        _open_transaction(connection);
-    }
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    if (!_piped) {
-        _get_queued_reply(connection);
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TRANSACTION_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/utils.h b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/utils.h
deleted file mode 100644
index f77f796d6..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/include/sw/redis++/utils.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_UTILS_H
-
-#include <cstring>
-#include <string>
-#include <type_traits>
-#include "cxx_utils.h"
-
-namespace sw {
-
-namespace redis {
-
-using OptionalString = Optional<std::string>;
-
-using OptionalLongLong = Optional<long long>;
-
-using OptionalDouble = Optional<double>;
-
-using OptionalStringPair = Optional<std::pair<std::string, std::string>>;
-
-template <typename ...>
-struct IsKvPair : std::false_type {};
-
-template <typename T, typename U>
-struct IsKvPair<std::pair<T, U>> : std::true_type {};
-
-template <typename ...>
-using Void = void;
-
-template <typename T, typename U = Void<>>
-struct IsInserter : std::false_type {};
-
-template <typename T>
-//struct IsInserter<T, Void<typename T::container_type>> : std::true_type {};
-struct IsInserter<T,
-    typename std::enable_if<!std::is_void<typename T::container_type>::value>::type>
-        : std::true_type {};
-
-template <typename Iter, typename T = Void<>>
-struct IterType {
-    using type = typename std::iterator_traits<Iter>::value_type;
-};
-
-template <typename Iter>
-//struct IterType<Iter, Void<typename Iter::container_type>> {
-struct IterType<Iter,
-    //typename std::enable_if<std::is_void<typename Iter::value_type>::value>::type> {
-    typename std::enable_if<IsInserter<Iter>::value>::type> {
-    using type = typename std::decay<typename Iter::container_type::value_type>::type;
-};
-
-template <typename Iter, typename T = Void<>>
-struct IsIter : std::false_type {};
-
-template <typename Iter>
-struct IsIter<Iter, typename std::enable_if<IsInserter<Iter>::value>::type> : std::true_type {};
-
-template <typename Iter>
-//struct IsIter<Iter, Void<typename std::iterator_traits<Iter>::iterator_category>>
-struct IsIter<Iter,
-    typename std::enable_if<!std::is_void<
-        typename std::iterator_traits<Iter>::value_type>::value>::type>
-            : std::integral_constant<bool, !std::is_convertible<Iter, StringView>::value> {};
-
-template <typename T>
-struct IsKvPairIter : IsKvPair<typename IterType<T>::type> {};
-
-template <typename T, typename Tuple>
-struct TupleWithType : std::false_type {};
-
-template <typename T>
-struct TupleWithType<T, std::tuple<>> : std::false_type {};
-
-template <typename T, typename U, typename ...Args>
-struct TupleWithType<T, std::tuple<U, Args...>> : TupleWithType<T, std::tuple<Args...>> {};
-
-template <typename T, typename ...Args>
-struct TupleWithType<T, std::tuple<T, Args...>> : std::true_type {};
-
-template <std::size_t ...Is>
-struct IndexSequence {};
-
-template <std::size_t I, std::size_t ...Is>
-struct MakeIndexSequence : MakeIndexSequence<I - 1, I - 1, Is...> {};
-
-template <std::size_t ...Is>
-struct MakeIndexSequence<0, Is...> : IndexSequence<Is...> {};
-
-// NthType and NthValue are taken from
-// https://stackoverflow.com/questions/14261183
-template <std::size_t I, typename ...Args>
-struct NthType {};
-
-template <typename Arg, typename ...Args>
-struct NthType<0, Arg, Args...> {
-    using type = Arg;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-struct NthType<I, Arg, Args...> {
-    using type = typename NthType<I - 1, Args...>::type;
-};
-
-template <typename ...Args>
-struct LastType {
-    using type = typename NthType<sizeof...(Args) - 1, Args...>::type;
-};
-
-struct InvalidLastType {};
-
-template <>
-struct LastType<> {
-    using type = InvalidLastType;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&arg, Args &&...)
-    -> typename std::enable_if<(I == 0), decltype(std::forward<Arg>(arg))>::type {
-    return std::forward<Arg>(arg);
-}
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&, Args &&...args)
-    -> typename std::enable_if<(I > 0),
-            decltype(std::forward<typename NthType<I, Arg, Args...>::type>(
-                    std::declval<typename NthType<I, Arg, Args...>::type>()))>::type {
-    return std::forward<typename NthType<I, Arg, Args...>::type>(
-            NthValue<I - 1>(std::forward<Args>(args)...));
-}
-
-template <typename ...Args>
-auto LastValue(Args &&...args)
-    -> decltype(std::forward<typename LastType<Args...>::type>(
-            std::declval<typename LastType<Args...>::type>())) {
-    return std::forward<typename LastType<Args...>::type>(
-            NthValue<sizeof...(Args) - 1>(std::forward<Args>(args)...));
-}
-
-template <typename T, typename = Void<>>
-struct HasPushBack : std::false_type {};
-
-template <typename T>
-struct HasPushBack<T,
-    typename std::enable_if<
-        std::is_void<decltype(
-            std::declval<T>().push_back(std::declval<typename T::value_type>())
-                )>::value>::type> : std::true_type {};
-
-template <typename T, typename = Void<>>
-struct HasInsert : std::false_type {};
-
-template <typename T>
-struct HasInsert<T,
-    typename std::enable_if<
-        std::is_same<
-            decltype(std::declval<T>().insert(std::declval<typename T::const_iterator>(),
-                                                std::declval<typename T::value_type>())),
-            typename T::iterator>::value>::type> : std::true_type {};
-
-template <typename T>
-struct IsSequenceContainer
-    : std::integral_constant<bool,
-        HasPushBack<T>::value
-            && !std::is_same<typename std::decay<T>::type, std::string>::value> {};
-
-template <typename T>
-struct IsAssociativeContainer
-    : std::integral_constant<bool,
-        HasInsert<T>::value && !HasPushBack<T>::value> {};
-
-uint16_t crc16(const char *buf, int len);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/lib/libredis++.a b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/lib/libredis++.a
deleted file mode 100644
index 12d829293..000000000
Binary files a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/lib/libredis++.a and /dev/null differ
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/lib/pkgconfig/redis++.pc b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/lib/pkgconfig/redis++.pc
deleted file mode 100644
index 7bf203b35..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/lib/pkgconfig/redis++.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/home/grant/dev/ZeroTierOne/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: redis++
-Description: This is a Redis client, based on hiredis and written in C++11. It supports scritpting, pub/sub, pipeline, transaction, Redis Cluster, Redis Sentinel, connection pool, ACL, SSL and thread safety.
-Version: 1.3.3
-URL: https://github.com/sewenew/redis-plus-plus
-Requires: hiredis
-Cflags: -I${includedir}
-Libs: -L${libdir} -lredis++
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-config-version.cmake b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-config-version.cmake
deleted file mode 100644
index ef4be219f..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-config-version.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# This is a basic version file for the Config-mode of find_package().
-# It is used by write_basic_package_version_file() as input file for configure_file()
-# to create a version-file which can be installed along a config.cmake file.
-#
-# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-# the requested version string are exactly the same and it sets
-# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
-# The variable CVF_VERSION must be set before calling configure_file().
-
-set(PACKAGE_VERSION "1.3.3")
-
-if (PACKAGE_FIND_VERSION_RANGE)
-  # Package version must be in the requested version range
-  if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
-      OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
-        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
-    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-  else()
-    set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  endif()
-else()
-  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
-    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-  else()
-    set(PACKAGE_VERSION_COMPATIBLE TRUE)
-    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-      set(PACKAGE_VERSION_EXACT TRUE)
-    endif()
-  endif()
-endif()
-
-
-# if the installed project requested no architecture check, don't perform the check
-if("FALSE")
-  return()
-endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
-  return()
-endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
-  math(EXPR installedBits "8 * 8")
-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-config.cmake b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-config.cmake
deleted file mode 100644
index 580d98613..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-config.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-
-####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
-####### Any changes to this file will be overwritten by the next CMake run ####
-####### The input file was redis++-config.cmake.in                            ########
-
-get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
-
-macro(set_and_check _var _file)
-  set(${_var} "${_file}")
-  if(NOT EXISTS "${_file}")
-    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif()
-endmacro()
-
-macro(check_required_components _NAME)
-  foreach(comp ${${_NAME}_FIND_COMPONENTS})
-    if(NOT ${_NAME}_${comp}_FOUND)
-      if(${_NAME}_FIND_REQUIRED_${comp})
-        set(${_NAME}_FOUND FALSE)
-      endif()
-    endif()
-  endforeach()
-endmacro()
-
-####################################################################################
-
-include(CMakeFindDependencyMacro)
-
-string(REPLACE "," ";" REDIS_PLUS_PLUS_DEPENDS_LIST hiredis)
-foreach(REDIS_PLUS_PLUS_DEP ${REDIS_PLUS_PLUS_DEPENDS_LIST})
-    find_dependency(${REDIS_PLUS_PLUS_DEP} REQUIRED)
-endforeach()
-
-include("${CMAKE_CURRENT_LIST_DIR}/redis++-targets.cmake")
-
-check_required_components(redis++)
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-targets-release.cmake b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-targets-release.cmake
deleted file mode 100644
index b790b539f..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-targets-release.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "Release".
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Import target "redis++::redis++_static" for configuration "Release"
-set_property(TARGET redis++::redis++_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-set_target_properties(redis++::redis++_static PROPERTIES
-  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libredis++.a"
-  )
-
-list(APPEND _IMPORT_CHECK_TARGETS redis++::redis++_static )
-list(APPEND _IMPORT_CHECK_FILES_FOR_redis++::redis++_static "${_IMPORT_PREFIX}/lib/libredis++.a" )
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-targets.cmake b/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-targets.cmake
deleted file mode 100644
index 9e87d927e..000000000
--- a/ext/redis-plus-plus-1.3.3/install/ubuntu22.04/arm64/share/cmake/redis++/redis++-targets.cmake
+++ /dev/null
@@ -1,94 +0,0 @@
-# Generated by CMake
-
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
-   message(FATAL_ERROR "CMake >= 2.6.0 required")
-endif()
-cmake_policy(PUSH)
-cmake_policy(VERSION 2.6...3.20)
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Protect against multiple inclusion, which would fail when already imported targets are added once more.
-set(_targetsDefined)
-set(_targetsNotDefined)
-set(_expectedTargets)
-foreach(_expectedTarget redis++::redis++_static)
-  list(APPEND _expectedTargets ${_expectedTarget})
-  if(NOT TARGET ${_expectedTarget})
-    list(APPEND _targetsNotDefined ${_expectedTarget})
-  endif()
-  if(TARGET ${_expectedTarget})
-    list(APPEND _targetsDefined ${_expectedTarget})
-  endif()
-endforeach()
-if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
-  unset(_targetsDefined)
-  unset(_targetsNotDefined)
-  unset(_expectedTargets)
-  set(CMAKE_IMPORT_FILE_VERSION)
-  cmake_policy(POP)
-  return()
-endif()
-if(NOT "${_targetsDefined}" STREQUAL "")
-  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
-endif()
-unset(_targetsDefined)
-unset(_targetsNotDefined)
-unset(_expectedTargets)
-
-
-# Compute the installation prefix relative to this file.
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-if(_IMPORT_PREFIX STREQUAL "/")
-  set(_IMPORT_PREFIX "")
-endif()
-
-# Create imported target redis++::redis++_static
-add_library(redis++::redis++_static STATIC IMPORTED)
-
-set_target_properties(redis++::redis++_static PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
-)
-
-# Load information for each installed configuration.
-get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-file(GLOB CONFIG_FILES "${_DIR}/redis++-targets-*.cmake")
-foreach(f ${CONFIG_FILES})
-  include(${f})
-endforeach()
-
-# Cleanup temporary variables.
-set(_IMPORT_PREFIX)
-
-# Loop over all imported files and verify that they actually exist
-foreach(target ${_IMPORT_CHECK_TARGETS} )
-  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
-    if(NOT EXISTS "${file}" )
-      message(FATAL_ERROR "The imported target \"${target}\" references the file
-   \"${file}\"
-but this file does not exist.  Possible reasons include:
-* The file was deleted, renamed, or moved to another location.
-* An install or uninstall procedure did not complete successfully.
-* The installation package was faulty and contained
-   \"${CMAKE_CURRENT_LIST_FILE}\"
-but not all the files it references.
-")
-    endif()
-  endforeach()
-  unset(_IMPORT_CHECK_FILES_FOR_${target})
-endforeach()
-unset(_IMPORT_CHECK_TARGETS)
-
-# This file does not depend on other imported targets which have
-# been exported from the same project but in a separate export set.
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-cmake_policy(POP)
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection.cpp
deleted file mode 100644
index 6070d7c80..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "async_connection.h"
-#include <hiredis/async.h>
-#include "errors.h"
-#include "async_shards_pool.h"
-#include "cmd_formatter.h"
-
-namespace {
-
-using namespace sw::redis;
-
-void set_options_callback(redisAsyncContext *ctx, void *r, void *) {
-    assert(ctx != nullptr);
-
-    auto *context = static_cast<AsyncContext *>(ctx->data);
-    assert(context != nullptr);
-
-    auto &connection = context->connection;
-    assert(connection);
-
-    redisReply *reply = static_cast<redisReply *>(r);
-    if (reply == nullptr) {
-        // Connection has bee closed.
-        // TODO: not sure if we should set this to be State::BROKEN
-        return;
-    }
-
-    try {
-        if (reply::is_error(*reply)) {
-            throw_error(*reply);
-        }
-
-        reply::parse<void>(*reply);
-    } catch (const Error &e) {
-        // TODO: disconnect and connect_callback might throw
-        connection->disconnect(std::make_exception_ptr(e));
-
-        return;
-    }
-
-    connection->connect_callback();
-}
-
-}
-
-namespace sw {
-
-namespace redis {
-
-AsyncConnection::AsyncConnection(const ConnectionOptions &opts,
-        EventLoop *loop,
-        AsyncConnectionMode mode) :
-    _opts(opts),
-    _loop(loop),
-    _create_time(std::chrono::steady_clock::now()),
-    _last_active(std::chrono::steady_clock::now().time_since_epoch()) {
-    assert(_loop != nullptr);
-
-    switch (mode) {
-    case AsyncConnectionMode::SINGLE:
-        _state = State::NOT_CONNECTED;
-        break;
-
-    case AsyncConnectionMode::SENTINEL:
-        _state = State::WAIT_SENTINEL;
-        break;
-
-    default:
-        throw Error("not supporeted async connection mode");
-        break;
-    }
-}
-
-AsyncConnection::~AsyncConnection() {
-    _clean_up();
-}
-
-void AsyncConnection::send(AsyncEventUPtr event) {
-    {
-        std::lock_guard<std::mutex> lock(_mtx);
-
-        _events.push_back(std::move(event));
-    }
-
-    _loop->add(shared_from_this());
-}
-
-void AsyncConnection::event_callback() {
-    // NOTE: we should try our best not throw in these callbacks
-    switch (_state.load()) {
-    case State::WAIT_SENTINEL:
-        _connect_with_sentinel();
-        break;
-
-    case State::NOT_CONNECTED:
-        _connect();
-        break;
-
-    case State::READY:
-        _send();
-        break;
-
-    case State::BROKEN:
-        _clean_up();
-        break;
-
-    default:
-        break;
-    }
-}
-
-void AsyncConnection::connect_callback(std::exception_ptr err) {
-    if (err) {
-        // Failed to connect to Redis, fail all pending events.
-        _fail_events(err);
-
-        return;
-    }
-
-    // Connect OK.
-    try {
-        switch (_state.load()) {
-        case State::CONNECTING:
-            _connecting_callback();
-            break;
-
-        case State::AUTHING:
-            _authing_callback();
-            break;
-
-        case State::SELECTING_DB:
-            _select_db_callback();
-            break;
-
-        default:
-            assert(_state == State::ENABLE_READONLY);
-
-            _set_ready();
-        }
-    } catch (const Error &e) {
-        disconnect(std::make_exception_ptr(e));
-    }
-}
-
-void AsyncConnection::disconnect(std::exception_ptr err) {
-    if (_ctx != nullptr) {
-        _disable_disconnect_callback();
-
-        redisAsyncDisconnect(_ctx);
-    }
-
-    _fail_events(err);
-}
-
-void AsyncConnection::disconnect_callback(std::exception_ptr err) {
-    _fail_events(err);
-}
-
-ConnectionOptions AsyncConnection::options() {
-    std::lock_guard<std::mutex> lock(_mtx);
-
-    return _opts;
-}
-
-void AsyncConnection::update_node_info(const std::string &host, int port) {
-    std::lock_guard<std::mutex> lock(_mtx);
-
-    _opts.host = host;
-    _opts.port = port;
-}
-
-void AsyncConnection::_disable_disconnect_callback() {
-    assert(_ctx != nullptr);
-
-    auto *ctx = static_cast<AsyncContext *>(_ctx->data);
-
-    assert(ctx != nullptr);
-
-    ctx->run_disconnect_callback = false;
-}
-
-void AsyncConnection::_send() {
-    auto events = _get_events();
-    auto &ctx = _context();
-    for (auto idx = 0U; idx != events.size(); ++idx) {
-        auto &event = events[idx];
-        try {
-            event->handle(ctx);
-
-            // CommandEvent::_reply_callback will release the memory.
-            event.release();
-        } catch (...) {
-            // Failed to send command, fail subsequent events.
-            auto err = std::current_exception();
-            for (; idx != events.size(); ++idx) {
-                auto &event = events[idx];
-                event->set_exception(err);
-            }
-
-            disconnect(err);
-
-            break;
-        }
-    }
-}
-
-std::vector<AsyncEventUPtr> AsyncConnection::_get_events() {
-    std::vector<AsyncEventUPtr> events;
-    {
-        std::lock_guard<std::mutex> lock(_mtx);
-
-        events.swap(_events);
-    }
-
-    return events;
-}
-
-void AsyncConnection::_clean_up() {
-    if (!_err) {
-        _err = std::make_exception_ptr(Error("connection is closing"));
-    }
-
-    auto events = _get_events();
-    for (auto &event : events) {
-        assert(event);
-
-        event->set_exception(_err);
-    }
-}
-
-void AsyncConnection::_fail_events(std::exception_ptr err) {
-    _ctx = nullptr;
-
-    _err = err;
-
-    _state = State::BROKEN;
-
-    // Must call _clean_up after `_err` has been set.
-    _clean_up();
-}
-
-void AsyncConnection::_connecting_callback() {
-    if (_need_auth()) {
-        _auth();
-    } else if (_need_select_db()) {
-        _select_db();
-    } else if (_need_enable_readonly()) {
-        _enable_readonly();
-    } else {
-        _set_ready();
-    }
-}
-
-void AsyncConnection::_authing_callback() {
-    if (_need_select_db()) {
-        _select_db();
-    } else if (_need_enable_readonly()) {
-        _enable_readonly();
-    } else {
-        _set_ready();
-    }
-}
-
-void AsyncConnection::_select_db_callback() {
-    if (_need_enable_readonly()) {
-        _enable_readonly();
-    } else {
-        _set_ready();
-    }
-}
-
-void AsyncConnection::_auth() {
-    assert(!broken());
-
-    if (_opts.user == "default") {
-        if (redisAsyncCommand(_ctx, set_options_callback, nullptr, "AUTH %b",
-                    _opts.password.data(), _opts.password.size()) != REDIS_OK) {
-            throw Error("failed to send auth command");
-        }
-    } else {
-        // Redis 6.0 or latter
-        if (redisAsyncCommand(_ctx, set_options_callback, nullptr, "AUTH %b %b",
-                    _opts.user.data(), _opts.user.size(),
-                    _opts.password.data(), _opts.password.size()) != REDIS_OK) {
-            throw Error("failed to send auth command");
-        }
-    }
-
-    _state = State::AUTHING;
-}
-
-void AsyncConnection::_select_db() {
-    assert(!broken());
-
-    if (redisAsyncCommand(_ctx, set_options_callback, nullptr, "SELECT %d",
-            _opts.db) != REDIS_OK) {
-        throw Error("failed to send select command");
-    }
-
-    _state = State::SELECTING_DB;
-}
-
-void AsyncConnection::_enable_readonly() {
-    assert(!broken());
-
-    if (redisAsyncCommand(_ctx, set_options_callback, nullptr, "READONLY") != REDIS_OK) {
-        throw Error("failed to send readonly command");
-    }
-
-    _state = State::ENABLE_READONLY;
-}
-
-void AsyncConnection::_set_ready() {
-    _state = State::READY;
-
-    // Send pending commands.
-    _send();
-}
-
-void AsyncConnection::_connect_with_sentinel() {
-    try {
-        auto opts = options();
-        if (opts.host.empty()) {
-            // Still waiting for sentinel.
-            return;
-        }
-
-        // Already got node info from sentinel
-        _state = State::NOT_CONNECTED;
-
-        _connect();
-    } catch (const Error &err) {
-        _fail_events(std::current_exception());
-    }
-}
-
-void AsyncConnection::_connect() {
-    try {
-        auto opts = options();
-
-        auto ctx = _connect(opts);
-
-        assert(ctx && ctx->err == REDIS_OK);
-
-        const auto &tls_opts = opts.tls;
-        tls::TlsContextUPtr tls_ctx;
-        if (tls::enabled(tls_opts)) {
-            tls_ctx = tls::secure_connection(ctx->c, tls_opts);
-        }
-
-        _loop->watch(*ctx);
-
-        _tls_ctx = std::move(tls_ctx);
-        _ctx = ctx.release();
-
-        _state = State::CONNECTING;
-    } catch (const Error &err) {
-        _fail_events(std::current_exception());
-    }
-}
-
-bool AsyncConnection::_need_auth() const {
-    return !_opts.password.empty() || _opts.user != "default";
-}
-
-bool AsyncConnection::_need_select_db() const {
-    return _opts.db != 0;
-}
-
-bool AsyncConnection::_need_enable_readonly() const {
-    return _opts.readonly;
-}
-
-void AsyncConnection::_clean_async_context(void *data) {
-    auto *ctx = static_cast<AsyncContext *>(data);
-
-    assert(ctx != nullptr);
-
-    delete ctx;
-}
-
-AsyncConnection::AsyncContextUPtr AsyncConnection::_connect(const ConnectionOptions &opts) {
-    redisAsyncContext *context = nullptr;
-    switch (opts.type) {
-    case ConnectionType::TCP:
-        context = redisAsyncConnect(opts.host.c_str(), opts.port);
-        break;
-
-    case ConnectionType::UNIX:
-        context = redisAsyncConnectUnix(opts.path.c_str());
-        break;
-
-    default:
-        // Never goes here.
-        throw Error("Unknown connection type");
-    }
-
-    if (context == nullptr) {
-        throw Error("Failed to allocate memory for connection.");
-    }
-
-    auto ctx = AsyncContextUPtr(context);
-    if (ctx->err != REDIS_OK) {
-        throw_error(ctx->c, "failed to connect to server");
-    }
-
-    ctx->data = new AsyncContext(shared_from_this());
-    ctx->dataCleanup = _clean_async_context;
-
-    return ctx;
-}
-
-GuardedAsyncConnection::GuardedAsyncConnection(const AsyncConnectionPoolSPtr &pool) :
-    _pool(pool), _connection(_pool->fetch()) {
-    assert(!_connection->broken());
-}
-
-GuardedAsyncConnection::~GuardedAsyncConnection() {
-    // If `GuardedAsyncConnection` has been moved, `_pool` will be nullptr.
-    if (_pool) {
-        _pool->release(std::move(_connection));
-    }
-}
-
-AsyncConnection& GuardedAsyncConnection::connection() {
-    assert(_connection);
-
-    return *_connection;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection.h
deleted file mode 100644
index 727a16be2..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection.h
+++ /dev/null
@@ -1,498 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_CONNECTION_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_CONNECTION_H
-
-#include <cassert>
-#include <memory>
-#include <mutex>
-#include <atomic>
-#include <exception>
-#include <vector>
-#include <hiredis/async.h>
-#include "connection.h"
-#include "command_args.h"
-#include "event_loop.h"
-#include "async_utils.h"
-#include "tls.h"
-#include "shards.h"
-#include "cmd_formatter.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Result>
-struct DefaultResultParser {
-    Result operator()(redisReply &reply) const {
-        return reply::parse<Result>(reply);
-    }
-};
-
-class AsyncConnection;
-class AsyncConnectionPool;
-class AsyncShardsPool;
-
-class AsyncEvent {
-public:
-    virtual ~AsyncEvent() = default;
-
-    virtual void handle(redisAsyncContext &ctx) = 0;
-
-    virtual void set_exception(std::exception_ptr err) = 0;
-};
-
-using AsyncEventUPtr = std::unique_ptr<AsyncEvent>;
-
-enum class AsyncConnectionMode {
-    SINGLE = 0,
-    SENTINEL,
-    CLUSTER
-};
-
-class AsyncConnection : public std::enable_shared_from_this<AsyncConnection> {
-public:
-    AsyncConnection(const ConnectionOptions &opts,
-            EventLoop *loop,
-            AsyncConnectionMode = AsyncConnectionMode::SINGLE);
-
-    AsyncConnection(const AsyncConnection &) = delete;
-    AsyncConnection& operator=(const AsyncConnection &) = delete;
-
-    AsyncConnection(AsyncConnection &&) = delete;
-    AsyncConnection& operator=(AsyncConnection &&) = delete;
-
-    ~AsyncConnection();
-
-    bool broken() const noexcept {
-        return _state == State::BROKEN;
-    }
-
-    auto create_time() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _create_time;
-    }
-
-    auto last_active() const
-        -> std::chrono::steady_clock::duration {
-        return _last_active;
-    }
-
-    void disconnect(std::exception_ptr err);
-
-    template <typename Result, typename ResultParser>
-    Future<Result> send(FormattedCommand cmd);
-
-    template <typename Result, typename ResultParser>
-    Future<Result> send(const std::shared_ptr<AsyncShardsPool> &pool,
-            const StringView &key,
-            FormattedCommand cmd);
-
-    void send(AsyncEventUPtr event);
-
-    void event_callback();
-
-    void connect_callback(std::exception_ptr err = nullptr);
-
-    void disconnect_callback(std::exception_ptr err);
-
-    ConnectionOptions options();
-
-    void update_node_info(const std::string &host, int port);
-
-private:
-    enum class State {
-        BROKEN = 0,
-        NOT_CONNECTED,
-        CONNECTING,
-        AUTHING,
-        SELECTING_DB,
-        READY,
-        WAIT_SENTINEL,
-        ENABLE_READONLY
-    };
-
-    redisAsyncContext& _context() {
-        assert(_ctx != nullptr);
-
-        _last_active = std::chrono::steady_clock::now().time_since_epoch();
-
-        return *_ctx;
-    }
-
-    void _connecting_callback();
-
-    void _authing_callback();
-
-    void _select_db_callback();
-
-    bool _need_auth() const;
-
-    void _auth();
-
-    bool _need_select_db() const;
-
-    void _select_db();
-
-    bool _need_enable_readonly() const;
-
-    void _enable_readonly();
-
-    void _set_ready();
-
-    void _connect_with_sentinel();
-
-    void _connect();
-
-    void _disable_disconnect_callback();
-
-    void _send();
-
-    std::vector<std::unique_ptr<AsyncEvent>> _get_events();
-
-    void _clean_up();
-
-    void _fail_events(std::exception_ptr err);
-
-    static void _clean_async_context(void *data);
-
-    struct AsyncContextDeleter {
-        void operator()(redisAsyncContext *ctx) const {
-            if (ctx != nullptr) {
-                redisAsyncFree(ctx);
-            }
-        }
-    };
-    using AsyncContextUPtr = std::unique_ptr<redisAsyncContext, AsyncContextDeleter>;
-
-    AsyncContextUPtr _connect(const ConnectionOptions &opts);
-
-    ConnectionOptions _opts;
-
-    EventLoop *_loop = nullptr;
-
-    tls::TlsContextUPtr _tls_ctx;
-
-    // _ctx will be release by EventLoop after attached.
-    redisAsyncContext *_ctx = nullptr;
-
-    // The time that the connection is created.
-    std::chrono::time_point<std::chrono::steady_clock> _create_time{};
-
-    // The time that the connection is created or the time that
-    // the connection is recently used, i.e. `_context()` is called.
-    // NOTE: `_last_active` is `std::atomic`, and we cannot make it of type time_point,
-    // since time_point's constructor is non-trival.
-    std::atomic<std::chrono::steady_clock::duration> _last_active{};
-
-    std::vector<std::unique_ptr<AsyncEvent>> _events;
-
-    std::atomic<State> _state{State::NOT_CONNECTED};
-
-    std::exception_ptr _err;
-
-    std::mutex _mtx;
-};
-
-using AsyncConnectionSPtr = std::shared_ptr<AsyncConnection>;
-
-struct AsyncContext {
-    AsyncContext(AsyncConnectionSPtr conn) : connection(std::move(conn)) {}
-
-    AsyncConnectionSPtr connection;
-
-    bool run_disconnect_callback = true;
-};
-
-template <typename Result, typename ResultParser>
-class CommandEvent : public AsyncEvent {
-public:
-    explicit CommandEvent(FormattedCommand cmd) : _cmd(std::move(cmd)) {}
-
-    Future<Result> get_future() {
-        return _pro.get_future();
-    }
-
-    virtual void handle(redisAsyncContext &ctx) override {
-        _handle(ctx, _reply_callback);
-    }
-
-    virtual void set_exception(std::exception_ptr err) override {
-        _pro.set_exception(err);
-    }
-
-    template <typename T>
-    struct ResultType {};
-
-    void set_value(redisReply &reply) {
-        _set_value(reply, ResultType<Result>{});
-    }
-
-protected:
-    using Callback = void (*)(redisAsyncContext *, void *, void *);
-
-    void _handle(redisAsyncContext &ctx, Callback callback) {
-        if (redisAsyncFormattedCommand(&ctx,
-                    callback, this, _cmd.data(), _cmd.size()) != REDIS_OK) {
-            throw_error(ctx.c, "failed to send command");
-        }
-    }
-
-private:
-    static void _reply_callback(redisAsyncContext * /*ctx*/, void *r, void *privdata) {
-        auto event = static_cast<CommandEvent<Result, ResultParser> *>(privdata);
-
-        assert(event != nullptr);
-
-        try {
-            redisReply *reply = static_cast<redisReply *>(r);
-            if (reply == nullptr) {
-                event->set_exception(std::make_exception_ptr(Error("connection has been closed")));
-            } else if (reply::is_error(*reply)) {
-                try {
-                    throw_error(*reply);
-                } catch (const Error &e) {
-                    event->set_exception(std::current_exception());
-                }
-            } else {
-                event->set_value(*reply);
-            }
-        } catch (...) {
-            event->set_exception(std::current_exception());
-        }
-
-        delete event;
-    }
-
-    template <typename T>
-    void _set_value(redisReply &reply, ResultType<T>) {
-        ResultParser parser;
-        _pro.set_value(parser(reply));
-    }
-
-    void _set_value(redisReply &reply, ResultType<void>) {
-        ResultParser parser;
-        parser(reply);
-
-        _pro.set_value();
-    }
-
-    FormattedCommand _cmd;
-
-    Promise<Result> _pro;
-};
-
-template <typename Result, typename ResultParser>
-using CommandEventUPtr = std::unique_ptr<CommandEvent<Result, ResultParser>>;
-
-class AskingEvent : public AsyncEvent {
-public:
-    explicit AskingEvent(AsyncEvent *event) : _event(event) {}
-
-    ~AskingEvent() {
-        if (_event != nullptr) {
-            delete _event;
-        }
-    }
-
-    virtual void handle(redisAsyncContext &ctx) override {
-        if (redisAsyncCommand(&ctx, _asking_callback, this, "ASKING") != REDIS_OK) {
-            throw_error(ctx.c, "failed to send ASKING command");
-        }
-
-        assert(_event != nullptr);
-
-        _event->handle(ctx);
-
-        _event = nullptr;
-    }
-
-    virtual void set_exception(std::exception_ptr err) override {
-        if (_event != nullptr) {
-            _event->set_exception(err);
-        }
-    }
-
-private:
-    static void _asking_callback(redisAsyncContext * /*ctx*/, void *r, void *privdata) {
-        auto event = static_cast<AskingEvent *>(privdata);
-
-        assert(event != nullptr);
-
-        // TODO: No need to check the reply. It seems that we can simply ignore the reply,
-        // and delete the event.
-        try {
-            redisReply *reply = static_cast<redisReply *>(r);
-            if (reply == nullptr) {
-                event->set_exception(std::make_exception_ptr(Error("connection has been closed")));
-            } else if (reply::is_error(*reply)) {
-                try {
-                    throw_error(*reply);
-                } catch (const Error &e) {
-                    event->set_exception(std::current_exception());
-                }
-            } else {
-                reply::parse<void>(*reply);
-            }
-        } catch (...) {
-            event->set_exception(std::current_exception());
-        }
-
-        delete event;
-    }
-
-    AsyncEvent *_event = nullptr;
-};
-
-// NOTE: This class is similar to `SafeAsyncConnection`.
-// The difference is that `SafeAsyncConnection` tries to avoid copying a std::shared_ptr.
-class GuardedAsyncConnection {
-public:
-    explicit GuardedAsyncConnection(const std::shared_ptr<AsyncConnectionPool> &pool);
-
-    GuardedAsyncConnection(const GuardedAsyncConnection &) = delete;
-    GuardedAsyncConnection& operator=(const GuardedAsyncConnection &) = delete;
-
-    GuardedAsyncConnection(GuardedAsyncConnection &&) = default;
-    GuardedAsyncConnection& operator=(GuardedAsyncConnection &&) = default;
-
-    ~GuardedAsyncConnection();
-
-    AsyncConnection& connection();
-
-private:
-    std::shared_ptr<AsyncConnectionPool> _pool;
-    std::shared_ptr<AsyncConnection> _connection;
-};
-
-template <typename Result, typename ResultParser>
-class ClusterEvent : public CommandEvent<Result, ResultParser> {
-public:
-    explicit ClusterEvent(const std::shared_ptr<AsyncShardsPool> &pool,
-            const StringView &key,
-            FormattedCommand cmd) :
-        CommandEvent<Result, ResultParser>(std::move(cmd)),
-        _pool(pool),
-        _key(key.data(), key.size()) {}
-
-    virtual void handle(redisAsyncContext &ctx) override {
-        CommandEvent<Result, ResultParser>::_handle(ctx, _cluster_reply_callback);
-    }
-
-private:
-    enum class State {
-        NORMAL = 0,
-        MOVED,
-        ASKING
-    };
-
-    static void _cluster_reply_callback(redisAsyncContext * /*ctx*/, void *r, void *privdata) {
-        auto event = static_cast<ClusterEvent<Result, ResultParser> *>(privdata);
-
-        assert(event != nullptr);
-
-        try {
-            redisReply *reply = static_cast<redisReply *>(r);
-            if (reply == nullptr) {
-                event->set_exception(std::make_exception_ptr(Error("connection has been closed")));
-            } else if (reply::is_error(*reply)) {
-                try {
-                    throw_error(*reply);
-                } catch (const IoError &err) {
-                    event->_pool->update(event->_key, AsyncEventUPtr(event));
-                    return;
-                } catch (const ClosedError &err) {
-                    event->_pool->update(event->_key, AsyncEventUPtr(event));
-                    return;
-                } catch (const MovedError &err) {
-                    switch (event->_state) {
-                    case State::MOVED:
-                        throw Error("too many moved error");
-                        break;
-
-                    case State::ASKING:
-                        throw Error("Slot migrating...");
-                        break;
-
-                    default:
-                        break;
-                    }
-
-                    event->_state = State::MOVED;
-                    event->_pool->update(event->_key, AsyncEventUPtr(event));
-                    return;
-                } catch (const AskError &err) {
-                    event->_state = State::ASKING;
-                    auto pool = event->_pool->fetch(err.node());
-                    assert(pool);
-                    GuardedAsyncConnection connection(pool);
-                    connection.connection().send(AsyncEventUPtr(new AskingEvent(event)));
-                    return;
-                } catch (const Error &e) {
-                    event->set_exception(std::current_exception());
-                }
-            } else {
-                event->set_value(*reply);
-            }
-        } catch (...) {
-            event->set_exception(std::current_exception());
-        }
-
-        delete event;
-    }
-
-    std::shared_ptr<AsyncShardsPool> _pool;
-
-    std::string _key;
-
-    State _state = State::NORMAL;
-};
-
-template <typename Result, typename ResultParser>
-using ClusterEventUPtr = std::unique_ptr<ClusterEvent<Result, ResultParser>>;
-
-template <typename Result, typename ResultParser>
-Future<Result> AsyncConnection::send(FormattedCommand cmd) {
-    auto event = CommandEventUPtr<Result, ResultParser>(
-            new CommandEvent<Result, ResultParser>(std::move(cmd)));
-
-    auto fut = event->get_future();
-
-    send(std::move(event));
-
-    return fut;
-}
-
-template <typename Result, typename ResultParser>
-Future<Result> AsyncConnection::send(const std::shared_ptr<AsyncShardsPool> &pool,
-        const StringView &key,
-        FormattedCommand cmd) {
-    auto event = ClusterEventUPtr<Result, ResultParser>(
-            new ClusterEvent<Result, ResultParser>(pool, key, std::move(cmd)));
-
-    auto fut = event->get_future();
-
-    send(std::move(event));
-
-    return fut;
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_CONNECTION_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection_pool.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection_pool.cpp
deleted file mode 100644
index f00d57bb8..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection_pool.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "async_connection_pool.h"
-#include <cassert>
-#include <utility>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-SimpleAsyncSentinel::SimpleAsyncSentinel(const AsyncSentinelSPtr &sentinel,
-                                            const std::string &master_name,
-                                            Role role) :
-                                                _sentinel(sentinel),
-                                                _master_name(master_name),
-                                                _role(role) {
-    if (!_sentinel) {
-        throw Error("Sentinel cannot be null");
-    }
-
-    if (_role != Role::MASTER && _role != Role::SLAVE) {
-        throw Error("Role must be Role::MASTER or Role::SLAVE");
-    }
-}
-
-AsyncConnectionSPtr SimpleAsyncSentinel::create(const ConnectionOptions &opts,
-        const std::shared_ptr<AsyncConnectionPool> &pool,
-        EventLoop *loop) {
-    auto connection = std::make_shared<AsyncConnection>(opts, loop, AsyncConnectionMode::SENTINEL);
-
-    AsyncSentinel::AsyncSentinelTask task;
-    task.pool = pool;
-    task.connection = connection;
-    task.master_name = _master_name;
-    task.role = _role;
-
-    _sentinel->add(std::move(task));
-
-    return connection;
-}
-
-AsyncConnectionPool::AsyncConnectionPool(const EventLoopSPtr &loop,
-        const ConnectionPoolOptions &pool_opts,
-        const ConnectionOptions &connection_opts) :
-            _loop(loop),
-            _opts(connection_opts),
-            _pool_opts(pool_opts) {
-    if (_pool_opts.size == 0) {
-        throw Error("CANNOT create an empty pool");
-    }
-
-    // Lazily create connections.
-}
-
-AsyncConnectionPool::AsyncConnectionPool(SimpleAsyncSentinel sentinel,
-                                const EventLoopSPtr &loop,
-                                const ConnectionPoolOptions &pool_opts,
-                                const ConnectionOptions &connection_opts) :
-                                    _loop(loop),
-                                    _opts(connection_opts),
-                                    _pool_opts(pool_opts),
-                                    _sentinel(std::move(sentinel)) {
-    // In this case, the connection must be of TCP type.
-    if (_opts.type != ConnectionType::TCP) {
-        throw Error("Sentinel only supports TCP connection");
-    }
-
-    if (_opts.connect_timeout == std::chrono::milliseconds(0)
-            || _opts.socket_timeout == std::chrono::milliseconds(0)) {
-        throw Error("With sentinel, connection timeout and socket timeout cannot be 0");
-    }
-
-    // Cleanup connection options.
-    _update_connection_opts("", -1);
-
-    assert(_sentinel);
-}
-
-AsyncConnectionPool::AsyncConnectionPool(AsyncConnectionPool &&that) {
-    std::lock_guard<std::mutex> lock(that._mutex);
-
-    _move(std::move(that));
-}
-
-AsyncConnectionPool& AsyncConnectionPool::operator=(AsyncConnectionPool &&that) {
-    if (this != &that) {
-        std::lock(_mutex, that._mutex);
-        std::lock_guard<std::mutex> lock_this(_mutex, std::adopt_lock);
-        std::lock_guard<std::mutex> lock_that(that._mutex, std::adopt_lock);
-
-        _move(std::move(that));
-    }
-
-    return *this;
-}
-
-AsyncConnectionPool::~AsyncConnectionPool() {
-    assert(_loop);
-
-    // TODO: what if the connection has been borrowed but not returned?
-    // Or we dont' need to worry about that, since it's destructing and
-    // all borrowed connections should have been returned.
-    for (auto &connection : _pool) {
-        // TODO: what if some connection has never been watched? Is it possible?
-        _loop->unwatch(std::move(connection));
-    }
-}
-
-AsyncConnectionSPtr AsyncConnectionPool::fetch() {
-    std::unique_lock<std::mutex> lock(_mutex);
-
-    if (_pool.empty()) {
-        if (_used_connections == _pool_opts.size) {
-            _wait_for_connection(lock);
-        } else {
-            // Lazily create a new connection.
-            auto connection = _create();
-
-            ++_used_connections;
-
-            return connection;
-        }
-    }
-
-    // _pool is NOT empty.
-    auto connection = _fetch();
-
-    auto connection_lifetime = _pool_opts.connection_lifetime;
-    auto connection_idle_time = _pool_opts.connection_idle_time;
-
-    if (_sentinel) {
-        auto opts = _opts;
-        auto role_changed = _role_changed(connection->options());
-        auto sentinel = _sentinel;
-
-        lock.unlock();
-
-        if (role_changed || _need_reconnect(*connection, connection_lifetime, connection_idle_time)) {
-            try {
-                auto tmp_connection = sentinel.create(opts, shared_from_this(), _loop.get());
-
-                std::swap(tmp_connection, connection);
-
-                // Release expired connection.
-                // TODO: If `unwatch` throw, we will leak the connection.
-                _loop->unwatch(std::move(tmp_connection));
-            } catch (const Error &e) {
-                // Failed to reconnect, return it to the pool, and retry latter.
-                release(std::move(connection));
-                throw;
-            }
-        }
-
-        return connection;
-    }
-
-    lock.unlock();
-
-    assert(connection);
-
-    if (_need_reconnect(*connection, connection_lifetime, connection_idle_time)) {
-        try {
-            auto tmp_connection = _create();
-
-            std::swap(tmp_connection, connection);
-
-            // Release expired connection.
-            // TODO: If `unwatch` throw, we will leak the connection.
-            _loop->unwatch(std::move(tmp_connection));
-        } catch (const Error &e) {
-            // Failed, return it to the pool, and retry latter.
-            release(std::move(connection));
-            throw;
-        }
-    }
-
-    return connection;
-}
-
-ConnectionOptions AsyncConnectionPool::connection_options() {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    return _opts;
-}
-
-void AsyncConnectionPool::release(AsyncConnectionSPtr connection) {
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        _pool.push_back(std::move(connection));
-    }
-
-    _cv.notify_one();
-}
-
-AsyncConnectionSPtr AsyncConnectionPool::create() {
-    std::unique_lock<std::mutex> lock(_mutex);
-
-    auto opts = _opts;
-
-    if (_sentinel) {
-        // TODO: it seems that we don't need to copy sentinel,
-        // since it's thread-safe.
-        auto sentinel = _sentinel;
-
-        lock.unlock();
-
-        return sentinel.create(opts, shared_from_this(), _loop.get());
-    } else {
-        lock.unlock();
-
-        return std::make_shared<AsyncConnection>(opts, _loop.get());
-    }
-}
-
-AsyncConnectionPool AsyncConnectionPool::clone() {
-    std::unique_lock<std::mutex> lock(_mutex);
-
-    auto opts = _opts;
-    auto pool_opts = _pool_opts;
-
-    if (_sentinel) {
-        auto sentinel = _sentinel;
-
-        lock.unlock();
-
-        return AsyncConnectionPool(sentinel, _loop, pool_opts, opts);
-    } else {
-        lock.unlock();
-
-        return AsyncConnectionPool(_loop, pool_opts, opts);
-    }
-}
-
-void AsyncConnectionPool::update_node_info(const std::string &host,
-        int port,
-        AsyncConnectionSPtr &connection) {
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        _update_connection_opts(host, port);
-    }
-
-    connection->update_node_info(host, port);
-
-    _loop->add(connection);
-}
-
-void AsyncConnectionPool::update_node_info(AsyncConnectionSPtr &connection,
-        std::exception_ptr err) {
-    _loop->unwatch(connection, err);
-}
-
-void AsyncConnectionPool::_move(AsyncConnectionPool &&that) {
-    _loop = std::move(that._loop);
-    _opts = std::move(that._opts);
-    _pool_opts = std::move(that._pool_opts);
-    _pool = std::move(that._pool);
-    _used_connections = that._used_connections;
-    _sentinel = std::move(that._sentinel);
-}
-
-AsyncConnectionSPtr AsyncConnectionPool::_create() {
-    if (_sentinel) {
-        // Get Redis host and port info from sentinel.
-        // In this case, the mutex has been locked.
-        return _sentinel.create(_opts, shared_from_this(), _loop.get());
-    }
-
-    return std::make_shared<AsyncConnection>(_opts, _loop.get());
-}
-
-AsyncConnectionSPtr AsyncConnectionPool::_fetch() {
-    assert(!_pool.empty());
-
-    auto connection = std::move(_pool.front());
-    _pool.pop_front();
-
-    return connection;
-}
-
-void AsyncConnectionPool::_wait_for_connection(std::unique_lock<std::mutex> &lock) {
-    auto timeout = _pool_opts.wait_timeout;
-    if (timeout > std::chrono::milliseconds(0)) {
-        // Wait until _pool is no longer empty or timeout.
-        if (!_cv.wait_for(lock,
-                    timeout,
-                    [this] { return !(this->_pool).empty(); })) {
-            throw Error("Failed to fetch a connection in "
-                    + std::to_string(timeout.count()) + " milliseconds");
-        }
-    } else {
-        // Wait forever.
-        _cv.wait(lock, [this] { return !(this->_pool).empty(); });
-    }
-}
-
-bool AsyncConnectionPool::_need_reconnect(const AsyncConnection &connection,
-                                    const std::chrono::milliseconds &connection_lifetime,
-                                    const std::chrono::milliseconds &connection_idle_time) const {
-    if (connection.broken()) {
-        return true;
-    }
-
-    auto now = std::chrono::steady_clock::now();
-    if (connection_lifetime > std::chrono::milliseconds(0)) {
-        if (now - connection.create_time() > connection_lifetime) {
-            return true;
-        }
-    }
-
-    if (connection_idle_time > std::chrono::milliseconds(0)) {
-        if (now.time_since_epoch() - connection.last_active() > connection_idle_time) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool AsyncConnectionPool::_role_changed(const ConnectionOptions &opts) const {
-    if (opts.host.empty()) {
-        // Still waiting for sentinel.
-        return false;
-    }
-
-    return opts.port != _opts.port || opts.host != _opts.host;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection_pool.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection_pool.h
deleted file mode 100644
index 17aef68a9..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_connection_pool.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_CONNECTION_POOL_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_CONNECTION_POOL_H
-
-#include <cassert>
-#include <unordered_set>
-#include <chrono>
-#include <mutex>
-#include <memory>
-#include <exception>
-#include <condition_variable>
-#include <deque>
-#include "connection.h"
-#include "connection_pool.h"
-#include "async_connection.h"
-#include "async_sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-class AsyncConnectionPool;
-
-class SimpleAsyncSentinel {
-public:
-    SimpleAsyncSentinel(const AsyncSentinelSPtr &sentinel,
-                        const std::string &master_name,
-                        Role role);
-
-    SimpleAsyncSentinel() = default;
-
-    SimpleAsyncSentinel(const SimpleAsyncSentinel &) = default;
-    SimpleAsyncSentinel& operator=(const SimpleAsyncSentinel &) = default;
-
-    SimpleAsyncSentinel(SimpleAsyncSentinel &&) = default;
-    SimpleAsyncSentinel& operator=(SimpleAsyncSentinel &&) = default;
-
-    ~SimpleAsyncSentinel() = default;
-
-    explicit operator bool() const {
-        return bool(_sentinel);
-    }
-
-    AsyncConnectionSPtr create(const ConnectionOptions &opts,
-            const std::shared_ptr<AsyncConnectionPool> &pool,
-            EventLoop *loop);
-
-private:
-    AsyncSentinelSPtr _sentinel;
-
-    std::string _master_name;
-
-    Role _role = Role::MASTER;
-};
-
-class AsyncConnectionPool : public std::enable_shared_from_this<AsyncConnectionPool> {
-public:
-    AsyncConnectionPool(const EventLoopSPtr &loop,
-                    const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    AsyncConnectionPool(SimpleAsyncSentinel sentinel,
-                    const EventLoopSPtr &loop,
-                    const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    AsyncConnectionPool(AsyncConnectionPool &&that);
-    AsyncConnectionPool& operator=(AsyncConnectionPool &&that);
-
-    AsyncConnectionPool(const AsyncConnectionPool &) = delete;
-    AsyncConnectionPool& operator=(const AsyncConnectionPool &) = delete;
-
-    ~AsyncConnectionPool();
-
-    // Fetch a connection from pool.
-    AsyncConnectionSPtr fetch();
-
-    ConnectionOptions connection_options();
-
-    void release(AsyncConnectionSPtr connection);
-
-    // Create a new connection.
-    AsyncConnectionSPtr create();
-
-    AsyncConnectionPool clone();
-
-    // These update_node_info overloads are called by AsyncSentinel.
-    void update_node_info(const std::string &host,
-            int port,
-            AsyncConnectionSPtr &connection);
-
-    void update_node_info(AsyncConnectionSPtr &connection,
-            std::exception_ptr err);
-
-private:
-    void _move(AsyncConnectionPool &&that);
-
-    // NOT thread-safe
-    AsyncConnectionSPtr _create();
-
-    AsyncConnectionSPtr _fetch();
-
-    void _wait_for_connection(std::unique_lock<std::mutex> &lock);
-
-    bool _need_reconnect(const AsyncConnection &connection,
-                            const std::chrono::milliseconds &connection_lifetime,
-                            const std::chrono::milliseconds &connection_idle_time) const;
-
-    void _update_connection_opts(const std::string &host, int port) {
-        _opts.host = host;
-        _opts.port = port;
-    }
-
-    bool _role_changed(const ConnectionOptions &opts) const;
-
-    EventLoopSPtr _loop;
-
-    ConnectionOptions _opts;
-
-    ConnectionPoolOptions _pool_opts;
-
-    std::deque<AsyncConnectionSPtr> _pool;
-
-    std::size_t _used_connections = 0;
-
-    std::mutex _mutex;
-
-    std::condition_variable _cv;
-
-    SimpleAsyncSentinel _sentinel;
-};
-
-using AsyncConnectionPoolSPtr = std::shared_ptr<AsyncConnectionPool>;
-
-class SafeAsyncConnection {
-public:
-    explicit SafeAsyncConnection(AsyncConnectionPool &pool) : _pool(pool), _connection(_pool.fetch()) {
-        assert(_connection);
-    }
-
-    SafeAsyncConnection(const SafeAsyncConnection &) = delete;
-    SafeAsyncConnection& operator=(const SafeAsyncConnection &) = delete;
-
-    SafeAsyncConnection(SafeAsyncConnection &&) = delete;
-    SafeAsyncConnection& operator=(SafeAsyncConnection &&) = delete;
-
-    ~SafeAsyncConnection() {
-        _pool.release(std::move(_connection));
-    }
-
-    AsyncConnection& connection() {
-        assert(_connection);
-
-        return *_connection;
-    }
-
-private:
-    AsyncConnectionPool &_pool;
-    AsyncConnectionSPtr _connection;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_CONNECTION_POOL_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis++.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis++.h
deleted file mode 100644
index 364ba5882..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis++.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_REDISPLUSPLUS_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_REDISPLUSPLUS_H
-
-#include "async_redis.h"
-#include "async_redis_cluster.h"
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_REDISPLUSPLUS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis.cpp
deleted file mode 100644
index 6d9d35ccc..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "async_redis.h"
-#include "reply.h"
-
-namespace sw {
-
-namespace redis {
-
-AsyncRedis::AsyncRedis(const ConnectionOptions &opts,
-        const ConnectionPoolOptions &pool_opts,
-        const EventLoopSPtr &loop) : _loop(loop) {
-    if (!_loop) {
-        _loop = std::make_shared<EventLoop>();
-    }
-
-    _pool = std::make_shared<AsyncConnectionPool>(_loop, pool_opts, opts);
-}
-
-AsyncRedis::AsyncRedis(const std::shared_ptr<AsyncSentinel> &sentinel,
-        const std::string &master_name,
-        Role role,
-        const ConnectionOptions &opts,
-        const ConnectionPoolOptions &pool_opts,
-        const EventLoopSPtr &loop) : _loop(loop) {
-    if (!_loop) {
-        _loop = std::make_shared<EventLoop>();
-    }
-
-    _pool = std::make_shared<AsyncConnectionPool>(SimpleAsyncSentinel(sentinel, master_name, role),
-                                                    _loop,
-                                                    pool_opts,
-                                                    opts);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis.h
deleted file mode 100644
index 726db54ff..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis.h
+++ /dev/null
@@ -1,789 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_REDIS_H
-
-#include "async_connection.h"
-#include "async_connection_pool.h"
-#include "async_sentinel.h"
-#include "event_loop.h"
-#include "utils.h"
-#include "command.h"
-#include "command_args.h"
-#include "command_options.h"
-#include "cmd_formatter.h"
-
-namespace sw {
-
-namespace redis {
-
-class AsyncRedis {
-public:
-    AsyncRedis(const ConnectionOptions &opts,
-            const ConnectionPoolOptions &pool_opts = {},
-            const EventLoopSPtr &loop = nullptr);
-
-    AsyncRedis(const std::shared_ptr<AsyncSentinel> &sentinel,
-                const std::string &master_name,
-                Role role,
-                const ConnectionOptions &connection_opts,
-                const ConnectionPoolOptions &pool_opts = {},
-                const EventLoopSPtr &loop = nullptr);
-
-    AsyncRedis(const AsyncRedis &) = delete;
-    AsyncRedis& operator=(const AsyncRedis &) = delete;
-
-    AsyncRedis(AsyncRedis &&) = default;
-    AsyncRedis& operator=(AsyncRedis &&) = default;
-
-    ~AsyncRedis() = default;
-
-    template <typename Result, typename ...Args>
-    Future<Result> command(const StringView &cmd_name, Args &&...args) {
-        auto formatter = [](const StringView &cmd_name, Args &&...args) {
-            CmdArgs cmd_args;
-            cmd_args.append(cmd_name, std::forward<Args>(args)...);
-            return fmt::format_cmd(cmd_args);
-        };
-
-        return _command<Result>(formatter, cmd_name, std::forward<Args>(args)...);
-    }
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Future<Result>>::type {
-        auto formatter = [](Input first, Input last) {
-            CmdArgs cmd_args;
-            while (first != last) {
-                cmd_args.append(*first);
-                ++first;
-            }
-            return fmt::format_cmd(cmd_args);
-        };
-
-        return _command<Result>(formatter, first, last);
-    }
-
-    // CONNECTION commands.
-
-    Future<std::string> echo(const StringView &msg) {
-        return _command<std::string>(fmt::echo, msg);
-    }
-
-    Future<std::string> ping() {
-        return _command<std::string, FormattedCommand (*)()>(fmt::ping);
-    }
-
-    Future<std::string> ping(const StringView &msg) {
-        return _command<std::string,
-               FormattedCommand (*)(const StringView &)>(fmt::ping, msg);
-    }
-
-    // KEY commands.
-
-    Future<long long> del(const StringView &key) {
-        return _command<long long>(fmt::del, key);
-    }
-
-    template <typename Input>
-    Future<long long> del(Input first, Input last) {
-        range_check("DEL", first, last);
-
-        return _command<long long>(fmt::del_range<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<long long> del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    Future<long long> exists(const StringView &key) {
-        return _command<long long>(fmt::exists, key);
-    }
-
-    template <typename Input>
-    Future<long long> exists(Input first, Input last) {
-        range_check("EXISTS", first, last);
-
-        return _command<long long>(fmt::exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<long long> exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    Future<bool> expire(const StringView &key, const std::chrono::seconds &timeout) {
-        return _command<bool>(fmt::expire, key, timeout);
-    }
-
-    Future<bool> expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp) {
-        return _command<bool>(fmt::expireat, key, tp);
-    }
-
-    Future<bool> pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-        return _command<bool>(fmt::pexpire, key, timeout);
-    }
-
-    Future<bool> pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp) {
-        return _command<bool>(fmt::pexpireat, key, tp);
-    }
-
-    Future<long long> pttl(const StringView &key) {
-        return _command<long long>(fmt::pttl, key);
-    }
-
-    Future<void> rename(const StringView &key, const StringView &newkey) {
-        return _command<void>(fmt::rename, key, newkey);
-    }
-
-    Future<bool> renamenx(const StringView &key, const StringView &newkey) {
-        return _command<bool>(fmt::renamenx, key, newkey);
-    }
-
-    Future<long long> ttl(const StringView &key) {
-        return _command<long long>(fmt::ttl, key);
-    }
-
-    Future<long long> unlink(const StringView &key) {
-        return _command<long long>(fmt::unlink, key);
-    }
-
-    template <typename Input>
-    Future<long long> unlink(Input first, Input last) {
-        range_check("UNLINK", first, last);
-
-        return _command<long long>(fmt::unlink_range<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<long long> unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    // STRING commands.
-
-    Future<OptionalString> get(const StringView &key) {
-        return _command<OptionalString>(fmt::get, key);
-    }
-
-    Future<long long> incr(const StringView &key) {
-        return _command<long long>(fmt::incr, key);
-    }
-
-    Future<long long> incrby(const StringView &key, long long increment) {
-        return _command<long long>(fmt::incrby, key, increment);
-    }
-
-    Future<double> incrbyfloat(const StringView &key, double increment) {
-        return _command<double>(fmt::incrbyfloat, key, increment);
-    }
-
-    template <typename Output, typename Input>
-    Future<Output> mget(Input first, Input last) {
-        range_check("MGET", first, last);
-
-        return _command<Output>(fmt::mget<Input>, first, last);
-    }
-
-    template <typename Output, typename T>
-    Future<Output> mget(std::initializer_list<T> il) {
-        return mget<Output>(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    Future<void> mset(Input first, Input last) {
-        range_check("MSET", first, last);
-
-        return _command<void>(fmt::mset<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<void> mset(std::initializer_list<T> il) {
-        return mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    Future<bool> msetnx(Input first, Input last) {
-        range_check("MSETNX", first, last);
-
-        return _command<bool>(fmt::msetnx<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<bool> msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    Future<bool> set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS) {
-        return _command_with_parser<bool, fmt::SetResultParser>(fmt::set, key, val, ttl, type);
-    }
-
-    Future<long long> strlen(const StringView &key) {
-        return _command<long long>(fmt::strlen, key);
-    }
-
-    // LIST commands.
-
-    Future<OptionalStringPair> blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return _command<OptionalStringPair>(fmt::blpop, key, timeout);
-    }
-
-    template <typename Input>
-    Future<OptionalStringPair> blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        range_check("BLPOP", first, last);
-
-        return _command<OptionalStringPair>(fmt::blpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    Future<OptionalStringPair> blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    Future<OptionalStringPair> brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return _command<OptionalStringPair>(fmt::brpop, key, timeout);
-    }
-
-    template <typename Input>
-    Future<OptionalStringPair> brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        range_check("BRPOP", first, last);
-
-        return _command<OptionalStringPair>(fmt::brpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    Future<OptionalStringPair> brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    Future<OptionalString> brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return _command<OptionalString>(fmt::brpoplpush, source, destination, timeout);
-    }
-
-    Future<long long> llen(const StringView &key) {
-        return _command<long long>(fmt::llen, key);
-    }
-
-    Future<OptionalString> lpop(const StringView &key) {
-        return _command<OptionalString>(fmt::lpop, key);
-    }
-
-    Future<long long> lpush(const StringView &key, const StringView &val) {
-        return _command<long long>(fmt::lpush, key, val);
-    }
-
-    template <typename Input>
-    Future<long long> lpush(const StringView &key, Input first, Input last) {
-        range_check("LPUSH", first, last);
-
-        return _command<long long>(fmt::lpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    Future<Output> lrange(const StringView &key, long long start, long long stop) {
-        return _command<Output>(fmt::lrange, key, start, stop);
-    }
-
-    Future<long long> lrem(const StringView &key, long long count, const StringView &val) {
-        return _command<long long>(fmt::lrem, key, count, val);
-    }
-
-    Future<void> ltrim(const StringView &key, long long start, long long stop) {
-        return _command<void>(fmt::ltrim, key, start, stop);
-    }
-
-    Future<OptionalString> rpop(const StringView &key) {
-        return _command<OptionalString>(fmt::rpop, key);
-    }
-
-    Future<OptionalString> rpoplpush(const StringView &source, const StringView &destination) {
-        return _command<OptionalString>(fmt::rpoplpush, source, destination);
-    }
-
-    Future<long long> rpush(const StringView &key, const StringView &val) {
-        return _command<long long>(fmt::rpush, key, val);
-    }
-
-    template <typename Input>
-    Future<long long> rpush(const StringView &key, Input first, Input last) {
-        range_check("RPUSH", first, last);
-
-        return _command<long long>(fmt::rpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    // HASH commands.
-
-    Future<long long> hdel(const StringView &key, const StringView &field) {
-        return _command<long long>(fmt::hdel, key, field);
-    }
-
-    template <typename Input>
-    Future<long long> hdel(const StringView &key, Input first, Input last) {
-        range_check("HDEL", first, last);
-
-        return _command<long long>(fmt::hdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    Future<bool> hexists(const StringView &key, const StringView &field) {
-        return _command<bool>(fmt::hexists, key, field);
-    }
-
-    Future<OptionalString> hget(const StringView &key, const StringView &field) {
-        return _command<OptionalString>(fmt::hget, key, field);
-    }
-
-    template <typename Output>
-    Future<Output> hgetall(const StringView &key) {
-        return _command<Output>(fmt::hgetall, key);
-    }
-
-    Future<long long> hincrby(const StringView &key, const StringView &field, long long increment) {
-        return _command<long long>(fmt::hincrby, key, field, increment);
-    }
-
-    Future<double> hincrbyfloat(const StringView &key, const StringView &field, double increment) {
-        return _command<double>(fmt::hincrbyfloat, key, field, increment);
-    }
-
-    template <typename Output>
-    Future<Output> hkeys(const StringView &key) {
-        return _command<Output>(fmt::hkeys, key);
-    }
-
-    Future<long long> hlen(const StringView &key) {
-        return _command<long long>(fmt::hlen, key);
-    }
-
-    template <typename Output, typename Input>
-    Future<Output> hmget(const StringView &key, Input first, Input last) {
-        range_check("HMGET", first, last);
-
-        return _command<Output>(fmt::hmget<Input>, key, first, last);
-    }
-
-    template <typename Output, typename T>
-    Future<Output> hmget(const StringView &key, std::initializer_list<T> il) {
-        return hmget<Output>(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    Future<void> hmset(const StringView &key, Input first, Input last) {
-        range_check("HMSET", first, last);
-
-        return _command<void>(fmt::hmset<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<void> hmset(const StringView &key, std::initializer_list<T> il) {
-        return hmset(key, il.begin(), il.end());
-    }
-
-    Future<bool> hset(const StringView &key, const StringView &field, const StringView &val) {
-        return _command<bool>(fmt::hset, key, field, val);
-    }
-
-    Future<bool> hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hset(key, item.first, item.second);
-    }
-
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value, Future<long long>>::type {
-        range_check("HSET", first, last);
-
-        return _command<long long>(fmt::hset_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    Future<Output> hvals(const StringView &key) {
-        return _command<Output>(fmt::hvals, key);
-    }
-
-    // SET commands.
-
-    Future<long long> sadd(const StringView &key, const StringView &member) {
-        return _command<long long>(fmt::sadd, key, member);
-    }
-
-    template <typename Input>
-    Future<long long> sadd(const StringView &key, Input first, Input last) {
-        range_check("SADD", first, last);
-
-        return _command<long long>(fmt::sadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    Future<long long> scard(const StringView &key) {
-        return _command<long long>(fmt::scard, key);
-    }
-
-    Future<bool> sismember(const StringView &key, const StringView &member) {
-        return _command<bool>(fmt::sismember, key, member);
-    }
-
-    template <typename Output>
-    Future<Output> smembers(const StringView &key) {
-        return _command<Output>(fmt::smembers, key);
-    }
-
-    Future<OptionalString> spop(const StringView &key) {
-        return _command<OptionalString,
-               FormattedCommand (*)(const StringView &)>(fmt::spop, key);
-    }
-
-    template <typename Output>
-    Future<Output> spop(const StringView &key, long long count) {
-        return _command<Output,
-               FormattedCommand (*)(const StringView &, long long)>(fmt::spop, key, count);
-    }
-
-    Future<long long> srem(const StringView &key, const StringView &member) {
-        return _command<long long>(fmt::srem, key, member);
-    }
-
-    template <typename Input>
-    Future<long long> srem(const StringView &key, Input first, Input last) {
-        range_check("SREM", first, last);
-
-        return _command<long long>(fmt::srem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        return _command<Optional<std::tuple<std::string, std::string, double>>>(
-                fmt::bzpopmax, key, timeout);
-    }
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        range_check("BZPOPMAX", first, last);
-
-        return _command<Optional<std::tuple<std::string, std::string, double>>>(
-                fmt::bzpopmax_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        return _command<Optional<std::tuple<std::string, std::string, double>>>(
-                fmt::bzpopmin, key, timeout);
-    }
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        range_check("BZPOPMIN", first, last);
-
-        return _command<Optional<std::tuple<std::string, std::string, double>>>(
-                fmt::bzpopmin_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    Future<long long> zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return _command<long long>(fmt::zadd, key, member, score, type, changed);
-    }
-
-    template <typename Input>
-    Future<long long> zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        range_check("ZADD", first, last);
-
-        return _command<long long>(fmt::zadd_range<Input>,
-                key,
-                first,
-                last,
-                type,
-                changed);
-    }
-
-    template <typename T>
-    Future<long long> zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    Future<long long> zcard(const StringView &key) {
-        return _command<long long>(fmt::zcard, key);
-    }
-
-    template <typename Interval>
-    Future<long long> zcount(const StringView &key, const Interval &interval) {
-        return _command<long long>(fmt::zcount<Interval>, key, interval);
-    }
-
-    Future<double> zincrby(const StringView &key, double increment, const StringView &member) {
-        return _command<double>(fmt::zincrby, key, increment, member);
-    }
-
-    template <typename Interval>
-    Future<long long> zlexcount(const StringView &key, const Interval &interval) {
-        return _command<long long>(fmt::zlexcount<Interval>, key, interval);
-    }
-
-    Future<Optional<std::pair<std::string, double>>> zpopmax(const StringView &key) {
-        return _command<Optional<std::pair<std::string, double>>,
-                FormattedCommand (*)(const StringView &)>(fmt::zpopmax, key);
-    }
-
-    template <typename Output>
-    Future<Output> zpopmax(const StringView &key, long long count) {
-        return _command<Output, FormattedCommand (*)(const StringView &, long long)>(
-                fmt::zpopmax, key, count);
-    }
-
-    Future<Optional<std::pair<std::string, double>>> zpopmin(const StringView &key) {
-        return _command<Optional<std::pair<std::string, double>>,
-                FormattedCommand (*)(const StringView &)>(fmt::zpopmin, key);
-    }
-
-    template <typename Output>
-    Future<Output> zpopmin(const StringView &key, long long count) {
-        return _command<Output, FormattedCommand (*)(const StringView &, long long)>(
-                fmt::zpopmin, key, count);
-    }
-
-    template <typename Output>
-    Future<Output> zrange(const StringView &key, long long start, long long stop) {
-        return _command<Output>(fmt::zrange, key, start, stop);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-        return _command<Output>(fmt::zrangebylex<Interval>,
-                key, interval, opts);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrangebylex(const StringView &key, const Interval &interval) {
-        return zrangebylex<Output>(key, interval, {});
-    }
-
-    // TODO: withscores parameter
-    template <typename Output, typename Interval>
-    Future<Output> zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-        return _command<Output>(fmt::zrangebyscore<Interval>,
-                key, interval, opts);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrangebyscore(const StringView &key, const Interval &interval) {
-        return zrangebyscore(key, interval, {});
-    }
-
-    Future<OptionalLongLong> zrank(const StringView &key, const StringView &member) {
-        return _command<OptionalLongLong>(fmt::zrank, key, member);
-    }
-
-    Future<long long> zrem(const StringView &key, const StringView &member) {
-        return _command<long long>(fmt::zrem, key, member);
-    }
-
-    template <typename Input>
-    Future<long long> zrem(const StringView &key, Input first, Input last) {
-        range_check("ZREM", first, last);
-
-        return _command<long long>(fmt::zrem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    Future<long long> zremrangebylex(const StringView &key, const Interval &interval) {
-        return _command<long long>(fmt::zremrangebylex<Interval>, key, interval);
-    }
-
-    Future<long long> zremrangebyrank(const StringView &key, long long start, long long stop) {
-        return _command<long long>(fmt::zremrangebyrank, key, start, stop);
-    }
-
-    template <typename Interval>
-    Future<long long> zremrangebyscore(const StringView &key, const Interval &interval) {
-        return _command<long long>(fmt::zremrangebyscore<Interval>, key, interval);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-        return _command<Output>(fmt::zrevrangebylex<Interval>,
-                key, interval, opts);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrevrangebylex(const StringView &key, const Interval &interval) {
-        return zrevrangebylex<Output>(key, interval, {});
-    }
-
-    Future<OptionalLongLong> zrevrank(const StringView &key, const StringView &member) {
-        return _command<OptionalLongLong>(fmt::zrevrank, key, member);
-    }
-
-    Future<OptionalDouble> zscore(const StringView &key, const StringView &member) {
-        return _command<OptionalDouble>(fmt::zscore, key, member);
-    }
-
-    // SCRIPTING commands.
-
-    template <typename Result, typename Keys, typename Args>
-    Future<Result> eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last) {
-        return _command<Result>(fmt::eval<Keys, Args>,
-                script, keys_first, keys_last, args_first, args_last);
-    }
-
-    template <typename Result>
-    Future<Result> eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args) {
-        return eval<Result>(script,
-                keys.begin(), keys.end(),
-                args.begin(), args.end());
-    }
-
-    template <typename Result, typename Keys, typename Args>
-    Future<Result> evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last) {
-        return _command<Result>(fmt::evalsha<Keys, Args>,
-                script, keys_first, keys_last, args_first, args_last);
-    }
-
-    template <typename Result>
-    Future<Result> evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-        return evalsha<Result>(script,
-                keys.begin(), keys.end(),
-                args.begin(), args.end());
-    }
-
-private:
-    template <typename Result, typename Formatter, typename ...Args>
-    Future<Result> _command(Formatter formatter, Args &&...args) {
-        return _command_with_parser<Result, DefaultResultParser<Result>>(
-                formatter, std::forward<Args>(args)...);
-    }
-
-    template <typename Result, typename ResultParser, typename Formatter, typename ...Args>
-    Future<Result> _command_with_parser(Formatter formatter, Args &&...args) {
-        auto formatted_cmd = formatter(std::forward<Args>(args)...);
-
-        assert(_pool);
-        SafeAsyncConnection connection(*_pool);
-
-        return connection.connection().send<Result, ResultParser>(std::move(formatted_cmd));
-    }
-
-    EventLoopSPtr _loop;
-
-    AsyncConnectionPoolSPtr _pool;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_REDIS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis_cluster.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis_cluster.cpp
deleted file mode 100644
index d7ae2dee3..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis_cluster.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "async_redis_cluster.h"
-#include <cassert>
-
-namespace sw {
-
-namespace redis {
-
-AsyncRedisCluster::AsyncRedisCluster(const ConnectionOptions &opts,
-        const ConnectionPoolOptions &pool_opts,
-        Role role,
-        const EventLoopSPtr &loop) : _loop(loop) {
-    if (!_loop) {
-        _loop = std::make_shared<EventLoop>();
-    }
-
-    _pool = std::make_shared<AsyncShardsPool>(_loop, pool_opts, opts, role);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis_cluster.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis_cluster.h
deleted file mode 100644
index b18be94ea..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_redis_cluster.h
+++ /dev/null
@@ -1,819 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_REDIS_CLUSTER_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_REDIS_CLUSTER_H
-
-#include <cassert>
-#include "utils.h"
-#include "async_connection.h"
-#include "async_connection_pool.h"
-#include "async_shards_pool.h"
-#include "event_loop.h"
-#include "cmd_formatter.h"
-
-namespace sw {
-
-namespace redis {
-
-class AsyncRedisCluster {
-public:
-    AsyncRedisCluster(const ConnectionOptions &opts,
-            const ConnectionPoolOptions &pool_opts = {},
-            Role role = Role::MASTER,
-            const EventLoopSPtr &loop = nullptr);
-
-    AsyncRedisCluster(const AsyncRedisCluster &) = delete;
-    AsyncRedisCluster& operator=(const AsyncRedisCluster &) = delete;
-
-    AsyncRedisCluster(AsyncRedisCluster &&) = default;
-    AsyncRedisCluster& operator=(AsyncRedisCluster &&) = default;
-
-    ~AsyncRedisCluster() = default;
-
-    template <typename Result, typename ...Args>
-    Future<Result> command(const StringView &cmd_name, const StringView &key, Args &&...args) {
-        auto formatter = [&cmd_name](const StringView &key, Args &&...args) {
-            CmdArgs cmd_args;
-            cmd_args.append(cmd_name, key, std::forward<Args>(args)...);
-            return fmt::format_cmd(cmd_args);
-        };
-
-        return _command<Result>(formatter, key, std::forward<Args>(args)...);
-    }
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Future<Result>>::type {
-        if (first == last || std::next(first) == last) {
-            throw Error("command: invalid range");
-        }
-
-        const auto &cmd_name = *first;
-        ++first;
-
-        auto formatter = [&cmd_name](Input first, Input last) {
-            CmdArgs cmd_args;
-            cmd_args.append(cmd_name);
-            while (first != last) {
-                cmd_args.append(*first);
-                ++first;
-            }
-            return fmt::format_cmd(cmd_args);
-        };
-
-        return _command<Result>(formatter, first, last);
-    }
-
-    // CONNECTION commands.
-
-    Future<long long> del(const StringView &key) {
-        return _command<long long>(fmt::del, key);
-    }
-
-    template <typename Input>
-    Future<long long> del(Input first, Input last) {
-        range_check("DEL", first, last);
-
-        return _command<long long>(fmt::del_range<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<long long> del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    Future<long long> exists(const StringView &key) {
-        return _command<long long>(fmt::exists, key);
-    }
-
-    template <typename Input>
-    Future<long long> exists(Input first, Input last) {
-        range_check("EXISTS", first, last);
-
-        return _command<long long>(fmt::exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<long long> exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    Future<bool> expire(const StringView &key, const std::chrono::seconds &timeout) {
-        return _command<bool>(fmt::expire, key, timeout);
-    }
-
-    Future<bool> expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp) {
-        return _command<bool>(fmt::expireat, key, tp);
-    }
-
-    Future<bool> pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-        return _command<bool>(fmt::pexpire, key, timeout);
-    }
-
-    Future<bool> pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp) {
-        return _command<bool>(fmt::pexpireat, key, tp);
-    }
-
-    Future<long long> pttl(const StringView &key) {
-        return _command<long long>(fmt::pttl, key);
-    }
-
-    Future<void> rename(const StringView &key, const StringView &newkey) {
-        return _command<void>(fmt::rename, key, newkey);
-    }
-
-    Future<bool> renamenx(const StringView &key, const StringView &newkey) {
-        return _command<bool>(fmt::renamenx, key, newkey);
-    }
-
-    Future<long long> ttl(const StringView &key) {
-        return _command<long long>(fmt::ttl, key);
-    }
-
-    Future<long long> unlink(const StringView &key) {
-        return _command<long long>(fmt::unlink, key);
-    }
-
-    template <typename Input>
-    Future<long long> unlink(Input first, Input last) {
-        range_check("UNLINK", first, last);
-
-        return _command<long long>(fmt::unlink_range<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<long long> unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    // STRING commands.
-
-    Future<OptionalString> get(const StringView &key) {
-        return _command<OptionalString>(fmt::get, key);
-    }
-
-    Future<long long> incr(const StringView &key) {
-        return _command<long long>(fmt::incr, key);
-    }
-
-    Future<long long> incrby(const StringView &key, long long increment) {
-        return _command<long long>(fmt::incrby, key, increment);
-    }
-
-    Future<double> incrbyfloat(const StringView &key, double increment) {
-        return _command<double>(fmt::incrbyfloat, key, increment);
-    }
-
-    template <typename Output, typename Input>
-    Future<Output> mget(Input first, Input last) {
-        range_check("MGET", first, last);
-
-        return _command<Output>(fmt::mget<Input>, first, last);
-    }
-
-    template <typename Output, typename T>
-    Future<Output> mget(std::initializer_list<T> il) {
-        return mget<Output>(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    Future<void> mset(Input first, Input last) {
-        range_check("MSET", first, last);
-
-        return _command<void>(fmt::mset<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<void> mset(std::initializer_list<T> il) {
-        return mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    Future<bool> msetnx(Input first, Input last) {
-        range_check("MSETNX", first, last);
-
-        return _command<bool>(fmt::msetnx<Input>, first, last);
-    }
-
-    template <typename T>
-    Future<bool> msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    Future<bool> set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS) {
-        return _command_with_parser<bool, fmt::SetResultParser>(fmt::set,
-                key, key, val, ttl, type);
-    }
-
-    Future<long long> strlen(const StringView &key) {
-        return _command<long long>(fmt::strlen, key);
-    }
-
-    // LIST commands.
-
-    Future<OptionalStringPair> blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return _command<OptionalStringPair>(fmt::blpop, key, timeout);
-    }
-
-    template <typename Input>
-    Future<OptionalStringPair> blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        range_check("BLPOP", first, last);
-
-        return _command<OptionalStringPair>(fmt::blpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    Future<OptionalStringPair> blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    Future<OptionalStringPair> brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return _command<OptionalStringPair>(fmt::brpop, key, timeout);
-    }
-
-    template <typename Input>
-    Future<OptionalStringPair> brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        range_check("BRPOP", first, last);
-
-        return _command<OptionalStringPair>(fmt::brpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    Future<OptionalStringPair> brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    Future<OptionalString> brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return _command<OptionalString>(fmt::brpoplpush, source, destination, timeout);
-    }
-
-    Future<long long> llen(const StringView &key) {
-        return _command<long long>(fmt::llen, key);
-    }
-
-    Future<OptionalString> lpop(const StringView &key) {
-        return _command<OptionalString>(fmt::lpop, key);
-    }
-
-    Future<long long> lpush(const StringView &key, const StringView &val) {
-        return _command<long long>(fmt::lpush, key, val);
-    }
-
-    template <typename Input>
-    Future<long long> lpush(const StringView &key, Input first, Input last) {
-        range_check("LPUSH", first, last);
-
-        return _command<long long>(fmt::lpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    Future<Output> lrange(const StringView &key, long long start, long long stop) {
-        return _command<Output>(fmt::lrange, key, start, stop);
-    }
-
-    Future<long long> lrem(const StringView &key, long long count, const StringView &val) {
-        return _command<long long>(fmt::lrem, key, count, val);
-    }
-
-    Future<void> ltrim(const StringView &key, long long start, long long stop) {
-        return _command<void>(fmt::ltrim, key, start, stop);
-    }
-
-    Future<OptionalString> rpop(const StringView &key) {
-        return _command<OptionalString>(fmt::rpop, key);
-    }
-
-    Future<OptionalString> rpoplpush(const StringView &source, const StringView &destination) {
-        return _command<OptionalString>(fmt::rpoplpush, source, destination);
-    }
-
-    Future<long long> rpush(const StringView &key, const StringView &val) {
-        return _command<long long>(fmt::rpush, key, val);
-    }
-
-    template <typename Input>
-    Future<long long> rpush(const StringView &key, Input first, Input last) {
-        range_check("RPUSH", first, last);
-
-        return _command<long long>(fmt::rpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    // HASH commands.
-
-    Future<long long> hdel(const StringView &key, const StringView &field) {
-        return _command<long long>(fmt::hdel, key, field);
-    }
-
-    template <typename Input>
-    Future<long long> hdel(const StringView &key, Input first, Input last) {
-        range_check("HDEL", first, last);
-
-        return _command<long long>(fmt::hdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    Future<bool> hexists(const StringView &key, const StringView &field) {
-        return _command<bool>(fmt::hexists, key, field);
-    }
-
-    Future<OptionalString> hget(const StringView &key, const StringView &field) {
-        return _command<OptionalString>(fmt::hget, key, field);
-    }
-
-    template <typename Output>
-    Future<Output> hgetall(const StringView &key) {
-        return _command<Output>(fmt::hgetall, key);
-    }
-
-    Future<long long> hincrby(const StringView &key, const StringView &field, long long increment) {
-        return _command<long long>(fmt::hincrby, key, field, increment);
-    }
-
-    Future<double> hincrbyfloat(const StringView &key, const StringView &field, double increment) {
-        return _command<double>(fmt::hincrbyfloat, key, field, increment);
-    }
-
-    template <typename Output>
-    Future<Output> hkeys(const StringView &key) {
-        return _command<Output>(fmt::hkeys, key);
-    }
-
-    Future<long long> hlen(const StringView &key) {
-        return _command<long long>(fmt::hlen, key);
-    }
-
-    template <typename Output, typename Input>
-    Future<Output> hmget(const StringView &key, Input first, Input last) {
-        range_check("HMGET", first, last);
-
-        return _command<Output>(fmt::hmget<Input>, key, first, last);
-    }
-
-    template <typename Output, typename T>
-    Future<Output> hmget(const StringView &key, std::initializer_list<T> il) {
-        return hmget<Output>(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    Future<void> hmset(const StringView &key, Input first, Input last) {
-        range_check("HMSET", first, last);
-
-        return _command<void>(fmt::hmset<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<void> hmset(const StringView &key, std::initializer_list<T> il) {
-        return hmset(key, il.begin(), il.end());
-    }
-
-    Future<bool> hset(const StringView &key, const StringView &field, const StringView &val) {
-        return _command<bool>(fmt::hset, key, field, val);
-    }
-
-    Future<bool> hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hset(key, item.first, item.second);
-    }
-
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value, Future<long long>>::type {
-        range_check("HSET", first, last);
-
-        return _command<long long>(fmt::hset_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    Future<Output> hvals(const StringView &key) {
-        return _command<Output>(fmt::hvals, key);
-    }
-
-    // SET commands.
-
-    Future<long long> sadd(const StringView &key, const StringView &member) {
-        return _command<long long>(fmt::sadd, key, member);
-    }
-
-    template <typename Input>
-    Future<long long> sadd(const StringView &key, Input first, Input last) {
-        range_check("SADD", first, last);
-
-        return _command<long long>(fmt::sadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    Future<long long> scard(const StringView &key) {
-        return _command<long long>(fmt::scard, key);
-    }
-
-    Future<bool> sismember(const StringView &key, const StringView &member) {
-        return _command<bool>(fmt::sismember, key, member);
-    }
-
-    template <typename Output>
-    Future<Output> smembers(const StringView &key) {
-        return _command<Output>(fmt::smembers, key);
-    }
-
-    Future<OptionalString> spop(const StringView &key) {
-        return _command<OptionalString, FormattedCommand (*)(const StringView &)>(fmt::spop, key);
-    }
-
-    template <typename Output>
-    Future<Output> spop(const StringView &key, long long count) {
-        return _command<Output,
-               FormattedCommand (*)(const StringView &, long long)>(fmt::spop, key, count);
-    }
-
-    Future<long long> srem(const StringView &key, const StringView &member) {
-        return _command<long long>(fmt::srem, key, member);
-    }
-
-    template <typename Input>
-    Future<long long> srem(const StringView &key, Input first, Input last) {
-        range_check("SREM", first, last);
-
-        return _command<long long>(fmt::srem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        return _command<Optional<std::tuple<std::string, std::string, double>>>(
-                fmt::bzpopmax, key, timeout);
-    }
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        range_check("BZPOPMAX", first, last);
-
-        return _command<Optional<std::tuple<std::string, std::string, double>>>(
-                fmt::bzpopmax_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        return _command<Optional<std::tuple<std::string, std::string, double>>>(
-                fmt::bzpopmin, key, timeout);
-    }
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        range_check("BZPOPMIN", first, last);
-
-        return _command<Optional<std::tuple<std::string, std::string, double>>>(
-                fmt::bzpopmin_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Future<Optional<std::tuple<std::string, std::string, double>>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    Future<long long> zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return _command<long long>(fmt::zadd, key, member, score, type, changed);
-    }
-
-    template <typename Input>
-    Future<long long> zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        range_check("ZADD", first, last);
-
-        return _command<long long>(fmt::zadd_range<Input>, key, first, last, type, changed);
-    }
-
-    template <typename T>
-    Future<long long> zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    Future<long long> zcard(const StringView &key) {
-        return _command<long long>(fmt::zcard, key);
-    }
-
-    template <typename Interval>
-    Future<long long> zcount(const StringView &key, const Interval &interval) {
-        return _command<long long>(fmt::zcount<Interval>, key, interval);
-    }
-
-    Future<double> zincrby(const StringView &key, double increment, const StringView &member) {
-        return _command<double>(fmt::zincrby, key, increment, member);
-    }
-
-    template <typename Interval>
-    Future<long long> zlexcount(const StringView &key, const Interval &interval) {
-        return _command<long long>(fmt::zlexcount<Interval>, key, interval);
-    }
-
-    Future<Optional<std::pair<std::string, double>>> zpopmax(const StringView &key) {
-        return _command<Optional<std::pair<std::string, double>>,
-               FormattedCommand (*)(const StringView &)>(fmt::zpopmax, key);
-    }
-
-    template <typename Output>
-    Future<Output> zpopmax(const StringView &key, long long count) {
-        return _command<Output, FormattedCommand (*)(const StringView &, long long)>(
-                fmt::zpopmax, key, count);
-    }
-
-    Future<Optional<std::pair<std::string, double>>> zpopmin(const StringView &key) {
-        return _command<Optional<std::pair<std::string, double>>,
-               FormattedCommand (*)(const StringView &)>(fmt::zpopmin, key);
-    }
-
-    template <typename Output>
-    Future<Output> zpopmin(const StringView &key, long long count) {
-        return _command<Output, FormattedCommand (*)(const StringView &, long long)>(
-                fmt::zpopmin, key, count);
-    }
-
-    template <typename Output>
-    Future<Output> zrange(const StringView &key, long long start, long long stop) {
-        return _command<Output>(fmt::zrange, key, start, stop);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-        return _command<Output>(fmt::zrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrangebylex(const StringView &key, const Interval &interval) {
-        return zrangebylex<Output>(key, interval, {});
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-        return _command<Output>(fmt::zrangebyscore<Interval>,
-                key, interval, opts);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrangebyscore(const StringView &key, const Interval &interval) {
-        return zrangebyscore(key, interval, {});
-    }
-
-    Future<OptionalLongLong> zrank(const StringView &key, const StringView &member) {
-        return _command<OptionalLongLong>(fmt::zrank, key, member);
-    }
-
-    Future<long long> zrem(const StringView &key, const StringView &member) {
-        return _command<long long>(fmt::zrem, key, member);
-    }
-
-    template <typename Input>
-    Future<long long> zrem(const StringView &key, Input first, Input last) {
-        range_check("ZREM", first, last);
-
-        return _command<long long>(fmt::zrem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    Future<long long> zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    Future<long long> zremrangebylex(const StringView &key, const Interval &interval) {
-        return _command<long long>(fmt::zremrangebylex<Interval>, key, interval);
-    }
-
-    Future<long long> zremrangebyrank(const StringView &key, long long start, long long stop) {
-        return _command<long long>(fmt::zremrangebyrank, key, start, stop);
-    }
-
-    template <typename Interval>
-    Future<long long> zremrangebyscore(const StringView &key, const Interval &interval) {
-        return _command<long long>(fmt::zremrangebyscore<Interval>, key, interval);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-        return _command<Output>(fmt::zrevrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Output, typename Interval>
-    Future<Output> zrevrangebylex(const StringView &key, const Interval &interval) {
-        return zrevrangebylex<Output>(key, interval, {});
-    }
-
-    Future<OptionalLongLong> zrevrank(const StringView &key, const StringView &member) {
-        return _command<OptionalLongLong>(fmt::zrevrank, key, member);
-    }
-
-    Future<OptionalDouble> zscore(const StringView &key, const StringView &member) {
-        return _command<OptionalDouble>(fmt::zscore, key, member);
-    }
-
-    // SCRIPTING commands.
-
-    template <typename Result, typename Keys, typename Args>
-    Future<Result> eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last) {
-        if (keys_first == keys_last) {
-            throw Error("DO NOT support Lua script without key");
-        }
-
-        return _generic_command<Result>(fmt::eval<Keys, Args>, *keys_first, script,
-                keys_first, keys_last,
-                args_first, args_last);
-    }
-
-    template <typename Result>
-    Future<Result> eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args) {
-        return eval<Result>(script,
-                keys.begin(), keys.end(),
-                args.begin(), args.end());
-    }
-
-    template <typename Result, typename Keys, typename Args>
-    Future<Result> evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last) {
-        if (keys_first == keys_last) {
-            throw Error("DO NOT support Lua script without key");
-        }
-
-        return _generic_command<Result>(fmt::evalsha<Keys, Args>, *keys_first, script,
-                keys_first, keys_last, args_first, args_last);
-    }
-
-    template <typename Result>
-    Future<Result> evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-        return evalsha<Result>(script,
-                keys.begin(), keys.end(),
-                args.begin(), args.end());
-    }
-
-private:
-    template <typename Result, typename ResultParser,
-             typename Formatter, typename ...Args>
-    Future<Result> _command_with_parser(Formatter formatter,
-            const StringView &key, Args &&...args) {
-        auto formatted_cmd = formatter(std::forward<Args>(args)...);
-
-        assert(_pool);
-
-        auto pool = _pool->fetch(key);
-        assert(pool);
-
-        GuardedAsyncConnection connection(pool);
-
-        return connection.connection().send<Result, ResultParser>(
-                _pool, key, std::move(formatted_cmd));
-    }
-
-    template <typename Result, typename Formatter, typename ...Args>
-    Future<Result> _generic_command(Formatter formatter, const StringView &key, Args &&...args) {
-        return _command_with_parser<Result, DefaultResultParser<Result>>(
-                formatter, key, std::forward<Args>(args)...);
-    }
-
-    template <typename Result, typename Formatter, typename Key, typename ...Args>
-    Future<Result> _command(Formatter formatter, Key &&key, Args &&...args) {
-        return _generic_command<Result>(formatter,
-                std::is_convertible<typename std::decay<Key>::type, StringView>(),
-                std::forward<Key>(key),
-                std::forward<Args>(args)...);
-    }
-
-    template <typename Result, typename Formatter, typename ...Args>
-    Future<Result> _generic_command(Formatter formatter, std::true_type,
-            const StringView &key, Args &&...args) {
-        return _generic_command<Result>(formatter, key, key, std::forward<Args>(args)...);
-    }
-
-    template <typename Result, typename Formatter, typename Input, typename ...Args>
-    Future<Result> _generic_command(Formatter formatter, std::false_type, Input &&input, Args &&...args) {
-        return _range_command<Result>(formatter,
-                std::is_convertible<typename std::decay<
-                    decltype(*std::declval<Input>())>::type, StringView>(),
-                std::forward<Input>(input),
-                std::forward<Args>(args)...);
-    }
-
-    template <typename Result, typename Formatter, typename Input, typename ...Args>
-    Future<Result> _range_command(Formatter formatter, std::true_type,
-            Input &&input, Args &&...args) {
-        return _generic_command<Result>(formatter, *input,
-                std::forward<Input>(input), std::forward<Args>(args)...);
-    }
-
-    template <typename Result, typename Formatter, typename Input, typename ...Args>
-    Future<Result> _range_command(Formatter formatter, std::false_type,
-            Input &&input, Args &&...args) {
-        return _generic_command<Result>(formatter, std::get<0>(*input),
-                std::forward<Input>(input), std::forward<Args>(args)...);
-    }
-
-    EventLoopSPtr _loop;
-
-    AsyncShardsPoolSPtr _pool;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_REDIS_CLUSTER_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_sentinel.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_sentinel.cpp
deleted file mode 100644
index 3ea3e49de..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_sentinel.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "async_sentinel.h"
-#include <cassert>
-#include "errors.h"
-#include "async_connection_pool.h"
-
-namespace sw {
-
-namespace redis {
-
-AsyncSentinel::AsyncSentinel(const SentinelOptions &sentinel_opts) :
-    _sentinel(std::make_shared<Sentinel>(sentinel_opts)),
-    _worker([this]() { this->_run(); }) {}
-
-AsyncSentinel::~AsyncSentinel() {
-    _stop_worker();
-
-    if (_worker.joinable()) {
-        _worker.join();
-    }
-}
-
-void AsyncSentinel::add(AsyncSentinelTask task) {
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        _tasks.push(std::move(task));
-    }
-
-    _cv.notify_one();
-}
-
-void AsyncSentinel::_stop_worker() {
-    // Add an empty task to stop the worker thread.
-    add(AsyncSentinelTask{});
-}
-
-void AsyncSentinel::_run() {
-    while (true) {
-        auto tasks = _fetch_tasks();
-
-        assert(!tasks.empty());
-
-        while (!tasks.empty()) {
-            auto &task = tasks.front();
-            if (!task) {
-                // Got a stopping task.
-                return;
-            }
-
-            _run_task(task);
-
-            tasks.pop();
-        }
-    }
-}
-
-void AsyncSentinel::_run_task(AsyncSentinelTask &task) {
-    auto pool = task.pool.lock();
-    if (!pool) {
-        // AsyncConnectionPool has been destroyed, give up the task.
-        return;
-    }
-
-    auto &connection = task.connection;
-    try {
-        SimpleSentinel sentinel(_sentinel, task.master_name, task.role);
-        auto sync_connection = sentinel.create(connection->options());
-
-        const auto &opts = sync_connection.options();
-        pool->update_node_info(opts.host, opts.port, connection);
-    } catch (const StopIterError &e) {
-        pool->update_node_info(connection,
-                std::make_exception_ptr(Error("Failed to create connection with sentinel")));
-    } catch (const Error &e) {
-        pool->update_node_info(connection, std::current_exception());
-    }
-}
-
-auto AsyncSentinel::_fetch_tasks() -> std::queue<AsyncSentinelTask> {
-    std::queue<AsyncSentinelTask> tasks;
-
-    std::unique_lock<std::mutex> lock(_mutex);
-    if (_tasks.empty()) {
-        _cv.wait(lock, [this]() { return !(this->_tasks).empty(); } );
-    }
-
-    tasks.swap(_tasks);
-
-    return tasks;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_sentinel.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_sentinel.h
deleted file mode 100644
index 7b1a3463d..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_sentinel.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_SENTINEL_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_SENTINEL_H
-
-#include <mutex>
-#include <memory>
-#include <queue>
-#include <condition_variable>
-#include "sentinel.h"
-#include "async_connection.h"
-
-namespace sw {
-
-namespace redis {
-
-class AsyncConnectionPool;
-
-class AsyncSentinel {
-public:
-    explicit AsyncSentinel(const SentinelOptions &sentinel_opts);
-
-    AsyncSentinel(const AsyncSentinel &) = delete;
-    AsyncSentinel& operator=(const AsyncSentinel &) = delete;
-
-    AsyncSentinel(AsyncSentinel &&) = delete;
-    AsyncSentinel& operator=(AsyncSentinel &&) = delete;
-
-    ~AsyncSentinel();
-
-private:
-    friend class SimpleAsyncSentinel;
-
-    struct AsyncSentinelTask {
-        operator bool() const noexcept {
-            return bool(connection);
-        }
-
-        std::weak_ptr<AsyncConnectionPool> pool;
-
-        AsyncConnectionSPtr connection;
-
-        std::string master_name;
-
-        Role role = Role::MASTER;
-    };
-
-    void add(AsyncSentinelTask task);
-
-    void _stop_worker();
-
-    void _run_task(AsyncSentinelTask &task);
-
-    std::queue<AsyncSentinelTask> _fetch_tasks();
-
-    void _run();
-
-    std::queue<AsyncSentinelTask> _tasks;
-
-    std::shared_ptr<Sentinel> _sentinel;
-
-    std::thread _worker;
-
-    std::mutex _mutex;
-
-    std::condition_variable _cv;
-};
-
-using AsyncSentinelSPtr = std::shared_ptr<AsyncSentinel>;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_SENTINEL_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_shards_pool.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_shards_pool.cpp
deleted file mode 100644
index 46c5b8bf2..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_shards_pool.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "async_shards_pool.h"
-#include <cassert>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-const std::size_t AsyncShardsPool::SHARDS;
-
-AsyncShardsPool::AsyncShardsPool(const EventLoopSPtr &loop,
-        const ConnectionPoolOptions &pool_opts,
-        const ConnectionOptions &connection_opts,
-        Role role) :
-            _pool_opts(pool_opts),
-            _connection_opts(connection_opts),
-            _role(role),
-            _loop(loop) {
-    assert(_loop);
-
-    if (_connection_opts.type != ConnectionType::TCP) {
-        throw Error("Only support TCP connection for Redis Cluster");
-    }
-
-    auto node = Node{_connection_opts.host, _connection_opts.port};
-    _shards.emplace(SlotRange{0U, SHARDS}, node);
-    _pools.emplace(node,
-            std::make_shared<AsyncConnectionPool>(_loop, _pool_opts, _connection_opts));
-
-    _worker = std::thread([this]() { this->_run(); });
-}
-
-AsyncShardsPool::AsyncShardsPool(AsyncShardsPool &&that) {
-    std::lock_guard<std::mutex> lock(that._mutex);
-
-    _move(std::move(that));
-}
-
-AsyncShardsPool& AsyncShardsPool::operator=(AsyncShardsPool &&that) {
-    if (this != &that) {
-        std::lock(_mutex, that._mutex);
-        std::lock_guard<std::mutex> lock_this(_mutex, std::adopt_lock);
-        std::lock_guard<std::mutex> lock_that(that._mutex, std::adopt_lock);
-
-        _move(std::move(that));
-    }
-
-    return *this;
-}
-
-AsyncShardsPool::~AsyncShardsPool() {
-    update({}, nullptr);
-
-    if (_worker.joinable()) {
-        _worker.join();
-    }
-}
-
-AsyncConnectionPoolSPtr AsyncShardsPool::fetch(const StringView &key) {
-    auto slot = _slot(key);
-
-    return _fetch(slot);
-}
-
-AsyncConnectionPoolSPtr AsyncShardsPool::fetch() {
-    auto slot = _slot();
-
-    return _fetch(slot);
-}
-
-AsyncConnectionPoolSPtr AsyncShardsPool::fetch(const Node &node) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    auto iter = _pools.find(node);
-    if (iter == _pools.end()) {
-        // Node doesn't exist, and it should be a newly created node.
-        // So add a new connection pool.
-        iter = _add_node(node);
-    }
-
-    assert(iter != _pools.end());
-
-    return iter->second;
-}
-
-void AsyncShardsPool::update(const std::string &key, AsyncEventUPtr event) {
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        _events.push(RedeliverEvent{key, std::move(event)});
-    }
-
-    _cv.notify_one();
-}
-
-ConnectionOptions AsyncShardsPool::connection_options(const StringView &key) {
-    auto slot = _slot(key);
-
-    return _connection_options(slot);
-}
-
-ConnectionOptions AsyncShardsPool::connection_options() {
-    auto slot = _slot();
-
-    return _connection_options(slot);
-}
-
-void AsyncShardsPool::_move(AsyncShardsPool &&that) {
-    _pool_opts = that._pool_opts;
-    _connection_opts = that._connection_opts;
-    _role = that._role;
-    _shards = std::move(that._shards);
-    _pools = std::move(that._pools);
-    _loop = std::move(that._loop);
-    _worker = std::move(that._worker);
-    _events = std::move(that._events);
-}
-
-ConnectionOptions AsyncShardsPool::_connection_options(Slot slot) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    auto &pool = _get_pool(slot);
-
-    assert(pool);
-
-    return pool->connection_options();
-}
-
-Slot AsyncShardsPool::_slot(const StringView &key) const {
-    // The following code is copied from: https://redis.io/topics/cluster-spec
-    // And I did some minor changes.
-
-    const auto *k = key.data();
-    auto keylen = key.size();
-
-    // start-end indexes of { and }.
-    std::size_t s = 0;
-    std::size_t e = 0;
-
-    // Search the first occurrence of '{'.
-    for (s = 0; s < keylen; s++)
-        if (k[s] == '{') break;
-
-    // No '{' ? Hash the whole key. This is the base case.
-    if (s == keylen) return crc16(k, keylen) & SHARDS;
-
-    // '{' found? Check if we have the corresponding '}'.
-    for (e = s + 1; e < keylen; e++)
-        if (k[e] == '}') break;
-
-    // No '}' or nothing between {} ? Hash the whole key.
-    if (e == keylen || e == s + 1) return crc16(k, keylen) & SHARDS;
-
-    // If we are here there is both a { and a } on its right. Hash
-    // what is in the middle between { and }.
-    return crc16(k + s + 1, e - s - 1) & SHARDS;
-}
-
-Slot AsyncShardsPool::_slot() const {
-    return _random(0, SHARDS);
-}
-
-AsyncConnectionPoolSPtr AsyncShardsPool::_fetch(Slot slot) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    return _get_pool(slot);
-}
-
-AsyncConnectionPoolSPtr& AsyncShardsPool::_get_pool(Slot slot) {
-    const auto &node = _get_node(slot);
-
-    auto node_iter = _pools.find(node);
-    if (node_iter == _pools.end()) {
-        throw Error("Slot is NOT covered: " + std::to_string(slot));
-    }
-
-    return node_iter->second;
-}
-
-void AsyncShardsPool::_run() {
-    while (true) {
-        auto events = _fetch_events();
-
-        assert(!events.empty());
-
-        try {
-            // TODO: when we try to stop the worker thread,
-            // we don't need to call `_update_shards`
-            _update_shards();
-
-            // if _redeliver_events or _fail_events returns true if there's a null event,
-            // and we exit the thread loop.
-            if (_redeliver_events(events)) {
-                break;
-            }
-        } catch (...) {
-            if (_fail_events(events, std::current_exception())) {
-                break;
-            }
-        }
-    }
-}
-
-auto AsyncShardsPool::_fetch_events() -> std::queue<RedeliverEvent> {
-    std::queue<RedeliverEvent> events;
-
-    std::unique_lock<std::mutex> lock(_mutex);
-    if (_events.empty()) {
-        _cv.wait(lock, [this]() { return !(this->_events).empty(); } );
-    }
-
-    events.swap(_events);
-
-    return events;
-}
-
-std::size_t AsyncShardsPool::_random(std::size_t min, std::size_t max) const {
-    static thread_local std::default_random_engine engine;
-
-    std::uniform_int_distribution<std::size_t> uniform_dist(min, max);
-
-    return uniform_dist(engine);
-}
-
-const Node& AsyncShardsPool::_get_node(Slot slot) const {
-    auto shards_iter = _shards.lower_bound(SlotRange{slot, slot});
-    if (shards_iter == _shards.end() || slot < shards_iter->first.min) {
-        throw Error("Slot is out of range: " + std::to_string(slot));
-    }
-
-    return shards_iter->second;
-}
-
-Shards AsyncShardsPool::_get_shards(const std::string &host, int port) {
-    auto opts = _connection_opts;
-    opts.host = host;
-    opts.port = port;
-    ShardsPool pool(_pool_opts, opts, _role);
-
-    return pool.shards();
-}
-
-void AsyncShardsPool::_update_shards() {
-    for (int idx = 0; idx < 4; ++idx) {
-        try {
-            Shards shards;
-            if (idx < 3) {
-                Node node;
-                {
-                    std::lock_guard<std::mutex> lock(_mutex);
-
-                    // Randomly pick a node.
-                    node = _get_node(_slot());
-                }
-
-                shards = _get_shards(node.host, node.port);
-            } else {
-                shards = _get_shards(_connection_opts.host, _connection_opts.port);
-            }
-
-            std::unordered_set<Node, NodeHash> nodes;
-            for (const auto &shard : shards) {
-                nodes.insert(shard.second);
-            }
-
-            std::lock_guard<std::mutex> lock(_mutex);
-
-            _shards = std::move(shards);
-
-            // Remove non-existent nodes.
-            for (auto iter = _pools.begin(); iter != _pools.end(); ) {
-                if (nodes.find(iter->first) == nodes.end()) {
-                    // Node has been removed.
-                    _pools.erase(iter++);
-                } else {
-                    ++iter;
-                }
-            }
-
-            // Add connection pool for new nodes.
-            // In fact, connections will be created lazily.
-            for (const auto &node : nodes) {
-                if (_pools.find(node) == _pools.end()) {
-                    _add_node(node);
-                }
-            }
-
-            // Update successfully.
-            return;
-        } catch (const Error &e) {
-            // continue;
-        }
-    }
-
-    throw Error("Failed to update shards info");
-}
-
-auto AsyncShardsPool::_add_node(const Node &node) -> NodeMap::iterator {
-    auto opts = _connection_opts;
-    opts.host = node.host;
-    opts.port = node.port;
-
-    // TODO: Better set readonly an attribute of `Node`.
-    if (_role == Role::SLAVE) {
-        opts.readonly = true;
-    }
-
-    return _pools.emplace(node,
-            std::make_shared<AsyncConnectionPool>(_loop, _pool_opts, opts)).first;
-}
-
-bool AsyncShardsPool::_redeliver_events(std::queue<RedeliverEvent> &events) {
-    bool should_stop_worker = false;
-    while (!events.empty()) {
-        auto &event = events.front();
-        try {
-            auto &async_event = event.event;
-            if (!async_event) {
-                should_stop_worker = true;
-                events.pop();
-                continue;
-            }
-
-            auto pool = fetch(event.key);
-            assert(pool);
-
-            GuardedAsyncConnection connection(pool);
-
-            connection.connection().send(std::move(async_event));
-        } catch (...) {
-            event.event->set_exception(std::current_exception());
-        }
-        events.pop();
-    }
-
-    return should_stop_worker;
-}
-
-bool AsyncShardsPool::_fail_events(std::queue<RedeliverEvent> &events,
-        std::exception_ptr err) {
-    bool should_stop_worker = false;
-    while (!events.empty()) {
-        auto &event = events.front(); 
-        auto &async_event = event.event;
-        if (!async_event) {
-            should_stop_worker = true;
-        } else {
-            async_event->set_exception(err);
-        }
-        events.pop();
-    }
-
-    return should_stop_worker;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_shards_pool.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_shards_pool.h
deleted file mode 100644
index bf3641acd..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/async_shards_pool.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_SHARDS_POOL_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_SHARDS_POOL_H
-
-#include <condition_variable>
-#include <mutex>
-#include <exception>
-#include <thread>
-#include <queue>
-#include <memory>
-#include "shards_pool.h"
-#include "async_connection_pool.h"
-
-namespace sw {
-
-namespace redis {
-
-class AsyncShardsPool {
-public:
-    AsyncShardsPool(const AsyncShardsPool &) = delete;
-    AsyncShardsPool& operator=(const AsyncShardsPool &) = delete;
-
-    AsyncShardsPool(AsyncShardsPool &&that);
-    AsyncShardsPool& operator=(AsyncShardsPool &&that);
-
-    ~AsyncShardsPool();
-
-    AsyncShardsPool(const EventLoopSPtr &loop,
-                const ConnectionPoolOptions &pool_opts,
-                const ConnectionOptions &connection_opts,
-                Role role);
-
-    AsyncConnectionPoolSPtr fetch(const StringView &key);
-
-    AsyncConnectionPoolSPtr fetch();
-
-    AsyncConnectionPoolSPtr fetch(const Node &node);
-
-    void update(const std::string &key, AsyncEventUPtr event);
-
-    ConnectionOptions connection_options(const StringView &key);
-
-    ConnectionOptions connection_options();
-
-private:
-    struct RedeliverEvent {
-        std::string key;
-        AsyncEventUPtr event;
-    };
-
-    void _run();
-
-    void _move(AsyncShardsPool &&that);
-
-    Slot _slot(const StringView &key) const;
-
-    AsyncConnectionPoolSPtr _fetch(Slot slot);
-
-    Slot _slot() const;
-
-    std::queue<RedeliverEvent> _fetch_events();
-
-    void _update_shards();
-
-    bool _redeliver_events(std::queue<RedeliverEvent> &events);
-
-    bool _fail_events(std::queue<RedeliverEvent> &events, std::exception_ptr err);
-
-    using NodeMap = std::unordered_map<Node, AsyncConnectionPoolSPtr, NodeHash>;
-
-    NodeMap::iterator _add_node(const Node &node);
-
-    std::size_t _random(std::size_t min, std::size_t max) const;
-
-    const Node& _get_node(Slot slot) const;
-
-    AsyncConnectionPoolSPtr& _get_pool(Slot slot);
-
-    ConnectionOptions _connection_options(Slot slot);
-
-    Shards _get_shards(const std::string &host, int port);
-
-    ConnectionPoolOptions _pool_opts;
-
-    ConnectionOptions _connection_opts;
-
-    Role _role = Role::MASTER;
-
-    Shards _shards;
-
-    NodeMap _pools;
-
-    EventLoopSPtr _loop;
-
-    std::thread _worker;
-
-    std::condition_variable _cv;
-
-    std::mutex _mutex;
-
-    std::queue<RedeliverEvent> _events;
-
-    static const std::size_t SHARDS = 16383;
-};
-
-using AsyncShardsPoolSPtr = std::shared_ptr<AsyncShardsPool>;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_SHARDS_POOL_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/cmd_formatter.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/cmd_formatter.h
deleted file mode 100644
index 85efdf347..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/cmd_formatter.h
+++ /dev/null
@@ -1,775 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
-#define SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
-
-#include <hiredis/hiredis.h>
-#include "command_options.h"
-#include "command_args.h"
-#include "command.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class FormattedCommand {
-public:
-    FormattedCommand(char *data, int len) : _data(data), _size(len) {
-        if (data == nullptr || len < 0) {
-            throw Error("failed to format command");
-        }
-    }
-
-    FormattedCommand(const FormattedCommand &) = delete;
-    FormattedCommand& operator=(const FormattedCommand &) = delete;
-
-    FormattedCommand(FormattedCommand &&that) noexcept {
-        _move(std::move(that));
-    }
-
-    FormattedCommand& operator=(FormattedCommand &&that) noexcept {
-        if (this != &that) {
-            _move(std::move(that));
-        }
-
-        return *this;
-    }
-
-    ~FormattedCommand() noexcept {
-        if (_data != nullptr) {
-            redisFreeCommand(_data);
-        }
-    }
-
-    const char* data() const noexcept {
-        return _data;
-    }
-
-    int size() const noexcept {
-        return _size;
-    }
-
-private:
-    void _move(FormattedCommand &&that) noexcept {
-        _data = that._data;
-        _size = that._size;
-        that._data = nullptr;
-        that._size = 0;
-    }
-
-    char *_data = nullptr;
-    int _size = 0;
-};
-
-namespace fmt {
-
-template <typename ...Args>
-FormattedCommand format_cmd(const char *format, Args &&...args) {
-    char *data = nullptr;
-    auto len = redisFormatCommand(&data, format, std::forward<Args>(args)...);
-
-    return FormattedCommand(data, len);
-}
-
-inline FormattedCommand format_cmd(int argc, const char **argv, const std::size_t *argv_len) {
-    char *data = nullptr;
-    auto len = redisFormatCommandArgv(&data, argc, argv, argv_len);
-
-    return FormattedCommand(data, len);
-}
-
-inline FormattedCommand format_cmd(CmdArgs &args) {
-    char *data = nullptr;
-    auto len = redisFormatCommandArgv(&data, args.size(), args.argv(), args.argv_len());
-
-    return FormattedCommand(data, len);
-}
-
-struct SetResultParser {
-    bool operator()(redisReply &reply) const {
-        sw::redis::reply::rewrite_set_reply(reply);
-        return sw::redis::reply::parse<bool>(reply);
-    }
-};
-
-// CONNECTION commands.
-
-inline FormattedCommand echo(const StringView &msg) {
-    return format_cmd("ECHO %b", msg.data(), msg.size());
-}
-
-inline FormattedCommand ping() {
-    return format_cmd("PING");
-}
-
-inline FormattedCommand ping(const StringView &msg) {
-    return format_cmd("PING %b", msg.data(), msg.size());
-}
-
-inline FormattedCommand del(const StringView &key) {
-    return format_cmd("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand del_range(Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand exists(const StringView &key) {
-    return format_cmd("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand exists_range(Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("EXPIRE %b %lld", key.data(), key.size(), timeout.count());
-}
-
-inline FormattedCommand expireat(const StringView &key,
-        const std::chrono::time_point<std::chrono::system_clock,
-                                        std::chrono::seconds> &tp) {
-    return format_cmd("EXPIREAT %b %lld", key.data(), key.size(), tp.time_since_epoch().count());
-}
-
-inline FormattedCommand pexpire(const StringView &key,
-        const std::chrono::milliseconds &timeout) {
-    return format_cmd("PEXPIRE %b %lld", key.data(), key.size(), timeout.count());
-}
-
-inline FormattedCommand pexpireat(const StringView &key,
-        const std::chrono::time_point<std::chrono::system_clock,
-                                            std::chrono::milliseconds> &tp) {
-    return format_cmd("PEXPIREAT %b %lld", key.data(), key.size(), tp.time_since_epoch().count());
-}
-
-inline FormattedCommand pttl(const StringView &key) {
-    return format_cmd("PTTL %b", key.data(), key.size());
-}
-
-inline FormattedCommand rename(const StringView &key, const StringView &newkey) {
-    return format_cmd("RENAME %b %b", key.data(), key.size(), newkey.data(), newkey.size());
-}
-
-inline FormattedCommand renamenx(const StringView &key, const StringView &newkey) {
-    return format_cmd("RENAMENX %b %b", key.data(), key.size(), newkey.data(), newkey.size());
-}
-
-inline FormattedCommand ttl(const StringView &key) {
-    return format_cmd("TTL %b", key.data(), key.size());
-}
-
-inline FormattedCommand unlink(const StringView &key) {
-    return format_cmd("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand unlink_range(Input first, Input last) {
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// STRING commands.
-
-inline FormattedCommand get(const StringView &key) {
-    return format_cmd("GET %b", key.data(), key.size());
-}
-
-inline FormattedCommand incr(const StringView &key) {
-    return format_cmd("INCR %b", key.data(), key.size());
-}
-
-inline FormattedCommand incrby(const StringView &key, long long increment) {
-    return format_cmd("INCRBY %b %lld", key.data(), key.size(), increment);
-}
-
-inline FormattedCommand incrbyfloat(const StringView &key, double increment) {
-    return format_cmd("INCRBYFLOAT %b %f", key.data(), key.size(), increment);
-}
-
-template <typename Input>
-FormattedCommand mget(Input first, Input last) {
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand mset(Input first, Input last) {
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand msetnx(Input first, Input last) {
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand set(const StringView &key,
-        const StringView &val,
-        const std::chrono::milliseconds &ttl,
-        UpdateType type) {
-    CmdArgs args;
-    args << "SET" << key << val;
-
-    if (ttl > std::chrono::milliseconds(0)) {
-        args << "PX" << ttl.count();
-    }
-
-    cmd::detail::set_update_type(args, type);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand strlen(const StringView &key) {
-    return format_cmd("STRLEN %b", key.data(), key.size());
-}
-
-inline FormattedCommand blpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BLPOP %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand blpop_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand brpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BRPOP %b %lld", key.data(), key.size(), timeout.count());
-}
-
-
-template <typename Input>
-FormattedCommand brpop_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand brpoplpush(const StringView &source,
-        const StringView &destination,
-        const std::chrono::seconds &timeout) {
-    return format_cmd("BRPOPLPUSH %b %b %lld",
-            source.data(), source.size(),
-            destination.data(), destination.size(),
-            timeout.count());
-}
-
-inline FormattedCommand llen(const StringView &key) {
-    return format_cmd("LLEN %b", key.data(), key.size());
-}
-
-inline FormattedCommand lpop(const StringView &key) {
-    return format_cmd("LPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand lpush(const StringView &key, const StringView &val) {
-    return format_cmd("LPUSH %b %b", key.data(), key.size(), val.data(), val.size());
-}
-
-template <typename Input>
-FormattedCommand lpush_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand lrange(const StringView &key, long long start, long long stop) {
-    return format_cmd("LRANGE %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-inline FormattedCommand lrem(const StringView &key, long long count, const StringView &val) {
-    return format_cmd("LREM %b %lld %b", key.data(), key.size(), count, val.data(), val.size());
-}
-
-inline FormattedCommand ltrim(const StringView &key, long long start, long long stop) {
-    return format_cmd("LTRIM %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-inline FormattedCommand rpop(const StringView &key) {
-    return format_cmd("RPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand rpoplpush(const StringView &source, const StringView &destination) {
-    return format_cmd("RPOPLPUSH %b %b",
-            source.data(), source.size(),
-            destination.data(), destination.size());
-}
-
-inline FormattedCommand rpush(const StringView &key, const StringView &val) {
-    return format_cmd("RPUSH %b %b", key.data(), key.size(), val.data(), val.size());
-}
-
-template <typename Input>
-FormattedCommand rpush_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// HASH commands.
-
-inline FormattedCommand hdel(const StringView &key, const StringView &field) {
-    return format_cmd("HDEL %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-template <typename Input>
-FormattedCommand hdel_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hexists(const StringView &key, const StringView &field) {
-    return format_cmd("HEXISTS %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-inline FormattedCommand hget(const StringView &key, const StringView &field) {
-    return format_cmd("HGET %b %b", key.data(), key.size(), field.data(), field.size());
-}
-
-inline FormattedCommand hgetall(const StringView &key) {
-    return format_cmd("HGETALL %b", key.data(), key.size());
-}
-
-inline FormattedCommand hincrby(const StringView &key,
-        const StringView &field,
-        long long increment) {
-    return format_cmd("HINCRBY %b %b %lld",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            increment);
-}
-
-inline FormattedCommand hincrbyfloat(const StringView &key,
-        const StringView &field,
-        double increment) {
-    return format_cmd("HINCRBYFLOAT %b %b %f",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            increment);
-}
-
-inline FormattedCommand hkeys(const StringView &key) {
-    return format_cmd("HKEYS %b", key.data(), key.size());
-}
-
-inline FormattedCommand hlen(const StringView &key) {
-    return format_cmd("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-FormattedCommand hmget(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand hmset(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hset(const StringView &key,
-        const StringView &field,
-        const StringView &val) {
-    return format_cmd("HSET %b %b %b",
-            key.data(), key.size(),
-            field.data(), field.size(),
-            val.data(), val.size());
-}
-
-template <typename Input>
-auto hset_range(const StringView &key,
-        Input first,
-        Input last)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                FormattedCommand>::type {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HSET" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand hvals(const StringView &key) {
-    return format_cmd("HVALS %b", key.data(), key.size());
-}
-
-// SET commands.
-
-inline FormattedCommand sadd(const StringView &key, const StringView &member) {
-    return format_cmd("SADD %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand sadd_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand scard(const StringView &key) {
-    return format_cmd("SCARD %b", key.data(), key.size());
-}
-
-inline FormattedCommand sismember(const StringView &key, const StringView &member) {
-    return format_cmd("SISMEMBER %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand smembers(const StringView &key) {
-    return format_cmd("SMEMBERS %b", key.data(), key.size());
-}
-
-inline FormattedCommand spop(const StringView &key) {
-    return format_cmd("SPOP %b", key.data(), key.size());
-}
-
-inline FormattedCommand spop(const StringView &key, long long count) {
-    return format_cmd("SPOP %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand srem(const StringView &key, const StringView &member) {
-    return format_cmd("SREM %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand srem_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-// SORTED SET commands.
-
-inline FormattedCommand bzpopmax(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BZPOPMAX %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand bzpopmax_range(Input first,
-        Input last,
-        const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand bzpopmin(const StringView &key, const std::chrono::seconds &timeout) {
-    return format_cmd("BZPOPMIN %b %lld", key.data(), key.size(), timeout.count());
-}
-
-template <typename Input>
-FormattedCommand bzpopmin_range(Input first, Input last, const std::chrono::seconds &timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout.count();
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand zadd(const StringView &key,
-        const StringView &member,
-        double score,
-        UpdateType type,
-        bool changed) {
-    CmdArgs args;
-    args << "ZADD" << key;
-
-    cmd::detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    args << score << member;
-
-    return format_cmd(args);
-}
-
-template <typename Input>
-FormattedCommand zadd_range(const StringView &key,
-        Input first,
-        Input last,
-        UpdateType type,
-        bool changed) {
-    CmdArgs args;
-    args << "ZADD" << key;
-
-    cmd::detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    return format_cmd(args);
-}
-
-inline FormattedCommand zcard(const StringView &key) {
-    return format_cmd("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-FormattedCommand zcount(const StringView &key, const Interval &interval) {
-    return format_cmd("ZCOUNT %b %s %s",
-            key.data(), key.size(),
-            interval.min().c_str(),
-            interval.max().c_str());
-}
-
-inline FormattedCommand zincrby(const StringView &key,
-        double increment,
-        const StringView &member) {
-    return format_cmd("ZINCRBY %b %f %b",
-            key.data(), key.size(),
-            increment,
-            member.data(), member.size());
-}
-
-template <typename Interval>
-FormattedCommand zlexcount(const StringView &key,
-        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline FormattedCommand zpopmax(const StringView &key) {
-    return format_cmd("ZPOPMAX %b", key.data(), key.size());
-}
-
-inline FormattedCommand zpopmax(const StringView &key, long long count) {
-    return format_cmd("ZPOPMAX %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand zpopmin(const StringView &key) {
-    return format_cmd("ZPOPMIN %b", key.data(), key.size());
-}
-
-inline FormattedCommand zpopmin_count(const StringView &key, long long count) {
-    return format_cmd("ZPOPMIN %b %lld", key.data(), key.size(), count);
-}
-
-inline FormattedCommand zrange(const StringView &key, long long start, long long stop) {
-    return format_cmd("ZRANGE %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-template <typename Interval>
-FormattedCommand zrangebylex(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-FormattedCommand zrangebyscore(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-inline FormattedCommand zrank(const StringView &key, const StringView &member) {
-    return format_cmd("ZRANK %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand zrem(const StringView &key, const StringView &member) {
-    return format_cmd("ZREM %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-template <typename Input>
-FormattedCommand zrem_range(const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    return format_cmd(args);
-}
-
-template <typename Interval>
-FormattedCommand zremrangebylex(const StringView &key, const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline FormattedCommand zremrangebyrank(const StringView &key, long long start, long long stop) {
-    return format_cmd("ZREMRANGEBYRANK %b %lld %lld", key.data(), key.size(), start, stop);
-}
-
-template <typename Interval>
-FormattedCommand zremrangebyscore(const StringView &key,
-        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-template <typename Interval>
-FormattedCommand zrevrangebylex(const StringView &key,
-        const Interval &interval,
-        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    return format_cmd("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-inline FormattedCommand zrevrank(const StringView &key, const StringView &member) {
-    return format_cmd("ZREVRANK %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-inline FormattedCommand zscore(const StringView &key, const StringView &member) {
-    return format_cmd("ZSCORE %b %b", key.data(), key.size(), member.data(), member.size());
-}
-
-// SCRIPTING commands.
-template <typename Keys, typename Args>
-FormattedCommand eval(const StringView &script,
-        Keys keys_first,
-        Keys keys_last,
-        Args args_first,
-        Args args_last) {
-    CmdArgs args;
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    args << "EVAL" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    return format_cmd(args);
-}
-
-template <typename Keys, typename Args>
-FormattedCommand evalsha(const StringView &script,
-        Keys keys_first,
-        Keys keys_last,
-        Args args_first,
-        Args args_last) {
-    CmdArgs args;
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    args << "EVALSHA" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    return format_cmd(args);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CMD_FORMATTER_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/command.cpp
deleted file mode 100644
index bb1afb2a9..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "command.h"
-#include <cassert>
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-// KEY commands.
-
-void restore(Connection &connection,
-                const StringView &key,
-                const StringView &val,
-                long long ttl,
-                bool replace) {
-    CmdArgs args;
-    args << "RESTORE" << key << ttl << val;
-
-    if (replace) {
-        args << "REPLACE";
-    }
-
-    connection.send(args);
-}
-
-// STRING commands.
-
-void bitop(Connection &connection,
-            BitOp op,
-            const StringView &destination,
-            const StringView &key) {
-    CmdArgs args;
-
-    detail::set_bitop(args, op);
-
-    args << destination << key;
-
-    connection.send(args);
-}
-
-void set(Connection &connection,
-            const StringView &key,
-            const StringView &val,
-            long long ttl,
-            UpdateType type) {
-    CmdArgs args;
-    args << "SET" << key << val;
-
-    if (ttl > 0) {
-        args << "PX" << ttl;
-    }
-
-    detail::set_update_type(args, type);
-
-    connection.send(args);
-}
-
-// LIST commands.
-
-void linsert(Connection &connection,
-                const StringView &key,
-                InsertPosition position,
-                const StringView &pivot,
-                const StringView &val) {
-    std::string pos;
-    switch (position) {
-    case InsertPosition::BEFORE:
-        pos = "BEFORE";
-        break;
-
-    case InsertPosition::AFTER:
-        pos = "AFTER";
-        break;
-
-    default:
-        assert(false);
-    }
-
-    connection.send("LINSERT %b %s %b %b",
-                    key.data(), key.size(),
-                    pos.c_str(),
-                    pivot.data(), pivot.size(),
-                    val.data(), val.size());
-}
-
-// GEO commands.
-
-void geodist(Connection &connection,
-                const StringView &key,
-                const StringView &member1,
-                const StringView &member2,
-                GeoUnit unit) {
-    CmdArgs args;
-    args << "GEODIST" << key << member1 << member2;
-
-    detail::set_geo_unit(args, unit);
-
-    connection.send(args);
-}
-
-void georadius_store(Connection &connection,
-                        const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        const StringView &destination,
-                        bool store_dist,
-                        long long count) {
-    CmdArgs args;
-    args << "GEORADIUS" << key << loc.first << loc.second;
-
-    detail::set_georadius_store_parameters(args,
-                                            radius,
-                                            unit,
-                                            destination,
-                                            store_dist,
-                                            count);
-
-    connection.send(args);
-}
-
-void georadius(Connection &connection,
-                const StringView &key,
-                const std::pair<double, double> &loc,
-                double radius,
-                GeoUnit unit,
-                long long count,
-                bool asc,
-                bool with_coord,
-                bool with_dist,
-                bool with_hash) {
-    CmdArgs args;
-    args << "GEORADIUS" << key << loc.first << loc.second;
-
-    detail::set_georadius_parameters(args,
-                                        radius,
-                                        unit,
-                                        count,
-                                        asc,
-                                        with_coord,
-                                        with_dist,
-                                        with_hash);
-
-    connection.send(args);
-}
-
-void georadiusbymember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        bool with_coord,
-                        bool with_dist,
-                        bool with_hash) {
-    CmdArgs args;
-    args << "GEORADIUSBYMEMBER" << key << member;
-
-    detail::set_georadius_parameters(args,
-                                        radius,
-                                        unit,
-                                        count,
-                                        asc,
-                                        with_coord,
-                                        with_dist,
-                                        with_hash);
-
-    connection.send(args);
-}
-
-void georadiusbymember_store(Connection &connection,
-                                const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count) {
-    CmdArgs args;
-    args << "GEORADIUSBYMEMBER" << key << member;
-
-    detail::set_georadius_store_parameters(args,
-                                            radius,
-                                            unit,
-                                            destination,
-                                            store_dist,
-                                            count);
-
-    connection.send(args);
-}
-
-// Stream commands.
-
-void xtrim(Connection &connection, const StringView &key, long long count, bool approx) {
-    CmdArgs args;
-    args << "XTRIM" << key << "MAXLEN";
-
-    if (approx) {
-        args << "~";
-    }
-
-    args << count;
-
-    connection.send(args);
-}
-
-namespace detail {
-
-void set_bitop(CmdArgs &args, BitOp op) {
-    args << "BITOP";
-
-    switch (op) {
-    case BitOp::AND:
-        args << "AND";
-        break;
-
-    case BitOp::OR:
-        args << "OR";
-        break;
-
-    case BitOp::XOR:
-        args << "XOR";
-        break;
-
-    case BitOp::NOT:
-        args << "NOT";
-        break;
-
-    default:
-        throw Error("Unknown bit operations");
-    }
-}
-
-void set_update_type(CmdArgs &args, UpdateType type) {
-    switch (type) {
-    case UpdateType::EXIST:
-        args << "XX";
-        break;
-
-    case UpdateType::NOT_EXIST:
-        args << "NX";
-        break;
-
-    case UpdateType::ALWAYS:
-        // Do nothing.
-        break;
-
-    default:
-        throw Error("Unknown update type");
-    }
-}
-
-void set_aggregation_type(CmdArgs &args, Aggregation aggr) {
-    args << "AGGREGATE";
-
-    switch (aggr) {
-    case Aggregation::SUM:
-        args << "SUM";
-        break;
-
-    case Aggregation::MIN:
-        args << "MIN";
-        break;
-
-    case Aggregation::MAX:
-        args << "MAX";
-        break;
-
-    default:
-        throw Error("Unknown aggregation type");
-    }
-}
-
-void set_geo_unit(CmdArgs &args, GeoUnit unit) {
-    switch (unit) {
-    case GeoUnit::M:
-        args << "m";
-        break;
-
-    case GeoUnit::KM:
-        args << "km";
-        break;
-
-    case GeoUnit::MI:
-        args << "mi";
-        break;
-
-    case GeoUnit::FT:
-        args << "ft";
-        break;
-
-    default:
-        throw Error("Unknown geo unit type");
-        break;
-    }
-}
-
-void set_georadius_store_parameters(CmdArgs &args,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-    args << radius;
-
-    detail::set_geo_unit(args, unit);
-
-    args << "COUNT" << count;
-
-    if (store_dist) {
-        args << "STOREDIST";
-    } else {
-        args << "STORE";
-    }
-
-    args << destination;
-}
-
-void set_georadius_parameters(CmdArgs &args,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                bool with_coord,
-                                bool with_dist,
-                                bool with_hash) {
-    args << radius;
-
-    detail::set_geo_unit(args, unit);
-
-    if (with_coord) {
-        args << "WITHCOORD";
-    }
-
-    if (with_dist) {
-        args << "WITHDIST";
-    }
-
-    if (with_hash) {
-        args << "WITHHASH";
-    }
-
-    args << "COUNT" << count;
-
-    if (asc) {
-        args << "ASC";
-    } else {
-        args << "DESC";
-    }
-}
-
-}
-
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/command.h
deleted file mode 100644
index 81857dd9b..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command.h
+++ /dev/null
@@ -1,2271 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_H
-
-#include <cassert>
-#include <ctime>
-#include <string>
-#include <chrono>
-#include "connection.h"
-#include "command_options.h"
-#include "command_args.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-// CONNECTION command.
-inline void auth(Connection &connection, const StringView &password) {
-    connection.send("AUTH %b", password.data(), password.size());
-}
-
-inline void auth(Connection &connection, const StringView &user, const StringView &password) {
-    connection.send("AUTH %b %b",
-                    user.data(), user.size(),
-                    password.data(), password.size());
-}
-
-inline void echo(Connection &connection, const StringView &msg) {
-    connection.send("ECHO %b", msg.data(), msg.size());
-}
-
-inline void ping(Connection &connection) {
-    connection.send("PING");
-}
-
-inline void quit(Connection &connection) {
-    connection.send("QUIT");
-}
-
-inline void ping(Connection &connection, const StringView &msg) {
-    // If *msg* is empty, Redis returns am empty reply of REDIS_REPLY_STRING type.
-    connection.send("PING %b", msg.data(), msg.size());
-}
-
-inline void select(Connection &connection, long long idx) {
-    connection.send("SELECT %lld", idx);
-}
-
-inline void swapdb(Connection &connection, long long idx1, long long idx2) {
-    connection.send("SWAPDB %lld %lld", idx1, idx2);
-}
-
-// SERVER commands.
-
-inline void bgrewriteaof(Connection &connection) {
-    connection.send("BGREWRITEAOF");
-}
-
-inline void bgsave(Connection &connection) {
-    connection.send("BGSAVE");
-}
-
-inline void dbsize(Connection &connection) {
-    connection.send("DBSIZE");
-}
-
-inline void flushall(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHALL ASYNC");
-    } else {
-        connection.send("FLUSHALL");
-    }
-}
-
-inline void flushdb(Connection &connection, bool async) {
-    if (async) {
-        connection.send("FLUSHDB ASYNC");
-    } else {
-        connection.send("FLUSHDB");
-    }
-}
-
-inline void info(Connection &connection) {
-    connection.send("INFO");
-}
-
-inline void info(Connection &connection, const StringView &section) {
-    connection.send("INFO %b", section.data(), section.size());
-}
-
-inline void lastsave(Connection &connection) {
-    connection.send("LASTSAVE");
-}
-
-inline void save(Connection &connection) {
-    connection.send("SAVE");
-}
-
-// KEY commands.
-
-inline void del(Connection &connection, const StringView &key) {
-    connection.send("DEL %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void del_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "DEL" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void dump(Connection &connection, const StringView &key) {
-    connection.send("DUMP %b", key.data(), key.size());
-}
-
-inline void exists(Connection &connection, const StringView &key) {
-    connection.send("EXISTS %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void expire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("EXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void expireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("EXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void keys(Connection &connection, const StringView &pattern) {
-    connection.send("KEYS %b", pattern.data(), pattern.size());
-}
-
-inline void move(Connection &connection, const StringView &key, long long db) {
-    connection.send("MOVE %b %lld",
-                    key.data(), key.size(),
-                    db);
-}
-
-inline void persist(Connection &connection, const StringView &key) {
-    connection.send("PERSIST %b", key.data(), key.size());
-}
-
-inline void pexpire(Connection &connection,
-                    const StringView &key,
-                    long long timeout) {
-    connection.send("PEXPIRE %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-inline void pexpireat(Connection &connection,
-                        const StringView &key,
-                        long long timestamp) {
-    connection.send("PEXPIREAT %b %lld",
-                    key.data(), key.size(),
-                    timestamp);
-}
-
-inline void pttl(Connection &connection, const StringView &key) {
-    connection.send("PTTL %b", key.data(), key.size());
-}
-
-inline void randomkey(Connection &connection) {
-    connection.send("RANDOMKEY");
-}
-
-inline void rename(Connection &connection,
-                    const StringView &key,
-                    const StringView &newkey) {
-    connection.send("RENAME %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-inline void renamenx(Connection &connection,
-                        const StringView &key,
-                        const StringView &newkey) {
-    connection.send("RENAMENX %b %b",
-                    key.data(), key.size(),
-                    newkey.data(), newkey.size());
-}
-
-void restore(Connection &connection,
-                const StringView &key,
-                const StringView &val,
-                long long ttl,
-                bool replace);
-
-inline void scan(Connection &connection,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SCAN %lld MATCH %b COUNT %lld",
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void touch(Connection &connection, const StringView &key) {
-    connection.send("TOUCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void touch_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "TOUCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void ttl(Connection &connection, const StringView &key) {
-    connection.send("TTL %b", key.data(), key.size());
-}
-
-inline void type(Connection &connection, const StringView &key) {
-    connection.send("TYPE %b", key.data(), key.size());
-}
-
-inline void unlink(Connection &connection, const StringView &key) {
-    connection.send("UNLINK %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void unlink_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "UNLINK" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void wait(Connection &connection, long long numslave, long long timeout) {
-    connection.send("WAIT %lld %lld", numslave, timeout);
-}
-
-// STRING commands.
-
-inline void append(Connection &connection, const StringView &key, const StringView &str) {
-    connection.send("APPEND %b %b",
-                    key.data(), key.size(),
-                    str.data(), str.size());
-}
-
-inline void bitcount(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("BITCOUNT %b %lld %lld",
-                    key.data(), key.size(),
-                    start, end);
-}
-
-void bitop(Connection &connection,
-            BitOp op,
-            const StringView &destination,
-            const StringView &key);
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last);
-
-inline void bitpos(Connection &connection,
-                    const StringView &key,
-                    long long bit,
-                    long long start,
-                    long long end) {
-    connection.send("BITPOS %b %lld %lld %lld",
-                    key.data(), key.size(),
-                    bit,
-                    start,
-                    end);
-}
-
-inline void decr(Connection &connection, const StringView &key) {
-    connection.send("DECR %b", key.data(), key.size());
-}
-
-inline void decrby(Connection &connection, const StringView &key, long long decrement) {
-    connection.send("DECRBY %b %lld",
-                    key.data(), key.size(),
-                    decrement);
-}
-
-inline void get(Connection &connection, const StringView &key) {
-    connection.send("GET %b",
-                    key.data(), key.size());
-}
-
-inline void getbit(Connection &connection, const StringView &key, long long offset) {
-    connection.send("GETBIT %b %lld",
-                    key.data(), key.size(),
-                    offset);
-}
-
-inline void getrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long end) {
-    connection.send("GETRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    end);
-}
-
-inline void getset(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("GETSET %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void incr(Connection &connection, const StringView &key) {
-    connection.send("INCR %b", key.data(), key.size());
-}
-
-inline void incrby(Connection &connection, const StringView &key, long long increment) {
-    connection.send("INCRBY %b %lld",
-                    key.data(), key.size(),
-                    increment);
-}
-
-inline void incrbyfloat(Connection &connection, const StringView &key, double increment) {
-    connection.send("INCRBYFLOAT %b %f",
-                    key.data(), key.size(),
-                    increment);
-}
-
-template <typename Input>
-inline void mget(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MGET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void mset(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSET" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void msetnx(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "MSETNX" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void psetex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("PSETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-void set(Connection &connection,
-            const StringView &key,
-            const StringView &val,
-            long long ttl,
-            UpdateType type);
-
-inline void setex(Connection &connection,
-                    const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    connection.send("SETEX %b %lld %b",
-                    key.data(), key.size(),
-                    ttl,
-                    val.data(), val.size());
-}
-
-inline void setnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &val) {
-    connection.send("SETNX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void setrange(Connection &connection,
-                        const StringView &key,
-                        long long offset,
-                        const StringView &val) {
-    connection.send("SETRANGE %b %lld %b",
-                    key.data(), key.size(),
-                    offset,
-                    val.data(), val.size());
-}
-
-inline void strlen(Connection &connection, const StringView &key) {
-    connection.send("STRLEN %b", key.data(), key.size());
-}
-
-// LIST commands.
-
-inline void blpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BLPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void blpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BLPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpop(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BRPOP %b %lld",
-                    key.data(), key.size(),
-                    timeout);
-}
-
-template <typename Input>
-inline void brpop_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BRPOP" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void brpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination,
-                        long long timeout) {
-    connection.send("BRPOPLPUSH %b %b %lld",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    timeout);
-}
-
-inline void lindex(Connection &connection, const StringView &key, long long index) {
-    connection.send("LINDEX %b %lld",
-                    key.data(), key.size(),
-                    index);
-}
-
-void linsert(Connection &connection,
-                const StringView &key,
-                InsertPosition position,
-                const StringView &pivot,
-                const StringView &val);
-
-inline void llen(Connection &connection,
-                    const StringView &key) {
-    connection.send("LLEN %b", key.data(), key.size());
-}
-
-inline void lpop(Connection &connection, const StringView &key) {
-    connection.send("LPOP %b",
-                    key.data(), key.size());
-}
-
-inline void lpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void lpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "LPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void lpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("LPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-inline void lrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LRANGE %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void lrem(Connection &connection,
-                    const StringView &key,
-                    long long count,
-                    const StringView &val) {
-    connection.send("LREM %b %lld %b",
-                    key.data(), key.size(),
-                    count,
-                    val.data(), val.size());
-}
-
-inline void lset(Connection &connection,
-                    const StringView &key,
-                    long long index,
-                    const StringView &val) {
-    connection.send("LSET %b %lld %b",
-                    key.data(), key.size(),
-                    index,
-                    val.data(), val.size());
-}
-
-inline void ltrim(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop) {
-    connection.send("LTRIM %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-inline void rpop(Connection &connection, const StringView &key) {
-    connection.send("RPOP %b", key.data(), key.size());
-}
-
-inline void rpoplpush(Connection &connection,
-                        const StringView &source,
-                        const StringView &destination) {
-    connection.send("RPOPLPUSH %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size());
-}
-
-inline void rpush(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSH %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-inline void rpush_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "RPUSH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void rpushx(Connection &connection, const StringView &key, const StringView &val) {
-    connection.send("RPUSHX %b %b",
-                    key.data(), key.size(),
-                    val.data(), val.size());
-}
-
-// HASH commands.
-
-inline void hdel(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HDEL %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-template <typename Input>
-inline void hdel_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hexists(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HEXISTS %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hget(Connection &connection, const StringView &key, const StringView &field) {
-    connection.send("HGET %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hgetall(Connection &connection, const StringView &key) {
-    connection.send("HGETALL %b", key.data(), key.size());
-}
-
-inline void hincrby(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    long long increment) {
-    connection.send("HINCRBY %b %b %lld",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hincrbyfloat(Connection &connection,
-                            const StringView &key,
-                            const StringView &field,
-                            double increment) {
-    connection.send("HINCRBYFLOAT %b %b %f",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    increment);
-}
-
-inline void hkeys(Connection &connection, const StringView &key) {
-    connection.send("HKEYS %b", key.data(), key.size());
-}
-
-inline void hlen(Connection &connection, const StringView &key) {
-    connection.send("HLEN %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void hmget(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMGET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void hmset(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HMSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("HSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void hset(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSET %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-template <typename Input>
-void hset_range(Connection &connection, const StringView &key, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "HSET" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void hsetnx(Connection &connection,
-                    const StringView &key,
-                    const StringView &field,
-                    const StringView &val) {
-    connection.send("HSETNX %b %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size(),
-                    val.data(), val.size());
-}
-
-inline void hstrlen(Connection &connection,
-                    const StringView &key,
-                    const StringView &field) {
-    connection.send("HSTRLEN %b %b",
-                    key.data(), key.size(),
-                    field.data(), field.size());
-}
-
-inline void hvals(Connection &connection, const StringView &key) {
-    connection.send("HVALS %b", key.data(), key.size());
-}
-
-// SET commands
-
-inline void sadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SADD %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void sadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void scard(Connection &connection, const StringView &key) {
-    connection.send("SCARD %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiff(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFF" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sdiffstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SDIFFSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sdiffstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SDIFFSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-inline void sinter(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTER" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SINTERSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sinterstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SINTERSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sismember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("SISMEMBER %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void smembers(Connection &connection, const StringView &key) {
-    connection.send("SMEMBERS %b", key.data(), key.size());
-}
-
-inline void smove(Connection &connection,
-                    const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    connection.send("SMOVE %b %b %b",
-                    source.data(), source.size(),
-                    destination.data(), destination.size(),
-                    member.data(), member.size());
-}
-
-inline void spop(Connection &connection, const StringView &key) {
-    connection.send("SPOP %b", key.data(), key.size());
-}
-
-inline void spop_range(Connection &connection, const StringView &key, long long count) {
-    connection.send("SPOP %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srandmember(Connection &connection, const StringView &key) {
-    connection.send("SRANDMEMBER %b", key.data(), key.size());
-}
-
-inline void srandmember_range(Connection &connection,
-                                const StringView &key,
-                                long long count) {
-    connection.send("SRANDMEMBER %b %lld",
-                    key.data(), key.size(),
-                    count);
-}
-
-inline void srem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("SREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void srem_range(Connection &connection,
-                    const StringView &key,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("SSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-template <typename Input>
-inline void sunion(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNION" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void sunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key) {
-    connection.send("SUNIONSTORE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void sunionstore_range(Connection &connection,
-                                const StringView &destination,
-                                Input first,
-                                Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SUNIONSTORE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Sorted Set commands.
-
-inline void bzpopmax(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMAX %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmax_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMAX" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-inline void bzpopmin(Connection &connection, const StringView &key, long long timeout) {
-    connection.send("BZPOPMIN %b %lld", key.data(), key.size(), timeout);
-}
-
-template <typename Input>
-void bzpopmin_range(Connection &connection,
-                    Input first,
-                    Input last,
-                    long long timeout) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "BZPOPMIN" << std::make_pair(first, last) << timeout;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed);
-
-inline void zadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type,
-                    bool changed) {
-    auto tmp = {std::make_pair(member, score)};
-
-    zadd_range(connection, key, tmp.begin(), tmp.end(), type, changed);
-}
-
-inline void zcard(Connection &connection, const StringView &key) {
-    connection.send("ZCARD %b", key.data(), key.size());
-}
-
-template <typename Interval>
-inline void zcount(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval) {
-    connection.send("ZCOUNT %b %s %s",
-                    key.data(), key.size(),
-                    interval.min().c_str(),
-                    interval.max().c_str());
-}
-
-inline void zincrby(Connection &connection,
-                    const StringView &key,
-                    double increment,
-                    const StringView &member) {
-    connection.send("ZINCRBY %b %f %b",
-                    key.data(), key.size(),
-                    increment,
-                    member.data(), member.size());
-}
-
-inline void zinterstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZINTERSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-template <typename Interval>
-inline void zlexcount(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZLEXCOUNT %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zpopmax(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMAX %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zpopmin(Connection &connection, const StringView &key, long long count) {
-    connection.send("ZPOPMIN %b %lld",
-                        key.data(), key.size(),
-                        count);
-}
-
-inline void zrange(Connection &connection,
-                    const StringView &key,
-                    long long start,
-                    long long stop,
-                    bool with_scores) {
-    if (with_scores) {
-        connection.send("ZRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrangebylex(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrangebyscore(Connection &connection,
-                    const StringView &key,
-                    const Interval &interval,
-                    const LimitOptions &opts,
-                    bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        min.data(), min.size(),
-                        max.data(), max.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrank(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zrem(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZREM %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void zrem_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "ZREM" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Interval>
-inline void zremrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYLEX %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zremrangebyrank(Connection &connection,
-                            const StringView &key,
-                            long long start,
-                            long long stop) {
-    connection.send("zremrangebyrank %b %lld %lld",
-                    key.data(), key.size(),
-                    start,
-                    stop);
-}
-
-template <typename Interval>
-inline void zremrangebyscore(Connection &connection,
-                                const StringView &key,
-                                const Interval &interval) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREMRANGEBYSCORE %b %b %b",
-                    key.data(), key.size(),
-                    min.data(), min.size(),
-                    max.data(), max.size());
-}
-
-inline void zrevrange(Connection &connection,
-                        const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores) {
-    if (with_scores) {
-        connection.send("ZREVRANGE %b %lld %lld WITHSCORES",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    } else {
-        connection.send("ZREVRANGE %b %lld %lld",
-                        key.data(), key.size(),
-                        start,
-                        stop);
-    }
-}
-
-template <typename Interval>
-inline void zrevrangebylex(Connection &connection,
-                            const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    connection.send("ZREVRANGEBYLEX %b %b %b LIMIT %lld %lld",
-                    key.data(), key.size(),
-                    max.data(), max.size(),
-                    min.data(), min.size(),
-                    opts.offset,
-                    opts.count);
-}
-
-template <typename Interval>
-void zrevrangebyscore(Connection &connection,
-                        const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        bool with_scores) {
-    const auto &min = interval.min();
-    const auto &max = interval.max();
-
-    if (with_scores) {
-        connection.send("ZREVRANGEBYSCORE %b %b %b WITHSCORES LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    } else {
-        connection.send("ZREVRANGEBYSCORE %b %b %b LIMIT %lld %lld",
-                        key.data(), key.size(),
-                        max.data(), max.size(),
-                        min.data(), min.size(),
-                        opts.offset,
-                        opts.count);
-    }
-}
-
-inline void zrevrank(Connection &connection,
-                        const StringView &key,
-                        const StringView &member) {
-    connection.send("ZREVRANK %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zscan(Connection &connection,
-                    const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count) {
-    connection.send("ZSCAN %b %lld MATCH %b COUNT %lld",
-                    key.data(), key.size(),
-                    cursor,
-                    pattern.data(), pattern.size(),
-                    count);
-}
-
-inline void zscore(Connection &connection,
-                    const StringView &key,
-                    const StringView &member) {
-    connection.send("ZSCORE %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-inline void zunionstore(Connection &connection,
-                        const StringView &destination,
-                        const StringView &key,
-                        double weight) {
-    connection.send("ZUNIONSTORE %b 1 %b WEIGHTS %f",
-                    destination.data(), destination.size(),
-                    key.data(), key.size(),
-                    weight);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr);
-
-// HYPERLOGLOG commands.
-
-inline void pfadd(Connection &connection,
-                    const StringView &key,
-                    const StringView &element) {
-    connection.send("PFADD %b %b",
-                    key.data(), key.size(),
-                    element.data(), element.size());
-}
-
-template <typename Input>
-inline void pfadd_range(Connection &connection,
-                        const StringView &key,
-                        Input first,
-                        Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFADD" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfcount(Connection &connection, const StringView &key) {
-    connection.send("PFCOUNT %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfcount_range(Connection &connection,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFCOUNT" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void pfmerge(Connection &connection, const StringView &destination, const StringView &key) {
-    connection.send("PFMERGE %b %b",
-                    destination.data(), destination.size(),
-                    key.data(), key.size());
-}
-
-template <typename Input>
-inline void pfmerge_range(Connection &connection,
-                            const StringView &destination,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "PFMERGE" << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// GEO commands.
-
-inline void geoadd(Connection &connection,
-                    const StringView &key,
-                    const std::tuple<StringView, double, double> &member) {
-    const auto &mem = std::get<0>(member);
-
-    connection.send("GEOADD %b %f %f %b",
-                    key.data(), key.size(),
-                    std::get<1>(member),
-                    std::get<2>(member),
-                    mem.data(), mem.size());
-}
-
-template <typename Input>
-inline void geoadd_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOADD" << key;
-
-    while (first != last) {
-        const auto &member = *first;
-        args << std::get<1>(member) << std::get<2>(member) << std::get<0>(member);
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-void geodist(Connection &connection,
-                const StringView &key,
-                const StringView &member1,
-                const StringView &member2,
-                GeoUnit unit);
-
-inline void geohash(Connection &connection, const StringView &key, const StringView &member) {
-    connection.send("GEOHASH %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void geohash_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOHASH" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void geopos(Connection &connection, const StringView &key, const StringView &member) {
-    connection.send("GEOPOS %b %b",
-                    key.data(), key.size(),
-                    member.data(), member.size());
-}
-
-template <typename Input>
-inline void geopos_range(Connection &connection,
-                            const StringView &key,
-                            Input first,
-                            Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "GEOPOS" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-void georadius(Connection &connection,
-                const StringView &key,
-                const std::pair<double, double> &loc,
-                double radius,
-                GeoUnit unit,
-                long long count,
-                bool asc,
-                bool with_coord,
-                bool with_dist,
-                bool with_hash);
-
-void georadius_store(Connection &connection,
-                        const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        const StringView &destination,
-                        bool store_dist,
-                        long long count);
-
-void georadiusbymember(Connection &connection,
-                        const StringView &key,
-                        const StringView &member,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        bool with_coord,
-                        bool with_dist,
-                        bool with_hash);
-
-void georadiusbymember_store(Connection &connection,
-                                const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-// SCRIPTING commands.
-
-template <typename Keys, typename Args>
-inline void eval(Connection &connection,
-                   const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last) {
-    CmdArgs cmd_args;
-
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    cmd_args << "EVAL" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    connection.send(cmd_args);
-}
-
-template <typename Keys, typename Args>
-inline void evalsha(Connection &connection,
-                       const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last) {
-    CmdArgs cmd_args;
-
-    auto keys_num = std::distance(keys_first, keys_last);
-
-    cmd_args << "EVALSHA" << script << keys_num
-            << std::make_pair(keys_first, keys_last)
-            << std::make_pair(args_first, args_last);
-
-    connection.send(cmd_args);
-}
-
-inline void script_exists(Connection &connection, const StringView &sha) {
-    connection.send("SCRIPT EXISTS %b", sha.data(), sha.size());
-}
-
-template <typename Input>
-inline void script_exists_range(Connection &connection, Input first, Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-    args << "SCRIPT" << "EXISTS" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void script_flush(Connection &connection) {
-    connection.send("SCRIPT FLUSH");
-}
-
-inline void script_kill(Connection &connection) {
-    connection.send("SCRIPT KILL");
-}
-
-inline void script_load(Connection &connection, const StringView &script) {
-    connection.send("SCRIPT LOAD %b", script.data(), script.size());
-}
-
-// PUBSUB commands.
-
-inline void psubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void psubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void publish(Connection &connection,
-                    const StringView &channel,
-                    const StringView &message) {
-    connection.send("PUBLISH %b %b",
-                    channel.data(), channel.size(),
-                    message.data(), message.size());
-}
-
-inline void punsubscribe(Connection &connection) {
-    connection.send("PUNSUBSCRIBE");
-}
-
-inline void punsubscribe(Connection &connection, const StringView &pattern) {
-    connection.send("PUNSUBSCRIBE %b", pattern.data(), pattern.size());
-}
-
-template <typename Input>
-inline void punsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("PUNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "PUNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void subscribe(Connection &connection, const StringView &channel) {
-    connection.send("SUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void subscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("SUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "SUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void unsubscribe(Connection &connection) {
-    connection.send("UNSUBSCRIBE");
-}
-
-inline void unsubscribe(Connection &connection, const StringView &channel) {
-    connection.send("UNSUBSCRIBE %b", channel.data(), channel.size());
-}
-
-template <typename Input>
-inline void unsubscribe_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNSUBSCRIBE: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNSUBSCRIBE" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Transaction commands.
-
-inline void discard(Connection &connection) {
-    connection.send("DISCARD");
-}
-
-inline void exec(Connection &connection) {
-    connection.send("EXEC");
-}
-
-inline void multi(Connection &connection) {
-    connection.send("MULTI");
-}
-
-inline void unwatch(Connection &connection) {
-    connection.send("UNWATCH");
-}
-
-template <typename Input>
-inline void unwatch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("UNWATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "UNWATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void watch(Connection &connection, const StringView &key) {
-    connection.send("WATCH %b", key.data(), key.size());
-}
-
-template <typename Input>
-inline void watch_range(Connection &connection, Input first, Input last) {
-    if (first == last) {
-        throw Error("WATCH: no key specified");
-    }
-
-    CmdArgs args;
-    args << "WATCH" << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-// Stream commands.
-
-inline void xack(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &id) {
-    connection.send("XACK %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xack_range(Connection &connection,
-                const StringView &key,
-                const StringView &group,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XACK" << key << group << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_range(Connection &connection,
-                const StringView &key,
-                const StringView &id,
-                Input first,
-                Input last) {
-    CmdArgs args;
-    args << "XADD" << key << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xadd_maxlen_range(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    CmdArgs args;
-    args << "XADD" << key << "MAXLEN";
-
-    if (approx) {
-        args << "~";
-    }
-
-    args << count << id << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xclaim(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    const StringView &id) {
-    connection.send("XCLAIM %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size(),
-                    min_idle_time,
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xclaim_range(Connection &connection,
-                    const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    long long min_idle_time,
-                    Input first,
-                    Input last) {
-    CmdArgs args;
-    args << "XCLAIM" << key << group << consumer << min_idle_time << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xdel(Connection &connection, const StringView &key, const StringView &id) {
-    connection.send("XDEL %b %b", key.data(), key.size(), id.data(), id.size());
-}
-
-template <typename Input>
-void xdel_range(Connection &connection, const StringView &key, Input first, Input last) {
-    CmdArgs args;
-    args << "XDEL" << key << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-inline void xgroup_create(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id,
-                            bool mkstream) {
-    CmdArgs args;
-    args << "XGROUP" << "CREATE" << key << group << id;
-
-    if (mkstream) {
-        args << "MKSTREAM";
-    }
-
-    connection.send(args);
-}
-
-inline void xgroup_setid(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &id) {
-    connection.send("XGROUP SETID %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    id.data(), id.size());
-}
-
-inline void xgroup_destroy(Connection &connection,
-                            const StringView &key,
-                            const StringView &group) {
-    connection.send("XGROUP DESTROY %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xgroup_delconsumer(Connection &connection,
-                                const StringView &key,
-                                const StringView &group,
-                                const StringView &consumer) {
-    connection.send("XGROUP DELCONSUMER %b %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    consumer.data(), consumer.size());
-}
-
-inline void xlen(Connection &connection, const StringView &key) {
-    connection.send("XLEN %b", key.data(), key.size());
-}
-
-inline void xpending(Connection &connection, const StringView &key, const StringView &group) {
-    connection.send("XPENDING %b %b",
-                    key.data(), key.size(),
-                    group.data(), group.size());
-}
-
-inline void xpending_detail(Connection &connection,
-                            const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XPENDING %b %b %b %b %lld",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xpending_per_consumer(Connection &connection,
-                                    const StringView &key,
-                                    const StringView &group,
-                                    const StringView &start,
-                                    const StringView &end,
-                                    long long count,
-                                    const StringView &consumer) {
-    connection.send("XPENDING %b %b %b %b %lld %b",
-                    key.data(), key.size(),
-                    group.data(), group.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count,
-                    consumer.data(), consumer.size());
-}
-
-inline void xrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &start,
-                    const StringView &end) {
-    connection.send("XRANGE %b %b %b",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size());
-}
-
-inline void xrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-    connection.send("XRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    start.data(), start.size(),
-                    end.data(), end.size(),
-                    count);
-}
-
-inline void xread(Connection &connection,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count) {
-    connection.send("XREAD COUNT %lld STREAMS %b %b",
-                    count,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_range(Connection &connection, Input first, Input last, long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xread_block(Connection &connection,
-                        const StringView &key,
-                        const StringView &id,
-                        long long timeout,
-                        long long count) {
-    connection.send("XREAD COUNT %lld BLOCK %lld STREAMS %b %b",
-                    count,
-                    timeout,
-                    key.data(), key.size(),
-                    id.data(), id.size());
-}
-
-template <typename Input>
-void xread_block_range(Connection &connection,
-                        Input first,
-                        Input last,
-                        long long timeout,
-                        long long count) {
-    CmdArgs args;
-    args << "XREAD" << "COUNT" << count << "BLOCK" << timeout << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_range(Connection &connection,
-                        const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer << "COUNT" << count;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xreadgroup_block(Connection &connection,
-                                const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long timeout,
-                                long long count,
-                                bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS" << key << id;
-
-    connection.send(args);
-}
-
-template <typename Input>
-void xreadgroup_block_range(Connection &connection,
-                            const StringView &group,
-                            const StringView &consumer,
-                            Input first,
-                            Input last,
-                            long long timeout,
-                            long long count,
-                            bool noack) {
-    CmdArgs args;
-    args << "XREADGROUP" << "GROUP" << group << consumer
-        << "COUNT" << count << "BLOCK" << timeout;
-
-    if (noack) {
-        args << "NOACK";
-    }
-
-    args << "STREAMS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    connection.send(args);
-}
-
-inline void xrevrange(Connection &connection,
-                    const StringView &key,
-                    const StringView &end,
-                    const StringView &start) {
-    connection.send("XREVRANGE %b %b %b",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size());
-}
-
-inline void xrevrange_count(Connection &connection,
-                            const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-    connection.send("XREVRANGE %b %b %b COUNT %lld",
-                    key.data(), key.size(),
-                    end.data(), end.size(),
-                    start.data(), start.size(),
-                    count);
-}
-
-void xtrim(Connection &connection, const StringView &key, long long count, bool approx);
-
-namespace detail {
-
-void set_bitop(CmdArgs &args, BitOp op);
-
-void set_update_type(CmdArgs &args, UpdateType type);
-
-void set_aggregation_type(CmdArgs &args, Aggregation type);
-
-template <typename Input>
-void zinterstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZINTERSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::false_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last)
-        << std::make_pair(first, last);
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zunionstore(std::true_type,
-                    Connection &connection,
-                    const StringView &destination,
-                    Input first,
-                    Input last,
-                    Aggregation aggr) {
-    CmdArgs args;
-    args << "ZUNIONSTORE" << destination << std::distance(first, last);
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->first;
-    }
-
-    args << "WEIGHTS";
-
-    for (auto iter = first; iter != last; ++iter) {
-        args << iter->second;
-    }
-
-    set_aggregation_type(args, aggr);
-
-    connection.send(args);
-}
-
-void set_geo_unit(CmdArgs &args, GeoUnit unit);
-
-void set_georadius_store_parameters(CmdArgs &args,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count);
-
-void set_georadius_parameters(CmdArgs &args,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                bool with_coord,
-                                bool with_dist,
-                                bool with_hash);
-
-}
-
-}
-
-}
-
-}
-
-namespace sw {
-
-namespace redis {
-
-namespace cmd {
-
-template <typename Input>
-void bitop_range(Connection &connection,
-                    BitOp op,
-                    const StringView &destination,
-                    Input first,
-                    Input last) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    detail::set_bitop(args, op);
-
-    args << destination << std::make_pair(first, last);
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zadd_range(Connection &connection,
-                const StringView &key,
-                Input first,
-                Input last,
-                UpdateType type,
-                bool changed) {
-    assert(first != last);
-
-    CmdArgs args;
-
-    args << "ZADD" << key;
-
-    detail::set_update_type(args, type);
-
-    if (changed) {
-        args << "CH";
-    }
-
-    while (first != last) {
-        // Swap the <member, score> pair to <score, member> pair.
-        args << first->second << first->first;
-        ++first;
-    }
-
-    connection.send(args);
-}
-
-template <typename Input>
-void zinterstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zinterstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-template <typename Input>
-void zunionstore_range(Connection &connection,
-                        const StringView &destination,
-                        Input first,
-                        Input last,
-                        Aggregation aggr) {
-    assert(first != last);
-
-    detail::zunionstore(typename IsKvPairIter<Input>::type(),
-                        connection,
-                        destination,
-                        first,
-                        last,
-                        aggr);
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_args.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_args.h
deleted file mode 100644
index 0beb71e5c..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_args.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
-
-#include <vector>
-#include <list>
-#include <string>
-#include <tuple>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-class CmdArgs {
-public:
-    template <typename Arg>
-    CmdArgs& append(Arg &&arg);
-
-    template <typename Arg, typename ...Args>
-    CmdArgs& append(Arg &&arg, Args &&...args);
-
-    // All overloads of operator<< are for internal use only.
-    CmdArgs& operator<<(const StringView &arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& operator<<(T &&arg);
-
-    template <typename Iter>
-    CmdArgs& operator<<(const std::pair<Iter, Iter> &range);
-
-    template <std::size_t N, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &) ->
-        typename std::enable_if<N == sizeof...(Args), CmdArgs&>::type {
-        return *this;
-    }
-
-    template <std::size_t N = 0, typename ...Args>
-    auto operator<<(const std::tuple<Args...> &arg) ->
-        typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type;
-
-    const char** argv() {
-        return _argv.data();
-    }
-
-    const std::size_t* argv_len() {
-        return _argv_len.data();
-    }
-
-    std::size_t size() const {
-        return _argv.size();
-    }
-
-private:
-    // Deep copy.
-    CmdArgs& _append(std::string arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const StringView &arg);
-
-    // Shallow copy.
-    CmdArgs& _append(const char *arg);
-
-    template <typename T,
-                 typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                        int>::type = 0>
-    CmdArgs& _append(T &&arg) {
-        return operator<<(std::forward<T>(arg));
-    }
-
-    template <typename Iter>
-    CmdArgs& _append(std::true_type, const std::pair<Iter, Iter> &range);
-
-    template <typename Iter>
-    CmdArgs& _append(std::false_type, const std::pair<Iter, Iter> &range);
-
-    std::vector<const char *> _argv;
-    std::vector<std::size_t> _argv_len;
-
-    std::list<std::string> _args;
-};
-
-template <typename Arg>
-inline CmdArgs& CmdArgs::append(Arg &&arg) {
-    return _append(std::forward<Arg>(arg));
-}
-
-template <typename Arg, typename ...Args>
-inline CmdArgs& CmdArgs::append(Arg &&arg, Args &&...args) {
-    _append(std::forward<Arg>(arg));
-
-    return append(std::forward<Args>(args)...);
-}
-
-inline CmdArgs& CmdArgs::operator<<(const StringView &arg) {
-    _argv.push_back(arg.data());
-    _argv_len.push_back(arg.size());
-
-    return *this;
-}
-
-template <typename Iter>
-inline CmdArgs& CmdArgs::operator<<(const std::pair<Iter, Iter> &range) {
-    return _append(IsKvPair<typename std::decay<decltype(*std::declval<Iter>())>::type>(), range);
-}
-
-template <typename T,
-             typename std::enable_if<std::is_arithmetic<typename std::decay<T>::type>::value,
-                                    int>::type>
-inline CmdArgs& CmdArgs::operator<<(T &&arg) {
-    return _append(std::to_string(std::forward<T>(arg)));
-}
-
-template <std::size_t N, typename ...Args>
-auto CmdArgs::operator<<(const std::tuple<Args...> &arg) ->
-    typename std::enable_if<N < sizeof...(Args), CmdArgs&>::type {
-    operator<<(std::get<N>(arg));
-
-    return operator<<<N + 1, Args...>(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(std::string arg) {
-    _args.push_back(std::move(arg));
-    return operator<<(_args.back());
-}
-
-inline CmdArgs& CmdArgs::_append(const StringView &arg) {
-    return operator<<(arg);
-}
-
-inline CmdArgs& CmdArgs::_append(const char *arg) {
-    return operator<<(arg);
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::false_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << *first;
-        ++first;
-    }
-
-    return *this;
-}
-
-template <typename Iter>
-CmdArgs& CmdArgs::_append(std::true_type, const std::pair<Iter, Iter> &range) {
-    auto first = range.first;
-    auto last = range.second;
-    while (first != last) {
-        *this << first->first << first->second;
-        ++first;
-    }
-
-    return *this;
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_ARGS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_options.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_options.cpp
deleted file mode 100644
index 0c9254e86..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_options.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "command_options.h"
-#include "errors.h"
-
-namespace {
-
-const std::string NEGATIVE_INFINITY_NUMERIC = "-inf";
-const std::string POSITIVE_INFINITY_NUMERIC = "+inf";
-
-const std::string NEGATIVE_INFINITY_STRING = "-";
-const std::string POSITIVE_INFINITY_STRING = "+";
-
-std::string unbound(const std::string &bnd);
-
-std::string bound(const std::string &bnd);
-
-}
-
-namespace sw {
-
-namespace redis {
-
-const std::string& UnboundedInterval<double>::min() const {
-    return NEGATIVE_INFINITY_NUMERIC;
-}
-
-const std::string& UnboundedInterval<double>::max() const {
-    return POSITIVE_INFINITY_NUMERIC;
-}
-
-BoundedInterval<double>::BoundedInterval(double min, double max, BoundType type) :
-                                            _min(std::to_string(min)),
-                                            _max(std::to_string(max)) {
-    switch (type) {
-    case BoundType::CLOSED:
-        // Do nothing
-        break;
-
-    case BoundType::OPEN:
-        _min = unbound(_min);
-        _max = unbound(_max);
-        break;
-
-    case BoundType::LEFT_OPEN:
-        _min = unbound(_min);
-        break;
-
-    case BoundType::RIGHT_OPEN:
-        _max = unbound(_max);
-        break;
-
-    default:
-        throw Error("Unknow BoundType");
-    }
-}
-
-LeftBoundedInterval<double>::LeftBoundedInterval(double min, BoundType type) :
-                                                    _min(std::to_string(min)) {
-    switch (type) {
-    case BoundType::OPEN:
-        _min = unbound(_min);
-        break;
-
-    case BoundType::RIGHT_OPEN:
-        // Do nothing.
-        break;
-
-    default:
-        throw Error("Bound type can only be OPEN or RIGHT_OPEN");
-    }
-}
-
-const std::string& LeftBoundedInterval<double>::max() const {
-    return POSITIVE_INFINITY_NUMERIC;
-}
-
-RightBoundedInterval<double>::RightBoundedInterval(double max, BoundType type) :
-                                                    _max(std::to_string(max)) {
-    switch (type) {
-    case BoundType::OPEN:
-        _max = unbound(_max);
-        break;
-
-    case BoundType::LEFT_OPEN:
-        // Do nothing.
-        break;
-
-    default:
-        throw Error("Bound type can only be OPEN or LEFT_OPEN");
-    }
-}
-
-const std::string& RightBoundedInterval<double>::min() const {
-    return NEGATIVE_INFINITY_NUMERIC;
-}
-
-const std::string& UnboundedInterval<std::string>::min() const {
-    return NEGATIVE_INFINITY_STRING;
-}
-
-const std::string& UnboundedInterval<std::string>::max() const {
-    return POSITIVE_INFINITY_STRING;
-}
-
-BoundedInterval<std::string>::BoundedInterval(const std::string &min,
-                                                const std::string &max,
-                                                BoundType type) {
-    switch (type) {
-    case BoundType::CLOSED:
-        _min = bound(min);
-        _max = bound(max);
-        break;
-
-    case BoundType::OPEN:
-        _min = unbound(min);
-        _max = unbound(max);
-        break;
-
-    case BoundType::LEFT_OPEN:
-        _min = unbound(min);
-        _max = bound(max);
-        break;
-
-    case BoundType::RIGHT_OPEN:
-        _min = bound(min);
-        _max = unbound(max);
-        break;
-
-    default:
-        throw Error("Unknow BoundType");
-    }
-}
-
-LeftBoundedInterval<std::string>::LeftBoundedInterval(const std::string &min, BoundType type) {
-    switch (type) {
-    case BoundType::OPEN:
-        _min = unbound(min);
-        break;
-
-    case BoundType::RIGHT_OPEN:
-        _min = bound(min);
-        break;
-
-    default:
-        throw Error("Bound type can only be OPEN or RIGHT_OPEN");
-    }
-}
-
-const std::string& LeftBoundedInterval<std::string>::max() const {
-    return POSITIVE_INFINITY_STRING;
-}
-
-RightBoundedInterval<std::string>::RightBoundedInterval(const std::string &max, BoundType type) {
-    switch (type) {
-    case BoundType::OPEN:
-        _max = unbound(max);
-        break;
-
-    case BoundType::LEFT_OPEN:
-        _max = bound(max);
-        break;
-
-    default:
-        throw Error("Bound type can only be OPEN or LEFT_OPEN");
-    }
-}
-
-const std::string& RightBoundedInterval<std::string>::min() const {
-    return NEGATIVE_INFINITY_STRING;
-}
-
-}
-
-}
-
-namespace {
-
-std::string unbound(const std::string &bnd) {
-    return "(" + bnd;
-}
-
-std::string bound(const std::string &bnd) {
-    return "[" + bnd;
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_options.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_options.h
deleted file mode 100644
index ca766c086..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/command_options.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-#define SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
-
-#include <string>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class UpdateType {
-    EXIST,
-    NOT_EXIST,
-    ALWAYS
-};
-
-enum class InsertPosition {
-    BEFORE,
-    AFTER
-};
-
-enum class BoundType {
-    CLOSED,
-    OPEN,
-    LEFT_OPEN,
-    RIGHT_OPEN
-};
-
-// (-inf, +inf)
-template <typename T>
-class UnboundedInterval;
-
-// [min, max], (min, max), (min, max], [min, max)
-template <typename T>
-class BoundedInterval;
-
-// [min, +inf), (min, +inf)
-template <typename T>
-class LeftBoundedInterval;
-
-// (-inf, max], (-inf, max)
-template <typename T>
-class RightBoundedInterval;
-
-template <>
-class UnboundedInterval<double> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<double> {
-public:
-    BoundedInterval(double min, double max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<double> {
-public:
-    LeftBoundedInterval(double min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<double> {
-public:
-    RightBoundedInterval(double max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-template <>
-class UnboundedInterval<std::string> {
-public:
-    const std::string& min() const;
-
-    const std::string& max() const;
-};
-
-template <>
-class BoundedInterval<std::string> {
-public:
-    BoundedInterval(const std::string &min, const std::string &max, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _min;
-    std::string _max;
-};
-
-template <>
-class LeftBoundedInterval<std::string> {
-public:
-    LeftBoundedInterval(const std::string &min, BoundType type);
-
-    const std::string& min() const {
-        return _min;
-    }
-
-    const std::string& max() const;
-
-private:
-    std::string _min;
-};
-
-template <>
-class RightBoundedInterval<std::string> {
-public:
-    RightBoundedInterval(const std::string &max, BoundType type);
-
-    const std::string& min() const;
-
-    const std::string& max() const {
-        return _max;
-    }
-
-private:
-    std::string _max;
-};
-
-struct LimitOptions {
-    long long offset = 0;
-    long long count = -1;
-};
-
-enum class Aggregation {
-    SUM,
-    MIN,
-    MAX
-};
-
-enum class BitOp {
-    AND,
-    OR,
-    XOR,
-    NOT
-};
-
-enum class GeoUnit {
-    M,
-    KM,
-    MI,
-    FT
-};
-
-template <typename T>
-struct WithCoord : TupleWithType<std::pair<double, double>, T> {};
-
-template <typename T>
-struct WithDist : TupleWithType<double, T> {};
-
-template <typename T>
-struct WithHash : TupleWithType<long long, T> {};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_COMMAND_OPTIONS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection.cpp
deleted file mode 100644
index f0a808827..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection.cpp
+++ /dev/null
@@ -1,494 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "connection.h"
-#include <cassert>
-#include <tuple>
-#include <algorithm>
-#include "reply.h"
-#include "command.h"
-#include "command_args.h"
-
-#ifdef _MSC_VER
-
-#include <winsock2.h>   // for `timeval` with MSVC compiler
-
-#endif
-
-namespace sw {
-
-namespace redis {
-
-ConnectionOptions::ConnectionOptions(const std::string &uri) :
-                                        ConnectionOptions(_parse_uri(uri)) {}
-
-ConnectionOptions ConnectionOptions::_parse_uri(const std::string &uri) const {
-    std::string type;
-    std::string auth;
-    std::string path;
-    std::tie(type, auth, path) = _split_uri(uri);
-
-    ConnectionOptions opts;
-
-    _set_auth_opts(auth, opts);
-
-    auto db = 0;
-    std::string parameter_string;
-    std::tie(path, db, parameter_string) = _split_path(path);
-
-    _parse_parameters(parameter_string, opts);
-
-    opts.db = db;
-
-    if (type == "tcp") {
-        _set_tcp_opts(path, opts);
-    } else if (type == "unix") {
-        _set_unix_opts(path, opts);
-    } else {
-        throw Error("invalid URI: invalid type");
-    }
-
-    return opts;
-}
-
-void ConnectionOptions::_parse_parameters(const std::string &parameter_string,
-                                            ConnectionOptions &opts) const {
-    auto parameters = _split(parameter_string, "&");
-    if (parameters.empty()) {
-        // No parameters
-        return;
-    }
-
-    for (const auto &parameter : parameters) {
-        auto kv_pair = _split(parameter, "=");
-        if (kv_pair.size() != 2) {
-            throw Error("invalid option: not a key-value pair: " + parameter);
-        }
-
-        const auto &key = kv_pair[0];
-        const auto &val = kv_pair[1];
-        _set_option(key, val, opts);
-    }
-}
-
-void ConnectionOptions::_set_option(const std::string &key,
-                                    const std::string &val,
-                                    ConnectionOptions &opts) const {
-    if (key == "keep_alive") {
-        opts.keep_alive = _parse_bool_option(val);
-    } else if (key == "connect_timeout") {
-        opts.connect_timeout = _parse_timeout_option(val);
-    } else if (key == "socket_timeout") {
-        opts.socket_timeout = _parse_timeout_option(val);
-    } else {
-        throw Error("unknown uri parameter");
-    }
-}
-
-bool ConnectionOptions::_parse_bool_option(const std::string &str) const {
-    if (str == "true") {
-        return true;
-    } else if (str == "false") {
-        return false;
-    } else {
-        throw Error("invalid uri parameter of bool type: " + str);
-    }
-}
-
-std::chrono::milliseconds ConnectionOptions::_parse_timeout_option(const std::string &str) const {
-    std::size_t timeout = 0;
-    std::string unit;
-    try {
-        std::size_t pos = 0;
-        timeout = std::stoul(str, &pos);
-        unit = str.substr(pos);
-    } catch (const std::exception &e) {
-        throw Error("invalid uri parameter of timeout type: " + str);
-    }
-
-    if (unit == "ms") {
-        return std::chrono::milliseconds(timeout);
-    } else if (unit == "s") {
-        return std::chrono::seconds(timeout);
-    } else if (unit == "m") {
-        return std::chrono::minutes(timeout);
-    } else {
-        throw Error("unknown timeout unit: " + unit);
-    }
-}
-
-std::vector<std::string> ConnectionOptions::_split(const std::string &str,
-                                                    const std::string &delimiter) const {
-    if (str.empty()) {
-        return {};
-    }
-
-    std::vector<std::string> fields;
-
-    if (delimiter.empty()) {
-        std::transform(str.begin(), str.end(), std::back_inserter(fields),
-                [](char c) { return std::string(1, c); });
-        return fields;
-    }
-
-    std::string::size_type pos = 0;
-    std::string::size_type idx = 0;
-    while (true) {
-        pos = str.find(delimiter, idx);
-        if (pos == std::string::npos) {
-            fields.push_back(str.substr(idx));
-            break;
-        }
-
-        fields.push_back(str.substr(idx, pos - idx));
-        idx = pos + delimiter.size();
-    }
-
-    return fields;
-}
-
-auto ConnectionOptions::_split_uri(const std::string &uri) const
-    -> std::tuple<std::string, std::string, std::string> {
-    auto pos = uri.find("://");
-    if (pos == std::string::npos) {
-        throw Error("invalid URI: no scheme");
-    }
-
-    auto type = uri.substr(0, pos);
-
-    auto start = pos + 3;
-    pos = uri.find("@", start);
-    if (pos == std::string::npos) {
-        // No auth info.
-        return std::make_tuple(type, std::string{}, uri.substr(start));
-    }
-
-    auto auth = uri.substr(start, pos - start);
-
-    return std::make_tuple(type, auth, uri.substr(pos + 1));
-}
-
-auto ConnectionOptions::_split_path(const std::string &path) const
-    -> std::tuple<std::string, int, std::string> {
-    auto parameter_pos = path.rfind("?");
-    std::string parameter_string;
-    if (parameter_pos != std::string::npos) {
-        parameter_string = path.substr(parameter_pos + 1);
-    }
-
-    auto pos = path.rfind("/");
-    if (pos != std::string::npos) {
-        // Might specified a db number.
-        try {
-            auto db = std::stoi(path.substr(pos + 1));
-
-            return std::make_tuple(path.substr(0, pos), db, parameter_string);
-        } catch (const std::exception &) {
-            // Not a db number, and it might be a path to unix domain socket.
-        }
-    }
-
-    // No db number specified, and use default one, i.e. 0.
-    return std::make_tuple(path.substr(0, parameter_pos), 0, parameter_string);
-}
-
-void ConnectionOptions::_set_auth_opts(const std::string &auth, ConnectionOptions &opts) const {
-    if (auth.empty()) {
-        // No auth info.
-        return;
-    }
-
-    auto pos = auth.find(":");
-    if (pos == std::string::npos) {
-        // No user name.
-        opts.password = auth;
-    } else {
-        opts.user = auth.substr(0, pos);
-        opts.password = auth.substr(pos + 1);
-    }
-}
-
-void ConnectionOptions::_set_tcp_opts(const std::string &path, ConnectionOptions &opts) const {
-    opts.type = ConnectionType::TCP;
-
-    auto pos = path.find(":");
-    if (pos != std::string::npos) {
-        // Port number specified.
-        try {
-            opts.port = std::stoi(path.substr(pos + 1));
-        } catch (const std::exception &) {
-            throw Error("invalid URI: invalid port");
-        }
-    } // else use default port, i.e. 6379.
-
-    opts.host = path.substr(0, pos);
-}
-
-void ConnectionOptions::_set_unix_opts(const std::string &path, ConnectionOptions &opts) const {
-    opts.type = ConnectionType::UNIX;
-    opts.path = path;
-}
-
-class Connection::Connector {
-public:
-    explicit Connector(const ConnectionOptions &opts);
-
-    ContextUPtr connect() const;
-
-private:
-    ContextUPtr _connect() const;
-
-    redisContext* _connect_tcp() const;
-
-    redisContext* _connect_unix() const;
-
-    void _set_socket_timeout(redisContext &ctx) const;
-
-    void _enable_keep_alive(redisContext &ctx) const;
-
-    timeval _to_timeval(const std::chrono::milliseconds &dur) const;
-
-    const ConnectionOptions &_opts;
-};
-
-Connection::Connector::Connector(const ConnectionOptions &opts) : _opts(opts) {}
-
-Connection::ContextUPtr Connection::Connector::connect() const {
-    auto ctx = _connect();
-
-    assert(ctx);
-
-    if (ctx->err != REDIS_OK) {
-        throw_error(*ctx, "Failed to connect to Redis");
-    }
-
-    _set_socket_timeout(*ctx);
-
-    _enable_keep_alive(*ctx);
-
-    return ctx;
-}
-
-Connection::ContextUPtr Connection::Connector::_connect() const {
-    redisContext *context = nullptr;
-    switch (_opts.type) {
-    case ConnectionType::TCP:
-        context = _connect_tcp();
-        break;
-
-    case ConnectionType::UNIX:
-        context = _connect_unix();
-        break;
-
-    default:
-        // Never goes here.
-        throw Error("Unknown connection type");
-    }
-
-    if (context == nullptr) {
-        throw Error("Failed to allocate memory for connection.");
-    }
-
-    return ContextUPtr(context);
-}
-
-redisContext* Connection::Connector::_connect_tcp() const {
-    if (_opts.connect_timeout > std::chrono::milliseconds(0)) {
-        return redisConnectWithTimeout(_opts.host.c_str(),
-                    _opts.port,
-                    _to_timeval(_opts.connect_timeout));
-    } else {
-        return redisConnect(_opts.host.c_str(), _opts.port);
-    }
-}
-
-redisContext* Connection::Connector::_connect_unix() const {
-    if (_opts.connect_timeout > std::chrono::milliseconds(0)) {
-        return redisConnectUnixWithTimeout(
-                    _opts.path.c_str(),
-                    _to_timeval(_opts.connect_timeout));
-    } else {
-        return redisConnectUnix(_opts.path.c_str());
-    }
-}
-
-void Connection::Connector::_set_socket_timeout(redisContext &ctx) const {
-    if (_opts.socket_timeout <= std::chrono::milliseconds(0)) {
-        return;
-    }
-
-    if (redisSetTimeout(&ctx, _to_timeval(_opts.socket_timeout)) != REDIS_OK) {
-        throw_error(ctx, "Failed to set socket timeout");
-    }
-}
-
-void Connection::Connector::_enable_keep_alive(redisContext &ctx) const {
-    if (!_opts.keep_alive) {
-        return;
-    }
-
-    if (redisEnableKeepAlive(&ctx) != REDIS_OK) {
-        throw_error(ctx, "Failed to enable keep alive option");
-    }
-}
-
-timeval Connection::Connector::_to_timeval(const std::chrono::milliseconds &dur) const {
-    auto sec = std::chrono::duration_cast<std::chrono::seconds>(dur);
-    auto msec = std::chrono::duration_cast<std::chrono::microseconds>(dur - sec);
-
-    timeval t;
-    t.tv_sec = sec.count();
-    t.tv_usec = msec.count();
-    return t;
-}
-
-void swap(Connection &lhs, Connection &rhs) noexcept {
-    std::swap(lhs._ctx, rhs._ctx);
-    std::swap(lhs._create_time, rhs._create_time);
-    std::swap(lhs._opts, rhs._opts);
-}
-
-Connection::Connection(const ConnectionOptions &opts) :
-            _ctx(Connector(opts).connect()),
-            _create_time(std::chrono::steady_clock::now()),
-            _last_active(std::chrono::steady_clock::now()),
-            _opts(opts) {
-    assert(_ctx && !broken());
-
-    const auto &tls_opts = opts.tls;
-    // If not compiled with TLS, TLS is always disabled.
-    if (tls::enabled(tls_opts)) {
-        _tls_ctx = tls::secure_connection(*_ctx, tls_opts);
-    }
-
-    _set_options();
-}
-
-void Connection::reconnect() {
-    Connection connection(_opts);
-
-    swap(*this, connection);
-}
-
-void Connection::send(int argc, const char **argv, const std::size_t *argv_len) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommandArgv(ctx,
-                                argc,
-                                argv,
-                                argv_len) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-void Connection::send(CmdArgs &args) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommandArgv(ctx,
-                                args.size(),
-                                args.argv(),
-                                args.argv_len()) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-ReplyUPtr Connection::recv(bool handle_error_reply) {
-    auto *ctx = _context();
-
-    assert(ctx != nullptr);
-
-    void *r = nullptr;
-    if (redisGetReply(ctx, &r) != REDIS_OK) {
-        throw_error(*ctx, "Failed to get reply");
-    }
-
-    assert(!broken() && r != nullptr);
-
-    auto reply = ReplyUPtr(static_cast<redisReply*>(r));
-
-    if (handle_error_reply && reply::is_error(*reply)) {
-        throw_error(*reply);
-    }
-
-    return reply;
-}
-
-void Connection::_set_options() {
-    _auth();
-
-    _select_db();
-
-    if (_opts.readonly) {
-        _enable_readonly();
-    }
-}
-
-void Connection::_enable_readonly() {
-    send("READONLY");
-
-    auto reply = recv();
-
-    assert(reply);
-
-    reply::parse<void>(*reply);
-}
-
-void Connection::_auth() {
-    const std::string DEFAULT_USER = "default";
-
-    if (_opts.user == DEFAULT_USER && _opts.password.empty()) {
-        return;
-    }
-
-    if (_opts.user == DEFAULT_USER) {
-        cmd::auth(*this, _opts.password);
-    } else {
-        // Redis 6.0 or latter
-        cmd::auth(*this, _opts.user, _opts.password);
-    }
-
-    auto reply = recv();
-
-    assert(reply);
-
-    reply::parse<void>(*reply);
-}
-
-void Connection::_select_db() {
-    if (_opts.db == 0) {
-        return;
-    }
-
-    cmd::select(*this, _opts.db);
-
-    auto reply = recv();
-
-    assert(reply);
-
-    reply::parse<void>(*reply);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection.h
deleted file mode 100644
index 340375561..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_H
-
-#include <cerrno>
-#include <cstring>
-#include <memory>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <chrono>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "reply.h"
-#include "utils.h"
-#include "tls.h"
-
-namespace sw {
-
-namespace redis {
-
-enum class ConnectionType {
-    TCP = 0,
-    UNIX
-};
-
-struct ConnectionOptions {
-public:
-    ConnectionOptions() = default;
-
-    explicit ConnectionOptions(const std::string &uri);
-
-    ConnectionOptions(const ConnectionOptions &) = default;
-    ConnectionOptions& operator=(const ConnectionOptions &) = default;
-
-    ConnectionOptions(ConnectionOptions &&) = default;
-    ConnectionOptions& operator=(ConnectionOptions &&) = default;
-
-    ~ConnectionOptions() = default;
-
-    ConnectionType type = ConnectionType::TCP;
-
-    std::string host;
-
-    int port = 6379;
-
-    std::string path;
-
-    std::string user = "default";
-
-    std::string password;
-
-    int db = 0;
-
-    bool keep_alive = false;
-
-    std::chrono::milliseconds connect_timeout{0};
-
-    std::chrono::milliseconds socket_timeout{0};
-
-    tls::TlsOptions tls;
-
-    // `readonly` is only used for reading from a slave node in Redis Cluster mode.
-    // Client code should never manually set/get it. This member might be removed in the future.
-    bool readonly = false;
-
-private:
-    ConnectionOptions _parse_uri(const std::string &uri) const;
-
-    auto _split_uri(const std::string &uri) const
-        -> std::tuple<std::string, std::string, std::string>;
-
-    auto _split_path(const std::string &path) const
-        -> std::tuple<std::string, int, std::string>;
-
-    void _parse_parameters(const std::string &parameter_string,
-                            ConnectionOptions &opts) const;
-
-    void _set_option(const std::string &key, const std::string &val, ConnectionOptions &opts) const;
-
-    bool _parse_bool_option(const std::string &str) const;
-
-    std::chrono::milliseconds _parse_timeout_option(const std::string &str) const;
-
-    std::vector<std::string> _split(const std::string &str, const std::string &delimiter) const;
-
-    void _set_auth_opts(const std::string &auth, ConnectionOptions &opts) const;
-
-    void _set_tcp_opts(const std::string &path, ConnectionOptions &opts) const;
-
-    void _set_unix_opts(const std::string &path, ConnectionOptions &opts) const;
-};
-
-class CmdArgs;
-
-class Connection {
-public:
-    explicit Connection(const ConnectionOptions &opts);
-
-    Connection(const Connection &) = delete;
-    Connection& operator=(const Connection &) = delete;
-
-    Connection(Connection &&) = default;
-    Connection& operator=(Connection &&) = default;
-
-    ~Connection() = default;
-
-    // Check if the connection is broken. Client needs to do this check
-    // before sending some command to the connection. If it's broken,
-    // client needs to reconnect it.
-    bool broken() const noexcept {
-        return _ctx->err != REDIS_OK;
-    }
-
-    void reset() noexcept {
-        _ctx->err = 0;
-    }
-
-    void invalidate() noexcept {
-        _ctx->err = REDIS_ERR;
-    }
-
-    void reconnect();
-
-    auto create_time() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _create_time;
-    }
-
-    auto last_active() const
-        -> std::chrono::time_point<std::chrono::steady_clock> {
-        return _last_active;
-    }
-
-    template <typename ...Args>
-    void send(const char *format, Args &&...args);
-
-    void send(int argc, const char **argv, const std::size_t *argv_len);
-
-    void send(CmdArgs &args);
-
-    ReplyUPtr recv(bool handle_error_reply = true);
-
-    const ConnectionOptions& options() const {
-        return _opts;
-    }
-
-    friend void swap(Connection &lhs, Connection &rhs) noexcept;
-
-private:
-    class Connector;
-
-    struct ContextDeleter {
-        void operator()(redisContext *context) const {
-            if (context != nullptr) {
-                redisFree(context);
-            }
-        };
-    };
-
-    using ContextUPtr = std::unique_ptr<redisContext, ContextDeleter>;
-
-    void _set_options();
-
-    void _auth();
-
-    void _select_db();
-
-    void _enable_readonly();
-
-    redisContext* _context();
-
-    ContextUPtr _ctx;
-
-    // The time that the connection is created.
-    std::chrono::time_point<std::chrono::steady_clock> _create_time{};
-
-    // The time that the connection is created or the time that
-    // the connection is recently used, i.e. `_context()` is called.
-    std::chrono::time_point<std::chrono::steady_clock> _last_active{};
-
-    ConnectionOptions _opts;
-
-    // TODO: define _tls_ctx before _ctx
-    tls::TlsContextUPtr _tls_ctx;
-};
-
-using ConnectionSPtr = std::shared_ptr<Connection>;
-
-enum class Role {
-    MASTER,
-    SLAVE
-};
-
-// Inline implementaions.
-
-template <typename ...Args>
-inline void Connection::send(const char *format, Args &&...args) {
-    auto ctx = _context();
-
-    assert(ctx != nullptr);
-
-    if (redisAppendCommand(ctx,
-                format,
-                std::forward<Args>(args)...) != REDIS_OK) {
-        throw_error(*ctx, "Failed to send command");
-    }
-
-    assert(!broken());
-}
-
-inline redisContext* Connection::_context() {
-    _last_active = std::chrono::steady_clock::now();
-
-    return _ctx.get();
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection_pool.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection_pool.cpp
deleted file mode 100644
index 7049f5fc8..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection_pool.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "connection_pool.h"
-#include <cassert>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-ConnectionPool::ConnectionPool(const ConnectionPoolOptions &pool_opts,
-        const ConnectionOptions &connection_opts) :
-            _opts(connection_opts),
-            _pool_opts(pool_opts) {
-    if (_pool_opts.size == 0) {
-        throw Error("CANNOT create an empty pool");
-    }
-
-    // Lazily create connections.
-}
-
-ConnectionPool::ConnectionPool(SimpleSentinel sentinel,
-                                const ConnectionPoolOptions &pool_opts,
-                                const ConnectionOptions &connection_opts) :
-                                    _opts(connection_opts),
-                                    _pool_opts(pool_opts),
-                                    _sentinel(std::move(sentinel)) {
-    // In this case, the connection must be of TCP type.
-    if (_opts.type != ConnectionType::TCP) {
-        throw Error("Sentinel only supports TCP connection");
-    }
-
-    if (_opts.connect_timeout == std::chrono::milliseconds(0)
-            || _opts.socket_timeout == std::chrono::milliseconds(0)) {
-        throw Error("With sentinel, connection timeout and socket timeout cannot be 0");
-    }
-
-    // Cleanup connection options.
-    _update_connection_opts("", -1);
-
-    assert(_sentinel);
-}
-
-ConnectionPool::ConnectionPool(ConnectionPool &&that) {
-    std::lock_guard<std::mutex> lock(that._mutex);
-
-    _move(std::move(that));
-}
-
-ConnectionPool& ConnectionPool::operator=(ConnectionPool &&that) {
-    if (this != &that) {
-        std::lock(_mutex, that._mutex);
-        std::lock_guard<std::mutex> lock_this(_mutex, std::adopt_lock);
-        std::lock_guard<std::mutex> lock_that(that._mutex, std::adopt_lock);
-
-        _move(std::move(that));
-    }
-
-    return *this;
-}
-
-Connection ConnectionPool::fetch() {
-    std::unique_lock<std::mutex> lock(_mutex);
-
-    if (_pool.empty()) {
-        if (_used_connections == _pool_opts.size) {
-            _wait_for_connection(lock);
-        } else {
-            // Lazily create a new connection.
-            auto connection = _create();
-
-            ++_used_connections;
-
-            return connection;
-        }
-    }
-
-    // _pool is NOT empty.
-    auto connection = _fetch();
-
-    auto connection_lifetime = _pool_opts.connection_lifetime;
-    auto connection_idle_time = _pool_opts.connection_idle_time;
-
-    if (_sentinel) {
-        auto opts = _opts;
-        auto role_changed = _role_changed(connection.options());
-        auto sentinel = _sentinel;
-
-        lock.unlock();
-
-        if (role_changed || _need_reconnect(connection, connection_lifetime, connection_idle_time)) {
-            try {
-                connection = _create(sentinel, opts, false);
-            } catch (const Error &e) {
-                // Failed to reconnect, return it to the pool, and retry latter.
-                release(std::move(connection));
-                throw;
-            }
-        }
-
-        return connection;
-    }
-
-    lock.unlock();
-
-    if (_need_reconnect(connection, connection_lifetime, connection_idle_time)) {
-        try {
-            connection.reconnect();
-        } catch (const Error &e) {
-            // Failed to reconnect, return it to the pool, and retry latter.
-            release(std::move(connection));
-            throw;
-        }
-    }
-
-    return connection;
-}
-
-ConnectionOptions ConnectionPool::connection_options() {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    return _opts;
-}
-
-void ConnectionPool::release(Connection connection) {
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        _pool.push_back(std::move(connection));
-    }
-
-    _cv.notify_one();
-}
-
-Connection ConnectionPool::create() {
-    std::unique_lock<std::mutex> lock(_mutex);
-
-    auto opts = _opts;
-
-    if (_sentinel) {
-        auto sentinel = _sentinel;
-
-        lock.unlock();
-
-        return _create(sentinel, opts, false);
-    } else {
-        lock.unlock();
-
-        return Connection(opts);
-    }
-}
-
-ConnectionPool ConnectionPool::clone() {
-    std::unique_lock<std::mutex> lock(_mutex);
-
-    auto opts = _opts;
-    auto pool_opts = _pool_opts;
-
-    if (_sentinel) {
-        auto sentinel = _sentinel;
-
-        lock.unlock();
-
-        return ConnectionPool(sentinel, pool_opts, opts);
-    } else {
-        lock.unlock();
-
-        return ConnectionPool(pool_opts, opts);
-    }
-}
-
-void ConnectionPool::_move(ConnectionPool &&that) {
-    _opts = std::move(that._opts);
-    _pool_opts = std::move(that._pool_opts);
-    _pool = std::move(that._pool);
-    _used_connections = that._used_connections;
-    _sentinel = std::move(that._sentinel);
-}
-
-Connection ConnectionPool::_create() {
-    if (_sentinel) {
-        // Get Redis host and port info from sentinel.
-        return _create(_sentinel, _opts, true);
-    }
-
-    return Connection(_opts);
-}
-
-Connection ConnectionPool::_create(SimpleSentinel &sentinel,
-                                    const ConnectionOptions &opts,
-                                    bool locked) {
-    try {
-        auto connection = sentinel.create(opts);
-
-        std::unique_lock<std::mutex> lock(_mutex, std::defer_lock);
-        if (!locked) {
-            lock.lock();
-        }
-
-        const auto &connection_opts = connection.options();
-        if (_role_changed(connection_opts)) {
-            // Master/Slave has been changed, reconnect all connections.
-            _update_connection_opts(connection_opts.host, connection_opts.port);
-        }
-
-        return connection;
-    } catch (const StopIterError &e) {
-        throw Error("Failed to create connection with sentinel");
-    }
-}
-
-Connection ConnectionPool::_fetch() {
-    assert(!_pool.empty());
-
-    auto connection = std::move(_pool.front());
-    _pool.pop_front();
-
-    return connection;
-}
-
-void ConnectionPool::_wait_for_connection(std::unique_lock<std::mutex> &lock) {
-    auto timeout = _pool_opts.wait_timeout;
-    if (timeout > std::chrono::milliseconds(0)) {
-        // Wait until _pool is no longer empty or timeout.
-        if (!_cv.wait_for(lock,
-                    timeout,
-                    [this] { return !(this->_pool).empty(); })) {
-            throw Error("Failed to fetch a connection in "
-                    + std::to_string(timeout.count()) + " milliseconds");
-        }
-    } else {
-        // Wait forever.
-        _cv.wait(lock, [this] { return !(this->_pool).empty(); });
-    }
-}
-
-bool ConnectionPool::_need_reconnect(const Connection &connection,
-                                    const std::chrono::milliseconds &connection_lifetime,
-                                    const std::chrono::milliseconds &connection_idle_time) const {
-    if (connection.broken()) {
-        return true;
-    }
-
-    auto now = std::chrono::steady_clock::now();
-    if (connection_lifetime > std::chrono::milliseconds(0)) {
-        if (now - connection.create_time() > connection_lifetime) {
-            return true;
-        }
-    }
-
-    if (connection_idle_time > std::chrono::milliseconds(0)) {
-        if (now - connection.last_active() > connection_idle_time) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection_pool.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection_pool.h
deleted file mode 100644
index 30ba5daa2..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/connection_pool.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-#define SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
-
-#include <cassert>
-#include <chrono>
-#include <mutex>
-#include <memory>
-#include <condition_variable>
-#include <deque>
-#include "connection.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ConnectionPoolOptions {
-    // Max number of connections, including both in-use and idle ones.
-    std::size_t size = 1;
-
-    // Max time to wait for a connection. 0ms means client waits forever.
-    std::chrono::milliseconds wait_timeout{0};
-
-    // Max lifetime of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_lifetime{0};
-
-    // Max idle time of a connection. 0ms means we never expire the connection.
-    std::chrono::milliseconds connection_idle_time{0};
-};
-
-class ConnectionPool {
-public:
-    ConnectionPool(const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool(SimpleSentinel sentinel,
-                    const ConnectionPoolOptions &pool_opts,
-                    const ConnectionOptions &connection_opts);
-
-    ConnectionPool() = default;
-
-    ConnectionPool(ConnectionPool &&that);
-    ConnectionPool& operator=(ConnectionPool &&that);
-
-    ConnectionPool(const ConnectionPool &) = delete;
-    ConnectionPool& operator=(const ConnectionPool &) = delete;
-
-    ~ConnectionPool() = default;
-
-    // Fetch a connection from pool.
-    Connection fetch();
-
-    ConnectionOptions connection_options();
-
-    void release(Connection connection);
-
-    // Create a new connection.
-    Connection create();
-
-    ConnectionPool clone();
-
-private:
-    void _move(ConnectionPool &&that);
-
-    // NOT thread-safe
-    Connection _create();
-
-    Connection _create(SimpleSentinel &sentinel, const ConnectionOptions &opts, bool locked);
-
-    Connection _fetch();
-
-    void _wait_for_connection(std::unique_lock<std::mutex> &lock);
-
-    bool _need_reconnect(const Connection &connection,
-                            const std::chrono::milliseconds &connection_lifetime,
-                            const std::chrono::milliseconds &connection_idle_time) const;
-
-    void _update_connection_opts(const std::string &host, int port) {
-        _opts.host = host;
-        _opts.port = port;
-    }
-
-    bool _role_changed(const ConnectionOptions &opts) const {
-        return opts.port != _opts.port || opts.host != _opts.host;
-    }
-
-    ConnectionOptions _opts;
-
-    ConnectionPoolOptions _pool_opts;
-
-    std::deque<Connection> _pool;
-
-    std::size_t _used_connections = 0;
-
-    std::mutex _mutex;
-
-    std::condition_variable _cv;
-
-    SimpleSentinel _sentinel;
-};
-
-using ConnectionPoolSPtr = std::shared_ptr<ConnectionPool>;
-
-class SafeConnection {
-public:
-    explicit SafeConnection(ConnectionPool &pool) : _pool(pool), _connection(_pool.fetch()) {
-        assert(!_connection.broken());
-    }
-
-    SafeConnection(const SafeConnection &) = delete;
-    SafeConnection& operator=(const SafeConnection &) = delete;
-
-    SafeConnection(SafeConnection &&) = delete;
-    SafeConnection& operator=(SafeConnection &&) = delete;
-
-    ~SafeConnection() {
-        _pool.release(std::move(_connection));
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPool &_pool;
-    Connection _connection;
-};
-
-// NOTE: This class is similar to `SafeConnection`.
-// The difference is that `SafeConnection` tries to avoid copying a std::shared_ptr.
-class GuardedConnection {
-public:
-    explicit GuardedConnection(const ConnectionPoolSPtr &pool) : _pool(pool),
-                                                        _connection(_pool->fetch()) {
-        assert(!_connection.broken());
-    }
-
-    GuardedConnection(const GuardedConnection &) = delete;
-    GuardedConnection& operator=(const GuardedConnection &) = delete;
-
-    GuardedConnection(GuardedConnection &&) = default;
-    GuardedConnection& operator=(GuardedConnection &&) = default;
-
-    ~GuardedConnection() {
-        // If `GuardedConnection` has been moved, `_pool` will be nullptr.
-        if (_pool) {
-            _pool->release(std::move(_connection));
-        }
-    }
-
-    Connection& connection() {
-        return _connection;
-    }
-
-private:
-    ConnectionPoolSPtr _pool;
-    Connection _connection;
-};
-
-using GuardedConnectionSPtr = std::shared_ptr<GuardedConnection>;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CONNECTION_POOL_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/crc16.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/crc16.cpp
deleted file mode 100644
index c94a08d30..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/crc16.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2001-2010 Georges Menie (www.menie.org)
- * Copyright 2010-2012 Salvatore Sanfilippo (adapted to Redis coding style)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the University of California, Berkeley nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* CRC16 implementation according to CCITT standards.
- *
- * Note by @antirez: this is actually the XMODEM CRC 16 algorithm, using the
- * following parameters:
- *
- * Name                       : "XMODEM", also known as "ZMODEM", "CRC-16/ACORN"
- * Width                      : 16 bit
- * Poly                       : 1021 (That is actually x^16 + x^12 + x^5 + 1)
- * Initialization             : 0000
- * Reflect Input byte         : False
- * Reflect Output CRC         : False
- * Xor constant to output CRC : 0000
- * Output for "123456789"     : 31C3
- */
-
-#include <cstdint>
-
-namespace sw {
-
-namespace redis {
-
-static const uint16_t crc16tab[256]= {
-    0x0000,0x1021,0x2042,0x3063,0x4084,0x50a5,0x60c6,0x70e7,
-    0x8108,0x9129,0xa14a,0xb16b,0xc18c,0xd1ad,0xe1ce,0xf1ef,
-    0x1231,0x0210,0x3273,0x2252,0x52b5,0x4294,0x72f7,0x62d6,
-    0x9339,0x8318,0xb37b,0xa35a,0xd3bd,0xc39c,0xf3ff,0xe3de,
-    0x2462,0x3443,0x0420,0x1401,0x64e6,0x74c7,0x44a4,0x5485,
-    0xa56a,0xb54b,0x8528,0x9509,0xe5ee,0xf5cf,0xc5ac,0xd58d,
-    0x3653,0x2672,0x1611,0x0630,0x76d7,0x66f6,0x5695,0x46b4,
-    0xb75b,0xa77a,0x9719,0x8738,0xf7df,0xe7fe,0xd79d,0xc7bc,
-    0x48c4,0x58e5,0x6886,0x78a7,0x0840,0x1861,0x2802,0x3823,
-    0xc9cc,0xd9ed,0xe98e,0xf9af,0x8948,0x9969,0xa90a,0xb92b,
-    0x5af5,0x4ad4,0x7ab7,0x6a96,0x1a71,0x0a50,0x3a33,0x2a12,
-    0xdbfd,0xcbdc,0xfbbf,0xeb9e,0x9b79,0x8b58,0xbb3b,0xab1a,
-    0x6ca6,0x7c87,0x4ce4,0x5cc5,0x2c22,0x3c03,0x0c60,0x1c41,
-    0xedae,0xfd8f,0xcdec,0xddcd,0xad2a,0xbd0b,0x8d68,0x9d49,
-    0x7e97,0x6eb6,0x5ed5,0x4ef4,0x3e13,0x2e32,0x1e51,0x0e70,
-    0xff9f,0xefbe,0xdfdd,0xcffc,0xbf1b,0xaf3a,0x9f59,0x8f78,
-    0x9188,0x81a9,0xb1ca,0xa1eb,0xd10c,0xc12d,0xf14e,0xe16f,
-    0x1080,0x00a1,0x30c2,0x20e3,0x5004,0x4025,0x7046,0x6067,
-    0x83b9,0x9398,0xa3fb,0xb3da,0xc33d,0xd31c,0xe37f,0xf35e,
-    0x02b1,0x1290,0x22f3,0x32d2,0x4235,0x5214,0x6277,0x7256,
-    0xb5ea,0xa5cb,0x95a8,0x8589,0xf56e,0xe54f,0xd52c,0xc50d,
-    0x34e2,0x24c3,0x14a0,0x0481,0x7466,0x6447,0x5424,0x4405,
-    0xa7db,0xb7fa,0x8799,0x97b8,0xe75f,0xf77e,0xc71d,0xd73c,
-    0x26d3,0x36f2,0x0691,0x16b0,0x6657,0x7676,0x4615,0x5634,
-    0xd94c,0xc96d,0xf90e,0xe92f,0x99c8,0x89e9,0xb98a,0xa9ab,
-    0x5844,0x4865,0x7806,0x6827,0x18c0,0x08e1,0x3882,0x28a3,
-    0xcb7d,0xdb5c,0xeb3f,0xfb1e,0x8bf9,0x9bd8,0xabbb,0xbb9a,
-    0x4a75,0x5a54,0x6a37,0x7a16,0x0af1,0x1ad0,0x2ab3,0x3a92,
-    0xfd2e,0xed0f,0xdd6c,0xcd4d,0xbdaa,0xad8b,0x9de8,0x8dc9,
-    0x7c26,0x6c07,0x5c64,0x4c45,0x3ca2,0x2c83,0x1ce0,0x0cc1,
-    0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8,
-    0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0
-};
-
-uint16_t crc16(const char *buf, int len) {
-    int counter;
-    uint16_t crc = 0;
-    for (counter = 0; counter < len; counter++)
-            crc = (crc<<8) ^ crc16tab[((crc>>8) ^ *buf++)&0x00FF];
-    return crc;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/cxx11/cxx_utils.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/cxx11/cxx_utils.h
deleted file mode 100644
index 6134a6503..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/cxx11/cxx_utils.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
-
-#include <string>
-#include <utility>
-
-namespace sw {
-
-namespace redis {
-
-// By now, not all compilers support std::string_view and std::optional,
-// so we make our own implementation.
-
-class StringView {
-public:
-    constexpr StringView() noexcept = default;
-
-    constexpr StringView(const char *data, std::size_t size) : _data(data), _size(size) {}
-
-    StringView(const char *data) : _data(data), _size(std::strlen(data)) {}
-
-    StringView(const std::string &str) : _data(str.data()), _size(str.size()) {}
-
-    constexpr StringView(const StringView &) noexcept = default;
-
-    StringView& operator=(const StringView &) noexcept = default;
-
-    constexpr const char* data() const noexcept {
-        return _data;
-    }
-
-    constexpr std::size_t size() const noexcept {
-        return _size;
-    }
-
-private:
-    const char *_data = nullptr;
-    std::size_t _size = 0;
-};
-
-template <typename T>
-class Optional {
-public:
-#if defined(_MSC_VER) && (_MSC_VER < 1910)
-    Optional() : _value() {}    // MSVC 2015 bug
-#else
-    Optional() = default;
-#endif
-
-    Optional(const Optional &) = default;
-    Optional& operator=(const Optional &) = default;
-
-    Optional(Optional &&) = default;
-    Optional& operator=(Optional &&) = default;
-
-    ~Optional() = default;
-
-    template <typename ...Args>
-    explicit Optional(Args &&...args) : _value(true, T(std::forward<Args>(args)...)) {}
-
-    explicit operator bool() const {
-        return _value.first;
-    }
-
-    T& value() {
-        return _value.second;
-    }
-
-    const T& value() const {
-        return _value.second;
-    }
-
-    T* operator->() {
-        return &(_value.second);
-    }
-
-    const T* operator->() const {
-        return &(_value.second);
-    }
-
-    T& operator*() {
-        return _value.second;
-    }
-
-    const T& operator*() const {
-        return _value.second;
-    }
-
-private:
-    std::pair<bool, T> _value;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/cxx17/cxx_utils.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/cxx17/cxx_utils.h
deleted file mode 100644
index dce51abe9..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/cxx17/cxx_utils.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
-
-#include <string_view>
-#include <optional>
-#include <variant>
-
-#define REDIS_PLUS_PLUS_HAS_OPTIONAL
-
-#define REDIS_PLUS_PLUS_HAS_VARIANT
-
-namespace sw {
-
-namespace redis {
-
-using StringView = std::string_view;
-
-template <typename T>
-using Optional = std::optional<T>;
-
-template <typename ...Args>
-using Variant = std::variant<Args...>;
-
-using Monostate = std::monostate;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_CXX_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/errors.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/errors.cpp
deleted file mode 100644
index 23d2c3874..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/errors.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "errors.h"
-#include <cassert>
-#include <cerrno>
-#include <unordered_map>
-#include <tuple>
-#include "shards.h"
-
-namespace {
-
-using namespace sw::redis;
-
-std::pair<ReplyErrorType, std::string> parse_error(const std::string &msg);
-
-std::unordered_map<std::string, ReplyErrorType> error_map = {
-    {"MOVED", ReplyErrorType::MOVED},
-    {"ASK", ReplyErrorType::ASK}
-};
-
-}
-
-namespace sw {
-
-namespace redis {
-
-void throw_error(const redisContext &context, const std::string &err_info) {
-    auto err_code = context.err;
-    const auto *err_str = context.errstr;
-    if (err_str == nullptr) {
-        throw Error(err_info + ": null error message: " + std::to_string(err_code));
-    }
-
-    auto err_msg = err_info + ": " + err_str;
-
-    switch (err_code) {
-    case REDIS_ERR_IO:
-        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ETIMEDOUT) {
-            throw TimeoutError(err_msg);
-        } else {
-            throw IoError(err_msg);
-        }
-        break;
-
-    case REDIS_ERR_EOF:
-        throw ClosedError(err_msg);
-        break;
-
-    case REDIS_ERR_PROTOCOL:
-        throw ProtoError(err_msg);
-        break;
-
-    case REDIS_ERR_OOM:
-        throw OomError(err_msg);
-        break;
-
-    case REDIS_ERR_OTHER:
-        throw Error(err_msg);
-        break;
-
-#ifdef REDIS_ERR_TIMEOUT
-    case REDIS_ERR_TIMEOUT:
-        throw TimeoutError(err_msg);
-        break;
-#endif
-
-    default:
-        throw Error("unknown error code: " + err_msg);
-    }
-}
-
-void throw_error(const redisReply &reply) {
-    assert(reply.type == REDIS_REPLY_ERROR);
-
-    if (reply.str == nullptr) {
-        throw Error("Null error reply");
-    }
-
-    auto err_str = std::string(reply.str, reply.len);
-
-    auto err_type = ReplyErrorType::ERR;
-    std::string err_msg;
-    std::tie(err_type, err_msg) = parse_error(err_str);
-
-    switch (err_type) {
-    case ReplyErrorType::MOVED:
-        throw MovedError(err_msg);
-        break;
-
-    case ReplyErrorType::ASK:
-        throw AskError(err_msg);
-        break;
-
-    default:
-        throw ReplyError(err_str);
-        break;
-    }
-}
-
-}
-
-}
-
-namespace {
-
-using namespace sw::redis;
-
-std::pair<ReplyErrorType, std::string> parse_error(const std::string &err) {
-    // The error contains an Error Prefix, and an optional error message.
-    auto idx = err.find_first_of(" \n");
-
-    if (idx == std::string::npos) {
-        throw ProtoError("No Error Prefix: " + err);
-    }
-
-    auto err_prefix = err.substr(0, idx);
-    auto err_type = ReplyErrorType::ERR;
-
-    auto iter = error_map.find(err_prefix);
-    if (iter != error_map.end()) {
-        // Specific error.
-        err_type = iter->second;
-    } // else Generic error.
-
-    return {err_type, err.substr(idx + 1)};
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/errors.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/errors.h
deleted file mode 100644
index 7cc19d2f1..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/errors.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ERRORS_H
-#define SEWENEW_REDISPLUSPLUS_ERRORS_H
-
-#include <exception>
-#include <string>
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-enum ReplyErrorType {
-    ERR,
-    MOVED,
-    ASK
-};
-
-class Error : public std::exception {
-public:
-    explicit Error(const std::string &msg) : _msg(msg) {}
-
-    Error(const Error &) = default;
-    Error& operator=(const Error &) = default;
-
-    Error(Error &&) = default;
-    Error& operator=(Error &&) = default;
-
-    virtual ~Error() override = default;
-
-    virtual const char* what() const noexcept override {
-        return _msg.data();
-    }
-
-private:
-    std::string _msg;
-};
-
-class IoError : public Error {
-public:
-    explicit IoError(const std::string &msg) : Error(msg) {}
-
-    IoError(const IoError &) = default;
-    IoError& operator=(const IoError &) = default;
-
-    IoError(IoError &&) = default;
-    IoError& operator=(IoError &&) = default;
-
-    virtual ~IoError() override = default;
-};
-
-class TimeoutError : public IoError {
-public:
-    explicit TimeoutError(const std::string &msg) : IoError(msg) {}
-
-    TimeoutError(const TimeoutError &) = default;
-    TimeoutError& operator=(const TimeoutError &) = default;
-
-    TimeoutError(TimeoutError &&) = default;
-    TimeoutError& operator=(TimeoutError &&) = default;
-
-    virtual ~TimeoutError() override = default;
-};
-
-class ClosedError : public Error {
-public:
-    explicit ClosedError(const std::string &msg) : Error(msg) {}
-
-    ClosedError(const ClosedError &) = default;
-    ClosedError& operator=(const ClosedError &) = default;
-
-    ClosedError(ClosedError &&) = default;
-    ClosedError& operator=(ClosedError &&) = default;
-
-    virtual ~ClosedError() override = default;
-};
-
-class ProtoError : public Error {
-public:
-    explicit ProtoError(const std::string &msg) : Error(msg) {}
-
-    ProtoError(const ProtoError &) = default;
-    ProtoError& operator=(const ProtoError &) = default;
-
-    ProtoError(ProtoError &&) = default;
-    ProtoError& operator=(ProtoError &&) = default;
-
-    virtual ~ProtoError() override = default;
-};
-
-class OomError : public Error {
-public:
-    explicit OomError(const std::string &msg) : Error(msg) {}
-
-    OomError(const OomError &) = default;
-    OomError& operator=(const OomError &) = default;
-
-    OomError(OomError &&) = default;
-    OomError& operator=(OomError &&) = default;
-
-    virtual ~OomError() override = default;
-};
-
-class ReplyError : public Error {
-public:
-    explicit ReplyError(const std::string &msg) : Error(msg) {}
-
-    ReplyError(const ReplyError &) = default;
-    ReplyError& operator=(const ReplyError &) = default;
-
-    ReplyError(ReplyError &&) = default;
-    ReplyError& operator=(ReplyError &&) = default;
-
-    virtual ~ReplyError() override = default;
-};
-
-class WatchError : public Error {
-public:
-    explicit WatchError() : Error("Watched key has been modified") {}
-
-    WatchError(const WatchError &) = default;
-    WatchError& operator=(const WatchError &) = default;
-
-    WatchError(WatchError &&) = default;
-    WatchError& operator=(WatchError &&) = default;
-
-    virtual ~WatchError() override = default;
-};
-
-
-// MovedError and AskError are defined in shards.h
-class MovedError;
-
-class AskError;
-
-void throw_error(const redisContext &context, const std::string &err_info);
-
-void throw_error(const redisReply &reply);
-
-template <typename Input>
-inline void range_check(const char *cmd, Input first, Input last) {
-    if (first == last) {
-        throw Error(std::string(cmd) + ": no key specified");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ERRORS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/event_loop.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/event_loop.cpp
deleted file mode 100644
index 8e210b883..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/event_loop.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "event_loop.h"
-#include <cassert>
-#include <hiredis/adapters/libuv.h>
-#include "async_connection.h"
-
-namespace sw {
-
-namespace redis {
-
-EventLoop::EventLoop() {
-    _loop = _create_event_loop();
-
-    _event_async = _create_uv_async(_event_callback);
-    _stop_async = _create_uv_async(_stop_callback);
-
-    _loop_thread = std::thread([this]() { uv_run(this->_loop.get(), UV_RUN_DEFAULT); });
-}
-
-EventLoop::~EventLoop() {
-    _stop();
-
-    if (_loop_thread.joinable()) {
-        _loop_thread.join();
-    }
-}
-
-void EventLoop::unwatch(AsyncConnectionSPtr connection, std::exception_ptr err) {
-    assert(connection);
-
-    {
-        std::lock_guard<std::mutex> lock(_mtx);
-
-        _disconnect_events.emplace(std::move(connection), err);
-    }
-
-    _notify();
-}
-
-void EventLoop::add(AsyncConnectionSPtr event) {
-    assert(event);
-
-    {
-        std::lock_guard<std::mutex> lock(_mtx);
-
-        _command_events.insert(std::move(event));
-    }
-
-    _notify();
-}
-
-void EventLoop::watch(redisAsyncContext &ctx) {
-    if (redisLibuvAttach(&ctx, _loop.get()) != REDIS_OK) {
-        throw Error("failed to attach to event loop");
-    }
-
-    redisAsyncSetConnectCallback(&ctx, EventLoop::_connect_callback);
-    redisAsyncSetDisconnectCallback(&ctx, EventLoop::_disconnect_callback);
-}
-
-void EventLoop::_connect_callback(const redisAsyncContext *ctx, int status) {
-    assert(ctx != nullptr);
-
-    auto *context = static_cast<AsyncContext *>(ctx->data);
-    assert(context != nullptr);
-
-    auto &connection = context->connection;
-    std::exception_ptr err;
-    if (status != REDIS_OK) {
-        try {
-            throw_error(ctx->c, "failed to connect to server");
-        } catch (const Error &e) {
-            err = std::current_exception();
-        }
-    }
-
-    connection->connect_callback(err);
-}
-
-void EventLoop::_disconnect_callback(const redisAsyncContext *ctx, int status) {
-    assert(ctx != nullptr);
-
-    auto *context = static_cast<AsyncContext *>(ctx->data);
-    assert(context != nullptr);
-
-    if (!context->run_disconnect_callback) {
-        return;
-    }
-
-    auto &connection = context->connection;
-    std::exception_ptr err;
-    if (status != REDIS_OK) {
-        try {
-            throw_error(ctx->c, "failed to disconnect from server");
-        } catch (const Error &e) {
-            err = std::current_exception();
-        }
-    }
-
-    // TODO: if status == REDIS_OK, should we call the callback?
-    connection->disconnect_callback(err);
-}
-
-void EventLoop::_event_callback(uv_async_t *handle) {
-    assert(handle != nullptr);
-
-    auto *event_loop = static_cast<EventLoop*>(handle->data);
-    assert(event_loop != nullptr);
-
-    std::unordered_set<AsyncConnectionSPtr> command_events;
-    std::unordered_map<AsyncConnectionSPtr, std::exception_ptr> disconnect_events;
-    std::tie(command_events, disconnect_events) = event_loop->_get_events();
-
-    for (auto &connection : command_events) {
-        assert(connection);
-
-        connection->event_callback();
-    }
-
-    for (auto &ele : disconnect_events) {
-        auto &connection = ele.first;
-        auto &err = ele.second;
-
-        assert(connection);
-
-        if (!err) {
-            // Ensure all pending events have been sent before disconnecting.
-            connection->event_callback();
-        }
-
-        // If `event_callback` fails, connection will be release by event loop,
-        // and this `disconnect` call will do nothing.
-        connection->disconnect(err);
-    }
-}
-
-void EventLoop::_stop_callback(uv_async_t *handle) {
-    assert(handle != nullptr);
-
-    auto *event_loop = static_cast<EventLoop*>(handle->data);
-    assert(event_loop != nullptr);
-
-    std::unordered_set<AsyncConnectionSPtr> command_events;
-    std::unordered_map<AsyncConnectionSPtr, std::exception_ptr> disconnect_events;
-    std::tie(command_events, disconnect_events) = event_loop->_get_events();
-
-    event_loop->_clean_up(command_events, disconnect_events);
-
-    uv_stop(event_loop->_loop.get());
-}
-
-void EventLoop::_clean_up(std::unordered_set<AsyncConnectionSPtr> &command_events,
-        std::unordered_map<AsyncConnectionSPtr, std::exception_ptr> &disconnect_events) {
-    auto err = std::make_exception_ptr(Error("event loop is closing"));
-    for (auto &connection : command_events) {
-        assert(connection);
-
-        connection->disconnect(err);
-    }
-
-    for (auto &ele : disconnect_events) {
-        auto &connection = ele.first;
-        auto e = ele.second;
-        if (!e) {
-            e = err;
-        }
-
-        assert(connection);
-
-        connection->disconnect(e);
-    }
-}
-
-void EventLoop::LoopDeleter::operator()(uv_loop_t *loop) const {
-    if (loop == nullptr) {
-        return;
-    }
-
-    // How to correctly close an event loop:
-    // https://stackoverflow.com/questions/25615340/closing-libuv-handles-correctly
-    // TODO: do we need to call this? Since we always has 2 async_t handles.
-    if (uv_loop_close(loop) == 0) {
-        delete loop;
-
-        return;
-    }
-
-    uv_walk(loop,
-            [](uv_handle_t *handle, void *) {
-                if (handle != nullptr) {
-                    // We don't need to release handle's memory in close callback,
-                    // since we'll release the memory in EventLoop's destructor.
-                    uv_close(handle, nullptr);
-                }
-            },
-            nullptr);
-
-    // Ensure uv_walk's callback to be called.
-    uv_run(loop, UV_RUN_DEFAULT);
-
-    uv_loop_close(loop);
-
-    delete loop;
-}
-
-void EventLoop::_notify() {
-    assert(_event_async);
-
-    uv_async_send(_event_async.get());
-}
-
-void EventLoop::_stop() {
-    assert(_stop_async);
-
-    uv_async_send(_stop_async.get());
-}
-
-auto EventLoop::_get_events()
-    -> std::pair<std::unordered_set<AsyncConnectionSPtr>,
-                    std::unordered_map<AsyncConnectionSPtr, std::exception_ptr>> {
-    std::unordered_set<AsyncConnectionSPtr> command_events;
-    std::unordered_map<AsyncConnectionSPtr, std::exception_ptr> disconnect_events;
-    {
-        std::lock_guard<std::mutex> lock(_mtx);
-
-        command_events.swap(_command_events);
-        disconnect_events.swap(_disconnect_events);
-    }
-
-    return std::make_pair(std::move(command_events), std::move(disconnect_events));
-}
-
-EventLoop::UvAsyncUPtr EventLoop::_create_uv_async(AsyncCallback callback) {
-    auto uv_async = std::unique_ptr<uv_async_t>(new uv_async_t);
-    auto err = uv_async_init(_loop.get(), uv_async.get(), callback);
-    if (err != 0) {
-        throw Error("failed to initialize async: " + _err_msg(err));
-    }
-
-    uv_async->data = this;
-
-    return uv_async;
-}
-
-EventLoop::LoopUPtr EventLoop::_create_event_loop() const {
-    auto *loop = new uv_loop_t;
-    auto err = uv_loop_init(loop);
-    if (err != 0) {
-        delete loop;
-        throw Error("failed to initialize event loop: " + _err_msg(err));
-    }
-
-    return LoopUPtr(loop);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/event_loop.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/event_loop.h
deleted file mode 100644
index 7df87770a..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/event_loop.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_EVENT_LOOP_H
-#define SEWENEW_REDISPLUSPLUS_EVENT_LOOP_H
-
-#include <unordered_set>
-#include <unordered_map>
-#include <memory>
-#include <exception>
-#include <mutex>
-#include <thread>
-#include <uv.h>
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-class AsyncConnection;
-class AsyncEvent;
-
-class EventLoop {
-public:
-    EventLoop();
-
-    EventLoop(const EventLoop &) = delete;
-    EventLoop& operator=(const EventLoop &) = delete;
-
-    EventLoop(EventLoop &&that);
-
-    EventLoop& operator=(EventLoop &&that);
-
-    ~EventLoop();
-
-    void unwatch(std::shared_ptr<AsyncConnection> connection, std::exception_ptr err = nullptr);
-
-    void add(std::shared_ptr<AsyncConnection> event);
-
-    // Not thread safe. Only call it in callback functions.
-    void watch(redisAsyncContext &ctx);
-
-private:
-    static void _connect_callback(const redisAsyncContext *ctx, int status);
-
-    static void _disconnect_callback(const redisAsyncContext *ctx, int status);
-
-    static void _event_callback(uv_async_t *handle);
-
-    static void _stop_callback(uv_async_t *handle);
-
-    struct LoopDeleter {
-        void operator()(uv_loop_t *loop) const;
-    };
-
-    using LoopUPtr = std::unique_ptr<uv_loop_t, LoopDeleter>;
-
-    std::string _err_msg(int err) const {
-        return uv_strerror(err);
-    }
-
-    LoopUPtr _create_event_loop() const;
-
-    using UvAsyncUPtr = std::unique_ptr<uv_async_t>;
-
-    using AsyncCallback = void (*)(uv_async_t*);
-
-    UvAsyncUPtr _create_uv_async(AsyncCallback callback);
-
-    void _stop();
-
-    void _notify();
-
-    void _clean_up(std::unordered_set<std::shared_ptr<AsyncConnection>> &command_events,
-            std::unordered_map<std::shared_ptr<AsyncConnection>, std::exception_ptr> &disconnect_events);
-
-    auto _get_events()
-        -> std::pair<std::unordered_set<std::shared_ptr<AsyncConnection>>,
-            std::unordered_map<std::shared_ptr<AsyncConnection>, std::exception_ptr>>;
-
-    // We must define _event_async and _stop_async before _loop,
-    // because these memory can only be release after _loop's deleter
-    // has been called, i.e. the deleter will close these handles.
-    UvAsyncUPtr _event_async;
-
-    UvAsyncUPtr _stop_async;
-
-    std::thread _loop_thread;
-
-    std::mutex _mtx;
-
-    std::unordered_map<std::shared_ptr<AsyncConnection>, std::exception_ptr> _disconnect_events;
-
-    std::unordered_set<std::shared_ptr<AsyncConnection>> _command_events;
-
-    // _loop must be defined at last, since its destructor needs other data members.
-    LoopUPtr _loop;
-};
-
-using EventLoopSPtr = std::shared_ptr<EventLoop>;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_EVENT_LOOP_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/future/boost/async_utils.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/future/boost/async_utils.h
deleted file mode 100644
index 7445d5d0c..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/future/boost/async_utils.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_UTILS_H
-
-#define BOOST_THREAD_PROVIDES_FUTURE
-#define BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
-
-#include <boost/thread/future.hpp>
-
-namespace sw {
-
-namespace redis {
-
-template <typename T>
-using Future = boost::future<T>;
-
-template <typename T>
-using Promise = boost::promise<T>;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/future/std/async_utils.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/future/std/async_utils.h
deleted file mode 100644
index 0a5afedfe..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/future/std/async_utils.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2021 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_ASYNC_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_ASYNC_UTILS_H
-
-#include <future>
-
-namespace sw {
-
-namespace redis {
-
-template <typename T>
-using Future = std::future<T>;
-
-template <typename T>
-using Promise = std::promise<T>;
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_ASYNC_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/no_tls/tls.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/no_tls/tls.h
deleted file mode 100644
index 0f2303db7..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/no_tls/tls.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2020 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_NO_TLS_H
-#define SEWENEW_REDISPLUSPLUS_NO_TLS_H
-
-#include <hiredis/hiredis.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace tls {
-
-struct TlsOptions {};
-
-struct TlsContextUPtr {};
-
-inline TlsContextUPtr secure_connection(redisContext &/*ctx*/, const TlsOptions &/*opts*/) {
-    // Do nothing
-    return {};
-}
-
-inline bool enabled(const TlsOptions &/*opts*/) {
-    return false;
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_NO_TLS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/pipeline.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/pipeline.cpp
deleted file mode 100644
index 24fe9cace..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/pipeline.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "pipeline.h"
-
-namespace sw {
-
-namespace redis {
-
-std::vector<ReplyUPtr> PipelineImpl::exec(Connection &connection, std::size_t cmd_num) {
-    std::vector<ReplyUPtr> replies;
-    while (cmd_num > 0) {
-        replies.push_back(connection.recv(false));
-        --cmd_num;
-    }
-
-    return replies;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/pipeline.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/pipeline.h
deleted file mode 100644
index 52b01253f..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/pipeline.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_PIPELINE_H
-#define SEWENEW_REDISPLUSPLUS_PIPELINE_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-class PipelineImpl {
-public:
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args) {
-        assert(!connection.broken());
-
-        cmd(connection, std::forward<Args>(args)...);
-    }
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t /*cmd_num*/) {
-        // Reconnect to Redis to discard all commands.
-        connection.reconnect();
-    }
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_PIPELINE_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/queued_redis.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/queued_redis.h
deleted file mode 100644
index e663c7423..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/queued_redis.h
+++ /dev/null
@@ -1,2013 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
-
-#include <cassert>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <vector>
-#include "connection.h"
-#include "connection_pool.h"
-#include "utils.h"
-#include "reply.h"
-#include "command.h"
-#include "redis.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class QueuedReplies;
-
-// If any command throws, QueuedRedis resets the connection, and becomes invalid.
-// In this case, the only thing we can do is to destory the QueuedRedis object.
-template <typename Impl>
-class QueuedRedis {
-public:
-    QueuedRedis(QueuedRedis &&) = default;
-    QueuedRedis& operator=(QueuedRedis &&) = default;
-
-    // When it destructs, the underlying *Connection* will be closed or return to pool,
-    // and any command that has NOT been executed will be ignored.
-    ~QueuedRedis();
-
-    Redis redis();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                    QueuedRedis&>::type;
-
-    template <typename ...Args>
-    QueuedRedis& command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, QueuedRedis&>::type;
-
-    QueuedReplies exec();
-
-    void discard();
-
-    // CONNECTION commands.
-
-    QueuedRedis& auth(const StringView &password) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::auth, password);
-    }
-
-    QueuedRedis& auth(const StringView &user, const StringView &password) {
-        return command<void (*)(Connection &, const StringView &, const StringView &)>(
-                        cmd::auth, user, password);
-    }
-
-    QueuedRedis& echo(const StringView &msg) {
-        return command(cmd::echo, msg);
-    }
-
-    QueuedRedis& ping() {
-        return command<void (*)(Connection &)>(cmd::ping);
-    }
-
-    QueuedRedis& ping(const StringView &msg) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::ping, msg);
-    }
-
-    // We DO NOT support the QUIT command. See *Redis::quit* doc for details.
-    //
-    // QueuedRedis& quit();
-
-    QueuedRedis& select(long long idx) {
-        return command(cmd::select, idx);
-    }
-
-    QueuedRedis& swapdb(long long idx1, long long idx2) {
-        return command(cmd::swapdb, idx1, idx2);
-    }
-
-    // SERVER commands.
-
-    QueuedRedis& bgrewriteaof() {
-        return command(cmd::bgrewriteaof);
-    }
-
-    QueuedRedis& bgsave() {
-        return command(cmd::bgsave);
-    }
-
-    QueuedRedis& dbsize() {
-        return command(cmd::dbsize);
-    }
-
-    QueuedRedis& flushall(bool async = false) {
-        return command(cmd::flushall, async);
-    }
-
-    QueuedRedis& flushdb(bool async = false) {
-        return command(cmd::flushdb, async);
-    }
-
-    QueuedRedis& info() {
-        return command<void (*)(Connection &)>(cmd::info);
-    }
-
-    QueuedRedis& info(const StringView &section) {
-        return command<void (*)(Connection &, const StringView &)>(cmd::info, section);
-    }
-
-    QueuedRedis& lastsave() {
-        return command(cmd::lastsave);
-    }
-
-    QueuedRedis& save() {
-        return command(cmd::save);
-    }
-
-    // KEY commands.
-
-    QueuedRedis& del(const StringView &key) {
-        return command(cmd::del, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& del(Input first, Input last) {
-        range_check("DEL", first, last);
-
-        return command(cmd::del_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    QueuedRedis& dump(const StringView &key) {
-        return command(cmd::dump, key);
-    }
-
-    QueuedRedis& exists(const StringView &key) {
-        return command(cmd::exists, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& exists(Input first, Input last) {
-        range_check("EXISTS", first, last);
-
-        return command(cmd::exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& expire(const StringView &key, long long timeout) {
-        return command(cmd::expire, key, timeout);
-    }
-
-    QueuedRedis& expire(const StringView &key,
-                        const std::chrono::seconds &timeout) {
-        return expire(key, timeout.count());
-    }
-
-    QueuedRedis& expireat(const StringView &key, long long timestamp) {
-        return command(cmd::expireat, key, timestamp);
-    }
-
-    QueuedRedis& expireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::seconds> &tp) {
-        return expireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& keys(const StringView &pattern) {
-        return command(cmd::keys, pattern);
-    }
-
-    QueuedRedis& move(const StringView &key, long long db) {
-        return command(cmd::move, key, db);
-    }
-
-    QueuedRedis& persist(const StringView &key) {
-        return command(cmd::persist, key);
-    }
-
-    QueuedRedis& pexpire(const StringView &key, long long timeout) {
-        return command(cmd::pexpire, key, timeout);
-    }
-
-    QueuedRedis& pexpire(const StringView &key,
-                            const std::chrono::milliseconds &timeout) {
-        return pexpire(key, timeout.count());
-    }
-
-    QueuedRedis& pexpireat(const StringView &key, long long timestamp) {
-        return command(cmd::pexpireat, key, timestamp);
-    }
-
-    QueuedRedis& pexpireat(const StringView &key,
-                            const std::chrono::time_point<std::chrono::system_clock,
-                                                            std::chrono::milliseconds> &tp) {
-        return pexpireat(key, tp.time_since_epoch().count());
-    }
-
-    QueuedRedis& pttl(const StringView &key) {
-        return command(cmd::pttl, key);
-    }
-
-    QueuedRedis& randomkey() {
-        return command(cmd::randomkey);
-    }
-
-    QueuedRedis& rename(const StringView &key, const StringView &newkey) {
-        return command(cmd::rename, key, newkey);
-    }
-
-    QueuedRedis& renamenx(const StringView &key, const StringView &newkey) {
-        return command(cmd::renamenx, key, newkey);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                                const StringView &val,
-                                long long ttl,
-                                bool replace = false) {
-        return command(cmd::restore, key, val, ttl, replace);
-    }
-
-    QueuedRedis& restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                            bool replace = false) {
-        return restore(key, val, ttl.count(), replace);
-    }
-
-    // TODO: sort
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::scan, cursor, pattern, count);
-    }
-
-    QueuedRedis& scan(long long cursor) {
-        return scan(cursor, "*", 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        const StringView &pattern) {
-        return scan(cursor, pattern, 10);
-    }
-
-    QueuedRedis& scan(long long cursor,
-                        long long count) {
-        return scan(cursor, "*", count);
-    }
-
-    QueuedRedis& touch(const StringView &key) {
-        return command(cmd::touch, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& touch(Input first, Input last) {
-        range_check("TOUCH", first, last);
-
-        return command(cmd::touch_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    QueuedRedis& ttl(const StringView &key) {
-        return command(cmd::ttl, key);
-    }
-
-    QueuedRedis& type(const StringView &key) {
-        return command(cmd::type, key);
-    }
-
-    QueuedRedis& unlink(const StringView &key) {
-        return command(cmd::unlink, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& unlink(Input first, Input last) {
-        range_check("UNLINK", first, last);
-
-        return command(cmd::unlink_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    QueuedRedis& wait(long long numslaves, long long timeout) {
-        return command(cmd::wait, numslaves, timeout);
-    }
-
-    QueuedRedis& wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-        return wait(numslaves, timeout.count());
-    }
-
-    // STRING commands.
-
-    QueuedRedis& append(const StringView &key, const StringView &str) {
-        return command(cmd::append, key, str);
-    }
-
-    QueuedRedis& bitcount(const StringView &key,
-                            long long start = 0,
-                            long long end = -1) {
-        return command(cmd::bitcount, key, start, end);
-    }
-
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        const StringView &key) {
-        return command(cmd::bitop, op, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        Input first,
-                        Input last) {
-        range_check("BITOP", first, last);
-
-        return command(cmd::bitop_range<Input>, op, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& bitop(BitOp op,
-                        const StringView &destination,
-                        std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1) {
-        return command(cmd::bitpos, key, bit, start, end);
-    }
-
-    QueuedRedis& decr(const StringView &key) {
-        return command(cmd::decr, key);
-    }
-
-    QueuedRedis& decrby(const StringView &key, long long decrement) {
-        return command(cmd::decrby, key, decrement);
-    }
-
-    QueuedRedis& get(const StringView &key) {
-        return command(cmd::get, key);
-    }
-
-    QueuedRedis& getbit(const StringView &key, long long offset) {
-        return command(cmd::getbit, key, offset);
-    }
-
-    QueuedRedis& getrange(const StringView &key, long long start, long long end) {
-        return command(cmd::getrange, key, start, end);
-    }
-
-    QueuedRedis& getset(const StringView &key, const StringView &val) {
-        return command(cmd::getset, key, val);
-    }
-
-    QueuedRedis& incr(const StringView &key) {
-        return command(cmd::incr, key);
-    }
-
-    QueuedRedis& incrby(const StringView &key, long long increment) {
-        return command(cmd::incrby, key, increment);
-    }
-
-    QueuedRedis& incrbyfloat(const StringView &key, double increment) {
-        return command(cmd::incrbyfloat, key, increment);
-    }
-
-    template <typename Input>
-    QueuedRedis& mget(Input first, Input last) {
-        range_check("MGET", first, last);
-
-        return command(cmd::mget<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mget(std::initializer_list<T> il) {
-        return mget(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& mset(Input first, Input last) {
-        range_check("MSET", first, last);
-
-        return command(cmd::mset<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& mset(std::initializer_list<T> il) {
-        return mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& msetnx(Input first, Input last) {
-        range_check("MSETNX", first, last);
-
-        return command(cmd::msetnx<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::psetex, key, ttl, val);
-    }
-
-    QueuedRedis& psetex(const StringView &key,
-                        const std::chrono::milliseconds &ttl,
-                        const StringView &val) {
-        return psetex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& set(const StringView &key,
-                        const StringView &val,
-                        const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                        UpdateType type = UpdateType::ALWAYS) {
-        _set_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::set, key, val, ttl.count(), type);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-        return command(cmd::setex, key, ttl, val);
-    }
-
-    QueuedRedis& setex(const StringView &key,
-                        const std::chrono::seconds &ttl,
-                        const StringView &val) {
-        return setex(key, ttl.count(), val);
-    }
-
-    QueuedRedis& setnx(const StringView &key, const StringView &val) {
-        return command(cmd::setnx, key, val);
-    }
-
-    QueuedRedis& setrange(const StringView &key,
-                            long long offset,
-                            const StringView &val) {
-        return command(cmd::setrange, key, offset, val);
-    }
-
-    QueuedRedis& strlen(const StringView &key) {
-        return command(cmd::strlen, key);
-    }
-
-    // LIST commands.
-
-    QueuedRedis& blpop(const StringView &key, long long timeout) {
-        return command(cmd::blpop, key, timeout);
-    }
-
-    QueuedRedis& blpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first, Input last, long long timeout) {
-        range_check("BLPOP", first, last);
-
-        return command(cmd::blpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& blpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& blpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key, long long timeout) {
-        return command(cmd::brpop, key, timeout);
-    }
-
-    QueuedRedis& brpop(const StringView &key,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first, Input last, long long timeout) {
-        range_check("BRPOP", first, last);
-
-        return command(cmd::brpop_range<Input>, first, last, timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& brpop(Input first,
-                        Input last,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& brpop(std::initializer_list<T> il,
-                        const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            long long timeout) {
-        return command(cmd::brpoplpush, source, destination, timeout);
-    }
-
-    QueuedRedis& brpoplpush(const StringView &source,
-                            const StringView &destination,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpoplpush(source, destination, timeout.count());
-    }
-
-    QueuedRedis& lindex(const StringView &key, long long index) {
-        return command(cmd::lindex, key, index);
-    }
-
-    QueuedRedis& linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-        return command(cmd::linsert, key, position, pivot, val);
-    }
-
-    QueuedRedis& llen(const StringView &key) {
-        return command(cmd::llen, key);
-    }
-
-    QueuedRedis& lpop(const StringView &key) {
-        return command(cmd::lpop, key);
-    }
-
-    QueuedRedis& lpush(const StringView &key, const StringView &val) {
-        return command(cmd::lpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& lpush(const StringView &key, Input first, Input last) {
-        range_check("LPUSH", first, last);
-
-        return command(cmd::lpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& lpushx(const StringView &key, const StringView &val) {
-        return command(cmd::lpushx, key, val);
-    }
-
-    QueuedRedis& lrange(const StringView &key,
-                        long long start,
-                        long long stop) {
-        return command(cmd::lrange, key, start, stop);
-    }
-
-    QueuedRedis& lrem(const StringView &key, long long count, const StringView &val) {
-        return command(cmd::lrem, key, count, val);
-    }
-
-    QueuedRedis& lset(const StringView &key, long long index, const StringView &val) {
-        return command(cmd::lset, key, index, val);
-    }
-
-    QueuedRedis& ltrim(const StringView &key, long long start, long long stop) {
-        return command(cmd::ltrim, key, start, stop);
-    }
-
-    QueuedRedis& rpop(const StringView &key) {
-        return command(cmd::rpop, key);
-    }
-
-    QueuedRedis& rpoplpush(const StringView &source, const StringView &destination) {
-        return command(cmd::rpoplpush, source, destination);
-    }
-
-    QueuedRedis& rpush(const StringView &key, const StringView &val) {
-        return command(cmd::rpush, key, val);
-    }
-
-    template <typename Input>
-    QueuedRedis& rpush(const StringView &key, Input first, Input last) {
-        range_check("RPUSH", first, last);
-
-        return command(cmd::rpush_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& rpushx(const StringView &key, const StringView &val) {
-        return command(cmd::rpushx, key, val);
-    }
-
-    // HASH commands.
-
-    QueuedRedis& hdel(const StringView &key, const StringView &field) {
-        return command(cmd::hdel, key, field);
-    }
-
-    template <typename Input>
-    QueuedRedis& hdel(const StringView &key, Input first, Input last) {
-        range_check("HDEL", first, last);
-
-        return command(cmd::hdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hexists(const StringView &key, const StringView &field) {
-        return command(cmd::hexists, key, field);
-    }
-
-    QueuedRedis& hget(const StringView &key, const StringView &field) {
-        return command(cmd::hget, key, field);
-    }
-
-    QueuedRedis& hgetall(const StringView &key) {
-        return command(cmd::hgetall, key);
-    }
-
-    QueuedRedis& hincrby(const StringView &key,
-                            const StringView &field,
-                            long long increment) {
-        return command(cmd::hincrby, key, field, increment);
-    }
-
-    QueuedRedis& hincrbyfloat(const StringView &key,
-                                const StringView &field,
-                                double increment) {
-        return command(cmd::hincrbyfloat, key, field, increment);
-    }
-
-    QueuedRedis& hkeys(const StringView &key) {
-        return command(cmd::hkeys, key);
-    }
-
-    QueuedRedis& hlen(const StringView &key) {
-        return command(cmd::hlen, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& hmget(const StringView &key, Input first, Input last) {
-        range_check("HMGET", first, last);
-
-        return command(cmd::hmget<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmget(const StringView &key, std::initializer_list<T> il) {
-        return hmget(key, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& hmset(const StringView &key, Input first, Input last) {
-        range_check("HMSET", first, last);
-
-        return command(cmd::hmset<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hmset(const StringView &key, std::initializer_list<T> il) {
-        return hmset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::hscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return hscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return hscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& hscan(const StringView &key,
-                        long long cursor) {
-        return hscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& hset(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hset, key, field, val);
-    }
-
-    QueuedRedis& hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hset(key, item.first, item.second);
-    }
-
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("HSET", first, last);
-
-        return command(cmd::hset_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-        return command(cmd::hsetnx, key, field, val);
-    }
-
-    QueuedRedis& hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-        return hsetnx(key, item.first, item.second);
-    }
-
-    QueuedRedis& hstrlen(const StringView &key, const StringView &field) {
-        return command(cmd::hstrlen, key, field);
-    }
-
-    QueuedRedis& hvals(const StringView &key) {
-        return command(cmd::hvals, key);
-    }
-
-    // SET commands.
-
-    QueuedRedis& sadd(const StringView &key, const StringView &member) {
-        return command(cmd::sadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& sadd(const StringView &key, Input first, Input last) {
-        range_check("SADD", first, last);
-
-        return command(cmd::sadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& scard(const StringView &key) {
-        return command(cmd::scard, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiff(Input first, Input last) {
-        range_check("SDIFF", first, last);
-
-        return command(cmd::sdiff<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiff(std::initializer_list<T> il) {
-        return sdiff(il.begin(), il.end());
-    }
-
-    QueuedRedis& sdiffstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sdiffstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-        range_check("SDIFFSTORE", first, last);
-
-        return command(cmd::sdiffstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sdiffstore(const StringView &destination, std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& sinter(Input first, Input last) {
-        range_check("SINTER", first, last);
-
-        return command(cmd::sinter<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinter(std::initializer_list<T> il) {
-        return sinter(il.begin(), il.end());
-    }
-
-    QueuedRedis& sinterstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sinterstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sinterstore(const StringView &destination,
-                                Input first,
-                                Input last) {
-        range_check("SINTERSTORE", first, last);
-
-        return command(cmd::sinterstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sinterstore(const StringView &destination, std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    QueuedRedis& sismember(const StringView &key, const StringView &member) {
-        return command(cmd::sismember, key, member);
-    }
-
-    QueuedRedis& smembers(const StringView &key) {
-        return command(cmd::smembers, key);
-    }
-
-    QueuedRedis& smove(const StringView &source,
-                        const StringView &destination,
-                        const StringView &member) {
-        return command(cmd::smove, source, destination, member);
-    }
-
-    QueuedRedis& spop(const StringView &key) {
-        return command(cmd::spop, key);
-    }
-
-    QueuedRedis& spop(const StringView &key, long long count) {
-        return command(cmd::spop_range, key, count);
-    }
-
-    QueuedRedis& srandmember(const StringView &key) {
-        return command(cmd::srandmember, key);
-    }
-
-    QueuedRedis& srandmember(const StringView &key, long long count) {
-        return command(cmd::srandmember_range, key, count);
-    }
-
-    QueuedRedis& srem(const StringView &key, const StringView &member) {
-        return command(cmd::srem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& srem(const StringView &key, Input first, Input last) {
-        range_check("SREM", first, last);
-
-        return command(cmd::srem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::sscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern) {
-        return sscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return sscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& sscan(const StringView &key,
-                        long long cursor) {
-        return sscan(key, cursor, "*", 10);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunion(Input first, Input last) {
-        range_check("SUNION", first, last);
-
-        return command(cmd::sunion<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunion(std::initializer_list<T> il) {
-        return sunion(il.begin(), il.end());
-    }
-
-    QueuedRedis& sunionstore(const StringView &destination, const StringView &key) {
-        return command(cmd::sunionstore, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& sunionstore(const StringView &destination, Input first, Input last) {
-        range_check("SUNIONSTORE", first, last);
-
-        return command(cmd::sunionstore_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    QueuedRedis& bzpopmax(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmax, key, timeout);
-    }
-
-    QueuedRedis& bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first, Input last, long long timeout) {
-        range_check("BZPOPMAX", first, last);
-
-        return command(cmd::bzpopmax_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il, long long timeout) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmax(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key, long long timeout) {
-        return command(cmd::bzpopmin, key, timeout);
-    }
-
-    QueuedRedis& bzpopmin(const StringView &key,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(key, timeout.count());
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first, Input last, long long timeout) {
-        range_check("BZPOPMIN", first, last);
-
-        return command(cmd::bzpopmin_range<Input>, first, last, timeout);
-    }
-
-    template <typename Input>
-    QueuedRedis& bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(first, last, timeout.count());
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il, long long timeout) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    QueuedRedis& bzpopmin(std::initializer_list<T> il,
-                            const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    QueuedRedis& zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        return command(cmd::zadd, key, member, score, type, changed);
-    }
-
-    template <typename Input>
-    QueuedRedis& zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type = UpdateType::ALWAYS,
-                        bool changed = false) {
-        range_check("ZADD", first, last);
-
-        return command(cmd::zadd_range<Input>, key, first, last, type, changed);
-    }
-
-    QueuedRedis& zcard(const StringView &key) {
-        return command(cmd::zcard, key);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zincrby(const StringView &key, double increment, const StringView &member) {
-        return command(cmd::zincrby, key, increment, member);
-    }
-
-    QueuedRedis& zinterstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zinterstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        range_check("ZINTERSTORE", first, last);
-
-        return command(cmd::zinterstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zinterstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zlexcount(const StringView &key, const Interval &interval) {
-        return command(cmd::zlexcount<Interval>, key, interval);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::zpopmax, key, 1);
-    }
-
-    QueuedRedis& zpopmax(const StringView &key, long long count) {
-        return command(cmd::zpopmax, key, count);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::zpopmin, key, 1);
-    }
-
-    QueuedRedis& zpopmin(const StringView &key, long long count) {
-        return command(cmd::zpopmin, key, count);
-    }
-
-    // NOTE: *QueuedRedis::zrange*'s parameters are different from *Redis::zrange*.
-    // *Redis::zrange* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::zrange*. So we have to use an extra parameter: *with_scores*,
-    // to decide whether we should send *WITHSCORES* option to Redis. This also applies to
-    // other commands with the *WITHSCORES* option, e.g. *ZRANGEBYSCORE*, *ZREVRANGE*,
-    // *ZREVRANGEBYSCORE*.
-    QueuedRedis& zrange(const StringView &key,
-                        long long start,
-                        long long stop,
-                        bool with_scores = false) {
-        return command(cmd::zrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrangebylex(const StringView &key, const Interval &interval) {
-        return zrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                bool with_scores = false) {
-        return command(cmd::zrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                bool with_scores = false) {
-        return zrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrank, key, member);
-    }
-
-    QueuedRedis& zrem(const StringView &key, const StringView &member) {
-        return command(cmd::zrem, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& zrem(const StringView &key, Input first, Input last) {
-        range_check("ZREM", first, last);
-
-        return command(cmd::zrem_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebylex(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebylex<Interval>, key, interval);
-    }
-
-    QueuedRedis& zremrangebyrank(const StringView &key, long long start, long long stop) {
-        return command(cmd::zremrangebyrank, key, start, stop);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zremrangebyscore(const StringView &key, const Interval &interval) {
-        return command(cmd::zremrangebyscore<Interval>, key, interval);
-    }
-
-    // See comments on *ZRANGE*.
-    QueuedRedis& zrevrange(const StringView &key,
-                            long long start,
-                            long long stop,
-                            bool with_scores = false) {
-        return command(cmd::zrevrange, key, start, stop, with_scores);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts) {
-        return command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-    }
-
-    template <typename Interval>
-    QueuedRedis& zrevrangebylex(const StringView &key, const Interval &interval) {
-        return zrevrangebylex(key, interval, {});
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    const LimitOptions &opts,
-                                    bool with_scores = false) {
-        return command(cmd::zrevrangebyscore<Interval>, key, interval, opts, with_scores);
-    }
-
-    // See comments on *ZRANGE*.
-    template <typename Interval>
-    QueuedRedis& zrevrangebyscore(const StringView &key,
-                                    const Interval &interval,
-                                    bool with_scores = false) {
-        return zrevrangebyscore(key, interval, {}, with_scores);
-    }
-
-    QueuedRedis& zrevrank(const StringView &key, const StringView &member) {
-        return command(cmd::zrevrank, key, member);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count) {
-        return command(cmd::zscan, key, cursor, pattern, count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern) {
-        return zscan(key, cursor, pattern, 10);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor,
-                        long long count) {
-        return zscan(key, cursor, "*", count);
-    }
-
-    QueuedRedis& zscan(const StringView &key,
-                        long long cursor) {
-        return zscan(key, cursor, "*", 10);
-    }
-
-    QueuedRedis& zscore(const StringView &key, const StringView &member) {
-        return command(cmd::zscore, key, member);
-    }
-
-    QueuedRedis& zunionstore(const StringView &destination,
-                                const StringView &key,
-                                double weight) {
-        return command(cmd::zunionstore, destination, key, weight);
-    }
-
-    template <typename Input>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type = Aggregation::SUM) {
-        range_check("ZUNIONSTORE", first, last);
-
-        return command(cmd::zunionstore_range<Input>, destination, first, last, type);
-    }
-
-    template <typename T>
-    QueuedRedis& zunionstore(const StringView &destination,
-                                std::initializer_list<T> il,
-                                Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    QueuedRedis& pfadd(const StringView &key, const StringView &element) {
-        return command(cmd::pfadd, key, element);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfadd(const StringView &key, Input first, Input last) {
-        range_check("PFADD", first, last);
-
-        return command(cmd::pfadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& pfcount(const StringView &key) {
-        return command(cmd::pfcount, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfcount(Input first, Input last) {
-        range_check("PFCOUNT", first, last);
-
-        return command(cmd::pfcount_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    QueuedRedis& pfmerge(const StringView &destination, const StringView &key) {
-        return command(cmd::pfmerge, destination, key);
-    }
-
-    template <typename Input>
-    QueuedRedis& pfmerge(const StringView &destination, Input first, Input last) {
-        range_check("PFMERGE", first, last);
-
-        return command(cmd::pfmerge_range<Input>, destination, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        return pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    QueuedRedis& geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-        return command(cmd::geoadd, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geoadd(const StringView &key,
-                        Input first,
-                        Input last) {
-        range_check("GEOADD", first, last);
-
-        return command(cmd::geoadd_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geoadd(const StringView &key, std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M) {
-        return command(cmd::geodist, key, member1, member2, unit);
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& geohash(const StringView &key, const StringView &member) {
-        return command(cmd::geohash, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geohash(const StringView &key, Input first, Input last) {
-        range_check("GEOHASH", first, last);
-
-        return command(cmd::geohash_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geohash(const StringView &key, std::initializer_list<T> il) {
-        return geohash(key, il.begin(), il.end());
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& geopos(const StringView &key, const StringView &member) {
-        return command(cmd::geopos, key, member);
-    }
-
-    template <typename Input>
-    QueuedRedis& geopos(const StringView &key, Input first, Input last) {
-        range_check("GEOPOS", first, last);
-
-        return command(cmd::geopos_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& geopos(const StringView &key, std::initializer_list<T> il) {
-        return geopos(key, il.begin(), il.end());
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            const StringView &destination,
-                            bool store_dist,
-                            long long count) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadius_store,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // NOTE: *QueuedRedis::georadius*'s parameters are different from *Redis::georadius*.
-    // *Redis::georadius* is overloaded by the output iterator, however, there's no such
-    // iterator in *QueuedRedis::georadius*. So we have to use extra parameters to decide
-    // whether we should send options to Redis. This also applies to *GEORADIUSBYMEMBER*.
-    QueuedRedis& georadius(const StringView &key,
-                            const std::pair<double, double> &loc,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            bool with_coord,
-                            bool with_dist,
-                            bool with_hash) {
-        return command(cmd::georadius,
-                        key,
-                        loc,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-        _empty_array_cmd_indexes.push_back(_cmd_num);
-
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        destination,
-                        store_dist,
-                        count);
-    }
-
-    // See the comments on *GEORADIUS*.
-    QueuedRedis& georadiusbymember(const StringView &key,
-                                    const StringView &member,
-                                    double radius,
-                                    GeoUnit unit,
-                                    long long count,
-                                    bool asc,
-                                    bool with_coord,
-                                    bool with_dist,
-                                    bool with_hash) {
-        return command(cmd::georadiusbymember,
-                        key,
-                        member,
-                        radius,
-                        unit,
-                        count,
-                        asc,
-                        with_coord,
-                        with_dist,
-                        with_hash);
-    }
-
-    // SCRIPTING commands.
-
-    template <typename Keys, typename Args>
-    QueuedRedis& eval(const StringView &script,
-                        Keys keys_first,
-                        Keys keys_last,
-                        Args args_first,
-                        Args args_last) {
-        return command(cmd::eval<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-    }
-
-    QueuedRedis& eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-        return eval(script, keys.begin(), keys.end(), args.begin(), args.end());
-    }
-
-    template <typename Keys, typename Args>
-    QueuedRedis& evalsha(const StringView &script,
-                            Keys keys_first,
-                            Keys keys_last,
-                            Args args_first,
-                            Args args_last) {
-        return command(cmd::evalsha<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-    }
-
-    QueuedRedis& evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-        return evalsha(script, keys.begin(), keys.end(), args.begin(), args.end());
-    }
-
-    // Call reply::parse_leniently to parse the reply.
-    QueuedRedis& script_exists(const StringView &sha1) {
-        return command(cmd::script_exists, sha1);
-    }
-
-    template <typename Input>
-    QueuedRedis& script_exists(Input first, Input last) {
-        range_check("SCRIPT EXISTS", first, last);
-
-        return command(cmd::script_exists_range<Input>, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& script_exists(std::initializer_list<T> il) {
-        return script_exists(il.begin(), il.end());
-    }
-
-    QueuedRedis& script_flush() {
-        return command(cmd::script_flush);
-    }
-
-    QueuedRedis& script_kill() {
-        return command(cmd::script_kill);
-    }
-
-    QueuedRedis& script_load(const StringView &script) {
-        return command(cmd::script_load, script);
-    }
-
-    // PUBSUB commands.
-
-    QueuedRedis& publish(const StringView &channel, const StringView &message) {
-        return command(cmd::publish, channel, message);
-    }
-
-    // Stream commands.
-
-    QueuedRedis& xack(const StringView &key, const StringView &group, const StringView &id) {
-        return command(cmd::xack, key, group, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xack(const StringView &key, const StringView &group, Input first, Input last) {
-        range_check("XACK", first, last);
-
-        return command(cmd::xack_range<Input>, key, group, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, Input first, Input last) {
-        range_check("XADD", first, last);
-
-        return command(cmd::xadd_range<Input>, key, id, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true) {
-        range_check("XADD", first, last);
-
-        return command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-    }
-
-    template <typename T>
-    QueuedRedis& xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    QueuedRedis& xclaim(const StringView &key,
-                        const StringView &group,
-                        const StringView &consumer,
-                        const std::chrono::milliseconds &min_idle_time,
-                        const StringView &id) {
-        return command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last) {
-        range_check("XCLAIM", first, last);
-
-        return command(cmd::xclaim_range<Input>,
-                        key,
-                        group,
-                        consumer,
-                        min_idle_time.count(),
-                        first,
-                        last);
-    }
-
-    template <typename T>
-    QueuedRedis& xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il) {
-        return xclaim(key, group, consumer, min_idle_time, il.begin(), il.end());
-    }
-
-    QueuedRedis& xdel(const StringView &key, const StringView &id) {
-        return command(cmd::xdel, key, id);
-    }
-
-    template <typename Input>
-    QueuedRedis& xdel(const StringView &key, Input first, Input last) {
-        range_check("XDEL", first, last);
-
-        return command(cmd::xdel_range<Input>, key, first, last);
-    }
-
-    template <typename T>
-    QueuedRedis& xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    QueuedRedis& xgroup_create(const StringView &key,
-                                const StringView &group,
-                                const StringView &id,
-                                bool mkstream = false) {
-        return command(cmd::xgroup_create, key, group, id, mkstream);
-    }
-
-    QueuedRedis& xgroup_setid(const StringView &key,
-                                const StringView &group,
-                                const StringView &id) {
-        return command(cmd::xgroup_setid, key, group, id);
-    }
-
-    QueuedRedis& xgroup_destroy(const StringView &key, const StringView &group) {
-        return command(cmd::xgroup_destroy, key, group);
-    }
-
-    QueuedRedis& xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer) {
-        return command(cmd::xgroup_delconsumer, key, group, consumer);
-    }
-
-    QueuedRedis& xlen(const StringView &key) {
-        return command(cmd::xlen, key);
-    }
-
-    QueuedRedis& xpending(const StringView &key, const StringView &group) {
-        return command(cmd::xpending, key, group);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count) {
-        return command(cmd::xpending_detail, key, group, start, end, count);
-    }
-
-    QueuedRedis& xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer) {
-        return command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end) {
-        return command(cmd::xrange, key, start, end);
-    }
-
-    QueuedRedis& xrange(const StringView &key,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count) {
-        return command(cmd::xrange_count, key, start, end, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id, long long count) {
-        return command(cmd::xread, key, id, count);
-    }
-
-    QueuedRedis& xread(const StringView &key, const StringView &id) {
-        return xread(key, id, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last, long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREAD", first, last);
-
-        return command(cmd::xread_range<Input>, first, last, count);
-    }
-
-    template <typename Input>
-    auto xread(Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, 0);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count) {
-        return command(cmd::xread_block, key, id, timeout.count(), count);
-    }
-
-    QueuedRedis& xread(const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout) {
-        return xread(key, id, timeout, 0);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREAD", first, last);
-
-        return command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-    }
-
-    template <typename Input>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xread(first, last, timeout, 0);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREADGROUP", first, last);
-
-        return command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first ,last, 0, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            bool noack) {
-        return command(cmd::xreadgroup_block,
-                        group,
-                        consumer,
-                        key,
-                        id,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false);
-    }
-
-    QueuedRedis& xreadgroup(const StringView &group,
-                            const StringView &consumer,
-                            const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        range_check("XREADGROUP", first, last);
-
-        return command(cmd::xreadgroup_block_range<Input>,
-                        group,
-                        consumer,
-                        first,
-                        last,
-                        timeout.count(),
-                        count,
-                        noack);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, count, false);
-    }
-
-    template <typename Input>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    QueuedRedis&>::type {
-        return xreadgroup(group, consumer, first, last, timeout, 0, false);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start) {
-        return command(cmd::xrevrange, key, end, start);
-    }
-
-    QueuedRedis& xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            long long count) {
-        return command(cmd::xrevrange_count, key, end, start, count);
-    }
-
-    QueuedRedis& xtrim(const StringView &key, long long count, bool approx = true) {
-        return command(cmd::xtrim, key, count, approx);
-    }
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    template <typename ...Args>
-    QueuedRedis(const ConnectionPoolSPtr &pool, bool new_connection, Args &&...args);
-
-    Connection& _connection();
-
-    void _sanity_check();
-
-    void _reset(bool reset_connection = true);
-
-    void _return_connection();
-
-    void _invalidate();
-
-    void _clean_up();
-
-    void _rewrite_replies(std::vector<ReplyUPtr> &replies) const;
-
-    template <typename Func>
-    void _rewrite_replies(const std::vector<std::size_t> &indexes,
-                            Func rewriter,
-                            std::vector<ReplyUPtr> &replies) const;
-
-    GuardedConnectionSPtr _guarded_connection;
-
-    ConnectionPoolSPtr _connection_pool;
-
-    bool _new_connection = true;
-
-    Impl _impl;
-
-    std::size_t _cmd_num = 0;
-
-    std::vector<std::size_t> _set_cmd_indexes;
-
-    std::vector<std::size_t> _empty_array_cmd_indexes;
-
-    bool _valid = true;
-};
-
-class QueuedReplies {
-public:
-    QueuedReplies() = default;
-
-    QueuedReplies(const QueuedReplies &) = delete;
-    QueuedReplies& operator=(const QueuedReplies &) = delete;
-
-    QueuedReplies(QueuedReplies &&) = default;
-    QueuedReplies& operator=(QueuedReplies &&) = default;
-
-    ~QueuedReplies() = default;
-
-    std::size_t size() const;
-
-    redisReply& get(std::size_t idx);
-
-    template <typename Result>
-    Result get(std::size_t idx);
-
-    template <typename Output>
-    void get(std::size_t idx, Output output);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    explicit QueuedReplies(std::vector<ReplyUPtr> replies) : _replies(std::move(replies)) {}
-
-    void _index_check(std::size_t idx) const;
-
-    std::vector<ReplyUPtr> _replies;
-};
-
-}
-
-}
-
-#include "queued_redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/queued_redis.hpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/queued_redis.hpp
deleted file mode 100644
index d2865e46e..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/queued_redis.hpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>::QueuedRedis(const ConnectionPoolSPtr &pool,
-                                bool new_connection,
-                                Args &&...args) :
-            _new_connection(new_connection),
-            _impl(std::forward<Args>(args)...) {
-    assert(pool);
-
-    if (_new_connection) {
-        _connection_pool = std::make_shared<ConnectionPool>(pool->clone());
-    } else {
-        // Create a connection from the origin pool.
-        _connection_pool = pool;
-    }
-}
-
-template <typename Impl>
-QueuedRedis<Impl>::~QueuedRedis() {
-    try {
-        _clean_up();
-    } catch (const Error &e) {
-        // Ensure the destructor does not throw
-    }
-}
-
-template <typename Impl>
-Redis QueuedRedis<Impl>::redis() {
-    _sanity_check();
-
-    assert(_guarded_connection);
-
-    return Redis(_guarded_connection);
-}
-
-template <typename Impl>
-template <typename Cmd, typename ...Args>
-auto QueuedRedis<Impl>::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value,
-                                QueuedRedis<Impl>&>::type {
-    try {
-        _sanity_check();
-
-        _impl.command(_connection(), cmd, std::forward<Args>(args)...);
-
-        ++_cmd_num;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-
-    return *this;
-}
-
-template <typename Impl>
-template <typename ...Args>
-QueuedRedis<Impl>& QueuedRedis<Impl>::command(const StringView &cmd_name, Args &&...args) {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Impl>
-template <typename Input>
-auto QueuedRedis<Impl>::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, QueuedRedis<Impl>&>::type {
-    if (first == last) {
-        throw Error("command: empty range");
-    }
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Impl>
-QueuedReplies QueuedRedis<Impl>::exec() {
-    try {
-        _sanity_check();
-
-        auto replies = _impl.exec(_connection(), _cmd_num);
-
-        _rewrite_replies(replies);
-
-        _reset();
-
-        return QueuedReplies(std::move(replies));
-    } catch (const WatchError &e) {
-        // In this case, we only clear some states and keep the connection,
-        // so that user can retry the transaction.
-        _reset(false);
-        throw;
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::discard() {
-    try {
-        _sanity_check();
-
-        _impl.discard(_connection(), _cmd_num);
-
-        _reset();
-    } catch (const Error &e) {
-        _invalidate();
-        throw;
-    }
-}
-
-template <typename Impl>
-Connection& QueuedRedis<Impl>::_connection() {
-    assert(_valid);
-
-    if (!_guarded_connection) {
-        _guarded_connection = std::make_shared<GuardedConnection>(_connection_pool);
-    }
-
-    return _guarded_connection->connection();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_sanity_check() {
-    if (!_valid) {
-        throw Error("Not in valid state");
-    }
-
-    if (_connection().broken()) {
-        throw Error("Connection is broken");
-    }
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_reset(bool reset_connection) {
-    if (reset_connection && !_new_connection) {
-        _return_connection();
-    }
-
-    _cmd_num = 0;
-
-    _set_cmd_indexes.clear();
-
-    _empty_array_cmd_indexes.clear();
-}
-
-template <typename Impl>
-inline void QueuedRedis<Impl>::_return_connection() {
-    if (_guarded_connection.use_count() == 1) {
-        // If no one else holding the connection, return it back to pool.
-        // Instead, if some other `Redis` object holds the connection,
-        // e.g. `auto redis = transaction.redis();`, we cannot return the connection.
-        _guarded_connection.reset();
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_invalidate() {
-    _valid = false;
-
-    _clean_up();
-
-    _reset();
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_clean_up() {
-    if (_guarded_connection && !_new_connection) {
-        // Something bad happened, we need to close the current connection
-        // before returning it back to pool.
-        _guarded_connection->connection().invalidate();
-    }
-}
-
-template <typename Impl>
-void QueuedRedis<Impl>::_rewrite_replies(std::vector<ReplyUPtr> &replies) const {
-    _rewrite_replies(_set_cmd_indexes, reply::rewrite_set_reply, replies);
-
-    _rewrite_replies(_empty_array_cmd_indexes, reply::rewrite_empty_array_reply, replies);
-}
-
-template <typename Impl>
-template <typename Func>
-void QueuedRedis<Impl>::_rewrite_replies(const std::vector<std::size_t> &indexes,
-                                            Func rewriter,
-                                            std::vector<ReplyUPtr> &replies) const {
-    for (auto idx : indexes) {
-        assert(idx < replies.size());
-
-        auto &reply = replies[idx];
-
-        assert(reply);
-
-        rewriter(*reply);
-    }
-}
-
-inline std::size_t QueuedReplies::size() const {
-    return _replies.size();
-}
-
-inline redisReply& QueuedReplies::get(std::size_t idx) {
-    _index_check(idx);
-
-    auto &reply = _replies[idx];
-
-    assert(reply);
-
-    if (reply::is_error(*reply)) {
-        throw_error(*reply);
-    }
-
-    return *reply;
-}
-
-template <typename Result>
-inline Result QueuedReplies::get(std::size_t idx) {
-    auto &reply = get(idx);
-
-    return reply::parse<Result>(reply);
-}
-
-template <typename Output>
-inline void QueuedReplies::get(std::size_t idx, Output output) {
-    auto &reply = get(idx);
-
-    reply::to_array(reply, output);
-}
-
-inline void QueuedReplies::_index_check(std::size_t idx) const {
-    if (idx >= size()) {
-        throw Error("Out of range");
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_QUEUED_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis++.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis++.h
deleted file mode 100644
index 0da0ebb16..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis++.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-#define SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
-
-#include "redis.h"
-#include "redis_cluster.h"
-#include "queued_redis.h"
-#include "sentinel.h"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDISPLUSPLUS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.cpp
deleted file mode 100644
index e47de333f..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.cpp
+++ /dev/null
@@ -1,929 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "redis.h"
-#include <hiredis/hiredis.h>
-#include "command.h"
-#include "errors.h"
-#include "queued_redis.h"
-
-namespace sw {
-
-namespace redis {
-
-Redis::Redis(const std::string &uri) : Redis(ConnectionOptions(uri)) {}
-
-Redis::Redis(const GuardedConnectionSPtr &connection) : _connection(connection) {
-    assert(_connection);
-}
-
-Pipeline Redis::pipeline(bool new_connection) {
-    if (!_pool) {
-        throw Error("cannot create pipeline in single connection mode");
-    }
-
-    return Pipeline(_pool, new_connection);
-}
-
-Transaction Redis::transaction(bool piped, bool new_connection) {
-    if (!_pool) {
-        throw Error("cannot create transaction in single connection mode");
-    }
-
-    return Transaction(_pool, new_connection, piped);
-}
-
-Subscriber Redis::subscriber() {
-    if (!_pool) {
-        throw Error("cannot create subscriber in single connection mode");
-    }
-
-    return Subscriber(_pool->create());
-}
-
-// CONNECTION commands.
-
-void Redis::auth(const StringView &password) {
-    auto reply = command<void (*)(Connection &, const StringView &)>(cmd::auth, password);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::auth(const StringView &user, const StringView &password) {
-    auto reply = command<void (*)(Connection &, const StringView &, const StringView &)>(
-                        cmd::auth, user, password);
-
-    reply::parse<void>(*reply);
-}
-
-std::string Redis::echo(const StringView &msg) {
-    auto reply = command(cmd::echo, msg);
-
-    return reply::parse<std::string>(*reply);
-}
-
-std::string Redis::ping() {
-    auto reply = command<void (*)(Connection &)>(cmd::ping);
-
-    return reply::to_status(*reply);
-}
-
-std::string Redis::ping(const StringView &msg) {
-    auto reply = command<void (*)(Connection &, const StringView &)>(cmd::ping, msg);
-
-    return reply::parse<std::string>(*reply);
-}
-
-void Redis::swapdb(long long idx1, long long idx2) {
-    auto reply = command(cmd::swapdb, idx1, idx2);
-
-    reply::parse<void>(*reply);
-}
-
-// SERVER commands.
-
-void Redis::bgrewriteaof() {
-    auto reply = command(cmd::bgrewriteaof);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::bgsave() {
-    auto reply = command(cmd::bgsave);
-
-    reply::parse<void>(*reply);
-}
-
-long long Redis::dbsize() {
-    auto reply = command(cmd::dbsize);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::flushall(bool async) {
-    auto reply = command(cmd::flushall, async);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::flushdb(bool async) {
-    auto reply = command(cmd::flushdb, async);
-
-    reply::parse<void>(*reply);
-}
-
-std::string Redis::info() {
-    auto reply = command<void (*)(Connection &)>(cmd::info);
-
-    return reply::parse<std::string>(*reply);
-}
-
-std::string Redis::info(const StringView &section) {
-    auto reply = command<void (*)(Connection &, const StringView &)>(cmd::info, section);
-
-    return reply::parse<std::string>(*reply);
-}
-
-long long Redis::lastsave() {
-    auto reply = command(cmd::lastsave);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::save() {
-    auto reply = command(cmd::save);
-
-    reply::parse<void>(*reply);
-}
-
-// KEY commands.
-
-long long Redis::del(const StringView &key) {
-    auto reply = command(cmd::del, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString Redis::dump(const StringView &key) {
-    auto reply = command(cmd::dump, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::exists(const StringView &key) {
-    auto reply = command(cmd::exists, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool Redis::expire(const StringView &key, long long timeout) {
-    auto reply = command(cmd::expire, key, timeout);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::expireat(const StringView &key, long long timestamp) {
-    auto reply = command(cmd::expireat, key, timestamp);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::move(const StringView &key, long long db) {
-    auto reply = command(cmd::move, key, db);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::persist(const StringView &key) {
-    auto reply = command(cmd::persist, key);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::pexpire(const StringView &key, long long timeout) {
-    auto reply = command(cmd::pexpire, key, timeout);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::pexpireat(const StringView &key, long long timestamp) {
-    auto reply = command(cmd::pexpireat, key, timestamp);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long Redis::pttl(const StringView &key) {
-    auto reply = command(cmd::pttl, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString Redis::randomkey() {
-    auto reply = command(cmd::randomkey);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-void Redis::rename(const StringView &key, const StringView &newkey) {
-    auto reply = command(cmd::rename, key, newkey);
-
-    reply::parse<void>(*reply);
-}
-
-bool Redis::renamenx(const StringView &key, const StringView &newkey) {
-    auto reply = command(cmd::renamenx, key, newkey);
-
-    return reply::parse<bool>(*reply);
-}
-
-void Redis::restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace) {
-    auto reply = command(cmd::restore, key, val, ttl, replace);
-
-    reply::parse<void>(*reply);
-}
-
-long long Redis::touch(const StringView &key) {
-    auto reply = command(cmd::touch, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::ttl(const StringView &key) {
-    auto reply = command(cmd::ttl, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-std::string Redis::type(const StringView &key) {
-    auto reply = command(cmd::type, key);
-
-    return reply::parse<std::string>(*reply);
-}
-
-long long Redis::unlink(const StringView &key) {
-    auto reply = command(cmd::unlink, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::wait(long long numslaves, long long timeout) {
-    auto reply = command(cmd::wait, numslaves, timeout);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-long long Redis::append(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::append, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::bitcount(const StringView &key, long long start, long long end) {
-    auto reply = command(cmd::bitcount, key, start, end);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::bitop(BitOp op, const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::bitop, op, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::bitpos(const StringView &key,
-                            long long bit,
-                            long long start,
-                            long long end) {
-    auto reply = command(cmd::bitpos, key, bit, start, end);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::decr(const StringView &key) {
-    auto reply = command(cmd::decr, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::decrby(const StringView &key, long long decrement) {
-    auto reply = command(cmd::decrby, key, decrement);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString Redis::get(const StringView &key) {
-    auto reply = command(cmd::get, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::getbit(const StringView &key, long long offset) {
-    auto reply = command(cmd::getbit, key, offset);
-
-    return reply::parse<long long>(*reply);
-}
-
-std::string Redis::getrange(const StringView &key, long long start, long long end) {
-    auto reply = command(cmd::getrange, key, start, end);
-
-    return reply::parse<std::string>(*reply);
-}
-
-OptionalString Redis::getset(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::getset, key, val);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::incr(const StringView &key) {
-    auto reply = command(cmd::incr, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::incrby(const StringView &key, long long increment) {
-    auto reply = command(cmd::incrby, key, increment);
-
-    return reply::parse<long long>(*reply);
-}
-
-double Redis::incrbyfloat(const StringView &key, double increment) {
-    auto reply = command(cmd::incrbyfloat, key, increment);
-
-    return reply::parse<double>(*reply);
-}
-
-void Redis::psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-    auto reply = command(cmd::psetex, key, ttl, val);
-
-    reply::parse<void>(*reply);
-}
-
-bool Redis::set(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl,
-                    UpdateType type) {
-    auto reply = command(cmd::set, key, val, ttl.count(), type);
-
-    reply::rewrite_set_reply(*reply);
-
-    return reply::parse<bool>(*reply);
-}
-
-void Redis::setex(const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    auto reply = command(cmd::setex, key, ttl, val);
-
-    reply::parse<void>(*reply);
-}
-
-bool Redis::setnx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::setnx, key, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long Redis::setrange(const StringView &key, long long offset, const StringView &val) {
-    auto reply = command(cmd::setrange, key, offset, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::strlen(const StringView &key) {
-    auto reply = command(cmd::strlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// LIST commands.
-
-OptionalStringPair Redis::blpop(const StringView &key, long long timeout) {
-    auto reply = command(cmd::blpop, key, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-OptionalStringPair Redis::blpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return blpop(key, timeout.count());
-}
-
-OptionalStringPair Redis::brpop(const StringView &key, long long timeout) {
-    auto reply = command(cmd::brpop, key, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-OptionalStringPair Redis::brpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return brpop(key, timeout.count());
-}
-
-OptionalString Redis::brpoplpush(const StringView &source,
-                                    const StringView &destination,
-                                    long long timeout) {
-    auto reply = command(cmd::brpoplpush, source, destination, timeout);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString Redis::lindex(const StringView &key, long long index) {
-    auto reply = command(cmd::lindex, key, index);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-    auto reply = command(cmd::linsert, key, position, pivot, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::llen(const StringView &key) {
-    auto reply = command(cmd::llen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString Redis::lpop(const StringView &key) {
-    auto reply = command(cmd::lpop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::lpush(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::lpush, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::lpushx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::lpushx, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::lrem(const StringView &key, long long count, const StringView &val) {
-    auto reply = command(cmd::lrem, key, count, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::lset(const StringView &key, long long index, const StringView &val) {
-    auto reply = command(cmd::lset, key, index, val);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::ltrim(const StringView &key, long long start, long long stop) {
-    auto reply = command(cmd::ltrim, key, start, stop);
-
-    reply::parse<void>(*reply);
-}
-
-OptionalString Redis::rpop(const StringView &key) {
-    auto reply = command(cmd::rpop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString Redis::rpoplpush(const StringView &source, const StringView &destination) {
-    auto reply = command(cmd::rpoplpush, source, destination);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::rpush(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::rpush, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::rpushx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::rpushx, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::hdel(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hdel, key, field);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool Redis::hexists(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hexists, key, field);
-
-    return reply::parse<bool>(*reply);
-}
-
-OptionalString Redis::hget(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hget, key, field);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::hincrby(const StringView &key, const StringView &field, long long increment) {
-    auto reply = command(cmd::hincrby, key, field, increment);
-
-    return reply::parse<long long>(*reply);
-}
-
-double Redis::hincrbyfloat(const StringView &key, const StringView &field, double increment) {
-    auto reply = command(cmd::hincrbyfloat, key, field, increment);
-
-    return reply::parse<double>(*reply);
-}
-
-long long Redis::hlen(const StringView &key) {
-    auto reply = command(cmd::hlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool Redis::hset(const StringView &key, const StringView &field, const StringView &val) {
-    auto reply = command(cmd::hset, key, field, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-    return hset(key, item.first, item.second);
-}
-
-bool Redis::hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-    auto reply = command(cmd::hsetnx, key, field, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-    return hsetnx(key, item.first, item.second);
-}
-
-long long Redis::hstrlen(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hstrlen, key, field);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SET commands.
-
-long long Redis::sadd(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::sadd, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::scard(const StringView &key) {
-    auto reply = command(cmd::scard, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::sdiffstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sdiffstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::sinterstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sinterstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool Redis::sismember(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::sismember, key, member);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool Redis::smove(const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    auto reply = command(cmd::smove, source, destination, member);
-
-    return reply::parse<bool>(*reply);
-}
-
-OptionalString Redis::spop(const StringView &key) {
-    auto reply = command(cmd::spop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString Redis::srandmember(const StringView &key) {
-    auto reply = command(cmd::srandmember, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long Redis::srem(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::srem, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::sunionstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sunionstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-auto Redis::bzpopmax(const StringView &key, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax, key, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-auto Redis::bzpopmin(const StringView &key, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin, key, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-long long Redis::zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type,
-                        bool changed) {
-    auto reply = command(cmd::zadd, key, member, score, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::zcard(const StringView &key) {
-    auto reply = command(cmd::zcard, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-double Redis::zincrby(const StringView &key, double increment, const StringView &member) {
-    auto reply = command(cmd::zincrby, key, increment, member);
-
-    return reply::parse<double>(*reply);
-}
-
-long long Redis::zinterstore(const StringView &destination, const StringView &key, double weight) {
-    auto reply = command(cmd::zinterstore, destination, key, weight);
-
-    return reply::parse<long long>(*reply);
-}
-
-Optional<std::pair<std::string, double>> Redis::zpopmax(const StringView &key) {
-    auto reply = command(cmd::zpopmax, key, 1);
-
-    reply::rewrite_empty_array_reply(*reply);
-
-    return reply::parse<Optional<std::pair<std::string, double>>>(*reply);
-}
-
-Optional<std::pair<std::string, double>> Redis::zpopmin(const StringView &key) {
-    auto reply = command(cmd::zpopmin, key, 1);
-
-    reply::rewrite_empty_array_reply(*reply);
-
-    return reply::parse<Optional<std::pair<std::string, double>>>(*reply);
-}
-
-OptionalLongLong Redis::zrank(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrank, key, member);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-long long Redis::zrem(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrem, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::zremrangebyrank(const StringView &key, long long start, long long stop) {
-    auto reply = command(cmd::zremrangebyrank, key, start, stop);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalLongLong Redis::zrevrank(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrevrank, key, member);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-OptionalDouble Redis::zscore(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zscore, key, member);
-
-    return reply::parse<OptionalDouble>(*reply);
-}
-
-long long Redis::zunionstore(const StringView &destination, const StringView &key, double weight) {
-    auto reply = command(cmd::zunionstore, destination, key, weight);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-bool Redis::pfadd(const StringView &key, const StringView &element) {
-    auto reply = command(cmd::pfadd, key, element);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long Redis::pfcount(const StringView &key) {
-    auto reply = command(cmd::pfcount, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::pfmerge(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::pfmerge, destination, key);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-long long Redis::geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-    auto reply = command(cmd::geoadd, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalDouble Redis::geodist(const StringView &key,
-                                const StringView &member1,
-                                const StringView &member2,
-                                GeoUnit unit) {
-    auto reply = command(cmd::geodist, key, member1, member2, unit);
-
-    return reply::parse<OptionalDouble>(*reply);
-}
-
-OptionalString Redis::geohash(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::geohash, key, member);
-
-    return reply::parse_leniently<OptionalString>(*reply);
-}
-
-Optional<std::pair<double, double>> Redis::geopos(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::geopos, key, member);
-
-    return reply::parse_leniently<Optional<std::pair<double, double>>>(*reply);
-}
-
-OptionalLongLong Redis::georadius(const StringView &key,
-                                    const std::pair<double, double> &loc,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-    auto reply = command(cmd::georadius_store,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            destination,
-                            store_dist,
-                            count);
-
-    reply::rewrite_empty_array_reply(*reply);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-OptionalLongLong Redis::georadiusbymember(const StringView &key,
-                                            const StringView &member,
-                                            double radius,
-                                            GeoUnit unit,
-                                            const StringView &destination,
-                                            bool store_dist,
-                                            long long count) {
-    auto reply = command(cmd::georadiusbymember_store,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            destination,
-                            store_dist,
-                            count);
-
-    reply::rewrite_empty_array_reply(*reply);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-// SCRIPTING commands.
-
-bool Redis::script_exists(const StringView &sha1) {
-    auto reply = command(cmd::script_exists, sha1);
-
-    return reply::parse_leniently<bool>(*reply);
-}
-
-void Redis::script_flush() {
-    auto reply = command(cmd::script_flush);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::script_kill() {
-    auto reply = command(cmd::script_kill);
-
-    reply::parse<void>(*reply);
-}
-
-std::string Redis::script_load(const StringView &script) {
-    auto reply = command(cmd::script_load, script);
-
-    return reply::parse<std::string>(*reply);
-}
-
-// PUBSUB commands.
-
-long long Redis::publish(const StringView &channel, const StringView &message) {
-    auto reply = command(cmd::publish, channel, message);
-
-    return reply::parse<long long>(*reply);
-}
-
-// Transaction commands.
-
-void Redis::watch(const StringView &key) {
-    auto reply = command(cmd::watch, key);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::unwatch() {
-    auto reply = command(cmd::unwatch);
-
-    reply::parse<void>(*reply);
-}
-
-// Stream commands.
-
-long long Redis::xack(const StringView &key, const StringView &group, const StringView &id) {
-    auto reply = command(cmd::xack, key, group, id);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::xdel(const StringView &key, const StringView &id) {
-    auto reply = command(cmd::xdel, key, id);
-
-    return reply::parse<long long>(*reply);
-}
-
-void Redis::xgroup_create(const StringView &key,
-                            const StringView &group,
-                            const StringView &id,
-                            bool mkstream) {
-    auto reply = command(cmd::xgroup_create, key, group, id, mkstream);
-
-    reply::parse<void>(*reply);
-}
-
-void Redis::xgroup_setid(const StringView &key, const StringView &group, const StringView &id) {
-    auto reply = command(cmd::xgroup_setid, key, group, id);
-
-    reply::parse<void>(*reply);
-}
-
-long long Redis::xgroup_destroy(const StringView &key, const StringView &group) {
-    auto reply = command(cmd::xgroup_destroy, key, group);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::xgroup_delconsumer(const StringView &key,
-                                const StringView &group,
-                                const StringView &consumer) {
-    auto reply = command(cmd::xgroup_delconsumer, key, group, consumer);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::xlen(const StringView &key) {
-    auto reply = command(cmd::xlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long Redis::xtrim(const StringView &key, long long count, bool approx) {
-    auto reply = command(cmd::xtrim, key, count, approx);
-
-    return reply::parse<long long>(*reply);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.h
deleted file mode 100644
index 1333e6b68..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.h
+++ /dev/null
@@ -1,3631 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_H
-
-#include <string>
-#include <chrono>
-#include <memory>
-#include <initializer_list>
-#include <tuple>
-#include "connection_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "sentinel.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class Redis {
-public:
-    /// @brief Construct `Redis` instance with connection options and connection pool options.
-    /// @param connection_opts Connection options.
-    /// @param pool_opts Connection pool options.
-    /// @see `ConnectionOptions`
-    /// @see `ConnectionPoolOptions`
-    /// @see https://github.com/sewenew/redis-plus-plus#connection
-    explicit Redis(const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(std::make_shared<ConnectionPool>(pool_opts, connection_opts)) {}
-
-    /// @brief Construct `Redis` instance with URI.
-    /// @param uri URI, e.g. 'tcp://127.0.0.1', 'tcp://127.0.0.1:6379', or 'unix://path/to/socket'.
-    ///            Full URI scheme: 'tcp://[[username:]password@]host[:port][/db]' or
-    ///            unix://[[username:]password@]path-to-unix-domain-socket[/db]
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/37
-    /// @see https://github.com/sewenew/redis-plus-plus#connection
-    explicit Redis(const std::string &uri);
-
-    /// @brief Construct `Redis` instance with Redis sentinel, i.e. get node info from sentinel.
-    /// @param sentinel `Sentinel` instance.
-    /// @param master_name Name of master node.
-    /// @param role Connect to master node or slave node.
-    ///             - Role::MASTER: Connect to master node.
-    ///             - Role::SLAVE: Connect to slave node.
-    /// @param connection_opts Connection options.
-    /// @param pool_opts Connection pool options.
-    /// @see `Sentinel`
-    /// @see `Role`
-    /// @see https://github.com/sewenew/redis-plus-plus#redis-sentinel
-    Redis(const std::shared_ptr<Sentinel> &sentinel,
-            const std::string &master_name,
-            Role role,
-            const ConnectionOptions &connection_opts,
-            const ConnectionPoolOptions &pool_opts = {}) :
-                _pool(std::make_shared<ConnectionPool>(SimpleSentinel(sentinel, master_name, role),
-                                                        pool_opts,
-                                                        connection_opts)) {}
-
-    /// @brief `Redis` is not copyable.
-    Redis(const Redis &) = delete;
-
-    /// @brief `Redis` is not copyable.
-    Redis& operator=(const Redis &) = delete;
-
-    /// @brief `Redis` is movable.
-    Redis(Redis &&) = default;
-
-    /// @brief `Redis` is movable.
-    Redis& operator=(Redis &&) = default;
-
-    /// @brief Create a pipeline.
-    /// @param new_connection Whether creating a `Pipeline` object in a new connection.
-    /// @return The created pipeline.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#pipeline
-    Pipeline pipeline(bool new_connection = true);
-
-    /// @brief Create a transaction.
-    /// @param piped Whether commands in a transaction should be sent in a pipeline to reduce RTT.
-    /// @param new_connection Whether creating a `Pipeline` object in a new connection.
-    /// @return The created transaction.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#transaction
-    Transaction transaction(bool piped = false, bool new_connection = true);
-
-    /// @brief Create a subscriber.
-    /// @return The created subscriber.
-    /// @note Instead of picking a connection from the underlying connection pool,
-    ///       this method will create a new connection to Redis. So it's not a cheap operation,
-    ///       and you'd better reuse the returned object as much as possible.
-    /// @see https://github.com/sewenew/redis-plus-plus#publishsubscribe
-    Subscriber subscriber();
-
-    template <typename Cmd, typename ...Args>
-    auto command(Cmd cmd, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename ...Args>
-    auto command(const StringView &cmd_name, Args &&...args)
-        -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type;
-
-    template <typename Result, typename ...Args>
-    Result command(const StringView &cmd_name, Args &&...args);
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // CONNECTION commands.
-
-    /// @brief Send password to Redis.
-    /// @param password Password.
-    /// @note Normally, you should not call this method.
-    ///       Instead, you should set password with `ConnectionOptions` or URI.
-    /// @see https://redis.io/commands/auth
-    void auth(const StringView &password);
-
-    /// @brief Send user and password to Redis.
-    /// @param user User name.
-    /// @param password Password.
-    /// @note Normally, you should not call this method.
-    ///       Instead, you should set password with `ConnectionOptions` or URI.
-    ///       Also this overload only works with Redis 6.0 or later.
-    /// @see https://redis.io/commands/auth
-    void auth(const StringView &user, const StringView &password);
-
-    /// @brief Ask Redis to return the given message.
-    /// @param msg Message to be sent.
-    /// @return Return the given message.
-    /// @see https://redis.io/commands/echo
-    std::string echo(const StringView &msg);
-
-    /// @brief Test if the connection is alive.
-    /// @return Always return *PONG*.
-    /// @see https://redis.io/commands/ping
-    std::string ping();
-
-    /// @brief Test if the connection is alive.
-    /// @param msg Message sent to Redis.
-    /// @return Return the given message.
-    /// @see https://redis.io/commands/ping
-    std::string ping(const StringView &msg);
-
-    // After sending QUIT, only the current connection will be close, while
-    // other connections in the pool is still open. This is a strange behavior.
-    // So we DO NOT support the QUIT command. If you want to quit connection to
-    // server, just destroy the Redis object.
-    //
-    // void quit();
-
-    // We get a connection from the pool, and send the SELECT command to switch
-    // to a specified DB. However, when we try to send other commands to the
-    // given DB, we might get a different connection from the pool, and these
-    // commands, in fact, work on other DB. e.g.
-    //
-    // redis.select(1); // get a connection from the pool and switch to the 1th DB
-    // redis.get("key"); // might get another connection from the pool,
-    //                   // and try to get 'key' on the default DB
-    //
-    // Obviously, this is NOT what we expect. So we DO NOT support SELECT command.
-    // In order to select a DB, we can specify the DB index with the ConnectionOptions.
-    //
-    // However, since Pipeline and Transaction always send multiple commands on a
-    // single connection, these two classes have a *select* method.
-    //
-    // void select(long long idx);
-
-    /// @brief Swap two Redis databases.
-    /// @param idx1 The index of the first database.
-    /// @param idx2 The index of the second database.
-    /// @see https://redis.io/commands/swapdb
-    void swapdb(long long idx1, long long idx2);
-
-    // SERVER commands.
-
-    /// @brief Rewrite AOF in the background.
-    /// @see https://redis.io/commands/bgrewriteaof
-    void bgrewriteaof();
-
-    /// @brief Save database in the background.
-    /// @see https://redis.io/commands/bgsave
-    void bgsave();
-
-    /// @brief Get the size of the currently selected database.
-    /// @return Number of keys in currently selected database.
-    /// @see https://redis.io/commands/dbsize
-    long long dbsize();
-
-    /// @brief Remove keys of all databases.
-    /// @param async Whether flushing databases asynchronously, i.e. without blocking the server.
-    /// @see https://redis.io/commands/flushall
-    void flushall(bool async = false);
-
-    /// @brief Remove keys of current databases.
-    /// @param async Whether flushing databases asynchronously, i.e. without blocking the server.
-    /// @see https://redis.io/commands/flushdb
-    void flushdb(bool async = false);
-
-    /// @brief Get the info about the server.
-    /// @return Server info.
-    /// @see https://redis.io/commands/info
-    std::string info();
-
-    /// @brief Get the info about the server on the given section.
-    /// @param section Section.
-    /// @return Server info.
-    /// @see https://redis.io/commands/info
-    std::string info(const StringView &section);
-
-    /// @brief Get the UNIX timestamp in seconds, at which the database was saved successfully.
-    /// @return The last saving time.
-    /// @see https://redis.io/commands/lastsave
-    long long lastsave();
-
-    /// @brief Save databases into RDB file **synchronously**, i.e. block the server during saving.
-    /// @see https://redis.io/commands/save
-    void save();
-
-    // KEY commands.
-
-    /// @brief Delete the given key.
-    /// @param key Key.
-    /// @return Number of keys removed.
-    /// @retval 1 If the key exists, and has been removed.
-    /// @retval 0 If the key does not exist.
-    /// @see https://redis.io/commands/del
-    long long del(const StringView &key);
-
-    /// @brief Delete the given list of keys.
-    /// @param first Iterator to the first key in the range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys removed.
-    /// @see https://redis.io/commands/del
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    /// @brief Delete the given list of keys.
-    /// @param il Initializer list of keys to be deleted.
-    /// @return Number of keys removed.
-    /// @see https://redis.io/commands/del
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    /// @brief Get the serialized valued stored at key.
-    /// @param key Key.
-    /// @return The serialized value.
-    /// @note If key does not exist, `dump` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/dump
-    OptionalString dump(const StringView &key);
-
-    /// @brief Check if the given key exists.
-    /// @param key Key.
-    /// @return Whether the given key exists.
-    /// @retval 1 If key exists.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/exists
-    long long exists(const StringView &key);
-
-    /// @brief Check if the given keys exist.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys existing.
-    /// @see https://redis.io/commands/exists
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    /// @brief Check if the given keys exist.
-    /// @param il Initializer list of keys to be checked.
-    /// @return Number of keys existing.
-    /// @see https://redis.io/commands/exists
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in seconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expire
-    bool expire(const StringView &key, long long timeout);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in seconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expire
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in seconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expireat
-    bool expireat(const StringView &key, long long timestamp);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in seconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/expireat
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    /// @brief Get keys matching the given pattern.
-    /// @param pattern Pattern.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @note It's always a bad idea to call `keys`, since it might block Redis for a long time,
-    ///       especially when the data set is very big.
-    /// @see `Redis::scan`
-    /// @see https://redis.io/commands/keys
-    template <typename Output>
-    void keys(const StringView &pattern, Output output);
-
-    /// @brief Move a key to the given database.
-    /// @param key Key.
-    /// @param db The destination database.
-    /// @return Whether key has been moved.
-    /// @retval true If key has been moved.
-    /// @retval false If key was not moved.
-    /// @see https://redis.io/commands/move
-    bool move(const StringView &key, long long db);
-
-    /// @brief Remove timeout on key.
-    /// @param key Key.
-    /// @return Whether timeout has been removed.
-    /// @retval true If timeout has been removed.
-    /// @retval false If key does not exist, or does not have an associated timeout.
-    /// @see https://redis.io/commands/persist
-    bool persist(const StringView &key);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in milliseconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpire
-    bool pexpire(const StringView &key, long long timeout);
-
-    /// @brief Set a timeout on key.
-    /// @param key Key.
-    /// @param timeout Timeout in milliseconds.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpire
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in milliseconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpireat
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    /// @brief Set a timeout on key, i.e. expire the key at a future time point.
-    /// @param key Key.
-    /// @param timestamp Time in milliseconds since UNIX epoch.
-    /// @return Whether timeout has been set.
-    /// @retval true If timeout has been set.
-    /// @retval false If key does not exist.
-    /// @see https://redis.io/commands/pexpireat
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    /// @brief Get the TTL of a key in milliseconds.
-    /// @param key Key.
-    /// @return TTL of the key in milliseconds.
-    /// @see https://redis.io/commands/pttl
-    long long pttl(const StringView &key);
-
-    /// @brief Get a random key from current database.
-    /// @return A random key.
-    /// @note If the database is empty, `randomkey` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/randomkey
-    OptionalString randomkey();
-
-    /// @brief Rename `key` to `newkey`.
-    /// @param key Key to be renamed.
-    /// @param newkey The new name of the key.
-    /// @see https://redis.io/commands/rename
-    void rename(const StringView &key, const StringView &newkey);
-
-    /// @brief Rename `key` to `newkey` if `newkey` does not exist.
-    /// @param key Key to be renamed.
-    /// @param newkey The new name of the key.
-    /// @return Whether key has been renamed.
-    /// @retval true If key has been renamed.
-    /// @retval false If newkey already exists.
-    /// @see https://redis.io/commands/renamenx
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    /// @brief Create a key with the value obtained by `Redis::dump`.
-    /// @param key Key.
-    /// @param val Value obtained by `Redis::dump`.
-    /// @param ttl Timeout of the created key in milliseconds. If `ttl` is 0, set no timeout.
-    /// @param replace Whether to overwrite an existing key.
-    ///                If `replace` is `true` and key already exists, throw an exception.
-    /// @see https://redis.io/commands/restore
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    /// @brief Create a key with the value obtained by `Redis::dump`.
-    /// @param key Key.
-    /// @param val Value obtained by `Redis::dump`.
-    /// @param ttl Timeout of the created key in milliseconds. If `ttl` is 0, set no timeout.
-    /// @param replace Whether to overwrite an existing key.
-    ///                If `replace` is `true` and key already exists, throw an exception.
-    /// @see https://redis.io/commands/restore
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    /// @brief Scan keys of the database matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_set<std::string> keys;
-    /// while (true) {
-    ///     cursor = redis.scan(cursor, "pattern:*", 10, std::inserter(keys, keys.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of the keys to be scanned.
-    /// @param count A hint for how many keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    /// TODO: support the TYPE option for Redis 6.0.
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all keys of the database.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    Output output);
-
-    /// @brief Scan keys of the database matching the given pattern.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of the keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan keys of the database matching the given pattern.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many keys to be scanned.
-    /// @param output Output iterator to the destination where the returned keys are stored.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/scan
-    template <typename Output>
-    long long scan(long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Update the last access time of the given key.
-    /// @param key Key.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    long long touch(const StringView &key);
-
-    /// @brief Update the last access time of the given key.
-    /// @param first Iterator to the first key to be touched.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    /// @brief Update the last access time of the given key.
-    /// @param il Initializer list of keys to be touched.
-    /// @return Whether last access time of the key has been updated.
-    /// @retval 1 If key exists, and last access time has been updated.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/touch
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    /// @brief Get the remaining Time-To-Live of a key.
-    /// @param key Key.
-    /// @return TTL in seconds.
-    /// @retval TTL If the key has a timeout.
-    /// @retval -1 If the key exists but does not have a timeout.
-    /// @retval -2 If the key does not exist.
-    /// @note In Redis 2.6 or older, `ttl` returns -1 if the key does not exist,
-    ///       or if the key exists but does not have a timeout.
-    /// @see https://redis.io/commands/ttl
-    long long ttl(const StringView &key);
-
-    /// @brief Get the type of the value stored at key.
-    /// @param key Key.
-    /// @return The type of the value.
-    /// @see https://redis.io/commands/type
-    std::string type(const StringView &key);
-
-    /// @brief Remove the given key asynchronously, i.e. without blocking Redis.
-    /// @param key Key.
-    /// @return Whether the key has been removed.
-    /// @retval 1 If key exists, and has been removed.
-    /// @retval 0 If key does not exist.
-    /// @see https://redis.io/commands/unlink
-    long long unlink(const StringView &key);
-
-    /// @brief Remove the given keys asynchronously, i.e. without blocking Redis.
-    /// @param first Iterator to the first key in the given range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of keys that have been removed.
-    /// @see https://redis.io/commands/unlink
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    /// @brief Remove the given keys asynchronously, i.e. without blocking Redis.
-    /// @param il Initializer list of keys to be unlinked.
-    /// @return Number of keys that have been removed.
-    /// @see https://redis.io/commands/unlink
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    /// @brief Wait until previous write commands are successfully replicated to at
-    ///        least the specified number of replicas or the given timeout has been reached.
-    /// @param numslaves Number of replicas.
-    /// @param timeout Timeout in milliseconds. If timeout is 0ms, wait forever.
-    /// @return Number of replicas that have been successfully replicated these write commands.
-    /// @note The return value might be less than `numslaves`, because timeout has been reached.
-    /// @see https://redis.io/commands/wait
-    long long wait(long long numslaves, long long timeout);
-
-    /// @brief Wait until previous write commands are successfully replicated to at
-    ///        least the specified number of replicas or the given timeout has been reached.
-    /// @param numslaves Number of replicas.
-    /// @param timeout Timeout in milliseconds. If timeout is 0ms, wait forever.
-    /// @return Number of replicas that have been successfully replicated these write commands.
-    /// @note The return value might be less than `numslaves`, because timeout has been reached.
-    /// @see https://redis.io/commands/wait
-    /// TODO: Support default parameter for `timeout` to wait forever.
-    long long wait(long long numslaves, const std::chrono::milliseconds &timeout);
-
-    // STRING commands.
-
-    /// @brief Append the given string to the string stored at key.
-    /// @param key Key.
-    /// @param str String to be appended.
-    /// @return The length of the string after the append operation.
-    /// @see https://redis.io/commands/append
-    long long append(const StringView &key, const StringView &str);
-
-    /// @brief Get the number of bits that have been set for the given range of the string.
-    /// @param key Key.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return Number of bits that have been set.
-    /// @note The index can be negative to index from the end of the string.
-    /// @see https://redis.io/commands/bitcount
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    /// @brief Do bit operation on the string stored at `key`, and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param key The key where the string to be operated is stored.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    /// @brief Do bit operations on the strings stored at the given keys,
-    ///        and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param first Iterator to the first key where the string to be operated is stored.
-    /// @param last Off-the-end iterator to the given range of keys.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    /// @brief Do bit operations on the strings stored at the given keys,
-    ///        and save the result to `destination`.
-    /// @param op Bit operations.
-    /// @param destination The destination key where the result is saved.
-    /// @param il Initializer list of keys where the strings are operated.
-    /// @return The length of the string saved at `destination`.
-    /// @see https://redis.io/commands/bitop
-    /// @see `BitOp`
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    /// @brief Get the position of the first bit set to 0 or 1 in the given range of the string.
-    /// @param key Key.
-    /// @param bit 0 or 1.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return The position of the first bit set to 0 or 1.
-    /// @see https://redis.io/commands/bitpos
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    /// @brief Decrement the integer stored at key by 1.
-    /// @param key Key.
-    /// @return The value after the decrement.
-    /// @see https://redis.io/commands/decr
-    long long decr(const StringView &key);
-
-    /// @brief Decrement the integer stored at key by `decrement`.
-    /// @param key Key.
-    /// @param decrement Decrement.
-    /// @return The value after the decrement.
-    /// @see https://redis.io/commands/decrby
-    long long decrby(const StringView &key, long long decrement);
-
-    /// @brief Get the string value stored at key.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto val = redis.get("key");
-    /// if (val)
-    ///     std::cout << *val << std::endl;
-    /// else
-    ///     std::cout << "key not exist" << std::endl;
-    /// @endcode
-    /// @param key Key.
-    /// @return The value stored at key.
-    /// @note If key does not exist, `get` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/get
-    OptionalString get(const StringView &key);
-
-    /// @brief Get the bit value at offset in the string.
-    /// @param key Key.
-    /// @param offset Offset.
-    /// @return The bit value.
-    /// @see https://redis.io/commands/getbit
-    long long getbit(const StringView &key, long long offset);
-
-    /// @brief Get the substring of the string stored at key.
-    /// @param key Key.
-    /// @param start Start index (inclusive) of the range. 0 means the beginning of the string.
-    /// @param end End index (inclusive) of the range. -1 means the end of the string.
-    /// @return The substring in range [start, end]. If key does not exist, return an empty string.
-    /// @see https://redis.io/commands/getrange
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    /// @brief Atomically set the string stored at `key` to `val`, and return the old value.
-    /// @param key Key.
-    /// @param val Value to be set.
-    /// @return The old value stored at key.
-    /// @note If key does not exist, `getset` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/getset
-    /// @see `OptionalString`
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    /// @brief Increment the integer stored at key by 1.
-    /// @param key Key.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incr
-    long long incr(const StringView &key);
-
-    /// @brief Increment the integer stored at key by `increment`.
-    /// @param key Key.
-    /// @param increment Increment.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incrby
-    long long incrby(const StringView &key, long long increment);
-
-    /// @brief Increment the floating point number stored at key by `increment`.
-    /// @param key Key.
-    /// @param increment Increment.
-    /// @return The value after the increment.
-    /// @see https://redis.io/commands/incrbyfloat
-    double incrbyfloat(const StringView &key, double increment);
-
-    /// @brief Get the values of multiple keys atomically.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// std::vector<OptionalString> vals;
-    /// redis.mget(keys.begin(), keys.end(), std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "key does not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param first Iterator to the first key of the given range.
-    /// @param last Off-the-end iterator to the given range.
-    /// @param output Output iterator to the destination where the values are stored.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given key might not exist (in this case, the value of the corresponding
-    ///       key is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/mget
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    /// @brief Get the values of multiple keys atomically.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<OptionalString> vals;
-    /// redis.mget({"k1", "k2", "k3"}, std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "key does not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param il Initializer list of keys.
-    /// @param output Output iterator to the destination where the values are stored.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given key might not exist (in this case, the value of the corresponding
-    ///       key is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/mget
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    /// @brief Set multiple key-value pairs.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::pair<std::string, std::string>> kvs1 = {{"k1", "v1"}, {"k2", "v2"}};
-    /// redis.mset(kvs1.begin(), kvs1.end());
-    /// std::unordered_map<std::string, std::string> kvs2 = {{"k3", "v3"}, {"k4", "v4"}};
-    /// redis.mset(kvs2.begin(), kvs2.end());
-    /// @endcode
-    /// @param first Iterator to the first key-value pair.
-    /// @param last Off-the-end iterator to the given range.
-    /// @see https://redis.io/commands/mset
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    /// @brief Set multiple key-value pairs.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.mset({std::make_pair("k1", "v1"), std::make_pair("k2", "v2")});
-    /// @endcode
-    /// @param il Initializer list of key-value pairs.
-    /// @see https://redis.io/commands/mset
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    /// @brief Set the given key-value pairs if all specified keys do not exist.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::pair<std::string, std::string>> kvs1;
-    /// redis.msetnx(kvs1.begin(), kvs1.end());
-    /// std::unordered_map<std::string, std::string> kvs2;
-    /// redis.msetnx(kvs2.begin(), kvs2.end());
-    /// @endcode
-    /// @param first Iterator to the first key-value pair.
-    /// @param last Off-the-end iterator of the given range.
-    /// @return Whether all keys have been set.
-    /// @retval true If all keys have been set.
-    /// @retval false If no key was set, i.e. at least one key already exist.
-    /// @see https://redis.io/commands/msetnx
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    /// @brief Set the given key-value pairs if all specified keys do not exist.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.msetnx({make_pair("k1", "v1"), make_pair("k2", "v2")});
-    /// @endcode
-    /// @param il Initializer list of key-value pairs.
-    /// @return Whether all keys have been set.
-    /// @retval true If all keys have been set.
-    /// @retval false If no key was set, i.e. at least one key already exist.
-    /// @see https://redis.io/commands/msetnx
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    /// @brief Set key-value pair with the given timeout in milliseconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in milliseconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/psetex
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    /// @brief Set key-value pair with the given timeout in milliseconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in milliseconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/psetex
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    /// @brief Set a key-value pair.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Set a key-value pair.
-    /// redis.set("key", "value");
-    /// // Set a key-value pair, and expire it after 10 seconds.
-    /// redis.set("key", "value", std::chrono::seconds(10));
-    /// // Set a key-value pair with a timeout, only if the key already exists.
-    /// if (redis.set("key", "value", std::chrono::seconds(10), UpdateType::EXIST))
-    ///     std::cout << "OK" << std::endl;
-    /// else
-    ///     std::cout << "key does not exist" << std::endl;
-    /// @endcode
-    /// @param key Key.
-    /// @param val Value.
-    /// @param ttl Timeout on the key. If `ttl` is 0ms, do not set timeout.
-    /// @param type Options for set command:
-    ///             - UpdateType::EXIST: Set the key only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Set the key only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always set the key no matter whether it exists.
-    /// @return Whether the key has been set.
-    /// @retval true If the key has been set.
-    /// @retval false If the key was not set, because of the given option.
-    /// @see https://redis.io/commands/set
-    // TODO: Support KEEPTTL option for Redis 6.0
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    // TODO: add SETBIT command.
-
-    /// @brief Set key-value pair with the given timeout in seconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in seconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/setex
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    /// @brief Set key-value pair with the given timeout in seconds.
-    /// @param key Key.
-    /// @param ttl Time-To-Live in seconds.
-    /// @param val Value.
-    /// @see https://redis.io/commands/setex
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    /// @brief Set the key if it does not exist.
-    /// @param key Key.
-    /// @param val Value.
-    /// @return Whether the key has been set.
-    /// @retval true If the key has been set.
-    /// @retval false If the key was not set, i.e. the key already exists.
-    /// @see https://redis.io/commands/setnx
-    bool setnx(const StringView &key, const StringView &val);
-
-    /// @brief Set the substring starting from `offset` to the given value.
-    /// @param key Key.
-    /// @param offset Offset.
-    /// @param val Value.
-    /// @return The length of the string after this operation.
-    /// @see https://redis.io/commands/setrange
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    /// @brief Get the length of the string stored at key.
-    /// @param key Key.
-    /// @return The length of the string.
-    /// @note If key does not exist, `strlen` returns 0.
-    /// @see https://redis.io/commands/strlen
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    /// @brief Pop the first element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    /// @brief Pop the first element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param il Initializer list of keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the first element of multiple lists in a blocking way.
-    /// @param il Initializer list of keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::lpop`
-    /// @see https://redis.io/commands/blpop
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the last element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    /// @brief Pop the last element of the list in a blocking way.
-    /// @param key Key where the list is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If list is empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param il Initializer list of lists.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param first Iterator to the first list.
-    /// @param last Off-the-end iterator to the list range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Pop the last element of multiple lists in a blocking way.
-    /// @param il Initializer list of list keys.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-element pair.
-    /// @note If all lists are empty and timeout reaches, return `OptionalStringPair{}` (`std::nullopt`).
-    /// @see `Redis::rpop`
-    /// @see https://redis.io/commands/brpop
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop last element of one list and push it to the left of another list in blocking way.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @param timeout Timeout. 0 means block forever.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `brpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::rpoplpush`
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    /// @brief Pop last element of one list and push it to the left of another list in blocking way.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @param timeout Timeout. 0 means block forever.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `brpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::rpoplpush`
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    /// @brief Get the element at the given index of the list.
-    /// @param key Key where the list is stored.
-    /// @param index Zero-base index, and -1 means the last element.
-    /// @return The element at the given index.
-    /// @see https://redis.io/commands/lindex
-    OptionalString lindex(const StringView &key, long long index);
-
-    /// @brief Insert an element to a list before or after the pivot element.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Insert 'hello' before 'world'
-    /// auto len = redis.linsert("list", InsertPosition::BEFORE, "world", "hello");
-    /// if (len == -1)
-    ///     std::cout << "there's no 'world' in the list" << std::endl;
-    /// else
-    ///     std::cout << "after the operation, the length of the list is " << len << std::endl;
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param position Before or after the pivot element.
-    /// @param pivot The pivot value. The `pivot` is the value of the element, not the index.
-    /// @param val Element to be inserted.
-    /// @return The length of the list after the operation.
-    /// @note If the pivot value is not found, `linsert` returns -1.
-    /// @see `InsertPosition`
-    /// @see https://redis.io/commands/linsert
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    /// @brief Get the length of the list.
-    /// @param key Key where the list is stored.
-    /// @return The length of the list.
-    /// @see https://redis.io/commands/llen
-    long long llen(const StringView &key);
-
-    /// @brief Pop the first element of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto element = redis.lpop("list");
-    /// if (element)
-    ///     std::cout << *element << std::endl;
-    /// else
-    ///     std::cout << "list is empty, i.e. list does not exist" << std::endl;
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @return The popped element.
-    /// @note If list is empty, i.e. key does not exist, return `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/lpop
-    OptionalString lpop(const StringView &key);
-
-    /// @brief Push an element to the beginning of the list.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    long long lpush(const StringView &key, const StringView &val);
-
-    /// @brief Push multiple elements to the beginning of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> elements = {"e1", "e2", "e3"};
-    /// redis.lpush("list", elements.begin(), elements.end());
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param first Iterator to the first element to be pushed.
-    /// @param last Off-the-end iterator to the given element range.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    /// @brief Push multiple elements to the beginning of the list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.lpush("list", {"e1", "e2", "e3"});
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param il Initializer list of elements.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpush
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    /// @brief Push an element to the beginning of the list, only if the list already exists.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/lpushx
-    // TODO: add a multiple elements overload.
-    long long lpushx(const StringView &key, const StringView &val);
-
-    /// @brief Get elements in the given range of the given list.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> elements;
-    /// // Save all elements of a Redis list to a vector of string.
-    /// redis.lrange("list", 0, -1, std::back_inserter(elements));
-    /// @endcode
-    /// @param key Key where the list is stored.
-    /// @param start Start index of the range. Index can be negative, which mean index from the end.
-    /// @param stop End index of the range.
-    /// @param output Output iterator to the destination where the results are saved.
-    /// @see https://redis.io/commands/lrange
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Remove the first `count` occurrences of elements equal to `val`.
-    /// @param key Key where the list is stored.
-    /// @param count Number of occurrences to be removed.
-    /// @param val Value.
-    /// @return Number of elements removed.
-    /// @note `count` can be positive, negative and 0. Check the reference for detail.
-    /// @see https://redis.io/commands/lrem
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    /// @brief Set the element at the given index to the specified value.
-    /// @param key Key where the list is stored.
-    /// @param index Index of the element to be set.
-    /// @param val Value.
-    /// @see https://redis.io/commands/lset
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    /// @brief Trim a list to keep only element in the given range.
-    /// @param key Key where the key is stored.
-    /// @param start Start of the index.
-    /// @param stop End of the index.
-    /// @see https://redis.io/commands/ltrim
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    /// @brief Pop the last element of a list.
-    /// @param key Key where the list is stored.
-    /// @return The popped element.
-    /// @note If the list is empty, i.e. key does not exist, `rpop` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/rpop
-    OptionalString rpop(const StringView &key);
-
-    /// @brief Pop last element of one list and push it to the left of another list.
-    /// @param source Key of the source list.
-    /// @param destination Key of the destination list.
-    /// @return The popped element.
-    /// @note If the source list does not exist, `rpoplpush` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/brpoplpush
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    /// @brief Push an element to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    long long rpush(const StringView &key, const StringView &val);
-
-    /// @brief Push multiple elements to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param first Iterator to the first element to be pushed.
-    /// @param last Off-the-end iterator to the given element range.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    /// @brief Push multiple elements to the end of the list.
-    /// @param key Key where the list is stored.
-    /// @param il Initializer list of elements to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpush
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    /// @brief Push an element to the end of the list, only if the list already exists.
-    /// @param key Key where the list is stored.
-    /// @param val Element to be pushed.
-    /// @return The length of the list after the operation.
-    /// @see https://redis.io/commands/rpushx
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    /// @brief Remove the given field from hash.
-    /// @param key Key where the hash is stored.
-    /// @param field Field to be removed.
-    /// @return Whether the field has been removed.
-    /// @retval 1 If the field exists, and has been removed.
-    /// @retval 0 If the field does not exist.
-    /// @see https://redis.io/commands/hdel
-    long long hdel(const StringView &key, const StringView &field);
-
-    /// @brief Remove multiple fields from hash.
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field to be removed.
-    /// @param last Off-the-end iterator to the given field range.
-    /// @return Number of fields that has been removed.
-    /// @see https://redis.io/commands/hdel
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple fields from hash.
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of fields.
-    /// @return Number of fields that has been removed.
-    /// @see https://redis.io/commands/hdel
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    /// @brief Check if the given field exists in hash.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Whether the field exists.
-    /// @retval true If the field exists in hash.
-    /// @retval false If the field does not exist.
-    /// @see https://redis.io/commands/hexists
-    bool hexists(const StringView &key, const StringView &field);
-
-    /// @brief Get the value of the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Value of the given field.
-    /// @note If field does not exist, `hget` returns `OptionalString{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/hget
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    /// @brief Get all field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> results;
-    /// // Save all field-value pairs of a Redis hash to an unordered_map<string, string>.
-    /// redis.hgetall("hash", std::inserter(results, results.begin()));
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hgetall` on a large hash, since it will block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hgetall
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    /// @brief Increment the integer stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param increment Increment.
-    /// @return The value of the field after the increment.
-    /// @see https://redis.io/commands/hincrby
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    /// @brief Increment the floating point number stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param increment Increment.
-    /// @return The value of the field after the increment.
-    /// @see https://redis.io/commands/hincrbyfloat
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    /// @brief Get all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hkeys` on a large hash, since it will block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hkeys
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    /// @brief Get the number of fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @return Number of fields.
-    /// @see https://redis.io/commands/hlen
-    long long hlen(const StringView &key);
-
-    /// @brief Get values of multiple fields.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> fields = {"f1", "f2"};
-    /// std::vector<OptionalString> vals;
-    /// redis.hmget("hash", fields.begin(), fields.end(), std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "field not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field.
-    /// @param last Off-the-end iterator to the given field range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given field might not exist (in this case, the value of the corresponding
-    ///       field is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/hmget
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    /// @brief Get values of multiple fields.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<OptionalString> vals;
-    /// redis.hmget("hash", {"f1", "f2"}, std::back_inserter(vals));
-    /// for (const auto &val : vals) {
-    ///     if (val)
-    ///         std::cout << *val << std::endl;
-    ///     else
-    ///         std::cout << "field not exist" << std::endl;
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of fields.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The destination should be a container of `OptionalString` type,
-    ///       since the given field might not exist (in this case, the value of the corresponding
-    ///       field is `OptionalString{}` (`std::nullopt`)).
-    /// @see https://redis.io/commands/hmget
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    /// @brief Set multiple field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> m = {{"f1", "v1"}, {"f2", "v2"}};
-    /// redis.hmset("hash", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field-value pair.
-    /// @param last Off-the-end iterator to the range.
-    /// @see https://redis.io/commands/hmset
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    /// @brief Set multiple field-value pairs of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.hmset("hash", {std::make_pair("f1", "v1"), std::make_pair("f2", "v2")});
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of field-value pairs.
-    /// @see https://redis.io/commands/hmset
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    /// @brief Scan fields of the given hash matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_map<std::string, std::string> kvs;
-    /// while (true) {
-    ///     cursor = redis.hscan("hash", cursor, "pattern:*", 10, std::inserter(kvs, kvs.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan fields of the given hash matching the given pattern.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all fields of the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/hscan
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Set hash field to value.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param val Value.
-    /// @return Whether the given field is a new field.
-    /// @retval true If the given field didn't exist, and a new field has been added.
-    /// @retval false If the given field already exists, and its value has been overwritten.
-    /// @note When `hset` returns false, it does not mean that the method failed to set the field.
-    ///       Instead, it means that the field already exists, and we've overwritten its value.
-    ///       If `hset` fails, it will throw an exception of `Exception` type.
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/9
-    /// @see https://redis.io/commands/hset
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    /// @brief Set hash field to value.
-    /// @param key Key where the hash is stored.
-    /// @param item The field-value pair to be set.
-    /// @return Whether the given field is a new field.
-    /// @retval true If the given field didn't exist, and a new field has been added.
-    /// @retval false If the given field already exists, and its value has been overwritten.
-    /// @note When `hset` returns false, it does not mean that the method failed to set the field.
-    ///       Instead, it means that the field already exists, and we've overwritten its value.
-    ///       If `hset` fails, it will throw an exception of `Exception` type.
-    /// @see https://github.com/sewenew/redis-plus-plus/issues/9
-    /// @see https://redis.io/commands/hset
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    /// @brief Set multiple fields of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, std::string> m = {{"f1", "v1"}, {"f2", "v2"}};
-    /// redis.hset("hash", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param first Iterator to the first field to be set.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of fields that have been added, i.e. fields that not existed before.
-    /// @see https://redis.io/commands/hset
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value, long long>::type;
-
-    /// @brief Set multiple fields of the given hash.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.hset("hash", {std::make_pair("f1", "v1"), std::make_pair("f2", "v2")});
-    /// @endcode
-    /// @param key Key where the hash is stored.
-    /// @param il Initializer list of field-value pairs.
-    /// @return Number of fields that have been added, i.e. fields that not existed before.
-    /// @see https://redis.io/commands/hset
-    template <typename T>
-    long long hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    /// @brief Set hash field to value, only if the given field does not exist.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @param val Value.
-    /// @return Whether the field has been set.
-    /// @retval true If the field has been set.
-    /// @retval false If failed to set the field, i.e. the field already exists.
-    /// @see https://redis.io/commands/hsetnx
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    /// @brief Set hash field to value, only if the given field does not exist.
-    /// @param key Key where the hash is stored.
-    /// @param item The field-value pair to be set.
-    /// @return Whether the field has been set.
-    /// @retval true If the field has been set.
-    /// @retval false If failed to set the field, i.e. the field already exists.
-    /// @see https://redis.io/commands/hsetnx
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    /// @brief Get the length of the string stored at the given field.
-    /// @param key Key where the hash is stored.
-    /// @param field Field.
-    /// @return Length of the string.
-    /// @see https://redis.io/commands/hstrlen
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    /// @brief Get values of all fields stored at the given hash.
-    /// @param key Key where the hash is stored.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note It's always a bad idea to call `hvals` on a large hash, since it might block Redis.
-    /// @see `Redis::hscan`
-    /// @see https://redis.io/commands/hvals
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    /// @brief Add a member to the given set.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be added.
-    /// @return Whether the given member is a new member.
-    /// @retval 1 The member did not exist before, and it has been added now.
-    /// @retval 0 The member already exists before this operation.
-    /// @see https://redis.io/commands/sadd
-    long long sadd(const StringView &key, const StringView &member);
-
-    /// @brief Add multiple members to the given set.
-    /// @param key Key where the set is stored.
-    /// @param first Iterator to the first member to be added.
-    /// @param last Off-the-end iterator to the member range.
-    /// @return Number of new members that have been added, i.e. members did not exist before.
-    /// @see https://redis.io/commands/sadd
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    /// @brief Add multiple members to the given set.
-    /// @param key Key where the set is stored.
-    /// @param il Initializer list of members to be added.
-    /// @return Number of new members that have been added, i.e. members did not exist before.
-    /// @see https://redis.io/commands/sadd
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    /// @brief Get the number of members in the set.
-    /// @param key Key where the set is stored.
-    /// @return Number of members.
-    /// @see https://redis.io/commands/scard
-    long long scard(const StringView &key);
-
-    /// @brief Get the difference between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sdiff
-    // TODO: `void sdiff(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    /// @brief Get the difference between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sdiff
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sdiffstore
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sdiff`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sdiffstore
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    /// @brief Same as `sdiff`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sdiffstore
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    /// @brief Get the intersection between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sinter
-    // TODO: `void sinter(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    /// @brief Get the intersection between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sinter
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sinter
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sinter`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sinter
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    /// @brief Same as `sinter`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sinter
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    /// @brief Test if `member` exists in the set stored at key.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be checked.
-    /// @return Whether `member` exists in the set.
-    /// @retval true If it exists in the set.
-    /// @retval false If it does not exist in the set, or the given key does not exist.
-    /// @see https://redis.io/commands/sismember
-    bool sismember(const StringView &key, const StringView &member);
-
-    /// @brief Get all members in the given set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_set<std::string> members1;
-    /// redis.smembers("set", std::inserter(members1, members1.begin()));
-    /// std::vector<std::string> members2;
-    /// redis.smembers("set", std::back_inserter(members2));
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param output Iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/smembers
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    /// @brief Move `member` from one set to another.
-    /// @param source Key of the set in which the member currently exists.
-    /// @param destination Key of the destination set.
-    /// @return Whether the member has been moved.
-    /// @retval true If the member has been moved.
-    /// @retval false If `member` does not exist in `source`.
-    /// @see https://redis.io/commands/smove
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    /// @brief Remove a random member from the set.
-    /// @param key Key where the set is stored.
-    /// @return The popped member.
-    /// @note If the set is empty, `spop` returns `OptionalString{}` (`std::nullopt`).
-    /// @see `Redis::srandmember`
-    /// @see https://redis.io/commands/spop
-    OptionalString spop(const StringView &key);
-
-    /// @brief Remove multiple random members from the set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> members;
-    /// redis.spop("set", 10, std::back_inserter(members));
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of popped members might be less than `count`.
-    /// @see `Redis::srandmember`
-    /// @see https://redis.io/commands/spop
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    /// @brief Get a random member of the given set.
-    /// @param key Key where the set is stored.
-    /// @return A random member.
-    /// @note If the set is empty, `srandmember` returns `OptionalString{}` (`std::nullopt`).
-    /// @note This method won't remove the member from the set.
-    /// @see `Redis::spop`
-    /// @see https://redis.io/commands/srandmember
-    OptionalString srandmember(const StringView &key);
-
-    /// @brief Get multiple random members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param count Number of members to be returned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method won't remove members from the set.
-    /// @see `Redis::spop`
-    /// @see https://redis.io/commands/srandmember
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    /// @brief Remove a member from set.
-    /// @param key Key where the set is stored.
-    /// @param member Member to be removed.
-    /// @return Whether the member has been removed.
-    /// @retval 1 If the given member exists, and has been removed.
-    /// @retval 0 If the given member does not exist.
-    /// @see https://redis.io/commands/srem
-    long long srem(const StringView &key, const StringView &member);
-
-    /// @brief Remove multiple members from set.
-    /// @param key Key where the set is stored.
-    /// @param first Iterator to the first member to be removed.
-    /// @param last Off-the-end iterator to the range.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/srem
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple members from set.
-    /// @param key Key where the set is stored.
-    /// @param il Initializer list of members to be removed.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/srem
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    /// @brief Scan members of the set matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::unordered_set<std::string> members;
-    /// while (true) {
-    ///     cursor = redis.sscan("set", cursor, "pattern:*",
-    ///         10, std::inserter(members, members.begin()));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan members of the set matching the given pattern.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many fields to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all members of the given set.
-    /// @param key Key where the set is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/sscan
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Get the union between the first set and all successive sets.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to the range.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sunion
-    // TODO: `void sunion(const StringView &key, Input first, Input last, Output output)` is better.
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    /// @brief Get the union between the first set and all successive sets.
-    /// @param il Initializer list of sets.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @see https://redis.io/commands/sunion
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    /// @brief Copy set stored at `key` to `destination`.
-    /// @param destination Key of the destination set.
-    /// @param key Key of the source set.
-    /// @return Number of members of the set.
-    /// @see https://redis.io/commands/sunionstore
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    /// @brief Same as `sunion`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param first Iterator to the first set.
-    /// @param last Off-the-end iterator to set range.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sunionstore
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    /// @brief Same as `sunion`, except that it stores the result to another set.
-    /// @param destination Key of the destination set.
-    /// @param il Initializer list of sets.
-    /// @return Number of members in the resulting set.
-    /// @see https://redis.io/commands/sunionstore
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    /// @brief Pop the member with highest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the highest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the highest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with highest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the higest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmax` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmax`
-    /// @see https://redis.io/commands/bzpopmax
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with lowest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from sorted set in a blocking way.
-    /// @param key Key where the sorted set is stored.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If sorted set is empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param first Iterator to the first key.
-    /// @param last Off-the-end iterator to the key range.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Pop the member with lowest score from multiple sorted set in a blocking way.
-    /// @param il Initializer list of sorted sets.
-    /// @param timeout Timeout in seconds. 0 means block forever.
-    /// @return Key-member-score tuple with the lowest score.
-    /// @note If all lists are empty and timeout reaches, `bzpopmin` returns
-    ///       `Optional<std::tuple<std::string, std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::zpopmin`
-    /// @see https://redis.io/commands/bzpopmin
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    /// @brief Add or update a member with score to sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member to be added.
-    /// @param score Score of the member.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    /// @brief Add or update multiple members with score to sorted set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::unordered_map<std::string, double> m = {{"m1", 1.2}, {"m2", 2.3}};
-    /// redis.zadd("zset", m.begin(), m.end());
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member-score pair.
-    /// @param last Off-the-end iterator to the member-score pairs range.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    /// @brief Add or update multiple members with score to sorted set.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// redis.zadd("zset", {std::make_pair("m1", 1.4), std::make_pair("m2", 2.3)});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member-score pair.
-    /// @param last Off-the-end iterator to the member-score pairs range.
-    /// @param type Options for zadd command:
-    ///             - UpdateType::EXIST: Add the member only if it already exists.
-    ///             - UpdateType::NOT_EXIST: Add the member only if it does not exist.
-    ///             - UpdateType::ALWAYS: Always add the member no matter whether it exists.
-    /// @param changed Whether change the return value from number of newly added member to
-    ///                number of members changed (i.e. added and updated).
-    /// @return Number of added members or number of added and updated members depends on `changed`.
-    /// @note We don't support the INCR option, because in this case, the return value of zadd
-    ///       command is NOT of type long long. However, you can always use the generic interface
-    ///       to send zadd command with INCR option:
-    ///       `auto score = redis.command<OptionalDouble>("ZADD", "key", "XX", "INCR", 10, "mem");`
-    /// @see `UpdateType`
-    /// @see https://redis.io/commands/zadd
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    /// @brief Get the number of members in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Number of members in the sorted set.
-    /// @see https://redis.io/commands/zcard
-    long long zcard(const StringView &key);
-
-    /// @brief Get the number of members with score between a min-max score range.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Count members with score between (2.3, 5]
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::LEFT_OPEN));
-    /// // Count members with score between [2.3, 5)
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::RIGHT_OPEN));
-    /// // Count members with score between (2.3, 5)
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::OPEN));
-    /// // Count members with score between [2.3, 5]
-    /// redis.zcount("zset", BoundedInterval<double>(2.3, 5, BoundType::CLOSED));
-    /// // Count members with score between [2.3, +inf)
-    /// redis.zcount("zset", LeftBoundedInterval<double>(2.3, BoundType::RIGHT_OPEN));
-    /// // Count members with score between (2.3, +inf)
-    /// redis.zcount("zset", LeftBoundedInterval<double>(2.3, BoundType::OPEN));
-    /// // Count members with score between (-inf, 5]
-    /// redis.zcount("zset", RightBoundedInterval<double>(5, BoundType::LEFT_OPEN));
-    /// // Count members with score between (-inf, 5)
-    /// redis.zcount("zset", RightBoundedInterval<double>(5, BoundType::OPEN));
-    /// // Count members with score between (-inf, +inf)
-    /// redis.zcount("zset", UnboundedInterval<double>{});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval The min-max score range.
-    /// @return Number of members with score between a min-max score range.
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zcount
-    // TODO: add a string version of Interval: zcount("key", "(2.3", "5").
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    /// @brief Increment the score of given member.
-    /// @param key Key where the sorted set is stored.
-    /// @param increment Increment.
-    /// @param member Member.
-    /// @return The score of the member after the operation.
-    /// @see https://redis.io/commands/zincrby
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    /// @brief Copy a sorted set to another one with the scores being multiplied by a factor.
-    /// @param destination Key of the destination sorted set.
-    /// @param key Key of the source sorted set.
-    /// @param weight Weight to be multiplied to the score of each member.
-    /// @return The number of members in the sorted set.
-    /// @note  There's no aggregation type parameter for single key overload, since these 3 types
-    ///         have the same effect.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    /// @brief Get intersection of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// redis.zinterstore("destination", keys.begin(), keys.end());
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// std::vector<std::pair<std::string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}};
-    /// redis.zinterstore("destination", keys_with_weights.begin(),
-    ///     keys_with_weights.end(), Aggregation::MIN);
-    /// // NOTE: `keys_with_weights` can also be of type `std::unordered_map<std::string, double>`.
-    /// // However, it will be slower than std::vector<std::pair<std::string, double>>, since we use
-    /// // `std::distance(first, last)` to calculate the *numkeys* parameter.
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param first Iterator to the first sorted set (might with weight).
-    /// @param last Off-the-end iterator to the sorted set range.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `Input` is an
-    ///       iterator to a container of `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZINTERSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///        If `Input` is an iterator to a container of `std::pair<std::string, double>`,
-    ///        i.e. key-weight pair, we send the command with the given weights:
-    ///       *ZINTERSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    /// @brief Get intersection of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// redis.zinterstore("destination", {"k1", "k2"});
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// redis.zinterstore("destination",
-    ///     {std::make_pair("k1", 1), std::make_pair("k2", 2)}, Aggregation::MIN);
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param il Initializer list of sorted set.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `T` is
-    ///       of type `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZINTERSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///       If `T` is of type `std::pair<std::string, double>`, i.e. key-weight pair,
-    ///       we send the command with the given weights:
-    ///       *ZINTERSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zunionstore`
-    /// @see https://redis.io/commands/zinterstore
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    /// @brief Get the number of members between a min-max range in lexicographical order.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Count members between (abc, abd]
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::LEFT_OPEN));
-    /// // Count members between [abc, abd)
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::RIGHT_OPEN));
-    /// // Count members between (abc, abd)
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::OPEN));
-    /// // Count members between [abc, abd]
-    /// redis.zlexcount("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED));
-    /// // Count members between [abc, +inf)
-    /// redis.zlexcount("zset", LeftBoundedInterval<std::string>("abc", BoundType::RIGHT_OPEN));
-    /// // Count members between (abc, +inf)
-    /// redis.zlexcount("zset", LeftBoundedInterval<std::string>("abc", BoundType::OPEN));
-    /// // Count members between (-inf, "abd"]
-    /// redis.zlexcount("zset", RightBoundedInterval<std::string>("abd", BoundType::LEFT_OPEN));
-    /// // Count members between (-inf, "abd")
-    /// redis.zlexcount("zset", RightBoundedInterval<std::string>("abd", BoundType::OPEN));
-    /// // Count members between (-inf, +inf)
-    /// redis.zlexcount("zset", UnboundedInterval<std::string>{});
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval The min-max range in lexicographical order.
-    /// @return Number of members between a min-max range in lexicographical order.
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zlexcount
-    // TODO: add a string version of Interval: zlexcount("key", "(abc", "abd").
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    /// @brief Pop the member with highest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Member-score pair with the highest score.
-    /// @note If sorted set is empty `zpopmax` returns
-    ///       `Optional<std::pair<std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::bzpopmax`
-    /// @see https://redis.io/commands/zpopmax
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    /// @brief Pop multiple members with highest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of returned members might be less than `count`.
-    /// @see `Redis::bzpopmax`
-    /// @see https://redis.io/commands/zpopmax
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    /// @brief Pop the member with lowest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @return Member-score pair with the lowest score.
-    /// @note If sorted set is empty `zpopmin` returns
-    ///       `Optional<std::pair<std::string, double>>{}` (`std::nullopt`).
-    /// @see `Redis::bzpopmin`
-    /// @see https://redis.io/commands/zpopmin
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    /// @brief Pop multiple members with lowest score from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param count Number of members to be popped.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note The number of returned members might be less than `count`.
-    /// @see `Redis::bzpopmin`
-    /// @see https://redis.io/commands/zpopmin
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    /// @brief Get a range of members by rank (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // send *ZRANGE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// redis.zrange("zset", 0, -1, std::back_inserter(result));
-    /// // send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// redis.zrange("zset", 0, -1, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank. Inclusive and can be negative.
-    /// @param stop Stop rank. Inclusive and can be negative.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGE key start stop* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGE key start stop WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @see `Redis::zrevrange`
-    /// @see https://redis.io/commands/zrange
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Get members between [abc, abd].
-    /// redis.zrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `Redis::zrevrangebylex`
-    /// @see https://redis.io/commands/zrangebylex
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Limit the result to at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members between [abc, abd].
-    /// redis.zrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     opts, std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `LimitOptions`
-    /// @see `Redis::zrevrangebylex`
-    /// @see https://redis.io/commands/zrangebylex
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get a range of members by score (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Get members whose score between (3, 6).
-    /// redis.zrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf).
-    /// redis.zrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrevrangebyscore`
-    /// @see https://redis.io/commands/zrangebyscore
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by score (ordered from lowest to highest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Only return at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members whose score between (3, 6).
-    /// redis.zrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     opts, std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf).
-    /// redis.zrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     opts, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrevrangebyscore`
-    /// @see https://redis.io/commands/zrangebyscore
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get the rank (from low to high) of the given member in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The rank of the given member.
-    /// @note If the member does not exist, `zrank` returns `OptionalLongLong{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zrank
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    /// @brief Remove the given member from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member to be removed.
-    /// @return Whether the member has been removed.
-    /// @retval 1 If the member exists, and has been removed.
-    /// @retval 0 If the member does not exist.
-    /// @see https://redis.io/commands/zrem
-    long long zrem(const StringView &key, const StringView &member);
-
-    /// @brief Remove multiple members from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param first Iterator to the first member.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/zrem
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    /// @brief Remove multiple members from sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param il Initializer list of members to be removed.
-    /// @return Number of members that have been removed.
-    /// @see https://redis.io/commands/zrem
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    /// @brief Remove members in the given range of lexicographical order.
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @return Number of members removed.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see https://redis.io/commands/zremrangebylex
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    /// @brief Remove members in the given range ordered by rank.
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank.
-    /// @param stop Stop rank.
-    /// @return Number of members removed.
-    /// @see https://redis.io/commands/zremrangebyrank
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    /// @brief Remove members in the given range ordered by score.
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @return Number of members removed.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see https://redis.io/commands/zremrangebyscore
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    /// @brief Get a range of members by rank (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // send *ZREVRANGE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// redis.zrevrange("key", 0, -1, std::back_inserter(result));
-    /// // send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// redis.zrevrange("key", 0, -1, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param start Start rank. Inclusive and can be negative.
-    /// @param stop Stop rank. Inclusive and can be negative.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGE key start stop* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGE key start stop WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @see `Redis::zrange`
-    /// @see https://redis.io/commands/zrevrange
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Get members between [abc, abd] in reverse order.
-    /// redis.zrevrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `Redis::zrangebylex`
-    /// @see https://redis.io/commands/zrevrangebylex
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by lexicographical order (from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// std::vector<std::string> result;
-    /// // Limit the result to at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members between [abc, abd] in reverse order.
-    /// redis.zrevrangebylex("zset", BoundedInterval<std::string>("abc", "abd", BoundType::CLOSED),
-    ///     opts, std::back_inserter(result));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by lexicographical order.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note See `Redis::zlexcount`'s *Example* part for how to set `interval` parameter.
-    /// @see `Redis::zlexcount`
-    /// @see `BoundedInterval`
-    /// @see `LeftBoundedInterval`
-    /// @see `RightBoundedInterval`
-    /// @see `UnboundedInterval`
-    /// @see `BoundType`
-    /// @see `LimitOptions`
-    /// @see `Redis::zrangebylex`
-    /// @see https://redis.io/commands/zrevrangebylex
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    /// @brief Get a range of members by score (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZREVRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Get members whose score between (3, 6) in reverse order.
-    /// redis.zrevrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf) in reverse order.
-    /// redis.zrevrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrangebyscore`
-    /// @see https://redis.io/commands/zrevrangebyscore
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    /// @brief Get a range of members by score (ordered from highest to lowest).
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Send *ZREVRANGEBYSCORE* command without the *WITHSCORES* option:
-    /// std::vector<std::string> result;
-    /// // Only return at most 5 members starting from 10.
-    /// LimitOptions opts;
-    /// opts.offset = 10;
-    /// opts.count = 5;
-    /// // Get members whose score between (3, 6) in reverse order.
-    /// redis.zrevrangebyscore("zset", BoundedInterval<double>(3, 6, BoundType::OPEN),
-    ///     opts, std::back_inserter(result));
-    /// // Send command with *WITHSCORES* option:
-    /// std::vector<std::pair<std::string, double>> with_score;
-    /// // Get members whose score between [3, +inf) in reverse order.
-    /// redis.zrevrangebyscore("zset", LeftBoundedInterval<double>(3, BoundType::RIGHT_OPEN),
-    ///     opts, std::back_inserter(with_score));
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param interval the min-max range by score.
-    /// @param opts Options to do pagination, i.e. *LIMIT offset count*.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @note This method can also return the score of each member. If `output` is an iterator
-    ///       to a container of `std::string`, we send *ZREVRANGEBYSCORE key min max* command.
-    ///       If it's an iterator to a container of `std::pair<std::string, double>`,
-    ///       we send *ZREVRANGEBYSCORE key min max WITHSCORES* command. See the *Example* part on
-    ///       how to use this method.
-    /// @note See `Redis::zcount`'s *Example* part for how to set the `interval` parameter.
-    /// @see `Redis::zrangebyscore`
-    /// @see https://redis.io/commands/zrevrangebyscore
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    /// @brief Get the rank (from high to low) of the given member in the sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The rank of the given member.
-    /// @note If the member does not exist, `zrevrank` returns `OptionalLongLong{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zrevrank
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    /// @brief Scan members of the given sorted set matching the given pattern.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// auto cursor = 0LL;
-    /// std::vector<std::pair<std::string, double>> members;
-    /// while (true) {
-    ///     cursor = redis.zscan("zset", cursor, "pattern:*",
-    ///         10, std::back_inserter(members));
-    ///     if (cursor == 0) {
-    ///         break;
-    ///     }
-    /// }
-    /// @endcode
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of members to be scanned.
-    /// @param count A hint for how many members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan members of the given sorted set matching the given pattern.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param pattern Pattern of members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    /// @brief Scan all members of the given sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param count A hint for how many members to be scanned.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    /// @brief Scan all members of the given sorted set.
-    /// @param key Key where the sorted set is stored.
-    /// @param cursor Cursor.
-    /// @param output Output iterator to the destination where the result is saved.
-    /// @return The cursor to be used for the next scan operation.
-    /// @see https://redis.io/commands/zscan
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    /// @brief Get the score of the given member.
-    /// @param key Key where the sorted set is stored.
-    /// @param member Member.
-    /// @return The score of the member.
-    /// @note If member does not exist, `zscore` returns `OptionalDouble{}` (`std::nullopt`).
-    /// @see https://redis.io/commands/zscore
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    /// @brief Copy a sorted set to another one with the scores being multiplied by a factor.
-    /// @param destination Key of the destination sorted set.
-    /// @param key Key of the source sorted set.
-    /// @param weight Weight to be multiplied to the score of each member.
-    /// @return The number of members in the sorted set.
-    /// @note  There's no aggregation type parameter for single key overload, since these 3 types
-    ///         have the same effect.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zinterstore
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    /// @brief Get union of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// std::vector<std::string> keys = {"k1", "k2", "k3"};
-    /// redis.zunionstore("destination", keys.begin(), keys.end());
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// std::vector<std::pair<std::string, double>> keys_with_weights = {{"k1", 1}, {"k2", 2}};
-    /// redis.zunionstore("destination", keys_with_weights.begin(),
-    ///     keys_with_weights.end(), Aggregation::MIN);
-    /// // NOTE: `keys_with_weights` can also be of type `std::unordered_map<std::string, double>`.
-    /// // However, it will be slower than std::vector<std::pair<std::string, double>>, since we use
-    /// // `std::distance(first, last)` to calculate the *numkeys* parameter.
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param first Iterator to the first sorted set (might with weight).
-    /// @param last Off-the-end iterator to the sorted set range.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `Input` is an
-    ///       iterator to a container of `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///        If `Input` is an iterator to a container of `std::pair<std::string, double>`,
-    ///        i.e. key-weight pair, we send the command with the given weights:
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zunionstore
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    /// @brief Get union of multiple sorted sets, and store the result to another one.
-    ///
-    /// Example:
-    /// @code{.cpp}
-    /// // Use the default weight, i.e. 1,
-    /// // and use the sum of the all scores as the score of the result:
-    /// redis.zunionstore("destination", {"k1", "k2"});
-    /// // Each sorted set has a different weight,
-    /// // and the score of the result is the min of all scores.
-    /// redis.zunionstore("destination",
-    ///     {std::make_pair("k1", 1), std::make_pair("k2", 2)}, Aggregation::MIN);
-    /// @endcode
-    /// @param destination Key of the destination sorted set.
-    /// @param il Initializer list of sorted set.
-    /// @param type How the scores are aggregated.
-    ///             - Aggregation::SUM: Score of a member is the sum of all scores.
-    ///             - Aggregation::MIN: Score of a member is the min of all scores.
-    ///             - Aggregation::MAX: Score of a member is the max of all scores.
-    /// @return The number of members in the resulting sorted set.
-    /// @note The score of each member can be multiplied by a factor, i.e. weight. If `T` is
-    ///       of type `std::string`, we use the default weight, i.e. 1, and send
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [AGGREGATE SUM|MIN|MAX]* command.
-    ///       If `T` is of type `std::pair<std::string, double>`, i.e. key-weight pair,
-    ///       we send the command with the given weights:
-    ///       *ZUNIONSTORE dest numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX]*.
-    ///       See the *Example* part for examples on how to use this command.
-    /// @see `Redis::zinterstore`
-    /// @see https://redis.io/commands/zunionstore
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    /// @brief Add the given element to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param element Element to be added.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    bool pfadd(const StringView &key, const StringView &element);
-
-    /// @brief Add the given elements to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param first Iterator to the first element.
-    /// @param last Off-the-end iterator to the given range.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    /// @brief Add the given elements to a hyperloglog.
-    /// @param key Key of the hyperloglog.
-    /// @param il Initializer list of elements to be added.
-    /// @return Whether any of hyperloglog's internal register has been altered.
-    /// @retval true If at least one internal register has been altered.
-    /// @retval false If none of internal registers has been altered.
-    /// @note When `pfadd` returns false, it does not mean that this method failed to add
-    ///       an element to the hyperloglog. Instead it means that the internal registers
-    ///       were not altered. If `pfadd` fails, it will throw an exception of `Exception` type.
-    /// @see https://redis.io/commands/pfadd
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    OptionalString geohash(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    Optional<std::pair<double, double>> geopos(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-
-    /// @brief Get members in geo range, i.e. a circle, and store them in a sorted set.
-    /// @param key Key of the GEO set.
-    /// @param loc Location encoded with <longitude, latitude> pair.
-    /// @param radius Radius of the range.
-    /// @param unit Radius unit.
-    /// @param destination Key of the destination sorted set.
-    /// @param store_dist Whether store distance info instead of geo info to destination.
-    /// @param count Limit the first N members.
-    /// @return Number of members stored in destination.
-    /// @note Before Redis 6.2.6, if key does not exist, returns `OptionalLongLong{}` (`std::nullopt`).
-    ///       Since Redis 6.2.6, if key does not exist, returns 0.
-    /// @see `GeoUnit`
-    /// @see `Redis::georadiusbymember`
-    /// @see https://redis.io/commands/georadius
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    /// @brief Get members in geo range, i.e. a circle, and store them in a sorted set.
-    /// @param key Key of the GEO set.
-    /// @param member Member which is the center of the circle.
-    /// @param radius Radius of the range.
-    /// @param unit Radius unit.
-    /// @param destination Key of the destination sorted set.
-    /// @param store_dist Whether store distance info instead of geo info to destination.
-    /// @param count Limit the first N members.
-    /// @return Number of members stored in destination.
-    /// @note Before Redis 6.2.6, if key does not exist, returns `OptionalLongLong{}` (`std::nullopt`).
-    ///       Since Redis 6.2.6, if key does not exist, returns 0.
-    /// @note If member does not exist, throw an `ReplyError`.
-    /// @see `GeoUnit`
-    /// @see `Redis::georadius`
-    /// @see https://redis.io/commands/georadiusbymember
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result, typename Keys, typename Args>
-    Result eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last);
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last,
-                Output output);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result, typename Keys, typename Args>
-    Result evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last,
-                    Output output);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    /// @brief Check if the given script exists.
-    /// @param sha1 SHA1 digest of the script.
-    /// @return Whether the script exists.
-    /// @retval true If the script exists.
-    /// @retval false If the script does not exist.
-    /// @see https://redis.io/commands/script-exists
-    bool script_exists(const StringView &sha1);
-
-    template <typename Input, typename Output>
-    void script_exists(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void script_exists(std::initializer_list<T> il, Output output) {
-        script_exists(il.begin(), il.end(), output);
-    }
-
-    void script_flush();
-
-    void script_kill();
-
-    std::string script_load(const StringView &script);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Transaction commands.
-    void watch(const StringView &key);
-
-    template <typename Input>
-    void watch(Input first, Input last);
-
-    template <typename T>
-    void watch(std::initializer_list<T> il) {
-        watch(il.begin(), il.end());
-    }
-
-    void unwatch();
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first ,last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    template <typename Impl>
-    friend class QueuedRedis;
-
-    friend class RedisCluster;
-
-    // For internal use.
-    explicit Redis(const GuardedConnectionSPtr &connection);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Connection &connection, Cmd cmd, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    // Pool Mode.
-    // Public constructors create a *Redis* instance with a pool.
-    // In this case, *_connection* is a null pointer, and is never used.
-    ConnectionPoolSPtr _pool;
-
-    // Single Connection Mode.
-    // Private constructor creates a *Redis* instance with a single connection.
-    // This is used when we create Transaction, Pipeline and Subscriber.
-    // In this case, *_pool* is empty, and is never used.
-    GuardedConnectionSPtr _connection;
-};
-
-}
-
-}
-
-#include "redis.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.hpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.hpp
deleted file mode 100644
index c560ce111..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis.hpp
+++ /dev/null
@@ -1,1342 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_HPP
-
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename ...Args>
-auto Redis::command(Cmd cmd, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    if (_connection) {
-        // Single Connection Mode.
-        // TODO: In this case, should we reconnect?
-        auto &connection = _connection->connection();
-        if (connection.broken()) {
-            throw Error("Connection is broken");
-        }
-
-        return _command(connection, cmd, std::forward<Args>(args)...);
-    } else {
-        assert(_pool);
-
-        // Pool Mode, i.e. get connection from pool.
-        SafeConnection connection(*_pool);
-
-        return _command(connection.connection(), cmd, std::forward<Args>(args)...);
-    }
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<!IsIter<typename LastType<Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = [](Connection &connection, const StringView &cmd_name, Args &&...args) {
-                    CmdArgs cmd_args;
-                    cmd_args.append(cmd_name, std::forward<Args>(args)...);
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, cmd_name, std::forward<Args>(args)...);
-}
-
-template <typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    range_check("command", first, last);
-
-    auto cmd = [](Connection &connection, Input first, Input last) {
-                    CmdArgs cmd_args;
-                    while (first != last) {
-                        cmd_args.append(*first);
-                        ++first;
-                    }
-                    connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename ...Args>
-Result Redis::command(const StringView &cmd_name, Args &&...args) {
-    auto r = command(cmd_name, std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename ...Args>
-auto Redis::command(const StringView &cmd_name, Args &&...args)
-    -> typename std::enable_if<IsIter<typename LastType<Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args) - 1>(),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Result, typename Input>
-auto Redis::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto Redis::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long Redis::del(Input first, Input last) {
-    range_check("DEL", first, last);
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::exists(Input first, Input last) {
-    range_check("EXISTS", first, last);
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool Redis::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool Redis::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-template <typename Output>
-void Redis::keys(const StringView &pattern, Output output) {
-    auto reply = command(cmd::keys, pattern);
-
-    reply::to_array(*reply, output);
-}
-
-inline bool Redis::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool Redis::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void Redis::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Output>
-long long Redis::scan(long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::scan, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return scan(cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                long long count,
-                                Output output) {
-    return scan(cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::scan(long long cursor,
-                                Output output) {
-    return scan(cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::touch(Input first, Input last) {
-    range_check("TOUCH", first, last);
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::unlink(Input first, Input last) {
-    range_check("UNLINK", first, last);
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline long long Redis::wait(long long numslaves, const std::chrono::milliseconds &timeout) {
-    return wait(numslaves, timeout.count());
-}
-
-// STRING commands.
-
-template <typename Input>
-long long Redis::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    range_check("BITOP", first, last);
-
-    auto reply = command(cmd::bitop_range<Input>, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::mget(Input first, Input last, Output output) {
-    range_check("MGET", first, last);
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void Redis::mset(Input first, Input last) {
-    range_check("MSET", first, last);
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool Redis::msetnx(Input first, Input last) {
-    range_check("MSETNX", first, last);
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void Redis::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void Redis::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first, Input last, long long timeout) {
-    range_check("BLPOP", first, last);
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first, Input last, long long timeout) {
-    range_check("BRPOP", first, last);
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair Redis::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString Redis::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long Redis::lpush(const StringView &key, Input first, Input last) {
-    range_check("LPUSH", first, last);
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long Redis::rpush(const StringView &key, Input first, Input last) {
-    range_check("RPUSH", first, last);
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long Redis::hdel(const StringView &key, Input first, Input last) {
-    range_check("HDEL", first, last);
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void Redis::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void Redis::hmget(const StringView &key, Input first, Input last, Output output) {
-    range_check("HMGET", first, last);
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void Redis::hmset(const StringView &key, Input first, Input last) {
-    range_check("HMSET", first, last);
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long Redis::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-auto Redis::hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    long long>::type {
-    range_check("HSET", first, last);
-
-    auto reply = command(cmd::hset_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void Redis::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long Redis::sadd(const StringView &key, Input first, Input last) {
-    range_check("SADD", first, last);
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sdiff(Input first, Input last, Output output) {
-    range_check("SDIFF", first, last);
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    range_check("SDIFFSTORE", first, last);
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::sinter(Input first, Input last, Output output) {
-    range_check("SINTER", first, last);
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sinterstore(const StringView &destination,
-                            Input first,
-                            Input last) {
-    range_check("SINTERSTORE", first, last);
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::srem(const StringView &key, Input first, Input last) {
-    range_check("SREM", first, last);
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long Redis::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void Redis::sunion(Input first, Input last, Output output) {
-    range_check("SUNION", first, last);
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::sunionstore(const StringView &destination, Input first, Input last) {
-    range_check("SUNIONSTORE", first, last);
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto Redis::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmax(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto Redis::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto Redis::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto Redis::bzpopmin(Input first,
-                            Input last,
-                            const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long Redis::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    range_check("ZADD", first, last);
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long Redis::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    range_check("ZINTERSTORE", first, last);
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::zrem(const StringView &key, Input first, Input last) {
-    range_check("ZREM", first, last);
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long Redis::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void Redis::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void Redis::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void Redis::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long Redis::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long Redis::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long Redis::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    range_check("ZUNIONSTORE", first, last);
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool Redis::pfadd(const StringView &key, Input first, Input last) {
-    range_check("PFADD", first, last);
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long Redis::pfcount(Input first, Input last) {
-    range_check("PFCOUNT", first, last);
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void Redis::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    range_check("PFMERGE", first, last);
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long Redis::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    range_check("GEOADD", first, last);
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void Redis::geohash(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOHASH", first, last);
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::geopos(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOPOS", first, last);
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result, typename Keys, typename Args>
-Result Redis::eval(const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last) {
-    auto reply = command(cmd::eval<Keys, Args>, script, keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args) {
-    return eval<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void Redis::eval(const StringView &script,
-                   Keys keys_first,
-                   Keys keys_last,
-                   Args args_first,
-                   Args args_last,
-                   Output output) {
-    auto reply = command(cmd::eval<Keys, Args>,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::eval(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output) {
-    eval(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Result, typename Keys, typename Args>
-Result Redis::evalsha(const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last) {
-    auto reply = command(cmd::evalsha<Keys, Args>, script,
-            keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args) {
-    return evalsha<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void Redis::evalsha(const StringView &script,
-                       Keys keys_first,
-                       Keys keys_last,
-                       Args args_first,
-                       Args args_last,
-                       Output output) {
-    auto reply = command(cmd::evalsha<Keys, Args>,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::evalsha(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    evalsha(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Input, typename Output>
-void Redis::script_exists(Input first, Input last, Output output) {
-    range_check("SCRIPT EXISTS", first, last);
-
-    auto reply = command(cmd::script_exists_range<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-// Transaction commands.
-
-template <typename Input>
-void Redis::watch(Input first, Input last) {
-    auto reply = command(cmd::watch_range<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long Redis::xack(const StringView &key, const StringView &group, Input first, Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key, const StringView &id, Input first, Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string Redis::xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    const StringView &id,
-                    Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void Redis::xclaim(const StringView &key,
-                    const StringView &group,
-                    const StringView &consumer,
-                    const std::chrono::milliseconds &min_idle_time,
-                    Input first,
-                    Input last,
-                    Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long Redis::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto Redis::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xpending(const StringView &key,
-                        const StringView &group,
-                        const StringView &start,
-                        const StringView &end,
-                        long long count,
-                        const StringView &consumer,
-                        Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrange(const StringView &key,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xread(const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xread(Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = command(cmd::xreadgroup_range<Input>, group, consumer, first, last, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        const StringView &key,
-                        const StringView &id,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output) {
-    auto reply = command(cmd::xreadgroup_block,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto Redis::xreadgroup(const StringView &group,
-                        const StringView &consumer,
-                        Input first,
-                        Input last,
-                        const std::chrono::milliseconds &timeout,
-                        long long count,
-                        bool noack,
-                        Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = command(cmd::xreadgroup_block_range<Input>,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void Redis::xrevrange(const StringView &key,
-                        const StringView &end,
-                        const StringView &start,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr Redis::_command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    auto reply = connection.recv();
-
-    return reply;
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr Redis::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_HPP
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.cpp
deleted file mode 100644
index 118414b00..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.cpp
+++ /dev/null
@@ -1,802 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "redis_cluster.h"
-#include <hiredis/hiredis.h>
-#include "command.h"
-#include "errors.h"
-#include "queued_redis.h"
-
-namespace sw {
-
-namespace redis {
-
-RedisCluster::RedisCluster(const std::string &uri) : RedisCluster(ConnectionOptions(uri)) {}
-
-Redis RedisCluster::redis(const StringView &hash_tag, bool new_connection) {
-    auto pool = _pool.fetch(hash_tag);
-    if (new_connection) {
-        // Create a new pool
-        pool = std::make_shared<ConnectionPool>(pool->clone());
-    }
-
-    return Redis(std::make_shared<GuardedConnection>(pool));
-}
-
-Pipeline RedisCluster::pipeline(const StringView &hash_tag, bool new_connection) {
-    auto pool = _pool.fetch(hash_tag);
-    if (new_connection) {
-        // Create a new pool
-        pool = std::make_shared<ConnectionPool>(pool->clone());
-    }
-
-    return Pipeline(pool, new_connection);
-}
-
-Transaction RedisCluster::transaction(const StringView &hash_tag, bool piped, bool new_connection) {
-    auto pool = _pool.fetch(hash_tag);
-    if (new_connection) {
-        // Create a new pool
-        pool = std::make_shared<ConnectionPool>(pool->clone());
-    }
-
-    return Transaction(pool, new_connection, piped);
-}
-
-Subscriber RedisCluster::subscriber() {
-    auto opts = _pool.connection_options();
-    return Subscriber(Connection(opts));
-}
-
-// KEY commands.
-
-long long RedisCluster::del(const StringView &key) {
-    auto reply = command(cmd::del, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString RedisCluster::dump(const StringView &key) {
-    auto reply = command(cmd::dump, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::exists(const StringView &key) {
-    auto reply = command(cmd::exists, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool RedisCluster::expire(const StringView &key, long long timeout) {
-    auto reply = command(cmd::expire, key, timeout);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::expireat(const StringView &key, long long timestamp) {
-    auto reply = command(cmd::expireat, key, timestamp);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::persist(const StringView &key) {
-    auto reply = command(cmd::persist, key);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::pexpire(const StringView &key, long long timeout) {
-    auto reply = command(cmd::pexpire, key, timeout);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::pexpireat(const StringView &key, long long timestamp) {
-    auto reply = command(cmd::pexpireat, key, timestamp);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long RedisCluster::pttl(const StringView &key) {
-    auto reply = command(cmd::pttl, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::rename(const StringView &key, const StringView &newkey) {
-    auto reply = command(cmd::rename, key, newkey);
-
-    reply::parse<void>(*reply);
-}
-
-bool RedisCluster::renamenx(const StringView &key, const StringView &newkey) {
-    auto reply = command(cmd::renamenx, key, newkey);
-
-    return reply::parse<bool>(*reply);
-}
-
-void RedisCluster::restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace) {
-    auto reply = command(cmd::restore, key, val, ttl, replace);
-
-    reply::parse<void>(*reply);
-}
-
-long long RedisCluster::touch(const StringView &key) {
-    auto reply = command(cmd::touch, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::ttl(const StringView &key) {
-    auto reply = command(cmd::ttl, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-std::string RedisCluster::type(const StringView &key) {
-    auto reply = command(cmd::type, key);
-
-    return reply::parse<std::string>(*reply);
-}
-
-long long RedisCluster::unlink(const StringView &key) {
-    auto reply = command(cmd::unlink, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-long long RedisCluster::append(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::append, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::bitcount(const StringView &key, long long start, long long end) {
-    auto reply = command(cmd::bitcount, key, start, end);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::bitop(BitOp op, const StringView &destination, const StringView &key) {
-    auto reply = _command(cmd::bitop, destination, op, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::bitpos(const StringView &key,
-                            long long bit,
-                            long long start,
-                            long long end) {
-    auto reply = command(cmd::bitpos, key, bit, start, end);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::decr(const StringView &key) {
-    auto reply = command(cmd::decr, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::decrby(const StringView &key, long long decrement) {
-    auto reply = command(cmd::decrby, key, decrement);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString RedisCluster::get(const StringView &key) {
-    auto reply = command(cmd::get, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::getbit(const StringView &key, long long offset) {
-    auto reply = command(cmd::getbit, key, offset);
-
-    return reply::parse<long long>(*reply);
-}
-
-std::string RedisCluster::getrange(const StringView &key, long long start, long long end) {
-    auto reply = command(cmd::getrange, key, start, end);
-
-    return reply::parse<std::string>(*reply);
-}
-
-OptionalString RedisCluster::getset(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::getset, key, val);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::incr(const StringView &key) {
-    auto reply = command(cmd::incr, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::incrby(const StringView &key, long long increment) {
-    auto reply = command(cmd::incrby, key, increment);
-
-    return reply::parse<long long>(*reply);
-}
-
-double RedisCluster::incrbyfloat(const StringView &key, double increment) {
-    auto reply = command(cmd::incrbyfloat, key, increment);
-
-    return reply::parse<double>(*reply);
-}
-
-void RedisCluster::psetex(const StringView &key,
-                        long long ttl,
-                        const StringView &val) {
-    auto reply = command(cmd::psetex, key, ttl, val);
-
-    reply::parse<void>(*reply);
-}
-
-bool RedisCluster::set(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl,
-                    UpdateType type) {
-    auto reply = command(cmd::set, key, val, ttl.count(), type);
-
-    reply::rewrite_set_reply(*reply);
-
-    return reply::parse<bool>(*reply);
-}
-
-void RedisCluster::setex(const StringView &key,
-                    long long ttl,
-                    const StringView &val) {
-    auto reply = command(cmd::setex, key, ttl, val);
-
-    reply::parse<void>(*reply);
-}
-
-bool RedisCluster::setnx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::setnx, key, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long RedisCluster::setrange(const StringView &key, long long offset, const StringView &val) {
-    auto reply = command(cmd::setrange, key, offset, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::strlen(const StringView &key) {
-    auto reply = command(cmd::strlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// LIST commands.
-
-OptionalStringPair RedisCluster::blpop(const StringView &key, long long timeout) {
-    auto reply = command(cmd::blpop, key, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-OptionalStringPair RedisCluster::blpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return blpop(key, timeout.count());
-}
-
-OptionalStringPair RedisCluster::brpop(const StringView &key, long long timeout) {
-    auto reply = command(cmd::brpop, key, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-OptionalStringPair RedisCluster::brpop(const StringView &key, const std::chrono::seconds &timeout) {
-    return brpop(key, timeout.count());
-}
-
-OptionalString RedisCluster::brpoplpush(const StringView &source,
-                                    const StringView &destination,
-                                    long long timeout) {
-    auto reply = command(cmd::brpoplpush, source, destination, timeout);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString RedisCluster::lindex(const StringView &key, long long index) {
-    auto reply = command(cmd::lindex, key, index);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::linsert(const StringView &key,
-                            InsertPosition position,
-                            const StringView &pivot,
-                            const StringView &val) {
-    auto reply = command(cmd::linsert, key, position, pivot, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::llen(const StringView &key) {
-    auto reply = command(cmd::llen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalString RedisCluster::lpop(const StringView &key) {
-    auto reply = command(cmd::lpop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::lpush(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::lpush, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::lpushx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::lpushx, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::lrem(const StringView &key, long long count, const StringView &val) {
-    auto reply = command(cmd::lrem, key, count, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::lset(const StringView &key, long long index, const StringView &val) {
-    auto reply = command(cmd::lset, key, index, val);
-
-    reply::parse<void>(*reply);
-}
-
-void RedisCluster::ltrim(const StringView &key, long long start, long long stop) {
-    auto reply = command(cmd::ltrim, key, start, stop);
-
-    reply::parse<void>(*reply);
-}
-
-OptionalString RedisCluster::rpop(const StringView &key) {
-    auto reply = command(cmd::rpop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString RedisCluster::rpoplpush(const StringView &source, const StringView &destination) {
-    auto reply = command(cmd::rpoplpush, source, destination);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::rpush(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::rpush, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::rpushx(const StringView &key, const StringView &val) {
-    auto reply = command(cmd::rpushx, key, val);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::hdel(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hdel, key, field);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool RedisCluster::hexists(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hexists, key, field);
-
-    return reply::parse<bool>(*reply);
-}
-
-OptionalString RedisCluster::hget(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hget, key, field);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::hincrby(const StringView &key, const StringView &field, long long increment) {
-    auto reply = command(cmd::hincrby, key, field, increment);
-
-    return reply::parse<long long>(*reply);
-}
-
-double RedisCluster::hincrbyfloat(const StringView &key, const StringView &field, double increment) {
-    auto reply = command(cmd::hincrbyfloat, key, field, increment);
-
-    return reply::parse<double>(*reply);
-}
-
-long long RedisCluster::hlen(const StringView &key) {
-    auto reply = command(cmd::hlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool RedisCluster::hset(const StringView &key, const StringView &field, const StringView &val) {
-    auto reply = command(cmd::hset, key, field, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::hset(const StringView &key, const std::pair<StringView, StringView> &item) {
-    return hset(key, item.first, item.second);
-}
-
-bool RedisCluster::hsetnx(const StringView &key, const StringView &field, const StringView &val) {
-    auto reply = command(cmd::hsetnx, key, field, val);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::hsetnx(const StringView &key, const std::pair<StringView, StringView> &item) {
-    return hsetnx(key, item.first, item.second);
-}
-
-long long RedisCluster::hstrlen(const StringView &key, const StringView &field) {
-    auto reply = command(cmd::hstrlen, key, field);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SET commands.
-
-long long RedisCluster::sadd(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::sadd, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::scard(const StringView &key) {
-    auto reply = command(cmd::scard, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::sdiffstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sdiffstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::sinterstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sinterstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-bool RedisCluster::sismember(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::sismember, key, member);
-
-    return reply::parse<bool>(*reply);
-}
-
-bool RedisCluster::smove(const StringView &source,
-                    const StringView &destination,
-                    const StringView &member) {
-    auto reply = command(cmd::smove, source, destination, member);
-
-    return reply::parse<bool>(*reply);
-}
-
-OptionalString RedisCluster::spop(const StringView &key) {
-    auto reply = command(cmd::spop, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-OptionalString RedisCluster::srandmember(const StringView &key) {
-    auto reply = command(cmd::srandmember, key);
-
-    return reply::parse<OptionalString>(*reply);
-}
-
-long long RedisCluster::srem(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::srem, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::sunionstore(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::sunionstore, destination, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-auto RedisCluster::bzpopmax(const StringView &key, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax, key, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-auto RedisCluster::bzpopmin(const StringView &key, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin, key, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-long long RedisCluster::zadd(const StringView &key,
-                        const StringView &member,
-                        double score,
-                        UpdateType type,
-                        bool changed) {
-    auto reply = command(cmd::zadd, key, member, score, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::zcard(const StringView &key) {
-    auto reply = command(cmd::zcard, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-double RedisCluster::zincrby(const StringView &key, double increment, const StringView &member) {
-    auto reply = command(cmd::zincrby, key, increment, member);
-
-    return reply::parse<double>(*reply);
-}
-
-long long RedisCluster::zinterstore(const StringView &destination,
-                                    const StringView &key,
-                                    double weight) {
-    auto reply = command(cmd::zinterstore, destination, key, weight);
-
-    return reply::parse<long long>(*reply);
-}
-
-Optional<std::pair<std::string, double>> RedisCluster::zpopmax(const StringView &key) {
-    auto reply = command(cmd::zpopmax, key, 1);
-
-    reply::rewrite_empty_array_reply(*reply);
-
-    return reply::parse<Optional<std::pair<std::string, double>>>(*reply);
-}
-
-Optional<std::pair<std::string, double>> RedisCluster::zpopmin(const StringView &key) {
-    auto reply = command(cmd::zpopmin, key, 1);
-
-    reply::rewrite_empty_array_reply(*reply);
-
-    return reply::parse<Optional<std::pair<std::string, double>>>(*reply);
-}
-
-OptionalLongLong RedisCluster::zrank(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrank, key, member);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-long long RedisCluster::zrem(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrem, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::zremrangebyrank(const StringView &key, long long start, long long stop) {
-    auto reply = command(cmd::zremrangebyrank, key, start, stop);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalLongLong RedisCluster::zrevrank(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zrevrank, key, member);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-OptionalDouble RedisCluster::zscore(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::zscore, key, member);
-
-    return reply::parse<OptionalDouble>(*reply);
-}
-
-long long RedisCluster::zunionstore(const StringView &destination,
-                                    const StringView &key,
-                                    double weight) {
-    auto reply = command(cmd::zunionstore, destination, key, weight);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-bool RedisCluster::pfadd(const StringView &key, const StringView &element) {
-    auto reply = command(cmd::pfadd, key, element);
-
-    return reply::parse<bool>(*reply);
-}
-
-long long RedisCluster::pfcount(const StringView &key) {
-    auto reply = command(cmd::pfcount, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::pfmerge(const StringView &destination, const StringView &key) {
-    auto reply = command(cmd::pfmerge, destination, key);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-long long RedisCluster::geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member) {
-    auto reply = command(cmd::geoadd, key, member);
-
-    return reply::parse<long long>(*reply);
-}
-
-OptionalDouble RedisCluster::geodist(const StringView &key,
-                                const StringView &member1,
-                                const StringView &member2,
-                                GeoUnit unit) {
-    auto reply = command(cmd::geodist, key, member1, member2, unit);
-
-    return reply::parse<OptionalDouble>(*reply);
-}
-
-OptionalString RedisCluster::geohash(const StringView &key, const StringView &member) {
-    auto reply = command(cmd::geohash, key, member);
-
-    return reply::parse_leniently<OptionalString>(*reply);
-}
-
-Optional<std::pair<double, double>> RedisCluster::geopos(const StringView &key,
-                                                            const StringView &member) {
-    auto reply = command(cmd::geopos, key, member);
-
-    return reply::parse_leniently<Optional<std::pair<double, double>>>(*reply);
-}
-
-
-OptionalLongLong RedisCluster::georadius(const StringView &key,
-                                    const std::pair<double, double> &loc,
-                                    double radius,
-                                    GeoUnit unit,
-                                    const StringView &destination,
-                                    bool store_dist,
-                                    long long count) {
-    auto reply = command(cmd::georadius_store,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            destination,
-                            store_dist,
-                            count);
-
-    reply::rewrite_empty_array_reply(*reply);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-OptionalLongLong RedisCluster::georadiusbymember(const StringView &key,
-                                            const StringView &member,
-                                            double radius,
-                                            GeoUnit unit,
-                                            const StringView &destination,
-                                            bool store_dist,
-                                            long long count) {
-    auto reply = command(cmd::georadiusbymember_store,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            destination,
-                            store_dist,
-                            count);
-
-    reply::rewrite_empty_array_reply(*reply);
-
-    return reply::parse<OptionalLongLong>(*reply);
-}
-
-// PUBSUB commands.
-
-long long RedisCluster::publish(const StringView &channel, const StringView &message) {
-    auto reply = command(cmd::publish, channel, message);
-
-    return reply::parse<long long>(*reply);
-}
-
-// Stream commands.
-
-long long RedisCluster::xack(const StringView &key, const StringView &group, const StringView &id) {
-    auto reply = command(cmd::xack, key, group, id);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::xdel(const StringView &key, const StringView &id) {
-    auto reply = command(cmd::xdel, key, id);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::xgroup_create(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &id,
-                                    bool mkstream) {
-    auto reply = command(cmd::xgroup_create, key, group, id, mkstream);
-
-    reply::parse<void>(*reply);
-}
-
-void RedisCluster::xgroup_setid(const StringView &key,
-                                const StringView &group,
-                                const StringView &id) {
-    auto reply = command(cmd::xgroup_setid, key, group, id);
-
-    reply::parse<void>(*reply);
-}
-
-long long RedisCluster::xgroup_destroy(const StringView &key, const StringView &group) {
-    auto reply = command(cmd::xgroup_destroy, key, group);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::xgroup_delconsumer(const StringView &key,
-                                            const StringView &group,
-                                            const StringView &consumer) {
-    auto reply = command(cmd::xgroup_delconsumer, key, group, consumer);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::xlen(const StringView &key) {
-    auto reply = command(cmd::xlen, key);
-
-    return reply::parse<long long>(*reply);
-}
-
-long long RedisCluster::xtrim(const StringView &key, long long count, bool approx) {
-    auto reply = command(cmd::xtrim, key, count, approx);
-
-    return reply::parse<long long>(*reply);
-}
-
-void RedisCluster::_asking(Connection &connection) {
-    // Send ASKING command.
-    connection.send("ASKING");
-
-    auto reply = connection.recv();
-
-    assert(reply);
-
-    reply::parse<void>(*reply);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.h
deleted file mode 100644
index 63c6131c1..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.h
+++ /dev/null
@@ -1,1439 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
-
-#include <string>
-#include <chrono>
-#include <initializer_list>
-#include <tuple>
-#include "shards_pool.h"
-#include "reply.h"
-#include "command_options.h"
-#include "utils.h"
-#include "subscriber.h"
-#include "pipeline.h"
-#include "transaction.h"
-#include "redis.h"
-#include "connection.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Impl>
-class QueuedRedis;
-
-using Transaction = QueuedRedis<TransactionImpl>;
-
-using Pipeline = QueuedRedis<PipelineImpl>;
-
-class RedisCluster {
-public:
-    RedisCluster(const ConnectionOptions &connection_opts,
-                    const ConnectionPoolOptions &pool_opts = {},
-                    Role role = Role::MASTER) : _pool(pool_opts, connection_opts, role) {}
-
-    // Construct RedisCluster with URI:
-    // "tcp://127.0.0.1" or "tcp://127.0.0.1:6379"
-    // Only need to specify one URI.
-    explicit RedisCluster(const std::string &uri);
-
-    RedisCluster(const RedisCluster &) = delete;
-    RedisCluster& operator=(const RedisCluster &) = delete;
-
-    RedisCluster(RedisCluster &&) = default;
-    RedisCluster& operator=(RedisCluster &&) = default;
-
-    Redis redis(const StringView &hash_tag, bool new_connection = true);
-
-    Pipeline pipeline(const StringView &hash_tag, bool new_connection = true);
-
-    Transaction transaction(const StringView &hash_tag, bool piped = false, bool new_connection = true);
-
-    Subscriber subscriber();
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type;
-
-    template <typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value)
-                && IsIter<typename LastType<Key, Args...>::type>::value, void>::type;
-
-    template <typename Result, typename Key, typename ...Args>
-    auto command(const StringView &cmd_name, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-                || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type;
-
-    template <typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type;
-
-    template <typename Result, typename Input>
-    auto command(Input first, Input last)
-        -> typename std::enable_if<IsIter<Input>::value, Result>::type;
-
-    template <typename Input, typename Output>
-    auto command(Input first, Input last, Output output)
-        -> typename std::enable_if<IsIter<Input>::value, void>::type;
-
-    // KEY commands.
-
-    long long del(const StringView &key);
-
-    template <typename Input>
-    long long del(Input first, Input last);
-
-    template <typename T>
-    long long del(std::initializer_list<T> il) {
-        return del(il.begin(), il.end());
-    }
-
-    OptionalString dump(const StringView &key);
-
-    long long exists(const StringView &key);
-
-    template <typename Input>
-    long long exists(Input first, Input last);
-
-    template <typename T>
-    long long exists(std::initializer_list<T> il) {
-        return exists(il.begin(), il.end());
-    }
-
-    bool expire(const StringView &key, long long timeout);
-
-    bool expire(const StringView &key, const std::chrono::seconds &timeout);
-
-    bool expireat(const StringView &key, long long timestamp);
-
-    bool expireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::seconds> &tp);
-
-    bool persist(const StringView &key);
-
-    bool pexpire(const StringView &key, long long timeout);
-
-    bool pexpire(const StringView &key, const std::chrono::milliseconds &timeout);
-
-    bool pexpireat(const StringView &key, long long timestamp);
-
-    bool pexpireat(const StringView &key,
-                    const std::chrono::time_point<std::chrono::system_clock,
-                                                    std::chrono::milliseconds> &tp);
-
-    long long pttl(const StringView &key);
-
-    void rename(const StringView &key, const StringView &newkey);
-
-    bool renamenx(const StringView &key, const StringView &newkey);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    long long ttl,
-                    bool replace = false);
-
-    void restore(const StringView &key,
-                    const StringView &val,
-                    const std::chrono::milliseconds &ttl = std::chrono::milliseconds{0},
-                    bool replace = false);
-
-    // TODO: sort
-
-    long long touch(const StringView &key);
-
-    template <typename Input>
-    long long touch(Input first, Input last);
-
-    template <typename T>
-    long long touch(std::initializer_list<T> il) {
-        return touch(il.begin(), il.end());
-    }
-
-    long long ttl(const StringView &key);
-
-    std::string type(const StringView &key);
-
-    long long unlink(const StringView &key);
-
-    template <typename Input>
-    long long unlink(Input first, Input last);
-
-    template <typename T>
-    long long unlink(std::initializer_list<T> il) {
-        return unlink(il.begin(), il.end());
-    }
-
-    // STRING commands.
-
-    long long append(const StringView &key, const StringView &str);
-
-    long long bitcount(const StringView &key, long long start = 0, long long end = -1);
-
-    long long bitop(BitOp op, const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long bitop(BitOp op, const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long bitop(BitOp op, const StringView &destination, std::initializer_list<T> il) {
-        return bitop(op, destination, il.begin(), il.end());
-    }
-
-    long long bitpos(const StringView &key,
-                        long long bit,
-                        long long start = 0,
-                        long long end = -1);
-
-    long long decr(const StringView &key);
-
-    long long decrby(const StringView &key, long long decrement);
-
-    OptionalString get(const StringView &key);
-
-    long long getbit(const StringView &key, long long offset);
-
-    std::string getrange(const StringView &key, long long start, long long end);
-
-    OptionalString getset(const StringView &key, const StringView &val);
-
-    long long incr(const StringView &key);
-
-    long long incrby(const StringView &key, long long increment);
-
-    double incrbyfloat(const StringView &key, double increment);
-
-    template <typename Input, typename Output>
-    void mget(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void mget(std::initializer_list<T> il, Output output) {
-        mget(il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void mset(Input first, Input last);
-
-    template <typename T>
-    void mset(std::initializer_list<T> il) {
-        mset(il.begin(), il.end());
-    }
-
-    template <typename Input>
-    bool msetnx(Input first, Input last);
-
-    template <typename T>
-    bool msetnx(std::initializer_list<T> il) {
-        return msetnx(il.begin(), il.end());
-    }
-
-    void psetex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void psetex(const StringView &key,
-                const std::chrono::milliseconds &ttl,
-                const StringView &val);
-
-    bool set(const StringView &key,
-                const StringView &val,
-                const std::chrono::milliseconds &ttl = std::chrono::milliseconds(0),
-                UpdateType type = UpdateType::ALWAYS);
-
-    void setex(const StringView &key,
-                long long ttl,
-                const StringView &val);
-
-    void setex(const StringView &key,
-                const std::chrono::seconds &ttl,
-                const StringView &val);
-
-    bool setnx(const StringView &key, const StringView &val);
-
-    long long setrange(const StringView &key, long long offset, const StringView &val);
-
-    long long strlen(const StringView &key);
-
-    // LIST commands.
-
-    OptionalStringPair blpop(const StringView &key, long long timeout);
-
-    OptionalStringPair blpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il, long long timeout) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair blpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return blpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalStringPair brpop(const StringView &key, long long timeout);
-
-    OptionalStringPair brpop(const StringView &key,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first, Input last, long long timeout);
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il, long long timeout) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    template <typename Input>
-    OptionalStringPair brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    template <typename T>
-    OptionalStringPair brpop(std::initializer_list<T> il,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0}) {
-        return brpop(il.begin(), il.end(), timeout);
-    }
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                long long timeout);
-
-    OptionalString brpoplpush(const StringView &source,
-                                const StringView &destination,
-                                const std::chrono::seconds &timeout = std::chrono::seconds{0});
-
-    OptionalString lindex(const StringView &key, long long index);
-
-    long long linsert(const StringView &key,
-                        InsertPosition position,
-                        const StringView &pivot,
-                        const StringView &val);
-
-    long long llen(const StringView &key);
-
-    OptionalString lpop(const StringView &key);
-
-    long long lpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long lpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long lpush(const StringView &key, std::initializer_list<T> il) {
-        return lpush(key, il.begin(), il.end());
-    }
-
-    long long lpushx(const StringView &key, const StringView &val);
-
-    template <typename Output>
-    void lrange(const StringView &key, long long start, long long stop, Output output);
-
-    long long lrem(const StringView &key, long long count, const StringView &val);
-
-    void lset(const StringView &key, long long index, const StringView &val);
-
-    void ltrim(const StringView &key, long long start, long long stop);
-
-    OptionalString rpop(const StringView &key);
-
-    OptionalString rpoplpush(const StringView &source, const StringView &destination);
-
-    long long rpush(const StringView &key, const StringView &val);
-
-    template <typename Input>
-    long long rpush(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long rpush(const StringView &key, std::initializer_list<T> il) {
-        return rpush(key, il.begin(), il.end());
-    }
-
-    long long rpushx(const StringView &key, const StringView &val);
-
-    // HASH commands.
-
-    long long hdel(const StringView &key, const StringView &field);
-
-    template <typename Input>
-    long long hdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long hdel(const StringView &key, std::initializer_list<T> il) {
-        return hdel(key, il.begin(), il.end());
-    }
-
-    bool hexists(const StringView &key, const StringView &field);
-
-    OptionalString hget(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hgetall(const StringView &key, Output output);
-
-    long long hincrby(const StringView &key, const StringView &field, long long increment);
-
-    double hincrbyfloat(const StringView &key, const StringView &field, double increment);
-
-    template <typename Output>
-    void hkeys(const StringView &key, Output output);
-
-    long long hlen(const StringView &key);
-
-    template <typename Input, typename Output>
-    void hmget(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void hmget(const StringView &key, std::initializer_list<T> il, Output output) {
-        hmget(key, il.begin(), il.end(), output);
-    }
-
-    template <typename Input>
-    void hmset(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    void hmset(const StringView &key, std::initializer_list<T> il) {
-        hmset(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long hscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    bool hset(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hset(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    template <typename Input>
-    auto hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value, long long>::type;
-
-    template <typename T>
-    long long hset(const StringView &key, std::initializer_list<T> il) {
-        return hset(key, il.begin(), il.end());
-    }
-
-    bool hsetnx(const StringView &key, const StringView &field, const StringView &val);
-
-    bool hsetnx(const StringView &key, const std::pair<StringView, StringView> &item);
-
-    long long hstrlen(const StringView &key, const StringView &field);
-
-    template <typename Output>
-    void hvals(const StringView &key, Output output);
-
-    // SET commands.
-
-    long long sadd(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long sadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long sadd(const StringView &key, std::initializer_list<T> il) {
-        return sadd(key, il.begin(), il.end());
-    }
-
-    long long scard(const StringView &key);
-
-    template <typename Input, typename Output>
-    void sdiff(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sdiff(std::initializer_list<T> il, Output output) {
-        sdiff(il.begin(), il.end(), output);
-    }
-
-    long long sdiffstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sdiffstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sdiffstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sdiffstore(destination, il.begin(), il.end());
-    }
-
-    template <typename Input, typename Output>
-    void sinter(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sinter(std::initializer_list<T> il, Output output) {
-        sinter(il.begin(), il.end(), output);
-    }
-
-    long long sinterstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sinterstore(const StringView &destination,
-                            Input first,
-                            Input last);
-
-    template <typename T>
-    long long sinterstore(const StringView &destination,
-                            std::initializer_list<T> il) {
-        return sinterstore(destination, il.begin(), il.end());
-    }
-
-    bool sismember(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    void smembers(const StringView &key, Output output);
-
-    bool smove(const StringView &source,
-                const StringView &destination,
-                const StringView &member);
-
-    OptionalString spop(const StringView &key);
-
-    template <typename Output>
-    void spop(const StringView &key, long long count, Output output);
-
-    OptionalString srandmember(const StringView &key);
-
-    template <typename Output>
-    void srandmember(const StringView &key, long long count, Output output);
-
-    long long srem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long srem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long srem(const StringView &key, std::initializer_list<T> il) {
-        return srem(key, il.begin(), il.end());
-    }
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long sscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    template <typename Input, typename Output>
-    void sunion(Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void sunion(std::initializer_list<T> il, Output output) {
-        sunion(il.begin(), il.end(), output);
-    }
-
-    long long sunionstore(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    long long sunionstore(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    long long sunionstore(const StringView &destination, std::initializer_list<T> il) {
-        return sunionstore(destination, il.begin(), il.end());
-    }
-
-    // SORTED SET commands.
-
-    auto bzpopmax(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmax(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmax(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmax(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmax(il.begin(), il.end(), timeout);
-    }
-
-    auto bzpopmin(const StringView &key, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    auto bzpopmin(const StringView &key,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first, Input last, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename Input>
-    auto bzpopmin(Input first,
-                    Input last,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>>;
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il, long long timeout)
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    template <typename T>
-    auto bzpopmin(std::initializer_list<T> il,
-                    const std::chrono::seconds &timeout = std::chrono::seconds{0})
-        -> Optional<std::tuple<std::string, std::string, double>> {
-        return bzpopmin(il.begin(), il.end(), timeout);
-    }
-
-    // We don't support the INCR option, since you can always use ZINCRBY instead.
-    long long zadd(const StringView &key,
-                    const StringView &member,
-                    double score,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename Input>
-    long long zadd(const StringView &key,
-                    Input first,
-                    Input last,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false);
-
-    template <typename T>
-    long long zadd(const StringView &key,
-                    std::initializer_list<T> il,
-                    UpdateType type = UpdateType::ALWAYS,
-                    bool changed = false) {
-        return zadd(key, il.begin(), il.end(), type, changed);
-    }
-
-    long long zcard(const StringView &key);
-
-    template <typename Interval>
-    long long zcount(const StringView &key, const Interval &interval);
-
-    double zincrby(const StringView &key, double increment, const StringView &member);
-
-    long long zinterstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zinterstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zinterstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zinterstore(destination, il.begin(), il.end(), type);
-    }
-
-    template <typename Interval>
-    long long zlexcount(const StringView &key, const Interval &interval);
-
-    Optional<std::pair<std::string, double>> zpopmax(const StringView &key);
-
-    template <typename Output>
-    void zpopmax(const StringView &key, long long count, Output output);
-
-    Optional<std::pair<std::string, double>> zpopmin(const StringView &key);
-
-    template <typename Output>
-    void zpopmin(const StringView &key, long long count, Output output);
-
-    // If *output* is an iterator of a container of string,
-    // we send *ZRANGE key start stop* command.
-    // If it's an iterator of a container of pair<string, double>,
-    // we send *ZRANGE key start stop WITHSCORES* command.
-    //
-    // The following code sends *ZRANGE* without the *WITHSCORES* option:
-    //
-    // vector<string> result;
-    // redis.zrange("key", 0, -1, back_inserter(result));
-    //
-    // On the other hand, the following code sends command with *WITHSCORES* option:
-    //
-    // unordered_map<string, double> with_score;
-    // redis.zrange("key", 0, -1, inserter(with_score, with_score.end()));
-    //
-    // This also applies to other commands with the *WITHSCORES* option,
-    // e.g. *ZRANGEBYSCORE*, *ZREVRANGE*, *ZREVRANGEBYSCORE*.
-    template <typename Output>
-    void zrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrangebyscore(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    OptionalLongLong zrank(const StringView &key, const StringView &member);
-
-    long long zrem(const StringView &key, const StringView &member);
-
-    template <typename Input>
-    long long zrem(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long zrem(const StringView &key, std::initializer_list<T> il) {
-        return zrem(key, il.begin(), il.end());
-    }
-
-    template <typename Interval>
-    long long zremrangebylex(const StringView &key, const Interval &interval);
-
-    long long zremrangebyrank(const StringView &key, long long start, long long stop);
-
-    template <typename Interval>
-    long long zremrangebyscore(const StringView &key, const Interval &interval);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Output>
-    void zrevrange(const StringView &key, long long start, long long stop, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key, const Interval &interval, Output output);
-
-    template <typename Interval, typename Output>
-    void zrevrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key, const Interval &interval, Output output);
-
-    // See *zrange* comment on how to send command with *WITHSCORES* option.
-    template <typename Interval, typename Output>
-    void zrevrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output);
-
-    OptionalLongLong zrevrank(const StringView &key, const StringView &member);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    const StringView &pattern,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    long long zscan(const StringView &key,
-                    long long cursor,
-                    Output output);
-
-    OptionalDouble zscore(const StringView &key, const StringView &member);
-
-    long long zunionstore(const StringView &destination, const StringView &key, double weight);
-
-    template <typename Input>
-    long long zunionstore(const StringView &destination,
-                            Input first,
-                            Input last,
-                            Aggregation type = Aggregation::SUM);
-
-    template <typename T>
-    long long zunionstore(const StringView &destination,
-                            std::initializer_list<T> il,
-                            Aggregation type = Aggregation::SUM) {
-        return zunionstore(destination, il.begin(), il.end(), type);
-    }
-
-    // HYPERLOGLOG commands.
-
-    bool pfadd(const StringView &key, const StringView &element);
-
-    template <typename Input>
-    bool pfadd(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    bool pfadd(const StringView &key, std::initializer_list<T> il) {
-        return pfadd(key, il.begin(), il.end());
-    }
-
-    long long pfcount(const StringView &key);
-
-    template <typename Input>
-    long long pfcount(Input first, Input last);
-
-    template <typename T>
-    long long pfcount(std::initializer_list<T> il) {
-        return pfcount(il.begin(), il.end());
-    }
-
-    void pfmerge(const StringView &destination, const StringView &key);
-
-    template <typename Input>
-    void pfmerge(const StringView &destination, Input first, Input last);
-
-    template <typename T>
-    void pfmerge(const StringView &destination, std::initializer_list<T> il) {
-        pfmerge(destination, il.begin(), il.end());
-    }
-
-    // GEO commands.
-
-    long long geoadd(const StringView &key,
-                        const std::tuple<StringView, double, double> &member);
-
-    template <typename Input>
-    long long geoadd(const StringView &key,
-                        Input first,
-                        Input last);
-
-    template <typename T>
-    long long geoadd(const StringView &key,
-                        std::initializer_list<T> il) {
-        return geoadd(key, il.begin(), il.end());
-    }
-
-    OptionalDouble geodist(const StringView &key,
-                            const StringView &member1,
-                            const StringView &member2,
-                            GeoUnit unit = GeoUnit::M);
-
-    OptionalString geohash(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geohash(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geohash(const StringView &key, std::initializer_list<T> il, Output output) {
-        geohash(key, il.begin(), il.end(), output);
-    }
-
-    Optional<std::pair<double, double>> geopos(const StringView &key, const StringView &member);
-
-    template <typename Input, typename Output>
-    void geopos(const StringView &key, Input first, Input last, Output output);
-
-    template <typename T, typename Output>
-    void geopos(const StringView &key, std::initializer_list<T> il, Output output) {
-        geopos(key, il.begin(), il.end(), output);
-    }
-
-    // TODO:
-    // 1. since we have different overloads for georadius and georadius-store,
-    //    we might use the GEORADIUS_RO command in the future.
-    // 2. there're too many parameters for this method, we might refactor it.
-    OptionalLongLong georadius(const StringView &key,
-                                const std::pair<double, double> &loc,
-                                double radius,
-                                GeoUnit unit,
-                                const StringView &destination,
-                                bool store_dist,
-                                long long count);
-
-    // If *output* is an iterator of a container of string, we send *GEORADIUS* command
-    // without any options and only get the members in the specified geo range.
-    // If *output* is an iterator of a container of a tuple, the type of the tuple decides
-    // options we send with the *GEORADIUS* command. If the tuple has an element of type
-    // double, we send the *WITHDIST* option. If it has an element of type string, we send
-    // the *WITHHASH* option. If it has an element of type pair<double, double>, we send
-    // the *WITHCOORD* option. For example:
-    //
-    // The following code only gets the members in range, i.e. without any option.
-    //
-    // vector<string> members;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(members))
-    //
-    // The following code sends the command with *WITHDIST* option.
-    //
-    // vector<tuple<string, double>> with_dist;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist))
-    //
-    // The following code sends the command with *WITHDIST* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, string>> with_dist_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_hash))
-    //
-    // The following code sends the command with *WITHDIST*, *WITHCOORD* and *WITHHASH* options.
-    //
-    // vector<tuple<string, double, pair<double, double>, string>> with_dist_coord_hash;
-    // redis.georadius("key", make_pair(10.1, 10.2), 10, GeoUnit::KM, 10, true,
-    //                  back_inserter(with_dist_coord_hash))
-    //
-    // This also applies to *GEORADIUSBYMEMBER*.
-    template <typename Output>
-    void georadius(const StringView &key,
-                    const std::pair<double, double> &loc,
-                    double radius,
-                    GeoUnit unit,
-                    long long count,
-                    bool asc,
-                    Output output);
-
-    OptionalLongLong georadiusbymember(const StringView &key,
-                                        const StringView &member,
-                                        double radius,
-                                        GeoUnit unit,
-                                        const StringView &destination,
-                                        bool store_dist,
-                                        long long count);
-
-    // See comments on *GEORADIUS*.
-    template <typename Output>
-    void georadiusbymember(const StringView &key,
-                            const StringView &member,
-                            double radius,
-                            GeoUnit unit,
-                            long long count,
-                            bool asc,
-                            Output output);
-
-    // SCRIPTING commands.
-
-    template <typename Result, typename Keys, typename Args>
-    Result eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last);
-
-    template <typename Result>
-    Result eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void eval(const StringView &script,
-                Keys keys_first,
-                Keys keys_last,
-                Args args_first,
-                Args args_last,
-                Output output);
-
-    template <typename Output>
-    void eval(const StringView &script,
-                std::initializer_list<StringView> keys,
-                std::initializer_list<StringView> args,
-                Output output);
-
-    template <typename Result, typename Keys, typename Args>
-    Result evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last);
-
-    template <typename Result>
-    Result evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args);
-
-    template <typename Keys, typename Args, typename Output>
-    void evalsha(const StringView &script,
-                    Keys keys_first,
-                    Keys keys_last,
-                    Args args_first,
-                    Args args_last,
-                    Output output);
-
-    template <typename Output>
-    void evalsha(const StringView &script,
-                    std::initializer_list<StringView> keys,
-                    std::initializer_list<StringView> args,
-                    Output output);
-
-    // PUBSUB commands.
-
-    long long publish(const StringView &channel, const StringView &message);
-
-    // Stream commands.
-
-    long long xack(const StringView &key, const StringView &group, const StringView &id);
-
-    template <typename Input>
-    long long xack(const StringView &key, const StringView &group, Input first, Input last);
-
-    template <typename T>
-    long long xack(const StringView &key, const StringView &group, std::initializer_list<T> il) {
-        return xack(key, group, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key, const StringView &id, Input first, Input last);
-
-    template <typename T>
-    std::string xadd(const StringView &key, const StringView &id, std::initializer_list<T> il) {
-        return xadd(key, id, il.begin(), il.end());
-    }
-
-    template <typename Input>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        Input first,
-                        Input last,
-                        long long count,
-                        bool approx = true);
-
-    template <typename T>
-    std::string xadd(const StringView &key,
-                        const StringView &id,
-                        std::initializer_list<T> il,
-                        long long count,
-                        bool approx = true) {
-        return xadd(key, id, il.begin(), il.end(), count, approx);
-    }
-
-    template <typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                const StringView &id,
-                Output output);
-
-    template <typename Input, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                Input first,
-                Input last,
-                Output output);
-
-    template <typename T, typename Output>
-    void xclaim(const StringView &key,
-                const StringView &group,
-                const StringView &consumer,
-                const std::chrono::milliseconds &min_idle_time,
-                std::initializer_list<T> il,
-                Output output) {
-        xclaim(key, group, consumer, min_idle_time, il.begin(), il.end(), output);
-    }
-
-    long long xdel(const StringView &key, const StringView &id);
-
-    template <typename Input>
-    long long xdel(const StringView &key, Input first, Input last);
-
-    template <typename T>
-    long long xdel(const StringView &key, std::initializer_list<T> il) {
-        return xdel(key, il.begin(), il.end());
-    }
-
-    void xgroup_create(const StringView &key,
-                        const StringView &group,
-                        const StringView &id,
-                        bool mkstream = false);
-
-    void xgroup_setid(const StringView &key, const StringView &group, const StringView &id);
-
-    long long xgroup_destroy(const StringView &key, const StringView &group);
-
-    long long xgroup_delconsumer(const StringView &key,
-                                    const StringView &group,
-                                    const StringView &consumer);
-
-    long long xlen(const StringView &key);
-
-    template <typename Output>
-    auto xpending(const StringView &key, const StringView &group, Output output)
-        -> std::tuple<long long, OptionalString, OptionalString>;
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    Output output);
-
-    template <typename Output>
-    void xpending(const StringView &key,
-                    const StringView &group,
-                    const StringView &start,
-                    const StringView &end,
-                    long long count,
-                    const StringView &consumer,
-                    Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                Output output);
-
-    template <typename Output>
-    void xrange(const StringView &key,
-                const StringView &start,
-                const StringView &end,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                Output output) {
-        xread(key, id, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, long long count, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first, Input last, Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, 0, output);
-    }
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output);
-
-    template <typename Output>
-    void xread(const StringView &key,
-                const StringView &id,
-                const std::chrono::milliseconds &timeout,
-                Output output) {
-        xread(key, id, timeout, 0, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                long long count,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xread(Input first,
-                Input last,
-                const std::chrono::milliseconds &timeout,
-                Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xread(first, last, timeout, 0, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    long long count,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    Output output) {
-        xreadgroup(group, consumer, key, id, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first ,last, 0, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output);
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, count, false, output);
-    }
-
-    template <typename Output>
-    void xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    const StringView &key,
-                    const StringView &id,
-                    const std::chrono::milliseconds &timeout,
-                    Output output) {
-        return xreadgroup(group, consumer, key, id, timeout, 0, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    bool noack,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type;
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    long long count,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, count, false, output);
-    }
-
-    template <typename Input, typename Output>
-    auto xreadgroup(const StringView &group,
-                    const StringView &consumer,
-                    Input first,
-                    Input last,
-                    const std::chrono::milliseconds &timeout,
-                    Output output)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-        xreadgroup(group, consumer, first, last, timeout, 0, false, output);
-    }
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    Output output);
-
-    template <typename Output>
-    void xrevrange(const StringView &key,
-                    const StringView &end,
-                    const StringView &start,
-                    long long count,
-                    Output output);
-
-    long long xtrim(const StringView &key, long long count, bool approx = true);
-
-private:
-    class Command {
-    public:
-        explicit Command(const StringView &cmd_name) : _cmd_name(cmd_name) {}
-
-        template <typename ...Args>
-        void operator()(Connection &connection, Args &&...args) const {
-            CmdArgs cmd_args;
-            cmd_args.append(_cmd_name, std::forward<Args>(args)...);
-            connection.send(cmd_args);
-        }
-
-    private:
-        StringView _cmd_name;
-    };
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename Key, typename ...Args>
-    auto _generic_command(Cmd cmd, Key &&key, Args &&...args)
-        -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                    ReplyUPtr>::type;
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, Connection &connection, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::true_type, const StringView &key, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _command(Cmd cmd, std::false_type, Input &&first, Args &&...args);
-
-    template <std::size_t ...Is, typename ...Args>
-    ReplyUPtr _command(const StringView &cmd_name, const IndexSequence<Is...> &, Args &&...args) {
-        return command(cmd_name, NthValue<Is>(std::forward<Args>(args)...)...);
-    }
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::true_type, Input input, Args &&...args);
-
-    template <typename Cmd, typename Input, typename ...Args>
-    ReplyUPtr _range_command(Cmd cmd, std::false_type, Input input, Args &&...args);
-
-    void _asking(Connection &connection);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::true_type, Cmd cmd, Args &&... args);
-
-    template <typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(std::false_type, Cmd cmd, Args &&... args);
-
-    template <typename Output, typename Cmd, typename ...Args>
-    ReplyUPtr _score_command(Cmd cmd, Args &&... args);
-
-    ShardsPool _pool;
-};
-
-}
-
-}
-
-#include "redis_cluster.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.hpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.hpp
deleted file mode 100644
index 2153d181b..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/redis_cluster.hpp
+++ /dev/null
@@ -1,1403 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-#define SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
-
-#include <utility>
-#include "command.h"
-#include "reply.h"
-#include "utils.h"
-#include "errors.h"
-#include "shards_pool.h"
-
-namespace sw {
-
-namespace redis {
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<!std::is_convertible<Cmd, StringView>::value, ReplyUPtr>::type {
-    return _command(cmd,
-                    std::is_convertible<typename std::decay<Key>::type, StringView>(),
-                    std::forward<Key>(key),
-                    std::forward<Args>(args)...);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-        || std::is_arithmetic<typename std::decay<Key>::type>::value)
-        && !IsIter<typename LastType<Key, Args...>::type>::value, ReplyUPtr>::type {
-    auto cmd = Command(cmd_name);
-
-    return _generic_command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Result, typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value, Result>::type {
-    auto r = command(cmd_name, std::forward<Key>(key), std::forward<Args>(args)...);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Key, typename ...Args>
-auto RedisCluster::command(const StringView &cmd_name, Key &&key, Args &&...args)
-    -> typename std::enable_if<(std::is_convertible<Key, StringView>::value
-            || std::is_arithmetic<typename std::decay<Key>::type>::value)
-            && IsIter<typename LastType<Key, Args...>::type>::value, void>::type {
-    auto r = _command(cmd_name,
-                        MakeIndexSequence<sizeof...(Args)>(),
-                        std::forward<Key>(key),
-                        std::forward<Args>(args)...);
-
-    assert(r);
-
-    reply::to_array(*r, LastValue(std::forward<Args>(args)...));
-}
-
-template <typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, ReplyUPtr>::type {
-    if (first == last || std::next(first) == last) {
-        throw Error("command: invalid range");
-    }
-
-    const auto &key = *first;
-    ++first;
-
-    auto cmd = [&key](Connection &connection, Input first, Input last) {
-                        CmdArgs cmd_args;
-                        cmd_args.append(key);
-                        while (first != last) {
-                            cmd_args.append(*first);
-                            ++first;
-                        }
-                        connection.send(cmd_args);
-    };
-
-    return command(cmd, first, last);
-}
-
-template <typename Result, typename Input>
-auto RedisCluster::command(Input first, Input last)
-    -> typename std::enable_if<IsIter<Input>::value, Result>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    return reply::parse<Result>(*r);
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::command(Input first, Input last, Output output)
-    -> typename std::enable_if<IsIter<Input>::value, void>::type {
-    auto r = command(first, last);
-
-    assert(r);
-
-    reply::to_array(*r, output);
-}
-
-// KEY commands.
-
-template <typename Input>
-long long RedisCluster::del(Input first, Input last) {
-    range_check("DEL", first, last);
-
-    auto reply = command(cmd::del_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::exists(Input first, Input last) {
-    range_check("EXISTS", first, last);
-
-    auto reply = command(cmd::exists_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-inline bool RedisCluster::expire(const StringView &key, const std::chrono::seconds &timeout) {
-    return expire(key, timeout.count());
-}
-
-inline bool RedisCluster::expireat(const StringView &key,
-                                    const std::chrono::time_point<std::chrono::system_clock,
-                                                                    std::chrono::seconds> &tp) {
-    return expireat(key, tp.time_since_epoch().count());
-}
-
-inline bool RedisCluster::pexpire(const StringView &key, const std::chrono::milliseconds &timeout) {
-    return pexpire(key, timeout.count());
-}
-
-inline bool RedisCluster::pexpireat(const StringView &key,
-                                const std::chrono::time_point<std::chrono::system_clock,
-                                                                std::chrono::milliseconds> &tp) {
-    return pexpireat(key, tp.time_since_epoch().count());
-}
-
-inline void RedisCluster::restore(const StringView &key,
-                            const StringView &val,
-                            const std::chrono::milliseconds &ttl,
-                            bool replace) {
-    return restore(key, val, ttl.count(), replace);
-}
-
-template <typename Input>
-long long RedisCluster::touch(Input first, Input last) {
-    range_check("TOUCH", first, last);
-
-    auto reply = command(cmd::touch_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::unlink(Input first, Input last) {
-    range_check("UNLINK", first, last);
-
-    auto reply = command(cmd::unlink_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// STRING commands.
-
-template <typename Input>
-long long RedisCluster::bitop(BitOp op, const StringView &destination, Input first, Input last) {
-    range_check("BITOP", first, last);
-
-    auto reply = _command(cmd::bitop_range<Input>, destination, op, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::mget(Input first, Input last, Output output) {
-    range_check("MGET", first, last);
-
-    auto reply = command(cmd::mget<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-void RedisCluster::mset(Input first, Input last) {
-    range_check("MSET", first, last);
-
-    auto reply = command(cmd::mset<Input>, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Input>
-bool RedisCluster::msetnx(Input first, Input last) {
-    range_check("MSETNX", first, last);
-
-    auto reply = command(cmd::msetnx<Input>, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-inline void RedisCluster::psetex(const StringView &key,
-                            const std::chrono::milliseconds &ttl,
-                            const StringView &val) {
-    return psetex(key, ttl.count(), val);
-}
-
-inline void RedisCluster::setex(const StringView &key,
-                            const std::chrono::seconds &ttl,
-                            const StringView &val) {
-    setex(key, ttl.count(), val);
-}
-
-// LIST commands.
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first, Input last, long long timeout) {
-    range_check("BLPOP", first, last);
-
-    auto reply = command(cmd::blpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::blpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return blpop(first, last, timeout.count());
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first, Input last, long long timeout) {
-    range_check("BRPOP", first, last);
-
-    auto reply = command(cmd::brpop_range<Input>, first, last, timeout);
-
-    return reply::parse<OptionalStringPair>(*reply);
-}
-
-template <typename Input>
-OptionalStringPair RedisCluster::brpop(Input first,
-                                Input last,
-                                const std::chrono::seconds &timeout) {
-    return brpop(first, last, timeout.count());
-}
-
-inline OptionalString RedisCluster::brpoplpush(const StringView &source,
-                                        const StringView &destination,
-                                        const std::chrono::seconds &timeout) {
-    return brpoplpush(source, destination, timeout.count());
-}
-
-template <typename Input>
-inline long long RedisCluster::lpush(const StringView &key, Input first, Input last) {
-    range_check("LPUSH", first, last);
-
-    auto reply = command(cmd::lpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::lrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = command(cmd::lrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline long long RedisCluster::rpush(const StringView &key, Input first, Input last) {
-    range_check("RPUSH", first, last);
-
-    auto reply = command(cmd::rpush_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HASH commands.
-
-template <typename Input>
-inline long long RedisCluster::hdel(const StringView &key, Input first, Input last) {
-    range_check("HDEL", first, last);
-
-    auto reply = command(cmd::hdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hgetall(const StringView &key, Output output) {
-    auto reply = command(cmd::hgetall, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-inline void RedisCluster::hkeys(const StringView &key, Output output) {
-    auto reply = command(cmd::hkeys, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-inline void RedisCluster::hmget(const StringView &key, Input first, Input last, Output output) {
-    range_check("HMGET", first, last);
-
-    auto reply = command(cmd::hmget<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-inline void RedisCluster::hmset(const StringView &key, Input first, Input last) {
-    range_check("HMSET", first, last);
-
-    auto reply = command(cmd::hmset<Input>, key, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::hscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::hscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return hscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return hscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::hscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return hscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-auto RedisCluster::hset(const StringView &key, Input first, Input last)
-        -> typename std::enable_if<!std::is_convertible<Input, StringView>::value,
-                                    long long>::type {
-    range_check("HSET", first, last);
-
-    auto reply = command(cmd::hset_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-inline void RedisCluster::hvals(const StringView &key, Output output) {
-    auto reply = command(cmd::hvals, key);
-
-    reply::to_array(*reply, output);
-}
-
-// SET commands.
-
-template <typename Input>
-long long RedisCluster::sadd(const StringView &key, Input first, Input last) {
-    range_check("SADD", first, last);
-
-    auto reply = command(cmd::sadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sdiff(Input first, Input last, Output output) {
-    range_check("SDIFF", first, last);
-
-    auto reply = command(cmd::sdiff<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sdiffstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    range_check("SDIFFSTORE", first, last);
-
-    auto reply = command(cmd::sdiffstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sinter(Input first, Input last, Output output) {
-    range_check("SINTER", first, last);
-
-    auto reply = command(cmd::sinter<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sinterstore(const StringView &destination,
-                                    Input first,
-                                    Input last) {
-    range_check("SINTERSTORE", first, last);
-
-    auto reply = command(cmd::sinterstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::smembers(const StringView &key, Output output) {
-    auto reply = command(cmd::smembers, key);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::spop(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::spop_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::srandmember(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::srandmember_range, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::srem(const StringView &key, Input first, Input last) {
-    range_check("SREM", first, last);
-
-    auto reply = command(cmd::srem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-long long RedisCluster::sscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::sscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return sscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return sscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::sscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return sscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::sunion(Input first, Input last, Output output) {
-    range_check("SUNION", first, last);
-
-    auto reply = command(cmd::sunion<Input>, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::sunionstore(const StringView &destination, Input first, Input last) {
-    range_check("SUNIONSTORE", first, last);
-
-    auto reply = command(cmd::sunionstore_range<Input>, destination, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-// SORTED SET commands.
-
-inline auto RedisCluster::bzpopmax(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmax(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmax_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmax(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmax(first, last, timeout.count());
-}
-
-inline auto RedisCluster::bzpopmin(const StringView &key, const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(key, timeout.count());
-}
-
-template <typename Input>
-auto RedisCluster::bzpopmin(Input first, Input last, long long timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    auto reply = command(cmd::bzpopmin_range<Input>, first, last, timeout);
-
-    return reply::parse<Optional<std::tuple<std::string, std::string, double>>>(*reply);
-}
-
-template <typename Input>
-inline auto RedisCluster::bzpopmin(Input first,
-                                    Input last,
-                                    const std::chrono::seconds &timeout)
-    -> Optional<std::tuple<std::string, std::string, double>> {
-    return bzpopmin(first, last, timeout.count());
-}
-
-template <typename Input>
-long long RedisCluster::zadd(const StringView &key,
-                        Input first,
-                        Input last,
-                        UpdateType type,
-                        bool changed) {
-    range_check("ZADD", first, last);
-
-    auto reply = command(cmd::zadd_range<Input>, key, first, last, type, changed);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::zinterstore(const StringView &destination,
-                                Input first,
-                                Input last,
-                                Aggregation type) {
-    range_check("ZINTERSTORE", first, last);
-
-    auto reply = command(cmd::zinterstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zlexcount(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zlexcount<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zpopmax(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmax, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zpopmin(const StringView &key, long long count, Output output) {
-    auto reply = command(cmd::zpopmin, key, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::zrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key, const Interval &interval, Output output) {
-    zrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebylex(const StringView &key,
-                        const Interval &interval,
-                        const LimitOptions &opts,
-                        Output output) {
-    auto reply = command(cmd::zrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            Output output) {
-    zrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrangebyscore(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = _score_command<Output>(cmd::zrangebyscore<Interval>,
-                                        key,
-                                        interval,
-                                        opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::zrem(const StringView &key, Input first, Input last) {
-    range_check("ZREM", first, last);
-
-    auto reply = command(cmd::zrem_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebylex(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebylex<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Interval>
-long long RedisCluster::zremrangebyscore(const StringView &key, const Interval &interval) {
-    auto reply = command(cmd::zremrangebyscore<Interval>, key, interval);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::zrevrange(const StringView &key, long long start, long long stop, Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrange, key, start, stop);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-inline void RedisCluster::zrevrangebylex(const StringView &key,
-                                    const Interval &interval,
-                                    Output output) {
-    zrevrangebylex(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebylex(const StringView &key,
-                            const Interval &interval,
-                            const LimitOptions &opts,
-                            Output output) {
-    auto reply = command(cmd::zrevrangebylex<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key, const Interval &interval, Output output) {
-    zrevrangebyscore(key, interval, {}, output);
-}
-
-template <typename Interval, typename Output>
-void RedisCluster::zrevrangebyscore(const StringView &key,
-                                const Interval &interval,
-                                const LimitOptions &opts,
-                                Output output) {
-    auto reply = _score_command<Output>(cmd::zrevrangebyscore<Interval>, key, interval, opts);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-long long RedisCluster::zscan(const StringView &key,
-                        long long cursor,
-                        const StringView &pattern,
-                        long long count,
-                        Output output) {
-    auto reply = command(cmd::zscan, key, cursor, pattern, count);
-
-    return reply::parse_scan_reply(*reply, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                const StringView &pattern,
-                                Output output) {
-    return zscan(key, cursor, pattern, 10, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                long long count,
-                                Output output) {
-    return zscan(key, cursor, "*", count, output);
-}
-
-template <typename Output>
-inline long long RedisCluster::zscan(const StringView &key,
-                                long long cursor,
-                                Output output) {
-    return zscan(key, cursor, "*", 10, output);
-}
-
-template <typename Input>
-long long RedisCluster::zunionstore(const StringView &destination,
-                                    Input first,
-                                    Input last,
-                                    Aggregation type) {
-    range_check("ZUNIONSTORE", first, last);
-
-    auto reply = command(cmd::zunionstore_range<Input>,
-                            destination,
-                            first,
-                            last,
-                            type);
-
-    return reply::parse<long long>(*reply);
-}
-
-// HYPERLOGLOG commands.
-
-template <typename Input>
-bool RedisCluster::pfadd(const StringView &key, Input first, Input last) {
-    range_check("PFADD", first, last);
-
-    auto reply = command(cmd::pfadd_range<Input>, key, first, last);
-
-    return reply::parse<bool>(*reply);
-}
-
-template <typename Input>
-long long RedisCluster::pfcount(Input first, Input last) {
-    range_check("PFCOUNT", first, last);
-
-    auto reply = command(cmd::pfcount_range<Input>, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-void RedisCluster::pfmerge(const StringView &destination,
-                    Input first,
-                    Input last) {
-    range_check("PFMERGE", first, last);
-
-    auto reply = command(cmd::pfmerge_range<Input>, destination, first, last);
-
-    reply::parse<void>(*reply);
-}
-
-// GEO commands.
-
-template <typename Input>
-inline long long RedisCluster::geoadd(const StringView &key,
-                                Input first,
-                                Input last) {
-    range_check("GEOADD", first, last);
-
-    auto reply = command(cmd::geoadd_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geohash(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOHASH", first, last);
-
-    auto reply = command(cmd::geohash_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::geopos(const StringView &key, Input first, Input last, Output output) {
-    range_check("GEOPOS", first, last);
-
-    auto reply = command(cmd::geopos_range<Input>, key, first, last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadius(const StringView &key,
-                        const std::pair<double, double> &loc,
-                        double radius,
-                        GeoUnit unit,
-                        long long count,
-                        bool asc,
-                        Output output) {
-    auto reply = command(cmd::georadius,
-                            key,
-                            loc,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::georadiusbymember(const StringView &key,
-                                const StringView &member,
-                                double radius,
-                                GeoUnit unit,
-                                long long count,
-                                bool asc,
-                                Output output) {
-    auto reply = command(cmd::georadiusbymember,
-                            key,
-                            member,
-                            radius,
-                            unit,
-                            count,
-                            asc,
-                            WithCoord<typename IterType<Output>::type>::value,
-                            WithDist<typename IterType<Output>::type>::value,
-                            WithHash<typename IterType<Output>::type>::value);
-
-    reply::to_array(*reply, output);
-}
-
-// SCRIPTING commands.
-
-template <typename Result, typename Keys, typename Args>
-Result RedisCluster::eval(const StringView &script,
-                          Keys keys_first,
-                          Keys keys_last,
-                          Args args_first,
-                          Args args_last) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval<Keys, Args>, *keys_first, script, keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result RedisCluster::eval(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args) {
-    return eval<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void RedisCluster::eval(const StringView &script,
-                          Keys keys_first,
-                          Keys keys_last,
-                          Args args_first,
-                          Args args_last,
-                          Output output) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::eval<Keys, Args>,
-                            *keys_first,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::eval(const StringView &script,
-                        std::initializer_list<StringView> keys,
-                        std::initializer_list<StringView> args,
-                        Output output) {
-    eval(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-template <typename Result, typename Keys, typename Args>
-Result RedisCluster::evalsha(const StringView &script,
-                              Keys keys_first,
-                              Keys keys_last,
-                              Args args_first,
-                              Args args_last) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha<Keys, Args>, *keys_first, script,
-            keys_first, keys_last, args_first, args_last);
-
-    return reply::parse<Result>(*reply);
-}
-
-template <typename Result>
-Result RedisCluster::evalsha(const StringView &script,
-                                std::initializer_list<StringView> keys,
-                                std::initializer_list<StringView> args) {
-    return evalsha<Result>(script, keys.begin(), keys.end(), args.begin(), args.end());
-}
-
-template <typename Keys, typename Args, typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                              Keys keys_first,
-                              Keys keys_last,
-                              Args args_first,
-                              Args args_last,
-                              Output output) {
-    if (keys_first == keys_last) {
-        throw Error("DO NOT support Lua script without key");
-    }
-
-    auto reply = _command(cmd::evalsha<Keys, Args>,
-                            *keys_first,
-                            script,
-                            keys_first, keys_last,
-                            args_first, args_last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::evalsha(const StringView &script,
-                            std::initializer_list<StringView> keys,
-                            std::initializer_list<StringView> args,
-                            Output output) {
-    evalsha(script, keys.begin(), keys.end(), args.begin(), args.end(), output);
-}
-
-// Stream commands.
-
-template <typename Input>
-long long RedisCluster::xack(const StringView &key,
-                                const StringView &group,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xack_range<Input>, key, group, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last) {
-    auto reply = command(cmd::xadd_range<Input>, key, id, first, last);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Input>
-std::string RedisCluster::xadd(const StringView &key,
-                                const StringView &id,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool approx) {
-    auto reply = command(cmd::xadd_maxlen_range<Input>, key, id, first, last, count, approx);
-
-    return reply::parse<std::string>(*reply);
-}
-
-template <typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            const StringView &id,
-                            Output output) {
-    auto reply = command(cmd::xclaim, key, group, consumer, min_idle_time.count(), id);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input, typename Output>
-void RedisCluster::xclaim(const StringView &key,
-                            const StringView &group,
-                            const StringView &consumer,
-                            const std::chrono::milliseconds &min_idle_time,
-                            Input first,
-                            Input last,
-                            Output output) {
-    auto reply = command(cmd::xclaim_range<Input>,
-                            key,
-                            group,
-                            consumer,
-                            min_idle_time.count(),
-                            first,
-                            last);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Input>
-long long RedisCluster::xdel(const StringView &key, Input first, Input last) {
-    auto reply = command(cmd::xdel_range<Input>, key, first, last);
-
-    return reply::parse<long long>(*reply);
-}
-
-template <typename Output>
-auto RedisCluster::xpending(const StringView &key, const StringView &group, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    auto reply = command(cmd::xpending, key, group);
-
-    return reply::parse_xpending_reply(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xpending_detail, key, group, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xpending(const StringView &key,
-                            const StringView &group,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            const StringView &consumer,
-                            Output output) {
-    auto reply = command(cmd::xpending_per_consumer, key, group, start, end, count, consumer);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            Output output) {
-    auto reply = command(cmd::xrange, key, start, end);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrange(const StringView &key,
-                            const StringView &start,
-                            const StringView &end,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xrange_count, key, start, end, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread, key, id, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first, Input last, long long count, Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_range<Input>, first, last, count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xread(const StringView &key,
-                            const StringView &id,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output) {
-    auto reply = command(cmd::xread_block, key, id, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xread(Input first,
-                            Input last,
-                            const std::chrono::milliseconds &timeout,
-                            long long count,
-                            Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREAD", first, last);
-
-    auto reply = command(cmd::xread_block_range<Input>, first, last, timeout.count(), count);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup, key, group, consumer, key, id, count, noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = _command(cmd::xreadgroup_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                const StringView &key,
-                                const StringView &id,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output) {
-    auto reply = _command(cmd::xreadgroup_block,
-                            key,
-                            group,
-                            consumer,
-                            key,
-                            id,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Input, typename Output>
-auto RedisCluster::xreadgroup(const StringView &group,
-                                const StringView &consumer,
-                                Input first,
-                                Input last,
-                                const std::chrono::milliseconds &timeout,
-                                long long count,
-                                bool noack,
-                                Output output)
-    -> typename std::enable_if<!std::is_convertible<Input, StringView>::value>::type {
-    range_check("XREADGROUP", first, last);
-
-    auto reply = _command(cmd::xreadgroup_block_range<Input>,
-                            first->first,
-                            group,
-                            consumer,
-                            first,
-                            last,
-                            timeout.count(),
-                            count,
-                            noack);
-
-    if (!reply::is_nil(*reply)) {
-        reply::to_array(*reply, output);
-    }
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                            const StringView &end,
-                            const StringView &start,
-                            Output output) {
-    auto reply = command(cmd::xrevrange, key, end, start);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Output>
-void RedisCluster::xrevrange(const StringView &key,
-                                const StringView &end,
-                                const StringView &start,
-                                long long count,
-                                Output output) {
-    auto reply = command(cmd::xrevrange_count, key, end, start, count);
-
-    reply::to_array(*reply, output);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_convertible<Key, StringView>::value,
-                                ReplyUPtr>::type {
-    return command(cmd, std::forward<Key>(key), std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Key, typename ...Args>
-auto RedisCluster::_generic_command(Cmd cmd, Key &&key, Args &&...args)
-    -> typename std::enable_if<std::is_arithmetic<typename std::decay<Key>::type>::value,
-                                ReplyUPtr>::type {
-    auto k = std::to_string(std::forward<Key>(key));
-    return command(cmd, k, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::true_type, const StringView &key, Args &&...args) {
-    return _command(cmd, key, key, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, std::false_type, Input &&first, Args &&...args) {
-    return _range_command(cmd,
-                            std::is_convertible<
-                                typename std::decay<
-                                    decltype(*std::declval<Input>())>::type, StringView>(),
-                            std::forward<Input>(first),
-                            std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::true_type, Input input, Args &&...args) {
-    return _command(cmd, *input, input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename Input, typename ...Args>
-ReplyUPtr RedisCluster::_range_command(Cmd cmd, std::false_type, Input input, Args &&...args) {
-    return _command(cmd, std::get<0>(*input), input, std::forward<Args>(args)...);
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, Connection &connection, Args &&...args) {
-    assert(!connection.broken());
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    return connection.recv();
-}
-
-template <typename Cmd, typename ...Args>
-ReplyUPtr RedisCluster::_command(Cmd cmd, const StringView &key, Args &&...args) {
-    for (auto idx = 0; idx < 2; ++idx) {
-        try {
-            auto pool = _pool.fetch(key);
-            assert(pool);
-            SafeConnection safe_connection(*pool);
-
-            return _command(cmd, safe_connection.connection(), std::forward<Args>(args)...);
-        } catch (const IoError &err) {
-            // When master is down, one of its replicas will be promoted to be the new master.
-            // If we try to send command to the old master, we'll get an *IoError*.
-            // In this case, we need to update the slots mapping.
-            _pool.update();
-        } catch (const ClosedError &err) {
-            // Node might be removed.
-            // 1. Get up-to-date slot mapping to check if the node still exists.
-            _pool.update();
-
-            // TODO:
-            // 2. If it's NOT exist, update slot mapping, and retry.
-            // 3. If it's still exist, that means the node is down, NOT removed, throw exception.
-        } catch (const MovedError &err) {
-            // Slot mapping has been changed, update it and try again.
-            _pool.update();
-        } catch (const AskError &err) {
-            auto pool = _pool.fetch(err.node());
-            assert(pool);
-            SafeConnection safe_connection(*pool);
-            auto &connection = safe_connection.connection();
-
-            // 1. send ASKING command.
-            _asking(connection);
-
-            // 2. resend last command.
-            try {
-                return _command(cmd, connection, std::forward<Args>(args)...);
-            } catch (const MovedError &err) {
-                throw Error("Slot migrating... ASKING node hasn't been set to IMPORTING state");
-            }
-        } // For other exceptions, just throw it.
-    }
-
-    // Possible failures:
-    // 1. Source node has already run 'CLUSTER SETSLOT xxx NODE xxx',
-    //    while the destination node has NOT run it.
-    //    In this case, client will be redirected by both nodes with MovedError.
-    // 2. Other failures...
-    throw Error("Failed to send command with key: " + std::string(key.data(), key.size()));
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::true_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., true);
-}
-
-template <typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(std::false_type, Cmd cmd, Args &&... args) {
-    return command(cmd, std::forward<Args>(args)..., false);
-}
-
-template <typename Output, typename Cmd, typename ...Args>
-inline ReplyUPtr RedisCluster::_score_command(Cmd cmd, Args &&... args) {
-    return _score_command(typename IsKvPairIter<Output>::type(),
-                            cmd,
-                            std::forward<Args>(args)...);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REDIS_CLUSTER_HPP
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/reply.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/reply.cpp
deleted file mode 100644
index 01f1c8eec..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/reply.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "reply.h"
-#include <cstdlib>
-#include <stdexcept>
-
-namespace sw {
-
-namespace redis {
-
-namespace reply {
-
-std::string to_status(redisReply &reply) {
-    if (!reply::is_status(reply)) {
-        throw ProtoError("Expect STATUS reply");
-    }
-
-    if (reply.str == nullptr) {
-        throw ProtoError("A null status reply");
-    }
-
-    // Old version hiredis' *redisReply::len* is of type int.
-    // So we CANNOT have something like: *return {reply.str, reply.len}*.
-    return std::string(reply.str, reply.len);
-}
-
-std::string parse(ParseTag<std::string>, redisReply &reply) {
-    if (!reply::is_string(reply) && !reply::is_status(reply)) {
-        throw ProtoError("Expect STRING reply");
-    }
-
-    if (reply.str == nullptr) {
-        throw ProtoError("A null string reply");
-    }
-
-    // Old version hiredis' *redisReply::len* is of type int.
-    // So we CANNOT have something like: *return {reply.str, reply.len}*.
-    return std::string(reply.str, reply.len);
-}
-
-long long parse(ParseTag<long long>, redisReply &reply) {
-    if (!reply::is_integer(reply)) {
-        throw ProtoError("Expect INTEGER reply");
-    }
-
-    return reply.integer;
-}
-
-double parse(ParseTag<double>, redisReply &reply) {
-    try {
-        return std::stod(parse<std::string>(reply));
-    } catch (const std::invalid_argument &) {
-        throw ProtoError("not a double reply");
-    } catch (const std::out_of_range &) {
-        throw ProtoError("double reply out of range");
-    }
-}
-
-bool parse(ParseTag<bool>, redisReply &reply) {
-    auto ret = parse<long long>(reply);
-
-    if (ret == 1) {
-        return true;
-    } else if (ret == 0) {
-        return false;
-    } else {
-        throw ProtoError("Invalid bool reply: " + std::to_string(ret));
-    }
-}
-
-void parse(ParseTag<void>, redisReply &reply) {
-    if (!reply::is_status(reply)) {
-        throw ProtoError("Expect STATUS reply");
-    }
-
-    if (reply.str == nullptr) {
-        throw ProtoError("A null status reply");
-    }
-
-    static const std::string OK = "OK";
-
-    // Old version hiredis' *redisReply::len* is of type int.
-    // So we have to cast it to an unsigned int.
-    if (static_cast<std::size_t>(reply.len) != OK.size()
-            || OK.compare(0, OK.size(), reply.str, reply.len) != 0) {
-        throw ProtoError("NOT ok status reply: " + reply::to_status(reply));
-    }
-}
-
-void rewrite_set_reply(redisReply &reply) {
-    if (is_nil(reply)) {
-        // Failed to set, and make it a FALSE reply.
-        reply.type = REDIS_REPLY_INTEGER;
-        reply.integer = 0;
-
-        return;
-    }
-
-    // Check if it's a "OK" status reply.
-    reply::parse<void>(reply);
-
-    assert(is_status(reply) && reply.str != nullptr);
-
-    free(reply.str);
-
-    // Make it a TRUE reply.
-    reply.type = REDIS_REPLY_INTEGER;
-    reply.integer = 1;
-}
-
-void rewrite_empty_array_reply(redisReply &reply) {
-    if (is_array(reply) && reply.elements == 0) {
-        // Make it a nil reply.
-        reply.type = REDIS_REPLY_NIL;
-    }
-}
-
-namespace detail {
-
-bool is_flat_array(redisReply &reply) {
-    assert(reply::is_array(reply));
-
-    // Empty array reply.
-    if (reply.element == nullptr || reply.elements == 0) {
-        return false;
-    }
-
-    auto *sub_reply = reply.element[0];
-
-    // Null element.
-    if (sub_reply == nullptr) {
-        return false;
-    }
-
-    return !reply::is_array(*sub_reply);
-}
-
-}
-
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/reply.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/reply.h
deleted file mode 100644
index d89174329..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/reply.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_REPLY_H
-#define SEWENEW_REDISPLUSPLUS_REPLY_H
-
-#include <cassert>
-#include <string>
-#include <iterator>
-#include <memory>
-#include <functional>
-#include <tuple>
-#include <hiredis/hiredis.h>
-#include "errors.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-struct ReplyDeleter {
-    void operator()(redisReply *reply) const {
-        if (reply != nullptr) {
-            freeReplyObject(reply);
-        }
-    }
-};
-
-using ReplyUPtr = std::unique_ptr<redisReply, ReplyDeleter>;
-
-namespace reply {
-
-template <typename T>
-struct ParseTag {};
-
-template <typename T>
-inline T parse(redisReply &reply) {
-    return parse(ParseTag<T>(), reply);
-}
-
-template <typename T>
-T parse_leniently(redisReply &reply);
-
-void parse(ParseTag<void>, redisReply &reply);
-
-std::string parse(ParseTag<std::string>, redisReply &reply);
-
-long long parse(ParseTag<long long>, redisReply &reply);
-
-double parse(ParseTag<double>, redisReply &reply);
-
-bool parse(ParseTag<bool>, redisReply &reply);
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply);
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply);
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply);
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-inline Monostate parse(ParseTag<Monostate>, redisReply &) {
-    // Just ignore the reply
-    return {};
-}
-
-template <typename ...Args>
-Variant<Args...> parse(ParseTag<Variant<Args...>>, redisReply &reply);
-
-#endif
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type = 0>
-T parse(ParseTag<T>, redisReply &reply);
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output);
-
-inline bool is_error(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ERROR;
-}
-
-inline bool is_nil(redisReply &reply) {
-    return reply.type == REDIS_REPLY_NIL;
-}
-
-inline bool is_string(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STRING;
-}
-
-inline bool is_status(redisReply &reply) {
-    return reply.type == REDIS_REPLY_STATUS;
-}
-
-inline bool is_integer(redisReply &reply) {
-    return reply.type == REDIS_REPLY_INTEGER;
-}
-
-inline bool is_array(redisReply &reply) {
-    return reply.type == REDIS_REPLY_ARRAY;
-}
-
-std::string to_status(redisReply &reply);
-
-template <typename Output>
-void to_array(redisReply &reply, Output output);
-
-// Rewrite set reply to bool type
-void rewrite_set_reply(redisReply &reply);
-
-// Some command might return an empty array reply as a nil reply,
-// e.g. georadius, zpopmin, zpopmax. In this case, we rewrite the
-// reply to a nil reply.
-void rewrite_empty_array_reply(redisReply &reply);
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString>;
-
-}
-
-// Inline implementations.
-
-namespace reply {
-
-namespace detail {
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        auto *sub_reply = reply.element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null array element reply");
-        }
-
-        *output = parse<typename IterType<Output>::type>(*sub_reply);
-
-        ++output;
-    }
-}
-
-bool is_flat_array(redisReply &reply);
-
-template <typename Output>
-void to_flat_array(redisReply &reply, Output output) {
-    if (reply.element == nullptr) {
-        // Empty array.
-        return;
-    }
-
-    if (reply.elements % 2 != 0) {
-        throw ProtoError("Not string pair array reply");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; idx += 2) {
-        auto *key_reply = reply.element[idx];
-        auto *val_reply = reply.element[idx + 1];
-        if (key_reply == nullptr || val_reply == nullptr) {
-            throw ProtoError("Null string array reply");
-        }
-
-        using Pair = typename IterType<Output>::type;
-        using FirstType = typename std::decay<typename Pair::first_type>::type;
-        using SecondType = typename std::decay<typename Pair::second_type>::type;
-        *output = std::make_pair(parse<FirstType>(*key_reply),
-                                    parse<SecondType>(*val_reply));
-
-        ++output;
-    }
-}
-
-template <typename Output>
-void to_array(std::true_type, redisReply &reply, Output output) {
-    if (is_flat_array(reply)) {
-        to_flat_array(reply, output);
-    } else {
-        to_array(reply, output);
-    }
-}
-
-template <typename Output>
-void to_array(std::false_type, redisReply &reply, Output output) {
-    to_array(reply, output);
-}
-
-template <typename T>
-std::tuple<T> parse_tuple(redisReply **reply, std::size_t idx) {
-    assert(reply != nullptr);
-
-    auto *sub_reply = reply[idx];
-    if (sub_reply == nullptr) {
-        throw ProtoError("Null reply");
-    }
-
-    return std::make_tuple(parse<T>(*sub_reply));
-}
-
-template <typename T, typename ...Args>
-auto parse_tuple(redisReply **reply, std::size_t idx) ->
-    typename std::enable_if<sizeof...(Args) != 0, std::tuple<T, Args...>>::type {
-    assert(reply != nullptr);
-
-    return std::tuple_cat(parse_tuple<T>(reply, idx),
-                            parse_tuple<Args...>(reply, idx + 1));
-}
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-template <typename T>
-Variant<T> parse_variant(redisReply &reply) {
-    return parse<T>(reply);
-}
-
-template <typename T, typename ...Args>
-auto parse_variant(redisReply &reply) ->
-    typename std::enable_if<sizeof...(Args) != 0, Variant<T, Args...>>::type {
-    auto return_var = [](auto &&arg) {
-        return Variant<T, Args...>(std::move(arg));
-    };
-
-    try {
-        return std::visit(return_var, parse_variant<T>(reply));
-    } catch (const ProtoError &) {
-        return std::visit(return_var, parse_variant<Args...>(reply));
-    }
-}
-
-#endif
-
-}
-
-template <typename T>
-T parse_leniently(redisReply &reply) {
-    if (is_array(reply) && reply.elements == 1) {
-        if (reply.element == nullptr) {
-            throw ProtoError("null array reply");
-        }
-
-        auto *ele = reply.element[0];
-        if (ele != nullptr) {
-            return parse<T>(*ele);
-        } // else fall through
-    }
-
-    return parse<T>(reply);
-}
-
-template <typename T>
-Optional<T> parse(ParseTag<Optional<T>>, redisReply &reply) {
-    if (reply::is_nil(reply)) {
-        // Because of a GCC bug, we cannot return {} for -std=c++17
-        // Refer to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86465
-#if defined REDIS_PLUS_PLUS_HAS_OPTIONAL
-        return std::nullopt;
-#else
-        return {};
-#endif
-    }
-
-    return Optional<T>(parse<T>(reply));
-}
-
-template <typename T, typename U>
-std::pair<T, U> parse(ParseTag<std::pair<T, U>>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != 2) {
-        throw ProtoError("NOT key-value PAIR reply");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null PAIR reply");
-    }
-
-    auto *first = reply.element[0];
-    auto *second = reply.element[1];
-    if (first == nullptr || second == nullptr) {
-        throw ProtoError("Null pair reply");
-    }
-
-    return std::make_pair(parse<typename std::decay<T>::type>(*first),
-                            parse<typename std::decay<U>::type>(*second));
-}
-
-template <typename ...Args>
-std::tuple<Args...> parse(ParseTag<std::tuple<Args...>>, redisReply &reply) {
-    constexpr auto size = sizeof...(Args);
-
-    static_assert(size > 0, "DO NOT support parsing tuple with 0 element");
-
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.elements != size) {
-        throw ProtoError("Expect tuple reply with " + std::to_string(size) + "elements");
-    }
-
-    if (reply.element == nullptr) {
-        throw ProtoError("Null TUPLE reply");
-    }
-
-    return detail::parse_tuple<Args...>(reply.element, 0);
-}
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-template <typename ...Args>
-Variant<Args...> parse(ParseTag<Variant<Args...>>, redisReply &reply) {
-    return detail::parse_variant<Args...>(reply);
-}
-
-#endif
-
-template <typename T, typename std::enable_if<IsSequenceContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::back_inserter(container));
-
-    return container;
-}
-
-template <typename T, typename std::enable_if<IsAssociativeContainer<T>::value, int>::type>
-T parse(ParseTag<T>, redisReply &reply) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    T container;
-
-    to_array(reply, std::inserter(container, container.end()));
-
-    return container;
-}
-
-template <typename Output>
-long long parse_scan_reply(redisReply &reply, Output output) {
-    if (reply.elements != 2 || reply.element == nullptr) {
-        throw ProtoError("Invalid scan reply");
-    }
-
-    auto *cursor_reply = reply.element[0];
-    auto *data_reply = reply.element[1];
-    if (cursor_reply == nullptr || data_reply == nullptr) {
-        throw ProtoError("Invalid cursor reply or data reply");
-    }
-
-    auto cursor_str = reply::parse<std::string>(*cursor_reply);
-    long long new_cursor = 0;
-    try {
-        new_cursor = std::stoll(cursor_str);
-    } catch (const std::exception &e) {
-        throw ProtoError("Invalid cursor reply: " + cursor_str);
-    }
-
-    reply::to_array(*data_reply, output);
-
-    return new_cursor;
-}
-
-template <typename Output>
-void to_array(redisReply &reply, Output output) {
-    if (!is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    detail::to_array(typename IsKvPairIter<Output>::type(), reply, output);
-}
-
-template <typename Output>
-auto parse_xpending_reply(redisReply &reply, Output output)
-    -> std::tuple<long long, OptionalString, OptionalString> {
-    if (!is_array(reply) || reply.elements != 4) {
-        throw ProtoError("expect array reply with 4 elements");
-    }
-
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        if (reply.element[idx] == nullptr) {
-            throw ProtoError("null array reply");
-        }
-    }
-
-    auto num = parse<long long>(*(reply.element[0]));
-    auto start = parse<OptionalString>(*(reply.element[1]));
-    auto end = parse<OptionalString>(*(reply.element[2]));
-
-    auto &entry_reply = *(reply.element[3]);
-    if (!is_nil(entry_reply)) {
-        to_array(entry_reply, output);
-    }
-
-    return std::make_tuple(num, std::move(start), std::move(end));
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_REPLY_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/sentinel.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/sentinel.cpp
deleted file mode 100644
index 6cce61461..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/sentinel.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "sentinel.h"
-#include <cassert>
-#include <thread>
-#include <random>
-#include <algorithm>
-#include "redis.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class Sentinel::Iterator {
-public:
-    Iterator(std::list<Connection> &healthy_sentinels,
-                std::list<ConnectionOptions> &broken_sentinels) :
-                    _healthy_sentinels(healthy_sentinels),
-                    _broken_sentinels(broken_sentinels) {
-        reset();
-    }
-
-    Connection& next();
-
-    void reset();
-
-private:
-    std::list<Connection> &_healthy_sentinels;
-
-    std::size_t _healthy_size = 0;
-
-    std::list<ConnectionOptions> &_broken_sentinels;
-
-    std::size_t _broken_size = 0;
-};
-
-Connection& Sentinel::Iterator::next() {
-    while (_healthy_size > 0) {
-        assert(_healthy_sentinels.size() >= _healthy_size);
-
-        --_healthy_size;
-
-        auto &connection = _healthy_sentinels.front();
-        if (connection.broken()) {
-            _broken_sentinels.push_front(connection.options());
-            ++_broken_size;
-
-            _healthy_sentinels.pop_front();
-        } else {
-            _healthy_sentinels.splice(_healthy_sentinels.end(),
-                                        _healthy_sentinels,
-                                        _healthy_sentinels.begin());
-
-            return _healthy_sentinels.back();
-        }
-    }
-
-    while (_broken_size > 0) {
-        assert(_broken_sentinels.size() >= _broken_size);
-
-        --_broken_size;
-
-        try {
-            const auto &opt = _broken_sentinels.front();
-            Connection connection(opt);
-            _healthy_sentinels.push_back(std::move(connection));
-
-            _broken_sentinels.pop_front();
-
-            return _healthy_sentinels.back();
-        } catch (const Error &e) {
-            // Failed to connect to sentinel.
-            _broken_sentinels.splice(_broken_sentinels.end(),
-                                        _broken_sentinels,
-                                        _broken_sentinels.begin());
-        }
-    }
-
-    throw StopIterError();
-}
-
-void Sentinel::Iterator::reset() {
-    _healthy_size = _healthy_sentinels.size();
-    _broken_size = _broken_sentinels.size();
-}
-
-Sentinel::Sentinel(const SentinelOptions &sentinel_opts) :
-                    _broken_sentinels(_parse_options(sentinel_opts)),
-                    _sentinel_opts(sentinel_opts) {
-    if (_sentinel_opts.connect_timeout == std::chrono::milliseconds(0)
-            || _sentinel_opts.socket_timeout == std::chrono::milliseconds(0)) {
-        throw Error("With sentinel, connection timeout and socket timeout cannot be 0");
-    }
-}
-
-Connection Sentinel::master(const std::string &master_name, const ConnectionOptions &opts) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    Iterator iter(_healthy_sentinels, _broken_sentinels);
-    std::size_t retries = 0;
-    while (true) {
-        try {
-            auto &sentinel = iter.next();
-
-            auto master = _get_master_addr_by_name(sentinel, master_name);
-            if (!master) {
-                // Try the next sentinel.
-                continue;
-            }
-
-            auto connection = _connect_redis(*master, opts);
-            if (_get_role(connection) != Role::MASTER) {
-                // Retry the whole process at most SentinelOptions::max_retry times.
-                ++retries;
-                if (retries > _sentinel_opts.max_retry) {
-                    throw Error("Failed to get master from sentinel");
-                }
-
-                std::this_thread::sleep_for(_sentinel_opts.retry_interval);
-
-                // Restart the iteration.
-                iter.reset();
-                continue;
-            }
-
-            return connection;
-        } catch (const StopIterError &e) {
-            throw;
-        } catch (const Error &e) {
-            continue;
-        }
-    }
-}
-
-Connection Sentinel::slave(const std::string &master_name, const ConnectionOptions &opts) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    Iterator iter(_healthy_sentinels, _broken_sentinels);
-    std::size_t retries = 0;
-    while (true) {
-        try {
-            auto &sentinel = iter.next();
-
-            auto slaves = _get_slave_addr_by_name(sentinel, master_name);
-            if (slaves.empty()) {
-                // Try the next sentinel.
-                continue;
-            }
-
-            // Normally slaves list is NOT very large, so there won't be a performance problem.
-            auto slave_iter = std::find(slaves.begin(),
-                                        slaves.end(),
-                                        Node{opts.host, opts.port});
-            if (slave_iter != slaves.end() && slave_iter != slaves.begin()) {
-                // The given node is still a valid slave. Try it first.
-                std::swap(*(slaves.begin()), *slave_iter);
-            }
-
-            for (const auto &slave : slaves) {
-                try {
-                    auto connection = _connect_redis(slave, opts);
-                    if (_get_role(connection) != Role::SLAVE) {
-                        // Retry the whole process at most SentinelOptions::max_retry times.
-                        ++retries;
-                        if (retries > _sentinel_opts.max_retry) {
-                            throw Error("Failed to get slave from sentinel");
-                        }
-
-                        std::this_thread::sleep_for(_sentinel_opts.retry_interval);
-
-                        // Restart the iteration.
-                        iter.reset();
-                        break;
-                    }
-
-                    return connection;
-                } catch (const Error &e) {
-                    // Try the next slave.
-                    continue;
-                }
-            }
-        } catch (const StopIterError &e) {
-            throw;
-        } catch (const Error &e) {
-            continue;
-        }
-    }
-}
-
-Optional<Node> Sentinel::_get_master_addr_by_name(Connection &connection, const StringView &name) {
-    connection.send("SENTINEL GET-MASTER-ADDR-BY-NAME %b", name.data(), name.size());
-
-    auto reply = connection.recv();
-
-    assert(reply);
-
-    auto master = reply::parse<Optional<std::pair<std::string, std::string>>>(*reply);
-    if (!master) {
-        return {};
-    }
-
-    int port = 0;
-    try {
-        port = std::stoi(master->second);
-    } catch (const std::exception &) {
-        throw ProtoError("Master port is invalid: " + master->second);
-    }
-
-    return Optional<Node>{Node{master->first, port}};
-}
-
-std::vector<Node> Sentinel::_get_slave_addr_by_name(Connection &connection,
-                                                    const StringView &name) {
-    try {
-        connection.send("SENTINEL SLAVES %b", name.data(), name.size());
-
-        auto reply = connection.recv();
-
-        assert(reply);
-
-        auto slaves = _parse_slave_info(*reply);
-
-        // Make slave list random.
-        std::mt19937 gen(std::random_device{}());
-        std::shuffle(slaves.begin(), slaves.end(), gen);
-
-        return slaves;
-    } catch (const ReplyError &e) {
-        // Unknown master name.
-        return {};
-    }
-}
-
-std::vector<Node> Sentinel::_parse_slave_info(redisReply &reply) const {
-    using SlaveInfo = std::unordered_map<std::string, std::string>;
-
-    auto slaves = reply::parse<std::vector<SlaveInfo>>(reply);
-
-    std::vector<Node> nodes;
-    for (const auto &slave : slaves) {
-        auto flags_iter = slave.find("flags");
-        auto ip_iter = slave.find("ip");
-        auto port_iter = slave.find("port");
-        if (flags_iter == slave.end() || ip_iter == slave.end() || port_iter == slave.end()) {
-            throw ProtoError("Invalid slave info");
-        }
-
-        // This slave is down, e.g. 's_down,slave,disconnected'
-        if (flags_iter->second != "slave") {
-            continue;
-        }
-
-        int port = 0;
-        try {
-            port = std::stoi(port_iter->second);
-        } catch (const std::exception &) {
-            throw ProtoError("Slave port is invalid: " + port_iter->second);
-        }
-
-        nodes.push_back(Node{ip_iter->second, port});
-    }
-
-    return nodes;
-}
-
-Connection Sentinel::_connect_redis(const Node &node, ConnectionOptions opts) {
-    opts.host = node.host;
-    opts.port = node.port;
-
-    return Connection(opts);
-}
-
-Role Sentinel::_get_role(Connection &connection) {
-    connection.send("INFO REPLICATION");
-    auto reply = connection.recv();
-
-    assert(reply);
-    auto info = reply::parse<std::string>(*reply);
-
-    auto start = info.find("role:");
-    if (start == std::string::npos) {
-        throw ProtoError("Invalid INFO REPLICATION reply");
-    }
-    start += 5;
-    auto stop = info.find("\r\n", start);
-    if (stop == std::string::npos) {
-        throw ProtoError("Invalid INFO REPLICATION reply");
-    }
-
-    auto role = info.substr(start, stop - start);
-    if (role == "master") {
-        return Role::MASTER;
-    } else if (role == "slave") {
-        return Role::SLAVE;
-    } else {
-        throw Error("Invalid role: " + role);
-    }
-}
-
-std::list<ConnectionOptions> Sentinel::_parse_options(const SentinelOptions &opts) const {
-    std::list<ConnectionOptions> options;
-    for (const auto &node : opts.nodes) {
-        ConnectionOptions opt;
-        opt.host = node.first;
-        opt.port = node.second;
-        opt.password = opts.password;
-        opt.keep_alive = opts.keep_alive;
-        opt.connect_timeout = opts.connect_timeout;
-        opt.socket_timeout = opts.socket_timeout;
-        opt.tls = opts.tls;
-
-        options.push_back(opt);
-    }
-
-    return options;
-}
-
-SimpleSentinel::SimpleSentinel(const std::shared_ptr<Sentinel> &sentinel,
-                                const std::string &master_name,
-                                Role role) :
-                                    _sentinel(sentinel),
-                                    _master_name(master_name),
-                                    _role(role) {
-    if (!_sentinel) {
-        throw Error("Sentinel cannot be null");
-    }
-
-    if (_role != Role::MASTER && _role != Role::SLAVE) {
-        throw Error("Role must be Role::MASTER or Role::SLAVE");
-    }
-}
-
-Connection SimpleSentinel::create(const ConnectionOptions &opts) {
-    assert(_sentinel);
-
-    if (_role == Role::MASTER) {
-        return _sentinel->master(_master_name, opts);
-    }
-
-    assert(_role == Role::SLAVE);
-
-    return _sentinel->slave(_master_name, opts);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/sentinel.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/sentinel.h
deleted file mode 100644
index 6f998791e..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/sentinel.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SENTINEL_H
-#define SEWENEW_REDISPLUSPLUS_SENTINEL_H
-
-#include <string>
-#include <list>
-#include <vector>
-#include <memory>
-#include <mutex>
-#include "connection.h"
-#include "shards.h"
-#include "reply.h"
-#include "tls.h"
-
-namespace sw {
-
-namespace redis {
-
-struct SentinelOptions {
-    std::vector<std::pair<std::string, int>> nodes;
-
-    std::string password;
-
-    bool keep_alive = true;
-
-    std::chrono::milliseconds connect_timeout{100};
-
-    std::chrono::milliseconds socket_timeout{100};
-
-    std::chrono::milliseconds retry_interval{100};
-
-    std::size_t max_retry = 2;
-
-    tls::TlsOptions tls;
-};
-
-class Sentinel {
-public:
-    explicit Sentinel(const SentinelOptions &sentinel_opts);
-
-    Sentinel(const Sentinel &) = delete;
-    Sentinel& operator=(const Sentinel &) = delete;
-
-    Sentinel(Sentinel &&) = delete;
-    Sentinel& operator=(Sentinel &&) = delete;
-
-    ~Sentinel() = default;
-
-private:
-    Connection master(const std::string &master_name, const ConnectionOptions &opts);
-
-    Connection slave(const std::string &master_name, const ConnectionOptions &opts);
-
-    class Iterator;
-
-    friend class SimpleSentinel;
-
-    std::list<ConnectionOptions> _parse_options(const SentinelOptions &opts) const;
-
-    Optional<Node> _get_master_addr_by_name(Connection &connection, const StringView &name);
-
-    std::vector<Node> _get_slave_addr_by_name(Connection &connection, const StringView &name);
-
-    Connection _connect_redis(const Node &node, ConnectionOptions opts);
-
-    Role _get_role(Connection &connection);
-
-    std::vector<Node> _parse_slave_info(redisReply &reply) const;
-
-    std::list<Connection> _healthy_sentinels;
-
-    std::list<ConnectionOptions> _broken_sentinels;
-
-    SentinelOptions _sentinel_opts;
-
-    std::mutex _mutex;
-};
-
-class SimpleSentinel {
-public:
-    SimpleSentinel(const std::shared_ptr<Sentinel> &sentinel,
-                    const std::string &master_name,
-                    Role role);
-
-    SimpleSentinel() = default;
-
-    SimpleSentinel(const SimpleSentinel &) = default;
-    SimpleSentinel& operator=(const SimpleSentinel &) = default;
-
-    SimpleSentinel(SimpleSentinel &&) = default;
-    SimpleSentinel& operator=(SimpleSentinel &&) = default;
-
-    ~SimpleSentinel() = default;
-
-    explicit operator bool() const {
-        return bool(_sentinel);
-    }
-
-    Connection create(const ConnectionOptions &opts);
-
-private:
-    std::shared_ptr<Sentinel> _sentinel;
-
-    std::string _master_name;
-
-    Role _role = Role::MASTER;
-};
-
-class StopIterError : public Error {
-public:
-    StopIterError() : Error("StopIterError") {}
-
-    StopIterError(const StopIterError &) = default;
-    StopIterError& operator=(const StopIterError &) = default;
-
-    StopIterError(StopIterError &&) = default;
-    StopIterError& operator=(StopIterError &&) = default;
-
-    virtual ~StopIterError() override = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SENTINEL_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards.cpp
deleted file mode 100644
index c5baf5ad8..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "shards.h"
-
-namespace sw {
-
-namespace redis {
-
-RedirectionError::RedirectionError(const std::string &msg): ReplyError(msg) {
-    std::tie(_slot, _node) = _parse_error(msg);
-}
-
-std::pair<Slot, Node> RedirectionError::_parse_error(const std::string &msg) const {
-    // "slot ip:port"
-    auto space_pos = msg.find(" ");
-    auto colon_pos = msg.find(":");
-    if (space_pos == std::string::npos
-            || colon_pos == std::string::npos
-            || colon_pos < space_pos) {
-        throw ProtoError("Invalid ASK error message: " + msg);
-    }
-
-    try {
-        // We need to do a cast for x86 build (32 bit) on Windows.
-        // See https://github.com/sewenew/redis-plus-plus/issues/115 for detail.
-        auto slot = static_cast<Slot>(std::stoull(msg.substr(0, space_pos)));
-        auto host = msg.substr(space_pos + 1, colon_pos - space_pos - 1);
-        auto port = std::stoi(msg.substr(colon_pos + 1));
-
-        return {slot, {host, port}};
-    } catch (const std::exception &e) {
-        throw ProtoError("Invalid ASK error message: " + msg);
-    }
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards.h
deleted file mode 100644
index 0d4cd97b3..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_H
-
-#include <string>
-#include <map>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-using Slot = std::size_t;
-
-struct SlotRange {
-    Slot min;
-    Slot max;
-};
-
-inline bool operator<(const SlotRange &lhs, const SlotRange &rhs) {
-    return lhs.max < rhs.max;
-}
-
-struct Node {
-    std::string host;
-    int port;
-};
-
-inline bool operator==(const Node &lhs, const Node &rhs) {
-    return lhs.host == rhs.host && lhs.port == rhs.port;
-}
-
-struct NodeHash {
-    std::size_t operator()(const Node &node) const noexcept {
-        auto host_hash = std::hash<std::string>{}(node.host);
-        auto port_hash = std::hash<int>{}(node.port);
-        return host_hash ^ (port_hash << 1);
-    }
-};
-
-using Shards = std::map<SlotRange, Node>;
-
-class RedirectionError : public ReplyError {
-public:
-    RedirectionError(const std::string &msg);
-
-    RedirectionError(const RedirectionError &) = default;
-    RedirectionError& operator=(const RedirectionError &) = default;
-
-    RedirectionError(RedirectionError &&) = default;
-    RedirectionError& operator=(RedirectionError &&) = default;
-
-    virtual ~RedirectionError() override = default;
-
-    Slot slot() const {
-        return _slot;
-    }
-
-    const Node& node() const {
-        return _node;
-    }
-
-private:
-    std::pair<Slot, Node> _parse_error(const std::string &msg) const;
-
-    Slot _slot = 0;
-    Node _node;
-};
-
-class MovedError : public RedirectionError {
-public:
-    explicit MovedError(const std::string &msg) : RedirectionError(msg) {}
-
-    MovedError(const MovedError &) = default;
-    MovedError& operator=(const MovedError &) = default;
-
-    MovedError(MovedError &&) = default;
-    MovedError& operator=(MovedError &&) = default;
-
-    virtual ~MovedError() override = default;
-};
-
-class AskError : public RedirectionError {
-public:
-    explicit AskError(const std::string &msg) : RedirectionError(msg) {}
-
-    AskError(const AskError &) = default;
-    AskError& operator=(const AskError &) = default;
-
-    AskError(AskError &&) = default;
-    AskError& operator=(AskError &&) = default;
-
-    virtual ~AskError() override = default;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards_pool.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards_pool.cpp
deleted file mode 100644
index e12231639..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards_pool.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "shards_pool.h"
-#include <unordered_set>
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-const std::size_t ShardsPool::SHARDS;
-
-ShardsPool::ShardsPool(const ConnectionPoolOptions &pool_opts,
-                        const ConnectionOptions &connection_opts,
-                        Role role) :
-                            _pool_opts(pool_opts),
-                            _connection_opts(connection_opts),
-                            _role(role) {
-    if (_connection_opts.type != ConnectionType::TCP) {
-        throw Error("Only support TCP connection for Redis Cluster");
-    }
-
-    Connection connection(_connection_opts);
-
-    _shards = _cluster_slots(connection);
-
-    _init_pool(_shards);
-}
-
-ShardsPool::ShardsPool(ShardsPool &&that) {
-    std::lock_guard<std::mutex> lock(that._mutex);
-
-    _move(std::move(that));
-}
-
-ShardsPool& ShardsPool::operator=(ShardsPool &&that) {
-    if (this != &that) {
-        std::lock(_mutex, that._mutex);
-        std::lock_guard<std::mutex> lock_this(_mutex, std::adopt_lock);
-        std::lock_guard<std::mutex> lock_that(that._mutex, std::adopt_lock);
-
-        _move(std::move(that));
-    }
-
-    return *this;
-}
-
-ConnectionPoolSPtr ShardsPool::fetch(const StringView &key) {
-    auto slot = _slot(key);
-
-    return _fetch(slot);
-}
-
-ConnectionPoolSPtr ShardsPool::fetch() {
-    auto slot = _slot();
-
-    return _fetch(slot);
-}
-
-ConnectionPoolSPtr ShardsPool::fetch(const Node &node) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    auto iter = _pools.find(node);
-    if (iter == _pools.end()) {
-        // Node doesn't exist, and it should be a newly created node.
-        // So add a new connection pool.
-        iter = _add_node(node);
-    }
-
-    assert(iter != _pools.end());
-
-    return iter->second;
-}
-
-void ShardsPool::update() {
-    // My might send command to a removed node.
-    // Try at most 3 times from the current shard masters and finally with the user given connection options.
-    for (auto idx = 0; idx < 4; ++idx) {
-        try {
-            Shards shards;
-            if (idx < 3) {
-                // Randomly pick a connection.
-                auto pool = fetch();
-                assert(pool);
-                SafeConnection safe_connection(*pool);
-                shards = _cluster_slots(safe_connection.connection());
-            }
-            else {
-                Connection connection(_connection_opts);
-                shards = _cluster_slots(connection);
-            }
-
-
-            std::unordered_set<Node, NodeHash> nodes;
-            for (const auto &shard : shards) {
-                nodes.insert(shard.second);
-            }
-
-            std::lock_guard<std::mutex> lock(_mutex);
-
-            // TODO: If shards is unchanged, no need to update, and return immediately.
-
-            _shards = std::move(shards);
-
-            // Remove non-existent nodes.
-            for (auto iter = _pools.begin(); iter != _pools.end(); ) {
-                if (nodes.find(iter->first) == nodes.end()) {
-                    // Node has been removed.
-                    _pools.erase(iter++);
-                } else {
-                    ++iter;
-                }
-            }
-
-            // Add connection pool for new nodes.
-            // In fact, connections will be created lazily.
-            for (const auto &node : nodes) {
-                if (_pools.find(node) == _pools.end()) {
-                    _add_node(node);
-                }
-            }
-
-            // Update successfully.
-            return;
-        } catch (const Error &) {
-            // continue;
-        }
-    }
-
-    throw Error("Failed to update shards info");
-}
-
-ConnectionOptions ShardsPool::connection_options(const StringView &key) {
-    auto slot = _slot(key);
-
-    return _connection_options(slot);
-}
-
-ConnectionOptions ShardsPool::connection_options() {
-    auto slot = _slot();
-
-    return _connection_options(slot);
-}
-
-Shards ShardsPool::shards() {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    return _shards;
-}
-
-void ShardsPool::_move(ShardsPool &&that) {
-    _pool_opts = that._pool_opts;
-    _connection_opts = that._connection_opts;
-    _shards = std::move(that._shards);
-    _pools = std::move(that._pools);
-    _role = that._role;
-}
-
-void ShardsPool::_init_pool(const Shards &shards) {
-    for (const auto &shard : shards) {
-        _add_node(shard.second);
-    }
-}
-
-Shards ShardsPool::_cluster_slots(Connection &connection) const {
-    auto reply = _cluster_slots_command(connection);
-
-    assert(reply);
-
-    return _parse_reply(*reply);
-}
-
-ReplyUPtr ShardsPool::_cluster_slots_command(Connection &connection) const {
-    connection.send("CLUSTER SLOTS");
-
-    return connection.recv();
-}
-
-Shards ShardsPool::_parse_reply(redisReply &reply) const {
-    if (!reply::is_array(reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply.element == nullptr || reply.elements == 0) {
-        throw Error("Empty slots");
-    }
-
-    Shards shards;
-    for (std::size_t idx = 0; idx != reply.elements; ++idx) {
-        auto *sub_reply = reply.element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null slot info");
-        }
-
-        shards.emplace(_parse_slot_info(*sub_reply));
-    }
-
-    return shards;
-}
-
-Slot ShardsPool::_parse_slot(redisReply *reply) const {
-    if (reply == nullptr) {
-        throw ProtoError("null slot id");
-    }
-
-    auto slot = reply::parse<long long>(*reply);
-    if (slot < 0) {
-        throw ProtoError("negative slot id");
-    }
-
-    return static_cast<Slot>(slot);
-}
-
-Node ShardsPool::_parse_node(redisReply *reply) const {
-    if (reply == nullptr
-            || !reply::is_array(*reply)
-            || reply->element == nullptr
-            || reply->elements < 2) {
-        throw ProtoError("invalid node info");
-    }
-
-    auto host = reply::parse<std::string>(*(reply->element[0]));
-    int port = reply::parse<long long>(*(reply->element[1]));
-
-    return {host, port};
-}
-
-std::pair<SlotRange, Node> ShardsPool::_parse_slot_info(redisReply &reply) const {
-    // Slot info is an array reply: min slot, max slot, master node, [slave nodes]
-    if (reply.elements < 3 || reply.element == nullptr) {
-        throw ProtoError("Invalid slot info");
-    }
-
-    auto min_slot = _parse_slot(reply.element[0]);
-
-    auto max_slot = _parse_slot(reply.element[1]);
-
-    if (min_slot > max_slot) {
-        throw ProtoError("Invalid slot range");
-    }
-
-    auto slot_range = SlotRange{min_slot, max_slot};
-
-    switch (_role) {
-    case Role::MASTER:
-        // Return master node, i.e. `reply.element[2]`.
-        return std::make_pair(slot_range, _parse_node(reply.element[2]));
-
-    case Role::SLAVE: {
-        auto size = reply.elements;
-        if (size <= 3) {
-            throw Error("no slave node available");
-        }
-
-        // Randomly pick a slave node.
-        auto *slave_node_reply = reply.element[_random(3, size - 1)];
-
-        return std::make_pair(slot_range, _parse_node(slave_node_reply));
-    }
-
-    default:
-        throw Error("unknown role");
-    }
-}
-
-Slot ShardsPool::_slot(const StringView &key) const {
-    // The following code is copied from: https://redis.io/topics/cluster-spec
-    // And I did some minor changes.
-
-    const auto *k = key.data();
-    auto keylen = key.size();
-
-    // start-end indexes of { and }.
-    std::size_t s = 0;
-    std::size_t e = 0;
-
-    // Search the first occurrence of '{'.
-    for (s = 0; s < keylen; s++)
-        if (k[s] == '{') break;
-
-    // No '{' ? Hash the whole key. This is the base case.
-    if (s == keylen) return crc16(k, keylen) & SHARDS;
-
-    // '{' found? Check if we have the corresponding '}'.
-    for (e = s + 1; e < keylen; e++)
-        if (k[e] == '}') break;
-
-    // No '}' or nothing between {} ? Hash the whole key.
-    if (e == keylen || e == s + 1) return crc16(k, keylen) & SHARDS;
-
-    // If we are here there is both a { and a } on its right. Hash
-    // what is in the middle between { and }.
-    return crc16(k + s + 1, e - s - 1) & SHARDS;
-}
-
-Slot ShardsPool::_slot() const {
-    return _random(0, SHARDS);
-}
-
-std::size_t ShardsPool::_random(std::size_t min, std::size_t max) const {
-    static thread_local std::default_random_engine engine;
-
-    std::uniform_int_distribution<std::size_t> uniform_dist(min, max);
-
-    return uniform_dist(engine);
-}
-
-ConnectionPoolSPtr& ShardsPool::_get_pool(Slot slot) {
-    auto shards_iter = _shards.lower_bound(SlotRange{slot, slot});
-    if (shards_iter == _shards.end() || slot < shards_iter->first.min) {
-        throw Error("Slot is out of range: " + std::to_string(slot));
-    }
-
-    const auto &node = shards_iter->second;
-
-    auto node_iter = _pools.find(node);
-    if (node_iter == _pools.end()) {
-        throw Error("Slot is NOT covered: " + std::to_string(slot));
-    }
-
-    return node_iter->second;
-}
-
-ConnectionPoolSPtr ShardsPool::_fetch(Slot slot) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    return _get_pool(slot);
-}
-
-ConnectionOptions ShardsPool::_connection_options(Slot slot) {
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    auto &pool = _get_pool(slot);
-
-    assert(pool);
-
-    return pool->connection_options();
-}
-
-auto ShardsPool::_add_node(const Node &node) -> NodeMap::iterator {
-    auto opts = _connection_opts;
-    opts.host = node.host;
-    opts.port = node.port;
-
-    // TODO: Better set readonly an attribute of `Node`.
-    if (_role == Role::SLAVE) {
-        opts.readonly = true;
-    }
-
-    return _pools.emplace(node, std::make_shared<ConnectionPool>(_pool_opts, opts)).first;
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards_pool.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards_pool.h
deleted file mode 100644
index e6e9e4a52..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/shards_pool.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-#define SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
-
-#include <cassert>
-#include <unordered_map>
-#include <string>
-#include <random>
-#include <memory>
-#include "reply.h"
-#include "connection_pool.h"
-#include "shards.h"
-
-namespace sw {
-
-namespace redis {
-
-class ShardsPool {
-public:
-    ShardsPool() = default;
-
-    ShardsPool(const ShardsPool &that) = delete;
-    ShardsPool& operator=(const ShardsPool &that) = delete;
-
-    ShardsPool(ShardsPool &&that);
-    ShardsPool& operator=(ShardsPool &&that);
-
-    ~ShardsPool() = default;
-
-    ShardsPool(const ConnectionPoolOptions &pool_opts,
-                const ConnectionOptions &connection_opts,
-                Role role);
-
-    // Fetch a connection by key.
-    ConnectionPoolSPtr fetch(const StringView &key);
-
-    // Randomly pick a connection.
-    ConnectionPoolSPtr fetch();
-
-    // Fetch a connection by node.
-    ConnectionPoolSPtr fetch(const Node &node);
-
-    void update();
-
-    ConnectionOptions connection_options(const StringView &key);
-
-    ConnectionOptions connection_options();
-
-    Shards shards();
-
-private:
-    void _move(ShardsPool &&that);
-
-    void _init_pool(const Shards &shards);
-
-    Shards _cluster_slots(Connection &connection) const;
-
-    ReplyUPtr _cluster_slots_command(Connection &connection) const;
-
-    Shards _parse_reply(redisReply &reply) const;
-
-    Slot _parse_slot(redisReply *reply) const;
-
-    Node _parse_node(redisReply *reply) const;
-
-    std::pair<SlotRange, Node> _parse_slot_info(redisReply &reply) const;
-
-    // Get slot by key.
-    std::size_t _slot(const StringView &key) const;
-
-    // Randomly pick a slot.
-    std::size_t _slot() const;
-
-    // Get a random number between [min, max]
-    std::size_t _random(std::size_t min, std::size_t max) const;
-
-    ConnectionPoolSPtr& _get_pool(Slot slot);
-
-    ConnectionPoolSPtr _fetch(Slot slot);
-
-    ConnectionOptions _connection_options(Slot slot);
-
-    using NodeMap = std::unordered_map<Node, ConnectionPoolSPtr, NodeHash>;
-
-    NodeMap::iterator _add_node(const Node &node);
-
-    ConnectionPoolOptions _pool_opts;
-
-    ConnectionOptions _connection_opts;
-
-    Shards _shards;
-
-    NodeMap _pools;
-
-    std::mutex _mutex;
-
-    Role _role = Role::MASTER;
-
-    static const std::size_t SHARDS = 16383;
-};
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SHARDS_POOL_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/subscriber.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/subscriber.cpp
deleted file mode 100644
index b699b02f0..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/subscriber.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "subscriber.h"
-#include <cassert>
-
-namespace sw {
-
-namespace redis {
-
-const Subscriber::TypeIndex Subscriber::_msg_type_index = {
-    {"message", MsgType::MESSAGE},
-    {"pmessage", MsgType::PMESSAGE},
-    {"subscribe", MsgType::SUBSCRIBE},
-    {"unsubscribe", MsgType::UNSUBSCRIBE},
-    {"psubscribe", MsgType::PSUBSCRIBE},
-    {"punsubscribe", MsgType::PUNSUBSCRIBE}
-};
-
-Subscriber::Subscriber(Connection connection) : _connection(std::move(connection)) {}
-
-void Subscriber::subscribe(const StringView &channel) {
-    _check_connection();
-
-    // TODO: cmd::subscribe DOES NOT send the subscribe message to Redis.
-    // In fact, it puts the command to network buffer.
-    // So we need a queue to record these sub or unsub commands, and
-    // ensure that before stopping the subscriber, all these commands
-    // have really been sent to Redis.
-    cmd::subscribe(_connection, channel);
-}
-
-void Subscriber::unsubscribe() {
-    _check_connection();
-
-    cmd::unsubscribe(_connection);
-}
-
-void Subscriber::unsubscribe(const StringView &channel) {
-    _check_connection();
-
-    cmd::unsubscribe(_connection, channel);
-}
-
-void Subscriber::psubscribe(const StringView &pattern) {
-    _check_connection();
-
-    cmd::psubscribe(_connection, pattern);
-}
-
-void Subscriber::punsubscribe() {
-    _check_connection();
-
-    cmd::punsubscribe(_connection);
-}
-
-void Subscriber::punsubscribe(const StringView &pattern) {
-    _check_connection();
-
-    cmd::punsubscribe(_connection, pattern);
-}
-
-void Subscriber::consume() {
-    _check_connection();
-
-    ReplyUPtr reply;
-    try {
-        reply = _connection.recv();
-    } catch (const TimeoutError &) {
-        _connection.reset();
-        throw;
-    }
-
-    assert(reply);
-
-    if (!reply::is_array(*reply) || reply->elements < 1 || reply->element == nullptr) {
-        throw ProtoError("Invalid subscribe message");
-    }
-
-    auto type = _msg_type(reply->element[0]);
-    switch (type) {
-    case MsgType::MESSAGE:
-        _handle_message(*reply);
-        break;
-
-    case MsgType::PMESSAGE:
-        _handle_pmessage(*reply);
-        break;
-
-    case MsgType::SUBSCRIBE:
-    case MsgType::UNSUBSCRIBE:
-    case MsgType::PSUBSCRIBE:
-    case MsgType::PUNSUBSCRIBE:
-        _handle_meta(type, *reply);
-        break;
-
-    default:
-        assert(false);
-    }
-}
-
-Subscriber::MsgType Subscriber::_msg_type(redisReply *reply) const {
-    if (reply == nullptr) {
-        throw ProtoError("Null type reply.");
-    }
-
-    auto type = reply::parse<std::string>(*reply);
-
-    auto iter = _msg_type_index.find(type);
-    if (iter == _msg_type_index.end()) {
-        throw ProtoError("Invalid message type.");
-    }
-
-    return iter->second;
-}
-
-void Subscriber::_check_connection() {
-    if (_connection.broken()) {
-        throw Error("Connection is broken");
-    }
-}
-
-void Subscriber::_handle_message(redisReply &reply) {
-    if (_msg_callback == nullptr) {
-        return;
-    }
-
-    if (reply.elements != 3) {
-        throw ProtoError("Expect 3 sub replies");
-    }
-
-    assert(reply.element != nullptr);
-
-    auto *channel_reply = reply.element[1];
-    if (channel_reply == nullptr) {
-        throw ProtoError("Null channel reply");
-    }
-    auto channel = reply::parse<std::string>(*channel_reply);
-
-    auto *msg_reply = reply.element[2];
-    if (msg_reply == nullptr) {
-        throw ProtoError("Null message reply");
-    }
-    auto msg = reply::parse<std::string>(*msg_reply);
-
-    _msg_callback(std::move(channel), std::move(msg));
-}
-
-void Subscriber::_handle_pmessage(redisReply &reply) {
-    if (_pmsg_callback == nullptr) {
-        return;
-    }
-
-    if (reply.elements != 4) {
-        throw ProtoError("Expect 4 sub replies");
-    }
-
-    assert(reply.element != nullptr);
-
-    auto *pattern_reply = reply.element[1];
-    if (pattern_reply == nullptr) {
-        throw ProtoError("Null pattern reply");
-    }
-    auto pattern = reply::parse<std::string>(*pattern_reply);
-
-    auto *channel_reply = reply.element[2];
-    if (channel_reply == nullptr) {
-        throw ProtoError("Null channel reply");
-    }
-    auto channel = reply::parse<std::string>(*channel_reply);
-
-    auto *msg_reply = reply.element[3];
-    if (msg_reply == nullptr) {
-        throw ProtoError("Null message reply");
-    }
-    auto msg = reply::parse<std::string>(*msg_reply);
-
-    _pmsg_callback(std::move(pattern), std::move(channel), std::move(msg));
-}
-
-void Subscriber::_handle_meta(MsgType type, redisReply &reply) {
-    if (_meta_callback == nullptr) {
-        return;
-    }
-
-    if (reply.elements != 3) {
-        throw ProtoError("Expect 3 sub replies");
-    }
-
-    assert(reply.element != nullptr);
-
-    auto *channel_reply = reply.element[1];
-    if (channel_reply == nullptr) {
-        throw ProtoError("Null channel reply");
-    }
-    auto channel = reply::parse<OptionalString>(*channel_reply);
-
-    auto *num_reply = reply.element[2];
-    if (num_reply == nullptr) {
-        throw ProtoError("Null num reply");
-    }
-    auto num = reply::parse<long long>(*num_reply);
-
-    _meta_callback(type, std::move(channel), num);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/subscriber.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/subscriber.h
deleted file mode 100644
index 8b7c5cfb4..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/subscriber.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-#define SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
-
-#include <unordered_map>
-#include <string>
-#include <functional>
-#include "connection.h"
-#include "reply.h"
-#include "command.h"
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-// @NOTE: Subscriber is NOT thread-safe.
-// Subscriber uses callbacks to handle messages. There are 6 kinds of messages:
-// 1) MESSAGE: message sent to a channel.
-// 2) PMESSAGE: message sent to channels of a given pattern.
-// 3) SUBSCRIBE: meta message sent when we successfully subscribe to a channel.
-// 4) UNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel.
-// 5) PSUBSCRIBE: meta message sent when we successfully subscribe to a channel pattern.
-// 6) PUNSUBSCRIBE: meta message sent when we successfully unsubscribe to a channel pattern.
-//
-// Use Subscriber::on_message(MsgCallback) to set the callback function for message of
-// *MESSAGE* type, and the callback interface is:
-// void (std::string channel, std::string msg)
-//
-// Use Subscriber::on_pmessage(PatternMsgCallback) to set the callback function for message of
-// *PMESSAGE* type, and the callback interface is:
-// void (std::string pattern, std::string channel, std::string msg)
-//
-// Messages of other types are called *META MESSAGE*, they have the same callback interface.
-// Use Subscriber::on_meta(MetaCallback) to set the callback function:
-// void (Subscriber::MsgType type, OptionalString channel, long long num)
-//
-// NOTE: If we haven't subscribe/psubscribe to any channel/pattern, and try to
-// unsubscribe/punsubscribe without any parameter, i.e. unsubscribe/punsubscribe all
-// channels/patterns, *channel* will be null. So the second parameter of meta callback
-// is of type *OptionalString*.
-//
-// All these callback interfaces pass std::string by value, and you can take their ownership
-// (i.e. std::move) safely.
-//
-// If you don't set callback for a specific kind of message, Subscriber::consume() will
-// receive the message, and ignore it, i.e. no callback will be called.
-class Subscriber {
-public:
-    Subscriber(const Subscriber &) = delete;
-    Subscriber& operator=(const Subscriber &) = delete;
-
-    Subscriber(Subscriber &&) = default;
-    Subscriber& operator=(Subscriber &&) = default;
-
-    ~Subscriber() = default;
-
-    enum class MsgType {
-        SUBSCRIBE,
-        UNSUBSCRIBE,
-        PSUBSCRIBE,
-        PUNSUBSCRIBE,
-        MESSAGE,
-        PMESSAGE
-    };
-
-    template <typename MsgCb>
-    void on_message(MsgCb msg_callback);
-
-    template <typename PMsgCb>
-    void on_pmessage(PMsgCb pmsg_callback);
-
-    template <typename MetaCb>
-    void on_meta(MetaCb meta_callback);
-
-    void subscribe(const StringView &channel);
-
-    template <typename Input>
-    void subscribe(Input first, Input last);
-
-    template <typename T>
-    void subscribe(std::initializer_list<T> channels) {
-        subscribe(channels.begin(), channels.end());
-    }
-
-    void unsubscribe();
-
-    void unsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void unsubscribe(Input first, Input last);
-
-    template <typename T>
-    void unsubscribe(std::initializer_list<T> channels) {
-        unsubscribe(channels.begin(), channels.end());
-    }
-
-    void psubscribe(const StringView &pattern);
-
-    template <typename Input>
-    void psubscribe(Input first, Input last);
-
-    template <typename T>
-    void psubscribe(std::initializer_list<T> channels) {
-        psubscribe(channels.begin(), channels.end());
-    }
-
-    void punsubscribe();
-
-    void punsubscribe(const StringView &channel);
-
-    template <typename Input>
-    void punsubscribe(Input first, Input last);
-
-    template <typename T>
-    void punsubscribe(std::initializer_list<T> channels) {
-        punsubscribe(channels.begin(), channels.end());
-    }
-
-    void consume();
-
-private:
-    friend class Redis;
-
-    friend class RedisCluster;
-
-    explicit Subscriber(Connection connection);
-
-    MsgType _msg_type(redisReply *reply) const;
-
-    void _check_connection();
-
-    void _handle_message(redisReply &reply);
-
-    void _handle_pmessage(redisReply &reply);
-
-    void _handle_meta(MsgType type, redisReply &reply);
-
-    using MsgCallback = std::function<void (std::string channel, std::string msg)>;
-
-    using PatternMsgCallback = std::function<void (std::string pattern,
-                                                    std::string channel,
-                                                    std::string msg)>;
-
-    using MetaCallback = std::function<void (MsgType type,
-                                                OptionalString channel,
-                                                long long num)>;
-
-    using TypeIndex = std::unordered_map<std::string, MsgType>;
-    static const TypeIndex _msg_type_index;
-
-    Connection _connection;
-
-    MsgCallback _msg_callback = nullptr;
-
-    PatternMsgCallback _pmsg_callback = nullptr;
-
-    MetaCallback _meta_callback = nullptr;
-};
-
-template <typename MsgCb>
-void Subscriber::on_message(MsgCb msg_callback) {
-    _msg_callback = msg_callback;
-}
-
-template <typename PMsgCb>
-void Subscriber::on_pmessage(PMsgCb pmsg_callback) {
-    _pmsg_callback = pmsg_callback;
-}
-
-template <typename MetaCb>
-void Subscriber::on_meta(MetaCb meta_callback) {
-    _meta_callback = meta_callback;
-}
-
-template <typename Input>
-void Subscriber::subscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::subscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::unsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::unsubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::psubscribe(Input first, Input last) {
-    if (first == last) {
-        return;
-    }
-
-    _check_connection();
-
-    cmd::psubscribe_range(_connection, first, last);
-}
-
-template <typename Input>
-void Subscriber::punsubscribe(Input first, Input last) {
-    _check_connection();
-
-    cmd::punsubscribe_range(_connection, first, last);
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_SUBSCRIBER_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/tls/tls.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/tls/tls.cpp
deleted file mode 100644
index 1ee4309dc..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/tls/tls.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2020 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "tls.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace tls {
-
-bool& auto_init() {
-    static bool init = true;
-
-    return init;
-}
-
-void disable_auto_init() {
-    auto_init() = false;
-}
-
-TlsInit::TlsInit() {
-    if (auto_init()) {
-        redisInitOpenSSL();
-    }
-}
-
-TlsContextUPtr secure_connection(redisContext &ctx, const TlsOptions &opts) {
-    static TlsInit tls_init;
-
-    auto c_str = [](const std::string &s) {
-        return s.empty() ? nullptr : s.c_str();
-    };
-
-    redisSSLContextError err;
-    auto tls_ctx = TlsContextUPtr(redisCreateSSLContext(c_str(opts.cacert),
-                                                        c_str(opts.cacertdir),
-                                                        c_str(opts.cert),
-                                                        c_str(opts.key),
-                                                        c_str(opts.sni),
-                                                        &err));
-    if (!tls_ctx) {
-        throw Error(std::string("failed to create TLS context: ")
-                    + redisSSLContextGetError(err));
-    }
-
-    if (redisInitiateSSLWithContext(&ctx, tls_ctx.get()) != REDIS_OK) {
-        throw_error(ctx, "Failed to initialize TLS connection");
-    }
-
-    return tls_ctx;
-}
-
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/tls/tls.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/tls/tls.h
deleted file mode 100644
index 7b586c24d..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/tls/tls.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2020 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TLS_H
-#define SEWENEW_REDISPLUSPLUS_TLS_H
-
-#include <string>
-#include <memory>
-#include <hiredis/hiredis.h>
-#include <hiredis/hiredis_ssl.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace tls {
-
-// Disable auto initializing OpenSSL.
-// You should call it only once and call it before any sw::redis::Redis operation.
-// Otherwise, the behavior is undefined.
-void disable_auto_init();
-
-class TlsInit {
-public:
-    TlsInit();
-};
-
-struct TlsOptions {
-    bool enabled = false;
-
-    std::string cacert;
-
-    std::string cacertdir;
-
-    std::string cert;
-
-    std::string key;
-
-    std::string sni;
-};
-
-inline bool enabled(const TlsOptions &opts) {
-    return opts.enabled;
-}
-
-struct TlsContextDeleter {
-    void operator()(redisSSLContext *ssl) const {
-        if (ssl != nullptr) {
-            redisFreeSSLContext(ssl);
-        }
-    }
-};
-
-using TlsContextUPtr = std::unique_ptr<redisSSLContext, TlsContextDeleter>;
-
-TlsContextUPtr secure_connection(redisContext &ctx, const TlsOptions &opts);
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TLS_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/transaction.cpp b/ext/redis-plus-plus-1.3.3/src/sw/redis++/transaction.cpp
deleted file mode 100644
index faa1bd178..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/transaction.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#include "transaction.h"
-#include "command.h"
-
-namespace sw {
-
-namespace redis {
-
-std::vector<ReplyUPtr> TransactionImpl::exec(Connection &connection, std::size_t cmd_num) {
-    _close_transaction();
-
-    _get_queued_replies(connection, cmd_num);
-
-    return _exec(connection);
-}
-
-void TransactionImpl::discard(Connection &connection, std::size_t cmd_num) {
-    _close_transaction();
-
-    _get_queued_replies(connection, cmd_num);
-
-    _discard(connection);
-}
-
-void TransactionImpl::_open_transaction(Connection &connection) {
-    assert(!_in_transaction);
-
-    cmd::multi(connection);
-    auto reply = connection.recv();
-    auto status = reply::to_status(*reply);
-    if (status != "OK") {
-        throw Error("Failed to open transaction: " + status);
-    }
-
-    _in_transaction = true;
-}
-
-void TransactionImpl::_close_transaction() {
-    if (!_in_transaction) {
-        throw Error("No command in transaction");
-    }
-
-    _in_transaction = false;
-}
-
-void TransactionImpl::_get_queued_reply(Connection &connection) {
-    auto reply = connection.recv();
-    auto status = reply::to_status(*reply);
-    if (status != "QUEUED") {
-        throw Error("Invalid QUEUED reply: " + status);
-    }
-}
-
-void TransactionImpl::_get_queued_replies(Connection &connection, std::size_t cmd_num) {
-    if (_piped) {
-        // Get all QUEUED reply
-        while (cmd_num > 0) {
-            _get_queued_reply(connection);
-
-            --cmd_num;
-        }
-    }
-}
-
-std::vector<ReplyUPtr> TransactionImpl::_exec(Connection &connection) {
-    cmd::exec(connection);
-
-    auto reply = connection.recv();
-
-    if (reply::is_nil(*reply)) {
-        // Execution has been aborted, i.e. watched key has been modified.
-        throw WatchError();
-    }
-
-    if (!reply::is_array(*reply)) {
-        throw ProtoError("Expect ARRAY reply");
-    }
-
-    if (reply->element == nullptr || reply->elements == 0) {
-        // Since we don't allow EXEC without any command, this ARRAY reply
-        // should NOT be null or empty.
-        throw ProtoError("Null ARRAY reply");
-    }
-
-    std::vector<ReplyUPtr> replies;
-    for (std::size_t idx = 0; idx != reply->elements; ++idx) {
-        auto *sub_reply = reply->element[idx];
-        if (sub_reply == nullptr) {
-            throw ProtoError("Null sub reply");
-        }
-
-        auto r = ReplyUPtr(sub_reply);
-        reply->element[idx] = nullptr;
-        replies.push_back(std::move(r));
-    }
-
-    return replies;
-}
-
-void TransactionImpl::_discard(Connection &connection) {
-    cmd::discard(connection);
-    auto reply = connection.recv();
-    reply::parse<void>(*reply);
-}
-
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/transaction.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/transaction.h
deleted file mode 100644
index f19f24889..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/transaction.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-#define SEWENEW_REDISPLUSPLUS_TRANSACTION_H
-
-#include <cassert>
-#include <vector>
-#include "connection.h"
-#include "errors.h"
-
-namespace sw {
-
-namespace redis {
-
-class TransactionImpl {
-public:
-    explicit TransactionImpl(bool piped) : _piped(piped) {}
-
-    template <typename Cmd, typename ...Args>
-    void command(Connection &connection, Cmd cmd, Args &&...args);
-
-    std::vector<ReplyUPtr> exec(Connection &connection, std::size_t cmd_num);
-
-    void discard(Connection &connection, std::size_t cmd_num);
-
-private:
-    void _open_transaction(Connection &connection);
-
-    void _close_transaction();
-
-    void _get_queued_reply(Connection &connection);
-
-    void _get_queued_replies(Connection &connection, std::size_t cmd_num);
-
-    std::vector<ReplyUPtr> _exec(Connection &connection);
-
-    void _discard(Connection &connection);
-
-    bool _in_transaction = false;
-
-    bool _piped;
-};
-
-template <typename Cmd, typename ...Args>
-void TransactionImpl::command(Connection &connection, Cmd cmd, Args &&...args) {
-    assert(!connection.broken());
-
-    if (!_in_transaction) {
-        _open_transaction(connection);
-    }
-
-    cmd(connection, std::forward<Args>(args)...);
-
-    if (!_piped) {
-        _get_queued_reply(connection);
-    }
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TRANSACTION_H
diff --git a/ext/redis-plus-plus-1.3.3/src/sw/redis++/utils.h b/ext/redis-plus-plus-1.3.3/src/sw/redis++/utils.h
deleted file mode 100644
index f77f796d6..000000000
--- a/ext/redis-plus-plus-1.3.3/src/sw/redis++/utils.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_UTILS_H
-
-#include <cstring>
-#include <string>
-#include <type_traits>
-#include "cxx_utils.h"
-
-namespace sw {
-
-namespace redis {
-
-using OptionalString = Optional<std::string>;
-
-using OptionalLongLong = Optional<long long>;
-
-using OptionalDouble = Optional<double>;
-
-using OptionalStringPair = Optional<std::pair<std::string, std::string>>;
-
-template <typename ...>
-struct IsKvPair : std::false_type {};
-
-template <typename T, typename U>
-struct IsKvPair<std::pair<T, U>> : std::true_type {};
-
-template <typename ...>
-using Void = void;
-
-template <typename T, typename U = Void<>>
-struct IsInserter : std::false_type {};
-
-template <typename T>
-//struct IsInserter<T, Void<typename T::container_type>> : std::true_type {};
-struct IsInserter<T,
-    typename std::enable_if<!std::is_void<typename T::container_type>::value>::type>
-        : std::true_type {};
-
-template <typename Iter, typename T = Void<>>
-struct IterType {
-    using type = typename std::iterator_traits<Iter>::value_type;
-};
-
-template <typename Iter>
-//struct IterType<Iter, Void<typename Iter::container_type>> {
-struct IterType<Iter,
-    //typename std::enable_if<std::is_void<typename Iter::value_type>::value>::type> {
-    typename std::enable_if<IsInserter<Iter>::value>::type> {
-    using type = typename std::decay<typename Iter::container_type::value_type>::type;
-};
-
-template <typename Iter, typename T = Void<>>
-struct IsIter : std::false_type {};
-
-template <typename Iter>
-struct IsIter<Iter, typename std::enable_if<IsInserter<Iter>::value>::type> : std::true_type {};
-
-template <typename Iter>
-//struct IsIter<Iter, Void<typename std::iterator_traits<Iter>::iterator_category>>
-struct IsIter<Iter,
-    typename std::enable_if<!std::is_void<
-        typename std::iterator_traits<Iter>::value_type>::value>::type>
-            : std::integral_constant<bool, !std::is_convertible<Iter, StringView>::value> {};
-
-template <typename T>
-struct IsKvPairIter : IsKvPair<typename IterType<T>::type> {};
-
-template <typename T, typename Tuple>
-struct TupleWithType : std::false_type {};
-
-template <typename T>
-struct TupleWithType<T, std::tuple<>> : std::false_type {};
-
-template <typename T, typename U, typename ...Args>
-struct TupleWithType<T, std::tuple<U, Args...>> : TupleWithType<T, std::tuple<Args...>> {};
-
-template <typename T, typename ...Args>
-struct TupleWithType<T, std::tuple<T, Args...>> : std::true_type {};
-
-template <std::size_t ...Is>
-struct IndexSequence {};
-
-template <std::size_t I, std::size_t ...Is>
-struct MakeIndexSequence : MakeIndexSequence<I - 1, I - 1, Is...> {};
-
-template <std::size_t ...Is>
-struct MakeIndexSequence<0, Is...> : IndexSequence<Is...> {};
-
-// NthType and NthValue are taken from
-// https://stackoverflow.com/questions/14261183
-template <std::size_t I, typename ...Args>
-struct NthType {};
-
-template <typename Arg, typename ...Args>
-struct NthType<0, Arg, Args...> {
-    using type = Arg;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-struct NthType<I, Arg, Args...> {
-    using type = typename NthType<I - 1, Args...>::type;
-};
-
-template <typename ...Args>
-struct LastType {
-    using type = typename NthType<sizeof...(Args) - 1, Args...>::type;
-};
-
-struct InvalidLastType {};
-
-template <>
-struct LastType<> {
-    using type = InvalidLastType;
-};
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&arg, Args &&...)
-    -> typename std::enable_if<(I == 0), decltype(std::forward<Arg>(arg))>::type {
-    return std::forward<Arg>(arg);
-}
-
-template <std::size_t I, typename Arg, typename ...Args>
-auto NthValue(Arg &&, Args &&...args)
-    -> typename std::enable_if<(I > 0),
-            decltype(std::forward<typename NthType<I, Arg, Args...>::type>(
-                    std::declval<typename NthType<I, Arg, Args...>::type>()))>::type {
-    return std::forward<typename NthType<I, Arg, Args...>::type>(
-            NthValue<I - 1>(std::forward<Args>(args)...));
-}
-
-template <typename ...Args>
-auto LastValue(Args &&...args)
-    -> decltype(std::forward<typename LastType<Args...>::type>(
-            std::declval<typename LastType<Args...>::type>())) {
-    return std::forward<typename LastType<Args...>::type>(
-            NthValue<sizeof...(Args) - 1>(std::forward<Args>(args)...));
-}
-
-template <typename T, typename = Void<>>
-struct HasPushBack : std::false_type {};
-
-template <typename T>
-struct HasPushBack<T,
-    typename std::enable_if<
-        std::is_void<decltype(
-            std::declval<T>().push_back(std::declval<typename T::value_type>())
-                )>::value>::type> : std::true_type {};
-
-template <typename T, typename = Void<>>
-struct HasInsert : std::false_type {};
-
-template <typename T>
-struct HasInsert<T,
-    typename std::enable_if<
-        std::is_same<
-            decltype(std::declval<T>().insert(std::declval<typename T::const_iterator>(),
-                                                std::declval<typename T::value_type>())),
-            typename T::iterator>::value>::type> : std::true_type {};
-
-template <typename T>
-struct IsSequenceContainer
-    : std::integral_constant<bool,
-        HasPushBack<T>::value
-            && !std::is_same<typename std::decay<T>::type, std::string>::value> {};
-
-template <typename T>
-struct IsAssociativeContainer
-    : std::integral_constant<bool,
-        HasInsert<T>::value && !HasPushBack<T>::value> {};
-
-uint16_t crc16(const char *buf, int len);
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/test/CMakeLists.txt b/ext/redis-plus-plus-1.3.3/test/CMakeLists.txt
deleted file mode 100644
index 92219b6be..000000000
--- a/ext/redis-plus-plus-1.3.3/test/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-project(test_redis++)
-
-cmake_minimum_required(VERSION 3.1)
-
-set(REDIS_PLUS_PLUS_TEST_SOURCES src/sw/redis++/test_main.cpp)
-
-add_executable(${PROJECT_NAME} ${REDIS_PLUS_PLUS_TEST_SOURCES})
-
-# hiredis dependency
-find_path(HIREDIS_HEADER hiredis REQUIRED)
-target_include_directories(${PROJECT_NAME} PRIVATE $<BUILD_INTERFACE:${HIREDIS_HEADER}>)
-
-find_library(TEST_HIREDIS_LIB libhiredis.a)
-if(NOT TEST_HIREDIS_LIB)
-    find_library(TEST_HIREDIS_LIB libhiredis_static.a)
-    if(NOT TEST_HIREDIS_LIB)
-        find_library(TEST_HIREDIS_LIB hiredis)
-    endif()
-endif()
-target_link_libraries(${PROJECT_NAME} ${TEST_HIREDIS_LIB})
-
-if(REDIS_PLUS_PLUS_USE_TLS)
-    find_package(OpenSSL REQUIRED)
-    find_library(TEST_HIREDIS_TLS_LIB libhiredis_ssl.a)
-    if(NOT TEST_HIREDIS_TLS_LIB)
-        find_library(TEST_HIREDIS_TLS_LIB libhiredis_ssl_static.a)
-        if(NOT TEST_HIREDIS_TLS_LIB)
-            find_library(TEST_HIREDIS_TLS_LIB hiredis_ssl)
-        endif()
-    endif()
-    target_link_libraries(${PROJECT_NAME} ${TEST_HIREDIS_TLS_LIB} ${OPENSSL_LIBRARIES})
-endif()
-
-# redis++ dependency
-target_include_directories(${PROJECT_NAME} PRIVATE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../src>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../${TLS_SUB_DIR}>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../${CXX_UTILS_DIR}>)
-
-# solaris socket dependency
-if(CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
-    target_link_libraries(${PROJECT_NAME} -lsocket)
-endif(CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
-
-# Windows socket dependency
-if(WIN32)
-    target_link_libraries(${PROJECT_NAME} ws2_32)
-endif()
-
-find_package(Threads REQUIRED)
-
-if(REDIS_PLUS_PLUS_BUILD_STATIC)
-    set(REDIS_PLUS_PLUS_LIB redis++_static)
-else()
-    set(REDIS_PLUS_PLUS_LIB redis++)
-endif()
-
-target_link_libraries(${PROJECT_NAME} ${REDIS_PLUS_PLUS_LIB} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/benchmark_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/benchmark_test.h
deleted file mode 100644
index 309bc6863..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/benchmark_test.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-struct BenchmarkOptions {
-    std::size_t pool_size = 5;
-    std::size_t thread_num = 10;
-    std::size_t total_request_num = 100000;
-    std::size_t key_len = 10;
-    std::size_t val_len = 10;
-};
-
-template <typename RedisInstance>
-class BenchmarkTest {
-public:
-    BenchmarkTest(const BenchmarkOptions &opts, RedisInstance &instance);
-
-    ~BenchmarkTest() {
-        _cleanup();
-    }
-
-    void run();
-
-private:
-    template <typename Func>
-    void _run(const std::string &title, Func &&func);
-
-    template <typename Func>
-    std::size_t _run(Func &&func, std::size_t request_num);
-
-    void _test_get();
-
-    std::vector<std::string> _gen_keys() const;
-
-    std::string _gen_value() const;
-
-    void _cleanup();
-
-    const std::string& _key(std::size_t idx) const {
-        return _keys[idx % _keys.size()];
-    }
-
-    BenchmarkOptions _opts;
-
-    RedisInstance &_redis;
-
-    std::vector<std::string> _keys;
-
-    std::string _value;
-};
-
-}
-
-}
-
-}
-
-#include "benchmark_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/benchmark_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/benchmark_test.hpp
deleted file mode 100644
index eaf50ec50..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/benchmark_test.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_HPP
-
-#include <chrono>
-#include <random>
-#include <future>
-#include <algorithm>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-BenchmarkTest<RedisInstance>::BenchmarkTest(const BenchmarkOptions &opts,
-        RedisInstance &instance) : _opts(opts), _redis(instance) {
-    REDIS_ASSERT(_opts.pool_size > 0
-            && _opts.thread_num > 0
-            && _opts.total_request_num > 0
-            && _opts.key_len > 0
-            && _opts.val_len > 0,
-                "Invalid benchmark test options.");
-
-    _keys = _gen_keys();
-    _value = _gen_value();
-}
-
-template <typename RedisInstance>
-void BenchmarkTest<RedisInstance>::run() {
-    _cleanup();
-
-    _run("SET key value", [this](std::size_t idx) { this->_redis.set(this->_key(idx), _value); });
-
-    _run("GET key", [this](std::size_t idx) {
-                        auto res = this->_redis.get(this->_key(idx));
-                        (void)res;
-                    });
-
-    _cleanup();
-
-    _run("LPUSH key value", [this](std::size_t idx) {
-                                this->_redis.lpush(this->_key(idx), _value);
-                            });
-
-    _run("LRANGE key 0 10", [this](std::size_t idx) {
-                std::vector<std::string> res;
-                res.reserve(10);
-                this->_redis.lrange(this->_key(idx), 0, 10, std::back_inserter(res));
-            });
-
-    _run("LPOP key", [this](std::size_t idx) {
-                        auto res = this->_redis.lpop(this->_key(idx));
-                        (void)res;
-                     });
-
-    _cleanup();
-
-    _run("INCR key", [this](std::size_t idx) {
-                        auto num = this->_redis.incr(this->_key(idx));
-                        (void)num;
-                     });
-
-    _cleanup();
-
-    _run("SADD key member", [this](std::size_t idx) {
-                                auto num = this->_redis.sadd(this->_key(idx), _value);
-                                (void)num;
-                            });
-
-    _run("SPOP key", [this](std::size_t idx) {
-                        auto res = this->_redis.spop(this->_key(idx));
-                        (void)res;
-                     });
-
-    _cleanup();
-}
-
-template <typename RedisInstance>
-template <typename Func>
-void BenchmarkTest<RedisInstance>::_run(const std::string &title, Func &&func) {
-    auto thread_num = _opts.thread_num;
-    auto requests_per_thread = _opts.total_request_num / thread_num;
-    auto total_request_num = requests_per_thread * thread_num;
-    std::vector<std::future<std::size_t>> res;
-    res.reserve(thread_num);
-    res.push_back(std::async(std::launch::async,
-                    [this](Func &&func, std::size_t request_num) {
-                        return this->_run(std::forward<Func>(func), request_num);
-                    },
-                    std::forward<Func>(func),
-                    requests_per_thread));
-
-    auto total_in_msec = 0;
-    for (auto &fut : res) {
-        total_in_msec += fut.get();
-    }
-
-    auto total_in_sec = total_in_msec * 1.0 / 1000;
-
-    auto avg = total_in_msec * 1.0 / total_request_num;
-
-    auto ops = static_cast<std::size_t>(1000 / avg);
-
-    std::cout << "-----" << title << "-----" << std::endl;
-    std::cout << total_request_num << " requests cost " << total_in_sec << " seconds" << std::endl;
-    std::cout << ops << " requests per second" << std::endl;
-}
-
-template <typename RedisInstance>
-template <typename Func>
-std::size_t BenchmarkTest<RedisInstance>::_run(Func &&func, std::size_t request_num) {
-    auto start = std::chrono::steady_clock::now();
-
-    for (auto idx = 0U; idx != request_num; ++idx) {
-        func(idx);
-    }
-
-    auto stop = std::chrono::steady_clock::now();
-
-    return std::chrono::duration_cast<std::chrono::milliseconds>(stop - start).count();
-}
-
-template <typename RedisInstance>
-std::vector<std::string> BenchmarkTest<RedisInstance>::_gen_keys() const {
-    const auto KEY_NUM = 100;
-    std::vector<std::string> res;
-    res.reserve(KEY_NUM);
-    std::default_random_engine engine(std::random_device{}());
-    std::uniform_int_distribution<int> uniform_dist(0, 255);
-    for (auto i = 0; i != KEY_NUM; ++i) {
-        std::string str;
-        str.reserve(_opts.key_len);
-        for (std::size_t j = 0; j != _opts.key_len; ++j) {
-            str.push_back(static_cast<char>(uniform_dist(engine)));
-        }
-        res.push_back(str);
-    }
-
-    return res;
-}
-
-template <typename RedisInstance>
-std::string BenchmarkTest<RedisInstance>::_gen_value() const {
-    return std::string(_opts.val_len, 'x');
-}
-
-template <typename RedisInstance>
-void BenchmarkTest<RedisInstance>::_cleanup() {
-    for (const auto &key : _keys) {
-        _redis.del(key);
-    }
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_BENCHMARK_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/connection_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/connection_cmds_test.h
deleted file mode 100644
index 2127257c3..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/connection_cmds_test.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ConnectionCmdTest {
-public:
-    explicit ConnectionCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _run(Redis &redis);
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "connection_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/connection_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/connection_cmds_test.hpp
deleted file mode 100644
index 90e7c313b..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/connection_cmds_test.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_HPP
-
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ConnectionCmdTest<RedisInstance>::run() {
-    cluster_specializing_test(*this, &ConnectionCmdTest<RedisInstance>::_run, _redis);
-}
-
-template <typename RedisInstance>
-void ConnectionCmdTest<RedisInstance>::_run(Redis &instance) {
-    auto message = std::string("hello");
-
-    REDIS_ASSERT(instance.echo(message) == message, "failed to test echo");
-
-    REDIS_ASSERT(instance.ping() == "PONG", "failed to test ping");
-
-    REDIS_ASSERT(instance.ping(message) == message, "failed to test ping");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_CONNECTION_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/geo_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/geo_cmds_test.h
deleted file mode 100644
index 41b9795fa..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/geo_cmds_test.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class GeoCmdTest {
-public:
-    explicit GeoCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "geo_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/geo_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/geo_cmds_test.hpp
deleted file mode 100644
index f74d2166c..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/geo_cmds_test.hpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_HPP
-
-#include <vector>
-#include <tuple>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void GeoCmdTest<RedisInstance>::run() {
-    auto key = test_key("geo");
-    auto not_exist_key = test_key("geo_not_exist");
-    auto dest = test_key("dest");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key, dest});
-
-    auto members = {
-        std::make_tuple("m1", 10.0, 11.0),
-        std::make_tuple("m2", 10.1, 11.1),
-        std::make_tuple("m3", 10.2, 11.2)
-    };
-
-    REDIS_ASSERT(_redis.geoadd(key, std::make_tuple("m1", 10.0, 11.0)) == 1,
-            "failed to test geoadd");
-    REDIS_ASSERT(_redis.geoadd(key, members) == 2, "failed to test geoadd");
-
-    auto dist = _redis.geodist(key, "m1", "m4", GeoUnit::KM);
-    REDIS_ASSERT(!dist, "failed to test geodist with nonexistent member");
-
-    auto hash = _redis.geohash(key, "m1");
-    REDIS_ASSERT(bool(hash) && *hash == "s1zned3z8u0", "failed to test geohash");
-    hash = _redis.geohash(key, "m9");
-    REDIS_ASSERT(!hash, "failed to test geohash");
-
-    std::vector<OptionalString> hashes;
-    _redis.geohash(key, {"m1", "m4"}, std::back_inserter(hashes));
-    REDIS_ASSERT(hashes.size() == 2, "failed to test geohash");
-    REDIS_ASSERT(bool(hashes[0]) && *(hashes[0]) == "s1zned3z8u0" && !(hashes[1]),
-            "failed to test geohash");
-    hashes.clear();
-    _redis.geohash(key, {"m4"}, std::back_inserter(hashes));
-    REDIS_ASSERT(hashes.size() == 1 && !(hashes[0]), "failed to test geohash");
-
-    std::vector<Optional<std::pair<double, double>>> pos;
-    _redis.geopos(key, {"m4"}, std::back_inserter(pos));
-    REDIS_ASSERT(pos.size() == 1 && !(pos[0]), "failed to test geopos");
-
-    auto position = _redis.geopos(key, "m3");
-    REDIS_ASSERT(bool(position), "failed to test geopos");
-    position = _redis.geopos(key, "m4");
-    REDIS_ASSERT(!position, "failed to test geopos");
-
-    auto num = _redis.georadius(key,
-                                std::make_pair(10.1, 11.1),
-                                100,
-                                GeoUnit::KM,
-                                dest,
-                                false,
-                                10);
-    REDIS_ASSERT(bool(num) && *num == 3, "failed to test georadius with store option");
-
-    num = _redis.georadius(key,
-                            std::make_pair(50, 50),
-                            1,
-                            GeoUnit::M,
-                            dest,
-                            false,
-                            10);
-    REDIS_ASSERT(bool(num) && *num == 0, "failed to test georadius with store option");
-
-    num = _redis.georadius(not_exist_key,
-                            std::make_pair(10.1, 11.1),
-                            100,
-                            GeoUnit::KM,
-                            dest,
-                            false,
-                            10);
-    REDIS_ASSERT(!num || (num && *num == 0), "failed to test georadius with store option");
-
-    std::vector<std::string> mems;
-    _redis.georadius(key,
-                    std::make_pair(10.1, 11.1),
-                    100,
-                    GeoUnit::KM,
-                    10,
-                    true,
-                    std::back_inserter(mems));
-    REDIS_ASSERT(mems.size() == 3, "failed to test georadius with no option");
-
-    std::vector<std::tuple<std::string, double>> with_dist;
-    _redis.georadius(key,
-                    std::make_pair(10.1, 11.1),
-                    100,
-                    GeoUnit::KM,
-                    10,
-                    true,
-                    std::back_inserter(with_dist));
-    REDIS_ASSERT(with_dist.size() == 3, "failed to test georadius with dist");
-
-    std::vector<std::tuple<std::string, double, std::pair<double, double>>> with_dist_coord;
-    _redis.georadius(key,
-                    std::make_pair(10.1, 11.1),
-                    100,
-                    GeoUnit::KM,
-                    10,
-                    true,
-                    std::back_inserter(with_dist_coord));
-    REDIS_ASSERT(with_dist_coord.size() == 3, "failed to test georadius with dist and coord");
-
-    num = _redis.georadiusbymember(key,
-                                    "m1",
-                                    100,
-                                    GeoUnit::KM,
-                                    dest,
-                                    false,
-                                    10);
-    REDIS_ASSERT(bool(num) && *num == 3, "failed to test georadiusbymember with store option");
-
-    num = _redis.georadiusbymember(not_exist_key,
-                                    "m1",
-                                    100,
-                                    GeoUnit::KM,
-                                    dest,
-                                    false,
-                                    10);
-    REDIS_ASSERT(!num || (num && *num == 0), "failed to test georadiusbymember with store option");
-
-    mems.clear();
-    _redis.georadiusbymember(key,
-                            "m1",
-                            100,
-                            GeoUnit::KM,
-                            10,
-                            true,
-                            std::back_inserter(mems));
-    REDIS_ASSERT(mems.size() == 3, "failed to test georadiusbymember with no option");
-
-    with_dist.clear();
-    _redis.georadiusbymember(key,
-                            "m1",
-                            100,
-                            GeoUnit::KM,
-                            10,
-                            true,
-                            std::back_inserter(with_dist));
-    REDIS_ASSERT(with_dist.size() == 3, "failed to test georadiusbymember with dist");
-
-    with_dist_coord.clear();
-    _redis.georadiusbymember(key,
-                            "m1",
-                            100,
-                            GeoUnit::KM,
-                            10,
-                            true,
-                            std::back_inserter(with_dist_coord));
-    REDIS_ASSERT(with_dist_coord.size() == 3,
-            "failed to test georadiusbymember with dist and coord");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_GEO_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hash_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hash_cmds_test.h
deleted file mode 100644
index 60791c8b9..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hash_cmds_test.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class HashCmdTest {
-public:
-    explicit HashCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_hash();
-
-    void _test_hash_batch();
-
-    void _test_numeric();
-
-    void _test_hscan();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "hash_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hash_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hash_cmds_test.hpp
deleted file mode 100644
index 13716c8d2..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hash_cmds_test.hpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_HPP
-
-#include <unordered_map>
-#include <map>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::run() {
-    _test_hash();
-
-    _test_hash_batch();
-
-    _test_numeric();
-
-    _test_hscan();
-}
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::_test_hash() {
-    auto key = test_key("hash");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto f1 = std::string("f1");
-    auto v1 = std::string("v1");
-    auto f2 = std::string("f2");
-    auto v2 = std::string("v2");
-    auto f3 = std::string("f3");
-    auto v3 = std::string("v3");
-
-    REDIS_ASSERT(_redis.hset(key, f1, v1), "failed to test hset");
-    REDIS_ASSERT(!_redis.hset(key, f1, v2), "failed to test hset with exist field");
-
-    std::unordered_map<std::string, std::string> m = {{"ff1", "vv1"}, {"ff2", "vv2"}};
-    REDIS_ASSERT(_redis.hset(key, m.begin(), m.end()) == 2, "failed to test hset");
-    REDIS_ASSERT(_redis.hset(key, {std::make_pair("ff1", "vv1"),
-                std::make_pair("ff2", "vv2")}) == 0, "failed to test hset");
-
-    auto res = _redis.hget(key, f1);
-    REDIS_ASSERT(res && *res == v2, "failed to test hget");
-
-    REDIS_ASSERT(_redis.hsetnx(key, f2, v1), "failed to test hsetnx");
-    REDIS_ASSERT(!_redis.hsetnx(key, f2, v2), "failed to test hsetnx with exist field");
-
-    res = _redis.hget(key, f2);
-    REDIS_ASSERT(res && *res == v1, "failed to test hget");
-
-    REDIS_ASSERT(!_redis.hexists(key, f3), "failed to test hexists");
-    REDIS_ASSERT(_redis.hset(key, std::make_pair(f3, v3)), "failed to test hset");
-    REDIS_ASSERT(_redis.hexists(key, f3), "failed to test hexists");
-
-    REDIS_ASSERT(_redis.hlen(key) == 5, "failed to test hlen");
-    REDIS_ASSERT(_redis.hstrlen(key, f1) == static_cast<long long>(v1.size()),
-            "failed to test hstrlen");
-
-    REDIS_ASSERT(_redis.hdel(key, f1) == 1, "failed to test hdel");
-    REDIS_ASSERT(_redis.hdel(key, {f1, f2, f3}) == 2, "failed to test hdel range");
-}
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::_test_hash_batch() {
-    auto key = test_key("hash");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto f1 = std::string("f1");
-    auto v1 = std::string("v1");
-    auto f2 = std::string("f2");
-    auto v2 = std::string("v2");
-    auto f3 = std::string("f3");
-
-    _redis.hmset(key, {std::make_pair(f1, v1),
-                        std::make_pair(f2, v2)});
-
-    std::vector<std::string> fields;
-    _redis.hkeys(key, std::back_inserter(fields));
-    REDIS_ASSERT(fields.size() == 2, "failed to test hkeys");
-
-    std::vector<std::string> vals;
-    _redis.hvals(key, std::back_inserter(vals));
-    REDIS_ASSERT(vals.size() == 2, "failed to test hvals");
-
-    std::unordered_map<std::string, std::string> items;
-    _redis.hgetall(key, std::inserter(items, items.end()));
-    REDIS_ASSERT(items.size() == 2 && items[f1] == v1 && items[f2] == v2,
-            "failed to test hgetall");
-
-    std::vector<std::pair<std::string, std::string>> item_vec;
-    _redis.hgetall(key, std::back_inserter(item_vec));
-    REDIS_ASSERT(item_vec.size() == 2, "failed to test hgetall");
-
-    std::vector<OptionalString> res;
-    _redis.hmget(key, {f1, f2, f3}, std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 3
-            && bool(res[0]) && *(res[0]) == v1
-            && bool(res[1]) && *(res[1]) == v2
-            && !res[2],
-                "failed to test hmget");
-}
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::_test_numeric() {
-    auto key = test_key("numeric");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto field = "field";
-
-    REDIS_ASSERT(_redis.hincrby(key, field, 1) == 1, "failed to test hincrby");
-    REDIS_ASSERT(_redis.hincrby(key, field, -1) == 0, "failed to test hincrby");
-    REDIS_ASSERT(_redis.hincrbyfloat(key, field, 1.5) == 1.5, "failed to test hincrbyfloat");
-}
-
-template <typename RedisInstance>
-void HashCmdTest<RedisInstance>::_test_hscan() {
-    auto key = test_key("hscan");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto items = std::unordered_map<std::string, std::string>{
-        std::make_pair("f1", "v1"),
-        std::make_pair("f2", "v2"),
-        std::make_pair("f3", "v3"),
-    };
-
-    _redis.hmset(key, items.begin(), items.end());
-
-    std::unordered_map<std::string, std::string> item_map;
-    auto cursor = 0;
-    while (true) {
-        cursor = _redis.hscan(key, cursor, "f*", 2, std::inserter(item_map, item_map.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-
-    REDIS_ASSERT(item_map == items, "failed to test hscan with pattern and count");
-
-    std::map<std::string, std::string> item_vec;
-    cursor = 0;
-    while (true) {
-        cursor = _redis.hscan(key, cursor, std::inserter(item_vec, item_vec.begin()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-
-    REDIS_ASSERT(item_vec.size() == items.size(), "failed to test hscan");
-    for (const auto &ele : item_vec) {
-        REDIS_ASSERT(items.find(ele.first) != items.end(), "failed to test hscan");
-    }
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_HASH_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hyperloglog_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hyperloglog_cmds_test.h
deleted file mode 100644
index 50e454b23..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hyperloglog_cmds_test.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class HyperloglogCmdTest {
-public:
-    explicit HyperloglogCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "hyperloglog_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hyperloglog_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hyperloglog_cmds_test.hpp
deleted file mode 100644
index 09775255f..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/hyperloglog_cmds_test.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_HPP
-
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void HyperloglogCmdTest<RedisInstance>::run() {
-    auto k1 = test_key("k1");
-    auto k2 = test_key("k2");
-    auto k3 = test_key("k3");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {k1, k2, k3});
-
-    _redis.pfadd(k1, "a");
-    auto members1 = {"b", "c", "d", "e", "f", "g"};
-    _redis.pfadd(k1, members1);
-
-    auto cnt = _redis.pfcount(k1);
-    auto err = cnt * 1.0 / (1 + members1.size());
-    REDIS_ASSERT(err < 1.02 && err > 0.98, "failed to test pfadd and pfcount");
-
-    auto members2 = {"a", "b", "c", "h", "i", "j", "k"};
-    _redis.pfadd(k2, members2);
-    auto total = 1 + members1.size() + members2.size() - 3;
-
-    cnt = _redis.pfcount({k1, k2});
-    err = cnt * 1.0 / total;
-    REDIS_ASSERT(err < 1.02 && err > 0.98, "failed to test pfcount");
-
-    _redis.pfmerge(k3, {k1, k2});
-    cnt = _redis.pfcount(k3);
-    err = cnt * 1.0 / total;
-    REDIS_ASSERT(err < 1.02 && err > 0.98, "failed to test pfcount");
-
-    _redis.pfmerge(k3, k1);
-    REDIS_ASSERT(cnt == _redis.pfcount(k3), "failed to test pfmerge");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_HYPERLOGLOG_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/keys_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/keys_cmds_test.h
deleted file mode 100644
index 54d25ca28..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/keys_cmds_test.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class KeysCmdTest {
-public:
-    explicit KeysCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_key();
-
-    void _test_randomkey(Redis &instance);
-
-    void _test_ttl();
-
-    void _test_scan(Redis &instance);
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "keys_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/keys_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/keys_cmds_test.hpp
deleted file mode 100644
index de21f8d18..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/keys_cmds_test.hpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_HPP
-
-#include <vector>
-#include <unordered_set>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::run() {
-    _test_key();
-
-    cluster_specializing_test(*this, &KeysCmdTest<RedisInstance>::_test_randomkey, _redis);
-
-    _test_ttl();
-
-    cluster_specializing_test(*this, &KeysCmdTest<RedisInstance>::_test_scan, _redis);
-}
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::_test_key() {
-    auto key = test_key("key");
-    auto dest = test_key("dest");
-    auto new_key_name = test_key("new-key");
-    auto not_exist_key = test_key("not-exist");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key, dest, new_key_name});
-
-    REDIS_ASSERT(_redis.exists(key) == 0, "failed to test exists");
-
-    auto val = std::string("val");
-    _redis.set(key, val);
-
-    REDIS_ASSERT(_redis.exists({key, not_exist_key}) == 1, "failed to test exists");
-
-    auto new_val = _redis.dump(key);
-    REDIS_ASSERT(bool(new_val), "failed to test dump");
-
-    _redis.restore(dest, *new_val, std::chrono::seconds(1000));
-
-    new_val = _redis.get(dest);
-    REDIS_ASSERT(bool(new_val) && *new_val == val, "failed to test dump and restore");
-
-    _redis.rename(dest, new_key_name);
-
-    bool not_exist = false;
-    try {
-        _redis.rename(not_exist_key, new_key_name);
-    } catch (const Error &e) {
-        not_exist = true;
-    }
-    REDIS_ASSERT(not_exist, "failed to test rename with nonexistent key");
-
-    REDIS_ASSERT(_redis.renamenx(new_key_name, dest), "failed to test renamenx");
-
-    REDIS_ASSERT(_redis.touch(not_exist_key) == 0, "failed to test touch");
-    REDIS_ASSERT(_redis.touch({key, dest, new_key_name}) == 2, "failed to test touch");
-
-    REDIS_ASSERT(_redis.type(key) == "string", "failed to test type");
-
-    REDIS_ASSERT(_redis.del({new_key_name, dest}) == 1, "failed to test del");
-    REDIS_ASSERT(_redis.unlink({new_key_name, key}) == 1, "failed to test unlink");
-}
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::_test_randomkey(Redis &instance) {
-    auto key = test_key("randomkey");
-
-    KeyDeleter<Redis> deleter(instance, key);
-
-    instance.set(key, "value");
-
-    auto rand_key = instance.randomkey();
-    REDIS_ASSERT(bool(rand_key), "failed to test randomkey");
-}
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::_test_ttl() {
-    using namespace std::chrono;
-
-    auto key = test_key("ttl");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    _redis.set(key, "val", seconds(100));
-    auto ttl = _redis.ttl(key);
-    REDIS_ASSERT(ttl > 0 && ttl <= 100, "failed to test ttl");
-
-    REDIS_ASSERT(_redis.persist(key), "failed to test persist");
-    ttl = _redis.ttl(key);
-    REDIS_ASSERT(ttl == -1, "failed to test ttl");
-
-    REDIS_ASSERT(_redis.expire(key, seconds(100)),
-            "failed to test expire");
-
-    auto tp = time_point_cast<seconds>(system_clock::now() + seconds(100));
-    REDIS_ASSERT(_redis.expireat(key, tp), "failed to test expireat");
-    ttl = _redis.ttl(key);
-    REDIS_ASSERT(ttl > 0, "failed to test expireat");
-
-    REDIS_ASSERT(_redis.pexpire(key, milliseconds(100000)), "failed to test expire");
-
-    auto pttl = _redis.pttl(key);
-    REDIS_ASSERT(pttl > 0 && pttl <= 100000, "failed to test pttl");
-
-    auto tp_milli = time_point_cast<milliseconds>(system_clock::now() + milliseconds(100000));
-    REDIS_ASSERT(_redis.pexpireat(key, tp_milli), "failed to test pexpireat");
-    pttl = _redis.pttl(key);
-    REDIS_ASSERT(pttl > 0, "failed to test pexpireat");
-}
-
-template <typename RedisInstance>
-void KeysCmdTest<RedisInstance>::_test_scan(Redis &instance) {
-    std::string key_pattern = "!@#$%^&()_+alseufoawhnlkszd";
-    auto k1 = test_key(key_pattern + "k1");
-    auto k2 = test_key(key_pattern + "k2");
-    auto k3 = test_key(key_pattern + "k3");
-
-    auto keys = {k1, k2, k3};
-
-    KeyDeleter<Redis> deleter(instance, keys);
-
-    instance.set(k1, "v");
-    instance.set(k2, "v");
-    instance.set(k3, "v");
-
-    auto cursor = 0;
-    std::unordered_set<std::string> res;
-    while (true) {
-        cursor = instance.scan(cursor, "*" + key_pattern + "*", 2, std::inserter(res, res.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-    REDIS_ASSERT(res == std::unordered_set<std::string>(keys),
-            "failed to test scan");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_KEYS_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/list_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/list_cmds_test.h
deleted file mode 100644
index 2092fe9e4..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/list_cmds_test.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ListCmdTest {
-public:
-    explicit ListCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_lpoppush();
-
-    void _test_rpoppush();
-
-    void _test_list();
-
-    void _test_blocking();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "list_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/list_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/list_cmds_test.hpp
deleted file mode 100644
index fd26d8fde..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/list_cmds_test.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_HPP
-
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::run() {
-    _test_lpoppush();
-
-    _test_rpoppush();
-
-    _test_list();
-
-    _test_blocking();
-}
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::_test_lpoppush() {
-    auto key = test_key("lpoppush");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto item = _redis.lpop(key);
-    REDIS_ASSERT(!item, "failed to test lpop");
-
-    REDIS_ASSERT(_redis.lpushx(key, "1") == 0, "failed to test lpushx");
-    REDIS_ASSERT(_redis.lpush(key, "1") == 1, "failed to test lpush");
-    REDIS_ASSERT(_redis.lpushx(key, "2") == 2, "failed to test lpushx");
-    REDIS_ASSERT(_redis.lpush(key, {"3", "4", "5"}) == 5, "failed to test lpush");
-
-    item = _redis.lpop(key);
-    REDIS_ASSERT(item && *item == "5", "failed to test lpop");
-}
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::_test_rpoppush() {
-    auto key = test_key("rpoppush");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto item = _redis.rpop(key);
-    REDIS_ASSERT(!item, "failed to test rpop");
-
-    REDIS_ASSERT(_redis.rpushx(key, "1") == 0, "failed to test rpushx");
-    REDIS_ASSERT(_redis.rpush(key, "1") == 1, "failed to test rpush");
-    REDIS_ASSERT(_redis.rpushx(key, "2") == 2, "failed to test rpushx");
-    REDIS_ASSERT(_redis.rpush(key, {"3", "4", "5"}) == 5, "failed to test rpush");
-
-    item = _redis.rpop(key);
-    REDIS_ASSERT(item && *item == "5", "failed to test rpop");
-}
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::_test_list() {
-    auto key = test_key("list");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto item = _redis.lindex(key, 0);
-    REDIS_ASSERT(!item, "failed to test lindex");
-
-    _redis.lpush(key, {"1", "2", "3", "4", "5"});
-
-    REDIS_ASSERT(_redis.lrem(key, 0, "3") == 1, "failed to test lrem");
-
-    REDIS_ASSERT(_redis.linsert(key, InsertPosition::BEFORE, "2", "3") == 5,
-            "failed to test lindex");
-
-    REDIS_ASSERT(_redis.llen(key) == 5, "failed to test llen");
-
-    _redis.lset(key, 0, "6");
-    item = _redis.lindex(key, 0);
-    REDIS_ASSERT(item && *item == "6", "failed to test lindex");
-
-    _redis.ltrim(key, 0, 2);
-
-    std::vector<std::string> res;
-    _redis.lrange(key, 0, -1, std::back_inserter(res));
-    REDIS_ASSERT(res == std::vector<std::string>({"6", "4", "3"}), "failed to test ltrim");
-}
-
-template <typename RedisInstance>
-void ListCmdTest<RedisInstance>::_test_blocking() {
-    auto k1 = test_key("k1");
-    auto k2 = test_key("k2");
-    auto k3 = test_key("k3");
-
-    auto keys = {k1, k2, k3};
-
-    KeyDeleter<RedisInstance> deleter(_redis, keys);
-
-    std::string val("value");
-    _redis.lpush(k1, val);
-
-    auto res = _redis.blpop(keys.begin(), keys.end());
-    REDIS_ASSERT(res && *res == std::make_pair(k1, val), "failed to test blpop");
-
-    res = _redis.brpop(keys, std::chrono::seconds(1));
-    REDIS_ASSERT(!res, "failed to test brpop with timeout");
-
-    _redis.lpush(k1, val);
-    res = _redis.blpop(k1);
-    REDIS_ASSERT(res && *res == std::make_pair(k1, val), "failed to test blpop");
-
-    res = _redis.blpop(k1, std::chrono::seconds(1));
-    REDIS_ASSERT(!res, "failed to test blpop with timeout");
-
-    _redis.lpush(k1, val);
-    res = _redis.brpop(k1);
-    REDIS_ASSERT(res && *res == std::make_pair(k1, val), "failed to test brpop");
-
-    res = _redis.brpop(k1, std::chrono::seconds(1));
-    REDIS_ASSERT(!res, "failed to test brpop with timeout");
-
-    auto str = _redis.brpoplpush(k2, k3, std::chrono::seconds(1));
-    REDIS_ASSERT(!str, "failed to test brpoplpush with timeout");
-
-    _redis.lpush(k2, val);
-    str = _redis.brpoplpush(k2, k3);
-    REDIS_ASSERT(str && *str == val, "failed to test brpoplpush");
-
-    str = _redis.rpoplpush(k3, k2);
-    REDIS_ASSERT(str && *str == val, "failed to test rpoplpush");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_LIST_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pipeline_transaction_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pipeline_transaction_test.h
deleted file mode 100644
index 9987894cc..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pipeline_transaction_test.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class PipelineTransactionTest {
-public:
-    explicit PipelineTransactionTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    Pipeline _pipeline(const StringView &key, bool new_connection);
-
-    Transaction _transaction(const StringView &key, bool piped, bool new_connection);
-
-    void _test_pipeline(const StringView &key, Pipeline &pipe);
-
-    void _test_pipeline_streams(const StringView &key, Pipeline &pipe);
-
-    void _test_transaction(const StringView &key, Transaction &tx);
-
-    void _test_watch();
-
-    void _test_error_handle(bool new_connection);
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "pipeline_transaction_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pipeline_transaction_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pipeline_transaction_test.hpp
deleted file mode 100644
index 426161bb1..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pipeline_transaction_test.hpp
+++ /dev/null
@@ -1,293 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_HPP
-
-#include <string>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::run() {
-    {
-        auto key = test_key("pipeline");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto pipe = _pipeline(key, true);
-        _test_pipeline(key, pipe);
-    }
-
-    {
-        auto key = test_key("pipeline");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto pipe = _pipeline(key, false);
-        _test_pipeline(key, pipe);
-    }
-
-    {
-        auto key = test_key("pipeline");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto pipe = _pipeline(key, false);
-        _test_pipeline_streams(key, pipe);
-    }
-
-    {
-        auto key = test_key("transaction");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto tx = _transaction(key, true, true);
-        _test_transaction(key, tx);
-    }
-
-    {
-        auto key = test_key("transaction");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto tx = _transaction(key, false, true);
-        _test_transaction(key, tx);
-    }
-
-    {
-        auto key = test_key("transaction");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto tx = _transaction(key, true, false);
-        _test_transaction(key, tx);
-    }
-
-    {
-        auto key = test_key("transaction");
-        KeyDeleter<RedisInstance> deleter(_redis, key);
-        auto tx = _transaction(key, false, false);
-        _test_transaction(key, tx);
-    }
-
-    _test_watch();
-
-    _test_error_handle(true);
-    _test_error_handle(false);
-}
-
-template <typename RedisInstance>
-Pipeline PipelineTransactionTest<RedisInstance>::_pipeline(const StringView &,
-        bool new_connection) {
-    return _redis.pipeline(new_connection);
-}
-
-template <>
-inline Pipeline PipelineTransactionTest<RedisCluster>::_pipeline(const StringView &key,
-        bool new_connection) {
-    return _redis.pipeline(key, new_connection);
-}
-
-template <typename RedisInstance>
-Transaction PipelineTransactionTest<RedisInstance>::_transaction(const StringView &,
-        bool piped, bool new_connection) {
-    return _redis.transaction(piped, new_connection);
-}
-
-template <>
-inline Transaction PipelineTransactionTest<RedisCluster>::_transaction(const StringView &key,
-        bool piped, bool new_connection) {
-    return _redis.transaction(key, piped, new_connection);
-}
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::_test_pipeline(const StringView &key,
-        Pipeline &pipe) {
-    std::string val("value");
-    auto replies = pipe.set(key, val)
-                        .get(key)
-                        .strlen(key)
-                        .exec();
-
-    REDIS_ASSERT(replies.get<bool>(0), "failed to test pipeline with set operation");
-
-    auto new_val = replies.get<OptionalString>(1);
-    std::size_t len = replies.get<long long>(2);
-    REDIS_ASSERT(bool(new_val) && *new_val == val && len == val.size(),
-            "failed to test pipeline with string operations");
-
-    REDIS_ASSERT(reply::parse<bool>(replies.get(0)), "failed to test pipeline with set operation");
-
-    new_val = reply::parse<OptionalString>(replies.get(1));
-    len = reply::parse<long long>(replies.get(2));
-    REDIS_ASSERT(bool(new_val) && *new_val == val && len == val.size(),
-            "failed to test pipeline with string operations");
-}
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::_test_pipeline_streams(const StringView &key,
-        Pipeline &pipe) {
-
-    const std::vector<std::string> ids = {"1565427842-0", "1565427842-1"};
-    std::vector<std::pair<std::string, std::string>> attrs = {
-        {"f1", "v1"},
-        {"f2", "v2"}
-    };
-    for (auto id : ids) {
-        pipe.xadd(key, id, attrs.begin(), attrs.end());
-    }
-    for (auto id : ids) {
-        pipe.xrange(key, "-", "+", 1);
-        pipe.xrevrange(key, "+", "-", 1);
-    }
-    auto replies = pipe.exec();
-    int replyCnt = 0;
-    using Item = std::pair<std::string, std::unordered_map<std::string, std::string>>;
-    std::vector<Item> items;
-    for (auto id : ids) {
-        auto reply = replies.get(replyCnt++);
-        std::string retId = reply::parse<std::string>(reply);
-        REDIS_ASSERT(retId == id, "failed to test pipeline_streams with xadd");
-    }
-    for (auto id : ids) {
-        auto replyXrange = replies.get(replyCnt++);
-        std::vector<Item> items = reply::parse<std::vector<Item>>(replyXrange);
-        auto replyXrevrange = replies.get(replyCnt++);
-        std::vector<Item> itemsRev = reply::parse<std::vector<Item>>(replyXrevrange);
-        REDIS_ASSERT(
-            items.size() == 1 &&
-            items.at(0).first == ids.at(0) &&
-            itemsRev.at(0).first == ids.at(ids.size()-1),
-            "failed to test pipeline_streams with count");
-    }
-}
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::_test_transaction(const StringView &key,
-        Transaction &tx) {
-    std::unordered_map<std::string, std::string> m = {
-        std::make_pair("f1", "v1"),
-        std::make_pair("f2", "v2"),
-        std::make_pair("f3", "v3")
-    };
-    auto replies = tx.hmset(key, m.begin(), m.end())
-                        .hgetall(key)
-                        .hdel(key, "f1")
-                        .exec();
-
-    replies.get<void>(0);
-
-    decltype(m) mm;
-    replies.get(1, std::inserter(mm, mm.end()));
-    REDIS_ASSERT(mm == m, "failed to test transaction");
-
-    REDIS_ASSERT(replies.get<long long>(2) == 1, "failed to test transaction");
-
-    tx.set(key, "value")
-        .get(key)
-        .incr(key);
-
-    tx.discard();
-
-    replies = tx.del(key)
-                .set(key, "value")
-                .exec();
-
-    REDIS_ASSERT(replies.get<long long>(0) == 1, "failed to test transaction");
-
-    REDIS_ASSERT(replies.get<bool>(1), "failed to test transaction");
-}
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::_test_watch() {
-    auto key = test_key("watch");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    {
-        auto tx = _transaction(key, false, true);
-
-        auto redis = tx.redis();
-
-        redis.watch(key);
-
-        auto replies = tx.set(key, "1").get(key).exec();
-
-        REDIS_ASSERT(replies.size() == 2
-                && replies.template get<bool>(0) == true, "failed to test watch");
-
-        auto val = replies.template get<sw::redis::OptionalString>(1);
-
-        REDIS_ASSERT(val && *val == "1", "failed to test watch");
-    }
-
-    try {
-        auto tx = _transaction(key, false, true);
-
-        auto redis = tx.redis();
-
-        redis.watch(key);
-
-        // Key has been modified by other client.
-        _redis.set(key, "val");
-
-        // Transaction should fail, and throw WatchError
-        tx.set(key, "1").exec();
-
-        REDIS_ASSERT(false, "failed to test watch");
-    } catch (const sw::redis::WatchError &err) {
-        // Catch the error.
-    }
-}
-
-template <typename RedisInstance>
-void PipelineTransactionTest<RedisInstance>::_test_error_handle(bool new_connection) {
-    auto key = test_key("error_handle");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    try {
-        auto pipe = _pipeline(key, new_connection);
-
-        // This will fail
-        pipe.set(key, "val").hget(key, "field").exec();
-    } catch (const sw::redis::Error &err) {
-        // Ignore the error.
-    }
-
-    auto pipe = _pipeline(key, new_connection);
-    std::string val("val");
-    auto replies = pipe.set(key, val).get(key).exec();
-    REDIS_ASSERT(replies.size() == 2, "failed to test pipeline's error handling");
-    auto value = replies.template get<sw::redis::OptionalString>(1);
-    REDIS_ASSERT(value && *value == val, "failed to test pipeline's error handling");
-
-    {
-        auto pipe = _pipeline(key, new_connection);
-        pipe.set(key, "val");
-
-        // Forget to call exec() or discard()
-    }
-
-    pipe = _pipeline(key, new_connection);
-    val = "new value";
-    replies = pipe.set(key, val).get(key).exec();
-    REDIS_ASSERT(replies.size() == 2, "failed to test pipeline's error handling");
-    value = replies.template get<sw::redis::OptionalString>(1);
-    REDIS_ASSERT(value && *value == val, "failed to test pipeline's error handling");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_PIPELINE_TRANSACTION_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pubsub_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pubsub_test.h
deleted file mode 100644
index f816eaecc..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pubsub_test.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class PubSubTest {
-public:
-    explicit PubSubTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_sub_channel();
-
-    void _test_sub_pattern();
-
-    void _test_unsubscribe();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "pubsub_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pubsub_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pubsub_test.hpp
deleted file mode 100644
index 4530c0788..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/pubsub_test.hpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_HPP
-
-#include <unordered_map>
-#include <unordered_set>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void PubSubTest<RedisInstance>::run() {
-    _test_sub_channel();
-
-    _test_sub_pattern();
-
-    _test_unsubscribe();
-}
-
-template <typename RedisInstance>
-void PubSubTest<RedisInstance>::_test_sub_channel() {
-    auto sub = _redis.subscriber();
-
-    auto msgs = {"msg1", "msg2"};
-    auto channel1 = test_key("c1");
-    sub.on_message([&msgs, &channel1](std::string channel, std::string msg) {
-                        static std::size_t idx = 0;
-                        REDIS_ASSERT(channel == channel1 && msg == *(msgs.begin() + idx),
-                                        "failed to test subscribe");
-                        ++idx;
-                    });
-
-    sub.subscribe(channel1);
-
-    // Consume the SUBSCRIBE message.
-    sub.consume();
-
-    for (const auto &msg : msgs) {
-        _redis.publish(channel1, msg);
-        sub.consume();
-    }
-
-    sub.unsubscribe(channel1);
-
-    // Consume the UNSUBSCRIBE message.
-    sub.consume();
-
-    auto channel2 = test_key("c2");
-    auto channel3 = test_key("c3");
-    auto channel4 = test_key("c4");
-    std::unordered_set<std::string> channels;
-    sub.on_meta([&channels](Subscriber::MsgType type,
-                            OptionalString channel,
-                            long long num) {
-                    REDIS_ASSERT(bool(channel), "failed to test subscribe");
-
-                    if (type == Subscriber::MsgType::SUBSCRIBE) {
-                        auto iter = channels.find(*channel);
-                        REDIS_ASSERT(iter == channels.end(), "failed to test subscribe");
-                        channels.insert(*channel);
-                        REDIS_ASSERT(static_cast<std::size_t>(num) == channels.size(),
-                                        "failed to test subscribe");
-                    } else if (type == Subscriber::MsgType::UNSUBSCRIBE) {
-                        auto iter = channels.find(*channel);
-                        REDIS_ASSERT(iter != channels.end(), "failed to test subscribe");
-                        channels.erase(*channel);
-                        REDIS_ASSERT(static_cast<std::size_t>(num) == channels.size(),
-                                        "failed to test subscribe");
-                    } else {
-                        REDIS_ASSERT(false, "Unknown message type");
-                    }
-                });
-
-    std::unordered_map<std::string, std::string> messages = {
-        {channel2, "msg2"},
-        {channel3, "msg3"},
-        {channel4, "msg4"},
-    };
-    sub.on_message([&messages](std::string channel, std::string msg) {
-                        REDIS_ASSERT(messages.find(channel) != messages.end(),
-                                        "failed to test subscribe");
-                        REDIS_ASSERT(messages[channel] == msg, "failed to test subscribe");
-                   });
-
-    sub.subscribe({channel2, channel3, channel4});
-
-    for (std::size_t idx = 0; idx != channels.size(); ++idx) {
-        sub.consume();
-    }
-
-    for (const auto &ele : messages) {
-        _redis.publish(ele.first, ele.second);
-        sub.consume();
-    }
-
-    auto tmp = {channel2, channel3, channel4};
-    sub.unsubscribe(tmp);
-
-    for (std::size_t idx = 0; idx != tmp.size(); ++idx) {
-        sub.consume();
-    }
-}
-
-template <typename RedisInstance>
-void PubSubTest<RedisInstance>::_test_sub_pattern() {
-    auto sub = _redis.subscriber();
-
-    auto msgs = {"msg1", "msg2"};
-    auto pattern1 = test_key("pattern*");
-    std::string channel1 = test_key("pattern1");
-    sub.on_pmessage([&msgs, &pattern1, &channel1](std::string pattern,
-                                                    std::string channel,
-                                                    std::string msg) {
-                        static std::size_t idx = 0;
-                        REDIS_ASSERT(pattern == pattern1
-                                        && channel == channel1
-                                        && msg == *(msgs.begin() + idx),
-                                        "failed to test psubscribe");
-                        ++idx;
-                    });
-
-    sub.psubscribe(pattern1);
-
-    // Consume the PSUBSCRIBE message.
-    sub.consume();
-
-    for (const auto &msg : msgs) {
-        _redis.publish(channel1, msg);
-        sub.consume();
-    }
-
-    sub.punsubscribe(pattern1);
-
-    // Consume the PUNSUBSCRIBE message.
-    sub.consume();
-
-    auto channel2 = test_key("pattern22");
-    auto channel3 = test_key("pattern33");
-    auto channel4 = test_key("pattern44");
-    std::unordered_set<std::string> channels;
-    sub.on_meta([&channels](Subscriber::MsgType type,
-                            OptionalString channel,
-                            long long num) {
-                    REDIS_ASSERT(bool(channel), "failed to test psubscribe");
-
-                    if (type == Subscriber::MsgType::PSUBSCRIBE) {
-                        auto iter = channels.find(*channel);
-                        REDIS_ASSERT(iter == channels.end(), "failed to test psubscribe");
-                        channels.insert(*channel);
-                        REDIS_ASSERT(static_cast<std::size_t>(num) == channels.size(),
-                                        "failed to test psubscribe");
-                    } else if (type == Subscriber::MsgType::PUNSUBSCRIBE) {
-                        auto iter = channels.find(*channel);
-                        REDIS_ASSERT(iter != channels.end(), "failed to test psubscribe");
-                        channels.erase(*channel);
-                        REDIS_ASSERT(static_cast<std::size_t>(num) == channels.size(),
-                                        "failed to test psubscribe");
-                    } else {
-                        REDIS_ASSERT(false, "Unknown message type");
-                    }
-                });
-
-    auto pattern2 = test_key("pattern2*");
-    auto pattern3 = test_key("pattern3*");
-    auto pattern4 = test_key("pattern4*");
-    std::unordered_set<std::string> patterns = {pattern2, pattern3, pattern4};
-
-    std::unordered_map<std::string, std::string> messages = {
-        {channel2, "msg2"},
-        {channel3, "msg3"},
-        {channel4, "msg4"},
-    };
-    sub.on_pmessage([&patterns, &messages](std::string pattern,
-                                            std::string channel,
-                                            std::string msg) {
-                        REDIS_ASSERT(patterns.find(pattern) != patterns.end(),
-                                        "failed to test psubscribe");
-                        REDIS_ASSERT(messages[channel] == msg, "failed to test psubscribe");
-                    });
-
-    sub.psubscribe({pattern2, pattern3, pattern4});
-
-    for (std::size_t idx = 0; idx != channels.size(); ++idx) {
-        sub.consume();
-    }
-
-    for (const auto &ele : messages) {
-        _redis.publish(ele.first, ele.second);
-        sub.consume();
-    }
-
-    auto tmp = {pattern2, pattern3, pattern4};
-    sub.punsubscribe(tmp);
-
-    for (std::size_t idx = 0; idx != tmp.size(); ++idx) {
-        sub.consume();
-    }
-}
-
-template <typename RedisInstance>
-void PubSubTest<RedisInstance>::_test_unsubscribe() {
-    auto sub = _redis.subscriber();
-
-    sub.on_meta([](Subscriber::MsgType type,
-                        OptionalString channel,
-                        long long num) {
-                        REDIS_ASSERT(type == Subscriber::MsgType::UNSUBSCRIBE,
-                                        "failed to test unsub");
-
-                        REDIS_ASSERT(!channel, "failed to test unsub");
-
-                        REDIS_ASSERT(num == 0, "failed to test unsub");
-                    });
-
-    sub.unsubscribe();
-    sub.consume();
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SUBPUB_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/sanity_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/sanity_test.h
deleted file mode 100644
index eabbdbd1e..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/sanity_test.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class SanityTest {
-public:
-    SanityTest(const ConnectionOptions &opts, RedisInstance &instance)
-        : _opts(opts), _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_uri();
-
-    void _test_uri_ctor();
-
-    std::string _build_uri(const ConnectionOptions &opts) const;
-
-    void _ping(Redis &instance);
-
-    void _test_move_ctor();
-
-    void _test_cmdargs();
-
-    void _test_generic_command();
-
-    void _test_hash_tag();
-
-    void _test_hash_tag(std::initializer_list<std::string> keys);
-
-    std::string _test_key(const std::string &key);
-
-    void _test_ping(Redis &instance);
-
-    void _test_pipeline(const StringView &key, Pipeline &pipeline);
-
-    void _test_transaction(const StringView &key, Transaction &transaction);
-
-    Pipeline _pipeline(const StringView &key);
-
-    Transaction _transaction(const StringView &key);
-
-    ConnectionOptions _opts;
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "sanity_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/sanity_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/sanity_test.hpp
deleted file mode 100644
index 482fb17de..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/sanity_test.hpp
+++ /dev/null
@@ -1,481 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_HPP
-
-#include "utils.h"
-#include <unordered_map>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::run() {
-    _test_uri();
-
-    _test_uri_ctor();
-
-    _test_move_ctor();
-
-    cluster_specializing_test(*this, &SanityTest<RedisInstance>::_test_ping, _redis);
-
-    auto pipe_key = test_key("pipeline");
-    auto tx_key = test_key("transaction");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {pipe_key, tx_key});
-
-    auto pipeline = _pipeline(pipe_key);
-    _test_pipeline(pipe_key, pipeline);
-
-    auto transaction = _transaction(tx_key);
-    _test_transaction(tx_key, transaction);
-
-    _test_cmdargs();
-
-    _test_generic_command();
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_uri_ctor() {
-    std::string uri;
-    switch (_opts.type) {
-    case sw::redis::ConnectionType::TCP:
-        uri = _build_uri(_opts);
-        break;
-
-    case sw::redis::ConnectionType::UNIX:
-        REDIS_ASSERT(false, "NO test for UNIX Domain Socket");
-        break;
-
-    default:
-        REDIS_ASSERT(false, "Unknown connection type");
-    }
-
-    auto instance = RedisInstance(uri);
-
-    cluster_specializing_test(*this, &SanityTest<RedisInstance>::_ping, instance);
-}
-
-template <typename RedisInstance>
-std::string SanityTest<RedisInstance>::_build_uri(const ConnectionOptions &opts) const {
-    auto scheme = "tcp://";
-    auto uri = opts.host + ":" + std::to_string(opts.port) + "/" + std::to_string(opts.db);
-
-    std::string auth;
-    if (opts.user != "default") {
-        auth += opts.user + ":";
-    }
-
-    if (!opts.password.empty()) {
-        auth += opts.password;
-    }
-
-    if (!auth.empty()) {
-        auth += "@";
-    }
-
-    return scheme + auth + uri;
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_ping(Redis &instance) {
-    REDIS_ASSERT(instance.ping() == "PONG", "Failed to test constructing Redis with uri");
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_move_ctor() {
-    auto test_move_ctor = std::move(_redis);
-
-    _redis = std::move(test_move_ctor);
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_cmdargs() {
-    auto lpush_num = [](Connection &connection, const StringView &key, long long num) {
-        connection.send("LPUSH %b %lld",
-                        key.data(), key.size(),
-                        num);
-    };
-
-    auto lpush_nums = [](Connection &connection,
-                            const StringView &key,
-                            const std::vector<long long> &nums) {
-        CmdArgs args;
-        args.append("LPUSH").append(key);
-        for (auto num : nums) {
-            args.append(std::to_string(num));
-        }
-
-        connection.send(args);
-    };
-
-    auto key = test_key("lpush_num");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto reply = _redis.command(lpush_num, key, 1);
-    REDIS_ASSERT(reply::parse<long long>(*reply) == 1, "failed to test cmdargs");
-
-    std::vector<long long> nums = {2, 3, 4, 5};
-    reply = _redis.command(lpush_nums, key, nums);
-    REDIS_ASSERT(reply::parse<long long>(*reply) == 5, "failed to test cmdargs");
-
-    std::vector<std::string> res;
-    _redis.lrange(key, 0, -1, std::back_inserter(res));
-    REDIS_ASSERT((res == std::vector<std::string>{"5", "4", "3", "2", "1"}),
-            "failed to test cmdargs");
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_generic_command() {
-    auto key = test_key("key");
-    auto not_exist_key = test_key("not_exist_key");
-    auto k1 = test_key("k1");
-    auto k2 = test_key("k2");
-    auto key_var = test_key("key_var");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key, not_exist_key, k1, k2, key_var});
-
-    std::string cmd("set");
-    _redis.command(cmd, key, 123);
-    auto reply = _redis.command("get", key);
-    auto val = reply::parse<OptionalString>(*reply);
-    REDIS_ASSERT(val && *val == "123", "failed to test generic command");
-
-    val = _redis.template command<OptionalString>("get", key);
-    REDIS_ASSERT(val && *val == "123", "failed to test generic command");
-
-    std::vector<OptionalString> res;
-    _redis.command("mget", key, not_exist_key, std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 2 && res[0] && *res[0] == "123" && !res[1],
-            "failed to test generic command");
-
-    reply = _redis.command("incr", key);
-    REDIS_ASSERT(reply::parse<long long>(*reply) == 124, "failed to test generic command");
-
-    _redis.command("mset", k1.c_str(), "v", k2.c_str(), "v");
-    reply = _redis.command("mget", k1, k2);
-    res.clear();
-    reply::to_array(*reply, std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 2 && res[0] && *(res[0]) == "v" && res[1] && *(res[1]) == "v",
-            "failed to test generic command");
-
-    res = _redis.template command<std::vector<OptionalString>>("mget", k1, k2);
-    REDIS_ASSERT(res.size() == 2 && res[0] && *(res[0]) == "v" && res[1] && *(res[1]) == "v",
-            "failed to test generic command");
-
-    res.clear();
-    _redis.command("mget", k1, k2, std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 2 && res[0] && *(res[0]) == "v" && res[1] && *(res[1]) == "v",
-            "failed to test generic command");
-
-    auto set_cmd_str = {"set", key.c_str(), "new_value"};
-    _redis.command(set_cmd_str.begin(), set_cmd_str.end());
-
-    auto get_cmd_str = {"get", key.c_str()};
-    reply = _redis.command(get_cmd_str.begin(), get_cmd_str.end());
-    val = reply::parse<OptionalString>(*reply);
-    REDIS_ASSERT(val && *val == "new_value", "failed to test generic command");
-
-    val = _redis.template command<OptionalString>(get_cmd_str.begin(), get_cmd_str.end());
-    REDIS_ASSERT(val && *val == "new_value", "failed to test generic command");
-
-    auto mget_cmd_str = {"mget", key.c_str(), not_exist_key.c_str()};
-    res.clear();
-    _redis.command(mget_cmd_str.begin(), mget_cmd_str.end(), std::back_inserter(res));
-    REDIS_ASSERT(res.size() == 2 && res[0] && *res[0] == "new_value" && !res[1],
-            "failed to test generic command");
-
-#ifdef REDIS_PLUS_PLUS_HAS_VARIANT
-
-    _redis.hmset(key_var, {std::make_pair("a", "abc"), std::make_pair("b", "1.2")});
-    std::unordered_map<std::string, Variant<double, std::string>> var_result;
-    _redis.hgetall(key_var, std::inserter(var_result, var_result.begin()));
-    REDIS_ASSERT(var_result.size() == 2
-            && std::get<std::string>(var_result["a"]) == "abc"
-            && (std::get<double>(var_result["b"]) - 1.2) < 0.01,
-            "failed to test generic command with variant reply");
-
-    std::unordered_map<std::string, Variant<long long, Monostate>> var_with_monostate;
-    _redis.hgetall(key_var, std::inserter(var_with_monostate, var_with_monostate.begin()));
-    REDIS_ASSERT(var_with_monostate.size() == 2
-            && std::holds_alternative<Monostate>(var_with_monostate["a"])
-            && std::holds_alternative<Monostate>(var_with_monostate["b"]),
-            "failed to test generic command with variant reply");
-
-#endif
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_hash_tag() {
-    _test_hash_tag({_test_key("{tag}postfix1"),
-                    _test_key("{tag}postfix2"),
-                    _test_key("{tag}postfix3")});
-
-    _test_hash_tag({_test_key("prefix1{tag}postfix1"),
-                    _test_key("prefix2{tag}postfix2"),
-                    _test_key("prefix3{tag}postfix3")});
-
-    _test_hash_tag({_test_key("prefix1{tag}"),
-                    _test_key("prefix2{tag}"),
-                    _test_key("prefix3{tag}")});
-
-    _test_hash_tag({_test_key("prefix{}postfix"),
-                    _test_key("prefix{}postfix"),
-                    _test_key("prefix{}postfix")});
-
-    _test_hash_tag({_test_key("prefix1{tag}post}fix1"),
-                    _test_key("prefix2{tag}pos}tfix2"),
-                    _test_key("prefix3{tag}postfi}x3")});
-
-    _test_hash_tag({_test_key("prefix1{t{ag}postfix1"),
-                    _test_key("prefix2{t{ag}postfix2"),
-                    _test_key("prefix3{t{ag}postfix3")});
-
-    _test_hash_tag({_test_key("prefix1{t{ag}postfi}x1"),
-                    _test_key("prefix2{t{ag}post}fix2"),
-                    _test_key("prefix3{t{ag}po}stfix3")});
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_hash_tag(std::initializer_list<std::string> keys) {
-    KeyDeleter<RedisInstance> deleter(_redis, keys.begin(), keys.end());
-
-    std::string value = "value";
-    std::vector<std::pair<std::string, std::string>> kvs;
-    for (const auto &key : keys) {
-        kvs.emplace_back(key, value);
-    }
-
-    _redis.mset(kvs.begin(), kvs.end());
-
-    std::vector<OptionalString> res;
-    res.reserve(keys.size());
-    _redis.mget(keys.begin(), keys.end(), std::back_inserter(res));
-
-    REDIS_ASSERT(res.size() == keys.size(), "failed to test hash tag");
-
-    for (const auto &ele : res) {
-        REDIS_ASSERT(ele && *ele == value, "failed to test hash tag");
-    }
-}
-
-template <typename RedisInstance>
-std::string SanityTest<RedisInstance>::_test_key(const std::string &key) {
-    REDIS_ASSERT(key.size() > 1, "failed to generate key");
-
-    // Ensure that key prefix has NO hash tag. Also see the implementation of test_key.
-    return key.substr(1);
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_ping(Redis &instance) {
-    auto reply = instance.command("ping");
-    REDIS_ASSERT(reply && reply::parse<std::string>(*reply) == "PONG",
-            "failed to test generic command");
-
-    auto pong = instance.command<std::string>("ping");
-    REDIS_ASSERT(pong == "PONG", "failed to test generic command");
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_pipeline(const StringView &key, Pipeline &pipeline) {
-    auto pipe_replies = pipeline.command("set", key, "value").command("get", key).exec();
-    auto val = pipe_replies.get<OptionalString>(1);
-    REDIS_ASSERT(val && *val == "value", "failed to test generic command");
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_transaction(const StringView &key, Transaction &transaction) {
-    auto tx_replies = transaction.command("set", key, 456).command("incr", key).exec();
-    REDIS_ASSERT(tx_replies.get<long long>(1) == 457, "failed to test generic command");
-}
-
-template <typename RedisInstance>
-Pipeline SanityTest<RedisInstance>::_pipeline(const StringView &) {
-    return _redis.pipeline();
-}
-
-template <>
-inline Pipeline SanityTest<RedisCluster>::_pipeline(const StringView &key) {
-    return _redis.pipeline(key);
-}
-
-template <typename RedisInstance>
-Transaction SanityTest<RedisInstance>::_transaction(const StringView &) {
-    return _redis.transaction();
-}
-
-template <>
-inline Transaction SanityTest<RedisCluster>::_transaction(const StringView &key) {
-    return _redis.transaction(key);
-}
-
-template <typename RedisInstance>
-void SanityTest<RedisInstance>::_test_uri() {
-    auto opts = ConnectionOptions("tcp://user:pass@127.0.0.1:7000/1");
-    REDIS_ASSERT(opts.user == "user" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 7000
-            && opts.db == 1 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://user:pass@127.0.0.1:7000");
-    REDIS_ASSERT(opts.user == "user" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 7000
-            && opts.db == 0 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://user:pass@127.0.0.1/1");
-    REDIS_ASSERT(opts.user == "user" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 6379
-            && opts.db == 1 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://user:pass@127.0.0.1");
-    REDIS_ASSERT(opts.user == "user" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 6379
-            && opts.db == 0 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://pass@127.0.0.1");
-    REDIS_ASSERT(opts.user == "default" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 6379
-            && opts.db == 0 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://pass@127.0.0.1/1");
-    REDIS_ASSERT(opts.user == "default" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 6379
-            && opts.db == 1 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://pass@127.0.0.1:7000/1");
-    REDIS_ASSERT(opts.user == "default" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 7000
-            && opts.db == 1 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://user:@127.0.0.1:7000/1");
-    REDIS_ASSERT(opts.user == "user" && opts.password == ""
-            && opts.host == "127.0.0.1" && opts.port == 7000
-            && opts.db == 1 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://user:@127.0.0.1:7000");
-    REDIS_ASSERT(opts.user == "user" && opts.password == ""
-            && opts.host == "127.0.0.1" && opts.port == 7000
-            && opts.db == 0 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://user:@127.0.0.1");
-    REDIS_ASSERT(opts.user == "user" && opts.password == ""
-            && opts.host == "127.0.0.1" && opts.port == 6379
-            && opts.db == 0 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://127.0.0.1");
-    REDIS_ASSERT(opts.user == "default" && opts.password == ""
-            && opts.host == "127.0.0.1" && opts.port == 6379
-            && opts.db == 0 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://127.0.0.1:7000");
-    REDIS_ASSERT(opts.user == "default" && opts.password == ""
-            && opts.host == "127.0.0.1" && opts.port == 7000
-            && opts.db == 0 && opts.type == ConnectionType::TCP,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://127.0.0.1:7000/1?keep_alive=true&connect_timeout=300ms&socket_timeout=1s");
-    REDIS_ASSERT(opts.user == "default" && opts.password == ""
-            && opts.host == "127.0.0.1" && opts.port == 7000
-            && opts.db == 1 && opts.type == ConnectionType::TCP
-            && opts.keep_alive && opts.connect_timeout == std::chrono::milliseconds(300)
-            && opts.socket_timeout == std::chrono::seconds(1),
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://pass@127.0.0.1:7000?connect_timeout=300ms&socket_timeout=1s");
-    REDIS_ASSERT(opts.user == "default" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 7000
-            && opts.db == 0 && opts.type == ConnectionType::TCP
-            && opts.connect_timeout == std::chrono::milliseconds(300)
-            && opts.socket_timeout == std::chrono::seconds(1),
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("tcp://user:pass@127.0.0.1?connect_timeout=300ms&socket_timeout=1s&keep_alive=false");
-    REDIS_ASSERT(opts.user == "user" && opts.password == "pass"
-            && opts.host == "127.0.0.1" && opts.port == 6379
-            && opts.db == 0 && opts.type == ConnectionType::TCP
-            && opts.connect_timeout == std::chrono::milliseconds(300)
-            && opts.socket_timeout == std::chrono::seconds(1) && !opts.keep_alive,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("unix://user:pass@path/to/unix/domain.sock/1");
-    REDIS_ASSERT(opts.user == "user" && opts.password == "pass"
-            && opts.path == "path/to/unix/domain.sock"
-            && opts.db == 1 && opts.type == ConnectionType::UNIX,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("unix://user:pass@path/to/unix/domain.sock");
-    REDIS_ASSERT(opts.user == "user" && opts.password == "pass"
-            && opts.path == "path/to/unix/domain.sock"
-            && opts.db == 0 && opts.type == ConnectionType::UNIX,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("unix://pass@path/to/unix/domain.sock");
-    REDIS_ASSERT(opts.user == "default" && opts.password == "pass"
-            && opts.path == "path/to/unix/domain.sock"
-            && opts.db == 0 && opts.type == ConnectionType::UNIX,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("unix://user:@path/to/unix/domain.sock");
-    REDIS_ASSERT(opts.user == "user" && opts.password == ""
-            && opts.path == "path/to/unix/domain.sock"
-            && opts.db == 0 && opts.type == ConnectionType::UNIX,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("unix://path/to/unix/domain.sock");
-    REDIS_ASSERT(opts.user == "default" && opts.password == ""
-            && opts.path == "path/to/unix/domain.sock"
-            && opts.db == 0 && opts.type == ConnectionType::UNIX,
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("unix://path/to/unix/domain.sock?keep_alive=false&socket_timeout=100ms");
-    REDIS_ASSERT(opts.user == "default" && opts.password == ""
-            && opts.path == "path/to/unix/domain.sock"
-            && opts.db == 0 && opts.type == ConnectionType::UNIX
-            && !opts.keep_alive && opts.socket_timeout == std::chrono::milliseconds(100),
-            "failed to test uri construction");
-
-    opts = ConnectionOptions("unix://user:pass@path/to/unix/domain.sock/1?connect_timeout=1s&keep_alive=true&socket_timeout=100ms");
-    REDIS_ASSERT(opts.user == "user" && opts.password == "pass"
-            && opts.path == "path/to/unix/domain.sock"
-            && opts.db == 1 && opts.type == ConnectionType::UNIX
-            && opts.connect_timeout == std::chrono::seconds(1) && opts.keep_alive
-            && opts.socket_timeout == std::chrono::milliseconds(100),
-            "failed to test uri construction");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SANITY_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/script_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/script_cmds_test.h
deleted file mode 100644
index f7adb11b6..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/script_cmds_test.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ScriptCmdTest {
-public:
-    explicit ScriptCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _run(Redis &instance);
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "script_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/script_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/script_cmds_test.hpp
deleted file mode 100644
index 86a0e7dfd..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/script_cmds_test.hpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_HPP
-
-#include <list>
-#include <vector>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ScriptCmdTest<RedisInstance>::run() {
-    cluster_specializing_test(*this,
-            &ScriptCmdTest<RedisInstance>::_run,
-            _redis);
-}
-
-template <typename RedisInstance>
-void ScriptCmdTest<RedisInstance>::_run(Redis &instance) {
-    auto key1 = test_key("k1");
-    auto key2 = test_key("k2");
-
-    KeyDeleter<Redis> deleter(instance, {key1, key2});
-
-    std::string script = "redis.call('set', KEYS[1], 1);"
-                    "redis.call('set', KEYS[2], 2);"
-                    "local first = redis.call('get', KEYS[1]);"
-                    "local second = redis.call('get', KEYS[2]);"
-                    "return first + second";
-
-    std::initializer_list<StringView> keys = {key1, key2};
-    std::initializer_list<StringView> empty_list = {};
-
-    auto num = instance.eval<long long>(script, keys, empty_list);
-    REDIS_ASSERT(num == 3, "failed to test scripting for cluster");
-
-    num = instance.eval<long long>(script, keys.begin(), keys.end(),
-            empty_list.begin(), empty_list.end());
-    REDIS_ASSERT(num == 3, "failed to test scripting for cluster");
-
-    script = "return 1";
-    num = instance.eval<long long>(script, empty_list, empty_list);
-    REDIS_ASSERT(num == 1, "failed to test eval");
-
-    num = instance.eval<long long>(script, empty_list.begin(), empty_list.end(),
-            empty_list.begin(), empty_list.end());
-    REDIS_ASSERT(num == 1, "failed to test eval");
-
-    auto script_with_args = "return {ARGV[1] + 1, ARGV[2] + 2, ARGV[3] + 3}";
-    std::initializer_list<StringView> args = {"1", "2", "3"};
-    std::vector<long long> res;
-    instance.eval(script_with_args,
-                empty_list,
-                args,
-                std::back_inserter(res));
-    REDIS_ASSERT(res == std::vector<long long>({2, 4, 6}),
-            "failed to test eval with array reply");
-
-    res.clear();
-    instance.eval(script_with_args,
-                empty_list.begin(), empty_list.end(),
-                args.begin(), args.end(),
-                std::back_inserter(res));
-    REDIS_ASSERT(res == std::vector<long long>({2, 4, 6}),
-            "failed to test eval with array reply");
-
-    auto sha1 = instance.script_load(script);
-    num = instance.evalsha<long long>(sha1, {}, {});
-    REDIS_ASSERT(num == 1, "failed to test evalsha");
-
-    num = instance.evalsha<long long>(sha1, empty_list.begin(), empty_list.end(),
-            empty_list.begin(), empty_list.end());
-    REDIS_ASSERT(num == 1, "failed to test evalsha");
-
-    auto sha2 = instance.script_load(script_with_args);
-    res.clear();
-    instance.evalsha(sha2,
-                    empty_list,
-                    args,
-                    std::back_inserter(res));
-    REDIS_ASSERT(res == std::vector<long long>({2, 4, 6}),
-            "failed to test evalsha with array reply");
-
-    res.clear();
-    instance.evalsha(sha2,
-                    empty_list.begin(), empty_list.end(),
-                    args.begin(), args.end(),
-                    std::back_inserter(res));
-    REDIS_ASSERT(res == std::vector<long long>({2, 4, 6}),
-            "failed to test evalsha with array reply");
-
-    std::list<bool> exist_res;
-    instance.script_exists({sha1, sha2, std::string("not exist")}, std::back_inserter(exist_res));
-    REDIS_ASSERT(exist_res == std::list<bool>({true, true, false}),
-            "failed to test script exists");
-
-    REDIS_ASSERT(instance.script_exists(sha1), "failed to test script exists");
-    REDIS_ASSERT(!instance.script_exists("not exist"), "failed to test script exists");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SCRIPT_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/set_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/set_cmds_test.h
deleted file mode 100644
index c5320d793..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/set_cmds_test.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class SetCmdTest {
-public:
-    explicit SetCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_set();
-
-    void _test_multi_set();
-
-    void _test_sscan();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "set_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/set_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/set_cmds_test.hpp
deleted file mode 100644
index 1a4c24bfd..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/set_cmds_test.hpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_HPP
-
-#include <unordered_set>
-#include <vector>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void SetCmdTest<RedisInstance>::run() {
-    _test_set();
-
-    _test_multi_set();
-
-    _test_sscan();
-}
-
-template <typename RedisInstance>
-void SetCmdTest<RedisInstance>::_test_set() {
-    auto key = test_key("set");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::string m1("m1");
-    std::string m2("m2");
-    std::string m3("m3");
-
-    REDIS_ASSERT(_redis.sadd(key, m1) == 1, "failed to test sadd");
-
-    auto members = {m1, m2, m3};
-    REDIS_ASSERT(_redis.sadd(key, members) == 2, "failed to test sadd with multiple members");
-
-    REDIS_ASSERT(_redis.scard(key) == 3, "failed to test scard");
-
-    REDIS_ASSERT(_redis.sismember(key, m1), "failed to test sismember");
-
-    std::unordered_set<std::string> res;
-    _redis.smembers(key, std::inserter(res, res.end()));
-    REDIS_ASSERT(res.find(m1) != res.end()
-            && res.find(m2) != res.end()
-            && res.find(m3) != res.end(),
-                "failed to test smembers");
-
-    auto ele = _redis.srandmember(key);
-    REDIS_ASSERT(bool(ele) && res.find(*ele) != res.end(), "failed to test srandmember");
-
-    std::vector<std::string> rand_members;
-    _redis.srandmember(key, 2, std::back_inserter(rand_members));
-    REDIS_ASSERT(rand_members.size() == 2, "failed to test srandmember");
-
-    ele = _redis.spop(key);
-    REDIS_ASSERT(bool(ele) && res.find(*ele) != res.end(), "failed to test spop");
-
-    rand_members.clear();
-    _redis.spop(key, 3, std::back_inserter(rand_members));
-    REDIS_ASSERT(rand_members.size() == 2, "failed to test srandmember");
-
-    rand_members.clear();
-    _redis.srandmember(key, 2, std::back_inserter(rand_members));
-    REDIS_ASSERT(rand_members.empty(), "failed to test srandmember with empty set");
-
-    _redis.spop(key, 2, std::back_inserter(rand_members));
-    REDIS_ASSERT(rand_members.empty(), "failed to test spop with empty set");
-
-    _redis.sadd(key, members);
-    REDIS_ASSERT(_redis.srem(key, m1) == 1, "failed to test srem");
-    REDIS_ASSERT(_redis.srem(key, members) == 2, "failed to test srem with mulitple members");
-    REDIS_ASSERT(_redis.srem(key, members) == 0, "failed to test srem with mulitple members");
-}
-
-template <typename RedisInstance>
-void SetCmdTest<RedisInstance>::_test_multi_set() {
-    auto k1 = test_key("s1");
-    auto k2 = test_key("s2");
-    auto k3 = test_key("s3");
-    auto k4 = test_key("s4");
-    auto k5 = test_key("s5");
-    auto k6 = test_key("s6");
-
-    KeyDeleter<RedisInstance> keys(_redis, {k1, k2, k3, k4, k5, k6});
-
-    _redis.sadd(k1, {"a", "c"});
-    _redis.sadd(k2, {"a", "b"});
-    std::vector<std::string> sdiff;
-    _redis.sdiff({k1, k1}, std::back_inserter(sdiff));
-    REDIS_ASSERT(sdiff.empty(), "failed to test sdiff");
-
-    _redis.sdiff({k1, k2}, std::back_inserter(sdiff));
-    REDIS_ASSERT(sdiff == std::vector<std::string>({"c"}), "failed to test sdiff");
-
-    _redis.sdiffstore(k3, {k1, k2});
-    sdiff.clear();
-    _redis.smembers(k3, std::back_inserter(sdiff));
-    REDIS_ASSERT(sdiff == std::vector<std::string>({"c"}), "failed to test sdiffstore");
-
-    REDIS_ASSERT(_redis.sdiffstore(k3, k1) == 2, "failed to test sdiffstore");
-
-    REDIS_ASSERT(_redis.sinterstore(k3, k1) == 2, "failed to test sinterstore");
-
-    REDIS_ASSERT(_redis.sunionstore(k3, k1) == 2, "failed to test sunionstore");
-
-    std::vector<std::string> sinter;
-    _redis.sinter({k1, k2}, std::back_inserter(sinter));
-    REDIS_ASSERT(sinter == std::vector<std::string>({"a"}), "failed to test sinter");
-
-    _redis.sinterstore(k4, {k1, k2});
-    sinter.clear();
-    _redis.smembers(k4, std::back_inserter(sinter));
-    REDIS_ASSERT(sinter == std::vector<std::string>({"a"}), "failed to test sinterstore");
-
-    std::unordered_set<std::string> sunion;
-    _redis.sunion({k1, k2}, std::inserter(sunion, sunion.end()));
-    REDIS_ASSERT(sunion == std::unordered_set<std::string>({"a", "b", "c"}),
-            "failed to test sunion");
-
-    _redis.sunionstore(k5, {k1, k2});
-    sunion.clear();
-    _redis.smembers(k5, std::inserter(sunion, sunion.end()));
-    REDIS_ASSERT(sunion == std::unordered_set<std::string>({"a", "b", "c"}),
-            "failed to test sunionstore");
-
-    REDIS_ASSERT(_redis.smove(k5, k6, "a"), "failed to test smove");
-}
-
-template <typename RedisInstance>
-void SetCmdTest<RedisInstance>::_test_sscan() {
-    auto key = test_key("sscan");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::unordered_set<std::string> members = {"m1", "m2", "m3"};
-    _redis.sadd(key, members.begin(), members.end());
-
-    std::unordered_set<std::string> res;
-    long long cursor = 0;
-    while (true) {
-        cursor = _redis.sscan(key, cursor, "m*", 1, std::inserter(res, res.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-
-    REDIS_ASSERT(res == members, "failed to test sscan");
-
-    res.clear();
-    cursor = 0;
-    while (true) {
-        cursor = _redis.sscan(key, cursor, std::inserter(res, res.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-
-    REDIS_ASSERT(res == members, "failed to test sscan");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_SET_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/stream_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/stream_cmds_test.h
deleted file mode 100644
index 24873a8b4..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/stream_cmds_test.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class StreamCmdsTest {
-public:
-    explicit StreamCmdsTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    using Item = std::pair<std::string, std::unordered_map<std::string, std::string>>;
-    using Result = std::unordered_map<std::string, std::vector<Item>>;
-
-    void _test_stream_cmds();
-
-    void _test_group_cmds();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "stream_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/stream_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/stream_cmds_test.hpp
deleted file mode 100644
index 5926f2540..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/stream_cmds_test.hpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_HPP
-
-#include <vector>
-#include <string>
-#include <thread>
-#include <chrono>
-#include <unordered_map>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void StreamCmdsTest<RedisInstance>::run() {
-    _test_stream_cmds();
-
-    _test_group_cmds();
-}
-
-template <typename RedisInstance>
-void StreamCmdsTest<RedisInstance>::_test_stream_cmds() {
-    auto key = test_key("stream");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::vector<std::pair<std::string, std::string>> attrs = {
-        {"f1", "v1"},
-        {"f2", "v2"}
-    };
-    const std::vector<std::string> ids = {"1565427842-0", "1565427842-1"};
-    REDIS_ASSERT(_redis.xadd(key, ids.at(0), attrs.begin(), attrs.end()) == ids.at(0),
-            "failed to test xadd");
-
-    std::vector<std::pair<std::string, std::string>> keys = {std::make_pair(key, "0-0")};
-    Result result;
-    _redis.xread(keys.begin(), keys.end(), 1, std::inserter(result, result.end()));
-
-    REDIS_ASSERT(result.size() == 1
-            && result.find(key) != result.end()
-            && result[key].size() == 1
-            && result[key].at(0).first == ids.at(0)
-            && result[key].at(0).second.size() == 2,
-            "failed to test xread");
-
-    result.clear();
-    _redis.xread(key, std::string("0-0"), 1, std::inserter(result, result.end()));
-
-    REDIS_ASSERT(result.size() == 1
-            && result.find(key) != result.end()
-            && result[key].size() == 1
-            && result[key].at(0).first == ids.at(0)
-            && result[key].at(0).second.size() == 2,
-            "failed to test xread");
-
-    result.clear();
-    keys = {std::make_pair(key, ids.at(0))};
-    _redis.xread(keys.begin(),
-                    keys.end(),
-                    std::chrono::seconds(1),
-                    2,
-                    std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xread");
-
-    _redis.xread(key,
-                    ids.at(0),
-                    std::chrono::seconds(1),
-                    2,
-                    std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xread");
-
-    REDIS_ASSERT(_redis.xadd(key, ids.at(1),
-                             attrs.begin(),
-                             attrs.end()) == ids.at(1),
-                 "failed to test xadd");
-
-    REDIS_ASSERT(_redis.xlen(key) == 2, "failed to test xlen");
-
-    std::vector<Item> items;
-    _redis.xrange(key, "-", "+", 2, std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 2 &&
-                 items.at(0).first == ids.at(0) &&
-                 items.at(1).first == ids.at(1),
-                 "failed to test xrange with count");
-
-    items.clear();
-    _redis.xrange(key, "-", "+", 1, std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 &&
-                 items.at(0).first == ids.at(0),
-                 "failed to test xrange with count");
-
-    items.clear();
-    _redis.xrevrange(key, "+", "-", 2, std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 2 &&
-                 items.at(0).first == ids.at(1) &&
-                 items.at(1).first == ids.at(0),
-                 "failed to test xrevrange with count");
-
-    items.clear();
-    _redis.xrevrange(key, "+", "-", 1, std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 &&
-                 items.at(0).first == ids.at(1),
-                 "failed to test xrevrange with count");
-
-    REDIS_ASSERT(_redis.xtrim(key, 1, false) == 1, "failed to test xtrim");
-
-    items.clear();
-    _redis.xrange(key, "-", "+", std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 && items[0].first == ids.at(1),
-                 "failed to test xrange");
-
-    items.clear();
-    _redis.xrevrange(key, "+", "-", std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 && items[0].first == ids.at(1),
-                 "failed to test xrevrange");
-
-    REDIS_ASSERT(_redis.xdel(key, {ids.at(1), std::string("111-111")}) == 1,
-                 "failed to test xdel");
-}
-
-template <typename RedisInstance>
-void StreamCmdsTest<RedisInstance>::_test_group_cmds() {
-    auto key = test_key("stream");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto group = "group";
-    auto consumer1 = "consumer1";
-
-    _redis.xgroup_create(key, group, "$", true);
-
-    std::vector<std::pair<std::string, std::string>> attrs = {
-        {"f1", "v1"},
-        {"f2", "v2"}
-    };
-    auto id = _redis.xadd(key, "*", attrs.begin(), attrs.end());
-    auto keys = {std::make_pair(key, ">")};
-
-    Result result;
-    _redis.xreadgroup(group,
-            consumer1,
-            keys.begin(),
-            keys.end(),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 1
-            && result.find(key) != result.end()
-            && result[key].size() == 1
-            && result[key][0].first == id,
-            "failed to test xreadgroup");
-
-    result.clear();
-    _redis.xreadgroup(group,
-            consumer1,
-            key,
-            std::string(">"),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xreadgroup");
-
-    result.clear();
-    _redis.xreadgroup(group,
-            "not-exist-consumer",
-            keys.begin(),
-            keys.end(),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xreadgroup");
-
-    result.clear();
-    _redis.xreadgroup(group,
-            consumer1,
-            keys.begin(),
-            keys.end(),
-            std::chrono::seconds(1),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xreadgroup");
-
-    result.clear();
-    _redis.xreadgroup(group,
-            consumer1,
-            key,
-            ">",
-            std::chrono::seconds(1),
-            1,
-            std::inserter(result, result.end()));
-    REDIS_ASSERT(result.size() == 0, "failed to test xreadgroup");
-
-    using PendingResult = std::vector<std::tuple<std::string, std::string, long long, long long>>;
-    PendingResult pending_result;
-    _redis.xpending(key, group, "-", "+", 1, consumer1, std::back_inserter(pending_result));
-
-    REDIS_ASSERT(pending_result.size() == 1
-            && std::get<0>(pending_result[0]) == id
-            && std::get<1>(pending_result[0]) == consumer1,
-            "failed to test xpending");
-
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-
-    auto consumer2 = "consumer2";
-    std::vector<Item> items;
-    auto ids = {id};
-    _redis.xclaim(key,
-            group,
-            consumer2,
-            std::chrono::milliseconds(10),
-            ids,
-            std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 && items[0].first == id, "failed to test xclaim");
-
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-
-    items.clear();
-    _redis.xclaim(key, group, consumer1, std::chrono::milliseconds(10), id, std::back_inserter(items));
-    REDIS_ASSERT(items.size() == 1 && items[0].first == id, "failed to test xclaim: " + std::to_string(items.size()));
-
-    _redis.xack(key, group, id);
-
-    REDIS_ASSERT(_redis.xgroup_delconsumer(key, group, consumer1) == 0,
-            "failed to test xgroup_delconsumer");
-
-    REDIS_ASSERT(_redis.xgroup_delconsumer(key, group, consumer2) == 0,
-            "failed to test xgroup_delconsumer");
-
-    REDIS_ASSERT(_redis.xgroup_destroy(key, group) == 1,
-            "failed to test xgroup_destroy");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_STREAM_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/string_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/string_cmds_test.h
deleted file mode 100644
index 86788b2bc..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/string_cmds_test.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class StringCmdTest {
-public:
-    explicit StringCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_str();
-
-    void _test_bit();
-
-    void _test_numeric();
-
-    void _test_getset();
-
-    void _test_mgetset();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "string_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/string_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/string_cmds_test.hpp
deleted file mode 100644
index cf702e433..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/string_cmds_test.hpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_HPP
-
-#include <vector>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::run() {
-    _test_str();
-
-    _test_bit();
-
-    _test_numeric();
-
-    _test_getset();
-
-    _test_mgetset();
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_str() {
-    auto key = test_key("str");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::string val("value");
-
-    long long val_size = val.size();
-
-    auto len1 = _redis.append(key, val);
-    REDIS_ASSERT(len1 == val_size, "failed to append to non-existent key");
-
-    auto len2 = _redis.append(key, val);
-    REDIS_ASSERT(len2 == len1 + val_size, "failed to append to non-empty string");
-
-    auto len3 = _redis.append(key, {});
-    REDIS_ASSERT(len3 == len2, "failed to append empty string");
-
-    auto len4 = _redis.strlen(key);
-    REDIS_ASSERT(len4 == len3, "failed to test strlen");
-
-    REDIS_ASSERT(_redis.del(key) == 1, "failed to remove key");
-
-    auto len5 = _redis.append(key, {});
-    REDIS_ASSERT(len5 == 0, "failed to append empty string to non-existent key");
-
-    _redis.del(key);
-
-    REDIS_ASSERT(_redis.getrange(key, 0, 2) == "", "failed to test getrange on non-existent key");
-
-    _redis.set(key, val);
-
-    REDIS_ASSERT(_redis.getrange(key, 1, 2) == val.substr(1, 2), "failed to test getrange");
-
-    long long new_size = val.size() * 2;
-    REDIS_ASSERT(_redis.setrange(key, val.size(), val) == new_size, "failed to test setrange");
-    REDIS_ASSERT(_redis.getrange(key, 0, -1) == val + val, "failed to test setrange");
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_bit() {
-    auto key = test_key("bit");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    REDIS_ASSERT(_redis.bitcount(key) == 0, "failed to test bitcount on non-existent key");
-
-    REDIS_ASSERT(_redis.getbit(key, 5) == 0, "failed to test getbit");
-
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 1, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 3, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 7, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 10, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 10, 0) == 1,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 11, 1) == 0,
-            "failed to test setbit");
-    REDIS_ASSERT(_redis.template command<long long>("SETBIT", key, 21, 1) == 0,
-            "failed to test setbit");
-
-    // key -> 01010001, 00010000, 00000100
-
-    REDIS_ASSERT(_redis.getbit(key, 1) == 1, "failed to test getbit");
-    REDIS_ASSERT(_redis.getbit(key, 2) == 0, "failed to test getbit");
-    REDIS_ASSERT(_redis.getbit(key, 7) == 1, "failed to test getbit");
-    REDIS_ASSERT(_redis.getbit(key, 10) == 0, "failed to test getbit");
-    REDIS_ASSERT(_redis.getbit(key, 100) == 0, "failed to test getbit");
-
-    REDIS_ASSERT(_redis.bitcount(key) == 5, "failed to test bitcount");
-    REDIS_ASSERT(_redis.bitcount(key, 0, 0) == 3, "failed to test bitcount");
-    REDIS_ASSERT(_redis.bitcount(key, 0, 1) == 4, "failed to test bitcount");
-    REDIS_ASSERT(_redis.bitcount(key, -2, -1) == 2, "failed to test bitcount");
-
-    REDIS_ASSERT(_redis.bitpos(key, 1) == 1, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 0) == 0, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 1, 1, 1) == 11, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 0, 1, 1) == 8, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 1, -1, -1) == 21, "failed to test bitpos");
-    REDIS_ASSERT(_redis.bitpos(key, 0, -1, -1) == 16, "failed to test bitpos");
-
-    auto dest_key = test_key("bitop_dest");
-    auto src_key1 = test_key("bitop_src1");
-    auto src_key2 = test_key("bitop_src2");
-
-    KeyDeleter<RedisInstance> deleters(_redis, {dest_key, src_key1, src_key2});
-
-    // src_key1 -> 00010000
-    _redis.template command<long long>("SETBIT", src_key1, 3, 1);
-
-    // src_key2 -> 00000000, 00001000
-    _redis.template command<long long>("SETBIT", src_key2, 12, 1);
-
-    REDIS_ASSERT(_redis.bitop(BitOp::AND, dest_key, {src_key1, src_key2}) == 2,
-            "failed to test bitop");
-
-    // dest_key -> 00000000, 00000000
-    auto v = _redis.get(dest_key);
-    REDIS_ASSERT(v && *v == std::string(2, 0), "failed to test bitop");
-
-    REDIS_ASSERT(_redis.bitop(BitOp::NOT, dest_key, src_key1) == 1,
-            "failed to test bitop");
-
-    // dest_key -> 11101111
-    v = _redis.get(dest_key);
-    REDIS_ASSERT(v && *v == std::string(1, '\xEF'), "failed to test bitop");
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_numeric() {
-    auto key = test_key("numeric");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    REDIS_ASSERT(_redis.incr(key) == 1, "failed to test incr");
-    REDIS_ASSERT(_redis.decr(key) == 0, "failed to test decr");
-    REDIS_ASSERT(_redis.incrby(key, 3) == 3, "failed to test incrby");
-    REDIS_ASSERT(_redis.decrby(key, 3) == 0, "failed to test decrby");
-    REDIS_ASSERT(_redis.incrby(key, -3) == -3, "failed to test incrby");
-    REDIS_ASSERT(_redis.decrby(key, -3) == 0, "failed to test incrby");
-    REDIS_ASSERT(_redis.incrbyfloat(key, 1.5) == 1.5, "failed to test incrbyfloat");
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_getset() {
-    auto key = test_key("getset");
-    auto non_exist_key = test_key("non-existent");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key, non_exist_key});
-
-    std::string val("value");
-    REDIS_ASSERT(_redis.set(key, val), "failed to test set");
-
-    auto v = _redis.get(key);
-    REDIS_ASSERT(v && *v == val, "failed to test get");
-
-    v = _redis.getset(key, val + val);
-    REDIS_ASSERT(v && *v == val, "failed to test get");
-
-    REDIS_ASSERT(!_redis.set(key, val, std::chrono::milliseconds(0), UpdateType::NOT_EXIST),
-            "failed to test set with NOT_EXIST type");
-    REDIS_ASSERT(!_redis.set(non_exist_key, val, std::chrono::milliseconds(0), UpdateType::EXIST),
-            "failed to test set with EXIST type");
-
-    REDIS_ASSERT(!_redis.setnx(key, val), "failed to test setnx");
-    REDIS_ASSERT(_redis.setnx(non_exist_key, val), "failed to test setnx");
-
-    auto ttl = std::chrono::seconds(10);
-
-    _redis.set(key, val, ttl);
-    REDIS_ASSERT(_redis.ttl(key) <= ttl.count(), "failed to test set key with ttl");
-
-    _redis.setex(key, ttl, val);
-    REDIS_ASSERT(_redis.ttl(key) <= ttl.count(), "failed to test setex");
-
-    auto pttl = std::chrono::milliseconds(10000);
-
-    _redis.psetex(key, ttl, val);
-    REDIS_ASSERT(_redis.pttl(key) <= pttl.count(), "failed to test psetex");
-}
-
-template <typename RedisInstance>
-void StringCmdTest<RedisInstance>::_test_mgetset() {
-    auto kvs = {std::make_pair(test_key("k1"), "v1"),
-                std::make_pair(test_key("k2"), "v2"),
-                std::make_pair(test_key("k3"), "v3")};
-
-    std::vector<std::string> keys;
-    std::vector<std::string> vals;
-    for (const auto &kv : kvs) {
-        keys.push_back(kv.first);
-        vals.push_back(kv.second);
-    }
-
-    KeyDeleter<RedisInstance> deleter(_redis, keys.begin(), keys.end());
-
-    _redis.mset(kvs);
-
-    std::vector<OptionalString> res;
-    _redis.mget(keys.begin(), keys.end(), std::back_inserter(res));
-
-    REDIS_ASSERT(res.size() == kvs.size(), "failed to test mget");
-
-    std::vector<std::string> res_vals;
-    for (const auto &ele : res) {
-        REDIS_ASSERT(bool(ele), "failed to test mget");
-
-        res_vals.push_back(*ele);
-    }
-
-    REDIS_ASSERT(vals == res_vals, "failed to test mget");
-
-    REDIS_ASSERT(!_redis.msetnx(kvs), "failed to test msetnx");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_STRING_CMDS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/test_main.cpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/test_main.cpp
deleted file mode 100644
index d52c7b7cc..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/test_main.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifdef _MSC_VER
-
-#include <unordered_map>
-#include <vector>
-
-#else
-
-#include <unistd.h> // for getopt on non-Windows platform
-
-#endif
-
-#include <string>
-#include <chrono>
-#include <tuple>
-#include <iostream>
-#include <sw/redis++/redis++.h>
-#include "sanity_test.h"
-#include "connection_cmds_test.h"
-#include "keys_cmds_test.h"
-#include "string_cmds_test.h"
-#include "list_cmds_test.h"
-#include "hash_cmds_test.h"
-#include "set_cmds_test.h"
-#include "zset_cmds_test.h"
-#include "hyperloglog_cmds_test.h"
-#include "geo_cmds_test.h"
-#include "script_cmds_test.h"
-#include "pubsub_test.h"
-#include "pipeline_transaction_test.h"
-#include "threads_test.h"
-#include "stream_cmds_test.h"
-#include "benchmark_test.h"
-
-namespace {
-
-#ifdef _MSC_VER
-
-// A simple implementation of `getopt` on Windows platform.
-
-char *optarg = nullptr;
-int optind = 1;
-
-int getopt(int argc, char **argv, const char *optstring);
-
-#endif
-
-struct TestOptions {
-    bool run_thread_test = false;
-};
-
-void print_help();
-
-auto parse_options(int argc, char **argv)
-    -> std::tuple<sw::redis::Optional<sw::redis::ConnectionOptions>,
-                    sw::redis::Optional<sw::redis::ConnectionOptions>,
-                    sw::redis::Optional<sw::redis::test::BenchmarkOptions>,
-                    TestOptions>;
-
-template <typename RedisInstance>
-void run_test(const sw::redis::ConnectionOptions &opts, const TestOptions &test_options);
-
-template <typename RedisInstance>
-void run_benchmark(const sw::redis::ConnectionOptions &opts,
-        const sw::redis::test::BenchmarkOptions &benchmark_opts);
-
-}
-
-int main(int argc, char **argv) {
-    try {
-        sw::redis::Optional<sw::redis::ConnectionOptions> opts;
-        sw::redis::Optional<sw::redis::ConnectionOptions> cluster_node_opts;
-        sw::redis::Optional<sw::redis::test::BenchmarkOptions> benchmark_opts;
-        TestOptions test_options;
-        std::tie(opts, cluster_node_opts, benchmark_opts, test_options) = parse_options(argc, argv);
-
-        if (opts) {
-            std::cout << "Testing Redis..." << std::endl;
-
-            if (benchmark_opts) {
-                run_benchmark<sw::redis::Redis>(*opts, *benchmark_opts);
-            } else {
-                run_test<sw::redis::Redis>(*opts, test_options);
-            }
-        }
-
-        if (cluster_node_opts) {
-            std::cout << "Testing RedisCluster..." << std::endl;
-
-            if (benchmark_opts) {
-                run_benchmark<sw::redis::RedisCluster>(*cluster_node_opts, *benchmark_opts);
-            } else {
-                run_test<sw::redis::RedisCluster>(*cluster_node_opts, test_options);
-            }
-        }
-
-        std::cout << "Pass all tests" << std::endl;
-    } catch (const sw::redis::Error &e) {
-        std::cerr << "Test failed: " << e.what() << std::endl;
-        return -1;
-    }
-
-    return 0;
-}
-
-namespace {
-
-#ifdef _MSC_VER
-
-std::vector<std::string> split(const std::string &str) {
-    if (str.empty()) {
-        return {};
-    }
-
-    std::vector<std::string> result;
-
-    std::string::size_type pos = 0;
-    std::string::size_type idx = 0;
-    while (true) {
-        pos = str.find(':', idx);
-        if (pos == std::string::npos) {
-            result.push_back(str.substr(idx));
-            break;
-        }
-
-        result.push_back(str.substr(idx, pos - idx));
-        idx = pos + 1;
-    }
-
-    return result;
-}
-
-std::unordered_map<char, bool> parse_opt_map(const std::string &opts) {
-    auto fields = split(opts);
-    if (fields.empty()) {
-        return {};
-    }
-
-    std::unordered_map<char, bool> opt_map;
-    for (auto iter = fields.begin(); iter != fields.end() - 1; ++iter) {
-        const auto &field = *iter;
-        if (field.empty()) {
-            continue;
-        }
-
-        for (auto it = field.begin(); it != field.end() - 1; ++it) {
-            opt_map.emplace(*it, false);
-        }
-
-        opt_map.emplace(field.back(), true);
-    }
-
-    const auto &last_opts = fields.back();
-    if (!last_opts.empty()) {
-        for (auto c : last_opts) {
-            opt_map.emplace(c, false);
-        }
-    }
-
-    return opt_map;
-}
-
-int getopt(int argc, char **argv, const char *optstring) {
-    if (argc < 1 || argv == nullptr || optstring == nullptr || optind >= argc) {
-        return -1;
-    }
-
-    auto opt_map = parse_opt_map(optstring);
-
-    std::string opt = *(argv + optind);
-    if (opt.size() != 2 || opt.front() != '-') {
-        return -1;
-    }
-
-    auto result = opt.back();
-    auto iter = opt_map.find(result);
-    if (iter == opt_map.end()) {
-        return -1;
-    }
-
-    ++optind;
-
-    if (iter->second) {
-        if (optind == argc) {
-            return -1;
-        }
-
-        optarg = *(argv + optind);
-
-        ++optind;
-    }
-
-    return result;
-}
-
-#endif
-
-void print_help() {
-    std::cerr << "Usage: test_redis++ -h host -p port"
-        << " -n cluster_node -c cluster_port [-a auth] [-b] [-e key_prefix]\n\n";
-    std::cerr << "See https://github.com/sewenew/redis-plus-plus#run-tests-optional"
-        << " for details on how to run test" << std::endl;
-}
-
-auto parse_options(int argc, char **argv)
-    -> std::tuple<sw::redis::Optional<sw::redis::ConnectionOptions>,
-                    sw::redis::Optional<sw::redis::ConnectionOptions>,
-                    sw::redis::Optional<sw::redis::test::BenchmarkOptions>,
-                    TestOptions> {
-    std::string host;
-    int port = 0;
-    std::string auth;
-    std::string cluster_node;
-    int cluster_port = 0;
-    bool benchmark = false;
-    sw::redis::test::BenchmarkOptions tmp_benchmark_opts;
-    TestOptions test_options;
-
-    int opt = 0;
-    while ((opt = getopt(argc, argv, "h:p:a:n:c:e:k:v:r:t:bs:m")) != -1) {
-        try {
-            switch (opt) {
-            case 'h':
-                host = optarg;
-                break;
-
-            case 'p':
-                port = std::stoi(optarg);
-                break;
-
-            case 'a':
-                auth = optarg;
-                break;
-
-            case 'n':
-                cluster_node = optarg;
-                break;
-
-            case 'c':
-                cluster_port = std::stoi(optarg);
-                break;
-
-            case 'b':
-                benchmark = true;
-                break;
-
-            case 'k':
-                tmp_benchmark_opts.key_len = std::stoi(optarg);
-                break;
-
-            case 'v':
-                tmp_benchmark_opts.val_len = std::stoi(optarg);
-                break;
-
-            case 'r':
-                tmp_benchmark_opts.total_request_num = std::stoi(optarg);
-                break;
-
-            case 't':
-                tmp_benchmark_opts.thread_num = std::stoi(optarg);
-                break;
-
-            case 's':
-                tmp_benchmark_opts.pool_size = std::stoi(optarg);
-                break;
-
-            case 'm':
-                test_options.run_thread_test = true;
-                break;
-
-            case 'e':
-                sw::redis::test::key_prefix(optarg);
-                break;
-
-            default:
-                throw sw::redis::Error("Unknown command line option");
-                break;
-            }
-        } catch (const sw::redis::Error &e) {
-            print_help();
-            throw;
-        } catch (const std::exception &e) {
-            print_help();
-            throw sw::redis::Error("Invalid command line option");
-        }
-    }
-
-    sw::redis::Optional<sw::redis::ConnectionOptions> opts;
-    if (!host.empty() && port > 0) {
-        sw::redis::ConnectionOptions tmp;
-        tmp.host = host;
-        tmp.port = port;
-        tmp.password = auth;
-
-        opts = sw::redis::Optional<sw::redis::ConnectionOptions>(tmp);
-    }
-
-    sw::redis::Optional<sw::redis::ConnectionOptions> cluster_opts;
-    if (!cluster_node.empty() && cluster_port > 0) {
-        sw::redis::ConnectionOptions tmp;
-        tmp.host = cluster_node;
-        tmp.port = cluster_port;
-        tmp.password = auth;
-
-        cluster_opts = sw::redis::Optional<sw::redis::ConnectionOptions>(tmp);
-    }
-
-    if (!opts && !cluster_opts) {
-        print_help();
-        throw sw::redis::Error("Invalid connection options");
-    }
-
-    sw::redis::Optional<sw::redis::test::BenchmarkOptions> benchmark_opts;
-    if (benchmark) {
-        benchmark_opts = sw::redis::Optional<sw::redis::test::BenchmarkOptions>(tmp_benchmark_opts);
-    }
-
-    return std::make_tuple(std::move(opts), std::move(cluster_opts), std::move(benchmark_opts), test_options);
-}
-
-template <typename RedisInstance>
-void run_test(const sw::redis::ConnectionOptions &opts, const TestOptions &test_options) {
-    auto instance = RedisInstance(opts);
-
-    sw::redis::test::SanityTest<RedisInstance> sanity_test(opts, instance);
-    sanity_test.run();
-
-    std::cout << "Pass sanity tests" << std::endl;
-
-    sw::redis::test::ConnectionCmdTest<RedisInstance> connection_test(instance);
-    connection_test.run();
-
-    std::cout << "Pass connection commands tests" << std::endl;
-
-    sw::redis::test::KeysCmdTest<RedisInstance> keys_test(instance);
-    keys_test.run();
-
-    std::cout << "Pass keys commands tests" << std::endl;
-
-    sw::redis::test::StringCmdTest<RedisInstance> string_test(instance);
-    string_test.run();
-
-    std::cout << "Pass string commands tests" << std::endl;
-
-    sw::redis::test::ListCmdTest<RedisInstance> list_test(instance);
-    list_test.run();
-
-    std::cout << "Pass list commands tests" << std::endl;
-
-    sw::redis::test::HashCmdTest<RedisInstance> hash_test(instance);
-    hash_test.run();
-
-    std::cout << "Pass hash commands tests" << std::endl;
-
-    sw::redis::test::SetCmdTest<RedisInstance> set_test(instance);
-    set_test.run();
-
-    std::cout << "Pass set commands tests" << std::endl;
-
-    sw::redis::test::ZSetCmdTest<RedisInstance> zset_test(instance);
-    zset_test.run();
-
-    std::cout << "Pass zset commands tests" << std::endl;
-
-    sw::redis::test::HyperloglogCmdTest<RedisInstance> hll_test(instance);
-    hll_test.run();
-
-    std::cout << "Pass hyperloglog commands tests" << std::endl;
-
-    sw::redis::test::GeoCmdTest<RedisInstance> geo_test(instance);
-    geo_test.run();
-
-    std::cout << "Pass geo commands tests" << std::endl;
-
-    sw::redis::test::ScriptCmdTest<RedisInstance> script_test(instance);
-    script_test.run();
-
-    std::cout << "Pass script commands tests" << std::endl;
-
-    sw::redis::test::PubSubTest<RedisInstance> pubsub_test(instance);
-    pubsub_test.run();
-
-    std::cout << "Pass pubsub tests" << std::endl;
-
-    sw::redis::test::PipelineTransactionTest<RedisInstance> pipe_tx_test(instance);
-    pipe_tx_test.run();
-
-    std::cout << "Pass pipeline and transaction tests" << std::endl;
-
-    if (test_options.run_thread_test) {
-        sw::redis::test::ThreadsTest<RedisInstance> threads_test(opts);
-        threads_test.run();
-
-        std::cout << "Pass threads tests" << std::endl;
-    }
-
-    sw::redis::test::StreamCmdsTest<RedisInstance> stream_test(instance);
-    stream_test.run();
-
-    std::cout << "Pass stream commands tests" << std::endl;
-}
-
-template <typename RedisInstance>
-void run_benchmark(const sw::redis::ConnectionOptions &opts,
-        const sw::redis::test::BenchmarkOptions &benchmark_opts) {
-    std::cout << "Benchmark test options:" << std::endl;
-    std::cout << "  Thread number: " << benchmark_opts.thread_num << std::endl;
-    std::cout << "  Connection pool size: " << benchmark_opts.pool_size << std::endl;
-    std::cout << "  Length of key: " << benchmark_opts.key_len << std::endl;
-    std::cout << "  Length of value: " << benchmark_opts.val_len << std::endl;
-
-    auto instance = RedisInstance(opts);
-
-    sw::redis::test::BenchmarkTest<RedisInstance> benchmark_test(benchmark_opts, instance);
-    benchmark_test.run();
-}
-
-}
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/threads_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/threads_test.h
deleted file mode 100644
index aee307ec2..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/threads_test.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ThreadsTest {
-public:
-    explicit ThreadsTest(const ConnectionOptions &opts) : _opts(opts) {}
-
-    void run();
-
-private:
-    void _test_multithreads(RedisInstance redis, int threads_num, int times);
-
-    void _test_timeout();
-
-    ConnectionOptions _opts;
-};
-
-}
-
-}
-
-}
-
-#include "threads_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/threads_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/threads_test.hpp
deleted file mode 100644
index 24bee9454..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/threads_test.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_HPP
-
-#include <thread>
-#include <chrono>
-#include <atomic>
-#include <memory>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ThreadsTest<RedisInstance>::run() {
-    // 100 * 10000 = 1 million writes
-    auto thread_num = 100;
-    auto times = 10000;
-
-    // Default pool options: single connection and wait forever.
-    _test_multithreads(RedisInstance(_opts), thread_num, times);
-
-    // Pool with 10 connections.
-    ConnectionPoolOptions pool_opts;
-    pool_opts.size = 10;
-    _test_multithreads(RedisInstance(_opts, pool_opts), thread_num, times);
-
-    _test_timeout();
-}
-
-template <typename RedisInstance>
-void ThreadsTest<RedisInstance>::_test_multithreads(RedisInstance redis,
-        int thread_num,
-        int times) {
-    std::vector<std::string> keys;
-    keys.reserve(thread_num);
-    for (auto idx = 0; idx != thread_num; ++idx) {
-        auto key = test_key("multi-threads::" + std::to_string(idx));
-        keys.push_back(key);
-    }
-
-    using DeleterUPtr = std::unique_ptr<KeyDeleter<RedisInstance>>;
-    std::vector<DeleterUPtr> deleters;
-    for (const auto &key : keys) {
-        deleters.emplace_back(new KeyDeleter<RedisInstance>(redis, key));
-    }
-
-    std::vector<std::thread> workers;
-    workers.reserve(thread_num);
-    for (const auto &key : keys) {
-        workers.emplace_back([&redis, key, times]() {
-                                try {
-                                    for (auto i = 0; i != times; ++i) {
-                                        redis.incr(key);
-                                    }
-                                } catch (...) {
-                                    // Something bad happens.
-                                    return;
-                                }
-                            });
-    }
-
-    for (auto &worker : workers) {
-        worker.join();
-    }
-
-    for (const auto &key : keys) {
-        auto val = redis.get(key);
-        REDIS_ASSERT(bool(val), "failed to test multithreads, cannot get value of " + key);
-
-        auto num = std::stoi(*val);
-        REDIS_ASSERT(num == times, "failed to test multithreads, num: "
-                + *val + ", times: " + std::to_string(times));
-    }
-}
-
-template <typename RedisInstance>
-void ThreadsTest<RedisInstance>::_test_timeout() {
-    using namespace std::chrono;
-
-    ConnectionPoolOptions pool_opts;
-    pool_opts.size = 1;
-    pool_opts.wait_timeout = milliseconds(100);
-
-    auto redis = RedisInstance(_opts, pool_opts);
-
-    auto key = test_key("key");
-
-    std::atomic<bool> slow_get_is_running{false};
-    auto slow_get = [&slow_get_is_running](Connection &connection, const StringView &key) {
-                        slow_get_is_running = true;
-
-                        // Sleep a while to simulate a slow get.
-                        std::this_thread::sleep_for(seconds(5));
-
-                        connection.send("GET %b", key.data(), key.size());
-                    };
-    auto slow_get_thread = std::thread([&redis, slow_get, &key]() {
-                                            redis.command(slow_get, key);
-                                        });
-
-    auto get_thread = std::thread([&redis, &slow_get_is_running, &key]() {
-                                        try {
-                                            while (!slow_get_is_running) {
-                                                std::this_thread::sleep_for(milliseconds(10));
-                                            }
-
-                                            redis.get(key);
-
-                                            // Slow get is running, this thread should
-                                            // timeout before obtaining the connection.
-                                            // So it never reaches here.
-                                            REDIS_ASSERT(false, "failed to test pool timeout");
-                                        } catch (const Error &err) {
-                                            // This thread timeout.
-                                        }
-                                    });
-
-    slow_get_thread.join();
-    get_thread.join();
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_THREADS_TEST_HPP
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/utils.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/utils.h
deleted file mode 100644
index da4e1fdb4..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/utils.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_UTILS_H
-#define SEWENEW_REDISPLUSPLUS_TEST_UTILS_H
-
-#include <string>
-#include <vector>
-#include <sw/redis++/redis++.h>
-
-#define REDIS_ASSERT(condition, msg) \
-    sw::redis::test::redis_assert((condition), (msg), __FILE__, __LINE__)
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-inline void redis_assert(bool condition,
-                            const std::string &msg,
-                            const std::string &file,
-                            int line) {
-    if (!condition) {
-        auto err_msg = "ASSERT: " + msg + ". " + file + ":" + std::to_string(line);
-        throw Error(err_msg);
-    }
-}
-
-inline std::string key_prefix(const std::string &key = "") {
-    static std::string KEY_PREFIX = "sw::redis::test";
-    if (!key.empty()) {
-        KEY_PREFIX = key;
-    }
-
-    return KEY_PREFIX;
-}
-
-inline std::string test_key(const std::string &k) {
-    // Key prefix with hash tag,
-    // so that we can call multiple-key commands on RedisCluster.
-    return "{" + key_prefix() + "}::" + k;
-}
-
-template <typename Test>
-void cluster_specializing_test(Test &test, void (Test::*func)(Redis &instance), Redis &instance) {
-    (test.*func)(instance);
-}
-
-template <typename Test>
-void cluster_specializing_test(Test &test,
-        void (Test::*func)(Redis &instance),
-        RedisCluster &cluster) {
-    auto instance = cluster.redis("hash-tag");
-    (test.*func)(instance);
-}
-
-template <typename RedisInstance>
-class KeyDeleter {
-public:
-    template <typename Input>
-    KeyDeleter(RedisInstance &redis, Input first, Input last) : _redis(redis), _keys(first, last) {
-        _delete();
-    }
-
-    KeyDeleter(RedisInstance &redis, std::initializer_list<std::string> il) :
-                KeyDeleter(redis, il.begin(), il.end()) {}
-
-    KeyDeleter(RedisInstance &redis, const std::string &key) : KeyDeleter(redis, {key}) {}
-
-    ~KeyDeleter() {
-        _delete();
-    }
-
-private:
-    void _delete() {
-        if (!_keys.empty()) {
-            _redis.del(_keys.begin(), _keys.end());
-        }
-    }
-
-    RedisInstance &_redis;
-    std::vector<std::string> _keys;
-};
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_UTILS_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/zset_cmds_test.h b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/zset_cmds_test.h
deleted file mode 100644
index 56fd0b96f..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/zset_cmds_test.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_H
-#define SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_H
-
-#include <sw/redis++/redis++.h>
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-class ZSetCmdTest {
-public:
-    explicit ZSetCmdTest(RedisInstance &instance) : _redis(instance) {}
-
-    void run();
-
-private:
-    void _test_zset();
-
-    void _test_zscan();
-
-    void _test_range();
-
-    void _test_lex();
-
-    void _test_multi_zset();
-
-    void _test_zpop();
-
-    void _test_bzpop();
-
-    RedisInstance &_redis;
-};
-
-}
-
-}
-
-}
-
-#include "zset_cmds_test.hpp"
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_H
diff --git a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/zset_cmds_test.hpp b/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/zset_cmds_test.hpp
deleted file mode 100644
index 9f6c05a08..000000000
--- a/ext/redis-plus-plus-1.3.3/test/src/sw/redis++/zset_cmds_test.hpp
+++ /dev/null
@@ -1,422 +0,0 @@
-/**************************************************************************
-   Copyright (c) 2017 sewenew
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- *************************************************************************/
-
-#ifndef SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_HPP
-#define SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_HPP
-
-#include <map>
-#include <unordered_map>
-#include <vector>
-#include <algorithm>
-#include "utils.h"
-
-namespace sw {
-
-namespace redis {
-
-namespace test {
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::run() {
-    _test_zset();
-
-    _test_zscan();
-
-    _test_range();
-
-    _test_lex();
-
-    _test_multi_zset();
-
-    _test_zpop();
-
-    _test_bzpop();
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_zset() {
-    auto key = test_key("zset");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::map<std::string, double> s = {
-        std::make_pair("m1", 1.2),
-        std::make_pair("m2", 2),
-        std::make_pair("m3", 3),
-    };
-
-    const auto &ele = *(s.begin());
-    REDIS_ASSERT(_redis.zadd(key, ele.first, ele.second, UpdateType::EXIST) == 0,
-            "failed to test zadd with noexistent member");
-
-    REDIS_ASSERT(_redis.zadd(key, s.begin(), s.end()) == 3, "failed to test zadd");
-
-    REDIS_ASSERT(_redis.zadd(key, ele.first, ele.second, UpdateType::NOT_EXIST) == 0,
-            "failed to test zadd with exist member");
-
-    REDIS_ASSERT(_redis.zadd(key, s.begin(), s.end(), UpdateType::ALWAYS, true) == 0,
-            "failed to test zadd");
-
-    REDIS_ASSERT(_redis.zcard(key) == 3, "failed to test zcard");
-
-    auto rank = _redis.zrank(key, "m2");
-    REDIS_ASSERT(bool(rank) && *rank == 1, "failed to test zrank");
-    rank = _redis.zrevrank(key, "m4");
-    REDIS_ASSERT(!rank, "failed to test zrevrank with nonexistent member");
-
-    auto score = _redis.zscore(key, "m4");
-    REDIS_ASSERT(!score, "failed to test zscore with nonexistent member");
-
-    REDIS_ASSERT(_redis.zincrby(key, 1, "m3") == 4, "failed to test zincrby");
-
-    score = _redis.zscore(key, "m3");
-    REDIS_ASSERT(score && *score == 4, "failed to test zscore");
-
-    REDIS_ASSERT(_redis.zrem(key, "m1") == 1, "failed to test zrem");
-    REDIS_ASSERT(_redis.zrem(key, {"m1", "m2", "m3", "m4"}) == 2, "failed to test zrem");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_zscan() {
-    auto key = test_key("zscan");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::map<std::string, double> s = {
-        std::make_pair("m1", 1.2),
-        std::make_pair("m2", 2),
-        std::make_pair("m3", 3),
-    };
-    _redis.zadd(key, s.begin(), s.end());
-
-    std::map<std::string, double> res;
-    auto cursor = 0;
-    while (true) {
-        cursor = _redis.zscan(key, cursor, "m*", 2, std::inserter(res, res.end()));
-        if (cursor == 0) {
-            break;
-        }
-    }
-    REDIS_ASSERT(res == s, "failed to test zscan");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_range() {
-    auto key = test_key("range");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    std::vector<std::pair<std::string, double>> s = {
-        std::make_pair("m1", 1),
-        std::make_pair("m2", 2),
-        std::make_pair("m3", 3),
-        std::make_pair("m4", 4),
-    };
-    std::vector<std::string> sKeys;
-    for (const auto &p : s) {
-        sKeys.push_back(p.first);
-    }
-    std::vector<std::string> sReversedKeys = sKeys;
-    std::reverse(sReversedKeys.begin(), sReversedKeys.end());
-
-    _redis.zadd(key, s.begin(), s.end());
-
-    REDIS_ASSERT(_redis.zcount(key, UnboundedInterval<double>{}) == static_cast<long long int>(s.size()),
-                 "failed to test zcount");
-
-    std::vector<std::string> members;
-    _redis.zrange(key, 0, -1, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == s.size() && members == sKeys,
-                 "failed to test zrange");
-
-    std::vector<std::pair<std::string, double>> res;
-    _redis.zrange(key, 0, -1, std::inserter(res, res.end()));
-    REDIS_ASSERT(s == res, "failed to test zrange with score");
-
-    members.clear();
-    _redis.zrevrange(key, 0, 0, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 && members.at(0) == sKeys.at(s.size()-1),
-                 "failed to test zrevrange");
-
-    res.clear();
-    _redis.zrevrange(key, 0, 0, std::inserter(res, res.end()));
-    REDIS_ASSERT(res.size() == 1 && res.at(0) == s.at(s.size()-1),
-                 "failed to test zrevrange with score");
-
-    members.clear();
-    _redis.zrangebyscore(key, UnboundedInterval<double>{}, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == s.size() && members == sKeys,
-                 "failed to test zrangebyscore");
-
-    LimitOptions limitOpts;
-    limitOpts.offset = 0;
-    limitOpts.count = 2;
-    members.clear();
-    _redis.zrangebyscore(key, UnboundedInterval<double>{}, limitOpts, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 2 &&
-                 members.at(0) == sKeys.at(0) &&
-                 members.at(1) == sKeys.at(1),
-                 "failed to test zrangebyscore with limits 0, 1");
-
-    limitOpts.offset = 1;
-    members.clear();
-    _redis.zrangebyscore(key, UnboundedInterval<double>{}, limitOpts, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 2 &&
-                 members.at(0) == sKeys.at(1) &&
-                 members.at(1) == sKeys.at(2),
-                 "failed to test zrangebyscore with limits 1, 2");
-
-    limitOpts.offset = s.size() - 1;
-    members.clear();
-    _redis.zrangebyscore(key, UnboundedInterval<double>{}, limitOpts, std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 &&
-                 members.at(0) == sKeys.at(sKeys.size() - 1),
-                 "failed to test zrangebyscore with limits size-1, 2");
-
-    members.clear();
-    _redis.zrangebyscore(key,
-            BoundedInterval<double>(1, 2, BoundType::RIGHT_OPEN),
-            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 && members.at(0) == sKeys.at(0),
-                 "failed to test zrangebyscore");
-
-    res.clear();
-    _redis.zrangebyscore(key,
-            LeftBoundedInterval<double>(2, BoundType::OPEN),
-            std::inserter(res, res.end()));
-    REDIS_ASSERT(res.size() == 2 && res.at(0) == s.at(s.size()-2) && res.at(1) == s.at(s.size()-1),
-                 "failed to test zrangebyscore");
-
-    members.clear();
-    _redis.zrevrangebyscore(key,
-            BoundedInterval<double>(1, 3, BoundType::CLOSED),
-            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == sReversedKeys.size()-1,
-                 "failed to test zrevrangebyscore (size)");
-    for (size_t i=0; i<members.size(); i++) {
-        REDIS_ASSERT(members.at(i) == sReversedKeys.at(i+1),
-                     "failed to test zrevrangebyscore");
-    }
-
-    limitOpts.offset = 0;
-    members.clear();
-    _redis.zrevrangebyscore(key,
-            BoundedInterval<double>(1, 3, BoundType::CLOSED),
-            limitOpts,
-            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 2 &&
-                 members.at(0) == sReversedKeys.at(1) &&
-                 members.at(1) == sReversedKeys.at(2),
-                 "failed to test zrevrangebyscore with limits 0, 2");
-
-    limitOpts.offset = 1;
-    members.clear();
-    _redis.zrevrangebyscore(key,
-                            BoundedInterval<double>(1, 3, BoundType::CLOSED),
-                            limitOpts,
-                            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 2 &&
-                 members.at(0) == sReversedKeys.at(2) &&
-                 members.at(1) == sReversedKeys.at(3),
-                 "failed to test zrevrangebyscore with limits 1, 2");
-
-    limitOpts.offset = s.size()-2;
-    members.clear();
-    _redis.zrevrangebyscore(key,
-                            BoundedInterval<double>(1, 3, BoundType::CLOSED),
-                            limitOpts,
-                            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 &&
-                 members.at(0) == sReversedKeys.at(s.size()-1),
-                 "failed to test zrevrangebyscore with limits size-2, 2");
-
-    res.clear();
-    _redis.zrevrangebyscore(key,
-            RightBoundedInterval<double>(1, BoundType::LEFT_OPEN),
-            std::inserter(res, res.end()));
-    REDIS_ASSERT(res.size() == 1 && res.at(0) == s.at(0), "failed to test zrevrangebyscore");
-
-    REDIS_ASSERT(_redis.zremrangebyrank(key, 0, 0) == 1, "failed to test zremrangebyrank");
-
-    REDIS_ASSERT(_redis.zremrangebyscore(key,
-                BoundedInterval<double>(2, 3, BoundType::LEFT_OPEN)) == 1,
-            "failed to test zremrangebyscore");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_lex() {
-    auto key = test_key("lex");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    auto s = {
-        std::make_pair("m1", 0),
-        std::make_pair("m2", 0),
-        std::make_pair("m3", 0),
-    };
-    _redis.zadd(key, s.begin(), s.end());
-
-    REDIS_ASSERT(_redis.zlexcount(key, UnboundedInterval<std::string>{}) == 3,
-            "failed to test zlexcount");
-
-    std::vector<std::string> members;
-    _redis.zrangebylex(key,
-            LeftBoundedInterval<std::string>("m2", BoundType::OPEN),
-            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 && members[0] == "m3",
-            "failed to test zrangebylex");
-
-    members.clear();
-    _redis.zrevrangebylex(key,
-            RightBoundedInterval<std::string>("m1", BoundType::LEFT_OPEN),
-            std::back_inserter(members));
-    REDIS_ASSERT(members.size() == 1 && members[0] == "m1",
-            "failed to test zrevrangebylex");
-
-    REDIS_ASSERT(_redis.zremrangebylex(key,
-                BoundedInterval<std::string>("m1", "m3", BoundType::OPEN)) == 1,
-            "failed to test zremrangebylex");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_multi_zset() {
-    auto k1 = test_key("k1");
-    auto k2 = test_key("k2");
-    auto k3 = test_key("k3");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {k1, k2, k3});
-
-    _redis.zadd(k1, {std::make_pair("a", 1), std::make_pair("b", 2)});
-    _redis.zadd(k2, {std::make_pair("a", 2), std::make_pair("c", 3)});
-
-    REDIS_ASSERT(_redis.zinterstore(k3, {k1, k2}) == 1, "failed to test zinterstore");
-    auto score = _redis.zscore(k3, "a");
-    REDIS_ASSERT(bool(score) && *score == 3, "failed to test zinterstore");
-
-    REDIS_ASSERT(_redis.zinterstore(k3, k1, 2) == 2, "failed to test zinterstore");
-
-    _redis.del(k3);
-
-    REDIS_ASSERT(_redis.zinterstore(k3, {k1, k2}, Aggregation::MAX) == 1,
-            "failed to test zinterstore");
-    score = _redis.zscore(k3, "a");
-    REDIS_ASSERT(bool(score) && *score == 2, "failed to test zinterstore");
-
-    _redis.del(k3);
-
-    REDIS_ASSERT(_redis.zunionstore(k3,
-                {std::make_pair(k1, 1), std::make_pair(k2, 2)},
-                Aggregation::MIN) == 3,
-            "failed to test zunionstore");
-    std::vector<std::pair<std::string, double>> res;
-    _redis.zrange(k3, 0, -1, std::back_inserter(res));
-    for (const auto &ele : res) {
-        if (ele.first == "a") {
-            REDIS_ASSERT(ele.second == 1, "failed to test zunionstore");
-        } else if (ele.first == "b") {
-            REDIS_ASSERT(ele.second == 2, "failed to test zunionstore");
-        } else if (ele.first == "c") {
-            REDIS_ASSERT(ele.second == 6, "failed to test zunionstore");
-        } else {
-            REDIS_ASSERT(false, "failed to test zuionstore");
-        }
-    }
-
-    REDIS_ASSERT(_redis.zunionstore(k3, k1, 2) == 2, "failed to test zunionstore");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_zpop() {
-    auto key = test_key("zpop");
-    auto not_exist_key = test_key("zpop_not_exist");
-
-    KeyDeleter<RedisInstance> deleter(_redis, key);
-
-    _redis.zadd(key, {std::make_pair("m1", 1.1),
-                        std::make_pair("m2", 2.2),
-                        std::make_pair("m3", 3.3),
-                        std::make_pair("m4", 4.4),
-                        std::make_pair("m5", 5.5),
-                        std::make_pair("m6", 6.6)});
-
-    auto item = _redis.zpopmax(key);
-    REDIS_ASSERT(item && item->first == "m6", "failed to test zpopmax");
-
-    item = _redis.zpopmax(not_exist_key);
-    REDIS_ASSERT(!item, "failed to test zpopmax");
-
-    item = _redis.zpopmin(key);
-    REDIS_ASSERT(item && item->first == "m1", "failed to test zpopmin");
-
-    item = _redis.zpopmin(not_exist_key);
-    REDIS_ASSERT(!item, "failed to test zpopmin");
-
-    std::vector<std::pair<std::string, double>> vec;
-    _redis.zpopmax(key, 2, std::back_inserter(vec));
-    REDIS_ASSERT(vec.size() == 2 && vec[0].first == "m5" && vec[1].first == "m4",
-            "failed to test zpopmax");
-
-    std::unordered_map<std::string, double> m;
-    _redis.zpopmin(key, 2, std::inserter(m, m.end()));
-    REDIS_ASSERT(m.size() == 2 && m.find("m3") != m.end() && m.find("m2") != m.end(),
-            "failed to test zpopmin");
-}
-
-template <typename RedisInstance>
-void ZSetCmdTest<RedisInstance>::_test_bzpop() {
-    auto key1 = test_key("bzpop1");
-    auto key2 = test_key("bzpop2");
-
-    KeyDeleter<RedisInstance> deleter(_redis, {key1, key2});
-
-    _redis.zadd(key1, {std::make_pair("m1", 1.1),
-                        std::make_pair("m2", 2.2),
-                        std::make_pair("m3", 3.3),
-                        std::make_pair("m4", 4.4),
-                        std::make_pair("m5", 5.5),
-                        std::make_pair("m6", 6.6)});
-
-    _redis.zadd(key2, {std::make_pair("m1", 1.1),
-                        std::make_pair("m2", 2.2),
-                        std::make_pair("m3", 3.3),
-                        std::make_pair("m4", 4.4),
-                        std::make_pair("m5", 5.5),
-                        std::make_pair("m6", 6.6)});
-
-    auto item = _redis.bzpopmax(key1);
-    REDIS_ASSERT(item && std::get<0>(*item) == key1 && std::get<1>(*item) == "m6",
-            "failed to test bzpopmax");
-
-    item = _redis.bzpopmin(key1, std::chrono::seconds(1));
-    REDIS_ASSERT(item && std::get<0>(*item) == key1 && std::get<1>(*item) == "m1",
-            "failed to test zpopmin");
-
-    item = _redis.bzpopmax({key1, key2}, std::chrono::seconds(1));
-    REDIS_ASSERT(item && std::get<0>(*item) == key1 && std::get<1>(*item) == "m5",
-            "failed to test zpopmax");
-
-    item = _redis.bzpopmin({key2, key1});
-    REDIS_ASSERT(item && std::get<0>(*item) == key2 && std::get<1>(*item) == "m1",
-            "failed to test zpopmin");
-}
-
-}
-
-}
-
-}
-
-#endif // end SEWENEW_REDISPLUSPLUS_TEST_ZSET_CMDS_TEST_HPP
diff --git a/ext/tap-mac/README.txt b/ext/tap-mac/README.txt
new file mode 100644
index 000000000..177b936f7
--- /dev/null
+++ b/ext/tap-mac/README.txt
@@ -0,0 +1,19 @@
+This is a hack of tuntaposx. It's here for two reasons:
+
+1) There seem to be issues with large MTUs in the original tuntap code,
+   so we set up our zt0 tap with the correct ZeroTier MTU as the default.
+
+2) Lots of other mac products (VPNs, etc.) ship their own tap device
+   drivers that like to conflict with one another. This gives us no
+   choice but to play along. But we call our tap device zt0, which means
+   it won't conflict with everyone else's tap0.
+
+3) It's nice to call the device zt0, same as Linux, for consistency across
+   *nix platforms. Mac does not seem to support interface renaming.
+
+This will be placed in the ZeroTier home as a kext and is auto-loaded by the
+ZeroTier One binary if /dev/zt0 is not found. It can also be auto-updated.
+
+See this page for the original:
+
+http://tuntaposx.sourceforge.net
diff --git a/ext/tap-mac/tuntap/Makefile b/ext/tap-mac/tuntap/Makefile
new file mode 100644
index 000000000..53ab1a9d7
--- /dev/null
+++ b/ext/tap-mac/tuntap/Makefile
@@ -0,0 +1,95 @@
+# Lets have a version, at last!
+TUNTAP_VERSION = 20150118
+
+# BASE install directory
+BASE=
+
+all: tap.kext
+
+keysetup:
+	-security delete-keychain net.sf.tuntaposx.tmp
+	security create-keychain -p $$(head -c 32 /dev/urandom | hexdump -e '"%02x"') \
+		net.sf.tuntaposx.tmp
+	security set-keychain-settings -lut 60 net.sf.tuntaposx.tmp
+	security import identity.p12 -k net.sf.tuntaposx.tmp -f pkcs12 \
+		-P $$(read -sp 'identity passphrase: ' pw && echo "$$pw") -A
+	security find-identity -v net.sf.tuntaposx.tmp | \
+		awk -F \" '$$2 ~ /^Developer ID Application:/ { print $$2 }' > .signing_identity
+	security find-identity -v net.sf.tuntaposx.tmp | \
+		awk -F \" '$$2 ~ /^Developer ID Installer:/ { print $$2 }' > .installer_identity
+
+pkgbuild/%.pkg: %.kext
+	mkdir -p pkgbuild/$*_root/Library/Extensions
+	cp -pR $*.kext pkgbuild/$*_root/Library/Extensions
+	mkdir -p pkgbuild/$*_root/Library/LaunchDaemons
+	cp pkg/launchd/net.sf.tuntaposx.$*.plist pkgbuild/$*_root/Library/LaunchDaemons
+	pkgbuild --root pkgbuild/$*_root \
+		--component-plist pkg/components/$*.plist \
+		--scripts pkg/scripts/$* pkgbuild/$*.pkg
+
+tuntap_$(TUNTAP_VERSION).pkg: pkgbuild/tap.pkg pkgbuild/tun.pkg
+	productbuild --distribution pkg/distribution.xml --package-path pkgbuild \
+		--resources pkg/res.dummy \
+		tuntap_$(TUNTAP_VERSION).pkg ; \
+	pkgutil --expand tuntap_$(TUNTAP_VERSION).pkg pkgbuild/tuntap_pkg.d
+	cp -pR pkg/res/ pkgbuild/tuntap_pkg.d/Resources
+	pkgutil --flatten pkgbuild/tuntap_pkg.d tuntap_$(TUNTAP_VERSION).pkg
+	if test -s ".installer_identity"; then \
+		productsign --sign "$$(cat .installer_identity)" --keychain net.sf.tuntaposx.tmp \
+			tuntap_$(TUNTAP_VERSION).pkg tuntap_$(TUNTAP_VERSION).pkg.signed ; \
+		mv tuntap_$(TUNTAP_VERSION).pkg.signed tuntap_$(TUNTAP_VERSION).pkg ; \
+	fi
+
+pkg: tuntap_$(TUNTAP_VERSION).pkg
+	tar czf tuntap_$(TUNTAP_VERSION).tar.gz \
+		README.installer README tuntap_$(TUNTAP_VERSION).pkg 
+
+# Install targets
+# They are provided for the gentoo ebuild, but should work just fine for other people as well.
+install_%_kext: %.kext
+	mkdir -p $(BASE)/Library/Extensions
+	cp -pR $*.kext $(BASE)/Library/Extensions/
+	chown -R root:wheel $(BASE)/Library/Extensions/$*.kext
+	mkdir -p $(BASE)/Library/LaunchDaemons
+	cp pkg/launchd/net.sf.tuntaposx.$*.plist $(BASE)/Library/LaunchDaemons
+	chown -R root:wheel $(BASE)/Library/LaunchDaemons/net.sf.tuntaposx.$*.plist
+
+install: install_tap_kext install_tun_kext
+
+tarball: clean
+	touch tuntap_$(TUNTAP_VERSION)_src.tar.gz
+	tar czf tuntap_$(TUNTAP_VERSION)_src.tar.gz \
+		-C .. \
+		--exclude "tuntap/identity.p12" \
+		--exclude "tuntap/tuntap_$(TUNTAP_VERSION)_src.tar.gz" \
+		--exclude "tuntap/tuntap_$(TUNTAP_VERSION).tar.gz" \
+		--exclude "tuntap/tuntap_$(TUNTAP_VERSION).pkg" \
+		--exclude "*/.*" \
+		tuntap
+
+clean:
+	cd src/tap && make -f Makefile clean
+	cd src/tun && make -f Makefile clean
+	-rm -rf pkgbuild
+	-rm -rf tuntap_$(TUNTAP_VERSION).pkg
+	-rm -f tuntap_$(TUNTAP_VERSION).tar.gz
+	-rm -f tuntap_$(TUNTAP_VERSION)_src.tar.gz
+
+%.kext:
+	cd src/$* && make TUNTAP_VERSION=$(TUNTAP_VERSION) -f Makefile all
+	if test -s ".signing_identity"; then \
+		codesign -fv --keychain net.sf.tuntaposx.tmp -s "$$(cat .signing_identity)" \
+			$*.kext ; \
+	fi
+
+test:
+	# configd messes with interface flags, issuing SIOCSIFFLAGS ioctls upon receiving kernel
+	# events indicating protocols have been attached and detached. Unfortunately, configd does
+	# this asynchronously, making the SIOCSIFFLAGS changes totally unpredictable when we bring
+	# our interfaces up and down in rapid succession during our tests. I haven't found a good
+	# way to suppress or handle this mess other than disabling configd temporarily.
+	killall -STOP configd
+	-PYTHONPATH=test python test/tuntap/tuntap_tests.py --tests='$(TESTS)'
+	killall -CONT configd
+
+.PHONY: test
diff --git a/ext/tap-mac/tuntap/src/lock.cc b/ext/tap-mac/tuntap/src/lock.cc
new file mode 100644
index 000000000..9c78783a5
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/lock.cc
@@ -0,0 +1,206 @@
+/*
+ * ip tunnel/ethertap device for MacOSX.
+ *
+ * Locking implementation.
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "lock.h"
+
+extern "C" {
+
+#include <kern/clock.h>
+
+#include <sys/syslog.h>
+#include <sys/proc.h>
+
+}
+
+#if 0
+#define dprintf(...)			log(LOG_INFO, __VA_ARGS__)
+#else
+#define dprintf(...)
+#endif
+
+/* class tt_lock */
+lck_grp_t *tt_lock::tt_lck_grp = NULL;
+
+bool
+tt_lock::initialize()
+{
+	/* init if necessary */
+	if (tt_lck_grp == NULL) {
+		dprintf("initing lock group\n");
+		tt_lck_grp = lck_grp_alloc_init("tuntap locks", LCK_GRP_ATTR_NULL);
+
+		if (tt_lck_grp == NULL) {
+			/* if something fails, the lock won't work */
+			log(LOG_ERR, "tuntap: could not allocate locking group\n");
+			return false;
+		}
+	}
+
+	return true;
+}
+
+void
+tt_lock::shutdown()
+{
+	/* free the locking group */
+	if (tt_lck_grp != NULL) {
+		dprintf("freeing lock group\n");
+		lck_grp_free(tt_lck_grp);
+		tt_lck_grp = NULL;
+	}
+}
+
+/* tt_mutex */
+tt_mutex::tt_mutex()
+{
+	/* fail if locking group not initialized */
+	if (tt_lck_grp == NULL)
+		return;
+
+	/* allocate the lock */
+	lck = lck_rw_alloc_init(tt_lck_grp, NULL);
+
+	if (lck == NULL)
+		log(LOG_ERR, "tuntap: could not allocate mutex\n");
+}
+
+tt_mutex::~tt_mutex()
+{
+	/* if the lock doesn't exist, this will be a no-op */
+	if (lck == NULL)
+		return;
+
+	/* free the lock */
+	lck_rw_free(lck, tt_lck_grp);
+}
+
+void
+tt_mutex::lock()
+{
+	if (lck != NULL)
+		lck_rw_lock_exclusive(lck);
+}
+
+void
+tt_mutex::unlock()
+{
+	if (lck != NULL)
+		lck_rw_unlock_exclusive(lck);
+}
+
+void
+tt_mutex::sleep(void *cond)
+{
+	if (lck != NULL)
+		lck_rw_sleep(lck, LCK_SLEEP_DEFAULT, cond, THREAD_INTERRUPTIBLE);
+}
+
+void
+tt_mutex::sleep(void *cond, uint64_t nanoseconds)
+{
+	if (lck != NULL) {
+		uint64_t abstime;
+		nanoseconds_to_absolutetime(nanoseconds, &abstime);
+		lck_rw_sleep_deadline(lck, LCK_SLEEP_DEFAULT, cond, THREAD_INTERRUPTIBLE, abstime);
+	}
+}
+
+void
+tt_mutex::wakeup(void *cond)
+{
+	if (lck != NULL)
+		::wakeup(cond);
+}
+
+/* tt_gate */
+tt_gate::tt_gate()
+	: ticket_number(0),
+	population(0)
+{
+}
+
+void
+tt_gate::enter()
+{
+	/* just try to grab the lock, increase the ticket number and the population */
+	auto_lock l(&slock);
+	ticket_number++;
+	population++;
+}
+
+void
+tt_gate::exit()
+{
+	auto_lock l(&slock);
+	ticket_number--;
+	population--;
+}
+
+bool
+tt_gate::is_anyone_in()
+{
+	return population != 0;
+}
+
+unsigned int
+tt_gate::get_ticket_number()
+{
+	return ticket_number;
+}
+
+void
+tt_gate::lock()
+{
+	slock.lock();
+}
+
+void
+tt_gate::unlock()
+{
+	slock.unlock();
+}
+
+void
+tt_gate::sleep(void* cond)
+{
+	slock.sleep(cond);
+}
+
+void
+tt_gate::sleep(void* cond, uint64_t nanoseconds)
+{
+	slock.sleep(cond, nanoseconds);
+}
+
+void
+tt_gate::wakeup(void* cond)
+{
+	slock.wakeup(cond);
+}
+
diff --git a/ext/tap-mac/tuntap/src/lock.h b/ext/tap-mac/tuntap/src/lock.h
new file mode 100644
index 000000000..51d3299af
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/lock.h
@@ -0,0 +1,160 @@
+/*
+ * ip tunnel/ethertap device for MacOSX.
+ *
+ * Locking is not as straightforward for Tiger. So declare our own locking class.
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __LOCK_H__
+#define __LOCK_H__
+
+extern "C" {
+
+#include <kern/locks.h>
+#include <sys/param.h>
+
+}
+
+/* our own locking class. declares the common interface of the locking primitives. */
+class tt_lock {
+	
+	protected:
+		/* locking group */
+		static lck_grp_t *tt_lck_grp;
+
+	public:
+		/* be virtual */
+		virtual ~tt_lock() { };
+
+		/* static intialization (inits the locking group) */
+		static bool initialize();
+		static void shutdown();
+
+		/* locking */
+		virtual void lock() = 0;
+		virtual void unlock() = 0;
+
+		/* monitor primitives */
+		virtual void sleep(void* cond) = 0;
+		virtual void sleep(void* cond, uint64_t) = 0;
+		virtual void wakeup(void* cond) = 0;
+};
+
+/* simple mutex */
+class tt_mutex : public tt_lock {
+
+	private:
+		/* underlying darwin lock */
+		lck_rw_t *lck;
+
+	public:
+		tt_mutex();
+		virtual ~tt_mutex();
+
+		void lock();
+		void unlock();
+
+		/* monitor primitives */
+		void sleep(void* cond);
+		void sleep(void* cond, uint64_t);
+		void wakeup(void* cond);
+};
+
+/* A very special locking class that we use to track threads that enter and leave the character
+ * device service functions. They call enter() before entering the actual service routinge and
+ * exit() when done. enter() only permits them to pass when the gate isn't locked. Furthermore, the
+ * gate assigns ticket numbers to everyone that passes the gate, so you can check whether more
+ * threads came through. See tuntap_mgr::shutdown() for how we use that stuff.
+ */
+class tt_gate : public tt_lock {
+
+	private:
+		/* synchronization lock */
+		tt_mutex slock;
+		/* ticket number */
+		unsigned int ticket_number;
+		/* count of threads that are in */
+		unsigned int population;
+
+	public:
+		/* construct a new gate */
+		tt_gate();
+
+		/* enter - pass the gate */
+		void enter();
+		/* exit - pass the gate */
+		void exit();
+
+		/* check whether anyone is in */
+		bool is_anyone_in();
+		/* gets the next ticket number */
+		unsigned int get_ticket_number();
+
+		/* lock the gate */
+		void lock();
+		/* unlock the gate */
+		void unlock();
+
+		/* monitor primitives */
+		void sleep(void* cond);
+		void sleep(void* cond, uint64_t);
+		void wakeup(void* cond);
+};
+
+/* auto_lock and auto_rwlock serve as automatic lock managers: Create an object, passing the
+ * tt_[rw]lock you want to lock to have it grab the lock. When the object goes out of scope, the
+ * destructor of the class will release the lock.
+ */
+class auto_lock {
+
+	protected:
+		/* the lock we hold */
+		tt_lock *l;
+
+	public:
+		auto_lock(tt_lock *m)
+			: l(m)
+		{
+			lock();
+		}
+
+		~auto_lock()
+		{
+			unlock();
+		}
+
+		void lock()
+		{
+			l->lock();
+		}
+
+		void unlock()
+		{
+			l->unlock();
+		}
+};
+
+#endif /* __LOCK_H__ */
+
diff --git a/ext/tap-mac/tuntap/src/mem.cc b/ext/tap-mac/tuntap/src/mem.cc
new file mode 100644
index 000000000..cd3264fa6
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/mem.cc
@@ -0,0 +1,76 @@
+/*
+ * ip tunnel/ethertap device for MacOSX. Common functionality of tap_interface and tun_interface.
+ *
+ * Memory management implementation.
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "mem.h"
+
+extern "C" {
+
+#include <libkern/OSMalloc.h>
+
+}
+
+#if 0
+#define dprintf(...)			log(LOG_INFO, __VA_ARGS__)
+#else
+#define dprintf(...)
+#endif
+
+static int inited = 0;
+static OSMallocTag tag;
+
+void
+mem_initialize(const char* name) {
+	
+	if (!inited) {
+		tag = OSMalloc_Tagalloc(name, OSMT_DEFAULT);
+		inited = 1;
+	}
+}
+
+void
+mem_shutdown() {
+	
+	if (inited) {
+		OSMalloc_Tagfree(tag);
+		inited = 0;
+	}
+}
+
+void *
+mem_alloc(uint32_t size) {
+
+	return OSMalloc(size, tag);
+}
+
+void
+mem_free(void *addr, uint32_t size) {
+
+	OSFree(addr, size, tag);
+}
+
diff --git a/ext/tap-mac/tuntap/src/mem.h b/ext/tap-mac/tuntap/src/mem.h
new file mode 100644
index 000000000..4d06fd8c8
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/mem.h
@@ -0,0 +1,48 @@
+/*
+ * ip tunnel/ethertap device for MacOSX. Common functionality of tap_interface and tun_interface.
+ *
+ * Memory management.
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __MEM_H__
+#define __MEM_H__
+
+extern "C" {
+
+#include <stdint.h>
+
+}
+
+/* Memory manager initalization and shutdown */
+void mem_initialize(const char *name);
+void mem_shutdown();
+
+/* Memory allocation functions */
+void *mem_alloc(uint32_t size);
+void mem_free(void *addr, uint32_t size);
+
+#endif /* __MEM_H__ */
+
diff --git a/ext/tap-mac/tuntap/src/tap/Info.plist b/ext/tap-mac/tuntap/src/tap/Info.plist
new file mode 100644
index 000000000..bb9b03fdb
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/tap/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>@@CFBUNDLEDEVELOPMENTREGION@@</string>
+	<key>CFBundleExecutable</key>
+	<string>@@CFBUNDLEEXECUTABLE@@</string>
+	<key>CFBundleIdentifier</key>
+	<string>@@CFBUNDLEIDENTIFIER@@</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>@@CFBUNDLEEXECUTABLE@@</string>
+	<key>CFBundlePackageType</key>
+	<string>@@CFBUNDLEPACKAGETYPE@@</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@@CFBUNDLEVERSION@@</string>
+	<key>CFBundleSignature</key>
+	<string>@@CFBUNDLESIGNATURE@@</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.apple.kpi.mach</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.bsd</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>8.0</string>
+		<key>com.apple.kpi.unsupported</key>
+		<string>8.0</string>
+	</dict>
+</dict>
+</plist>
+
diff --git a/ext/tap-mac/tuntap/src/tap/Makefile b/ext/tap-mac/tuntap/src/tap/Makefile
new file mode 100644
index 000000000..306a86d7f
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/tap/Makefile
@@ -0,0 +1,60 @@
+#
+# ethertap driver for MacOSX
+#
+# Makefile
+#
+# (c) 2004, 2005, 2006, 2007, 2008 Mattias Nissler
+#
+
+OBJS = ../tuntap.o ../tuntap_mgr.o ../lock.o ../mem.o kmod.o tap.o
+KMOD_BIN = tap
+BUNDLE_DIR = ../..
+BUNDLE_NAME = tap.kext
+
+TAP_KEXT_VERSION = $(TUNTAP_VERSION)
+
+BUNDLE_REGION = English
+BUNDLE_IDENTIFIER = com.zerotier.tap
+BUNDLE_SIGNATURE = ????
+BUNDLE_PACKAGETYPE = KEXT
+BUNDLE_VERSION = $(TAP_KEXT_VERSION)
+
+INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
+	-nostdinc -fno-builtin -fno-stack-protector -msoft-float -fno-common \
+	-arch x86_64 \
+	-DKERNEL -DAPPLE -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
+	-DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
+CCFLAGS = $(CFLAGS)
+LDFLAGS = -Wall -Werror -arch x86_64 -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
+
+CCP = clang -x c++
+CC = clang -x c
+LD = clang
+
+all: $(KMOD_BIN) bundle
+
+.c.o:
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+.cc.o:
+	$(CCP) $(CCFLAGS) $(INCLUDE) -c $< -o $@
+
+$(KMOD_BIN):	$(OBJS)
+	$(LD) $(LDFLAGS) -o $(KMOD_BIN) $(OBJS)
+
+bundle:	$(KMOD_BIN)
+	rm -rf $(BUNDLE_DIR)/$(BUNDLE_NAME)
+	mkdir -p $(BUNDLE_DIR)/$(BUNDLE_NAME)/Contents/MacOS
+	cp $(KMOD_BIN) $(BUNDLE_DIR)/$(BUNDLE_NAME)/Contents/MacOS
+	sed -e "s/@@CFBUNDLEEXECUTABLE@@/$(KMOD_BIN)/" \
+	 -e "s/@@CFBUNDLEDEVELOPMENTREGION@@/$(BUNDLE_REGION)/" \
+	 -e "s/@@CFBUNDLEIDENTIFIER@@/$(BUNDLE_IDENTIFIER)/" \
+	 -e "s/@@CFBUNDLESIGNATURE@@/$(BUNDLE_SIGNATURE)/" \
+	 -e "s/@@CFBUNDLEPACKAGETYPE@@/$(BUNDLE_PACKAGETYPE)/" \
+	 -e "s/@@CFBUNDLEVERSION@@/$(BUNDLE_VERSION)/" \
+	Info.plist > $(BUNDLE_DIR)/$(BUNDLE_NAME)/Contents/Info.plist
+
+clean:
+	-rm -f $(OBJS) $(KMOD_BIN)
+	-rm -rf $(BUNDLE_DIR)/$(BUNDLE_NAME)
+
diff --git a/ext/tap-mac/tuntap/src/tap/kmod.cc b/ext/tap-mac/tuntap/src/tap/kmod.cc
new file mode 100644
index 000000000..f9c4a40ef
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/tap/kmod.cc
@@ -0,0 +1,93 @@
+/*
+ * ethertap device for MacOSX.
+ *
+ * Kext definition (it is a mach kmod really...)
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "tap.h"
+#include "mem.h"
+
+extern "C" {
+
+#include <sys/param.h>
+
+#include <mach/kmod.h>
+
+static tap_manager *mgr;
+
+/*
+ * start function. called when the kext gets loaded.
+ */
+static kern_return_t tap_module_start(struct kmod_info *ki, void *data)
+{
+	mem_initialize(TAP_FAMILY_NAME);
+
+	/* initialize locking */
+	if (!tt_lock::initialize())
+		return KMOD_RETURN_FAILURE;
+
+	/* create a tap manager that will handle the rest */
+	mgr = new tap_manager();
+
+	if (mgr != NULL) {
+		if (mgr->initialize(TAP_IF_COUNT, (char *) TAP_FAMILY_NAME))
+			return KMOD_RETURN_SUCCESS;
+
+		delete mgr;
+		mgr = NULL;
+		/* clean up locking */
+		tt_lock::shutdown();
+	}
+
+	return KMOD_RETURN_FAILURE;
+}
+
+/*
+ * stop function. called when the kext should be unloaded. unloading can be prevented by
+ * returning failure
+ */
+static kern_return_t tap_module_stop(struct kmod_info *ki, void *data)
+{
+	if (mgr != NULL) {
+		if (!mgr->shutdown())
+			return KMOD_RETURN_FAILURE;
+
+		delete mgr;
+		mgr = NULL;
+	}
+
+	/* clean up locking */
+	tt_lock::shutdown();
+
+	mem_shutdown();
+
+	return KMOD_RETURN_SUCCESS;
+} 
+
+KMOD_DECL(tap, TAP_KEXT_VERSION)
+
+}
+
diff --git a/ext/tap-mac/tuntap/src/tap/tap.cc b/ext/tap-mac/tuntap/src/tap/tap.cc
new file mode 100644
index 000000000..b348a85e8
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/tap/tap.cc
@@ -0,0 +1,533 @@
+/*
+ * ethertap device for macosx.
+ *
+ * tap_interface class definition
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "tap.h"
+
+extern "C" {
+
+#include <sys/systm.h>
+#include <sys/syslog.h>
+#include <sys/param.h>
+#include <sys/sockio.h>
+#include <sys/random.h>
+#include <sys/kern_event.h>
+
+#include <mach/thread_policy.h>
+
+#include <net/if_types.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/dlil.h>
+#include <net/ethernet.h>
+
+}
+
+#if 0
+#define dprintf(...)			log(LOG_INFO, __VA_ARGS__)
+#else
+#define dprintf(...)
+#endif
+
+// These declarations are missing in the Kernel.framework headers, put present in userspace :-/
+#pragma pack(4)
+struct ifmediareq {
+	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
+	int	ifm_current;		/* current media options */
+	int	ifm_mask;		/* don't care mask */
+	int	ifm_status;		/* media status */
+	int	ifm_active;		/* active options */
+	int	ifm_count;		/* # entries in ifm_ulist array */
+	int	*ifm_ulist;		/* media words */
+};
+
+struct ifmediareq64 {
+	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
+	int	ifm_current;		/* current media options */
+	int	ifm_mask;		/* don't care mask */
+	int	ifm_status;		/* media status */
+	int	ifm_active;		/* active options */
+	int	ifm_count;		/* # entries in ifm_ulist array */
+	user64_addr_t ifmu_ulist __attribute__((aligned(8)));
+};
+
+struct ifmediareq32 {
+	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
+	int	ifm_current;		/* current media options */
+	int	ifm_mask;		/* don't care mask */
+	int	ifm_status;		/* media status */
+	int	ifm_active;		/* active options */
+	int	ifm_count;		/* # entries in ifm_ulist array */
+	user32_addr_t ifmu_ulist;	/* 32-bit pointer */
+};
+#pragma pack()
+
+#define	SIOCGIFMEDIA32	_IOWR('i', 56, struct ifmediareq32) /* get net media */
+#define	SIOCGIFMEDIA64	_IOWR('i', 56, struct ifmediareq64) /* get net media (64-bit) */
+
+/* thread_policy_set is exported in Mach.kext, but commented in mach/thread_policy.h in the
+ * Kernel.Framework headers (why?). Add a local declaration to work around that.
+ */
+extern "C" {
+kern_return_t thread_policy_set(
+	thread_t thread,
+	thread_policy_flavor_t flavor,
+	thread_policy_t policy_info,
+	mach_msg_type_number_t count);
+}
+
+static unsigned char ETHER_BROADCAST_ADDR[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
+/* members */
+tap_interface::tap_interface() {
+	bzero(attached_protos, sizeof(attached_protos));
+	input_thread = THREAD_NULL;
+}
+
+bool
+tap_interface::initialize(unsigned short major, unsigned short unit)
+{
+	this->unit = unit;
+	this->family_name = TAP_FAMILY_NAME;
+	this->family = IFNET_FAMILY_ETHERNET;
+	this->type = IFT_ETHER;
+	bzero(unique_id, UIDLEN);
+	snprintf(unique_id, UIDLEN, "%s%d", family_name, unit);
+
+	dprintf("tap: starting interface %s%d\n", TAP_FAMILY_NAME, unit);
+
+	/* register character device */
+	if (!tuntap_interface::register_chardev(major))
+		return false;
+
+	return true;
+}
+
+void
+tap_interface::shutdown()
+{
+	dprintf("tap: shutting down tap interface %s%d\n", TAP_FAMILY_NAME, unit);
+
+	unregister_chardev();
+}
+
+int
+tap_interface::initialize_interface()
+{
+	struct sockaddr_dl lladdr;
+	lladdr.sdl_len = sizeof(lladdr);
+	lladdr.sdl_family = AF_LINK;
+	lladdr.sdl_alen = ETHER_ADDR_LEN;
+	lladdr.sdl_nlen = lladdr.sdl_slen = 0;
+
+	/* generate a random MAC address */
+	read_random(LLADDR(&lladdr), ETHER_ADDR_LEN);
+
+	/* clear multicast bit and set local assignment bit (see IEEE 802) */
+	(LLADDR(&lladdr))[0] &= 0xfe;
+	(LLADDR(&lladdr))[0] |= 0x02;
+
+	dprintf("tap: random tap address: %02x:%02x:%02x:%02x:%02x:%02x\n",
+			(LLADDR(&lladdr))[0] & 0xff,
+			(LLADDR(&lladdr))[1] & 0xff,
+			(LLADDR(&lladdr))[2] & 0xff,
+			(LLADDR(&lladdr))[3] & 0xff,
+			(LLADDR(&lladdr))[4] & 0xff,
+			(LLADDR(&lladdr))[5] & 0xff);
+
+	/* register interface */
+	if (!tuntap_interface::register_interface(&lladdr, ETHER_BROADCAST_ADDR, ETHER_ADDR_LEN))
+		return EIO;
+
+	/* Set link level address. Yes, we need to do that again. Darwin sucks. */
+	errno_t err = ifnet_set_lladdr(ifp, LLADDR(&lladdr), ETHER_ADDR_LEN);
+	if (err)
+		dprintf("tap: failed to set lladdr on %s%d: %d\n", family_name, unit, err);
+
+	/* set mtu */
+	ifnet_set_mtu(ifp, TAP_MTU);
+	/* set header length */
+	ifnet_set_hdrlen(ifp, sizeof(struct ether_header));
+	/* add the broadcast flag */
+	ifnet_set_flags(ifp, IFF_BROADCAST, IFF_BROADCAST);
+
+	/* we must call bpfattach(). Otherwise we deadlock BPF while unloading. Seems to be a bug in
+	 * the kernel, see bpfdetach() in net/bpf.c, it will return without releasing the lock if
+	 * the interface wasn't attached. I wonder what they were smoking while writing it ;-)
+	 */
+	bpfattach(ifp, DLT_EN10MB, ifnet_hdrlen(ifp));
+
+	/* Inject an empty packet to trigger the input thread calling demux(), which will unblock
+	 * thread_sync_lock. This is part of a hack to avoid a kernel crash on re-attaching
+	 * interfaces, see comment in shutdown_interface for more information.
+	 */
+	mbuf_t empty_mbuf;
+	mbuf_gethdr(MBUF_WAITOK, MBUF_TYPE_DATA, &empty_mbuf);
+	if (empty_mbuf != NULL) {
+		mbuf_pkthdr_setrcvif(empty_mbuf, ifp);
+		mbuf_pkthdr_setlen(empty_mbuf, 0);
+		mbuf_pkthdr_setheader(empty_mbuf, mbuf_data(empty_mbuf));
+		mbuf_set_csum_performed(empty_mbuf, 0, 0);
+		if (ifnet_input(ifp, empty_mbuf, NULL) == 0) {
+			auto_lock l(&thread_sync_lock);
+			for (int i = 0; i < 100 && input_thread == THREAD_NULL; ++i) {
+				dprintf("input thread not found, waiting...\n");
+				thread_sync_lock.sleep(&input_thread, 10000000);
+			}
+		} else {
+			mbuf_freem(empty_mbuf);
+		}
+	}
+	if (input_thread == THREAD_NULL)
+		dprintf("Failed to determine input thread!\n");
+
+	return 0;
+}
+
+void
+tap_interface::shutdown_interface()
+{
+	dprintf("tap: shutting down network interface of device %s%d\n", TAP_FAMILY_NAME, unit);
+
+	/* detach all protocols */
+	for (unsigned int i = 0; i < MAX_ATTACHED_PROTOS; i++) {
+		if (attached_protos[i].used) {
+			errno_t err = ifnet_detach_protocol(ifp, attached_protos[i].proto);
+			if (err)
+				log(LOG_WARNING, "tap: could not detach protocol %d from %s%d\n",
+						attached_protos[i].proto, TAP_FAMILY_NAME, unit);
+		}
+	}
+
+	cleanup_interface();
+	unregister_interface();
+
+	/* There's a race condition in the kernel that may cause crashes when quickly re-attaching
+	 * interfaces. The crash happens when the interface gets re-attached before the input thread
+	 * for the interface managed to terminate, in which case an assert on the input_waiting flag
+	 * to be clear triggers in ifnet_attach. The bug is really that there's no synchronization
+	 * for terminating the input thread. To work around this, the following code does add the
+	 * missing synchronization to wait for the input thread to terminate. Of course, threading
+	 * primitives available to kexts are few, and I'm not aware of a way to wait for a thread to
+	 * terminate. Hence, the code calls thread_policy_set (passing bogus parameters) in a loop,
+	 * until it returns KERN_TERMINATED. Since this is all rather fragile, there's an upper
+	 * limit on the loop iteratations we're willing to make, so this terminates eventually even
+	 * if things change on the kernel side eventually.
+	 */
+	if (input_thread != THREAD_NULL) {
+		dprintf("Waiting for input thread...\n");
+		kern_return_t result = 0;
+		for (int i = 0; i < 100; ++i) {
+			result = thread_policy_set(input_thread, -1, NULL, 0);
+			dprintf("thread_policy_set result: %d\n", result);
+			if (result == KERN_TERMINATED) {
+				dprintf("Input thread terminated.\n");
+				thread_deallocate(input_thread);
+				input_thread = THREAD_NULL;
+				break;
+			}
+
+			auto_lock l(&thread_sync_lock);
+			thread_sync_lock.sleep(&input_thread, 10000000);
+		}
+	}
+}
+
+errno_t
+tap_interface::if_ioctl(u_int32_t cmd, void *arg)
+{
+	dprintf("tap: if_ioctl cmd: %d (%x)\n", cmd & 0xff, cmd);
+
+	switch (cmd) {
+		case SIOCSIFLLADDR:
+			{
+				/* set ethernet address */
+				struct sockaddr *ea = &(((struct ifreq *) arg)->ifr_addr);
+
+				dprintf("tap: SIOCSIFLLADDR family %d len %d\n",
+						ea->sa_family, ea->sa_len);
+
+				/* check if it is really an ethernet address */
+				if (ea->sa_family != AF_LINK || ea->sa_len != ETHER_ADDR_LEN)
+					return EINVAL;
+
+				/* ok, copy */
+				errno_t err = ifnet_set_lladdr(ifp, ea->sa_data, ETHER_ADDR_LEN);
+				if (err) {
+					dprintf("tap: failed to set lladdr on %s%d: %d\n",
+							family_name, unit, err);
+					return err;
+				}
+
+				/* Generate a LINK_ON event. This necessary for configd to re-read
+				 * the interface data and refresh the MAC address. Not doing so
+				 * would result in the DHCP client using a stale MAC address...
+				 */
+				generate_link_event(KEV_DL_LINK_ON);
+
+				return 0;
+			}
+
+		case SIOCGIFMEDIA32:
+		case SIOCGIFMEDIA64:
+			{
+				struct ifmediareq *ifmr = (struct ifmediareq*) arg;
+				user_addr_t list = USER_ADDR_NULL;
+
+				ifmr->ifm_current = IFM_ETHER;
+				ifmr->ifm_mask = 0;
+				ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE;
+				ifmr->ifm_active = IFM_ETHER;
+				ifmr->ifm_count = 1;
+
+				if (cmd == SIOCGIFMEDIA64)
+					list = ((struct ifmediareq64*) ifmr)->ifmu_ulist;
+				else
+					list = CAST_USER_ADDR_T(
+						((struct ifmediareq32*) ifmr)->ifmu_ulist);
+				
+				if (list != USER_ADDR_NULL)
+					return copyout(&ifmr->ifm_current, list, sizeof(int));
+				
+				return 0;
+			}
+
+		default:
+			/* let our superclass handle it */
+			return tuntap_interface::if_ioctl(cmd, arg);
+	}
+			
+	return EOPNOTSUPP;
+}
+
+errno_t
+tap_interface::if_demux(mbuf_t m, char *header, protocol_family_t *proto)
+{
+	struct ether_header *eh = (struct ether_header *) header;
+	unsigned char lladdr[ETHER_ADDR_LEN];
+
+	dprintf("tap: if_demux\n");
+
+	/* Make note of what input thread this interface is running on. This is part of a hack to
+	 * avoid a crash on re-attaching interfaces, see comment in shutdown_interface for details.
+	 */
+	if (input_thread == THREAD_NULL) {
+		auto_lock l(&thread_sync_lock);
+		input_thread = current_thread();
+		thread_reference(input_thread);
+		thread_sync_lock.wakeup(&input_thread);
+	}
+
+	/* size check */
+	if (mbuf_len(m) < sizeof(struct ether_header))
+		return ENOENT;
+
+	/* catch broadcast and multicast (stolen from bsd/net/ether_if_module.c) */
+	if (eh->ether_dhost[0] & 1) {
+		if (memcmp(ETHER_BROADCAST_ADDR, eh->ether_dhost, ETHER_ADDR_LEN) == 0) {
+			/* broadcast */
+			dprintf("tap: broadcast packet.\n");
+			mbuf_setflags_mask(m, MBUF_BCAST, MBUF_BCAST);
+		} else {
+			/* multicast */
+			dprintf("tap: multicast packet.\n");
+			mbuf_setflags_mask(m, MBUF_MCAST, MBUF_MCAST);
+		}
+	} else {
+		/* check wether the packet has our address */
+		ifnet_lladdr_copy_bytes(ifp, lladdr, ETHER_ADDR_LEN);
+		if (memcmp(lladdr, eh->ether_dhost, ETHER_ADDR_LEN) != 0)
+			mbuf_setflags_mask(m, MBUF_PROMISC, MBUF_PROMISC);
+	}
+
+	/* find the protocol */
+	for (unsigned int i = 0; i < MAX_ATTACHED_PROTOS; i++) {
+		if (attached_protos[i].used && attached_protos[i].type == eh->ether_type) {
+			*proto = attached_protos[i].proto;
+			return 0;
+		}
+	}
+
+	dprintf("tap: if_demux() failed to find proto.\n");
+
+	/* no matching proto found */
+	return ENOENT;
+}
+
+errno_t
+tap_interface::if_framer(mbuf_t *m, const struct sockaddr *dest, const char *dest_linkaddr,
+		const char *frame_type)
+{
+	struct ether_header *eh;
+	mbuf_t nm = *m;
+	errno_t err;
+
+	dprintf("tap: if_framer\n");
+
+	/* prepend the ethernet header */
+	err = mbuf_prepend(&nm, sizeof (struct ether_header), MBUF_WAITOK);
+	if (err) {
+		dprintf("tap: could not prepend data to mbuf: %d\n", err);
+		return err;
+	}
+	*m = nm;
+
+	/* fill the header */
+	eh = (struct ether_header *) mbuf_data(*m);
+	memcpy(eh->ether_dhost, dest_linkaddr, ETHER_ADDR_LEN);
+	ifnet_lladdr_copy_bytes(ifp, eh->ether_shost, ETHER_ADDR_LEN);
+	eh->ether_type = *((u_int16_t *) frame_type);
+
+	return 0;
+}
+
+errno_t
+tap_interface::if_add_proto(protocol_family_t proto, const struct ifnet_demux_desc *desc,
+		u_int32_t ndesc)
+{
+	errno_t err;
+
+	dprintf("tap: if_add_proto proto %d\n", proto);
+
+	for (unsigned int i = 0; i < ndesc; i++) {
+		/* try to add the protocol */
+		err = add_one_proto(proto, desc[i]);
+		if (err != 0) {
+			/* if that fails, remove everything stored so far */
+			if_del_proto(proto);
+			return err;
+		}
+	}
+
+	return 0;
+}
+
+errno_t
+tap_interface::if_del_proto(protocol_family_t proto)
+{
+	dprintf("tap: if_del_proto proto %d\n", proto);
+
+	/* delete all matching entries in attached_protos */
+	for (unsigned int i = 0; i < MAX_ATTACHED_PROTOS; i++) {
+		if (attached_protos[i].proto == proto)
+			attached_protos[i].used = false;
+	}
+
+	return 0;
+}
+
+errno_t
+tap_interface::if_check_multi(const struct sockaddr *maddr)
+{
+	dprintf("tap: if_check_multi family %d\n", maddr->sa_family);
+
+	/* see whether it is a ethernet address with the multicast bit set */
+	if (maddr->sa_family == AF_LINK) {
+		struct sockaddr_dl *dlmaddr = (struct sockaddr_dl *) maddr;
+		if (LLADDR(dlmaddr)[0] & 0x01)
+			return 0;
+		else
+			return EADDRNOTAVAIL;
+	}
+
+	return EOPNOTSUPP;
+}
+
+errno_t
+tap_interface::add_one_proto(protocol_family_t proto, const struct ifnet_demux_desc &dd)
+{
+	int free = -1;
+	u_int16_t dt;
+
+	/* we only support DLIL_DESC_ETYPE2 */
+	if (dd.type != DLIL_DESC_ETYPE2 || dd.datalen != 2) {
+		log(LOG_WARNING, "tap: tap only supports DLIL_DESC_ETYPE2 protocols.\n");
+		return EINVAL;
+	}
+
+	dt = *((u_int16_t *) (dd.data));
+
+	/* see if the protocol is already registered */
+	for (unsigned int i = 0; i < MAX_ATTACHED_PROTOS; i++) {
+		if (attached_protos[i].used) {
+			if (dt == attached_protos[i].type) {
+				/* already registered */
+				if (attached_protos[i].proto == proto) {
+					/* matches the old entry */
+					return 0;
+				} else
+					return EEXIST;
+			}
+		} else if (free == -1)
+			free = i;
+	}
+
+	/* did we find a free entry? */
+	if (free == -1)
+		/* is ENOBUFS correct? */
+		return ENOBUFS;
+
+	/* ok, save information */
+	attached_protos[free].used = true;
+	attached_protos[free].type = dt;
+	attached_protos[free].proto = proto;
+
+	return 0;
+}
+
+/* This code is shamelessly stolen from if_bond.c */
+void
+tap_interface::generate_link_event(u_int32_t code)
+{
+	struct {
+		struct kern_event_msg header;
+		u_int32_t unit;
+		char if_name[IFNAMSIZ];
+	} event;
+
+	bzero(&event, sizeof(event));
+	event.header.total_size = sizeof(event);
+	event.header.vendor_code = KEV_VENDOR_APPLE;
+	event.header.kev_class = KEV_NETWORK_CLASS;
+	event.header.kev_subclass = KEV_DL_SUBCLASS;
+	event.header.event_code = code;
+	event.header.event_data[0] = family;
+	event.unit = (u_int32_t) unit;
+	strncpy(event.if_name, ifnet_name(ifp), IFNAMSIZ);
+
+	ifnet_event(ifp, &event.header);
+}
+
+/* tap_manager members */
+tuntap_interface *
+tap_manager::create_interface()
+{
+	return new tap_interface();
+}
+
diff --git a/ext/tap-mac/tuntap/src/tap/tap.h b/ext/tap-mac/tuntap/src/tap/tap.h
new file mode 100644
index 000000000..a5164d4a1
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/tap/tap.h
@@ -0,0 +1,111 @@
+/*
+ * ethertap device for MacOSX.
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __TAP_H__
+#define __TAP_H__
+
+#include "tuntap.h"
+
+extern "C" {
+
+#include <kern/thread.h>
+
+}
+
+#define TAP_FAMILY_NAME			((char *) "zt")
+#define TAP_IF_COUNT			32	/* max number of tap interfaces */
+#define TAP_MTU				2800
+#define TAP_LLADDR			tap_lladdr
+
+/* the mac address of our interfaces. note that the last byte will be replaced by the unit number */
+extern u_char tap_lladdr[];
+
+/* tap manager */
+class tap_manager : public tuntap_manager {
+
+	protected:
+		/* just define the interface creation method */
+		virtual tuntap_interface *create_interface();
+
+};
+
+/* the tap network interface */
+class tap_interface : public tuntap_interface {
+        public:
+	   	tap_interface();
+
+	protected:
+		/* maximum number of protocols that can be attached */
+		static const unsigned int MAX_ATTACHED_PROTOS = 8;
+
+		/* information about attached protocols for demuxing is stored here */
+		struct {
+			/* whether this entry is used */
+			bool used;
+			/* type in the ethernet header */
+			u_int16_t type;
+			/* protocol passed to add_proto */
+			protocol_family_t proto;
+		} attached_protos[MAX_ATTACHED_PROTOS];
+
+		/* The input thread for the network interface. */
+		thread_t input_thread;
+
+		/* initializes the interface */
+		virtual bool initialize(unsigned short major, unsigned short unit);
+
+		/* shuts the interface down */
+		virtual void shutdown();
+
+		/* called when the character device is opened in order to intialize the network
+		 * interface.
+		 */
+		virtual int initialize_interface();
+		/* called when the character device is closed to shutdown the network interface */
+		virtual void shutdown_interface();
+
+		/* override interface routines */
+		virtual errno_t if_ioctl(u_int32_t cmd, void *arg);
+		virtual errno_t if_demux(mbuf_t m, char *header, protocol_family_t *proto);
+		virtual errno_t if_framer(mbuf_t *m, const struct sockaddr *dest,
+				const char *dest_linkaddr, const char *frame_type);
+		virtual errno_t if_add_proto(protocol_family_t proto,
+				const struct ifnet_demux_desc *ddesc, u_int32_t ndesc);
+		virtual errno_t if_del_proto(protocol_family_t proto);
+		virtual errno_t if_check_multi(const struct sockaddr *maddr);
+
+		/* if_add_proto helper */
+		errno_t add_one_proto(protocol_family_t proto, const struct ifnet_demux_desc &dd);
+
+		/* generates a kernel event */
+		void generate_link_event(u_int32_t code);
+
+		friend class tap_manager;
+};
+
+#endif /* __TAP_H__ */
+
diff --git a/ext/tap-mac/tuntap/src/tuntap.cc b/ext/tap-mac/tuntap/src/tuntap.cc
new file mode 100644
index 000000000..d0f89018b
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/tuntap.cc
@@ -0,0 +1,963 @@
+/*
+ * ip tunnel/ethertap device for MacOSX. Common functionality of tap_interface and tun_interface.
+ *
+ * tuntap_interface class definition
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "tuntap.h"
+
+#if 0
+#define dprintf(...)			log(LOG_INFO, __VA_ARGS__)
+#else
+#define dprintf(...)
+#endif
+
+extern "C" {
+
+#include <sys/conf.h>
+#include <sys/syslog.h>
+#include <sys/param.h>
+#include <sys/filio.h>
+#include <sys/sockio.h>
+#include <sys/fcntl.h>
+#include <sys/kpi_socket.h>
+
+#include <vm/vm_kern.h>
+
+#include <net/if_types.h>
+#include <net/if_var.h>
+#include <net/if_dl.h>
+#include <net/if_arp.h>
+
+#include <miscfs/devfs/devfs.h>
+
+}
+
+extern "C" {
+
+/* interface service functions that delegate to the appropriate tuntap_interface instance */
+errno_t
+tuntap_if_output(ifnet_t ifp, mbuf_t m)
+{
+	if (ifp != NULL) {
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			return ttif->if_output(m);
+	}
+
+	if (m != NULL)
+		mbuf_freem_list(m);
+
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg)
+{
+	if (ifp != NULL) {
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			return ttif->if_ioctl(cmd, arg);
+	}
+
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, int (*cb)(ifnet_t, mbuf_t))
+{
+	if (ifp != NULL) {
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			return ttif->if_set_bpf_tap(mode, cb);
+	}
+
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header, protocol_family_t *proto)
+{
+	if (ifp != NULL) {
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			return ttif->if_demux(m, header, proto);
+	}
+
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_framer(ifnet_t ifp, mbuf_t *m, const struct sockaddr *dest, const char *dest_linkaddr,
+		const char *frame_type)
+{
+	if (ifp != NULL) {
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			return ttif->if_framer(m, dest, dest_linkaddr, frame_type);
+	}
+
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_add_proto(ifnet_t ifp, protocol_family_t proto, const struct ifnet_demux_desc *ddesc,
+		u_int32_t ndesc)
+{
+	if (ifp != NULL) {
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			return ttif->if_add_proto(proto, ddesc, ndesc);
+	}
+
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_del_proto(ifnet_t ifp, protocol_family_t proto)
+{
+	if (ifp != NULL) {
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			return ttif->if_del_proto(proto);
+	}
+
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_check_multi(ifnet_t ifp, const struct sockaddr* maddr)
+{
+	if (ifp != NULL)
+	{
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			return ttif->if_check_multi(maddr);
+	}
+
+	return ENODEV;
+}
+
+void
+tuntap_if_detached(ifnet_t ifp)
+{
+	if (ifp != NULL) {
+		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
+		if (ttif != NULL)
+			ttif->if_detached();
+	}
+}
+
+errno_t
+tuntap_if_noop_output(ifnet_t, mbuf_t)
+{
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_noop_demux(ifnet_t, mbuf_t, char*, protocol_family_t*)
+{
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_noop_add_proto(ifnet_t, protocol_family_t, const struct ifnet_demux_desc*, u_int32_t)
+{
+	return ENODEV;
+}
+
+errno_t
+tuntap_if_noop_del_proto(ifnet_t, protocol_family_t)
+{
+	return ENODEV;
+}
+
+} /* extern "C" */
+
+/* tuntap_mbuf_queue */
+tuntap_mbuf_queue::tuntap_mbuf_queue()
+{
+	head = tail = NULL;
+	size = 0;
+}
+
+tuntap_mbuf_queue::~tuntap_mbuf_queue()
+{
+	clear();
+}
+
+bool
+tuntap_mbuf_queue::enqueue(mbuf_t mb)
+{
+	if (size == QUEUE_SIZE)
+		return false;
+
+	mbuf_setnextpkt(mb, NULL);
+
+	if (head == NULL)
+		head = tail = mb;
+	else {
+		mbuf_setnextpkt(tail, mb);
+		tail = mb;
+	}
+	size++;
+
+	return true;
+}
+
+mbuf_t
+tuntap_mbuf_queue::dequeue()
+{
+	mbuf_t ret;
+
+	/* check wether there is a packet in the queue */
+	if (head == NULL)
+		return NULL;
+
+	/* fetch it */
+	ret = head;
+	head = mbuf_nextpkt(head);
+	mbuf_setnextpkt(ret, NULL);
+	size--;
+
+	return ret;
+}
+
+void
+tuntap_mbuf_queue::clear()
+{
+	/* free mbufs that are in the queue */
+	if (head != NULL)
+		mbuf_freem_list(head);
+
+	head = NULL;
+	tail = NULL;
+	size = 0;
+}
+
+/* tuntap_interface members */
+tuntap_interface::tuntap_interface()
+{
+	/* initialize the members */
+	ifp = NULL;
+	open = false;
+	block_io = true;
+	dev_handle = NULL;
+	pid = 0;
+	selthreadclear(&rsel);
+	bpf_mode = BPF_MODE_DISABLED;
+	bpf_callback = NULL;
+	bzero(unique_id, UIDLEN);
+	in_ioctl = false;
+}
+
+tuntap_interface::~tuntap_interface()
+{
+}
+
+bool
+tuntap_interface::register_chardev(unsigned short major)
+{
+	/* register character device */
+	dev_handle = devfs_make_node(makedev(major, unit), DEVFS_CHAR, 0, 0, 0660, "%s%d",
+			family_name, (int) unit);
+
+	if (dev_handle == NULL) {
+		log(LOG_ERR, "tuntap: could not make /dev/%s%d\n", family_name, (int) unit);
+		return false;
+	}
+
+	return true;
+}
+
+void
+tuntap_interface::unregister_chardev()
+{
+	dprintf("unregistering character device\n");
+
+	/* unregister character device */
+	if (dev_handle != NULL)
+		devfs_remove(dev_handle);
+	dev_handle = NULL;
+}
+
+bool
+tuntap_interface::register_interface(const struct sockaddr_dl* lladdr, void *bcaddr,
+		u_int32_t bcaddrlen)
+{
+	struct ifnet_init_params ip;
+	errno_t err;
+
+	dprintf("register_interface\n");
+
+	/* initialize an initialization info struct */
+	ip.uniqueid_len = UIDLEN;
+	ip.uniqueid = unique_id;
+	ip.name = family_name;
+	ip.unit = unit;
+	ip.family = family;
+	ip.type = type;
+	ip.output = tuntap_if_output;
+	ip.demux = tuntap_if_demux;
+	ip.add_proto = tuntap_if_add_proto;
+	ip.del_proto = tuntap_if_del_proto;
+	ip.check_multi = tuntap_if_check_multi;
+	ip.framer = tuntap_if_framer;
+	ip.softc = this;
+	ip.ioctl = tuntap_if_ioctl;
+	ip.set_bpf_tap = tuntap_if_set_bpf_tap;
+	ip.detach = tuntap_if_detached;
+	ip.event = NULL;
+	ip.broadcast_addr = bcaddr;
+	ip.broadcast_len = bcaddrlen;
+
+	dprintf("tuntap: tuntap_if_check_multi is at 0x%08x\n", (void*) tuntap_if_check_multi);
+
+	/* allocate the interface */
+	err = ifnet_allocate(&ip, &ifp);
+	if (err) {
+		log(LOG_ERR, "tuntap: could not allocate interface for %s%d: %d\n", family_name,
+				(int) unit, err);
+		ifp = NULL;
+		return false;
+	}
+
+	/* activate the interface */
+	err = ifnet_attach(ifp, lladdr);
+	if (err) {
+		log(LOG_ERR, "tuntap: could not attach interface %s%d: %d\n", family_name,
+				(int) unit, err);
+		ifnet_release(ifp);
+		ifp = NULL;
+		return false;
+	}
+
+	dprintf("setting interface flags\n");
+
+	/* set interface flags */
+	ifnet_set_flags(ifp, IFF_RUNNING | IFF_MULTICAST | IFF_SIMPLEX, (u_int16_t) ~0UL);
+
+	dprintf("flags: %x\n", ifnet_flags(ifp));
+	
+	return true;
+}
+
+void
+tuntap_interface::unregister_interface()
+{
+	errno_t err;
+
+	dprintf("unregistering network interface\n");
+
+	if (ifp != NULL) {
+		interface_detached = false;
+
+		/* detach interface */
+		err = ifnet_detach(ifp);
+		if (err)
+			log(LOG_ERR, "tuntap: error detaching interface %s%d: %d\n",
+					family_name, unit, err);
+
+		dprintf("interface detaching\n");
+
+		/* Wait until the interface has completely been detached. */
+		thread_sync_lock.lock();
+		while (!interface_detached)
+			thread_sync_lock.sleep(&interface_detached);
+		thread_sync_lock.unlock();
+
+		dprintf("interface detached\n");
+
+		/* release the interface */
+		ifnet_release(ifp);
+
+		ifp = NULL;
+	}
+
+	dprintf("network interface unregistered\n");
+}
+
+void
+tuntap_interface::cleanup_interface()
+{
+	errno_t err;
+	ifaddr_t *addrs;
+	ifaddr_t *a;
+	struct ifreq ifr;
+
+	/* mark the interface down */
+	ifnet_set_flags(ifp, 0, IFF_UP | IFF_RUNNING);
+
+	/* Unregister all interface addresses. This works around a deficiency in the Darwin kernel.
+	 * If we don't remove all IP addresses that are attached to the interface it can happen that
+	 * the IP code fails to clean them up itself. When the interface is recycled, the IP code
+	 * might then think some addresses are still attached to the interface...
+	 */
+
+	err = ifnet_get_address_list(ifp, &addrs);
+	if (!err) {
+
+		/* Execute a SIOCDIFADDR ioctl for each address. For technical reasons, we can only
+		 * do that with a socket of the appropriate family. So try to create a dummy socket.
+		 * I know this is a little expensive, but better than crashing...
+		 *
+		 * This really sucks.
+		 */
+		for (a = addrs; *a != NULL; a++) {
+			/* initialize the request parameters */
+			snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s%d",
+				ifnet_name(ifp), ifnet_unit(ifp));
+			ifaddr_address(*a, &(ifr.ifr_addr), sizeof(ifr.ifr_addr));
+			if (ifr.ifr_addr.sa_family != AF_INET)
+				continue;
+
+			dprintf("trying to delete address of family %d\n", ifr.ifr_addr.sa_family);
+
+			do_sock_ioctl(ifr.ifr_addr.sa_family, SIOCDIFADDR, &ifr);
+		}
+
+		/* release the address list */
+		ifnet_free_address_list(addrs);
+	}
+}
+
+bool
+tuntap_interface::idle()
+{
+	return !(open);
+}
+
+void
+tuntap_interface::notify_bpf(mbuf_t mb, bool out)
+{
+	auto_lock l(&bpf_lock);
+
+	if ((out && bpf_mode == BPF_MODE_OUTPUT)
+			|| (!out && bpf_mode == BPF_MODE_INPUT)
+			|| (bpf_mode == BPF_MODE_INPUT_OUTPUT))
+		(*bpf_callback)(ifp, mb);
+}
+
+void
+tuntap_interface::do_sock_ioctl(sa_family_t af, unsigned long cmd, void* arg) {
+	if (in_ioctl) {
+		log(LOG_ERR, "tuntap: ioctl recursion detected, aborting.\n");
+		return;
+	}
+
+	socket_t sock;
+	errno_t err = sock_socket(af, SOCK_RAW, 0, NULL, NULL, &sock);
+	if (err) {
+		log(LOG_ERR, "tuntap: failed to create socket: %d\n", err);
+		return;
+	}
+
+	in_ioctl = true;
+
+	/* issue the ioctl */
+	err = sock_ioctl(sock, cmd, arg);
+	if (err)
+		log(LOG_ERR, "tuntap: socket ioctl %d failed: %d\n", cmd, err);
+
+	in_ioctl = false;
+
+	/* get rid of the socket */
+	sock_close(sock);
+}
+
+/* character device service methods */
+int
+tuntap_interface::cdev_open(int flags, int devtype, proc_t p)
+{
+	dprintf("tuntap: cdev_open()\n");
+
+	/* grab the lock so that there can only be one thread inside */
+	auto_lock l(&lock);
+
+	/* check wether it is already open */
+	if (open)
+		return EBUSY;
+
+	/* bring the network interface up */
+	int error = initialize_interface();
+	if (error)
+		return error;
+
+	open = true;
+	pid = proc_pid(p);
+
+	return 0;
+}
+
+int
+tuntap_interface::cdev_close(int flags, int devtype, proc_t p)
+{
+	dprintf("tuntap: cdev_close()\n");
+
+	auto_lock l(&lock);
+
+	if (open) {
+		open = false;
+
+		/* shut down the network interface */
+		shutdown_interface();
+
+		/* clear the queue */
+		send_queue.clear();
+
+		/* wakeup the cdev thread and notify selects */
+		wakeup(this);
+		selwakeup(&rsel);
+
+		return 0;
+	}
+
+	return EBADF;
+}
+
+int
+tuntap_interface::cdev_read(uio_t uio, int ioflag)
+{
+	auto_lock l(&lock);
+
+	unsigned int nb = 0;
+	int error;
+
+	dprintf("tuntap: cdev read\n");
+
+	if (!open || ifp == NULL || !(ifnet_flags(ifp) & IFF_UP))
+		return EIO;
+
+	/* fetch a new mbuf from the queue if necessary */
+	mbuf_t cur_mbuf = NULL;
+	while (cur_mbuf == NULL) {
+		dprintf("tuntap: fetching new mbuf\n");
+
+		cur_mbuf = send_queue.dequeue();
+		if (cur_mbuf == NULL) {
+			/* nothing in queue, block or return */
+			if (!block_io) {
+				dprintf("tuntap: aborting (nbio)\n");
+				return EWOULDBLOCK;
+			} else {
+				/* block */
+				dprintf("tuntap: waiting\n");
+				/* release the lock while waiting */
+				l.unlock();
+				error = msleep(this, NULL, PZERO | PCATCH, "tuntap", NULL);
+
+				l.lock();
+
+				if (error)
+					return error;
+
+				/* see whether the device was closed in the meantime */
+				if (!open || ifp == NULL || !(ifnet_flags(ifp) & IFF_UP))
+					return EIO;
+
+			}
+		}
+	}
+
+	/* notify bpf */
+	notify_bpf(cur_mbuf, true);
+
+	/* output what we have */
+	do {
+		dprintf("tuntap: got new mbuf: %p uio_resid: %d\n", cur_mbuf, uio_resid(uio));
+
+		/* now we have an mbuf */
+		int chunk_len = min(mbuf_len(cur_mbuf), uio_resid(uio));
+		error = uiomove((char *) mbuf_data(cur_mbuf), chunk_len, uio);
+		if (error) {
+			mbuf_freem(cur_mbuf);
+			return error;
+		}
+		nb += chunk_len;
+
+		dprintf("tuntap: moved %d bytes to userspace uio_resid: %d\n", chunk_len,
+				uio_resid(uio));
+
+		/* update cur_mbuf */
+		cur_mbuf = mbuf_free(cur_mbuf);
+
+	} while (uio_resid(uio) > 0 && cur_mbuf != NULL);
+
+	/* update statistics */
+	ifnet_stat_increment_out(ifp, 1, nb, 0);
+
+	/* still data left? forget about that ;-) */
+	if (cur_mbuf != NULL)
+		mbuf_freem(cur_mbuf);
+
+	dprintf("tuntap: read done\n");
+
+	return 0;
+}
+
+int
+tuntap_interface::cdev_write(uio_t uio, int ioflag)
+{
+	auto_lock l(&lock);
+
+	if (!open || ifp == NULL || !(ifnet_flags(ifp) & IFF_UP))
+		return EIO;
+
+	dprintf("tuntap: cdev write. uio_resid: %d\n", uio_resid(uio));
+
+	/* pack the data into an mbuf chain */
+	mbuf_t first, mb;
+
+	/* first we need an mbuf having a header */
+	mbuf_gethdr(MBUF_WAITOK, MBUF_TYPE_DATA, &first);
+	if (first == NULL) {
+		log(LOG_ERR, "tuntap: could not get mbuf.\n");
+		return ENOMEM;
+	}
+	mbuf_setlen(first, 0);
+
+	unsigned int mlen = mbuf_maxlen(first);
+	unsigned int chunk_len;
+	unsigned int copied = 0;
+	unsigned int max_data_len = ifnet_mtu(ifp) + ifnet_hdrlen(ifp);
+	int error;
+
+	/* stuff the data into the mbuf(s) */
+	mb = first;
+	while (uio_resid(uio) > 0) {
+		/* copy a chunk. enforce mtu (don't know if this is correct behaviour) */
+		chunk_len = min(max_data_len - copied, min(uio_resid(uio), mlen));
+		error = uiomove((caddr_t) mbuf_data(mb), chunk_len, uio);
+		if (error) {
+			log(LOG_ERR, "tuntap: could not copy data from userspace: %d\n", error);
+			mbuf_freem(first);
+			return error;
+		}
+
+		dprintf("tuntap: copied %d bytes, uio_resid %d\n", chunk_len,
+				uio_resid(uio));
+
+		mlen -= chunk_len;
+		mbuf_setlen(mb, mbuf_len(mb) + chunk_len);
+		copied += chunk_len;
+
+		/* if done, break the loop */
+		if (uio_resid(uio) <= 0 || copied >= max_data_len)
+			break;
+
+		/* allocate a new mbuf if the current is filled */
+		if (mlen == 0) {
+			mbuf_t next;
+			mbuf_get(MBUF_WAITOK, MBUF_TYPE_DATA, &next);
+			if (next == NULL) {
+				log(LOG_ERR, "tuntap: could not get mbuf.\n");
+				mbuf_freem(first);
+				return ENOMEM;
+			}
+			mbuf_setnext(mb, next);
+			mb = next;
+			mbuf_setlen(mb, 0);
+			mlen = mbuf_maxlen(mb);
+		}
+	}
+
+	/* fill in header info */
+	mbuf_pkthdr_setrcvif(first, ifp);
+	mbuf_pkthdr_setlen(first, copied);
+	mbuf_pkthdr_setheader(first, mbuf_data(first));
+	mbuf_set_csum_performed(first, 0, 0);
+
+	/* update statistics */
+	ifnet_stat_increment_in(ifp, 1, copied, 0);
+
+	dprintf("tuntap: mbuf chain constructed. first: %p mb: %p len: %d data: %p\n",
+			first, mb, mbuf_len(first), mbuf_data(first));
+
+	/* notify bpf */
+	notify_bpf(first, false);
+
+	/* need to adjust the data pointer to point directly behind the linklevel header. The header
+	 * itself is later accessed via m_pkthdr.header. Well, if something is ugly, here is it.
+	 */
+	mbuf_adj(first, ifnet_hdrlen(ifp));
+
+	/* pass the packet over to the network stack */
+	error = ifnet_input(ifp, first, NULL);
+
+	if (error) {
+		log(LOG_ERR, "tuntap: could not input packet into network stack.\n");
+		mbuf_freem(first);
+		return error;
+	}
+
+	return 0;
+}
+
+int
+tuntap_interface::cdev_ioctl(u_long cmd, caddr_t data, int fflag, proc_t p)
+{
+	auto_lock l(&lock);
+
+	dprintf("tuntap: cdev ioctl: %d\n", (int) (cmd & 0xff));
+
+	switch (cmd) {
+		case FIONBIO:
+			/* set i/o mode */
+			block_io = *((int *) data) ? false : true;
+			return 0;
+		case FIOASYNC:
+			/* don't allow switching it on */
+			if (*((int *) data))
+				return ENOTTY;
+			return 0;
+	}
+
+	return ENOTTY;
+}
+
+int
+tuntap_interface::cdev_select(int which, void *wql, proc_t p)
+{
+	auto_lock l(&lock);
+
+	int ret = 0;
+
+	dprintf("tuntap: select. which: %d\n", which);
+
+	switch (which) {
+		case FREAD:
+			/* check wether data is available */
+			{
+				if (!send_queue.empty())
+					ret = 1;
+				else {
+					dprintf("tuntap: select: waiting\n");
+					selrecord(p, &rsel, wql);
+				}
+			}
+			break;
+		case FWRITE:
+			/* we are always writeable */
+			ret = 1;
+	}
+
+	return ret;
+}
+
+/* interface service methods */
+errno_t
+tuntap_interface::if_output(mbuf_t m)
+{
+	mbuf_t pkt;
+
+	dprintf("tuntap: if output\n");
+
+	/* just to be sure */
+	if (m == NULL)
+		return 0;
+
+	if (!open || ifp == NULL || !(ifnet_flags(ifp) & IFF_UP)) {
+		mbuf_freem_list(m);
+		return EHOSTDOWN;
+	}
+
+	/* check whether packet has a header */
+	if ((mbuf_flags(m) & MBUF_PKTHDR) == 0) {
+		log(LOG_ERR, "tuntap: packet to be output has no mbuf header.\n");
+		mbuf_freem_list(m);
+		return EINVAL;
+	}
+
+	/* put the packet(s) into the output queue */
+	while (m != NULL) {
+		/* keep pointer, iterate */
+		pkt = m;
+		m = mbuf_nextpkt(m);
+		mbuf_setnextpkt(pkt, NULL);
+
+		auto_lock l(&lock);
+
+		if (!send_queue.enqueue(pkt)) {
+			mbuf_freem(pkt);
+			mbuf_freem_list(m);
+			return ENOBUFS;
+		}
+	}
+
+	/* protect the wakeup calls with the lock, not sure they are safe. */
+	{
+		auto_lock l(&lock);
+
+		/* wakeup the cdev thread and notify selects */
+		wakeup(this);
+		selwakeup(&rsel);
+	}
+
+	return 0;
+}
+
+errno_t
+tuntap_interface::if_ioctl(u_int32_t cmd, void *arg)
+{
+	dprintf("tuntap: if ioctl: %d\n", (int) (cmd & 0xff));
+
+	switch (cmd) {
+		case SIOCSIFADDR:
+			{
+				dprintf("tuntap: if_ioctl: SIOCSIFADDR\n");
+
+				/* Unfortunately, ifconfig sets the address family field of an INET
+				 * netmask to zero, which makes early mDNSresponder versions ignore
+				 * the interface. Fix that here. This one is of the category "ugly
+				 * workaround". Dumb Darwin...
+				 *
+				 * Meanwhile, Apple has fixed mDNSResponder, and recent versions of
+				 * Leopard don't need this hack anymore. However, Tiger still has a
+				 * broken version so we leave the hack in for now.
+				 *
+				 * TODO: Revisit when dropping Tiger support.
+				 *
+				 * Btw. If you configure other network interfaces using ifconfig,
+				 * you run into the same problem. I still don't know how to make the
+				 * tap devices show up in the network configuration panel...
+				 */
+				ifaddr_t ifa = (ifaddr_t) arg;
+				if (ifa == NULL)
+					return 0;
+
+				sa_family_t af = ifaddr_address_family(ifa);
+				if (af != AF_INET)
+					return 0;
+
+				struct ifaliasreq ifra;
+				int sa_size = sizeof(struct sockaddr);
+				if (ifaddr_address(ifa, &ifra.ifra_addr, sa_size)
+					|| ifaddr_dstaddress(ifa, &ifra.ifra_broadaddr, sa_size)
+					|| ifaddr_netmask(ifa, &ifra.ifra_mask, sa_size)) {
+					log(LOG_WARNING,
+						"tuntap: failed to parse interface address.\n");
+					return 0;
+				}
+
+				// Check that the address family fields match. If not, issue another
+				// SIOCAIFADDR to fix the entry.
+				if (ifra.ifra_addr.sa_family != af
+					|| ifra.ifra_broadaddr.sa_family != af
+					|| ifra.ifra_mask.sa_family != af) {
+					log(LOG_INFO, "tuntap: Fixing address family for %s%d\n",
+						family_name, unit);
+
+					snprintf(ifra.ifra_name, sizeof(ifra.ifra_name), "%s%d",
+						family_name, unit);
+					ifra.ifra_addr.sa_family = af;
+					ifra.ifra_broadaddr.sa_family = af;
+					ifra.ifra_mask.sa_family = af;
+
+					do_sock_ioctl(af, SIOCAIFADDR, &ifra);
+				}
+
+				return 0;
+			}
+
+		case SIOCSIFFLAGS:
+			return 0;
+
+		case SIOCGIFSTATUS:
+			{
+				struct ifstat *stat = (struct ifstat *) arg;
+				int len;
+				char *p;
+
+				if (stat == NULL)
+					return EINVAL;
+
+				/* print status */
+				len = strlen(stat->ascii);
+				p = stat->ascii + len;
+				if (open) {
+					snprintf(p, IFSTATMAX - len, "\topen (pid %u)\n", pid);
+				} else {
+					snprintf(p, IFSTATMAX - len, "\tclosed\n");
+				}
+
+				return 0;
+			}
+
+		case SIOCSIFMTU:
+			{
+				struct ifreq *ifr = (struct ifreq *) arg;
+
+				if (ifr == NULL)
+					return EINVAL;
+
+				ifnet_set_mtu(ifp, ifr->ifr_mtu);
+
+				return 0;
+			}
+
+		case SIOCDIFADDR:
+			return 0;
+
+	}
+
+	return EOPNOTSUPP;
+}
+
+errno_t
+tuntap_interface::if_set_bpf_tap(bpf_tap_mode mode, int (*cb)(ifnet_t, mbuf_t))
+{
+	dprintf("tuntap: mode %d\n", mode);
+
+	auto_lock l(&bpf_lock);
+
+	bpf_callback = cb;
+	bpf_mode = mode;
+
+	return 0;
+}
+
+errno_t
+tuntap_interface::if_check_multi(const struct sockaddr *maddr)
+{
+	dprintf("tuntap: if_check_multi\n");
+
+	return EOPNOTSUPP;
+}
+
+void
+tuntap_interface::if_detached()
+{
+	dprintf("tuntap: if_detached\n");
+
+	/* wake unregister_interface() */
+	thread_sync_lock.lock();
+	interface_detached = true;
+	thread_sync_lock.wakeup(&interface_detached);
+	thread_sync_lock.unlock();
+
+	dprintf("if_detached done\n");
+}
+
diff --git a/ext/tap-mac/tuntap/src/tuntap.h b/ext/tap-mac/tuntap/src/tuntap.h
new file mode 100644
index 000000000..d5f398d01
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/tuntap.h
@@ -0,0 +1,301 @@
+/*
+ * ip tunnel/ethertap device for MacOSX.
+ *
+ * The class tuntaptap_interface contains the common functionality of tuntap_interface and
+ * tap_interface.
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __TUNTAP_H__
+#define __TUNTAP_H__
+
+#include "util.h"
+#include "lock.h"
+
+extern "C" {
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/systm.h>
+#include <sys/kpi_mbuf.h>
+
+#include <kern/locks.h>
+
+#include <net/if.h>
+#include <net/bpf.h>
+#include <net/kpi_interface.h>
+
+}
+
+extern "C" {
+
+errno_t tuntap_if_output(ifnet_t ifp, mbuf_t m);
+errno_t tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg);
+errno_t tuntap_if_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, int (*cb)(ifnet_t, mbuf_t));
+errno_t tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header, protocol_family_t *proto);
+errno_t tuntap_if_framer(ifnet_t ifp, mbuf_t *m, const struct sockaddr *dest,
+		const char *dest_linkaddr, const char *frame_type);
+errno_t tuntap_if_add_proto(ifnet_t ifp, protocol_family_t proto,
+		const struct ifnet_demux_desc *ddesc, u_int32_t ndesc);
+errno_t tuntap_if_del_proto(ifnet_t ifp, protocol_family_t proto);
+errno_t tuntap_if_check_multi(ifnet_t ifp, const struct sockaddr *maddr);
+void tuntap_if_detached(ifnet_t ifp);
+
+}
+
+/* forward declaration */
+class tuntap_interface;
+
+/* both interface families have their manager object that will create, initialize, shutdown and
+ * delete interfaces. This is (mostly) generic so it can be used both for tun and tap. The only
+ * exception is the interface creation, therefore this class is abstract. tun and tap have their own
+ * versions that simply fill in create_interface().
+ */
+class tuntap_manager {
+
+	protected:
+		/* manager cdev gate */
+		tt_gate cdev_gate;
+		/* interface count */
+		unsigned int count;
+		/* an array holding all the interface instances */
+		tuntap_interface **tuntaps;
+		/* the major device number */
+		int dev_major;
+		/* family name */
+		char *family;
+
+		/* wether static members are initialized */
+		static bool statics_initialized;
+
+		/* major-to-manager-map */
+		static const int MAX_CDEV = 256;
+		static tuntap_manager *mgr_map[MAX_CDEV];
+
+		/* initializes static members */
+		void initialize_statics();
+
+	public:
+		/* sets major device number, allocates the interface table. */
+		bool initialize(unsigned int count, char *family);
+
+		/* tries to shutdown the family. returns true if successful. the manager object may
+		 * not be deleted if this wasn't called successfully.
+		 */
+		bool shutdown();
+
+		/* the destructor deletes allocated memory and unregisters the character device
+		 * switch */
+		virtual ~tuntap_manager();
+
+		/* here are the cdev routines for the class. They will figure out the manager object
+		 * and call the service methods declared below.
+		 */
+		static int cdev_open(dev_t dev, int flags, int devtype, proc_t p);
+		static int cdev_close(dev_t dev, int flags, int devtype, proc_t p);
+		static int cdev_read(dev_t dev, uio_t uio, int ioflag);
+		static int cdev_write(dev_t dev, uio_t uio, int ioflag);
+		static int cdev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag,
+				proc_t p);
+		static int cdev_select(dev_t dev, int which, void *wql, proc_t p);
+
+	protected:
+		/* Here are the actual service routines that will do the required things (creating
+		 * interfaces and such) and forward to the interface's implementation.
+		 */
+		int do_cdev_open(dev_t dev, int flags, int devtype, proc_t p);
+		int do_cdev_close(dev_t dev, int flags, int devtype, proc_t p);
+		int do_cdev_read(dev_t dev, uio_t uio, int ioflag);
+		int do_cdev_write(dev_t dev, uio_t uio, int ioflag);
+		int do_cdev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, proc_t p);
+		int do_cdev_select(dev_t dev, int which, void *wql, proc_t p);
+
+		/* abstract method that will create an interface. Implemented by tun and tap */
+		virtual tuntap_interface *create_interface() = 0;
+		
+		/* makes sure there is one idle interface available (if nothing fails */
+		void ensure_idle_device();
+
+};
+
+/* a class implementing a mbuf packet queue. On Darwin 7 we had struct ifqueue, but that is now
+ * internal to the kernel for Darwin 8. So lets have our own.
+ */
+class tuntap_mbuf_queue {
+
+	private:
+		/* output end of the queue. dequeueing takes mbufs from here */
+		mbuf_t head;
+		/* input end. new mbufs are appended here. */
+		mbuf_t tail;
+
+		/* size */
+		unsigned int size;
+
+		/* maximum queue size */
+		static const unsigned int QUEUE_SIZE = 128;
+
+	public:
+		/* initialize new empty queue */
+		tuntap_mbuf_queue();
+		~tuntap_mbuf_queue();
+
+		/* is the queue full? */
+		bool full() { return size == QUEUE_SIZE; }
+		/* is it emtpy? */
+		bool empty() { return size == 0; }
+
+		/* enqueue an mbuf. returns true if there was space left, so the mbuf could be
+		 * queued, false otherwise */
+		bool enqueue(mbuf_t mb);
+
+		/* tries to dequeue the next mbuf. If the queue is empty, NULL is returned */
+		mbuf_t dequeue();
+
+		/* makes the queue empty, discarding any queue packets */
+		void clear();
+};
+
+class tuntap_interface {
+
+	protected:
+		/* interface number */
+		unsigned int unit;
+		/* family name */
+		char *family_name;
+		/* family identifier */
+		ifnet_family_t family;
+		/* interface type */
+		u_int32_t type;
+		/* id string */
+		static const unsigned int UIDLEN = 20;
+		char unique_id[UIDLEN];
+
+		/* synchronization */
+		tt_mutex lock;
+		tt_mutex bpf_lock;
+		tt_mutex thread_sync_lock;
+
+		/* the interface structure registered */
+		ifnet_t ifp;
+		/* whether the device has been opened */
+		bool open;
+		/* whether we are doing blocking i/o */
+		bool block_io;
+		/* whether the interface has properly been detached */
+		bool interface_detached;
+		/* handle to the devfs node for the character device */
+		void *dev_handle;
+		/* the pid of the process that opened the cdev, if any */
+		pid_t pid;
+		/* read select info */
+		struct selinfo rsel;
+		/* bpf mode, wether filtering is on or off */
+		bpf_tap_mode bpf_mode;
+		/* bpf callback. called when packet arrives/leaves */
+		int (*bpf_callback)(ifnet_t, mbuf_t);
+		/* pending packets queue (for output), must be accessed with the lock held */
+		tuntap_mbuf_queue send_queue;
+		/* whether an ioctl that we issued is currently being processed */
+		bool in_ioctl;
+
+		/* protected constructor. initializes most of the members */
+		tuntap_interface();
+		virtual ~tuntap_interface();
+
+		/* initialize the device */
+		virtual bool initialize(unsigned short major, unsigned short unit) = 0;
+
+		/* character device management */
+		virtual bool register_chardev(unsigned short major);
+		virtual void unregister_chardev();
+
+		/* network interface management */
+		virtual bool register_interface(const struct sockaddr_dl *lladdr,
+				void *bcaddr, u_int32_t bcaddrlen);
+		virtual void unregister_interface();
+		virtual void cleanup_interface();
+
+		/* called when the character device is opened in order to intialize the network
+		 * interface.
+		 */
+		virtual int initialize_interface() = 0;
+		/* called when the character device is closed to shutdown the network interface */
+		virtual void shutdown_interface() = 0;
+
+		/* check wether the interface is idle (so it can be brought down) */
+		virtual bool idle();
+
+		/* shut it down */
+		virtual void shutdown() = 0;
+
+		/* notifies BPF of a packet coming through */
+		virtual void notify_bpf(mbuf_t mb, bool out);
+
+		/* executes a socket ioctl through a temporary socket */
+		virtual void do_sock_ioctl(sa_family_t af, unsigned long cmd, void* arg);
+
+		/* character device service methods. Called by the manager */
+		virtual int cdev_open(int flags, int devtype, proc_t p);
+		virtual int cdev_close(int flags, int devtype, proc_t p);
+		virtual int cdev_read(uio_t uio, int ioflag);
+		virtual int cdev_write(uio_t uio, int ioflag);
+		virtual int cdev_ioctl(u_long cmd, caddr_t data, int fflag, proc_t p);
+		virtual int cdev_select(int which, void *wql, proc_t p);
+
+		/* interface functions. friends and implementation methods */
+		friend errno_t tuntap_if_output(ifnet_t ifp, mbuf_t m);
+		friend errno_t tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg);
+		friend errno_t tuntap_if_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode,
+				int (*cb)(ifnet_t, mbuf_t));
+		friend errno_t tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header,
+				protocol_family_t *proto);
+		friend errno_t tuntap_if_framer(ifnet_t ifp, mbuf_t *m, const struct sockaddr *dest,
+				const char *dest_linkaddr, const char *frame_type);
+		friend errno_t tuntap_if_add_proto(ifnet_t ifp, protocol_family_t proto,
+				const struct ifnet_demux_desc *ddesc, u_int32_t ndesc);
+		friend errno_t tuntap_if_del_proto(ifnet_t ifp, protocol_family_t proto);
+		friend errno_t tuntap_if_check_multi(ifnet_t ifp, const struct sockaddr *maddr);
+		friend void tuntap_if_detached(ifnet_t ifp);
+
+		virtual errno_t if_output(mbuf_t m);
+		virtual errno_t if_ioctl(u_int32_t cmd, void *arg);
+		virtual errno_t if_set_bpf_tap(bpf_tap_mode mode, int (*cb)(ifnet_t, mbuf_t));
+		virtual errno_t if_demux(mbuf_t m, char *header, protocol_family_t *proto) = 0;
+		virtual errno_t if_framer(mbuf_t *m, const struct sockaddr *dest,
+				const char *dest_linkaddr, const char *frame_type) = 0;
+		virtual errno_t if_add_proto(protocol_family_t proto,
+				const struct ifnet_demux_desc *ddesc, u_int32_t ndesc) = 0;
+		virtual errno_t if_del_proto(protocol_family_t proto) = 0;
+		virtual errno_t if_check_multi(const struct sockaddr *maddr);
+		virtual void if_detached();
+
+		/* tuntap_manager feeds us with cdev input, so it is our friend */
+		friend class tuntap_manager;
+};
+
+#endif /* __TUNTAP_H__ */
+
diff --git a/ext/tap-mac/tuntap/src/tuntap_mgr.cc b/ext/tap-mac/tuntap/src/tuntap_mgr.cc
new file mode 100644
index 000000000..f41394e9d
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/tuntap_mgr.cc
@@ -0,0 +1,372 @@
+/*
+ * ip tunnel/ethertap device for MacOSX.
+ *
+ * tuntap_manager definition.
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "tuntap.h"
+#include "mem.h"
+
+extern "C" {
+
+#include <sys/conf.h>
+#include <sys/param.h>
+#include <sys/syslog.h>
+#include <sys/systm.h>
+
+#include <vm/vm_kern.h>
+
+#include <miscfs/devfs/devfs.h>
+
+}
+
+#if 0
+#define dprintf(...)			log(LOG_INFO, __VA_ARGS__)
+#else
+#define dprintf(...)
+#endif
+
+/* cdevsw for tuntap_manager */
+static struct cdevsw mgr_cdevsw =
+{
+	tuntap_manager::cdev_open,
+	tuntap_manager::cdev_close,
+	tuntap_manager::cdev_read,
+	tuntap_manager::cdev_write,
+	tuntap_manager::cdev_ioctl,
+	eno_stop,
+	eno_reset,
+	NULL,
+	tuntap_manager::cdev_select,
+	eno_mmap,
+	eno_strat,
+	eno_getc,
+	eno_putc,
+	0
+};
+
+/* tuntap_manager members */
+tuntap_manager *tuntap_manager::mgr_map[MAX_CDEV];
+
+bool tuntap_manager::statics_initialized = false;
+
+/* static initializer */
+void
+tuntap_manager::initialize_statics()
+{
+	dprintf("initializing mgr_map\n");
+
+	/* initialize the major-to-manager map */
+	for (int i = 0; i < MAX_CDEV; i++)
+		mgr_map[i] = NULL;
+
+	statics_initialized = true;
+}
+
+bool
+tuntap_manager::initialize(unsigned int count, char *family)
+{
+	this->count = count;
+	this->family = family;
+	this->tuntaps = NULL;
+
+	if (!statics_initialized)
+		initialize_statics();
+
+	/* make sure noone can access the character devices until we are done */
+	auto_lock l(&cdev_gate);
+
+	/* register the switch for the tap character devices */
+	dev_major = cdevsw_add(-1, &mgr_cdevsw);
+	if (dev_major == -1) {
+		log(LOG_ERR, "%s: could not register character device switch.\n", family);
+		return false;
+	}
+
+	/* allocate memory for the interface instance table */
+	tuntaps = (tuntap_interface **) mem_alloc(count * sizeof(tuntap_interface *));
+	if (tuntaps == NULL)
+	{
+		log(LOG_ERR, "%s: no memory!\n", family);
+		return false;
+	}
+
+	bzero(tuntaps, count * sizeof(tuntap_interface *));
+
+	/* Create the interfaces. This will only add the character devices. The network devices will
+	 * be created upon open()ing the corresponding character devices.
+	 */
+	for (int i = 0; i < (int) count; i++)
+	{
+		tuntaps[i] = create_interface();
+
+		if (tuntaps[i] != NULL)
+		{
+			if (tuntaps[i]->initialize(dev_major, i))
+			{
+				continue;
+			}
+
+			/* error here. current interface needs to be shut down */
+			i++;
+		}
+
+		/* something went wrong. clean up. */
+		while (--i >= 0)
+		{
+			tuntaps[i]->shutdown();
+			delete  tuntaps[i];
+		}
+
+		return false;
+	}
+
+	/* register the new family in the mgr switch */
+	mgr_map[dev_major] = this;
+
+	log(LOG_INFO, "%s kernel extension version %s <mattias.nissler@gmx.de>\n",
+			family, TUNTAP_VERSION);
+
+	return true;
+}
+
+bool
+tuntap_manager::shutdown()
+{
+	bool ok = true;
+
+	/* we halt the whole thing while we check whether we can shutdown */
+	auto_lock l(&cdev_gate);
+
+	/* anyone in? */
+	if (cdev_gate.is_anyone_in()) {
+		dprintf("tuntap_mgr: won't shutdown, threads still behind the gate.");
+		ok = false;
+	} else {
+		/* query the interfaces to see if shutting down is ok */
+		if (tuntaps != NULL) {
+			for (unsigned int i = 0; i < count; i++) {
+				if (tuntaps[i] != NULL)
+					ok &= tuntaps[i]->idle();
+			}
+
+			/* if yes, do it now */
+			if (ok) {
+				for (unsigned int i = 0; i < count; i++) {
+					if (tuntaps[i] != NULL) {
+						tuntaps[i]->shutdown();
+						delete tuntaps[i];
+						tuntaps[i] = NULL;
+					}
+				}
+			}
+		}
+	}
+
+	/* unregister the character device switch */
+	if (ok) {
+		if (dev_major != -1 && cdevsw_remove(dev_major, &mgr_cdevsw) == -1) {
+			log(LOG_WARNING,
+				"%s: character device switch got lost. strange.\n", family);
+		}
+		mgr_map[dev_major] = NULL;
+		dev_major = -1;
+
+		/* at this point there is still a chance that some thread hangs at the cdev_gate in
+		 * one of the cdev service functions. I can't imagine any way that would aviod this.
+		 * So lets unblock the gate such that they fail.
+		 */
+		unsigned int old_number;
+		do {
+			old_number = cdev_gate.get_ticket_number();
+
+			dprintf("tuntap_manager: waiting for other threads to give up.\n");
+
+			/* wait one second */
+			cdev_gate.sleep(&cdev_gate, 1000000);
+
+		} while (cdev_gate.get_ticket_number() != old_number);
+
+		/* I hope it is safe to unload now. */
+
+	} else {
+		log(LOG_WARNING, "%s: won't unload, at least one interface is busy.\n", family);
+	}
+
+	dprintf("tuntap manager: shutdown %s\n", ok ? "ok" : "failed");
+
+	return ok;
+}
+
+tuntap_manager::~tuntap_manager()
+{
+	dprintf("freeing interface table\n");
+
+	/* free memory */
+	if (tuntaps != NULL)
+		mem_free(tuntaps, count * sizeof(tuntap_interface *));
+}
+
+/* service method dispatchers */
+int
+tuntap_manager::cdev_open(dev_t dev, int flags, int devtype, proc_t p)
+{
+	return (mgr_map[major(dev)] == NULL ? ENOENT
+			: mgr_map[major(dev)]->do_cdev_open(dev, flags, devtype, p));
+}
+
+int
+tuntap_manager::cdev_close(dev_t dev, int flags, int devtype, proc_t p)
+{
+	return (mgr_map[major(dev)] == NULL ? EBADF
+			: mgr_map[major(dev)]->do_cdev_close(dev, flags, devtype, p));
+}
+
+int
+tuntap_manager::cdev_read(dev_t dev, uio_t uio, int ioflag)
+{
+	return (mgr_map[major(dev)] == NULL ? EBADF
+			: mgr_map[major(dev)]->do_cdev_read(dev, uio, ioflag));
+}
+
+int
+tuntap_manager::cdev_write(dev_t dev, uio_t uio, int ioflag)
+{
+	return (mgr_map[major(dev)] == NULL ? EBADF
+			: mgr_map[major(dev)]->do_cdev_write(dev, uio, ioflag));
+}
+
+int
+tuntap_manager::cdev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, proc_t p)
+{
+	return (mgr_map[major(dev)] == NULL ? EBADF
+			: mgr_map[major(dev)]->do_cdev_ioctl(dev, cmd, data, fflag, p));
+}
+
+int
+tuntap_manager::cdev_select(dev_t dev, int which, void *wql, proc_t p)
+{
+	return (mgr_map[major(dev)] == NULL ? EBADF
+			: mgr_map[major(dev)]->do_cdev_select(dev, which, wql, p));
+}
+
+/* character device service methods */
+int
+tuntap_manager::do_cdev_open(dev_t dev, int flags, int devtype, proc_t p)
+{
+	int dmin = minor(dev);
+	int error = ENOENT;
+
+	cdev_gate.enter();
+
+	if (dmin < (int) count && dmin >= 0 && tuntaps[dmin] != NULL)
+		error = tuntaps[dmin]->cdev_open(flags, devtype, p);
+
+	cdev_gate.exit();
+
+	return error;
+}
+
+int
+tuntap_manager::do_cdev_close(dev_t dev, int flags, int devtype, proc_t p)
+{
+	int dmin = minor(dev);
+	int error = EBADF;
+
+	cdev_gate.enter();
+
+	if (dmin < (int) count && dmin >= 0 && tuntaps[dmin] != NULL)
+		error = tuntaps[dmin]->cdev_close(flags, devtype, p);
+
+	cdev_gate.exit();
+
+	return error;
+}
+
+int
+tuntap_manager::do_cdev_read(dev_t dev, uio_t uio, int ioflag)
+{
+	int dmin = minor(dev);
+	int error = EBADF;
+
+	cdev_gate.enter();
+
+	if (dmin < (int) count && dmin >= 0 && tuntaps[dmin] != NULL)
+		error = tuntaps[dmin]->cdev_read(uio, ioflag);
+
+	cdev_gate.exit();
+	
+	return error;
+}
+
+int
+tuntap_manager::do_cdev_write(dev_t dev, uio_t uio, int ioflag)
+{
+	int dmin = minor(dev);
+	int error = EBADF;
+
+	cdev_gate.enter();
+
+	if (dmin < (int) count && dmin >= 0 && tuntaps[dmin] != NULL)
+		error = tuntaps[dmin]->cdev_write(uio, ioflag);
+
+	cdev_gate.exit();
+	
+	return error;
+}
+
+int
+tuntap_manager::do_cdev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, proc_t p)
+{
+	int dmin = minor(dev);
+	int error = EBADF;
+
+	cdev_gate.enter();
+
+	if (dmin < (int) count && dmin >= 0 && tuntaps[dmin] != NULL)
+		error = tuntaps[dmin]->cdev_ioctl(cmd, data, fflag, p);
+
+	cdev_gate.exit();
+	
+	return error;
+}
+
+int
+tuntap_manager::do_cdev_select(dev_t dev, int which, void *wql, proc_t p)
+{
+	int dmin = minor(dev);
+	int error = EBADF;
+
+	cdev_gate.enter();
+
+	if (dmin < (int) count && dmin >= 0 && tuntaps[dmin] != NULL)
+		error = tuntaps[dmin]->cdev_select(which, wql, p);
+
+	cdev_gate.exit();
+	
+	return error;
+}
+
diff --git a/ext/tap-mac/tuntap/src/util.h b/ext/tap-mac/tuntap/src/util.h
new file mode 100644
index 000000000..0f6955e8e
--- /dev/null
+++ b/ext/tap-mac/tuntap/src/util.h
@@ -0,0 +1,46 @@
+/*
+ * ip tunnel/ethertap device for MacOSX.
+ *
+ * Some utilities and misc stuff.
+ */
+/*
+ * Copyright (c) 2011 Mattias Nissler <mattias.nissler@gmx.de>
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ *      conditions and the following disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __UTIL_H__
+#define __UTIL_H__
+
+extern "C" {
+
+/* In Darwin 8 (OS X Tiger) there is a problem with struct selinfo. It was made `private' to the
+ * kernel, so its definition is not available from the headers in Kernel.framework. However, we need
+ * to declare something :-(
+ */
+struct selinfo {
+	char data[128];	/* should be enough... */
+};
+
+} /* extern "C" */
+
+#endif /* __UTIL_H__ */
+
diff --git a/ext/x64-salsa2012-asm/README.md b/ext/x64-salsa2012-asm/README.md
deleted file mode 100644
index a69a1a671..000000000
--- a/ext/x64-salsa2012-asm/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Blazingly fast X64 ASM implementation of Salsa20/12
-======
-
-This is ripped from the [cnacl](https://github.com/cjdelisle/cnacl) source. The actual code is by Danial J. Bernstein and is in the public domain.
-
-This is included on Linux and Mac 64-bit builds and is significantly faster than the SSE intrinsics or C versions. It's used for packet encode/decode only since its use differs a bit from the regular Salsa20 C++ class. Specifically it lacks the ability to be called on multiple blocks, preferring instead to take a key and a single stream to encrypt and that's it.
diff --git a/ext/x64-salsa2012-asm/salsa2012.h b/ext/x64-salsa2012-asm/salsa2012.h
deleted file mode 100644
index 73e375ebe..000000000
--- a/ext/x64-salsa2012-asm/salsa2012.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef ZT_X64_SALSA2012_ASM
-#define ZT_X64_SALSA2012_ASM
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Generates Salsa20/12 key stream
-// output, outlen, nonce, key (256-bit / 32-byte)
-extern int zt_salsa2012_amd64_xmm6(unsigned char *, unsigned long long, const unsigned char *, const unsigned char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/ext/x64-salsa2012-asm/salsa2012.s b/ext/x64-salsa2012-asm/salsa2012.s
deleted file mode 100644
index 699c89ac6..000000000
--- a/ext/x64-salsa2012-asm/salsa2012.s
+++ /dev/null
@@ -1,4488 +0,0 @@
-# qhasm: enter zt_salsa2012_amd64_xmm6
-.text
-.p2align 5
-.globl _zt_salsa2012_amd64_xmm6
-.globl zt_salsa2012_amd64_xmm6
-_zt_salsa2012_amd64_xmm6:
-zt_salsa2012_amd64_xmm6:
-mov %rsp,%r11
-and $31,%r11
-add $480,%r11
-sub %r11,%rsp
-
-# qhasm: r11_stack = r11_caller
-# asm 1: movq <r11_caller=int64#9,>r11_stack=stack64#1
-# asm 2: movq <r11_caller=%r11,>r11_stack=352(%rsp)
-movq %r11,352(%rsp)
-
-# qhasm: r12_stack = r12_caller
-# asm 1: movq <r12_caller=int64#10,>r12_stack=stack64#2
-# asm 2: movq <r12_caller=%r12,>r12_stack=360(%rsp)
-movq %r12,360(%rsp)
-
-# qhasm: r13_stack = r13_caller
-# asm 1: movq <r13_caller=int64#11,>r13_stack=stack64#3
-# asm 2: movq <r13_caller=%r13,>r13_stack=368(%rsp)
-movq %r13,368(%rsp)
-
-# qhasm: r14_stack = r14_caller
-# asm 1: movq <r14_caller=int64#12,>r14_stack=stack64#4
-# asm 2: movq <r14_caller=%r14,>r14_stack=376(%rsp)
-movq %r14,376(%rsp)
-
-# qhasm: r15_stack = r15_caller
-# asm 1: movq <r15_caller=int64#13,>r15_stack=stack64#5
-# asm 2: movq <r15_caller=%r15,>r15_stack=384(%rsp)
-movq %r15,384(%rsp)
-
-# qhasm: rbx_stack = rbx_caller
-# asm 1: movq <rbx_caller=int64#14,>rbx_stack=stack64#6
-# asm 2: movq <rbx_caller=%rbx,>rbx_stack=392(%rsp)
-movq %rbx,392(%rsp)
-
-# qhasm: rbp_stack = rbp_caller
-# asm 1: movq <rbp_caller=int64#15,>rbp_stack=stack64#7
-# asm 2: movq <rbp_caller=%rbp,>rbp_stack=400(%rsp)
-movq %rbp,400(%rsp)
-
-# qhasm: bytes = arg2
-# asm 1: mov  <arg2=int64#2,>bytes=int64#6
-# asm 2: mov  <arg2=%rsi,>bytes=%r9
-mov  %rsi,%r9
-
-# qhasm: out = arg1
-# asm 1: mov  <arg1=int64#1,>out=int64#1
-# asm 2: mov  <arg1=%rdi,>out=%rdi
-mov  %rdi,%rdi
-
-# qhasm: m = out
-# asm 1: mov  <out=int64#1,>m=int64#2
-# asm 2: mov  <out=%rdi,>m=%rsi
-mov  %rdi,%rsi
-
-# qhasm: iv = arg3
-# asm 1: mov  <arg3=int64#3,>iv=int64#3
-# asm 2: mov  <arg3=%rdx,>iv=%rdx
-mov  %rdx,%rdx
-
-# qhasm: k = arg4
-# asm 1: mov  <arg4=int64#4,>k=int64#8
-# asm 2: mov  <arg4=%rcx,>k=%r10
-mov  %rcx,%r10
-
-# qhasm:               unsigned>? bytes - 0
-# asm 1: cmp  $0,<bytes=int64#6
-# asm 2: cmp  $0,<bytes=%r9
-cmp  $0,%r9
-# comment:fp stack unchanged by jump
-
-# qhasm: goto done if !unsigned>
-jbe ._done
-
-# qhasm: a = 0
-# asm 1: mov  $0,>a=int64#7
-# asm 2: mov  $0,>a=%rax
-mov  $0,%rax
-
-# qhasm: i = bytes
-# asm 1: mov  <bytes=int64#6,>i=int64#4
-# asm 2: mov  <bytes=%r9,>i=%rcx
-mov  %r9,%rcx
-
-# qhasm: while (i) { *out++ = a; --i }
-rep stosb
-
-# qhasm: out -= bytes
-# asm 1: sub  <bytes=int64#6,<out=int64#1
-# asm 2: sub  <bytes=%r9,<out=%rdi
-sub  %r9,%rdi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto start
-jmp ._start
-
-# qhasm: enter zt_salsa2012_amd64_xmm6_xor
-.text
-.p2align 5
-.globl _zt_salsa2012_amd64_xmm6_xor
-.globl zt_salsa2012_amd64_xmm6_xor
-_zt_salsa2012_amd64_xmm6_xor:
-zt_salsa2012_amd64_xmm6_xor:
-mov %rsp,%r11
-and $31,%r11
-add $480,%r11
-sub %r11,%rsp
-
-# qhasm: r11_stack = r11_caller
-# asm 1: movq <r11_caller=int64#9,>r11_stack=stack64#1
-# asm 2: movq <r11_caller=%r11,>r11_stack=352(%rsp)
-movq %r11,352(%rsp)
-
-# qhasm: r12_stack = r12_caller
-# asm 1: movq <r12_caller=int64#10,>r12_stack=stack64#2
-# asm 2: movq <r12_caller=%r12,>r12_stack=360(%rsp)
-movq %r12,360(%rsp)
-
-# qhasm: r13_stack = r13_caller
-# asm 1: movq <r13_caller=int64#11,>r13_stack=stack64#3
-# asm 2: movq <r13_caller=%r13,>r13_stack=368(%rsp)
-movq %r13,368(%rsp)
-
-# qhasm: r14_stack = r14_caller
-# asm 1: movq <r14_caller=int64#12,>r14_stack=stack64#4
-# asm 2: movq <r14_caller=%r14,>r14_stack=376(%rsp)
-movq %r14,376(%rsp)
-
-# qhasm: r15_stack = r15_caller
-# asm 1: movq <r15_caller=int64#13,>r15_stack=stack64#5
-# asm 2: movq <r15_caller=%r15,>r15_stack=384(%rsp)
-movq %r15,384(%rsp)
-
-# qhasm: rbx_stack = rbx_caller
-# asm 1: movq <rbx_caller=int64#14,>rbx_stack=stack64#6
-# asm 2: movq <rbx_caller=%rbx,>rbx_stack=392(%rsp)
-movq %rbx,392(%rsp)
-
-# qhasm: rbp_stack = rbp_caller
-# asm 1: movq <rbp_caller=int64#15,>rbp_stack=stack64#7
-# asm 2: movq <rbp_caller=%rbp,>rbp_stack=400(%rsp)
-movq %rbp,400(%rsp)
-
-# qhasm: out = arg1
-# asm 1: mov  <arg1=int64#1,>out=int64#1
-# asm 2: mov  <arg1=%rdi,>out=%rdi
-mov  %rdi,%rdi
-
-# qhasm: m = arg2
-# asm 1: mov  <arg2=int64#2,>m=int64#2
-# asm 2: mov  <arg2=%rsi,>m=%rsi
-mov  %rsi,%rsi
-
-# qhasm: bytes = arg3
-# asm 1: mov  <arg3=int64#3,>bytes=int64#6
-# asm 2: mov  <arg3=%rdx,>bytes=%r9
-mov  %rdx,%r9
-
-# qhasm: iv = arg4
-# asm 1: mov  <arg4=int64#4,>iv=int64#3
-# asm 2: mov  <arg4=%rcx,>iv=%rdx
-mov  %rcx,%rdx
-
-# qhasm: k = arg5
-# asm 1: mov  <arg5=int64#5,>k=int64#8
-# asm 2: mov  <arg5=%r8,>k=%r10
-mov  %r8,%r10
-
-# qhasm:               unsigned>? bytes - 0
-# asm 1: cmp  $0,<bytes=int64#6
-# asm 2: cmp  $0,<bytes=%r9
-cmp  $0,%r9
-# comment:fp stack unchanged by jump
-
-# qhasm: goto done if !unsigned>
-jbe ._done
-# comment:fp stack unchanged by fallthrough
-
-# qhasm: start:
-._start:
-
-# qhasm:   in12 = *(uint32 *) (k + 20)
-# asm 1: movl   20(<k=int64#8),>in12=int64#4d
-# asm 2: movl   20(<k=%r10),>in12=%ecx
-movl   20(%r10),%ecx
-
-# qhasm:   in1 = *(uint32 *) (k + 0)
-# asm 1: movl   0(<k=int64#8),>in1=int64#5d
-# asm 2: movl   0(<k=%r10),>in1=%r8d
-movl   0(%r10),%r8d
-
-# qhasm:   in6 = *(uint32 *) (iv + 0)
-# asm 1: movl   0(<iv=int64#3),>in6=int64#7d
-# asm 2: movl   0(<iv=%rdx),>in6=%eax
-movl   0(%rdx),%eax
-
-# qhasm:   in11 = *(uint32 *) (k + 16)
-# asm 1: movl   16(<k=int64#8),>in11=int64#9d
-# asm 2: movl   16(<k=%r10),>in11=%r11d
-movl   16(%r10),%r11d
-
-# qhasm:   ((uint32 *)&x1)[0] = in12
-# asm 1: movl <in12=int64#4d,>x1=stack128#1
-# asm 2: movl <in12=%ecx,>x1=0(%rsp)
-movl %ecx,0(%rsp)
-
-# qhasm:   ((uint32 *)&x1)[1] = in1
-# asm 1: movl <in1=int64#5d,4+<x1=stack128#1
-# asm 2: movl <in1=%r8d,4+<x1=0(%rsp)
-movl %r8d,4+0(%rsp)
-
-# qhasm:   ((uint32 *)&x1)[2] = in6
-# asm 1: movl <in6=int64#7d,8+<x1=stack128#1
-# asm 2: movl <in6=%eax,8+<x1=0(%rsp)
-movl %eax,8+0(%rsp)
-
-# qhasm:   ((uint32 *)&x1)[3] = in11
-# asm 1: movl <in11=int64#9d,12+<x1=stack128#1
-# asm 2: movl <in11=%r11d,12+<x1=0(%rsp)
-movl %r11d,12+0(%rsp)
-
-# qhasm:   in8 = 0
-# asm 1: mov  $0,>in8=int64#4
-# asm 2: mov  $0,>in8=%rcx
-mov  $0,%rcx
-
-# qhasm:   in13 = *(uint32 *) (k + 24)
-# asm 1: movl   24(<k=int64#8),>in13=int64#5d
-# asm 2: movl   24(<k=%r10),>in13=%r8d
-movl   24(%r10),%r8d
-
-# qhasm:   in2 = *(uint32 *) (k + 4)
-# asm 1: movl   4(<k=int64#8),>in2=int64#7d
-# asm 2: movl   4(<k=%r10),>in2=%eax
-movl   4(%r10),%eax
-
-# qhasm:   in7 = *(uint32 *) (iv + 4)
-# asm 1: movl   4(<iv=int64#3),>in7=int64#3d
-# asm 2: movl   4(<iv=%rdx),>in7=%edx
-movl   4(%rdx),%edx
-
-# qhasm:   ((uint32 *)&x2)[0] = in8
-# asm 1: movl <in8=int64#4d,>x2=stack128#2
-# asm 2: movl <in8=%ecx,>x2=16(%rsp)
-movl %ecx,16(%rsp)
-
-# qhasm:   ((uint32 *)&x2)[1] = in13
-# asm 1: movl <in13=int64#5d,4+<x2=stack128#2
-# asm 2: movl <in13=%r8d,4+<x2=16(%rsp)
-movl %r8d,4+16(%rsp)
-
-# qhasm:   ((uint32 *)&x2)[2] = in2
-# asm 1: movl <in2=int64#7d,8+<x2=stack128#2
-# asm 2: movl <in2=%eax,8+<x2=16(%rsp)
-movl %eax,8+16(%rsp)
-
-# qhasm:   ((uint32 *)&x2)[3] = in7
-# asm 1: movl <in7=int64#3d,12+<x2=stack128#2
-# asm 2: movl <in7=%edx,12+<x2=16(%rsp)
-movl %edx,12+16(%rsp)
-
-# qhasm:   in4 = *(uint32 *) (k + 12)
-# asm 1: movl   12(<k=int64#8),>in4=int64#3d
-# asm 2: movl   12(<k=%r10),>in4=%edx
-movl   12(%r10),%edx
-
-# qhasm:   in9 = 0
-# asm 1: mov  $0,>in9=int64#4
-# asm 2: mov  $0,>in9=%rcx
-mov  $0,%rcx
-
-# qhasm:   in14 = *(uint32 *) (k + 28)
-# asm 1: movl   28(<k=int64#8),>in14=int64#5d
-# asm 2: movl   28(<k=%r10),>in14=%r8d
-movl   28(%r10),%r8d
-
-# qhasm:   in3 = *(uint32 *) (k + 8)
-# asm 1: movl   8(<k=int64#8),>in3=int64#7d
-# asm 2: movl   8(<k=%r10),>in3=%eax
-movl   8(%r10),%eax
-
-# qhasm:   ((uint32 *)&x3)[0] = in4
-# asm 1: movl <in4=int64#3d,>x3=stack128#3
-# asm 2: movl <in4=%edx,>x3=32(%rsp)
-movl %edx,32(%rsp)
-
-# qhasm:   ((uint32 *)&x3)[1] = in9
-# asm 1: movl <in9=int64#4d,4+<x3=stack128#3
-# asm 2: movl <in9=%ecx,4+<x3=32(%rsp)
-movl %ecx,4+32(%rsp)
-
-# qhasm:   ((uint32 *)&x3)[2] = in14
-# asm 1: movl <in14=int64#5d,8+<x3=stack128#3
-# asm 2: movl <in14=%r8d,8+<x3=32(%rsp)
-movl %r8d,8+32(%rsp)
-
-# qhasm:   ((uint32 *)&x3)[3] = in3
-# asm 1: movl <in3=int64#7d,12+<x3=stack128#3
-# asm 2: movl <in3=%eax,12+<x3=32(%rsp)
-movl %eax,12+32(%rsp)
-
-# qhasm:   in0 = 1634760805
-# asm 1: mov  $1634760805,>in0=int64#3
-# asm 2: mov  $1634760805,>in0=%rdx
-mov  $1634760805,%rdx
-
-# qhasm:   in5 = 857760878
-# asm 1: mov  $857760878,>in5=int64#4
-# asm 2: mov  $857760878,>in5=%rcx
-mov  $857760878,%rcx
-
-# qhasm:   in10 = 2036477234
-# asm 1: mov  $2036477234,>in10=int64#5
-# asm 2: mov  $2036477234,>in10=%r8
-mov  $2036477234,%r8
-
-# qhasm:   in15 = 1797285236
-# asm 1: mov  $1797285236,>in15=int64#7
-# asm 2: mov  $1797285236,>in15=%rax
-mov  $1797285236,%rax
-
-# qhasm:   ((uint32 *)&x0)[0] = in0
-# asm 1: movl <in0=int64#3d,>x0=stack128#4
-# asm 2: movl <in0=%edx,>x0=48(%rsp)
-movl %edx,48(%rsp)
-
-# qhasm:   ((uint32 *)&x0)[1] = in5
-# asm 1: movl <in5=int64#4d,4+<x0=stack128#4
-# asm 2: movl <in5=%ecx,4+<x0=48(%rsp)
-movl %ecx,4+48(%rsp)
-
-# qhasm:   ((uint32 *)&x0)[2] = in10
-# asm 1: movl <in10=int64#5d,8+<x0=stack128#4
-# asm 2: movl <in10=%r8d,8+<x0=48(%rsp)
-movl %r8d,8+48(%rsp)
-
-# qhasm:   ((uint32 *)&x0)[3] = in15
-# asm 1: movl <in15=int64#7d,12+<x0=stack128#4
-# asm 2: movl <in15=%eax,12+<x0=48(%rsp)
-movl %eax,12+48(%rsp)
-
-# qhasm:                               unsigned<? bytes - 256
-# asm 1: cmp  $256,<bytes=int64#6
-# asm 2: cmp  $256,<bytes=%r9
-cmp  $256,%r9
-# comment:fp stack unchanged by jump
-
-# qhasm:   goto bytesbetween1and255 if unsigned<
-jb ._bytesbetween1and255
-
-# qhasm:   z0 = x0
-# asm 1: movdqa <x0=stack128#4,>z0=int6464#1
-# asm 2: movdqa <x0=48(%rsp),>z0=%xmm0
-movdqa 48(%rsp),%xmm0
-
-# qhasm:   z5 = z0[1,1,1,1]
-# asm 1: pshufd $0x55,<z0=int6464#1,>z5=int6464#2
-# asm 2: pshufd $0x55,<z0=%xmm0,>z5=%xmm1
-pshufd $0x55,%xmm0,%xmm1
-
-# qhasm:   z10 = z0[2,2,2,2]
-# asm 1: pshufd $0xaa,<z0=int6464#1,>z10=int6464#3
-# asm 2: pshufd $0xaa,<z0=%xmm0,>z10=%xmm2
-pshufd $0xaa,%xmm0,%xmm2
-
-# qhasm:   z15 = z0[3,3,3,3]
-# asm 1: pshufd $0xff,<z0=int6464#1,>z15=int6464#4
-# asm 2: pshufd $0xff,<z0=%xmm0,>z15=%xmm3
-pshufd $0xff,%xmm0,%xmm3
-
-# qhasm:   z0 = z0[0,0,0,0]
-# asm 1: pshufd $0x00,<z0=int6464#1,>z0=int6464#1
-# asm 2: pshufd $0x00,<z0=%xmm0,>z0=%xmm0
-pshufd $0x00,%xmm0,%xmm0
-
-# qhasm:   orig5 = z5
-# asm 1: movdqa <z5=int6464#2,>orig5=stack128#5
-# asm 2: movdqa <z5=%xmm1,>orig5=64(%rsp)
-movdqa %xmm1,64(%rsp)
-
-# qhasm:   orig10 = z10
-# asm 1: movdqa <z10=int6464#3,>orig10=stack128#6
-# asm 2: movdqa <z10=%xmm2,>orig10=80(%rsp)
-movdqa %xmm2,80(%rsp)
-
-# qhasm:   orig15 = z15
-# asm 1: movdqa <z15=int6464#4,>orig15=stack128#7
-# asm 2: movdqa <z15=%xmm3,>orig15=96(%rsp)
-movdqa %xmm3,96(%rsp)
-
-# qhasm:   orig0 = z0
-# asm 1: movdqa <z0=int6464#1,>orig0=stack128#8
-# asm 2: movdqa <z0=%xmm0,>orig0=112(%rsp)
-movdqa %xmm0,112(%rsp)
-
-# qhasm:   z1 = x1
-# asm 1: movdqa <x1=stack128#1,>z1=int6464#1
-# asm 2: movdqa <x1=0(%rsp),>z1=%xmm0
-movdqa 0(%rsp),%xmm0
-
-# qhasm:   z6 = z1[2,2,2,2]
-# asm 1: pshufd $0xaa,<z1=int6464#1,>z6=int6464#2
-# asm 2: pshufd $0xaa,<z1=%xmm0,>z6=%xmm1
-pshufd $0xaa,%xmm0,%xmm1
-
-# qhasm:   z11 = z1[3,3,3,3]
-# asm 1: pshufd $0xff,<z1=int6464#1,>z11=int6464#3
-# asm 2: pshufd $0xff,<z1=%xmm0,>z11=%xmm2
-pshufd $0xff,%xmm0,%xmm2
-
-# qhasm:   z12 = z1[0,0,0,0]
-# asm 1: pshufd $0x00,<z1=int6464#1,>z12=int6464#4
-# asm 2: pshufd $0x00,<z1=%xmm0,>z12=%xmm3
-pshufd $0x00,%xmm0,%xmm3
-
-# qhasm:   z1 = z1[1,1,1,1]
-# asm 1: pshufd $0x55,<z1=int6464#1,>z1=int6464#1
-# asm 2: pshufd $0x55,<z1=%xmm0,>z1=%xmm0
-pshufd $0x55,%xmm0,%xmm0
-
-# qhasm:   orig6 = z6
-# asm 1: movdqa <z6=int6464#2,>orig6=stack128#9
-# asm 2: movdqa <z6=%xmm1,>orig6=128(%rsp)
-movdqa %xmm1,128(%rsp)
-
-# qhasm:   orig11 = z11
-# asm 1: movdqa <z11=int6464#3,>orig11=stack128#10
-# asm 2: movdqa <z11=%xmm2,>orig11=144(%rsp)
-movdqa %xmm2,144(%rsp)
-
-# qhasm:   orig12 = z12
-# asm 1: movdqa <z12=int6464#4,>orig12=stack128#11
-# asm 2: movdqa <z12=%xmm3,>orig12=160(%rsp)
-movdqa %xmm3,160(%rsp)
-
-# qhasm:   orig1 = z1
-# asm 1: movdqa <z1=int6464#1,>orig1=stack128#12
-# asm 2: movdqa <z1=%xmm0,>orig1=176(%rsp)
-movdqa %xmm0,176(%rsp)
-
-# qhasm:   z2 = x2
-# asm 1: movdqa <x2=stack128#2,>z2=int6464#1
-# asm 2: movdqa <x2=16(%rsp),>z2=%xmm0
-movdqa 16(%rsp),%xmm0
-
-# qhasm:   z7 = z2[3,3,3,3]
-# asm 1: pshufd $0xff,<z2=int6464#1,>z7=int6464#2
-# asm 2: pshufd $0xff,<z2=%xmm0,>z7=%xmm1
-pshufd $0xff,%xmm0,%xmm1
-
-# qhasm:   z13 = z2[1,1,1,1]
-# asm 1: pshufd $0x55,<z2=int6464#1,>z13=int6464#3
-# asm 2: pshufd $0x55,<z2=%xmm0,>z13=%xmm2
-pshufd $0x55,%xmm0,%xmm2
-
-# qhasm:   z2 = z2[2,2,2,2]
-# asm 1: pshufd $0xaa,<z2=int6464#1,>z2=int6464#1
-# asm 2: pshufd $0xaa,<z2=%xmm0,>z2=%xmm0
-pshufd $0xaa,%xmm0,%xmm0
-
-# qhasm:   orig7 = z7
-# asm 1: movdqa <z7=int6464#2,>orig7=stack128#13
-# asm 2: movdqa <z7=%xmm1,>orig7=192(%rsp)
-movdqa %xmm1,192(%rsp)
-
-# qhasm:   orig13 = z13
-# asm 1: movdqa <z13=int6464#3,>orig13=stack128#14
-# asm 2: movdqa <z13=%xmm2,>orig13=208(%rsp)
-movdqa %xmm2,208(%rsp)
-
-# qhasm:   orig2 = z2
-# asm 1: movdqa <z2=int6464#1,>orig2=stack128#15
-# asm 2: movdqa <z2=%xmm0,>orig2=224(%rsp)
-movdqa %xmm0,224(%rsp)
-
-# qhasm:   z3 = x3
-# asm 1: movdqa <x3=stack128#3,>z3=int6464#1
-# asm 2: movdqa <x3=32(%rsp),>z3=%xmm0
-movdqa 32(%rsp),%xmm0
-
-# qhasm:   z4 = z3[0,0,0,0]
-# asm 1: pshufd $0x00,<z3=int6464#1,>z4=int6464#2
-# asm 2: pshufd $0x00,<z3=%xmm0,>z4=%xmm1
-pshufd $0x00,%xmm0,%xmm1
-
-# qhasm:   z14 = z3[2,2,2,2]
-# asm 1: pshufd $0xaa,<z3=int6464#1,>z14=int6464#3
-# asm 2: pshufd $0xaa,<z3=%xmm0,>z14=%xmm2
-pshufd $0xaa,%xmm0,%xmm2
-
-# qhasm:   z3 = z3[3,3,3,3]
-# asm 1: pshufd $0xff,<z3=int6464#1,>z3=int6464#1
-# asm 2: pshufd $0xff,<z3=%xmm0,>z3=%xmm0
-pshufd $0xff,%xmm0,%xmm0
-
-# qhasm:   orig4 = z4
-# asm 1: movdqa <z4=int6464#2,>orig4=stack128#16
-# asm 2: movdqa <z4=%xmm1,>orig4=240(%rsp)
-movdqa %xmm1,240(%rsp)
-
-# qhasm:   orig14 = z14
-# asm 1: movdqa <z14=int6464#3,>orig14=stack128#17
-# asm 2: movdqa <z14=%xmm2,>orig14=256(%rsp)
-movdqa %xmm2,256(%rsp)
-
-# qhasm:   orig3 = z3
-# asm 1: movdqa <z3=int6464#1,>orig3=stack128#18
-# asm 2: movdqa <z3=%xmm0,>orig3=272(%rsp)
-movdqa %xmm0,272(%rsp)
-
-# qhasm: bytesatleast256:
-._bytesatleast256:
-
-# qhasm:   in8 = ((uint32 *)&x2)[0]
-# asm 1: movl <x2=stack128#2,>in8=int64#3d
-# asm 2: movl <x2=16(%rsp),>in8=%edx
-movl 16(%rsp),%edx
-
-# qhasm:   in9 = ((uint32 *)&x3)[1]
-# asm 1: movl 4+<x3=stack128#3,>in9=int64#4d
-# asm 2: movl 4+<x3=32(%rsp),>in9=%ecx
-movl 4+32(%rsp),%ecx
-
-# qhasm:   ((uint32 *) &orig8)[0] = in8
-# asm 1: movl <in8=int64#3d,>orig8=stack128#19
-# asm 2: movl <in8=%edx,>orig8=288(%rsp)
-movl %edx,288(%rsp)
-
-# qhasm:   ((uint32 *) &orig9)[0] = in9
-# asm 1: movl <in9=int64#4d,>orig9=stack128#20
-# asm 2: movl <in9=%ecx,>orig9=304(%rsp)
-movl %ecx,304(%rsp)
-
-# qhasm:   in8 += 1
-# asm 1: add  $1,<in8=int64#3
-# asm 2: add  $1,<in8=%rdx
-add  $1,%rdx
-
-# qhasm:   in9 <<= 32
-# asm 1: shl  $32,<in9=int64#4
-# asm 2: shl  $32,<in9=%rcx
-shl  $32,%rcx
-
-# qhasm:   in8 += in9
-# asm 1: add  <in9=int64#4,<in8=int64#3
-# asm 2: add  <in9=%rcx,<in8=%rdx
-add  %rcx,%rdx
-
-# qhasm:   in9 = in8
-# asm 1: mov  <in8=int64#3,>in9=int64#4
-# asm 2: mov  <in8=%rdx,>in9=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint64) in9 >>= 32
-# asm 1: shr  $32,<in9=int64#4
-# asm 2: shr  $32,<in9=%rcx
-shr  $32,%rcx
-
-# qhasm:   ((uint32 *) &orig8)[1] = in8
-# asm 1: movl <in8=int64#3d,4+<orig8=stack128#19
-# asm 2: movl <in8=%edx,4+<orig8=288(%rsp)
-movl %edx,4+288(%rsp)
-
-# qhasm:   ((uint32 *) &orig9)[1] = in9
-# asm 1: movl <in9=int64#4d,4+<orig9=stack128#20
-# asm 2: movl <in9=%ecx,4+<orig9=304(%rsp)
-movl %ecx,4+304(%rsp)
-
-# qhasm:   in8 += 1
-# asm 1: add  $1,<in8=int64#3
-# asm 2: add  $1,<in8=%rdx
-add  $1,%rdx
-
-# qhasm:   in9 <<= 32
-# asm 1: shl  $32,<in9=int64#4
-# asm 2: shl  $32,<in9=%rcx
-shl  $32,%rcx
-
-# qhasm:   in8 += in9
-# asm 1: add  <in9=int64#4,<in8=int64#3
-# asm 2: add  <in9=%rcx,<in8=%rdx
-add  %rcx,%rdx
-
-# qhasm:   in9 = in8
-# asm 1: mov  <in8=int64#3,>in9=int64#4
-# asm 2: mov  <in8=%rdx,>in9=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint64) in9 >>= 32
-# asm 1: shr  $32,<in9=int64#4
-# asm 2: shr  $32,<in9=%rcx
-shr  $32,%rcx
-
-# qhasm:   ((uint32 *) &orig8)[2] = in8
-# asm 1: movl <in8=int64#3d,8+<orig8=stack128#19
-# asm 2: movl <in8=%edx,8+<orig8=288(%rsp)
-movl %edx,8+288(%rsp)
-
-# qhasm:   ((uint32 *) &orig9)[2] = in9
-# asm 1: movl <in9=int64#4d,8+<orig9=stack128#20
-# asm 2: movl <in9=%ecx,8+<orig9=304(%rsp)
-movl %ecx,8+304(%rsp)
-
-# qhasm:   in8 += 1
-# asm 1: add  $1,<in8=int64#3
-# asm 2: add  $1,<in8=%rdx
-add  $1,%rdx
-
-# qhasm:   in9 <<= 32
-# asm 1: shl  $32,<in9=int64#4
-# asm 2: shl  $32,<in9=%rcx
-shl  $32,%rcx
-
-# qhasm:   in8 += in9
-# asm 1: add  <in9=int64#4,<in8=int64#3
-# asm 2: add  <in9=%rcx,<in8=%rdx
-add  %rcx,%rdx
-
-# qhasm:   in9 = in8
-# asm 1: mov  <in8=int64#3,>in9=int64#4
-# asm 2: mov  <in8=%rdx,>in9=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint64) in9 >>= 32
-# asm 1: shr  $32,<in9=int64#4
-# asm 2: shr  $32,<in9=%rcx
-shr  $32,%rcx
-
-# qhasm:   ((uint32 *) &orig8)[3] = in8
-# asm 1: movl <in8=int64#3d,12+<orig8=stack128#19
-# asm 2: movl <in8=%edx,12+<orig8=288(%rsp)
-movl %edx,12+288(%rsp)
-
-# qhasm:   ((uint32 *) &orig9)[3] = in9
-# asm 1: movl <in9=int64#4d,12+<orig9=stack128#20
-# asm 2: movl <in9=%ecx,12+<orig9=304(%rsp)
-movl %ecx,12+304(%rsp)
-
-# qhasm:   in8 += 1
-# asm 1: add  $1,<in8=int64#3
-# asm 2: add  $1,<in8=%rdx
-add  $1,%rdx
-
-# qhasm:   in9 <<= 32
-# asm 1: shl  $32,<in9=int64#4
-# asm 2: shl  $32,<in9=%rcx
-shl  $32,%rcx
-
-# qhasm:   in8 += in9
-# asm 1: add  <in9=int64#4,<in8=int64#3
-# asm 2: add  <in9=%rcx,<in8=%rdx
-add  %rcx,%rdx
-
-# qhasm:   in9 = in8
-# asm 1: mov  <in8=int64#3,>in9=int64#4
-# asm 2: mov  <in8=%rdx,>in9=%rcx
-mov  %rdx,%rcx
-
-# qhasm:   (uint64) in9 >>= 32
-# asm 1: shr  $32,<in9=int64#4
-# asm 2: shr  $32,<in9=%rcx
-shr  $32,%rcx
-
-# qhasm:   ((uint32 *)&x2)[0] = in8
-# asm 1: movl <in8=int64#3d,>x2=stack128#2
-# asm 2: movl <in8=%edx,>x2=16(%rsp)
-movl %edx,16(%rsp)
-
-# qhasm:   ((uint32 *)&x3)[1] = in9
-# asm 1: movl <in9=int64#4d,4+<x3=stack128#3
-# asm 2: movl <in9=%ecx,4+<x3=32(%rsp)
-movl %ecx,4+32(%rsp)
-
-# qhasm:   bytes_backup = bytes
-# asm 1: movq <bytes=int64#6,>bytes_backup=stack64#8
-# asm 2: movq <bytes=%r9,>bytes_backup=408(%rsp)
-movq %r9,408(%rsp)
-
-# qhasm: i = 12
-# asm 1: mov  $12,>i=int64#3
-# asm 2: mov  $12,>i=%rdx
-mov  $12,%rdx
-
-# qhasm:   z5 = orig5
-# asm 1: movdqa <orig5=stack128#5,>z5=int6464#1
-# asm 2: movdqa <orig5=64(%rsp),>z5=%xmm0
-movdqa 64(%rsp),%xmm0
-
-# qhasm:   z10 = orig10
-# asm 1: movdqa <orig10=stack128#6,>z10=int6464#2
-# asm 2: movdqa <orig10=80(%rsp),>z10=%xmm1
-movdqa 80(%rsp),%xmm1
-
-# qhasm:   z15 = orig15
-# asm 1: movdqa <orig15=stack128#7,>z15=int6464#3
-# asm 2: movdqa <orig15=96(%rsp),>z15=%xmm2
-movdqa 96(%rsp),%xmm2
-
-# qhasm:   z14 = orig14
-# asm 1: movdqa <orig14=stack128#17,>z14=int6464#4
-# asm 2: movdqa <orig14=256(%rsp),>z14=%xmm3
-movdqa 256(%rsp),%xmm3
-
-# qhasm:   z3 = orig3
-# asm 1: movdqa <orig3=stack128#18,>z3=int6464#5
-# asm 2: movdqa <orig3=272(%rsp),>z3=%xmm4
-movdqa 272(%rsp),%xmm4
-
-# qhasm:   z6 = orig6
-# asm 1: movdqa <orig6=stack128#9,>z6=int6464#6
-# asm 2: movdqa <orig6=128(%rsp),>z6=%xmm5
-movdqa 128(%rsp),%xmm5
-
-# qhasm:   z11 = orig11
-# asm 1: movdqa <orig11=stack128#10,>z11=int6464#7
-# asm 2: movdqa <orig11=144(%rsp),>z11=%xmm6
-movdqa 144(%rsp),%xmm6
-
-# qhasm:   z1 = orig1
-# asm 1: movdqa <orig1=stack128#12,>z1=int6464#8
-# asm 2: movdqa <orig1=176(%rsp),>z1=%xmm7
-movdqa 176(%rsp),%xmm7
-
-# qhasm:   z7 = orig7
-# asm 1: movdqa <orig7=stack128#13,>z7=int6464#9
-# asm 2: movdqa <orig7=192(%rsp),>z7=%xmm8
-movdqa 192(%rsp),%xmm8
-
-# qhasm:   z13 = orig13
-# asm 1: movdqa <orig13=stack128#14,>z13=int6464#10
-# asm 2: movdqa <orig13=208(%rsp),>z13=%xmm9
-movdqa 208(%rsp),%xmm9
-
-# qhasm:   z2 = orig2
-# asm 1: movdqa <orig2=stack128#15,>z2=int6464#11
-# asm 2: movdqa <orig2=224(%rsp),>z2=%xmm10
-movdqa 224(%rsp),%xmm10
-
-# qhasm:   z9 = orig9
-# asm 1: movdqa <orig9=stack128#20,>z9=int6464#12
-# asm 2: movdqa <orig9=304(%rsp),>z9=%xmm11
-movdqa 304(%rsp),%xmm11
-
-# qhasm:   z0 = orig0
-# asm 1: movdqa <orig0=stack128#8,>z0=int6464#13
-# asm 2: movdqa <orig0=112(%rsp),>z0=%xmm12
-movdqa 112(%rsp),%xmm12
-
-# qhasm:   z12 = orig12
-# asm 1: movdqa <orig12=stack128#11,>z12=int6464#14
-# asm 2: movdqa <orig12=160(%rsp),>z12=%xmm13
-movdqa 160(%rsp),%xmm13
-
-# qhasm:   z4 = orig4
-# asm 1: movdqa <orig4=stack128#16,>z4=int6464#15
-# asm 2: movdqa <orig4=240(%rsp),>z4=%xmm14
-movdqa 240(%rsp),%xmm14
-
-# qhasm:   z8 = orig8
-# asm 1: movdqa <orig8=stack128#19,>z8=int6464#16
-# asm 2: movdqa <orig8=288(%rsp),>z8=%xmm15
-movdqa 288(%rsp),%xmm15
-
-# qhasm: mainloop1:
-._mainloop1:
-
-# qhasm: 						z10_stack = z10
-# asm 1: movdqa <z10=int6464#2,>z10_stack=stack128#21
-# asm 2: movdqa <z10=%xmm1,>z10_stack=320(%rsp)
-movdqa %xmm1,320(%rsp)
-
-# qhasm: 								z15_stack = z15
-# asm 1: movdqa <z15=int6464#3,>z15_stack=stack128#22
-# asm 2: movdqa <z15=%xmm2,>z15_stack=336(%rsp)
-movdqa %xmm2,336(%rsp)
-
-# qhasm: 		y4 = z12
-# asm 1: movdqa <z12=int6464#14,>y4=int6464#2
-# asm 2: movdqa <z12=%xmm13,>y4=%xmm1
-movdqa %xmm13,%xmm1
-
-# qhasm: uint32323232	y4 += z0
-# asm 1: paddd <z0=int6464#13,<y4=int6464#2
-# asm 2: paddd <z0=%xmm12,<y4=%xmm1
-paddd %xmm12,%xmm1
-
-# qhasm: 		r4 = y4
-# asm 1: movdqa <y4=int6464#2,>r4=int6464#3
-# asm 2: movdqa <y4=%xmm1,>r4=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232	y4 <<= 7
-# asm 1: pslld $7,<y4=int6464#2
-# asm 2: pslld $7,<y4=%xmm1
-pslld $7,%xmm1
-
-# qhasm: 		z4 ^= y4
-# asm 1: pxor  <y4=int6464#2,<z4=int6464#15
-# asm 2: pxor  <y4=%xmm1,<z4=%xmm14
-pxor  %xmm1,%xmm14
-
-# qhasm: uint32323232	r4 >>= 25
-# asm 1: psrld $25,<r4=int6464#3
-# asm 2: psrld $25,<r4=%xmm2
-psrld $25,%xmm2
-
-# qhasm: 		z4 ^= r4
-# asm 1: pxor  <r4=int6464#3,<z4=int6464#15
-# asm 2: pxor  <r4=%xmm2,<z4=%xmm14
-pxor  %xmm2,%xmm14
-
-# qhasm: 				y9 = z1
-# asm 1: movdqa <z1=int6464#8,>y9=int6464#2
-# asm 2: movdqa <z1=%xmm7,>y9=%xmm1
-movdqa %xmm7,%xmm1
-
-# qhasm: uint32323232			y9 += z5
-# asm 1: paddd <z5=int6464#1,<y9=int6464#2
-# asm 2: paddd <z5=%xmm0,<y9=%xmm1
-paddd %xmm0,%xmm1
-
-# qhasm: 				r9 = y9
-# asm 1: movdqa <y9=int6464#2,>r9=int6464#3
-# asm 2: movdqa <y9=%xmm1,>r9=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232			y9 <<= 7
-# asm 1: pslld $7,<y9=int6464#2
-# asm 2: pslld $7,<y9=%xmm1
-pslld $7,%xmm1
-
-# qhasm: 				z9 ^= y9
-# asm 1: pxor  <y9=int6464#2,<z9=int6464#12
-# asm 2: pxor  <y9=%xmm1,<z9=%xmm11
-pxor  %xmm1,%xmm11
-
-# qhasm: uint32323232			r9 >>= 25
-# asm 1: psrld $25,<r9=int6464#3
-# asm 2: psrld $25,<r9=%xmm2
-psrld $25,%xmm2
-
-# qhasm: 				z9 ^= r9
-# asm 1: pxor  <r9=int6464#3,<z9=int6464#12
-# asm 2: pxor  <r9=%xmm2,<z9=%xmm11
-pxor  %xmm2,%xmm11
-
-# qhasm: 		y8 = z0
-# asm 1: movdqa <z0=int6464#13,>y8=int6464#2
-# asm 2: movdqa <z0=%xmm12,>y8=%xmm1
-movdqa %xmm12,%xmm1
-
-# qhasm: uint32323232	y8 += z4
-# asm 1: paddd <z4=int6464#15,<y8=int6464#2
-# asm 2: paddd <z4=%xmm14,<y8=%xmm1
-paddd %xmm14,%xmm1
-
-# qhasm: 		r8 = y8
-# asm 1: movdqa <y8=int6464#2,>r8=int6464#3
-# asm 2: movdqa <y8=%xmm1,>r8=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232	y8 <<= 9
-# asm 1: pslld $9,<y8=int6464#2
-# asm 2: pslld $9,<y8=%xmm1
-pslld $9,%xmm1
-
-# qhasm: 		z8 ^= y8
-# asm 1: pxor  <y8=int6464#2,<z8=int6464#16
-# asm 2: pxor  <y8=%xmm1,<z8=%xmm15
-pxor  %xmm1,%xmm15
-
-# qhasm: uint32323232	r8 >>= 23
-# asm 1: psrld $23,<r8=int6464#3
-# asm 2: psrld $23,<r8=%xmm2
-psrld $23,%xmm2
-
-# qhasm: 		z8 ^= r8
-# asm 1: pxor  <r8=int6464#3,<z8=int6464#16
-# asm 2: pxor  <r8=%xmm2,<z8=%xmm15
-pxor  %xmm2,%xmm15
-
-# qhasm: 				y13 = z5
-# asm 1: movdqa <z5=int6464#1,>y13=int6464#2
-# asm 2: movdqa <z5=%xmm0,>y13=%xmm1
-movdqa %xmm0,%xmm1
-
-# qhasm: uint32323232			y13 += z9
-# asm 1: paddd <z9=int6464#12,<y13=int6464#2
-# asm 2: paddd <z9=%xmm11,<y13=%xmm1
-paddd %xmm11,%xmm1
-
-# qhasm: 				r13 = y13
-# asm 1: movdqa <y13=int6464#2,>r13=int6464#3
-# asm 2: movdqa <y13=%xmm1,>r13=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232			y13 <<= 9
-# asm 1: pslld $9,<y13=int6464#2
-# asm 2: pslld $9,<y13=%xmm1
-pslld $9,%xmm1
-
-# qhasm: 				z13 ^= y13
-# asm 1: pxor  <y13=int6464#2,<z13=int6464#10
-# asm 2: pxor  <y13=%xmm1,<z13=%xmm9
-pxor  %xmm1,%xmm9
-
-# qhasm: uint32323232			r13 >>= 23
-# asm 1: psrld $23,<r13=int6464#3
-# asm 2: psrld $23,<r13=%xmm2
-psrld $23,%xmm2
-
-# qhasm: 				z13 ^= r13
-# asm 1: pxor  <r13=int6464#3,<z13=int6464#10
-# asm 2: pxor  <r13=%xmm2,<z13=%xmm9
-pxor  %xmm2,%xmm9
-
-# qhasm: 		y12 = z4
-# asm 1: movdqa <z4=int6464#15,>y12=int6464#2
-# asm 2: movdqa <z4=%xmm14,>y12=%xmm1
-movdqa %xmm14,%xmm1
-
-# qhasm: uint32323232	y12 += z8
-# asm 1: paddd <z8=int6464#16,<y12=int6464#2
-# asm 2: paddd <z8=%xmm15,<y12=%xmm1
-paddd %xmm15,%xmm1
-
-# qhasm: 		r12 = y12
-# asm 1: movdqa <y12=int6464#2,>r12=int6464#3
-# asm 2: movdqa <y12=%xmm1,>r12=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232	y12 <<= 13
-# asm 1: pslld $13,<y12=int6464#2
-# asm 2: pslld $13,<y12=%xmm1
-pslld $13,%xmm1
-
-# qhasm: 		z12 ^= y12
-# asm 1: pxor  <y12=int6464#2,<z12=int6464#14
-# asm 2: pxor  <y12=%xmm1,<z12=%xmm13
-pxor  %xmm1,%xmm13
-
-# qhasm: uint32323232	r12 >>= 19
-# asm 1: psrld $19,<r12=int6464#3
-# asm 2: psrld $19,<r12=%xmm2
-psrld $19,%xmm2
-
-# qhasm: 		z12 ^= r12
-# asm 1: pxor  <r12=int6464#3,<z12=int6464#14
-# asm 2: pxor  <r12=%xmm2,<z12=%xmm13
-pxor  %xmm2,%xmm13
-
-# qhasm: 				y1 = z9
-# asm 1: movdqa <z9=int6464#12,>y1=int6464#2
-# asm 2: movdqa <z9=%xmm11,>y1=%xmm1
-movdqa %xmm11,%xmm1
-
-# qhasm: uint32323232			y1 += z13
-# asm 1: paddd <z13=int6464#10,<y1=int6464#2
-# asm 2: paddd <z13=%xmm9,<y1=%xmm1
-paddd %xmm9,%xmm1
-
-# qhasm: 				r1 = y1
-# asm 1: movdqa <y1=int6464#2,>r1=int6464#3
-# asm 2: movdqa <y1=%xmm1,>r1=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232			y1 <<= 13
-# asm 1: pslld $13,<y1=int6464#2
-# asm 2: pslld $13,<y1=%xmm1
-pslld $13,%xmm1
-
-# qhasm: 				z1 ^= y1
-# asm 1: pxor  <y1=int6464#2,<z1=int6464#8
-# asm 2: pxor  <y1=%xmm1,<z1=%xmm7
-pxor  %xmm1,%xmm7
-
-# qhasm: uint32323232			r1 >>= 19
-# asm 1: psrld $19,<r1=int6464#3
-# asm 2: psrld $19,<r1=%xmm2
-psrld $19,%xmm2
-
-# qhasm: 				z1 ^= r1
-# asm 1: pxor  <r1=int6464#3,<z1=int6464#8
-# asm 2: pxor  <r1=%xmm2,<z1=%xmm7
-pxor  %xmm2,%xmm7
-
-# qhasm: 		y0 = z8
-# asm 1: movdqa <z8=int6464#16,>y0=int6464#2
-# asm 2: movdqa <z8=%xmm15,>y0=%xmm1
-movdqa %xmm15,%xmm1
-
-# qhasm: uint32323232	y0 += z12
-# asm 1: paddd <z12=int6464#14,<y0=int6464#2
-# asm 2: paddd <z12=%xmm13,<y0=%xmm1
-paddd %xmm13,%xmm1
-
-# qhasm: 		r0 = y0
-# asm 1: movdqa <y0=int6464#2,>r0=int6464#3
-# asm 2: movdqa <y0=%xmm1,>r0=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232	y0 <<= 18
-# asm 1: pslld $18,<y0=int6464#2
-# asm 2: pslld $18,<y0=%xmm1
-pslld $18,%xmm1
-
-# qhasm: 		z0 ^= y0
-# asm 1: pxor  <y0=int6464#2,<z0=int6464#13
-# asm 2: pxor  <y0=%xmm1,<z0=%xmm12
-pxor  %xmm1,%xmm12
-
-# qhasm: uint32323232	r0 >>= 14
-# asm 1: psrld $14,<r0=int6464#3
-# asm 2: psrld $14,<r0=%xmm2
-psrld $14,%xmm2
-
-# qhasm: 		z0 ^= r0
-# asm 1: pxor  <r0=int6464#3,<z0=int6464#13
-# asm 2: pxor  <r0=%xmm2,<z0=%xmm12
-pxor  %xmm2,%xmm12
-
-# qhasm: 						z10 = z10_stack
-# asm 1: movdqa <z10_stack=stack128#21,>z10=int6464#2
-# asm 2: movdqa <z10_stack=320(%rsp),>z10=%xmm1
-movdqa 320(%rsp),%xmm1
-
-# qhasm: 		z0_stack = z0
-# asm 1: movdqa <z0=int6464#13,>z0_stack=stack128#21
-# asm 2: movdqa <z0=%xmm12,>z0_stack=320(%rsp)
-movdqa %xmm12,320(%rsp)
-
-# qhasm: 				y5 = z13
-# asm 1: movdqa <z13=int6464#10,>y5=int6464#3
-# asm 2: movdqa <z13=%xmm9,>y5=%xmm2
-movdqa %xmm9,%xmm2
-
-# qhasm: uint32323232			y5 += z1
-# asm 1: paddd <z1=int6464#8,<y5=int6464#3
-# asm 2: paddd <z1=%xmm7,<y5=%xmm2
-paddd %xmm7,%xmm2
-
-# qhasm: 				r5 = y5
-# asm 1: movdqa <y5=int6464#3,>r5=int6464#13
-# asm 2: movdqa <y5=%xmm2,>r5=%xmm12
-movdqa %xmm2,%xmm12
-
-# qhasm: uint32323232			y5 <<= 18
-# asm 1: pslld $18,<y5=int6464#3
-# asm 2: pslld $18,<y5=%xmm2
-pslld $18,%xmm2
-
-# qhasm: 				z5 ^= y5
-# asm 1: pxor  <y5=int6464#3,<z5=int6464#1
-# asm 2: pxor  <y5=%xmm2,<z5=%xmm0
-pxor  %xmm2,%xmm0
-
-# qhasm: uint32323232			r5 >>= 14
-# asm 1: psrld $14,<r5=int6464#13
-# asm 2: psrld $14,<r5=%xmm12
-psrld $14,%xmm12
-
-# qhasm: 				z5 ^= r5
-# asm 1: pxor  <r5=int6464#13,<z5=int6464#1
-# asm 2: pxor  <r5=%xmm12,<z5=%xmm0
-pxor  %xmm12,%xmm0
-
-# qhasm: 						y14 = z6
-# asm 1: movdqa <z6=int6464#6,>y14=int6464#3
-# asm 2: movdqa <z6=%xmm5,>y14=%xmm2
-movdqa %xmm5,%xmm2
-
-# qhasm: uint32323232					y14 += z10
-# asm 1: paddd <z10=int6464#2,<y14=int6464#3
-# asm 2: paddd <z10=%xmm1,<y14=%xmm2
-paddd %xmm1,%xmm2
-
-# qhasm: 						r14 = y14
-# asm 1: movdqa <y14=int6464#3,>r14=int6464#13
-# asm 2: movdqa <y14=%xmm2,>r14=%xmm12
-movdqa %xmm2,%xmm12
-
-# qhasm: uint32323232					y14 <<= 7
-# asm 1: pslld $7,<y14=int6464#3
-# asm 2: pslld $7,<y14=%xmm2
-pslld $7,%xmm2
-
-# qhasm: 						z14 ^= y14
-# asm 1: pxor  <y14=int6464#3,<z14=int6464#4
-# asm 2: pxor  <y14=%xmm2,<z14=%xmm3
-pxor  %xmm2,%xmm3
-
-# qhasm: uint32323232					r14 >>= 25
-# asm 1: psrld $25,<r14=int6464#13
-# asm 2: psrld $25,<r14=%xmm12
-psrld $25,%xmm12
-
-# qhasm: 						z14 ^= r14
-# asm 1: pxor  <r14=int6464#13,<z14=int6464#4
-# asm 2: pxor  <r14=%xmm12,<z14=%xmm3
-pxor  %xmm12,%xmm3
-
-# qhasm: 								z15 = z15_stack
-# asm 1: movdqa <z15_stack=stack128#22,>z15=int6464#3
-# asm 2: movdqa <z15_stack=336(%rsp),>z15=%xmm2
-movdqa 336(%rsp),%xmm2
-
-# qhasm: 				z5_stack = z5
-# asm 1: movdqa <z5=int6464#1,>z5_stack=stack128#22
-# asm 2: movdqa <z5=%xmm0,>z5_stack=336(%rsp)
-movdqa %xmm0,336(%rsp)
-
-# qhasm: 								y3 = z11
-# asm 1: movdqa <z11=int6464#7,>y3=int6464#1
-# asm 2: movdqa <z11=%xmm6,>y3=%xmm0
-movdqa %xmm6,%xmm0
-
-# qhasm: uint32323232							y3 += z15
-# asm 1: paddd <z15=int6464#3,<y3=int6464#1
-# asm 2: paddd <z15=%xmm2,<y3=%xmm0
-paddd %xmm2,%xmm0
-
-# qhasm: 								r3 = y3
-# asm 1: movdqa <y3=int6464#1,>r3=int6464#13
-# asm 2: movdqa <y3=%xmm0,>r3=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232							y3 <<= 7
-# asm 1: pslld $7,<y3=int6464#1
-# asm 2: pslld $7,<y3=%xmm0
-pslld $7,%xmm0
-
-# qhasm: 								z3 ^= y3
-# asm 1: pxor  <y3=int6464#1,<z3=int6464#5
-# asm 2: pxor  <y3=%xmm0,<z3=%xmm4
-pxor  %xmm0,%xmm4
-
-# qhasm: uint32323232							r3 >>= 25
-# asm 1: psrld $25,<r3=int6464#13
-# asm 2: psrld $25,<r3=%xmm12
-psrld $25,%xmm12
-
-# qhasm: 								z3 ^= r3
-# asm 1: pxor  <r3=int6464#13,<z3=int6464#5
-# asm 2: pxor  <r3=%xmm12,<z3=%xmm4
-pxor  %xmm12,%xmm4
-
-# qhasm: 						y2 = z10
-# asm 1: movdqa <z10=int6464#2,>y2=int6464#1
-# asm 2: movdqa <z10=%xmm1,>y2=%xmm0
-movdqa %xmm1,%xmm0
-
-# qhasm: uint32323232					y2 += z14
-# asm 1: paddd <z14=int6464#4,<y2=int6464#1
-# asm 2: paddd <z14=%xmm3,<y2=%xmm0
-paddd %xmm3,%xmm0
-
-# qhasm: 						r2 = y2
-# asm 1: movdqa <y2=int6464#1,>r2=int6464#13
-# asm 2: movdqa <y2=%xmm0,>r2=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232					y2 <<= 9
-# asm 1: pslld $9,<y2=int6464#1
-# asm 2: pslld $9,<y2=%xmm0
-pslld $9,%xmm0
-
-# qhasm: 						z2 ^= y2
-# asm 1: pxor  <y2=int6464#1,<z2=int6464#11
-# asm 2: pxor  <y2=%xmm0,<z2=%xmm10
-pxor  %xmm0,%xmm10
-
-# qhasm: uint32323232					r2 >>= 23
-# asm 1: psrld $23,<r2=int6464#13
-# asm 2: psrld $23,<r2=%xmm12
-psrld $23,%xmm12
-
-# qhasm: 						z2 ^= r2
-# asm 1: pxor  <r2=int6464#13,<z2=int6464#11
-# asm 2: pxor  <r2=%xmm12,<z2=%xmm10
-pxor  %xmm12,%xmm10
-
-# qhasm: 								y7 = z15
-# asm 1: movdqa <z15=int6464#3,>y7=int6464#1
-# asm 2: movdqa <z15=%xmm2,>y7=%xmm0
-movdqa %xmm2,%xmm0
-
-# qhasm: uint32323232							y7 += z3
-# asm 1: paddd <z3=int6464#5,<y7=int6464#1
-# asm 2: paddd <z3=%xmm4,<y7=%xmm0
-paddd %xmm4,%xmm0
-
-# qhasm: 								r7 = y7
-# asm 1: movdqa <y7=int6464#1,>r7=int6464#13
-# asm 2: movdqa <y7=%xmm0,>r7=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232							y7 <<= 9
-# asm 1: pslld $9,<y7=int6464#1
-# asm 2: pslld $9,<y7=%xmm0
-pslld $9,%xmm0
-
-# qhasm: 								z7 ^= y7
-# asm 1: pxor  <y7=int6464#1,<z7=int6464#9
-# asm 2: pxor  <y7=%xmm0,<z7=%xmm8
-pxor  %xmm0,%xmm8
-
-# qhasm: uint32323232							r7 >>= 23
-# asm 1: psrld $23,<r7=int6464#13
-# asm 2: psrld $23,<r7=%xmm12
-psrld $23,%xmm12
-
-# qhasm: 								z7 ^= r7
-# asm 1: pxor  <r7=int6464#13,<z7=int6464#9
-# asm 2: pxor  <r7=%xmm12,<z7=%xmm8
-pxor  %xmm12,%xmm8
-
-# qhasm: 						y6 = z14
-# asm 1: movdqa <z14=int6464#4,>y6=int6464#1
-# asm 2: movdqa <z14=%xmm3,>y6=%xmm0
-movdqa %xmm3,%xmm0
-
-# qhasm: uint32323232					y6 += z2
-# asm 1: paddd <z2=int6464#11,<y6=int6464#1
-# asm 2: paddd <z2=%xmm10,<y6=%xmm0
-paddd %xmm10,%xmm0
-
-# qhasm: 						r6 = y6
-# asm 1: movdqa <y6=int6464#1,>r6=int6464#13
-# asm 2: movdqa <y6=%xmm0,>r6=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232					y6 <<= 13
-# asm 1: pslld $13,<y6=int6464#1
-# asm 2: pslld $13,<y6=%xmm0
-pslld $13,%xmm0
-
-# qhasm: 						z6 ^= y6
-# asm 1: pxor  <y6=int6464#1,<z6=int6464#6
-# asm 2: pxor  <y6=%xmm0,<z6=%xmm5
-pxor  %xmm0,%xmm5
-
-# qhasm: uint32323232					r6 >>= 19
-# asm 1: psrld $19,<r6=int6464#13
-# asm 2: psrld $19,<r6=%xmm12
-psrld $19,%xmm12
-
-# qhasm: 						z6 ^= r6
-# asm 1: pxor  <r6=int6464#13,<z6=int6464#6
-# asm 2: pxor  <r6=%xmm12,<z6=%xmm5
-pxor  %xmm12,%xmm5
-
-# qhasm: 								y11 = z3
-# asm 1: movdqa <z3=int6464#5,>y11=int6464#1
-# asm 2: movdqa <z3=%xmm4,>y11=%xmm0
-movdqa %xmm4,%xmm0
-
-# qhasm: uint32323232							y11 += z7
-# asm 1: paddd <z7=int6464#9,<y11=int6464#1
-# asm 2: paddd <z7=%xmm8,<y11=%xmm0
-paddd %xmm8,%xmm0
-
-# qhasm: 								r11 = y11
-# asm 1: movdqa <y11=int6464#1,>r11=int6464#13
-# asm 2: movdqa <y11=%xmm0,>r11=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232							y11 <<= 13
-# asm 1: pslld $13,<y11=int6464#1
-# asm 2: pslld $13,<y11=%xmm0
-pslld $13,%xmm0
-
-# qhasm: 								z11 ^= y11
-# asm 1: pxor  <y11=int6464#1,<z11=int6464#7
-# asm 2: pxor  <y11=%xmm0,<z11=%xmm6
-pxor  %xmm0,%xmm6
-
-# qhasm: uint32323232							r11 >>= 19
-# asm 1: psrld $19,<r11=int6464#13
-# asm 2: psrld $19,<r11=%xmm12
-psrld $19,%xmm12
-
-# qhasm: 								z11 ^= r11
-# asm 1: pxor  <r11=int6464#13,<z11=int6464#7
-# asm 2: pxor  <r11=%xmm12,<z11=%xmm6
-pxor  %xmm12,%xmm6
-
-# qhasm: 						y10 = z2
-# asm 1: movdqa <z2=int6464#11,>y10=int6464#1
-# asm 2: movdqa <z2=%xmm10,>y10=%xmm0
-movdqa %xmm10,%xmm0
-
-# qhasm: uint32323232					y10 += z6
-# asm 1: paddd <z6=int6464#6,<y10=int6464#1
-# asm 2: paddd <z6=%xmm5,<y10=%xmm0
-paddd %xmm5,%xmm0
-
-# qhasm: 						r10 = y10
-# asm 1: movdqa <y10=int6464#1,>r10=int6464#13
-# asm 2: movdqa <y10=%xmm0,>r10=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232					y10 <<= 18
-# asm 1: pslld $18,<y10=int6464#1
-# asm 2: pslld $18,<y10=%xmm0
-pslld $18,%xmm0
-
-# qhasm: 						z10 ^= y10
-# asm 1: pxor  <y10=int6464#1,<z10=int6464#2
-# asm 2: pxor  <y10=%xmm0,<z10=%xmm1
-pxor  %xmm0,%xmm1
-
-# qhasm: uint32323232					r10 >>= 14
-# asm 1: psrld $14,<r10=int6464#13
-# asm 2: psrld $14,<r10=%xmm12
-psrld $14,%xmm12
-
-# qhasm: 						z10 ^= r10
-# asm 1: pxor  <r10=int6464#13,<z10=int6464#2
-# asm 2: pxor  <r10=%xmm12,<z10=%xmm1
-pxor  %xmm12,%xmm1
-
-# qhasm: 		z0 = z0_stack
-# asm 1: movdqa <z0_stack=stack128#21,>z0=int6464#1
-# asm 2: movdqa <z0_stack=320(%rsp),>z0=%xmm0
-movdqa 320(%rsp),%xmm0
-
-# qhasm: 						z10_stack = z10
-# asm 1: movdqa <z10=int6464#2,>z10_stack=stack128#21
-# asm 2: movdqa <z10=%xmm1,>z10_stack=320(%rsp)
-movdqa %xmm1,320(%rsp)
-
-# qhasm: 		y1 = z3
-# asm 1: movdqa <z3=int6464#5,>y1=int6464#2
-# asm 2: movdqa <z3=%xmm4,>y1=%xmm1
-movdqa %xmm4,%xmm1
-
-# qhasm: uint32323232	y1 += z0
-# asm 1: paddd <z0=int6464#1,<y1=int6464#2
-# asm 2: paddd <z0=%xmm0,<y1=%xmm1
-paddd %xmm0,%xmm1
-
-# qhasm: 		r1 = y1
-# asm 1: movdqa <y1=int6464#2,>r1=int6464#13
-# asm 2: movdqa <y1=%xmm1,>r1=%xmm12
-movdqa %xmm1,%xmm12
-
-# qhasm: uint32323232	y1 <<= 7
-# asm 1: pslld $7,<y1=int6464#2
-# asm 2: pslld $7,<y1=%xmm1
-pslld $7,%xmm1
-
-# qhasm: 		z1 ^= y1
-# asm 1: pxor  <y1=int6464#2,<z1=int6464#8
-# asm 2: pxor  <y1=%xmm1,<z1=%xmm7
-pxor  %xmm1,%xmm7
-
-# qhasm: uint32323232	r1 >>= 25
-# asm 1: psrld $25,<r1=int6464#13
-# asm 2: psrld $25,<r1=%xmm12
-psrld $25,%xmm12
-
-# qhasm: 		z1 ^= r1
-# asm 1: pxor  <r1=int6464#13,<z1=int6464#8
-# asm 2: pxor  <r1=%xmm12,<z1=%xmm7
-pxor  %xmm12,%xmm7
-
-# qhasm: 								y15 = z7
-# asm 1: movdqa <z7=int6464#9,>y15=int6464#2
-# asm 2: movdqa <z7=%xmm8,>y15=%xmm1
-movdqa %xmm8,%xmm1
-
-# qhasm: uint32323232							y15 += z11
-# asm 1: paddd <z11=int6464#7,<y15=int6464#2
-# asm 2: paddd <z11=%xmm6,<y15=%xmm1
-paddd %xmm6,%xmm1
-
-# qhasm: 								r15 = y15
-# asm 1: movdqa <y15=int6464#2,>r15=int6464#13
-# asm 2: movdqa <y15=%xmm1,>r15=%xmm12
-movdqa %xmm1,%xmm12
-
-# qhasm: uint32323232							y15 <<= 18
-# asm 1: pslld $18,<y15=int6464#2
-# asm 2: pslld $18,<y15=%xmm1
-pslld $18,%xmm1
-
-# qhasm: 								z15 ^= y15
-# asm 1: pxor  <y15=int6464#2,<z15=int6464#3
-# asm 2: pxor  <y15=%xmm1,<z15=%xmm2
-pxor  %xmm1,%xmm2
-
-# qhasm: uint32323232							r15 >>= 14
-# asm 1: psrld $14,<r15=int6464#13
-# asm 2: psrld $14,<r15=%xmm12
-psrld $14,%xmm12
-
-# qhasm: 								z15 ^= r15
-# asm 1: pxor  <r15=int6464#13,<z15=int6464#3
-# asm 2: pxor  <r15=%xmm12,<z15=%xmm2
-pxor  %xmm12,%xmm2
-
-# qhasm: 				z5 = z5_stack
-# asm 1: movdqa <z5_stack=stack128#22,>z5=int6464#13
-# asm 2: movdqa <z5_stack=336(%rsp),>z5=%xmm12
-movdqa 336(%rsp),%xmm12
-
-# qhasm: 								z15_stack = z15
-# asm 1: movdqa <z15=int6464#3,>z15_stack=stack128#22
-# asm 2: movdqa <z15=%xmm2,>z15_stack=336(%rsp)
-movdqa %xmm2,336(%rsp)
-
-# qhasm: 				y6 = z4
-# asm 1: movdqa <z4=int6464#15,>y6=int6464#2
-# asm 2: movdqa <z4=%xmm14,>y6=%xmm1
-movdqa %xmm14,%xmm1
-
-# qhasm: uint32323232			y6 += z5
-# asm 1: paddd <z5=int6464#13,<y6=int6464#2
-# asm 2: paddd <z5=%xmm12,<y6=%xmm1
-paddd %xmm12,%xmm1
-
-# qhasm: 				r6 = y6
-# asm 1: movdqa <y6=int6464#2,>r6=int6464#3
-# asm 2: movdqa <y6=%xmm1,>r6=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232			y6 <<= 7
-# asm 1: pslld $7,<y6=int6464#2
-# asm 2: pslld $7,<y6=%xmm1
-pslld $7,%xmm1
-
-# qhasm: 				z6 ^= y6
-# asm 1: pxor  <y6=int6464#2,<z6=int6464#6
-# asm 2: pxor  <y6=%xmm1,<z6=%xmm5
-pxor  %xmm1,%xmm5
-
-# qhasm: uint32323232			r6 >>= 25
-# asm 1: psrld $25,<r6=int6464#3
-# asm 2: psrld $25,<r6=%xmm2
-psrld $25,%xmm2
-
-# qhasm: 				z6 ^= r6
-# asm 1: pxor  <r6=int6464#3,<z6=int6464#6
-# asm 2: pxor  <r6=%xmm2,<z6=%xmm5
-pxor  %xmm2,%xmm5
-
-# qhasm: 		y2 = z0
-# asm 1: movdqa <z0=int6464#1,>y2=int6464#2
-# asm 2: movdqa <z0=%xmm0,>y2=%xmm1
-movdqa %xmm0,%xmm1
-
-# qhasm: uint32323232	y2 += z1
-# asm 1: paddd <z1=int6464#8,<y2=int6464#2
-# asm 2: paddd <z1=%xmm7,<y2=%xmm1
-paddd %xmm7,%xmm1
-
-# qhasm: 		r2 = y2
-# asm 1: movdqa <y2=int6464#2,>r2=int6464#3
-# asm 2: movdqa <y2=%xmm1,>r2=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232	y2 <<= 9
-# asm 1: pslld $9,<y2=int6464#2
-# asm 2: pslld $9,<y2=%xmm1
-pslld $9,%xmm1
-
-# qhasm: 		z2 ^= y2
-# asm 1: pxor  <y2=int6464#2,<z2=int6464#11
-# asm 2: pxor  <y2=%xmm1,<z2=%xmm10
-pxor  %xmm1,%xmm10
-
-# qhasm: uint32323232	r2 >>= 23
-# asm 1: psrld $23,<r2=int6464#3
-# asm 2: psrld $23,<r2=%xmm2
-psrld $23,%xmm2
-
-# qhasm: 		z2 ^= r2
-# asm 1: pxor  <r2=int6464#3,<z2=int6464#11
-# asm 2: pxor  <r2=%xmm2,<z2=%xmm10
-pxor  %xmm2,%xmm10
-
-# qhasm: 				y7 = z5
-# asm 1: movdqa <z5=int6464#13,>y7=int6464#2
-# asm 2: movdqa <z5=%xmm12,>y7=%xmm1
-movdqa %xmm12,%xmm1
-
-# qhasm: uint32323232			y7 += z6
-# asm 1: paddd <z6=int6464#6,<y7=int6464#2
-# asm 2: paddd <z6=%xmm5,<y7=%xmm1
-paddd %xmm5,%xmm1
-
-# qhasm: 				r7 = y7
-# asm 1: movdqa <y7=int6464#2,>r7=int6464#3
-# asm 2: movdqa <y7=%xmm1,>r7=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232			y7 <<= 9
-# asm 1: pslld $9,<y7=int6464#2
-# asm 2: pslld $9,<y7=%xmm1
-pslld $9,%xmm1
-
-# qhasm: 				z7 ^= y7
-# asm 1: pxor  <y7=int6464#2,<z7=int6464#9
-# asm 2: pxor  <y7=%xmm1,<z7=%xmm8
-pxor  %xmm1,%xmm8
-
-# qhasm: uint32323232			r7 >>= 23
-# asm 1: psrld $23,<r7=int6464#3
-# asm 2: psrld $23,<r7=%xmm2
-psrld $23,%xmm2
-
-# qhasm: 				z7 ^= r7
-# asm 1: pxor  <r7=int6464#3,<z7=int6464#9
-# asm 2: pxor  <r7=%xmm2,<z7=%xmm8
-pxor  %xmm2,%xmm8
-
-# qhasm: 		y3 = z1
-# asm 1: movdqa <z1=int6464#8,>y3=int6464#2
-# asm 2: movdqa <z1=%xmm7,>y3=%xmm1
-movdqa %xmm7,%xmm1
-
-# qhasm: uint32323232	y3 += z2
-# asm 1: paddd <z2=int6464#11,<y3=int6464#2
-# asm 2: paddd <z2=%xmm10,<y3=%xmm1
-paddd %xmm10,%xmm1
-
-# qhasm: 		r3 = y3
-# asm 1: movdqa <y3=int6464#2,>r3=int6464#3
-# asm 2: movdqa <y3=%xmm1,>r3=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232	y3 <<= 13
-# asm 1: pslld $13,<y3=int6464#2
-# asm 2: pslld $13,<y3=%xmm1
-pslld $13,%xmm1
-
-# qhasm: 		z3 ^= y3
-# asm 1: pxor  <y3=int6464#2,<z3=int6464#5
-# asm 2: pxor  <y3=%xmm1,<z3=%xmm4
-pxor  %xmm1,%xmm4
-
-# qhasm: uint32323232	r3 >>= 19
-# asm 1: psrld $19,<r3=int6464#3
-# asm 2: psrld $19,<r3=%xmm2
-psrld $19,%xmm2
-
-# qhasm: 		z3 ^= r3
-# asm 1: pxor  <r3=int6464#3,<z3=int6464#5
-# asm 2: pxor  <r3=%xmm2,<z3=%xmm4
-pxor  %xmm2,%xmm4
-
-# qhasm: 				y4 = z6
-# asm 1: movdqa <z6=int6464#6,>y4=int6464#2
-# asm 2: movdqa <z6=%xmm5,>y4=%xmm1
-movdqa %xmm5,%xmm1
-
-# qhasm: uint32323232			y4 += z7
-# asm 1: paddd <z7=int6464#9,<y4=int6464#2
-# asm 2: paddd <z7=%xmm8,<y4=%xmm1
-paddd %xmm8,%xmm1
-
-# qhasm: 				r4 = y4
-# asm 1: movdqa <y4=int6464#2,>r4=int6464#3
-# asm 2: movdqa <y4=%xmm1,>r4=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232			y4 <<= 13
-# asm 1: pslld $13,<y4=int6464#2
-# asm 2: pslld $13,<y4=%xmm1
-pslld $13,%xmm1
-
-# qhasm: 				z4 ^= y4
-# asm 1: pxor  <y4=int6464#2,<z4=int6464#15
-# asm 2: pxor  <y4=%xmm1,<z4=%xmm14
-pxor  %xmm1,%xmm14
-
-# qhasm: uint32323232			r4 >>= 19
-# asm 1: psrld $19,<r4=int6464#3
-# asm 2: psrld $19,<r4=%xmm2
-psrld $19,%xmm2
-
-# qhasm: 				z4 ^= r4
-# asm 1: pxor  <r4=int6464#3,<z4=int6464#15
-# asm 2: pxor  <r4=%xmm2,<z4=%xmm14
-pxor  %xmm2,%xmm14
-
-# qhasm: 		y0 = z2
-# asm 1: movdqa <z2=int6464#11,>y0=int6464#2
-# asm 2: movdqa <z2=%xmm10,>y0=%xmm1
-movdqa %xmm10,%xmm1
-
-# qhasm: uint32323232	y0 += z3
-# asm 1: paddd <z3=int6464#5,<y0=int6464#2
-# asm 2: paddd <z3=%xmm4,<y0=%xmm1
-paddd %xmm4,%xmm1
-
-# qhasm: 		r0 = y0
-# asm 1: movdqa <y0=int6464#2,>r0=int6464#3
-# asm 2: movdqa <y0=%xmm1,>r0=%xmm2
-movdqa %xmm1,%xmm2
-
-# qhasm: uint32323232	y0 <<= 18
-# asm 1: pslld $18,<y0=int6464#2
-# asm 2: pslld $18,<y0=%xmm1
-pslld $18,%xmm1
-
-# qhasm: 		z0 ^= y0
-# asm 1: pxor  <y0=int6464#2,<z0=int6464#1
-# asm 2: pxor  <y0=%xmm1,<z0=%xmm0
-pxor  %xmm1,%xmm0
-
-# qhasm: uint32323232	r0 >>= 14
-# asm 1: psrld $14,<r0=int6464#3
-# asm 2: psrld $14,<r0=%xmm2
-psrld $14,%xmm2
-
-# qhasm: 		z0 ^= r0
-# asm 1: pxor  <r0=int6464#3,<z0=int6464#1
-# asm 2: pxor  <r0=%xmm2,<z0=%xmm0
-pxor  %xmm2,%xmm0
-
-# qhasm: 						z10 = z10_stack
-# asm 1: movdqa <z10_stack=stack128#21,>z10=int6464#2
-# asm 2: movdqa <z10_stack=320(%rsp),>z10=%xmm1
-movdqa 320(%rsp),%xmm1
-
-# qhasm: 		z0_stack = z0
-# asm 1: movdqa <z0=int6464#1,>z0_stack=stack128#21
-# asm 2: movdqa <z0=%xmm0,>z0_stack=320(%rsp)
-movdqa %xmm0,320(%rsp)
-
-# qhasm: 				y5 = z7
-# asm 1: movdqa <z7=int6464#9,>y5=int6464#1
-# asm 2: movdqa <z7=%xmm8,>y5=%xmm0
-movdqa %xmm8,%xmm0
-
-# qhasm: uint32323232			y5 += z4
-# asm 1: paddd <z4=int6464#15,<y5=int6464#1
-# asm 2: paddd <z4=%xmm14,<y5=%xmm0
-paddd %xmm14,%xmm0
-
-# qhasm: 				r5 = y5
-# asm 1: movdqa <y5=int6464#1,>r5=int6464#3
-# asm 2: movdqa <y5=%xmm0,>r5=%xmm2
-movdqa %xmm0,%xmm2
-
-# qhasm: uint32323232			y5 <<= 18
-# asm 1: pslld $18,<y5=int6464#1
-# asm 2: pslld $18,<y5=%xmm0
-pslld $18,%xmm0
-
-# qhasm: 				z5 ^= y5
-# asm 1: pxor  <y5=int6464#1,<z5=int6464#13
-# asm 2: pxor  <y5=%xmm0,<z5=%xmm12
-pxor  %xmm0,%xmm12
-
-# qhasm: uint32323232			r5 >>= 14
-# asm 1: psrld $14,<r5=int6464#3
-# asm 2: psrld $14,<r5=%xmm2
-psrld $14,%xmm2
-
-# qhasm: 				z5 ^= r5
-# asm 1: pxor  <r5=int6464#3,<z5=int6464#13
-# asm 2: pxor  <r5=%xmm2,<z5=%xmm12
-pxor  %xmm2,%xmm12
-
-# qhasm: 						y11 = z9
-# asm 1: movdqa <z9=int6464#12,>y11=int6464#1
-# asm 2: movdqa <z9=%xmm11,>y11=%xmm0
-movdqa %xmm11,%xmm0
-
-# qhasm: uint32323232					y11 += z10
-# asm 1: paddd <z10=int6464#2,<y11=int6464#1
-# asm 2: paddd <z10=%xmm1,<y11=%xmm0
-paddd %xmm1,%xmm0
-
-# qhasm: 						r11 = y11
-# asm 1: movdqa <y11=int6464#1,>r11=int6464#3
-# asm 2: movdqa <y11=%xmm0,>r11=%xmm2
-movdqa %xmm0,%xmm2
-
-# qhasm: uint32323232					y11 <<= 7
-# asm 1: pslld $7,<y11=int6464#1
-# asm 2: pslld $7,<y11=%xmm0
-pslld $7,%xmm0
-
-# qhasm: 						z11 ^= y11
-# asm 1: pxor  <y11=int6464#1,<z11=int6464#7
-# asm 2: pxor  <y11=%xmm0,<z11=%xmm6
-pxor  %xmm0,%xmm6
-
-# qhasm: uint32323232					r11 >>= 25
-# asm 1: psrld $25,<r11=int6464#3
-# asm 2: psrld $25,<r11=%xmm2
-psrld $25,%xmm2
-
-# qhasm: 						z11 ^= r11
-# asm 1: pxor  <r11=int6464#3,<z11=int6464#7
-# asm 2: pxor  <r11=%xmm2,<z11=%xmm6
-pxor  %xmm2,%xmm6
-
-# qhasm: 								z15 = z15_stack
-# asm 1: movdqa <z15_stack=stack128#22,>z15=int6464#3
-# asm 2: movdqa <z15_stack=336(%rsp),>z15=%xmm2
-movdqa 336(%rsp),%xmm2
-
-# qhasm: 				z5_stack = z5
-# asm 1: movdqa <z5=int6464#13,>z5_stack=stack128#22
-# asm 2: movdqa <z5=%xmm12,>z5_stack=336(%rsp)
-movdqa %xmm12,336(%rsp)
-
-# qhasm: 								y12 = z14
-# asm 1: movdqa <z14=int6464#4,>y12=int6464#1
-# asm 2: movdqa <z14=%xmm3,>y12=%xmm0
-movdqa %xmm3,%xmm0
-
-# qhasm: uint32323232							y12 += z15
-# asm 1: paddd <z15=int6464#3,<y12=int6464#1
-# asm 2: paddd <z15=%xmm2,<y12=%xmm0
-paddd %xmm2,%xmm0
-
-# qhasm: 								r12 = y12
-# asm 1: movdqa <y12=int6464#1,>r12=int6464#13
-# asm 2: movdqa <y12=%xmm0,>r12=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232							y12 <<= 7
-# asm 1: pslld $7,<y12=int6464#1
-# asm 2: pslld $7,<y12=%xmm0
-pslld $7,%xmm0
-
-# qhasm: 								z12 ^= y12
-# asm 1: pxor  <y12=int6464#1,<z12=int6464#14
-# asm 2: pxor  <y12=%xmm0,<z12=%xmm13
-pxor  %xmm0,%xmm13
-
-# qhasm: uint32323232							r12 >>= 25
-# asm 1: psrld $25,<r12=int6464#13
-# asm 2: psrld $25,<r12=%xmm12
-psrld $25,%xmm12
-
-# qhasm: 								z12 ^= r12
-# asm 1: pxor  <r12=int6464#13,<z12=int6464#14
-# asm 2: pxor  <r12=%xmm12,<z12=%xmm13
-pxor  %xmm12,%xmm13
-
-# qhasm: 						y8 = z10
-# asm 1: movdqa <z10=int6464#2,>y8=int6464#1
-# asm 2: movdqa <z10=%xmm1,>y8=%xmm0
-movdqa %xmm1,%xmm0
-
-# qhasm: uint32323232					y8 += z11
-# asm 1: paddd <z11=int6464#7,<y8=int6464#1
-# asm 2: paddd <z11=%xmm6,<y8=%xmm0
-paddd %xmm6,%xmm0
-
-# qhasm: 						r8 = y8
-# asm 1: movdqa <y8=int6464#1,>r8=int6464#13
-# asm 2: movdqa <y8=%xmm0,>r8=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232					y8 <<= 9
-# asm 1: pslld $9,<y8=int6464#1
-# asm 2: pslld $9,<y8=%xmm0
-pslld $9,%xmm0
-
-# qhasm: 						z8 ^= y8
-# asm 1: pxor  <y8=int6464#1,<z8=int6464#16
-# asm 2: pxor  <y8=%xmm0,<z8=%xmm15
-pxor  %xmm0,%xmm15
-
-# qhasm: uint32323232					r8 >>= 23
-# asm 1: psrld $23,<r8=int6464#13
-# asm 2: psrld $23,<r8=%xmm12
-psrld $23,%xmm12
-
-# qhasm: 						z8 ^= r8
-# asm 1: pxor  <r8=int6464#13,<z8=int6464#16
-# asm 2: pxor  <r8=%xmm12,<z8=%xmm15
-pxor  %xmm12,%xmm15
-
-# qhasm: 								y13 = z15
-# asm 1: movdqa <z15=int6464#3,>y13=int6464#1
-# asm 2: movdqa <z15=%xmm2,>y13=%xmm0
-movdqa %xmm2,%xmm0
-
-# qhasm: uint32323232							y13 += z12
-# asm 1: paddd <z12=int6464#14,<y13=int6464#1
-# asm 2: paddd <z12=%xmm13,<y13=%xmm0
-paddd %xmm13,%xmm0
-
-# qhasm: 								r13 = y13
-# asm 1: movdqa <y13=int6464#1,>r13=int6464#13
-# asm 2: movdqa <y13=%xmm0,>r13=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232							y13 <<= 9
-# asm 1: pslld $9,<y13=int6464#1
-# asm 2: pslld $9,<y13=%xmm0
-pslld $9,%xmm0
-
-# qhasm: 								z13 ^= y13
-# asm 1: pxor  <y13=int6464#1,<z13=int6464#10
-# asm 2: pxor  <y13=%xmm0,<z13=%xmm9
-pxor  %xmm0,%xmm9
-
-# qhasm: uint32323232							r13 >>= 23
-# asm 1: psrld $23,<r13=int6464#13
-# asm 2: psrld $23,<r13=%xmm12
-psrld $23,%xmm12
-
-# qhasm: 								z13 ^= r13
-# asm 1: pxor  <r13=int6464#13,<z13=int6464#10
-# asm 2: pxor  <r13=%xmm12,<z13=%xmm9
-pxor  %xmm12,%xmm9
-
-# qhasm: 						y9 = z11
-# asm 1: movdqa <z11=int6464#7,>y9=int6464#1
-# asm 2: movdqa <z11=%xmm6,>y9=%xmm0
-movdqa %xmm6,%xmm0
-
-# qhasm: uint32323232					y9 += z8
-# asm 1: paddd <z8=int6464#16,<y9=int6464#1
-# asm 2: paddd <z8=%xmm15,<y9=%xmm0
-paddd %xmm15,%xmm0
-
-# qhasm: 						r9 = y9
-# asm 1: movdqa <y9=int6464#1,>r9=int6464#13
-# asm 2: movdqa <y9=%xmm0,>r9=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232					y9 <<= 13
-# asm 1: pslld $13,<y9=int6464#1
-# asm 2: pslld $13,<y9=%xmm0
-pslld $13,%xmm0
-
-# qhasm: 						z9 ^= y9
-# asm 1: pxor  <y9=int6464#1,<z9=int6464#12
-# asm 2: pxor  <y9=%xmm0,<z9=%xmm11
-pxor  %xmm0,%xmm11
-
-# qhasm: uint32323232					r9 >>= 19
-# asm 1: psrld $19,<r9=int6464#13
-# asm 2: psrld $19,<r9=%xmm12
-psrld $19,%xmm12
-
-# qhasm: 						z9 ^= r9
-# asm 1: pxor  <r9=int6464#13,<z9=int6464#12
-# asm 2: pxor  <r9=%xmm12,<z9=%xmm11
-pxor  %xmm12,%xmm11
-
-# qhasm: 								y14 = z12
-# asm 1: movdqa <z12=int6464#14,>y14=int6464#1
-# asm 2: movdqa <z12=%xmm13,>y14=%xmm0
-movdqa %xmm13,%xmm0
-
-# qhasm: uint32323232							y14 += z13
-# asm 1: paddd <z13=int6464#10,<y14=int6464#1
-# asm 2: paddd <z13=%xmm9,<y14=%xmm0
-paddd %xmm9,%xmm0
-
-# qhasm: 								r14 = y14
-# asm 1: movdqa <y14=int6464#1,>r14=int6464#13
-# asm 2: movdqa <y14=%xmm0,>r14=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232							y14 <<= 13
-# asm 1: pslld $13,<y14=int6464#1
-# asm 2: pslld $13,<y14=%xmm0
-pslld $13,%xmm0
-
-# qhasm: 								z14 ^= y14
-# asm 1: pxor  <y14=int6464#1,<z14=int6464#4
-# asm 2: pxor  <y14=%xmm0,<z14=%xmm3
-pxor  %xmm0,%xmm3
-
-# qhasm: uint32323232							r14 >>= 19
-# asm 1: psrld $19,<r14=int6464#13
-# asm 2: psrld $19,<r14=%xmm12
-psrld $19,%xmm12
-
-# qhasm: 								z14 ^= r14
-# asm 1: pxor  <r14=int6464#13,<z14=int6464#4
-# asm 2: pxor  <r14=%xmm12,<z14=%xmm3
-pxor  %xmm12,%xmm3
-
-# qhasm: 						y10 = z8
-# asm 1: movdqa <z8=int6464#16,>y10=int6464#1
-# asm 2: movdqa <z8=%xmm15,>y10=%xmm0
-movdqa %xmm15,%xmm0
-
-# qhasm: uint32323232					y10 += z9
-# asm 1: paddd <z9=int6464#12,<y10=int6464#1
-# asm 2: paddd <z9=%xmm11,<y10=%xmm0
-paddd %xmm11,%xmm0
-
-# qhasm: 						r10 = y10
-# asm 1: movdqa <y10=int6464#1,>r10=int6464#13
-# asm 2: movdqa <y10=%xmm0,>r10=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232					y10 <<= 18
-# asm 1: pslld $18,<y10=int6464#1
-# asm 2: pslld $18,<y10=%xmm0
-pslld $18,%xmm0
-
-# qhasm: 						z10 ^= y10
-# asm 1: pxor  <y10=int6464#1,<z10=int6464#2
-# asm 2: pxor  <y10=%xmm0,<z10=%xmm1
-pxor  %xmm0,%xmm1
-
-# qhasm: uint32323232					r10 >>= 14
-# asm 1: psrld $14,<r10=int6464#13
-# asm 2: psrld $14,<r10=%xmm12
-psrld $14,%xmm12
-
-# qhasm: 						z10 ^= r10
-# asm 1: pxor  <r10=int6464#13,<z10=int6464#2
-# asm 2: pxor  <r10=%xmm12,<z10=%xmm1
-pxor  %xmm12,%xmm1
-
-# qhasm: 								y15 = z13
-# asm 1: movdqa <z13=int6464#10,>y15=int6464#1
-# asm 2: movdqa <z13=%xmm9,>y15=%xmm0
-movdqa %xmm9,%xmm0
-
-# qhasm: uint32323232							y15 += z14
-# asm 1: paddd <z14=int6464#4,<y15=int6464#1
-# asm 2: paddd <z14=%xmm3,<y15=%xmm0
-paddd %xmm3,%xmm0
-
-# qhasm: 								r15 = y15
-# asm 1: movdqa <y15=int6464#1,>r15=int6464#13
-# asm 2: movdqa <y15=%xmm0,>r15=%xmm12
-movdqa %xmm0,%xmm12
-
-# qhasm: uint32323232							y15 <<= 18
-# asm 1: pslld $18,<y15=int6464#1
-# asm 2: pslld $18,<y15=%xmm0
-pslld $18,%xmm0
-
-# qhasm: 								z15 ^= y15
-# asm 1: pxor  <y15=int6464#1,<z15=int6464#3
-# asm 2: pxor  <y15=%xmm0,<z15=%xmm2
-pxor  %xmm0,%xmm2
-
-# qhasm: uint32323232							r15 >>= 14
-# asm 1: psrld $14,<r15=int6464#13
-# asm 2: psrld $14,<r15=%xmm12
-psrld $14,%xmm12
-
-# qhasm: 								z15 ^= r15
-# asm 1: pxor  <r15=int6464#13,<z15=int6464#3
-# asm 2: pxor  <r15=%xmm12,<z15=%xmm2
-pxor  %xmm12,%xmm2
-
-# qhasm: 		z0 = z0_stack
-# asm 1: movdqa <z0_stack=stack128#21,>z0=int6464#13
-# asm 2: movdqa <z0_stack=320(%rsp),>z0=%xmm12
-movdqa 320(%rsp),%xmm12
-
-# qhasm: 				z5 = z5_stack
-# asm 1: movdqa <z5_stack=stack128#22,>z5=int6464#1
-# asm 2: movdqa <z5_stack=336(%rsp),>z5=%xmm0
-movdqa 336(%rsp),%xmm0
-
-# qhasm:                   unsigned>? i -= 2
-# asm 1: sub  $2,<i=int64#3
-# asm 2: sub  $2,<i=%rdx
-sub  $2,%rdx
-# comment:fp stack unchanged by jump
-
-# qhasm: goto mainloop1 if unsigned>
-ja ._mainloop1
-
-# qhasm:   uint32323232 z0 += orig0
-# asm 1: paddd <orig0=stack128#8,<z0=int6464#13
-# asm 2: paddd <orig0=112(%rsp),<z0=%xmm12
-paddd 112(%rsp),%xmm12
-
-# qhasm:   uint32323232 z1 += orig1
-# asm 1: paddd <orig1=stack128#12,<z1=int6464#8
-# asm 2: paddd <orig1=176(%rsp),<z1=%xmm7
-paddd 176(%rsp),%xmm7
-
-# qhasm:   uint32323232 z2 += orig2
-# asm 1: paddd <orig2=stack128#15,<z2=int6464#11
-# asm 2: paddd <orig2=224(%rsp),<z2=%xmm10
-paddd 224(%rsp),%xmm10
-
-# qhasm:   uint32323232 z3 += orig3
-# asm 1: paddd <orig3=stack128#18,<z3=int6464#5
-# asm 2: paddd <orig3=272(%rsp),<z3=%xmm4
-paddd 272(%rsp),%xmm4
-
-# qhasm:   in0 = z0
-# asm 1: movd   <z0=int6464#13,>in0=int64#3
-# asm 2: movd   <z0=%xmm12,>in0=%rdx
-movd   %xmm12,%rdx
-
-# qhasm:   in1 = z1
-# asm 1: movd   <z1=int6464#8,>in1=int64#4
-# asm 2: movd   <z1=%xmm7,>in1=%rcx
-movd   %xmm7,%rcx
-
-# qhasm:   in2 = z2
-# asm 1: movd   <z2=int6464#11,>in2=int64#5
-# asm 2: movd   <z2=%xmm10,>in2=%r8
-movd   %xmm10,%r8
-
-# qhasm:   in3 = z3
-# asm 1: movd   <z3=int6464#5,>in3=int64#6
-# asm 2: movd   <z3=%xmm4,>in3=%r9
-movd   %xmm4,%r9
-
-# qhasm:   z0 <<<= 96
-# asm 1: pshufd $0x39,<z0=int6464#13,<z0=int6464#13
-# asm 2: pshufd $0x39,<z0=%xmm12,<z0=%xmm12
-pshufd $0x39,%xmm12,%xmm12
-
-# qhasm:   z1 <<<= 96
-# asm 1: pshufd $0x39,<z1=int6464#8,<z1=int6464#8
-# asm 2: pshufd $0x39,<z1=%xmm7,<z1=%xmm7
-pshufd $0x39,%xmm7,%xmm7
-
-# qhasm:   z2 <<<= 96
-# asm 1: pshufd $0x39,<z2=int6464#11,<z2=int6464#11
-# asm 2: pshufd $0x39,<z2=%xmm10,<z2=%xmm10
-pshufd $0x39,%xmm10,%xmm10
-
-# qhasm:   z3 <<<= 96
-# asm 1: pshufd $0x39,<z3=int6464#5,<z3=int6464#5
-# asm 2: pshufd $0x39,<z3=%xmm4,<z3=%xmm4
-pshufd $0x39,%xmm4,%xmm4
-
-# qhasm:   (uint32) in0 ^= *(uint32 *) (m + 0)
-# asm 1: xorl 0(<m=int64#2),<in0=int64#3d
-# asm 2: xorl 0(<m=%rsi),<in0=%edx
-xorl 0(%rsi),%edx
-
-# qhasm:   (uint32) in1 ^= *(uint32 *) (m + 4)
-# asm 1: xorl 4(<m=int64#2),<in1=int64#4d
-# asm 2: xorl 4(<m=%rsi),<in1=%ecx
-xorl 4(%rsi),%ecx
-
-# qhasm:   (uint32) in2 ^= *(uint32 *) (m + 8)
-# asm 1: xorl 8(<m=int64#2),<in2=int64#5d
-# asm 2: xorl 8(<m=%rsi),<in2=%r8d
-xorl 8(%rsi),%r8d
-
-# qhasm:   (uint32) in3 ^= *(uint32 *) (m + 12)
-# asm 1: xorl 12(<m=int64#2),<in3=int64#6d
-# asm 2: xorl 12(<m=%rsi),<in3=%r9d
-xorl 12(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 0) = in0
-# asm 1: movl   <in0=int64#3d,0(<out=int64#1)
-# asm 2: movl   <in0=%edx,0(<out=%rdi)
-movl   %edx,0(%rdi)
-
-# qhasm:   *(uint32 *) (out + 4) = in1
-# asm 1: movl   <in1=int64#4d,4(<out=int64#1)
-# asm 2: movl   <in1=%ecx,4(<out=%rdi)
-movl   %ecx,4(%rdi)
-
-# qhasm:   *(uint32 *) (out + 8) = in2
-# asm 1: movl   <in2=int64#5d,8(<out=int64#1)
-# asm 2: movl   <in2=%r8d,8(<out=%rdi)
-movl   %r8d,8(%rdi)
-
-# qhasm:   *(uint32 *) (out + 12) = in3
-# asm 1: movl   <in3=int64#6d,12(<out=int64#1)
-# asm 2: movl   <in3=%r9d,12(<out=%rdi)
-movl   %r9d,12(%rdi)
-
-# qhasm:   in0 = z0
-# asm 1: movd   <z0=int6464#13,>in0=int64#3
-# asm 2: movd   <z0=%xmm12,>in0=%rdx
-movd   %xmm12,%rdx
-
-# qhasm:   in1 = z1
-# asm 1: movd   <z1=int6464#8,>in1=int64#4
-# asm 2: movd   <z1=%xmm7,>in1=%rcx
-movd   %xmm7,%rcx
-
-# qhasm:   in2 = z2
-# asm 1: movd   <z2=int6464#11,>in2=int64#5
-# asm 2: movd   <z2=%xmm10,>in2=%r8
-movd   %xmm10,%r8
-
-# qhasm:   in3 = z3
-# asm 1: movd   <z3=int6464#5,>in3=int64#6
-# asm 2: movd   <z3=%xmm4,>in3=%r9
-movd   %xmm4,%r9
-
-# qhasm:   z0 <<<= 96
-# asm 1: pshufd $0x39,<z0=int6464#13,<z0=int6464#13
-# asm 2: pshufd $0x39,<z0=%xmm12,<z0=%xmm12
-pshufd $0x39,%xmm12,%xmm12
-
-# qhasm:   z1 <<<= 96
-# asm 1: pshufd $0x39,<z1=int6464#8,<z1=int6464#8
-# asm 2: pshufd $0x39,<z1=%xmm7,<z1=%xmm7
-pshufd $0x39,%xmm7,%xmm7
-
-# qhasm:   z2 <<<= 96
-# asm 1: pshufd $0x39,<z2=int6464#11,<z2=int6464#11
-# asm 2: pshufd $0x39,<z2=%xmm10,<z2=%xmm10
-pshufd $0x39,%xmm10,%xmm10
-
-# qhasm:   z3 <<<= 96
-# asm 1: pshufd $0x39,<z3=int6464#5,<z3=int6464#5
-# asm 2: pshufd $0x39,<z3=%xmm4,<z3=%xmm4
-pshufd $0x39,%xmm4,%xmm4
-
-# qhasm:   (uint32) in0 ^= *(uint32 *) (m + 64)
-# asm 1: xorl 64(<m=int64#2),<in0=int64#3d
-# asm 2: xorl 64(<m=%rsi),<in0=%edx
-xorl 64(%rsi),%edx
-
-# qhasm:   (uint32) in1 ^= *(uint32 *) (m + 68)
-# asm 1: xorl 68(<m=int64#2),<in1=int64#4d
-# asm 2: xorl 68(<m=%rsi),<in1=%ecx
-xorl 68(%rsi),%ecx
-
-# qhasm:   (uint32) in2 ^= *(uint32 *) (m + 72)
-# asm 1: xorl 72(<m=int64#2),<in2=int64#5d
-# asm 2: xorl 72(<m=%rsi),<in2=%r8d
-xorl 72(%rsi),%r8d
-
-# qhasm:   (uint32) in3 ^= *(uint32 *) (m + 76)
-# asm 1: xorl 76(<m=int64#2),<in3=int64#6d
-# asm 2: xorl 76(<m=%rsi),<in3=%r9d
-xorl 76(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 64) = in0
-# asm 1: movl   <in0=int64#3d,64(<out=int64#1)
-# asm 2: movl   <in0=%edx,64(<out=%rdi)
-movl   %edx,64(%rdi)
-
-# qhasm:   *(uint32 *) (out + 68) = in1
-# asm 1: movl   <in1=int64#4d,68(<out=int64#1)
-# asm 2: movl   <in1=%ecx,68(<out=%rdi)
-movl   %ecx,68(%rdi)
-
-# qhasm:   *(uint32 *) (out + 72) = in2
-# asm 1: movl   <in2=int64#5d,72(<out=int64#1)
-# asm 2: movl   <in2=%r8d,72(<out=%rdi)
-movl   %r8d,72(%rdi)
-
-# qhasm:   *(uint32 *) (out + 76) = in3
-# asm 1: movl   <in3=int64#6d,76(<out=int64#1)
-# asm 2: movl   <in3=%r9d,76(<out=%rdi)
-movl   %r9d,76(%rdi)
-
-# qhasm:   in0 = z0
-# asm 1: movd   <z0=int6464#13,>in0=int64#3
-# asm 2: movd   <z0=%xmm12,>in0=%rdx
-movd   %xmm12,%rdx
-
-# qhasm:   in1 = z1
-# asm 1: movd   <z1=int6464#8,>in1=int64#4
-# asm 2: movd   <z1=%xmm7,>in1=%rcx
-movd   %xmm7,%rcx
-
-# qhasm:   in2 = z2
-# asm 1: movd   <z2=int6464#11,>in2=int64#5
-# asm 2: movd   <z2=%xmm10,>in2=%r8
-movd   %xmm10,%r8
-
-# qhasm:   in3 = z3
-# asm 1: movd   <z3=int6464#5,>in3=int64#6
-# asm 2: movd   <z3=%xmm4,>in3=%r9
-movd   %xmm4,%r9
-
-# qhasm:   z0 <<<= 96
-# asm 1: pshufd $0x39,<z0=int6464#13,<z0=int6464#13
-# asm 2: pshufd $0x39,<z0=%xmm12,<z0=%xmm12
-pshufd $0x39,%xmm12,%xmm12
-
-# qhasm:   z1 <<<= 96
-# asm 1: pshufd $0x39,<z1=int6464#8,<z1=int6464#8
-# asm 2: pshufd $0x39,<z1=%xmm7,<z1=%xmm7
-pshufd $0x39,%xmm7,%xmm7
-
-# qhasm:   z2 <<<= 96
-# asm 1: pshufd $0x39,<z2=int6464#11,<z2=int6464#11
-# asm 2: pshufd $0x39,<z2=%xmm10,<z2=%xmm10
-pshufd $0x39,%xmm10,%xmm10
-
-# qhasm:   z3 <<<= 96
-# asm 1: pshufd $0x39,<z3=int6464#5,<z3=int6464#5
-# asm 2: pshufd $0x39,<z3=%xmm4,<z3=%xmm4
-pshufd $0x39,%xmm4,%xmm4
-
-# qhasm:   (uint32) in0 ^= *(uint32 *) (m + 128)
-# asm 1: xorl 128(<m=int64#2),<in0=int64#3d
-# asm 2: xorl 128(<m=%rsi),<in0=%edx
-xorl 128(%rsi),%edx
-
-# qhasm:   (uint32) in1 ^= *(uint32 *) (m + 132)
-# asm 1: xorl 132(<m=int64#2),<in1=int64#4d
-# asm 2: xorl 132(<m=%rsi),<in1=%ecx
-xorl 132(%rsi),%ecx
-
-# qhasm:   (uint32) in2 ^= *(uint32 *) (m + 136)
-# asm 1: xorl 136(<m=int64#2),<in2=int64#5d
-# asm 2: xorl 136(<m=%rsi),<in2=%r8d
-xorl 136(%rsi),%r8d
-
-# qhasm:   (uint32) in3 ^= *(uint32 *) (m + 140)
-# asm 1: xorl 140(<m=int64#2),<in3=int64#6d
-# asm 2: xorl 140(<m=%rsi),<in3=%r9d
-xorl 140(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 128) = in0
-# asm 1: movl   <in0=int64#3d,128(<out=int64#1)
-# asm 2: movl   <in0=%edx,128(<out=%rdi)
-movl   %edx,128(%rdi)
-
-# qhasm:   *(uint32 *) (out + 132) = in1
-# asm 1: movl   <in1=int64#4d,132(<out=int64#1)
-# asm 2: movl   <in1=%ecx,132(<out=%rdi)
-movl   %ecx,132(%rdi)
-
-# qhasm:   *(uint32 *) (out + 136) = in2
-# asm 1: movl   <in2=int64#5d,136(<out=int64#1)
-# asm 2: movl   <in2=%r8d,136(<out=%rdi)
-movl   %r8d,136(%rdi)
-
-# qhasm:   *(uint32 *) (out + 140) = in3
-# asm 1: movl   <in3=int64#6d,140(<out=int64#1)
-# asm 2: movl   <in3=%r9d,140(<out=%rdi)
-movl   %r9d,140(%rdi)
-
-# qhasm:   in0 = z0
-# asm 1: movd   <z0=int6464#13,>in0=int64#3
-# asm 2: movd   <z0=%xmm12,>in0=%rdx
-movd   %xmm12,%rdx
-
-# qhasm:   in1 = z1
-# asm 1: movd   <z1=int6464#8,>in1=int64#4
-# asm 2: movd   <z1=%xmm7,>in1=%rcx
-movd   %xmm7,%rcx
-
-# qhasm:   in2 = z2
-# asm 1: movd   <z2=int6464#11,>in2=int64#5
-# asm 2: movd   <z2=%xmm10,>in2=%r8
-movd   %xmm10,%r8
-
-# qhasm:   in3 = z3
-# asm 1: movd   <z3=int6464#5,>in3=int64#6
-# asm 2: movd   <z3=%xmm4,>in3=%r9
-movd   %xmm4,%r9
-
-# qhasm:   (uint32) in0 ^= *(uint32 *) (m + 192)
-# asm 1: xorl 192(<m=int64#2),<in0=int64#3d
-# asm 2: xorl 192(<m=%rsi),<in0=%edx
-xorl 192(%rsi),%edx
-
-# qhasm:   (uint32) in1 ^= *(uint32 *) (m + 196)
-# asm 1: xorl 196(<m=int64#2),<in1=int64#4d
-# asm 2: xorl 196(<m=%rsi),<in1=%ecx
-xorl 196(%rsi),%ecx
-
-# qhasm:   (uint32) in2 ^= *(uint32 *) (m + 200)
-# asm 1: xorl 200(<m=int64#2),<in2=int64#5d
-# asm 2: xorl 200(<m=%rsi),<in2=%r8d
-xorl 200(%rsi),%r8d
-
-# qhasm:   (uint32) in3 ^= *(uint32 *) (m + 204)
-# asm 1: xorl 204(<m=int64#2),<in3=int64#6d
-# asm 2: xorl 204(<m=%rsi),<in3=%r9d
-xorl 204(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 192) = in0
-# asm 1: movl   <in0=int64#3d,192(<out=int64#1)
-# asm 2: movl   <in0=%edx,192(<out=%rdi)
-movl   %edx,192(%rdi)
-
-# qhasm:   *(uint32 *) (out + 196) = in1
-# asm 1: movl   <in1=int64#4d,196(<out=int64#1)
-# asm 2: movl   <in1=%ecx,196(<out=%rdi)
-movl   %ecx,196(%rdi)
-
-# qhasm:   *(uint32 *) (out + 200) = in2
-# asm 1: movl   <in2=int64#5d,200(<out=int64#1)
-# asm 2: movl   <in2=%r8d,200(<out=%rdi)
-movl   %r8d,200(%rdi)
-
-# qhasm:   *(uint32 *) (out + 204) = in3
-# asm 1: movl   <in3=int64#6d,204(<out=int64#1)
-# asm 2: movl   <in3=%r9d,204(<out=%rdi)
-movl   %r9d,204(%rdi)
-
-# qhasm:   uint32323232 z4 += orig4
-# asm 1: paddd <orig4=stack128#16,<z4=int6464#15
-# asm 2: paddd <orig4=240(%rsp),<z4=%xmm14
-paddd 240(%rsp),%xmm14
-
-# qhasm:   uint32323232 z5 += orig5
-# asm 1: paddd <orig5=stack128#5,<z5=int6464#1
-# asm 2: paddd <orig5=64(%rsp),<z5=%xmm0
-paddd 64(%rsp),%xmm0
-
-# qhasm:   uint32323232 z6 += orig6
-# asm 1: paddd <orig6=stack128#9,<z6=int6464#6
-# asm 2: paddd <orig6=128(%rsp),<z6=%xmm5
-paddd 128(%rsp),%xmm5
-
-# qhasm:   uint32323232 z7 += orig7
-# asm 1: paddd <orig7=stack128#13,<z7=int6464#9
-# asm 2: paddd <orig7=192(%rsp),<z7=%xmm8
-paddd 192(%rsp),%xmm8
-
-# qhasm:   in4 = z4
-# asm 1: movd   <z4=int6464#15,>in4=int64#3
-# asm 2: movd   <z4=%xmm14,>in4=%rdx
-movd   %xmm14,%rdx
-
-# qhasm:   in5 = z5
-# asm 1: movd   <z5=int6464#1,>in5=int64#4
-# asm 2: movd   <z5=%xmm0,>in5=%rcx
-movd   %xmm0,%rcx
-
-# qhasm:   in6 = z6
-# asm 1: movd   <z6=int6464#6,>in6=int64#5
-# asm 2: movd   <z6=%xmm5,>in6=%r8
-movd   %xmm5,%r8
-
-# qhasm:   in7 = z7
-# asm 1: movd   <z7=int6464#9,>in7=int64#6
-# asm 2: movd   <z7=%xmm8,>in7=%r9
-movd   %xmm8,%r9
-
-# qhasm:   z4 <<<= 96
-# asm 1: pshufd $0x39,<z4=int6464#15,<z4=int6464#15
-# asm 2: pshufd $0x39,<z4=%xmm14,<z4=%xmm14
-pshufd $0x39,%xmm14,%xmm14
-
-# qhasm:   z5 <<<= 96
-# asm 1: pshufd $0x39,<z5=int6464#1,<z5=int6464#1
-# asm 2: pshufd $0x39,<z5=%xmm0,<z5=%xmm0
-pshufd $0x39,%xmm0,%xmm0
-
-# qhasm:   z6 <<<= 96
-# asm 1: pshufd $0x39,<z6=int6464#6,<z6=int6464#6
-# asm 2: pshufd $0x39,<z6=%xmm5,<z6=%xmm5
-pshufd $0x39,%xmm5,%xmm5
-
-# qhasm:   z7 <<<= 96
-# asm 1: pshufd $0x39,<z7=int6464#9,<z7=int6464#9
-# asm 2: pshufd $0x39,<z7=%xmm8,<z7=%xmm8
-pshufd $0x39,%xmm8,%xmm8
-
-# qhasm:   (uint32) in4 ^= *(uint32 *) (m + 16)
-# asm 1: xorl 16(<m=int64#2),<in4=int64#3d
-# asm 2: xorl 16(<m=%rsi),<in4=%edx
-xorl 16(%rsi),%edx
-
-# qhasm:   (uint32) in5 ^= *(uint32 *) (m + 20)
-# asm 1: xorl 20(<m=int64#2),<in5=int64#4d
-# asm 2: xorl 20(<m=%rsi),<in5=%ecx
-xorl 20(%rsi),%ecx
-
-# qhasm:   (uint32) in6 ^= *(uint32 *) (m + 24)
-# asm 1: xorl 24(<m=int64#2),<in6=int64#5d
-# asm 2: xorl 24(<m=%rsi),<in6=%r8d
-xorl 24(%rsi),%r8d
-
-# qhasm:   (uint32) in7 ^= *(uint32 *) (m + 28)
-# asm 1: xorl 28(<m=int64#2),<in7=int64#6d
-# asm 2: xorl 28(<m=%rsi),<in7=%r9d
-xorl 28(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 16) = in4
-# asm 1: movl   <in4=int64#3d,16(<out=int64#1)
-# asm 2: movl   <in4=%edx,16(<out=%rdi)
-movl   %edx,16(%rdi)
-
-# qhasm:   *(uint32 *) (out + 20) = in5
-# asm 1: movl   <in5=int64#4d,20(<out=int64#1)
-# asm 2: movl   <in5=%ecx,20(<out=%rdi)
-movl   %ecx,20(%rdi)
-
-# qhasm:   *(uint32 *) (out + 24) = in6
-# asm 1: movl   <in6=int64#5d,24(<out=int64#1)
-# asm 2: movl   <in6=%r8d,24(<out=%rdi)
-movl   %r8d,24(%rdi)
-
-# qhasm:   *(uint32 *) (out + 28) = in7
-# asm 1: movl   <in7=int64#6d,28(<out=int64#1)
-# asm 2: movl   <in7=%r9d,28(<out=%rdi)
-movl   %r9d,28(%rdi)
-
-# qhasm:   in4 = z4
-# asm 1: movd   <z4=int6464#15,>in4=int64#3
-# asm 2: movd   <z4=%xmm14,>in4=%rdx
-movd   %xmm14,%rdx
-
-# qhasm:   in5 = z5
-# asm 1: movd   <z5=int6464#1,>in5=int64#4
-# asm 2: movd   <z5=%xmm0,>in5=%rcx
-movd   %xmm0,%rcx
-
-# qhasm:   in6 = z6
-# asm 1: movd   <z6=int6464#6,>in6=int64#5
-# asm 2: movd   <z6=%xmm5,>in6=%r8
-movd   %xmm5,%r8
-
-# qhasm:   in7 = z7
-# asm 1: movd   <z7=int6464#9,>in7=int64#6
-# asm 2: movd   <z7=%xmm8,>in7=%r9
-movd   %xmm8,%r9
-
-# qhasm:   z4 <<<= 96
-# asm 1: pshufd $0x39,<z4=int6464#15,<z4=int6464#15
-# asm 2: pshufd $0x39,<z4=%xmm14,<z4=%xmm14
-pshufd $0x39,%xmm14,%xmm14
-
-# qhasm:   z5 <<<= 96
-# asm 1: pshufd $0x39,<z5=int6464#1,<z5=int6464#1
-# asm 2: pshufd $0x39,<z5=%xmm0,<z5=%xmm0
-pshufd $0x39,%xmm0,%xmm0
-
-# qhasm:   z6 <<<= 96
-# asm 1: pshufd $0x39,<z6=int6464#6,<z6=int6464#6
-# asm 2: pshufd $0x39,<z6=%xmm5,<z6=%xmm5
-pshufd $0x39,%xmm5,%xmm5
-
-# qhasm:   z7 <<<= 96
-# asm 1: pshufd $0x39,<z7=int6464#9,<z7=int6464#9
-# asm 2: pshufd $0x39,<z7=%xmm8,<z7=%xmm8
-pshufd $0x39,%xmm8,%xmm8
-
-# qhasm:   (uint32) in4 ^= *(uint32 *) (m + 80)
-# asm 1: xorl 80(<m=int64#2),<in4=int64#3d
-# asm 2: xorl 80(<m=%rsi),<in4=%edx
-xorl 80(%rsi),%edx
-
-# qhasm:   (uint32) in5 ^= *(uint32 *) (m + 84)
-# asm 1: xorl 84(<m=int64#2),<in5=int64#4d
-# asm 2: xorl 84(<m=%rsi),<in5=%ecx
-xorl 84(%rsi),%ecx
-
-# qhasm:   (uint32) in6 ^= *(uint32 *) (m + 88)
-# asm 1: xorl 88(<m=int64#2),<in6=int64#5d
-# asm 2: xorl 88(<m=%rsi),<in6=%r8d
-xorl 88(%rsi),%r8d
-
-# qhasm:   (uint32) in7 ^= *(uint32 *) (m + 92)
-# asm 1: xorl 92(<m=int64#2),<in7=int64#6d
-# asm 2: xorl 92(<m=%rsi),<in7=%r9d
-xorl 92(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 80) = in4
-# asm 1: movl   <in4=int64#3d,80(<out=int64#1)
-# asm 2: movl   <in4=%edx,80(<out=%rdi)
-movl   %edx,80(%rdi)
-
-# qhasm:   *(uint32 *) (out + 84) = in5
-# asm 1: movl   <in5=int64#4d,84(<out=int64#1)
-# asm 2: movl   <in5=%ecx,84(<out=%rdi)
-movl   %ecx,84(%rdi)
-
-# qhasm:   *(uint32 *) (out + 88) = in6
-# asm 1: movl   <in6=int64#5d,88(<out=int64#1)
-# asm 2: movl   <in6=%r8d,88(<out=%rdi)
-movl   %r8d,88(%rdi)
-
-# qhasm:   *(uint32 *) (out + 92) = in7
-# asm 1: movl   <in7=int64#6d,92(<out=int64#1)
-# asm 2: movl   <in7=%r9d,92(<out=%rdi)
-movl   %r9d,92(%rdi)
-
-# qhasm:   in4 = z4
-# asm 1: movd   <z4=int6464#15,>in4=int64#3
-# asm 2: movd   <z4=%xmm14,>in4=%rdx
-movd   %xmm14,%rdx
-
-# qhasm:   in5 = z5
-# asm 1: movd   <z5=int6464#1,>in5=int64#4
-# asm 2: movd   <z5=%xmm0,>in5=%rcx
-movd   %xmm0,%rcx
-
-# qhasm:   in6 = z6
-# asm 1: movd   <z6=int6464#6,>in6=int64#5
-# asm 2: movd   <z6=%xmm5,>in6=%r8
-movd   %xmm5,%r8
-
-# qhasm:   in7 = z7
-# asm 1: movd   <z7=int6464#9,>in7=int64#6
-# asm 2: movd   <z7=%xmm8,>in7=%r9
-movd   %xmm8,%r9
-
-# qhasm:   z4 <<<= 96
-# asm 1: pshufd $0x39,<z4=int6464#15,<z4=int6464#15
-# asm 2: pshufd $0x39,<z4=%xmm14,<z4=%xmm14
-pshufd $0x39,%xmm14,%xmm14
-
-# qhasm:   z5 <<<= 96
-# asm 1: pshufd $0x39,<z5=int6464#1,<z5=int6464#1
-# asm 2: pshufd $0x39,<z5=%xmm0,<z5=%xmm0
-pshufd $0x39,%xmm0,%xmm0
-
-# qhasm:   z6 <<<= 96
-# asm 1: pshufd $0x39,<z6=int6464#6,<z6=int6464#6
-# asm 2: pshufd $0x39,<z6=%xmm5,<z6=%xmm5
-pshufd $0x39,%xmm5,%xmm5
-
-# qhasm:   z7 <<<= 96
-# asm 1: pshufd $0x39,<z7=int6464#9,<z7=int6464#9
-# asm 2: pshufd $0x39,<z7=%xmm8,<z7=%xmm8
-pshufd $0x39,%xmm8,%xmm8
-
-# qhasm:   (uint32) in4 ^= *(uint32 *) (m + 144)
-# asm 1: xorl 144(<m=int64#2),<in4=int64#3d
-# asm 2: xorl 144(<m=%rsi),<in4=%edx
-xorl 144(%rsi),%edx
-
-# qhasm:   (uint32) in5 ^= *(uint32 *) (m + 148)
-# asm 1: xorl 148(<m=int64#2),<in5=int64#4d
-# asm 2: xorl 148(<m=%rsi),<in5=%ecx
-xorl 148(%rsi),%ecx
-
-# qhasm:   (uint32) in6 ^= *(uint32 *) (m + 152)
-# asm 1: xorl 152(<m=int64#2),<in6=int64#5d
-# asm 2: xorl 152(<m=%rsi),<in6=%r8d
-xorl 152(%rsi),%r8d
-
-# qhasm:   (uint32) in7 ^= *(uint32 *) (m + 156)
-# asm 1: xorl 156(<m=int64#2),<in7=int64#6d
-# asm 2: xorl 156(<m=%rsi),<in7=%r9d
-xorl 156(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 144) = in4
-# asm 1: movl   <in4=int64#3d,144(<out=int64#1)
-# asm 2: movl   <in4=%edx,144(<out=%rdi)
-movl   %edx,144(%rdi)
-
-# qhasm:   *(uint32 *) (out + 148) = in5
-# asm 1: movl   <in5=int64#4d,148(<out=int64#1)
-# asm 2: movl   <in5=%ecx,148(<out=%rdi)
-movl   %ecx,148(%rdi)
-
-# qhasm:   *(uint32 *) (out + 152) = in6
-# asm 1: movl   <in6=int64#5d,152(<out=int64#1)
-# asm 2: movl   <in6=%r8d,152(<out=%rdi)
-movl   %r8d,152(%rdi)
-
-# qhasm:   *(uint32 *) (out + 156) = in7
-# asm 1: movl   <in7=int64#6d,156(<out=int64#1)
-# asm 2: movl   <in7=%r9d,156(<out=%rdi)
-movl   %r9d,156(%rdi)
-
-# qhasm:   in4 = z4
-# asm 1: movd   <z4=int6464#15,>in4=int64#3
-# asm 2: movd   <z4=%xmm14,>in4=%rdx
-movd   %xmm14,%rdx
-
-# qhasm:   in5 = z5
-# asm 1: movd   <z5=int6464#1,>in5=int64#4
-# asm 2: movd   <z5=%xmm0,>in5=%rcx
-movd   %xmm0,%rcx
-
-# qhasm:   in6 = z6
-# asm 1: movd   <z6=int6464#6,>in6=int64#5
-# asm 2: movd   <z6=%xmm5,>in6=%r8
-movd   %xmm5,%r8
-
-# qhasm:   in7 = z7
-# asm 1: movd   <z7=int6464#9,>in7=int64#6
-# asm 2: movd   <z7=%xmm8,>in7=%r9
-movd   %xmm8,%r9
-
-# qhasm:   (uint32) in4 ^= *(uint32 *) (m + 208)
-# asm 1: xorl 208(<m=int64#2),<in4=int64#3d
-# asm 2: xorl 208(<m=%rsi),<in4=%edx
-xorl 208(%rsi),%edx
-
-# qhasm:   (uint32) in5 ^= *(uint32 *) (m + 212)
-# asm 1: xorl 212(<m=int64#2),<in5=int64#4d
-# asm 2: xorl 212(<m=%rsi),<in5=%ecx
-xorl 212(%rsi),%ecx
-
-# qhasm:   (uint32) in6 ^= *(uint32 *) (m + 216)
-# asm 1: xorl 216(<m=int64#2),<in6=int64#5d
-# asm 2: xorl 216(<m=%rsi),<in6=%r8d
-xorl 216(%rsi),%r8d
-
-# qhasm:   (uint32) in7 ^= *(uint32 *) (m + 220)
-# asm 1: xorl 220(<m=int64#2),<in7=int64#6d
-# asm 2: xorl 220(<m=%rsi),<in7=%r9d
-xorl 220(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 208) = in4
-# asm 1: movl   <in4=int64#3d,208(<out=int64#1)
-# asm 2: movl   <in4=%edx,208(<out=%rdi)
-movl   %edx,208(%rdi)
-
-# qhasm:   *(uint32 *) (out + 212) = in5
-# asm 1: movl   <in5=int64#4d,212(<out=int64#1)
-# asm 2: movl   <in5=%ecx,212(<out=%rdi)
-movl   %ecx,212(%rdi)
-
-# qhasm:   *(uint32 *) (out + 216) = in6
-# asm 1: movl   <in6=int64#5d,216(<out=int64#1)
-# asm 2: movl   <in6=%r8d,216(<out=%rdi)
-movl   %r8d,216(%rdi)
-
-# qhasm:   *(uint32 *) (out + 220) = in7
-# asm 1: movl   <in7=int64#6d,220(<out=int64#1)
-# asm 2: movl   <in7=%r9d,220(<out=%rdi)
-movl   %r9d,220(%rdi)
-
-# qhasm:   uint32323232 z8 += orig8
-# asm 1: paddd <orig8=stack128#19,<z8=int6464#16
-# asm 2: paddd <orig8=288(%rsp),<z8=%xmm15
-paddd 288(%rsp),%xmm15
-
-# qhasm:   uint32323232 z9 += orig9
-# asm 1: paddd <orig9=stack128#20,<z9=int6464#12
-# asm 2: paddd <orig9=304(%rsp),<z9=%xmm11
-paddd 304(%rsp),%xmm11
-
-# qhasm:   uint32323232 z10 += orig10
-# asm 1: paddd <orig10=stack128#6,<z10=int6464#2
-# asm 2: paddd <orig10=80(%rsp),<z10=%xmm1
-paddd 80(%rsp),%xmm1
-
-# qhasm:   uint32323232 z11 += orig11
-# asm 1: paddd <orig11=stack128#10,<z11=int6464#7
-# asm 2: paddd <orig11=144(%rsp),<z11=%xmm6
-paddd 144(%rsp),%xmm6
-
-# qhasm:   in8 = z8
-# asm 1: movd   <z8=int6464#16,>in8=int64#3
-# asm 2: movd   <z8=%xmm15,>in8=%rdx
-movd   %xmm15,%rdx
-
-# qhasm:   in9 = z9
-# asm 1: movd   <z9=int6464#12,>in9=int64#4
-# asm 2: movd   <z9=%xmm11,>in9=%rcx
-movd   %xmm11,%rcx
-
-# qhasm:   in10 = z10
-# asm 1: movd   <z10=int6464#2,>in10=int64#5
-# asm 2: movd   <z10=%xmm1,>in10=%r8
-movd   %xmm1,%r8
-
-# qhasm:   in11 = z11
-# asm 1: movd   <z11=int6464#7,>in11=int64#6
-# asm 2: movd   <z11=%xmm6,>in11=%r9
-movd   %xmm6,%r9
-
-# qhasm:   z8 <<<= 96
-# asm 1: pshufd $0x39,<z8=int6464#16,<z8=int6464#16
-# asm 2: pshufd $0x39,<z8=%xmm15,<z8=%xmm15
-pshufd $0x39,%xmm15,%xmm15
-
-# qhasm:   z9 <<<= 96
-# asm 1: pshufd $0x39,<z9=int6464#12,<z9=int6464#12
-# asm 2: pshufd $0x39,<z9=%xmm11,<z9=%xmm11
-pshufd $0x39,%xmm11,%xmm11
-
-# qhasm:   z10 <<<= 96
-# asm 1: pshufd $0x39,<z10=int6464#2,<z10=int6464#2
-# asm 2: pshufd $0x39,<z10=%xmm1,<z10=%xmm1
-pshufd $0x39,%xmm1,%xmm1
-
-# qhasm:   z11 <<<= 96
-# asm 1: pshufd $0x39,<z11=int6464#7,<z11=int6464#7
-# asm 2: pshufd $0x39,<z11=%xmm6,<z11=%xmm6
-pshufd $0x39,%xmm6,%xmm6
-
-# qhasm:   (uint32) in8 ^= *(uint32 *) (m + 32)
-# asm 1: xorl 32(<m=int64#2),<in8=int64#3d
-# asm 2: xorl 32(<m=%rsi),<in8=%edx
-xorl 32(%rsi),%edx
-
-# qhasm:   (uint32) in9 ^= *(uint32 *) (m + 36)
-# asm 1: xorl 36(<m=int64#2),<in9=int64#4d
-# asm 2: xorl 36(<m=%rsi),<in9=%ecx
-xorl 36(%rsi),%ecx
-
-# qhasm:   (uint32) in10 ^= *(uint32 *) (m + 40)
-# asm 1: xorl 40(<m=int64#2),<in10=int64#5d
-# asm 2: xorl 40(<m=%rsi),<in10=%r8d
-xorl 40(%rsi),%r8d
-
-# qhasm:   (uint32) in11 ^= *(uint32 *) (m + 44)
-# asm 1: xorl 44(<m=int64#2),<in11=int64#6d
-# asm 2: xorl 44(<m=%rsi),<in11=%r9d
-xorl 44(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 32) = in8
-# asm 1: movl   <in8=int64#3d,32(<out=int64#1)
-# asm 2: movl   <in8=%edx,32(<out=%rdi)
-movl   %edx,32(%rdi)
-
-# qhasm:   *(uint32 *) (out + 36) = in9
-# asm 1: movl   <in9=int64#4d,36(<out=int64#1)
-# asm 2: movl   <in9=%ecx,36(<out=%rdi)
-movl   %ecx,36(%rdi)
-
-# qhasm:   *(uint32 *) (out + 40) = in10
-# asm 1: movl   <in10=int64#5d,40(<out=int64#1)
-# asm 2: movl   <in10=%r8d,40(<out=%rdi)
-movl   %r8d,40(%rdi)
-
-# qhasm:   *(uint32 *) (out + 44) = in11
-# asm 1: movl   <in11=int64#6d,44(<out=int64#1)
-# asm 2: movl   <in11=%r9d,44(<out=%rdi)
-movl   %r9d,44(%rdi)
-
-# qhasm:   in8 = z8
-# asm 1: movd   <z8=int6464#16,>in8=int64#3
-# asm 2: movd   <z8=%xmm15,>in8=%rdx
-movd   %xmm15,%rdx
-
-# qhasm:   in9 = z9
-# asm 1: movd   <z9=int6464#12,>in9=int64#4
-# asm 2: movd   <z9=%xmm11,>in9=%rcx
-movd   %xmm11,%rcx
-
-# qhasm:   in10 = z10
-# asm 1: movd   <z10=int6464#2,>in10=int64#5
-# asm 2: movd   <z10=%xmm1,>in10=%r8
-movd   %xmm1,%r8
-
-# qhasm:   in11 = z11
-# asm 1: movd   <z11=int6464#7,>in11=int64#6
-# asm 2: movd   <z11=%xmm6,>in11=%r9
-movd   %xmm6,%r9
-
-# qhasm:   z8 <<<= 96
-# asm 1: pshufd $0x39,<z8=int6464#16,<z8=int6464#16
-# asm 2: pshufd $0x39,<z8=%xmm15,<z8=%xmm15
-pshufd $0x39,%xmm15,%xmm15
-
-# qhasm:   z9 <<<= 96
-# asm 1: pshufd $0x39,<z9=int6464#12,<z9=int6464#12
-# asm 2: pshufd $0x39,<z9=%xmm11,<z9=%xmm11
-pshufd $0x39,%xmm11,%xmm11
-
-# qhasm:   z10 <<<= 96
-# asm 1: pshufd $0x39,<z10=int6464#2,<z10=int6464#2
-# asm 2: pshufd $0x39,<z10=%xmm1,<z10=%xmm1
-pshufd $0x39,%xmm1,%xmm1
-
-# qhasm:   z11 <<<= 96
-# asm 1: pshufd $0x39,<z11=int6464#7,<z11=int6464#7
-# asm 2: pshufd $0x39,<z11=%xmm6,<z11=%xmm6
-pshufd $0x39,%xmm6,%xmm6
-
-# qhasm:   (uint32) in8 ^= *(uint32 *) (m + 96)
-# asm 1: xorl 96(<m=int64#2),<in8=int64#3d
-# asm 2: xorl 96(<m=%rsi),<in8=%edx
-xorl 96(%rsi),%edx
-
-# qhasm:   (uint32) in9 ^= *(uint32 *) (m + 100)
-# asm 1: xorl 100(<m=int64#2),<in9=int64#4d
-# asm 2: xorl 100(<m=%rsi),<in9=%ecx
-xorl 100(%rsi),%ecx
-
-# qhasm:   (uint32) in10 ^= *(uint32 *) (m + 104)
-# asm 1: xorl 104(<m=int64#2),<in10=int64#5d
-# asm 2: xorl 104(<m=%rsi),<in10=%r8d
-xorl 104(%rsi),%r8d
-
-# qhasm:   (uint32) in11 ^= *(uint32 *) (m + 108)
-# asm 1: xorl 108(<m=int64#2),<in11=int64#6d
-# asm 2: xorl 108(<m=%rsi),<in11=%r9d
-xorl 108(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 96) = in8
-# asm 1: movl   <in8=int64#3d,96(<out=int64#1)
-# asm 2: movl   <in8=%edx,96(<out=%rdi)
-movl   %edx,96(%rdi)
-
-# qhasm:   *(uint32 *) (out + 100) = in9
-# asm 1: movl   <in9=int64#4d,100(<out=int64#1)
-# asm 2: movl   <in9=%ecx,100(<out=%rdi)
-movl   %ecx,100(%rdi)
-
-# qhasm:   *(uint32 *) (out + 104) = in10
-# asm 1: movl   <in10=int64#5d,104(<out=int64#1)
-# asm 2: movl   <in10=%r8d,104(<out=%rdi)
-movl   %r8d,104(%rdi)
-
-# qhasm:   *(uint32 *) (out + 108) = in11
-# asm 1: movl   <in11=int64#6d,108(<out=int64#1)
-# asm 2: movl   <in11=%r9d,108(<out=%rdi)
-movl   %r9d,108(%rdi)
-
-# qhasm:   in8 = z8
-# asm 1: movd   <z8=int6464#16,>in8=int64#3
-# asm 2: movd   <z8=%xmm15,>in8=%rdx
-movd   %xmm15,%rdx
-
-# qhasm:   in9 = z9
-# asm 1: movd   <z9=int6464#12,>in9=int64#4
-# asm 2: movd   <z9=%xmm11,>in9=%rcx
-movd   %xmm11,%rcx
-
-# qhasm:   in10 = z10
-# asm 1: movd   <z10=int6464#2,>in10=int64#5
-# asm 2: movd   <z10=%xmm1,>in10=%r8
-movd   %xmm1,%r8
-
-# qhasm:   in11 = z11
-# asm 1: movd   <z11=int6464#7,>in11=int64#6
-# asm 2: movd   <z11=%xmm6,>in11=%r9
-movd   %xmm6,%r9
-
-# qhasm:   z8 <<<= 96
-# asm 1: pshufd $0x39,<z8=int6464#16,<z8=int6464#16
-# asm 2: pshufd $0x39,<z8=%xmm15,<z8=%xmm15
-pshufd $0x39,%xmm15,%xmm15
-
-# qhasm:   z9 <<<= 96
-# asm 1: pshufd $0x39,<z9=int6464#12,<z9=int6464#12
-# asm 2: pshufd $0x39,<z9=%xmm11,<z9=%xmm11
-pshufd $0x39,%xmm11,%xmm11
-
-# qhasm:   z10 <<<= 96
-# asm 1: pshufd $0x39,<z10=int6464#2,<z10=int6464#2
-# asm 2: pshufd $0x39,<z10=%xmm1,<z10=%xmm1
-pshufd $0x39,%xmm1,%xmm1
-
-# qhasm:   z11 <<<= 96
-# asm 1: pshufd $0x39,<z11=int6464#7,<z11=int6464#7
-# asm 2: pshufd $0x39,<z11=%xmm6,<z11=%xmm6
-pshufd $0x39,%xmm6,%xmm6
-
-# qhasm:   (uint32) in8 ^= *(uint32 *) (m + 160)
-# asm 1: xorl 160(<m=int64#2),<in8=int64#3d
-# asm 2: xorl 160(<m=%rsi),<in8=%edx
-xorl 160(%rsi),%edx
-
-# qhasm:   (uint32) in9 ^= *(uint32 *) (m + 164)
-# asm 1: xorl 164(<m=int64#2),<in9=int64#4d
-# asm 2: xorl 164(<m=%rsi),<in9=%ecx
-xorl 164(%rsi),%ecx
-
-# qhasm:   (uint32) in10 ^= *(uint32 *) (m + 168)
-# asm 1: xorl 168(<m=int64#2),<in10=int64#5d
-# asm 2: xorl 168(<m=%rsi),<in10=%r8d
-xorl 168(%rsi),%r8d
-
-# qhasm:   (uint32) in11 ^= *(uint32 *) (m + 172)
-# asm 1: xorl 172(<m=int64#2),<in11=int64#6d
-# asm 2: xorl 172(<m=%rsi),<in11=%r9d
-xorl 172(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 160) = in8
-# asm 1: movl   <in8=int64#3d,160(<out=int64#1)
-# asm 2: movl   <in8=%edx,160(<out=%rdi)
-movl   %edx,160(%rdi)
-
-# qhasm:   *(uint32 *) (out + 164) = in9
-# asm 1: movl   <in9=int64#4d,164(<out=int64#1)
-# asm 2: movl   <in9=%ecx,164(<out=%rdi)
-movl   %ecx,164(%rdi)
-
-# qhasm:   *(uint32 *) (out + 168) = in10
-# asm 1: movl   <in10=int64#5d,168(<out=int64#1)
-# asm 2: movl   <in10=%r8d,168(<out=%rdi)
-movl   %r8d,168(%rdi)
-
-# qhasm:   *(uint32 *) (out + 172) = in11
-# asm 1: movl   <in11=int64#6d,172(<out=int64#1)
-# asm 2: movl   <in11=%r9d,172(<out=%rdi)
-movl   %r9d,172(%rdi)
-
-# qhasm:   in8 = z8
-# asm 1: movd   <z8=int6464#16,>in8=int64#3
-# asm 2: movd   <z8=%xmm15,>in8=%rdx
-movd   %xmm15,%rdx
-
-# qhasm:   in9 = z9
-# asm 1: movd   <z9=int6464#12,>in9=int64#4
-# asm 2: movd   <z9=%xmm11,>in9=%rcx
-movd   %xmm11,%rcx
-
-# qhasm:   in10 = z10
-# asm 1: movd   <z10=int6464#2,>in10=int64#5
-# asm 2: movd   <z10=%xmm1,>in10=%r8
-movd   %xmm1,%r8
-
-# qhasm:   in11 = z11
-# asm 1: movd   <z11=int6464#7,>in11=int64#6
-# asm 2: movd   <z11=%xmm6,>in11=%r9
-movd   %xmm6,%r9
-
-# qhasm:   (uint32) in8 ^= *(uint32 *) (m + 224)
-# asm 1: xorl 224(<m=int64#2),<in8=int64#3d
-# asm 2: xorl 224(<m=%rsi),<in8=%edx
-xorl 224(%rsi),%edx
-
-# qhasm:   (uint32) in9 ^= *(uint32 *) (m + 228)
-# asm 1: xorl 228(<m=int64#2),<in9=int64#4d
-# asm 2: xorl 228(<m=%rsi),<in9=%ecx
-xorl 228(%rsi),%ecx
-
-# qhasm:   (uint32) in10 ^= *(uint32 *) (m + 232)
-# asm 1: xorl 232(<m=int64#2),<in10=int64#5d
-# asm 2: xorl 232(<m=%rsi),<in10=%r8d
-xorl 232(%rsi),%r8d
-
-# qhasm:   (uint32) in11 ^= *(uint32 *) (m + 236)
-# asm 1: xorl 236(<m=int64#2),<in11=int64#6d
-# asm 2: xorl 236(<m=%rsi),<in11=%r9d
-xorl 236(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 224) = in8
-# asm 1: movl   <in8=int64#3d,224(<out=int64#1)
-# asm 2: movl   <in8=%edx,224(<out=%rdi)
-movl   %edx,224(%rdi)
-
-# qhasm:   *(uint32 *) (out + 228) = in9
-# asm 1: movl   <in9=int64#4d,228(<out=int64#1)
-# asm 2: movl   <in9=%ecx,228(<out=%rdi)
-movl   %ecx,228(%rdi)
-
-# qhasm:   *(uint32 *) (out + 232) = in10
-# asm 1: movl   <in10=int64#5d,232(<out=int64#1)
-# asm 2: movl   <in10=%r8d,232(<out=%rdi)
-movl   %r8d,232(%rdi)
-
-# qhasm:   *(uint32 *) (out + 236) = in11
-# asm 1: movl   <in11=int64#6d,236(<out=int64#1)
-# asm 2: movl   <in11=%r9d,236(<out=%rdi)
-movl   %r9d,236(%rdi)
-
-# qhasm:   uint32323232 z12 += orig12
-# asm 1: paddd <orig12=stack128#11,<z12=int6464#14
-# asm 2: paddd <orig12=160(%rsp),<z12=%xmm13
-paddd 160(%rsp),%xmm13
-
-# qhasm:   uint32323232 z13 += orig13
-# asm 1: paddd <orig13=stack128#14,<z13=int6464#10
-# asm 2: paddd <orig13=208(%rsp),<z13=%xmm9
-paddd 208(%rsp),%xmm9
-
-# qhasm:   uint32323232 z14 += orig14
-# asm 1: paddd <orig14=stack128#17,<z14=int6464#4
-# asm 2: paddd <orig14=256(%rsp),<z14=%xmm3
-paddd 256(%rsp),%xmm3
-
-# qhasm:   uint32323232 z15 += orig15
-# asm 1: paddd <orig15=stack128#7,<z15=int6464#3
-# asm 2: paddd <orig15=96(%rsp),<z15=%xmm2
-paddd 96(%rsp),%xmm2
-
-# qhasm:   in12 = z12
-# asm 1: movd   <z12=int6464#14,>in12=int64#3
-# asm 2: movd   <z12=%xmm13,>in12=%rdx
-movd   %xmm13,%rdx
-
-# qhasm:   in13 = z13
-# asm 1: movd   <z13=int6464#10,>in13=int64#4
-# asm 2: movd   <z13=%xmm9,>in13=%rcx
-movd   %xmm9,%rcx
-
-# qhasm:   in14 = z14
-# asm 1: movd   <z14=int6464#4,>in14=int64#5
-# asm 2: movd   <z14=%xmm3,>in14=%r8
-movd   %xmm3,%r8
-
-# qhasm:   in15 = z15
-# asm 1: movd   <z15=int6464#3,>in15=int64#6
-# asm 2: movd   <z15=%xmm2,>in15=%r9
-movd   %xmm2,%r9
-
-# qhasm:   z12 <<<= 96
-# asm 1: pshufd $0x39,<z12=int6464#14,<z12=int6464#14
-# asm 2: pshufd $0x39,<z12=%xmm13,<z12=%xmm13
-pshufd $0x39,%xmm13,%xmm13
-
-# qhasm:   z13 <<<= 96
-# asm 1: pshufd $0x39,<z13=int6464#10,<z13=int6464#10
-# asm 2: pshufd $0x39,<z13=%xmm9,<z13=%xmm9
-pshufd $0x39,%xmm9,%xmm9
-
-# qhasm:   z14 <<<= 96
-# asm 1: pshufd $0x39,<z14=int6464#4,<z14=int6464#4
-# asm 2: pshufd $0x39,<z14=%xmm3,<z14=%xmm3
-pshufd $0x39,%xmm3,%xmm3
-
-# qhasm:   z15 <<<= 96
-# asm 1: pshufd $0x39,<z15=int6464#3,<z15=int6464#3
-# asm 2: pshufd $0x39,<z15=%xmm2,<z15=%xmm2
-pshufd $0x39,%xmm2,%xmm2
-
-# qhasm:   (uint32) in12 ^= *(uint32 *) (m + 48)
-# asm 1: xorl 48(<m=int64#2),<in12=int64#3d
-# asm 2: xorl 48(<m=%rsi),<in12=%edx
-xorl 48(%rsi),%edx
-
-# qhasm:   (uint32) in13 ^= *(uint32 *) (m + 52)
-# asm 1: xorl 52(<m=int64#2),<in13=int64#4d
-# asm 2: xorl 52(<m=%rsi),<in13=%ecx
-xorl 52(%rsi),%ecx
-
-# qhasm:   (uint32) in14 ^= *(uint32 *) (m + 56)
-# asm 1: xorl 56(<m=int64#2),<in14=int64#5d
-# asm 2: xorl 56(<m=%rsi),<in14=%r8d
-xorl 56(%rsi),%r8d
-
-# qhasm:   (uint32) in15 ^= *(uint32 *) (m + 60)
-# asm 1: xorl 60(<m=int64#2),<in15=int64#6d
-# asm 2: xorl 60(<m=%rsi),<in15=%r9d
-xorl 60(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 48) = in12
-# asm 1: movl   <in12=int64#3d,48(<out=int64#1)
-# asm 2: movl   <in12=%edx,48(<out=%rdi)
-movl   %edx,48(%rdi)
-
-# qhasm:   *(uint32 *) (out + 52) = in13
-# asm 1: movl   <in13=int64#4d,52(<out=int64#1)
-# asm 2: movl   <in13=%ecx,52(<out=%rdi)
-movl   %ecx,52(%rdi)
-
-# qhasm:   *(uint32 *) (out + 56) = in14
-# asm 1: movl   <in14=int64#5d,56(<out=int64#1)
-# asm 2: movl   <in14=%r8d,56(<out=%rdi)
-movl   %r8d,56(%rdi)
-
-# qhasm:   *(uint32 *) (out + 60) = in15
-# asm 1: movl   <in15=int64#6d,60(<out=int64#1)
-# asm 2: movl   <in15=%r9d,60(<out=%rdi)
-movl   %r9d,60(%rdi)
-
-# qhasm:   in12 = z12
-# asm 1: movd   <z12=int6464#14,>in12=int64#3
-# asm 2: movd   <z12=%xmm13,>in12=%rdx
-movd   %xmm13,%rdx
-
-# qhasm:   in13 = z13
-# asm 1: movd   <z13=int6464#10,>in13=int64#4
-# asm 2: movd   <z13=%xmm9,>in13=%rcx
-movd   %xmm9,%rcx
-
-# qhasm:   in14 = z14
-# asm 1: movd   <z14=int6464#4,>in14=int64#5
-# asm 2: movd   <z14=%xmm3,>in14=%r8
-movd   %xmm3,%r8
-
-# qhasm:   in15 = z15
-# asm 1: movd   <z15=int6464#3,>in15=int64#6
-# asm 2: movd   <z15=%xmm2,>in15=%r9
-movd   %xmm2,%r9
-
-# qhasm:   z12 <<<= 96
-# asm 1: pshufd $0x39,<z12=int6464#14,<z12=int6464#14
-# asm 2: pshufd $0x39,<z12=%xmm13,<z12=%xmm13
-pshufd $0x39,%xmm13,%xmm13
-
-# qhasm:   z13 <<<= 96
-# asm 1: pshufd $0x39,<z13=int6464#10,<z13=int6464#10
-# asm 2: pshufd $0x39,<z13=%xmm9,<z13=%xmm9
-pshufd $0x39,%xmm9,%xmm9
-
-# qhasm:   z14 <<<= 96
-# asm 1: pshufd $0x39,<z14=int6464#4,<z14=int6464#4
-# asm 2: pshufd $0x39,<z14=%xmm3,<z14=%xmm3
-pshufd $0x39,%xmm3,%xmm3
-
-# qhasm:   z15 <<<= 96
-# asm 1: pshufd $0x39,<z15=int6464#3,<z15=int6464#3
-# asm 2: pshufd $0x39,<z15=%xmm2,<z15=%xmm2
-pshufd $0x39,%xmm2,%xmm2
-
-# qhasm:   (uint32) in12 ^= *(uint32 *) (m + 112)
-# asm 1: xorl 112(<m=int64#2),<in12=int64#3d
-# asm 2: xorl 112(<m=%rsi),<in12=%edx
-xorl 112(%rsi),%edx
-
-# qhasm:   (uint32) in13 ^= *(uint32 *) (m + 116)
-# asm 1: xorl 116(<m=int64#2),<in13=int64#4d
-# asm 2: xorl 116(<m=%rsi),<in13=%ecx
-xorl 116(%rsi),%ecx
-
-# qhasm:   (uint32) in14 ^= *(uint32 *) (m + 120)
-# asm 1: xorl 120(<m=int64#2),<in14=int64#5d
-# asm 2: xorl 120(<m=%rsi),<in14=%r8d
-xorl 120(%rsi),%r8d
-
-# qhasm:   (uint32) in15 ^= *(uint32 *) (m + 124)
-# asm 1: xorl 124(<m=int64#2),<in15=int64#6d
-# asm 2: xorl 124(<m=%rsi),<in15=%r9d
-xorl 124(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 112) = in12
-# asm 1: movl   <in12=int64#3d,112(<out=int64#1)
-# asm 2: movl   <in12=%edx,112(<out=%rdi)
-movl   %edx,112(%rdi)
-
-# qhasm:   *(uint32 *) (out + 116) = in13
-# asm 1: movl   <in13=int64#4d,116(<out=int64#1)
-# asm 2: movl   <in13=%ecx,116(<out=%rdi)
-movl   %ecx,116(%rdi)
-
-# qhasm:   *(uint32 *) (out + 120) = in14
-# asm 1: movl   <in14=int64#5d,120(<out=int64#1)
-# asm 2: movl   <in14=%r8d,120(<out=%rdi)
-movl   %r8d,120(%rdi)
-
-# qhasm:   *(uint32 *) (out + 124) = in15
-# asm 1: movl   <in15=int64#6d,124(<out=int64#1)
-# asm 2: movl   <in15=%r9d,124(<out=%rdi)
-movl   %r9d,124(%rdi)
-
-# qhasm:   in12 = z12
-# asm 1: movd   <z12=int6464#14,>in12=int64#3
-# asm 2: movd   <z12=%xmm13,>in12=%rdx
-movd   %xmm13,%rdx
-
-# qhasm:   in13 = z13
-# asm 1: movd   <z13=int6464#10,>in13=int64#4
-# asm 2: movd   <z13=%xmm9,>in13=%rcx
-movd   %xmm9,%rcx
-
-# qhasm:   in14 = z14
-# asm 1: movd   <z14=int6464#4,>in14=int64#5
-# asm 2: movd   <z14=%xmm3,>in14=%r8
-movd   %xmm3,%r8
-
-# qhasm:   in15 = z15
-# asm 1: movd   <z15=int6464#3,>in15=int64#6
-# asm 2: movd   <z15=%xmm2,>in15=%r9
-movd   %xmm2,%r9
-
-# qhasm:   z12 <<<= 96
-# asm 1: pshufd $0x39,<z12=int6464#14,<z12=int6464#14
-# asm 2: pshufd $0x39,<z12=%xmm13,<z12=%xmm13
-pshufd $0x39,%xmm13,%xmm13
-
-# qhasm:   z13 <<<= 96
-# asm 1: pshufd $0x39,<z13=int6464#10,<z13=int6464#10
-# asm 2: pshufd $0x39,<z13=%xmm9,<z13=%xmm9
-pshufd $0x39,%xmm9,%xmm9
-
-# qhasm:   z14 <<<= 96
-# asm 1: pshufd $0x39,<z14=int6464#4,<z14=int6464#4
-# asm 2: pshufd $0x39,<z14=%xmm3,<z14=%xmm3
-pshufd $0x39,%xmm3,%xmm3
-
-# qhasm:   z15 <<<= 96
-# asm 1: pshufd $0x39,<z15=int6464#3,<z15=int6464#3
-# asm 2: pshufd $0x39,<z15=%xmm2,<z15=%xmm2
-pshufd $0x39,%xmm2,%xmm2
-
-# qhasm:   (uint32) in12 ^= *(uint32 *) (m + 176)
-# asm 1: xorl 176(<m=int64#2),<in12=int64#3d
-# asm 2: xorl 176(<m=%rsi),<in12=%edx
-xorl 176(%rsi),%edx
-
-# qhasm:   (uint32) in13 ^= *(uint32 *) (m + 180)
-# asm 1: xorl 180(<m=int64#2),<in13=int64#4d
-# asm 2: xorl 180(<m=%rsi),<in13=%ecx
-xorl 180(%rsi),%ecx
-
-# qhasm:   (uint32) in14 ^= *(uint32 *) (m + 184)
-# asm 1: xorl 184(<m=int64#2),<in14=int64#5d
-# asm 2: xorl 184(<m=%rsi),<in14=%r8d
-xorl 184(%rsi),%r8d
-
-# qhasm:   (uint32) in15 ^= *(uint32 *) (m + 188)
-# asm 1: xorl 188(<m=int64#2),<in15=int64#6d
-# asm 2: xorl 188(<m=%rsi),<in15=%r9d
-xorl 188(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 176) = in12
-# asm 1: movl   <in12=int64#3d,176(<out=int64#1)
-# asm 2: movl   <in12=%edx,176(<out=%rdi)
-movl   %edx,176(%rdi)
-
-# qhasm:   *(uint32 *) (out + 180) = in13
-# asm 1: movl   <in13=int64#4d,180(<out=int64#1)
-# asm 2: movl   <in13=%ecx,180(<out=%rdi)
-movl   %ecx,180(%rdi)
-
-# qhasm:   *(uint32 *) (out + 184) = in14
-# asm 1: movl   <in14=int64#5d,184(<out=int64#1)
-# asm 2: movl   <in14=%r8d,184(<out=%rdi)
-movl   %r8d,184(%rdi)
-
-# qhasm:   *(uint32 *) (out + 188) = in15
-# asm 1: movl   <in15=int64#6d,188(<out=int64#1)
-# asm 2: movl   <in15=%r9d,188(<out=%rdi)
-movl   %r9d,188(%rdi)
-
-# qhasm:   in12 = z12
-# asm 1: movd   <z12=int6464#14,>in12=int64#3
-# asm 2: movd   <z12=%xmm13,>in12=%rdx
-movd   %xmm13,%rdx
-
-# qhasm:   in13 = z13
-# asm 1: movd   <z13=int6464#10,>in13=int64#4
-# asm 2: movd   <z13=%xmm9,>in13=%rcx
-movd   %xmm9,%rcx
-
-# qhasm:   in14 = z14
-# asm 1: movd   <z14=int6464#4,>in14=int64#5
-# asm 2: movd   <z14=%xmm3,>in14=%r8
-movd   %xmm3,%r8
-
-# qhasm:   in15 = z15
-# asm 1: movd   <z15=int6464#3,>in15=int64#6
-# asm 2: movd   <z15=%xmm2,>in15=%r9
-movd   %xmm2,%r9
-
-# qhasm:   (uint32) in12 ^= *(uint32 *) (m + 240)
-# asm 1: xorl 240(<m=int64#2),<in12=int64#3d
-# asm 2: xorl 240(<m=%rsi),<in12=%edx
-xorl 240(%rsi),%edx
-
-# qhasm:   (uint32) in13 ^= *(uint32 *) (m + 244)
-# asm 1: xorl 244(<m=int64#2),<in13=int64#4d
-# asm 2: xorl 244(<m=%rsi),<in13=%ecx
-xorl 244(%rsi),%ecx
-
-# qhasm:   (uint32) in14 ^= *(uint32 *) (m + 248)
-# asm 1: xorl 248(<m=int64#2),<in14=int64#5d
-# asm 2: xorl 248(<m=%rsi),<in14=%r8d
-xorl 248(%rsi),%r8d
-
-# qhasm:   (uint32) in15 ^= *(uint32 *) (m + 252)
-# asm 1: xorl 252(<m=int64#2),<in15=int64#6d
-# asm 2: xorl 252(<m=%rsi),<in15=%r9d
-xorl 252(%rsi),%r9d
-
-# qhasm:   *(uint32 *) (out + 240) = in12
-# asm 1: movl   <in12=int64#3d,240(<out=int64#1)
-# asm 2: movl   <in12=%edx,240(<out=%rdi)
-movl   %edx,240(%rdi)
-
-# qhasm:   *(uint32 *) (out + 244) = in13
-# asm 1: movl   <in13=int64#4d,244(<out=int64#1)
-# asm 2: movl   <in13=%ecx,244(<out=%rdi)
-movl   %ecx,244(%rdi)
-
-# qhasm:   *(uint32 *) (out + 248) = in14
-# asm 1: movl   <in14=int64#5d,248(<out=int64#1)
-# asm 2: movl   <in14=%r8d,248(<out=%rdi)
-movl   %r8d,248(%rdi)
-
-# qhasm:   *(uint32 *) (out + 252) = in15
-# asm 1: movl   <in15=int64#6d,252(<out=int64#1)
-# asm 2: movl   <in15=%r9d,252(<out=%rdi)
-movl   %r9d,252(%rdi)
-
-# qhasm:   bytes = bytes_backup
-# asm 1: movq <bytes_backup=stack64#8,>bytes=int64#6
-# asm 2: movq <bytes_backup=408(%rsp),>bytes=%r9
-movq 408(%rsp),%r9
-
-# qhasm:   bytes -= 256
-# asm 1: sub  $256,<bytes=int64#6
-# asm 2: sub  $256,<bytes=%r9
-sub  $256,%r9
-
-# qhasm:   m += 256
-# asm 1: add  $256,<m=int64#2
-# asm 2: add  $256,<m=%rsi
-add  $256,%rsi
-
-# qhasm:   out += 256
-# asm 1: add  $256,<out=int64#1
-# asm 2: add  $256,<out=%rdi
-add  $256,%rdi
-
-# qhasm:                            unsigned<? bytes - 256
-# asm 1: cmp  $256,<bytes=int64#6
-# asm 2: cmp  $256,<bytes=%r9
-cmp  $256,%r9
-# comment:fp stack unchanged by jump
-
-# qhasm:   goto bytesatleast256 if !unsigned<
-jae ._bytesatleast256
-
-# qhasm:                 unsigned>? bytes - 0
-# asm 1: cmp  $0,<bytes=int64#6
-# asm 2: cmp  $0,<bytes=%r9
-cmp  $0,%r9
-# comment:fp stack unchanged by jump
-
-# qhasm:   goto done if !unsigned>
-jbe ._done
-# comment:fp stack unchanged by fallthrough
-
-# qhasm: bytesbetween1and255:
-._bytesbetween1and255:
-
-# qhasm:                   unsigned<? bytes - 64
-# asm 1: cmp  $64,<bytes=int64#6
-# asm 2: cmp  $64,<bytes=%r9
-cmp  $64,%r9
-# comment:fp stack unchanged by jump
-
-# qhasm:   goto nocopy if !unsigned<
-jae ._nocopy
-
-# qhasm:     ctarget = out
-# asm 1: mov  <out=int64#1,>ctarget=int64#3
-# asm 2: mov  <out=%rdi,>ctarget=%rdx
-mov  %rdi,%rdx
-
-# qhasm:     out = &tmp
-# asm 1: leaq <tmp=stack512#1,>out=int64#1
-# asm 2: leaq <tmp=416(%rsp),>out=%rdi
-leaq 416(%rsp),%rdi
-
-# qhasm:     i = bytes
-# asm 1: mov  <bytes=int64#6,>i=int64#4
-# asm 2: mov  <bytes=%r9,>i=%rcx
-mov  %r9,%rcx
-
-# qhasm:     while (i) { *out++ = *m++; --i }
-rep movsb
-
-# qhasm:     out = &tmp
-# asm 1: leaq <tmp=stack512#1,>out=int64#1
-# asm 2: leaq <tmp=416(%rsp),>out=%rdi
-leaq 416(%rsp),%rdi
-
-# qhasm:     m = &tmp
-# asm 1: leaq <tmp=stack512#1,>m=int64#2
-# asm 2: leaq <tmp=416(%rsp),>m=%rsi
-leaq 416(%rsp),%rsi
-# comment:fp stack unchanged by fallthrough
-
-# qhasm:   nocopy:
-._nocopy:
-
-# qhasm:   bytes_backup = bytes
-# asm 1: movq <bytes=int64#6,>bytes_backup=stack64#8
-# asm 2: movq <bytes=%r9,>bytes_backup=408(%rsp)
-movq %r9,408(%rsp)
-
-# qhasm: diag0 = x0
-# asm 1: movdqa <x0=stack128#4,>diag0=int6464#1
-# asm 2: movdqa <x0=48(%rsp),>diag0=%xmm0
-movdqa 48(%rsp),%xmm0
-
-# qhasm: diag1 = x1
-# asm 1: movdqa <x1=stack128#1,>diag1=int6464#2
-# asm 2: movdqa <x1=0(%rsp),>diag1=%xmm1
-movdqa 0(%rsp),%xmm1
-
-# qhasm: diag2 = x2
-# asm 1: movdqa <x2=stack128#2,>diag2=int6464#3
-# asm 2: movdqa <x2=16(%rsp),>diag2=%xmm2
-movdqa 16(%rsp),%xmm2
-
-# qhasm: diag3 = x3
-# asm 1: movdqa <x3=stack128#3,>diag3=int6464#4
-# asm 2: movdqa <x3=32(%rsp),>diag3=%xmm3
-movdqa 32(%rsp),%xmm3
-
-# qhasm:                     a0 = diag1
-# asm 1: movdqa <diag1=int6464#2,>a0=int6464#5
-# asm 2: movdqa <diag1=%xmm1,>a0=%xmm4
-movdqa %xmm1,%xmm4
-
-# qhasm: i = 12
-# asm 1: mov  $12,>i=int64#4
-# asm 2: mov  $12,>i=%rcx
-mov  $12,%rcx
-
-# qhasm: mainloop2:
-._mainloop2:
-
-# qhasm: uint32323232        a0 += diag0
-# asm 1: paddd <diag0=int6464#1,<a0=int6464#5
-# asm 2: paddd <diag0=%xmm0,<a0=%xmm4
-paddd %xmm0,%xmm4
-
-# qhasm:                                 a1 = diag0
-# asm 1: movdqa <diag0=int6464#1,>a1=int6464#6
-# asm 2: movdqa <diag0=%xmm0,>a1=%xmm5
-movdqa %xmm0,%xmm5
-
-# qhasm:                     b0 = a0
-# asm 1: movdqa <a0=int6464#5,>b0=int6464#7
-# asm 2: movdqa <a0=%xmm4,>b0=%xmm6
-movdqa %xmm4,%xmm6
-
-# qhasm: uint32323232        a0 <<= 7
-# asm 1: pslld $7,<a0=int6464#5
-# asm 2: pslld $7,<a0=%xmm4
-pslld $7,%xmm4
-
-# qhasm: uint32323232        b0 >>= 25
-# asm 1: psrld $25,<b0=int6464#7
-# asm 2: psrld $25,<b0=%xmm6
-psrld $25,%xmm6
-
-# qhasm:                 diag3 ^= a0
-# asm 1: pxor  <a0=int6464#5,<diag3=int6464#4
-# asm 2: pxor  <a0=%xmm4,<diag3=%xmm3
-pxor  %xmm4,%xmm3
-
-# qhasm:                 diag3 ^= b0
-# asm 1: pxor  <b0=int6464#7,<diag3=int6464#4
-# asm 2: pxor  <b0=%xmm6,<diag3=%xmm3
-pxor  %xmm6,%xmm3
-
-# qhasm: uint32323232                        a1 += diag3
-# asm 1: paddd <diag3=int6464#4,<a1=int6464#6
-# asm 2: paddd <diag3=%xmm3,<a1=%xmm5
-paddd %xmm3,%xmm5
-
-# qhasm:                                                 a2 = diag3
-# asm 1: movdqa <diag3=int6464#4,>a2=int6464#5
-# asm 2: movdqa <diag3=%xmm3,>a2=%xmm4
-movdqa %xmm3,%xmm4
-
-# qhasm:                                     b1 = a1
-# asm 1: movdqa <a1=int6464#6,>b1=int6464#7
-# asm 2: movdqa <a1=%xmm5,>b1=%xmm6
-movdqa %xmm5,%xmm6
-
-# qhasm: uint32323232                        a1 <<= 9
-# asm 1: pslld $9,<a1=int6464#6
-# asm 2: pslld $9,<a1=%xmm5
-pslld $9,%xmm5
-
-# qhasm: uint32323232                        b1 >>= 23
-# asm 1: psrld $23,<b1=int6464#7
-# asm 2: psrld $23,<b1=%xmm6
-psrld $23,%xmm6
-
-# qhasm:                                 diag2 ^= a1
-# asm 1: pxor  <a1=int6464#6,<diag2=int6464#3
-# asm 2: pxor  <a1=%xmm5,<diag2=%xmm2
-pxor  %xmm5,%xmm2
-
-# qhasm:                 diag3 <<<= 32
-# asm 1: pshufd $0x93,<diag3=int6464#4,<diag3=int6464#4
-# asm 2: pshufd $0x93,<diag3=%xmm3,<diag3=%xmm3
-pshufd $0x93,%xmm3,%xmm3
-
-# qhasm:                                 diag2 ^= b1
-# asm 1: pxor  <b1=int6464#7,<diag2=int6464#3
-# asm 2: pxor  <b1=%xmm6,<diag2=%xmm2
-pxor  %xmm6,%xmm2
-
-# qhasm: uint32323232                                        a2 += diag2
-# asm 1: paddd <diag2=int6464#3,<a2=int6464#5
-# asm 2: paddd <diag2=%xmm2,<a2=%xmm4
-paddd %xmm2,%xmm4
-
-# qhasm:                                                                 a3 = diag2
-# asm 1: movdqa <diag2=int6464#3,>a3=int6464#6
-# asm 2: movdqa <diag2=%xmm2,>a3=%xmm5
-movdqa %xmm2,%xmm5
-
-# qhasm:                                                     b2 = a2
-# asm 1: movdqa <a2=int6464#5,>b2=int6464#7
-# asm 2: movdqa <a2=%xmm4,>b2=%xmm6
-movdqa %xmm4,%xmm6
-
-# qhasm: uint32323232                                        a2 <<= 13
-# asm 1: pslld $13,<a2=int6464#5
-# asm 2: pslld $13,<a2=%xmm4
-pslld $13,%xmm4
-
-# qhasm: uint32323232                                        b2 >>= 19
-# asm 1: psrld $19,<b2=int6464#7
-# asm 2: psrld $19,<b2=%xmm6
-psrld $19,%xmm6
-
-# qhasm:                                                 diag1 ^= a2
-# asm 1: pxor  <a2=int6464#5,<diag1=int6464#2
-# asm 2: pxor  <a2=%xmm4,<diag1=%xmm1
-pxor  %xmm4,%xmm1
-
-# qhasm:                                 diag2 <<<= 64
-# asm 1: pshufd $0x4e,<diag2=int6464#3,<diag2=int6464#3
-# asm 2: pshufd $0x4e,<diag2=%xmm2,<diag2=%xmm2
-pshufd $0x4e,%xmm2,%xmm2
-
-# qhasm:                                                 diag1 ^= b2
-# asm 1: pxor  <b2=int6464#7,<diag1=int6464#2
-# asm 2: pxor  <b2=%xmm6,<diag1=%xmm1
-pxor  %xmm6,%xmm1
-
-# qhasm: uint32323232                                                        a3 += diag1
-# asm 1: paddd <diag1=int6464#2,<a3=int6464#6
-# asm 2: paddd <diag1=%xmm1,<a3=%xmm5
-paddd %xmm1,%xmm5
-
-# qhasm:                 a4 = diag3
-# asm 1: movdqa <diag3=int6464#4,>a4=int6464#5
-# asm 2: movdqa <diag3=%xmm3,>a4=%xmm4
-movdqa %xmm3,%xmm4
-
-# qhasm:                                                                     b3 = a3
-# asm 1: movdqa <a3=int6464#6,>b3=int6464#7
-# asm 2: movdqa <a3=%xmm5,>b3=%xmm6
-movdqa %xmm5,%xmm6
-
-# qhasm: uint32323232                                                        a3 <<= 18
-# asm 1: pslld $18,<a3=int6464#6
-# asm 2: pslld $18,<a3=%xmm5
-pslld $18,%xmm5
-
-# qhasm: uint32323232                                                        b3 >>= 14
-# asm 1: psrld $14,<b3=int6464#7
-# asm 2: psrld $14,<b3=%xmm6
-psrld $14,%xmm6
-
-# qhasm:                                                                 diag0 ^= a3
-# asm 1: pxor  <a3=int6464#6,<diag0=int6464#1
-# asm 2: pxor  <a3=%xmm5,<diag0=%xmm0
-pxor  %xmm5,%xmm0
-
-# qhasm:                                                 diag1 <<<= 96
-# asm 1: pshufd $0x39,<diag1=int6464#2,<diag1=int6464#2
-# asm 2: pshufd $0x39,<diag1=%xmm1,<diag1=%xmm1
-pshufd $0x39,%xmm1,%xmm1
-
-# qhasm:                                                                 diag0 ^= b3
-# asm 1: pxor  <b3=int6464#7,<diag0=int6464#1
-# asm 2: pxor  <b3=%xmm6,<diag0=%xmm0
-pxor  %xmm6,%xmm0
-
-# qhasm: uint32323232        a4 += diag0
-# asm 1: paddd <diag0=int6464#1,<a4=int6464#5
-# asm 2: paddd <diag0=%xmm0,<a4=%xmm4
-paddd %xmm0,%xmm4
-
-# qhasm:                                 a5 = diag0
-# asm 1: movdqa <diag0=int6464#1,>a5=int6464#6
-# asm 2: movdqa <diag0=%xmm0,>a5=%xmm5
-movdqa %xmm0,%xmm5
-
-# qhasm:                     b4 = a4
-# asm 1: movdqa <a4=int6464#5,>b4=int6464#7
-# asm 2: movdqa <a4=%xmm4,>b4=%xmm6
-movdqa %xmm4,%xmm6
-
-# qhasm: uint32323232        a4 <<= 7
-# asm 1: pslld $7,<a4=int6464#5
-# asm 2: pslld $7,<a4=%xmm4
-pslld $7,%xmm4
-
-# qhasm: uint32323232        b4 >>= 25
-# asm 1: psrld $25,<b4=int6464#7
-# asm 2: psrld $25,<b4=%xmm6
-psrld $25,%xmm6
-
-# qhasm:                 diag1 ^= a4
-# asm 1: pxor  <a4=int6464#5,<diag1=int6464#2
-# asm 2: pxor  <a4=%xmm4,<diag1=%xmm1
-pxor  %xmm4,%xmm1
-
-# qhasm:                 diag1 ^= b4
-# asm 1: pxor  <b4=int6464#7,<diag1=int6464#2
-# asm 2: pxor  <b4=%xmm6,<diag1=%xmm1
-pxor  %xmm6,%xmm1
-
-# qhasm: uint32323232                        a5 += diag1
-# asm 1: paddd <diag1=int6464#2,<a5=int6464#6
-# asm 2: paddd <diag1=%xmm1,<a5=%xmm5
-paddd %xmm1,%xmm5
-
-# qhasm:                                                 a6 = diag1
-# asm 1: movdqa <diag1=int6464#2,>a6=int6464#5
-# asm 2: movdqa <diag1=%xmm1,>a6=%xmm4
-movdqa %xmm1,%xmm4
-
-# qhasm:                                     b5 = a5
-# asm 1: movdqa <a5=int6464#6,>b5=int6464#7
-# asm 2: movdqa <a5=%xmm5,>b5=%xmm6
-movdqa %xmm5,%xmm6
-
-# qhasm: uint32323232                        a5 <<= 9
-# asm 1: pslld $9,<a5=int6464#6
-# asm 2: pslld $9,<a5=%xmm5
-pslld $9,%xmm5
-
-# qhasm: uint32323232                        b5 >>= 23
-# asm 1: psrld $23,<b5=int6464#7
-# asm 2: psrld $23,<b5=%xmm6
-psrld $23,%xmm6
-
-# qhasm:                                 diag2 ^= a5
-# asm 1: pxor  <a5=int6464#6,<diag2=int6464#3
-# asm 2: pxor  <a5=%xmm5,<diag2=%xmm2
-pxor  %xmm5,%xmm2
-
-# qhasm:                 diag1 <<<= 32
-# asm 1: pshufd $0x93,<diag1=int6464#2,<diag1=int6464#2
-# asm 2: pshufd $0x93,<diag1=%xmm1,<diag1=%xmm1
-pshufd $0x93,%xmm1,%xmm1
-
-# qhasm:                                 diag2 ^= b5
-# asm 1: pxor  <b5=int6464#7,<diag2=int6464#3
-# asm 2: pxor  <b5=%xmm6,<diag2=%xmm2
-pxor  %xmm6,%xmm2
-
-# qhasm: uint32323232                                        a6 += diag2
-# asm 1: paddd <diag2=int6464#3,<a6=int6464#5
-# asm 2: paddd <diag2=%xmm2,<a6=%xmm4
-paddd %xmm2,%xmm4
-
-# qhasm:                                                                 a7 = diag2
-# asm 1: movdqa <diag2=int6464#3,>a7=int6464#6
-# asm 2: movdqa <diag2=%xmm2,>a7=%xmm5
-movdqa %xmm2,%xmm5
-
-# qhasm:                                                     b6 = a6
-# asm 1: movdqa <a6=int6464#5,>b6=int6464#7
-# asm 2: movdqa <a6=%xmm4,>b6=%xmm6
-movdqa %xmm4,%xmm6
-
-# qhasm: uint32323232                                        a6 <<= 13
-# asm 1: pslld $13,<a6=int6464#5
-# asm 2: pslld $13,<a6=%xmm4
-pslld $13,%xmm4
-
-# qhasm: uint32323232                                        b6 >>= 19
-# asm 1: psrld $19,<b6=int6464#7
-# asm 2: psrld $19,<b6=%xmm6
-psrld $19,%xmm6
-
-# qhasm:                                                 diag3 ^= a6
-# asm 1: pxor  <a6=int6464#5,<diag3=int6464#4
-# asm 2: pxor  <a6=%xmm4,<diag3=%xmm3
-pxor  %xmm4,%xmm3
-
-# qhasm:                                 diag2 <<<= 64
-# asm 1: pshufd $0x4e,<diag2=int6464#3,<diag2=int6464#3
-# asm 2: pshufd $0x4e,<diag2=%xmm2,<diag2=%xmm2
-pshufd $0x4e,%xmm2,%xmm2
-
-# qhasm:                                                 diag3 ^= b6
-# asm 1: pxor  <b6=int6464#7,<diag3=int6464#4
-# asm 2: pxor  <b6=%xmm6,<diag3=%xmm3
-pxor  %xmm6,%xmm3
-
-# qhasm: uint32323232                                                        a7 += diag3
-# asm 1: paddd <diag3=int6464#4,<a7=int6464#6
-# asm 2: paddd <diag3=%xmm3,<a7=%xmm5
-paddd %xmm3,%xmm5
-
-# qhasm:                 a0 = diag1
-# asm 1: movdqa <diag1=int6464#2,>a0=int6464#5
-# asm 2: movdqa <diag1=%xmm1,>a0=%xmm4
-movdqa %xmm1,%xmm4
-
-# qhasm:                                                                     b7 = a7
-# asm 1: movdqa <a7=int6464#6,>b7=int6464#7
-# asm 2: movdqa <a7=%xmm5,>b7=%xmm6
-movdqa %xmm5,%xmm6
-
-# qhasm: uint32323232                                                        a7 <<= 18
-# asm 1: pslld $18,<a7=int6464#6
-# asm 2: pslld $18,<a7=%xmm5
-pslld $18,%xmm5
-
-# qhasm: uint32323232                                                        b7 >>= 14
-# asm 1: psrld $14,<b7=int6464#7
-# asm 2: psrld $14,<b7=%xmm6
-psrld $14,%xmm6
-
-# qhasm:                                                                 diag0 ^= a7
-# asm 1: pxor  <a7=int6464#6,<diag0=int6464#1
-# asm 2: pxor  <a7=%xmm5,<diag0=%xmm0
-pxor  %xmm5,%xmm0
-
-# qhasm:                                                 diag3 <<<= 96
-# asm 1: pshufd $0x39,<diag3=int6464#4,<diag3=int6464#4
-# asm 2: pshufd $0x39,<diag3=%xmm3,<diag3=%xmm3
-pshufd $0x39,%xmm3,%xmm3
-
-# qhasm:                                                                 diag0 ^= b7
-# asm 1: pxor  <b7=int6464#7,<diag0=int6464#1
-# asm 2: pxor  <b7=%xmm6,<diag0=%xmm0
-pxor  %xmm6,%xmm0
-
-# qhasm: uint32323232        a0 += diag0
-# asm 1: paddd <diag0=int6464#1,<a0=int6464#5
-# asm 2: paddd <diag0=%xmm0,<a0=%xmm4
-paddd %xmm0,%xmm4
-
-# qhasm:                                 a1 = diag0
-# asm 1: movdqa <diag0=int6464#1,>a1=int6464#6
-# asm 2: movdqa <diag0=%xmm0,>a1=%xmm5
-movdqa %xmm0,%xmm5
-
-# qhasm:                     b0 = a0
-# asm 1: movdqa <a0=int6464#5,>b0=int6464#7
-# asm 2: movdqa <a0=%xmm4,>b0=%xmm6
-movdqa %xmm4,%xmm6
-
-# qhasm: uint32323232        a0 <<= 7
-# asm 1: pslld $7,<a0=int6464#5
-# asm 2: pslld $7,<a0=%xmm4
-pslld $7,%xmm4
-
-# qhasm: uint32323232        b0 >>= 25
-# asm 1: psrld $25,<b0=int6464#7
-# asm 2: psrld $25,<b0=%xmm6
-psrld $25,%xmm6
-
-# qhasm:                 diag3 ^= a0
-# asm 1: pxor  <a0=int6464#5,<diag3=int6464#4
-# asm 2: pxor  <a0=%xmm4,<diag3=%xmm3
-pxor  %xmm4,%xmm3
-
-# qhasm:                 diag3 ^= b0
-# asm 1: pxor  <b0=int6464#7,<diag3=int6464#4
-# asm 2: pxor  <b0=%xmm6,<diag3=%xmm3
-pxor  %xmm6,%xmm3
-
-# qhasm: uint32323232                        a1 += diag3
-# asm 1: paddd <diag3=int6464#4,<a1=int6464#6
-# asm 2: paddd <diag3=%xmm3,<a1=%xmm5
-paddd %xmm3,%xmm5
-
-# qhasm:                                                 a2 = diag3
-# asm 1: movdqa <diag3=int6464#4,>a2=int6464#5
-# asm 2: movdqa <diag3=%xmm3,>a2=%xmm4
-movdqa %xmm3,%xmm4
-
-# qhasm:                                     b1 = a1
-# asm 1: movdqa <a1=int6464#6,>b1=int6464#7
-# asm 2: movdqa <a1=%xmm5,>b1=%xmm6
-movdqa %xmm5,%xmm6
-
-# qhasm: uint32323232                        a1 <<= 9
-# asm 1: pslld $9,<a1=int6464#6
-# asm 2: pslld $9,<a1=%xmm5
-pslld $9,%xmm5
-
-# qhasm: uint32323232                        b1 >>= 23
-# asm 1: psrld $23,<b1=int6464#7
-# asm 2: psrld $23,<b1=%xmm6
-psrld $23,%xmm6
-
-# qhasm:                                 diag2 ^= a1
-# asm 1: pxor  <a1=int6464#6,<diag2=int6464#3
-# asm 2: pxor  <a1=%xmm5,<diag2=%xmm2
-pxor  %xmm5,%xmm2
-
-# qhasm:                 diag3 <<<= 32
-# asm 1: pshufd $0x93,<diag3=int6464#4,<diag3=int6464#4
-# asm 2: pshufd $0x93,<diag3=%xmm3,<diag3=%xmm3
-pshufd $0x93,%xmm3,%xmm3
-
-# qhasm:                                 diag2 ^= b1
-# asm 1: pxor  <b1=int6464#7,<diag2=int6464#3
-# asm 2: pxor  <b1=%xmm6,<diag2=%xmm2
-pxor  %xmm6,%xmm2
-
-# qhasm: uint32323232                                        a2 += diag2
-# asm 1: paddd <diag2=int6464#3,<a2=int6464#5
-# asm 2: paddd <diag2=%xmm2,<a2=%xmm4
-paddd %xmm2,%xmm4
-
-# qhasm:                                                                 a3 = diag2
-# asm 1: movdqa <diag2=int6464#3,>a3=int6464#6
-# asm 2: movdqa <diag2=%xmm2,>a3=%xmm5
-movdqa %xmm2,%xmm5
-
-# qhasm:                                                     b2 = a2
-# asm 1: movdqa <a2=int6464#5,>b2=int6464#7
-# asm 2: movdqa <a2=%xmm4,>b2=%xmm6
-movdqa %xmm4,%xmm6
-
-# qhasm: uint32323232                                        a2 <<= 13
-# asm 1: pslld $13,<a2=int6464#5
-# asm 2: pslld $13,<a2=%xmm4
-pslld $13,%xmm4
-
-# qhasm: uint32323232                                        b2 >>= 19
-# asm 1: psrld $19,<b2=int6464#7
-# asm 2: psrld $19,<b2=%xmm6
-psrld $19,%xmm6
-
-# qhasm:                                                 diag1 ^= a2
-# asm 1: pxor  <a2=int6464#5,<diag1=int6464#2
-# asm 2: pxor  <a2=%xmm4,<diag1=%xmm1
-pxor  %xmm4,%xmm1
-
-# qhasm:                                 diag2 <<<= 64
-# asm 1: pshufd $0x4e,<diag2=int6464#3,<diag2=int6464#3
-# asm 2: pshufd $0x4e,<diag2=%xmm2,<diag2=%xmm2
-pshufd $0x4e,%xmm2,%xmm2
-
-# qhasm:                                                 diag1 ^= b2
-# asm 1: pxor  <b2=int6464#7,<diag1=int6464#2
-# asm 2: pxor  <b2=%xmm6,<diag1=%xmm1
-pxor  %xmm6,%xmm1
-
-# qhasm: uint32323232                                                        a3 += diag1
-# asm 1: paddd <diag1=int6464#2,<a3=int6464#6
-# asm 2: paddd <diag1=%xmm1,<a3=%xmm5
-paddd %xmm1,%xmm5
-
-# qhasm:                 a4 = diag3
-# asm 1: movdqa <diag3=int6464#4,>a4=int6464#5
-# asm 2: movdqa <diag3=%xmm3,>a4=%xmm4
-movdqa %xmm3,%xmm4
-
-# qhasm:                                                                     b3 = a3
-# asm 1: movdqa <a3=int6464#6,>b3=int6464#7
-# asm 2: movdqa <a3=%xmm5,>b3=%xmm6
-movdqa %xmm5,%xmm6
-
-# qhasm: uint32323232                                                        a3 <<= 18
-# asm 1: pslld $18,<a3=int6464#6
-# asm 2: pslld $18,<a3=%xmm5
-pslld $18,%xmm5
-
-# qhasm: uint32323232                                                        b3 >>= 14
-# asm 1: psrld $14,<b3=int6464#7
-# asm 2: psrld $14,<b3=%xmm6
-psrld $14,%xmm6
-
-# qhasm:                                                                 diag0 ^= a3
-# asm 1: pxor  <a3=int6464#6,<diag0=int6464#1
-# asm 2: pxor  <a3=%xmm5,<diag0=%xmm0
-pxor  %xmm5,%xmm0
-
-# qhasm:                                                 diag1 <<<= 96
-# asm 1: pshufd $0x39,<diag1=int6464#2,<diag1=int6464#2
-# asm 2: pshufd $0x39,<diag1=%xmm1,<diag1=%xmm1
-pshufd $0x39,%xmm1,%xmm1
-
-# qhasm:                                                                 diag0 ^= b3
-# asm 1: pxor  <b3=int6464#7,<diag0=int6464#1
-# asm 2: pxor  <b3=%xmm6,<diag0=%xmm0
-pxor  %xmm6,%xmm0
-
-# qhasm: uint32323232        a4 += diag0
-# asm 1: paddd <diag0=int6464#1,<a4=int6464#5
-# asm 2: paddd <diag0=%xmm0,<a4=%xmm4
-paddd %xmm0,%xmm4
-
-# qhasm:                                 a5 = diag0
-# asm 1: movdqa <diag0=int6464#1,>a5=int6464#6
-# asm 2: movdqa <diag0=%xmm0,>a5=%xmm5
-movdqa %xmm0,%xmm5
-
-# qhasm:                     b4 = a4
-# asm 1: movdqa <a4=int6464#5,>b4=int6464#7
-# asm 2: movdqa <a4=%xmm4,>b4=%xmm6
-movdqa %xmm4,%xmm6
-
-# qhasm: uint32323232        a4 <<= 7
-# asm 1: pslld $7,<a4=int6464#5
-# asm 2: pslld $7,<a4=%xmm4
-pslld $7,%xmm4
-
-# qhasm: uint32323232        b4 >>= 25
-# asm 1: psrld $25,<b4=int6464#7
-# asm 2: psrld $25,<b4=%xmm6
-psrld $25,%xmm6
-
-# qhasm:                 diag1 ^= a4
-# asm 1: pxor  <a4=int6464#5,<diag1=int6464#2
-# asm 2: pxor  <a4=%xmm4,<diag1=%xmm1
-pxor  %xmm4,%xmm1
-
-# qhasm:                 diag1 ^= b4
-# asm 1: pxor  <b4=int6464#7,<diag1=int6464#2
-# asm 2: pxor  <b4=%xmm6,<diag1=%xmm1
-pxor  %xmm6,%xmm1
-
-# qhasm: uint32323232                        a5 += diag1
-# asm 1: paddd <diag1=int6464#2,<a5=int6464#6
-# asm 2: paddd <diag1=%xmm1,<a5=%xmm5
-paddd %xmm1,%xmm5
-
-# qhasm:                                                 a6 = diag1
-# asm 1: movdqa <diag1=int6464#2,>a6=int6464#5
-# asm 2: movdqa <diag1=%xmm1,>a6=%xmm4
-movdqa %xmm1,%xmm4
-
-# qhasm:                                     b5 = a5
-# asm 1: movdqa <a5=int6464#6,>b5=int6464#7
-# asm 2: movdqa <a5=%xmm5,>b5=%xmm6
-movdqa %xmm5,%xmm6
-
-# qhasm: uint32323232                        a5 <<= 9
-# asm 1: pslld $9,<a5=int6464#6
-# asm 2: pslld $9,<a5=%xmm5
-pslld $9,%xmm5
-
-# qhasm: uint32323232                        b5 >>= 23
-# asm 1: psrld $23,<b5=int6464#7
-# asm 2: psrld $23,<b5=%xmm6
-psrld $23,%xmm6
-
-# qhasm:                                 diag2 ^= a5
-# asm 1: pxor  <a5=int6464#6,<diag2=int6464#3
-# asm 2: pxor  <a5=%xmm5,<diag2=%xmm2
-pxor  %xmm5,%xmm2
-
-# qhasm:                 diag1 <<<= 32
-# asm 1: pshufd $0x93,<diag1=int6464#2,<diag1=int6464#2
-# asm 2: pshufd $0x93,<diag1=%xmm1,<diag1=%xmm1
-pshufd $0x93,%xmm1,%xmm1
-
-# qhasm:                                 diag2 ^= b5
-# asm 1: pxor  <b5=int6464#7,<diag2=int6464#3
-# asm 2: pxor  <b5=%xmm6,<diag2=%xmm2
-pxor  %xmm6,%xmm2
-
-# qhasm: uint32323232                                        a6 += diag2
-# asm 1: paddd <diag2=int6464#3,<a6=int6464#5
-# asm 2: paddd <diag2=%xmm2,<a6=%xmm4
-paddd %xmm2,%xmm4
-
-# qhasm:                                                                 a7 = diag2
-# asm 1: movdqa <diag2=int6464#3,>a7=int6464#6
-# asm 2: movdqa <diag2=%xmm2,>a7=%xmm5
-movdqa %xmm2,%xmm5
-
-# qhasm:                                                     b6 = a6
-# asm 1: movdqa <a6=int6464#5,>b6=int6464#7
-# asm 2: movdqa <a6=%xmm4,>b6=%xmm6
-movdqa %xmm4,%xmm6
-
-# qhasm: uint32323232                                        a6 <<= 13
-# asm 1: pslld $13,<a6=int6464#5
-# asm 2: pslld $13,<a6=%xmm4
-pslld $13,%xmm4
-
-# qhasm: uint32323232                                        b6 >>= 19
-# asm 1: psrld $19,<b6=int6464#7
-# asm 2: psrld $19,<b6=%xmm6
-psrld $19,%xmm6
-
-# qhasm:                                                 diag3 ^= a6
-# asm 1: pxor  <a6=int6464#5,<diag3=int6464#4
-# asm 2: pxor  <a6=%xmm4,<diag3=%xmm3
-pxor  %xmm4,%xmm3
-
-# qhasm:                                 diag2 <<<= 64
-# asm 1: pshufd $0x4e,<diag2=int6464#3,<diag2=int6464#3
-# asm 2: pshufd $0x4e,<diag2=%xmm2,<diag2=%xmm2
-pshufd $0x4e,%xmm2,%xmm2
-
-# qhasm:                                                 diag3 ^= b6
-# asm 1: pxor  <b6=int6464#7,<diag3=int6464#4
-# asm 2: pxor  <b6=%xmm6,<diag3=%xmm3
-pxor  %xmm6,%xmm3
-
-# qhasm:                  unsigned>? i -= 4
-# asm 1: sub  $4,<i=int64#4
-# asm 2: sub  $4,<i=%rcx
-sub  $4,%rcx
-
-# qhasm: uint32323232                                                        a7 += diag3
-# asm 1: paddd <diag3=int6464#4,<a7=int6464#6
-# asm 2: paddd <diag3=%xmm3,<a7=%xmm5
-paddd %xmm3,%xmm5
-
-# qhasm:                 a0 = diag1
-# asm 1: movdqa <diag1=int6464#2,>a0=int6464#5
-# asm 2: movdqa <diag1=%xmm1,>a0=%xmm4
-movdqa %xmm1,%xmm4
-
-# qhasm:                                                                     b7 = a7
-# asm 1: movdqa <a7=int6464#6,>b7=int6464#7
-# asm 2: movdqa <a7=%xmm5,>b7=%xmm6
-movdqa %xmm5,%xmm6
-
-# qhasm: uint32323232                                                        a7 <<= 18
-# asm 1: pslld $18,<a7=int6464#6
-# asm 2: pslld $18,<a7=%xmm5
-pslld $18,%xmm5
-
-# qhasm:                 b0 = 0
-# asm 1: pxor   >b0=int6464#8,>b0=int6464#8
-# asm 2: pxor   >b0=%xmm7,>b0=%xmm7
-pxor   %xmm7,%xmm7
-
-# qhasm: uint32323232                                                        b7 >>= 14
-# asm 1: psrld $14,<b7=int6464#7
-# asm 2: psrld $14,<b7=%xmm6
-psrld $14,%xmm6
-
-# qhasm:                                                                 diag0 ^= a7
-# asm 1: pxor  <a7=int6464#6,<diag0=int6464#1
-# asm 2: pxor  <a7=%xmm5,<diag0=%xmm0
-pxor  %xmm5,%xmm0
-
-# qhasm:                                                 diag3 <<<= 96
-# asm 1: pshufd $0x39,<diag3=int6464#4,<diag3=int6464#4
-# asm 2: pshufd $0x39,<diag3=%xmm3,<diag3=%xmm3
-pshufd $0x39,%xmm3,%xmm3
-
-# qhasm:                                                                 diag0 ^= b7
-# asm 1: pxor  <b7=int6464#7,<diag0=int6464#1
-# asm 2: pxor  <b7=%xmm6,<diag0=%xmm0
-pxor  %xmm6,%xmm0
-# comment:fp stack unchanged by jump
-
-# qhasm: goto mainloop2 if unsigned>
-ja ._mainloop2
-
-# qhasm: uint32323232 diag0 += x0
-# asm 1: paddd <x0=stack128#4,<diag0=int6464#1
-# asm 2: paddd <x0=48(%rsp),<diag0=%xmm0
-paddd 48(%rsp),%xmm0
-
-# qhasm: uint32323232 diag1 += x1
-# asm 1: paddd <x1=stack128#1,<diag1=int6464#2
-# asm 2: paddd <x1=0(%rsp),<diag1=%xmm1
-paddd 0(%rsp),%xmm1
-
-# qhasm: uint32323232 diag2 += x2
-# asm 1: paddd <x2=stack128#2,<diag2=int6464#3
-# asm 2: paddd <x2=16(%rsp),<diag2=%xmm2
-paddd 16(%rsp),%xmm2
-
-# qhasm: uint32323232 diag3 += x3
-# asm 1: paddd <x3=stack128#3,<diag3=int6464#4
-# asm 2: paddd <x3=32(%rsp),<diag3=%xmm3
-paddd 32(%rsp),%xmm3
-
-# qhasm: in0 = diag0
-# asm 1: movd   <diag0=int6464#1,>in0=int64#4
-# asm 2: movd   <diag0=%xmm0,>in0=%rcx
-movd   %xmm0,%rcx
-
-# qhasm: in12 = diag1
-# asm 1: movd   <diag1=int6464#2,>in12=int64#5
-# asm 2: movd   <diag1=%xmm1,>in12=%r8
-movd   %xmm1,%r8
-
-# qhasm: in8 = diag2
-# asm 1: movd   <diag2=int6464#3,>in8=int64#6
-# asm 2: movd   <diag2=%xmm2,>in8=%r9
-movd   %xmm2,%r9
-
-# qhasm: in4 = diag3
-# asm 1: movd   <diag3=int6464#4,>in4=int64#7
-# asm 2: movd   <diag3=%xmm3,>in4=%rax
-movd   %xmm3,%rax
-
-# qhasm: diag0 <<<= 96
-# asm 1: pshufd $0x39,<diag0=int6464#1,<diag0=int6464#1
-# asm 2: pshufd $0x39,<diag0=%xmm0,<diag0=%xmm0
-pshufd $0x39,%xmm0,%xmm0
-
-# qhasm: diag1 <<<= 96
-# asm 1: pshufd $0x39,<diag1=int6464#2,<diag1=int6464#2
-# asm 2: pshufd $0x39,<diag1=%xmm1,<diag1=%xmm1
-pshufd $0x39,%xmm1,%xmm1
-
-# qhasm: diag2 <<<= 96
-# asm 1: pshufd $0x39,<diag2=int6464#3,<diag2=int6464#3
-# asm 2: pshufd $0x39,<diag2=%xmm2,<diag2=%xmm2
-pshufd $0x39,%xmm2,%xmm2
-
-# qhasm: diag3 <<<= 96
-# asm 1: pshufd $0x39,<diag3=int6464#4,<diag3=int6464#4
-# asm 2: pshufd $0x39,<diag3=%xmm3,<diag3=%xmm3
-pshufd $0x39,%xmm3,%xmm3
-
-# qhasm: (uint32) in0 ^= *(uint32 *) (m + 0)
-# asm 1: xorl 0(<m=int64#2),<in0=int64#4d
-# asm 2: xorl 0(<m=%rsi),<in0=%ecx
-xorl 0(%rsi),%ecx
-
-# qhasm: (uint32) in12 ^= *(uint32 *) (m + 48)
-# asm 1: xorl 48(<m=int64#2),<in12=int64#5d
-# asm 2: xorl 48(<m=%rsi),<in12=%r8d
-xorl 48(%rsi),%r8d
-
-# qhasm: (uint32) in8 ^= *(uint32 *) (m + 32)
-# asm 1: xorl 32(<m=int64#2),<in8=int64#6d
-# asm 2: xorl 32(<m=%rsi),<in8=%r9d
-xorl 32(%rsi),%r9d
-
-# qhasm: (uint32) in4 ^= *(uint32 *) (m + 16)
-# asm 1: xorl 16(<m=int64#2),<in4=int64#7d
-# asm 2: xorl 16(<m=%rsi),<in4=%eax
-xorl 16(%rsi),%eax
-
-# qhasm: *(uint32 *) (out + 0) = in0
-# asm 1: movl   <in0=int64#4d,0(<out=int64#1)
-# asm 2: movl   <in0=%ecx,0(<out=%rdi)
-movl   %ecx,0(%rdi)
-
-# qhasm: *(uint32 *) (out + 48) = in12
-# asm 1: movl   <in12=int64#5d,48(<out=int64#1)
-# asm 2: movl   <in12=%r8d,48(<out=%rdi)
-movl   %r8d,48(%rdi)
-
-# qhasm: *(uint32 *) (out + 32) = in8
-# asm 1: movl   <in8=int64#6d,32(<out=int64#1)
-# asm 2: movl   <in8=%r9d,32(<out=%rdi)
-movl   %r9d,32(%rdi)
-
-# qhasm: *(uint32 *) (out + 16) = in4
-# asm 1: movl   <in4=int64#7d,16(<out=int64#1)
-# asm 2: movl   <in4=%eax,16(<out=%rdi)
-movl   %eax,16(%rdi)
-
-# qhasm: in5 = diag0
-# asm 1: movd   <diag0=int6464#1,>in5=int64#4
-# asm 2: movd   <diag0=%xmm0,>in5=%rcx
-movd   %xmm0,%rcx
-
-# qhasm: in1 = diag1
-# asm 1: movd   <diag1=int6464#2,>in1=int64#5
-# asm 2: movd   <diag1=%xmm1,>in1=%r8
-movd   %xmm1,%r8
-
-# qhasm: in13 = diag2
-# asm 1: movd   <diag2=int6464#3,>in13=int64#6
-# asm 2: movd   <diag2=%xmm2,>in13=%r9
-movd   %xmm2,%r9
-
-# qhasm: in9 = diag3
-# asm 1: movd   <diag3=int6464#4,>in9=int64#7
-# asm 2: movd   <diag3=%xmm3,>in9=%rax
-movd   %xmm3,%rax
-
-# qhasm: diag0 <<<= 96
-# asm 1: pshufd $0x39,<diag0=int6464#1,<diag0=int6464#1
-# asm 2: pshufd $0x39,<diag0=%xmm0,<diag0=%xmm0
-pshufd $0x39,%xmm0,%xmm0
-
-# qhasm: diag1 <<<= 96
-# asm 1: pshufd $0x39,<diag1=int6464#2,<diag1=int6464#2
-# asm 2: pshufd $0x39,<diag1=%xmm1,<diag1=%xmm1
-pshufd $0x39,%xmm1,%xmm1
-
-# qhasm: diag2 <<<= 96
-# asm 1: pshufd $0x39,<diag2=int6464#3,<diag2=int6464#3
-# asm 2: pshufd $0x39,<diag2=%xmm2,<diag2=%xmm2
-pshufd $0x39,%xmm2,%xmm2
-
-# qhasm: diag3 <<<= 96
-# asm 1: pshufd $0x39,<diag3=int6464#4,<diag3=int6464#4
-# asm 2: pshufd $0x39,<diag3=%xmm3,<diag3=%xmm3
-pshufd $0x39,%xmm3,%xmm3
-
-# qhasm: (uint32) in5 ^= *(uint32 *) (m + 20)
-# asm 1: xorl 20(<m=int64#2),<in5=int64#4d
-# asm 2: xorl 20(<m=%rsi),<in5=%ecx
-xorl 20(%rsi),%ecx
-
-# qhasm: (uint32) in1 ^= *(uint32 *) (m + 4)
-# asm 1: xorl 4(<m=int64#2),<in1=int64#5d
-# asm 2: xorl 4(<m=%rsi),<in1=%r8d
-xorl 4(%rsi),%r8d
-
-# qhasm: (uint32) in13 ^= *(uint32 *) (m + 52)
-# asm 1: xorl 52(<m=int64#2),<in13=int64#6d
-# asm 2: xorl 52(<m=%rsi),<in13=%r9d
-xorl 52(%rsi),%r9d
-
-# qhasm: (uint32) in9 ^= *(uint32 *) (m + 36)
-# asm 1: xorl 36(<m=int64#2),<in9=int64#7d
-# asm 2: xorl 36(<m=%rsi),<in9=%eax
-xorl 36(%rsi),%eax
-
-# qhasm: *(uint32 *) (out + 20) = in5
-# asm 1: movl   <in5=int64#4d,20(<out=int64#1)
-# asm 2: movl   <in5=%ecx,20(<out=%rdi)
-movl   %ecx,20(%rdi)
-
-# qhasm: *(uint32 *) (out + 4) = in1
-# asm 1: movl   <in1=int64#5d,4(<out=int64#1)
-# asm 2: movl   <in1=%r8d,4(<out=%rdi)
-movl   %r8d,4(%rdi)
-
-# qhasm: *(uint32 *) (out + 52) = in13
-# asm 1: movl   <in13=int64#6d,52(<out=int64#1)
-# asm 2: movl   <in13=%r9d,52(<out=%rdi)
-movl   %r9d,52(%rdi)
-
-# qhasm: *(uint32 *) (out + 36) = in9
-# asm 1: movl   <in9=int64#7d,36(<out=int64#1)
-# asm 2: movl   <in9=%eax,36(<out=%rdi)
-movl   %eax,36(%rdi)
-
-# qhasm: in10 = diag0
-# asm 1: movd   <diag0=int6464#1,>in10=int64#4
-# asm 2: movd   <diag0=%xmm0,>in10=%rcx
-movd   %xmm0,%rcx
-
-# qhasm: in6 = diag1
-# asm 1: movd   <diag1=int6464#2,>in6=int64#5
-# asm 2: movd   <diag1=%xmm1,>in6=%r8
-movd   %xmm1,%r8
-
-# qhasm: in2 = diag2
-# asm 1: movd   <diag2=int6464#3,>in2=int64#6
-# asm 2: movd   <diag2=%xmm2,>in2=%r9
-movd   %xmm2,%r9
-
-# qhasm: in14 = diag3
-# asm 1: movd   <diag3=int6464#4,>in14=int64#7
-# asm 2: movd   <diag3=%xmm3,>in14=%rax
-movd   %xmm3,%rax
-
-# qhasm: diag0 <<<= 96
-# asm 1: pshufd $0x39,<diag0=int6464#1,<diag0=int6464#1
-# asm 2: pshufd $0x39,<diag0=%xmm0,<diag0=%xmm0
-pshufd $0x39,%xmm0,%xmm0
-
-# qhasm: diag1 <<<= 96
-# asm 1: pshufd $0x39,<diag1=int6464#2,<diag1=int6464#2
-# asm 2: pshufd $0x39,<diag1=%xmm1,<diag1=%xmm1
-pshufd $0x39,%xmm1,%xmm1
-
-# qhasm: diag2 <<<= 96
-# asm 1: pshufd $0x39,<diag2=int6464#3,<diag2=int6464#3
-# asm 2: pshufd $0x39,<diag2=%xmm2,<diag2=%xmm2
-pshufd $0x39,%xmm2,%xmm2
-
-# qhasm: diag3 <<<= 96
-# asm 1: pshufd $0x39,<diag3=int6464#4,<diag3=int6464#4
-# asm 2: pshufd $0x39,<diag3=%xmm3,<diag3=%xmm3
-pshufd $0x39,%xmm3,%xmm3
-
-# qhasm: (uint32) in10 ^= *(uint32 *) (m + 40)
-# asm 1: xorl 40(<m=int64#2),<in10=int64#4d
-# asm 2: xorl 40(<m=%rsi),<in10=%ecx
-xorl 40(%rsi),%ecx
-
-# qhasm: (uint32) in6 ^= *(uint32 *) (m + 24)
-# asm 1: xorl 24(<m=int64#2),<in6=int64#5d
-# asm 2: xorl 24(<m=%rsi),<in6=%r8d
-xorl 24(%rsi),%r8d
-
-# qhasm: (uint32) in2 ^= *(uint32 *) (m + 8)
-# asm 1: xorl 8(<m=int64#2),<in2=int64#6d
-# asm 2: xorl 8(<m=%rsi),<in2=%r9d
-xorl 8(%rsi),%r9d
-
-# qhasm: (uint32) in14 ^= *(uint32 *) (m + 56)
-# asm 1: xorl 56(<m=int64#2),<in14=int64#7d
-# asm 2: xorl 56(<m=%rsi),<in14=%eax
-xorl 56(%rsi),%eax
-
-# qhasm: *(uint32 *) (out + 40) = in10
-# asm 1: movl   <in10=int64#4d,40(<out=int64#1)
-# asm 2: movl   <in10=%ecx,40(<out=%rdi)
-movl   %ecx,40(%rdi)
-
-# qhasm: *(uint32 *) (out + 24) = in6
-# asm 1: movl   <in6=int64#5d,24(<out=int64#1)
-# asm 2: movl   <in6=%r8d,24(<out=%rdi)
-movl   %r8d,24(%rdi)
-
-# qhasm: *(uint32 *) (out + 8) = in2
-# asm 1: movl   <in2=int64#6d,8(<out=int64#1)
-# asm 2: movl   <in2=%r9d,8(<out=%rdi)
-movl   %r9d,8(%rdi)
-
-# qhasm: *(uint32 *) (out + 56) = in14
-# asm 1: movl   <in14=int64#7d,56(<out=int64#1)
-# asm 2: movl   <in14=%eax,56(<out=%rdi)
-movl   %eax,56(%rdi)
-
-# qhasm: in15 = diag0
-# asm 1: movd   <diag0=int6464#1,>in15=int64#4
-# asm 2: movd   <diag0=%xmm0,>in15=%rcx
-movd   %xmm0,%rcx
-
-# qhasm: in11 = diag1
-# asm 1: movd   <diag1=int6464#2,>in11=int64#5
-# asm 2: movd   <diag1=%xmm1,>in11=%r8
-movd   %xmm1,%r8
-
-# qhasm: in7 = diag2
-# asm 1: movd   <diag2=int6464#3,>in7=int64#6
-# asm 2: movd   <diag2=%xmm2,>in7=%r9
-movd   %xmm2,%r9
-
-# qhasm: in3 = diag3
-# asm 1: movd   <diag3=int6464#4,>in3=int64#7
-# asm 2: movd   <diag3=%xmm3,>in3=%rax
-movd   %xmm3,%rax
-
-# qhasm: (uint32) in15 ^= *(uint32 *) (m + 60)
-# asm 1: xorl 60(<m=int64#2),<in15=int64#4d
-# asm 2: xorl 60(<m=%rsi),<in15=%ecx
-xorl 60(%rsi),%ecx
-
-# qhasm: (uint32) in11 ^= *(uint32 *) (m + 44)
-# asm 1: xorl 44(<m=int64#2),<in11=int64#5d
-# asm 2: xorl 44(<m=%rsi),<in11=%r8d
-xorl 44(%rsi),%r8d
-
-# qhasm: (uint32) in7 ^= *(uint32 *) (m + 28)
-# asm 1: xorl 28(<m=int64#2),<in7=int64#6d
-# asm 2: xorl 28(<m=%rsi),<in7=%r9d
-xorl 28(%rsi),%r9d
-
-# qhasm: (uint32) in3 ^= *(uint32 *) (m + 12)
-# asm 1: xorl 12(<m=int64#2),<in3=int64#7d
-# asm 2: xorl 12(<m=%rsi),<in3=%eax
-xorl 12(%rsi),%eax
-
-# qhasm: *(uint32 *) (out + 60) = in15
-# asm 1: movl   <in15=int64#4d,60(<out=int64#1)
-# asm 2: movl   <in15=%ecx,60(<out=%rdi)
-movl   %ecx,60(%rdi)
-
-# qhasm: *(uint32 *) (out + 44) = in11
-# asm 1: movl   <in11=int64#5d,44(<out=int64#1)
-# asm 2: movl   <in11=%r8d,44(<out=%rdi)
-movl   %r8d,44(%rdi)
-
-# qhasm: *(uint32 *) (out + 28) = in7
-# asm 1: movl   <in7=int64#6d,28(<out=int64#1)
-# asm 2: movl   <in7=%r9d,28(<out=%rdi)
-movl   %r9d,28(%rdi)
-
-# qhasm: *(uint32 *) (out + 12) = in3
-# asm 1: movl   <in3=int64#7d,12(<out=int64#1)
-# asm 2: movl   <in3=%eax,12(<out=%rdi)
-movl   %eax,12(%rdi)
-
-# qhasm:   bytes = bytes_backup
-# asm 1: movq <bytes_backup=stack64#8,>bytes=int64#6
-# asm 2: movq <bytes_backup=408(%rsp),>bytes=%r9
-movq 408(%rsp),%r9
-
-# qhasm:   in8 = ((uint32 *)&x2)[0]
-# asm 1: movl <x2=stack128#2,>in8=int64#4d
-# asm 2: movl <x2=16(%rsp),>in8=%ecx
-movl 16(%rsp),%ecx
-
-# qhasm:   in9 = ((uint32 *)&x3)[1]
-# asm 1: movl 4+<x3=stack128#3,>in9=int64#5d
-# asm 2: movl 4+<x3=32(%rsp),>in9=%r8d
-movl 4+32(%rsp),%r8d
-
-# qhasm:   in8 += 1
-# asm 1: add  $1,<in8=int64#4
-# asm 2: add  $1,<in8=%rcx
-add  $1,%rcx
-
-# qhasm:   in9 <<= 32
-# asm 1: shl  $32,<in9=int64#5
-# asm 2: shl  $32,<in9=%r8
-shl  $32,%r8
-
-# qhasm:   in8 += in9
-# asm 1: add  <in9=int64#5,<in8=int64#4
-# asm 2: add  <in9=%r8,<in8=%rcx
-add  %r8,%rcx
-
-# qhasm:   in9 = in8
-# asm 1: mov  <in8=int64#4,>in9=int64#5
-# asm 2: mov  <in8=%rcx,>in9=%r8
-mov  %rcx,%r8
-
-# qhasm:   (uint64) in9 >>= 32
-# asm 1: shr  $32,<in9=int64#5
-# asm 2: shr  $32,<in9=%r8
-shr  $32,%r8
-
-# qhasm:   ((uint32 *)&x2)[0] = in8
-# asm 1: movl <in8=int64#4d,>x2=stack128#2
-# asm 2: movl <in8=%ecx,>x2=16(%rsp)
-movl %ecx,16(%rsp)
-
-# qhasm:   ((uint32 *)&x3)[1] = in9
-# asm 1: movl <in9=int64#5d,4+<x3=stack128#3
-# asm 2: movl <in9=%r8d,4+<x3=32(%rsp)
-movl %r8d,4+32(%rsp)
-
-# qhasm:                          unsigned>? unsigned<? bytes - 64
-# asm 1: cmp  $64,<bytes=int64#6
-# asm 2: cmp  $64,<bytes=%r9
-cmp  $64,%r9
-# comment:fp stack unchanged by jump
-
-# qhasm:   goto bytesatleast65 if unsigned>
-ja ._bytesatleast65
-# comment:fp stack unchanged by jump
-
-# qhasm:     goto bytesatleast64 if !unsigned<
-jae ._bytesatleast64
-
-# qhasm:       m = out
-# asm 1: mov  <out=int64#1,>m=int64#2
-# asm 2: mov  <out=%rdi,>m=%rsi
-mov  %rdi,%rsi
-
-# qhasm:       out = ctarget
-# asm 1: mov  <ctarget=int64#3,>out=int64#1
-# asm 2: mov  <ctarget=%rdx,>out=%rdi
-mov  %rdx,%rdi
-
-# qhasm:       i = bytes
-# asm 1: mov  <bytes=int64#6,>i=int64#4
-# asm 2: mov  <bytes=%r9,>i=%rcx
-mov  %r9,%rcx
-
-# qhasm:       while (i) { *out++ = *m++; --i }
-rep movsb
-# comment:fp stack unchanged by fallthrough
-
-# qhasm:     bytesatleast64:
-._bytesatleast64:
-# comment:fp stack unchanged by fallthrough
-
-# qhasm:     done:
-._done:
-
-# qhasm:     r11_caller = r11_stack
-# asm 1: movq <r11_stack=stack64#1,>r11_caller=int64#9
-# asm 2: movq <r11_stack=352(%rsp),>r11_caller=%r11
-movq 352(%rsp),%r11
-
-# qhasm:     r12_caller = r12_stack
-# asm 1: movq <r12_stack=stack64#2,>r12_caller=int64#10
-# asm 2: movq <r12_stack=360(%rsp),>r12_caller=%r12
-movq 360(%rsp),%r12
-
-# qhasm:     r13_caller = r13_stack
-# asm 1: movq <r13_stack=stack64#3,>r13_caller=int64#11
-# asm 2: movq <r13_stack=368(%rsp),>r13_caller=%r13
-movq 368(%rsp),%r13
-
-# qhasm:     r14_caller = r14_stack
-# asm 1: movq <r14_stack=stack64#4,>r14_caller=int64#12
-# asm 2: movq <r14_stack=376(%rsp),>r14_caller=%r14
-movq 376(%rsp),%r14
-
-# qhasm:     r15_caller = r15_stack
-# asm 1: movq <r15_stack=stack64#5,>r15_caller=int64#13
-# asm 2: movq <r15_stack=384(%rsp),>r15_caller=%r15
-movq 384(%rsp),%r15
-
-# qhasm:     rbx_caller = rbx_stack
-# asm 1: movq <rbx_stack=stack64#6,>rbx_caller=int64#14
-# asm 2: movq <rbx_stack=392(%rsp),>rbx_caller=%rbx
-movq 392(%rsp),%rbx
-
-# qhasm:     rbp_caller = rbp_stack
-# asm 1: movq <rbp_stack=stack64#7,>rbp_caller=int64#15
-# asm 2: movq <rbp_stack=400(%rsp),>rbp_caller=%rbp
-movq 400(%rsp),%rbp
-
-# qhasm:     leave
-add %r11,%rsp
-xor %rax,%rax
-xor %rdx,%rdx
-ret
-
-# qhasm:   bytesatleast65:
-._bytesatleast65:
-
-# qhasm:   bytes -= 64
-# asm 1: sub  $64,<bytes=int64#6
-# asm 2: sub  $64,<bytes=%r9
-sub  $64,%r9
-
-# qhasm:   out += 64
-# asm 1: add  $64,<out=int64#1
-# asm 2: add  $64,<out=%rdi
-add  $64,%rdi
-
-# qhasm:   m += 64
-# asm 1: add  $64,<m=int64#2
-# asm 2: add  $64,<m=%rsi
-add  $64,%rsi
-# comment:fp stack unchanged by jump
-
-# qhasm: goto bytesbetween1and255
-jmp ._bytesbetween1and255
diff --git a/include/ZeroTierDebug.h b/include/ZeroTierDebug.h
deleted file mode 100644
index 2e9cc2c5a..000000000
--- a/include/ZeroTierDebug.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-/**
- * @file
- *
- * Debug macros
- */
-
-#ifndef ZT_DEBUG_H
-#define ZT_DEBUG_H
-
-#if defined(__linux__) || defined(__APPLE__)
-#include <pthread.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#endif
-
-#include <string.h>
-
-#define ZT_MSG_INFO true
-#define ZT_COLOR    true
-
-// Debug output colors
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#endif
-#if defined(ZT_COLOR) && ! defined(_WIN32) && ! defined(__ANDROID__) && ! defined(TARGET_OS_IPHONE) && ! defined(TARGET_IPHONE_SIMULATOR) && ! defined(__APP_FRAMEWORK__)
-#define ZT_RED   "\x1B[31m"
-#define ZT_GRN   "\x1B[32m"
-#define ZT_YEL   "\x1B[33m"
-#define ZT_BLU   "\x1B[34m"
-#define ZT_MAG   "\x1B[35m"
-#define ZT_CYN   "\x1B[36m"
-#define ZT_WHT   "\x1B[37m"
-#define ZT_RESET "\x1B[0m"
-#else
-#define ZT_RED
-#define ZT_GRN
-#define ZT_YEL
-#define ZT_BLU
-#define ZT_MAG
-#define ZT_CYN
-#define ZT_WHT
-#define ZT_RESET
-#endif
-
-#define ZT_FILENAME (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)   // short
-
-#ifdef __linux__
-#define ZT_THREAD_ID (long)0   // syscall(SYS_gettid)
-#endif
-#ifdef __APPLE__
-#define ZT_THREAD_ID (long)0   // (long)gettid()
-#endif
-#ifdef __FreeBSD__
-#define ZT_THREAD_ID (long)0   // (long)gettid()
-#endif
-#ifdef _WIN32
-#define ZT_THREAD_ID (long)0   //
-#endif
-#if defined(__JNI_LIB__)
-#include <jni.h>
-#endif
-#if defined(__ANDROID__)
-#include <android/log.h>
-#define ZT_LOG_TAG "ZTSDK"
-#endif
-#if defined(ZT_DEBUG_TRACE)
-#if ZT_MSG_INFO == true
-#if defined(__ANDROID__)
-#define DEBUG_INFO(fmt, args...) ((void)__android_log_print(ANDROID_LOG_VERBOSE, ZT_LOG_TAG, "INFO : %17s:%5d:%20s: " fmt "\n", ZT_FILENAME, __LINE__, __FUNCTION__, ##args))
-#endif
-#if defined(_WIN32)
-#define DEBUG_INFO(fmt, ...) fprintf(stderr, ZT_GRN "INFO [%ld]: %17s:%5d:%25s: " fmt "\n" ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, __VA_ARGS__)
-#endif
-#if defined(__linux__) or defined(__APPLE__) or defined(__FreeBSD__)
-#define DEBUG_INFO(fmt, args...) fprintf(stderr, ZT_GRN "INFO [%ld]: %17s:%5d:%25s: " fmt "\n" ZT_RESET, ZT_THREAD_ID, ZT_FILENAME, __LINE__, __FUNCTION__, ##args)
-#endif
-#else
-#define DEBUG_INFO(fmt, args...)
-#endif
-#else   // blank
-#if defined(_WIN32)
-#define DEBUG_INFO(...)
-#else
-#define DEBUG_INFO(fmt, args...)
-#endif
-#endif
-
-#endif   // _H
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h
index 8aa701a8f..b77cc820b 100644
--- a/include/ZeroTierOne.h
+++ b/include/ZeroTierOne.h
@@ -1,65 +1,43 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 /*
  * This defines the external C API for ZeroTier's core network virtualization
  * engine.
  */
 
-#ifndef ZT_ZEROTIER_API_H
-#define ZT_ZEROTIER_API_H
+#ifndef ZT_ZEROTIERONE_H
+#define ZT_ZEROTIERONE_H
 
 #include <stdint.h>
 
 // For the struct sockaddr_storage structure
 #if defined(_WIN32) || defined(_WIN64)
-// clang-format off
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-// clang-format on
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+#include <Windows.h>
 #else /* not Windows */
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #endif /* Windows or not */
 
-#if defined(_MSC_VER)
-#ifdef ZT_EXPORT
-#define ZT_SDK_API __declspec(dllexport)
-#else
-#define ZT_SDK_API __declspec(dllimport)
-#if ! defined(ZT_SDK)
-#ifdef _DEBUG
-#ifdef _WIN64
-#pragma comment(lib, "ZeroTierOne_x64d.lib")
-#else
-#pragma comment(lib, "ZeroTierOne_x86d.lib")
-#endif
-#else
-#ifdef _WIN64
-#pragma comment(lib, "ZeroTierOne_x64.lib")
-#else
-#pragma comment(lib, "ZeroTierOne_x86.lib")
-#endif
-#endif
-#endif
-#endif
-#else
-#define ZT_SDK_API
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -73,54 +51,30 @@ extern "C" {
  */
 #define ZT_DEFAULT_PORT 9993
 
-/**
- * Minimum MTU, which is the minimum allowed by IPv6 and several specs
- */
-#define ZT_MIN_MTU 1280
-
 /**
  * Maximum MTU for ZeroTier virtual networks
- */
-#define ZT_MAX_MTU 10000
-
-/**
- * Minimum UDP payload size allowed
- */
-#define ZT_MIN_PHYSMTU 510
-
-/**
- * Maximum physical interface name length. This number is gigantic because of Windows.
- */
-#define ZT_MAX_PHYSIFNAME 256
-
-/**
- * Default UDP payload size (physical path MTU) not including UDP and IP overhead
  *
- * This is small enough for PPPoE and for Google Cloud's bizarrely tiny MTUs.
- * A 2800 byte payload still fits into two packets, so this should not impact
- * real world throughput at all vs the previous default of 1444.
+ * This is pretty much an unchangeable global constant. To make it change
+ * across nodes would require logic to send ICMP packet too big messages,
+ * which would complicate things. 1500 has been good enough on most LANs
+ * for ages, so a larger MTU should be fine for the forseeable future. This
+ * typically results in two UDP packets per single large frame. Experimental
+ * results seem to show that this is good. Larger MTUs resulting in more
+ * fragments seemed too brittle on slow/crummy links for no benefit.
+ *
+ * If this does change, also change it in tap.h in the tuntaposx code under
+ * mac-tap.
+ *
+ * Overhead for a normal frame split into two packets:
+ *
+ * 1414 = 1444 (typical UDP MTU) - 28 (packet header) - 2 (ethertype)
+ * 1428 = 1444 (typical UDP MTU) - 16 (fragment header)
+ * SUM: 2842
+ *
+ * We use 2800, which leaves some room for other payload in other types of
+ * messages such as multicast propagation or future support for bridging.
  */
-#define ZT_DEFAULT_PHYSMTU 1432
-
-/**
- * Maximum physical UDP payload
- */
-#define ZT_MAX_PHYSPAYLOAD 10100
-
-/**
- * Headroom for max physical MTU
- */
-#define ZT_MAX_HEADROOM 224
-
-/**
- * Maximum payload MTU for UDP packets
- */
-#define ZT_MAX_PHYSMTU (ZT_MAX_PHYSPAYLOAD + ZT_MAX_HEADROOM)
-
-/**
- * Maximum size of a remote trace message's serialized Dictionary
- */
-#define ZT_MAX_REMOTE_TRACE_SIZE 10000
+#define ZT_MAX_MTU 2800
 
 /**
  * Maximum length of network short name
@@ -128,9 +82,9 @@ extern "C" {
 #define ZT_MAX_NETWORK_SHORT_NAME_LENGTH 127
 
 /**
- * Maximum number of pushed routes on a network
+ * Maximum number of local routes on a network
  */
-#define ZT_MAX_NETWORK_ROUTES 128
+#define ZT_MAX_NETWORK_LOCAL_ROUTES 32
 
 /**
  * Maximum number of statically assigned IP addresses per network endpoint using ZT address management (not DHCP)
@@ -138,229 +92,82 @@ extern "C" {
 #define ZT_MAX_ZT_ASSIGNED_ADDRESSES 32
 
 /**
- * Maximum number of "specialists" on a network -- bridges, relays, etc.
+ * Maximum number of default routes / gateways on a network (ZT managed)
  */
-#define ZT_MAX_NETWORK_SPECIALISTS 256
+#define ZT_MAX_NETWORK_GATEWAYS 8
+
+/**
+ * Maximum number of active bridges on a network
+ */
+#define ZT_MAX_NETWORK_ACTIVE_BRIDGES 256
+
+/**
+ * Maximum number of static devices on a network
+ */
+#define ZT_MAX_NETWORK_STATIC_DEVICES 32
+
+/**
+ * Maximum number of rules per network (can be increased)
+ */
+#define ZT_MAX_NETWORK_RULES 64
 
 /**
  * Maximum number of multicast group subscriptions per network
  */
 #define ZT_MAX_NETWORK_MULTICAST_SUBSCRIPTIONS 4096
 
-/**
- * Rules engine revision ID, which specifies rules engine capabilities
- */
-#define ZT_RULES_ENGINE_REVISION 1
-
-/**
- * Maximum number of base (non-capability) network rules
- */
-#define ZT_MAX_NETWORK_RULES 1024
-
-/**
- * Maximum number of per-member capabilities per network
- */
-#define ZT_MAX_NETWORK_CAPABILITIES 128
-
-/**
- * Maximum number of per-member tags per network
- */
-#define ZT_MAX_NETWORK_TAGS 128
-
 /**
  * Maximum number of direct network paths to a given peer
  */
-#define ZT_MAX_PEER_NETWORK_PATHS 64
+#define ZT_MAX_PEER_NETWORK_PATHS 4
 
 /**
- * Maximum number of path configurations that can be set
+ * Feature flag: ZeroTier One was built to be thread-safe -- concurrent processXXX() calls are okay
  */
-#define ZT_MAX_CONFIGURABLE_PATHS 32
+#define ZT_FEATURE_FLAG_THREAD_SAFE 0x00000001
 
 /**
- * Maximum number of rules per capability
+ * Feature flag: FIPS compliant build (not available yet, but reserved for future use if we ever do this)
  */
-#define ZT_MAX_CAPABILITY_RULES 64
+#define ZT_FEATURE_FLAG_FIPS 0x00000002
 
 /**
- * Maximum number of certificates of ownership to assign to a single network member
+ * Maximum number of hops in a ZeroTier circuit test
+ *
+ * This is more or less the max that can be fit in a given packet (with
+ * fragmentation) and only one address per hop.
  */
-#define ZT_MAX_CERTIFICATES_OF_OWNERSHIP 4
+#define ZT_CIRCUIT_TEST_MAX_HOPS 256
 
 /**
- * Global maximum length for capability chain of custody (including initial issue)
+ * Maximum number of addresses per hop in a circuit test
  */
-#define ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH 7
+#define ZT_CIRCUIT_TEST_MAX_HOP_BREADTH 8
 
 /**
- * Maximum number of multicast groups a device / network interface can be subscribed to at once
+ * Maximum number of cluster members (and max member ID plus one)
  */
-#define ZT_MAX_MULTICAST_SUBSCRIPTIONS 1024
+#define ZT_CLUSTER_MAX_MEMBERS 128
 
 /**
- * Maximum value for link quality (min is 0)
+ * Maximum number of physical ZeroTier addresses a cluster member can report
  */
-#define ZT_PATH_LINK_QUALITY_MAX 0xff
+#define ZT_CLUSTER_MAX_ZT_PHYSICAL_ADDRESSES 16
 
 /**
- * Maximum number of DNS servers per domain
+ * Maximum allowed cluster message length in bytes
  */
-#define ZT_MAX_DNS_SERVERS 4
+#define ZT_CLUSTER_MAX_MESSAGE_LENGTH (1500 - 48)
 
 /**
- * Packet characteristics flag: packet direction, 1 if inbound 0 if outbound
+ * This device is a network preferred relay
  */
-#define ZT_RULE_PACKET_CHARACTERISTICS_INBOUND 0x8000000000000000ULL
+#define ZT_NETWORK_STATIC_DEVICE_IS_RELAY 0x0001
 
 /**
- * Packet characteristics flag: multicast or broadcast destination MAC
+ * A null/empty sockaddr (all zero) to signify an unspecified socket address
  */
-#define ZT_RULE_PACKET_CHARACTERISTICS_MULTICAST 0x4000000000000000ULL
-
-/**
- * Packet characteristics flag: broadcast destination MAC
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_BROADCAST 0x2000000000000000ULL
-
-/**
- * Packet characteristics flag: sending IP address has a certificate of ownership
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_SENDER_IP_AUTHENTICATED 0x1000000000000000ULL
-
-/**
- * Packet characteristics flag: sending MAC address has a certificate of ownership
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_SENDER_MAC_AUTHENTICATED 0x0800000000000000ULL
-
-/**
- * Packet characteristics flag: TCP left-most reserved bit
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_RESERVED_0 0x0000000000000800ULL
-
-/**
- * Packet characteristics flag: TCP middle reserved bit
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_RESERVED_1 0x0000000000000400ULL
-
-/**
- * Packet characteristics flag: TCP right-most reserved bit
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_RESERVED_2 0x0000000000000200ULL
-
-/**
- * Packet characteristics flag: TCP NS flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_NS 0x0000000000000100ULL
-
-/**
- * Packet characteristics flag: TCP CWR flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_CWR 0x0000000000000080ULL
-
-/**
- * Packet characteristics flag: TCP ECE flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_ECE 0x0000000000000040ULL
-
-/**
- * Packet characteristics flag: TCP URG flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_URG 0x0000000000000020ULL
-
-/**
- * Packet characteristics flag: TCP ACK flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_ACK 0x0000000000000010ULL
-
-/**
- * Packet characteristics flag: TCP PSH flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_PSH 0x0000000000000008ULL
-
-/**
- * Packet characteristics flag: TCP RST flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_RST 0x0000000000000004ULL
-
-/**
- * Packet characteristics flag: TCP SYN flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_SYN 0x0000000000000002ULL
-
-/**
- * Packet characteristics flag: TCP FIN flag
- */
-#define ZT_RULE_PACKET_CHARACTERISTICS_TCP_FIN 0x0000000000000001ULL
-
-// Fields in remote trace dictionaries
-#define ZT_REMOTE_TRACE_FIELD__EVENT                        "event"
-#define ZT_REMOTE_TRACE_FIELD__NODE_ID                      "nodeId"
-#define ZT_REMOTE_TRACE_FIELD__PACKET_ID                    "packetId"
-#define ZT_REMOTE_TRACE_FIELD__PACKET_VERB                  "packetVerb"
-#define ZT_REMOTE_TRACE_FIELD__PACKET_TRUSTED_PATH_ID       "packetTrustedPathId"
-#define ZT_REMOTE_TRACE_FIELD__PACKET_TRUSTED_PATH_APPROVED "packetTrustedPathApproved"
-#define ZT_REMOTE_TRACE_FIELD__PACKET_HOPS                  "packetHops"
-#define ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR                "remoteZtAddr"
-#define ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR               "remotePhyAddr"
-#define ZT_REMOTE_TRACE_FIELD__LOCAL_ZTADDR                 "localZtAddr"
-#define ZT_REMOTE_TRACE_FIELD__LOCAL_PHYADDR                "localPhyAddr"
-#define ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET                 "localSocket"
-#define ZT_REMOTE_TRACE_FIELD__IP_SCOPE                     "phyAddrIpScope"
-#define ZT_REMOTE_TRACE_FIELD__NETWORK_ID                   "networkId"
-#define ZT_REMOTE_TRACE_FIELD__SOURCE_ZTADDR                "sourceZtAddr"
-#define ZT_REMOTE_TRACE_FIELD__DEST_ZTADDR                  "destZtAddr"
-#define ZT_REMOTE_TRACE_FIELD__SOURCE_MAC                   "sourceMac"
-#define ZT_REMOTE_TRACE_FIELD__DEST_MAC                     "destMac"
-#define ZT_REMOTE_TRACE_FIELD__ETHERTYPE                    "etherType"
-#define ZT_REMOTE_TRACE_FIELD__VLAN_ID                      "vlanId"
-#define ZT_REMOTE_TRACE_FIELD__FRAME_LENGTH                 "frameLength"
-#define ZT_REMOTE_TRACE_FIELD__FRAME_DATA                   "frameData"
-#define ZT_REMOTE_TRACE_FIELD__FILTER_FLAG_NOTEE            "filterNoTee"
-#define ZT_REMOTE_TRACE_FIELD__FILTER_FLAG_INBOUND          "filterInbound"
-#define ZT_REMOTE_TRACE_FIELD__FILTER_RESULT                "filterResult"
-#define ZT_REMOTE_TRACE_FIELD__FILTER_BASE_RULE_LOG         "filterBaseRuleLog"
-#define ZT_REMOTE_TRACE_FIELD__FILTER_CAP_RULE_LOG          "filterCapRuleLog"
-#define ZT_REMOTE_TRACE_FIELD__FILTER_CAP_ID                "filterMatchingCapId"
-#define ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE              "credType"
-#define ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID                "credId"
-#define ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP         "credTs"
-#define ZT_REMOTE_TRACE_FIELD__CREDENTIAL_INFO              "credInfo"
-#define ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO         "credIssuedTo"
-#define ZT_REMOTE_TRACE_FIELD__CREDENTIAL_REVOCATION_TARGET "credRevocationTarget"
-#define ZT_REMOTE_TRACE_FIELD__REASON                       "reason"
-#define ZT_REMOTE_TRACE_FIELD__NETWORK_CONTROLLER_ID        "networkControllerId"
-
-// Event types in remote traces
-#define ZT_REMOTE_TRACE_EVENT__RESETTING_PATHS_IN_SCOPE       0x1000
-#define ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH   0x1001
-#define ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH          0x1002
-#define ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED                0x1003
-#define ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE             0x1004
-#define ZT_REMOTE_TRACE_EVENT__PACKET_INVALID                 0x1005
-#define ZT_REMOTE_TRACE_EVENT__DROPPED_HELLO                  0x1006
-#define ZT_REMOTE_TRACE_EVENT__OUTGOING_NETWORK_FRAME_DROPPED 0x2000
-#define ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_ACCESS_DENIED 0x2001
-#define ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_FRAME_DROPPED 0x2002
-#define ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED            0x2003
-#define ZT_REMOTE_TRACE_EVENT__CREDENTIAL_ACCEPTED            0x2004
-#define ZT_REMOTE_TRACE_EVENT__NETWORK_CONFIG_REQUEST_SENT    0x2005
-#define ZT_REMOTE_TRACE_EVENT__NETWORK_FILTER_TRACE           0x2006
-
-// Event types in remote traces in hex string form
-#define ZT_REMOTE_TRACE_EVENT__RESETTING_PATHS_IN_SCOPE_S       "1000"
-#define ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH_S   "1001"
-#define ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH_S          "1002"
-#define ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED_S                "1003"
-#define ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE_S             "1004"
-#define ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S                 "1005"
-#define ZT_REMOTE_TRACE_EVENT__DROPPED_HELLO_S                  "1006"
-#define ZT_REMOTE_TRACE_EVENT__OUTGOING_NETWORK_FRAME_DROPPED_S "2000"
-#define ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_ACCESS_DENIED_S "2001"
-#define ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_FRAME_DROPPED_S "2002"
-#define ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S            "2003"
-#define ZT_REMOTE_TRACE_EVENT__CREDENTIAL_ACCEPTED_S            "2004"
-#define ZT_REMOTE_TRACE_EVENT__NETWORK_CONFIG_REQUEST_SENT_S    "2005"
-#define ZT_REMOTE_TRACE_EVENT__NETWORK_FILTER_TRACE_S           "2006"
+extern const struct sockaddr_storage ZT_SOCKADDR_NULL;
 
 /****************************************************************************/
 /* Structures and other types                                               */
@@ -374,1132 +181,919 @@ extern "C" {
  * indicate serious problems like an inaccessible data store or a compile
  * problem.
  */
-enum ZT_ResultCode {
-    /**
-     * Operation completed normally
-     */
-    ZT_RESULT_OK = 0,
+enum ZT_ResultCode
+{
+	/**
+	 * Operation completed normally
+	 */
+	ZT_RESULT_OK = 0,
 
-    /**
-     * Call produced no error but no action was taken
-     */
-    ZT_RESULT_OK_IGNORED = 1,
+	// Fatal errors (>0, <1000)
 
-    // Fatal errors (>=100, <1000)
+	/**
+	 * Ran out of memory
+	 */
+	ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY = 1,
 
-    /**
-     * Ran out of memory
-     */
-    ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY = 100,
+	/**
+	 * Data store is not writable or has failed
+	 */
+	ZT_RESULT_FATAL_ERROR_DATA_STORE_FAILED = 2,
 
-    /**
-     * Data store is not writable or has failed
-     */
-    ZT_RESULT_FATAL_ERROR_DATA_STORE_FAILED = 101,
+	/**
+	 * Internal error (e.g. unexpected exception indicating bug or build problem)
+	 */
+	ZT_RESULT_FATAL_ERROR_INTERNAL = 3,
 
-    /**
-     * Internal error (e.g. unexpected exception indicating bug or build problem)
-     */
-    ZT_RESULT_FATAL_ERROR_INTERNAL = 102,
+	// Non-fatal errors (>1000)
 
-    // Non-fatal errors (>1000)
+	/**
+	 * Network ID not valid
+	 */
+	ZT_RESULT_ERROR_NETWORK_NOT_FOUND = 1000,
 
-    /**
-     * Network ID not valid
-     */
-    ZT_RESULT_ERROR_NETWORK_NOT_FOUND = 1000,
+	/**
+	 * The requested operation is not supported on this version or build
+	 */
+	ZT_RESULT_ERROR_UNSUPPORTED_OPERATION = 1001,
 
-    /**
-     * The requested operation is not supported on this version or build
-     */
-    ZT_RESULT_ERROR_UNSUPPORTED_OPERATION = 1001,
-
-    /**
-     * The requested operation was given a bad parameter or was called in an invalid state
-     */
-    ZT_RESULT_ERROR_BAD_PARAMETER = 1002
+	/**
+	 * The requestion operation was given a bad parameter or was called in an invalid state
+	 */
+	ZT_RESULT_ERROR_BAD_PARAMETER = 1002
 };
 
 /**
  * @param x Result code
  * @return True if result code indicates a fatal error
  */
-#define ZT_ResultCode_isFatal(x) ((((int)(x)) >= 100) && (((int)(x)) < 1000))
+#define ZT_ResultCode_isFatal(x) ((((int)(x)) > 0)&&(((int)(x)) < 1000))
 
 /**
  * Status codes sent to status update callback when things happen
  */
-enum ZT_Event {
-    /**
-     * Node has been initialized
-     *
-     * This is the first event generated, and is always sent. It may occur
-     * before Node's constructor returns.
-     *
-     * Meta-data: none
-     */
-    ZT_EVENT_UP = 0,
+enum ZT_Event
+{
+	/**
+	 * Node has been initialized
+	 *
+	 * This is the first event generated, and is always sent. It may occur
+	 * before Node's constructor returns.
+	 *
+	 * Meta-data: none
+	 */
+	ZT_EVENT_UP = 0,
 
-    /**
-     * Node is offline -- network does not seem to be reachable by any available strategy
-     *
-     * Meta-data: none
-     */
-    ZT_EVENT_OFFLINE = 1,
+	/**
+	 * Node is offline -- network does not seem to be reachable by any available strategy
+	 *
+	 * Meta-data: none
+	 */
+	ZT_EVENT_OFFLINE = 1,
 
-    /**
-     * Node is online -- at least one upstream node appears reachable
-     *
-     * Meta-data: none
-     */
-    ZT_EVENT_ONLINE = 2,
+	/**
+	 * Node is online -- at least one upstream node appears reachable
+	 *
+	 * Meta-data: none
+	 */
+	ZT_EVENT_ONLINE = 2,
 
-    /**
-     * Node is shutting down
-     *
-     * This is generated within Node's destructor when it is being shut down.
-     * It's done for convenience, since cleaning up other state in the event
-     * handler may appear more idiomatic.
-     *
-     * Meta-data: none
-     */
-    ZT_EVENT_DOWN = 3,
+	/**
+	 * Node is shutting down
+	 *
+	 * This is generated within Node's destructor when it is being shut down.
+	 * It's done for convenience, since cleaning up other state in the event
+	 * handler may appear more idiomatic.
+	 *
+	 * Meta-data: none
+	 */
+	ZT_EVENT_DOWN = 3,
 
-    /**
-     * Your identity has collided with another node's ZeroTier address
-     *
-     * This happens if two different public keys both hash (via the algorithm
-     * in Identity::generate()) to the same 40-bit ZeroTier address.
-     *
-     * This is something you should "never" see, where "never" is defined as
-     * once per 2^39 new node initializations / identity creations. If you do
-     * see it, you're going to see it very soon after a node is first
-     * initialized.
-     *
-     * This is reported as an event rather than a return code since it's
-     * detected asynchronously via error messages from authoritative nodes.
-     *
-     * If this occurs, you must shut down and delete the node, delete the
-     * identity.secret record/file from the data store, and restart to generate
-     * a new identity. If you don't do this, you will not be able to communicate
-     * with other nodes.
-     *
-     * We'd automate this process, but we don't think silently deleting
-     * private keys or changing our address without telling the calling code
-     * is good form. It violates the principle of least surprise.
-     *
-     * You can technically get away with not handling this, but we recommend
-     * doing so in a mature reliable application. Besides, handling this
-     * condition is a good way to make sure it never arises. It's like how
-     * umbrellas prevent rain and smoke detectors prevent fires. They do, right?
-     *
-     * Meta-data: none
-     */
-    ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION = 4,
+	/**
+	 * Your identity has collided with another node's ZeroTier address
+	 *
+	 * This happens if two different public keys both hash (via the algorithm
+	 * in Identity::generate()) to the same 40-bit ZeroTier address.
+	 *
+	 * This is something you should "never" see, where "never" is defined as
+	 * once per 2^39 new node initializations / identity creations. If you do
+	 * see it, you're going to see it very soon after a node is first
+	 * initialized.
+	 *
+	 * This is reported as an event rather than a return code since it's
+	 * detected asynchronously via error messages from authoritative nodes.
+	 *
+	 * If this occurs, you must shut down and delete the node, delete the
+	 * identity.secret record/file from the data store, and restart to generate
+	 * a new identity. If you don't do this, you will not be able to communicate
+	 * with other nodes.
+	 *
+	 * We'd automate this process, but we don't think silently deleting
+	 * private keys or changing our address without telling the calling code
+	 * is good form. It violates the principle of least surprise.
+	 *
+	 * You can technically get away with not handling this, but we recommend
+	 * doing so in a mature reliable application. Besides, handling this
+	 * condition is a good way to make sure it never arises. It's like how
+	 * umbrellas prevent rain and smoke detectors prevent fires. They do, right?
+	 *
+	 * Meta-data: none
+	 */
+	ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION = 4,
 
-    /**
-     * Trace (debugging) message
-     *
-     * These events are only generated if this is a TRACE-enabled build.
-     *
-     * Meta-data: C string, TRACE message
-     */
-    ZT_EVENT_TRACE = 5,
-
-    /**
-     * VERB_USER_MESSAGE received
-     *
-     * These are generated when a VERB_USER_MESSAGE packet is received via
-     * ZeroTier VL1.
-     *
-     * Meta-data: ZT_UserMessage structure
-     */
-    ZT_EVENT_USER_MESSAGE = 6,
-
-    /**
-     * Remote trace received
-     *
-     * These are generated when a VERB_REMOTE_TRACE is received. Note
-     * that any node can fling one of these at us. It is your responsibility
-     * to filter and determine if it's worth paying attention to. If it's
-     * not just drop it. Most nodes that are not active controllers ignore
-     * these, and controllers only save them if they pertain to networks
-     * with remote tracing enabled.
-     *
-     * Meta-data: ZT_RemoteTrace structure
-     */
-    ZT_EVENT_REMOTE_TRACE = 7
+	/**
+	 * Trace (debugging) message
+	 *
+	 * These events are only generated if this is a TRACE-enabled build.
+	 *
+	 * Meta-data: C string, TRACE message
+	 */
+	ZT_EVENT_TRACE = 5
 };
 
-/**
- * Payload of REMOTE_TRACE event
- */
-typedef struct {
-    /**
-     * ZeroTier address of sender
-     */
-    uint64_t origin;
-
-    /**
-     * Null-terminated Dictionary containing key/value pairs sent by origin
-     *
-     * This *should* be a dictionary, but the implementation only checks
-     * that it is a valid non-empty C-style null-terminated string. Be very
-     * careful to use a well-tested parser to parse this as it represents
-     * data received from a potentially un-trusted peer on the network.
-     * Invalid payloads should be dropped.
-     *
-     * The contents of data[] may be modified.
-     */
-    char* data;
-
-    /**
-     * Length of dict[] in bytes, including terminating null
-     */
-    unsigned int len;
-} ZT_RemoteTrace;
-
-/**
- * User message used with ZT_EVENT_USER_MESSAGE
- *
- * These are direct VL1 P2P messages for application use. Encryption and
- * authentication in the ZeroTier protocol will guarantee the origin
- * address and message content, but you are responsible for any other
- * levels of authentication or access control that are required. Any node
- * in the world can send you a user message! (Unless your network is air
- * gapped.)
- */
-typedef struct {
-    /**
-     * ZeroTier address of sender (least significant 40 bits)
-     */
-    uint64_t origin;
-
-    /**
-     * User message type ID
-     */
-    uint64_t typeId;
-
-    /**
-     * User message data (not including type ID)
-     */
-    const void* data;
-
-    /**
-     * Length of data in bytes
-     */
-    unsigned int length;
-} ZT_UserMessage;
-
 /**
  * Current node status
  */
-typedef struct {
-    /**
-     * 40-bit ZeroTier address of this node
-     */
-    uint64_t address;
+typedef struct
+{
+	/**
+	 * 40-bit ZeroTier address of this node
+	 */
+	uint64_t address;
 
-    /**
-     * Public identity in string-serialized form (safe to send to others)
-     *
-     * This pointer will remain valid as long as the node exists.
-     */
-    const char* publicIdentity;
+	/**
+	 * Current world ID
+	 */
+	uint64_t worldId;
 
-    /**
-     * Full identity including secret key in string-serialized form
-     *
-     * This pointer will remain valid as long as the node exists.
-     */
-    const char* secretIdentity;
+	/**
+	 * Current world revision/timestamp
+	 */
+	uint64_t worldTimestamp;
 
-    /**
-     * True if some kind of connectivity appears available
-     */
-    int online;
+	/**
+	 * Public identity in string-serialized form (safe to send to others)
+	 *
+	 * This pointer will remain valid as long as the node exists.
+	 */
+	const char *publicIdentity;
+
+	/**
+	 * Full identity including secret key in string-serialized form
+	 *
+	 * This pointer will remain valid as long as the node exists.
+	 */
+	const char *secretIdentity;
+
+	/**
+	 * True if some kind of connectivity appears available
+	 */
+	int online;
 } ZT_NodeStatus;
 
-/**
- * Internal node statistics
- *
- * This structure is subject to change between versions.
- */
-typedef struct {
-    /**
-     * Number of each protocol verb (possible verbs 0..31) received
-     */
-    uint64_t inVerbCounts[32];
-
-    /**
-     * Number of bytes for each protocol verb received
-     */
-    uint64_t inVerbBytes[32];
-} ZT_NodeStatistics;
-
 /**
  * Virtual network status codes
  */
-enum ZT_VirtualNetworkStatus {
-    /**
-     * Waiting for network configuration (also means revision == 0)
-     */
-    ZT_NETWORK_STATUS_REQUESTING_CONFIGURATION = 0,
+enum ZT_VirtualNetworkStatus
+{
+	/**
+	 * Waiting for network configuration (also means revision == 0)
+	 */
+	ZT_NETWORK_STATUS_REQUESTING_CONFIGURATION = 0,
 
-    /**
-     * Configuration received and we are authorized
-     */
-    ZT_NETWORK_STATUS_OK = 1,
+	/**
+	 * Configuration received and we are authorized
+	 */
+	ZT_NETWORK_STATUS_OK = 1,
 
-    /**
-     * Netconf master told us 'nope'
-     */
-    ZT_NETWORK_STATUS_ACCESS_DENIED = 2,
+	/**
+	 * Netconf master told us 'nope'
+	 */
+	ZT_NETWORK_STATUS_ACCESS_DENIED = 2,
 
-    /**
-     * Netconf master exists, but this virtual network does not
-     */
-    ZT_NETWORK_STATUS_NOT_FOUND = 3,
+	/**
+	 * Netconf master exists, but this virtual network does not
+	 */
+	ZT_NETWORK_STATUS_NOT_FOUND = 3,
 
-    /**
-     * Initialization of network failed or other internal error
-     */
-    ZT_NETWORK_STATUS_PORT_ERROR = 4,
+	/**
+	 * Initialization of network failed or other internal error
+	 */
+	ZT_NETWORK_STATUS_PORT_ERROR = 4,
 
-    /**
-     * ZeroTier core version too old
-     */
-    ZT_NETWORK_STATUS_CLIENT_TOO_OLD = 5,
-
-    /**
-     * External authentication is required (e.g. SSO)
-     */
-    ZT_NETWORK_STATUS_AUTHENTICATION_REQUIRED = 6
+	/**
+	 * ZeroTier One version too old
+	 */
+	ZT_NETWORK_STATUS_CLIENT_TOO_OLD = 5
 };
 
+/**
+ * A network-scope defined static device entry
+ *
+ * Statically defined devices can have pre-specified endpoint addresses
+ * and can serve as things like network-specific relays.
+ */
+typedef struct
+{
+	/**
+	 * ZeroTier address (least significant 40 bits, other bits ignored)
+	 */
+	uint64_t address;
+
+	/**
+	 * Physical address or zero ss_family if unspecified (two entries to support both V4 and V6)
+	 */
+	struct sockaddr_storage physical[2];
+
+	/**
+	 * Flags indicating roles (if any) and restrictions
+	 */
+	unsigned int flags;
+} ZT_VirtualNetworkStaticDevice;
+
 /**
  * Virtual network type codes
  */
-enum ZT_VirtualNetworkType {
-    /**
-     * Private networks are authorized via certificates of membership
-     */
-    ZT_NETWORK_TYPE_PRIVATE = 0,
+enum ZT_VirtualNetworkType
+{
+	/**
+	 * Private networks are authorized via certificates of membership
+	 */
+	ZT_NETWORK_TYPE_PRIVATE = 0,
 
-    /**
-     * Public networks have no access control -- they'll always be AUTHORIZED
-     */
-    ZT_NETWORK_TYPE_PUBLIC = 1
+	/**
+	 * Public networks have no access control -- they'll always be AUTHORIZED
+	 */
+	ZT_NETWORK_TYPE_PUBLIC = 1
 };
 
 /**
- * The type of a virtual network rules table entry
- *
- * These must be from 0 to 63 since the most significant two bits of each
- * rule type are NOT (MSB) and AND/OR.
- *
- * Each rule is composed of zero or more MATCHes followed by an ACTION.
- * An ACTION with no MATCHes is always taken.
+ * An action in a network rule
  */
-enum ZT_VirtualNetworkRuleType {
-    // 0 to 15 reserved for actions
-
-    /**
-     * Drop frame
-     */
-    ZT_NETWORK_RULE_ACTION_DROP = 0,
-
-    /**
-     * Accept and pass frame
-     */
-    ZT_NETWORK_RULE_ACTION_ACCEPT = 1,
-
-    /**
-     * Forward a copy of this frame to an observer (by ZT address)
-     */
-    ZT_NETWORK_RULE_ACTION_TEE = 2,
-
-    /**
-     * Exactly like TEE but mandates ACKs from observer
-     */
-    ZT_NETWORK_RULE_ACTION_WATCH = 3,
-
-    /**
-     * Drop and redirect this frame to another node (by ZT address)
-     */
-    ZT_NETWORK_RULE_ACTION_REDIRECT = 4,
-
-    /**
-     * Stop evaluating rule set (drops unless there are capabilities, etc.)
-     */
-    ZT_NETWORK_RULE_ACTION_BREAK = 5,
-
-    /**
-     * Place a matching frame in the specified QoS bucket
-     */
-    ZT_NETWORK_RULE_ACTION_PRIORITY = 6,
-
-    /**
-     * Maximum ID for an ACTION, anything higher is a MATCH
-     */
-    ZT_NETWORK_RULE_ACTION__MAX_ID = 15,
-
-    // 16 to 63 reserved for match criteria
-
-    ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS = 24,
-    ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS = 25,
-    ZT_NETWORK_RULE_MATCH_VLAN_ID = 26,
-    ZT_NETWORK_RULE_MATCH_VLAN_PCP = 27,
-    ZT_NETWORK_RULE_MATCH_VLAN_DEI = 28,
-    ZT_NETWORK_RULE_MATCH_MAC_SOURCE = 29,
-    ZT_NETWORK_RULE_MATCH_MAC_DEST = 30,
-    ZT_NETWORK_RULE_MATCH_IPV4_SOURCE = 31,
-    ZT_NETWORK_RULE_MATCH_IPV4_DEST = 32,
-    ZT_NETWORK_RULE_MATCH_IPV6_SOURCE = 33,
-    ZT_NETWORK_RULE_MATCH_IPV6_DEST = 34,
-    ZT_NETWORK_RULE_MATCH_IP_TOS = 35,
-    ZT_NETWORK_RULE_MATCH_IP_PROTOCOL = 36,
-    ZT_NETWORK_RULE_MATCH_ETHERTYPE = 37,
-    ZT_NETWORK_RULE_MATCH_ICMP = 38,
-    ZT_NETWORK_RULE_MATCH_IP_SOURCE_PORT_RANGE = 39,
-    ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE = 40,
-    ZT_NETWORK_RULE_MATCH_CHARACTERISTICS = 41,
-    ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE = 42,
-    ZT_NETWORK_RULE_MATCH_RANDOM = 43,
-    ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE = 44,
-    ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_AND = 45,
-    ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_OR = 46,
-    ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_XOR = 47,
-    ZT_NETWORK_RULE_MATCH_TAGS_EQUAL = 48,
-    ZT_NETWORK_RULE_MATCH_TAG_SENDER = 49,
-    ZT_NETWORK_RULE_MATCH_TAG_RECEIVER = 50,
-    ZT_NETWORK_RULE_MATCH_INTEGER_RANGE = 51,
-
-    /**
-     * Maximum ID allowed for a MATCH entry in the rules table
-     */
-    ZT_NETWORK_RULE_MATCH__MAX_ID = 63
+enum ZT_VirtualNetworkRuleAction
+{
+	ZT_NETWORK_RULE_ACTION_DROP = 0,
+	ZT_NETWORK_RULE_ACTION_ACCEPT = 1
 };
 
 /**
  * Network flow rule
  *
- * Rules are stored in a table in which one or more match entries is followed
- * by an action. If more than one match precedes an action, the rule is
- * the AND of all matches. An action with no match is always taken since it
- * matches anything. If nothing matches, the default action is DROP.
- *
- * This is designed to be a more memory-efficient way of storing rules than
- * a wide table, yet still fast and simple to access in code.
+ * Currently only etherType is supported! Other flags will have no effect
+ * until the rules engine is fully implemented.
  */
-typedef struct {
-    /**
-     * Type and flags
-     *
-     * Bits are: NOTTTTTT
-     *
-     * N - If true, sense of match is inverted (no effect on actions)
-     * O - If true, result is ORed with previous instead of ANDed (no effect on actions)
-     * T - Rule or action type
-     *
-     * AND with 0x3f to get type, 0x80 to get NOT bit, and 0x40 to get OR bit.
-     */
-    uint8_t t;
+typedef struct
+{
+	/**
+	 * Rule sort order
+	 */
+	int ruleNo;
 
-    /**
-     * Union containing the value of this rule -- which field is used depends on 't'
-     */
-    union {
-        /**
-         * IPv6 address in big-endian / network byte order and netmask bits
-         */
-        struct {
-            uint8_t ip[16];
-            uint8_t mask;
-        } ipv6;
+	/**
+	 * Source ZeroTier address ("port" on the global virtual switch) (0 == wildcard)
+	 */
+	uint64_t sourcePort;
 
-        /**
-         * IPv4 address in big-endian / network byte order
-         */
-        struct {
-            uint32_t ip;
-            uint8_t mask;
-        } ipv4;
+	/**
+	 * Destination ZeroTier address ("port" on the global virtual switch) (0 == wildcard)
+	 */
+	uint64_t destPort;
 
-        /**
-         * Integer range match in packet payload
-         *
-         * This allows matching of ranges of integers up to 64 bits wide where
-         * the range is +/- INT32_MAX. It's packed this way so it fits in 16
-         * bytes and doesn't enlarge the overall size of this union.
-         */
-        struct {
-            uint64_t start;   // integer range start
-            uint32_t end;     // end of integer range (relative to start, inclusive, 0 for equality w/start)
-            uint16_t idx;     // index in packet of integer
-            uint8_t format;   // bits in integer (range 1-64, ((format&63)+1)) and endianness (MSB 1 for little, 0 for big)
-        } intRange;
+	/**
+	 * VLAN ID (-1 == wildcard)
+	 */
+	int vlanId;
 
-        /**
-         * Packet characteristic flags being matched
-         */
-        uint64_t characteristics;
+	/**
+	 * VLAN PCP (-1 == wildcard)
+	 */
+	int vlanPcp;
 
-        /**
-         * IP port range -- start-end inclusive -- host byte order
-         */
-        uint16_t port[2];
+	/**
+	 * Ethernet type (-1 == wildcard)
+	 */
+	int etherType;
 
-        /**
-         * 40-bit ZeroTier address (in least significant bits, host byte order)
-         */
-        uint64_t zt;
+	/**
+	 * Source MAC address (least significant 48 bits, host byte order) (0 == wildcard)
+	 */
+	uint64_t macSource;
 
-        /**
-         * 0 = never, UINT32_MAX = always
-         */
-        uint32_t randomProbability;
+	/** 
+	 * Destination MAC address (least significant 48 bits, host byte order) (0 == wildcard)
+	 */
+	uint64_t macDest;
 
-        /**
-         * 48-bit Ethernet MAC address in big-endian order
-         */
-        uint8_t mac[6];
+	/**
+	 * Source IP address (ss_family == 0 for wildcard)
+	 */
+	struct sockaddr_storage ipSource;
 
-        /**
-         * VLAN ID in host byte order
-         */
-        uint16_t vlanId;
+	/**
+	 * Destination IP address (ss_family == 0 for wildcard)
+	 */
+	struct sockaddr_storage ipDest;
 
-        /**
-         * VLAN PCP (least significant 3 bits)
-         */
-        uint8_t vlanPcp;
+	/**
+	 * IP type of service (-1 == wildcard)
+	 */
+	int ipTos;
 
-        /**
-         * VLAN DEI (single bit / boolean)
-         */
-        uint8_t vlanDei;
+	/**
+	 * IP protocol (-1 == wildcard)
+	 */
+	int ipProtocol;
 
-        /**
-         * Ethernet type in host byte order
-         */
-        uint16_t etherType;
+	/**
+	 * IP source port (-1 == wildcard)
+	 */
+	int ipSourcePort;
 
-        /**
-         * IP protocol
-         */
-        uint8_t ipProtocol;
+	/**
+	 * IP destination port (-1 == wildcard)
+	 */
+	int ipDestPort;
 
-        /**
-         * IP type of service a.k.a. DSCP field
-         */
-        struct {
-            uint8_t mask;
-            uint8_t value[2];
-        } ipTos;
+	/**
+	 * Flags to match if set
+	 */
+	unsigned long flags;
 
-        /**
-         * Ethernet packet size in host byte order (start-end, inclusive)
-         */
-        uint16_t frameSize[2];
+	/**
+	 * Flags to match if NOT set
+	 */
+	unsigned long invFlags;
 
-        /**
-         * ICMP type and code
-         */
-        struct {
-            uint8_t type;    // ICMP type, always matched
-            uint8_t code;    // ICMP code if matched
-            uint8_t flags;   // flag 0x01 means also match code, otherwise only match type
-        } icmp;
-
-        /**
-         * For tag-related rules
-         */
-        struct {
-            uint32_t id;
-            uint32_t value;
-        } tag;
-
-        /**
-         * Destinations for TEE and REDIRECT
-         */
-        struct {
-            uint64_t address;
-            uint32_t flags;
-            uint16_t length;
-        } fwd;
-
-        /**
-         * Quality of Service (QoS) bucket we want a frame to be placed in
-         */
-        uint8_t qosBucket;
-    } v;
+	/** 
+	 * Action if rule matches
+	 */
+	enum ZT_VirtualNetworkRuleAction action;
 } ZT_VirtualNetworkRule;
 
-/**
- * A route to be pushed on a virtual network
- */
-typedef struct {
-    /**
-     * Target network / netmask bits (in port field) or NULL or 0.0.0.0/0 for default
-     */
-    struct sockaddr_storage target;
-
-    /**
-     * Gateway IP address (port ignored) or NULL (family == 0) for LAN-local (no gateway)
-     */
-    struct sockaddr_storage via;
-
-    /**
-     * Route flags
-     */
-    uint16_t flags;
-
-    /**
-     * Route metric (not currently used)
-     */
-    uint16_t metric;
-} ZT_VirtualNetworkRoute;
-
-/**
- * DNS configuration to be pushed on a virtual network
- */
-typedef struct {
-    char domain[128];
-    struct sockaddr_storage server_addr[ZT_MAX_DNS_SERVERS];
-} ZT_VirtualNetworkDNS;
-
 /**
  * An Ethernet multicast group
  */
-typedef struct {
-    /**
-     * MAC address (least significant 48 bits)
-     */
-    uint64_t mac;
+typedef struct
+{
+	/**
+	 * MAC address (least significant 48 bits)
+	 */
+	uint64_t mac;
 
-    /**
-     * Additional distinguishing information (usually zero)
-     */
-    unsigned long adi;
+	/**
+	 * Additional distinguishing information (usually zero)
+	 */
+	unsigned long adi;
 } ZT_MulticastGroup;
 
 /**
  * Virtual network configuration update type
  */
-enum ZT_VirtualNetworkConfigOperation {
-    /**
-     * Network is coming up (either for the first time or after service restart)
-     */
-    ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP = 1,
+enum ZT_VirtualNetworkConfigOperation
+{
+	/**
+	 * Network is coming up (either for the first time or after service restart)
+	 */
+	ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP = 1,
 
-    /**
-     * Network configuration has been updated
-     */
-    ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE = 2,
+	/**
+	 * Network configuration has been updated
+	 */
+	ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE = 2,
 
-    /**
-     * Network is going down (not permanently)
-     */
-    ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN = 3,
+	/**
+	 * Network is going down (not permanently)
+	 */
+	ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN = 3,
 
-    /**
-     * Network is going down permanently (leave/delete)
-     */
-    ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY = 4
+	/**
+	 * Network is going down permanently (leave/delete)
+	 */
+	ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY = 4
 };
 
 /**
  * What trust hierarchy role does this peer have?
  */
 enum ZT_PeerRole {
-    ZT_PEER_ROLE_LEAF = 0,    // ordinary node
-    ZT_PEER_ROLE_MOON = 1,    // moon root
-    ZT_PEER_ROLE_PLANET = 2   // planetary root
+	ZT_PEER_ROLE_LEAF = 0,     // ordinary node
+	ZT_PEER_ROLE_RELAY = 1,    // relay node
+	ZT_PEER_ROLE_ROOT = 2      // root server
 };
 
 /**
  * Vendor ID
  */
-enum ZT_Vendor { ZT_VENDOR_UNSPECIFIED = 0, ZT_VENDOR_ZEROTIER = 1 };
+enum ZT_Vendor {
+	ZT_VENDOR_UNSPECIFIED = 0,
+	ZT_VENDOR_ZEROTIER = 1
+};
 
 /**
  * Platform type
  */
 enum ZT_Platform {
-    ZT_PLATFORM_UNSPECIFIED = 0,
-    ZT_PLATFORM_LINUX = 1,
-    ZT_PLATFORM_WINDOWS = 2,
-    ZT_PLATFORM_MACOS = 3,
-    ZT_PLATFORM_ANDROID = 4,
-    ZT_PLATFORM_IOS = 5,
-    ZT_PLATFORM_SOLARIS_SMARTOS = 6,
-    ZT_PLATFORM_FREEBSD = 7,
-    ZT_PLATFORM_NETBSD = 8,
-    ZT_PLATFORM_OPENBSD = 9,
-    ZT_PLATFORM_RISCOS = 10,
-    ZT_PLATFORM_VXWORKS = 11,
-    ZT_PLATFORM_FREERTOS = 12,
-    ZT_PLATFORM_SYSBIOS = 13,
-    ZT_PLATFORM_HURD = 14,
-    ZT_PLATFORM_WEB = 15
+	ZT_PLATFORM_UNSPECIFIED = 0,
+	ZT_PLATFORM_LINUX = 1,
+	ZT_PLATFORM_WINDOWS = 2,
+	ZT_PLATFORM_MACOS = 3,
+	ZT_PLATFORM_ANDROID = 4,
+	ZT_PLATFORM_IOS = 5,
+	ZT_PLATFORM_SOLARIS_SMARTOS = 6,
+	ZT_PLATFORM_FREEBSD = 7,
+	ZT_PLATFORM_NETBSD = 8,
+	ZT_PLATFORM_OPENBSD = 9,
+	ZT_PLATFORM_RISCOS = 10,
+	ZT_PLATFORM_VXWORKS = 11,
+	ZT_PLATFORM_FREERTOS = 12,
+	ZT_PLATFORM_SYSBIOS = 13,
+	ZT_PLATFORM_HURD = 14
 };
 
 /**
  * Architecture type
  */
 enum ZT_Architecture {
-    ZT_ARCHITECTURE_UNSPECIFIED = 0,
-    ZT_ARCHITECTURE_X86 = 1,
-    ZT_ARCHITECTURE_X64 = 2,
-    ZT_ARCHITECTURE_ARM32 = 3,
-    ZT_ARCHITECTURE_ARM64 = 4,
-    ZT_ARCHITECTURE_MIPS32 = 5,
-    ZT_ARCHITECTURE_MIPS64 = 6,
-    ZT_ARCHITECTURE_POWER32 = 7,
-    ZT_ARCHITECTURE_POWER64 = 8,
-    ZT_ARCHITECTURE_OPENRISC32 = 9,
-    ZT_ARCHITECTURE_OPENRISC64 = 10,
-    ZT_ARCHITECTURE_SPARC32 = 11,
-    ZT_ARCHITECTURE_SPARC64 = 12,
-    ZT_ARCHITECTURE_DOTNET_CLR = 13,
-    ZT_ARCHITECTURE_JAVA_JVM = 14,
-    ZT_ARCHITECTURE_WEB = 15,
-    ZT_ARCHITECTURE_S390X = 16,
-    ZT_ARCHITECTURE_LOONGARCH64 = 17
+	ZT_ARCHITECTURE_UNSPECIFIED = 0,
+	ZT_ARCHITECTURE_X86 = 1,
+	ZT_ARCHITECTURE_X64 = 2,
+	ZT_ARCHITECTURE_ARM32 = 3,
+	ZT_ARCHITECTURE_ARM64 = 4,
+	ZT_ARCHITECTURE_MIPS32 = 5,
+	ZT_ARCHITECTURE_MIPS64 = 6,
+	ZT_ARCHITECTURE_POWER32 = 7,
+	ZT_ARCHITECTURE_POWER64 = 8
 };
 
 /**
  * Virtual network configuration
  */
-typedef struct {
-    /**
-     * 64-bit ZeroTier network ID
-     */
-    uint64_t nwid;
+typedef struct
+{
+	/**
+	 * 64-bit ZeroTier network ID
+	 */
+	uint64_t nwid;
 
-    /**
-     * Ethernet MAC (48 bits) that should be assigned to port
-     */
-    uint64_t mac;
+	/**
+	 * Ethernet MAC (48 bits) that should be assigned to port
+	 */
+	uint64_t mac;
 
-    /**
-     * Network name (from network configuration master)
-     */
-    char name[ZT_MAX_NETWORK_SHORT_NAME_LENGTH + 1];
+	/**
+	 * Network name (from network configuration master)
+	 */
+	char name[ZT_MAX_NETWORK_SHORT_NAME_LENGTH + 1];
 
-    /**
-     * Network configuration request status
-     */
-    enum ZT_VirtualNetworkStatus status;
+	/**
+	 * Network configuration request status
+	 */
+	enum ZT_VirtualNetworkStatus status;
 
-    /**
-     * Network type
-     */
-    enum ZT_VirtualNetworkType type;
+	/**
+	 * Network type
+	 */
+	enum ZT_VirtualNetworkType type;
 
-    /**
-     * Maximum interface MTU
-     */
-    unsigned int mtu;
+	/**
+	 * Maximum interface MTU
+	 */
+	unsigned int mtu;
 
-    /**
-     * If nonzero, the network this port belongs to indicates DHCP availability
-     *
-     * This is a suggestion. The underlying implementation is free to ignore it
-     * for security or other reasons. This is simply a netconf parameter that
-     * means 'DHCP is available on this network.'
-     */
-    int dhcp;
+	/**
+	 * If nonzero, the network this port belongs to indicates DHCP availability
+	 *
+	 * This is a suggestion. The underlying implementation is free to ignore it
+	 * for security or other reasons. This is simply a netconf parameter that
+	 * means 'DHCP is available on this network.'
+	 */
+	int dhcp;
 
-    /**
-     * If nonzero, this port is allowed to bridge to other networks
-     *
-     * This is informational. If this is false (0), bridged packets will simply
-     * be dropped and bridging won't work.
-     */
-    int bridge;
+	/**
+	 * If nonzero, this port is allowed to bridge to other networks
+	 *
+	 * This is informational. If this is false (0), bridged packets will simply
+	 * be dropped and bridging won't work.
+	 */
+	int bridge;
 
-    /**
-     * If nonzero, this network supports and allows broadcast (ff:ff:ff:ff:ff:ff) traffic
-     */
-    int broadcastEnabled;
+	/**
+	 * If nonzero, this network supports and allows broadcast (ff:ff:ff:ff:ff:ff) traffic
+	 */
+	int broadcastEnabled;
 
-    /**
-     * If the network is in PORT_ERROR state, this is the (negative) error code most recently reported
-     */
-    int portError;
+	/**
+	 * If the network is in PORT_ERROR state, this is the error most recently returned by the port config callback
+	 */
+	int portError;
 
-    /**
-     * Revision number as reported by controller or 0 if still waiting for config
-     */
-    unsigned long netconfRevision;
+	/**
+	 * Is this network enabled? If not, all frames to/from are dropped.
+	 */
+	int enabled;
 
-    /**
-     * Number of assigned addresses
-     */
-    unsigned int assignedAddressCount;
+	/**
+	 * Network config revision as reported by netconf master
+	 *
+	 * If this is zero, it means we're still waiting for our netconf.
+	 */
+	unsigned long netconfRevision;
 
-    /**
-     * ZeroTier-assigned addresses (in sockaddr_storage structures)
-     *
-     * For IP, the port number of the sockaddr_XX structure contains the number
-     * of bits in the address netmask. Only the IP address and port are used.
-     * Other fields like interface number can be ignored.
-     *
-     * This is only used for ZeroTier-managed address assignments sent by the
-     * virtual network's configuration master.
-     */
-    struct sockaddr_storage assignedAddresses[ZT_MAX_ZT_ASSIGNED_ADDRESSES];
+	/**
+	 * Number of multicast group subscriptions
+	 */
+	unsigned int multicastSubscriptionCount;
 
-    /**
-     * Number of ZT-pushed routes
-     */
-    unsigned int routeCount;
+	/**
+	 * Multicast group subscriptions
+	 */
+	ZT_MulticastGroup multicastSubscriptions[ZT_MAX_NETWORK_MULTICAST_SUBSCRIPTIONS];
 
-    /**
-     * Routes (excluding those implied by assigned addresses and their masks)
-     */
-    ZT_VirtualNetworkRoute routes[ZT_MAX_NETWORK_ROUTES];
+	/**
+	 * Number of assigned addresses
+	 */
+	unsigned int assignedAddressCount;
 
-    /**
-     * Number of multicast groups subscribed
-     */
-    unsigned int multicastSubscriptionCount;
-
-    /**
-     * Multicast groups to which this network's device is subscribed
-     */
-    struct {
-        uint64_t mac; /* MAC in lower 48 bits */
-        uint32_t adi; /* Additional distinguishing information, usually zero except for IPv4 ARP groups */
-    } multicastSubscriptions[ZT_MAX_MULTICAST_SUBSCRIPTIONS];
-
-    /**
-     * Network specific DNS configuration
-     */
-    ZT_VirtualNetworkDNS dns;
-
-    /**
-     * sso enabled
-     */
-    bool ssoEnabled;
-
-    /**
-     * SSO version
-     */
-    uint64_t ssoVersion;
-
-    /**
-     * If the status us AUTHENTICATION_REQUIRED, this may contain a URL for authentication.
-     */
-    char authenticationURL[2048];
-
-    /**
-     * Time that current authentication expires. only valid if ssoEnabled is true
-     */
-    uint64_t authenticationExpiryTime;
-
-    /**
-     * OIDC issuer URL.
-     */
-    char issuerURL[2048];
-
-    /**
-     * central base URL.
-     */
-    char centralAuthURL[2048];
-
-    /**
-     * sso nonce
-     */
-    char ssoNonce[128];
-
-    /**
-     * sso state
-     */
-    char ssoState[256];
-
-    /**
-     * oidc client id
-     */
-    char ssoClientID[256];
-
-    /**
-     * sso provider
-     **/
-    char ssoProvider[64];
+	/**
+	 * ZeroTier-assigned addresses (in sockaddr_storage structures)
+	 *
+	 * For IP, the port number of the sockaddr_XX structure contains the number
+	 * of bits in the address netmask. Only the IP address and port are used.
+	 * Other fields like interface number can be ignored.
+	 *
+	 * This is only used for ZeroTier-managed address assignments sent by the
+	 * virtual network's configuration master.
+	 */
+	struct sockaddr_storage assignedAddresses[ZT_MAX_ZT_ASSIGNED_ADDRESSES];
 } ZT_VirtualNetworkConfig;
 
 /**
  * A list of networks
  */
-typedef struct {
-    ZT_VirtualNetworkConfig* networks;
-    unsigned long networkCount;
+typedef struct
+{
+	ZT_VirtualNetworkConfig *networks;
+	unsigned long networkCount;
 } ZT_VirtualNetworkList;
 
-/**
- * Physical path configuration
- */
-typedef struct {
-    /**
-     * If non-zero set this physical network path to be trusted to disable encryption and authentication
-     */
-    uint64_t trustedPathId;
-
-    /**
-     * Physical path MTU from ZT_MIN_PHYSMTU and ZT_MAX_PHYSMTU or <= 0 to use default
-     */
-    int mtu;
-} ZT_PhysicalPathConfiguration;
-
 /**
  * Physical network path to a peer
  */
-typedef struct {
-    /**
-     * Address of endpoint
-     */
-    struct sockaddr_storage address;
+typedef struct
+{
+	/**
+	 * Address of endpoint
+	 */
+	struct sockaddr_storage address;
 
-    /**
-     * Time of last send in milliseconds or 0 for never
-     */
-    uint64_t lastSend;
+	/**
+	 * Time of last send in milliseconds or 0 for never
+	 */
+	uint64_t lastSend;
 
-    /**
-     * Time of last receive in milliseconds or 0 for never
-     */
-    uint64_t lastReceive;
+	/**
+	 * Time of last receive in milliseconds or 0 for never
+	 */
+	uint64_t lastReceive;
 
-    /**
-     * Is this a trusted path? If so this will be its nonzero ID.
-     */
-    uint64_t trustedPathId;
+	/**
+	 * Is path active?
+	 */
+	int active;
 
-    /**
-     * Mean latency
-     */
-    float latencyMean;
-
-    /**
-     * Maximum observed latency
-     */
-    float latencyMax;
-
-    /**
-     * Variance of latency
-     */
-    float latencyVariance;
-
-    /**
-     * Packet loss ratio
-     */
-    float packetLossRatio;
-
-    /**
-     * Packet error ratio
-     */
-    float packetErrorRatio;
-
-    /**
-     * Number of flows assigned to this path
-     */
-    uint16_t assignedFlowCount;
-
-    /**
-     * Address scope
-     */
-    uint8_t scope;
-
-    /**
-     * Relative quality value
-     */
-    float relativeQuality;
-
-    /**
-     * Name of physical interface this path resides on
-     */
-    char ifname[ZT_MAX_PHYSIFNAME];
-
-    /**
-     * Pointer to PhySocket object for this path
-     */
-    uint64_t localSocket;
-
-    /**
-     * Local port corresponding to this path's localSocket
-     */
-    uint16_t localPort;
-
-    /**
-     * Is path expired?
-     */
-    int expired;
-
-    /**
-     * Whether this path is currently included in the bond
-     */
-    uint8_t bonded;
-
-    /**
-     * Whether this path is currently eligible to be used in a bond
-     */
-    uint8_t eligible;
-
-    /**
-     * The capacity of this link (as given to bonding layer)
-     */
-    uint32_t linkSpeed;
-
-    /**
-     * Is path preferred?
-     */
-    int preferred;
+	/**
+	 * Is path preferred?
+	 */
+	int preferred;
 } ZT_PeerPhysicalPath;
 
 /**
  * Peer status result buffer
  */
-typedef struct {
-    /**
-     * ZeroTier address (40 bits)
-     */
-    uint64_t address;
+typedef struct
+{
+	/**
+	 * ZeroTier address (40 bits)
+	 */
+	uint64_t address;
 
-    /**
-     * Remote major version or -1 if not known
-     */
-    int versionMajor;
+	/**
+	 * Time we last received a unicast frame from this peer
+	 */
+	uint64_t lastUnicastFrame;
 
-    /**
-     * Remote minor version or -1 if not known
-     */
-    int versionMinor;
+	/**
+	 * Time we last received a multicast rame from this peer
+	 */
+	uint64_t lastMulticastFrame;
 
-    /**
-     * Remote revision or -1 if not known
-     */
-    int versionRev;
+	/**
+	 * Remote major version or -1 if not known
+	 */
+	int versionMajor;
 
-    /**
-     * Last measured latency in milliseconds or -1 if unknown
-     */
-    int latency;
+	/**
+	 * Remote minor version or -1 if not known
+	 */
+	int versionMinor;
 
-    /**
-     * What trust hierarchy role does this device have?
-     */
-    enum ZT_PeerRole role;
+	/**
+	 * Remote revision or -1 if not known
+	 */
+	int versionRev;
 
-    /**
-     * Whether a multi-link bond has formed
-     */
-    bool isBonded;
+	/**
+	 * Last measured latency in milliseconds or zero if unknown
+	 */
+	unsigned int latency;
 
-    /**
-     * The bonding policy used to bond to this peer
-     */
-    int bondingPolicy;
+	/**
+	 * What trust hierarchy role does this device have?
+	 */
+	enum ZT_PeerRole role;
 
-    /**
-     * The number of links that comprise the bond to this peer that are considered alive
-     */
-    int numAliveLinks;
+	/**
+	 * Number of paths (size of paths[])
+	 */
+	unsigned int pathCount;
 
-    /**
-     * The number of links that comprise the bond to this peer
-     */
-    int numTotalLinks;
-
-    /**
-     * The user-specified bond template name
-     */
-    char customBondName[32];
-
-    /**
-     * Number of paths (size of paths[])
-     */
-    unsigned int pathCount;
-
-    /**
-     * Known network paths to peer
-     */
-    ZT_PeerPhysicalPath paths[ZT_MAX_PEER_NETWORK_PATHS];
+	/**
+	 * Known network paths to peer
+	 */
+	ZT_PeerPhysicalPath paths[ZT_MAX_PEER_NETWORK_PATHS];
 } ZT_Peer;
 
 /**
  * List of peers
  */
-typedef struct {
-    ZT_Peer* peers;
-    unsigned long peerCount;
+typedef struct
+{
+	ZT_Peer *peers;
+	unsigned long peerCount;
 } ZT_PeerList;
 
 /**
- * ZeroTier core state objects
+ * ZeroTier circuit test configuration and path
  */
-enum ZT_StateObjectType {
-    /**
-     * Null object -- ignored
-     */
-    ZT_STATE_OBJECT_NULL = 0,
+typedef struct {
+	/**
+	 * Test ID -- an arbitrary 64-bit identifier
+	 */
+	uint64_t testId;
 
-    /**
-     * Public address and public key
-     *
-     * Object ID: this node's address if known, or 0 if unknown (first query)
-     * Canonical path: <HOME>/identity.public
-     * Persistence: required
-     */
-    ZT_STATE_OBJECT_IDENTITY_PUBLIC = 1,
+	/**
+	 * Timestamp -- sent with test and echoed back by each reporter
+	 */
+	uint64_t timestamp;
 
-    /**
-     * Full identity with secret key
-     *
-     * Object ID: this node's address if known, or 0 if unknown (first query)
-     * Canonical path: <HOME>/identity.secret
-     * Persistence: required, should be stored with restricted permissions e.g. mode 0600 on *nix
-     */
-    ZT_STATE_OBJECT_IDENTITY_SECRET = 2,
+	/**
+	 * Originator credential: network ID
+	 *
+	 * If this is nonzero, a network ID will be set for this test and
+	 * the originator must be its primary network controller. This is
+	 * currently the only authorization method available, so it must
+	 * be set to run a test.
+	 */
+	uint64_t credentialNetworkId;
 
-    /**
-     * The planet (there is only one per... well... planet!)
-     *
-     * Object ID: world ID of planet, or 0 if unknown (first query)
-     * Canonical path: <HOME>/planet
-     * Persistence: recommended
-     */
-    ZT_STATE_OBJECT_PLANET = 3,
+	/**
+	 * Hops in circuit test (a.k.a. FIFO for graph traversal)
+	 */
+	struct {
+		/**
+		 * Hop flags (currently unused, must be zero)
+		 */
+		unsigned int flags;
 
-    /**
-     * A moon (federated root set)
-     *
-     * Object ID: world ID of moon
-     * Canonical path: <HOME>/moons.d/<ID>.moon (16-digit hex ID)
-     * Persistence: required if moon memberships should persist
-     */
-    ZT_STATE_OBJECT_MOON = 4,
+		/**
+		 * Number of addresses in this hop (max: ZT_CIRCUIT_TEST_MAX_HOP_BREADTH)
+		 */
+		unsigned int breadth;
 
-    /**
-     * Peer and related state
-     *
-     * Object ID: peer address
-     * Canonical path: <HOME>/peers.d/<ID> (10-digit address
-     * Persistence: optional, can be cleared at any time
-     */
-    ZT_STATE_OBJECT_PEER = 5,
+		/**
+		 * 40-bit ZeroTier addresses (most significant 24 bits ignored)
+		 */
+		uint64_t addresses[ZT_CIRCUIT_TEST_MAX_HOP_BREADTH];
+	} hops[ZT_CIRCUIT_TEST_MAX_HOPS];
 
-    /**
-     * Network configuration
-     *
-     * Object ID: peer address
-     * Canonical path: <HOME>/networks.d/<NETWORKID>.conf (16-digit hex ID)
-     * Persistence: required if network memberships should persist
-     */
-    ZT_STATE_OBJECT_NETWORK_CONFIG = 6
-};
+	/**
+	 * Number of hops (max: ZT_CIRCUIT_TEST_MAX_HOPS)
+	 */
+	unsigned int hopCount;
+
+	/**
+	 * If non-zero, circuit test will report back at every hop
+	 */
+	int reportAtEveryHop;
+
+	/**
+	 * An arbitrary user-settable pointer
+	 */
+	void *ptr;
+
+	/**
+	 * Pointer for internal use -- initialize to zero and do not modify
+	 */
+	void *_internalPtr;
+} ZT_CircuitTest;
+
+/**
+ * Circuit test result report
+ */
+typedef struct {
+	/**
+	 * Sender of report (current hop)
+	 */
+	uint64_t current;
+
+	/**
+	 * Previous hop
+	 */
+	uint64_t upstream;
+
+	/**
+	 * 64-bit test ID
+	 */
+	uint64_t testId;
+
+	/**
+	 * Timestamp from original test (echoed back at each hop)
+	 */
+	uint64_t timestamp;
+
+	/**
+	 * Timestamp on remote device
+	 */
+	uint64_t remoteTimestamp;
+
+	/**
+	 * 64-bit packet ID of packet received by the reporting device
+	 */
+	uint64_t sourcePacketId;
+
+	/**
+	 * Flags (currently unused, will be zero)
+	 */
+	uint64_t flags;
+
+	/**
+	 * ZeroTier protocol-level hop count of packet received by reporting device (>0 indicates relayed)
+	 */
+	unsigned int sourcePacketHopCount;
+
+	/**
+	 * Error code (currently unused, will be zero)
+	 */
+	unsigned int errorCode;
+
+	/**
+	 * Remote device vendor ID
+	 */
+	enum ZT_Vendor vendor;
+
+	/**
+	 * Remote device protocol compliance version
+	 */
+	unsigned int protocolVersion;
+
+	/**
+	 * Software major version
+	 */
+	unsigned int majorVersion;
+
+	/**
+	 * Software minor version
+	 */
+	unsigned int minorVersion;
+
+	/**
+	 * Software revision
+	 */
+	unsigned int revision;
+
+	/**
+	 * Platform / OS
+	 */
+	enum ZT_Platform platform;
+
+	/**
+	 * System architecture
+	 */
+	enum ZT_Architecture architecture;
+
+	/**
+	 * Local device address on which packet was received by reporting device
+	 *
+	 * This may have ss_family equal to zero (null address) if unspecified.
+	 */
+	struct sockaddr_storage receivedOnLocalAddress;
+
+	/**
+	 * Remote address from which reporter received the test packet
+	 *
+	 * This may have ss_family set to zero (null address) if unspecified.
+	 */
+	struct sockaddr_storage receivedFromRemoteAddress;
+
+	/**
+	 * Next hops to which packets are being or will be sent by the reporter
+	 *
+	 * In addition to reporting back, the reporter may send the test on if
+	 * there are more recipients in the FIFO. If it does this, it can report
+	 * back the address(es) that make up the next hop and the physical address
+	 * for each if it has one. The physical address being null/unspecified
+	 * typically indicates that no direct path exists and the next packet
+	 * will be relayed.
+	 */
+	struct {
+		/**
+		 * 40-bit ZeroTier address
+		 */
+		uint64_t address;
+
+		/**
+		 * Physical address or null address (ss_family == 0) if unspecified or unknown
+		 */
+		struct sockaddr_storage physicalAddress;
+	} nextHops[ZT_CIRCUIT_TEST_MAX_HOP_BREADTH];
+
+	/**
+	 * Number of next hops reported in nextHops[]
+	 */
+	unsigned int nextHopCount;
+} ZT_CircuitTestReport;
+
+/**
+ * A cluster member's status
+ */
+typedef struct {
+	/**
+	 * This cluster member's ID (from 0 to 1-ZT_CLUSTER_MAX_MEMBERS)
+	 */
+	unsigned int id;
+
+	/**
+	 * Number of milliseconds since last 'alive' heartbeat message received via cluster backplane address
+	 */
+	unsigned int msSinceLastHeartbeat;
+
+	/**
+	 * Non-zero if cluster member is alive
+	 */
+	int alive;
+
+	/**
+	 * X, Y, and Z coordinates of this member (if specified, otherwise zero)
+	 *
+	 * What these mean depends on the location scheme being used for
+	 * location-aware clustering. At present this is GeoIP and these
+	 * will be the X, Y, and Z coordinates of the location on a spherical
+	 * approximation of Earth where Earth's core is the origin (in km).
+	 * They don't have to be perfect and need only be comparable with others
+	 * to find shortest path via the standard vector distance formula.
+	 */
+	int x,y,z;
+
+	/**
+	 * Cluster member's last reported load
+	 */
+	uint64_t load;
+
+	/**
+	 * Number of peers
+	 */
+	uint64_t peers;
+
+	/**
+	 * Physical ZeroTier endpoints for this member (where peers are sent when directed here)
+	 */
+	struct sockaddr_storage zeroTierPhysicalEndpoints[ZT_CLUSTER_MAX_ZT_PHYSICAL_ADDRESSES];
+
+	/**
+	 * Number of physical ZeroTier endpoints this member is announcing
+	 */
+	unsigned int numZeroTierPhysicalEndpoints;
+} ZT_ClusterMemberStatus;
+
+/**
+ * ZeroTier cluster status
+ */
+typedef struct {
+	/**
+	 * My cluster member ID (a record for 'self' is included in member[])
+	 */
+	unsigned int myId;
+
+	/**
+	 * Number of cluster members
+	 */
+	unsigned int clusterSize;
+
+	/**
+	 * Cluster member statuses
+	 */
+	ZT_ClusterMemberStatus members[ZT_CLUSTER_MAX_MEMBERS];
+} ZT_ClusterStatus;
 
 /**
  * An instance of a ZeroTier One node (opaque)
@@ -1532,13 +1126,12 @@ typedef void ZT_Node;
  * PORT_ERROR state.
  */
 typedef int (*ZT_VirtualNetworkConfigFunction)(
-    ZT_Node*,                              /* Node */
-    void*,                                 /* User ptr */
-    void*,                                 /* Thread ptr */
-    uint64_t,                              /* Network ID */
-    void**,                                /* Modifiable network user PTR */
-    enum ZT_VirtualNetworkConfigOperation, /* Config operation */
-    const ZT_VirtualNetworkConfig*);       /* Network configuration */
+	ZT_Node *,                             /* Node */
+	void *,                                /* User ptr */
+	uint64_t,                              /* Network ID */
+	void **,                               /* Modifiable network user PTR */
+	enum ZT_VirtualNetworkConfigOperation, /* Config operation */
+	const ZT_VirtualNetworkConfig *);      /* Network configuration */
 
 /**
  * Function to send a frame out to a virtual network port
@@ -1548,17 +1141,16 @@ typedef int (*ZT_VirtualNetworkConfigFunction)(
  * (9) frame length.
  */
 typedef void (*ZT_VirtualNetworkFrameFunction)(
-    ZT_Node*,      /* Node */
-    void*,         /* User ptr */
-    void*,         /* Thread ptr */
-    uint64_t,      /* Network ID */
-    void**,        /* Modifiable network user PTR */
-    uint64_t,      /* Source MAC */
-    uint64_t,      /* Destination MAC */
-    unsigned int,  /* Ethernet type */
-    unsigned int,  /* VLAN ID (0 for none) */
-    const void*,   /* Frame data */
-    unsigned int); /* Frame length */
+	ZT_Node *,                             /* Node */
+	void *,                                /* User ptr */
+	uint64_t,                              /* Network ID */
+	void **,                               /* Modifiable network user PTR */
+	uint64_t,                              /* Source MAC */
+	uint64_t,                              /* Destination MAC */
+	unsigned int,                          /* Ethernet type */
+	unsigned int,                          /* VLAN ID (0 for none) */
+	const void *,                          /* Frame data */
+	unsigned int);                         /* Frame length */
 
 /**
  * Callback for events
@@ -1570,61 +1162,81 @@ typedef void (*ZT_VirtualNetworkFrameFunction)(
  * in the definition of ZT_Event.
  */
 typedef void (*ZT_EventCallback)(
-    ZT_Node*,      /* Node */
-    void*,         /* User ptr */
-    void*,         /* Thread ptr */
-    enum ZT_Event, /* Event type */
-    const void*);  /* Event payload (if applicable) */
+	ZT_Node *,
+	void *,
+	enum ZT_Event,
+	const void *);
 
 /**
- * Callback for storing and/or publishing state information
+ * Function to get an object from the data store
  *
- * See ZT_StateObjectType docs for information about each state object type
- * and when and if it needs to be persisted.
+ * Parameters: (1) object name, (2) buffer to fill, (3) size of buffer, (4)
+ * index in object to start reading, (5) result parameter that must be set
+ * to the actual size of the object if it exists.
  *
- * An object of length -1 is sent to indicate that an object should be
- * deleted.
+ * Object names can contain forward slash (/) path separators. They will
+ * never contain .. or backslash (\), so this is safe to map as a Unix-style
+ * path if the underlying storage permits. For security reasons we recommend
+ * returning errors if .. or \ are used.
+ *
+ * The function must return the actual number of bytes read. If the object
+ * doesn't exist, it should return -1. -2 should be returned on other errors
+ * such as errors accessing underlying storage.
+ *
+ * If the read doesn't fit in the buffer, the max number of bytes should be
+ * read. The caller may call the function multiple times to read the whole
+ * object.
  */
-typedef void (*ZT_StatePutFunction)(
-    ZT_Node*,                /* Node */
-    void*,                   /* User ptr */
-    void*,                   /* Thread ptr */
-    enum ZT_StateObjectType, /* State object type */
-    const uint64_t[2],       /* State object ID (if applicable) */
-    const void*,             /* State object data */
-    int);                    /* Length of data or -1 to delete */
+typedef long (*ZT_DataStoreGetFunction)(
+	ZT_Node *,
+	void *,
+	const char *,
+	void *,
+	unsigned long,
+	unsigned long,
+	unsigned long *);
 
 /**
- * Callback for retrieving stored state information
+ * Function to store an object in the data store
  *
- * This function should return the number of bytes actually stored to the
- * buffer or -1 if the state object was not found or the buffer was too
- * small to store it.
+ * Parameters: (1) node, (2) user ptr, (3) object name, (4) object data,
+ * (5) object size, (6) secure? (bool).
+ *
+ * If secure is true, the file should be set readable and writable only
+ * to the user running ZeroTier One. What this means is platform-specific.
+ *
+ * Name semantics are the same as the get function. This must return zero on
+ * success. You can return any OS-specific error code on failure, as these
+ * may be visible in logs or error messages and might aid in debugging.
+ *
+ * If the data pointer is null, this must be interpreted as a delete
+ * operation.
  */
-typedef int (*ZT_StateGetFunction)(
-    ZT_Node*,                /* Node */
-    void*,                   /* User ptr */
-    void*,                   /* Thread ptr */
-    enum ZT_StateObjectType, /* State object type */
-    const uint64_t[2],       /* State object ID (if applicable) */
-    void*,                   /* Buffer to store state object data */
-    unsigned int);           /* Length of data buffer in bytes */
+typedef int (*ZT_DataStorePutFunction)(
+	ZT_Node *,
+	void *,
+	const char *,
+	const void *,
+	unsigned long,
+	int);
 
 /**
- * Function to send a ZeroTier packet out over the physical wire (L2/L3)
+ * Function to send a ZeroTier packet out over the wire
  *
  * Parameters:
  *  (1) Node
  *  (2) User pointer
- *  (3) Local socket or -1 for "all" or "any"
+ *  (3) Local interface address
  *  (4) Remote address
  *  (5) Packet data
  *  (6) Packet length
  *  (7) Desired IP TTL or 0 to use default
  *
- * If there is only one local socket, the local socket can be ignored.
- * If the local socket is -1, the packet should be sent out from all
- * bound local sockets or a random bound local socket.
+ * If there is only one local interface it is safe to ignore the local
+ * interface address. Otherwise if running with multiple interfaces, the
+ * correct local interface should be chosen by address unless NULL. If
+ * the ss_family field is zero (NULL address), a random or preferred
+ * default interface should be used.
  *
  * If TTL is nonzero, packets should have their IP TTL value set to this
  * value if possible. If this is not possible it is acceptable to ignore
@@ -1635,24 +1247,22 @@ typedef int (*ZT_StateGetFunction)(
  * delivery. It only means that the packet appears to have been sent.
  */
 typedef int (*ZT_WirePacketSendFunction)(
-    ZT_Node*,                       /* Node */
-    void*,                          /* User ptr */
-    void*,                          /* Thread ptr */
-    int64_t,                        /* Local socket */
-    const struct sockaddr_storage*, /* Remote address */
-    const void*,                    /* Packet data */
-    unsigned int,                   /* Packet length */
-    unsigned int);                  /* TTL or 0 to use default */
+	ZT_Node *,                        /* Node */
+	void *,                           /* User ptr */
+	const struct sockaddr_storage *,  /* Local address */
+	const struct sockaddr_storage *,  /* Remote address */
+	const void *,                     /* Packet data */
+	unsigned int,                     /* Packet length */
+	unsigned int);                    /* TTL or 0 to use default */
 
 /**
  * Function to check whether a path should be used for ZeroTier traffic
  *
- * Parameters:
+ * Paramters:
  *  (1) Node
  *  (2) User pointer
- *  (3) ZeroTier address or 0 for none/any
- *  (4) Local socket or -1 if unknown
- *  (5) Remote address
+ *  (3) Local interface address
+ *  (4) Remote address
  *
  * This function must return nonzero (true) if the path should be used.
  *
@@ -1664,108 +1274,47 @@ typedef int (*ZT_WirePacketSendFunction)(
  * all configured ZeroTier interfaces and check to ensure that the supplied
  * addresses will not result in ZeroTier traffic being sent over a ZeroTier
  * interface (recursion).
+ *
+ * Obviously this is not required in configurations where this can't happen,
+ * such as network containers or embedded.
  */
 typedef int (*ZT_PathCheckFunction)(
-    ZT_Node*,                        /* Node */
-    void*,                           /* User ptr */
-    void*,                           /* Thread ptr */
-    uint64_t,                        /* ZeroTier address */
-    int64_t,                         /* Local socket or -1 if unknown */
-    const struct sockaddr_storage*); /* Remote address */
-
-/**
- * Function to get physical addresses for ZeroTier peers
- *
- * Parameters:
- *  (1) Node
- *  (2) User pointer
- *  (3) ZeroTier address (least significant 40 bits)
- *  (4) Desired address family or -1 for any
- *  (5) Buffer to fill with result
- *
- * If provided this function will be occasionally called to get physical
- * addresses that might be tried to reach a ZeroTier address. It must
- * return a nonzero (true) value if the result buffer has been filled
- * with an address.
- */
-typedef int (*ZT_PathLookupFunction)(
-    ZT_Node*,                  /* Node */
-    void*,                     /* User ptr */
-    void*,                     /* Thread ptr */
-    uint64_t,                  /* ZeroTier address (40 bits) */
-    int,                       /* Desired ss_family or -1 for any */
-    struct sockaddr_storage*); /* Result buffer */
+	ZT_Node *,                        /* Node */
+	void *,                           /* User ptr */
+	const struct sockaddr_storage *,  /* Local address */
+	const struct sockaddr_storage *); /* Remote address */
 
 /****************************************************************************/
 /* C Node API                                                               */
 /****************************************************************************/
 
 /**
- * Structure for configuring ZeroTier core callback functions
- */
-struct ZT_Node_Callbacks {
-    /**
-     * Struct version -- must currently be 0
-     */
-    long version;
-
-    /**
-     * REQUIRED: Function to store and/or replicate state objects
-     */
-    ZT_StatePutFunction statePutFunction;
-
-    /**
-     * REQUIRED: Function to retrieve state objects from an object store
-     */
-    ZT_StateGetFunction stateGetFunction;
-
-    /**
-     * REQUIRED: Function to send packets over the physical wire
-     */
-    ZT_WirePacketSendFunction wirePacketSendFunction;
-
-    /**
-     * REQUIRED: Function to inject frames into a virtual network's TAP
-     */
-    ZT_VirtualNetworkFrameFunction virtualNetworkFrameFunction;
-
-    /**
-     * REQUIRED: Function to be called when virtual networks are configured or changed
-     */
-    ZT_VirtualNetworkConfigFunction virtualNetworkConfigFunction;
-
-    /**
-     * REQUIRED: Function to be called to notify external code of important events
-     */
-    ZT_EventCallback eventCallback;
-
-    /**
-     * OPTIONAL: Function to check whether a given physical path should be used
-     */
-    ZT_PathCheckFunction pathCheckFunction;
-
-    /**
-     * OPTIONAL: Function to get hints to physical paths to ZeroTier addresses
-     */
-    ZT_PathLookupFunction pathLookupFunction;
-};
-
-/**
- * Create a new ZeroTier node
+ * Create a new ZeroTier One node
  *
- * This will attempt to load its identity via the state get function in the
- * callback struct. If that fails it will generate a new identity and store
- * it. Identity generation can take anywhere from a few hundred milliseconds
- * to a few seconds depending on your CPU speed.
+ * Note that this can take a few seconds the first time it's called, as it
+ * will generate an identity.
  *
  * @param node Result: pointer is set to new node instance on success
  * @param uptr User pointer to pass to functions/callbacks
- * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
- * @param callbacks Callback function configuration
  * @param now Current clock in milliseconds
+ * @param dataStoreGetFunction Function called to get objects from persistent storage
+ * @param dataStorePutFunction Function called to put objects in persistent storage
+ * @param virtualNetworkConfigFunction Function to be called when virtual LANs are created, deleted, or their config parameters change
+ * @param pathCheckFunction A function to check whether a path should be used for ZeroTier traffic, or NULL to allow any path
+ * @param eventCallback Function to receive status updates and non-fatal error notices
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_new(ZT_Node** node, void* uptr, void* tptr, const struct ZT_Node_Callbacks* callbacks, int64_t now);
+enum ZT_ResultCode ZT_Node_new(
+	ZT_Node **node,
+	void *uptr,
+	uint64_t now,
+	ZT_DataStoreGetFunction dataStoreGetFunction,
+	ZT_DataStorePutFunction dataStorePutFunction,
+	ZT_WirePacketSendFunction wirePacketSendFunction,
+	ZT_VirtualNetworkFrameFunction virtualNetworkFrameFunction,
+	ZT_VirtualNetworkConfigFunction virtualNetworkConfigFunction,
+	ZT_PathCheckFunction pathCheckFunction,
+	ZT_EventCallback eventCallback);
 
 /**
  * Delete a node and free all resources it consumes
@@ -1775,29 +1324,33 @@ ZT_SDK_API enum ZT_ResultCode ZT_Node_new(ZT_Node** node, void* uptr, void* tptr
  *
  * @param node Node to delete
  */
-ZT_SDK_API void ZT_Node_delete(ZT_Node* node);
+void ZT_Node_delete(ZT_Node *node);
 
 /**
  * Process a packet received from the physical wire
  *
  * @param node Node instance
- * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
  * @param now Current clock in milliseconds
- * @param localSocket Local socket (you can use 0 if only one local socket is bound and ignore this)
+ * @param localAddress Local address, or point to ZT_SOCKADDR_NULL if unspecified
  * @param remoteAddress Origin of packet
  * @param packetData Packet data
  * @param packetLength Packet length
  * @param nextBackgroundTaskDeadline Value/result: set to deadline for next call to processBackgroundTasks()
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API enum ZT_ResultCode
-ZT_Node_processWirePacket(ZT_Node* node, void* tptr, int64_t now, int64_t localSocket, const struct sockaddr_storage* remoteAddress, const void* packetData, unsigned int packetLength, volatile int64_t* nextBackgroundTaskDeadline);
+enum ZT_ResultCode ZT_Node_processWirePacket(
+	ZT_Node *node,
+	uint64_t now,
+	const struct sockaddr_storage *localAddress,
+	const struct sockaddr_storage *remoteAddress,
+	const void *packetData,
+	unsigned int packetLength,
+	volatile uint64_t *nextBackgroundTaskDeadline);
 
 /**
  * Process a frame from a virtual network port (tap)
  *
  * @param node Node instance
- * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
  * @param now Current clock in milliseconds
  * @param nwid ZeroTier 64-bit virtual network ID
  * @param sourceMac Source MAC address (least significant 48 bits)
@@ -1809,35 +1362,33 @@ ZT_Node_processWirePacket(ZT_Node* node, void* tptr, int64_t now, int64_t localS
  * @param nextBackgroundTaskDeadline Value/result: set to deadline for next call to processBackgroundTasks()
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_processVirtualNetworkFrame(
-    ZT_Node* node,
-    void* tptr,
-    int64_t now,
-    uint64_t nwid,
-    uint64_t sourceMac,
-    uint64_t destMac,
-    unsigned int etherType,
-    unsigned int vlanId,
-    const void* frameData,
-    unsigned int frameLength,
-    volatile int64_t* nextBackgroundTaskDeadline);
+enum ZT_ResultCode ZT_Node_processVirtualNetworkFrame(
+	ZT_Node *node,
+	uint64_t now,
+	uint64_t nwid,
+	uint64_t sourceMac,
+	uint64_t destMac,
+	unsigned int etherType,
+	unsigned int vlanId,
+	const void *frameData,
+	unsigned int frameLength,
+	volatile uint64_t *nextBackgroundTaskDeadline);
 
 /**
  * Perform periodic background operations
  *
  * @param node Node instance
- * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
  * @param now Current clock in milliseconds
  * @param nextBackgroundTaskDeadline Value/result: set to deadline for next call to processBackgroundTasks()
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_processBackgroundTasks(ZT_Node* node, void* tptr, int64_t now, volatile int64_t* nextBackgroundTaskDeadline);
+enum ZT_ResultCode ZT_Node_processBackgroundTasks(ZT_Node *node,uint64_t now,volatile uint64_t *nextBackgroundTaskDeadline);
 
 /**
  * Join a network
  *
  * This may generate calls to the port config callback before it returns,
- * or these may be differed if a netconf is not available yet.
+ * or these may be deffered if a netconf is not available yet.
  *
  * If we are already a member of the network, nothing is done and OK is
  * returned.
@@ -1847,7 +1398,7 @@ ZT_SDK_API enum ZT_ResultCode ZT_Node_processBackgroundTasks(ZT_Node* node, void
  * @param uptr An arbitrary pointer to associate with this network (default: NULL)
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_join(ZT_Node* node, uint64_t nwid, void* uptr, void* tptr);
+enum ZT_ResultCode ZT_Node_join(ZT_Node *node,uint64_t nwid,void *uptr);
 
 /**
  * Leave a network
@@ -1864,7 +1415,7 @@ ZT_SDK_API enum ZT_ResultCode ZT_Node_join(ZT_Node* node, uint64_t nwid, void* u
  * @param uptr Target pointer is set to uptr (if not NULL)
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_leave(ZT_Node* node, uint64_t nwid, void** uptr, void* tptr);
+enum ZT_ResultCode ZT_Node_leave(ZT_Node *node,uint64_t nwid,void **uptr);
 
 /**
  * Subscribe to an Ethernet multicast group
@@ -1886,13 +1437,12 @@ ZT_SDK_API enum ZT_ResultCode ZT_Node_leave(ZT_Node* node, uint64_t nwid, void**
  * This does not generate an update call to networkConfigCallback().
  *
  * @param node Node instance
- * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
  * @param nwid 64-bit network ID
  * @param multicastGroup Ethernet multicast or broadcast MAC (least significant 48 bits)
  * @param multicastAdi Multicast ADI (least significant 32 bits only, use 0 if not needed)
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_multicastSubscribe(ZT_Node* node, void* tptr, uint64_t nwid, uint64_t multicastGroup, unsigned long multicastAdi);
+enum ZT_ResultCode ZT_Node_multicastSubscribe(ZT_Node *node,uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi);
 
 /**
  * Unsubscribe from an Ethernet multicast group (or all groups)
@@ -1908,33 +1458,7 @@ ZT_SDK_API enum ZT_ResultCode ZT_Node_multicastSubscribe(ZT_Node* node, void* tp
  * @param multicastAdi Multicast ADI (least significant 32 bits only, use 0 if not needed)
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_multicastUnsubscribe(ZT_Node* node, uint64_t nwid, uint64_t multicastGroup, unsigned long multicastAdi);
-
-/**
- * Add or update a moon
- *
- * Moons are persisted in the data store in moons.d/, so this can persist
- * across invocations if the contents of moon.d are scanned and orbit is
- * called for each on startup.
- *
- * @param node Node instance
- * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
- * @param moonWorldId Moon's world ID
- * @param moonSeed If non-zero, the ZeroTier address of any member of the moon to query for moon definition
- * @param len Length of moonWorld in bytes
- * @return Error if moon was invalid or failed to be added
- */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_orbit(ZT_Node* node, void* tptr, uint64_t moonWorldId, uint64_t moonSeed);
-
-/**
- * Remove a moon (does nothing if not present)
- *
- * @param node Node instance
- * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
- * @param moonWorldId World ID of moon to remove
- * @return Error if anything bad happened
- */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_deorbit(ZT_Node* node, void* tptr, uint64_t moonWorldId);
+enum ZT_ResultCode ZT_Node_multicastUnsubscribe(ZT_Node *node,uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi);
 
 /**
  * Get this node's 40-bit ZeroTier address
@@ -1942,7 +1466,7 @@ ZT_SDK_API enum ZT_ResultCode ZT_Node_deorbit(ZT_Node* node, void* tptr, uint64_
  * @param node Node instance
  * @return ZeroTier address (least significant 40 bits of 64-bit int)
  */
-ZT_SDK_API uint64_t ZT_Node_address(ZT_Node* node);
+uint64_t ZT_Node_address(ZT_Node *node);
 
 /**
  * Get the status of this node
@@ -1950,7 +1474,7 @@ ZT_SDK_API uint64_t ZT_Node_address(ZT_Node* node);
  * @param node Node instance
  * @param status Buffer to fill with current node status
  */
-ZT_SDK_API void ZT_Node_status(ZT_Node* node, ZT_NodeStatus* status);
+void ZT_Node_status(ZT_Node *node,ZT_NodeStatus *status);
 
 /**
  * Get a list of known peer nodes
@@ -1961,7 +1485,7 @@ ZT_SDK_API void ZT_Node_status(ZT_Node* node, ZT_NodeStatus* status);
  * @param node Node instance
  * @return List of known peers or NULL on failure
  */
-ZT_SDK_API ZT_PeerList* ZT_Node_peers(ZT_Node* node);
+ZT_PeerList *ZT_Node_peers(ZT_Node *node);
 
 /**
  * Get the status of a virtual network
@@ -1973,7 +1497,7 @@ ZT_SDK_API ZT_PeerList* ZT_Node_peers(ZT_Node* node);
  * @param nwid 64-bit network ID
  * @return Network configuration or NULL if we are not a member of this network
  */
-ZT_SDK_API ZT_VirtualNetworkConfig* ZT_Node_networkConfig(ZT_Node* node, uint64_t nwid);
+ZT_VirtualNetworkConfig *ZT_Node_networkConfig(ZT_Node *node,uint64_t nwid);
 
 /**
  * Enumerate and get status of all networks
@@ -1981,7 +1505,7 @@ ZT_SDK_API ZT_VirtualNetworkConfig* ZT_Node_networkConfig(ZT_Node* node, uint64_
  * @param node Node instance
  * @return List of networks or NULL on failure
  */
-ZT_SDK_API ZT_VirtualNetworkList* ZT_Node_networks(ZT_Node* node);
+ZT_VirtualNetworkList *ZT_Node_networks(ZT_Node *node);
 
 /**
  * Free a query result buffer
@@ -1991,7 +1515,7 @@ ZT_SDK_API ZT_VirtualNetworkList* ZT_Node_networks(ZT_Node* node);
  * @param node Node instance
  * @param qr Query result buffer
  */
-ZT_SDK_API void ZT_Node_freeQueryResult(ZT_Node* node, void* qr);
+void ZT_Node_freeQueryResult(ZT_Node *node,void *qr);
 
 /**
  * Add a local interface address
@@ -2015,28 +1539,12 @@ ZT_SDK_API void ZT_Node_freeQueryResult(ZT_Node* node, void* qr);
  * @param addr Local interface address
  * @return Boolean: non-zero if address was accepted and added
  */
-ZT_SDK_API int ZT_Node_addLocalInterfaceAddress(ZT_Node* node, const struct sockaddr_storage* addr);
+int ZT_Node_addLocalInterfaceAddress(ZT_Node *node,const struct sockaddr_storage *addr);
 
 /**
  * Clear local interface addresses
  */
-ZT_SDK_API void ZT_Node_clearLocalInterfaceAddresses(ZT_Node* node);
-
-/**
- * Send a VERB_USER_MESSAGE to another ZeroTier node
- *
- * There is no delivery guarantee here. Failure can occur if the message is
- * too large or if dest is not a valid ZeroTier address.
- *
- * @param node Node instance
- * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
- * @param dest Destination ZeroTier address
- * @param typeId VERB_USER_MESSAGE type ID
- * @param data Payload data to attach to user message
- * @param len Length of data in bytes
- * @return Boolean: non-zero on success, zero on failure
- */
-ZT_SDK_API int ZT_Node_sendUserMessage(ZT_Node* node, void* tptr, uint64_t dest, uint64_t typeId, const void* data, unsigned int len);
+void ZT_Node_clearLocalInterfaceAddresses(ZT_Node *node);
 
 /**
  * Set a network configuration master instance for this node
@@ -2049,21 +1557,175 @@ ZT_SDK_API int ZT_Node_sendUserMessage(ZT_Node* node, void* tptr, uint64_t dest,
  * NetworkConfigMaster base class in node/. No type checking is performed,
  * so a pointer to anything else will result in a crash.
  *
- * @param node ZeroTier One node
+ * @param node ZertTier One node
  * @param networkConfigMasterInstance Instance of NetworkConfigMaster C++ class or NULL to disable
  * @return OK (0) or error code if a fatal error condition has occurred
  */
-ZT_SDK_API void ZT_Node_setNetconfMaster(ZT_Node* node, void* networkConfigMasterInstance);
+void ZT_Node_setNetconfMaster(ZT_Node *node,void *networkConfigMasterInstance);
 
 /**
- * Set configuration for a given physical path
+ * Initiate a VL1 circuit test
+ *
+ * This sends an initial VERB_CIRCUIT_TEST and reports results back to the
+ * supplied callback until circuitTestEnd() is called. The supplied
+ * ZT_CircuitTest structure should be initially zeroed and then filled
+ * in with settings and hops.
+ *
+ * It is the caller's responsibility to call circuitTestEnd() and then
+ * to dispose of the test structure. Otherwise this node will listen
+ * for results forever.
  *
  * @param node Node instance
- * @param pathNetwork Network/CIDR of path or NULL to clear the cache and reset all paths to default
- * @param pathConfig Path configuration or NULL to erase this entry and therefore reset it to NULL
- * @return OK or error code
+ * @param test Test configuration
+ * @param reportCallback Function to call each time a report is received
+ * @return OK or error if, for example, test is too big for a packet or support isn't compiled in
  */
-ZT_SDK_API enum ZT_ResultCode ZT_Node_setPhysicalPathConfiguration(ZT_Node* node, const struct sockaddr_storage* pathNetwork, const ZT_PhysicalPathConfiguration* pathConfig);
+enum ZT_ResultCode ZT_Node_circuitTestBegin(ZT_Node *node,ZT_CircuitTest *test,void (*reportCallback)(ZT_Node *, ZT_CircuitTest *,const ZT_CircuitTestReport *));
+
+/**
+ * Stop listening for results to a given circuit test
+ *
+ * This does not free the 'test' structure. The caller may do that
+ * after calling this method to unregister it.
+ *
+ * Any reports that are received for a given test ID after it is
+ * terminated are ignored.
+ *
+ * @param node Node instance
+ * @param test Test configuration to unregister
+ */
+void ZT_Node_circuitTestEnd(ZT_Node *node,ZT_CircuitTest *test);
+
+/**
+ * Initialize cluster operation
+ *
+ * This initializes the internal structures and state for cluster operation.
+ * It takes two function pointers. The first is to a function that can be
+ * used to send data to cluster peers (mechanism is not defined by Node),
+ * and the second is to a function that can be used to get the location of
+ * a physical address in X,Y,Z coordinate space (e.g. as cartesian coordinates
+ * projected from the center of the Earth).
+ *
+ * Send function takes an arbitrary pointer followed by the cluster member ID
+ * to send data to, a pointer to the data, and the length of the data. The
+ * maximum message length is ZT_CLUSTER_MAX_MESSAGE_LENGTH (65535). Messages
+ * must be delivered whole and may be dropped or transposed, though high
+ * failure rates are undesirable and can cause problems. Validity checking or
+ * CRC is also not required since the Node validates the authenticity of
+ * cluster messages using cryptogrphic methods and will silently drop invalid
+ * messages.
+ *
+ * Address to location function is optional and if NULL geo-handoff is not
+ * enabled (in this case x, y, and z in clusterInit are also unused). It
+ * takes an arbitrary pointer followed by a physical address and three result
+ * parameters for x, y, and z. It returns zero on failure or nonzero if these
+ * three coordinates have been set. Coordinate space is arbitrary and can be
+ * e.g. coordinates on Earth relative to Earth's center. These can be obtained
+ * from latitutde and longitude with versions of the Haversine formula.
+ *
+ * See: http://stackoverflow.com/questions/1185408/converting-from-longitude-latitude-to-cartesian-coordinates
+ *
+ * Neither the send nor the address to location function should block. If the
+ * address to location function does not have a location for an address, it
+ * should return zero and then look up the address for future use since it
+ * will be called again in (typically) 1-3 minutes.
+ *
+ * Note that both functions can be called from any thread from which the
+ * various Node functions are called, and so must be thread safe if multiple
+ * threads are being used.
+ *
+ * @param node Node instance
+ * @param myId My cluster member ID (less than or equal to ZT_CLUSTER_MAX_MEMBERS)
+ * @param zeroTierPhysicalEndpoints Preferred physical address(es) for ZeroTier clients to contact this cluster member (for peer redirect)
+ * @param numZeroTierPhysicalEndpoints Number of physical endpoints in zeroTierPhysicalEndpoints[] (max allowed: 255)
+ * @param x My cluster member's X location
+ * @param y My cluster member's Y location
+ * @param z My cluster member's Z location
+ * @param sendFunction Function to be called to send data to other cluster members
+ * @param sendFunctionArg First argument to sendFunction()
+ * @param addressToLocationFunction Function to be called to get the location of a physical address or NULL to disable geo-handoff
+ * @param addressToLocationFunctionArg First argument to addressToLocationFunction()
+ * @return OK or UNSUPPORTED_OPERATION if this Node was not built with cluster support
+ */
+enum ZT_ResultCode ZT_Node_clusterInit(
+	ZT_Node *node,
+	unsigned int myId,
+	const struct sockaddr_storage *zeroTierPhysicalEndpoints,
+	unsigned int numZeroTierPhysicalEndpoints,
+	int x,
+	int y,
+	int z,
+	void (*sendFunction)(void *,unsigned int,const void *,unsigned int),
+	void *sendFunctionArg,
+	int (*addressToLocationFunction)(void *,const struct sockaddr_storage *,int *,int *,int *),
+	void *addressToLocationFunctionArg);
+
+/**
+ * Add a member to this cluster
+ *
+ * Calling this without having called clusterInit() will do nothing.
+ *
+ * @param node Node instance
+ * @param memberId Member ID (must be less than or equal to ZT_CLUSTER_MAX_MEMBERS)
+ * @return OK or error if clustering is disabled, ID invalid, etc.
+ */
+enum ZT_ResultCode ZT_Node_clusterAddMember(ZT_Node *node,unsigned int memberId);
+
+/**
+ * Remove a member from this cluster
+ *
+ * Calling this without having called clusterInit() will do nothing.
+ *
+ * @param node Node instance
+ * @param memberId Member ID to remove (nothing happens if not present)
+ */
+void ZT_Node_clusterRemoveMember(ZT_Node *node,unsigned int memberId);
+
+/**
+ * Handle an incoming cluster state message
+ *
+ * The message itself contains cluster member IDs, and invalid or badly
+ * addressed messages will be silently discarded.
+ *
+ * Calling this without having called clusterInit() will do nothing.
+ *
+ * @param node Node instance
+ * @param msg Cluster message
+ * @param len Length of cluster message
+ */
+void ZT_Node_clusterHandleIncomingMessage(ZT_Node *node,const void *msg,unsigned int len);
+
+/**
+ * Get the current status of the cluster from this node's point of view
+ *
+ * Calling this without clusterInit() or without cluster support will just
+ * zero out the structure and show a cluster size of zero.
+ *
+ * @param node Node instance
+ * @param cs Cluster status structure to fill with data
+ */
+void ZT_Node_clusterStatus(ZT_Node *node,ZT_ClusterStatus *cs);
+
+/**
+ * Do things in the background until Node dies
+ *
+ * This function can be called from one or more background threads to process
+ * certain tasks in the background to improve foreground performance. It will
+ * not return until the Node is shut down. If threading is not enabled in
+ * this build it will return immediately and will do nothing.
+ *
+ * This is completely optional. If this is never called, all processing is
+ * done in the foreground in the various processXXXX() methods.
+ *
+ * This does NOT replace or eliminate the need to call the normal
+ * processBackgroundTasks() function in your main loop. This mechanism is
+ * used to offload the processing of expensive mssages onto background
+ * handler threads to prevent foreground performance degradation under
+ * high load.
+ *
+ * @param node Node instance
+ */
+void ZT_Node_backgroundThreadMain(ZT_Node *node);
 
 /**
  * Get ZeroTier One version
@@ -2071,8 +1733,9 @@ ZT_SDK_API enum ZT_ResultCode ZT_Node_setPhysicalPathConfiguration(ZT_Node* node
  * @param major Result: major version
  * @param minor Result: minor version
  * @param revision Result: revision
+ * @param featureFlags: Result: feature flag bitmap
  */
-ZT_SDK_API void ZT_version(int* major, int* minor, int* revision);
+void ZT_version(int *major,int *minor,int *revision,unsigned long *featureFlags);
 
 #ifdef __cplusplus
 }
diff --git a/java/README.md b/java/README.md
index 979101c5e..2650ec3df 100644
--- a/java/README.md
+++ b/java/README.md
@@ -5,7 +5,7 @@ ZeroTier One SDK - Android JNI Wrapper
 Building
 -----
 
-Requires:
+Reqires:
 
 * JDK
 * ANT
diff --git a/java/jni/Android.mk b/java/jni/Android.mk
new file mode 100644
index 000000000..5c2f1c790
--- /dev/null
+++ b/java/jni/Android.mk
@@ -0,0 +1,47 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := ZeroTierOneJNI
+LOCAL_C_INCLUDES := $(ZT1)/include
+LOCAL_C_INCLUDES += $(ZT1)/node
+LOCAL_LDLIBS := -llog
+# LOCAL_CFLAGS := -g
+
+# ZeroTierOne SDK source files
+LOCAL_SRC_FILES := \
+	$(ZT1)/ext/lz4/lz4.c \
+	$(ZT1)/ext/json-parser/json.c \
+	$(ZT1)/ext/http-parser/http_parser.c \
+	$(ZT1)/node/C25519.cpp \
+	$(ZT1)/node/CertificateOfMembership.cpp \
+	$(ZT1)/node/DeferredPackets.cpp \
+	$(ZT1)/node/Dictionary.cpp \
+	$(ZT1)/node/Identity.cpp \
+	$(ZT1)/node/IncomingPacket.cpp \
+	$(ZT1)/node/InetAddress.cpp \
+	$(ZT1)/node/Multicaster.cpp \
+	$(ZT1)/node/Network.cpp \
+	$(ZT1)/node/NetworkConfig.cpp \
+	$(ZT1)/node/Node.cpp \
+	$(ZT1)/node/OutboundMulticast.cpp \
+	$(ZT1)/node/Packet.cpp \
+	$(ZT1)/node/Path.cpp \
+	$(ZT1)/node/Peer.cpp \
+	$(ZT1)/node/Poly1305.cpp \
+	$(ZT1)/node/Salsa20.cpp \
+	$(ZT1)/node/SelfAwareness.cpp \
+	$(ZT1)/node/SHA512.cpp \
+	$(ZT1)/node/Switch.cpp \
+	$(ZT1)/node/Topology.cpp \
+	$(ZT1)/node/Utils.cpp \
+	$(ZT1)/osdep/Http.cpp \
+	$(ZT1)/osdep/OSUtils.cpp
+
+# JNI Files
+LOCAL_SRC_FILES += \
+	com_zerotierone_sdk_Node.cpp \
+	ZT_jniutils.cpp \
+	ZT_jnilookup.cpp
+
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/java/jni/Application.mk b/java/jni/Application.mk
new file mode 100644
index 000000000..608e94c0a
--- /dev/null
+++ b/java/jni/Application.mk
@@ -0,0 +1,5 @@
+NDK_TOOLCHAIN_VERSION := clang
+APP_STL := c++_static
+APP_CPPFLAGS := -O3 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
+APP_PLATFORM := android-14
+APP_ABI := all
diff --git a/java/jni/ZT_jnicache.cpp b/java/jni/ZT_jnicache.cpp
deleted file mode 100644
index c721a9ee1..000000000
--- a/java/jni/ZT_jnicache.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-//
-// Created by Brenton Bostick on 1/18/23.
-//
-
-#include "ZT_jnicache.h"
-
-#include "ZT_jniutils.h"
-
-#include <cassert>
-
-#define LOG_TAG "Cache"
-
-#define EXCEPTIONANDNULLCHECK(var) \
-    do { \
-        if (env->ExceptionCheck()) { \
-            assert(false && "Exception"); \
-        } \
-        if ((var) == NULL) { \
-            assert(false && #var " is NULL"); \
-        } \
-    } while (false)
-
-#define SETCLASS(classVar, classNameString) \
-	do { \
-        jclass classVar ## _local = env->FindClass(classNameString); \
-        EXCEPTIONANDNULLCHECK(classVar ## _local); \
-        classVar = reinterpret_cast<jclass>(env->NewGlobalRef(classVar ## _local)); \
-        EXCEPTIONANDNULLCHECK(classVar); \
-        env->DeleteLocalRef(classVar ## _local); \
-    } while (false)
-
-#define SETOBJECT(objectVar, code) \
-	do { \
-        jobject objectVar ## _local = code; \
-        EXCEPTIONANDNULLCHECK(objectVar ## _local); \
-        objectVar = env->NewGlobalRef(objectVar ## _local); \
-        EXCEPTIONANDNULLCHECK(objectVar); \
-        env->DeleteLocalRef(objectVar ## _local); \
-    } while (false)
-
-
-//
-// Classes
-//
-
-jclass ArrayList_class;
-jclass DataStoreGetListener_class;
-jclass DataStorePutListener_class;
-jclass EventListener_class;
-jclass Event_class;
-jclass Inet4Address_class;
-jclass Inet6Address_class;
-jclass InetAddress_class;
-jclass InetSocketAddress_class;
-jclass NodeStatus_class;
-jclass Node_class;
-jclass PacketSender_class;
-jclass PathChecker_class;
-jclass PeerPhysicalPath_class;
-jclass PeerRole_class;
-jclass Peer_class;
-jclass ResultCode_class;
-jclass Version_class;
-jclass VirtualNetworkConfigListener_class;
-jclass VirtualNetworkConfigOperation_class;
-jclass VirtualNetworkConfig_class;
-jclass VirtualNetworkDNS_class;
-jclass VirtualNetworkFrameListener_class;
-jclass VirtualNetworkRoute_class;
-jclass VirtualNetworkStatus_class;
-jclass VirtualNetworkType_class;
-
-//
-// Instance methods
-//
-
-jmethodID ArrayList_add_method;
-jmethodID ArrayList_ctor;
-jmethodID DataStoreGetListener_onDataStoreGet_method;
-jmethodID DataStorePutListener_onDataStorePut_method;
-jmethodID DataStorePutListener_onDelete_method;
-jmethodID EventListener_onEvent_method;
-jmethodID EventListener_onTrace_method;
-jmethodID InetAddress_getAddress_method;
-jmethodID InetSocketAddress_ctor;
-jmethodID InetSocketAddress_getAddress_method;
-jmethodID InetSocketAddress_getPort_method;
-jmethodID NodeStatus_ctor;
-jmethodID PacketSender_onSendPacketRequested_method;
-jmethodID PathChecker_onPathCheck_method;
-jmethodID PathChecker_onPathLookup_method;
-jmethodID PeerPhysicalPath_ctor;
-jmethodID Peer_ctor;
-jmethodID Version_ctor;
-jmethodID VirtualNetworkConfigListener_onNetworkConfigurationUpdated_method;
-jmethodID VirtualNetworkConfig_ctor;
-jmethodID VirtualNetworkDNS_ctor;
-jmethodID VirtualNetworkFrameListener_onVirtualNetworkFrame_method;
-jmethodID VirtualNetworkRoute_ctor;
-
-//
-// Static methods
-//
-
-jmethodID Event_fromInt_method;
-jmethodID InetAddress_getByAddress_method;
-jmethodID PeerRole_fromInt_method;
-jmethodID ResultCode_fromInt_method;
-jmethodID VirtualNetworkConfigOperation_fromInt_method;
-jmethodID VirtualNetworkStatus_fromInt_method;
-jmethodID VirtualNetworkType_fromInt_method;
-
-//
-// Enums
-//
-
-jobject ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-jobject ResultCode_RESULT_OK_enum;
-
-void setupJNICache(JavaVM *vm) {
-
-    JNIEnv *env;
-    GETENV(env, vm);
-
-    //
-    // Classes
-    //
-
-    SETCLASS(ArrayList_class, "java/util/ArrayList");
-    SETCLASS(DataStoreGetListener_class, "com/zerotier/sdk/DataStoreGetListener");
-    SETCLASS(DataStorePutListener_class, "com/zerotier/sdk/DataStorePutListener");
-    SETCLASS(EventListener_class, "com/zerotier/sdk/EventListener");
-    SETCLASS(Event_class, "com/zerotier/sdk/Event");
-    SETCLASS(Inet4Address_class, "java/net/Inet4Address");
-    SETCLASS(Inet6Address_class, "java/net/Inet6Address");
-    SETCLASS(InetAddress_class, "java/net/InetAddress");
-    SETCLASS(InetSocketAddress_class, "java/net/InetSocketAddress");
-    SETCLASS(NodeStatus_class, "com/zerotier/sdk/NodeStatus");
-    SETCLASS(Node_class, "com/zerotier/sdk/Node");
-    SETCLASS(PacketSender_class, "com/zerotier/sdk/PacketSender");
-    SETCLASS(PathChecker_class, "com/zerotier/sdk/PathChecker");
-    SETCLASS(PeerPhysicalPath_class, "com/zerotier/sdk/PeerPhysicalPath");
-    SETCLASS(PeerRole_class, "com/zerotier/sdk/PeerRole");
-    SETCLASS(Peer_class, "com/zerotier/sdk/Peer");
-    SETCLASS(ResultCode_class, "com/zerotier/sdk/ResultCode");
-    SETCLASS(Version_class, "com/zerotier/sdk/Version");
-    SETCLASS(VirtualNetworkConfigListener_class, "com/zerotier/sdk/VirtualNetworkConfigListener");
-    SETCLASS(VirtualNetworkConfigOperation_class, "com/zerotier/sdk/VirtualNetworkConfigOperation");
-    SETCLASS(VirtualNetworkConfig_class, "com/zerotier/sdk/VirtualNetworkConfig");
-    SETCLASS(VirtualNetworkDNS_class, "com/zerotier/sdk/VirtualNetworkDNS");
-    SETCLASS(VirtualNetworkFrameListener_class, "com/zerotier/sdk/VirtualNetworkFrameListener");
-    SETCLASS(VirtualNetworkRoute_class, "com/zerotier/sdk/VirtualNetworkRoute");
-    SETCLASS(VirtualNetworkStatus_class, "com/zerotier/sdk/VirtualNetworkStatus");
-    SETCLASS(VirtualNetworkType_class, "com/zerotier/sdk/VirtualNetworkType");
-
-    //
-    // Instance methods
-    //
-
-    EXCEPTIONANDNULLCHECK(ArrayList_add_method = env->GetMethodID(ArrayList_class, "add", "(Ljava/lang/Object;)Z"));
-    EXCEPTIONANDNULLCHECK(ArrayList_ctor = env->GetMethodID(ArrayList_class, "<init>", "(I)V"));
-    EXCEPTIONANDNULLCHECK(DataStoreGetListener_onDataStoreGet_method = env->GetMethodID(DataStoreGetListener_class, "onDataStoreGet", "(Ljava/lang/String;[B)J"));
-    EXCEPTIONANDNULLCHECK(DataStorePutListener_onDataStorePut_method = env->GetMethodID(DataStorePutListener_class, "onDataStorePut", "(Ljava/lang/String;[BZ)I"));
-    EXCEPTIONANDNULLCHECK(DataStorePutListener_onDelete_method = env->GetMethodID(DataStorePutListener_class, "onDelete", "(Ljava/lang/String;)I"));
-    EXCEPTIONANDNULLCHECK(EventListener_onEvent_method = env->GetMethodID(EventListener_class, "onEvent", "(Lcom/zerotier/sdk/Event;)V"));
-    EXCEPTIONANDNULLCHECK(EventListener_onTrace_method = env->GetMethodID(EventListener_class, "onTrace", "(Ljava/lang/String;)V"));
-    EXCEPTIONANDNULLCHECK(InetAddress_getAddress_method = env->GetMethodID(InetAddress_class, "getAddress", "()[B"));
-    EXCEPTIONANDNULLCHECK(InetSocketAddress_ctor = env->GetMethodID(InetSocketAddress_class, "<init>", "(Ljava/net/InetAddress;I)V"));
-    EXCEPTIONANDNULLCHECK(InetSocketAddress_getAddress_method = env->GetMethodID(InetSocketAddress_class, "getAddress", "()Ljava/net/InetAddress;"));
-    EXCEPTIONANDNULLCHECK(InetSocketAddress_getPort_method = env->GetMethodID(InetSocketAddress_class, "getPort", "()I"));
-    EXCEPTIONANDNULLCHECK(NodeStatus_ctor = env->GetMethodID(NodeStatus_class, "<init>", "(JLjava/lang/String;Ljava/lang/String;Z)V"));
-    EXCEPTIONANDNULLCHECK(PacketSender_onSendPacketRequested_method = env->GetMethodID(PacketSender_class, "onSendPacketRequested", "(JLjava/net/InetSocketAddress;[BI)I"));
-    EXCEPTIONANDNULLCHECK(PathChecker_onPathCheck_method = env->GetMethodID(PathChecker_class, "onPathCheck", "(JJLjava/net/InetSocketAddress;)Z"));
-    EXCEPTIONANDNULLCHECK(PathChecker_onPathLookup_method = env->GetMethodID(PathChecker_class, "onPathLookup", "(JI)Ljava/net/InetSocketAddress;"));
-    EXCEPTIONANDNULLCHECK(PeerPhysicalPath_ctor = env->GetMethodID(PeerPhysicalPath_class, "<init>", "(Ljava/net/InetSocketAddress;JJZ)V"));
-    EXCEPTIONANDNULLCHECK(Peer_ctor = env->GetMethodID(Peer_class, "<init>", "(JIIIILcom/zerotier/sdk/PeerRole;[Lcom/zerotier/sdk/PeerPhysicalPath;)V"));
-    EXCEPTIONANDNULLCHECK(Version_ctor = env->GetMethodID(Version_class, "<init>", "(III)V"));
-    EXCEPTIONANDNULLCHECK(VirtualNetworkConfigListener_onNetworkConfigurationUpdated_method = env->GetMethodID(VirtualNetworkConfigListener_class, "onNetworkConfigurationUpdated", "(JLcom/zerotier/sdk/VirtualNetworkConfigOperation;Lcom/zerotier/sdk/VirtualNetworkConfig;)I"));
-    EXCEPTIONANDNULLCHECK(VirtualNetworkConfig_ctor = env->GetMethodID(VirtualNetworkConfig_class, "<init>", "(JJLjava/lang/String;Lcom/zerotier/sdk/VirtualNetworkStatus;Lcom/zerotier/sdk/VirtualNetworkType;IZZZIJ[Ljava/net/InetSocketAddress;[Lcom/zerotier/sdk/VirtualNetworkRoute;Lcom/zerotier/sdk/VirtualNetworkDNS;)V"));
-    EXCEPTIONANDNULLCHECK(VirtualNetworkDNS_ctor = env->GetMethodID(VirtualNetworkDNS_class, "<init>", "(Ljava/lang/String;Ljava/util/ArrayList;)V"));
-    EXCEPTIONANDNULLCHECK(VirtualNetworkFrameListener_onVirtualNetworkFrame_method = env->GetMethodID(VirtualNetworkFrameListener_class, "onVirtualNetworkFrame", "(JJJJJ[B)V"));
-    EXCEPTIONANDNULLCHECK(VirtualNetworkRoute_ctor = env->GetMethodID(VirtualNetworkRoute_class, "<init>", "(Ljava/net/InetSocketAddress;Ljava/net/InetSocketAddress;II)V"));
-
-    //
-    // Static methods
-    //
-
-    EXCEPTIONANDNULLCHECK(Event_fromInt_method = env->GetStaticMethodID(Event_class, "fromInt", "(I)Lcom/zerotier/sdk/Event;"));
-    EXCEPTIONANDNULLCHECK(InetAddress_getByAddress_method = env->GetStaticMethodID(InetAddress_class, "getByAddress", "([B)Ljava/net/InetAddress;"));
-    EXCEPTIONANDNULLCHECK(PeerRole_fromInt_method = env->GetStaticMethodID(PeerRole_class, "fromInt", "(I)Lcom/zerotier/sdk/PeerRole;"));
-    EXCEPTIONANDNULLCHECK(ResultCode_fromInt_method = env->GetStaticMethodID(ResultCode_class, "fromInt", "(I)Lcom/zerotier/sdk/ResultCode;"));
-    EXCEPTIONANDNULLCHECK(VirtualNetworkConfigOperation_fromInt_method = env->GetStaticMethodID(VirtualNetworkConfigOperation_class, "fromInt", "(I)Lcom/zerotier/sdk/VirtualNetworkConfigOperation;"));
-    EXCEPTIONANDNULLCHECK(VirtualNetworkStatus_fromInt_method = env->GetStaticMethodID(VirtualNetworkStatus_class, "fromInt", "(I)Lcom/zerotier/sdk/VirtualNetworkStatus;"));
-    EXCEPTIONANDNULLCHECK(VirtualNetworkType_fromInt_method = env->GetStaticMethodID(VirtualNetworkType_class, "fromInt", "(I)Lcom/zerotier/sdk/VirtualNetworkType;"));
-
-    //
-    // Enums
-    //
-
-    SETOBJECT(ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum, createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL));
-    SETOBJECT(ResultCode_RESULT_OK_enum, createResultObject(env, ZT_RESULT_OK));
-}
-
-void teardownJNICache(JavaVM *vm) {
-
-    JNIEnv *env;
-    GETENV(env, vm);
-
-    env->DeleteGlobalRef(ArrayList_class);
-    env->DeleteGlobalRef(DataStoreGetListener_class);
-    env->DeleteGlobalRef(DataStorePutListener_class);
-    env->DeleteGlobalRef(EventListener_class);
-    env->DeleteGlobalRef(Event_class);
-    env->DeleteGlobalRef(InetAddress_class);
-    env->DeleteGlobalRef(InetSocketAddress_class);
-    env->DeleteGlobalRef(NodeStatus_class);
-    env->DeleteGlobalRef(Node_class);
-    env->DeleteGlobalRef(PacketSender_class);
-    env->DeleteGlobalRef(PathChecker_class);
-    env->DeleteGlobalRef(PeerPhysicalPath_class);
-    env->DeleteGlobalRef(PeerRole_class);
-    env->DeleteGlobalRef(Peer_class);
-    env->DeleteGlobalRef(ResultCode_class);
-    env->DeleteGlobalRef(Version_class);
-    env->DeleteGlobalRef(VirtualNetworkConfigListener_class);
-    env->DeleteGlobalRef(VirtualNetworkConfigOperation_class);
-    env->DeleteGlobalRef(VirtualNetworkConfig_class);
-    env->DeleteGlobalRef(VirtualNetworkDNS_class);
-    env->DeleteGlobalRef(VirtualNetworkFrameListener_class);
-    env->DeleteGlobalRef(VirtualNetworkRoute_class);
-    env->DeleteGlobalRef(VirtualNetworkStatus_class);
-    env->DeleteGlobalRef(VirtualNetworkType_class);
-
-    env->DeleteGlobalRef(ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum);
-    env->DeleteGlobalRef(ResultCode_RESULT_OK_enum);
-}
diff --git a/java/jni/ZT_jnicache.h b/java/jni/ZT_jnicache.h
deleted file mode 100644
index c5cc9cb2f..000000000
--- a/java/jni/ZT_jnicache.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Created by Brenton Bostick on 1/18/23.
-//
-
-#ifndef ZEROTIERANDROID_JNICACHE_H
-#define ZEROTIERANDROID_JNICACHE_H
-
-#include <jni.h>
-
-
-//
-// Classes
-//
-
-extern jclass ArrayList_class;
-extern jclass DataStoreGetListener_class;
-extern jclass DataStorePutListener_class;
-extern jclass EventListener_class;
-extern jclass Event_class;
-extern jclass Inet4Address_class;
-extern jclass Inet6Address_class;
-extern jclass InetAddress_class;
-extern jclass InetSocketAddress_class;
-extern jclass NodeStatus_class;
-extern jclass Node_class;
-extern jclass PacketSender_class;
-extern jclass PathChecker_class;
-extern jclass PeerPhysicalPath_class;
-extern jclass PeerRole_class;
-extern jclass Peer_class;
-extern jclass ResultCode_class;
-extern jclass Version_class;
-extern jclass VirtualNetworkConfigListener_class;
-extern jclass VirtualNetworkConfigOperation_class;
-extern jclass VirtualNetworkConfig_class;
-extern jclass VirtualNetworkDNS_class;
-extern jclass VirtualNetworkFrameListener_class;
-extern jclass VirtualNetworkRoute_class;
-extern jclass VirtualNetworkStatus_class;
-extern jclass VirtualNetworkType_class;
-
-//
-// Instance methods
-//
-
-extern jmethodID ArrayList_add_method;
-extern jmethodID ArrayList_ctor;
-extern jmethodID DataStoreGetListener_onDataStoreGet_method;
-extern jmethodID DataStorePutListener_onDataStorePut_method;
-extern jmethodID DataStorePutListener_onDelete_method;
-extern jmethodID EventListener_onEvent_method;
-extern jmethodID EventListener_onTrace_method;
-extern jmethodID InetAddress_getAddress_method;
-extern jmethodID InetSocketAddress_ctor;
-extern jmethodID InetSocketAddress_getAddress_method;
-extern jmethodID InetSocketAddress_getPort_method;
-extern jmethodID NodeStatus_ctor;
-extern jmethodID PacketSender_onSendPacketRequested_method;
-extern jmethodID PathChecker_onPathCheck_method;
-extern jmethodID PathChecker_onPathLookup_method;
-extern jmethodID PeerPhysicalPath_ctor;
-extern jmethodID Peer_ctor;
-extern jmethodID Version_ctor;
-extern jmethodID VirtualNetworkConfigListener_onNetworkConfigurationUpdated_method;
-extern jmethodID VirtualNetworkConfig_ctor;
-extern jmethodID VirtualNetworkDNS_ctor;
-extern jmethodID VirtualNetworkFrameListener_onVirtualNetworkFrame_method;
-extern jmethodID VirtualNetworkRoute_ctor;
-
-//
-// Static methods
-//
-
-extern jmethodID Event_fromInt_method;
-extern jmethodID InetAddress_getByAddress_method;
-extern jmethodID PeerRole_fromInt_method;
-extern jmethodID ResultCode_fromInt_method;
-extern jmethodID VirtualNetworkConfigOperation_fromInt_method;
-extern jmethodID VirtualNetworkStatus_fromInt_method;
-extern jmethodID VirtualNetworkType_fromInt_method;
-
-//
-// Enums
-//
-
-extern jobject ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-extern jobject ResultCode_RESULT_OK_enum;
-
-void setupJNICache(JavaVM *vm);
-void teardownJNICache(JavaVM *vm);
-
-#endif // ZEROTIERANDROID_JNICACHE_H
diff --git a/java/jni/ZT_jnilookup.cpp b/java/jni/ZT_jnilookup.cpp
new file mode 100644
index 000000000..be52a3666
--- /dev/null
+++ b/java/jni/ZT_jnilookup.cpp
@@ -0,0 +1,158 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include "ZT_jnilookup.h"
+#include "ZT_jniutils.h"
+
+JniLookup::JniLookup()
+    : m_jvm(NULL)
+{
+    LOGV("JNI Cache Created");
+}
+
+JniLookup::JniLookup(JavaVM *jvm)
+    : m_jvm(jvm)
+{
+    LOGV("JNI Cache Created");
+}
+
+JniLookup::~JniLookup()
+{
+    LOGV("JNI Cache Destroyed");
+}
+
+
+void JniLookup::setJavaVM(JavaVM *jvm)
+{ 
+    LOGV("Assigned JVM to object");
+    m_jvm = jvm; 
+}
+
+
+jclass JniLookup::findClass(const std::string &name)
+{
+    if(!m_jvm)
+        return NULL;
+
+    // get the class from the JVM
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        LOGE("Error retreiving JNI Environment");
+        return NULL;
+    }
+
+    jclass cls = env->FindClass(name.c_str());
+    if(env->ExceptionCheck())
+    {
+        LOGE("Error finding class: %s", name.c_str());
+        return NULL;
+    }
+
+    return cls;
+}
+
+
+jmethodID JniLookup::findMethod(jclass cls, const std::string &methodName, const std::string &methodSig)
+{
+    if(!m_jvm)
+        return NULL;
+
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        return NULL;
+    }
+
+    jmethodID mid = env->GetMethodID(cls, methodName.c_str(), methodSig.c_str());
+    if(env->ExceptionCheck())
+    {
+        return NULL;
+    }
+
+    return mid;
+}
+
+jmethodID JniLookup::findStaticMethod(jclass cls, const std::string &methodName, const std::string &methodSig)
+{
+    if(!m_jvm)
+        return NULL;
+
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        return NULL;
+    }
+
+    jmethodID mid = env->GetStaticMethodID(cls, methodName.c_str(), methodSig.c_str());
+    if(env->ExceptionCheck())
+    {
+        return NULL;
+    }
+
+    return mid;
+}
+
+jfieldID JniLookup::findField(jclass cls, const std::string &fieldName, const std::string &typeStr)
+{
+    if(!m_jvm)
+        return NULL;
+
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        return NULL;
+    }
+
+    jfieldID fid = env->GetFieldID(cls, fieldName.c_str(), typeStr.c_str());
+    if(env->ExceptionCheck())
+    {
+        return NULL;
+    }
+
+    return fid;
+}
+
+jfieldID JniLookup::findStaticField(jclass cls, const std::string &fieldName, const std::string &typeStr)
+{
+    if(!m_jvm)
+        return NULL;
+
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        return NULL;
+    }
+
+    jfieldID fid = env->GetStaticFieldID(cls, fieldName.c_str(), typeStr.c_str());
+    if(env->ExceptionCheck())
+    {
+        return NULL;
+    }
+
+    return fid;
+}
\ No newline at end of file
diff --git a/java/jni/ZT_jnilookup.h b/java/jni/ZT_jnilookup.h
new file mode 100644
index 000000000..f5bd97d7d
--- /dev/null
+++ b/java/jni/ZT_jnilookup.h
@@ -0,0 +1,54 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_JNILOOKUP_H_
+#define ZT_JNILOOKUP_H_
+
+#include <jni.h>
+#include <map>
+#include <string>
+
+
+
+class JniLookup {
+public:
+    JniLookup();
+    JniLookup(JavaVM *jvm);
+    ~JniLookup();
+
+    void setJavaVM(JavaVM *jvm);
+
+    jclass findClass(const std::string &name);
+    jmethodID findMethod(jclass cls, const std::string &methodName, const std::string &methodSig);
+    jmethodID findStaticMethod(jclass cls, const std::string &methodName, const std::string &methodSig);
+    jfieldID findField(jclass cls, const std::string &fieldName, const std::string &typeStr);
+    jfieldID findStaticField(jclass cls, const std::string &fieldName, const std::string &typeStr);
+private:
+    JavaVM *m_jvm;
+};
+
+#endif
\ No newline at end of file
diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp
index 8ab507bed..ae1aa9298 100644
--- a/java/jni/ZT_jniutils.cpp
+++ b/java/jni/ZT_jniutils.cpp
@@ -1,139 +1,296 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #include "ZT_jniutils.h"
-
-#include "ZT_jnicache.h"
-
+#include "ZT_jnilookup.h"
 #include <string>
-#include <cassert>
+#include <assert.h>
 
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/types.h>
+extern JniLookup lookup;
 
-#define LOG_TAG "Utils"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 jobject createResultObject(JNIEnv *env, ZT_ResultCode code)
 {
-    jobject resultObject = env->CallStaticObjectMethod(ResultCode_class, ResultCode_fromInt_method, (jint)code);
-    if(env->ExceptionCheck() || resultObject == NULL) {
-        LOGE("Error creating ResultCode object");
+    jclass resultClass = NULL;
+    
+    jobject resultObject = NULL;
+
+    resultClass = lookup.findClass("com/zerotier/sdk/ResultCode");
+    if(resultClass == NULL)
+    {
+        LOGE("Couldnt find ResultCode class");
+        return NULL; // exception thrown
+    }
+
+    std::string fieldName;
+    switch(code)
+    {
+    case ZT_RESULT_OK:
+        LOGV("ZT_RESULT_OK");
+        fieldName = "RESULT_OK";
+        break;
+    case ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY:
+        LOGV("ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY");
+        fieldName = "RESULT_FATAL_ERROR_OUT_OF_MEMORY";
+        break;
+    case ZT_RESULT_FATAL_ERROR_DATA_STORE_FAILED:
+        LOGV("RESULT_FATAL_ERROR_DATA_STORE_FAILED");
+        fieldName = "RESULT_FATAL_ERROR_DATA_STORE_FAILED";
+        break;
+    case ZT_RESULT_ERROR_NETWORK_NOT_FOUND:
+        LOGV("RESULT_FATAL_ERROR_DATA_STORE_FAILED");
+        fieldName = "RESULT_ERROR_NETWORK_NOT_FOUND";
+        break;
+    case ZT_RESULT_FATAL_ERROR_INTERNAL:
+    default:
+        LOGV("RESULT_FATAL_ERROR_DATA_STORE_FAILED");
+        fieldName = "RESULT_FATAL_ERROR_INTERNAL";
+        break;
+    }
+
+    jfieldID enumField = lookup.findStaticField(resultClass, fieldName.c_str(), "Lcom/zerotier/sdk/ResultCode;");
+    if(env->ExceptionCheck() || enumField == NULL) 
+    {
+        LOGE("Error on FindStaticField");
         return NULL;
     }
 
+    resultObject = env->GetStaticObjectField(resultClass, enumField);
+    if(env->ExceptionCheck() || resultObject == NULL) 
+    {
+        LOGE("Error on GetStaticObjectField");
+    }
     return resultObject;
 }
 
 
 jobject createVirtualNetworkStatus(JNIEnv *env, ZT_VirtualNetworkStatus status)
 {
-    jobject statusObject = env->CallStaticObjectMethod(VirtualNetworkStatus_class, VirtualNetworkStatus_fromInt_method, (jint)status);
-    if (env->ExceptionCheck() || statusObject == NULL) {
-        LOGE("Error creating VirtualNetworkStatus object");
-        return NULL;
+    jobject statusObject = NULL;
+
+    jclass statusClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkStatus");
+    if(statusClass == NULL)
+    {
+        return NULL; // exception thrown
     }
 
+    std::string fieldName;
+    switch(status)
+    {
+    case ZT_NETWORK_STATUS_REQUESTING_CONFIGURATION:
+        fieldName = "NETWORK_STATUS_REQUESTING_CONFIGURATION";
+        break;
+    case ZT_NETWORK_STATUS_OK:
+        fieldName = "NETWORK_STATUS_OK";
+        break;
+    case ZT_NETWORK_STATUS_ACCESS_DENIED:
+        fieldName = "NETWORK_STATUS_ACCESS_DENIED";
+        break;
+    case ZT_NETWORK_STATUS_NOT_FOUND:
+        fieldName = "NETWORK_STATUS_NOT_FOUND";
+        break;
+    case ZT_NETWORK_STATUS_PORT_ERROR:
+        fieldName = "NETWORK_STATUS_PORT_ERROR";
+        break;
+    case ZT_NETWORK_STATUS_CLIENT_TOO_OLD:
+        fieldName = "NETWORK_STATUS_CLIENT_TOO_OLD";
+        break;
+    }
+
+    jfieldID enumField = lookup.findStaticField(statusClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkStatus;");
+
+    statusObject = env->GetStaticObjectField(statusClass, enumField);
+
     return statusObject;
 }
 
 jobject createEvent(JNIEnv *env, ZT_Event event)
 {
-    jobject eventObject = env->CallStaticObjectMethod(Event_class, Event_fromInt_method, (jint)event);
-    if (env->ExceptionCheck() || eventObject == NULL) {
-        LOGE("Error creating Event object");
+    jclass eventClass = NULL;
+    jobject eventObject = NULL;
+
+    eventClass = lookup.findClass("com/zerotier/sdk/Event");
+    if(eventClass == NULL)
+    {
         return NULL;
     }
 
+    std::string fieldName;
+    switch(event)
+    {
+    case ZT_EVENT_UP:
+        fieldName = "EVENT_UP";
+        break;
+    case ZT_EVENT_OFFLINE:
+        fieldName = "EVENT_OFFLINE";
+        break;
+    case ZT_EVENT_ONLINE:
+        fieldName = "EVENT_ONLINE";
+        break;
+    case ZT_EVENT_DOWN:
+        fieldName = "EVENT_DOWN";
+        break;
+    case ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION:
+        fieldName = "EVENT_FATAL_ERROR_IDENTITY_COLLISION";
+        break;
+    case ZT_EVENT_TRACE:
+        fieldName = "EVENT_TRACE";
+        break;
+    }
+
+    jfieldID enumField = lookup.findStaticField(eventClass, fieldName.c_str(), "Lcom/zerotier/sdk/Event;");
+
+    eventObject = env->GetStaticObjectField(eventClass, enumField);
+
     return eventObject;
 }
 
 jobject createPeerRole(JNIEnv *env, ZT_PeerRole role)
 {
-    jobject peerRoleObject = env->CallStaticObjectMethod(PeerRole_class, PeerRole_fromInt_method, (jint)role);
-    if (env->ExceptionCheck() || peerRoleObject == NULL) {
-        LOGE("Error creating PeerRole object");
+    jclass peerRoleClass = NULL;
+    jobject peerRoleObject = NULL;
+
+    peerRoleClass = lookup.findClass("com/zerotier/sdk/PeerRole");
+    if(peerRoleClass == NULL)
+    {
         return NULL;
     }
 
+    std::string fieldName;
+    switch(role)
+    {
+    case ZT_PEER_ROLE_LEAF:
+        fieldName = "PEER_ROLE_LEAF";
+        break;
+    case ZT_PEER_ROLE_RELAY:
+        fieldName = "PEER_ROLE_RELAY";
+        break;
+    case ZT_PEER_ROLE_ROOT:
+        fieldName = "PEER_ROLE_ROOTS";
+        break;
+    }
+
+    jfieldID enumField = lookup.findStaticField(peerRoleClass, fieldName.c_str(), "Lcom/zerotier/sdk/PeerRole;");
+
+    peerRoleObject = env->GetStaticObjectField(peerRoleClass, enumField);
+
     return peerRoleObject;
 }
 
 jobject createVirtualNetworkType(JNIEnv *env, ZT_VirtualNetworkType type)
 {
-    jobject vntypeObject = env->CallStaticObjectMethod(VirtualNetworkType_class, VirtualNetworkType_fromInt_method, (jint)type);
-    if (env->ExceptionCheck() || vntypeObject == NULL) {
-        LOGE("Error creating VirtualNetworkType object");
+    jclass vntypeClass = NULL;
+    jobject vntypeObject = NULL;
+
+    vntypeClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkType");
+    if(env->ExceptionCheck() || vntypeClass == NULL)
+    {
         return NULL;
     }
 
+    std::string fieldName;
+    switch(type)
+    {
+    case ZT_NETWORK_TYPE_PRIVATE:
+        fieldName = "NETWORK_TYPE_PRIVATE";
+        break;
+    case ZT_NETWORK_TYPE_PUBLIC:
+        fieldName = "NETWORK_TYPE_PUBLIC";
+        break;
+    }
+
+    jfieldID enumField = lookup.findStaticField(vntypeClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkType;");
+    vntypeObject = env->GetStaticObjectField(vntypeClass, enumField);
     return vntypeObject;
 }
 
 jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT_VirtualNetworkConfigOperation op)
 {
-    jobject vnetConfigOpObject = env->CallStaticObjectMethod(VirtualNetworkConfigOperation_class, VirtualNetworkConfigOperation_fromInt_method, (jint)op);
-    if (env->ExceptionCheck() || vnetConfigOpObject == NULL) {
-        LOGE("Error creating VirtualNetworkConfigOperation object");
+    jclass vnetConfigOpClass = NULL;
+    jobject vnetConfigOpObject = NULL;
+
+    vnetConfigOpClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkConfigOperation");
+    if(env->ExceptionCheck() || vnetConfigOpClass == NULL)
+    {
         return NULL;
     }
 
+    std::string fieldName;
+    switch(op)
+    {
+    case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP:
+        fieldName = "VIRTUAL_NETWORK_CONFIG_OPERATION_UP";
+        break;
+    case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE:
+        fieldName = "VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE";
+        break;
+    case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN:
+        fieldName = "VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN";
+        break;
+    case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY:
+        fieldName = "VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY";
+        break;
+    }
+
+    jfieldID enumField = lookup.findStaticField(vnetConfigOpClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkConfigOperation;");
+    vnetConfigOpObject = env->GetStaticObjectField(vnetConfigOpClass, enumField);
     return vnetConfigOpObject;
 }
 
 jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr)
 {
+    LOGV("newInetAddress");
+    jclass inetAddressClass = NULL;
+    jmethodID inetAddress_getByAddress = NULL;
+
+    inetAddressClass = lookup.findClass("java/net/InetAddress");
+    if(env->ExceptionCheck() || inetAddressClass == NULL)
+    {
+        LOGE("Error finding InetAddress class");
+        return NULL;
+    }
+
+    inetAddress_getByAddress = lookup.findStaticMethod(
+        inetAddressClass, "getByAddress", "([B)Ljava/net/InetAddress;");
+    if(env->ExceptionCheck() || inetAddress_getByAddress == NULL)
+    {
+        LOGE("Erorr finding getByAddress() static method");
+        return NULL;
+    }
+
     jobject inetAddressObj = NULL;
     switch(addr.ss_family)
     {
         case AF_INET6:
         {
             sockaddr_in6 *ipv6 = (sockaddr_in6*)&addr;
-            const unsigned char *bytes = reinterpret_cast<const unsigned char *>(&ipv6->sin6_addr.s6_addr);
-
-            jbyteArray buff = newByteArray(env, bytes, 16);
-            if(env->ExceptionCheck() || buff == NULL)
+            jbyteArray buff = env->NewByteArray(16);
+            if(buff == NULL)
             {
+                LOGE("Error creating IPV6 byte array");
                 return NULL;
             }
 
+            env->SetByteArrayRegion(buff, 0, 16, (jbyte*)ipv6->sin6_addr.s6_addr);
             inetAddressObj = env->CallStaticObjectMethod(
-                InetAddress_class, InetAddress_getByAddress_method, (jbyteArray)buff);
+                inetAddressClass, inetAddress_getByAddress, buff);
         }
         break;
         case AF_INET:
         {
             sockaddr_in *ipv4 = (sockaddr_in*)&addr;
-            const unsigned char *bytes = reinterpret_cast<const unsigned char *>(&ipv4->sin_addr.s_addr);
-            jbyteArray buff = newByteArray(env, bytes, 4);
-            if(env->ExceptionCheck() || buff == NULL)
+            jbyteArray buff = env->NewByteArray(4);
+            if(buff == NULL)
             {
+                LOGE("Error creating IPV4 byte array");
                 return NULL;
             }
 
+            env->SetByteArrayRegion(buff, 0, 4, (jbyte*)&ipv4->sin_addr);
             inetAddressObj = env->CallStaticObjectMethod(
-                InetAddress_class, InetAddress_getByAddress_method, (jbyteArray)buff);
+                inetAddressClass, inetAddress_getByAddress, buff);
         }
         break;
-        default:
-        {
-            assert(false && "addr.ss_family is neither AF_INET6 nor AF_INET");
-        }
     }
     if(env->ExceptionCheck() || inetAddressObj == NULL) {
         LOGE("Error creating InetAddress object");
@@ -143,41 +300,16 @@ jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr)
     return inetAddressObj;
 }
 
-int addressPort(const sockaddr_storage addr) {
-
-    int port = 0;
-    switch(addr.ss_family)
-    {
-        case AF_INET6:
-        {
-            sockaddr_in6 *ipv6 = (sockaddr_in6*)&addr;
-            port = ntohs(ipv6->sin6_port);
-        }
-            break;
-        case AF_INET:
-        {
-            sockaddr_in *ipv4 = (sockaddr_in*)&addr;
-            port = ntohs(ipv4->sin_port);
-        }
-            break;
-        default:
-        {
-            assert(false && "addr.ss_family is neither AF_INET6 nor AF_INET");
-        }
-    }
-
-    return port;
-}
-
-//
-// addr may be empty
-//
-// may return NULL
-//
 jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
 {
-    if(isSocketAddressEmpty(addr))
+    LOGV("newInetSocketAddress Called");
+    jclass inetSocketAddressClass = NULL;
+    jmethodID inetSocketAddress_constructor = NULL;
+
+    inetSocketAddressClass = lookup.findClass("java/net/InetSocketAddress");
+    if(env->ExceptionCheck() || inetSocketAddressClass == NULL)
     {
+        LOGE("Error finding InetSocketAddress Class");
         return NULL;
     }
 
@@ -185,441 +317,615 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
 
     if(env->ExceptionCheck() || inetAddressObject == NULL)
     {
+        LOGE("Error creating new inet address");
         return NULL;
     }
 
-    int port = addressPort(addr);
+    inetSocketAddress_constructor = lookup.findMethod(
+        inetSocketAddressClass, "<init>", "(Ljava/net/InetAddress;I)V");
+    if(env->ExceptionCheck() || inetSocketAddress_constructor == NULL)
+    {
+        LOGE("Error finding InetSocketAddress constructor");
+        return NULL;
+    }
 
-    jobject inetSocketAddressObject = env->NewObject(InetSocketAddress_class, InetSocketAddress_ctor, (jobject)inetAddressObject, (jint)port);
+    int port = 0;
+    switch(addr.ss_family)
+    {
+        case AF_INET6:
+        {
+            LOGV("IPV6 Address");
+            sockaddr_in6 *ipv6 = (sockaddr_in6*)&addr;
+            port = ntohs(ipv6->sin6_port);
+            LOGV("Port %d", port);
+        }
+        break;
+        case AF_INET:
+        {
+            LOGV("IPV4 Address");
+            sockaddr_in *ipv4 = (sockaddr_in*)&addr;
+            port = ntohs(ipv4->sin_port);
+            LOGV("Port: %d", port);
+        }
+        break;
+        default:
+        {
+            LOGE("ERROR:  addr.ss_family is not set or unknown");
+            break;
+        }
+    };
+
+
+    jobject inetSocketAddressObject = env->NewObject(inetSocketAddressClass, inetSocketAddress_constructor, inetAddressObject, port);
     if(env->ExceptionCheck() || inetSocketAddressObject == NULL) {
         LOGE("Error creating InetSocketAddress object");
-        return NULL;
     }
     return inetSocketAddressObject;
 }
 
-jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
+jobject newMulticastGroup(JNIEnv *env, const ZT_MulticastGroup &mc)
 {
-    //
-    // may be NULL
-    //
-    jobject addressObject = newInetSocketAddress(env, ppp.address);
-    if(env->ExceptionCheck()) {
+    jclass multicastGroupClass = NULL;
+    jmethodID multicastGroup_constructor = NULL;
+
+    jfieldID macField = NULL;
+    jfieldID adiField = NULL;
+
+    multicastGroupClass = lookup.findClass("com/zerotier/sdk/MulticastGroup");
+    if(env->ExceptionCheck() || multicastGroupClass == NULL)
+    {
         return NULL;
     }
 
-    jobject pppObject = env->NewObject(
-            PeerPhysicalPath_class,
-            PeerPhysicalPath_ctor,
-            (jobject)addressObject,
-            (jlong)ppp.lastSend,
-            (jlong)ppp.lastReceive,
-            (jboolean)ppp.preferred); // ANDROID-56: cast to correct size
+    multicastGroup_constructor = lookup.findMethod(
+        multicastGroupClass, "<init>", "()V");
+    if(env->ExceptionCheck() || multicastGroup_constructor == NULL)
+    {
+        return NULL;
+    }
+
+    jobject multicastGroupObj = env->NewObject(multicastGroupClass, multicastGroup_constructor);
+    if(env->ExceptionCheck() || multicastGroupObj == NULL)
+    {
+        return NULL;
+    }
+
+    macField = lookup.findField(multicastGroupClass, "mac", "J");
+    if(env->ExceptionCheck() || macField == NULL)
+    {
+        return NULL;
+    }
+
+    adiField = lookup.findField(multicastGroupClass, "adi", "J");
+    if(env->ExceptionCheck() || adiField == NULL)
+    {
+        return NULL;
+    }
+
+    env->SetLongField(multicastGroupObj, macField, mc.mac);
+    env->SetLongField(multicastGroupObj, adiField, mc.adi);
+
+    return multicastGroupObj;
+}
+
+jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
+{
+    LOGV("newPeerPhysicalPath Called");
+    jclass pppClass = NULL;
+
+    jfieldID addressField = NULL;
+    jfieldID lastSendField = NULL;
+    jfieldID lastReceiveField = NULL;
+    jfieldID activeField = NULL;
+    jfieldID preferredField = NULL;
+
+    jmethodID ppp_constructor = NULL;
+
+    pppClass = lookup.findClass("com/zerotier/sdk/PeerPhysicalPath");
+    if(env->ExceptionCheck() || pppClass == NULL)
+    {
+        LOGE("Error finding PeerPhysicalPath class");
+        return NULL;
+    }
+
+    addressField = lookup.findField(pppClass, "address", "Ljava/net/InetSocketAddress;");
+    if(env->ExceptionCheck() || addressField == NULL)
+    {
+        LOGE("Error finding address field");
+        return NULL;
+    }
+
+    lastSendField = lookup.findField(pppClass, "lastSend", "J");
+    if(env->ExceptionCheck() || lastSendField == NULL)
+    {
+        LOGE("Error finding lastSend field");
+        return NULL;
+    }
+
+    lastReceiveField = lookup.findField(pppClass, "lastReceive", "J");
+    if(env->ExceptionCheck() || lastReceiveField == NULL)
+    {
+        LOGE("Error finding lastReceive field");
+        return NULL;
+    }
+
+    activeField = lookup.findField(pppClass, "active", "Z");
+    if(env->ExceptionCheck() || activeField == NULL)
+    {
+        LOGE("Error finding active field");
+        return NULL;
+    }
+
+    preferredField = lookup.findField(pppClass, "preferred", "Z");
+    if(env->ExceptionCheck() || preferredField == NULL)
+    {
+        LOGE("Error finding preferred field");
+        return NULL;
+    }
+
+    ppp_constructor = lookup.findMethod(pppClass, "<init>", "()V");
+    if(env->ExceptionCheck() || ppp_constructor == NULL)
+    {
+        LOGE("Error finding PeerPhysicalPath constructor");
+        return NULL;
+    }
+
+    jobject pppObject = env->NewObject(pppClass, ppp_constructor);
     if(env->ExceptionCheck() || pppObject == NULL)
     {
         LOGE("Error creating PPP object");
+        return NULL; // out of memory
+    }
+
+    jobject addressObject = newInetSocketAddress(env, ppp.address);
+    if(env->ExceptionCheck() || addressObject == NULL) {
+        LOGE("Error creating InetSocketAddress object");
         return NULL;
     }
 
+    env->SetObjectField(pppObject, addressField, addressObject);
+    env->SetLongField(pppObject, lastSendField, ppp.lastSend);
+    env->SetLongField(pppObject, lastReceiveField, ppp.lastReceive);
+    env->SetBooleanField(pppObject, activeField, ppp.active);
+    env->SetBooleanField(pppObject, preferredField, ppp.preferred);
+
+    if(env->ExceptionCheck()) {
+        LOGE("Exception assigning fields to PeerPhysicalPath object");
+    }
+
     return pppObject;
 }
 
-jobject newPeer(JNIEnv *env, const ZT_Peer &peer)
+jobject newPeer(JNIEnv *env, const ZT_Peer &peer) 
 {
-    jobject peerRoleObj = createPeerRole(env, peer.role);
-    if(env->ExceptionCheck() || peerRoleObj == NULL)
-    {
-        return NULL; // out of memory
-    }
+    LOGV("newPeer called");
 
-    jobjectArray arrayObject = newPeerPhysicalPathArray(env, peer.paths, peer.pathCount);
-    if (env->ExceptionCheck() || arrayObject == NULL) {
+    jclass peerClass = NULL;
+
+    jfieldID addressField = NULL;
+    jfieldID lastUnicastFrameField = NULL;
+    jfieldID lastMulticastFrameField = NULL;
+    jfieldID versionMajorField = NULL;
+    jfieldID versionMinorField = NULL;
+    jfieldID versionRevField = NULL;
+    jfieldID latencyField = NULL;
+    jfieldID roleField = NULL;
+    jfieldID pathsField = NULL;
+
+    jmethodID peer_constructor = NULL;
+
+    peerClass = lookup.findClass("com/zerotier/sdk/Peer");
+    if(env->ExceptionCheck() || peerClass == NULL)
+    {
+        LOGE("Error finding Peer class");
         return NULL;
     }
 
-    jobject peerObject = env->NewObject(
-            Peer_class,
-            Peer_ctor,
-            (jlong)peer.address,
-            (jint)peer.versionMajor,
-            (jint)peer.versionMinor,
-            (jint)peer.versionRev,
-            (jint)peer.latency,
-            (jobject)peerRoleObj,
-            (jobjectArray)arrayObject);
+    addressField = lookup.findField(peerClass, "address", "J");
+    if(env->ExceptionCheck() || addressField == NULL)
+    {
+        LOGE("Error finding address field of Peer object");
+        return NULL;
+    }
+
+    lastUnicastFrameField = lookup.findField(peerClass, "lastUnicastFrame", "J");
+    if(env->ExceptionCheck() || lastUnicastFrameField == NULL)
+    {
+        LOGE("Error finding lastUnicastFrame field of Peer object");
+        return NULL;
+    }
+
+    lastMulticastFrameField = lookup.findField(peerClass, "lastMulticastFrame", "J");
+    if(env->ExceptionCheck() || lastMulticastFrameField == NULL)
+    {
+        LOGE("Error finding lastMulticastFrame field of Peer object");
+        return NULL;
+    }
+
+    versionMajorField = lookup.findField(peerClass, "versionMajor", "I");
+    if(env->ExceptionCheck() || versionMajorField == NULL)
+    {
+        LOGE("Error finding versionMajor field of Peer object");
+        return NULL;
+    }
+
+    versionMinorField = lookup.findField(peerClass, "versionMinor", "I");
+    if(env->ExceptionCheck() || versionMinorField == NULL)
+    {
+        LOGE("Error finding versionMinor field of Peer object");
+        return NULL;
+    }
+
+    versionRevField = lookup.findField(peerClass, "versionRev", "I");
+    if(env->ExceptionCheck() || versionRevField == NULL)
+    {
+        LOGE("Error finding versionRev field of Peer object");
+        return NULL;
+    }
+
+    latencyField = lookup.findField(peerClass, "latency", "I");
+    if(env->ExceptionCheck() || latencyField == NULL)
+    {
+        LOGE("Error finding latency field of Peer object");
+        return NULL;
+    }
+
+    roleField = lookup.findField(peerClass, "role", "Lcom/zerotier/sdk/PeerRole;");
+    if(env->ExceptionCheck() || roleField == NULL)
+    {
+        LOGE("Error finding role field of Peer object");
+        return NULL;
+    }
+
+    pathsField = lookup.findField(peerClass, "paths", "[Lcom/zerotier/sdk/PeerPhysicalPath;");
+    if(env->ExceptionCheck() || pathsField == NULL)
+    {
+        LOGE("Error finding paths field of Peer object");
+        return NULL;
+    }
+
+    peer_constructor = lookup.findMethod(peerClass, "<init>", "()V");
+    if(env->ExceptionCheck() || peer_constructor == NULL)
+    {
+        LOGE("Error finding Peer constructor");
+        return NULL;
+    }
+
+    jobject peerObject = env->NewObject(peerClass, peer_constructor);
     if(env->ExceptionCheck() || peerObject == NULL)
     {
         LOGE("Error creating Peer object");
+        return NULL; // out of memory
+    }
+
+    env->SetLongField(peerObject, addressField, (jlong)peer.address);
+    env->SetLongField(peerObject, lastUnicastFrameField, (jlong)peer.lastUnicastFrame);
+    env->SetLongField(peerObject, lastMulticastFrameField, (jlong)peer.lastMulticastFrame);
+    env->SetIntField(peerObject, versionMajorField, peer.versionMajor);
+    env->SetIntField(peerObject, versionMinorField, peer.versionMinor);
+    env->SetIntField(peerObject, versionRevField, peer.versionRev);
+    env->SetIntField(peerObject, latencyField, peer.latency);
+    env->SetObjectField(peerObject, roleField, createPeerRole(env, peer.role));
+
+    jclass peerPhysicalPathClass = lookup.findClass("com/zerotier/sdk/PeerPhysicalPath");
+    if(env->ExceptionCheck() || peerPhysicalPathClass == NULL)
+    {
+        LOGE("Error finding PeerPhysicalPath class");
         return NULL;
     }
 
+    jobjectArray arrayObject = env->NewObjectArray(
+        peer.pathCount, peerPhysicalPathClass, NULL);
+    if(env->ExceptionCheck() || arrayObject == NULL) 
+    {
+        LOGE("Error creating PeerPhysicalPath[] array");
+        return NULL;
+    }
+
+    for(unsigned int i = 0; i < peer.pathCount; ++i)
+    {
+        jobject path = newPeerPhysicalPath(env, peer.paths[i]);
+
+        env->SetObjectArrayElement(arrayObject, i, path);
+        if(env->ExceptionCheck()) {
+            LOGE("exception assigning PeerPhysicalPath to array");
+            break;
+        }
+    }
+
+    env->SetObjectField(peerObject, pathsField, arrayObject);
+
     return peerObject;
 }
 
 jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &vnetConfig)
 {
-    jstring nameStr = env->NewStringUTF(vnetConfig.name);
-    if(env->ExceptionCheck() || nameStr == NULL)
+    jclass vnetConfigClass = NULL;
+    jmethodID vnetConfig_constructor = NULL;
+    jfieldID nwidField = NULL;
+    jfieldID macField = NULL;
+    jfieldID nameField = NULL;
+    jfieldID statusField = NULL;
+    jfieldID typeField = NULL;
+    jfieldID mtuField = NULL;
+    jfieldID dhcpField = NULL;
+    jfieldID bridgeField = NULL;
+    jfieldID broadcastEnabledField = NULL;
+    jfieldID portErrorField = NULL;
+    jfieldID enabledField = NULL;
+    jfieldID netconfRevisionField = NULL;
+    jfieldID multicastSubscriptionsField = NULL;
+    jfieldID assignedAddressesField = NULL;
+
+    vnetConfigClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkConfig");
+    if(vnetConfigClass == NULL)
     {
-        LOGE("Exception creating new string");
-        return NULL; // out of memory
+        LOGE("Couldn't find com.zerotier.sdk.VirtualNetworkConfig");
+        return NULL;
     }
 
-    jobject statusObject = createVirtualNetworkStatus(env, vnetConfig.status);
-    if(env->ExceptionCheck() || statusObject == NULL)
+    vnetConfig_constructor = lookup.findMethod(
+        vnetConfigClass, "<init>", "()V");
+    if(env->ExceptionCheck() || vnetConfig_constructor == NULL)
     {
+        LOGE("Couldn't find VirtualNetworkConfig Constructor");
         return NULL;
     }
 
-    jobject typeObject = createVirtualNetworkType(env, vnetConfig.type);
-    if(env->ExceptionCheck() || typeObject == NULL)
-    {
-        return NULL;
-    }
-
-    jobjectArray assignedAddrArrayObj = newInetSocketAddressArray(env, vnetConfig.assignedAddresses, vnetConfig.assignedAddressCount);
-    if (env->ExceptionCheck() || assignedAddrArrayObj == NULL) {
-        return NULL;
-    }
-
-    jobjectArray routesArrayObj = newVirtualNetworkRouteArray(env, vnetConfig.routes, vnetConfig.routeCount);
-    if (env->ExceptionCheck() || routesArrayObj == NULL) {
-        return NULL;
-    }
-
-    //
-    // may be NULL
-    //
-    jobject dnsObj = newVirtualNetworkDNS(env, vnetConfig.dns);
-    if(env->ExceptionCheck()) {
-        return NULL;
-    }
-
-    jobject vnetConfigObj = env->NewObject(
-            VirtualNetworkConfig_class,
-            VirtualNetworkConfig_ctor,
-            (jlong)vnetConfig.nwid,
-            (jlong)vnetConfig.mac,
-            (jstring)nameStr,
-            (jobject)statusObject,
-            (jobject)typeObject,
-            (jint)vnetConfig.mtu,
-            (jboolean)vnetConfig.dhcp, // ANDROID-56: cast to correct size
-            (jboolean)vnetConfig.bridge, // ANDROID-56: cast to correct size
-            (jboolean)vnetConfig.broadcastEnabled, // ANDROID-56: cast to correct size
-            (jint)vnetConfig.portError,
-            (jlong)vnetConfig.netconfRevision,
-            (jobjectArray)assignedAddrArrayObj,
-            (jobjectArray)routesArrayObj,
-            (jobject)dnsObj);
+    jobject vnetConfigObj = env->NewObject(vnetConfigClass, vnetConfig_constructor);
     if(env->ExceptionCheck() || vnetConfigObj == NULL)
     {
         LOGE("Error creating new VirtualNetworkConfig object");
         return NULL;
     }
 
+    nwidField = lookup.findField(vnetConfigClass, "nwid", "J");
+    if(env->ExceptionCheck() || nwidField == NULL)
+    {
+        LOGE("Error getting nwid field");
+        return NULL;
+    }
+
+    macField = lookup.findField(vnetConfigClass, "mac", "J");
+    if(env->ExceptionCheck() || macField == NULL)
+    {
+        LOGE("Error getting mac field");
+        return NULL;
+    }
+
+    nameField = lookup.findField(vnetConfigClass, "name", "Ljava/lang/String;");
+    if(env->ExceptionCheck() || nameField == NULL)
+    {
+        LOGE("Error getting name field");
+        return NULL;
+    }
+
+    statusField = lookup.findField(vnetConfigClass, "status", "Lcom/zerotier/sdk/VirtualNetworkStatus;");
+    if(env->ExceptionCheck() || statusField == NULL)
+    {
+        LOGE("Error getting status field");
+        return NULL;
+    }
+
+    typeField = lookup.findField(vnetConfigClass, "type", "Lcom/zerotier/sdk/VirtualNetworkType;");
+    if(env->ExceptionCheck() || typeField == NULL)
+    {
+        LOGE("Error getting type field");
+        return NULL;
+    }
+
+    mtuField = lookup.findField(vnetConfigClass, "mtu", "I");
+    if(env->ExceptionCheck() || mtuField == NULL)
+    {
+        LOGE("Error getting mtu field");
+        return NULL;
+    }
+
+    dhcpField = lookup.findField(vnetConfigClass, "dhcp", "Z");
+    if(env->ExceptionCheck() || dhcpField == NULL)
+    {
+        LOGE("Error getting dhcp field");
+        return NULL;
+    }
+
+    bridgeField = lookup.findField(vnetConfigClass, "bridge", "Z");
+    if(env->ExceptionCheck() || bridgeField == NULL)
+    {
+        LOGE("Error getting bridge field");
+        return NULL;
+    }
+
+    broadcastEnabledField = lookup.findField(vnetConfigClass, "broadcastEnabled", "Z");
+    if(env->ExceptionCheck() || broadcastEnabledField == NULL)
+    {
+        LOGE("Error getting broadcastEnabled field");
+        return NULL;
+    }
+
+    portErrorField = lookup.findField(vnetConfigClass, "portError", "I");
+    if(env->ExceptionCheck() || portErrorField == NULL)
+    {
+        LOGE("Error getting portError field");
+        return NULL;
+    }
+
+    enabledField = lookup.findField(vnetConfigClass, "enabled", "Z");
+    if(env->ExceptionCheck() || enabledField == NULL)
+    {
+        LOGE("Error getting enabled field");
+        return NULL;
+    }
+
+    netconfRevisionField = lookup.findField(vnetConfigClass, "netconfRevision", "J");
+    if(env->ExceptionCheck() || netconfRevisionField == NULL)
+    {
+        LOGE("Error getting netconfRevision field");
+        return NULL;
+    }
+
+    multicastSubscriptionsField = lookup.findField(vnetConfigClass, "multicastSubscriptions", "[Lcom/zerotier/sdk/MulticastGroup;");
+    if(env->ExceptionCheck() || multicastSubscriptionsField == NULL)
+    {
+        LOGE("Error getting multicastSubscriptions field");
+        return NULL;
+    }
+
+    assignedAddressesField = lookup.findField(vnetConfigClass, "assignedAddresses", "[Ljava/net/InetSocketAddress;");
+    if(env->ExceptionCheck() || assignedAddressesField == NULL)
+    {
+        LOGE("Error getting assignedAddresses field");
+        return NULL;
+    }
+
+    env->SetLongField(vnetConfigObj, nwidField, vnetConfig.nwid);
+    env->SetLongField(vnetConfigObj, macField, vnetConfig.mac);
+    jstring nameStr = env->NewStringUTF(vnetConfig.name);
+    if(env->ExceptionCheck() || nameStr == NULL)
+    {
+        return NULL; // out of memory
+    }
+    env->SetObjectField(vnetConfigObj, nameField, nameStr);
+
+    jobject statusObject = createVirtualNetworkStatus(env, vnetConfig.status);
+    if(env->ExceptionCheck() || statusObject == NULL)
+    {
+        return NULL;
+    }
+    env->SetObjectField(vnetConfigObj, statusField, statusObject);
+
+    jobject typeObject = createVirtualNetworkType(env, vnetConfig.type);
+    if(env->ExceptionCheck() || typeObject == NULL)
+    {
+        return NULL;
+    }
+    env->SetObjectField(vnetConfigObj, typeField, typeObject);
+
+    env->SetIntField(vnetConfigObj, mtuField, (int)vnetConfig.mtu);
+    env->SetBooleanField(vnetConfigObj, dhcpField, vnetConfig.dhcp);
+    env->SetBooleanField(vnetConfigObj, bridgeField, vnetConfig.bridge);
+    env->SetBooleanField(vnetConfigObj, broadcastEnabledField, vnetConfig.broadcastEnabled);
+    env->SetBooleanField(vnetConfigObj, enabledField, vnetConfig.enabled);
+    env->SetIntField(vnetConfigObj, portErrorField, vnetConfig.portError);
+
+    jclass multicastGroupClass = lookup.findClass("com/zerotier/sdk/MulticastGroup");
+    if(env->ExceptionCheck() || multicastGroupClass == NULL) 
+    {
+        LOGE("Error finding MulticastGroup class");
+        return NULL;
+    }
+
+    jobjectArray mcastSubsArrayObj = env->NewObjectArray(
+        vnetConfig.multicastSubscriptionCount, multicastGroupClass, NULL);
+    if(env->ExceptionCheck() || mcastSubsArrayObj == NULL) {
+        LOGE("Error creating MulticastGroup[] array");
+        return NULL;
+    }
+
+    for(unsigned int i = 0; i < vnetConfig.multicastSubscriptionCount; ++i)
+    {
+        jobject mcastObj = newMulticastGroup(env, vnetConfig.multicastSubscriptions[i]);
+        env->SetObjectArrayElement(mcastSubsArrayObj, i, mcastObj);
+        if(env->ExceptionCheck())
+        {
+            LOGE("Error assigning MulticastGroup to array");
+        }
+    }
+    env->SetObjectField(vnetConfigObj, multicastSubscriptionsField, mcastSubsArrayObj);
+
+    jclass inetSocketAddressClass = lookup.findClass("java/net/InetSocketAddress");
+    if(env->ExceptionCheck() || inetSocketAddressClass == NULL)
+    {
+        LOGE("Error finding InetSocketAddress class");
+        return NULL;
+    }
+
+    jobjectArray assignedAddrArrayObj = env->NewObjectArray(
+        vnetConfig.assignedAddressCount, inetSocketAddressClass, NULL);
+    if(env->ExceptionCheck() || assignedAddrArrayObj == NULL)
+    {
+        LOGE("Error creating InetSocketAddress[] array");
+        return NULL;
+    }
+
+    for(unsigned int i = 0; i < vnetConfig.assignedAddressCount; ++i)
+    {
+        jobject inetAddrObj = newInetSocketAddress(env, vnetConfig.assignedAddresses[i]);
+        env->SetObjectArrayElement(assignedAddrArrayObj, i, inetAddrObj);
+        if(env->ExceptionCheck())
+        {
+            LOGE("Error assigning InetSocketAddress to array");
+            return NULL;
+        }
+    }
+
+    env->SetObjectField(vnetConfigObj, assignedAddressesField, assignedAddrArrayObj);
+
     return vnetConfigObj;
 }
 
-jobject newVersion(JNIEnv *env, int major, int minor, int rev)
+jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags)
 {
-    // create a com.zerotier.sdk.Version object
-    jobject versionObj = env->NewObject(Version_class, Version_ctor, (jint)major, (jint)minor, (jint)rev);
-    if(env->ExceptionCheck() || versionObj == NULL)
+   // create a com.zerotier.sdk.Version object
+    jclass versionClass = NULL;
+    jmethodID versionConstructor = NULL;
+
+    versionClass = lookup.findClass("com/zerotier/sdk/Version");
+    if(env->ExceptionCheck() || versionClass == NULL)
     {
-        LOGE("Error creating new Version object");
         return NULL;
     }
 
+    versionConstructor = lookup.findMethod(
+        versionClass, "<init>", "()V");
+    if(env->ExceptionCheck() || versionConstructor == NULL)
+    {
+        return NULL;
+    }
+
+    jobject versionObj = env->NewObject(versionClass, versionConstructor);
+    if(env->ExceptionCheck() || versionObj == NULL)
+    {
+        return NULL;
+    }
+
+    // copy data to Version object
+    jfieldID majorField = NULL;
+    jfieldID minorField = NULL;
+    jfieldID revisionField = NULL;
+    jfieldID featureFlagsField = NULL;
+
+    majorField = lookup.findField(versionClass, "major", "I");
+    if(env->ExceptionCheck() || majorField == NULL)
+    {
+        return NULL;
+    }
+
+    minorField = lookup.findField(versionClass, "minor", "I");
+    if(env->ExceptionCheck() || minorField == NULL)
+    {
+        return NULL;
+    }
+
+    revisionField = lookup.findField(versionClass, "revision", "I");
+    if(env->ExceptionCheck() || revisionField == NULL)
+    {
+        return NULL;
+    }
+
+    featureFlagsField = lookup.findField(versionClass, "featureFlags", "J");
+    if(env->ExceptionCheck() || featureFlagsField == NULL)
+    {
+        return NULL;
+    }
+
+    env->SetIntField(versionObj, majorField, (jint)major);
+    env->SetIntField(versionObj, minorField, (jint)minor);
+    env->SetIntField(versionObj, revisionField, (jint)rev);
+    env->SetLongField(versionObj, featureFlagsField, (jlong)featureFlags); 
+
     return versionObj;
 }
 
-jobject newVirtualNetworkRoute(JNIEnv *env, const ZT_VirtualNetworkRoute &route)
-{
-    //
-    // may be NULL
-    //
-    jobject targetObj = newInetSocketAddress(env, route.target);
-    if (env->ExceptionCheck()) {
-        return NULL;
-    }
-
-    //
-    // may be NULL
-    //
-    jobject viaObj = newInetSocketAddress(env, route.via);
-    if (env->ExceptionCheck()) {
-        return NULL;
-    }
-
-    jobject routeObj = env->NewObject(
-            VirtualNetworkRoute_class,
-            VirtualNetworkRoute_ctor,
-            (jobject)targetObj,
-            (jobject)viaObj,
-            (jint)route.flags, // ANDROID-56: cast to correct size
-            (jint)route.metric); // ANDROID-56: cast to correct size
-    if(env->ExceptionCheck() || routeObj == NULL)
-    {
-        LOGE("Exception creating VirtualNetworkRoute");
-        return NULL;
-    }
-
-    return routeObj;
-}
-
-//
-// may return NULL
-//
-jobject newVirtualNetworkDNS(JNIEnv *env, const ZT_VirtualNetworkDNS &dns)
-{
-    if (strlen(dns.domain) == 0) {
-        LOGD("dns.domain is empty; returning NULL");
-        return NULL;
-    }
-
-    jstring domain = env->NewStringUTF(dns.domain);
-    if (env->ExceptionCheck() || domain == NULL) {
-        LOGE("Exception creating new string");
-        return NULL;
-    }
-
-    jobject addrList = env->NewObject(ArrayList_class, ArrayList_ctor, (jint)0);
-    if (env->ExceptionCheck() || addrList == NULL) {
-        LOGE("Exception creating new ArrayList");
-        return NULL;
-    }
-
-    for (int i = 0; i < ZT_MAX_DNS_SERVERS; ++i) { //NOLINT
-
-        struct sockaddr_storage tmp = dns.server_addr[i];
-
-        //
-        // may be NULL
-        //
-        jobject addr = newInetSocketAddress(env, tmp);
-        if (env->ExceptionCheck()) {
-            return NULL;
-        }
-
-        if (addr == NULL) {
-            continue;
-        }
-
-        env->CallBooleanMethod(addrList, ArrayList_add_method, (jobject)addr);
-        if(env->ExceptionCheck())
-        {
-            LOGE("Exception calling add");
-            return NULL;
-        }
-
-        env->DeleteLocalRef(addr);
-    }
-
-    jobject dnsObj = env->NewObject(
-            VirtualNetworkDNS_class,
-            VirtualNetworkDNS_ctor,
-            (jstring)domain,
-            (jobject)addrList);
-    if (env->ExceptionCheck() || dnsObj == NULL) {
-        LOGE("Exception creating new VirtualNetworkDNS");
-        return NULL;
-    }
-    return dnsObj;
-}
-
-jobject newNodeStatus(JNIEnv *env, const ZT_NodeStatus &status) {
-
-    jstring pubIdentStr = env->NewStringUTF(status.publicIdentity);
-    if(env->ExceptionCheck() || pubIdentStr == NULL)
-    {
-        LOGE("Exception creating new string");
-        return NULL;
-    }
-
-    jstring secIdentStr = env->NewStringUTF(status.secretIdentity);
-    if(env->ExceptionCheck() || secIdentStr == NULL)
-    {
-        LOGE("Exception creating new string");
-        return NULL;
-    }
-
-    jobject nodeStatusObj = env->NewObject(
-            NodeStatus_class,
-            NodeStatus_ctor,
-            (jlong)status.address,
-            (jstring)pubIdentStr,
-            (jstring)secIdentStr,
-            (jboolean)status.online);
-    if(env->ExceptionCheck() || nodeStatusObj == NULL) {
-        LOGE("Exception creating new NodeStatus");
-        return NULL;
-    }
-
-    return nodeStatusObj;
-}
-
-jobjectArray newPeerArray(JNIEnv *env, const ZT_Peer *peers, size_t count) {
-    return newArrayObject<ZT_Peer, newPeer>(env, peers, count, Peer_class);
-}
-
-jobjectArray newVirtualNetworkConfigArray(JNIEnv *env, const ZT_VirtualNetworkConfig *networks, size_t count) {
-    return newArrayObject<ZT_VirtualNetworkConfig, newNetworkConfig>(env, networks, count, VirtualNetworkConfig_class);
-}
-
-jobjectArray newPeerPhysicalPathArray(JNIEnv *env, const ZT_PeerPhysicalPath *paths, size_t count) {
-    return newArrayObject<ZT_PeerPhysicalPath, newPeerPhysicalPath>(env, paths, count, PeerPhysicalPath_class);
-}
-
-jobjectArray newInetSocketAddressArray(JNIEnv *env, const sockaddr_storage *addresses, size_t count) {
-    return newArrayObject<sockaddr_storage, newInetSocketAddress>(env, addresses, count, InetSocketAddress_class);
-}
-
-jobjectArray newVirtualNetworkRouteArray(JNIEnv *env, const ZT_VirtualNetworkRoute *routes, size_t count) {
-    return newArrayObject<ZT_VirtualNetworkRoute, newVirtualNetworkRoute>(env, routes, count, VirtualNetworkRoute_class);
-}
-
-void newArrayObject_logCount(size_t count) {
-    LOGE("count > JSIZE_MAX: %zu", count);
-}
-
-void newArrayObject_log(const char *msg) {
-    LOGE("%s", msg);
-}
-
-jbyteArray newByteArray(JNIEnv *env, const unsigned char *bytes, size_t count) {
-
-    if (count > JSIZE_MAX) {
-        LOGE("count > JSIZE_MAX: %zu", count);
-        return NULL;
-    }
-
-    jsize jCount = static_cast<jsize>(count);
-    const jbyte *jBytes = reinterpret_cast<const jbyte *>(bytes);
-
-    jbyteArray byteArrayObj = env->NewByteArray(jCount);
-    if(byteArrayObj == NULL)
-    {
-        LOGE("NewByteArray returned NULL");
-        return NULL;
-    }
-
-    env->SetByteArrayRegion(byteArrayObj, 0, jCount, jBytes);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception when calling SetByteArrayRegion");
-        return NULL;
-    }
-
-    return byteArrayObj;
-}
-
-jbyteArray newByteArray(JNIEnv *env, size_t count) {
-
-    if (count > JSIZE_MAX) {
-        LOGE("count > JSIZE_MAX: %zu", count);
-        return NULL;
-    }
-
-    jsize jCount = static_cast<jsize>(count);
-
-    jbyteArray byteArrayObj = env->NewByteArray(jCount);
-    if(byteArrayObj == NULL)
-    {
-        LOGE("NewByteArray returned NULL");
-        return NULL;
-    }
-
-    return byteArrayObj;
-}
-
-bool isSocketAddressEmpty(const sockaddr_storage addr) {
-
-    //
-    // was:
-    // struct sockaddr_storage nullAddress = {0};
-    //
-    // but was getting this warning:
-    // warning: suggest braces around initialization of subobject
-    //
-    // when building ZeroTierOne
-    //
-    sockaddr_storage emptyAddress; //NOLINT
-
-    //
-    // It is possible to assume knowledge about internals of sockaddr_storage and construct
-    // correct 0-initializer, but it is simpler to just treat sockaddr_storage as opaque and
-    // use memset here to fill with 0
-    //
-    // This is also done in InetAddress.hpp for InetAddress
-    //
-    memset(&emptyAddress, 0, sizeof(sockaddr_storage));
-
-    return (memcmp(&addr, &emptyAddress, sizeof(sockaddr_storage)) == 0); //NOLINT
-}
-
-//
-// returns empty sockaddr_storage on error
-//
-sockaddr_storage fromSocketAddressObject(JNIEnv *env, jobject sockAddressObject) {
-
-    sockaddr_storage emptyAddress; //NOLINT
-
-    memset(&emptyAddress, 0, sizeof(sockaddr_storage));
-
-    jint port = env->CallIntMethod(sockAddressObject, InetSocketAddress_getPort_method);
-    if(env->ExceptionCheck())
-    {
-        LOGE("Exception calling getPort");
-        return emptyAddress;
-    }
-
-    jobject addressObject = env->CallObjectMethod(sockAddressObject, InetSocketAddress_getAddress_method);
-    if(env->ExceptionCheck() || addressObject == NULL)
-    {
-        LOGE("Exception calling getAddress");
-        return emptyAddress;
-    }
-
-    jbyteArray addressArrayObj = reinterpret_cast<jbyteArray>(env->CallObjectMethod(addressObject, InetAddress_getAddress_method));
-    if(env->ExceptionCheck() || addressArrayObj == NULL)
-    {
-        LOGE("Exception calling getAddress");
-        return emptyAddress;
-    }
-
-    sockaddr_storage addr = {};
-
-    if (env->IsInstanceOf(addressObject, Inet4Address_class)) {
-
-        // IPV4
-
-        assert(env->GetArrayLength(addressArrayObj) == 4);
-
-        sockaddr_in *addr_4 = reinterpret_cast<sockaddr_in *>(&addr);
-        addr_4->sin_family = AF_INET;
-        addr_4->sin_port = htons(port);
-
-        void *data = env->GetPrimitiveArrayCritical(addressArrayObj, NULL);
-        memcpy(&addr_4->sin_addr.s_addr, data, 4);
-        env->ReleasePrimitiveArrayCritical(addressArrayObj, data, 0);
-
-    } else if (env->IsInstanceOf(addressObject, Inet6Address_class)) {
-
-        // IPV6
-
-        assert(env->GetArrayLength(addressArrayObj) == 16);
-
-        sockaddr_in6 *addr_6 = reinterpret_cast<sockaddr_in6 *>(&addr);
-        addr_6->sin6_family = AF_INET6;
-        addr_6->sin6_port = htons(port);
-
-        void *data = env->GetPrimitiveArrayCritical(addressArrayObj, NULL);
-        memcpy(&addr_6->sin6_addr.s6_addr, data, 16);
-        env->ReleasePrimitiveArrayCritical(addressArrayObj, data, 0);
-
-    } else {
-        assert(false && "addressObject is neither Inet4Address nor Inet6Address");
-    }
-
-    return addr;
+#ifdef __cplusplus
 }
+#endif
\ No newline at end of file
diff --git a/java/jni/ZT_jniutils.h b/java/jni/ZT_jniutils.h
index 23664a732..b76a28c27 100644
--- a/java/jni/ZT_jniutils.h
+++ b/java/jni/ZT_jniutils.h
@@ -1,84 +1,27 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #ifndef ZT_jniutils_h_
 #define ZT_jniutils_h_
-
+#include <stdio.h>
 #include <jni.h>
 #include <ZeroTierOne.h>
 
-#include <limits> // for numeric_limits
-#include <sys/socket.h> // for sockaddr_storage
-
-#if defined(__ANDROID__)
-
-#include <android/log.h>
-
-    #if !defined(NDEBUG)
-        #define LOGV(...) ((void)__android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__))
-        #define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
-    #else
-        #define LOGV(...)
-        #define LOGD(...)
-    #endif
-
-    #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))
-    #define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
-#else
-    #if !defined(NDEBUG)
-        #define LOGV(...) fprintf(stdout, __VA_ARGS__)
-        #define LOGD(...) fprintf(stdout, __VA_ARGS__)
-    #else
-        #define LOGV(...)
-        #define LOGD(...)
-    #endif
-
-    #define LOGI(...) fprintf(stdout, __VA_ARGS__)
-    #define LOGE(...) fprintf(stdout, __VA_ARGS__)
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-//
-// Call GetEnv and assert if there is an error
-//
-#define GETENV(env, vm) \
-    do { \
-        jint getEnvRet; \
-        assert(vm); \
-        if ((getEnvRet = vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6)) != JNI_OK) { \
-            LOGE("Error calling GetEnv: %d", getEnvRet); \
-            assert(false && "Error calling GetEnv"); \
-        } \
-    } while (false)
+#define LOG_TAG "ZeroTierOneJNI"
 
-//
-// Call GetJavaVM and assert if there is an error
-//
-#define GETJAVAVM(env, vm) \
-    do { \
-        jint getJavaVMRet; \
-        if ((getJavaVMRet = env->GetJavaVM(&vm)) != 0) { \
-            LOGE("Error calling GetJavaVM: %d", getJavaVMRet); \
-            assert(false && "Error calling GetJavaVM"); \
-        } \
-    } while (false)
-
-
-const jsize JSIZE_MAX = std::numeric_limits<jsize>::max();
+#if __ANDROID__
+#include <android/log.h>
+#define LOGV(...) ((void)__android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__))
+#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))
+#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
+#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
+#else
+#define LOGV(...) fprintf(stdout, __VA_ARGS__)
+#define LOGI(...) fprintf(stdout, __VA_ARGS__)
+#define LOGD(...) fprintf(stdout, __VA_ARGS__)
+#define LOGE(...) fprintf(stdout, __VA_ARGS__)
+#endif
 
 jobject createResultObject(JNIEnv *env, ZT_ResultCode code);
 jobject createVirtualNetworkStatus(JNIEnv *env, ZT_VirtualNetworkStatus status);
@@ -89,81 +32,18 @@ jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT_VirtualNetworkConfig
 
 jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr);
 jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr);
-int addressPort(const sockaddr_storage addr);
+
+jobject newMulticastGroup(JNIEnv *env, const ZT_MulticastGroup &mc);
 
 jobject newPeer(JNIEnv *env, const ZT_Peer &peer);
 jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp);
 
 jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &config);
 
-jobject newVersion(JNIEnv *env, int major, int minor, int rev);
+jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags);
 
-jobject newVirtualNetworkRoute(JNIEnv *env, const ZT_VirtualNetworkRoute &route);
-
-jobject newVirtualNetworkDNS(JNIEnv *env, const ZT_VirtualNetworkDNS &dns);
-
-jobject newNodeStatus(JNIEnv *env, const ZT_NodeStatus &status);
-
-jobjectArray newPeerArray(JNIEnv *env, const ZT_Peer *peers, size_t count);
-
-jobjectArray newVirtualNetworkConfigArray(JNIEnv *env, const ZT_VirtualNetworkConfig *networks, size_t count);
-
-jobjectArray newPeerPhysicalPathArray(JNIEnv *env, const ZT_PeerPhysicalPath *paths, size_t count);
-
-jobjectArray newInetSocketAddressArray(JNIEnv *env, const sockaddr_storage *addresses, size_t count);
-
-jobjectArray newVirtualNetworkRouteArray(JNIEnv *env, const ZT_VirtualNetworkRoute *routes, size_t count);
-
-//
-// log functions only for newArrayObject below
-//
-void newArrayObject_logCount(size_t count);
-void newArrayObject_log(const char *msg);
-
-//
-// function template for creating array objects
-//
-template <typename T, jobject (*F)(JNIEnv *, const T &)>
-jobjectArray newArrayObject(JNIEnv *env, const T *buffer, size_t count, jclass clazz) {
-
-    if (count > JSIZE_MAX) {
-        newArrayObject_logCount(count);
-        return NULL;
-    }
-
-    jsize jCount = static_cast<jsize>(count);
-
-    jobjectArray arrayObj = env->NewObjectArray(jCount, clazz, NULL);
-    if (env->ExceptionCheck() || arrayObj == NULL) {
-        newArrayObject_log("Error creating array object");
-        return NULL;
-    }
-
-    for (jsize i = 0; i < jCount; i++) {
-
-        jobject obj = F(env, buffer[i]);
-        if(env->ExceptionCheck() || obj == NULL) {
-            return NULL;
-        }
-
-        env->SetObjectArrayElement(arrayObj, i, obj);
-        if(env->ExceptionCheck()) {
-            newArrayObject_log("Error assigning object to array");
-            return NULL;
-        }
-
-        env->DeleteLocalRef(obj);
-    }
-
-    return arrayObj;
+#ifdef __cplusplus
 }
+#endif
 
-jbyteArray newByteArray(JNIEnv *env, const unsigned char *bytes, size_t count);
-
-jbyteArray newByteArray(JNIEnv *env, size_t count);
-
-bool isSocketAddressEmpty(const sockaddr_storage addr);
-
-sockaddr_storage fromSocketAddressObject(JNIEnv *env, jobject sockAddressObject);
-
-#endif // ZT_jniutils_h_
+#endif
\ No newline at end of file
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index ba1627856..dbabf8032 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -26,62 +26,42 @@
  */
 
 #include "com_zerotierone_sdk_Node.h"
-
-#include "ZT_jnicache.h"
 #include "ZT_jniutils.h"
+#include "ZT_jnilookup.h"
 
 #include <ZeroTierOne.h>
 #include "Mutex.hpp"
 
 #include <map>
 #include <string>
-#include <cassert>
-#include <cstring>
-#include <cinttypes> // for PRId64
+#include <assert.h>
+#include <string.h>
 
-#define LOG_TAG "Node"
+// global static JNI Lookup Object
+JniLookup lookup;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 namespace {
     struct JniRef
     {
-        JniRef(
-            int64_t id,
-            JavaVM *jvm,
-            jobject dataStoreGetListenerLocalIn,
-            jobject dataStorePutListenerLocalIn,
-            jobject packetSenderLocalIn,
-            jobject eventListenerLocalIn,
-            jobject frameListenerLocalIn,
-            jobject configListenerLocalIn,
-            jobject pathCheckerLocalIn)
-            : id(id)
-            , jvm(jvm)
-            , node()
-            , dataStoreGetListener()
-            , dataStorePutListener()
-            , packetSender()
-            , eventListener()
-            , frameListener()
-            , configListener()
-            , pathChecker()
-            , inited() {
-
-            JNIEnv *env;
-            GETENV(env, jvm);
-
-            dataStoreGetListener = env->NewGlobalRef(dataStoreGetListenerLocalIn);
-            dataStorePutListener = env->NewGlobalRef(dataStorePutListenerLocalIn);
-            packetSender = env->NewGlobalRef(packetSenderLocalIn);
-            eventListener = env->NewGlobalRef(eventListenerLocalIn);
-            frameListener = env->NewGlobalRef(frameListenerLocalIn);
-            configListener = env->NewGlobalRef(configListenerLocalIn);
-            pathChecker = env->NewGlobalRef(pathCheckerLocalIn);
-        };
+        JniRef()
+            : jvm(NULL)
+            , node(NULL)
+            , dataStoreGetListener(NULL)
+            , dataStorePutListener(NULL)
+            , packetSender(NULL)
+            , eventListener(NULL)
+            , frameListener(NULL)
+            , configListener(NULL)
+        {}
 
         ~JniRef()
         {
-            JNIEnv *env;
-            GETENV(env, jvm);
+            JNIEnv *env = NULL;
+            jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
 
             env->DeleteGlobalRef(dataStoreGetListener);
             env->DeleteGlobalRef(dataStorePutListener);
@@ -89,10 +69,9 @@ namespace {
             env->DeleteGlobalRef(eventListener);
             env->DeleteGlobalRef(frameListener);
             env->DeleteGlobalRef(configListener);
-            env->DeleteGlobalRef(pathChecker);
         }
 
-        int64_t id;
+        uint64_t id;
 
         JavaVM *jvm;
 
@@ -104,116 +83,62 @@ namespace {
         jobject eventListener;
         jobject frameListener;
         jobject configListener;
-        jobject pathChecker;
-
-        bool inited;
-
-        bool finishInitializing();
     };
 
-    //
-    // RAII construct for calling AttachCurrentThread and DetachCurrent automatically
-    //
-    struct ScopedJNIThreadAttacher {
 
-        JavaVM *jvm;
-        JNIEnv **env_p;
-        jint getEnvRet;
-
-        ScopedJNIThreadAttacher(JavaVM *jvmIn, JNIEnv **env_pIn, jint getEnvRetIn) :
-        jvm(jvmIn),
-        env_p(env_pIn),
-        getEnvRet(getEnvRetIn) {
-
-            if (getEnvRet != JNI_EDETACHED) {
-                return;
-            }
-
-            jint attachCurrentThreadRet;
-            if ((attachCurrentThreadRet = jvm->AttachCurrentThread(env_p, NULL)) != JNI_OK) {
-                LOGE("Error calling AttachCurrentThread: %d", attachCurrentThreadRet);
-                assert(false && "Error calling AttachCurrentThread");
-            }
-        }
-
-        ~ScopedJNIThreadAttacher() {
-
-            if (getEnvRet != JNI_EDETACHED) {
-                return;
-            }
-
-            jint detachCurrentThreadRet;
-            if ((detachCurrentThreadRet = jvm->DetachCurrentThread()) != JNI_OK) {
-                LOGE("Error calling DetachCurrentThread: %d", detachCurrentThreadRet);
-                assert(false && "Error calling DetachCurrentThread");
-            }
-        }
-    };
-
-    /*
-    * This must return 0 on success. It can return any OS-dependent error code
-    * on failure, and this results in the network being placed into the
-    * PORT_ERROR state.
-    */
     int VirtualNetworkConfigFunctionCallback(
         ZT_Node *node,
         void *userData,
-        void *threadData,
         uint64_t nwid,
-        void **nuptr,
+        void **,
         enum ZT_VirtualNetworkConfigOperation operation,
         const ZT_VirtualNetworkConfig *config)
     {
-        LOGV("VirtualNetworkConfigFunctionCallback");
+        LOGV("VritualNetworkConfigFunctionCallback");
         JniRef *ref = (JniRef*)userData;
-        assert(ref);
-        JNIEnv *env;
-        GETENV(env, ref->jvm);
+        JNIEnv *env = NULL;
+        ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
 
-        if (env->ExceptionCheck()) {
-            LOGE("Unhandled pending exception");
-            return -100;
+        jclass configListenerClass = env->GetObjectClass(ref->configListener);
+        if(configListenerClass == NULL)
+        {
+            LOGE("Couldn't find class for VirtualNetworkConfigListener instance");
+            return -1;
         }
 
-        if (ref->configListener == NULL) {
-            LOGE("configListener is NULL");
-            return -101;
+        jmethodID configListenerCallbackMethod = lookup.findMethod(configListenerClass,
+            "onNetworkConfigurationUpdated",
+            "(JLcom/zerotier/sdk/VirtualNetworkConfigOperation;Lcom/zerotier/sdk/VirtualNetworkConfig;)I");
+        if(configListenerCallbackMethod == NULL)
+        {
+            LOGE("Couldn't find onVirtualNetworkFrame() method");
+            return -2;
         }
 
         jobject operationObject = createVirtualNetworkConfigOperation(env, operation);
-        if(env->ExceptionCheck() || operationObject == NULL)
+        if(operationObject == NULL)
         {
-            return -102;
-        }
-
-        if (config == NULL) {
-            LOGE("Config is NULL");
-            return -103;
+            LOGE("Error creating VirtualNetworkConfigOperation object");
+            return -3;
         }
 
         jobject networkConfigObject = newNetworkConfig(env, *config);
-        if(env->ExceptionCheck() || networkConfigObject == NULL)
+        if(networkConfigObject == NULL)
         {
-            return -104;
+            LOGE("Error creating VirtualNetworkConfig object");
+            return -4;
         }
 
-        jint ret = env->CallIntMethod(
-            ref->configListener,
-            VirtualNetworkConfigListener_onNetworkConfigurationUpdated_method,
-            (jlong)nwid, (jobject)operationObject, (jobject)networkConfigObject);
-        if (env->ExceptionCheck()) {
-            LOGE("Exception calling onNetworkConfigurationUpdated");
-            return -105;
-        }
-
-        return ret;
+        return env->CallIntMethod(
+            ref->configListener, 
+            configListenerCallbackMethod, 
+            (jlong)nwid, operationObject, networkConfigObject);
     }
 
     void VirtualNetworkFrameFunctionCallback(ZT_Node *node,
         void *userData,
-        void *threadData,
         uint64_t nwid,
-        void** nuptr,
+        void**,
         uint64_t sourceMac,
         uint64_t destMac,
         unsigned int etherType,
@@ -222,690 +147,477 @@ namespace {
         unsigned int frameLength)
     {
         LOGV("VirtualNetworkFrameFunctionCallback");
-#ifndef NDEBUG
-        if (frameLength >= 14) {
-            unsigned char* local = (unsigned char*)frameData;
-            LOGV("Type Bytes: 0x%02x%02x", local[12], local[13]);
-        }
-#endif
+        unsigned char* local = (unsigned char*)frameData;
+        LOGV("Type Bytes: 0x%02x%02x", local[12], local[13]);
         JniRef *ref = (JniRef*)userData;
-        assert(ref);
         assert(ref->node == node);
-        JNIEnv *env;
-        
-        jint getEnvRet;
-        assert(ref->jvm);
-        getEnvRet = ref->jvm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
+        JNIEnv *env = NULL;
+        ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
 
-        if (!(getEnvRet == JNI_OK || getEnvRet == JNI_EDETACHED)) {
-            LOGE("Error calling GetEnv: %d", getEnvRet);
-            assert(false && "Error calling GetEnv");
-        }
 
-        //
-        // Thread might actually be detached.
-        //
-        // e.g:
-        // https://github.com/zerotier/ZeroTierOne/blob/91e7ce87f09ac1cfdeaf6ff22c3cedcd93574c86/node/Switch.cpp#L519
-        //
-        // Make sure to attach if needed
-        //
-        ScopedJNIThreadAttacher attacher{ref->jvm, &env, getEnvRet};
-
-        if (env->ExceptionCheck()) {
-            LOGE("Unhandled pending exception");
+        jclass frameListenerClass = env->GetObjectClass(ref->frameListener);
+        if(env->ExceptionCheck() || frameListenerClass == NULL)
+        {
+            LOGE("Couldn't find class for VirtualNetworkFrameListener instance");
             return;
         }
 
-        if (ref->frameListener == NULL) {
-            LOGE("frameListener is NULL");
+        jmethodID frameListenerCallbackMethod = lookup.findMethod(
+            frameListenerClass,
+            "onVirtualNetworkFrame", "(JJJJJ[B)V");
+        if(env->ExceptionCheck() || frameListenerCallbackMethod == NULL)
+        {
+            LOGE("Couldn't find onVirtualNetworkFrame() method");
             return;
         }
 
-        const unsigned char *bytes = static_cast<const unsigned char*>(frameData);
-        jbyteArray dataArray = newByteArray(env, bytes, frameLength);
+        jbyteArray dataArray = env->NewByteArray(frameLength);
         if(env->ExceptionCheck() || dataArray == NULL)
         {
+            LOGE("Couldn't create frame data array");
             return;
         }
 
-        env->CallVoidMethod(ref->frameListener, VirtualNetworkFrameListener_onVirtualNetworkFrame_method, (jlong)nwid, (jlong)sourceMac, (jlong)destMac, (jlong)etherType, (jlong)vlanid, (jbyteArray)dataArray);
-        if (env->ExceptionCheck()) {
-            LOGE("Exception calling onVirtualNetworkFrame");
+        void *data = env->GetPrimitiveArrayCritical(dataArray, NULL);
+        memcpy(data, frameData, frameLength);
+        env->ReleasePrimitiveArrayCritical(dataArray, data, 0);
+
+        if(env->ExceptionCheck())
+        {
+            LOGE("Error setting frame data to array");
             return;
         }
+
+        env->CallVoidMethod(ref->frameListener, frameListenerCallbackMethod, (jlong)nwid, (jlong)sourceMac, (jlong)destMac, (jlong)etherType, (jlong)vlanid, dataArray);
     }
 
 
     void EventCallback(ZT_Node *node,
         void *userData,
-        void *threadData,
-        enum ZT_Event event,
-        const void *data) {
+        enum ZT_Event event, 
+        const void *data)
+    {
         LOGV("EventCallback");
-        JniRef *ref = (JniRef *) userData;
-        assert(ref);
-        if (ref->node != node && event != ZT_EVENT_UP) {
+        JniRef *ref = (JniRef*)userData;
+        if(ref->node != node && event != ZT_EVENT_UP)
+        {
             LOGE("Nodes not equal. ref->node %p, node %p. Event: %d", ref->node, node, event);
             return;
         }
-        JNIEnv *env;
-        GETENV(env, ref->jvm);
+        JNIEnv *env = NULL;
+        ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
 
-        if (env->ExceptionCheck()) {
-            LOGE("Unhandled pending exception");
+
+        jclass eventListenerClass = env->GetObjectClass(ref->eventListener);
+        if(eventListenerClass == NULL)
+        {
+            LOGE("Couldn't class for EventListener instance");
             return;
         }
 
-        if (ref->eventListener == NULL) {
-            LOGE("eventListener is NULL");
+        jmethodID onEventMethod = lookup.findMethod(eventListenerClass,
+            "onEvent", "(Lcom/zerotier/sdk/Event;)V");
+        if(onEventMethod == NULL)
+        {
+            LOGE("Couldn't find onEvent method");
+            return;
+        }
+
+        jmethodID onTraceMethod = lookup.findMethod(eventListenerClass,
+            "onTrace", "(Ljava/lang/String;)V");
+        if(onTraceMethod == NULL)
+        {
+            LOGE("Couldn't find onTrace method");
             return;
         }
 
         jobject eventObject = createEvent(env, event);
-        if (env->ExceptionCheck() || eventObject == NULL) {
+        if(eventObject == NULL)
+        {
             return;
         }
 
-        switch (event) {
-            case ZT_EVENT_UP: {
-                LOGD("Event Up");
-                env->CallVoidMethod(ref->eventListener, EventListener_onEvent_method, (jobject)eventObject);
-                if (env->ExceptionCheck()) {
-                    LOGE("Exception calling onEvent");
-                    return;
-                }
-                break;
-            }
-            case ZT_EVENT_OFFLINE: {
-                LOGD("Event Offline");
-                env->CallVoidMethod(ref->eventListener, EventListener_onEvent_method, (jobject)eventObject);
-                if (env->ExceptionCheck()) {
-                    LOGE("Exception calling onEvent");
-                    return;
-                }
-                break;
-            }
-            case ZT_EVENT_ONLINE: {
-                LOGD("Event Online");
-                env->CallVoidMethod(ref->eventListener, EventListener_onEvent_method, (jobject)eventObject);
-                if (env->ExceptionCheck()) {
-                    LOGE("Exception calling onEvent");
-                    return;
-                }
-                break;
-            }
-            case ZT_EVENT_DOWN: {
-                LOGD("Event Down");
-                env->CallVoidMethod(ref->eventListener, EventListener_onEvent_method, (jobject)eventObject);
-                if (env->ExceptionCheck()) {
-                    LOGE("Exception calling onEvent");
-                    return;
-                }
-                break;
-            }
-            case ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION: {
-                LOGV("Identity Collision");
-                // call onEvent()
-                env->CallVoidMethod(ref->eventListener, EventListener_onEvent_method, (jobject)eventObject);
-                if (env->ExceptionCheck()) {
-                    LOGE("Exception calling onEvent");
-                    return;
-                }
-            }
-                break;
-            case ZT_EVENT_TRACE: {
-                LOGV("Trace Event");
-                // call onTrace()
-                if (data == NULL) {
-                    break;
-                }
-                const char *message = (const char *) data;
-                jstring messageStr = env->NewStringUTF(message);
-                if (env->ExceptionCheck() || messageStr == NULL) {
-                    LOGE("Exception creating new string");
-                    return;
-                }
-
-                env->CallVoidMethod(ref->eventListener, EventListener_onTrace_method, (jstring)messageStr);
-                if (env->ExceptionCheck()) {
-                    LOGE("Exception calling onTrace");
-                    return;
-                }
-            }
-                break;
-            case ZT_EVENT_USER_MESSAGE:
-            case ZT_EVENT_REMOTE_TRACE:
-                break;
+        switch(event)
+        {
+        case ZT_EVENT_UP:
+        {
+            LOGD("Event Up");
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
+            break;
         }
-    }
-
-    void StatePutFunction(
-            ZT_Node *node,
-            void *userData,
-            void *threadData,
-            enum ZT_StateObjectType type,
-            const uint64_t id[2],
-            const void *buffer,
-            int bufferLength) {
-        LOGV("StatePutFunction");
-        
-        char p[4096] = {0};
-        bool secure = false;
-        int res = 0;
-        switch (type) {
-            case ZT_STATE_OBJECT_IDENTITY_PUBLIC:
-                res = snprintf(p, sizeof(p), "identity.public");
-                break;
-            case ZT_STATE_OBJECT_IDENTITY_SECRET:
-                res = snprintf(p, sizeof(p), "identity.secret");
-                secure = true;
-                break;
-            case ZT_STATE_OBJECT_PLANET:
-                res = snprintf(p, sizeof(p), "planet");
-                break;
-            case ZT_STATE_OBJECT_MOON:
-                res = snprintf(p, sizeof(p), "moons.d/%.16" PRIx64 ".moon", id[0]);
-                break;
-            case ZT_STATE_OBJECT_NETWORK_CONFIG:
-                res = snprintf(p, sizeof(p), "networks.d/%.16" PRIx64 ".conf", id[0]);
-                break;
-            case ZT_STATE_OBJECT_PEER:
-                res = snprintf(p, sizeof(p), "peers.d/%.10" PRIx64, id[0]);
-                break;
-            case ZT_STATE_OBJECT_NULL:
-                return;
+        case ZT_EVENT_OFFLINE:
+        {
+            LOGD("Event Offline");
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
+            break;
         }
-
-        if (!(0 <= res && res < sizeof(p))) {
-            LOGE("snprintf error: %d", res);
-            return;
+        case ZT_EVENT_ONLINE:
+        {
+            LOGD("Event Online");
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
+            break;
         }
-
-        JniRef *ref = (JniRef*)userData;
-        assert(ref);
-        JNIEnv *env;
-        GETENV(env, ref->jvm);
-
-        if (env->ExceptionCheck()) {
-            LOGE("Unhandled pending exception");
-            return;
+        case ZT_EVENT_DOWN:
+        {
+            LOGD("Event Down");
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
+            break;
         }
-
-        if (ref->dataStorePutListener == NULL) {
-            LOGE("dataStorePutListener is NULL");
-            return;
+        case ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION:
+        {
+            LOGV("Identity Collision");
+            // call onEvent()
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
         }
-
-        jstring nameStr = env->NewStringUTF(p);
-        if (env->ExceptionCheck() || nameStr == NULL) {
-            LOGE("Exception creating new string");
-            return;
-        }
-
-        if (bufferLength >= 0) {
-            LOGD("JNI: Write file: %s", p);
-            const unsigned char *bytes = static_cast<const unsigned char *>(buffer);
-            jbyteArray bufferObj = newByteArray(env, bytes, bufferLength);
-            if(env->ExceptionCheck() || bufferObj == NULL)
+        break;
+        case ZT_EVENT_TRACE:
+        {
+            LOGV("Trace Event");
+            // call onTrace()
+            if(data != NULL)
             {
-                return;
-            }
-
-            int retval = env->CallIntMethod(ref->dataStorePutListener,
-                               DataStorePutListener_onDataStorePut_method,
-                               (jstring)nameStr, (jbyteArray)bufferObj, (jboolean)secure);
-            if (env->ExceptionCheck()) {
-                LOGE("Exception calling onDataStorePut");
-                return;
-            }
-
-            if (retval != 0) {
-                LOGE("onDataStorePut error: %d", retval);
-            }
-
-        } else {
-            LOGD("JNI: Delete file: %s", p);
-            int retval = env->CallIntMethod(ref->dataStorePutListener, DataStorePutListener_onDelete_method, (jstring)nameStr);
-            if (env->ExceptionCheck()) {
-                LOGE("Exception calling onDelete");
-                return;
-            }
-
-            if (retval != 0) {
-                LOGE("onDelete error: %d", retval);
+                const char* message = (const char*)data;
+                jstring messageStr = env->NewStringUTF(message);
+                env->CallVoidMethod(ref->eventListener, onTraceMethod, messageStr);
             }
         }
+        break;
+        }
     }
 
-    /**
-     * This function should return the number of bytes actually stored to the
-     * buffer or -1 if the state object was not found or the buffer was too
-     * small to store it.
-     */
-    int StateGetFunction(
-            ZT_Node *node,
-            void *userData,
-            void *threadData,
-            ZT_StateObjectType type,
-            const uint64_t id[2],
-            void *buffer,
-            unsigned int bufferLength) {
-        LOGV("StateGetFunction");
-
-        char p[4096] = {0};
-        int res = 0;
-        switch (type) {
-            case ZT_STATE_OBJECT_IDENTITY_PUBLIC:
-                res = snprintf(p, sizeof(p), "identity.public");
-                break;
-            case ZT_STATE_OBJECT_IDENTITY_SECRET:
-                res = snprintf(p, sizeof(p), "identity.secret");
-                break;
-            case ZT_STATE_OBJECT_PLANET:
-                res = snprintf(p, sizeof(p), "planet");
-                break;
-            case ZT_STATE_OBJECT_MOON:
-                res = snprintf(p, sizeof(p), "moons.d/%.16" PRIx64 ".moon", id[0]);
-                break;
-            case ZT_STATE_OBJECT_NETWORK_CONFIG:
-                res = snprintf(p, sizeof(p), "networks.d/%.16" PRIx64 ".conf", id[0]);
-                break;
-            case ZT_STATE_OBJECT_PEER:
-                res = snprintf(p, sizeof(p), "peers.d/%.10" PRIx64, id[0]);
-                break;
-            case ZT_STATE_OBJECT_NULL:
-                return -100;
-        }
-
-        if (!(0 <= res && res < sizeof(p))) {
-            LOGE("snprintf error: %d", res);
-            return -101;
-        }
-
+    long DataStoreGetFunction(ZT_Node *node,
+        void *userData,
+        const char *objectName,
+        void *buffer,
+        unsigned long bufferSize,
+        unsigned long bufferIndex,
+        unsigned long *out_objectSize)
+    {
         JniRef *ref = (JniRef*)userData;
-        assert(ref);
-        JNIEnv *env;
-        GETENV(env, ref->jvm);
+        JNIEnv *env = NULL;
+        ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
 
-        if (env->ExceptionCheck()) {
-            LOGE("Unhandled pending exception");
-            return -102;
+        jclass dataStoreGetClass = env->GetObjectClass(ref->dataStoreGetListener);
+        if(dataStoreGetClass == NULL)
+        {
+            LOGE("Couldn't find class for DataStoreGetListener instance");
+            return -2;
         }
 
-        if (ref->dataStoreGetListener == NULL) {
-            LOGE("dataStoreGetListener is NULL");
-            return -103;
+        jmethodID dataStoreGetCallbackMethod = lookup.findMethod(
+            dataStoreGetClass,
+            "onDataStoreGet",
+            "(Ljava/lang/String;[BJ[J)J");
+        if(dataStoreGetCallbackMethod == NULL)
+        {
+            LOGE("Couldn't find onDataStoreGet method");
+            return -2;
         }
 
-        jstring nameStr = env->NewStringUTF(p);
-        if(env->ExceptionCheck() || nameStr == NULL)
+        jstring nameStr = env->NewStringUTF(objectName);
+        if(nameStr == NULL)
         {
             LOGE("Error creating name string object");
-            return -104; // out of memory
+            return -2; // out of memory
         }
 
-        jbyteArray bufferObj = newByteArray(env, bufferLength);
-        if(env->ExceptionCheck() || bufferObj == NULL)
+        jbyteArray bufferObj = env->NewByteArray(bufferSize);
+        if(bufferObj == NULL)
         {
-            return -105;
+            LOGE("Error creating byte[] buffer of size: %lu", bufferSize);
+            return -2;
         }
 
-        LOGV("Calling onDataStoreGet(%s, %p)", p, buffer);
-
-        int retval = (int)env->CallLongMethod(
-                ref->dataStoreGetListener,
-                DataStoreGetListener_onDataStoreGet_method,
-                (jstring)nameStr,
-                (jbyteArray)bufferObj);
-        if (env->ExceptionCheck()) {
-            LOGE("Exception calling onDataStoreGet");
-            return -106;
+        jlongArray objectSizeObj = env->NewLongArray(1);
+        if(objectSizeObj == NULL)
+        {
+            LOGE("Error creating long[1] array for actual object size");
+            return -2; // couldn't create long[1] array
         }
 
-        LOGV("onDataStoreGet returned %d", retval);
+        LOGV("Calling onDataStoreGet(%s, %p, %lu, %p)",
+            objectName, buffer, bufferIndex, objectSizeObj);
+
+        long retval = (long)env->CallLongMethod(
+            ref->dataStoreGetListener, dataStoreGetCallbackMethod, 
+            nameStr, bufferObj, (jlong)bufferIndex, objectSizeObj);
 
         if(retval > 0)
         {
-            if (retval > bufferLength) {
-                LOGE("retval > bufferLength. retval: %d, bufferLength: %u", retval, bufferLength);
-                return -107;
-            }
-
             void *data = env->GetPrimitiveArrayCritical(bufferObj, NULL);
             memcpy(buffer, data, retval);
             env->ReleasePrimitiveArrayCritical(bufferObj, data, 0);
+
+            jlong *objSize = (jlong*)env->GetPrimitiveArrayCritical(objectSizeObj, NULL);
+            *out_objectSize = (unsigned long)objSize[0];
+            env->ReleasePrimitiveArrayCritical(objectSizeObj, objSize, 0);
         }
 
+        LOGV("Out Object Size: %lu", *out_objectSize);
+
         return retval;
     }
 
-    /**
-     * The function must return zero on success and may return any error code
-     * on failure. Note that success does not (of course) guarantee packet
-     * delivery. It only means that the packet appears to have been sent.
-     */
+    int DataStorePutFunction(ZT_Node *node,
+        void *userData,
+        const char *objectName,
+        const void *buffer,
+        unsigned long bufferSize,
+        int secure)
+    {
+        JniRef *ref = (JniRef*)userData;
+        JNIEnv *env = NULL;
+        ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
+
+
+        jclass dataStorePutClass = env->GetObjectClass(ref->dataStorePutListener);
+        if(dataStorePutClass == NULL)
+        {
+            LOGE("Couldn't find class for DataStorePutListener instance");
+            return -1;
+        }
+
+        jmethodID dataStorePutCallbackMethod = lookup.findMethod(
+            dataStorePutClass,
+            "onDataStorePut",
+            "(Ljava/lang/String;[BZ)I");
+        if(dataStorePutCallbackMethod == NULL)
+        {
+            LOGE("Couldn't find onDataStorePut method");
+            return -2;
+        }
+
+        jmethodID deleteMethod = lookup.findMethod(dataStorePutClass,
+            "onDelete", "(Ljava/lang/String;)I");
+        if(deleteMethod == NULL)
+        {
+            LOGE("Couldn't find onDelete method");
+            return -3;
+        }
+
+        jstring nameStr = env->NewStringUTF(objectName);
+
+        if(buffer == NULL)
+        {
+            LOGD("JNI: Delete file: %s", objectName);
+            // delete operation
+            return env->CallIntMethod(
+                ref->dataStorePutListener, deleteMethod, nameStr);
+        }
+        else
+        {
+            LOGD("JNI: Write file: %s", objectName);
+            // set operation
+            jbyteArray bufferObj = env->NewByteArray(bufferSize);
+            if(env->ExceptionCheck() || bufferObj == NULL)
+            {
+                LOGE("Error creating byte array buffer!");
+                return -4;
+            }
+
+            env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
+            bool bsecure = secure != 0;
+
+            return env->CallIntMethod(ref->dataStorePutListener,
+                dataStorePutCallbackMethod,
+                nameStr, bufferObj, bsecure);
+        }
+    }
+
     int WirePacketSendFunction(ZT_Node *node,
         void *userData,
-        void *threadData,
-        int64_t localSocket,
+        const struct sockaddr_storage *localAddress,
         const struct sockaddr_storage *remoteAddress,
         const void *buffer,
         unsigned int bufferSize,
         unsigned int ttl)
     {
-        LOGV("WirePacketSendFunction(%" PRId64 ", %p, %p, %u, %u)", localSocket, remoteAddress, buffer, bufferSize, ttl);
+        LOGV("WirePacketSendFunction(%p, %p, %p, %d)", localAddress, remoteAddress, buffer, bufferSize);
         JniRef *ref = (JniRef*)userData;
-        assert(ref);
         assert(ref->node == node);
 
-        JNIEnv *env;
-        GETENV(env, ref->jvm);
+        JNIEnv *env = NULL;
+        ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
 
-        if (env->ExceptionCheck()) {
-            LOGE("Unhandled pending exception");
-            return -100;
-        }
 
-        if (ref->packetSender == NULL) {
-            LOGE("packetSender is NULL");
-            return -101;
-        }
-
-        //
-        // may be NULL
-        //
-        jobject remoteAddressObj = newInetSocketAddress(env, *remoteAddress);
-        if (env->ExceptionCheck()) {
-            return -102;
-        }
-        const unsigned char *bytes = static_cast<const unsigned char *>(buffer);
-        jbyteArray bufferObj = newByteArray(env, bytes, bufferSize);
-        if (env->ExceptionCheck() || bufferObj == NULL)
+        jclass packetSenderClass = env->GetObjectClass(ref->packetSender);
+        if(packetSenderClass == NULL)
         {
-            return -103;
+            LOGE("Couldn't find class for PacketSender instance");
+            return -1;
+        }
+
+        jmethodID packetSenderCallbackMethod = lookup.findMethod(packetSenderClass,
+            "onSendPacketRequested", "(Ljava/net/InetSocketAddress;Ljava/net/InetSocketAddress;[BI)I");
+        if(packetSenderCallbackMethod == NULL)
+        {
+            LOGE("Couldn't find onSendPacketRequested method");
+            return -2;
         }
         
-        int retval = env->CallIntMethod(ref->packetSender, PacketSender_onSendPacketRequested_method, (jlong)localSocket, (jobject)remoteAddressObj, (jbyteArray)bufferObj, (jint)0);
-        if (env->ExceptionCheck()) {
-            LOGE("Exception calling onSendPacketRequested");
-            return -104;
+        jobject localAddressObj = NULL;
+        if(memcmp(localAddress, &ZT_SOCKADDR_NULL, sizeof(sockaddr_storage)) != 0)
+        {
+            localAddressObj = newInetSocketAddress(env, *localAddress);
         }
 
+        jobject remoteAddressObj = newInetSocketAddress(env, *remoteAddress);
+        jbyteArray bufferObj = env->NewByteArray(bufferSize);
+        env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
+        int retval = env->CallIntMethod(ref->packetSender, packetSenderCallbackMethod, localAddressObj, remoteAddressObj, bufferObj);
+
         LOGV("JNI Packet Sender returned: %d", retval);
         return retval;
     }
 
-    /**
-     * This function must return nonzero (true) if the path should be used.
-     */
-    int PathCheckFunction(ZT_Node *node,
-        void *userPtr,
-        void *threadPtr,
-        uint64_t address,
-        int64_t localSocket,
-        const struct sockaddr_storage *remoteAddress)
-    {
-        LOGV("PathCheckFunction");
-
-        JniRef *ref = (JniRef*)userPtr;
-        assert(ref);
-        assert(ref->node == node);
-
-        if(ref->pathChecker == NULL) {
-            return true;
-        }
-
-        JNIEnv *env;
-        GETENV(env, ref->jvm);
-
-        if (env->ExceptionCheck()) {
-            LOGE("Unhandled pending exception");
-            return true;
-        }
-
-        //
-        // may be NULL
-        //
-        jobject remoteAddressObj = newInetSocketAddress(env, *remoteAddress);
-        if (env->ExceptionCheck()) {
-            return true;
-        }
-
-        jboolean ret = env->CallBooleanMethod(ref->pathChecker, PathChecker_onPathCheck_method, (jlong)address, (jlong)localSocket, (jobject)remoteAddressObj);
-        if (env->ExceptionCheck()) {
-            LOGE("Exception calling onPathCheck");
-            return true;
-        }
-
-        return ret;
-    }
-
-    /**
-     * It must return a nonzero (true) value if the result buffer has been filled with an address.
-     */
-    int PathLookupFunction(ZT_Node *node,
-        void *userPtr,
-        void *threadPtr,
-        uint64_t address,
-        int ss_family,
-        struct sockaddr_storage *result)
-    {
-        LOGV("PathLookupFunction");
-
-        JniRef *ref = (JniRef*)userPtr;
-        assert(ref);
-        assert(ref->node == node);
-
-        if(ref->pathChecker == NULL) {
-            return false;
-        }
-
-        JNIEnv *env;
-        GETENV(env, ref->jvm);
-
-        if (env->ExceptionCheck()) {
-            LOGE("Unhandled pending exception");
-            return false;
-        }
-        
-        //
-        // may be NULL
-        //
-        jobject sockAddressObject = env->CallObjectMethod(ref->pathChecker, PathChecker_onPathLookup_method, (jlong)address, (jint)ss_family);
-        if (env->ExceptionCheck()) {
-            LOGE("Unable to call onPathLookup implementation");
-            return false;
-        }
-
-        if(sockAddressObject == NULL)
-        {
-            LOGE("Unable to call onPathLookup implementation");
-            return false;
-        }
-
-        *result = fromSocketAddressObject(env, sockAddressObject);
-        if (env->ExceptionCheck() || isSocketAddressEmpty(*result)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    typedef std::map<int64_t, JniRef*> NodeMap;
-    NodeMap nodeMap;
+    typedef std::map<uint64_t, JniRef*> NodeMap;
+    static NodeMap nodeMap;
     ZeroTier::Mutex nodeMapMutex;
 
-    bool isInited(int64_t nodeId) {
-
-        ZeroTier::Mutex::Lock lock(nodeMapMutex);
-        NodeMap::iterator found = nodeMap.find(nodeId);
-
-        if (found == nodeMap.end()) {
-
-            //
-            // not in map yet, or has been removed from map
-            //
-            return false;
-        }
-        
-        JniRef *ref = found->second;
-
-        assert(ref);
-
-        return ref->inited;
-    }
-
-    bool JniRef::finishInitializing() {
-
-        ZeroTier::Mutex::Lock lock(nodeMapMutex);
-        NodeMap::iterator found = nodeMap.find(id);
-
-        if (found != nodeMap.end()) {
-            //
-            // already in map
-            //
-            LOGE("Cannot finish initializing; node is already in map");
-            return false;
-        }
-
-        nodeMap.insert(std::make_pair(id, this));
-
-        assert(!inited);
-        inited = true;
-
-        return true;
-    }
-
-    ZT_Node* findNode(int64_t nodeId)
+    ZT_Node* findNode(uint64_t nodeId)
     {
         ZeroTier::Mutex::Lock lock(nodeMapMutex);
         NodeMap::iterator found = nodeMap.find(nodeId);
-
-        assert(found != nodeMap.end());
-
-        JniRef *ref = found->second;
-
-        assert(ref);
-
-        return ref->node;
-    }
-
-    JniRef *removeRef(int64_t nodeId) {
-
-        ZeroTier::Mutex::Lock lock(nodeMapMutex);
-
-        NodeMap::iterator found = nodeMap.find(nodeId);
-
-        if (found == nodeMap.end()) {
-            return nullptr;
+        if(found != nodeMap.end())
+        {
+            JniRef *ref = found->second;
+            return ref->node;
         }
-
-        JniRef *ref = found->second;
-
-        assert(ref);
-
-        nodeMap.erase(nodeId);
-
-        return ref;
+        return NULL;
     }
 }
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) 
 {
-    setupJNICache(vm);
+    lookup.setJavaVM(vm);
     return JNI_VERSION_1_6;
 }
 
 JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved)
 {
-    teardownJNICache(vm);
+
 }
 
 
 /*
  * Class:     com_zerotier_sdk_Node
  * Method:    node_init
- * Signature: (JLcom/zerotier/sdk/DataStoreGetListener;Lcom/zerotier/sdk/DataStorePutListener;Lcom/zerotier/sdk/PacketSender;Lcom/zerotier/sdk/EventListener;Lcom/zerotier/sdk/VirtualNetworkFrameListener;Lcom/zerotier/sdk/VirtualNetworkConfigListener;Lcom/zerotier/sdk/PathChecker;)Lcom/zerotier/sdk/ResultCode;
+ * Signature: (J)Lcom/zerotier/sdk/ResultCode;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
-    JNIEnv *env, jobject obj, jlong now, jobject dataStoreGetListener,
-    jobject dataStorePutListener, jobject packetSender, jobject eventListener,
-    jobject frameListener, jobject configListener,
-    jobject pathChecker)
+    JNIEnv *env, jobject obj, jlong now)
 {
     LOGV("Creating ZT_Node struct");
-    jobject resultObject = ResultCode_RESULT_OK_enum;
-
-    JavaVM *vm;
-    GETJAVAVM(env, vm);
-
-    assert(dataStoreGetListener != NULL);
-    assert(dataStorePutListener != NULL);
-    assert(packetSender != NULL);
-    assert(frameListener != NULL);
-    assert(configListener != NULL);
-    assert(eventListener != NULL);
-    //
-    // OPTIONAL, pathChecker may be NULL
-    //
-//    assert(pathChecker != NULL);
-
-    ZT_Node_Callbacks callbacks{};
-    callbacks.stateGetFunction = &StateGetFunction;
-    callbacks.statePutFunction = &StatePutFunction;
-    callbacks.wirePacketSendFunction = &WirePacketSendFunction;
-    callbacks.virtualNetworkFrameFunction = &VirtualNetworkFrameFunctionCallback;
-    callbacks.virtualNetworkConfigFunction = &VirtualNetworkConfigFunctionCallback;
-    callbacks.eventCallback = &EventCallback;
-    callbacks.pathCheckFunction = &PathCheckFunction;
-    callbacks.pathLookupFunction = &PathLookupFunction;
-
-    //
-    // a bit of a confusing dance here where ref and node both know about each other
-    //
-    JniRef *ref = new JniRef(
-            now,
-            vm,
-            dataStoreGetListener,
-            dataStorePutListener,
-            packetSender,
-            eventListener,
-            frameListener,
-            configListener,
-            pathChecker);
+    jobject resultObject = createResultObject(env, ZT_RESULT_OK);
 
     ZT_Node *node;
+    JniRef *ref = new JniRef;
+    ref->id = (uint64_t)now;
+    env->GetJavaVM(&ref->jvm);
+
+    jclass cls = env->GetObjectClass(obj);
+    jfieldID fid = lookup.findField(
+        cls, "getListener", "Lcom/zerotier/sdk/DataStoreGetListener;");
+
+    if(fid == NULL)
+    {
+        return NULL; // exception already thrown
+    }
+
+    jobject tmp = env->GetObjectField(obj, fid);
+    if(tmp == NULL)
+    {
+        return NULL;
+    }
+    ref->dataStoreGetListener = env->NewGlobalRef(tmp);
+
+    fid = lookup.findField(
+        cls, "putListener", "Lcom/zerotier/sdk/DataStorePutListener;");
+
+    if(fid == NULL)
+    {
+        return NULL; // exception already thrown
+    }
+
+    tmp = env->GetObjectField(obj, fid);
+    if(tmp == NULL)
+    {
+        return NULL;
+    }
+    ref->dataStorePutListener = env->NewGlobalRef(tmp);
+
+    fid = lookup.findField(
+        cls, "sender", "Lcom/zerotier/sdk/PacketSender;");
+    if(fid == NULL)
+    {
+        return NULL; // exception already thrown
+    }
+
+    tmp = env->GetObjectField(obj, fid);
+    if(tmp == NULL)
+    {
+        return NULL;
+    }
+    ref->packetSender = env->NewGlobalRef(tmp);
+
+    fid = lookup.findField(
+        cls, "frameListener", "Lcom/zerotier/sdk/VirtualNetworkFrameListener;");
+    if(fid == NULL)
+    {
+        return NULL; // exception already thrown
+    }
+
+    tmp = env->GetObjectField(obj, fid);
+    if(tmp == NULL)
+    {
+        return NULL;
+    }
+    ref->frameListener = env->NewGlobalRef(tmp);
+
+    fid = lookup.findField(
+        cls, "configListener", "Lcom/zerotier/sdk/VirtualNetworkConfigListener;");
+    if(fid == NULL)
+    {
+        return NULL; // exception already thrown
+    }
+
+    tmp = env->GetObjectField(obj, fid);
+    if(tmp == NULL)
+    {
+        return NULL;
+    }
+    ref->configListener = env->NewGlobalRef(tmp);
+
+    fid = lookup.findField(
+        cls, "eventListener", "Lcom/zerotier/sdk/EventListener;");
+    if(fid == NULL)
+    {
+        return NULL;
+    }
+
+    tmp = env->GetObjectField(obj, fid);
+    if(tmp == NULL)
+    {
+        return NULL;
+    }
+    ref->eventListener = env->NewGlobalRef(tmp);
+
     ZT_ResultCode rc = ZT_Node_new(
         &node,
         ref,
+        (uint64_t)now,
+        &DataStoreGetFunction,
+        &DataStorePutFunction,
+        &WirePacketSendFunction,
+        &VirtualNetworkFrameFunctionCallback,
+        &VirtualNetworkConfigFunctionCallback,
         NULL,
-        &callbacks,
-        (int64_t)now);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception creating Node");
+        &EventCallback);
 
-        if(node)
-        {
-            ZT_Node_delete(node);
-            node = NULL;
-        }
-        delete ref;
-        ref = NULL;
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
     if(rc != ZT_RESULT_OK)
     {
         LOGE("Error creating Node: %d", rc);
         resultObject = createResultObject(env, rc);
-        if (env->ExceptionCheck() || resultObject == NULL) {
-            return NULL;
-        }
-
         if(node)
         {
             ZT_Node_delete(node);
@@ -916,29 +628,14 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
         return resultObject;
     }
 
-    //
-    // node is now updated
-    //
+    ZeroTier::Mutex::Lock lock(nodeMapMutex);
     ref->node = node;
-
-    if (!ref->finishInitializing()) {
-        LOGE("finishInitializing() failed");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
+    nodeMap.insert(std::make_pair(ref->id, ref));
+    
 
     return resultObject;
 }
 
-/*
- * Class:     com_zerotier_sdk_Node
- * Method:    node_isInited
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_zerotier_sdk_Node_node_1isInited
-        (JNIEnv *env, jobject obj, jlong nodeId) {
-    return isInited(nodeId);
-}
-
 /*
  * Class:     com_zerotier_sdk_Node
  * Method:    node_delete
@@ -948,17 +645,28 @@ JNIEXPORT void JNICALL Java_com_zerotier_sdk_Node_node_1delete(
     JNIEnv *env, jobject obj, jlong id)
 {
     LOGV("Destroying ZT_Node struct");
-    int64_t nodeId = (int64_t)id;
+    uint64_t nodeId = (uint64_t)id;
 
-    JniRef *ref = removeRef(nodeId);
-
-    if (!ref) {
-        return;
+    NodeMap::iterator found;
+    {
+        ZeroTier::Mutex::Lock lock(nodeMapMutex);  
+        found = nodeMap.find(nodeId);
     }
 
-    ZT_Node_delete(ref->node);
+    if(found != nodeMap.end())
+    {
+        JniRef *ref = found->second;
+        nodeMap.erase(found);
 
-    delete ref;
+        ZT_Node_delete(ref->node);
+
+        delete ref;
+        ref = NULL;
+    }
+    else
+    {
+        LOGE("Attempted to delete a node that doesn't exist!");
+    }
 }
 
 /*
@@ -967,9 +675,9 @@ JNIEXPORT void JNICALL Java_com_zerotier_sdk_Node_node_1delete(
  * Signature: (JJJJJII[B[J)Lcom/zerotier/sdk/ResultCode;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
-    JNIEnv *env, jobject obj,
-    jlong id,
-    jlong in_now,
+    JNIEnv *env, jobject obj, 
+    jlong id, 
+    jlong in_now, 
     jlong in_nwid,
     jlong in_sourceMac,
     jlong in_destMac,
@@ -978,18 +686,23 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
     jbyteArray in_frameData,
     jlongArray out_nextBackgroundTaskDeadline)
 {
-    int64_t nodeId = (int64_t) id;
-
+    uint64_t nodeId = (uint64_t) id;
+    
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
 
     unsigned int nbtd_len = env->GetArrayLength(out_nextBackgroundTaskDeadline);
     if(nbtd_len < 1)
     {
         // array for next background task length has 0 elements!
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
     }
 
-    int64_t now = (int64_t)in_now;
+    uint64_t now = (uint64_t)in_now;
     uint64_t nwid = (uint64_t)in_nwid;
     uint64_t sourceMac = (uint64_t)in_sourceMac;
     uint64_t destMac = (uint64_t)in_destMac;
@@ -998,18 +711,14 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
 
     unsigned int frameLength = env->GetArrayLength(in_frameData);
     void *frameData = env->GetPrimitiveArrayCritical(in_frameData, NULL);
-    //
-    // need local copy of frameData because arbitrary code may run in ZT_Node_processVirtualNetworkFrame and no other JNI work may happen between GetPrimitiveArrayCritical / ReleasePrimitiveArrayCritical
-    //
     void *localData = malloc(frameLength);
     memcpy(localData, frameData, frameLength);
     env->ReleasePrimitiveArrayCritical(in_frameData, frameData, 0);
 
-    int64_t nextBackgroundTaskDeadline = 0;
+    uint64_t nextBackgroundTaskDeadline = 0;
 
     ZT_ResultCode rc = ZT_Node_processVirtualNetworkFrame(
         node,
-        NULL,
         now,
         nwid,
         sourceMac,
@@ -1019,16 +728,6 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
         (const void*)localData,
         frameLength,
         &nextBackgroundTaskDeadline);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_processVirtualNetworkFrame");
-        free(localData);
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
-    if (rc != ZT_RESULT_OK) {
-        LOGE("ZT_Node_processVirtualNetworkFrame returned: %d", rc);
-    }
-
-    free(localData);
 
     jlong *outDeadline = (jlong*)env->GetPrimitiveArrayCritical(out_nextBackgroundTaskDeadline, NULL);
     outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
@@ -1040,65 +739,197 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
 /*
  * Class:     com_zerotier_sdk_Node
  * Method:    processWirePacket
- * Signature: (JJJLjava/net/InetSocketAddress;[B[J)Lcom/zerotier/sdk/ResultCode;
+ * Signature: (JJLjava/net/InetSocketAddress;I[B[J)Lcom/zerotier/sdk/ResultCode;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
-    JNIEnv *env, jobject obj,
+    JNIEnv *env, jobject obj, 
     jlong id,
-    jlong in_now,
-    jlong in_localSocket,
+    jlong in_now, 
+    jobject in_localAddress,
     jobject in_remoteAddress,
     jbyteArray in_packetData,
     jlongArray out_nextBackgroundTaskDeadline)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        LOGE("Couldn't find a valid node!");
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
 
-    unsigned int nbtd_len = (unsigned int)env->GetArrayLength(out_nextBackgroundTaskDeadline);
+    unsigned int nbtd_len = env->GetArrayLength(out_nextBackgroundTaskDeadline);
     if(nbtd_len < 1)
     {
         LOGE("nbtd_len < 1");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
     }
 
-    int64_t now = (int64_t)in_now;
+    uint64_t now = (uint64_t)in_now;
 
-    sockaddr_storage remoteAddress = fromSocketAddressObject(env, in_remoteAddress);
-    if (env->ExceptionCheck() || isSocketAddressEmpty(remoteAddress)) {
-        return NULL;
+    // get the java.net.InetSocketAddress class and getAddress() method
+    jclass inetAddressClass = lookup.findClass("java/net/InetAddress");
+    if(inetAddressClass == NULL)
+    {
+        LOGE("Can't find InetAddress class");
+        // can't find java.net.InetAddress
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
     }
 
-    unsigned int packetLength = (unsigned int)env->GetArrayLength(in_packetData);
+    jmethodID getAddressMethod = lookup.findMethod(
+        inetAddressClass, "getAddress", "()[B");
+    if(getAddressMethod == NULL)
+    {
+        // cant find InetAddress.getAddres()
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
+
+    jclass InetSocketAddressClass = lookup.findClass("java/net/InetSocketAddress");
+    if(InetSocketAddressClass == NULL)
+    {
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
+
+    jmethodID inetSockGetAddressMethod = lookup.findMethod(
+        InetSocketAddressClass, "getAddress", "()Ljava/net/InetAddress;");
+
+    jobject localAddrObj = NULL;
+    if(in_localAddress != NULL)
+    {
+        localAddrObj = env->CallObjectMethod(in_localAddress, inetSockGetAddressMethod);
+    }
+
+    jobject remoteAddrObject = env->CallObjectMethod(in_remoteAddress, inetSockGetAddressMethod);
+
+    if(remoteAddrObject == NULL)
+    {
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
+
+    jmethodID inetSock_getPort = lookup.findMethod(
+        InetSocketAddressClass, "getPort", "()I");
+
+    if(env->ExceptionCheck() || inetSock_getPort == NULL) 
+    {
+        LOGE("Couldn't find getPort method on InetSocketAddress");
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
+
+    // call InetSocketAddress.getPort()
+    int remotePort = env->CallIntMethod(in_remoteAddress, inetSock_getPort);
+    if(env->ExceptionCheck())
+    {
+        LOGE("Exception calling InetSocketAddress.getPort()");
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
+
+    // Call InetAddress.getAddress()
+    jbyteArray remoteAddressArray = (jbyteArray)env->CallObjectMethod(remoteAddrObject, getAddressMethod);
+    if(remoteAddressArray == NULL)
+    {
+        LOGE("Unable to call getAddress()");
+        // unable to call getAddress()
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
+
+    unsigned int addrSize = env->GetArrayLength(remoteAddressArray);
+    
+
+    sockaddr_storage localAddress = {};
+    
+    if(localAddrObj == NULL)
+    {
+        localAddress = ZT_SOCKADDR_NULL;
+    }
+    else
+    {
+        int localPort = env->CallIntMethod(in_localAddress, inetSock_getPort);
+        jbyteArray localAddressArray = (jbyteArray)env->CallObjectMethod(localAddrObj, getAddressMethod);
+        if(localAddressArray != NULL)
+        {
+
+            unsigned int localAddrSize = env->GetArrayLength(localAddressArray);
+            jbyte *addr = (jbyte*)env->GetPrimitiveArrayCritical(localAddressArray, NULL);
+
+            if(localAddrSize == 16)
+            {
+                sockaddr_in6 ipv6 = {};
+                ipv6.sin6_family = AF_INET6;
+                ipv6.sin6_port = htons(localPort);
+                memcpy(ipv6.sin6_addr.s6_addr, addr, 16);
+                memcpy(&localAddress, &ipv6, sizeof(sockaddr_in6));
+            }
+            else if(localAddrSize)
+            {
+                // IPV4 address
+                sockaddr_in ipv4 = {};
+                ipv4.sin_family = AF_INET;
+                ipv4.sin_port = htons(localPort);
+                memcpy(&ipv4.sin_addr, addr, 4);
+                memcpy(&localAddress, &ipv4, sizeof(sockaddr_in));
+            }
+            else
+            {
+                localAddress = ZT_SOCKADDR_NULL;
+            }
+            env->ReleasePrimitiveArrayCritical(localAddressArray, addr, 0);
+        }
+    }
+
+    // get the address bytes
+    jbyte *addr = (jbyte*)env->GetPrimitiveArrayCritical(remoteAddressArray, NULL);
+    sockaddr_storage remoteAddress = {};
+
+    if(addrSize == 16)
+    {
+        // IPV6 address
+        sockaddr_in6 ipv6 = {};
+        ipv6.sin6_family = AF_INET6;
+        ipv6.sin6_port = htons(remotePort);
+        memcpy(ipv6.sin6_addr.s6_addr, addr, 16);
+        memcpy(&remoteAddress, &ipv6, sizeof(sockaddr_in6));
+    }
+    else if(addrSize == 4)
+    {
+        // IPV4 address
+        sockaddr_in ipv4 = {};
+        ipv4.sin_family = AF_INET;
+        ipv4.sin_port = htons(remotePort);
+        memcpy(&ipv4.sin_addr, addr, 4);
+        memcpy(&remoteAddress, &ipv4, sizeof(sockaddr_in));
+    }
+    else
+    {
+        LOGE("Unknown IP version");
+        // unknown address type
+        env->ReleasePrimitiveArrayCritical(remoteAddressArray, addr, 0);
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
+    env->ReleasePrimitiveArrayCritical(remoteAddressArray, addr, 0);
+
+    unsigned int packetLength = env->GetArrayLength(in_packetData);
     if(packetLength == 0)
     {
         LOGE("Empty packet?!?");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
     }
     void *packetData = env->GetPrimitiveArrayCritical(in_packetData, NULL);
-    //
-    // need local copy of packetData because arbitrary code may run in ZT_Node_processWirePacket and no other JNI work may happen between GetPrimitiveArrayCritical / ReleasePrimitiveArrayCritical
-    //
     void *localData = malloc(packetLength);
     memcpy(localData, packetData, packetLength);
     env->ReleasePrimitiveArrayCritical(in_packetData, packetData, 0);
 
-    int64_t nextBackgroundTaskDeadline = 0;
+    uint64_t nextBackgroundTaskDeadline = 0;
 
     ZT_ResultCode rc = ZT_Node_processWirePacket(
         node,
-        NULL,
         now,
-        in_localSocket,
+        &localAddress,
         &remoteAddress,
         localData,
         packetLength,
         &nextBackgroundTaskDeadline);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_processWirePacket");
-        free(localData);
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
-    if(rc != ZT_RESULT_OK)
+    if(rc != ZT_RESULT_OK) 
     {
         LOGE("ZT_Node_processWirePacket returned: %d", rc);
     }
@@ -1118,31 +949,29 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
  * Signature: (JJ[J)Lcom/zerotier/sdk/ResultCode;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processBackgroundTasks(
-    JNIEnv *env, jobject obj,
+    JNIEnv *env, jobject obj, 
     jlong id,
     jlong in_now,
     jlongArray out_nextBackgroundTaskDeadline)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
 
     unsigned int nbtd_len = env->GetArrayLength(out_nextBackgroundTaskDeadline);
     if(nbtd_len < 1)
     {
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
     }
 
-    int64_t now = (int64_t)in_now;
-    int64_t nextBackgroundTaskDeadline = 0;
+    uint64_t now = (uint64_t)in_now;
+    uint64_t nextBackgroundTaskDeadline = 0;
 
-    ZT_ResultCode rc = ZT_Node_processBackgroundTasks(node, NULL, now, &nextBackgroundTaskDeadline);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_processBackgroundTasks");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
-    if (rc != ZT_RESULT_OK) {
-        LOGE("ZT_Node_processBackgroundTasks returned: %d", rc);
-    }
+    ZT_ResultCode rc = ZT_Node_processBackgroundTasks(node, now, &nextBackgroundTaskDeadline);
 
     jlong *outDeadline = (jlong*)env->GetPrimitiveArrayCritical(out_nextBackgroundTaskDeadline, NULL);
     outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
@@ -1159,15 +988,17 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processBackgroundTasks(
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_join(
     JNIEnv *env, jobject obj, jlong id, jlong in_nwid)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
+
     uint64_t nwid = (uint64_t)in_nwid;
 
-    ZT_ResultCode rc = ZT_Node_join(node, nwid, NULL, NULL);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_join");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
+    ZT_ResultCode rc = ZT_Node_join(node, nwid, NULL);
 
     return createResultObject(env, rc);
 }
@@ -1180,17 +1011,18 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_join(
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_leave(
     JNIEnv *env, jobject obj, jlong id, jlong in_nwid)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
 
     uint64_t nwid = (uint64_t)in_nwid;
 
-    ZT_ResultCode rc = ZT_Node_leave(node, nwid, NULL, NULL);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_leave");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
-
+    ZT_ResultCode rc = ZT_Node_leave(node, nwid, NULL);
+    
     return createResultObject(env, rc);
 }
 
@@ -1200,25 +1032,26 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_leave(
  * Signature: (JJJJ)Lcom/zerotier/sdk/ResultCode;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_multicastSubscribe(
-    JNIEnv *env, jobject obj,
-    jlong id,
+    JNIEnv *env, jobject obj, 
+    jlong id, 
     jlong in_nwid,
     jlong in_multicastGroup,
     jlong in_multicastAdi)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
 
     uint64_t nwid = (uint64_t)in_nwid;
     uint64_t multicastGroup = (uint64_t)in_multicastGroup;
     unsigned long multicastAdi = (unsigned long)in_multicastAdi;
 
     ZT_ResultCode rc = ZT_Node_multicastSubscribe(
-        node, NULL, nwid, multicastGroup, multicastAdi);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_multicastSubscribe");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
+        node, nwid, multicastGroup, multicastAdi);
 
     return createResultObject(env, rc);
 }
@@ -1229,14 +1062,19 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_multicastSubscribe(
  * Signature: (JJJJ)Lcom/zerotier/sdk/ResultCode;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_multicastUnsubscribe(
-    JNIEnv *env, jobject obj,
-    jlong id,
+    JNIEnv *env, jobject obj, 
+    jlong id, 
     jlong in_nwid,
     jlong in_multicastGroup,
     jlong in_multicastAdi)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL);
+    }
 
     uint64_t nwid = (uint64_t)in_nwid;
     uint64_t multicastGroup = (uint64_t)in_multicastGroup;
@@ -1244,60 +1082,6 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_multicastUnsubscribe(
 
     ZT_ResultCode rc = ZT_Node_multicastUnsubscribe(
         node, nwid, multicastGroup, multicastAdi);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_multicastUnsubscribe");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
-
-    return createResultObject(env, rc);
-}
-
-/*
- * Class:   com_zerotier_sdk_Node
- * Method:  orbit
- * Signature: (JJJ)Lcom/zerotier/sdk/ResultCode;
- */
-JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_orbit(
-    JNIEnv *env, jobject obj,
-    jlong id,
-    jlong in_moonWorldId,
-    jlong in_moonSeed)
-{
-    int64_t nodeId = (int64_t)id;
-    ZT_Node *node = findNode(nodeId);
-
-    uint64_t moonWorldId = (uint64_t)in_moonWorldId;
-    uint64_t moonSeed = (uint64_t)in_moonSeed;
-
-    ZT_ResultCode rc = ZT_Node_orbit(node, NULL, moonWorldId, moonSeed);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_orbit");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
-
-    return createResultObject(env, rc);
-}
-
-/*
- * Class:   com_zerotier_sdk_Node
- * Method:  deorbit
- * Signature: (JJ)L/com/zerotier/sdk/ResultCode;
- */
-JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_deorbit(
-    JNIEnv *env, jobject obj,
-    jlong id,
-    jlong in_moonWorldId)
-{
-    int64_t nodeId = (int64_t)id;
-    ZT_Node *node = findNode(nodeId);
-
-    uint64_t moonWorldId = (uint64_t)in_moonWorldId;
-
-    ZT_ResultCode rc = ZT_Node_deorbit(node, NULL, moonWorldId);
-    if (env->ExceptionCheck()) {
-        LOGE("Exception calling ZT_Node_deorbit");
-        return ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
-    }
 
     return createResultObject(env, rc);
 }
@@ -1310,8 +1094,13 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_deorbit(
 JNIEXPORT jlong JNICALL Java_com_zerotier_sdk_Node_address(
     JNIEnv *env , jobject obj, jlong id)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return 0;
+    }
 
     uint64_t address = ZT_Node_address(node);
     return (jlong)address;
@@ -1325,32 +1114,108 @@ JNIEXPORT jlong JNICALL Java_com_zerotier_sdk_Node_address(
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_status
    (JNIEnv *env, jobject obj, jlong id)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return 0;
+    }
+
+    jclass nodeStatusClass = NULL;
+    jmethodID nodeStatusConstructor = NULL;
+
+    // create a com.zerotier.sdk.NodeStatus object
+    nodeStatusClass = lookup.findClass("com/zerotier/sdk/NodeStatus");
+    if(nodeStatusClass == NULL)
+    {
+        return NULL;
+    }
+    
+    nodeStatusConstructor = lookup.findMethod(
+        nodeStatusClass, "<init>", "()V");
+    if(nodeStatusConstructor == NULL)
+    {
+        return NULL;
+    }
+
+    jobject nodeStatusObj = env->NewObject(nodeStatusClass, nodeStatusConstructor);
+    if(nodeStatusObj == NULL)
+    {
+        return NULL;
+    }
 
     ZT_NodeStatus nodeStatus;
     ZT_Node_status(node, &nodeStatus);
 
-    return newNodeStatus(env, nodeStatus);
+    jfieldID addressField = NULL;
+    jfieldID publicIdentityField = NULL;
+    jfieldID secretIdentityField = NULL;
+    jfieldID onlineField = NULL;
+
+    addressField = lookup.findField(nodeStatusClass, "address", "J");
+    if(addressField == NULL)
+    {
+        return NULL;
+    }
+
+    publicIdentityField = lookup.findField(nodeStatusClass, "publicIdentity", "Ljava/lang/String;");
+    if(publicIdentityField == NULL)
+    {
+        return NULL;
+    }
+
+    secretIdentityField = lookup.findField(nodeStatusClass, "secretIdentity", "Ljava/lang/String;");
+    if(secretIdentityField == NULL)
+    {
+        return NULL;
+    }
+
+    onlineField = lookup.findField(nodeStatusClass, "online", "Z");
+    if(onlineField == NULL)
+    {
+        return NULL;
+    }
+
+    env->SetLongField(nodeStatusObj, addressField, nodeStatus.address);
+
+    jstring pubIdentStr = env->NewStringUTF(nodeStatus.publicIdentity);
+    if(pubIdentStr == NULL)
+    {
+        return NULL; // out of memory
+    }
+    env->SetObjectField(nodeStatusObj, publicIdentityField, pubIdentStr);
+
+    jstring secIdentStr = env->NewStringUTF(nodeStatus.secretIdentity);
+    if(secIdentStr == NULL)
+    {
+        return NULL; // out of memory
+    }
+    env->SetObjectField(nodeStatusObj, secretIdentityField, secIdentStr);
+
+    env->SetBooleanField(nodeStatusObj, onlineField, nodeStatus.online);
+
+    return nodeStatusObj;
 }
 
 /*
  * Class:     com_zerotier_sdk_Node
  * Method:    networkConfig
- * Signature: (JJ)Lcom/zerotier/sdk/VirtualNetworkConfig;
+ * Signature: (J)Lcom/zerotier/sdk/VirtualNetworkConfig;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_networkConfig(
     JNIEnv *env, jobject obj, jlong id, jlong nwid)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
-
-    ZT_VirtualNetworkConfig *vnetConfig = ZT_Node_networkConfig(node, nwid);
-    if (vnetConfig == NULL) {
-        LOGE("vnetConfig == NULL");
-        return NULL;
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return 0;
     }
 
+    ZT_VirtualNetworkConfig *vnetConfig = ZT_Node_networkConfig(node, nwid);
+    
     jobject vnetConfigObject = newNetworkConfig(env, *vnetConfig);
 
     ZT_Node_freeQueryResult(node, vnetConfig);
@@ -1361,7 +1226,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_networkConfig(
 /*
  * Class:     com_zerotier_sdk_Node
  * Method:    version
- * Signature: ()Lcom/zerotier/sdk/Version;
+ * Signature: (J)Lcom/zerotier/sdk/Version;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_version(
     JNIEnv *env, jobject obj)
@@ -1369,10 +1234,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_version(
     int major = 0;
     int minor = 0;
     int revision = 0;
+    unsigned long featureFlags = 0;
 
-    ZT_version(&major, &minor, &revision);
+    ZT_version(&major, &minor, &revision, &featureFlags);
 
-    return newVersion(env, major, minor, revision);
+    return newVersion(env, major, minor, revision, featureFlags);
 }
 
 /*
@@ -1383,18 +1249,60 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_version(
 JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_peers(
     JNIEnv *env, jobject obj, jlong id)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return 0;
+    }
 
     ZT_PeerList *peerList = ZT_Node_peers(node);
-
+    
     if(peerList == NULL)
     {
         LOGE("ZT_Node_peers returned NULL");
         return NULL;
     }
 
-    jobjectArray peerArrayObj = newPeerArray(env, peerList->peers, peerList->peerCount);
+    int peerCount = peerList->peerCount * 100;
+    LOGV("Ensure Local Capacity: %d", peerCount);
+    if(env->EnsureLocalCapacity(peerCount))
+    {
+        LOGE("EnsureLocalCapacity failed!!");
+        ZT_Node_freeQueryResult(node, peerList);
+        return NULL;
+    }
+
+    jclass peerClass = lookup.findClass("com/zerotier/sdk/Peer");
+    if(env->ExceptionCheck() || peerClass == NULL)
+    {
+        LOGE("Error finding Peer class");
+        ZT_Node_freeQueryResult(node, peerList);
+        return NULL;
+    }
+
+    jobjectArray peerArrayObj = env->NewObjectArray(
+        peerList->peerCount, peerClass, NULL);
+
+    if(env->ExceptionCheck() || peerArrayObj == NULL)
+    {
+        LOGE("Error creating Peer[] array");
+        ZT_Node_freeQueryResult(node, peerList);
+        return NULL;
+    }
+
+
+    for(unsigned int i = 0; i < peerList->peerCount; ++i)
+    {
+        jobject peerObj = newPeer(env, peerList->peers[i]);
+        env->SetObjectArrayElement(peerArrayObj, i, peerObj);
+        if(env->ExceptionCheck()) 
+        {
+            LOGE("Error assigning Peer object to array");
+            break;
+        }
+    }
 
     ZT_Node_freeQueryResult(node, peerList);
     peerList = NULL;
@@ -1404,23 +1312,53 @@ JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_peers(
 
 /*
  * Class:     com_zerotier_sdk_Node
- * Method:    networkConfigs
+ * Method:    networks
  * Signature: (J)[Lcom/zerotier/sdk/VirtualNetworkConfig;
  */
-JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networkConfigs(
+JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networks(
     JNIEnv *env, jobject obj, jlong id)
 {
-    int64_t nodeId = (int64_t) id;
+    uint64_t nodeId = (uint64_t) id;
     ZT_Node *node = findNode(nodeId);
+    if(node == NULL)
+    {
+        // cannot find valid node.  We should  never get here.
+        return 0;
+    }
 
     ZT_VirtualNetworkList *networkList = ZT_Node_networks(node);
     if(networkList == NULL)
     {
-        LOGE("ZT_Node_networks returned NULL");
         return NULL;
     }
 
-    jobjectArray networkListObject = newVirtualNetworkConfigArray(env, networkList->networks, networkList->networkCount);
+    jclass vnetConfigClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkConfig");
+    if(env->ExceptionCheck() || vnetConfigClass == NULL)
+    {
+        LOGE("Error finding VirtualNetworkConfig class");
+        ZT_Node_freeQueryResult(node, networkList);
+        return NULL;
+    }
+
+    jobjectArray networkListObject = env->NewObjectArray(
+        networkList->networkCount, vnetConfigClass, NULL);
+    if(env->ExceptionCheck() || networkListObject == NULL)
+    {
+        LOGE("Error creating VirtualNetworkConfig[] array");
+        ZT_Node_freeQueryResult(node, networkList);
+        return NULL;
+    }
+
+    for(unsigned int i = 0; i < networkList->networkCount; ++i)
+    {
+        jobject networkObject = newNetworkConfig(env, networkList->networks[i]);
+        env->SetObjectArrayElement(networkListObject, i, networkObject);
+        if(env->ExceptionCheck())
+        {
+            LOGE("Error assigning VirtualNetworkConfig object to array");
+            break;
+        }
+    }
 
     ZT_Node_freeQueryResult(node, networkList);
 
@@ -1429,4 +1367,4 @@ JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networkConfigs(
 
 #ifdef __cplusplus
 } // extern "C"
-#endif
+#endif
\ No newline at end of file
diff --git a/java/jni/com_zerotierone_sdk_Node.h b/java/jni/com_zerotierone_sdk_Node.h
index a439f4129..7c1011abd 100644
--- a/java/jni/com_zerotierone_sdk_Node.h
+++ b/java/jni/com_zerotierone_sdk_Node.h
@@ -10,17 +10,9 @@ extern "C" {
 /*
  * Class:     com_zerotier_sdk_Node
  * Method:    node_init
- * Signature: (JLcom/zerotier/sdk/DataStoreGetListener;Lcom/zerotier/sdk/DataStorePutListener;Lcom/zerotier/sdk/PacketSender;Lcom/zerotier/sdk/EventListener;Lcom/zerotier/sdk/VirtualNetworkFrameListener;Lcom/zerotier/sdk/VirtualNetworkConfigListener;Lcom/zerotier/sdk/PathChecker;)Lcom/zerotier/sdk/ResultCode;
+ * Signature: (J)Lcom/zerotier/sdk/ResultCode;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init
-  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject, jobject, jobject, jobject);
-
-/*
- * Class:     com_zerotier_sdk_Node
- * Method:    node_isInited
- * Signature: (J)Z;
- */
-JNIEXPORT jboolean JNICALL Java_com_zerotier_sdk_Node_node_1isInited
   (JNIEnv *, jobject, jlong);
 
 /*
@@ -42,10 +34,10 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame
 /*
  * Class:     com_zerotier_sdk_Node
  * Method:    processWirePacket
- * Signature: (JJJLjava/net/InetSockAddress;[B[J)Lcom/zerotier/sdk/ResultCode;
+ * Signature: (JJLjava/net/InetSockAddress;Ljava/net/InetSockAddress;[B[J)Lcom/zerotier/sdk/ResultCode;
  */
 JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket
-  (JNIEnv *, jobject, jlong, jlong, jlong, jobject, jbyteArray, jlongArray);
+  (JNIEnv *, jobject, jlong, jlong, jobject, jobject, jbyteArray, jlongArray);
 
 /*
  * Class:     com_zerotier_sdk_Node
@@ -129,10 +121,10 @@ JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_peers
 
 /*
  * Class:     com_zerotier_sdk_Node
- * Method:    networkConfigs
+ * Method:    networks
  * Signature: (J)[Lcom/zerotier/sdk/VirtualNetworkConfig;
  */
-JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networkConfigs
+JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networks
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
diff --git a/java/src/com/zerotier/sdk/DataStoreGetListener.java b/java/src/com/zerotier/sdk/DataStoreGetListener.java
index 105b14c55..b525be63d 100644
--- a/java/src/com/zerotier/sdk/DataStoreGetListener.java
+++ b/java/src/com/zerotier/sdk/DataStoreGetListener.java
@@ -24,7 +24,6 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-
 package com.zerotier.sdk;
 
 public interface DataStoreGetListener {
@@ -47,9 +46,13 @@ public interface DataStoreGetListener {
      *
      * @param name Name of the object in the data store
      * @param out_buffer buffer to put the object in
-     * @return size of the object
+     * @param bufferIndex index in the object to start reading
+     * @param out_objectSize long[1] to be set to the actual size of the object if it exists.
+     * @return the actual number of bytes read.
      */
-    long onDataStoreGet(
+    public long onDataStoreGet(
             String name,
-            byte[] out_buffer);
+            byte[] out_buffer,
+            long bufferIndex,
+            long[] out_objectSize);
 }
diff --git a/java/src/com/zerotier/sdk/DataStorePutListener.java b/java/src/com/zerotier/sdk/DataStorePutListener.java
index 0fa8e19c1..77e55027e 100644
--- a/java/src/com/zerotier/sdk/DataStorePutListener.java
+++ b/java/src/com/zerotier/sdk/DataStorePutListener.java
@@ -24,7 +24,6 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-
 package com.zerotier.sdk;
 
 public interface DataStorePutListener {
@@ -44,7 +43,7 @@ public interface DataStorePutListener {
      * @param secure set to user read/write only.
      * @return 0 on success.
      */
-    int onDataStorePut(
+    public int onDataStorePut(
         String name,
         byte[] buffer,
         boolean secure);
@@ -55,6 +54,6 @@ public interface DataStorePutListener {
      * @param name Object name
      * @return 0 on success.
      */
-    int onDelete(
+    public int onDelete(
         String name);
 }
diff --git a/java/src/com/zerotier/sdk/Event.java b/java/src/com/zerotier/sdk/Event.java
index c55da2cc0..22d350e1e 100644
--- a/java/src/com/zerotier/sdk/Event.java
+++ b/java/src/com/zerotier/sdk/Event.java
@@ -27,32 +27,26 @@
 
 package com.zerotier.sdk;
 
-/**
- * Status codes sent to status update callback when things happen
- * <p>
- * Defined in ZeroTierOne.h as ZT_Event
- */
 public enum Event {
-
     /**
      * Node has been initialized
-     * <p>
+     *
      * This is the first event generated, and is always sent. It may occur
      * before Node's constructor returns.
      */
-    EVENT_UP(0),
+	EVENT_UP,
 
     /**
      * Node is offline -- network does not seem to be reachable by any available strategy
      */
-    EVENT_OFFLINE(1),
+	EVENT_OFFLINE,
 
     /**
      * Node is online -- at least one upstream node appears reachable
-     * <p>
+     *
      * Meta-data: none
      */
-    EVENT_ONLINE(2),
+    EVENT_ONLINE,
 
     /**
      * Node is shutting down
@@ -61,7 +55,7 @@ public enum Event {
      * It's done for convenience, since cleaning up other state in the event
      * handler may appear more idiomatic.</p>
      */
-    EVENT_DOWN(3),
+	EVENT_DOWN,
 
     /**
      * Your identity has collided with another node's ZeroTier address
@@ -91,7 +85,7 @@ public enum Event {
      * condition is a good way to make sure it never arises. It's like how
      * umbrellas prevent rain and smoke detectors prevent fires. They do, right?</p>
      */
-    EVENT_FATAL_ERROR_IDENTITY_COLLISION(4),
+	EVENT_FATAL_ERROR_IDENTITY_COLLISION,
 
     /**
      * Trace (debugging) message
@@ -100,55 +94,5 @@ public enum Event {
      *
      * <p>Meta-data: {@link String}, TRACE message</p>
      */
-    EVENT_TRACE(5),
-
-    /**
-     * VERB_USER_MESSAGE received
-     * <p>
-     * These are generated when a VERB_USER_MESSAGE packet is received via
-     * ZeroTier VL1.
-     */
-    EVENT_USER_MESSAGE(6),
-
-    /**
-     * Remote trace received
-     * <p>
-     * These are generated when a VERB_REMOTE_TRACE is received. Note
-     * that any node can fling one of these at us. It is your responsibility
-     * to filter and determine if it's worth paying attention to. If it's
-     * not just drop it. Most nodes that are not active controllers ignore
-     * these, and controllers only save them if they pertain to networks
-     * with remote tracing enabled.
-     */
-    EVENT_REMOTE_TRACE(7);
-
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private final int id;
-
-    Event(int id) {
-        this.id = id;
-    }
-
-    public static Event fromInt(int id) {
-        switch (id) {
-            case 0:
-                return EVENT_UP;
-            case 1:
-                return EVENT_OFFLINE;
-            case 2:
-                return EVENT_ONLINE;
-            case 3:
-                return EVENT_DOWN;
-            case 4:
-                return EVENT_FATAL_ERROR_IDENTITY_COLLISION;
-            case 5:
-                return EVENT_TRACE;
-            case 6:
-                return EVENT_USER_MESSAGE;
-            case 7:
-                return EVENT_REMOTE_TRACE;
-            default:
-                throw new RuntimeException("Unhandled value: " + id);
-        }
-    }
-}
+	EVENT_TRACE
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/EventListener.java b/java/src/com/zerotier/sdk/EventListener.java
index 88fb8afc3..91050aaa9 100644
--- a/java/src/com/zerotier/sdk/EventListener.java
+++ b/java/src/com/zerotier/sdk/EventListener.java
@@ -27,17 +27,19 @@
 
 package com.zerotier.sdk;
 
+import java.net.InetSocketAddress;
+import java.lang.String;
+
 /**
  * Interface to handle callbacks for ZeroTier One events.
  */
 public interface EventListener {
-
     /**
      * Callback for events with no other associated metadata
      * 
      * @param event {@link Event} enum
      */
-    void onEvent(Event event);
+    public void onEvent(Event event);
     
     /**
      * Trace messages
@@ -46,5 +48,5 @@ public interface EventListener {
      *
      * @param message the trace message
      */
-    void onTrace(String message);
+    public void onTrace(String message);
 }
diff --git a/java/src/com/zerotier/sdk/MulticastGroup.java b/java/src/com/zerotier/sdk/MulticastGroup.java
new file mode 100644
index 000000000..68114424f
--- /dev/null
+++ b/java/src/com/zerotier/sdk/MulticastGroup.java
@@ -0,0 +1,53 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+package com.zerotier.sdk;
+
+
+public final class MulticastGroup {
+    private MulticastGroup() {}
+
+    private long mac;
+    private long adi;
+
+    public boolean equals(MulticastGroup other) {
+        return mac == other.mac && adi == other.adi;
+    }
+
+    /**
+     * MAC address (least significant 48 bits)
+     */
+    public final long getMacAddress() {
+        return mac;
+    }
+
+    /**
+     * Additional distinguishing information (usually zero)
+     */
+    public final long getAdi() {
+        return adi;
+    }
+}
diff --git a/java/src/com/zerotier/sdk/NativeUtils.java b/java/src/com/zerotier/sdk/NativeUtils.java
new file mode 100644
index 000000000..07e1ef5bc
--- /dev/null
+++ b/java/src/com/zerotier/sdk/NativeUtils.java
@@ -0,0 +1,93 @@
+package com.zerotier.sdk;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+ 
+/**
+ * Simple library class for working with JNI (Java Native Interface)
+ * 
+ * @see http://adamheinrich.com/2012/how-to-load-native-jni-library-from-jar
+ *
+ * @author Adam Heirnich <adam@adamh.cz>, http://www.adamh.cz
+ */
+public class NativeUtils {
+ 
+    /**
+     * Private constructor - this class will never be instanced
+     */
+    private NativeUtils() {
+    }
+ 
+    /**
+     * Loads library from current JAR archive
+     * 
+     * The file from JAR is copied into system temporary directory and then loaded. The temporary file is deleted after exiting.
+     * Method uses String as filename because the pathname is "abstract", not system-dependent.
+     * 
+     * @param filename The filename inside JAR as absolute path (beginning with '/'), e.g. /package/File.ext
+     * @throws IOException If temporary file creation or read/write operation fails
+     * @throws IllegalArgumentException If source file (param path) does not exist
+     * @throws IllegalArgumentException If the path is not absolute or if the filename is shorter than three characters (restriction of {@see File#createTempFile(java.lang.String, java.lang.String)}).
+     */
+    public static void loadLibraryFromJar(String path) throws IOException {
+ 
+        if (!path.startsWith("/")) {
+            throw new IllegalArgumentException("The path has to be absolute (start with '/').");
+        }
+ 
+        // Obtain filename from path
+        String[] parts = path.split("/");
+        String filename = (parts.length > 1) ? parts[parts.length - 1] : null;
+ 
+        // Split filename to prexif and suffix (extension)
+        String prefix = "";
+        String suffix = null;
+        if (filename != null) {
+            parts = filename.split("\\.", 2);
+            prefix = parts[0];
+            suffix = (parts.length > 1) ? "."+parts[parts.length - 1] : null; // Thanks, davs! :-)
+        }
+ 
+        // Check if the filename is okay
+        if (filename == null || prefix.length() < 3) {
+            throw new IllegalArgumentException("The filename has to be at least 3 characters long.");
+        }
+ 
+        // Prepare temporary file
+        File temp = File.createTempFile(prefix, suffix);
+        temp.deleteOnExit();
+ 
+        if (!temp.exists()) {
+            throw new FileNotFoundException("File " + temp.getAbsolutePath() + " does not exist.");
+        }
+ 
+        // Prepare buffer for data copying
+        byte[] buffer = new byte[1024];
+        int readBytes;
+ 
+        // Open and check input stream
+        InputStream is = NativeUtils.class.getResourceAsStream(path);
+        if (is == null) {
+            throw new FileNotFoundException("File " + path + " was not found inside JAR.");
+        }
+ 
+        // Open output stream and copy data between source file in JAR and the temporary file
+        OutputStream os = new FileOutputStream(temp);
+        try {
+            while ((readBytes = is.read(buffer)) != -1) {
+                os.write(buffer, 0, readBytes);
+            }
+        } finally {
+            // If read/write fails, close streams safely before throwing an exception
+            os.close();
+            is.close();
+        }
+ 
+        // Finally, load the library
+        System.load(temp.getAbsolutePath());
+    }
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/Node.java b/java/src/com/zerotier/sdk/Node.java
index 280b5cd50..4bc6e1846 100644
--- a/java/src/com/zerotier/sdk/Node.java
+++ b/java/src/com/zerotier/sdk/Node.java
@@ -28,68 +28,91 @@
 package com.zerotier.sdk;
 
 import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.io.IOException;
 
 /**
  * A ZeroTier One node
  */
 public class Node {
-    static {
-        System.loadLibrary("ZeroTierOneJNI");
-    }
+	static {
+        try {
+    		System.loadLibrary("ZeroTierOneJNI");
+        } catch (UnsatisfiedLinkError e) {
+            try { 
+                if(System.getProperty("os.name").startsWith("Windows")) {
+                    System.out.println("Arch: " + System.getProperty("sun.arch.data.model"));
+                    if(System.getProperty("sun.arch.data.model").equals("64")) {
+                        NativeUtils.loadLibraryFromJar("/lib/ZeroTierOneJNI_win64.dll");
+                    } else {
+                        NativeUtils.loadLibraryFromJar("/lib/ZeroTierOneJNI_win32.dll");
+                    }
+                } else if(System.getProperty("os.name").startsWith("Mac")) {
+                    NativeUtils.loadLibraryFromJar("/lib/libZeroTierOneJNI.jnilib");
+                } else {
+                    // TODO: Linux
+                }
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+            }
+        }
+	}
 
     private static final String TAG = "NODE";
 
     /**
      * Node ID for JNI purposes.
      * Currently set to the now value passed in at the constructor
+     * 
+     * -1 if the node has already been closed
      */
-    private final long nodeId;
+    private long nodeId;
+
+    private final DataStoreGetListener getListener;
+    private final DataStorePutListener putListener;
+    private final PacketSender sender;
+    private final EventListener eventListener;
+    private final VirtualNetworkFrameListener frameListener;
+    private final VirtualNetworkConfigListener configListener;
     
     /**
      * Create a new ZeroTier One node
      *
-     * @param now Current clock in milliseconds
-     */
-    public Node(long now) {
-        this.nodeId = now;
-    }
-
-    /**
-     * Init a new ZeroTier One node
-     *
      * <p>Note that this can take a few seconds the first time it's called, as it
      * will generate an identity.</p>
      *
+     * @param now Current clock in milliseconds
      * @param getListener User written instance of the {@link DataStoreGetListener} interface called to get objects from persistent storage.  This instance must be unique per Node object.
-     * @param putListener User written instance of the {@link DataStorePutListener} interface called to put objects in persistent storage.  This instance must be unique per Node object.
-     * @param sender User written instance of the {@link PacketSender} interface to send ZeroTier packets out over the wire.
+     * @param putListener User written intstance of the {@link DataStorePutListener} interface called to put objects in persistent storage.  This instance must be unique per Node object.
+     * @param sender
      * @param eventListener User written instance of the {@link EventListener} interface to receive status updates and non-fatal error notices.  This instance must be unique per Node object.
-     * @param frameListener User written instance of the {@link VirtualNetworkFrameListener} interface to send a frame out to a virtual network port.
+     * @param frameListener 
      * @param configListener User written instance of the {@link VirtualNetworkConfigListener} interface to be called when virtual LANs are created, deleted, or their config parameters change.  This instance must be unique per Node object.
-     * @param pathChecker User written instance of the {@link PathChecker} interface. Not required and can be null.
      */
-    public ResultCode init(
-            DataStoreGetListener getListener,
-            DataStorePutListener putListener,
-            PacketSender sender,
-            EventListener eventListener,
-            VirtualNetworkFrameListener frameListener,
-            VirtualNetworkConfigListener configListener,
-            PathChecker pathChecker) {
-        return node_init(
-                nodeId,
-                getListener,
-                putListener,
-                sender,
-                eventListener,
-                frameListener,
-                configListener,
-                pathChecker);
-    }
+	public Node(long now,
+                DataStoreGetListener getListener,
+                DataStorePutListener putListener,
+                PacketSender sender,
+                EventListener eventListener,
+                VirtualNetworkFrameListener frameListener,
+                VirtualNetworkConfigListener configListener) throws NodeException
+	{
+        this.nodeId = now;
 
-    public boolean isInited() {
-        return node_isInited(nodeId);
-    }
+        this.getListener = getListener;
+        this.putListener = putListener;
+        this.sender = sender;
+        this.eventListener = eventListener;
+        this.frameListener = frameListener;
+        this.configListener = configListener;
+
+        ResultCode rc = node_init(now);
+        if(rc != ResultCode.RESULT_OK)
+        {
+            // TODO: Throw Exception
+            throw new NodeException(rc.toString());
+        }
+	}
 
     /**
       * Close this Node.
@@ -97,12 +120,15 @@ public class Node {
       * <p>The Node object can no longer be used once this method is called.</p>
       */
     public void close() {
-        node_delete(nodeId);
+        if(nodeId != -1) {
+            node_delete(nodeId);
+            nodeId = -1;
+        }
     }
 
     @Override
-    public String toString() {
-        return "Node(" + nodeId + ")";
+    protected void finalize() {
+        close();
     }
 
     /**
@@ -136,7 +162,6 @@ public class Node {
      * Process a packet received from the physical wire
      *
      * @param now Current clock in milliseconds
-     * @param localSocket Local socket or -1
      * @param remoteAddress Origin of packet
      * @param packetData Packet data
      * @param nextBackgroundTaskDeadline Value/result: set to deadline for next call to processBackgroundTasks()
@@ -144,12 +169,12 @@ public class Node {
      */
     public ResultCode processWirePacket(
         long now,
-        long localSocket,
+        InetSocketAddress localAddress,
         InetSocketAddress remoteAddress,
         byte[] packetData,
         long[] nextBackgroundTaskDeadline) {
         return processWirePacket(
-            nodeId, now, localSocket, remoteAddress, packetData,
+            nodeId, now, localAddress, remoteAddress, packetData, 
             nextBackgroundTaskDeadline);
     }
 
@@ -168,7 +193,7 @@ public class Node {
      * Join a network
      *
      * <p>This may generate calls to the port config callback before it returns,
-     * or these may be deferred if a netconf is not available yet.</p>
+     * or these may be deffered if a netconf is not available yet.</p>
      *
      * <p>If we are already a member of the network, nothing is done and OK is
      * returned.</p>
@@ -293,34 +318,6 @@ public class Node {
         return multicastUnsubscribe(nodeId, nwid, multicastGroup, multicastAdi);
     }
 
-    /**
-     * Add or update a moon
-     * <p>
-     * Moons are persisted in the data store in moons.d/, so this can persist
-     * across invocations if the contents of moon.d are scanned and orbit is
-     * called for each on startup.
-     *
-     * @param moonWorldId Moon's world ID
-     * @param moonSeed If non-zero, the ZeroTier address of any member of the moon to query for moon definition
-     * @return Error if moon was invalid or failed to be added
-     */
-    public ResultCode orbit(
-            long moonWorldId,
-            long moonSeed) {
-        return orbit(nodeId, moonWorldId, moonSeed);
-    }
-
-    /**
-     * Remove a moon (does nothing if not present)
-     *
-     * @param moonWorldId World ID of moon to remove
-     * @return Error if anything bad happened
-     */
-    public ResultCode deorbit(
-            long moonWorldId) {
-        return deorbit(nodeId, moonWorldId);
-    }
-
     /**
      * Get this node's 40-bit ZeroTier address
      *
@@ -363,8 +360,8 @@ public class Node {
      *
      * @return List of networks or NULL on failure
      */
-    public VirtualNetworkConfig[] networkConfigs() {
-        return networkConfigs(nodeId);
+    public VirtualNetworkConfig[] networks() {
+        return networks(nodeId);
     }
 
     /**
@@ -379,17 +376,7 @@ public class Node {
     //
     // function declarations for JNI
     //
-    private native ResultCode node_init(
-            long nodeId,
-            DataStoreGetListener dataStoreGetListener,
-            DataStorePutListener dataStorePutListener,
-            PacketSender packetSender,
-            EventListener eventListener,
-            VirtualNetworkFrameListener virtualNetworkFrameListener,
-            VirtualNetworkConfigListener virtualNetworkConfigListener,
-            PathChecker pathChecker);
-
-    private native boolean node_isInited(long nodeId);
+    private native ResultCode node_init(long now);
 
     private native void node_delete(long nodeId);
 
@@ -407,7 +394,7 @@ public class Node {
     private native ResultCode processWirePacket(
         long nodeId,
         long now,
-        long localSocket,
+        InetSocketAddress localAddress,
         InetSocketAddress remoteAddress,
         byte[] packetData,
         long[] nextBackgroundTaskDeadline);
@@ -433,15 +420,6 @@ public class Node {
         long multicastGroup,
         long multicastAdi);
 
-    private native ResultCode orbit(
-            long nodeId,
-            long moonWorldId,
-            long moonSeed);
-
-    private native ResultCode deorbit(
-            long nodeId,
-            long moonWorldId);
-
     private native long address(long nodeId);
 
     private native NodeStatus status(long nodeId);
@@ -452,5 +430,5 @@ public class Node {
 
     private native Peer[] peers(long nodeId);
 
-    private native VirtualNetworkConfig[] networkConfigs(long nodeId);
-}
+    private native VirtualNetworkConfig[] networks(long nodeId);
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/NodeException.java b/java/src/com/zerotier/sdk/NodeException.java
new file mode 100644
index 000000000..1fdef72f8
--- /dev/null
+++ b/java/src/com/zerotier/sdk/NodeException.java
@@ -0,0 +1,36 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+package com.zerotier.sdk;
+
+import java.lang.RuntimeException;
+
+public class NodeException extends RuntimeException {
+    public NodeException(String message) {
+        super(message);
+    }
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/NodeStatus.java b/java/src/com/zerotier/sdk/NodeStatus.java
index 04c3ee60c..94376d85b 100644
--- a/java/src/com/zerotier/sdk/NodeStatus.java
+++ b/java/src/com/zerotier/sdk/NodeStatus.java
@@ -27,64 +27,43 @@
 
 package com.zerotier.sdk;
 
-import com.zerotier.sdk.util.StringUtils;
+public final class NodeStatus {
+	private long address;
+	private String publicIdentity;
+	private String secretIdentity;
+	private boolean online;
 
-/**
- * Current node status
- * <p>
- * Defined in ZeroTierOne.h as ZT_NodeStatus
- */
-public class NodeStatus {
-
-    private final long address;
-
-    private final String publicIdentity;
-
-    private final String secretIdentity;
-
-    private final boolean online;
-
-    public NodeStatus(long address, String publicIdentity, String secretIdentity, boolean online) {
-        this.address = address;
-        this.publicIdentity = publicIdentity;
-        this.secretIdentity = secretIdentity;
-        this.online = online;
-    }
-
-    @Override
-    public String toString() {
-        return "NodeStatus(" + StringUtils.addressToString(address) + ", " + publicIdentity + ", " + secretIdentity + ", " + online + ")";
-    }
+	private NodeStatus() {}
 
 	/**
 	 * 40-bit ZeroTier address of this node
 	 */
-    public long getAddress() {
-        return address;
-    }
+	public final long getAddres() {
+		return address;
+	}
 
 	/**
 	 * Public identity in string-serialized form (safe to send to others)
 	 *
 	 * <p>This identity will remain valid as long as the node exists.</p>
 	 */
-    public String getPublicIdentity() {
-        return publicIdentity;
-    }
+	public final String getPublicIdentity() {
+		return publicIdentity;
+	}
 
 	/**
 	 * Full identity including secret key in string-serialized form
 	 *
 	 * <p>This identity will remain valid as long as the node exists.</p>
 	 */
-    public String getSecretIdentity() {
-        return secretIdentity;
-    }
+	public final String getSecretIdentity() {
+		return secretIdentity;
+	}
 
 	/**
 	 * True if some kind of connectivity appears available
 	 */
-    public boolean isOnline() {
-        return online;
-    }
-}
+	public final boolean isOnline() {
+		return online;
+	}
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/PacketSender.java b/java/src/com/zerotier/sdk/PacketSender.java
index 893824a08..22893ec73 100644
--- a/java/src/com/zerotier/sdk/PacketSender.java
+++ b/java/src/com/zerotier/sdk/PacketSender.java
@@ -24,14 +24,12 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-
 package com.zerotier.sdk;
 
 import java.net.InetSocketAddress;
 
 
 public interface PacketSender {
-
     /**
      * Function to send a ZeroTier packet out over the wire
      *
@@ -39,14 +37,13 @@ public interface PacketSender {
      * on failure. Note that success does not (of course) guarantee packet
      * delivery. It only means that the packet appears to have been sent.</p>
      *
-     * @param localSocket socket file descriptor to send from.  Set to -1 if not specified.
+     * @param localAddr {@link InetSocketAddress} to send from.  Set to null if not specified.
      * @param remoteAddr {@link InetSocketAddress} to send to
      * @param packetData data to send
-     * @param ttl TTL is ignored
      * @return 0 on success, any error code on failure.
      */
-    int onSendPacketRequested(
-            long localSocket,
+    public int onSendPacketRequested(
+            InetSocketAddress localAddr,
             InetSocketAddress remoteAddr,
             byte[] packetData,
             int ttl);
diff --git a/java/src/com/zerotier/sdk/PathChecker.java b/java/src/com/zerotier/sdk/PathChecker.java
deleted file mode 100644
index 66a297dc4..000000000
--- a/java/src/com/zerotier/sdk/PathChecker.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2017  ZeroTier, Inc.  https://www.zerotier.com/
- */
-
-package com.zerotier.sdk;
-
-import java.net.InetSocketAddress;
-
-public interface PathChecker {
-
-    /**
-     * Callback to check whether a path should be used for ZeroTier traffic
-     * <p>
-     * This function must return true if the path should be used.
-     * <p>
-     * If no path check function is specified, ZeroTier will still exclude paths
-     * that overlap with ZeroTier-assigned and managed IP address blocks. But the
-     * use of a path check function is recommended to ensure that recursion does
-     * not occur in cases where addresses are assigned by the OS or managed by
-     * an out of band mechanism like DHCP. The path check function should examine
-     * all configured ZeroTier interfaces and check to ensure that the supplied
-     * addresses will not result in ZeroTier traffic being sent over a ZeroTier
-     * interface (recursion).
-     * <p>
-     * Obviously this is not required in configurations where this can't happen,
-     * such as network containers or embedded.
-     *
-     * @param ztAddress ZeroTier address or 0 for none/any
-     * @param localSocket Local interface socket.  -1 if unspecified
-     * @param remoteAddress remote address
-     * @return true if the path should be used
-     */
-    boolean onPathCheck(long ztAddress, long localSocket, InetSocketAddress remoteAddress);
-
-    /**
-     * Function to get physical addresses for ZeroTier peers
-     * <p>
-     * If provided this function will be occasionally called to get physical
-     * addresses that might be tried to reach a ZeroTier address.
-     *
-     * @param ztAddress ZeroTier address (least significant 40 bits)
-     * @param ss_family desired address family or -1 for any
-     * @return address and port of ztAddress or null
-     */
-    InetSocketAddress onPathLookup(long ztAddress, int ss_family);
-}
diff --git a/java/src/com/zerotier/sdk/Peer.java b/java/src/com/zerotier/sdk/Peer.java
index de7d64e56..fb2d1065c 100644
--- a/java/src/com/zerotier/sdk/Peer.java
+++ b/java/src/com/zerotier/sdk/Peer.java
@@ -27,92 +27,84 @@
 
 package com.zerotier.sdk;
 
-import com.zerotier.sdk.util.StringUtils;
-
-import java.util.Arrays;
+import java.util.ArrayList;
 
 /**
- * Peer status result buffer
- * <p>
- * Defined in ZeroTierOne.h as ZT_Peer
+ * Peer status result
  */
-public class Peer {
+public final class Peer {
+    private long address;
+    private long lastUnicastFrame;
+    private long lastMulticastFrame;
+    private int versionMajor;
+    private int versionMinor;
+    private int versionRev;
+    private int latency;
+    private PeerRole role;
+    private PeerPhysicalPath[] paths;
 
-    private final long address;
-
-    private final int versionMajor;
-
-    private final int versionMinor;
-
-    private final int versionRev;
-
-    private final int latency;
-
-    private final PeerRole role;
-
-    private final PeerPhysicalPath[] paths;
-
-    public Peer(long address, int versionMajor, int versionMinor, int versionRev, int latency, PeerRole role, PeerPhysicalPath[] paths) {
-        this.address = address;
-        this.versionMajor = versionMajor;
-        this.versionMinor = versionMinor;
-        this.versionRev = versionRev;
-        this.latency = latency;
-        this.role = role;
-        this.paths = paths;
-    }
-
-    @Override
-    public String toString() {
-        return "Peer(" + StringUtils.addressToString(address) + ", " + versionMajor + ", " + versionMinor + ", " + versionRev + ", " + latency + ", " + role + ", " + Arrays.toString(paths) + ")";
-    }
+    private Peer() {}
 
     /**
      * ZeroTier address (40 bits)
      */
-    public long getAddress() {
+    public final long address() {
         return address;
     }
 
+    /**
+     * Time we last received a unicast frame from this peer
+     */
+    public final long lastUnicastFrame() {
+        return lastUnicastFrame;
+    }
+
+    /**
+     * Time we last received a multicast rame from this peer
+     */
+    public final long lastMulticastFrame() {
+        return lastMulticastFrame;
+    }
+
     /**
      * Remote major version or -1 if not known
      */
-    public int getVersionMajor() {
+    public final int versionMajor() {
         return versionMajor;
     }
 
     /**
      * Remote minor version or -1 if not known
      */
-    public int getVersionMinor() {
+    public final int versionMinor() {
         return versionMinor;
     }
 
     /**
      * Remote revision or -1 if not known
      */
-    public int getVersionRev() {
+    public final int versionRev() {
         return versionRev;
     }
 
     /**
      * Last measured latency in milliseconds or zero if unknown
      */
-    public int getLatency() {
+    public final int latency() {
         return latency;
     }
 
     /**
      * What trust hierarchy role does this device have?
      */
-    public PeerRole getRole() {
+    public final PeerRole role() {
         return role;
     }
 
     /**
      * Known network paths to peer
      */
-    public PeerPhysicalPath[] getPaths() {
+    public final PeerPhysicalPath[] paths() {
         return paths;
     }
-}
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/PeerPhysicalPath.java b/java/src/com/zerotier/sdk/PeerPhysicalPath.java
index 849725b50..d64ea56b3 100644
--- a/java/src/com/zerotier/sdk/PeerPhysicalPath.java
+++ b/java/src/com/zerotier/sdk/PeerPhysicalPath.java
@@ -31,62 +31,56 @@ import java.net.InetSocketAddress;
 
 /**
  * Physical network path to a peer
- * <p>
- * Defined in ZeroTierOne.h as ZT_PeerPhysicalPath
  */
-public class PeerPhysicalPath {
+public final class PeerPhysicalPath {
+    private InetSocketAddress address;
+    private long lastSend;
+    private long lastReceive;
+    private boolean fixed;
+    private boolean active;
+    private boolean preferred;
 
-    private final InetSocketAddress address;
-
-    private final long lastSend;
-
-    private final long lastReceive;
-
-    private final boolean preferred;
-
-    public PeerPhysicalPath(InetSocketAddress address, long lastSend, long lastReceive, boolean preferred) {
-        this.address = address;
-        if (lastSend < 0) {
-            throw new RuntimeException("lastSend < 0: " + lastSend);
-        }
-        this.lastSend = lastSend;
-        if (lastReceive < 0) {
-            throw new RuntimeException("lastReceive < 0: " + lastReceive);
-        }
-        this.lastReceive = lastReceive;
-        this.preferred = preferred;
-    }
-
-    @Override
-    public String toString() {
-        return "PeerPhysicalPath(" + address + ", " + lastSend + ", " + lastReceive + ", " + preferred + ")";
-    }
+    private PeerPhysicalPath() {}
 
     /**
      * Address of endpoint
      */
-    public InetSocketAddress getAddress() {
+    public final InetSocketAddress address() {
         return address;
     }
 
     /**
      * Time of last send in milliseconds or 0 for never
      */
-    public long getLastSend() {
+    public final long lastSend() {
         return lastSend;
     }
 
     /**
      * Time of last receive in milliseconds or 0 for never
      */
-    public long getLastReceive() {
+    public final long lastReceive() {
         return lastReceive;
     }
 
+    /**
+     * Is path fixed? (i.e. not learned, static)
+     */
+    public final boolean isFixed() {
+        return fixed;
+    }
+
+    /**
+     * Is path active?
+     */
+    public final boolean isActive() {
+        return active;
+    }
+
     /**
      * Is path preferred?
      */
-    public boolean isPreferred() {
+    public final boolean isPreferred() {
         return preferred;
     }
-}
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java
index e05ba4a3b..d7d55f053 100644
--- a/java/src/com/zerotier/sdk/PeerRole.java
+++ b/java/src/com/zerotier/sdk/PeerRole.java
@@ -27,45 +27,19 @@
 
 package com.zerotier.sdk;
 
-/**
- * What trust hierarchy role does this peer have?
- * <p>
- * Defined in ZeroTierOne.h as ZT_PeerRole
- */
 public enum PeerRole {
-
     /**
      * An ordinary node
      */
-    PEER_ROLE_LEAF(0),
+    PEER_ROLE_LEAF,
 
     /**
-     * moon root
+     * relay node
      */
-    PEER_ROLE_MOON(1),
+    PEER_ROLE_RELAY,
 
     /**
-     * planetary root
+     * root server
      */
-    PEER_ROLE_PLANET(2);
-
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private final int id;
-
-    PeerRole(int id) {
-        this.id = id;
-    }
-
-    public static PeerRole fromInt(int id) {
-        switch (id) {
-            case 0:
-                return PEER_ROLE_LEAF;
-            case 1:
-                return PEER_ROLE_MOON;
-            case 2:
-                return PEER_ROLE_PLANET;
-            default:
-                throw new RuntimeException("Unhandled value: " + id);
-        }
-    }
-}
+    PEER_ROLE_ROOT
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/ResultCode.java b/java/src/com/zerotier/sdk/ResultCode.java
index dc8a901b5..5da82b319 100644
--- a/java/src/com/zerotier/sdk/ResultCode.java
+++ b/java/src/com/zerotier/sdk/ResultCode.java
@@ -34,78 +34,41 @@ package com.zerotier.sdk;
  * occurs, the node should be considered to not be working correctly. These
  * indicate serious problems like an inaccessible data store or a compile
  * problem.</p>
- *
- * Defined in ZeroTierOne.h as ZT_ResultCode
  */
 public enum ResultCode {
-
     /**
      * Operation completed normally
      */
-    RESULT_OK(0),
+	RESULT_OK(0),
 
-    /**
-     * Call produced no error but no action was taken
-     */
-    RESULT_OK_IGNORED(1),
-
-    // Fatal errors (>=100, <1000)
+    // Fatal errors (> 0, < 1000)
     /**
      * Ran out of memory
      */
-	RESULT_FATAL_ERROR_OUT_OF_MEMORY(100),
+	RESULT_FATAL_ERROR_OUT_OF_MEMORY(1),
 
     /**
      * Data store is not writable or has failed
      */
-	RESULT_FATAL_ERROR_DATA_STORE_FAILED(101),
+	RESULT_FATAL_ERROR_DATA_STORE_FAILED(2),
 
     /**
      * Internal error (e.g. unexpected exception indicating bug or build problem)
      */
-	RESULT_FATAL_ERROR_INTERNAL(102),
+	RESULT_FATAL_ERROR_INTERNAL(3),
 
     // non-fatal errors
 
     /**
      * Network ID not valid
      */
-	RESULT_ERROR_NETWORK_NOT_FOUND(1000),
+	RESULT_ERROR_NETWORK_NOT_FOUND(1000);
+	
+	private final int id;
+    ResultCode(int id) { this.id = id; }
+    public int getValue() { return id; }
 
-    RESULT_ERROR_UNSUPPORTED_OPERATION(1001),
-
-    RESULT_ERROR_BAD_PARAMETER(1002);
-
-    private final int id;
-
-    ResultCode(int id) {
-        this.id = id;
+    public boolean isFatal(int id) {
+    	return (id > 0 && id < 1000);
     }
-
-    public static ResultCode fromInt(int id) {
-        switch (id) {
-            case 0:
-                return RESULT_OK;
-            case 1:
-                return RESULT_OK_IGNORED;
-            case 100:
-                return RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-            case 101:
-                return RESULT_FATAL_ERROR_DATA_STORE_FAILED;
-            case 102:
-                return RESULT_FATAL_ERROR_INTERNAL;
-            case 1000:
-                return RESULT_ERROR_NETWORK_NOT_FOUND;
-            case 1001:
-                return RESULT_ERROR_UNSUPPORTED_OPERATION;
-            case 1002:
-                return RESULT_ERROR_BAD_PARAMETER;
-            default:
-                throw new RuntimeException("Unhandled value: " + id);
-        }
-    }
-
-    public boolean isFatal() {
-        return (id >= 100 && id < 1000);
-    }
-}
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/Version.java b/java/src/com/zerotier/sdk/Version.java
index 0dbe1d2a5..d7fa0ce49 100644
--- a/java/src/com/zerotier/sdk/Version.java
+++ b/java/src/com/zerotier/sdk/Version.java
@@ -27,27 +27,11 @@
 
 package com.zerotier.sdk;
 
-public class Version {
-
-    private final int major;
-    private final int minor;
-    private final int revision;
-
-    public Version(int major, int minor, int revision) {
-        this.major = major;
-        this.minor = minor;
-        this.revision = revision;
-    }
-
-    public int getMajor() {
-        return major;
-    }
-
-    public int getMinor() {
-        return minor;
-    }
-
-    public int getRevision() {
-        return revision;
-    }
-}
+public final class Version {
+    private Version() {}
+    
+	public int major = 0;
+	public int minor = 0;
+	public int revision = 0;
+	public long featureFlags = 0;
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 275266823..9816180bd 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -27,314 +27,108 @@
 
 package com.zerotier.sdk;
 
-import android.util.Log;
-
-import com.zerotier.sdk.util.StringUtils;
-
-import java.net.InetSocketAddress;
+import java.lang.Comparable;
+import java.lang.Override;
+import java.lang.String;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-
-/**
- * Virtual network configuration
- * <p>
- * Defined in ZeroTierOne.h as ZT_VirtualNetworkConfig
- */
-public class VirtualNetworkConfig implements Comparable<VirtualNetworkConfig> {
-
-    private final static String TAG = "VirtualNetworkConfig";
+import java.net.InetSocketAddress;
 
+public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConfig> {
     public static final int MAX_MULTICAST_SUBSCRIPTIONS = 4096;
     public static final int ZT_MAX_ZT_ASSIGNED_ADDRESSES = 16;
 
-    private final long nwid;
+    private long nwid;
+    private long mac;
+    private String name;
+    private VirtualNetworkStatus status;
+    private VirtualNetworkType type;
+    private int mtu;
+    private boolean dhcp;
+    private boolean bridge;
+    private boolean broadcastEnabled;
+    private int portError;
+    private boolean enabled;
+    private long netconfRevision;
+    private MulticastGroup[] multicastSubscriptions;
+    private InetSocketAddress[] assignedAddresses;
 
-    private final long mac;
+    private VirtualNetworkConfig() {
 
-    private final String name;
-
-    private final VirtualNetworkStatus status;
-
-    private final VirtualNetworkType type;
-
-    private final int mtu;
-
-    private final boolean dhcp;
-
-    private final boolean bridge;
-
-    private final boolean broadcastEnabled;
-
-    private final int portError;
-
-    private final long netconfRevision;
-
-    private final InetSocketAddress[] assignedAddresses;
-
-    private final VirtualNetworkRoute[] routes;
-
-    private final VirtualNetworkDNS dns;
-
-    public VirtualNetworkConfig(long nwid, long mac, String name, VirtualNetworkStatus status, VirtualNetworkType type, int mtu, boolean dhcp, boolean bridge, boolean broadcastEnabled, int portError, long netconfRevision, InetSocketAddress[] assignedAddresses, VirtualNetworkRoute[] routes, VirtualNetworkDNS dns) {
-        this.nwid = nwid;
-        this.mac = mac;
-        this.name = name;
-        this.status = status;
-        this.type = type;
-        if (mtu < 0) {
-            throw new RuntimeException("mtu < 0: " + mtu);
-        }
-        this.mtu = mtu;
-        this.dhcp = dhcp;
-        this.bridge = bridge;
-        this.broadcastEnabled = broadcastEnabled;
-        this.portError = portError;
-        if (netconfRevision < 0) {
-            throw new RuntimeException("netconfRevision < 0: " + netconfRevision);
-        }
-        this.netconfRevision = netconfRevision;
-        this.assignedAddresses = assignedAddresses;
-        this.routes = routes;
-        this.dns = dns;
     }
 
-    @Override
-    public String toString() {
-        return "VirtualNetworkConfig(" + StringUtils.networkIdToString(nwid) + ", " + StringUtils.macAddressToString(mac) + ", " + name + ", " + status + ", " + type + ", " + mtu + ", " + dhcp + ", " + bridge + ", " + broadcastEnabled + ", " + portError + ", " + netconfRevision + ", " + Arrays.toString(assignedAddresses) + ", " + Arrays.toString(routes) + ", " + dns + ")";
-    }
-
-    @Override
-    public boolean equals(Object o) {
-
-        if (o == null) {
-            Log.i(TAG, "Old is null");
-
-            return false;
-        }
-
-        if (!(o instanceof VirtualNetworkConfig)) {
-            Log.i(TAG, "Old is not an instance of VirtualNetworkConfig: " + o);
-
-            return false;
-        }
-
-        VirtualNetworkConfig old = (VirtualNetworkConfig) o;
-
-        if (this.nwid != old.nwid) {
-            Log.i(TAG, "NetworkID Changed. New: " + StringUtils.networkIdToString(this.nwid) + " (" + this.nwid + "), " +
-                    "Old: " + StringUtils.networkIdToString(old.nwid) + " (" + old.nwid + ")");
-
-            return false;
-        }
-
-        if (this.mac != old.mac) {
-            Log.i(TAG, "MAC Changed. New: " + StringUtils.macAddressToString(this.mac) + ", Old: " + StringUtils.macAddressToString(old.mac));
-
-            return false;
-        }
-
-        if (!this.name.equals(old.name)) {
-            Log.i(TAG, "Name Changed. New: " + this.name + ", Old: " + old.name);
-
-            return false;
-        }
-
-        if (this.status != old.status) {
-            Log.i(TAG, "Status Changed. New: " + this.status + ", Old: " + old.status);
-
-            return false;
-        }
-
-        if (this.type != old.type) {
-            Log.i(TAG, "Type changed. New: " + this.type + ", Old: " + old.type);
-
-            return false;
-        }
-
-        if (this.mtu != old.mtu) {
-            Log.i(TAG, "MTU Changed. New: " + this.mtu + ", Old: " + old.mtu);
-
-            return false;
-        }
-
-        if (this.dhcp != old.dhcp) {
-            Log.i(TAG, "DHCP Flag Changed. New: " + this.dhcp + ", Old: " + old.dhcp);
-
-            return false;
-        }
-
-        if (this.bridge != old.bridge) {
-            Log.i(TAG, "Bridge Flag Changed. New: " + this.bridge + ", Old: " + old.bridge);
-
-            return false;
-        }
-
-        if (this.broadcastEnabled != old.broadcastEnabled) {
-            Log.i(TAG, "Broadcast Flag Changed. New: "+ this.broadcastEnabled + ", Old: " + old.broadcastEnabled);
-
-            return false;
-        }
-
-        if (this.portError != old.portError) {
-            Log.i(TAG, "Port Error Changed. New: " + this.portError + ", Old: " + old.portError);
-
-            return false;
-        }
-
-        if (this.netconfRevision != old.netconfRevision) {
-            Log.i(TAG, "NetConfRevision Changed. New: " + this.netconfRevision + ", Old: " + old.netconfRevision);
-
-            return false;
-        }
-
-        if (!Arrays.equals(assignedAddresses, old.assignedAddresses)) {
-
-            ArrayList<String> aaNew = new ArrayList<>();
-            ArrayList<String> aaOld = new ArrayList<>();
-            for (InetSocketAddress s : assignedAddresses) {
-                aaNew.add(s.toString());
-            }
-            for (InetSocketAddress s : old.assignedAddresses) {
-                aaOld.add(s.toString());
-            }
-            Collections.sort(aaNew);
-            Collections.sort(aaOld);
-
-            Log.i(TAG, "Assigned Addresses Changed");
-            Log.i(TAG, "New:");
-            for (String s : aaNew) {
-                Log.i(TAG, "    " + s);
-            }
-            Log.i(TAG, "");
-            Log.i(TAG, "Old:");
-            for (String s : aaOld) {
-                Log.i(TAG, "    " +s);
-            }
-            Log.i(TAG, "");
-
-            return false;
-        }
-
-        if (!Arrays.equals(routes, old.routes)) {
-
-            ArrayList<String> rNew = new ArrayList<>();
-            ArrayList<String> rOld = new ArrayList<>();
-            for (VirtualNetworkRoute r : routes) {
-                rNew.add(r.toString());
-            }
-            for (VirtualNetworkRoute r : old.routes) {
-                rOld.add(r.toString());
-            }
-            Collections.sort(rNew);
-            Collections.sort(rOld);
-
-            Log.i(TAG, "Managed Routes Changed");
-            Log.i(TAG, "New:");
-            for (String s : rNew) {
-                Log.i(TAG, "    " + s);
-            }
-            Log.i(TAG, "");
-            Log.i(TAG, "Old:");
-            for (String s : rOld) {
-                Log.i(TAG, "    " + s);
-            }
-            Log.i(TAG, "");
-
-            return false;
-        }
-
-        boolean dnsEquals;
-        if (this.dns == null) {
-            //noinspection RedundantIfStatement
-            if (old.dns == null) {
-                dnsEquals = true;
-            } else {
-                dnsEquals = false;
+    public boolean equals(VirtualNetworkConfig cfg) {
+        boolean aaEqual = true;
+        if(assignedAddresses.length == cfg.assignedAddresses.length) {
+            for(int i = 0; i < assignedAddresses.length; ++i) {
+                if(!assignedAddresses[i].equals(cfg.assignedAddresses[i])) {
+                    return false;
+                }
             }
         } else {
-            if (old.dns == null) {
-                dnsEquals = false;
-            } else {
-                dnsEquals = this.dns.equals(old.dns);
-            }
+            aaEqual = false;
         }
 
-        if (!dnsEquals) {
-            Log.i(TAG, "DNS Changed. New: " + this.dns + ", Old: " + old.dns);
-
-            return false;
-        }
-
-        return true;
+        return nwid == cfg.nwid &&
+               mac == cfg.mac &&
+               name.equals(cfg.name) &&
+               status.equals(cfg.status) &&
+               type.equals(cfg.type) &&
+               mtu == cfg.mtu &&
+               dhcp == cfg.dhcp &&
+               bridge == cfg.bridge &&
+               broadcastEnabled == cfg.broadcastEnabled &&
+               portError == cfg.portError &&
+               enabled == cfg.enabled &&
+               aaEqual;
     }
 
-    @Override
     public int compareTo(VirtualNetworkConfig cfg) {
-        return Long.compare(this.nwid, cfg.nwid);
-    }
-
-    @Override
-    public int hashCode() {
-
-        int result = 17;
-        result = 37 * result + (int) (nwid ^ (nwid >>> 32));
-        result = 37 * result + (int) (mac ^ (mac >>> 32));
-        result = 37 * result + name.hashCode();
-        result = 37 * result + status.hashCode();
-        result = 37 * result + type.hashCode();
-        result = 37 * result + mtu;
-        result = 37 * result + (dhcp ? 1 : 0);
-        result = 37 * result + (bridge ? 1 : 0);
-        result = 37 * result + (broadcastEnabled ? 1 : 0);
-        result = 37 * result + portError;
-        result = 37 * result + (int) (netconfRevision ^ (netconfRevision >>> 32));
-        result = 37 * result + Arrays.hashCode(assignedAddresses);
-        result = 37 * result + Arrays.hashCode(routes);
-        result = 37 * result + (dns == null ? 0 : dns.hashCode());
-
-        return result;
+        if(cfg.nwid == this.nwid) {
+            return 0;
+        } else {
+            return this.nwid > cfg.nwid ? 1 : -1;
+        }
     }
 
     /**
      * 64-bit ZeroTier network ID
      */
-    public long getNwid() {
+    public final long networkId() {
         return nwid;
     }
 
     /**
-     * Ethernet MAC (48 bits) that should be assigned to port
+     * Ethernet MAC (40 bits) that should be assigned to port
      */
-    public long getMac() {
+    public final long macAddress() {
         return mac;
     }
 
     /**
      * Network name (from network configuration master)
      */
-    public String getName() {
+    public final String name() {
         return name;
     }
 
     /**
      * Network configuration request status
      */
-    public VirtualNetworkStatus getStatus() {
+    public final VirtualNetworkStatus networkStatus() {
         return status;
     }
 
     /**
      * Network type
      */
-    public VirtualNetworkType getType() {
+    public final VirtualNetworkType networkType() {
         return type;
     }
 
     /**
      * Maximum interface MTU
      */
-    public int getMtu() {
+    public final int mtu() {
         return mtu;
     }
 
@@ -345,7 +139,7 @@ public class VirtualNetworkConfig implements Comparable<VirtualNetworkConfig> {
      * for security or other reasons. This is simply a netconf parameter that
      * means 'DHCP is available on this network.'</p>
      */
-    public boolean isDhcp() {
+    public final boolean isDhcpAvailable() {
         return dhcp;
     }
 
@@ -355,58 +149,58 @@ public class VirtualNetworkConfig implements Comparable<VirtualNetworkConfig> {
      * <p>This is informational. If this is false, bridged packets will simply
      * be dropped and bridging won't work.</p>
      */
-    public boolean isBridge() {
+    public final boolean isBridgeEnabled() {
         return bridge;
     }
 
     /**
      * If true, this network supports and allows broadcast (ff:ff:ff:ff:ff:ff) traffic
      */
-    public boolean isBroadcastEnabled() {
+    public final boolean broadcastEnabled() {
         return broadcastEnabled;
     }
 
     /**
      * If the network is in PORT_ERROR state, this is the error most recently returned by the port config callback
      */
-    public int getPortError() {
+    public final int portError() {
         return portError;
     }
 
+    /**
+     * Is this network enabled? If not, all frames to/from are dropped.
+     */
+    public final boolean isEnabled() {
+        return enabled;
+    }
+
     /**
      * Network config revision as reported by netconf master
      *
      * <p>If this is zero, it means we're still waiting for our netconf.</p>
      */
-    public long getNetconfRevision() {
+    public final long netconfRevision() {
         return netconfRevision;
     }
 
     /**
-     * ZeroTier-assigned addresses (in {@link InetSocketAddress} objects)
-     * <p>
+     * Multicast group subscriptions
+     */
+    public final MulticastGroup[] multicastSubscriptions() {
+        return multicastSubscriptions;
+    }
+
+    /**
+     * ZeroTier-assigned addresses (in {@link java.net.InetSocketAddress} objects)
+     *
      * For IP, the port number of the sockaddr_XX structure contains the number
      * of bits in the address netmask. Only the IP address and port are used.
      * Other fields like interface number can be ignored.
-     * <p>
+     *
      * This is only used for ZeroTier-managed address assignments sent by the
      * virtual network's configuration master.
      */
-    public InetSocketAddress[] getAssignedAddresses() {
+    public final InetSocketAddress[] assignedAddresses() {
         return assignedAddresses;
     }
-
-    /**
-     * ZeroTier-assigned routes (in {@link VirtualNetworkRoute} objects)
-     */
-    public VirtualNetworkRoute[] getRoutes() {
-        return routes;
-    }
-
-    /**
-     * Network specific DNS configuration
-     */
-    public VirtualNetworkDNS getDns() {
-        return dns;
-    }
 }
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java b/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
index 7c140bd77..15ae301cd 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
@@ -25,25 +25,25 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
+
 package com.zerotier.sdk;
 
 
 public interface VirtualNetworkConfigListener {
-
     /**
      * Callback called to update virtual network port configuration
      *
      * <p>This can be called at any time to update the configuration of a virtual
      * network port. The parameter after the network ID specifies whether this
      * port is being brought up, updated, brought down, or permanently deleted.
-     * <p>
+     *
      * This in turn should be used by the underlying implementation to create
      * and configure tap devices at the OS (or virtual network stack) layer.</P>
      *
-     * This should not call {@link Node#multicastSubscribe(long, long)} or other network-modifying
+     * This should not call {@link Node#multicastSubscribe} or other network-modifying
      * methods, as this could cause a deadlock in multithreaded or interrupt
      * driven environments.
-     * <p>
+     *
      * This must return 0 on success. It can return any OS-dependent error code
      * on failure, and this results in the network being placed into the
      * PORT_ERROR state.
@@ -53,8 +53,8 @@ public interface VirtualNetworkConfigListener {
      * @param config {@link VirtualNetworkConfig} object with the new configuration
      * @return 0 on success
      */
-    int onNetworkConfigurationUpdated(
+    public int onNetworkConfigurationUpdated(
             long nwid,
             VirtualNetworkConfigOperation op,
             VirtualNetworkConfig config);
-}
+}
\ No newline at end of file
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java b/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
index 59837a6be..b70eb4786 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
@@ -24,55 +24,26 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-
 package com.zerotier.sdk;
 
-/**
- * Virtual network configuration update type
- * <p>
- * Defined in ZeroTierOne.h as ZT_VirtualNetworkConfigOperation
- */
 public enum VirtualNetworkConfigOperation {
-
     /**
      * Network is coming up (either for the first time or after service restart)
      */
-    VIRTUAL_NETWORK_CONFIG_OPERATION_UP(1),
+    VIRTUAL_NETWORK_CONFIG_OPERATION_UP,
 
     /**
      * Network configuration has been updated
      */
-    VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE(2),
+    VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE,
 
     /**
      * Network is going down (not permanently)
      */
-    VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN(3),
+    VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN,
 
     /**
      * Network is going down permanently (leave/delete)
      */
-    VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY(4);
-
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private final int id;
-
-    VirtualNetworkConfigOperation(int id) {
-        this.id = id;
-    }
-
-    public static VirtualNetworkConfigOperation fromInt(int id) {
-        switch (id) {
-            case 1:
-                return VIRTUAL_NETWORK_CONFIG_OPERATION_UP;
-            case 2:
-                return VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE;
-            case 3:
-                return VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN;
-            case 4:
-                return VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY;
-            default:
-                throw new RuntimeException("Unhandled value: " + id);
-        }
-    }
+    VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY
 }
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkDNS.java b/java/src/com/zerotier/sdk/VirtualNetworkDNS.java
deleted file mode 100644
index 48d24046d..000000000
--- a/java/src/com/zerotier/sdk/VirtualNetworkDNS.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2020  ZeroTier, Inc.  https://www.zerotier.com/
- */
-
-package com.zerotier.sdk;
-
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-
-/**
- * DNS configuration to be pushed on a virtual network
- * <p>
- * Defined in ZeroTierOne.h as ZT_VirtualNetworkDNS
- */
-public class VirtualNetworkDNS implements Comparable<VirtualNetworkDNS> {
-
-    private final String domain;
-    private final ArrayList<InetSocketAddress> servers;
-
-    public VirtualNetworkDNS(String domain, ArrayList<InetSocketAddress> servers) {
-        this.domain = domain;
-        this.servers = servers;
-    }
-
-    @Override
-    public String toString() {
-        return "VirtualNetworkDNS(" + domain + ", " + servers + ")";
-    }
-
-    @Override
-    public boolean equals(Object o) {
-
-        if (o == null) {
-            return false;
-        }
-
-        if (!(o instanceof VirtualNetworkDNS)) {
-            return false;
-        }
-
-        VirtualNetworkDNS d = (VirtualNetworkDNS) o;
-
-        if (!domain.equals(d.domain)) {
-            return false;
-        }
-
-        //noinspection RedundantIfStatement
-        if (!servers.equals(d.servers)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int compareTo(VirtualNetworkDNS o) {
-        return domain.compareTo(o.domain);
-    }
-
-    @Override
-    public int hashCode() {
-
-        int result = 17;
-        result = 37 * result + domain.hashCode();
-        result = 37 * result + servers.hashCode();
-
-        return result;
-    }
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public ArrayList<InetSocketAddress> getServers() {
-        return servers;
-    }
-}
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java b/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
index 650c9cedc..9ad322825 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
@@ -28,18 +28,17 @@
 package com.zerotier.sdk;
 
 public interface VirtualNetworkFrameListener {
-
     /**
      * Function to send a frame out to a virtual network port
      * 
      * @param nwid ZeroTier One network ID
      * @param srcMac source MAC address
      * @param destMac destination MAC address
-     * @param etherType EtherType
-     * @param vlanId VLAN ID
+     * @param ethertype
+     * @param vlanId
      * @param frameData data to send
      */
-    void onVirtualNetworkFrame(
+    public void onVirtualNetworkFrame(
                 long nwid,
                 long srcMac,
                 long destMac,
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkRoute.java b/java/src/com/zerotier/sdk/VirtualNetworkRoute.java
deleted file mode 100644
index ec569813b..000000000
--- a/java/src/com/zerotier/sdk/VirtualNetworkRoute.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2015  ZeroTier, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * --
- *
- * ZeroTier may be used and distributed under the terms of the GPLv3, which
- * are available at: http://www.gnu.org/licenses/gpl-3.0.html
- *
- * If you would like to embed ZeroTier into a commercial application or
- * redistribute it in a modified binary form, please contact ZeroTier Networks
- * LLC. Start here: http://www.zerotier.com/
- */
-
-package com.zerotier.sdk;
-
-import java.net.InetSocketAddress;
-
-/**
- * A route to be pushed on a virtual network
- * <p>
- * Defined in ZeroTierOne.h as ZT_VirtualNetworkRoute
- */
-public class VirtualNetworkRoute implements Comparable<VirtualNetworkRoute>
-{
-	/**
-	 * Target network / netmask bits (in port field) or NULL or 0.0.0.0/0 for default
-	 */
-    private final InetSocketAddress target;
-    
-	/**
-	 * Gateway IP address (port ignored) or NULL (family == 0) for LAN-local (no gateway)
-	 */
-    private final InetSocketAddress via;
-
-	/**
-	 * Route flags
-	 */
-    private final int flags;
-
-	/**
-	 * Route metric (not currently used)
-	 */
-    private final int metric;
-
-    public VirtualNetworkRoute(InetSocketAddress target, InetSocketAddress via, int flags, int metric) {
-        this.target = target;
-        this.via = via;
-        this.flags = flags;
-        this.metric = metric;
-    }
-
-    @Override
-    public String toString() {
-        return "VirtualNetworkRoute(" + target + ", " + via + ", " + flags + ", " + metric + ")";
-    }
-
-    @Override
-    public int compareTo(VirtualNetworkRoute other) {
-        throw new RuntimeException("Unimplemented");
-    }
-
-    @Override
-    public boolean equals(Object o) {
-
-        if (!(o instanceof VirtualNetworkRoute)) {
-            return false;
-        }
-
-        VirtualNetworkRoute other = (VirtualNetworkRoute) o;
-
-        boolean targetEquals;
-        if (target == null) {
-            //noinspection RedundantIfStatement
-            if (other.target == null) {
-                targetEquals = true;
-            } else {
-                targetEquals = false;
-            }
-        } else {
-            if (other.target == null) {
-                targetEquals = false;
-            } else {
-                targetEquals = target.equals(other.target);
-            }
-        }
-
-        if (!targetEquals) {
-            return false;
-        }
-
-        boolean viaEquals;
-        if (via == null) {
-            //noinspection RedundantIfStatement
-            if (other.via == null) {
-                viaEquals = true;
-            } else {
-                viaEquals = false;
-            }
-        } else {
-            if (other.via == null) {
-                viaEquals = false;
-            } else {
-                viaEquals = via.equals(other.via);
-            }
-        }
-
-        if (!viaEquals) {
-            return false;
-        }
-
-        if (flags != other.flags) {
-            return false;
-        }
-
-        //noinspection RedundantIfStatement
-        if (metric != other.metric) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-
-        int result = 17;
-        result = 37 * result + (target == null ? 0 : target.hashCode());
-        result = 37 * result + (via == null ? 0 : via.hashCode());
-        result = 37 * result + flags;
-        result = 37 * result + metric;
-
-        return result;
-    }
-
-    public InetSocketAddress getTarget() {
-        return target;
-    }
-
-    public InetSocketAddress getVia() {
-        return via;
-    }
-
-    public int getFlags() {
-        return flags;
-    }
-
-    public int getMetric() {
-        return metric;
-    }
-}
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkStatus.java b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
index 9539bdcc6..2d00561a1 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
@@ -24,76 +24,36 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-
 package com.zerotier.sdk;
 
-/**
- * Virtual network status codes
- * <p>
- * Defined in ZeroTierOne.h as ZT_VirtualNetworkStatus
- */
 public enum VirtualNetworkStatus {
-
     /**
      * Waiting for network configuration (also means revision == 0)
      */
-    NETWORK_STATUS_REQUESTING_CONFIGURATION(0),
+    NETWORK_STATUS_REQUESTING_CONFIGURATION,
 
     /**
      * Configuration received and we are authorized
      */
-    NETWORK_STATUS_OK(1),
+    NETWORK_STATUS_OK,
 
     /**
      * Netconf master told us 'nope'
      */
-    NETWORK_STATUS_ACCESS_DENIED(2),
+    NETWORK_STATUS_ACCESS_DENIED,
 
     /**
      * Netconf master exists, but this virtual network does not
      */
-    NETWORK_STATUS_NOT_FOUND(3),
+    NETWORK_STATUS_NOT_FOUND,
 
     /**
      * Initialization of network failed or other internal error
      */
-    NETWORK_STATUS_PORT_ERROR(4),
+    NETWORK_STATUS_PORT_ERROR,
 
     /**
      * ZeroTier One version too old
      */
-    NETWORK_STATUS_CLIENT_TOO_OLD(5),
-
-    /**
-     * External authentication is required (e.g. SSO)
-     */
-    NETWORK_STATUS_AUTHENTICATION_REQUIRED(6);
-
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private final int id;
-
-    VirtualNetworkStatus(int id) {
-        this.id = id;
-    }
-
-    public static VirtualNetworkStatus fromInt(int id) {
-        switch (id) {
-            case 0:
-                return NETWORK_STATUS_REQUESTING_CONFIGURATION;
-            case 1:
-                return NETWORK_STATUS_OK;
-            case 2:
-                return NETWORK_STATUS_ACCESS_DENIED;
-            case 3:
-                return NETWORK_STATUS_NOT_FOUND;
-            case 4:
-                return NETWORK_STATUS_PORT_ERROR;
-            case 5:
-                return NETWORK_STATUS_CLIENT_TOO_OLD;
-            case 6:
-                return NETWORK_STATUS_AUTHENTICATION_REQUIRED;
-            default:
-                throw new RuntimeException("Unhandled value: " + id);
-        }
-    }
+    NETWORK_STATUS_CLIENT_TOO_OLD
 }
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkType.java b/java/src/com/zerotier/sdk/VirtualNetworkType.java
index 5c1239c02..ab1f4e087 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkType.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkType.java
@@ -24,41 +24,16 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-
 package com.zerotier.sdk;
 
-/**
- * Virtual network type codes
- * <p>
- * Defined in ZeroTierOne.h as ZT_VirtualNetworkType
- */
 public enum VirtualNetworkType {
-
     /**
      * Private networks are authorized via certificates of membership
      */
-    NETWORK_TYPE_PRIVATE(0),
+    NETWORK_TYPE_PRIVATE,
 
     /**
      * Public networks have no access control -- they'll always be AUTHORIZED
      */
-    NETWORK_TYPE_PUBLIC(1);
-
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private final int id;
-
-    VirtualNetworkType(int id) {
-        this.id = id;
-    }
-
-    public static VirtualNetworkType fromInt(int id) {
-        switch (id) {
-            case 0:
-                return NETWORK_TYPE_PRIVATE;
-            case 1:
-                return NETWORK_TYPE_PUBLIC;
-            default:
-                throw new RuntimeException("Unhandled value: " + id);
-        }
-    }
+    NETWORK_TYPE_PUBLIC
 }
diff --git a/java/src/com/zerotier/sdk/util/StringUtils.java b/java/src/com/zerotier/sdk/util/StringUtils.java
deleted file mode 100644
index c7bcc5d9f..000000000
--- a/java/src/com/zerotier/sdk/util/StringUtils.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2023  ZeroTier, Inc.  https://www.zerotier.com/
- */
-
-package com.zerotier.sdk.util;
-
-public class StringUtils {
-
-    /**
-     * Convert mac address to string.
-     *
-     * @param mac MAC address
-     * @return string in XX:XX:XX:XX:XX:XX format
-     */
-    public static String macAddressToString(long mac) {
-
-        int[] macChars = new int[6];
-        for (int i = 0; i < 6; i++) {
-            macChars[i] = (int) (mac % 256);
-            mac >>= 8;
-        }
-
-        return String.format("%02x:%02x:%02x:%02x:%02x:%02x", macChars[5], macChars[4], macChars[3], macChars[2], macChars[1], macChars[0]);
-    }
-
-    /**
-     * Convert long to hex string.
-     *
-     * @param networkId long
-     * @return string with 0 padding
-     */
-    public static String networkIdToString(long networkId) {
-        return String.format("%016x", networkId);
-    }
-
-    /**
-     * Convert node address to string.
-     *
-     * Node addresses are 40 bits, so print 10 hex characters.
-     *
-     * @param address Node address
-     * @return formatted string
-     */
-    public static String addressToString(long address) {
-        return String.format("%010x", address);
-    }
-
-    public static String etherTypeToString(long etherType) {
-        return String.format("%04x", etherType);
-    }
-}
diff --git a/java/test/com/zerotier/sdk/util/StringUtilsTest.java b/java/test/com/zerotier/sdk/util/StringUtilsTest.java
deleted file mode 100644
index 257b14a99..000000000
--- a/java/test/com/zerotier/sdk/util/StringUtilsTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2023  ZeroTier, Inc.  https://www.zerotier.com/
- */
-
-package com.zerotier.sdk.util;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class StringUtilsTest {
-
-    public StringUtilsTest() {
-    }
-
-    public String oldMacDisplay(long mac) {
-
-        String macStr = Long.toHexString(mac);
-
-        if (macStr.length() > 12) {
-            throw new RuntimeException();
-        }
-
-        while (macStr.length() < 12) {
-            //noinspection StringConcatenationInLoop
-            macStr = "0" + macStr;
-        }
-
-        //noinspection StringBufferReplaceableByString
-        StringBuilder displayMac = new StringBuilder();
-        displayMac.append(macStr.charAt(0));
-        displayMac.append(macStr.charAt(1));
-        displayMac.append(':');
-        displayMac.append(macStr.charAt(2));
-        displayMac.append(macStr.charAt(3));
-        displayMac.append(':');
-        displayMac.append(macStr.charAt(4));
-        displayMac.append(macStr.charAt(5));
-        displayMac.append(':');
-        displayMac.append(macStr.charAt(6));
-        displayMac.append(macStr.charAt(7));
-        displayMac.append(':');
-        displayMac.append(macStr.charAt(8));
-        displayMac.append(macStr.charAt(9));
-        displayMac.append(':');
-        displayMac.append(macStr.charAt(10));
-        displayMac.append(macStr.charAt(11));
-
-        return displayMac.toString();
-    }
-
-    @Test
-    public void testMacDisplay() {
-
-        long mac1 = 1234567891;
-        assertThat(StringUtils.macAddressToString(mac1)).isEqualTo(oldMacDisplay(mac1));
-
-        long mac2 = 999999999;
-        assertThat(StringUtils.macAddressToString(mac2)).isEqualTo(oldMacDisplay(mac2));
-
-        long mac3 = 0x7fffffffffffL;
-        assertThat(StringUtils.macAddressToString(mac3)).isEqualTo(oldMacDisplay(mac3));
-        assertThat(StringUtils.macAddressToString(mac3)).isEqualTo("7f:ff:ff:ff:ff:ff");
-
-        long mac4 = 0x7fafcf3f8fffL;
-        assertThat(StringUtils.macAddressToString(mac4)).isEqualTo(oldMacDisplay(mac4));
-        assertThat(StringUtils.macAddressToString(mac4)).isEqualTo("7f:af:cf:3f:8f:ff");
-    }
-}
diff --git a/make-bsd.mk b/make-bsd.mk
deleted file mode 100644
index ce0b4dde1..000000000
--- a/make-bsd.mk
+++ /dev/null
@@ -1,198 +0,0 @@
-# This requires GNU make, which is typically "gmake" on BSD systems
-
-INCLUDES=-isystem ext -Iext/prometheus-cpp-lite-1.0/core/include -Iext/prometheus-cpp-lite-1.0/simpleapi/include
-DEFS=
-LIBS=
-
-include objects.mk
-ONE_OBJS+=osdep/BSDEthernetTap.o ext/http-parser/http_parser.o
-
-ifeq ($(OSTYPE),FreeBSD)
-	# Auto-detect miniupnpc and nat-pmp as well and use ports libs if present,
-	# otherwise build into binary as done on Mac and Windows.
-	INCLUDES+=-I/usr/local/include
-	LIBS+=-L/usr/local/lib
-	ONE_OBJS+=osdep/PortMapper.o
-	override DEFS+=-DZT_USE_MINIUPNPC
-	MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2..*"' /usr/local/include/miniupnpc/miniupnpc.h && echo 1)
-	ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
-		LIBS+=-lminiupnpc
-		override DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
-	else
-		override DEFS+=-DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -DOS_STRING=\"FreeBSD/$(shell uname -r)\" -DMINIUPNPC_VERSION_STRING=\"2.0\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR
-		ONE_OBJS+=ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o
-	endif
-	ifeq ($(wildcard /usr/local/include/natpmp.h),)
-		ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
-	else
-		LIBS+=-lnatpmp
-		override DEFS+=-DZT_USE_SYSTEM_NATPMP
-	endif
-endif
-
-# Build with address sanitization library for advanced debugging (clang)
-ifeq ($(ZT_SANITIZE),1)
-	SANFLAGS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
-endif
-# "make debug" is a shortcut for this
-ifeq ($(ZT_DEBUG),1)
-	CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
-	LDFLAGS+=
-	STRIP=echo
-	ZT_TRACE=1
-	# The following line enables optimization for the crypto code, since
-	# C25519 in particular is almost UNUSABLE in heavy testing without it.
-node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
-else
-	CFLAGS?=-O3 -fstack-protector
-	CFLAGS+=-Wall -fPIE -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
-	LDFLAGS+=-pie -Wl,-z,relro,-z,now
-	STRIP=strip --strip-all
-endif
-
-ifeq ($(ZT_TRACE),1)
-	DEFS+=-DZT_TRACE
-endif
-
-# Determine system build architecture from compiler target
-CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1)
-ZT_ARCHITECTURE=999
-ifeq ($(CC_MACH),x86_64)
-	ZT_ARCHITECTURE=2
-	ZT_USE_X64_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),amd64)
-	ZT_ARCHITECTURE=2
-	ZT_USE_X64_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),i386)
-	ZT_ARCHITECTURE=1
-endif
-ifeq ($(CC_MACH),i686)
-	ZT_ARCHITECTURE=1
-endif
-ifeq ($(CC_MACH),arm)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),armel)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),armhf)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),armv6)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING -DZT_NO_UNALIGNED_ACCESS
-	ZT_USE_ARM32_NEON_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),armv6zk)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),armv6kz)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),armv7)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING -DZT_AES_NO_ACCEL -DZT_NO_UNALIGNED_ACCESS
-	ZT_USE_ARM32_NEON_ASM_SALSA2012=1
-endif
-ifeq ($(CC_MACH),arm64)
-	ZT_ARCHITECTURE=4
-	override DEFS+=-DZT_NO_TYPE_PUNNING -march=armv8-a+crypto
-endif
-ifeq ($(CC_MACH),aarch64)
-	ZT_ARCHITECTURE=4
-	override DEFS+=-DZT_NO_TYPE_PUNNING -march=armv8-a+crypto
-endif
-ifeq ($(CC_MACH),mipsel)
-	ZT_ARCHITECTURE=5
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-ifeq ($(CC_MACH),mips)
-	ZT_ARCHITECTURE=5
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-ifeq ($(CC_MACH),mips64)
-	ZT_ARCHITECTURE=6
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-ifeq ($(CC_MACH),mips64el)
-	ZT_ARCHITECTURE=6
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-
-# Fail if system architecture could not be determined
-ifeq ($(ZT_ARCHITECTURE),999)
-ERR=$(error FATAL: architecture could not be determined from $(CC) -dumpmachine: $(CC_MACH))
-.PHONY: err
-err: ; $(ERR)
-endif
-
-# Build faster crypto on some targets
-ifeq ($(ZT_USE_X64_ASM_SALSA2012),1)
-	override DEFS+=-DZT_USE_X64_ASM_SALSA2012
-	override CORE_OBJS+=ext/x64-salsa2012-asm/salsa2012.o
-endif
-ifeq ($(ZT_USE_ARM32_NEON_ASM_SALSA2012),1)
-	override DEFS+=-DZT_USE_ARM32_NEON_ASM_SALSA2012
-	override CORE_OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o
-	override ASFLAGS+=-meabi=5
-	override LDFLAGS+=-Wl,-z,notext
-endif
-
-override DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\""
-
-CXXFLAGS+=$(CFLAGS) -std=c++17 #-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH -D_GLIBCXX_USE_C99_MATH_TR1
-
-all:	one
-
-one:	$(CORE_OBJS) $(ONE_OBJS) one.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LIBS)
-	$(STRIP) zerotier-one
-	ln -sf zerotier-one zerotier-idtool
-	ln -sf zerotier-one zerotier-cli
-
-zerotier-one: one
-
-zerotier-idtool: one
-
-zerotier-cli: one
-
-libzerotiercore.a:	$(CORE_OBJS)
-	ar rcs libzerotiercore.a $(CORE_OBJS)
-	ranlib libzerotiercore.a
-
-core: libzerotiercore.a
-
-selftest:	$(CORE_OBJS) $(ONE_OBJS) selftest.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(CORE_OBJS) $(ONE_OBJS) $(LIBS)
-	$(STRIP) zerotier-selftest
-
-zerotier-selftest: selftest
-
-clean:
-	rm -rf *.a *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli $(ONE_OBJS) $(CORE_OBJS)
-
-debug:	FORCE
-	$(MAKE) -j ZT_DEBUG=1
-
-install:	one
-	rm -f /usr/local/sbin/zerotier-one
-	cp zerotier-one /usr/local/sbin
-	ln -sf /usr/local/sbin/zerotier-one /usr/local/sbin/zerotier-cli
-	ln -sf /usr/local/sbin/zerotier-one /usr/local/bin/zerotier-idtool
-
-uninstall:	FORCE
-	rm -rf /usr/local/sbin/zerotier-one /usr/local/sbin/zerotier-cli /usr/local/bin/zerotier-idtool /var/db/zerotier-one/zerotier-one.port /var/db/zerotier-one/zerotier-one.pid /var/db/zerotier-one/iddb.d
-
-FORCE:
diff --git a/make-freebsd.mk b/make-freebsd.mk
new file mode 100644
index 000000000..7148896e1
--- /dev/null
+++ b/make-freebsd.mk
@@ -0,0 +1,65 @@
+CC=cc
+CXX=c++
+
+INCLUDES=
+DEFS=
+LIBS=
+
+include objects.mk
+OBJS+=osdep/BSDEthernetTap.o
+
+# "make official" is a shortcut for this
+ifeq ($(ZT_OFFICIAL_RELEASE),1)
+	DEFS+=-DZT_OFFICIAL_RELEASE
+endif
+
+# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support
+ifeq ($(ZT_ENABLE_CLUSTER),1)
+	DEFS+=-DZT_ENABLE_CLUSTER
+endif
+
+# "make debug" is a shortcut for this
+ifeq ($(ZT_DEBUG),1)
+	DEFS+=-DZT_TRACE
+	CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
+	LDFLAGS+=
+	STRIP=echo
+	# The following line enables optimization for the crypto code, since
+	# C25519 in particular is almost UNUSABLE in heavy testing without it.
+ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
+else
+	CFLAGS?=-O3 -fstack-protector
+	CFLAGS+=-Wall -fPIE -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+	LDFLAGS+=-pie -Wl,-z,relro,-z,now
+	STRIP=strip --strip-all
+endif
+
+CXXFLAGS+=$(CFLAGS) -fno-rtti
+
+all:	one
+
+one:	$(OBJS) service/OneService.o one.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o $(LIBS)
+	$(STRIP) zerotier-one
+	ln -sf zerotier-one zerotier-idtool
+	ln -sf zerotier-one zerotier-cli
+
+selftest:	$(OBJS) selftest.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS)
+	$(STRIP) zerotier-selftest
+
+# No installer on FreeBSD yet
+#installer: one FORCE
+#	./buildinstaller.sh
+
+clean:
+	rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-*
+
+debug:	FORCE
+	make -j 4 ZT_DEBUG=1
+
+#official: FORCE
+#	make -j 4 ZT_OFFICIAL_RELEASE=1
+#	./buildinstaller.sh
+
+FORCE:
diff --git a/make-linux.mk b/make-linux.mk
index 141607a4b..3ead1be21 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -1,607 +1,135 @@
-# Automagically pick CLANG or RH/CentOS newer GCC if present
+#
+# Makefile for ZeroTier One on Linux
+#
+# This is confirmed to work on distributions newer than CentOS 6 (the
+# one used for reference builds) and on 32 and 64 bit x86 and ARM
+# machines. It should also work on other 'normal' machines and recent
+# distributions. Editing might be required for tiny devices or weird
+# distros.
+#
+# Targets
+#   one: zerotier-one and symlinks (cli and idtool)
+#   doc: builds manpages, requires rst2man somewhere in PATH
+#   all: builds 'one'
+#   selftest: zerotier-selftest
+#   debug: builds 'one' and 'selftest' with tracing and debug flags
+#   installer: builds installers and packages (RPM/DEB/etc.) if possible
+#   official: cleans and then builds 'one', 'installer', and 'doc'
+#   clean: removes all built files, objects, other trash
+#
+
+GENERATED_FILES :=
+DOC_DIR = doc
+
+# Automagically pick clang or gcc, with preference for clang
 # This is only done if we have not overridden these with an environment or CLI variable
 ifeq ($(origin CC),default)
-	CC:=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi)
-	CC:=$(shell if [ -e /opt/rh/devtoolset-8/root/usr/bin/gcc ]; then echo /opt/rh/devtoolset-8/root/usr/bin/gcc; else echo $(CC); fi)
+	CC=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi)
 endif
 ifeq ($(origin CXX),default)
-	CXX:=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi)
-	CXX:=$(shell if [ -e /opt/rh/devtoolset-8/root/usr/bin/g++ ]; then echo /opt/rh/devtoolset-8/root/usr/bin/g++; else echo $(CXX); fi)
+	CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi)
 endif
 
-INCLUDES?=-Irustybits/target -isystem ext -Iext/prometheus-cpp-lite-1.0/core/include -Iext-prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include -Iext/prometheus-cpp-lite-1.0/simpleapi/include
+#UNAME_M=$(shell $(CC) -dumpmachine | cut -d '-' -f 1)
+
+INCLUDES?=
 DEFS?=
 LDLIBS?=
-DESTDIR?=
-EXTRA_DEPS?=
 
 include objects.mk
-ifeq ($(ZT_EXTOSDEP),1)
-	ONE_OBJS+=osdep/ExtOsdep.o
-	override DEFS += -DZT_EXTOSDEP
-else
-	ONE_OBJS+=osdep/LinuxEthernetTap.o
-	ONE_OBJS+=osdep/LinuxNetLink.o
+
+ifeq ($(ZT_OFFICIAL_RELEASE),1)
+	DEFS+=-DZT_OFFICIAL_RELEASE
+	ZT_USE_MINIUPNPC=1
 endif
 
-# for central controller buildsk
-TIMESTAMP=$(shell date +"%Y%m%d%H%M")
-
-# Auto-detect miniupnpc and nat-pmp as well and use system libs if present,
-# otherwise build into binary as done on Mac and Windows.
-ONE_OBJS+=osdep/PortMapper.o
-override DEFS+=-DZT_USE_MINIUPNPC
-MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2..*"' /usr/include/miniupnpc/miniupnpc.h && echo 1)
-#MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' /usr/include/miniupnpc/miniupnpc.h && echo 1)
-ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
-	override DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
-	LDLIBS+=-lminiupnpc
-else
-	override DEFS+=-DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING="\"Linux\"" -DMINIUPNPC_VERSION_STRING="\"2.0\"" -DUPNP_VERSION_STRING="\"UPnP/1.1\"" -DENABLE_STRNATPMPERR
-	ONE_OBJS+=ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o
-endif
-ifeq ($(wildcard /usr/include/natpmp.h),)
-	ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
-else
-	LDLIBS+=-lnatpmp
-	override DEFS+=-DZT_USE_SYSTEM_NATPMP
+ifeq ($(ZT_USE_MINIUPNPC),1)
+	DEFS+=-DZT_USE_MINIUPNPC -DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING=\"Linux\" -DMINIUPNPC_VERSION_STRING=\"1.9\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR
+	OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o osdep/PortMapper.o
 endif
 
-# Use bundled http-parser since distribution versions are NOT API-stable or compatible!
-# Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
-ONE_OBJS+=ext/http-parser/http_parser.o
-
-ifeq ($(ZT_RULES_ENGINE_DEBUGGING),1)
-	override DEFS+=-DZT_RULES_ENGINE_DEBUGGING
+ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
+	DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
+	LDLIBS+=-L/usr/local/lib -lsqlite3
+	OBJS+=controller/SqliteNetworkController.o
 endif
 
-ifeq ($(ZT_DEBUG_TRACE),1)
-	DEFS+=-DZT_DEBUG_TRACE
+ifeq ($(ZT_ENABLE_CLUSTER),1)
+	DEFS+=-DZT_ENABLE_CLUSTER
 endif
 
-# Build with address sanitization library for advanced debugging (clang)
-ifeq ($(ZT_SANITIZE),1)
-	override DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
-endif
 ifeq ($(ZT_DEBUG),1)
-	override CFLAGS+=-Wall -Wno-deprecated -g -O -pthread $(INCLUDES) $(DEFS)
-	override CXXFLAGS+=-Wall -Wno-deprecated -g -O -std=c++17 -pthread $(INCLUDES) $(DEFS)
-	ZT_TRACE=1
-	ZT_CARGO_FLAGS=
+	DEFS+=-DZT_TRACE
+	CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
+	CXXFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
+	LDFLAGS=-ldl
+	STRIP?=echo
 	# The following line enables optimization for the crypto code, since
 	# C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box!
-node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CXXFLAGS=-Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
+ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
 else
 	CFLAGS?=-O3 -fstack-protector
-	override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+	CFLAGS+=-Wall -fPIE -fvisibility=hidden -pthread $(INCLUDES) -DNDEBUG $(DEFS)
 	CXXFLAGS?=-O3 -fstack-protector
-	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
-	LDFLAGS?=-pie -Wl,-z,relro,-z,now
-	ZT_CARGO_FLAGS=--release
-endif
-
-ifeq ($(ZT_QNAP), 1)
-	override DEFS+=-D__QNAP__
-	ZT_EMBEDDED=1
-endif
-ifeq ($(ZT_UBIQUITI), 1)
-	override DEFS+=-D__UBIQUITI__
-	ZT_EMBEDDED=1
-endif
-
-ifeq ($(ZT_SYNOLOGY), 1)
-	override DEFS+=-D__SYNOLOGY__
-	ZT_EMBEDDED=1
-endif
-
-ifeq ($(ZT_DISABLE_COMPRESSION), 1)
-	override DEFS+=-DZT_DISABLE_COMPRESSION
+	CXXFLAGS+=-Wall -Wreorder -fPIE -fvisibility=hidden -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+	LDFLAGS=-ldl -pie -Wl,-z,relro,-z,now
+	STRIP?=strip
+	STRIP+=--strip-all
 endif
 
 ifeq ($(ZT_TRACE),1)
-	override DEFS+=-DZT_TRACE
+	DEFS+=-DZT_TRACE
 endif
 
-ifeq ($(ZT_DEBUG),1)
-	override DEFS+=-DZT_DEBUG
-endif
+# Uncomment for gprof profile build
+#CFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS)
+#CXXFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS)
+#LDFLAGS=
+#STRIP=echo
 
-ifeq ($(ZT_USE_TEST_TAP),1)
-	override DEFS+=-DZT_USE_TEST_TAP
-endif
-
-ifeq ($(ZT_VAULT_SUPPORT),1)
-	override DEFS+=-DZT_VAULT_SUPPORT=1
-	override LDLIBS+=-lcurl
-endif
-
-# Determine system build architecture from compiler target
-CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1)
-ZT_ARCHITECTURE=999
-ifeq ($(CC_MACH),x86_64)
-	ZT_ARCHITECTURE=2
-	ZT_USE_X64_ASM_SALSA=1
-	ZT_USE_X64_ASM_ED25519=1
-	override CFLAGS+=-msse -msse2
-	override CXXFLAGS+=-msse -msse2
-	ZT_SSO_SUPPORTED=1
-	ifeq ($(ZT_CONTROLLER),1)
-		EXT_ARCH=amd64
-	endif
-endif
-ifeq ($(CC_MACH),amd64)
-	ZT_ARCHITECTURE=2
-	ZT_USE_X64_ASM_SALSA=1
-	ZT_USE_X64_ASM_ED25519=1
-	override CFLAGS+=-msse -msse2
-	override CXXFLAGS+=-msse -msse2
-	ZT_SSO_SUPPORTED=1
-	ifeq ($(ZT_CONTROLLER),1)
-		EXT_ARCH=amd64
-	endif
-endif
-ifeq ($(CC_MACH),powerpc64le)
-	ZT_ARCHITECTURE=8
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-ifeq ($(CC_MACH),powerpc)
-	ZT_ARCHITECTURE=8
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	override DEFS+=-DZT_NO_CAPABILITIES
-endif
-ifeq ($(CC_MACH),ppc64le)
-	ZT_ARCHITECTURE=8
-endif
-ifeq ($(CC_MACH),ppc64el)
-	ZT_ARCHITECTURE=8
-endif
-ifeq ($(CC_MACH),e2k)
-	ZT_ARCHITECTURE=2
-endif
-ifeq ($(CC_MACH),e2k64)
-	ZT_ARCHITECTURE=2
-endif
-ifeq ($(CC_MACH),i386)
-	ZT_ARCHITECTURE=1
-	ZT_SSO_SUPPORTED=1
-endif
-ifeq ($(CC_MACH),i486)
-	ZT_ARCHITECTURE=1
-	ZT_SSO_SUPPORTED=1
-endif
-ifeq ($(CC_MACH),i586)
-	ZT_ARCHITECTURE=1
-	ZT_SSO_SUPPORTED=1
-endif
-ifeq ($(CC_MACH),i686)
-	ZT_ARCHITECTURE=1
-	ZT_SSO_SUPPORTED=1
-endif
-ifeq ($(CC_MACH),arm)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armel)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armhf)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-	ZT_SSO_SUPPORTED=1
-endif
-ifeq ($(CC_MACH),armv6)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armv6l)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armv6zk)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armv6kz)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armv6k)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armv7)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armv7l)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armv7hl)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),armv7ve)
-	ZT_ARCHITECTURE=3
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
-endif
-ifeq ($(CC_MACH),arm64)
-	ZT_ARCHITECTURE=4
-	ZT_SSO_SUPPORTED=1
-	ZT_USE_X64_ASM_ED25519=0
-	override DEFS+=-DZT_NO_TYPE_PUNNING -DZT_ARCH_ARM_HAS_NEON -march=armv8-a+crypto -mtune=generic -mstrict-align
-endif
-ifeq ($(CC_MACH),aarch64)
-	ZT_ARCHITECTURE=4
-	ZT_SSO_SUPPORTED=1
-	ZT_USE_X64_ASM_ED25519=0
-	override DEFS+=-DZT_NO_TYPE_PUNNING -DZT_ARCH_ARM_HAS_NEON -march=armv8-a+crypto -mtune=generic -mstrict-align
-	ifeq ($(ZT_CONTROLLER),1)
-		EXT_ARCH=arm64
-	endif
-endif
-ifeq ($(CC_MACH),mipsel)
-	ZT_ARCHITECTURE=5
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-ifeq ($(CC_MACH),mips)
-	ZT_ARCHITECTURE=5
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-ifeq ($(CC_MACH),mips64)
-	ZT_ARCHITECTURE=6
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-ifeq ($(CC_MACH),mips64el)
-	ZT_ARCHITECTURE=6
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-ifeq ($(CC_MACH),s390x)
-	ZT_ARCHITECTURE=16
-endif
-ifeq ($(CC_MACH),riscv64)
-	ZT_ARCHITECTURE=0
-endif
-ifeq ($(CC_MACH),loongarch64)
-	ZT_ARCHITECTURE=17
-	override DEFS+=-DZT_NO_TYPE_PUNNING
-endif
-
-ifeq ($(ZT_EXTOSDEP), 1)
-	ZT_SSO_SUPPORTED=0
-endif
-
-# Fail if system architecture could not be determined
-ifeq ($(ZT_ARCHITECTURE),999)
-ERR=$(error FATAL: architecture could not be determined from $(CC) -dumpmachine: $(CC_MACH))
-.PHONY: err
-err: ; $(ERR)
-endif
-
-# Flag for Intel 32-bit processors since some machine images are incorrectly marked as i386
-ifeq ($(ZT_IA32),1)
-	override LDFLAGS+=-m32
-	override CFLAGS+=-m32
-	override CXXFLAGS+=-m32
-	# Prevent the use of X64 crypto
-	ZT_USE_X64_ASM_SALSA=0
-	ZT_USE_X64_ASM_ED25519=0
-endif
-
-ifeq ($(ZT_SSO_SUPPORTED), 1)
-	ifeq ($(ZT_EMBEDDED),)
-		override DEFS+=-DZT_SSO_SUPPORTED=1
-		ifeq ($(ZT_DEBUG),1)
-			LDLIBS+=rustybits/target/debug/libzeroidc.a -ldl -lssl -lcrypto
-		else
-			LDLIBS+=rustybits/target/release/libzeroidc.a -ldl -lssl -lcrypto
-		endif
-	endif
-endif
-
-OTEL_VERSION=1.21.0
-ifeq (${ZT_OTEL},1)
-	OTEL_INSTALL_DIR=ext/opentelemetry-cpp-${OTEL_VERSION}/localinstall
-	override DEFS+=-DZT_OPENTELEMETRY_ENABLED=1
-	INCLUDES+=-I${OTEL_INSTALL_DIR}/include
-	LDLIBS+=-L${OTEL_INSTALL_DIR}/lib -lopentelemetry_exporter_in_memory_metric -lopentelemetry_exporter_in_memory -lopentelemetry_exporter_ostream_logs -lopentelemetry_exporter_ostream_metrics -lopentelemetry_exporter_ostream_span -lopentelemetry_exporter_otlp_grpc  -lopentelemetry_exporter_otlp_grpc_client -lopentelemetry_exporter_otlp_grpc_log -lopentelemetry_exporter_otlp_grpc_metrics -lopentelemetry_otlp_recordable -lopentelemetry_common -lopentelemetry_trace -lopentelemetry_common -lopentelemetry_resources -lopentelemetry_logs -lopentelemetry_metrics -lopentelemetry_proto -lopentelemetry_proto_grpc -lopentelemetry_version -lprotobuf -lgrpc++
-else
-	OTEL_INSTALL_DIR=ext/opentelemetry-cpp-api-only
-	INCLUDES+=-I${OTEL_INSTALL_DIR}/include
-endif
-
-# Disable software updates by default on Linux since that is normally done with package management
-override DEFS+=-DZT_BUILD_PLATFORM=1 -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\""
-
-# This forces libstdc++ not to include these abominations, especially mt and pool
-override DEFS+=-D_MT_ALLOCATOR_H -D_POOL_ALLOCATOR_H -D_EXTPTR_ALLOCATOR_H -D_DEBUG_ALLOCATOR_H
-
-# Static builds, which are currently done for a number of Linux targets
-ifeq ($(ZT_STATIC),1)
-	override LDFLAGS+=-static
-endif
-
-# For building an official semi-static binary on CentOS 7
-ifeq ($(ZT_OFFICIAL),1)
-	CORE_OBJS+=ext/misc/linux-old-glibc-compat.o
-	override LDFLAGS+=-Wl,--wrap=memcpy -static-libstdc++
-endif
-
-ifeq ($(ZT_CONTROLLER),1)
-	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
-	override LDLIBS+=-Lext/libpqxx-7.7.3/install/ubuntu22.04/$(EXT_ARCH)/lib -lpqxx -lpq ext/hiredis-1.0.2/lib/ubuntu22.04/$(EXT_ARCH)/libhiredis.a ext/redis-plus-plus-1.3.3/install/ubuntu22.04/$(EXT_ARCH)/lib/libredis++.a -lssl -lcrypto
-	override DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_NO_PEER_METRICS -DZT_OPENTELEMETRY_ENABLED
-	override INCLUDES+=-I/usr/include/postgresql -Iext/libpqxx-7.7.3/install/ubuntu22.04/$(EXT_ARCH)/include -Iext/hiredis-1.0.2/include/ -Iext/redis-plus-plus-1.3.3/install/ubuntu22.04/$(EXT_ARCH)/include/sw/
-	ifeq ($(ZT_DEBUG),1)
-		override LDLIBS+=rustybits/target/debug/libsmeeclient.a
-	else
-		override LDLIBS+=rustybits/target/release/libsmeeclient.a
-	endif
-endif
-
-# ARM32 hell -- use conservative CFLAGS
-ifeq ($(ZT_ARCHITECTURE),3)
-	ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
-		override CFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
-		override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
-		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
-	else
-		ifeq ($(ZT_EXTOSDEP), 0)
-			override CFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
-			override CXXFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
-		else
-			override DEFS+=-DZT_NO_PEER_METRICS
-		endif
-		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
-	endif
-endif
-
-# Build faster crypto on some targets
-ifeq ($(ZT_USE_X64_ASM_SALSA),1)
-	override DEFS+=-DZT_USE_X64_ASM_SALSA2012
-	override CORE_OBJS+=ext/x64-salsa2012-asm/salsa2012.o
-endif
-ifeq ($(ZT_USE_X64_ASM_ED25519),1)
-	override DEFS+=-DZT_USE_FAST_X64_ED25519
-	override CORE_OBJS+=ext/ed25519-amd64-asm/choose_t.o ext/ed25519-amd64-asm/consts.o ext/ed25519-amd64-asm/fe25519_add.o ext/ed25519-amd64-asm/fe25519_freeze.o ext/ed25519-amd64-asm/fe25519_mul.o ext/ed25519-amd64-asm/fe25519_square.o ext/ed25519-amd64-asm/fe25519_sub.o ext/ed25519-amd64-asm/ge25519_add_p1p1.o ext/ed25519-amd64-asm/ge25519_dbl_p1p1.o ext/ed25519-amd64-asm/ge25519_nielsadd2.o ext/ed25519-amd64-asm/ge25519_nielsadd_p1p1.o ext/ed25519-amd64-asm/ge25519_p1p1_to_p2.o ext/ed25519-amd64-asm/ge25519_p1p1_to_p3.o ext/ed25519-amd64-asm/ge25519_pnielsadd_p1p1.o ext/ed25519-amd64-asm/heap_rootreplaced.o ext/ed25519-amd64-asm/heap_rootreplaced_1limb.o ext/ed25519-amd64-asm/heap_rootreplaced_2limbs.o ext/ed25519-amd64-asm/heap_rootreplaced_3limbs.o ext/ed25519-amd64-asm/sc25519_add.o ext/ed25519-amd64-asm/sc25519_barrett.o ext/ed25519-amd64-asm/sc25519_lt.o ext/ed25519-amd64-asm/sc25519_sub_nored.o ext/ed25519-amd64-asm/ull4_mul.o ext/ed25519-amd64-asm/fe25519_getparity.o ext/ed25519-amd64-asm/fe25519_invert.o ext/ed25519-amd64-asm/fe25519_iseq.o ext/ed25519-amd64-asm/fe25519_iszero.o ext/ed25519-amd64-asm/fe25519_neg.o ext/ed25519-amd64-asm/fe25519_pack.o ext/ed25519-amd64-asm/fe25519_pow2523.o ext/ed25519-amd64-asm/fe25519_setint.o ext/ed25519-amd64-asm/fe25519_unpack.o ext/ed25519-amd64-asm/ge25519_add.o ext/ed25519-amd64-asm/ge25519_base.o ext/ed25519-amd64-asm/ge25519_double.o ext/ed25519-amd64-asm/ge25519_double_scalarmult.o ext/ed25519-amd64-asm/ge25519_isneutral.o ext/ed25519-amd64-asm/ge25519_multi_scalarmult.o ext/ed25519-amd64-asm/ge25519_pack.o ext/ed25519-amd64-asm/ge25519_scalarmult_base.o ext/ed25519-amd64-asm/ge25519_unpackneg.o ext/ed25519-amd64-asm/hram.o ext/ed25519-amd64-asm/index_heap.o ext/ed25519-amd64-asm/sc25519_from32bytes.o ext/ed25519-amd64-asm/sc25519_from64bytes.o ext/ed25519-amd64-asm/sc25519_from_shortsc.o ext/ed25519-amd64-asm/sc25519_iszero.o ext/ed25519-amd64-asm/sc25519_mul.o ext/ed25519-amd64-asm/sc25519_mul_shortsc.o ext/ed25519-amd64-asm/sc25519_slide.o ext/ed25519-amd64-asm/sc25519_to32bytes.o ext/ed25519-amd64-asm/sc25519_window4.o ext/ed25519-amd64-asm/sign.o
-endif
-ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1)
-	override DEFS+=-DZT_USE_ARM32_NEON_ASM_SALSA2012
-	override CORE_OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o
-endif
-
-# Position Independence
-override CFLAGS+=-fPIC -fPIE
-override CXXFLAGS+=-fPIC -fPIE
-
-# Non-executable stack
-override LDFLAGS+=-Wl,-z,noexecstack
-
-.PHONY: all
 all:	one
 
-.PHONY: one
-one: otel zerotier-one zerotier-idtool zerotier-cli
-
-from_builder:	FORCE
+one:	$(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o $(LDLIBS)
+	$(STRIP) zerotier-one
 	ln -sf zerotier-one zerotier-idtool
 	ln -sf zerotier-one zerotier-cli
 
-zerotier-one: $(CORE_OBJS) $(ONE_OBJS) one.o ext/${OTEL_INSTALL_DIR}/include/opentelemetry/version.h
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LDLIBS)
+netcon: $(OBJS)
+	rm -f *.o
+	# Need to selectively rebuild one.cpp and OneService.cpp with ZT_SERVICE_NETCON and ZT_ONE_NO_ROOT_CHECK defined, and also NetconEthernetTap
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -DZT_SERVICE_NETCON -DZT_ONE_NO_ROOT_CHECK -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -o zerotier-netcon-service $(OBJS) service/OneService.cpp netcon/NetconEthernetTap.cpp one.cpp -x c netcon/RPC.c $(LDLIBS) -ldl
+	# Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
+	cd netcon ; make -f make-liblwip.mk
+	# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
+	cd netcon ; gcc -g -O2 -Wall -std=c99 -fPIC -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libzerotierintercept.so Intercept.c RPC.c -ldl
+	cp netcon/libzerotierintercept.so libzerotierintercept.so
+	ln -sf zerotier-netcon-service zerotier-cli
+	ln -sf zerotier-netcon-service zerotier-idtool
 
-zerotier-idtool: zerotier-one
-	ln -sf zerotier-one zerotier-idtool
+selftest:	$(OBJS) selftest.o
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LDLIBS)
+	$(STRIP) zerotier-selftest
 
-zerotier-cli: zerotier-one
-	ln -sf zerotier-one zerotier-cli
-
-$(ONE_OBJS): zeroidc smeeclient
-
-libzerotiercore.a:	FORCE
-	make CFLAGS="-O3 -fstack-protector -fPIC" CXXFLAGS="-O3 -std=c++17 -fstack-protector -fPIC" $(CORE_OBJS)
-	ar rcs libzerotiercore.a $(CORE_OBJS)
-	ranlib libzerotiercore.a
-
-core: libzerotiercore.a
-
-selftest:	$(CORE_OBJS) $(ONE_OBJS) selftest.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(CORE_OBJS) $(ONE_OBJS) $(LDLIBS)
-
-zerotier-selftest: selftest
-
-manpages:	FORCE
-	cd doc ; ./build.sh
-
-doc:	manpages
-
-ifeq (${ZT_OTEL},1)
-otel:
-	cd ext/opentelemetry-cpp-1.21.0 && mkdir -p localinstall && cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(shell pwd)/ext/opentelemetry-cpp-1.21.0/localinstall -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TESTING=OFF -DOPENTELEMETRY_INSTALL=ON -DWITH_BENCHMARK=OFF -DWITH_EXAMPLES=OFF -DWITH_FUNC_TESTS=OFF -DUSE_THIRDPARTY_LIBRARIES=ON -DWITH_OTLP_GRPC=ON -DWITH_OTLP_HTTP=OFF -DWITH_PROMETHEUS=OFF
-	cd ext/opentelemetry-cpp-1.21.0/build && make -j4 install
-else
-otel:
-	@echo "OpenTelemetry exporter not enabled, skipping build."
-endif
-
-ext/${OTEL_INSTALL_DIR}/include/opentelemetry/version.h: otel
+installer: one FORCE
+	./ext/installfiles/linux/buildinstaller.sh
 
 clean: FORCE
-	rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp docker/zerotier-one rustybits/target ext/opentelemetry-cpp-${OTEL_VERSION}/localinstall ext/opentelemetry-cpp-${OTEL_VERSION}/build
-
-distclean:	clean
-
-realclean:	distclean
-
-official:	FORCE
-	make -j`nproc` ZT_OFFICIAL=1 all
-
-docker:	FORCE
-	docker build --no-cache -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized .
-
-_buildx:
-	@echo "docker buildx create"
-	# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-	docker run --privileged --rm tonistiigi/binfmt --install all
-	@echo docker buildx create --name multiarch --driver docker-container --use
-	@echo docker buildx inspect --bootstrap
-
-central-controller:	FORCE
-	make ZT_OTEL=1 otel && ZT_OTEL=1 make -j4 ZT_CONTROLLER=1  one
-
-central-controller-docker: _buildx FORCE
-	docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=`git name-rev --name-only HEAD` . --push
-	@echo Image: registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP}
-
-centralv2-controller-docker: _buildx FORCE
-	docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:$(shell git rev-parse --short HEAD) -f ext/central-controller-docker/Dockerfile --build-arg git_branch=`git name-rev --name-only HEAD` . --push
-	@echo Image: us-central1-docker.pkg.dev/zerotier-421eb9/docker-images/ztcentral-controller:$(shell git rev-parse --short HEAD)
+	rm -rf ${GENERATED_FILES} *.so *.o netcon/*.a node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest zerotier-netcon-service build-* ZeroTierOneInstaller-* *.deb *.rpm .depend netcon/.depend
+	find netcon -type f \( -name '*.o' -o -name '*.so' -o -name '*.1.0' -o -name 'zerotier-one' -o -name 'zerotier-cli' -o -name 'zerotier-netcon-service' \) -delete
+	find netcon/docker-test -name "zerotier-intercept" -type f -delete
 
 debug:	FORCE
 	make ZT_DEBUG=1 one
 	make ZT_DEBUG=1 selftest
 
-ifeq ($(ZT_SSO_SUPPORTED), 1)
-ifeq ($(ZT_EMBEDDED),)
-zeroidc:	FORCE
-	export PATH=/${HOME}/.cargo/bin:$$PATH; cd rustybits && cargo build $(ZT_CARGO_FLAGS) -p zeroidc
-endif
-else
-zeroidc:
-endif
+official: FORCE
+	make ZT_OFFICIAL_RELEASE=1 clean
+	make -j 4 ZT_OFFICIAL_RELEASE=1 one
+	make ZT_OFFICIAL_RELEASE=1 installer
+	make ZT_OFFICIAL_RELEASE=1 doc
 
-ifeq ($(ZT_CONTROLLER), 1)
-smeeclient:	FORCE
-	export PATH=/${HOME}/.cargo/bin:$$PATH; cd rustybits && cargo build $(ZT_CARGO_FLAGS) -p smeeclient
-else
-smeeclient:
-endif
-
-# Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these
-# provide backward compatibility with old releases where the binaries actually
-# lived here. Folks got scripts.
-
-install:	FORCE
-	mkdir -p $(DESTDIR)/usr/sbin
-	rm -f $(DESTDIR)/usr/sbin/zerotier-one
-	cp -f zerotier-one $(DESTDIR)/usr/sbin/zerotier-one
-	rm -f $(DESTDIR)/usr/sbin/zerotier-cli
-	rm -f $(DESTDIR)/usr/sbin/zerotier-idtool
-	ln -s zerotier-one $(DESTDIR)/usr/sbin/zerotier-cli
-	ln -s zerotier-one $(DESTDIR)/usr/sbin/zerotier-idtool
-	mkdir -p $(DESTDIR)/var/lib/zerotier-one
-	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one
-	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
-	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
-	ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-one
-	ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
-	ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
-	mkdir -p $(DESTDIR)/usr/share/man/man8
-	rm -f $(DESTDIR)/usr/share/man/man8/zerotier-one.8.gz
-	cat doc/zerotier-one.8 | gzip -9 >$(DESTDIR)/usr/share/man/man8/zerotier-one.8.gz
-	mkdir -p $(DESTDIR)/usr/share/man/man1
-	rm -f $(DESTDIR)/usr/share/man/man1/zerotier-idtool.1.gz
-	rm -f $(DESTDIR)/usr/share/man/man1/zerotier-cli.1.gz
-	cat doc/zerotier-cli.1 | gzip -9 >$(DESTDIR)/usr/share/man/man1/zerotier-cli.1.gz
-	cat doc/zerotier-idtool.1 | gzip -9 >$(DESTDIR)/usr/share/man/man1/zerotier-idtool.1.gz
-	cp ext/installfiles/linux/zerotier-one.te $(DESTDIR)/var/lib/zerotier-one/zerotier-one.te
-
-# Uninstall preserves identity.public and identity.secret since the user might
-# want to save these. These are your ZeroTier address.
-
-uninstall:	FORCE
-	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one
-	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
-	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
-	rm -f $(DESTDIR)/usr/sbin/zerotier-cli
-	rm -f $(DESTDIR)/usr/sbin/zerotier-idtool
-	rm -f $(DESTDIR)/usr/sbin/zerotier-one
-	rm -rf $(DESTDIR)/var/lib/zerotier-one/iddb.d
-	rm -rf $(DESTDIR)/var/lib/zerotier-one/updates.d
-	rm -rf $(DESTDIR)/var/lib/zerotier-one/networks.d
-	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one.port
-	rm -f $(DESTDIR)/usr/share/man/man8/zerotier-one.8.gz
-	rm -f $(DESTDIR)/usr/share/man/man1/zerotier-idtool.1.gz
-	rm -f $(DESTDIR)/usr/share/man/man1/zerotier-cli.1.gz
-
-# These are just for convenience for building Linux packages
-
-echo_flags:
-	@echo "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~"
-	@echo "echo_flags :: CC=$(CC)"
-	@echo "echo_flags :: CXX=$(CXX)"
-	@echo "echo_flags :: CFLAGS=$(CFLAGS)"
-	@echo "echo_flags :: CXXFLAGS=$(CXXFLAGS)"
-	@echo "echo_flags :: LDFLAGS=$(LDFLAGS)"
-	@echo "echo_flags :: RUSTFLAGS=$(RUSTFLAGS)"
-	@echo "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~"
-
-debian: echo_flags
-	@echo "building deb package"
-	debuild --no-lintian -I -i -us -uc -nc -b
-	# debuild --no-lintian -b -uc -us
-
-# debian:	FORCE
-# 	debuild --no-lintian -I -i -us -uc -nc -b
-
-debian-clean: FORCE
-	rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp
-
-redhat:
-	@echo "building rpm package"
-	rpmbuild --target `rpm -q bash --qf "%{arch}"` -ba zerotier-one.spec
-
-# This installs the packages needed to build ZT locally on CentOS 7 and
-# is here largely for documentation purposes.
-centos-7-setup: FORCE
-	yum install -y gcc gcc-c++ make epel-release git
-	yum install -y centos-release-scl
-	yum install -y devtoolset-8-gcc devtoolset-8-gcc-c++
-
-snap-build-local: FORCE
-	snapcraft
-
-snap-install: FORCE
-	snap install zerotier_`git describe --tags --abbrev=0`_${SNAP_ARCH}.snap --dangerous
-
-snap-uninstall: FORCE
-	snap remove zerotier
-
-snap-build-remote: FORCE
-	cd pkg && snapcraft remote-build --build-for=amd64,arm64,s390x,ppc64el,armhf,i386
-
-snap-upload: ./pkg/*.snap
-	for file in $^ ; do \
-		snapcraft upload --release=beta,edge,candidate $${file} ; \
-	done
-
-synology-pkg: FORCE
-	cd pkg/synology ; ./build.sh build
-
-synology-docker: FORCE
-	cd pkg/synology/dsm7-docker/; ./build.sh build-and-push
-
-munge_rpm:
-	@:$(call check_defined, VERSION)
-	@echo "Updating rpm spec to $(VERSION)"
-	ci/scripts/munge_rpm_spec.sh zerotier-one.spec $(VERSION) "Adam Ierymenko <adam.ierymenko@zerotier.com>" "see https://github.com/zerotier/ZeroTierOne for release notes"
-
-munge_deb:
-	@:$(call check_defined, VERSION)
-	@echo "Updating debian/changelog to $(VERSION)"
-	ci/scripts/munge_debian_changelog.sh debian/changelog $(VERSION) "Adam Ierymenko <adam.ierymenko@zerotier.com>" "see https://github.com/zerotier/ZeroTierOne for release notes"
+# Includes 'doc' target
+include ${DOC_DIR}/module.mk
 
 FORCE:
diff --git a/make-mac.mk b/make-mac.mk
index 69bdf7d7f..5987aed5a 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -1,245 +1,121 @@
-CC=clang
-CXX=clang++
-TOPDIR=$(shell pwd)
+ifeq ($(origin CC),default)
+	CC=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi)
+endif
+ifeq ($(origin CXX),default)
+	CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi)
+endif
 
-INCLUDES=-I$(shell pwd)/rustybits/target -isystem $(TOPDIR)/ext  -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/core/include -I$(TOPDIR)/ext-prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/simpleapi/include
+INCLUDES=
 DEFS=
 LIBS=
-ARCH_FLAGS=-arch x86_64 -arch arm64 
+ARCH_FLAGS=-arch x86_64
 
+include objects.mk
+OBJS+=osdep/OSXEthernetTap.o
+
+# Disable codesign since open source users will not have ZeroTier's certs
 CODESIGN=echo
 PRODUCTSIGN=echo
 CODESIGN_APP_CERT=
 CODESIGN_INSTALLER_CERT=
-NOTARIZE=echo
-NOTARIZE_APPLE_ID=null
-NOTARIZE_TEAM_ID=null
 
-ZT_BUILD_PLATFORM=3
-ZT_BUILD_ARCHITECTURE=2
-ZT_VERSION_MAJOR=$(shell cat version.h | grep -F VERSION_MAJOR | cut -d ' ' -f 3)
-ZT_VERSION_MINOR=$(shell cat version.h | grep -F VERSION_MINOR | cut -d ' ' -f 3)
-ZT_VERSION_REV=$(shell cat version.h | grep -F VERSION_REVISION | cut -d ' ' -f 3)
-ZT_VERSION_BUILD=$(shell cat version.h | grep -F VERSION_BUILD | cut -d ' ' -f 3)
+# Build with libminiupnpc by default for Mac
+ZT_USE_MINIUPNPC?=1
 
-# for central controller builds
-TIMESTAMP=$(shell date +"%Y%m%d%H%M")
-
-DEFS+=-DZT_BUILD_PLATFORM=$(ZT_BUILD_PLATFORM) -DZT_BUILD_ARCHITECTURE=$(ZT_BUILD_ARCHITECTURE)
-
-include objects.mk
-ONE_OBJS+=osdep/MacEthernetTap.o osdep/MacKextEthernetTap.o osdep/MacDNSHelper.o ext/http-parser/http_parser.o
-LIBS+=-framework CoreServices -framework SystemConfiguration -framework CoreFoundation -framework Security
-
-# Official releases are signed with our Apple cert and apply software updates by default
+# For internal use only -- signs everything with ZeroTier's developer cert
 ifeq ($(ZT_OFFICIAL_RELEASE),1)
-	DEFS+=-DZT_SOFTWARE_UPDATE_DEFAULT="\"apply\""
+	DEFS+=-DZT_OFFICIAL_RELEASE -DZT_AUTO_UPDATE
 	ZT_USE_MINIUPNPC=1
 	CODESIGN=codesign
 	PRODUCTSIGN=productsign
-	CODESIGN_APP_CERT="Developer ID Application: ZeroTier, Inc (8ZD9JUCZ4V)"
-	CODESIGN_INSTALLER_CERT="Developer ID Installer: ZeroTier, Inc (8ZD9JUCZ4V)"
-	NOTARIZE=xcrun notarytool
-	NOTARIZE_APPLE_ID="adam.ierymenko@gmail.com"
-	NOTARIZE_TEAM_ID="8ZD9JUCZ4V"
-else
-	DEFS+=-DZT_SOFTWARE_UPDATE_DEFAULT="\"download\""
+	CODESIGN_APP_CERT="Developer ID Application: ZeroTier Networks LLC (8ZD9JUCZ4V)"
+	CODESIGN_INSTALLER_CERT="Developer ID Installer: ZeroTier Networks LLC (8ZD9JUCZ4V)"
 endif
 
-# Use fast ASM Salsa20/12 for x64 processors
-DEFS+=-DZT_USE_X64_ASM_SALSA2012
-CORE_OBJS+=ext/x64-salsa2012-asm/salsa2012.o
-CXXFLAGS=$(CFLAGS) -std=c++17 -stdlib=libc++
-
-# Build miniupnpc and nat-pmp as included libraries -- extra defs are required for these sources
-DEFS+=-DMACOSX -DZT_SSO_SUPPORTED -DZT_USE_MINIUPNPC -DMINIUPNP_STATICLIB -D_DARWIN_C_SOURCE -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -DOS_STRING=\"Darwin/15.0.0\" -DMINIUPNPC_VERSION_STRING=\"2.0\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR
-ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o osdep/PortMapper.o
-ifeq ($(ZT_CONTROLLER),1)
-	MACOS_VERSION_MIN=10.15
-	override CXXFLAGS=$(CFLAGS) -std=c++17 -stdlib=libc++
-	LIBS+=-L/opt/homebrew/lib -L/usr/local/opt/libpqxx/lib -L/usr/local/opt/libpq/lib -L/usr/local/opt/openssl/lib/ -lpqxx -lpq -lssl -lcrypto -lgssapi_krb5 ext/redis-plus-plus-1.1.1/install/macos/lib/libredis++.a ext/hiredis-0.14.1/lib/macos/libhiredis.a rustybits/target/libsmeeclient.a
-	DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER_USE_REDIS -DZT_CONTROLLER 
-	INCLUDES+=-I/opt/homebrew/include -I/opt/homebrew/opt/libpq/include -I/usr/local/opt/libpq/include -I/usr/local/opt/libpqxx/include -Iext/hiredis-0.14.1/include/ -Iext/redis-plus-plus-1.1.1/install/macos/include/sw/ -Irustybits/target/
-else
-	MACOS_VERSION_MIN=10.13
+# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support
+ifeq ($(ZT_ENABLE_CLUSTER),1)
+	DEFS+=-DZT_ENABLE_CLUSTER
 endif
 
-# Build with address sanitization library for advanced debugging (clang)
-ifeq ($(ZT_SANITIZE),1)
-	DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
+ifeq ($(ZT_AUTO_UPDATE),1)
+	DEFS+=-DZT_AUTO_UPDATE
 endif
-ifeq ($(ZT_DEBUG_TRACE),1)
-	DEFS+=-DZT_DEBUG_TRACE
+
+ifeq ($(ZT_USE_MINIUPNPC),1)
+	DEFS+=-DMACOSX -DZT_USE_MINIUPNPC -DMINIUPNP_STATICLIB -D_DARWIN_C_SOURCE -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -DOS_STRING=\"Darwin/15.0.0\" -DMINIUPNPC_VERSION_STRING=\"1.9\" -DUPNP_VERSION_STRING=\"UPnP/1.1\" -DENABLE_STRNATPMPERR
+	OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o osdep/PortMapper.o
 endif
+
+# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller
+ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
+	DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
+	LIBS+=-L/usr/local/lib -lsqlite3
+	OBJS+=controller/SqliteNetworkController.o
+endif
+
 # Debug mode -- dump trace output, build binary with -g
 ifeq ($(ZT_DEBUG),1)
-	ZT_TRACE=1
-	ARCH_FLAGS=
-	CFLAGS+=-Wall -g $(INCLUDES) $(DEFS) $(ARCH_FLAGS)
+	DEFS+=-DZT_TRACE
+	CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
 	STRIP=echo
-	EXTRA_CARGO_FLAGS=
-	RUST_VARIANT=debug
 	# The following line enables optimization for the crypto code, since
 	# C25519 in particular is almost UNUSABLE in heavy testing without it.
-node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g $(INCLUDES) $(DEFS)
+ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
 else
-	CFLAGS?=-O3 -fstack-protector-strong
-	CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
+	CFLAGS?=-Ofast -fstack-protector
+	CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -pthread -mmacosx-version-min=10.7 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
 	STRIP=strip
-	EXTRA_CARGO_FLAGS=--release
-	RUST_VARIANT=release
 endif
 
-ifeq ($(ZT_TRACE),1)
-	DEFS+=-DZT_TRACE
-endif
-
-ifeq ($(ZT_DEBUG),1)
-	DEFS+=-DZT_DEBUG
-endif
-
-ifeq ($(ZT_VAULT_SUPPORT),1)
-	DEFS+=-DZT_VAULT_SUPPORT=1
-	LIBS+=-lcurl
-endif
-
-OTEL_VERSION=1.21.0
-ifeq (${ZT_OTEL},1)
-	OTEL_INSTALL_DIR=ext/opentelemetry-cpp-${OTEL_VERSION}/localinstall
-	DEFS+=-DZT_OTEL
-	INCLUDES+=-I${OTEL_INSTALL_DIR}/include
-	LIBS+=-L${OTEL_INSTALL_DIR}/lib -lopentelemetry_exporter_in_memory_metric -lopentelemetry_exporter_in_memory -lopentelemetry_exporter_ostream_logs -lopentelemetry_exporter_ostream_metrics -lopentelemetry_exporter_ostream_span -lopentelemetry_trace -lopentelemetry_common -lopentelemetry_resources -lopentelemetry_logs -lopentelemetry_metrics -lopentelemetry_version
-else
-	OTEL_INSTALL_DIR=ext/opentelemetry-cpp-api-only
-	INCLUDES+=-I${OTEL_INSTALL_DIR}/include
-endif
+CXXFLAGS=$(CFLAGS) -fno-rtti
 
 all: one
 
-ext/x64-salsa2012-asm/salsa2012.o:
-	as -arch x86_64 -mmacosx-version-min=$(MACOS_VERSION_MIN) -o ext/x64-salsa2012-asm/salsa2012.o ext/x64-salsa2012-asm/salsa2012.s
-
-mac-agent: FORCE
-	$(CC) -O3 $(ARCH_FLAGS) -mmacosx-version-min=$(MACOS_VERSION_MIN) -o MacEthernetTapAgent osdep/MacEthernetTapAgent.c
-	$(CODESIGN) -f --options=runtime -s $(CODESIGN_APP_CERT) MacEthernetTapAgent
-
-osdep/MacDNSHelper.o: osdep/MacDNSHelper.mm
-	$(CXX) $(CXXFLAGS) -c osdep/MacDNSHelper.mm -o osdep/MacDNSHelper.o 
-
-ifeq ($(ZT_CONTROLLER),1)
-one:	otel zeroidc smeeclient $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent 
-else
-one:	otel zeroidc $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent 
-endif
-	$(CXX) $(CXXFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LIBS) rustybits/target/libzeroidc.a
-	# $(STRIP) zerotier-one
+one:	$(OBJS) service/OneService.o one.o
+	$(CXX) $(CXXFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o $(LIBS)
+	$(STRIP) zerotier-one
 	ln -sf zerotier-one zerotier-idtool
 	ln -sf zerotier-one zerotier-cli
-	$(CODESIGN) -f --options=runtime -s $(CODESIGN_APP_CERT) zerotier-one
+	$(CODESIGN) -f -s $(CODESIGN_APP_CERT) zerotier-one
+	$(CODESIGN) -vvv zerotier-one
 
-zerotier-one: one
+netcon: $(OBJS)
+	rm -f *.o
+	# Need to selectively rebuild one.cpp and OneService.cpp with ZT_SERVICE_NETCON and ZT_ONE_NO_ROOT_CHECK defined, and also NetconEthernetTap
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -DZT_SERVICE_NETCON -DZT_ONE_NO_ROOT_CHECK -Iext/lwip/src/include -Iext/lwip/src/include/ipv4 -Iext/lwip/src/include/ipv6 -o zerotier-netcon-service $(OBJS) service/OneService.cpp netcon/NetconEthernetTap.cpp one.cpp -x c netcon/RPC.c $(LDLIBS) -ldl
+	# Build netcon/liblwip.so which must be placed in ZT home for zerotier-netcon-service to work
+	cd netcon ; make -f make-liblwip.mk
+	# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
+	cd netcon ; gcc -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -nostdlib -shared -o libzerotierintercept.so Intercept.c RPC.c -ldl
+	cp netcon/libzerotierintercept.so libzerotierintercept.so
+	ln -sf zerotier-netcon-service zerotier-cli
+	ln -sf zerotier-netcon-service zerotier-idtool
 
-zeroidc: rustybits/target/libzeroidc.a
-
-ifeq ($(ZT_CONTROLLER),1)
-smeeclient: rustybits/target/libsmeeclient.a
-
-rustybits/target/libsmeeclient.a:	FORCE
-	cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p smeeclient --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS)
-	cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p smeeclient --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS)
-	cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libsmeeclient.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libsmeeclient.a -output target/libsmeeclient.a
-endif
-
-rustybits/target/libzeroidc.a:	FORCE
-	cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS)
-	cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS)
-	cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a
-
-central-controller:
-	make ARCH_FLAGS="-arch x86_64" ZT_CONTROLLER=1 one
-
-zerotier-idtool: one
-
-zerotier-cli: one
-
-$(ONE_OBJS): zeroidc
-
-libzerotiercore.a:	$(CORE_OBJS)
-	ar rcs libzerotiercore.a $(CORE_OBJS)
-	ranlib libzerotiercore.a
-
-core: libzerotiercore.a
-
-#cli:	FORCE
-#	$(CXX) $(CXXFLAGS) -o zerotier cli/zerotier.cpp osdep/OSUtils.cpp node/InetAddress.cpp node/Utils.cpp node/Salsa20.cpp node/Identity.cpp node/SHA512.cpp node/C25519.cpp -lcurl
-#	$(STRIP) zerotier
-
-selftest: $(CORE_OBJS) $(ONE_OBJS) selftest.o
-	$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(CORE_OBJS) $(ONE_OBJS) $(LIBS) rustybits/target/libzeroidc.a
+selftest: $(OBJS) selftest.o
+	$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS)
 	$(STRIP) zerotier-selftest
 
-zerotier-selftest: selftest
-
-# Make compile_commands.json for clangd editor extensions. Probably works on Linux too.
-compile_commands: FORCE
-	compiledb make ZT_DEBUG=1
-
 # Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html
 mac-dist-pkg: FORCE
 	packagesbuild "ext/installfiles/mac/ZeroTier One.pkgproj"
 	rm -f "ZeroTier One Signed.pkg"
 	$(PRODUCTSIGN) --sign $(CODESIGN_INSTALLER_CERT) "ZeroTier One.pkg" "ZeroTier One Signed.pkg"
 	if [ -f "ZeroTier One Signed.pkg" ]; then mv -f "ZeroTier One Signed.pkg" "ZeroTier One.pkg"; fi
-	rm -f zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_*
-	cat ext/installfiles/mac-update/updater.tmpl.sh "ZeroTier One.pkg" >zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_$(ZT_VERSION_MAJOR).$(ZT_VERSION_MINOR).$(ZT_VERSION_REV)_$(ZT_VERSION_BUILD).exe
-	$(NOTARIZE) submit --apple-id "adam.ierymenko@gmail.com" --team-id "8ZD9JUCZ4V" --wait "ZeroTier One.pkg"
-	echo '*** When Apple notifies that the app is notarized, run: xcrun stapler staple "ZeroTier One.pkg"'
 
-# For ZeroTier, Inc. to build official signed packages
+# For internal use only
 official: FORCE
-	cd ../DesktopUI ; make ZT_OFFICIAL_RELEASE=1
-	make clean
-	make ZT_OFFICIAL_RELEASE=1 -j 8 one
+	make ZT_OFFICIAL_RELEASE=1 clean
+	make -j 4 ZT_OFFICIAL_RELEASE=1
 	make ZT_OFFICIAL_RELEASE=1 mac-dist-pkg
 
-_buildx:
-	@echo "docker buildx create"
-	# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-	docker run --privileged --rm tonistiigi/binfmt --install all
-	@echo docker buildx create --name multiarch --driver docker-container --use
-	@echo docker buildx inspect --bootstrap
-
-controller-builder: _buildx FORCE
-	docker buildx build --platform linux/arm64,linux/amd64 --no-cache -t registry.zerotier.com/zerotier/ctlbuild:latest -f ext/central-controller-docker/Dockerfile.builder . --push
-
-controller-run: _buildx FORCE
-	docker buildx build --platform linux/arm64,linux/amd64 --no-cache -t registry.zerotier.com/zerotier-central/ctlrun:latest -f ext/central-controller-docker/Dockerfile.run_base . --push
-
-central-controller-docker: _buildx FORCE
-	docker buildx build --platform linux/arm64,linux/amd64 --no-cache -t registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=$(shell git name-rev --name-only HEAD) . --push
-	@echo Image: registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP}
-
-centralv2-controller-docker: _buildx FORCE
-	docker buildx build --platform linux/amd64,linux/arm64 --no-cache -t us-central1-docker.pkg.dev/zerotier-d648c7/central-v2/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile --build-arg git_branch=`git name-rev --name-only HEAD` . --push
-	@echo Image: us-central1-docker.pkg.dev/zerotier-d648c7/central-v2/ztcentral-controller:${TIMESTAMP} 
-
-docker-release:	_buildx
-	docker buildx build --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x -t zerotier/zerotier:${RELEASE_DOCKER_TAG} -t zerotier/zerotier:latest --build-arg VERSION=${RELEASE_VERSION} -f Dockerfile.release . --push
-	
 clean:
-	rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_* rustybits/target/ ext/opentelemetry-cpp-${OTEL_VERSION}/localinstall ext/opentelemetry-cpp-${OTEL_VERSION}/build
+	rm -rf netcon/*.so *.dSYM build-* *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* mkworld
 
-ifeq (${ZT_OTEL},1)
-otel:
-	cd ext/opentelemetry-cpp-1.21.0 && mkdir -p localinstall && cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(shell pwd)/ext/opentelemetry-cpp-1.21.0/localinstall -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOS_VERSION_MIN} -DBUILD_TESTING=OFF -DOPENTELEMETRY_INSTALL=ON -DWITH_BENCHMARK=OFF -DWITH_EXAMPLES=OFF -DWITH_FUNC_TESTS=OFF
-	cd ext/opentelemetry-cpp-1.21.0/build && make install
-else
-otel:
-	@echo "OpenTelemetry Exporter not enabled, skipping build."
-endif
-
-distclean:	clean
-
-realclean:	clean
+# For those building from source -- installs signed binary tap driver in system ZT home
+install-mac-tap: FORCE
+	mkdir -p /Library/Application\ Support/ZeroTier/One
+	rm -rf /Library/Application\ Support/ZeroTier/One/tap.kext
+	cp -R ext/bin/tap-mac/tap.kext /Library/Application\ Support/ZeroTier/One
+	chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext
 
 FORCE:
diff --git a/make-netbsd.mk b/make-netbsd.mk
deleted file mode 100644
index f2490038b..000000000
--- a/make-netbsd.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-CC=gcc
-CXX=g++
-
-INCLUDES=
-DEFS=
-LIBS=
-
-include objects.mk
-OBJS+=osdep/NetBSDEthernetTap.o ext/lz4/lz4.o ext/json-parser/json.o ext/http-parser/http_parser.o
-
-# "make official" is a shortcut for this
-ifeq ($(ZT_OFFICIAL_RELEASE),1)
-	DEFS+=-DZT_OFFICIAL_RELEASE
-endif
-
-# Build with ZT_ENABLE_CLUSTER=1 to build with cluster support
-ifeq ($(ZT_ENABLE_CLUSTER),1)
-	DEFS+=-DZT_ENABLE_CLUSTER
-endif
-
-# "make debug" is a shortcut for this
-ifeq ($(ZT_DEBUG),1)
-	DEFS+=-DZT_TRACE
-	CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
-	LDFLAGS+=
-	STRIP=echo
-	# The following line enables optimization for the crypto code, since
-	# C25519 in particular is almost UNUSABLE in heavy testing without it.
-ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS)
-else
-	CFLAGS?=-O3 -fstack-protector
-	CFLAGS+=-fPIE -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
-	LDFLAGS+=-pie -Wl,-z,relro,-z,now
-	STRIP=strip --strip-all
-endif
-
-CXXFLAGS+=$(CFLAGS) -fno-rtti -fpermissive
-
-all:	one
-
-one:	$(OBJS) service/OneService.o one.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS)  -o zerotier-one $(OBJS) service/OneService.o one.o $(LIBS)
-	$(STRIP) zerotier-one
-	ln -sf zerotier-one zerotier-idtool
-	ln -sf zerotier-one zerotier-cli
-
-selftest:	$(OBJS) selftest.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS)
-	$(STRIP) zerotier-selftest
-
-# No installer on FreeBSD yet
-#installer: one FORCE
-#	./buildinstaller.sh
-
-clean:
-	rm -rf *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-*
-
-debug:	FORCE
-	make -j 4 ZT_DEBUG=1
-
-#official: FORCE
-#	make -j 4 ZT_OFFICIAL_RELEASE=1
-#	./buildinstaller.sh
-
-FORCE:
diff --git a/netcon/Intercept.c b/netcon/Intercept.c
new file mode 100644
index 000000000..48276c966
--- /dev/null
+++ b/netcon/Intercept.c
@@ -0,0 +1,576 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifdef USE_GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <dlfcn.h>
+#include <strings.h>
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <pwd.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <netdb.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/poll.h>
+#include <sys/un.h>
+#include <arpa/inet.h>
+#include <sys/resource.h>
+
+#if defined(__linux__)
+  #include <linux/errno.h>
+  #include <sys/syscall.h>
+  #include <linux/net.h> /* for NPROTO */
+#endif
+
+#if defined(__linux__)
+  #define SOCK_MAX (SOCK_PACKET + 1)
+#endif
+#define SOCK_TYPE_MASK 0xf
+
+#include "Intercept.h"
+#include "RPC.h"
+#include "common.inc.c"
+
+/*------------------------------------------------------------------------------
+------------------- Intercept<--->Service Comm mechanisms ----------------------
+------------------------------------------------------------------------------*/
+
+static char *netpath = (char *)0;
+
+/* Check whether the socket is mapped to the service or not. We
+need to know if this is a regular AF_LOCAL socket or an end of a socketpair
+that the service uses. We don't want to keep state in the intercept, so
+we simply ask the service via an RPC */
+
+static int connected_to_service(int sockfd)
+{
+  dwr(MSG_DEBUG,"connected_to_service():\n");
+  socklen_t len;
+  struct sockaddr_storage addr;
+  len = sizeof addr;
+  struct sockaddr_un * addr_un;
+  getpeername(sockfd, (struct sockaddr*)&addr, &len);
+  if (addr.ss_family == AF_LOCAL || addr.ss_family == AF_LOCAL) {
+    addr_un = (struct sockaddr_un*)&addr;
+    if(strcmp(addr_un->sun_path, netpath) == 0) {
+      dwr(MSG_DEBUG,"connected_to_service(): Yes, %s\n", addr_un->sun_path);
+      return 1;
+    }
+  }
+  dwr(MSG_DEBUG,"connected_to_service(): Not connected to service\n");
+  return 0;
+}
+
+/* get symbols and initialize mutexes */
+static int set_up_intercept()
+{
+  if (!realconnect) {
+
+#if defined(__linux__)
+    realaccept4 = dlsym(RTLD_NEXT, "accept4");
+    realsyscall = dlsym(RTLD_NEXT, "syscall");
+#endif
+    realconnect = dlsym(RTLD_NEXT, "connect");
+    realbind = dlsym(RTLD_NEXT, "bind");
+    realaccept = dlsym(RTLD_NEXT, "accept");
+    reallisten = dlsym(RTLD_NEXT, "listen");
+    realsocket = dlsym(RTLD_NEXT, "socket");
+    realbind = dlsym(RTLD_NEXT, "bind");
+    realsetsockopt = dlsym(RTLD_NEXT, "setsockopt");
+    realgetsockopt = dlsym(RTLD_NEXT, "getsockopt");
+    realclose = dlsym(RTLD_NEXT, "close");
+    realgetsockname = dlsym(RTLD_NEXT, "getsockname");
+  }
+  if (!netpath) {
+    netpath = getenv("ZT_NC_NETWORK");
+    if (!netpath)
+      return 0;
+    dwr(MSG_DEBUG,"Connecting to service at: %s\n", netpath);
+    /* Hook/intercept Posix net API symbols */
+    rpc_mutex_init();
+  }
+  return 1;
+}
+
+/*------------------------------------------------------------------------------
+--------------------------------- setsockopt() ---------------------------------
+------------------------------------------------------------------------------*/
+
+/* int socket, int level, int option_name, const void *option_value, socklen_t option_len */
+int setsockopt(SETSOCKOPT_SIG)
+{
+  if (!set_up_intercept())
+    return realsetsockopt(socket, level, option_name, option_value, option_len);
+
+  dwr(MSG_DEBUG,"setsockopt(%d)\n", socket);
+#if defined(__linux__)
+  if(level == SOL_IPV6 && option_name == IPV6_V6ONLY)
+    return 0;
+  if(level == SOL_IP && (option_name == IP_TTL || option_name == IP_TOS))
+    return 0;
+#endif
+  if(level == IPPROTO_TCP || (level == SOL_SOCKET && option_name == SO_KEEPALIVE))
+    return 0;
+  if(realsetsockopt(socket, level, option_name, option_value, option_len) < 0)
+    perror("setsockopt():\n");
+  return 0;
+}
+
+/*------------------------------------------------------------------------------
+--------------------------------- getsockopt() ---------------------------------
+------------------------------------------------------------------------------*/
+
+/* int sockfd, int level, int optname, void *optval, socklen_t *optlen */
+int getsockopt(GETSOCKOPT_SIG)
+{
+  dwr(MSG_DEBUG,"getsockopt(%d)\n", sockfd);
+  if (!set_up_intercept() || !connected_to_service(sockfd))
+    return realgetsockopt(sockfd, level, optname, optval, optlen);
+  if(optname == SO_TYPE) {
+    int* val = (int*)optval;
+    *val = 2;
+    optval = (void*)val;
+  }
+  return 0;
+}
+
+/*------------------------------------------------------------------------------
+----------------------------------- socket() -----------------------------------
+------------------------------------------------------------------------------*/
+
+/* int socket_family, int socket_type, int protocol
+   socket() intercept function */
+int socket(SOCKET_SIG)
+{
+  if (!set_up_intercept())
+    return realsocket(socket_family, socket_type, protocol);
+
+  dwr(MSG_DEBUG,"socket():\n");
+  /* Check that type makes sense */
+#if defined(__linux__)
+  int flags = socket_type & ~SOCK_TYPE_MASK;
+  if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK)) {
+      errno = EINVAL;
+      return -1;
+  }
+#endif
+  socket_type &= SOCK_TYPE_MASK;
+  /* Check protocol is in range */
+#if defined(__linux__)
+  if (socket_family < 0 || socket_family >= NPROTO){
+    errno = EAFNOSUPPORT;
+    return -1;
+  }
+  if (socket_type < 0 || socket_type >= SOCK_MAX) {
+    errno = EINVAL;
+    return -1;
+  }
+#endif
+  /* TODO: detect ENFILE condition */
+  if(socket_family == AF_LOCAL
+#if defined(__linux__)
+    || socket_family == AF_NETLINK
+#endif
+    || socket_family == AF_UNIX) {
+      int err = realsocket(socket_family, socket_type, protocol);
+      dwr(MSG_DEBUG,"realsocket() = %d\n", err);
+      return err;
+  }
+  /* Assemble and send RPC */
+  struct socket_st rpc_st;
+  rpc_st.socket_family = socket_family;
+  rpc_st.socket_type = socket_type;
+  rpc_st.protocol = protocol;
+  rpc_st.__tid = syscall(SYS_gettid);
+  /* -1 is passed since we we're generating the new socket in this call */
+  return rpc_send_command(netpath, RPC_SOCKET, -1, &rpc_st, sizeof(struct socket_st));
+}
+
+/*------------------------------------------------------------------------------
+---------------------------------- connect() -----------------------------------
+------------------------------------------------------------------------------*/
+
+/* int __fd, const struct sockaddr * __addr, socklen_t __len
+   connect() intercept function */
+int connect(CONNECT_SIG)
+{
+  if (!set_up_intercept())
+    return realconnect(__fd, __addr, __len);
+
+  struct sockaddr_in *connaddr;
+  connaddr = (struct sockaddr_in *)__addr;
+  if(__addr->sa_family == AF_LOCAL || __addr->sa_family == AF_UNIX) {
+  	struct sockaddr_storage storage;
+   	memcpy(&storage, __addr, __len);
+  	struct sockaddr_un *s_un = (struct sockaddr_un*)&storage;
+  	dwr(MSG_DEBUG, "connect(): address = %s\n", s_un->sun_path);	
+  }
+
+  int port = connaddr->sin_port;
+  int ip = connaddr->sin_addr.s_addr;
+  unsigned char d[4];
+  d[0] = ip & 0xFF;
+  d[1] = (ip >>  8) & 0xFF;
+  d[2] = (ip >> 16) & 0xFF;
+  d[3] = (ip >> 24) & 0xFF;
+  dwr(MSG_DEBUG,"connect(): %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], ntohs(port));
+
+  dwr(MSG_DEBUG,"connect(%d):\n", __fd);
+  /* Check that this is a valid fd */
+  if(fcntl(__fd, F_GETFD) < 0) {
+    errno = EBADF;
+    return -1;
+  }
+  /* Check that it is a socket */
+  int sock_type;
+  socklen_t sock_type_len = sizeof(sock_type);
+  if(getsockopt(__fd, SOL_SOCKET, SO_TYPE, (void *) &sock_type, &sock_type_len) < 0) {
+    errno = ENOTSOCK;
+    return -1;
+  }
+#if defined(__linux__)
+  /* Check family */
+  if (connaddr->sin_family < 0 || connaddr->sin_family >= NPROTO){
+    errno = EAFNOSUPPORT;
+    return -1;
+  }
+#endif
+  /* make sure we don't touch any standard outputs */
+  if(__fd == STDIN_FILENO || __fd == STDOUT_FILENO || __fd == STDERR_FILENO)
+    return(realconnect(__fd, __addr, __len));
+
+  if(__addr != NULL && (connaddr->sin_family == AF_LOCAL
+#if defined(__linux__)
+    || connaddr->sin_family == PF_NETLINK
+    || connaddr->sin_family == AF_NETLINK
+#endif
+    || connaddr->sin_family == AF_UNIX)) {
+    return realconnect(__fd, __addr, __len);
+  }
+  /* Assemble and send RPC */
+  struct connect_st rpc_st;
+#if defined(__linux__)
+  rpc_st.__tid = syscall(SYS_gettid);
+#endif
+  rpc_st.__fd = __fd;
+  memcpy(&rpc_st.__addr, __addr, sizeof(struct sockaddr_storage));
+  memcpy(&rpc_st.__len, &__len, sizeof(socklen_t));
+  return rpc_send_command(netpath, RPC_CONNECT, __fd, &rpc_st, sizeof(struct connect_st));
+}
+
+/*------------------------------------------------------------------------------
+------------------------------------ bind() ------------------------------------
+------------------------------------------------------------------------------*/
+
+/* int sockfd, const struct sockaddr *addr, socklen_t addrlen
+   bind() intercept function */
+int bind(BIND_SIG)
+{
+  if (!set_up_intercept())
+    return realbind(sockfd, addr, addrlen);
+
+  dwr(MSG_DEBUG,"bind(%d):\n", sockfd);
+  /* Check that this is a valid fd */
+  if(fcntl(sockfd, F_GETFD) < 0) {
+    errno = EBADF;
+    return -1;
+  }
+  /* Check that it is a socket */
+  int opt = -1;
+  socklen_t opt_len;
+  if(getsockopt(sockfd, SOL_SOCKET, SO_TYPE, (void *) &opt, &opt_len) < 0) {
+    errno = ENOTSOCK;
+    return -1;
+  }
+  /* make sure we don't touch any standard outputs */
+  if(sockfd == STDIN_FILENO || sockfd == STDOUT_FILENO || sockfd == STDERR_FILENO)
+    return(realbind(sockfd, addr, addrlen));
+  /* If local, just use normal syscall */
+  struct sockaddr_in *connaddr;
+  connaddr = (struct sockaddr_in *)addr;
+
+  if(connaddr->sin_family == AF_LOCAL
+#if defined(__linux__)
+    || connaddr->sin_family == AF_NETLINK
+#endif
+    || connaddr->sin_family == AF_UNIX) {
+      int err = realbind(sockfd, addr, addrlen);
+      dwr(MSG_DEBUG,"realbind, err = %d\n", err);
+      return err;
+  }
+  int port = connaddr->sin_port;
+  int ip = connaddr->sin_addr.s_addr;
+  unsigned char d[4];
+  d[0] = ip & 0xFF;
+  d[1] = (ip >>  8) & 0xFF;
+  d[2] = (ip >> 16) & 0xFF;
+  d[3] = (ip >> 24) & 0xFF;
+  dwr(MSG_DEBUG,"bind(): %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], ntohs(port));
+  /* Assemble and send RPC */
+  struct bind_st rpc_st;
+  rpc_st.sockfd = sockfd;
+#if defined(__linux__)
+  rpc_st.__tid = syscall(SYS_gettid);
+#endif
+  memcpy(&rpc_st.addr, addr, sizeof(struct sockaddr_storage));
+  memcpy(&rpc_st.addrlen, &addrlen, sizeof(socklen_t));
+  return rpc_send_command(netpath, RPC_BIND, sockfd, &rpc_st, sizeof(struct bind_st));
+}
+
+/*------------------------------------------------------------------------------
+----------------------------------- accept4() ----------------------------------
+------------------------------------------------------------------------------*/
+
+/* int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags */
+#if defined(__linux__)
+int accept4(ACCEPT4_SIG)
+{
+  dwr(MSG_DEBUG,"accept4(%d):\n", sockfd);
+  if ((flags & SOCK_CLOEXEC))
+    fcntl(sockfd, F_SETFL, FD_CLOEXEC);
+  if ((flags & SOCK_NONBLOCK))
+    fcntl(sockfd, F_SETFL, O_NONBLOCK);
+  return accept(sockfd, addr, addrlen);
+}
+#endif
+
+/*------------------------------------------------------------------------------
+----------------------------------- accept() -----------------------------------
+------------------------------------------------------------------------------*/
+
+/* int sockfd struct sockaddr *addr, socklen_t *addrlen
+   accept() intercept function */
+int accept(ACCEPT_SIG)
+{
+  if (!set_up_intercept())
+    return realaccept(sockfd, addr, addrlen);
+
+  dwr(MSG_DEBUG,"accept(%d):\n", sockfd);
+  /* Check that this is a valid fd */
+  if(fcntl(sockfd, F_GETFD) < 0) {
+    return -1;
+    errno = EBADF;
+    dwr(MSG_DEBUG,"EBADF\n");
+    return -1;
+  }
+  /* Check that it is a socket */
+  int opt;
+  socklen_t opt_len;
+  if(getsockopt(sockfd, SOL_SOCKET, SO_TYPE, (void *) &opt, &opt_len) < 0) {
+    errno = ENOTSOCK;
+    dwr(MSG_DEBUG,"ENOTSOCK\n");
+    return -1;
+  }
+  /* Check that this socket supports accept() */
+  if(!(opt && (SOCK_STREAM | SOCK_SEQPACKET))) {
+    errno = EOPNOTSUPP;
+    dwr(MSG_DEBUG,"EOPNOTSUPP\n");
+    return -1;
+  }
+  /* Check that we haven't hit the soft-limit file descriptors allowed */
+  struct rlimit rl;
+  getrlimit(RLIMIT_NOFILE, &rl);
+  if(sockfd >= rl.rlim_cur){
+    errno = EMFILE;
+    dwr(MSG_DEBUG,"EMFILE\n");
+    return -1;
+  }
+  /* Check address length */
+  if(addrlen < 0) {
+    errno = EINVAL;
+    dwr(MSG_DEBUG,"EINVAL\n");
+    return -1;
+  }
+  /* redirect calls for standard I/O descriptors to kernel */
+  if(sockfd == STDIN_FILENO || sockfd == STDOUT_FILENO || sockfd == STDERR_FILENO){
+    dwr(MSG_DEBUG,"realaccept():\n");
+    return(realaccept(sockfd, addr, addrlen));
+  }
+  if(addr)
+    addr->sa_family = AF_INET;
+
+  int new_fd = get_new_fd(sockfd);
+  if(new_fd > 0) {
+    errno = ERR_OK;
+    return new_fd;
+  }
+  errno = EAGAIN;
+  return -EAGAIN;
+}
+
+/*------------------------------------------------------------------------------
+------------------------------------- listen()----------------------------------
+------------------------------------------------------------------------------*/
+
+/* int sockfd, int backlog */
+int listen(LISTEN_SIG)
+{
+  if (!set_up_intercept())
+    return(reallisten(sockfd, backlog));
+
+  dwr(MSG_DEBUG,"listen(%d):\n", sockfd);
+  int sock_type;
+  socklen_t sock_type_len = sizeof(sock_type);
+
+  /* Check that this is a valid fd */
+  if(fcntl(sockfd, F_GETFD) < 0) {
+    errno = EBADF;
+    return -1;
+  }
+  /* Check that it is a socket */
+  if(getsockopt(sockfd, SOL_SOCKET, SO_TYPE, (void *) &sock_type, &sock_type_len) < 0) {
+    errno = ENOTSOCK;
+    return -1;
+  }
+  /* Check that this socket supports accept() */
+  if(!(sock_type && (SOCK_STREAM | SOCK_SEQPACKET))) {
+    errno = EOPNOTSUPP;
+    return -1;
+  }
+  /* make sure we don't touch any standard outputs */
+  if(sockfd == STDIN_FILENO || sockfd == STDOUT_FILENO || sockfd == STDERR_FILENO)
+    return(reallisten(sockfd, backlog));
+
+  if(!connected_to_service(sockfd)) {
+    reallisten(sockfd, backlog);
+  }
+  /* Assemble and send RPC */
+  struct listen_st rpc_st;
+  rpc_st.sockfd = sockfd;
+  rpc_st.backlog = backlog;
+#if defined(__linux__)
+  rpc_st.__tid = syscall(SYS_gettid);
+#endif
+  return rpc_send_command(netpath, RPC_LISTEN, sockfd, &rpc_st, sizeof(struct listen_st));
+}
+
+/*------------------------------------------------------------------------------
+------------------------------------- close() ----------------------------------
+------------------------------------------------------------------------------*/
+
+/* int fd */
+int close(CLOSE_SIG)
+{
+  dwr(MSG_DEBUG, "close(%d)\n", fd);
+  set_up_intercept();
+  return realclose(fd);
+}
+
+/*------------------------------------------------------------------------------
+-------------------------------- getsockname() ---------------------------------
+------------------------------------------------------------------------------*/
+
+/* int sockfd, struct sockaddr *addr, socklen_t *addrlen */
+int getsockname(GETSOCKNAME_SIG)
+{
+  if (!set_up_intercept())
+    return realgetsockname(sockfd, addr, addrlen);
+
+  dwr(MSG_DEBUG,"getsockname(%d)\n", sockfd);
+  if(!connected_to_service(sockfd)) {
+    dwr(MSG_DEBUG,"getsockname(): not used by service\n");
+    return realgetsockname(sockfd, addr, addrlen);
+  }
+  /* This is kind of a hack as it stands -- assumes sockaddr is sockaddr_in
+   * and is an IPv4 address. */
+
+  /* assemble and send command */
+  struct getsockname_st rpc_st;
+  rpc_st.sockfd = sockfd;
+  memcpy(&rpc_st.addr, addr, *addrlen);
+  memcpy(&rpc_st.addrlen, &addrlen, sizeof(socklen_t));
+  int rpcfd = rpc_send_command(netpath, RPC_GETSOCKNAME, sockfd, &rpc_st, sizeof(struct getsockname_st));
+  /* read address info from service */
+  char addrbuf[sizeof(struct sockaddr_storage)];
+  memset(&addrbuf, 0, sizeof(struct sockaddr_storage));
+
+  if(rpcfd > -1)
+    if(read(rpcfd, &addrbuf, sizeof(struct sockaddr_storage)) > 0)
+     close(rpcfd);
+
+  struct sockaddr_storage sock_storage;
+  memcpy(&sock_storage, addrbuf, sizeof(struct sockaddr_storage));
+  *addrlen = sizeof(struct sockaddr_in);
+  memcpy(addr, &sock_storage, (*addrlen > sizeof(sock_storage)) ? sizeof(sock_storage) : *addrlen);
+  addr->sa_family = AF_INET;
+  return 0;
+}
+
+/*------------------------------------------------------------------------------
+------------------------------------ syscall() ---------------------------------
+------------------------------------------------------------------------------*/
+
+#if defined(__linux__)
+long syscall(SYSCALL_SIG)
+{
+  va_list ap;
+  uintptr_t a,b,c,d,e,f;
+  va_start(ap, number);
+  a=va_arg(ap, uintptr_t);
+  b=va_arg(ap, uintptr_t);
+  c=va_arg(ap, uintptr_t);
+  d=va_arg(ap, uintptr_t);
+  e=va_arg(ap, uintptr_t);
+  f=va_arg(ap, uintptr_t);
+  va_end(ap);
+
+  if (!set_up_intercept())
+    return realsyscall(number,a,b,c,d,e,f);
+
+  dwr(MSG_DEBUG_EXTRA,"syscall(%u, ...):\n", number);
+
+#if defined(__i386__)
+  /* TODO: Implement for 32-bit systems: syscall(__NR_socketcall, 18, args);
+  args[0] = (unsigned long) fd;
+  args[1] = (unsigned long) addr;
+  args[2] = (unsigned long) addrlen;
+  args[3] = (unsigned long) flags;
+  */
+#else
+  if(number == __NR_accept4) {
+    int sockfd = a;
+    struct sockaddr * addr = (struct sockaddr*)b;
+    socklen_t * addrlen = (socklen_t*)c;
+    int flags = d;
+    int old_errno = errno;
+    int err = accept4(sockfd, addr, addrlen, flags);
+    errno = old_errno;
+    err = err == -EBADF ? -EAGAIN : err;
+    return err;
+  }
+#endif
+  return realsyscall(number,a,b,c,d,e,f);
+}
+#endif
\ No newline at end of file
diff --git a/netcon/Intercept.h b/netcon/Intercept.h
new file mode 100644
index 000000000..9593468fd
--- /dev/null
+++ b/netcon/Intercept.h
@@ -0,0 +1,94 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef _INTERCEPT_H
+#define _INTERCEPT_H	1
+
+#include <sys/socket.h>
+
+
+#if defined(__linux__)
+	#define ACCEPT4_SIG int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags
+ 	#define SYSCALL_SIG	long number, ...
+#endif
+
+#define CLOSE_SIG int fd
+#define READ_SIG int __fd, void *__buf, size_t __nbytes
+#define BIND_SIG int sockfd, const struct sockaddr *addr, socklen_t addrlen
+#define CONNECT_SIG int __fd, const struct sockaddr * __addr, socklen_t __len
+#define WRITE_SIG int __fd, const void *__buf, size_t __n
+#define LISTEN_SIG int sockfd, int backlog
+#define SOCKET_SIG int socket_family, int socket_type, int protocol
+#define ACCEPT_SIG int sockfd, struct sockaddr *addr, socklen_t *addrlen
+#define SHUTDOWN_SIG int socket, int how
+#define CONNECT_SOCKARG struct sockaddr *
+#define IOCTL_SIG int __fd, unsigned long int __request, ...
+#define FCNTL_SIG int __fd, int __cmd, ...
+#define DAEMON_SIG int nochdir, int noclose
+#define SETSOCKOPT_SIG int socket, int level, int option_name, const void *option_value, socklen_t option_len
+#define GETSOCKOPT_SIG int sockfd, int level, int optname, void *optval, socklen_t *optlen
+#define CLONE_SIG int (*fn)(void *), void *child_stack, int flags, void *arg, ...
+#define GETSOCKNAME_SIG int sockfd, struct sockaddr *addr, socklen_t *addrlen
+#define DUP2_SIG int oldfd, int newfd
+#define DUP3_SIG int oldfd, int newfd, int flags
+
+
+#if defined(__linux__)
+	int accept4(ACCEPT4_SIG);
+	long syscall(SYSCALL_SIG);
+#endif
+
+void my_init(void);
+int connect(CONNECT_SIG);
+int bind(BIND_SIG);
+int accept(ACCEPT_SIG);
+int listen(LISTEN_SIG);
+int socket(SOCKET_SIG);
+int setsockopt(SETSOCKOPT_SIG);
+int getsockopt(GETSOCKOPT_SIG);
+int close(CLOSE_SIG);
+int clone(CLONE_SIG);
+int dup2(DUP2_SIG);
+int dup3(DUP3_SIG);
+int getsockname(GETSOCKNAME_SIG);
+
+#if defined(__linux__)
+	static int (*realaccept4)(ACCEPT4_SIG) = 0;
+	static long (*realsyscall)(SYSCALL_SIG) = 0;
+#endif
+
+static int (*realconnect)(CONNECT_SIG) = 0;
+static int (*realbind)(BIND_SIG) = 0;
+static int (*realaccept)(ACCEPT_SIG) = 0;
+static int (*reallisten)(LISTEN_SIG) = 0;
+static int (*realsocket)(SOCKET_SIG) = 0;
+static int (*realsetsockopt)(SETSOCKOPT_SIG) = 0;
+static int (*realgetsockopt)(GETSOCKOPT_SIG) = 0;
+static int (*realclose)(CLOSE_SIG) = 0;
+static int (*realgetsockname)(GETSOCKNAME_SIG) = 0;
+
+#endif
diff --git a/netcon/LWIPStack.hpp b/netcon/LWIPStack.hpp
new file mode 100644
index 000000000..2ad1a843c
--- /dev/null
+++ b/netcon/LWIPStack.hpp
@@ -0,0 +1,223 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_LWIPSTACK_H
+#define ZT_LWIPSTACK_H
+
+#include "lwip/mem.h"
+#include "lwip/pbuf.h"
+#include "lwip/ip_addr.h"
+#include "lwip/netif.h"
+
+#include "../node/Mutex.hpp"
+
+#include <stdio.h>
+#include <dlfcn.h>
+
+#ifdef D_GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
+
+typedef ip_addr ip_addr_t;
+struct tcp_pcb;
+
+#define TCP_WRITE_SIG struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags
+#define TCP_SENT_SIG struct tcp_pcb * pcb, err_t (* sent)(void * arg, struct tcp_pcb * tpcb, u16_t len)
+#define TCP_NEW_SIG void
+#define TCP_SNDBUF_SIG struct tcp_pcb * pcb
+#define TCP_CONNECT_SIG struct tcp_pcb * pcb, struct ip_addr * ipaddr, u16_t port, err_t (* connected)(void * arg, struct tcp_pcb * tpcb, err_t err)
+#define TCP_RECV_SIG struct tcp_pcb * pcb, err_t (* recv)(void * arg, struct tcp_pcb * tpcb, struct pbuf * p, err_t err)
+#define TCP_RECVED_SIG struct tcp_pcb * pcb, u16_t len
+#define TCP_ERR_SIG struct tcp_pcb * pcb, void (* err)(void * arg, err_t err)
+#define TCP_POLL_SIG struct tcp_pcb * pcb, err_t (* poll)(void * arg, struct tcp_pcb * tpcb), u8_t interval
+#define TCP_ARG_SIG struct tcp_pcb * pcb, void * arg
+#define TCP_CLOSE_SIG struct tcp_pcb * pcb
+#define TCP_ABORT_SIG struct tcp_pcb * pcb
+#define TCP_OUTPUT_SIG struct tcp_pcb * pcb
+#define TCP_ACCEPT_SIG struct tcp_pcb * pcb, err_t (* accept)(void * arg, struct tcp_pcb * newpcb, err_t err)
+#define TCP_LISTEN_SIG struct tcp_pcb * pcb
+#define TCP_LISTEN_WITH_BACKLOG_SIG struct tcp_pcb * pcb, u8_t backlog
+#define TCP_BIND_SIG struct tcp_pcb * pcb, struct ip_addr * ipaddr, u16_t port
+#define PBUF_FREE_SIG struct pbuf *p
+#define PBUF_ALLOC_SIG pbuf_layer layer, u16_t length, pbuf_type type
+#define LWIP_HTONS_SIG u16_t x
+#define LWIP_NTOHS_SIG u16_t x
+#define IPADDR_NTOA_SIG const ip_addr_t *addr
+#define ETHARP_OUTPUT_SIG struct netif *netif, struct pbuf *q, ip_addr_t *ipaddr
+#define ETHERNET_INPUT_SIG struct pbuf *p, struct netif *netif
+#define TCP_INPUT_SIG struct pbuf *p, struct netif *inp
+#define IP_INPUT_SIG struct pbuf *p, struct netif *inp
+#define NETIF_SET_DEFAULT_SIG struct netif *netif
+#define NETIF_ADD_SIG struct netif *netif, ip_addr_t *ipaddr, ip_addr_t *netmask, ip_addr_t *gw, void *state, netif_init_fn init, netif_input_fn input
+#define NETIF_SET_UP_SIG struct netif *netif
+#define NETIF_POLL_SIG struct netif *netif
+
+namespace ZeroTier {
+
+/**
+ * Loads an instance of liblwip.so in a private memory arena
+ *
+ * This uses dlmopen() to load an instance of the LWIP stack into its
+ * own private memory space. This is done to get around the stack's
+ * lack of thread-safety or multi-instance support. The alternative
+ * would be to massively refactor the stack so everything lives in a
+ * state object instead of static memory space.
+ */
+class LWIPStack
+{
+public:
+  void *_libref;
+
+  void (*_lwip_init)();
+  err_t (*_tcp_write)(TCP_WRITE_SIG);
+  void (*_tcp_sent)(TCP_SENT_SIG);
+  struct tcp_pcb * (*_tcp_new)(TCP_NEW_SIG);
+  u16_t (*_tcp_sndbuf)(TCP_SNDBUF_SIG);
+  err_t (*_tcp_connect)(TCP_CONNECT_SIG);
+  void (*_tcp_recv)(TCP_RECV_SIG);
+  void (*_tcp_recved)(TCP_RECVED_SIG);
+  void (*_tcp_err)(TCP_ERR_SIG);
+  void (*_tcp_poll)(TCP_POLL_SIG);
+  void (*_tcp_arg)(TCP_ARG_SIG);
+  err_t (*_tcp_close)(TCP_CLOSE_SIG);
+  void (*_tcp_abort)(TCP_ABORT_SIG);
+  err_t (*_tcp_output)(TCP_OUTPUT_SIG);
+  void (*_tcp_accept)(TCP_ACCEPT_SIG);
+  struct tcp_pcb * (*_tcp_listen)(TCP_LISTEN_SIG);
+  struct tcp_pcb * (*_tcp_listen_with_backlog)(TCP_LISTEN_WITH_BACKLOG_SIG);
+  err_t (*_tcp_bind)(TCP_BIND_SIG);
+  void (*_etharp_tmr)(void);
+  void (*_tcp_tmr)(void);
+  u8_t (*_pbuf_free)(PBUF_FREE_SIG);
+  struct pbuf * (*_pbuf_alloc)(PBUF_ALLOC_SIG);
+  u16_t (*_lwip_htons)(LWIP_HTONS_SIG);
+  u16_t (*_lwip_ntohs)(LWIP_NTOHS_SIG);
+  char* (*_ipaddr_ntoa)(IPADDR_NTOA_SIG);
+  err_t (*_etharp_output)(ETHARP_OUTPUT_SIG);
+  err_t (*_ethernet_input)(ETHERNET_INPUT_SIG);
+  void (*_tcp_input)(TCP_INPUT_SIG);
+  err_t (*_ip_input)(IP_INPUT_SIG);
+  void (*_netif_set_default)(NETIF_SET_DEFAULT_SIG);
+  struct netif * (*_netif_add)(NETIF_ADD_SIG);
+  void (*_netif_set_up)(NETIF_SET_UP_SIG);
+  void (*_netif_poll)(NETIF_POLL_SIG);
+
+
+  Mutex _lock;
+
+  LWIPStack(const char* path) :
+    _libref(NULL)
+  {
+    
+#if defined(__linux__)
+    _libref = dlmopen(LM_ID_NEWLM, path, RTLD_NOW);
+#elif defined(__APPLE__)
+    _libref = dlopen(path, RTLD_NOW);
+#endif
+
+    if(_libref == NULL)
+      printf("dlerror(): %s\n", dlerror());
+
+    _lwip_init = (void(*)(void))dlsym(_libref, "lwip_init");
+    _tcp_write = (err_t(*)(TCP_WRITE_SIG))dlsym(_libref, "tcp_write");
+    _tcp_sent = (void(*)(TCP_SENT_SIG))dlsym(_libref, "tcp_sent");
+    _tcp_new = (struct tcp_pcb*(*)(TCP_NEW_SIG))dlsym(_libref, "tcp_new");
+    _tcp_sndbuf = (u16_t(*)(TCP_SNDBUF_SIG))dlsym(_libref, "tcp_sndbuf");
+    _tcp_connect = (err_t(*)(TCP_CONNECT_SIG))dlsym(_libref, "tcp_connect");
+    _tcp_recv = (void(*)(TCP_RECV_SIG))dlsym(_libref, "tcp_recv");
+    _tcp_recved = (void(*)(TCP_RECVED_SIG))dlsym(_libref, "tcp_recved");
+    _tcp_err = (void(*)(TCP_ERR_SIG))dlsym(_libref, "tcp_err");
+    _tcp_poll = (void(*)(TCP_POLL_SIG))dlsym(_libref, "tcp_poll");
+    _tcp_arg = (void(*)(TCP_ARG_SIG))dlsym(_libref, "tcp_arg");
+    _tcp_close = (err_t(*)(TCP_CLOSE_SIG))dlsym(_libref, "tcp_close");
+    _tcp_abort = (void(*)(TCP_ABORT_SIG))dlsym(_libref, "tcp_abort");
+    _tcp_output = (err_t(*)(TCP_OUTPUT_SIG))dlsym(_libref, "tcp_output");
+    _tcp_accept = (void(*)(TCP_ACCEPT_SIG))dlsym(_libref, "tcp_accept");
+    _tcp_listen = (struct tcp_pcb*(*)(TCP_LISTEN_SIG))dlsym(_libref, "tcp_listen");
+    _tcp_listen_with_backlog = (struct tcp_pcb*(*)(TCP_LISTEN_WITH_BACKLOG_SIG))dlsym(_libref, "tcp_listen_with_backlog");
+    _tcp_bind = (err_t(*)(TCP_BIND_SIG))dlsym(_libref, "tcp_bind");
+    _etharp_tmr = (void(*)(void))dlsym(_libref, "etharp_tmr");
+    _tcp_tmr = (void(*)(void))dlsym(_libref, "tcp_tmr");
+    _pbuf_free = (u8_t(*)(PBUF_FREE_SIG))dlsym(_libref, "pbuf_free");
+    _pbuf_alloc = (struct pbuf*(*)(PBUF_ALLOC_SIG))dlsym(_libref, "pbuf_alloc");
+    _lwip_htons = (u16_t(*)(LWIP_HTONS_SIG))dlsym(_libref, "lwip_htons");
+    _lwip_ntohs = (u16_t(*)(LWIP_NTOHS_SIG))dlsym(_libref, "lwip_ntohs");
+    _ipaddr_ntoa = (char*(*)(IPADDR_NTOA_SIG))dlsym(_libref, "ipaddr_ntoa");
+    _etharp_output = (err_t(*)(ETHARP_OUTPUT_SIG))dlsym(_libref, "etharp_output");
+    _ethernet_input = (err_t(*)(ETHERNET_INPUT_SIG))dlsym(_libref, "ethernet_input");
+    _tcp_input = (void(*)(TCP_INPUT_SIG))dlsym(_libref, "tcp_input");
+    _ip_input = (err_t(*)(IP_INPUT_SIG))dlsym(_libref, "ip_input");
+    _netif_set_default = (void(*)(NETIF_SET_DEFAULT_SIG))dlsym(_libref, "netif_set_default");
+    _netif_add = (struct netif*(*)(NETIF_ADD_SIG))dlsym(_libref, "netif_add");
+    _netif_set_up = (void(*)(NETIF_SET_UP_SIG))dlsym(_libref, "netif_set_up");
+    _netif_poll = (void(*)(NETIF_POLL_SIG))dlsym(_libref, "netif_poll");
+  }
+
+  ~LWIPStack()
+  {
+    if (_libref)
+      dlclose(_libref);
+  }
+
+  inline void lwip_init() throw() { Mutex::Lock _l(_lock); return _lwip_init(); }
+  inline err_t tcp_write(TCP_WRITE_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_write(pcb,arg,len,apiflags); }
+  inline void tcp_sent(TCP_SENT_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_sent(pcb,sent); }
+  inline struct tcp_pcb * tcp_new(TCP_NEW_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_new(); }
+  inline u16_t tcp_sndbuf(TCP_SNDBUF_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_sndbuf(pcb); }
+  inline err_t tcp_connect(TCP_CONNECT_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_connect(pcb,ipaddr,port,connected); }
+  inline void tcp_recv(TCP_RECV_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_recv(pcb,recv); }
+  inline void tcp_recved(TCP_RECVED_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_recved(pcb,len); }
+  inline void tcp_err(TCP_ERR_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_err(pcb,err); }
+  inline void tcp_poll(TCP_POLL_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_poll(pcb,poll,interval); }
+  inline void tcp_arg(TCP_ARG_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_arg(pcb,arg); }
+  inline err_t tcp_close(TCP_CLOSE_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_close(pcb); }
+  inline void tcp_abort(TCP_ABORT_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_abort(pcb); }
+  inline err_t tcp_output(TCP_OUTPUT_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_output(pcb); }
+  inline void tcp_accept(TCP_ACCEPT_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_accept(pcb,accept); }
+  inline struct tcp_pcb * tcp_listen(TCP_LISTEN_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_listen(pcb); }
+  inline struct tcp_pcb * tcp_listen_with_backlog(TCP_LISTEN_WITH_BACKLOG_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_listen_with_backlog(pcb,backlog); }
+  inline err_t tcp_bind(TCP_BIND_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_bind(pcb,ipaddr,port); }
+  inline void etharp_tmr(void) throw() { Mutex::Lock _l(_lock); return _etharp_tmr(); }
+  inline void tcp_tmr(void) throw() { Mutex::Lock _l(_lock); return _tcp_tmr(); }
+  inline u8_t pbuf_free(PBUF_FREE_SIG) throw() { Mutex::Lock _l(_lock); return _pbuf_free(p); }
+  inline struct pbuf * pbuf_alloc(PBUF_ALLOC_SIG) throw() { Mutex::Lock _l(_lock); return _pbuf_alloc(layer,length,type); }
+  inline u16_t lwip_htons(LWIP_HTONS_SIG) throw() { Mutex::Lock _l(_lock); return _lwip_htons(x); }
+  inline u16_t lwip_ntohs(LWIP_NTOHS_SIG) throw() { Mutex::Lock _l(_lock); return _lwip_ntohs(x); }
+  inline char* ipaddr_ntoa(IPADDR_NTOA_SIG) throw() { Mutex::Lock _l(_lock); return _ipaddr_ntoa(addr); }
+  inline err_t etharp_output(ETHARP_OUTPUT_SIG) throw() { Mutex::Lock _l(_lock); return _etharp_output(netif,q,ipaddr); }
+  inline err_t ethernet_input(ETHERNET_INPUT_SIG) throw() { Mutex::Lock _l(_lock); return _ethernet_input(p,netif); }
+  inline void tcp_input(TCP_INPUT_SIG) throw() { Mutex::Lock _l(_lock); return _tcp_input(p,inp); }
+  inline err_t ip_input(IP_INPUT_SIG) throw() { Mutex::Lock _l(_lock); return _ip_input(p,inp); }
+  inline void netif_set_default(NETIF_SET_DEFAULT_SIG) throw() { Mutex::Lock _l(_lock); return _netif_set_default(netif); }
+  inline struct netif * netif_add(NETIF_ADD_SIG) throw() { Mutex::Lock _l(_lock); return _netif_add(netif,ipaddr,netmask,gw,state,init,input); }
+  inline void netif_set_up(NETIF_SET_UP_SIG) throw() { Mutex::Lock _l(_lock); return _netif_set_up(netif); }
+  inline void netif_poll(NETIF_POLL_SIG) throw() { Mutex::Lock _l(_lock); return _netif_poll(netif); }
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
new file mode 100644
index 000000000..fda53fc04
--- /dev/null
+++ b/netcon/NetconEthernetTap.cpp
@@ -0,0 +1,1059 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include <algorithm>
+#include <utility>
+#include <dlfcn.h>
+#include <sys/poll.h>
+#include <stdint.h>
+#include <utility>
+#include <string>
+#include <sys/resource.h>
+#include <sys/syscall.h>
+
+#include "NetconEthernetTap.hpp"
+
+#include "../node/Utils.hpp"
+#include "../osdep/OSUtils.hpp"
+#include "../osdep/Phy.hpp"
+
+#include "Intercept.h"
+#include "LWIPStack.hpp"
+
+#include "lwip/tcp_impl.h"
+#include "netif/etharp.h"
+#include "lwip/api.h"
+#include "lwip/ip.h"
+#include "lwip/ip_addr.h"
+#include "lwip/ip_frag.h"
+#include "lwip/tcp.h"
+
+#include "common.inc.c"
+#include "RPC.h"
+
+namespace ZeroTier {
+
+// ---------------------------------------------------------------------------
+
+static err_t tapif_init(struct netif *netif)
+{
+  // Actual init functionality is in addIp() of tap
+  return ERR_OK;
+}
+
+/*
+ * Outputs data from the pbuf queue to the interface
+ */
+static err_t low_level_output(struct netif *netif, struct pbuf *p)
+{
+  struct pbuf *q;
+  char buf[ZT_MAX_MTU+32];
+  char *bufptr;
+  int totalLength = 0;
+
+  ZeroTier::NetconEthernetTap *tap = (ZeroTier::NetconEthernetTap*)netif->state;
+  bufptr = buf;
+  // Copy data from each pbuf, one at a time
+  for(q = p; q != NULL; q = q->next) {
+    memcpy(bufptr, q->payload, q->len);
+    bufptr += q->len;
+    totalLength += q->len;
+  }
+
+  // [Send packet to network]
+  // Split ethernet header and feed into handler
+  struct eth_hdr *ethhdr;
+  ethhdr = (struct eth_hdr *)buf;
+
+  ZeroTier::MAC src_mac;
+  ZeroTier::MAC dest_mac;
+  src_mac.setTo(ethhdr->src.addr, 6);
+  dest_mac.setTo(ethhdr->dest.addr, 6);
+
+  tap->_handler(tap->_arg,tap->_nwid,src_mac,dest_mac,
+    Utils::ntoh((uint16_t)ethhdr->type),0,buf + sizeof(struct eth_hdr),totalLength - sizeof(struct eth_hdr));
+  return ERR_OK;
+}
+
+// ---------------------------------------------------------------------------
+
+NetconEthernetTap::NetconEthernetTap(
+	const char *homePath,
+	const MAC &mac,
+	unsigned int mtu,
+	unsigned int metric,
+	uint64_t nwid,
+	const char *friendlyName,
+	void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+	void *arg) :
+  _nwid(nwid),
+	_handler(handler),
+	_arg(arg),
+  _phy(this,false,true),
+  _unixListenSocket((PhySocket *)0),
+	_mac(mac),
+	_homePath(homePath),
+	_mtu(mtu),
+	_enabled(true),
+	_run(true)
+{
+	char sockPath[4096],lwipPath[4096];
+	rpcCounter = -1;
+	Utils::snprintf(sockPath,sizeof(sockPath),"%s%snc_%.16llx",homePath,ZT_PATH_SEPARATOR_S,_nwid,ZT_PATH_SEPARATOR_S,(unsigned long long)nwid);
+    _dev = sockPath; // in netcon mode, set device to be just the network ID
+
+	Utils::snprintf(lwipPath,sizeof(lwipPath),"%s%sliblwip.so",homePath,ZT_PATH_SEPARATOR_S);
+	lwipstack = new LWIPStack(lwipPath);
+	if(!lwipstack)
+		throw std::runtime_error("unable to dynamically load a new instance of liblwip.so (searched ZeroTier home path)");
+	lwipstack->lwip_init();
+
+	_unixListenSocket = _phy.unixListen(sockPath,(void *)this);
+	fprintf(stderr," NetconEthernetTap initialized on: %s\n", sockPath);
+	if (!_unixListenSocket)
+		throw std::runtime_error(std::string("unable to bind to ")+sockPath);
+	_thread = Thread::start(this);
+}
+
+NetconEthernetTap::~NetconEthernetTap()
+{
+	_run = false;
+	_phy.whack();
+	_phy.whack(); // TODO: Rationale?
+	Thread::join(_thread);
+	_phy.close(_unixListenSocket,false);
+	delete lwipstack;
+}
+
+void NetconEthernetTap::setEnabled(bool en)
+{
+	_enabled = en;
+}
+
+bool NetconEthernetTap::enabled() const
+{
+	return _enabled;
+}
+
+bool NetconEthernetTap::addIp(const InetAddress &ip)
+{
+	Mutex::Lock _l(_ips_m);
+	if (std::find(_ips.begin(),_ips.end(),ip) == _ips.end()) {
+		_ips.push_back(ip);
+		std::sort(_ips.begin(),_ips.end());
+
+		if (ip.isV4()) {
+			// Set IP
+			static ip_addr_t ipaddr, netmask, gw;
+			IP4_ADDR(&gw,192,168,0,1);
+			ipaddr.addr = *((u32_t *)ip.rawIpData());
+			netmask.addr = *((u32_t *)ip.netmask().rawIpData());
+
+			// Set up the lwip-netif for LWIP's sake
+			lwipstack->netif_add(&interface,&ipaddr, &netmask, &gw, NULL, tapif_init, lwipstack->_ethernet_input);
+			interface.state = this;
+			interface.output = lwipstack->_etharp_output;
+			_mac.copyTo(interface.hwaddr, 6);
+			interface.mtu = _mtu;
+			interface.name[0] = 't';
+			interface.name[1] = 'p';
+			interface.linkoutput = low_level_output;
+			interface.hwaddr_len = 6;
+			interface.flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_IGMP;
+			lwipstack->netif_set_default(&interface);
+			lwipstack->netif_set_up(&interface);
+		}
+	}
+	return true;
+}
+
+bool NetconEthernetTap::removeIp(const InetAddress &ip)
+{
+	Mutex::Lock _l(_ips_m);
+	std::vector<InetAddress>::iterator i(std::find(_ips.begin(),_ips.end(),ip));
+	if (i == _ips.end())
+		return false;
+	_ips.erase(i);
+	if (ip.isV4()) {
+		// TODO: dealloc from LWIP
+	}
+	return true;
+}
+
+std::vector<InetAddress> NetconEthernetTap::ips() const
+{
+	Mutex::Lock _l(_ips_m);
+	return _ips;
+}
+
+void NetconEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
+{
+	struct pbuf *p,*q;
+	if (!_enabled)
+		return;
+
+	struct eth_hdr ethhdr;
+	from.copyTo(ethhdr.src.addr, 6);
+	to.copyTo(ethhdr.dest.addr, 6);
+	ethhdr.type = Utils::hton((uint16_t)etherType);
+
+	// We allocate a pbuf chain of pbufs from the pool.
+	p = lwipstack->pbuf_alloc(PBUF_RAW, len+sizeof(struct eth_hdr), PBUF_POOL);
+
+	if (p != NULL) {
+		const char *dataptr = reinterpret_cast<const char *>(data);
+
+		// First pbuf gets ethernet header at start
+		q = p;
+		if (q->len < sizeof(ethhdr)) {
+			dwr(MSG_ERROR,"_put(): Dropped packet: first pbuf smaller than ethernet header\n");
+			return;
+		}
+		memcpy(q->payload,&ethhdr,sizeof(ethhdr));
+		memcpy((char*)q->payload + sizeof(ethhdr),dataptr,q->len - sizeof(ethhdr));
+		dataptr += q->len - sizeof(ethhdr);
+
+		// Remaining pbufs (if any) get rest of data
+		while ((q = q->next)) {
+			memcpy(q->payload,dataptr,q->len);
+			dataptr += q->len;
+		}
+	} else {
+		dwr(MSG_ERROR,"put(): Dropped packet: no pbufs available\n");
+		return;
+	}
+
+	{
+		Mutex::Lock _l2(lwipstack->_lock);
+		if(interface.input(p, &interface) != ERR_OK) {
+			dwr(MSG_ERROR,"put(): Error while RXing packet (netif->input)\n");
+		}
+	}
+}
+
+std::string NetconEthernetTap::deviceName() const
+{
+	return _dev;
+}
+
+void NetconEthernetTap::setFriendlyName(const char *friendlyName) {
+}
+
+void NetconEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
+{
+	std::vector<MulticastGroup> newGroups;
+	Mutex::Lock _l(_multicastGroups_m);
+
+	// TODO: get multicast subscriptions from LWIP
+
+	std::vector<InetAddress> allIps(ips());
+	for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
+		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
+
+	std::sort(newGroups.begin(),newGroups.end());
+	std::unique(newGroups.begin(),newGroups.end());
+
+	for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
+		if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
+			added.push_back(*m);
+	}
+	for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
+		if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
+			removed.push_back(*m);
+	}
+	_multicastGroups.swap(newGroups);
+}
+
+void NetconEthernetTap::threadMain()
+	throw()
+{
+	uint64_t prev_tcp_time = 0, prev_status_time = 0, prev_etharp_time = 0;
+
+	// Main timer loop
+	while (_run) {
+		uint64_t now = OSUtils::now();
+		uint64_t since_tcp = now - prev_tcp_time;
+		uint64_t since_etharp = now - prev_etharp_time;
+		uint64_t since_status = now - prev_status_time;
+		uint64_t tcp_remaining = ZT_LWIP_TCP_TIMER_INTERVAL;
+		uint64_t etharp_remaining = ARP_TMR_INTERVAL;
+
+		// Connection prunning
+		if (since_status >= STATUS_TMR_INTERVAL) {
+			prev_status_time = now;
+			for(size_t i=0;i<_TcpConnections.size();++i) {
+				if(!_TcpConnections[i]->sock)
+					continue;
+				int fd = _phy.getDescriptor(_TcpConnections[i]->sock);
+				dwr(MSG_DEBUG," tap_thread(): tcp\\jobs = {%d, %d}\n", _TcpConnections.size(), jobmap.size());
+				// If there's anything on the RX buf, set to notify in case we stalled
+				if(_TcpConnections[i]->rxsz > 0)
+					_phy.setNotifyWritable(_TcpConnections[i]->sock, true);
+				fcntl(fd, F_SETFL, O_NONBLOCK);
+				unsigned char tmpbuf[BUF_SZ];
+				
+				int n = read(fd,&tmpbuf,BUF_SZ);
+				if(_TcpConnections[i]->pcb->state == SYN_SENT) {
+					dwr(MSG_DEBUG_EXTRA,"  tap_thread(): <%x> state = SYN_SENT, should finish or be removed soon\n", _TcpConnections[i]->sock);
+				}
+				if((n < 0 && errno != EAGAIN) || (n == 0 && errno == EAGAIN)) {
+					dwr(MSG_DEBUG," tap_thread(): closing sock (%x)\n", _TcpConnections[i]->sock);
+					closeConnection(_TcpConnections[i]->sock);
+				} else if (n > 0) {
+					dwr(MSG_DEBUG," tap_thread(): data read during connection check (%d bytes)\n", n);
+					phyOnUnixData(_TcpConnections[i]->sock,_phy.getuptr(_TcpConnections[i]->sock),&tmpbuf,n);
+				}		
+			}
+		}
+		// Main TCP/ETHARP timer section
+		if (since_tcp >= ZT_LWIP_TCP_TIMER_INTERVAL) {
+			prev_tcp_time = now;
+			lwipstack->tcp_tmr();
+			// Makeshift poll
+			for(size_t i=0;i<_TcpConnections.size();++i) {
+				if(_TcpConnections[i]->txsz > 0){
+					lwipstack->_lock.lock();
+					handleWrite(_TcpConnections[i]);
+					lwipstack->_lock.unlock();
+				}
+			}
+		} else {
+			tcp_remaining = ZT_LWIP_TCP_TIMER_INTERVAL - since_tcp;
+		}
+		if (since_etharp >= ARP_TMR_INTERVAL) {
+			prev_etharp_time = now;
+			lwipstack->etharp_tmr();
+		} else {
+			etharp_remaining = ARP_TMR_INTERVAL - since_etharp;
+		}
+		_phy.poll((unsigned long)std::min(tcp_remaining,etharp_remaining));
+	}
+	dlclose(lwipstack->_libref);
+}
+
+// Unused -- no UDP or TCP from this thread/Phy<>
+void NetconEthernetTap::phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len) {}
+void NetconEthernetTap::phyOnTcpConnect(PhySocket *sock,void **uptr,bool success) {}
+void NetconEthernetTap::phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from) {}
+void NetconEthernetTap::phyOnTcpClose(PhySocket *sock,void **uptr) {}
+void NetconEthernetTap::phyOnTcpData(PhySocket *sock,void **uptr,void *data,unsigned long len) {}
+void NetconEthernetTap::phyOnTcpWritable(PhySocket *sock,void **uptr) {}
+
+
+TcpConnection *NetconEthernetTap::getConnection(PhySocket *sock)
+{
+	for(size_t i=0;i<_TcpConnections.size();++i) {
+		if(_TcpConnections[i]->sock == sock)
+			return _TcpConnections[i];
+	}
+	return NULL;
+}
+
+void NetconEthernetTap::closeConnection(PhySocket *sock)
+{
+	// Here we assume _tcpconns_m is already locked by caller
+	if(!sock) {
+		dwr(MSG_DEBUG," closeConnection(): invalid PhySocket\n");
+		return;
+	}
+	TcpConnection *conn = getConnection(sock);
+	if(!conn)
+		return;
+	if(conn->pcb && conn->pcb->state != CLOSED) {
+		dwr(MSG_DEBUG," closeConnection(%x): PCB->state = %d\n", sock, conn->pcb->state);
+		if(conn->pcb->state == SYN_SENT) {
+			dwr(MSG_DEBUG," closeConnection(%x): invalid PCB state for this operation. ignoring.\n", sock);
+			return;
+		}	
+		if(lwipstack->_tcp_close(conn->pcb) == ERR_OK) {
+			// Unregister callbacks for this PCB
+			lwipstack->_tcp_arg(conn->pcb, NULL);
+		    lwipstack->_tcp_recv(conn->pcb, NULL);
+		    lwipstack->_tcp_err(conn->pcb, NULL);
+		    lwipstack->_tcp_sent(conn->pcb, NULL);
+		    lwipstack->_tcp_poll(conn->pcb, NULL, 1);
+		}
+		else {
+			dwr(MSG_ERROR," closeConnection(%x): error while calling tcp_close()\n", sock);
+		}
+	}
+	for(size_t i=0;i<_TcpConnections.size();++i) {
+		if(_TcpConnections[i] == conn){
+			_TcpConnections.erase(_TcpConnections.begin() + i);
+			delete conn;
+			break;
+		}
+	}
+	if(!sock)
+		return;
+	close(_phy.getDescriptor(sock));
+	_phy.close(sock, false);
+}
+
+void NetconEthernetTap::phyOnUnixClose(PhySocket *sock,void **uptr) {
+	Mutex::Lock _l(_tcpconns_m);
+	closeConnection(sock);
+}
+
+void NetconEthernetTap::phyOnUnixWritable(PhySocket *sock,void **uptr,bool lwip_invoked)
+{
+	if(!lwip_invoked) {
+		_tcpconns_m.lock();
+		_rx_buf_m.lock();
+	}
+	TcpConnection *conn = getConnection(sock);	
+	if(conn && conn->rxsz) {
+		int n = _phy.streamSend(conn->sock, conn->rxbuf, conn->rxsz);
+		if(n > 0) {
+			if(conn->rxsz-n > 0)
+				memcpy(conn->rxbuf, conn->rxbuf+n, conn->rxsz-n);
+		  	conn->rxsz -= n;
+		  	lwipstack->_tcp_recved(conn->pcb, n);
+		} else {
+			dwr(MSG_DEBUG," phyOnUnixWritable(): errno = %d, rxsz = %d\n", errno, conn->rxsz);
+			_phy.setNotifyWritable(conn->sock, false);
+		}
+	}
+	if(!lwip_invoked) {
+		_tcpconns_m.unlock();
+		_rx_buf_m.unlock();
+	}
+}
+
+void NetconEthernetTap::phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len)
+{		
+	uint64_t CANARY_num;
+	pid_t pid, tid;
+	int rpcCount, wlen = len;
+	char cmd, timestamp[20], CANARY[CANARY_SZ], padding[] = {PADDING};
+	void *payload;
+	unsigned char *buf = (unsigned char*)data;
+	std::pair<PhySocket*, void*> sockdata;
+	PhySocket *rpcSock;
+	bool foundJob = false, detected_rpc = false;
+	TcpConnection *conn;
+
+	// RPC
+	char phrase[RPC_PHRASE_SZ];
+	memset(phrase, 0, RPC_PHRASE_SZ);
+	if(len == BUF_SZ) {
+		memcpy(phrase, buf, RPC_PHRASE_SZ);
+		if(strcmp(phrase, RPC_PHRASE) == 0)
+			detected_rpc = true;
+	}
+	if(detected_rpc) {
+		unloadRPC(data, pid, tid, rpcCount, timestamp, CANARY, cmd, payload);
+		memcpy(&CANARY_num, CANARY, CANARY_SZ);
+		dwr(MSG_DEBUG," <%x> RPC: (pid=%d, tid=%d, rpcCount=%d, timestamp=%s, cmd=%d)\n", 
+			sock, pid, tid, rpcCount, timestamp, cmd);
+
+		if(cmd == RPC_SOCKET) {				
+			dwr(MSG_DEBUG,"  <%x> RPC_SOCKET\n", sock);
+			// Create new lwip socket and associate it with this sock
+			struct socket_st socket_rpc;
+			memcpy(&socket_rpc, &buf[IDX_PAYLOAD+STRUCT_IDX], sizeof(struct socket_st));
+			TcpConnection * new_conn;
+			if((new_conn = handleSocket(sock, uptr, &socket_rpc))) {
+				new_conn->pid = pid; // Merely kept to look up application path/names later, not strictly necessary
+			}
+		} else {
+			jobmap[CANARY_num] = std::make_pair<PhySocket*, void*>(sock, data);
+		}
+		write(_phy.getDescriptor(sock), "z", 1); // RPC ACK byte to maintain order
+	}
+	// STREAM
+	else {
+		int data_start = -1, data_end = -1, canary_pos = -1, padding_pos = -1;
+		// Look for padding
+		std::string padding_pattern(padding, padding+PADDING_SZ);
+		std::string buffer(buf, buf + len);
+		padding_pos = buffer.find(padding_pattern);
+		canary_pos = padding_pos-CANARY_SZ;
+		// Grab token, next we'll use it to look up an RPC job
+		if(canary_pos > -1) {
+			memcpy(&CANARY_num, buf+canary_pos, CANARY_SZ);
+			if(CANARY_num != 0) {
+				// Find job
+				sockdata = jobmap[CANARY_num];
+				if(!sockdata.first) {
+					dwr(MSG_DEBUG," <%x> unable to locate job entry for %llu\n", sock, CANARY_num);
+					return;
+				}  else
+					foundJob = true;
+			}
+		}
+
+		conn = getConnection(sock);
+		if(!conn)
+			return;
+
+		if(padding_pos == -1) { // [DATA]
+			memcpy(&conn->txbuf[conn->txsz], buf, wlen);
+		} else { // Padding found, implies a canary is present
+			// [CANARY]
+			if(len == CANARY_SZ+PADDING_SZ && canary_pos == 0) {
+				wlen = 0; // Nothing to write
+			} else {
+				// [CANARY] + [DATA]
+				if(len > CANARY_SZ+PADDING_SZ && canary_pos == 0) {
+					wlen = len - CANARY_SZ+PADDING_SZ;
+					data_start = padding_pos+PADDING_SZ;
+					memcpy((&conn->txbuf)+conn->txsz, buf+data_start, wlen);
+				}
+				// [DATA] + [CANARY]
+				if(len > CANARY_SZ+PADDING_SZ && canary_pos > 0 && canary_pos == len - CANARY_SZ+PADDING_SZ) {
+					wlen = len - CANARY_SZ+PADDING_SZ;
+					data_start = 0;
+					memcpy((&conn->txbuf)+conn->txsz, buf+data_start, wlen);												
+				}
+				// [DATA] + [CANARY] + [DATA]
+				if(len > CANARY_SZ+PADDING_SZ && canary_pos > 0 && len > (canary_pos + CANARY_SZ+PADDING_SZ)) {
+					wlen = len - CANARY_SZ+PADDING_SZ;
+					data_start = 0;
+					data_end = padding_pos-CANARY_SZ;
+					memcpy((&conn->txbuf)+conn->txsz, buf+data_start, (data_end-data_start)+1);
+					memcpy((&conn->txbuf)+conn->txsz, buf+(padding_pos+PADDING_SZ), len-(canary_pos+CANARY_SZ+PADDING_SZ));
+				}
+			}
+		}
+		// Write data from stream
+		if(conn->txsz > (DEFAULT_BUF_SZ / 2)) {
+			_phy.setNotifyReadable(sock, false);
+		}
+		lwipstack->_lock.lock();
+		conn->txsz += wlen;
+		handleWrite(conn);
+		lwipstack->_lock.unlock();
+	}
+	if(foundJob) {
+		rpcSock = sockdata.first;
+		buf = (unsigned char*)sockdata.second;
+	}
+	// Process RPC if we have a corresponding jobmap entry
+	if(foundJob) {
+		unloadRPC(buf, pid, tid, rpcCount, timestamp, CANARY, cmd, payload);
+		dwr(MSG_DEBUG," <%x> RPC: (pid=%d, tid=%d, rpcCount=%d, timestamp=%s, cmd=%d)\n", 
+			sock, pid, tid, rpcCount, timestamp, cmd);
+
+		switch(cmd) {
+			case RPC_BIND:
+			    struct bind_st bind_rpc;
+			    memcpy(&bind_rpc,  &buf[IDX_PAYLOAD+STRUCT_IDX], sizeof(struct bind_st));
+			    handleBind(sock, rpcSock, uptr, &bind_rpc);
+				break;
+		  	case RPC_LISTEN:
+			    struct listen_st listen_rpc;
+			    memcpy(&listen_rpc,  &buf[IDX_PAYLOAD+STRUCT_IDX], sizeof(struct listen_st));
+			    handleListen(sock, rpcSock, uptr, &listen_rpc);
+				break;
+		  	case RPC_GETSOCKNAME:
+		  		struct getsockname_st getsockname_rpc;
+		    	memcpy(&getsockname_rpc,  &buf[IDX_PAYLOAD+STRUCT_IDX], sizeof(struct getsockname_st));
+		  		handleGetsockname(sock, rpcSock, uptr, &getsockname_rpc);
+		  		break;
+			case RPC_CONNECT:
+			    struct connect_st connect_rpc;
+			    memcpy(&connect_rpc,  &buf[IDX_PAYLOAD+STRUCT_IDX], sizeof(struct connect_st));
+			    handleConnect(sock, rpcSock, conn, &connect_rpc);
+			    jobmap.erase(CANARY_num);
+				return; // Keep open RPC, we'll use it once in nc_connected to send retval
+		  	default:
+				break;
+		}
+		Mutex::Lock _l(_tcpconns_m);
+		closeConnection(sockdata.first); // close RPC after sending retval, no longer needed
+		jobmap.erase(CANARY_num);
+		return;
+	}
+}
+
+int NetconEthernetTap::sendReturnValue(PhySocket *sock, int retval, int _errno = 0){
+	return sendReturnValue(_phy.getDescriptor(sock), retval, _errno);
+}
+int NetconEthernetTap::sendReturnValue(int fd, int retval, int _errno = 0)
+{
+	dwr(MSG_DEBUG," sendReturnValue(): fd = %d, retval = %d, errno = %d\n", fd, retval, _errno);
+	int sz = sizeof(char) + sizeof(retval) + sizeof(errno);
+	char retmsg[sz];
+	memset(&retmsg, 0, sizeof(retmsg));
+	retmsg[0]=RPC_RETVAL;
+	memcpy(&retmsg[1], &retval, sizeof(retval));
+	memcpy(&retmsg[1]+sizeof(retval), &_errno, sizeof(_errno));
+	return write(fd, &retmsg, sz);
+}
+
+void NetconEthernetTap::unloadRPC(void *data, pid_t &pid, pid_t &tid, 
+	int &rpcCount, char (timestamp[RPC_TIMESTAMP_SZ]), char (CANARY[sizeof(uint64_t)]), char &cmd, void* &payload)
+{
+	unsigned char *buf = (unsigned char*)data;
+	memcpy(&pid, &buf[IDX_PID], sizeof(pid_t));
+	memcpy(&tid, &buf[IDX_TID], sizeof(pid_t));
+	memcpy(&rpcCount, &buf[IDX_COUNT], sizeof(int));
+	memcpy(timestamp, &buf[IDX_TIME], RPC_TIMESTAMP_SZ);
+	memcpy(&cmd, &buf[IDX_PAYLOAD], sizeof(char));
+	memcpy(CANARY, &buf[IDX_PAYLOAD+1], CANARY_SZ);
+}
+
+/*------------------------------------------------------------------------------
+--------------------------------- LWIP callbacks -------------------------------
+------------------------------------------------------------------------------*/
+
+err_t NetconEthernetTap::nc_accept(void *arg, struct tcp_pcb *newPCB, err_t err)
+{
+	Larg *l = (Larg*)arg;
+	Mutex::Lock _l(l->tap->_tcpconns_m);
+
+	TcpConnection *conn = l->conn;
+	NetconEthernetTap *tap = l->tap;
+
+	if(!conn->sock)
+		return -1;
+	int fd = tap->_phy.getDescriptor(conn->sock);
+
+  	if(conn) {
+	  	// create new socketpair
+	  	ZT_PHY_SOCKFD_TYPE fds[2];
+		if(socketpair(PF_LOCAL, SOCK_STREAM, 0, fds) < 0) {
+			if(errno < 0) {
+				l->tap->sendReturnValue(conn, -1, errno);
+				dwr(MSG_ERROR," nc_accept(): unable to create socketpair\n");
+				return ERR_MEM;
+			}
+		}
+		// create and populate new TcpConnection
+		TcpConnection *newTcpConn = new TcpConnection();
+		l->tap->_TcpConnections.push_back(newTcpConn);
+		newTcpConn->pcb = newPCB;
+		newTcpConn->sock = tap->_phy.wrapSocket(fds[0], newTcpConn);
+
+		if(sock_fd_write(fd, fds[1]) < 0)
+	  		return -1;
+	    tap->lwipstack->_tcp_arg(newPCB, new Larg(tap, newTcpConn));
+	    tap->lwipstack->_tcp_recv(newPCB, nc_recved);
+	    tap->lwipstack->_tcp_err(newPCB, nc_err);
+	    tap->lwipstack->_tcp_sent(newPCB, nc_sent);
+	    tap->lwipstack->_tcp_poll(newPCB, nc_poll, 1);
+	    if(conn->pcb->state == LISTEN) {
+	    	dwr(MSG_DEBUG," nc_accept(): can't call tcp_accept() on LISTEN socket (pcb = %x)\n", conn->pcb);
+	    	return ERR_OK;
+	    }
+	    tcp_accepted(conn->pcb); // Let lwIP know that it can queue additional incoming connections
+		return ERR_OK;
+  	} else
+  		dwr(MSG_ERROR," nc_accept(): can't locate Connection object for PCB.\n");
+  	return -1;
+}
+
+err_t NetconEthernetTap::nc_recved(void *arg, struct tcp_pcb *PCB, struct pbuf *p, err_t err)
+{
+	Larg *l = (Larg*)arg;
+	int tot = 0;
+  	struct pbuf* q = p;
+	Mutex::Lock _l(l->tap->_tcpconns_m);
+
+	if(!l->conn) {
+		dwr(MSG_ERROR," nc_recved(): no connection\n");
+		return ERR_OK; 
+	}
+	if(p == NULL) {
+		if(l->conn->pcb->state == CLOSE_WAIT){
+			l->tap->closeConnection(l->conn->sock);
+			return ERR_ABRT;
+		}
+		return err;
+	}
+	Mutex::Lock _l2(l->tap->_rx_buf_m);
+	// Cycle through pbufs and write them to the RX buffer
+	// The RX buffer will be emptied via phyOnUnixWritable()
+	while(p != NULL) {
+		if(p->len <= 0)
+			break;
+		int avail = DEFAULT_BUF_SZ - l->conn->rxsz;
+		int len = p->len;
+		if(avail < len)
+			dwr(MSG_ERROR," nc_recved(): not enough room (%d bytes) on RX buffer\n", avail);
+		memcpy(l->conn->rxbuf + (l->conn->rxsz), p->payload, len);
+		l->conn->rxsz += len;
+		p = p->next;
+		tot += len;
+	}
+	if(tot) {
+		l->tap->phyOnUnixWritable(l->conn->sock, NULL, true);
+		l->tap->_phy.setNotifyWritable(l->conn->sock, true);
+	}
+	l->tap->lwipstack->_pbuf_free(q);
+	return ERR_OK;
+}
+
+err_t NetconEthernetTap::nc_sent(void* arg, struct tcp_pcb *PCB, u16_t len)
+{
+	Larg *l = (Larg*)arg;
+	Mutex::Lock _l(l->tap->_tcpconns_m);
+	if(l->conn->probation && l->conn->txsz == 0){
+		l->conn->probation = false; // TX buffer now empty, removing from probation
+	}
+	if(l && l->conn && len && !l->conn->probation) {
+		if(l->conn->txsz < (float)DEFAULT_BUF_SOFTMAX) {
+			l->tap->_phy.setNotifyReadable(l->conn->sock, true);
+			l->tap->_phy.whack();
+		}
+	}
+	return ERR_OK;
+}
+
+err_t NetconEthernetTap::nc_connected(void *arg, struct tcp_pcb *PCB, err_t err)
+{
+	Larg *l = (Larg*)arg;
+	if(l && l->conn)
+		l->tap->sendReturnValue(l->tap->_phy.getDescriptor(l->conn->rpcSock), ERR_OK);
+	return ERR_OK;
+}
+
+err_t NetconEthernetTap::nc_poll(void* arg, struct tcp_pcb *PCB)
+{
+	return ERR_OK;
+}
+
+void NetconEthernetTap::nc_err(void *arg, err_t err)
+{
+	dwr(MSG_DEBUG,"nc_err() = %d\n", err);
+	Larg *l = (Larg*)arg;
+	Mutex::Lock _l(l->tap->_tcpconns_m);
+
+	if(!l->conn)
+		dwr(MSG_ERROR,"nc_err(): connection is NULL!\n");
+	int fd = l->tap->_phy.getDescriptor(l->conn->sock);
+
+	switch(err)
+	{
+		case ERR_MEM:
+		  dwr(MSG_ERROR,"nc_err(): ERR_MEM->ENOMEM\n");
+			l->tap->sendReturnValue(fd, -1, ENOMEM);
+			break;
+		case ERR_BUF:
+			dwr(MSG_ERROR,"nc_err(): ERR_BUF->ENOBUFS\n");
+			l->tap->sendReturnValue(fd, -1, ENOBUFS);
+			break;
+		case ERR_TIMEOUT:
+			dwr(MSG_ERROR,"nc_err(): ERR_TIMEOUT->ETIMEDOUT\n");
+			l->tap->sendReturnValue(fd, -1, ETIMEDOUT);
+			break;
+		case ERR_RTE:
+			dwr(MSG_ERROR,"nc_err(): ERR_RTE->ENETUNREACH\n");
+			l->tap->sendReturnValue(fd, -1, ENETUNREACH);
+			break;
+		case ERR_INPROGRESS:
+			dwr(MSG_ERROR,"nc_err(): ERR_INPROGRESS->EINPROGRESS\n");
+			l->tap->sendReturnValue(fd, -1, EINPROGRESS);
+			break;
+		case ERR_VAL:
+			dwr(MSG_ERROR,"nc_err(): ERR_VAL->EINVAL\n");
+			l->tap->sendReturnValue(fd, -1, EINVAL);
+			break;
+		case ERR_WOULDBLOCK:
+			dwr(MSG_ERROR,"nc_err(): ERR_WOULDBLOCK->EWOULDBLOCK\n");
+			l->tap->sendReturnValue(fd, -1, EWOULDBLOCK);
+			break;
+		case ERR_USE:
+			dwr(MSG_ERROR,"nc_err(): ERR_USE->EADDRINUSE\n");
+			l->tap->sendReturnValue(fd, -1, EADDRINUSE);
+			break;
+		case ERR_ISCONN:
+			dwr(MSG_ERROR,"nc_err(): ERR_ISCONN->EISCONN\n");
+			l->tap->sendReturnValue(fd, -1, EISCONN);
+			break;
+		case ERR_ABRT:
+			dwr(MSG_ERROR,"nc_err(): ERR_ABRT->ECONNREFUSED\n");
+			l->tap->sendReturnValue(fd, -1, ECONNREFUSED);
+			break;
+
+			// FIXME: Below are errors which don't have a standard errno correlate
+
+		case ERR_RST:
+			l->tap->sendReturnValue(fd, -1, -1);
+			break;
+		case ERR_CLSD:
+			l->tap->sendReturnValue(fd, -1, -1);
+			break;
+		case ERR_CONN:
+			l->tap->sendReturnValue(fd, -1, -1);
+			break;
+		case ERR_ARG:
+			l->tap->sendReturnValue(fd, -1, -1);
+			break;
+		case ERR_IF:
+			l->tap->sendReturnValue(fd, -1, -1);
+			break;
+		default:
+			break;
+	}
+	dwr(MSG_ERROR,"nc_err(): closing connection\n");
+	l->tap->closeConnection(l->conn);
+}
+
+/*------------------------------------------------------------------------------
+----------------------------- RPC Handler functions ----------------------------
+------------------------------------------------------------------------------*/
+
+void NetconEthernetTap::handleGetsockname(PhySocket *sock, PhySocket *rpcSock, void **uptr, struct getsockname_st *getsockname_rpc)
+{
+	Mutex::Lock _l(_tcpconns_m);
+	TcpConnection *conn = getConnection(sock);
+	char retmsg[sizeof(struct sockaddr_storage)];
+	memset(&retmsg, 0, sizeof(retmsg));
+	if ((conn)&&(conn->addr))
+    	memcpy(&retmsg, conn->addr, sizeof(struct sockaddr_storage));
+	write(_phy.getDescriptor(rpcSock), &retmsg, sizeof(struct sockaddr_storage));
+}
+
+void NetconEthernetTap::handleBind(PhySocket *sock, PhySocket *rpcSock, void **uptr, struct bind_st *bind_rpc)
+{
+	Mutex::Lock _l(_tcpconns_m);
+	struct sockaddr_in *rawAddr = (struct sockaddr_in *) &bind_rpc->addr;
+	int port = lwipstack->ntohs(rawAddr->sin_port);
+	ip_addr_t connAddr;
+	connAddr.addr = *((u32_t *)_ips[0].rawIpData());
+	TcpConnection *conn = getConnection(sock);
+	dwr(MSG_DEBUG," handleBind(%d)\n", bind_rpc->sockfd);
+	if(conn) {
+		if(conn->pcb->state == CLOSED){
+	  		int err = lwipstack->tcp_bind(conn->pcb, &connAddr, port);
+			int ip = rawAddr->sin_addr.s_addr;
+			unsigned char d[4];
+			d[0] = ip & 0xFF;
+			d[1] = (ip >>  8) & 0xFF;
+			d[2] = (ip >> 16) & 0xFF;
+			d[3] = (ip >> 24) & 0xFF;
+			dwr(MSG_DEBUG," handleBind(): %d.%d.%d.%d : %d\n", d[0],d[1],d[2],d[3], port);
+
+			if(err != ERR_OK) {
+				dwr(MSG_ERROR," handleBind(): err = %d\n", err);
+				if(err == ERR_USE)
+					sendReturnValue(rpcSock, -1, EADDRINUSE);
+				if(err == ERR_MEM)
+					sendReturnValue(rpcSock, -1, ENOMEM);
+				if(err == ERR_BUF)
+					sendReturnValue(rpcSock, -1, ENOMEM);
+			} else {
+				conn->addr = (struct sockaddr_storage *) &bind_rpc->addr;
+				sendReturnValue(rpcSock, ERR_OK, ERR_OK); // Success
+			}
+		} else {
+			dwr(MSG_ERROR," handleBind(): PCB (%x) not in CLOSED state. Ignoring BIND request.\n", conn->pcb);
+			sendReturnValue(rpcSock, -1, EINVAL);
+		}
+	} else {
+		dwr(MSG_ERROR," handleBind(): unable to locate TcpConnection.\n");
+		sendReturnValue(rpcSock, -1, EBADF);
+	}
+}
+
+void NetconEthernetTap::handleListen(PhySocket *sock, PhySocket *rpcSock, void **uptr, struct listen_st *listen_rpc)
+{
+	Mutex::Lock _l(_tcpconns_m);
+	TcpConnection *conn = getConnection(sock);
+	if(!conn){
+		dwr(MSG_ERROR," handleListen(): unable to locate TcpConnection.\n");
+		sendReturnValue(rpcSock, -1, EBADF);
+		return;
+	}
+	if(conn->pcb->state == LISTEN) {
+		dwr(MSG_ERROR," handleListen(): PCB is already in listening state.\n");
+		sendReturnValue(rpcSock, ERR_OK, ERR_OK);
+		return;
+	}
+	struct tcp_pcb* listeningPCB;
+
+#ifdef TCP_LISTEN_BACKLOG
+		listeningPCB = lwipstack->tcp_listen_with_backlog(conn->pcb, listen_rpc->backlog);
+#else
+		listeningPCB = lwipstack->tcp_listen(conn->pcb);
+#endif
+
+	if(listeningPCB != NULL) {
+    	conn->pcb = listeningPCB;
+    	lwipstack->tcp_accept(listeningPCB, nc_accept);
+		lwipstack->tcp_arg(listeningPCB, new Larg(this, conn));
+		/* we need to wait for the client to send us the fd allocated on their end
+		for this listening socket */
+		fcntl(_phy.getDescriptor(conn->sock), F_SETFL, O_NONBLOCK);
+		conn->listening = true;
+		sendReturnValue(rpcSock, ERR_OK, ERR_OK);
+		return;
+  	}
+  sendReturnValue(rpcSock, -1, -1);
+}
+
+TcpConnection * NetconEthernetTap::handleSocket(PhySocket *sock, void **uptr, struct socket_st* socket_rpc)
+{
+	Mutex::Lock _l(_tcpconns_m);
+	struct tcp_pcb *newPCB = lwipstack->tcp_new();
+  	if(newPCB != NULL) {
+  		TcpConnection *newConn = new TcpConnection();
+  		*uptr = newConn;
+  		newConn->sock = sock;
+  		newConn->pcb = newPCB;
+  		_TcpConnections.push_back(newConn);
+		return newConn;
+	}
+	dwr(MSG_ERROR," handleSocket(): Memory not available for new PCB\n");
+	sendReturnValue(_phy.getDescriptor(sock), -1, ENOMEM);
+	return NULL;
+}
+
+void NetconEthernetTap::handleConnect(PhySocket *sock, PhySocket *rpcSock, TcpConnection *conn, struct connect_st* connect_rpc)
+{
+	Mutex::Lock _l(_tcpconns_m);
+	struct sockaddr_in *rawAddr = (struct sockaddr_in *) &connect_rpc->__addr;
+	int port = lwipstack->ntohs(rawAddr->sin_port);
+	ip_addr_t connAddr = convert_ip(rawAddr);
+
+	if(conn != NULL) {
+		lwipstack->tcp_sent(conn->pcb, nc_sent);
+		lwipstack->tcp_recv(conn->pcb, nc_recved);
+		lwipstack->tcp_err(conn->pcb, nc_err);
+		lwipstack->tcp_poll(conn->pcb, nc_poll, APPLICATION_POLL_FREQ);
+		lwipstack->tcp_arg(conn->pcb, new Larg(this, conn));
+
+		int err = 0, ip = rawAddr->sin_addr.s_addr;
+		unsigned char d[4];
+		d[0] = ip & 0xFF;
+		d[1] = (ip >>  8) & 0xFF;
+		d[2] = (ip >> 16) & 0xFF;
+		d[3] = (ip >> 24) & 0xFF;
+		dwr(MSG_DEBUG," handleConnect(): %d.%d.%d.%d: %d\n", d[0],d[1],d[2],d[3], port);	
+		dwr(MSG_DEBUG," handleConnect(): pcb->state = %x\n", conn->pcb->state);
+		if(conn->pcb->state != CLOSED) {
+			dwr(MSG_DEBUG," handleConnect(): PCB != CLOSED, cannot connect using this PCB\n");
+			sendReturnValue(rpcSock, -1, EAGAIN);
+			return;
+		}
+		if((err = lwipstack->tcp_connect(conn->pcb,&connAddr,port,nc_connected)) < 0)
+		{
+			if(err == ERR_ISCONN) {
+				sendReturnValue(rpcSock, -1, EISCONN); // Already in connected state
+				return;
+			} if(err == ERR_USE) {
+				sendReturnValue(rpcSock, -1, EADDRINUSE); // Already in use
+				return;
+			} if(err == ERR_VAL) {
+				sendReturnValue(rpcSock, -1, EINVAL); // Invalid ipaddress parameter
+				return;
+			} if(err == ERR_RTE) {
+				sendReturnValue(rpcSock, -1, ENETUNREACH); // No route to host
+				return;
+			} if(err == ERR_BUF) {
+				sendReturnValue(rpcSock, -1, EAGAIN); // No more ports available
+				return;
+			}
+			if(err == ERR_MEM) {
+				/* Can occur for the following reasons: tcp_enqueue_flags()
+
+				1) tcp_enqueue_flags is always called with either SYN or FIN in flags.
+				  We need one available snd_buf byte to do that.
+				  This means we can't send FIN while snd_buf==0. A better fix would be to
+				  not include SYN and FIN sequence numbers in the snd_buf count.
+
+				2) Cannot allocate new pbuf
+				3) Cannot allocate new TCP segment
+
+				*/
+				sendReturnValue(rpcSock, -1, EAGAIN); // FIXME: Doesn't describe the problem well, but closest match
+				return;
+			}
+
+			// We should only return a value if failure happens immediately
+			// Otherwise, we still need to wait for a callback from lwIP.
+			// - This is because an ERR_OK from tcp_connect() only verifies
+			//   that the SYN packet was enqueued onto the stack properly,
+			//   that's it!
+			// - Most instances of a retval for a connect() should happen
+			//   in the nc_connect() and nc_err() callbacks!
+			dwr(MSG_ERROR," handleConnect(): unable to connect\n");
+			sendReturnValue(rpcSock, -1, EAGAIN);
+		}
+		// Everything seems to be ok, but we don't have enough info to retval
+		conn->listening=true;
+		conn->rpcSock=rpcSock; // used for return value from lwip CB
+	} else {
+		dwr(MSG_ERROR," handleConnect(): could not locate PCB based on their fd\n");
+		sendReturnValue(rpcSock, -1, EBADF);
+	}
+}
+
+void NetconEthernetTap::handleWrite(TcpConnection *conn)
+{
+	if(!conn || !conn->pcb) {
+		dwr(MSG_ERROR," handleWrite(): invalid connection/PCB\n");
+		return;
+	}
+	// How much we are currently allowed to write to the connection
+	int err, sz, r, sndbuf = conn->pcb->snd_buf;
+	if(!sndbuf) {
+		/* PCB send buffer is full, turn off readability notifications for the
+		corresponding PhySocket until nc_sent() is called and confirms that there is
+		now space on the buffer */
+		if(!conn->probation) {
+			dwr(MSG_DEBUG," handleWrite(): sndbuf == 0, LWIP stack is full\n");
+			_phy.setNotifyReadable(conn->sock, false);
+			conn->probation = true;
+		}
+		return;
+	}
+	if(conn->txsz <= 0)
+		return; // Nothing to write
+	if(!conn->listening)
+		lwipstack->_tcp_output(conn->pcb);
+
+	if(conn->sock) {
+		r = conn->txsz < sndbuf ? conn->txsz : sndbuf;
+		/* Writes data pulled from the client's socket buffer to LWIP. This merely sends the
+		 * data to LWIP to be enqueued and eventually sent to the network. */
+		if(r > 0) {
+			err = lwipstack->_tcp_write(conn->pcb, &conn->txbuf, r, TCP_WRITE_FLAG_COPY);
+			lwipstack->_tcp_output(conn->pcb);
+			if(err != ERR_OK) {
+				dwr(MSG_ERROR," handleWrite(): error while writing to PCB, (err = %d)\n", err);
+				if(err == -1) 
+					dwr(MSG_DEBUG," handleWrite(): out of memory\n");
+				return;
+			} else {
+				sz = (conn->txsz)-r;
+				if(sz)
+					memmove(&conn->txbuf, (conn->txbuf+r), sz);
+				conn->txsz -= r;
+
+				float max = (float)DEFAULT_BUF_SZ;
+				dwr(MSG_TRANSFER," TX --->    :: {TX: %.3f%%, RX: %.3f%%, sock=%x} :: %d bytes\n", 
+					(float)conn->txsz / max, (float)conn->rxsz / max, conn->sock, r);
+				return;
+			}
+		}
+	}
+}
+
+} // namespace ZeroTier
diff --git a/netcon/NetconEthernetTap.hpp b/netcon/NetconEthernetTap.hpp
new file mode 100644
index 000000000..2c79840bc
--- /dev/null
+++ b/netcon/NetconEthernetTap.hpp
@@ -0,0 +1,460 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_NETCONETHERNETTAP_HPP
+#define ZT_NETCONETHERNETTAP_HPP
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <stdexcept>
+#include <stdint.h>
+
+#include "../node/Constants.hpp"
+#include "../node/MulticastGroup.hpp"
+#include "../node/Mutex.hpp"
+#include "../node/InetAddress.hpp"
+#include "../osdep/Thread.hpp"
+#include "../osdep/Phy.hpp"
+
+#include "netif/etharp.h"
+
+#include "RPC.h"
+
+struct tcp_pcb;
+struct socket_st;
+struct listen_st;
+struct bind_st;
+struct connect_st;
+struct getsockname_st;
+struct accept_st;
+
+#define APPLICATION_POLL_FREQ           2
+#define ZT_LWIP_TCP_TIMER_INTERVAL      5
+#define STATUS_TMR_INTERVAL             250 // How often we check connection statuses (in ms)
+#define DEFAULT_BUF_SZ                  1024 * 1024 * 2
+#define DEFAULT_BUF_SOFTMAX				DEFAULT_BUF_SZ / 2
+
+namespace ZeroTier {
+
+class NetconEthernetTap;
+class LWIPStack;
+
+/*
+ * TCP connection administered by service
+ */
+struct TcpConnection
+{
+  bool listening, probation;
+  int pid, txsz, rxsz;
+  PhySocket *rpcSock, *sock;
+  struct tcp_pcb *pcb;
+  struct sockaddr_storage *addr;
+  unsigned char txbuf[DEFAULT_BUF_SZ];
+  unsigned char rxbuf[DEFAULT_BUF_SZ];
+};
+
+/*
+ * A helper for passing a reference to _phy to LWIP callbacks as a "state"
+ */
+struct Larg
+{
+  NetconEthernetTap *tap;
+  TcpConnection *conn;
+  Larg(NetconEthernetTap *_tap, TcpConnection *conn) : tap(_tap), conn(conn) {}
+};
+
+/*
+ * Network Containers instance -- emulates an Ethernet tap device as far as OneService knows
+ */
+class NetconEthernetTap
+{
+	friend class Phy<NetconEthernetTap *>;
+
+public:
+	NetconEthernetTap(
+		const char *homePath,
+		const MAC &mac,
+		unsigned int mtu,
+		unsigned int metric,
+		uint64_t nwid,
+		const char *friendlyName,
+		void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+		void *arg);
+
+	~NetconEthernetTap();
+
+	void setEnabled(bool en);
+	bool enabled() const;
+	bool addIp(const InetAddress &ip);
+	bool removeIp(const InetAddress &ip);
+	std::vector<InetAddress> ips() const;
+	void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
+	std::string deviceName() const;
+	void setFriendlyName(const char *friendlyName);
+	void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
+
+	void threadMain()
+		throw();
+
+	LWIPStack *lwipstack;
+  uint64_t _nwid;
+  void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
+  void *_arg;
+
+private:
+	// LWIP callbacks
+	// NOTE: these are called from within LWIP, meaning that lwipstack->_lock is ALREADY
+	// locked in this case!
+
+	/*
+	 * Callback from LWIP for when a connection has been accepted and the PCB has been
+	 * put into an ACCEPT state.
+	 *
+	 * A socketpair is created, one end is kept and wrapped into a PhySocket object
+	 * for use in the main ZT I/O loop, and one end is sent to the client. The client
+	 * is then required to tell the service what new file descriptor it has allocated
+	 * for this connection. After the mapping is complete, the accepted socket can be
+	 * used.
+	 *
+	 * @param associated service state object
+	 * @param newly allocated PCB
+	 * @param error code
+	 * @return ERR_OK if everything is ok, -1 otherwise
+	 *
+	 *	 i := should be implemented in intercept lib
+	 *	 I := is implemented in intercept lib
+	 *	 X := is implemented in service
+	 *	 ? := required treatment Unknown
+	 *	 - := Not needed
+	 *
+	 *	[ ] EAGAIN or EWOULDBLOCK - The socket is marked nonblocking and no connections are present
+	 *													to be accepted. POSIX.1-2001 allows either error to be returned for
+	 *													this case, and does not require these constants to have the same value,
+	 *													so a portable application should check for both possibilities.
+	 *	[I] EBADF - The descriptor is invalid.
+	 *	[I] ECONNABORTED - A connection has been aborted.
+	 *	[i] EFAULT - The addr argument is not in a writable part of the user address space.
+	 *	[-] EINTR - The system call was interrupted by a signal that was caught before a valid connection arrived; see signal(7).
+	 *	[I] EINVAL - Socket is not listening for connections, or addrlen is invalid (e.g., is negative).
+	 *	[I] EINVAL - (accept4()) invalid value in flags.
+	 *	[I] EMFILE - The per-process limit of open file descriptors has been reached.
+	 *	[ ] ENFILE - The system limit on the total number of open files has been reached.
+	 *	[ ] ENOBUFS, ENOMEM - Not enough free memory. This often means that the memory allocation is
+	 *												limited by the socket buffer limits, not by the system memory.
+	 *	[I] ENOTSOCK - The descriptor references a file, not a socket.
+	 *	[I] EOPNOTSUPP - The referenced socket is not of type SOCK_STREAM.
+	 *	[ ] EPROTO - Protocol error.
+	 *
+	 */
+	static err_t nc_accept(void *arg, struct tcp_pcb *newPCB, err_t err);
+
+	/*
+	 * Callback from LWIP for when data is available to be read from the network.
+	 *
+	 * Data is in the form of a linked list of struct pbufs, it is then recombined and
+	 * send to the client over the associated unix socket.
+	 *
+	 * @param associated service state object
+	 * @param allocated PCB
+	 * @param chain of pbufs
+	 * @param error code
+	 * @return ERR_OK if everything is ok, -1 otherwise
+	 *
+	 */
+ 	static err_t nc_recved(void *arg, struct tcp_pcb *PCB, struct pbuf *p, err_t err);
+
+	/*
+	 * Callback from LWIP when an internal error is associtated with the given (arg)
+	 *
+	 * Since the PCB related to this error might no longer exist, only its perviously
+	 * associated (arg) is provided to us.
+	 *
+	 * @param associated service state object
+	 * @param error code
+	 *
+	 */
+	static void nc_err(void *arg, err_t err);
+
+	/*
+	 * Callback from LWIP to do whatever work we might need to do.
+	 *
+	 * @param associated service state object
+	 * @param PCB we're polling on
+	 * @return ERR_OK if everything is ok, -1 otherwise
+	 *
+	 */
+	static err_t nc_poll(void* arg, struct tcp_pcb *PCB);
+
+	/*
+	 * Callback from LWIP to signal that 'len' bytes have successfully been sent.
+	 * As a result, we should put our socket back into a notify-on-readability state
+	 * since there is now room on the PCB buffer to write to.
+	 *
+	 * NOTE: This could be used to track the amount of data sent by a connection.
+	 *
+	 * @param associated service state object
+	 * @param relevant PCB
+	 * @param length of data sent
+	 * @return ERR_OK if everything is ok, -1 otherwise
+	 *
+	 */
+	static err_t nc_sent(void *arg, struct tcp_pcb *PCB, u16_t len);
+
+	/*
+	 * Callback from LWIP which sends a return value to the client to signal that
+	 * a connection was established for this PCB
+	 *
+	 * @param associated service state object
+	 * @param relevant PCB
+	 * @param error code
+	 * @return ERR_OK if everything is ok, -1 otherwise
+	 *
+	 */
+	static err_t nc_connected(void *arg, struct tcp_pcb *PCB, err_t err);
+	
+	//static void nc_close(struct tcp_pcb *PCB);
+	//static err_t nc_send(struct tcp_pcb *PCB);
+
+	/*
+	 * Handles an RPC to bind an LWIP PCB to a given address and port
+	 *
+	 * @param PhySocket associated with this RPC connection
+	 * @param structure containing the data and parameters for this client's RPC
+	 *
+
+	 i := should be implemented in intercept lib
+	 I := is implemented in intercept lib
+	 X := is implemented in service
+	 ? := required treatment Unknown
+	 - := Not needed
+
+	[ ]	EACCES - The address is protected, and the user is not the superuser.
+	[X]	EADDRINUSE - The given address is already in use.
+	[I]	EBADF - sockfd is not a valid descriptor.
+	[X]	EINVAL - The socket is already bound to an address.
+	[I]	ENOTSOCK - sockfd is a descriptor for a file, not a socket.
+
+	[X]	ENOMEM - Insufficient kernel memory was available.
+
+	  - The following errors are specific to UNIX domain (AF_UNIX) sockets:
+
+	[-]	EACCES - Search permission is denied on a component of the path prefix. (See also path_resolution(7).)
+	[-]	EADDRNOTAVAIL - A nonexistent interface was requested or the requested address was not local.
+	[-]	EFAULT - addr points outside the user's accessible address space.
+	[-]	EINVAL - The addrlen is wrong, or the socket was not in the AF_UNIX family.
+	[-]	ELOOP - Too many symbolic links were encountered in resolving addr.
+	[-]	ENAMETOOLONG - s addr is too long.
+	[-]	ENOENT - The file does not exist.
+	[-]	ENOTDIR - A component of the path prefix is not a directory.
+	[-]	EROFS - The socket inode would reside on a read-only file system.
+	 */
+	void handleBind(PhySocket *sock, PhySocket *rpcsock, void **uptr, struct bind_st *bind_rpc);
+	
+	/*
+	 * Handles an RPC to put an LWIP PCB into LISTEN mode
+	 *
+	 * @param PhySocket associated with this RPC connection
+	 * @param structure containing the data and parameters for this client's RPC
+	 *
+
+	 i := should be implemented in intercept lib
+	 I := is implemented in intercept lib
+	 X := is implemented in service
+	 ? := required treatment Unknown
+	 - := Not needed
+
+	[?] EADDRINUSE - Another socket is already listening on the same port.
+	[IX] EBADF - The argument sockfd is not a valid descriptor.
+	[I] ENOTSOCK - The argument sockfd is not a socket.
+	[I] EOPNOTSUPP - The socket is not of a type that supports the listen() operation.
+	 */
+	void handleListen(PhySocket *sock, PhySocket *rpcsock, void **uptr, struct listen_st *listen_rpc);
+	
+	/*
+	 * Handles an RPC to create a socket (LWIP PCB and associated socketpair)
+	 *
+	 * A socketpair is created, one end is kept and wrapped into a PhySocket object
+	 * for use in the main ZT I/O loop, and one end is sent to the client. The client
+	 * is then required to tell the service what new file descriptor it has allocated
+	 * for this connection. After the mapping is complete, the socket can be used.
+	 *
+	 * @param PhySocket associated with this RPC connection
+	 * @param structure containing the data and parameters for this client's RPC
+	 *
+
+	 i := should be implemented in intercept lib
+	 I := is implemented in intercept lib
+	 X := is implemented in service
+	 ? := required treatment Unknown
+	 - := Not needed
+
+	[-] EACCES - Permission to create a socket of the specified type and/or protocol is denied.
+	[I] EAFNOSUPPORT - The implementation does not support the specified address family.
+	[I] EINVAL - Unknown protocol, or protocol family not available.
+	[I] EINVAL - Invalid flags in type.
+	[I] EMFILE - Process file table overflow.
+	[?] ENFILE - The system limit on the total number of open files has been reached.
+	[X] ENOBUFS or ENOMEM - Insufficient memory is available.  The socket cannot be created until sufficient resources are freed.
+	[?] EPROTONOSUPPORT - The protocol type or the specified protocol is not supported within this domain.
+	 */
+	TcpConnection * handleSocket(PhySocket *sock, void **uptr, struct socket_st* socket_rpc);
+	
+	/*
+	 * Handles an RPC to connect to a given address and port
+	 *
+	 * @param PhySocket associated with this RPC connection
+	 * @param structure containing the data and parameters for this client's RPC
+
+	--- Error handling in this method will only catch problems which are immedately
+	    apprent. Some errors will need to be caught in the nc_connected(0 callback
+
+	 i := should be implemented in intercept lib
+ 	 I := is implemented in intercept lib
+ 	 X := is implemented in service
+ 	 ? := required treatment Unknown
+ 	 - := Not needed
+
+	[-] EACCES - For UNIX domain sockets, which are identified by pathname: Write permission is denied ...
+	[?] EACCES, EPERM - The user tried to connect to a broadcast address without having the socket broadcast flag enabled ...
+	[X] EADDRINUSE - Local address is already in use.
+	[I] EAFNOSUPPORT - The passed address didn't have the correct address family in its sa_family field.
+	[X] EAGAIN - No more free local ports or insufficient entries in the routing cache.
+	[ ] EALREADY - The socket is nonblocking and a previous connection attempt has not yet been completed.
+	[IX] EBADF - The file descriptor is not a valid index in the descriptor table.
+	[ ] ECONNREFUSED - No-one listening on the remote address.
+	[i] EFAULT - The socket structure address is outside the user's address space.
+	[ ] EINPROGRESS - The socket is nonblocking and the connection cannot be completed immediately.
+	[-] EINTR - The system call was interrupted by a signal that was caught.
+	[X] EISCONN - The socket is already connected.
+	[X] ENETUNREACH - Network is unreachable.
+	[I] ENOTSOCK - The file descriptor is not associated with a socket.
+	[X] ETIMEDOUT - Timeout while attempting connection.
+
+	[X] EINVAL - Invalid argument, SVr4, generally makes sense to set this
+	 */
+	void handleConnect(PhySocket *sock, PhySocket *rpcsock, TcpConnection *conn, struct connect_st* connect_rpc);
+	
+	/* 
+	 * Return the address that the socket is bound to 
+	 */
+	void handleGetsockname(PhySocket *sock, PhySocket *rpcsock, void **uptr, struct getsockname_st *getsockname_rpc);
+
+	/* 
+ 	 * Writes data from the application's socket to the LWIP connection
+ 	 */
+	void handleWrite(TcpConnection *conn);
+
+	/*
+	 * Sends a return value to the intercepted application
+	 */
+	int sendReturnValue(PhySocket *sock, int retval, int _errno);
+	int sendReturnValue(int fd, int retval, int _errno);
+
+	/* 
+ 	* Unpacks the buffer from an RPC command
+ 	*/
+	void unloadRPC(void *data, pid_t &pid, pid_t &tid, 
+		int &rpc_count, char (timestamp[RPC_TIMESTAMP_SZ]), char (magic[sizeof(uint64_t)]), char &cmd, void* &payload);
+
+	// Unused -- no UDP or TCP from this thread/Phy<>
+	void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len);
+	void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success);
+	void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from);
+	void phyOnTcpClose(PhySocket *sock,void **uptr);
+	void phyOnTcpData(PhySocket *sock,void **uptr,void *data,unsigned long len);
+	void phyOnTcpWritable(PhySocket *sock,void **uptr);
+
+	/*
+ 	 * Signals us to close the TcpConnection associated with this PhySocket
+ 	 */
+	void phyOnUnixClose(PhySocket *sock,void **uptr);
+	
+    /* 
+ 	 * Notifies us that there is data to be read from an application's socket
+ 	 */
+	void phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len);
+	
+	/* 
+ 	 * Notifies us that we can write to an application's socket
+ 	 */
+	void phyOnUnixWritable(PhySocket *sock,void **uptr,bool lwip_invoked);
+
+	/*
+ 	 * Returns a pointer to a TcpConnection associated with a given PhySocket
+ 	 */
+	TcpConnection *getConnection(PhySocket *sock);
+
+	/*
+ 	 * Closes a TcpConnection, associated LWIP PCB strcuture, 
+ 	 * PhySocket, and underlying file descriptor
+ 	 */
+	void closeConnection(PhySocket *sock);
+
+	ip_addr_t convert_ip(struct sockaddr_in * addr)
+	{
+	  ip_addr_t conn_addr;
+	  struct sockaddr_in *ipv4 = addr;
+	  short a = ip4_addr1(&(ipv4->sin_addr));
+	  short b = ip4_addr2(&(ipv4->sin_addr));
+	  short c = ip4_addr3(&(ipv4->sin_addr));
+	  short d = ip4_addr4(&(ipv4->sin_addr));
+	  IP4_ADDR(&conn_addr, a,b,c,d);
+	  return conn_addr;
+	}
+
+	Phy<NetconEthernetTap *> _phy;
+	PhySocket *_unixListenSocket;
+
+	std::vector<TcpConnection*> _TcpConnections;
+	std::map<uint64_t, std::pair<PhySocket*, void*> > jobmap;
+
+	pid_t rpcCounter;
+	netif interface;
+
+	MAC _mac;
+	Thread _thread;
+	std::string _homePath;
+	std::string _dev; // path to Unix domain socket
+
+	std::vector<MulticastGroup> _multicastGroups;
+	Mutex _multicastGroups_m;
+
+	std::vector<InetAddress> _ips;
+	Mutex _ips_m, _tcpconns_m, _rx_buf_m;
+
+	unsigned int _mtu;
+	volatile bool _enabled;
+	volatile bool _run;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/netcon/README.md b/netcon/README.md
new file mode 100644
index 000000000..12d48c1d0
--- /dev/null
+++ b/netcon/README.md
@@ -0,0 +1,214 @@
+Network Containers (beta)
+======
+
+ZeroTier Network Containers offers a microkernel-like networking paradigm for containerized applications and application-specific virtual networking.
+
+Network Containers couples the ZeroTier core Ethernet virtualization engine with a user-space TCP/IP stack and a library that intercepts calls to the Posix network API. This allows servers and applications to be used without modification or recompilation. It can be used to run services on virtual networks without elevated privileges, special configuration of the physical host, kernel support, or any other application specific configuration. It's ideal for use with [Docker](http://http://www.docker.com), [LXC](https://linuxcontainers.org), or [Rkt](https://coreos.com/rkt/docs/latest/) to build containerized microservices that automatically connect to a virtual network when deployed. It can also be used on a plain un-containerized Linux system to run applications on virtual networks without elevated privileges or system modification.
+
+More discussion can be found in our [original blog announcement](https://www.zerotier.com/blog/?p=490) and [the netcon product page](https://www.zerotier.com/product-netcon.shtml).
+
+Network Containers is currently in **BETA** and is suitable for testing and experimentation. Only Linux is supported. Future updates will focus on compatibility, full stack support, and improved performance, and may also port to other OSes.
+
+# Limitations and Compatibility
+
+The beta version of Network Containers **only supports TCP over IPv4**. There is no IPv6 support and no support for UDP or ICMP (or RAW sockets). That means network-containerizing *ping* won't work, nor will UDP-based apps like VoIP servers, DNS servers, or P2P apps.
+
+The virtual TCP/IP stack will respond to *incoming* ICMP ECHO requests, which means that you can ping it from another host on the same ZeroTier virtual network. This is useful for testing.
+
+**Network Containers are currently all or nothing.** If engaged, the intercept library intercepts all network I/O calls and redirects them through the new path. A network-containerized application cannot communicate over the regular network connection of its host or container or with anything else except other hosts on its ZeroTier virtual LAN. Support for optional "fall-through" to the host IP stack for outgoing connections outside the virtual network and for gateway routes within the virtual network is planned. (It will be optional since in some cases total network isolation might be considered a nice security feature.)
+
+#### Compatibility Test Results
+
+The following applications have been tested and confirmed to work for the beta release:
+
+Fedora 23:
+
+    httpstub.c
+    nginx 1.8.0
+    http 2.4.16, 2.4.17
+    darkhttpd 1.11
+    python 2.7.10 (python -m SimpleHTTPServer)
+    python 3.4.3 (python -m http.server)
+    redis 3.0.4
+    node 6.0.0-pre
+    sshd
+
+CentOS 7:
+
+    httpstub.c
+    nginx 1.6.3
+    httpd 2.4.6 (debug mode -X)
+    darkhttpd 1.11
+    node 4.2.2
+    redis 2.8.19
+    sshd
+
+Ubuntu 14.04.3:
+
+    httpstub.c
+    nginx 1.4.6
+    python 2.7.6 (python -m SimpleHTTPServer)
+    python 3.4.0 (python -m http.server)
+    node 5.2.0
+    redis 2.8.4
+    sshd
+
+It is *likely* to work with other things but there are no guarantees.
+
+# Building Network Containers
+
+Network Containers are currently only for Linux. To build the network container host, IP stack, and intercept library, from the base of the ZeroTier One tree run:
+
+    make clean
+    make netcon
+
+This will build a binary called *zerotier-netcon-service* and a library called *libzerotierintercept.so*. It will also build the IP stack as *netcon/liblwip.so*.
+
+The *zerotier-netcon-service* binary is almost the same as a regular ZeroTier One build except instead of creating virtual network ports using Linux's */dev/net/tun* interface, it creates instances of a user-space TCP/IP stack for each virtual network and provides RPC access to this stack via a Unix domain socket. The latter is a library that can be loaded with the Linux *LD\_PRELOAD* environment variable or by placement into */etc/ld.so.preload* on a Linux system or container. Additional magic involving nameless Unix domain socket pairs and interprocess socket handoff is used to emulate TCP sockets with extremely low overhead and in a way that's compatible with select, poll, epoll, and other I/O event mechanisms.
+
+The intercept library does nothing unless the *ZT\_NC\_NETWORK* environment variable is set. If on program launch (or fork) it detects the presence of this environment variable, it will attempt to connect to a running *zerotier-netcon-service* at the specified Unix domain socket path.
+
+Unlike *zerotier-one*, *zerotier-netcon-service* does not need to be run with root privileges and will not modify the host's network configuration in any way. It can be run alongside *zerotier-one* on the same host with no ill effect, though this can be confusing since you'll have to remember the difference between "real" host interfaces (tun/tap) and network containerized endpoints. The latter are completely unknown to the kernel and will not show up in *ifconfig*.
+
+# Linking into an application on Mac OSX
+
+Example:
+
+    gcc myapp.c -o myapp libzerotierintercept.so
+    export ZT_NC_NETWORK=/tmp/netcon-test-home/nc_8056c2e21c000001
+
+Start service
+
+    ./zerotier-netcon-service -d -p8000 /tmp/netcon-test-home
+
+Run application
+
+    ./myapp
+
+
+# Starting the Network Containers Service
+
+You don't need Docker or any other container engine to try Network Containers. A simple test can be performed in user space (no root) in your own home directory.
+
+First, build the netcon service and intercept library as described above. Then create a directory to act as a temporary ZeroTier home for your test netcon service instance. You'll need to move the *liblwip.so* binary that was built with *make netcon* into there, since the service must be able to find it there and load it.
+
+    mkdir /tmp/netcon-test-home
+    cp -f ./netcon/liblwip.so /tmp/netcon-test-home
+
+Now you can run the service (no sudo needed, and *-d* tells it to run in the background):
+
+    ./zerotier-netcon-service -d -p8000 /tmp/netcon-test-home
+
+As with ZeroTier One in its normal incarnation, you'll need to join a network for anything interesting to happen:
+
+    ./zerotier-cli -D/tmp/netcon-test-home join 8056c2e21c000001
+
+If you don't want to use [Earth](https://www.zerotier.com/public.shtml) for this test, replace 8056c2e21c000001 with a different network ID. The *-D* option tells *zerotier-cli* not to look in /var/lib/zerotier-one for information about a running instance of the ZeroTier system service but instead to look in */tmp/netcon-test-home*.
+
+Now type:
+
+    ./zerotier-cli -D/tmp/netcon-test-home listnetworks
+
+Try it a few times until you see that you've successfully joined the network and have an IP address. Instead of a *zt#* device, a path to a Unix domain socket will be listed for the network's port.
+
+Now you will want to have ZeroTier One (the normal *zerotier-one* build, not network containers) running somewhere else, such as on another Linux system or VM. Technically you could run it on the *same* Linux system and it wouldn't matter at all, but many people find this intensely confusing until they grasp just what exactly is happening here.
+
+On the other Linux system, join the same network if you haven't already (8056c2e21c000001 if you're using Earth) and wait until you have an IP address. Then try pinging the IP address your netcon instance received. You should see ping replies.
+
+Back on the host that's running *zerotier-netcon-service*, type *ip addr list* or *ifconfig* (ifconfig is technically deprecated so some Linux systems might not have it). Notice that the IP address of the network containers endpoint is not listed and no network device is listed for it either. That's because as far as the Linux kernel is concerned it doesn't exist.
+
+What are you pinging? What is happening here?
+
+The *zerotier-netcon-service* binary has joined a *virtual* network and is running a *virtual* TCP/IP stack entirely in user space. As far as your system is concerned it's just another program exchanging UDP packets with a few other hosts on the Internet and nothing out of the ordinary is happening at all. That's why you never had to type *sudo*. It didn't change anything on the host.
+
+Now you can run an application inside your network container.
+
+    export LD_PRELOAD=`pwd`/libzerotierintercept.so
+    export ZT_NC_NETWORK=/tmp/netcon-test-home/nc_8056c2e21c000001
+    node netcon/httpserver.js
+
+Also note that the "pwd" in LD_PRELOAD assumes you are in the ZeroTier source root and have built netcon there. If not, substitute the full path to *libzerotierintercept.so*. If you want to remove those environment variables later, use "unset LD_PRELOAD" and "unset ZT_NC_NETWORK".
+
+If you don't have node.js installed, an alternative test using python would be:
+
+    python -m SimpleHTTPServer 80
+
+If you are running Python 3, use "-m http.server".
+
+If all went well a small static HTTP server is now serving up the current directory, but only inside the network container. Going to port 80 on your machine won't work. To reach it, go to the other system where you joined the same network with a conventional ZeroTier instance and try:
+
+    curl http://NETCON.INSTANCE.IP/
+
+Replace *NETCON.INSTANCE.IP* with the IP address that *zerotier-netcon-service* was assigned on the virtual network. (This is the same IP you pinged in your first test.) If everything works, you should get back a copy of ZeroTier One's main README.md file.
+
+# Installing in a Docker container (or any other container engine)
+
+If it's not immediately obvious, installation into a Docker container is easy. Just install *zerotier-netcon-service*, *libzerotierintercept.so*, and *liblwip.so* into the container at an appropriate locations. We suggest putting it all in */var/lib/zerotier-one* since this is the default ZeroTier home and will eliminate the need to supply a path to any of ZeroTier's services or utilities. Then, in your Docker container entry point script launch the service with *-d* to run it in the background, set the appropriate environment variables as described above, and launch your container's main application.
+
+The only bit of complexity is configuring which virtual network to join. ZeroTier's service automatically joins networks that have *.conf* files in *ZTHOME/networks.d* even if the *.conf* file is empty. So one way of doing this very easily is to add the following commands to your Dockerfile or container entry point script:
+
+    mkdir -p /var/lib/zerotier-one/networks.d
+    touch /var/lib/zerotier-one/networks.d/8056c2e21c000001.conf
+
+Replace 8056c2e21c000001 with the network ID of the network you want your container to automatically join. It's also a good idea in your container's entry point script to add a small loop to wait until the container's instance of ZeroTier generates an identity and comes online. This could be something like:
+
+    /var/lib/zerotier-one/zerotier-netcon-service -d
+    while [ ! -f /var/lib/zerotier-one/identity.secret ]; do
+      sleep 0.1
+    done
+    # zerotier-netcon-service is now running and has generated an identity
+
+(Be sure you don't bundle the identity into the container, otherwise every container will try to be the same device and they will "fight" over the device's address.)
+
+Now each new instance of your container will automatically join the specified network on startup. Authorizing the container on a private network still requires a manual authorization step either via the ZeroTier Central web UI or the API. We're working on some ideas to automate this via bearer token auth or similar since doing this manually or with scripts for large deployments is tedious.
+
+# Docker-based Unit Tests
+
+Each unit test will temporarily copy all required ZeroTier binaries into its local directory, then build the *netcon_dockerfile* and *monitor_dockerfile*. Once built, each container will be run and perform tests and monitoring specified in *netcon_entrypoint.sh* and *monitor_entrypoint.sh*
+
+Results will be written to the *netcon/docker-test/_results/* directory which is a common shared volume between all containers involved in the test and will be a combination of raw and formatted dumps to files whose names reflect the test performed. In the event of failure, *FAIL.* will be prepended to the result file's name (e.g. *FAIL.my_application_1.0.2.x86_64*), likewise in the event of success, *OK.* will be prepended.
+
+To run unit tests:
+
+1) Disable SELinux. This is so the containers can use a shared volume to exchange MD5 sums and address information. 
+
+2) Set up your own network at [https://my.zerotier.com/](https://my.zerotier.com/). For our example we'll just use the Earth network (8056c2e21c000001). Use its network id as follows:
+
+3) Generate two pairs of identity keys. Each public/private pair will be used by the *netcon* and *monitor* containers:
+
+    mkdir -p /tmp/netcon_first
+    cp -f ./netcon/liblwip.so /tmp/netcon_first
+    ./zerotier-netcon-service -d -p8100 /tmp/netcon_first
+    while [ ! -f /tmp/netcon_first/identity.secret ]; do
+      sleep 0.1
+    done
+    ./zerotier-cli -D/tmp/netcon_first join 8056c2e21c000001
+    kill `cat /tmp/netcon_first/zerotier-one.pid`
+
+    mkdir -p /tmp/netcon_second
+    cp -f ./netcon/liblwip.so /tmp/netcon_second
+    ./zerotier-netcon-service -d -p8101 /tmp/netcon_second
+    while [ ! -f /tmp/netcon_second/identity.secret ]; do
+      sleep 0.1
+    done
+    ./zerotier-cli -D/tmp/netcon_second join 8056c2e21c000001
+    kill `cat /tmp/netcon_second/zerotier-one.pid`
+
+4) Copy the identity files to your *docker-test* directory. Names will be altered during copy step so the dockerfiles know which identities to use for each image/container:
+
+    cp /tmp/netcon_first/identity.public ./netcon/docker-test/netcon_identity.public
+    cp /tmp/netcon_first/identity.secret ./netcon/docker-test/netcon_identity.secret
+
+    cp /tmp/netcon_second/identity.public ./netcon/docker-test/monitor_identity.public
+    cp /tmp/netcon_second/identity.secret ./netcon/docker-test/monitor_identity.secret
+
+
+5) Place a blank network config file in the *netcon/docker-test* directory (e.g. "8056c2e21c000001.conf")
+ - This will be used to inform test-specific scripts what network to use for testing
+
+After you've created your network and placed its blank config file in *netcon/docker-test* run the following to perform unit tests for httpd:
+
+    ./build.sh httpd
+    ./test.sh httpd
+
+It's useful to note that the keyword *httpd* in this example is merely a substring for a test name, this means that if we replaced it with *x86_64* or *fc23*, it would run all unit tests for *x86_64* systems or *Fedora 23* respectively.
diff --git a/netcon/RPC.c b/netcon/RPC.c
new file mode 100644
index 000000000..7d5c11e0d
--- /dev/null
+++ b/netcon/RPC.c
@@ -0,0 +1,283 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/un.h>
+#include <pthread.h>
+#include <errno.h>
+
+#if defined(__linux__)
+#include <sys/syscall.h>
+#endif
+
+#include <fcntl.h>
+#include <dlfcn.h>
+#include <stdint.h>
+
+#include <sys/socket.h>
+#include <strings.h>
+#include "RPC.h"
+
+#define SERVICE_CONNECT_ATTEMPTS 30
+
+#define CONNECT_SIG int __fd, const struct sockaddr * __addr, socklen_t __len
+#define SOCKET_SIG int socket_family, int socket_type, int protocol
+
+static int (*realconnect)(CONNECT_SIG) = 0;
+static int (*realsocket)(SOCKET_SIG) = 0;
+
+#ifdef NETCON_INTERCEPT
+static int rpc_count;
+#endif
+
+static pthread_mutex_t lock;
+void rpc_mutex_init() {
+  if(pthread_mutex_init(&lock, NULL) != 0) {
+    fprintf(stderr, "error while initializing service call mutex\n");
+  }
+}
+void rpc_mutex_destroy() {
+  pthread_mutex_destroy(&lock);
+}
+
+/* 
+ * Reads a new file descriptor from the service 
+ */
+int get_new_fd(int sock)
+{
+  char buf[BUF_SZ];
+  int newfd;
+  ssize_t size = sock_fd_read(sock, buf, sizeof(buf), &newfd);
+  if(size > 0)
+    return newfd;
+  return -1;
+}
+
+/*
+ * Reads a return value from the service and sets errno (if applicable)
+ */
+int get_retval(int rpc_sock)
+{
+  if(rpc_sock >= 0) {
+    int retval;
+    int sz = sizeof(char) + sizeof(retval) + sizeof(errno);
+    char retbuf[BUF_SZ];
+    memset(&retbuf, 0, sz);
+    int n_read = read(rpc_sock, &retbuf, sz);
+    if(n_read > 0) {
+      memcpy(&retval, &retbuf[1], sizeof(retval));
+      memcpy(&errno, &retbuf[1+sizeof(retval)], sizeof(errno));
+      return retval;
+    }
+  }
+  return -1;
+}
+
+int load_symbols_rpc()
+{
+#ifdef NETCON_INTERCEPT
+  realsocket = dlsym(RTLD_NEXT, "socket");
+  realconnect = dlsym(RTLD_NEXT, "connect");
+  if(!realconnect || !realsocket)
+    return -1;
+#endif
+  return 1;
+}
+
+int rpc_join(const char * sockname)
+{
+  if(!load_symbols_rpc())
+    return -1;
+
+	struct sockaddr_un addr;
+	int conn_err = -1, attempts = 0;
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	strncpy(addr.sun_path, sockname, sizeof(addr.sun_path)-1);
+
+	int sock;
+	if((sock = realsocket(AF_UNIX, SOCK_STREAM, 0)) < 0){
+		fprintf(stderr, "Error while creating RPC socket\n");
+		return -1;
+	}
+	while((conn_err != 0) && (attempts < SERVICE_CONNECT_ATTEMPTS)){
+		if((conn_err = realconnect(sock, (struct sockaddr*)&addr, sizeof(addr))) != 0) {
+			fprintf(stderr, "Error while connecting to RPC socket. Re-attempting...\n");
+			sleep(1);
+		}
+		else
+			return sock;
+		attempts++;
+	}
+	return -1;
+}
+
+/*
+ * Send a command to the service 
+ */
+int rpc_send_command(char *path, int cmd, int forfd, void *data, int len)
+{
+  pthread_mutex_lock(&lock);
+  char c, padding[] = {PADDING};
+  char cmdbuf[BUF_SZ], CANARY[CANARY_SZ+PADDING_SZ], metabuf[BUF_SZ];
+  memcpy(CANARY+CANARY_SZ, padding, sizeof(padding));
+  uint64_t canary_num;
+  // ephemeral RPC socket used only for this command
+  int rpc_sock = rpc_join(path);
+  // Generate token
+  int fdrand = open("/dev/urandom", O_RDONLY);
+
+  if(read(fdrand, &CANARY, CANARY_SZ) < 0) {
+     fprintf(stderr,"unable to read from /dev/urandom for RPC canary data\n");
+     return -1;  
+  }
+  memcpy(&canary_num, CANARY, CANARY_SZ);  
+  cmdbuf[CMD_ID_IDX] = cmd;
+  memcpy(&cmdbuf[CANARY_IDX], &canary_num, CANARY_SZ);
+  memcpy(&cmdbuf[STRUCT_IDX], data, len);
+
+#if defined(VERBOSE)
+  rpc_count++;
+  memset(metabuf, 0, BUF_SZ);
+#if defined(__linux__)
+  pid_t pid = syscall(SYS_getpid);
+  pid_t tid = syscall(SYS_gettid);
+#endif
+  char timestring[20];
+  time_t timestamp;
+  timestamp = time(NULL);
+  strftime(timestring, sizeof(timestring), "%H:%M:%S", localtime(&timestamp));
+  memcpy(metabuf, RPC_PHRASE, RPC_PHRASE_SZ); // Write signal phrase
+#if defined(__linux__)
+  memcpy(&metabuf[IDX_PID],     &pid,         sizeof(pid_t)      ); /* pid       */
+  memcpy(&metabuf[IDX_TID],     &tid,         sizeof(pid_t)      ); /* tid       */
+#endif
+  memcpy(&metabuf[IDX_COUNT],   &rpc_count,   sizeof(rpc_count)  ); /* rpc_count */
+  memcpy(&metabuf[IDX_TIME],    &timestring,   20                ); /* timestamp */
+#endif
+  /* Combine command flag+payload with RPC metadata */
+  memcpy(&metabuf[IDX_PAYLOAD], cmdbuf, len + 1 + CANARY_SZ);
+  
+  // Write RPC
+  int n_write = write(rpc_sock, &metabuf, BUF_SZ);
+  if(n_write < 0) {
+    fprintf(stderr, "Error writing command to service (CMD = %d)\n", cmdbuf[CMD_ID_IDX]);
+    errno = 0;
+  }
+  // Write token to corresponding data stream
+  if(read(rpc_sock, &c, 1) < 0) {
+    fprintf(stderr, "unable to read RPC ACK byte from service.\n");
+    return -1;
+  }
+  if(c == 'z' && n_write > 0 && forfd > -1){
+    if(send(forfd, &CANARY, CANARY_SZ+PADDING_SZ, 0) < 0) {
+      fprintf(stderr,"unable to write canary to stream\n");
+      return -1;
+    }
+  }
+  // Process response from service
+  int ret = ERR_OK;
+  if(n_write > 0) {
+    if(cmdbuf[CMD_ID_IDX]==RPC_SOCKET) {
+      pthread_mutex_unlock(&lock);
+      return rpc_sock; // Used as new socket
+    }
+    if(cmdbuf[CMD_ID_IDX]==RPC_CONNECT
+      || cmdbuf[CMD_ID_IDX]==RPC_BIND
+      || cmdbuf[CMD_ID_IDX]==RPC_LISTEN) {
+    	ret = get_retval(rpc_sock);
+    }
+    if(cmdbuf[CMD_ID_IDX]==RPC_GETSOCKNAME) {
+      pthread_mutex_unlock(&lock);
+      return rpc_sock; // Don't close rpc here, we'll use it to read getsockopt_st
+    }
+  }
+  else
+    ret = -1;
+  close(rpc_sock); // We're done with this RPC socket, close it (if type-R)
+  pthread_mutex_unlock(&lock);
+  return ret;
+}
+
+/* 
+ * Send file descriptor 
+ */
+ssize_t sock_fd_write(int sock, int fd)
+{
+  ssize_t size;
+  struct msghdr msg;
+  struct iovec iov;
+  char buf = '\0';
+  int buflen = 1;
+  union {
+        struct cmsghdr  cmsghdr;
+    char control[CMSG_SPACE(sizeof (int))];
+  } cmsgu;
+  struct cmsghdr *cmsg;
+  iov.iov_base = &buf;
+  iov.iov_len = buflen;
+  msg.msg_name = NULL;
+  msg.msg_namelen = 0;
+  msg.msg_iov = &iov;
+  msg.msg_iovlen = 1;
+  if (fd != -1) {
+      msg.msg_control = cmsgu.control;
+      msg.msg_controllen = sizeof(cmsgu.control);
+      cmsg = CMSG_FIRSTHDR(&msg);
+      cmsg->cmsg_len = CMSG_LEN(sizeof (int));
+      cmsg->cmsg_level = SOL_SOCKET;
+      cmsg->cmsg_type = SCM_RIGHTS;
+      *((int *) CMSG_DATA(cmsg)) = fd;
+  } else {
+      msg.msg_control = NULL;
+      msg.msg_controllen = 0;
+  }
+  size = sendmsg(sock, &msg, 0);
+  if (size < 0)
+      perror ("sendmsg");
+  return size;
+}
+/* 
+ * Read a file descriptor 
+ */
+ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd)
+{
+  ssize_t size;
+  if (fd) {
+    struct msghdr msg;
+    struct iovec iov;
+    union {
+      struct cmsghdr cmsghdr;
+      char control[CMSG_SPACE(sizeof (int))];
+    } cmsgu;
+    struct cmsghdr *cmsg;
+    iov.iov_base = buf;
+    iov.iov_len = bufsize;
+    msg.msg_name = NULL;
+    msg.msg_namelen = 0;
+    msg.msg_iov = &iov;
+    msg.msg_iovlen = 1;
+    msg.msg_control = cmsgu.control;
+    msg.msg_controllen = sizeof(cmsgu.control);
+    size = recvmsg (sock, &msg, 0);
+    if (size < 0)
+      return -1;
+    cmsg = CMSG_FIRSTHDR(&msg);
+    if (cmsg && cmsg->cmsg_len == CMSG_LEN(sizeof(int))) {
+      if (cmsg->cmsg_level != SOL_SOCKET) {
+        fprintf (stderr, "invalid cmsg_level %d\n",cmsg->cmsg_level);
+        return -1;
+      }
+      if (cmsg->cmsg_type != SCM_RIGHTS) {
+          fprintf (stderr, "invalid cmsg_type %d\n",cmsg->cmsg_type);
+          return -1;
+      }
+      *fd = *((int *) CMSG_DATA(cmsg));
+    } else *fd = -1;
+  } else {
+    size = read (sock, buf, bufsize);
+    if (size < 0) {
+      fprintf(stderr, "sock_fd_read(): read: Error\n");
+      return -1;
+    }
+  }
+  return size;
+}
diff --git a/netcon/RPC.h b/netcon/RPC.h
new file mode 100644
index 000000000..2ae8f154c
--- /dev/null
+++ b/netcon/RPC.h
@@ -0,0 +1,115 @@
+#ifndef __RPCLIB_H_
+#define __RPCLIB_H_
+
+#include <stdint.h>
+
+#define CANARY_SZ               sizeof(uint64_t)
+#define PADDING_SZ              12
+#define PADDING                 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89
+
+#define RPC_PHRASE              "zerotier\0"
+#define RPC_PHRASE_SZ           9
+#define RPC_TIMESTAMP_SZ        20
+// 1st RPC section (metdata)
+#define IDX_SIGNAL_PHRASE       0
+#define IDX_PID                 IDX_SIGNAL_PHRASE + RPC_PHRASE_SZ
+#define IDX_TID                 sizeof(pid_t) + IDX_PID
+#define IDX_COUNT               IDX_TID + sizeof(pid_t)
+#define IDX_TIME                IDX_COUNT + sizeof(int)
+#define IDX_PAYLOAD             IDX_TIME + RPC_TIMESTAMP_SZ
+// 2nd RPC section (payload and canary)
+#define CMD_ID_IDX              0
+#define CANARY_IDX              1
+#define STRUCT_IDX              CANARY_IDX+CANARY_SZ
+
+#define BUF_SZ                  512
+
+#define ERR_OK                  0
+
+/* RPC codes */
+#define RPC_UNDEFINED           0
+#define RPC_CONNECT             1
+#define RPC_CONNECT_SOCKARG     2
+#define RPC_CLOSE               3
+#define RPC_READ                4
+#define RPC_WRITE               5
+#define RPC_BIND                6
+#define RPC_ACCEPT              7
+#define RPC_LISTEN              8
+#define RPC_SOCKET              9
+#define RPC_SHUTDOWN            10
+#define RPC_GETSOCKNAME         11
+#define RPC_RETVAL              12
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int get_retval(int);
+int rpc_join(const char * sockname);
+int rpc_send_command(char *path, int cmd, int forfd, void *data, int len);
+
+int get_new_fd(int sock);
+ssize_t sock_fd_write(int sock, int fd);
+ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd);
+
+void rpc_mutex_destroy();
+void rpc_mutex_init();
+
+
+/* Structures used for sending commands via RPC mechanism */
+
+struct bind_st {
+	int sockfd;
+	struct sockaddr_storage addr;
+	socklen_t addrlen;
+	int __tid;
+};
+
+struct connect_st {
+	int __fd;
+	struct sockaddr_storage __addr;
+	socklen_t __len;
+	int __tid;
+};
+
+struct close_st {
+	int fd;
+};
+
+struct listen_st {
+	int sockfd;
+	int backlog;
+	int __tid;
+};
+
+struct socket_st {
+  int socket_family;
+  int socket_type;
+  int protocol;
+	int __tid;
+};
+
+struct accept_st {
+	int sockfd;
+	struct sockaddr_storage addr;
+	socklen_t addrlen;
+	int __tid;
+};
+
+struct shutdown_st {
+	int socket;
+	int how;
+};
+
+struct getsockname_st {
+	int sockfd;
+	struct sockaddr_storage addr;
+	socklen_t addrlen;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/netcon/common.inc.c b/netcon/common.inc.c
new file mode 100644
index 000000000..6468dac26
--- /dev/null
+++ b/netcon/common.inc.c
@@ -0,0 +1,108 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include <stdio.h>
+#include <netdb.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <pthread.h>
+#include <fcntl.h>
+#include <sys/syscall.h>
+
+#ifndef _COMMON_H
+#define _COMMON_H  1
+
+#define DEBUG_LEVEL     0
+
+#define MSG_TRANSFER    1 // RX/TX specific statements
+#define MSG_ERROR       2 // Errors
+#define MSG_INFO        3 // Information which is generally useful to any user
+#define MSG_DEBUG       4 // Information which is only useful to someone debugging
+#define MSG_DEBUG_EXTRA 5 // If nothing in your world makes sense
+
+#ifdef NETCON_INTERCEPT
+
+void print_addr(struct sockaddr *addr)
+{
+  char *s = NULL;
+  switch(addr->sa_family) {
+      case AF_INET: {
+          struct sockaddr_in *addr_in = (struct sockaddr_in *)addr;
+          s = malloc(INET_ADDRSTRLEN);
+          inet_ntop(AF_INET, &(addr_in->sin_addr), s, INET_ADDRSTRLEN);
+          break;
+      }
+      case AF_INET6: {
+          struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr;
+          s = malloc(INET6_ADDRSTRLEN);
+          inet_ntop(AF_INET6, &(addr_in6->sin6_addr), s, INET6_ADDRSTRLEN);
+          break;
+      }
+      default:
+          break;
+  }
+  fprintf(stderr, "IP address: %s\n", s);
+  free(s);
+}
+#endif
+
+#ifdef NETCON_SERVICE
+  namespace ZeroTier {
+#endif
+  void dwr(int level, const char *fmt, ... )
+  {
+    if(level > DEBUG_LEVEL)
+        return;
+    int saveerr;
+    saveerr = errno;
+    va_list ap;
+    va_start(ap, fmt);
+  #ifdef VERBOSE // So we can cut out some clutter in the strace output while debugging
+    char timestring[20];
+    time_t timestamp;
+    timestamp = time(NULL);
+    strftime(timestring, sizeof(timestring), "%H:%M:%S", localtime(&timestamp));
+    pid_t tid = syscall(SYS_gettid);
+    fprintf(stderr, "%s [tid=%7d] ", timestring, tid);
+  #endif
+    vfprintf(stderr, fmt, ap);
+    fflush(stderr);
+
+    errno = saveerr;
+    va_end(ap);
+  }
+#ifdef NETCON_SERVICE
+}
+#endif
+
+#endif
diff --git a/netcon/docker-test/_build_single_image.sh b/netcon/docker-test/_build_single_image.sh
new file mode 100755
index 000000000..aa4b77d43
--- /dev/null
+++ b/netcon/docker-test/_build_single_image.sh
@@ -0,0 +1,30 @@
+# Builds a test docker image
+
+test_name=${PWD##*/}
+echo 'Building dockerfiles for test: ' "$test_name"
+touch "$test_name".name
+
+# Docker won't allow the inclusion of files outside of the build directory
+cp ../../*.conf .
+cp ../../zerotier-one zerotier-one
+cp ../../zerotier-cli zerotier-cli
+cp ../../zerotier-cli zerotier-netcon-service
+cp ../../zerotier-intercept zerotier-intercept
+cp ../../libzerotierintercept.so libzerotierintercept.so
+cp ../../liblwip.so liblwip.so
+cp ../../netcon_identity.public netcon_identity.public
+cp ../../netcon_identity.secret netcon_identity.secret
+cp ../../monitor_identity.public monitor_identity.public
+cp ../../monitor_identity.secret monitor_identity.secret
+
+docker build --tag="$test_name" -f netcon_dockerfile .
+docker build --tag="$test_name"_monitor -f monitor_dockerfile .
+
+rm -f zerotier-cli
+rm -f zerotier-netcon-service
+rm -f zerotier-intercept
+rm -f *.so
+rm -f *.public
+rm -f *.secret
+rm -f *.conf
+rm -f *.name
\ No newline at end of file
diff --git a/netcon/docker-test/_remove_all.sh b/netcon/docker-test/_remove_all.sh
new file mode 100755
index 000000000..c6090a9b9
--- /dev/null
+++ b/netcon/docker-test/_remove_all.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+# Delete all containers
+docker rm $(docker ps -a -q)
+# Delete all images
+docker rmi $(docker images -q)
diff --git a/netcon/docker-test/_two_party_test.sh b/netcon/docker-test/_two_party_test.sh
new file mode 100755
index 000000000..8fa3b3eb6
--- /dev/null
+++ b/netcon/docker-test/_two_party_test.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Runs test image and monitor image as daemons
+test_name=${PWD##*/}
+echo 'Starting containers for: ' "$test_name"
+touch "$test_name".name
+test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
+monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
+
+echo "waiting $netcon_test_wait_time for test to complete."
+sleep $netcon_test_wait_time
+docker stop $(docker ps -a -q)
+docker rm $test_container
+docker rm $monitor_container
+
+rm -f *.name
\ No newline at end of file
diff --git a/netcon/docker-test/build.sh b/netcon/docker-test/build.sh
new file mode 100755
index 000000000..bb5fd8e77
--- /dev/null
+++ b/netcon/docker-test/build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "*** Building Zerotier-One, libraries, and test/monitor images..."
+
+./build_zt.sh
+./build_tests.sh $1
+
+echo "*** Done"
diff --git a/netcon/docker-test/build_tests.sh b/netcon/docker-test/build_tests.sh
new file mode 100755
index 000000000..65009f18d
--- /dev/null
+++ b/netcon/docker-test/build_tests.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Merely BUILDS test images
+
+# Remove previous test results
+rm _results/*.txt 
+
+# How long we shall wait for each test to conclude
+export netcon_test_wait_time=60s
+
+export image_build_script=_build_single_image.sh
+
+# Iterate over all depth=2 (relatively-speaking) directories and perform each test
+find . -mindepth 2 -maxdepth 2 -type d | while read testdir; do
+   
+    if [[ $testdir != *$1* ]]
+    then
+	continue    
+    fi
+
+    echo "\n\n\n*** Building: '$testdir'..."
+    rm _results/*.tmp
+
+    # Stage scripts
+    cp $image_build_script $testdir/$image_build_script
+    cd $testdir
+
+    # Build test docker images
+    ./$image_build_script
+    rm $image_build_script
+
+    cd ../../
+done
diff --git a/netcon/docker-test/build_zt.sh b/netcon/docker-test/build_zt.sh
new file mode 100755
index 000000000..d36c407f0
--- /dev/null
+++ b/netcon/docker-test/build_zt.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Builds Zerotier-One and libraries required for Network Containers, then
+# copies the binaries into the test directory.
+
+cd ../../
+make clean
+make one
+make netcon
+cd netcon/docker-test
+
+cp ../../zerotier-cli zerotier-cli
+cp ../../zerotier-netcon-service zerotier-netcon-service
+cp ../../libzerotierintercept.so libzerotierintercept.so
+
+cp ../liblwip.so liblwip.so
+cp ../zerotier-intercept zerotier-intercept
+
+cp ../../zerotier-one zerotier-one
+
diff --git a/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/monitor_dockerfile b/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh b/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile b/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..66a39d88e
--- /dev/null
+++ b/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile
@@ -0,0 +1,38 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install darkhttpd-1.11
+RUN yum clean all
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh b/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..978696a89
--- /dev/null
+++ b/netcon/docker-test/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '--- Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of="$bigfile_name"  bs="$bigfile_size"  count=1
+md5sum < "$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+darkhttpd /
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..fe668fb79
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
@@ -0,0 +1,38 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install httpd-2.4.16-1.fc23.x86_64
+RUN yum clean all
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..688bd63b4
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '--- Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
+md5sum < /var/www/html/"$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+rm -rf /run/httpd/* /tmp/httpd*
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+/usr/sbin/httpd -X
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..76b7b7dd5
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile
@@ -0,0 +1,39 @@
+# ZT Network Containers Test
+FROM ubuntu:14.04
+MAINTAINER https://www.zerotier.com/
+
+RUN \
+  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get -y upgrade && \
+  apt-get -y install apache2
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..688bd63b4
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '--- Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
+md5sum < /var/www/html/"$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+rm -rf /run/httpd/* /tmp/httpd*
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+/usr/sbin/httpd -X
diff --git a/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..3053a832f
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile
@@ -0,0 +1,38 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install httpd-2.4.18-1.fc23.x86_64
+RUN yum clean all
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..d2ab248a9
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
+#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < /var/www/html/"$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+rm -rf /run/httpd/* /tmp/httpd*
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+/usr/sbin/httpd -X
diff --git a/netcon/docker-test/httpd/httpd_demo/htdocs/ZeroTierIcon.png b/netcon/docker-test/httpd/httpd_demo/htdocs/ZeroTierIcon.png
new file mode 100644
index 000000000..4d9641b34
Binary files /dev/null and b/netcon/docker-test/httpd/httpd_demo/htdocs/ZeroTierIcon.png differ
diff --git a/netcon/docker-test/httpd/httpd_demo/htdocs/index.html b/netcon/docker-test/httpd/httpd_demo/htdocs/index.html
new file mode 100644
index 000000000..017e44933
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd_demo/htdocs/index.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="http://bootswatch.com/cosmo/bootstrap.min.css">
+	<title>ZeroTier Network Containers Preview</title>
+</head>
+<body>
+
+<br><br>
+
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-xs-1 col-xs-offset-1"><img src="ZeroTierIcon.png" style="width: 100%; height: 100%;"></div>
+		<div class="col-xs-9">
+			<h1>ZeroTier Network Containers Preview</h1>
+			(a.k.a. super bleeding edge pre-alphe pre-release demo)
+		</div>
+	</div>
+</div>
+
+<br>
+<hr>
+<br>
+
+<div class="container-fluid"><div class="row"><div class="col-xs-10 col-xs-offset-1 lead">
+
+<p><b>This page is being served from a Docker container with its own private TCP/IP microservice.</b></p>
+
+<p>
+It's connected to a virtual network, but if you "docker exec" into it and look around you won't find any special devices. No special privileges or configuration changes on the Docker host were needed. Everything is completely "stock" and completely self-contained.
+</p>
+
+<p>
+There's nothing special about the web server. It's just Apache. There's nothing special about the Linux image. It's based on a regular Fedora Docker base image. Other than Apache, the only thing this image contains is the ZeroTier network containers microservice and dynamic library.
+</p>
+
+<p>
+When Apache is run, our launcher script configures it to load a special dynamic library. This library intercepts calls to the Linux C networking API, redirecting network I/O to our private network stack microservice instead of the standard Linux kernel network path. This microservice takes care of the rest, automatically encapsulating traffic and sending it over the virtual network instead of the physical.
+</p>
+
+<p>
+It's a bit like how networking would work on a microkernel: modular, composable, portable, and independent.
+</p>
+
+<p>
+Network Containers allows a Docker (or LXC, CoreOS/rkt, runc, OpenVZ, SmartOS/Triton, <a target="_blank" href="https://github.com/p8952/bocker">bocker</a>, or even just bare metal Linux) system to connect to virtual networks without requiring <u>any</u> special permissions or special configuration on the host node. Processes inside the container don't even need to run with root permissions. It's 100% user-space, making it ideal for multi-tenant deployments or any other situation where modifying the configuration of the host node is impossible or just inconvenient.
+</p>
+
+<p>
+Once properly tuned and optimized, Network Containers also has the potential to be much faster than tun/tap or pcap based network overlays. It imposes only a single context switch from application/service to virtual network microservice as opposed to at least four for tun/tap and pcap-based solutions, since the latter require two trips through the kernel network stack. We believe it may be possible to approach or even equal the performance of VXLAN/IPSec or other fully kernel-mode configurations, but with the ease and total independence of a fully container-based solution.
+</p>
+
+<p>
+We created this container image to show you a preview of one of the projects we've been working on at ZeroTier. We still have a good deal of packaging, testing, and performance optimization work to do before Network Containers will be ready for a real public beta release. Follow the <a href="https://www.zerotier.com/blog">blog</a> or <a href="https://twitter.com/zerotier">@zerotier</a> for updates and announcements.
+</p>
+
+<p>
+P.S. If you want to use ZeroTier in Docker today, you can do it with the same ZeroTier One endpoint service you're using to access this network. The only catch is that you have to launch your containers with "--device=/dev/net/tun --cap-add=NET_ADMIN". Network Containers eliminates the need for these special options.
+</p>
+
+</div></div></div>
+
+<hr>
+
+</body>
+</html>
diff --git a/netcon/docker-test/httpd/httpd_demo/monitor_dockerfile b/netcon/docker-test/httpd/httpd_demo/monitor_dockerfile
new file mode 100644
index 000000000..08f08ae11
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd_demo/monitor_dockerfile
@@ -0,0 +1,25 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Install LWIP library used by service
+ADD liblwip.so /
+RUN mkdir -p ext/bin/lwip
+RUN cp liblwip.so ext/bin/lwip/liblwip.so
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd_demo/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd_demo/monitor_entrypoint.sh
new file mode 100644
index 000000000..79d4391d8
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd_demo/monitor_entrypoint.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=25 # wait for test container to come online
+app_timeout_time=15 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+echo '*** Waiting for initial identity generation...'
+while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
+	sleep 0.2
+done
+echo '*** Waiting for network config...'
+virtip4=""
+while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
+	sleep 0.2
+done
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" >> "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ $rx_md5sum != $tx_md5sum ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile b/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile
new file mode 100644
index 000000000..cf50e1d92
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile
@@ -0,0 +1,45 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install httpd-2.4.17-3.fc23.x86_64
+RUN yum clean all
+
+EXPOSE 9993/udp
+
+#include Apache
+ADD htdocs/index.html /
+ADD htdocs/ZeroTierIcon.png /
+RUN mv index.html /var/www/html/index.html
+RUN mv ZeroTierIcon.png /var/www/html/ZeroTierIcon.png
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+ADD zerotier-cli /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Install LWIP library used by service
+ADD liblwip.so /
+RUN mkdir -p ext/bin/lwip
+RUN cp liblwip.so ext/bin/lwip/liblwip.so
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/httpd/httpd_demo/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd_demo/netcon_entrypoint.sh
new file mode 100644
index 000000000..5c42b6a67
--- /dev/null
+++ b/netcon/docker-test/httpd/httpd_demo/netcon_entrypoint.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+echo '*** Waiting for initial identity generation...'
+while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
+	sleep 0.2
+done
+echo '*** Waiting for network config...'
+virtip4=""
+while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
+	sleep 0.2
+done
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
+#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+rm -rf /run/httpd/* /tmp/httpd*
+zerotier-intercept /usr/sbin/httpd -X
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..cb9c1cc04
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile
@@ -0,0 +1,43 @@
+# ZT Network Containers Test
+FROM ubuntu:14.04
+MAINTAINER https://www.zerotier.com/
+
+
+# Install
+RUN \
+  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get -y upgrade && \
+  apt-get -y install nginx
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+ADD nginx.conf_ /
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..b9b8ef71a
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls {*.conf,}) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+cp -f nginx.conf_ /etc/nginx/nginx.conf
+nginx_html_path=/usr/share/nginx/html/
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of="$nginx_html_path$bigfile_name"  bs="$bigfile_size"  count=1
+#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < "$nginx_html_path$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+nginx
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/nginx.conf_ b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/nginx.conf_
new file mode 100644
index 000000000..7069ef03b
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/nginx.conf_
@@ -0,0 +1,55 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    # Load modular configuration files from the /etc/nginx/conf.d directory.
+    # See http://nginx.org/en/docs/ngx_core_module.html#include
+    # for more information.
+    include /etc/nginx/conf.d/*.conf;
+
+    server {
+        listen       80 default_server;
+        #listen       [::]:80 default_server;
+        server_name  _;
+        root         /usr/share/nginx/html;
+
+        # Load configuration files for the default server block.
+        include /etc/nginx/default.d/*.conf;
+
+        location / {
+        }
+
+        error_page 404 /404.html;
+            location = /40x.html {
+        }
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+        }
+    }
+}
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..8dcd5bf01
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
@@ -0,0 +1,40 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install nginx-1:1.8.0-13.fc23.x86_64
+RUN yum clean all
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+ADD nginx.conf_ /
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..b9b8ef71a
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls {*.conf,}) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+cp -f nginx.conf_ /etc/nginx/nginx.conf
+nginx_html_path=/usr/share/nginx/html/
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of="$nginx_html_path$bigfile_name"  bs="$bigfile_size"  count=1
+#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < "$nginx_html_path$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+nginx
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx.conf_ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx.conf_
new file mode 100644
index 000000000..7069ef03b
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx.conf_
@@ -0,0 +1,55 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    # Load modular configuration files from the /etc/nginx/conf.d directory.
+    # See http://nginx.org/en/docs/ngx_core_module.html#include
+    # for more information.
+    include /etc/nginx/conf.d/*.conf;
+
+    server {
+        listen       80 default_server;
+        #listen       [::]:80 default_server;
+        server_name  _;
+        root         /usr/share/nginx/html;
+
+        # Load configuration files for the default server block.
+        include /etc/nginx/default.d/*.conf;
+
+        location / {
+        }
+
+        error_page 404 /404.html;
+            location = /40x.html {
+        }
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+        }
+    }
+}
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..05cd51fb3
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
@@ -0,0 +1,40 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install nginx-1:1.8.0-14.fc23.x86_64
+RUN yum clean all
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+ADD nginx.conf_ /
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..b9b8ef71a
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls {*.conf,}) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+cp -f nginx.conf_ /etc/nginx/nginx.conf
+nginx_html_path=/usr/share/nginx/html/
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of="$nginx_html_path$bigfile_name"  bs="$bigfile_size"  count=1
+#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
+md5sum < "$nginx_html_path$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+nginx
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/nginx.conf_ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/nginx.conf_
new file mode 100644
index 000000000..7069ef03b
--- /dev/null
+++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/nginx.conf_
@@ -0,0 +1,55 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    # Load modular configuration files from the /etc/nginx/conf.d directory.
+    # See http://nginx.org/en/docs/ngx_core_module.html#include
+    # for more information.
+    include /etc/nginx/conf.d/*.conf;
+
+    server {
+        listen       80 default_server;
+        #listen       [::]:80 default_server;
+        server_name  _;
+        root         /usr/share/nginx/html;
+
+        # Load configuration files for the default server block.
+        include /etc/nginx/default.d/*.conf;
+
+        location / {
+        }
+
+        error_page 404 /404.html;
+            location = /40x.html {
+        }
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+        }
+    }
+}
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/httpserver.js b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/httpserver.js
new file mode 100644
index 000000000..b2401c503
--- /dev/null
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/httpserver.js
@@ -0,0 +1,7 @@
+var http = require('http');
+var server = http.createServer(function (request, response) {
+  response.writeHead(200, {"Content-Type": "text/plain"});
+  response.end("welcome to the machine!\n");
+});
+server.listen(8080);
+console.log("Server running!");
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
new file mode 100644
index 000000000..1701a467b
--- /dev/null
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=25 # wait for test container to come online
+app_timeout_time=15 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+response_string=$(curl --connect-timeout "$app_timeout_time" -v http://"$ncvirtip":8080/)
+
+if [[ $response_string == *"welcome to the machine!"* ]]
+then
+	echo 'NODEJS RESPONSE OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: nodejs-server responded!\n' >> "$file_path$ok$test_name.txt"
+else
+	echo 'NODEJS RESPONSE FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: nodejs server did NOT respond!\n' >> "$file_path$fail$test_name.txt"
+fi
+
+
+
+
+
+
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
new file mode 100644
index 000000000..55f48a620
--- /dev/null
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
@@ -0,0 +1,41 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install nodejs
+RUN yum clean all
+
+EXPOSE 9993/udp 8080/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# 
+ADD httpserver.js /
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
new file mode 100644
index 000000000..44e409d09
--- /dev/null
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+
+# --- Test section ---
+echo '*** Starting application...'
+sleep 0.5
+node httpserver.js
\ No newline at end of file
diff --git a/netcon/docker-test/python/python/monitor_dockerfile b/netcon/docker-test/python/python/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/python/python/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/python/python/monitor_entrypoint.sh b/netcon/docker-test/python/python/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/python/python/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/python/python/netcon_dockerfile b/netcon/docker-test/python/python/netcon_dockerfile
new file mode 100644
index 000000000..6646f670d
--- /dev/null
+++ b/netcon/docker-test/python/python/netcon_dockerfile
@@ -0,0 +1,38 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install python
+RUN yum clean all
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/python/python/netcon_entrypoint.sh b/netcon/docker-test/python/python/netcon_entrypoint.sh
new file mode 100644
index 000000000..5e1a19b87
--- /dev/null
+++ b/netcon/docker-test/python/python/netcon_entrypoint.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '--- Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of="$bigfile_name"  bs="$bigfile_size"  count=1
+md5sum < "$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+python -m SimpleHTTPServer 80
diff --git a/netcon/docker-test/python/python3/monitor_dockerfile b/netcon/docker-test/python/python3/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/python/python3/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/python/python3/monitor_entrypoint.sh b/netcon/docker-test/python/python3/monitor_entrypoint.sh
new file mode 100644
index 000000000..c8fca5a34
--- /dev/null
+++ b/netcon/docker-test/python/python3/monitor_entrypoint.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=35 # wait for test container to come online
+app_timeout_time=25 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Curling from intercepted server at' $ncvirtip
+rm -rf "$file_path"*."$file_base"
+touch "$bigfile_name"
+
+# Perform test
+# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
+# Large transfer test
+curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+rx_md5sum=$(<$rx_md5sumfile)
+tx_md5sum=$(<$tx_md5sumfile)
+
+echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
+
+if [ "$rx_md5sum" != "$tx_md5sum" ]; 
+then
+	echo 'MD5 FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
+else
+	echo 'MD5 OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
+	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
+	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
+fi
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/python/python3/netcon_dockerfile b/netcon/docker-test/python/python3/netcon_dockerfile
new file mode 100644
index 000000000..f960fa302
--- /dev/null
+++ b/netcon/docker-test/python/python3/netcon_dockerfile
@@ -0,0 +1,37 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum clean all
+
+EXPOSE 9993/udp 80/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+ADD zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/python/python3/netcon_entrypoint.sh b/netcon/docker-test/python/python3/netcon_entrypoint.sh
new file mode 100644
index 000000000..c3c8b281f
--- /dev/null
+++ b/netcon/docker-test/python/python3/netcon_entrypoint.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '--- Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of="$bigfile_name"  bs="$bigfile_size"  count=1
+md5sum < "$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+python3 -m http.server 80
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/hello.lua b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/hello.lua
new file mode 100644
index 000000000..59a2dea6b
--- /dev/null
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/hello.lua
@@ -0,0 +1,3 @@
+local msg = "welcome to the machine!"
+redis.call("SET", "msg", msg)
+return redis.call("GET", "msg")
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..e6cd65a3e
--- /dev/null
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile
@@ -0,0 +1,28 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+RUN yum -y install redis-3.0.4-1.fc23.x86_64
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD hello.lua /
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..087f50bbe
--- /dev/null
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=25 # wait for test container to come online
+app_timeout_time=15 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Running lua script against redis host at' $ncvirtip
+redis-cli -h $ncvirtip EVAL "$(cat hello.lua)" 0 > redis_response.txt
+response_string=$(<redis_response.txt)
+
+if [[ $response_string == *"welcome to the machine!"* ]]
+then
+	echo 'REDIS RESPONSE OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: redis-server responded!\n' >> "$file_path$ok$test_name.txt"
+else
+	echo 'REDIS RESPONSE FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: redis server did NOT respond!\n' >> "$file_path$fail$test_name.txt"
+fi
+
+
+
+
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..c5b0773bf
--- /dev/null
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
@@ -0,0 +1,38 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install redis-3.0.4-1.fc23.x86_64
+RUN yum clean all
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+EXPOSE 9993/udp 6379/udp
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+Add zerotier-netcon-service /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..b422d1749
--- /dev/null
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+echo '*** Starting application...'
+sleep 0.5
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+/usr/bin/redis-server --port 6379
diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile
new file mode 100644
index 000000000..d2d2a0cbf
--- /dev/null
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile
@@ -0,0 +1,24 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
new file mode 100644
index 000000000..0756bc6aa
--- /dev/null
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=25 # wait for test container to come online
+app_timeout_time=15 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile # large, random test transfer file
+rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Copying file to intercepted server at' $ncvirtip
+touch "$bigfile_name"
+
+# Check md5
+md5sum < "$bigfile_name" > "$rx_md5sumfile"
+tx_md5sum=$(<$tx_md5sumfile)
+
+# ...
+
+
+
+
+
+
+
+
diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
new file mode 100644
index 000000000..39e00a814
--- /dev/null
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
@@ -0,0 +1,37 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install openssh-server
+RUN yum clean all
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD zerotier-intercept /
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+RUN /usr/bin/install -c zerotier-intercept /usr/bin
+
+ADD zerotier-cli /
+
+# Install test scripts
+ADD netcon_entrypoint.sh /netcon_entrypoint.sh
+RUN chmod -v +x /netcon_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh
new file mode 100644
index 000000000..b52b9f69d
--- /dev/null
+++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+bigfile_name=bigfile
+bigfile_size=10M # size of file we want to use for the test
+tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+./zerotier-one -d -U -p9993
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+export ZT_NC_NWID=$dev
+
+# --- Test section ---
+# Generate large random file for transfer test, share md5sum for monitor container to check
+echo '*** Generating ' "$bigfile_size" ' file'
+dd if=/dev/urandom of=/var/www/html/"$bigfile_name"  bs="$bigfile_size"  count=1
+md5sum < /var/www/html/"$bigfile_name" > "$tx_md5sumfile"
+echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
+
+echo '*** Starting application...'
+sleep 0.5
+
+# wait for rsa public key from monitor
+#while [ ! -s "$file_path$rsa_public_key_file" ]; do
+#	sleep 0.2
+#done
+
+zerotier-intercept /usr/sbin/sshd
diff --git a/netcon/docker-test/test.sh b/netcon/docker-test/test.sh
new file mode 100755
index 000000000..03e860115
--- /dev/null
+++ b/netcon/docker-test/test.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Runs test images
+
+echo "*** Running unit tests..."
+
+# Remove previous test results
+rm _results/*.txt 
+
+# How long we shall wait for each test to conclude
+export netcon_test_wait_time=60s
+
+# Test structure, in later releases more complex multi-party scripts will be included
+export test_script=_two_party_test.sh
+
+# Iterate over all depth=2 (relatively-speaking) directories and perform each test
+find . -mindepth 2 -maxdepth 2 -type d | while read testdir; do
+
+    if [[ $testdir != *$1* ]]
+    then
+        continue
+    fi
+
+    echo "*** Testing: '$testdir'..."
+    rm _results/*.tmp
+
+    # Stage scripts
+    cp $test_script $testdir/$test_script
+    cd $testdir
+
+    # Run test 
+    ./$test_script
+    rm $test_script
+
+    cd ../../
+done
+
+echo "*** Done"
diff --git a/netcon/httpserver.js b/netcon/httpserver.js
new file mode 100644
index 000000000..5c2c0116d
--- /dev/null
+++ b/netcon/httpserver.js
@@ -0,0 +1,7 @@
+var http = require('http');
+var server = http.createServer(function (request, response) {
+  response.writeHead(200, {"Content-Type": "text/plain"});
+  response.end("\n\nWelcome to the machine!\n\n");
+});
+server.listen(80);
+console.log("Server running!");
diff --git a/netcon/httpstub.c b/netcon/httpstub.c
new file mode 100644
index 000000000..e5efaecc2
--- /dev/null
+++ b/netcon/httpstub.c
@@ -0,0 +1,542 @@
+/* A simple http server for performance test.
+   Copyright (C) 2013 Sun, Junyi <ccnusjy@gmail.com> */
+
+/* https://github.com/fxsjy/httpstub */
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+#include <sys/sendfile.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#include <net/if.h>
+#include <fcntl.h>
+#include <time.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <assert.h>
+#include <signal.h>
+#include <sys/epoll.h>
+#include <pthread.h>
+#include <errno.h>
+
+#define MAX_EPOLL_FD 4096
+#define MAX_BUF_SIZE (1<<20)
+#define WORKER_COUNT 2
+
+int ep_fd[WORKER_COUNT],listen_fd;
+int g_delay;
+int g_shutdown_flag;
+int g_quiet;
+FILE *g_logger;
+int g_pipe[WORKER_COUNT][2];
+
+enum version_t {
+        HTTP_1_0 = 10,
+        HTTP_1_1 = 11
+};
+struct io_data_t {
+        int fd;
+        struct sockaddr_in addr;
+        char *in_buf;
+        char *out_buf;
+        int in_buf_cur;
+        int out_buf_cur;
+        int out_buf_total;
+        int keep_alive;
+        enum version_t version;
+};
+
+struct slice_t {
+        char *begin;
+        size_t size;
+};
+
+struct thread_data_t{
+        struct slice_t data_from_file;
+        int myep_fd;
+        int mypipe_fd;
+};
+
+static void *handle_io_loop(void *param);
+
+static void httpstub_log(const char *fmt, ...);
+
+static void setnonblocking(int fd)
+{
+        int opts;
+        opts = fcntl(fd, F_GETFL);
+        if (opts < 0) {
+                fprintf(stderr, "fcntl failed\n");
+                return;
+        }
+        opts = opts | O_NONBLOCK;
+        if (fcntl(fd, F_SETFL, opts) < 0) {
+                fprintf(stderr, "fcntl failed\n");
+                return;
+        }
+        return;
+}
+
+static void usage()
+{
+        printf("usage:  httpstub -p <port> -f <data file> -d <delay (ms)> [-q quiet] \n");
+}
+
+static struct slice_t load_data(char *fname)
+{
+        struct stat buf;
+        char *bin = NULL;
+        FILE *fptr;
+        int ret;
+        struct slice_t result;
+        ret = stat(fname, &buf);
+        if (ret < 0) {
+                printf("open %s failed\n", fname);
+                perror("");
+                exit(1);
+        }
+        printf(">> size of %s is %d\n", fname, (int)buf.st_size);
+        if (buf.st_size <= 0) {
+                printf("the file is empty or broken\n");
+                exit(1);
+        }
+        if (buf.st_size <= 0 || buf.st_size > MAX_BUF_SIZE) {
+                printf("file is too large\n");
+                exit(1);
+        }
+        bin = (char *)malloc(sizeof(char) * buf.st_size + 1);
+        bin[buf.st_size] = '\0';
+        result.size = buf.st_size;
+        result.begin = bin;
+        fptr = fopen(fname, "rb");
+        if(fread(bin, buf.st_size, 1, fptr)<=0){
+                perror("failed to read file");
+                exit(1);
+        };
+        fclose(fptr);
+        return result;
+}
+
+static struct io_data_t * alloc_io_data(int client_fd, struct sockaddr_in *client_addr)
+{
+        struct io_data_t *io_data_ptr = (struct io_data_t *)malloc(sizeof(struct io_data_t));
+        io_data_ptr->fd = client_fd;
+        io_data_ptr->in_buf = (char *)malloc(4096);
+        io_data_ptr->out_buf = (char *)malloc(MAX_BUF_SIZE);
+        io_data_ptr->in_buf_cur = 0;
+        io_data_ptr->out_buf_cur = 0;
+        io_data_ptr->keep_alive = 1;
+        if (client_addr)
+                io_data_ptr->addr = *client_addr;
+        return io_data_ptr;
+}
+
+static void destroy_io_data(struct io_data_t *io_data_ptr)
+{
+        if(NULL == io_data_ptr)return;
+        if(io_data_ptr->in_buf)free(io_data_ptr->in_buf);
+        if(io_data_ptr->out_buf)free(io_data_ptr->out_buf);
+        io_data_ptr->in_buf = NULL;
+        io_data_ptr->out_buf = NULL;
+        free(io_data_ptr);
+}
+
+void exit_hook(int number)
+{
+        close(listen_fd);
+        g_shutdown_flag=1;
+        printf(">> [%d]will shutdown...[%d]\n", getpid(),number);
+}
+
+int main(int argc, char **argv)
+{
+        const char *ip_binding = "0.0.0.0";
+        int port_listening = 8402;
+        char *data_file=NULL;
+        int opt;
+        int on = 1;
+
+        int client_fd=0;
+        int worker_count=WORKER_COUNT,i;
+        register int worker_pointer = 0;
+
+        struct sockaddr_in server_addr;
+        struct slice_t data_from_file;
+
+        pthread_t tid[WORKER_COUNT];
+        pthread_attr_t tattr[WORKER_COUNT];
+        struct thread_data_t tdata[WORKER_COUNT];
+
+        char ip_buf[256] = { 0 };
+        struct sockaddr_in client_addr;
+        socklen_t client_n;
+
+
+        g_delay = 0;
+        g_shutdown_flag = 0;
+        if (argc == 1) {
+                usage();
+                return 1;
+        }
+        g_quiet = 0;
+        while ((opt = getopt(argc, argv, "l:p:f:d:hq")) != -1) {
+                switch (opt) {
+                        case 'l':
+                                ip_binding = strdup(optarg);
+                                break;
+                        case 'p':
+                                port_listening = atoi(optarg);
+                                if (port_listening == 0) {
+                                        printf(">> invalid port : %s\n", optarg);
+                                        exit(1);
+                                }
+                                break;
+                        case 'f':
+                                data_file = strdup(optarg);
+                                break;
+                        case 'd':
+                                g_delay = atoi(optarg);
+                                break;
+                        case 'q':
+                                g_quiet = 1;
+                                break;
+                        case 'h':
+                                usage();
+                                return 1;
+                }
+
+        }
+        printf(">> IP listening:%s\n", ip_binding);
+        printf(">> port: %d\n", port_listening);
+        printf(">> data_file: %s\n", data_file);
+        printf(">> reponse delay(MS): %d\n", g_delay);
+        printf(">> quite:%d\n",g_quiet);
+
+        if (NULL == data_file || strlen(data_file) == 0) {
+                printf("\033[31m-data file is needed!~ \033[0m\n");
+                usage();
+                return 1;
+        }
+
+        g_logger = fopen("stub.log", "a");
+        if (g_logger ==NULL) {
+                perror("create log file stub.log failed.");
+                exit(1);
+        }
+
+        data_from_file = load_data(data_file);
+
+        signal(SIGPIPE, SIG_IGN);
+        signal(SIGINT, exit_hook);
+        signal(SIGKILL, exit_hook);
+        signal(SIGQUIT, exit_hook);
+        signal(SIGTERM, exit_hook);
+        signal(SIGHUP, exit_hook);
+
+        for(i=0;i<WORKER_COUNT;i++){
+                if(pipe(g_pipe[i])<0){
+                        perror("failed to create pipe");
+                        exit(1);
+                }
+        }
+
+        listen_fd = socket(AF_INET, SOCK_STREAM, 0);
+        if (-1 == listen_fd) {
+                perror("listen faild!");
+                exit(-1);
+        }
+
+        setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+        setsockopt(listen_fd, IPPROTO_TCP, TCP_NODELAY, (int[]) {1}, sizeof(int));
+        setsockopt(listen_fd, IPPROTO_TCP, TCP_QUICKACK, (int[]) {1}, sizeof(int));
+
+        memset(&server_addr, 0, sizeof(server_addr));
+        server_addr.sin_family = AF_INET;
+        server_addr.sin_port = htons((short)port_listening);
+        server_addr.sin_addr.s_addr = inet_addr(ip_binding);
+
+        if (-1 == bind(listen_fd, (struct sockaddr *)&server_addr, sizeof(server_addr))) {
+                perror("bind error");
+                exit(-1);
+        }
+
+        if (-1 == listen(listen_fd, 32)) {
+                perror("listen error");
+                exit(-1);
+        }
+
+        for(i=0;i<worker_count;i++){
+                ep_fd[i] = epoll_create(MAX_EPOLL_FD);
+                if(ep_fd[i]<0){
+                        perror("epoll_create failed.");
+                        exit(-1);
+                }
+        }
+
+        for(i=0;i<worker_count;i++){
+                pthread_attr_init(tattr+i);
+                pthread_attr_setdetachstate(tattr+i, PTHREAD_CREATE_JOINABLE);
+                tdata[i].data_from_file = data_from_file;
+                tdata[i].myep_fd = ep_fd[i];
+                tdata[i].mypipe_fd = g_pipe[i][0];
+                if (pthread_create(tid+i, tattr+i, handle_io_loop, tdata+i ) != 0) {
+                        fprintf(stderr, "pthread_create failed\n");
+                        return -1;
+                }
+
+        }
+
+
+        while(1){
+                if ((client_fd = accept(listen_fd, (struct sockaddr *)&client_addr, &client_n)) > 0) {
+                        if(write(g_pipe[worker_pointer][1],(char*)&client_fd,4)<0){
+                                perror("failed to write pipe");
+                                exit(1);
+                        }
+                        inet_ntop(AF_INET, &client_addr.sin_addr, ip_buf, sizeof(ip_buf));
+                        httpstub_log("[CONN]Connection from %s", ip_buf);
+                        worker_pointer++;
+                        if(worker_pointer == worker_count) worker_pointer=0;
+                }
+                else if(errno == EBADF && g_shutdown_flag){
+                        break;
+                }
+                else{
+                        if(0 == g_shutdown_flag){
+                                perror("please check ulimit -n");
+                                sleep(1);
+                        }
+                }
+        }
+
+        free(data_from_file.begin);
+
+        for(i=0; i< worker_count; i++){
+                close(ep_fd[i]);
+        }
+
+        if(client_fd<0 && 0==g_shutdown_flag){
+                perror("Accep failed, try ulimit -n");
+                httpstub_log("[ERROR]too many fds open, try ulimit -n");
+                g_shutdown_flag = 1;
+        }
+        fclose(g_logger);
+        printf(">> [%d]waiting worker thread....\n",getpid());
+
+        for(i=0; i< worker_count; i++)
+                pthread_join(tid[i], NULL);
+
+        printf(">> [%d]Bye~\n",getpid());
+        return 0;
+}
+
+static void destroy_fd(int myep_fd, int client_fd, struct io_data_t *data_ptr, int case_no)
+{
+        struct epoll_event ev;
+        ev.data.ptr = data_ptr;
+        epoll_ctl(myep_fd, EPOLL_CTL_DEL, client_fd, &ev);
+        shutdown(client_fd, SHUT_RDWR);
+        close(client_fd);
+        destroy_io_data(data_ptr);
+        httpstub_log("[DEBUG] close case %d",case_no);
+}
+
+static void httpstub_log(const char *fmt, ...)
+{
+        if(0 == g_quiet){
+                char msg[4096];
+                char buf[64];
+                time_t now = time(NULL);
+                va_list ap;
+                va_start(ap, fmt);
+                vsnprintf(msg, sizeof(msg), fmt, ap);
+                va_end(ap);
+                strftime(buf, sizeof(buf), "%d %b %H:%M:%S", localtime(&now));
+                fprintf(g_logger, "[%d] %s %s\n", (int)getpid(), buf, msg);
+                fflush(g_logger);
+        }
+}
+
+static void handle_output(int myep_fd, struct io_data_t *client_io_ptr)
+{
+        int cfd, ret, case_no;
+        struct epoll_event ev;
+
+        cfd = client_io_ptr->fd;
+        ret = send(cfd, client_io_ptr->out_buf + client_io_ptr->out_buf_cur, client_io_ptr->out_buf_total - client_io_ptr->out_buf_cur, MSG_NOSIGNAL);
+        if (ret >= 0)
+                client_io_ptr->out_buf_cur += ret;
+
+        httpstub_log("[DEBUG]out_buf_cur %d", client_io_ptr->out_buf_cur);
+        httpstub_log("[DEBUG]out_buf_total %d", client_io_ptr->out_buf_total);
+
+        //printf("ret:%d\n",ret);
+        //printf("errno:%d\n", errno);
+        if (0 == ret || (ret < 0 && errno != EAGAIN && errno != EWOULDBLOCK)) {
+                //printf("loose 2\n");
+                case_no = 2;
+                //perror("send");
+                //printf("cfd: %d\n", cfd);
+                destroy_fd(myep_fd, cfd, client_io_ptr, case_no);
+                return;
+        }
+        if (client_io_ptr->out_buf_cur == client_io_ptr->out_buf_total) {     //have sent all
+                httpstub_log("[NOTICE] all messages have been sent.(%d bytes)", client_io_ptr->out_buf_total);
+                //printf("alive: %d\n", client_io_ptr->keep_alive);
+                if (client_io_ptr->version == HTTP_1_0 && 0 == client_io_ptr->keep_alive) {
+                        case_no = 4;
+                        destroy_fd(myep_fd, cfd, client_io_ptr, case_no);
+                        return;
+                }
+                ev.data.ptr = client_io_ptr;
+                ev.events = EPOLLIN;
+                epoll_ctl(myep_fd, EPOLL_CTL_MOD, cfd, &ev);
+        }
+
+}
+
+
+static void handle_input(int myep_fd, struct io_data_t *client_io_ptr, struct slice_t data_from_file, const char *rsps_msg_fmt, int delay)
+{
+        int npos = 0;
+        int total = 0;
+        int ret = 0;
+        int case_no = 0;
+        char headmsg[256];
+        char *sep = NULL;
+        const char *CRLF = "\r\n\r\n";
+        const char *LF = "\n\n";
+        const char *sep_flag=NULL;
+
+        struct epoll_event ev;
+        int cfd = client_io_ptr->fd;
+        int pkg_len = 0;
+
+        assert(client_io_ptr->in_buf_cur >= 0);
+        ret = recv(cfd, client_io_ptr->in_buf + client_io_ptr->in_buf_cur, 512, MSG_DONTWAIT);
+        //printf("%u\n",(unsigned int)pthread_self());
+        if (0 == ret || (ret < 0 && errno != EAGAIN && errno != EWOULDBLOCK)) {
+                case_no = 1;
+                //perror("++++++++");
+                destroy_fd(myep_fd, cfd, client_io_ptr, case_no);
+                return;
+        }
+
+        client_io_ptr->in_buf_cur += ret;
+        client_io_ptr->in_buf[client_io_ptr->in_buf_cur] = '\0';
+
+        sep = strstr(client_io_ptr->in_buf, CRLF);
+        if (NULL == sep) {
+                sep = strstr(client_io_ptr->in_buf, LF);
+                if (NULL == sep)
+                        return;
+                else
+                        sep_flag = LF;
+        } else {
+                sep_flag = CRLF;
+        }
+
+        if (strstr(client_io_ptr->in_buf, "GET ") == client_io_ptr->in_buf) {
+                if (strstr(client_io_ptr->in_buf, "HTTP/1.0") != NULL) {
+                        client_io_ptr->version = HTTP_1_0;
+                        if (NULL == strstr(client_io_ptr->in_buf, "Connection: Keep-Alive")) {
+                                client_io_ptr->keep_alive = 0;
+                        }
+                } else {
+                        client_io_ptr->version = HTTP_1_1;
+                }
+        }
+        npos = strcspn(client_io_ptr->in_buf, "\r\n");
+        if (npos > 250)
+                npos = 250;
+        memcpy(headmsg, client_io_ptr->in_buf, npos);
+        headmsg[npos] = '\0';
+        httpstub_log("[RECV] %s ", headmsg);
+
+        pkg_len = sep - client_io_ptr->in_buf + strlen(sep_flag);
+
+        assert(pkg_len >= 0);
+        assert(client_io_ptr->in_buf_cur - pkg_len >= 0);
+        memmove(client_io_ptr->in_buf, sep + strlen(sep_flag), client_io_ptr->in_buf_cur - pkg_len);
+        client_io_ptr->in_buf_cur -= pkg_len;
+
+        client_io_ptr->out_buf_cur = 0;
+        total = snprintf(client_io_ptr->out_buf, MAX_BUF_SIZE, rsps_msg_fmt, data_from_file.size);
+        memcpy(client_io_ptr->out_buf + total, data_from_file.begin, data_from_file.size);
+        total += data_from_file.size;
+        httpstub_log("[DEBUG]total:%d", total);
+        client_io_ptr->out_buf_total = total;
+
+        ev.data.ptr = client_io_ptr;
+        ev.events = EPOLLOUT;
+        epoll_ctl(myep_fd, EPOLL_CTL_MOD, cfd, &ev);
+        if (delay > 0) {
+                //printf("usleep: %d\n",(int)(g_delay*2000/nfds) );
+                usleep(delay);
+        }
+}
+
+static void * handle_io_loop(void *param)
+{
+        register int i;
+        int cfd, nfds, case_no, new_sock_fd;
+        struct epoll_event events[MAX_EPOLL_FD],ev;
+
+        const char *rsps_msg_fmt = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nConnection: Keep-Alive\r\nContent-Type: text/plain\r\n\r\n";
+
+        struct io_data_t *client_io_ptr;
+
+        struct thread_data_t my_tdata  = *(struct thread_data_t*)param;
+
+        ev.data.fd = my_tdata.mypipe_fd;
+        ev.events = EPOLLIN;
+        epoll_ctl(my_tdata.myep_fd,EPOLL_CTL_ADD,my_tdata.mypipe_fd,&ev);
+
+        while (1) {
+                nfds = epoll_wait(my_tdata.myep_fd, events, MAX_EPOLL_FD, 1000);
+                //printf("nfds:%d, epoll fd:%d\n",nfds,my_tdata.myep_fd);
+                if(nfds<=0 && 0!=g_shutdown_flag){
+                        break;
+                }
+                for (i = 0; i < nfds && nfds>0; i++) {
+                        if( (events[i].data.fd == my_tdata.mypipe_fd) && (events[i].events & EPOLLIN)){
+                                if(read(my_tdata.mypipe_fd,&new_sock_fd,4)==-1){
+                                        perror("faild to read pipe");
+                                        exit(1);
+                                }
+				setnonblocking(new_sock_fd);
+                                ev.data.ptr = alloc_io_data(new_sock_fd, (struct sockaddr_in *)NULL);
+                                ev.events = EPOLLIN;
+                                epoll_ctl(my_tdata.myep_fd, EPOLL_CTL_ADD, new_sock_fd, &ev);
+                                continue;
+                        }
+                        client_io_ptr = (struct io_data_t *)events[i].data.ptr;
+                        if(client_io_ptr->fd<=0) continue;
+
+                        if (events[i].events & EPOLLIN) {
+                                handle_input(my_tdata.myep_fd, client_io_ptr, my_tdata.data_from_file, rsps_msg_fmt, (int)(g_delay * 1000 / nfds));
+
+                        } else if (events[i].events & EPOLLOUT) {
+                                handle_output(my_tdata.myep_fd, client_io_ptr);
+
+                        } else if (events[i].events & EPOLLERR) {
+                                cfd = client_io_ptr->fd;
+                                case_no = 3;
+                                destroy_fd(my_tdata.myep_fd, cfd, client_io_ptr, case_no);
+                        }
+                }
+        }
+        return NULL;
+}
diff --git a/netcon/install-intercept.sh b/netcon/install-intercept.sh
new file mode 100755
index 000000000..b3da8aa84
--- /dev/null
+++ b/netcon/install-intercept.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# This script is only needed for debugging purposes
+
+cp libzerotierintercept.so /lib/libzerotierintercept.so
+ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+/usr/bin/install -c zerotier-intercept /usr/bin
+
+# rm -r /lib/libzerotierintercept.so
+# rm -r /lib/libzerotierintercept
+# rm -r /usr/bin/zerotier-intercept
diff --git a/netcon/make-liblwip.mk b/netcon/make-liblwip.mk
new file mode 100644
index 000000000..b473e60ed
--- /dev/null
+++ b/netcon/make-liblwip.mk
@@ -0,0 +1,107 @@
+#
+# Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+# SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+# OF SUCH DAMAGE.
+#
+# This file is part of the lwIP TCP/IP stack.
+#
+# Author: Adam Dunkels <adam@sics.se>
+#
+
+CONTRIBDIR=../ext/contrib
+LWIPARCH=$(CONTRIBDIR)/ports/unix
+
+#Set this to where you have the lwip core module checked out from CVS
+#default assumes it's a dir named lwip at the same level as the contrib module
+LWIPDIR=../ext/lwip/src
+
+
+CCDEP=gcc
+CC=gcc
+CFLAGS=-O3 -g -Wall -DIPv4 -fPIC 
+#-DLWIP_DEBUG
+
+CFLAGS:=$(CFLAGS) \
+	-I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
+	-I$(LWIPDIR) -I.
+
+
+# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
+COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \
+	$(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c $(LWIPDIR)/core/stats.c \
+	$(LWIPDIR)/core/sys.c $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \
+	$(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/dhcp.c \
+	$(LWIPDIR)/core/init.c $(LWIPDIR)/core/timers.c $(LWIPDIR)/core/def.c
+CORE4FILES=$(wildcard $(LWIPDIR)/core/ipv4/*.c) $(LWIPDIR)/core/ipv4/inet.c \
+	$(LWIPDIR)/core/ipv4/inet_chksum.c
+
+# SNMPFILES: Extra SNMPv1 agent
+SNMPFILES=$(LWIPDIR)/core/snmp/asn1_dec.c $(LWIPDIR)/core/snmp/asn1_enc.c \
+	$(LWIPDIR)/core/snmp/mib2.c $(LWIPDIR)/core/snmp/mib_structs.c \
+	$(LWIPDIR)/core/snmp/msg_in.c $(LWIPDIR)/core/snmp/msg_out.c
+
+# APIFILES: The files which implement the sequential and socket APIs.
+APIFILES=$(LWIPDIR)/api/api_lib.c $(LWIPDIR)/api/api_msg.c $(LWIPDIR)/api/tcpip.c \
+	$(LWIPDIR)/api/err.c $(LWIPDIR)/api/sockets.c $(LWIPDIR)/api/netbuf.c $(LWIPDIR)/api/netdb.c
+
+# NETIFFILES: Files implementing various generic network interface functions.'
+NETIFFILES=$(LWIPDIR)/netif/etharp.c $(LWIPDIR)/netif/slipif.c
+
+# NETIFFILES: Add PPP netif
+NETIFFILES+=$(LWIPDIR)/netif/ppp/auth.c $(LWIPDIR)/netif/ppp/chap.c \
+	$(LWIPDIR)/netif/ppp/chpms.c $(LWIPDIR)/netif/ppp/fsm.c \
+	$(LWIPDIR)/netif/ppp/ipcp.c $(LWIPDIR)/netif/ppp/lcp.c \
+	$(LWIPDIR)/netif/ppp/magic.c $(LWIPDIR)/netif/ppp/md5.c \
+	$(LWIPDIR)/netif/ppp/pap.c $(LWIPDIR)/netif/ppp/ppp.c \
+	$(LWIPDIR)/netif/ppp/randm.c $(LWIPDIR)/netif/ppp/vj.c
+
+# ARCHFILES: Architecture specific files.
+ARCHFILES=$(wildcard $(LWIPARCH)/*.c $(LWIPARCH)tapif.c $(LWIPARCH)/netif/list.c $(LWIPARCH)/netif/tcpdump.c)
+
+
+# LWIPFILES: All the above.
+LWIPFILES=$(COREFILES) $(CORE4FILES) $(SNMPFILES) $(APIFILES) $(NETIFFILES) $(ARCHFILES)
+LWIPFILESW=$(wildcard $(LWIPFILES))
+LWIPOBJS=$(notdir $(LWIPFILESW:.c=.o))
+
+LWIPLIB=liblwip.so
+
+%.o:
+	$(CC) $(CFLAGS) -c $(<:.o=.c)
+
+all: $(LWIPLIB)
+.PHONY: all
+
+clean:
+	rm -f *.o $(LWIPLIB) *.s .depend* *.core core
+
+depend dep: .depend
+
+include .depend
+
+$(LWIPLIB): $(LWIPOBJS)
+	$(CC) -g -nostartfiles -shared -o $@ $^
+
+.depend: $(LWIPFILES)
+	$(CCDEP) $(CFLAGS) -MM $^ > .depend || rm -f .depend
diff --git a/netcon/zerotier-intercept b/netcon/zerotier-intercept
new file mode 100755
index 000000000..f35c9d15c
--- /dev/null
+++ b/netcon/zerotier-intercept
@@ -0,0 +1,54 @@
+#!/bin/sh
+# usage:
+# /usr/bin/intercept program <args>
+
+if [ $# = 0 ] ; then
+   echo "$0: insufficient arguments"
+   exit
+fi
+
+case "$1" in
+	on)
+		if [ -z "$LD_PRELOAD" ]
+			then
+				export LD_PRELOAD="/lib/libzerotierintercept.so"
+			else
+				echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so" || \
+				export LD_PRELOAD="/lib/libzerotierintercept.so $LD_PRELOAD"
+		fi
+	;;
+	off)
+		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libzerotierintercept.so \?//'`
+		if [ -z "$LD_PRELOAD" ]
+			then
+				unset LD_PRELOAD
+		fi
+	;;
+	show|sh)
+		echo "LD_PRELOAD=\"$LD_PRELOAD\""
+	;;
+	-h|-?)
+      echo ""
+   ;;
+	*)
+		if [ -z "$LD_PRELOAD" ]
+		then
+			export LD_PRELOAD="/lib/libzerotierintercept.so"
+		else
+			echo $LD_PRELOAD | grep -q "/lib/libzerotierintercept\.so" || \
+			export LD_PRELOAD="/lib/libzerotierintercept.so $LD_PRELOAD"
+		fi
+
+		if [ $# = 0 ]
+		then
+			${SHELL:-/bin/sh}
+		fi
+
+		if [ $# -gt 0 ]
+		then
+			exec "$@"
+		fi
+	;;
+esac
+
+#EOF
diff --git a/node/AES.cpp b/node/AES.cpp
deleted file mode 100644
index 1ba6aeeb7..000000000
--- a/node/AES.cpp
+++ /dev/null
@@ -1,727 +0,0 @@
-/*
- * Copyright (c)2013-2020 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "AES.hpp"
-
-#include "Constants.hpp"
-
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-
-#define Te1_r(x) ZT_ROR32(Te0[x], 8U)
-#define Te2_r(x) ZT_ROR32(Te0[x], 16U)
-#define Te3_r(x) ZT_ROR32(Te0[x], 24U)
-#define Td1_r(x) ZT_ROR32(Td0[x], 8U)
-#define Td2_r(x) ZT_ROR32(Td0[x], 16U)
-#define Td3_r(x) ZT_ROR32(Td0[x], 24U)
-
-namespace ZeroTier {
-
-// GMAC ---------------------------------------------------------------------------------------------------------------
-
-namespace {
-
-#define s_bmul32(N, x, y, rh, rl)                                                                                                                                                                                                              \
-	uint32_t x0t_##N = (x) & 0x11111111U;                                                                                                                                                                                                      \
-	uint32_t x1t_##N = (x) & 0x22222222U;                                                                                                                                                                                                      \
-	uint32_t x2t_##N = (x) & 0x44444444U;                                                                                                                                                                                                      \
-	uint32_t x3t_##N = (x) & 0x88888888U;                                                                                                                                                                                                      \
-	uint32_t y0t_##N = (y) & 0x11111111U;                                                                                                                                                                                                      \
-	uint32_t y1t_##N = (y) & 0x22222222U;                                                                                                                                                                                                      \
-	uint32_t y2t_##N = (y) & 0x44444444U;                                                                                                                                                                                                      \
-	uint32_t y3t_##N = (y) & 0x88888888U;                                                                                                                                                                                                      \
-	uint64_t z0t_##N = (((uint64_t)x0t_##N * y0t_##N) ^ ((uint64_t)x1t_##N * y3t_##N) ^ ((uint64_t)x2t_##N * y2t_##N) ^ ((uint64_t)x3t_##N * y1t_##N)) & 0x1111111111111111ULL;                                                                \
-	uint64_t z1t_##N = (((uint64_t)x0t_##N * y1t_##N) ^ ((uint64_t)x1t_##N * y0t_##N) ^ ((uint64_t)x2t_##N * y3t_##N) ^ ((uint64_t)x3t_##N * y2t_##N)) & 0x2222222222222222ULL;                                                                \
-	uint64_t z2t_##N = (((uint64_t)x0t_##N * y2t_##N) ^ ((uint64_t)x1t_##N * y1t_##N) ^ ((uint64_t)x2t_##N * y0t_##N) ^ ((uint64_t)x3t_##N * y3t_##N)) & 0x4444444444444444ULL;                                                                \
-	z0t_##N |= z1t_##N;                                                                                                                                                                                                                        \
-	z2t_##N |= z0t_##N;                                                                                                                                                                                                                        \
-	uint64_t zt_##N = z2t_##N | ((((uint64_t)x0t_##N * y3t_##N) ^ ((uint64_t)x1t_##N * y2t_##N) ^ ((uint64_t)x2t_##N * y1t_##N) ^ ((uint64_t)x3t_##N * y0t_##N)) & 0x8888888888888888ULL);                                                     \
-	(rh) = (uint32_t)(zt_##N >> 32U);                                                                                                                                                                                                          \
-	(rl) = (uint32_t)zt_##N;
-
-void s_gfmul(const uint64_t hh, const uint64_t hl, uint64_t& y0, uint64_t& y1) noexcept
-{
-	uint32_t hhh = (uint32_t)(hh >> 32U);
-	uint32_t hhl = (uint32_t)hh;
-	uint32_t hlh = (uint32_t)(hl >> 32U);
-	uint32_t hll = (uint32_t)hl;
-	uint32_t hhXlh = hhh ^ hlh;
-	uint32_t hhXll = hhl ^ hll;
-	uint64_t yl = Utils::ntoh(y0);
-	uint64_t yh = Utils::ntoh(y1);
-	uint32_t cilh = (uint32_t)(yh >> 32U);
-	uint32_t cill = (uint32_t)yh;
-	uint32_t cihh = (uint32_t)(yl >> 32U);
-	uint32_t cihl = (uint32_t)yl;
-	uint32_t cihXlh = cihh ^ cilh;
-	uint32_t cihXll = cihl ^ cill;
-	uint32_t aah, aal, abh, abl, ach, acl;
-	s_bmul32(M0, cihh, hhh, aah, aal);
-	s_bmul32(M1, cihl, hhl, abh, abl);
-	s_bmul32(M2, cihh ^ cihl, hhh ^ hhl, ach, acl);
-	ach ^= aah ^ abh;
-	acl ^= aal ^ abl;
-	aal ^= ach;
-	abh ^= acl;
-	uint32_t bah, bal, bbh, bbl, bch, bcl;
-	s_bmul32(M3, cilh, hlh, bah, bal);
-	s_bmul32(M4, cill, hll, bbh, bbl);
-	s_bmul32(M5, cilh ^ cill, hlh ^ hll, bch, bcl);
-	bch ^= bah ^ bbh;
-	bcl ^= bal ^ bbl;
-	bal ^= bch;
-	bbh ^= bcl;
-	uint32_t cah, cal, cbh, cbl, cch, ccl;
-	s_bmul32(M6, cihXlh, hhXlh, cah, cal);
-	s_bmul32(M7, cihXll, hhXll, cbh, cbl);
-	s_bmul32(M8, cihXlh ^ cihXll, hhXlh ^ hhXll, cch, ccl);
-	cch ^= cah ^ cbh;
-	ccl ^= cal ^ cbl;
-	cal ^= cch;
-	cbh ^= ccl;
-	cah ^= bah ^ aah;
-	cal ^= bal ^ aal;
-	cbh ^= bbh ^ abh;
-	cbl ^= bbl ^ abl;
-	uint64_t zhh = ((uint64_t)aah << 32U) | aal;
-	uint64_t zhl = (((uint64_t)abh << 32U) | abl) ^ (((uint64_t)cah << 32U) | cal);
-	uint64_t zlh = (((uint64_t)bah << 32U) | bal) ^ (((uint64_t)cbh << 32U) | cbl);
-	uint64_t zll = ((uint64_t)bbh << 32U) | bbl;
-	zhh = zhh << 1U | zhl >> 63U;
-	zhl = zhl << 1U | zlh >> 63U;
-	zlh = zlh << 1U | zll >> 63U;
-	zll <<= 1U;
-	zlh ^= (zll << 63U) ^ (zll << 62U) ^ (zll << 57U);
-	zhh ^= zlh ^ (zlh >> 1U) ^ (zlh >> 2U) ^ (zlh >> 7U);
-	zhl ^= zll ^ (zll >> 1U) ^ (zll >> 2U) ^ (zll >> 7U) ^ (zlh << 63U) ^ (zlh << 62U) ^ (zlh << 57U);
-	y0 = Utils::hton(zhh);
-	y1 = Utils::hton(zhl);
-}
-
-}	// anonymous namespace
-
-void AES::GMAC::update(const void* const data, unsigned int len) noexcept
-{
-	const uint8_t* in = reinterpret_cast<const uint8_t*>(data);
-	_len += len;
-
-#ifdef ZT_AES_AESNI
-	if (likely(Utils::CPUID.aes)) {
-		p_aesNIUpdate(in, len);
-		return;
-	}
-#endif	 // ZT_AES_AESNI
-
-#ifdef ZT_AES_NEON
-	if (Utils::ARMCAP.pmull) {
-		p_armUpdate(in, len);
-		return;
-	}
-#endif	 // ZT_AES_NEON
-
-	const uint64_t h0 = _aes.p_k.sw.h[0];
-	const uint64_t h1 = _aes.p_k.sw.h[1];
-	uint64_t y0 = _y[0];
-	uint64_t y1 = _y[1];
-
-	if (_rp) {
-		for (;;) {
-			if (! len) {
-				return;
-			}
-			--len;
-			_r[_rp++] = *(in++);
-			if (_rp == 16) {
-				y0 ^= Utils::loadMachineEndian<uint64_t>(_r);
-				y1 ^= Utils::loadMachineEndian<uint64_t>(_r + 8);
-				s_gfmul(h0, h1, y0, y1);
-				break;
-			}
-		}
-	}
-
-	while (len >= 16) {
-		y0 ^= Utils::loadMachineEndian<uint64_t>(in);
-		y1 ^= Utils::loadMachineEndian<uint64_t>(in + 8);
-		in += 16;
-		s_gfmul(h0, h1, y0, y1);
-		len -= 16;
-	}
-
-	_y[0] = y0;
-	_y[1] = y1;
-
-	for (unsigned int i = 0; i < len; ++i) {
-		_r[i] = in[i];
-	}
-	_rp = len;	 // len is always less than 16 here
-}
-
-void AES::GMAC::finish(uint8_t tag[16]) noexcept
-{
-#ifdef ZT_AES_AESNI
-	if (likely(Utils::CPUID.aes)) {
-		p_aesNIFinish(tag);
-		return;
-	}
-#endif	 // ZT_AES_AESNI
-
-#ifdef ZT_AES_NEON
-	if (Utils::ARMCAP.pmull) {
-		p_armFinish(tag);
-		return;
-	}
-#endif	 // ZT_AES_NEON
-
-	const uint64_t h0 = _aes.p_k.sw.h[0];
-	const uint64_t h1 = _aes.p_k.sw.h[1];
-	uint64_t y0 = _y[0];
-	uint64_t y1 = _y[1];
-
-	if (_rp) {
-		while (_rp < 16) {
-			_r[_rp++] = 0;
-		}
-		y0 ^= Utils::loadMachineEndian<uint64_t>(_r);
-		y1 ^= Utils::loadMachineEndian<uint64_t>(_r + 8);
-		s_gfmul(h0, h1, y0, y1);
-	}
-
-	y0 ^= Utils::hton((uint64_t)_len << 3U);
-	s_gfmul(h0, h1, y0, y1);
-
-	uint64_t iv2[2];
-	Utils::copy<12>(iv2, _iv);
-#if __BYTE_ORDER == __BIG_ENDIAN
-	reinterpret_cast<uint32_t*>(iv2)[3] = 0x00000001;
-#else
-	reinterpret_cast<uint32_t*>(iv2)[3] = 0x01000000;
-#endif
-	_aes.encrypt(iv2, iv2);
-
-	Utils::storeMachineEndian<uint64_t>(tag, iv2[0] ^ y0);
-	Utils::storeMachineEndian<uint64_t>(tag + 8, iv2[1] ^ y1);
-}
-
-// AES-CTR ------------------------------------------------------------------------------------------------------------
-
-void AES::CTR::crypt(const void* const input, unsigned int len) noexcept
-{
-	const uint8_t* in = reinterpret_cast<const uint8_t*>(input);
-	uint8_t* out = _out;
-
-#ifdef ZT_AES_AESNI
-	if (likely(Utils::CPUID.aes)) {
-		p_aesNICrypt(in, out, len);
-		return;
-	}
-#endif	 // ZT_AES_AESNI
-
-#ifdef ZT_AES_NEON
-	if (Utils::ARMCAP.aes) {
-		p_armCrypt(in, out, len);
-		return;
-	}
-#endif	 // ZT_AES_NEON
-
-	uint64_t keyStream[2];
-	uint32_t ctr = Utils::ntoh(reinterpret_cast<uint32_t*>(_ctr)[3]);
-
-	unsigned int totalLen = _len;
-	if ((totalLen & 15U)) {
-		for (;;) {
-			if (! len) {
-				_len = (totalLen + len);
-				return;
-			}
-			--len;
-			out[totalLen++] = *(in++);
-			if (! (totalLen & 15U)) {
-				_aes.p_encryptSW(reinterpret_cast<const uint8_t*>(_ctr), reinterpret_cast<uint8_t*>(keyStream));
-				reinterpret_cast<uint32_t*>(_ctr)[3] = Utils::hton(++ctr);
-				uint8_t* outblk = out + (totalLen - 16);
-				for (int i = 0; i < 16; ++i) {
-					outblk[i] ^= reinterpret_cast<uint8_t*>(keyStream)[i];
-				}
-				break;
-			}
-		}
-	}
-
-	out += totalLen;
-	_len = (totalLen + len);
-
-	if (likely(len >= 16)) {
-		const uint32_t* const restrict rk = _aes.p_k.sw.ek;
-		const uint32_t ctr0rk0 = Utils::ntoh(reinterpret_cast<const uint32_t*>(_ctr)[0]) ^ rk[0];
-		const uint32_t ctr1rk1 = Utils::ntoh(reinterpret_cast<const uint32_t*>(_ctr)[1]) ^ rk[1];
-		const uint32_t ctr2rk2 = Utils::ntoh(reinterpret_cast<const uint32_t*>(_ctr)[2]) ^ rk[2];
-		const uint32_t m8 = 0x000000ff;
-		const uint32_t m8_8 = 0x0000ff00;
-		const uint32_t m8_16 = 0x00ff0000;
-		const uint32_t m8_24 = 0xff000000;
-		if (likely((((uintptr_t)out & 7U) == 0U) && (((uintptr_t)in & 7U) == 0U))) {
-			do {
-				uint32_t s0, s1, s2, s3, t0, t1, t2, t3;
-				s0 = ctr0rk0;
-				s1 = ctr1rk1;
-				s2 = ctr2rk2;
-				s3 = ctr++ ^ rk[3];
-
-				const uint64_t in0 = *reinterpret_cast<const uint64_t*>(in);
-				const uint64_t in1 = *reinterpret_cast<const uint64_t*>(in + 8);
-				in += 16;
-
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[4];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[5];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[6];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[7];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[8];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[9];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[10];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[11];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[12];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[13];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[14];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[15];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[16];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[17];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[18];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[19];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[20];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[21];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[22];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[23];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[24];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[25];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[26];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[27];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[28];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[29];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[30];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[31];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[32];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[33];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[34];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[35];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[36];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[37];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[38];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[39];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[40];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[41];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[42];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[43];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[44];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[45];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[46];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[47];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[48];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[49];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[50];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[51];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[52];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[53];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[54];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[55];
-				s0 = (Te2_r(t0 >> 24U) & m8_24) ^ (Te3_r((t1 >> 16U) & m8) & m8_16) ^ (Te0[(t2 >> 8U) & m8] & m8_8) ^ (Te1_r(t3 & m8) & m8) ^ rk[56];
-				s1 = (Te2_r(t1 >> 24U) & m8_24) ^ (Te3_r((t2 >> 16U) & m8) & m8_16) ^ (Te0[(t3 >> 8U) & m8] & m8_8) ^ (Te1_r(t0 & m8) & m8) ^ rk[57];
-				s2 = (Te2_r(t2 >> 24U) & m8_24) ^ (Te3_r((t3 >> 16U) & m8) & m8_16) ^ (Te0[(t0 >> 8U) & m8] & m8_8) ^ (Te1_r(t1 & m8) & m8) ^ rk[58];
-				s3 = (Te2_r(t3 >> 24U) & m8_24) ^ (Te3_r((t0 >> 16U) & m8) & m8_16) ^ (Te0[(t1 >> 8U) & m8] & m8_8) ^ (Te1_r(t2 & m8) & m8) ^ rk[59];
-
-				*reinterpret_cast<uint64_t*>(out) = in0 ^ Utils::hton(((uint64_t)s0 << 32U) | (uint64_t)s1);
-				*reinterpret_cast<uint64_t*>(out + 8) = in1 ^ Utils::hton(((uint64_t)s2 << 32U) | (uint64_t)s3);
-				out += 16;
-			} while ((len -= 16) >= 16);
-		}
-		else {
-			do {
-				uint32_t s0, s1, s2, s3, t0, t1, t2, t3;
-				s0 = ctr0rk0;
-				s1 = ctr1rk1;
-				s2 = ctr2rk2;
-				s3 = ctr++ ^ rk[3];
-
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[4];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[5];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[6];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[7];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[8];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[9];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[10];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[11];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[12];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[13];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[14];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[15];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[16];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[17];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[18];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[19];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[20];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[21];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[22];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[23];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[24];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[25];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[26];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[27];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[28];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[29];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[30];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[31];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[32];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[33];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[34];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[35];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[36];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[37];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[38];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[39];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[40];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[41];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[42];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[43];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[44];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[45];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[46];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[47];
-				s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[48];
-				s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[49];
-				s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[50];
-				s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[51];
-				t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[52];
-				t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[53];
-				t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[54];
-				t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[55];
-				s0 = (Te2_r(t0 >> 24U) & m8_24) ^ (Te3_r((t1 >> 16U) & m8) & m8_16) ^ (Te0[(t2 >> 8U) & m8] & m8_8) ^ (Te1_r(t3 & m8) & m8) ^ rk[56];
-				s1 = (Te2_r(t1 >> 24U) & m8_24) ^ (Te3_r((t2 >> 16U) & m8) & m8_16) ^ (Te0[(t3 >> 8U) & m8] & m8_8) ^ (Te1_r(t0 & m8) & m8) ^ rk[57];
-				s2 = (Te2_r(t2 >> 24U) & m8_24) ^ (Te3_r((t3 >> 16U) & m8) & m8_16) ^ (Te0[(t0 >> 8U) & m8] & m8_8) ^ (Te1_r(t1 & m8) & m8) ^ rk[58];
-				s3 = (Te2_r(t3 >> 24U) & m8_24) ^ (Te3_r((t0 >> 16U) & m8) & m8_16) ^ (Te0[(t1 >> 8U) & m8] & m8_8) ^ (Te1_r(t2 & m8) & m8) ^ rk[59];
-
-				out[0] = in[0] ^ (uint8_t)(s0 >> 24U);
-				out[1] = in[1] ^ (uint8_t)(s0 >> 16U);
-				out[2] = in[2] ^ (uint8_t)(s0 >> 8U);
-				out[3] = in[3] ^ (uint8_t)s0;
-				out[4] = in[4] ^ (uint8_t)(s1 >> 24U);
-				out[5] = in[5] ^ (uint8_t)(s1 >> 16U);
-				out[6] = in[6] ^ (uint8_t)(s1 >> 8U);
-				out[7] = in[7] ^ (uint8_t)s1;
-				out[8] = in[8] ^ (uint8_t)(s2 >> 24U);
-				out[9] = in[9] ^ (uint8_t)(s2 >> 16U);
-				out[10] = in[10] ^ (uint8_t)(s2 >> 8U);
-				out[11] = in[11] ^ (uint8_t)s2;
-				out[12] = in[12] ^ (uint8_t)(s3 >> 24U);
-				out[13] = in[13] ^ (uint8_t)(s3 >> 16U);
-				out[14] = in[14] ^ (uint8_t)(s3 >> 8U);
-				out[15] = in[15] ^ (uint8_t)s3;
-				out += 16;
-				in += 16;
-			} while ((len -= 16) >= 16);
-		}
-		reinterpret_cast<uint32_t*>(_ctr)[3] = Utils::hton(ctr);
-	}
-
-	// Any remaining input is placed in _out. This will be picked up and crypted
-	// on subsequent calls to crypt() or finish() as it'll mean _len will not be
-	// an even multiple of 16.
-	while (len) {
-		--len;
-		*(out++) = *(in++);
-	}
-}
-
-void AES::CTR::finish() noexcept
-{
-	uint8_t tmp[16];
-	const unsigned int rem = _len & 15U;
-	if (rem) {
-		_aes.encrypt(_ctr, tmp);
-		for (unsigned int i = 0, j = _len - rem; i < rem; ++i) {
-			_out[j + i] ^= tmp[i];
-		}
-	}
-}
-
-// Software AES and AES key expansion ---------------------------------------------------------------------------------
-
-const uint32_t AES::Te0[256] = { 0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d, 0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554, 0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d, 0xe7fefe19, 0xb5d7d762, 0x4dababe6, 0xec76769a,
-								 0x8fcaca45, 0x1f82829d, 0x89c9c940, 0xfa7d7d87, 0xeffafa15, 0xb25959eb, 0x8e4747c9, 0xfbf0f00b, 0x41adadec, 0xb3d4d467, 0x5fa2a2fd, 0x45afafea, 0x239c9cbf, 0x53a4a4f7, 0xe4727296, 0x9bc0c05b,
-								 0x75b7b7c2, 0xe1fdfd1c, 0x3d9393ae, 0x4c26266a, 0x6c36365a, 0x7e3f3f41, 0xf5f7f702, 0x83cccc4f, 0x6834345c, 0x51a5a5f4, 0xd1e5e534, 0xf9f1f108, 0xe2717193, 0xabd8d873, 0x62313153, 0x2a15153f,
-								 0x0804040c, 0x95c7c752, 0x46232365, 0x9dc3c35e, 0x30181828, 0x379696a1, 0x0a05050f, 0x2f9a9ab5, 0x0e070709, 0x24121236, 0x1b80809b, 0xdfe2e23d, 0xcdebeb26, 0x4e272769, 0x7fb2b2cd, 0xea75759f,
-								 0x1209091b, 0x1d83839e, 0x582c2c74, 0x341a1a2e, 0x361b1b2d, 0xdc6e6eb2, 0xb45a5aee, 0x5ba0a0fb, 0xa45252f6, 0x763b3b4d, 0xb7d6d661, 0x7db3b3ce, 0x5229297b, 0xdde3e33e, 0x5e2f2f71, 0x13848497,
-								 0xa65353f5, 0xb9d1d168, 0x00000000, 0xc1eded2c, 0x40202060, 0xe3fcfc1f, 0x79b1b1c8, 0xb65b5bed, 0xd46a6abe, 0x8dcbcb46, 0x67bebed9, 0x7239394b, 0x944a4ade, 0x984c4cd4, 0xb05858e8, 0x85cfcf4a,
-								 0xbbd0d06b, 0xc5efef2a, 0x4faaaae5, 0xedfbfb16, 0x864343c5, 0x9a4d4dd7, 0x66333355, 0x11858594, 0x8a4545cf, 0xe9f9f910, 0x04020206, 0xfe7f7f81, 0xa05050f0, 0x783c3c44, 0x259f9fba, 0x4ba8a8e3,
-								 0xa25151f3, 0x5da3a3fe, 0x804040c0, 0x058f8f8a, 0x3f9292ad, 0x219d9dbc, 0x70383848, 0xf1f5f504, 0x63bcbcdf, 0x77b6b6c1, 0xafdada75, 0x42212163, 0x20101030, 0xe5ffff1a, 0xfdf3f30e, 0xbfd2d26d,
-								 0x81cdcd4c, 0x180c0c14, 0x26131335, 0xc3ecec2f, 0xbe5f5fe1, 0x359797a2, 0x884444cc, 0x2e171739, 0x93c4c457, 0x55a7a7f2, 0xfc7e7e82, 0x7a3d3d47, 0xc86464ac, 0xba5d5de7, 0x3219192b, 0xe6737395,
-								 0xc06060a0, 0x19818198, 0x9e4f4fd1, 0xa3dcdc7f, 0x44222266, 0x542a2a7e, 0x3b9090ab, 0x0b888883, 0x8c4646ca, 0xc7eeee29, 0x6bb8b8d3, 0x2814143c, 0xa7dede79, 0xbc5e5ee2, 0x160b0b1d, 0xaddbdb76,
-								 0xdbe0e03b, 0x64323256, 0x743a3a4e, 0x140a0a1e, 0x924949db, 0x0c06060a, 0x4824246c, 0xb85c5ce4, 0x9fc2c25d, 0xbdd3d36e, 0x43acacef, 0xc46262a6, 0x399191a8, 0x319595a4, 0xd3e4e437, 0xf279798b,
-								 0xd5e7e732, 0x8bc8c843, 0x6e373759, 0xda6d6db7, 0x018d8d8c, 0xb1d5d564, 0x9c4e4ed2, 0x49a9a9e0, 0xd86c6cb4, 0xac5656fa, 0xf3f4f407, 0xcfeaea25, 0xca6565af, 0xf47a7a8e, 0x47aeaee9, 0x10080818,
-								 0x6fbabad5, 0xf0787888, 0x4a25256f, 0x5c2e2e72, 0x381c1c24, 0x57a6a6f1, 0x73b4b4c7, 0x97c6c651, 0xcbe8e823, 0xa1dddd7c, 0xe874749c, 0x3e1f1f21, 0x964b4bdd, 0x61bdbddc, 0x0d8b8b86, 0x0f8a8a85,
-								 0xe0707090, 0x7c3e3e42, 0x71b5b5c4, 0xcc6666aa, 0x904848d8, 0x06030305, 0xf7f6f601, 0x1c0e0e12, 0xc26161a3, 0x6a35355f, 0xae5757f9, 0x69b9b9d0, 0x17868691, 0x99c1c158, 0x3a1d1d27, 0x279e9eb9,
-								 0xd9e1e138, 0xebf8f813, 0x2b9898b3, 0x22111133, 0xd26969bb, 0xa9d9d970, 0x078e8e89, 0x339494a7, 0x2d9b9bb6, 0x3c1e1e22, 0x15878792, 0xc9e9e920, 0x87cece49, 0xaa5555ff, 0x50282878, 0xa5dfdf7a,
-								 0x038c8c8f, 0x59a1a1f8, 0x09898980, 0x1a0d0d17, 0x65bfbfda, 0xd7e6e631, 0x844242c6, 0xd06868b8, 0x824141c3, 0x299999b0, 0x5a2d2d77, 0x1e0f0f11, 0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a };
-const uint32_t AES::Te4[256] = { 0x63636363, 0x7c7c7c7c, 0x77777777, 0x7b7b7b7b, 0xf2f2f2f2, 0x6b6b6b6b, 0x6f6f6f6f, 0xc5c5c5c5, 0x30303030, 0x01010101, 0x67676767, 0x2b2b2b2b, 0xfefefefe, 0xd7d7d7d7, 0xabababab, 0x76767676,
-								 0xcacacaca, 0x82828282, 0xc9c9c9c9, 0x7d7d7d7d, 0xfafafafa, 0x59595959, 0x47474747, 0xf0f0f0f0, 0xadadadad, 0xd4d4d4d4, 0xa2a2a2a2, 0xafafafaf, 0x9c9c9c9c, 0xa4a4a4a4, 0x72727272, 0xc0c0c0c0,
-								 0xb7b7b7b7, 0xfdfdfdfd, 0x93939393, 0x26262626, 0x36363636, 0x3f3f3f3f, 0xf7f7f7f7, 0xcccccccc, 0x34343434, 0xa5a5a5a5, 0xe5e5e5e5, 0xf1f1f1f1, 0x71717171, 0xd8d8d8d8, 0x31313131, 0x15151515,
-								 0x04040404, 0xc7c7c7c7, 0x23232323, 0xc3c3c3c3, 0x18181818, 0x96969696, 0x05050505, 0x9a9a9a9a, 0x07070707, 0x12121212, 0x80808080, 0xe2e2e2e2, 0xebebebeb, 0x27272727, 0xb2b2b2b2, 0x75757575,
-								 0x09090909, 0x83838383, 0x2c2c2c2c, 0x1a1a1a1a, 0x1b1b1b1b, 0x6e6e6e6e, 0x5a5a5a5a, 0xa0a0a0a0, 0x52525252, 0x3b3b3b3b, 0xd6d6d6d6, 0xb3b3b3b3, 0x29292929, 0xe3e3e3e3, 0x2f2f2f2f, 0x84848484,
-								 0x53535353, 0xd1d1d1d1, 0x00000000, 0xedededed, 0x20202020, 0xfcfcfcfc, 0xb1b1b1b1, 0x5b5b5b5b, 0x6a6a6a6a, 0xcbcbcbcb, 0xbebebebe, 0x39393939, 0x4a4a4a4a, 0x4c4c4c4c, 0x58585858, 0xcfcfcfcf,
-								 0xd0d0d0d0, 0xefefefef, 0xaaaaaaaa, 0xfbfbfbfb, 0x43434343, 0x4d4d4d4d, 0x33333333, 0x85858585, 0x45454545, 0xf9f9f9f9, 0x02020202, 0x7f7f7f7f, 0x50505050, 0x3c3c3c3c, 0x9f9f9f9f, 0xa8a8a8a8,
-								 0x51515151, 0xa3a3a3a3, 0x40404040, 0x8f8f8f8f, 0x92929292, 0x9d9d9d9d, 0x38383838, 0xf5f5f5f5, 0xbcbcbcbc, 0xb6b6b6b6, 0xdadadada, 0x21212121, 0x10101010, 0xffffffff, 0xf3f3f3f3, 0xd2d2d2d2,
-								 0xcdcdcdcd, 0x0c0c0c0c, 0x13131313, 0xecececec, 0x5f5f5f5f, 0x97979797, 0x44444444, 0x17171717, 0xc4c4c4c4, 0xa7a7a7a7, 0x7e7e7e7e, 0x3d3d3d3d, 0x64646464, 0x5d5d5d5d, 0x19191919, 0x73737373,
-								 0x60606060, 0x81818181, 0x4f4f4f4f, 0xdcdcdcdc, 0x22222222, 0x2a2a2a2a, 0x90909090, 0x88888888, 0x46464646, 0xeeeeeeee, 0xb8b8b8b8, 0x14141414, 0xdededede, 0x5e5e5e5e, 0x0b0b0b0b, 0xdbdbdbdb,
-								 0xe0e0e0e0, 0x32323232, 0x3a3a3a3a, 0x0a0a0a0a, 0x49494949, 0x06060606, 0x24242424, 0x5c5c5c5c, 0xc2c2c2c2, 0xd3d3d3d3, 0xacacacac, 0x62626262, 0x91919191, 0x95959595, 0xe4e4e4e4, 0x79797979,
-								 0xe7e7e7e7, 0xc8c8c8c8, 0x37373737, 0x6d6d6d6d, 0x8d8d8d8d, 0xd5d5d5d5, 0x4e4e4e4e, 0xa9a9a9a9, 0x6c6c6c6c, 0x56565656, 0xf4f4f4f4, 0xeaeaeaea, 0x65656565, 0x7a7a7a7a, 0xaeaeaeae, 0x08080808,
-								 0xbabababa, 0x78787878, 0x25252525, 0x2e2e2e2e, 0x1c1c1c1c, 0xa6a6a6a6, 0xb4b4b4b4, 0xc6c6c6c6, 0xe8e8e8e8, 0xdddddddd, 0x74747474, 0x1f1f1f1f, 0x4b4b4b4b, 0xbdbdbdbd, 0x8b8b8b8b, 0x8a8a8a8a,
-								 0x70707070, 0x3e3e3e3e, 0xb5b5b5b5, 0x66666666, 0x48484848, 0x03030303, 0xf6f6f6f6, 0x0e0e0e0e, 0x61616161, 0x35353535, 0x57575757, 0xb9b9b9b9, 0x86868686, 0xc1c1c1c1, 0x1d1d1d1d, 0x9e9e9e9e,
-								 0xe1e1e1e1, 0xf8f8f8f8, 0x98989898, 0x11111111, 0x69696969, 0xd9d9d9d9, 0x8e8e8e8e, 0x94949494, 0x9b9b9b9b, 0x1e1e1e1e, 0x87878787, 0xe9e9e9e9, 0xcececece, 0x55555555, 0x28282828, 0xdfdfdfdf,
-								 0x8c8c8c8c, 0xa1a1a1a1, 0x89898989, 0x0d0d0d0d, 0xbfbfbfbf, 0xe6e6e6e6, 0x42424242, 0x68686868, 0x41414141, 0x99999999, 0x2d2d2d2d, 0x0f0f0f0f, 0xb0b0b0b0, 0x54545454, 0xbbbbbbbb, 0x16161616 };
-const uint32_t AES::Td0[256] = { 0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96, 0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393, 0x2030fa55, 0xad766df6, 0x88cc7691, 0xf5024c25, 0x4fe5d7fc, 0xc52acbd7, 0x26354480, 0xb562a38f,
-								 0xdeb15a49, 0x25ba1b67, 0x45ea0e98, 0x5dfec0e1, 0xc32f7502, 0x814cf012, 0x8d4697a3, 0x6bd3f9c6, 0x038f5fe7, 0x15929c95, 0xbf6d7aeb, 0x955259da, 0xd4be832d, 0x587421d3, 0x49e06929, 0x8ec9c844,
-								 0x75c2896a, 0xf48e7978, 0x99583e6b, 0x27b971dd, 0xbee14fb6, 0xf088ad17, 0xc920ac66, 0x7dce3ab4, 0x63df4a18, 0xe51a3182, 0x97513360, 0x62537f45, 0xb16477e0, 0xbb6bae84, 0xfe81a01c, 0xf9082b94,
-								 0x70486858, 0x8f45fd19, 0x94de6c87, 0x527bf8b7, 0xab73d323, 0x724b02e2, 0xe31f8f57, 0x6655ab2a, 0xb2eb2807, 0x2fb5c203, 0x86c57b9a, 0xd33708a5, 0x302887f2, 0x23bfa5b2, 0x02036aba, 0xed16825c,
-								 0x8acf1c2b, 0xa779b492, 0xf307f2f0, 0x4e69e2a1, 0x65daf4cd, 0x0605bed5, 0xd134621f, 0xc4a6fe8a, 0x342e539d, 0xa2f355a0, 0x058ae132, 0xa4f6eb75, 0x0b83ec39, 0x4060efaa, 0x5e719f06, 0xbd6e1051,
-								 0x3e218af9, 0x96dd063d, 0xdd3e05ae, 0x4de6bd46, 0x91548db5, 0x71c45d05, 0x0406d46f, 0x605015ff, 0x1998fb24, 0xd6bde997, 0x894043cc, 0x67d99e77, 0xb0e842bd, 0x07898b88, 0xe7195b38, 0x79c8eedb,
-								 0xa17c0a47, 0x7c420fe9, 0xf8841ec9, 0x00000000, 0x09808683, 0x322bed48, 0x1e1170ac, 0x6c5a724e, 0xfd0efffb, 0x0f853856, 0x3daed51e, 0x362d3927, 0x0a0fd964, 0x685ca621, 0x9b5b54d1, 0x24362e3a,
-								 0x0c0a67b1, 0x9357e70f, 0xb4ee96d2, 0x1b9b919e, 0x80c0c54f, 0x61dc20a2, 0x5a774b69, 0x1c121a16, 0xe293ba0a, 0xc0a02ae5, 0x3c22e043, 0x121b171d, 0x0e090d0b, 0xf28bc7ad, 0x2db6a8b9, 0x141ea9c8,
-								 0x57f11985, 0xaf75074c, 0xee99ddbb, 0xa37f60fd, 0xf701269f, 0x5c72f5bc, 0x44663bc5, 0x5bfb7e34, 0x8b432976, 0xcb23c6dc, 0xb6edfc68, 0xb8e4f163, 0xd731dcca, 0x42638510, 0x13972240, 0x84c61120,
-								 0x854a247d, 0xd2bb3df8, 0xaef93211, 0xc729a16d, 0x1d9e2f4b, 0xdcb230f3, 0x0d8652ec, 0x77c1e3d0, 0x2bb3166c, 0xa970b999, 0x119448fa, 0x47e96422, 0xa8fc8cc4, 0xa0f03f1a, 0x567d2cd8, 0x223390ef,
-								 0x87494ec7, 0xd938d1c1, 0x8ccaa2fe, 0x98d40b36, 0xa6f581cf, 0xa57ade28, 0xdab78e26, 0x3fadbfa4, 0x2c3a9de4, 0x5078920d, 0x6a5fcc9b, 0x547e4662, 0xf68d13c2, 0x90d8b8e8, 0x2e39f75e, 0x82c3aff5,
-								 0x9f5d80be, 0x69d0937c, 0x6fd52da9, 0xcf2512b3, 0xc8ac993b, 0x10187da7, 0xe89c636e, 0xdb3bbb7b, 0xcd267809, 0x6e5918f4, 0xec9ab701, 0x834f9aa8, 0xe6956e65, 0xaaffe67e, 0x21bccf08, 0xef15e8e6,
-								 0xbae79bd9, 0x4a6f36ce, 0xea9f09d4, 0x29b07cd6, 0x31a4b2af, 0x2a3f2331, 0xc6a59430, 0x35a266c0, 0x744ebc37, 0xfc82caa6, 0xe090d0b0, 0x33a7d815, 0xf104984a, 0x41ecdaf7, 0x7fcd500e, 0x1791f62f,
-								 0x764dd68d, 0x43efb04d, 0xccaa4d54, 0xe49604df, 0x9ed1b5e3, 0x4c6a881b, 0xc12c1fb8, 0x4665517f, 0x9d5eea04, 0x018c355d, 0xfa877473, 0xfb0b412e, 0xb3671d5a, 0x92dbd252, 0xe9105633, 0x6dd64713,
-								 0x9ad7618c, 0x37a10c7a, 0x59f8148e, 0xeb133c89, 0xcea927ee, 0xb761c935, 0xe11ce5ed, 0x7a47b13c, 0x9cd2df59, 0x55f2733f, 0x1814ce79, 0x73c737bf, 0x53f7cdea, 0x5ffdaa5b, 0xdf3d6f14, 0x7844db86,
-								 0xcaaff381, 0xb968c43e, 0x3824342c, 0xc2a3405f, 0x161dc372, 0xbce2250c, 0x283c498b, 0xff0d9541, 0x39a80171, 0x080cb3de, 0xd8b4e49c, 0x6456c190, 0x7bcb8461, 0xd532b670, 0x486c5c74, 0xd0b85742 };
-const uint8_t AES::Td4[256] = { 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
-								0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
-								0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
-								0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
-								0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
-								0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
-								0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
-								0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d };
-const uint32_t AES::rcon[15] = { 0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000, 0x6c000000, 0xd8000000, 0xab000000, 0x4d000000, 0x9a000000 };
-
-void AES::p_initSW(const uint8_t* key) noexcept
-{
-	uint32_t* rk = p_k.sw.ek;
-
-	rk[0] = Utils::loadBigEndian<uint32_t>(key);
-	rk[1] = Utils::loadBigEndian<uint32_t>(key + 4);
-	rk[2] = Utils::loadBigEndian<uint32_t>(key + 8);
-	rk[3] = Utils::loadBigEndian<uint32_t>(key + 12);
-	rk[4] = Utils::loadBigEndian<uint32_t>(key + 16);
-	rk[5] = Utils::loadBigEndian<uint32_t>(key + 20);
-	rk[6] = Utils::loadBigEndian<uint32_t>(key + 24);
-	rk[7] = Utils::loadBigEndian<uint32_t>(key + 28);
-	for (int i = 0;;) {
-		uint32_t temp = rk[7];
-		rk[8] = rk[0] ^ (Te2_r((temp >> 16U) & 0xffU) & 0xff000000U) ^ (Te3_r((temp >> 8U) & 0xffU) & 0x00ff0000U) ^ (Te0[(temp) & 0xffU] & 0x0000ff00U) ^ (Te1_r(temp >> 24U) & 0x000000ffU) ^ rcon[i];
-		rk[9] = rk[1] ^ rk[8];
-		rk[10] = rk[2] ^ rk[9];
-		rk[11] = rk[3] ^ rk[10];
-		if (++i == 7) {
-			break;
-		}
-		temp = rk[11];
-		rk[12] = rk[4] ^ (Te2_r(temp >> 24U) & 0xff000000U) ^ (Te3_r((temp >> 16U) & 0xffU) & 0x00ff0000U) ^ (Te0[(temp >> 8U) & 0xffU] & 0x0000ff00U) ^ (Te1_r((temp) & 0xffU) & 0x000000ffU);
-		rk[13] = rk[5] ^ rk[12];
-		rk[14] = rk[6] ^ rk[13];
-		rk[15] = rk[7] ^ rk[14];
-		rk += 8;
-	}
-
-	p_encryptSW((const uint8_t*)Utils::ZERO256, (uint8_t*)p_k.sw.h);
-	p_k.sw.h[0] = Utils::ntoh(p_k.sw.h[0]);
-	p_k.sw.h[1] = Utils::ntoh(p_k.sw.h[1]);
-
-	for (int i = 0; i < 60; ++i) {
-		p_k.sw.dk[i] = p_k.sw.ek[i];
-	}
-	rk = p_k.sw.dk;
-
-	for (int i = 0, j = 56; i < j; i += 4, j -= 4) {
-		uint32_t temp = rk[i];
-		rk[i] = rk[j];
-		rk[j] = temp;
-		temp = rk[i + 1];
-		rk[i + 1] = rk[j + 1];
-		rk[j + 1] = temp;
-		temp = rk[i + 2];
-		rk[i + 2] = rk[j + 2];
-		rk[j + 2] = temp;
-		temp = rk[i + 3];
-		rk[i + 3] = rk[j + 3];
-		rk[j + 3] = temp;
-	}
-	for (int i = 1; i < 14; ++i) {
-		rk += 4;
-		rk[0] = Td0[Te4[(rk[0] >> 24U)] & 0xffU] ^ Td1_r(Te4[(rk[0] >> 16U) & 0xffU] & 0xffU) ^ Td2_r(Te4[(rk[0] >> 8U) & 0xffU] & 0xffU) ^ Td3_r(Te4[(rk[0]) & 0xffU] & 0xffU);
-		rk[1] = Td0[Te4[(rk[1] >> 24U)] & 0xffU] ^ Td1_r(Te4[(rk[1] >> 16U) & 0xffU] & 0xffU) ^ Td2_r(Te4[(rk[1] >> 8U) & 0xffU] & 0xffU) ^ Td3_r(Te4[(rk[1]) & 0xffU] & 0xffU);
-		rk[2] = Td0[Te4[(rk[2] >> 24U)] & 0xffU] ^ Td1_r(Te4[(rk[2] >> 16U) & 0xffU] & 0xffU) ^ Td2_r(Te4[(rk[2] >> 8U) & 0xffU] & 0xffU) ^ Td3_r(Te4[(rk[2]) & 0xffU] & 0xffU);
-		rk[3] = Td0[Te4[(rk[3] >> 24U)] & 0xffU] ^ Td1_r(Te4[(rk[3] >> 16U) & 0xffU] & 0xffU) ^ Td2_r(Te4[(rk[3] >> 8U) & 0xffU] & 0xffU) ^ Td3_r(Te4[(rk[3]) & 0xffU] & 0xffU);
-	}
-}
-
-void AES::p_encryptSW(const uint8_t* in, uint8_t* out) const noexcept
-{
-	const uint32_t* const restrict rk = p_k.sw.ek;
-	const uint32_t m8 = 0x000000ff;
-	const uint32_t m8_8 = 0x0000ff00;
-	const uint32_t m8_16 = 0x00ff0000;
-	const uint32_t m8_24 = 0xff000000;
-	uint32_t s0 = Utils::loadBigEndian<uint32_t>(in) ^ rk[0];
-	uint32_t s1 = Utils::loadBigEndian<uint32_t>(in + 4) ^ rk[1];
-	uint32_t s2 = Utils::loadBigEndian<uint32_t>(in + 8) ^ rk[2];
-	uint32_t s3 = Utils::loadBigEndian<uint32_t>(in + 12) ^ rk[3];
-
-	uint32_t t0, t1, t2, t3;
-	t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[4];
-	t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[5];
-	t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[6];
-	t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[7];
-	s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[8];
-	s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[9];
-	s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[10];
-	s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[11];
-	t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[12];
-	t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[13];
-	t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[14];
-	t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[15];
-	s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[16];
-	s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[17];
-	s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[18];
-	s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[19];
-	t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[20];
-	t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[21];
-	t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[22];
-	t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[23];
-	s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[24];
-	s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[25];
-	s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[26];
-	s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[27];
-	t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[28];
-	t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[29];
-	t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[30];
-	t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[31];
-	s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[32];
-	s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[33];
-	s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[34];
-	s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[35];
-	t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[36];
-	t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[37];
-	t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[38];
-	t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[39];
-	s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[40];
-	s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[41];
-	s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[42];
-	s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[43];
-	t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[44];
-	t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[45];
-	t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[46];
-	t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[47];
-	s0 = Te0[t0 >> 24U] ^ Te1_r((t1 >> 16U) & m8) ^ Te2_r((t2 >> 8U) & m8) ^ Te3_r(t3 & m8) ^ rk[48];
-	s1 = Te0[t1 >> 24U] ^ Te1_r((t2 >> 16U) & m8) ^ Te2_r((t3 >> 8U) & m8) ^ Te3_r(t0 & m8) ^ rk[49];
-	s2 = Te0[t2 >> 24U] ^ Te1_r((t3 >> 16U) & m8) ^ Te2_r((t0 >> 8U) & m8) ^ Te3_r(t1 & m8) ^ rk[50];
-	s3 = Te0[t3 >> 24U] ^ Te1_r((t0 >> 16U) & m8) ^ Te2_r((t1 >> 8U) & m8) ^ Te3_r(t2 & m8) ^ rk[51];
-	t0 = Te0[s0 >> 24U] ^ Te1_r((s1 >> 16U) & m8) ^ Te2_r((s2 >> 8U) & m8) ^ Te3_r(s3 & m8) ^ rk[52];
-	t1 = Te0[s1 >> 24U] ^ Te1_r((s2 >> 16U) & m8) ^ Te2_r((s3 >> 8U) & m8) ^ Te3_r(s0 & m8) ^ rk[53];
-	t2 = Te0[s2 >> 24U] ^ Te1_r((s3 >> 16U) & m8) ^ Te2_r((s0 >> 8U) & m8) ^ Te3_r(s1 & m8) ^ rk[54];
-	t3 = Te0[s3 >> 24U] ^ Te1_r((s0 >> 16U) & m8) ^ Te2_r((s1 >> 8U) & m8) ^ Te3_r(s2 & m8) ^ rk[55];
-	s0 = (Te2_r(t0 >> 24U) & m8_24) ^ (Te3_r((t1 >> 16U) & m8) & m8_16) ^ (Te0[(t2 >> 8U) & m8] & m8_8) ^ (Te1_r(t3 & m8) & m8) ^ rk[56];
-	s1 = (Te2_r(t1 >> 24U) & m8_24) ^ (Te3_r((t2 >> 16U) & m8) & m8_16) ^ (Te0[(t3 >> 8U) & m8] & m8_8) ^ (Te1_r(t0 & m8) & m8) ^ rk[57];
-	s2 = (Te2_r(t2 >> 24U) & m8_24) ^ (Te3_r((t3 >> 16U) & m8) & m8_16) ^ (Te0[(t0 >> 8U) & m8] & m8_8) ^ (Te1_r(t1 & m8) & m8) ^ rk[58];
-	s3 = (Te2_r(t3 >> 24U) & m8_24) ^ (Te3_r((t0 >> 16U) & m8) & m8_16) ^ (Te0[(t1 >> 8U) & m8] & m8_8) ^ (Te1_r(t2 & m8) & m8) ^ rk[59];
-
-	Utils::storeBigEndian<uint32_t>(out, s0);
-	Utils::storeBigEndian<uint32_t>(out + 4, s1);
-	Utils::storeBigEndian<uint32_t>(out + 8, s2);
-	Utils::storeBigEndian<uint32_t>(out + 12, s3);
-}
-
-void AES::p_decryptSW(const uint8_t* in, uint8_t* out) const noexcept
-{
-	const uint32_t* restrict rk = p_k.sw.dk;
-	const uint32_t m8 = 0x000000ff;
-	uint32_t s0 = Utils::loadBigEndian<uint32_t>(in) ^ rk[0];
-	uint32_t s1 = Utils::loadBigEndian<uint32_t>(in + 4) ^ rk[1];
-	uint32_t s2 = Utils::loadBigEndian<uint32_t>(in + 8) ^ rk[2];
-	uint32_t s3 = Utils::loadBigEndian<uint32_t>(in + 12) ^ rk[3];
-
-	uint32_t t0, t1, t2, t3;
-	t0 = Td0[s0 >> 24U] ^ Td1_r((s3 >> 16U) & m8) ^ Td2_r((s2 >> 8U) & m8) ^ Td3_r(s1 & m8) ^ rk[4];
-	t1 = Td0[s1 >> 24U] ^ Td1_r((s0 >> 16U) & m8) ^ Td2_r((s3 >> 8U) & m8) ^ Td3_r(s2 & m8) ^ rk[5];
-	t2 = Td0[s2 >> 24U] ^ Td1_r((s1 >> 16U) & m8) ^ Td2_r((s0 >> 8U) & m8) ^ Td3_r(s3 & m8) ^ rk[6];
-	t3 = Td0[s3 >> 24U] ^ Td1_r((s2 >> 16U) & m8) ^ Td2_r((s1 >> 8U) & m8) ^ Td3_r(s0 & m8) ^ rk[7];
-	s0 = Td0[t0 >> 24U] ^ Td1_r((t3 >> 16U) & m8) ^ Td2_r((t2 >> 8U) & m8) ^ Td3_r(t1 & m8) ^ rk[8];
-	s1 = Td0[t1 >> 24U] ^ Td1_r((t0 >> 16U) & m8) ^ Td2_r((t3 >> 8U) & m8) ^ Td3_r(t2 & m8) ^ rk[9];
-	s2 = Td0[t2 >> 24U] ^ Td1_r((t1 >> 16U) & m8) ^ Td2_r((t0 >> 8U) & m8) ^ Td3_r(t3 & m8) ^ rk[10];
-	s3 = Td0[t3 >> 24U] ^ Td1_r((t2 >> 16U) & m8) ^ Td2_r((t1 >> 8U) & m8) ^ Td3_r(t0 & m8) ^ rk[11];
-	t0 = Td0[s0 >> 24U] ^ Td1_r((s3 >> 16U) & m8) ^ Td2_r((s2 >> 8U) & m8) ^ Td3_r(s1 & m8) ^ rk[12];
-	t1 = Td0[s1 >> 24U] ^ Td1_r((s0 >> 16U) & m8) ^ Td2_r((s3 >> 8U) & m8) ^ Td3_r(s2 & m8) ^ rk[13];
-	t2 = Td0[s2 >> 24U] ^ Td1_r((s1 >> 16U) & m8) ^ Td2_r((s0 >> 8U) & m8) ^ Td3_r(s3 & m8) ^ rk[14];
-	t3 = Td0[s3 >> 24U] ^ Td1_r((s2 >> 16U) & m8) ^ Td2_r((s1 >> 8U) & m8) ^ Td3_r(s0 & m8) ^ rk[15];
-	s0 = Td0[t0 >> 24U] ^ Td1_r((t3 >> 16U) & m8) ^ Td2_r((t2 >> 8U) & m8) ^ Td3_r(t1 & m8) ^ rk[16];
-	s1 = Td0[t1 >> 24U] ^ Td1_r((t0 >> 16U) & m8) ^ Td2_r((t3 >> 8U) & m8) ^ Td3_r(t2 & m8) ^ rk[17];
-	s2 = Td0[t2 >> 24U] ^ Td1_r((t1 >> 16U) & m8) ^ Td2_r((t0 >> 8U) & m8) ^ Td3_r(t3 & m8) ^ rk[18];
-	s3 = Td0[t3 >> 24U] ^ Td1_r((t2 >> 16U) & m8) ^ Td2_r((t1 >> 8U) & m8) ^ Td3_r(t0 & m8) ^ rk[19];
-	t0 = Td0[s0 >> 24U] ^ Td1_r((s3 >> 16U) & m8) ^ Td2_r((s2 >> 8U) & m8) ^ Td3_r(s1 & m8) ^ rk[20];
-	t1 = Td0[s1 >> 24U] ^ Td1_r((s0 >> 16U) & m8) ^ Td2_r((s3 >> 8U) & m8) ^ Td3_r(s2 & m8) ^ rk[21];
-	t2 = Td0[s2 >> 24U] ^ Td1_r((s1 >> 16U) & m8) ^ Td2_r((s0 >> 8U) & m8) ^ Td3_r(s3 & m8) ^ rk[22];
-	t3 = Td0[s3 >> 24U] ^ Td1_r((s2 >> 16U) & m8) ^ Td2_r((s1 >> 8U) & m8) ^ Td3_r(s0 & m8) ^ rk[23];
-	s0 = Td0[t0 >> 24U] ^ Td1_r((t3 >> 16U) & m8) ^ Td2_r((t2 >> 8U) & m8) ^ Td3_r(t1 & m8) ^ rk[24];
-	s1 = Td0[t1 >> 24U] ^ Td1_r((t0 >> 16U) & m8) ^ Td2_r((t3 >> 8U) & m8) ^ Td3_r(t2 & m8) ^ rk[25];
-	s2 = Td0[t2 >> 24U] ^ Td1_r((t1 >> 16U) & m8) ^ Td2_r((t0 >> 8U) & m8) ^ Td3_r(t3 & m8) ^ rk[26];
-	s3 = Td0[t3 >> 24U] ^ Td1_r((t2 >> 16U) & m8) ^ Td2_r((t1 >> 8U) & m8) ^ Td3_r(t0 & m8) ^ rk[27];
-	t0 = Td0[s0 >> 24U] ^ Td1_r((s3 >> 16U) & m8) ^ Td2_r((s2 >> 8U) & m8) ^ Td3_r(s1 & m8) ^ rk[28];
-	t1 = Td0[s1 >> 24U] ^ Td1_r((s0 >> 16U) & m8) ^ Td2_r((s3 >> 8U) & m8) ^ Td3_r(s2 & m8) ^ rk[29];
-	t2 = Td0[s2 >> 24U] ^ Td1_r((s1 >> 16U) & m8) ^ Td2_r((s0 >> 8U) & m8) ^ Td3_r(s3 & m8) ^ rk[30];
-	t3 = Td0[s3 >> 24U] ^ Td1_r((s2 >> 16U) & m8) ^ Td2_r((s1 >> 8U) & m8) ^ Td3_r(s0 & m8) ^ rk[31];
-	s0 = Td0[t0 >> 24U] ^ Td1_r((t3 >> 16U) & m8) ^ Td2_r((t2 >> 8U) & m8) ^ Td3_r(t1 & m8) ^ rk[32];
-	s1 = Td0[t1 >> 24U] ^ Td1_r((t0 >> 16U) & m8) ^ Td2_r((t3 >> 8U) & m8) ^ Td3_r(t2 & m8) ^ rk[33];
-	s2 = Td0[t2 >> 24U] ^ Td1_r((t1 >> 16U) & m8) ^ Td2_r((t0 >> 8U) & m8) ^ Td3_r(t3 & m8) ^ rk[34];
-	s3 = Td0[t3 >> 24U] ^ Td1_r((t2 >> 16U) & m8) ^ Td2_r((t1 >> 8U) & m8) ^ Td3_r(t0 & m8) ^ rk[35];
-	t0 = Td0[s0 >> 24U] ^ Td1_r((s3 >> 16U) & m8) ^ Td2_r((s2 >> 8U) & m8) ^ Td3_r(s1 & m8) ^ rk[36];
-	t1 = Td0[s1 >> 24U] ^ Td1_r((s0 >> 16U) & m8) ^ Td2_r((s3 >> 8U) & m8) ^ Td3_r(s2 & m8) ^ rk[37];
-	t2 = Td0[s2 >> 24U] ^ Td1_r((s1 >> 16U) & m8) ^ Td2_r((s0 >> 8U) & m8) ^ Td3_r(s3 & m8) ^ rk[38];
-	t3 = Td0[s3 >> 24U] ^ Td1_r((s2 >> 16U) & m8) ^ Td2_r((s1 >> 8U) & m8) ^ Td3_r(s0 & m8) ^ rk[39];
-	s0 = Td0[t0 >> 24U] ^ Td1_r((t3 >> 16U) & m8) ^ Td2_r((t2 >> 8U) & m8) ^ Td3_r(t1 & m8) ^ rk[40];
-	s1 = Td0[t1 >> 24U] ^ Td1_r((t0 >> 16U) & m8) ^ Td2_r((t3 >> 8U) & m8) ^ Td3_r(t2 & m8) ^ rk[41];
-	s2 = Td0[t2 >> 24U] ^ Td1_r((t1 >> 16U) & m8) ^ Td2_r((t0 >> 8U) & m8) ^ Td3_r(t3 & m8) ^ rk[42];
-	s3 = Td0[t3 >> 24U] ^ Td1_r((t2 >> 16U) & m8) ^ Td2_r((t1 >> 8U) & m8) ^ Td3_r(t0 & m8) ^ rk[43];
-	t0 = Td0[s0 >> 24U] ^ Td1_r((s3 >> 16U) & m8) ^ Td2_r((s2 >> 8U) & m8) ^ Td3_r(s1 & m8) ^ rk[44];
-	t1 = Td0[s1 >> 24U] ^ Td1_r((s0 >> 16U) & m8) ^ Td2_r((s3 >> 8U) & m8) ^ Td3_r(s2 & m8) ^ rk[45];
-	t2 = Td0[s2 >> 24U] ^ Td1_r((s1 >> 16U) & m8) ^ Td2_r((s0 >> 8U) & m8) ^ Td3_r(s3 & m8) ^ rk[46];
-	t3 = Td0[s3 >> 24U] ^ Td1_r((s2 >> 16U) & m8) ^ Td2_r((s1 >> 8U) & m8) ^ Td3_r(s0 & m8) ^ rk[47];
-	s0 = Td0[t0 >> 24U] ^ Td1_r((t3 >> 16U) & m8) ^ Td2_r((t2 >> 8U) & m8) ^ Td3_r(t1 & m8) ^ rk[48];
-	s1 = Td0[t1 >> 24U] ^ Td1_r((t0 >> 16U) & m8) ^ Td2_r((t3 >> 8U) & m8) ^ Td3_r(t2 & m8) ^ rk[49];
-	s2 = Td0[t2 >> 24U] ^ Td1_r((t1 >> 16U) & m8) ^ Td2_r((t0 >> 8U) & m8) ^ Td3_r(t3 & m8) ^ rk[50];
-	s3 = Td0[t3 >> 24U] ^ Td1_r((t2 >> 16U) & m8) ^ Td2_r((t1 >> 8U) & m8) ^ Td3_r(t0 & m8) ^ rk[51];
-	t0 = Td0[s0 >> 24U] ^ Td1_r((s3 >> 16U) & m8) ^ Td2_r((s2 >> 8U) & m8) ^ Td3_r(s1 & m8) ^ rk[52];
-	t1 = Td0[s1 >> 24U] ^ Td1_r((s0 >> 16U) & m8) ^ Td2_r((s3 >> 8U) & m8) ^ Td3_r(s2 & m8) ^ rk[53];
-	t2 = Td0[s2 >> 24U] ^ Td1_r((s1 >> 16U) & m8) ^ Td2_r((s0 >> 8U) & m8) ^ Td3_r(s3 & m8) ^ rk[54];
-	t3 = Td0[s3 >> 24U] ^ Td1_r((s2 >> 16U) & m8) ^ Td2_r((s1 >> 8U) & m8) ^ Td3_r(s0 & m8) ^ rk[55];
-	s0 = (Td4[t0 >> 24U] << 24U) ^ (Td4[(t3 >> 16U) & m8] << 16U) ^ (Td4[(t2 >> 8U) & m8] << 8U) ^ (Td4[(t1)&m8]) ^ rk[56];
-	s1 = (Td4[t1 >> 24U] << 24U) ^ (Td4[(t0 >> 16U) & m8] << 16U) ^ (Td4[(t3 >> 8U) & m8] << 8U) ^ (Td4[(t2)&m8]) ^ rk[57];
-	s2 = (Td4[t2 >> 24U] << 24U) ^ (Td4[(t1 >> 16U) & m8] << 16U) ^ (Td4[(t0 >> 8U) & m8] << 8U) ^ (Td4[(t3)&m8]) ^ rk[58];
-	s3 = (Td4[t3 >> 24U] << 24U) ^ (Td4[(t2 >> 16U) & m8] << 16U) ^ (Td4[(t1 >> 8U) & m8] << 8U) ^ (Td4[(t0)&m8]) ^ rk[59];
-
-	Utils::storeBigEndian<uint32_t>(out, s0);
-	Utils::storeBigEndian<uint32_t>(out + 4, s1);
-	Utils::storeBigEndian<uint32_t>(out + 8, s2);
-	Utils::storeBigEndian<uint32_t>(out + 12, s3);
-}
-
-}	// namespace ZeroTier
diff --git a/node/AES.hpp b/node/AES.hpp
deleted file mode 100644
index cb4ca23f5..000000000
--- a/node/AES.hpp
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * Copyright (c)2013-2020 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_AES_HPP
-#define ZT_AES_HPP
-
-#include "Constants.hpp"
-#include "SHA512.hpp"
-#include "Utils.hpp"
-
-// Uncomment to disable all hardware acceleration (usually for testing)
-// #define ZT_AES_NO_ACCEL
-
-#if ! defined(ZT_AES_NO_ACCEL) && defined(ZT_ARCH_X64)
-#define ZT_AES_AESNI 1
-#endif
-#if ! defined(ZT_AES_NO_ACCEL) && defined(ZT_ARCH_ARM_HAS_NEON) && defined(ZT_ARCH_ARM_HAS_CRYPTO)
-#define ZT_AES_NEON 1
-#endif
-
-#ifndef ZT_INLINE
-#define ZT_INLINE inline
-#endif
-
-namespace ZeroTier {
-
-/**
- * AES-256 and pals including GMAC, CTR, etc.
- *
- * This includes hardware acceleration for certain processors. The software
- * mode is fallback and is significantly slower.
- */
-class AES {
-  public:
-	/**
-	 * @return True if this system has hardware AES acceleration
-	 */
-	static ZT_INLINE bool accelerated()
-	{
-#ifdef ZT_AES_AESNI
-		return Utils::CPUID.aes;
-#else
-#ifdef ZT_AES_NEON
-		return Utils::ARMCAP.aes;
-#else
-		return false;
-#endif
-#endif
-	}
-
-	/**
-	 * Create an un-initialized AES instance (must call init() before use)
-	 */
-	ZT_INLINE AES() noexcept
-	{
-	}
-
-	/**
-	 * Create an AES instance with the given key
-	 *
-	 * @param key 256-bit key
-	 */
-	explicit ZT_INLINE AES(const void* const key) noexcept
-	{
-		this->init(key);
-	}
-
-	ZT_INLINE ~AES()
-	{
-		Utils::burn(&p_k, sizeof(p_k));
-	}
-
-	/**
-	 * Set (or re-set) this AES256 cipher's key
-	 *
-	 * @param key 256-bit / 32-byte key
-	 */
-	ZT_INLINE void init(const void* const key) noexcept
-	{
-#ifdef ZT_AES_AESNI
-		if (likely(Utils::CPUID.aes)) {
-			p_init_aesni(reinterpret_cast<const uint8_t*>(key));
-			return;
-		}
-#endif
-#ifdef ZT_AES_NEON
-		if (Utils::ARMCAP.aes) {
-			p_init_armneon_crypto(reinterpret_cast<const uint8_t*>(key));
-			return;
-		}
-#endif
-		p_initSW(reinterpret_cast<const uint8_t*>(key));
-	}
-
-	/**
-	 * Encrypt a single AES block
-	 *
-	 * @param in Input block
-	 * @param out Output block (can be same as input)
-	 */
-	ZT_INLINE void encrypt(const void* const in, void* const out) const noexcept
-	{
-#ifdef ZT_AES_AESNI
-		if (likely(Utils::CPUID.aes)) {
-			p_encrypt_aesni(in, out);
-			return;
-		}
-#endif
-#ifdef ZT_AES_NEON
-		if (Utils::ARMCAP.aes) {
-			p_encrypt_armneon_crypto(in, out);
-			return;
-		}
-#endif
-		p_encryptSW(reinterpret_cast<const uint8_t*>(in), reinterpret_cast<uint8_t*>(out));
-	}
-
-	/**
-	 * Decrypt a single AES block
-	 *
-	 * @param in Input block
-	 * @param out Output block (can be same as input)
-	 */
-	ZT_INLINE void decrypt(const void* const in, void* const out) const noexcept
-	{
-#ifdef ZT_AES_AESNI
-		if (likely(Utils::CPUID.aes)) {
-			p_decrypt_aesni(in, out);
-			return;
-		}
-#endif
-#ifdef ZT_AES_NEON
-		if (Utils::ARMCAP.aes) {
-			p_decrypt_armneon_crypto(in, out);
-			return;
-		}
-#endif
-		p_decryptSW(reinterpret_cast<const uint8_t*>(in), reinterpret_cast<uint8_t*>(out));
-	}
-
-	class GMACSIVEncryptor;
-	class GMACSIVDecryptor;
-
-	/**
-	 * Streaming GMAC calculator
-	 */
-	class GMAC {
-		friend class GMACSIVEncryptor;
-		friend class GMACSIVDecryptor;
-
-	  public:
-		/**
-		 * @return True if this system has hardware GMAC acceleration
-		 */
-		static ZT_INLINE bool accelerated()
-		{
-#ifdef ZT_AES_AESNI
-			return Utils::CPUID.aes;
-#else
-#ifdef ZT_AES_NEON
-			return Utils::ARMCAP.pmull;
-#else
-			return false;
-#endif
-#endif
-		}
-
-		/**
-		 * Create a new instance of GMAC (must be initialized with init() before use)
-		 *
-		 * @param aes Keyed AES instance to use
-		 */
-		ZT_INLINE GMAC(const AES& aes) : _aes(aes)
-		{
-		}
-
-		/**
-		 * Reset and initialize for a new GMAC calculation
-		 *
-		 * @param iv 96-bit initialization vector (pad with zeroes if actual IV is shorter)
-		 */
-		ZT_INLINE void init(const uint8_t iv[12]) noexcept
-		{
-			_rp = 0;
-			_len = 0;
-			// We fill the least significant 32 bits in the _iv field with 1 since in GCM mode
-			// this would hold the counter, but we're not doing GCM. The counter is therefore
-			// always 1.
-#ifdef ZT_AES_AESNI	  // also implies an x64 processor
-			*reinterpret_cast<uint64_t*>(_iv) = *reinterpret_cast<const uint64_t*>(iv);
-			*reinterpret_cast<uint32_t*>(_iv + 8) = *reinterpret_cast<const uint64_t*>(iv + 8);
-			*reinterpret_cast<uint32_t*>(_iv + 12) = 0x01000000;   // 0x00000001 in big-endian byte order
-#else
-			for (int i = 0; i < 12; ++i) {
-				_iv[i] = iv[i];
-			}
-			_iv[12] = 0;
-			_iv[13] = 0;
-			_iv[14] = 0;
-			_iv[15] = 1;
-#endif
-			_y[0] = 0;
-			_y[1] = 0;
-		}
-
-		/**
-		 * Process data through GMAC
-		 *
-		 * @param data Bytes to process
-		 * @param len Length of input
-		 */
-		void update(const void* data, unsigned int len) noexcept;
-
-		/**
-		 * Process any remaining cached bytes and generate tag
-		 *
-		 * Don't call finish() more than once or you'll get an invalid result.
-		 *
-		 * @param tag 128-bit GMAC tag (can be truncated)
-		 */
-		void finish(uint8_t tag[16]) noexcept;
-
-	  private:
-#ifdef ZT_AES_AESNI
-		void p_aesNIUpdate(const uint8_t* in, unsigned int len) noexcept;
-		void p_aesNIFinish(uint8_t tag[16]) noexcept;
-#endif
-#ifdef ZT_AES_NEON
-		void p_armUpdate(const uint8_t* in, unsigned int len) noexcept;
-		void p_armFinish(uint8_t tag[16]) noexcept;
-#endif
-		const AES& _aes;
-		unsigned int _rp;
-		unsigned int _len;
-		uint8_t _r[16];	  // remainder
-		uint8_t _iv[16];
-		uint64_t _y[2];
-	};
-
-	/**
-	 * Streaming AES-CTR encrypt/decrypt
-	 *
-	 * NOTE: this doesn't support overflow of the counter in the least significant 32 bits.
-	 * AES-GMAC-CTR doesn't need this, so we don't support it as an optimization.
-	 */
-	class CTR {
-		friend class GMACSIVEncryptor;
-		friend class GMACSIVDecryptor;
-
-	  public:
-		ZT_INLINE CTR(const AES& aes) noexcept : _aes(aes)
-		{
-		}
-
-		/**
-		 * Initialize this CTR instance to encrypt a new stream
-		 *
-		 * @param iv Unique initialization vector and initial 32-bit counter (least significant 32 bits, big-endian)
-		 * @param output Buffer to which to store output (MUST be large enough for total bytes processed!)
-		 */
-		ZT_INLINE void init(const uint8_t iv[16], void* const output) noexcept
-		{
-			Utils::copy<16>(_ctr, iv);
-			_out = reinterpret_cast<uint8_t*>(output);
-			_len = 0;
-		}
-
-		/**
-		 * Initialize this CTR instance to encrypt a new stream
-		 *
-		 * @param iv Unique initialization vector
-		 * @param ic Initial counter (must be in big-endian byte order!)
-		 * @param output Buffer to which to store output (MUST be large enough for total bytes processed!)
-		 */
-		ZT_INLINE void init(const uint8_t iv[12], const uint32_t ic, void* const output) noexcept
-		{
-			Utils::copy<12>(_ctr, iv);
-			reinterpret_cast<uint32_t*>(_ctr)[3] = ic;
-			_out = reinterpret_cast<uint8_t*>(output);
-			_len = 0;
-		}
-
-		/**
-		 * Encrypt or decrypt data, writing result to the output provided to init()
-		 *
-		 * @param input Input data
-		 * @param len Length of input
-		 */
-		void crypt(const void* input, unsigned int len) noexcept;
-
-		/**
-		 * Finish any remaining bytes if total bytes processed wasn't a multiple of 16
-		 *
-		 * Don't call more than once for a given stream or data may be corrupted.
-		 */
-		void finish() noexcept;
-
-	  private:
-#ifdef ZT_AES_AESNI
-		void p_aesNICrypt(const uint8_t* in, uint8_t* out, unsigned int len) noexcept;
-#endif
-#ifdef ZT_AES_NEON
-		void p_armCrypt(const uint8_t* in, uint8_t* out, unsigned int len) noexcept;
-#endif
-		const AES& _aes;
-		uint64_t _ctr[2];
-		uint8_t* _out;
-		unsigned int _len;
-	};
-
-	/**
-	 * Encryptor for AES-GMAC-SIV.
-	 *
-	 * Encryption requires two passes. The first pass starts after init
-	 * with aad (if any) followed by update1() and finish1(). Then the
-	 * update2() and finish2() methods must be used over the same data
-	 * (but NOT AAD) again.
-	 *
-	 * This supports encryption of a maximum of 2^31 bytes of data per
-	 * call to init().
-	 */
-	class GMACSIVEncryptor {
-	  public:
-		/**
-		 * Create a new AES-GMAC-SIV encryptor keyed with the provided AES instances
-		 *
-		 * @param k0 First of two AES instances keyed with K0
-		 * @param k1 Second of two AES instances keyed with K1
-		 */
-		ZT_INLINE GMACSIVEncryptor(const AES& k0, const AES& k1) noexcept
-			: _gmac(k0)
-			, _ctr(k1)
-		{
-		}
-
-		/**
-		 * Initialize AES-GMAC-SIV
-		 *
-		 * @param iv IV in network byte order (byte order in which it will appear on the wire)
-		 * @param output Pointer to buffer to receive ciphertext, must be large enough for all to-be-processed data!
-		 */
-		ZT_INLINE void init(const uint64_t iv, void* const output) noexcept
-		{
-			// Output buffer to receive the result of AES-CTR encryption.
-			_output = output;
-
-			// Initialize GMAC with 64-bit IV (and remaining 32 bits padded to zero).
-			_tag[0] = iv;
-			_tag[1] = 0;
-			_gmac.init(reinterpret_cast<const uint8_t*>(_tag));
-		}
-
-		/**
-		 * Process AAD (additional authenticated data) that is not being encrypted.
-		 *
-		 * If such data exists this must be called before update1() and finish1().
-		 *
-		 * Note: current code only supports one single chunk of AAD. Don't call this
-		 * multiple times per message.
-		 *
-		 * @param aad Additional authenticated data
-		 * @param len Length of AAD in bytes
-		 */
-		ZT_INLINE void aad(const void* const aad, unsigned int len) noexcept
-		{
-			// Feed ADD into GMAC first
-			_gmac.update(aad, len);
-
-			// End of AAD is padded to a multiple of 16 bytes to ensure unique encoding.
-			len &= 0xfU;
-			if (len != 0) {
-				_gmac.update(Utils::ZERO256, 16 - len);
-			}
-		}
-
-		/**
-		 * First pass plaintext input function
-		 *
-		 * @param input Plaintext chunk
-		 * @param len Length of plaintext chunk
-		 */
-		ZT_INLINE void update1(const void* const input, const unsigned int len) noexcept
-		{
-			_gmac.update(input, len);
-		}
-
-		/**
-		 * Finish first pass, compute CTR IV, initialize second pass.
-		 */
-		ZT_INLINE void finish1() noexcept
-		{
-			// Compute 128-bit GMAC tag.
-			uint64_t tmp[2];
-			_gmac.finish(reinterpret_cast<uint8_t*>(tmp));
-
-			// Shorten to 64 bits, concatenate with message IV, and encrypt with AES to
-			// yield the CTR IV and opaque IV/MAC blob. In ZeroTier's use of GMAC-SIV
-			// this get split into the packet ID (64 bits) and the MAC (64 bits) in each
-			// packet and then recombined on receipt for legacy reasons (but with no
-			// cryptographic or performance impact).
-			_tag[1] = tmp[0] ^ tmp[1];
-			_ctr._aes.encrypt(_tag, _tag);
-
-			// Initialize CTR with 96-bit CTR nonce and 32-bit counter. The counter
-			// incorporates 31 more bits of entropy which should raise our security margin
-			// a bit, but this is not included in the worst case analysis of GMAC-SIV.
-			// The most significant bit of the counter is masked to zero to allow up to
-			// 2^31 bytes to be encrypted before the counter loops. Some CTR implementations
-			// increment the whole big-endian 128-bit integer in which case this could be
-			// used for more than 2^31 bytes, but ours does not for performance reasons
-			// and so 2^31 should be considered the input limit.
-			tmp[0] = _tag[0];
-			tmp[1] = _tag[1] & ZT_CONST_TO_BE_UINT64(0xffffffff7fffffffULL);
-			_ctr.init(reinterpret_cast<const uint8_t*>(tmp), _output);
-		}
-
-		/**
-		 * Second pass plaintext input function
-		 *
-		 * The same plaintext must be fed in the second time in the same order,
-		 * though chunk boundaries do not have to be the same.
-		 *
-		 * @param input Plaintext chunk
-		 * @param len Length of plaintext chunk
-		 */
-		ZT_INLINE void update2(const void* const input, const unsigned int len) noexcept
-		{
-			_ctr.crypt(input, len);
-		}
-
-		/**
-		 * Finish second pass and return a pointer to the opaque 128-bit IV+MAC block
-		 *
-		 * The returned pointer remains valid as long as this object exists and init()
-		 * is not called again.
-		 *
-		 * @return Pointer to 128-bit opaque IV+MAC (packed into two 64-bit integers)
-		 */
-		ZT_INLINE const uint64_t* finish2()
-		{
-			_ctr.finish();
-			return _tag;
-		}
-
-	  private:
-		void* _output;
-		uint64_t _tag[2];
-		AES::GMAC _gmac;
-		AES::CTR _ctr;
-	};
-
-	/**
-	 * Decryptor for AES-GMAC-SIV.
-	 *
-	 * GMAC-SIV decryption is single-pass. AAD (if any) must be processed first.
-	 */
-	class GMACSIVDecryptor {
-	  public:
-		ZT_INLINE GMACSIVDecryptor(const AES& k0, const AES& k1) noexcept
-			: _ctr(k1)
-			, _gmac(k0)
-		{
-		}
-
-		/**
-		 * Initialize decryptor for a new message
-		 *
-		 * @param tag 128-bit combined IV/MAC originally created by GMAC-SIV encryption
-		 * @param output Buffer in which to write output plaintext (must be large enough!)
-		 */
-		ZT_INLINE void init(const uint64_t tag[2], void* const output) noexcept
-		{
-			uint64_t tmp[2];
-			tmp[0] = tag[0];
-			tmp[1] = tag[1] & ZT_CONST_TO_BE_UINT64(0xffffffff7fffffffULL);
-			_ctr.init(reinterpret_cast<const uint8_t*>(tmp), output);
-
-			_ctr._aes.decrypt(tag, _ivMac);
-
-			tmp[0] = _ivMac[0];
-			tmp[1] = 0;
-			_gmac.init(reinterpret_cast<const uint8_t*>(tmp));
-
-			_output = output;
-			_decryptedLen = 0;
-		}
-
-		/**
-		 * Process AAD (additional authenticated data) that wasn't encrypted
-		 *
-		 * @param aad Additional authenticated data
-		 * @param len Length of AAD in bytes
-		 */
-		ZT_INLINE void aad(const void* const aad, unsigned int len) noexcept
-		{
-			_gmac.update(aad, len);
-			len &= 0xfU;
-			if (len != 0) {
-				_gmac.update(Utils::ZERO256, 16 - len);
-			}
-		}
-
-		/**
-		 * Feed ciphertext into the decryptor
-		 *
-		 * Unlike encryption, GMAC-SIV decryption requires only one pass.
-		 *
-		 * @param input Input ciphertext
-		 * @param len Length of ciphertext
-		 */
-		ZT_INLINE void update(const void* const input, const unsigned int len) noexcept
-		{
-			_ctr.crypt(input, len);
-			_decryptedLen += len;
-		}
-
-		/**
-		 * Flush decryption, compute MAC, and verify
-		 *
-		 * @return True if resulting plaintext (and AAD) pass message authentication check
-		 */
-		ZT_INLINE bool finish() noexcept
-		{
-			_ctr.finish();
-
-			uint64_t gmacTag[2];
-			_gmac.update(_output, _decryptedLen);
-			_gmac.finish(reinterpret_cast<uint8_t*>(gmacTag));
-			return (gmacTag[0] ^ gmacTag[1]) == _ivMac[1];
-		}
-
-	  private:
-		uint64_t _ivMac[2];
-		AES::CTR _ctr;
-		AES::GMAC _gmac;
-		void* _output;
-		unsigned int _decryptedLen;
-	};
-
-  private:
-	static const uint32_t Te0[256];
-	static const uint32_t Te4[256];
-	static const uint32_t Td0[256];
-	static const uint8_t Td4[256];
-	static const uint32_t rcon[15];
-
-	void p_initSW(const uint8_t* key) noexcept;
-	void p_encryptSW(const uint8_t* in, uint8_t* out) const noexcept;
-	void p_decryptSW(const uint8_t* in, uint8_t* out) const noexcept;
-
-	union {
-#ifdef ZT_AES_AESNI
-		struct {
-			__m128i k[28];
-			__m128i h[4];	 // h, hh, hhh, hhhh
-			__m128i h2[4];	 // _mm_xor_si128(_mm_shuffle_epi32(h, 78), h), etc.
-		} ni;
-#endif
-
-#ifdef ZT_AES_NEON
-		struct {
-			uint64_t hsw[2];   // in case it has AES but not PMULL, not sure if that ever happens
-			uint8x16_t ek[15];
-			uint8x16_t dk[15];
-			uint8x16_t h;
-		} neon;
-#endif
-
-		struct {
-			uint64_t h[2];
-			uint32_t ek[60];
-			uint32_t dk[60];
-		} sw;
-	} p_k;
-
-#ifdef ZT_AES_AESNI
-	void p_init_aesni(const uint8_t* key) noexcept;
-	void p_encrypt_aesni(const void* in, void* out) const noexcept;
-	void p_decrypt_aesni(const void* in, void* out) const noexcept;
-#endif
-
-#ifdef ZT_AES_NEON
-	void p_init_armneon_crypto(const uint8_t* key) noexcept;
-	void p_encrypt_armneon_crypto(const void* in, void* out) const noexcept;
-	void p_decrypt_armneon_crypto(const void* in, void* out) const noexcept;
-#endif
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/AES_aesni.cpp b/node/AES_aesni.cpp
deleted file mode 100644
index e4509425a..000000000
--- a/node/AES_aesni.cpp
+++ /dev/null
@@ -1,675 +0,0 @@
-/*
- * Copyright (c)2013-2020 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "AES.hpp"
-#include "Constants.hpp"
-
-#ifdef ZT_AES_AESNI
-
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-
-namespace ZeroTier {
-
-namespace {
-
-const __m128i s_sseSwapBytes = _mm_set_epi8(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,pclmul")))
-#endif
-__m128i
-p_gmacPCLMUL128(const __m128i h, __m128i y) noexcept
-{
-	y = _mm_shuffle_epi8(y, s_sseSwapBytes);
-	__m128i t1 = _mm_clmulepi64_si128(h, y, 0x00);
-	__m128i t2 = _mm_clmulepi64_si128(h, y, 0x01);
-	__m128i t3 = _mm_clmulepi64_si128(h, y, 0x10);
-	__m128i t4 = _mm_clmulepi64_si128(h, y, 0x11);
-	t2 = _mm_xor_si128(t2, t3);
-	t3 = _mm_slli_si128(t2, 8);
-	t2 = _mm_srli_si128(t2, 8);
-	t1 = _mm_xor_si128(t1, t3);
-	t4 = _mm_xor_si128(t4, t2);
-	__m128i t5 = _mm_srli_epi32(t1, 31);
-	t1 = _mm_or_si128(_mm_slli_epi32(t1, 1), _mm_slli_si128(t5, 4));
-	t4 = _mm_or_si128(_mm_or_si128(_mm_slli_epi32(t4, 1), _mm_slli_si128(_mm_srli_epi32(t4, 31), 4)), _mm_srli_si128(t5, 12));
-	t5 = _mm_xor_si128(_mm_xor_si128(_mm_slli_epi32(t1, 31), _mm_slli_epi32(t1, 30)), _mm_slli_epi32(t1, 25));
-	t1 = _mm_xor_si128(t1, _mm_slli_si128(t5, 12));
-	t4 = _mm_xor_si128(_mm_xor_si128(_mm_xor_si128(_mm_xor_si128(_mm_xor_si128(t4, _mm_srli_si128(t5, 4)), t1), _mm_srli_epi32(t1, 2)), _mm_srli_epi32(t1, 7)), _mm_srli_epi32(t1, 1));
-	return _mm_shuffle_epi8(t4, s_sseSwapBytes);
-}
-
-/* Disable VAES stuff on compilers too old to compile these intrinsics,
- * and MinGW64 also seems not to support them so disable on Windows.
- * The performance gain can be significant but regular SSE is already so
- * fast it's highly unlikely to be a rate limiting factor except on massive
- * servers and network infrastructure stuff. */
-#if ! defined(__WINDOWS__) && ((__GNUC__ >= 8) || (__clang_major__ >= 7))
-
-#define ZT_AES_VAES512 1
-
-#ifdef __GNUC__
-__attribute__((__target__("sse4,aes,avx,avx2,vaes,avx512f,avx512bw")))
-#endif
-void p_aesCtrInnerVAES512(unsigned int &len, const uint64_t c0, uint64_t &c1, const uint8_t *&in, uint8_t *&out, const __m128i *const k) noexcept
-{
-	const __m512i kk0 = _mm512_broadcast_i32x4(k[0]);
-	const __m512i kk1 = _mm512_broadcast_i32x4(k[1]);
-	const __m512i kk2 = _mm512_broadcast_i32x4(k[2]);
-	const __m512i kk3 = _mm512_broadcast_i32x4(k[3]);
-	const __m512i kk4 = _mm512_broadcast_i32x4(k[4]);
-	const __m512i kk5 = _mm512_broadcast_i32x4(k[5]);
-	const __m512i kk6 = _mm512_broadcast_i32x4(k[6]);
-	const __m512i kk7 = _mm512_broadcast_i32x4(k[7]);
-	const __m512i kk8 = _mm512_broadcast_i32x4(k[8]);
-	const __m512i kk9 = _mm512_broadcast_i32x4(k[9]);
-	const __m512i kk10 = _mm512_broadcast_i32x4(k[10]);
-	const __m512i kk11 = _mm512_broadcast_i32x4(k[11]);
-	const __m512i kk12 = _mm512_broadcast_i32x4(k[12]);
-	const __m512i kk13 = _mm512_broadcast_i32x4(k[13]);
-	const __m512i kk14 = _mm512_broadcast_i32x4(k[14]);
-	do {
-		__m512i p0 = _mm512_loadu_si512(reinterpret_cast<const __m512i*>(in));
-		__m512i d0 = _mm512_set_epi64((long long)Utils::hton(c1 + 3ULL), (long long)c0, (long long)Utils::hton(c1 + 2ULL), (long long)c0, (long long)Utils::hton(c1 + 1ULL), (long long)c0, (long long)Utils::hton(c1), (long long)c0);
-		c1 += 4;
-		in += 64;
-		len -= 64;
-		d0 = _mm512_xor_si512(d0, kk0);
-		d0 = _mm512_aesenc_epi128(d0, kk1);
-		d0 = _mm512_aesenc_epi128(d0, kk2);
-		d0 = _mm512_aesenc_epi128(d0, kk3);
-		d0 = _mm512_aesenc_epi128(d0, kk4);
-		d0 = _mm512_aesenc_epi128(d0, kk5);
-		d0 = _mm512_aesenc_epi128(d0, kk6);
-		d0 = _mm512_aesenc_epi128(d0, kk7);
-		d0 = _mm512_aesenc_epi128(d0, kk8);
-		d0 = _mm512_aesenc_epi128(d0, kk9);
-		d0 = _mm512_aesenc_epi128(d0, kk10);
-		d0 = _mm512_aesenc_epi128(d0, kk11);
-		d0 = _mm512_aesenc_epi128(d0, kk12);
-		d0 = _mm512_aesenc_epi128(d0, kk13);
-		d0 = _mm512_aesenclast_epi128(d0, kk14);
-		_mm512_storeu_si512(reinterpret_cast<__m512i*>(out), _mm512_xor_si512(p0, d0));
-		out += 64;
-	} while (likely(len >= 64));
-}
-
-#define ZT_AES_VAES256 1
-
-#ifdef __GNUC__
-__attribute__((__target__("sse4,aes,avx,avx2,vaes")))
-#endif
-void p_aesCtrInnerVAES256(unsigned int &len, const uint64_t c0, uint64_t &c1, const uint8_t *&in, uint8_t *&out, const __m128i *const k) noexcept
-{
-	const __m256i kk0 = _mm256_broadcastsi128_si256(k[0]);
-	const __m256i kk1 = _mm256_broadcastsi128_si256(k[1]);
-	const __m256i kk2 = _mm256_broadcastsi128_si256(k[2]);
-	const __m256i kk3 = _mm256_broadcastsi128_si256(k[3]);
-	const __m256i kk4 = _mm256_broadcastsi128_si256(k[4]);
-	const __m256i kk5 = _mm256_broadcastsi128_si256(k[5]);
-	const __m256i kk6 = _mm256_broadcastsi128_si256(k[6]);
-	const __m256i kk7 = _mm256_broadcastsi128_si256(k[7]);
-	const __m256i kk8 = _mm256_broadcastsi128_si256(k[8]);
-	const __m256i kk9 = _mm256_broadcastsi128_si256(k[9]);
-	const __m256i kk10 = _mm256_broadcastsi128_si256(k[10]);
-	const __m256i kk11 = _mm256_broadcastsi128_si256(k[11]);
-	const __m256i kk12 = _mm256_broadcastsi128_si256(k[12]);
-	const __m256i kk13 = _mm256_broadcastsi128_si256(k[13]);
-	const __m256i kk14 = _mm256_broadcastsi128_si256(k[14]);
-	do {
-		__m256i p0 = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(in));
-		__m256i p1 = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(in + 32));
-		__m256i d0 = _mm256_set_epi64x((long long)Utils::hton(c1 + 1ULL), (long long)c0, (long long)Utils::hton(c1), (long long)c0);
-		__m256i d1 = _mm256_set_epi64x((long long)Utils::hton(c1 + 3ULL), (long long)c0, (long long)Utils::hton(c1 + 2ULL), (long long)c0);
-		c1 += 4;
-		in += 64;
-		len -= 64;
-		d0 = _mm256_xor_si256(d0, kk0);
-		d1 = _mm256_xor_si256(d1, kk0);
-		d0 = _mm256_aesenc_epi128(d0, kk1);
-		d1 = _mm256_aesenc_epi128(d1, kk1);
-		d0 = _mm256_aesenc_epi128(d0, kk2);
-		d1 = _mm256_aesenc_epi128(d1, kk2);
-		d0 = _mm256_aesenc_epi128(d0, kk3);
-		d1 = _mm256_aesenc_epi128(d1, kk3);
-		d0 = _mm256_aesenc_epi128(d0, kk4);
-		d1 = _mm256_aesenc_epi128(d1, kk4);
-		d0 = _mm256_aesenc_epi128(d0, kk5);
-		d1 = _mm256_aesenc_epi128(d1, kk5);
-		d0 = _mm256_aesenc_epi128(d0, kk6);
-		d1 = _mm256_aesenc_epi128(d1, kk6);
-		d0 = _mm256_aesenc_epi128(d0, kk7);
-		d1 = _mm256_aesenc_epi128(d1, kk7);
-		d0 = _mm256_aesenc_epi128(d0, kk8);
-		d1 = _mm256_aesenc_epi128(d1, kk8);
-		d0 = _mm256_aesenc_epi128(d0, kk9);
-		d1 = _mm256_aesenc_epi128(d1, kk9);
-		d0 = _mm256_aesenc_epi128(d0, kk10);
-		d1 = _mm256_aesenc_epi128(d1, kk10);
-		d0 = _mm256_aesenc_epi128(d0, kk11);
-		d1 = _mm256_aesenc_epi128(d1, kk11);
-		d0 = _mm256_aesenc_epi128(d0, kk12);
-		d1 = _mm256_aesenc_epi128(d1, kk12);
-		d0 = _mm256_aesenc_epi128(d0, kk13);
-		d1 = _mm256_aesenc_epi128(d1, kk13);
-		d0 = _mm256_aesenclast_epi128(d0, kk14);
-		d1 = _mm256_aesenclast_epi128(d1, kk14);
-		_mm256_storeu_si256(reinterpret_cast<__m256i*>(out), _mm256_xor_si256(d0, p0));
-		_mm256_storeu_si256(reinterpret_cast<__m256i*>(out + 32), _mm256_xor_si256(d1, p1));
-		out += 64;
-	} while (likely(len >= 64));
-}
-
-#endif	 // does compiler support AVX2 and AVX512 AES intrinsics?
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,aes,pclmul")))
-#endif
-__m128i
-p_init256_1_aesni(__m128i a, __m128i b) noexcept
-{
-	__m128i x, y;
-	b = _mm_shuffle_epi32(b, 0xff);
-	y = _mm_slli_si128(a, 0x04);
-	x = _mm_xor_si128(a, y);
-	y = _mm_slli_si128(y, 0x04);
-	x = _mm_xor_si128(x, y);
-	y = _mm_slli_si128(y, 0x04);
-	x = _mm_xor_si128(x, y);
-	x = _mm_xor_si128(x, b);
-	return x;
-}
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,aes,pclmul")))
-#endif
-__m128i
-p_init256_2_aesni(__m128i a, __m128i b) noexcept
-{
-	__m128i x, y, z;
-	y = _mm_aeskeygenassist_si128(a, 0x00);
-	z = _mm_shuffle_epi32(y, 0xaa);
-	y = _mm_slli_si128(b, 0x04);
-	x = _mm_xor_si128(b, y);
-	y = _mm_slli_si128(y, 0x04);
-	x = _mm_xor_si128(x, y);
-	y = _mm_slli_si128(y, 0x04);
-	x = _mm_xor_si128(x, y);
-	x = _mm_xor_si128(x, z);
-	return x;
-}
-
-}	// anonymous namespace
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,pclmul")))
-#endif
-void AES::GMAC::p_aesNIUpdate(const uint8_t *in, unsigned int len) noexcept
-{
-	__m128i y = _mm_loadu_si128(reinterpret_cast<const __m128i*>(_y));
-
-	// Handle anything left over from a previous run that wasn't a multiple of 16 bytes.
-	if (_rp) {
-		for (;;) {
-			if (! len) {
-				return;
-			}
-			--len;
-			_r[_rp++] = *(in++);
-			if (_rp == 16) {
-				y = p_gmacPCLMUL128(_aes.p_k.ni.h[0], _mm_xor_si128(y, _mm_loadu_si128(reinterpret_cast<__m128i*>(_r))));
-				break;
-			}
-		}
-	}
-
-	if (likely(len >= 64)) {
-		const __m128i sb = s_sseSwapBytes;
-		const __m128i h = _aes.p_k.ni.h[0];
-		const __m128i hh = _aes.p_k.ni.h[1];
-		const __m128i hhh = _aes.p_k.ni.h[2];
-		const __m128i hhhh = _aes.p_k.ni.h[3];
-		const __m128i h2 = _aes.p_k.ni.h2[0];
-		const __m128i hh2 = _aes.p_k.ni.h2[1];
-		const __m128i hhh2 = _aes.p_k.ni.h2[2];
-		const __m128i hhhh2 = _aes.p_k.ni.h2[3];
-		const uint8_t* const end64 = in + (len & ~((unsigned int)63));
-		len &= 63U;
-		do {
-			__m128i d1 = _mm_shuffle_epi8(_mm_xor_si128(y, _mm_loadu_si128(reinterpret_cast<const __m128i*>(in))), sb);
-			__m128i d2 = _mm_shuffle_epi8(_mm_loadu_si128(reinterpret_cast<const __m128i*>(in + 16)), sb);
-			__m128i d3 = _mm_shuffle_epi8(_mm_loadu_si128(reinterpret_cast<const __m128i*>(in + 32)), sb);
-			__m128i d4 = _mm_shuffle_epi8(_mm_loadu_si128(reinterpret_cast<const __m128i*>(in + 48)), sb);
-			in += 64;
-			__m128i a = _mm_xor_si128(_mm_xor_si128(_mm_clmulepi64_si128(hhhh, d1, 0x00), _mm_clmulepi64_si128(hhh, d2, 0x00)), _mm_xor_si128(_mm_clmulepi64_si128(hh, d3, 0x00), _mm_clmulepi64_si128(h, d4, 0x00)));
-			__m128i b = _mm_xor_si128(_mm_xor_si128(_mm_clmulepi64_si128(hhhh, d1, 0x11), _mm_clmulepi64_si128(hhh, d2, 0x11)), _mm_xor_si128(_mm_clmulepi64_si128(hh, d3, 0x11), _mm_clmulepi64_si128(h, d4, 0x11)));
-			__m128i c = _mm_xor_si128(
-				_mm_xor_si128(
-					_mm_xor_si128(_mm_clmulepi64_si128(hhhh2, _mm_xor_si128(_mm_shuffle_epi32(d1, 78), d1), 0x00), _mm_clmulepi64_si128(hhh2, _mm_xor_si128(_mm_shuffle_epi32(d2, 78), d2), 0x00)),
-					_mm_xor_si128(_mm_clmulepi64_si128(hh2, _mm_xor_si128(_mm_shuffle_epi32(d3, 78), d3), 0x00), _mm_clmulepi64_si128(h2, _mm_xor_si128(_mm_shuffle_epi32(d4, 78), d4), 0x00))),
-				_mm_xor_si128(a, b));
-			a = _mm_xor_si128(_mm_slli_si128(c, 8), a);
-			b = _mm_xor_si128(_mm_srli_si128(c, 8), b);
-			c = _mm_srli_epi32(a, 31);
-			a = _mm_or_si128(_mm_slli_epi32(a, 1), _mm_slli_si128(c, 4));
-			b = _mm_or_si128(_mm_or_si128(_mm_slli_epi32(b, 1), _mm_slli_si128(_mm_srli_epi32(b, 31), 4)), _mm_srli_si128(c, 12));
-			c = _mm_xor_si128(_mm_slli_epi32(a, 31), _mm_xor_si128(_mm_slli_epi32(a, 30), _mm_slli_epi32(a, 25)));
-			a = _mm_xor_si128(a, _mm_slli_si128(c, 12));
-			b = _mm_xor_si128(b, _mm_xor_si128(a, _mm_xor_si128(_mm_xor_si128(_mm_srli_epi32(a, 1), _mm_srli_si128(c, 4)), _mm_xor_si128(_mm_srli_epi32(a, 2), _mm_srli_epi32(a, 7)))));
-			y = _mm_shuffle_epi8(b, sb);
-		} while (likely(in != end64));
-	}
-
-	while (len >= 16) {
-		y = p_gmacPCLMUL128(_aes.p_k.ni.h[0], _mm_xor_si128(y, _mm_loadu_si128(reinterpret_cast<const __m128i*>(in))));
-		in += 16;
-		len -= 16;
-	}
-
-	_mm_storeu_si128(reinterpret_cast<__m128i*>(_y), y);
-
-	// Any overflow is cached for a later run or finish().
-	for (unsigned int i = 0; i < len; ++i) {
-		_r[i] = in[i];
-	}
-	_rp = len;	 // len is always less than 16 here
-}
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,pclmul,aes")))
-#endif
-void AES::GMAC::p_aesNIFinish(uint8_t tag[16]) noexcept
-{
-	__m128i y = _mm_loadu_si128(reinterpret_cast<const __m128i*>(_y));
-
-	// Handle any remaining bytes, padding the last block with zeroes.
-	if (_rp) {
-		while (_rp < 16) {
-			_r[_rp++] = 0;
-		}
-		y = p_gmacPCLMUL128(_aes.p_k.ni.h[0], _mm_xor_si128(y, _mm_loadu_si128(reinterpret_cast<__m128i*>(_r))));
-	}
-
-	// Interleave encryption of IV with the final GHASH of y XOR (length * 8).
-	// Then XOR these together to get the final tag.
-	const __m128i* const k = _aes.p_k.ni.k;
-	const __m128i h = _aes.p_k.ni.h[0];
-	y = _mm_xor_si128(y, _mm_set_epi64x(0LL, (long long)Utils::hton((uint64_t)_len << 3U)));
-	y = _mm_shuffle_epi8(y, s_sseSwapBytes);
-	__m128i encIV = _mm_xor_si128(_mm_loadu_si128(reinterpret_cast<const __m128i*>(_iv)), k[0]);
-	__m128i t1 = _mm_clmulepi64_si128(h, y, 0x00);
-	__m128i t2 = _mm_clmulepi64_si128(h, y, 0x01);
-	__m128i t3 = _mm_clmulepi64_si128(h, y, 0x10);
-	__m128i t4 = _mm_clmulepi64_si128(h, y, 0x11);
-	encIV = _mm_aesenc_si128(encIV, k[1]);
-	t2 = _mm_xor_si128(t2, t3);
-	t3 = _mm_slli_si128(t2, 8);
-	encIV = _mm_aesenc_si128(encIV, k[2]);
-	t2 = _mm_srli_si128(t2, 8);
-	t1 = _mm_xor_si128(t1, t3);
-	encIV = _mm_aesenc_si128(encIV, k[3]);
-	t4 = _mm_xor_si128(t4, t2);
-	__m128i t5 = _mm_srli_epi32(t1, 31);
-	t1 = _mm_slli_epi32(t1, 1);
-	__m128i t6 = _mm_srli_epi32(t4, 31);
-	encIV = _mm_aesenc_si128(encIV, k[4]);
-	t4 = _mm_slli_epi32(t4, 1);
-	t3 = _mm_srli_si128(t5, 12);
-	encIV = _mm_aesenc_si128(encIV, k[5]);
-	t6 = _mm_slli_si128(t6, 4);
-	t5 = _mm_slli_si128(t5, 4);
-	encIV = _mm_aesenc_si128(encIV, k[6]);
-	t1 = _mm_or_si128(t1, t5);
-	t4 = _mm_or_si128(t4, t6);
-	encIV = _mm_aesenc_si128(encIV, k[7]);
-	t4 = _mm_or_si128(t4, t3);
-	t5 = _mm_slli_epi32(t1, 31);
-	encIV = _mm_aesenc_si128(encIV, k[8]);
-	t6 = _mm_slli_epi32(t1, 30);
-	t3 = _mm_slli_epi32(t1, 25);
-	encIV = _mm_aesenc_si128(encIV, k[9]);
-	t5 = _mm_xor_si128(t5, t6);
-	t5 = _mm_xor_si128(t5, t3);
-	encIV = _mm_aesenc_si128(encIV, k[10]);
-	t6 = _mm_srli_si128(t5, 4);
-	t4 = _mm_xor_si128(t4, t6);
-	encIV = _mm_aesenc_si128(encIV, k[11]);
-	t5 = _mm_slli_si128(t5, 12);
-	t1 = _mm_xor_si128(t1, t5);
-	t4 = _mm_xor_si128(t4, t1);
-	t5 = _mm_srli_epi32(t1, 1);
-	encIV = _mm_aesenc_si128(encIV, k[12]);
-	t2 = _mm_srli_epi32(t1, 2);
-	t3 = _mm_srli_epi32(t1, 7);
-	encIV = _mm_aesenc_si128(encIV, k[13]);
-	t4 = _mm_xor_si128(t4, t2);
-	t4 = _mm_xor_si128(t4, t3);
-	encIV = _mm_aesenclast_si128(encIV, k[14]);
-	t4 = _mm_xor_si128(t4, t5);
-	_mm_storeu_si128(reinterpret_cast<__m128i*>(tag), _mm_xor_si128(_mm_shuffle_epi8(t4, s_sseSwapBytes), encIV));
-}
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,aes")))
-#endif
-void AES::CTR::p_aesNICrypt(const uint8_t *in, uint8_t *out, unsigned int len) noexcept
-{
-	const __m128i dd = _mm_set_epi64x(0, (long long)_ctr[0]);
-	uint64_t c1 = Utils::ntoh(_ctr[1]);
-
-	const __m128i* const k = _aes.p_k.ni.k;
-	const __m128i k0 = k[0];
-	const __m128i k1 = k[1];
-	const __m128i k2 = k[2];
-	const __m128i k3 = k[3];
-	const __m128i k4 = k[4];
-	const __m128i k5 = k[5];
-	const __m128i k6 = k[6];
-	const __m128i k7 = k[7];
-	const __m128i k8 = k[8];
-	const __m128i k9 = k[9];
-	const __m128i k10 = k[10];
-	const __m128i k11 = k[11];
-	const __m128i k12 = k[12];
-	const __m128i k13 = k[13];
-	const __m128i k14 = k[14];
-
-	// Complete any unfinished blocks from previous calls to crypt().
-	unsigned int totalLen = _len;
-	if ((totalLen & 15U)) {
-		for (;;) {
-			if (unlikely(! len)) {
-				_ctr[1] = Utils::hton(c1);
-				_len = totalLen;
-				return;
-			}
-			--len;
-			out[totalLen++] = *(in++);
-			if (! (totalLen & 15U)) {
-				__m128i d0 = _mm_insert_epi64(dd, (long long)Utils::hton(c1++), 1);
-				d0 = _mm_xor_si128(d0, k0);
-				d0 = _mm_aesenc_si128(d0, k1);
-				d0 = _mm_aesenc_si128(d0, k2);
-				d0 = _mm_aesenc_si128(d0, k3);
-				d0 = _mm_aesenc_si128(d0, k4);
-				d0 = _mm_aesenc_si128(d0, k5);
-				d0 = _mm_aesenc_si128(d0, k6);
-				d0 = _mm_aesenc_si128(d0, k7);
-				d0 = _mm_aesenc_si128(d0, k8);
-				d0 = _mm_aesenc_si128(d0, k9);
-				d0 = _mm_aesenc_si128(d0, k10);
-				__m128i* const outblk = reinterpret_cast<__m128i*>(out + (totalLen - 16));
-				d0 = _mm_aesenc_si128(d0, k11);
-				const __m128i p0 = _mm_loadu_si128(outblk);
-				d0 = _mm_aesenc_si128(d0, k12);
-				d0 = _mm_aesenc_si128(d0, k13);
-				d0 = _mm_aesenclast_si128(d0, k14);
-				_mm_storeu_si128(outblk, _mm_xor_si128(p0, d0));
-				break;
-			}
-		}
-	}
-
-	out += totalLen;
-	_len = totalLen + len;
-
-	if (likely(len >= 64)) {
-#if defined(ZT_AES_VAES512) && defined(ZT_AES_VAES256)
-		if (Utils::CPUID.vaes && (len >= 256)) {
-			if (Utils::CPUID.avx512f) {
-				p_aesCtrInnerVAES512(len, _ctr[0], c1, in, out, k);
-			}
-			else {
-				p_aesCtrInnerVAES256(len, _ctr[0], c1, in, out, k);
-			}
-			goto skip_conventional_aesni_64;
-		}
-#endif
-
-#if ! defined(ZT_AES_VAES512) && defined(ZT_AES_VAES256)
-		if (Utils::CPUID.vaes && (len >= 256)) {
-			p_aesCtrInnerVAES256(len, _ctr[0], c1, in, out, k);
-			goto skip_conventional_aesni_64;
-		}
-#endif
-
-		const uint8_t* const eof64 = in + (len & ~((unsigned int)63));
-		len &= 63;
-		__m128i d0, d1, d2, d3;
-		do {
-			const uint64_t c10 = Utils::hton(c1);
-			const uint64_t c11 = Utils::hton(c1 + 1ULL);
-			const uint64_t c12 = Utils::hton(c1 + 2ULL);
-			const uint64_t c13 = Utils::hton(c1 + 3ULL);
-			d0 = _mm_insert_epi64(dd, (long long)c10, 1);
-			d1 = _mm_insert_epi64(dd, (long long)c11, 1);
-			d2 = _mm_insert_epi64(dd, (long long)c12, 1);
-			d3 = _mm_insert_epi64(dd, (long long)c13, 1);
-			c1 += 4;
-			d0 = _mm_xor_si128(d0, k0);
-			d1 = _mm_xor_si128(d1, k0);
-			d2 = _mm_xor_si128(d2, k0);
-			d3 = _mm_xor_si128(d3, k0);
-			d0 = _mm_aesenc_si128(d0, k1);
-			d1 = _mm_aesenc_si128(d1, k1);
-			d2 = _mm_aesenc_si128(d2, k1);
-			d3 = _mm_aesenc_si128(d3, k1);
-			d0 = _mm_aesenc_si128(d0, k2);
-			d1 = _mm_aesenc_si128(d1, k2);
-			d2 = _mm_aesenc_si128(d2, k2);
-			d3 = _mm_aesenc_si128(d3, k2);
-			d0 = _mm_aesenc_si128(d0, k3);
-			d1 = _mm_aesenc_si128(d1, k3);
-			d2 = _mm_aesenc_si128(d2, k3);
-			d3 = _mm_aesenc_si128(d3, k3);
-			d0 = _mm_aesenc_si128(d0, k4);
-			d1 = _mm_aesenc_si128(d1, k4);
-			d2 = _mm_aesenc_si128(d2, k4);
-			d3 = _mm_aesenc_si128(d3, k4);
-			d0 = _mm_aesenc_si128(d0, k5);
-			d1 = _mm_aesenc_si128(d1, k5);
-			d2 = _mm_aesenc_si128(d2, k5);
-			d3 = _mm_aesenc_si128(d3, k5);
-			d0 = _mm_aesenc_si128(d0, k6);
-			d1 = _mm_aesenc_si128(d1, k6);
-			d2 = _mm_aesenc_si128(d2, k6);
-			d3 = _mm_aesenc_si128(d3, k6);
-			d0 = _mm_aesenc_si128(d0, k7);
-			d1 = _mm_aesenc_si128(d1, k7);
-			d2 = _mm_aesenc_si128(d2, k7);
-			d3 = _mm_aesenc_si128(d3, k7);
-			d0 = _mm_aesenc_si128(d0, k8);
-			d1 = _mm_aesenc_si128(d1, k8);
-			d2 = _mm_aesenc_si128(d2, k8);
-			d3 = _mm_aesenc_si128(d3, k8);
-			d0 = _mm_aesenc_si128(d0, k9);
-			d1 = _mm_aesenc_si128(d1, k9);
-			d2 = _mm_aesenc_si128(d2, k9);
-			d3 = _mm_aesenc_si128(d3, k9);
-			d0 = _mm_aesenc_si128(d0, k10);
-			d1 = _mm_aesenc_si128(d1, k10);
-			d2 = _mm_aesenc_si128(d2, k10);
-			d3 = _mm_aesenc_si128(d3, k10);
-			d0 = _mm_aesenc_si128(d0, k11);
-			d1 = _mm_aesenc_si128(d1, k11);
-			d2 = _mm_aesenc_si128(d2, k11);
-			d3 = _mm_aesenc_si128(d3, k11);
-			d0 = _mm_aesenc_si128(d0, k12);
-			d1 = _mm_aesenc_si128(d1, k12);
-			d2 = _mm_aesenc_si128(d2, k12);
-			d3 = _mm_aesenc_si128(d3, k12);
-			d0 = _mm_aesenc_si128(d0, k13);
-			d1 = _mm_aesenc_si128(d1, k13);
-			d2 = _mm_aesenc_si128(d2, k13);
-			d3 = _mm_aesenc_si128(d3, k13);
-			d0 = _mm_xor_si128(_mm_aesenclast_si128(d0, k14), _mm_loadu_si128(reinterpret_cast<const __m128i*>(in)));
-			d1 = _mm_xor_si128(_mm_aesenclast_si128(d1, k14), _mm_loadu_si128(reinterpret_cast<const __m128i*>(in + 16)));
-			d2 = _mm_xor_si128(_mm_aesenclast_si128(d2, k14), _mm_loadu_si128(reinterpret_cast<const __m128i*>(in + 32)));
-			d3 = _mm_xor_si128(_mm_aesenclast_si128(d3, k14), _mm_loadu_si128(reinterpret_cast<const __m128i*>(in + 48)));
-			in += 64;
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(out), d0);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(out + 16), d1);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(out + 32), d2);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(out + 48), d3);
-			out += 64;
-		} while (likely(in != eof64));
-	}
-
-skip_conventional_aesni_64:
-	while (len >= 16) {
-		__m128i d0 = _mm_insert_epi64(dd, (long long)Utils::hton(c1++), 1);
-		d0 = _mm_xor_si128(d0, k0);
-		d0 = _mm_aesenc_si128(d0, k1);
-		d0 = _mm_aesenc_si128(d0, k2);
-		d0 = _mm_aesenc_si128(d0, k3);
-		d0 = _mm_aesenc_si128(d0, k4);
-		d0 = _mm_aesenc_si128(d0, k5);
-		d0 = _mm_aesenc_si128(d0, k6);
-		d0 = _mm_aesenc_si128(d0, k7);
-		d0 = _mm_aesenc_si128(d0, k8);
-		d0 = _mm_aesenc_si128(d0, k9);
-		d0 = _mm_aesenc_si128(d0, k10);
-		d0 = _mm_aesenc_si128(d0, k11);
-		d0 = _mm_aesenc_si128(d0, k12);
-		d0 = _mm_aesenc_si128(d0, k13);
-		_mm_storeu_si128(reinterpret_cast<__m128i*>(out), _mm_xor_si128(_mm_aesenclast_si128(d0, k14), _mm_loadu_si128(reinterpret_cast<const __m128i*>(in))));
-		in += 16;
-		len -= 16;
-		out += 16;
-	}
-
-	// Any remaining input is placed in _out. This will be picked up and crypted
-	// on subsequent calls to crypt() or finish() as it'll mean _len will not be
-	// an even multiple of 16.
-	for (unsigned int i = 0; i < len; ++i) {
-		out[i] = in[i];
-	}
-
-	_ctr[1] = Utils::hton(c1);
-}
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,aes,pclmul")))
-#endif
-void AES::p_init_aesni(const uint8_t *key) noexcept
-{
-	__m128i t1, t2, k1, k2, k3, k4, k5, k6, k7, k8, k9, k10, k11, k12, k13;
-	p_k.ni.k[0] = t1 = _mm_loadu_si128((const __m128i*)key);
-	p_k.ni.k[1] = k1 = t2 = _mm_loadu_si128((const __m128i*)(key + 16));
-	p_k.ni.k[2] = k2 = t1 = p_init256_1_aesni(t1, _mm_aeskeygenassist_si128(t2, 0x01));
-	p_k.ni.k[3] = k3 = t2 = p_init256_2_aesni(t1, t2);
-	p_k.ni.k[4] = k4 = t1 = p_init256_1_aesni(t1, _mm_aeskeygenassist_si128(t2, 0x02));
-	p_k.ni.k[5] = k5 = t2 = p_init256_2_aesni(t1, t2);
-	p_k.ni.k[6] = k6 = t1 = p_init256_1_aesni(t1, _mm_aeskeygenassist_si128(t2, 0x04));
-	p_k.ni.k[7] = k7 = t2 = p_init256_2_aesni(t1, t2);
-	p_k.ni.k[8] = k8 = t1 = p_init256_1_aesni(t1, _mm_aeskeygenassist_si128(t2, 0x08));
-	p_k.ni.k[9] = k9 = t2 = p_init256_2_aesni(t1, t2);
-	p_k.ni.k[10] = k10 = t1 = p_init256_1_aesni(t1, _mm_aeskeygenassist_si128(t2, 0x10));
-	p_k.ni.k[11] = k11 = t2 = p_init256_2_aesni(t1, t2);
-	p_k.ni.k[12] = k12 = t1 = p_init256_1_aesni(t1, _mm_aeskeygenassist_si128(t2, 0x20));
-	p_k.ni.k[13] = k13 = t2 = p_init256_2_aesni(t1, t2);
-	p_k.ni.k[14] = p_init256_1_aesni(t1, _mm_aeskeygenassist_si128(t2, 0x40));
-	p_k.ni.k[15] = _mm_aesimc_si128(k13);
-	p_k.ni.k[16] = _mm_aesimc_si128(k12);
-	p_k.ni.k[17] = _mm_aesimc_si128(k11);
-	p_k.ni.k[18] = _mm_aesimc_si128(k10);
-	p_k.ni.k[19] = _mm_aesimc_si128(k9);
-	p_k.ni.k[20] = _mm_aesimc_si128(k8);
-	p_k.ni.k[21] = _mm_aesimc_si128(k7);
-	p_k.ni.k[22] = _mm_aesimc_si128(k6);
-	p_k.ni.k[23] = _mm_aesimc_si128(k5);
-	p_k.ni.k[24] = _mm_aesimc_si128(k4);
-	p_k.ni.k[25] = _mm_aesimc_si128(k3);
-	p_k.ni.k[26] = _mm_aesimc_si128(k2);
-	p_k.ni.k[27] = _mm_aesimc_si128(k1);
-
-	__m128i h = p_k.ni.k[0];   // _mm_xor_si128(_mm_setzero_si128(),_k.ni.k[0]);
-	h = _mm_aesenc_si128(h, k1);
-	h = _mm_aesenc_si128(h, k2);
-	h = _mm_aesenc_si128(h, k3);
-	h = _mm_aesenc_si128(h, k4);
-	h = _mm_aesenc_si128(h, k5);
-	h = _mm_aesenc_si128(h, k6);
-	h = _mm_aesenc_si128(h, k7);
-	h = _mm_aesenc_si128(h, k8);
-	h = _mm_aesenc_si128(h, k9);
-	h = _mm_aesenc_si128(h, k10);
-	h = _mm_aesenc_si128(h, k11);
-	h = _mm_aesenc_si128(h, k12);
-	h = _mm_aesenc_si128(h, k13);
-	h = _mm_aesenclast_si128(h, p_k.ni.k[14]);
-	__m128i hswap = _mm_shuffle_epi8(h, s_sseSwapBytes);
-	__m128i hh = p_gmacPCLMUL128(hswap, h);
-	__m128i hhh = p_gmacPCLMUL128(hswap, hh);
-	__m128i hhhh = p_gmacPCLMUL128(hswap, hhh);
-	p_k.ni.h[0] = hswap;
-	p_k.ni.h[1] = hh = _mm_shuffle_epi8(hh, s_sseSwapBytes);
-	p_k.ni.h[2] = hhh = _mm_shuffle_epi8(hhh, s_sseSwapBytes);
-	p_k.ni.h[3] = hhhh = _mm_shuffle_epi8(hhhh, s_sseSwapBytes);
-	p_k.ni.h2[0] = _mm_xor_si128(_mm_shuffle_epi32(hswap, 78), hswap);
-	p_k.ni.h2[1] = _mm_xor_si128(_mm_shuffle_epi32(hh, 78), hh);
-	p_k.ni.h2[2] = _mm_xor_si128(_mm_shuffle_epi32(hhh, 78), hhh);
-	p_k.ni.h2[3] = _mm_xor_si128(_mm_shuffle_epi32(hhhh, 78), hhhh);
-}
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,aes,pclmul")))
-#endif
-void AES::p_encrypt_aesni(const void *const in, void *const out) const noexcept
-{
-	__m128i tmp = _mm_loadu_si128((const __m128i*)in);
-	tmp = _mm_xor_si128(tmp, p_k.ni.k[0]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[1]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[2]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[3]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[4]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[5]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[6]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[7]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[8]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[9]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[10]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[11]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[12]);
-	tmp = _mm_aesenc_si128(tmp, p_k.ni.k[13]);
-	_mm_storeu_si128((__m128i*)out, _mm_aesenclast_si128(tmp, p_k.ni.k[14]));
-}
-
-#ifdef __GNUC__
-__attribute__((__target__("ssse3,sse4,sse4.1,sse4.2,aes,pclmul")))
-#endif
-void AES::p_decrypt_aesni(const void *in, void *out) const noexcept
-{
-	__m128i tmp = _mm_loadu_si128((const __m128i*)in);
-	tmp = _mm_xor_si128(tmp, p_k.ni.k[14]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[15]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[16]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[17]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[18]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[19]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[20]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[21]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[22]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[23]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[24]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[25]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[26]);
-	tmp = _mm_aesdec_si128(tmp, p_k.ni.k[27]);
-	_mm_storeu_si128((__m128i*)out, _mm_aesdeclast_si128(tmp, p_k.ni.k[0]));
-}
-
-}	// namespace ZeroTier
-
-#endif	 // ZT_AES_AESNI
diff --git a/node/AES_armcrypto.cpp b/node/AES_armcrypto.cpp
deleted file mode 100644
index a1be0b003..000000000
--- a/node/AES_armcrypto.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (c)2013-2020 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "AES.hpp"
-#include "Constants.hpp"
-
-#ifdef ZT_AES_NEON
-
-namespace ZeroTier {
-
-namespace {
-
-ZT_INLINE uint8x16_t s_clmul_armneon_crypto(uint8x16_t h, uint8x16_t y, const uint8_t b[16]) noexcept
-{
-	uint8x16_t r0, r1, t0, t1;
-	r0 = vld1q_u8(b);
-	const uint8x16_t z = veorq_u8(h, h);
-	y = veorq_u8(r0, y);
-	y = vrbitq_u8(y);
-	const uint8x16_t p = vreinterpretq_u8_u64(vdupq_n_u64(0x0000000000000087));
-	t0 = vextq_u8(y, y, 8);
-	__asm__ __volatile__("pmull     %0.1q, %1.1d, %2.1d \n\t" : "=w"(r0) : "w"(h), "w"(y));
-	__asm__ __volatile__("pmull2   %0.1q, %1.2d, %2.2d \n\t" : "=w"(r1) : "w"(h), "w"(y));
-	__asm__ __volatile__("pmull     %0.1q, %1.1d, %2.1d \n\t" : "=w"(t1) : "w"(h), "w"(t0));
-	__asm__ __volatile__("pmull2   %0.1q, %1.2d, %2.2d \n\t" : "=w"(t0) : "w"(h), "w"(t0));
-	t0 = veorq_u8(t0, t1);
-	t1 = vextq_u8(z, t0, 8);
-	r0 = veorq_u8(r0, t1);
-	t1 = vextq_u8(t0, z, 8);
-	r1 = veorq_u8(r1, t1);
-	__asm__ __volatile__("pmull2   %0.1q, %1.2d, %2.2d \n\t" : "=w"(t0) : "w"(r1), "w"(p));
-	t1 = vextq_u8(t0, z, 8);
-	r1 = veorq_u8(r1, t1);
-	t1 = vextq_u8(z, t0, 8);
-	r0 = veorq_u8(r0, t1);
-	__asm__ __volatile__("pmull     %0.1q, %1.1d, %2.1d \n\t" : "=w"(t0) : "w"(r1), "w"(p));
-	return vrbitq_u8(veorq_u8(r0, t0));
-}
-
-}	// anonymous namespace
-
-void AES::GMAC::p_armUpdate(const uint8_t* in, unsigned int len) noexcept
-{
-	uint8x16_t y = vld1q_u8(reinterpret_cast<const uint8_t*>(_y));
-	const uint8x16_t h = _aes.p_k.neon.h;
-
-	if (_rp) {
-		for (;;) {
-			if (! len) {
-				return;
-			}
-			--len;
-			_r[_rp++] = *(in++);
-			if (_rp == 16) {
-				y = s_clmul_armneon_crypto(h, y, _r);
-				break;
-			}
-		}
-	}
-
-	while (len >= 16) {
-		y = s_clmul_armneon_crypto(h, y, in);
-		in += 16;
-		len -= 16;
-	}
-
-	vst1q_u8(reinterpret_cast<uint8_t*>(_y), y);
-
-	for (unsigned int i = 0; i < len; ++i) {
-		_r[i] = in[i];
-	}
-	_rp = len;	 // len is always less than 16 here
-}
-
-void AES::GMAC::p_armFinish(uint8_t tag[16]) noexcept
-{
-	uint64_t tmp[2];
-	uint8x16_t y = vld1q_u8(reinterpret_cast<const uint8_t*>(_y));
-	const uint8x16_t h = _aes.p_k.neon.h;
-
-	if (_rp) {
-		while (_rp < 16) {
-			_r[_rp++] = 0;
-		}
-		y = s_clmul_armneon_crypto(h, y, _r);
-	}
-
-	tmp[0] = Utils::hton((uint64_t)_len << 3U);
-	tmp[1] = 0;
-	y = s_clmul_armneon_crypto(h, y, reinterpret_cast<const uint8_t*>(tmp));
-
-	Utils::copy<12>(tmp, _iv);
-#if __BYTE_ORDER == __BIG_ENDIAN
-	reinterpret_cast<uint32_t*>(tmp)[3] = 0x00000001;
-#else
-	reinterpret_cast<uint32_t*>(tmp)[3] = 0x01000000;
-#endif
-	_aes.encrypt(tmp, tmp);
-
-	uint8x16_t yy = y;
-	Utils::storeMachineEndian<uint64_t>(tag, tmp[0] ^ reinterpret_cast<const uint64_t*>(&yy)[0]);
-	Utils::storeMachineEndian<uint64_t>(tag + 8, tmp[1] ^ reinterpret_cast<const uint64_t*>(&yy)[1]);
-}
-
-void AES::CTR::p_armCrypt(const uint8_t* in, uint8_t* out, unsigned int len) noexcept
-{
-	uint8x16_t dd = vrev32q_u8(vld1q_u8(reinterpret_cast<uint8_t*>(_ctr)));
-	const uint32x4_t one = { 0, 0, 0, 1 };
-
-	uint8x16_t k0 = _aes.p_k.neon.ek[0];
-	uint8x16_t k1 = _aes.p_k.neon.ek[1];
-	uint8x16_t k2 = _aes.p_k.neon.ek[2];
-	uint8x16_t k3 = _aes.p_k.neon.ek[3];
-	uint8x16_t k4 = _aes.p_k.neon.ek[4];
-	uint8x16_t k5 = _aes.p_k.neon.ek[5];
-	uint8x16_t k6 = _aes.p_k.neon.ek[6];
-	uint8x16_t k7 = _aes.p_k.neon.ek[7];
-	uint8x16_t k8 = _aes.p_k.neon.ek[8];
-	uint8x16_t k9 = _aes.p_k.neon.ek[9];
-	uint8x16_t k10 = _aes.p_k.neon.ek[10];
-	uint8x16_t k11 = _aes.p_k.neon.ek[11];
-	uint8x16_t k12 = _aes.p_k.neon.ek[12];
-	uint8x16_t k13 = _aes.p_k.neon.ek[13];
-	uint8x16_t k14 = _aes.p_k.neon.ek[14];
-
-	unsigned int totalLen = _len;
-	if ((totalLen & 15U) != 0) {
-		for (;;) {
-			if (unlikely(! len)) {
-				vst1q_u8(reinterpret_cast<uint8_t*>(_ctr), vrev32q_u8(dd));
-				_len = totalLen;
-				return;
-			}
-			--len;
-			out[totalLen++] = *(in++);
-			if ((totalLen & 15U) == 0) {
-				uint8_t* const otmp = out + (totalLen - 16);
-				uint8x16_t d0 = vrev32q_u8(dd);
-				uint8x16_t pt = vld1q_u8(otmp);
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k0));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k1));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k2));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k3));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k4));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k5));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k6));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k7));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k8));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k9));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k10));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k11));
-				d0 = vaesmcq_u8(vaeseq_u8(d0, k12));
-				d0 = veorq_u8(vaeseq_u8(d0, k13), k14);
-				vst1q_u8(otmp, veorq_u8(pt, d0));
-				dd = (uint8x16_t)vaddq_u32((uint32x4_t)dd, one);
-				break;
-			}
-		}
-	}
-
-	out += totalLen;
-	_len = totalLen + len;
-
-	if (likely(len >= 64)) {
-		const uint32x4_t four = vshlq_n_u32(one, 2);
-		uint8x16_t dd1 = (uint8x16_t)vaddq_u32((uint32x4_t)dd, one);
-		uint8x16_t dd2 = (uint8x16_t)vaddq_u32((uint32x4_t)dd1, one);
-		uint8x16_t dd3 = (uint8x16_t)vaddq_u32((uint32x4_t)dd2, one);
-		for (;;) {
-			len -= 64;
-			uint8x16_t d0 = vrev32q_u8(dd);
-			uint8x16_t d1 = vrev32q_u8(dd1);
-			uint8x16_t d2 = vrev32q_u8(dd2);
-			uint8x16_t d3 = vrev32q_u8(dd3);
-			uint8x16_t pt0 = vld1q_u8(in);
-			uint8x16_t pt1 = vld1q_u8(in + 16);
-			uint8x16_t pt2 = vld1q_u8(in + 32);
-			uint8x16_t pt3 = vld1q_u8(in + 48);
-
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k0));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k0));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k0));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k0));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k1));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k1));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k1));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k1));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k2));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k2));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k2));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k2));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k3));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k3));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k3));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k3));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k4));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k4));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k4));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k4));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k5));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k5));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k5));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k5));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k6));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k6));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k6));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k6));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k7));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k7));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k7));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k7));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k8));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k8));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k8));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k8));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k9));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k9));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k9));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k9));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k10));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k10));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k10));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k10));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k11));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k11));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k11));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k11));
-			d0 = vaesmcq_u8(vaeseq_u8(d0, k12));
-			d1 = vaesmcq_u8(vaeseq_u8(d1, k12));
-			d2 = vaesmcq_u8(vaeseq_u8(d2, k12));
-			d3 = vaesmcq_u8(vaeseq_u8(d3, k12));
-			d0 = veorq_u8(vaeseq_u8(d0, k13), k14);
-			d1 = veorq_u8(vaeseq_u8(d1, k13), k14);
-			d2 = veorq_u8(vaeseq_u8(d2, k13), k14);
-			d3 = veorq_u8(vaeseq_u8(d3, k13), k14);
-
-			d0 = veorq_u8(pt0, d0);
-			d1 = veorq_u8(pt1, d1);
-			d2 = veorq_u8(pt2, d2);
-			d3 = veorq_u8(pt3, d3);
-
-			vst1q_u8(out, d0);
-			vst1q_u8(out + 16, d1);
-			vst1q_u8(out + 32, d2);
-			vst1q_u8(out + 48, d3);
-
-			out += 64;
-			in += 64;
-
-			dd = (uint8x16_t)vaddq_u32((uint32x4_t)dd, four);
-			if (unlikely(len < 64)) {
-				break;
-			}
-			dd1 = (uint8x16_t)vaddq_u32((uint32x4_t)dd1, four);
-			dd2 = (uint8x16_t)vaddq_u32((uint32x4_t)dd2, four);
-			dd3 = (uint8x16_t)vaddq_u32((uint32x4_t)dd3, four);
-		}
-	}
-
-	while (len >= 16) {
-		len -= 16;
-		uint8x16_t d0 = vrev32q_u8(dd);
-		uint8x16_t pt = vld1q_u8(in);
-		in += 16;
-		dd = (uint8x16_t)vaddq_u32((uint32x4_t)dd, one);
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k0));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k1));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k2));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k3));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k4));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k5));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k6));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k7));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k8));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k9));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k10));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k11));
-		d0 = vaesmcq_u8(vaeseq_u8(d0, k12));
-		d0 = veorq_u8(vaeseq_u8(d0, k13), k14);
-		vst1q_u8(out, veorq_u8(pt, d0));
-		out += 16;
-	}
-
-	// Any remaining input is placed in _out. This will be picked up and crypted
-	// on subsequent calls to crypt() or finish() as it'll mean _len will not be
-	// an even multiple of 16.
-	for (unsigned int i = 0; i < len; ++i) {
-		out[i] = in[i];
-	}
-
-	vst1q_u8(reinterpret_cast<uint8_t*>(_ctr), vrev32q_u8(dd));
-}
-
-#define ZT_INIT_ARMNEON_CRYPTO_SUBWORD(w) ((uint32_t)s_sbox[w & 0xffU] + ((uint32_t)s_sbox[(w >> 8U) & 0xffU] << 8U) + ((uint32_t)s_sbox[(w >> 16U) & 0xffU] << 16U) + ((uint32_t)s_sbox[(w >> 24U) & 0xffU] << 24U))
-#define ZT_INIT_ARMNEON_CRYPTO_ROTWORD(w) (((w) << 8U) | ((w) >> 24U))
-#define ZT_INIT_ARMNEON_CRYPTO_NK		  8
-#define ZT_INIT_ARMNEON_CRYPTO_NB		  4
-#define ZT_INIT_ARMNEON_CRYPTO_NR		  14
-
-void AES::p_init_armneon_crypto(const uint8_t* key) noexcept
-{
-	static const uint8_t s_sbox[256] = { 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
-										 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
-										 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-										 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
-										 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
-										 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-										 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
-										 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 };
-
-	uint64_t h[2];
-	uint32_t* const w = reinterpret_cast<uint32_t*>(p_k.neon.ek);
-
-	for (unsigned int i = 0; i < ZT_INIT_ARMNEON_CRYPTO_NK; ++i) {
-		const unsigned int j = i * 4;
-		w[i] = ((uint32_t)key[j] << 24U) | ((uint32_t)key[j + 1] << 16U) | ((uint32_t)key[j + 2] << 8U) | (uint32_t)key[j + 3];
-	}
-
-	for (unsigned int i = ZT_INIT_ARMNEON_CRYPTO_NK; i < (ZT_INIT_ARMNEON_CRYPTO_NB * (ZT_INIT_ARMNEON_CRYPTO_NR + 1)); ++i) {
-		uint32_t t = w[i - 1];
-		const unsigned int imod = i & (ZT_INIT_ARMNEON_CRYPTO_NK - 1);
-		if (imod == 0) {
-			t = ZT_INIT_ARMNEON_CRYPTO_SUBWORD(ZT_INIT_ARMNEON_CRYPTO_ROTWORD(t)) ^ rcon[(i - 1) / ZT_INIT_ARMNEON_CRYPTO_NK];
-		}
-		else if (imod == 4) {
-			t = ZT_INIT_ARMNEON_CRYPTO_SUBWORD(t);
-		}
-		w[i] = w[i - ZT_INIT_ARMNEON_CRYPTO_NK] ^ t;
-	}
-
-	for (unsigned int i = 0; i < (ZT_INIT_ARMNEON_CRYPTO_NB * (ZT_INIT_ARMNEON_CRYPTO_NR + 1)); ++i) {
-		w[i] = Utils::hton(w[i]);
-	}
-
-	p_k.neon.dk[0] = p_k.neon.ek[14];
-	for (int i = 1; i < 14; ++i) {
-		p_k.neon.dk[i] = vaesimcq_u8(p_k.neon.ek[14 - i]);
-	}
-	p_k.neon.dk[14] = p_k.neon.ek[0];
-
-	p_encrypt_armneon_crypto(Utils::ZERO256, h);
-	Utils::copy<16>(&(p_k.neon.h), h);
-	p_k.neon.h = vrbitq_u8(p_k.neon.h);
-	p_k.sw.h[0] = Utils::ntoh(h[0]);
-	p_k.sw.h[1] = Utils::ntoh(h[1]);
-}
-
-void AES::p_encrypt_armneon_crypto(const void* const in, void* const out) const noexcept
-{
-	uint8x16_t tmp = vld1q_u8(reinterpret_cast<const uint8_t*>(in));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[0]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[1]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[2]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[3]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[4]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[5]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[6]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[7]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[8]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[9]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[10]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[11]));
-	tmp = vaesmcq_u8(vaeseq_u8(tmp, p_k.neon.ek[12]));
-	tmp = veorq_u8(vaeseq_u8(tmp, p_k.neon.ek[13]), p_k.neon.ek[14]);
-	vst1q_u8(reinterpret_cast<uint8_t*>(out), tmp);
-}
-
-void AES::p_decrypt_armneon_crypto(const void* const in, void* const out) const noexcept
-{
-	uint8x16_t tmp = vld1q_u8(reinterpret_cast<const uint8_t*>(in));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[0]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[1]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[2]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[3]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[4]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[5]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[6]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[7]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[8]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[9]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[10]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[11]));
-	tmp = vaesimcq_u8(vaesdq_u8(tmp, p_k.neon.dk[12]));
-	tmp = veorq_u8(vaesdq_u8(tmp, p_k.neon.dk[13]), p_k.neon.dk[14]);
-	vst1q_u8(reinterpret_cast<uint8_t*>(out), tmp);
-}
-
-}	// namespace ZeroTier
-
-#endif	 // ZT_AES_NEON
diff --git a/node/Address.hpp b/node/Address.hpp
index 182ccb7bb..db46a4c93 100644
--- a/node/Address.hpp
+++ b/node/Address.hpp
@@ -1,61 +1,94 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_ADDRESS_HPP
 #define ZT_ADDRESS_HPP
 
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "Utils.hpp"
-
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
+
 #include <string>
 
+#include "Constants.hpp"
+#include "Utils.hpp"
+#include "Buffer.hpp"
+
 namespace ZeroTier {
 
 /**
  * A ZeroTier address
  */
-class Address {
-  public:
-	Address() : _a(0)
+class Address
+{
+public:
+	Address()
+		throw() :
+		_a(0)
 	{
 	}
-	Address(const Address& a) : _a(a._a)
+
+	Address(const Address &a)
+		throw() :
+		_a(a._a)
 	{
 	}
-	Address(uint64_t a) : _a(a & 0xffffffffffULL)
+
+	Address(uint64_t a)
+		throw() :
+		_a(a & 0xffffffffffULL)
 	{
 	}
 
+	Address(const char *s)
+		throw()
+	{
+		unsigned char foo[ZT_ADDRESS_LENGTH];
+		setTo(foo,Utils::unhex(s,foo,ZT_ADDRESS_LENGTH));
+	}
+
+	Address(const std::string &s)
+		throw()
+	{
+		unsigned char foo[ZT_ADDRESS_LENGTH];
+		setTo(foo,Utils::unhex(s.c_str(),foo,ZT_ADDRESS_LENGTH));
+	}
+
 	/**
 	 * @param bits Raw address -- 5 bytes, big-endian byte order
 	 * @param len Length of array
 	 */
-	Address(const void* bits, unsigned int len)
+	Address(const void *bits,unsigned int len)
+		throw()
 	{
-		setTo(bits, len);
+		setTo(bits,len);
 	}
 
-	inline Address& operator=(const Address& a)
+	inline Address &operator=(const Address &a)
+		throw()
 	{
 		_a = a._a;
 		return *this;
 	}
-	inline Address& operator=(const uint64_t a)
+
+	inline Address &operator=(const uint64_t a)
+		throw()
 	{
 		_a = (a & 0xffffffffffULL);
 		return *this;
@@ -65,13 +98,14 @@ class Address {
 	 * @param bits Raw address -- 5 bytes, big-endian byte order
 	 * @param len Length of array
 	 */
-	inline void setTo(const void* bits, const unsigned int len)
+	inline void setTo(const void *bits,unsigned int len)
+		throw()
 	{
 		if (len < ZT_ADDRESS_LENGTH) {
 			_a = 0;
 			return;
 		}
-		const unsigned char* b = (const unsigned char*)bits;
+		const unsigned char *b = (const unsigned char *)bits;
 		uint64_t a = ((uint64_t)*b++) << 32;
 		a |= ((uint64_t)*b++) << 24;
 		a |= ((uint64_t)*b++) << 16;
@@ -84,12 +118,12 @@ class Address {
 	 * @param bits Buffer to hold 5-byte address in big-endian byte order
 	 * @param len Length of array
 	 */
-	inline void copyTo(void* const bits, const unsigned int len) const
+	inline void copyTo(void *bits,unsigned int len) const
+		throw()
 	{
-		if (len < ZT_ADDRESS_LENGTH) {
+		if (len < ZT_ADDRESS_LENGTH)
 			return;
-		}
-		unsigned char* b = (unsigned char*)bits;
+		unsigned char *b = (unsigned char *)bits;
 		*(b++) = (unsigned char)((_a >> 32) & 0xff);
 		*(b++) = (unsigned char)((_a >> 24) & 0xff);
 		*(b++) = (unsigned char)((_a >> 16) & 0xff);
@@ -102,9 +136,11 @@ class Address {
 	 *
 	 * @param b Buffer to append to
 	 */
-	template <unsigned int C> inline void appendTo(Buffer<C>& b) const
+	template<unsigned int C>
+	inline void appendTo(Buffer<C> &b) const
+		throw(std::out_of_range)
 	{
-		unsigned char* p = (unsigned char*)b.appendField(ZT_ADDRESS_LENGTH);
+		unsigned char *p = (unsigned char *)b.appendField(ZT_ADDRESS_LENGTH);
 		*(p++) = (unsigned char)((_a >> 32) & 0xff);
 		*(p++) = (unsigned char)((_a >> 24) & 0xff);
 		*(p++) = (unsigned char)((_a >> 16) & 0xff);
@@ -116,6 +152,7 @@ class Address {
 	 * @return Integer containing address (0 to 2^40)
 	 */
 	inline uint64_t toInt() const
+		throw()
 	{
 		return _a;
 	}
@@ -124,6 +161,7 @@ class Address {
 	 * @return Hash code for use with Hashtable
 	 */
 	inline unsigned long hashCode() const
+		throw()
 	{
 		return (unsigned long)_a;
 	}
@@ -131,18 +169,31 @@ class Address {
 	/**
 	 * @return Hexadecimal string
 	 */
-	inline char* toString(char buf[11]) const
+	inline std::string toString() const
 	{
-		return Utils::hex10(_a, buf);
+		char buf[16];
+		Utils::snprintf(buf,sizeof(buf),"%.10llx",(unsigned long long)_a);
+		return std::string(buf);
+	};
+
+	/**
+	 * @param buf Buffer to fill
+	 * @param len Length of buffer
+	 */
+	inline void toString(char *buf,unsigned int len) const
+	{
+		Utils::snprintf(buf,len,"%.10llx",(unsigned long long)_a);
 	}
 
 	/**
 	 * @return True if this address is not zero
 	 */
-	inline operator bool() const
-	{
-		return (_a != 0);
-	}
+	inline operator bool() const throw() { return (_a != 0); }
+
+	/**
+	 * Set to null/zero
+	 */
+	inline void zero() throw() { _a = 0; }
 
 	/**
 	 * Check if this address is reserved
@@ -154,78 +205,28 @@ class Address {
 	 * @return True if address is reserved and may not be used
 	 */
 	inline bool isReserved() const
+		throw()
 	{
-		return ((! _a) || ((_a >> 32) == ZT_ADDRESS_RESERVED_PREFIX));
+		return ((!_a)||((_a >> 32) == ZT_ADDRESS_RESERVED_PREFIX));
 	}
 
 	/**
 	 * @param i Value from 0 to 4 (inclusive)
 	 * @return Byte at said position (address interpreted in big-endian order)
 	 */
-	inline uint8_t operator[](unsigned int i) const
-	{
-		return (uint8_t)(_a >> (32 - (i * 8)));
-	}
+	inline unsigned char operator[](unsigned int i) const throw() { return (unsigned char)((_a >> (32 - (i * 8))) & 0xff); }
 
-	inline void zero()
-	{
-		_a = 0;
-	}
+	inline bool operator==(const Address &a) const throw() { return (_a == a._a); }
+	inline bool operator!=(const Address &a) const throw() { return (_a != a._a); }
+	inline bool operator>(const Address &a) const throw() { return (_a > a._a); }
+	inline bool operator<(const Address &a) const throw() { return (_a < a._a); }
+	inline bool operator>=(const Address &a) const throw() { return (_a >= a._a); }
+	inline bool operator<=(const Address &a) const throw() { return (_a <= a._a); }
 
-	inline bool operator==(const uint64_t& a) const
-	{
-		return (_a == (a & 0xffffffffffULL));
-	}
-	inline bool operator!=(const uint64_t& a) const
-	{
-		return (_a != (a & 0xffffffffffULL));
-	}
-	inline bool operator>(const uint64_t& a) const
-	{
-		return (_a > (a & 0xffffffffffULL));
-	}
-	inline bool operator<(const uint64_t& a) const
-	{
-		return (_a < (a & 0xffffffffffULL));
-	}
-	inline bool operator>=(const uint64_t& a) const
-	{
-		return (_a >= (a & 0xffffffffffULL));
-	}
-	inline bool operator<=(const uint64_t& a) const
-	{
-		return (_a <= (a & 0xffffffffffULL));
-	}
-
-	inline bool operator==(const Address& a) const
-	{
-		return (_a == a._a);
-	}
-	inline bool operator!=(const Address& a) const
-	{
-		return (_a != a._a);
-	}
-	inline bool operator>(const Address& a) const
-	{
-		return (_a > a._a);
-	}
-	inline bool operator<(const Address& a) const
-	{
-		return (_a < a._a);
-	}
-	inline bool operator>=(const Address& a) const
-	{
-		return (_a >= a._a);
-	}
-	inline bool operator<=(const Address& a) const
-	{
-		return (_a <= a._a);
-	}
-
-  private:
+private:
 	uint64_t _a;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Array.hpp b/node/Array.hpp
new file mode 100644
index 000000000..19b29eb3b
--- /dev/null
+++ b/node/Array.hpp
@@ -0,0 +1,107 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_ARRAY_HPP
+#define ZT_ARRAY_HPP
+
+#include <string>
+#include <algorithm>
+
+namespace ZeroTier {
+
+/**
+ * Static array -- a simple thing that's belonged in STL since the time of the dinosaurs
+ */
+template<typename T,std::size_t S>
+class Array
+{
+public:
+	Array() throw() {}
+
+	Array(const Array &a)
+	{
+		for(std::size_t i=0;i<S;++i)
+			data[i] = a.data[i];
+	}
+
+	Array(const T *ptr)
+	{
+		for(std::size_t i=0;i<S;++i)
+			data[i] = ptr[i];
+	}
+
+	inline Array &operator=(const Array &a)
+	{
+		for(std::size_t i=0;i<S;++i)
+			data[i] = a.data[i];
+		return *this;
+	}
+
+	typedef T value_type;
+	typedef T* pointer;
+	typedef const T* const_pointer;
+	typedef T& reference;
+	typedef const T& const_reference;
+	typedef T* iterator;
+	typedef const T* const_iterator;
+	typedef std::size_t size_type;
+	typedef std::ptrdiff_t difference_type;
+	typedef std::reverse_iterator<iterator> reverse_iterator;
+	typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+	inline iterator begin() throw() { return data; }
+	inline iterator end() throw() { return &(data[S]); }
+	inline const_iterator begin() const throw() { return data; }
+	inline const_iterator end() const throw() { return &(data[S]); }
+
+	inline reverse_iterator rbegin() throw() { return reverse_iterator(begin()); }
+	inline reverse_iterator rend() throw() { return reverse_iterator(end()); }
+	inline const_reverse_iterator rbegin() const throw() { return const_reverse_iterator(begin()); }
+	inline const_reverse_iterator rend() const throw() { return const_reverse_iterator(end()); }
+
+	inline std::size_t size() const throw() { return S; }
+	inline std::size_t max_size() const throw() { return S; }
+
+	inline reference operator[](const std::size_t n) throw() { return data[n]; }
+	inline const_reference operator[](const std::size_t n) const throw() { return data[n]; }
+
+	inline reference front() throw() { return data[0]; }
+	inline const_reference front() const throw() { return data[0]; }
+	inline reference back() throw() { return data[S-1]; }
+	inline const_reference back() const throw() { return data[S-1]; }
+
+	inline bool operator==(const Array &k) const throw()
+	{
+		for(unsigned long i=0;i<S;++i) {
+			if (data[i] != k.data[i])
+				return false;
+		}
+		return true;
+	}
+	inline bool operator<(const Array &k) const throw() { return std::lexicographical_compare(begin(),end(),k.begin(),k.end()); }
+	inline bool operator!=(const Array &k) const throw() { return !(*this == k); }
+	inline bool operator>(const Array &k) const throw() { return (k < *this); }
+	inline bool operator<=(const Array &k) const throw() { return !(k < *this); }
+	inline bool operator>=(const Array &k) const throw() { return !(*this < k); }
+
+	T data[S];
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/node/AtomicCounter.hpp b/node/AtomicCounter.hpp
index 1e75d6e9f..b49937716 100644
--- a/node/AtomicCounter.hpp
+++ b/node/AtomicCounter.hpp
@@ -1,22 +1,30 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_ATOMICCOUNTER_HPP
 #define ZT_ATOMICCOUNTER_HPP
 
 #include "Constants.hpp"
+#include "Mutex.hpp"
+#include "NonCopyable.hpp"
 
-#ifndef __GNUC__
+#ifdef __WINDOWS__
+// <atomic> will replace this whole class eventually once it's ubiquitous
 #include <atomic>
 #endif
 
@@ -25,56 +33,81 @@ namespace ZeroTier {
 /**
  * Simple atomic counter supporting increment and decrement
  */
-class AtomicCounter {
-  public:
+class AtomicCounter : NonCopyable
+{
+public:
+	/**
+	 * Initialize counter at zero
+	 */
 	AtomicCounter()
+		throw()
 	{
 		_v = 0;
 	}
 
-	inline int load() const
+	inline operator int() const
+		throw()
 	{
 #ifdef __GNUC__
-		return __sync_or_and_fetch(const_cast<int*>(&_v), 0);
+		return __sync_or_and_fetch(const_cast <volatile int *>(&_v),0);
 #else
-		return _v.load();
+#ifdef __WINDOWS__
+		return (int)_v;
+#else
+		_l.lock();
+		int v = _v;
+		_l.unlock();
+		return v;
+#endif
 #endif
 	}
 
 	inline int operator++()
+		throw()
 	{
 #ifdef __GNUC__
-		return __sync_add_and_fetch(&_v, 1);
+		return __sync_add_and_fetch(&_v,1);
 #else
+#ifdef __WINDOWS__
 		return ++_v;
+#else
+		_l.lock();
+		int v = ++_v;
+		_l.unlock();
+		return v;
+#endif
 #endif
 	}
 
 	inline int operator--()
+		throw()
 	{
 #ifdef __GNUC__
-		return __sync_sub_and_fetch(&_v, 1);
+		return __sync_sub_and_fetch(&_v,1);
 #else
+#ifdef __WINDOWS__
 		return --_v;
+#else
+		_l.lock();
+		int v = --_v;
+		_l.unlock();
+		return v;
+#endif
 #endif
 	}
 
-  private:
-	AtomicCounter(const AtomicCounter&)
-	{
-	}
-	const AtomicCounter& operator=(const AtomicCounter&)
-	{
-		return *this;
-	}
-
-#ifdef __GNUC__
-	int _v;
-#else
+private:
+#ifdef __WINDOWS__
 	std::atomic_int _v;
+#else
+	int _v;
+#ifndef __GNUC__
+#warning Neither __WINDOWS__ nor __GNUC__ so AtomicCounter using Mutex
+	Mutex _l;
+#endif
 #endif
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/BinarySemaphore.hpp b/node/BinarySemaphore.hpp
new file mode 100644
index 000000000..315d2b00a
--- /dev/null
+++ b/node/BinarySemaphore.hpp
@@ -0,0 +1,97 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_BINARYSEMAPHORE_HPP
+#define ZT_BINARYSEMAPHORE_HPP
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "Constants.hpp"
+#include "NonCopyable.hpp"
+
+#ifdef __WINDOWS__
+
+#include <Windows.h>
+
+namespace ZeroTier {
+
+class BinarySemaphore : NonCopyable
+{
+public:
+	BinarySemaphore() throw() { _sem = CreateSemaphore(NULL,0,1,NULL); }
+	~BinarySemaphore() { CloseHandle(_sem); }
+	inline void wait() { WaitForSingleObject(_sem,INFINITE); }
+	inline void post() { ReleaseSemaphore(_sem,1,NULL); }
+private:
+	HANDLE _sem;
+};
+
+} // namespace ZeroTier
+
+#else // !__WINDOWS__
+
+#include <pthread.h>
+
+namespace ZeroTier {
+
+class BinarySemaphore : NonCopyable
+{
+public:
+	BinarySemaphore()
+	{
+		pthread_mutex_init(&_mh,(const pthread_mutexattr_t *)0);
+		pthread_cond_init(&_cond,(const pthread_condattr_t *)0);
+		_f = false;
+	}
+
+	~BinarySemaphore()
+	{
+		pthread_cond_destroy(&_cond);
+		pthread_mutex_destroy(&_mh);
+	}
+
+	inline void wait()
+	{
+		pthread_mutex_lock(const_cast <pthread_mutex_t *>(&_mh));
+		while (!_f)
+			pthread_cond_wait(const_cast <pthread_cond_t *>(&_cond),const_cast <pthread_mutex_t *>(&_mh));
+		_f = false;
+		pthread_mutex_unlock(const_cast <pthread_mutex_t *>(&_mh));
+	}
+
+	inline void post()
+	{
+		pthread_mutex_lock(const_cast <pthread_mutex_t *>(&_mh));
+		_f = true;
+		pthread_mutex_unlock(const_cast <pthread_mutex_t *>(&_mh));
+		pthread_cond_signal(const_cast <pthread_cond_t *>(&_cond));
+	}
+
+private:
+	pthread_cond_t _cond;
+	pthread_mutex_t _mh;
+	volatile bool _f;
+};
+
+} // namespace ZeroTier
+
+#endif // !__WINDOWS__
+
+#endif
diff --git a/node/Bond.cpp b/node/Bond.cpp
deleted file mode 100644
index 647633342..000000000
--- a/node/Bond.cpp
+++ /dev/null
@@ -1,2047 +0,0 @@
-/*
- * Copyright (c)2013-2021 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "Bond.hpp"
-
-#include "Switch.hpp"
-
-#include <cinttypes>   // for PRId64, etc. macros
-#include <cmath>
-#include <cstdio>
-#include <string>
-
-// FIXME: remove this suppression and actually fix warnings
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#endif
-
-namespace ZeroTier {
-
-static unsigned char s_freeRandomByteCounter = 0;
-
-int Bond::_minReqMonitorInterval = ZT_BOND_FAILOVER_DEFAULT_INTERVAL;
-uint8_t Bond::_defaultPolicy = ZT_BOND_POLICY_NONE;
-
-Phy<Bond*>* Bond::_phy;
-
-Binder* Bond::_binder;
-
-Mutex Bond::_bonds_m;
-Mutex Bond::_links_m;
-
-std::string Bond::_defaultPolicyStr;
-std::map<int64_t, SharedPtr<Bond> > Bond::_bonds;
-std::map<int64_t, std::string> Bond::_policyTemplateAssignments;
-std::map<std::string, SharedPtr<Bond> > Bond::_bondPolicyTemplates;
-std::map<std::string, std::vector<SharedPtr<Link> > > Bond::_linkDefinitions;
-std::map<std::string, std::map<std::string, SharedPtr<Link> > > Bond::_interfaceToLinkMap;
-
-bool Bond::linkAllowed(std::string& policyAlias, SharedPtr<Link> link)
-{
-	if (! link) {
-		return false;
-	}
-	bool foundInDefinitions = false;
-	if (_linkDefinitions.count(policyAlias)) {
-		auto it = _linkDefinitions[policyAlias].begin();
-		while (it != _linkDefinitions[policyAlias].end()) {
-			if (link->ifname() == (*it)->ifname()) {
-				foundInDefinitions = true;
-				break;
-			}
-			++it;
-		}
-	}
-	return _linkDefinitions[policyAlias].empty() || foundInDefinitions;
-}
-
-void Bond::addCustomLink(std::string& policyAlias, SharedPtr<Link> link)
-{
-	Mutex::Lock _l(_links_m);
-	_linkDefinitions[policyAlias].push_back(link);
-	auto search = _interfaceToLinkMap[policyAlias].find(link->ifname());
-	if (search == _interfaceToLinkMap[policyAlias].end()) {
-		link->setAsUserSpecified(true);
-		_interfaceToLinkMap[policyAlias].insert(std::pair<std::string, SharedPtr<Link> >(link->ifname(), link));
-	}
-}
-
-bool Bond::addCustomPolicy(const SharedPtr<Bond>& newBond)
-{
-	Mutex::Lock _l(_bonds_m);
-	if (! _bondPolicyTemplates.count(newBond->policyAlias())) {
-		_bondPolicyTemplates[newBond->policyAlias()] = newBond;
-		return true;
-	}
-	return false;
-}
-
-bool Bond::assignBondingPolicyToPeer(int64_t identity, const std::string& policyAlias)
-{
-	Mutex::Lock _l(_bonds_m);
-	if (! _policyTemplateAssignments.count(identity)) {
-		_policyTemplateAssignments[identity] = policyAlias;
-		return true;
-	}
-	return false;
-}
-
-SharedPtr<Bond> Bond::getBondByPeerId(int64_t identity)
-{
-	Mutex::Lock _l(_bonds_m);
-	return _bonds.count(identity) ? _bonds[identity] : SharedPtr<Bond>();
-}
-
-bool Bond::setAllMtuByTuple(uint16_t mtu, const std::string& ifStr, const std::string& ipStr)
-{
-	Mutex::Lock _l(_bonds_m);
-	std::map<int64_t, SharedPtr<Bond> >::iterator bondItr = _bonds.begin();
-	bool found = false;
-	while (bondItr != _bonds.end()) {
-		if (bondItr->second->setMtuByTuple(mtu, ifStr, ipStr)) {
-			found = true;
-		}
-		++bondItr;
-	}
-	return found;
-}
-
-bool Bond::setMtuByTuple(uint16_t mtu, const std::string& ifStr, const std::string& ipStr)
-{
-	Mutex::Lock _lp(_paths_m);
-	bool found = false;
-	for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p) {
-			SharedPtr<Link> sl = getLink(_paths[i].p);
-			if (sl) {
-				if (sl->ifname() == ifStr) {
-					char ipBuf[64] = { 0 };
-					_paths[i].p->address().toIpString(ipBuf);
-					std::string newString = std::string(ipBuf);
-					if (newString == ipStr) {
-						_paths[i].p->_mtu = mtu;
-						found = true;
-					}
-				}
-			}
-		}
-	}
-	return found;
-}
-
-SharedPtr<Bond> Bond::createBond(const RuntimeEnvironment* renv, const SharedPtr<Peer>& peer)
-{
-	Mutex::Lock _l(_bonds_m);
-	int64_t identity = peer->identity().address().toInt();
-	Bond* bond = nullptr;
-	if (! _bonds.count(identity)) {
-		if (! _policyTemplateAssignments.count(identity)) {
-			if (_defaultPolicy) {
-				bond = new Bond(renv, _defaultPolicy, peer);
-				bond->debug("new default bond");
-			}
-			if (! _defaultPolicy && _defaultPolicyStr.length()) {
-				bond = new Bond(renv, _bondPolicyTemplates[_defaultPolicyStr].ptr(), peer);
-				bond->debug("new default custom bond (based on %s)", bond->getPolicyStrByCode(bond->policy()).c_str());
-			}
-		}
-		else {
-			if (! _bondPolicyTemplates[_policyTemplateAssignments[identity]]) {
-				bond = new Bond(renv, _defaultPolicy, peer);
-				bond->debug("peer-specific bond, was specified as %s but the bond definition was not found, using default %s", _policyTemplateAssignments[identity].c_str(), getPolicyStrByCode(_defaultPolicy).c_str());
-			}
-			else {
-				bond = new Bond(renv, _bondPolicyTemplates[_policyTemplateAssignments[identity]].ptr(), peer);
-				bond->debug("new default bond");
-			}
-		}
-	}
-	if (bond) {
-		_bonds[identity] = bond;
-		/**
-		 * Determine if user has specified anything that could affect the bonding policy's decisions
-		 */
-		if (_interfaceToLinkMap.count(bond->policyAlias())) {
-			std::map<std::string, SharedPtr<Link> >::iterator it = _interfaceToLinkMap[bond->policyAlias()].begin();
-			while (it != _interfaceToLinkMap[bond->policyAlias()].end()) {
-				if (it->second->isUserSpecified()) {
-					bond->_userHasSpecifiedLinks = true;
-				}
-				if (it->second->isUserSpecified() && it->second->primary()) {
-					bond->_userHasSpecifiedPrimaryLink = true;
-				}
-				if (it->second->isUserSpecified() && it->second->userHasSpecifiedFailoverInstructions()) {
-					bond->_userHasSpecifiedFailoverInstructions = true;
-				}
-				if (it->second->isUserSpecified() && (it->second->capacity() > 0)) {
-					bond->_userHasSpecifiedLinkCapacities = true;
-				}
-				++it;
-			}
-		}
-		bond->startBond();
-		return bond;
-	}
-	return SharedPtr<Bond>();
-}
-
-void Bond::destroyBond(uint64_t peerId)
-{
-	Mutex::Lock _l(_bonds_m);
-	auto iter = _bonds.find(peerId);
-	if (iter != _bonds.end()) {
-		iter->second->stopBond();
-		_bonds.erase(iter);
-	}
-}
-
-void Bond::stopBond()
-{
-	debug("stopping bond");
-	_run = false;
-}
-
-void Bond::startBond()
-{
-	debug("starting bond");
-	_run = true;
-}
-
-SharedPtr<Link> Bond::getLinkBySocket(const std::string& policyAlias, uint64_t localSocket, bool createIfNeeded = false)
-{
-	Mutex::Lock _l(_links_m);
-	char ifname[ZT_MAX_PHYSIFNAME] = {};
-	_binder->getIfName((PhySocket*)((uintptr_t)localSocket), ifname, sizeof(ifname) - 1);
-	std::string ifnameStr(ifname);
-	auto search = _interfaceToLinkMap[policyAlias].find(ifnameStr);
-	if (search == _interfaceToLinkMap[policyAlias].end()) {
-		if (createIfNeeded) {
-			SharedPtr<Link> s = new Link(ifnameStr, 0, 0, 0, true, ZT_BOND_SLAVE_MODE_PRIMARY, "");
-			_interfaceToLinkMap[policyAlias].insert(std::pair<std::string, SharedPtr<Link> >(ifnameStr, s));
-			return s;
-		}
-		else {
-			return SharedPtr<Link>();
-		}
-	}
-	else {
-		return search->second;
-	}
-}
-
-SharedPtr<Link> Bond::getLinkByName(const std::string& policyAlias, const std::string& ifname)
-{
-	Mutex::Lock _l(_links_m);
-	auto search = _interfaceToLinkMap[policyAlias].find(ifname);
-	if (search != _interfaceToLinkMap[policyAlias].end()) {
-		return search->second;
-	}
-	return SharedPtr<Link>();
-}
-
-void Bond::processBackgroundTasks(void* tPtr, const int64_t now)
-{
-	unsigned long _currMinReqMonitorInterval = ZT_BOND_FAILOVER_DEFAULT_INTERVAL;
-	Mutex::Lock _l(_bonds_m);
-	std::map<int64_t, SharedPtr<Bond> >::iterator bondItr = _bonds.begin();
-	while (bondItr != _bonds.end()) {
-		// Update Bond Controller's background processing timer
-		_currMinReqMonitorInterval = std::min(_currMinReqMonitorInterval, (unsigned long)(bondItr->second->monitorInterval()));
-		bondItr->second->processBackgroundBondTasks(tPtr, now);
-		++bondItr;
-	}
-	_minReqMonitorInterval = std::min(_currMinReqMonitorInterval, (unsigned long)ZT_BOND_FAILOVER_DEFAULT_INTERVAL);
-}
-
-Bond::Bond(const RuntimeEnvironment* renv) : RR(renv)
-{
-	initTimers();
-}
-
-Bond::Bond(const RuntimeEnvironment* renv, int policy, const SharedPtr<Peer>& peer) : RR(renv), _freeRandomByte((unsigned char)((uintptr_t)this >> 4) ^ ++s_freeRandomByteCounter), _peer(peer), _peerId(_peer->_id.address().toInt())
-{
-	initTimers();
-	setBondParameters(policy, SharedPtr<Bond>(), false);
-	_policyAlias = getPolicyStrByCode(policy);
-}
-
-Bond::Bond(const RuntimeEnvironment* renv, std::string& basePolicy, std::string& policyAlias, const SharedPtr<Peer>& peer) : RR(renv), _policyAlias(policyAlias), _peer(peer)
-{
-	initTimers();
-	setBondParameters(getPolicyCodeByStr(basePolicy), SharedPtr<Bond>(), false);
-}
-
-Bond::Bond(const RuntimeEnvironment* renv, SharedPtr<Bond> originalBond, const SharedPtr<Peer>& peer)
-	: RR(renv)
-	, _freeRandomByte((unsigned char)((uintptr_t)this >> 4) ^ ++s_freeRandomByteCounter)
-	, _peer(peer)
-	, _peerId(_peer->_id.address().toInt())
-{
-	initTimers();
-	setBondParameters(originalBond->_policy, originalBond, true);
-}
-
-void Bond::nominatePathToBond(const SharedPtr<Path>& path, int64_t now)
-{
-	Mutex::Lock _l(_paths_m);
-	debug("attempting to nominate link %s", pathToStr(path).c_str());
-	/**
-	 * Ensure the link is allowed and the path is not already present
-	 */
-	if (! RR->bc->linkAllowed(_policyAlias, getLinkBySocket(_policyAlias, path->localSocket(), true))) {
-		debug("link %s is not allowed according to user-specified rules", pathToStr(path).c_str());
-		return;
-	}
-	bool alreadyPresent = false;
-	for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		// Sanity check
-		if (path.ptr() == _paths[i].p.ptr()) {
-			alreadyPresent = true;
-			debug("link %s already exists", pathToStr(path).c_str());
-			break;
-		}
-	}
-	if (! alreadyPresent) {
-		SharedPtr<Link> link = getLink(path);
-		if (link) {
-			std::string ifnameStr = std::string(link->ifname());
-			memset(path->_ifname, 0x0, ZT_MAX_PHYSIFNAME);
-			memcpy(path->_ifname, ifnameStr.c_str(), std::min((int)ifnameStr.length(), ZT_MAX_PHYSIFNAME));
-		}
-		/**
-		 * Find somewhere to stick it
-		 */
-		for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (! _paths[i].p) {
-				_paths[i].set(now, path);
-				/**
-				 * Set user preferences and update state variables of other paths on the same link
-				 */
-				SharedPtr<Link> sl = getLink(_paths[i].p);
-				if (sl) {
-					// Determine if there are any other paths on this link
-					bool bFoundCommonLink = false;
-					SharedPtr<Link> commonLink = RR->bc->getLinkBySocket(_policyAlias, _paths[i].p->localSocket());
-					if (commonLink) {
-						for (unsigned int j = 0; j < ZT_MAX_PEER_NETWORK_PATHS; ++j) {
-							if (_paths[j].p && _paths[j].p.ptr() != _paths[i].p.ptr()) {
-								if (RR->bc->getLinkBySocket(_policyAlias, _paths[j].p->localSocket(), true) == commonLink) {
-									bFoundCommonLink = true;
-									_paths[j].onlyPathOnLink = false;
-								}
-							}
-						}
-						_paths[i].ipvPref = sl->ipvPref();
-						_paths[i].mode = sl->mode();
-						_paths[i].enabled = sl->enabled();
-						_paths[i].localPort = _phy->getLocalPort((PhySocket*)((uintptr_t)path->localSocket()));
-						_paths[i].onlyPathOnLink = ! bFoundCommonLink;
-					}
-				}
-				log("nominated link %s", pathToStr(path).c_str());
-				break;
-			}
-		}
-	}
-	curateBond(now, true);
-	estimatePathQuality(now);
-}
-
-void Bond::addPathToBond(int nominatedIdx, int bondedIdx)
-{
-	// Map bonded set to nominated set
-	_realIdxMap[bondedIdx] = nominatedIdx;
-	// Tell the bonding layer that we can now use this path for traffic
-	_paths[nominatedIdx].bonded = true;
-}
-
-SharedPtr<Path> Bond::getAppropriatePath(int64_t now, int32_t flowId)
-{
-	Mutex::Lock _l(_paths_m);
-	/**
-	 * active-backup
-	 */
-	if (_policy == ZT_BOND_POLICY_ACTIVE_BACKUP) {
-		if (_abPathIdx != ZT_MAX_PEER_NETWORK_PATHS && _paths[_abPathIdx].p) {
-			// fprintf(stderr, "trying to send via (_abPathIdx=%d) %s\n", _abPathIdx, pathToStr(_paths[_abPathIdx].p).c_str());
-			return _paths[_abPathIdx].p;
-		}
-	}
-	/**
-	 * broadcast
-	 */
-	if (_policy == ZT_BOND_POLICY_BROADCAST) {
-		return SharedPtr<Path>();	// Handled in Switch::_trySend()
-	}
-	if (! _numBondedPaths) {
-		return SharedPtr<Path>();	// No paths assigned to bond yet, cannot balance traffic
-	}
-	/**
-	 * balance-rr
-	 */
-	if (_policy == ZT_BOND_POLICY_BALANCE_RR) {
-		if (_packetsPerLink == 0) {
-			// Randomly select a path
-			return _paths[_realIdxMap[_freeRandomByte % _numBondedPaths]].p;
-		}
-		if (_rrPacketsSentOnCurrLink < _packetsPerLink) {
-			// Continue to use this link
-			++_rrPacketsSentOnCurrLink;
-			return _paths[_realIdxMap[_rrIdx]].p;
-		}
-		// Reset striping counter
-		_rrPacketsSentOnCurrLink = 0;
-		if (_numBondedPaths == 1 || _rrIdx >= (ZT_MAX_PEER_NETWORK_PATHS - 1)) {
-			_rrIdx = 0;
-		}
-		else {
-			int _tempIdx = _rrIdx;
-			for (int searchCount = 0; searchCount < (_numBondedPaths - 1); searchCount++) {
-				_tempIdx = (_tempIdx == (_numBondedPaths - 1)) ? 0 : _tempIdx + 1;
-				if (_realIdxMap[_tempIdx] != ZT_MAX_PEER_NETWORK_PATHS) {
-					if (_paths[_realIdxMap[_tempIdx]].p && _paths[_realIdxMap[_tempIdx]].eligible) {
-						_rrIdx = _tempIdx;
-						break;
-					}
-				}
-			}
-		}
-		if (_paths[_realIdxMap[_rrIdx]].p) {
-			return _paths[_realIdxMap[_rrIdx]].p;
-		}
-	}
-	/**
-	 * balance-xor/aware
-	 */
-	if (_policy == ZT_BOND_POLICY_BALANCE_XOR || _policy == ZT_BOND_POLICY_BALANCE_AWARE) {
-		if (flowId == -1) {
-			// No specific path required for unclassified traffic, send on anything
-			int m_idx = _realIdxMap[_freeRandomByte % _numBondedPaths];
-			return _paths[m_idx].p;
-		}
-		Mutex::Lock _l(_flows_m);
-		std::map<int16_t, SharedPtr<Flow> >::iterator it = _flows.find(flowId);
-		if (likely(it != _flows.end())) {
-			it->second->lastActivity = now;
-			return _paths[it->second->assignedPath].p;
-		}
-		else {
-			unsigned char entropy;
-			Utils::getSecureRandom(&entropy, 1);
-			SharedPtr<Flow> flow = createFlow(ZT_MAX_PEER_NETWORK_PATHS, flowId, entropy, now);
-			_flows[flowId] = flow;
-			return _paths[flow->assignedPath].p;
-		}
-	}
-	return SharedPtr<Path>();
-}
-
-void Bond::recordIncomingInvalidPacket(const SharedPtr<Path>& path)
-{
-	Mutex::Lock _l(_paths_m);
-	for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p == path) {
-			//_paths[i].packetValiditySamples.push(false);
-		}
-	}
-}
-
-void Bond::recordOutgoingPacket(const SharedPtr<Path>& path, uint64_t packetId, uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now)
-{
-	_freeRandomByte += (unsigned char)(packetId >> 8);	 // Grab entropy to use in path selection logic
-	bool isFrame = (verb == Packet::Packet::VERB_ECHO || verb == Packet::VERB_FRAME || verb == Packet::VERB_EXT_FRAME);
-	bool shouldRecord = (packetId & (ZT_QOS_ACK_DIVISOR - 1) && (verb != Packet::VERB_ACK) && (verb != Packet::VERB_QOS_MEASUREMENT));
-	if (isFrame || shouldRecord) {
-		Mutex::Lock _l(_paths_m);
-		int pathIdx = getNominatedPathIdx(path);
-		if (pathIdx == ZT_MAX_PEER_NETWORK_PATHS) {
-			return;
-		}
-		if (isFrame) {
-			++(_paths[pathIdx].packetsOut);
-			_lastFrame = now;
-		}
-		if (shouldRecord) {
-			//_paths[pathIdx].expectingAckAsOf = now;
-			//_paths[pathIdx].totalBytesSentSinceLastAckReceived += payloadLength;
-			//_paths[pathIdx].unackedBytes += payloadLength;
-			if (_paths[pathIdx].qosStatsOut.size() < ZT_QOS_MAX_PENDING_RECORDS) {
-				_paths[pathIdx].qosStatsOut[packetId] = now;
-			}
-		}
-	}
-	if (flowId != ZT_QOS_NO_FLOW) {
-		Mutex::Lock _l(_flows_m);
-		if (_flows.count(flowId)) {
-			_flows[flowId]->bytesOut += payloadLength;
-		}
-	}
-}
-
-void Bond::recordIncomingPacket(const SharedPtr<Path>& path, uint64_t packetId, uint16_t payloadLength, Packet::Verb verb, int32_t flowId, int64_t now)
-{
-	bool isFrame = (verb == Packet::Packet::VERB_ECHO || verb == Packet::VERB_FRAME || verb == Packet::VERB_EXT_FRAME);
-	bool shouldRecord = (packetId & (ZT_QOS_ACK_DIVISOR - 1) && (verb != Packet::VERB_ACK) && (verb != Packet::VERB_QOS_MEASUREMENT));
-	Mutex::Lock _l(_paths_m);
-	int pathIdx = getNominatedPathIdx(path);
-	if (pathIdx == ZT_MAX_PEER_NETWORK_PATHS) {
-		return;
-	}
-	// Take note of the time that this previously-dead path received a packet
-	if (! _paths[pathIdx].alive) {
-		_paths[pathIdx].lastAliveToggle = now;
-	}
-	if (isFrame || shouldRecord) {
-		if (_paths[pathIdx].allowed()) {
-			if (isFrame) {
-				++(_paths[pathIdx].packetsIn);
-				_lastFrame = now;
-			}
-			if (shouldRecord) {
-				if (_paths[pathIdx].qosStatsIn.size() < ZT_QOS_MAX_PENDING_RECORDS) {
-					// debug("Recording QoS information (table size = %d)", _paths[pathIdx].qosStatsIn.size());
-					_paths[pathIdx].qosStatsIn[packetId] = now;
-					++(_paths[pathIdx].packetsReceivedSinceLastQoS);
-					//_paths[pathIdx].packetValiditySamples.push(true);
-				}
-				else {
-					// debug("QoS buffer full, will not record information");
-				}
-				/*
-				if (_paths[pathIdx].ackStatsIn.size() < ZT_ACK_MAX_PENDING_RECORDS) {
-					//debug("Recording ACK information (table size = %d)", _paths[pathIdx].ackStatsIn.size());
-					_paths[pathIdx].ackStatsIn[packetId] = payloadLength;
-					++(_paths[pathIdx].packetsReceivedSinceLastAck);
-				}
-				else {
-					debug("ACK buffer full, will not record information");
-				}
-				*/
-			}
-		}
-	}
-
-	/**
-	 * Learn new flows and pro-actively create entries for them in the bond so
-	 * that the next time we send a packet out that is part of a flow we know
-	 * which path to use.
-	 */
-	if ((flowId != ZT_QOS_NO_FLOW) && (_policy == ZT_BOND_POLICY_BALANCE_RR || _policy == ZT_BOND_POLICY_BALANCE_XOR || _policy == ZT_BOND_POLICY_BALANCE_AWARE)) {
-		Mutex::Lock _l(_flows_m);
-		SharedPtr<Flow> flow;
-		if (! _flows.count(flowId)) {
-			flow = createFlow(pathIdx, flowId, 0, now);
-		}
-		else {
-			flow = _flows[flowId];
-		}
-		if (flow) {
-			flow->bytesIn += payloadLength;
-		}
-	}
-}
-
-void Bond::receivedQoS(const SharedPtr<Path>& path, int64_t now, int count, uint64_t* rx_id, uint16_t* rx_ts)
-{
-	Mutex::Lock _l(_paths_m);
-	int pathIdx = getNominatedPathIdx(path);
-	if (pathIdx == ZT_MAX_PEER_NETWORK_PATHS) {
-		return;
-	}
-	_paths[pathIdx].lastQoSReceived = now;
-	// debug("received QoS packet (sampling %d frames) via %s", count, pathToStr(path).c_str());
-	//  Look up egress times and compute latency values for each record
-	std::map<uint64_t, uint64_t>::iterator it;
-	for (int j = 0; j < count; j++) {
-		it = _paths[pathIdx].qosStatsOut.find(rx_id[j]);
-		if (it != _paths[pathIdx].qosStatsOut.end()) {
-			_paths[pathIdx].latencySamples.push(((uint16_t)(now - it->second) - rx_ts[j]) / 2);
-			// if (_paths[pathIdx].shouldAvoid) {
-			//	debug("RX sample on avoided path %d", pathIdx);
-			// }
-			_paths[pathIdx].qosStatsOut.erase(it);
-		}
-	}
-	_paths[pathIdx].qosRecordSize.push(count);
-}
-
-void Bond::receivedAck(int pathIdx, int64_t now, int32_t ackedBytes)
-{
-	/*
-	Mutex::Lock _l(_paths_m);
-	debug("received ACK of %d bytes on path %s, there are still %d un-acked bytes", ackedBytes, pathToStr(_paths[pathIdx].p).c_str(), _paths[pathIdx].unackedBytes);
-	_paths[pathIdx].lastAckReceived = now;
-	_paths[pathIdx].unackedBytes = (ackedBytes > _paths[pathIdx].unackedBytes) ? 0 : _paths[pathIdx].unackedBytes - ackedBytes;
-	*/
-}
-
-int32_t Bond::generateQoSPacket(int pathIdx, int64_t now, char* qosBuffer)
-{
-	int32_t len = 0;
-	std::map<uint64_t, uint64_t>::iterator it = _paths[pathIdx].qosStatsIn.begin();
-	int i = 0;
-	int numRecords = std::min(_paths[pathIdx].packetsReceivedSinceLastQoS, ZT_QOS_TABLE_SIZE);
-	// debug("numRecords=%3d, packetsReceivedSinceLastQoS=%3d, _paths[pathIdx].qosStatsIn.size()=%3zu", numRecords, _paths[pathIdx].packetsReceivedSinceLastQoS, _paths[pathIdx].qosStatsIn.size());
-	while (i < numRecords && it != _paths[pathIdx].qosStatsIn.end()) {
-		uint64_t id = it->first;
-		memcpy(qosBuffer, &id, sizeof(uint64_t));
-		qosBuffer += sizeof(uint64_t);
-		uint16_t holdingTime = (uint16_t)(now - it->second);
-		memcpy(qosBuffer, &holdingTime, sizeof(uint16_t));
-		qosBuffer += sizeof(uint16_t);
-		len += sizeof(uint64_t) + sizeof(uint16_t);
-		_paths[pathIdx].qosStatsIn.erase(it++);
-		++i;
-	}
-	return len;
-}
-
-bool Bond::assignFlowToBondedPath(SharedPtr<Flow>& flow, int64_t now, bool reassign = false)
-{
-	if (! _numBondedPaths) {
-		debug("unable to assign flow %x (bond has no links)", flow->id);
-		return false;
-	}
-	unsigned int bondedIdx = ZT_MAX_PEER_NETWORK_PATHS;
-	if (_policy == ZT_BOND_POLICY_BALANCE_XOR) {
-		bondedIdx = abs((int)(flow->id % _numBondedPaths));
-		flow->assignPath(_realIdxMap[bondedIdx], now);
-		++(_paths[_realIdxMap[bondedIdx]].assignedFlowCount);
-	}
-	if (_policy == ZT_BOND_POLICY_BALANCE_AWARE) {
-		/** balance-aware generally works like balance-xor except that it will try to
-		 * take into account user preferences (or default sane limits) that will discourage
-		 * allocating traffic to links with a lesser perceived "quality" */
-		int offset = 0;
-		float bestQuality = 0.0;
-		int nextBestQualIdx = ZT_MAX_PEER_NETWORK_PATHS;
-
-		if (reassign) {
-			log("attempting to re-assign out-flow %04x previously on idx %d (%u / %zu flows)", flow->id, flow->assignedPath, _paths[_realIdxMap[flow->assignedPath]].assignedFlowCount, _flows.size());
-		}
-		else {
-			debug("attempting to assign flow for the first time");
-		}
-
-		unsigned char entropy;
-		Utils::getSecureRandom(&entropy, 1);
-		float randomLinkCapacity = ((float)entropy / 255.0);   // Used to random but proportional choices
-
-		while (offset < _numBondedPaths) {
-			unsigned char entropy;
-			Utils::getSecureRandom(&entropy, 1);
-
-			if (reassign) {
-				bondedIdx = (flow->assignedPath + offset) % (_numBondedPaths);
-			}
-			else {
-				bondedIdx = abs((int)((entropy + offset) % (_numBondedPaths)));
-			}
-			// debug("idx=%d, offset=%d, randomCap=%f, actualCap=%f", bondedIdx, offset, randomLinkCapacity, _paths[_realIdxMap[bondedIdx]].relativeLinkCapacity);
-			if (! _paths[_realIdxMap[bondedIdx]].p) {
-				continue;
-			}
-			if (! _paths[_realIdxMap[bondedIdx]].shouldAvoid && randomLinkCapacity <= _paths[_realIdxMap[bondedIdx]].relativeLinkCapacity) {
-				// debug("  assign out-flow %04x to link %s (%u / %zu flows)", flow->id, pathToStr(_paths[_realIdxMap[bondedIdx]].p).c_str(), _paths[_realIdxMap[bondedIdx]].assignedFlowCount, _flows.size());
-				break;	 // Acceptable -- No violation of quality spec
-			}
-			if (_paths[_realIdxMap[bondedIdx]].relativeQuality > bestQuality) {
-				bestQuality = _paths[_realIdxMap[bondedIdx]].relativeQuality;
-				nextBestQualIdx = bondedIdx;
-				// debug("    recording next-best link %f idx %d", _paths[_realIdxMap[bondedIdx]].relativeQuality, bondedIdx);
-			}
-			++offset;
-		}
-		if (offset < _numBondedPaths) {
-			// We were (able) to find a path that didn't violate any of the user's quality requirements
-			flow->assignPath(_realIdxMap[bondedIdx], now);
-			++(_paths[_realIdxMap[bondedIdx]].assignedFlowCount);
-			// debug("       ABLE to find optimal link %f idx %d", _paths[_realIdxMap[bondedIdx]].relativeQuality, bondedIdx);
-		}
-		else {
-			// We were (unable) to find a path that didn't violate at least one quality requirement, will choose next best option
-			flow->assignPath(_realIdxMap[nextBestQualIdx], now);
-			++(_paths[_realIdxMap[nextBestQualIdx]].assignedFlowCount);
-			// debug("       UNABLE to find, will use link %f idx %d", _paths[_realIdxMap[nextBestQualIdx]].relativeQuality, nextBestQualIdx);
-		}
-	}
-	if (_policy == ZT_BOND_POLICY_ACTIVE_BACKUP) {
-		if (_abPathIdx == ZT_MAX_PEER_NETWORK_PATHS) {
-			log("unable to assign out-flow %x (no active backup link)", flow->id);
-		}
-		flow->assignPath(_abPathIdx, now);
-	}
-	log("assign out-flow %04x to link %s (%u / %zu flows)", flow->id, pathToStr(_paths[flow->assignedPath].p).c_str(), _paths[flow->assignedPath].assignedFlowCount, _flows.size());
-	return true;
-}
-
-SharedPtr<Bond::Flow> Bond::createFlow(int pathIdx, int32_t flowId, unsigned char entropy, int64_t now)
-{
-	if (! _numBondedPaths) {
-		debug("unable to assign flow %04x (bond has no links)", flowId);
-		return SharedPtr<Flow>();
-	}
-	if (_flows.size() >= ZT_FLOW_MAX_COUNT) {
-		debug("forget oldest flow (max flows reached: %d)", ZT_FLOW_MAX_COUNT);
-		forgetFlowsWhenNecessary(0, true, now);
-	}
-	SharedPtr<Flow> flow = new Flow(flowId, now);
-	_flows[flowId] = flow;
-	/**
-	 * Add a flow with a given Path already provided. This is the case when a packet
-	 * is received on a path but no flow exists, in this case we simply assign the path
-	 * that the remote peer chose for us.
-	 */
-	if (pathIdx != ZT_MAX_PEER_NETWORK_PATHS) {
-		flow->assignPath(pathIdx, now);
-		_paths[pathIdx].assignedFlowCount++;
-		debug("assign in-flow %04x to link %s (%u / %zu)", flow->id, pathToStr(_paths[pathIdx].p).c_str(), _paths[pathIdx].assignedFlowCount, _flows.size());
-	}
-	/**
-	 * Add a flow when no path was provided. This means that it is an outgoing packet
-	 * and that it is up to the local peer to decide how to load-balance its transmission.
-	 */
-	else {
-		assignFlowToBondedPath(flow, now);
-	}
-	return flow;
-}
-
-void Bond::forgetFlowsWhenNecessary(uint64_t age, bool oldest, int64_t now)
-{
-	std::map<int16_t, SharedPtr<Flow> >::iterator it = _flows.begin();
-	std::map<int16_t, SharedPtr<Flow> >::iterator oldestFlow = _flows.end();
-	SharedPtr<Flow> expiredFlow;
-	if (age) {	 // Remove by specific age
-		while (it != _flows.end()) {
-			if (it->second->age(now) > age) {
-				debug("forget flow %04x (age %" PRId64 ") (%u / %zu)", it->first, it->second->age(now), _paths[it->second->assignedPath].assignedFlowCount, (_flows.size() - 1));
-				_paths[it->second->assignedPath].assignedFlowCount--;
-				it = _flows.erase(it);
-			}
-			else {
-				++it;
-			}
-		}
-	}
-	else if (oldest) {	 // Remove single oldest by natural expiration
-		uint64_t maxAge = 0;
-		while (it != _flows.end()) {
-			if (it->second->age(now) > maxAge) {
-				maxAge = (now - it->second->age(now));
-				oldestFlow = it;
-			}
-			++it;
-		}
-		if (oldestFlow != _flows.end()) {
-			debug("forget oldest flow %04x (age %" PRId64 ") (total flows: %zu)", oldestFlow->first, oldestFlow->second->age(now), _flows.size() - 1);
-			_paths[oldestFlow->second->assignedPath].assignedFlowCount--;
-			_flows.erase(oldestFlow);
-		}
-	}
-}
-
-void Bond::processIncomingPathNegotiationRequest(uint64_t now, SharedPtr<Path>& path, int16_t remoteUtility)
-{
-	char pathStr[64] = { 0 };
-	if (_abLinkSelectMethod != ZT_BOND_RESELECTION_POLICY_OPTIMIZE) {
-		return;
-	}
-	Mutex::Lock _l(_paths_m);
-	int pathIdx = getNominatedPathIdx(path);
-	if (pathIdx == ZT_MAX_PEER_NETWORK_PATHS) {
-		return;
-	}
-	_paths[pathIdx].p->address().toString(pathStr);
-	if (! _lastPathNegotiationCheck) {
-		return;
-	}
-	SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[pathIdx].p->localSocket());
-	if (link) {
-		if (remoteUtility > _localUtility) {
-			_paths[pathIdx].p->address().toString(pathStr);
-			debug("peer suggests alternate link %s/%s, remote utility (%d) greater than local utility (%d), switching to suggested link\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility);
-			_negotiatedPathIdx = pathIdx;
-		}
-		if (remoteUtility < _localUtility) {
-			debug("peer suggests alternate link %s/%s, remote utility (%d) less than local utility (%d), not switching\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility);
-		}
-		if (remoteUtility == _localUtility) {
-			debug("peer suggests alternate link %s/%s, remote utility (%d) equal to local utility (%d)\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility);
-			if (_peer->_id.address().toInt() > RR->node->identity().address().toInt()) {
-				debug("agree with peer to use alternate link %s/%s\n", link->ifname().c_str(), pathStr);
-				_negotiatedPathIdx = pathIdx;
-			}
-			else {
-				debug("ignore petition from peer to use alternate link %s/%s\n", link->ifname().c_str(), pathStr);
-			}
-		}
-	}
-}
-
-void Bond::pathNegotiationCheck(void* tPtr, int64_t now)
-{
-	int maxInPathIdx = ZT_MAX_PEER_NETWORK_PATHS;
-	int maxOutPathIdx = ZT_MAX_PEER_NETWORK_PATHS;
-	uint64_t maxInCount = 0;
-	uint64_t maxOutCount = 0;
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (! _paths[i].p) {
-			continue;
-		}
-		if (_paths[i].packetsIn > maxInCount) {
-			maxInCount = _paths[i].packetsIn;
-			maxInPathIdx = i;
-		}
-		if (_paths[i].packetsOut > maxOutCount) {
-			maxOutCount = _paths[i].packetsOut;
-			maxOutPathIdx = i;
-		}
-		_paths[i].resetPacketCounts();
-	}
-	bool _peerLinksSynchronized = ((maxInPathIdx != ZT_MAX_PEER_NETWORK_PATHS) && (maxOutPathIdx != ZT_MAX_PEER_NETWORK_PATHS) && (maxInPathIdx != maxOutPathIdx)) ? false : true;
-	/**
-	 * Determine utility and attempt to petition remote peer to switch to our chosen path
-	 */
-	if (! _peerLinksSynchronized) {
-		_localUtility = _paths[maxOutPathIdx].failoverScore - _paths[maxInPathIdx].failoverScore;
-		if (_paths[maxOutPathIdx].negotiated) {
-			_localUtility -= ZT_BOND_FAILOVER_HANDICAP_NEGOTIATED;
-		}
-		if ((now - _lastSentPathNegotiationRequest) > ZT_PATH_NEGOTIATION_CUTOFF_TIME) {
-			// fprintf(stderr, "BT: (sync) it's been long enough, sending more requests.\n");
-			_numSentPathNegotiationRequests = 0;
-		}
-		if (_numSentPathNegotiationRequests < ZT_PATH_NEGOTIATION_TRY_COUNT) {
-			if (_localUtility >= 0) {
-				// fprintf(stderr, "BT: (sync) paths appear to be out of sync (utility=%d)\n", _localUtility);
-				sendPATH_NEGOTIATION_REQUEST(tPtr, _paths[maxOutPathIdx].p);
-				++_numSentPathNegotiationRequests;
-				_lastSentPathNegotiationRequest = now;
-				// fprintf(stderr, "sending request to use %s on %s, ls=%llx, utility=%d\n", pathStr, link->ifname().c_str(), _paths[maxOutPathIdx].p->localSocket(), _localUtility);
-			}
-		}
-		/**
-		 * Give up negotiating and consider switching
-		 */
-		else if ((now - _lastSentPathNegotiationRequest) > (2 * ZT_BOND_OPTIMIZE_INTERVAL)) {
-			if (_localUtility == 0) {
-				// There's no loss to us, just switch without sending a another request
-				// fprintf(stderr, "BT: (sync) giving up, switching to remote peer's path.\n");
-				_negotiatedPathIdx = maxInPathIdx;
-			}
-		}
-	}
-}
-
-void Bond::sendPATH_NEGOTIATION_REQUEST(void* tPtr, int pathIdx)
-{
-	debug("send link negotiation request to peer via link %s, local utility is %d", pathToStr(_paths[pathIdx].p).c_str(), _localUtility);
-	if (_abLinkSelectMethod != ZT_BOND_RESELECTION_POLICY_OPTIMIZE) {
-		return;
-	}
-	Packet outp(_peer->_id.address(), RR->identity.address(), Packet::VERB_PATH_NEGOTIATION_REQUEST);
-	outp.append<int16_t>(_localUtility);
-	if (_paths[pathIdx].p->address()) {
-		Metrics::pkt_path_negotiation_request_out++;
-		outp.armor(_peer->key(), true, false, _peer->aesKeysIfSupported(), _peer->identity());
-		RR->node->putPacket(tPtr, _paths[pathIdx].p->localSocket(), _paths[pathIdx].p->address(), outp.data(), outp.size());
-		_overheadBytes += outp.size();
-	}
-}
-
-void Bond::sendACK(void* tPtr, int pathIdx, int64_t localSocket, const InetAddress& atAddress, int64_t now)
-{
-	/*
-	Packet outp(_peer->_id.address(), RR->identity.address(), Packet::VERB_ACK);
-	int32_t bytesToAck = 0;
-	std::map<uint64_t, uint64_t>::iterator it = _paths[pathIdx].ackStatsIn.begin();
-	while (it != _paths[pathIdx].ackStatsIn.end()) {
-		bytesToAck += it->second;
-		++it;
-	}
-	debug("sending ACK of %d bytes on path %s (table size = %zu)", bytesToAck, pathToStr(_paths[pathIdx].p).c_str(), _paths[pathIdx].ackStatsIn.size());
-	outp.append<uint32_t>(bytesToAck);
-	if (atAddress) {
-		outp.armor(_peer->key(), false, _peer->aesKeysIfSupported());
-		RR->node->putPacket(tPtr, localSocket, atAddress, outp.data(), outp.size());
-	}
-	else {
-		RR->sw->send(tPtr, outp, false);
-	}
-	_paths[pathIdx].ackStatsIn.clear();
-	_paths[pathIdx].packetsReceivedSinceLastAck = 0;
-	_paths[pathIdx].lastAckSent = now;
-	*/
-}
-
-void Bond::sendQOS_MEASUREMENT(void* tPtr, int pathIdx, int64_t localSocket, const InetAddress& atAddress, int64_t now)
-{
-	int64_t _now = RR->node->now();
-	Packet outp(_peer->_id.address(), RR->identity.address(), Packet::VERB_QOS_MEASUREMENT);
-	char qosData[ZT_QOS_MAX_PACKET_SIZE];
-	int16_t len = generateQoSPacket(pathIdx, _now, qosData);
-	if (len) {
-		// debug("sending QOS via link %s (len=%d)", pathToStr(_paths[pathIdx].p).c_str(), len);
-		outp.append(qosData, len);
-		if (atAddress) {
-			outp.armor(_peer->key(), true, false, _peer->aesKeysIfSupported(), _peer->identity());
-			RR->node->putPacket(tPtr, localSocket, atAddress, outp.data(), outp.size());
-		}
-		else {
-			RR->sw->send(tPtr, outp, false);
-		}
-		Metrics::pkt_qos_out++;
-		_paths[pathIdx].packetsReceivedSinceLastQoS = 0;
-		_paths[pathIdx].lastQoSMeasurement = now;
-		_overheadBytes += outp.size();
-	}
-}
-
-void Bond::processBackgroundBondTasks(void* tPtr, int64_t now)
-{
-	if (! _run) {
-		return;
-	}
-	if (! _peer->_localMultipathSupported || (now - _lastBackgroundTaskCheck) < ZT_BOND_BACKGROUND_TASK_MIN_INTERVAL) {
-		return;
-	}
-	_lastBackgroundTaskCheck = now;
-	Mutex::Lock _l(_paths_m);
-
-	curateBond(now, false);
-	if ((now - _lastQualityEstimation) > _qualityEstimationInterval) {
-		_lastQualityEstimation = now;
-		estimatePathQuality(now);
-	}
-	dumpInfo(now, false);
-
-	// Send ambient monitoring traffic
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p && _paths[i].allowed()) {
-			if (_isLeaf) {
-				if ((_monitorInterval > 0) && (((now - _paths[i].p->_lastIn) >= (_paths[i].alive ? _monitorInterval : _failoverInterval)))) {
-					if ((_peer->remoteVersionProtocol() >= 5) && (! ((_peer->remoteVersionMajor() == 1) && (_peer->remoteVersionMinor() == 1) && (_peer->remoteVersionRevision() == 0)))) {
-						Packet outp(_peer->address(), RR->identity.address(), Packet::VERB_ECHO);	// ECHO (this is our bond's heartbeat)
-						outp.armor(_peer->key(), true, false, _peer->aesKeysIfSupported(), _peer->identity());
-						RR->node->expectReplyTo(outp.packetId());
-						RR->node->putPacket(tPtr, _paths[i].p->localSocket(), _paths[i].p->address(), outp.data(), outp.size());
-						_paths[i].p->_lastOut = now;
-						_overheadBytes += outp.size();
-						Metrics::pkt_echo_out++;
-						// debug("tx: verb 0x%-2x of len %4d via %s (ECHO)", Packet::VERB_ECHO, outp.size(), pathToStr(_paths[i].p).c_str());
-					}
-				}
-				// QOS
-				if (_paths[i].needsToSendQoS(now, _qosSendInterval)) {
-					sendQOS_MEASUREMENT(tPtr, i, _paths[i].p->localSocket(), _paths[i].p->address(), now);
-				}
-				// ACK
-				/*
-				if (_paths[i].needsToSendAck(now, _ackSendInterval)) {
-					sendACK(tPtr, i, _paths[i].p->localSocket(), _paths[i].p->address(), now);
-				}
-				*/
-			}
-		}
-	}
-	// Perform periodic background tasks unique to each bonding policy
-	switch (_policy) {
-		case ZT_BOND_POLICY_ACTIVE_BACKUP:
-			processActiveBackupTasks(tPtr, now);
-			break;
-		case ZT_BOND_POLICY_BROADCAST:
-			break;
-		case ZT_BOND_POLICY_BALANCE_RR:
-		case ZT_BOND_POLICY_BALANCE_XOR:
-		case ZT_BOND_POLICY_BALANCE_AWARE:
-			processBalanceTasks(now);
-			break;
-		default:
-			break;
-	}
-	// Check whether or not a path negotiation needs to be performed
-	if (((now - _lastPathNegotiationCheck) > ZT_BOND_OPTIMIZE_INTERVAL) && _allowPathNegotiation) {
-		_lastPathNegotiationCheck = now;
-		pathNegotiationCheck(tPtr, now);
-	}
-}
-
-void Bond::curateBond(int64_t now, bool rebuildBond)
-{
-	uint8_t tmpNumAliveLinks = 0;
-	uint8_t tmpNumTotalLinks = 0;
-
-	/**
-	 * Update path state variables. State variables are used so that critical
-	 * blocks that perform fast packet processing won't need to make as many
-	 * function calls or computations.
-	 */
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (! _paths[i].p) {
-			continue;
-		}
-
-		// Whether this path is still in its trial period
-		bool inTrial = (now - _paths[i].whenNominated) < ZT_BOND_OPTIMIZE_INTERVAL;
-
-		/**
-		 * Remove expired or invalid links from bond
-		 */
-		SharedPtr<Link> link = getLink(_paths[i].p);
-		if (! link) {
-			log("link is no longer valid, removing from bond");
-			_paths[i].p->_valid = false;
-			_paths[i] = NominatedPath();
-			_paths[i].p = SharedPtr<Path>();
-			continue;
-		}
-		if ((now - _paths[i].lastEligibility) > (ZT_PEER_EXPIRED_PATH_TRIAL_PERIOD) && ! inTrial) {
-			log("link (%s) has expired or is invalid, removing from bond", pathToStr(_paths[i].p).c_str());
-			_paths[i] = NominatedPath();
-			_paths[i].p = SharedPtr<Path>();
-			continue;
-		}
-
-		tmpNumTotalLinks++;
-		if (_paths[i].eligible) {
-			tmpNumAliveLinks++;
-		}
-
-		/**
-		 * Determine aliveness
-		 */
-		_paths[i].alive = _isLeaf ? (now - _paths[i].p->_lastIn) < _failoverInterval : (now - _paths[i].p->_lastIn) < ZT_PEER_PATH_EXPIRATION;
-
-		/**
-		 * Determine current eligibility
-		 */
-		bool currEligibility = false;
-		// Simple RX age (driven by packets of any type and gratuitous VERB_HELLOs)
-		bool acceptableAge = _isLeaf ? (_paths[i].p->age(now) < (_failoverInterval + _downDelay)) : _paths[i].alive;
-		// Whether we've waited long enough since the link last came online
-		bool satisfiedUpDelay = (now - _paths[i].lastAliveToggle) >= _upDelay;
-		// How long since the last QoS was received (Must be less than ZT_PEER_PATH_EXPIRATION since the remote peer's _qosSendInterval isn't known)
-		bool acceptableQoSAge = (_paths[i].lastQoSReceived == 0 && inTrial) || ((now - _paths[i].lastQoSReceived) < ZT_PEER_EXPIRED_PATH_TRIAL_PERIOD);
-
-		// Allow active-backup to operate without the receipt of QoS records
-		// This may be expanded to the other modes as an option
-		if (_policy == ZT_BOND_POLICY_ACTIVE_BACKUP) {
-			acceptableQoSAge = true;
-		}
-
-		currEligibility = _paths[i].allowed() && ((acceptableAge && satisfiedUpDelay && acceptableQoSAge) || inTrial);
-
-		if (currEligibility) {
-			_paths[i].lastEligibility = now;
-		}
-
-		/**
-		 * Note eligibility state change (if any) and take appropriate action
-		 */
-		if (currEligibility != _paths[i].eligible) {
-			if (currEligibility == 0) {
-				log("link %s is no longer eligible (reason: allowed=%d, age=%d, ud=%d, qos=%d, trial=%d)", pathToStr(_paths[i].p).c_str(), _paths[i].allowed(), acceptableAge, satisfiedUpDelay, acceptableQoSAge, inTrial);
-			}
-			if (currEligibility == 1) {
-				log("link %s is eligible", pathToStr(_paths[i].p).c_str());
-			}
-			dumpPathStatus(now, i);
-			if (currEligibility) {
-				rebuildBond = true;
-			}
-			if (! currEligibility) {
-				_paths[i].adjustRefractoryPeriod(now, _defaultPathRefractoryPeriod, ! currEligibility);
-				if (_paths[i].bonded) {
-					debug("link %s was bonded, flow reallocation will occur soon", pathToStr(_paths[i].p).c_str());
-					rebuildBond = true;
-					_paths[i].shouldAvoid = true;
-					_paths[i].bonded = false;
-				}
-			}
-		}
-		if (currEligibility) {
-			_paths[i].adjustRefractoryPeriod(now, _defaultPathRefractoryPeriod, false);
-		}
-		_paths[i].eligible = currEligibility;
-	}
-
-	/**
-	 * Trigger status report if number of links change
-	 */
-	_numAliveLinks = tmpNumAliveLinks;
-	_numTotalLinks = tmpNumTotalLinks;
-	if ((_numAliveLinks != tmpNumAliveLinks) || (_numTotalLinks != tmpNumTotalLinks)) {
-		dumpInfo(now, true);
-	}
-
-	/**
-	 * Check for failure of (all) primary links and inform bond to use spares if present
-	 */
-	bool foundUsablePrimaryPath = false;
-	for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		// debug("[%d], bonded=%d, alive=%d", i, _paths[i].bonded , _paths[i].alive);
-		if (_paths[i].p && _paths[i].bonded && _paths[i].alive) {
-			foundUsablePrimaryPath = true;
-		}
-	}
-	rebuildBond = rebuildBond ? true : ! foundUsablePrimaryPath;
-
-	/**
-	 * Curate the set of paths that are part of the bond proper. Select a set of paths
-	 * per logical link according to eligibility and user-specified constraints.
-	 */
-	int updatedBondedPathCount = 0;
-	if ((_policy == ZT_BOND_POLICY_BALANCE_RR) || (_policy == ZT_BOND_POLICY_BALANCE_XOR) || (_policy == ZT_BOND_POLICY_BALANCE_AWARE)) {
-		if (! _numBondedPaths) {
-			rebuildBond = true;
-		}
-		if (rebuildBond) {
-			// Clear previous bonded index mapping
-			for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-				_realIdxMap[i] = ZT_MAX_PEER_NETWORK_PATHS;
-				_paths[i].bonded = false;
-			}
-
-			// Build map associating paths with local physical links. Will be selected from in next step
-			std::map<SharedPtr<Link>, std::vector<int> > linkMap;
-			for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-				if (_paths[i].p) {
-					SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[i].p->localSocket());
-					if (link) {
-						linkMap[link].push_back(i);
-					}
-				}
-			}
-			// Re-form bond from link<->path map
-			std::map<SharedPtr<Link>, std::vector<int> >::iterator it = linkMap.begin();
-			while (it != linkMap.end()) {
-				SharedPtr<Link> link = it->first;
-
-				// Bond a spare link if required (no viable primary links left)
-				if (! foundUsablePrimaryPath) {
-					// debug("no usable primary links remain, will attempt to use spare if available");
-					for (int j = 0; j < it->second.size(); j++) {
-						int idx = it->second.at(j);
-						if (! _paths[idx].p || ! _paths[idx].eligible || ! _paths[idx].allowed() || ! _paths[idx].isSpare()) {
-							continue;
-						}
-						addPathToBond(idx, updatedBondedPathCount);
-						++updatedBondedPathCount;
-						debug("add %s (spare)", pathToStr(_paths[idx].p).c_str());
-					}
-				}
-
-				int ipvPref = link->ipvPref();
-
-				// If user has no address type preference, then use every path we find on a link
-				if (ipvPref == 0) {
-					for (int j = 0; j < it->second.size(); j++) {
-						int idx = it->second.at(j);
-						if (! _paths[idx].p || ! _paths[idx].eligible || ! _paths[idx].allowed() || _paths[idx].isSpare()) {
-							continue;
-						}
-						addPathToBond(idx, updatedBondedPathCount);
-						++updatedBondedPathCount;
-						debug("add %s (no user addr preference)", pathToStr(_paths[idx].p).c_str());
-					}
-				}
-				// If the user prefers to only use one address type (IPv4 or IPv6)
-				if (ipvPref == 4 || ipvPref == 6) {
-					for (int j = 0; j < it->second.size(); j++) {
-						int idx = it->second.at(j);
-						if (! _paths[idx].p || ! _paths[idx].eligible || _paths[idx].isSpare()) {
-							continue;
-						}
-						if (! _paths[idx].allowed()) {
-							debug("did not add %s (user addr preference %d)", pathToStr(_paths[idx].p).c_str(), ipvPref);
-							continue;
-						}
-						addPathToBond(idx, updatedBondedPathCount);
-						++updatedBondedPathCount;
-						debug("add path %s (user addr preference %d)", pathToStr(_paths[idx].p).c_str(), ipvPref);
-					}
-				}
-				// If the users prefers one address type to another, try to find at least
-				// one path of that type before considering others.
-				if (ipvPref == 46 || ipvPref == 64) {
-					bool foundPreferredPath = false;
-					// Search for preferred paths
-					for (int j = 0; j < it->second.size(); j++) {
-						int idx = it->second.at(j);
-						if (! _paths[idx].p || ! _paths[idx].eligible || ! _paths[idx].allowed() || _paths[idx].isSpare()) {
-							continue;
-						}
-						if (_paths[idx].preferred()) {
-							addPathToBond(idx, updatedBondedPathCount);
-							++updatedBondedPathCount;
-							debug("add %s (user addr preference %d)", pathToStr(_paths[idx].p).c_str(), ipvPref);
-							foundPreferredPath = true;
-						}
-					}
-					// Unable to find a path that matches user preference, settle for another address type
-					if (! foundPreferredPath) {
-						debug("did not find first-choice path type on link %s (user preference %d)", link->ifname().c_str(), ipvPref);
-						for (int j = 0; j < it->second.size(); j++) {
-							int idx = it->second.at(j);
-							if (! _paths[idx].p || ! _paths[idx].eligible || _paths[idx].isSpare()) {
-								continue;
-							}
-							addPathToBond(idx, updatedBondedPathCount);
-							++updatedBondedPathCount;
-							debug("add %s (user addr preference %d)", pathToStr(_paths[idx].p).c_str(), ipvPref);
-							foundPreferredPath = true;
-						}
-					}
-				}
-				++it;	// Next link
-			}
-			_numBondedPaths = updatedBondedPathCount;
-			if (_policy == ZT_BOND_POLICY_BALANCE_RR) {
-				// Cause a RR reset since the current index might no longer be valid
-				_rrPacketsSentOnCurrLink = _packetsPerLink;
-				_rrIdx = 0;
-			}
-		}
-	}
-	if (_policy == ZT_BOND_POLICY_ACTIVE_BACKUP) {
-		for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p && _paths[i].bonded) {
-				updatedBondedPathCount++;
-			}
-		}
-		_numBondedPaths = updatedBondedPathCount;
-	}
-}
-
-void Bond::estimatePathQuality(int64_t now)
-{
-	float lat[ZT_MAX_PEER_NETWORK_PATHS] = { 0 };
-	float pdv[ZT_MAX_PEER_NETWORK_PATHS] = { 0 };
-	float plr[ZT_MAX_PEER_NETWORK_PATHS] = { 0 };
-	float per[ZT_MAX_PEER_NETWORK_PATHS] = { 0 };
-
-	float maxLAT = 0;
-	float maxPDV = 0;
-	float maxPLR = 0;
-	float maxPER = 0;
-
-	float absoluteQuality[ZT_MAX_PEER_NETWORK_PATHS] = { 0 };
-
-	float totQuality = 0.0f;
-
-	// Process observation samples, compute summary statistics, and compute relative link qualities
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (! _paths[i].p || ! _paths[i].allowed()) {
-			continue;
-		}
-		// Drain unacknowledged QoS records
-		int qosRecordTimeout = (_qosSendInterval * 3);
-		std::map<uint64_t, uint64_t>::iterator it = _paths[i].qosStatsOut.begin();
-		int numDroppedQosOutRecords = 0;
-		while (it != _paths[i].qosStatsOut.end()) {
-			if ((now - it->second) >= qosRecordTimeout) {
-				it = _paths[i].qosStatsOut.erase(it);
-				++numDroppedQosOutRecords;
-			}
-			else {
-				++it;
-			}
-		}
-		if (numDroppedQosOutRecords) {
-			// debug("dropped %d QOS out-records", numDroppedQosOutRecords);
-		}
-
-		/*
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (! _paths[i].p) {
-				continue;
-			}
-			// if ((now - _paths[i].lastAckReceived) > ackSendInterval) {
-			//	debug("been a while since ACK");
-			//	if (_paths[i].unackedBytes > 0) {
-			//		_paths[i].unackedBytes / _paths[i].bytesSen
-			//	}
-			// }
-		}
-		*/
-
-		it = _paths[i].qosStatsIn.begin();
-		int numDroppedQosInRecords = 0;
-		while (it != _paths[i].qosStatsIn.end()) {
-			if ((now - it->second) >= qosRecordTimeout) {
-				it = _paths[i].qosStatsIn.erase(it);
-				++numDroppedQosInRecords;
-			}
-			else {
-				++it;
-			}
-		}
-		if (numDroppedQosInRecords) {
-			// debug("dropped %d QOS in-records", numDroppedQosInRecords);
-		}
-
-		absoluteQuality[i] = 0;
-		totQuality = 0;
-		// Normalize raw observations according to sane limits and/or user specified values
-		lat[i] = 1.0 / expf(4 * Utils::normalize(_paths[i].latency, 0, _qw[ZT_QOS_LAT_MAX_IDX], 0, 1));
-		pdv[i] = 1.0 / expf(4 * Utils::normalize(_paths[i].latencyVariance, 0, _qw[ZT_QOS_PDV_MAX_IDX], 0, 1));
-		plr[i] = 1.0 / expf(4 * Utils::normalize(_paths[i].packetLossRatio, 0, _qw[ZT_QOS_PLR_MAX_IDX], 0, 1));
-		per[i] = 1.0 / expf(4 * Utils::normalize(_paths[i].packetErrorRatio, 0, _qw[ZT_QOS_PER_MAX_IDX], 0, 1));
-		// Record bond-wide maximums to determine relative values
-		maxLAT = lat[i] > maxLAT ? lat[i] : maxLAT;
-		maxPDV = pdv[i] > maxPDV ? pdv[i] : maxPDV;
-		maxPLR = plr[i] > maxPLR ? plr[i] : maxPLR;
-		maxPER = per[i] > maxPER ? per[i] : maxPER;
-	}
-
-	// Compute relative user-specified link capacities (may change during life of Bond)
-	int maxObservedLinkCap = 0;
-	// Find current maximum
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p && _paths[i].allowed()) {
-			SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[i].p->localSocket());
-			if (link) {
-				int linkSpeed = link->capacity();
-				_paths[i].p->_givenLinkSpeed = linkSpeed;
-				_paths[i].p->_mtu = link->mtu() ? link->mtu() : _paths[i].p->_mtu;
-				_paths[i].p->_assignedFlowCount = _paths[i].assignedFlowCount;
-				maxObservedLinkCap = linkSpeed > maxObservedLinkCap ? linkSpeed : maxObservedLinkCap;
-			}
-		}
-	}
-	// Compute relative link capacity (Used for weighting traffic allocations)
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p && _paths[i].allowed()) {
-			SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[i].p->localSocket());
-			if (link) {
-				float relativeCapacity = (link->capacity() / (float)maxObservedLinkCap);
-				link->setRelativeCapacity(relativeCapacity);
-				_paths[i].relativeLinkCapacity = relativeCapacity;
-			}
-		}
-	}
-
-	// Convert metrics to relative quantities and apply contribution weights
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p && _paths[i].bonded) {
-			absoluteQuality[i] += ((maxLAT > 0.0f ? lat[i] / maxLAT : 0.0f) * _qw[ZT_QOS_LAT_WEIGHT_IDX]);
-			absoluteQuality[i] += ((maxPDV > 0.0f ? pdv[i] / maxPDV : 0.0f) * _qw[ZT_QOS_PDV_WEIGHT_IDX]);
-			absoluteQuality[i] += ((maxPLR > 0.0f ? plr[i] / maxPLR : 0.0f) * _qw[ZT_QOS_PLR_WEIGHT_IDX]);
-			absoluteQuality[i] += ((maxPER > 0.0f ? per[i] / maxPER : 0.0f) * _qw[ZT_QOS_PER_WEIGHT_IDX]);
-			absoluteQuality[i] *= _paths[i].relativeLinkCapacity;
-			totQuality += absoluteQuality[i];
-		}
-	}
-
-	// Compute quality of link relative to all others in the bond (also accounting for stated link capacity)
-	if (totQuality > 0.0) {
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p && _paths[i].bonded) {
-				_paths[i].relativeQuality = absoluteQuality[i] / totQuality;
-				// debug("[%2d], abs=%f, tot=%f, rel=%f, relcap=%f", i, absoluteQuality[i], totQuality, _paths[i].relativeQuality, _paths[i].relativeLinkCapacity);
-			}
-		}
-	}
-
-	// Compute summary statistics
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (! _paths[i].p || ! _paths[i].allowed()) {
-			continue;
-		}
-		// Compute/Smooth average of real-world observations
-		if (_paths[i].latencySamples.count() >= ZT_QOS_SHORTTERM_SAMPLE_WIN_MIN_REQ_SIZE) {
-			_paths[i].latency = _paths[i].latencySamples.mean();
-		}
-		if (_paths[i].latencySamples.count() >= ZT_QOS_SHORTTERM_SAMPLE_WIN_MIN_REQ_SIZE) {
-			_paths[i].latencyVariance = _paths[i].latencySamples.stddev();
-		}
-
-		// Write values to external path object so that it can be propagated to the user
-		_paths[i].p->_latencyMean = _paths[i].latency;
-		_paths[i].p->_latencyVariance = _paths[i].latencyVariance;
-		_paths[i].p->_packetLossRatio = _paths[i].packetLossRatio;
-		_paths[i].p->_packetErrorRatio = _paths[i].packetErrorRatio;
-		_paths[i].p->_bonded = _paths[i].bonded;
-		_paths[i].p->_eligible = _paths[i].eligible;
-		//_paths[i].packetErrorRatio = 1.0 - (_paths[i].packetValiditySamples.count() ? _paths[i].packetValiditySamples.mean() : 1.0);
-		// _valid is written elsewhere
-		_paths[i].p->_relativeQuality = _paths[i].relativeQuality;
-		_paths[i].p->_localPort = _paths[i].localPort;
-	}
-
-	// Flag links for avoidance
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (! _paths[i].p || ! _paths[i].allowed()) {
-			continue;
-		}
-		bool shouldAvoid = false;
-		if (! _paths[i].shouldAvoid) {
-			if (_paths[i].latency > _qw[ZT_QOS_LAT_MAX_IDX]) {
-				log("avoiding link %s because (lat %6.4f > %6.4f)", pathToStr(_paths[i].p).c_str(), _paths[i].latency, _qw[ZT_QOS_LAT_MAX_IDX]);
-				shouldAvoid = true;
-			}
-			if (_paths[i].latencyVariance > _qw[ZT_QOS_PDV_MAX_IDX]) {
-				log("avoiding link %s because (pdv %6.4f > %6.4f)", pathToStr(_paths[i].p).c_str(), _paths[i].latencyVariance, _qw[ZT_QOS_PDV_MAX_IDX]);
-				shouldAvoid = true;
-			}
-			if (_paths[i].packetErrorRatio > _qw[ZT_QOS_PER_MAX_IDX]) {
-				log("avoiding link %s because (per %6.4f > %6.4f)", pathToStr(_paths[i].p).c_str(), _paths[i].packetErrorRatio, _qw[ZT_QOS_PER_MAX_IDX]);
-				shouldAvoid = true;
-			}
-			if (_paths[i].packetLossRatio > _qw[ZT_QOS_PLR_MAX_IDX]) {
-				log("avoiding link %s because (plr %6.4f > %6.4f)", pathToStr(_paths[i].p).c_str(), _paths[i].packetLossRatio, _qw[ZT_QOS_PLR_MAX_IDX]);
-				shouldAvoid = true;
-			}
-			_paths[i].shouldAvoid = shouldAvoid;
-		}
-		else {
-			if (! shouldAvoid) {
-				log("no longer avoiding link %s", pathToStr(_paths[i].p).c_str());
-				_paths[i].shouldAvoid = false;
-			}
-		}
-	}
-}
-
-void Bond::processBalanceTasks(int64_t now)
-{
-	if (! _numBondedPaths) {
-		return;
-	}
-	/**
-	 * Clean up and reset flows if necessary
-	 */
-	if ((now - _lastFlowExpirationCheck) > ZT_PEER_PATH_EXPIRATION) {
-		Mutex::Lock _l(_flows_m);
-		forgetFlowsWhenNecessary(ZT_PEER_PATH_EXPIRATION, false, now);
-		std::map<int16_t, SharedPtr<Flow> >::iterator it = _flows.begin();
-		while (it != _flows.end()) {
-			it->second->resetByteCounts();
-			++it;
-		}
-		_lastFlowExpirationCheck = now;
-	}
-	/**
-	 * Move (all) flows from dead paths
-	 */
-	if (_policy == ZT_BOND_POLICY_BALANCE_XOR || _policy == ZT_BOND_POLICY_BALANCE_AWARE) {
-		Mutex::Lock _l(_flows_m);
-		std::map<int16_t, SharedPtr<Flow> >::iterator flow_it = _flows.begin();
-		while (flow_it != _flows.end()) {
-			if (_paths[flow_it->second->assignedPath].p) {
-				int originalPathIdx = flow_it->second->assignedPath;
-				if (! _paths[originalPathIdx].eligible) {
-					log("moving all flows from dead link %s", pathToStr(_paths[originalPathIdx].p).c_str());
-					if (assignFlowToBondedPath(flow_it->second, now, true)) {
-						_paths[originalPathIdx].assignedFlowCount--;
-					}
-				}
-			}
-			++flow_it;
-		}
-	}
-	/**
-	 * Move (some) flows from low quality paths
-	 */
-	if (_policy == ZT_BOND_POLICY_BALANCE_AWARE) {
-		Mutex::Lock _l(_flows_m);
-		std::map<int16_t, SharedPtr<Flow> >::iterator flow_it = _flows.begin();
-		while (flow_it != _flows.end()) {
-			if (_paths[flow_it->second->assignedPath].p) {
-				int originalPathIdx = flow_it->second->assignedPath;
-				if (_paths[originalPathIdx].shouldAvoid) {
-					if (assignFlowToBondedPath(flow_it->second, now, true)) {
-						_paths[originalPathIdx].assignedFlowCount--;
-						return;	  // Only move one flow at a time
-					}
-				}
-			}
-			++flow_it;
-		}
-	}
-}
-
-void Bond::dequeueNextActiveBackupPath(uint64_t now)
-{
-	if (_abFailoverQueue.empty()) {
-		return;
-	}
-	_abPathIdx = _abFailoverQueue.front();
-	_abFailoverQueue.pop_front();
-	_lastActiveBackupPathChange = now;
-	for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p) {
-			_paths[i].resetPacketCounts();
-		}
-	}
-}
-
-bool Bond::abForciblyRotateLink()
-{
-	Mutex::Lock _l(_paths_m);
-	if (_policy == ZT_BOND_POLICY_ACTIVE_BACKUP) {
-		int prevPathIdx = _abPathIdx;
-		dequeueNextActiveBackupPath(RR->node->now());
-		log("active link rotated from %s to %s", pathToStr(_paths[prevPathIdx].p).c_str(), pathToStr(_paths[_abPathIdx].p).c_str());
-		return true;
-	}
-	return false;
-}
-
-void Bond::processActiveBackupTasks(void* tPtr, int64_t now)
-{
-	int prevActiveBackupPathIdx = _abPathIdx;
-	int nonPreferredPathIdx = ZT_MAX_PEER_NETWORK_PATHS;
-	bool foundPathOnPrimaryLink = false;
-	bool foundPreferredPath = false;
-
-	if (_abPathIdx != ZT_MAX_PEER_NETWORK_PATHS && ! _paths[_abPathIdx].p) {
-		_abPathIdx = ZT_MAX_PEER_NETWORK_PATHS;
-		log("main active-backup path has been removed");
-	}
-
-	/**
-	 * Generate periodic status report
-	 */
-	if ((now - _lastBondStatusLog) > ZT_BOND_STATUS_INTERVAL) {
-		_lastBondStatusLog = now;
-		if (_abPathIdx == ZT_MAX_PEER_NETWORK_PATHS) {
-			log("no active link");
-		}
-		else if (_paths[_abPathIdx].p) {
-			log("active link is %s, failover queue size is %zu", pathToStr(_paths[_abPathIdx].p).c_str(), _abFailoverQueue.size());
-		}
-		if (_abFailoverQueue.empty()) {
-			log("failover queue is empty, bond is no longer fault-tolerant");
-		}
-	}
-	/**
-	 * Select initial "active" active-backup link
-	 */
-	if (_abPathIdx == ZT_MAX_PEER_NETWORK_PATHS) {
-		/**
-		 * [Automatic mode]
-		 * The user has not explicitly specified links or their failover schedule,
-		 * the bonding policy will now select the first eligible path and set it as
-		 * its active backup path, if a substantially better path is detected the bonding
-		 * policy will assign it as the new active backup path. If the path fails it will
-		 * simply find the next eligible path.
-		 */
-		if (! userHasSpecifiedLinks()) {
-			for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-				if (_paths[i].p && _paths[i].eligible) {
-					SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[i].p->localSocket());
-					if (link) {
-						log("found eligible link %s", pathToStr(_paths[i].p).c_str());
-						_abPathIdx = i;
-						break;
-					}
-				}
-			}
-		}
-
-		/**
-		 * [Manual mode]
-		 * The user has specified links or failover rules that the bonding policy should adhere to.
-		 */
-		else if (userHasSpecifiedLinks()) {
-			if (userHasSpecifiedPrimaryLink()) {
-				for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-					if (! _paths[i].p) {
-						continue;
-					}
-					SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[i].p->localSocket());
-					if (link) {
-						if (_paths[i].eligible && link->primary()) {
-							if (! _paths[i].preferred()) {
-								// Found path on primary link, take note in case we don't find a preferred path
-								nonPreferredPathIdx = i;
-								foundPathOnPrimaryLink = true;
-							}
-							if (_paths[i].preferred()) {
-								_abPathIdx = i;
-								foundPathOnPrimaryLink = true;
-								if (_paths[_abPathIdx].p) {
-									SharedPtr<Link> abLink = RR->bc->getLinkBySocket(_policyAlias, _paths[_abPathIdx].p->localSocket());
-									if (abLink) {
-										log("found preferred primary link (_abPathIdx=%d), %s", _abPathIdx, pathToStr(_paths[_abPathIdx].p).c_str());
-										foundPreferredPath = true;
-									}
-									break;	 // Found preferred path on primary link
-								}
-							}
-						}
-					}
-				}
-				if (! foundPreferredPath && foundPathOnPrimaryLink && (nonPreferredPathIdx != ZT_MAX_PEER_NETWORK_PATHS)) {
-					log("found non-preferred primary link (_abPathIdx=%d)", _abPathIdx);
-					_abPathIdx = nonPreferredPathIdx;
-				}
-			}
-
-			else if (! userHasSpecifiedPrimaryLink()) {
-				for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-					if (_paths[i].p && _paths[i].eligible) {
-						_abPathIdx = i;
-						break;
-					}
-				}
-				if (_abPathIdx != ZT_MAX_PEER_NETWORK_PATHS) {
-					if (_paths[_abPathIdx].p) {
-						SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[_abPathIdx].p->localSocket());
-						if (link) {
-							log("select non-primary link %s", pathToStr(_paths[_abPathIdx].p).c_str());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// Short-circuit if we don't have an active link yet. Everything below is optimization from the base case
-	if (_abPathIdx < 0 || _abPathIdx == ZT_MAX_PEER_NETWORK_PATHS || (! _paths[_abPathIdx].p)) {
-		return;
-	}
-
-	// Remove ineligible paths from the failover link queue
-	for (std::deque<int>::iterator it(_abFailoverQueue.begin()); it != _abFailoverQueue.end();) {
-		if (! _paths[(*it)].p) {
-			log("link is no longer valid, removing from failover queue (%zu links remain in queue)", _abFailoverQueue.size());
-			it = _abFailoverQueue.erase(it);
-			continue;
-		}
-		if (_paths[(*it)].p && ! _paths[(*it)].eligible) {
-			SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[(*it)].p->localSocket());
-			if (link) {
-				log("link %s is ineligible, removing from failover queue (%zu links remain in queue)", pathToStr(_paths[(*it)].p).c_str(), _abFailoverQueue.size());
-			}
-			it = _abFailoverQueue.erase(it);
-			continue;
-		}
-		else {
-			++it;
-		}
-	}
-	/**
-	 * Failover instructions were provided by user, build queue according those as well as IPv
-	 * preference, disregarding performance.
-	 */
-	if (userHasSpecifiedFailoverInstructions()) {
-		/**
-		 * Clear failover scores
-		 */
-		for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p) {
-				_paths[i].failoverScore = 0;
-			}
-		}
-		// Follow user-specified failover instructions
-		for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (! _paths[i].p || ! _paths[i].allowed() || ! _paths[i].eligible) {
-				continue;
-			}
-			SharedPtr<Link> link = RR->bc->getLinkBySocket(_policyAlias, _paths[i].p->localSocket());
-			if (! link) {
-				continue;
-			}
-			int failoverScoreHandicap = _paths[i].failoverScore;
-			if (_paths[i].preferred()) {
-				failoverScoreHandicap += ZT_BOND_FAILOVER_HANDICAP_PREFERRED;
-			}
-			if (link->primary()) {
-				// If using "optimize" primary re-select mode, ignore user link designations
-				failoverScoreHandicap += ZT_BOND_FAILOVER_HANDICAP_PRIMARY;
-			}
-			if (! _paths[i].failoverScore) {
-				// If we didn't inherit a failover score from a "parent" that wants to use this path as a failover
-				int newHandicap = failoverScoreHandicap ? failoverScoreHandicap : (_paths[i].relativeQuality * 255.0);
-				_paths[i].failoverScore = newHandicap;
-			}
-			SharedPtr<Link> failoverLink;
-			if (link->failoverToLink().length()) {
-				failoverLink = RR->bc->getLinkByName(_policyAlias, link->failoverToLink());
-			}
-			if (failoverLink) {
-				for (int j = 0; j < ZT_MAX_PEER_NETWORK_PATHS; j++) {
-					if (_paths[j].p && getLink(_paths[j].p) == failoverLink.ptr()) {
-						int inheritedHandicap = failoverScoreHandicap - 10;
-						int newHandicap = _paths[j].failoverScore > inheritedHandicap ? _paths[j].failoverScore : inheritedHandicap;
-						if (! _paths[j].preferred()) {
-							newHandicap--;
-						}
-						_paths[j].failoverScore = newHandicap;
-					}
-				}
-			}
-			if (_paths[i].p) {
-				if (_paths[i].p.ptr() != _paths[_abPathIdx].p.ptr()) {
-					bool bFoundPathInQueue = false;
-					for (std::deque<int>::iterator it(_abFailoverQueue.begin()); it != _abFailoverQueue.end(); ++it) {
-						if (_paths[(*it)].p && (_paths[i].p.ptr() == _paths[(*it)].p.ptr())) {
-							bFoundPathInQueue = true;
-						}
-					}
-					if (! bFoundPathInQueue) {
-						_abFailoverQueue.push_back(i);
-						log("add link %s to failover queue (%zu links in queue)", pathToStr(_paths[i].p).c_str(), _abFailoverQueue.size());
-						addPathToBond(i, 0);
-					}
-				}
-			}
-		}
-	}
-	/**
-	 * No failover instructions provided by user, build queue according to performance
-	 * and IPv preference.
-	 */
-	else if (! userHasSpecifiedFailoverInstructions()) {
-		for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (! _paths[i].p || ! _paths[i].allowed() || ! _paths[i].eligible) {
-				continue;
-			}
-			int failoverScoreHandicap = 0;
-			if (_paths[i].preferred()) {
-				failoverScoreHandicap = ZT_BOND_FAILOVER_HANDICAP_PREFERRED;
-			}
-			if (! _paths[i].eligible) {
-				failoverScoreHandicap = -10000;
-			}
-			SharedPtr<Link> link = getLink(_paths[i].p);
-			if (! link) {
-				continue;
-			}
-			if (link->primary() && _abLinkSelectMethod != ZT_BOND_RESELECTION_POLICY_OPTIMIZE) {
-				// If using "optimize" primary re-select mode, ignore user link designations
-				failoverScoreHandicap = ZT_BOND_FAILOVER_HANDICAP_PRIMARY;
-			}
-			/*
-			if (_paths[i].p.ptr() == _paths[_negotiatedPathIdx].p.ptr()) {
-				_paths[i].negotiated = true;
-				failoverScoreHandicap = ZT_BOND_FAILOVER_HANDICAP_NEGOTIATED;
-			}
-			else {
-				_paths[i].negotiated = false;
-			}
-			*/
-			_paths[i].failoverScore = _paths[i].relativeQuality + failoverScoreHandicap;
-			if (_paths[i].p.ptr() != _paths[_abPathIdx].p.ptr()) {
-				bool bFoundPathInQueue = false;
-				for (std::deque<int>::iterator it(_abFailoverQueue.begin()); it != _abFailoverQueue.end(); ++it) {
-					if (_paths[i].p.ptr() == _paths[(*it)].p.ptr()) {
-						bFoundPathInQueue = true;
-					}
-				}
-				if (! bFoundPathInQueue) {
-					_abFailoverQueue.push_back(i);
-					log("add link %s to failover queue (%zu links in queue)", pathToStr(_paths[i].p).c_str(), _abFailoverQueue.size());
-					addPathToBond(i, 0);
-				}
-			}
-		}
-	}
-	// Sort queue based on performance
-	std::sort(_abFailoverQueue.begin(), _abFailoverQueue.end(), [this](const int a, const int b) {
-		// Sort by failover score in descending order (highest score first)
-		return _paths[a].failoverScore > _paths[b].failoverScore;
-	});
-
-	/**
-	 * Short-circuit if we have no queued paths
-	 */
-	if (_abFailoverQueue.empty()) {
-		return;
-	}
-
-	/**
-	 * Fulfill primary re-select obligations
-	 */
-	if (! _paths[_abPathIdx].eligible) {   // Implicit ZT_BOND_RESELECTION_POLICY_FAILURE
-		log("link %s has failed, select link from failover queue (%zu links in queue)", pathToStr(_paths[_abPathIdx].p).c_str(), _abFailoverQueue.size());
-		if (! _abFailoverQueue.empty()) {
-			dequeueNextActiveBackupPath(now);
-			log("active link switched to %s", pathToStr(_paths[_abPathIdx].p).c_str());
-		}
-		else {
-			log("failover queue is empty, no links to choose from");
-		}
-	}
-	/**
-	 * Detect change to prevent flopping during later optimization step.
-	 */
-	if (prevActiveBackupPathIdx != _abPathIdx) {
-		_lastActiveBackupPathChange = now;
-	}
-	if (_abFailoverQueue.empty()) {
-		return;	  // No sense in continuing since there are no links to switch to
-	}
-
-	if (_abLinkSelectMethod == ZT_BOND_RESELECTION_POLICY_ALWAYS) {
-		SharedPtr<Link> abLink = getLink(_paths[_abPathIdx].p);
-		if (! _paths[_abFailoverQueue.front()].p) {
-			log("invalid link. not switching");
-			return;
-		}
-
-		SharedPtr<Link> abFailoverLink = getLink(_paths[_abFailoverQueue.front()].p);
-		if (abLink && ! abLink->primary() && _paths[_abFailoverQueue.front()].p && abFailoverLink && abFailoverLink->primary()) {
-			dequeueNextActiveBackupPath(now);
-			log("switch back to available primary link %s (select mode: always)", pathToStr(_paths[_abPathIdx].p).c_str());
-		}
-	}
-	if (_abLinkSelectMethod == ZT_BOND_RESELECTION_POLICY_BETTER) {
-		SharedPtr<Link> abLink = getLink(_paths[_abPathIdx].p);
-		if (abLink && ! abLink->primary()) {
-			// Active backup has switched to "better" primary link according to re-select policy.
-			SharedPtr<Link> abFailoverLink = getLink(_paths[_abFailoverQueue.front()].p);
-			if (_paths[_abFailoverQueue.front()].p && abFailoverLink && abFailoverLink->primary() && (_paths[_abFailoverQueue.front()].failoverScore > _paths[_abPathIdx].failoverScore)) {
-				dequeueNextActiveBackupPath(now);
-				log("switch back to user-defined primary link %s (select mode: better)", pathToStr(_paths[_abPathIdx].p).c_str());
-			}
-		}
-	}
-	if (_abLinkSelectMethod == ZT_BOND_RESELECTION_POLICY_OPTIMIZE && ! _abFailoverQueue.empty()) {
-		/**
-		 * Implement link negotiation that was previously-decided
-		 */
-		if (_paths[_abFailoverQueue.front()].negotiated) {
-			dequeueNextActiveBackupPath(now);
-			_lastPathNegotiationCheck = now;
-			log("switch negotiated link %s (select mode: optimize)", pathToStr(_paths[_abPathIdx].p).c_str());
-		}
-		else {
-			// Try to find a better path and automatically switch to it -- not too often, though.
-			if ((now - _lastActiveBackupPathChange) > ZT_BOND_OPTIMIZE_INTERVAL) {
-				if (! _abFailoverQueue.empty()) {
-					int newFScore = _paths[_abFailoverQueue.front()].failoverScore;
-					int prevFScore = _paths[_abPathIdx].failoverScore;
-					// Establish a minimum switch threshold to prevent flapping
-					int failoverScoreDifference = _paths[_abFailoverQueue.front()].failoverScore - _paths[_abPathIdx].failoverScore;
-					int thresholdQuantity = (int)(ZT_BOND_ACTIVE_BACKUP_OPTIMIZE_MIN_THRESHOLD * (float)_paths[_abPathIdx].relativeQuality);
-					if ((failoverScoreDifference > 0) && (failoverScoreDifference > thresholdQuantity)) {
-						SharedPtr<Path> oldPath = _paths[_abPathIdx].p;
-						dequeueNextActiveBackupPath(now);
-						log("switch from %s (score: %d) to better link %s (score: %d) (select mode: optimize)", pathToStr(oldPath).c_str(), prevFScore, pathToStr(_paths[_abPathIdx].p).c_str(), newFScore);
-					}
-				}
-			}
-		}
-	}
-}
-
-void Bond::initTimers()
-{
-	_lastFlowExpirationCheck = 0;
-	_lastFlowRebalance = 0;
-	_lastSentPathNegotiationRequest = 0;
-	_lastPathNegotiationCheck = 0;
-	_lastPathNegotiationReceived = 0;
-	_lastQoSRateCheck = 0;
-	_lastAckRateCheck = 0;
-	_lastQualityEstimation = 0;
-	_lastBondStatusLog = 0;
-	_lastSummaryDump = 0;
-	_lastActiveBackupPathChange = 0;
-	_lastFrame = 0;
-	_lastBackgroundTaskCheck = 0;
-}
-
-void Bond::setBondParameters(int policy, SharedPtr<Bond> templateBond, bool useTemplate)
-{
-	// Sanity check for policy
-
-	_defaultPolicy = (_defaultPolicy <= ZT_BOND_POLICY_NONE || _defaultPolicy > ZT_BOND_POLICY_BALANCE_AWARE) ? ZT_BOND_POLICY_NONE : _defaultPolicy;
-	_policy = (policy <= ZT_BOND_POLICY_NONE || policy > ZT_BOND_POLICY_BALANCE_AWARE) ? _defaultPolicy : policy;
-
-	// Check if non-leaf to prevent spamming infrastructure
-	ZT_PeerRole role;
-	if (_peer) {
-		role = RR->topology->role(_peer->address());
-	}
-	_isLeaf = _peer ? (role != ZT_PEER_ROLE_PLANET && role != ZT_PEER_ROLE_MOON) : false;
-
-	// Path negotiation
-
-	_allowPathNegotiation = false;
-	_pathNegotiationCutoffCount = 0;
-	_localUtility = 0;
-	_negotiatedPathIdx = 0;
-
-	// User preferences which may override the default bonding algorithm's behavior
-
-	_userHasSpecifiedPrimaryLink = false;
-	_userHasSpecifiedFailoverInstructions = false;
-	_userHasSpecifiedLinkCapacities = 0;
-
-	// Bond status
-
-	_numAliveLinks = 0;
-	_numTotalLinks = 0;
-	_numBondedPaths = 0;
-
-	// General parameters
-
-	_downDelay = 0;
-	_upDelay = 0;
-	_monitorInterval = 0;
-
-	// balance-aware
-
-	_totalBondUnderload = 0;
-	_overheadBytes = 0;
-
-	/**
-	 * Policy defaults
-	 */
-	_abPathIdx = ZT_MAX_PEER_NETWORK_PATHS;
-	_abLinkSelectMethod = ZT_BOND_RESELECTION_POLICY_ALWAYS;
-	_rrPacketsSentOnCurrLink = 0;
-	_rrIdx = 0;
-	_packetsPerLink = 64;
-
-	// Sane quality defaults
-
-	_qw[ZT_QOS_LAT_MAX_IDX] = 500.0f;
-	_qw[ZT_QOS_PDV_MAX_IDX] = 100.0f;
-	_qw[ZT_QOS_PLR_MAX_IDX] = 0.001f;
-	_qw[ZT_QOS_PER_MAX_IDX] = 0.0001f;
-	_qw[ZT_QOS_LAT_WEIGHT_IDX] = 0.25f;
-	_qw[ZT_QOS_PDV_WEIGHT_IDX] = 0.25f;
-	_qw[ZT_QOS_PLR_WEIGHT_IDX] = 0.25f;
-	_qw[ZT_QOS_PER_WEIGHT_IDX] = 0.25f;
-
-	_failoverInterval = ZT_BOND_FAILOVER_DEFAULT_INTERVAL;
-
-	/* If a user has specified custom parameters for this bonding policy, overlay them onto the defaults */
-	if (useTemplate) {
-		_policyAlias = templateBond->_policyAlias;
-		_policy = templateBond->policy();
-		_failoverInterval = templateBond->_failoverInterval >= ZT_BOND_FAILOVER_MIN_INTERVAL ? templateBond->_failoverInterval : ZT_BOND_FAILOVER_MIN_INTERVAL;
-		_downDelay = templateBond->_downDelay;
-		_upDelay = templateBond->_upDelay;
-		_abLinkSelectMethod = templateBond->_abLinkSelectMethod;
-		memcpy(_qw, templateBond->_qw, ZT_QOS_PARAMETER_SIZE * sizeof(float));
-		debug("user link quality spec = {%6.3f, %6.3f, %6.3f, %6.3f, %6.3f, %6.3f, %6.3f, %6.3f}", _qw[0], _qw[1], _qw[2], _qw[3], _qw[4], _qw[5], _qw[6], _qw[7]);
-	}
-
-	if (! _isLeaf) {
-		_policy = ZT_BOND_POLICY_NONE;
-	}
-
-	// Timer geometry
-
-	_monitorInterval = _failoverInterval / ZT_BOND_ECHOS_PER_FAILOVER_INTERVAL;
-	_qualityEstimationInterval = _failoverInterval * 2;
-	_qosSendInterval = _failoverInterval * 2;
-	_ackSendInterval = _failoverInterval * 2;
-	_qosCutoffCount = 0;
-	_ackCutoffCount = 0;
-	_defaultPathRefractoryPeriod = 8000;
-}
-
-void Bond::setUserLinkQualitySpec(float weights[], int len)
-{
-	if (len != ZT_QOS_PARAMETER_SIZE) {
-		debug("link quality spec has an invalid number of parameters (%d out of %d), ignoring", len, ZT_QOS_PARAMETER_SIZE);
-		return;
-	}
-	float weightTotal = 0.0;
-	for (unsigned int i = 4; i < ZT_QOS_PARAMETER_SIZE; ++i) {
-		weightTotal += weights[i];
-	}
-	if (weightTotal > 0.99 && weightTotal < 1.01) {
-		memcpy(_qw, weights, len * sizeof(float));
-	}
-}
-
-SharedPtr<Link> Bond::getLink(const SharedPtr<Path>& path)
-{
-	return ! path ? SharedPtr<Link>() : RR->bc->getLinkBySocket(_policyAlias, path->localSocket());
-}
-
-std::string Bond::pathToStr(const SharedPtr<Path>& path)
-{
-#ifdef ZT_TRACE
-	if (path) {
-		char pathStr[64] = { 0 };
-		char fullPathStr[384] = { 0 };
-		path->address().toString(pathStr);
-		SharedPtr<Link> link = getLink(path);
-		if (link) {
-			std::string ifnameStr = std::string(link->ifname());
-			snprintf(fullPathStr, 384, "%.16" PRIx64 "-%s/%s", path->localSocket(), ifnameStr.c_str(), pathStr);
-			return std::string(fullPathStr);
-		}
-	}
-	return "";
-#else
-	return "";
-#endif
-}
-
-void Bond::dumpPathStatus(int64_t now, int pathIdx)
-{
-#ifdef ZT_TRACE
-	std::string aliveOrDead = _paths[pathIdx].alive ? std::string("alive") : std::string("dead");
-	std::string eligibleOrNot = _paths[pathIdx].eligible ? std::string("eligible") : std::string("ineligible");
-	std::string bondedOrNot = _paths[pathIdx].bonded ? std::string("bonded") : std::string("unbonded");
-	log("path[%2u] --- %5s (in %7" PRId64 ", out: %7" PRId64 "), %10s, %8s, flows=%-6u lat=%-8.3f pdv=%-7.3f err=%-6.4f loss=%-6.4f qual=%-6.4f --- (%s) spare=%d",
-		pathIdx,
-		aliveOrDead.c_str(),
-		_paths[pathIdx].p->age(now),
-		_paths[pathIdx].p->_lastOut == 0 ? static_cast<int64_t>(0) : now - _paths[pathIdx].p->_lastOut,
-		eligibleOrNot.c_str(),
-		bondedOrNot.c_str(),
-		_paths[pathIdx].assignedFlowCount,
-		_paths[pathIdx].latency,
-		_paths[pathIdx].latencyVariance,
-		_paths[pathIdx].packetErrorRatio,
-		_paths[pathIdx].packetLossRatio,
-		_paths[pathIdx].relativeQuality,
-		pathToStr(_paths[pathIdx].p).c_str(),
-		_paths[pathIdx].isSpare());
-#endif
-}
-
-void Bond::dumpInfo(int64_t now, bool force)
-{
-#ifdef ZT_TRACE
-	uint64_t timeSinceLastDump = now - _lastSummaryDump;
-	if (! force && timeSinceLastDump < ZT_BOND_STATUS_INTERVAL) {
-		return;
-	}
-	_lastSummaryDump = now;
-	float overhead = (_overheadBytes / (timeSinceLastDump / 1000.0f) / 1000.0f);
-	_overheadBytes = 0;
-	log("bond: ready=%d, bp=%d, fi=%" PRIu64 ", mi=%d, ud=%d, dd=%d, flows=%zu, leaf=%d, overhead=%f KB/s, links=(%d/%d)",
-		isReady(),
-		_policy,
-		_failoverInterval,
-		_monitorInterval,
-		_upDelay,
-		_downDelay,
-		_flows.size(),
-		_isLeaf,
-		overhead,
-		_numAliveLinks,
-		_numTotalLinks);
-	for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p) {
-			dumpPathStatus(now, i);
-		}
-	}
-	log("");
-#endif
-}
-
-}	// namespace ZeroTier
diff --git a/node/Bond.hpp b/node/Bond.hpp
deleted file mode 100644
index f7d1f05a2..000000000
--- a/node/Bond.hpp
+++ /dev/null
@@ -1,1573 +0,0 @@
-/*
- * Copyright (c)2013-2021 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_BOND_HPP
-#define ZT_BOND_HPP
-
-#include "../osdep/Binder.hpp"
-#include "../osdep/Phy.hpp"
-#include "Packet.hpp"
-#include "Path.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Trace.hpp"
-
-#include <cstdarg>
-#include <deque>
-#include <list>
-#include <map>
-
-/**
- * Indices for the path quality weight vector
- */
-enum ZT_BondQualityWeightIndex { ZT_QOS_LAT_MAX_IDX, ZT_QOS_PDV_MAX_IDX, ZT_QOS_PLR_MAX_IDX, ZT_QOS_PER_MAX_IDX, ZT_QOS_LAT_WEIGHT_IDX, ZT_QOS_PDV_WEIGHT_IDX, ZT_QOS_PLR_WEIGHT_IDX, ZT_QOS_PER_WEIGHT_IDX, ZT_QOS_PARAMETER_SIZE };
-
-/**
- *  Multipath bonding policy
- */
-enum ZT_BondBondingPolicy {
-	/**
-	 * Normal operation. No fault tolerance, no load balancing
-	 */
-	ZT_BOND_POLICY_NONE = 0,
-
-	/**
-	 * Sends traffic out on only one path at a time. Configurable immediate
-	 * fail-over.
-	 */
-	ZT_BOND_POLICY_ACTIVE_BACKUP = 1,
-
-	/**
-	 * Sends traffic out on all paths
-	 */
-	ZT_BOND_POLICY_BROADCAST = 2,
-
-	/**
-	 * Stripes packets across all paths
-	 */
-	ZT_BOND_POLICY_BALANCE_RR = 3,
-
-	/**
-	 * Packets destined for specific peers will always be sent over the same
-	 * path.
-	 */
-	ZT_BOND_POLICY_BALANCE_XOR = 4,
-
-	/**
-	 * Balances flows among all paths according to path performance
-	 */
-	ZT_BOND_POLICY_BALANCE_AWARE = 5
-};
-
-/**
- * Multipath active re-selection policy (linkSelectMethod)
- */
-enum ZT_BondLinkSelectMethod {
-	/**
-	 * Primary link regains status as active link whenever it comes back up
-	 * (default when links are explicitly specified)
-	 */
-	ZT_BOND_RESELECTION_POLICY_ALWAYS = 0,
-
-	/**
-	 * Primary link regains status as active link when it comes back up and
-	 * (if) it is better than the currently-active link.
-	 */
-	ZT_BOND_RESELECTION_POLICY_BETTER = 1,
-
-	/**
-	 * Primary link regains status as active link only if the currently-active
-	 * link fails.
-	 */
-	ZT_BOND_RESELECTION_POLICY_FAILURE = 2,
-
-	/**
-	 * The primary link can change if a superior path is detected.
-	 * (default if user provides no fail-over guidance)
-	 */
-	ZT_BOND_RESELECTION_POLICY_OPTIMIZE = 3
-};
-
-/**
- * Mode of multipath link interface
- */
-enum ZT_BondLinkMode { ZT_BOND_SLAVE_MODE_PRIMARY = 0, ZT_BOND_SLAVE_MODE_SPARE = 1 };
-
-#include "../node/AtomicCounter.hpp"
-#include "../node/SharedPtr.hpp"
-
-#include <string>
-
-namespace ZeroTier {
-
-class Link {
-	friend class SharedPtr<Link>;
-
-  public:
-	/**
-	 *
-	 * @param ifnameStr
-	 * @param ipvPref
-	 * @param capacity
-	 * @param enabled
-	 * @param mode
-	 * @param failoverToLinkStr
-	 */
-	Link(std::string ifnameStr, uint8_t ipvPref, uint16_t mtu, uint32_t capacity, bool enabled, uint8_t mode, std::string failoverToLinkStr)
-		: _ifnameStr(ifnameStr)
-		, _ipvPref(ipvPref)
-		, _mtu(mtu)
-		, _capacity(capacity)
-		, _relativeCapacity(0.0)
-		, _enabled(enabled)
-		, _mode(mode)
-		, _failoverToLinkStr(failoverToLinkStr)
-		, _isUserSpecified(false)
-	{
-	}
-
-	/**
-	 * @return The string representation of this link's underlying interface's system name.
-	 */
-	inline std::string ifname()
-	{
-		return _ifnameStr;
-	}
-
-	/**
-	 * @return Whether this link is designated as a primary.
-	 */
-	inline bool primary()
-	{
-		return _mode == ZT_BOND_SLAVE_MODE_PRIMARY;
-	}
-
-	/**
-	 * @return Whether this link is designated as a spare.
-	 */
-	inline bool spare()
-	{
-		return _mode == ZT_BOND_SLAVE_MODE_SPARE;
-	}
-
-	/**
-	 * @return The name of the link interface that should be used in the event of a failure.
-	 */
-	inline std::string failoverToLink()
-	{
-		return _failoverToLinkStr;
-	}
-
-	/**
-	 * @return Whether this link interface was specified by the user or auto-detected.
-	 */
-	inline bool isUserSpecified()
-	{
-		return _isUserSpecified;
-	}
-
-	/**
-	 * Signify that this link was specified by the user and not the result of auto-detection.
-	 *
-	 * @param isUserSpecified
-	 */
-	inline void setAsUserSpecified(bool isUserSpecified)
-	{
-		_isUserSpecified = isUserSpecified;
-	}
-
-	/**
-	 * @return Whether or not the user has specified failover instructions.
-	 */
-	inline bool userHasSpecifiedFailoverInstructions()
-	{
-		return _failoverToLinkStr.length();
-	}
-
-	/**
-	 * @return The capacity of the link relative to others in the bond.
-	 */
-	inline float relativeCapacity()
-	{
-		return _relativeCapacity;
-	}
-
-	/**
-	 * Sets the capacity of the link relative to others in the bond.
-	 *
-	 * @param relativeCapacity The capacity relative to the rest of the link.
-	 */
-	inline void setRelativeCapacity(float relativeCapacity)
-	{
-		_relativeCapacity = relativeCapacity;
-	}
-
-	/**
-	 * @return The absolute capacity of the link (as specified by the user.)
-	 */
-	inline uint32_t capacity()
-	{
-		return _capacity;
-	}
-
-	/**
-	 * @return The address preference for this link (as specified by the user.)
-	 */
-	inline uint8_t ipvPref()
-	{
-		return _ipvPref;
-	}
-
-	/**
-	 * @return The MTU for this link (as specified by the user.)
-	 */
-	inline uint16_t mtu()
-	{
-		return _mtu;
-	}
-
-	/**
-	 * @return The mode (e.g. primary/spare) for this link (as specified by the user.)
-	 */
-	inline uint8_t mode()
-	{
-		return _mode;
-	}
-
-	/**
-	 * @return Whether this link is enabled or disabled
-	 */
-	inline uint8_t enabled()
-	{
-		return _enabled;
-	}
-
-  private:
-	/**
-	 * String representation of underlying interface's system name
-	 */
-	std::string _ifnameStr;
-
-	/**
-	 * What preference (if any) a user has for IP protocol version used in
-	 * path aggregations. Preference is expressed in the order of the digits:
-	 *
-	 *  0: no preference
-	 *  4: IPv4 only
-	 *  6: IPv6 only
-	 * 46: IPv4 over IPv6
-	 * 64: IPv6 over IPv4
-	 */
-	uint8_t _ipvPref;
-
-	/**
-	 * The physical-layer MTU for this link
-	 */
-	uint16_t _mtu;
-
-	/**
-	 * User-specified capacity of this link
-	 */
-	uint32_t _capacity;
-
-	/**
-	 * Speed relative to other specified links (computed by Bond)
-	 */
-	float _relativeCapacity;
-
-	/**
-	 * Whether this link is enabled, or (disabled (possibly bad config))
-	 */
-	uint8_t _enabled;
-
-	/**
-	 * Whether this link is designated as a primary, a spare, or no preference.
-	 */
-	uint8_t _mode;
-
-	/**
-	 * The specific name of the link to be used in the event that this
-	 * link fails.
-	 */
-	std::string _failoverToLinkStr;
-
-	/**
-	 * Whether or not this link was created as a result of manual user specification. This is
-	 * important to know because certain policy decisions are dependent on whether the user
-	 * intents to use a specific set of interfaces.
-	 */
-	bool _isUserSpecified;
-
-	AtomicCounter __refCount;
-};
-
-class Link;
-class Peer;
-
-class Bond {
-  public:
-	/**
-	 * Stop bond's internal functions (can be resumed)
-	 */
-	void stopBond();
-
-	/**
-	 * Start or resume a bond's internal functions
-	 */
-	void startBond();
-
-	/**
-	 * @return Whether this link is permitted to become a member of a bond.
-	 */
-	static bool linkAllowed(std::string& policyAlias, SharedPtr<Link> link);
-
-	/**
-	 * @return The minimum interval required to poll the active bonds to fulfill all active monitoring timing requirements.
-	 */
-	static int minReqMonitorInterval()
-	{
-		return _minReqMonitorInterval;
-	}
-
-	/**
-	 * @return Whether the bonding layer is currently set up to be used.
-	 */
-	static bool inUse()
-	{
-		return ! _bondPolicyTemplates.empty() || _defaultPolicy;
-	}
-
-	/**
-	 * Sets a pointer to an instance of _binder used by the Bond to get interface data
-	 */
-	static void setBinder(Binder* b)
-	{
-		_binder = b;
-	}
-
-	/**
-	 * @param basePolicyName Bonding policy name (See ZeroTierOne.h)
-	 * @return The bonding policy code for a given human-readable bonding policy name
-	 */
-	static int getPolicyCodeByStr(const std::string& basePolicyName)
-	{
-		if (basePolicyName == "active-backup") {
-			return 1;
-		}
-		if (basePolicyName == "broadcast") {
-			return 2;
-		}
-		if (basePolicyName == "balance-rr") {
-			return 3;
-		}
-		if (basePolicyName == "balance-xor") {
-			return 4;
-		}
-		if (basePolicyName == "balance-aware") {
-			return 5;
-		}
-		return 0;	// "none"
-	}
-
-	/**
-	 * @param policy Bonding policy code (See ZeroTierOne.h)
-	 * @return The human-readable name for the given bonding policy code
-	 */
-	static std::string getPolicyStrByCode(int policy)
-	{
-		if (policy == 1) {
-			return "active-backup";
-		}
-		if (policy == 2) {
-			return "broadcast";
-		}
-		if (policy == 3) {
-			return "balance-rr";
-		}
-		if (policy == 4) {
-			return "balance-xor";
-		}
-		if (policy == 5) {
-			return "balance-aware";
-		}
-		return "none";
-	}
-
-	/**
-	 * Sets the default bonding policy for new or undefined bonds.
-	 *
-	 * @param bp Bonding policy
-	 */
-	static void setBondingLayerDefaultPolicy(uint8_t bp)
-	{
-		_defaultPolicy = bp;
-	}
-
-	/**
-	 * Sets the default (custom) bonding policy for new or undefined bonds.
-	 *
-	 * @param alias Human-readable string alias for bonding policy
-	 */
-	static void setBondingLayerDefaultPolicyStr(std::string alias)
-	{
-		_defaultPolicyStr = alias;
-	}
-
-	/**
-	 * Add a user-defined link to a given bonding policy.
-	 *
-	 * @param policyAlias User-defined custom name for variant of bonding policy
-	 * @param link Pointer to new link definition
-	 */
-	static void addCustomLink(std::string& policyAlias, SharedPtr<Link> link);
-
-	/**
-	 * Add a user-defined bonding policy that is based on one of the standard types.
-	 *
-	 * @param newBond Pointer to custom Bond object
-	 * @return Whether a uniquely-named custom policy was successfully added
-	 */
-	static bool addCustomPolicy(const SharedPtr<Bond>& newBond);
-
-	/**
-	 * Assigns a specific bonding policy
-	 *
-	 * @param identity
-	 * @param policyAlias
-	 * @return
-	 */
-	static bool assignBondingPolicyToPeer(int64_t identity, const std::string& policyAlias);
-
-	/**
-	 * Get pointer to bond by a given peer ID
-	 *
-	 * @param peer Remote peer ID
-	 * @return A pointer to the Bond
-	 */
-	static SharedPtr<Bond> getBondByPeerId(int64_t identity);
-
-	/**
-	 * Set MTU for link by given interface name and IP address (across all bonds)
-	 *
-	 * @param mtu MTU to be used on this link
-	 * @param ifStr interface name to match
-	 * @param ipStr IP address to match
-	 * @return Whether the MTU was set
-	 */
-	static bool setAllMtuByTuple(uint16_t mtu, const std::string& ifStr, const std::string& ipStr);
-
-	/**
-	 * Set MTU for link by given interface name and IP address
-	 *
-	 * @param mtu MTU to be used on this link
-	 * @param ifStr interface name to match
-	 * @param ipStr IP address to match
-	 * @return Whether the MTU was set
-	 */
-	bool setMtuByTuple(uint16_t mtu, const std::string& ifStr, const std::string& ipStr);
-
-	/**
-	 * Add a new bond to the bond controller.
-	 *
-	 * @param renv Runtime environment
-	 * @param peer Remote peer that this bond services
-	 * @return A pointer to the newly created Bond
-	 */
-	static SharedPtr<Bond> createBond(const RuntimeEnvironment* renv, const SharedPtr<Peer>& peer);
-
-	/**
-	 * Remove a bond from the bond controller.
-	 *
-	 * @param peerId Remote peer that this bond services
-	 */
-	static void destroyBond(uint64_t peerId);
-
-	/**
-	 * Periodically perform maintenance tasks for the bonding layer.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param now Current time
-	 */
-	static void processBackgroundTasks(void* tPtr, int64_t now);
-
-	/**
-	 * Gets a reference to a physical link definition given a policy alias and a local socket.
-	 *
-	 * @param policyAlias Policy in use
-	 * @param localSocket Local source socket
-	 * @param createIfNeeded Whether a Link object is created if the name wasn't previously in the link map
-	 * @return Physical link definition
-	 */
-	SharedPtr<Link> getLinkBySocket(const std::string& policyAlias, uint64_t localSocket, bool createIfNeeded);
-
-	/**
-	 * Gets a reference to a physical link definition given its human-readable system name.
-	 *
-	 * @param policyAlias Policy in use
-	 * @param ifname Alphanumeric human-readable name
-	 * @return Physical link definition
-	 */
-	static SharedPtr<Link> getLinkByName(const std::string& policyAlias, const std::string& ifname);
-
-  private:
-	static Phy<Bond*>* _phy;
-
-	static Mutex _bonds_m;
-	static Mutex _links_m;
-
-	/**
-	 * The minimum required monitoring interval among all bonds
-	 */
-	static int _minReqMonitorInterval;
-
-	/**
-	 * The default bonding policy used for new bonds unless otherwise specified.
-	 */
-	static uint8_t _defaultPolicy;
-
-	/**
-	 * The default bonding policy used for new bonds unless otherwise specified.
-	 */
-	static std::string _defaultPolicyStr;
-
-	/**
-	 * All currently active bonds.
-	 */
-	static std::map<int64_t, SharedPtr<Bond> > _bonds;
-
-	/**
-	 * Map of peers to custom bonding policies
-	 */
-	static std::map<int64_t, std::string> _policyTemplateAssignments;
-
-	/**
-	 * User-defined bonding policies (can be assigned to a peer)
-	 */
-	static std::map<std::string, SharedPtr<Bond> > _bondPolicyTemplates;
-
-	/**
-	 * Set of links defined for a given bonding policy
-	 */
-	static std::map<std::string, std::vector<SharedPtr<Link> > > _linkDefinitions;
-
-	/**
-	 * Set of link objects mapped to their physical interfaces
-	 */
-	static std::map<std::string, std::map<std::string, SharedPtr<Link> > > _interfaceToLinkMap;
-
-	struct NominatedPath;
-	struct Flow;
-
-	friend class SharedPtr<Bond>;
-	friend class Peer;
-
-  public:
-	void dumpInfo(int64_t now, bool force);
-	std::string pathToStr(const SharedPtr<Path>& path);
-	void dumpPathStatus(int64_t now, int pathIdx);
-
-	SharedPtr<Link> getLink(const SharedPtr<Path>& path);
-
-	/**
-	 * Constructor
-	 *
-	 *
-	 */
-	Bond(const RuntimeEnvironment* renv);
-
-	/**
-	 * Constructor. Creates a bond based off of ZT defaults
-	 *
-	 * @param renv Runtime environment
-	 * @param policy Bonding policy
-	 * @param peer
-	 */
-	Bond(const RuntimeEnvironment* renv, int policy, const SharedPtr<Peer>& peer);
-
-	/**
-	 * Constructor. For use when user intends to manually specify parameters
-	 *
-	 * @param basePolicy
-	 * @param policyAlias
-	 * @param peer
-	 */
-	Bond(const RuntimeEnvironment* renv, std::string& basePolicy, std::string& policyAlias, const SharedPtr<Peer>& peer);
-
-	/**
-	 * Constructor. Creates a bond based off of a user-defined bond template
-	 *
-	 * @param renv Runtime environment
-	 * @param original
-	 * @param peer
-	 */
-	Bond(const RuntimeEnvironment* renv, SharedPtr<Bond> originalBond, const SharedPtr<Peer>& peer);
-
-	/**
-	 * @return The human-readable name of the bonding policy
-	 */
-	std::string policyAlias()
-	{
-		return _policyAlias;
-	}
-
-	/**
-	 * Return whether this bond is able to properly process traffic
-	 */
-	bool isReady()
-	{
-		return _numBondedPaths;
-	}
-
-	/**
-	 * Inform the bond about the path that its peer (owning object) just learned about.
-	 * If the path is allowed to be used, it will be inducted into the bond on a trial
-	 * period where link statistics will be collected to judge its quality.
-	 *
-	 * @param path Newly-learned Path which should now be handled by the Bond
-	 * @param now Current time
-	 */
-	void nominatePathToBond(const SharedPtr<Path>& path, int64_t now);
-
-	/**
-	 * Add a nominated path to the bond. This merely maps the index from the nominated set
-	 * to a smaller set and sets the path's bonded flag to true.
-	 *
-	 * @param nominatedIdx The index in the nominated set
-	 * @param bondedIdx The index in the bonded set (subset of nominated)
-	 */
-	void addPathToBond(int nominatedIdx, int bondedIdx);
-
-	/**
-	 * Check path states and perform bond rebuilds if needed.
-	 *
-	 * @param now Current time
-	 * @param rebuild Whether or not the bond should be reconstructed.
-	 */
-	void curateBond(int64_t now, bool rebuild);
-
-	/**
-	 * Periodically perform statistical summaries of quality metrics for all paths.
-	 *
-	 * @param now Current time
-	 */
-	void estimatePathQuality(int64_t now);
-
-	/**
-	 * Record an invalid incoming packet. This packet failed
-	 * MAC/compression/cipher checks and will now contribute to a
-	 * Packet Error Ratio (PER).
-	 *
-	 * @param path Path over which packet was received
-	 */
-	void recordIncomingInvalidPacket(const SharedPtr<Path>& path);
-
-	/**
-	 * Record statistics on outbound an packet.
-	 *
-	 * @param path Path over which packet is being sent
-	 * @param packetId Packet ID
-	 * @param payloadLength Packet data length
-	 * @param verb Packet verb
-	 * @param flowId Flow ID
-	 * @param now Current time
-	 */
-	void recordOutgoingPacket(const SharedPtr<Path>& path, uint64_t packetId, uint16_t payloadLength, Packet::Verb verb, int32_t flowId, int64_t now);
-
-	/**
-	 * Process the contents of an inbound VERB_QOS_MEASUREMENT to gather path quality observations.
-	 *
-	 * @param now Current time
-	 * @param count Number of records
-	 * @param rx_id table of packet IDs
-	 * @param rx_ts table of holding times
-	 */
-	void receivedQoS(const SharedPtr<Path>& path, int64_t now, int count, uint64_t* rx_id, uint16_t* rx_ts);
-
-	/**
-	 * Process the contents of an inbound VERB_ACK to gather path quality observations.
-	 *
-	 * @param pathIdx Path over which packet was received
-	 * @param now Current time
-	 * @param ackedBytes Number of bytes ACKed by this VERB_ACK
-	 */
-	void receivedAck(int pathIdx, int64_t now, int32_t ackedBytes);
-
-	/**
-	 * Generate the contents of a VERB_QOS_MEASUREMENT packet.
-	 *
-	 * @param now Current time
-	 * @param qosBuffer destination buffer
-	 * @return Size of payload
-	 */
-	int32_t generateQoSPacket(int pathIdx, int64_t now, char* qosBuffer);
-
-	/**
-	 * Record statistics for an inbound packet.
-	 *
-	 * @param path Path over which packet was received
-	 * @param packetId Packet ID
-	 * @param payloadLength Packet data length
-	 * @param verb Packet verb
-	 * @param flowId Flow ID
-	 * @param now Current time
-	 */
-	void recordIncomingPacket(const SharedPtr<Path>& path, uint64_t packetId, uint16_t payloadLength, Packet::Verb verb, int32_t flowId, int64_t now);
-
-	/**
-	 * Determines the most appropriate path for packet and flow egress. This decision is made by
-	 * the underlying bonding policy as well as QoS-related statistical observations of path quality.
-	 *
-	 * @param now Current time
-	 * @param flowId Flow ID
-	 * @return Pointer to suggested Path
-	 */
-	SharedPtr<Path> getAppropriatePath(int64_t now, int32_t flowId);
-
-	/**
-	 * Creates a new flow record
-	 *
-	 * @param np Path over which flow shall be handled
-	 * @param flowId Flow ID
-	 * @param entropy A byte of entropy to be used by the bonding algorithm
-	 * @param now Current time
-	 * @return Pointer to newly-created Flow
-	 */
-	SharedPtr<Flow> createFlow(int pathIdx, int32_t flowId, unsigned char entropy, int64_t now);
-
-	/**
-	 * Removes flow records that are past a certain age limit.
-	 *
-	 * @param age Age threshold to be forgotten
-	 * @param oldest Whether only the oldest shall be forgotten
-	 * @param now Current time
-	 */
-	void forgetFlowsWhenNecessary(uint64_t age, bool oldest, int64_t now);
-
-	/**
-	 * Assigns a new flow to a bonded path
-	 *
-	 * @param flow Flow to be assigned
-	 * @param now Current time
-	 * @param reassign Whether this flow is being re-assigned to another path
-	 */
-	bool assignFlowToBondedPath(SharedPtr<Flow>& flow, int64_t now, bool reassign);
-
-	/**
-	 * Determine whether a path change should occur given the remote peer's reported utility and our
-	 * local peer's known utility. This has the effect of assigning inbound and outbound traffic to
-	 * the same path.
-	 *
-	 * @param now Current time
-	 * @param path Path over which the negotiation request was received
-	 * @param remoteUtility How much utility the remote peer claims to gain by using the declared path
-	 */
-	void processIncomingPathNegotiationRequest(uint64_t now, SharedPtr<Path>& path, int16_t remoteUtility);
-
-	/**
-	 * Determine state of path synchronization and whether a negotiation request
-	 * shall be sent to the peer.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param now Current time
-	 */
-	void pathNegotiationCheck(void* tPtr, int64_t now);
-
-	/**
-	 * Sends a VERB_ACK to the remote peer.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param path Path over which packet should be sent
-	 * @param localSocket Local source socket
-	 * @param atAddress
-	 * @param now Current time
-	 */
-	void sendACK(void* tPtr, int pathIdx, int64_t localSocket, const InetAddress& atAddress, int64_t now);
-
-	/**
-	 * Sends a VERB_QOS_MEASUREMENT to the remote peer.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param path Path over which packet should be sent
-	 * @param localSocket Local source socket
-	 * @param atAddress
-	 * @param now Current time
-	 */
-	void sendQOS_MEASUREMENT(void* tPtr, int pathIdx, int64_t localSocket, const InetAddress& atAddress, int64_t now);
-
-	/**
-	 * Sends a VERB_PATH_NEGOTIATION_REQUEST to the remote peer.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param path Path over which packet should be sent
-	 */
-	void sendPATH_NEGOTIATION_REQUEST(void* tPtr, int pathIdx);
-
-	/**
-	 *
-	 * @param now Current time
-	 */
-	void processBalanceTasks(int64_t now);
-
-	/**
-	 * Perform periodic tasks unique to active-backup
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param now Current time
-	 */
-	void processActiveBackupTasks(void* tPtr, int64_t now);
-
-	/**
-	 * Switches the active link in an active-backup scenario to the next best during
-	 * a failover event.
-	 *
-	 * @param now Current time
-	 */
-	void dequeueNextActiveBackupPath(uint64_t now);
-
-	/**
-	 * Zero all timers
-	 */
-	void initTimers();
-
-	/**
-	 * Set bond parameters to reasonable defaults, these may later be overwritten by
-	 * user-specified parameters.
-	 *
-	 * @param policy Bonding policy
-	 * @param templateBond
-	 */
-	void setBondParameters(int policy, SharedPtr<Bond> templateBond, bool useTemplate);
-
-	/**
-	 * Check and assign user-specified link quality parameters to this bond.
-	 *
-	 * @param weights Set of user-specified parameters
-	 * @param len Length of parameter vector
-	 */
-	void setUserLinkQualitySpec(float weights[], int len);
-
-	/**
-	 * @return Whether the user has defined links for use on this bond
-	 */
-	inline bool userHasSpecifiedLinks()
-	{
-		return _userHasSpecifiedLinks;
-	}
-
-	/**
-	 * @return Whether the user has defined a set of failover link(s) for this bond
-	 */
-	inline bool userHasSpecifiedFailoverInstructions()
-	{
-		return _userHasSpecifiedFailoverInstructions;
-	};
-
-	/**
-	 * @return Whether the user has specified a primary link
-	 */
-	inline bool userHasSpecifiedPrimaryLink()
-	{
-		return _userHasSpecifiedPrimaryLink;
-	}
-
-	/**
-	 * @return Whether the user has specified link capacities
-	 */
-	inline bool userHasSpecifiedLinkCapacities()
-	{
-		return _userHasSpecifiedLinkCapacities;
-	}
-
-	/**
-	 * Periodically perform maintenance tasks for each active bond.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param now Current time
-	 */
-	void processBackgroundBondTasks(void* tPtr, int64_t now);
-
-	/**
-	 * Rate limit gate for VERB_ACK
-	 *
-	 * @param now Current time
-	 * @return Whether the incoming packet should be rate-gated
-	 */
-	inline bool rateGateACK(const int64_t now)
-	{
-		_ackCutoffCount++;
-		int numToDrain = _lastAckRateCheck ? (now - _lastAckRateCheck) / ZT_ACK_DRAINAGE_DIVISOR : _ackCutoffCount;
-		_lastAckRateCheck = now;
-		if (_ackCutoffCount > numToDrain) {
-			_ackCutoffCount -= numToDrain;
-		}
-		else {
-			_ackCutoffCount = 0;
-		}
-		return (_ackCutoffCount < ZT_ACK_CUTOFF_LIMIT);
-	}
-
-	/**
-	 * Rate limit gate for VERB_QOS_MEASUREMENT
-	 *
-	 * @param now Current time
-	 * @return Whether the incoming packet should be rate-gated
-	 */
-	inline bool rateGateQoS(int64_t now, SharedPtr<Path>& path)
-	{
-		char pathStr[64] = { 0 };
-		path->address().toString(pathStr);
-		uint64_t diff = now - _lastQoSRateCheck;
-		if ((diff) <= (_qosSendInterval / ZT_MAX_PEER_NETWORK_PATHS)) {
-			++_qosCutoffCount;
-		}
-		else {
-			_qosCutoffCount = 0;
-		}
-		_lastQoSRateCheck = now;
-		return (_qosCutoffCount < (ZT_MAX_PEER_NETWORK_PATHS * 2));
-	}
-
-	/**
-	 * Rate limit gate for VERB_PATH_NEGOTIATION_REQUEST
-	 *
-	 * @param now Current time
-	 * @return Whether the incoming packet should be rate-gated
-	 */
-	inline bool rateGatePathNegotiation(int64_t now, SharedPtr<Path>& path)
-	{
-		char pathStr[64] = { 0 };
-		path->address().toString(pathStr);
-		int diff = now - _lastPathNegotiationReceived;
-		if ((diff) <= (ZT_PATH_NEGOTIATION_CUTOFF_TIME / ZT_MAX_PEER_NETWORK_PATHS)) {
-			++_pathNegotiationCutoffCount;
-		}
-		else {
-			_pathNegotiationCutoffCount = 0;
-		}
-		_lastPathNegotiationReceived = now;
-		return (_pathNegotiationCutoffCount < (ZT_MAX_PEER_NETWORK_PATHS * 2));
-	}
-
-	/**
-	 * @param interval Maximum amount of time user expects a failover to take on this bond.
-	 */
-	inline void setFailoverInterval(uint32_t interval)
-	{
-		_failoverInterval = interval;
-	}
-
-	/**
-	 * @param interval Maximum amount of time user expects a failover to take on this bond.
-	 */
-	inline uint32_t getFailoverInterval()
-	{
-		return _failoverInterval;
-	}
-
-	/**
-	 * @param strategy Strategy that the bond uses to prob for path aliveness and quality
-	 */
-	inline void setLinkMonitorStrategy(uint8_t strategy)
-	{
-		_linkMonitorStrategy = strategy;
-	}
-
-	/**
-	 * @return the current up delay parameter
-	 */
-	inline uint16_t getUpDelay()
-	{
-		return _upDelay;
-	}
-
-	/**
-	 * @param upDelay Length of time before a newly-discovered path is admitted to the bond
-	 */
-	inline void setUpDelay(int upDelay)
-	{
-		if (upDelay >= 0) {
-			_upDelay = upDelay;
-		}
-	}
-
-	/**
-	 * @return Length of time before a newly-failed path is removed from the bond
-	 */
-	inline uint16_t getDownDelay()
-	{
-		return _downDelay;
-	}
-
-	/**
-	 * @param downDelay Length of time before a newly-failed path is removed from the bond
-	 */
-	inline void setDownDelay(int downDelay)
-	{
-		if (downDelay >= 0) {
-			_downDelay = downDelay;
-		}
-	}
-
-	/**
-	 * @return The current monitoring interval for the bond
-	 */
-	inline int monitorInterval()
-	{
-		return _monitorInterval;
-	}
-
-	/**
-	 * Set the current monitoring interval for the bond (can be overridden with intervals specific to certain links.)
-	 *
-	 * @param monitorInterval How often gratuitous VERB_HELLO(s) are sent to remote peer.
-	 */
-	inline void setBondMonitorInterval(uint16_t interval)
-	{
-		_monitorInterval = interval;
-	}
-
-	/**
-	 * @param policy Bonding policy for this bond
-	 */
-
-	inline void setPolicy(uint8_t policy)
-	{
-		_policy = policy;
-	}
-
-	/**
-	 * @return the current bonding policy
-	 */
-	inline uint8_t policy()
-	{
-		return _policy;
-	}
-
-	/**
-	 * @return the number of links in this bond which are considered alive
-	 */
-	inline uint8_t getNumAliveLinks()
-	{
-		return _numAliveLinks;
-	};
-
-	/**
-	 * @return the number of links in this bond
-	 */
-	inline uint8_t getNumTotalLinks()
-	{
-		return _numTotalLinks;
-	}
-
-	/**
-	 * @return Whether flow-hashing is currently supported for this bond.
-	 */
-	bool flowHashingSupported()
-	{
-		return _policy == ZT_BOND_POLICY_BALANCE_XOR || _policy == ZT_BOND_POLICY_BALANCE_AWARE;
-	}
-
-	/**
-	 *
-	 * @param packetsPerLink
-	 */
-	inline void setPacketsPerLink(int packetsPerLink)
-	{
-		_packetsPerLink = packetsPerLink;
-	}
-
-	/**
-	 * @return Number of packets to be sent on each interface in a balance-rr bond
-	 */
-	inline int getPacketsPerLink()
-	{
-		return _packetsPerLink;
-	}
-
-	/**
-	 *
-	 * @param linkSelectMethod
-	 */
-	inline void setLinkSelectMethod(uint8_t method)
-	{
-		_abLinkSelectMethod = method;
-	}
-
-	/**
-	 *
-	 * @return
-	 */
-	inline uint8_t getLinkSelectMethod()
-	{
-		return _abLinkSelectMethod;
-	}
-
-	/**
-	 *
-	 * @param allowPathNegotiation
-	 */
-	inline void setAllowPathNegotiation(bool allowPathNegotiation)
-	{
-		_allowPathNegotiation = allowPathNegotiation;
-	}
-
-	/**
-	 *
-	 * @return
-	 */
-	inline bool allowPathNegotiation()
-	{
-		return _allowPathNegotiation;
-	}
-
-	/**
-	 * Forcibly rotates the currently active link used in an active-backup bond to the next link in the failover queue
-	 *
-	 * @return True if this operation succeeded, false if otherwise
-	 */
-	bool abForciblyRotateLink();
-
-	/**
-	 * Emit message to tracing system but with added timestamp and subsystem info
-	 */
-	void log(const char* fmt, ...)
-#ifdef __GNUC__
-		__attribute__((format(printf, 2, 3)))
-#endif
-	{
-		// if (_peerId != 0x0 && _peerId != 0x0) { return; }
-#ifdef ZT_TRACE
-		time_t rawtime;
-		struct tm* timeinfo;
-		char timestamp[80];
-		time(&rawtime);
-		timeinfo = localtime(&rawtime);
-		strftime(timestamp, 80, "%F %T", timeinfo);
-#define MAX_BOND_MSG_LEN 1024
-		char traceMsg[MAX_BOND_MSG_LEN];
-		char userMsg[MAX_BOND_MSG_LEN];
-		va_list args;
-		va_start(args, fmt);
-		if (vsnprintf(userMsg, sizeof(userMsg), fmt, args) < 0) {
-			fprintf(stderr, "Encountered format encoding error while writing to trace log\n");
-			return;
-		}
-		snprintf(traceMsg, MAX_BOND_MSG_LEN, "%s (%llx/%s) %s", timestamp, _peerId, _policyAlias.c_str(), userMsg);
-		va_end(args);
-		RR->t->bondStateMessage(NULL, traceMsg);
-#undef MAX_MSG_LEN
-#endif
-	}
-
-	/**
-	 * Emit message to tracing system but with added timestamp and subsystem info
-	 */
-	void debug(const char* fmt, ...)
-#ifdef __GNUC__
-		__attribute__((format(printf, 2, 3)))
-#endif
-	{
-		// if (_peerId != 0x0 && _peerId != 0x0) { return; }
-#ifdef ZT_DEBUG
-		time_t rawtime;
-		struct tm* timeinfo;
-		char timestamp[80];
-		time(&rawtime);
-		timeinfo = localtime(&rawtime);
-		strftime(timestamp, 80, "%F %T", timeinfo);
-#define MAX_BOND_MSG_LEN 1024
-		char traceMsg[MAX_BOND_MSG_LEN];
-		char userMsg[MAX_BOND_MSG_LEN];
-		va_list args;
-		va_start(args, fmt);
-		if (vsnprintf(userMsg, sizeof(userMsg), fmt, args) < 0) {
-			fprintf(stderr, "Encountered format encoding error while writing to trace log\n");
-			return;
-		}
-		snprintf(traceMsg, MAX_BOND_MSG_LEN, "%s (%llx/%s) %s", timestamp, _peerId, _policyAlias.c_str(), userMsg);
-		va_end(args);
-		RR->t->bondStateMessage(NULL, traceMsg);
-#undef MAX_MSG_LEN
-#endif
-	}
-
-  private:
-	struct NominatedPath {
-		NominatedPath()
-			: lastAckSent(0)
-			, lastAckReceived(0)
-			, lastQoSReceived(0)
-			, unackedBytes(0)
-			, packetsReceivedSinceLastAck(0)
-			, lastQoSMeasurement(0)
-			, lastThroughputEstimation(0)
-			, lastRefractoryUpdate(0)
-			, lastAliveToggle(0)
-			, alive(false)
-			, eligible(true)
-			, lastEligibility(0)
-			, whenNominated(0)
-			, refractoryPeriod(0)
-			, ipvPref(0)
-			, mode(0)
-			, onlyPathOnLink(false)
-			, bonded(false)
-			, negotiated(false)
-			, shouldAvoid(false)
-			, assignedFlowCount(0)
-			, latency(0)
-			, latencyVariance(0)
-			, packetLossRatio(0)
-			, packetErrorRatio(0)
-			, relativeQuality(0)
-			, relativeLinkCapacity(0)
-			, failoverScore(0)
-			, packetsReceivedSinceLastQoS(0)
-			, packetsIn(0)
-			, packetsOut(0)
-			, localPort(0)
-		{
-		}
-
-		/**
-		 * Set or update a refractory period for the path.
-		 *
-		 * @param punishment How much a path should be punished
-		 * @param pathFailure Whether this call is the result of a recent path failure
-		 */
-		inline void adjustRefractoryPeriod(int64_t now, uint32_t punishment, bool pathFailure)
-		{
-			if (pathFailure) {
-				unsigned int suggestedRefractoryPeriod = refractoryPeriod ? punishment + (refractoryPeriod * 2) : punishment;
-				refractoryPeriod = std::min(suggestedRefractoryPeriod, (unsigned int)ZT_BOND_MAX_REFRACTORY_PERIOD);
-				lastRefractoryUpdate = 0;
-			}
-			else {
-				uint32_t drainRefractory = 0;
-				if (lastRefractoryUpdate) {
-					drainRefractory = (now - lastRefractoryUpdate);
-				}
-				else {
-					drainRefractory = (now - lastAliveToggle);
-				}
-				lastRefractoryUpdate = now;
-				if (refractoryPeriod > drainRefractory) {
-					refractoryPeriod -= drainRefractory;
-				}
-				else {
-					refractoryPeriod = 0;
-					lastRefractoryUpdate = 0;
-				}
-			}
-		}
-
-		/**
-		 * @return True if a path is permitted to be used in a bond (according to user pref.)
-		 */
-		inline bool allowed()
-		{
-			return (! ipvPref || ((p->_addr.isV4() && (ipvPref == 4 || ipvPref == 46 || ipvPref == 64)) || ((p->_addr.isV6() && (ipvPref == 6 || ipvPref == 46 || ipvPref == 64)))));
-		}
-
-		/**
-		 * @return True if a path exists on a link marked as a spare
-		 */
-		inline bool isSpare()
-		{
-			return mode == ZT_BOND_SLAVE_MODE_SPARE;
-		}
-
-		/**
-		 * @return True if a path is preferred over another on the same physical link (according to user pref.)
-		 */
-		inline bool preferred()
-		{
-			return onlyPathOnLink || (p->_addr.isV4() && (ipvPref == 4 || ipvPref == 46)) || (p->_addr.isV6() && (ipvPref == 6 || ipvPref == 64));
-		}
-
-		/**
-		 * @param now Current time
-		 * @return Whether a QoS (VERB_QOS_MEASUREMENT) packet needs to be emitted at this time
-		 */
-		inline bool needsToSendQoS(int64_t now, uint64_t qosSendInterval)
-		{
-			return ((packetsReceivedSinceLastQoS >= ZT_QOS_TABLE_SIZE) || ((now - lastQoSMeasurement) > qosSendInterval)) && packetsReceivedSinceLastQoS;
-		}
-
-		/**
-		 * @param now Current time
-		 * @return Whether an ACK (VERB_ACK) packet needs to be emitted at this time
-		 */
-		inline bool needsToSendAck(int64_t now, uint64_t ackSendInterval)
-		{
-			return ((now - lastAckSent) >= ackSendInterval || (packetsReceivedSinceLastAck == ZT_QOS_TABLE_SIZE)) && packetsReceivedSinceLastAck;
-		}
-
-		/**
-		 * Reset packet counters
-		 */
-		inline void resetPacketCounts()
-		{
-			packetsIn = 0;
-			packetsOut = 0;
-		}
-
-		std::map<uint64_t, uint64_t> qosStatsOut;	// id:egress_time
-		std::map<uint64_t, uint64_t> qosStatsIn;	// id:now
-		std::map<uint64_t, uint64_t> ackStatsIn;	// id:now
-
-		RingBuffer<int, ZT_QOS_SHORTTERM_SAMPLE_WIN_SIZE> qosRecordSize;
-		RingBuffer<float, ZT_QOS_SHORTTERM_SAMPLE_WIN_SIZE> qosRecordLossSamples;
-		RingBuffer<uint64_t, ZT_QOS_SHORTTERM_SAMPLE_WIN_SIZE> throughputSamples;
-		RingBuffer<bool, ZT_QOS_SHORTTERM_SAMPLE_WIN_SIZE> packetValiditySamples;
-		RingBuffer<float, ZT_QOS_SHORTTERM_SAMPLE_WIN_SIZE> throughputVarianceSamples;
-		RingBuffer<uint16_t, ZT_QOS_SHORTTERM_SAMPLE_WIN_SIZE> latencySamples;
-
-		uint64_t lastAckSent;
-		uint64_t lastAckReceived;
-		uint64_t lastQoSReceived;
-		uint64_t unackedBytes;
-		uint64_t packetsReceivedSinceLastAck;
-
-		uint64_t lastQoSMeasurement;		 // Last time that a VERB_QOS_MEASUREMENT was sent out on this path.
-		uint64_t lastThroughputEstimation;	 // Last time that the path's throughput was estimated.
-		uint64_t lastRefractoryUpdate;		 // The last time that the refractory period was updated.
-		uint64_t lastAliveToggle;			 // The last time that the path was marked as "alive".
-		bool alive;
-		bool eligible;				  // State of eligibility at last check. Used for determining state changes.
-		uint64_t lastEligibility;	  // The last time that this path was eligible
-		uint64_t whenNominated;		  // Timestamp indicating when this path's trial period began.
-		uint32_t refractoryPeriod;	  // Amount of time that this path will be prevented from becoming a member of a bond.
-		uint8_t ipvPref;			  // IP version preference inherited from the physical link.
-		uint8_t mode;				  // Mode inherited from the physical link.
-		bool onlyPathOnLink;		  // IP version preference inherited from the physical link.
-		bool enabled;				  // Enabled state inherited from the physical link.
-		bool bonded;				  // Whether this path is currently part of a bond.
-		bool negotiated;			  // Whether this path was intentionally negotiated by either peer.
-		bool shouldAvoid;			  // Whether flows should be moved from this path. Current traffic flows will be re-allocated immediately.
-		uint16_t assignedFlowCount;	  // The number of flows currently assigned to this path.
-		float latency;				  // The mean latency (computed from a sliding window.)
-		float latencyVariance;		  // Packet delay variance (computed from a sliding window.)
-		float packetLossRatio;		  // The ratio of lost packets to received packets.
-		float packetErrorRatio;		  // The ratio of packets that failed their MAC/CRC checks to those that did not.
-		float relativeQuality;		  // The relative quality of the link.
-		float relativeLinkCapacity;	  // The relative capacity of the link.
-
-		uint32_t failoverScore;				   // Score that indicates to what degree this path is preferred over others that are available to the bonding policy. (specifically for active-backup)
-		int32_t packetsReceivedSinceLastQoS;   // Number of packets received since the last VERB_QOS_MEASUREMENT was sent to the remote peer.
-
-		/**
-		 * Counters used for tracking path load.
-		 */
-		int packetsIn;
-		int packetsOut;
-
-		uint16_t localPort;
-
-		// AtomicCounter __refCount;
-
-		SharedPtr<Path> p;
-		void set(uint64_t now, const SharedPtr<Path>& path)
-		{
-			p = path;
-			whenNominated = now;
-		}
-	};
-
-	/**
-	 * Paths nominated to the bond (may or may not actually be bonded)
-	 */
-	NominatedPath _paths[ZT_MAX_PEER_NETWORK_PATHS];
-
-	inline int getNominatedPathIdx(const SharedPtr<Path>& path)
-	{
-		for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p == path) {
-				return i;
-			}
-		}
-		return ZT_MAX_PEER_NETWORK_PATHS;
-	}
-
-	/**
-	 * A protocol flow that is identified by the origin and destination port.
-	 */
-	struct Flow {
-		/**
-		 * @param flowId Given flow ID
-		 * @param now Current time
-		 */
-		Flow(int32_t flowId, int64_t now) : id(flowId), bytesIn(0), bytesOut(0), lastActivity(now), lastPathReassignment(0), assignedPath(ZT_MAX_PEER_NETWORK_PATHS)
-		{
-		}
-
-		/**
-		 * Reset flow statistics
-		 */
-		inline void resetByteCounts()
-		{
-			bytesIn = 0;
-			bytesOut = 0;
-		}
-
-		/**
-		 * How long since a packet was sent or received in this flow
-		 *
-		 * @param now Current time
-		 * @return The age of the flow in terms of last recorded activity
-		 */
-		int64_t age(int64_t now)
-		{
-			return now - lastActivity;
-		}
-
-		/**
-		 * @param path Assigned path over which this flow should be handled
-		 */
-		inline void assignPath(int pathIdx, int64_t now)
-		{
-			assignedPath = pathIdx;
-			lastPathReassignment = now;
-		}
-
-		AtomicCounter __refCount;
-
-		int32_t id;						// Flow ID used for hashing and path selection
-		uint64_t bytesIn;				// Used for tracking flow size
-		uint64_t bytesOut;				// Used for tracking flow size
-		int64_t lastActivity;			// The last time that this flow handled traffic
-		int64_t lastPathReassignment;	// Time of last path assignment. Used for anti-flapping
-		int assignedPath;				// Index of path to which this flow is assigned
-	};
-
-	const RuntimeEnvironment* RR;
-	AtomicCounter __refCount;
-
-	std::string _policyAlias;	// Custom name given by the user to this bond type.
-
-	static Binder* _binder;
-
-	/**
-	 * Set of indices corresponding to paths currently included in the bond proper. This
-	 * may only be updated during a call to curateBond(). The reason for this is so that
-	 * we can simplify the high frequency packet egress logic.
-	 */
-	int _realIdxMap[ZT_MAX_PEER_NETWORK_PATHS] = { ZT_MAX_PEER_NETWORK_PATHS };
-	int _numBondedPaths;						  // Number of paths currently included in the _realIdxMap set.
-	std::map<int16_t, SharedPtr<Flow> > _flows;	  // Flows hashed according to port and protocol
-	float _qw[ZT_QOS_PARAMETER_SIZE];			  // Link quality specification (can be customized by user)
-
-	bool _run;
-
-	uint8_t _policy;
-	uint32_t _upDelay;
-	uint32_t _downDelay;
-
-	// active-backup
-	int _abPathIdx;	  // current active path
-	std::deque<int> _abFailoverQueue;
-	uint8_t _abLinkSelectMethod;   // link re-selection policy for the primary link in active-backup
-
-	// balance-rr
-	uint8_t _rrIdx;						 // index to path currently in use during Round Robin operation
-	uint16_t _rrPacketsSentOnCurrLink;	 // number of packets sent on this link since the most recent path switch.
-	/**
-	 * How many packets will be sent on a path before moving to the next path
-	 * in the round-robin sequence. A value of zero will cause a random path
-	 * selection for each outgoing packet.
-	 */
-	int _packetsPerLink;
-
-	// balance-aware
-	uint64_t _totalBondUnderload;
-
-	// dynamic link monitoring
-	uint8_t _linkMonitorStrategy;
-
-	// path negotiation
-	int16_t _localUtility;
-	int _negotiatedPathIdx;
-	uint8_t _numSentPathNegotiationRequests;
-	bool _allowPathNegotiation;
-
-	/**
-	 * Timers and intervals
-	 */
-	uint64_t _failoverInterval;
-	uint64_t _qosSendInterval;
-	uint64_t _ackSendInterval;
-	uint64_t throughputMeasurementInterval;
-	uint64_t _qualityEstimationInterval;
-
-	/**
-	 * Link state reporting
-	 */
-	uint8_t _numAliveLinks;
-	uint8_t _numTotalLinks;
-
-	/**
-	 * Default initial punishment inflicted on misbehaving paths. Punishment slowly
-	 * drains linearly. For each eligibility change the remaining punishment is doubled.
-	 */
-	uint32_t _defaultPathRefractoryPeriod;
-	unsigned char _freeRandomByte;	 // Free byte of entropy that is updated on every packet egress event.
-	SharedPtr<Peer> _peer;			 // Remote peer that this bond services
-	unsigned long long _peerId;		 // ID of the peer that this bond services
-	bool _isLeaf;
-
-	/**
-	 * Rate-limiting
-	 */
-	uint16_t _qosCutoffCount;
-	uint16_t _ackCutoffCount;
-	uint64_t _lastQoSRateCheck;
-	uint64_t _lastAckRateCheck;
-	uint16_t _pathNegotiationCutoffCount;
-	uint64_t _lastPathNegotiationReceived;
-
-	/**
-	 * Recent event timestamps
-	 */
-	uint64_t _lastSummaryDump;
-
-	uint64_t _lastQualityEstimation;
-	uint64_t _lastBackgroundTaskCheck;
-	uint64_t _lastBondStatusLog;
-	uint64_t _lastPathNegotiationCheck;
-	uint64_t _lastSentPathNegotiationRequest;
-	uint64_t _lastFlowExpirationCheck;
-	uint64_t _lastFlowRebalance;
-	uint64_t _lastFrame;
-	uint64_t _lastActiveBackupPathChange;
-
-	Mutex _paths_m;
-
-	Mutex _flows_m;
-
-	bool _userHasSpecifiedLinks;				  // Whether the user has specified links for this bond.
-	bool _userHasSpecifiedPrimaryLink;			  // Whether the user has specified a primary link for this bond.
-	bool _userHasSpecifiedFailoverInstructions;	  // Whether the user has specified failover instructions for this bond.
-	bool _userHasSpecifiedLinkCapacities;		  // Whether the user has specified links capacities for this bond.
-	/**
-	 * How frequently (in ms) a VERB_ECHO is sent to a peer to verify that a
-	 * path is still active. A value of zero (0) will disable active path
-	 * monitoring; as result, all monitoring will be a function of traffic.
-	 */
-	int _monitorInterval;
-	bool _allowFlowHashing;	  // Whether or not flow hashing is allowed.
-
-	uint64_t _overheadBytes;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/Buffer.hpp b/node/Buffer.hpp
index ae013c790..c5d625deb 100644
--- a/node/Buffer.hpp
+++ b/node/Buffer.hpp
@@ -1,30 +1,36 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_BUFFER_HPP
 #define ZT_BUFFER_HPP
 
+#include <string.h>
+#include <stdint.h>
+
+#include <stdexcept>
+#include <string>
+#include <algorithm>
+#include <utility>
+
 #include "Constants.hpp"
 #include "Utils.hpp"
 
-#include <algorithm>
-#include <stdexcept>
-#include <stdint.h>
-#include <string.h>
-#include <string>
-#include <utility>
-
-#if defined(__GNUC__) && (! defined(ZT_NO_TYPE_PUNNING))
+#if defined(__GNUC__) && (!defined(ZT_NO_TYPE_PUNNING))
 #define ZT_VAR_MAY_ALIAS __attribute__((__may_alias__))
 #else
 #define ZT_VAR_MAY_ALIAS
@@ -45,115 +51,107 @@ namespace ZeroTier {
  *
  * @tparam C Total capacity
  */
-template <unsigned int C> class Buffer {
+template<unsigned int C>
+class Buffer
+{
 	// I love me!
 	template <unsigned int C2> friend class Buffer;
 
-  public:
+public:
 	// STL container idioms
 	typedef unsigned char value_type;
-	typedef unsigned char* pointer;
-	typedef const char* const_pointer;
-	typedef char& reference;
-	typedef const char& const_reference;
-	typedef char* iterator;
-	typedef const char* const_iterator;
+	typedef unsigned char * pointer;
+	typedef const unsigned char * const_pointer;
+	typedef unsigned char & reference;
+	typedef const unsigned char & const_reference;
+	typedef unsigned char * iterator;
+	typedef const unsigned char * const_iterator;
 	typedef unsigned int size_type;
 	typedef int difference_type;
 	typedef std::reverse_iterator<iterator> reverse_iterator;
 	typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-	inline iterator begin()
-	{
-		return _b;
-	}
-	inline iterator end()
-	{
-		return (_b + _l);
-	}
-	inline const_iterator begin() const
-	{
-		return _b;
-	}
-	inline const_iterator end() const
-	{
-		return (_b + _l);
-	}
-	inline reverse_iterator rbegin()
-	{
-		return reverse_iterator(begin());
-	}
-	inline reverse_iterator rend()
-	{
-		return reverse_iterator(end());
-	}
-	inline const_reverse_iterator rbegin() const
-	{
-		return const_reverse_iterator(begin());
-	}
-	inline const_reverse_iterator rend() const
-	{
-		return const_reverse_iterator(end());
-	}
+	inline iterator begin() { return _b; }
+	inline iterator end() { return (_b + _l); }
+	inline const_iterator begin() const { return _b; }
+	inline const_iterator end() const { return (_b + _l); }
+	inline reverse_iterator rbegin() { return reverse_iterator(begin()); }
+	inline reverse_iterator rend() { return reverse_iterator(end()); }
+	inline const_reverse_iterator rbegin() const { return const_reverse_iterator(begin()); }
+	inline const_reverse_iterator rend() const { return const_reverse_iterator(end()); }
 
-	Buffer() : _l(0)
+	Buffer()
+		throw() :
+		_l(0)
 	{
 	}
 
 	Buffer(unsigned int l)
+		throw(std::out_of_range)
 	{
-		if (l > C) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
+		if (l > C)
+			throw std::out_of_range("Buffer: construct with size larger than capacity");
 		_l = l;
 	}
 
-	template <unsigned int C2> Buffer(const Buffer<C2>& b)
+	template<unsigned int C2>
+	Buffer(const Buffer<C2> &b)
+		throw(std::out_of_range)
 	{
 		*this = b;
 	}
 
-	Buffer(const void* b, unsigned int l)
+	Buffer(const void *b,unsigned int l)
+		throw(std::out_of_range)
 	{
-		copyFrom(b, l);
+		copyFrom(b,l);
 	}
 
-	template <unsigned int C2> inline Buffer& operator=(const Buffer<C2>& b)
+	Buffer(const std::string &s)
+		throw(std::out_of_range)
 	{
-		if (unlikely(b._l > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		if (C2 == C) {
-			memcpy(this, &b, sizeof(Buffer<C>));
-		}
-		else {
-			memcpy(_b, b._b, _l = b._l);
-		}
+		copyFrom(s.data(),s.length());
+	}
+
+	template<unsigned int C2>
+	inline Buffer &operator=(const Buffer<C2> &b)
+		throw(std::out_of_range)
+	{
+		if (b._l > C)
+			throw std::out_of_range("Buffer: assignment from buffer larger than capacity");
+		memcpy(_b,b._b,_l = b._l);
 		return *this;
 	}
 
-	inline void copyFrom(const void* b, unsigned int l)
+	inline Buffer &operator=(const std::string &s)
+		throw(std::out_of_range)
 	{
-		if (unlikely(l > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		memcpy(_b, b, l);
+		copyFrom(s.data(),s.length());
+		return *this;
+	}
+
+	inline void copyFrom(const void *b,unsigned int l)
+		throw(std::out_of_range)
+	{
+		if (l > C)
+			throw std::out_of_range("Buffer: set from C array larger than capacity");
 		_l = l;
+		memcpy(_b,b,l);
 	}
 
 	unsigned char operator[](const unsigned int i) const
+		throw(std::out_of_range)
 	{
-		if (unlikely(i >= _l)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
+		if (i >= _l)
+			throw std::out_of_range("Buffer: [] beyond end of data");
 		return (unsigned char)_b[i];
 	}
 
-	unsigned char& operator[](const unsigned int i)
+	unsigned char &operator[](const unsigned int i)
+		throw(std::out_of_range)
 	{
-		if (unlikely(i >= _l)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		return ((unsigned char*)_b)[i];
+		if (i >= _l)
+			throw std::out_of_range("Buffer: [] beyond end of data");
+		return ((unsigned char *)_b)[i];
 	}
 
 	/**
@@ -169,19 +167,19 @@ template <unsigned int C> class Buffer {
 	 * @return Pointer to field data
 	 * @throws std::out_of_range Field extends beyond data size
 	 */
-	unsigned char* field(unsigned int i, unsigned int l)
+	unsigned char *field(unsigned int i,unsigned int l)
+		throw(std::out_of_range)
 	{
-		if (unlikely((i + l) > _l)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		return (unsigned char*)(_b + i);
+		if ((i + l) > _l)
+			throw std::out_of_range("Buffer: field() beyond end of data");
+		return (unsigned char *)(_b + i);
 	}
-	const unsigned char* field(unsigned int i, unsigned int l) const
+	const unsigned char *field(unsigned int i,unsigned int l) const
+		throw(std::out_of_range)
 	{
-		if (unlikely((i + l) > _l)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		return (const unsigned char*)(_b + i);
+		if ((i + l) > _l)
+			throw std::out_of_range("Buffer: field() beyond end of data");
+		return (const unsigned char *)(_b + i);
 	}
 
 	/**
@@ -191,18 +189,18 @@ template <unsigned int C> class Buffer {
 	 * @param v Value
 	 * @tparam T Integer type (e.g. uint16_t, int64_t)
 	 */
-	template <typename T> inline void setAt(unsigned int i, const T v)
+	template<typename T>
+	inline void setAt(unsigned int i,const T v)
+		throw(std::out_of_range)
 	{
-		if (unlikely((i + sizeof(T)) > _l)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
+		if ((i + sizeof(T)) > _l)
+			throw std::out_of_range("Buffer: setAt() beyond end of data");
 #ifdef ZT_NO_TYPE_PUNNING
-		uint8_t* p = reinterpret_cast<uint8_t*>(_b + i);
-		for (unsigned int x = 1; x <= sizeof(T); ++x) {
+		uint8_t *p = reinterpret_cast<uint8_t *>(_b + i);
+		for(unsigned int x=1;x<=sizeof(T);++x)
 			*(p++) = (uint8_t)(v >> (8 * (sizeof(T) - x)));
-		}
 #else
-		T* const ZT_VAR_MAY_ALIAS p = reinterpret_cast<T*>(_b + i);
+		T *const ZT_VAR_MAY_ALIAS p = reinterpret_cast<T *>(_b + i);
 		*p = Utils::hton(v);
 #endif
 	}
@@ -214,21 +212,22 @@ template <unsigned int C> class Buffer {
 	 * @tparam T Integer type (e.g. uint16_t, int64_t)
 	 * @return Integer value
 	 */
-	template <typename T> inline T at(unsigned int i) const
+	template<typename T>
+	inline T at(unsigned int i) const
+		throw(std::out_of_range)
 	{
-		if (unlikely((i + sizeof(T)) > _l)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
+		if ((i + sizeof(T)) > _l)
+			throw std::out_of_range("Buffer: at() beyond end of data");
 #ifdef ZT_NO_TYPE_PUNNING
 		T v = 0;
-		const uint8_t* p = reinterpret_cast<const uint8_t*>(_b + i);
-		for (unsigned int x = 0; x < sizeof(T); ++x) {
+		const uint8_t *p = reinterpret_cast<const uint8_t *>(_b + i);
+		for(unsigned int x=0;x<sizeof(T);++x) {
 			v <<= 8;
-			v |= (T) * (p++);
+			v |= (T)*(p++);
 		}
 		return v;
 #else
-		const T* const ZT_VAR_MAY_ALIAS p = reinterpret_cast<const T*>(_b + i);
+		const T *const ZT_VAR_MAY_ALIAS p = reinterpret_cast<const T *>(_b + i);
 		return Utils::ntoh(*p);
 #endif
 	}
@@ -240,18 +239,18 @@ template <unsigned int C> class Buffer {
 	 * @tparam T Integer type (e.g. uint16_t, int64_t)
 	 * @throws std::out_of_range Attempt to append beyond capacity
 	 */
-	template <typename T> inline void append(const T v)
+	template<typename T>
+	inline void append(const T v)
+		throw(std::out_of_range)
 	{
-		if (unlikely((_l + sizeof(T)) > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
+		if ((_l + sizeof(T)) > C)
+			throw std::out_of_range("Buffer: append beyond capacity");
 #ifdef ZT_NO_TYPE_PUNNING
-		uint8_t* p = reinterpret_cast<uint8_t*>(_b + _l);
-		for (unsigned int x = 1; x <= sizeof(T); ++x) {
+		uint8_t *p = reinterpret_cast<uint8_t *>(_b + _l);
+		for(unsigned int x=1;x<=sizeof(T);++x)
 			*(p++) = (uint8_t)(v >> (8 * (sizeof(T) - x)));
-		}
 #else
-		T* const ZT_VAR_MAY_ALIAS p = reinterpret_cast<T*>(_b + _l);
+		T *const ZT_VAR_MAY_ALIAS p = reinterpret_cast<T *>(_b + _l);
 		*p = Utils::hton(v);
 #endif
 		_l += sizeof(T);
@@ -264,28 +263,13 @@ template <unsigned int C> class Buffer {
 	 * @param n Number of times to append
 	 * @throws std::out_of_range Attempt to append beyond capacity
 	 */
-	inline void append(unsigned char c, unsigned int n)
+	inline void append(unsigned char c,unsigned int n)
+		throw(std::out_of_range)
 	{
-		if (unlikely((_l + n) > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		for (unsigned int i = 0; i < n; ++i) {
+		if ((_l + n) > C)
+			throw std::out_of_range("Buffer: append beyond capacity");
+		for(unsigned int i=0;i<n;++i)
 			_b[_l++] = (char)c;
-		}
-	}
-
-	/**
-	 * Append secure random bytes
-	 *
-	 * @param n Number of random bytes to append
-	 */
-	inline void appendRandom(unsigned int n)
-	{
-		if (unlikely((_l + n) > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		Utils::getSecureRandom(_b + _l, n);
-		_l += n;
 	}
 
 	/**
@@ -295,31 +279,25 @@ template <unsigned int C> class Buffer {
 	 * @param l Length
 	 * @throws std::out_of_range Attempt to append beyond capacity
 	 */
-	inline void append(const void* b, unsigned int l)
+	inline void append(const void *b,unsigned int l)
+		throw(std::out_of_range)
 	{
-		if (unlikely((_l + l) > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		memcpy(_b + _l, b, l);
+		if ((_l + l) > C)
+			throw std::out_of_range("Buffer: append beyond capacity");
+		memcpy(_b + _l,b,l);
 		_l += l;
 	}
 
 	/**
-	 * Append a C string including null termination byte
+	 * Append a string
 	 *
-	 * @param s C string
+	 * @param s String to append
 	 * @throws std::out_of_range Attempt to append beyond capacity
 	 */
-	inline void appendCString(const char* s)
+	inline void append(const std::string &s)
+		throw(std::out_of_range)
 	{
-		for (;;) {
-			if (unlikely(_l >= C)) {
-				throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-			}
-			if (! (_b[_l++] = *(s++))) {
-				break;
-			}
-		}
+		append(s.data(),(unsigned int)s.length());
 	}
 
 	/**
@@ -329,9 +307,11 @@ template <unsigned int C> class Buffer {
 	 * @tparam C2 Capacity of second buffer (typically inferred)
 	 * @throws std::out_of_range Attempt to append beyond capacity
 	 */
-	template <unsigned int C2> inline void append(const Buffer<C2>& b)
+	template<unsigned int C2>
+	inline void append(const Buffer<C2> &b)
+		throw(std::out_of_range)
 	{
-		append(b._b, b._l);
+		append(b._b,b._l);
 	}
 
 	/**
@@ -344,12 +324,12 @@ template <unsigned int C> class Buffer {
 	 * @param l Length of field to append
 	 * @return Pointer to beginning of appended field of length 'l'
 	 */
-	inline char* appendField(unsigned int l)
+	inline char *appendField(unsigned int l)
+		throw(std::out_of_range)
 	{
-		if (unlikely((_l + l) > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		char* r = _b + _l;
+		if ((_l + l) > C)
+			throw std::out_of_range("Buffer: append beyond capacity");
+		char *r = _b + _l;
 		_l += l;
 		return r;
 	}
@@ -363,10 +343,10 @@ template <unsigned int C> class Buffer {
 	 * @throws std::out_of_range Capacity exceeded
 	 */
 	inline void addSize(unsigned int i)
+		throw(std::out_of_range)
 	{
-		if (unlikely((i + _l) > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
+		if ((i + _l) > C)
+			throw std::out_of_range("Buffer: setSize to larger than capacity");
 		_l += i;
 	}
 
@@ -379,10 +359,10 @@ template <unsigned int C> class Buffer {
 	 * @throws std::out_of_range Size larger than capacity
 	 */
 	inline void setSize(const unsigned int i)
+		throw(std::out_of_range)
 	{
-		if (unlikely(i > C)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
+		if (i > C)
+			throw std::out_of_range("Buffer: setSize to larger than capacity");
 		_l = i;
 	}
 
@@ -390,17 +370,16 @@ template <unsigned int C> class Buffer {
 	 * Move everything after 'at' to the buffer's front and truncate
 	 *
 	 * @param at Truncate before this position
-	 * @throws std::out_of_range Position is beyond size of buffer
+	 * @throw std::out_of_range Position is beyond size of buffer
 	 */
 	inline void behead(const unsigned int at)
+		throw(std::out_of_range)
 	{
-		if (! at) {
+		if (!at)
 			return;
-		}
-		if (unlikely(at > _l)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		::memmove(_b, _b + at, _l -= at);
+		if (at > _l)
+			throw std::out_of_range("Buffer: behead() beyond capacity");
+		::memmove(_b,_b + at,_l -= at);
 	}
 
 	/**
@@ -408,15 +387,15 @@ template <unsigned int C> class Buffer {
 	 *
 	 * @param start Starting position
 	 * @param length Length of block to erase
-	 * @throws std::out_of_range Position plus length is beyond size of buffer
+	 * @throw std::out_of_range Position plus length is beyond size of buffer
 	 */
-	inline void erase(const unsigned int at, const unsigned int length)
+	inline void erase(const unsigned int at,const unsigned int length)
+		throw(std::out_of_range)
 	{
 		const unsigned int endr = at + length;
-		if (unlikely(endr > _l)) {
-			throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-		}
-		::memmove(_b + at, _b + endr, _l - endr);
+		if (endr > _l)
+			throw std::out_of_range("Buffer: erase() range beyond end of buffer");
+		::memmove(_b + at,_b + endr,_l - endr);
 		_l -= length;
 	}
 
@@ -424,6 +403,7 @@ template <unsigned int C> class Buffer {
 	 * Set buffer data length to zero
 	 */
 	inline void clear()
+		throw()
 	{
 		_l = 0;
 	}
@@ -432,88 +412,86 @@ template <unsigned int C> class Buffer {
 	 * Zero buffer up to size()
 	 */
 	inline void zero()
+		throw()
 	{
-		memset(_b, 0, _l);
+		memset(_b,0,_l);
 	}
 
 	/**
 	 * Zero unused capacity area
 	 */
 	inline void zeroUnused()
+		throw()
 	{
-		memset(_b + _l, 0, C - _l);
+		memset(_b + _l,0,C - _l);
 	}
 
 	/**
 	 * Unconditionally and securely zero buffer's underlying memory
 	 */
 	inline void burn()
+		throw()
 	{
-		Utils::burn(_b, sizeof(_b));
+		Utils::burn(_b,sizeof(_b));
 	}
 
 	/**
 	 * @return Constant pointer to data in buffer
 	 */
-	inline const void* data() const
-	{
-		return _b;
-	}
-
-	/**
-	 * @return Non-constant pointer to data in buffer
-	 */
-	inline void* unsafeData()
-	{
-		return _b;
-	}
+	inline const void *data() const throw() { return _b; }
 
 	/**
 	 * @return Size of data in buffer
 	 */
-	inline unsigned int size() const
-	{
-		return _l;
-	}
+	inline unsigned int size() const throw() { return _l; }
 
 	/**
 	 * @return Capacity of buffer
 	 */
-	inline unsigned int capacity() const
-	{
-		return C;
-	}
+	inline unsigned int capacity() const throw() { return C; }
 
-	template <unsigned int C2> inline bool operator==(const Buffer<C2>& b) const
+	template<unsigned int C2>
+	inline bool operator==(const Buffer<C2> &b) const
+		throw()
 	{
-		return ((_l == b._l) && (! memcmp(_b, b._b, _l)));
+		return ((_l == b._l)&&(!memcmp(_b,b._b,_l)));
 	}
-	template <unsigned int C2> inline bool operator!=(const Buffer<C2>& b) const
+	template<unsigned int C2>
+	inline bool operator!=(const Buffer<C2> &b) const
+		throw()
 	{
-		return ((_l != b._l) || (memcmp(_b, b._b, _l)));
+		return ((_l != b._l)||(memcmp(_b,b._b,_l)));
 	}
-	template <unsigned int C2> inline bool operator<(const Buffer<C2>& b) const
+	template<unsigned int C2>
+	inline bool operator<(const Buffer<C2> &b) const
+		throw()
 	{
-		return (memcmp(_b, b._b, std::min(_l, b._l)) < 0);
+		return (memcmp(_b,b._b,std::min(_l,b._l)) < 0);
 	}
-	template <unsigned int C2> inline bool operator>(const Buffer<C2>& b) const
+	template<unsigned int C2>
+	inline bool operator>(const Buffer<C2> &b) const
+		throw()
 	{
 		return (b < *this);
 	}
-	template <unsigned int C2> inline bool operator<=(const Buffer<C2>& b) const
+	template<unsigned int C2>
+	inline bool operator<=(const Buffer<C2> &b) const
+		throw()
 	{
-		return ! (b < *this);
+		return !(b < *this);
 	}
-	template <unsigned int C2> inline bool operator>=(const Buffer<C2>& b) const
+	template<unsigned int C2>
+	inline bool operator>=(const Buffer<C2> &b) const
+		throw()
 	{
-		return ! (*this < b);
+		return !(*this < b);
 	}
 
-  private:
-	char ZT_VAR_MAY_ALIAS _b[C];
+private:
 	unsigned int _l;
+	char ZT_VAR_MAY_ALIAS _b[C];
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/C25519.cpp b/node/C25519.cpp
new file mode 100644
index 000000000..e9ffecc16
--- /dev/null
+++ b/node/C25519.cpp
@@ -0,0 +1,2398 @@
+// Code taken from NaCl by D. J. Bernstein and others
+
+/*
+Matthew Dempsky
+Public domain.
+Derived from public domain code by D. J. Bernstein.
+*/
+
+// Modified very slightly for ZeroTier One by Adam Ierymenko
+// (no functional changes)
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "Constants.hpp"
+#include "C25519.hpp"
+#include "SHA512.hpp"
+#include "Buffer.hpp"
+
+#ifdef __WINDOWS__
+#pragma warning(disable: 4146)
+#endif
+
+namespace ZeroTier {
+
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
+#define crypto_int32 int32_t
+#define crypto_uint32 uint32_t
+#define crypto_int64 int64_t
+#define crypto_uint64 uint64_t
+#define crypto_hash_sha512_BYTES 64
+
+static inline void add(unsigned int out[32],const unsigned int a[32],const unsigned int b[32])
+{
+  unsigned int j;
+  unsigned int u;
+  u = 0;
+  for (j = 0;j < 31;++j) { u += a[j] + b[j]; out[j] = u & 255; u >>= 8; }
+  u += a[31] + b[31]; out[31] = u;
+}
+
+static inline void sub(unsigned int out[32],const unsigned int a[32],const unsigned int b[32])
+{
+  unsigned int j;
+  unsigned int u;
+  u = 218;
+  for (j = 0;j < 31;++j) {
+    u += a[j] + 65280 - b[j];
+    out[j] = u & 255;
+    u >>= 8;
+  }
+  u += a[31] - b[31];
+  out[31] = u;
+}
+
+static inline void squeeze(unsigned int a[32])
+{
+  unsigned int j;
+  unsigned int u;
+  u = 0;
+  for (j = 0;j < 31;++j) { u += a[j]; a[j] = u & 255; u >>= 8; }
+  u += a[31]; a[31] = u & 127;
+  u = 19 * (u >> 7);
+  for (j = 0;j < 31;++j) { u += a[j]; a[j] = u & 255; u >>= 8; }
+  u += a[31]; a[31] = u;
+}
+
+static const unsigned int minusp[32] = {
+ 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128
+} ;
+
+static inline void freeze(unsigned int a[32])
+{
+  unsigned int aorig[32];
+  unsigned int j;
+  unsigned int negative;
+
+  for (j = 0;j < 32;++j) aorig[j] = a[j];
+  add(a,a,minusp);
+  negative = -((a[31] >> 7) & 1);
+  for (j = 0;j < 32;++j) a[j] ^= negative & (aorig[j] ^ a[j]);
+}
+
+static inline void mult(unsigned int out[32],const unsigned int a[32],const unsigned int b[32])
+{
+  unsigned int i;
+  unsigned int j;
+  unsigned int u;
+
+  for (i = 0;i < 32;++i) {
+    u = 0;
+    for (j = 0;j <= i;++j) u += a[j] * b[i - j];
+    for (j = i + 1;j < 32;++j) u += 38 * a[j] * b[i + 32 - j];
+    out[i] = u;
+  }
+  squeeze(out);
+}
+
+static inline void mult121665(unsigned int out[32],const unsigned int a[32])
+{
+  unsigned int j;
+  unsigned int u;
+
+  u = 0;
+  for (j = 0;j < 31;++j) { u += 121665 * a[j]; out[j] = u & 255; u >>= 8; }
+  u += 121665 * a[31]; out[31] = u & 127;
+  u = 19 * (u >> 7);
+  for (j = 0;j < 31;++j) { u += out[j]; out[j] = u & 255; u >>= 8; }
+  u += out[j]; out[j] = u;
+}
+
+static inline void square(unsigned int out[32],const unsigned int a[32])
+{
+  unsigned int i;
+  unsigned int j;
+  unsigned int u;
+
+  for (i = 0;i < 32;++i) {
+    u = 0;
+    for (j = 0;j < i - j;++j) u += a[j] * a[i - j];
+    for (j = i + 1;j < i + 32 - j;++j) u += 38 * a[j] * a[i + 32 - j];
+    u *= 2;
+    if ((i & 1) == 0) {
+      u += a[i / 2] * a[i / 2];
+      u += 38 * a[i / 2 + 16] * a[i / 2 + 16];
+    }
+    out[i] = u;
+  }
+  squeeze(out);
+}
+
+static inline void select(unsigned int p[64],unsigned int q[64],const unsigned int r[64],const unsigned int s[64],unsigned int b)
+{
+  unsigned int j;
+  unsigned int t;
+  unsigned int bminus1;
+
+  bminus1 = b - 1;
+  for (j = 0;j < 64;++j) {
+    t = bminus1 & (r[j] ^ s[j]);
+    p[j] = s[j] ^ t;
+    q[j] = r[j] ^ t;
+  }
+}
+
+static void mainloop(unsigned int work[64],const unsigned char e[32])
+{
+  unsigned int xzm1[64];
+  unsigned int xzm[64];
+  unsigned int xzmb[64];
+  unsigned int xzm1b[64];
+  unsigned int xznb[64];
+  unsigned int xzn1b[64];
+  unsigned int a0[64];
+  unsigned int a1[64];
+  unsigned int b0[64];
+  unsigned int b1[64];
+  unsigned int c1[64];
+  unsigned int r[32];
+  unsigned int s[32];
+  unsigned int t[32];
+  unsigned int u[32];
+  //unsigned int i;
+  unsigned int j;
+  unsigned int b;
+  int pos;
+
+  for (j = 0;j < 32;++j) xzm1[j] = work[j];
+  xzm1[32] = 1;
+  for (j = 33;j < 64;++j) xzm1[j] = 0;
+
+  xzm[0] = 1;
+  for (j = 1;j < 64;++j) xzm[j] = 0;
+
+  for (pos = 254;pos >= 0;--pos) {
+    b = e[pos / 8] >> (pos & 7);
+    b &= 1;
+    select(xzmb,xzm1b,xzm,xzm1,b);
+    add(a0,xzmb,xzmb + 32);
+    sub(a0 + 32,xzmb,xzmb + 32);
+    add(a1,xzm1b,xzm1b + 32);
+    sub(a1 + 32,xzm1b,xzm1b + 32);
+    square(b0,a0);
+    square(b0 + 32,a0 + 32);
+    mult(b1,a1,a0 + 32);
+    mult(b1 + 32,a1 + 32,a0);
+    add(c1,b1,b1 + 32);
+    sub(c1 + 32,b1,b1 + 32);
+    square(r,c1 + 32);
+    sub(s,b0,b0 + 32);
+    mult121665(t,s);
+    add(u,t,b0);
+    mult(xznb,b0,b0 + 32);
+    mult(xznb + 32,s,u);
+    square(xzn1b,c1);
+    mult(xzn1b + 32,r,work);
+    select(xzm,xzm1,xznb,xzn1b,b);
+  }
+
+  for (j = 0;j < 64;++j) work[j] = xzm[j];
+}
+
+static void recip(unsigned int out[32],const unsigned int z[32])
+{
+  unsigned int z2[32];
+  unsigned int z9[32];
+  unsigned int z11[32];
+  unsigned int z2_5_0[32];
+  unsigned int z2_10_0[32];
+  unsigned int z2_20_0[32];
+  unsigned int z2_50_0[32];
+  unsigned int z2_100_0[32];
+  unsigned int t0[32];
+  unsigned int t1[32];
+  int i;
+
+  /* 2 */ square(z2,z);
+  /* 4 */ square(t1,z2);
+  /* 8 */ square(t0,t1);
+  /* 9 */ mult(z9,t0,z);
+  /* 11 */ mult(z11,z9,z2);
+  /* 22 */ square(t0,z11);
+  /* 2^5 - 2^0 = 31 */ mult(z2_5_0,t0,z9);
+
+  /* 2^6 - 2^1 */ square(t0,z2_5_0);
+  /* 2^7 - 2^2 */ square(t1,t0);
+  /* 2^8 - 2^3 */ square(t0,t1);
+  /* 2^9 - 2^4 */ square(t1,t0);
+  /* 2^10 - 2^5 */ square(t0,t1);
+  /* 2^10 - 2^0 */ mult(z2_10_0,t0,z2_5_0);
+
+  /* 2^11 - 2^1 */ square(t0,z2_10_0);
+  /* 2^12 - 2^2 */ square(t1,t0);
+  /* 2^20 - 2^10 */ for (i = 2;i < 10;i += 2) { square(t0,t1); square(t1,t0); }
+  /* 2^20 - 2^0 */ mult(z2_20_0,t1,z2_10_0);
+
+  /* 2^21 - 2^1 */ square(t0,z2_20_0);
+  /* 2^22 - 2^2 */ square(t1,t0);
+  /* 2^40 - 2^20 */ for (i = 2;i < 20;i += 2) { square(t0,t1); square(t1,t0); }
+  /* 2^40 - 2^0 */ mult(t0,t1,z2_20_0);
+
+  /* 2^41 - 2^1 */ square(t1,t0);
+  /* 2^42 - 2^2 */ square(t0,t1);
+  /* 2^50 - 2^10 */ for (i = 2;i < 10;i += 2) { square(t1,t0); square(t0,t1); }
+  /* 2^50 - 2^0 */ mult(z2_50_0,t0,z2_10_0);
+
+  /* 2^51 - 2^1 */ square(t0,z2_50_0);
+  /* 2^52 - 2^2 */ square(t1,t0);
+  /* 2^100 - 2^50 */ for (i = 2;i < 50;i += 2) { square(t0,t1); square(t1,t0); }
+  /* 2^100 - 2^0 */ mult(z2_100_0,t1,z2_50_0);
+
+  /* 2^101 - 2^1 */ square(t1,z2_100_0);
+  /* 2^102 - 2^2 */ square(t0,t1);
+  /* 2^200 - 2^100 */ for (i = 2;i < 100;i += 2) { square(t1,t0); square(t0,t1); }
+  /* 2^200 - 2^0 */ mult(t1,t0,z2_100_0);
+
+  /* 2^201 - 2^1 */ square(t0,t1);
+  /* 2^202 - 2^2 */ square(t1,t0);
+  /* 2^250 - 2^50 */ for (i = 2;i < 50;i += 2) { square(t0,t1); square(t1,t0); }
+  /* 2^250 - 2^0 */ mult(t0,t1,z2_50_0);
+
+  /* 2^251 - 2^1 */ square(t1,t0);
+  /* 2^252 - 2^2 */ square(t0,t1);
+  /* 2^253 - 2^3 */ square(t1,t0);
+  /* 2^254 - 2^4 */ square(t0,t1);
+  /* 2^255 - 2^5 */ square(t1,t0);
+  /* 2^255 - 21 */ mult(out,t1,z11);
+}
+
+static inline int crypto_scalarmult(unsigned char *q,
+  const unsigned char *n,
+  const unsigned char *p)
+{
+  unsigned int work[96];
+  unsigned char e[32];
+  unsigned int i;
+  for (i = 0;i < 32;++i) e[i] = n[i];
+  e[0] &= 248;
+  e[31] &= 127;
+  e[31] |= 64;
+  for (i = 0;i < 32;++i) work[i] = p[i];
+  mainloop(work,e);
+  recip(work + 32,work + 32);
+  mult(work + 64,work,work + 32);
+  freeze(work + 64);
+  for (i = 0;i < 32;++i) q[i] = work[64 + i];
+  return 0;
+}
+
+static const unsigned char base[32] = {9};
+
+static inline int crypto_scalarmult_base(unsigned char *q,
+  const unsigned char *n)
+{
+  return crypto_scalarmult(q,n,base);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
+// This is the Ed25519 stuff from SUPERCOP:
+// http://bench.cr.yp.to/supercop.html
+
+// Also public domain, newer version than the Ed25519 found in NaCl
+
+typedef struct 
+{
+  crypto_uint32 v[32]; 
+}
+fe25519;
+
+static void fe25519_sub(fe25519 *r, const fe25519 *x, const fe25519 *y);
+
+static inline crypto_uint32 equal(crypto_uint32 a,crypto_uint32 b) /* 16-bit inputs */
+{
+  crypto_uint32 x = a ^ b; /* 0: yes; 1..65535: no */
+  x -= 1; /* 4294967295: yes; 0..65534: no */
+  x >>= 31; /* 1: yes; 0: no */
+  return x;
+}
+
+static inline crypto_uint32 ge(crypto_uint32 a,crypto_uint32 b) /* 16-bit inputs */
+{
+  unsigned int x = a;
+  x -= (unsigned int) b; /* 0..65535: yes; 4294901761..4294967295: no */
+  x >>= 31; /* 0: yes; 1: no */
+  x ^= 1; /* 1: yes; 0: no */
+  return x;
+}
+
+static inline crypto_uint32 times19(crypto_uint32 a)
+{
+  return (a << 4) + (a << 1) + a;
+}
+
+static inline crypto_uint32 times38(crypto_uint32 a)
+{
+  return (a << 5) + (a << 2) + (a << 1);
+}
+
+static inline void reduce_add_sub(fe25519 *r)
+{
+  crypto_uint32 t;
+  int i,rep;
+
+  for(rep=0;rep<4;rep++)
+  {
+    t = r->v[31] >> 7;
+    r->v[31] &= 127;
+    t = times19(t);
+    r->v[0] += t;
+    for(i=0;i<31;i++)
+    {
+      t = r->v[i] >> 8;
+      r->v[i+1] += t;
+      r->v[i] &= 255;
+    }
+  }
+}
+
+static inline void reduce_mul(fe25519 *r)
+{
+  crypto_uint32 t;
+  int i,rep;
+
+  for(rep=0;rep<2;rep++)
+  {
+    t = r->v[31] >> 7;
+    r->v[31] &= 127;
+    t = times19(t);
+    r->v[0] += t;
+    for(i=0;i<31;i++)
+    {
+      t = r->v[i] >> 8;
+      r->v[i+1] += t;
+      r->v[i] &= 255;
+    }
+  }
+}
+
+/* reduction modulo 2^255-19 */
+static inline void fe25519_freeze(fe25519 *r) 
+{
+  int i;
+  crypto_uint32 m = equal(r->v[31],127);
+  for(i=30;i>0;i--)
+    m &= equal(r->v[i],255);
+  m &= ge(r->v[0],237);
+
+  m = -m;
+
+  r->v[31] -= m&127;
+  for(i=30;i>0;i--)
+    r->v[i] -= m&255;
+  r->v[0] -= m&237;
+}
+
+static inline void fe25519_unpack(fe25519 *r, const unsigned char x[32])
+{
+  int i;
+  for(i=0;i<32;i++) r->v[i] = x[i];
+  r->v[31] &= 127;
+}
+
+/* Assumes input x being reduced below 2^255 */
+static inline void fe25519_pack(unsigned char r[32], const fe25519 *x)
+{
+  int i;
+  fe25519 y = *x;
+  fe25519_freeze(&y);
+  for(i=0;i<32;i++) 
+    r[i] = y.v[i];
+}
+
+#if 0
+static int fe25519_iszero(const fe25519 *x)
+{
+  int i;
+  int r;
+  fe25519 t = *x;
+  fe25519_freeze(&t);
+  r = equal(t.v[0],0);
+  for(i=1;i<32;i++) 
+    r &= equal(t.v[i],0);
+  return r;
+}
+#endif
+
+static inline int fe25519_iseq_vartime(const fe25519 *x, const fe25519 *y)
+{
+  int i;
+  fe25519 t1 = *x;
+  fe25519 t2 = *y;
+  fe25519_freeze(&t1);
+  fe25519_freeze(&t2);
+  for(i=0;i<32;i++)
+    if(t1.v[i] != t2.v[i]) return 0;
+  return 1;
+}
+
+static inline void fe25519_cmov(fe25519 *r, const fe25519 *x, unsigned char b)
+{
+  int i;
+  crypto_uint32 mask = b;
+  mask = -mask;
+  for(i=0;i<32;i++) r->v[i] ^= mask & (x->v[i] ^ r->v[i]);
+}
+
+static inline unsigned char fe25519_getparity(const fe25519 *x)
+{
+  fe25519 t = *x;
+  fe25519_freeze(&t);
+  return t.v[0] & 1;
+}
+
+static inline void fe25519_setone(fe25519 *r)
+{
+  int i;
+  r->v[0] = 1;
+  for(i=1;i<32;i++) r->v[i]=0;
+}
+
+static inline void fe25519_setzero(fe25519 *r)
+{
+  int i;
+  for(i=0;i<32;i++) r->v[i]=0;
+}
+
+static inline void fe25519_neg(fe25519 *r, const fe25519 *x)
+{
+  fe25519 t;
+  int i;
+  for(i=0;i<32;i++) t.v[i]=x->v[i];
+  fe25519_setzero(r);
+  fe25519_sub(r, r, &t);
+}
+
+static inline void fe25519_add(fe25519 *r, const fe25519 *x, const fe25519 *y)
+{
+  int i;
+  for(i=0;i<32;i++) r->v[i] = x->v[i] + y->v[i];
+  reduce_add_sub(r);
+}
+
+static inline void fe25519_sub(fe25519 *r, const fe25519 *x, const fe25519 *y)
+{
+  int i;
+  crypto_uint32 t[32];
+  t[0] = x->v[0] + 0x1da;
+  t[31] = x->v[31] + 0xfe;
+  for(i=1;i<31;i++) t[i] = x->v[i] + 0x1fe;
+  for(i=0;i<32;i++) r->v[i] = t[i] - y->v[i];
+  reduce_add_sub(r);
+}
+
+static inline void fe25519_mul(fe25519 *r, const fe25519 *x, const fe25519 *y)
+{
+  int i,j;
+  crypto_uint32 t[63];
+  for(i=0;i<63;i++)t[i] = 0;
+
+  for(i=0;i<32;i++)
+    for(j=0;j<32;j++)
+      t[i+j] += x->v[i] * y->v[j];
+
+  for(i=32;i<63;i++)
+    r->v[i-32] = t[i-32] + times38(t[i]); 
+  r->v[31] = t[31]; /* result now in r[0]...r[31] */
+
+  reduce_mul(r);
+}
+
+static inline void fe25519_square(fe25519 *r, const fe25519 *x)
+{
+  fe25519_mul(r, x, x);
+}
+
+static void fe25519_invert(fe25519 *r, const fe25519 *x)
+{
+  fe25519 z2;
+  fe25519 z9;
+  fe25519 z11;
+  fe25519 z2_5_0;
+  fe25519 z2_10_0;
+  fe25519 z2_20_0;
+  fe25519 z2_50_0;
+  fe25519 z2_100_0;
+  fe25519 t0;
+  fe25519 t1;
+  int i;
+  
+  /* 2 */ fe25519_square(&z2,x);
+  /* 4 */ fe25519_square(&t1,&z2);
+  /* 8 */ fe25519_square(&t0,&t1);
+  /* 9 */ fe25519_mul(&z9,&t0,x);
+  /* 11 */ fe25519_mul(&z11,&z9,&z2);
+  /* 22 */ fe25519_square(&t0,&z11);
+  /* 2^5 - 2^0 = 31 */ fe25519_mul(&z2_5_0,&t0,&z9);
+
+  /* 2^6 - 2^1 */ fe25519_square(&t0,&z2_5_0);
+  /* 2^7 - 2^2 */ fe25519_square(&t1,&t0);
+  /* 2^8 - 2^3 */ fe25519_square(&t0,&t1);
+  /* 2^9 - 2^4 */ fe25519_square(&t1,&t0);
+  /* 2^10 - 2^5 */ fe25519_square(&t0,&t1);
+  /* 2^10 - 2^0 */ fe25519_mul(&z2_10_0,&t0,&z2_5_0);
+
+  /* 2^11 - 2^1 */ fe25519_square(&t0,&z2_10_0);
+  /* 2^12 - 2^2 */ fe25519_square(&t1,&t0);
+  /* 2^20 - 2^10 */ for (i = 2;i < 10;i += 2) { fe25519_square(&t0,&t1); fe25519_square(&t1,&t0); }
+  /* 2^20 - 2^0 */ fe25519_mul(&z2_20_0,&t1,&z2_10_0);
+
+  /* 2^21 - 2^1 */ fe25519_square(&t0,&z2_20_0);
+  /* 2^22 - 2^2 */ fe25519_square(&t1,&t0);
+  /* 2^40 - 2^20 */ for (i = 2;i < 20;i += 2) { fe25519_square(&t0,&t1); fe25519_square(&t1,&t0); }
+  /* 2^40 - 2^0 */ fe25519_mul(&t0,&t1,&z2_20_0);
+
+  /* 2^41 - 2^1 */ fe25519_square(&t1,&t0);
+  /* 2^42 - 2^2 */ fe25519_square(&t0,&t1);
+  /* 2^50 - 2^10 */ for (i = 2;i < 10;i += 2) { fe25519_square(&t1,&t0); fe25519_square(&t0,&t1); }
+  /* 2^50 - 2^0 */ fe25519_mul(&z2_50_0,&t0,&z2_10_0);
+
+  /* 2^51 - 2^1 */ fe25519_square(&t0,&z2_50_0);
+  /* 2^52 - 2^2 */ fe25519_square(&t1,&t0);
+  /* 2^100 - 2^50 */ for (i = 2;i < 50;i += 2) { fe25519_square(&t0,&t1); fe25519_square(&t1,&t0); }
+  /* 2^100 - 2^0 */ fe25519_mul(&z2_100_0,&t1,&z2_50_0);
+
+  /* 2^101 - 2^1 */ fe25519_square(&t1,&z2_100_0);
+  /* 2^102 - 2^2 */ fe25519_square(&t0,&t1);
+  /* 2^200 - 2^100 */ for (i = 2;i < 100;i += 2) { fe25519_square(&t1,&t0); fe25519_square(&t0,&t1); }
+  /* 2^200 - 2^0 */ fe25519_mul(&t1,&t0,&z2_100_0);
+
+  /* 2^201 - 2^1 */ fe25519_square(&t0,&t1);
+  /* 2^202 - 2^2 */ fe25519_square(&t1,&t0);
+  /* 2^250 - 2^50 */ for (i = 2;i < 50;i += 2) { fe25519_square(&t0,&t1); fe25519_square(&t1,&t0); }
+  /* 2^250 - 2^0 */ fe25519_mul(&t0,&t1,&z2_50_0);
+
+  /* 2^251 - 2^1 */ fe25519_square(&t1,&t0);
+  /* 2^252 - 2^2 */ fe25519_square(&t0,&t1);
+  /* 2^253 - 2^3 */ fe25519_square(&t1,&t0);
+  /* 2^254 - 2^4 */ fe25519_square(&t0,&t1);
+  /* 2^255 - 2^5 */ fe25519_square(&t1,&t0);
+  /* 2^255 - 21 */ fe25519_mul(r,&t1,&z11);
+}
+
+static void fe25519_pow2523(fe25519 *r, const fe25519 *x)
+{
+  fe25519 z2;
+  fe25519 z9;
+  fe25519 z11;
+  fe25519 z2_5_0;
+  fe25519 z2_10_0;
+  fe25519 z2_20_0;
+  fe25519 z2_50_0;
+  fe25519 z2_100_0;
+  fe25519 t;
+  int i;
+    
+  /* 2 */ fe25519_square(&z2,x);
+  /* 4 */ fe25519_square(&t,&z2);
+  /* 8 */ fe25519_square(&t,&t);
+  /* 9 */ fe25519_mul(&z9,&t,x);
+  /* 11 */ fe25519_mul(&z11,&z9,&z2);
+  /* 22 */ fe25519_square(&t,&z11);
+  /* 2^5 - 2^0 = 31 */ fe25519_mul(&z2_5_0,&t,&z9);
+
+  /* 2^6 - 2^1 */ fe25519_square(&t,&z2_5_0);
+  /* 2^10 - 2^5 */ for (i = 1;i < 5;i++) { fe25519_square(&t,&t); }
+  /* 2^10 - 2^0 */ fe25519_mul(&z2_10_0,&t,&z2_5_0);
+
+  /* 2^11 - 2^1 */ fe25519_square(&t,&z2_10_0);
+  /* 2^20 - 2^10 */ for (i = 1;i < 10;i++) { fe25519_square(&t,&t); }
+  /* 2^20 - 2^0 */ fe25519_mul(&z2_20_0,&t,&z2_10_0);
+
+  /* 2^21 - 2^1 */ fe25519_square(&t,&z2_20_0);
+  /* 2^40 - 2^20 */ for (i = 1;i < 20;i++) { fe25519_square(&t,&t); }
+  /* 2^40 - 2^0 */ fe25519_mul(&t,&t,&z2_20_0);
+
+  /* 2^41 - 2^1 */ fe25519_square(&t,&t);
+  /* 2^50 - 2^10 */ for (i = 1;i < 10;i++) { fe25519_square(&t,&t); }
+  /* 2^50 - 2^0 */ fe25519_mul(&z2_50_0,&t,&z2_10_0);
+
+  /* 2^51 - 2^1 */ fe25519_square(&t,&z2_50_0);
+  /* 2^100 - 2^50 */ for (i = 1;i < 50;i++) { fe25519_square(&t,&t); }
+  /* 2^100 - 2^0 */ fe25519_mul(&z2_100_0,&t,&z2_50_0);
+
+  /* 2^101 - 2^1 */ fe25519_square(&t,&z2_100_0);
+  /* 2^200 - 2^100 */ for (i = 1;i < 100;i++) { fe25519_square(&t,&t); }
+  /* 2^200 - 2^0 */ fe25519_mul(&t,&t,&z2_100_0);
+
+  /* 2^201 - 2^1 */ fe25519_square(&t,&t);
+  /* 2^250 - 2^50 */ for (i = 1;i < 50;i++) { fe25519_square(&t,&t); }
+  /* 2^250 - 2^0 */ fe25519_mul(&t,&t,&z2_50_0);
+
+  /* 2^251 - 2^1 */ fe25519_square(&t,&t);
+  /* 2^252 - 2^2 */ fe25519_square(&t,&t);
+  /* 2^252 - 3 */ fe25519_mul(r,&t,x);
+}
+
+typedef struct 
+{
+  crypto_uint32 v[32]; 
+}
+sc25519;
+
+typedef struct 
+{
+  crypto_uint32 v[16]; 
+}
+shortsc25519;
+
+static const crypto_uint32 m[32] = {0xED, 0xD3, 0xF5, 0x5C, 0x1A, 0x63, 0x12, 0x58, 0xD6, 0x9C, 0xF7, 0xA2, 0xDE, 0xF9, 0xDE, 0x14, 
+                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10};
+
+static const crypto_uint32 mu[33] = {0x1B, 0x13, 0x2C, 0x0A, 0xA3, 0xE5, 0x9C, 0xED, 0xA7, 0x29, 0x63, 0x08, 0x5D, 0x21, 0x06, 0x21, 
+                                     0xEB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F};
+
+static inline crypto_uint32 lt(crypto_uint32 a,crypto_uint32 b) /* 16-bit inputs */
+{
+  unsigned int x = a;
+  x -= (unsigned int) b; /* 0..65535: no; 4294901761..4294967295: yes */
+  x >>= 31; /* 0: no; 1: yes */
+  return x;
+}
+
+/* Reduce coefficients of r before calling reduce_add_sub */
+static inline void reduce_add_sub(sc25519 *r)
+{
+  crypto_uint32 pb = 0;
+  crypto_uint32 b;
+  crypto_uint32 mask;
+  int i;
+  unsigned char t[32];
+
+  for(i=0;i<32;i++) 
+  {
+    pb += m[i];
+    b = lt(r->v[i],pb);
+    t[i] = r->v[i]-pb+(b<<8);
+    pb = b;
+  }
+  mask = b - 1;
+  for(i=0;i<32;i++) 
+    r->v[i] ^= mask & (r->v[i] ^ t[i]);
+}
+
+/* Reduce coefficients of x before calling barrett_reduce */
+static inline void barrett_reduce(sc25519 *r, const crypto_uint32 x[64])
+{
+  /* See HAC, Alg. 14.42 */
+  int i,j;
+  crypto_uint32 q2[66];
+  crypto_uint32 *q3 = q2 + 33;
+  crypto_uint32 r1[33];
+  crypto_uint32 r2[33];
+  crypto_uint32 carry;
+  crypto_uint32 pb = 0;
+  crypto_uint32 b;
+
+  for (i = 0;i < 66;++i) q2[i] = 0;
+  for (i = 0;i < 33;++i) r2[i] = 0;
+
+  for(i=0;i<33;i++)
+    for(j=0;j<33;j++)
+      if(i+j >= 31) q2[i+j] += mu[i]*x[j+31];
+  carry = q2[31] >> 8;
+  q2[32] += carry;
+  carry = q2[32] >> 8;
+  q2[33] += carry;
+
+  for(i=0;i<33;i++)r1[i] = x[i];
+  for(i=0;i<32;i++)
+    for(j=0;j<33;j++)
+      if(i+j < 33) r2[i+j] += m[i]*q3[j];
+
+  for(i=0;i<32;i++)
+  {
+    carry = r2[i] >> 8;
+    r2[i+1] += carry;
+    r2[i] &= 0xff;
+  }
+
+  for(i=0;i<32;i++) 
+  {
+    pb += r2[i];
+    b = lt(r1[i],pb);
+    r->v[i] = r1[i]-pb+(b<<8);
+    pb = b;
+  }
+
+  /* XXX: Can it really happen that r<0?, See HAC, Alg 14.42, Step 3 
+   * If so: Handle  it here!
+   */
+
+  reduce_add_sub(r);
+  reduce_add_sub(r);
+}
+
+static inline void sc25519_from32bytes(sc25519 *r, const unsigned char x[32])
+{
+  int i;
+  crypto_uint32 t[64];
+  for(i=0;i<32;i++) t[i] = x[i];
+  for(i=32;i<64;++i) t[i] = 0;
+  barrett_reduce(r, t);
+}
+
+#if 0
+static void shortsc25519_from16bytes(shortsc25519 *r, const unsigned char x[16])
+{
+  int i;
+  for(i=0;i<16;i++) r->v[i] = x[i];
+}
+#endif
+
+static inline void sc25519_from64bytes(sc25519 *r, const unsigned char x[64])
+{
+  int i;
+  crypto_uint32 t[64];
+  for(i=0;i<64;i++) t[i] = x[i];
+  barrett_reduce(r, t);
+}
+
+#if 0
+static void sc25519_from_shortsc(sc25519 *r, const shortsc25519 *x)
+{
+  int i;
+  for(i=0;i<16;i++)
+    r->v[i] = x->v[i];
+  for(i=0;i<16;i++)
+    r->v[16+i] = 0;
+}
+#endif
+
+static inline void sc25519_to32bytes(unsigned char r[32], const sc25519 *x)
+{
+  int i;
+  for(i=0;i<32;i++) r[i] = x->v[i];
+}
+
+#if 0
+static int sc25519_iszero_vartime(const sc25519 *x)
+{
+  int i;
+  for(i=0;i<32;i++)
+    if(x->v[i] != 0) return 0;
+  return 1;
+}
+#endif
+
+#if 0
+static int sc25519_isshort_vartime(const sc25519 *x)
+{
+  int i;
+  for(i=31;i>15;i--)
+    if(x->v[i] != 0) return 0;
+  return 1;
+}
+#endif
+
+#if 0
+static int sc25519_lt_vartime(const sc25519 *x, const sc25519 *y)
+{
+  int i;
+  for(i=31;i>=0;i--)
+  {
+    if(x->v[i] < y->v[i]) return 1;
+    if(x->v[i] > y->v[i]) return 0;
+  }
+  return 0;
+}
+#endif
+
+static inline void sc25519_add(sc25519 *r, const sc25519 *x, const sc25519 *y)
+{
+  int i, carry;
+  for(i=0;i<32;i++) r->v[i] = x->v[i] + y->v[i];
+  for(i=0;i<31;i++)
+  {
+    carry = r->v[i] >> 8;
+    r->v[i+1] += carry;
+    r->v[i] &= 0xff;
+  }
+  reduce_add_sub(r);
+}
+
+#if 0
+static void sc25519_sub_nored(sc25519 *r, const sc25519 *x, const sc25519 *y)
+{
+  crypto_uint32 b = 0;
+  crypto_uint32 t;
+  int i;
+  for(i=0;i<32;i++)
+  {
+    t = x->v[i] - y->v[i] - b;
+    r->v[i] = t & 255;
+    b = (t >> 8) & 1;
+  }
+}
+#endif
+
+static inline void sc25519_mul(sc25519 *r, const sc25519 *x, const sc25519 *y)
+{
+  int i,j,carry;
+  crypto_uint32 t[64];
+  for(i=0;i<64;i++)t[i] = 0;
+
+  for(i=0;i<32;i++)
+    for(j=0;j<32;j++)
+      t[i+j] += x->v[i] * y->v[j];
+
+  /* Reduce coefficients */
+  for(i=0;i<63;i++)
+  {
+    carry = t[i] >> 8;
+    t[i+1] += carry;
+    t[i] &= 0xff;
+  }
+
+  barrett_reduce(r, t);
+}
+
+#if 0
+static void sc25519_mul_shortsc(sc25519 *r, const sc25519 *x, const shortsc25519 *y)
+{
+  sc25519 t;
+  sc25519_from_shortsc(&t, y);
+  sc25519_mul(r, x, &t);
+}
+#endif
+
+static inline void sc25519_window3(signed char r[85], const sc25519 *s)
+{
+  char carry;
+  int i;
+  for(i=0;i<10;i++)
+  {
+    r[8*i+0]  =  s->v[3*i+0]       & 7;
+    r[8*i+1]  = (s->v[3*i+0] >> 3) & 7;
+    r[8*i+2]  = (s->v[3*i+0] >> 6) & 7;
+    r[8*i+2] ^= (s->v[3*i+1] << 2) & 7;
+    r[8*i+3]  = (s->v[3*i+1] >> 1) & 7;
+    r[8*i+4]  = (s->v[3*i+1] >> 4) & 7;
+    r[8*i+5]  = (s->v[3*i+1] >> 7) & 7;
+    r[8*i+5] ^= (s->v[3*i+2] << 1) & 7;
+    r[8*i+6]  = (s->v[3*i+2] >> 2) & 7;
+    r[8*i+7]  = (s->v[3*i+2] >> 5) & 7;
+  }
+  r[8*i+0]  =  s->v[3*i+0]       & 7;
+  r[8*i+1]  = (s->v[3*i+0] >> 3) & 7;
+  r[8*i+2]  = (s->v[3*i+0] >> 6) & 7;
+  r[8*i+2] ^= (s->v[3*i+1] << 2) & 7;
+  r[8*i+3]  = (s->v[3*i+1] >> 1) & 7;
+  r[8*i+4]  = (s->v[3*i+1] >> 4) & 7;
+
+  /* Making it signed */
+  carry = 0;
+  for(i=0;i<84;i++)
+  {
+    r[i] += carry;
+    r[i+1] += r[i] >> 3;
+    r[i] &= 7;
+    carry = r[i] >> 2;
+    r[i] -= carry<<3;
+  }
+  r[84] += carry;
+}
+
+#if 0
+static void sc25519_window5(signed char r[51], const sc25519 *s)
+{
+  char carry;
+  int i;
+  for(i=0;i<6;i++)
+  {
+    r[8*i+0]  =  s->v[5*i+0]       & 31;
+    r[8*i+1]  = (s->v[5*i+0] >> 5) & 31;
+    r[8*i+1] ^= (s->v[5*i+1] << 3) & 31;
+    r[8*i+2]  = (s->v[5*i+1] >> 2) & 31;
+    r[8*i+3]  = (s->v[5*i+1] >> 7) & 31;
+    r[8*i+3] ^= (s->v[5*i+2] << 1) & 31;
+    r[8*i+4]  = (s->v[5*i+2] >> 4) & 31;
+    r[8*i+4] ^= (s->v[5*i+3] << 4) & 31;
+    r[8*i+5]  = (s->v[5*i+3] >> 1) & 31;
+    r[8*i+6]  = (s->v[5*i+3] >> 6) & 31;
+    r[8*i+6] ^= (s->v[5*i+4] << 2) & 31;
+    r[8*i+7]  = (s->v[5*i+4] >> 3) & 31;
+  }
+  r[8*i+0]  =  s->v[5*i+0]       & 31;
+  r[8*i+1]  = (s->v[5*i+0] >> 5) & 31;
+  r[8*i+1] ^= (s->v[5*i+1] << 3) & 31;
+  r[8*i+2]  = (s->v[5*i+1] >> 2) & 31;
+
+  /* Making it signed */
+  carry = 0;
+  for(i=0;i<50;i++)
+  {
+    r[i] += carry;
+    r[i+1] += r[i] >> 5;
+    r[i] &= 31;
+    carry = r[i] >> 4;
+    r[i] -= carry<<5;
+  }
+  r[50] += carry;
+}
+#endif
+
+static inline void sc25519_2interleave2(unsigned char r[127], const sc25519 *s1, const sc25519 *s2)
+{
+  int i;
+  for(i=0;i<31;i++)
+  {
+    r[4*i]   = ( s1->v[i]       & 3) ^ (( s2->v[i]       & 3) << 2);
+    r[4*i+1] = ((s1->v[i] >> 2) & 3) ^ (((s2->v[i] >> 2) & 3) << 2);
+    r[4*i+2] = ((s1->v[i] >> 4) & 3) ^ (((s2->v[i] >> 4) & 3) << 2);
+    r[4*i+3] = ((s1->v[i] >> 6) & 3) ^ (((s2->v[i] >> 6) & 3) << 2);
+  }
+  r[124] = ( s1->v[31]       & 3) ^ (( s2->v[31]       & 3) << 2);
+  r[125] = ((s1->v[31] >> 2) & 3) ^ (((s2->v[31] >> 2) & 3) << 2);
+  r[126] = ((s1->v[31] >> 4) & 3) ^ (((s2->v[31] >> 4) & 3) << 2);
+}
+
+typedef struct
+{
+  fe25519 x;
+  fe25519 y;
+  fe25519 z;
+  fe25519 t;
+} ge25519;
+
+/* d */
+static const fe25519 ge25519_ecd = {{0xA3, 0x78, 0x59, 0x13, 0xCA, 0x4D, 0xEB, 0x75, 0xAB, 0xD8, 0x41, 0x41, 0x4D, 0x0A, 0x70, 0x00, 
+                      0x98, 0xE8, 0x79, 0x77, 0x79, 0x40, 0xC7, 0x8C, 0x73, 0xFE, 0x6F, 0x2B, 0xEE, 0x6C, 0x03, 0x52}};
+/* 2*d */
+static const fe25519 ge25519_ec2d = {{0x59, 0xF1, 0xB2, 0x26, 0x94, 0x9B, 0xD6, 0xEB, 0x56, 0xB1, 0x83, 0x82, 0x9A, 0x14, 0xE0, 0x00, 
+                       0x30, 0xD1, 0xF3, 0xEE, 0xF2, 0x80, 0x8E, 0x19, 0xE7, 0xFC, 0xDF, 0x56, 0xDC, 0xD9, 0x06, 0x24}};
+/* sqrt(-1) */
+static const fe25519 ge25519_sqrtm1 = {{0xB0, 0xA0, 0x0E, 0x4A, 0x27, 0x1B, 0xEE, 0xC4, 0x78, 0xE4, 0x2F, 0xAD, 0x06, 0x18, 0x43, 0x2F, 
+                         0xA7, 0xD7, 0xFB, 0x3D, 0x99, 0x00, 0x4D, 0x2B, 0x0B, 0xDF, 0xC1, 0x4F, 0x80, 0x24, 0x83, 0x2B}};
+
+#define ge25519_p3 ge25519
+
+typedef struct
+{
+  fe25519 x;
+  fe25519 z;
+  fe25519 y;
+  fe25519 t;
+} ge25519_p1p1;
+
+typedef struct
+{
+  fe25519 x;
+  fe25519 y;
+  fe25519 z;
+} ge25519_p2;
+
+typedef struct
+{
+  fe25519 x;
+  fe25519 y;
+} ge25519_aff;
+
+
+/* Packed coordinates of the base point */
+static const ge25519 ge25519_base = {{{0x1A, 0xD5, 0x25, 0x8F, 0x60, 0x2D, 0x56, 0xC9, 0xB2, 0xA7, 0x25, 0x95, 0x60, 0xC7, 0x2C, 0x69, 
+                                0x5C, 0xDC, 0xD6, 0xFD, 0x31, 0xE2, 0xA4, 0xC0, 0xFE, 0x53, 0x6E, 0xCD, 0xD3, 0x36, 0x69, 0x21}},
+                              {{0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
+                                0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}},
+                              {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
+                              {{0xA3, 0xDD, 0xB7, 0xA5, 0xB3, 0x8A, 0xDE, 0x6D, 0xF5, 0x52, 0x51, 0x77, 0x80, 0x9F, 0xF0, 0x20, 
+                                0x7D, 0xE3, 0xAB, 0x64, 0x8E, 0x4E, 0xEA, 0x66, 0x65, 0x76, 0x8B, 0xD7, 0x0F, 0x5F, 0x87, 0x67}}};
+
+/* Multiples of the base point in affine representation */
+static const ge25519_aff ge25519_base_multiples_affine[425] = {
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x1a, 0xd5, 0x25, 0x8f, 0x60, 0x2d, 0x56, 0xc9, 0xb2, 0xa7, 0x25, 0x95, 0x60, 0xc7, 0x2c, 0x69, 0x5c, 0xdc, 0xd6, 0xfd, 0x31, 0xe2, 0xa4, 0xc0, 0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21}} ,
+ {{0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}}},
+{{{0x0e, 0xce, 0x43, 0x28, 0x4e, 0xa1, 0xc5, 0x83, 0x5f, 0xa4, 0xd7, 0x15, 0x45, 0x8e, 0x0d, 0x08, 0xac, 0xe7, 0x33, 0x18, 0x7d, 0x3b, 0x04, 0x3d, 0x6c, 0x04, 0x5a, 0x9f, 0x4c, 0x38, 0xab, 0x36}} ,
+ {{0xc9, 0xa3, 0xf8, 0x6a, 0xae, 0x46, 0x5f, 0x0e, 0x56, 0x51, 0x38, 0x64, 0x51, 0x0f, 0x39, 0x97, 0x56, 0x1f, 0xa2, 0xc9, 0xe8, 0x5e, 0xa2, 0x1d, 0xc2, 0x29, 0x23, 0x09, 0xf3, 0xcd, 0x60, 0x22}}},
+{{{0x5c, 0xe2, 0xf8, 0xd3, 0x5f, 0x48, 0x62, 0xac, 0x86, 0x48, 0x62, 0x81, 0x19, 0x98, 0x43, 0x63, 0x3a, 0xc8, 0xda, 0x3e, 0x74, 0xae, 0xf4, 0x1f, 0x49, 0x8f, 0x92, 0x22, 0x4a, 0x9c, 0xae, 0x67}} ,
+ {{0xd4, 0xb4, 0xf5, 0x78, 0x48, 0x68, 0xc3, 0x02, 0x04, 0x03, 0x24, 0x67, 0x17, 0xec, 0x16, 0x9f, 0xf7, 0x9e, 0x26, 0x60, 0x8e, 0xa1, 0x26, 0xa1, 0xab, 0x69, 0xee, 0x77, 0xd1, 0xb1, 0x67, 0x12}}},
+{{{0x70, 0xf8, 0xc9, 0xc4, 0x57, 0xa6, 0x3a, 0x49, 0x47, 0x15, 0xce, 0x93, 0xc1, 0x9e, 0x73, 0x1a, 0xf9, 0x20, 0x35, 0x7a, 0xb8, 0xd4, 0x25, 0x83, 0x46, 0xf1, 0xcf, 0x56, 0xdb, 0xa8, 0x3d, 0x20}} ,
+ {{0x2f, 0x11, 0x32, 0xca, 0x61, 0xab, 0x38, 0xdf, 0xf0, 0x0f, 0x2f, 0xea, 0x32, 0x28, 0xf2, 0x4c, 0x6c, 0x71, 0xd5, 0x80, 0x85, 0xb8, 0x0e, 0x47, 0xe1, 0x95, 0x15, 0xcb, 0x27, 0xe8, 0xd0, 0x47}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xc8, 0x84, 0xa5, 0x08, 0xbc, 0xfd, 0x87, 0x3b, 0x99, 0x8b, 0x69, 0x80, 0x7b, 0xc6, 0x3a, 0xeb, 0x93, 0xcf, 0x4e, 0xf8, 0x5c, 0x2d, 0x86, 0x42, 0xb6, 0x71, 0xd7, 0x97, 0x5f, 0xe1, 0x42, 0x67}} ,
+ {{0xb4, 0xb9, 0x37, 0xfc, 0xa9, 0x5b, 0x2f, 0x1e, 0x93, 0xe4, 0x1e, 0x62, 0xfc, 0x3c, 0x78, 0x81, 0x8f, 0xf3, 0x8a, 0x66, 0x09, 0x6f, 0xad, 0x6e, 0x79, 0x73, 0xe5, 0xc9, 0x00, 0x06, 0xd3, 0x21}}},
+{{{0xf8, 0xf9, 0x28, 0x6c, 0x6d, 0x59, 0xb2, 0x59, 0x74, 0x23, 0xbf, 0xe7, 0x33, 0x8d, 0x57, 0x09, 0x91, 0x9c, 0x24, 0x08, 0x15, 0x2b, 0xe2, 0xb8, 0xee, 0x3a, 0xe5, 0x27, 0x06, 0x86, 0xa4, 0x23}} ,
+ {{0xeb, 0x27, 0x67, 0xc1, 0x37, 0xab, 0x7a, 0xd8, 0x27, 0x9c, 0x07, 0x8e, 0xff, 0x11, 0x6a, 0xb0, 0x78, 0x6e, 0xad, 0x3a, 0x2e, 0x0f, 0x98, 0x9f, 0x72, 0xc3, 0x7f, 0x82, 0xf2, 0x96, 0x96, 0x70}}},
+{{{0x81, 0x6b, 0x88, 0xe8, 0x1e, 0xc7, 0x77, 0x96, 0x0e, 0xa1, 0xa9, 0x52, 0xe0, 0xd8, 0x0e, 0x61, 0x9e, 0x79, 0x2d, 0x95, 0x9c, 0x8d, 0x96, 0xe0, 0x06, 0x40, 0x5d, 0x87, 0x28, 0x5f, 0x98, 0x70}} ,
+ {{0xf1, 0x79, 0x7b, 0xed, 0x4f, 0x44, 0xb2, 0xe7, 0x08, 0x0d, 0xc2, 0x08, 0x12, 0xd2, 0x9f, 0xdf, 0xcd, 0x93, 0x20, 0x8a, 0xcf, 0x33, 0xca, 0x6d, 0x89, 0xb9, 0x77, 0xc8, 0x93, 0x1b, 0x4e, 0x60}}},
+{{{0x26, 0x4f, 0x7e, 0x97, 0xf6, 0x40, 0xdd, 0x4f, 0xfc, 0x52, 0x78, 0xf9, 0x90, 0x31, 0x03, 0xe6, 0x7d, 0x56, 0x39, 0x0b, 0x1d, 0x56, 0x82, 0x85, 0xf9, 0x1a, 0x42, 0x17, 0x69, 0x6c, 0xcf, 0x39}} ,
+ {{0x69, 0xd2, 0x06, 0x3a, 0x4f, 0x39, 0x2d, 0xf9, 0x38, 0x40, 0x8c, 0x4c, 0xe7, 0x05, 0x12, 0xb4, 0x78, 0x8b, 0xf8, 0xc0, 0xec, 0x93, 0xde, 0x7a, 0x6b, 0xce, 0x2c, 0xe1, 0x0e, 0xa9, 0x34, 0x44}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x0b, 0xa4, 0x3c, 0xb0, 0x0f, 0x7a, 0x51, 0xf1, 0x78, 0xd6, 0xd9, 0x6a, 0xfd, 0x46, 0xe8, 0xb8, 0xa8, 0x79, 0x1d, 0x87, 0xf9, 0x90, 0xf2, 0x9c, 0x13, 0x29, 0xf8, 0x0b, 0x20, 0x64, 0xfa, 0x05}} ,
+ {{0x26, 0x09, 0xda, 0x17, 0xaf, 0x95, 0xd6, 0xfb, 0x6a, 0x19, 0x0d, 0x6e, 0x5e, 0x12, 0xf1, 0x99, 0x4c, 0xaa, 0xa8, 0x6f, 0x79, 0x86, 0xf4, 0x72, 0x28, 0x00, 0x26, 0xf9, 0xea, 0x9e, 0x19, 0x3d}}},
+{{{0x87, 0xdd, 0xcf, 0xf0, 0x5b, 0x49, 0xa2, 0x5d, 0x40, 0x7a, 0x23, 0x26, 0xa4, 0x7a, 0x83, 0x8a, 0xb7, 0x8b, 0xd2, 0x1a, 0xbf, 0xea, 0x02, 0x24, 0x08, 0x5f, 0x7b, 0xa9, 0xb1, 0xbe, 0x9d, 0x37}} ,
+ {{0xfc, 0x86, 0x4b, 0x08, 0xee, 0xe7, 0xa0, 0xfd, 0x21, 0x45, 0x09, 0x34, 0xc1, 0x61, 0x32, 0x23, 0xfc, 0x9b, 0x55, 0x48, 0x53, 0x99, 0xf7, 0x63, 0xd0, 0x99, 0xce, 0x01, 0xe0, 0x9f, 0xeb, 0x28}}},
+{{{0x47, 0xfc, 0xab, 0x5a, 0x17, 0xf0, 0x85, 0x56, 0x3a, 0x30, 0x86, 0x20, 0x28, 0x4b, 0x8e, 0x44, 0x74, 0x3a, 0x6e, 0x02, 0xf1, 0x32, 0x8f, 0x9f, 0x3f, 0x08, 0x35, 0xe9, 0xca, 0x16, 0x5f, 0x6e}} ,
+ {{0x1c, 0x59, 0x1c, 0x65, 0x5d, 0x34, 0xa4, 0x09, 0xcd, 0x13, 0x9c, 0x70, 0x7d, 0xb1, 0x2a, 0xc5, 0x88, 0xaf, 0x0b, 0x60, 0xc7, 0x9f, 0x34, 0x8d, 0xd6, 0xb7, 0x7f, 0xea, 0x78, 0x65, 0x8d, 0x77}}},
+{{{0x56, 0xa5, 0xc2, 0x0c, 0xdd, 0xbc, 0xb8, 0x20, 0x6d, 0x57, 0x61, 0xb5, 0xfb, 0x78, 0xb5, 0xd4, 0x49, 0x54, 0x90, 0x26, 0xc1, 0xcb, 0xe9, 0xe6, 0xbf, 0xec, 0x1d, 0x4e, 0xed, 0x07, 0x7e, 0x5e}} ,
+ {{0xc7, 0xf6, 0x6c, 0x56, 0x31, 0x20, 0x14, 0x0e, 0xa8, 0xd9, 0x27, 0xc1, 0x9a, 0x3d, 0x1b, 0x7d, 0x0e, 0x26, 0xd3, 0x81, 0xaa, 0xeb, 0xf5, 0x6b, 0x79, 0x02, 0xf1, 0x51, 0x5c, 0x75, 0x55, 0x0f}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x0a, 0x34, 0xcd, 0x82, 0x3c, 0x33, 0x09, 0x54, 0xd2, 0x61, 0x39, 0x30, 0x9b, 0xfd, 0xef, 0x21, 0x26, 0xd4, 0x70, 0xfa, 0xee, 0xf9, 0x31, 0x33, 0x73, 0x84, 0xd0, 0xb3, 0x81, 0xbf, 0xec, 0x2e}} ,
+ {{0xe8, 0x93, 0x8b, 0x00, 0x64, 0xf7, 0x9c, 0xb8, 0x74, 0xe0, 0xe6, 0x49, 0x48, 0x4d, 0x4d, 0x48, 0xb6, 0x19, 0xa1, 0x40, 0xb7, 0xd9, 0x32, 0x41, 0x7c, 0x82, 0x37, 0xa1, 0x2d, 0xdc, 0xd2, 0x54}}},
+{{{0x68, 0x2b, 0x4a, 0x5b, 0xd5, 0xc7, 0x51, 0x91, 0x1d, 0xe1, 0x2a, 0x4b, 0xc4, 0x47, 0xf1, 0xbc, 0x7a, 0xb3, 0xcb, 0xc8, 0xb6, 0x7c, 0xac, 0x90, 0x05, 0xfd, 0xf3, 0xf9, 0x52, 0x3a, 0x11, 0x6b}} ,
+ {{0x3d, 0xc1, 0x27, 0xf3, 0x59, 0x43, 0x95, 0x90, 0xc5, 0x96, 0x79, 0xf5, 0xf4, 0x95, 0x65, 0x29, 0x06, 0x9c, 0x51, 0x05, 0x18, 0xda, 0xb8, 0x2e, 0x79, 0x7e, 0x69, 0x59, 0x71, 0x01, 0xeb, 0x1a}}},
+{{{0x15, 0x06, 0x49, 0xb6, 0x8a, 0x3c, 0xea, 0x2f, 0x34, 0x20, 0x14, 0xc3, 0xaa, 0xd6, 0xaf, 0x2c, 0x3e, 0xbd, 0x65, 0x20, 0xe2, 0x4d, 0x4b, 0x3b, 0xeb, 0x9f, 0x4a, 0xc3, 0xad, 0xa4, 0x3b, 0x60}} ,
+ {{0xbc, 0x58, 0xe6, 0xc0, 0x95, 0x2a, 0x2a, 0x81, 0x9a, 0x7a, 0xf3, 0xd2, 0x06, 0xbe, 0x48, 0xbc, 0x0c, 0xc5, 0x46, 0xe0, 0x6a, 0xd4, 0xac, 0x0f, 0xd9, 0xcc, 0x82, 0x34, 0x2c, 0xaf, 0xdb, 0x1f}}},
+{{{0xf7, 0x17, 0x13, 0xbd, 0xfb, 0xbc, 0xd2, 0xec, 0x45, 0xb3, 0x15, 0x31, 0xe9, 0xaf, 0x82, 0x84, 0x3d, 0x28, 0xc6, 0xfc, 0x11, 0xf5, 0x41, 0xb5, 0x8b, 0xd3, 0x12, 0x76, 0x52, 0xe7, 0x1a, 0x3c}} ,
+ {{0x4e, 0x36, 0x11, 0x07, 0xa2, 0x15, 0x20, 0x51, 0xc4, 0x2a, 0xc3, 0x62, 0x8b, 0x5e, 0x7f, 0xa6, 0x0f, 0xf9, 0x45, 0x85, 0x6c, 0x11, 0x86, 0xb7, 0x7e, 0xe5, 0xd7, 0xf9, 0xc3, 0x91, 0x1c, 0x05}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xea, 0xd6, 0xde, 0x29, 0x3a, 0x00, 0xb9, 0x02, 0x59, 0xcb, 0x26, 0xc4, 0xba, 0x99, 0xb1, 0x97, 0x2f, 0x8e, 0x00, 0x92, 0x26, 0x4f, 0x52, 0xeb, 0x47, 0x1b, 0x89, 0x8b, 0x24, 0xc0, 0x13, 0x7d}} ,
+ {{0xd5, 0x20, 0x5b, 0x80, 0xa6, 0x80, 0x20, 0x95, 0xc3, 0xe9, 0x9f, 0x8e, 0x87, 0x9e, 0x1e, 0x9e, 0x7a, 0xc7, 0xcc, 0x75, 0x6c, 0xa5, 0xf1, 0x91, 0x1a, 0xa8, 0x01, 0x2c, 0xab, 0x76, 0xa9, 0x59}}},
+{{{0xde, 0xc9, 0xb1, 0x31, 0x10, 0x16, 0xaa, 0x35, 0x14, 0x6a, 0xd4, 0xb5, 0x34, 0x82, 0x71, 0xd2, 0x4a, 0x5d, 0x9a, 0x1f, 0x53, 0x26, 0x3c, 0xe5, 0x8e, 0x8d, 0x33, 0x7f, 0xff, 0xa9, 0xd5, 0x17}} ,
+ {{0x89, 0xaf, 0xf6, 0xa4, 0x64, 0xd5, 0x10, 0xe0, 0x1d, 0xad, 0xef, 0x44, 0xbd, 0xda, 0x83, 0xac, 0x7a, 0xa8, 0xf0, 0x1c, 0x07, 0xf9, 0xc3, 0x43, 0x6c, 0x3f, 0xb7, 0xd3, 0x87, 0x22, 0x02, 0x73}}},
+{{{0x64, 0x1d, 0x49, 0x13, 0x2f, 0x71, 0xec, 0x69, 0x87, 0xd0, 0x42, 0xee, 0x13, 0xec, 0xe3, 0xed, 0x56, 0x7b, 0xbf, 0xbd, 0x8c, 0x2f, 0x7d, 0x7b, 0x9d, 0x28, 0xec, 0x8e, 0x76, 0x2f, 0x6f, 0x08}} ,
+ {{0x22, 0xf5, 0x5f, 0x4d, 0x15, 0xef, 0xfc, 0x4e, 0x57, 0x03, 0x36, 0x89, 0xf0, 0xeb, 0x5b, 0x91, 0xd6, 0xe2, 0xca, 0x01, 0xa5, 0xee, 0x52, 0xec, 0xa0, 0x3c, 0x8f, 0x33, 0x90, 0x5a, 0x94, 0x72}}},
+{{{0x8a, 0x4b, 0xe7, 0x38, 0xbc, 0xda, 0xc2, 0xb0, 0x85, 0xe1, 0x4a, 0xfe, 0x2d, 0x44, 0x84, 0xcb, 0x20, 0x6b, 0x2d, 0xbf, 0x11, 0x9c, 0xd7, 0xbe, 0xd3, 0x3e, 0x5f, 0xbf, 0x68, 0xbc, 0xa8, 0x07}} ,
+ {{0x01, 0x89, 0x28, 0x22, 0x6a, 0x78, 0xaa, 0x29, 0x03, 0xc8, 0x74, 0x95, 0x03, 0x3e, 0xdc, 0xbd, 0x07, 0x13, 0xa8, 0xa2, 0x20, 0x2d, 0xb3, 0x18, 0x70, 0x42, 0xfd, 0x7a, 0xc4, 0xd7, 0x49, 0x72}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x02, 0xff, 0x32, 0x2b, 0x5c, 0x93, 0x54, 0x32, 0xe8, 0x57, 0x54, 0x1a, 0x8b, 0x33, 0x60, 0x65, 0xd3, 0x67, 0xa4, 0xc1, 0x26, 0xc4, 0xa4, 0x34, 0x1f, 0x9b, 0xa7, 0xa9, 0xf4, 0xd9, 0x4f, 0x5b}} ,
+ {{0x46, 0x8d, 0xb0, 0x33, 0x54, 0x26, 0x5b, 0x68, 0xdf, 0xbb, 0xc5, 0xec, 0xc2, 0xf9, 0x3c, 0x5a, 0x37, 0xc1, 0x8e, 0x27, 0x47, 0xaa, 0x49, 0x5a, 0xf8, 0xfb, 0x68, 0x04, 0x23, 0xd1, 0xeb, 0x40}}},
+{{{0x65, 0xa5, 0x11, 0x84, 0x8a, 0x67, 0x9d, 0x9e, 0xd1, 0x44, 0x68, 0x7a, 0x34, 0xe1, 0x9f, 0xa3, 0x54, 0xcd, 0x07, 0xca, 0x79, 0x1f, 0x54, 0x2f, 0x13, 0x70, 0x4e, 0xee, 0xa2, 0xfa, 0xe7, 0x5d}} ,
+ {{0x36, 0xec, 0x54, 0xf8, 0xce, 0xe4, 0x85, 0xdf, 0xf6, 0x6f, 0x1d, 0x90, 0x08, 0xbc, 0xe8, 0xc0, 0x92, 0x2d, 0x43, 0x6b, 0x92, 0xa9, 0x8e, 0xab, 0x0a, 0x2e, 0x1c, 0x1e, 0x64, 0x23, 0x9f, 0x2c}}},
+{{{0xa7, 0xd6, 0x2e, 0xd5, 0xcc, 0xd4, 0xcb, 0x5a, 0x3b, 0xa7, 0xf9, 0x46, 0x03, 0x1d, 0xad, 0x2b, 0x34, 0x31, 0x90, 0x00, 0x46, 0x08, 0x82, 0x14, 0xc4, 0xe0, 0x9c, 0xf0, 0xe3, 0x55, 0x43, 0x31}} ,
+ {{0x60, 0xd6, 0xdd, 0x78, 0xe6, 0xd4, 0x22, 0x42, 0x1f, 0x00, 0xf9, 0xb1, 0x6a, 0x63, 0xe2, 0x92, 0x59, 0xd1, 0x1a, 0xb7, 0x00, 0x54, 0x29, 0xc9, 0xc1, 0xf6, 0x6f, 0x7a, 0xc5, 0x3c, 0x5f, 0x65}}},
+{{{0x27, 0x4f, 0xd0, 0x72, 0xb1, 0x11, 0x14, 0x27, 0x15, 0x94, 0x48, 0x81, 0x7e, 0x74, 0xd8, 0x32, 0xd5, 0xd1, 0x11, 0x28, 0x60, 0x63, 0x36, 0x32, 0x37, 0xb5, 0x13, 0x1c, 0xa0, 0x37, 0xe3, 0x74}} ,
+ {{0xf1, 0x25, 0x4e, 0x11, 0x96, 0x67, 0xe6, 0x1c, 0xc2, 0xb2, 0x53, 0xe2, 0xda, 0x85, 0xee, 0xb2, 0x9f, 0x59, 0xf3, 0xba, 0xbd, 0xfa, 0xcf, 0x6e, 0xf9, 0xda, 0xa4, 0xb3, 0x02, 0x8f, 0x64, 0x08}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x34, 0x94, 0xf2, 0x64, 0x54, 0x47, 0x37, 0x07, 0x40, 0x8a, 0x20, 0xba, 0x4a, 0x55, 0xd7, 0x3f, 0x47, 0xba, 0x25, 0x23, 0x14, 0xb0, 0x2c, 0xe8, 0x55, 0xa8, 0xa6, 0xef, 0x51, 0xbd, 0x6f, 0x6a}} ,
+ {{0x71, 0xd6, 0x16, 0x76, 0xb2, 0x06, 0xea, 0x79, 0xf5, 0xc4, 0xc3, 0x52, 0x7e, 0x61, 0xd1, 0xe1, 0xad, 0x70, 0x78, 0x1d, 0x16, 0x11, 0xf8, 0x7c, 0x2b, 0xfc, 0x55, 0x9f, 0x52, 0xf8, 0xf5, 0x16}}},
+{{{0x34, 0x96, 0x9a, 0xf6, 0xc5, 0xe0, 0x14, 0x03, 0x24, 0x0e, 0x4c, 0xad, 0x9e, 0x9a, 0x70, 0x23, 0x96, 0xb2, 0xf1, 0x2e, 0x9d, 0xc3, 0x32, 0x9b, 0x54, 0xa5, 0x73, 0xde, 0x88, 0xb1, 0x3e, 0x24}} ,
+ {{0xf6, 0xe2, 0x4c, 0x1f, 0x5b, 0xb2, 0xaf, 0x82, 0xa5, 0xcf, 0x81, 0x10, 0x04, 0xef, 0xdb, 0xa2, 0xcc, 0x24, 0xb2, 0x7e, 0x0b, 0x7a, 0xeb, 0x01, 0xd8, 0x52, 0xf4, 0x51, 0x89, 0x29, 0x79, 0x37}}},
+{{{0x74, 0xde, 0x12, 0xf3, 0x68, 0xb7, 0x66, 0xc3, 0xee, 0x68, 0xdc, 0x81, 0xb5, 0x55, 0x99, 0xab, 0xd9, 0x28, 0x63, 0x6d, 0x8b, 0x40, 0x69, 0x75, 0x6c, 0xcd, 0x5c, 0x2a, 0x7e, 0x32, 0x7b, 0x29}} ,
+ {{0x02, 0xcc, 0x22, 0x74, 0x4d, 0x19, 0x07, 0xc0, 0xda, 0xb5, 0x76, 0x51, 0x2a, 0xaa, 0xa6, 0x0a, 0x5f, 0x26, 0xd4, 0xbc, 0xaf, 0x48, 0x88, 0x7f, 0x02, 0xbc, 0xf2, 0xe1, 0xcf, 0xe9, 0xdd, 0x15}}},
+{{{0xed, 0xb5, 0x9a, 0x8c, 0x9a, 0xdd, 0x27, 0xf4, 0x7f, 0x47, 0xd9, 0x52, 0xa7, 0xcd, 0x65, 0xa5, 0x31, 0x22, 0xed, 0xa6, 0x63, 0x5b, 0x80, 0x4a, 0xad, 0x4d, 0xed, 0xbf, 0xee, 0x49, 0xb3, 0x06}} ,
+ {{0xf8, 0x64, 0x8b, 0x60, 0x90, 0xe9, 0xde, 0x44, 0x77, 0xb9, 0x07, 0x36, 0x32, 0xc2, 0x50, 0xf5, 0x65, 0xdf, 0x48, 0x4c, 0x37, 0xaa, 0x68, 0xab, 0x9a, 0x1f, 0x3e, 0xff, 0x89, 0x92, 0xa0, 0x07}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x7d, 0x4f, 0x9c, 0x19, 0xc0, 0x4a, 0x31, 0xec, 0xf9, 0xaa, 0xeb, 0xb2, 0x16, 0x9c, 0xa3, 0x66, 0x5f, 0xd1, 0xd4, 0xed, 0xb8, 0x92, 0x1c, 0xab, 0xda, 0xea, 0xd9, 0x57, 0xdf, 0x4c, 0x2a, 0x48}} ,
+ {{0x4b, 0xb0, 0x4e, 0x6e, 0x11, 0x3b, 0x51, 0xbd, 0x6a, 0xfd, 0xe4, 0x25, 0xa5, 0x5f, 0x11, 0x3f, 0x98, 0x92, 0x51, 0x14, 0xc6, 0x5f, 0x3c, 0x0b, 0xa8, 0xf7, 0xc2, 0x81, 0x43, 0xde, 0x91, 0x73}}},
+{{{0x3c, 0x8f, 0x9f, 0x33, 0x2a, 0x1f, 0x43, 0x33, 0x8f, 0x68, 0xff, 0x1f, 0x3d, 0x73, 0x6b, 0xbf, 0x68, 0xcc, 0x7d, 0x13, 0x6c, 0x24, 0x4b, 0xcc, 0x4d, 0x24, 0x0d, 0xfe, 0xde, 0x86, 0xad, 0x3b}} ,
+ {{0x79, 0x51, 0x81, 0x01, 0xdc, 0x73, 0x53, 0xe0, 0x6e, 0x9b, 0xea, 0x68, 0x3f, 0x5c, 0x14, 0x84, 0x53, 0x8d, 0x4b, 0xc0, 0x9f, 0x9f, 0x89, 0x2b, 0x8c, 0xba, 0x86, 0xfa, 0xf2, 0xcd, 0xe3, 0x2d}}},
+{{{0x06, 0xf9, 0x29, 0x5a, 0xdb, 0x3d, 0x84, 0x52, 0xab, 0xcc, 0x6b, 0x60, 0x9d, 0xb7, 0x4a, 0x0e, 0x36, 0x63, 0x91, 0xad, 0xa0, 0x95, 0xb0, 0x97, 0x89, 0x4e, 0xcf, 0x7d, 0x3c, 0xe5, 0x7c, 0x28}} ,
+ {{0x2e, 0x69, 0x98, 0xfd, 0xc6, 0xbd, 0xcc, 0xca, 0xdf, 0x9a, 0x44, 0x7e, 0x9d, 0xca, 0x89, 0x6d, 0xbf, 0x27, 0xc2, 0xf8, 0xcd, 0x46, 0x00, 0x2b, 0xb5, 0x58, 0x4e, 0xb7, 0x89, 0x09, 0xe9, 0x2d}}},
+{{{0x54, 0xbe, 0x75, 0xcb, 0x05, 0xb0, 0x54, 0xb7, 0xe7, 0x26, 0x86, 0x4a, 0xfc, 0x19, 0xcf, 0x27, 0x46, 0xd4, 0x22, 0x96, 0x5a, 0x11, 0xe8, 0xd5, 0x1b, 0xed, 0x71, 0xc5, 0x5d, 0xc8, 0xaf, 0x45}} ,
+ {{0x40, 0x7b, 0x77, 0x57, 0x49, 0x9e, 0x80, 0x39, 0x23, 0xee, 0x81, 0x0b, 0x22, 0xcf, 0xdb, 0x7a, 0x2f, 0x14, 0xb8, 0x57, 0x8f, 0xa1, 0x39, 0x1e, 0x77, 0xfc, 0x0b, 0xa6, 0xbf, 0x8a, 0x0c, 0x6c}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x77, 0x3a, 0xd4, 0xd8, 0x27, 0xcf, 0xe8, 0xa1, 0x72, 0x9d, 0xca, 0xdd, 0x0d, 0x96, 0xda, 0x79, 0xed, 0x56, 0x42, 0x15, 0x60, 0xc7, 0x1c, 0x6b, 0x26, 0x30, 0xf6, 0x6a, 0x95, 0x67, 0xf3, 0x0a}} ,
+ {{0xc5, 0x08, 0xa4, 0x2b, 0x2f, 0xbd, 0x31, 0x81, 0x2a, 0xa6, 0xb6, 0xe4, 0x00, 0x91, 0xda, 0x3d, 0xb2, 0xb0, 0x96, 0xce, 0x8a, 0xd2, 0x8d, 0x70, 0xb3, 0xd3, 0x34, 0x01, 0x90, 0x8d, 0x10, 0x21}}},
+{{{0x33, 0x0d, 0xe7, 0xba, 0x4f, 0x07, 0xdf, 0x8d, 0xea, 0x7d, 0xa0, 0xc5, 0xd6, 0xb1, 0xb0, 0xe5, 0x57, 0x1b, 0x5b, 0xf5, 0x45, 0x13, 0x14, 0x64, 0x5a, 0xeb, 0x5c, 0xfc, 0x54, 0x01, 0x76, 0x2b}} ,
+ {{0x02, 0x0c, 0xc2, 0xaf, 0x96, 0x36, 0xfe, 0x4a, 0xe2, 0x54, 0x20, 0x6a, 0xeb, 0xb2, 0x9f, 0x62, 0xd7, 0xce, 0xa2, 0x3f, 0x20, 0x11, 0x34, 0x37, 0xe0, 0x42, 0xed, 0x6f, 0xf9, 0x1a, 0xc8, 0x7d}}},
+{{{0xd8, 0xb9, 0x11, 0xe8, 0x36, 0x3f, 0x42, 0xc1, 0xca, 0xdc, 0xd3, 0xf1, 0xc8, 0x23, 0x3d, 0x4f, 0x51, 0x7b, 0x9d, 0x8d, 0xd8, 0xe4, 0xa0, 0xaa, 0xf3, 0x04, 0xd6, 0x11, 0x93, 0xc8, 0x35, 0x45}} ,
+ {{0x61, 0x36, 0xd6, 0x08, 0x90, 0xbf, 0xa7, 0x7a, 0x97, 0x6c, 0x0f, 0x84, 0xd5, 0x33, 0x2d, 0x37, 0xc9, 0x6a, 0x80, 0x90, 0x3d, 0x0a, 0xa2, 0xaa, 0xe1, 0xb8, 0x84, 0xba, 0x61, 0x36, 0xdd, 0x69}}},
+{{{0x6b, 0xdb, 0x5b, 0x9c, 0xc6, 0x92, 0xbc, 0x23, 0xaf, 0xc5, 0xb8, 0x75, 0xf8, 0x42, 0xfa, 0xd6, 0xb6, 0x84, 0x94, 0x63, 0x98, 0x93, 0x48, 0x78, 0x38, 0xcd, 0xbb, 0x18, 0x34, 0xc3, 0xdb, 0x67}} ,
+ {{0x96, 0xf3, 0x3a, 0x09, 0x56, 0xb0, 0x6f, 0x7c, 0x51, 0x1e, 0x1b, 0x39, 0x48, 0xea, 0xc9, 0x0c, 0x25, 0xa2, 0x7a, 0xca, 0xe7, 0x92, 0xfc, 0x59, 0x30, 0xa3, 0x89, 0x85, 0xdf, 0x6f, 0x43, 0x38}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x79, 0x84, 0x44, 0x19, 0xbd, 0xe9, 0x54, 0xc4, 0xc0, 0x6e, 0x2a, 0xa8, 0xa8, 0x9b, 0x43, 0xd5, 0x71, 0x22, 0x5f, 0xdc, 0x01, 0xfa, 0xdf, 0xb3, 0xb8, 0x47, 0x4b, 0x0a, 0xa5, 0x44, 0xea, 0x29}} ,
+ {{0x05, 0x90, 0x50, 0xaf, 0x63, 0x5f, 0x9d, 0x9e, 0xe1, 0x9d, 0x38, 0x97, 0x1f, 0x6c, 0xac, 0x30, 0x46, 0xb2, 0x6a, 0x19, 0xd1, 0x4b, 0xdb, 0xbb, 0x8c, 0xda, 0x2e, 0xab, 0xc8, 0x5a, 0x77, 0x6c}}},
+{{{0x2b, 0xbe, 0xaf, 0xa1, 0x6d, 0x2f, 0x0b, 0xb1, 0x8f, 0xe3, 0xe0, 0x38, 0xcd, 0x0b, 0x41, 0x1b, 0x4a, 0x15, 0x07, 0xf3, 0x6f, 0xdc, 0xb8, 0xe9, 0xde, 0xb2, 0xa3, 0x40, 0x01, 0xa6, 0x45, 0x1e}} ,
+ {{0x76, 0x0a, 0xda, 0x8d, 0x2c, 0x07, 0x3f, 0x89, 0x7d, 0x04, 0xad, 0x43, 0x50, 0x6e, 0xd2, 0x47, 0xcb, 0x8a, 0xe6, 0x85, 0x1a, 0x24, 0xf3, 0xd2, 0x60, 0xfd, 0xdf, 0x73, 0xa4, 0x0d, 0x73, 0x0e}}},
+{{{0xfd, 0x67, 0x6b, 0x71, 0x9b, 0x81, 0x53, 0x39, 0x39, 0xf4, 0xb8, 0xd5, 0xc3, 0x30, 0x9b, 0x3b, 0x7c, 0xa3, 0xf0, 0xd0, 0x84, 0x21, 0xd6, 0xbf, 0xb7, 0x4c, 0x87, 0x13, 0x45, 0x2d, 0xa7, 0x55}} ,
+ {{0x5d, 0x04, 0xb3, 0x40, 0x28, 0x95, 0x2d, 0x30, 0x83, 0xec, 0x5e, 0xe4, 0xff, 0x75, 0xfe, 0x79, 0x26, 0x9d, 0x1d, 0x36, 0xcd, 0x0a, 0x15, 0xd2, 0x24, 0x14, 0x77, 0x71, 0xd7, 0x8a, 0x1b, 0x04}}},
+{{{0x5d, 0x93, 0xc9, 0xbe, 0xaa, 0x90, 0xcd, 0x9b, 0xfb, 0x73, 0x7e, 0xb0, 0x64, 0x98, 0x57, 0x44, 0x42, 0x41, 0xb1, 0xaf, 0xea, 0xc1, 0xc3, 0x22, 0xff, 0x60, 0x46, 0xcb, 0x61, 0x81, 0x70, 0x61}} ,
+ {{0x0d, 0x82, 0xb9, 0xfe, 0x21, 0xcd, 0xc4, 0xf5, 0x98, 0x0c, 0x4e, 0x72, 0xee, 0x87, 0x49, 0xf8, 0xa1, 0x95, 0xdf, 0x8f, 0x2d, 0xbd, 0x21, 0x06, 0x7c, 0x15, 0xe8, 0x12, 0x6d, 0x93, 0xd6, 0x38}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x91, 0xf7, 0x51, 0xd9, 0xef, 0x7d, 0x42, 0x01, 0x13, 0xe9, 0xb8, 0x7f, 0xa6, 0x49, 0x17, 0x64, 0x21, 0x80, 0x83, 0x2c, 0x63, 0x4c, 0x60, 0x09, 0x59, 0x91, 0x92, 0x77, 0x39, 0x51, 0xf4, 0x48}} ,
+ {{0x60, 0xd5, 0x22, 0x83, 0x08, 0x2f, 0xff, 0x99, 0x3e, 0x69, 0x6d, 0x88, 0xda, 0xe7, 0x5b, 0x52, 0x26, 0x31, 0x2a, 0xe5, 0x89, 0xde, 0x68, 0x90, 0xb6, 0x22, 0x5a, 0xbd, 0xd3, 0x85, 0x53, 0x31}}},
+{{{0xd8, 0xce, 0xdc, 0xf9, 0x3c, 0x4b, 0xa2, 0x1d, 0x2c, 0x2f, 0x36, 0xbe, 0x7a, 0xfc, 0xcd, 0xbc, 0xdc, 0xf9, 0x30, 0xbd, 0xff, 0x05, 0xc7, 0xe4, 0x8e, 0x17, 0x62, 0xf8, 0x4d, 0xa0, 0x56, 0x79}} ,
+ {{0x82, 0xe7, 0xf6, 0xba, 0x53, 0x84, 0x0a, 0xa3, 0x34, 0xff, 0x3c, 0xa3, 0x6a, 0xa1, 0x37, 0xea, 0xdd, 0xb6, 0x95, 0xb3, 0x78, 0x19, 0x76, 0x1e, 0x55, 0x2f, 0x77, 0x2e, 0x7f, 0xc1, 0xea, 0x5e}}},
+{{{0x83, 0xe1, 0x6e, 0xa9, 0x07, 0x33, 0x3e, 0x83, 0xff, 0xcb, 0x1c, 0x9f, 0xb1, 0xa3, 0xb4, 0xc9, 0xe1, 0x07, 0x97, 0xff, 0xf8, 0x23, 0x8f, 0xce, 0x40, 0xfd, 0x2e, 0x5e, 0xdb, 0x16, 0x43, 0x2d}} ,
+ {{0xba, 0x38, 0x02, 0xf7, 0x81, 0x43, 0x83, 0xa3, 0x20, 0x4f, 0x01, 0x3b, 0x8a, 0x04, 0x38, 0x31, 0xc6, 0x0f, 0xc8, 0xdf, 0xd7, 0xfa, 0x2f, 0x88, 0x3f, 0xfc, 0x0c, 0x76, 0xc4, 0xa6, 0x45, 0x72}}},
+{{{0xbb, 0x0c, 0xbc, 0x6a, 0xa4, 0x97, 0x17, 0x93, 0x2d, 0x6f, 0xde, 0x72, 0x10, 0x1c, 0x08, 0x2c, 0x0f, 0x80, 0x32, 0x68, 0x27, 0xd4, 0xab, 0xdd, 0xc5, 0x58, 0x61, 0x13, 0x6d, 0x11, 0x1e, 0x4d}} ,
+ {{0x1a, 0xb9, 0xc9, 0x10, 0xfb, 0x1e, 0x4e, 0xf4, 0x84, 0x4b, 0x8a, 0x5e, 0x7b, 0x4b, 0xe8, 0x43, 0x8c, 0x8f, 0x00, 0xb5, 0x54, 0x13, 0xc5, 0x5c, 0xb6, 0x35, 0x4e, 0x9d, 0xe4, 0x5b, 0x41, 0x6d}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x15, 0x7d, 0x12, 0x48, 0x82, 0x14, 0x42, 0xcd, 0x32, 0xd4, 0x4b, 0xc1, 0x72, 0x61, 0x2a, 0x8c, 0xec, 0xe2, 0xf8, 0x24, 0x45, 0x94, 0xe3, 0xbe, 0xdd, 0x67, 0xa8, 0x77, 0x5a, 0xae, 0x5b, 0x4b}} ,
+ {{0xcb, 0x77, 0x9a, 0x20, 0xde, 0xb8, 0x23, 0xd9, 0xa0, 0x0f, 0x8c, 0x7b, 0xa5, 0xcb, 0xae, 0xb6, 0xec, 0x42, 0x67, 0x0e, 0x58, 0xa4, 0x75, 0x98, 0x21, 0x71, 0x84, 0xb3, 0xe0, 0x76, 0x94, 0x73}}},
+{{{0xdf, 0xfc, 0x69, 0x28, 0x23, 0x3f, 0x5b, 0xf8, 0x3b, 0x24, 0x37, 0xf3, 0x1d, 0xd5, 0x22, 0x6b, 0xd0, 0x98, 0xa8, 0x6c, 0xcf, 0xff, 0x06, 0xe1, 0x13, 0xdf, 0xb9, 0xc1, 0x0c, 0xa9, 0xbf, 0x33}} ,
+ {{0xd9, 0x81, 0xda, 0xb2, 0x4f, 0x82, 0x9d, 0x43, 0x81, 0x09, 0xf1, 0xd2, 0x01, 0xef, 0xac, 0xf4, 0x2d, 0x7d, 0x01, 0x09, 0xf1, 0xff, 0xa5, 0x9f, 0xe5, 0xca, 0x27, 0x63, 0xdb, 0x20, 0xb1, 0x53}}},
+{{{0x67, 0x02, 0xe8, 0xad, 0xa9, 0x34, 0xd4, 0xf0, 0x15, 0x81, 0xaa, 0xc7, 0x4d, 0x87, 0x94, 0xea, 0x75, 0xe7, 0x4c, 0x94, 0x04, 0x0e, 0x69, 0x87, 0xe7, 0x51, 0x91, 0x10, 0x03, 0xc7, 0xbe, 0x56}} ,
+ {{0x32, 0xfb, 0x86, 0xec, 0x33, 0x6b, 0x2e, 0x51, 0x2b, 0xc8, 0xfa, 0x6c, 0x70, 0x47, 0x7e, 0xce, 0x05, 0x0c, 0x71, 0xf3, 0xb4, 0x56, 0xa6, 0xdc, 0xcc, 0x78, 0x07, 0x75, 0xd0, 0xdd, 0xb2, 0x6a}}},
+{{{0xc6, 0xef, 0xb9, 0xc0, 0x2b, 0x22, 0x08, 0x1e, 0x71, 0x70, 0xb3, 0x35, 0x9c, 0x7a, 0x01, 0x92, 0x44, 0x9a, 0xf6, 0xb0, 0x58, 0x95, 0xc1, 0x9b, 0x02, 0xed, 0x2d, 0x7c, 0x34, 0x29, 0x49, 0x44}} ,
+ {{0x45, 0x62, 0x1d, 0x2e, 0xff, 0x2a, 0x1c, 0x21, 0xa4, 0x25, 0x7b, 0x0d, 0x8c, 0x15, 0x39, 0xfc, 0x8f, 0x7c, 0xa5, 0x7d, 0x1e, 0x25, 0xa3, 0x45, 0xd6, 0xab, 0xbd, 0xcb, 0xc5, 0x5e, 0x78, 0x77}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xd0, 0xd3, 0x42, 0xed, 0x1d, 0x00, 0x3c, 0x15, 0x2c, 0x9c, 0x77, 0x81, 0xd2, 0x73, 0xd1, 0x06, 0xd5, 0xc4, 0x7f, 0x94, 0xbb, 0x92, 0x2d, 0x2c, 0x4b, 0x45, 0x4b, 0xe9, 0x2a, 0x89, 0x6b, 0x2b}} ,
+ {{0xd2, 0x0c, 0x88, 0xc5, 0x48, 0x4d, 0xea, 0x0d, 0x4a, 0xc9, 0x52, 0x6a, 0x61, 0x79, 0xe9, 0x76, 0xf3, 0x85, 0x52, 0x5c, 0x1b, 0x2c, 0xe1, 0xd6, 0xc4, 0x0f, 0x18, 0x0e, 0x4e, 0xf6, 0x1c, 0x7f}}},
+{{{0xb4, 0x04, 0x2e, 0x42, 0xcb, 0x1f, 0x2b, 0x11, 0x51, 0x7b, 0x08, 0xac, 0xaa, 0x3e, 0x9e, 0x52, 0x60, 0xb7, 0xc2, 0x61, 0x57, 0x8c, 0x84, 0xd5, 0x18, 0xa6, 0x19, 0xfc, 0xb7, 0x75, 0x91, 0x1b}} ,
+ {{0xe8, 0x68, 0xca, 0x44, 0xc8, 0x38, 0x38, 0xcc, 0x53, 0x0a, 0x32, 0x35, 0xcc, 0x52, 0xcb, 0x0e, 0xf7, 0xc5, 0xe7, 0xec, 0x3d, 0x85, 0xcc, 0x58, 0xe2, 0x17, 0x47, 0xff, 0x9f, 0xa5, 0x30, 0x17}}},
+{{{0xe3, 0xae, 0xc8, 0xc1, 0x71, 0x75, 0x31, 0x00, 0x37, 0x41, 0x5c, 0x0e, 0x39, 0xda, 0x73, 0xa0, 0xc7, 0x97, 0x36, 0x6c, 0x5b, 0xf2, 0xee, 0x64, 0x0a, 0x3d, 0x89, 0x1e, 0x1d, 0x49, 0x8c, 0x37}} ,
+ {{0x4c, 0xe6, 0xb0, 0xc1, 0xa5, 0x2a, 0x82, 0x09, 0x08, 0xad, 0x79, 0x9c, 0x56, 0xf6, 0xf9, 0xc1, 0xd7, 0x7c, 0x39, 0x7f, 0x93, 0xca, 0x11, 0x55, 0xbf, 0x07, 0x1b, 0x82, 0x29, 0x69, 0x95, 0x5c}}},
+{{{0x87, 0xee, 0xa6, 0x56, 0x9e, 0xc2, 0x9a, 0x56, 0x24, 0x42, 0x85, 0x4d, 0x98, 0x31, 0x1e, 0x60, 0x4d, 0x87, 0x85, 0x04, 0xae, 0x46, 0x12, 0xf9, 0x8e, 0x7f, 0xe4, 0x7f, 0xf6, 0x1c, 0x37, 0x01}} ,
+ {{0x73, 0x4c, 0xb6, 0xc5, 0xc4, 0xe9, 0x6c, 0x85, 0x48, 0x4a, 0x5a, 0xac, 0xd9, 0x1f, 0x43, 0xf8, 0x62, 0x5b, 0xee, 0x98, 0x2a, 0x33, 0x8e, 0x79, 0xce, 0x61, 0x06, 0x35, 0xd8, 0xd7, 0xca, 0x71}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x72, 0xd3, 0xae, 0xa6, 0xca, 0x8f, 0xcd, 0xcc, 0x78, 0x8e, 0x19, 0x4d, 0xa7, 0xd2, 0x27, 0xe9, 0xa4, 0x3c, 0x16, 0x5b, 0x84, 0x80, 0xf9, 0xd0, 0xcc, 0x6a, 0x1e, 0xca, 0x1e, 0x67, 0xbd, 0x63}} ,
+ {{0x7b, 0x6e, 0x2a, 0xd2, 0x87, 0x48, 0xff, 0xa1, 0xca, 0xe9, 0x15, 0x85, 0xdc, 0xdb, 0x2c, 0x39, 0x12, 0x91, 0xa9, 0x20, 0xaa, 0x4f, 0x29, 0xf4, 0x15, 0x7a, 0xd2, 0xf5, 0x32, 0xcc, 0x60, 0x04}}},
+{{{0xe5, 0x10, 0x47, 0x3b, 0xfa, 0x90, 0xfc, 0x30, 0xb5, 0xea, 0x6f, 0x56, 0x8f, 0xfb, 0x0e, 0xa7, 0x3b, 0xc8, 0xb2, 0xff, 0x02, 0x7a, 0x33, 0x94, 0x93, 0x2a, 0x03, 0xe0, 0x96, 0x3a, 0x6c, 0x0f}} ,
+ {{0x5a, 0x63, 0x67, 0xe1, 0x9b, 0x47, 0x78, 0x9f, 0x38, 0x79, 0xac, 0x97, 0x66, 0x1d, 0x5e, 0x51, 0xee, 0x24, 0x42, 0xe8, 0x58, 0x4b, 0x8a, 0x03, 0x75, 0x86, 0x37, 0x86, 0xe2, 0x97, 0x4e, 0x3d}}},
+{{{0x3f, 0x75, 0x8e, 0xb4, 0xff, 0xd8, 0xdd, 0xd6, 0x37, 0x57, 0x9d, 0x6d, 0x3b, 0xbd, 0xd5, 0x60, 0x88, 0x65, 0x9a, 0xb9, 0x4a, 0x68, 0x84, 0xa2, 0x67, 0xdd, 0x17, 0x25, 0x97, 0x04, 0x8b, 0x5e}} ,
+ {{0xbb, 0x40, 0x5e, 0xbc, 0x16, 0x92, 0x05, 0xc4, 0xc0, 0x4e, 0x72, 0x90, 0x0e, 0xab, 0xcf, 0x8a, 0xed, 0xef, 0xb9, 0x2d, 0x3b, 0xf8, 0x43, 0x5b, 0xba, 0x2d, 0xeb, 0x2f, 0x52, 0xd2, 0xd1, 0x5a}}},
+{{{0x40, 0xb4, 0xab, 0xe6, 0xad, 0x9f, 0x46, 0x69, 0x4a, 0xb3, 0x8e, 0xaa, 0xea, 0x9c, 0x8a, 0x20, 0x16, 0x5d, 0x8c, 0x13, 0xbd, 0xf6, 0x1d, 0xc5, 0x24, 0xbd, 0x90, 0x2a, 0x1c, 0xc7, 0x13, 0x3b}} ,
+ {{0x54, 0xdc, 0x16, 0x0d, 0x18, 0xbe, 0x35, 0x64, 0x61, 0x52, 0x02, 0x80, 0xaf, 0x05, 0xf7, 0xa6, 0x42, 0xd3, 0x8f, 0x2e, 0x79, 0x26, 0xa8, 0xbb, 0xb2, 0x17, 0x48, 0xb2, 0x7a, 0x0a, 0x89, 0x14}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x20, 0xa8, 0x88, 0xe3, 0x91, 0xc0, 0x6e, 0xbb, 0x8a, 0x27, 0x82, 0x51, 0x83, 0xb2, 0x28, 0xa9, 0x83, 0xeb, 0xa6, 0xa9, 0x4d, 0x17, 0x59, 0x22, 0x54, 0x00, 0x50, 0x45, 0xcb, 0x48, 0x4b, 0x18}} ,
+ {{0x33, 0x7c, 0xe7, 0x26, 0xba, 0x4d, 0x32, 0xfe, 0x53, 0xf4, 0xfa, 0x83, 0xe3, 0xa5, 0x79, 0x66, 0x73, 0xef, 0x80, 0x23, 0x68, 0xc2, 0x60, 0xdd, 0xa9, 0x33, 0xdc, 0x03, 0x7a, 0xe0, 0xe0, 0x3e}}},
+{{{0x34, 0x5c, 0x13, 0xfb, 0xc0, 0xe3, 0x78, 0x2b, 0x54, 0x58, 0x22, 0x9b, 0x76, 0x81, 0x7f, 0x93, 0x9c, 0x25, 0x3c, 0xd2, 0xe9, 0x96, 0x21, 0x26, 0x08, 0xf5, 0xed, 0x95, 0x11, 0xae, 0x04, 0x5a}} ,
+ {{0xb9, 0xe8, 0xc5, 0x12, 0x97, 0x1f, 0x83, 0xfe, 0x3e, 0x94, 0x99, 0xd4, 0x2d, 0xf9, 0x52, 0x59, 0x5c, 0x82, 0xa6, 0xf0, 0x75, 0x7e, 0xe8, 0xec, 0xcc, 0xac, 0x18, 0x21, 0x09, 0x67, 0x66, 0x67}}},
+{{{0xb3, 0x40, 0x29, 0xd1, 0xcb, 0x1b, 0x08, 0x9e, 0x9c, 0xb7, 0x53, 0xb9, 0x3b, 0x71, 0x08, 0x95, 0x12, 0x1a, 0x58, 0xaf, 0x7e, 0x82, 0x52, 0x43, 0x4f, 0x11, 0x39, 0xf4, 0x93, 0x1a, 0x26, 0x05}} ,
+ {{0x6e, 0x44, 0xa3, 0xf9, 0x64, 0xaf, 0xe7, 0x6d, 0x7d, 0xdf, 0x1e, 0xac, 0x04, 0xea, 0x3b, 0x5f, 0x9b, 0xe8, 0x24, 0x9d, 0x0e, 0xe5, 0x2e, 0x3e, 0xdf, 0xa9, 0xf7, 0xd4, 0x50, 0x71, 0xf0, 0x78}}},
+{{{0x3e, 0xa8, 0x38, 0xc2, 0x57, 0x56, 0x42, 0x9a, 0xb1, 0xe2, 0xf8, 0x45, 0xaa, 0x11, 0x48, 0x5f, 0x17, 0xc4, 0x54, 0x27, 0xdc, 0x5d, 0xaa, 0xdd, 0x41, 0xbc, 0xdf, 0x81, 0xb9, 0x53, 0xee, 0x52}} ,
+ {{0xc3, 0xf1, 0xa7, 0x6d, 0xb3, 0x5f, 0x92, 0x6f, 0xcc, 0x91, 0xb8, 0x95, 0x05, 0xdf, 0x3c, 0x64, 0x57, 0x39, 0x61, 0x51, 0xad, 0x8c, 0x38, 0x7b, 0xc8, 0xde, 0x00, 0x34, 0xbe, 0xa1, 0xb0, 0x7e}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x25, 0x24, 0x1d, 0x8a, 0x67, 0x20, 0xee, 0x42, 0xeb, 0x38, 0xed, 0x0b, 0x8b, 0xcd, 0x46, 0x9d, 0x5e, 0x6b, 0x1e, 0x24, 0x9d, 0x12, 0x05, 0x1a, 0xcc, 0x05, 0x4e, 0x92, 0x38, 0xe1, 0x1f, 0x50}} ,
+ {{0x4e, 0xee, 0x1c, 0x91, 0xe6, 0x11, 0xbd, 0x8e, 0x55, 0x1a, 0x18, 0x75, 0x66, 0xaf, 0x4d, 0x7b, 0x0f, 0xae, 0x6d, 0x85, 0xca, 0x82, 0x58, 0x21, 0x9c, 0x18, 0xe0, 0xed, 0xec, 0x22, 0x80, 0x2f}}},
+{{{0x68, 0x3b, 0x0a, 0x39, 0x1d, 0x6a, 0x15, 0x57, 0xfc, 0xf0, 0x63, 0x54, 0xdb, 0x39, 0xdb, 0xe8, 0x5c, 0x64, 0xff, 0xa0, 0x09, 0x4f, 0x3b, 0xb7, 0x32, 0x60, 0x99, 0x94, 0xfd, 0x94, 0x82, 0x2d}} ,
+ {{0x24, 0xf6, 0x5a, 0x44, 0xf1, 0x55, 0x2c, 0xdb, 0xea, 0x7c, 0x84, 0x7c, 0x01, 0xac, 0xe3, 0xfd, 0xc9, 0x27, 0xc1, 0x5a, 0xb9, 0xde, 0x4f, 0x5a, 0x90, 0xdd, 0xc6, 0x67, 0xaa, 0x6f, 0x8a, 0x3a}}},
+{{{0x78, 0x52, 0x87, 0xc9, 0x97, 0x63, 0xb1, 0xdd, 0x54, 0x5f, 0xc1, 0xf8, 0xf1, 0x06, 0xa6, 0xa8, 0xa3, 0x88, 0x82, 0xd4, 0xcb, 0xa6, 0x19, 0xdd, 0xd1, 0x11, 0x87, 0x08, 0x17, 0x4c, 0x37, 0x2a}} ,
+ {{0xa1, 0x0c, 0xf3, 0x08, 0x43, 0xd9, 0x24, 0x1e, 0x83, 0xa7, 0xdf, 0x91, 0xca, 0xbd, 0x69, 0x47, 0x8d, 0x1b, 0xe2, 0xb9, 0x4e, 0xb5, 0xe1, 0x76, 0xb3, 0x1c, 0x93, 0x03, 0xce, 0x5f, 0xb3, 0x5a}}},
+{{{0x1d, 0xda, 0xe4, 0x61, 0x03, 0x50, 0xa9, 0x8b, 0x68, 0x18, 0xef, 0xb2, 0x1c, 0x84, 0x3b, 0xa2, 0x44, 0x95, 0xa3, 0x04, 0x3b, 0xd6, 0x99, 0x00, 0xaf, 0x76, 0x42, 0x67, 0x02, 0x7d, 0x85, 0x56}} ,
+ {{0xce, 0x72, 0x0e, 0x29, 0x84, 0xb2, 0x7d, 0xd2, 0x45, 0xbe, 0x57, 0x06, 0xed, 0x7f, 0xcf, 0xed, 0xcd, 0xef, 0x19, 0xd6, 0xbc, 0x15, 0x79, 0x64, 0xd2, 0x18, 0xe3, 0x20, 0x67, 0x3a, 0x54, 0x0b}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x52, 0xfd, 0x04, 0xc5, 0xfb, 0x99, 0xe7, 0xe8, 0xfb, 0x8c, 0xe1, 0x42, 0x03, 0xef, 0x9d, 0xd9, 0x9e, 0x4d, 0xf7, 0x80, 0xcf, 0x2e, 0xcc, 0x9b, 0x45, 0xc9, 0x7b, 0x7a, 0xbc, 0x37, 0xa8, 0x52}} ,
+ {{0x96, 0x11, 0x41, 0x8a, 0x47, 0x91, 0xfe, 0xb6, 0xda, 0x7a, 0x54, 0x63, 0xd1, 0x14, 0x35, 0x05, 0x86, 0x8c, 0xa9, 0x36, 0x3f, 0xf2, 0x85, 0x54, 0x4e, 0x92, 0xd8, 0x85, 0x01, 0x46, 0xd6, 0x50}}},
+{{{0x53, 0xcd, 0xf3, 0x86, 0x40, 0xe6, 0x39, 0x42, 0x95, 0xd6, 0xcb, 0x45, 0x1a, 0x20, 0xc8, 0x45, 0x4b, 0x32, 0x69, 0x04, 0xb1, 0xaf, 0x20, 0x46, 0xc7, 0x6b, 0x23, 0x5b, 0x69, 0xee, 0x30, 0x3f}} ,
+ {{0x70, 0x83, 0x47, 0xc0, 0xdb, 0x55, 0x08, 0xa8, 0x7b, 0x18, 0x6d, 0xf5, 0x04, 0x5a, 0x20, 0x0c, 0x4a, 0x8c, 0x60, 0xae, 0xae, 0x0f, 0x64, 0x55, 0x55, 0x2e, 0xd5, 0x1d, 0x53, 0x31, 0x42, 0x41}}},
+{{{0xca, 0xfc, 0x88, 0x6b, 0x96, 0x78, 0x0a, 0x8b, 0x83, 0xdc, 0xbc, 0xaf, 0x40, 0xb6, 0x8d, 0x7f, 0xef, 0xb4, 0xd1, 0x3f, 0xcc, 0xa2, 0x74, 0xc9, 0xc2, 0x92, 0x55, 0x00, 0xab, 0xdb, 0xbf, 0x4f}} ,
+ {{0x93, 0x1c, 0x06, 0x2d, 0x66, 0x65, 0x02, 0xa4, 0x97, 0x18, 0xfd, 0x00, 0xe7, 0xab, 0x03, 0xec, 0xce, 0xc1, 0xbf, 0x37, 0xf8, 0x13, 0x53, 0xa5, 0xe5, 0x0c, 0x3a, 0xa8, 0x55, 0xb9, 0xff, 0x68}}},
+{{{0xe4, 0xe6, 0x6d, 0x30, 0x7d, 0x30, 0x35, 0xc2, 0x78, 0x87, 0xf9, 0xfc, 0x6b, 0x5a, 0xc3, 0xb7, 0x65, 0xd8, 0x2e, 0xc7, 0xa5, 0x0c, 0xc6, 0xdc, 0x12, 0xaa, 0xd6, 0x4f, 0xc5, 0x38, 0xbc, 0x0e}} ,
+ {{0xe2, 0x3c, 0x76, 0x86, 0x38, 0xf2, 0x7b, 0x2c, 0x16, 0x78, 0x8d, 0xf5, 0xa4, 0x15, 0xda, 0xdb, 0x26, 0x85, 0xa0, 0x56, 0xdd, 0x1d, 0xe3, 0xb3, 0xfd, 0x40, 0xef, 0xf2, 0xd9, 0xa1, 0xb3, 0x04}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xdb, 0x49, 0x0e, 0xe6, 0x58, 0x10, 0x7a, 0x52, 0xda, 0xb5, 0x7d, 0x37, 0x6a, 0x3e, 0xa1, 0x78, 0xce, 0xc7, 0x1c, 0x24, 0x23, 0xdb, 0x7d, 0xfb, 0x8c, 0x8d, 0xdc, 0x30, 0x67, 0x69, 0x75, 0x3b}} ,
+ {{0xa9, 0xea, 0x6d, 0x16, 0x16, 0x60, 0xf4, 0x60, 0x87, 0x19, 0x44, 0x8c, 0x4a, 0x8b, 0x3e, 0xfb, 0x16, 0x00, 0x00, 0x54, 0xa6, 0x9e, 0x9f, 0xef, 0xcf, 0xd9, 0xd2, 0x4c, 0x74, 0x31, 0xd0, 0x34}}},
+{{{0xa4, 0xeb, 0x04, 0xa4, 0x8c, 0x8f, 0x71, 0x27, 0x95, 0x85, 0x5d, 0x55, 0x4b, 0xb1, 0x26, 0x26, 0xc8, 0xae, 0x6a, 0x7d, 0xa2, 0x21, 0xca, 0xce, 0x38, 0xab, 0x0f, 0xd0, 0xd5, 0x2b, 0x6b, 0x00}} ,
+ {{0xe5, 0x67, 0x0c, 0xf1, 0x3a, 0x9a, 0xea, 0x09, 0x39, 0xef, 0xd1, 0x30, 0xbc, 0x33, 0xba, 0xb1, 0x6a, 0xc5, 0x27, 0x08, 0x7f, 0x54, 0x80, 0x3d, 0xab, 0xf6, 0x15, 0x7a, 0xc2, 0x40, 0x73, 0x72}}},
+{{{0x84, 0x56, 0x82, 0xb6, 0x12, 0x70, 0x7f, 0xf7, 0xf0, 0xbd, 0x5b, 0xa9, 0xd5, 0xc5, 0x5f, 0x59, 0xbf, 0x7f, 0xb3, 0x55, 0x22, 0x02, 0xc9, 0x44, 0x55, 0x87, 0x8f, 0x96, 0x98, 0x64, 0x6d, 0x15}} ,
+ {{0xb0, 0x8b, 0xaa, 0x1e, 0xec, 0xc7, 0xa5, 0x8f, 0x1f, 0x92, 0x04, 0xc6, 0x05, 0xf6, 0xdf, 0xa1, 0xcc, 0x1f, 0x81, 0xf5, 0x0e, 0x9c, 0x57, 0xdc, 0xe3, 0xbb, 0x06, 0x87, 0x1e, 0xfe, 0x23, 0x6c}}},
+{{{0xd8, 0x2b, 0x5b, 0x16, 0xea, 0x20, 0xf1, 0xd3, 0x68, 0x8f, 0xae, 0x5b, 0xd0, 0xa9, 0x1a, 0x19, 0xa8, 0x36, 0xfb, 0x2b, 0x57, 0x88, 0x7d, 0x90, 0xd5, 0xa6, 0xf3, 0xdc, 0x38, 0x89, 0x4e, 0x1f}} ,
+ {{0xcc, 0x19, 0xda, 0x9b, 0x3b, 0x43, 0x48, 0x21, 0x2e, 0x23, 0x4d, 0x3d, 0xae, 0xf8, 0x8c, 0xfc, 0xdd, 0xa6, 0x74, 0x37, 0x65, 0xca, 0xee, 0x1a, 0x19, 0x8e, 0x9f, 0x64, 0x6f, 0x0c, 0x8b, 0x5a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x25, 0xb9, 0xc2, 0xf0, 0x72, 0xb8, 0x15, 0x16, 0xcc, 0x8d, 0x3c, 0x6f, 0x25, 0xed, 0xf4, 0x46, 0x2e, 0x0c, 0x60, 0x0f, 0xe2, 0x84, 0x34, 0x55, 0x89, 0x59, 0x34, 0x1b, 0xf5, 0x8d, 0xfe, 0x08}} ,
+ {{0xf8, 0xab, 0x93, 0xbc, 0x44, 0xba, 0x1b, 0x75, 0x4b, 0x49, 0x6f, 0xd0, 0x54, 0x2e, 0x63, 0xba, 0xb5, 0xea, 0xed, 0x32, 0x14, 0xc9, 0x94, 0xd8, 0xc5, 0xce, 0xf4, 0x10, 0x68, 0xe0, 0x38, 0x27}}},
+{{{0x74, 0x1c, 0x14, 0x9b, 0xd4, 0x64, 0x61, 0x71, 0x5a, 0xb6, 0x21, 0x33, 0x4f, 0xf7, 0x8e, 0xba, 0xa5, 0x48, 0x9a, 0xc7, 0xfa, 0x9a, 0xf0, 0xb4, 0x62, 0xad, 0xf2, 0x5e, 0xcc, 0x03, 0x24, 0x1a}} ,
+ {{0xf5, 0x76, 0xfd, 0xe4, 0xaf, 0xb9, 0x03, 0x59, 0xce, 0x63, 0xd2, 0x3b, 0x1f, 0xcd, 0x21, 0x0c, 0xad, 0x44, 0xa5, 0x97, 0xac, 0x80, 0x11, 0x02, 0x9b, 0x0c, 0xe5, 0x8b, 0xcd, 0xfb, 0x79, 0x77}}},
+{{{0x15, 0xbe, 0x9a, 0x0d, 0xba, 0x38, 0x72, 0x20, 0x8a, 0xf5, 0xbe, 0x59, 0x93, 0x79, 0xb7, 0xf6, 0x6a, 0x0c, 0x38, 0x27, 0x1a, 0x60, 0xf4, 0x86, 0x3b, 0xab, 0x5a, 0x00, 0xa0, 0xce, 0x21, 0x7d}} ,
+ {{0x6c, 0xba, 0x14, 0xc5, 0xea, 0x12, 0x9e, 0x2e, 0x82, 0x63, 0xce, 0x9b, 0x4a, 0xe7, 0x1d, 0xec, 0xf1, 0x2e, 0x51, 0x1c, 0xf4, 0xd0, 0x69, 0x15, 0x42, 0x9d, 0xa3, 0x3f, 0x0e, 0xbf, 0xe9, 0x5c}}},
+{{{0xe4, 0x0d, 0xf4, 0xbd, 0xee, 0x31, 0x10, 0xed, 0xcb, 0x12, 0x86, 0xad, 0xd4, 0x2f, 0x90, 0x37, 0x32, 0xc3, 0x0b, 0x73, 0xec, 0x97, 0x85, 0xa4, 0x01, 0x1c, 0x76, 0x35, 0xfe, 0x75, 0xdd, 0x71}} ,
+ {{0x11, 0xa4, 0x88, 0x9f, 0x3e, 0x53, 0x69, 0x3b, 0x1b, 0xe0, 0xf7, 0xba, 0x9b, 0xad, 0x4e, 0x81, 0x5f, 0xb5, 0x5c, 0xae, 0xbe, 0x67, 0x86, 0x37, 0x34, 0x8e, 0x07, 0x32, 0x45, 0x4a, 0x67, 0x39}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x90, 0x70, 0x58, 0x20, 0x03, 0x1e, 0x67, 0xb2, 0xc8, 0x9b, 0x58, 0xc5, 0xb1, 0xeb, 0x2d, 0x4a, 0xde, 0x82, 0x8c, 0xf2, 0xd2, 0x14, 0xb8, 0x70, 0x61, 0x4e, 0x73, 0xd6, 0x0b, 0x6b, 0x0d, 0x30}} ,
+ {{0x81, 0xfc, 0x55, 0x5c, 0xbf, 0xa7, 0xc4, 0xbd, 0xe2, 0xf0, 0x4b, 0x8f, 0xe9, 0x7d, 0x99, 0xfa, 0xd3, 0xab, 0xbc, 0xc7, 0x83, 0x2b, 0x04, 0x7f, 0x0c, 0x19, 0x43, 0x03, 0x3d, 0x07, 0xca, 0x40}}},
+{{{0xf9, 0xc8, 0xbe, 0x8c, 0x16, 0x81, 0x39, 0x96, 0xf6, 0x17, 0x58, 0xc8, 0x30, 0x58, 0xfb, 0xc2, 0x03, 0x45, 0xd2, 0x52, 0x76, 0xe0, 0x6a, 0x26, 0x28, 0x5c, 0x88, 0x59, 0x6a, 0x5a, 0x54, 0x42}} ,
+ {{0x07, 0xb5, 0x2e, 0x2c, 0x67, 0x15, 0x9b, 0xfb, 0x83, 0x69, 0x1e, 0x0f, 0xda, 0xd6, 0x29, 0xb1, 0x60, 0xe0, 0xb2, 0xba, 0x69, 0xa2, 0x9e, 0xbd, 0xbd, 0xe0, 0x1c, 0xbd, 0xcd, 0x06, 0x64, 0x70}}},
+{{{0x41, 0xfa, 0x8c, 0xe1, 0x89, 0x8f, 0x27, 0xc8, 0x25, 0x8f, 0x6f, 0x5f, 0x55, 0xf8, 0xde, 0x95, 0x6d, 0x2f, 0x75, 0x16, 0x2b, 0x4e, 0x44, 0xfd, 0x86, 0x6e, 0xe9, 0x70, 0x39, 0x76, 0x97, 0x7e}} ,
+ {{0x17, 0x62, 0x6b, 0x14, 0xa1, 0x7c, 0xd0, 0x79, 0x6e, 0xd8, 0x8a, 0xa5, 0x6d, 0x8c, 0x93, 0xd2, 0x3f, 0xec, 0x44, 0x8d, 0x6e, 0x91, 0x01, 0x8c, 0x8f, 0xee, 0x01, 0x8f, 0xc0, 0xb4, 0x85, 0x0e}}},
+{{{0x02, 0x3a, 0x70, 0x41, 0xe4, 0x11, 0x57, 0x23, 0xac, 0xe6, 0xfc, 0x54, 0x7e, 0xcd, 0xd7, 0x22, 0xcb, 0x76, 0x9f, 0x20, 0xce, 0xa0, 0x73, 0x76, 0x51, 0x3b, 0xa4, 0xf8, 0xe3, 0x62, 0x12, 0x6c}} ,
+ {{0x7f, 0x00, 0x9c, 0x26, 0x0d, 0x6f, 0x48, 0x7f, 0x3a, 0x01, 0xed, 0xc5, 0x96, 0xb0, 0x1f, 0x4f, 0xa8, 0x02, 0x62, 0x27, 0x8a, 0x50, 0x8d, 0x9a, 0x8b, 0x52, 0x0f, 0x1e, 0xcf, 0x41, 0x38, 0x19}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xf5, 0x6c, 0xd4, 0x2f, 0x0f, 0x69, 0x0f, 0x87, 0x3f, 0x61, 0x65, 0x1e, 0x35, 0x34, 0x85, 0xba, 0x02, 0x30, 0xac, 0x25, 0x3d, 0xe2, 0x62, 0xf1, 0xcc, 0xe9, 0x1b, 0xc2, 0xef, 0x6a, 0x42, 0x57}} ,
+ {{0x34, 0x1f, 0x2e, 0xac, 0xd1, 0xc7, 0x04, 0x52, 0x32, 0x66, 0xb2, 0x33, 0x73, 0x21, 0x34, 0x54, 0xf7, 0x71, 0xed, 0x06, 0xb0, 0xff, 0xa6, 0x59, 0x6f, 0x8a, 0x4e, 0xfb, 0x02, 0xb0, 0x45, 0x6b}}},
+{{{0xf5, 0x48, 0x0b, 0x03, 0xc5, 0x22, 0x7d, 0x80, 0x08, 0x53, 0xfe, 0x32, 0xb1, 0xa1, 0x8a, 0x74, 0x6f, 0xbd, 0x3f, 0x85, 0xf4, 0xcf, 0xf5, 0x60, 0xaf, 0x41, 0x7e, 0x3e, 0x46, 0xa3, 0x5a, 0x20}} ,
+ {{0xaa, 0x35, 0x87, 0x44, 0x63, 0x66, 0x97, 0xf8, 0x6e, 0x55, 0x0c, 0x04, 0x3e, 0x35, 0x50, 0xbf, 0x93, 0x69, 0xd2, 0x8b, 0x05, 0x55, 0x99, 0xbe, 0xe2, 0x53, 0x61, 0xec, 0xe8, 0x08, 0x0b, 0x32}}},
+{{{0xb3, 0x10, 0x45, 0x02, 0x69, 0x59, 0x2e, 0x97, 0xd9, 0x64, 0xf8, 0xdb, 0x25, 0x80, 0xdc, 0xc4, 0xd5, 0x62, 0x3c, 0xed, 0x65, 0x91, 0xad, 0xd1, 0x57, 0x81, 0x94, 0xaa, 0xa1, 0x29, 0xfc, 0x68}} ,
+ {{0xdd, 0xb5, 0x7d, 0xab, 0x5a, 0x21, 0x41, 0x53, 0xbb, 0x17, 0x79, 0x0d, 0xd1, 0xa8, 0x0c, 0x0c, 0x20, 0x88, 0x09, 0xe9, 0x84, 0xe8, 0x25, 0x11, 0x67, 0x7a, 0x8b, 0x1a, 0xe4, 0x5d, 0xe1, 0x5d}}},
+{{{0x37, 0xea, 0xfe, 0x65, 0x3b, 0x25, 0xe8, 0xe1, 0xc2, 0xc5, 0x02, 0xa4, 0xbe, 0x98, 0x0a, 0x2b, 0x61, 0xc1, 0x9b, 0xe2, 0xd5, 0x92, 0xe6, 0x9e, 0x7d, 0x1f, 0xca, 0x43, 0x88, 0x8b, 0x2c, 0x59}} ,
+ {{0xe0, 0xb5, 0x00, 0x1d, 0x2a, 0x6f, 0xaf, 0x79, 0x86, 0x2f, 0xa6, 0x5a, 0x93, 0xd1, 0xfe, 0xae, 0x3a, 0xee, 0xdb, 0x7c, 0x61, 0xbe, 0x7c, 0x01, 0xf9, 0xfe, 0x52, 0xdc, 0xd8, 0x52, 0xa3, 0x42}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x22, 0xaf, 0x13, 0x37, 0xbd, 0x37, 0x71, 0xac, 0x04, 0x46, 0x63, 0xac, 0xa4, 0x77, 0xed, 0x25, 0x38, 0xe0, 0x15, 0xa8, 0x64, 0x00, 0x0d, 0xce, 0x51, 0x01, 0xa9, 0xbc, 0x0f, 0x03, 0x1c, 0x04}} ,
+ {{0x89, 0xf9, 0x80, 0x07, 0xcf, 0x3f, 0xb3, 0xe9, 0xe7, 0x45, 0x44, 0x3d, 0x2a, 0x7c, 0xe9, 0xe4, 0x16, 0x5c, 0x5e, 0x65, 0x1c, 0xc7, 0x7d, 0xc6, 0x7a, 0xfb, 0x43, 0xee, 0x25, 0x76, 0x46, 0x72}}},
+{{{0x02, 0xa2, 0xed, 0xf4, 0x8f, 0x6b, 0x0b, 0x3e, 0xeb, 0x35, 0x1a, 0xd5, 0x7e, 0xdb, 0x78, 0x00, 0x96, 0x8a, 0xa0, 0xb4, 0xcf, 0x60, 0x4b, 0xd4, 0xd5, 0xf9, 0x2d, 0xbf, 0x88, 0xbd, 0x22, 0x62}} ,
+ {{0x13, 0x53, 0xe4, 0x82, 0x57, 0xfa, 0x1e, 0x8f, 0x06, 0x2b, 0x90, 0xba, 0x08, 0xb6, 0x10, 0x54, 0x4f, 0x7c, 0x1b, 0x26, 0xed, 0xda, 0x6b, 0xdd, 0x25, 0xd0, 0x4e, 0xea, 0x42, 0xbb, 0x25, 0x03}}},
+{{{0x51, 0x16, 0x50, 0x7c, 0xd5, 0x5d, 0xf6, 0x99, 0xe8, 0x77, 0x72, 0x4e, 0xfa, 0x62, 0xcb, 0x76, 0x75, 0x0c, 0xe2, 0x71, 0x98, 0x92, 0xd5, 0xfa, 0x45, 0xdf, 0x5c, 0x6f, 0x1e, 0x9e, 0x28, 0x69}} ,
+ {{0x0d, 0xac, 0x66, 0x6d, 0xc3, 0x8b, 0xba, 0x16, 0xb5, 0xe2, 0xa0, 0x0d, 0x0c, 0xbd, 0xa4, 0x8e, 0x18, 0x6c, 0xf2, 0xdc, 0xf9, 0xdc, 0x4a, 0x86, 0x25, 0x95, 0x14, 0xcb, 0xd8, 0x1a, 0x04, 0x0f}}},
+{{{0x97, 0xa5, 0xdb, 0x8b, 0x2d, 0xaa, 0x42, 0x11, 0x09, 0xf2, 0x93, 0xbb, 0xd9, 0x06, 0x84, 0x4e, 0x11, 0xa8, 0xa0, 0x25, 0x2b, 0xa6, 0x5f, 0xae, 0xc4, 0xb4, 0x4c, 0xc8, 0xab, 0xc7, 0x3b, 0x02}} ,
+ {{0xee, 0xc9, 0x29, 0x0f, 0xdf, 0x11, 0x85, 0xed, 0xce, 0x0d, 0x62, 0x2c, 0x8f, 0x4b, 0xf9, 0x04, 0xe9, 0x06, 0x72, 0x1d, 0x37, 0x20, 0x50, 0xc9, 0x14, 0xeb, 0xec, 0x39, 0xa7, 0x97, 0x2b, 0x4d}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x69, 0xd1, 0x39, 0xbd, 0xfb, 0x33, 0xbe, 0xc4, 0xf0, 0x5c, 0xef, 0xf0, 0x56, 0x68, 0xfc, 0x97, 0x47, 0xc8, 0x72, 0xb6, 0x53, 0xa4, 0x0a, 0x98, 0xa5, 0xb4, 0x37, 0x71, 0xcf, 0x66, 0x50, 0x6d}} ,
+ {{0x17, 0xa4, 0x19, 0x52, 0x11, 0x47, 0xb3, 0x5c, 0x5b, 0xa9, 0x2e, 0x22, 0xb4, 0x00, 0x52, 0xf9, 0x57, 0x18, 0xb8, 0xbe, 0x5a, 0xe3, 0xab, 0x83, 0xc8, 0x87, 0x0a, 0x2a, 0xd8, 0x8c, 0xbb, 0x54}}},
+{{{0xa9, 0x62, 0x93, 0x85, 0xbe, 0xe8, 0x73, 0x4a, 0x0e, 0xb0, 0xb5, 0x2d, 0x94, 0x50, 0xaa, 0xd3, 0xb2, 0xea, 0x9d, 0x62, 0x76, 0x3b, 0x07, 0x34, 0x4e, 0x2d, 0x70, 0xc8, 0x9a, 0x15, 0x66, 0x6b}} ,
+ {{0xc5, 0x96, 0xca, 0xc8, 0x22, 0x1a, 0xee, 0x5f, 0xe7, 0x31, 0x60, 0x22, 0x83, 0x08, 0x63, 0xce, 0xb9, 0x32, 0x44, 0x58, 0x5d, 0x3a, 0x9b, 0xe4, 0x04, 0xd5, 0xef, 0x38, 0xef, 0x4b, 0xdd, 0x19}}},
+{{{0x4d, 0xc2, 0x17, 0x75, 0xa1, 0x68, 0xcd, 0xc3, 0xc6, 0x03, 0x44, 0xe3, 0x78, 0x09, 0x91, 0x47, 0x3f, 0x0f, 0xe4, 0x92, 0x58, 0xfa, 0x7d, 0x1f, 0x20, 0x94, 0x58, 0x5e, 0xbc, 0x19, 0x02, 0x6f}} ,
+ {{0x20, 0xd6, 0xd8, 0x91, 0x54, 0xa7, 0xf3, 0x20, 0x4b, 0x34, 0x06, 0xfa, 0x30, 0xc8, 0x6f, 0x14, 0x10, 0x65, 0x74, 0x13, 0x4e, 0xf0, 0x69, 0x26, 0xce, 0xcf, 0x90, 0xf4, 0xd0, 0xc5, 0xc8, 0x64}}},
+{{{0x26, 0xa2, 0x50, 0x02, 0x24, 0x72, 0xf1, 0xf0, 0x4e, 0x2d, 0x93, 0xd5, 0x08, 0xe7, 0xae, 0x38, 0xf7, 0x18, 0xa5, 0x32, 0x34, 0xc2, 0xf0, 0xa6, 0xec, 0xb9, 0x61, 0x7b, 0x64, 0x99, 0xac, 0x71}} ,
+ {{0x25, 0xcf, 0x74, 0x55, 0x1b, 0xaa, 0xa9, 0x38, 0x41, 0x40, 0xd5, 0x95, 0x95, 0xab, 0x1c, 0x5e, 0xbc, 0x41, 0x7e, 0x14, 0x30, 0xbe, 0x13, 0x89, 0xf4, 0xe5, 0xeb, 0x28, 0xc0, 0xc2, 0x96, 0x3a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x2b, 0x77, 0x45, 0xec, 0x67, 0x76, 0x32, 0x4c, 0xb9, 0xdf, 0x25, 0x32, 0x6b, 0xcb, 0xe7, 0x14, 0x61, 0x43, 0xee, 0xba, 0x9b, 0x71, 0xef, 0xd2, 0x48, 0x65, 0xbb, 0x1b, 0x8a, 0x13, 0x1b, 0x22}} ,
+ {{0x84, 0xad, 0x0c, 0x18, 0x38, 0x5a, 0xba, 0xd0, 0x98, 0x59, 0xbf, 0x37, 0xb0, 0x4f, 0x97, 0x60, 0x20, 0xb3, 0x9b, 0x97, 0xf6, 0x08, 0x6c, 0xa4, 0xff, 0xfb, 0xb7, 0xfa, 0x95, 0xb2, 0x51, 0x79}}},
+{{{0x28, 0x5c, 0x3f, 0xdb, 0x6b, 0x18, 0x3b, 0x5c, 0xd1, 0x04, 0x28, 0xde, 0x85, 0x52, 0x31, 0xb5, 0xbb, 0xf6, 0xa9, 0xed, 0xbe, 0x28, 0x4f, 0xb3, 0x7e, 0x05, 0x6a, 0xdb, 0x95, 0x0d, 0x1b, 0x1c}} ,
+ {{0xd5, 0xc5, 0xc3, 0x9a, 0x0a, 0xd0, 0x31, 0x3e, 0x07, 0x36, 0x8e, 0xc0, 0x8a, 0x62, 0xb1, 0xca, 0xd6, 0x0e, 0x1e, 0x9d, 0xef, 0xab, 0x98, 0x4d, 0xbb, 0x6c, 0x05, 0xe0, 0xe4, 0x5d, 0xbd, 0x57}}},
+{{{0xcc, 0x21, 0x27, 0xce, 0xfd, 0xa9, 0x94, 0x8e, 0xe1, 0xab, 0x49, 0xe0, 0x46, 0x26, 0xa1, 0xa8, 0x8c, 0xa1, 0x99, 0x1d, 0xb4, 0x27, 0x6d, 0x2d, 0xc8, 0x39, 0x30, 0x5e, 0x37, 0x52, 0xc4, 0x6e}} ,
+ {{0xa9, 0x85, 0xf4, 0xe7, 0xb0, 0x15, 0x33, 0x84, 0x1b, 0x14, 0x1a, 0x02, 0xd9, 0x3b, 0xad, 0x0f, 0x43, 0x6c, 0xea, 0x3e, 0x0f, 0x7e, 0xda, 0xdd, 0x6b, 0x4c, 0x7f, 0x6e, 0xd4, 0x6b, 0xbf, 0x0f}}},
+{{{0x47, 0x9f, 0x7c, 0x56, 0x7c, 0x43, 0x91, 0x1c, 0xbb, 0x4e, 0x72, 0x3e, 0x64, 0xab, 0xa0, 0xa0, 0xdf, 0xb4, 0xd8, 0x87, 0x3a, 0xbd, 0xa8, 0x48, 0xc9, 0xb8, 0xef, 0x2e, 0xad, 0x6f, 0x84, 0x4f}} ,
+ {{0x2d, 0x2d, 0xf0, 0x1b, 0x7e, 0x2a, 0x6c, 0xf8, 0xa9, 0x6a, 0xe1, 0xf0, 0x99, 0xa1, 0x67, 0x9a, 0xd4, 0x13, 0xca, 0xca, 0xba, 0x27, 0x92, 0xaa, 0xa1, 0x5d, 0x50, 0xde, 0xcc, 0x40, 0x26, 0x0a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x9f, 0x3e, 0xf2, 0xb2, 0x90, 0xce, 0xdb, 0x64, 0x3e, 0x03, 0xdd, 0x37, 0x36, 0x54, 0x70, 0x76, 0x24, 0xb5, 0x69, 0x03, 0xfc, 0xa0, 0x2b, 0x74, 0xb2, 0x05, 0x0e, 0xcc, 0xd8, 0x1f, 0x6a, 0x1f}} ,
+ {{0x19, 0x5e, 0x60, 0x69, 0x58, 0x86, 0xa0, 0x31, 0xbd, 0x32, 0xe9, 0x2c, 0x5c, 0xd2, 0x85, 0xba, 0x40, 0x64, 0xa8, 0x74, 0xf8, 0x0e, 0x1c, 0xb3, 0xa9, 0x69, 0xe8, 0x1e, 0x40, 0x64, 0x99, 0x77}}},
+{{{0x6c, 0x32, 0x4f, 0xfd, 0xbb, 0x5c, 0xbb, 0x8d, 0x64, 0x66, 0x4a, 0x71, 0x1f, 0x79, 0xa3, 0xad, 0x8d, 0xf9, 0xd4, 0xec, 0xcf, 0x67, 0x70, 0xfa, 0x05, 0x4a, 0x0f, 0x6e, 0xaf, 0x87, 0x0a, 0x6f}} ,
+ {{0xc6, 0x36, 0x6e, 0x6c, 0x8c, 0x24, 0x09, 0x60, 0xbe, 0x26, 0xd2, 0x4c, 0x5e, 0x17, 0xca, 0x5f, 0x1d, 0xcc, 0x87, 0xe8, 0x42, 0x6a, 0xcb, 0xcb, 0x7d, 0x92, 0x05, 0x35, 0x81, 0x13, 0x60, 0x6b}}},
+{{{0xf4, 0x15, 0xcd, 0x0f, 0x0a, 0xaf, 0x4e, 0x6b, 0x51, 0xfd, 0x14, 0xc4, 0x2e, 0x13, 0x86, 0x74, 0x44, 0xcb, 0x66, 0x6b, 0xb6, 0x9d, 0x74, 0x56, 0x32, 0xac, 0x8d, 0x8e, 0x8c, 0x8c, 0x8c, 0x39}} ,
+ {{0xca, 0x59, 0x74, 0x1a, 0x11, 0xef, 0x6d, 0xf7, 0x39, 0x5c, 0x3b, 0x1f, 0xfa, 0xe3, 0x40, 0x41, 0x23, 0x9e, 0xf6, 0xd1, 0x21, 0xa2, 0xbf, 0xad, 0x65, 0x42, 0x6b, 0x59, 0x8a, 0xe8, 0xc5, 0x7f}}},
+{{{0x64, 0x05, 0x7a, 0x84, 0x4a, 0x13, 0xc3, 0xf6, 0xb0, 0x6e, 0x9a, 0x6b, 0x53, 0x6b, 0x32, 0xda, 0xd9, 0x74, 0x75, 0xc4, 0xba, 0x64, 0x3d, 0x3b, 0x08, 0xdd, 0x10, 0x46, 0xef, 0xc7, 0x90, 0x1f}} ,
+ {{0x7b, 0x2f, 0x3a, 0xce, 0xc8, 0xa1, 0x79, 0x3c, 0x30, 0x12, 0x44, 0x28, 0xf6, 0xbc, 0xff, 0xfd, 0xf4, 0xc0, 0x97, 0xb0, 0xcc, 0xc3, 0x13, 0x7a, 0xb9, 0x9a, 0x16, 0xe4, 0xcb, 0x4c, 0x34, 0x63}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x07, 0x4e, 0xd3, 0x2d, 0x09, 0x33, 0x0e, 0xd2, 0x0d, 0xbe, 0x3e, 0xe7, 0xe4, 0xaa, 0xb7, 0x00, 0x8b, 0xe8, 0xad, 0xaa, 0x7a, 0x8d, 0x34, 0x28, 0xa9, 0x81, 0x94, 0xc5, 0xe7, 0x42, 0xac, 0x47}} ,
+ {{0x24, 0x89, 0x7a, 0x8f, 0xb5, 0x9b, 0xf0, 0xc2, 0x03, 0x64, 0xd0, 0x1e, 0xf5, 0xa4, 0xb2, 0xf3, 0x74, 0xe9, 0x1a, 0x16, 0xfd, 0xcb, 0x15, 0xea, 0xeb, 0x10, 0x6c, 0x35, 0xd1, 0xc1, 0xa6, 0x28}}},
+{{{0xcc, 0xd5, 0x39, 0xfc, 0xa5, 0xa4, 0xad, 0x32, 0x15, 0xce, 0x19, 0xe8, 0x34, 0x2b, 0x1c, 0x60, 0x91, 0xfc, 0x05, 0xa9, 0xb3, 0xdc, 0x80, 0x29, 0xc4, 0x20, 0x79, 0x06, 0x39, 0xc0, 0xe2, 0x22}} ,
+ {{0xbb, 0xa8, 0xe1, 0x89, 0x70, 0x57, 0x18, 0x54, 0x3c, 0xf6, 0x0d, 0x82, 0x12, 0x05, 0x87, 0x96, 0x06, 0x39, 0xe3, 0xf8, 0xb3, 0x95, 0xe5, 0xd7, 0x26, 0xbf, 0x09, 0x5a, 0x94, 0xf9, 0x1c, 0x63}}},
+{{{0x2b, 0x8c, 0x2d, 0x9a, 0x8b, 0x84, 0xf2, 0x56, 0xfb, 0xad, 0x2e, 0x7f, 0xb7, 0xfc, 0x30, 0xe1, 0x35, 0x89, 0xba, 0x4d, 0xa8, 0x6d, 0xce, 0x8c, 0x8b, 0x30, 0xe0, 0xda, 0x29, 0x18, 0x11, 0x17}} ,
+ {{0x19, 0xa6, 0x5a, 0x65, 0x93, 0xc3, 0xb5, 0x31, 0x22, 0x4f, 0xf3, 0xf6, 0x0f, 0xeb, 0x28, 0xc3, 0x7c, 0xeb, 0xce, 0x86, 0xec, 0x67, 0x76, 0x6e, 0x35, 0x45, 0x7b, 0xd8, 0x6b, 0x92, 0x01, 0x65}}},
+{{{0x3d, 0xd5, 0x9a, 0x64, 0x73, 0x36, 0xb1, 0xd6, 0x86, 0x98, 0x42, 0x3f, 0x8a, 0xf1, 0xc7, 0xf5, 0x42, 0xa8, 0x9c, 0x52, 0xa8, 0xdc, 0xf9, 0x24, 0x3f, 0x4a, 0xa1, 0xa4, 0x5b, 0xe8, 0x62, 0x1a}} ,
+ {{0xc5, 0xbd, 0xc8, 0x14, 0xd5, 0x0d, 0xeb, 0xe1, 0xa5, 0xe6, 0x83, 0x11, 0x09, 0x00, 0x1d, 0x55, 0x83, 0x51, 0x7e, 0x75, 0x00, 0x81, 0xb9, 0xcb, 0xd8, 0xc5, 0xe5, 0xa1, 0xd9, 0x17, 0x6d, 0x1f}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xea, 0xf9, 0xe4, 0xe9, 0xe1, 0x52, 0x3f, 0x51, 0x19, 0x0d, 0xdd, 0xd9, 0x9d, 0x93, 0x31, 0x87, 0x23, 0x09, 0xd5, 0x83, 0xeb, 0x92, 0x09, 0x76, 0x6e, 0xe3, 0xf8, 0xc0, 0xa2, 0x66, 0xb5, 0x36}} ,
+ {{0x3a, 0xbb, 0x39, 0xed, 0x32, 0x02, 0xe7, 0x43, 0x7a, 0x38, 0x14, 0x84, 0xe3, 0x44, 0xd2, 0x5e, 0x94, 0xdd, 0x78, 0x89, 0x55, 0x4c, 0x73, 0x9e, 0xe1, 0xe4, 0x3e, 0x43, 0xd0, 0x4a, 0xde, 0x1b}}},
+{{{0xb2, 0xe7, 0x8f, 0xe3, 0xa3, 0xc5, 0xcb, 0x72, 0xee, 0x79, 0x41, 0xf8, 0xdf, 0xee, 0x65, 0xc5, 0x45, 0x77, 0x27, 0x3c, 0xbd, 0x58, 0xd3, 0x75, 0xe2, 0x04, 0x4b, 0xbb, 0x65, 0xf3, 0xc8, 0x0f}} ,
+ {{0x24, 0x7b, 0x93, 0x34, 0xb5, 0xe2, 0x74, 0x48, 0xcd, 0xa0, 0x0b, 0x92, 0x97, 0x66, 0x39, 0xf4, 0xb0, 0xe2, 0x5d, 0x39, 0x6a, 0x5b, 0x45, 0x17, 0x78, 0x1e, 0xdb, 0x91, 0x81, 0x1c, 0xf9, 0x16}}},
+{{{0x16, 0xdf, 0xd1, 0x5a, 0xd5, 0xe9, 0x4e, 0x58, 0x95, 0x93, 0x5f, 0x51, 0x09, 0xc3, 0x2a, 0xc9, 0xd4, 0x55, 0x48, 0x79, 0xa4, 0xa3, 0xb2, 0xc3, 0x62, 0xaa, 0x8c, 0xe8, 0xad, 0x47, 0x39, 0x1b}} ,
+ {{0x46, 0xda, 0x9e, 0x51, 0x3a, 0xe6, 0xd1, 0xa6, 0xbb, 0x4d, 0x7b, 0x08, 0xbe, 0x8c, 0xd5, 0xf3, 0x3f, 0xfd, 0xf7, 0x44, 0x80, 0x2d, 0x53, 0x4b, 0xd0, 0x87, 0x68, 0xc1, 0xb5, 0xd8, 0xf7, 0x07}}},
+{{{0xf4, 0x10, 0x46, 0xbe, 0xb7, 0xd2, 0xd1, 0xce, 0x5e, 0x76, 0xa2, 0xd7, 0x03, 0xdc, 0xe4, 0x81, 0x5a, 0xf6, 0x3c, 0xde, 0xae, 0x7a, 0x9d, 0x21, 0x34, 0xa5, 0xf6, 0xa9, 0x73, 0xe2, 0x8d, 0x60}} ,
+ {{0xfa, 0x44, 0x71, 0xf6, 0x41, 0xd8, 0xc6, 0x58, 0x13, 0x37, 0xeb, 0x84, 0x0f, 0x96, 0xc7, 0xdc, 0xc8, 0xa9, 0x7a, 0x83, 0xb2, 0x2f, 0x31, 0xb1, 0x1a, 0xd8, 0x98, 0x3f, 0x11, 0xd0, 0x31, 0x3b}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x81, 0xd5, 0x34, 0x16, 0x01, 0xa3, 0x93, 0xea, 0x52, 0x94, 0xec, 0x93, 0xb7, 0x81, 0x11, 0x2d, 0x58, 0xf9, 0xb5, 0x0a, 0xaa, 0x4f, 0xf6, 0x2e, 0x3f, 0x36, 0xbf, 0x33, 0x5a, 0xe7, 0xd1, 0x08}} ,
+ {{0x1a, 0xcf, 0x42, 0xae, 0xcc, 0xb5, 0x77, 0x39, 0xc4, 0x5b, 0x5b, 0xd0, 0x26, 0x59, 0x27, 0xd0, 0x55, 0x71, 0x12, 0x9d, 0x88, 0x3d, 0x9c, 0xea, 0x41, 0x6a, 0xf0, 0x50, 0x93, 0x93, 0xdd, 0x47}}},
+{{{0x6f, 0xc9, 0x51, 0x6d, 0x1c, 0xaa, 0xf5, 0xa5, 0x90, 0x3f, 0x14, 0xe2, 0x6e, 0x8e, 0x64, 0xfd, 0xac, 0xe0, 0x4e, 0x22, 0xe5, 0xc1, 0xbc, 0x29, 0x0a, 0x6a, 0x9e, 0xa1, 0x60, 0xcb, 0x2f, 0x0b}} ,
+ {{0xdc, 0x39, 0x32, 0xf3, 0xa1, 0x44, 0xe9, 0xc5, 0xc3, 0x78, 0xfb, 0x95, 0x47, 0x34, 0x35, 0x34, 0xe8, 0x25, 0xde, 0x93, 0xc6, 0xb4, 0x76, 0x6d, 0x86, 0x13, 0xc6, 0xe9, 0x68, 0xb5, 0x01, 0x63}}},
+{{{0x1f, 0x9a, 0x52, 0x64, 0x97, 0xd9, 0x1c, 0x08, 0x51, 0x6f, 0x26, 0x9d, 0xaa, 0x93, 0x33, 0x43, 0xfa, 0x77, 0xe9, 0x62, 0x9b, 0x5d, 0x18, 0x75, 0xeb, 0x78, 0xf7, 0x87, 0x8f, 0x41, 0xb4, 0x4d}} ,
+ {{0x13, 0xa8, 0x82, 0x3e, 0xe9, 0x13, 0xad, 0xeb, 0x01, 0xca, 0xcf, 0xda, 0xcd, 0xf7, 0x6c, 0xc7, 0x7a, 0xdc, 0x1e, 0x6e, 0xc8, 0x4e, 0x55, 0x62, 0x80, 0xea, 0x78, 0x0c, 0x86, 0xb9, 0x40, 0x51}}},
+{{{0x27, 0xae, 0xd3, 0x0d, 0x4c, 0x8f, 0x34, 0xea, 0x7d, 0x3c, 0xe5, 0x8a, 0xcf, 0x5b, 0x92, 0xd8, 0x30, 0x16, 0xb4, 0xa3, 0x75, 0xff, 0xeb, 0x27, 0xc8, 0x5c, 0x6c, 0xc2, 0xee, 0x6c, 0x21, 0x0b}} ,
+ {{0xc3, 0xba, 0x12, 0x53, 0x2a, 0xaa, 0x77, 0xad, 0x19, 0x78, 0x55, 0x8a, 0x2e, 0x60, 0x87, 0xc2, 0x6e, 0x91, 0x38, 0x91, 0x3f, 0x7a, 0xc5, 0x24, 0x8f, 0x51, 0xc5, 0xde, 0xb0, 0x53, 0x30, 0x56}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x02, 0xfe, 0x54, 0x12, 0x18, 0xca, 0x7d, 0xa5, 0x68, 0x43, 0xa3, 0x6d, 0x14, 0x2a, 0x6a, 0xa5, 0x8e, 0x32, 0xe7, 0x63, 0x4f, 0xe3, 0xc6, 0x44, 0x3e, 0xab, 0x63, 0xca, 0x17, 0x86, 0x74, 0x3f}} ,
+ {{0x1e, 0x64, 0xc1, 0x7d, 0x52, 0xdc, 0x13, 0x5a, 0xa1, 0x9c, 0x4e, 0xee, 0x99, 0x28, 0xbb, 0x4c, 0xee, 0xac, 0xa9, 0x1b, 0x89, 0xa2, 0x38, 0x39, 0x7b, 0xc4, 0x0f, 0x42, 0xe6, 0x89, 0xed, 0x0f}}},
+{{{0xf3, 0x3c, 0x8c, 0x80, 0x83, 0x10, 0x8a, 0x37, 0x50, 0x9c, 0xb4, 0xdf, 0x3f, 0x8c, 0xf7, 0x23, 0x07, 0xd6, 0xff, 0xa0, 0x82, 0x6c, 0x75, 0x3b, 0xe4, 0xb5, 0xbb, 0xe4, 0xe6, 0x50, 0xf0, 0x08}} ,
+ {{0x62, 0xee, 0x75, 0x48, 0x92, 0x33, 0xf2, 0xf4, 0xad, 0x15, 0x7a, 0xa1, 0x01, 0x46, 0xa9, 0x32, 0x06, 0x88, 0xb6, 0x36, 0x47, 0x35, 0xb9, 0xb4, 0x42, 0x85, 0x76, 0xf0, 0x48, 0x00, 0x90, 0x38}}},
+{{{0x51, 0x15, 0x9d, 0xc3, 0x95, 0xd1, 0x39, 0xbb, 0x64, 0x9d, 0x15, 0x81, 0xc1, 0x68, 0xd0, 0xb6, 0xa4, 0x2c, 0x7d, 0x5e, 0x02, 0x39, 0x00, 0xe0, 0x3b, 0xa4, 0xcc, 0xca, 0x1d, 0x81, 0x24, 0x10}} ,
+ {{0xe7, 0x29, 0xf9, 0x37, 0xd9, 0x46, 0x5a, 0xcd, 0x70, 0xfe, 0x4d, 0x5b, 0xbf, 0xa5, 0xcf, 0x91, 0xf4, 0xef, 0xee, 0x8a, 0x29, 0xd0, 0xe7, 0xc4, 0x25, 0x92, 0x8a, 0xff, 0x36, 0xfc, 0xe4, 0x49}}},
+{{{0xbd, 0x00, 0xb9, 0x04, 0x7d, 0x35, 0xfc, 0xeb, 0xd0, 0x0b, 0x05, 0x32, 0x52, 0x7a, 0x89, 0x24, 0x75, 0x50, 0xe1, 0x63, 0x02, 0x82, 0x8e, 0xe7, 0x85, 0x0c, 0xf2, 0x56, 0x44, 0x37, 0x83, 0x25}} ,
+ {{0x8f, 0xa1, 0xce, 0xcb, 0x60, 0xda, 0x12, 0x02, 0x1e, 0x29, 0x39, 0x2a, 0x03, 0xb7, 0xeb, 0x77, 0x40, 0xea, 0xc9, 0x2b, 0x2c, 0xd5, 0x7d, 0x7e, 0x2c, 0xc7, 0x5a, 0xfd, 0xff, 0xc4, 0xd1, 0x62}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x1d, 0x88, 0x98, 0x5b, 0x4e, 0xfc, 0x41, 0x24, 0x05, 0xe6, 0x50, 0x2b, 0xae, 0x96, 0x51, 0xd9, 0x6b, 0x72, 0xb2, 0x33, 0x42, 0x98, 0x68, 0xbb, 0x10, 0x5a, 0x7a, 0x8c, 0x9d, 0x07, 0xb4, 0x05}} ,
+ {{0x2f, 0x61, 0x9f, 0xd7, 0xa8, 0x3f, 0x83, 0x8c, 0x10, 0x69, 0x90, 0xe6, 0xcf, 0xd2, 0x63, 0xa3, 0xe4, 0x54, 0x7e, 0xe5, 0x69, 0x13, 0x1c, 0x90, 0x57, 0xaa, 0xe9, 0x53, 0x22, 0x43, 0x29, 0x23}}},
+{{{0xe5, 0x1c, 0xf8, 0x0a, 0xfd, 0x2d, 0x7e, 0xf5, 0xf5, 0x70, 0x7d, 0x41, 0x6b, 0x11, 0xfe, 0xbe, 0x99, 0xd1, 0x55, 0x29, 0x31, 0xbf, 0xc0, 0x97, 0x6c, 0xd5, 0x35, 0xcc, 0x5e, 0x8b, 0xd9, 0x69}} ,
+ {{0x8e, 0x4e, 0x9f, 0x25, 0xf8, 0x81, 0x54, 0x2d, 0x0e, 0xd5, 0x54, 0x81, 0x9b, 0xa6, 0x92, 0xce, 0x4b, 0xe9, 0x8f, 0x24, 0x3b, 0xca, 0xe0, 0x44, 0xab, 0x36, 0xfe, 0xfb, 0x87, 0xd4, 0x26, 0x3e}}},
+{{{0x0f, 0x93, 0x9c, 0x11, 0xe7, 0xdb, 0xf1, 0xf0, 0x85, 0x43, 0x28, 0x15, 0x37, 0xdd, 0xde, 0x27, 0xdf, 0xad, 0x3e, 0x49, 0x4f, 0xe0, 0x5b, 0xf6, 0x80, 0x59, 0x15, 0x3c, 0x85, 0xb7, 0x3e, 0x12}} ,
+ {{0xf5, 0xff, 0xcc, 0xf0, 0xb4, 0x12, 0x03, 0x5f, 0xc9, 0x84, 0xcb, 0x1d, 0x17, 0xe0, 0xbc, 0xcc, 0x03, 0x62, 0xa9, 0x8b, 0x94, 0xa6, 0xaa, 0x18, 0xcb, 0x27, 0x8d, 0x49, 0xa6, 0x17, 0x15, 0x07}}},
+{{{0xd9, 0xb6, 0xd4, 0x9d, 0xd4, 0x6a, 0xaf, 0x70, 0x07, 0x2c, 0x10, 0x9e, 0xbd, 0x11, 0xad, 0xe4, 0x26, 0x33, 0x70, 0x92, 0x78, 0x1c, 0x74, 0x9f, 0x75, 0x60, 0x56, 0xf4, 0x39, 0xa8, 0xa8, 0x62}} ,
+ {{0x3b, 0xbf, 0x55, 0x35, 0x61, 0x8b, 0x44, 0x97, 0xe8, 0x3a, 0x55, 0xc1, 0xc8, 0x3b, 0xfd, 0x95, 0x29, 0x11, 0x60, 0x96, 0x1e, 0xcb, 0x11, 0x9d, 0xc2, 0x03, 0x8a, 0x1b, 0xc6, 0xd6, 0x45, 0x3d}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x7e, 0x0e, 0x50, 0xb2, 0xcc, 0x0d, 0x6b, 0xa6, 0x71, 0x5b, 0x42, 0xed, 0xbd, 0xaf, 0xac, 0xf0, 0xfc, 0x12, 0xa2, 0x3f, 0x4e, 0xda, 0xe8, 0x11, 0xf3, 0x23, 0xe1, 0x04, 0x62, 0x03, 0x1c, 0x4e}} ,
+ {{0xc8, 0xb1, 0x1b, 0x6f, 0x73, 0x61, 0x3d, 0x27, 0x0d, 0x7d, 0x7a, 0x25, 0x5f, 0x73, 0x0e, 0x2f, 0x93, 0xf6, 0x24, 0xd8, 0x4f, 0x90, 0xac, 0xa2, 0x62, 0x0a, 0xf0, 0x61, 0xd9, 0x08, 0x59, 0x6a}}},
+{{{0x6f, 0x2d, 0x55, 0xf8, 0x2f, 0x8e, 0xf0, 0x18, 0x3b, 0xea, 0xdd, 0x26, 0x72, 0xd1, 0xf5, 0xfe, 0xe5, 0xb8, 0xe6, 0xd3, 0x10, 0x48, 0x46, 0x49, 0x3a, 0x9f, 0x5e, 0x45, 0x6b, 0x90, 0xe8, 0x7f}} ,
+ {{0xd3, 0x76, 0x69, 0x33, 0x7b, 0xb9, 0x40, 0x70, 0xee, 0xa6, 0x29, 0x6b, 0xdd, 0xd0, 0x5d, 0x8d, 0xc1, 0x3e, 0x4a, 0xea, 0x37, 0xb1, 0x03, 0x02, 0x03, 0x35, 0xf1, 0x28, 0x9d, 0xff, 0x00, 0x13}}},
+{{{0x7a, 0xdb, 0x12, 0xd2, 0x8a, 0x82, 0x03, 0x1b, 0x1e, 0xaf, 0xf9, 0x4b, 0x9c, 0xbe, 0xae, 0x7c, 0xe4, 0x94, 0x2a, 0x23, 0xb3, 0x62, 0x86, 0xe7, 0xfd, 0x23, 0xaa, 0x99, 0xbd, 0x2b, 0x11, 0x6c}} ,
+ {{0x8d, 0xa6, 0xd5, 0xac, 0x9d, 0xcc, 0x68, 0x75, 0x7f, 0xc3, 0x4d, 0x4b, 0xdd, 0x6c, 0xbb, 0x11, 0x5a, 0x60, 0xe5, 0xbd, 0x7d, 0x27, 0x8b, 0xda, 0xb4, 0x95, 0xf6, 0x03, 0x27, 0xa4, 0x92, 0x3f}}},
+{{{0x22, 0xd6, 0xb5, 0x17, 0x84, 0xbf, 0x12, 0xcc, 0x23, 0x14, 0x4a, 0xdf, 0x14, 0x31, 0xbc, 0xa1, 0xac, 0x6e, 0xab, 0xfa, 0x57, 0x11, 0x53, 0xb3, 0x27, 0xe6, 0xf9, 0x47, 0x33, 0x44, 0x34, 0x1e}} ,
+ {{0x79, 0xfc, 0xa6, 0xb4, 0x0b, 0x35, 0x20, 0xc9, 0x4d, 0x22, 0x84, 0xc4, 0xa9, 0x20, 0xec, 0x89, 0x94, 0xba, 0x66, 0x56, 0x48, 0xb9, 0x87, 0x7f, 0xca, 0x1e, 0x06, 0xed, 0xa5, 0x55, 0x59, 0x29}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x56, 0xe1, 0xf5, 0xf1, 0xd5, 0xab, 0xa8, 0x2b, 0xae, 0x89, 0xf3, 0xcf, 0x56, 0x9f, 0xf2, 0x4b, 0x31, 0xbc, 0x18, 0xa9, 0x06, 0x5b, 0xbe, 0xb4, 0x61, 0xf8, 0xb2, 0x06, 0x9c, 0x81, 0xab, 0x4c}} ,
+ {{0x1f, 0x68, 0x76, 0x01, 0x16, 0x38, 0x2b, 0x0f, 0x77, 0x97, 0x92, 0x67, 0x4e, 0x86, 0x6a, 0x8b, 0xe5, 0xe8, 0x0c, 0xf7, 0x36, 0x39, 0xb5, 0x33, 0xe6, 0xcf, 0x5e, 0xbd, 0x18, 0xfb, 0x10, 0x1f}}},
+{{{0x83, 0xf0, 0x0d, 0x63, 0xef, 0x53, 0x6b, 0xb5, 0x6b, 0xf9, 0x83, 0xcf, 0xde, 0x04, 0x22, 0x9b, 0x2c, 0x0a, 0xe0, 0xa5, 0xd8, 0xc7, 0x9c, 0xa5, 0xa3, 0xf6, 0x6f, 0xcf, 0x90, 0x6b, 0x68, 0x7c}} ,
+ {{0x33, 0x15, 0xd7, 0x7f, 0x1a, 0xd5, 0x21, 0x58, 0xc4, 0x18, 0xa5, 0xf0, 0xcc, 0x73, 0xa8, 0xfd, 0xfa, 0x18, 0xd1, 0x03, 0x91, 0x8d, 0x52, 0xd2, 0xa3, 0xa4, 0xd3, 0xb1, 0xea, 0x1d, 0x0f, 0x00}}},
+{{{0xcc, 0x48, 0x83, 0x90, 0xe5, 0xfd, 0x3f, 0x84, 0xaa, 0xf9, 0x8b, 0x82, 0x59, 0x24, 0x34, 0x68, 0x4f, 0x1c, 0x23, 0xd9, 0xcc, 0x71, 0xe1, 0x7f, 0x8c, 0xaf, 0xf1, 0xee, 0x00, 0xb6, 0xa0, 0x77}} ,
+ {{0xf5, 0x1a, 0x61, 0xf7, 0x37, 0x9d, 0x00, 0xf4, 0xf2, 0x69, 0x6f, 0x4b, 0x01, 0x85, 0x19, 0x45, 0x4d, 0x7f, 0x02, 0x7c, 0x6a, 0x05, 0x47, 0x6c, 0x1f, 0x81, 0x20, 0xd4, 0xe8, 0x50, 0x27, 0x72}}},
+{{{0x2c, 0x3a, 0xe5, 0xad, 0xf4, 0xdd, 0x2d, 0xf7, 0x5c, 0x44, 0xb5, 0x5b, 0x21, 0xa3, 0x89, 0x5f, 0x96, 0x45, 0xca, 0x4d, 0xa4, 0x21, 0x99, 0x70, 0xda, 0xc4, 0xc4, 0xa0, 0xe5, 0xf4, 0xec, 0x0a}} ,
+ {{0x07, 0x68, 0x21, 0x65, 0xe9, 0x08, 0xa0, 0x0b, 0x6a, 0x4a, 0xba, 0xb5, 0x80, 0xaf, 0xd0, 0x1b, 0xc5, 0xf5, 0x4b, 0x73, 0x50, 0x60, 0x2d, 0x71, 0x69, 0x61, 0x0e, 0xc0, 0x20, 0x40, 0x30, 0x19}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xd0, 0x75, 0x57, 0x3b, 0xeb, 0x5c, 0x14, 0x56, 0x50, 0xc9, 0x4f, 0xb8, 0xb8, 0x1e, 0xa3, 0xf4, 0xab, 0xf5, 0xa9, 0x20, 0x15, 0x94, 0x82, 0xda, 0x96, 0x1c, 0x9b, 0x59, 0x8c, 0xff, 0xf4, 0x51}} ,
+ {{0xc1, 0x3a, 0x86, 0xd7, 0xb0, 0x06, 0x84, 0x7f, 0x1b, 0xbd, 0xd4, 0x07, 0x78, 0x80, 0x2e, 0xb1, 0xb4, 0xee, 0x52, 0x38, 0xee, 0x9a, 0xf9, 0xf6, 0xf3, 0x41, 0x6e, 0xd4, 0x88, 0x95, 0xac, 0x35}}},
+{{{0x41, 0x97, 0xbf, 0x71, 0x6a, 0x9b, 0x72, 0xec, 0xf3, 0xf8, 0x6b, 0xe6, 0x0e, 0x6c, 0x69, 0xa5, 0x2f, 0x68, 0x52, 0xd8, 0x61, 0x81, 0xc0, 0x63, 0x3f, 0xa6, 0x3c, 0x13, 0x90, 0xe6, 0x8d, 0x56}} ,
+ {{0xe8, 0x39, 0x30, 0x77, 0x23, 0xb1, 0xfd, 0x1b, 0x3d, 0x3e, 0x74, 0x4d, 0x7f, 0xae, 0x5b, 0x3a, 0xb4, 0x65, 0x0e, 0x3a, 0x43, 0xdc, 0xdc, 0x41, 0x47, 0xe6, 0xe8, 0x92, 0x09, 0x22, 0x48, 0x4c}}},
+{{{0x85, 0x57, 0x9f, 0xb5, 0xc8, 0x06, 0xb2, 0x9f, 0x47, 0x3f, 0xf0, 0xfa, 0xe6, 0xa9, 0xb1, 0x9b, 0x6f, 0x96, 0x7d, 0xf9, 0xa4, 0x65, 0x09, 0x75, 0x32, 0xa6, 0x6c, 0x7f, 0x47, 0x4b, 0x2f, 0x4f}} ,
+ {{0x34, 0xe9, 0x59, 0x93, 0x9d, 0x26, 0x80, 0x54, 0xf2, 0xcc, 0x3c, 0xc2, 0x25, 0x85, 0xe3, 0x6a, 0xc1, 0x62, 0x04, 0xa7, 0x08, 0x32, 0x6d, 0xa1, 0x39, 0x84, 0x8a, 0x3b, 0x87, 0x5f, 0x11, 0x13}}},
+{{{0xda, 0x03, 0x34, 0x66, 0xc4, 0x0c, 0x73, 0x6e, 0xbc, 0x24, 0xb5, 0xf9, 0x70, 0x81, 0x52, 0xe9, 0xf4, 0x7c, 0x23, 0xdd, 0x9f, 0xb8, 0x46, 0xef, 0x1d, 0x22, 0x55, 0x7d, 0x71, 0xc4, 0x42, 0x33}} ,
+ {{0xc5, 0x37, 0x69, 0x5b, 0xa8, 0xc6, 0x9d, 0xa4, 0xfc, 0x61, 0x6e, 0x68, 0x46, 0xea, 0xd7, 0x1c, 0x67, 0xd2, 0x7d, 0xfa, 0xf1, 0xcc, 0x54, 0x8d, 0x36, 0x35, 0xc9, 0x00, 0xdf, 0x6c, 0x67, 0x50}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x9a, 0x4d, 0x42, 0x29, 0x5d, 0xa4, 0x6b, 0x6f, 0xa8, 0x8a, 0x4d, 0x91, 0x7b, 0xd2, 0xdf, 0x36, 0xef, 0x01, 0x22, 0xc5, 0xcc, 0x8d, 0xeb, 0x58, 0x3d, 0xb3, 0x50, 0xfc, 0x8b, 0x97, 0x96, 0x33}} ,
+ {{0x93, 0x33, 0x07, 0xc8, 0x4a, 0xca, 0xd0, 0xb1, 0xab, 0xbd, 0xdd, 0xa7, 0x7c, 0xac, 0x3e, 0x45, 0xcb, 0xcc, 0x07, 0x91, 0xbf, 0x35, 0x9d, 0xcb, 0x7d, 0x12, 0x3c, 0x11, 0x59, 0x13, 0xcf, 0x5c}}},
+{{{0x45, 0xb8, 0x41, 0xd7, 0xab, 0x07, 0x15, 0x00, 0x8e, 0xce, 0xdf, 0xb2, 0x43, 0x5c, 0x01, 0xdc, 0xf4, 0x01, 0x51, 0x95, 0x10, 0x5a, 0xf6, 0x24, 0x24, 0xa0, 0x19, 0x3a, 0x09, 0x2a, 0xaa, 0x3f}} ,
+ {{0xdc, 0x8e, 0xeb, 0xc6, 0xbf, 0xdd, 0x11, 0x7b, 0xe7, 0x47, 0xe6, 0xce, 0xe7, 0xb6, 0xc5, 0xe8, 0x8a, 0xdc, 0x4b, 0x57, 0x15, 0x3b, 0x66, 0xca, 0x89, 0xa3, 0xfd, 0xac, 0x0d, 0xe1, 0x1d, 0x7a}}},
+{{{0x89, 0xef, 0xbf, 0x03, 0x75, 0xd0, 0x29, 0x50, 0xcb, 0x7d, 0xd6, 0xbe, 0xad, 0x5f, 0x7b, 0x00, 0x32, 0xaa, 0x98, 0xed, 0x3f, 0x8f, 0x92, 0xcb, 0x81, 0x56, 0x01, 0x63, 0x64, 0xa3, 0x38, 0x39}} ,
+ {{0x8b, 0xa4, 0xd6, 0x50, 0xb4, 0xaa, 0x5d, 0x64, 0x64, 0x76, 0x2e, 0xa1, 0xa6, 0xb3, 0xb8, 0x7c, 0x7a, 0x56, 0xf5, 0x5c, 0x4e, 0x84, 0x5c, 0xfb, 0xdd, 0xca, 0x48, 0x8b, 0x48, 0xb9, 0xba, 0x34}}},
+{{{0xc5, 0xe3, 0xe8, 0xae, 0x17, 0x27, 0xe3, 0x64, 0x60, 0x71, 0x47, 0x29, 0x02, 0x0f, 0x92, 0x5d, 0x10, 0x93, 0xc8, 0x0e, 0xa1, 0xed, 0xba, 0xa9, 0x96, 0x1c, 0xc5, 0x76, 0x30, 0xcd, 0xf9, 0x30}} ,
+ {{0x95, 0xb0, 0xbd, 0x8c, 0xbc, 0xa7, 0x4f, 0x7e, 0xfd, 0x4e, 0x3a, 0xbf, 0x5f, 0x04, 0x79, 0x80, 0x2b, 0x5a, 0x9f, 0x4f, 0x68, 0x21, 0x19, 0x71, 0xc6, 0x20, 0x01, 0x42, 0xaa, 0xdf, 0xae, 0x2c}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x90, 0x6e, 0x7e, 0x4b, 0x71, 0x93, 0xc0, 0x72, 0xed, 0xeb, 0x71, 0x24, 0x97, 0x26, 0x9c, 0xfe, 0xcb, 0x3e, 0x59, 0x19, 0xa8, 0x0f, 0x75, 0x7d, 0xbe, 0x18, 0xe6, 0x96, 0x1e, 0x95, 0x70, 0x60}} ,
+ {{0x89, 0x66, 0x3e, 0x1d, 0x4c, 0x5f, 0xfe, 0xc0, 0x04, 0x43, 0xd6, 0x44, 0x19, 0xb5, 0xad, 0xc7, 0x22, 0xdc, 0x71, 0x28, 0x64, 0xde, 0x41, 0x38, 0x27, 0x8f, 0x2c, 0x6b, 0x08, 0xb8, 0xb8, 0x7b}}},
+{{{0x3d, 0x70, 0x27, 0x9d, 0xd9, 0xaf, 0xb1, 0x27, 0xaf, 0xe3, 0x5d, 0x1e, 0x3a, 0x30, 0x54, 0x61, 0x60, 0xe8, 0xc3, 0x26, 0x3a, 0xbc, 0x7e, 0xf5, 0x81, 0xdd, 0x64, 0x01, 0x04, 0xeb, 0xc0, 0x1e}} ,
+ {{0xda, 0x2c, 0xa4, 0xd1, 0xa1, 0xc3, 0x5c, 0x6e, 0x32, 0x07, 0x1f, 0xb8, 0x0e, 0x19, 0x9e, 0x99, 0x29, 0x33, 0x9a, 0xae, 0x7a, 0xed, 0x68, 0x42, 0x69, 0x7c, 0x07, 0xb3, 0x38, 0x2c, 0xf6, 0x3d}}},
+{{{0x64, 0xaa, 0xb5, 0x88, 0x79, 0x65, 0x38, 0x8c, 0x94, 0xd6, 0x62, 0x37, 0x7d, 0x64, 0xcd, 0x3a, 0xeb, 0xff, 0xe8, 0x81, 0x09, 0xc7, 0x6a, 0x50, 0x09, 0x0d, 0x28, 0x03, 0x0d, 0x9a, 0x93, 0x0a}} ,
+ {{0x42, 0xa3, 0xf1, 0xc5, 0xb4, 0x0f, 0xd8, 0xc8, 0x8d, 0x15, 0x31, 0xbd, 0xf8, 0x07, 0x8b, 0xcd, 0x08, 0x8a, 0xfb, 0x18, 0x07, 0xfe, 0x8e, 0x52, 0x86, 0xef, 0xbe, 0xec, 0x49, 0x52, 0x99, 0x08}}},
+{{{0x0f, 0xa9, 0xd5, 0x01, 0xaa, 0x48, 0x4f, 0x28, 0x66, 0x32, 0x1a, 0xba, 0x7c, 0xea, 0x11, 0x80, 0x17, 0x18, 0x9b, 0x56, 0x88, 0x25, 0x06, 0x69, 0x12, 0x2c, 0xea, 0x56, 0x69, 0x41, 0x24, 0x19}} ,
+ {{0xde, 0x21, 0xf0, 0xda, 0x8a, 0xfb, 0xb1, 0xb8, 0xcd, 0xc8, 0x6a, 0x82, 0x19, 0x73, 0xdb, 0xc7, 0xcf, 0x88, 0xeb, 0x96, 0xee, 0x6f, 0xfb, 0x06, 0xd2, 0xcd, 0x7d, 0x7b, 0x12, 0x28, 0x8e, 0x0c}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x93, 0x44, 0x97, 0xce, 0x28, 0xff, 0x3a, 0x40, 0xc4, 0xf5, 0xf6, 0x9b, 0xf4, 0x6b, 0x07, 0x84, 0xfb, 0x98, 0xd8, 0xec, 0x8c, 0x03, 0x57, 0xec, 0x49, 0xed, 0x63, 0xb6, 0xaa, 0xff, 0x98, 0x28}} ,
+ {{0x3d, 0x16, 0x35, 0xf3, 0x46, 0xbc, 0xb3, 0xf4, 0xc6, 0xb6, 0x4f, 0xfa, 0xf4, 0xa0, 0x13, 0xe6, 0x57, 0x45, 0x93, 0xb9, 0xbc, 0xd6, 0x59, 0xe7, 0x77, 0x94, 0x6c, 0xab, 0x96, 0x3b, 0x4f, 0x09}}},
+{{{0x5a, 0xf7, 0x6b, 0x01, 0x12, 0x4f, 0x51, 0xc1, 0x70, 0x84, 0x94, 0x47, 0xb2, 0x01, 0x6c, 0x71, 0xd7, 0xcc, 0x17, 0x66, 0x0f, 0x59, 0x5d, 0x5d, 0x10, 0x01, 0x57, 0x11, 0xf5, 0xdd, 0xe2, 0x34}} ,
+ {{0x26, 0xd9, 0x1f, 0x5c, 0x58, 0xac, 0x8b, 0x03, 0xd2, 0xc3, 0x85, 0x0f, 0x3a, 0xc3, 0x7f, 0x6d, 0x8e, 0x86, 0xcd, 0x52, 0x74, 0x8f, 0x55, 0x77, 0x17, 0xb7, 0x8e, 0xb7, 0x88, 0xea, 0xda, 0x1b}}},
+{{{0xb6, 0xea, 0x0e, 0x40, 0x93, 0x20, 0x79, 0x35, 0x6a, 0x61, 0x84, 0x5a, 0x07, 0x6d, 0xf9, 0x77, 0x6f, 0xed, 0x69, 0x1c, 0x0d, 0x25, 0x76, 0xcc, 0xf0, 0xdb, 0xbb, 0xc5, 0xad, 0xe2, 0x26, 0x57}} ,
+ {{0xcf, 0xe8, 0x0e, 0x6b, 0x96, 0x7d, 0xed, 0x27, 0xd1, 0x3c, 0xa9, 0xd9, 0x50, 0xa9, 0x98, 0x84, 0x5e, 0x86, 0xef, 0xd6, 0xf0, 0xf8, 0x0e, 0x89, 0x05, 0x2f, 0xd9, 0x5f, 0x15, 0x5f, 0x73, 0x79}}},
+{{{0xc8, 0x5c, 0x16, 0xfe, 0xed, 0x9f, 0x26, 0x56, 0xf6, 0x4b, 0x9f, 0xa7, 0x0a, 0x85, 0xfe, 0xa5, 0x8c, 0x87, 0xdd, 0x98, 0xce, 0x4e, 0xc3, 0x58, 0x55, 0xb2, 0x7b, 0x3d, 0xd8, 0x6b, 0xb5, 0x4c}} ,
+ {{0x65, 0x38, 0xa0, 0x15, 0xfa, 0xa7, 0xb4, 0x8f, 0xeb, 0xc4, 0x86, 0x9b, 0x30, 0xa5, 0x5e, 0x4d, 0xea, 0x8a, 0x9a, 0x9f, 0x1a, 0xd8, 0x5b, 0x53, 0x14, 0x19, 0x25, 0x63, 0xb4, 0x6f, 0x1f, 0x5d}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xac, 0x8f, 0xbc, 0x1e, 0x7d, 0x8b, 0x5a, 0x0b, 0x8d, 0xaf, 0x76, 0x2e, 0x71, 0xe3, 0x3b, 0x6f, 0x53, 0x2f, 0x3e, 0x90, 0x95, 0xd4, 0x35, 0x14, 0x4f, 0x8c, 0x3c, 0xce, 0x57, 0x1c, 0x76, 0x49}} ,
+ {{0xa8, 0x50, 0xe1, 0x61, 0x6b, 0x57, 0x35, 0xeb, 0x44, 0x0b, 0x0c, 0x6e, 0xf9, 0x25, 0x80, 0x74, 0xf2, 0x8f, 0x6f, 0x7a, 0x3e, 0x7f, 0x2d, 0xf3, 0x4e, 0x09, 0x65, 0x10, 0x5e, 0x03, 0x25, 0x32}}},
+{{{0xa9, 0x60, 0xdc, 0x0f, 0x64, 0xe5, 0x1d, 0xe2, 0x8d, 0x4f, 0x79, 0x2f, 0x0e, 0x24, 0x02, 0x00, 0x05, 0x77, 0x43, 0x25, 0x3d, 0x6a, 0xc7, 0xb7, 0xbf, 0x04, 0x08, 0x65, 0xf4, 0x39, 0x4b, 0x65}} ,
+ {{0x96, 0x19, 0x12, 0x6b, 0x6a, 0xb7, 0xe3, 0xdc, 0x45, 0x9b, 0xdb, 0xb4, 0xa8, 0xae, 0xdc, 0xa8, 0x14, 0x44, 0x65, 0x62, 0xce, 0x34, 0x9a, 0x84, 0x18, 0x12, 0x01, 0xf1, 0xe2, 0x7b, 0xce, 0x50}}},
+{{{0x41, 0x21, 0x30, 0x53, 0x1b, 0x47, 0x01, 0xb7, 0x18, 0xd8, 0x82, 0x57, 0xbd, 0xa3, 0x60, 0xf0, 0x32, 0xf6, 0x5b, 0xf0, 0x30, 0x88, 0x91, 0x59, 0xfd, 0x90, 0xa2, 0xb9, 0x55, 0x93, 0x21, 0x34}} ,
+ {{0x97, 0x67, 0x9e, 0xeb, 0x6a, 0xf9, 0x6e, 0xd6, 0x73, 0xe8, 0x6b, 0x29, 0xec, 0x63, 0x82, 0x00, 0xa8, 0x99, 0x1c, 0x1d, 0x30, 0xc8, 0x90, 0x52, 0x90, 0xb6, 0x6a, 0x80, 0x4e, 0xff, 0x4b, 0x51}}},
+{{{0x0f, 0x7d, 0x63, 0x8c, 0x6e, 0x5c, 0xde, 0x30, 0xdf, 0x65, 0xfa, 0x2e, 0xb0, 0xa3, 0x25, 0x05, 0x54, 0xbd, 0x25, 0xba, 0x06, 0xae, 0xdf, 0x8b, 0xd9, 0x1b, 0xea, 0x38, 0xb3, 0x05, 0x16, 0x09}} ,
+ {{0xc7, 0x8c, 0xbf, 0x64, 0x28, 0xad, 0xf8, 0xa5, 0x5a, 0x6f, 0xc9, 0xba, 0xd5, 0x7f, 0xd5, 0xd6, 0xbd, 0x66, 0x2f, 0x3d, 0xaa, 0x54, 0xf6, 0xba, 0x32, 0x22, 0x9a, 0x1e, 0x52, 0x05, 0xf4, 0x1d}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xaa, 0x1f, 0xbb, 0xeb, 0xfe, 0xe4, 0x87, 0xfc, 0xb1, 0x2c, 0xb7, 0x88, 0xf4, 0xc6, 0xb9, 0xf5, 0x24, 0x46, 0xf2, 0xa5, 0x9f, 0x8f, 0x8a, 0x93, 0x70, 0x69, 0xd4, 0x56, 0xec, 0xfd, 0x06, 0x46}} ,
+ {{0x4e, 0x66, 0xcf, 0x4e, 0x34, 0xce, 0x0c, 0xd9, 0xa6, 0x50, 0xd6, 0x5e, 0x95, 0xaf, 0xe9, 0x58, 0xfa, 0xee, 0x9b, 0xb8, 0xa5, 0x0f, 0x35, 0xe0, 0x43, 0x82, 0x6d, 0x65, 0xe6, 0xd9, 0x00, 0x0f}}},
+{{{0x7b, 0x75, 0x3a, 0xfc, 0x64, 0xd3, 0x29, 0x7e, 0xdd, 0x49, 0x9a, 0x59, 0x53, 0xbf, 0xb4, 0xa7, 0x52, 0xb3, 0x05, 0xab, 0xc3, 0xaf, 0x16, 0x1a, 0x85, 0x42, 0x32, 0xa2, 0x86, 0xfa, 0x39, 0x43}} ,
+ {{0x0e, 0x4b, 0xa3, 0x63, 0x8a, 0xfe, 0xa5, 0x58, 0xf1, 0x13, 0xbd, 0x9d, 0xaa, 0x7f, 0x76, 0x40, 0x70, 0x81, 0x10, 0x75, 0x99, 0xbb, 0xbe, 0x0b, 0x16, 0xe9, 0xba, 0x62, 0x34, 0xcc, 0x07, 0x6d}}},
+{{{0xc3, 0xf1, 0xc6, 0x93, 0x65, 0xee, 0x0b, 0xbc, 0xea, 0x14, 0xf0, 0xc1, 0xf8, 0x84, 0x89, 0xc2, 0xc9, 0xd7, 0xea, 0x34, 0xca, 0xa7, 0xc4, 0x99, 0xd5, 0x50, 0x69, 0xcb, 0xd6, 0x21, 0x63, 0x7c}} ,
+ {{0x99, 0xeb, 0x7c, 0x31, 0x73, 0x64, 0x67, 0x7f, 0x0c, 0x66, 0xaa, 0x8c, 0x69, 0x91, 0xe2, 0x26, 0xd3, 0x23, 0xe2, 0x76, 0x5d, 0x32, 0x52, 0xdf, 0x5d, 0xc5, 0x8f, 0xb7, 0x7c, 0x84, 0xb3, 0x70}}},
+{{{0xeb, 0x01, 0xc7, 0x36, 0x97, 0x4e, 0xb6, 0xab, 0x5f, 0x0d, 0x2c, 0xba, 0x67, 0x64, 0x55, 0xde, 0xbc, 0xff, 0xa6, 0xec, 0x04, 0xd3, 0x8d, 0x39, 0x56, 0x5e, 0xee, 0xf8, 0xe4, 0x2e, 0x33, 0x62}} ,
+ {{0x65, 0xef, 0xb8, 0x9f, 0xc8, 0x4b, 0xa7, 0xfd, 0x21, 0x49, 0x9b, 0x92, 0x35, 0x82, 0xd6, 0x0a, 0x9b, 0xf2, 0x79, 0xf1, 0x47, 0x2f, 0x6a, 0x7e, 0x9f, 0xcf, 0x18, 0x02, 0x3c, 0xfb, 0x1b, 0x3e}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x2f, 0x8b, 0xc8, 0x40, 0x51, 0xd1, 0xac, 0x1a, 0x0b, 0xe4, 0xa9, 0xa2, 0x42, 0x21, 0x19, 0x2f, 0x7b, 0x97, 0xbf, 0xf7, 0x57, 0x6d, 0x3f, 0x3d, 0x4f, 0x0f, 0xe2, 0xb2, 0x81, 0x00, 0x9e, 0x7b}} ,
+ {{0x8c, 0x85, 0x2b, 0xc4, 0xfc, 0xf1, 0xab, 0xe8, 0x79, 0x22, 0xc4, 0x84, 0x17, 0x3a, 0xfa, 0x86, 0xa6, 0x7d, 0xf9, 0xf3, 0x6f, 0x03, 0x57, 0x20, 0x4d, 0x79, 0xf9, 0x6e, 0x71, 0x54, 0x38, 0x09}}},
+{{{0x40, 0x29, 0x74, 0xa8, 0x2f, 0x5e, 0xf9, 0x79, 0xa4, 0xf3, 0x3e, 0xb9, 0xfd, 0x33, 0x31, 0xac, 0x9a, 0x69, 0x88, 0x1e, 0x77, 0x21, 0x2d, 0xf3, 0x91, 0x52, 0x26, 0x15, 0xb2, 0xa6, 0xcf, 0x7e}} ,
+ {{0xc6, 0x20, 0x47, 0x6c, 0xa4, 0x7d, 0xcb, 0x63, 0xea, 0x5b, 0x03, 0xdf, 0x3e, 0x88, 0x81, 0x6d, 0xce, 0x07, 0x42, 0x18, 0x60, 0x7e, 0x7b, 0x55, 0xfe, 0x6a, 0xf3, 0xda, 0x5c, 0x8b, 0x95, 0x10}}},
+{{{0x62, 0xe4, 0x0d, 0x03, 0xb4, 0xd7, 0xcd, 0xfa, 0xbd, 0x46, 0xdf, 0x93, 0x71, 0x10, 0x2c, 0xa8, 0x3b, 0xb6, 0x09, 0x05, 0x70, 0x84, 0x43, 0x29, 0xa8, 0x59, 0xf5, 0x8e, 0x10, 0xe4, 0xd7, 0x20}} ,
+ {{0x57, 0x82, 0x1c, 0xab, 0xbf, 0x62, 0x70, 0xe8, 0xc4, 0xcf, 0xf0, 0x28, 0x6e, 0x16, 0x3c, 0x08, 0x78, 0x89, 0x85, 0x46, 0x0f, 0xf6, 0x7f, 0xcf, 0xcb, 0x7e, 0xb8, 0x25, 0xe9, 0x5a, 0xfa, 0x03}}},
+{{{0xfb, 0x95, 0x92, 0x63, 0x50, 0xfc, 0x62, 0xf0, 0xa4, 0x5e, 0x8c, 0x18, 0xc2, 0x17, 0x24, 0xb7, 0x78, 0xc2, 0xa9, 0xe7, 0x6a, 0x32, 0xd6, 0x29, 0x85, 0xaf, 0xcb, 0x8d, 0x91, 0x13, 0xda, 0x6b}} ,
+ {{0x36, 0x0a, 0xc2, 0xb6, 0x4b, 0xa5, 0x5d, 0x07, 0x17, 0x41, 0x31, 0x5f, 0x62, 0x46, 0xf8, 0x92, 0xf9, 0x66, 0x48, 0x73, 0xa6, 0x97, 0x0d, 0x7d, 0x88, 0xee, 0x62, 0xb1, 0x03, 0xa8, 0x3f, 0x2c}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x4a, 0xb1, 0x70, 0x8a, 0xa9, 0xe8, 0x63, 0x79, 0x00, 0xe2, 0x25, 0x16, 0xca, 0x4b, 0x0f, 0xa4, 0x66, 0xad, 0x19, 0x9f, 0x88, 0x67, 0x0c, 0x8b, 0xc2, 0x4a, 0x5b, 0x2b, 0x6d, 0x95, 0xaf, 0x19}} ,
+ {{0x8b, 0x9d, 0xb6, 0xcc, 0x60, 0xb4, 0x72, 0x4f, 0x17, 0x69, 0x5a, 0x4a, 0x68, 0x34, 0xab, 0xa1, 0x45, 0x32, 0x3c, 0x83, 0x87, 0x72, 0x30, 0x54, 0x77, 0x68, 0xae, 0xfb, 0xb5, 0x8b, 0x22, 0x5e}}},
+{{{0xf1, 0xb9, 0x87, 0x35, 0xc5, 0xbb, 0xb9, 0xcf, 0xf5, 0xd6, 0xcd, 0xd5, 0x0c, 0x7c, 0x0e, 0xe6, 0x90, 0x34, 0xfb, 0x51, 0x42, 0x1e, 0x6d, 0xac, 0x9a, 0x46, 0xc4, 0x97, 0x29, 0x32, 0xbf, 0x45}} ,
+ {{0x66, 0x9e, 0xc6, 0x24, 0xc0, 0xed, 0xa5, 0x5d, 0x88, 0xd4, 0xf0, 0x73, 0x97, 0x7b, 0xea, 0x7f, 0x42, 0xff, 0x21, 0xa0, 0x9b, 0x2f, 0x9a, 0xfd, 0x53, 0x57, 0x07, 0x84, 0x48, 0x88, 0x9d, 0x52}}},
+{{{0xc6, 0x96, 0x48, 0x34, 0x2a, 0x06, 0xaf, 0x94, 0x3d, 0xf4, 0x1a, 0xcf, 0xf2, 0xc0, 0x21, 0xc2, 0x42, 0x5e, 0xc8, 0x2f, 0x35, 0xa2, 0x3e, 0x29, 0xfa, 0x0c, 0x84, 0xe5, 0x89, 0x72, 0x7c, 0x06}} ,
+ {{0x32, 0x65, 0x03, 0xe5, 0x89, 0xa6, 0x6e, 0xb3, 0x5b, 0x8e, 0xca, 0xeb, 0xfe, 0x22, 0x56, 0x8b, 0x5d, 0x14, 0x4b, 0x4d, 0xf9, 0xbe, 0xb5, 0xf5, 0xe6, 0x5c, 0x7b, 0x8b, 0xf4, 0x13, 0x11, 0x34}}},
+{{{0x07, 0xc6, 0x22, 0x15, 0xe2, 0x9c, 0x60, 0xa2, 0x19, 0xd9, 0x27, 0xae, 0x37, 0x4e, 0xa6, 0xc9, 0x80, 0xa6, 0x91, 0x8f, 0x12, 0x49, 0xe5, 0x00, 0x18, 0x47, 0xd1, 0xd7, 0x28, 0x22, 0x63, 0x39}} ,
+ {{0xe8, 0xe2, 0x00, 0x7e, 0xf2, 0x9e, 0x1e, 0x99, 0x39, 0x95, 0x04, 0xbd, 0x1e, 0x67, 0x7b, 0xb2, 0x26, 0xac, 0xe6, 0xaa, 0xe2, 0x46, 0xd5, 0xe4, 0xe8, 0x86, 0xbd, 0xab, 0x7c, 0x55, 0x59, 0x6f}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x24, 0x64, 0x6e, 0x9b, 0x35, 0x71, 0x78, 0xce, 0x33, 0x03, 0x21, 0x33, 0x36, 0xf1, 0x73, 0x9b, 0xb9, 0x15, 0x8b, 0x2c, 0x69, 0xcf, 0x4d, 0xed, 0x4f, 0x4d, 0x57, 0x14, 0x13, 0x82, 0xa4, 0x4d}} ,
+ {{0x65, 0x6e, 0x0a, 0xa4, 0x59, 0x07, 0x17, 0xf2, 0x6b, 0x4a, 0x1f, 0x6e, 0xf6, 0xb5, 0xbc, 0x62, 0xe4, 0xb6, 0xda, 0xa2, 0x93, 0xbc, 0x29, 0x05, 0xd2, 0xd2, 0x73, 0x46, 0x03, 0x16, 0x40, 0x31}}},
+{{{0x4c, 0x73, 0x6d, 0x15, 0xbd, 0xa1, 0x4d, 0x5c, 0x13, 0x0b, 0x24, 0x06, 0x98, 0x78, 0x1c, 0x5b, 0xeb, 0x1f, 0x18, 0x54, 0x43, 0xd9, 0x55, 0x66, 0xda, 0x29, 0x21, 0xe8, 0xb8, 0x3c, 0x42, 0x22}} ,
+ {{0xb4, 0xcd, 0x08, 0x6f, 0x15, 0x23, 0x1a, 0x0b, 0x22, 0xed, 0xd1, 0xf1, 0xa7, 0xc7, 0x73, 0x45, 0xf3, 0x9e, 0xce, 0x76, 0xb7, 0xf6, 0x39, 0xb6, 0x8e, 0x79, 0xbe, 0xe9, 0x9b, 0xcf, 0x7d, 0x62}}},
+{{{0x92, 0x5b, 0xfc, 0x72, 0xfd, 0xba, 0xf1, 0xfd, 0xa6, 0x7c, 0x95, 0xe3, 0x61, 0x3f, 0xe9, 0x03, 0xd4, 0x2b, 0xd4, 0x20, 0xd9, 0xdb, 0x4d, 0x32, 0x3e, 0xf5, 0x11, 0x64, 0xe3, 0xb4, 0xbe, 0x32}} ,
+ {{0x86, 0x17, 0x90, 0xe7, 0xc9, 0x1f, 0x10, 0xa5, 0x6a, 0x2d, 0x39, 0xd0, 0x3b, 0xc4, 0xa6, 0xe9, 0x59, 0x13, 0xda, 0x1a, 0xe6, 0xa0, 0xb9, 0x3c, 0x50, 0xb8, 0x40, 0x7c, 0x15, 0x36, 0x5a, 0x42}}},
+{{{0xb4, 0x0b, 0x32, 0xab, 0xdc, 0x04, 0x51, 0x55, 0x21, 0x1e, 0x0b, 0x75, 0x99, 0x89, 0x73, 0x35, 0x3a, 0x91, 0x2b, 0xfe, 0xe7, 0x49, 0xea, 0x76, 0xc1, 0xf9, 0x46, 0xb9, 0x53, 0x02, 0x23, 0x04}} ,
+ {{0xfc, 0x5a, 0x1e, 0x1d, 0x74, 0x58, 0x95, 0xa6, 0x8f, 0x7b, 0x97, 0x3e, 0x17, 0x3b, 0x79, 0x2d, 0xa6, 0x57, 0xef, 0x45, 0x02, 0x0b, 0x4d, 0x6e, 0x9e, 0x93, 0x8d, 0x2f, 0xd9, 0x9d, 0xdb, 0x04}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xc0, 0xd7, 0x56, 0x97, 0x58, 0x91, 0xde, 0x09, 0x4f, 0x9f, 0xbe, 0x63, 0xb0, 0x83, 0x86, 0x43, 0x5d, 0xbc, 0xe0, 0xf3, 0xc0, 0x75, 0xbf, 0x8b, 0x8e, 0xaa, 0xf7, 0x8b, 0x64, 0x6e, 0xb0, 0x63}} ,
+ {{0x16, 0xae, 0x8b, 0xe0, 0x9b, 0x24, 0x68, 0x5c, 0x44, 0xc2, 0xd0, 0x08, 0xb7, 0x7b, 0x62, 0xfd, 0x7f, 0xd8, 0xd4, 0xb7, 0x50, 0xfd, 0x2c, 0x1b, 0xbf, 0x41, 0x95, 0xd9, 0x8e, 0xd8, 0x17, 0x1b}}},
+{{{0x86, 0x55, 0x37, 0x8e, 0xc3, 0x38, 0x48, 0x14, 0xb5, 0x97, 0xd2, 0xa7, 0x54, 0x45, 0xf1, 0x35, 0x44, 0x38, 0x9e, 0xf1, 0x1b, 0xb6, 0x34, 0x00, 0x3c, 0x96, 0xee, 0x29, 0x00, 0xea, 0x2c, 0x0b}} ,
+ {{0xea, 0xda, 0x99, 0x9e, 0x19, 0x83, 0x66, 0x6d, 0xe9, 0x76, 0x87, 0x50, 0xd1, 0xfd, 0x3c, 0x60, 0x87, 0xc6, 0x41, 0xd9, 0x8e, 0xdb, 0x5e, 0xde, 0xaa, 0x9a, 0xd3, 0x28, 0xda, 0x95, 0xea, 0x47}}},
+{{{0xd0, 0x80, 0xba, 0x19, 0xae, 0x1d, 0xa9, 0x79, 0xf6, 0x3f, 0xac, 0x5d, 0x6f, 0x96, 0x1f, 0x2a, 0xce, 0x29, 0xb2, 0xff, 0x37, 0xf1, 0x94, 0x8f, 0x0c, 0xb5, 0x28, 0xba, 0x9a, 0x21, 0xf6, 0x66}} ,
+ {{0x02, 0xfb, 0x54, 0xb8, 0x05, 0xf3, 0x81, 0x52, 0x69, 0x34, 0x46, 0x9d, 0x86, 0x76, 0x8f, 0xd7, 0xf8, 0x6a, 0x66, 0xff, 0xe6, 0xa7, 0x90, 0xf7, 0x5e, 0xcd, 0x6a, 0x9b, 0x55, 0xfc, 0x9d, 0x48}}},
+{{{0xbd, 0xaa, 0x13, 0xe6, 0xcd, 0x45, 0x4a, 0xa4, 0x59, 0x0a, 0x64, 0xb1, 0x98, 0xd6, 0x34, 0x13, 0x04, 0xe6, 0x97, 0x94, 0x06, 0xcb, 0xd4, 0x4e, 0xbb, 0x96, 0xcd, 0xd1, 0x57, 0xd1, 0xe3, 0x06}} ,
+ {{0x7a, 0x6c, 0x45, 0x27, 0xc4, 0x93, 0x7f, 0x7d, 0x7c, 0x62, 0x50, 0x38, 0x3a, 0x6b, 0xb5, 0x88, 0xc6, 0xd9, 0xf1, 0x78, 0x19, 0xb9, 0x39, 0x93, 0x3d, 0xc9, 0xe0, 0x9c, 0x3c, 0xce, 0xf5, 0x72}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x24, 0xea, 0x23, 0x7d, 0x56, 0x2c, 0xe2, 0x59, 0x0e, 0x85, 0x60, 0x04, 0x88, 0x5a, 0x74, 0x1e, 0x4b, 0xef, 0x13, 0xda, 0x4c, 0xff, 0x83, 0x45, 0x85, 0x3f, 0x08, 0x95, 0x2c, 0x20, 0x13, 0x1f}} ,
+ {{0x48, 0x5f, 0x27, 0x90, 0x5c, 0x02, 0x42, 0xad, 0x78, 0x47, 0x5c, 0xb5, 0x7e, 0x08, 0x85, 0x00, 0xfa, 0x7f, 0xfd, 0xfd, 0xe7, 0x09, 0x11, 0xf2, 0x7e, 0x1b, 0x38, 0x6c, 0x35, 0x6d, 0x33, 0x66}}},
+{{{0x93, 0x03, 0x36, 0x81, 0xac, 0xe4, 0x20, 0x09, 0x35, 0x4c, 0x45, 0xb2, 0x1e, 0x4c, 0x14, 0x21, 0xe6, 0xe9, 0x8a, 0x7b, 0x8d, 0xfe, 0x1e, 0xc6, 0x3e, 0xc1, 0x35, 0xfa, 0xe7, 0x70, 0x4e, 0x1d}} ,
+ {{0x61, 0x2e, 0xc2, 0xdd, 0x95, 0x57, 0xd1, 0xab, 0x80, 0xe8, 0x63, 0x17, 0xb5, 0x48, 0xe4, 0x8a, 0x11, 0x9e, 0x72, 0xbe, 0x85, 0x8d, 0x51, 0x0a, 0xf2, 0x9f, 0xe0, 0x1c, 0xa9, 0x07, 0x28, 0x7b}}},
+{{{0xbb, 0x71, 0x14, 0x5e, 0x26, 0x8c, 0x3d, 0xc8, 0xe9, 0x7c, 0xd3, 0xd6, 0xd1, 0x2f, 0x07, 0x6d, 0xe6, 0xdf, 0xfb, 0x79, 0xd6, 0x99, 0x59, 0x96, 0x48, 0x40, 0x0f, 0x3a, 0x7b, 0xb2, 0xa0, 0x72}} ,
+ {{0x4e, 0x3b, 0x69, 0xc8, 0x43, 0x75, 0x51, 0x6c, 0x79, 0x56, 0xe4, 0xcb, 0xf7, 0xa6, 0x51, 0xc2, 0x2c, 0x42, 0x0b, 0xd4, 0x82, 0x20, 0x1c, 0x01, 0x08, 0x66, 0xd7, 0xbf, 0x04, 0x56, 0xfc, 0x02}}},
+{{{0x24, 0xe8, 0xb7, 0x60, 0xae, 0x47, 0x80, 0xfc, 0xe5, 0x23, 0xe7, 0xc2, 0xc9, 0x85, 0xe6, 0x98, 0xa0, 0x29, 0x4e, 0xe1, 0x84, 0x39, 0x2d, 0x95, 0x2c, 0xf3, 0x45, 0x3c, 0xff, 0xaf, 0x27, 0x4c}} ,
+ {{0x6b, 0xa6, 0xf5, 0x4b, 0x11, 0xbd, 0xba, 0x5b, 0x9e, 0xc4, 0xa4, 0x51, 0x1e, 0xbe, 0xd0, 0x90, 0x3a, 0x9c, 0xc2, 0x26, 0xb6, 0x1e, 0xf1, 0x95, 0x7d, 0xc8, 0x6d, 0x52, 0xe6, 0x99, 0x2c, 0x5f}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x85, 0xe0, 0x24, 0x32, 0xb4, 0xd1, 0xef, 0xfc, 0x69, 0xa2, 0xbf, 0x8f, 0x72, 0x2c, 0x95, 0xf6, 0xe4, 0x6e, 0x7d, 0x90, 0xf7, 0x57, 0x81, 0xa0, 0xf7, 0xda, 0xef, 0x33, 0x07, 0xe3, 0x6b, 0x78}} ,
+ {{0x36, 0x27, 0x3e, 0xc6, 0x12, 0x07, 0xab, 0x4e, 0xbe, 0x69, 0x9d, 0xb3, 0xbe, 0x08, 0x7c, 0x2a, 0x47, 0x08, 0xfd, 0xd4, 0xcd, 0x0e, 0x27, 0x34, 0x5b, 0x98, 0x34, 0x2f, 0x77, 0x5f, 0x3a, 0x65}}},
+{{{0x13, 0xaa, 0x2e, 0x4c, 0xf0, 0x22, 0xb8, 0x6c, 0xb3, 0x19, 0x4d, 0xeb, 0x6b, 0xd0, 0xa4, 0xc6, 0x9c, 0xdd, 0xc8, 0x5b, 0x81, 0x57, 0x89, 0xdf, 0x33, 0xa9, 0x68, 0x49, 0x80, 0xe4, 0xfe, 0x21}} ,
+ {{0x00, 0x17, 0x90, 0x30, 0xe9, 0xd3, 0x60, 0x30, 0x31, 0xc2, 0x72, 0x89, 0x7a, 0x36, 0xa5, 0xbd, 0x39, 0x83, 0x85, 0x50, 0xa1, 0x5d, 0x6c, 0x41, 0x1d, 0xb5, 0x2c, 0x07, 0x40, 0x77, 0x0b, 0x50}}},
+{{{0x64, 0x34, 0xec, 0xc0, 0x9e, 0x44, 0x41, 0xaf, 0xa0, 0x36, 0x05, 0x6d, 0xea, 0x30, 0x25, 0x46, 0x35, 0x24, 0x9d, 0x86, 0xbd, 0x95, 0xf1, 0x6a, 0x46, 0xd7, 0x94, 0x54, 0xf9, 0x3b, 0xbd, 0x5d}} ,
+ {{0x77, 0x5b, 0xe2, 0x37, 0xc7, 0xe1, 0x7c, 0x13, 0x8c, 0x9f, 0x7b, 0x7b, 0x2a, 0xce, 0x42, 0xa3, 0xb9, 0x2a, 0x99, 0xa8, 0xc0, 0xd8, 0x3c, 0x86, 0xb0, 0xfb, 0xe9, 0x76, 0x77, 0xf7, 0xf5, 0x56}}},
+{{{0xdf, 0xb3, 0x46, 0x11, 0x6e, 0x13, 0xb7, 0x28, 0x4e, 0x56, 0xdd, 0xf1, 0xac, 0xad, 0x58, 0xc3, 0xf8, 0x88, 0x94, 0x5e, 0x06, 0x98, 0xa1, 0xe4, 0x6a, 0xfb, 0x0a, 0x49, 0x5d, 0x8a, 0xfe, 0x77}} ,
+ {{0x46, 0x02, 0xf5, 0xa5, 0xaf, 0xc5, 0x75, 0x6d, 0xba, 0x45, 0x35, 0x0a, 0xfe, 0xc9, 0xac, 0x22, 0x91, 0x8d, 0x21, 0x95, 0x33, 0x03, 0xc0, 0x8a, 0x16, 0xf3, 0x39, 0xe0, 0x01, 0x0f, 0x53, 0x3c}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x34, 0x75, 0x37, 0x1f, 0x34, 0x4e, 0xa9, 0x1d, 0x68, 0x67, 0xf8, 0x49, 0x98, 0x96, 0xfc, 0x4c, 0x65, 0x97, 0xf7, 0x02, 0x4a, 0x52, 0x6c, 0x01, 0xbd, 0x48, 0xbb, 0x1b, 0xed, 0xa4, 0xe2, 0x53}} ,
+ {{0x59, 0xd5, 0x9b, 0x5a, 0xa2, 0x90, 0xd3, 0xb8, 0x37, 0x4c, 0x55, 0x82, 0x28, 0x08, 0x0f, 0x7f, 0xaa, 0x81, 0x65, 0xe0, 0x0c, 0x52, 0xc9, 0xa3, 0x32, 0x27, 0x64, 0xda, 0xfd, 0x34, 0x23, 0x5a}}},
+{{{0xb5, 0xb0, 0x0c, 0x4d, 0xb3, 0x7b, 0x23, 0xc8, 0x1f, 0x8a, 0x39, 0x66, 0xe6, 0xba, 0x4c, 0x10, 0x37, 0xca, 0x9c, 0x7c, 0x05, 0x9e, 0xff, 0xc0, 0xf8, 0x8e, 0xb1, 0x8f, 0x6f, 0x67, 0x18, 0x26}} ,
+ {{0x4b, 0x41, 0x13, 0x54, 0x23, 0x1a, 0xa4, 0x4e, 0xa9, 0x8b, 0x1e, 0x4b, 0xfc, 0x15, 0x24, 0xbb, 0x7e, 0xcb, 0xb6, 0x1e, 0x1b, 0xf5, 0xf2, 0xc8, 0x56, 0xec, 0x32, 0xa2, 0x60, 0x5b, 0xa0, 0x2a}}},
+{{{0xa4, 0x29, 0x47, 0x86, 0x2e, 0x92, 0x4f, 0x11, 0x4f, 0xf3, 0xb2, 0x5c, 0xd5, 0x3e, 0xa6, 0xb9, 0xc8, 0xe2, 0x33, 0x11, 0x1f, 0x01, 0x8f, 0xb0, 0x9b, 0xc7, 0xa5, 0xff, 0x83, 0x0f, 0x1e, 0x28}} ,
+ {{0x1d, 0x29, 0x7a, 0xa1, 0xec, 0x8e, 0xb5, 0xad, 0xea, 0x02, 0x68, 0x60, 0x74, 0x29, 0x1c, 0xa5, 0xcf, 0xc8, 0x3b, 0x7d, 0x8b, 0x2b, 0x7c, 0xad, 0xa4, 0x40, 0x17, 0x51, 0x59, 0x7c, 0x2e, 0x5d}}},
+{{{0x0a, 0x6c, 0x4f, 0xbc, 0x3e, 0x32, 0xe7, 0x4a, 0x1a, 0x13, 0xc1, 0x49, 0x38, 0xbf, 0xf7, 0xc2, 0xd3, 0x8f, 0x6b, 0xad, 0x52, 0xf7, 0xcf, 0xbc, 0x27, 0xcb, 0x40, 0x67, 0x76, 0xcd, 0x6d, 0x56}} ,
+ {{0xe5, 0xb0, 0x27, 0xad, 0xbe, 0x9b, 0xf2, 0xb5, 0x63, 0xde, 0x3a, 0x23, 0x95, 0xb7, 0x0a, 0x7e, 0xf3, 0x9e, 0x45, 0x6f, 0x19, 0x39, 0x75, 0x8f, 0x39, 0x3d, 0x0f, 0xc0, 0x9f, 0xf1, 0xe9, 0x51}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x88, 0xaa, 0x14, 0x24, 0x86, 0x94, 0x11, 0x12, 0x3e, 0x1a, 0xb5, 0xcc, 0xbb, 0xe0, 0x9c, 0xd5, 0x9c, 0x6d, 0xba, 0x58, 0x72, 0x8d, 0xfb, 0x22, 0x7b, 0x9f, 0x7c, 0x94, 0x30, 0xb3, 0x51, 0x21}} ,
+ {{0xf6, 0x74, 0x3d, 0xf2, 0xaf, 0xd0, 0x1e, 0x03, 0x7c, 0x23, 0x6b, 0xc9, 0xfc, 0x25, 0x70, 0x90, 0xdc, 0x9a, 0xa4, 0xfb, 0x49, 0xfc, 0x3d, 0x0a, 0x35, 0x38, 0x6f, 0xe4, 0x7e, 0x50, 0x01, 0x2a}}},
+{{{0xd6, 0xe3, 0x96, 0x61, 0x3a, 0xfd, 0xef, 0x9b, 0x1f, 0x90, 0xa4, 0x24, 0x14, 0x5b, 0xc8, 0xde, 0x50, 0xb1, 0x1d, 0xaf, 0xe8, 0x55, 0x8a, 0x87, 0x0d, 0xfe, 0xaa, 0x3b, 0x82, 0x2c, 0x8d, 0x7b}} ,
+ {{0x85, 0x0c, 0xaf, 0xf8, 0x83, 0x44, 0x49, 0xd9, 0x45, 0xcf, 0xf7, 0x48, 0xd9, 0x53, 0xb4, 0xf1, 0x65, 0xa0, 0xe1, 0xc3, 0xb3, 0x15, 0xed, 0x89, 0x9b, 0x4f, 0x62, 0xb3, 0x57, 0xa5, 0x45, 0x1c}}},
+{{{0x8f, 0x12, 0xea, 0xaf, 0xd1, 0x1f, 0x79, 0x10, 0x0b, 0xf6, 0xa3, 0x7b, 0xea, 0xac, 0x8b, 0x57, 0x32, 0x62, 0xe7, 0x06, 0x12, 0x51, 0xa0, 0x3b, 0x43, 0x5e, 0xa4, 0x20, 0x78, 0x31, 0xce, 0x0d}} ,
+ {{0x84, 0x7c, 0xc2, 0xa6, 0x91, 0x23, 0xce, 0xbd, 0xdc, 0xf9, 0xce, 0xd5, 0x75, 0x30, 0x22, 0xe6, 0xf9, 0x43, 0x62, 0x0d, 0xf7, 0x75, 0x9d, 0x7f, 0x8c, 0xff, 0x7d, 0xe4, 0x72, 0xac, 0x9f, 0x1c}}},
+{{{0x88, 0xc1, 0x99, 0xd0, 0x3c, 0x1c, 0x5d, 0xb4, 0xef, 0x13, 0x0f, 0x90, 0xb9, 0x36, 0x2f, 0x95, 0x95, 0xc6, 0xdc, 0xde, 0x0a, 0x51, 0xe2, 0x8d, 0xf3, 0xbc, 0x51, 0xec, 0xdf, 0xb1, 0xa2, 0x5f}} ,
+ {{0x2e, 0x68, 0xa1, 0x23, 0x7d, 0x9b, 0x40, 0x69, 0x85, 0x7b, 0x42, 0xbf, 0x90, 0x4b, 0xd6, 0x40, 0x2f, 0xd7, 0x52, 0x52, 0xb2, 0x21, 0xde, 0x64, 0xbd, 0x88, 0xc3, 0x6d, 0xa5, 0xfa, 0x81, 0x3f}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xfb, 0xfd, 0x47, 0x7b, 0x8a, 0x66, 0x9e, 0x79, 0x2e, 0x64, 0x82, 0xef, 0xf7, 0x21, 0xec, 0xf6, 0xd8, 0x86, 0x09, 0x31, 0x7c, 0xdd, 0x03, 0x6a, 0x58, 0xa0, 0x77, 0xb7, 0x9b, 0x8c, 0x87, 0x1f}} ,
+ {{0x55, 0x47, 0xe4, 0xa8, 0x3d, 0x55, 0x21, 0x34, 0xab, 0x1d, 0xae, 0xe0, 0xf4, 0xea, 0xdb, 0xc5, 0xb9, 0x58, 0xbf, 0xc4, 0x2a, 0x89, 0x31, 0x1a, 0xf4, 0x2d, 0xe1, 0xca, 0x37, 0x99, 0x47, 0x59}}},
+{{{0xc7, 0xca, 0x63, 0xc1, 0x49, 0xa9, 0x35, 0x45, 0x55, 0x7e, 0xda, 0x64, 0x32, 0x07, 0x50, 0xf7, 0x32, 0xac, 0xde, 0x75, 0x58, 0x9b, 0x11, 0xb2, 0x3a, 0x1f, 0xf5, 0xf7, 0x79, 0x04, 0xe6, 0x08}} ,
+ {{0x46, 0xfa, 0x22, 0x4b, 0xfa, 0xe1, 0xfe, 0x96, 0xfc, 0x67, 0xba, 0x67, 0x97, 0xc4, 0xe7, 0x1b, 0x86, 0x90, 0x5f, 0xee, 0xf4, 0x5b, 0x11, 0xb2, 0xcd, 0xad, 0xee, 0xc2, 0x48, 0x6c, 0x2b, 0x1b}}},
+{{{0xe3, 0x39, 0x62, 0xb4, 0x4f, 0x31, 0x04, 0xc9, 0xda, 0xd5, 0x73, 0x51, 0x57, 0xc5, 0xb8, 0xf3, 0xa3, 0x43, 0x70, 0xe4, 0x61, 0x81, 0x84, 0xe2, 0xbb, 0xbf, 0x4f, 0x9e, 0xa4, 0x5e, 0x74, 0x06}} ,
+ {{0x29, 0xac, 0xff, 0x27, 0xe0, 0x59, 0xbe, 0x39, 0x9c, 0x0d, 0x83, 0xd7, 0x10, 0x0b, 0x15, 0xb7, 0xe1, 0xc2, 0x2c, 0x30, 0x73, 0x80, 0x3a, 0x7d, 0x5d, 0xab, 0x58, 0x6b, 0xc1, 0xf0, 0xf4, 0x22}}},
+{{{0xfe, 0x7f, 0xfb, 0x35, 0x7d, 0xc6, 0x01, 0x23, 0x28, 0xc4, 0x02, 0xac, 0x1f, 0x42, 0xb4, 0x9d, 0xfc, 0x00, 0x94, 0xa5, 0xee, 0xca, 0xda, 0x97, 0x09, 0x41, 0x77, 0x87, 0x5d, 0x7b, 0x87, 0x78}} ,
+ {{0xf5, 0xfb, 0x90, 0x2d, 0x81, 0x19, 0x9e, 0x2f, 0x6d, 0x85, 0x88, 0x8c, 0x40, 0x5c, 0x77, 0x41, 0x4d, 0x01, 0x19, 0x76, 0x60, 0xe8, 0x4c, 0x48, 0xe4, 0x33, 0x83, 0x32, 0x6c, 0xb4, 0x41, 0x03}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xff, 0x10, 0xc2, 0x09, 0x4f, 0x6e, 0xf4, 0xd2, 0xdf, 0x7e, 0xca, 0x7b, 0x1c, 0x1d, 0xba, 0xa3, 0xb6, 0xda, 0x67, 0x33, 0xd4, 0x87, 0x36, 0x4b, 0x11, 0x20, 0x05, 0xa6, 0x29, 0xc1, 0x87, 0x17}} ,
+ {{0xf6, 0x96, 0xca, 0x2f, 0xda, 0x38, 0xa7, 0x1b, 0xfc, 0xca, 0x7d, 0xfe, 0x08, 0x89, 0xe2, 0x47, 0x2b, 0x6a, 0x5d, 0x4b, 0xfa, 0xa1, 0xb4, 0xde, 0xb6, 0xc2, 0x31, 0x51, 0xf5, 0xe0, 0xa4, 0x0b}}},
+{{{0x5c, 0xe5, 0xc6, 0x04, 0x8e, 0x2b, 0x57, 0xbe, 0x38, 0x85, 0x23, 0xcb, 0xb7, 0xbe, 0x4f, 0xa9, 0xd3, 0x6e, 0x12, 0xaa, 0xd5, 0xb2, 0x2e, 0x93, 0x29, 0x9a, 0x4a, 0x88, 0x18, 0x43, 0xf5, 0x01}} ,
+ {{0x50, 0xfc, 0xdb, 0xa2, 0x59, 0x21, 0x8d, 0xbd, 0x7e, 0x33, 0xae, 0x2f, 0x87, 0x1a, 0xd0, 0x97, 0xc7, 0x0d, 0x4d, 0x63, 0x01, 0xef, 0x05, 0x84, 0xec, 0x40, 0xdd, 0xa8, 0x0a, 0x4f, 0x70, 0x0b}}},
+{{{0x41, 0x69, 0x01, 0x67, 0x5c, 0xd3, 0x8a, 0xc5, 0xcf, 0x3f, 0xd1, 0x57, 0xd1, 0x67, 0x3e, 0x01, 0x39, 0xb5, 0xcb, 0x81, 0x56, 0x96, 0x26, 0xb6, 0xc2, 0xe7, 0x5c, 0xfb, 0x63, 0x97, 0x58, 0x06}} ,
+ {{0x0c, 0x0e, 0xf3, 0xba, 0xf0, 0xe5, 0xba, 0xb2, 0x57, 0x77, 0xc6, 0x20, 0x9b, 0x89, 0x24, 0xbe, 0xf2, 0x9c, 0x8a, 0xba, 0x69, 0xc1, 0xf1, 0xb0, 0x4f, 0x2a, 0x05, 0x9a, 0xee, 0x10, 0x7e, 0x36}}},
+{{{0x3f, 0x26, 0xe9, 0x40, 0xe9, 0x03, 0xad, 0x06, 0x69, 0x91, 0xe0, 0xd1, 0x89, 0x60, 0x84, 0x79, 0xde, 0x27, 0x6d, 0xe6, 0x76, 0xbd, 0xea, 0xe6, 0xae, 0x48, 0xc3, 0x67, 0xc0, 0x57, 0xcd, 0x2f}} ,
+ {{0x7f, 0xc1, 0xdc, 0xb9, 0xc7, 0xbc, 0x86, 0x3d, 0x55, 0x4b, 0x28, 0x7a, 0xfb, 0x4d, 0xc7, 0xf8, 0xbc, 0x67, 0x2a, 0x60, 0x4d, 0x8f, 0x07, 0x0b, 0x1a, 0x17, 0xbf, 0xfa, 0xac, 0xa7, 0x3d, 0x1a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x91, 0x3f, 0xed, 0x5e, 0x18, 0x78, 0x3f, 0x23, 0x2c, 0x0d, 0x8c, 0x44, 0x00, 0xe8, 0xfb, 0xe9, 0x8e, 0xd6, 0xd1, 0x36, 0x58, 0x57, 0x9e, 0xae, 0x4b, 0x5c, 0x0b, 0x07, 0xbc, 0x6b, 0x55, 0x2b}} ,
+ {{0x6f, 0x4d, 0x17, 0xd7, 0xe1, 0x84, 0xd9, 0x78, 0xb1, 0x90, 0xfd, 0x2e, 0xb3, 0xb5, 0x19, 0x3f, 0x1b, 0xfa, 0xc0, 0x68, 0xb3, 0xdd, 0x00, 0x2e, 0x89, 0xbd, 0x7e, 0x80, 0x32, 0x13, 0xa0, 0x7b}}},
+{{{0x1a, 0x6f, 0x40, 0xaf, 0x44, 0x44, 0xb0, 0x43, 0x8f, 0x0d, 0xd0, 0x1e, 0xc4, 0x0b, 0x19, 0x5d, 0x8e, 0xfe, 0xc1, 0xf3, 0xc5, 0x5c, 0x91, 0xf8, 0x04, 0x4e, 0xbe, 0x90, 0xb4, 0x47, 0x5c, 0x3f}} ,
+ {{0xb0, 0x3b, 0x2c, 0xf3, 0xfe, 0x32, 0x71, 0x07, 0x3f, 0xaa, 0xba, 0x45, 0x60, 0xa8, 0x8d, 0xea, 0x54, 0xcb, 0x39, 0x10, 0xb4, 0xf2, 0x8b, 0xd2, 0x14, 0x82, 0x42, 0x07, 0x8e, 0xe9, 0x7c, 0x53}}},
+{{{0xb0, 0xae, 0xc1, 0x8d, 0xc9, 0x8f, 0xb9, 0x7a, 0x77, 0xef, 0xba, 0x79, 0xa0, 0x3c, 0xa8, 0xf5, 0x6a, 0xe2, 0x3f, 0x5d, 0x00, 0xe3, 0x4b, 0x45, 0x24, 0x7b, 0x43, 0x78, 0x55, 0x1d, 0x2b, 0x1e}} ,
+ {{0x01, 0xb8, 0xd6, 0x16, 0x67, 0xa0, 0x15, 0xb9, 0xe1, 0x58, 0xa4, 0xa7, 0x31, 0x37, 0x77, 0x2f, 0x8b, 0x12, 0x9f, 0xf4, 0x3f, 0xc7, 0x36, 0x66, 0xd2, 0xa8, 0x56, 0xf7, 0x7f, 0x74, 0xc6, 0x41}}},
+{{{0x5d, 0xf8, 0xb4, 0xa8, 0x30, 0xdd, 0xcc, 0x38, 0xa5, 0xd3, 0xca, 0xd8, 0xd1, 0xf8, 0xb2, 0x31, 0x91, 0xd4, 0x72, 0x05, 0x57, 0x4a, 0x3b, 0x82, 0x4a, 0xc6, 0x68, 0x20, 0xe2, 0x18, 0x41, 0x61}} ,
+ {{0x19, 0xd4, 0x8d, 0x47, 0x29, 0x12, 0x65, 0xb0, 0x11, 0x78, 0x47, 0xb5, 0xcb, 0xa3, 0xa5, 0xfa, 0x05, 0x85, 0x54, 0xa9, 0x33, 0x97, 0x8d, 0x2b, 0xc2, 0xfe, 0x99, 0x35, 0x28, 0xe5, 0xeb, 0x63}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xb1, 0x3f, 0x3f, 0xef, 0xd8, 0xf4, 0xfc, 0xb3, 0xa0, 0x60, 0x50, 0x06, 0x2b, 0x29, 0x52, 0x70, 0x15, 0x0b, 0x24, 0x24, 0xf8, 0x5f, 0x79, 0x18, 0xcc, 0xff, 0x89, 0x99, 0x84, 0xa1, 0xae, 0x13}} ,
+ {{0x44, 0x1f, 0xb8, 0xc2, 0x01, 0xc1, 0x30, 0x19, 0x55, 0x05, 0x60, 0x10, 0xa4, 0x6c, 0x2d, 0x67, 0x70, 0xe5, 0x25, 0x1b, 0xf2, 0xbf, 0xdd, 0xfb, 0x70, 0x2b, 0xa1, 0x8c, 0x9c, 0x94, 0x84, 0x08}}},
+{{{0xe7, 0xc4, 0x43, 0x4d, 0xc9, 0x2b, 0x69, 0x5d, 0x1d, 0x3c, 0xaf, 0xbb, 0x43, 0x38, 0x4e, 0x98, 0x3d, 0xed, 0x0d, 0x21, 0x03, 0xfd, 0xf0, 0x99, 0x47, 0x04, 0xb0, 0x98, 0x69, 0x55, 0x72, 0x0f}} ,
+ {{0x5e, 0xdf, 0x15, 0x53, 0x3b, 0x86, 0x80, 0xb0, 0xf1, 0x70, 0x68, 0x8f, 0x66, 0x7c, 0x0e, 0x49, 0x1a, 0xd8, 0x6b, 0xfe, 0x4e, 0xef, 0xca, 0x47, 0xd4, 0x03, 0xc1, 0x37, 0x50, 0x9c, 0xc1, 0x16}}},
+{{{0xcd, 0x24, 0xc6, 0x3e, 0x0c, 0x82, 0x9b, 0x91, 0x2b, 0x61, 0x4a, 0xb2, 0x0f, 0x88, 0x55, 0x5f, 0x5a, 0x57, 0xff, 0xe5, 0x74, 0x0b, 0x13, 0x43, 0x00, 0xd8, 0x6b, 0xcf, 0xd2, 0x15, 0x03, 0x2c}} ,
+ {{0xdc, 0xff, 0x15, 0x61, 0x2f, 0x4a, 0x2f, 0x62, 0xf2, 0x04, 0x2f, 0xb5, 0x0c, 0xb7, 0x1e, 0x3f, 0x74, 0x1a, 0x0f, 0xd7, 0xea, 0xcd, 0xd9, 0x7d, 0xf6, 0x12, 0x0e, 0x2f, 0xdb, 0x5a, 0x3b, 0x16}}},
+{{{0x1b, 0x37, 0x47, 0xe3, 0xf5, 0x9e, 0xea, 0x2c, 0x2a, 0xe7, 0x82, 0x36, 0xf4, 0x1f, 0x81, 0x47, 0x92, 0x4b, 0x69, 0x0e, 0x11, 0x8c, 0x5d, 0x53, 0x5b, 0x81, 0x27, 0x08, 0xbc, 0xa0, 0xae, 0x25}} ,
+ {{0x69, 0x32, 0xa1, 0x05, 0x11, 0x42, 0x00, 0xd2, 0x59, 0xac, 0x4d, 0x62, 0x8b, 0x13, 0xe2, 0x50, 0x5d, 0xa0, 0x9d, 0x9b, 0xfd, 0xbb, 0x12, 0x41, 0x75, 0x41, 0x9e, 0xcc, 0xdc, 0xc7, 0xdc, 0x5d}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xd9, 0xe3, 0x38, 0x06, 0x46, 0x70, 0x82, 0x5e, 0x28, 0x49, 0x79, 0xff, 0x25, 0xd2, 0x4e, 0x29, 0x8d, 0x06, 0xb0, 0x23, 0xae, 0x9b, 0x66, 0xe4, 0x7d, 0xc0, 0x70, 0x91, 0xa3, 0xfc, 0xec, 0x4e}} ,
+ {{0x62, 0x12, 0x37, 0x6a, 0x30, 0xf6, 0x1e, 0xfb, 0x14, 0x5c, 0x0d, 0x0e, 0xb7, 0x81, 0x6a, 0xe7, 0x08, 0x05, 0xac, 0xaa, 0x38, 0x46, 0xe2, 0x73, 0xea, 0x4b, 0x07, 0x81, 0x43, 0x7c, 0x9e, 0x5e}}},
+{{{0xfc, 0xf9, 0x21, 0x4f, 0x2e, 0x76, 0x9b, 0x1f, 0x28, 0x60, 0x77, 0x43, 0x32, 0x9d, 0xbe, 0x17, 0x30, 0x2a, 0xc6, 0x18, 0x92, 0x66, 0x62, 0x30, 0x98, 0x40, 0x11, 0xa6, 0x7f, 0x18, 0x84, 0x28}} ,
+ {{0x3f, 0xab, 0xd3, 0xf4, 0x8a, 0x76, 0xa1, 0x3c, 0xca, 0x2d, 0x49, 0xc3, 0xea, 0x08, 0x0b, 0x85, 0x17, 0x2a, 0xc3, 0x6c, 0x08, 0xfd, 0x57, 0x9f, 0x3d, 0x5f, 0xdf, 0x67, 0x68, 0x42, 0x00, 0x32}}},
+{{{0x51, 0x60, 0x1b, 0x06, 0x4f, 0x8a, 0x21, 0xba, 0x38, 0xa8, 0xba, 0xd6, 0x40, 0xf6, 0xe9, 0x9b, 0x76, 0x4d, 0x56, 0x21, 0x5b, 0x0a, 0x9b, 0x2e, 0x4f, 0x3d, 0x81, 0x32, 0x08, 0x9f, 0x97, 0x5b}} ,
+ {{0xe5, 0x44, 0xec, 0x06, 0x9d, 0x90, 0x79, 0x9f, 0xd3, 0xe0, 0x79, 0xaf, 0x8f, 0x10, 0xfd, 0xdd, 0x04, 0xae, 0x27, 0x97, 0x46, 0x33, 0x79, 0xea, 0xb8, 0x4e, 0xca, 0x5a, 0x59, 0x57, 0xe1, 0x0e}}},
+{{{0x1a, 0xda, 0xf3, 0xa5, 0x41, 0x43, 0x28, 0xfc, 0x7e, 0xe7, 0x71, 0xea, 0xc6, 0x3b, 0x59, 0xcc, 0x2e, 0xd3, 0x40, 0xec, 0xb3, 0x13, 0x6f, 0x44, 0xcd, 0x13, 0xb2, 0x37, 0xf2, 0x6e, 0xd9, 0x1c}} ,
+ {{0xe3, 0xdb, 0x60, 0xcd, 0x5c, 0x4a, 0x18, 0x0f, 0xef, 0x73, 0x36, 0x71, 0x8c, 0xf6, 0x11, 0xb4, 0xd8, 0xce, 0x17, 0x5e, 0x4f, 0x26, 0x77, 0x97, 0x5f, 0xcb, 0xef, 0x91, 0xeb, 0x6a, 0x62, 0x7a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x18, 0x4a, 0xa2, 0x97, 0x08, 0x81, 0x2d, 0x83, 0xc4, 0xcc, 0xf0, 0x83, 0x7e, 0xec, 0x0d, 0x95, 0x4c, 0x5b, 0xfb, 0xfa, 0x98, 0x80, 0x4a, 0x66, 0x56, 0x0c, 0x51, 0xb3, 0xf2, 0x04, 0x5d, 0x27}} ,
+ {{0x3b, 0xb9, 0xb8, 0x06, 0x5a, 0x2e, 0xfe, 0xc3, 0x82, 0x37, 0x9c, 0xa3, 0x11, 0x1f, 0x9c, 0xa6, 0xda, 0x63, 0x48, 0x9b, 0xad, 0xde, 0x2d, 0xa6, 0xbc, 0x6e, 0x32, 0xda, 0x27, 0x65, 0xdd, 0x57}}},
+{{{0x84, 0x4f, 0x37, 0x31, 0x7d, 0x2e, 0xbc, 0xad, 0x87, 0x07, 0x2a, 0x6b, 0x37, 0xfc, 0x5f, 0xeb, 0x4e, 0x75, 0x35, 0xa6, 0xde, 0xab, 0x0a, 0x19, 0x3a, 0xb7, 0xb1, 0xef, 0x92, 0x6a, 0x3b, 0x3c}} ,
+ {{0x3b, 0xb2, 0x94, 0x6d, 0x39, 0x60, 0xac, 0xee, 0xe7, 0x81, 0x1a, 0x3b, 0x76, 0x87, 0x5c, 0x05, 0x94, 0x2a, 0x45, 0xb9, 0x80, 0xe9, 0x22, 0xb1, 0x07, 0xcb, 0x40, 0x9e, 0x70, 0x49, 0x6d, 0x12}}},
+{{{0xfd, 0x18, 0x78, 0x84, 0xa8, 0x4c, 0x7d, 0x6e, 0x59, 0xa6, 0xe5, 0x74, 0xf1, 0x19, 0xa6, 0x84, 0x2e, 0x51, 0xc1, 0x29, 0x13, 0xf2, 0x14, 0x6b, 0x5d, 0x53, 0x51, 0xf7, 0xef, 0xbf, 0x01, 0x22}} ,
+ {{0xa4, 0x4b, 0x62, 0x4c, 0xe6, 0xfd, 0x72, 0x07, 0xf2, 0x81, 0xfc, 0xf2, 0xbd, 0x12, 0x7c, 0x68, 0x76, 0x2a, 0xba, 0xf5, 0x65, 0xb1, 0x1f, 0x17, 0x0a, 0x38, 0xb0, 0xbf, 0xc0, 0xf8, 0xf4, 0x2a}}},
+{{{0x55, 0x60, 0x55, 0x5b, 0xe4, 0x1d, 0x71, 0x4c, 0x9d, 0x5b, 0x9f, 0x70, 0xa6, 0x85, 0x9a, 0x2c, 0xa0, 0xe2, 0x32, 0x48, 0xce, 0x9e, 0x2a, 0xa5, 0x07, 0x3b, 0xc7, 0x6c, 0x86, 0x77, 0xde, 0x3c}} ,
+ {{0xf7, 0x18, 0x7a, 0x96, 0x7e, 0x43, 0x57, 0xa9, 0x55, 0xfc, 0x4e, 0xb6, 0x72, 0x00, 0xf2, 0xe4, 0xd7, 0x52, 0xd3, 0xd3, 0xb6, 0x85, 0xf6, 0x71, 0xc7, 0x44, 0x3f, 0x7f, 0xd7, 0xb3, 0xf2, 0x79}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x46, 0xca, 0xa7, 0x55, 0x7b, 0x79, 0xf3, 0xca, 0x5a, 0x65, 0xf6, 0xed, 0x50, 0x14, 0x7b, 0xe4, 0xc4, 0x2a, 0x65, 0x9e, 0xe2, 0xf9, 0xca, 0xa7, 0x22, 0x26, 0x53, 0xcb, 0x21, 0x5b, 0xa7, 0x31}} ,
+ {{0x90, 0xd7, 0xc5, 0x26, 0x08, 0xbd, 0xb0, 0x53, 0x63, 0x58, 0xc3, 0x31, 0x5e, 0x75, 0x46, 0x15, 0x91, 0xa6, 0xf8, 0x2f, 0x1a, 0x08, 0x65, 0x88, 0x2f, 0x98, 0x04, 0xf1, 0x7c, 0x6e, 0x00, 0x77}}},
+{{{0x81, 0x21, 0x61, 0x09, 0xf6, 0x4e, 0xf1, 0x92, 0xee, 0x63, 0x61, 0x73, 0x87, 0xc7, 0x54, 0x0e, 0x42, 0x4b, 0xc9, 0x47, 0xd1, 0xb8, 0x7e, 0x91, 0x75, 0x37, 0x99, 0x28, 0xb8, 0xdd, 0x7f, 0x50}} ,
+ {{0x89, 0x8f, 0xc0, 0xbe, 0x5d, 0xd6, 0x9f, 0xa0, 0xf0, 0x9d, 0x81, 0xce, 0x3a, 0x7b, 0x98, 0x58, 0xbb, 0xd7, 0x78, 0xc8, 0x3f, 0x13, 0xf1, 0x74, 0x19, 0xdf, 0xf8, 0x98, 0x89, 0x5d, 0xfa, 0x5f}}},
+{{{0x9e, 0x35, 0x85, 0x94, 0x47, 0x1f, 0x90, 0x15, 0x26, 0xd0, 0x84, 0xed, 0x8a, 0x80, 0xf7, 0x63, 0x42, 0x86, 0x27, 0xd7, 0xf4, 0x75, 0x58, 0xdc, 0x9c, 0xc0, 0x22, 0x7e, 0x20, 0x35, 0xfd, 0x1f}} ,
+ {{0x68, 0x0e, 0x6f, 0x97, 0xba, 0x70, 0xbb, 0xa3, 0x0e, 0xe5, 0x0b, 0x12, 0xf4, 0xa2, 0xdc, 0x47, 0xf8, 0xe6, 0xd0, 0x23, 0x6c, 0x33, 0xa8, 0x99, 0x46, 0x6e, 0x0f, 0x44, 0xba, 0x76, 0x48, 0x0f}}},
+{{{0xa3, 0x2a, 0x61, 0x37, 0xe2, 0x59, 0x12, 0x0e, 0x27, 0xba, 0x64, 0x43, 0xae, 0xc0, 0x42, 0x69, 0x79, 0xa4, 0x1e, 0x29, 0x8b, 0x15, 0xeb, 0xf8, 0xaf, 0xd4, 0xa2, 0x68, 0x33, 0xb5, 0x7a, 0x24}} ,
+ {{0x2c, 0x19, 0x33, 0xdd, 0x1b, 0xab, 0xec, 0x01, 0xb0, 0x23, 0xf8, 0x42, 0x2b, 0x06, 0x88, 0xea, 0x3d, 0x2d, 0x00, 0x2a, 0x78, 0x45, 0x4d, 0x38, 0xed, 0x2e, 0x2e, 0x44, 0x49, 0xed, 0xcb, 0x33}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xa0, 0x68, 0xe8, 0x41, 0x8f, 0x91, 0xf8, 0x11, 0x13, 0x90, 0x2e, 0xa7, 0xab, 0x30, 0xef, 0xad, 0xa0, 0x61, 0x00, 0x88, 0xef, 0xdb, 0xce, 0x5b, 0x5c, 0xbb, 0x62, 0xc8, 0x56, 0xf9, 0x00, 0x73}} ,
+ {{0x3f, 0x60, 0xc1, 0x82, 0x2d, 0xa3, 0x28, 0x58, 0x24, 0x9e, 0x9f, 0xe3, 0x70, 0xcc, 0x09, 0x4e, 0x1a, 0x3f, 0x11, 0x11, 0x15, 0x07, 0x3c, 0xa4, 0x41, 0xe0, 0x65, 0xa3, 0x0a, 0x41, 0x6d, 0x11}}},
+{{{0x31, 0x40, 0x01, 0x52, 0x56, 0x94, 0x5b, 0x28, 0x8a, 0xaa, 0x52, 0xee, 0xd8, 0x0a, 0x05, 0x8d, 0xcd, 0xb5, 0xaa, 0x2e, 0x38, 0xaa, 0xb7, 0x87, 0xf7, 0x2b, 0xfb, 0x04, 0xcb, 0x84, 0x3d, 0x54}} ,
+ {{0x20, 0xef, 0x59, 0xde, 0xa4, 0x2b, 0x93, 0x6e, 0x2e, 0xec, 0x42, 0x9a, 0xd4, 0x2d, 0xf4, 0x46, 0x58, 0x27, 0x2b, 0x18, 0x8f, 0x83, 0x3d, 0x69, 0x9e, 0xd4, 0x3e, 0xb6, 0xc5, 0xfd, 0x58, 0x03}}},
+{{{0x33, 0x89, 0xc9, 0x63, 0x62, 0x1c, 0x17, 0xb4, 0x60, 0xc4, 0x26, 0x68, 0x09, 0xc3, 0x2e, 0x37, 0x0f, 0x7b, 0xb4, 0x9c, 0xb6, 0xf9, 0xfb, 0xd4, 0x51, 0x78, 0xc8, 0x63, 0xea, 0x77, 0x47, 0x07}} ,
+ {{0x32, 0xb4, 0x18, 0x47, 0x79, 0xcb, 0xd4, 0x5a, 0x07, 0x14, 0x0f, 0xa0, 0xd5, 0xac, 0xd0, 0x41, 0x40, 0xab, 0x61, 0x23, 0xe5, 0x2a, 0x2a, 0x6f, 0xf7, 0xa8, 0xd4, 0x76, 0xef, 0xe7, 0x45, 0x6c}}},
+{{{0xa1, 0x5e, 0x60, 0x4f, 0xfb, 0xe1, 0x70, 0x6a, 0x1f, 0x55, 0x4f, 0x09, 0xb4, 0x95, 0x33, 0x36, 0xc6, 0x81, 0x01, 0x18, 0x06, 0x25, 0x27, 0xa4, 0xb4, 0x24, 0xa4, 0x86, 0x03, 0x4c, 0xac, 0x02}} ,
+ {{0x77, 0x38, 0xde, 0xd7, 0x60, 0x48, 0x07, 0xf0, 0x74, 0xa8, 0xff, 0x54, 0xe5, 0x30, 0x43, 0xff, 0x77, 0xfb, 0x21, 0x07, 0xff, 0xb2, 0x07, 0x6b, 0xe4, 0xe5, 0x30, 0xfc, 0x19, 0x6c, 0xa3, 0x01}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x13, 0xc5, 0x2c, 0xac, 0xd3, 0x83, 0x82, 0x7c, 0x29, 0xf7, 0x05, 0xa5, 0x00, 0xb6, 0x1f, 0x86, 0x55, 0xf4, 0xd6, 0x2f, 0x0c, 0x99, 0xd0, 0x65, 0x9b, 0x6b, 0x46, 0x0d, 0x43, 0xf8, 0x16, 0x28}} ,
+ {{0x1e, 0x7f, 0xb4, 0x74, 0x7e, 0xb1, 0x89, 0x4f, 0x18, 0x5a, 0xab, 0x64, 0x06, 0xdf, 0x45, 0x87, 0xe0, 0x6a, 0xc6, 0xf0, 0x0e, 0xc9, 0x24, 0x35, 0x38, 0xea, 0x30, 0x54, 0xb4, 0xc4, 0x52, 0x54}}},
+{{{0xe9, 0x9f, 0xdc, 0x3f, 0xc1, 0x89, 0x44, 0x74, 0x27, 0xe4, 0xc1, 0x90, 0xff, 0x4a, 0xa7, 0x3c, 0xee, 0xcd, 0xf4, 0x1d, 0x25, 0x94, 0x7f, 0x63, 0x16, 0x48, 0xbc, 0x64, 0xfe, 0x95, 0xc4, 0x0c}} ,
+ {{0x8b, 0x19, 0x75, 0x6e, 0x03, 0x06, 0x5e, 0x6a, 0x6f, 0x1a, 0x8c, 0xe3, 0xd3, 0x28, 0xf2, 0xe0, 0xb9, 0x7a, 0x43, 0x69, 0xe6, 0xd3, 0xc0, 0xfe, 0x7e, 0x97, 0xab, 0x6c, 0x7b, 0x8e, 0x13, 0x42}}},
+{{{0xd4, 0xca, 0x70, 0x3d, 0xab, 0xfb, 0x5f, 0x5e, 0x00, 0x0c, 0xcc, 0x77, 0x22, 0xf8, 0x78, 0x55, 0xae, 0x62, 0x35, 0xfb, 0x9a, 0xc6, 0x03, 0xe4, 0x0c, 0xee, 0xab, 0xc7, 0xc0, 0x89, 0x87, 0x54}} ,
+ {{0x32, 0xad, 0xae, 0x85, 0x58, 0x43, 0xb8, 0xb1, 0xe6, 0x3e, 0x00, 0x9c, 0x78, 0x88, 0x56, 0xdb, 0x9c, 0xfc, 0x79, 0xf6, 0xf9, 0x41, 0x5f, 0xb7, 0xbc, 0x11, 0xf9, 0x20, 0x36, 0x1c, 0x53, 0x2b}}},
+{{{0x5a, 0x20, 0x5b, 0xa1, 0xa5, 0x44, 0x91, 0x24, 0x02, 0x63, 0x12, 0x64, 0xb8, 0x55, 0xf6, 0xde, 0x2c, 0xdb, 0x47, 0xb8, 0xc6, 0x0a, 0xc3, 0x00, 0x78, 0x93, 0xd8, 0xf5, 0xf5, 0x18, 0x28, 0x0a}} ,
+ {{0xd6, 0x1b, 0x9a, 0x6c, 0xe5, 0x46, 0xea, 0x70, 0x96, 0x8d, 0x4e, 0x2a, 0x52, 0x21, 0x26, 0x4b, 0xb1, 0xbb, 0x0f, 0x7c, 0xa9, 0x9b, 0x04, 0xbb, 0x51, 0x08, 0xf1, 0x9a, 0xa4, 0x76, 0x7c, 0x18}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xfa, 0x94, 0xf7, 0x40, 0xd0, 0xd7, 0xeb, 0xa9, 0x82, 0x36, 0xd5, 0x15, 0xb9, 0x33, 0x7a, 0xbf, 0x8a, 0xf2, 0x63, 0xaa, 0x37, 0xf5, 0x59, 0xac, 0xbd, 0xbb, 0x32, 0x36, 0xbe, 0x73, 0x99, 0x38}} ,
+ {{0x2c, 0xb3, 0xda, 0x7a, 0xd8, 0x3d, 0x99, 0xca, 0xd2, 0xf4, 0xda, 0x99, 0x8e, 0x4f, 0x98, 0xb7, 0xf4, 0xae, 0x3e, 0x9f, 0x8e, 0x35, 0x60, 0xa4, 0x33, 0x75, 0xa4, 0x04, 0x93, 0xb1, 0x6b, 0x4d}}},
+{{{0x97, 0x9d, 0xa8, 0xcd, 0x97, 0x7b, 0x9d, 0xb9, 0xe7, 0xa5, 0xef, 0xfd, 0xa8, 0x42, 0x6b, 0xc3, 0x62, 0x64, 0x7d, 0xa5, 0x1b, 0xc9, 0x9e, 0xd2, 0x45, 0xb9, 0xee, 0x03, 0xb0, 0xbf, 0xc0, 0x68}} ,
+ {{0xed, 0xb7, 0x84, 0x2c, 0xf6, 0xd3, 0xa1, 0x6b, 0x24, 0x6d, 0x87, 0x56, 0x97, 0x59, 0x79, 0x62, 0x9f, 0xac, 0xed, 0xf3, 0xc9, 0x89, 0x21, 0x2e, 0x04, 0xb3, 0xcc, 0x2f, 0xbe, 0xd6, 0x0a, 0x4b}}},
+{{{0x39, 0x61, 0x05, 0xed, 0x25, 0x89, 0x8b, 0x5d, 0x1b, 0xcb, 0x0c, 0x55, 0xf4, 0x6a, 0x00, 0x8a, 0x46, 0xe8, 0x1e, 0xc6, 0x83, 0xc8, 0x5a, 0x76, 0xdb, 0xcc, 0x19, 0x7a, 0xcc, 0x67, 0x46, 0x0b}} ,
+ {{0x53, 0xcf, 0xc2, 0xa1, 0xad, 0x6a, 0xf3, 0xcd, 0x8f, 0xc9, 0xde, 0x1c, 0xf8, 0x6c, 0x8f, 0xf8, 0x76, 0x42, 0xe7, 0xfe, 0xb2, 0x72, 0x21, 0x0a, 0x66, 0x74, 0x8f, 0xb7, 0xeb, 0xe4, 0x6f, 0x01}}},
+{{{0x22, 0x8c, 0x6b, 0xbe, 0xfc, 0x4d, 0x70, 0x62, 0x6e, 0x52, 0x77, 0x99, 0x88, 0x7e, 0x7b, 0x57, 0x7a, 0x0d, 0xfe, 0xdc, 0x72, 0x92, 0xf1, 0x68, 0x1d, 0x97, 0xd7, 0x7c, 0x8d, 0x53, 0x10, 0x37}} ,
+ {{0x53, 0x88, 0x77, 0x02, 0xca, 0x27, 0xa8, 0xe5, 0x45, 0xe2, 0xa8, 0x48, 0x2a, 0xab, 0x18, 0xca, 0xea, 0x2d, 0x2a, 0x54, 0x17, 0x37, 0x32, 0x09, 0xdc, 0xe0, 0x4a, 0xb7, 0x7d, 0x82, 0x10, 0x7d}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x8a, 0x64, 0x1e, 0x14, 0x0a, 0x57, 0xd4, 0xda, 0x5c, 0x96, 0x9b, 0x01, 0x4c, 0x67, 0xbf, 0x8b, 0x30, 0xfe, 0x08, 0xdb, 0x0d, 0xd5, 0xa8, 0xd7, 0x09, 0x11, 0x85, 0xa2, 0xd3, 0x45, 0xfb, 0x7e}} ,
+ {{0xda, 0x8c, 0xc2, 0xd0, 0xac, 0x18, 0xe8, 0x52, 0x36, 0xd4, 0x21, 0xa3, 0xdd, 0x57, 0x22, 0x79, 0xb7, 0xf8, 0x71, 0x9d, 0xc6, 0x91, 0x70, 0x86, 0x56, 0xbf, 0xa1, 0x11, 0x8b, 0x19, 0xe1, 0x0f}}},
+{{{0x18, 0x32, 0x98, 0x2c, 0x8f, 0x91, 0xae, 0x12, 0xf0, 0x8c, 0xea, 0xf3, 0x3c, 0xb9, 0x5d, 0xe4, 0x69, 0xed, 0xb2, 0x47, 0x18, 0xbd, 0xce, 0x16, 0x52, 0x5c, 0x23, 0xe2, 0xa5, 0x25, 0x52, 0x5d}} ,
+ {{0xb9, 0xb1, 0xe7, 0x5d, 0x4e, 0xbc, 0xee, 0xbb, 0x40, 0x81, 0x77, 0x82, 0x19, 0xab, 0xb5, 0xc6, 0xee, 0xab, 0x5b, 0x6b, 0x63, 0x92, 0x8a, 0x34, 0x8d, 0xcd, 0xee, 0x4f, 0x49, 0xe5, 0xc9, 0x7e}}},
+{{{0x21, 0xac, 0x8b, 0x22, 0xcd, 0xc3, 0x9a, 0xe9, 0x5e, 0x78, 0xbd, 0xde, 0xba, 0xad, 0xab, 0xbf, 0x75, 0x41, 0x09, 0xc5, 0x58, 0xa4, 0x7d, 0x92, 0xb0, 0x7f, 0xf2, 0xa1, 0xd1, 0xc0, 0xb3, 0x6d}} ,
+ {{0x62, 0x4f, 0xd0, 0x75, 0x77, 0xba, 0x76, 0x77, 0xd7, 0xb8, 0xd8, 0x92, 0x6f, 0x98, 0x34, 0x3d, 0xd6, 0x4e, 0x1c, 0x0f, 0xf0, 0x8f, 0x2e, 0xf1, 0xb3, 0xbd, 0xb1, 0xb9, 0xec, 0x99, 0xb4, 0x07}}},
+{{{0x60, 0x57, 0x2e, 0x9a, 0x72, 0x1d, 0x6b, 0x6e, 0x58, 0x33, 0x24, 0x8c, 0x48, 0x39, 0x46, 0x8e, 0x89, 0x6a, 0x88, 0x51, 0x23, 0x62, 0xb5, 0x32, 0x09, 0x36, 0xe3, 0x57, 0xf5, 0x98, 0xde, 0x6f}} ,
+ {{0x8b, 0x2c, 0x00, 0x48, 0x4a, 0xf9, 0x5b, 0x87, 0x69, 0x52, 0xe5, 0x5b, 0xd1, 0xb1, 0xe5, 0x25, 0x25, 0xe0, 0x9c, 0xc2, 0x13, 0x44, 0xe8, 0xb9, 0x0a, 0x70, 0xad, 0xbd, 0x0f, 0x51, 0x94, 0x69}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xa2, 0xdc, 0xab, 0xa9, 0x25, 0x2d, 0xac, 0x5f, 0x03, 0x33, 0x08, 0xe7, 0x7e, 0xfe, 0x95, 0x36, 0x3c, 0x5b, 0x3a, 0xd3, 0x05, 0x82, 0x1c, 0x95, 0x2d, 0xd8, 0x77, 0x7e, 0x02, 0xd9, 0x5b, 0x70}} ,
+ {{0xc2, 0xfe, 0x1b, 0x0c, 0x67, 0xcd, 0xd6, 0xe0, 0x51, 0x8e, 0x2c, 0xe0, 0x79, 0x88, 0xf0, 0xcf, 0x41, 0x4a, 0xad, 0x23, 0xd4, 0x46, 0xca, 0x94, 0xa1, 0xc3, 0xeb, 0x28, 0x06, 0xfa, 0x17, 0x14}}},
+{{{0x7b, 0xaa, 0x70, 0x0a, 0x4b, 0xfb, 0xf5, 0xbf, 0x80, 0xc5, 0xcf, 0x08, 0x7a, 0xdd, 0xa1, 0xf4, 0x9d, 0x54, 0x50, 0x53, 0x23, 0x77, 0x23, 0xf5, 0x34, 0xa5, 0x22, 0xd1, 0x0d, 0x96, 0x2e, 0x47}} ,
+ {{0xcc, 0xb7, 0x32, 0x89, 0x57, 0xd0, 0x98, 0x75, 0xe4, 0x37, 0x99, 0xa9, 0xe8, 0xba, 0xed, 0xba, 0xeb, 0xc7, 0x4f, 0x15, 0x76, 0x07, 0x0c, 0x4c, 0xef, 0x9f, 0x52, 0xfc, 0x04, 0x5d, 0x58, 0x10}}},
+{{{0xce, 0x82, 0xf0, 0x8f, 0x79, 0x02, 0xa8, 0xd1, 0xda, 0x14, 0x09, 0x48, 0xee, 0x8a, 0x40, 0x98, 0x76, 0x60, 0x54, 0x5a, 0xde, 0x03, 0x24, 0xf5, 0xe6, 0x2f, 0xe1, 0x03, 0xbf, 0x68, 0x82, 0x7f}} ,
+ {{0x64, 0xe9, 0x28, 0xc7, 0xa4, 0xcf, 0x2a, 0xf9, 0x90, 0x64, 0x72, 0x2c, 0x8b, 0xeb, 0xec, 0xa0, 0xf2, 0x7d, 0x35, 0xb5, 0x90, 0x4d, 0x7f, 0x5b, 0x4a, 0x49, 0xe4, 0xb8, 0x3b, 0xc8, 0xa1, 0x2f}}},
+{{{0x8b, 0xc5, 0xcc, 0x3d, 0x69, 0xa6, 0xa1, 0x18, 0x44, 0xbc, 0x4d, 0x77, 0x37, 0xc7, 0x86, 0xec, 0x0c, 0xc9, 0xd6, 0x44, 0xa9, 0x23, 0x27, 0xb9, 0x03, 0x34, 0xa7, 0x0a, 0xd5, 0xc7, 0x34, 0x37}} ,
+ {{0xf9, 0x7e, 0x3e, 0x66, 0xee, 0xf9, 0x99, 0x28, 0xff, 0xad, 0x11, 0xd8, 0xe2, 0x66, 0xc5, 0xcd, 0x0f, 0x0d, 0x0b, 0x6a, 0xfc, 0x7c, 0x24, 0xa8, 0x4f, 0xa8, 0x5e, 0x80, 0x45, 0x8b, 0x6c, 0x41}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xef, 0x1e, 0xec, 0xf7, 0x8d, 0x77, 0xf2, 0xea, 0xdb, 0x60, 0x03, 0x21, 0xc0, 0xff, 0x5e, 0x67, 0xc3, 0x71, 0x0b, 0x21, 0xb4, 0x41, 0xa0, 0x68, 0x38, 0xc6, 0x01, 0xa3, 0xd3, 0x51, 0x3c, 0x3c}} ,
+ {{0x92, 0xf8, 0xd6, 0x4b, 0xef, 0x42, 0x13, 0xb2, 0x4a, 0xc4, 0x2e, 0x72, 0x3f, 0xc9, 0x11, 0xbd, 0x74, 0x02, 0x0e, 0xf5, 0x13, 0x9d, 0x83, 0x1a, 0x1b, 0xd5, 0x54, 0xde, 0xc4, 0x1e, 0x16, 0x6c}}},
+{{{0x27, 0x52, 0xe4, 0x63, 0xaa, 0x94, 0xe6, 0xc3, 0x28, 0x9c, 0xc6, 0x56, 0xac, 0xfa, 0xb6, 0xbd, 0xe2, 0xcc, 0x76, 0xc6, 0x27, 0x27, 0xa2, 0x8e, 0x78, 0x2b, 0x84, 0x72, 0x10, 0xbd, 0x4e, 0x2a}} ,
+ {{0xea, 0xa7, 0x23, 0xef, 0x04, 0x61, 0x80, 0x50, 0xc9, 0x6e, 0xa5, 0x96, 0xd1, 0xd1, 0xc8, 0xc3, 0x18, 0xd7, 0x2d, 0xfd, 0x26, 0xbd, 0xcb, 0x7b, 0x92, 0x51, 0x0e, 0x4a, 0x65, 0x57, 0xb8, 0x49}}},
+{{{0xab, 0x55, 0x36, 0xc3, 0xec, 0x63, 0x55, 0x11, 0x55, 0xf6, 0xa5, 0xc7, 0x01, 0x5f, 0xfe, 0x79, 0xd8, 0x0a, 0xf7, 0x03, 0xd8, 0x98, 0x99, 0xf5, 0xd0, 0x00, 0x54, 0x6b, 0x66, 0x28, 0xf5, 0x25}} ,
+ {{0x7a, 0x8d, 0xa1, 0x5d, 0x70, 0x5d, 0x51, 0x27, 0xee, 0x30, 0x65, 0x56, 0x95, 0x46, 0xde, 0xbd, 0x03, 0x75, 0xb4, 0x57, 0x59, 0x89, 0xeb, 0x02, 0x9e, 0xcc, 0x89, 0x19, 0xa7, 0xcb, 0x17, 0x67}}},
+{{{0x6a, 0xeb, 0xfc, 0x9a, 0x9a, 0x10, 0xce, 0xdb, 0x3a, 0x1c, 0x3c, 0x6a, 0x9d, 0xea, 0x46, 0xbc, 0x45, 0x49, 0xac, 0xe3, 0x41, 0x12, 0x7c, 0xf0, 0xf7, 0x4f, 0xf9, 0xf7, 0xff, 0x2c, 0x89, 0x04}} ,
+ {{0x30, 0x31, 0x54, 0x1a, 0x46, 0xca, 0xe6, 0xc6, 0xcb, 0xe2, 0xc3, 0xc1, 0x8b, 0x75, 0x81, 0xbe, 0xee, 0xf8, 0xa3, 0x11, 0x1c, 0x25, 0xa3, 0xa7, 0x35, 0x51, 0x55, 0xe2, 0x25, 0xaa, 0xe2, 0x3a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xb4, 0x48, 0x10, 0x9f, 0x8a, 0x09, 0x76, 0xfa, 0xf0, 0x7a, 0xb0, 0x70, 0xf7, 0x83, 0x80, 0x52, 0x84, 0x2b, 0x26, 0xa2, 0xc4, 0x5d, 0x4f, 0xba, 0xb1, 0xc8, 0x40, 0x0d, 0x78, 0x97, 0xc4, 0x60}} ,
+ {{0xd4, 0xb1, 0x6c, 0x08, 0xc7, 0x40, 0x38, 0x73, 0x5f, 0x0b, 0xf3, 0x76, 0x5d, 0xb2, 0xa5, 0x2f, 0x57, 0x57, 0x07, 0xed, 0x08, 0xa2, 0x6c, 0x4f, 0x08, 0x02, 0xb5, 0x0e, 0xee, 0x44, 0xfa, 0x22}}},
+{{{0x0f, 0x00, 0x3f, 0xa6, 0x04, 0x19, 0x56, 0x65, 0x31, 0x7f, 0x8b, 0xeb, 0x0d, 0xe1, 0x47, 0x89, 0x97, 0x16, 0x53, 0xfa, 0x81, 0xa7, 0xaa, 0xb2, 0xbf, 0x67, 0xeb, 0x72, 0x60, 0x81, 0x0d, 0x48}} ,
+ {{0x7e, 0x13, 0x33, 0xcd, 0xa8, 0x84, 0x56, 0x1e, 0x67, 0xaf, 0x6b, 0x43, 0xac, 0x17, 0xaf, 0x16, 0xc0, 0x52, 0x99, 0x49, 0x5b, 0x87, 0x73, 0x7e, 0xb5, 0x43, 0xda, 0x6b, 0x1d, 0x0f, 0x2d, 0x55}}},
+{{{0xe9, 0x58, 0x1f, 0xff, 0x84, 0x3f, 0x93, 0x1c, 0xcb, 0xe1, 0x30, 0x69, 0xa5, 0x75, 0x19, 0x7e, 0x14, 0x5f, 0xf8, 0xfc, 0x09, 0xdd, 0xa8, 0x78, 0x9d, 0xca, 0x59, 0x8b, 0xd1, 0x30, 0x01, 0x13}} ,
+ {{0xff, 0x76, 0x03, 0xc5, 0x4b, 0x89, 0x99, 0x70, 0x00, 0x59, 0x70, 0x9c, 0xd5, 0xd9, 0x11, 0x89, 0x5a, 0x46, 0xfe, 0xef, 0xdc, 0xd9, 0x55, 0x2b, 0x45, 0xa7, 0xb0, 0x2d, 0xfb, 0x24, 0xc2, 0x29}}},
+{{{0x38, 0x06, 0xf8, 0x0b, 0xac, 0x82, 0xc4, 0x97, 0x2b, 0x90, 0xe0, 0xf7, 0xa8, 0xab, 0x6c, 0x08, 0x80, 0x66, 0x90, 0x46, 0xf7, 0x26, 0x2d, 0xf8, 0xf1, 0xc4, 0x6b, 0x4a, 0x82, 0x98, 0x8e, 0x37}} ,
+ {{0x8e, 0xb4, 0xee, 0xb8, 0xd4, 0x3f, 0xb2, 0x1b, 0xe0, 0x0a, 0x3d, 0x75, 0x34, 0x28, 0xa2, 0x8e, 0xc4, 0x92, 0x7b, 0xfe, 0x60, 0x6e, 0x6d, 0xb8, 0x31, 0x1d, 0x62, 0x0d, 0x78, 0x14, 0x42, 0x11}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x5e, 0xa8, 0xd8, 0x04, 0x9b, 0x73, 0xc9, 0xc9, 0xdc, 0x0d, 0x73, 0xbf, 0x0a, 0x0a, 0x73, 0xff, 0x18, 0x1f, 0x9c, 0x51, 0xaa, 0xc6, 0xf1, 0x83, 0x25, 0xfd, 0xab, 0xa3, 0x11, 0xd3, 0x01, 0x24}} ,
+ {{0x4d, 0xe3, 0x7e, 0x38, 0x62, 0x5e, 0x64, 0xbb, 0x2b, 0x53, 0xb5, 0x03, 0x68, 0xc4, 0xf2, 0x2b, 0x5a, 0x03, 0x32, 0x99, 0x4a, 0x41, 0x9a, 0xe1, 0x1a, 0xae, 0x8c, 0x48, 0xf3, 0x24, 0x32, 0x65}}},
+{{{0xe8, 0xdd, 0xad, 0x3a, 0x8c, 0xea, 0xf4, 0xb3, 0xb2, 0xe5, 0x73, 0xf2, 0xed, 0x8b, 0xbf, 0xed, 0xb1, 0x0c, 0x0c, 0xfb, 0x2b, 0xf1, 0x01, 0x48, 0xe8, 0x26, 0x03, 0x8e, 0x27, 0x4d, 0x96, 0x72}} ,
+ {{0xc8, 0x09, 0x3b, 0x60, 0xc9, 0x26, 0x4d, 0x7c, 0xf2, 0x9c, 0xd4, 0xa1, 0x3b, 0x26, 0xc2, 0x04, 0x33, 0x44, 0x76, 0x3c, 0x02, 0xbb, 0x11, 0x42, 0x0c, 0x22, 0xb7, 0xc6, 0xe1, 0xac, 0xb4, 0x0e}}},
+{{{0x6f, 0x85, 0xe7, 0xef, 0xde, 0x67, 0x30, 0xfc, 0xbf, 0x5a, 0xe0, 0x7b, 0x7a, 0x2a, 0x54, 0x6b, 0x5d, 0x62, 0x85, 0xa1, 0xf8, 0x16, 0x88, 0xec, 0x61, 0xb9, 0x96, 0xb5, 0xef, 0x2d, 0x43, 0x4d}} ,
+ {{0x7c, 0x31, 0x33, 0xcc, 0xe4, 0xcf, 0x6c, 0xff, 0x80, 0x47, 0x77, 0xd1, 0xd8, 0xe9, 0x69, 0x97, 0x98, 0x7f, 0x20, 0x57, 0x1d, 0x1d, 0x4f, 0x08, 0x27, 0xc8, 0x35, 0x57, 0x40, 0xc6, 0x21, 0x0c}}},
+{{{0xd2, 0x8e, 0x9b, 0xfa, 0x42, 0x8e, 0xdf, 0x8f, 0xc7, 0x86, 0xf9, 0xa4, 0xca, 0x70, 0x00, 0x9d, 0x21, 0xbf, 0xec, 0x57, 0x62, 0x30, 0x58, 0x8c, 0x0d, 0x35, 0xdb, 0x5d, 0x8b, 0x6a, 0xa0, 0x5a}} ,
+ {{0xc1, 0x58, 0x7c, 0x0d, 0x20, 0xdd, 0x11, 0x26, 0x5f, 0x89, 0x3b, 0x97, 0x58, 0xf8, 0x8b, 0xe3, 0xdf, 0x32, 0xe2, 0xfc, 0xd8, 0x67, 0xf2, 0xa5, 0x37, 0x1e, 0x6d, 0xec, 0x7c, 0x27, 0x20, 0x79}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xd0, 0xe9, 0xc0, 0xfa, 0x95, 0x45, 0x23, 0x96, 0xf1, 0x2c, 0x79, 0x25, 0x14, 0xce, 0x40, 0x14, 0x44, 0x2c, 0x36, 0x50, 0xd9, 0x63, 0x56, 0xb7, 0x56, 0x3b, 0x9e, 0xa7, 0xef, 0x89, 0xbb, 0x0e}} ,
+ {{0xce, 0x7f, 0xdc, 0x0a, 0xcc, 0x82, 0x1c, 0x0a, 0x78, 0x71, 0xe8, 0x74, 0x8d, 0x01, 0x30, 0x0f, 0xa7, 0x11, 0x4c, 0xdf, 0x38, 0xd7, 0xa7, 0x0d, 0xf8, 0x48, 0x52, 0x00, 0x80, 0x7b, 0x5f, 0x0e}}},
+{{{0x25, 0x83, 0xe6, 0x94, 0x7b, 0x81, 0xb2, 0x91, 0xae, 0x0e, 0x05, 0xc9, 0xa3, 0x68, 0x2d, 0xd9, 0x88, 0x25, 0x19, 0x2a, 0x61, 0x61, 0x21, 0x97, 0x15, 0xa1, 0x35, 0xa5, 0x46, 0xc8, 0xa2, 0x0e}} ,
+ {{0x1b, 0x03, 0x0d, 0x8b, 0x5a, 0x1b, 0x97, 0x4b, 0xf2, 0x16, 0x31, 0x3d, 0x1f, 0x33, 0xa0, 0x50, 0x3a, 0x18, 0xbe, 0x13, 0xa1, 0x76, 0xc1, 0xba, 0x1b, 0xf1, 0x05, 0x7b, 0x33, 0xa8, 0x82, 0x3b}}},
+{{{0xba, 0x36, 0x7b, 0x6d, 0xa9, 0xea, 0x14, 0x12, 0xc5, 0xfa, 0x91, 0x00, 0xba, 0x9b, 0x99, 0xcc, 0x56, 0x02, 0xe9, 0xa0, 0x26, 0x40, 0x66, 0x8c, 0xc4, 0xf8, 0x85, 0x33, 0x68, 0xe7, 0x03, 0x20}} ,
+ {{0x50, 0x5b, 0xff, 0xa9, 0xb2, 0xf1, 0xf1, 0x78, 0xcf, 0x14, 0xa4, 0xa9, 0xfc, 0x09, 0x46, 0x94, 0x54, 0x65, 0x0d, 0x9c, 0x5f, 0x72, 0x21, 0xe2, 0x97, 0xa5, 0x2d, 0x81, 0xce, 0x4a, 0x5f, 0x79}}},
+{{{0x3d, 0x5f, 0x5c, 0xd2, 0xbc, 0x7d, 0x77, 0x0e, 0x2a, 0x6d, 0x22, 0x45, 0x84, 0x06, 0xc4, 0xdd, 0xc6, 0xa6, 0xc6, 0xd7, 0x49, 0xad, 0x6d, 0x87, 0x91, 0x0e, 0x3a, 0x67, 0x1d, 0x2c, 0x1d, 0x56}} ,
+ {{0xfe, 0x7a, 0x74, 0xcf, 0xd4, 0xd2, 0xe5, 0x19, 0xde, 0xd0, 0xdb, 0x70, 0x23, 0x69, 0xe6, 0x6d, 0xec, 0xec, 0xcc, 0x09, 0x33, 0x6a, 0x77, 0xdc, 0x6b, 0x22, 0x76, 0x5d, 0x92, 0x09, 0xac, 0x2d}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x23, 0x15, 0x17, 0xeb, 0xd3, 0xdb, 0x12, 0x5e, 0x01, 0xf0, 0x91, 0xab, 0x2c, 0x41, 0xce, 0xac, 0xed, 0x1b, 0x4b, 0x2d, 0xbc, 0xdb, 0x17, 0x66, 0x89, 0x46, 0xad, 0x4b, 0x1e, 0x6f, 0x0b, 0x14}} ,
+ {{0x11, 0xce, 0xbf, 0xb6, 0x77, 0x2d, 0x48, 0x22, 0x18, 0x4f, 0xa3, 0x5d, 0x4a, 0xb0, 0x70, 0x12, 0x3e, 0x54, 0xd7, 0xd8, 0x0e, 0x2b, 0x27, 0xdc, 0x53, 0xff, 0xca, 0x8c, 0x59, 0xb3, 0x4e, 0x44}}},
+{{{0x07, 0x76, 0x61, 0x0f, 0x66, 0xb2, 0x21, 0x39, 0x7e, 0xc0, 0xec, 0x45, 0x28, 0x82, 0xa1, 0x29, 0x32, 0x44, 0x35, 0x13, 0x5e, 0x61, 0x5e, 0x54, 0xcb, 0x7c, 0xef, 0xf6, 0x41, 0xcf, 0x9f, 0x0a}} ,
+ {{0xdd, 0xf9, 0xda, 0x84, 0xc3, 0xe6, 0x8a, 0x9f, 0x24, 0xd2, 0x96, 0x5d, 0x39, 0x6f, 0x58, 0x8c, 0xc1, 0x56, 0x93, 0xab, 0xb5, 0x79, 0x3b, 0xd2, 0xa8, 0x73, 0x16, 0xed, 0xfa, 0xb4, 0x2f, 0x73}}},
+{{{0x8b, 0xb1, 0x95, 0xe5, 0x92, 0x50, 0x35, 0x11, 0x76, 0xac, 0xf4, 0x4d, 0x24, 0xc3, 0x32, 0xe6, 0xeb, 0xfe, 0x2c, 0x87, 0xc4, 0xf1, 0x56, 0xc4, 0x75, 0x24, 0x7a, 0x56, 0x85, 0x5a, 0x3a, 0x13}} ,
+ {{0x0d, 0x16, 0xac, 0x3c, 0x4a, 0x58, 0x86, 0x3a, 0x46, 0x7f, 0x6c, 0xa3, 0x52, 0x6e, 0x37, 0xe4, 0x96, 0x9c, 0xe9, 0x5c, 0x66, 0x41, 0x67, 0xe4, 0xfb, 0x79, 0x0c, 0x05, 0xf6, 0x64, 0xd5, 0x7c}}},
+{{{0x28, 0xc1, 0xe1, 0x54, 0x73, 0xf2, 0xbf, 0x76, 0x74, 0x19, 0x19, 0x1b, 0xe4, 0xb9, 0xa8, 0x46, 0x65, 0x73, 0xf3, 0x77, 0x9b, 0x29, 0x74, 0x5b, 0xc6, 0x89, 0x6c, 0x2c, 0x7c, 0xf8, 0xb3, 0x0f}} ,
+ {{0xf7, 0xd5, 0xe9, 0x74, 0x5d, 0xb8, 0x25, 0x16, 0xb5, 0x30, 0xbc, 0x84, 0xc5, 0xf0, 0xad, 0xca, 0x12, 0x28, 0xbc, 0x9d, 0xd4, 0xfa, 0x82, 0xe6, 0xe3, 0xbf, 0xa2, 0x15, 0x2c, 0xd4, 0x34, 0x10}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x61, 0xb1, 0x46, 0xba, 0x0e, 0x31, 0xa5, 0x67, 0x6c, 0x7f, 0xd6, 0xd9, 0x27, 0x85, 0x0f, 0x79, 0x14, 0xc8, 0x6c, 0x2f, 0x5f, 0x5b, 0x9c, 0x35, 0x3d, 0x38, 0x86, 0x77, 0x65, 0x55, 0x6a, 0x7b}} ,
+ {{0xd3, 0xb0, 0x3a, 0x66, 0x60, 0x1b, 0x43, 0xf1, 0x26, 0x58, 0x99, 0x09, 0x8f, 0x2d, 0xa3, 0x14, 0x71, 0x85, 0xdb, 0xed, 0xf6, 0x26, 0xd5, 0x61, 0x9a, 0x73, 0xac, 0x0e, 0xea, 0xac, 0xb7, 0x0c}}},
+{{{0x5e, 0xf4, 0xe5, 0x17, 0x0e, 0x10, 0x9f, 0xe7, 0x43, 0x5f, 0x67, 0x5c, 0xac, 0x4b, 0xe5, 0x14, 0x41, 0xd2, 0xbf, 0x48, 0xf5, 0x14, 0xb0, 0x71, 0xc6, 0x61, 0xc1, 0xb2, 0x70, 0x58, 0xd2, 0x5a}} ,
+ {{0x2d, 0xba, 0x16, 0x07, 0x92, 0x94, 0xdc, 0xbd, 0x50, 0x2b, 0xc9, 0x7f, 0x42, 0x00, 0xba, 0x61, 0xed, 0xf8, 0x43, 0xed, 0xf5, 0xf9, 0x40, 0x60, 0xb2, 0xb0, 0x82, 0xcb, 0xed, 0x75, 0xc7, 0x65}}},
+{{{0x80, 0xba, 0x0d, 0x09, 0x40, 0xa7, 0x39, 0xa6, 0x67, 0x34, 0x7e, 0x66, 0xbe, 0x56, 0xfb, 0x53, 0x78, 0xc4, 0x46, 0xe8, 0xed, 0x68, 0x6c, 0x7f, 0xce, 0xe8, 0x9f, 0xce, 0xa2, 0x64, 0x58, 0x53}} ,
+ {{0xe8, 0xc1, 0xa9, 0xc2, 0x7b, 0x59, 0x21, 0x33, 0xe2, 0x43, 0x73, 0x2b, 0xac, 0x2d, 0xc1, 0x89, 0x3b, 0x15, 0xe2, 0xd5, 0xc0, 0x97, 0x8a, 0xfd, 0x6f, 0x36, 0x33, 0xb7, 0xb9, 0xc3, 0x88, 0x09}}},
+{{{0xd0, 0xb6, 0x56, 0x30, 0x5c, 0xae, 0xb3, 0x75, 0x44, 0xa4, 0x83, 0x51, 0x6e, 0x01, 0x65, 0xef, 0x45, 0x76, 0xe6, 0xf5, 0xa2, 0x0d, 0xd4, 0x16, 0x3b, 0x58, 0x2f, 0xf2, 0x2f, 0x36, 0x18, 0x3f}} ,
+ {{0xfd, 0x2f, 0xe0, 0x9b, 0x1e, 0x8c, 0xc5, 0x18, 0xa9, 0xca, 0xd4, 0x2b, 0x35, 0xb6, 0x95, 0x0a, 0x9f, 0x7e, 0xfb, 0xc4, 0xef, 0x88, 0x7b, 0x23, 0x43, 0xec, 0x2f, 0x0d, 0x0f, 0x7a, 0xfc, 0x5c}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x8d, 0xd2, 0xda, 0xc7, 0x44, 0xd6, 0x7a, 0xdb, 0x26, 0x7d, 0x1d, 0xb8, 0xe1, 0xde, 0x9d, 0x7a, 0x7d, 0x17, 0x7e, 0x1c, 0x37, 0x04, 0x8d, 0x2d, 0x7c, 0x5e, 0x18, 0x38, 0x1e, 0xaf, 0xc7, 0x1b}} ,
+ {{0x33, 0x48, 0x31, 0x00, 0x59, 0xf6, 0xf2, 0xca, 0x0f, 0x27, 0x1b, 0x63, 0x12, 0x7e, 0x02, 0x1d, 0x49, 0xc0, 0x5d, 0x79, 0x87, 0xef, 0x5e, 0x7a, 0x2f, 0x1f, 0x66, 0x55, 0xd8, 0x09, 0xd9, 0x61}}},
+{{{0x54, 0x83, 0x02, 0x18, 0x82, 0x93, 0x99, 0x07, 0xd0, 0xa7, 0xda, 0xd8, 0x75, 0x89, 0xfa, 0xf2, 0xd9, 0xa3, 0xb8, 0x6b, 0x5a, 0x35, 0x28, 0xd2, 0x6b, 0x59, 0xc2, 0xf8, 0x45, 0xe2, 0xbc, 0x06}} ,
+ {{0x65, 0xc0, 0xa3, 0x88, 0x51, 0x95, 0xfc, 0x96, 0x94, 0x78, 0xe8, 0x0d, 0x8b, 0x41, 0xc9, 0xc2, 0x58, 0x48, 0x75, 0x10, 0x2f, 0xcd, 0x2a, 0xc9, 0xa0, 0x6d, 0x0f, 0xdd, 0x9c, 0x98, 0x26, 0x3d}}},
+{{{0x2f, 0x66, 0x29, 0x1b, 0x04, 0x89, 0xbd, 0x7e, 0xee, 0x6e, 0xdd, 0xb7, 0x0e, 0xef, 0xb0, 0x0c, 0xb4, 0xfc, 0x7f, 0xc2, 0xc9, 0x3a, 0x3c, 0x64, 0xef, 0x45, 0x44, 0xaf, 0x8a, 0x90, 0x65, 0x76}} ,
+ {{0xa1, 0x4c, 0x70, 0x4b, 0x0e, 0xa0, 0x83, 0x70, 0x13, 0xa4, 0xaf, 0xb8, 0x38, 0x19, 0x22, 0x65, 0x09, 0xb4, 0x02, 0x4f, 0x06, 0xf8, 0x17, 0xce, 0x46, 0x45, 0xda, 0x50, 0x7c, 0x8a, 0xd1, 0x4e}}},
+{{{0xf7, 0xd4, 0x16, 0x6c, 0x4e, 0x95, 0x9d, 0x5d, 0x0f, 0x91, 0x2b, 0x52, 0xfe, 0x5c, 0x34, 0xe5, 0x30, 0xe6, 0xa4, 0x3b, 0xf3, 0xf3, 0x34, 0x08, 0xa9, 0x4a, 0xa0, 0xb5, 0x6e, 0xb3, 0x09, 0x0a}} ,
+ {{0x26, 0xd9, 0x5e, 0xa3, 0x0f, 0xeb, 0xa2, 0xf3, 0x20, 0x3b, 0x37, 0xd4, 0xe4, 0x9e, 0xce, 0x06, 0x3d, 0x53, 0xed, 0xae, 0x2b, 0xeb, 0xb6, 0x24, 0x0a, 0x11, 0xa3, 0x0f, 0xd6, 0x7f, 0xa4, 0x3a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xdb, 0x9f, 0x2c, 0xfc, 0xd6, 0xb2, 0x1e, 0x2e, 0x52, 0x7a, 0x06, 0x87, 0x2d, 0x86, 0x72, 0x2b, 0x6d, 0x90, 0x77, 0x46, 0x43, 0xb5, 0x7a, 0xf8, 0x60, 0x7d, 0x91, 0x60, 0x5b, 0x9d, 0x9e, 0x07}} ,
+ {{0x97, 0x87, 0xc7, 0x04, 0x1c, 0x38, 0x01, 0x39, 0x58, 0xc7, 0x85, 0xa3, 0xfc, 0x64, 0x00, 0x64, 0x25, 0xa2, 0xbf, 0x50, 0x94, 0xca, 0x26, 0x31, 0x45, 0x0a, 0x24, 0xd2, 0x51, 0x29, 0x51, 0x16}}},
+{{{0x4d, 0x4a, 0xd7, 0x98, 0x71, 0x57, 0xac, 0x7d, 0x8b, 0x37, 0xbd, 0x63, 0xff, 0x87, 0xb1, 0x49, 0x95, 0x20, 0x7c, 0xcf, 0x7c, 0x59, 0xc4, 0x91, 0x9c, 0xef, 0xd0, 0xdb, 0x60, 0x09, 0x9d, 0x46}} ,
+ {{0xcb, 0x78, 0x94, 0x90, 0xe4, 0x45, 0xb3, 0xf6, 0xd9, 0xf6, 0x57, 0x74, 0xd5, 0xf8, 0x83, 0x4f, 0x39, 0xc9, 0xbd, 0x88, 0xc2, 0x57, 0x21, 0x1f, 0x24, 0x32, 0x68, 0xf8, 0xc7, 0x21, 0x5f, 0x0b}}},
+{{{0x2a, 0x36, 0x68, 0xfc, 0x5f, 0xb6, 0x4f, 0xa5, 0xe3, 0x9d, 0x24, 0x2f, 0xc0, 0x93, 0x61, 0xcf, 0xf8, 0x0a, 0xed, 0xe1, 0xdb, 0x27, 0xec, 0x0e, 0x14, 0x32, 0x5f, 0x8e, 0xa1, 0x62, 0x41, 0x16}} ,
+ {{0x95, 0x21, 0x01, 0xce, 0x95, 0x5b, 0x0e, 0x57, 0xc7, 0xb9, 0x62, 0xb5, 0x28, 0xca, 0x11, 0xec, 0xb4, 0x46, 0x06, 0x73, 0x26, 0xff, 0xfb, 0x66, 0x7d, 0xee, 0x5f, 0xb2, 0x56, 0xfd, 0x2a, 0x08}}},
+{{{0x92, 0x67, 0x77, 0x56, 0xa1, 0xff, 0xc4, 0xc5, 0x95, 0xf0, 0xe3, 0x3a, 0x0a, 0xca, 0x94, 0x4d, 0x9e, 0x7e, 0x3d, 0xb9, 0x6e, 0xb6, 0xb0, 0xce, 0xa4, 0x30, 0x89, 0x99, 0xe9, 0xad, 0x11, 0x59}} ,
+ {{0xf6, 0x48, 0x95, 0xa1, 0x6f, 0x5f, 0xb7, 0xa5, 0xbb, 0x30, 0x00, 0x1c, 0xd2, 0x8a, 0xd6, 0x25, 0x26, 0x1b, 0xb2, 0x0d, 0x37, 0x6a, 0x05, 0xf4, 0x9d, 0x3e, 0x17, 0x2a, 0x43, 0xd2, 0x3a, 0x06}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x32, 0x99, 0x93, 0xd1, 0x9a, 0x72, 0xf3, 0xa9, 0x16, 0xbd, 0xb4, 0x4c, 0xdd, 0xf9, 0xd4, 0xb2, 0x64, 0x9a, 0xd3, 0x05, 0xe4, 0xa3, 0x73, 0x1c, 0xcb, 0x7e, 0x57, 0x67, 0xff, 0x04, 0xb3, 0x10}} ,
+ {{0xb9, 0x4b, 0xa4, 0xad, 0xd0, 0x6d, 0x61, 0x23, 0xb4, 0xaf, 0x34, 0xa9, 0xaa, 0x65, 0xec, 0xd9, 0x69, 0xe3, 0x85, 0xcd, 0xcc, 0xe7, 0xb0, 0x9b, 0x41, 0xc1, 0x1c, 0xf9, 0xa0, 0xfa, 0xb7, 0x13}}},
+{{{0x04, 0xfd, 0x88, 0x3c, 0x0c, 0xd0, 0x09, 0x52, 0x51, 0x4f, 0x06, 0x19, 0xcc, 0xc3, 0xbb, 0xde, 0x80, 0xc5, 0x33, 0xbc, 0xf9, 0xf3, 0x17, 0x36, 0xdd, 0xc6, 0xde, 0xe8, 0x9b, 0x5d, 0x79, 0x1b}} ,
+ {{0x65, 0x0a, 0xbe, 0x51, 0x57, 0xad, 0x50, 0x79, 0x08, 0x71, 0x9b, 0x07, 0x95, 0x8f, 0xfb, 0xae, 0x4b, 0x38, 0xba, 0xcf, 0x53, 0x2a, 0x86, 0x1e, 0xc0, 0x50, 0x5c, 0x67, 0x1b, 0xf6, 0x87, 0x6c}}},
+{{{0x4f, 0x00, 0xb2, 0x66, 0x55, 0xed, 0x4a, 0xed, 0x8d, 0xe1, 0x66, 0x18, 0xb2, 0x14, 0x74, 0x8d, 0xfd, 0x1a, 0x36, 0x0f, 0x26, 0x5c, 0x8b, 0x89, 0xf3, 0xab, 0xf2, 0xf3, 0x24, 0x67, 0xfd, 0x70}} ,
+ {{0xfd, 0x4e, 0x2a, 0xc1, 0x3a, 0xca, 0x8f, 0x00, 0xd8, 0xec, 0x74, 0x67, 0xef, 0x61, 0xe0, 0x28, 0xd0, 0x96, 0xf4, 0x48, 0xde, 0x81, 0xe3, 0xef, 0xdc, 0xaa, 0x7d, 0xf3, 0xb6, 0x55, 0xa6, 0x65}}},
+{{{0xeb, 0xcb, 0xc5, 0x70, 0x91, 0x31, 0x10, 0x93, 0x0d, 0xc8, 0xd0, 0xef, 0x62, 0xe8, 0x6f, 0x82, 0xe3, 0x69, 0x3d, 0x91, 0x7f, 0x31, 0xe1, 0x26, 0x35, 0x3c, 0x4a, 0x2f, 0xab, 0xc4, 0x9a, 0x5e}} ,
+ {{0xab, 0x1b, 0xb5, 0xe5, 0x2b, 0xc3, 0x0e, 0x29, 0xb0, 0xd0, 0x73, 0xe6, 0x4f, 0x64, 0xf2, 0xbc, 0xe4, 0xe4, 0xe1, 0x9a, 0x52, 0x33, 0x2f, 0xbd, 0xcc, 0x03, 0xee, 0x8a, 0xfa, 0x00, 0x5f, 0x50}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xf6, 0xdb, 0x0d, 0x22, 0x3d, 0xb5, 0x14, 0x75, 0x31, 0xf0, 0x81, 0xe2, 0xb9, 0x37, 0xa2, 0xa9, 0x84, 0x11, 0x9a, 0x07, 0xb5, 0x53, 0x89, 0x78, 0xa9, 0x30, 0x27, 0xa1, 0xf1, 0x4e, 0x5c, 0x2e}} ,
+ {{0x8b, 0x00, 0x54, 0xfb, 0x4d, 0xdc, 0xcb, 0x17, 0x35, 0x40, 0xff, 0xb7, 0x8c, 0xfe, 0x4a, 0xe4, 0x4e, 0x99, 0x4e, 0xa8, 0x74, 0x54, 0x5d, 0x5c, 0x96, 0xa3, 0x12, 0x55, 0x36, 0x31, 0x17, 0x5c}}},
+{{{0xce, 0x24, 0xef, 0x7b, 0x86, 0xf2, 0x0f, 0x77, 0xe8, 0x5c, 0x7d, 0x87, 0x38, 0x2d, 0xef, 0xaf, 0xf2, 0x8c, 0x72, 0x2e, 0xeb, 0xb6, 0x55, 0x4b, 0x6e, 0xf1, 0x4e, 0x8a, 0x0e, 0x9a, 0x6c, 0x4c}} ,
+ {{0x25, 0xea, 0x86, 0xc2, 0xd1, 0x4f, 0xb7, 0x3e, 0xa8, 0x5c, 0x8d, 0x66, 0x81, 0x25, 0xed, 0xc5, 0x4c, 0x05, 0xb9, 0xd8, 0xd6, 0x70, 0xbe, 0x73, 0x82, 0xe8, 0xa1, 0xe5, 0x1e, 0x71, 0xd5, 0x26}}},
+{{{0x4e, 0x6d, 0xc3, 0xa7, 0x4f, 0x22, 0x45, 0x26, 0xa2, 0x7e, 0x16, 0xf7, 0xf7, 0x63, 0xdc, 0x86, 0x01, 0x2a, 0x71, 0x38, 0x5c, 0x33, 0xc3, 0xce, 0x30, 0xff, 0xf9, 0x2c, 0x91, 0x71, 0x8a, 0x72}} ,
+ {{0x8c, 0x44, 0x09, 0x28, 0xd5, 0x23, 0xc9, 0x8f, 0xf3, 0x84, 0x45, 0xc6, 0x9a, 0x5e, 0xff, 0xd2, 0xc7, 0x57, 0x93, 0xa3, 0xc1, 0x69, 0xdd, 0x62, 0x0f, 0xda, 0x5c, 0x30, 0x59, 0x5d, 0xe9, 0x4c}}},
+{{{0x92, 0x7e, 0x50, 0x27, 0x72, 0xd7, 0x0c, 0xd6, 0x69, 0x96, 0x81, 0x35, 0x84, 0x94, 0x35, 0x8b, 0x6c, 0xaa, 0x62, 0x86, 0x6e, 0x1c, 0x15, 0xf3, 0x6c, 0xb3, 0xff, 0x65, 0x1b, 0xa2, 0x9b, 0x59}} ,
+ {{0xe2, 0xa9, 0x65, 0x88, 0xc4, 0x50, 0xfa, 0xbb, 0x3b, 0x6e, 0x5f, 0x44, 0x01, 0xca, 0x97, 0xd4, 0xdd, 0xf6, 0xcd, 0x3f, 0x3f, 0xe5, 0x97, 0x67, 0x2b, 0x8c, 0x66, 0x0f, 0x35, 0x9b, 0xf5, 0x07}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xf1, 0x59, 0x27, 0xd8, 0xdb, 0x5a, 0x11, 0x5e, 0x82, 0xf3, 0x38, 0xff, 0x1c, 0xed, 0xfe, 0x3f, 0x64, 0x54, 0x3f, 0x7f, 0xd1, 0x81, 0xed, 0xef, 0x65, 0xc5, 0xcb, 0xfd, 0xe1, 0x80, 0xcd, 0x11}} ,
+ {{0xe0, 0xdb, 0x22, 0x28, 0xe6, 0xff, 0x61, 0x9d, 0x41, 0x14, 0x2d, 0x3b, 0x26, 0x22, 0xdf, 0xf1, 0x34, 0x81, 0xe9, 0x45, 0xee, 0x0f, 0x98, 0x8b, 0xa6, 0x3f, 0xef, 0xf7, 0x43, 0x19, 0xf1, 0x43}}},
+{{{0xee, 0xf3, 0x00, 0xa1, 0x50, 0xde, 0xc0, 0xb6, 0x01, 0xe3, 0x8c, 0x3c, 0x4d, 0x31, 0xd2, 0xb0, 0x58, 0xcd, 0xed, 0x10, 0x4a, 0x7a, 0xef, 0x80, 0xa9, 0x19, 0x32, 0xf3, 0xd8, 0x33, 0x8c, 0x06}} ,
+ {{0xcb, 0x7d, 0x4f, 0xff, 0x30, 0xd8, 0x12, 0x3b, 0x39, 0x1c, 0x06, 0xf9, 0x4c, 0x34, 0x35, 0x71, 0xb5, 0x16, 0x94, 0x67, 0xdf, 0xee, 0x11, 0xde, 0xa4, 0x1d, 0x88, 0x93, 0x35, 0xa9, 0x32, 0x10}}},
+{{{0xe9, 0xc3, 0xbc, 0x7b, 0x5c, 0xfc, 0xb2, 0xf9, 0xc9, 0x2f, 0xe5, 0xba, 0x3a, 0x0b, 0xab, 0x64, 0x38, 0x6f, 0x5b, 0x4b, 0x93, 0xda, 0x64, 0xec, 0x4d, 0x3d, 0xa0, 0xf5, 0xbb, 0xba, 0x47, 0x48}} ,
+ {{0x60, 0xbc, 0x45, 0x1f, 0x23, 0xa2, 0x3b, 0x70, 0x76, 0xe6, 0x97, 0x99, 0x4f, 0x77, 0x54, 0x67, 0x30, 0x9a, 0xe7, 0x66, 0xd6, 0xcd, 0x2e, 0x51, 0x24, 0x2c, 0x42, 0x4a, 0x11, 0xfe, 0x6f, 0x7e}}},
+{{{0x87, 0xc0, 0xb1, 0xf0, 0xa3, 0x6f, 0x0c, 0x93, 0xa9, 0x0a, 0x72, 0xef, 0x5c, 0xbe, 0x65, 0x35, 0xa7, 0x6a, 0x4e, 0x2c, 0xbf, 0x21, 0x23, 0xe8, 0x2f, 0x97, 0xc7, 0x3e, 0xc8, 0x17, 0xac, 0x1e}} ,
+ {{0x7b, 0xef, 0x21, 0xe5, 0x40, 0xcc, 0x1e, 0xdc, 0xd6, 0xbd, 0x97, 0x7a, 0x7c, 0x75, 0x86, 0x7a, 0x25, 0x5a, 0x6e, 0x7c, 0xe5, 0x51, 0x3c, 0x1b, 0x5b, 0x82, 0x9a, 0x07, 0x60, 0xa1, 0x19, 0x04}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x96, 0x88, 0xa6, 0xab, 0x8f, 0xe3, 0x3a, 0x49, 0xf8, 0xfe, 0x34, 0xe7, 0x6a, 0xb2, 0xfe, 0x40, 0x26, 0x74, 0x57, 0x4c, 0xf6, 0xd4, 0x99, 0xce, 0x5d, 0x7b, 0x2f, 0x67, 0xd6, 0x5a, 0xe4, 0x4e}} ,
+ {{0x5c, 0x82, 0xb3, 0xbd, 0x55, 0x25, 0xf6, 0x6a, 0x93, 0xa4, 0x02, 0xc6, 0x7d, 0x5c, 0xb1, 0x2b, 0x5b, 0xff, 0xfb, 0x56, 0xf8, 0x01, 0x41, 0x90, 0xc6, 0xb6, 0xac, 0x4f, 0xfe, 0xa7, 0x41, 0x70}}},
+{{{0xdb, 0xfa, 0x9b, 0x2c, 0xd4, 0x23, 0x67, 0x2c, 0x8a, 0x63, 0x6c, 0x07, 0x26, 0x48, 0x4f, 0xc2, 0x03, 0xd2, 0x53, 0x20, 0x28, 0xed, 0x65, 0x71, 0x47, 0xa9, 0x16, 0x16, 0x12, 0xbc, 0x28, 0x33}} ,
+ {{0x39, 0xc0, 0xfa, 0xfa, 0xcd, 0x33, 0x43, 0xc7, 0x97, 0x76, 0x9b, 0x93, 0x91, 0x72, 0xeb, 0xc5, 0x18, 0x67, 0x4c, 0x11, 0xf0, 0xf4, 0xe5, 0x73, 0xb2, 0x5c, 0x1b, 0xc2, 0x26, 0x3f, 0xbf, 0x2b}}},
+{{{0x86, 0xe6, 0x8c, 0x1d, 0xdf, 0xca, 0xfc, 0xd5, 0xf8, 0x3a, 0xc3, 0x44, 0x72, 0xe6, 0x78, 0x9d, 0x2b, 0x97, 0xf8, 0x28, 0x45, 0xb4, 0x20, 0xc9, 0x2a, 0x8c, 0x67, 0xaa, 0x11, 0xc5, 0x5b, 0x2f}} ,
+ {{0x17, 0x0f, 0x86, 0x52, 0xd7, 0x9d, 0xc3, 0x44, 0x51, 0x76, 0x32, 0x65, 0xb4, 0x37, 0x81, 0x99, 0x46, 0x37, 0x62, 0xed, 0xcf, 0x64, 0x9d, 0x72, 0x40, 0x7a, 0x4c, 0x0b, 0x76, 0x2a, 0xfb, 0x56}}},
+{{{0x33, 0xa7, 0x90, 0x7c, 0xc3, 0x6f, 0x17, 0xa5, 0xa0, 0x67, 0x72, 0x17, 0xea, 0x7e, 0x63, 0x14, 0x83, 0xde, 0xc1, 0x71, 0x2d, 0x41, 0x32, 0x7a, 0xf3, 0xd1, 0x2b, 0xd8, 0x2a, 0xa6, 0x46, 0x36}} ,
+ {{0xac, 0xcc, 0x6b, 0x7c, 0xf9, 0xb8, 0x8b, 0x08, 0x5c, 0xd0, 0x7d, 0x8f, 0x73, 0xea, 0x20, 0xda, 0x86, 0xca, 0x00, 0xc7, 0xad, 0x73, 0x4d, 0xe9, 0xe8, 0xa9, 0xda, 0x1f, 0x03, 0x06, 0xdd, 0x24}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x9c, 0xb2, 0x61, 0x0a, 0x98, 0x2a, 0xa5, 0xd7, 0xee, 0xa9, 0xac, 0x65, 0xcb, 0x0a, 0x1e, 0xe2, 0xbe, 0xdc, 0x85, 0x59, 0x0f, 0x9c, 0xa6, 0x57, 0x34, 0xa5, 0x87, 0xeb, 0x7b, 0x1e, 0x0c, 0x3c}} ,
+ {{0x2f, 0xbd, 0x84, 0x63, 0x0d, 0xb5, 0xa0, 0xf0, 0x4b, 0x9e, 0x93, 0xc6, 0x34, 0x9a, 0x34, 0xff, 0x73, 0x19, 0x2f, 0x6e, 0x54, 0x45, 0x2c, 0x92, 0x31, 0x76, 0x34, 0xf1, 0xb2, 0x26, 0xe8, 0x74}}},
+{{{0x0a, 0x67, 0x90, 0x6d, 0x0c, 0x4c, 0xcc, 0xc0, 0xe6, 0xbd, 0xa7, 0x5e, 0x55, 0x8c, 0xcd, 0x58, 0x9b, 0x11, 0xa2, 0xbb, 0x4b, 0xb1, 0x43, 0x04, 0x3c, 0x55, 0xed, 0x23, 0xfe, 0xcd, 0xb1, 0x53}} ,
+ {{0x05, 0xfb, 0x75, 0xf5, 0x01, 0xaf, 0x38, 0x72, 0x58, 0xfc, 0x04, 0x29, 0x34, 0x7a, 0x67, 0xa2, 0x08, 0x50, 0x6e, 0xd0, 0x2b, 0x73, 0xd5, 0xb8, 0xe4, 0x30, 0x96, 0xad, 0x45, 0xdf, 0xa6, 0x5c}}},
+{{{0x0d, 0x88, 0x1a, 0x90, 0x7e, 0xdc, 0xd8, 0xfe, 0xc1, 0x2f, 0x5d, 0x67, 0xee, 0x67, 0x2f, 0xed, 0x6f, 0x55, 0x43, 0x5f, 0x87, 0x14, 0x35, 0x42, 0xd3, 0x75, 0xae, 0xd5, 0xd3, 0x85, 0x1a, 0x76}} ,
+ {{0x87, 0xc8, 0xa0, 0x6e, 0xe1, 0xb0, 0xad, 0x6a, 0x4a, 0x34, 0x71, 0xed, 0x7c, 0xd6, 0x44, 0x03, 0x65, 0x4a, 0x5c, 0x5c, 0x04, 0xf5, 0x24, 0x3f, 0xb0, 0x16, 0x5e, 0x8c, 0xb2, 0xd2, 0xc5, 0x20}}},
+{{{0x98, 0x83, 0xc2, 0x37, 0xa0, 0x41, 0xa8, 0x48, 0x5c, 0x5f, 0xbf, 0xc8, 0xfa, 0x24, 0xe0, 0x59, 0x2c, 0xbd, 0xf6, 0x81, 0x7e, 0x88, 0xe6, 0xca, 0x04, 0xd8, 0x5d, 0x60, 0xbb, 0x74, 0xa7, 0x0b}} ,
+ {{0x21, 0x13, 0x91, 0xbf, 0x77, 0x7a, 0x33, 0xbc, 0xe9, 0x07, 0x39, 0x0a, 0xdd, 0x7d, 0x06, 0x10, 0x9a, 0xee, 0x47, 0x73, 0x1b, 0x15, 0x5a, 0xfb, 0xcd, 0x4d, 0xd0, 0xd2, 0x3a, 0x01, 0xba, 0x54}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x48, 0xd5, 0x39, 0x4a, 0x0b, 0x20, 0x6a, 0x43, 0xa0, 0x07, 0x82, 0x5e, 0x49, 0x7c, 0xc9, 0x47, 0xf1, 0x7c, 0x37, 0xb9, 0x23, 0xef, 0x6b, 0x46, 0x45, 0x8c, 0x45, 0x76, 0xdf, 0x14, 0x6b, 0x6e}} ,
+ {{0x42, 0xc9, 0xca, 0x29, 0x4c, 0x76, 0x37, 0xda, 0x8a, 0x2d, 0x7c, 0x3a, 0x58, 0xf2, 0x03, 0xb4, 0xb5, 0xb9, 0x1a, 0x13, 0x2d, 0xde, 0x5f, 0x6b, 0x9d, 0xba, 0x52, 0xc9, 0x5d, 0xb3, 0xf3, 0x30}}},
+{{{0x4c, 0x6f, 0xfe, 0x6b, 0x0c, 0x62, 0xd7, 0x48, 0x71, 0xef, 0xb1, 0x85, 0x79, 0xc0, 0xed, 0x24, 0xb1, 0x08, 0x93, 0x76, 0x8e, 0xf7, 0x38, 0x8e, 0xeb, 0xfe, 0x80, 0x40, 0xaf, 0x90, 0x64, 0x49}} ,
+ {{0x4a, 0x88, 0xda, 0xc1, 0x98, 0x44, 0x3c, 0x53, 0x4e, 0xdb, 0x4b, 0xb9, 0x12, 0x5f, 0xcd, 0x08, 0x04, 0xef, 0x75, 0xe7, 0xb1, 0x3a, 0xe5, 0x07, 0xfa, 0xca, 0x65, 0x7b, 0x72, 0x10, 0x64, 0x7f}}},
+{{{0x3d, 0x81, 0xf0, 0xeb, 0x16, 0xfd, 0x58, 0x33, 0x8d, 0x7c, 0x1a, 0xfb, 0x20, 0x2c, 0x8a, 0xee, 0x90, 0xbb, 0x33, 0x6d, 0x45, 0xe9, 0x8e, 0x99, 0x85, 0xe1, 0x08, 0x1f, 0xc5, 0xf1, 0xb5, 0x46}} ,
+ {{0xe4, 0xe7, 0x43, 0x4b, 0xa0, 0x3f, 0x2b, 0x06, 0xba, 0x17, 0xae, 0x3d, 0xe6, 0xce, 0xbd, 0xb8, 0xed, 0x74, 0x11, 0x35, 0xec, 0x96, 0xfe, 0x31, 0xe3, 0x0e, 0x7a, 0x4e, 0xc9, 0x1d, 0xcb, 0x20}}},
+{{{0xe0, 0x67, 0xe9, 0x7b, 0xdb, 0x96, 0x5c, 0xb0, 0x32, 0xd0, 0x59, 0x31, 0x90, 0xdc, 0x92, 0x97, 0xac, 0x09, 0x38, 0x31, 0x0f, 0x7e, 0xd6, 0x5d, 0xd0, 0x06, 0xb6, 0x1f, 0xea, 0xf0, 0x5b, 0x07}} ,
+ {{0x81, 0x9f, 0xc7, 0xde, 0x6b, 0x41, 0x22, 0x35, 0x14, 0x67, 0x77, 0x3e, 0x90, 0x81, 0xb0, 0xd9, 0x85, 0x4c, 0xca, 0x9b, 0x3f, 0x04, 0x59, 0xd6, 0xaa, 0x17, 0xc3, 0x88, 0x34, 0x37, 0xba, 0x43}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x4c, 0xb6, 0x69, 0xc8, 0x81, 0x95, 0x94, 0x33, 0x92, 0x34, 0xe9, 0x3c, 0x84, 0x0d, 0x3d, 0x5a, 0x37, 0x9c, 0x22, 0xa0, 0xaa, 0x65, 0xce, 0xb4, 0xc2, 0x2d, 0x66, 0x67, 0x02, 0xff, 0x74, 0x10}} ,
+ {{0x22, 0xb0, 0xd5, 0xe6, 0xc7, 0xef, 0xb1, 0xa7, 0x13, 0xda, 0x60, 0xb4, 0x80, 0xc1, 0x42, 0x7d, 0x10, 0x70, 0x97, 0x04, 0x4d, 0xda, 0x23, 0x89, 0xc2, 0x0e, 0x68, 0xcb, 0xde, 0xe0, 0x9b, 0x29}}},
+{{{0x33, 0xfe, 0x42, 0x2a, 0x36, 0x2b, 0x2e, 0x36, 0x64, 0x5c, 0x8b, 0xcc, 0x81, 0x6a, 0x15, 0x08, 0xa1, 0x27, 0xe8, 0x57, 0xe5, 0x78, 0x8e, 0xf2, 0x58, 0x19, 0x12, 0x42, 0xae, 0xc4, 0x63, 0x3e}} ,
+ {{0x78, 0x96, 0x9c, 0xa7, 0xca, 0x80, 0xae, 0x02, 0x85, 0xb1, 0x7c, 0x04, 0x5c, 0xc1, 0x5b, 0x26, 0xc1, 0xba, 0xed, 0xa5, 0x59, 0x70, 0x85, 0x8c, 0x8c, 0xe8, 0x87, 0xac, 0x6a, 0x28, 0x99, 0x35}}},
+{{{0x9f, 0x04, 0x08, 0x28, 0xbe, 0x87, 0xda, 0x80, 0x28, 0x38, 0xde, 0x9f, 0xcd, 0xe4, 0xe3, 0x62, 0xfb, 0x2e, 0x46, 0x8d, 0x01, 0xb3, 0x06, 0x51, 0xd4, 0x19, 0x3b, 0x11, 0xfa, 0xe2, 0xad, 0x1e}} ,
+ {{0xa0, 0x20, 0x99, 0x69, 0x0a, 0xae, 0xa3, 0x70, 0x4e, 0x64, 0x80, 0xb7, 0x85, 0x9c, 0x87, 0x54, 0x43, 0x43, 0x55, 0x80, 0x6d, 0x8d, 0x7c, 0xa9, 0x64, 0xca, 0x6c, 0x2e, 0x21, 0xd8, 0xc8, 0x6c}}},
+{{{0x91, 0x4a, 0x07, 0xad, 0x08, 0x75, 0xc1, 0x4f, 0xa4, 0xb2, 0xc3, 0x6f, 0x46, 0x3e, 0xb1, 0xce, 0x52, 0xab, 0x67, 0x09, 0x54, 0x48, 0x6b, 0x6c, 0xd7, 0x1d, 0x71, 0x76, 0xcb, 0xff, 0xdd, 0x31}} ,
+ {{0x36, 0x88, 0xfa, 0xfd, 0xf0, 0x36, 0x6f, 0x07, 0x74, 0x88, 0x50, 0xd0, 0x95, 0x38, 0x4a, 0x48, 0x2e, 0x07, 0x64, 0x97, 0x11, 0x76, 0x01, 0x1a, 0x27, 0x4d, 0x8e, 0x25, 0x9a, 0x9b, 0x1c, 0x22}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xbe, 0x57, 0xbd, 0x0e, 0x0f, 0xac, 0x5e, 0x76, 0xa3, 0x71, 0xad, 0x2b, 0x10, 0x45, 0x02, 0xec, 0x59, 0xd5, 0x5d, 0xa9, 0x44, 0xcc, 0x25, 0x4c, 0xb3, 0x3c, 0x5b, 0x69, 0x07, 0x55, 0x26, 0x6b}} ,
+ {{0x30, 0x6b, 0xd4, 0xa7, 0x51, 0x29, 0xe3, 0xf9, 0x7a, 0x75, 0x2a, 0x82, 0x2f, 0xd6, 0x1d, 0x99, 0x2b, 0x80, 0xd5, 0x67, 0x1e, 0x15, 0x9d, 0xca, 0xfd, 0xeb, 0xac, 0x97, 0x35, 0x09, 0x7f, 0x3f}}},
+{{{0x35, 0x0d, 0x34, 0x0a, 0xb8, 0x67, 0x56, 0x29, 0x20, 0xf3, 0x19, 0x5f, 0xe2, 0x83, 0x42, 0x73, 0x53, 0xa8, 0xc5, 0x02, 0x19, 0x33, 0xb4, 0x64, 0xbd, 0xc3, 0x87, 0x8c, 0xd7, 0x76, 0xed, 0x25}} ,
+ {{0x47, 0x39, 0x37, 0x76, 0x0d, 0x1d, 0x0c, 0xf5, 0x5a, 0x6d, 0x43, 0x88, 0x99, 0x15, 0xb4, 0x52, 0x0f, 0x2a, 0xb3, 0xb0, 0x3f, 0xa6, 0xb3, 0x26, 0xb3, 0xc7, 0x45, 0xf5, 0x92, 0x5f, 0x9b, 0x17}}},
+{{{0x9d, 0x23, 0xbd, 0x15, 0xfe, 0x52, 0x52, 0x15, 0x26, 0x79, 0x86, 0xba, 0x06, 0x56, 0x66, 0xbb, 0x8c, 0x2e, 0x10, 0x11, 0xd5, 0x4a, 0x18, 0x52, 0xda, 0x84, 0x44, 0xf0, 0x3e, 0xe9, 0x8c, 0x35}} ,
+ {{0xad, 0xa0, 0x41, 0xec, 0xc8, 0x4d, 0xb9, 0xd2, 0x6e, 0x96, 0x4e, 0x5b, 0xc5, 0xc2, 0xa0, 0x1b, 0xcf, 0x0c, 0xbf, 0x17, 0x66, 0x57, 0xc1, 0x17, 0x90, 0x45, 0x71, 0xc2, 0xe1, 0x24, 0xeb, 0x27}}},
+{{{0x2c, 0xb9, 0x42, 0xa4, 0xaf, 0x3b, 0x42, 0x0e, 0xc2, 0x0f, 0xf2, 0xea, 0x83, 0xaf, 0x9a, 0x13, 0x17, 0xb0, 0xbd, 0x89, 0x17, 0xe3, 0x72, 0xcb, 0x0e, 0x76, 0x7e, 0x41, 0x63, 0x04, 0x88, 0x71}} ,
+ {{0x75, 0x78, 0x38, 0x86, 0x57, 0xdd, 0x9f, 0xee, 0x54, 0x70, 0x65, 0xbf, 0xf1, 0x2c, 0xe0, 0x39, 0x0d, 0xe3, 0x89, 0xfd, 0x8e, 0x93, 0x4f, 0x43, 0xdc, 0xd5, 0x5b, 0xde, 0xf9, 0x98, 0xe5, 0x7b}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xe7, 0x3b, 0x65, 0x11, 0xdf, 0xb2, 0xf2, 0x63, 0x94, 0x12, 0x6f, 0x5c, 0x9e, 0x77, 0xc1, 0xb6, 0xd8, 0xab, 0x58, 0x7a, 0x1d, 0x95, 0x73, 0xdd, 0xe7, 0xe3, 0x6f, 0xf2, 0x03, 0x1d, 0xdb, 0x76}} ,
+ {{0xae, 0x06, 0x4e, 0x2c, 0x52, 0x1b, 0xbc, 0x5a, 0x5a, 0xa5, 0xbe, 0x27, 0xbd, 0xeb, 0xe1, 0x14, 0x17, 0x68, 0x26, 0x07, 0x03, 0xd1, 0x18, 0x0b, 0xdf, 0xf1, 0x06, 0x5c, 0xa6, 0x1b, 0xb9, 0x24}}},
+{{{0xc5, 0x66, 0x80, 0x13, 0x0e, 0x48, 0x8c, 0x87, 0x31, 0x84, 0xb4, 0x60, 0xed, 0xc5, 0xec, 0xb6, 0xc5, 0x05, 0x33, 0x5f, 0x2f, 0x7d, 0x40, 0xb6, 0x32, 0x1d, 0x38, 0x74, 0x1b, 0xf1, 0x09, 0x3d}} ,
+ {{0xd4, 0x69, 0x82, 0xbc, 0x8d, 0xf8, 0x34, 0x36, 0x75, 0x55, 0x18, 0x55, 0x58, 0x3c, 0x79, 0xaf, 0x26, 0x80, 0xab, 0x9b, 0x95, 0x00, 0xf1, 0xcb, 0xda, 0xc1, 0x9f, 0xf6, 0x2f, 0xa2, 0xf4, 0x45}}},
+{{{0x17, 0xbe, 0xeb, 0x85, 0xed, 0x9e, 0xcd, 0x56, 0xf5, 0x17, 0x45, 0x42, 0xb4, 0x1f, 0x44, 0x4c, 0x05, 0x74, 0x15, 0x47, 0x00, 0xc6, 0x6a, 0x3d, 0x24, 0x09, 0x0d, 0x58, 0xb1, 0x42, 0xd7, 0x04}} ,
+ {{0x8d, 0xbd, 0xa3, 0xc4, 0x06, 0x9b, 0x1f, 0x90, 0x58, 0x60, 0x74, 0xb2, 0x00, 0x3b, 0x3c, 0xd2, 0xda, 0x82, 0xbb, 0x10, 0x90, 0x69, 0x92, 0xa9, 0xb4, 0x30, 0x81, 0xe3, 0x7c, 0xa8, 0x89, 0x45}}},
+{{{0x3f, 0xdc, 0x05, 0xcb, 0x41, 0x3c, 0xc8, 0x23, 0x04, 0x2c, 0x38, 0x99, 0xe3, 0x68, 0x55, 0xf9, 0xd3, 0x32, 0xc7, 0xbf, 0xfa, 0xd4, 0x1b, 0x5d, 0xde, 0xdc, 0x10, 0x42, 0xc0, 0x42, 0xd9, 0x75}} ,
+ {{0x2d, 0xab, 0x35, 0x4e, 0x87, 0xc4, 0x65, 0x97, 0x67, 0x24, 0xa4, 0x47, 0xad, 0x3f, 0x8e, 0xf3, 0xcb, 0x31, 0x17, 0x77, 0xc5, 0xe2, 0xd7, 0x8f, 0x3c, 0xc1, 0xcd, 0x56, 0x48, 0xc1, 0x6c, 0x69}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x14, 0xae, 0x5f, 0x88, 0x7b, 0xa5, 0x90, 0xdf, 0x10, 0xb2, 0x8b, 0x5e, 0x24, 0x17, 0xc3, 0xa3, 0xd4, 0x0f, 0x92, 0x61, 0x1a, 0x19, 0x5a, 0xad, 0x76, 0xbd, 0xd8, 0x1c, 0xdd, 0xe0, 0x12, 0x6d}} ,
+ {{0x8e, 0xbd, 0x70, 0x8f, 0x02, 0xa3, 0x24, 0x4d, 0x5a, 0x67, 0xc4, 0xda, 0xf7, 0x20, 0x0f, 0x81, 0x5b, 0x7a, 0x05, 0x24, 0x67, 0x83, 0x0b, 0x2a, 0x80, 0xe7, 0xfd, 0x74, 0x4b, 0x9e, 0x5c, 0x0d}}},
+{{{0x94, 0xd5, 0x5f, 0x1f, 0xa2, 0xfb, 0xeb, 0xe1, 0x07, 0x34, 0xf8, 0x20, 0xad, 0x81, 0x30, 0x06, 0x2d, 0xa1, 0x81, 0x95, 0x36, 0xcf, 0x11, 0x0b, 0xaf, 0xc1, 0x2b, 0x9a, 0x6c, 0x55, 0xc1, 0x16}} ,
+ {{0x36, 0x4f, 0xf1, 0x5e, 0x74, 0x35, 0x13, 0x28, 0xd7, 0x11, 0xcf, 0xb8, 0xde, 0x93, 0xb3, 0x05, 0xb8, 0xb5, 0x73, 0xe9, 0xeb, 0xad, 0x19, 0x1e, 0x89, 0x0f, 0x8b, 0x15, 0xd5, 0x8c, 0xe3, 0x23}}},
+{{{0x33, 0x79, 0xe7, 0x18, 0xe6, 0x0f, 0x57, 0x93, 0x15, 0xa0, 0xa7, 0xaa, 0xc4, 0xbf, 0x4f, 0x30, 0x74, 0x95, 0x5e, 0x69, 0x4a, 0x5b, 0x45, 0xe4, 0x00, 0xeb, 0x23, 0x74, 0x4c, 0xdf, 0x6b, 0x45}} ,
+ {{0x97, 0x29, 0x6c, 0xc4, 0x42, 0x0b, 0xdd, 0xc0, 0x29, 0x5c, 0x9b, 0x34, 0x97, 0xd0, 0xc7, 0x79, 0x80, 0x63, 0x74, 0xe4, 0x8e, 0x37, 0xb0, 0x2b, 0x7c, 0xe8, 0x68, 0x6c, 0xc3, 0x82, 0x97, 0x57}}},
+{{{0x22, 0xbe, 0x83, 0xb6, 0x4b, 0x80, 0x6b, 0x43, 0x24, 0x5e, 0xef, 0x99, 0x9b, 0xa8, 0xfc, 0x25, 0x8d, 0x3b, 0x03, 0x94, 0x2b, 0x3e, 0xe7, 0x95, 0x76, 0x9b, 0xcc, 0x15, 0xdb, 0x32, 0xe6, 0x66}} ,
+ {{0x84, 0xf0, 0x4a, 0x13, 0xa6, 0xd6, 0xfa, 0x93, 0x46, 0x07, 0xf6, 0x7e, 0x5c, 0x6d, 0x5e, 0xf6, 0xa6, 0xe7, 0x48, 0xf0, 0x06, 0xea, 0xff, 0x90, 0xc1, 0xcc, 0x4c, 0x19, 0x9c, 0x3c, 0x4e, 0x53}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x2a, 0x50, 0xe3, 0x07, 0x15, 0x59, 0xf2, 0x8b, 0x81, 0xf2, 0xf3, 0xd3, 0x6c, 0x99, 0x8c, 0x70, 0x67, 0xec, 0xcc, 0xee, 0x9e, 0x59, 0x45, 0x59, 0x7d, 0x47, 0x75, 0x69, 0xf5, 0x24, 0x93, 0x5d}} ,
+ {{0x6a, 0x4f, 0x1b, 0xbe, 0x6b, 0x30, 0xcf, 0x75, 0x46, 0xe3, 0x7b, 0x9d, 0xfc, 0xcd, 0xd8, 0x5c, 0x1f, 0xb4, 0xc8, 0xe2, 0x24, 0xec, 0x1a, 0x28, 0x05, 0x32, 0x57, 0xfd, 0x3c, 0x5a, 0x98, 0x10}}},
+{{{0xa3, 0xdb, 0xf7, 0x30, 0xd8, 0xc2, 0x9a, 0xe1, 0xd3, 0xce, 0x22, 0xe5, 0x80, 0x1e, 0xd9, 0xe4, 0x1f, 0xab, 0xc0, 0x71, 0x1a, 0x86, 0x0e, 0x27, 0x99, 0x5b, 0xfa, 0x76, 0x99, 0xb0, 0x08, 0x3c}} ,
+ {{0x2a, 0x93, 0xd2, 0x85, 0x1b, 0x6a, 0x5d, 0xa6, 0xee, 0xd1, 0xd1, 0x33, 0xbd, 0x6a, 0x36, 0x73, 0x37, 0x3a, 0x44, 0xb4, 0xec, 0xa9, 0x7a, 0xde, 0x83, 0x40, 0xd7, 0xdf, 0x28, 0xba, 0xa2, 0x30}}},
+{{{0xd3, 0xb5, 0x6d, 0x05, 0x3f, 0x9f, 0xf3, 0x15, 0x8d, 0x7c, 0xca, 0xc9, 0xfc, 0x8a, 0x7c, 0x94, 0xb0, 0x63, 0x36, 0x9b, 0x78, 0xd1, 0x91, 0x1f, 0x93, 0xd8, 0x57, 0x43, 0xde, 0x76, 0xa3, 0x43}} ,
+ {{0x9b, 0x35, 0xe2, 0xa9, 0x3d, 0x32, 0x1e, 0xbb, 0x16, 0x28, 0x70, 0xe9, 0x45, 0x2f, 0x8f, 0x70, 0x7f, 0x08, 0x7e, 0x53, 0xc4, 0x7a, 0xbf, 0xf7, 0xe1, 0xa4, 0x6a, 0xd8, 0xac, 0x64, 0x1b, 0x11}}},
+{{{0xb2, 0xeb, 0x47, 0x46, 0x18, 0x3e, 0x1f, 0x99, 0x0c, 0xcc, 0xf1, 0x2c, 0xe0, 0xe7, 0x8f, 0xe0, 0x01, 0x7e, 0x65, 0xb8, 0x0c, 0xd0, 0xfb, 0xc8, 0xb9, 0x90, 0x98, 0x33, 0x61, 0x3b, 0xd8, 0x27}} ,
+ {{0xa0, 0xbe, 0x72, 0x3a, 0x50, 0x4b, 0x74, 0xab, 0x01, 0xc8, 0x93, 0xc5, 0xe4, 0xc7, 0x08, 0x6c, 0xb4, 0xca, 0xee, 0xeb, 0x8e, 0xd7, 0x4e, 0x26, 0xc6, 0x1d, 0xe2, 0x71, 0xaf, 0x89, 0xa0, 0x2a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x98, 0x0b, 0xe4, 0xde, 0xdb, 0xa8, 0xfa, 0x82, 0x74, 0x06, 0x52, 0x6d, 0x08, 0x52, 0x8a, 0xff, 0x62, 0xc5, 0x6a, 0x44, 0x0f, 0x51, 0x8c, 0x1f, 0x6e, 0xb6, 0xc6, 0x2c, 0x81, 0xd3, 0x76, 0x46}} ,
+ {{0xf4, 0x29, 0x74, 0x2e, 0x80, 0xa7, 0x1a, 0x8f, 0xf6, 0xbd, 0xd6, 0x8e, 0xbf, 0xc1, 0x95, 0x2a, 0xeb, 0xa0, 0x7f, 0x45, 0xa0, 0x50, 0x14, 0x05, 0xb1, 0x57, 0x4c, 0x74, 0xb7, 0xe2, 0x89, 0x7d}}},
+{{{0x07, 0xee, 0xa7, 0xad, 0xb7, 0x09, 0x0b, 0x49, 0x4e, 0xbf, 0xca, 0xe5, 0x21, 0xe6, 0xe6, 0xaf, 0xd5, 0x67, 0xf3, 0xce, 0x7e, 0x7c, 0x93, 0x7b, 0x5a, 0x10, 0x12, 0x0e, 0x6c, 0x06, 0x11, 0x75}} ,
+ {{0xd5, 0xfc, 0x86, 0xa3, 0x3b, 0xa3, 0x3e, 0x0a, 0xfb, 0x0b, 0xf7, 0x36, 0xb1, 0x5b, 0xda, 0x70, 0xb7, 0x00, 0xa7, 0xda, 0x88, 0x8f, 0x84, 0xa8, 0xbc, 0x1c, 0x39, 0xb8, 0x65, 0xf3, 0x4d, 0x60}}},
+{{{0x96, 0x9d, 0x31, 0xf4, 0xa2, 0xbe, 0x81, 0xb9, 0xa5, 0x59, 0x9e, 0xba, 0x07, 0xbe, 0x74, 0x58, 0xd8, 0xeb, 0xc5, 0x9f, 0x3d, 0xd1, 0xf4, 0xae, 0xce, 0x53, 0xdf, 0x4f, 0xc7, 0x2a, 0x89, 0x4d}} ,
+ {{0x29, 0xd8, 0xf2, 0xaa, 0xe9, 0x0e, 0xf7, 0x2e, 0x5f, 0x9d, 0x8a, 0x5b, 0x09, 0xed, 0xc9, 0x24, 0x22, 0xf4, 0x0f, 0x25, 0x8f, 0x1c, 0x84, 0x6e, 0x34, 0x14, 0x6c, 0xea, 0xb3, 0x86, 0x5d, 0x04}}},
+{{{0x07, 0x98, 0x61, 0xe8, 0x6a, 0xd2, 0x81, 0x49, 0x25, 0xd5, 0x5b, 0x18, 0xc7, 0x35, 0x52, 0x51, 0xa4, 0x46, 0xad, 0x18, 0x0d, 0xc9, 0x5f, 0x18, 0x91, 0x3b, 0xb4, 0xc0, 0x60, 0x59, 0x8d, 0x66}} ,
+ {{0x03, 0x1b, 0x79, 0x53, 0x6e, 0x24, 0xae, 0x57, 0xd9, 0x58, 0x09, 0x85, 0x48, 0xa2, 0xd3, 0xb5, 0xe2, 0x4d, 0x11, 0x82, 0xe6, 0x86, 0x3c, 0xe9, 0xb1, 0x00, 0x19, 0xc2, 0x57, 0xf7, 0x66, 0x7a}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x0f, 0xe3, 0x89, 0x03, 0xd7, 0x22, 0x95, 0x9f, 0xca, 0xb4, 0x8d, 0x9e, 0x6d, 0x97, 0xff, 0x8d, 0x21, 0x59, 0x07, 0xef, 0x03, 0x2d, 0x5e, 0xf8, 0x44, 0x46, 0xe7, 0x85, 0x80, 0xc5, 0x89, 0x50}} ,
+ {{0x8b, 0xd8, 0x53, 0x86, 0x24, 0x86, 0x29, 0x52, 0x01, 0xfa, 0x20, 0xc3, 0x4e, 0x95, 0xcb, 0xad, 0x7b, 0x34, 0x94, 0x30, 0xb7, 0x7a, 0xfa, 0x96, 0x41, 0x60, 0x2b, 0xcb, 0x59, 0xb9, 0xca, 0x50}}},
+{{{0xc2, 0x5b, 0x9b, 0x78, 0x23, 0x1b, 0x3a, 0x88, 0x94, 0x5f, 0x0a, 0x9b, 0x98, 0x2b, 0x6e, 0x53, 0x11, 0xf6, 0xff, 0xc6, 0x7d, 0x42, 0xcc, 0x02, 0x80, 0x40, 0x0d, 0x1e, 0xfb, 0xaf, 0x61, 0x07}} ,
+ {{0xb0, 0xe6, 0x2f, 0x81, 0x70, 0xa1, 0x2e, 0x39, 0x04, 0x7c, 0xc4, 0x2c, 0x87, 0x45, 0x4a, 0x5b, 0x69, 0x97, 0xac, 0x6d, 0x2c, 0x10, 0x42, 0x7c, 0x3b, 0x15, 0x70, 0x60, 0x0e, 0x11, 0x6d, 0x3a}}},
+{{{0x9b, 0x18, 0x80, 0x5e, 0xdb, 0x05, 0xbd, 0xc6, 0xb7, 0x3c, 0xc2, 0x40, 0x4d, 0x5d, 0xce, 0x97, 0x8a, 0x34, 0x15, 0xab, 0x28, 0x5d, 0x10, 0xf0, 0x37, 0x0c, 0xcc, 0x16, 0xfa, 0x1f, 0x33, 0x0d}} ,
+ {{0x19, 0xf9, 0x35, 0xaa, 0x59, 0x1a, 0x0c, 0x5c, 0x06, 0xfc, 0x6a, 0x0b, 0x97, 0x53, 0x36, 0xfc, 0x2a, 0xa5, 0x5a, 0x9b, 0x30, 0xef, 0x23, 0xaf, 0x39, 0x5d, 0x9a, 0x6b, 0x75, 0x57, 0x48, 0x0b}}},
+{{{0x26, 0xdc, 0x76, 0x3b, 0xfc, 0xf9, 0x9c, 0x3f, 0x89, 0x0b, 0x62, 0x53, 0xaf, 0x83, 0x01, 0x2e, 0xbc, 0x6a, 0xc6, 0x03, 0x0d, 0x75, 0x2a, 0x0d, 0xe6, 0x94, 0x54, 0xcf, 0xb3, 0xe5, 0x96, 0x25}} ,
+ {{0xfe, 0x82, 0xb1, 0x74, 0x31, 0x8a, 0xa7, 0x6f, 0x56, 0xbd, 0x8d, 0xf4, 0xe0, 0x94, 0x51, 0x59, 0xde, 0x2c, 0x5a, 0xf4, 0x84, 0x6b, 0x4a, 0x88, 0x93, 0xc0, 0x0c, 0x9a, 0xac, 0xa7, 0xa0, 0x68}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x25, 0x0d, 0xd6, 0xc7, 0x23, 0x47, 0x10, 0xad, 0xc7, 0x08, 0x5c, 0x87, 0x87, 0x93, 0x98, 0x18, 0xb8, 0xd3, 0x9c, 0xac, 0x5a, 0x3d, 0xc5, 0x75, 0xf8, 0x49, 0x32, 0x14, 0xcc, 0x51, 0x96, 0x24}} ,
+ {{0x65, 0x9c, 0x5d, 0xf0, 0x37, 0x04, 0xf0, 0x34, 0x69, 0x2a, 0xf0, 0xa5, 0x64, 0xca, 0xde, 0x2b, 0x5b, 0x15, 0x10, 0xd2, 0xab, 0x06, 0xdd, 0xc4, 0xb0, 0xb6, 0x5b, 0xc1, 0x17, 0xdf, 0x8f, 0x02}}},
+{{{0xbd, 0x59, 0x3d, 0xbf, 0x5c, 0x31, 0x44, 0x2c, 0x32, 0x94, 0x04, 0x60, 0x84, 0x0f, 0xad, 0x00, 0xb6, 0x8f, 0xc9, 0x1d, 0xcc, 0x5c, 0xa2, 0x49, 0x0e, 0x50, 0x91, 0x08, 0x9a, 0x43, 0x55, 0x05}} ,
+ {{0x5d, 0x93, 0x55, 0xdf, 0x9b, 0x12, 0x19, 0xec, 0x93, 0x85, 0x42, 0x9e, 0x66, 0x0f, 0x9d, 0xaf, 0x99, 0xaf, 0x26, 0x89, 0xbc, 0x61, 0xfd, 0xff, 0xce, 0x4b, 0xf4, 0x33, 0x95, 0xc9, 0x35, 0x58}}},
+{{{0x12, 0x55, 0xf9, 0xda, 0xcb, 0x44, 0xa7, 0xdc, 0x57, 0xe2, 0xf9, 0x9a, 0xe6, 0x07, 0x23, 0x60, 0x54, 0xa7, 0x39, 0xa5, 0x9b, 0x84, 0x56, 0x6e, 0xaa, 0x8b, 0x8f, 0xb0, 0x2c, 0x87, 0xaf, 0x67}} ,
+ {{0x00, 0xa9, 0x4c, 0xb2, 0x12, 0xf8, 0x32, 0xa8, 0x7a, 0x00, 0x4b, 0x49, 0x32, 0xba, 0x1f, 0x5d, 0x44, 0x8e, 0x44, 0x7a, 0xdc, 0x11, 0xfb, 0x39, 0x08, 0x57, 0x87, 0xa5, 0x12, 0x42, 0x93, 0x0e}}},
+{{{0x17, 0xb4, 0xae, 0x72, 0x59, 0xd0, 0xaa, 0xa8, 0x16, 0x8b, 0x63, 0x11, 0xb3, 0x43, 0x04, 0xda, 0x0c, 0xa8, 0xb7, 0x68, 0xdd, 0x4e, 0x54, 0xe7, 0xaf, 0x5d, 0x5d, 0x05, 0x76, 0x36, 0xec, 0x0d}} ,
+ {{0x6d, 0x7c, 0x82, 0x32, 0x38, 0x55, 0x57, 0x74, 0x5b, 0x7d, 0xc3, 0xc4, 0xfb, 0x06, 0x29, 0xf0, 0x13, 0x55, 0x54, 0xc6, 0xa7, 0xdc, 0x4c, 0x9f, 0x98, 0x49, 0x20, 0xa8, 0xc3, 0x8d, 0xfa, 0x48}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x87, 0x47, 0x9d, 0xe9, 0x25, 0xd5, 0xe3, 0x47, 0x78, 0xdf, 0x85, 0xa7, 0x85, 0x5e, 0x7a, 0x4c, 0x5f, 0x79, 0x1a, 0xf3, 0xa2, 0xb2, 0x28, 0xa0, 0x9c, 0xdd, 0x30, 0x40, 0xd4, 0x38, 0xbd, 0x28}} ,
+ {{0xfc, 0xbb, 0xd5, 0x78, 0x6d, 0x1d, 0xd4, 0x99, 0xb4, 0xaa, 0x44, 0x44, 0x7a, 0x1b, 0xd8, 0xfe, 0xb4, 0x99, 0xb9, 0xcc, 0xe7, 0xc4, 0xd3, 0x3a, 0x73, 0x83, 0x41, 0x5c, 0x40, 0xd7, 0x2d, 0x55}}},
+{{{0x26, 0xe1, 0x7b, 0x5f, 0xe5, 0xdc, 0x3f, 0x7d, 0xa1, 0xa7, 0x26, 0x44, 0x22, 0x23, 0xc0, 0x8f, 0x7d, 0xf1, 0xb5, 0x11, 0x47, 0x7b, 0x19, 0xd4, 0x75, 0x6f, 0x1e, 0xa5, 0x27, 0xfe, 0xc8, 0x0e}} ,
+ {{0xd3, 0x11, 0x3d, 0xab, 0xef, 0x2c, 0xed, 0xb1, 0x3d, 0x7c, 0x32, 0x81, 0x6b, 0xfe, 0xf8, 0x1c, 0x3c, 0x7b, 0xc0, 0x61, 0xdf, 0xb8, 0x75, 0x76, 0x7f, 0xaa, 0xd8, 0x93, 0xaf, 0x3d, 0xe8, 0x3d}}},
+{{{0xfd, 0x5b, 0x4e, 0x8d, 0xb6, 0x7e, 0x82, 0x9b, 0xef, 0xce, 0x04, 0x69, 0x51, 0x52, 0xff, 0xef, 0xa0, 0x52, 0xb5, 0x79, 0x17, 0x5e, 0x2f, 0xde, 0xd6, 0x3c, 0x2d, 0xa0, 0x43, 0xb4, 0x0b, 0x19}} ,
+ {{0xc0, 0x61, 0x48, 0x48, 0x17, 0xf4, 0x9e, 0x18, 0x51, 0x2d, 0xea, 0x2f, 0xf2, 0xf2, 0xe0, 0xa3, 0x14, 0xb7, 0x8b, 0x3a, 0x30, 0xf5, 0x81, 0xc1, 0x5d, 0x71, 0x39, 0x62, 0x55, 0x1f, 0x60, 0x5a}}},
+{{{0xe5, 0x89, 0x8a, 0x76, 0x6c, 0xdb, 0x4d, 0x0a, 0x5b, 0x72, 0x9d, 0x59, 0x6e, 0x63, 0x63, 0x18, 0x7c, 0xe3, 0xfa, 0xe2, 0xdb, 0xa1, 0x8d, 0xf4, 0xa5, 0xd7, 0x16, 0xb2, 0xd0, 0xb3, 0x3f, 0x39}} ,
+ {{0xce, 0x60, 0x09, 0x6c, 0xf5, 0x76, 0x17, 0x24, 0x80, 0x3a, 0x96, 0xc7, 0x94, 0x2e, 0xf7, 0x6b, 0xef, 0xb5, 0x05, 0x96, 0xef, 0xd3, 0x7b, 0x51, 0xda, 0x05, 0x44, 0x67, 0xbc, 0x07, 0x21, 0x4e}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xe9, 0x73, 0x6f, 0x21, 0xb9, 0xde, 0x22, 0x7d, 0xeb, 0x97, 0x31, 0x10, 0xa3, 0xea, 0xe1, 0xc6, 0x37, 0xeb, 0x8f, 0x43, 0x58, 0xde, 0x41, 0x64, 0x0e, 0x3e, 0x07, 0x99, 0x3d, 0xf1, 0xdf, 0x1e}} ,
+ {{0xf8, 0xad, 0x43, 0xc2, 0x17, 0x06, 0xe2, 0xe4, 0xa9, 0x86, 0xcd, 0x18, 0xd7, 0x78, 0xc8, 0x74, 0x66, 0xd2, 0x09, 0x18, 0xa5, 0xf1, 0xca, 0xa6, 0x62, 0x92, 0xc1, 0xcb, 0x00, 0xeb, 0x42, 0x2e}}},
+{{{0x7b, 0x34, 0x24, 0x4c, 0xcf, 0x38, 0xe5, 0x6c, 0x0a, 0x01, 0x2c, 0x22, 0x0b, 0x24, 0x38, 0xad, 0x24, 0x7e, 0x19, 0xf0, 0x6c, 0xf9, 0x31, 0xf4, 0x35, 0x11, 0xf6, 0x46, 0x33, 0x3a, 0x23, 0x59}} ,
+ {{0x20, 0x0b, 0xa1, 0x08, 0x19, 0xad, 0x39, 0x54, 0xea, 0x3e, 0x23, 0x09, 0xb6, 0xe2, 0xd2, 0xbc, 0x4d, 0xfc, 0x9c, 0xf0, 0x13, 0x16, 0x22, 0x3f, 0xb9, 0xd2, 0x11, 0x86, 0x90, 0x55, 0xce, 0x3c}}},
+{{{0xc4, 0x0b, 0x4b, 0x62, 0x99, 0x37, 0x84, 0x3f, 0x74, 0xa2, 0xf9, 0xce, 0xe2, 0x0b, 0x0f, 0x2a, 0x3d, 0xa3, 0xe3, 0xdb, 0x5a, 0x9d, 0x93, 0xcc, 0xa5, 0xef, 0x82, 0x91, 0x1d, 0xe6, 0x6c, 0x68}} ,
+ {{0xa3, 0x64, 0x17, 0x9b, 0x8b, 0xc8, 0x3a, 0x61, 0xe6, 0x9d, 0xc6, 0xed, 0x7b, 0x03, 0x52, 0x26, 0x9d, 0x3a, 0xb3, 0x13, 0xcc, 0x8a, 0xfd, 0x2c, 0x1a, 0x1d, 0xed, 0x13, 0xd0, 0x55, 0x57, 0x0e}}},
+{{{0x1a, 0xea, 0xbf, 0xfd, 0x4a, 0x3c, 0x8e, 0xec, 0x29, 0x7e, 0x77, 0x77, 0x12, 0x99, 0xd7, 0x84, 0xf9, 0x55, 0x7f, 0xf1, 0x8b, 0xb4, 0xd2, 0x95, 0xa3, 0x8d, 0xf0, 0x8a, 0xa7, 0xeb, 0x82, 0x4b}} ,
+ {{0x2c, 0x28, 0xf4, 0x3a, 0xf6, 0xde, 0x0a, 0xe0, 0x41, 0x44, 0x23, 0xf8, 0x3f, 0x03, 0x64, 0x9f, 0xc3, 0x55, 0x4c, 0xc6, 0xc1, 0x94, 0x1c, 0x24, 0x5d, 0x5f, 0x92, 0x45, 0x96, 0x57, 0x37, 0x14}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xc1, 0xcd, 0x90, 0x66, 0xb9, 0x76, 0xa0, 0x5b, 0xa5, 0x85, 0x75, 0x23, 0xf9, 0x89, 0xa5, 0x82, 0xb2, 0x6f, 0xb1, 0xeb, 0xc4, 0x69, 0x6f, 0x18, 0x5a, 0xed, 0x94, 0x3d, 0x9d, 0xd9, 0x2c, 0x1a}} ,
+ {{0x35, 0xb0, 0xe6, 0x73, 0x06, 0xb7, 0x37, 0xe0, 0xf8, 0xb0, 0x22, 0xe8, 0xd2, 0xed, 0x0b, 0xef, 0xe6, 0xc6, 0x5a, 0x99, 0x9e, 0x1a, 0x9f, 0x04, 0x97, 0xe4, 0x4d, 0x0b, 0xbe, 0xba, 0x44, 0x40}}},
+{{{0xc1, 0x56, 0x96, 0x91, 0x5f, 0x1f, 0xbb, 0x54, 0x6f, 0x88, 0x89, 0x0a, 0xb2, 0xd6, 0x41, 0x42, 0x6a, 0x82, 0xee, 0x14, 0xaa, 0x76, 0x30, 0x65, 0x0f, 0x67, 0x39, 0xa6, 0x51, 0x7c, 0x49, 0x24}} ,
+ {{0x35, 0xa3, 0x78, 0xd1, 0x11, 0x0f, 0x75, 0xd3, 0x70, 0x46, 0xdb, 0x20, 0x51, 0xcb, 0x92, 0x80, 0x54, 0x10, 0x74, 0x36, 0x86, 0xa9, 0xd7, 0xa3, 0x08, 0x78, 0xf1, 0x01, 0x29, 0xf8, 0x80, 0x3b}}},
+{{{0xdb, 0xa7, 0x9d, 0x9d, 0xbf, 0xa0, 0xcc, 0xed, 0x53, 0xa2, 0xa2, 0x19, 0x39, 0x48, 0x83, 0x19, 0x37, 0x58, 0xd1, 0x04, 0x28, 0x40, 0xf7, 0x8a, 0xc2, 0x08, 0xb7, 0xa5, 0x42, 0xcf, 0x53, 0x4c}} ,
+ {{0xa7, 0xbb, 0xf6, 0x8e, 0xad, 0xdd, 0xf7, 0x90, 0xdd, 0x5f, 0x93, 0x89, 0xae, 0x04, 0x37, 0xe6, 0x9a, 0xb7, 0xe8, 0xc0, 0xdf, 0x16, 0x2a, 0xbf, 0xc4, 0x3a, 0x3c, 0x41, 0xd5, 0x89, 0x72, 0x5a}}},
+{{{0x1f, 0x96, 0xff, 0x34, 0x2c, 0x13, 0x21, 0xcb, 0x0a, 0x89, 0x85, 0xbe, 0xb3, 0x70, 0x9e, 0x1e, 0xde, 0x97, 0xaf, 0x96, 0x30, 0xf7, 0x48, 0x89, 0x40, 0x8d, 0x07, 0xf1, 0x25, 0xf0, 0x30, 0x58}} ,
+ {{0x1e, 0xd4, 0x93, 0x57, 0xe2, 0x17, 0xe7, 0x9d, 0xab, 0x3c, 0x55, 0x03, 0x82, 0x2f, 0x2b, 0xdb, 0x56, 0x1e, 0x30, 0x2e, 0x24, 0x47, 0x6e, 0xe6, 0xff, 0x33, 0x24, 0x2c, 0x75, 0x51, 0xd4, 0x67}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0x2b, 0x06, 0xd9, 0xa1, 0x5d, 0xe1, 0xf4, 0xd1, 0x1e, 0x3c, 0x9a, 0xc6, 0x29, 0x2b, 0x13, 0x13, 0x78, 0xc0, 0xd8, 0x16, 0x17, 0x2d, 0x9e, 0xa9, 0xc9, 0x79, 0x57, 0xab, 0x24, 0x91, 0x92, 0x19}} ,
+ {{0x69, 0xfb, 0xa1, 0x9c, 0xa6, 0x75, 0x49, 0x7d, 0x60, 0x73, 0x40, 0x42, 0xc4, 0x13, 0x0a, 0x95, 0x79, 0x1e, 0x04, 0x83, 0x94, 0x99, 0x9b, 0x1e, 0x0c, 0xe8, 0x1f, 0x54, 0xef, 0xcb, 0xc0, 0x52}}},
+{{{0x14, 0x89, 0x73, 0xa1, 0x37, 0x87, 0x6a, 0x7a, 0xcf, 0x1d, 0xd9, 0x2e, 0x1a, 0x67, 0xed, 0x74, 0xc0, 0xf0, 0x9c, 0x33, 0xdd, 0xdf, 0x08, 0xbf, 0x7b, 0xd1, 0x66, 0xda, 0xe6, 0xc9, 0x49, 0x08}} ,
+ {{0xe9, 0xdd, 0x5e, 0x55, 0xb0, 0x0a, 0xde, 0x21, 0x4c, 0x5a, 0x2e, 0xd4, 0x80, 0x3a, 0x57, 0x92, 0x7a, 0xf1, 0xc4, 0x2c, 0x40, 0xaf, 0x2f, 0xc9, 0x92, 0x03, 0xe5, 0x5a, 0xbc, 0xdc, 0xf4, 0x09}}},
+{{{0xf3, 0xe1, 0x2b, 0x7c, 0x05, 0x86, 0x80, 0x93, 0x4a, 0xad, 0xb4, 0x8f, 0x7e, 0x99, 0x0c, 0xfd, 0xcd, 0xef, 0xd1, 0xff, 0x2c, 0x69, 0x34, 0x13, 0x41, 0x64, 0xcf, 0x3b, 0xd0, 0x90, 0x09, 0x1e}} ,
+ {{0x9d, 0x45, 0xd6, 0x80, 0xe6, 0x45, 0xaa, 0xf4, 0x15, 0xaa, 0x5c, 0x34, 0x87, 0x99, 0xa2, 0x8c, 0x26, 0x84, 0x62, 0x7d, 0xb6, 0x29, 0xc0, 0x52, 0xea, 0xf5, 0x81, 0x18, 0x0f, 0x35, 0xa9, 0x0e}}},
+{{{0xe7, 0x20, 0x72, 0x7c, 0x6d, 0x94, 0x5f, 0x52, 0x44, 0x54, 0xe3, 0xf1, 0xb2, 0xb0, 0x36, 0x46, 0x0f, 0xae, 0x92, 0xe8, 0x70, 0x9d, 0x6e, 0x79, 0xb1, 0xad, 0x37, 0xa9, 0x5f, 0xc0, 0xde, 0x03}} ,
+ {{0x15, 0x55, 0x37, 0xc6, 0x1c, 0x27, 0x1c, 0x6d, 0x14, 0x4f, 0xca, 0xa4, 0xc4, 0x88, 0x25, 0x46, 0x39, 0xfc, 0x5a, 0xe5, 0xfe, 0x29, 0x11, 0x69, 0xf5, 0x72, 0x84, 0x4d, 0x78, 0x9f, 0x94, 0x15}}},
+{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, 
+ {{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+{{{0xec, 0xd3, 0xff, 0x57, 0x0b, 0xb0, 0xb2, 0xdc, 0xf8, 0x4f, 0xe2, 0x12, 0xd5, 0x36, 0xbe, 0x6b, 0x09, 0x43, 0x6d, 0xa3, 0x4d, 0x90, 0x2d, 0xb8, 0x74, 0xe8, 0x71, 0x45, 0x19, 0x8b, 0x0c, 0x6a}} ,
+ {{0xb8, 0x42, 0x1c, 0x03, 0xad, 0x2c, 0x03, 0x8e, 0xac, 0xd7, 0x98, 0x29, 0x13, 0xc6, 0x02, 0x29, 0xb5, 0xd4, 0xe7, 0xcf, 0xcc, 0x8b, 0x83, 0xec, 0x35, 0xc7, 0x9c, 0x74, 0xb7, 0xad, 0x85, 0x5f}}},
+{{{0x78, 0x84, 0xe1, 0x56, 0x45, 0x69, 0x68, 0x5a, 0x4f, 0xb8, 0xb1, 0x29, 0xff, 0x33, 0x03, 0x31, 0xb7, 0xcb, 0x96, 0x25, 0xe6, 0xe6, 0x41, 0x98, 0x1a, 0xbb, 0x03, 0x56, 0xf2, 0xb2, 0x91, 0x34}} ,
+ {{0x2c, 0x6c, 0xf7, 0x66, 0xa4, 0x62, 0x6b, 0x39, 0xb3, 0xba, 0x65, 0xd3, 0x1c, 0xf8, 0x11, 0xaa, 0xbe, 0xdc, 0x80, 0x59, 0x87, 0xf5, 0x7b, 0xe5, 0xe3, 0xb3, 0x3e, 0x39, 0xda, 0xbe, 0x88, 0x09}}},
+{{{0x8b, 0xf1, 0xa0, 0xf5, 0xdc, 0x29, 0xb4, 0xe2, 0x07, 0xc6, 0x7a, 0x00, 0xd0, 0x89, 0x17, 0x51, 0xd4, 0xbb, 0xd4, 0x22, 0xea, 0x7e, 0x7d, 0x7c, 0x24, 0xea, 0xf2, 0xe8, 0x22, 0x12, 0x95, 0x06}} ,
+ {{0xda, 0x7c, 0xa4, 0x0c, 0xf4, 0xba, 0x6e, 0xe1, 0x89, 0xb5, 0x59, 0xca, 0xf1, 0xc0, 0x29, 0x36, 0x09, 0x44, 0xe2, 0x7f, 0xd1, 0x63, 0x15, 0x99, 0xea, 0x25, 0xcf, 0x0c, 0x9d, 0xc0, 0x44, 0x6f}}},
+{{{0x1d, 0x86, 0x4e, 0xcf, 0xf7, 0x37, 0x10, 0x25, 0x8f, 0x12, 0xfb, 0x19, 0xfb, 0xe0, 0xed, 0x10, 0xc8, 0xe2, 0xf5, 0x75, 0xb1, 0x33, 0xc0, 0x96, 0x0d, 0xfb, 0x15, 0x6c, 0x0d, 0x07, 0x5f, 0x05}} ,
+ {{0x69, 0x3e, 0x47, 0x97, 0x2c, 0xaf, 0x52, 0x7c, 0x78, 0x83, 0xad, 0x1b, 0x39, 0x82, 0x2f, 0x02, 0x6f, 0x47, 0xdb, 0x2a, 0xb0, 0xe1, 0x91, 0x99, 0x55, 0xb8, 0x99, 0x3a, 0xa0, 0x44, 0x11, 0x51}}}
+};
+
+static inline void p1p1_to_p2(ge25519_p2 *r, const ge25519_p1p1 *p)
+{
+  fe25519_mul(&r->x, &p->x, &p->t);
+  fe25519_mul(&r->y, &p->y, &p->z);
+  fe25519_mul(&r->z, &p->z, &p->t);
+}
+
+static inline void p1p1_to_p2_2(ge25519_p3 *r, const ge25519_p1p1 *p)
+{
+  fe25519_mul(&r->x, &p->x, &p->t);
+  fe25519_mul(&r->y, &p->y, &p->z);
+  fe25519_mul(&r->z, &p->z, &p->t);
+}
+
+static inline void p1p1_to_p3(ge25519_p3 *r, const ge25519_p1p1 *p)
+{
+  p1p1_to_p2_2(r, p);
+  fe25519_mul(&r->t, &p->x, &p->y);
+}
+
+static void ge25519_mixadd2(ge25519_p3 *r, const ge25519_aff *q)
+{
+  fe25519 a,b,t1,t2,c,d,e,f,g,h,qt;
+  fe25519_mul(&qt, &q->x, &q->y);
+  fe25519_sub(&a, &r->y, &r->x); /* A = (Y1-X1)*(Y2-X2) */
+  fe25519_add(&b, &r->y, &r->x); /* B = (Y1+X1)*(Y2+X2) */
+  fe25519_sub(&t1, &q->y, &q->x);
+  fe25519_add(&t2, &q->y, &q->x);
+  fe25519_mul(&a, &a, &t1);
+  fe25519_mul(&b, &b, &t2);
+  fe25519_sub(&e, &b, &a); /* E = B-A */
+  fe25519_add(&h, &b, &a); /* H = B+A */
+  fe25519_mul(&c, &r->t, &qt); /* C = T1*k*T2 */
+  fe25519_mul(&c, &c, &ge25519_ec2d);
+  fe25519_add(&d, &r->z, &r->z); /* D = Z1*2 */
+  fe25519_sub(&f, &d, &c); /* F = D-C */
+  fe25519_add(&g, &d, &c); /* G = D+C */
+  fe25519_mul(&r->x, &e, &f);
+  fe25519_mul(&r->y, &h, &g);
+  fe25519_mul(&r->z, &g, &f);
+  fe25519_mul(&r->t, &e, &h);
+}
+
+static void add_p1p1(ge25519_p1p1 *r, const ge25519_p3 *p, const ge25519_p3 *q)
+{
+  fe25519 a, b, c, d, t;
+  
+  fe25519_sub(&a, &p->y, &p->x); /* A = (Y1-X1)*(Y2-X2) */
+  fe25519_sub(&t, &q->y, &q->x);
+  fe25519_mul(&a, &a, &t);
+  fe25519_add(&b, &p->x, &p->y); /* B = (Y1+X1)*(Y2+X2) */
+  fe25519_add(&t, &q->x, &q->y);
+  fe25519_mul(&b, &b, &t);
+  fe25519_mul(&c, &p->t, &q->t); /* C = T1*k*T2 */
+  fe25519_mul(&c, &c, &ge25519_ec2d);
+  fe25519_mul(&d, &p->z, &q->z); /* D = Z1*2*Z2 */
+  fe25519_add(&d, &d, &d);
+  fe25519_sub(&r->x, &b, &a); /* E = B-A */
+  fe25519_sub(&r->t, &d, &c); /* F = D-C */
+  fe25519_add(&r->z, &d, &c); /* G = D+C */
+  fe25519_add(&r->y, &b, &a); /* H = B+A */
+}
+
+/* See http://www.hyperelliptic.org/EFD/g1p/auto-twisted-extended-1.html#doubling-dbl-2008-hwcd */
+static void dbl_p1p1(ge25519_p1p1 *r, const ge25519_p2 *p)
+{
+  fe25519 a,b,c,d;
+  fe25519_square(&a, &p->x);
+  fe25519_square(&b, &p->y);
+  fe25519_square(&c, &p->z);
+  fe25519_add(&c, &c, &c);
+  fe25519_neg(&d, &a);
+
+  fe25519_add(&r->x, &p->x, &p->y);
+  fe25519_square(&r->x, &r->x);
+  fe25519_sub(&r->x, &r->x, &a);
+  fe25519_sub(&r->x, &r->x, &b);
+  fe25519_add(&r->z, &d, &b);
+  fe25519_sub(&r->t, &r->z, &c);
+  fe25519_sub(&r->y, &d, &b);
+}
+
+/* Constant-time version of: if(b) r = p */
+static inline void cmov_aff(ge25519_aff *r, const ge25519_aff *p, unsigned char b)
+{
+  fe25519_cmov(&r->x, &p->x, b);
+  fe25519_cmov(&r->y, &p->y, b);
+}
+
+static inline unsigned char equal(signed char b,signed char c)
+{
+  unsigned char ub = b;
+  unsigned char uc = c;
+  unsigned char x = ub ^ uc; /* 0: yes; 1..255: no */
+  crypto_uint32 y = x; /* 0: yes; 1..255: no */
+  y -= 1; /* 4294967295: yes; 0..254: no */
+  y >>= 31; /* 1: yes; 0: no */
+  return (unsigned char)y;
+}
+
+static inline unsigned char negative(signed char b)
+{
+  unsigned long long x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */
+  x >>= 63; /* 1: yes; 0: no */
+  return (unsigned char)x;
+}
+
+static inline void choose_t(ge25519_aff *t, unsigned long long pos, signed char b)
+{
+  /* constant time */
+  fe25519 v;
+  *t = ge25519_base_multiples_affine[5*pos+0];
+  cmov_aff(t, &ge25519_base_multiples_affine[5*pos+1],equal(b,1) | equal(b,-1));
+  cmov_aff(t, &ge25519_base_multiples_affine[5*pos+2],equal(b,2) | equal(b,-2));
+  cmov_aff(t, &ge25519_base_multiples_affine[5*pos+3],equal(b,3) | equal(b,-3));
+  cmov_aff(t, &ge25519_base_multiples_affine[5*pos+4],equal(b,-4));
+  fe25519_neg(&v, &t->x);
+  fe25519_cmov(&t->x, &v, negative(b));
+}
+
+static inline void setneutral(ge25519 *r)
+{
+  fe25519_setzero(&r->x);
+  fe25519_setone(&r->y);
+  fe25519_setone(&r->z);
+  fe25519_setzero(&r->t);
+}
+
+/* return 0 on success, -1 otherwise */
+static int ge25519_unpackneg_vartime(ge25519_p3 *r, const unsigned char p[32])
+{
+  unsigned char par;
+  fe25519 t, chk, num, den, den2, den4, den6;
+  fe25519_setone(&r->z);
+  par = p[31] >> 7;
+  fe25519_unpack(&r->y, p); 
+  fe25519_square(&num, &r->y); /* x = y^2 */
+  fe25519_mul(&den, &num, &ge25519_ecd); /* den = dy^2 */
+  fe25519_sub(&num, &num, &r->z); /* x = y^2-1 */
+  fe25519_add(&den, &r->z, &den); /* den = dy^2+1 */
+
+  /* Computation of sqrt(num/den) */
+  /* 1.: computation of num^((p-5)/8)*den^((7p-35)/8) = (num*den^7)^((p-5)/8) */
+  fe25519_square(&den2, &den);
+  fe25519_square(&den4, &den2);
+  fe25519_mul(&den6, &den4, &den2);
+  fe25519_mul(&t, &den6, &num);
+  fe25519_mul(&t, &t, &den);
+
+  fe25519_pow2523(&t, &t);
+  /* 2. computation of r->x = t * num * den^3 */
+  fe25519_mul(&t, &t, &num);
+  fe25519_mul(&t, &t, &den);
+  fe25519_mul(&t, &t, &den);
+  fe25519_mul(&r->x, &t, &den);
+
+  /* 3. Check whether sqrt computation gave correct result, multiply by sqrt(-1) if not: */
+  fe25519_square(&chk, &r->x);
+  fe25519_mul(&chk, &chk, &den);
+  if (!fe25519_iseq_vartime(&chk, &num))
+    fe25519_mul(&r->x, &r->x, &ge25519_sqrtm1);
+
+  /* 4. Now we have one of the two square roots, except if input was not a square */
+  fe25519_square(&chk, &r->x);
+  fe25519_mul(&chk, &chk, &den);
+  if (!fe25519_iseq_vartime(&chk, &num))
+    return -1;
+
+  /* 5. Choose the desired square root according to parity: */
+  if(fe25519_getparity(&r->x) != (1-par))
+    fe25519_neg(&r->x, &r->x);
+
+  fe25519_mul(&r->t, &r->x, &r->y);
+  return 0;
+}
+
+static inline void ge25519_pack(unsigned char r[32], const ge25519_p3 *p)
+{
+  fe25519 tx, ty, zi;
+  fe25519_invert(&zi, &p->z); 
+  fe25519_mul(&tx, &p->x, &zi);
+  fe25519_mul(&ty, &p->y, &zi);
+  fe25519_pack(r, &ty);
+  r[31] ^= fe25519_getparity(&tx) << 7;
+}
+
+#if 0
+static int ge25519_isneutral_vartime(const ge25519_p3 *p)
+{
+  int ret = 1;
+  if(!fe25519_iszero(&p->x)) ret = 0;
+  if(!fe25519_iseq_vartime(&p->y, &p->z)) ret = 0;
+  return ret;
+}
+#endif
+
+/* computes [s1]p1 + [s2]p2 */
+static void ge25519_double_scalarmult_vartime(ge25519_p3 *r, const ge25519_p3 *p1, const sc25519 *s1, const ge25519_p3 *p2, const sc25519 *s2)
+{
+  ge25519_p1p1 tp1p1;
+  ge25519_p3 pre[16];
+  char *pre5 = (char *)(&(pre[5])); // eliminate type punning warning
+  unsigned char b[127];
+  int i;
+
+  /* precomputation                                                        s2 s1 */
+  setneutral(pre);                                                      /* 00 00 */
+  pre[1] = *p1;                                                         /* 00 01 */
+  dbl_p1p1(&tp1p1,(ge25519_p2 *)p1);      p1p1_to_p3( &pre[2], &tp1p1); /* 00 10 */
+  add_p1p1(&tp1p1,&pre[1], &pre[2]);      p1p1_to_p3( &pre[3], &tp1p1); /* 00 11 */
+  pre[4] = *p2;                                                         /* 01 00 */
+  add_p1p1(&tp1p1,&pre[1], &pre[4]);      p1p1_to_p3( &pre[5], &tp1p1); /* 01 01 */
+  add_p1p1(&tp1p1,&pre[2], &pre[4]);      p1p1_to_p3( &pre[6], &tp1p1); /* 01 10 */
+  add_p1p1(&tp1p1,&pre[3], &pre[4]);      p1p1_to_p3( &pre[7], &tp1p1); /* 01 11 */
+  dbl_p1p1(&tp1p1,(ge25519_p2 *)p2);      p1p1_to_p3( &pre[8], &tp1p1); /* 10 00 */
+  add_p1p1(&tp1p1,&pre[1], &pre[8]);      p1p1_to_p3( &pre[9], &tp1p1); /* 10 01 */
+  dbl_p1p1(&tp1p1,(ge25519_p2 *)pre5);    p1p1_to_p3(&pre[10], &tp1p1); /* 10 10 */
+  add_p1p1(&tp1p1,&pre[3], &pre[8]);      p1p1_to_p3(&pre[11], &tp1p1); /* 10 11 */
+  add_p1p1(&tp1p1,&pre[4], &pre[8]);      p1p1_to_p3(&pre[12], &tp1p1); /* 11 00 */
+  add_p1p1(&tp1p1,&pre[1],&pre[12]);      p1p1_to_p3(&pre[13], &tp1p1); /* 11 01 */
+  add_p1p1(&tp1p1,&pre[2],&pre[12]);      p1p1_to_p3(&pre[14], &tp1p1); /* 11 10 */
+  add_p1p1(&tp1p1,&pre[3],&pre[12]);      p1p1_to_p3(&pre[15], &tp1p1); /* 11 11 */
+
+  sc25519_2interleave2(b,s1,s2);
+
+  /* scalar multiplication */
+  *r = pre[b[126]];
+  for(i=125;i>=0;i--)
+  {
+    dbl_p1p1(&tp1p1, (ge25519_p2 *)r);
+    p1p1_to_p2((ge25519_p2 *) r, &tp1p1);
+    dbl_p1p1(&tp1p1, (ge25519_p2 *)r);
+    if(b[i]!=0)
+    {
+      p1p1_to_p3(r, &tp1p1);
+      add_p1p1(&tp1p1, r, &pre[b[i]]);
+    }
+    if(i != 0) p1p1_to_p2((ge25519_p2 *)r, &tp1p1);
+    else p1p1_to_p3(r, &tp1p1);
+  }
+}
+
+static inline void ge25519_scalarmult_base(ge25519_p3 *r, const sc25519 *s)
+{
+  signed char b[85];
+  int i;
+  ge25519_aff t;
+  sc25519_window3(b,s);
+
+  choose_t((ge25519_aff *)r, 0, b[0]);
+  fe25519_setone(&r->z);
+  fe25519_mul(&r->t, &r->x, &r->y);
+  for(i=1;i<85;i++)
+  {
+    choose_t(&t, (unsigned long long) i, b[i]);
+    ge25519_mixadd2(r, &t);
+  }
+}
+
+static inline void get_hram(unsigned char *hram, const unsigned char *sm, const unsigned char *pk, unsigned char *playground, unsigned long long smlen)
+{
+  unsigned long long i;
+
+  for (i =  0;i < 32;++i)    playground[i] = sm[i];
+  for (i = 32;i < 64;++i)    playground[i] = pk[i-32];
+  for (i = 64;i < smlen;++i) playground[i] = sm[i];
+
+  //crypto_hash_sha512(hram,playground,smlen);
+  SHA512::hash(hram,playground,(unsigned int)smlen);
+}
+
+// This is the original sign and verify code -- the versions in sign() and
+// verify() below the fold are slightly modified in terms of how they behave
+// in relation to the message, but the algorithms are the same.
+
+#if 0
+int crypto_sign_keypair(
+    unsigned char *pk,
+    unsigned char *sk
+    )
+{
+  sc25519 scsk;
+  ge25519 gepk;
+  unsigned char extsk[64];
+  int i;
+
+  randombytes(sk, 32);
+  crypto_hash_sha512(extsk, sk, 32);
+  extsk[0] &= 248;
+  extsk[31] &= 127;
+  extsk[31] |= 64;
+
+  sc25519_from32bytes(&scsk,extsk);
+  
+  ge25519_scalarmult_base(&gepk, &scsk);
+  ge25519_pack(pk, &gepk);
+  for(i=0;i<32;i++)
+    sk[32 + i] = pk[i];
+  return 0;
+}
+
+static int crypto_sign(
+    unsigned char *sm,unsigned long long *smlen,
+    const unsigned char *m,unsigned long long mlen,
+    const unsigned char *sk
+    )
+{
+  sc25519 sck, scs, scsk;
+  ge25519 ger;
+  unsigned char r[32];
+  unsigned char s[32];
+  unsigned char extsk[64];
+  unsigned long long i;
+  unsigned char hmg[crypto_hash_sha512_BYTES];
+  unsigned char hram[crypto_hash_sha512_BYTES];
+
+  crypto_hash_sha512(extsk, sk, 32);
+  extsk[0] &= 248;
+  extsk[31] &= 127;
+  extsk[31] |= 64;
+
+  *smlen = mlen+64;
+  for(i=0;i<mlen;i++)
+    sm[64 + i] = m[i];
+  for(i=0;i<32;i++)
+    sm[32 + i] = extsk[32+i];
+
+  crypto_hash_sha512(hmg, sm+32, mlen+32); /* Generate k as h(extsk[32],...,extsk[63],m) */
+
+  /* Computation of R */
+  sc25519_from64bytes(&sck, hmg);
+  ge25519_scalarmult_base(&ger, &sck);
+  ge25519_pack(r, &ger);
+  
+  /* Computation of s */
+  for(i=0;i<32;i++)
+    sm[i] = r[i];
+
+  get_hram(hram, sm, sk+32, sm, mlen+64);
+
+  sc25519_from64bytes(&scs, hram);
+  sc25519_from32bytes(&scsk, extsk);
+  sc25519_mul(&scs, &scs, &scsk);
+  
+  sc25519_add(&scs, &scs, &sck);
+
+  sc25519_to32bytes(s,&scs); /* cat s */
+  for(i=0;i<32;i++)
+    sm[32 + i] = s[i]; 
+
+  return 0;
+}
+
+static int crypto_sign_open(
+    unsigned char *m,unsigned long long *mlen,
+    const unsigned char *sm,unsigned long long smlen,
+    const unsigned char *pk
+    )
+{
+  int i, ret;
+  unsigned char t2[32];
+  ge25519 get1, get2;
+  sc25519 schram, scs;
+  unsigned char hram[crypto_hash_sha512_BYTES];
+
+  *mlen = (unsigned long long) -1;
+  if (smlen < 64) return -1;
+
+  if (ge25519_unpackneg_vartime(&get1, pk)) return -1;
+
+  get_hram(hram,sm,pk,m,smlen);
+
+  sc25519_from64bytes(&schram, hram);
+
+  sc25519_from32bytes(&scs, sm+32);
+
+  ge25519_double_scalarmult_vartime(&get2, &get1, &schram, &ge25519_base, &scs);
+  ge25519_pack(t2, &get2);
+
+  ret = crypto_verify_32(sm, t2);
+
+  if (!ret)
+  {
+    for(i=0;i<smlen-64;i++)
+      m[i] = sm[i + 64];
+    *mlen = smlen-64;
+  }
+  else
+  {
+    for(i=0;i<smlen-64;i++)
+      m[i] = 0;
+  }
+  return ret;
+}
+#endif // 0
+
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
+void C25519::agree(const C25519::Private &mine,const C25519::Public &their,void *keybuf,unsigned int keylen)
+  throw()
+{
+	unsigned char rawkey[32];
+	unsigned char digest[64];
+
+	crypto_scalarmult(rawkey,mine.data,their.data);
+	SHA512::hash(digest,rawkey,32);
+	for(unsigned int i=0,k=0;i<keylen;) {
+		if (k == 64) {
+			k = 0;
+			SHA512::hash(digest,digest,64);
+		}
+		((unsigned char *)keybuf)[i++] = digest[k++];
+	}
+}
+
+void C25519::sign(const C25519::Private &myPrivate,const C25519::Public &myPublic,const void *msg,unsigned int len,void *signature)
+  throw()
+{
+  sc25519 sck, scs, scsk;
+  ge25519 ger;
+  unsigned char r[32];
+  unsigned char s[32];
+  unsigned char extsk[64];
+  unsigned char hmg[crypto_hash_sha512_BYTES];
+  unsigned char hram[crypto_hash_sha512_BYTES];
+  unsigned char *sig = (unsigned char *)signature;
+  unsigned char digest[64]; // we sign the first 32 bytes of SHA-512(msg)
+
+  SHA512::hash(digest,msg,len);
+
+  SHA512::hash(extsk,myPrivate.data + 32,32);
+  extsk[0] &= 248;
+  extsk[31] &= 127;
+  extsk[31] |= 64;
+
+  for(unsigned int i=0;i<32;i++)
+    sig[32 + i] = extsk[32 + i];
+  for(unsigned int i=0;i<32;i++)
+    sig[64 + i] = digest[i];
+
+  SHA512::hash(hmg,sig + 32,64);
+  //crypto_hash_sha512(hmg, sm+32, mlen+32); /* Generate k as h(extsk[32],...,extsk[63],m) */
+
+  /* Computation of R */
+  sc25519_from64bytes(&sck, hmg);
+  ge25519_scalarmult_base(&ger, &sck);
+  ge25519_pack(r, &ger);
+  
+  /* Computation of s */
+  for(unsigned int i=0;i<32;i++)
+    sig[i] = r[i];
+
+  get_hram(hram,sig,myPublic.data + 32,sig,96);
+
+  sc25519_from64bytes(&scs, hram);
+  sc25519_from32bytes(&scsk, extsk);
+  sc25519_mul(&scs, &scs, &scsk);
+  
+  sc25519_add(&scs, &scs, &sck);
+
+  sc25519_to32bytes(s,&scs); /* cat s */
+  for(unsigned int i=0;i<32;i++)
+    sig[32 + i] = s[i]; 
+}
+
+bool C25519::verify(const C25519::Public &their,const void *msg,unsigned int len,const void *signature)
+  throw()
+{
+  unsigned char t2[32];
+  ge25519 get1, get2;
+  sc25519 schram, scs;
+  unsigned char hram[crypto_hash_sha512_BYTES];
+  unsigned char m[96];
+  unsigned char digest[64]; // we sign the first 32 bytes of SHA-512(msg)
+  const unsigned char *sig = (const unsigned char *)signature;
+
+  // First check the message's integrity
+  SHA512::hash(digest,msg,len);
+  if (!Utils::secureEq(sig + 64,digest,32))
+    return false;
+
+  if (ge25519_unpackneg_vartime(&get1,their.data + 32))
+    return false;
+
+  get_hram(hram,sig,their.data + 32,m,96);
+
+  sc25519_from64bytes(&schram, hram);
+
+  sc25519_from32bytes(&scs, sig+32);
+
+  ge25519_double_scalarmult_vartime(&get2, &get1, &schram, &ge25519_base, &scs);
+  ge25519_pack(t2, &get2);
+
+  return Utils::secureEq(sig,t2,32);
+}
+
+void C25519::_calcPubDH(C25519::Pair &kp)
+  throw()
+{
+  // First 32 bytes of pub and priv are the keys for ECDH key
+  // agreement. This generates the public portion from the private.
+  crypto_scalarmult_base(kp.pub.data,kp.priv.data);
+}
+
+void C25519::_calcPubED(C25519::Pair &kp)
+  throw()
+{
+  unsigned char extsk[64];
+  sc25519 scsk;
+  ge25519 gepk;
+
+  // Second 32 bytes of pub and priv are the keys for ed25519
+  // signing and verification.
+  SHA512::hash(extsk,kp.priv.data + 32,32);
+  extsk[0] &= 248;
+  extsk[31] &= 127;
+  extsk[31] |= 64;
+  sc25519_from32bytes(&scsk,extsk);
+  ge25519_scalarmult_base(&gepk,&scsk);
+  ge25519_pack(kp.pub.data + 32,&gepk);
+  // In NaCl, the public key is crammed into the next 32 bytes
+  // of the private key for signing since both keys are required
+  // to sign. In this version we just get it from kp.pub, so we
+  // leave that out of private.
+}
+
+} // namespace ZeroTier
diff --git a/node/C25519.hpp b/node/C25519.hpp
new file mode 100644
index 000000000..b19d96937
--- /dev/null
+++ b/node/C25519.hpp
@@ -0,0 +1,213 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_C25519_HPP
+#define ZT_C25519_HPP
+
+#include "Array.hpp"
+#include "Utils.hpp"
+
+namespace ZeroTier {
+
+#define ZT_C25519_PUBLIC_KEY_LEN 64
+#define ZT_C25519_PRIVATE_KEY_LEN 64
+#define ZT_C25519_SIGNATURE_LEN 96
+
+/**
+ * A combined Curve25519 ECDH and Ed25519 signature engine
+ */
+class C25519
+{
+public:
+	/**
+	 * Public key (both crypto and signing)
+	 */
+	typedef Array<unsigned char,ZT_C25519_PUBLIC_KEY_LEN> Public; // crypto key, signing key (both 32 bytes)
+
+	/**
+	 * Private key (both crypto and signing)
+	 */
+	typedef Array<unsigned char,ZT_C25519_PRIVATE_KEY_LEN> Private; // crypto key, signing key (both 32 bytes)
+
+	/**
+	 * Message signature
+	 */
+	typedef Array<unsigned char,ZT_C25519_SIGNATURE_LEN> Signature;
+
+	/**
+	 * Public/private key pair
+	 */
+	typedef struct {
+		Public pub;
+		Private priv;
+	} Pair;
+
+	/**
+	 * Generate a C25519 elliptic curve key pair
+	 */
+	static inline Pair generate()
+		throw()
+	{
+		Pair kp;
+		Utils::getSecureRandom(kp.priv.data,(unsigned int)kp.priv.size());
+		_calcPubDH(kp);
+		_calcPubED(kp);
+		return kp;
+	}
+
+	/**
+	 * Generate a key pair satisfying a condition
+	 *
+	 * This begins with a random keypair from a random secret key and then
+	 * iteratively increments the random secret until cond(kp) returns true.
+	 * This is used to compute key pairs in which the public key, its hash
+	 * or some other aspect of it satisfies some condition, such as for a
+	 * hashcash criteria.
+	 *
+	 * @param cond Condition function or function object
+	 * @return Key pair where cond(kp) returns true
+	 * @tparam F Type of 'cond'
+	 */
+	template<typename F>
+	static inline Pair generateSatisfying(F cond)
+		throw()
+	{
+		Pair kp;
+		void *const priv = (void *)kp.priv.data;
+		Utils::getSecureRandom(priv,(unsigned int)kp.priv.size());
+		_calcPubED(kp); // do Ed25519 key -- bytes 32-63 of pub and priv
+		do {
+			++(((uint64_t *)priv)[1]);
+			--(((uint64_t *)priv)[2]);
+			_calcPubDH(kp); // keep regenerating bytes 0-31 until satisfied
+		} while (!cond(kp));
+		return kp;
+	}
+
+	/**
+	 * Perform C25519 ECC key agreement
+	 *
+	 * Actual key bytes are generated from one or more SHA-512 digests of
+	 * the raw result of key agreement.
+	 *
+	 * @param mine My private key
+	 * @param their Their public key
+	 * @param keybuf Buffer to fill
+	 * @param keylen Number of key bytes to generate
+	 */
+	static void agree(const Private &mine,const Public &their,void *keybuf,unsigned int keylen)
+		throw();
+	static inline void agree(const Pair &mine,const Public &their,void *keybuf,unsigned int keylen)
+		throw()
+	{
+		agree(mine.priv,their,keybuf,keylen);
+	}
+
+	/**
+	 * Sign a message with a sender's key pair
+	 *
+	 * This takes the SHA-521 of msg[] and then signs the first 32 bytes of this
+	 * digest, returning it and the 64-byte ed25519 signature in signature[].
+	 * This results in a signature that verifies both the signer's authenticity
+	 * and the integrity of the message.
+	 *
+	 * This is based on the original ed25519 code from NaCl and the SUPERCOP
+	 * cipher benchmark suite, but with the modification that it always
+	 * produces a signature of fixed 96-byte length based on the hash of an
+	 * arbitrary-length message.
+	 *
+	 * @param myPrivate My private key
+	 * @param myPublic My public key
+	 * @param msg Message to sign
+	 * @param len Length of message in bytes
+	 * @param signature Buffer to fill with signature -- MUST be 96 bytes in length
+	 */
+	static void sign(const Private &myPrivate,const Public &myPublic,const void *msg,unsigned int len,void *signature)
+		throw();
+	static inline void sign(const Pair &mine,const void *msg,unsigned int len,void *signature)
+		throw()
+	{
+		sign(mine.priv,mine.pub,msg,len,signature);
+	}
+
+	/**
+	 * Sign a message with a sender's key pair
+	 *
+	 * @param myPrivate My private key
+	 * @param myPublic My public key
+	 * @param msg Message to sign
+	 * @param len Length of message in bytes
+	 * @return Signature
+	 */
+	static inline Signature sign(const Private &myPrivate,const Public &myPublic,const void *msg,unsigned int len)
+		throw()
+	{
+		Signature sig;
+		sign(myPrivate,myPublic,msg,len,sig.data);
+		return sig;
+	}
+	static inline Signature sign(const Pair &mine,const void *msg,unsigned int len)
+		throw()
+	{
+		Signature sig;
+		sign(mine.priv,mine.pub,msg,len,sig.data);
+		return sig;
+	}
+
+	/**
+	 * Verify a message's signature
+	 *
+	 * @param their Public key to verify against
+	 * @param msg Message to verify signature integrity against
+	 * @param len Length of message in bytes
+	 * @param signature 96-byte signature
+	 * @return True if signature is valid and the message is authentic and unmodified
+	 */
+	static bool verify(const Public &their,const void *msg,unsigned int len,const void *signature)
+		throw();
+
+	/**
+	 * Verify a message's signature
+	 *
+	 * @param their Public key to verify against
+	 * @param msg Message to verify signature integrity against
+	 * @param len Length of message in bytes
+	 * @param signature 96-byte signature
+	 * @return True if signature is valid and the message is authentic and unmodified
+	 */
+	static inline bool verify(const Public &their,const void *msg,unsigned int len,const Signature &signature)
+		throw()
+	{
+		return verify(their,msg,len,signature.data);
+	}
+
+private:
+	// derive first 32 bytes of kp.pub from first 32 bytes of kp.priv
+	// this is the ECDH key
+	static void _calcPubDH(Pair &kp)
+		throw();
+
+	// derive 2nd 32 bytes of kp.pub from 2nd 32 bytes of kp.priv
+	// this is the Ed25519 sign/verify key
+	static void _calcPubED(Pair &kp)
+		throw();
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/node/Capability.cpp b/node/Capability.cpp
deleted file mode 100644
index b7ee3f9f7..000000000
--- a/node/Capability.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "Capability.hpp"
-
-#include "Identity.hpp"
-#include "Network.hpp"
-#include "Node.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
-
-namespace ZeroTier {
-
-int Capability::verify(const RuntimeEnvironment* RR, void* tPtr) const
-{
-	try {
-		// There must be at least one entry, and sanity check for bad chain max length
-		if ((_maxCustodyChainLength < 1) || (_maxCustodyChainLength > ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH)) {
-			return -1;
-		}
-
-		// Validate all entries in chain of custody
-		Buffer<(sizeof(Capability) * 2)> tmp;
-		this->serialize(tmp, true);
-		for (unsigned int c = 0; c < _maxCustodyChainLength; ++c) {
-			if (c == 0) {
-				if ((! _custody[c].to) || (! _custody[c].from) || (_custody[c].from != Network::controllerFor(_nwid))) {
-					return -1;	 // the first entry must be present and from the network's controller
-				}
-			}
-			else {
-				if (! _custody[c].to) {
-					return 0;	// all previous entries were valid, so we are valid
-				}
-				else if ((! _custody[c].from) || (_custody[c].from != _custody[c - 1].to)) {
-					return -1;	 // otherwise if we have another entry it must be from the previous holder in the chain
-				}
-			}
-
-			const Identity id(RR->topology->getIdentity(tPtr, _custody[c].from));
-			if (id) {
-				if (! id.verify(tmp.data(), tmp.size(), _custody[c].signature)) {
-					return -1;
-				}
-			}
-			else {
-				RR->sw->requestWhois(tPtr, RR->node->now(), _custody[c].from);
-				return 1;
-			}
-		}
-
-		// We reached max custody chain length and everything was valid
-		return 0;
-	}
-	catch (...) {
-	}
-	return -1;
-}
-
-}	// namespace ZeroTier
diff --git a/node/Capability.hpp b/node/Capability.hpp
deleted file mode 100644
index b22380c5d..000000000
--- a/node/Capability.hpp
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_CAPABILITY_HPP
-#define ZT_CAPABILITY_HPP
-
-#include "../include/ZeroTierOne.h"
-#include "Address.hpp"
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "Credential.hpp"
-#include "ECC.hpp"
-#include "Identity.hpp"
-#include "Utils.hpp"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-namespace ZeroTier {
-
-class RuntimeEnvironment;
-
-/**
- * A set of grouped and signed network flow rules
- *
- * On the sending side the sender does the following for each packet:
- *
- * (1) Evaluates its capabilities in ascending order of ID to determine
- *     which capability allows it to transmit this packet.
- * (2) If it has not done so lately, it then sends this capability to the
- *     receiving peer ("presents" it).
- * (3) The sender then sends the packet.
- *
- * On the receiving side the receiver evaluates the capabilities presented
- * by the sender. If any valid un-expired capability allows this packet it
- * is accepted.
- *
- * Note that this is after evaluation of network scope rules and only if
- * network scope rules do not deliver an explicit match.
- *
- * Capabilities support a chain of custody. This is currently unused but
- * in the future would allow the publication of capabilities that can be
- * handed off between nodes. Limited transferability of capabilities is
- * a feature of true capability based security.
- */
-class Capability : public Credential {
-  public:
-	static inline Credential::Type credentialType()
-	{
-		return Credential::CREDENTIAL_TYPE_CAPABILITY;
-	}
-
-	Capability() : _nwid(0), _ts(0), _id(0), _maxCustodyChainLength(0), _ruleCount(0)
-	{
-		memset(_rules, 0, sizeof(_rules));
-		memset(_custody, 0, sizeof(_custody));
-	}
-
-	/**
-	 * @param id Capability ID
-	 * @param nwid Network ID
-	 * @param ts Timestamp (at controller)
-	 * @param mccl Maximum custody chain length (1 to create non-transferable capability)
-	 * @param rules Network flow rules for this capability
-	 * @param ruleCount Number of flow rules
-	 */
-	Capability(uint32_t id, uint64_t nwid, int64_t ts, unsigned int mccl, const ZT_VirtualNetworkRule* rules, unsigned int ruleCount)
-		: _nwid(nwid)
-		, _ts(ts)
-		, _id(id)
-		, _maxCustodyChainLength((mccl > 0) ? ((mccl < ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH) ? mccl : (unsigned int)ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH) : 1)
-		, _ruleCount((ruleCount < ZT_MAX_CAPABILITY_RULES) ? ruleCount : ZT_MAX_CAPABILITY_RULES)
-	{
-		if (_ruleCount > 0) {
-			memcpy(_rules, rules, sizeof(ZT_VirtualNetworkRule) * _ruleCount);
-		}
-	}
-
-	/**
-	 * @return Rules -- see ruleCount() for size of array
-	 */
-	inline const ZT_VirtualNetworkRule* rules() const
-	{
-		return _rules;
-	}
-
-	/**
-	 * @return Number of rules in rules()
-	 */
-	inline unsigned int ruleCount() const
-	{
-		return _ruleCount;
-	}
-
-	/**
-	 * @return ID and evaluation order of this capability in network
-	 */
-	inline uint32_t id() const
-	{
-		return _id;
-	}
-
-	/**
-	 * @return Network ID for which this capability was issued
-	 */
-	inline uint64_t networkId() const
-	{
-		return _nwid;
-	}
-
-	/**
-	 * @return Timestamp
-	 */
-	inline int64_t timestamp() const
-	{
-		return _ts;
-	}
-
-	/**
-	 * @return Last 'to' address in chain of custody
-	 */
-	inline Address issuedTo() const
-	{
-		Address i2;
-		for (unsigned int i = 0; i < ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH; ++i) {
-			if (! _custody[i].to) {
-				return i2;
-			}
-			else {
-				i2 = _custody[i].to;
-			}
-		}
-		return i2;
-	}
-
-	/**
-	 * Sign this capability and add signature to its chain of custody
-	 *
-	 * If this returns false, this object should be considered to be
-	 * in an undefined state and should be discarded. False can be returned
-	 * if there is no more room for signatures (max chain length reached)
-	 * or if the 'from' identity does not include a secret key to allow
-	 * it to sign anything.
-	 *
-	 * @param from Signing identity (must have secret)
-	 * @param to Recipient of this signature
-	 * @return True if signature successful and chain of custody appended
-	 */
-	inline bool sign(const Identity& from, const Address& to)
-	{
-		try {
-			for (unsigned int i = 0; ((i < _maxCustodyChainLength) && (i < ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH)); ++i) {
-				if (! (_custody[i].to)) {
-					Buffer<(sizeof(Capability) * 2)> tmp;
-					this->serialize(tmp, true);
-					_custody[i].to = to;
-					_custody[i].from = from.address();
-					_custody[i].signature = from.sign(tmp.data(), tmp.size());
-					return true;
-				}
-			}
-		}
-		catch (...) {
-		}
-		return false;
-	}
-
-	/**
-	 * Verify this capability's chain of custody and signatures
-	 *
-	 * @param RR Runtime environment to provide for peer lookup, etc.
-	 * @return 0 == OK, 1 == waiting for WHOIS, -1 == BAD signature or chain
-	 */
-	int verify(const RuntimeEnvironment* RR, void* tPtr) const;
-
-	template <unsigned int C> static inline void serializeRules(Buffer<C>& b, const ZT_VirtualNetworkRule* rules, unsigned int ruleCount)
-	{
-		for (unsigned int i = 0; i < ruleCount; ++i) {
-			// Each rule consists of its 8-bit type followed by the size of that type's
-			// field followed by field data. The inclusion of the size will allow non-supported
-			// rules to be ignored but still parsed.
-			b.append((uint8_t)rules[i].t);
-			switch ((ZT_VirtualNetworkRuleType)(rules[i].t & 0x3f)) {
-				default:
-					b.append((uint8_t)0);
-					break;
-				case ZT_NETWORK_RULE_ACTION_TEE:
-				case ZT_NETWORK_RULE_ACTION_WATCH:
-				case ZT_NETWORK_RULE_ACTION_REDIRECT:
-					b.append((uint8_t)14);
-					b.append((uint64_t)rules[i].v.fwd.address);
-					b.append((uint32_t)rules[i].v.fwd.flags);
-					b.append((uint16_t)rules[i].v.fwd.length);	 // unused for redirect
-					break;
-				case ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS:
-				case ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS:
-					b.append((uint8_t)5);
-					Address(rules[i].v.zt).appendTo(b);
-					break;
-				case ZT_NETWORK_RULE_MATCH_VLAN_ID:
-					b.append((uint8_t)2);
-					b.append((uint16_t)rules[i].v.vlanId);
-					break;
-				case ZT_NETWORK_RULE_MATCH_VLAN_PCP:
-					b.append((uint8_t)1);
-					b.append((uint8_t)rules[i].v.vlanPcp);
-					break;
-				case ZT_NETWORK_RULE_MATCH_VLAN_DEI:
-					b.append((uint8_t)1);
-					b.append((uint8_t)rules[i].v.vlanDei);
-					break;
-				case ZT_NETWORK_RULE_MATCH_MAC_SOURCE:
-				case ZT_NETWORK_RULE_MATCH_MAC_DEST:
-					b.append((uint8_t)6);
-					b.append(rules[i].v.mac, 6);
-					break;
-				case ZT_NETWORK_RULE_MATCH_IPV4_SOURCE:
-				case ZT_NETWORK_RULE_MATCH_IPV4_DEST:
-					b.append((uint8_t)5);
-					b.append(&(rules[i].v.ipv4.ip), 4);
-					b.append((uint8_t)rules[i].v.ipv4.mask);
-					break;
-				case ZT_NETWORK_RULE_MATCH_IPV6_SOURCE:
-				case ZT_NETWORK_RULE_MATCH_IPV6_DEST:
-					b.append((uint8_t)17);
-					b.append(rules[i].v.ipv6.ip, 16);
-					b.append((uint8_t)rules[i].v.ipv6.mask);
-					break;
-				case ZT_NETWORK_RULE_MATCH_IP_TOS:
-					b.append((uint8_t)3);
-					b.append((uint8_t)rules[i].v.ipTos.mask);
-					b.append((uint8_t)rules[i].v.ipTos.value[0]);
-					b.append((uint8_t)rules[i].v.ipTos.value[1]);
-					break;
-				case ZT_NETWORK_RULE_MATCH_IP_PROTOCOL:
-					b.append((uint8_t)1);
-					b.append((uint8_t)rules[i].v.ipProtocol);
-					break;
-				case ZT_NETWORK_RULE_MATCH_ETHERTYPE:
-					b.append((uint8_t)2);
-					b.append((uint16_t)rules[i].v.etherType);
-					break;
-				case ZT_NETWORK_RULE_MATCH_ICMP:
-					b.append((uint8_t)3);
-					b.append((uint8_t)rules[i].v.icmp.type);
-					b.append((uint8_t)rules[i].v.icmp.code);
-					b.append((uint8_t)rules[i].v.icmp.flags);
-					break;
-				case ZT_NETWORK_RULE_MATCH_IP_SOURCE_PORT_RANGE:
-				case ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE:
-					b.append((uint8_t)4);
-					b.append((uint16_t)rules[i].v.port[0]);
-					b.append((uint16_t)rules[i].v.port[1]);
-					break;
-				case ZT_NETWORK_RULE_MATCH_CHARACTERISTICS:
-					b.append((uint8_t)8);
-					b.append((uint64_t)rules[i].v.characteristics);
-					break;
-				case ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE:
-					b.append((uint8_t)4);
-					b.append((uint16_t)rules[i].v.frameSize[0]);
-					b.append((uint16_t)rules[i].v.frameSize[1]);
-					break;
-				case ZT_NETWORK_RULE_MATCH_RANDOM:
-					b.append((uint8_t)4);
-					b.append((uint32_t)rules[i].v.randomProbability);
-					break;
-				case ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE:
-				case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_AND:
-				case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_OR:
-				case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_XOR:
-				case ZT_NETWORK_RULE_MATCH_TAGS_EQUAL:
-				case ZT_NETWORK_RULE_MATCH_TAG_SENDER:
-				case ZT_NETWORK_RULE_MATCH_TAG_RECEIVER:
-					b.append((uint8_t)8);
-					b.append((uint32_t)rules[i].v.tag.id);
-					b.append((uint32_t)rules[i].v.tag.value);
-					break;
-				case ZT_NETWORK_RULE_MATCH_INTEGER_RANGE:
-					b.append((uint8_t)19);
-					b.append((uint64_t)rules[i].v.intRange.start);
-					b.append((uint64_t)(rules[i].v.intRange.start + (uint64_t)rules[i].v.intRange.end));   // more future-proof
-					b.append((uint16_t)rules[i].v.intRange.idx);
-					b.append((uint8_t)rules[i].v.intRange.format);
-					break;
-			}
-		}
-	}
-
-	template <unsigned int C> static inline void deserializeRules(const Buffer<C>& b, unsigned int& p, ZT_VirtualNetworkRule* rules, unsigned int& ruleCount, const unsigned int maxRuleCount)
-	{
-		while ((ruleCount < maxRuleCount) && (p < b.size())) {
-			rules[ruleCount].t = (uint8_t)b[p++];
-			const unsigned int fieldLen = (unsigned int)b[p++];
-			switch ((ZT_VirtualNetworkRuleType)(rules[ruleCount].t & 0x3f)) {
-				default:
-					break;
-				case ZT_NETWORK_RULE_ACTION_TEE:
-				case ZT_NETWORK_RULE_ACTION_WATCH:
-				case ZT_NETWORK_RULE_ACTION_REDIRECT:
-					rules[ruleCount].v.fwd.address = b.template at<uint64_t>(p);
-					rules[ruleCount].v.fwd.flags = b.template at<uint32_t>(p + 8);
-					rules[ruleCount].v.fwd.length = b.template at<uint16_t>(p + 12);
-					break;
-				case ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS:
-				case ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS:
-					rules[ruleCount].v.zt = Address(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH).toInt();
-					break;
-				case ZT_NETWORK_RULE_MATCH_VLAN_ID:
-					rules[ruleCount].v.vlanId = b.template at<uint16_t>(p);
-					break;
-				case ZT_NETWORK_RULE_MATCH_VLAN_PCP:
-					rules[ruleCount].v.vlanPcp = (uint8_t)b[p];
-					break;
-				case ZT_NETWORK_RULE_MATCH_VLAN_DEI:
-					rules[ruleCount].v.vlanDei = (uint8_t)b[p];
-					break;
-				case ZT_NETWORK_RULE_MATCH_MAC_SOURCE:
-				case ZT_NETWORK_RULE_MATCH_MAC_DEST:
-					memcpy(rules[ruleCount].v.mac, b.field(p, 6), 6);
-					break;
-				case ZT_NETWORK_RULE_MATCH_IPV4_SOURCE:
-				case ZT_NETWORK_RULE_MATCH_IPV4_DEST:
-					memcpy(&(rules[ruleCount].v.ipv4.ip), b.field(p, 4), 4);
-					rules[ruleCount].v.ipv4.mask = (uint8_t)b[p + 4];
-					break;
-				case ZT_NETWORK_RULE_MATCH_IPV6_SOURCE:
-				case ZT_NETWORK_RULE_MATCH_IPV6_DEST:
-					memcpy(rules[ruleCount].v.ipv6.ip, b.field(p, 16), 16);
-					rules[ruleCount].v.ipv6.mask = (uint8_t)b[p + 16];
-					break;
-				case ZT_NETWORK_RULE_MATCH_IP_TOS:
-					rules[ruleCount].v.ipTos.mask = (uint8_t)b[p];
-					rules[ruleCount].v.ipTos.value[0] = (uint8_t)b[p + 1];
-					rules[ruleCount].v.ipTos.value[1] = (uint8_t)b[p + 2];
-					break;
-				case ZT_NETWORK_RULE_MATCH_IP_PROTOCOL:
-					rules[ruleCount].v.ipProtocol = (uint8_t)b[p];
-					break;
-				case ZT_NETWORK_RULE_MATCH_ETHERTYPE:
-					rules[ruleCount].v.etherType = b.template at<uint16_t>(p);
-					break;
-				case ZT_NETWORK_RULE_MATCH_ICMP:
-					rules[ruleCount].v.icmp.type = (uint8_t)b[p];
-					rules[ruleCount].v.icmp.code = (uint8_t)b[p + 1];
-					rules[ruleCount].v.icmp.flags = (uint8_t)b[p + 2];
-					break;
-				case ZT_NETWORK_RULE_MATCH_IP_SOURCE_PORT_RANGE:
-				case ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE:
-					rules[ruleCount].v.port[0] = b.template at<uint16_t>(p);
-					rules[ruleCount].v.port[1] = b.template at<uint16_t>(p + 2);
-					break;
-				case ZT_NETWORK_RULE_MATCH_CHARACTERISTICS:
-					rules[ruleCount].v.characteristics = b.template at<uint64_t>(p);
-					break;
-				case ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE:
-					rules[ruleCount].v.frameSize[0] = b.template at<uint16_t>(p);
-					rules[ruleCount].v.frameSize[1] = b.template at<uint16_t>(p + 2);
-					break;
-				case ZT_NETWORK_RULE_MATCH_RANDOM:
-					rules[ruleCount].v.randomProbability = b.template at<uint32_t>(p);
-					break;
-				case ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE:
-				case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_AND:
-				case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_OR:
-				case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_XOR:
-				case ZT_NETWORK_RULE_MATCH_TAGS_EQUAL:
-				case ZT_NETWORK_RULE_MATCH_TAG_SENDER:
-				case ZT_NETWORK_RULE_MATCH_TAG_RECEIVER:
-					rules[ruleCount].v.tag.id = b.template at<uint32_t>(p);
-					rules[ruleCount].v.tag.value = b.template at<uint32_t>(p + 4);
-					break;
-				case ZT_NETWORK_RULE_MATCH_INTEGER_RANGE:
-					rules[ruleCount].v.intRange.start = b.template at<uint64_t>(p);
-					rules[ruleCount].v.intRange.end = (uint32_t)(b.template at<uint64_t>(p + 8) - rules[ruleCount].v.intRange.start);
-					rules[ruleCount].v.intRange.idx = b.template at<uint16_t>(p + 16);
-					rules[ruleCount].v.intRange.format = (uint8_t)b[p + 18];
-					break;
-			}
-			p += fieldLen;
-			++ruleCount;
-		}
-	}
-
-	template <unsigned int C> inline void serialize(Buffer<C>& b, const bool forSign = false) const
-	{
-		if (forSign) {
-			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-
-		// These are the same between Tag and Capability
-		b.append(_nwid);
-		b.append(_ts);
-		b.append(_id);
-
-		b.append((uint16_t)_ruleCount);
-		serializeRules(b, _rules, _ruleCount);
-		b.append((uint8_t)_maxCustodyChainLength);
-
-		if (! forSign) {
-			for (unsigned int i = 0;; ++i) {
-				if ((i < _maxCustodyChainLength) && (i < ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH) && (_custody[i].to)) {
-					_custody[i].to.appendTo(b);
-					_custody[i].from.appendTo(b);
-					b.append((uint8_t)1);						// 1 == Ed25519 signature
-					b.append((uint16_t)ZT_ECC_SIGNATURE_LEN);	// length of signature
-					b.append(_custody[i].signature.data, ZT_ECC_SIGNATURE_LEN);
-				}
-				else {
-					b.append((unsigned char)0, ZT_ADDRESS_LENGTH);	 // zero 'to' terminates chain
-					break;
-				}
-			}
-		}
-
-		// This is the size of any additional fields, currently 0.
-		b.append((uint16_t)0);
-
-		if (forSign) {
-			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-	}
-
-	template <unsigned int C> inline unsigned int deserialize(const Buffer<C>& b, unsigned int startAt = 0)
-	{
-		*this = Capability();
-
-		unsigned int p = startAt;
-
-		_nwid = b.template at<uint64_t>(p);
-		p += 8;
-		_ts = b.template at<uint64_t>(p);
-		p += 8;
-		_id = b.template at<uint32_t>(p);
-		p += 4;
-
-		const unsigned int rc = b.template at<uint16_t>(p);
-		p += 2;
-		if (rc > ZT_MAX_CAPABILITY_RULES) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-		}
-		deserializeRules(b, p, _rules, _ruleCount, rc);
-
-		_maxCustodyChainLength = (unsigned int)b[p++];
-		if ((_maxCustodyChainLength < 1) || (_maxCustodyChainLength > ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH)) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-		}
-
-		for (unsigned int i = 0;; ++i) {
-			const Address to(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-			p += ZT_ADDRESS_LENGTH;
-			if (! to) {
-				break;
-			}
-			if ((i >= _maxCustodyChainLength) || (i >= ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH)) {
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-			}
-			_custody[i].to = to;
-			_custody[i].from.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-			p += ZT_ADDRESS_LENGTH;
-			if (b[p++] == 1) {
-				if (b.template at<uint16_t>(p) != ZT_ECC_SIGNATURE_LEN) {
-					throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_CRYPTOGRAPHIC_TOKEN;
-				}
-				p += 2;
-				memcpy(_custody[i].signature.data, b.field(p, ZT_ECC_SIGNATURE_LEN), ZT_ECC_SIGNATURE_LEN);
-				p += ZT_ECC_SIGNATURE_LEN;
-			}
-			else {
-				p += 2 + b.template at<uint16_t>(p);
-			}
-		}
-
-		p += 2 + b.template at<uint16_t>(p);
-		if (p > b.size()) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-		}
-
-		return (p - startAt);
-	}
-
-	// Provides natural sort order by ID
-	inline bool operator<(const Capability& c) const
-	{
-		return (_id < c._id);
-	}
-
-	inline bool operator==(const Capability& c) const
-	{
-		return (memcmp(this, &c, sizeof(Capability)) == 0);
-	}
-	inline bool operator!=(const Capability& c) const
-	{
-		return (memcmp(this, &c, sizeof(Capability)) != 0);
-	}
-
-  private:
-	uint64_t _nwid;
-	int64_t _ts;
-	uint32_t _id;
-
-	unsigned int _maxCustodyChainLength;
-
-	unsigned int _ruleCount;
-	ZT_VirtualNetworkRule _rules[ZT_MAX_CAPABILITY_RULES];
-
-	struct {
-		Address to;
-		Address from;
-		ECC::Signature signature;
-	} _custody[ZT_MAX_CAPABILITY_CUSTODY_CHAIN_LENGTH];
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/CertificateOfMembership.cpp b/node/CertificateOfMembership.cpp
index 5a00c8eab..55537fd94 100644
--- a/node/CertificateOfMembership.cpp
+++ b/node/CertificateOfMembership.cpp
@@ -1,141 +1,230 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #include "CertificateOfMembership.hpp"
 
-#include "ECC.hpp"
-#include "Network.hpp"
-#include "Node.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
-
 namespace ZeroTier {
 
-CertificateOfMembership::CertificateOfMembership(uint64_t timestamp, uint64_t timestampMaxDelta, uint64_t nwid, const Identity& issuedTo)
+void CertificateOfMembership::setQualifier(uint64_t id,uint64_t value,uint64_t maxDelta)
 {
-	_qualifiers[0].id = COM_RESERVED_ID_TIMESTAMP;
-	_qualifiers[0].value = timestamp;
-	_qualifiers[0].maxDelta = timestampMaxDelta;
-	_qualifiers[1].id = COM_RESERVED_ID_NETWORK_ID;
-	_qualifiers[1].value = nwid;
-	_qualifiers[1].maxDelta = 0;
-	_qualifiers[2].id = COM_RESERVED_ID_ISSUED_TO;
-	_qualifiers[2].value = issuedTo.address().toInt();
-	_qualifiers[2].maxDelta = 0xffffffffffffffffULL;
+	_signedBy.zero();
 
-	// Include hash of full identity public key in COM for hardening purposes. Pack it in
-	// using the original COM format. Format may be revised in the future to make this cleaner.
-	uint64_t idHash[6];
-	issuedTo.publicKeyHash(idHash);
-	for (unsigned long i = 0; i < 4; ++i) {
-		_qualifiers[i + 3].id = (uint64_t)(i + 3);
-		_qualifiers[i + 3].value = Utils::ntoh(idHash[i]);
-		_qualifiers[i + 3].maxDelta = 0xffffffffffffffffULL;
+	for(unsigned int i=0;i<_qualifierCount;++i) {
+		if (_qualifiers[i].id == id) {
+			_qualifiers[i].value = value;
+			_qualifiers[i].maxDelta = maxDelta;
+			return;
+		}
 	}
 
-	_qualifierCount = 7;
-	memset(_signature.data, 0, ZT_ECC_SIGNATURE_LEN);
+	if (_qualifierCount < ZT_NETWORK_COM_MAX_QUALIFIERS) {
+		_qualifiers[_qualifierCount].id = id;
+		_qualifiers[_qualifierCount].value = value;
+		_qualifiers[_qualifierCount].maxDelta = maxDelta;
+		++_qualifierCount;
+		std::sort(&(_qualifiers[0]),&(_qualifiers[_qualifierCount]));
+	}
 }
 
-bool CertificateOfMembership::agreesWith(const CertificateOfMembership& other, const Identity& otherIdentity) const
+#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
+
+std::string CertificateOfMembership::toString() const
 {
-	if ((_qualifierCount == 0) || (other._qualifierCount == 0)) {
-		return false;
+	std::string s;
+
+	s.append("1:"); // COM_UINT64_ED25519
+
+	uint64_t *const buf = new uint64_t[_qualifierCount * 3];
+	try {
+		unsigned int ptr = 0;
+		for(unsigned int i=0;i<_qualifierCount;++i) {
+			buf[ptr++] = Utils::hton(_qualifiers[i].id);
+			buf[ptr++] = Utils::hton(_qualifiers[i].value);
+			buf[ptr++] = Utils::hton(_qualifiers[i].maxDelta);
+		}
+		s.append(Utils::hex(buf,ptr * sizeof(uint64_t)));
+		delete [] buf;
+	} catch ( ... ) {
+		delete [] buf;
+		throw;
 	}
 
-	std::map<uint64_t, uint64_t> otherFields;
-	for (unsigned int i = 0; i < other._qualifierCount; ++i) {
-		otherFields[other._qualifiers[i].id] = other._qualifiers[i].value;
+	s.push_back(':');
+
+	s.append(_signedBy.toString());
+
+	if (_signedBy) {
+		s.push_back(':');
+		s.append(Utils::hex(_signature.data,(unsigned int)_signature.size()));
 	}
 
-	bool fullIdentityVerification = false;
-	for (unsigned int i = 0; i < _qualifierCount; ++i) {
-		const uint64_t qid = _qualifiers[i].id;
-		if ((qid >= 3) && (qid <= 6)) {
-			fullIdentityVerification = true;
-		}
-		std::map<uint64_t, uint64_t>::iterator otherQ(otherFields.find(qid));
-		if (otherQ == otherFields.end()) {
-			return false;
-		}
-		const uint64_t a = _qualifiers[i].value;
-		const uint64_t b = otherQ->second;
-		if (((a >= b) ? (a - b) : (b - a)) > _qualifiers[i].maxDelta) {
-			return false;
-		}
-	}
+	return s;
+}
 
-	// If this COM has a full hash of its identity, assume the other must have this as well.
-	// Otherwise we are on a controller that does not incorporate these.
-	if (fullIdentityVerification) {
-		uint64_t idHash[6];
-		otherIdentity.publicKeyHash(idHash);
-		for (unsigned long i = 0; i < 4; ++i) {
-			std::map<uint64_t, uint64_t>::iterator otherQ(otherFields.find((uint64_t)(i + 3)));
-			if (otherQ == otherFields.end()) {
-				return false;
+void CertificateOfMembership::fromString(const char *s)
+{
+	_qualifierCount = 0;
+	_signedBy.zero();
+	memset(_signature.data,0,_signature.size());
+
+	if (!*s)
+		return;
+
+	unsigned int colonAt = 0;
+	while ((s[colonAt])&&(s[colonAt] != ':')) ++colonAt;
+
+	if (!((colonAt == 1)&&(s[0] == '1'))) // COM_UINT64_ED25519?
+		return;
+
+	s += colonAt + 1;
+	colonAt = 0;
+	while ((s[colonAt])&&(s[colonAt] != ':')) ++colonAt;
+
+	if (colonAt) {
+		const unsigned int buflen = colonAt / 2;
+		char *const buf = new char[buflen];
+		unsigned int bufactual = Utils::unhex(s,colonAt,buf,buflen);
+		char *bufptr = buf;
+		try {
+			while (bufactual >= 24) {
+				if (_qualifierCount < ZT_NETWORK_COM_MAX_QUALIFIERS) {
+					_qualifiers[_qualifierCount].id = Utils::ntoh(*((uint64_t *)bufptr)); bufptr += 8;
+					_qualifiers[_qualifierCount].value = Utils::ntoh(*((uint64_t *)bufptr)); bufptr += 8;
+					_qualifiers[_qualifierCount].maxDelta = Utils::ntoh(*((uint64_t *)bufptr)); bufptr += 8;
+					++_qualifierCount;
+				} else {
+					bufptr += 24;
+				}
+				bufactual -= 24;
 			}
-			if (otherQ->second != Utils::ntoh(idHash[i])) {
-				return false;
+		} catch ( ... ) {}
+		delete [] buf;
+	}
+
+	if (s[colonAt]) {
+		s += colonAt + 1;
+		colonAt = 0;
+		while ((s[colonAt])&&(s[colonAt] != ':')) ++colonAt;
+
+		if (colonAt) {
+			char addrbuf[ZT_ADDRESS_LENGTH];
+			if (Utils::unhex(s,colonAt,addrbuf,sizeof(addrbuf)) == ZT_ADDRESS_LENGTH)
+				_signedBy.setTo(addrbuf,ZT_ADDRESS_LENGTH);
+
+			if ((_signedBy)&&(s[colonAt])) {
+				s += colonAt + 1;
+				colonAt = 0;
+				while ((s[colonAt])&&(s[colonAt] != ':')) ++colonAt;
+				if (colonAt) {
+					if (Utils::unhex(s,colonAt,_signature.data,(unsigned int)_signature.size()) != _signature.size())
+						_signedBy.zero();
+				} else {
+					_signedBy.zero();
+				}
+			} else {
+				_signedBy.zero();
 			}
 		}
 	}
 
+	std::sort(&(_qualifiers[0]),&(_qualifiers[_qualifierCount]));
+}
+
+#endif // ZT_SUPPORT_OLD_STYLE_NETCONF
+
+bool CertificateOfMembership::agreesWith(const CertificateOfMembership &other) const
+{
+	unsigned int myidx = 0;
+	unsigned int otheridx = 0;
+
+	while (myidx < _qualifierCount) {
+		// Fail if we're at the end of other, since this means the field is
+		// missing.
+		if (otheridx >= other._qualifierCount)
+			return false;
+
+		// Seek to corresponding tuple in other, ignoring tuples that
+		// we may not have. If we run off the end of other, the tuple is
+		// missing. This works because tuples are sorted by ID.
+		while (other._qualifiers[otheridx].id != _qualifiers[myidx].id) {
+			++otheridx;
+			if (otheridx >= other._qualifierCount)
+				return false;
+		}
+
+		// Compare to determine if the absolute value of the difference
+		// between these two parameters is within our maxDelta.
+		const uint64_t a = _qualifiers[myidx].value;
+		const uint64_t b = other._qualifiers[myidx].value;
+		if (((a >= b) ? (a - b) : (b - a)) > _qualifiers[myidx].maxDelta)
+			return false;
+
+		++myidx;
+	}
+
 	return true;
 }
 
-bool CertificateOfMembership::sign(const Identity& with)
+bool CertificateOfMembership::sign(const Identity &with)
 {
-	uint64_t buf[ZT_NETWORK_COM_MAX_QUALIFIERS * 3];
+	uint64_t *const buf = new uint64_t[_qualifierCount * 3];
 	unsigned int ptr = 0;
-	for (unsigned int i = 0; i < _qualifierCount; ++i) {
+	for(unsigned int i=0;i<_qualifierCount;++i) {
 		buf[ptr++] = Utils::hton(_qualifiers[i].id);
 		buf[ptr++] = Utils::hton(_qualifiers[i].value);
 		buf[ptr++] = Utils::hton(_qualifiers[i].maxDelta);
 	}
 
 	try {
-		_signature = with.sign(buf, ptr * sizeof(uint64_t));
+		_signature = with.sign(buf,ptr * sizeof(uint64_t));
 		_signedBy = with.address();
+		delete [] buf;
 		return true;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		_signedBy.zero();
+		delete [] buf;
 		return false;
 	}
 }
 
-int CertificateOfMembership::verify(const RuntimeEnvironment* RR, void* tPtr) const
+bool CertificateOfMembership::verify(const Identity &id) const
 {
-	if ((! _signedBy) || (_signedBy != Network::controllerFor(networkId())) || (_qualifierCount > ZT_NETWORK_COM_MAX_QUALIFIERS)) {
-		return -1;
-	}
+	if (!_signedBy)
+		return false;
+	if (id.address() != _signedBy)
+		return false;
 
-	const Identity id(RR->topology->getIdentity(tPtr, _signedBy));
-	if (! id) {
-		RR->sw->requestWhois(tPtr, RR->node->now(), _signedBy);
-		return 1;
-	}
-
-	uint64_t buf[ZT_NETWORK_COM_MAX_QUALIFIERS * 3];
+	uint64_t *const buf = new uint64_t[_qualifierCount * 3];
 	unsigned int ptr = 0;
-	for (unsigned int i = 0; i < _qualifierCount; ++i) {
+	for(unsigned int i=0;i<_qualifierCount;++i) {
 		buf[ptr++] = Utils::hton(_qualifiers[i].id);
 		buf[ptr++] = Utils::hton(_qualifiers[i].value);
 		buf[ptr++] = Utils::hton(_qualifiers[i].maxDelta);
 	}
-	return (id.verify(buf, ptr * sizeof(uint64_t), _signature) ? 0 : -1);
+
+	bool valid = false;
+	try {
+		valid = id.verify(buf,ptr * sizeof(uint64_t),_signature);
+		delete [] buf;
+	} catch ( ... ) {
+		delete [] buf;
+	}
+	return valid;
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/CertificateOfMembership.hpp b/node/CertificateOfMembership.hpp
index c5a3c6a7a..43c8c0af0 100644
--- a/node/CertificateOfMembership.hpp
+++ b/node/CertificateOfMembership.hpp
@@ -1,42 +1,55 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_CERTIFICATEOFMEMBERSHIP_HPP
 #define ZT_CERTIFICATEOFMEMBERSHIP_HPP
 
-#include "Address.hpp"
-#include "Buffer.hpp"
+#include <stdint.h>
+#include <string.h>
+
+#include <string>
+#include <stdexcept>
+#include <algorithm>
+
 #include "Constants.hpp"
-#include "Credential.hpp"
-#include "ECC.hpp"
+#include "Buffer.hpp"
+#include "Address.hpp"
+#include "C25519.hpp"
 #include "Identity.hpp"
 #include "Utils.hpp"
 
-#include <algorithm>
-#include <stdexcept>
-#include <stdint.h>
-#include <string.h>
-#include <string>
+/**
+ * Default window of time for certificate agreement
+ *
+ * Right now we use time for 'revision' so this is the maximum time divergence
+ * between two certs for them to agree. It comes out to five minutes, which
+ * gives a lot of margin for error if the controller hiccups or its clock
+ * drifts but causes de-authorized peers to fall off fast enough.
+ */
+#define ZT_NETWORK_COM_DEFAULT_REVISION_MAX_DELTA (ZT_NETWORK_AUTOCONF_DELAY * 5)
 
 /**
- * Maximum number of qualifiers allowed in a COM (absolute max: 65535)
+ * Maximum number of qualifiers in a COM
  */
-#define ZT_NETWORK_COM_MAX_QUALIFIERS 8
+#define ZT_NETWORK_COM_MAX_QUALIFIERS 16
 
 namespace ZeroTier {
 
-class RuntimeEnvironment;
-
 /**
  * Certificate of network membership
  *
@@ -63,57 +76,113 @@ class RuntimeEnvironment;
  * This is a memcpy()'able structure and is safe (in a crash sense) to modify
  * without locks.
  */
-class CertificateOfMembership : public Credential {
-  public:
-	static inline Credential::Type credentialType()
+class CertificateOfMembership
+{
+public:
+	/**
+	 * Certificate type codes, used in serialization
+	 *
+	 * Only one so far, and only one hopefully there shall be for quite some
+	 * time.
+	 */
+	enum Type
 	{
-		return Credential::CREDENTIAL_TYPE_COM;
-	}
+		COM_UINT64_ED25519 = 1 // tuples of unsigned 64's signed with Ed25519
+	};
 
 	/**
 	 * Reserved qualifier IDs
 	 *
-	 * IDs below 1024 are reserved for use as standard IDs. Others are available
-	 * for user-defined use.
+	 * IDs below 65536 should be considered reserved for future global
+	 * assignment here.
 	 *
 	 * Addition of new required fields requires that code in hasRequiredFields
 	 * be updated as well.
 	 */
-	enum ReservedId {
+	enum ReservedId
+	{
 		/**
-		 * Timestamp of certificate
+		 * Revision number of certificate
+		 *
+		 * Certificates may differ in revision number by a designated max
+		 * delta. Differences wider than this cause certificates not to agree.
 		 */
-		COM_RESERVED_ID_TIMESTAMP = 0,
+		COM_RESERVED_ID_REVISION = 0,
 
 		/**
 		 * Network ID for which certificate was issued
+		 *
+		 * maxDelta here is zero, since this must match.
 		 */
 		COM_RESERVED_ID_NETWORK_ID = 1,
 
 		/**
 		 * ZeroTier address to whom certificate was issued
+		 *
+		 * maxDelta will be 0xffffffffffffffff here since it's permitted to differ
+		 * from peers obviously.
 		 */
 		COM_RESERVED_ID_ISSUED_TO = 2
-
-		// IDs 3-6 reserved for full hash of identity to which this COM was issued.
 	};
 
 	/**
-	 * Create an empty certificate of membership
+	 * Create an empty certificate
 	 */
-	CertificateOfMembership() : _qualifierCount(0)
+	CertificateOfMembership() :
+		_qualifierCount(0)
 	{
+		memset(_signature.data,0,_signature.size());
+	}
+
+	CertificateOfMembership(const CertificateOfMembership &c)
+	{
+		memcpy(this,&c,sizeof(CertificateOfMembership));
 	}
 
 	/**
 	 * Create from required fields common to all networks
 	 *
-	 * @param timestamp Timestamp of certificate
+	 * @param revision Revision number of certificate
 	 * @param timestampMaxDelta Maximum variation between timestamps on this net
 	 * @param nwid Network ID
 	 * @param issuedTo Certificate recipient
 	 */
-	CertificateOfMembership(uint64_t timestamp, uint64_t timestampMaxDelta, uint64_t nwid, const Identity& issuedTo);
+	CertificateOfMembership(uint64_t revision,uint64_t revisionMaxDelta,uint64_t nwid,const Address &issuedTo)
+	{
+		_qualifiers[0].id = COM_RESERVED_ID_REVISION;
+		_qualifiers[0].value = revision;
+		_qualifiers[0].maxDelta = revisionMaxDelta;
+		_qualifiers[1].id = COM_RESERVED_ID_NETWORK_ID;
+		_qualifiers[1].value = nwid;
+		_qualifiers[1].maxDelta = 0;
+		_qualifiers[2].id = COM_RESERVED_ID_ISSUED_TO;
+		_qualifiers[2].value = issuedTo.toInt();
+		_qualifiers[2].maxDelta = 0xffffffffffffffffULL;
+		_qualifierCount = 3;
+		memset(_signature.data,0,_signature.size());
+	}
+
+	inline CertificateOfMembership &operator=(const CertificateOfMembership &c)
+	{
+		memcpy(this,&c,sizeof(CertificateOfMembership));
+		return *this;
+	}
+
+#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
+	/**
+	 * Create from string-serialized data
+	 *
+	 * @param s String-serialized COM
+	 */
+	CertificateOfMembership(const char *s) { fromString(s); }
+
+	/**
+	 * Create from string-serialized data
+	 *
+	 * @param s String-serialized COM
+	 */
+	CertificateOfMembership(const std::string &s) { fromString(s.c_str()); }
+#endif // ZT_SUPPORT_OLD_STYLE_NETCONF
 
 	/**
 	 * Create from binary-serialized COM in buffer
@@ -121,38 +190,57 @@ class CertificateOfMembership : public Credential {
 	 * @param b Buffer to deserialize from
 	 * @param startAt Position to start in buffer
 	 */
-	template <unsigned int C> CertificateOfMembership(const Buffer<C>& b, unsigned int startAt = 0)
+	template<unsigned int C>
+	CertificateOfMembership(const Buffer<C> &b,unsigned int startAt = 0)
 	{
-		deserialize(b, startAt);
+		deserialize(b,startAt);
 	}
 
 	/**
 	 * @return True if there's something here
 	 */
-	inline operator bool() const
+	inline operator bool() const throw() { return (_qualifierCount != 0); }
+
+	/**
+	 * Check for presence of all required fields common to all networks
+	 *
+	 * @return True if all required fields are present
+	 */
+	inline bool hasRequiredFields() const
 	{
-		return (_qualifierCount != 0);
+		if (_qualifierCount < 3)
+			return false;
+		if (_qualifiers[0].id != COM_RESERVED_ID_REVISION)
+			return false;
+		if (_qualifiers[1].id != COM_RESERVED_ID_NETWORK_ID)
+			return false;
+		if (_qualifiers[2].id != COM_RESERVED_ID_ISSUED_TO)
+			return false;
+		return true;
 	}
 
 	/**
-	 * @return Credential ID, always 0 for COMs
+	 * @return Maximum delta for mandatory revision field or 0 if field missing
 	 */
-	inline uint32_t id() const
+	inline uint64_t revisionMaxDelta() const
 	{
-		return 0;
-	}
-
-	/**
-	 * @return Timestamp for this cert and maximum delta for timestamp
-	 */
-	inline int64_t timestamp() const
-	{
-		for (unsigned int i = 0; i < _qualifierCount; ++i) {
-			if (_qualifiers[i].id == COM_RESERVED_ID_TIMESTAMP) {
-				return _qualifiers[i].value;
-			}
+		for(unsigned int i=0;i<_qualifierCount;++i) {
+			if (_qualifiers[i].id == COM_RESERVED_ID_REVISION)
+				return _qualifiers[i].maxDelta;
 		}
-		return 0;
+		return 0ULL;
+	}
+
+	/**
+	 * @return Revision number for this cert
+	 */
+	inline uint64_t revision() const
+	{
+		for(unsigned int i=0;i<_qualifierCount;++i) {
+			if (_qualifiers[i].id == COM_RESERVED_ID_REVISION)
+				return _qualifiers[i].value;
+		}
+		return 0ULL;
 	}
 
 	/**
@@ -160,10 +248,9 @@ class CertificateOfMembership : public Credential {
 	 */
 	inline Address issuedTo() const
 	{
-		for (unsigned int i = 0; i < _qualifierCount; ++i) {
-			if (_qualifiers[i].id == COM_RESERVED_ID_ISSUED_TO) {
+		for(unsigned int i=0;i<_qualifierCount;++i) {
+			if (_qualifiers[i].id == COM_RESERVED_ID_ISSUED_TO)
 				return Address(_qualifiers[i].value);
-			}
 		}
 		return Address();
 	}
@@ -173,29 +260,58 @@ class CertificateOfMembership : public Credential {
 	 */
 	inline uint64_t networkId() const
 	{
-		for (unsigned int i = 0; i < _qualifierCount; ++i) {
-			if (_qualifiers[i].id == COM_RESERVED_ID_NETWORK_ID) {
+		for(unsigned int i=0;i<_qualifierCount;++i) {
+			if (_qualifiers[i].id == COM_RESERVED_ID_NETWORK_ID)
 				return _qualifiers[i].value;
-			}
 		}
 		return 0ULL;
 	}
 
+	/**
+	 * Add or update a qualifier in this certificate
+	 *
+	 * Any signature is invalidated and signedBy is set to null.
+	 *
+	 * @param id Qualifier ID
+	 * @param value Qualifier value
+	 * @param maxDelta Qualifier maximum allowed difference (absolute value of difference)
+	 */
+	void setQualifier(uint64_t id,uint64_t value,uint64_t maxDelta);
+	inline void setQualifier(ReservedId id,uint64_t value,uint64_t maxDelta) { setQualifier((uint64_t)id,value,maxDelta); }
+
+#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
+	/**
+	 * @return String-serialized representation of this certificate
+	 */
+	std::string toString() const;
+
+	/**
+	 * Set this certificate equal to the hex-serialized string
+	 *
+	 * Invalid strings will result in invalid or undefined certificate
+	 * contents. These will subsequently fail validation and comparison.
+	 * Empty strings will result in an empty certificate.
+	 *
+	 * @param s String to deserialize
+	 */
+	void fromString(const char *s);
+	inline void fromString(const std::string &s) { fromString(s.c_str()); }
+#endif // ZT_SUPPORT_OLD_STYLE_NETCONF
+
 	/**
 	 * Compare two certificates for parameter agreement
 	 *
 	 * This compares this certificate with the other and returns true if all
-	 * parameters in this cert are present in the other and if they agree to
+	 * paramters in this cert are present in the other and if they agree to
 	 * within this cert's max delta value for each given parameter.
 	 *
 	 * Tuples present in other but not in this cert are ignored, but any
 	 * tuples present in this cert but not in other result in 'false'.
 	 *
 	 * @param other Cert to compare with
-	 * @param otherIdentity Identity of other node
 	 * @return True if certs agree and 'other' may be communicated with
 	 */
-	bool agreesWith(const CertificateOfMembership& other, const Identity& otherIdentity) const;
+	bool agreesWith(const CertificateOfMembership &other) const;
 
 	/**
 	 * Sign this certificate
@@ -203,135 +319,114 @@ class CertificateOfMembership : public Credential {
 	 * @param with Identity to sign with, must include private key
 	 * @return True if signature was successful
 	 */
-	bool sign(const Identity& with);
+	bool sign(const Identity &with);
 
 	/**
-	 * Verify this COM and its signature
+	 * Verify certificate against an identity
 	 *
-	 * @param RR Runtime environment for looking up peers
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @return 0 == OK, 1 == waiting for WHOIS, -1 == BAD signature or credential
+	 * @param id Identity to verify against
+	 * @return True if certificate is signed by this identity and verification was successful
 	 */
-	int verify(const RuntimeEnvironment* RR, void* tPtr) const;
+	bool verify(const Identity &id) const;
 
 	/**
 	 * @return True if signed
 	 */
-	inline bool isSigned() const
-	{
-		return (_signedBy);
-	}
+	inline bool isSigned() const throw() { return (_signedBy); }
 
 	/**
 	 * @return Address that signed this certificate or null address if none
 	 */
-	inline const Address& signedBy() const
-	{
-		return _signedBy;
-	}
+	inline const Address &signedBy() const throw() { return _signedBy; }
 
-	template <unsigned int C> inline void serialize(Buffer<C>& b) const
+	template<unsigned int C>
+	inline void serialize(Buffer<C> &b) const
 	{
-		b.append((uint8_t)1);
+		b.append((unsigned char)COM_UINT64_ED25519);
 		b.append((uint16_t)_qualifierCount);
-		for (unsigned int i = 0; i < _qualifierCount; ++i) {
+		for(unsigned int i=0;i<_qualifierCount;++i) {
 			b.append(_qualifiers[i].id);
 			b.append(_qualifiers[i].value);
 			b.append(_qualifiers[i].maxDelta);
 		}
 		_signedBy.appendTo(b);
-		if (_signedBy) {
-			b.append(_signature.data, ZT_ECC_SIGNATURE_LEN);
-		}
+		if (_signedBy)
+			b.append(_signature.data,(unsigned int)_signature.size());
 	}
 
-	template <unsigned int C> inline unsigned int deserialize(const Buffer<C>& b, unsigned int startAt = 0)
+	template<unsigned int C>
+	inline unsigned int deserialize(const Buffer<C> &b,unsigned int startAt = 0)
 	{
 		unsigned int p = startAt;
 
 		_qualifierCount = 0;
 		_signedBy.zero();
 
-		if (b[p++] != 1) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_TYPE;
-		}
+		if (b[p++] != COM_UINT64_ED25519)
+			throw std::invalid_argument("invalid type");
 
-		unsigned int numq = b.template at<uint16_t>(p);
-		p += sizeof(uint16_t);
+		unsigned int numq = b.template at<uint16_t>(p); p += sizeof(uint16_t);
 		uint64_t lastId = 0;
-		for (unsigned int i = 0; i < numq; ++i) {
+		for(unsigned int i=0;i<numq;++i) {
 			const uint64_t qid = b.template at<uint64_t>(p);
-			if (qid < lastId) {
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_BAD_ENCODING;
-			}
-			else {
-				lastId = qid;
-			}
+			if (qid < lastId)
+				throw std::invalid_argument("qualifiers not sorted");
+			else lastId = qid;
 			if (_qualifierCount < ZT_NETWORK_COM_MAX_QUALIFIERS) {
 				_qualifiers[_qualifierCount].id = qid;
 				_qualifiers[_qualifierCount].value = b.template at<uint64_t>(p + 8);
 				_qualifiers[_qualifierCount].maxDelta = b.template at<uint64_t>(p + 16);
 				p += 24;
 				++_qualifierCount;
-			}
-			else {
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
+			} else {
+				throw std::invalid_argument("too many qualifiers");
 			}
 		}
 
-		_signedBy.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
+		_signedBy.setTo(b.field(p,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH);
 		p += ZT_ADDRESS_LENGTH;
 
 		if (_signedBy) {
-			memcpy(_signature.data, b.field(p, ZT_ECC_SIGNATURE_LEN), ZT_ECC_SIGNATURE_LEN);
-			p += ZT_ECC_SIGNATURE_LEN;
+			memcpy(_signature.data,b.field(p,(unsigned int)_signature.size()),_signature.size());
+			p += (unsigned int)_signature.size();
 		}
 
 		return (p - startAt);
 	}
 
-	inline bool operator==(const CertificateOfMembership& c) const
+	inline bool operator==(const CertificateOfMembership &c) const
+		throw()
 	{
-		if (_signedBy != c._signedBy) {
+		if (_signedBy != c._signedBy)
 			return false;
-		}
-		if (_qualifierCount != c._qualifierCount) {
+		if (_qualifierCount != c._qualifierCount)
 			return false;
-		}
-		for (unsigned int i = 0; i < _qualifierCount; ++i) {
-			const _Qualifier& a = _qualifiers[i];
-			const _Qualifier& b = c._qualifiers[i];
-			if ((a.id != b.id) || (a.value != b.value) || (a.maxDelta != b.maxDelta)) {
+		for(unsigned int i=0;i<_qualifierCount;++i) {
+			const _Qualifier &a = _qualifiers[i];
+			const _Qualifier &b = c._qualifiers[i];
+			if ((a.id != b.id)||(a.value != b.value)||(a.maxDelta != b.maxDelta))
 				return false;
-			}
 		}
-		return (memcmp(_signature.data, c._signature.data, ZT_ECC_SIGNATURE_LEN) == 0);
-	}
-	inline bool operator!=(const CertificateOfMembership& c) const
-	{
-		return (! (*this == c));
+		return (_signature == c._signature);
 	}
+	inline bool operator!=(const CertificateOfMembership &c) const throw() { return (!(*this == c)); }
 
-  private:
-	struct _Qualifier {
-		_Qualifier() : id(0), value(0), maxDelta(0)
-		{
-		}
+private:
+	struct _Qualifier
+	{
+		_Qualifier() : id(0),value(0),maxDelta(0) {}
 		uint64_t id;
 		uint64_t value;
 		uint64_t maxDelta;
-		inline bool operator<(const _Qualifier& q) const
-		{
-			return (id < q.id);
-		}	// sort order
+		inline bool operator<(const _Qualifier &q) const throw() { return (id < q.id); } // sort order
 	};
 
 	Address _signedBy;
 	_Qualifier _qualifiers[ZT_NETWORK_COM_MAX_QUALIFIERS];
 	unsigned int _qualifierCount;
-	ECC::Signature _signature;
+	C25519::Signature _signature;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/CertificateOfOwnership.cpp b/node/CertificateOfOwnership.cpp
deleted file mode 100644
index 5a1cbf343..000000000
--- a/node/CertificateOfOwnership.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "CertificateOfOwnership.hpp"
-
-#include "Identity.hpp"
-#include "Network.hpp"
-#include "Node.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
-
-namespace ZeroTier {
-
-int CertificateOfOwnership::verify(const RuntimeEnvironment* RR, void* tPtr) const
-{
-	if ((! _signedBy) || (_signedBy != Network::controllerFor(_networkId))) {
-		return -1;
-	}
-	const Identity id(RR->topology->getIdentity(tPtr, _signedBy));
-	if (! id) {
-		RR->sw->requestWhois(tPtr, RR->node->now(), _signedBy);
-		return 1;
-	}
-	try {
-		Buffer<(sizeof(CertificateOfOwnership) + 64)> tmp;
-		this->serialize(tmp, true);
-		return (id.verify(tmp.data(), tmp.size(), _signature) ? 0 : -1);
-	}
-	catch (...) {
-		return -1;
-	}
-}
-
-bool CertificateOfOwnership::_owns(const CertificateOfOwnership::Thing& t, const void* v, unsigned int l) const
-{
-	for (unsigned int i = 0, j = _thingCount; i < j; ++i) {
-		if (_thingTypes[i] == (uint8_t)t) {
-			unsigned int k = 0;
-			while (k < l) {
-				if (reinterpret_cast<const uint8_t*>(v)[k] != _thingValues[i][k]) {
-					break;
-				}
-				++k;
-			}
-			if (k == l) {
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-}	// namespace ZeroTier
diff --git a/node/CertificateOfOwnership.hpp b/node/CertificateOfOwnership.hpp
deleted file mode 100644
index 3e2f5b926..000000000
--- a/node/CertificateOfOwnership.hpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_CERTIFICATEOFOWNERSHIP_HPP
-#define ZT_CERTIFICATEOFOWNERSHIP_HPP
-
-#include "Address.hpp"
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "Credential.hpp"
-#include "ECC.hpp"
-#include "Identity.hpp"
-#include "InetAddress.hpp"
-#include "MAC.hpp"
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-// Max things per CertificateOfOwnership
-#define ZT_CERTIFICATEOFOWNERSHIP_MAX_THINGS 16
-
-// Maximum size of a thing's value field in bytes
-#define ZT_CERTIFICATEOFOWNERSHIP_MAX_THING_VALUE_SIZE 16
-
-namespace ZeroTier {
-
-class RuntimeEnvironment;
-
-/**
- * Certificate indicating ownership of a network identifier
- */
-class CertificateOfOwnership : public Credential {
-  public:
-	static inline Credential::Type credentialType()
-	{
-		return Credential::CREDENTIAL_TYPE_COO;
-	}
-
-	enum Thing { THING_NULL = 0, THING_MAC_ADDRESS = 1, THING_IPV4_ADDRESS = 2, THING_IPV6_ADDRESS = 3 };
-
-	CertificateOfOwnership()
-	{
-		memset(reinterpret_cast<void*>(this), 0, sizeof(CertificateOfOwnership));
-	}
-
-	CertificateOfOwnership(const uint64_t nwid, const int64_t ts, const Address& issuedTo, const uint32_t id)
-	{
-		memset(reinterpret_cast<void*>(this), 0, sizeof(CertificateOfOwnership));
-		_networkId = nwid;
-		_ts = ts;
-		_id = id;
-		_issuedTo = issuedTo;
-	}
-
-	inline uint64_t networkId() const
-	{
-		return _networkId;
-	}
-	inline int64_t timestamp() const
-	{
-		return _ts;
-	}
-	inline uint32_t id() const
-	{
-		return _id;
-	}
-	inline unsigned int thingCount() const
-	{
-		return (unsigned int)_thingCount;
-	}
-
-	inline Thing thingType(const unsigned int i) const
-	{
-		return (Thing)_thingTypes[i];
-	}
-	inline const uint8_t* thingValue(const unsigned int i) const
-	{
-		return _thingValues[i];
-	}
-
-	inline const Address& issuedTo() const
-	{
-		return _issuedTo;
-	}
-
-	inline bool owns(const InetAddress& ip) const
-	{
-		if (ip.ss_family == AF_INET) {
-			return this->_owns(THING_IPV4_ADDRESS, &(reinterpret_cast<const struct sockaddr_in*>(&ip)->sin_addr.s_addr), 4);
-		}
-		if (ip.ss_family == AF_INET6) {
-			return this->_owns(THING_IPV6_ADDRESS, reinterpret_cast<const struct sockaddr_in6*>(&ip)->sin6_addr.s6_addr, 16);
-		}
-		return false;
-	}
-
-	inline bool owns(const MAC& mac) const
-	{
-		uint8_t tmp[6];
-		mac.copyTo(tmp, 6);
-		return this->_owns(THING_MAC_ADDRESS, tmp, 6);
-	}
-
-	inline void addThing(const InetAddress& ip)
-	{
-		if (_thingCount >= ZT_CERTIFICATEOFOWNERSHIP_MAX_THINGS) {
-			return;
-		}
-		if (ip.ss_family == AF_INET) {
-			_thingTypes[_thingCount] = THING_IPV4_ADDRESS;
-			memcpy(_thingValues[_thingCount], &(reinterpret_cast<const struct sockaddr_in*>(&ip)->sin_addr.s_addr), 4);
-			++_thingCount;
-		}
-		else if (ip.ss_family == AF_INET6) {
-			_thingTypes[_thingCount] = THING_IPV6_ADDRESS;
-			memcpy(_thingValues[_thingCount], reinterpret_cast<const struct sockaddr_in6*>(&ip)->sin6_addr.s6_addr, 16);
-			++_thingCount;
-		}
-	}
-
-	inline void addThing(const MAC& mac)
-	{
-		if (_thingCount >= ZT_CERTIFICATEOFOWNERSHIP_MAX_THINGS) {
-			return;
-		}
-		_thingTypes[_thingCount] = THING_MAC_ADDRESS;
-		mac.copyTo(_thingValues[_thingCount], 6);
-		++_thingCount;
-	}
-
-	/**
-	 * @param signer Signing identity, must have private key
-	 * @return True if signature was successful
-	 */
-	inline bool sign(const Identity& signer)
-	{
-		if (signer.hasPrivate()) {
-			Buffer<sizeof(CertificateOfOwnership) + 64> tmp;
-			_signedBy = signer.address();
-			this->serialize(tmp, true);
-			_signature = signer.sign(tmp.data(), tmp.size());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param RR Runtime environment to allow identity lookup for signedBy
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @return 0 == OK, 1 == waiting for WHOIS, -1 == BAD signature
-	 */
-	int verify(const RuntimeEnvironment* RR, void* tPtr) const;
-
-	template <unsigned int C> inline void serialize(Buffer<C>& b, const bool forSign = false) const
-	{
-		if (forSign) {
-			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-
-		b.append(_networkId);
-		b.append(_ts);
-		b.append(_flags);
-		b.append(_id);
-		b.append((uint16_t)_thingCount);
-		for (unsigned int i = 0, j = _thingCount; i < j; ++i) {
-			b.append((uint8_t)_thingTypes[i]);
-			b.append(_thingValues[i], ZT_CERTIFICATEOFOWNERSHIP_MAX_THING_VALUE_SIZE);
-		}
-
-		_issuedTo.appendTo(b);
-		_signedBy.appendTo(b);
-		if (! forSign) {
-			b.append((uint8_t)1);						// 1 == Ed25519
-			b.append((uint16_t)ZT_ECC_SIGNATURE_LEN);	// length of signature
-			b.append(_signature.data, ZT_ECC_SIGNATURE_LEN);
-		}
-
-		b.append((uint16_t)0);	 // length of additional fields, currently 0
-
-		if (forSign) {
-			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-	}
-
-	template <unsigned int C> inline unsigned int deserialize(const Buffer<C>& b, unsigned int startAt = 0)
-	{
-		unsigned int p = startAt;
-
-		*this = CertificateOfOwnership();
-
-		_networkId = b.template at<uint64_t>(p);
-		p += 8;
-		_ts = b.template at<uint64_t>(p);
-		p += 8;
-		_flags = b.template at<uint64_t>(p);
-		p += 8;
-		_id = b.template at<uint32_t>(p);
-		p += 4;
-		_thingCount = b.template at<uint16_t>(p);
-		p += 2;
-		for (unsigned int i = 0, j = _thingCount; i < j; ++i) {
-			if (i < ZT_CERTIFICATEOFOWNERSHIP_MAX_THINGS) {
-				_thingTypes[i] = (uint8_t)b[p++];
-				memcpy(_thingValues[i], b.field(p, ZT_CERTIFICATEOFOWNERSHIP_MAX_THING_VALUE_SIZE), ZT_CERTIFICATEOFOWNERSHIP_MAX_THING_VALUE_SIZE);
-				p += ZT_CERTIFICATEOFOWNERSHIP_MAX_THING_VALUE_SIZE;
-			}
-		}
-
-		_issuedTo.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		p += ZT_ADDRESS_LENGTH;
-		_signedBy.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		p += ZT_ADDRESS_LENGTH;
-		if (b[p++] == 1) {
-			if (b.template at<uint16_t>(p) != ZT_ECC_SIGNATURE_LEN) {
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_CRYPTOGRAPHIC_TOKEN;
-			}
-			p += 2;
-			memcpy(_signature.data, b.field(p, ZT_ECC_SIGNATURE_LEN), ZT_ECC_SIGNATURE_LEN);
-			p += ZT_ECC_SIGNATURE_LEN;
-		}
-		else {
-			p += 2 + b.template at<uint16_t>(p);
-		}
-
-		p += 2 + b.template at<uint16_t>(p);
-		if (p > b.size()) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-		}
-
-		return (p - startAt);
-	}
-
-	// Provides natural sort order by ID
-	inline bool operator<(const CertificateOfOwnership& coo) const
-	{
-		return (_id < coo._id);
-	}
-
-	inline bool operator==(const CertificateOfOwnership& coo) const
-	{
-		return (memcmp(this, &coo, sizeof(CertificateOfOwnership)) == 0);
-	}
-	inline bool operator!=(const CertificateOfOwnership& coo) const
-	{
-		return (memcmp(this, &coo, sizeof(CertificateOfOwnership)) != 0);
-	}
-
-  private:
-	bool _owns(const Thing& t, const void* v, unsigned int l) const;
-
-	uint64_t _networkId;
-	int64_t _ts;
-	uint64_t _flags;
-	uint32_t _id;
-	uint16_t _thingCount;
-	uint8_t _thingTypes[ZT_CERTIFICATEOFOWNERSHIP_MAX_THINGS];
-	uint8_t _thingValues[ZT_CERTIFICATEOFOWNERSHIP_MAX_THINGS][ZT_CERTIFICATEOFOWNERSHIP_MAX_THING_VALUE_SIZE];
-	Address _issuedTo;
-	Address _signedBy;
-	ECC::Signature _signature;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/Cluster.cpp b/node/Cluster.cpp
new file mode 100644
index 000000000..f590ad1cb
--- /dev/null
+++ b/node/Cluster.cpp
@@ -0,0 +1,913 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef ZT_ENABLE_CLUSTER
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <map>
+#include <algorithm>
+#include <set>
+#include <utility>
+#include <list>
+#include <stdexcept>
+
+#include "../version.h"
+
+#include "Cluster.hpp"
+#include "RuntimeEnvironment.hpp"
+#include "MulticastGroup.hpp"
+#include "CertificateOfMembership.hpp"
+#include "Salsa20.hpp"
+#include "Poly1305.hpp"
+#include "Identity.hpp"
+#include "Topology.hpp"
+#include "Packet.hpp"
+#include "Switch.hpp"
+#include "Node.hpp"
+#include "Array.hpp"
+
+namespace ZeroTier {
+
+static inline double _dist3d(int x1,int y1,int z1,int x2,int y2,int z2)
+	throw()
+{
+	double dx = ((double)x2 - (double)x1);
+	double dy = ((double)y2 - (double)y1);
+	double dz = ((double)z2 - (double)z1);
+	return sqrt((dx * dx) + (dy * dy) + (dz * dz));
+}
+
+// An entry in _ClusterSendQueue
+struct _ClusterSendQueueEntry
+{
+	uint64_t timestamp;
+	Address fromPeerAddress;
+	Address toPeerAddress;
+	// if we ever support larger transport MTUs this must be increased
+	unsigned char data[ZT_CLUSTER_SEND_QUEUE_DATA_MAX];
+	unsigned int len;
+	bool unite;
+};
+
+// A multi-index map with entry memory pooling -- this allows our queue to
+// be O(log(N)) and is complex enough that it makes the code a lot cleaner
+// to break it out from Cluster.
+class _ClusterSendQueue
+{
+public:
+	_ClusterSendQueue() :
+		_poolCount(0) {}
+	~_ClusterSendQueue() {} // memory is automatically freed when _chunks is destroyed
+
+	inline void enqueue(uint64_t now,const Address &from,const Address &to,const void *data,unsigned int len,bool unite)
+	{
+		if (len > ZT_CLUSTER_SEND_QUEUE_DATA_MAX)
+			return;
+
+		Mutex::Lock _l(_lock);
+
+		// Delete oldest queue entry for this sender if this enqueue() would take them over the per-sender limit
+		{
+			std::set< std::pair<Address,_ClusterSendQueueEntry *> >::iterator qi(_bySrc.lower_bound(std::pair<Address,_ClusterSendQueueEntry *>(from,(_ClusterSendQueueEntry *)0)));
+			std::set< std::pair<Address,_ClusterSendQueueEntry *> >::iterator oldest(qi);
+			unsigned long countForSender = 0;
+			while ((qi != _bySrc.end())&&(qi->first == from)) {
+				if (qi->second->timestamp < oldest->second->timestamp)
+					oldest = qi;
+				++countForSender;
+				++qi;
+			}
+			if (countForSender >= ZT_CLUSTER_MAX_QUEUE_PER_SENDER) {
+				_byDest.erase(std::pair<Address,_ClusterSendQueueEntry *>(oldest->second->toPeerAddress,oldest->second));
+				_pool[_poolCount++] = oldest->second;
+				_bySrc.erase(oldest);
+			}
+		}
+
+		_ClusterSendQueueEntry *e;
+		if (_poolCount > 0) {
+			e = _pool[--_poolCount];
+		} else {
+			if (_chunks.size() >= ZT_CLUSTER_MAX_QUEUE_CHUNKS)
+				return; // queue is totally full!
+			_chunks.push_back(Array<_ClusterSendQueueEntry,ZT_CLUSTER_QUEUE_CHUNK_SIZE>());
+			e = &(_chunks.back().data[0]);
+			for(unsigned int i=1;i<ZT_CLUSTER_QUEUE_CHUNK_SIZE;++i)
+				_pool[_poolCount++] = &(_chunks.back().data[i]);
+		}
+
+		e->timestamp = now;
+		e->fromPeerAddress = from;
+		e->toPeerAddress = to;
+		memcpy(e->data,data,len);
+		e->len = len;
+		e->unite = unite;
+
+		_bySrc.insert(std::pair<Address,_ClusterSendQueueEntry *>(from,e));
+		_byDest.insert(std::pair<Address,_ClusterSendQueueEntry *>(to,e));
+	}
+
+	inline void expire(uint64_t now)
+	{
+		Mutex::Lock _l(_lock);
+		for(std::set< std::pair<Address,_ClusterSendQueueEntry *> >::iterator qi(_bySrc.begin());qi!=_bySrc.end();) {
+			if ((now - qi->second->timestamp) > ZT_CLUSTER_QUEUE_EXPIRATION) {
+				_byDest.erase(std::pair<Address,_ClusterSendQueueEntry *>(qi->second->toPeerAddress,qi->second));
+				_pool[_poolCount++] = qi->second;
+				_bySrc.erase(qi++);
+			} else ++qi;
+		}
+	}
+
+	/**
+	 * Get and dequeue entries for a given destination address
+	 *
+	 * After use these entries must be returned with returnToPool()!
+	 *
+	 * @param dest Destination address
+	 * @param results Array to fill with results
+	 * @param maxResults Size of results[] in pointers
+	 * @return Number of actual results returned
+	 */
+	inline unsigned int getByDest(const Address &dest,_ClusterSendQueueEntry **results,unsigned int maxResults)
+	{
+		unsigned int count = 0;
+		Mutex::Lock _l(_lock);
+		std::set< std::pair<Address,_ClusterSendQueueEntry *> >::iterator qi(_byDest.lower_bound(std::pair<Address,_ClusterSendQueueEntry *>(dest,(_ClusterSendQueueEntry *)0)));
+		while ((qi != _byDest.end())&&(qi->first == dest)) {
+			_bySrc.erase(std::pair<Address,_ClusterSendQueueEntry *>(qi->second->fromPeerAddress,qi->second));
+			results[count++] = qi->second;
+			if (count == maxResults)
+				break;
+			_byDest.erase(qi++);
+		}
+		return count;
+	}
+
+	/**
+	 * Return entries to pool after use
+	 *
+	 * @param entries Array of entries
+	 * @param count Number of entries
+	 */
+	inline void returnToPool(_ClusterSendQueueEntry **entries,unsigned int count)
+	{
+		Mutex::Lock _l(_lock);
+		for(unsigned int i=0;i<count;++i)
+			_pool[_poolCount++] = entries[i];
+	}
+
+private:
+	std::list< Array<_ClusterSendQueueEntry,ZT_CLUSTER_QUEUE_CHUNK_SIZE> > _chunks;
+	_ClusterSendQueueEntry *_pool[ZT_CLUSTER_QUEUE_CHUNK_SIZE * ZT_CLUSTER_MAX_QUEUE_CHUNKS];
+	unsigned long _poolCount;
+	std::set< std::pair<Address,_ClusterSendQueueEntry *> > _bySrc;
+	std::set< std::pair<Address,_ClusterSendQueueEntry *> > _byDest;
+	Mutex _lock;
+};
+
+Cluster::Cluster(
+	const RuntimeEnvironment *renv,
+	uint16_t id,
+	const std::vector<InetAddress> &zeroTierPhysicalEndpoints,
+	int32_t x,
+	int32_t y,
+	int32_t z,
+	void (*sendFunction)(void *,unsigned int,const void *,unsigned int),
+	void *sendFunctionArg,
+	int (*addressToLocationFunction)(void *,const struct sockaddr_storage *,int *,int *,int *),
+	void *addressToLocationFunctionArg) :
+	RR(renv),
+	_sendQueue(new _ClusterSendQueue()),
+	_sendFunction(sendFunction),
+	_sendFunctionArg(sendFunctionArg),
+	_addressToLocationFunction(addressToLocationFunction),
+	_addressToLocationFunctionArg(addressToLocationFunctionArg),
+	_x(x),
+	_y(y),
+	_z(z),
+	_id(id),
+	_zeroTierPhysicalEndpoints(zeroTierPhysicalEndpoints),
+	_members(new _Member[ZT_CLUSTER_MAX_MEMBERS]),
+	_lastFlushed(0),
+	_lastCleanedRemotePeers(0),
+	_lastCleanedQueue(0)
+{
+	uint16_t stmp[ZT_SHA512_DIGEST_LEN / sizeof(uint16_t)];
+
+	// Generate master secret by hashing the secret from our Identity key pair
+	RR->identity.sha512PrivateKey(_masterSecret);
+
+	// Generate our inbound message key, which is the master secret XORed with our ID and hashed twice
+	memcpy(stmp,_masterSecret,sizeof(stmp));
+	stmp[0] ^= Utils::hton(id);
+	SHA512::hash(stmp,stmp,sizeof(stmp));
+	SHA512::hash(stmp,stmp,sizeof(stmp));
+	memcpy(_key,stmp,sizeof(_key));
+	Utils::burn(stmp,sizeof(stmp));
+}
+
+Cluster::~Cluster()
+{
+	Utils::burn(_masterSecret,sizeof(_masterSecret));
+	Utils::burn(_key,sizeof(_key));
+	delete [] _members;
+	delete _sendQueue;
+}
+
+void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
+{
+	Buffer<ZT_CLUSTER_MAX_MESSAGE_LENGTH> dmsg;
+	{
+		// FORMAT: <[16] iv><[8] MAC><... data>
+		if ((len < 24)||(len > ZT_CLUSTER_MAX_MESSAGE_LENGTH))
+			return;
+
+		// 16-byte IV: first 8 bytes XORed with key, last 8 bytes used as Salsa20 64-bit IV
+		char keytmp[32];
+		memcpy(keytmp,_key,32);
+		for(int i=0;i<8;++i)
+			keytmp[i] ^= reinterpret_cast<const char *>(msg)[i];
+		Salsa20 s20(keytmp,256,reinterpret_cast<const char *>(msg) + 8);
+		Utils::burn(keytmp,sizeof(keytmp));
+
+		// One-time-use Poly1305 key from first 32 bytes of Salsa20 keystream (as per DJB/NaCl "standard")
+		char polykey[ZT_POLY1305_KEY_LEN];
+		memset(polykey,0,sizeof(polykey));
+		s20.encrypt12(polykey,polykey,sizeof(polykey));
+
+		// Compute 16-byte MAC
+		char mac[ZT_POLY1305_MAC_LEN];
+		Poly1305::compute(mac,reinterpret_cast<const char *>(msg) + 24,len - 24,polykey);
+
+		// Check first 8 bytes of MAC against 64-bit MAC in stream
+		if (!Utils::secureEq(mac,reinterpret_cast<const char *>(msg) + 16,8))
+			return;
+
+		// Decrypt!
+		dmsg.setSize(len - 24);
+		s20.decrypt12(reinterpret_cast<const char *>(msg) + 24,const_cast<void *>(dmsg.data()),dmsg.size());
+	}
+
+	if (dmsg.size() < 4)
+		return;
+	const uint16_t fromMemberId = dmsg.at<uint16_t>(0);
+	unsigned int ptr = 2;
+	if (fromMemberId == _id) // sanity check: we don't talk to ourselves
+		return;
+	const uint16_t toMemberId = dmsg.at<uint16_t>(ptr);
+	ptr += 2;
+	if (toMemberId != _id) // sanity check: message not for us?
+		return;
+
+	{	// make sure sender is actually considered a member
+		Mutex::Lock _l3(_memberIds_m);
+		if (std::find(_memberIds.begin(),_memberIds.end(),fromMemberId) == _memberIds.end())
+			return;
+	}
+
+	try {
+		while (ptr < dmsg.size()) {
+			const unsigned int mlen = dmsg.at<uint16_t>(ptr); ptr += 2;
+			const unsigned int nextPtr = ptr + mlen;
+			if (nextPtr > dmsg.size())
+				break;
+
+			int mtype = -1;
+			try {
+				switch((StateMessageType)(mtype = (int)dmsg[ptr++])) {
+					default:
+						break;
+
+					case CLUSTER_MESSAGE_ALIVE: {
+						_Member &m = _members[fromMemberId];
+						Mutex::Lock mlck(m.lock);
+						ptr += 7; // skip version stuff, not used yet
+						m.x = dmsg.at<int32_t>(ptr); ptr += 4;
+						m.y = dmsg.at<int32_t>(ptr); ptr += 4;
+						m.z = dmsg.at<int32_t>(ptr); ptr += 4;
+						ptr += 8; // skip local clock, not used
+						m.load = dmsg.at<uint64_t>(ptr); ptr += 8;
+						m.peers = dmsg.at<uint64_t>(ptr); ptr += 8;
+						ptr += 8; // skip flags, unused
+#ifdef ZT_TRACE
+						std::string addrs;
+#endif
+						unsigned int physicalAddressCount = dmsg[ptr++];
+						m.zeroTierPhysicalEndpoints.clear();
+						for(unsigned int i=0;i<physicalAddressCount;++i) {
+							m.zeroTierPhysicalEndpoints.push_back(InetAddress());
+							ptr += m.zeroTierPhysicalEndpoints.back().deserialize(dmsg,ptr);
+							if (!(m.zeroTierPhysicalEndpoints.back())) {
+								m.zeroTierPhysicalEndpoints.pop_back();
+							}
+#ifdef ZT_TRACE
+							else {
+								if (addrs.length() > 0)
+									addrs.push_back(',');
+								addrs.append(m.zeroTierPhysicalEndpoints.back().toString());
+							}
+#endif
+						}
+#ifdef ZT_TRACE
+						if ((RR->node->now() - m.lastReceivedAliveAnnouncement) >= ZT_CLUSTER_TIMEOUT) {
+							TRACE("[%u] I'm alive! peers close to %d,%d,%d can be redirected to: %s",(unsigned int)fromMemberId,m.x,m.y,m.z,addrs.c_str());
+						}
+#endif
+						m.lastReceivedAliveAnnouncement = RR->node->now();
+					}	break;
+
+					case CLUSTER_MESSAGE_HAVE_PEER: {
+						Identity id;
+						ptr += id.deserialize(dmsg,ptr);
+						if (id) {
+							RR->topology->saveIdentity(id);
+
+							{
+								Mutex::Lock _l(_remotePeers_m);
+								_remotePeers[std::pair<Address,unsigned int>(id.address(),(unsigned int)fromMemberId)] = RR->node->now();
+							}
+
+							_ClusterSendQueueEntry *q[16384]; // 16384 is "tons"
+							unsigned int qc = _sendQueue->getByDest(id.address(),q,16384);
+							for(unsigned int i=0;i<qc;++i)
+								this->sendViaCluster(q[i]->fromPeerAddress,q[i]->toPeerAddress,q[i]->data,q[i]->len,q[i]->unite);
+							_sendQueue->returnToPool(q,qc);
+
+							TRACE("[%u] has %s (retried %u queued sends)",(unsigned int)fromMemberId,id.address().toString().c_str(),qc);
+						}
+					}	break;
+
+					case CLUSTER_MESSAGE_WANT_PEER: {
+						const Address zeroTierAddress(dmsg.field(ptr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); ptr += ZT_ADDRESS_LENGTH;
+						SharedPtr<Peer> peer(RR->topology->getPeerNoCache(zeroTierAddress));
+						if ( (peer) && (peer->hasClusterOptimalPath(RR->node->now())) ) {
+							Buffer<1024> buf;
+							peer->identity().serialize(buf);
+							Mutex::Lock _l2(_members[fromMemberId].lock);
+							_send(fromMemberId,CLUSTER_MESSAGE_HAVE_PEER,buf.data(),buf.size());
+						}
+					}	break;
+
+					case CLUSTER_MESSAGE_REMOTE_PACKET: {
+						const unsigned int plen = dmsg.at<uint16_t>(ptr); ptr += 2;
+						if (plen) {
+							Packet remotep(dmsg.field(ptr,plen),plen); ptr += plen;
+							//TRACE("remote %s from %s via %u (%u bytes)",Packet::verbString(remotep.verb()),remotep.source().toString().c_str(),fromMemberId,plen);
+							switch(remotep.verb()) {
+								case Packet::VERB_WHOIS:            _doREMOTE_WHOIS(fromMemberId,remotep); break;
+								case Packet::VERB_MULTICAST_GATHER: _doREMOTE_MULTICAST_GATHER(fromMemberId,remotep); break;
+								default: break; // ignore things we don't care about across cluster
+							}
+						}
+					}	break;
+
+					case CLUSTER_MESSAGE_PROXY_UNITE: {
+						const Address localPeerAddress(dmsg.field(ptr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); ptr += ZT_ADDRESS_LENGTH;
+						const Address remotePeerAddress(dmsg.field(ptr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); ptr += ZT_ADDRESS_LENGTH;
+						const unsigned int numRemotePeerPaths = dmsg[ptr++];
+						InetAddress remotePeerPaths[256]; // size is 8-bit, so 256 is max
+						for(unsigned int i=0;i<numRemotePeerPaths;++i)
+							ptr += remotePeerPaths[i].deserialize(dmsg,ptr);
+
+						TRACE("[%u] requested that we unite local %s with remote %s",(unsigned int)fromMemberId,localPeerAddress.toString().c_str(),remotePeerAddress.toString().c_str());
+
+						const uint64_t now = RR->node->now();
+						SharedPtr<Peer> localPeer(RR->topology->getPeerNoCache(localPeerAddress));
+						if ((localPeer)&&(numRemotePeerPaths > 0)) {
+							InetAddress bestLocalV4,bestLocalV6;
+							localPeer->getBestActiveAddresses(now,bestLocalV4,bestLocalV6);
+
+							InetAddress bestRemoteV4,bestRemoteV6;
+							for(unsigned int i=0;i<numRemotePeerPaths;++i) {
+								if ((bestRemoteV4)&&(bestRemoteV6))
+									break;
+								switch(remotePeerPaths[i].ss_family) {
+									case AF_INET:
+										if (!bestRemoteV4)
+											bestRemoteV4 = remotePeerPaths[i];
+										break;
+									case AF_INET6:
+										if (!bestRemoteV6)
+											bestRemoteV6 = remotePeerPaths[i];
+										break;
+								}
+							}
+
+							Packet rendezvousForLocal(localPeerAddress,RR->identity.address(),Packet::VERB_RENDEZVOUS);
+							rendezvousForLocal.append((uint8_t)0);
+							remotePeerAddress.appendTo(rendezvousForLocal);
+
+							Buffer<2048> rendezvousForRemote;
+							remotePeerAddress.appendTo(rendezvousForRemote);
+							rendezvousForRemote.append((uint8_t)Packet::VERB_RENDEZVOUS);
+							rendezvousForRemote.addSize(2); // space for actual packet payload length
+							rendezvousForRemote.append((uint8_t)0); // flags == 0
+							localPeerAddress.appendTo(rendezvousForRemote);
+
+							bool haveMatch = false;
+							if ((bestLocalV6)&&(bestRemoteV6)) {
+								haveMatch = true;
+
+								rendezvousForLocal.append((uint16_t)bestRemoteV6.port());
+								rendezvousForLocal.append((uint8_t)16);
+								rendezvousForLocal.append(bestRemoteV6.rawIpData(),16);
+
+								rendezvousForRemote.append((uint16_t)bestLocalV6.port());
+								rendezvousForRemote.append((uint8_t)16);
+								rendezvousForRemote.append(bestLocalV6.rawIpData(),16);
+								rendezvousForRemote.setAt<uint16_t>(ZT_ADDRESS_LENGTH + 1,(uint16_t)(9 + 16));
+							} else if ((bestLocalV4)&&(bestRemoteV4)) {
+								haveMatch = true;
+
+								rendezvousForLocal.append((uint16_t)bestRemoteV4.port());
+								rendezvousForLocal.append((uint8_t)4);
+								rendezvousForLocal.append(bestRemoteV4.rawIpData(),4);
+
+								rendezvousForRemote.append((uint16_t)bestLocalV4.port());
+								rendezvousForRemote.append((uint8_t)4);
+								rendezvousForRemote.append(bestLocalV4.rawIpData(),4);
+								rendezvousForRemote.setAt<uint16_t>(ZT_ADDRESS_LENGTH + 1,(uint16_t)(9 + 4));
+							}
+
+							if (haveMatch) {
+								{
+									Mutex::Lock _l2(_members[fromMemberId].lock);
+									_send(fromMemberId,CLUSTER_MESSAGE_PROXY_SEND,rendezvousForRemote.data(),rendezvousForRemote.size());
+								}
+								RR->sw->send(rendezvousForLocal,true,0);
+							}
+						}
+					}	break;
+
+					case CLUSTER_MESSAGE_PROXY_SEND: {
+						const Address rcpt(dmsg.field(ptr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); ptr += ZT_ADDRESS_LENGTH;
+						const Packet::Verb verb = (Packet::Verb)dmsg[ptr++];
+						const unsigned int len = dmsg.at<uint16_t>(ptr); ptr += 2;
+						Packet outp(rcpt,RR->identity.address(),verb);
+						outp.append(dmsg.field(ptr,len),len); ptr += len;
+						RR->sw->send(outp,true,0);
+						//TRACE("[%u] proxy send %s to %s length %u",(unsigned int)fromMemberId,Packet::verbString(verb),rcpt.toString().c_str(),len);
+					}	break;
+				}
+			} catch ( ... ) {
+				TRACE("invalid message of size %u type %d (inner decode), discarding",mlen,mtype);
+				// drop invalids
+			}
+
+			ptr = nextPtr;
+		}
+	} catch ( ... ) {
+		TRACE("invalid message (outer loop), discarding");
+		// drop invalids
+	}
+}
+
+void Cluster::broadcastHavePeer(const Identity &id)
+{
+	Buffer<1024> buf;
+	id.serialize(buf);
+	Mutex::Lock _l(_memberIds_m);
+	for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
+		Mutex::Lock _l2(_members[*mid].lock);
+		_send(*mid,CLUSTER_MESSAGE_HAVE_PEER,buf.data(),buf.size());
+	}
+}
+
+void Cluster::sendViaCluster(const Address &fromPeerAddress,const Address &toPeerAddress,const void *data,unsigned int len,bool unite)
+{
+	if (len > ZT_PROTO_MAX_PACKET_LENGTH) // sanity check
+		return;
+
+	const uint64_t now = RR->node->now();
+
+	uint64_t mostRecentTs = 0;
+	unsigned int mostRecentMemberId = 0xffffffff;
+	{
+		Mutex::Lock _l2(_remotePeers_m);
+		std::map< std::pair<Address,unsigned int>,uint64_t >::const_iterator rpe(_remotePeers.lower_bound(std::pair<Address,unsigned int>(toPeerAddress,0)));
+		for(;;) {
+			if ((rpe == _remotePeers.end())||(rpe->first.first != toPeerAddress))
+				break;
+			else if (rpe->second > mostRecentTs) {
+				mostRecentTs = rpe->second;
+				mostRecentMemberId = rpe->first.second;
+			}
+			++rpe;
+		}
+	}
+
+	const uint64_t age = now - mostRecentTs;
+	if (age >= (ZT_PEER_ACTIVITY_TIMEOUT / 3)) {
+		const bool enqueueAndWait = ((age >= ZT_PEER_ACTIVITY_TIMEOUT)||(mostRecentMemberId > 0xffff));
+
+		// Poll everyone with WANT_PEER if the age of our most recent entry is
+		// approaching expiration (or has expired, or does not exist).
+		char tmp[ZT_ADDRESS_LENGTH];
+		toPeerAddress.copyTo(tmp,ZT_ADDRESS_LENGTH);
+		{
+			Mutex::Lock _l(_memberIds_m);
+			for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
+				Mutex::Lock _l2(_members[*mid].lock);
+				_send(*mid,CLUSTER_MESSAGE_WANT_PEER,tmp,ZT_ADDRESS_LENGTH);
+			}
+		}
+
+		// If there isn't a good place to send via, then enqueue this for retrying
+		// later and return after having broadcasted a WANT_PEER.
+		if (enqueueAndWait) {
+			TRACE("sendViaCluster %s -> %s enqueueing to wait for HAVE_PEER",fromPeerAddress.toString().c_str(),toPeerAddress.toString().c_str());
+			_sendQueue->enqueue(now,fromPeerAddress,toPeerAddress,data,len,unite);
+			return;
+		}
+	}
+
+	Buffer<1024> buf;
+	if (unite) {
+		InetAddress v4,v6;
+		if (fromPeerAddress) {
+			SharedPtr<Peer> fromPeer(RR->topology->getPeerNoCache(fromPeerAddress));
+			if (fromPeer)
+				fromPeer->getBestActiveAddresses(now,v4,v6);
+		}
+		uint8_t addrCount = 0;
+		if (v4)
+			++addrCount;
+		if (v6)
+			++addrCount;
+		if (addrCount) {
+			toPeerAddress.appendTo(buf);
+			fromPeerAddress.appendTo(buf);
+			buf.append(addrCount);
+			if (v4)
+				v4.serialize(buf);
+			if (v6)
+				v6.serialize(buf);
+		}
+	}
+
+	{
+		Mutex::Lock _l2(_members[mostRecentMemberId].lock);
+		if (buf.size() > 0)
+			_send(mostRecentMemberId,CLUSTER_MESSAGE_PROXY_UNITE,buf.data(),buf.size());
+
+		for(std::vector<InetAddress>::const_iterator i1(_zeroTierPhysicalEndpoints.begin());i1!=_zeroTierPhysicalEndpoints.end();++i1) {
+			for(std::vector<InetAddress>::const_iterator i2(_members[mostRecentMemberId].zeroTierPhysicalEndpoints.begin());i2!=_members[mostRecentMemberId].zeroTierPhysicalEndpoints.end();++i2) {
+				if (i1->ss_family == i2->ss_family) {
+					TRACE("sendViaCluster relaying %u bytes from %s to %s by way of %u (%s->%s)",len,fromPeerAddress.toString().c_str(),toPeerAddress.toString().c_str(),(unsigned int)mostRecentMemberId,i1->toString().c_str(),i2->toString().c_str());
+					RR->node->putPacket(*i1,*i2,data,len);
+					return;
+				}
+			}
+		}
+
+		TRACE("sendViaCluster relaying %u bytes from %s to %s by way of %u failed: no common endpoints with the same address family!",len,fromPeerAddress.toString().c_str(),toPeerAddress.toString().c_str(),(unsigned int)mostRecentMemberId);
+		return;
+	}
+}
+
+void Cluster::sendDistributedQuery(const Packet &pkt)
+{
+	Buffer<4096> buf;
+	buf.append((uint16_t)pkt.size());
+	buf.append(pkt.data(),pkt.size());
+	Mutex::Lock _l(_memberIds_m);
+	for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
+		Mutex::Lock _l2(_members[*mid].lock);
+		_send(*mid,CLUSTER_MESSAGE_REMOTE_PACKET,buf.data(),buf.size());
+	}
+}
+
+void Cluster::doPeriodicTasks()
+{
+	const uint64_t now = RR->node->now();
+
+	if ((now - _lastFlushed) >= ZT_CLUSTER_FLUSH_PERIOD) {
+		_lastFlushed = now;
+
+		Mutex::Lock _l(_memberIds_m);
+		for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
+			Mutex::Lock _l2(_members[*mid].lock);
+
+			if ((now - _members[*mid].lastAnnouncedAliveTo) >= ((ZT_CLUSTER_TIMEOUT / 2) - 1000)) {
+				_members[*mid].lastAnnouncedAliveTo = now;
+
+				Buffer<2048> alive;
+				alive.append((uint16_t)ZEROTIER_ONE_VERSION_MAJOR);
+				alive.append((uint16_t)ZEROTIER_ONE_VERSION_MINOR);
+				alive.append((uint16_t)ZEROTIER_ONE_VERSION_REVISION);
+				alive.append((uint8_t)ZT_PROTO_VERSION);
+				if (_addressToLocationFunction) {
+					alive.append((int32_t)_x);
+					alive.append((int32_t)_y);
+					alive.append((int32_t)_z);
+				} else {
+					alive.append((int32_t)0);
+					alive.append((int32_t)0);
+					alive.append((int32_t)0);
+				}
+				alive.append((uint64_t)now);
+				alive.append((uint64_t)0); // TODO: compute and send load average
+				alive.append((uint64_t)RR->topology->countActive(now));
+				alive.append((uint64_t)0); // unused/reserved flags
+				alive.append((uint8_t)_zeroTierPhysicalEndpoints.size());
+				for(std::vector<InetAddress>::const_iterator pe(_zeroTierPhysicalEndpoints.begin());pe!=_zeroTierPhysicalEndpoints.end();++pe)
+					pe->serialize(alive);
+				_send(*mid,CLUSTER_MESSAGE_ALIVE,alive.data(),alive.size());
+			}
+
+			_flush(*mid);
+		}
+	}
+
+	if ((now - _lastCleanedRemotePeers) >= (ZT_PEER_ACTIVITY_TIMEOUT * 2)) {
+		_lastCleanedRemotePeers = now;
+
+		Mutex::Lock _l(_remotePeers_m);
+		for(std::map< std::pair<Address,unsigned int>,uint64_t >::iterator rp(_remotePeers.begin());rp!=_remotePeers.end();) {
+			if ((now - rp->second) >= ZT_PEER_ACTIVITY_TIMEOUT)
+				_remotePeers.erase(rp++);
+			else ++rp;
+		}
+	}
+
+	if ((now - _lastCleanedQueue) >= ZT_CLUSTER_QUEUE_EXPIRATION) {
+		_lastCleanedQueue = now;
+		_sendQueue->expire(now);
+	}
+}
+
+void Cluster::addMember(uint16_t memberId)
+{
+	if ((memberId >= ZT_CLUSTER_MAX_MEMBERS)||(memberId == _id))
+		return;
+
+	Mutex::Lock _l2(_members[memberId].lock);
+
+	{
+		Mutex::Lock _l(_memberIds_m);
+		if (std::find(_memberIds.begin(),_memberIds.end(),memberId) != _memberIds.end())
+			return;
+		_memberIds.push_back(memberId);
+		std::sort(_memberIds.begin(),_memberIds.end());
+	}
+
+	_members[memberId].clear();
+
+	// Generate this member's message key from the master and its ID
+	uint16_t stmp[ZT_SHA512_DIGEST_LEN / sizeof(uint16_t)];
+	memcpy(stmp,_masterSecret,sizeof(stmp));
+	stmp[0] ^= Utils::hton(memberId);
+	SHA512::hash(stmp,stmp,sizeof(stmp));
+	SHA512::hash(stmp,stmp,sizeof(stmp));
+	memcpy(_members[memberId].key,stmp,sizeof(_members[memberId].key));
+	Utils::burn(stmp,sizeof(stmp));
+
+	// Prepare q
+	_members[memberId].q.clear();
+	char iv[16];
+	Utils::getSecureRandom(iv,16);
+	_members[memberId].q.append(iv,16);
+	_members[memberId].q.addSize(8); // room for MAC
+	_members[memberId].q.append((uint16_t)_id);
+	_members[memberId].q.append((uint16_t)memberId);
+}
+
+void Cluster::removeMember(uint16_t memberId)
+{
+	Mutex::Lock _l(_memberIds_m);
+	std::vector<uint16_t> newMemberIds;
+	for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
+		if (*mid != memberId)
+			newMemberIds.push_back(*mid);
+	}
+	_memberIds = newMemberIds;
+}
+
+bool Cluster::findBetterEndpoint(InetAddress &redirectTo,const Address &peerAddress,const InetAddress &peerPhysicalAddress,bool offload)
+{
+	if (_addressToLocationFunction) {
+		// Pick based on location if it can be determined
+		int px = 0,py = 0,pz = 0;
+		if (_addressToLocationFunction(_addressToLocationFunctionArg,reinterpret_cast<const struct sockaddr_storage *>(&peerPhysicalAddress),&px,&py,&pz) == 0) {
+			TRACE("no geolocation data for %s",peerPhysicalAddress.toIpString().c_str());
+			return false;
+		}
+
+		// Find member closest to this peer
+		const uint64_t now = RR->node->now();
+		std::vector<InetAddress> best;
+		const double currentDistance = _dist3d(_x,_y,_z,px,py,pz);
+		double bestDistance = (offload ? 2147483648.0 : currentDistance);
+		unsigned int bestMember = _id;
+		{
+			Mutex::Lock _l(_memberIds_m);
+			for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
+				_Member &m = _members[*mid];
+				Mutex::Lock _ml(m.lock);
+
+				// Consider member if it's alive and has sent us a location and one or more physical endpoints to send peers to
+				if ( ((now - m.lastReceivedAliveAnnouncement) < ZT_CLUSTER_TIMEOUT) && ((m.x != 0)||(m.y != 0)||(m.z != 0)) && (m.zeroTierPhysicalEndpoints.size() > 0) ) {
+					const double mdist = _dist3d(m.x,m.y,m.z,px,py,pz);
+					if (mdist < bestDistance) {
+						bestDistance = mdist;
+						bestMember = *mid;
+						best = m.zeroTierPhysicalEndpoints;
+					}
+				}
+			}
+		}
+
+		// Redirect to a closer member if it has a ZeroTier endpoint address in the same ss_family
+		for(std::vector<InetAddress>::const_iterator a(best.begin());a!=best.end();++a) {
+			if (a->ss_family == peerPhysicalAddress.ss_family) {
+				TRACE("%s at [%d,%d,%d] is %f from us but %f from %u, can redirect to %s",peerAddress.toString().c_str(),px,py,pz,currentDistance,bestDistance,bestMember,a->toString().c_str());
+				redirectTo = *a;
+				return true;
+			}
+		}
+		TRACE("%s at [%d,%d,%d] is %f from us, no better endpoints found",peerAddress.toString().c_str(),px,py,pz,currentDistance);
+		return false;
+	} else {
+		// TODO: pick based on load if no location info?
+		return false;
+	}
+}
+
+void Cluster::status(ZT_ClusterStatus &status) const
+{
+	const uint64_t now = RR->node->now();
+	memset(&status,0,sizeof(ZT_ClusterStatus));
+
+	status.myId = _id;
+
+	{
+		ZT_ClusterMemberStatus *const s = &(status.members[status.clusterSize++]);
+		s->id = _id;
+		s->alive = 1;
+		s->x = _x;
+		s->y = _y;
+		s->z = _z;
+		s->load = 0; // TODO
+		s->peers = RR->topology->countActive(now);
+		for(std::vector<InetAddress>::const_iterator ep(_zeroTierPhysicalEndpoints.begin());ep!=_zeroTierPhysicalEndpoints.end();++ep) {
+			if (s->numZeroTierPhysicalEndpoints >= ZT_CLUSTER_MAX_ZT_PHYSICAL_ADDRESSES) // sanity check
+				break;
+			memcpy(&(s->zeroTierPhysicalEndpoints[s->numZeroTierPhysicalEndpoints++]),&(*ep),sizeof(struct sockaddr_storage));
+		}
+	}
+
+	{
+		Mutex::Lock _l1(_memberIds_m);
+		for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
+			if (status.clusterSize >= ZT_CLUSTER_MAX_MEMBERS) // sanity check
+				break;
+
+			_Member &m = _members[*mid];
+			Mutex::Lock ml(m.lock);
+
+			ZT_ClusterMemberStatus *const s = &(status.members[status.clusterSize++]);
+			s->id = *mid;
+			s->msSinceLastHeartbeat = (unsigned int)std::min((uint64_t)(~((unsigned int)0)),(now - m.lastReceivedAliveAnnouncement));
+			s->alive = (s->msSinceLastHeartbeat < ZT_CLUSTER_TIMEOUT) ? 1 : 0;
+			s->x = m.x;
+			s->y = m.y;
+			s->z = m.z;
+			s->load = m.load;
+			s->peers = m.peers;
+			for(std::vector<InetAddress>::const_iterator ep(m.zeroTierPhysicalEndpoints.begin());ep!=m.zeroTierPhysicalEndpoints.end();++ep) {
+				if (s->numZeroTierPhysicalEndpoints >= ZT_CLUSTER_MAX_ZT_PHYSICAL_ADDRESSES) // sanity check
+					break;
+				memcpy(&(s->zeroTierPhysicalEndpoints[s->numZeroTierPhysicalEndpoints++]),&(*ep),sizeof(struct sockaddr_storage));
+			}
+		}
+	}
+}
+
+void Cluster::_send(uint16_t memberId,StateMessageType type,const void *msg,unsigned int len)
+{
+	if ((len + 3) > (ZT_CLUSTER_MAX_MESSAGE_LENGTH - (24 + 2 + 2))) // sanity check
+		return;
+	_Member &m = _members[memberId];
+	// assumes m.lock is locked!
+	if ((m.q.size() + len + 3) > ZT_CLUSTER_MAX_MESSAGE_LENGTH)
+		_flush(memberId);
+	m.q.append((uint16_t)(len + 1));
+	m.q.append((uint8_t)type);
+	m.q.append(msg,len);
+}
+
+void Cluster::_flush(uint16_t memberId)
+{
+	_Member &m = _members[memberId];
+	// assumes m.lock is locked!
+	if (m.q.size() > (24 + 2 + 2)) { // 16-byte IV + 8-byte MAC + 2 byte from-member-ID + 2 byte to-member-ID
+		// Create key from member's key and IV
+		char keytmp[32];
+		memcpy(keytmp,m.key,32);
+		for(int i=0;i<8;++i)
+			keytmp[i] ^= m.q[i];
+		Salsa20 s20(keytmp,256,m.q.field(8,8));
+		Utils::burn(keytmp,sizeof(keytmp));
+
+		// One-time-use Poly1305 key from first 32 bytes of Salsa20 keystream (as per DJB/NaCl "standard")
+		char polykey[ZT_POLY1305_KEY_LEN];
+		memset(polykey,0,sizeof(polykey));
+		s20.encrypt12(polykey,polykey,sizeof(polykey));
+
+		// Encrypt m.q in place
+		s20.encrypt12(reinterpret_cast<const char *>(m.q.data()) + 24,const_cast<char *>(reinterpret_cast<const char *>(m.q.data())) + 24,m.q.size() - 24);
+
+		// Add MAC for authentication (encrypt-then-MAC)
+		char mac[ZT_POLY1305_MAC_LEN];
+		Poly1305::compute(mac,reinterpret_cast<const char *>(m.q.data()) + 24,m.q.size() - 24,polykey);
+		memcpy(m.q.field(16,8),mac,8);
+
+		// Send!
+		_sendFunction(_sendFunctionArg,memberId,m.q.data(),m.q.size());
+
+		// Prepare for more
+		m.q.clear();
+		char iv[16];
+		Utils::getSecureRandom(iv,16);
+		m.q.append(iv,16);
+		m.q.addSize(8); // room for MAC
+		m.q.append((uint16_t)_id); // from member ID
+		m.q.append((uint16_t)memberId); // to member ID
+	}
+}
+
+void Cluster::_doREMOTE_WHOIS(uint64_t fromMemberId,const Packet &remotep)
+{
+	if (remotep.payloadLength() >= ZT_ADDRESS_LENGTH) {
+		Identity queried(RR->topology->getIdentity(Address(remotep.payload(),ZT_ADDRESS_LENGTH)));
+		if (queried) {
+			Buffer<1024> routp;
+			remotep.source().appendTo(routp);
+			routp.append((uint8_t)Packet::VERB_OK);
+			routp.addSize(2); // space for length
+			routp.append((uint8_t)Packet::VERB_WHOIS);
+			routp.append(remotep.packetId());
+			queried.serialize(routp);
+			routp.setAt<uint16_t>(ZT_ADDRESS_LENGTH + 1,(uint16_t)(routp.size() - ZT_ADDRESS_LENGTH - 3));
+
+			TRACE("responding to remote WHOIS from %s @ %u with identity of %s",remotep.source().toString().c_str(),(unsigned int)fromMemberId,queried.address().toString().c_str());
+			Mutex::Lock _l2(_members[fromMemberId].lock);
+			_send(fromMemberId,CLUSTER_MESSAGE_PROXY_SEND,routp.data(),routp.size());
+		}
+	}
+}
+
+void Cluster::_doREMOTE_MULTICAST_GATHER(uint64_t fromMemberId,const Packet &remotep)
+{
+	const uint64_t nwid = remotep.at<uint64_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID);
+	const MulticastGroup mg(MAC(remotep.field(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC,6),6),remotep.at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_ADI));
+	unsigned int gatherLimit = remotep.at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_GATHER_LIMIT);
+	const Address remotePeerAddress(remotep.source());
+
+	if (gatherLimit) {
+		Buffer<ZT_PROTO_MAX_PACKET_LENGTH> routp;
+		remotePeerAddress.appendTo(routp);
+		routp.append((uint8_t)Packet::VERB_OK);
+		routp.addSize(2); // space for length
+		routp.append((uint8_t)Packet::VERB_MULTICAST_GATHER);
+		routp.append(remotep.packetId());
+		routp.append(nwid);
+		mg.mac().appendTo(routp);
+		routp.append((uint32_t)mg.adi());
+
+		if (gatherLimit > ((ZT_CLUSTER_MAX_MESSAGE_LENGTH - 80) / 5))
+			gatherLimit = ((ZT_CLUSTER_MAX_MESSAGE_LENGTH - 80) / 5);
+		if (RR->mc->gather(remotePeerAddress,nwid,mg,routp,gatherLimit)) {
+			routp.setAt<uint16_t>(ZT_ADDRESS_LENGTH + 1,(uint16_t)(routp.size() - ZT_ADDRESS_LENGTH - 3));
+
+			TRACE("responding to remote MULTICAST_GATHER from %s @ %u with %u bytes",remotePeerAddress.toString().c_str(),(unsigned int)fromMemberId,routp.size());
+			Mutex::Lock _l2(_members[fromMemberId].lock);
+			_send(fromMemberId,CLUSTER_MESSAGE_PROXY_SEND,routp.data(),routp.size());
+		}
+	}
+}
+
+} // namespace ZeroTier
+
+#endif // ZT_ENABLE_CLUSTER
diff --git a/node/Cluster.hpp b/node/Cluster.hpp
new file mode 100644
index 000000000..dafbf4255
--- /dev/null
+++ b/node/Cluster.hpp
@@ -0,0 +1,406 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_CLUSTER_HPP
+#define ZT_CLUSTER_HPP
+
+#ifdef ZT_ENABLE_CLUSTER
+
+#include <map>
+
+#include "Constants.hpp"
+#include "../include/ZeroTierOne.h"
+#include "Address.hpp"
+#include "InetAddress.hpp"
+#include "SHA512.hpp"
+#include "Utils.hpp"
+#include "Buffer.hpp"
+#include "Mutex.hpp"
+#include "SharedPtr.hpp"
+#include "Hashtable.hpp"
+#include "Packet.hpp"
+#include "SharedPtr.hpp"
+
+/**
+ * Timeout for cluster members being considered "alive"
+ *
+ * A cluster member is considered dead and will no longer have peers
+ * redirected to it if we have not heard a heartbeat in this long.
+ */
+#define ZT_CLUSTER_TIMEOUT 5000
+
+/**
+ * Desired period between doPeriodicTasks() in milliseconds
+ */
+#define ZT_CLUSTER_PERIODIC_TASK_PERIOD 20
+
+/**
+ * How often to flush outgoing message queues (maximum interval)
+ */
+#define ZT_CLUSTER_FLUSH_PERIOD ZT_CLUSTER_PERIODIC_TASK_PERIOD
+
+/**
+ * Maximum number of queued outgoing packets per sender address
+ */
+#define ZT_CLUSTER_MAX_QUEUE_PER_SENDER 16
+
+/**
+ * Expiration time for send queue entries
+ */
+#define ZT_CLUSTER_QUEUE_EXPIRATION 3000
+
+/**
+ * Chunk size for allocating queue entries
+ *
+ * Queue entries are allocated in chunks of this many and are added to a pool.
+ * ZT_CLUSTER_MAX_QUEUE_GLOBAL must be evenly divisible by this.
+ */
+#define ZT_CLUSTER_QUEUE_CHUNK_SIZE 32
+
+/**
+ * Maximum number of chunks to ever allocate
+ *
+ * This is a global sanity limit to prevent resource exhaustion attacks. It
+ * works out to about 600mb of RAM. You'll never see this on a normal edge
+ * node. We're unlikely to see this on a root server unless someone is DOSing
+ * us. In that case cluster relaying will be affected but other functions
+ * should continue to operate normally.
+ */
+#define ZT_CLUSTER_MAX_QUEUE_CHUNKS 8194
+
+/**
+ * Max data per queue entry
+ */
+#define ZT_CLUSTER_SEND_QUEUE_DATA_MAX 1500
+
+namespace ZeroTier {
+
+class RuntimeEnvironment;
+class MulticastGroup;
+class Peer;
+class Identity;
+
+// Internal class implemented inside Cluster.cpp
+class _ClusterSendQueue;
+
+/**
+ * Multi-homing cluster state replication and packet relaying
+ *
+ * Multi-homing means more than one node sharing the same ZeroTier identity.
+ * There is nothing in the protocol to prevent this, but to make it work well
+ * requires the devices sharing an identity to cooperate and share some
+ * information.
+ *
+ * There are three use cases we want to fulfill:
+ *
+ * (1) Multi-homing of root servers with handoff for efficient routing,
+ *     HA, and load balancing across many commodity nodes.
+ * (2) Multi-homing of network controllers for the same reason.
+ * (3) Multi-homing of nodes on virtual networks, such as domain servers
+ *     and other important endpoints.
+ *
+ * These use cases are in order of escalating difficulty. The initial
+ * version of Cluster is aimed at satisfying the first, though you are
+ * free to try #2 and #3.
+ */
+class Cluster
+{
+public:
+	/**
+	 * State message types
+	 */
+	enum StateMessageType
+	{
+		CLUSTER_MESSAGE_NOP = 0,
+
+		/**
+		 * This cluster member is alive:
+		 *   <[2] version minor>
+		 *   <[2] version major>
+		 *   <[2] version revision>
+		 *   <[1] protocol version>
+		 *   <[4] X location (signed 32-bit)>
+		 *   <[4] Y location (signed 32-bit)>
+		 *   <[4] Z location (signed 32-bit)>
+		 *   <[8] local clock at this member>
+		 *   <[8] load average>
+		 *   <[8] number of peers>
+		 *   <[8] flags (currently unused, must be zero)>
+		 *   <[1] number of preferred ZeroTier endpoints>
+		 *   <[...] InetAddress(es) of preferred ZeroTier endpoint(s)>
+		 *
+		 * Cluster members constantly broadcast an alive heartbeat and will only
+		 * receive peer redirects if they've done so within the timeout.
+		 */
+		CLUSTER_MESSAGE_ALIVE = 1,
+
+		/**
+		 * Cluster member has this peer:
+		 *   <[...] serialized identity of peer>
+		 *
+		 * This is typically sent in response to WANT_PEER but can also be pushed
+		 * to prepopulate if this makes sense.
+		 */
+		CLUSTER_MESSAGE_HAVE_PEER = 2,
+
+		/**
+		 * Cluster member wants this peer:
+		 *   <[5] ZeroTier address of peer>
+		 *
+		 * Members that have a direct link to this peer will respond with
+		 * HAVE_PEER.
+		 */
+		CLUSTER_MESSAGE_WANT_PEER = 3,
+
+		/**
+		 * A remote packet that we should also possibly respond to:
+		 *   <[2] 16-bit length of remote packet>
+		 *   <[...] remote packet payload>
+		 *
+		 * Cluster members may relay requests by relaying the request packet.
+		 * These may include requests such as WHOIS and MULTICAST_GATHER. The
+		 * packet must be already decrypted, decompressed, and authenticated.
+		 *
+		 * This can only be used for small request packets as per the cluster
+		 * message size limit, but since these are the only ones in question
+		 * this is fine.
+		 *
+		 * If a response is generated it is sent via PROXY_SEND.
+		 */
+		CLUSTER_MESSAGE_REMOTE_PACKET = 4,
+
+		/**
+		 * Request that VERB_RENDEZVOUS be sent to a peer that we have:
+		 *   <[5] ZeroTier address of peer on recipient's side>
+		 *   <[5] ZeroTier address of peer on sender's side>
+		 *   <[1] 8-bit number of sender's peer's active path addresses>
+		 *   <[...] series of serialized InetAddresses of sender's peer's paths>
+		 *
+		 * This requests that we perform NAT-t introduction between a peer that
+		 * we have and one on the sender's side. The sender furnishes contact
+		 * info for its peer, and we send VERB_RENDEZVOUS to both sides: to ours
+		 * directly and with PROXY_SEND to theirs.
+		 */
+		CLUSTER_MESSAGE_PROXY_UNITE = 5,
+
+		/**
+		 * Request that a cluster member send a packet to a locally-known peer:
+		 *   <[5] ZeroTier address of recipient>
+		 *   <[1] packet verb>
+		 *   <[2] length of packet payload>
+		 *   <[...] packet payload>
+		 *
+		 * This differs from RELAY in that it requests the receiving cluster
+		 * member to actually compose a ZeroTier Packet from itself to the
+		 * provided recipient. RELAY simply says "please forward this blob."
+		 * RELAY is used to implement peer-to-peer relaying with RENDEZVOUS,
+		 * while PROXY_SEND is used to implement proxy sending (which right
+		 * now is only used to send RENDEZVOUS).
+		 */
+		CLUSTER_MESSAGE_PROXY_SEND = 6,
+
+		/**
+		 * Replicate a network config for a network we belong to:
+		 *   <[8] 64-bit network ID>
+		 *   <[2] 16-bit length of network config>
+		 *   <[...] serialized network config>
+		 *
+		 * This is used by clusters to avoid every member having to query
+		 * for the same netconf for networks all members belong to.
+		 *
+		 * TODO: not implemented yet!
+		 */
+		CLUSTER_MESSAGE_NETWORK_CONFIG = 7
+	};
+
+	/**
+	 * Construct a new cluster
+	 */
+	Cluster(
+		const RuntimeEnvironment *renv,
+		uint16_t id,
+		const std::vector<InetAddress> &zeroTierPhysicalEndpoints,
+		int32_t x,
+		int32_t y,
+		int32_t z,
+		void (*sendFunction)(void *,unsigned int,const void *,unsigned int),
+		void *sendFunctionArg,
+		int (*addressToLocationFunction)(void *,const struct sockaddr_storage *,int *,int *,int *),
+		void *addressToLocationFunctionArg);
+
+	~Cluster();
+
+	/**
+	 * @return This cluster member's ID
+	 */
+	inline uint16_t id() const throw() { return _id; }
+
+	/**
+	 * Handle an incoming intra-cluster message
+	 *
+	 * @param data Message data
+	 * @param len Message length (max: ZT_CLUSTER_MAX_MESSAGE_LENGTH)
+	 */
+	void handleIncomingStateMessage(const void *msg,unsigned int len);
+
+	/**
+	 * Broadcast that we have a given peer
+	 *
+	 * This should be done when new peers are first contacted.
+	 *
+	 * @param id Identity of peer
+	 */
+	void broadcastHavePeer(const Identity &id);
+
+	/**
+	 * Send this packet via another node in this cluster if another node has this peer
+	 *
+	 * This is used in the outgoing packet and relaying logic in Switch to
+	 * relay packets to other cluster members. It isn't PROXY_SEND-- that is
+	 * used internally in Cluster to send responses to peer queries.
+	 *
+	 * @param fromPeerAddress Source peer address (if known, should be NULL for fragments)
+	 * @param toPeerAddress Destination peer address
+	 * @param data Packet or packet fragment data
+	 * @param len Length of packet or fragment
+	 * @param unite If true, also request proxy unite across cluster
+	 */
+	void sendViaCluster(const Address &fromPeerAddress,const Address &toPeerAddress,const void *data,unsigned int len,bool unite);
+
+	/**
+	 * Send a distributed query to other cluster members
+	 *
+	 * Some queries such as WHOIS or MULTICAST_GATHER need a response from other
+	 * cluster members. Replies (if any) will be sent back to the peer via
+	 * PROXY_SEND across the cluster.
+	 *
+	 * @param pkt Packet to distribute
+	 */
+	void sendDistributedQuery(const Packet &pkt);
+
+	/**
+	 * Call every ~ZT_CLUSTER_PERIODIC_TASK_PERIOD milliseconds.
+	 */
+	void doPeriodicTasks();
+
+	/**
+	 * Add a member ID to this cluster
+	 *
+	 * @param memberId Member ID
+	 */
+	void addMember(uint16_t memberId);
+
+	/**
+	 * Remove a member ID from this cluster
+	 *
+	 * @param memberId Member ID to remove
+	 */
+	void removeMember(uint16_t memberId);
+
+	/**
+	 * Find a better cluster endpoint for this peer (if any)
+	 *
+	 * @param redirectTo InetAddress to be set to a better endpoint (if there is one)
+	 * @param peerAddress Address of peer to (possibly) redirect
+	 * @param peerPhysicalAddress Physical address of peer's current best path (where packet was most recently received or getBestPath()->address())
+	 * @param offload Always redirect if possible -- can be used to offload peers during shutdown
+	 * @return True if redirectTo was set to a new address, false if redirectTo was not modified
+	 */
+	bool findBetterEndpoint(InetAddress &redirectTo,const Address &peerAddress,const InetAddress &peerPhysicalAddress,bool offload);
+
+	/**
+	 * Fill out ZT_ClusterStatus structure (from core API)
+	 *
+	 * @param status Reference to structure to hold result (anything there is replaced)
+	 */
+	void status(ZT_ClusterStatus &status) const;
+
+private:
+	void _send(uint16_t memberId,StateMessageType type,const void *msg,unsigned int len);
+	void _flush(uint16_t memberId);
+
+	void _doREMOTE_WHOIS(uint64_t fromMemberId,const Packet &remotep);
+	void _doREMOTE_MULTICAST_GATHER(uint64_t fromMemberId,const Packet &remotep);
+
+	// These are initialized in the constructor and remain immutable ------------
+	uint16_t _masterSecret[ZT_SHA512_DIGEST_LEN / sizeof(uint16_t)];
+	unsigned char _key[ZT_PEER_SECRET_KEY_LENGTH];
+	const RuntimeEnvironment *RR;
+	_ClusterSendQueue *const _sendQueue;
+	void (*_sendFunction)(void *,unsigned int,const void *,unsigned int);
+	void *_sendFunctionArg;
+	int (*_addressToLocationFunction)(void *,const struct sockaddr_storage *,int *,int *,int *);
+	void *_addressToLocationFunctionArg;
+	const int32_t _x;
+	const int32_t _y;
+	const int32_t _z;
+	const uint16_t _id;
+	const std::vector<InetAddress> _zeroTierPhysicalEndpoints;
+	// end immutable fields -----------------------------------------------------
+
+	struct _Member
+	{
+		unsigned char key[ZT_PEER_SECRET_KEY_LENGTH];
+
+		uint64_t lastReceivedAliveAnnouncement;
+		uint64_t lastAnnouncedAliveTo;
+
+		uint64_t load;
+		uint64_t peers;
+		int32_t x,y,z;
+
+		std::vector<InetAddress> zeroTierPhysicalEndpoints;
+
+		Buffer<ZT_CLUSTER_MAX_MESSAGE_LENGTH> q;
+
+		Mutex lock;
+
+		inline void clear()
+		{
+			lastReceivedAliveAnnouncement = 0;
+			lastAnnouncedAliveTo = 0;
+			load = 0;
+			peers = 0;
+			x = 0;
+			y = 0;
+			z = 0;
+			zeroTierPhysicalEndpoints.clear();
+			q.clear();
+		}
+
+		_Member() { this->clear(); }
+		~_Member() { Utils::burn(key,sizeof(key)); }
+	};
+	_Member *const _members;
+
+	std::vector<uint16_t> _memberIds;
+	Mutex _memberIds_m;
+
+	std::map< std::pair<Address,unsigned int>,uint64_t > _remotePeers; // we need ordered behavior and lower_bound here
+	Mutex _remotePeers_m;
+
+	uint64_t _lastFlushed;
+	uint64_t _lastCleanedRemotePeers;
+	uint64_t _lastCleanedQueue;
+};
+
+} // namespace ZeroTier
+
+#endif // ZT_ENABLE_CLUSTER
+
+#endif
diff --git a/node/Constants.hpp b/node/Constants.hpp
index 66621ec49..4bca7d29e 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -1,15 +1,20 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_CONSTANTS_HPP
 #define ZT_CONSTANTS_HPP
@@ -29,12 +34,6 @@
 // Also makes sure __BYTE_ORDER is defined reasonably.
 //
 
-#ifndef ZT_INLINE
-#define ZT_INLINE inline
-#endif
-
-#define restrict
-
 // Hack: make sure __GCC__ is defined on old GCC compilers
 #ifndef __GCC__
 #if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1) || defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) || defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
@@ -50,19 +49,9 @@
 #define __UNIX_LIKE__
 #endif
 #include <endian.h>
-#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64) || defined(__aarch64__))
-#ifdef ZT_SSO_SUPPORTED
-#define ZT_SSO_ENABLED 1
-#endif
-#endif
 #endif
 
 #ifdef __APPLE__
-#ifdef ZT_SSO_SUPPORTED
-#define ZT_SSO_ENABLED 1
-#endif
-#define likely(x)	__builtin_expect((x), 1)
-#define unlikely(x) __builtin_expect((x), 0)
 #include <TargetConditionals.h>
 #ifndef __UNIX_LIKE__
 #define __UNIX_LIKE__
@@ -73,10 +62,15 @@
 #include <machine/endian.h>
 #endif
 
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-#ifdef ZT_SSO_SUPPORTED
-#define ZT_SSO_ENABLED 0
+// Defined this macro to disable "type punning" on a number of targets that
+// have issues with unaligned memory access.
+#if defined(__arm__) || defined(__ARMEL__) || (defined(__APPLE__) && ( (defined(TARGET_OS_IPHONE) && (TARGET_OS_IPHONE != 0)) || (defined(TARGET_OS_WATCH) && (TARGET_OS_WATCH != 0)) || (defined(TARGET_IPHONE_SIMULATOR) && (TARGET_IPHONE_SIMULATOR != 0)) ) )
+#ifndef ZT_NO_TYPE_PUNNING
+#define ZT_NO_TYPE_PUNNING
 #endif
+#endif
+
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #ifndef __UNIX_LIKE__
 #define __UNIX_LIKE__
 #endif
@@ -85,16 +79,13 @@
 #endif
 #include <machine/endian.h>
 #ifndef __BYTE_ORDER
-#define __BYTE_ORDER	_BYTE_ORDER
+#define __BYTE_ORDER _BYTE_ORDER
 #define __LITTLE_ENDIAN _LITTLE_ENDIAN
-#define __BIG_ENDIAN	_BIG_ENDIAN
+#define __BIG_ENDIAN _BIG_ENDIAN
 #endif
 #endif
 
 #if defined(_WIN32) || defined(_WIN64)
-#ifdef ZT_SSO_SUPPORTED
-#define ZT_SSO_ENABLED 1
-#endif
 #ifndef __WINDOWS__
 #define __WINDOWS__
 #endif
@@ -106,169 +97,33 @@
 #pragma warning(disable : 4101)
 #undef __UNIX_LIKE__
 #undef __BSD__
-#include <windows.h>
-#include <winsock2.h>
-#endif
-
-#ifdef __NetBSD__
-#ifndef RTF_MULTICAST
-#define RTF_MULTICAST 0x20000000
-#endif
-#endif
-
-#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64))
-#define ZT_ARCH_X64 1
-#include <emmintrin.h>
-#include <immintrin.h>
-#include <xmmintrin.h>
-#endif
-
-#if (defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(ZT_ARCH_ARM_HAS_NEON))
-#if (defined(__APPLE__) && ! defined(__LP64__)) || (defined(__ANDROID__) && defined(__arm__))
-#ifdef ZT_ARCH_ARM_HAS_NEON
-#undef ZT_ARCH_ARM_HAS_NEON
-#endif
-#else
-#ifndef ZT_ARCH_ARM_HAS_NEON
-#define ZT_ARCH_ARM_HAS_NEON 1
-#endif
-#include <arm_neon.h>
-/*#include <arm_acle.h>*/
-#endif
-#endif
-
-#ifndef ZT_ARCH_ARM_HAS_CRYPTO
-#if defined(__ARM_FEATURE_CRYPTO)
-// ARM Cryptography Extension
-#define ZT_ARCH_ARM_HAS_CRYPTO
-#endif
-#endif
-
-// Define ZT_NO_TYPE_PUNNING to disable reckless casts on anything other than x86/x64.
-#if (! (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || defined(i386) || defined(__i386) || defined(__i386__) || defined(__i486__) || defined(__i586__)          \
-		|| defined(__i686__) || defined(_M_IX86) || defined(__X86__) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) || defined(__386)))
-#ifndef ZT_NO_TYPE_PUNNING
-#define ZT_NO_TYPE_PUNNING 1
-#endif
-#endif
-#ifdef ZT_NO_TYPE_PUNNING
-#ifndef ZT_NO_UNALIGNED_ACCESS
-#define ZT_NO_UNALIGNED_ACCESS 1
-#endif
+#define ZT_PATH_SEPARATOR '\\'
+#define ZT_PATH_SEPARATOR_S "\\"
+#define ZT_EOL_S "\r\n"
+#include <WinSock2.h>
+#include <Windows.h>
 #endif
 
 // Assume little endian if not defined
-#if (defined(__APPLE__) || defined(__WINDOWS__)) && (! defined(__BYTE_ORDER))
+#if (defined(__APPLE__) || defined(__WINDOWS__)) && (!defined(__BYTE_ORDER))
 #undef __BYTE_ORDER
 #undef __LITTLE_ENDIAN
 #undef __BIG_ENDIAN
-#define __BIG_ENDIAN	4321
+#define __BIG_ENDIAN 4321
 #define __LITTLE_ENDIAN 1234
-#define __BYTE_ORDER	1234
+#define __BYTE_ORDER 1234
 #endif
 
-#ifdef __WINDOWS__
-#define ZT_PATH_SEPARATOR	'\\'
-#define ZT_PATH_SEPARATOR_S "\\"
-#define ZT_EOL_S			"\r\n"
-#else
-#define ZT_PATH_SEPARATOR	'/'
+#ifdef __UNIX_LIKE__
+#define ZT_PATH_SEPARATOR '/'
 #define ZT_PATH_SEPARATOR_S "/"
-#define ZT_EOL_S			"\n"
+#define ZT_EOL_S "\n"
 #endif
 
 #ifndef __BYTE_ORDER
 #include <endian.h>
 #endif
 
-#if (defined(__GNUC__) && (__GNUC__ >= 3)) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__)
-#ifndef likely
-#define likely(x) __builtin_expect((x), 1)
-#endif
-#ifndef unlikely
-#define unlikely(x) __builtin_expect((x), 0)
-#endif
-#else
-#ifndef likely
-#define likely(x) (x)
-#endif
-#ifndef unlikely
-#define unlikely(x) (x)
-#endif
-#endif
-
-#ifdef __WINDOWS__
-#define ZT_PACKED_STRUCT(D) __pragma(pack(push, 1)) D __pragma(pack(pop))
-#else
-#define ZT_PACKED_STRUCT(D) D __attribute__((packed))
-#endif
-
-#if defined(_WIN32)
-#define ZT_PLATFORM_NAME "windows"	 // Windows
-#elif defined(_WIN64)
-#define ZT_PLATFORM_NAME "windows"	 // Windows
-#elif defined(__CYGWIN__)
-#define ZT_PLATFORM_NAME "windows"	 // Windows (Cygwin POSIX under Microsoft Window)
-#elif defined(__ANDROID__)
-#define ZT_PLATFORM_NAME "android"	 // Android (implies Linux, so it must come first)
-#elif defined(__linux__)
-#define ZT_PLATFORM_NAME "linux"   // Debian, Ubuntu, Gentoo, Fedora, openSUSE, RedHat, Centos and other
-#elif defined(__unix__) || ! defined(__APPLE__) && defined(__MACH__)
-#include <sys/param.h>
-#if defined(BSD)
-#define ZT_PLATFORM_NAME "bsd"	 // FreeBSD, NetBSD, OpenBSD, DragonFly BSD
-#endif
-#elif defined(__hpux)
-#define ZT_PLATFORM_NAME "hp-ux"   // HP-UX
-#elif defined(_AIX)
-#define ZT_PLATFORM_NAME "aix"					// IBM AIX
-#elif defined(__APPLE__) && defined(__MACH__)	// Apple OSX and iOS (Darwin)
-#include <TargetConditionals.h>
-#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR == 1
-#define ZT_PLATFORM_NAME "ios_sim"	 // Apple iOS
-#elif defined(TARGET_OS_IPAD) && TARGET_OS_IPAD == 1
-#define ZT_PLATFORM_NAME "ios_ipad"
-#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1
-#define ZT_PLATFORM_NAME "ios_iphone"	// Apple iOS
-#elif defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1
-#define ZT_PLATFORM_NAME "macos"   // Apple OSX
-#endif
-#elif defined(__sun) && defined(__SVR4)
-#define ZT_PLATFORM_NAME "solaris"	 // Oracle Solaris, Open Indiana
-#else
-#define ZT_PLATFORM_NAME "unknown"
-#endif
-#ifndef ZT_PLATFORM_NAME
-#define ZT_PLATFORM_NAME "unknown"
-#endif
-
-#if defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64) || defined(_M_AMD64)
-#define ZT_ARCH_NAME "x86_64"
-#elif defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(_X86_) || defined(_M_IX86) || defined(__X86__) || defined(__I86__) || defined(_M_I86)
-#define ZT_ARCH_NAME "x86"
-#elif defined(__aarch64__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-#define ZT_ARCH_NAME "arm64"
-#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_ARM) || defined(_M_ARM) || defined(_M_ARMT) || defined(__arm) || defined(__thumb__)
-#define ZT_ARCH_NAME "arm"
-#elif defined(__loongarch__) || defined(_LOONGARCH_ARCH)
-#define ZT_ARCH_NAME "loongarch"
-#elif defined(__mips__) || defined(__MIPS__)
-#define ZT_ARCH_NAME "mips"
-#elif defined(__riscv) || defined(__riscv_xlen)
-#define ZT_ARCH_NAME "riscv"
-#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC)
-#define ZT_ARCH_NAME "powerpc"
-#elif defined(__s390__) || defined(__s390x__) || defined(__zarch__)
-#define ZT_ARCH_NAME "s390"
-#else
-#define ZT_ARCH_NAME "unknown"
-#endif
-#ifndef ZT_ARCH_NAME
-#define ZT_ARCH_NAME "unknown"
-#endif
-
-#define ZT_TARGET_NAME (ZT_PLATFORM_NAME "/" ZT_ARCH_NAME)
-
 /**
  * Length of a ZeroTier address in bytes
  */
@@ -279,60 +134,85 @@
  */
 #define ZT_ADDRESS_LENGTH_HEX 10
 
-/**
- * Size of symmetric key (only the first 32 bits are used for some ciphers)
- */
-#define ZT_SYMMETRIC_KEY_SIZE 48
-
 /**
  * Addresses beginning with this byte are reserved for the joy of in-band signaling
  */
 #define ZT_ADDRESS_RESERVED_PREFIX 0xff
 
 /**
- * Default MTU used for Ethernet tap device
+ * Default payload MTU for UDP packets
+ *
+ * In the future we might support UDP path MTU discovery, but for now we
+ * set a maximum that is equal to 1500 minus 8 (for PPPoE overhead, common
+ * in some markets) minus 48 (IPv6 UDP overhead).
  */
-#define ZT_DEFAULT_MTU 2800
+#define ZT_UDP_DEFAULT_PAYLOAD_MTU 1444
 
 /**
- * Maximum number of packet fragments we'll support (protocol max: 16)
+ * Default MTU used for Ethernet tap device
  */
-#define ZT_MAX_PACKET_FRAGMENTS 7
+#define ZT_IF_MTU ZT_MAX_MTU
+
+/**
+ * Maximum number of packet fragments we'll support
+ *
+ * The actual spec allows 16, but this is the most we'll support right
+ * now. Packets with more than this many fragments are dropped.
+ */
+#define ZT_MAX_PACKET_FRAGMENTS 4
 
 /**
  * Size of RX queue
+ *
+ * This is about 2mb, and can be decreased for small devices. A queue smaller
+ * than about 4 is probably going to cause a lot of lost packets.
  */
-#define ZT_RX_QUEUE_SIZE 32
+#define ZT_RX_QUEUE_SIZE 64
 
 /**
- * Size of TX queue
+ * RX queue entries older than this do not "exist"
  */
-#define ZT_TX_QUEUE_SIZE 32
+#define ZT_RX_QUEUE_EXPIRE 4000
 
 /**
- * Minimum delay between timer task checks to prevent thrashing
+ * Length of secret key in bytes -- 256-bit -- do not change
  */
-#define ZT_CORE_TIMER_TASK_GRANULARITY 60
+#define ZT_PEER_SECRET_KEY_LENGTH 32
 
 /**
  * How often Topology::clean() and Network::clean() and similar are called, in ms
  */
-#define ZT_HOUSEKEEPING_PERIOD 30000
+#define ZT_HOUSEKEEPING_PERIOD 120000
+
+/**
+ * Overriding granularity for timer tasks to prevent CPU-intensive thrashing on every packet
+ */
+#define ZT_CORE_TIMER_TASK_GRANULARITY 500
+
+/**
+ * How long to remember peer records in RAM if they haven't been used
+ */
+#define ZT_PEER_IN_MEMORY_EXPIRATION 600000
 
 /**
  * Delay between WHOIS retries in ms
  */
-#define ZT_WHOIS_RETRY_DELAY 500
+#define ZT_WHOIS_RETRY_DELAY 1000
+
+/**
+ * Maximum identity WHOIS retries (each attempt tries consulting a different peer)
+ */
+#define ZT_MAX_WHOIS_RETRIES 3
 
 /**
  * Transmit queue entry timeout
  */
-#define ZT_TRANSMIT_QUEUE_TIMEOUT 5000
+#define ZT_TRANSMIT_QUEUE_TIMEOUT (ZT_WHOIS_RETRY_DELAY * (ZT_MAX_WHOIS_RETRIES + 1))
 
 /**
  * Receive queue entry timeout
  */
-#define ZT_RECEIVE_QUEUE_TIMEOUT 5000
+#define ZT_RECEIVE_QUEUE_TIMEOUT (ZT_WHOIS_RETRY_DELAY * (ZT_MAX_WHOIS_RETRIES + 1))
 
 /**
  * Maximum number of ZT hops allowed (this is not IP hops/TTL)
@@ -346,11 +226,6 @@
  */
 #define ZT_MULTICAST_LIKE_EXPIRE 600000
 
-/**
- * Period for multicast LIKE announcements
- */
-#define ZT_MULTICAST_ANNOUNCE_PERIOD 60000
-
 /**
  * Delay between explicit MULTICAST_GATHER requests for a given multicast channel
  */
@@ -364,172 +239,53 @@
 #define ZT_MULTICAST_TRANSMIT_TIMEOUT 5000
 
 /**
- * Delay between checks of peer pings, etc., and also related housekeeping tasks
+ * Default maximum number of peers to address with a single multicast (if unspecified in network config)
  */
-#define ZT_PING_CHECK_INTERVAL 5000
+#define ZT_MULTICAST_DEFAULT_LIMIT 32
 
 /**
- * How often the local.conf file is checked for changes (service, should be moved there)
- */
-#define ZT_LOCAL_CONF_FILE_CHECK_INTERVAL 10000
-
-/**
- * How frequently to send heartbeats over in-use paths
- */
-#define ZT_PATH_HEARTBEAT_PERIOD 14000
-
-/**
- * Do not accept HELLOs over a given path more often than this
- */
-#define ZT_PATH_HELLO_RATE_LIMIT 1000
-
-/**
- * Delay between full-fledge pings of directly connected peers
- */
-#define ZT_PEER_PING_PERIOD 60000
-
-/**
- * Paths are considered expired if they have not sent us a real packet in this long
- */
-#define ZT_PEER_PATH_EXPIRATION ((ZT_PEER_PING_PERIOD * 4) + 3000)
-
-/**
- * How often to retry expired paths that we're still remembering
- */
-#define ZT_PEER_EXPIRED_PATH_TRIAL_PERIOD (ZT_PEER_PING_PERIOD * 10)
-
-/**
- * Outgoing packets are only used for QoS/ACK statistical sampling if their
- * packet ID is divisible by this integer. This is to provide a mechanism for
- * both peers to agree on which packets need special treatment without having
- * to exchange information. Changing this value would be a breaking change and
- * would necessitate a protocol version upgrade. Since each incoming and
- * outgoing packet ID is checked against this value its evaluation is of the
- * form:
+ * How frequently to send a zero-byte UDP keepalive packet
  *
- * (id & (divisor - 1)) == 0, thus the divisor must be a power of 2.
+ * There are NATs with timeouts as short as 20 seconds, so this turns out
+ * to be needed.
+ */
+#define ZT_NAT_KEEPALIVE_DELAY 19000
+
+/**
+ * Delay between scans of the topology active peer DB for peers that need ping
  *
- * This value is set at (16) so that given a normally-distributed RNG output
- * we will sample 1/16th (or ~6.25%) of packets.
+ * This is also how often pings will be retried to upstream peers (relays, roots)
+ * constantly until something is heard.
  */
-#define ZT_QOS_ACK_DIVISOR 0x2
+#define ZT_PING_CHECK_INVERVAL 9500
 
 /**
- * Time horizon for VERB_QOS_MEASUREMENT and VERB_ACK packet processing cutoff
+ * Delay between ordinary case pings of direct links
  */
-#define ZT_QOS_ACK_CUTOFF_TIME 30000
-
-/**
- * Maximum number of VERB_QOS_MEASUREMENT and VERB_ACK packets allowed to be
- * processed within cutoff time. Separate totals are kept for each type but
- * the limit is the same for both.
- *
- * This limits how often this peer will compute statistical estimates
- * of various QoS measures from a VERB_QOS_MEASUREMENT or VERB_ACK packets to
- * CUTOFF_LIMIT times per CUTOFF_TIME milliseconds per peer to prevent
- * this from being useful for DOS amplification attacks.
- */
-#define ZT_QOS_ACK_CUTOFF_LIMIT 128
-
-/**
- * Minimum acceptable size for a VERB_QOS_MEASUREMENT packet
- */
-#define ZT_QOS_MIN_PACKET_SIZE (8 + 1)
-
-/**
- * Maximum acceptable size for a VERB_QOS_MEASUREMENT packet
- */
-#define ZT_QOS_MAX_PACKET_SIZE 1400
-
-/**
- * How many ID:sojourn time pairs are in a single QoS packet
- */
-#define ZT_QOS_TABLE_SIZE ((ZT_QOS_MAX_PACKET_SIZE * 8) / (64 + 16))
-
-/**
- * Maximum number of packets we monitor for ACK information at any given time
- */
-#define ZT_ACK_MAX_PENDING_RECORDS (32 * 1024)
-
-/**
- * Maximum number of packets we monitor for QoS information at any given time
- */
-#define ZT_QOS_MAX_PENDING_RECORDS (ZT_QOS_TABLE_SIZE * 3)
-
-/**
- * Interval used for rate-limiting the computation of path quality estimates.
- */
-#define ZT_QOS_COMPUTE_INTERVAL 1000
-
-/**
- * Number of samples to consider when processing real-time path statistics
- */
-#define ZT_QOS_SHORTTERM_SAMPLE_WIN_SIZE 64
-
-/**
- * Number of samples required before statistics summaries are computed
- */
-#define ZT_QOS_SHORTTERM_SAMPLE_WIN_MIN_REQ_SIZE 4
-
-/**
- * Max allowable time spent in any queue (in ms)
- */
-#define ZT_AQM_TARGET 5
-
-/**
- * Time period where the time spent in the queue by a packet should fall below.
- * target at least once. (in ms)
- */
-#define ZT_AQM_INTERVAL 100
-
-/**
- * The number of bytes that each queue is allowed to send during each DRR cycle.
- * This approximates a single-byte-based fairness queuing scheme.
- */
-#define ZT_AQM_QUANTUM ZT_DEFAULT_MTU
-
-/**
- * The maximum total number of packets that can be queued among all
- * active/inactive, old/new queues.
- */
-#define ZT_AQM_MAX_ENQUEUED_PACKETS 1024
-
-/**
- * Number of QoS queues (buckets)
- */
-#define ZT_AQM_NUM_BUCKETS 9
-
-/**
- * All unspecified traffic is put in this bucket. Anything in a bucket with a
- * smaller value is de-prioritized. Anything in a bucket with a higher value is
- prioritized over other traffic.
- */
-#define ZT_AQM_DEFAULT_BUCKET 0
+#define ZT_PEER_DIRECT_PING_DELAY 60000
 
 /**
  * Timeout for overall peer activity (measured from last receive)
  */
-#ifndef ZT_SDK
 #define ZT_PEER_ACTIVITY_TIMEOUT 500000
-#else
-#define ZT_PEER_ACTIVITY_TIMEOUT 30000
-#endif
 
 /**
- * General rate limit timeout for multiple packet types (HELLO, etc.)
+ * Timeout for path activity
  */
-#define ZT_PEER_GENERAL_INBOUND_RATE_LIMIT 500
+#define ZT_PATH_ACTIVITY_TIMEOUT ZT_PEER_ACTIVITY_TIMEOUT
 
 /**
- * General limit for max RTT for requests over the network
+ * No answer timeout to trigger dead path detection
  */
-#define ZT_GENERAL_RTT_LIMIT 5000
+#define ZT_PEER_DEAD_PATH_DETECTION_NO_ANSWER_TIMEOUT 2000
+
+/**
+ * Probation threshold after which a path becomes dead
+ */
+#define ZT_PEER_DEAD_PATH_DETECTION_MAX_PROBATION 3
 
 /**
  * Delay between requests for updated network autoconf information
- *
- * Don't lengthen this as it affects things like QoS / uptime monitoring
- * via ZeroTier Central. This is the heartbeat, basically.
  */
 #define ZT_NETWORK_AUTOCONF_DELAY 60000
 
@@ -543,9 +299,19 @@
 #define ZT_MIN_UNITE_INTERVAL 30000
 
 /**
- * How often should peers try memorized or statically defined paths?
+ * Delay between initial direct NAT-t packet and more aggressive techniques
+ *
+ * This may also be a delay before sending the first packet if we determine
+ * that we should wait for the remote to initiate rendezvous first.
  */
-#define ZT_TRY_MEMORIZED_PATH_INTERVAL 30000
+#define ZT_NAT_T_TACTICAL_ESCALATION_DELAY 1000
+
+/**
+ * How long (max) to remember network certificates of membership?
+ *
+ * This only applies to networks we don't belong to.
+ */
+#define ZT_PEER_NETWORK_COM_EXPIRATION 3600000
 
 /**
  * Sanity limit on maximum bridge routes
@@ -559,45 +325,19 @@
 #define ZT_MAX_BRIDGE_ROUTES 67108864
 
 /**
- * If there is no known L2 bridging route, spam to up to this many active bridges
+ * If there is no known route, spam to up to this many active bridges
  */
-#define ZT_MAX_BRIDGE_SPAM 32
+#define ZT_MAX_BRIDGE_SPAM 16
 
 /**
  * Interval between direct path pushes in milliseconds
  */
-#define ZT_DIRECT_PATH_PUSH_INTERVAL 15000
-
-/**
- * Interval between direct path pushes in milliseconds if we already have a path
- */
-#define ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH 120000
+#define ZT_DIRECT_PATH_PUSH_INTERVAL 120000
 
 /**
  * Time horizon for push direct paths cutoff
  */
-#define ZT_PUSH_DIRECT_PATHS_CUTOFF_TIME 30000
-
-/**
- * Drainage constants for VERB_ECHO rate-limiters
- */
-#define ZT_ECHO_CUTOFF_LIMIT	 ((1000 / ZT_CORE_TIMER_TASK_GRANULARITY) * ZT_MAX_PEER_NETWORK_PATHS)
-#define ZT_ECHO_DRAINAGE_DIVISOR (1000 / ZT_ECHO_CUTOFF_LIMIT)
-
-/**
- * Drainage constants for VERB_QOS rate-limiters
- */
-#define ZT_QOS_CUTOFF_LIMIT		((1000 / ZT_CORE_TIMER_TASK_GRANULARITY) * ZT_MAX_PEER_NETWORK_PATHS)
-#define ZT_QOS_DRAINAGE_DIVISOR (1000 / ZT_QOS_CUTOFF_LIMIT)
-
-/**
- * Drainage constants for VERB_ACK rate-limiters
- */
-#define ZT_ACK_CUTOFF_LIMIT		128
-#define ZT_ACK_DRAINAGE_DIVISOR (1000 / ZT_ACK_CUTOFF_LIMIT)
-
-#define ZT_BOND_DEFAULT_REFRACTORY_PERIOD 8000
-#define ZT_BOND_MAX_REFRACTORY_PERIOD	  600000
+#define ZT_PUSH_DIRECT_PATHS_CUTOFF_TIME 60000
 
 /**
  * Maximum number of direct path pushes within cutoff time
@@ -606,162 +346,48 @@
  * per CUTOFF_TIME milliseconds per peer to prevent this from being
  * useful for DOS amplification attacks.
  */
-#define ZT_PUSH_DIRECT_PATHS_CUTOFF_LIMIT 8
+#define ZT_PUSH_DIRECT_PATHS_CUTOFF_LIMIT 5
 
 /**
  * Maximum number of paths per IP scope (e.g. global, link-local) and family (e.g. v4/v6)
  */
-#define ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY 8
+#define ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY 4
 
 /**
- * Rate limit for network credential pushes from peer.
+ * Enable support for old Dictionary based network configs
  */
-#define ZT_PEER_CREDENTIALS_RATE_LIMIT 1000
+#define ZT_SUPPORT_OLD_STYLE_NETCONF 1
 
 /**
- * Rate limit for responding to peer credential requests
- */
-#define ZT_PEER_CREDENTIALS_REQUEST_RATE_LIMIT 1000
-
-/**
- * WHOIS rate limit (we allow these to be pretty fast)
- */
-#define ZT_PEER_WHOIS_RATE_LIMIT 100
-
-/**
- * General rate limit for other kinds of rate-limited packets (HELLO, credential request, etc.) both inbound and outbound
- */
-#define ZT_PEER_GENERAL_RATE_LIMIT 1000
-
-/**
- * Minimum allowed amount of time between flow/path optimizations (anti-flapping)
- */
-#define ZT_BOND_OPTIMIZE_INTERVAL 15000
-
-/**
- * Maximum number of flows allowed before we start forcibly forgetting old ones
- */
-#define ZT_FLOW_MAX_COUNT (1024 * 64)
-
-/**
- * How often we emit a bond summary for each bond
- */
-#define ZT_BOND_STATUS_INTERVAL 30000
-
-/**
- * How long before we consider a path to be dead in the general sense. This is
- * used while searching for default or alternative paths to try in the absence
- * of direct guidance from the user or a selection policy.
- */
-#define ZT_BOND_FAILOVER_DEFAULT_INTERVAL 5000
-
-/**
- * Anything below this value gets into thrashing territory since we divide
- * this value by ZT_BOND_ECHOS_PER_FAILOVER_INTERVAL to send ECHOs often.
- */
-#define ZT_BOND_FAILOVER_MIN_INTERVAL 500
-
-/**
- * How many times per failover interval that an ECHO is sent. This should be
- * at least 2. Anything more then 4 starts to increase overhead significantly.
- */
-#define ZT_BOND_ECHOS_PER_FAILOVER_INTERVAL 3
-
-/**
- * A defensive timer to prevent path quality metrics from being
- * processed too often.
- */
-#define ZT_BOND_BACKGROUND_TASK_MIN_INTERVAL ZT_CORE_TIMER_TASK_GRANULARITY
-
-/**
- * How often a bonding policy's background tasks are processed,
- * some need more frequent attention than others.
- */
-#define ZT_BOND_ACTIVE_BACKUP_CHECK_INTERVAL ZT_CORE_TIMER_TASK_GRANULARITY
-
-/**
- * Time horizon for path negotiation paths cutoff
- */
-#define ZT_PATH_NEGOTIATION_CUTOFF_TIME 60000
-
-/**
- * Maximum number of path negotiations within cutoff time
+ * A test pseudo-network-ID that can be joined
  *
- * This limits response to PATH_NEGOTIATION to CUTOFF_LIMIT responses
- * per CUTOFF_TIME milliseconds per peer to prevent this from being
- * useful for DOS amplification attacks.
- */
-#define ZT_PATH_NEGOTIATION_CUTOFF_LIMIT 8
-
-/**
- * How many times a peer will attempt to petition another peer to synchronize its
- * traffic to the same path before giving up and surrendering to the other peer's preference.
- */
-#define ZT_PATH_NEGOTIATION_TRY_COUNT 3
-
-/**
- * How much greater the quality of a path should be before an
- * optimization procedure triggers a switch.
- */
-#define ZT_BOND_ACTIVE_BACKUP_OPTIMIZE_MIN_THRESHOLD 0.10
-
-/**
- * Artificially inflates the failover score for paths which meet
- * certain non-performance-related policy ranking criteria.
- */
-#define ZT_BOND_FAILOVER_HANDICAP_PREFERRED	 500
-#define ZT_BOND_FAILOVER_HANDICAP_PRIMARY	 1000
-#define ZT_BOND_FAILOVER_HANDICAP_NEGOTIATED 5000
-
-/**
- * An indicator that no flow is to be associated with the given packet
- */
-#define ZT_QOS_NO_FLOW -1
-
-/**
- * Don't do expensive identity validation more often than this
+ * Joining this network ID will result in a network with no IP addressing
+ * and default parameters. No network configuration master will be consulted
+ * and instead a static config will be used. This is used in built-in testnet
+ * scenarios and can also be used for external testing.
  *
- * IPv4 and IPv6 address prefixes are hashed down to 14-bit (0-16383) integers
- * using the first 24 bits for IPv4 or the first 48 bits for IPv6. These are
- * then rate limited to one identity validation per this often milliseconds.
+ * This is an impossible real network ID since 0xff is a reserved address
+ * prefix.
  */
-#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64) || defined(_M_AMD64))
-// AMD64 machines can do anywhere from one every 50ms to one every 10ms. This provides plenty of margin.
-#define ZT_IDENTITY_VALIDATION_SOURCE_RATE_LIMIT 2000
-#else
-#if (defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(_M_IX86) || defined(_X86_) || defined(__I86__))
-// 32-bit Intel machines usually average about one every 100ms
-#define ZT_IDENTITY_VALIDATION_SOURCE_RATE_LIMIT 5000
-#else
-// This provides a safe margin for ARM, MIPS, etc. that usually average one every 250-400ms
-#define ZT_IDENTITY_VALIDATION_SOURCE_RATE_LIMIT 10000
-#endif
-#endif
-
-/**
- * How long is a path or peer considered to have a trust relationship with us (for e.g. relay policy) since last trusted established packet?
- */
-#define ZT_TRUST_EXPIRATION 600000
+#define ZT_TEST_NETWORK_ID 0xffffffffffffffffULL
 
 /**
  * Desired buffer size for UDP sockets (used in service and osdep but defined here)
  */
+#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__))
 #define ZT_UDP_DESIRED_BUF_SIZE 1048576
+#else
+#define ZT_UDP_DESIRED_BUF_SIZE 131072
+#endif
 
-/**
- * Desired / recommended min stack size for threads (used on some platforms to reset thread stack size)
- */
-#define ZT_THREAD_MIN_STACK_SIZE 1048576
-
-// Exceptions thrown in core ZT code
-#define ZT_EXCEPTION_OUT_OF_BOUNDS										 100
-#define ZT_EXCEPTION_OUT_OF_MEMORY										 101
-#define ZT_EXCEPTION_PRIVATE_KEY_REQUIRED								 102
-#define ZT_EXCEPTION_INVALID_ARGUMENT									 103
-#define ZT_EXCEPTION_INVALID_IDENTITY									 104
-#define ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_TYPE				 200
-#define ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW					 201
-#define ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_CRYPTOGRAPHIC_TOKEN 202
-#define ZT_EXCEPTION_INVALID_SERIALIZED_DATA_BAD_ENCODING				 203
+/* Ethernet frame types that might be relevant to us */
+#define ZT_ETHERTYPE_IPV4 0x0800
+#define ZT_ETHERTYPE_ARP 0x0806
+#define ZT_ETHERTYPE_RARP 0x8035
+#define ZT_ETHERTYPE_ATALK 0x809b
+#define ZT_ETHERTYPE_AARP 0x80f3
+#define ZT_ETHERTYPE_IPX_A 0x8137
+#define ZT_ETHERTYPE_IPX_B 0x8138
+#define ZT_ETHERTYPE_IPV6 0x86dd
 
 #endif
diff --git a/node/Credential.hpp b/node/Credential.hpp
deleted file mode 100644
index 3f290cadf..000000000
--- a/node/Credential.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_CREDENTIAL_HPP
-#define ZT_CREDENTIAL_HPP
-
-namespace ZeroTier {
-
-/**
- * Base class for credentials
- */
-class Credential {
-  public:
-	/**
-	 * Do not change type code IDs -- these are used in Revocation objects and elsewhere
-	 */
-	enum Type {
-		CREDENTIAL_TYPE_NULL = 0,
-		CREDENTIAL_TYPE_COM = 1,   // CertificateOfMembership
-		CREDENTIAL_TYPE_CAPABILITY = 2,
-		CREDENTIAL_TYPE_TAG = 3,
-		CREDENTIAL_TYPE_COO = 4,   // CertificateOfOwnership
-		CREDENTIAL_TYPE_REVOCATION = 6
-	};
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/DNS.hpp b/node/DNS.hpp
deleted file mode 100644
index 79e422e8f..000000000
--- a/node/DNS.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c)2020 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_DNS_HPP
-#define ZT_DNS_HPP
-#include "../include/ZeroTierOne.h"
-#include "Buffer.hpp"
-#include "InetAddress.hpp"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-namespace ZeroTier {
-
-/**
- * DNS data serialization methods
- */
-class DNS {
-  public:
-	template <unsigned int C> static inline void serializeDNS(Buffer<C>& b, const ZT_VirtualNetworkDNS* dns)
-	{
-		b.append(dns->domain, 128);
-		for (unsigned int j = 0; j < ZT_MAX_DNS_SERVERS; ++j) {
-			InetAddress tmp(dns->server_addr[j]);
-			tmp.serialize(b);
-		}
-	}
-
-	template <unsigned int C> static inline void deserializeDNS(const Buffer<C>& b, unsigned int& p, ZT_VirtualNetworkDNS* dns)
-	{
-		char* d = (char*)b.data() + p;
-		memset(dns, 0, sizeof(ZT_VirtualNetworkDNS));
-		memcpy(dns->domain, d, 128);
-		dns->domain[127] = 0;
-		p += 128;
-		for (unsigned int j = 0; j < ZT_MAX_DNS_SERVERS; ++j) {
-			p += reinterpret_cast<InetAddress*>(&(dns->server_addr[j]))->deserialize(b, p);
-		}
-	}
-};
-
-}	// namespace ZeroTier
-
-#endif	 // ZT_DNS_HPP
diff --git a/node/DeferredPackets.cpp b/node/DeferredPackets.cpp
new file mode 100644
index 000000000..192b40787
--- /dev/null
+++ b/node/DeferredPackets.cpp
@@ -0,0 +1,100 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Constants.hpp"
+#include "DeferredPackets.hpp"
+#include "IncomingPacket.hpp"
+#include "RuntimeEnvironment.hpp"
+#include "Node.hpp"
+
+namespace ZeroTier {
+
+DeferredPackets::DeferredPackets(const RuntimeEnvironment *renv) :
+	RR(renv),
+	_waiting(0),
+	_die(false)
+{
+}
+
+DeferredPackets::~DeferredPackets()
+{
+	_q_m.lock();
+	_die = true;
+	_q_m.unlock();
+
+	for(;;) {
+		_q_s.post();
+
+		_q_m.lock();
+		if (_waiting <= 0) {
+			_q_m.unlock();
+			break;
+		} else {
+			_q_m.unlock();
+		}
+	}
+}
+
+bool DeferredPackets::enqueue(IncomingPacket *pkt)
+{
+	{
+		Mutex::Lock _l(_q_m);
+		if (_q.size() >= ZT_DEFFEREDPACKETS_MAX)
+			return false;
+		_q.push_back(*pkt);
+	}
+	_q_s.post();
+	return true;
+}
+
+int DeferredPackets::process()
+{
+	std::list<IncomingPacket> pkt;
+
+	_q_m.lock();
+
+	if (_die) {
+		_q_m.unlock();
+		return -1;
+	}
+
+	while (_q.empty()) {
+		++_waiting;
+		_q_m.unlock();
+		_q_s.wait();
+		_q_m.lock();
+		--_waiting;
+		if (_die) {
+			_q_m.unlock();
+			return -1;
+		}
+	}
+
+	// Move item from _q list to a dummy list here to avoid copying packet
+	pkt.splice(pkt.end(),_q,_q.begin());
+
+	_q_m.unlock();
+
+	try {
+		pkt.front().tryDecode(RR,true);
+	} catch ( ... ) {} // drop invalids
+
+	return 1;
+}
+
+} // namespace ZeroTier
diff --git a/node/DeferredPackets.hpp b/node/DeferredPackets.hpp
new file mode 100644
index 000000000..a98553969
--- /dev/null
+++ b/node/DeferredPackets.hpp
@@ -0,0 +1,85 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_DEFERREDPACKETS_HPP
+#define ZT_DEFERREDPACKETS_HPP
+
+#include <list>
+
+#include "Constants.hpp"
+#include "SharedPtr.hpp"
+#include "Mutex.hpp"
+#include "DeferredPackets.hpp"
+#include "BinarySemaphore.hpp"
+
+/**
+ * Maximum number of deferred packets
+ */
+#define ZT_DEFFEREDPACKETS_MAX 256
+
+namespace ZeroTier {
+
+class IncomingPacket;
+class RuntimeEnvironment;
+
+/**
+ * Deferred packets
+ *
+ * IncomingPacket can defer its decoding this way by enqueueing itself here.
+ * When this is done, deferredDecode() is called later. This is done for
+ * operations that may be expensive to allow them to potentially be handled
+ * in the background or rate limited to maintain quality of service for more
+ * routine operations.
+ */
+class DeferredPackets
+{
+public:
+	DeferredPackets(const RuntimeEnvironment *renv);
+	~DeferredPackets();
+
+	/**
+	 * Enqueue a packet
+	 *
+	 * @param pkt Packet to process later (possibly in the background)
+	 * @return False if queue is full
+	 */
+	bool enqueue(IncomingPacket *pkt);
+
+	/**
+	 * Wait for and then process a deferred packet
+	 *
+	 * If we are shutting down (in destructor), this returns -1 and should
+	 * not be called again. Otherwise it returns the number of packets
+	 * processed.
+	 *
+	 * @return Number processed or -1 if shutting down
+	 */
+	int process();
+
+private:
+	std::list<IncomingPacket> _q;
+	const RuntimeEnvironment *const RR;
+ 	volatile int _waiting;
+	volatile bool _die;
+	Mutex _q_m;
+	BinarySemaphore _q_s;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/node/Dictionary.cpp b/node/Dictionary.cpp
new file mode 100644
index 000000000..e7a1a0e60
--- /dev/null
+++ b/node/Dictionary.cpp
@@ -0,0 +1,240 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Dictionary.hpp"
+#include "C25519.hpp"
+#include "Identity.hpp"
+#include "Utils.hpp"
+
+namespace ZeroTier {
+
+Dictionary::iterator Dictionary::find(const std::string &key)
+{
+	for(iterator i(begin());i!=end();++i) {
+		if (i->first == key)
+			return i;
+	}
+	return end();
+}
+Dictionary::const_iterator Dictionary::find(const std::string &key) const
+{
+	for(const_iterator i(begin());i!=end();++i) {
+		if (i->first == key)
+			return i;
+	}
+	return end();
+}
+
+bool Dictionary::getBoolean(const std::string &key,bool dfl) const
+{
+	const_iterator e(find(key));
+	if (e == end())
+		return dfl;
+	if (e->second.length() < 1)
+		return dfl;
+	switch(e->second[0]) {
+		case '1':
+		case 't':
+		case 'T':
+		case 'y':
+		case 'Y':
+			return true;
+	}
+	return false;
+}
+
+std::string &Dictionary::operator[](const std::string &key)
+{
+	for(iterator i(begin());i!=end();++i) {
+		if (i->first == key)
+			return i->second;
+	}
+	push_back(std::pair<std::string,std::string>(key,std::string()));
+	std::sort(begin(),end());
+	for(iterator i(begin());i!=end();++i) {
+		if (i->first == key)
+			return i->second;
+	}
+	return front().second; // should be unreachable!
+}
+
+std::string Dictionary::toString() const
+{
+	std::string s;
+	for(const_iterator kv(begin());kv!=end();++kv) {
+		_appendEsc(kv->first.data(),(unsigned int)kv->first.length(),s);
+		s.push_back('=');
+		_appendEsc(kv->second.data(),(unsigned int)kv->second.length(),s);
+		s.append(ZT_EOL_S);
+	}
+	return s;
+}
+
+void Dictionary::updateFromString(const char *s,unsigned int maxlen)
+{
+	bool escapeState = false;
+	std::string keyBuf;
+	std::string *element = &keyBuf;
+	const char *end = s + maxlen;
+	while ((*s)&&(s < end)) {
+		if (escapeState) {
+			escapeState = false;
+			switch(*s) {
+				case '0':
+					element->push_back((char)0);
+					break;
+				case 'r':
+					element->push_back('\r');
+					break;
+				case 'n':
+					element->push_back('\n');
+					break;
+				default:
+					element->push_back(*s);
+					break;
+			}
+		} else {
+			if (*s == '\\') {
+				escapeState = true;
+			} else if (*s == '=') {
+				if (element == &keyBuf)
+					element = &((*this)[keyBuf]);
+			} else if ((*s == '\r')||(*s == '\n')) {
+				if ((element == &keyBuf)&&(keyBuf.length() > 0))
+					(*this)[keyBuf];
+				keyBuf = "";
+				element = &keyBuf;
+			} else element->push_back(*s);
+		}
+		++s;
+	}
+	if ((element == &keyBuf)&&(keyBuf.length() > 0))
+		(*this)[keyBuf];
+}
+
+void Dictionary::fromString(const char *s,unsigned int maxlen)
+{
+	clear();
+	updateFromString(s,maxlen);
+}
+
+void Dictionary::eraseKey(const std::string &key)
+{
+	for(iterator i(begin());i!=end();++i) {
+		if (i->first == key) {
+			this->erase(i);
+			return;
+		}
+	}
+}
+
+bool Dictionary::sign(const Identity &id,uint64_t now)
+{
+	try {
+		// Sign identity and timestamp fields too. If there's an existing
+		// signature, _mkSigBuf() ignores it.
+		char nows[32];
+		Utils::snprintf(nows,sizeof(nows),"%llx",(unsigned long long)now);
+		(*this)[ZT_DICTIONARY_SIGNATURE_IDENTITY] = id.toString(false);
+		(*this)[ZT_DICTIONARY_SIGNATURE_TIMESTAMP] = nows;
+
+		// Create a blob to hash and sign from fields in sorted order
+		std::string buf;
+		_mkSigBuf(buf);
+
+		// Add signature field
+		C25519::Signature sig(id.sign(buf.data(),(unsigned int)buf.length()));
+		(*this)[ZT_DICTIONARY_SIGNATURE] = Utils::hex(sig.data,(unsigned int)sig.size());
+
+		return true;
+	} catch ( ... ) {
+		// Probably means identity has no secret key field
+		removeSignature();
+		return false;
+	}
+}
+
+bool Dictionary::verify(const Identity &id) const
+{
+	try {
+		std::string buf;
+		_mkSigBuf(buf);
+		const_iterator sig(find(ZT_DICTIONARY_SIGNATURE));
+		if (sig == end())
+			return false;
+		std::string sigbin(Utils::unhex(sig->second));
+		return id.verify(buf.data(),(unsigned int)buf.length(),sigbin.data(),(unsigned int)sigbin.length());
+	} catch ( ... ) {
+		return false;
+	}
+}
+
+uint64_t Dictionary::signatureTimestamp() const
+{
+	const_iterator ts(find(ZT_DICTIONARY_SIGNATURE_TIMESTAMP));
+	if (ts == end())
+		return 0;
+	return Utils::hexStrToU64(ts->second.c_str());
+}
+
+void Dictionary::_mkSigBuf(std::string &buf) const
+{
+	unsigned long pairs = 0;
+	for(const_iterator i(begin());i!=end();++i) {
+		if (i->first != ZT_DICTIONARY_SIGNATURE) {
+			buf.append(i->first);
+			buf.push_back('=');
+			buf.append(i->second);
+			buf.push_back('\0');
+			++pairs;
+		}
+	}
+	buf.push_back((char)0xff);
+	buf.push_back((char)((pairs >> 24) & 0xff)); // pad with number of key/value pairs at end
+	buf.push_back((char)((pairs >> 16) & 0xff));
+	buf.push_back((char)((pairs >> 8) & 0xff));
+	buf.push_back((char)(pairs & 0xff));
+}
+
+void Dictionary::_appendEsc(const char *data,unsigned int len,std::string &to)
+{
+	for(unsigned int i=0;i<len;++i) {
+		switch(data[i]) {
+			case 0:
+				to.append("\\0");
+				break;
+			case '\r':
+				to.append("\\r");
+				break;
+			case '\n':
+				to.append("\\n");
+				break;
+			case '\\':
+				to.append("\\\\");
+				break;
+			case '=':
+				to.append("\\=");
+				break;
+			default:
+				to.push_back(data[i]);
+				break;
+		}
+	}
+}
+
+} // namespace ZeroTier
diff --git a/node/Dictionary.hpp b/node/Dictionary.hpp
index 1c6b52620..5db82600b 100644
--- a/node/Dictionary.hpp
+++ b/node/Dictionary.hpp
@@ -1,506 +1,275 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_DICTIONARY_HPP
 #define ZT_DICTIONARY_HPP
 
-#include "Address.hpp"
-#include "Buffer.hpp"
+#include <stdint.h>
+
+#include <string>
+#include <vector>
+#include <stdexcept>
+#include <algorithm>
+
 #include "Constants.hpp"
 #include "Utils.hpp"
 
-#include <stdint.h>
+// Three fields are added/updated by sign()
+#define ZT_DICTIONARY_SIGNATURE "~!ed25519"
+#define ZT_DICTIONARY_SIGNATURE_IDENTITY "~!sigid"
+#define ZT_DICTIONARY_SIGNATURE_TIMESTAMP "~!sigts"
 
 namespace ZeroTier {
 
+class Identity;
+
 /**
- * A small (in code and data) packed key=value store
+ * Simple key/value dictionary with string serialization
  *
- * This stores data in the form of a compact blob that is sort of human
- * readable (depending on whether you put binary data in it) and is backward
- * compatible with older versions. Binary data is escaped such that the
- * serialized form of a Dictionary is always a valid null-terminated C string.
+ * The serialization format is a flat key=value with backslash escape.
+ * It does not support comments or other syntactic complexities. It is
+ * human-readable if the keys and values in the dictionary are also
+ * human-readable. Otherwise it might contain unprintable characters.
  *
- * Keys are restricted: no binary data, no CR/LF, and no equals (=). If a key
- * contains these characters it may not be retrievable. This is not checked.
+ * Keys beginning with "~!" are reserved for signature data fields.
  *
- * Lookup is via linear search and will be slow with a lot of keys. It's
- * designed for small things.
- *
- * There is code to test and fuzz this in selftest.cpp. Fuzzing a blob of
- * pointer tricks like this is important after any modifications.
- *
- * This is used for network configurations and for saving some things on disk
- * in the ZeroTier One service code.
- *
- * @tparam C Dictionary max capacity in bytes
+ * It's stored as a simple vector and can be linearly scanned or
+ * binary searched. Dictionaries are only used for very small things
+ * outside the core loop, so this is not a significant performance
+ * issue and it reduces memory use and code footprint.
  */
-template <unsigned int C> class Dictionary {
-  public:
-	Dictionary()
-	{
-		memset(_d, 0, sizeof(_d));
-	}
-	Dictionary(const char* s)
-	{
-		this->load(s);
-	}
-	Dictionary(const char* s, unsigned int len)
-	{
-		for (unsigned int i = 0; i < C; ++i) {
-			if ((s) && (i < len)) {
-				if (! (_d[i] = *s)) {
-					s = (const char*)0;
-				}
-				else {
-					++s;
-				}
-			}
-			else {
-				_d[i] = (char)0;
-			}
-		}
-		_d[C - 1] = (char)0;
-	}
-	Dictionary(const Dictionary& d)
-	{
-		memcpy(_d, d._d, C);
-	}
-
-	inline Dictionary& operator=(const Dictionary& d)
-	{
-		memcpy(_d, d._d, C);
-		return *this;
-	}
-
-	inline operator bool() const
-	{
-		return (_d[0] != 0);
-	}
+class Dictionary : public std::vector< std::pair<std::string,std::string> >
+{
+public:
+	Dictionary() {}
 
 	/**
-	 * Load a dictionary from a C-string
-	 *
-	 * @param s Dictionary in string form
-	 * @return False if 's' was longer than our capacity
+	 * @param s String-serialized dictionary
+	 * @param maxlen Maximum length of buffer
 	 */
-	inline bool load(const char* s)
-	{
-		for (unsigned int i = 0; i < C; ++i) {
-			if (s) {
-				if (! (_d[i] = *s)) {
-					s = (const char*)0;
-				}
-				else {
-					++s;
-				}
-			}
-			else {
-				_d[i] = (char)0;
-			}
-		}
-		_d[C - 1] = (char)0;
-		return (! s);
-	}
+	Dictionary(const char *s,unsigned int maxlen) { fromString(s,maxlen); }
 
 	/**
-	 * Delete all entries
+	 * @param s String-serialized dictionary
 	 */
-	inline void clear()
-	{
-		memset(_d, 0, sizeof(_d));
-	}
+	Dictionary(const std::string &s) { fromString(s.c_str(),(unsigned int)s.length()); }
+
+	iterator find(const std::string &key);
+	const_iterator find(const std::string &key) const;
 
 	/**
-	 * @return Size of dictionary in bytes not including terminating NULL
-	 */
-	inline unsigned int sizeBytes() const
-	{
-		for (unsigned int i = 0; i < C; ++i) {
-			if (! _d[i]) {
-				return i;
-			}
-		}
-		return C - 1;
-	}
-
-	/**
-	 * Get an entry
-	 *
-	 * Note that to get binary values, dest[] should be at least one more than
-	 * the maximum size of the value being retrieved. That's because even if
-	 * the data is binary a terminating 0 is still appended to dest[] after it.
-	 *
-	 * If the key is not found, dest[0] is set to 0 to make dest[] an empty
-	 * C string in that case. The dest[] array will *never* be unterminated
-	 * after this call.
-	 *
-	 * Security note: if 'key' is ever directly based on anything that is not
-	 * a hard-code or internally-generated name, it must be checked to ensure
-	 * that the buffer is NULL-terminated since key[] does not take a secondary
-	 * size parameter. In NetworkConfig all keys are hard-coded strings so this
-	 * isn't a problem in the core.
+	 * Get a key, returning a default if not present
 	 *
 	 * @param key Key to look up
-	 * @param dest Destination buffer
-	 * @param destlen Size of destination buffer
-	 * @return -1 if not found, or actual number of bytes stored in dest[] minus trailing 0
+	 * @param dfl Default if not present
+	 * @return Value or default
 	 */
-	inline int get(const char* key, char* dest, unsigned int destlen) const
+	inline const std::string &get(const std::string &key,const std::string &dfl) const
 	{
-		const char* p = _d;
-		const char* const eof = p + C;
-		const char* k;
-		bool esc;
-		int j;
-
-		if (! destlen) {   // sanity check
-			return -1;
-		}
-
-		while (*p) {
-			k = key;
-			while ((*k) && (*p)) {
-				if (*p != *k) {
-					break;
-				}
-				++k;
-				if (++p == eof) {
-					dest[0] = (char)0;
-					return -1;
-				}
-			}
-
-			if ((! *k) && (*p == '=')) {
-				j = 0;
-				esc = false;
-				++p;
-				while ((*p != 0) && (*p != 13) && (*p != 10)) {
-					if (esc) {
-						esc = false;
-						switch (*p) {
-							case 'r':
-								dest[j++] = 13;
-								break;
-							case 'n':
-								dest[j++] = 10;
-								break;
-							case '0':
-								dest[j++] = (char)0;
-								break;
-							case 'e':
-								dest[j++] = '=';
-								break;
-							default:
-								dest[j++] = *p;
-								break;
-						}
-						if (j == (int)destlen) {
-							dest[j - 1] = (char)0;
-							return j - 1;
-						}
-					}
-					else if (*p == '\\') {
-						esc = true;
-					}
-					else {
-						dest[j++] = *p;
-						if (j == (int)destlen) {
-							dest[j - 1] = (char)0;
-							return j - 1;
-						}
-					}
-					if (++p == eof) {
-						dest[0] = (char)0;
-						return -1;
-					}
-				}
-				dest[j] = (char)0;
-				return j;
-			}
-			else {
-				while ((*p) && (*p != 13) && (*p != 10)) {
-					if (++p == eof) {
-						dest[0] = (char)0;
-						return -1;
-					}
-				}
-				if (*p) {
-					if (++p == eof) {
-						dest[0] = (char)0;
-						return -1;
-					}
-				}
-				else {
-					break;
-				}
-			}
-		}
-
-		dest[0] = (char)0;
-		return -1;
+		const_iterator e(find(key));
+		if (e == end())
+			return dfl;
+		return e->second;
 	}
 
 	/**
-	 * Get the contents of a key into a buffer
-	 *
 	 * @param key Key to get
-	 * @param dest Destination buffer
-	 * @return True if key was found (if false, dest will be empty)
-	 * @tparam BC Buffer capacity (usually inferred)
+	 * @param dfl Default boolean result if key not found or empty (default: false)
+	 * @return Boolean value of key
 	 */
-	template <unsigned int BC> inline bool get(const char* key, Buffer<BC>& dest) const
+	bool getBoolean(const std::string &key,bool dfl = false) const;
+
+	/**
+	 * @param key Key to get
+	 * @param dfl Default value if not present (default: 0)
+	 * @return Value converted to unsigned 64-bit int or 0 if not found
+	 */
+	inline uint64_t getUInt(const std::string &key,uint64_t dfl = 0) const
 	{
-		const int r = this->get(key, const_cast<char*>(reinterpret_cast<const char*>(dest.data())), BC);
-		if (r >= 0) {
-			dest.setSize((unsigned int)r);
-			return true;
-		}
-		else {
-			dest.clear();
-			return false;
-		}
+		const_iterator e(find(key));
+		if (e == end())
+			return dfl;
+		return Utils::strToU64(e->second.c_str());
 	}
 
 	/**
-	 * Get a boolean value
-	 *
-	 * @param key Key to look up
-	 * @param dfl Default value if not found in dictionary
-	 * @return Boolean value of key or 'dfl' if not found
+	 * @param key Key to get
+	 * @param dfl Default value if not present (default: 0)
+	 * @return Value converted to unsigned 64-bit int or 0 if not found
 	 */
-	bool getB(const char* key, bool dfl = false) const
+	inline uint64_t getHexUInt(const std::string &key,uint64_t dfl = 0) const
 	{
-		char tmp[4];
-		if (this->get(key, tmp, sizeof(tmp)) >= 0) {
-			return ((*tmp == '1') || (*tmp == 't') || (*tmp == 'T'));
-		}
-		return dfl;
+		const_iterator e(find(key));
+		if (e == end())
+			return dfl;
+		return Utils::hexStrToU64(e->second.c_str());
 	}
 
 	/**
-	 * Get an unsigned int64 stored as hex in the dictionary
-	 *
-	 * @param key Key to look up
-	 * @param dfl Default value or 0 if unspecified
-	 * @return Decoded hex UInt value or 'dfl' if not found
+	 * @param key Key to get
+	 * @param dfl Default value if not present (default: 0)
+	 * @return Value converted to signed 64-bit int or 0 if not found
 	 */
-	inline uint64_t getUI(const char* key, uint64_t dfl = 0) const
+	inline int64_t getInt(const std::string &key,int64_t dfl = 0) const
 	{
-		char tmp[128];
-		if (this->get(key, tmp, sizeof(tmp)) >= 1) {
-			return Utils::hexStrToU64(tmp);
-		}
-		return dfl;
+		const_iterator e(find(key));
+		if (e == end())
+			return dfl;
+		return Utils::strTo64(e->second.c_str());
+	}
+
+	std::string &operator[](const std::string &key);
+
+	/**
+	 * @param key Key to set
+	 * @param value String value
+	 */
+	inline void set(const std::string &key,const char *value)
+	{
+		(*this)[key] = value;
 	}
 
 	/**
-	 * Get an unsigned int64 stored as hex in the dictionary
-	 *
-	 * @param key Key to look up
-	 * @param dfl Default value or 0 if unspecified
-	 * @return Decoded hex UInt value or 'dfl' if not found
+	 * @param key Key to set
+	 * @param value String value
 	 */
-	inline int64_t getI(const char* key, int64_t dfl = 0) const
+	inline void set(const std::string &key,const std::string &value)
 	{
-		char tmp[128];
-		if (this->get(key, tmp, sizeof(tmp)) >= 1) {
-			return Utils::hexStrTo64(tmp);
-		}
-		return dfl;
+		(*this)[key] = value;
 	}
 
 	/**
-	 * Add a new key=value pair
-	 *
-	 * If the key is already present this will append another, but the first
-	 * will always be returned by get(). This is not checked. If you want to
-	 * ensure a key is not present use erase() first.
-	 *
-	 * Use the vlen parameter to add binary values. Nulls will be escaped.
-	 *
-	 * @param key Key -- nulls, CR/LF, and equals (=) are illegal characters
-	 * @param value Value to set
-	 * @param vlen Length of value in bytes or -1 to treat value[] as a C-string and look for terminating 0
-	 * @return True if there was enough room to add this key=value pair
+	 * @param key Key to set
+	 * @param value Boolean value
 	 */
-	inline bool add(const char* key, const char* value, int vlen = -1)
+	inline void set(const std::string &key,bool value)
 	{
-		for (unsigned int i = 0; i < C; ++i) {
-			if (! _d[i]) {
-				unsigned int j = i;
-
-				if (j > 0) {
-					_d[j++] = (char)10;
-					if (j == C) {
-						_d[i] = (char)0;
-						return false;
-					}
-				}
-
-				const char* p = key;
-				while (*p) {
-					_d[j++] = *(p++);
-					if (j == C) {
-						_d[i] = (char)0;
-						return false;
-					}
-				}
-
-				_d[j++] = '=';
-				if (j == C) {
-					_d[i] = (char)0;
-					return false;
-				}
-
-				p = value;
-				int k = 0;
-				while (((vlen < 0) && (*p)) || (k < vlen)) {
-					switch (*p) {
-						case 0:
-						case 13:
-						case 10:
-						case '\\':
-						case '=':
-							_d[j++] = '\\';
-							if (j == C) {
-								_d[i] = (char)0;
-								return false;
-							}
-							switch (*p) {
-								case 0:
-									_d[j++] = '0';
-									break;
-								case 13:
-									_d[j++] = 'r';
-									break;
-								case 10:
-									_d[j++] = 'n';
-									break;
-								case '\\':
-									_d[j++] = '\\';
-									break;
-								case '=':
-									_d[j++] = 'e';
-									break;
-							}
-							if (j == C) {
-								_d[i] = (char)0;
-								return false;
-							}
-							break;
-						default:
-							_d[j++] = *p;
-							if (j == C) {
-								_d[i] = (char)0;
-								return false;
-							}
-							break;
-					}
-					++p;
-					++k;
-				}
-
-				_d[j] = (char)0;
-
-				return true;
-			}
-		}
-		return false;
+		(*this)[key] = ((value) ? "1" : "0");
 	}
 
 	/**
-	 * Add a boolean as a '1' or a '0'
+	 * @param key Key to set
+	 * @param value Integer value
 	 */
-	inline bool add(const char* key, bool value)
+	inline void set(const std::string &key,uint64_t value)
 	{
-		return this->add(key, (value) ? "1" : "0", 1);
+		char tmp[24];
+		Utils::snprintf(tmp,sizeof(tmp),"%llu",(unsigned long long)value);
+		(*this)[key] = tmp;
 	}
 
 	/**
-	 * Add a 64-bit integer (unsigned) as a hex value
+	 * @param key Key to set
+	 * @param value Integer value
 	 */
-	inline bool add(const char* key, uint64_t value)
+	inline void set(const std::string &key,int64_t value)
 	{
-		char tmp[32];
-		return this->add(key, Utils::hex(value, tmp), -1);
+		char tmp[24];
+		Utils::snprintf(tmp,sizeof(tmp),"%lld",(long long)value);
+		(*this)[key] = tmp;
 	}
 
 	/**
-	 * Add a 64-bit integer (unsigned) as a hex value
+	 * @param key Key to set
+	 * @param value Integer value
 	 */
-	inline bool add(const char* key, int64_t value)
+	inline void setHex(const std::string &key,uint64_t value)
 	{
-		char tmp[32];
-		if (value >= 0) {
-			return this->add(key, Utils::hex((uint64_t)value, tmp), -1);
-		}
-		else {
-			tmp[0] = '-';
-			return this->add(key, Utils::hex((uint64_t)(value * -1), tmp + 1), -1);
-		}
-	}
-
-	/**
-	 * Add a 64-bit integer (unsigned) as a hex value
-	 */
-	inline bool add(const char* key, const Address& a)
-	{
-		char tmp[32];
-		return this->add(key, Utils::hex(a.toInt(), tmp), -1);
-	}
-
-	/**
-	 * Add a binary buffer's contents as a value
-	 *
-	 * @tparam BC Buffer capacity (usually inferred)
-	 */
-	template <unsigned int BC> inline bool add(const char* key, const Buffer<BC>& value)
-	{
-		return this->add(key, (const char*)value.data(), (int)value.size());
+		char tmp[24];
+		Utils::snprintf(tmp,sizeof(tmp),"%llx",(unsigned long long)value);
+		(*this)[key] = tmp;
 	}
 
 	/**
 	 * @param key Key to check
-	 * @return True if key is present
+	 * @return True if dictionary contains key
 	 */
-	inline bool contains(const char* key) const
+	inline bool contains(const std::string &key) const { return (find(key) != end()); }
+
+	/**
+	 * @return String-serialized dictionary
+	 */
+	std::string toString() const;
+
+	/**
+	 * Clear and initialize from a string
+	 *
+	 * @param s String-serialized dictionary
+	 * @param maxlen Maximum length of string buffer
+	 */
+	void fromString(const char *s,unsigned int maxlen);
+	inline void fromString(const std::string &s) { fromString(s.c_str(),(unsigned int)s.length()); }
+	void updateFromString(const char *s,unsigned int maxlen);
+	inline void update(const char *s,unsigned int maxlen) { updateFromString(s, maxlen); }
+	inline void update(const std::string &s) { updateFromString(s.c_str(),(unsigned int)s.length()); }
+
+	/**
+	 * @return True if this dictionary is cryptographically signed
+	 */
+	inline bool hasSignature() const { return (find(ZT_DICTIONARY_SIGNATURE) != end()); }
+
+	/**
+	 * @return Signing identity in string-serialized format or empty string if none
+	 */
+	inline std::string signingIdentity() const { return get(ZT_DICTIONARY_SIGNATURE_IDENTITY,std::string()); }
+
+	/**
+	 * @return Signature timestamp in milliseconds since epoch or 0 if none
+	 */
+	uint64_t signatureTimestamp() const;
+
+	/**
+	 * @param key Key to erase
+	 */
+	void eraseKey(const std::string &key);
+
+	/**
+	 * Remove any signature from this dictionary
+	 */
+	inline void removeSignature()
 	{
-		char tmp[2];
-		return (this->get(key, tmp, 2) >= 0);
+		eraseKey(ZT_DICTIONARY_SIGNATURE);
+		eraseKey(ZT_DICTIONARY_SIGNATURE_IDENTITY);
+		eraseKey(ZT_DICTIONARY_SIGNATURE_TIMESTAMP);
 	}
 
 	/**
-	 * @return Value of C template parameter
+	 * Add or update signature fields with a signature of all other keys and values
+	 *
+	 * @param with Identity to sign with (must have secret key)
+	 * @param now Current time
+	 * @return True on success
 	 */
-	inline unsigned int capacity() const
-	{
-		return C;
-	}
+	bool sign(const Identity &id,uint64_t now);
 
-	inline const char* data() const
-	{
-		return _d;
-	}
-	inline char* unsafeData()
-	{
-		return _d;
-	}
+	/**
+	 * Verify signature against an identity
+	 *
+	 * @param id Identity to verify against
+	 * @return True if signature verification OK
+	 */
+	bool verify(const Identity &id) const;
 
-  private:
-	char _d[C];
+private:
+	void _mkSigBuf(std::string &buf) const;
+	static void _appendEsc(const char *data,unsigned int len,std::string &to);
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/ECC.cpp b/node/ECC.cpp
deleted file mode 100644
index ad5a2537a..000000000
--- a/node/ECC.cpp
+++ /dev/null
@@ -1,2581 +0,0 @@
-/*
-Matthew Dempsky
-Public domain.
-Derived from public domain code by D. J. Bernstein.
-*/
-
-// Modified very slightly for ZeroTier One by Adam Ierymenko
-// This code remains in the public domain.
-
-#include "ECC.hpp"
-
-#include "SHA512.hpp"
-
-#include <stdint.h>
-#include <string.h>
-
-#ifdef __WINDOWS__
-#pragma warning(disable : 4146)
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-namespace {
-
-#define crypto_int32			 int32_t
-#define crypto_uint32			 uint32_t
-#define crypto_int64			 int64_t
-#define crypto_uint64			 uint64_t
-#define crypto_hash_sha512_BYTES 64
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-typedef uint8_t u8;
-typedef int32_t s32;
-typedef int64_t limb;
-
-static inline void fsum(limb* output, const limb* in)
-{
-	unsigned i;
-	for (i = 0; i < 10; i += 2) {
-		output[0 + i] = output[0 + i] + in[0 + i];
-		output[1 + i] = output[1 + i] + in[1 + i];
-	}
-}
-
-static inline void fdifference(limb* output, const limb* in)
-{
-	unsigned i;
-	for (i = 0; i < 10; ++i) {
-		output[i] = in[i] - output[i];
-	}
-}
-
-static inline void fscalar_product(limb* output, const limb* in, const limb scalar)
-{
-	unsigned i;
-	for (i = 0; i < 10; ++i) {
-		output[i] = in[i] * scalar;
-	}
-}
-
-static inline void fproduct(limb* output, const limb* in2, const limb* in)
-{
-	output[0] = ((limb)((s32)in2[0])) * ((s32)in[0]);
-	output[1] = ((limb)((s32)in2[0])) * ((s32)in[1]) + ((limb)((s32)in2[1])) * ((s32)in[0]);
-	output[2] = 2 * ((limb)((s32)in2[1])) * ((s32)in[1]) + ((limb)((s32)in2[0])) * ((s32)in[2]) + ((limb)((s32)in2[2])) * ((s32)in[0]);
-	output[3] = ((limb)((s32)in2[1])) * ((s32)in[2]) + ((limb)((s32)in2[2])) * ((s32)in[1]) + ((limb)((s32)in2[0])) * ((s32)in[3]) + ((limb)((s32)in2[3])) * ((s32)in[0]);
-	output[4] = ((limb)((s32)in2[2])) * ((s32)in[2]) + 2 * (((limb)((s32)in2[1])) * ((s32)in[3]) + ((limb)((s32)in2[3])) * ((s32)in[1])) + ((limb)((s32)in2[0])) * ((s32)in[4]) + ((limb)((s32)in2[4])) * ((s32)in[0]);
-	output[5] =
-		((limb)((s32)in2[2])) * ((s32)in[3]) + ((limb)((s32)in2[3])) * ((s32)in[2]) + ((limb)((s32)in2[1])) * ((s32)in[4]) + ((limb)((s32)in2[4])) * ((s32)in[1]) + ((limb)((s32)in2[0])) * ((s32)in[5]) + ((limb)((s32)in2[5])) * ((s32)in[0]);
-	output[6] = 2 * (((limb)((s32)in2[3])) * ((s32)in[3]) + ((limb)((s32)in2[1])) * ((s32)in[5]) + ((limb)((s32)in2[5])) * ((s32)in[1])) + ((limb)((s32)in2[2])) * ((s32)in[4]) + ((limb)((s32)in2[4])) * ((s32)in[2])
-				+ ((limb)((s32)in2[0])) * ((s32)in[6]) + ((limb)((s32)in2[6])) * ((s32)in[0]);
-	output[7] = ((limb)((s32)in2[3])) * ((s32)in[4]) + ((limb)((s32)in2[4])) * ((s32)in[3]) + ((limb)((s32)in2[2])) * ((s32)in[5]) + ((limb)((s32)in2[5])) * ((s32)in[2]) + ((limb)((s32)in2[1])) * ((s32)in[6])
-				+ ((limb)((s32)in2[6])) * ((s32)in[1]) + ((limb)((s32)in2[0])) * ((s32)in[7]) + ((limb)((s32)in2[7])) * ((s32)in[0]);
-	output[8] = ((limb)((s32)in2[4])) * ((s32)in[4]) + 2 * (((limb)((s32)in2[3])) * ((s32)in[5]) + ((limb)((s32)in2[5])) * ((s32)in[3]) + ((limb)((s32)in2[1])) * ((s32)in[7]) + ((limb)((s32)in2[7])) * ((s32)in[1]))
-				+ ((limb)((s32)in2[2])) * ((s32)in[6]) + ((limb)((s32)in2[6])) * ((s32)in[2]) + ((limb)((s32)in2[0])) * ((s32)in[8]) + ((limb)((s32)in2[8])) * ((s32)in[0]);
-	output[9] = ((limb)((s32)in2[4])) * ((s32)in[5]) + ((limb)((s32)in2[5])) * ((s32)in[4]) + ((limb)((s32)in2[3])) * ((s32)in[6]) + ((limb)((s32)in2[6])) * ((s32)in[3]) + ((limb)((s32)in2[2])) * ((s32)in[7])
-				+ ((limb)((s32)in2[7])) * ((s32)in[2]) + ((limb)((s32)in2[1])) * ((s32)in[8]) + ((limb)((s32)in2[8])) * ((s32)in[1]) + ((limb)((s32)in2[0])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[0]);
-	output[10] = 2 * (((limb)((s32)in2[5])) * ((s32)in[5]) + ((limb)((s32)in2[3])) * ((s32)in[7]) + ((limb)((s32)in2[7])) * ((s32)in[3]) + ((limb)((s32)in2[1])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[1]))
-				 + ((limb)((s32)in2[4])) * ((s32)in[6]) + ((limb)((s32)in2[6])) * ((s32)in[4]) + ((limb)((s32)in2[2])) * ((s32)in[8]) + ((limb)((s32)in2[8])) * ((s32)in[2]);
-	output[11] = ((limb)((s32)in2[5])) * ((s32)in[6]) + ((limb)((s32)in2[6])) * ((s32)in[5]) + ((limb)((s32)in2[4])) * ((s32)in[7]) + ((limb)((s32)in2[7])) * ((s32)in[4]) + ((limb)((s32)in2[3])) * ((s32)in[8])
-				 + ((limb)((s32)in2[8])) * ((s32)in[3]) + ((limb)((s32)in2[2])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[2]);
-	output[12] = ((limb)((s32)in2[6])) * ((s32)in[6]) + 2 * (((limb)((s32)in2[5])) * ((s32)in[7]) + ((limb)((s32)in2[7])) * ((s32)in[5]) + ((limb)((s32)in2[3])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[3]))
-				 + ((limb)((s32)in2[4])) * ((s32)in[8]) + ((limb)((s32)in2[8])) * ((s32)in[4]);
-	output[13] =
-		((limb)((s32)in2[6])) * ((s32)in[7]) + ((limb)((s32)in2[7])) * ((s32)in[6]) + ((limb)((s32)in2[5])) * ((s32)in[8]) + ((limb)((s32)in2[8])) * ((s32)in[5]) + ((limb)((s32)in2[4])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[4]);
-	output[14] = 2 * (((limb)((s32)in2[7])) * ((s32)in[7]) + ((limb)((s32)in2[5])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[5])) + ((limb)((s32)in2[6])) * ((s32)in[8]) + ((limb)((s32)in2[8])) * ((s32)in[6]);
-	output[15] = ((limb)((s32)in2[7])) * ((s32)in[8]) + ((limb)((s32)in2[8])) * ((s32)in[7]) + ((limb)((s32)in2[6])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[6]);
-	output[16] = ((limb)((s32)in2[8])) * ((s32)in[8]) + 2 * (((limb)((s32)in2[7])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[7]));
-	output[17] = ((limb)((s32)in2[8])) * ((s32)in[9]) + ((limb)((s32)in2[9])) * ((s32)in[8]);
-	output[18] = 2 * ((limb)((s32)in2[9])) * ((s32)in[9]);
-}
-
-static inline void freduce_degree(limb* output)
-{
-	output[8] += output[18] << 4;
-	output[8] += output[18] << 1;
-	output[8] += output[18];
-	output[7] += output[17] << 4;
-	output[7] += output[17] << 1;
-	output[7] += output[17];
-	output[6] += output[16] << 4;
-	output[6] += output[16] << 1;
-	output[6] += output[16];
-	output[5] += output[15] << 4;
-	output[5] += output[15] << 1;
-	output[5] += output[15];
-	output[4] += output[14] << 4;
-	output[4] += output[14] << 1;
-	output[4] += output[14];
-	output[3] += output[13] << 4;
-	output[3] += output[13] << 1;
-	output[3] += output[13];
-	output[2] += output[12] << 4;
-	output[2] += output[12] << 1;
-	output[2] += output[12];
-	output[1] += output[11] << 4;
-	output[1] += output[11] << 1;
-	output[1] += output[11];
-	output[0] += output[10] << 4;
-	output[0] += output[10] << 1;
-	output[0] += output[10];
-}
-
-#if (-1 & 3) != 3
-#error "This code only works on a two's complement system"
-#endif
-
-static inline limb div_by_2_26(const limb v)
-{
-	/* High word of v; no shift needed. */
-	const uint32_t highword = (uint32_t)(((uint64_t)v) >> 32);
-	/* Set to all 1s if v was negative; else set to 0s. */
-	const int32_t sign = ((int32_t)highword) >> 31;
-	/* Set to 0x3ffffff if v was negative; else set to 0. */
-	const int32_t roundoff = ((uint32_t)sign) >> 6;
-	/* Should return v / (1<<26) */
-	return (v + roundoff) >> 26;
-}
-
-static inline limb div_by_2_25(const limb v)
-{
-	/* High word of v; no shift needed*/
-	const uint32_t highword = (uint32_t)(((uint64_t)v) >> 32);
-	/* Set to all 1s if v was negative; else set to 0s. */
-	const int32_t sign = ((int32_t)highword) >> 31;
-	/* Set to 0x1ffffff if v was negative; else set to 0. */
-	const int32_t roundoff = ((uint32_t)sign) >> 7;
-	/* Should return v / (1<<25) */
-	return (v + roundoff) >> 25;
-}
-
-static inline void freduce_coefficients(limb* output)
-{
-	unsigned i;
-
-	output[10] = 0;
-
-	for (i = 0; i < 10; i += 2) {
-		limb over = div_by_2_26(output[i]);
-		/* The entry condition (that |output[i]| < 280*2^54) means that over is, at
-		 * most, 280*2^28 in the first iteration of this loop. This is added to the
-		 * next limb and we can approximate the resulting bound of that limb by
-		 * 281*2^54. */
-		output[i] -= over << 26;
-		output[i + 1] += over;
-
-		/* For the first iteration, |output[i+1]| < 281*2^54, thus |over| <
-		 * 281*2^29. When this is added to the next limb, the resulting bound can
-		 * be approximated as 281*2^54.
-		 *
-		 * For subsequent iterations of the loop, 281*2^54 remains a conservative
-		 * bound and no overflow occurs. */
-		over = div_by_2_25(output[i + 1]);
-		output[i + 1] -= over << 25;
-		output[i + 2] += over;
-	}
-	/* Now |output[10]| < 281*2^29 and all other coefficients are reduced. */
-	output[0] += output[10] << 4;
-	output[0] += output[10] << 1;
-	output[0] += output[10];
-
-	output[10] = 0;
-
-	/* Now output[1..9] are reduced, and |output[0]| < 2^26 + 19*281*2^29
-	 * So |over| will be no more than 2^16. */
-	{
-		limb over = div_by_2_26(output[0]);
-		output[0] -= over << 26;
-		output[1] += over;
-	}
-
-	/* Now output[0,2..9] are reduced, and |output[1]| < 2^25 + 2^16 < 2^26. The
-	 * bound on |output[1]| is sufficient to meet our needs. */
-}
-
-static inline void fmul(limb* output, const limb* in, const limb* in2)
-{
-	limb t[19];
-	fproduct(t, in, in2);
-	/* |t[i]| < 14*2^54 */
-	freduce_degree(t);
-	freduce_coefficients(t);
-	/* |t[i]| < 2^26 */
-	memcpy(output, t, sizeof(limb) * 10);
-}
-
-static inline void fsquare_inner(limb* output, const limb* in)
-{
-	output[0] = ((limb)((s32)in[0])) * ((s32)in[0]);
-	output[1] = 2 * ((limb)((s32)in[0])) * ((s32)in[1]);
-	output[2] = 2 * (((limb)((s32)in[1])) * ((s32)in[1]) + ((limb)((s32)in[0])) * ((s32)in[2]));
-	output[3] = 2 * (((limb)((s32)in[1])) * ((s32)in[2]) + ((limb)((s32)in[0])) * ((s32)in[3]));
-	output[4] = ((limb)((s32)in[2])) * ((s32)in[2]) + 4 * ((limb)((s32)in[1])) * ((s32)in[3]) + 2 * ((limb)((s32)in[0])) * ((s32)in[4]);
-	output[5] = 2 * (((limb)((s32)in[2])) * ((s32)in[3]) + ((limb)((s32)in[1])) * ((s32)in[4]) + ((limb)((s32)in[0])) * ((s32)in[5]));
-	output[6] = 2 * (((limb)((s32)in[3])) * ((s32)in[3]) + ((limb)((s32)in[2])) * ((s32)in[4]) + ((limb)((s32)in[0])) * ((s32)in[6]) + 2 * ((limb)((s32)in[1])) * ((s32)in[5]));
-	output[7] = 2 * (((limb)((s32)in[3])) * ((s32)in[4]) + ((limb)((s32)in[2])) * ((s32)in[5]) + ((limb)((s32)in[1])) * ((s32)in[6]) + ((limb)((s32)in[0])) * ((s32)in[7]));
-	output[8] = ((limb)((s32)in[4])) * ((s32)in[4]) + 2 * (((limb)((s32)in[2])) * ((s32)in[6]) + ((limb)((s32)in[0])) * ((s32)in[8]) + 2 * (((limb)((s32)in[1])) * ((s32)in[7]) + ((limb)((s32)in[3])) * ((s32)in[5])));
-	output[9] = 2 * (((limb)((s32)in[4])) * ((s32)in[5]) + ((limb)((s32)in[3])) * ((s32)in[6]) + ((limb)((s32)in[2])) * ((s32)in[7]) + ((limb)((s32)in[1])) * ((s32)in[8]) + ((limb)((s32)in[0])) * ((s32)in[9]));
-	output[10] = 2 * (((limb)((s32)in[5])) * ((s32)in[5]) + ((limb)((s32)in[4])) * ((s32)in[6]) + ((limb)((s32)in[2])) * ((s32)in[8]) + 2 * (((limb)((s32)in[3])) * ((s32)in[7]) + ((limb)((s32)in[1])) * ((s32)in[9])));
-	output[11] = 2 * (((limb)((s32)in[5])) * ((s32)in[6]) + ((limb)((s32)in[4])) * ((s32)in[7]) + ((limb)((s32)in[3])) * ((s32)in[8]) + ((limb)((s32)in[2])) * ((s32)in[9]));
-	output[12] = ((limb)((s32)in[6])) * ((s32)in[6]) + 2 * (((limb)((s32)in[4])) * ((s32)in[8]) + 2 * (((limb)((s32)in[5])) * ((s32)in[7]) + ((limb)((s32)in[3])) * ((s32)in[9])));
-	output[13] = 2 * (((limb)((s32)in[6])) * ((s32)in[7]) + ((limb)((s32)in[5])) * ((s32)in[8]) + ((limb)((s32)in[4])) * ((s32)in[9]));
-	output[14] = 2 * (((limb)((s32)in[7])) * ((s32)in[7]) + ((limb)((s32)in[6])) * ((s32)in[8]) + 2 * ((limb)((s32)in[5])) * ((s32)in[9]));
-	output[15] = 2 * (((limb)((s32)in[7])) * ((s32)in[8]) + ((limb)((s32)in[6])) * ((s32)in[9]));
-	output[16] = ((limb)((s32)in[8])) * ((s32)in[8]) + 4 * ((limb)((s32)in[7])) * ((s32)in[9]);
-	output[17] = 2 * ((limb)((s32)in[8])) * ((s32)in[9]);
-	output[18] = 2 * ((limb)((s32)in[9])) * ((s32)in[9]);
-}
-
-static void fsquare(limb* output, const limb* in)
-{
-	limb t[19];
-	fsquare_inner(t, in);
-	/* |t[i]| < 14*2^54 because the largest product of two limbs will be <
-	 * 2^(27+27) and fsquare_inner adds together, at most, 14 of those
-	 * products. */
-	freduce_degree(t);
-	freduce_coefficients(t);
-	/* |t[i]| < 2^26 */
-	memcpy(output, t, sizeof(limb) * 10);
-}
-
-static inline void fexpand(limb* output, const u8* input)
-{
-#define F(n, start, shift, mask) output[n] = ((((limb)input[start + 0]) | ((limb)input[start + 1]) << 8 | ((limb)input[start + 2]) << 16 | ((limb)input[start + 3]) << 24) >> shift) & mask;
-	F(0, 0, 0, 0x3ffffff);
-	F(1, 3, 2, 0x1ffffff);
-	F(2, 6, 3, 0x3ffffff);
-	F(3, 9, 5, 0x1ffffff);
-	F(4, 12, 6, 0x3ffffff);
-	F(5, 16, 0, 0x1ffffff);
-	F(6, 19, 1, 0x3ffffff);
-	F(7, 22, 3, 0x1ffffff);
-	F(8, 25, 4, 0x3ffffff);
-	F(9, 28, 6, 0x1ffffff);
-#undef F
-}
-
-#if (-32 >> 1) != -16
-#error "This code only works when >> does sign-extension on negative numbers"
-#endif
-
-static inline s32 s32_eq(s32 a, s32 b)
-{
-	a = ~(a ^ b);
-	a &= a << 16;
-	a &= a << 8;
-	a &= a << 4;
-	a &= a << 2;
-	a &= a << 1;
-	return a >> 31;
-}
-
-static inline s32 s32_gte(s32 a, s32 b)
-{
-	a -= b;
-	/* a >= 0 iff a >= b. */
-	return ~(a >> 31);
-}
-
-static inline void fcontract(u8* output, limb* input_limbs)
-{
-	int i;
-	int j;
-	s32 input[10];
-	s32 mask;
-
-	/* |input_limbs[i]| < 2^26, so it's valid to convert to an s32. */
-	for (i = 0; i < 10; i++) {
-		input[i] = input_limbs[i];
-	}
-
-	for (j = 0; j < 2; ++j) {
-		for (i = 0; i < 9; ++i) {
-			if ((i & 1) == 1) {
-				/* This calculation is a time-invariant way to make input[i]
-				 * non-negative by borrowing from the next-larger limb. */
-				const s32 mask = input[i] >> 31;
-				const s32 carry = -((input[i] & mask) >> 25);
-				input[i] = input[i] + (carry << 25);
-				input[i + 1] = input[i + 1] - carry;
-			}
-			else {
-				const s32 mask = input[i] >> 31;
-				const s32 carry = -((input[i] & mask) >> 26);
-				input[i] = input[i] + (carry << 26);
-				input[i + 1] = input[i + 1] - carry;
-			}
-		}
-
-		/* There's no greater limb for input[9] to borrow from, but we can multiply
-		 * by 19 and borrow from input[0], which is valid mod 2^255-19. */
-		{
-			const s32 mask = input[9] >> 31;
-			const s32 carry = -((input[9] & mask) >> 25);
-			input[9] = input[9] + (carry << 25);
-			input[0] = input[0] - (carry * 19);
-		}
-
-		/* After the first iteration, input[1..9] are non-negative and fit within
-		 * 25 or 26 bits, depending on position. However, input[0] may be
-		 * negative. */
-	}
-
-	/* The first borrow-propagation pass above ended with every limb
-	   except (possibly) input[0] non-negative.
-
-	   If input[0] was negative after the first pass, then it was because of a
-	   carry from input[9]. On entry, input[9] < 2^26 so the carry was, at most,
-	   one, since (2**26-1) >> 25 = 1. Thus input[0] >= -19.
-
-	   In the second pass, each limb is decreased by at most one. Thus the second
-	   borrow-propagation pass could only have wrapped around to decrease
-	   input[0] again if the first pass left input[0] negative *and* input[1]
-	   through input[9] were all zero.  In that case, input[1] is now 2^25 - 1,
-	   and this last borrow-propagation step will leave input[1] non-negative. */
-	{
-		const s32 mask = input[0] >> 31;
-		const s32 carry = -((input[0] & mask) >> 26);
-		input[0] = input[0] + (carry << 26);
-		input[1] = input[1] - carry;
-	}
-
-	/* All input[i] are now non-negative. However, there might be values between
-	 * 2^25 and 2^26 in a limb which is, nominally, 25 bits wide. */
-	for (j = 0; j < 2; j++) {
-		for (i = 0; i < 9; i++) {
-			if ((i & 1) == 1) {
-				const s32 carry = input[i] >> 25;
-				input[i] &= 0x1ffffff;
-				input[i + 1] += carry;
-			}
-			else {
-				const s32 carry = input[i] >> 26;
-				input[i] &= 0x3ffffff;
-				input[i + 1] += carry;
-			}
-		}
-
-		{
-			const s32 carry = input[9] >> 25;
-			input[9] &= 0x1ffffff;
-			input[0] += 19 * carry;
-		}
-	}
-
-	/* If the first carry-chain pass, just above, ended up with a carry from
-	 * input[9], and that caused input[0] to be out-of-bounds, then input[0] was
-	 * < 2^26 + 2*19, because the carry was, at most, two.
-	 *
-	 * If the second pass carried from input[9] again then input[0] is < 2*19 and
-	 * the input[9] -> input[0] carry didn't push input[0] out of bounds. */
-
-	/* It still remains the case that input might be between 2^255-19 and 2^255.
-	 * In this case, input[1..9] must take their maximum value and input[0] must
-	 * be >= (2^255-19) & 0x3ffffff, which is 0x3ffffed. */
-	mask = s32_gte(input[0], 0x3ffffed);
-	for (i = 1; i < 10; i++) {
-		if ((i & 1) == 1) {
-			mask &= s32_eq(input[i], 0x1ffffff);
-		}
-		else {
-			mask &= s32_eq(input[i], 0x3ffffff);
-		}
-	}
-
-	/* mask is either 0xffffffff (if input >= 2^255-19) and zero otherwise. Thus
-	 * this conditionally subtracts 2^255-19. */
-	input[0] -= mask & 0x3ffffed;
-
-	for (i = 1; i < 10; i++) {
-		if ((i & 1) == 1) {
-			input[i] -= mask & 0x1ffffff;
-		}
-		else {
-			input[i] -= mask & 0x3ffffff;
-		}
-	}
-
-	input[1] <<= 2;
-	input[2] <<= 3;
-	input[3] <<= 5;
-	input[4] <<= 6;
-	input[6] <<= 1;
-	input[7] <<= 3;
-	input[8] <<= 4;
-	input[9] <<= 6;
-#define F(i, s)                                                                                                                                                                                                                                \
-	output[s + 0] |= input[i] & 0xff;                                                                                                                                                                                                          \
-	output[s + 1] = (input[i] >> 8) & 0xff;                                                                                                                                                                                                    \
-	output[s + 2] = (input[i] >> 16) & 0xff;                                                                                                                                                                                                   \
-	output[s + 3] = (input[i] >> 24) & 0xff;
-	output[0] = 0;
-	output[16] = 0;
-	F(0, 0);
-	F(1, 3);
-	F(2, 6);
-	F(3, 9);
-	F(4, 12);
-	F(5, 16);
-	F(6, 19);
-	F(7, 22);
-	F(8, 25);
-	F(9, 28);
-#undef F
-}
-
-static inline void fmonty(
-	limb* x2,
-	limb* z2, /* output 2Q */
-	limb* x3,
-	limb* z3, /* output Q + Q' */
-	limb* x,
-	limb* z, /* input Q */
-	limb* xprime,
-	limb* zprime, /* input Q' */
-	const limb* qmqp /* input Q - Q' */)
-{
-	limb origx[10], origxprime[10], zzz[19], xx[19], zz[19], xxprime[19], zzprime[19], zzzprime[19], xxxprime[19];
-
-	memcpy(origx, x, 10 * sizeof(limb));
-	fsum(x, z);
-	/* |x[i]| < 2^27 */
-	fdifference(z, origx); /* does x - z */
-	/* |z[i]| < 2^27 */
-
-	memcpy(origxprime, xprime, sizeof(limb) * 10);
-	fsum(xprime, zprime);
-	/* |xprime[i]| < 2^27 */
-	fdifference(zprime, origxprime);
-	/* |zprime[i]| < 2^27 */
-	fproduct(xxprime, xprime, z);
-	/* |xxprime[i]| < 14*2^54: the largest product of two limbs will be <
-	 * 2^(27+27) and fproduct adds together, at most, 14 of those products.
-	 * (Approximating that to 2^58 doesn't work out.) */
-	fproduct(zzprime, x, zprime);
-	/* |zzprime[i]| < 14*2^54 */
-	freduce_degree(xxprime);
-	freduce_coefficients(xxprime);
-	/* |xxprime[i]| < 2^26 */
-	freduce_degree(zzprime);
-	freduce_coefficients(zzprime);
-	/* |zzprime[i]| < 2^26 */
-	memcpy(origxprime, xxprime, sizeof(limb) * 10);
-	fsum(xxprime, zzprime);
-	/* |xxprime[i]| < 2^27 */
-	fdifference(zzprime, origxprime);
-	/* |zzprime[i]| < 2^27 */
-	fsquare(xxxprime, xxprime);
-	/* |xxxprime[i]| < 2^26 */
-	fsquare(zzzprime, zzprime);
-	/* |zzzprime[i]| < 2^26 */
-	fproduct(zzprime, zzzprime, qmqp);
-	/* |zzprime[i]| < 14*2^52 */
-	freduce_degree(zzprime);
-	freduce_coefficients(zzprime);
-	/* |zzprime[i]| < 2^26 */
-	memcpy(x3, xxxprime, sizeof(limb) * 10);
-	memcpy(z3, zzprime, sizeof(limb) * 10);
-
-	fsquare(xx, x);
-	/* |xx[i]| < 2^26 */
-	fsquare(zz, z);
-	/* |zz[i]| < 2^26 */
-	fproduct(x2, xx, zz);
-	/* |x2[i]| < 14*2^52 */
-	freduce_degree(x2);
-	freduce_coefficients(x2);
-	/* |x2[i]| < 2^26 */
-	fdifference(zz, xx);   // does zz = xx - zz
-	/* |zz[i]| < 2^27 */
-	memset(zzz + 10, 0, sizeof(limb) * 9);
-	fscalar_product(zzz, zz, 121665);
-	/* |zzz[i]| < 2^(27+17) */
-	/* No need to call freduce_degree here:
-	   fscalar_product doesn't increase the degree of its input. */
-	freduce_coefficients(zzz);
-	/* |zzz[i]| < 2^26 */
-	fsum(zzz, xx);
-	/* |zzz[i]| < 2^27 */
-	fproduct(z2, zz, zzz);
-	/* |z2[i]| < 14*2^(26+27) */
-	freduce_degree(z2);
-	freduce_coefficients(z2);
-	/* |z2|i| < 2^26 */
-}
-
-static inline void swap_conditional(limb a[19], limb b[19], limb iswap)
-{
-	unsigned i;
-	const s32 swap = (s32)-iswap;
-
-	for (i = 0; i < 10; ++i) {
-		const s32 x = swap & (((s32)a[i]) ^ ((s32)b[i]));
-		a[i] = ((s32)a[i]) ^ x;
-		b[i] = ((s32)b[i]) ^ x;
-	}
-}
-
-static inline void cmult(limb* resultx, limb* resultz, const u8* n, const limb* q)
-{
-	limb a[19] = { 0 }, b[19] = { 1 }, c[19] = { 1 }, d[19] = { 0 };
-	limb *nqpqx = a, *nqpqz = b, *nqx = c, *nqz = d, *t;
-	limb e[19] = { 0 }, f[19] = { 1 }, g[19] = { 0 }, h[19] = { 1 };
-	limb *nqpqx2 = e, *nqpqz2 = f, *nqx2 = g, *nqz2 = h;
-
-	unsigned i, j;
-
-	memcpy(nqpqx, q, sizeof(limb) * 10);
-
-	for (i = 0; i < 32; ++i) {
-		u8 byte = n[31 - i];
-		for (j = 0; j < 8; ++j) {
-			const limb bit = byte >> 7;
-
-			swap_conditional(nqx, nqpqx, bit);
-			swap_conditional(nqz, nqpqz, bit);
-			fmonty(nqx2, nqz2, nqpqx2, nqpqz2, nqx, nqz, nqpqx, nqpqz, q);
-			swap_conditional(nqx2, nqpqx2, bit);
-			swap_conditional(nqz2, nqpqz2, bit);
-
-			t = nqx;
-			nqx = nqx2;
-			nqx2 = t;
-			t = nqz;
-			nqz = nqz2;
-			nqz2 = t;
-			t = nqpqx;
-			nqpqx = nqpqx2;
-			nqpqx2 = t;
-			t = nqpqz;
-			nqpqz = nqpqz2;
-			nqpqz2 = t;
-
-			byte <<= 1;
-		}
-	}
-
-	memcpy(resultx, nqx, sizeof(limb) * 10);
-	memcpy(resultz, nqz, sizeof(limb) * 10);
-}
-
-static inline void crecip(limb* out, const limb* z)
-{
-	limb z2[10];
-	limb z9[10];
-	limb z11[10];
-	limb z2_5_0[10];
-	limb z2_10_0[10];
-	limb z2_20_0[10];
-	limb z2_50_0[10];
-	limb z2_100_0[10];
-	limb t0[10];
-	limb t1[10];
-	int i;
-
-	/* 2 */ fsquare(z2, z);
-	/* 4 */ fsquare(t1, z2);
-	/* 8 */ fsquare(t0, t1);
-	/* 9 */ fmul(z9, t0, z);
-	/* 11 */ fmul(z11, z9, z2);
-	/* 22 */ fsquare(t0, z11);
-	/* 2^5 - 2^0 = 31 */ fmul(z2_5_0, t0, z9);
-
-	/* 2^6 - 2^1 */ fsquare(t0, z2_5_0);
-	/* 2^7 - 2^2 */ fsquare(t1, t0);
-	/* 2^8 - 2^3 */ fsquare(t0, t1);
-	/* 2^9 - 2^4 */ fsquare(t1, t0);
-	/* 2^10 - 2^5 */ fsquare(t0, t1);
-	/* 2^10 - 2^0 */ fmul(z2_10_0, t0, z2_5_0);
-
-	/* 2^11 - 2^1 */ fsquare(t0, z2_10_0);
-	/* 2^12 - 2^2 */ fsquare(t1, t0);
-	/* 2^20 - 2^10 */ for (i = 2; i < 10; i += 2) {
-		fsquare(t0, t1);
-		fsquare(t1, t0);
-	}
-	/* 2^20 - 2^0 */ fmul(z2_20_0, t1, z2_10_0);
-
-	/* 2^21 - 2^1 */ fsquare(t0, z2_20_0);
-	/* 2^22 - 2^2 */ fsquare(t1, t0);
-	/* 2^40 - 2^20 */ for (i = 2; i < 20; i += 2) {
-		fsquare(t0, t1);
-		fsquare(t1, t0);
-	}
-	/* 2^40 - 2^0 */ fmul(t0, t1, z2_20_0);
-
-	/* 2^41 - 2^1 */ fsquare(t1, t0);
-	/* 2^42 - 2^2 */ fsquare(t0, t1);
-	/* 2^50 - 2^10 */ for (i = 2; i < 10; i += 2) {
-		fsquare(t1, t0);
-		fsquare(t0, t1);
-	}
-	/* 2^50 - 2^0 */ fmul(z2_50_0, t0, z2_10_0);
-
-	/* 2^51 - 2^1 */ fsquare(t0, z2_50_0);
-	/* 2^52 - 2^2 */ fsquare(t1, t0);
-	/* 2^100 - 2^50 */ for (i = 2; i < 50; i += 2) {
-		fsquare(t0, t1);
-		fsquare(t1, t0);
-	}
-	/* 2^100 - 2^0 */ fmul(z2_100_0, t1, z2_50_0);
-
-	/* 2^101 - 2^1 */ fsquare(t1, z2_100_0);
-	/* 2^102 - 2^2 */ fsquare(t0, t1);
-	/* 2^200 - 2^100 */ for (i = 2; i < 100; i += 2) {
-		fsquare(t1, t0);
-		fsquare(t0, t1);
-	}
-	/* 2^200 - 2^0 */ fmul(t1, t0, z2_100_0);
-
-	/* 2^201 - 2^1 */ fsquare(t0, t1);
-	/* 2^202 - 2^2 */ fsquare(t1, t0);
-	/* 2^250 - 2^50 */ for (i = 2; i < 50; i += 2) {
-		fsquare(t0, t1);
-		fsquare(t1, t0);
-	}
-	/* 2^250 - 2^0 */ fmul(t0, t1, z2_50_0);
-
-	/* 2^251 - 2^1 */ fsquare(t1, t0);
-	/* 2^252 - 2^2 */ fsquare(t0, t1);
-	/* 2^253 - 2^3 */ fsquare(t1, t0);
-	/* 2^254 - 2^4 */ fsquare(t0, t1);
-	/* 2^255 - 2^5 */ fsquare(t1, t0);
-	/* 2^255 - 21 */ fmul(out, t1, z11);
-}
-
-static void crypto_scalarmult(u8* mypublic, const u8* secret, const u8* basepoint)
-{
-	limb bp[10], x[10], z[11], zmone[10];
-	uint8_t e[32];
-	int i;
-
-	for (i = 0; i < 32; ++i) {
-		e[i] = secret[i];
-	}
-	e[0] &= 248;
-	e[31] &= 127;
-	e[31] |= 64;
-
-	fexpand(bp, basepoint);
-	cmult(x, z, e, bp);
-	crecip(zmone, z);
-	fmul(z, x, zmone);
-	fcontract(mypublic, z);
-}
-
-static const unsigned char base[32] = { 9 };
-static inline void crypto_scalarmult_base(unsigned char* q, const unsigned char* n)
-{
-	crypto_scalarmult(q, n, base);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-// Ed25519 ref from: http://bench.cr.yp.to/supercop.html
-
-typedef struct {
-	crypto_uint32 v[32];
-} fe25519;
-
-typedef struct {
-	crypto_uint32 v[32];
-} sc25519;
-
-typedef struct {
-	crypto_uint32 v[16];
-} shortsc25519;
-
-typedef struct {
-	fe25519 x;
-	fe25519 y;
-	fe25519 z;
-	fe25519 t;
-} ge25519;
-
-#define ge25519_p3 ge25519
-
-typedef struct {
-	fe25519 x;
-	fe25519 z;
-	fe25519 y;
-	fe25519 t;
-} ge25519_p1p1;
-
-typedef struct {
-	fe25519 x;
-	fe25519 y;
-	fe25519 z;
-} ge25519_p2;
-
-typedef struct {
-	fe25519 x;
-	fe25519 y;
-} ge25519_aff;
-
-static inline void fe25519_sub(fe25519* r, const fe25519* x, const fe25519* y);
-
-static inline crypto_uint32 equal(crypto_uint32 a, crypto_uint32 b) /* 16-bit inputs */
-{
-	crypto_uint32 x = a ^ b; /* 0: yes; 1..65535: no */
-	x -= 1;					 /* 4294967295: yes; 0..65534: no */
-	x >>= 31;				 /* 1: yes; 0: no */
-	return x;
-}
-
-static inline crypto_uint32 ge(crypto_uint32 a, crypto_uint32 b) /* 16-bit inputs */
-{
-	unsigned int x = a;
-	x -= (unsigned int)b; /* 0..65535: yes; 4294901761..4294967295: no */
-	x >>= 31;			  /* 0: yes; 1: no */
-	x ^= 1;				  /* 1: yes; 0: no */
-	return x;
-}
-
-static inline crypto_uint32 times19(crypto_uint32 a)
-{
-	return (a << 4) + (a << 1) + a;
-}
-
-static inline crypto_uint32 times38(crypto_uint32 a)
-{
-	return (a << 5) + (a << 2) + (a << 1);
-}
-
-static inline void reduce_add_sub(fe25519* r)
-{
-	crypto_uint32 t;
-	int i, rep;
-
-	for (rep = 0; rep < 4; rep++) {
-		t = r->v[31] >> 7;
-		r->v[31] &= 127;
-		t = times19(t);
-		r->v[0] += t;
-		for (i = 0; i < 31; i++) {
-			t = r->v[i] >> 8;
-			r->v[i + 1] += t;
-			r->v[i] &= 255;
-		}
-	}
-}
-
-static inline void reduce_mul(fe25519* r)
-{
-	crypto_uint32 t;
-	int i, rep;
-
-	for (rep = 0; rep < 2; rep++) {
-		t = r->v[31] >> 7;
-		r->v[31] &= 127;
-		t = times19(t);
-		r->v[0] += t;
-		for (i = 0; i < 31; i++) {
-			t = r->v[i] >> 8;
-			r->v[i + 1] += t;
-			r->v[i] &= 255;
-		}
-	}
-}
-
-/* reduction modulo 2^255-19 */
-static inline void fe25519_freeze(fe25519* r)
-{
-	int i;
-	crypto_uint32 m = equal(r->v[31], 127);
-	for (i = 30; i > 0; i--) {
-		m &= equal(r->v[i], 255);
-	}
-	m &= ge(r->v[0], 237);
-
-	m = -m;
-
-	r->v[31] -= m & 127;
-	for (i = 30; i > 0; i--) {
-		r->v[i] -= m & 255;
-	}
-	r->v[0] -= m & 237;
-}
-
-static inline void fe25519_unpack(fe25519* r, const unsigned char x[32])
-{
-	int i;
-	for (i = 0; i < 32; i++) {
-		r->v[i] = x[i];
-	}
-	r->v[31] &= 127;
-}
-
-/* Assumes input x being reduced below 2^255 */
-static inline void fe25519_pack(unsigned char r[32], const fe25519* x)
-{
-	int i;
-	fe25519 y = *x;
-	fe25519_freeze(&y);
-	for (i = 0; i < 32; i++) {
-		r[i] = y.v[i];
-	}
-}
-
-static inline int fe25519_iseq_vartime(const fe25519* x, const fe25519* y)
-{
-	int i;
-	fe25519 t1 = *x;
-	fe25519 t2 = *y;
-	fe25519_freeze(&t1);
-	fe25519_freeze(&t2);
-	for (i = 0; i < 32; i++) {
-		if (t1.v[i] != t2.v[i]) {
-			return 0;
-		}
-	}
-	return 1;
-}
-
-static inline void fe25519_cmov(fe25519* r, const fe25519* x, unsigned char b)
-{
-	int i;
-	crypto_uint32 mask = b;
-	mask = -mask;
-	for (i = 0; i < 32; i++) {
-		r->v[i] ^= mask & (x->v[i] ^ r->v[i]);
-	}
-}
-
-static inline unsigned char fe25519_getparity(const fe25519* x)
-{
-	fe25519 t = *x;
-	fe25519_freeze(&t);
-	return t.v[0] & 1;
-}
-
-static inline void fe25519_setone(fe25519* r)
-{
-	int i;
-	r->v[0] = 1;
-	for (i = 1; i < 32; i++) {
-		r->v[i] = 0;
-	}
-}
-
-static inline void fe25519_setzero(fe25519* r)
-{
-	int i;
-	for (i = 0; i < 32; i++) {
-		r->v[i] = 0;
-	}
-}
-
-static inline void fe25519_neg(fe25519* r, const fe25519* x)
-{
-	fe25519 t;
-	int i;
-	for (i = 0; i < 32; i++) {
-		t.v[i] = x->v[i];
-	}
-	fe25519_setzero(r);
-	fe25519_sub(r, r, &t);
-}
-
-static inline void fe25519_add(fe25519* r, const fe25519* x, const fe25519* y)
-{
-	int i;
-	for (i = 0; i < 32; i++) {
-		r->v[i] = x->v[i] + y->v[i];
-	}
-	reduce_add_sub(r);
-}
-
-static inline void fe25519_sub(fe25519* r, const fe25519* x, const fe25519* y)
-{
-	int i;
-	crypto_uint32 t[32];
-	t[0] = x->v[0] + 0x1da;
-	t[31] = x->v[31] + 0xfe;
-	for (i = 1; i < 31; i++) {
-		t[i] = x->v[i] + 0x1fe;
-	}
-	for (i = 0; i < 32; i++) {
-		r->v[i] = t[i] - y->v[i];
-	}
-	reduce_add_sub(r);
-}
-
-static inline void fe25519_mul(fe25519* r, const fe25519* x, const fe25519* y)
-{
-	int i, j;
-	crypto_uint32 t[63];
-	for (i = 0; i < 63; i++) {
-		t[i] = 0;
-	}
-
-	for (i = 0; i < 32; i++) {
-		for (j = 0; j < 32; j++) {
-			t[i + j] += x->v[i] * y->v[j];
-		}
-	}
-
-	for (i = 32; i < 63; i++) {
-		r->v[i - 32] = t[i - 32] + times38(t[i]);
-	}
-	r->v[31] = t[31]; /* result now in r[0]...r[31] */
-
-	reduce_mul(r);
-}
-
-static inline void fe25519_square(fe25519* r, const fe25519* x)
-{
-	fe25519_mul(r, x, x);
-}
-
-static inline void fe25519_invert(fe25519* r, const fe25519* x)
-{
-	fe25519 z2;
-	fe25519 z9;
-	fe25519 z11;
-	fe25519 z2_5_0;
-	fe25519 z2_10_0;
-	fe25519 z2_20_0;
-	fe25519 z2_50_0;
-	fe25519 z2_100_0;
-	fe25519 t0;
-	fe25519 t1;
-	int i;
-
-	/* 2 */ fe25519_square(&z2, x);
-	/* 4 */ fe25519_square(&t1, &z2);
-	/* 8 */ fe25519_square(&t0, &t1);
-	/* 9 */ fe25519_mul(&z9, &t0, x);
-	/* 11 */ fe25519_mul(&z11, &z9, &z2);
-	/* 22 */ fe25519_square(&t0, &z11);
-	/* 2^5 - 2^0 = 31 */ fe25519_mul(&z2_5_0, &t0, &z9);
-
-	/* 2^6 - 2^1 */ fe25519_square(&t0, &z2_5_0);
-	/* 2^7 - 2^2 */ fe25519_square(&t1, &t0);
-	/* 2^8 - 2^3 */ fe25519_square(&t0, &t1);
-	/* 2^9 - 2^4 */ fe25519_square(&t1, &t0);
-	/* 2^10 - 2^5 */ fe25519_square(&t0, &t1);
-	/* 2^10 - 2^0 */ fe25519_mul(&z2_10_0, &t0, &z2_5_0);
-
-	/* 2^11 - 2^1 */ fe25519_square(&t0, &z2_10_0);
-	/* 2^12 - 2^2 */ fe25519_square(&t1, &t0);
-	/* 2^20 - 2^10 */ for (i = 2; i < 10; i += 2) {
-		fe25519_square(&t0, &t1);
-		fe25519_square(&t1, &t0);
-	}
-	/* 2^20 - 2^0 */ fe25519_mul(&z2_20_0, &t1, &z2_10_0);
-
-	/* 2^21 - 2^1 */ fe25519_square(&t0, &z2_20_0);
-	/* 2^22 - 2^2 */ fe25519_square(&t1, &t0);
-	/* 2^40 - 2^20 */ for (i = 2; i < 20; i += 2) {
-		fe25519_square(&t0, &t1);
-		fe25519_square(&t1, &t0);
-	}
-	/* 2^40 - 2^0 */ fe25519_mul(&t0, &t1, &z2_20_0);
-
-	/* 2^41 - 2^1 */ fe25519_square(&t1, &t0);
-	/* 2^42 - 2^2 */ fe25519_square(&t0, &t1);
-	/* 2^50 - 2^10 */ for (i = 2; i < 10; i += 2) {
-		fe25519_square(&t1, &t0);
-		fe25519_square(&t0, &t1);
-	}
-	/* 2^50 - 2^0 */ fe25519_mul(&z2_50_0, &t0, &z2_10_0);
-
-	/* 2^51 - 2^1 */ fe25519_square(&t0, &z2_50_0);
-	/* 2^52 - 2^2 */ fe25519_square(&t1, &t0);
-	/* 2^100 - 2^50 */ for (i = 2; i < 50; i += 2) {
-		fe25519_square(&t0, &t1);
-		fe25519_square(&t1, &t0);
-	}
-	/* 2^100 - 2^0 */ fe25519_mul(&z2_100_0, &t1, &z2_50_0);
-
-	/* 2^101 - 2^1 */ fe25519_square(&t1, &z2_100_0);
-	/* 2^102 - 2^2 */ fe25519_square(&t0, &t1);
-	/* 2^200 - 2^100 */ for (i = 2; i < 100; i += 2) {
-		fe25519_square(&t1, &t0);
-		fe25519_square(&t0, &t1);
-	}
-	/* 2^200 - 2^0 */ fe25519_mul(&t1, &t0, &z2_100_0);
-
-	/* 2^201 - 2^1 */ fe25519_square(&t0, &t1);
-	/* 2^202 - 2^2 */ fe25519_square(&t1, &t0);
-	/* 2^250 - 2^50 */ for (i = 2; i < 50; i += 2) {
-		fe25519_square(&t0, &t1);
-		fe25519_square(&t1, &t0);
-	}
-	/* 2^250 - 2^0 */ fe25519_mul(&t0, &t1, &z2_50_0);
-
-	/* 2^251 - 2^1 */ fe25519_square(&t1, &t0);
-	/* 2^252 - 2^2 */ fe25519_square(&t0, &t1);
-	/* 2^253 - 2^3 */ fe25519_square(&t1, &t0);
-	/* 2^254 - 2^4 */ fe25519_square(&t0, &t1);
-	/* 2^255 - 2^5 */ fe25519_square(&t1, &t0);
-	/* 2^255 - 21 */ fe25519_mul(r, &t1, &z11);
-}
-
-static inline void fe25519_pow2523(fe25519* r, const fe25519* x)
-{
-	fe25519 z2;
-	fe25519 z9;
-	fe25519 z11;
-	fe25519 z2_5_0;
-	fe25519 z2_10_0;
-	fe25519 z2_20_0;
-	fe25519 z2_50_0;
-	fe25519 z2_100_0;
-	fe25519 t;
-	int i;
-
-	/* 2 */ fe25519_square(&z2, x);
-	/* 4 */ fe25519_square(&t, &z2);
-	/* 8 */ fe25519_square(&t, &t);
-	/* 9 */ fe25519_mul(&z9, &t, x);
-	/* 11 */ fe25519_mul(&z11, &z9, &z2);
-	/* 22 */ fe25519_square(&t, &z11);
-	/* 2^5 - 2^0 = 31 */ fe25519_mul(&z2_5_0, &t, &z9);
-
-	/* 2^6 - 2^1 */ fe25519_square(&t, &z2_5_0);
-	/* 2^10 - 2^5 */ for (i = 1; i < 5; i++) { fe25519_square(&t, &t); }
-	/* 2^10 - 2^0 */ fe25519_mul(&z2_10_0, &t, &z2_5_0);
-
-	/* 2^11 - 2^1 */ fe25519_square(&t, &z2_10_0);
-	/* 2^20 - 2^10 */ for (i = 1; i < 10; i++) { fe25519_square(&t, &t); }
-	/* 2^20 - 2^0 */ fe25519_mul(&z2_20_0, &t, &z2_10_0);
-
-	/* 2^21 - 2^1 */ fe25519_square(&t, &z2_20_0);
-	/* 2^40 - 2^20 */ for (i = 1; i < 20; i++) { fe25519_square(&t, &t); }
-	/* 2^40 - 2^0 */ fe25519_mul(&t, &t, &z2_20_0);
-
-	/* 2^41 - 2^1 */ fe25519_square(&t, &t);
-	/* 2^50 - 2^10 */ for (i = 1; i < 10; i++) { fe25519_square(&t, &t); }
-	/* 2^50 - 2^0 */ fe25519_mul(&z2_50_0, &t, &z2_10_0);
-
-	/* 2^51 - 2^1 */ fe25519_square(&t, &z2_50_0);
-	/* 2^100 - 2^50 */ for (i = 1; i < 50; i++) { fe25519_square(&t, &t); }
-	/* 2^100 - 2^0 */ fe25519_mul(&z2_100_0, &t, &z2_50_0);
-
-	/* 2^101 - 2^1 */ fe25519_square(&t, &z2_100_0);
-	/* 2^200 - 2^100 */ for (i = 1; i < 100; i++) { fe25519_square(&t, &t); }
-	/* 2^200 - 2^0 */ fe25519_mul(&t, &t, &z2_100_0);
-
-	/* 2^201 - 2^1 */ fe25519_square(&t, &t);
-	/* 2^250 - 2^50 */ for (i = 1; i < 50; i++) { fe25519_square(&t, &t); }
-	/* 2^250 - 2^0 */ fe25519_mul(&t, &t, &z2_50_0);
-
-	/* 2^251 - 2^1 */ fe25519_square(&t, &t);
-	/* 2^252 - 2^2 */ fe25519_square(&t, &t);
-	/* 2^252 - 3 */ fe25519_mul(r, &t, x);
-}
-
-static const crypto_uint32 m[32] = { 0xED, 0xD3, 0xF5, 0x5C, 0x1A, 0x63, 0x12, 0x58, 0xD6, 0x9C, 0xF7, 0xA2, 0xDE, 0xF9, 0xDE, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10 };
-static const crypto_uint32 mu[33] = { 0x1B, 0x13, 0x2C, 0x0A, 0xA3, 0xE5, 0x9C, 0xED, 0xA7, 0x29, 0x63, 0x08, 0x5D, 0x21, 0x06, 0x21, 0xEB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F };
-
-static inline crypto_uint32 lt(crypto_uint32 a, crypto_uint32 b) /* 16-bit inputs */
-{
-	unsigned int x = a;
-	x -= (unsigned int)b; /* 0..65535: no; 4294901761..4294967295: yes */
-	x >>= 31;			  /* 0: no; 1: yes */
-	return x;
-}
-
-/* Reduce coefficients of r before calling reduce_add_sub */
-static inline void reduce_add_sub(sc25519* r)
-{
-	crypto_uint32 pb = 0;
-	crypto_uint32 b;
-	crypto_uint32 mask;
-	int i;
-	unsigned char t[32];
-
-	for (i = 0; i < 32; i++) {
-		pb += m[i];
-		b = lt(r->v[i], pb);
-		t[i] = r->v[i] - pb + (b << 8);
-		pb = b;
-	}
-	mask = b - 1;
-	for (i = 0; i < 32; i++) {
-		r->v[i] ^= mask & (r->v[i] ^ t[i]);
-	}
-}
-
-/* Reduce coefficients of x before calling barrett_reduce */
-static inline void barrett_reduce(sc25519* r, const crypto_uint32 x[64])
-{
-	/* See HAC, Alg. 14.42 */
-	int i, j;
-	crypto_uint32 q2[66];
-	crypto_uint32* q3 = q2 + 33;
-	crypto_uint32 r1[33];
-	crypto_uint32 r2[33];
-	crypto_uint32 carry;
-	crypto_uint32 pb = 0;
-	crypto_uint32 b;
-
-	for (i = 0; i < 66; ++i) {
-		q2[i] = 0;
-	}
-	for (i = 0; i < 33; ++i) {
-		r2[i] = 0;
-	}
-
-	for (i = 0; i < 33; i++) {
-		for (j = 0; j < 33; j++) {
-			if (i + j >= 31) {
-				q2[i + j] += mu[i] * x[j + 31];
-			}
-		}
-	}
-	carry = q2[31] >> 8;
-	q2[32] += carry;
-	carry = q2[32] >> 8;
-	q2[33] += carry;
-
-	for (i = 0; i < 33; i++) {
-		r1[i] = x[i];
-	}
-	for (i = 0; i < 32; i++) {
-		for (j = 0; j < 33; j++) {
-			if (i + j < 33) {
-				r2[i + j] += m[i] * q3[j];
-			}
-		}
-	}
-
-	for (i = 0; i < 32; i++) {
-		carry = r2[i] >> 8;
-		r2[i + 1] += carry;
-		r2[i] &= 0xff;
-	}
-
-	for (i = 0; i < 32; i++) {
-		pb += r2[i];
-		b = lt(r1[i], pb);
-		r->v[i] = r1[i] - pb + (b << 8);
-		pb = b;
-	}
-
-	/* XXX: Can it really happen that r<0?, See HAC, Alg 14.42, Step 3
-	 * If so: Handle  it here!
-	 */
-
-	reduce_add_sub(r);
-	reduce_add_sub(r);
-}
-
-static inline void sc25519_from32bytes(sc25519* r, const unsigned char x[32])
-{
-	int i;
-	crypto_uint32 t[64];
-	for (i = 0; i < 32; i++) {
-		t[i] = x[i];
-	}
-	for (i = 32; i < 64; ++i) {
-		t[i] = 0;
-	}
-	barrett_reduce(r, t);
-}
-
-static inline void sc25519_from64bytes(sc25519* r, const unsigned char x[64])
-{
-	int i;
-	crypto_uint32 t[64];
-	for (i = 0; i < 64; i++) {
-		t[i] = x[i];
-	}
-	barrett_reduce(r, t);
-}
-
-static inline void sc25519_to32bytes(unsigned char r[32], const sc25519* x)
-{
-	int i;
-	for (i = 0; i < 32; i++) {
-		r[i] = x->v[i];
-	}
-}
-
-static inline void sc25519_add(sc25519* r, const sc25519* x, const sc25519* y)
-{
-	int i, carry;
-	for (i = 0; i < 32; i++) {
-		r->v[i] = x->v[i] + y->v[i];
-	}
-	for (i = 0; i < 31; i++) {
-		carry = r->v[i] >> 8;
-		r->v[i + 1] += carry;
-		r->v[i] &= 0xff;
-	}
-	reduce_add_sub(r);
-}
-
-static inline void sc25519_mul(sc25519* r, const sc25519* x, const sc25519* y)
-{
-	int i, j, carry;
-	crypto_uint32 t[64];
-	for (i = 0; i < 64; i++) {
-		t[i] = 0;
-	}
-
-	for (i = 0; i < 32; i++) {
-		for (j = 0; j < 32; j++) {
-			t[i + j] += x->v[i] * y->v[j];
-		}
-	}
-
-	for (i = 0; i < 63; i++) {
-		carry = t[i] >> 8;
-		t[i + 1] += carry;
-		t[i] &= 0xff;
-	}
-
-	barrett_reduce(r, t);
-}
-
-static inline void sc25519_window3(signed char r[85], const sc25519* s)
-{
-	char carry;
-	int i;
-	for (i = 0; i < 10; i++) {
-		r[8 * i + 0] = s->v[3 * i + 0] & 7;
-		r[8 * i + 1] = (s->v[3 * i + 0] >> 3) & 7;
-		r[8 * i + 2] = (s->v[3 * i + 0] >> 6) & 7;
-		r[8 * i + 2] ^= (s->v[3 * i + 1] << 2) & 7;
-		r[8 * i + 3] = (s->v[3 * i + 1] >> 1) & 7;
-		r[8 * i + 4] = (s->v[3 * i + 1] >> 4) & 7;
-		r[8 * i + 5] = (s->v[3 * i + 1] >> 7) & 7;
-		r[8 * i + 5] ^= (s->v[3 * i + 2] << 1) & 7;
-		r[8 * i + 6] = (s->v[3 * i + 2] >> 2) & 7;
-		r[8 * i + 7] = (s->v[3 * i + 2] >> 5) & 7;
-	}
-	r[8 * i + 0] = s->v[3 * i + 0] & 7;
-	r[8 * i + 1] = (s->v[3 * i + 0] >> 3) & 7;
-	r[8 * i + 2] = (s->v[3 * i + 0] >> 6) & 7;
-	r[8 * i + 2] ^= (s->v[3 * i + 1] << 2) & 7;
-	r[8 * i + 3] = (s->v[3 * i + 1] >> 1) & 7;
-	r[8 * i + 4] = (s->v[3 * i + 1] >> 4) & 7;
-
-	/* Making it signed */
-	carry = 0;
-	for (i = 0; i < 84; i++) {
-		r[i] += carry;
-		r[i + 1] += r[i] >> 3;
-		r[i] &= 7;
-		carry = r[i] >> 2;
-		r[i] -= carry << 3;
-	}
-	r[84] += carry;
-}
-
-static inline void sc25519_2interleave2(unsigned char r[127], const sc25519* s1, const sc25519* s2)
-{
-	int i;
-	for (i = 0; i < 31; i++) {
-		r[4 * i] = (s1->v[i] & 3) ^ ((s2->v[i] & 3) << 2);
-		r[4 * i + 1] = ((s1->v[i] >> 2) & 3) ^ (((s2->v[i] >> 2) & 3) << 2);
-		r[4 * i + 2] = ((s1->v[i] >> 4) & 3) ^ (((s2->v[i] >> 4) & 3) << 2);
-		r[4 * i + 3] = ((s1->v[i] >> 6) & 3) ^ (((s2->v[i] >> 6) & 3) << 2);
-	}
-	r[124] = (s1->v[31] & 3) ^ ((s2->v[31] & 3) << 2);
-	r[125] = ((s1->v[31] >> 2) & 3) ^ (((s2->v[31] >> 2) & 3) << 2);
-	r[126] = ((s1->v[31] >> 4) & 3) ^ (((s2->v[31] >> 4) & 3) << 2);
-}
-
-/* d */
-static const fe25519 ge25519_ecd = { { 0xA3, 0x78, 0x59, 0x13, 0xCA, 0x4D, 0xEB, 0x75, 0xAB, 0xD8, 0x41, 0x41, 0x4D, 0x0A, 0x70, 0x00, 0x98, 0xE8, 0x79, 0x77, 0x79, 0x40, 0xC7, 0x8C, 0x73, 0xFE, 0x6F, 0x2B, 0xEE, 0x6C, 0x03, 0x52 } };
-/* 2*d */
-static const fe25519 ge25519_ec2d = { { 0x59, 0xF1, 0xB2, 0x26, 0x94, 0x9B, 0xD6, 0xEB, 0x56, 0xB1, 0x83, 0x82, 0x9A, 0x14, 0xE0, 0x00, 0x30, 0xD1, 0xF3, 0xEE, 0xF2, 0x80, 0x8E, 0x19, 0xE7, 0xFC, 0xDF, 0x56, 0xDC, 0xD9, 0x06, 0x24 } };
-/* sqrt(-1) */
-static const fe25519 ge25519_sqrtm1 = { { 0xB0, 0xA0, 0x0E, 0x4A, 0x27, 0x1B, 0xEE, 0xC4, 0x78, 0xE4, 0x2F, 0xAD, 0x06, 0x18, 0x43, 0x2F, 0xA7, 0xD7, 0xFB, 0x3D, 0x99, 0x00, 0x4D, 0x2B, 0x0B, 0xDF, 0xC1, 0x4F, 0x80, 0x24, 0x83, 0x2B } };
-
-/* Packed coordinates of the base point */
-static const ge25519 ge25519_base = { { { 0x1A, 0xD5, 0x25, 0x8F, 0x60, 0x2D, 0x56, 0xC9, 0xB2, 0xA7, 0x25, 0x95, 0x60, 0xC7, 0x2C, 0x69, 0x5C, 0xDC, 0xD6, 0xFD, 0x31, 0xE2, 0xA4, 0xC0, 0xFE, 0x53, 0x6E, 0xCD, 0xD3, 0x36, 0x69, 0x21 } },
-									  { { 0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66 } },
-									  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-									  { { 0xA3, 0xDD, 0xB7, 0xA5, 0xB3, 0x8A, 0xDE, 0x6D, 0xF5, 0x52, 0x51, 0x77, 0x80, 0x9F, 0xF0, 0x20, 0x7D, 0xE3, 0xAB, 0x64, 0x8E, 0x4E, 0xEA, 0x66, 0x65, 0x76, 0x8B, 0xD7, 0x0F, 0x5F, 0x87, 0x67 } } };
-
-/* Multiples of the base point in affine representation */
-static const ge25519_aff ge25519_base_multiples_affine[425] = {
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x1a, 0xd5, 0x25, 0x8f, 0x60, 0x2d, 0x56, 0xc9, 0xb2, 0xa7, 0x25, 0x95, 0x60, 0xc7, 0x2c, 0x69, 0x5c, 0xdc, 0xd6, 0xfd, 0x31, 0xe2, 0xa4, 0xc0, 0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21 } },
-	  { { 0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66 } } },
-	{ { { 0x0e, 0xce, 0x43, 0x28, 0x4e, 0xa1, 0xc5, 0x83, 0x5f, 0xa4, 0xd7, 0x15, 0x45, 0x8e, 0x0d, 0x08, 0xac, 0xe7, 0x33, 0x18, 0x7d, 0x3b, 0x04, 0x3d, 0x6c, 0x04, 0x5a, 0x9f, 0x4c, 0x38, 0xab, 0x36 } },
-	  { { 0xc9, 0xa3, 0xf8, 0x6a, 0xae, 0x46, 0x5f, 0x0e, 0x56, 0x51, 0x38, 0x64, 0x51, 0x0f, 0x39, 0x97, 0x56, 0x1f, 0xa2, 0xc9, 0xe8, 0x5e, 0xa2, 0x1d, 0xc2, 0x29, 0x23, 0x09, 0xf3, 0xcd, 0x60, 0x22 } } },
-	{ { { 0x5c, 0xe2, 0xf8, 0xd3, 0x5f, 0x48, 0x62, 0xac, 0x86, 0x48, 0x62, 0x81, 0x19, 0x98, 0x43, 0x63, 0x3a, 0xc8, 0xda, 0x3e, 0x74, 0xae, 0xf4, 0x1f, 0x49, 0x8f, 0x92, 0x22, 0x4a, 0x9c, 0xae, 0x67 } },
-	  { { 0xd4, 0xb4, 0xf5, 0x78, 0x48, 0x68, 0xc3, 0x02, 0x04, 0x03, 0x24, 0x67, 0x17, 0xec, 0x16, 0x9f, 0xf7, 0x9e, 0x26, 0x60, 0x8e, 0xa1, 0x26, 0xa1, 0xab, 0x69, 0xee, 0x77, 0xd1, 0xb1, 0x67, 0x12 } } },
-	{ { { 0x70, 0xf8, 0xc9, 0xc4, 0x57, 0xa6, 0x3a, 0x49, 0x47, 0x15, 0xce, 0x93, 0xc1, 0x9e, 0x73, 0x1a, 0xf9, 0x20, 0x35, 0x7a, 0xb8, 0xd4, 0x25, 0x83, 0x46, 0xf1, 0xcf, 0x56, 0xdb, 0xa8, 0x3d, 0x20 } },
-	  { { 0x2f, 0x11, 0x32, 0xca, 0x61, 0xab, 0x38, 0xdf, 0xf0, 0x0f, 0x2f, 0xea, 0x32, 0x28, 0xf2, 0x4c, 0x6c, 0x71, 0xd5, 0x80, 0x85, 0xb8, 0x0e, 0x47, 0xe1, 0x95, 0x15, 0xcb, 0x27, 0xe8, 0xd0, 0x47 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xc8, 0x84, 0xa5, 0x08, 0xbc, 0xfd, 0x87, 0x3b, 0x99, 0x8b, 0x69, 0x80, 0x7b, 0xc6, 0x3a, 0xeb, 0x93, 0xcf, 0x4e, 0xf8, 0x5c, 0x2d, 0x86, 0x42, 0xb6, 0x71, 0xd7, 0x97, 0x5f, 0xe1, 0x42, 0x67 } },
-	  { { 0xb4, 0xb9, 0x37, 0xfc, 0xa9, 0x5b, 0x2f, 0x1e, 0x93, 0xe4, 0x1e, 0x62, 0xfc, 0x3c, 0x78, 0x81, 0x8f, 0xf3, 0x8a, 0x66, 0x09, 0x6f, 0xad, 0x6e, 0x79, 0x73, 0xe5, 0xc9, 0x00, 0x06, 0xd3, 0x21 } } },
-	{ { { 0xf8, 0xf9, 0x28, 0x6c, 0x6d, 0x59, 0xb2, 0x59, 0x74, 0x23, 0xbf, 0xe7, 0x33, 0x8d, 0x57, 0x09, 0x91, 0x9c, 0x24, 0x08, 0x15, 0x2b, 0xe2, 0xb8, 0xee, 0x3a, 0xe5, 0x27, 0x06, 0x86, 0xa4, 0x23 } },
-	  { { 0xeb, 0x27, 0x67, 0xc1, 0x37, 0xab, 0x7a, 0xd8, 0x27, 0x9c, 0x07, 0x8e, 0xff, 0x11, 0x6a, 0xb0, 0x78, 0x6e, 0xad, 0x3a, 0x2e, 0x0f, 0x98, 0x9f, 0x72, 0xc3, 0x7f, 0x82, 0xf2, 0x96, 0x96, 0x70 } } },
-	{ { { 0x81, 0x6b, 0x88, 0xe8, 0x1e, 0xc7, 0x77, 0x96, 0x0e, 0xa1, 0xa9, 0x52, 0xe0, 0xd8, 0x0e, 0x61, 0x9e, 0x79, 0x2d, 0x95, 0x9c, 0x8d, 0x96, 0xe0, 0x06, 0x40, 0x5d, 0x87, 0x28, 0x5f, 0x98, 0x70 } },
-	  { { 0xf1, 0x79, 0x7b, 0xed, 0x4f, 0x44, 0xb2, 0xe7, 0x08, 0x0d, 0xc2, 0x08, 0x12, 0xd2, 0x9f, 0xdf, 0xcd, 0x93, 0x20, 0x8a, 0xcf, 0x33, 0xca, 0x6d, 0x89, 0xb9, 0x77, 0xc8, 0x93, 0x1b, 0x4e, 0x60 } } },
-	{ { { 0x26, 0x4f, 0x7e, 0x97, 0xf6, 0x40, 0xdd, 0x4f, 0xfc, 0x52, 0x78, 0xf9, 0x90, 0x31, 0x03, 0xe6, 0x7d, 0x56, 0x39, 0x0b, 0x1d, 0x56, 0x82, 0x85, 0xf9, 0x1a, 0x42, 0x17, 0x69, 0x6c, 0xcf, 0x39 } },
-	  { { 0x69, 0xd2, 0x06, 0x3a, 0x4f, 0x39, 0x2d, 0xf9, 0x38, 0x40, 0x8c, 0x4c, 0xe7, 0x05, 0x12, 0xb4, 0x78, 0x8b, 0xf8, 0xc0, 0xec, 0x93, 0xde, 0x7a, 0x6b, 0xce, 0x2c, 0xe1, 0x0e, 0xa9, 0x34, 0x44 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x0b, 0xa4, 0x3c, 0xb0, 0x0f, 0x7a, 0x51, 0xf1, 0x78, 0xd6, 0xd9, 0x6a, 0xfd, 0x46, 0xe8, 0xb8, 0xa8, 0x79, 0x1d, 0x87, 0xf9, 0x90, 0xf2, 0x9c, 0x13, 0x29, 0xf8, 0x0b, 0x20, 0x64, 0xfa, 0x05 } },
-	  { { 0x26, 0x09, 0xda, 0x17, 0xaf, 0x95, 0xd6, 0xfb, 0x6a, 0x19, 0x0d, 0x6e, 0x5e, 0x12, 0xf1, 0x99, 0x4c, 0xaa, 0xa8, 0x6f, 0x79, 0x86, 0xf4, 0x72, 0x28, 0x00, 0x26, 0xf9, 0xea, 0x9e, 0x19, 0x3d } } },
-	{ { { 0x87, 0xdd, 0xcf, 0xf0, 0x5b, 0x49, 0xa2, 0x5d, 0x40, 0x7a, 0x23, 0x26, 0xa4, 0x7a, 0x83, 0x8a, 0xb7, 0x8b, 0xd2, 0x1a, 0xbf, 0xea, 0x02, 0x24, 0x08, 0x5f, 0x7b, 0xa9, 0xb1, 0xbe, 0x9d, 0x37 } },
-	  { { 0xfc, 0x86, 0x4b, 0x08, 0xee, 0xe7, 0xa0, 0xfd, 0x21, 0x45, 0x09, 0x34, 0xc1, 0x61, 0x32, 0x23, 0xfc, 0x9b, 0x55, 0x48, 0x53, 0x99, 0xf7, 0x63, 0xd0, 0x99, 0xce, 0x01, 0xe0, 0x9f, 0xeb, 0x28 } } },
-	{ { { 0x47, 0xfc, 0xab, 0x5a, 0x17, 0xf0, 0x85, 0x56, 0x3a, 0x30, 0x86, 0x20, 0x28, 0x4b, 0x8e, 0x44, 0x74, 0x3a, 0x6e, 0x02, 0xf1, 0x32, 0x8f, 0x9f, 0x3f, 0x08, 0x35, 0xe9, 0xca, 0x16, 0x5f, 0x6e } },
-	  { { 0x1c, 0x59, 0x1c, 0x65, 0x5d, 0x34, 0xa4, 0x09, 0xcd, 0x13, 0x9c, 0x70, 0x7d, 0xb1, 0x2a, 0xc5, 0x88, 0xaf, 0x0b, 0x60, 0xc7, 0x9f, 0x34, 0x8d, 0xd6, 0xb7, 0x7f, 0xea, 0x78, 0x65, 0x8d, 0x77 } } },
-	{ { { 0x56, 0xa5, 0xc2, 0x0c, 0xdd, 0xbc, 0xb8, 0x20, 0x6d, 0x57, 0x61, 0xb5, 0xfb, 0x78, 0xb5, 0xd4, 0x49, 0x54, 0x90, 0x26, 0xc1, 0xcb, 0xe9, 0xe6, 0xbf, 0xec, 0x1d, 0x4e, 0xed, 0x07, 0x7e, 0x5e } },
-	  { { 0xc7, 0xf6, 0x6c, 0x56, 0x31, 0x20, 0x14, 0x0e, 0xa8, 0xd9, 0x27, 0xc1, 0x9a, 0x3d, 0x1b, 0x7d, 0x0e, 0x26, 0xd3, 0x81, 0xaa, 0xeb, 0xf5, 0x6b, 0x79, 0x02, 0xf1, 0x51, 0x5c, 0x75, 0x55, 0x0f } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x0a, 0x34, 0xcd, 0x82, 0x3c, 0x33, 0x09, 0x54, 0xd2, 0x61, 0x39, 0x30, 0x9b, 0xfd, 0xef, 0x21, 0x26, 0xd4, 0x70, 0xfa, 0xee, 0xf9, 0x31, 0x33, 0x73, 0x84, 0xd0, 0xb3, 0x81, 0xbf, 0xec, 0x2e } },
-	  { { 0xe8, 0x93, 0x8b, 0x00, 0x64, 0xf7, 0x9c, 0xb8, 0x74, 0xe0, 0xe6, 0x49, 0x48, 0x4d, 0x4d, 0x48, 0xb6, 0x19, 0xa1, 0x40, 0xb7, 0xd9, 0x32, 0x41, 0x7c, 0x82, 0x37, 0xa1, 0x2d, 0xdc, 0xd2, 0x54 } } },
-	{ { { 0x68, 0x2b, 0x4a, 0x5b, 0xd5, 0xc7, 0x51, 0x91, 0x1d, 0xe1, 0x2a, 0x4b, 0xc4, 0x47, 0xf1, 0xbc, 0x7a, 0xb3, 0xcb, 0xc8, 0xb6, 0x7c, 0xac, 0x90, 0x05, 0xfd, 0xf3, 0xf9, 0x52, 0x3a, 0x11, 0x6b } },
-	  { { 0x3d, 0xc1, 0x27, 0xf3, 0x59, 0x43, 0x95, 0x90, 0xc5, 0x96, 0x79, 0xf5, 0xf4, 0x95, 0x65, 0x29, 0x06, 0x9c, 0x51, 0x05, 0x18, 0xda, 0xb8, 0x2e, 0x79, 0x7e, 0x69, 0x59, 0x71, 0x01, 0xeb, 0x1a } } },
-	{ { { 0x15, 0x06, 0x49, 0xb6, 0x8a, 0x3c, 0xea, 0x2f, 0x34, 0x20, 0x14, 0xc3, 0xaa, 0xd6, 0xaf, 0x2c, 0x3e, 0xbd, 0x65, 0x20, 0xe2, 0x4d, 0x4b, 0x3b, 0xeb, 0x9f, 0x4a, 0xc3, 0xad, 0xa4, 0x3b, 0x60 } },
-	  { { 0xbc, 0x58, 0xe6, 0xc0, 0x95, 0x2a, 0x2a, 0x81, 0x9a, 0x7a, 0xf3, 0xd2, 0x06, 0xbe, 0x48, 0xbc, 0x0c, 0xc5, 0x46, 0xe0, 0x6a, 0xd4, 0xac, 0x0f, 0xd9, 0xcc, 0x82, 0x34, 0x2c, 0xaf, 0xdb, 0x1f } } },
-	{ { { 0xf7, 0x17, 0x13, 0xbd, 0xfb, 0xbc, 0xd2, 0xec, 0x45, 0xb3, 0x15, 0x31, 0xe9, 0xaf, 0x82, 0x84, 0x3d, 0x28, 0xc6, 0xfc, 0x11, 0xf5, 0x41, 0xb5, 0x8b, 0xd3, 0x12, 0x76, 0x52, 0xe7, 0x1a, 0x3c } },
-	  { { 0x4e, 0x36, 0x11, 0x07, 0xa2, 0x15, 0x20, 0x51, 0xc4, 0x2a, 0xc3, 0x62, 0x8b, 0x5e, 0x7f, 0xa6, 0x0f, 0xf9, 0x45, 0x85, 0x6c, 0x11, 0x86, 0xb7, 0x7e, 0xe5, 0xd7, 0xf9, 0xc3, 0x91, 0x1c, 0x05 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xea, 0xd6, 0xde, 0x29, 0x3a, 0x00, 0xb9, 0x02, 0x59, 0xcb, 0x26, 0xc4, 0xba, 0x99, 0xb1, 0x97, 0x2f, 0x8e, 0x00, 0x92, 0x26, 0x4f, 0x52, 0xeb, 0x47, 0x1b, 0x89, 0x8b, 0x24, 0xc0, 0x13, 0x7d } },
-	  { { 0xd5, 0x20, 0x5b, 0x80, 0xa6, 0x80, 0x20, 0x95, 0xc3, 0xe9, 0x9f, 0x8e, 0x87, 0x9e, 0x1e, 0x9e, 0x7a, 0xc7, 0xcc, 0x75, 0x6c, 0xa5, 0xf1, 0x91, 0x1a, 0xa8, 0x01, 0x2c, 0xab, 0x76, 0xa9, 0x59 } } },
-	{ { { 0xde, 0xc9, 0xb1, 0x31, 0x10, 0x16, 0xaa, 0x35, 0x14, 0x6a, 0xd4, 0xb5, 0x34, 0x82, 0x71, 0xd2, 0x4a, 0x5d, 0x9a, 0x1f, 0x53, 0x26, 0x3c, 0xe5, 0x8e, 0x8d, 0x33, 0x7f, 0xff, 0xa9, 0xd5, 0x17 } },
-	  { { 0x89, 0xaf, 0xf6, 0xa4, 0x64, 0xd5, 0x10, 0xe0, 0x1d, 0xad, 0xef, 0x44, 0xbd, 0xda, 0x83, 0xac, 0x7a, 0xa8, 0xf0, 0x1c, 0x07, 0xf9, 0xc3, 0x43, 0x6c, 0x3f, 0xb7, 0xd3, 0x87, 0x22, 0x02, 0x73 } } },
-	{ { { 0x64, 0x1d, 0x49, 0x13, 0x2f, 0x71, 0xec, 0x69, 0x87, 0xd0, 0x42, 0xee, 0x13, 0xec, 0xe3, 0xed, 0x56, 0x7b, 0xbf, 0xbd, 0x8c, 0x2f, 0x7d, 0x7b, 0x9d, 0x28, 0xec, 0x8e, 0x76, 0x2f, 0x6f, 0x08 } },
-	  { { 0x22, 0xf5, 0x5f, 0x4d, 0x15, 0xef, 0xfc, 0x4e, 0x57, 0x03, 0x36, 0x89, 0xf0, 0xeb, 0x5b, 0x91, 0xd6, 0xe2, 0xca, 0x01, 0xa5, 0xee, 0x52, 0xec, 0xa0, 0x3c, 0x8f, 0x33, 0x90, 0x5a, 0x94, 0x72 } } },
-	{ { { 0x8a, 0x4b, 0xe7, 0x38, 0xbc, 0xda, 0xc2, 0xb0, 0x85, 0xe1, 0x4a, 0xfe, 0x2d, 0x44, 0x84, 0xcb, 0x20, 0x6b, 0x2d, 0xbf, 0x11, 0x9c, 0xd7, 0xbe, 0xd3, 0x3e, 0x5f, 0xbf, 0x68, 0xbc, 0xa8, 0x07 } },
-	  { { 0x01, 0x89, 0x28, 0x22, 0x6a, 0x78, 0xaa, 0x29, 0x03, 0xc8, 0x74, 0x95, 0x03, 0x3e, 0xdc, 0xbd, 0x07, 0x13, 0xa8, 0xa2, 0x20, 0x2d, 0xb3, 0x18, 0x70, 0x42, 0xfd, 0x7a, 0xc4, 0xd7, 0x49, 0x72 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x02, 0xff, 0x32, 0x2b, 0x5c, 0x93, 0x54, 0x32, 0xe8, 0x57, 0x54, 0x1a, 0x8b, 0x33, 0x60, 0x65, 0xd3, 0x67, 0xa4, 0xc1, 0x26, 0xc4, 0xa4, 0x34, 0x1f, 0x9b, 0xa7, 0xa9, 0xf4, 0xd9, 0x4f, 0x5b } },
-	  { { 0x46, 0x8d, 0xb0, 0x33, 0x54, 0x26, 0x5b, 0x68, 0xdf, 0xbb, 0xc5, 0xec, 0xc2, 0xf9, 0x3c, 0x5a, 0x37, 0xc1, 0x8e, 0x27, 0x47, 0xaa, 0x49, 0x5a, 0xf8, 0xfb, 0x68, 0x04, 0x23, 0xd1, 0xeb, 0x40 } } },
-	{ { { 0x65, 0xa5, 0x11, 0x84, 0x8a, 0x67, 0x9d, 0x9e, 0xd1, 0x44, 0x68, 0x7a, 0x34, 0xe1, 0x9f, 0xa3, 0x54, 0xcd, 0x07, 0xca, 0x79, 0x1f, 0x54, 0x2f, 0x13, 0x70, 0x4e, 0xee, 0xa2, 0xfa, 0xe7, 0x5d } },
-	  { { 0x36, 0xec, 0x54, 0xf8, 0xce, 0xe4, 0x85, 0xdf, 0xf6, 0x6f, 0x1d, 0x90, 0x08, 0xbc, 0xe8, 0xc0, 0x92, 0x2d, 0x43, 0x6b, 0x92, 0xa9, 0x8e, 0xab, 0x0a, 0x2e, 0x1c, 0x1e, 0x64, 0x23, 0x9f, 0x2c } } },
-	{ { { 0xa7, 0xd6, 0x2e, 0xd5, 0xcc, 0xd4, 0xcb, 0x5a, 0x3b, 0xa7, 0xf9, 0x46, 0x03, 0x1d, 0xad, 0x2b, 0x34, 0x31, 0x90, 0x00, 0x46, 0x08, 0x82, 0x14, 0xc4, 0xe0, 0x9c, 0xf0, 0xe3, 0x55, 0x43, 0x31 } },
-	  { { 0x60, 0xd6, 0xdd, 0x78, 0xe6, 0xd4, 0x22, 0x42, 0x1f, 0x00, 0xf9, 0xb1, 0x6a, 0x63, 0xe2, 0x92, 0x59, 0xd1, 0x1a, 0xb7, 0x00, 0x54, 0x29, 0xc9, 0xc1, 0xf6, 0x6f, 0x7a, 0xc5, 0x3c, 0x5f, 0x65 } } },
-	{ { { 0x27, 0x4f, 0xd0, 0x72, 0xb1, 0x11, 0x14, 0x27, 0x15, 0x94, 0x48, 0x81, 0x7e, 0x74, 0xd8, 0x32, 0xd5, 0xd1, 0x11, 0x28, 0x60, 0x63, 0x36, 0x32, 0x37, 0xb5, 0x13, 0x1c, 0xa0, 0x37, 0xe3, 0x74 } },
-	  { { 0xf1, 0x25, 0x4e, 0x11, 0x96, 0x67, 0xe6, 0x1c, 0xc2, 0xb2, 0x53, 0xe2, 0xda, 0x85, 0xee, 0xb2, 0x9f, 0x59, 0xf3, 0xba, 0xbd, 0xfa, 0xcf, 0x6e, 0xf9, 0xda, 0xa4, 0xb3, 0x02, 0x8f, 0x64, 0x08 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x34, 0x94, 0xf2, 0x64, 0x54, 0x47, 0x37, 0x07, 0x40, 0x8a, 0x20, 0xba, 0x4a, 0x55, 0xd7, 0x3f, 0x47, 0xba, 0x25, 0x23, 0x14, 0xb0, 0x2c, 0xe8, 0x55, 0xa8, 0xa6, 0xef, 0x51, 0xbd, 0x6f, 0x6a } },
-	  { { 0x71, 0xd6, 0x16, 0x76, 0xb2, 0x06, 0xea, 0x79, 0xf5, 0xc4, 0xc3, 0x52, 0x7e, 0x61, 0xd1, 0xe1, 0xad, 0x70, 0x78, 0x1d, 0x16, 0x11, 0xf8, 0x7c, 0x2b, 0xfc, 0x55, 0x9f, 0x52, 0xf8, 0xf5, 0x16 } } },
-	{ { { 0x34, 0x96, 0x9a, 0xf6, 0xc5, 0xe0, 0x14, 0x03, 0x24, 0x0e, 0x4c, 0xad, 0x9e, 0x9a, 0x70, 0x23, 0x96, 0xb2, 0xf1, 0x2e, 0x9d, 0xc3, 0x32, 0x9b, 0x54, 0xa5, 0x73, 0xde, 0x88, 0xb1, 0x3e, 0x24 } },
-	  { { 0xf6, 0xe2, 0x4c, 0x1f, 0x5b, 0xb2, 0xaf, 0x82, 0xa5, 0xcf, 0x81, 0x10, 0x04, 0xef, 0xdb, 0xa2, 0xcc, 0x24, 0xb2, 0x7e, 0x0b, 0x7a, 0xeb, 0x01, 0xd8, 0x52, 0xf4, 0x51, 0x89, 0x29, 0x79, 0x37 } } },
-	{ { { 0x74, 0xde, 0x12, 0xf3, 0x68, 0xb7, 0x66, 0xc3, 0xee, 0x68, 0xdc, 0x81, 0xb5, 0x55, 0x99, 0xab, 0xd9, 0x28, 0x63, 0x6d, 0x8b, 0x40, 0x69, 0x75, 0x6c, 0xcd, 0x5c, 0x2a, 0x7e, 0x32, 0x7b, 0x29 } },
-	  { { 0x02, 0xcc, 0x22, 0x74, 0x4d, 0x19, 0x07, 0xc0, 0xda, 0xb5, 0x76, 0x51, 0x2a, 0xaa, 0xa6, 0x0a, 0x5f, 0x26, 0xd4, 0xbc, 0xaf, 0x48, 0x88, 0x7f, 0x02, 0xbc, 0xf2, 0xe1, 0xcf, 0xe9, 0xdd, 0x15 } } },
-	{ { { 0xed, 0xb5, 0x9a, 0x8c, 0x9a, 0xdd, 0x27, 0xf4, 0x7f, 0x47, 0xd9, 0x52, 0xa7, 0xcd, 0x65, 0xa5, 0x31, 0x22, 0xed, 0xa6, 0x63, 0x5b, 0x80, 0x4a, 0xad, 0x4d, 0xed, 0xbf, 0xee, 0x49, 0xb3, 0x06 } },
-	  { { 0xf8, 0x64, 0x8b, 0x60, 0x90, 0xe9, 0xde, 0x44, 0x77, 0xb9, 0x07, 0x36, 0x32, 0xc2, 0x50, 0xf5, 0x65, 0xdf, 0x48, 0x4c, 0x37, 0xaa, 0x68, 0xab, 0x9a, 0x1f, 0x3e, 0xff, 0x89, 0x92, 0xa0, 0x07 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x7d, 0x4f, 0x9c, 0x19, 0xc0, 0x4a, 0x31, 0xec, 0xf9, 0xaa, 0xeb, 0xb2, 0x16, 0x9c, 0xa3, 0x66, 0x5f, 0xd1, 0xd4, 0xed, 0xb8, 0x92, 0x1c, 0xab, 0xda, 0xea, 0xd9, 0x57, 0xdf, 0x4c, 0x2a, 0x48 } },
-	  { { 0x4b, 0xb0, 0x4e, 0x6e, 0x11, 0x3b, 0x51, 0xbd, 0x6a, 0xfd, 0xe4, 0x25, 0xa5, 0x5f, 0x11, 0x3f, 0x98, 0x92, 0x51, 0x14, 0xc6, 0x5f, 0x3c, 0x0b, 0xa8, 0xf7, 0xc2, 0x81, 0x43, 0xde, 0x91, 0x73 } } },
-	{ { { 0x3c, 0x8f, 0x9f, 0x33, 0x2a, 0x1f, 0x43, 0x33, 0x8f, 0x68, 0xff, 0x1f, 0x3d, 0x73, 0x6b, 0xbf, 0x68, 0xcc, 0x7d, 0x13, 0x6c, 0x24, 0x4b, 0xcc, 0x4d, 0x24, 0x0d, 0xfe, 0xde, 0x86, 0xad, 0x3b } },
-	  { { 0x79, 0x51, 0x81, 0x01, 0xdc, 0x73, 0x53, 0xe0, 0x6e, 0x9b, 0xea, 0x68, 0x3f, 0x5c, 0x14, 0x84, 0x53, 0x8d, 0x4b, 0xc0, 0x9f, 0x9f, 0x89, 0x2b, 0x8c, 0xba, 0x86, 0xfa, 0xf2, 0xcd, 0xe3, 0x2d } } },
-	{ { { 0x06, 0xf9, 0x29, 0x5a, 0xdb, 0x3d, 0x84, 0x52, 0xab, 0xcc, 0x6b, 0x60, 0x9d, 0xb7, 0x4a, 0x0e, 0x36, 0x63, 0x91, 0xad, 0xa0, 0x95, 0xb0, 0x97, 0x89, 0x4e, 0xcf, 0x7d, 0x3c, 0xe5, 0x7c, 0x28 } },
-	  { { 0x2e, 0x69, 0x98, 0xfd, 0xc6, 0xbd, 0xcc, 0xca, 0xdf, 0x9a, 0x44, 0x7e, 0x9d, 0xca, 0x89, 0x6d, 0xbf, 0x27, 0xc2, 0xf8, 0xcd, 0x46, 0x00, 0x2b, 0xb5, 0x58, 0x4e, 0xb7, 0x89, 0x09, 0xe9, 0x2d } } },
-	{ { { 0x54, 0xbe, 0x75, 0xcb, 0x05, 0xb0, 0x54, 0xb7, 0xe7, 0x26, 0x86, 0x4a, 0xfc, 0x19, 0xcf, 0x27, 0x46, 0xd4, 0x22, 0x96, 0x5a, 0x11, 0xe8, 0xd5, 0x1b, 0xed, 0x71, 0xc5, 0x5d, 0xc8, 0xaf, 0x45 } },
-	  { { 0x40, 0x7b, 0x77, 0x57, 0x49, 0x9e, 0x80, 0x39, 0x23, 0xee, 0x81, 0x0b, 0x22, 0xcf, 0xdb, 0x7a, 0x2f, 0x14, 0xb8, 0x57, 0x8f, 0xa1, 0x39, 0x1e, 0x77, 0xfc, 0x0b, 0xa6, 0xbf, 0x8a, 0x0c, 0x6c } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x77, 0x3a, 0xd4, 0xd8, 0x27, 0xcf, 0xe8, 0xa1, 0x72, 0x9d, 0xca, 0xdd, 0x0d, 0x96, 0xda, 0x79, 0xed, 0x56, 0x42, 0x15, 0x60, 0xc7, 0x1c, 0x6b, 0x26, 0x30, 0xf6, 0x6a, 0x95, 0x67, 0xf3, 0x0a } },
-	  { { 0xc5, 0x08, 0xa4, 0x2b, 0x2f, 0xbd, 0x31, 0x81, 0x2a, 0xa6, 0xb6, 0xe4, 0x00, 0x91, 0xda, 0x3d, 0xb2, 0xb0, 0x96, 0xce, 0x8a, 0xd2, 0x8d, 0x70, 0xb3, 0xd3, 0x34, 0x01, 0x90, 0x8d, 0x10, 0x21 } } },
-	{ { { 0x33, 0x0d, 0xe7, 0xba, 0x4f, 0x07, 0xdf, 0x8d, 0xea, 0x7d, 0xa0, 0xc5, 0xd6, 0xb1, 0xb0, 0xe5, 0x57, 0x1b, 0x5b, 0xf5, 0x45, 0x13, 0x14, 0x64, 0x5a, 0xeb, 0x5c, 0xfc, 0x54, 0x01, 0x76, 0x2b } },
-	  { { 0x02, 0x0c, 0xc2, 0xaf, 0x96, 0x36, 0xfe, 0x4a, 0xe2, 0x54, 0x20, 0x6a, 0xeb, 0xb2, 0x9f, 0x62, 0xd7, 0xce, 0xa2, 0x3f, 0x20, 0x11, 0x34, 0x37, 0xe0, 0x42, 0xed, 0x6f, 0xf9, 0x1a, 0xc8, 0x7d } } },
-	{ { { 0xd8, 0xb9, 0x11, 0xe8, 0x36, 0x3f, 0x42, 0xc1, 0xca, 0xdc, 0xd3, 0xf1, 0xc8, 0x23, 0x3d, 0x4f, 0x51, 0x7b, 0x9d, 0x8d, 0xd8, 0xe4, 0xa0, 0xaa, 0xf3, 0x04, 0xd6, 0x11, 0x93, 0xc8, 0x35, 0x45 } },
-	  { { 0x61, 0x36, 0xd6, 0x08, 0x90, 0xbf, 0xa7, 0x7a, 0x97, 0x6c, 0x0f, 0x84, 0xd5, 0x33, 0x2d, 0x37, 0xc9, 0x6a, 0x80, 0x90, 0x3d, 0x0a, 0xa2, 0xaa, 0xe1, 0xb8, 0x84, 0xba, 0x61, 0x36, 0xdd, 0x69 } } },
-	{ { { 0x6b, 0xdb, 0x5b, 0x9c, 0xc6, 0x92, 0xbc, 0x23, 0xaf, 0xc5, 0xb8, 0x75, 0xf8, 0x42, 0xfa, 0xd6, 0xb6, 0x84, 0x94, 0x63, 0x98, 0x93, 0x48, 0x78, 0x38, 0xcd, 0xbb, 0x18, 0x34, 0xc3, 0xdb, 0x67 } },
-	  { { 0x96, 0xf3, 0x3a, 0x09, 0x56, 0xb0, 0x6f, 0x7c, 0x51, 0x1e, 0x1b, 0x39, 0x48, 0xea, 0xc9, 0x0c, 0x25, 0xa2, 0x7a, 0xca, 0xe7, 0x92, 0xfc, 0x59, 0x30, 0xa3, 0x89, 0x85, 0xdf, 0x6f, 0x43, 0x38 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x79, 0x84, 0x44, 0x19, 0xbd, 0xe9, 0x54, 0xc4, 0xc0, 0x6e, 0x2a, 0xa8, 0xa8, 0x9b, 0x43, 0xd5, 0x71, 0x22, 0x5f, 0xdc, 0x01, 0xfa, 0xdf, 0xb3, 0xb8, 0x47, 0x4b, 0x0a, 0xa5, 0x44, 0xea, 0x29 } },
-	  { { 0x05, 0x90, 0x50, 0xaf, 0x63, 0x5f, 0x9d, 0x9e, 0xe1, 0x9d, 0x38, 0x97, 0x1f, 0x6c, 0xac, 0x30, 0x46, 0xb2, 0x6a, 0x19, 0xd1, 0x4b, 0xdb, 0xbb, 0x8c, 0xda, 0x2e, 0xab, 0xc8, 0x5a, 0x77, 0x6c } } },
-	{ { { 0x2b, 0xbe, 0xaf, 0xa1, 0x6d, 0x2f, 0x0b, 0xb1, 0x8f, 0xe3, 0xe0, 0x38, 0xcd, 0x0b, 0x41, 0x1b, 0x4a, 0x15, 0x07, 0xf3, 0x6f, 0xdc, 0xb8, 0xe9, 0xde, 0xb2, 0xa3, 0x40, 0x01, 0xa6, 0x45, 0x1e } },
-	  { { 0x76, 0x0a, 0xda, 0x8d, 0x2c, 0x07, 0x3f, 0x89, 0x7d, 0x04, 0xad, 0x43, 0x50, 0x6e, 0xd2, 0x47, 0xcb, 0x8a, 0xe6, 0x85, 0x1a, 0x24, 0xf3, 0xd2, 0x60, 0xfd, 0xdf, 0x73, 0xa4, 0x0d, 0x73, 0x0e } } },
-	{ { { 0xfd, 0x67, 0x6b, 0x71, 0x9b, 0x81, 0x53, 0x39, 0x39, 0xf4, 0xb8, 0xd5, 0xc3, 0x30, 0x9b, 0x3b, 0x7c, 0xa3, 0xf0, 0xd0, 0x84, 0x21, 0xd6, 0xbf, 0xb7, 0x4c, 0x87, 0x13, 0x45, 0x2d, 0xa7, 0x55 } },
-	  { { 0x5d, 0x04, 0xb3, 0x40, 0x28, 0x95, 0x2d, 0x30, 0x83, 0xec, 0x5e, 0xe4, 0xff, 0x75, 0xfe, 0x79, 0x26, 0x9d, 0x1d, 0x36, 0xcd, 0x0a, 0x15, 0xd2, 0x24, 0x14, 0x77, 0x71, 0xd7, 0x8a, 0x1b, 0x04 } } },
-	{ { { 0x5d, 0x93, 0xc9, 0xbe, 0xaa, 0x90, 0xcd, 0x9b, 0xfb, 0x73, 0x7e, 0xb0, 0x64, 0x98, 0x57, 0x44, 0x42, 0x41, 0xb1, 0xaf, 0xea, 0xc1, 0xc3, 0x22, 0xff, 0x60, 0x46, 0xcb, 0x61, 0x81, 0x70, 0x61 } },
-	  { { 0x0d, 0x82, 0xb9, 0xfe, 0x21, 0xcd, 0xc4, 0xf5, 0x98, 0x0c, 0x4e, 0x72, 0xee, 0x87, 0x49, 0xf8, 0xa1, 0x95, 0xdf, 0x8f, 0x2d, 0xbd, 0x21, 0x06, 0x7c, 0x15, 0xe8, 0x12, 0x6d, 0x93, 0xd6, 0x38 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x91, 0xf7, 0x51, 0xd9, 0xef, 0x7d, 0x42, 0x01, 0x13, 0xe9, 0xb8, 0x7f, 0xa6, 0x49, 0x17, 0x64, 0x21, 0x80, 0x83, 0x2c, 0x63, 0x4c, 0x60, 0x09, 0x59, 0x91, 0x92, 0x77, 0x39, 0x51, 0xf4, 0x48 } },
-	  { { 0x60, 0xd5, 0x22, 0x83, 0x08, 0x2f, 0xff, 0x99, 0x3e, 0x69, 0x6d, 0x88, 0xda, 0xe7, 0x5b, 0x52, 0x26, 0x31, 0x2a, 0xe5, 0x89, 0xde, 0x68, 0x90, 0xb6, 0x22, 0x5a, 0xbd, 0xd3, 0x85, 0x53, 0x31 } } },
-	{ { { 0xd8, 0xce, 0xdc, 0xf9, 0x3c, 0x4b, 0xa2, 0x1d, 0x2c, 0x2f, 0x36, 0xbe, 0x7a, 0xfc, 0xcd, 0xbc, 0xdc, 0xf9, 0x30, 0xbd, 0xff, 0x05, 0xc7, 0xe4, 0x8e, 0x17, 0x62, 0xf8, 0x4d, 0xa0, 0x56, 0x79 } },
-	  { { 0x82, 0xe7, 0xf6, 0xba, 0x53, 0x84, 0x0a, 0xa3, 0x34, 0xff, 0x3c, 0xa3, 0x6a, 0xa1, 0x37, 0xea, 0xdd, 0xb6, 0x95, 0xb3, 0x78, 0x19, 0x76, 0x1e, 0x55, 0x2f, 0x77, 0x2e, 0x7f, 0xc1, 0xea, 0x5e } } },
-	{ { { 0x83, 0xe1, 0x6e, 0xa9, 0x07, 0x33, 0x3e, 0x83, 0xff, 0xcb, 0x1c, 0x9f, 0xb1, 0xa3, 0xb4, 0xc9, 0xe1, 0x07, 0x97, 0xff, 0xf8, 0x23, 0x8f, 0xce, 0x40, 0xfd, 0x2e, 0x5e, 0xdb, 0x16, 0x43, 0x2d } },
-	  { { 0xba, 0x38, 0x02, 0xf7, 0x81, 0x43, 0x83, 0xa3, 0x20, 0x4f, 0x01, 0x3b, 0x8a, 0x04, 0x38, 0x31, 0xc6, 0x0f, 0xc8, 0xdf, 0xd7, 0xfa, 0x2f, 0x88, 0x3f, 0xfc, 0x0c, 0x76, 0xc4, 0xa6, 0x45, 0x72 } } },
-	{ { { 0xbb, 0x0c, 0xbc, 0x6a, 0xa4, 0x97, 0x17, 0x93, 0x2d, 0x6f, 0xde, 0x72, 0x10, 0x1c, 0x08, 0x2c, 0x0f, 0x80, 0x32, 0x68, 0x27, 0xd4, 0xab, 0xdd, 0xc5, 0x58, 0x61, 0x13, 0x6d, 0x11, 0x1e, 0x4d } },
-	  { { 0x1a, 0xb9, 0xc9, 0x10, 0xfb, 0x1e, 0x4e, 0xf4, 0x84, 0x4b, 0x8a, 0x5e, 0x7b, 0x4b, 0xe8, 0x43, 0x8c, 0x8f, 0x00, 0xb5, 0x54, 0x13, 0xc5, 0x5c, 0xb6, 0x35, 0x4e, 0x9d, 0xe4, 0x5b, 0x41, 0x6d } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x15, 0x7d, 0x12, 0x48, 0x82, 0x14, 0x42, 0xcd, 0x32, 0xd4, 0x4b, 0xc1, 0x72, 0x61, 0x2a, 0x8c, 0xec, 0xe2, 0xf8, 0x24, 0x45, 0x94, 0xe3, 0xbe, 0xdd, 0x67, 0xa8, 0x77, 0x5a, 0xae, 0x5b, 0x4b } },
-	  { { 0xcb, 0x77, 0x9a, 0x20, 0xde, 0xb8, 0x23, 0xd9, 0xa0, 0x0f, 0x8c, 0x7b, 0xa5, 0xcb, 0xae, 0xb6, 0xec, 0x42, 0x67, 0x0e, 0x58, 0xa4, 0x75, 0x98, 0x21, 0x71, 0x84, 0xb3, 0xe0, 0x76, 0x94, 0x73 } } },
-	{ { { 0xdf, 0xfc, 0x69, 0x28, 0x23, 0x3f, 0x5b, 0xf8, 0x3b, 0x24, 0x37, 0xf3, 0x1d, 0xd5, 0x22, 0x6b, 0xd0, 0x98, 0xa8, 0x6c, 0xcf, 0xff, 0x06, 0xe1, 0x13, 0xdf, 0xb9, 0xc1, 0x0c, 0xa9, 0xbf, 0x33 } },
-	  { { 0xd9, 0x81, 0xda, 0xb2, 0x4f, 0x82, 0x9d, 0x43, 0x81, 0x09, 0xf1, 0xd2, 0x01, 0xef, 0xac, 0xf4, 0x2d, 0x7d, 0x01, 0x09, 0xf1, 0xff, 0xa5, 0x9f, 0xe5, 0xca, 0x27, 0x63, 0xdb, 0x20, 0xb1, 0x53 } } },
-	{ { { 0x67, 0x02, 0xe8, 0xad, 0xa9, 0x34, 0xd4, 0xf0, 0x15, 0x81, 0xaa, 0xc7, 0x4d, 0x87, 0x94, 0xea, 0x75, 0xe7, 0x4c, 0x94, 0x04, 0x0e, 0x69, 0x87, 0xe7, 0x51, 0x91, 0x10, 0x03, 0xc7, 0xbe, 0x56 } },
-	  { { 0x32, 0xfb, 0x86, 0xec, 0x33, 0x6b, 0x2e, 0x51, 0x2b, 0xc8, 0xfa, 0x6c, 0x70, 0x47, 0x7e, 0xce, 0x05, 0x0c, 0x71, 0xf3, 0xb4, 0x56, 0xa6, 0xdc, 0xcc, 0x78, 0x07, 0x75, 0xd0, 0xdd, 0xb2, 0x6a } } },
-	{ { { 0xc6, 0xef, 0xb9, 0xc0, 0x2b, 0x22, 0x08, 0x1e, 0x71, 0x70, 0xb3, 0x35, 0x9c, 0x7a, 0x01, 0x92, 0x44, 0x9a, 0xf6, 0xb0, 0x58, 0x95, 0xc1, 0x9b, 0x02, 0xed, 0x2d, 0x7c, 0x34, 0x29, 0x49, 0x44 } },
-	  { { 0x45, 0x62, 0x1d, 0x2e, 0xff, 0x2a, 0x1c, 0x21, 0xa4, 0x25, 0x7b, 0x0d, 0x8c, 0x15, 0x39, 0xfc, 0x8f, 0x7c, 0xa5, 0x7d, 0x1e, 0x25, 0xa3, 0x45, 0xd6, 0xab, 0xbd, 0xcb, 0xc5, 0x5e, 0x78, 0x77 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xd0, 0xd3, 0x42, 0xed, 0x1d, 0x00, 0x3c, 0x15, 0x2c, 0x9c, 0x77, 0x81, 0xd2, 0x73, 0xd1, 0x06, 0xd5, 0xc4, 0x7f, 0x94, 0xbb, 0x92, 0x2d, 0x2c, 0x4b, 0x45, 0x4b, 0xe9, 0x2a, 0x89, 0x6b, 0x2b } },
-	  { { 0xd2, 0x0c, 0x88, 0xc5, 0x48, 0x4d, 0xea, 0x0d, 0x4a, 0xc9, 0x52, 0x6a, 0x61, 0x79, 0xe9, 0x76, 0xf3, 0x85, 0x52, 0x5c, 0x1b, 0x2c, 0xe1, 0xd6, 0xc4, 0x0f, 0x18, 0x0e, 0x4e, 0xf6, 0x1c, 0x7f } } },
-	{ { { 0xb4, 0x04, 0x2e, 0x42, 0xcb, 0x1f, 0x2b, 0x11, 0x51, 0x7b, 0x08, 0xac, 0xaa, 0x3e, 0x9e, 0x52, 0x60, 0xb7, 0xc2, 0x61, 0x57, 0x8c, 0x84, 0xd5, 0x18, 0xa6, 0x19, 0xfc, 0xb7, 0x75, 0x91, 0x1b } },
-	  { { 0xe8, 0x68, 0xca, 0x44, 0xc8, 0x38, 0x38, 0xcc, 0x53, 0x0a, 0x32, 0x35, 0xcc, 0x52, 0xcb, 0x0e, 0xf7, 0xc5, 0xe7, 0xec, 0x3d, 0x85, 0xcc, 0x58, 0xe2, 0x17, 0x47, 0xff, 0x9f, 0xa5, 0x30, 0x17 } } },
-	{ { { 0xe3, 0xae, 0xc8, 0xc1, 0x71, 0x75, 0x31, 0x00, 0x37, 0x41, 0x5c, 0x0e, 0x39, 0xda, 0x73, 0xa0, 0xc7, 0x97, 0x36, 0x6c, 0x5b, 0xf2, 0xee, 0x64, 0x0a, 0x3d, 0x89, 0x1e, 0x1d, 0x49, 0x8c, 0x37 } },
-	  { { 0x4c, 0xe6, 0xb0, 0xc1, 0xa5, 0x2a, 0x82, 0x09, 0x08, 0xad, 0x79, 0x9c, 0x56, 0xf6, 0xf9, 0xc1, 0xd7, 0x7c, 0x39, 0x7f, 0x93, 0xca, 0x11, 0x55, 0xbf, 0x07, 0x1b, 0x82, 0x29, 0x69, 0x95, 0x5c } } },
-	{ { { 0x87, 0xee, 0xa6, 0x56, 0x9e, 0xc2, 0x9a, 0x56, 0x24, 0x42, 0x85, 0x4d, 0x98, 0x31, 0x1e, 0x60, 0x4d, 0x87, 0x85, 0x04, 0xae, 0x46, 0x12, 0xf9, 0x8e, 0x7f, 0xe4, 0x7f, 0xf6, 0x1c, 0x37, 0x01 } },
-	  { { 0x73, 0x4c, 0xb6, 0xc5, 0xc4, 0xe9, 0x6c, 0x85, 0x48, 0x4a, 0x5a, 0xac, 0xd9, 0x1f, 0x43, 0xf8, 0x62, 0x5b, 0xee, 0x98, 0x2a, 0x33, 0x8e, 0x79, 0xce, 0x61, 0x06, 0x35, 0xd8, 0xd7, 0xca, 0x71 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x72, 0xd3, 0xae, 0xa6, 0xca, 0x8f, 0xcd, 0xcc, 0x78, 0x8e, 0x19, 0x4d, 0xa7, 0xd2, 0x27, 0xe9, 0xa4, 0x3c, 0x16, 0x5b, 0x84, 0x80, 0xf9, 0xd0, 0xcc, 0x6a, 0x1e, 0xca, 0x1e, 0x67, 0xbd, 0x63 } },
-	  { { 0x7b, 0x6e, 0x2a, 0xd2, 0x87, 0x48, 0xff, 0xa1, 0xca, 0xe9, 0x15, 0x85, 0xdc, 0xdb, 0x2c, 0x39, 0x12, 0x91, 0xa9, 0x20, 0xaa, 0x4f, 0x29, 0xf4, 0x15, 0x7a, 0xd2, 0xf5, 0x32, 0xcc, 0x60, 0x04 } } },
-	{ { { 0xe5, 0x10, 0x47, 0x3b, 0xfa, 0x90, 0xfc, 0x30, 0xb5, 0xea, 0x6f, 0x56, 0x8f, 0xfb, 0x0e, 0xa7, 0x3b, 0xc8, 0xb2, 0xff, 0x02, 0x7a, 0x33, 0x94, 0x93, 0x2a, 0x03, 0xe0, 0x96, 0x3a, 0x6c, 0x0f } },
-	  { { 0x5a, 0x63, 0x67, 0xe1, 0x9b, 0x47, 0x78, 0x9f, 0x38, 0x79, 0xac, 0x97, 0x66, 0x1d, 0x5e, 0x51, 0xee, 0x24, 0x42, 0xe8, 0x58, 0x4b, 0x8a, 0x03, 0x75, 0x86, 0x37, 0x86, 0xe2, 0x97, 0x4e, 0x3d } } },
-	{ { { 0x3f, 0x75, 0x8e, 0xb4, 0xff, 0xd8, 0xdd, 0xd6, 0x37, 0x57, 0x9d, 0x6d, 0x3b, 0xbd, 0xd5, 0x60, 0x88, 0x65, 0x9a, 0xb9, 0x4a, 0x68, 0x84, 0xa2, 0x67, 0xdd, 0x17, 0x25, 0x97, 0x04, 0x8b, 0x5e } },
-	  { { 0xbb, 0x40, 0x5e, 0xbc, 0x16, 0x92, 0x05, 0xc4, 0xc0, 0x4e, 0x72, 0x90, 0x0e, 0xab, 0xcf, 0x8a, 0xed, 0xef, 0xb9, 0x2d, 0x3b, 0xf8, 0x43, 0x5b, 0xba, 0x2d, 0xeb, 0x2f, 0x52, 0xd2, 0xd1, 0x5a } } },
-	{ { { 0x40, 0xb4, 0xab, 0xe6, 0xad, 0x9f, 0x46, 0x69, 0x4a, 0xb3, 0x8e, 0xaa, 0xea, 0x9c, 0x8a, 0x20, 0x16, 0x5d, 0x8c, 0x13, 0xbd, 0xf6, 0x1d, 0xc5, 0x24, 0xbd, 0x90, 0x2a, 0x1c, 0xc7, 0x13, 0x3b } },
-	  { { 0x54, 0xdc, 0x16, 0x0d, 0x18, 0xbe, 0x35, 0x64, 0x61, 0x52, 0x02, 0x80, 0xaf, 0x05, 0xf7, 0xa6, 0x42, 0xd3, 0x8f, 0x2e, 0x79, 0x26, 0xa8, 0xbb, 0xb2, 0x17, 0x48, 0xb2, 0x7a, 0x0a, 0x89, 0x14 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x20, 0xa8, 0x88, 0xe3, 0x91, 0xc0, 0x6e, 0xbb, 0x8a, 0x27, 0x82, 0x51, 0x83, 0xb2, 0x28, 0xa9, 0x83, 0xeb, 0xa6, 0xa9, 0x4d, 0x17, 0x59, 0x22, 0x54, 0x00, 0x50, 0x45, 0xcb, 0x48, 0x4b, 0x18 } },
-	  { { 0x33, 0x7c, 0xe7, 0x26, 0xba, 0x4d, 0x32, 0xfe, 0x53, 0xf4, 0xfa, 0x83, 0xe3, 0xa5, 0x79, 0x66, 0x73, 0xef, 0x80, 0x23, 0x68, 0xc2, 0x60, 0xdd, 0xa9, 0x33, 0xdc, 0x03, 0x7a, 0xe0, 0xe0, 0x3e } } },
-	{ { { 0x34, 0x5c, 0x13, 0xfb, 0xc0, 0xe3, 0x78, 0x2b, 0x54, 0x58, 0x22, 0x9b, 0x76, 0x81, 0x7f, 0x93, 0x9c, 0x25, 0x3c, 0xd2, 0xe9, 0x96, 0x21, 0x26, 0x08, 0xf5, 0xed, 0x95, 0x11, 0xae, 0x04, 0x5a } },
-	  { { 0xb9, 0xe8, 0xc5, 0x12, 0x97, 0x1f, 0x83, 0xfe, 0x3e, 0x94, 0x99, 0xd4, 0x2d, 0xf9, 0x52, 0x59, 0x5c, 0x82, 0xa6, 0xf0, 0x75, 0x7e, 0xe8, 0xec, 0xcc, 0xac, 0x18, 0x21, 0x09, 0x67, 0x66, 0x67 } } },
-	{ { { 0xb3, 0x40, 0x29, 0xd1, 0xcb, 0x1b, 0x08, 0x9e, 0x9c, 0xb7, 0x53, 0xb9, 0x3b, 0x71, 0x08, 0x95, 0x12, 0x1a, 0x58, 0xaf, 0x7e, 0x82, 0x52, 0x43, 0x4f, 0x11, 0x39, 0xf4, 0x93, 0x1a, 0x26, 0x05 } },
-	  { { 0x6e, 0x44, 0xa3, 0xf9, 0x64, 0xaf, 0xe7, 0x6d, 0x7d, 0xdf, 0x1e, 0xac, 0x04, 0xea, 0x3b, 0x5f, 0x9b, 0xe8, 0x24, 0x9d, 0x0e, 0xe5, 0x2e, 0x3e, 0xdf, 0xa9, 0xf7, 0xd4, 0x50, 0x71, 0xf0, 0x78 } } },
-	{ { { 0x3e, 0xa8, 0x38, 0xc2, 0x57, 0x56, 0x42, 0x9a, 0xb1, 0xe2, 0xf8, 0x45, 0xaa, 0x11, 0x48, 0x5f, 0x17, 0xc4, 0x54, 0x27, 0xdc, 0x5d, 0xaa, 0xdd, 0x41, 0xbc, 0xdf, 0x81, 0xb9, 0x53, 0xee, 0x52 } },
-	  { { 0xc3, 0xf1, 0xa7, 0x6d, 0xb3, 0x5f, 0x92, 0x6f, 0xcc, 0x91, 0xb8, 0x95, 0x05, 0xdf, 0x3c, 0x64, 0x57, 0x39, 0x61, 0x51, 0xad, 0x8c, 0x38, 0x7b, 0xc8, 0xde, 0x00, 0x34, 0xbe, 0xa1, 0xb0, 0x7e } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x25, 0x24, 0x1d, 0x8a, 0x67, 0x20, 0xee, 0x42, 0xeb, 0x38, 0xed, 0x0b, 0x8b, 0xcd, 0x46, 0x9d, 0x5e, 0x6b, 0x1e, 0x24, 0x9d, 0x12, 0x05, 0x1a, 0xcc, 0x05, 0x4e, 0x92, 0x38, 0xe1, 0x1f, 0x50 } },
-	  { { 0x4e, 0xee, 0x1c, 0x91, 0xe6, 0x11, 0xbd, 0x8e, 0x55, 0x1a, 0x18, 0x75, 0x66, 0xaf, 0x4d, 0x7b, 0x0f, 0xae, 0x6d, 0x85, 0xca, 0x82, 0x58, 0x21, 0x9c, 0x18, 0xe0, 0xed, 0xec, 0x22, 0x80, 0x2f } } },
-	{ { { 0x68, 0x3b, 0x0a, 0x39, 0x1d, 0x6a, 0x15, 0x57, 0xfc, 0xf0, 0x63, 0x54, 0xdb, 0x39, 0xdb, 0xe8, 0x5c, 0x64, 0xff, 0xa0, 0x09, 0x4f, 0x3b, 0xb7, 0x32, 0x60, 0x99, 0x94, 0xfd, 0x94, 0x82, 0x2d } },
-	  { { 0x24, 0xf6, 0x5a, 0x44, 0xf1, 0x55, 0x2c, 0xdb, 0xea, 0x7c, 0x84, 0x7c, 0x01, 0xac, 0xe3, 0xfd, 0xc9, 0x27, 0xc1, 0x5a, 0xb9, 0xde, 0x4f, 0x5a, 0x90, 0xdd, 0xc6, 0x67, 0xaa, 0x6f, 0x8a, 0x3a } } },
-	{ { { 0x78, 0x52, 0x87, 0xc9, 0x97, 0x63, 0xb1, 0xdd, 0x54, 0x5f, 0xc1, 0xf8, 0xf1, 0x06, 0xa6, 0xa8, 0xa3, 0x88, 0x82, 0xd4, 0xcb, 0xa6, 0x19, 0xdd, 0xd1, 0x11, 0x87, 0x08, 0x17, 0x4c, 0x37, 0x2a } },
-	  { { 0xa1, 0x0c, 0xf3, 0x08, 0x43, 0xd9, 0x24, 0x1e, 0x83, 0xa7, 0xdf, 0x91, 0xca, 0xbd, 0x69, 0x47, 0x8d, 0x1b, 0xe2, 0xb9, 0x4e, 0xb5, 0xe1, 0x76, 0xb3, 0x1c, 0x93, 0x03, 0xce, 0x5f, 0xb3, 0x5a } } },
-	{ { { 0x1d, 0xda, 0xe4, 0x61, 0x03, 0x50, 0xa9, 0x8b, 0x68, 0x18, 0xef, 0xb2, 0x1c, 0x84, 0x3b, 0xa2, 0x44, 0x95, 0xa3, 0x04, 0x3b, 0xd6, 0x99, 0x00, 0xaf, 0x76, 0x42, 0x67, 0x02, 0x7d, 0x85, 0x56 } },
-	  { { 0xce, 0x72, 0x0e, 0x29, 0x84, 0xb2, 0x7d, 0xd2, 0x45, 0xbe, 0x57, 0x06, 0xed, 0x7f, 0xcf, 0xed, 0xcd, 0xef, 0x19, 0xd6, 0xbc, 0x15, 0x79, 0x64, 0xd2, 0x18, 0xe3, 0x20, 0x67, 0x3a, 0x54, 0x0b } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x52, 0xfd, 0x04, 0xc5, 0xfb, 0x99, 0xe7, 0xe8, 0xfb, 0x8c, 0xe1, 0x42, 0x03, 0xef, 0x9d, 0xd9, 0x9e, 0x4d, 0xf7, 0x80, 0xcf, 0x2e, 0xcc, 0x9b, 0x45, 0xc9, 0x7b, 0x7a, 0xbc, 0x37, 0xa8, 0x52 } },
-	  { { 0x96, 0x11, 0x41, 0x8a, 0x47, 0x91, 0xfe, 0xb6, 0xda, 0x7a, 0x54, 0x63, 0xd1, 0x14, 0x35, 0x05, 0x86, 0x8c, 0xa9, 0x36, 0x3f, 0xf2, 0x85, 0x54, 0x4e, 0x92, 0xd8, 0x85, 0x01, 0x46, 0xd6, 0x50 } } },
-	{ { { 0x53, 0xcd, 0xf3, 0x86, 0x40, 0xe6, 0x39, 0x42, 0x95, 0xd6, 0xcb, 0x45, 0x1a, 0x20, 0xc8, 0x45, 0x4b, 0x32, 0x69, 0x04, 0xb1, 0xaf, 0x20, 0x46, 0xc7, 0x6b, 0x23, 0x5b, 0x69, 0xee, 0x30, 0x3f } },
-	  { { 0x70, 0x83, 0x47, 0xc0, 0xdb, 0x55, 0x08, 0xa8, 0x7b, 0x18, 0x6d, 0xf5, 0x04, 0x5a, 0x20, 0x0c, 0x4a, 0x8c, 0x60, 0xae, 0xae, 0x0f, 0x64, 0x55, 0x55, 0x2e, 0xd5, 0x1d, 0x53, 0x31, 0x42, 0x41 } } },
-	{ { { 0xca, 0xfc, 0x88, 0x6b, 0x96, 0x78, 0x0a, 0x8b, 0x83, 0xdc, 0xbc, 0xaf, 0x40, 0xb6, 0x8d, 0x7f, 0xef, 0xb4, 0xd1, 0x3f, 0xcc, 0xa2, 0x74, 0xc9, 0xc2, 0x92, 0x55, 0x00, 0xab, 0xdb, 0xbf, 0x4f } },
-	  { { 0x93, 0x1c, 0x06, 0x2d, 0x66, 0x65, 0x02, 0xa4, 0x97, 0x18, 0xfd, 0x00, 0xe7, 0xab, 0x03, 0xec, 0xce, 0xc1, 0xbf, 0x37, 0xf8, 0x13, 0x53, 0xa5, 0xe5, 0x0c, 0x3a, 0xa8, 0x55, 0xb9, 0xff, 0x68 } } },
-	{ { { 0xe4, 0xe6, 0x6d, 0x30, 0x7d, 0x30, 0x35, 0xc2, 0x78, 0x87, 0xf9, 0xfc, 0x6b, 0x5a, 0xc3, 0xb7, 0x65, 0xd8, 0x2e, 0xc7, 0xa5, 0x0c, 0xc6, 0xdc, 0x12, 0xaa, 0xd6, 0x4f, 0xc5, 0x38, 0xbc, 0x0e } },
-	  { { 0xe2, 0x3c, 0x76, 0x86, 0x38, 0xf2, 0x7b, 0x2c, 0x16, 0x78, 0x8d, 0xf5, 0xa4, 0x15, 0xda, 0xdb, 0x26, 0x85, 0xa0, 0x56, 0xdd, 0x1d, 0xe3, 0xb3, 0xfd, 0x40, 0xef, 0xf2, 0xd9, 0xa1, 0xb3, 0x04 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xdb, 0x49, 0x0e, 0xe6, 0x58, 0x10, 0x7a, 0x52, 0xda, 0xb5, 0x7d, 0x37, 0x6a, 0x3e, 0xa1, 0x78, 0xce, 0xc7, 0x1c, 0x24, 0x23, 0xdb, 0x7d, 0xfb, 0x8c, 0x8d, 0xdc, 0x30, 0x67, 0x69, 0x75, 0x3b } },
-	  { { 0xa9, 0xea, 0x6d, 0x16, 0x16, 0x60, 0xf4, 0x60, 0x87, 0x19, 0x44, 0x8c, 0x4a, 0x8b, 0x3e, 0xfb, 0x16, 0x00, 0x00, 0x54, 0xa6, 0x9e, 0x9f, 0xef, 0xcf, 0xd9, 0xd2, 0x4c, 0x74, 0x31, 0xd0, 0x34 } } },
-	{ { { 0xa4, 0xeb, 0x04, 0xa4, 0x8c, 0x8f, 0x71, 0x27, 0x95, 0x85, 0x5d, 0x55, 0x4b, 0xb1, 0x26, 0x26, 0xc8, 0xae, 0x6a, 0x7d, 0xa2, 0x21, 0xca, 0xce, 0x38, 0xab, 0x0f, 0xd0, 0xd5, 0x2b, 0x6b, 0x00 } },
-	  { { 0xe5, 0x67, 0x0c, 0xf1, 0x3a, 0x9a, 0xea, 0x09, 0x39, 0xef, 0xd1, 0x30, 0xbc, 0x33, 0xba, 0xb1, 0x6a, 0xc5, 0x27, 0x08, 0x7f, 0x54, 0x80, 0x3d, 0xab, 0xf6, 0x15, 0x7a, 0xc2, 0x40, 0x73, 0x72 } } },
-	{ { { 0x84, 0x56, 0x82, 0xb6, 0x12, 0x70, 0x7f, 0xf7, 0xf0, 0xbd, 0x5b, 0xa9, 0xd5, 0xc5, 0x5f, 0x59, 0xbf, 0x7f, 0xb3, 0x55, 0x22, 0x02, 0xc9, 0x44, 0x55, 0x87, 0x8f, 0x96, 0x98, 0x64, 0x6d, 0x15 } },
-	  { { 0xb0, 0x8b, 0xaa, 0x1e, 0xec, 0xc7, 0xa5, 0x8f, 0x1f, 0x92, 0x04, 0xc6, 0x05, 0xf6, 0xdf, 0xa1, 0xcc, 0x1f, 0x81, 0xf5, 0x0e, 0x9c, 0x57, 0xdc, 0xe3, 0xbb, 0x06, 0x87, 0x1e, 0xfe, 0x23, 0x6c } } },
-	{ { { 0xd8, 0x2b, 0x5b, 0x16, 0xea, 0x20, 0xf1, 0xd3, 0x68, 0x8f, 0xae, 0x5b, 0xd0, 0xa9, 0x1a, 0x19, 0xa8, 0x36, 0xfb, 0x2b, 0x57, 0x88, 0x7d, 0x90, 0xd5, 0xa6, 0xf3, 0xdc, 0x38, 0x89, 0x4e, 0x1f } },
-	  { { 0xcc, 0x19, 0xda, 0x9b, 0x3b, 0x43, 0x48, 0x21, 0x2e, 0x23, 0x4d, 0x3d, 0xae, 0xf8, 0x8c, 0xfc, 0xdd, 0xa6, 0x74, 0x37, 0x65, 0xca, 0xee, 0x1a, 0x19, 0x8e, 0x9f, 0x64, 0x6f, 0x0c, 0x8b, 0x5a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x25, 0xb9, 0xc2, 0xf0, 0x72, 0xb8, 0x15, 0x16, 0xcc, 0x8d, 0x3c, 0x6f, 0x25, 0xed, 0xf4, 0x46, 0x2e, 0x0c, 0x60, 0x0f, 0xe2, 0x84, 0x34, 0x55, 0x89, 0x59, 0x34, 0x1b, 0xf5, 0x8d, 0xfe, 0x08 } },
-	  { { 0xf8, 0xab, 0x93, 0xbc, 0x44, 0xba, 0x1b, 0x75, 0x4b, 0x49, 0x6f, 0xd0, 0x54, 0x2e, 0x63, 0xba, 0xb5, 0xea, 0xed, 0x32, 0x14, 0xc9, 0x94, 0xd8, 0xc5, 0xce, 0xf4, 0x10, 0x68, 0xe0, 0x38, 0x27 } } },
-	{ { { 0x74, 0x1c, 0x14, 0x9b, 0xd4, 0x64, 0x61, 0x71, 0x5a, 0xb6, 0x21, 0x33, 0x4f, 0xf7, 0x8e, 0xba, 0xa5, 0x48, 0x9a, 0xc7, 0xfa, 0x9a, 0xf0, 0xb4, 0x62, 0xad, 0xf2, 0x5e, 0xcc, 0x03, 0x24, 0x1a } },
-	  { { 0xf5, 0x76, 0xfd, 0xe4, 0xaf, 0xb9, 0x03, 0x59, 0xce, 0x63, 0xd2, 0x3b, 0x1f, 0xcd, 0x21, 0x0c, 0xad, 0x44, 0xa5, 0x97, 0xac, 0x80, 0x11, 0x02, 0x9b, 0x0c, 0xe5, 0x8b, 0xcd, 0xfb, 0x79, 0x77 } } },
-	{ { { 0x15, 0xbe, 0x9a, 0x0d, 0xba, 0x38, 0x72, 0x20, 0x8a, 0xf5, 0xbe, 0x59, 0x93, 0x79, 0xb7, 0xf6, 0x6a, 0x0c, 0x38, 0x27, 0x1a, 0x60, 0xf4, 0x86, 0x3b, 0xab, 0x5a, 0x00, 0xa0, 0xce, 0x21, 0x7d } },
-	  { { 0x6c, 0xba, 0x14, 0xc5, 0xea, 0x12, 0x9e, 0x2e, 0x82, 0x63, 0xce, 0x9b, 0x4a, 0xe7, 0x1d, 0xec, 0xf1, 0x2e, 0x51, 0x1c, 0xf4, 0xd0, 0x69, 0x15, 0x42, 0x9d, 0xa3, 0x3f, 0x0e, 0xbf, 0xe9, 0x5c } } },
-	{ { { 0xe4, 0x0d, 0xf4, 0xbd, 0xee, 0x31, 0x10, 0xed, 0xcb, 0x12, 0x86, 0xad, 0xd4, 0x2f, 0x90, 0x37, 0x32, 0xc3, 0x0b, 0x73, 0xec, 0x97, 0x85, 0xa4, 0x01, 0x1c, 0x76, 0x35, 0xfe, 0x75, 0xdd, 0x71 } },
-	  { { 0x11, 0xa4, 0x88, 0x9f, 0x3e, 0x53, 0x69, 0x3b, 0x1b, 0xe0, 0xf7, 0xba, 0x9b, 0xad, 0x4e, 0x81, 0x5f, 0xb5, 0x5c, 0xae, 0xbe, 0x67, 0x86, 0x37, 0x34, 0x8e, 0x07, 0x32, 0x45, 0x4a, 0x67, 0x39 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x90, 0x70, 0x58, 0x20, 0x03, 0x1e, 0x67, 0xb2, 0xc8, 0x9b, 0x58, 0xc5, 0xb1, 0xeb, 0x2d, 0x4a, 0xde, 0x82, 0x8c, 0xf2, 0xd2, 0x14, 0xb8, 0x70, 0x61, 0x4e, 0x73, 0xd6, 0x0b, 0x6b, 0x0d, 0x30 } },
-	  { { 0x81, 0xfc, 0x55, 0x5c, 0xbf, 0xa7, 0xc4, 0xbd, 0xe2, 0xf0, 0x4b, 0x8f, 0xe9, 0x7d, 0x99, 0xfa, 0xd3, 0xab, 0xbc, 0xc7, 0x83, 0x2b, 0x04, 0x7f, 0x0c, 0x19, 0x43, 0x03, 0x3d, 0x07, 0xca, 0x40 } } },
-	{ { { 0xf9, 0xc8, 0xbe, 0x8c, 0x16, 0x81, 0x39, 0x96, 0xf6, 0x17, 0x58, 0xc8, 0x30, 0x58, 0xfb, 0xc2, 0x03, 0x45, 0xd2, 0x52, 0x76, 0xe0, 0x6a, 0x26, 0x28, 0x5c, 0x88, 0x59, 0x6a, 0x5a, 0x54, 0x42 } },
-	  { { 0x07, 0xb5, 0x2e, 0x2c, 0x67, 0x15, 0x9b, 0xfb, 0x83, 0x69, 0x1e, 0x0f, 0xda, 0xd6, 0x29, 0xb1, 0x60, 0xe0, 0xb2, 0xba, 0x69, 0xa2, 0x9e, 0xbd, 0xbd, 0xe0, 0x1c, 0xbd, 0xcd, 0x06, 0x64, 0x70 } } },
-	{ { { 0x41, 0xfa, 0x8c, 0xe1, 0x89, 0x8f, 0x27, 0xc8, 0x25, 0x8f, 0x6f, 0x5f, 0x55, 0xf8, 0xde, 0x95, 0x6d, 0x2f, 0x75, 0x16, 0x2b, 0x4e, 0x44, 0xfd, 0x86, 0x6e, 0xe9, 0x70, 0x39, 0x76, 0x97, 0x7e } },
-	  { { 0x17, 0x62, 0x6b, 0x14, 0xa1, 0x7c, 0xd0, 0x79, 0x6e, 0xd8, 0x8a, 0xa5, 0x6d, 0x8c, 0x93, 0xd2, 0x3f, 0xec, 0x44, 0x8d, 0x6e, 0x91, 0x01, 0x8c, 0x8f, 0xee, 0x01, 0x8f, 0xc0, 0xb4, 0x85, 0x0e } } },
-	{ { { 0x02, 0x3a, 0x70, 0x41, 0xe4, 0x11, 0x57, 0x23, 0xac, 0xe6, 0xfc, 0x54, 0x7e, 0xcd, 0xd7, 0x22, 0xcb, 0x76, 0x9f, 0x20, 0xce, 0xa0, 0x73, 0x76, 0x51, 0x3b, 0xa4, 0xf8, 0xe3, 0x62, 0x12, 0x6c } },
-	  { { 0x7f, 0x00, 0x9c, 0x26, 0x0d, 0x6f, 0x48, 0x7f, 0x3a, 0x01, 0xed, 0xc5, 0x96, 0xb0, 0x1f, 0x4f, 0xa8, 0x02, 0x62, 0x27, 0x8a, 0x50, 0x8d, 0x9a, 0x8b, 0x52, 0x0f, 0x1e, 0xcf, 0x41, 0x38, 0x19 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xf5, 0x6c, 0xd4, 0x2f, 0x0f, 0x69, 0x0f, 0x87, 0x3f, 0x61, 0x65, 0x1e, 0x35, 0x34, 0x85, 0xba, 0x02, 0x30, 0xac, 0x25, 0x3d, 0xe2, 0x62, 0xf1, 0xcc, 0xe9, 0x1b, 0xc2, 0xef, 0x6a, 0x42, 0x57 } },
-	  { { 0x34, 0x1f, 0x2e, 0xac, 0xd1, 0xc7, 0x04, 0x52, 0x32, 0x66, 0xb2, 0x33, 0x73, 0x21, 0x34, 0x54, 0xf7, 0x71, 0xed, 0x06, 0xb0, 0xff, 0xa6, 0x59, 0x6f, 0x8a, 0x4e, 0xfb, 0x02, 0xb0, 0x45, 0x6b } } },
-	{ { { 0xf5, 0x48, 0x0b, 0x03, 0xc5, 0x22, 0x7d, 0x80, 0x08, 0x53, 0xfe, 0x32, 0xb1, 0xa1, 0x8a, 0x74, 0x6f, 0xbd, 0x3f, 0x85, 0xf4, 0xcf, 0xf5, 0x60, 0xaf, 0x41, 0x7e, 0x3e, 0x46, 0xa3, 0x5a, 0x20 } },
-	  { { 0xaa, 0x35, 0x87, 0x44, 0x63, 0x66, 0x97, 0xf8, 0x6e, 0x55, 0x0c, 0x04, 0x3e, 0x35, 0x50, 0xbf, 0x93, 0x69, 0xd2, 0x8b, 0x05, 0x55, 0x99, 0xbe, 0xe2, 0x53, 0x61, 0xec, 0xe8, 0x08, 0x0b, 0x32 } } },
-	{ { { 0xb3, 0x10, 0x45, 0x02, 0x69, 0x59, 0x2e, 0x97, 0xd9, 0x64, 0xf8, 0xdb, 0x25, 0x80, 0xdc, 0xc4, 0xd5, 0x62, 0x3c, 0xed, 0x65, 0x91, 0xad, 0xd1, 0x57, 0x81, 0x94, 0xaa, 0xa1, 0x29, 0xfc, 0x68 } },
-	  { { 0xdd, 0xb5, 0x7d, 0xab, 0x5a, 0x21, 0x41, 0x53, 0xbb, 0x17, 0x79, 0x0d, 0xd1, 0xa8, 0x0c, 0x0c, 0x20, 0x88, 0x09, 0xe9, 0x84, 0xe8, 0x25, 0x11, 0x67, 0x7a, 0x8b, 0x1a, 0xe4, 0x5d, 0xe1, 0x5d } } },
-	{ { { 0x37, 0xea, 0xfe, 0x65, 0x3b, 0x25, 0xe8, 0xe1, 0xc2, 0xc5, 0x02, 0xa4, 0xbe, 0x98, 0x0a, 0x2b, 0x61, 0xc1, 0x9b, 0xe2, 0xd5, 0x92, 0xe6, 0x9e, 0x7d, 0x1f, 0xca, 0x43, 0x88, 0x8b, 0x2c, 0x59 } },
-	  { { 0xe0, 0xb5, 0x00, 0x1d, 0x2a, 0x6f, 0xaf, 0x79, 0x86, 0x2f, 0xa6, 0x5a, 0x93, 0xd1, 0xfe, 0xae, 0x3a, 0xee, 0xdb, 0x7c, 0x61, 0xbe, 0x7c, 0x01, 0xf9, 0xfe, 0x52, 0xdc, 0xd8, 0x52, 0xa3, 0x42 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x22, 0xaf, 0x13, 0x37, 0xbd, 0x37, 0x71, 0xac, 0x04, 0x46, 0x63, 0xac, 0xa4, 0x77, 0xed, 0x25, 0x38, 0xe0, 0x15, 0xa8, 0x64, 0x00, 0x0d, 0xce, 0x51, 0x01, 0xa9, 0xbc, 0x0f, 0x03, 0x1c, 0x04 } },
-	  { { 0x89, 0xf9, 0x80, 0x07, 0xcf, 0x3f, 0xb3, 0xe9, 0xe7, 0x45, 0x44, 0x3d, 0x2a, 0x7c, 0xe9, 0xe4, 0x16, 0x5c, 0x5e, 0x65, 0x1c, 0xc7, 0x7d, 0xc6, 0x7a, 0xfb, 0x43, 0xee, 0x25, 0x76, 0x46, 0x72 } } },
-	{ { { 0x02, 0xa2, 0xed, 0xf4, 0x8f, 0x6b, 0x0b, 0x3e, 0xeb, 0x35, 0x1a, 0xd5, 0x7e, 0xdb, 0x78, 0x00, 0x96, 0x8a, 0xa0, 0xb4, 0xcf, 0x60, 0x4b, 0xd4, 0xd5, 0xf9, 0x2d, 0xbf, 0x88, 0xbd, 0x22, 0x62 } },
-	  { { 0x13, 0x53, 0xe4, 0x82, 0x57, 0xfa, 0x1e, 0x8f, 0x06, 0x2b, 0x90, 0xba, 0x08, 0xb6, 0x10, 0x54, 0x4f, 0x7c, 0x1b, 0x26, 0xed, 0xda, 0x6b, 0xdd, 0x25, 0xd0, 0x4e, 0xea, 0x42, 0xbb, 0x25, 0x03 } } },
-	{ { { 0x51, 0x16, 0x50, 0x7c, 0xd5, 0x5d, 0xf6, 0x99, 0xe8, 0x77, 0x72, 0x4e, 0xfa, 0x62, 0xcb, 0x76, 0x75, 0x0c, 0xe2, 0x71, 0x98, 0x92, 0xd5, 0xfa, 0x45, 0xdf, 0x5c, 0x6f, 0x1e, 0x9e, 0x28, 0x69 } },
-	  { { 0x0d, 0xac, 0x66, 0x6d, 0xc3, 0x8b, 0xba, 0x16, 0xb5, 0xe2, 0xa0, 0x0d, 0x0c, 0xbd, 0xa4, 0x8e, 0x18, 0x6c, 0xf2, 0xdc, 0xf9, 0xdc, 0x4a, 0x86, 0x25, 0x95, 0x14, 0xcb, 0xd8, 0x1a, 0x04, 0x0f } } },
-	{ { { 0x97, 0xa5, 0xdb, 0x8b, 0x2d, 0xaa, 0x42, 0x11, 0x09, 0xf2, 0x93, 0xbb, 0xd9, 0x06, 0x84, 0x4e, 0x11, 0xa8, 0xa0, 0x25, 0x2b, 0xa6, 0x5f, 0xae, 0xc4, 0xb4, 0x4c, 0xc8, 0xab, 0xc7, 0x3b, 0x02 } },
-	  { { 0xee, 0xc9, 0x29, 0x0f, 0xdf, 0x11, 0x85, 0xed, 0xce, 0x0d, 0x62, 0x2c, 0x8f, 0x4b, 0xf9, 0x04, 0xe9, 0x06, 0x72, 0x1d, 0x37, 0x20, 0x50, 0xc9, 0x14, 0xeb, 0xec, 0x39, 0xa7, 0x97, 0x2b, 0x4d } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x69, 0xd1, 0x39, 0xbd, 0xfb, 0x33, 0xbe, 0xc4, 0xf0, 0x5c, 0xef, 0xf0, 0x56, 0x68, 0xfc, 0x97, 0x47, 0xc8, 0x72, 0xb6, 0x53, 0xa4, 0x0a, 0x98, 0xa5, 0xb4, 0x37, 0x71, 0xcf, 0x66, 0x50, 0x6d } },
-	  { { 0x17, 0xa4, 0x19, 0x52, 0x11, 0x47, 0xb3, 0x5c, 0x5b, 0xa9, 0x2e, 0x22, 0xb4, 0x00, 0x52, 0xf9, 0x57, 0x18, 0xb8, 0xbe, 0x5a, 0xe3, 0xab, 0x83, 0xc8, 0x87, 0x0a, 0x2a, 0xd8, 0x8c, 0xbb, 0x54 } } },
-	{ { { 0xa9, 0x62, 0x93, 0x85, 0xbe, 0xe8, 0x73, 0x4a, 0x0e, 0xb0, 0xb5, 0x2d, 0x94, 0x50, 0xaa, 0xd3, 0xb2, 0xea, 0x9d, 0x62, 0x76, 0x3b, 0x07, 0x34, 0x4e, 0x2d, 0x70, 0xc8, 0x9a, 0x15, 0x66, 0x6b } },
-	  { { 0xc5, 0x96, 0xca, 0xc8, 0x22, 0x1a, 0xee, 0x5f, 0xe7, 0x31, 0x60, 0x22, 0x83, 0x08, 0x63, 0xce, 0xb9, 0x32, 0x44, 0x58, 0x5d, 0x3a, 0x9b, 0xe4, 0x04, 0xd5, 0xef, 0x38, 0xef, 0x4b, 0xdd, 0x19 } } },
-	{ { { 0x4d, 0xc2, 0x17, 0x75, 0xa1, 0x68, 0xcd, 0xc3, 0xc6, 0x03, 0x44, 0xe3, 0x78, 0x09, 0x91, 0x47, 0x3f, 0x0f, 0xe4, 0x92, 0x58, 0xfa, 0x7d, 0x1f, 0x20, 0x94, 0x58, 0x5e, 0xbc, 0x19, 0x02, 0x6f } },
-	  { { 0x20, 0xd6, 0xd8, 0x91, 0x54, 0xa7, 0xf3, 0x20, 0x4b, 0x34, 0x06, 0xfa, 0x30, 0xc8, 0x6f, 0x14, 0x10, 0x65, 0x74, 0x13, 0x4e, 0xf0, 0x69, 0x26, 0xce, 0xcf, 0x90, 0xf4, 0xd0, 0xc5, 0xc8, 0x64 } } },
-	{ { { 0x26, 0xa2, 0x50, 0x02, 0x24, 0x72, 0xf1, 0xf0, 0x4e, 0x2d, 0x93, 0xd5, 0x08, 0xe7, 0xae, 0x38, 0xf7, 0x18, 0xa5, 0x32, 0x34, 0xc2, 0xf0, 0xa6, 0xec, 0xb9, 0x61, 0x7b, 0x64, 0x99, 0xac, 0x71 } },
-	  { { 0x25, 0xcf, 0x74, 0x55, 0x1b, 0xaa, 0xa9, 0x38, 0x41, 0x40, 0xd5, 0x95, 0x95, 0xab, 0x1c, 0x5e, 0xbc, 0x41, 0x7e, 0x14, 0x30, 0xbe, 0x13, 0x89, 0xf4, 0xe5, 0xeb, 0x28, 0xc0, 0xc2, 0x96, 0x3a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x2b, 0x77, 0x45, 0xec, 0x67, 0x76, 0x32, 0x4c, 0xb9, 0xdf, 0x25, 0x32, 0x6b, 0xcb, 0xe7, 0x14, 0x61, 0x43, 0xee, 0xba, 0x9b, 0x71, 0xef, 0xd2, 0x48, 0x65, 0xbb, 0x1b, 0x8a, 0x13, 0x1b, 0x22 } },
-	  { { 0x84, 0xad, 0x0c, 0x18, 0x38, 0x5a, 0xba, 0xd0, 0x98, 0x59, 0xbf, 0x37, 0xb0, 0x4f, 0x97, 0x60, 0x20, 0xb3, 0x9b, 0x97, 0xf6, 0x08, 0x6c, 0xa4, 0xff, 0xfb, 0xb7, 0xfa, 0x95, 0xb2, 0x51, 0x79 } } },
-	{ { { 0x28, 0x5c, 0x3f, 0xdb, 0x6b, 0x18, 0x3b, 0x5c, 0xd1, 0x04, 0x28, 0xde, 0x85, 0x52, 0x31, 0xb5, 0xbb, 0xf6, 0xa9, 0xed, 0xbe, 0x28, 0x4f, 0xb3, 0x7e, 0x05, 0x6a, 0xdb, 0x95, 0x0d, 0x1b, 0x1c } },
-	  { { 0xd5, 0xc5, 0xc3, 0x9a, 0x0a, 0xd0, 0x31, 0x3e, 0x07, 0x36, 0x8e, 0xc0, 0x8a, 0x62, 0xb1, 0xca, 0xd6, 0x0e, 0x1e, 0x9d, 0xef, 0xab, 0x98, 0x4d, 0xbb, 0x6c, 0x05, 0xe0, 0xe4, 0x5d, 0xbd, 0x57 } } },
-	{ { { 0xcc, 0x21, 0x27, 0xce, 0xfd, 0xa9, 0x94, 0x8e, 0xe1, 0xab, 0x49, 0xe0, 0x46, 0x26, 0xa1, 0xa8, 0x8c, 0xa1, 0x99, 0x1d, 0xb4, 0x27, 0x6d, 0x2d, 0xc8, 0x39, 0x30, 0x5e, 0x37, 0x52, 0xc4, 0x6e } },
-	  { { 0xa9, 0x85, 0xf4, 0xe7, 0xb0, 0x15, 0x33, 0x84, 0x1b, 0x14, 0x1a, 0x02, 0xd9, 0x3b, 0xad, 0x0f, 0x43, 0x6c, 0xea, 0x3e, 0x0f, 0x7e, 0xda, 0xdd, 0x6b, 0x4c, 0x7f, 0x6e, 0xd4, 0x6b, 0xbf, 0x0f } } },
-	{ { { 0x47, 0x9f, 0x7c, 0x56, 0x7c, 0x43, 0x91, 0x1c, 0xbb, 0x4e, 0x72, 0x3e, 0x64, 0xab, 0xa0, 0xa0, 0xdf, 0xb4, 0xd8, 0x87, 0x3a, 0xbd, 0xa8, 0x48, 0xc9, 0xb8, 0xef, 0x2e, 0xad, 0x6f, 0x84, 0x4f } },
-	  { { 0x2d, 0x2d, 0xf0, 0x1b, 0x7e, 0x2a, 0x6c, 0xf8, 0xa9, 0x6a, 0xe1, 0xf0, 0x99, 0xa1, 0x67, 0x9a, 0xd4, 0x13, 0xca, 0xca, 0xba, 0x27, 0x92, 0xaa, 0xa1, 0x5d, 0x50, 0xde, 0xcc, 0x40, 0x26, 0x0a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x9f, 0x3e, 0xf2, 0xb2, 0x90, 0xce, 0xdb, 0x64, 0x3e, 0x03, 0xdd, 0x37, 0x36, 0x54, 0x70, 0x76, 0x24, 0xb5, 0x69, 0x03, 0xfc, 0xa0, 0x2b, 0x74, 0xb2, 0x05, 0x0e, 0xcc, 0xd8, 0x1f, 0x6a, 0x1f } },
-	  { { 0x19, 0x5e, 0x60, 0x69, 0x58, 0x86, 0xa0, 0x31, 0xbd, 0x32, 0xe9, 0x2c, 0x5c, 0xd2, 0x85, 0xba, 0x40, 0x64, 0xa8, 0x74, 0xf8, 0x0e, 0x1c, 0xb3, 0xa9, 0x69, 0xe8, 0x1e, 0x40, 0x64, 0x99, 0x77 } } },
-	{ { { 0x6c, 0x32, 0x4f, 0xfd, 0xbb, 0x5c, 0xbb, 0x8d, 0x64, 0x66, 0x4a, 0x71, 0x1f, 0x79, 0xa3, 0xad, 0x8d, 0xf9, 0xd4, 0xec, 0xcf, 0x67, 0x70, 0xfa, 0x05, 0x4a, 0x0f, 0x6e, 0xaf, 0x87, 0x0a, 0x6f } },
-	  { { 0xc6, 0x36, 0x6e, 0x6c, 0x8c, 0x24, 0x09, 0x60, 0xbe, 0x26, 0xd2, 0x4c, 0x5e, 0x17, 0xca, 0x5f, 0x1d, 0xcc, 0x87, 0xe8, 0x42, 0x6a, 0xcb, 0xcb, 0x7d, 0x92, 0x05, 0x35, 0x81, 0x13, 0x60, 0x6b } } },
-	{ { { 0xf4, 0x15, 0xcd, 0x0f, 0x0a, 0xaf, 0x4e, 0x6b, 0x51, 0xfd, 0x14, 0xc4, 0x2e, 0x13, 0x86, 0x74, 0x44, 0xcb, 0x66, 0x6b, 0xb6, 0x9d, 0x74, 0x56, 0x32, 0xac, 0x8d, 0x8e, 0x8c, 0x8c, 0x8c, 0x39 } },
-	  { { 0xca, 0x59, 0x74, 0x1a, 0x11, 0xef, 0x6d, 0xf7, 0x39, 0x5c, 0x3b, 0x1f, 0xfa, 0xe3, 0x40, 0x41, 0x23, 0x9e, 0xf6, 0xd1, 0x21, 0xa2, 0xbf, 0xad, 0x65, 0x42, 0x6b, 0x59, 0x8a, 0xe8, 0xc5, 0x7f } } },
-	{ { { 0x64, 0x05, 0x7a, 0x84, 0x4a, 0x13, 0xc3, 0xf6, 0xb0, 0x6e, 0x9a, 0x6b, 0x53, 0x6b, 0x32, 0xda, 0xd9, 0x74, 0x75, 0xc4, 0xba, 0x64, 0x3d, 0x3b, 0x08, 0xdd, 0x10, 0x46, 0xef, 0xc7, 0x90, 0x1f } },
-	  { { 0x7b, 0x2f, 0x3a, 0xce, 0xc8, 0xa1, 0x79, 0x3c, 0x30, 0x12, 0x44, 0x28, 0xf6, 0xbc, 0xff, 0xfd, 0xf4, 0xc0, 0x97, 0xb0, 0xcc, 0xc3, 0x13, 0x7a, 0xb9, 0x9a, 0x16, 0xe4, 0xcb, 0x4c, 0x34, 0x63 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x07, 0x4e, 0xd3, 0x2d, 0x09, 0x33, 0x0e, 0xd2, 0x0d, 0xbe, 0x3e, 0xe7, 0xe4, 0xaa, 0xb7, 0x00, 0x8b, 0xe8, 0xad, 0xaa, 0x7a, 0x8d, 0x34, 0x28, 0xa9, 0x81, 0x94, 0xc5, 0xe7, 0x42, 0xac, 0x47 } },
-	  { { 0x24, 0x89, 0x7a, 0x8f, 0xb5, 0x9b, 0xf0, 0xc2, 0x03, 0x64, 0xd0, 0x1e, 0xf5, 0xa4, 0xb2, 0xf3, 0x74, 0xe9, 0x1a, 0x16, 0xfd, 0xcb, 0x15, 0xea, 0xeb, 0x10, 0x6c, 0x35, 0xd1, 0xc1, 0xa6, 0x28 } } },
-	{ { { 0xcc, 0xd5, 0x39, 0xfc, 0xa5, 0xa4, 0xad, 0x32, 0x15, 0xce, 0x19, 0xe8, 0x34, 0x2b, 0x1c, 0x60, 0x91, 0xfc, 0x05, 0xa9, 0xb3, 0xdc, 0x80, 0x29, 0xc4, 0x20, 0x79, 0x06, 0x39, 0xc0, 0xe2, 0x22 } },
-	  { { 0xbb, 0xa8, 0xe1, 0x89, 0x70, 0x57, 0x18, 0x54, 0x3c, 0xf6, 0x0d, 0x82, 0x12, 0x05, 0x87, 0x96, 0x06, 0x39, 0xe3, 0xf8, 0xb3, 0x95, 0xe5, 0xd7, 0x26, 0xbf, 0x09, 0x5a, 0x94, 0xf9, 0x1c, 0x63 } } },
-	{ { { 0x2b, 0x8c, 0x2d, 0x9a, 0x8b, 0x84, 0xf2, 0x56, 0xfb, 0xad, 0x2e, 0x7f, 0xb7, 0xfc, 0x30, 0xe1, 0x35, 0x89, 0xba, 0x4d, 0xa8, 0x6d, 0xce, 0x8c, 0x8b, 0x30, 0xe0, 0xda, 0x29, 0x18, 0x11, 0x17 } },
-	  { { 0x19, 0xa6, 0x5a, 0x65, 0x93, 0xc3, 0xb5, 0x31, 0x22, 0x4f, 0xf3, 0xf6, 0x0f, 0xeb, 0x28, 0xc3, 0x7c, 0xeb, 0xce, 0x86, 0xec, 0x67, 0x76, 0x6e, 0x35, 0x45, 0x7b, 0xd8, 0x6b, 0x92, 0x01, 0x65 } } },
-	{ { { 0x3d, 0xd5, 0x9a, 0x64, 0x73, 0x36, 0xb1, 0xd6, 0x86, 0x98, 0x42, 0x3f, 0x8a, 0xf1, 0xc7, 0xf5, 0x42, 0xa8, 0x9c, 0x52, 0xa8, 0xdc, 0xf9, 0x24, 0x3f, 0x4a, 0xa1, 0xa4, 0x5b, 0xe8, 0x62, 0x1a } },
-	  { { 0xc5, 0xbd, 0xc8, 0x14, 0xd5, 0x0d, 0xeb, 0xe1, 0xa5, 0xe6, 0x83, 0x11, 0x09, 0x00, 0x1d, 0x55, 0x83, 0x51, 0x7e, 0x75, 0x00, 0x81, 0xb9, 0xcb, 0xd8, 0xc5, 0xe5, 0xa1, 0xd9, 0x17, 0x6d, 0x1f } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xea, 0xf9, 0xe4, 0xe9, 0xe1, 0x52, 0x3f, 0x51, 0x19, 0x0d, 0xdd, 0xd9, 0x9d, 0x93, 0x31, 0x87, 0x23, 0x09, 0xd5, 0x83, 0xeb, 0x92, 0x09, 0x76, 0x6e, 0xe3, 0xf8, 0xc0, 0xa2, 0x66, 0xb5, 0x36 } },
-	  { { 0x3a, 0xbb, 0x39, 0xed, 0x32, 0x02, 0xe7, 0x43, 0x7a, 0x38, 0x14, 0x84, 0xe3, 0x44, 0xd2, 0x5e, 0x94, 0xdd, 0x78, 0x89, 0x55, 0x4c, 0x73, 0x9e, 0xe1, 0xe4, 0x3e, 0x43, 0xd0, 0x4a, 0xde, 0x1b } } },
-	{ { { 0xb2, 0xe7, 0x8f, 0xe3, 0xa3, 0xc5, 0xcb, 0x72, 0xee, 0x79, 0x41, 0xf8, 0xdf, 0xee, 0x65, 0xc5, 0x45, 0x77, 0x27, 0x3c, 0xbd, 0x58, 0xd3, 0x75, 0xe2, 0x04, 0x4b, 0xbb, 0x65, 0xf3, 0xc8, 0x0f } },
-	  { { 0x24, 0x7b, 0x93, 0x34, 0xb5, 0xe2, 0x74, 0x48, 0xcd, 0xa0, 0x0b, 0x92, 0x97, 0x66, 0x39, 0xf4, 0xb0, 0xe2, 0x5d, 0x39, 0x6a, 0x5b, 0x45, 0x17, 0x78, 0x1e, 0xdb, 0x91, 0x81, 0x1c, 0xf9, 0x16 } } },
-	{ { { 0x16, 0xdf, 0xd1, 0x5a, 0xd5, 0xe9, 0x4e, 0x58, 0x95, 0x93, 0x5f, 0x51, 0x09, 0xc3, 0x2a, 0xc9, 0xd4, 0x55, 0x48, 0x79, 0xa4, 0xa3, 0xb2, 0xc3, 0x62, 0xaa, 0x8c, 0xe8, 0xad, 0x47, 0x39, 0x1b } },
-	  { { 0x46, 0xda, 0x9e, 0x51, 0x3a, 0xe6, 0xd1, 0xa6, 0xbb, 0x4d, 0x7b, 0x08, 0xbe, 0x8c, 0xd5, 0xf3, 0x3f, 0xfd, 0xf7, 0x44, 0x80, 0x2d, 0x53, 0x4b, 0xd0, 0x87, 0x68, 0xc1, 0xb5, 0xd8, 0xf7, 0x07 } } },
-	{ { { 0xf4, 0x10, 0x46, 0xbe, 0xb7, 0xd2, 0xd1, 0xce, 0x5e, 0x76, 0xa2, 0xd7, 0x03, 0xdc, 0xe4, 0x81, 0x5a, 0xf6, 0x3c, 0xde, 0xae, 0x7a, 0x9d, 0x21, 0x34, 0xa5, 0xf6, 0xa9, 0x73, 0xe2, 0x8d, 0x60 } },
-	  { { 0xfa, 0x44, 0x71, 0xf6, 0x41, 0xd8, 0xc6, 0x58, 0x13, 0x37, 0xeb, 0x84, 0x0f, 0x96, 0xc7, 0xdc, 0xc8, 0xa9, 0x7a, 0x83, 0xb2, 0x2f, 0x31, 0xb1, 0x1a, 0xd8, 0x98, 0x3f, 0x11, 0xd0, 0x31, 0x3b } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x81, 0xd5, 0x34, 0x16, 0x01, 0xa3, 0x93, 0xea, 0x52, 0x94, 0xec, 0x93, 0xb7, 0x81, 0x11, 0x2d, 0x58, 0xf9, 0xb5, 0x0a, 0xaa, 0x4f, 0xf6, 0x2e, 0x3f, 0x36, 0xbf, 0x33, 0x5a, 0xe7, 0xd1, 0x08 } },
-	  { { 0x1a, 0xcf, 0x42, 0xae, 0xcc, 0xb5, 0x77, 0x39, 0xc4, 0x5b, 0x5b, 0xd0, 0x26, 0x59, 0x27, 0xd0, 0x55, 0x71, 0x12, 0x9d, 0x88, 0x3d, 0x9c, 0xea, 0x41, 0x6a, 0xf0, 0x50, 0x93, 0x93, 0xdd, 0x47 } } },
-	{ { { 0x6f, 0xc9, 0x51, 0x6d, 0x1c, 0xaa, 0xf5, 0xa5, 0x90, 0x3f, 0x14, 0xe2, 0x6e, 0x8e, 0x64, 0xfd, 0xac, 0xe0, 0x4e, 0x22, 0xe5, 0xc1, 0xbc, 0x29, 0x0a, 0x6a, 0x9e, 0xa1, 0x60, 0xcb, 0x2f, 0x0b } },
-	  { { 0xdc, 0x39, 0x32, 0xf3, 0xa1, 0x44, 0xe9, 0xc5, 0xc3, 0x78, 0xfb, 0x95, 0x47, 0x34, 0x35, 0x34, 0xe8, 0x25, 0xde, 0x93, 0xc6, 0xb4, 0x76, 0x6d, 0x86, 0x13, 0xc6, 0xe9, 0x68, 0xb5, 0x01, 0x63 } } },
-	{ { { 0x1f, 0x9a, 0x52, 0x64, 0x97, 0xd9, 0x1c, 0x08, 0x51, 0x6f, 0x26, 0x9d, 0xaa, 0x93, 0x33, 0x43, 0xfa, 0x77, 0xe9, 0x62, 0x9b, 0x5d, 0x18, 0x75, 0xeb, 0x78, 0xf7, 0x87, 0x8f, 0x41, 0xb4, 0x4d } },
-	  { { 0x13, 0xa8, 0x82, 0x3e, 0xe9, 0x13, 0xad, 0xeb, 0x01, 0xca, 0xcf, 0xda, 0xcd, 0xf7, 0x6c, 0xc7, 0x7a, 0xdc, 0x1e, 0x6e, 0xc8, 0x4e, 0x55, 0x62, 0x80, 0xea, 0x78, 0x0c, 0x86, 0xb9, 0x40, 0x51 } } },
-	{ { { 0x27, 0xae, 0xd3, 0x0d, 0x4c, 0x8f, 0x34, 0xea, 0x7d, 0x3c, 0xe5, 0x8a, 0xcf, 0x5b, 0x92, 0xd8, 0x30, 0x16, 0xb4, 0xa3, 0x75, 0xff, 0xeb, 0x27, 0xc8, 0x5c, 0x6c, 0xc2, 0xee, 0x6c, 0x21, 0x0b } },
-	  { { 0xc3, 0xba, 0x12, 0x53, 0x2a, 0xaa, 0x77, 0xad, 0x19, 0x78, 0x55, 0x8a, 0x2e, 0x60, 0x87, 0xc2, 0x6e, 0x91, 0x38, 0x91, 0x3f, 0x7a, 0xc5, 0x24, 0x8f, 0x51, 0xc5, 0xde, 0xb0, 0x53, 0x30, 0x56 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x02, 0xfe, 0x54, 0x12, 0x18, 0xca, 0x7d, 0xa5, 0x68, 0x43, 0xa3, 0x6d, 0x14, 0x2a, 0x6a, 0xa5, 0x8e, 0x32, 0xe7, 0x63, 0x4f, 0xe3, 0xc6, 0x44, 0x3e, 0xab, 0x63, 0xca, 0x17, 0x86, 0x74, 0x3f } },
-	  { { 0x1e, 0x64, 0xc1, 0x7d, 0x52, 0xdc, 0x13, 0x5a, 0xa1, 0x9c, 0x4e, 0xee, 0x99, 0x28, 0xbb, 0x4c, 0xee, 0xac, 0xa9, 0x1b, 0x89, 0xa2, 0x38, 0x39, 0x7b, 0xc4, 0x0f, 0x42, 0xe6, 0x89, 0xed, 0x0f } } },
-	{ { { 0xf3, 0x3c, 0x8c, 0x80, 0x83, 0x10, 0x8a, 0x37, 0x50, 0x9c, 0xb4, 0xdf, 0x3f, 0x8c, 0xf7, 0x23, 0x07, 0xd6, 0xff, 0xa0, 0x82, 0x6c, 0x75, 0x3b, 0xe4, 0xb5, 0xbb, 0xe4, 0xe6, 0x50, 0xf0, 0x08 } },
-	  { { 0x62, 0xee, 0x75, 0x48, 0x92, 0x33, 0xf2, 0xf4, 0xad, 0x15, 0x7a, 0xa1, 0x01, 0x46, 0xa9, 0x32, 0x06, 0x88, 0xb6, 0x36, 0x47, 0x35, 0xb9, 0xb4, 0x42, 0x85, 0x76, 0xf0, 0x48, 0x00, 0x90, 0x38 } } },
-	{ { { 0x51, 0x15, 0x9d, 0xc3, 0x95, 0xd1, 0x39, 0xbb, 0x64, 0x9d, 0x15, 0x81, 0xc1, 0x68, 0xd0, 0xb6, 0xa4, 0x2c, 0x7d, 0x5e, 0x02, 0x39, 0x00, 0xe0, 0x3b, 0xa4, 0xcc, 0xca, 0x1d, 0x81, 0x24, 0x10 } },
-	  { { 0xe7, 0x29, 0xf9, 0x37, 0xd9, 0x46, 0x5a, 0xcd, 0x70, 0xfe, 0x4d, 0x5b, 0xbf, 0xa5, 0xcf, 0x91, 0xf4, 0xef, 0xee, 0x8a, 0x29, 0xd0, 0xe7, 0xc4, 0x25, 0x92, 0x8a, 0xff, 0x36, 0xfc, 0xe4, 0x49 } } },
-	{ { { 0xbd, 0x00, 0xb9, 0x04, 0x7d, 0x35, 0xfc, 0xeb, 0xd0, 0x0b, 0x05, 0x32, 0x52, 0x7a, 0x89, 0x24, 0x75, 0x50, 0xe1, 0x63, 0x02, 0x82, 0x8e, 0xe7, 0x85, 0x0c, 0xf2, 0x56, 0x44, 0x37, 0x83, 0x25 } },
-	  { { 0x8f, 0xa1, 0xce, 0xcb, 0x60, 0xda, 0x12, 0x02, 0x1e, 0x29, 0x39, 0x2a, 0x03, 0xb7, 0xeb, 0x77, 0x40, 0xea, 0xc9, 0x2b, 0x2c, 0xd5, 0x7d, 0x7e, 0x2c, 0xc7, 0x5a, 0xfd, 0xff, 0xc4, 0xd1, 0x62 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x1d, 0x88, 0x98, 0x5b, 0x4e, 0xfc, 0x41, 0x24, 0x05, 0xe6, 0x50, 0x2b, 0xae, 0x96, 0x51, 0xd9, 0x6b, 0x72, 0xb2, 0x33, 0x42, 0x98, 0x68, 0xbb, 0x10, 0x5a, 0x7a, 0x8c, 0x9d, 0x07, 0xb4, 0x05 } },
-	  { { 0x2f, 0x61, 0x9f, 0xd7, 0xa8, 0x3f, 0x83, 0x8c, 0x10, 0x69, 0x90, 0xe6, 0xcf, 0xd2, 0x63, 0xa3, 0xe4, 0x54, 0x7e, 0xe5, 0x69, 0x13, 0x1c, 0x90, 0x57, 0xaa, 0xe9, 0x53, 0x22, 0x43, 0x29, 0x23 } } },
-	{ { { 0xe5, 0x1c, 0xf8, 0x0a, 0xfd, 0x2d, 0x7e, 0xf5, 0xf5, 0x70, 0x7d, 0x41, 0x6b, 0x11, 0xfe, 0xbe, 0x99, 0xd1, 0x55, 0x29, 0x31, 0xbf, 0xc0, 0x97, 0x6c, 0xd5, 0x35, 0xcc, 0x5e, 0x8b, 0xd9, 0x69 } },
-	  { { 0x8e, 0x4e, 0x9f, 0x25, 0xf8, 0x81, 0x54, 0x2d, 0x0e, 0xd5, 0x54, 0x81, 0x9b, 0xa6, 0x92, 0xce, 0x4b, 0xe9, 0x8f, 0x24, 0x3b, 0xca, 0xe0, 0x44, 0xab, 0x36, 0xfe, 0xfb, 0x87, 0xd4, 0x26, 0x3e } } },
-	{ { { 0x0f, 0x93, 0x9c, 0x11, 0xe7, 0xdb, 0xf1, 0xf0, 0x85, 0x43, 0x28, 0x15, 0x37, 0xdd, 0xde, 0x27, 0xdf, 0xad, 0x3e, 0x49, 0x4f, 0xe0, 0x5b, 0xf6, 0x80, 0x59, 0x15, 0x3c, 0x85, 0xb7, 0x3e, 0x12 } },
-	  { { 0xf5, 0xff, 0xcc, 0xf0, 0xb4, 0x12, 0x03, 0x5f, 0xc9, 0x84, 0xcb, 0x1d, 0x17, 0xe0, 0xbc, 0xcc, 0x03, 0x62, 0xa9, 0x8b, 0x94, 0xa6, 0xaa, 0x18, 0xcb, 0x27, 0x8d, 0x49, 0xa6, 0x17, 0x15, 0x07 } } },
-	{ { { 0xd9, 0xb6, 0xd4, 0x9d, 0xd4, 0x6a, 0xaf, 0x70, 0x07, 0x2c, 0x10, 0x9e, 0xbd, 0x11, 0xad, 0xe4, 0x26, 0x33, 0x70, 0x92, 0x78, 0x1c, 0x74, 0x9f, 0x75, 0x60, 0x56, 0xf4, 0x39, 0xa8, 0xa8, 0x62 } },
-	  { { 0x3b, 0xbf, 0x55, 0x35, 0x61, 0x8b, 0x44, 0x97, 0xe8, 0x3a, 0x55, 0xc1, 0xc8, 0x3b, 0xfd, 0x95, 0x29, 0x11, 0x60, 0x96, 0x1e, 0xcb, 0x11, 0x9d, 0xc2, 0x03, 0x8a, 0x1b, 0xc6, 0xd6, 0x45, 0x3d } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x7e, 0x0e, 0x50, 0xb2, 0xcc, 0x0d, 0x6b, 0xa6, 0x71, 0x5b, 0x42, 0xed, 0xbd, 0xaf, 0xac, 0xf0, 0xfc, 0x12, 0xa2, 0x3f, 0x4e, 0xda, 0xe8, 0x11, 0xf3, 0x23, 0xe1, 0x04, 0x62, 0x03, 0x1c, 0x4e } },
-	  { { 0xc8, 0xb1, 0x1b, 0x6f, 0x73, 0x61, 0x3d, 0x27, 0x0d, 0x7d, 0x7a, 0x25, 0x5f, 0x73, 0x0e, 0x2f, 0x93, 0xf6, 0x24, 0xd8, 0x4f, 0x90, 0xac, 0xa2, 0x62, 0x0a, 0xf0, 0x61, 0xd9, 0x08, 0x59, 0x6a } } },
-	{ { { 0x6f, 0x2d, 0x55, 0xf8, 0x2f, 0x8e, 0xf0, 0x18, 0x3b, 0xea, 0xdd, 0x26, 0x72, 0xd1, 0xf5, 0xfe, 0xe5, 0xb8, 0xe6, 0xd3, 0x10, 0x48, 0x46, 0x49, 0x3a, 0x9f, 0x5e, 0x45, 0x6b, 0x90, 0xe8, 0x7f } },
-	  { { 0xd3, 0x76, 0x69, 0x33, 0x7b, 0xb9, 0x40, 0x70, 0xee, 0xa6, 0x29, 0x6b, 0xdd, 0xd0, 0x5d, 0x8d, 0xc1, 0x3e, 0x4a, 0xea, 0x37, 0xb1, 0x03, 0x02, 0x03, 0x35, 0xf1, 0x28, 0x9d, 0xff, 0x00, 0x13 } } },
-	{ { { 0x7a, 0xdb, 0x12, 0xd2, 0x8a, 0x82, 0x03, 0x1b, 0x1e, 0xaf, 0xf9, 0x4b, 0x9c, 0xbe, 0xae, 0x7c, 0xe4, 0x94, 0x2a, 0x23, 0xb3, 0x62, 0x86, 0xe7, 0xfd, 0x23, 0xaa, 0x99, 0xbd, 0x2b, 0x11, 0x6c } },
-	  { { 0x8d, 0xa6, 0xd5, 0xac, 0x9d, 0xcc, 0x68, 0x75, 0x7f, 0xc3, 0x4d, 0x4b, 0xdd, 0x6c, 0xbb, 0x11, 0x5a, 0x60, 0xe5, 0xbd, 0x7d, 0x27, 0x8b, 0xda, 0xb4, 0x95, 0xf6, 0x03, 0x27, 0xa4, 0x92, 0x3f } } },
-	{ { { 0x22, 0xd6, 0xb5, 0x17, 0x84, 0xbf, 0x12, 0xcc, 0x23, 0x14, 0x4a, 0xdf, 0x14, 0x31, 0xbc, 0xa1, 0xac, 0x6e, 0xab, 0xfa, 0x57, 0x11, 0x53, 0xb3, 0x27, 0xe6, 0xf9, 0x47, 0x33, 0x44, 0x34, 0x1e } },
-	  { { 0x79, 0xfc, 0xa6, 0xb4, 0x0b, 0x35, 0x20, 0xc9, 0x4d, 0x22, 0x84, 0xc4, 0xa9, 0x20, 0xec, 0x89, 0x94, 0xba, 0x66, 0x56, 0x48, 0xb9, 0x87, 0x7f, 0xca, 0x1e, 0x06, 0xed, 0xa5, 0x55, 0x59, 0x29 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x56, 0xe1, 0xf5, 0xf1, 0xd5, 0xab, 0xa8, 0x2b, 0xae, 0x89, 0xf3, 0xcf, 0x56, 0x9f, 0xf2, 0x4b, 0x31, 0xbc, 0x18, 0xa9, 0x06, 0x5b, 0xbe, 0xb4, 0x61, 0xf8, 0xb2, 0x06, 0x9c, 0x81, 0xab, 0x4c } },
-	  { { 0x1f, 0x68, 0x76, 0x01, 0x16, 0x38, 0x2b, 0x0f, 0x77, 0x97, 0x92, 0x67, 0x4e, 0x86, 0x6a, 0x8b, 0xe5, 0xe8, 0x0c, 0xf7, 0x36, 0x39, 0xb5, 0x33, 0xe6, 0xcf, 0x5e, 0xbd, 0x18, 0xfb, 0x10, 0x1f } } },
-	{ { { 0x83, 0xf0, 0x0d, 0x63, 0xef, 0x53, 0x6b, 0xb5, 0x6b, 0xf9, 0x83, 0xcf, 0xde, 0x04, 0x22, 0x9b, 0x2c, 0x0a, 0xe0, 0xa5, 0xd8, 0xc7, 0x9c, 0xa5, 0xa3, 0xf6, 0x6f, 0xcf, 0x90, 0x6b, 0x68, 0x7c } },
-	  { { 0x33, 0x15, 0xd7, 0x7f, 0x1a, 0xd5, 0x21, 0x58, 0xc4, 0x18, 0xa5, 0xf0, 0xcc, 0x73, 0xa8, 0xfd, 0xfa, 0x18, 0xd1, 0x03, 0x91, 0x8d, 0x52, 0xd2, 0xa3, 0xa4, 0xd3, 0xb1, 0xea, 0x1d, 0x0f, 0x00 } } },
-	{ { { 0xcc, 0x48, 0x83, 0x90, 0xe5, 0xfd, 0x3f, 0x84, 0xaa, 0xf9, 0x8b, 0x82, 0x59, 0x24, 0x34, 0x68, 0x4f, 0x1c, 0x23, 0xd9, 0xcc, 0x71, 0xe1, 0x7f, 0x8c, 0xaf, 0xf1, 0xee, 0x00, 0xb6, 0xa0, 0x77 } },
-	  { { 0xf5, 0x1a, 0x61, 0xf7, 0x37, 0x9d, 0x00, 0xf4, 0xf2, 0x69, 0x6f, 0x4b, 0x01, 0x85, 0x19, 0x45, 0x4d, 0x7f, 0x02, 0x7c, 0x6a, 0x05, 0x47, 0x6c, 0x1f, 0x81, 0x20, 0xd4, 0xe8, 0x50, 0x27, 0x72 } } },
-	{ { { 0x2c, 0x3a, 0xe5, 0xad, 0xf4, 0xdd, 0x2d, 0xf7, 0x5c, 0x44, 0xb5, 0x5b, 0x21, 0xa3, 0x89, 0x5f, 0x96, 0x45, 0xca, 0x4d, 0xa4, 0x21, 0x99, 0x70, 0xda, 0xc4, 0xc4, 0xa0, 0xe5, 0xf4, 0xec, 0x0a } },
-	  { { 0x07, 0x68, 0x21, 0x65, 0xe9, 0x08, 0xa0, 0x0b, 0x6a, 0x4a, 0xba, 0xb5, 0x80, 0xaf, 0xd0, 0x1b, 0xc5, 0xf5, 0x4b, 0x73, 0x50, 0x60, 0x2d, 0x71, 0x69, 0x61, 0x0e, 0xc0, 0x20, 0x40, 0x30, 0x19 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xd0, 0x75, 0x57, 0x3b, 0xeb, 0x5c, 0x14, 0x56, 0x50, 0xc9, 0x4f, 0xb8, 0xb8, 0x1e, 0xa3, 0xf4, 0xab, 0xf5, 0xa9, 0x20, 0x15, 0x94, 0x82, 0xda, 0x96, 0x1c, 0x9b, 0x59, 0x8c, 0xff, 0xf4, 0x51 } },
-	  { { 0xc1, 0x3a, 0x86, 0xd7, 0xb0, 0x06, 0x84, 0x7f, 0x1b, 0xbd, 0xd4, 0x07, 0x78, 0x80, 0x2e, 0xb1, 0xb4, 0xee, 0x52, 0x38, 0xee, 0x9a, 0xf9, 0xf6, 0xf3, 0x41, 0x6e, 0xd4, 0x88, 0x95, 0xac, 0x35 } } },
-	{ { { 0x41, 0x97, 0xbf, 0x71, 0x6a, 0x9b, 0x72, 0xec, 0xf3, 0xf8, 0x6b, 0xe6, 0x0e, 0x6c, 0x69, 0xa5, 0x2f, 0x68, 0x52, 0xd8, 0x61, 0x81, 0xc0, 0x63, 0x3f, 0xa6, 0x3c, 0x13, 0x90, 0xe6, 0x8d, 0x56 } },
-	  { { 0xe8, 0x39, 0x30, 0x77, 0x23, 0xb1, 0xfd, 0x1b, 0x3d, 0x3e, 0x74, 0x4d, 0x7f, 0xae, 0x5b, 0x3a, 0xb4, 0x65, 0x0e, 0x3a, 0x43, 0xdc, 0xdc, 0x41, 0x47, 0xe6, 0xe8, 0x92, 0x09, 0x22, 0x48, 0x4c } } },
-	{ { { 0x85, 0x57, 0x9f, 0xb5, 0xc8, 0x06, 0xb2, 0x9f, 0x47, 0x3f, 0xf0, 0xfa, 0xe6, 0xa9, 0xb1, 0x9b, 0x6f, 0x96, 0x7d, 0xf9, 0xa4, 0x65, 0x09, 0x75, 0x32, 0xa6, 0x6c, 0x7f, 0x47, 0x4b, 0x2f, 0x4f } },
-	  { { 0x34, 0xe9, 0x59, 0x93, 0x9d, 0x26, 0x80, 0x54, 0xf2, 0xcc, 0x3c, 0xc2, 0x25, 0x85, 0xe3, 0x6a, 0xc1, 0x62, 0x04, 0xa7, 0x08, 0x32, 0x6d, 0xa1, 0x39, 0x84, 0x8a, 0x3b, 0x87, 0x5f, 0x11, 0x13 } } },
-	{ { { 0xda, 0x03, 0x34, 0x66, 0xc4, 0x0c, 0x73, 0x6e, 0xbc, 0x24, 0xb5, 0xf9, 0x70, 0x81, 0x52, 0xe9, 0xf4, 0x7c, 0x23, 0xdd, 0x9f, 0xb8, 0x46, 0xef, 0x1d, 0x22, 0x55, 0x7d, 0x71, 0xc4, 0x42, 0x33 } },
-	  { { 0xc5, 0x37, 0x69, 0x5b, 0xa8, 0xc6, 0x9d, 0xa4, 0xfc, 0x61, 0x6e, 0x68, 0x46, 0xea, 0xd7, 0x1c, 0x67, 0xd2, 0x7d, 0xfa, 0xf1, 0xcc, 0x54, 0x8d, 0x36, 0x35, 0xc9, 0x00, 0xdf, 0x6c, 0x67, 0x50 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x9a, 0x4d, 0x42, 0x29, 0x5d, 0xa4, 0x6b, 0x6f, 0xa8, 0x8a, 0x4d, 0x91, 0x7b, 0xd2, 0xdf, 0x36, 0xef, 0x01, 0x22, 0xc5, 0xcc, 0x8d, 0xeb, 0x58, 0x3d, 0xb3, 0x50, 0xfc, 0x8b, 0x97, 0x96, 0x33 } },
-	  { { 0x93, 0x33, 0x07, 0xc8, 0x4a, 0xca, 0xd0, 0xb1, 0xab, 0xbd, 0xdd, 0xa7, 0x7c, 0xac, 0x3e, 0x45, 0xcb, 0xcc, 0x07, 0x91, 0xbf, 0x35, 0x9d, 0xcb, 0x7d, 0x12, 0x3c, 0x11, 0x59, 0x13, 0xcf, 0x5c } } },
-	{ { { 0x45, 0xb8, 0x41, 0xd7, 0xab, 0x07, 0x15, 0x00, 0x8e, 0xce, 0xdf, 0xb2, 0x43, 0x5c, 0x01, 0xdc, 0xf4, 0x01, 0x51, 0x95, 0x10, 0x5a, 0xf6, 0x24, 0x24, 0xa0, 0x19, 0x3a, 0x09, 0x2a, 0xaa, 0x3f } },
-	  { { 0xdc, 0x8e, 0xeb, 0xc6, 0xbf, 0xdd, 0x11, 0x7b, 0xe7, 0x47, 0xe6, 0xce, 0xe7, 0xb6, 0xc5, 0xe8, 0x8a, 0xdc, 0x4b, 0x57, 0x15, 0x3b, 0x66, 0xca, 0x89, 0xa3, 0xfd, 0xac, 0x0d, 0xe1, 0x1d, 0x7a } } },
-	{ { { 0x89, 0xef, 0xbf, 0x03, 0x75, 0xd0, 0x29, 0x50, 0xcb, 0x7d, 0xd6, 0xbe, 0xad, 0x5f, 0x7b, 0x00, 0x32, 0xaa, 0x98, 0xed, 0x3f, 0x8f, 0x92, 0xcb, 0x81, 0x56, 0x01, 0x63, 0x64, 0xa3, 0x38, 0x39 } },
-	  { { 0x8b, 0xa4, 0xd6, 0x50, 0xb4, 0xaa, 0x5d, 0x64, 0x64, 0x76, 0x2e, 0xa1, 0xa6, 0xb3, 0xb8, 0x7c, 0x7a, 0x56, 0xf5, 0x5c, 0x4e, 0x84, 0x5c, 0xfb, 0xdd, 0xca, 0x48, 0x8b, 0x48, 0xb9, 0xba, 0x34 } } },
-	{ { { 0xc5, 0xe3, 0xe8, 0xae, 0x17, 0x27, 0xe3, 0x64, 0x60, 0x71, 0x47, 0x29, 0x02, 0x0f, 0x92, 0x5d, 0x10, 0x93, 0xc8, 0x0e, 0xa1, 0xed, 0xba, 0xa9, 0x96, 0x1c, 0xc5, 0x76, 0x30, 0xcd, 0xf9, 0x30 } },
-	  { { 0x95, 0xb0, 0xbd, 0x8c, 0xbc, 0xa7, 0x4f, 0x7e, 0xfd, 0x4e, 0x3a, 0xbf, 0x5f, 0x04, 0x79, 0x80, 0x2b, 0x5a, 0x9f, 0x4f, 0x68, 0x21, 0x19, 0x71, 0xc6, 0x20, 0x01, 0x42, 0xaa, 0xdf, 0xae, 0x2c } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x90, 0x6e, 0x7e, 0x4b, 0x71, 0x93, 0xc0, 0x72, 0xed, 0xeb, 0x71, 0x24, 0x97, 0x26, 0x9c, 0xfe, 0xcb, 0x3e, 0x59, 0x19, 0xa8, 0x0f, 0x75, 0x7d, 0xbe, 0x18, 0xe6, 0x96, 0x1e, 0x95, 0x70, 0x60 } },
-	  { { 0x89, 0x66, 0x3e, 0x1d, 0x4c, 0x5f, 0xfe, 0xc0, 0x04, 0x43, 0xd6, 0x44, 0x19, 0xb5, 0xad, 0xc7, 0x22, 0xdc, 0x71, 0x28, 0x64, 0xde, 0x41, 0x38, 0x27, 0x8f, 0x2c, 0x6b, 0x08, 0xb8, 0xb8, 0x7b } } },
-	{ { { 0x3d, 0x70, 0x27, 0x9d, 0xd9, 0xaf, 0xb1, 0x27, 0xaf, 0xe3, 0x5d, 0x1e, 0x3a, 0x30, 0x54, 0x61, 0x60, 0xe8, 0xc3, 0x26, 0x3a, 0xbc, 0x7e, 0xf5, 0x81, 0xdd, 0x64, 0x01, 0x04, 0xeb, 0xc0, 0x1e } },
-	  { { 0xda, 0x2c, 0xa4, 0xd1, 0xa1, 0xc3, 0x5c, 0x6e, 0x32, 0x07, 0x1f, 0xb8, 0x0e, 0x19, 0x9e, 0x99, 0x29, 0x33, 0x9a, 0xae, 0x7a, 0xed, 0x68, 0x42, 0x69, 0x7c, 0x07, 0xb3, 0x38, 0x2c, 0xf6, 0x3d } } },
-	{ { { 0x64, 0xaa, 0xb5, 0x88, 0x79, 0x65, 0x38, 0x8c, 0x94, 0xd6, 0x62, 0x37, 0x7d, 0x64, 0xcd, 0x3a, 0xeb, 0xff, 0xe8, 0x81, 0x09, 0xc7, 0x6a, 0x50, 0x09, 0x0d, 0x28, 0x03, 0x0d, 0x9a, 0x93, 0x0a } },
-	  { { 0x42, 0xa3, 0xf1, 0xc5, 0xb4, 0x0f, 0xd8, 0xc8, 0x8d, 0x15, 0x31, 0xbd, 0xf8, 0x07, 0x8b, 0xcd, 0x08, 0x8a, 0xfb, 0x18, 0x07, 0xfe, 0x8e, 0x52, 0x86, 0xef, 0xbe, 0xec, 0x49, 0x52, 0x99, 0x08 } } },
-	{ { { 0x0f, 0xa9, 0xd5, 0x01, 0xaa, 0x48, 0x4f, 0x28, 0x66, 0x32, 0x1a, 0xba, 0x7c, 0xea, 0x11, 0x80, 0x17, 0x18, 0x9b, 0x56, 0x88, 0x25, 0x06, 0x69, 0x12, 0x2c, 0xea, 0x56, 0x69, 0x41, 0x24, 0x19 } },
-	  { { 0xde, 0x21, 0xf0, 0xda, 0x8a, 0xfb, 0xb1, 0xb8, 0xcd, 0xc8, 0x6a, 0x82, 0x19, 0x73, 0xdb, 0xc7, 0xcf, 0x88, 0xeb, 0x96, 0xee, 0x6f, 0xfb, 0x06, 0xd2, 0xcd, 0x7d, 0x7b, 0x12, 0x28, 0x8e, 0x0c } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x93, 0x44, 0x97, 0xce, 0x28, 0xff, 0x3a, 0x40, 0xc4, 0xf5, 0xf6, 0x9b, 0xf4, 0x6b, 0x07, 0x84, 0xfb, 0x98, 0xd8, 0xec, 0x8c, 0x03, 0x57, 0xec, 0x49, 0xed, 0x63, 0xb6, 0xaa, 0xff, 0x98, 0x28 } },
-	  { { 0x3d, 0x16, 0x35, 0xf3, 0x46, 0xbc, 0xb3, 0xf4, 0xc6, 0xb6, 0x4f, 0xfa, 0xf4, 0xa0, 0x13, 0xe6, 0x57, 0x45, 0x93, 0xb9, 0xbc, 0xd6, 0x59, 0xe7, 0x77, 0x94, 0x6c, 0xab, 0x96, 0x3b, 0x4f, 0x09 } } },
-	{ { { 0x5a, 0xf7, 0x6b, 0x01, 0x12, 0x4f, 0x51, 0xc1, 0x70, 0x84, 0x94, 0x47, 0xb2, 0x01, 0x6c, 0x71, 0xd7, 0xcc, 0x17, 0x66, 0x0f, 0x59, 0x5d, 0x5d, 0x10, 0x01, 0x57, 0x11, 0xf5, 0xdd, 0xe2, 0x34 } },
-	  { { 0x26, 0xd9, 0x1f, 0x5c, 0x58, 0xac, 0x8b, 0x03, 0xd2, 0xc3, 0x85, 0x0f, 0x3a, 0xc3, 0x7f, 0x6d, 0x8e, 0x86, 0xcd, 0x52, 0x74, 0x8f, 0x55, 0x77, 0x17, 0xb7, 0x8e, 0xb7, 0x88, 0xea, 0xda, 0x1b } } },
-	{ { { 0xb6, 0xea, 0x0e, 0x40, 0x93, 0x20, 0x79, 0x35, 0x6a, 0x61, 0x84, 0x5a, 0x07, 0x6d, 0xf9, 0x77, 0x6f, 0xed, 0x69, 0x1c, 0x0d, 0x25, 0x76, 0xcc, 0xf0, 0xdb, 0xbb, 0xc5, 0xad, 0xe2, 0x26, 0x57 } },
-	  { { 0xcf, 0xe8, 0x0e, 0x6b, 0x96, 0x7d, 0xed, 0x27, 0xd1, 0x3c, 0xa9, 0xd9, 0x50, 0xa9, 0x98, 0x84, 0x5e, 0x86, 0xef, 0xd6, 0xf0, 0xf8, 0x0e, 0x89, 0x05, 0x2f, 0xd9, 0x5f, 0x15, 0x5f, 0x73, 0x79 } } },
-	{ { { 0xc8, 0x5c, 0x16, 0xfe, 0xed, 0x9f, 0x26, 0x56, 0xf6, 0x4b, 0x9f, 0xa7, 0x0a, 0x85, 0xfe, 0xa5, 0x8c, 0x87, 0xdd, 0x98, 0xce, 0x4e, 0xc3, 0x58, 0x55, 0xb2, 0x7b, 0x3d, 0xd8, 0x6b, 0xb5, 0x4c } },
-	  { { 0x65, 0x38, 0xa0, 0x15, 0xfa, 0xa7, 0xb4, 0x8f, 0xeb, 0xc4, 0x86, 0x9b, 0x30, 0xa5, 0x5e, 0x4d, 0xea, 0x8a, 0x9a, 0x9f, 0x1a, 0xd8, 0x5b, 0x53, 0x14, 0x19, 0x25, 0x63, 0xb4, 0x6f, 0x1f, 0x5d } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xac, 0x8f, 0xbc, 0x1e, 0x7d, 0x8b, 0x5a, 0x0b, 0x8d, 0xaf, 0x76, 0x2e, 0x71, 0xe3, 0x3b, 0x6f, 0x53, 0x2f, 0x3e, 0x90, 0x95, 0xd4, 0x35, 0x14, 0x4f, 0x8c, 0x3c, 0xce, 0x57, 0x1c, 0x76, 0x49 } },
-	  { { 0xa8, 0x50, 0xe1, 0x61, 0x6b, 0x57, 0x35, 0xeb, 0x44, 0x0b, 0x0c, 0x6e, 0xf9, 0x25, 0x80, 0x74, 0xf2, 0x8f, 0x6f, 0x7a, 0x3e, 0x7f, 0x2d, 0xf3, 0x4e, 0x09, 0x65, 0x10, 0x5e, 0x03, 0x25, 0x32 } } },
-	{ { { 0xa9, 0x60, 0xdc, 0x0f, 0x64, 0xe5, 0x1d, 0xe2, 0x8d, 0x4f, 0x79, 0x2f, 0x0e, 0x24, 0x02, 0x00, 0x05, 0x77, 0x43, 0x25, 0x3d, 0x6a, 0xc7, 0xb7, 0xbf, 0x04, 0x08, 0x65, 0xf4, 0x39, 0x4b, 0x65 } },
-	  { { 0x96, 0x19, 0x12, 0x6b, 0x6a, 0xb7, 0xe3, 0xdc, 0x45, 0x9b, 0xdb, 0xb4, 0xa8, 0xae, 0xdc, 0xa8, 0x14, 0x44, 0x65, 0x62, 0xce, 0x34, 0x9a, 0x84, 0x18, 0x12, 0x01, 0xf1, 0xe2, 0x7b, 0xce, 0x50 } } },
-	{ { { 0x41, 0x21, 0x30, 0x53, 0x1b, 0x47, 0x01, 0xb7, 0x18, 0xd8, 0x82, 0x57, 0xbd, 0xa3, 0x60, 0xf0, 0x32, 0xf6, 0x5b, 0xf0, 0x30, 0x88, 0x91, 0x59, 0xfd, 0x90, 0xa2, 0xb9, 0x55, 0x93, 0x21, 0x34 } },
-	  { { 0x97, 0x67, 0x9e, 0xeb, 0x6a, 0xf9, 0x6e, 0xd6, 0x73, 0xe8, 0x6b, 0x29, 0xec, 0x63, 0x82, 0x00, 0xa8, 0x99, 0x1c, 0x1d, 0x30, 0xc8, 0x90, 0x52, 0x90, 0xb6, 0x6a, 0x80, 0x4e, 0xff, 0x4b, 0x51 } } },
-	{ { { 0x0f, 0x7d, 0x63, 0x8c, 0x6e, 0x5c, 0xde, 0x30, 0xdf, 0x65, 0xfa, 0x2e, 0xb0, 0xa3, 0x25, 0x05, 0x54, 0xbd, 0x25, 0xba, 0x06, 0xae, 0xdf, 0x8b, 0xd9, 0x1b, 0xea, 0x38, 0xb3, 0x05, 0x16, 0x09 } },
-	  { { 0xc7, 0x8c, 0xbf, 0x64, 0x28, 0xad, 0xf8, 0xa5, 0x5a, 0x6f, 0xc9, 0xba, 0xd5, 0x7f, 0xd5, 0xd6, 0xbd, 0x66, 0x2f, 0x3d, 0xaa, 0x54, 0xf6, 0xba, 0x32, 0x22, 0x9a, 0x1e, 0x52, 0x05, 0xf4, 0x1d } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xaa, 0x1f, 0xbb, 0xeb, 0xfe, 0xe4, 0x87, 0xfc, 0xb1, 0x2c, 0xb7, 0x88, 0xf4, 0xc6, 0xb9, 0xf5, 0x24, 0x46, 0xf2, 0xa5, 0x9f, 0x8f, 0x8a, 0x93, 0x70, 0x69, 0xd4, 0x56, 0xec, 0xfd, 0x06, 0x46 } },
-	  { { 0x4e, 0x66, 0xcf, 0x4e, 0x34, 0xce, 0x0c, 0xd9, 0xa6, 0x50, 0xd6, 0x5e, 0x95, 0xaf, 0xe9, 0x58, 0xfa, 0xee, 0x9b, 0xb8, 0xa5, 0x0f, 0x35, 0xe0, 0x43, 0x82, 0x6d, 0x65, 0xe6, 0xd9, 0x00, 0x0f } } },
-	{ { { 0x7b, 0x75, 0x3a, 0xfc, 0x64, 0xd3, 0x29, 0x7e, 0xdd, 0x49, 0x9a, 0x59, 0x53, 0xbf, 0xb4, 0xa7, 0x52, 0xb3, 0x05, 0xab, 0xc3, 0xaf, 0x16, 0x1a, 0x85, 0x42, 0x32, 0xa2, 0x86, 0xfa, 0x39, 0x43 } },
-	  { { 0x0e, 0x4b, 0xa3, 0x63, 0x8a, 0xfe, 0xa5, 0x58, 0xf1, 0x13, 0xbd, 0x9d, 0xaa, 0x7f, 0x76, 0x40, 0x70, 0x81, 0x10, 0x75, 0x99, 0xbb, 0xbe, 0x0b, 0x16, 0xe9, 0xba, 0x62, 0x34, 0xcc, 0x07, 0x6d } } },
-	{ { { 0xc3, 0xf1, 0xc6, 0x93, 0x65, 0xee, 0x0b, 0xbc, 0xea, 0x14, 0xf0, 0xc1, 0xf8, 0x84, 0x89, 0xc2, 0xc9, 0xd7, 0xea, 0x34, 0xca, 0xa7, 0xc4, 0x99, 0xd5, 0x50, 0x69, 0xcb, 0xd6, 0x21, 0x63, 0x7c } },
-	  { { 0x99, 0xeb, 0x7c, 0x31, 0x73, 0x64, 0x67, 0x7f, 0x0c, 0x66, 0xaa, 0x8c, 0x69, 0x91, 0xe2, 0x26, 0xd3, 0x23, 0xe2, 0x76, 0x5d, 0x32, 0x52, 0xdf, 0x5d, 0xc5, 0x8f, 0xb7, 0x7c, 0x84, 0xb3, 0x70 } } },
-	{ { { 0xeb, 0x01, 0xc7, 0x36, 0x97, 0x4e, 0xb6, 0xab, 0x5f, 0x0d, 0x2c, 0xba, 0x67, 0x64, 0x55, 0xde, 0xbc, 0xff, 0xa6, 0xec, 0x04, 0xd3, 0x8d, 0x39, 0x56, 0x5e, 0xee, 0xf8, 0xe4, 0x2e, 0x33, 0x62 } },
-	  { { 0x65, 0xef, 0xb8, 0x9f, 0xc8, 0x4b, 0xa7, 0xfd, 0x21, 0x49, 0x9b, 0x92, 0x35, 0x82, 0xd6, 0x0a, 0x9b, 0xf2, 0x79, 0xf1, 0x47, 0x2f, 0x6a, 0x7e, 0x9f, 0xcf, 0x18, 0x02, 0x3c, 0xfb, 0x1b, 0x3e } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x2f, 0x8b, 0xc8, 0x40, 0x51, 0xd1, 0xac, 0x1a, 0x0b, 0xe4, 0xa9, 0xa2, 0x42, 0x21, 0x19, 0x2f, 0x7b, 0x97, 0xbf, 0xf7, 0x57, 0x6d, 0x3f, 0x3d, 0x4f, 0x0f, 0xe2, 0xb2, 0x81, 0x00, 0x9e, 0x7b } },
-	  { { 0x8c, 0x85, 0x2b, 0xc4, 0xfc, 0xf1, 0xab, 0xe8, 0x79, 0x22, 0xc4, 0x84, 0x17, 0x3a, 0xfa, 0x86, 0xa6, 0x7d, 0xf9, 0xf3, 0x6f, 0x03, 0x57, 0x20, 0x4d, 0x79, 0xf9, 0x6e, 0x71, 0x54, 0x38, 0x09 } } },
-	{ { { 0x40, 0x29, 0x74, 0xa8, 0x2f, 0x5e, 0xf9, 0x79, 0xa4, 0xf3, 0x3e, 0xb9, 0xfd, 0x33, 0x31, 0xac, 0x9a, 0x69, 0x88, 0x1e, 0x77, 0x21, 0x2d, 0xf3, 0x91, 0x52, 0x26, 0x15, 0xb2, 0xa6, 0xcf, 0x7e } },
-	  { { 0xc6, 0x20, 0x47, 0x6c, 0xa4, 0x7d, 0xcb, 0x63, 0xea, 0x5b, 0x03, 0xdf, 0x3e, 0x88, 0x81, 0x6d, 0xce, 0x07, 0x42, 0x18, 0x60, 0x7e, 0x7b, 0x55, 0xfe, 0x6a, 0xf3, 0xda, 0x5c, 0x8b, 0x95, 0x10 } } },
-	{ { { 0x62, 0xe4, 0x0d, 0x03, 0xb4, 0xd7, 0xcd, 0xfa, 0xbd, 0x46, 0xdf, 0x93, 0x71, 0x10, 0x2c, 0xa8, 0x3b, 0xb6, 0x09, 0x05, 0x70, 0x84, 0x43, 0x29, 0xa8, 0x59, 0xf5, 0x8e, 0x10, 0xe4, 0xd7, 0x20 } },
-	  { { 0x57, 0x82, 0x1c, 0xab, 0xbf, 0x62, 0x70, 0xe8, 0xc4, 0xcf, 0xf0, 0x28, 0x6e, 0x16, 0x3c, 0x08, 0x78, 0x89, 0x85, 0x46, 0x0f, 0xf6, 0x7f, 0xcf, 0xcb, 0x7e, 0xb8, 0x25, 0xe9, 0x5a, 0xfa, 0x03 } } },
-	{ { { 0xfb, 0x95, 0x92, 0x63, 0x50, 0xfc, 0x62, 0xf0, 0xa4, 0x5e, 0x8c, 0x18, 0xc2, 0x17, 0x24, 0xb7, 0x78, 0xc2, 0xa9, 0xe7, 0x6a, 0x32, 0xd6, 0x29, 0x85, 0xaf, 0xcb, 0x8d, 0x91, 0x13, 0xda, 0x6b } },
-	  { { 0x36, 0x0a, 0xc2, 0xb6, 0x4b, 0xa5, 0x5d, 0x07, 0x17, 0x41, 0x31, 0x5f, 0x62, 0x46, 0xf8, 0x92, 0xf9, 0x66, 0x48, 0x73, 0xa6, 0x97, 0x0d, 0x7d, 0x88, 0xee, 0x62, 0xb1, 0x03, 0xa8, 0x3f, 0x2c } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x4a, 0xb1, 0x70, 0x8a, 0xa9, 0xe8, 0x63, 0x79, 0x00, 0xe2, 0x25, 0x16, 0xca, 0x4b, 0x0f, 0xa4, 0x66, 0xad, 0x19, 0x9f, 0x88, 0x67, 0x0c, 0x8b, 0xc2, 0x4a, 0x5b, 0x2b, 0x6d, 0x95, 0xaf, 0x19 } },
-	  { { 0x8b, 0x9d, 0xb6, 0xcc, 0x60, 0xb4, 0x72, 0x4f, 0x17, 0x69, 0x5a, 0x4a, 0x68, 0x34, 0xab, 0xa1, 0x45, 0x32, 0x3c, 0x83, 0x87, 0x72, 0x30, 0x54, 0x77, 0x68, 0xae, 0xfb, 0xb5, 0x8b, 0x22, 0x5e } } },
-	{ { { 0xf1, 0xb9, 0x87, 0x35, 0xc5, 0xbb, 0xb9, 0xcf, 0xf5, 0xd6, 0xcd, 0xd5, 0x0c, 0x7c, 0x0e, 0xe6, 0x90, 0x34, 0xfb, 0x51, 0x42, 0x1e, 0x6d, 0xac, 0x9a, 0x46, 0xc4, 0x97, 0x29, 0x32, 0xbf, 0x45 } },
-	  { { 0x66, 0x9e, 0xc6, 0x24, 0xc0, 0xed, 0xa5, 0x5d, 0x88, 0xd4, 0xf0, 0x73, 0x97, 0x7b, 0xea, 0x7f, 0x42, 0xff, 0x21, 0xa0, 0x9b, 0x2f, 0x9a, 0xfd, 0x53, 0x57, 0x07, 0x84, 0x48, 0x88, 0x9d, 0x52 } } },
-	{ { { 0xc6, 0x96, 0x48, 0x34, 0x2a, 0x06, 0xaf, 0x94, 0x3d, 0xf4, 0x1a, 0xcf, 0xf2, 0xc0, 0x21, 0xc2, 0x42, 0x5e, 0xc8, 0x2f, 0x35, 0xa2, 0x3e, 0x29, 0xfa, 0x0c, 0x84, 0xe5, 0x89, 0x72, 0x7c, 0x06 } },
-	  { { 0x32, 0x65, 0x03, 0xe5, 0x89, 0xa6, 0x6e, 0xb3, 0x5b, 0x8e, 0xca, 0xeb, 0xfe, 0x22, 0x56, 0x8b, 0x5d, 0x14, 0x4b, 0x4d, 0xf9, 0xbe, 0xb5, 0xf5, 0xe6, 0x5c, 0x7b, 0x8b, 0xf4, 0x13, 0x11, 0x34 } } },
-	{ { { 0x07, 0xc6, 0x22, 0x15, 0xe2, 0x9c, 0x60, 0xa2, 0x19, 0xd9, 0x27, 0xae, 0x37, 0x4e, 0xa6, 0xc9, 0x80, 0xa6, 0x91, 0x8f, 0x12, 0x49, 0xe5, 0x00, 0x18, 0x47, 0xd1, 0xd7, 0x28, 0x22, 0x63, 0x39 } },
-	  { { 0xe8, 0xe2, 0x00, 0x7e, 0xf2, 0x9e, 0x1e, 0x99, 0x39, 0x95, 0x04, 0xbd, 0x1e, 0x67, 0x7b, 0xb2, 0x26, 0xac, 0xe6, 0xaa, 0xe2, 0x46, 0xd5, 0xe4, 0xe8, 0x86, 0xbd, 0xab, 0x7c, 0x55, 0x59, 0x6f } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x24, 0x64, 0x6e, 0x9b, 0x35, 0x71, 0x78, 0xce, 0x33, 0x03, 0x21, 0x33, 0x36, 0xf1, 0x73, 0x9b, 0xb9, 0x15, 0x8b, 0x2c, 0x69, 0xcf, 0x4d, 0xed, 0x4f, 0x4d, 0x57, 0x14, 0x13, 0x82, 0xa4, 0x4d } },
-	  { { 0x65, 0x6e, 0x0a, 0xa4, 0x59, 0x07, 0x17, 0xf2, 0x6b, 0x4a, 0x1f, 0x6e, 0xf6, 0xb5, 0xbc, 0x62, 0xe4, 0xb6, 0xda, 0xa2, 0x93, 0xbc, 0x29, 0x05, 0xd2, 0xd2, 0x73, 0x46, 0x03, 0x16, 0x40, 0x31 } } },
-	{ { { 0x4c, 0x73, 0x6d, 0x15, 0xbd, 0xa1, 0x4d, 0x5c, 0x13, 0x0b, 0x24, 0x06, 0x98, 0x78, 0x1c, 0x5b, 0xeb, 0x1f, 0x18, 0x54, 0x43, 0xd9, 0x55, 0x66, 0xda, 0x29, 0x21, 0xe8, 0xb8, 0x3c, 0x42, 0x22 } },
-	  { { 0xb4, 0xcd, 0x08, 0x6f, 0x15, 0x23, 0x1a, 0x0b, 0x22, 0xed, 0xd1, 0xf1, 0xa7, 0xc7, 0x73, 0x45, 0xf3, 0x9e, 0xce, 0x76, 0xb7, 0xf6, 0x39, 0xb6, 0x8e, 0x79, 0xbe, 0xe9, 0x9b, 0xcf, 0x7d, 0x62 } } },
-	{ { { 0x92, 0x5b, 0xfc, 0x72, 0xfd, 0xba, 0xf1, 0xfd, 0xa6, 0x7c, 0x95, 0xe3, 0x61, 0x3f, 0xe9, 0x03, 0xd4, 0x2b, 0xd4, 0x20, 0xd9, 0xdb, 0x4d, 0x32, 0x3e, 0xf5, 0x11, 0x64, 0xe3, 0xb4, 0xbe, 0x32 } },
-	  { { 0x86, 0x17, 0x90, 0xe7, 0xc9, 0x1f, 0x10, 0xa5, 0x6a, 0x2d, 0x39, 0xd0, 0x3b, 0xc4, 0xa6, 0xe9, 0x59, 0x13, 0xda, 0x1a, 0xe6, 0xa0, 0xb9, 0x3c, 0x50, 0xb8, 0x40, 0x7c, 0x15, 0x36, 0x5a, 0x42 } } },
-	{ { { 0xb4, 0x0b, 0x32, 0xab, 0xdc, 0x04, 0x51, 0x55, 0x21, 0x1e, 0x0b, 0x75, 0x99, 0x89, 0x73, 0x35, 0x3a, 0x91, 0x2b, 0xfe, 0xe7, 0x49, 0xea, 0x76, 0xc1, 0xf9, 0x46, 0xb9, 0x53, 0x02, 0x23, 0x04 } },
-	  { { 0xfc, 0x5a, 0x1e, 0x1d, 0x74, 0x58, 0x95, 0xa6, 0x8f, 0x7b, 0x97, 0x3e, 0x17, 0x3b, 0x79, 0x2d, 0xa6, 0x57, 0xef, 0x45, 0x02, 0x0b, 0x4d, 0x6e, 0x9e, 0x93, 0x8d, 0x2f, 0xd9, 0x9d, 0xdb, 0x04 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xc0, 0xd7, 0x56, 0x97, 0x58, 0x91, 0xde, 0x09, 0x4f, 0x9f, 0xbe, 0x63, 0xb0, 0x83, 0x86, 0x43, 0x5d, 0xbc, 0xe0, 0xf3, 0xc0, 0x75, 0xbf, 0x8b, 0x8e, 0xaa, 0xf7, 0x8b, 0x64, 0x6e, 0xb0, 0x63 } },
-	  { { 0x16, 0xae, 0x8b, 0xe0, 0x9b, 0x24, 0x68, 0x5c, 0x44, 0xc2, 0xd0, 0x08, 0xb7, 0x7b, 0x62, 0xfd, 0x7f, 0xd8, 0xd4, 0xb7, 0x50, 0xfd, 0x2c, 0x1b, 0xbf, 0x41, 0x95, 0xd9, 0x8e, 0xd8, 0x17, 0x1b } } },
-	{ { { 0x86, 0x55, 0x37, 0x8e, 0xc3, 0x38, 0x48, 0x14, 0xb5, 0x97, 0xd2, 0xa7, 0x54, 0x45, 0xf1, 0x35, 0x44, 0x38, 0x9e, 0xf1, 0x1b, 0xb6, 0x34, 0x00, 0x3c, 0x96, 0xee, 0x29, 0x00, 0xea, 0x2c, 0x0b } },
-	  { { 0xea, 0xda, 0x99, 0x9e, 0x19, 0x83, 0x66, 0x6d, 0xe9, 0x76, 0x87, 0x50, 0xd1, 0xfd, 0x3c, 0x60, 0x87, 0xc6, 0x41, 0xd9, 0x8e, 0xdb, 0x5e, 0xde, 0xaa, 0x9a, 0xd3, 0x28, 0xda, 0x95, 0xea, 0x47 } } },
-	{ { { 0xd0, 0x80, 0xba, 0x19, 0xae, 0x1d, 0xa9, 0x79, 0xf6, 0x3f, 0xac, 0x5d, 0x6f, 0x96, 0x1f, 0x2a, 0xce, 0x29, 0xb2, 0xff, 0x37, 0xf1, 0x94, 0x8f, 0x0c, 0xb5, 0x28, 0xba, 0x9a, 0x21, 0xf6, 0x66 } },
-	  { { 0x02, 0xfb, 0x54, 0xb8, 0x05, 0xf3, 0x81, 0x52, 0x69, 0x34, 0x46, 0x9d, 0x86, 0x76, 0x8f, 0xd7, 0xf8, 0x6a, 0x66, 0xff, 0xe6, 0xa7, 0x90, 0xf7, 0x5e, 0xcd, 0x6a, 0x9b, 0x55, 0xfc, 0x9d, 0x48 } } },
-	{ { { 0xbd, 0xaa, 0x13, 0xe6, 0xcd, 0x45, 0x4a, 0xa4, 0x59, 0x0a, 0x64, 0xb1, 0x98, 0xd6, 0x34, 0x13, 0x04, 0xe6, 0x97, 0x94, 0x06, 0xcb, 0xd4, 0x4e, 0xbb, 0x96, 0xcd, 0xd1, 0x57, 0xd1, 0xe3, 0x06 } },
-	  { { 0x7a, 0x6c, 0x45, 0x27, 0xc4, 0x93, 0x7f, 0x7d, 0x7c, 0x62, 0x50, 0x38, 0x3a, 0x6b, 0xb5, 0x88, 0xc6, 0xd9, 0xf1, 0x78, 0x19, 0xb9, 0x39, 0x93, 0x3d, 0xc9, 0xe0, 0x9c, 0x3c, 0xce, 0xf5, 0x72 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x24, 0xea, 0x23, 0x7d, 0x56, 0x2c, 0xe2, 0x59, 0x0e, 0x85, 0x60, 0x04, 0x88, 0x5a, 0x74, 0x1e, 0x4b, 0xef, 0x13, 0xda, 0x4c, 0xff, 0x83, 0x45, 0x85, 0x3f, 0x08, 0x95, 0x2c, 0x20, 0x13, 0x1f } },
-	  { { 0x48, 0x5f, 0x27, 0x90, 0x5c, 0x02, 0x42, 0xad, 0x78, 0x47, 0x5c, 0xb5, 0x7e, 0x08, 0x85, 0x00, 0xfa, 0x7f, 0xfd, 0xfd, 0xe7, 0x09, 0x11, 0xf2, 0x7e, 0x1b, 0x38, 0x6c, 0x35, 0x6d, 0x33, 0x66 } } },
-	{ { { 0x93, 0x03, 0x36, 0x81, 0xac, 0xe4, 0x20, 0x09, 0x35, 0x4c, 0x45, 0xb2, 0x1e, 0x4c, 0x14, 0x21, 0xe6, 0xe9, 0x8a, 0x7b, 0x8d, 0xfe, 0x1e, 0xc6, 0x3e, 0xc1, 0x35, 0xfa, 0xe7, 0x70, 0x4e, 0x1d } },
-	  { { 0x61, 0x2e, 0xc2, 0xdd, 0x95, 0x57, 0xd1, 0xab, 0x80, 0xe8, 0x63, 0x17, 0xb5, 0x48, 0xe4, 0x8a, 0x11, 0x9e, 0x72, 0xbe, 0x85, 0x8d, 0x51, 0x0a, 0xf2, 0x9f, 0xe0, 0x1c, 0xa9, 0x07, 0x28, 0x7b } } },
-	{ { { 0xbb, 0x71, 0x14, 0x5e, 0x26, 0x8c, 0x3d, 0xc8, 0xe9, 0x7c, 0xd3, 0xd6, 0xd1, 0x2f, 0x07, 0x6d, 0xe6, 0xdf, 0xfb, 0x79, 0xd6, 0x99, 0x59, 0x96, 0x48, 0x40, 0x0f, 0x3a, 0x7b, 0xb2, 0xa0, 0x72 } },
-	  { { 0x4e, 0x3b, 0x69, 0xc8, 0x43, 0x75, 0x51, 0x6c, 0x79, 0x56, 0xe4, 0xcb, 0xf7, 0xa6, 0x51, 0xc2, 0x2c, 0x42, 0x0b, 0xd4, 0x82, 0x20, 0x1c, 0x01, 0x08, 0x66, 0xd7, 0xbf, 0x04, 0x56, 0xfc, 0x02 } } },
-	{ { { 0x24, 0xe8, 0xb7, 0x60, 0xae, 0x47, 0x80, 0xfc, 0xe5, 0x23, 0xe7, 0xc2, 0xc9, 0x85, 0xe6, 0x98, 0xa0, 0x29, 0x4e, 0xe1, 0x84, 0x39, 0x2d, 0x95, 0x2c, 0xf3, 0x45, 0x3c, 0xff, 0xaf, 0x27, 0x4c } },
-	  { { 0x6b, 0xa6, 0xf5, 0x4b, 0x11, 0xbd, 0xba, 0x5b, 0x9e, 0xc4, 0xa4, 0x51, 0x1e, 0xbe, 0xd0, 0x90, 0x3a, 0x9c, 0xc2, 0x26, 0xb6, 0x1e, 0xf1, 0x95, 0x7d, 0xc8, 0x6d, 0x52, 0xe6, 0x99, 0x2c, 0x5f } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x85, 0xe0, 0x24, 0x32, 0xb4, 0xd1, 0xef, 0xfc, 0x69, 0xa2, 0xbf, 0x8f, 0x72, 0x2c, 0x95, 0xf6, 0xe4, 0x6e, 0x7d, 0x90, 0xf7, 0x57, 0x81, 0xa0, 0xf7, 0xda, 0xef, 0x33, 0x07, 0xe3, 0x6b, 0x78 } },
-	  { { 0x36, 0x27, 0x3e, 0xc6, 0x12, 0x07, 0xab, 0x4e, 0xbe, 0x69, 0x9d, 0xb3, 0xbe, 0x08, 0x7c, 0x2a, 0x47, 0x08, 0xfd, 0xd4, 0xcd, 0x0e, 0x27, 0x34, 0x5b, 0x98, 0x34, 0x2f, 0x77, 0x5f, 0x3a, 0x65 } } },
-	{ { { 0x13, 0xaa, 0x2e, 0x4c, 0xf0, 0x22, 0xb8, 0x6c, 0xb3, 0x19, 0x4d, 0xeb, 0x6b, 0xd0, 0xa4, 0xc6, 0x9c, 0xdd, 0xc8, 0x5b, 0x81, 0x57, 0x89, 0xdf, 0x33, 0xa9, 0x68, 0x49, 0x80, 0xe4, 0xfe, 0x21 } },
-	  { { 0x00, 0x17, 0x90, 0x30, 0xe9, 0xd3, 0x60, 0x30, 0x31, 0xc2, 0x72, 0x89, 0x7a, 0x36, 0xa5, 0xbd, 0x39, 0x83, 0x85, 0x50, 0xa1, 0x5d, 0x6c, 0x41, 0x1d, 0xb5, 0x2c, 0x07, 0x40, 0x77, 0x0b, 0x50 } } },
-	{ { { 0x64, 0x34, 0xec, 0xc0, 0x9e, 0x44, 0x41, 0xaf, 0xa0, 0x36, 0x05, 0x6d, 0xea, 0x30, 0x25, 0x46, 0x35, 0x24, 0x9d, 0x86, 0xbd, 0x95, 0xf1, 0x6a, 0x46, 0xd7, 0x94, 0x54, 0xf9, 0x3b, 0xbd, 0x5d } },
-	  { { 0x77, 0x5b, 0xe2, 0x37, 0xc7, 0xe1, 0x7c, 0x13, 0x8c, 0x9f, 0x7b, 0x7b, 0x2a, 0xce, 0x42, 0xa3, 0xb9, 0x2a, 0x99, 0xa8, 0xc0, 0xd8, 0x3c, 0x86, 0xb0, 0xfb, 0xe9, 0x76, 0x77, 0xf7, 0xf5, 0x56 } } },
-	{ { { 0xdf, 0xb3, 0x46, 0x11, 0x6e, 0x13, 0xb7, 0x28, 0x4e, 0x56, 0xdd, 0xf1, 0xac, 0xad, 0x58, 0xc3, 0xf8, 0x88, 0x94, 0x5e, 0x06, 0x98, 0xa1, 0xe4, 0x6a, 0xfb, 0x0a, 0x49, 0x5d, 0x8a, 0xfe, 0x77 } },
-	  { { 0x46, 0x02, 0xf5, 0xa5, 0xaf, 0xc5, 0x75, 0x6d, 0xba, 0x45, 0x35, 0x0a, 0xfe, 0xc9, 0xac, 0x22, 0x91, 0x8d, 0x21, 0x95, 0x33, 0x03, 0xc0, 0x8a, 0x16, 0xf3, 0x39, 0xe0, 0x01, 0x0f, 0x53, 0x3c } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x34, 0x75, 0x37, 0x1f, 0x34, 0x4e, 0xa9, 0x1d, 0x68, 0x67, 0xf8, 0x49, 0x98, 0x96, 0xfc, 0x4c, 0x65, 0x97, 0xf7, 0x02, 0x4a, 0x52, 0x6c, 0x01, 0xbd, 0x48, 0xbb, 0x1b, 0xed, 0xa4, 0xe2, 0x53 } },
-	  { { 0x59, 0xd5, 0x9b, 0x5a, 0xa2, 0x90, 0xd3, 0xb8, 0x37, 0x4c, 0x55, 0x82, 0x28, 0x08, 0x0f, 0x7f, 0xaa, 0x81, 0x65, 0xe0, 0x0c, 0x52, 0xc9, 0xa3, 0x32, 0x27, 0x64, 0xda, 0xfd, 0x34, 0x23, 0x5a } } },
-	{ { { 0xb5, 0xb0, 0x0c, 0x4d, 0xb3, 0x7b, 0x23, 0xc8, 0x1f, 0x8a, 0x39, 0x66, 0xe6, 0xba, 0x4c, 0x10, 0x37, 0xca, 0x9c, 0x7c, 0x05, 0x9e, 0xff, 0xc0, 0xf8, 0x8e, 0xb1, 0x8f, 0x6f, 0x67, 0x18, 0x26 } },
-	  { { 0x4b, 0x41, 0x13, 0x54, 0x23, 0x1a, 0xa4, 0x4e, 0xa9, 0x8b, 0x1e, 0x4b, 0xfc, 0x15, 0x24, 0xbb, 0x7e, 0xcb, 0xb6, 0x1e, 0x1b, 0xf5, 0xf2, 0xc8, 0x56, 0xec, 0x32, 0xa2, 0x60, 0x5b, 0xa0, 0x2a } } },
-	{ { { 0xa4, 0x29, 0x47, 0x86, 0x2e, 0x92, 0x4f, 0x11, 0x4f, 0xf3, 0xb2, 0x5c, 0xd5, 0x3e, 0xa6, 0xb9, 0xc8, 0xe2, 0x33, 0x11, 0x1f, 0x01, 0x8f, 0xb0, 0x9b, 0xc7, 0xa5, 0xff, 0x83, 0x0f, 0x1e, 0x28 } },
-	  { { 0x1d, 0x29, 0x7a, 0xa1, 0xec, 0x8e, 0xb5, 0xad, 0xea, 0x02, 0x68, 0x60, 0x74, 0x29, 0x1c, 0xa5, 0xcf, 0xc8, 0x3b, 0x7d, 0x8b, 0x2b, 0x7c, 0xad, 0xa4, 0x40, 0x17, 0x51, 0x59, 0x7c, 0x2e, 0x5d } } },
-	{ { { 0x0a, 0x6c, 0x4f, 0xbc, 0x3e, 0x32, 0xe7, 0x4a, 0x1a, 0x13, 0xc1, 0x49, 0x38, 0xbf, 0xf7, 0xc2, 0xd3, 0x8f, 0x6b, 0xad, 0x52, 0xf7, 0xcf, 0xbc, 0x27, 0xcb, 0x40, 0x67, 0x76, 0xcd, 0x6d, 0x56 } },
-	  { { 0xe5, 0xb0, 0x27, 0xad, 0xbe, 0x9b, 0xf2, 0xb5, 0x63, 0xde, 0x3a, 0x23, 0x95, 0xb7, 0x0a, 0x7e, 0xf3, 0x9e, 0x45, 0x6f, 0x19, 0x39, 0x75, 0x8f, 0x39, 0x3d, 0x0f, 0xc0, 0x9f, 0xf1, 0xe9, 0x51 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x88, 0xaa, 0x14, 0x24, 0x86, 0x94, 0x11, 0x12, 0x3e, 0x1a, 0xb5, 0xcc, 0xbb, 0xe0, 0x9c, 0xd5, 0x9c, 0x6d, 0xba, 0x58, 0x72, 0x8d, 0xfb, 0x22, 0x7b, 0x9f, 0x7c, 0x94, 0x30, 0xb3, 0x51, 0x21 } },
-	  { { 0xf6, 0x74, 0x3d, 0xf2, 0xaf, 0xd0, 0x1e, 0x03, 0x7c, 0x23, 0x6b, 0xc9, 0xfc, 0x25, 0x70, 0x90, 0xdc, 0x9a, 0xa4, 0xfb, 0x49, 0xfc, 0x3d, 0x0a, 0x35, 0x38, 0x6f, 0xe4, 0x7e, 0x50, 0x01, 0x2a } } },
-	{ { { 0xd6, 0xe3, 0x96, 0x61, 0x3a, 0xfd, 0xef, 0x9b, 0x1f, 0x90, 0xa4, 0x24, 0x14, 0x5b, 0xc8, 0xde, 0x50, 0xb1, 0x1d, 0xaf, 0xe8, 0x55, 0x8a, 0x87, 0x0d, 0xfe, 0xaa, 0x3b, 0x82, 0x2c, 0x8d, 0x7b } },
-	  { { 0x85, 0x0c, 0xaf, 0xf8, 0x83, 0x44, 0x49, 0xd9, 0x45, 0xcf, 0xf7, 0x48, 0xd9, 0x53, 0xb4, 0xf1, 0x65, 0xa0, 0xe1, 0xc3, 0xb3, 0x15, 0xed, 0x89, 0x9b, 0x4f, 0x62, 0xb3, 0x57, 0xa5, 0x45, 0x1c } } },
-	{ { { 0x8f, 0x12, 0xea, 0xaf, 0xd1, 0x1f, 0x79, 0x10, 0x0b, 0xf6, 0xa3, 0x7b, 0xea, 0xac, 0x8b, 0x57, 0x32, 0x62, 0xe7, 0x06, 0x12, 0x51, 0xa0, 0x3b, 0x43, 0x5e, 0xa4, 0x20, 0x78, 0x31, 0xce, 0x0d } },
-	  { { 0x84, 0x7c, 0xc2, 0xa6, 0x91, 0x23, 0xce, 0xbd, 0xdc, 0xf9, 0xce, 0xd5, 0x75, 0x30, 0x22, 0xe6, 0xf9, 0x43, 0x62, 0x0d, 0xf7, 0x75, 0x9d, 0x7f, 0x8c, 0xff, 0x7d, 0xe4, 0x72, 0xac, 0x9f, 0x1c } } },
-	{ { { 0x88, 0xc1, 0x99, 0xd0, 0x3c, 0x1c, 0x5d, 0xb4, 0xef, 0x13, 0x0f, 0x90, 0xb9, 0x36, 0x2f, 0x95, 0x95, 0xc6, 0xdc, 0xde, 0x0a, 0x51, 0xe2, 0x8d, 0xf3, 0xbc, 0x51, 0xec, 0xdf, 0xb1, 0xa2, 0x5f } },
-	  { { 0x2e, 0x68, 0xa1, 0x23, 0x7d, 0x9b, 0x40, 0x69, 0x85, 0x7b, 0x42, 0xbf, 0x90, 0x4b, 0xd6, 0x40, 0x2f, 0xd7, 0x52, 0x52, 0xb2, 0x21, 0xde, 0x64, 0xbd, 0x88, 0xc3, 0x6d, 0xa5, 0xfa, 0x81, 0x3f } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xfb, 0xfd, 0x47, 0x7b, 0x8a, 0x66, 0x9e, 0x79, 0x2e, 0x64, 0x82, 0xef, 0xf7, 0x21, 0xec, 0xf6, 0xd8, 0x86, 0x09, 0x31, 0x7c, 0xdd, 0x03, 0x6a, 0x58, 0xa0, 0x77, 0xb7, 0x9b, 0x8c, 0x87, 0x1f } },
-	  { { 0x55, 0x47, 0xe4, 0xa8, 0x3d, 0x55, 0x21, 0x34, 0xab, 0x1d, 0xae, 0xe0, 0xf4, 0xea, 0xdb, 0xc5, 0xb9, 0x58, 0xbf, 0xc4, 0x2a, 0x89, 0x31, 0x1a, 0xf4, 0x2d, 0xe1, 0xca, 0x37, 0x99, 0x47, 0x59 } } },
-	{ { { 0xc7, 0xca, 0x63, 0xc1, 0x49, 0xa9, 0x35, 0x45, 0x55, 0x7e, 0xda, 0x64, 0x32, 0x07, 0x50, 0xf7, 0x32, 0xac, 0xde, 0x75, 0x58, 0x9b, 0x11, 0xb2, 0x3a, 0x1f, 0xf5, 0xf7, 0x79, 0x04, 0xe6, 0x08 } },
-	  { { 0x46, 0xfa, 0x22, 0x4b, 0xfa, 0xe1, 0xfe, 0x96, 0xfc, 0x67, 0xba, 0x67, 0x97, 0xc4, 0xe7, 0x1b, 0x86, 0x90, 0x5f, 0xee, 0xf4, 0x5b, 0x11, 0xb2, 0xcd, 0xad, 0xee, 0xc2, 0x48, 0x6c, 0x2b, 0x1b } } },
-	{ { { 0xe3, 0x39, 0x62, 0xb4, 0x4f, 0x31, 0x04, 0xc9, 0xda, 0xd5, 0x73, 0x51, 0x57, 0xc5, 0xb8, 0xf3, 0xa3, 0x43, 0x70, 0xe4, 0x61, 0x81, 0x84, 0xe2, 0xbb, 0xbf, 0x4f, 0x9e, 0xa4, 0x5e, 0x74, 0x06 } },
-	  { { 0x29, 0xac, 0xff, 0x27, 0xe0, 0x59, 0xbe, 0x39, 0x9c, 0x0d, 0x83, 0xd7, 0x10, 0x0b, 0x15, 0xb7, 0xe1, 0xc2, 0x2c, 0x30, 0x73, 0x80, 0x3a, 0x7d, 0x5d, 0xab, 0x58, 0x6b, 0xc1, 0xf0, 0xf4, 0x22 } } },
-	{ { { 0xfe, 0x7f, 0xfb, 0x35, 0x7d, 0xc6, 0x01, 0x23, 0x28, 0xc4, 0x02, 0xac, 0x1f, 0x42, 0xb4, 0x9d, 0xfc, 0x00, 0x94, 0xa5, 0xee, 0xca, 0xda, 0x97, 0x09, 0x41, 0x77, 0x87, 0x5d, 0x7b, 0x87, 0x78 } },
-	  { { 0xf5, 0xfb, 0x90, 0x2d, 0x81, 0x19, 0x9e, 0x2f, 0x6d, 0x85, 0x88, 0x8c, 0x40, 0x5c, 0x77, 0x41, 0x4d, 0x01, 0x19, 0x76, 0x60, 0xe8, 0x4c, 0x48, 0xe4, 0x33, 0x83, 0x32, 0x6c, 0xb4, 0x41, 0x03 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xff, 0x10, 0xc2, 0x09, 0x4f, 0x6e, 0xf4, 0xd2, 0xdf, 0x7e, 0xca, 0x7b, 0x1c, 0x1d, 0xba, 0xa3, 0xb6, 0xda, 0x67, 0x33, 0xd4, 0x87, 0x36, 0x4b, 0x11, 0x20, 0x05, 0xa6, 0x29, 0xc1, 0x87, 0x17 } },
-	  { { 0xf6, 0x96, 0xca, 0x2f, 0xda, 0x38, 0xa7, 0x1b, 0xfc, 0xca, 0x7d, 0xfe, 0x08, 0x89, 0xe2, 0x47, 0x2b, 0x6a, 0x5d, 0x4b, 0xfa, 0xa1, 0xb4, 0xde, 0xb6, 0xc2, 0x31, 0x51, 0xf5, 0xe0, 0xa4, 0x0b } } },
-	{ { { 0x5c, 0xe5, 0xc6, 0x04, 0x8e, 0x2b, 0x57, 0xbe, 0x38, 0x85, 0x23, 0xcb, 0xb7, 0xbe, 0x4f, 0xa9, 0xd3, 0x6e, 0x12, 0xaa, 0xd5, 0xb2, 0x2e, 0x93, 0x29, 0x9a, 0x4a, 0x88, 0x18, 0x43, 0xf5, 0x01 } },
-	  { { 0x50, 0xfc, 0xdb, 0xa2, 0x59, 0x21, 0x8d, 0xbd, 0x7e, 0x33, 0xae, 0x2f, 0x87, 0x1a, 0xd0, 0x97, 0xc7, 0x0d, 0x4d, 0x63, 0x01, 0xef, 0x05, 0x84, 0xec, 0x40, 0xdd, 0xa8, 0x0a, 0x4f, 0x70, 0x0b } } },
-	{ { { 0x41, 0x69, 0x01, 0x67, 0x5c, 0xd3, 0x8a, 0xc5, 0xcf, 0x3f, 0xd1, 0x57, 0xd1, 0x67, 0x3e, 0x01, 0x39, 0xb5, 0xcb, 0x81, 0x56, 0x96, 0x26, 0xb6, 0xc2, 0xe7, 0x5c, 0xfb, 0x63, 0x97, 0x58, 0x06 } },
-	  { { 0x0c, 0x0e, 0xf3, 0xba, 0xf0, 0xe5, 0xba, 0xb2, 0x57, 0x77, 0xc6, 0x20, 0x9b, 0x89, 0x24, 0xbe, 0xf2, 0x9c, 0x8a, 0xba, 0x69, 0xc1, 0xf1, 0xb0, 0x4f, 0x2a, 0x05, 0x9a, 0xee, 0x10, 0x7e, 0x36 } } },
-	{ { { 0x3f, 0x26, 0xe9, 0x40, 0xe9, 0x03, 0xad, 0x06, 0x69, 0x91, 0xe0, 0xd1, 0x89, 0x60, 0x84, 0x79, 0xde, 0x27, 0x6d, 0xe6, 0x76, 0xbd, 0xea, 0xe6, 0xae, 0x48, 0xc3, 0x67, 0xc0, 0x57, 0xcd, 0x2f } },
-	  { { 0x7f, 0xc1, 0xdc, 0xb9, 0xc7, 0xbc, 0x86, 0x3d, 0x55, 0x4b, 0x28, 0x7a, 0xfb, 0x4d, 0xc7, 0xf8, 0xbc, 0x67, 0x2a, 0x60, 0x4d, 0x8f, 0x07, 0x0b, 0x1a, 0x17, 0xbf, 0xfa, 0xac, 0xa7, 0x3d, 0x1a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x91, 0x3f, 0xed, 0x5e, 0x18, 0x78, 0x3f, 0x23, 0x2c, 0x0d, 0x8c, 0x44, 0x00, 0xe8, 0xfb, 0xe9, 0x8e, 0xd6, 0xd1, 0x36, 0x58, 0x57, 0x9e, 0xae, 0x4b, 0x5c, 0x0b, 0x07, 0xbc, 0x6b, 0x55, 0x2b } },
-	  { { 0x6f, 0x4d, 0x17, 0xd7, 0xe1, 0x84, 0xd9, 0x78, 0xb1, 0x90, 0xfd, 0x2e, 0xb3, 0xb5, 0x19, 0x3f, 0x1b, 0xfa, 0xc0, 0x68, 0xb3, 0xdd, 0x00, 0x2e, 0x89, 0xbd, 0x7e, 0x80, 0x32, 0x13, 0xa0, 0x7b } } },
-	{ { { 0x1a, 0x6f, 0x40, 0xaf, 0x44, 0x44, 0xb0, 0x43, 0x8f, 0x0d, 0xd0, 0x1e, 0xc4, 0x0b, 0x19, 0x5d, 0x8e, 0xfe, 0xc1, 0xf3, 0xc5, 0x5c, 0x91, 0xf8, 0x04, 0x4e, 0xbe, 0x90, 0xb4, 0x47, 0x5c, 0x3f } },
-	  { { 0xb0, 0x3b, 0x2c, 0xf3, 0xfe, 0x32, 0x71, 0x07, 0x3f, 0xaa, 0xba, 0x45, 0x60, 0xa8, 0x8d, 0xea, 0x54, 0xcb, 0x39, 0x10, 0xb4, 0xf2, 0x8b, 0xd2, 0x14, 0x82, 0x42, 0x07, 0x8e, 0xe9, 0x7c, 0x53 } } },
-	{ { { 0xb0, 0xae, 0xc1, 0x8d, 0xc9, 0x8f, 0xb9, 0x7a, 0x77, 0xef, 0xba, 0x79, 0xa0, 0x3c, 0xa8, 0xf5, 0x6a, 0xe2, 0x3f, 0x5d, 0x00, 0xe3, 0x4b, 0x45, 0x24, 0x7b, 0x43, 0x78, 0x55, 0x1d, 0x2b, 0x1e } },
-	  { { 0x01, 0xb8, 0xd6, 0x16, 0x67, 0xa0, 0x15, 0xb9, 0xe1, 0x58, 0xa4, 0xa7, 0x31, 0x37, 0x77, 0x2f, 0x8b, 0x12, 0x9f, 0xf4, 0x3f, 0xc7, 0x36, 0x66, 0xd2, 0xa8, 0x56, 0xf7, 0x7f, 0x74, 0xc6, 0x41 } } },
-	{ { { 0x5d, 0xf8, 0xb4, 0xa8, 0x30, 0xdd, 0xcc, 0x38, 0xa5, 0xd3, 0xca, 0xd8, 0xd1, 0xf8, 0xb2, 0x31, 0x91, 0xd4, 0x72, 0x05, 0x57, 0x4a, 0x3b, 0x82, 0x4a, 0xc6, 0x68, 0x20, 0xe2, 0x18, 0x41, 0x61 } },
-	  { { 0x19, 0xd4, 0x8d, 0x47, 0x29, 0x12, 0x65, 0xb0, 0x11, 0x78, 0x47, 0xb5, 0xcb, 0xa3, 0xa5, 0xfa, 0x05, 0x85, 0x54, 0xa9, 0x33, 0x97, 0x8d, 0x2b, 0xc2, 0xfe, 0x99, 0x35, 0x28, 0xe5, 0xeb, 0x63 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xb1, 0x3f, 0x3f, 0xef, 0xd8, 0xf4, 0xfc, 0xb3, 0xa0, 0x60, 0x50, 0x06, 0x2b, 0x29, 0x52, 0x70, 0x15, 0x0b, 0x24, 0x24, 0xf8, 0x5f, 0x79, 0x18, 0xcc, 0xff, 0x89, 0x99, 0x84, 0xa1, 0xae, 0x13 } },
-	  { { 0x44, 0x1f, 0xb8, 0xc2, 0x01, 0xc1, 0x30, 0x19, 0x55, 0x05, 0x60, 0x10, 0xa4, 0x6c, 0x2d, 0x67, 0x70, 0xe5, 0x25, 0x1b, 0xf2, 0xbf, 0xdd, 0xfb, 0x70, 0x2b, 0xa1, 0x8c, 0x9c, 0x94, 0x84, 0x08 } } },
-	{ { { 0xe7, 0xc4, 0x43, 0x4d, 0xc9, 0x2b, 0x69, 0x5d, 0x1d, 0x3c, 0xaf, 0xbb, 0x43, 0x38, 0x4e, 0x98, 0x3d, 0xed, 0x0d, 0x21, 0x03, 0xfd, 0xf0, 0x99, 0x47, 0x04, 0xb0, 0x98, 0x69, 0x55, 0x72, 0x0f } },
-	  { { 0x5e, 0xdf, 0x15, 0x53, 0x3b, 0x86, 0x80, 0xb0, 0xf1, 0x70, 0x68, 0x8f, 0x66, 0x7c, 0x0e, 0x49, 0x1a, 0xd8, 0x6b, 0xfe, 0x4e, 0xef, 0xca, 0x47, 0xd4, 0x03, 0xc1, 0x37, 0x50, 0x9c, 0xc1, 0x16 } } },
-	{ { { 0xcd, 0x24, 0xc6, 0x3e, 0x0c, 0x82, 0x9b, 0x91, 0x2b, 0x61, 0x4a, 0xb2, 0x0f, 0x88, 0x55, 0x5f, 0x5a, 0x57, 0xff, 0xe5, 0x74, 0x0b, 0x13, 0x43, 0x00, 0xd8, 0x6b, 0xcf, 0xd2, 0x15, 0x03, 0x2c } },
-	  { { 0xdc, 0xff, 0x15, 0x61, 0x2f, 0x4a, 0x2f, 0x62, 0xf2, 0x04, 0x2f, 0xb5, 0x0c, 0xb7, 0x1e, 0x3f, 0x74, 0x1a, 0x0f, 0xd7, 0xea, 0xcd, 0xd9, 0x7d, 0xf6, 0x12, 0x0e, 0x2f, 0xdb, 0x5a, 0x3b, 0x16 } } },
-	{ { { 0x1b, 0x37, 0x47, 0xe3, 0xf5, 0x9e, 0xea, 0x2c, 0x2a, 0xe7, 0x82, 0x36, 0xf4, 0x1f, 0x81, 0x47, 0x92, 0x4b, 0x69, 0x0e, 0x11, 0x8c, 0x5d, 0x53, 0x5b, 0x81, 0x27, 0x08, 0xbc, 0xa0, 0xae, 0x25 } },
-	  { { 0x69, 0x32, 0xa1, 0x05, 0x11, 0x42, 0x00, 0xd2, 0x59, 0xac, 0x4d, 0x62, 0x8b, 0x13, 0xe2, 0x50, 0x5d, 0xa0, 0x9d, 0x9b, 0xfd, 0xbb, 0x12, 0x41, 0x75, 0x41, 0x9e, 0xcc, 0xdc, 0xc7, 0xdc, 0x5d } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xd9, 0xe3, 0x38, 0x06, 0x46, 0x70, 0x82, 0x5e, 0x28, 0x49, 0x79, 0xff, 0x25, 0xd2, 0x4e, 0x29, 0x8d, 0x06, 0xb0, 0x23, 0xae, 0x9b, 0x66, 0xe4, 0x7d, 0xc0, 0x70, 0x91, 0xa3, 0xfc, 0xec, 0x4e } },
-	  { { 0x62, 0x12, 0x37, 0x6a, 0x30, 0xf6, 0x1e, 0xfb, 0x14, 0x5c, 0x0d, 0x0e, 0xb7, 0x81, 0x6a, 0xe7, 0x08, 0x05, 0xac, 0xaa, 0x38, 0x46, 0xe2, 0x73, 0xea, 0x4b, 0x07, 0x81, 0x43, 0x7c, 0x9e, 0x5e } } },
-	{ { { 0xfc, 0xf9, 0x21, 0x4f, 0x2e, 0x76, 0x9b, 0x1f, 0x28, 0x60, 0x77, 0x43, 0x32, 0x9d, 0xbe, 0x17, 0x30, 0x2a, 0xc6, 0x18, 0x92, 0x66, 0x62, 0x30, 0x98, 0x40, 0x11, 0xa6, 0x7f, 0x18, 0x84, 0x28 } },
-	  { { 0x3f, 0xab, 0xd3, 0xf4, 0x8a, 0x76, 0xa1, 0x3c, 0xca, 0x2d, 0x49, 0xc3, 0xea, 0x08, 0x0b, 0x85, 0x17, 0x2a, 0xc3, 0x6c, 0x08, 0xfd, 0x57, 0x9f, 0x3d, 0x5f, 0xdf, 0x67, 0x68, 0x42, 0x00, 0x32 } } },
-	{ { { 0x51, 0x60, 0x1b, 0x06, 0x4f, 0x8a, 0x21, 0xba, 0x38, 0xa8, 0xba, 0xd6, 0x40, 0xf6, 0xe9, 0x9b, 0x76, 0x4d, 0x56, 0x21, 0x5b, 0x0a, 0x9b, 0x2e, 0x4f, 0x3d, 0x81, 0x32, 0x08, 0x9f, 0x97, 0x5b } },
-	  { { 0xe5, 0x44, 0xec, 0x06, 0x9d, 0x90, 0x79, 0x9f, 0xd3, 0xe0, 0x79, 0xaf, 0x8f, 0x10, 0xfd, 0xdd, 0x04, 0xae, 0x27, 0x97, 0x46, 0x33, 0x79, 0xea, 0xb8, 0x4e, 0xca, 0x5a, 0x59, 0x57, 0xe1, 0x0e } } },
-	{ { { 0x1a, 0xda, 0xf3, 0xa5, 0x41, 0x43, 0x28, 0xfc, 0x7e, 0xe7, 0x71, 0xea, 0xc6, 0x3b, 0x59, 0xcc, 0x2e, 0xd3, 0x40, 0xec, 0xb3, 0x13, 0x6f, 0x44, 0xcd, 0x13, 0xb2, 0x37, 0xf2, 0x6e, 0xd9, 0x1c } },
-	  { { 0xe3, 0xdb, 0x60, 0xcd, 0x5c, 0x4a, 0x18, 0x0f, 0xef, 0x73, 0x36, 0x71, 0x8c, 0xf6, 0x11, 0xb4, 0xd8, 0xce, 0x17, 0x5e, 0x4f, 0x26, 0x77, 0x97, 0x5f, 0xcb, 0xef, 0x91, 0xeb, 0x6a, 0x62, 0x7a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x18, 0x4a, 0xa2, 0x97, 0x08, 0x81, 0x2d, 0x83, 0xc4, 0xcc, 0xf0, 0x83, 0x7e, 0xec, 0x0d, 0x95, 0x4c, 0x5b, 0xfb, 0xfa, 0x98, 0x80, 0x4a, 0x66, 0x56, 0x0c, 0x51, 0xb3, 0xf2, 0x04, 0x5d, 0x27 } },
-	  { { 0x3b, 0xb9, 0xb8, 0x06, 0x5a, 0x2e, 0xfe, 0xc3, 0x82, 0x37, 0x9c, 0xa3, 0x11, 0x1f, 0x9c, 0xa6, 0xda, 0x63, 0x48, 0x9b, 0xad, 0xde, 0x2d, 0xa6, 0xbc, 0x6e, 0x32, 0xda, 0x27, 0x65, 0xdd, 0x57 } } },
-	{ { { 0x84, 0x4f, 0x37, 0x31, 0x7d, 0x2e, 0xbc, 0xad, 0x87, 0x07, 0x2a, 0x6b, 0x37, 0xfc, 0x5f, 0xeb, 0x4e, 0x75, 0x35, 0xa6, 0xde, 0xab, 0x0a, 0x19, 0x3a, 0xb7, 0xb1, 0xef, 0x92, 0x6a, 0x3b, 0x3c } },
-	  { { 0x3b, 0xb2, 0x94, 0x6d, 0x39, 0x60, 0xac, 0xee, 0xe7, 0x81, 0x1a, 0x3b, 0x76, 0x87, 0x5c, 0x05, 0x94, 0x2a, 0x45, 0xb9, 0x80, 0xe9, 0x22, 0xb1, 0x07, 0xcb, 0x40, 0x9e, 0x70, 0x49, 0x6d, 0x12 } } },
-	{ { { 0xfd, 0x18, 0x78, 0x84, 0xa8, 0x4c, 0x7d, 0x6e, 0x59, 0xa6, 0xe5, 0x74, 0xf1, 0x19, 0xa6, 0x84, 0x2e, 0x51, 0xc1, 0x29, 0x13, 0xf2, 0x14, 0x6b, 0x5d, 0x53, 0x51, 0xf7, 0xef, 0xbf, 0x01, 0x22 } },
-	  { { 0xa4, 0x4b, 0x62, 0x4c, 0xe6, 0xfd, 0x72, 0x07, 0xf2, 0x81, 0xfc, 0xf2, 0xbd, 0x12, 0x7c, 0x68, 0x76, 0x2a, 0xba, 0xf5, 0x65, 0xb1, 0x1f, 0x17, 0x0a, 0x38, 0xb0, 0xbf, 0xc0, 0xf8, 0xf4, 0x2a } } },
-	{ { { 0x55, 0x60, 0x55, 0x5b, 0xe4, 0x1d, 0x71, 0x4c, 0x9d, 0x5b, 0x9f, 0x70, 0xa6, 0x85, 0x9a, 0x2c, 0xa0, 0xe2, 0x32, 0x48, 0xce, 0x9e, 0x2a, 0xa5, 0x07, 0x3b, 0xc7, 0x6c, 0x86, 0x77, 0xde, 0x3c } },
-	  { { 0xf7, 0x18, 0x7a, 0x96, 0x7e, 0x43, 0x57, 0xa9, 0x55, 0xfc, 0x4e, 0xb6, 0x72, 0x00, 0xf2, 0xe4, 0xd7, 0x52, 0xd3, 0xd3, 0xb6, 0x85, 0xf6, 0x71, 0xc7, 0x44, 0x3f, 0x7f, 0xd7, 0xb3, 0xf2, 0x79 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x46, 0xca, 0xa7, 0x55, 0x7b, 0x79, 0xf3, 0xca, 0x5a, 0x65, 0xf6, 0xed, 0x50, 0x14, 0x7b, 0xe4, 0xc4, 0x2a, 0x65, 0x9e, 0xe2, 0xf9, 0xca, 0xa7, 0x22, 0x26, 0x53, 0xcb, 0x21, 0x5b, 0xa7, 0x31 } },
-	  { { 0x90, 0xd7, 0xc5, 0x26, 0x08, 0xbd, 0xb0, 0x53, 0x63, 0x58, 0xc3, 0x31, 0x5e, 0x75, 0x46, 0x15, 0x91, 0xa6, 0xf8, 0x2f, 0x1a, 0x08, 0x65, 0x88, 0x2f, 0x98, 0x04, 0xf1, 0x7c, 0x6e, 0x00, 0x77 } } },
-	{ { { 0x81, 0x21, 0x61, 0x09, 0xf6, 0x4e, 0xf1, 0x92, 0xee, 0x63, 0x61, 0x73, 0x87, 0xc7, 0x54, 0x0e, 0x42, 0x4b, 0xc9, 0x47, 0xd1, 0xb8, 0x7e, 0x91, 0x75, 0x37, 0x99, 0x28, 0xb8, 0xdd, 0x7f, 0x50 } },
-	  { { 0x89, 0x8f, 0xc0, 0xbe, 0x5d, 0xd6, 0x9f, 0xa0, 0xf0, 0x9d, 0x81, 0xce, 0x3a, 0x7b, 0x98, 0x58, 0xbb, 0xd7, 0x78, 0xc8, 0x3f, 0x13, 0xf1, 0x74, 0x19, 0xdf, 0xf8, 0x98, 0x89, 0x5d, 0xfa, 0x5f } } },
-	{ { { 0x9e, 0x35, 0x85, 0x94, 0x47, 0x1f, 0x90, 0x15, 0x26, 0xd0, 0x84, 0xed, 0x8a, 0x80, 0xf7, 0x63, 0x42, 0x86, 0x27, 0xd7, 0xf4, 0x75, 0x58, 0xdc, 0x9c, 0xc0, 0x22, 0x7e, 0x20, 0x35, 0xfd, 0x1f } },
-	  { { 0x68, 0x0e, 0x6f, 0x97, 0xba, 0x70, 0xbb, 0xa3, 0x0e, 0xe5, 0x0b, 0x12, 0xf4, 0xa2, 0xdc, 0x47, 0xf8, 0xe6, 0xd0, 0x23, 0x6c, 0x33, 0xa8, 0x99, 0x46, 0x6e, 0x0f, 0x44, 0xba, 0x76, 0x48, 0x0f } } },
-	{ { { 0xa3, 0x2a, 0x61, 0x37, 0xe2, 0x59, 0x12, 0x0e, 0x27, 0xba, 0x64, 0x43, 0xae, 0xc0, 0x42, 0x69, 0x79, 0xa4, 0x1e, 0x29, 0x8b, 0x15, 0xeb, 0xf8, 0xaf, 0xd4, 0xa2, 0x68, 0x33, 0xb5, 0x7a, 0x24 } },
-	  { { 0x2c, 0x19, 0x33, 0xdd, 0x1b, 0xab, 0xec, 0x01, 0xb0, 0x23, 0xf8, 0x42, 0x2b, 0x06, 0x88, 0xea, 0x3d, 0x2d, 0x00, 0x2a, 0x78, 0x45, 0x4d, 0x38, 0xed, 0x2e, 0x2e, 0x44, 0x49, 0xed, 0xcb, 0x33 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xa0, 0x68, 0xe8, 0x41, 0x8f, 0x91, 0xf8, 0x11, 0x13, 0x90, 0x2e, 0xa7, 0xab, 0x30, 0xef, 0xad, 0xa0, 0x61, 0x00, 0x88, 0xef, 0xdb, 0xce, 0x5b, 0x5c, 0xbb, 0x62, 0xc8, 0x56, 0xf9, 0x00, 0x73 } },
-	  { { 0x3f, 0x60, 0xc1, 0x82, 0x2d, 0xa3, 0x28, 0x58, 0x24, 0x9e, 0x9f, 0xe3, 0x70, 0xcc, 0x09, 0x4e, 0x1a, 0x3f, 0x11, 0x11, 0x15, 0x07, 0x3c, 0xa4, 0x41, 0xe0, 0x65, 0xa3, 0x0a, 0x41, 0x6d, 0x11 } } },
-	{ { { 0x31, 0x40, 0x01, 0x52, 0x56, 0x94, 0x5b, 0x28, 0x8a, 0xaa, 0x52, 0xee, 0xd8, 0x0a, 0x05, 0x8d, 0xcd, 0xb5, 0xaa, 0x2e, 0x38, 0xaa, 0xb7, 0x87, 0xf7, 0x2b, 0xfb, 0x04, 0xcb, 0x84, 0x3d, 0x54 } },
-	  { { 0x20, 0xef, 0x59, 0xde, 0xa4, 0x2b, 0x93, 0x6e, 0x2e, 0xec, 0x42, 0x9a, 0xd4, 0x2d, 0xf4, 0x46, 0x58, 0x27, 0x2b, 0x18, 0x8f, 0x83, 0x3d, 0x69, 0x9e, 0xd4, 0x3e, 0xb6, 0xc5, 0xfd, 0x58, 0x03 } } },
-	{ { { 0x33, 0x89, 0xc9, 0x63, 0x62, 0x1c, 0x17, 0xb4, 0x60, 0xc4, 0x26, 0x68, 0x09, 0xc3, 0x2e, 0x37, 0x0f, 0x7b, 0xb4, 0x9c, 0xb6, 0xf9, 0xfb, 0xd4, 0x51, 0x78, 0xc8, 0x63, 0xea, 0x77, 0x47, 0x07 } },
-	  { { 0x32, 0xb4, 0x18, 0x47, 0x79, 0xcb, 0xd4, 0x5a, 0x07, 0x14, 0x0f, 0xa0, 0xd5, 0xac, 0xd0, 0x41, 0x40, 0xab, 0x61, 0x23, 0xe5, 0x2a, 0x2a, 0x6f, 0xf7, 0xa8, 0xd4, 0x76, 0xef, 0xe7, 0x45, 0x6c } } },
-	{ { { 0xa1, 0x5e, 0x60, 0x4f, 0xfb, 0xe1, 0x70, 0x6a, 0x1f, 0x55, 0x4f, 0x09, 0xb4, 0x95, 0x33, 0x36, 0xc6, 0x81, 0x01, 0x18, 0x06, 0x25, 0x27, 0xa4, 0xb4, 0x24, 0xa4, 0x86, 0x03, 0x4c, 0xac, 0x02 } },
-	  { { 0x77, 0x38, 0xde, 0xd7, 0x60, 0x48, 0x07, 0xf0, 0x74, 0xa8, 0xff, 0x54, 0xe5, 0x30, 0x43, 0xff, 0x77, 0xfb, 0x21, 0x07, 0xff, 0xb2, 0x07, 0x6b, 0xe4, 0xe5, 0x30, 0xfc, 0x19, 0x6c, 0xa3, 0x01 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x13, 0xc5, 0x2c, 0xac, 0xd3, 0x83, 0x82, 0x7c, 0x29, 0xf7, 0x05, 0xa5, 0x00, 0xb6, 0x1f, 0x86, 0x55, 0xf4, 0xd6, 0x2f, 0x0c, 0x99, 0xd0, 0x65, 0x9b, 0x6b, 0x46, 0x0d, 0x43, 0xf8, 0x16, 0x28 } },
-	  { { 0x1e, 0x7f, 0xb4, 0x74, 0x7e, 0xb1, 0x89, 0x4f, 0x18, 0x5a, 0xab, 0x64, 0x06, 0xdf, 0x45, 0x87, 0xe0, 0x6a, 0xc6, 0xf0, 0x0e, 0xc9, 0x24, 0x35, 0x38, 0xea, 0x30, 0x54, 0xb4, 0xc4, 0x52, 0x54 } } },
-	{ { { 0xe9, 0x9f, 0xdc, 0x3f, 0xc1, 0x89, 0x44, 0x74, 0x27, 0xe4, 0xc1, 0x90, 0xff, 0x4a, 0xa7, 0x3c, 0xee, 0xcd, 0xf4, 0x1d, 0x25, 0x94, 0x7f, 0x63, 0x16, 0x48, 0xbc, 0x64, 0xfe, 0x95, 0xc4, 0x0c } },
-	  { { 0x8b, 0x19, 0x75, 0x6e, 0x03, 0x06, 0x5e, 0x6a, 0x6f, 0x1a, 0x8c, 0xe3, 0xd3, 0x28, 0xf2, 0xe0, 0xb9, 0x7a, 0x43, 0x69, 0xe6, 0xd3, 0xc0, 0xfe, 0x7e, 0x97, 0xab, 0x6c, 0x7b, 0x8e, 0x13, 0x42 } } },
-	{ { { 0xd4, 0xca, 0x70, 0x3d, 0xab, 0xfb, 0x5f, 0x5e, 0x00, 0x0c, 0xcc, 0x77, 0x22, 0xf8, 0x78, 0x55, 0xae, 0x62, 0x35, 0xfb, 0x9a, 0xc6, 0x03, 0xe4, 0x0c, 0xee, 0xab, 0xc7, 0xc0, 0x89, 0x87, 0x54 } },
-	  { { 0x32, 0xad, 0xae, 0x85, 0x58, 0x43, 0xb8, 0xb1, 0xe6, 0x3e, 0x00, 0x9c, 0x78, 0x88, 0x56, 0xdb, 0x9c, 0xfc, 0x79, 0xf6, 0xf9, 0x41, 0x5f, 0xb7, 0xbc, 0x11, 0xf9, 0x20, 0x36, 0x1c, 0x53, 0x2b } } },
-	{ { { 0x5a, 0x20, 0x5b, 0xa1, 0xa5, 0x44, 0x91, 0x24, 0x02, 0x63, 0x12, 0x64, 0xb8, 0x55, 0xf6, 0xde, 0x2c, 0xdb, 0x47, 0xb8, 0xc6, 0x0a, 0xc3, 0x00, 0x78, 0x93, 0xd8, 0xf5, 0xf5, 0x18, 0x28, 0x0a } },
-	  { { 0xd6, 0x1b, 0x9a, 0x6c, 0xe5, 0x46, 0xea, 0x70, 0x96, 0x8d, 0x4e, 0x2a, 0x52, 0x21, 0x26, 0x4b, 0xb1, 0xbb, 0x0f, 0x7c, 0xa9, 0x9b, 0x04, 0xbb, 0x51, 0x08, 0xf1, 0x9a, 0xa4, 0x76, 0x7c, 0x18 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xfa, 0x94, 0xf7, 0x40, 0xd0, 0xd7, 0xeb, 0xa9, 0x82, 0x36, 0xd5, 0x15, 0xb9, 0x33, 0x7a, 0xbf, 0x8a, 0xf2, 0x63, 0xaa, 0x37, 0xf5, 0x59, 0xac, 0xbd, 0xbb, 0x32, 0x36, 0xbe, 0x73, 0x99, 0x38 } },
-	  { { 0x2c, 0xb3, 0xda, 0x7a, 0xd8, 0x3d, 0x99, 0xca, 0xd2, 0xf4, 0xda, 0x99, 0x8e, 0x4f, 0x98, 0xb7, 0xf4, 0xae, 0x3e, 0x9f, 0x8e, 0x35, 0x60, 0xa4, 0x33, 0x75, 0xa4, 0x04, 0x93, 0xb1, 0x6b, 0x4d } } },
-	{ { { 0x97, 0x9d, 0xa8, 0xcd, 0x97, 0x7b, 0x9d, 0xb9, 0xe7, 0xa5, 0xef, 0xfd, 0xa8, 0x42, 0x6b, 0xc3, 0x62, 0x64, 0x7d, 0xa5, 0x1b, 0xc9, 0x9e, 0xd2, 0x45, 0xb9, 0xee, 0x03, 0xb0, 0xbf, 0xc0, 0x68 } },
-	  { { 0xed, 0xb7, 0x84, 0x2c, 0xf6, 0xd3, 0xa1, 0x6b, 0x24, 0x6d, 0x87, 0x56, 0x97, 0x59, 0x79, 0x62, 0x9f, 0xac, 0xed, 0xf3, 0xc9, 0x89, 0x21, 0x2e, 0x04, 0xb3, 0xcc, 0x2f, 0xbe, 0xd6, 0x0a, 0x4b } } },
-	{ { { 0x39, 0x61, 0x05, 0xed, 0x25, 0x89, 0x8b, 0x5d, 0x1b, 0xcb, 0x0c, 0x55, 0xf4, 0x6a, 0x00, 0x8a, 0x46, 0xe8, 0x1e, 0xc6, 0x83, 0xc8, 0x5a, 0x76, 0xdb, 0xcc, 0x19, 0x7a, 0xcc, 0x67, 0x46, 0x0b } },
-	  { { 0x53, 0xcf, 0xc2, 0xa1, 0xad, 0x6a, 0xf3, 0xcd, 0x8f, 0xc9, 0xde, 0x1c, 0xf8, 0x6c, 0x8f, 0xf8, 0x76, 0x42, 0xe7, 0xfe, 0xb2, 0x72, 0x21, 0x0a, 0x66, 0x74, 0x8f, 0xb7, 0xeb, 0xe4, 0x6f, 0x01 } } },
-	{ { { 0x22, 0x8c, 0x6b, 0xbe, 0xfc, 0x4d, 0x70, 0x62, 0x6e, 0x52, 0x77, 0x99, 0x88, 0x7e, 0x7b, 0x57, 0x7a, 0x0d, 0xfe, 0xdc, 0x72, 0x92, 0xf1, 0x68, 0x1d, 0x97, 0xd7, 0x7c, 0x8d, 0x53, 0x10, 0x37 } },
-	  { { 0x53, 0x88, 0x77, 0x02, 0xca, 0x27, 0xa8, 0xe5, 0x45, 0xe2, 0xa8, 0x48, 0x2a, 0xab, 0x18, 0xca, 0xea, 0x2d, 0x2a, 0x54, 0x17, 0x37, 0x32, 0x09, 0xdc, 0xe0, 0x4a, 0xb7, 0x7d, 0x82, 0x10, 0x7d } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x8a, 0x64, 0x1e, 0x14, 0x0a, 0x57, 0xd4, 0xda, 0x5c, 0x96, 0x9b, 0x01, 0x4c, 0x67, 0xbf, 0x8b, 0x30, 0xfe, 0x08, 0xdb, 0x0d, 0xd5, 0xa8, 0xd7, 0x09, 0x11, 0x85, 0xa2, 0xd3, 0x45, 0xfb, 0x7e } },
-	  { { 0xda, 0x8c, 0xc2, 0xd0, 0xac, 0x18, 0xe8, 0x52, 0x36, 0xd4, 0x21, 0xa3, 0xdd, 0x57, 0x22, 0x79, 0xb7, 0xf8, 0x71, 0x9d, 0xc6, 0x91, 0x70, 0x86, 0x56, 0xbf, 0xa1, 0x11, 0x8b, 0x19, 0xe1, 0x0f } } },
-	{ { { 0x18, 0x32, 0x98, 0x2c, 0x8f, 0x91, 0xae, 0x12, 0xf0, 0x8c, 0xea, 0xf3, 0x3c, 0xb9, 0x5d, 0xe4, 0x69, 0xed, 0xb2, 0x47, 0x18, 0xbd, 0xce, 0x16, 0x52, 0x5c, 0x23, 0xe2, 0xa5, 0x25, 0x52, 0x5d } },
-	  { { 0xb9, 0xb1, 0xe7, 0x5d, 0x4e, 0xbc, 0xee, 0xbb, 0x40, 0x81, 0x77, 0x82, 0x19, 0xab, 0xb5, 0xc6, 0xee, 0xab, 0x5b, 0x6b, 0x63, 0x92, 0x8a, 0x34, 0x8d, 0xcd, 0xee, 0x4f, 0x49, 0xe5, 0xc9, 0x7e } } },
-	{ { { 0x21, 0xac, 0x8b, 0x22, 0xcd, 0xc3, 0x9a, 0xe9, 0x5e, 0x78, 0xbd, 0xde, 0xba, 0xad, 0xab, 0xbf, 0x75, 0x41, 0x09, 0xc5, 0x58, 0xa4, 0x7d, 0x92, 0xb0, 0x7f, 0xf2, 0xa1, 0xd1, 0xc0, 0xb3, 0x6d } },
-	  { { 0x62, 0x4f, 0xd0, 0x75, 0x77, 0xba, 0x76, 0x77, 0xd7, 0xb8, 0xd8, 0x92, 0x6f, 0x98, 0x34, 0x3d, 0xd6, 0x4e, 0x1c, 0x0f, 0xf0, 0x8f, 0x2e, 0xf1, 0xb3, 0xbd, 0xb1, 0xb9, 0xec, 0x99, 0xb4, 0x07 } } },
-	{ { { 0x60, 0x57, 0x2e, 0x9a, 0x72, 0x1d, 0x6b, 0x6e, 0x58, 0x33, 0x24, 0x8c, 0x48, 0x39, 0x46, 0x8e, 0x89, 0x6a, 0x88, 0x51, 0x23, 0x62, 0xb5, 0x32, 0x09, 0x36, 0xe3, 0x57, 0xf5, 0x98, 0xde, 0x6f } },
-	  { { 0x8b, 0x2c, 0x00, 0x48, 0x4a, 0xf9, 0x5b, 0x87, 0x69, 0x52, 0xe5, 0x5b, 0xd1, 0xb1, 0xe5, 0x25, 0x25, 0xe0, 0x9c, 0xc2, 0x13, 0x44, 0xe8, 0xb9, 0x0a, 0x70, 0xad, 0xbd, 0x0f, 0x51, 0x94, 0x69 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xa2, 0xdc, 0xab, 0xa9, 0x25, 0x2d, 0xac, 0x5f, 0x03, 0x33, 0x08, 0xe7, 0x7e, 0xfe, 0x95, 0x36, 0x3c, 0x5b, 0x3a, 0xd3, 0x05, 0x82, 0x1c, 0x95, 0x2d, 0xd8, 0x77, 0x7e, 0x02, 0xd9, 0x5b, 0x70 } },
-	  { { 0xc2, 0xfe, 0x1b, 0x0c, 0x67, 0xcd, 0xd6, 0xe0, 0x51, 0x8e, 0x2c, 0xe0, 0x79, 0x88, 0xf0, 0xcf, 0x41, 0x4a, 0xad, 0x23, 0xd4, 0x46, 0xca, 0x94, 0xa1, 0xc3, 0xeb, 0x28, 0x06, 0xfa, 0x17, 0x14 } } },
-	{ { { 0x7b, 0xaa, 0x70, 0x0a, 0x4b, 0xfb, 0xf5, 0xbf, 0x80, 0xc5, 0xcf, 0x08, 0x7a, 0xdd, 0xa1, 0xf4, 0x9d, 0x54, 0x50, 0x53, 0x23, 0x77, 0x23, 0xf5, 0x34, 0xa5, 0x22, 0xd1, 0x0d, 0x96, 0x2e, 0x47 } },
-	  { { 0xcc, 0xb7, 0x32, 0x89, 0x57, 0xd0, 0x98, 0x75, 0xe4, 0x37, 0x99, 0xa9, 0xe8, 0xba, 0xed, 0xba, 0xeb, 0xc7, 0x4f, 0x15, 0x76, 0x07, 0x0c, 0x4c, 0xef, 0x9f, 0x52, 0xfc, 0x04, 0x5d, 0x58, 0x10 } } },
-	{ { { 0xce, 0x82, 0xf0, 0x8f, 0x79, 0x02, 0xa8, 0xd1, 0xda, 0x14, 0x09, 0x48, 0xee, 0x8a, 0x40, 0x98, 0x76, 0x60, 0x54, 0x5a, 0xde, 0x03, 0x24, 0xf5, 0xe6, 0x2f, 0xe1, 0x03, 0xbf, 0x68, 0x82, 0x7f } },
-	  { { 0x64, 0xe9, 0x28, 0xc7, 0xa4, 0xcf, 0x2a, 0xf9, 0x90, 0x64, 0x72, 0x2c, 0x8b, 0xeb, 0xec, 0xa0, 0xf2, 0x7d, 0x35, 0xb5, 0x90, 0x4d, 0x7f, 0x5b, 0x4a, 0x49, 0xe4, 0xb8, 0x3b, 0xc8, 0xa1, 0x2f } } },
-	{ { { 0x8b, 0xc5, 0xcc, 0x3d, 0x69, 0xa6, 0xa1, 0x18, 0x44, 0xbc, 0x4d, 0x77, 0x37, 0xc7, 0x86, 0xec, 0x0c, 0xc9, 0xd6, 0x44, 0xa9, 0x23, 0x27, 0xb9, 0x03, 0x34, 0xa7, 0x0a, 0xd5, 0xc7, 0x34, 0x37 } },
-	  { { 0xf9, 0x7e, 0x3e, 0x66, 0xee, 0xf9, 0x99, 0x28, 0xff, 0xad, 0x11, 0xd8, 0xe2, 0x66, 0xc5, 0xcd, 0x0f, 0x0d, 0x0b, 0x6a, 0xfc, 0x7c, 0x24, 0xa8, 0x4f, 0xa8, 0x5e, 0x80, 0x45, 0x8b, 0x6c, 0x41 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xef, 0x1e, 0xec, 0xf7, 0x8d, 0x77, 0xf2, 0xea, 0xdb, 0x60, 0x03, 0x21, 0xc0, 0xff, 0x5e, 0x67, 0xc3, 0x71, 0x0b, 0x21, 0xb4, 0x41, 0xa0, 0x68, 0x38, 0xc6, 0x01, 0xa3, 0xd3, 0x51, 0x3c, 0x3c } },
-	  { { 0x92, 0xf8, 0xd6, 0x4b, 0xef, 0x42, 0x13, 0xb2, 0x4a, 0xc4, 0x2e, 0x72, 0x3f, 0xc9, 0x11, 0xbd, 0x74, 0x02, 0x0e, 0xf5, 0x13, 0x9d, 0x83, 0x1a, 0x1b, 0xd5, 0x54, 0xde, 0xc4, 0x1e, 0x16, 0x6c } } },
-	{ { { 0x27, 0x52, 0xe4, 0x63, 0xaa, 0x94, 0xe6, 0xc3, 0x28, 0x9c, 0xc6, 0x56, 0xac, 0xfa, 0xb6, 0xbd, 0xe2, 0xcc, 0x76, 0xc6, 0x27, 0x27, 0xa2, 0x8e, 0x78, 0x2b, 0x84, 0x72, 0x10, 0xbd, 0x4e, 0x2a } },
-	  { { 0xea, 0xa7, 0x23, 0xef, 0x04, 0x61, 0x80, 0x50, 0xc9, 0x6e, 0xa5, 0x96, 0xd1, 0xd1, 0xc8, 0xc3, 0x18, 0xd7, 0x2d, 0xfd, 0x26, 0xbd, 0xcb, 0x7b, 0x92, 0x51, 0x0e, 0x4a, 0x65, 0x57, 0xb8, 0x49 } } },
-	{ { { 0xab, 0x55, 0x36, 0xc3, 0xec, 0x63, 0x55, 0x11, 0x55, 0xf6, 0xa5, 0xc7, 0x01, 0x5f, 0xfe, 0x79, 0xd8, 0x0a, 0xf7, 0x03, 0xd8, 0x98, 0x99, 0xf5, 0xd0, 0x00, 0x54, 0x6b, 0x66, 0x28, 0xf5, 0x25 } },
-	  { { 0x7a, 0x8d, 0xa1, 0x5d, 0x70, 0x5d, 0x51, 0x27, 0xee, 0x30, 0x65, 0x56, 0x95, 0x46, 0xde, 0xbd, 0x03, 0x75, 0xb4, 0x57, 0x59, 0x89, 0xeb, 0x02, 0x9e, 0xcc, 0x89, 0x19, 0xa7, 0xcb, 0x17, 0x67 } } },
-	{ { { 0x6a, 0xeb, 0xfc, 0x9a, 0x9a, 0x10, 0xce, 0xdb, 0x3a, 0x1c, 0x3c, 0x6a, 0x9d, 0xea, 0x46, 0xbc, 0x45, 0x49, 0xac, 0xe3, 0x41, 0x12, 0x7c, 0xf0, 0xf7, 0x4f, 0xf9, 0xf7, 0xff, 0x2c, 0x89, 0x04 } },
-	  { { 0x30, 0x31, 0x54, 0x1a, 0x46, 0xca, 0xe6, 0xc6, 0xcb, 0xe2, 0xc3, 0xc1, 0x8b, 0x75, 0x81, 0xbe, 0xee, 0xf8, 0xa3, 0x11, 0x1c, 0x25, 0xa3, 0xa7, 0x35, 0x51, 0x55, 0xe2, 0x25, 0xaa, 0xe2, 0x3a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xb4, 0x48, 0x10, 0x9f, 0x8a, 0x09, 0x76, 0xfa, 0xf0, 0x7a, 0xb0, 0x70, 0xf7, 0x83, 0x80, 0x52, 0x84, 0x2b, 0x26, 0xa2, 0xc4, 0x5d, 0x4f, 0xba, 0xb1, 0xc8, 0x40, 0x0d, 0x78, 0x97, 0xc4, 0x60 } },
-	  { { 0xd4, 0xb1, 0x6c, 0x08, 0xc7, 0x40, 0x38, 0x73, 0x5f, 0x0b, 0xf3, 0x76, 0x5d, 0xb2, 0xa5, 0x2f, 0x57, 0x57, 0x07, 0xed, 0x08, 0xa2, 0x6c, 0x4f, 0x08, 0x02, 0xb5, 0x0e, 0xee, 0x44, 0xfa, 0x22 } } },
-	{ { { 0x0f, 0x00, 0x3f, 0xa6, 0x04, 0x19, 0x56, 0x65, 0x31, 0x7f, 0x8b, 0xeb, 0x0d, 0xe1, 0x47, 0x89, 0x97, 0x16, 0x53, 0xfa, 0x81, 0xa7, 0xaa, 0xb2, 0xbf, 0x67, 0xeb, 0x72, 0x60, 0x81, 0x0d, 0x48 } },
-	  { { 0x7e, 0x13, 0x33, 0xcd, 0xa8, 0x84, 0x56, 0x1e, 0x67, 0xaf, 0x6b, 0x43, 0xac, 0x17, 0xaf, 0x16, 0xc0, 0x52, 0x99, 0x49, 0x5b, 0x87, 0x73, 0x7e, 0xb5, 0x43, 0xda, 0x6b, 0x1d, 0x0f, 0x2d, 0x55 } } },
-	{ { { 0xe9, 0x58, 0x1f, 0xff, 0x84, 0x3f, 0x93, 0x1c, 0xcb, 0xe1, 0x30, 0x69, 0xa5, 0x75, 0x19, 0x7e, 0x14, 0x5f, 0xf8, 0xfc, 0x09, 0xdd, 0xa8, 0x78, 0x9d, 0xca, 0x59, 0x8b, 0xd1, 0x30, 0x01, 0x13 } },
-	  { { 0xff, 0x76, 0x03, 0xc5, 0x4b, 0x89, 0x99, 0x70, 0x00, 0x59, 0x70, 0x9c, 0xd5, 0xd9, 0x11, 0x89, 0x5a, 0x46, 0xfe, 0xef, 0xdc, 0xd9, 0x55, 0x2b, 0x45, 0xa7, 0xb0, 0x2d, 0xfb, 0x24, 0xc2, 0x29 } } },
-	{ { { 0x38, 0x06, 0xf8, 0x0b, 0xac, 0x82, 0xc4, 0x97, 0x2b, 0x90, 0xe0, 0xf7, 0xa8, 0xab, 0x6c, 0x08, 0x80, 0x66, 0x90, 0x46, 0xf7, 0x26, 0x2d, 0xf8, 0xf1, 0xc4, 0x6b, 0x4a, 0x82, 0x98, 0x8e, 0x37 } },
-	  { { 0x8e, 0xb4, 0xee, 0xb8, 0xd4, 0x3f, 0xb2, 0x1b, 0xe0, 0x0a, 0x3d, 0x75, 0x34, 0x28, 0xa2, 0x8e, 0xc4, 0x92, 0x7b, 0xfe, 0x60, 0x6e, 0x6d, 0xb8, 0x31, 0x1d, 0x62, 0x0d, 0x78, 0x14, 0x42, 0x11 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x5e, 0xa8, 0xd8, 0x04, 0x9b, 0x73, 0xc9, 0xc9, 0xdc, 0x0d, 0x73, 0xbf, 0x0a, 0x0a, 0x73, 0xff, 0x18, 0x1f, 0x9c, 0x51, 0xaa, 0xc6, 0xf1, 0x83, 0x25, 0xfd, 0xab, 0xa3, 0x11, 0xd3, 0x01, 0x24 } },
-	  { { 0x4d, 0xe3, 0x7e, 0x38, 0x62, 0x5e, 0x64, 0xbb, 0x2b, 0x53, 0xb5, 0x03, 0x68, 0xc4, 0xf2, 0x2b, 0x5a, 0x03, 0x32, 0x99, 0x4a, 0x41, 0x9a, 0xe1, 0x1a, 0xae, 0x8c, 0x48, 0xf3, 0x24, 0x32, 0x65 } } },
-	{ { { 0xe8, 0xdd, 0xad, 0x3a, 0x8c, 0xea, 0xf4, 0xb3, 0xb2, 0xe5, 0x73, 0xf2, 0xed, 0x8b, 0xbf, 0xed, 0xb1, 0x0c, 0x0c, 0xfb, 0x2b, 0xf1, 0x01, 0x48, 0xe8, 0x26, 0x03, 0x8e, 0x27, 0x4d, 0x96, 0x72 } },
-	  { { 0xc8, 0x09, 0x3b, 0x60, 0xc9, 0x26, 0x4d, 0x7c, 0xf2, 0x9c, 0xd4, 0xa1, 0x3b, 0x26, 0xc2, 0x04, 0x33, 0x44, 0x76, 0x3c, 0x02, 0xbb, 0x11, 0x42, 0x0c, 0x22, 0xb7, 0xc6, 0xe1, 0xac, 0xb4, 0x0e } } },
-	{ { { 0x6f, 0x85, 0xe7, 0xef, 0xde, 0x67, 0x30, 0xfc, 0xbf, 0x5a, 0xe0, 0x7b, 0x7a, 0x2a, 0x54, 0x6b, 0x5d, 0x62, 0x85, 0xa1, 0xf8, 0x16, 0x88, 0xec, 0x61, 0xb9, 0x96, 0xb5, 0xef, 0x2d, 0x43, 0x4d } },
-	  { { 0x7c, 0x31, 0x33, 0xcc, 0xe4, 0xcf, 0x6c, 0xff, 0x80, 0x47, 0x77, 0xd1, 0xd8, 0xe9, 0x69, 0x97, 0x98, 0x7f, 0x20, 0x57, 0x1d, 0x1d, 0x4f, 0x08, 0x27, 0xc8, 0x35, 0x57, 0x40, 0xc6, 0x21, 0x0c } } },
-	{ { { 0xd2, 0x8e, 0x9b, 0xfa, 0x42, 0x8e, 0xdf, 0x8f, 0xc7, 0x86, 0xf9, 0xa4, 0xca, 0x70, 0x00, 0x9d, 0x21, 0xbf, 0xec, 0x57, 0x62, 0x30, 0x58, 0x8c, 0x0d, 0x35, 0xdb, 0x5d, 0x8b, 0x6a, 0xa0, 0x5a } },
-	  { { 0xc1, 0x58, 0x7c, 0x0d, 0x20, 0xdd, 0x11, 0x26, 0x5f, 0x89, 0x3b, 0x97, 0x58, 0xf8, 0x8b, 0xe3, 0xdf, 0x32, 0xe2, 0xfc, 0xd8, 0x67, 0xf2, 0xa5, 0x37, 0x1e, 0x6d, 0xec, 0x7c, 0x27, 0x20, 0x79 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xd0, 0xe9, 0xc0, 0xfa, 0x95, 0x45, 0x23, 0x96, 0xf1, 0x2c, 0x79, 0x25, 0x14, 0xce, 0x40, 0x14, 0x44, 0x2c, 0x36, 0x50, 0xd9, 0x63, 0x56, 0xb7, 0x56, 0x3b, 0x9e, 0xa7, 0xef, 0x89, 0xbb, 0x0e } },
-	  { { 0xce, 0x7f, 0xdc, 0x0a, 0xcc, 0x82, 0x1c, 0x0a, 0x78, 0x71, 0xe8, 0x74, 0x8d, 0x01, 0x30, 0x0f, 0xa7, 0x11, 0x4c, 0xdf, 0x38, 0xd7, 0xa7, 0x0d, 0xf8, 0x48, 0x52, 0x00, 0x80, 0x7b, 0x5f, 0x0e } } },
-	{ { { 0x25, 0x83, 0xe6, 0x94, 0x7b, 0x81, 0xb2, 0x91, 0xae, 0x0e, 0x05, 0xc9, 0xa3, 0x68, 0x2d, 0xd9, 0x88, 0x25, 0x19, 0x2a, 0x61, 0x61, 0x21, 0x97, 0x15, 0xa1, 0x35, 0xa5, 0x46, 0xc8, 0xa2, 0x0e } },
-	  { { 0x1b, 0x03, 0x0d, 0x8b, 0x5a, 0x1b, 0x97, 0x4b, 0xf2, 0x16, 0x31, 0x3d, 0x1f, 0x33, 0xa0, 0x50, 0x3a, 0x18, 0xbe, 0x13, 0xa1, 0x76, 0xc1, 0xba, 0x1b, 0xf1, 0x05, 0x7b, 0x33, 0xa8, 0x82, 0x3b } } },
-	{ { { 0xba, 0x36, 0x7b, 0x6d, 0xa9, 0xea, 0x14, 0x12, 0xc5, 0xfa, 0x91, 0x00, 0xba, 0x9b, 0x99, 0xcc, 0x56, 0x02, 0xe9, 0xa0, 0x26, 0x40, 0x66, 0x8c, 0xc4, 0xf8, 0x85, 0x33, 0x68, 0xe7, 0x03, 0x20 } },
-	  { { 0x50, 0x5b, 0xff, 0xa9, 0xb2, 0xf1, 0xf1, 0x78, 0xcf, 0x14, 0xa4, 0xa9, 0xfc, 0x09, 0x46, 0x94, 0x54, 0x65, 0x0d, 0x9c, 0x5f, 0x72, 0x21, 0xe2, 0x97, 0xa5, 0x2d, 0x81, 0xce, 0x4a, 0x5f, 0x79 } } },
-	{ { { 0x3d, 0x5f, 0x5c, 0xd2, 0xbc, 0x7d, 0x77, 0x0e, 0x2a, 0x6d, 0x22, 0x45, 0x84, 0x06, 0xc4, 0xdd, 0xc6, 0xa6, 0xc6, 0xd7, 0x49, 0xad, 0x6d, 0x87, 0x91, 0x0e, 0x3a, 0x67, 0x1d, 0x2c, 0x1d, 0x56 } },
-	  { { 0xfe, 0x7a, 0x74, 0xcf, 0xd4, 0xd2, 0xe5, 0x19, 0xde, 0xd0, 0xdb, 0x70, 0x23, 0x69, 0xe6, 0x6d, 0xec, 0xec, 0xcc, 0x09, 0x33, 0x6a, 0x77, 0xdc, 0x6b, 0x22, 0x76, 0x5d, 0x92, 0x09, 0xac, 0x2d } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x23, 0x15, 0x17, 0xeb, 0xd3, 0xdb, 0x12, 0x5e, 0x01, 0xf0, 0x91, 0xab, 0x2c, 0x41, 0xce, 0xac, 0xed, 0x1b, 0x4b, 0x2d, 0xbc, 0xdb, 0x17, 0x66, 0x89, 0x46, 0xad, 0x4b, 0x1e, 0x6f, 0x0b, 0x14 } },
-	  { { 0x11, 0xce, 0xbf, 0xb6, 0x77, 0x2d, 0x48, 0x22, 0x18, 0x4f, 0xa3, 0x5d, 0x4a, 0xb0, 0x70, 0x12, 0x3e, 0x54, 0xd7, 0xd8, 0x0e, 0x2b, 0x27, 0xdc, 0x53, 0xff, 0xca, 0x8c, 0x59, 0xb3, 0x4e, 0x44 } } },
-	{ { { 0x07, 0x76, 0x61, 0x0f, 0x66, 0xb2, 0x21, 0x39, 0x7e, 0xc0, 0xec, 0x45, 0x28, 0x82, 0xa1, 0x29, 0x32, 0x44, 0x35, 0x13, 0x5e, 0x61, 0x5e, 0x54, 0xcb, 0x7c, 0xef, 0xf6, 0x41, 0xcf, 0x9f, 0x0a } },
-	  { { 0xdd, 0xf9, 0xda, 0x84, 0xc3, 0xe6, 0x8a, 0x9f, 0x24, 0xd2, 0x96, 0x5d, 0x39, 0x6f, 0x58, 0x8c, 0xc1, 0x56, 0x93, 0xab, 0xb5, 0x79, 0x3b, 0xd2, 0xa8, 0x73, 0x16, 0xed, 0xfa, 0xb4, 0x2f, 0x73 } } },
-	{ { { 0x8b, 0xb1, 0x95, 0xe5, 0x92, 0x50, 0x35, 0x11, 0x76, 0xac, 0xf4, 0x4d, 0x24, 0xc3, 0x32, 0xe6, 0xeb, 0xfe, 0x2c, 0x87, 0xc4, 0xf1, 0x56, 0xc4, 0x75, 0x24, 0x7a, 0x56, 0x85, 0x5a, 0x3a, 0x13 } },
-	  { { 0x0d, 0x16, 0xac, 0x3c, 0x4a, 0x58, 0x86, 0x3a, 0x46, 0x7f, 0x6c, 0xa3, 0x52, 0x6e, 0x37, 0xe4, 0x96, 0x9c, 0xe9, 0x5c, 0x66, 0x41, 0x67, 0xe4, 0xfb, 0x79, 0x0c, 0x05, 0xf6, 0x64, 0xd5, 0x7c } } },
-	{ { { 0x28, 0xc1, 0xe1, 0x54, 0x73, 0xf2, 0xbf, 0x76, 0x74, 0x19, 0x19, 0x1b, 0xe4, 0xb9, 0xa8, 0x46, 0x65, 0x73, 0xf3, 0x77, 0x9b, 0x29, 0x74, 0x5b, 0xc6, 0x89, 0x6c, 0x2c, 0x7c, 0xf8, 0xb3, 0x0f } },
-	  { { 0xf7, 0xd5, 0xe9, 0x74, 0x5d, 0xb8, 0x25, 0x16, 0xb5, 0x30, 0xbc, 0x84, 0xc5, 0xf0, 0xad, 0xca, 0x12, 0x28, 0xbc, 0x9d, 0xd4, 0xfa, 0x82, 0xe6, 0xe3, 0xbf, 0xa2, 0x15, 0x2c, 0xd4, 0x34, 0x10 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x61, 0xb1, 0x46, 0xba, 0x0e, 0x31, 0xa5, 0x67, 0x6c, 0x7f, 0xd6, 0xd9, 0x27, 0x85, 0x0f, 0x79, 0x14, 0xc8, 0x6c, 0x2f, 0x5f, 0x5b, 0x9c, 0x35, 0x3d, 0x38, 0x86, 0x77, 0x65, 0x55, 0x6a, 0x7b } },
-	  { { 0xd3, 0xb0, 0x3a, 0x66, 0x60, 0x1b, 0x43, 0xf1, 0x26, 0x58, 0x99, 0x09, 0x8f, 0x2d, 0xa3, 0x14, 0x71, 0x85, 0xdb, 0xed, 0xf6, 0x26, 0xd5, 0x61, 0x9a, 0x73, 0xac, 0x0e, 0xea, 0xac, 0xb7, 0x0c } } },
-	{ { { 0x5e, 0xf4, 0xe5, 0x17, 0x0e, 0x10, 0x9f, 0xe7, 0x43, 0x5f, 0x67, 0x5c, 0xac, 0x4b, 0xe5, 0x14, 0x41, 0xd2, 0xbf, 0x48, 0xf5, 0x14, 0xb0, 0x71, 0xc6, 0x61, 0xc1, 0xb2, 0x70, 0x58, 0xd2, 0x5a } },
-	  { { 0x2d, 0xba, 0x16, 0x07, 0x92, 0x94, 0xdc, 0xbd, 0x50, 0x2b, 0xc9, 0x7f, 0x42, 0x00, 0xba, 0x61, 0xed, 0xf8, 0x43, 0xed, 0xf5, 0xf9, 0x40, 0x60, 0xb2, 0xb0, 0x82, 0xcb, 0xed, 0x75, 0xc7, 0x65 } } },
-	{ { { 0x80, 0xba, 0x0d, 0x09, 0x40, 0xa7, 0x39, 0xa6, 0x67, 0x34, 0x7e, 0x66, 0xbe, 0x56, 0xfb, 0x53, 0x78, 0xc4, 0x46, 0xe8, 0xed, 0x68, 0x6c, 0x7f, 0xce, 0xe8, 0x9f, 0xce, 0xa2, 0x64, 0x58, 0x53 } },
-	  { { 0xe8, 0xc1, 0xa9, 0xc2, 0x7b, 0x59, 0x21, 0x33, 0xe2, 0x43, 0x73, 0x2b, 0xac, 0x2d, 0xc1, 0x89, 0x3b, 0x15, 0xe2, 0xd5, 0xc0, 0x97, 0x8a, 0xfd, 0x6f, 0x36, 0x33, 0xb7, 0xb9, 0xc3, 0x88, 0x09 } } },
-	{ { { 0xd0, 0xb6, 0x56, 0x30, 0x5c, 0xae, 0xb3, 0x75, 0x44, 0xa4, 0x83, 0x51, 0x6e, 0x01, 0x65, 0xef, 0x45, 0x76, 0xe6, 0xf5, 0xa2, 0x0d, 0xd4, 0x16, 0x3b, 0x58, 0x2f, 0xf2, 0x2f, 0x36, 0x18, 0x3f } },
-	  { { 0xfd, 0x2f, 0xe0, 0x9b, 0x1e, 0x8c, 0xc5, 0x18, 0xa9, 0xca, 0xd4, 0x2b, 0x35, 0xb6, 0x95, 0x0a, 0x9f, 0x7e, 0xfb, 0xc4, 0xef, 0x88, 0x7b, 0x23, 0x43, 0xec, 0x2f, 0x0d, 0x0f, 0x7a, 0xfc, 0x5c } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x8d, 0xd2, 0xda, 0xc7, 0x44, 0xd6, 0x7a, 0xdb, 0x26, 0x7d, 0x1d, 0xb8, 0xe1, 0xde, 0x9d, 0x7a, 0x7d, 0x17, 0x7e, 0x1c, 0x37, 0x04, 0x8d, 0x2d, 0x7c, 0x5e, 0x18, 0x38, 0x1e, 0xaf, 0xc7, 0x1b } },
-	  { { 0x33, 0x48, 0x31, 0x00, 0x59, 0xf6, 0xf2, 0xca, 0x0f, 0x27, 0x1b, 0x63, 0x12, 0x7e, 0x02, 0x1d, 0x49, 0xc0, 0x5d, 0x79, 0x87, 0xef, 0x5e, 0x7a, 0x2f, 0x1f, 0x66, 0x55, 0xd8, 0x09, 0xd9, 0x61 } } },
-	{ { { 0x54, 0x83, 0x02, 0x18, 0x82, 0x93, 0x99, 0x07, 0xd0, 0xa7, 0xda, 0xd8, 0x75, 0x89, 0xfa, 0xf2, 0xd9, 0xa3, 0xb8, 0x6b, 0x5a, 0x35, 0x28, 0xd2, 0x6b, 0x59, 0xc2, 0xf8, 0x45, 0xe2, 0xbc, 0x06 } },
-	  { { 0x65, 0xc0, 0xa3, 0x88, 0x51, 0x95, 0xfc, 0x96, 0x94, 0x78, 0xe8, 0x0d, 0x8b, 0x41, 0xc9, 0xc2, 0x58, 0x48, 0x75, 0x10, 0x2f, 0xcd, 0x2a, 0xc9, 0xa0, 0x6d, 0x0f, 0xdd, 0x9c, 0x98, 0x26, 0x3d } } },
-	{ { { 0x2f, 0x66, 0x29, 0x1b, 0x04, 0x89, 0xbd, 0x7e, 0xee, 0x6e, 0xdd, 0xb7, 0x0e, 0xef, 0xb0, 0x0c, 0xb4, 0xfc, 0x7f, 0xc2, 0xc9, 0x3a, 0x3c, 0x64, 0xef, 0x45, 0x44, 0xaf, 0x8a, 0x90, 0x65, 0x76 } },
-	  { { 0xa1, 0x4c, 0x70, 0x4b, 0x0e, 0xa0, 0x83, 0x70, 0x13, 0xa4, 0xaf, 0xb8, 0x38, 0x19, 0x22, 0x65, 0x09, 0xb4, 0x02, 0x4f, 0x06, 0xf8, 0x17, 0xce, 0x46, 0x45, 0xda, 0x50, 0x7c, 0x8a, 0xd1, 0x4e } } },
-	{ { { 0xf7, 0xd4, 0x16, 0x6c, 0x4e, 0x95, 0x9d, 0x5d, 0x0f, 0x91, 0x2b, 0x52, 0xfe, 0x5c, 0x34, 0xe5, 0x30, 0xe6, 0xa4, 0x3b, 0xf3, 0xf3, 0x34, 0x08, 0xa9, 0x4a, 0xa0, 0xb5, 0x6e, 0xb3, 0x09, 0x0a } },
-	  { { 0x26, 0xd9, 0x5e, 0xa3, 0x0f, 0xeb, 0xa2, 0xf3, 0x20, 0x3b, 0x37, 0xd4, 0xe4, 0x9e, 0xce, 0x06, 0x3d, 0x53, 0xed, 0xae, 0x2b, 0xeb, 0xb6, 0x24, 0x0a, 0x11, 0xa3, 0x0f, 0xd6, 0x7f, 0xa4, 0x3a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xdb, 0x9f, 0x2c, 0xfc, 0xd6, 0xb2, 0x1e, 0x2e, 0x52, 0x7a, 0x06, 0x87, 0x2d, 0x86, 0x72, 0x2b, 0x6d, 0x90, 0x77, 0x46, 0x43, 0xb5, 0x7a, 0xf8, 0x60, 0x7d, 0x91, 0x60, 0x5b, 0x9d, 0x9e, 0x07 } },
-	  { { 0x97, 0x87, 0xc7, 0x04, 0x1c, 0x38, 0x01, 0x39, 0x58, 0xc7, 0x85, 0xa3, 0xfc, 0x64, 0x00, 0x64, 0x25, 0xa2, 0xbf, 0x50, 0x94, 0xca, 0x26, 0x31, 0x45, 0x0a, 0x24, 0xd2, 0x51, 0x29, 0x51, 0x16 } } },
-	{ { { 0x4d, 0x4a, 0xd7, 0x98, 0x71, 0x57, 0xac, 0x7d, 0x8b, 0x37, 0xbd, 0x63, 0xff, 0x87, 0xb1, 0x49, 0x95, 0x20, 0x7c, 0xcf, 0x7c, 0x59, 0xc4, 0x91, 0x9c, 0xef, 0xd0, 0xdb, 0x60, 0x09, 0x9d, 0x46 } },
-	  { { 0xcb, 0x78, 0x94, 0x90, 0xe4, 0x45, 0xb3, 0xf6, 0xd9, 0xf6, 0x57, 0x74, 0xd5, 0xf8, 0x83, 0x4f, 0x39, 0xc9, 0xbd, 0x88, 0xc2, 0x57, 0x21, 0x1f, 0x24, 0x32, 0x68, 0xf8, 0xc7, 0x21, 0x5f, 0x0b } } },
-	{ { { 0x2a, 0x36, 0x68, 0xfc, 0x5f, 0xb6, 0x4f, 0xa5, 0xe3, 0x9d, 0x24, 0x2f, 0xc0, 0x93, 0x61, 0xcf, 0xf8, 0x0a, 0xed, 0xe1, 0xdb, 0x27, 0xec, 0x0e, 0x14, 0x32, 0x5f, 0x8e, 0xa1, 0x62, 0x41, 0x16 } },
-	  { { 0x95, 0x21, 0x01, 0xce, 0x95, 0x5b, 0x0e, 0x57, 0xc7, 0xb9, 0x62, 0xb5, 0x28, 0xca, 0x11, 0xec, 0xb4, 0x46, 0x06, 0x73, 0x26, 0xff, 0xfb, 0x66, 0x7d, 0xee, 0x5f, 0xb2, 0x56, 0xfd, 0x2a, 0x08 } } },
-	{ { { 0x92, 0x67, 0x77, 0x56, 0xa1, 0xff, 0xc4, 0xc5, 0x95, 0xf0, 0xe3, 0x3a, 0x0a, 0xca, 0x94, 0x4d, 0x9e, 0x7e, 0x3d, 0xb9, 0x6e, 0xb6, 0xb0, 0xce, 0xa4, 0x30, 0x89, 0x99, 0xe9, 0xad, 0x11, 0x59 } },
-	  { { 0xf6, 0x48, 0x95, 0xa1, 0x6f, 0x5f, 0xb7, 0xa5, 0xbb, 0x30, 0x00, 0x1c, 0xd2, 0x8a, 0xd6, 0x25, 0x26, 0x1b, 0xb2, 0x0d, 0x37, 0x6a, 0x05, 0xf4, 0x9d, 0x3e, 0x17, 0x2a, 0x43, 0xd2, 0x3a, 0x06 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x32, 0x99, 0x93, 0xd1, 0x9a, 0x72, 0xf3, 0xa9, 0x16, 0xbd, 0xb4, 0x4c, 0xdd, 0xf9, 0xd4, 0xb2, 0x64, 0x9a, 0xd3, 0x05, 0xe4, 0xa3, 0x73, 0x1c, 0xcb, 0x7e, 0x57, 0x67, 0xff, 0x04, 0xb3, 0x10 } },
-	  { { 0xb9, 0x4b, 0xa4, 0xad, 0xd0, 0x6d, 0x61, 0x23, 0xb4, 0xaf, 0x34, 0xa9, 0xaa, 0x65, 0xec, 0xd9, 0x69, 0xe3, 0x85, 0xcd, 0xcc, 0xe7, 0xb0, 0x9b, 0x41, 0xc1, 0x1c, 0xf9, 0xa0, 0xfa, 0xb7, 0x13 } } },
-	{ { { 0x04, 0xfd, 0x88, 0x3c, 0x0c, 0xd0, 0x09, 0x52, 0x51, 0x4f, 0x06, 0x19, 0xcc, 0xc3, 0xbb, 0xde, 0x80, 0xc5, 0x33, 0xbc, 0xf9, 0xf3, 0x17, 0x36, 0xdd, 0xc6, 0xde, 0xe8, 0x9b, 0x5d, 0x79, 0x1b } },
-	  { { 0x65, 0x0a, 0xbe, 0x51, 0x57, 0xad, 0x50, 0x79, 0x08, 0x71, 0x9b, 0x07, 0x95, 0x8f, 0xfb, 0xae, 0x4b, 0x38, 0xba, 0xcf, 0x53, 0x2a, 0x86, 0x1e, 0xc0, 0x50, 0x5c, 0x67, 0x1b, 0xf6, 0x87, 0x6c } } },
-	{ { { 0x4f, 0x00, 0xb2, 0x66, 0x55, 0xed, 0x4a, 0xed, 0x8d, 0xe1, 0x66, 0x18, 0xb2, 0x14, 0x74, 0x8d, 0xfd, 0x1a, 0x36, 0x0f, 0x26, 0x5c, 0x8b, 0x89, 0xf3, 0xab, 0xf2, 0xf3, 0x24, 0x67, 0xfd, 0x70 } },
-	  { { 0xfd, 0x4e, 0x2a, 0xc1, 0x3a, 0xca, 0x8f, 0x00, 0xd8, 0xec, 0x74, 0x67, 0xef, 0x61, 0xe0, 0x28, 0xd0, 0x96, 0xf4, 0x48, 0xde, 0x81, 0xe3, 0xef, 0xdc, 0xaa, 0x7d, 0xf3, 0xb6, 0x55, 0xa6, 0x65 } } },
-	{ { { 0xeb, 0xcb, 0xc5, 0x70, 0x91, 0x31, 0x10, 0x93, 0x0d, 0xc8, 0xd0, 0xef, 0x62, 0xe8, 0x6f, 0x82, 0xe3, 0x69, 0x3d, 0x91, 0x7f, 0x31, 0xe1, 0x26, 0x35, 0x3c, 0x4a, 0x2f, 0xab, 0xc4, 0x9a, 0x5e } },
-	  { { 0xab, 0x1b, 0xb5, 0xe5, 0x2b, 0xc3, 0x0e, 0x29, 0xb0, 0xd0, 0x73, 0xe6, 0x4f, 0x64, 0xf2, 0xbc, 0xe4, 0xe4, 0xe1, 0x9a, 0x52, 0x33, 0x2f, 0xbd, 0xcc, 0x03, 0xee, 0x8a, 0xfa, 0x00, 0x5f, 0x50 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xf6, 0xdb, 0x0d, 0x22, 0x3d, 0xb5, 0x14, 0x75, 0x31, 0xf0, 0x81, 0xe2, 0xb9, 0x37, 0xa2, 0xa9, 0x84, 0x11, 0x9a, 0x07, 0xb5, 0x53, 0x89, 0x78, 0xa9, 0x30, 0x27, 0xa1, 0xf1, 0x4e, 0x5c, 0x2e } },
-	  { { 0x8b, 0x00, 0x54, 0xfb, 0x4d, 0xdc, 0xcb, 0x17, 0x35, 0x40, 0xff, 0xb7, 0x8c, 0xfe, 0x4a, 0xe4, 0x4e, 0x99, 0x4e, 0xa8, 0x74, 0x54, 0x5d, 0x5c, 0x96, 0xa3, 0x12, 0x55, 0x36, 0x31, 0x17, 0x5c } } },
-	{ { { 0xce, 0x24, 0xef, 0x7b, 0x86, 0xf2, 0x0f, 0x77, 0xe8, 0x5c, 0x7d, 0x87, 0x38, 0x2d, 0xef, 0xaf, 0xf2, 0x8c, 0x72, 0x2e, 0xeb, 0xb6, 0x55, 0x4b, 0x6e, 0xf1, 0x4e, 0x8a, 0x0e, 0x9a, 0x6c, 0x4c } },
-	  { { 0x25, 0xea, 0x86, 0xc2, 0xd1, 0x4f, 0xb7, 0x3e, 0xa8, 0x5c, 0x8d, 0x66, 0x81, 0x25, 0xed, 0xc5, 0x4c, 0x05, 0xb9, 0xd8, 0xd6, 0x70, 0xbe, 0x73, 0x82, 0xe8, 0xa1, 0xe5, 0x1e, 0x71, 0xd5, 0x26 } } },
-	{ { { 0x4e, 0x6d, 0xc3, 0xa7, 0x4f, 0x22, 0x45, 0x26, 0xa2, 0x7e, 0x16, 0xf7, 0xf7, 0x63, 0xdc, 0x86, 0x01, 0x2a, 0x71, 0x38, 0x5c, 0x33, 0xc3, 0xce, 0x30, 0xff, 0xf9, 0x2c, 0x91, 0x71, 0x8a, 0x72 } },
-	  { { 0x8c, 0x44, 0x09, 0x28, 0xd5, 0x23, 0xc9, 0x8f, 0xf3, 0x84, 0x45, 0xc6, 0x9a, 0x5e, 0xff, 0xd2, 0xc7, 0x57, 0x93, 0xa3, 0xc1, 0x69, 0xdd, 0x62, 0x0f, 0xda, 0x5c, 0x30, 0x59, 0x5d, 0xe9, 0x4c } } },
-	{ { { 0x92, 0x7e, 0x50, 0x27, 0x72, 0xd7, 0x0c, 0xd6, 0x69, 0x96, 0x81, 0x35, 0x84, 0x94, 0x35, 0x8b, 0x6c, 0xaa, 0x62, 0x86, 0x6e, 0x1c, 0x15, 0xf3, 0x6c, 0xb3, 0xff, 0x65, 0x1b, 0xa2, 0x9b, 0x59 } },
-	  { { 0xe2, 0xa9, 0x65, 0x88, 0xc4, 0x50, 0xfa, 0xbb, 0x3b, 0x6e, 0x5f, 0x44, 0x01, 0xca, 0x97, 0xd4, 0xdd, 0xf6, 0xcd, 0x3f, 0x3f, 0xe5, 0x97, 0x67, 0x2b, 0x8c, 0x66, 0x0f, 0x35, 0x9b, 0xf5, 0x07 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xf1, 0x59, 0x27, 0xd8, 0xdb, 0x5a, 0x11, 0x5e, 0x82, 0xf3, 0x38, 0xff, 0x1c, 0xed, 0xfe, 0x3f, 0x64, 0x54, 0x3f, 0x7f, 0xd1, 0x81, 0xed, 0xef, 0x65, 0xc5, 0xcb, 0xfd, 0xe1, 0x80, 0xcd, 0x11 } },
-	  { { 0xe0, 0xdb, 0x22, 0x28, 0xe6, 0xff, 0x61, 0x9d, 0x41, 0x14, 0x2d, 0x3b, 0x26, 0x22, 0xdf, 0xf1, 0x34, 0x81, 0xe9, 0x45, 0xee, 0x0f, 0x98, 0x8b, 0xa6, 0x3f, 0xef, 0xf7, 0x43, 0x19, 0xf1, 0x43 } } },
-	{ { { 0xee, 0xf3, 0x00, 0xa1, 0x50, 0xde, 0xc0, 0xb6, 0x01, 0xe3, 0x8c, 0x3c, 0x4d, 0x31, 0xd2, 0xb0, 0x58, 0xcd, 0xed, 0x10, 0x4a, 0x7a, 0xef, 0x80, 0xa9, 0x19, 0x32, 0xf3, 0xd8, 0x33, 0x8c, 0x06 } },
-	  { { 0xcb, 0x7d, 0x4f, 0xff, 0x30, 0xd8, 0x12, 0x3b, 0x39, 0x1c, 0x06, 0xf9, 0x4c, 0x34, 0x35, 0x71, 0xb5, 0x16, 0x94, 0x67, 0xdf, 0xee, 0x11, 0xde, 0xa4, 0x1d, 0x88, 0x93, 0x35, 0xa9, 0x32, 0x10 } } },
-	{ { { 0xe9, 0xc3, 0xbc, 0x7b, 0x5c, 0xfc, 0xb2, 0xf9, 0xc9, 0x2f, 0xe5, 0xba, 0x3a, 0x0b, 0xab, 0x64, 0x38, 0x6f, 0x5b, 0x4b, 0x93, 0xda, 0x64, 0xec, 0x4d, 0x3d, 0xa0, 0xf5, 0xbb, 0xba, 0x47, 0x48 } },
-	  { { 0x60, 0xbc, 0x45, 0x1f, 0x23, 0xa2, 0x3b, 0x70, 0x76, 0xe6, 0x97, 0x99, 0x4f, 0x77, 0x54, 0x67, 0x30, 0x9a, 0xe7, 0x66, 0xd6, 0xcd, 0x2e, 0x51, 0x24, 0x2c, 0x42, 0x4a, 0x11, 0xfe, 0x6f, 0x7e } } },
-	{ { { 0x87, 0xc0, 0xb1, 0xf0, 0xa3, 0x6f, 0x0c, 0x93, 0xa9, 0x0a, 0x72, 0xef, 0x5c, 0xbe, 0x65, 0x35, 0xa7, 0x6a, 0x4e, 0x2c, 0xbf, 0x21, 0x23, 0xe8, 0x2f, 0x97, 0xc7, 0x3e, 0xc8, 0x17, 0xac, 0x1e } },
-	  { { 0x7b, 0xef, 0x21, 0xe5, 0x40, 0xcc, 0x1e, 0xdc, 0xd6, 0xbd, 0x97, 0x7a, 0x7c, 0x75, 0x86, 0x7a, 0x25, 0x5a, 0x6e, 0x7c, 0xe5, 0x51, 0x3c, 0x1b, 0x5b, 0x82, 0x9a, 0x07, 0x60, 0xa1, 0x19, 0x04 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x96, 0x88, 0xa6, 0xab, 0x8f, 0xe3, 0x3a, 0x49, 0xf8, 0xfe, 0x34, 0xe7, 0x6a, 0xb2, 0xfe, 0x40, 0x26, 0x74, 0x57, 0x4c, 0xf6, 0xd4, 0x99, 0xce, 0x5d, 0x7b, 0x2f, 0x67, 0xd6, 0x5a, 0xe4, 0x4e } },
-	  { { 0x5c, 0x82, 0xb3, 0xbd, 0x55, 0x25, 0xf6, 0x6a, 0x93, 0xa4, 0x02, 0xc6, 0x7d, 0x5c, 0xb1, 0x2b, 0x5b, 0xff, 0xfb, 0x56, 0xf8, 0x01, 0x41, 0x90, 0xc6, 0xb6, 0xac, 0x4f, 0xfe, 0xa7, 0x41, 0x70 } } },
-	{ { { 0xdb, 0xfa, 0x9b, 0x2c, 0xd4, 0x23, 0x67, 0x2c, 0x8a, 0x63, 0x6c, 0x07, 0x26, 0x48, 0x4f, 0xc2, 0x03, 0xd2, 0x53, 0x20, 0x28, 0xed, 0x65, 0x71, 0x47, 0xa9, 0x16, 0x16, 0x12, 0xbc, 0x28, 0x33 } },
-	  { { 0x39, 0xc0, 0xfa, 0xfa, 0xcd, 0x33, 0x43, 0xc7, 0x97, 0x76, 0x9b, 0x93, 0x91, 0x72, 0xeb, 0xc5, 0x18, 0x67, 0x4c, 0x11, 0xf0, 0xf4, 0xe5, 0x73, 0xb2, 0x5c, 0x1b, 0xc2, 0x26, 0x3f, 0xbf, 0x2b } } },
-	{ { { 0x86, 0xe6, 0x8c, 0x1d, 0xdf, 0xca, 0xfc, 0xd5, 0xf8, 0x3a, 0xc3, 0x44, 0x72, 0xe6, 0x78, 0x9d, 0x2b, 0x97, 0xf8, 0x28, 0x45, 0xb4, 0x20, 0xc9, 0x2a, 0x8c, 0x67, 0xaa, 0x11, 0xc5, 0x5b, 0x2f } },
-	  { { 0x17, 0x0f, 0x86, 0x52, 0xd7, 0x9d, 0xc3, 0x44, 0x51, 0x76, 0x32, 0x65, 0xb4, 0x37, 0x81, 0x99, 0x46, 0x37, 0x62, 0xed, 0xcf, 0x64, 0x9d, 0x72, 0x40, 0x7a, 0x4c, 0x0b, 0x76, 0x2a, 0xfb, 0x56 } } },
-	{ { { 0x33, 0xa7, 0x90, 0x7c, 0xc3, 0x6f, 0x17, 0xa5, 0xa0, 0x67, 0x72, 0x17, 0xea, 0x7e, 0x63, 0x14, 0x83, 0xde, 0xc1, 0x71, 0x2d, 0x41, 0x32, 0x7a, 0xf3, 0xd1, 0x2b, 0xd8, 0x2a, 0xa6, 0x46, 0x36 } },
-	  { { 0xac, 0xcc, 0x6b, 0x7c, 0xf9, 0xb8, 0x8b, 0x08, 0x5c, 0xd0, 0x7d, 0x8f, 0x73, 0xea, 0x20, 0xda, 0x86, 0xca, 0x00, 0xc7, 0xad, 0x73, 0x4d, 0xe9, 0xe8, 0xa9, 0xda, 0x1f, 0x03, 0x06, 0xdd, 0x24 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x9c, 0xb2, 0x61, 0x0a, 0x98, 0x2a, 0xa5, 0xd7, 0xee, 0xa9, 0xac, 0x65, 0xcb, 0x0a, 0x1e, 0xe2, 0xbe, 0xdc, 0x85, 0x59, 0x0f, 0x9c, 0xa6, 0x57, 0x34, 0xa5, 0x87, 0xeb, 0x7b, 0x1e, 0x0c, 0x3c } },
-	  { { 0x2f, 0xbd, 0x84, 0x63, 0x0d, 0xb5, 0xa0, 0xf0, 0x4b, 0x9e, 0x93, 0xc6, 0x34, 0x9a, 0x34, 0xff, 0x73, 0x19, 0x2f, 0x6e, 0x54, 0x45, 0x2c, 0x92, 0x31, 0x76, 0x34, 0xf1, 0xb2, 0x26, 0xe8, 0x74 } } },
-	{ { { 0x0a, 0x67, 0x90, 0x6d, 0x0c, 0x4c, 0xcc, 0xc0, 0xe6, 0xbd, 0xa7, 0x5e, 0x55, 0x8c, 0xcd, 0x58, 0x9b, 0x11, 0xa2, 0xbb, 0x4b, 0xb1, 0x43, 0x04, 0x3c, 0x55, 0xed, 0x23, 0xfe, 0xcd, 0xb1, 0x53 } },
-	  { { 0x05, 0xfb, 0x75, 0xf5, 0x01, 0xaf, 0x38, 0x72, 0x58, 0xfc, 0x04, 0x29, 0x34, 0x7a, 0x67, 0xa2, 0x08, 0x50, 0x6e, 0xd0, 0x2b, 0x73, 0xd5, 0xb8, 0xe4, 0x30, 0x96, 0xad, 0x45, 0xdf, 0xa6, 0x5c } } },
-	{ { { 0x0d, 0x88, 0x1a, 0x90, 0x7e, 0xdc, 0xd8, 0xfe, 0xc1, 0x2f, 0x5d, 0x67, 0xee, 0x67, 0x2f, 0xed, 0x6f, 0x55, 0x43, 0x5f, 0x87, 0x14, 0x35, 0x42, 0xd3, 0x75, 0xae, 0xd5, 0xd3, 0x85, 0x1a, 0x76 } },
-	  { { 0x87, 0xc8, 0xa0, 0x6e, 0xe1, 0xb0, 0xad, 0x6a, 0x4a, 0x34, 0x71, 0xed, 0x7c, 0xd6, 0x44, 0x03, 0x65, 0x4a, 0x5c, 0x5c, 0x04, 0xf5, 0x24, 0x3f, 0xb0, 0x16, 0x5e, 0x8c, 0xb2, 0xd2, 0xc5, 0x20 } } },
-	{ { { 0x98, 0x83, 0xc2, 0x37, 0xa0, 0x41, 0xa8, 0x48, 0x5c, 0x5f, 0xbf, 0xc8, 0xfa, 0x24, 0xe0, 0x59, 0x2c, 0xbd, 0xf6, 0x81, 0x7e, 0x88, 0xe6, 0xca, 0x04, 0xd8, 0x5d, 0x60, 0xbb, 0x74, 0xa7, 0x0b } },
-	  { { 0x21, 0x13, 0x91, 0xbf, 0x77, 0x7a, 0x33, 0xbc, 0xe9, 0x07, 0x39, 0x0a, 0xdd, 0x7d, 0x06, 0x10, 0x9a, 0xee, 0x47, 0x73, 0x1b, 0x15, 0x5a, 0xfb, 0xcd, 0x4d, 0xd0, 0xd2, 0x3a, 0x01, 0xba, 0x54 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x48, 0xd5, 0x39, 0x4a, 0x0b, 0x20, 0x6a, 0x43, 0xa0, 0x07, 0x82, 0x5e, 0x49, 0x7c, 0xc9, 0x47, 0xf1, 0x7c, 0x37, 0xb9, 0x23, 0xef, 0x6b, 0x46, 0x45, 0x8c, 0x45, 0x76, 0xdf, 0x14, 0x6b, 0x6e } },
-	  { { 0x42, 0xc9, 0xca, 0x29, 0x4c, 0x76, 0x37, 0xda, 0x8a, 0x2d, 0x7c, 0x3a, 0x58, 0xf2, 0x03, 0xb4, 0xb5, 0xb9, 0x1a, 0x13, 0x2d, 0xde, 0x5f, 0x6b, 0x9d, 0xba, 0x52, 0xc9, 0x5d, 0xb3, 0xf3, 0x30 } } },
-	{ { { 0x4c, 0x6f, 0xfe, 0x6b, 0x0c, 0x62, 0xd7, 0x48, 0x71, 0xef, 0xb1, 0x85, 0x79, 0xc0, 0xed, 0x24, 0xb1, 0x08, 0x93, 0x76, 0x8e, 0xf7, 0x38, 0x8e, 0xeb, 0xfe, 0x80, 0x40, 0xaf, 0x90, 0x64, 0x49 } },
-	  { { 0x4a, 0x88, 0xda, 0xc1, 0x98, 0x44, 0x3c, 0x53, 0x4e, 0xdb, 0x4b, 0xb9, 0x12, 0x5f, 0xcd, 0x08, 0x04, 0xef, 0x75, 0xe7, 0xb1, 0x3a, 0xe5, 0x07, 0xfa, 0xca, 0x65, 0x7b, 0x72, 0x10, 0x64, 0x7f } } },
-	{ { { 0x3d, 0x81, 0xf0, 0xeb, 0x16, 0xfd, 0x58, 0x33, 0x8d, 0x7c, 0x1a, 0xfb, 0x20, 0x2c, 0x8a, 0xee, 0x90, 0xbb, 0x33, 0x6d, 0x45, 0xe9, 0x8e, 0x99, 0x85, 0xe1, 0x08, 0x1f, 0xc5, 0xf1, 0xb5, 0x46 } },
-	  { { 0xe4, 0xe7, 0x43, 0x4b, 0xa0, 0x3f, 0x2b, 0x06, 0xba, 0x17, 0xae, 0x3d, 0xe6, 0xce, 0xbd, 0xb8, 0xed, 0x74, 0x11, 0x35, 0xec, 0x96, 0xfe, 0x31, 0xe3, 0x0e, 0x7a, 0x4e, 0xc9, 0x1d, 0xcb, 0x20 } } },
-	{ { { 0xe0, 0x67, 0xe9, 0x7b, 0xdb, 0x96, 0x5c, 0xb0, 0x32, 0xd0, 0x59, 0x31, 0x90, 0xdc, 0x92, 0x97, 0xac, 0x09, 0x38, 0x31, 0x0f, 0x7e, 0xd6, 0x5d, 0xd0, 0x06, 0xb6, 0x1f, 0xea, 0xf0, 0x5b, 0x07 } },
-	  { { 0x81, 0x9f, 0xc7, 0xde, 0x6b, 0x41, 0x22, 0x35, 0x14, 0x67, 0x77, 0x3e, 0x90, 0x81, 0xb0, 0xd9, 0x85, 0x4c, 0xca, 0x9b, 0x3f, 0x04, 0x59, 0xd6, 0xaa, 0x17, 0xc3, 0x88, 0x34, 0x37, 0xba, 0x43 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x4c, 0xb6, 0x69, 0xc8, 0x81, 0x95, 0x94, 0x33, 0x92, 0x34, 0xe9, 0x3c, 0x84, 0x0d, 0x3d, 0x5a, 0x37, 0x9c, 0x22, 0xa0, 0xaa, 0x65, 0xce, 0xb4, 0xc2, 0x2d, 0x66, 0x67, 0x02, 0xff, 0x74, 0x10 } },
-	  { { 0x22, 0xb0, 0xd5, 0xe6, 0xc7, 0xef, 0xb1, 0xa7, 0x13, 0xda, 0x60, 0xb4, 0x80, 0xc1, 0x42, 0x7d, 0x10, 0x70, 0x97, 0x04, 0x4d, 0xda, 0x23, 0x89, 0xc2, 0x0e, 0x68, 0xcb, 0xde, 0xe0, 0x9b, 0x29 } } },
-	{ { { 0x33, 0xfe, 0x42, 0x2a, 0x36, 0x2b, 0x2e, 0x36, 0x64, 0x5c, 0x8b, 0xcc, 0x81, 0x6a, 0x15, 0x08, 0xa1, 0x27, 0xe8, 0x57, 0xe5, 0x78, 0x8e, 0xf2, 0x58, 0x19, 0x12, 0x42, 0xae, 0xc4, 0x63, 0x3e } },
-	  { { 0x78, 0x96, 0x9c, 0xa7, 0xca, 0x80, 0xae, 0x02, 0x85, 0xb1, 0x7c, 0x04, 0x5c, 0xc1, 0x5b, 0x26, 0xc1, 0xba, 0xed, 0xa5, 0x59, 0x70, 0x85, 0x8c, 0x8c, 0xe8, 0x87, 0xac, 0x6a, 0x28, 0x99, 0x35 } } },
-	{ { { 0x9f, 0x04, 0x08, 0x28, 0xbe, 0x87, 0xda, 0x80, 0x28, 0x38, 0xde, 0x9f, 0xcd, 0xe4, 0xe3, 0x62, 0xfb, 0x2e, 0x46, 0x8d, 0x01, 0xb3, 0x06, 0x51, 0xd4, 0x19, 0x3b, 0x11, 0xfa, 0xe2, 0xad, 0x1e } },
-	  { { 0xa0, 0x20, 0x99, 0x69, 0x0a, 0xae, 0xa3, 0x70, 0x4e, 0x64, 0x80, 0xb7, 0x85, 0x9c, 0x87, 0x54, 0x43, 0x43, 0x55, 0x80, 0x6d, 0x8d, 0x7c, 0xa9, 0x64, 0xca, 0x6c, 0x2e, 0x21, 0xd8, 0xc8, 0x6c } } },
-	{ { { 0x91, 0x4a, 0x07, 0xad, 0x08, 0x75, 0xc1, 0x4f, 0xa4, 0xb2, 0xc3, 0x6f, 0x46, 0x3e, 0xb1, 0xce, 0x52, 0xab, 0x67, 0x09, 0x54, 0x48, 0x6b, 0x6c, 0xd7, 0x1d, 0x71, 0x76, 0xcb, 0xff, 0xdd, 0x31 } },
-	  { { 0x36, 0x88, 0xfa, 0xfd, 0xf0, 0x36, 0x6f, 0x07, 0x74, 0x88, 0x50, 0xd0, 0x95, 0x38, 0x4a, 0x48, 0x2e, 0x07, 0x64, 0x97, 0x11, 0x76, 0x01, 0x1a, 0x27, 0x4d, 0x8e, 0x25, 0x9a, 0x9b, 0x1c, 0x22 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xbe, 0x57, 0xbd, 0x0e, 0x0f, 0xac, 0x5e, 0x76, 0xa3, 0x71, 0xad, 0x2b, 0x10, 0x45, 0x02, 0xec, 0x59, 0xd5, 0x5d, 0xa9, 0x44, 0xcc, 0x25, 0x4c, 0xb3, 0x3c, 0x5b, 0x69, 0x07, 0x55, 0x26, 0x6b } },
-	  { { 0x30, 0x6b, 0xd4, 0xa7, 0x51, 0x29, 0xe3, 0xf9, 0x7a, 0x75, 0x2a, 0x82, 0x2f, 0xd6, 0x1d, 0x99, 0x2b, 0x80, 0xd5, 0x67, 0x1e, 0x15, 0x9d, 0xca, 0xfd, 0xeb, 0xac, 0x97, 0x35, 0x09, 0x7f, 0x3f } } },
-	{ { { 0x35, 0x0d, 0x34, 0x0a, 0xb8, 0x67, 0x56, 0x29, 0x20, 0xf3, 0x19, 0x5f, 0xe2, 0x83, 0x42, 0x73, 0x53, 0xa8, 0xc5, 0x02, 0x19, 0x33, 0xb4, 0x64, 0xbd, 0xc3, 0x87, 0x8c, 0xd7, 0x76, 0xed, 0x25 } },
-	  { { 0x47, 0x39, 0x37, 0x76, 0x0d, 0x1d, 0x0c, 0xf5, 0x5a, 0x6d, 0x43, 0x88, 0x99, 0x15, 0xb4, 0x52, 0x0f, 0x2a, 0xb3, 0xb0, 0x3f, 0xa6, 0xb3, 0x26, 0xb3, 0xc7, 0x45, 0xf5, 0x92, 0x5f, 0x9b, 0x17 } } },
-	{ { { 0x9d, 0x23, 0xbd, 0x15, 0xfe, 0x52, 0x52, 0x15, 0x26, 0x79, 0x86, 0xba, 0x06, 0x56, 0x66, 0xbb, 0x8c, 0x2e, 0x10, 0x11, 0xd5, 0x4a, 0x18, 0x52, 0xda, 0x84, 0x44, 0xf0, 0x3e, 0xe9, 0x8c, 0x35 } },
-	  { { 0xad, 0xa0, 0x41, 0xec, 0xc8, 0x4d, 0xb9, 0xd2, 0x6e, 0x96, 0x4e, 0x5b, 0xc5, 0xc2, 0xa0, 0x1b, 0xcf, 0x0c, 0xbf, 0x17, 0x66, 0x57, 0xc1, 0x17, 0x90, 0x45, 0x71, 0xc2, 0xe1, 0x24, 0xeb, 0x27 } } },
-	{ { { 0x2c, 0xb9, 0x42, 0xa4, 0xaf, 0x3b, 0x42, 0x0e, 0xc2, 0x0f, 0xf2, 0xea, 0x83, 0xaf, 0x9a, 0x13, 0x17, 0xb0, 0xbd, 0x89, 0x17, 0xe3, 0x72, 0xcb, 0x0e, 0x76, 0x7e, 0x41, 0x63, 0x04, 0x88, 0x71 } },
-	  { { 0x75, 0x78, 0x38, 0x86, 0x57, 0xdd, 0x9f, 0xee, 0x54, 0x70, 0x65, 0xbf, 0xf1, 0x2c, 0xe0, 0x39, 0x0d, 0xe3, 0x89, 0xfd, 0x8e, 0x93, 0x4f, 0x43, 0xdc, 0xd5, 0x5b, 0xde, 0xf9, 0x98, 0xe5, 0x7b } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xe7, 0x3b, 0x65, 0x11, 0xdf, 0xb2, 0xf2, 0x63, 0x94, 0x12, 0x6f, 0x5c, 0x9e, 0x77, 0xc1, 0xb6, 0xd8, 0xab, 0x58, 0x7a, 0x1d, 0x95, 0x73, 0xdd, 0xe7, 0xe3, 0x6f, 0xf2, 0x03, 0x1d, 0xdb, 0x76 } },
-	  { { 0xae, 0x06, 0x4e, 0x2c, 0x52, 0x1b, 0xbc, 0x5a, 0x5a, 0xa5, 0xbe, 0x27, 0xbd, 0xeb, 0xe1, 0x14, 0x17, 0x68, 0x26, 0x07, 0x03, 0xd1, 0x18, 0x0b, 0xdf, 0xf1, 0x06, 0x5c, 0xa6, 0x1b, 0xb9, 0x24 } } },
-	{ { { 0xc5, 0x66, 0x80, 0x13, 0x0e, 0x48, 0x8c, 0x87, 0x31, 0x84, 0xb4, 0x60, 0xed, 0xc5, 0xec, 0xb6, 0xc5, 0x05, 0x33, 0x5f, 0x2f, 0x7d, 0x40, 0xb6, 0x32, 0x1d, 0x38, 0x74, 0x1b, 0xf1, 0x09, 0x3d } },
-	  { { 0xd4, 0x69, 0x82, 0xbc, 0x8d, 0xf8, 0x34, 0x36, 0x75, 0x55, 0x18, 0x55, 0x58, 0x3c, 0x79, 0xaf, 0x26, 0x80, 0xab, 0x9b, 0x95, 0x00, 0xf1, 0xcb, 0xda, 0xc1, 0x9f, 0xf6, 0x2f, 0xa2, 0xf4, 0x45 } } },
-	{ { { 0x17, 0xbe, 0xeb, 0x85, 0xed, 0x9e, 0xcd, 0x56, 0xf5, 0x17, 0x45, 0x42, 0xb4, 0x1f, 0x44, 0x4c, 0x05, 0x74, 0x15, 0x47, 0x00, 0xc6, 0x6a, 0x3d, 0x24, 0x09, 0x0d, 0x58, 0xb1, 0x42, 0xd7, 0x04 } },
-	  { { 0x8d, 0xbd, 0xa3, 0xc4, 0x06, 0x9b, 0x1f, 0x90, 0x58, 0x60, 0x74, 0xb2, 0x00, 0x3b, 0x3c, 0xd2, 0xda, 0x82, 0xbb, 0x10, 0x90, 0x69, 0x92, 0xa9, 0xb4, 0x30, 0x81, 0xe3, 0x7c, 0xa8, 0x89, 0x45 } } },
-	{ { { 0x3f, 0xdc, 0x05, 0xcb, 0x41, 0x3c, 0xc8, 0x23, 0x04, 0x2c, 0x38, 0x99, 0xe3, 0x68, 0x55, 0xf9, 0xd3, 0x32, 0xc7, 0xbf, 0xfa, 0xd4, 0x1b, 0x5d, 0xde, 0xdc, 0x10, 0x42, 0xc0, 0x42, 0xd9, 0x75 } },
-	  { { 0x2d, 0xab, 0x35, 0x4e, 0x87, 0xc4, 0x65, 0x97, 0x67, 0x24, 0xa4, 0x47, 0xad, 0x3f, 0x8e, 0xf3, 0xcb, 0x31, 0x17, 0x77, 0xc5, 0xe2, 0xd7, 0x8f, 0x3c, 0xc1, 0xcd, 0x56, 0x48, 0xc1, 0x6c, 0x69 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x14, 0xae, 0x5f, 0x88, 0x7b, 0xa5, 0x90, 0xdf, 0x10, 0xb2, 0x8b, 0x5e, 0x24, 0x17, 0xc3, 0xa3, 0xd4, 0x0f, 0x92, 0x61, 0x1a, 0x19, 0x5a, 0xad, 0x76, 0xbd, 0xd8, 0x1c, 0xdd, 0xe0, 0x12, 0x6d } },
-	  { { 0x8e, 0xbd, 0x70, 0x8f, 0x02, 0xa3, 0x24, 0x4d, 0x5a, 0x67, 0xc4, 0xda, 0xf7, 0x20, 0x0f, 0x81, 0x5b, 0x7a, 0x05, 0x24, 0x67, 0x83, 0x0b, 0x2a, 0x80, 0xe7, 0xfd, 0x74, 0x4b, 0x9e, 0x5c, 0x0d } } },
-	{ { { 0x94, 0xd5, 0x5f, 0x1f, 0xa2, 0xfb, 0xeb, 0xe1, 0x07, 0x34, 0xf8, 0x20, 0xad, 0x81, 0x30, 0x06, 0x2d, 0xa1, 0x81, 0x95, 0x36, 0xcf, 0x11, 0x0b, 0xaf, 0xc1, 0x2b, 0x9a, 0x6c, 0x55, 0xc1, 0x16 } },
-	  { { 0x36, 0x4f, 0xf1, 0x5e, 0x74, 0x35, 0x13, 0x28, 0xd7, 0x11, 0xcf, 0xb8, 0xde, 0x93, 0xb3, 0x05, 0xb8, 0xb5, 0x73, 0xe9, 0xeb, 0xad, 0x19, 0x1e, 0x89, 0x0f, 0x8b, 0x15, 0xd5, 0x8c, 0xe3, 0x23 } } },
-	{ { { 0x33, 0x79, 0xe7, 0x18, 0xe6, 0x0f, 0x57, 0x93, 0x15, 0xa0, 0xa7, 0xaa, 0xc4, 0xbf, 0x4f, 0x30, 0x74, 0x95, 0x5e, 0x69, 0x4a, 0x5b, 0x45, 0xe4, 0x00, 0xeb, 0x23, 0x74, 0x4c, 0xdf, 0x6b, 0x45 } },
-	  { { 0x97, 0x29, 0x6c, 0xc4, 0x42, 0x0b, 0xdd, 0xc0, 0x29, 0x5c, 0x9b, 0x34, 0x97, 0xd0, 0xc7, 0x79, 0x80, 0x63, 0x74, 0xe4, 0x8e, 0x37, 0xb0, 0x2b, 0x7c, 0xe8, 0x68, 0x6c, 0xc3, 0x82, 0x97, 0x57 } } },
-	{ { { 0x22, 0xbe, 0x83, 0xb6, 0x4b, 0x80, 0x6b, 0x43, 0x24, 0x5e, 0xef, 0x99, 0x9b, 0xa8, 0xfc, 0x25, 0x8d, 0x3b, 0x03, 0x94, 0x2b, 0x3e, 0xe7, 0x95, 0x76, 0x9b, 0xcc, 0x15, 0xdb, 0x32, 0xe6, 0x66 } },
-	  { { 0x84, 0xf0, 0x4a, 0x13, 0xa6, 0xd6, 0xfa, 0x93, 0x46, 0x07, 0xf6, 0x7e, 0x5c, 0x6d, 0x5e, 0xf6, 0xa6, 0xe7, 0x48, 0xf0, 0x06, 0xea, 0xff, 0x90, 0xc1, 0xcc, 0x4c, 0x19, 0x9c, 0x3c, 0x4e, 0x53 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x2a, 0x50, 0xe3, 0x07, 0x15, 0x59, 0xf2, 0x8b, 0x81, 0xf2, 0xf3, 0xd3, 0x6c, 0x99, 0x8c, 0x70, 0x67, 0xec, 0xcc, 0xee, 0x9e, 0x59, 0x45, 0x59, 0x7d, 0x47, 0x75, 0x69, 0xf5, 0x24, 0x93, 0x5d } },
-	  { { 0x6a, 0x4f, 0x1b, 0xbe, 0x6b, 0x30, 0xcf, 0x75, 0x46, 0xe3, 0x7b, 0x9d, 0xfc, 0xcd, 0xd8, 0x5c, 0x1f, 0xb4, 0xc8, 0xe2, 0x24, 0xec, 0x1a, 0x28, 0x05, 0x32, 0x57, 0xfd, 0x3c, 0x5a, 0x98, 0x10 } } },
-	{ { { 0xa3, 0xdb, 0xf7, 0x30, 0xd8, 0xc2, 0x9a, 0xe1, 0xd3, 0xce, 0x22, 0xe5, 0x80, 0x1e, 0xd9, 0xe4, 0x1f, 0xab, 0xc0, 0x71, 0x1a, 0x86, 0x0e, 0x27, 0x99, 0x5b, 0xfa, 0x76, 0x99, 0xb0, 0x08, 0x3c } },
-	  { { 0x2a, 0x93, 0xd2, 0x85, 0x1b, 0x6a, 0x5d, 0xa6, 0xee, 0xd1, 0xd1, 0x33, 0xbd, 0x6a, 0x36, 0x73, 0x37, 0x3a, 0x44, 0xb4, 0xec, 0xa9, 0x7a, 0xde, 0x83, 0x40, 0xd7, 0xdf, 0x28, 0xba, 0xa2, 0x30 } } },
-	{ { { 0xd3, 0xb5, 0x6d, 0x05, 0x3f, 0x9f, 0xf3, 0x15, 0x8d, 0x7c, 0xca, 0xc9, 0xfc, 0x8a, 0x7c, 0x94, 0xb0, 0x63, 0x36, 0x9b, 0x78, 0xd1, 0x91, 0x1f, 0x93, 0xd8, 0x57, 0x43, 0xde, 0x76, 0xa3, 0x43 } },
-	  { { 0x9b, 0x35, 0xe2, 0xa9, 0x3d, 0x32, 0x1e, 0xbb, 0x16, 0x28, 0x70, 0xe9, 0x45, 0x2f, 0x8f, 0x70, 0x7f, 0x08, 0x7e, 0x53, 0xc4, 0x7a, 0xbf, 0xf7, 0xe1, 0xa4, 0x6a, 0xd8, 0xac, 0x64, 0x1b, 0x11 } } },
-	{ { { 0xb2, 0xeb, 0x47, 0x46, 0x18, 0x3e, 0x1f, 0x99, 0x0c, 0xcc, 0xf1, 0x2c, 0xe0, 0xe7, 0x8f, 0xe0, 0x01, 0x7e, 0x65, 0xb8, 0x0c, 0xd0, 0xfb, 0xc8, 0xb9, 0x90, 0x98, 0x33, 0x61, 0x3b, 0xd8, 0x27 } },
-	  { { 0xa0, 0xbe, 0x72, 0x3a, 0x50, 0x4b, 0x74, 0xab, 0x01, 0xc8, 0x93, 0xc5, 0xe4, 0xc7, 0x08, 0x6c, 0xb4, 0xca, 0xee, 0xeb, 0x8e, 0xd7, 0x4e, 0x26, 0xc6, 0x1d, 0xe2, 0x71, 0xaf, 0x89, 0xa0, 0x2a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x98, 0x0b, 0xe4, 0xde, 0xdb, 0xa8, 0xfa, 0x82, 0x74, 0x06, 0x52, 0x6d, 0x08, 0x52, 0x8a, 0xff, 0x62, 0xc5, 0x6a, 0x44, 0x0f, 0x51, 0x8c, 0x1f, 0x6e, 0xb6, 0xc6, 0x2c, 0x81, 0xd3, 0x76, 0x46 } },
-	  { { 0xf4, 0x29, 0x74, 0x2e, 0x80, 0xa7, 0x1a, 0x8f, 0xf6, 0xbd, 0xd6, 0x8e, 0xbf, 0xc1, 0x95, 0x2a, 0xeb, 0xa0, 0x7f, 0x45, 0xa0, 0x50, 0x14, 0x05, 0xb1, 0x57, 0x4c, 0x74, 0xb7, 0xe2, 0x89, 0x7d } } },
-	{ { { 0x07, 0xee, 0xa7, 0xad, 0xb7, 0x09, 0x0b, 0x49, 0x4e, 0xbf, 0xca, 0xe5, 0x21, 0xe6, 0xe6, 0xaf, 0xd5, 0x67, 0xf3, 0xce, 0x7e, 0x7c, 0x93, 0x7b, 0x5a, 0x10, 0x12, 0x0e, 0x6c, 0x06, 0x11, 0x75 } },
-	  { { 0xd5, 0xfc, 0x86, 0xa3, 0x3b, 0xa3, 0x3e, 0x0a, 0xfb, 0x0b, 0xf7, 0x36, 0xb1, 0x5b, 0xda, 0x70, 0xb7, 0x00, 0xa7, 0xda, 0x88, 0x8f, 0x84, 0xa8, 0xbc, 0x1c, 0x39, 0xb8, 0x65, 0xf3, 0x4d, 0x60 } } },
-	{ { { 0x96, 0x9d, 0x31, 0xf4, 0xa2, 0xbe, 0x81, 0xb9, 0xa5, 0x59, 0x9e, 0xba, 0x07, 0xbe, 0x74, 0x58, 0xd8, 0xeb, 0xc5, 0x9f, 0x3d, 0xd1, 0xf4, 0xae, 0xce, 0x53, 0xdf, 0x4f, 0xc7, 0x2a, 0x89, 0x4d } },
-	  { { 0x29, 0xd8, 0xf2, 0xaa, 0xe9, 0x0e, 0xf7, 0x2e, 0x5f, 0x9d, 0x8a, 0x5b, 0x09, 0xed, 0xc9, 0x24, 0x22, 0xf4, 0x0f, 0x25, 0x8f, 0x1c, 0x84, 0x6e, 0x34, 0x14, 0x6c, 0xea, 0xb3, 0x86, 0x5d, 0x04 } } },
-	{ { { 0x07, 0x98, 0x61, 0xe8, 0x6a, 0xd2, 0x81, 0x49, 0x25, 0xd5, 0x5b, 0x18, 0xc7, 0x35, 0x52, 0x51, 0xa4, 0x46, 0xad, 0x18, 0x0d, 0xc9, 0x5f, 0x18, 0x91, 0x3b, 0xb4, 0xc0, 0x60, 0x59, 0x8d, 0x66 } },
-	  { { 0x03, 0x1b, 0x79, 0x53, 0x6e, 0x24, 0xae, 0x57, 0xd9, 0x58, 0x09, 0x85, 0x48, 0xa2, 0xd3, 0xb5, 0xe2, 0x4d, 0x11, 0x82, 0xe6, 0x86, 0x3c, 0xe9, 0xb1, 0x00, 0x19, 0xc2, 0x57, 0xf7, 0x66, 0x7a } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x0f, 0xe3, 0x89, 0x03, 0xd7, 0x22, 0x95, 0x9f, 0xca, 0xb4, 0x8d, 0x9e, 0x6d, 0x97, 0xff, 0x8d, 0x21, 0x59, 0x07, 0xef, 0x03, 0x2d, 0x5e, 0xf8, 0x44, 0x46, 0xe7, 0x85, 0x80, 0xc5, 0x89, 0x50 } },
-	  { { 0x8b, 0xd8, 0x53, 0x86, 0x24, 0x86, 0x29, 0x52, 0x01, 0xfa, 0x20, 0xc3, 0x4e, 0x95, 0xcb, 0xad, 0x7b, 0x34, 0x94, 0x30, 0xb7, 0x7a, 0xfa, 0x96, 0x41, 0x60, 0x2b, 0xcb, 0x59, 0xb9, 0xca, 0x50 } } },
-	{ { { 0xc2, 0x5b, 0x9b, 0x78, 0x23, 0x1b, 0x3a, 0x88, 0x94, 0x5f, 0x0a, 0x9b, 0x98, 0x2b, 0x6e, 0x53, 0x11, 0xf6, 0xff, 0xc6, 0x7d, 0x42, 0xcc, 0x02, 0x80, 0x40, 0x0d, 0x1e, 0xfb, 0xaf, 0x61, 0x07 } },
-	  { { 0xb0, 0xe6, 0x2f, 0x81, 0x70, 0xa1, 0x2e, 0x39, 0x04, 0x7c, 0xc4, 0x2c, 0x87, 0x45, 0x4a, 0x5b, 0x69, 0x97, 0xac, 0x6d, 0x2c, 0x10, 0x42, 0x7c, 0x3b, 0x15, 0x70, 0x60, 0x0e, 0x11, 0x6d, 0x3a } } },
-	{ { { 0x9b, 0x18, 0x80, 0x5e, 0xdb, 0x05, 0xbd, 0xc6, 0xb7, 0x3c, 0xc2, 0x40, 0x4d, 0x5d, 0xce, 0x97, 0x8a, 0x34, 0x15, 0xab, 0x28, 0x5d, 0x10, 0xf0, 0x37, 0x0c, 0xcc, 0x16, 0xfa, 0x1f, 0x33, 0x0d } },
-	  { { 0x19, 0xf9, 0x35, 0xaa, 0x59, 0x1a, 0x0c, 0x5c, 0x06, 0xfc, 0x6a, 0x0b, 0x97, 0x53, 0x36, 0xfc, 0x2a, 0xa5, 0x5a, 0x9b, 0x30, 0xef, 0x23, 0xaf, 0x39, 0x5d, 0x9a, 0x6b, 0x75, 0x57, 0x48, 0x0b } } },
-	{ { { 0x26, 0xdc, 0x76, 0x3b, 0xfc, 0xf9, 0x9c, 0x3f, 0x89, 0x0b, 0x62, 0x53, 0xaf, 0x83, 0x01, 0x2e, 0xbc, 0x6a, 0xc6, 0x03, 0x0d, 0x75, 0x2a, 0x0d, 0xe6, 0x94, 0x54, 0xcf, 0xb3, 0xe5, 0x96, 0x25 } },
-	  { { 0xfe, 0x82, 0xb1, 0x74, 0x31, 0x8a, 0xa7, 0x6f, 0x56, 0xbd, 0x8d, 0xf4, 0xe0, 0x94, 0x51, 0x59, 0xde, 0x2c, 0x5a, 0xf4, 0x84, 0x6b, 0x4a, 0x88, 0x93, 0xc0, 0x0c, 0x9a, 0xac, 0xa7, 0xa0, 0x68 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x25, 0x0d, 0xd6, 0xc7, 0x23, 0x47, 0x10, 0xad, 0xc7, 0x08, 0x5c, 0x87, 0x87, 0x93, 0x98, 0x18, 0xb8, 0xd3, 0x9c, 0xac, 0x5a, 0x3d, 0xc5, 0x75, 0xf8, 0x49, 0x32, 0x14, 0xcc, 0x51, 0x96, 0x24 } },
-	  { { 0x65, 0x9c, 0x5d, 0xf0, 0x37, 0x04, 0xf0, 0x34, 0x69, 0x2a, 0xf0, 0xa5, 0x64, 0xca, 0xde, 0x2b, 0x5b, 0x15, 0x10, 0xd2, 0xab, 0x06, 0xdd, 0xc4, 0xb0, 0xb6, 0x5b, 0xc1, 0x17, 0xdf, 0x8f, 0x02 } } },
-	{ { { 0xbd, 0x59, 0x3d, 0xbf, 0x5c, 0x31, 0x44, 0x2c, 0x32, 0x94, 0x04, 0x60, 0x84, 0x0f, 0xad, 0x00, 0xb6, 0x8f, 0xc9, 0x1d, 0xcc, 0x5c, 0xa2, 0x49, 0x0e, 0x50, 0x91, 0x08, 0x9a, 0x43, 0x55, 0x05 } },
-	  { { 0x5d, 0x93, 0x55, 0xdf, 0x9b, 0x12, 0x19, 0xec, 0x93, 0x85, 0x42, 0x9e, 0x66, 0x0f, 0x9d, 0xaf, 0x99, 0xaf, 0x26, 0x89, 0xbc, 0x61, 0xfd, 0xff, 0xce, 0x4b, 0xf4, 0x33, 0x95, 0xc9, 0x35, 0x58 } } },
-	{ { { 0x12, 0x55, 0xf9, 0xda, 0xcb, 0x44, 0xa7, 0xdc, 0x57, 0xe2, 0xf9, 0x9a, 0xe6, 0x07, 0x23, 0x60, 0x54, 0xa7, 0x39, 0xa5, 0x9b, 0x84, 0x56, 0x6e, 0xaa, 0x8b, 0x8f, 0xb0, 0x2c, 0x87, 0xaf, 0x67 } },
-	  { { 0x00, 0xa9, 0x4c, 0xb2, 0x12, 0xf8, 0x32, 0xa8, 0x7a, 0x00, 0x4b, 0x49, 0x32, 0xba, 0x1f, 0x5d, 0x44, 0x8e, 0x44, 0x7a, 0xdc, 0x11, 0xfb, 0x39, 0x08, 0x57, 0x87, 0xa5, 0x12, 0x42, 0x93, 0x0e } } },
-	{ { { 0x17, 0xb4, 0xae, 0x72, 0x59, 0xd0, 0xaa, 0xa8, 0x16, 0x8b, 0x63, 0x11, 0xb3, 0x43, 0x04, 0xda, 0x0c, 0xa8, 0xb7, 0x68, 0xdd, 0x4e, 0x54, 0xe7, 0xaf, 0x5d, 0x5d, 0x05, 0x76, 0x36, 0xec, 0x0d } },
-	  { { 0x6d, 0x7c, 0x82, 0x32, 0x38, 0x55, 0x57, 0x74, 0x5b, 0x7d, 0xc3, 0xc4, 0xfb, 0x06, 0x29, 0xf0, 0x13, 0x55, 0x54, 0xc6, 0xa7, 0xdc, 0x4c, 0x9f, 0x98, 0x49, 0x20, 0xa8, 0xc3, 0x8d, 0xfa, 0x48 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x87, 0x47, 0x9d, 0xe9, 0x25, 0xd5, 0xe3, 0x47, 0x78, 0xdf, 0x85, 0xa7, 0x85, 0x5e, 0x7a, 0x4c, 0x5f, 0x79, 0x1a, 0xf3, 0xa2, 0xb2, 0x28, 0xa0, 0x9c, 0xdd, 0x30, 0x40, 0xd4, 0x38, 0xbd, 0x28 } },
-	  { { 0xfc, 0xbb, 0xd5, 0x78, 0x6d, 0x1d, 0xd4, 0x99, 0xb4, 0xaa, 0x44, 0x44, 0x7a, 0x1b, 0xd8, 0xfe, 0xb4, 0x99, 0xb9, 0xcc, 0xe7, 0xc4, 0xd3, 0x3a, 0x73, 0x83, 0x41, 0x5c, 0x40, 0xd7, 0x2d, 0x55 } } },
-	{ { { 0x26, 0xe1, 0x7b, 0x5f, 0xe5, 0xdc, 0x3f, 0x7d, 0xa1, 0xa7, 0x26, 0x44, 0x22, 0x23, 0xc0, 0x8f, 0x7d, 0xf1, 0xb5, 0x11, 0x47, 0x7b, 0x19, 0xd4, 0x75, 0x6f, 0x1e, 0xa5, 0x27, 0xfe, 0xc8, 0x0e } },
-	  { { 0xd3, 0x11, 0x3d, 0xab, 0xef, 0x2c, 0xed, 0xb1, 0x3d, 0x7c, 0x32, 0x81, 0x6b, 0xfe, 0xf8, 0x1c, 0x3c, 0x7b, 0xc0, 0x61, 0xdf, 0xb8, 0x75, 0x76, 0x7f, 0xaa, 0xd8, 0x93, 0xaf, 0x3d, 0xe8, 0x3d } } },
-	{ { { 0xfd, 0x5b, 0x4e, 0x8d, 0xb6, 0x7e, 0x82, 0x9b, 0xef, 0xce, 0x04, 0x69, 0x51, 0x52, 0xff, 0xef, 0xa0, 0x52, 0xb5, 0x79, 0x17, 0x5e, 0x2f, 0xde, 0xd6, 0x3c, 0x2d, 0xa0, 0x43, 0xb4, 0x0b, 0x19 } },
-	  { { 0xc0, 0x61, 0x48, 0x48, 0x17, 0xf4, 0x9e, 0x18, 0x51, 0x2d, 0xea, 0x2f, 0xf2, 0xf2, 0xe0, 0xa3, 0x14, 0xb7, 0x8b, 0x3a, 0x30, 0xf5, 0x81, 0xc1, 0x5d, 0x71, 0x39, 0x62, 0x55, 0x1f, 0x60, 0x5a } } },
-	{ { { 0xe5, 0x89, 0x8a, 0x76, 0x6c, 0xdb, 0x4d, 0x0a, 0x5b, 0x72, 0x9d, 0x59, 0x6e, 0x63, 0x63, 0x18, 0x7c, 0xe3, 0xfa, 0xe2, 0xdb, 0xa1, 0x8d, 0xf4, 0xa5, 0xd7, 0x16, 0xb2, 0xd0, 0xb3, 0x3f, 0x39 } },
-	  { { 0xce, 0x60, 0x09, 0x6c, 0xf5, 0x76, 0x17, 0x24, 0x80, 0x3a, 0x96, 0xc7, 0x94, 0x2e, 0xf7, 0x6b, 0xef, 0xb5, 0x05, 0x96, 0xef, 0xd3, 0x7b, 0x51, 0xda, 0x05, 0x44, 0x67, 0xbc, 0x07, 0x21, 0x4e } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xe9, 0x73, 0x6f, 0x21, 0xb9, 0xde, 0x22, 0x7d, 0xeb, 0x97, 0x31, 0x10, 0xa3, 0xea, 0xe1, 0xc6, 0x37, 0xeb, 0x8f, 0x43, 0x58, 0xde, 0x41, 0x64, 0x0e, 0x3e, 0x07, 0x99, 0x3d, 0xf1, 0xdf, 0x1e } },
-	  { { 0xf8, 0xad, 0x43, 0xc2, 0x17, 0x06, 0xe2, 0xe4, 0xa9, 0x86, 0xcd, 0x18, 0xd7, 0x78, 0xc8, 0x74, 0x66, 0xd2, 0x09, 0x18, 0xa5, 0xf1, 0xca, 0xa6, 0x62, 0x92, 0xc1, 0xcb, 0x00, 0xeb, 0x42, 0x2e } } },
-	{ { { 0x7b, 0x34, 0x24, 0x4c, 0xcf, 0x38, 0xe5, 0x6c, 0x0a, 0x01, 0x2c, 0x22, 0x0b, 0x24, 0x38, 0xad, 0x24, 0x7e, 0x19, 0xf0, 0x6c, 0xf9, 0x31, 0xf4, 0x35, 0x11, 0xf6, 0x46, 0x33, 0x3a, 0x23, 0x59 } },
-	  { { 0x20, 0x0b, 0xa1, 0x08, 0x19, 0xad, 0x39, 0x54, 0xea, 0x3e, 0x23, 0x09, 0xb6, 0xe2, 0xd2, 0xbc, 0x4d, 0xfc, 0x9c, 0xf0, 0x13, 0x16, 0x22, 0x3f, 0xb9, 0xd2, 0x11, 0x86, 0x90, 0x55, 0xce, 0x3c } } },
-	{ { { 0xc4, 0x0b, 0x4b, 0x62, 0x99, 0x37, 0x84, 0x3f, 0x74, 0xa2, 0xf9, 0xce, 0xe2, 0x0b, 0x0f, 0x2a, 0x3d, 0xa3, 0xe3, 0xdb, 0x5a, 0x9d, 0x93, 0xcc, 0xa5, 0xef, 0x82, 0x91, 0x1d, 0xe6, 0x6c, 0x68 } },
-	  { { 0xa3, 0x64, 0x17, 0x9b, 0x8b, 0xc8, 0x3a, 0x61, 0xe6, 0x9d, 0xc6, 0xed, 0x7b, 0x03, 0x52, 0x26, 0x9d, 0x3a, 0xb3, 0x13, 0xcc, 0x8a, 0xfd, 0x2c, 0x1a, 0x1d, 0xed, 0x13, 0xd0, 0x55, 0x57, 0x0e } } },
-	{ { { 0x1a, 0xea, 0xbf, 0xfd, 0x4a, 0x3c, 0x8e, 0xec, 0x29, 0x7e, 0x77, 0x77, 0x12, 0x99, 0xd7, 0x84, 0xf9, 0x55, 0x7f, 0xf1, 0x8b, 0xb4, 0xd2, 0x95, 0xa3, 0x8d, 0xf0, 0x8a, 0xa7, 0xeb, 0x82, 0x4b } },
-	  { { 0x2c, 0x28, 0xf4, 0x3a, 0xf6, 0xde, 0x0a, 0xe0, 0x41, 0x44, 0x23, 0xf8, 0x3f, 0x03, 0x64, 0x9f, 0xc3, 0x55, 0x4c, 0xc6, 0xc1, 0x94, 0x1c, 0x24, 0x5d, 0x5f, 0x92, 0x45, 0x96, 0x57, 0x37, 0x14 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xc1, 0xcd, 0x90, 0x66, 0xb9, 0x76, 0xa0, 0x5b, 0xa5, 0x85, 0x75, 0x23, 0xf9, 0x89, 0xa5, 0x82, 0xb2, 0x6f, 0xb1, 0xeb, 0xc4, 0x69, 0x6f, 0x18, 0x5a, 0xed, 0x94, 0x3d, 0x9d, 0xd9, 0x2c, 0x1a } },
-	  { { 0x35, 0xb0, 0xe6, 0x73, 0x06, 0xb7, 0x37, 0xe0, 0xf8, 0xb0, 0x22, 0xe8, 0xd2, 0xed, 0x0b, 0xef, 0xe6, 0xc6, 0x5a, 0x99, 0x9e, 0x1a, 0x9f, 0x04, 0x97, 0xe4, 0x4d, 0x0b, 0xbe, 0xba, 0x44, 0x40 } } },
-	{ { { 0xc1, 0x56, 0x96, 0x91, 0x5f, 0x1f, 0xbb, 0x54, 0x6f, 0x88, 0x89, 0x0a, 0xb2, 0xd6, 0x41, 0x42, 0x6a, 0x82, 0xee, 0x14, 0xaa, 0x76, 0x30, 0x65, 0x0f, 0x67, 0x39, 0xa6, 0x51, 0x7c, 0x49, 0x24 } },
-	  { { 0x35, 0xa3, 0x78, 0xd1, 0x11, 0x0f, 0x75, 0xd3, 0x70, 0x46, 0xdb, 0x20, 0x51, 0xcb, 0x92, 0x80, 0x54, 0x10, 0x74, 0x36, 0x86, 0xa9, 0xd7, 0xa3, 0x08, 0x78, 0xf1, 0x01, 0x29, 0xf8, 0x80, 0x3b } } },
-	{ { { 0xdb, 0xa7, 0x9d, 0x9d, 0xbf, 0xa0, 0xcc, 0xed, 0x53, 0xa2, 0xa2, 0x19, 0x39, 0x48, 0x83, 0x19, 0x37, 0x58, 0xd1, 0x04, 0x28, 0x40, 0xf7, 0x8a, 0xc2, 0x08, 0xb7, 0xa5, 0x42, 0xcf, 0x53, 0x4c } },
-	  { { 0xa7, 0xbb, 0xf6, 0x8e, 0xad, 0xdd, 0xf7, 0x90, 0xdd, 0x5f, 0x93, 0x89, 0xae, 0x04, 0x37, 0xe6, 0x9a, 0xb7, 0xe8, 0xc0, 0xdf, 0x16, 0x2a, 0xbf, 0xc4, 0x3a, 0x3c, 0x41, 0xd5, 0x89, 0x72, 0x5a } } },
-	{ { { 0x1f, 0x96, 0xff, 0x34, 0x2c, 0x13, 0x21, 0xcb, 0x0a, 0x89, 0x85, 0xbe, 0xb3, 0x70, 0x9e, 0x1e, 0xde, 0x97, 0xaf, 0x96, 0x30, 0xf7, 0x48, 0x89, 0x40, 0x8d, 0x07, 0xf1, 0x25, 0xf0, 0x30, 0x58 } },
-	  { { 0x1e, 0xd4, 0x93, 0x57, 0xe2, 0x17, 0xe7, 0x9d, 0xab, 0x3c, 0x55, 0x03, 0x82, 0x2f, 0x2b, 0xdb, 0x56, 0x1e, 0x30, 0x2e, 0x24, 0x47, 0x6e, 0xe6, 0xff, 0x33, 0x24, 0x2c, 0x75, 0x51, 0xd4, 0x67 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0x2b, 0x06, 0xd9, 0xa1, 0x5d, 0xe1, 0xf4, 0xd1, 0x1e, 0x3c, 0x9a, 0xc6, 0x29, 0x2b, 0x13, 0x13, 0x78, 0xc0, 0xd8, 0x16, 0x17, 0x2d, 0x9e, 0xa9, 0xc9, 0x79, 0x57, 0xab, 0x24, 0x91, 0x92, 0x19 } },
-	  { { 0x69, 0xfb, 0xa1, 0x9c, 0xa6, 0x75, 0x49, 0x7d, 0x60, 0x73, 0x40, 0x42, 0xc4, 0x13, 0x0a, 0x95, 0x79, 0x1e, 0x04, 0x83, 0x94, 0x99, 0x9b, 0x1e, 0x0c, 0xe8, 0x1f, 0x54, 0xef, 0xcb, 0xc0, 0x52 } } },
-	{ { { 0x14, 0x89, 0x73, 0xa1, 0x37, 0x87, 0x6a, 0x7a, 0xcf, 0x1d, 0xd9, 0x2e, 0x1a, 0x67, 0xed, 0x74, 0xc0, 0xf0, 0x9c, 0x33, 0xdd, 0xdf, 0x08, 0xbf, 0x7b, 0xd1, 0x66, 0xda, 0xe6, 0xc9, 0x49, 0x08 } },
-	  { { 0xe9, 0xdd, 0x5e, 0x55, 0xb0, 0x0a, 0xde, 0x21, 0x4c, 0x5a, 0x2e, 0xd4, 0x80, 0x3a, 0x57, 0x92, 0x7a, 0xf1, 0xc4, 0x2c, 0x40, 0xaf, 0x2f, 0xc9, 0x92, 0x03, 0xe5, 0x5a, 0xbc, 0xdc, 0xf4, 0x09 } } },
-	{ { { 0xf3, 0xe1, 0x2b, 0x7c, 0x05, 0x86, 0x80, 0x93, 0x4a, 0xad, 0xb4, 0x8f, 0x7e, 0x99, 0x0c, 0xfd, 0xcd, 0xef, 0xd1, 0xff, 0x2c, 0x69, 0x34, 0x13, 0x41, 0x64, 0xcf, 0x3b, 0xd0, 0x90, 0x09, 0x1e } },
-	  { { 0x9d, 0x45, 0xd6, 0x80, 0xe6, 0x45, 0xaa, 0xf4, 0x15, 0xaa, 0x5c, 0x34, 0x87, 0x99, 0xa2, 0x8c, 0x26, 0x84, 0x62, 0x7d, 0xb6, 0x29, 0xc0, 0x52, 0xea, 0xf5, 0x81, 0x18, 0x0f, 0x35, 0xa9, 0x0e } } },
-	{ { { 0xe7, 0x20, 0x72, 0x7c, 0x6d, 0x94, 0x5f, 0x52, 0x44, 0x54, 0xe3, 0xf1, 0xb2, 0xb0, 0x36, 0x46, 0x0f, 0xae, 0x92, 0xe8, 0x70, 0x9d, 0x6e, 0x79, 0xb1, 0xad, 0x37, 0xa9, 0x5f, 0xc0, 0xde, 0x03 } },
-	  { { 0x15, 0x55, 0x37, 0xc6, 0x1c, 0x27, 0x1c, 0x6d, 0x14, 0x4f, 0xca, 0xa4, 0xc4, 0x88, 0x25, 0x46, 0x39, 0xfc, 0x5a, 0xe5, 0xfe, 0x29, 0x11, 0x69, 0xf5, 0x72, 0x84, 0x4d, 0x78, 0x9f, 0x94, 0x15 } } },
-	{ { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
-	  { { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
-	{ { { 0xec, 0xd3, 0xff, 0x57, 0x0b, 0xb0, 0xb2, 0xdc, 0xf8, 0x4f, 0xe2, 0x12, 0xd5, 0x36, 0xbe, 0x6b, 0x09, 0x43, 0x6d, 0xa3, 0x4d, 0x90, 0x2d, 0xb8, 0x74, 0xe8, 0x71, 0x45, 0x19, 0x8b, 0x0c, 0x6a } },
-	  { { 0xb8, 0x42, 0x1c, 0x03, 0xad, 0x2c, 0x03, 0x8e, 0xac, 0xd7, 0x98, 0x29, 0x13, 0xc6, 0x02, 0x29, 0xb5, 0xd4, 0xe7, 0xcf, 0xcc, 0x8b, 0x83, 0xec, 0x35, 0xc7, 0x9c, 0x74, 0xb7, 0xad, 0x85, 0x5f } } },
-	{ { { 0x78, 0x84, 0xe1, 0x56, 0x45, 0x69, 0x68, 0x5a, 0x4f, 0xb8, 0xb1, 0x29, 0xff, 0x33, 0x03, 0x31, 0xb7, 0xcb, 0x96, 0x25, 0xe6, 0xe6, 0x41, 0x98, 0x1a, 0xbb, 0x03, 0x56, 0xf2, 0xb2, 0x91, 0x34 } },
-	  { { 0x2c, 0x6c, 0xf7, 0x66, 0xa4, 0x62, 0x6b, 0x39, 0xb3, 0xba, 0x65, 0xd3, 0x1c, 0xf8, 0x11, 0xaa, 0xbe, 0xdc, 0x80, 0x59, 0x87, 0xf5, 0x7b, 0xe5, 0xe3, 0xb3, 0x3e, 0x39, 0xda, 0xbe, 0x88, 0x09 } } },
-	{ { { 0x8b, 0xf1, 0xa0, 0xf5, 0xdc, 0x29, 0xb4, 0xe2, 0x07, 0xc6, 0x7a, 0x00, 0xd0, 0x89, 0x17, 0x51, 0xd4, 0xbb, 0xd4, 0x22, 0xea, 0x7e, 0x7d, 0x7c, 0x24, 0xea, 0xf2, 0xe8, 0x22, 0x12, 0x95, 0x06 } },
-	  { { 0xda, 0x7c, 0xa4, 0x0c, 0xf4, 0xba, 0x6e, 0xe1, 0x89, 0xb5, 0x59, 0xca, 0xf1, 0xc0, 0x29, 0x36, 0x09, 0x44, 0xe2, 0x7f, 0xd1, 0x63, 0x15, 0x99, 0xea, 0x25, 0xcf, 0x0c, 0x9d, 0xc0, 0x44, 0x6f } } },
-	{ { { 0x1d, 0x86, 0x4e, 0xcf, 0xf7, 0x37, 0x10, 0x25, 0x8f, 0x12, 0xfb, 0x19, 0xfb, 0xe0, 0xed, 0x10, 0xc8, 0xe2, 0xf5, 0x75, 0xb1, 0x33, 0xc0, 0x96, 0x0d, 0xfb, 0x15, 0x6c, 0x0d, 0x07, 0x5f, 0x05 } },
-	  { { 0x69, 0x3e, 0x47, 0x97, 0x2c, 0xaf, 0x52, 0x7c, 0x78, 0x83, 0xad, 0x1b, 0x39, 0x82, 0x2f, 0x02, 0x6f, 0x47, 0xdb, 0x2a, 0xb0, 0xe1, 0x91, 0x99, 0x55, 0xb8, 0x99, 0x3a, 0xa0, 0x44, 0x11, 0x51 } } }
-};
-
-static inline void p1p1_to_p2(ge25519_p2* r, const ge25519_p1p1* p)
-{
-	fe25519_mul(&r->x, &p->x, &p->t);
-	fe25519_mul(&r->y, &p->y, &p->z);
-	fe25519_mul(&r->z, &p->z, &p->t);
-}
-
-static inline void p1p1_to_p2_2(ge25519_p3* r, const ge25519_p1p1* p)
-{
-	fe25519_mul(&r->x, &p->x, &p->t);
-	fe25519_mul(&r->y, &p->y, &p->z);
-	fe25519_mul(&r->z, &p->z, &p->t);
-}
-
-static inline void p1p1_to_p3(ge25519_p3* r, const ge25519_p1p1* p)
-{
-	p1p1_to_p2_2(r, p);
-	fe25519_mul(&r->t, &p->x, &p->y);
-}
-
-static inline void ge25519_mixadd2(ge25519_p3* r, const ge25519_aff* q)
-{
-	fe25519 a, b, t1, t2, c, d, e, f, g, h, qt;
-	fe25519_mul(&qt, &q->x, &q->y);
-	fe25519_sub(&a, &r->y, &r->x); /* A = (Y1-X1)*(Y2-X2) */
-	fe25519_add(&b, &r->y, &r->x); /* B = (Y1+X1)*(Y2+X2) */
-	fe25519_sub(&t1, &q->y, &q->x);
-	fe25519_add(&t2, &q->y, &q->x);
-	fe25519_mul(&a, &a, &t1);
-	fe25519_mul(&b, &b, &t2);
-	fe25519_sub(&e, &b, &a);	 /* E = B-A */
-	fe25519_add(&h, &b, &a);	 /* H = B+A */
-	fe25519_mul(&c, &r->t, &qt); /* C = T1*k*T2 */
-	fe25519_mul(&c, &c, &ge25519_ec2d);
-	fe25519_add(&d, &r->z, &r->z); /* D = Z1*2 */
-	fe25519_sub(&f, &d, &c);	   /* F = D-C */
-	fe25519_add(&g, &d, &c);	   /* G = D+C */
-	fe25519_mul(&r->x, &e, &f);
-	fe25519_mul(&r->y, &h, &g);
-	fe25519_mul(&r->z, &g, &f);
-	fe25519_mul(&r->t, &e, &h);
-}
-
-static inline void add_p1p1(ge25519_p1p1* r, const ge25519_p3* p, const ge25519_p3* q)
-{
-	fe25519 a, b, c, d, t;
-
-	fe25519_sub(&a, &p->y, &p->x); /* A = (Y1-X1)*(Y2-X2) */
-	fe25519_sub(&t, &q->y, &q->x);
-	fe25519_mul(&a, &a, &t);
-	fe25519_add(&b, &p->x, &p->y); /* B = (Y1+X1)*(Y2+X2) */
-	fe25519_add(&t, &q->x, &q->y);
-	fe25519_mul(&b, &b, &t);
-	fe25519_mul(&c, &p->t, &q->t); /* C = T1*k*T2 */
-	fe25519_mul(&c, &c, &ge25519_ec2d);
-	fe25519_mul(&d, &p->z, &q->z); /* D = Z1*2*Z2 */
-	fe25519_add(&d, &d, &d);
-	fe25519_sub(&r->x, &b, &a); /* E = B-A */
-	fe25519_sub(&r->t, &d, &c); /* F = D-C */
-	fe25519_add(&r->z, &d, &c); /* G = D+C */
-	fe25519_add(&r->y, &b, &a); /* H = B+A */
-}
-
-/* See http://www.hyperelliptic.org/EFD/g1p/auto-twisted-extended-1.html#doubling-dbl-2008-hwcd */
-static inline void dbl_p1p1(ge25519_p1p1* r, const ge25519_p2* p)
-{
-	fe25519 a, b, c, d;
-	fe25519_square(&a, &p->x);
-	fe25519_square(&b, &p->y);
-	fe25519_square(&c, &p->z);
-	fe25519_add(&c, &c, &c);
-	fe25519_neg(&d, &a);
-
-	fe25519_add(&r->x, &p->x, &p->y);
-	fe25519_square(&r->x, &r->x);
-	fe25519_sub(&r->x, &r->x, &a);
-	fe25519_sub(&r->x, &r->x, &b);
-	fe25519_add(&r->z, &d, &b);
-	fe25519_sub(&r->t, &r->z, &c);
-	fe25519_sub(&r->y, &d, &b);
-}
-
-/* Constant-time version of: if(b) r = p */
-static inline void cmov_aff(ge25519_aff* r, const ge25519_aff* p, unsigned char b)
-{
-	fe25519_cmov(&r->x, &p->x, b);
-	fe25519_cmov(&r->y, &p->y, b);
-}
-
-static inline unsigned char equal(signed char b, signed char c)
-{
-	unsigned char ub = b;
-	unsigned char uc = c;
-	unsigned char x = ub ^ uc; /* 0: yes; 1..255: no */
-	crypto_uint32 y = x;	   /* 0: yes; 1..255: no */
-	y -= 1;					   /* 4294967295: yes; 0..254: no */
-	y >>= 31;				   /* 1: yes; 0: no */
-	return (unsigned char)y;
-}
-
-static inline unsigned char negative(signed char b)
-{
-	unsigned long long x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */
-	x >>= 63;				  /* 1: yes; 0: no */
-	return (unsigned char)x;
-}
-
-static inline void choose_t(ge25519_aff* t, unsigned long long pos, signed char b)
-{
-	/* constant time */
-	fe25519 v;
-	*t = ge25519_base_multiples_affine[5 * pos + 0];
-	cmov_aff(t, &ge25519_base_multiples_affine[5 * pos + 1], equal(b, 1) | equal(b, -1));
-	cmov_aff(t, &ge25519_base_multiples_affine[5 * pos + 2], equal(b, 2) | equal(b, -2));
-	cmov_aff(t, &ge25519_base_multiples_affine[5 * pos + 3], equal(b, 3) | equal(b, -3));
-	cmov_aff(t, &ge25519_base_multiples_affine[5 * pos + 4], equal(b, -4));
-	fe25519_neg(&v, &t->x);
-	fe25519_cmov(&t->x, &v, negative(b));
-}
-
-static inline void setneutral(ge25519* r)
-{
-	fe25519_setzero(&r->x);
-	fe25519_setone(&r->y);
-	fe25519_setone(&r->z);
-	fe25519_setzero(&r->t);
-}
-
-/* return 0 on success, -1 otherwise */
-static inline int ge25519_unpackneg_vartime(ge25519_p3* r, const unsigned char p[32])
-{
-	unsigned char par;
-	fe25519 t, chk, num, den, den2, den4, den6;
-	fe25519_setone(&r->z);
-	par = p[31] >> 7;
-	fe25519_unpack(&r->y, p);
-	fe25519_square(&num, &r->y);		   /* x = y^2 */
-	fe25519_mul(&den, &num, &ge25519_ecd); /* den = dy^2 */
-	fe25519_sub(&num, &num, &r->z);		   /* x = y^2-1 */
-	fe25519_add(&den, &r->z, &den);		   /* den = dy^2+1 */
-
-	/* Computation of sqrt(num/den) */
-	/* 1.: computation of num^((p-5)/8)*den^((7p-35)/8) = (num*den^7)^((p-5)/8) */
-	fe25519_square(&den2, &den);
-	fe25519_square(&den4, &den2);
-	fe25519_mul(&den6, &den4, &den2);
-	fe25519_mul(&t, &den6, &num);
-	fe25519_mul(&t, &t, &den);
-
-	fe25519_pow2523(&t, &t);
-	/* 2. computation of r->x = t * num * den^3 */
-	fe25519_mul(&t, &t, &num);
-	fe25519_mul(&t, &t, &den);
-	fe25519_mul(&t, &t, &den);
-	fe25519_mul(&r->x, &t, &den);
-
-	/* 3. Check whether sqrt computation gave correct result, multiply by sqrt(-1) if not: */
-	fe25519_square(&chk, &r->x);
-	fe25519_mul(&chk, &chk, &den);
-	if (! fe25519_iseq_vartime(&chk, &num)) {
-		fe25519_mul(&r->x, &r->x, &ge25519_sqrtm1);
-	}
-
-	/* 4. Now we have one of the two square roots, except if input was not a square */
-	fe25519_square(&chk, &r->x);
-	fe25519_mul(&chk, &chk, &den);
-	if (! fe25519_iseq_vartime(&chk, &num)) {
-		return -1;
-	}
-
-	/* 5. Choose the desired square root according to parity: */
-	if (fe25519_getparity(&r->x) != (1 - par)) {
-		fe25519_neg(&r->x, &r->x);
-	}
-
-	fe25519_mul(&r->t, &r->x, &r->y);
-	return 0;
-}
-
-static inline void ge25519_pack(unsigned char r[32], const ge25519_p3* p)
-{
-	fe25519 tx, ty, zi;
-	fe25519_invert(&zi, &p->z);
-	fe25519_mul(&tx, &p->x, &zi);
-	fe25519_mul(&ty, &p->y, &zi);
-	fe25519_pack(r, &ty);
-	r[31] ^= fe25519_getparity(&tx) << 7;
-}
-
-/* computes [s1]p1 + [s2]p2 */
-static inline void ge25519_double_scalarmult_vartime(ge25519_p3* r, const ge25519_p3* p1, const sc25519* s1, const ge25519_p3* p2, const sc25519* s2)
-{
-	ge25519_p1p1 tp1p1;
-	ge25519_p3 pre[16];
-	char* pre5 = (char*)(&(pre[5]));   // eliminate type punning warning
-	unsigned char b[127];
-	int i;
-
-	/* precomputation                                                        s2 s1 */
-	setneutral(pre); /* 00 00 */
-	pre[1] = *p1;	 /* 00 01 */
-	dbl_p1p1(&tp1p1, (ge25519_p2*)p1);
-	p1p1_to_p3(&pre[2], &tp1p1); /* 00 10 */
-	add_p1p1(&tp1p1, &pre[1], &pre[2]);
-	p1p1_to_p3(&pre[3], &tp1p1); /* 00 11 */
-	pre[4] = *p2;				 /* 01 00 */
-	add_p1p1(&tp1p1, &pre[1], &pre[4]);
-	p1p1_to_p3(&pre[5], &tp1p1); /* 01 01 */
-	add_p1p1(&tp1p1, &pre[2], &pre[4]);
-	p1p1_to_p3(&pre[6], &tp1p1); /* 01 10 */
-	add_p1p1(&tp1p1, &pre[3], &pre[4]);
-	p1p1_to_p3(&pre[7], &tp1p1); /* 01 11 */
-	dbl_p1p1(&tp1p1, (ge25519_p2*)p2);
-	p1p1_to_p3(&pre[8], &tp1p1); /* 10 00 */
-	add_p1p1(&tp1p1, &pre[1], &pre[8]);
-	p1p1_to_p3(&pre[9], &tp1p1); /* 10 01 */
-	dbl_p1p1(&tp1p1, (ge25519_p2*)pre5);
-	p1p1_to_p3(&pre[10], &tp1p1); /* 10 10 */
-	add_p1p1(&tp1p1, &pre[3], &pre[8]);
-	p1p1_to_p3(&pre[11], &tp1p1); /* 10 11 */
-	add_p1p1(&tp1p1, &pre[4], &pre[8]);
-	p1p1_to_p3(&pre[12], &tp1p1); /* 11 00 */
-	add_p1p1(&tp1p1, &pre[1], &pre[12]);
-	p1p1_to_p3(&pre[13], &tp1p1); /* 11 01 */
-	add_p1p1(&tp1p1, &pre[2], &pre[12]);
-	p1p1_to_p3(&pre[14], &tp1p1); /* 11 10 */
-	add_p1p1(&tp1p1, &pre[3], &pre[12]);
-	p1p1_to_p3(&pre[15], &tp1p1); /* 11 11 */
-
-	sc25519_2interleave2(b, s1, s2);
-
-	/* scalar multiplication */
-	*r = pre[b[126]];
-	for (i = 125; i >= 0; i--) {
-		dbl_p1p1(&tp1p1, (ge25519_p2*)r);
-		p1p1_to_p2((ge25519_p2*)r, &tp1p1);
-		dbl_p1p1(&tp1p1, (ge25519_p2*)r);
-		if (b[i] != 0) {
-			p1p1_to_p3(r, &tp1p1);
-			add_p1p1(&tp1p1, r, &pre[b[i]]);
-		}
-		if (i != 0) {
-			p1p1_to_p2((ge25519_p2*)r, &tp1p1);
-		}
-		else {
-			p1p1_to_p3(r, &tp1p1);
-		}
-	}
-}
-
-static inline void ge25519_scalarmult_base(ge25519_p3* r, const sc25519* s)
-{
-	signed char b[85];
-	int i;
-	ge25519_aff t;
-	sc25519_window3(b, s);
-
-	choose_t((ge25519_aff*)r, 0, b[0]);
-	fe25519_setone(&r->z);
-	fe25519_mul(&r->t, &r->x, &r->y);
-	for (i = 1; i < 85; i++) {
-		choose_t(&t, (unsigned long long)i, b[i]);
-		ge25519_mixadd2(r, &t);
-	}
-}
-
-static inline void get_hram(unsigned char* hram, const unsigned char* sm, const unsigned char* pk, unsigned char* playground, unsigned long long smlen)
-{
-	unsigned long long i;
-
-	for (i = 0; i < 32; ++i) {
-		playground[i] = sm[i];
-	}
-	for (i = 32; i < 64; ++i) {
-		playground[i] = pk[i - 32];
-	}
-	for (i = 64; i < smlen; ++i) {
-		playground[i] = sm[i];
-	}
-
-	ZeroTier::SHA512(hram, playground, (unsigned int)smlen);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-}	// anonymous namespace
-
-#ifdef ZT_USE_FAST_X64_ED25519
-extern "C" void ed25519_amd64_asm_sign(const unsigned char* sk, const unsigned char* pk, const unsigned char* digest, unsigned char* sig);
-#endif
-
-namespace ZeroTier {
-
-void ECC::agree(const ECC::Private& mine, const ECC::Public& their, void* keybuf, unsigned int keylen)
-{
-	unsigned char rawkey[32];
-	unsigned char digest[64];
-
-	crypto_scalarmult(rawkey, mine.data, their.data);
-	SHA512(digest, rawkey, 32);
-	for (unsigned int i = 0, k = 0; i < keylen;) {
-		if (k == 64) {
-			k = 0;
-			SHA512(digest, digest, 64);
-		}
-		((unsigned char*)keybuf)[i++] = digest[k++];
-	}
-}
-
-void ECC::sign(const ECC::Private& myPrivate, const ECC::Public& myPublic, const void* msg, unsigned int len, void* signature)
-{
-	unsigned char digest[64];	// we sign the first 32 bytes of SHA-512(msg)
-	SHA512(digest, msg, len);
-
-#ifdef ZT_USE_FAST_X64_ED25519
-	ed25519_amd64_asm_sign(myPrivate.data + 32, myPublic.data + 32, digest, (unsigned char*)signature);
-#else
-	sc25519 sck, scs, scsk;
-	ge25519 ger;
-	unsigned char r[32];
-	unsigned char s[32];
-	unsigned char extsk[64];
-	unsigned char hmg[crypto_hash_sha512_BYTES];
-	unsigned char hram[crypto_hash_sha512_BYTES];
-	unsigned char* sig = (unsigned char*)signature;
-
-	SHA512(extsk, myPrivate.data + 32, 32);
-	extsk[0] &= 248;
-	extsk[31] &= 127;
-	extsk[31] |= 64;
-
-	for (unsigned int i = 0; i < 32; i++) {
-		sig[32 + i] = extsk[32 + i];
-	}
-	for (unsigned int i = 0; i < 32; i++) {
-		sig[64 + i] = digest[i];
-	}
-
-	SHA512(hmg, sig + 32, 64);
-
-	/* Computation of R */
-	sc25519_from64bytes(&sck, hmg);
-	ge25519_scalarmult_base(&ger, &sck);
-	ge25519_pack(r, &ger);
-
-	/* Computation of s */
-	for (unsigned int i = 0; i < 32; i++) {
-		sig[i] = r[i];
-	}
-
-	get_hram(hram, sig, myPublic.data + 32, sig, 96);
-
-	sc25519_from64bytes(&scs, hram);
-	sc25519_from32bytes(&scsk, extsk);
-	sc25519_mul(&scs, &scs, &scsk);
-
-	sc25519_add(&scs, &scs, &sck);
-
-	sc25519_to32bytes(s, &scs); /* cat s */
-	for (unsigned int i = 0; i < 32; i++) {
-		sig[32 + i] = s[i];
-	}
-#endif
-}
-
-bool ECC::verify(const ECC::Public& their, const void* msg, unsigned int len, const void* signature)
-{
-	const unsigned char* const sig = (const unsigned char*)signature;
-	unsigned char digest[64];	// we sign the first 32 bytes of SHA-512(msg)
-	SHA512(digest, msg, len);
-	if (! Utils::secureEq(sig + 64, digest, 32)) {
-		return false;
-	}
-
-	unsigned char t2[32];
-	ge25519 get1, get2;
-	sc25519 schram, scs;
-	unsigned char hram[crypto_hash_sha512_BYTES];
-	unsigned char m[96];
-
-	if (ge25519_unpackneg_vartime(&get1, their.data + 32)) {
-		return false;
-	}
-
-	get_hram(hram, sig, their.data + 32, m, 96);
-
-	sc25519_from64bytes(&schram, hram);
-
-	sc25519_from32bytes(&scs, sig + 32);
-
-	ge25519_double_scalarmult_vartime(&get2, &get1, &schram, &ge25519_base, &scs);
-	ge25519_pack(t2, &get2);
-
-	return Utils::secureEq(sig, t2, 32);
-}
-
-void ECC::_calcPubDH(ECC::Pair& kp)
-{
-	// First 32 bytes of pub and priv are the keys for ECDH key
-	// agreement. This generates the public portion from the private.
-	crypto_scalarmult_base(kp.pub.data, kp.priv.data);
-}
-
-void ECC::_calcPubED(ECC::Pair& kp)
-{
-	unsigned char extsk[64];
-	sc25519 scsk;
-	ge25519 gepk;
-
-	// Second 32 bytes of pub and priv are the keys for ed25519
-	// signing and verification.
-	SHA512(extsk, kp.priv.data + 32, 32);
-	extsk[0] &= 248;
-	extsk[31] &= 127;
-	extsk[31] |= 64;
-	sc25519_from32bytes(&scsk, extsk);
-	ge25519_scalarmult_base(&gepk, &scsk);
-	ge25519_pack(kp.pub.data + 32, &gepk);
-	// In NaCl, the public key is crammed into the next 32 bytes
-	// of the private key for signing since both keys are required
-	// to sign. In this version we just get it from kp.pub, so we
-	// leave that out of private.
-}
-
-}	// namespace ZeroTier
diff --git a/node/ECC.hpp b/node/ECC.hpp
deleted file mode 100644
index 68f6d5ea8..000000000
--- a/node/ECC.hpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-/*
- * This file defines the elliptic curve crypto used for ZeroTier V1. The normal
- * public version uses C25519 and Ed25519, while the FIPS version uses NIST.
- * FIPS builds are completely incompatible with regular ZeroTier, but that's
- * fine since FIPS users typically want a fully isolated private network. If you
- * are not such a user you probably don't want this.
- */
-
-#ifndef ZT_ECC_HPP
-#define ZT_ECC_HPP
-
-#include "Utils.hpp"
-
-#ifdef ZT_FIPS
-
-/* FIPS140/NIST ECC cryptography */
-/* Note that to be FIPS we also need to link against a FIPS-certified library. */
-
-#include <openssl/bn.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-
-#define ZT_ECC_EPHEMERAL_PUBLIC_KEY_LEN 97		 /* Single ECC P-384 key */
-#define ZT_ECC_PUBLIC_KEY_SET_LEN		(97 * 2) /* Two ECC P-384 keys */
-#define ZT_ECC_PRIVATE_KEY_SET_LEN		(48 * 2) /* Two ECC P-384 secret keys */
-#define ZT_ECC_SIGNATURE_LEN			96		 /* NIST P-384 ECDSA signature */
-
-class ECC {
-  public:
-	struct Public {
-		uint8_t data[ZT_ECC_PUBLIC_KEY_SET_LEN];
-	};
-	struct Private {
-		uint8_t data[ZT_ECC_PRIVATE_KEY_SET_LEN];
-	};
-	struct Signature {
-		uint8_t data[ZT_ECC_SIGNATURE_LEN];
-	};
-	struct Pair {
-		Public pub;
-		Private priv;
-	};
-};
-
-#else	// Curve25519 / Ed25519
-
-namespace ZeroTier {
-
-#define ZT_ECC_EPHEMERAL_PUBLIC_KEY_LEN 32 /* Single C25519 ECDH key */
-#define ZT_ECC_PUBLIC_KEY_SET_LEN		64 /* C25519 and Ed25519 keys */
-#define ZT_ECC_PRIVATE_KEY_SET_LEN		64 /* C25519 and Ed25519 secret keys */
-#define ZT_ECC_SIGNATURE_LEN			96 /* Ed25519 signature plus (not necessary) hash */
-
-class ECC {
-  public:
-	struct Public {
-		uint8_t data[ZT_ECC_PUBLIC_KEY_SET_LEN];
-	};
-	struct Private {
-		uint8_t data[ZT_ECC_PRIVATE_KEY_SET_LEN];
-	};
-	struct Signature {
-		uint8_t data[ZT_ECC_SIGNATURE_LEN];
-	};
-	struct Pair {
-		Public pub;
-		Private priv;
-	};
-
-	/**
-	 * Generate an elliptic curve key pair
-	 */
-	static inline Pair generate()
-	{
-		Pair kp;
-		Utils::getSecureRandom(kp.priv.data, ZT_ECC_PRIVATE_KEY_SET_LEN);
-		_calcPubDH(kp);
-		_calcPubED(kp);
-		return kp;
-	}
-
-	/**
-	 * Generate a key pair satisfying a condition
-	 *
-	 * This begins with a random keypair from a random secret key and then
-	 * iteratively increments the random secret until cond(kp) returns true.
-	 * This is used to compute key pairs in which the public key, its hash
-	 * or some other aspect of it satisfies some condition, such as for a
-	 * hashcash criteria.
-	 *
-	 * @param cond Condition function or function object
-	 * @return Key pair where cond(kp) returns true
-	 * @tparam F Type of 'cond'
-	 */
-	template <typename F> static inline Pair generateSatisfying(F cond)
-	{
-		Pair kp;
-		void* const priv = (void*)kp.priv.data;
-		Utils::getSecureRandom(priv, ZT_ECC_PRIVATE_KEY_SET_LEN);
-		_calcPubED(kp);	  // do Ed25519 key -- bytes 32-63 of pub and priv
-		do {
-			++(((uint64_t*)priv)[1]);
-			--(((uint64_t*)priv)[2]);
-			_calcPubDH(kp);	  // keep regenerating bytes 0-31 until satisfied
-		} while (! cond(kp));
-		return kp;
-	}
-
-	/**
-	 * Perform C25519 ECC key agreement
-	 *
-	 * Actual key bytes are generated from one or more SHA-512 digests of
-	 * the raw result of key agreement.
-	 *
-	 * @param mine My private key
-	 * @param their Their public key
-	 * @param keybuf Buffer to fill
-	 * @param keylen Number of key bytes to generate
-	 */
-	static void agree(const Private& mine, const Public& their, void* keybuf, unsigned int keylen);
-	static inline void agree(const Pair& mine, const Public& their, void* keybuf, unsigned int keylen)
-	{
-		agree(mine.priv, their, keybuf, keylen);
-	}
-
-	/**
-	 * Sign a message with a sender's key pair
-	 *
-	 * This takes the SHA-521 of msg[] and then signs the first 32 bytes of this
-	 * digest, returning it and the 64-byte ed25519 signature in signature[].
-	 * This results in a signature that verifies both the signer's authenticity
-	 * and the integrity of the message.
-	 *
-	 * This is based on the original ed25519 code from NaCl and the SUPERCOP
-	 * cipher benchmark suite, but with the modification that it always
-	 * produces a signature of fixed 96-byte length based on the hash of an
-	 * arbitrary-length message.
-	 *
-	 * @param myPrivate My private key
-	 * @param myPublic My public key
-	 * @param msg Message to sign
-	 * @param len Length of message in bytes
-	 * @param signature Buffer to fill with signature -- MUST be 96 bytes in length
-	 */
-	static void sign(const Private& myPrivate, const Public& myPublic, const void* msg, unsigned int len, void* signature);
-	static inline void sign(const Pair& mine, const void* msg, unsigned int len, void* signature)
-	{
-		sign(mine.priv, mine.pub, msg, len, signature);
-	}
-
-	/**
-	 * Sign a message with a sender's key pair
-	 *
-	 * @param myPrivate My private key
-	 * @param myPublic My public key
-	 * @param msg Message to sign
-	 * @param len Length of message in bytes
-	 * @return Signature
-	 */
-	static inline Signature sign(const Private& myPrivate, const Public& myPublic, const void* msg, unsigned int len)
-	{
-		Signature sig;
-		sign(myPrivate, myPublic, msg, len, sig.data);
-		return sig;
-	}
-	static inline Signature sign(const Pair& mine, const void* msg, unsigned int len)
-	{
-		Signature sig;
-		sign(mine.priv, mine.pub, msg, len, sig.data);
-		return sig;
-	}
-
-	/**
-	 * Verify a message's signature
-	 *
-	 * @param their Public key to verify against
-	 * @param msg Message to verify signature integrity against
-	 * @param len Length of message in bytes
-	 * @param signature 96-byte signature
-	 * @return True if signature is valid and the message is authentic and unmodified
-	 */
-	static bool verify(const Public& their, const void* msg, unsigned int len, const void* signature);
-
-	/**
-	 * Verify a message's signature
-	 *
-	 * @param their Public key to verify against
-	 * @param msg Message to verify signature integrity against
-	 * @param len Length of message in bytes
-	 * @param signature 96-byte signature
-	 * @return True if signature is valid and the message is authentic and unmodified
-	 */
-	static inline bool verify(const Public& their, const void* msg, unsigned int len, const Signature& signature)
-	{
-		return verify(their, msg, len, signature.data);
-	}
-
-  private:
-	// derive first 32 bytes of kp.pub from first 32 bytes of kp.priv
-	// this is the ECDH key
-	static void _calcPubDH(Pair& kp);
-
-	// derive 2nd 32 bytes of kp.pub from 2nd 32 bytes of kp.priv
-	// this is the Ed25519 sign/verify key
-	static void _calcPubED(Pair& kp);
-};
-
-}	// namespace ZeroTier
-
-#endif
-
-#endif
diff --git a/node/Hashtable.hpp b/node/Hashtable.hpp
index 5073f6029..f06b22308 100644
--- a/node/Hashtable.hpp
+++ b/node/Hashtable.hpp
@@ -1,58 +1,59 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_HASHTABLE_HPP
 #define ZT_HASHTABLE_HPP
 
-#include "Constants.hpp"
-
-#include <algorithm>
-#include <stdexcept>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <utility>
+
+#include <stdexcept>
 #include <vector>
+#include <utility>
+#include <algorithm>
 
 namespace ZeroTier {
 
 /**
  * A minimal hash table implementation for the ZeroTier core
+ *
+ * This is not a drop-in replacement for STL containers, and has several
+ * limitations. Keys can be uint64_t or an object, and if the latter they
+ * must implement a method called hashCode() that returns an unsigned long
+ * value that is evenly distributed.
  */
-template <typename K, typename V> class Hashtable {
-  private:
-	struct _Bucket {
-		_Bucket(const K& k, const V& v) : k(k), v(v)
-		{
-		}
-		_Bucket(const K& k) : k(k), v()
-		{
-		}
-		_Bucket(const _Bucket& b) : k(b.k), v(b.v)
-		{
-		}
-		inline _Bucket& operator=(const _Bucket& b)
-		{
-			k = b.k;
-			v = b.v;
-			return *this;
-		}
+template<typename K,typename V>
+class Hashtable
+{
+private:
+	struct _Bucket
+	{
+		_Bucket(const K &k,const V &v) : k(k),v(v) {}
+		_Bucket(const K &k) : k(k),v() {}
+		_Bucket(const _Bucket &b) : k(b.k),v(b.v) {}
+		inline _Bucket &operator=(const _Bucket &b) { k = b.k; v = b.v; return *this; }
 		K k;
 		V v;
-		_Bucket* next;	 // must be set manually for each _Bucket
+		_Bucket *next; // must be set manually for each _Bucket
 	};
 
-  public:
+public:
 	/**
 	 * A simple forward iterator (different from STL)
 	 *
@@ -60,12 +61,16 @@ template <typename K, typename V> class Hashtable {
 	 * may rehash and invalidate the iterator. Note the erasing the key will destroy
 	 * the targets of the pointers returned by next().
 	 */
-	class Iterator {
-	  public:
+	class Iterator
+	{
+	public:
 		/**
 		 * @param ht Hash table to iterate over
 		 */
-		Iterator(Hashtable& ht) : _idx(0), _ht(&ht), _b(ht._t[0])
+		Iterator(Hashtable &ht) :
+			_idx(0),
+			_ht(&ht),
+			_b(ht._t[0])
 		{
 		}
 
@@ -74,9 +79,9 @@ template <typename K, typename V> class Hashtable {
 		 * @param vptr Pointer to set to point to next value
 		 * @return True if kptr and vptr are set, false if no more entries
 		 */
-		inline bool next(K*& kptr, V*& vptr)
+		inline bool next(K *&kptr,V *&vptr)
 		{
-			for (;;) {
+			for(;;) {
 				if (_b) {
 					kptr = &(_b->k);
 					vptr = &(_b->v);
@@ -84,45 +89,46 @@ template <typename K, typename V> class Hashtable {
 					return true;
 				}
 				++_idx;
-				if (_idx >= _ht->_bc) {
+				if (_idx >= _ht->_bc)
 					return false;
-				}
 				_b = _ht->_t[_idx];
 			}
 		}
 
-	  private:
+	private:
 		unsigned long _idx;
-		Hashtable* _ht;
-		_Bucket* _b;
+		Hashtable *_ht;
+		_Bucket *_b;
 	};
-	// friend class Hashtable<K,V>::Iterator;
+	friend class Hashtable::Iterator;
 
 	/**
-	 * @param bc Initial capacity in buckets (default: 64, must be nonzero)
+	 * @param bc Initial capacity in buckets (default: 128, must be nonzero)
 	 */
-	Hashtable(unsigned long bc = 64) : _t(reinterpret_cast<_Bucket**>(::malloc(sizeof(_Bucket*) * bc))), _bc(bc), _s(0)
+	Hashtable(unsigned long bc = 128) :
+		_t(reinterpret_cast<_Bucket **>(::malloc(sizeof(_Bucket *) * bc))),
+		_bc(bc),
+		_s(0)
 	{
-		if (! _t) {
-			throw ZT_EXCEPTION_OUT_OF_MEMORY;
-		}
-		for (unsigned long i = 0; i < bc; ++i) {
-			_t[i] = (_Bucket*)0;
-		}
+		if (!_t)
+			throw std::bad_alloc();
+		for(unsigned long i=0;i<bc;++i)
+			_t[i] = (_Bucket *)0;
 	}
 
-	Hashtable(const Hashtable<K, V>& ht) : _t(reinterpret_cast<_Bucket**>(::malloc(sizeof(_Bucket*) * ht._bc))), _bc(ht._bc), _s(ht._s)
+	Hashtable(const Hashtable<K,V> &ht) :
+		_t(reinterpret_cast<_Bucket **>(::malloc(sizeof(_Bucket *) * ht._bc))),
+		_bc(ht._bc),
+		_s(ht._s)
 	{
-		if (! _t) {
-			throw ZT_EXCEPTION_OUT_OF_MEMORY;
-		}
-		for (unsigned long i = 0; i < _bc; ++i) {
-			_t[i] = (_Bucket*)0;
-		}
-		for (unsigned long i = 0; i < _bc; ++i) {
-			const _Bucket* b = ht._t[i];
+		if (!_t)
+			throw std::bad_alloc();
+		for(unsigned long i=0;i<_bc;++i)
+			_t[i] = (_Bucket *)0;
+		for(unsigned long i=0;i<_bc;++i) {
+			const _Bucket *b = ht._t[i];
 			while (b) {
-				_Bucket* nb = new _Bucket(*b);
+				_Bucket *nb = new _Bucket(*b);
 				nb->next = _t[i];
 				_t[i] = nb;
 				b = b->next;
@@ -136,14 +142,14 @@ template <typename K, typename V> class Hashtable {
 		::free(_t);
 	}
 
-	inline Hashtable& operator=(const Hashtable<K, V>& ht)
+	inline Hashtable &operator=(const Hashtable<K,V> &ht)
 	{
 		this->clear();
 		if (ht._s) {
-			for (unsigned long i = 0; i < ht._bc; ++i) {
-				const _Bucket* b = ht._t[i];
+			for(unsigned long i=0;i<ht._bc;++i) {
+				const _Bucket *b = ht._t[i];
 				while (b) {
-					this->set(b->k, b->v);
+					this->set(b->k,b->v);
 					b = b->next;
 				}
 			}
@@ -157,14 +163,14 @@ template <typename K, typename V> class Hashtable {
 	inline void clear()
 	{
 		if (_s) {
-			for (unsigned long i = 0; i < _bc; ++i) {
-				_Bucket* b = _t[i];
+			for(unsigned long i=0;i<_bc;++i) {
+				_Bucket *b = _t[i];
 				while (b) {
-					_Bucket* const nb = b->next;
+					_Bucket *const nb = b->next;
 					delete b;
 					b = nb;
 				}
-				_t[i] = (_Bucket*)0;
+				_t[i] = (_Bucket *)0;
 			}
 			_s = 0;
 		}
@@ -178,8 +184,8 @@ template <typename K, typename V> class Hashtable {
 		typename std::vector<K> k;
 		if (_s) {
 			k.reserve(_s);
-			for (unsigned long i = 0; i < _bc; ++i) {
-				_Bucket* b = _t[i];
+			for(unsigned long i=0;i<_bc;++i) {
+				_Bucket *b = _t[i];
 				while (b) {
 					k.push_back(b->k);
 					b = b->next;
@@ -195,11 +201,12 @@ template <typename K, typename V> class Hashtable {
 	 * @param v Vector, list, or other compliant container
 	 * @tparam Type of V (generally inferred)
 	 */
-	template <typename C> inline void appendKeys(C& v) const
+	template<typename C>
+	inline void appendKeys(C &v) const
 	{
 		if (_s) {
-			for (unsigned long i = 0; i < _bc; ++i) {
-				_Bucket* b = _t[i];
+			for(unsigned long i=0;i<_bc;++i) {
+				_Bucket *b = _t[i];
 				while (b) {
 					v.push_back(b->k);
 					b = b->next;
@@ -211,15 +218,15 @@ template <typename K, typename V> class Hashtable {
 	/**
 	 * @return Vector of all entries (pairs of K,V)
 	 */
-	inline typename std::vector<std::pair<K, V> > entries() const
+	inline typename std::vector< std::pair<K,V> > entries() const
 	{
-		typename std::vector<std::pair<K, V> > k;
+		typename std::vector< std::pair<K,V> > k;
 		if (_s) {
 			k.reserve(_s);
-			for (unsigned long i = 0; i < _bc; ++i) {
-				_Bucket* b = _t[i];
+			for(unsigned long i=0;i<_bc;++i) {
+				_Bucket *b = _t[i];
 				while (b) {
-					k.push_back(std::pair<K, V>(b->k, b->v));
+					k.push_back(std::pair<K,V>(b->k,b->v));
 					b = b->next;
 				}
 			}
@@ -231,51 +238,28 @@ template <typename K, typename V> class Hashtable {
 	 * @param k Key
 	 * @return Pointer to value or NULL if not found
 	 */
-	inline V* get(const K& k)
+	inline V *get(const K &k)
 	{
-		_Bucket* b = _t[_hc(k) % _bc];
+		_Bucket *b = _t[_hc(k) % _bc];
 		while (b) {
-			if (b->k == k) {
+			if (b->k == k)
 				return &(b->v);
-			}
 			b = b->next;
 		}
-		return (V*)0;
-	}
-	inline const V* get(const K& k) const
-	{
-		return const_cast<Hashtable*>(this)->get(k);
-	}
-
-	/**
-	 * @param k Key
-	 * @param v Value to fill with result
-	 * @return True if value was found and set (if false, v is not modified)
-	 */
-	inline bool get(const K& k, V& v) const
-	{
-		_Bucket* b = _t[_hc(k) % _bc];
-		while (b) {
-			if (b->k == k) {
-				v = b->v;
-				return true;
-			}
-			b = b->next;
-		}
-		return false;
+		return (V *)0;
 	}
+	inline const V *get(const K &k) const { return const_cast<Hashtable *>(this)->get(k); }
 
 	/**
 	 * @param k Key to check
 	 * @return True if key is present
 	 */
-	inline bool contains(const K& k) const
+	inline bool contains(const K &k) const
 	{
-		_Bucket* b = _t[_hc(k) % _bc];
+		_Bucket *b = _t[_hc(k) % _bc];
 		while (b) {
-			if (b->k == k) {
+			if (b->k == k)
 				return true;
-			}
 			b = b->next;
 		}
 		return false;
@@ -285,19 +269,16 @@ template <typename K, typename V> class Hashtable {
 	 * @param k Key
 	 * @return True if value was present
 	 */
-	inline bool erase(const K& k)
+	inline bool erase(const K &k)
 	{
 		const unsigned long bidx = _hc(k) % _bc;
-		_Bucket* lastb = (_Bucket*)0;
-		_Bucket* b = _t[bidx];
+		_Bucket *lastb = (_Bucket *)0;
+		_Bucket *b = _t[bidx];
 		while (b) {
 			if (b->k == k) {
-				if (lastb) {
+				if (lastb)
 					lastb->next = b->next;
-				}
-				else {
-					_t[bidx] = b->next;
-				}
+				else _t[bidx] = b->next;
 				delete b;
 				--_s;
 				return true;
@@ -313,12 +294,12 @@ template <typename K, typename V> class Hashtable {
 	 * @param v Value
 	 * @return Reference to value in table
 	 */
-	inline V& set(const K& k, const V& v)
+	inline V &set(const K &k,const V &v)
 	{
 		const unsigned long h = _hc(k);
 		unsigned long bidx = h % _bc;
 
-		_Bucket* b = _t[bidx];
+		_Bucket *b = _t[bidx];
 		while (b) {
 			if (b->k == k) {
 				b->v = v;
@@ -332,7 +313,7 @@ template <typename K, typename V> class Hashtable {
 			bidx = h % _bc;
 		}
 
-		b = new _Bucket(k, v);
+		b = new _Bucket(k,v);
 		b->next = _t[bidx];
 		_t[bidx] = b;
 		++_s;
@@ -343,16 +324,15 @@ template <typename K, typename V> class Hashtable {
 	 * @param k Key
 	 * @return Value, possibly newly created
 	 */
-	inline V& operator[](const K& k)
+	inline V &operator[](const K &k)
 	{
 		const unsigned long h = _hc(k);
 		unsigned long bidx = h % _bc;
 
-		_Bucket* b = _t[bidx];
+		_Bucket *b = _t[bidx];
 		while (b) {
-			if (b->k == k) {
+			if (b->k == k)
 				return b->v;
-			}
 			b = b->next;
 		}
 
@@ -371,27 +351,27 @@ template <typename K, typename V> class Hashtable {
 	/**
 	 * @return Number of entries
 	 */
-	inline unsigned long size() const
-	{
-		return _s;
-	}
+	inline unsigned long size() const throw() { return _s; }
 
 	/**
 	 * @return True if table is empty
 	 */
-	inline bool empty() const
-	{
-		return (_s == 0);
-	}
+	inline bool empty() const throw() { return (_s == 0); }
 
-  private:
-	template <typename O> static inline unsigned long _hc(const O& obj)
+private:
+	template<typename O>
+	static inline unsigned long _hc(const O &obj)
 	{
-		return (unsigned long)obj.hashCode();
+		return obj.hashCode();
 	}
 	static inline unsigned long _hc(const uint64_t i)
 	{
-		return (unsigned long)(i ^ (i >> 32));	 // good for network IDs and addresses
+		/* NOTE: this assumes that 'i' is evenly distributed, which is the case for
+		 * packet IDs and network IDs -- the two use cases in ZT for uint64_t keys.
+		 * These values are also greater than 0xffffffff so they'll map onto a full
+		 * bucket count just fine no matter what happens. Normally you'd want to
+		 * hash an integer key index in a hash table. */
+		return (unsigned long)i;
 	}
 	static inline unsigned long _hc(const uint32_t i)
 	{
@@ -401,23 +381,18 @@ template <typename K, typename V> class Hashtable {
 	{
 		return ((unsigned long)i * (unsigned long)0x9e3779b1);
 	}
-	static inline unsigned long _hc(const int i)
-	{
-		return ((unsigned long)i * (unsigned long)0x9e3379b1);
-	}
 
 	inline void _grow()
 	{
 		const unsigned long nc = _bc * 2;
-		_Bucket** nt = reinterpret_cast<_Bucket**>(::malloc(sizeof(_Bucket*) * nc));
+		_Bucket **nt = reinterpret_cast<_Bucket **>(::malloc(sizeof(_Bucket *) * nc));
 		if (nt) {
-			for (unsigned long i = 0; i < nc; ++i) {
-				nt[i] = (_Bucket*)0;
-			}
-			for (unsigned long i = 0; i < _bc; ++i) {
-				_Bucket* b = _t[i];
+			for(unsigned long i=0;i<nc;++i)
+				nt[i] = (_Bucket *)0;
+			for(unsigned long i=0;i<_bc;++i) {
+				_Bucket *b = _t[i];
 				while (b) {
-					_Bucket* const nb = b->next;
+					_Bucket *const nb = b->next;
 					const unsigned long nidx = _hc(b->k) % nc;
 					b->next = nt[nidx];
 					nt[nidx] = b;
@@ -430,11 +405,11 @@ template <typename K, typename V> class Hashtable {
 		}
 	}
 
-	_Bucket** _t;
+	_Bucket **_t;
 	unsigned long _bc;
 	unsigned long _s;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Identity.cpp b/node/Identity.cpp
index 1e6d4212d..6f89a1eea 100644
--- a/node/Identity.cpp
+++ b/node/Identity.cpp
@@ -1,203 +1,190 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "Identity.hpp"
-
-#include "Constants.hpp"
-#include "ECC.hpp"
-#include "SHA512.hpp"
-#include "Salsa20.hpp"
-#include "Utils.hpp"
-
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+
+#include "Constants.hpp"
+#include "Identity.hpp"
+#include "SHA512.hpp"
+#include "Salsa20.hpp"
+#include "Utils.hpp"
 
 // These can't be changed without a new identity type. They define the
 // parameters of the hashcash hashing/searching algorithm.
 
 #define ZT_IDENTITY_GEN_HASHCASH_FIRST_BYTE_LESS_THAN 17
-#define ZT_IDENTITY_GEN_MEMORY						  2097152
+#define ZT_IDENTITY_GEN_MEMORY 2097152
 
 namespace ZeroTier {
 
 // A memory-hard composition of SHA-512 and Salsa20 for hashcash hashing
-static inline void _computeMemoryHardHash(const void* publicKey, unsigned int publicKeyBytes, void* digest, void* genmem)
+static inline void _computeMemoryHardHash(const void *publicKey,unsigned int publicKeyBytes,void *digest,void *genmem)
 {
 	// Digest publicKey[] to obtain initial digest
-	SHA512(digest, publicKey, publicKeyBytes);
+	SHA512::hash(digest,publicKey,publicKeyBytes);
 
 	// Initialize genmem[] using Salsa20 in a CBC-like configuration since
-	// ordinary Salsa20 is randomly seek-able. This is good for a cipher
-	// but is not what we want for sequential memory-hardness.
-	memset(genmem, 0, ZT_IDENTITY_GEN_MEMORY);
-	Salsa20 s20(digest, (char*)digest + 32);
-	s20.crypt20((char*)genmem, (char*)genmem, 64);
-	for (unsigned long i = 64; i < ZT_IDENTITY_GEN_MEMORY; i += 64) {
+	// ordinary Salsa20 is randomly seekable. This is good for a cipher
+	// but is not what we want for sequential memory-harndess.
+	memset(genmem,0,ZT_IDENTITY_GEN_MEMORY);
+	Salsa20 s20(digest,256,(char *)digest + 32);
+	s20.encrypt20((char *)genmem,(char *)genmem,64);
+	for(unsigned long i=64;i<ZT_IDENTITY_GEN_MEMORY;i+=64) {
 		unsigned long k = i - 64;
-		*((uint64_t*)((char*)genmem + i)) = *((uint64_t*)((char*)genmem + k));
-		*((uint64_t*)((char*)genmem + i + 8)) = *((uint64_t*)((char*)genmem + k + 8));
-		*((uint64_t*)((char*)genmem + i + 16)) = *((uint64_t*)((char*)genmem + k + 16));
-		*((uint64_t*)((char*)genmem + i + 24)) = *((uint64_t*)((char*)genmem + k + 24));
-		*((uint64_t*)((char*)genmem + i + 32)) = *((uint64_t*)((char*)genmem + k + 32));
-		*((uint64_t*)((char*)genmem + i + 40)) = *((uint64_t*)((char*)genmem + k + 40));
-		*((uint64_t*)((char*)genmem + i + 48)) = *((uint64_t*)((char*)genmem + k + 48));
-		*((uint64_t*)((char*)genmem + i + 56)) = *((uint64_t*)((char*)genmem + k + 56));
-		s20.crypt20((char*)genmem + i, (char*)genmem + i, 64);
+		*((uint64_t *)((char *)genmem + i)) = *((uint64_t *)((char *)genmem + k));
+		*((uint64_t *)((char *)genmem + i + 8)) = *((uint64_t *)((char *)genmem + k + 8));
+		*((uint64_t *)((char *)genmem + i + 16)) = *((uint64_t *)((char *)genmem + k + 16));
+		*((uint64_t *)((char *)genmem + i + 24)) = *((uint64_t *)((char *)genmem + k + 24));
+		*((uint64_t *)((char *)genmem + i + 32)) = *((uint64_t *)((char *)genmem + k + 32));
+		*((uint64_t *)((char *)genmem + i + 40)) = *((uint64_t *)((char *)genmem + k + 40));
+		*((uint64_t *)((char *)genmem + i + 48)) = *((uint64_t *)((char *)genmem + k + 48));
+		*((uint64_t *)((char *)genmem + i + 56)) = *((uint64_t *)((char *)genmem + k + 56));
+		s20.encrypt20((char *)genmem + i,(char *)genmem + i,64);
 	}
 
 	// Render final digest using genmem as a lookup table
-	for (unsigned long i = 0; i < (ZT_IDENTITY_GEN_MEMORY / sizeof(uint64_t));) {
-		unsigned long idx1 = (unsigned long)(Utils::ntoh(((uint64_t*)genmem)[i++]) % (64 / sizeof(uint64_t)));
-		unsigned long idx2 = (unsigned long)(Utils::ntoh(((uint64_t*)genmem)[i++]) % (ZT_IDENTITY_GEN_MEMORY / sizeof(uint64_t)));
-		uint64_t tmp = ((uint64_t*)genmem)[idx2];
-		((uint64_t*)genmem)[idx2] = ((uint64_t*)digest)[idx1];
-		((uint64_t*)digest)[idx1] = tmp;
-		s20.crypt20(digest, digest, 64);
+	for(unsigned long i=0;i<(ZT_IDENTITY_GEN_MEMORY / sizeof(uint64_t));) {
+		unsigned long idx1 = (unsigned long)(Utils::ntoh(((uint64_t *)genmem)[i++]) % (64 / sizeof(uint64_t)));
+		unsigned long idx2 = (unsigned long)(Utils::ntoh(((uint64_t *)genmem)[i++]) % (ZT_IDENTITY_GEN_MEMORY / sizeof(uint64_t)));
+		uint64_t tmp = ((uint64_t *)genmem)[idx2];
+		((uint64_t *)genmem)[idx2] = ((uint64_t *)digest)[idx1];
+		((uint64_t *)digest)[idx1] = tmp;
+		s20.encrypt20(digest,digest,64);
 	}
 }
 
 // Hashcash generation halting condition -- halt when first byte is less than
 // threshold value.
-struct _Identity_generate_cond {
-	_Identity_generate_cond()
+struct _Identity_generate_cond
+{
+	_Identity_generate_cond() throw() {}
+	_Identity_generate_cond(unsigned char *sb,char *gm) throw() : digest(sb),genmem(gm) {}
+	inline bool operator()(const C25519::Pair &kp) const
+		throw()
 	{
-	}
-	_Identity_generate_cond(unsigned char* sb, char* gm) : digest(sb), genmem(gm)
-	{
-	}
-	inline bool operator()(const ECC::Pair& kp) const
-	{
-		_computeMemoryHardHash(kp.pub.data, ZT_ECC_PUBLIC_KEY_SET_LEN, digest, genmem);
+		_computeMemoryHardHash(kp.pub.data,(unsigned int)kp.pub.size(),digest,genmem);
 		return (digest[0] < ZT_IDENTITY_GEN_HASHCASH_FIRST_BYTE_LESS_THAN);
 	}
-	unsigned char* digest;
-	char* genmem;
+	unsigned char *digest;
+	char *genmem;
 };
 
 void Identity::generate()
 {
 	unsigned char digest[64];
-	char* genmem = new char[ZT_IDENTITY_GEN_MEMORY];
+	char *genmem = new char[ZT_IDENTITY_GEN_MEMORY];
 
-	ECC::Pair kp;
+	C25519::Pair kp;
 	do {
-		kp = ECC::generateSatisfying(_Identity_generate_cond(digest, genmem));
-		_address.setTo(digest + 59, ZT_ADDRESS_LENGTH);	  // last 5 bytes are address
+		kp = C25519::generateSatisfying(_Identity_generate_cond(digest,genmem));
+		_address.setTo(digest + 59,ZT_ADDRESS_LENGTH); // last 5 bytes are address
 	} while (_address.isReserved());
 
 	_publicKey = kp.pub;
-	if (! _privateKey) {
-		_privateKey = new ECC::Private();
-	}
+	if (!_privateKey)
+		_privateKey = new C25519::Private();
 	*_privateKey = kp.priv;
 
-	delete[] genmem;
+	delete [] genmem;
 }
 
 bool Identity::locallyValidate() const
 {
-	if (_address.isReserved()) {
+	if (_address.isReserved())
 		return false;
-	}
 
 	unsigned char digest[64];
-	char* genmem = new char[ZT_IDENTITY_GEN_MEMORY];
-	_computeMemoryHardHash(_publicKey.data, ZT_ECC_PUBLIC_KEY_SET_LEN, digest, genmem);
-	delete[] genmem;
+	char *genmem = new char[ZT_IDENTITY_GEN_MEMORY];
+	_computeMemoryHardHash(_publicKey.data,(unsigned int)_publicKey.size(),digest,genmem);
+	delete [] genmem;
 
 	unsigned char addrb[5];
-	_address.copyTo(addrb, 5);
+	_address.copyTo(addrb,5);
 
-	return ((digest[0] < ZT_IDENTITY_GEN_HASHCASH_FIRST_BYTE_LESS_THAN) && (digest[59] == addrb[0]) && (digest[60] == addrb[1]) && (digest[61] == addrb[2]) && (digest[62] == addrb[3]) && (digest[63] == addrb[4]));
+	return (
+		(digest[0] < ZT_IDENTITY_GEN_HASHCASH_FIRST_BYTE_LESS_THAN)&&
+		(digest[59] == addrb[0])&&
+		(digest[60] == addrb[1])&&
+		(digest[61] == addrb[2])&&
+		(digest[62] == addrb[3])&&
+		(digest[63] == addrb[4]));
 }
 
-char* Identity::toString(bool includePrivate, char buf[ZT_IDENTITY_STRING_BUFFER_LENGTH]) const
+std::string Identity::toString(bool includePrivate) const
 {
-	char* p = buf;
-	Utils::hex10(_address.toInt(), p);
-	p += 10;
-	*(p++) = ':';
-	*(p++) = '0';
-	*(p++) = ':';
-	Utils::hex(_publicKey.data, ZT_ECC_PUBLIC_KEY_SET_LEN, p);
-	p += ZT_ECC_PUBLIC_KEY_SET_LEN * 2;
-	if ((_privateKey) && (includePrivate)) {
-		*(p++) = ':';
-		Utils::hex(_privateKey->data, ZT_ECC_PRIVATE_KEY_SET_LEN, p);
-		p += ZT_ECC_PRIVATE_KEY_SET_LEN * 2;
+	std::string r;
+
+	r.append(_address.toString());
+	r.append(":0:"); // 0 == IDENTITY_TYPE_C25519
+	r.append(Utils::hex(_publicKey.data,(unsigned int)_publicKey.size()));
+	if ((_privateKey)&&(includePrivate)) {
+		r.push_back(':');
+		r.append(Utils::hex(_privateKey->data,(unsigned int)_privateKey->size()));
 	}
-	*p = (char)0;
-	return buf;
+
+	return r;
 }
 
-bool Identity::fromString(const char* str)
+bool Identity::fromString(const char *str)
 {
-	if (! str) {
-		_address.zero();
+	if (!str)
 		return false;
-	}
-	char tmp[ZT_IDENTITY_STRING_BUFFER_LENGTH];
-	if (! Utils::scopy(tmp, sizeof(tmp), str)) {
-		_address.zero();
+
+	char *saveptr = (char *)0;
+	char tmp[1024];
+	if (!Utils::scopy(tmp,sizeof(tmp),str))
 		return false;
-	}
 
 	delete _privateKey;
-	_privateKey = (ECC::Private*)0;
+	_privateKey = (C25519::Private *)0;
 
 	int fno = 0;
-	char* saveptr = (char*)0;
-	for (char* f = Utils::stok(tmp, ":", &saveptr); (f); f = Utils::stok((char*)0, ":", &saveptr)) {
-		switch (fno++) {
+	for(char *f=Utils::stok(tmp,":",&saveptr);(f);f=Utils::stok((char *)0,":",&saveptr)) {
+		switch(fno++) {
 			case 0:
-				_address = Address(Utils::hexStrToU64(f));
-				if (_address.isReserved()) {
-					_address.zero();
+				_address = Address(f);
+				if (_address.isReserved())
 					return false;
-				}
 				break;
 			case 1:
-				if ((f[0] != '0') || (f[1])) {
-					_address.zero();
+				if ((f[0] != '0')||(f[1]))
 					return false;
-				}
 				break;
 			case 2:
-				if (Utils::unhex(f, _publicKey.data, ZT_ECC_PUBLIC_KEY_SET_LEN) != ZT_ECC_PUBLIC_KEY_SET_LEN) {
-					_address.zero();
+				if (Utils::unhex(f,_publicKey.data,(unsigned int)_publicKey.size()) != _publicKey.size())
 					return false;
-				}
 				break;
 			case 3:
-				_privateKey = new ECC::Private();
-				if (Utils::unhex(f, _privateKey->data, ZT_ECC_PRIVATE_KEY_SET_LEN) != ZT_ECC_PRIVATE_KEY_SET_LEN) {
-					_address.zero();
+				_privateKey = new C25519::Private();
+				if (Utils::unhex(f,_privateKey->data,(unsigned int)_privateKey->size()) != _privateKey->size())
 					return false;
-				}
 				break;
 			default:
-				_address.zero();
 				return false;
 		}
 	}
-	if (fno < 3) {
-		_address.zero();
+	if (fno < 3)
 		return false;
-	}
 
 	return true;
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Identity.hpp b/node/Identity.hpp
index 0f82d4916..e19c4980b 100644
--- a/node/Identity.hpp
+++ b/node/Identity.hpp
@@ -1,30 +1,35 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_IDENTITY_HPP
 #define ZT_IDENTITY_HPP
 
-#include "Address.hpp"
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "ECC.hpp"
-#include "SHA512.hpp"
-#include "Utils.hpp"
-
 #include <stdio.h>
 #include <stdlib.h>
+#include <string>
 
-#define ZT_IDENTITY_STRING_BUFFER_LENGTH 384
+#include "Constants.hpp"
+#include "Array.hpp"
+#include "Utils.hpp"
+#include "Address.hpp"
+#include "C25519.hpp"
+#include "Buffer.hpp"
+#include "SHA512.hpp"
 
 namespace ZeroTier {
 
@@ -38,49 +43,68 @@ namespace ZeroTier {
  * search for a different public key that duplicates an existing address. (See
  * code for deriveAddress() for this algorithm.)
  */
-class Identity {
-  public:
-	Identity() : _privateKey((ECC::Private*)0)
+class Identity
+{
+public:
+	/**
+	 * Identity types
+	 */
+	enum Type
+	{
+		IDENTITY_TYPE_C25519 = 0
+	};
+
+	Identity() :
+		_privateKey((C25519::Private *)0)
 	{
 	}
 
-	Identity(const Identity& id) : _address(id._address), _publicKey(id._publicKey), _privateKey((id._privateKey) ? new ECC::Private(*(id._privateKey)) : (ECC::Private*)0)
+	Identity(const Identity &id) :
+		_address(id._address),
+		_publicKey(id._publicKey),
+		_privateKey((id._privateKey) ? new C25519::Private(*(id._privateKey)) : (C25519::Private *)0)
 	{
 	}
 
-	Identity(const char* str) : _privateKey((ECC::Private*)0)
+	Identity(const char *str)
+		throw(std::invalid_argument) :
+		_privateKey((C25519::Private *)0)
 	{
-		if (! fromString(str)) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_TYPE;
-		}
+		if (!fromString(str))
+			throw std::invalid_argument(std::string("invalid string-serialized identity: ") + str);
 	}
 
-	template <unsigned int C> Identity(const Buffer<C>& b, unsigned int startAt = 0) : _privateKey((ECC::Private*)0)
+	Identity(const std::string &str)
+		throw(std::invalid_argument) :
+		_privateKey((C25519::Private *)0)
 	{
-		deserialize(b, startAt);
+		if (!fromString(str))
+			throw std::invalid_argument(std::string("invalid string-serialized identity: ") + str);
+	}
+
+	template<unsigned int C>
+	Identity(const Buffer<C> &b,unsigned int startAt = 0) :
+		_privateKey((C25519::Private *)0)
+	{
+		deserialize(b,startAt);
 	}
 
 	~Identity()
 	{
-		if (_privateKey) {
-			Utils::burn(_privateKey, sizeof(ECC::Private));
-			delete _privateKey;
-		}
+		delete _privateKey;
 	}
 
-	inline Identity& operator=(const Identity& id)
+	inline Identity &operator=(const Identity &id)
 	{
 		_address = id._address;
 		_publicKey = id._publicKey;
 		if (id._privateKey) {
-			if (! _privateKey) {
-				_privateKey = new ECC::Private();
-			}
+			if (!_privateKey)
+				_privateKey = new C25519::Private();
 			*_privateKey = *(id._privateKey);
-		}
-		else {
+		} else {
 			delete _privateKey;
-			_privateKey = (ECC::Private*)0;
+			_privateKey = (C25519::Private *)0;
 		}
 		return *this;
 	}
@@ -102,22 +126,7 @@ class Identity {
 	/**
 	 * @return True if this identity contains a private key
 	 */
-	inline bool hasPrivate() const
-	{
-		return (_privateKey != (ECC::Private*)0);
-	}
-
-	/**
-	 * Compute a SHA384 hash of this identity's address and public key(s).
-	 *
-	 * @param sha384buf Buffer with 48 bytes of space to receive hash
-	 */
-	inline void publicKeyHash(void* sha384buf) const
-	{
-		uint8_t address[ZT_ADDRESS_LENGTH];
-		_address.copyTo(address, ZT_ADDRESS_LENGTH);
-		SHA384(sha384buf, address, ZT_ADDRESS_LENGTH, _publicKey.data, ZT_ECC_PUBLIC_KEY_SET_LEN);
-	}
+	inline bool hasPrivate() const throw() { return (_privateKey != (C25519::Private *)0); }
 
 	/**
 	 * Compute the SHA512 hash of our private key (if we have one)
@@ -125,10 +134,10 @@ class Identity {
 	 * @param sha Buffer to receive SHA512 (MUST be ZT_SHA512_DIGEST_LEN (64) bytes in length)
 	 * @return True on success, false if no private key
 	 */
-	inline bool sha512PrivateKey(void* sha) const
+	inline bool sha512PrivateKey(void *sha) const
 	{
 		if (_privateKey) {
-			SHA512(sha, _privateKey->data, ZT_ECC_PRIVATE_KEY_SET_LEN);
+			SHA512::hash(sha,_privateKey->data,ZT_C25519_PRIVATE_KEY_LEN);
 			return true;
 		}
 		return false;
@@ -140,12 +149,12 @@ class Identity {
 	 * @param data Data to sign
 	 * @param len Length of data
 	 */
-	inline ECC::Signature sign(const void* data, unsigned int len) const
+	inline C25519::Signature sign(const void *data,unsigned int len) const
+		throw(std::runtime_error)
 	{
-		if (_privateKey) {
-			return ECC::sign(*_privateKey, _publicKey, data, len);
-		}
-		throw ZT_EXCEPTION_PRIVATE_KEY_REQUIRED;
+		if (_privateKey)
+			return C25519::sign(*_privateKey,_publicKey,data,len);
+		throw std::runtime_error("sign() requires a private key");
 	}
 
 	/**
@@ -157,12 +166,11 @@ class Identity {
 	 * @param siglen Length of signature in bytes
 	 * @return True if signature validates and data integrity checks
 	 */
-	inline bool verify(const void* data, unsigned int len, const void* signature, unsigned int siglen) const
+	inline bool verify(const void *data,unsigned int len,const void *signature,unsigned int siglen) const
 	{
-		if (siglen != ZT_ECC_SIGNATURE_LEN) {
+		if (siglen != ZT_C25519_SIGNATURE_LEN)
 			return false;
-		}
-		return ECC::verify(_publicKey, data, len, signature);
+		return C25519::verify(_publicKey,data,len,signature);
 	}
 
 	/**
@@ -173,9 +181,9 @@ class Identity {
 	 * @param signature Signature
 	 * @return True if signature validates and data integrity checks
 	 */
-	inline bool verify(const void* data, unsigned int len, const ECC::Signature& signature) const
+	inline bool verify(const void *data,unsigned int len,const C25519::Signature &signature) const
 	{
-		return ECC::verify(_publicKey, data, len, signature);
+		return C25519::verify(_publicKey,data,len,signature);
 	}
 
 	/**
@@ -185,24 +193,27 @@ class Identity {
 	 *
 	 * @param id Identity to agree with
 	 * @param key Result parameter to fill with key bytes
+	 * @param klen Length of key in bytes
 	 * @return Was agreement successful?
 	 */
-	inline bool agree(const Identity& id, void* const key) const
+	inline bool agree(const Identity &id,void *key,unsigned int klen) const
 	{
 		if (_privateKey) {
-			ECC::agree(*_privateKey, id._publicKey, key, ZT_SYMMETRIC_KEY_SIZE);
+			C25519::agree(*_privateKey,id._publicKey,key,klen);
 			return true;
 		}
 		return false;
 	}
 
+	/**
+	 * @return Identity type
+	 */
+	inline Type type() const throw() { return IDENTITY_TYPE_C25519; }
+
 	/**
 	 * @return This identity's address
 	 */
-	inline const Address& address() const
-	{
-		return _address;
-	}
+	inline const Address &address() const throw() { return _address; }
 
 	/**
 	 * Serialize this identity (binary)
@@ -211,18 +222,16 @@ class Identity {
 	 * @param includePrivate If true, include private key component (if present) (default: false)
 	 * @throws std::out_of_range Buffer too small
 	 */
-	template <unsigned int C> inline void serialize(Buffer<C>& b, bool includePrivate = false) const
+	template<unsigned int C>
+	inline void serialize(Buffer<C> &b,bool includePrivate = false) const
 	{
 		_address.appendTo(b);
-		b.append((uint8_t)0);	// C25519/Ed25519 identity type
-		b.append(_publicKey.data, ZT_ECC_PUBLIC_KEY_SET_LEN);
-		if ((_privateKey) && (includePrivate)) {
-			b.append((unsigned char)ZT_ECC_PRIVATE_KEY_SET_LEN);
-			b.append(_privateKey->data, ZT_ECC_PRIVATE_KEY_SET_LEN);
-		}
-		else {
-			b.append((unsigned char)0);
-		}
+		b.append((unsigned char)IDENTITY_TYPE_C25519);
+		b.append(_publicKey.data,(unsigned int)_publicKey.size());
+		if ((_privateKey)&&(includePrivate)) {
+			b.append((unsigned char)_privateKey->size());
+			b.append(_privateKey->data,(unsigned int)_privateKey->size());
+		} else b.append((unsigned char)0);
 	}
 
 	/**
@@ -237,31 +246,30 @@ class Identity {
 	 * @throws std::out_of_range Serialized data invalid
 	 * @throws std::invalid_argument Serialized data invalid
 	 */
-	template <unsigned int C> inline unsigned int deserialize(const Buffer<C>& b, unsigned int startAt = 0)
+	template<unsigned int C>
+	inline unsigned int deserialize(const Buffer<C> &b,unsigned int startAt = 0)
 	{
 		delete _privateKey;
-		_privateKey = (ECC::Private*)0;
+		_privateKey = (C25519::Private *)0;
 
 		unsigned int p = startAt;
 
-		_address.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
+		_address.setTo(b.field(p,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH);
 		p += ZT_ADDRESS_LENGTH;
 
-		if (b[p++] != 0) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_TYPE;
-		}
+		if (b[p++] != IDENTITY_TYPE_C25519)
+			throw std::invalid_argument("unsupported identity type");
 
-		memcpy(_publicKey.data, b.field(p, ZT_ECC_PUBLIC_KEY_SET_LEN), ZT_ECC_PUBLIC_KEY_SET_LEN);
-		p += ZT_ECC_PUBLIC_KEY_SET_LEN;
+		memcpy(_publicKey.data,b.field(p,(unsigned int)_publicKey.size()),(unsigned int)_publicKey.size());
+		p += (unsigned int)_publicKey.size();
 
 		unsigned int privateKeyLength = (unsigned int)b[p++];
 		if (privateKeyLength) {
-			if (privateKeyLength != ZT_ECC_PRIVATE_KEY_SET_LEN) {
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_CRYPTOGRAPHIC_TOKEN;
-			}
-			_privateKey = new ECC::Private();
-			memcpy(_privateKey->data, b.field(p, ZT_ECC_PRIVATE_KEY_SET_LEN), ZT_ECC_PRIVATE_KEY_SET_LEN);
-			p += ZT_ECC_PRIVATE_KEY_SET_LEN;
+			if (privateKeyLength != ZT_C25519_PRIVATE_KEY_LEN)
+				throw std::invalid_argument("invalid private key");
+			_privateKey = new C25519::Private();
+			memcpy(_privateKey->data,b.field(p,ZT_C25519_PRIVATE_KEY_LEN),ZT_C25519_PRIVATE_KEY_LEN);
+			p += ZT_C25519_PRIVATE_KEY_LEN;
 		}
 
 		return (p - startAt);
@@ -271,10 +279,9 @@ class Identity {
 	 * Serialize to a more human-friendly string
 	 *
 	 * @param includePrivate If true, include private key (if it exists)
-	 * @param buf Buffer to store string
 	 * @return ASCII string representation of identity
 	 */
-	char* toString(bool includePrivate, char buf[ZT_IDENTITY_STRING_BUFFER_LENGTH]) const;
+	std::string toString(bool includePrivate) const;
 
 	/**
 	 * Deserialize a human-friendly string
@@ -285,71 +292,27 @@ class Identity {
 	 * @param str String to deserialize
 	 * @return True if deserialization appears successful
 	 */
-	bool fromString(const char* str);
-
-	/**
-	 * @return C25519 public key
-	 */
-	inline const ECC::Public& publicKey() const
-	{
-		return _publicKey;
-	}
-
-	/**
-	 * @return C25519 key pair (only returns valid pair if private key is present in this Identity object)
-	 */
-	inline const ECC::Pair privateKeyPair() const
-	{
-		ECC::Pair pair;
-		pair.pub = _publicKey;
-		if (_privateKey) {
-			pair.priv = *_privateKey;
-		}
-		else {
-			memset(pair.priv.data, 0, ZT_ECC_PRIVATE_KEY_SET_LEN);
-		}
-		return pair;
-	}
+	bool fromString(const char *str);
+	inline bool fromString(const std::string &str) { return fromString(str.c_str()); }
 
 	/**
 	 * @return True if this identity contains something
 	 */
-	inline operator bool() const
-	{
-		return (_address);
-	}
+	inline operator bool() const throw() { return (_address); }
 
-	inline bool operator==(const Identity& id) const
-	{
-		return ((_address == id._address) && (memcmp(_publicKey.data, id._publicKey.data, ZT_ECC_PUBLIC_KEY_SET_LEN) == 0));
-	}
-	inline bool operator<(const Identity& id) const
-	{
-		return ((_address < id._address) || ((_address == id._address) && (memcmp(_publicKey.data, id._publicKey.data, ZT_ECC_PUBLIC_KEY_SET_LEN) < 0)));
-	}
-	inline bool operator!=(const Identity& id) const
-	{
-		return ! (*this == id);
-	}
-	inline bool operator>(const Identity& id) const
-	{
-		return (id < *this);
-	}
-	inline bool operator<=(const Identity& id) const
-	{
-		return ! (id < *this);
-	}
-	inline bool operator>=(const Identity& id) const
-	{
-		return ! (*this < id);
-	}
+	inline bool operator==(const Identity &id) const throw() { return ((_address == id._address)&&(_publicKey == id._publicKey)); }
+	inline bool operator<(const Identity &id) const throw() { return ((_address < id._address)||((_address == id._address)&&(_publicKey < id._publicKey))); }
+	inline bool operator!=(const Identity &id) const throw() { return !(*this == id); }
+	inline bool operator>(const Identity &id) const throw() { return (id < *this); }
+	inline bool operator<=(const Identity &id) const throw() { return !(id < *this); }
+	inline bool operator>=(const Identity &id) const throw() { return !(*this < id); }
 
-  private:
+private:
 	Address _address;
-	ECC::Public _publicKey;
-	ECC::Private* _privateKey;
+	C25519::Public _publicKey;
+	C25519::Private *_privateKey;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp
index 8cf210437..e4427f064 100644
--- a/node/IncomingPacket.cpp
+++ b/node/IncomingPacket.cpp
@@ -1,1557 +1,1335 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
-
-#include "IncomingPacket.hpp"
-
-#include "../include/ZeroTierOne.h"
-#include "../version.h"
-#include "Bond.hpp"
-#include "Capability.hpp"
-#include "CertificateOfMembership.hpp"
-#include "Constants.hpp"
-#include "Metrics.hpp"
-#include "NetworkController.hpp"
-#include "Node.hpp"
-#include "PacketMultiplexer.hpp"
-#include "Path.hpp"
-#include "Peer.hpp"
-#include "Revocation.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "SHA512.hpp"
-#include "Salsa20.hpp"
-#include "SelfAwareness.hpp"
-#include "Switch.hpp"
-#include "Tag.hpp"
-#include "Topology.hpp"
-#include "Trace.hpp"
-#include "World.hpp"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
+
+#include "../version.h"
+#include "../include/ZeroTierOne.h"
+
+#include "Constants.hpp"
+#include "RuntimeEnvironment.hpp"
+#include "IncomingPacket.hpp"
+#include "Topology.hpp"
+#include "Switch.hpp"
+#include "Peer.hpp"
+#include "NetworkController.hpp"
+#include "SelfAwareness.hpp"
+#include "Salsa20.hpp"
+#include "SHA512.hpp"
+#include "World.hpp"
+#include "Cluster.hpp"
+#include "Node.hpp"
+#include "DeferredPackets.hpp"
 
 namespace ZeroTier {
 
-bool IncomingPacket::tryDecode(const RuntimeEnvironment* RR, void* tPtr, int32_t flowId)
+bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred)
 {
 	const Address sourceAddress(source());
+	try {
+		if ((cipher() == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE)&&(verb() == Packet::VERB_HELLO)) {
+			// Unencrypted HELLOs require some potentially expensive verification, so
+			// do this in the background if background processing is enabled.
+			if ((RR->dpEnabled > 0)&&(!deferred)) {
+				RR->dp->enqueue(this);
+				return true; // 'handled' via deferring to background thread(s)
+			} else {
+				// A null pointer for peer to _doHELLO() tells it to run its own
+				// special internal authentication logic. This is done for unencrypted
+				// HELLOs to learn new identities, etc.
+				SharedPtr<Peer> tmp;
+				return _doHELLO(RR,tmp);
+			}
+		}
+
+		SharedPtr<Peer> peer(RR->topology->getPeer(sourceAddress));
+		if (peer) {
+			if (!dearmor(peer->key())) {
+				TRACE("dropped packet from %s(%s), MAC authentication failed (size: %u)",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),size());
+				return true;
+			}
+			if (!uncompress()) {
+				TRACE("dropped packet from %s(%s), compressed data invalid",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
+				return true;
+			}
+
+			const Packet::Verb v = verb();
+			//TRACE("<< %s from %s(%s)",Packet::verbString(v),sourceAddress.toString().c_str(),_remoteAddress.toString().c_str());
+			switch(v) {
+				//case Packet::VERB_NOP:
+				default: // ignore unknown verbs, but if they pass auth check they are "received"
+					peer->received(_localAddress,_remoteAddress,hops(),packetId(),v,0,Packet::VERB_NOP);
+					return true;
+
+				case Packet::VERB_HELLO:                          return _doHELLO(RR,peer);
+				case Packet::VERB_ERROR:                          return _doERROR(RR,peer);
+				case Packet::VERB_OK:                             return _doOK(RR,peer);
+				case Packet::VERB_WHOIS:                          return _doWHOIS(RR,peer);
+				case Packet::VERB_RENDEZVOUS:                     return _doRENDEZVOUS(RR,peer);
+				case Packet::VERB_FRAME:                          return _doFRAME(RR,peer);
+				case Packet::VERB_EXT_FRAME:                      return _doEXT_FRAME(RR,peer);
+				case Packet::VERB_ECHO:                           return _doECHO(RR,peer);
+				case Packet::VERB_MULTICAST_LIKE:                 return _doMULTICAST_LIKE(RR,peer);
+				case Packet::VERB_NETWORK_MEMBERSHIP_CERTIFICATE: return _doNETWORK_MEMBERSHIP_CERTIFICATE(RR,peer);
+				case Packet::VERB_NETWORK_CONFIG_REQUEST:         return _doNETWORK_CONFIG_REQUEST(RR,peer);
+				case Packet::VERB_NETWORK_CONFIG_REFRESH:         return _doNETWORK_CONFIG_REFRESH(RR,peer);
+				case Packet::VERB_MULTICAST_GATHER:               return _doMULTICAST_GATHER(RR,peer);
+				case Packet::VERB_MULTICAST_FRAME:                return _doMULTICAST_FRAME(RR,peer);
+				case Packet::VERB_PUSH_DIRECT_PATHS:              return _doPUSH_DIRECT_PATHS(RR,peer);
+				case Packet::VERB_CIRCUIT_TEST:                   return _doCIRCUIT_TEST(RR,peer);
+				case Packet::VERB_CIRCUIT_TEST_REPORT:            return _doCIRCUIT_TEST_REPORT(RR,peer);
+				case Packet::VERB_REQUEST_PROOF_OF_WORK:          return _doREQUEST_PROOF_OF_WORK(RR,peer);
+			}
+		} else {
+			RR->sw->requestWhois(sourceAddress);
+			return false;
+		}
+	} catch ( ... ) {
+		// Exceptions are more informatively caught in _do...() handlers but
+		// this outer try/catch will catch anything else odd.
+		TRACE("dropped ??? from %s(%s): unexpected exception in tryDecode()",sourceAddress.toString().c_str(),_remoteAddress.toString().c_str());
+		return true;
+	}
+}
+
+bool IncomingPacket::_doERROR(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		const Packet::Verb inReVerb = (Packet::Verb)(*this)[ZT_PROTO_VERB_ERROR_IDX_IN_RE_VERB];
+		const uint64_t inRePacketId = at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_IN_RE_PACKET_ID);
+		const Packet::ErrorCode errorCode = (Packet::ErrorCode)(*this)[ZT_PROTO_VERB_ERROR_IDX_ERROR_CODE];
+
+		//TRACE("ERROR %s from %s(%s) in-re %s",Packet::errorString(errorCode),peer->address().toString().c_str(),_remoteAddress.toString().c_str(),Packet::verbString(inReVerb));
+
+		switch(errorCode) {
+
+			case Packet::ERROR_OBJ_NOT_FOUND:
+				if (inReVerb == Packet::VERB_NETWORK_CONFIG_REQUEST) {
+					SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD)));
+					if ((network)&&(network->controller() == peer->address()))
+						network->setNotFound();
+				}
+				break;
+
+			case Packet::ERROR_UNSUPPORTED_OPERATION:
+				if (inReVerb == Packet::VERB_NETWORK_CONFIG_REQUEST) {
+					SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD)));
+					if ((network)&&(network->controller() == peer->address()))
+						network->setNotFound();
+				}
+				break;
+
+			case Packet::ERROR_IDENTITY_COLLISION:
+				if (RR->topology->isRoot(peer->identity()))
+					RR->node->postEvent(ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION);
+				break;
+
+			case Packet::ERROR_NEED_MEMBERSHIP_CERTIFICATE: {
+				/* Note: certificates are public so it's safe to push them to anyone
+				 * who asks. We won't communicate unless we also get a certificate
+				 * from the remote that agrees. */
+				SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD)));
+				if (network) {
+					if ((network->hasConfig())&&(network->config().com())) {
+						Packet outp(peer->address(),RR->identity.address(),Packet::VERB_NETWORK_MEMBERSHIP_CERTIFICATE);
+						network->config().com().serialize(outp);
+						outp.armor(peer->key(),true);
+						RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+					}
+				}
+			}	break;
+
+			case Packet::ERROR_NETWORK_ACCESS_DENIED_: {
+				SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD)));
+				if ((network)&&(network->controller() == peer->address()))
+					network->setAccessDenied();
+			}	break;
+
+			case Packet::ERROR_UNWANTED_MULTICAST: {
+				uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD);
+				MulticastGroup mg(MAC(field(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD + 8,6),6),at<uint32_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD + 14));
+				TRACE("%.16llx: peer %s unsubscrubed from multicast group %s",nwid,peer->address().toString().c_str(),mg.toString().c_str());
+				RR->mc->remove(nwid,mg,peer->address());
+			}	break;
+
+			default: break;
+		}
+
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_ERROR,inRePacketId,inReVerb);
+	} catch ( ... ) {
+		TRACE("dropped ERROR from %s(%s): unexpected exception",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doHELLO(const RuntimeEnvironment *RR,SharedPtr<Peer> &peer)
+{
+	/* Note: this is the only packet ever sent in the clear, and it's also
+	 * the only packet that we authenticate via a different path. Authentication
+	 * occurs here and is based on the validity of the identity and the
+	 * integrity of the packet's MAC, but it must be done after we check
+	 * the identity since HELLO is a mechanism for learning new identities
+	 * in the first place. */
 
 	try {
-		// Check for trusted paths or unencrypted HELLOs (HELLO is the only packet sent in the clear)
-		const unsigned int c = cipher();
-		if (c == ZT_PROTO_CIPHER_SUITE__NO_CRYPTO_TRUSTED_PATH) {
-			// If this is marked as a packet via a trusted path, check source address and path ID.
-			// Obviously if no trusted paths are configured this always returns false and such
-			// packets are dropped on the floor.
-			const uint64_t tpid = trustedPathId();
-			if (RR->topology->shouldInboundPathBeTrusted(_path->address(), tpid)) {
-				_authenticated = true;
-			}
-			else {
-				RR->t->incomingPacketMessageAuthenticationFailure(tPtr, _path, packetId(), sourceAddress, hops(), "path not trusted");
-				return true;
+		const uint64_t pid = packetId();
+		const Address fromAddress(source());
+		const unsigned int protoVersion = (*this)[ZT_PROTO_VERB_HELLO_IDX_PROTOCOL_VERSION];
+		const unsigned int vMajor = (*this)[ZT_PROTO_VERB_HELLO_IDX_MAJOR_VERSION];
+		const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO_IDX_MINOR_VERSION];
+		const unsigned int vRevision = at<uint16_t>(ZT_PROTO_VERB_HELLO_IDX_REVISION);
+		const uint64_t timestamp = at<uint64_t>(ZT_PROTO_VERB_HELLO_IDX_TIMESTAMP);
+
+		Identity id;
+		InetAddress externalSurfaceAddress;
+		uint64_t worldId = ZT_WORLD_ID_NULL;
+		uint64_t worldTimestamp = 0;
+		{
+			unsigned int ptr = ZT_PROTO_VERB_HELLO_IDX_IDENTITY + id.deserialize(*this,ZT_PROTO_VERB_HELLO_IDX_IDENTITY);
+			if (ptr < size()) // ZeroTier One < 1.0.3 did not include physical destination address info
+				ptr += externalSurfaceAddress.deserialize(*this,ptr);
+			if ((ptr + 16) <= size()) { // older versions also did not include World IDs or timestamps
+				worldId = at<uint64_t>(ptr); ptr += 8;
+				worldTimestamp = at<uint64_t>(ptr);
 			}
 		}
-		else if ((c == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE) && (verb() == Packet::VERB_HELLO)) {
-			// Only HELLO is allowed in the clear, but will still have a MAC
-			return _doHELLO(RR, tPtr, false);
+
+		if (protoVersion < ZT_PROTO_VERSION_MIN) {
+			TRACE("dropped HELLO from %s(%s): protocol version too old",id.address().toString().c_str(),_remoteAddress.toString().c_str());
+			return true;
+		}
+		if (fromAddress != id.address()) {
+			TRACE("dropped HELLO from %s(%s): identity not for sending address",fromAddress.toString().c_str(),_remoteAddress.toString().c_str());
+			return true;
 		}
 
-		const SharedPtr<Peer> peer(RR->topology->getPeer(tPtr, sourceAddress));
-		if (peer) {
-			if (! _authenticated) {
-				if (! dearmor(peer->key(), peer->aesKeys(), RR->identity)) {
-					RR->t->incomingPacketMessageAuthenticationFailure(tPtr, _path, packetId(), sourceAddress, hops(), "invalid MAC");
-					peer->recordIncomingInvalidPacket(_path);
-					return true;
-				}
-			}
+		if (!peer) { // peer == NULL is the normal case here
+			peer = RR->topology->getPeer(id.address());
+			if (peer) {
+				// We already have an identity with this address -- check for collisions
 
-			if (! uncompress()) {
-				RR->t->incomingPacketInvalid(tPtr, _path, packetId(), sourceAddress, hops(), Packet::VERB_NOP, "LZ4 decompression failed");
-				return true;
-			}
+				if (peer->identity() != id) {
+					// Identity is different from the one we already have -- address collision
 
-			_authenticated = true;
-			const Packet::Verb v = verb();
-
-			bool r = true;
-			switch (v) {
-				// case Packet::VERB_NOP:
-				default:   // ignore unknown verbs, but if they pass auth check they are "received"
-					Metrics::pkt_nop_in++;
-					peer->received(tPtr, _path, hops(), packetId(), payloadLength(), v, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
-					break;
-				case Packet::VERB_HELLO:
-					r = _doHELLO(RR, tPtr, true);
-					break;
-				case Packet::VERB_ACK:
-					r = _doACK(RR, tPtr, peer);
-					break;
-				case Packet::VERB_QOS_MEASUREMENT:
-					r = _doQOS_MEASUREMENT(RR, tPtr, peer);
-					break;
-				case Packet::VERB_ERROR:
-					r = _doERROR(RR, tPtr, peer);
-					break;
-				case Packet::VERB_OK:
-					r = _doOK(RR, tPtr, peer);
-					break;
-				case Packet::VERB_WHOIS:
-					r = _doWHOIS(RR, tPtr, peer);
-					break;
-				case Packet::VERB_RENDEZVOUS:
-					r = _doRENDEZVOUS(RR, tPtr, peer);
-					break;
-				case Packet::VERB_FRAME:
-					r = _doFRAME(RR, tPtr, peer, flowId);
-					break;
-				case Packet::VERB_EXT_FRAME:
-					r = _doEXT_FRAME(RR, tPtr, peer, flowId);
-					break;
-				case Packet::VERB_ECHO:
-					r = _doECHO(RR, tPtr, peer);
-					break;
-				case Packet::VERB_MULTICAST_LIKE:
-					r = _doMULTICAST_LIKE(RR, tPtr, peer);
-					break;
-				case Packet::VERB_NETWORK_CREDENTIALS:
-					r = _doNETWORK_CREDENTIALS(RR, tPtr, peer);
-					break;
-				case Packet::VERB_NETWORK_CONFIG_REQUEST:
-					r = _doNETWORK_CONFIG_REQUEST(RR, tPtr, peer);
-					break;
-				case Packet::VERB_NETWORK_CONFIG:
-					r = _doNETWORK_CONFIG(RR, tPtr, peer);
-					break;
-				case Packet::VERB_MULTICAST_GATHER:
-					r = _doMULTICAST_GATHER(RR, tPtr, peer);
-					break;
-				case Packet::VERB_MULTICAST_FRAME:
-					r = _doMULTICAST_FRAME(RR, tPtr, peer);
-					break;
-				case Packet::VERB_PUSH_DIRECT_PATHS:
-					r = _doPUSH_DIRECT_PATHS(RR, tPtr, peer);
-					break;
-				case Packet::VERB_USER_MESSAGE:
-					r = _doUSER_MESSAGE(RR, tPtr, peer);
-					break;
-				case Packet::VERB_REMOTE_TRACE:
-					r = _doREMOTE_TRACE(RR, tPtr, peer);
-					break;
-				case Packet::VERB_PATH_NEGOTIATION_REQUEST:
-					r = _doPATH_NEGOTIATION_REQUEST(RR, tPtr, peer);
-					break;
-			}
-			if (r) {
-				RR->node->statsLogVerb((unsigned int)v, (unsigned int)size());
-				return true;
-			}
-			return false;
-		}
-		else {
-			RR->sw->requestWhois(tPtr, RR->node->now(), sourceAddress);
-			return false;
-		}
-	}
-	catch (...) {
-		RR->t->incomingPacketInvalid(tPtr, _path, packetId(), sourceAddress, hops(), verb(), "unexpected exception in tryDecode()");
-		return true;
-	}
-}
-
-bool IncomingPacket::_doERROR(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	const Packet::Verb inReVerb = (Packet::Verb)(*this)[ZT_PROTO_VERB_ERROR_IDX_IN_RE_VERB];
-	const uint64_t inRePacketId = at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_IN_RE_PACKET_ID);
-	const Packet::ErrorCode errorCode = (Packet::ErrorCode)(*this)[ZT_PROTO_VERB_ERROR_IDX_ERROR_CODE];
-	uint64_t networkId = 0;
-
-	Metrics::pkt_error_in++;
-
-	/* Security note: we do not gate doERROR() with expectingReplyTo() to
-	 * avoid having to log every outgoing packet ID. Instead we put the
-	 * logic to determine whether we should consider an ERROR in each
-	 * error handler. In most cases these are only trusted in specific
-	 * circumstances. */
-
-	switch (errorCode) {
-		case Packet::ERROR_OBJ_NOT_FOUND:
-			// Object not found, currently only meaningful from network controllers.
-			if (inReVerb == Packet::VERB_NETWORK_CONFIG_REQUEST) {
-				const SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD)));
-				if ((network) && (network->controller() == peer->address())) {
-					network->setNotFound(tPtr);
-				}
-			}
-			Metrics::pkt_error_obj_not_found_in++;
-			break;
-
-		case Packet::ERROR_UNSUPPORTED_OPERATION:
-			// This can be sent in response to any operation, though right now we only
-			// consider it meaningful from network controllers. This would indicate
-			// that the queried node does not support acting as a controller.
-			if (inReVerb == Packet::VERB_NETWORK_CONFIG_REQUEST) {
-				const SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD)));
-				if ((network) && (network->controller() == peer->address())) {
-					network->setNotFound(tPtr);
-				}
-			}
-			Metrics::pkt_error_unsupported_op_in++;
-			break;
-
-		case Packet::ERROR_IDENTITY_COLLISION:
-			// FIXME: for federation this will need a payload with a signature or something.
-			if (RR->topology->isUpstream(peer->identity())) {
-				RR->node->postEvent(tPtr, ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION);
-			}
-			Metrics::pkt_error_identity_collision_in++;
-			break;
-
-		case Packet::ERROR_NEED_MEMBERSHIP_CERTIFICATE: {
-			// Peers can send this in response to frames if they do not have a recent enough COM from us
-			networkId = at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD);
-			const SharedPtr<Network> network(RR->node->network(networkId));
-			const int64_t now = RR->node->now();
-			if ((network) && (network->config().com)) {
-				network->peerRequestedCredentials(tPtr, peer->address(), now);
-			}
-			Metrics::pkt_error_need_membership_cert_in++;
-		} break;
-
-		case Packet::ERROR_NETWORK_ACCESS_DENIED_: {
-			// Network controller: network access denied.
-			const SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD)));
-			if ((network) && (network->controller() == peer->address())) {
-				network->setAccessDenied(tPtr);
-			}
-			Metrics::pkt_error_network_access_denied_in++;
-		} break;
-
-		case Packet::ERROR_UNWANTED_MULTICAST: {
-			// Members of networks can use this error to indicate that they no longer
-			// want to receive multicasts on a given channel.
-			networkId = at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD);
-			const SharedPtr<Network> network(RR->node->network(networkId));
-			if ((network) && (network->gate(tPtr, peer))) {
-				const MulticastGroup mg(MAC(field(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD + 8, 6), 6), at<uint32_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD + 14));
-				RR->mc->remove(network->id(), mg, peer->address());
-			}
-			Metrics::pkt_error_unwanted_multicast_in++;
-		} break;
-
-		case Packet::ERROR_NETWORK_AUTHENTICATION_REQUIRED: {
-			// fprintf(stderr, "\nPacket::ERROR_NETWORK_AUTHENTICATION_REQUIRED\n\n");
-			const SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD)));
-			if ((network) && (network->controller() == peer->address())) {
-				int s = (int)size() - (ZT_PROTO_VERB_ERROR_IDX_PAYLOAD + 8);
-				if (s > 2) {
-					const uint16_t errorDataSize = at<uint16_t>(ZT_PROTO_VERB_ERROR_IDX_PAYLOAD + 8);
-					s -= 2;
-					if (s >= (int)errorDataSize) {
-						Dictionary<8192> authInfo(((const char*)this->data()) + (ZT_PROTO_VERB_ERROR_IDX_PAYLOAD + 10), errorDataSize);
-
-						uint64_t authVer = authInfo.getUI(ZT_AUTHINFO_DICT_KEY_VERSION, 0ULL);
-
-						if (authVer == 0) {
-							char authenticationURL[2048];
-
-							if (authInfo.get(ZT_AUTHINFO_DICT_KEY_AUTHENTICATION_URL, authenticationURL, sizeof(authenticationURL)) > 0) {
-								authenticationURL[sizeof(authenticationURL) - 1] = 0;	// ensure always zero terminated
-								network->setAuthenticationRequired(tPtr, authenticationURL);
-							}
-						}
-						else if (authVer == 1) {
-							char issuerURL[2048] = { 0 };
-							char centralAuthURL[2048] = { 0 };
-							char ssoNonce[64] = { 0 };
-							char ssoState[128] = { 0 };
-							char ssoClientID[256] = { 0 };
-							char ssoProvider[64] = { 0 };
-
-							if (authInfo.get(ZT_AUTHINFO_DICT_KEY_ISSUER_URL, issuerURL, sizeof(issuerURL)) > 0) {
-								issuerURL[sizeof(issuerURL) - 1] = 0;
-							}
-							if (authInfo.get(ZT_AUTHINFO_DICT_KEY_CENTRAL_ENDPOINT_URL, centralAuthURL, sizeof(centralAuthURL)) > 0) {
-								centralAuthURL[sizeof(centralAuthURL) - 1] = 0;
-							}
-							if (authInfo.get(ZT_AUTHINFO_DICT_KEY_NONCE, ssoNonce, sizeof(ssoNonce)) > 0) {
-								ssoNonce[sizeof(ssoNonce) - 1] = 0;
-							}
-							if (authInfo.get(ZT_AUTHINFO_DICT_KEY_STATE, ssoState, sizeof(ssoState)) > 0) {
-								ssoState[sizeof(ssoState) - 1] = 0;
-							}
-							if (authInfo.get(ZT_AUTHINFO_DICT_KEY_CLIENT_ID, ssoClientID, sizeof(ssoClientID)) > 0) {
-								ssoClientID[sizeof(ssoClientID) - 1] = 0;
-							}
-							if (authInfo.get(ZT_AUTHINFO_DICT_KEY_SSO_PROVIDER, ssoProvider, sizeof(ssoProvider)) > 0) {
-								ssoProvider[sizeof(ssoProvider) - 1] = 0;
-							}
-							else {
-								strncpy(ssoProvider, "default", sizeof(ssoProvider));
-							}
-
-							network->setAuthenticationRequired(tPtr, issuerURL, centralAuthURL, ssoClientID, ssoProvider, ssoNonce, ssoState);
+					unsigned char key[ZT_PEER_SECRET_KEY_LENGTH];
+					if (RR->identity.agree(id,key,ZT_PEER_SECRET_KEY_LENGTH)) {
+						if (dearmor(key)) { // ensure packet is authentic, otherwise drop
+							TRACE("rejected HELLO from %s(%s): address already claimed",id.address().toString().c_str(),_remoteAddress.toString().c_str());
+							Packet outp(id.address(),RR->identity.address(),Packet::VERB_ERROR);
+							outp.append((unsigned char)Packet::VERB_HELLO);
+							outp.append((uint64_t)pid);
+							outp.append((unsigned char)Packet::ERROR_IDENTITY_COLLISION);
+							outp.armor(key,true);
+							RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+						} else {
+							TRACE("rejected HELLO from %s(%s): packet failed authentication",id.address().toString().c_str(),_remoteAddress.toString().c_str());
 						}
+					} else {
+						TRACE("rejected HELLO from %s(%s): key agreement failed",id.address().toString().c_str(),_remoteAddress.toString().c_str());
 					}
+
+					return true;
+				} else {
+					// Identity is the same as the one we already have -- check packet integrity
+
+					if (!dearmor(peer->key())) {
+						TRACE("rejected HELLO from %s(%s): packet failed authentication",id.address().toString().c_str(),_remoteAddress.toString().c_str());
+						return true;
+					}
+
+					// Continue at // VALID
 				}
-				else {
-					network->setAuthenticationRequired(tPtr, "");
-				}
-			}
-			Metrics::pkt_error_authentication_required_in++;
-		} break;
+			} else {
+				// We don't already have an identity with this address -- validate and learn it
 
-		default:
-			break;
-	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_ERROR, inRePacketId, inReVerb, false, networkId, ZT_QOS_NO_FLOW);
-
-	return true;
-}
-
-bool IncomingPacket::_doACK(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	/*
-	if (! peer->rateGateACK(RR->node->now())) {
-		return true;
-	}
-	int32_t ackedBytes;
-	if (payloadLength() != sizeof(ackedBytes)) {
-		return true;   // ignore
-	}
-	memcpy(&ackedBytes, payload(), sizeof(ackedBytes));
-	peer->receivedAck(_path, RR->node->now(), Utils::ntoh(ackedBytes));
-	*/
-	Metrics::pkt_ack_in++;
-	return true;
-}
-
-bool IncomingPacket::_doQOS_MEASUREMENT(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_qos_in++;
-	if (! peer->rateGateQoS(RR->node->now(), _path)) {
-		return true;
-	}
-	if (payloadLength() > ZT_QOS_MAX_PACKET_SIZE || payloadLength() < ZT_QOS_MIN_PACKET_SIZE) {
-		return true;   // ignore
-	}
-	const int64_t now = RR->node->now();
-	uint64_t rx_id[ZT_QOS_TABLE_SIZE];
-	uint16_t rx_ts[ZT_QOS_TABLE_SIZE];
-	char* begin = (char*)payload();
-	char* ptr = begin;
-	int count = 0;
-	unsigned int len = payloadLength();
-	// Read packet IDs and latency compensation intervals for each packet tracked by this QoS packet
-	while (ptr < (begin + len) && (count < ZT_QOS_TABLE_SIZE)) {
-		memcpy((void*)&rx_id[count], ptr, sizeof(uint64_t));
-		ptr += sizeof(uint64_t);
-		memcpy((void*)&rx_ts[count], ptr, sizeof(uint16_t));
-		ptr += sizeof(uint16_t);
-		count++;
-	}
-	peer->receivedQoS(_path, now, count, rx_id, rx_ts);
-	return true;
-}
-
-bool IncomingPacket::_doHELLO(const RuntimeEnvironment* RR, void* tPtr, const bool alreadyAuthenticated)
-{
-	Metrics::pkt_hello_in++;
-	const int64_t now = RR->node->now();
-
-	const uint64_t pid = packetId();
-	const Address fromAddress(source());
-	const unsigned int protoVersion = (*this)[ZT_PROTO_VERB_HELLO_IDX_PROTOCOL_VERSION];
-	const unsigned int vMajor = (*this)[ZT_PROTO_VERB_HELLO_IDX_MAJOR_VERSION];
-	const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO_IDX_MINOR_VERSION];
-	const unsigned int vRevision = at<uint16_t>(ZT_PROTO_VERB_HELLO_IDX_REVISION);
-	const int64_t timestamp = at<int64_t>(ZT_PROTO_VERB_HELLO_IDX_TIMESTAMP);
-	Identity id;
-	unsigned int ptr = ZT_PROTO_VERB_HELLO_IDX_IDENTITY + id.deserialize(*this, ZT_PROTO_VERB_HELLO_IDX_IDENTITY);
-
-	if (protoVersion < ZT_PROTO_VERSION_MIN) {
-		RR->t->incomingPacketDroppedHELLO(tPtr, _path, pid, fromAddress, "protocol version too old");
-		return true;
-	}
-	if (fromAddress != id.address()) {
-		RR->t->incomingPacketDroppedHELLO(tPtr, _path, pid, fromAddress, "identity/address mismatch");
-		return true;
-	}
-
-	SharedPtr<Peer> peer(RR->topology->getPeer(tPtr, id.address()));
-	if (peer) {
-		// We already have an identity with this address -- check for collisions
-		if (! alreadyAuthenticated) {
-			if (peer->identity() != id) {
-				// Identity is different from the one we already have -- address collision
-
-				// Check rate limits
-				if (! RR->node->rateGateIdentityVerification(now, _path->address())) {
+				// Check identity proof of work
+				if (!id.locallyValidate()) {
+					TRACE("dropped HELLO from %s(%s): identity invalid",id.address().toString().c_str(),_remoteAddress.toString().c_str());
 					return true;
 				}
 
-				uint8_t key[ZT_SYMMETRIC_KEY_SIZE];
-				if (RR->identity.agree(id, key)) {
-					if (dearmor(key, peer->aesKeysIfSupported(), RR->identity)) {	// ensure packet is authentic, otherwise drop
-						RR->t->incomingPacketDroppedHELLO(tPtr, _path, pid, fromAddress, "address collision");
-						Packet outp(id.address(), RR->identity.address(), Packet::VERB_ERROR);
-						outp.append((uint8_t)Packet::VERB_HELLO);
-						outp.append((uint64_t)pid);
-						outp.append((uint8_t)Packet::ERROR_IDENTITY_COLLISION);
-						outp.armor(key, true, false, peer->aesKeysIfSupported(), peer->identity());
-						Metrics::pkt_error_out++;
-						Metrics::pkt_error_identity_collision_out++;
-						_path->send(RR, tPtr, outp.data(), outp.size(), RR->node->now());
-					}
-					else {
-						RR->t->incomingPacketMessageAuthenticationFailure(tPtr, _path, pid, fromAddress, hops(), "invalid MAC");
-					}
-				}
-				else {
-					RR->t->incomingPacketMessageAuthenticationFailure(tPtr, _path, pid, fromAddress, hops(), "invalid identity");
-				}
-
-				return true;
-			}
-			else {
-				// Identity is the same as the one we already have -- check packet integrity
-
-				if (! dearmor(peer->key(), peer->aesKeysIfSupported(), RR->identity)) {
-					RR->t->incomingPacketMessageAuthenticationFailure(tPtr, _path, pid, fromAddress, hops(), "invalid MAC");
+				// Check packet integrity and authentication
+				SharedPtr<Peer> newPeer(new Peer(RR,RR->identity,id));
+				if (!dearmor(newPeer->key())) {
+					TRACE("rejected HELLO from %s(%s): packet failed authentication",id.address().toString().c_str(),_remoteAddress.toString().c_str());
 					return true;
 				}
+				peer = RR->topology->addPeer(newPeer);
 
 				// Continue at // VALID
 			}
-		}	// else if alreadyAuthenticated then continue at // VALID
-	}
-	else {
-		// We don't already have an identity with this address -- validate and learn it
 
-		// Sanity check: this basically can't happen
-		if (alreadyAuthenticated) {
-			RR->t->incomingPacketDroppedHELLO(tPtr, _path, pid, fromAddress, "illegal alreadyAuthenticated state");
-			return true;
+			// VALID -- if we made it here, packet passed identity and authenticity checks!
 		}
 
-		// Check rate limits
-		if (! RR->node->rateGateIdentityVerification(now, _path->address())) {
-			RR->t->incomingPacketDroppedHELLO(tPtr, _path, pid, fromAddress, "rate limit exceeded");
-			return true;
+		if (externalSurfaceAddress)
+			RR->sa->iam(id.address(),_localAddress,_remoteAddress,externalSurfaceAddress,RR->topology->isRoot(id),RR->node->now());
+
+		Packet outp(id.address(),RR->identity.address(),Packet::VERB_OK);
+		outp.append((unsigned char)Packet::VERB_HELLO);
+		outp.append((uint64_t)pid);
+		outp.append((uint64_t)timestamp);
+		outp.append((unsigned char)ZT_PROTO_VERSION);
+		outp.append((unsigned char)ZEROTIER_ONE_VERSION_MAJOR);
+		outp.append((unsigned char)ZEROTIER_ONE_VERSION_MINOR);
+		outp.append((uint16_t)ZEROTIER_ONE_VERSION_REVISION);
+		if (protoVersion >= 5) {
+			_remoteAddress.serialize(outp);
+		} else {
+			/* LEGACY COMPATIBILITY HACK:
+			 *
+			 * For a while now (since 1.0.3), ZeroTier has recognized changes in
+			 * its network environment empirically by examining its external network
+			 * address as reported by trusted peers. In versions prior to 1.1.0
+			 * (protocol version < 5), they did this by saving a snapshot of this
+			 * information (in SelfAwareness.hpp) keyed by reporting device ID and
+			 * address type.
+			 *
+			 * This causes problems when clustering is combined with symmetric NAT.
+			 * Symmetric NAT remaps ports, so different endpoints in a cluster will
+			 * report back different exterior addresses. Since the old code keys
+			 * this by device ID and not sending physical address and compares the
+			 * entire address including port, it constantly thinks its external
+			 * surface is changing and resets connections when talking to a cluster.
+			 *
+			 * In new code we key by sending physical address and device and we also
+			 * take the more conservative position of only interpreting changes in
+			 * IP address (neglecting port) as a change in network topology that
+			 * necessitates a reset. But we can make older clients work here by
+			 * nulling out the port field. Since this info is only used for empirical
+			 * detection of link changes, it doesn't break anything else.
+			 */
+			InetAddress tmpa(_remoteAddress);
+			tmpa.setPort(0);
+			tmpa.serialize(outp);
 		}
 
-		// Check packet integrity and MAC (this is faster than locallyValidate() so do it first to filter out total crap)
-		SharedPtr<Peer> newPeer(new Peer(RR, RR->identity, id));
-		if (! dearmor(newPeer->key(), newPeer->aesKeysIfSupported(), RR->identity)) {
-			RR->t->incomingPacketMessageAuthenticationFailure(tPtr, _path, pid, fromAddress, hops(), "invalid MAC");
-			return true;
+		if ((worldId != ZT_WORLD_ID_NULL)&&(RR->topology->worldTimestamp() > worldTimestamp)&&(worldId == RR->topology->worldId())) {
+			World w(RR->topology->world());
+			const unsigned int sizeAt = outp.size();
+			outp.addSize(2); // make room for 16-bit size field
+			w.serialize(outp,false);
+			outp.setAt<uint16_t>(sizeAt,(uint16_t)(outp.size() - (sizeAt + 2)));
+		} else {
+			outp.append((uint16_t)0); // no world update needed
 		}
 
-		// Check that identity's address is valid as per the derivation function
-		if (! id.locallyValidate()) {
-			RR->t->incomingPacketDroppedHELLO(tPtr, _path, pid, fromAddress, "invalid identity");
-			return true;
-		}
+		outp.armor(peer->key(),true);
+		RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
 
-		peer = RR->topology->addPeer(tPtr, newPeer);
-
-		// Continue at // VALID
+		peer->setRemoteVersion(protoVersion,vMajor,vMinor,vRevision); // important for this to go first so received() knows the version
+		peer->received(_localAddress,_remoteAddress,hops(),pid,Packet::VERB_HELLO,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped HELLO from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
 	}
-
-	// VALID -- if we made it here, packet passed identity and authenticity checks!
-
-	// Get external surface address if present (was not in old versions)
-	InetAddress externalSurfaceAddress;
-	if (ptr < size()) {
-		ptr += externalSurfaceAddress.deserialize(*this, ptr);
-		if ((externalSurfaceAddress) && (hops() == 0)) {
-			RR->sa->iam(tPtr, id.address(), _path->localSocket(), _path->address(), externalSurfaceAddress, RR->topology->isUpstream(id), now);
-		}
-	}
-
-	// Get primary planet world ID and world timestamp if present
-	uint64_t planetWorldId = 0;
-	uint64_t planetWorldTimestamp = 0;
-	if ((ptr + 16) <= size()) {
-		planetWorldId = at<uint64_t>(ptr);
-		ptr += 8;
-		planetWorldTimestamp = at<uint64_t>(ptr);
-		ptr += 8;
-	}
-
-	std::vector<std::pair<uint64_t, uint64_t> > moonIdsAndTimestamps;
-	if (ptr < size()) {
-		// Remainder of packet, if present, is encrypted
-		cryptField(peer->key(), ptr, size() - ptr);
-
-		// Get moon IDs and timestamps if present
-		if ((ptr + 2) <= size()) {
-			const unsigned int numMoons = at<uint16_t>(ptr);
-			ptr += 2;
-			for (unsigned int i = 0; i < numMoons; ++i) {
-				if ((World::Type)(*this)[ptr++] == World::TYPE_MOON) {
-					moonIdsAndTimestamps.push_back(std::pair<uint64_t, uint64_t>(at<uint64_t>(ptr), at<uint64_t>(ptr + 8)));
-				}
-				ptr += 16;
-			}
-		}
-	}
-
-	// Send OK(HELLO) with an echo of the packet's timestamp and some of the same
-	// information about us: version, sent-to address, etc.
-
-	Packet outp(id.address(), RR->identity.address(), Packet::VERB_OK);
-	outp.append((unsigned char)Packet::VERB_HELLO);
-	outp.append((uint64_t)pid);
-	outp.append((uint64_t)timestamp);
-	outp.append((unsigned char)ZT_PROTO_VERSION);
-	outp.append((unsigned char)ZEROTIER_ONE_VERSION_MAJOR);
-	outp.append((unsigned char)ZEROTIER_ONE_VERSION_MINOR);
-	outp.append((uint16_t)ZEROTIER_ONE_VERSION_REVISION);
-	_path->address().serialize(outp);
-	const unsigned int worldUpdateSizeAt = outp.size();
-	outp.addSize(2);   // make room for 16-bit size field
-	if ((planetWorldId) && (RR->topology->planetWorldTimestamp() > planetWorldTimestamp) && (planetWorldId == RR->topology->planetWorldId())) {
-		RR->topology->planet().serialize(outp, false);
-	}
-	if (! moonIdsAndTimestamps.empty()) {
-		std::vector<World> moons(RR->topology->moons());
-		for (std::vector<World>::const_iterator m(moons.begin()); m != moons.end(); ++m) {
-			for (std::vector<std::pair<uint64_t, uint64_t> >::const_iterator i(moonIdsAndTimestamps.begin()); i != moonIdsAndTimestamps.end(); ++i) {
-				if (i->first == m->id()) {
-					if (m->timestamp() > i->second) {
-						m->serialize(outp, false);
-					}
-					break;
-				}
-			}
-		}
-	}
-	outp.setAt<uint16_t>(worldUpdateSizeAt, (uint16_t)(outp.size() - (worldUpdateSizeAt + 2)));
-
-	outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), peer->identity());
-	peer->recordOutgoingPacket(_path, outp.packetId(), outp.payloadLength(), outp.verb(), ZT_QOS_NO_FLOW, now);
-	Metrics::pkt_ok_out++;
-	_path->send(RR, tPtr, outp.data(), outp.size(), now);
-
-	peer->setRemoteVersion(protoVersion, vMajor, vMinor, vRevision);   // important for this to go first so received() knows the version
-	peer->received(tPtr, _path, hops(), pid, payloadLength(), Packet::VERB_HELLO, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
-
 	return true;
 }
 
-bool IncomingPacket::_doOK(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
+bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
 {
-	Metrics::pkt_ok_in++;
-	const Packet::Verb inReVerb = (Packet::Verb)(*this)[ZT_PROTO_VERB_OK_IDX_IN_RE_VERB];
-	const uint64_t inRePacketId = at<uint64_t>(ZT_PROTO_VERB_OK_IDX_IN_RE_PACKET_ID);
-	uint64_t networkId = 0;
+	try {
+		const Packet::Verb inReVerb = (Packet::Verb)(*this)[ZT_PROTO_VERB_OK_IDX_IN_RE_VERB];
+		const uint64_t inRePacketId = at<uint64_t>(ZT_PROTO_VERB_OK_IDX_IN_RE_PACKET_ID);
 
-	if (! RR->node->expectingReplyTo(inRePacketId)) {
-		return true;
-	}
+		//TRACE("%s(%s): OK(%s)",source().toString().c_str(),_remoteAddress.toString().c_str(),Packet::verbString(inReVerb));
 
-	switch (inReVerb) {
-		case Packet::VERB_HELLO: {
-			const uint64_t latency = RR->node->now() - at<uint64_t>(ZT_PROTO_VERB_HELLO__OK__IDX_TIMESTAMP);
-			const unsigned int vProto = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_PROTOCOL_VERSION];
-			const unsigned int vMajor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MAJOR_VERSION];
-			const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION];
-			const unsigned int vRevision = at<uint16_t>(ZT_PROTO_VERB_HELLO__OK__IDX_REVISION);
-			if (vProto < ZT_PROTO_VERSION_MIN) {
-				return true;
-			}
+		switch(inReVerb) {
 
-			InetAddress externalSurfaceAddress;
-			unsigned int ptr = ZT_PROTO_VERB_HELLO__OK__IDX_REVISION + 2;
+			case Packet::VERB_HELLO: {
+				const unsigned int latency = std::min((unsigned int)(RR->node->now() - at<uint64_t>(ZT_PROTO_VERB_HELLO__OK__IDX_TIMESTAMP)),(unsigned int)0xffff);
+				const unsigned int vProto = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_PROTOCOL_VERSION];
+				const unsigned int vMajor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MAJOR_VERSION];
+				const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION];
+				const unsigned int vRevision = at<uint16_t>(ZT_PROTO_VERB_HELLO__OK__IDX_REVISION);
 
-			// Get reported external surface address if present
-			if (ptr < size()) {
-				ptr += externalSurfaceAddress.deserialize(*this, ptr);
-			}
+				if (vProto < ZT_PROTO_VERSION_MIN) {
+					TRACE("%s(%s): OK(HELLO) dropped, protocol version too old",source().toString().c_str(),_remoteAddress.toString().c_str());
+					return true;
+				}
 
-			// Handle planet or moon updates if present
-			if ((ptr + 2) <= size()) {
-				const unsigned int worldsLen = at<uint16_t>(ptr);
-				ptr += 2;
-				if (RR->topology->shouldAcceptWorldUpdateFrom(peer->address())) {
-					const unsigned int endOfWorlds = ptr + worldsLen;
-					while (ptr < endOfWorlds) {
+				const bool trusted = RR->topology->isRoot(peer->identity());
+
+				InetAddress externalSurfaceAddress;
+				unsigned int ptr = ZT_PROTO_VERB_HELLO__OK__IDX_REVISION + 2;
+				if (ptr < size()) // ZeroTier One < 1.0.3 did not include this field
+					ptr += externalSurfaceAddress.deserialize(*this,ptr);
+				if ((trusted)&&((ptr + 2) <= size())) { // older versions also did not include this field, and right now we only use if from a root
+					World worldUpdate;
+					const unsigned int worldLen = at<uint16_t>(ptr); ptr += 2;
+					if (worldLen > 0) {
 						World w;
-						ptr += w.deserialize(*this, ptr);
-						RR->topology->addWorld(tPtr, w, false);
+						w.deserialize(*this,ptr);
+						RR->topology->worldUpdateIfValid(w);
 					}
 				}
-				else {
-					ptr += worldsLen;
+
+				TRACE("%s(%s): OK(HELLO), version %u.%u.%u, latency %u, reported external address %s",source().toString().c_str(),_remoteAddress.toString().c_str(),vMajor,vMinor,vRevision,latency,((externalSurfaceAddress) ? externalSurfaceAddress.toString().c_str() : "(none)"));
+
+				peer->addDirectLatencyMeasurment(latency);
+				peer->setRemoteVersion(vProto,vMajor,vMinor,vRevision);
+
+				if (externalSurfaceAddress)
+					RR->sa->iam(peer->address(),_localAddress,_remoteAddress,externalSurfaceAddress,trusted,RR->node->now());
+			}	break;
+
+			case Packet::VERB_WHOIS: {
+				if (RR->topology->isRoot(peer->identity())) {
+					const Identity id(*this,ZT_PROTO_VERB_WHOIS__OK__IDX_IDENTITY);
+					// Right now we can skip this since OK(WHOIS) is only accepted from
+					// roots. In the future it should be done if we query less trusted
+					// sources.
+					//if (id.locallyValidate())
+						RR->sw->doAnythingWaitingForPeer(RR->topology->addPeer(SharedPtr<Peer>(new Peer(RR,RR->identity,id))));
 				}
-			}
+			} break;
 
-			if (! hops()) {
-				_path->updateLatency((unsigned int)latency, RR->node->now());
-			}
+			case Packet::VERB_NETWORK_CONFIG_REQUEST: {
+				const SharedPtr<Network> nw(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_NETWORK_ID)));
+				if ((nw)&&(nw->controller() == peer->address())) {
+					const unsigned int dictlen = at<uint16_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT_LEN);
+					const std::string dict((const char *)field(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT,dictlen),dictlen);
+					if (dict.length()) {
+						nw->setConfiguration(Dictionary(dict));
+						TRACE("got network configuration for network %.16llx from %s",(unsigned long long)nw->id(),source().toString().c_str());
+					}
+				}
+			}	break;
 
-			peer->setRemoteVersion(vProto, vMajor, vMinor, vRevision);
+			//case Packet::VERB_ECHO: {
+			//}	break;
 
-			if ((externalSurfaceAddress) && (hops() == 0)) {
-				RR->sa->iam(tPtr, peer->address(), _path->localSocket(), _path->address(), externalSurfaceAddress, RR->topology->isUpstream(peer->identity()), RR->node->now());
-			}
-		} break;
-
-		case Packet::VERB_WHOIS:
-			if (RR->topology->isUpstream(peer->identity())) {
-				const Identity id(*this, ZT_PROTO_VERB_WHOIS__OK__IDX_IDENTITY);
-				RR->sw->doAnythingWaitingForPeer(tPtr, RR->topology->addPeer(tPtr, SharedPtr<Peer>(new Peer(RR, RR->identity, id))));
-			}
-			break;
-
-		case Packet::VERB_NETWORK_CONFIG_REQUEST: {
-			networkId = at<uint64_t>(ZT_PROTO_VERB_OK_IDX_PAYLOAD);
-			const SharedPtr<Network> network(RR->node->network(networkId));
-			if (network) {
-				network->handleConfigChunk(tPtr, packetId(), source(), *this, ZT_PROTO_VERB_OK_IDX_PAYLOAD);
-			}
-		} break;
-
-		case Packet::VERB_MULTICAST_GATHER: {
-			networkId = at<uint64_t>(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_NETWORK_ID);
-			const SharedPtr<Network> network(RR->node->network(networkId));
-			if (network) {
-				const MulticastGroup mg(MAC(field(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_MAC, 6), 6), at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_ADI));
+			case Packet::VERB_MULTICAST_GATHER: {
+				const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_NETWORK_ID);
+				const MulticastGroup mg(MAC(field(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_MAC,6),6),at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_ADI));
+				TRACE("%s(%s): OK(MULTICAST_GATHER) %.16llx/%s length %u",source().toString().c_str(),_remoteAddress.toString().c_str(),nwid,mg.toString().c_str(),size());
 				const unsigned int count = at<uint16_t>(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_GATHER_RESULTS + 4);
-				RR->mc->addMultiple(tPtr, RR->node->now(), networkId, mg, field(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_GATHER_RESULTS + 6, count * 5), count, at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_GATHER_RESULTS));
-			}
-		} break;
+				RR->mc->addMultiple(RR->node->now(),nwid,mg,field(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_GATHER_RESULTS + 6,count * 5),count,at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_GATHER_RESULTS));
+			}	break;
 
-		case Packet::VERB_MULTICAST_FRAME: {
-			const unsigned int flags = (*this)[ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_FLAGS];
-			networkId = at<uint64_t>(ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_NETWORK_ID);
-			const MulticastGroup mg(MAC(field(ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_MAC, 6), 6), at<uint32_t>(ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_ADI));
+			case Packet::VERB_MULTICAST_FRAME: {
+				const unsigned int flags = (*this)[ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_FLAGS];
+				const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_NETWORK_ID);
+				const MulticastGroup mg(MAC(field(ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_MAC,6),6),at<uint32_t>(ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_ADI));
+
+				//TRACE("%s(%s): OK(MULTICAST_FRAME) %.16llx/%s flags %.2x",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),nwid,mg.toString().c_str(),flags);
 
-			const SharedPtr<Network> network(RR->node->network(networkId));
-			if (network) {
 				unsigned int offset = 0;
 
-				if ((flags & 0x01) != 0) {	 // deprecated but still used by older peers
+				if ((flags & 0x01) != 0) {
+					// OK(MULTICAST_FRAME) includes certificate of membership update
 					CertificateOfMembership com;
-					offset += com.deserialize(*this, ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_COM_AND_GATHER_RESULTS);
-					if (com) {
-						network->addCredential(tPtr, com);
-					}
+					offset += com.deserialize(*this,ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_COM_AND_GATHER_RESULTS);
+					peer->validateAndSetNetworkMembershipCertificate(nwid,com);
 				}
 
 				if ((flags & 0x02) != 0) {
 					// OK(MULTICAST_FRAME) includes implicit gather results
 					offset += ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_COM_AND_GATHER_RESULTS;
-					unsigned int totalKnown = at<uint32_t>(offset);
-					offset += 4;
-					unsigned int count = at<uint16_t>(offset);
-					offset += 2;
-					RR->mc->addMultiple(tPtr, RR->node->now(), networkId, mg, field(offset, count * 5), count, totalKnown);
+					unsigned int totalKnown = at<uint32_t>(offset); offset += 4;
+					unsigned int count = at<uint16_t>(offset); offset += 2;
+					RR->mc->addMultiple(RR->node->now(),nwid,mg,field(offset,count * 5),count,totalKnown);
 				}
-			}
-		} break;
+			}	break;
 
-		default:
-			break;
+			default: break;
+		}
+
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_OK,inRePacketId,inReVerb);
+	} catch ( ... ) {
+		TRACE("dropped OK from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
 	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_OK, inRePacketId, inReVerb, false, networkId, ZT_QOS_NO_FLOW);
-
 	return true;
 }
 
-bool IncomingPacket::_doWHOIS(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
+bool IncomingPacket::_doWHOIS(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
 {
-	if ((! RR->topology->amUpstream()) && (! peer->rateGateInboundWhoisRequest(RR->node->now()))) {
-		return true;
-	}
-
-	Metrics::pkt_whois_in++;
-
-	Packet outp(peer->address(), RR->identity.address(), Packet::VERB_OK);
-	outp.append((unsigned char)Packet::VERB_WHOIS);
-	outp.append(packetId());
-
-	unsigned int count = 0;
-	unsigned int ptr = ZT_PACKET_IDX_PAYLOAD;
-	while ((ptr + ZT_ADDRESS_LENGTH) <= size()) {
-		const Address addr(field(ptr, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		ptr += ZT_ADDRESS_LENGTH;
-
-		const Identity id(RR->topology->getIdentity(tPtr, addr));
-		if (id) {
-			id.serialize(outp, false);
-			++count;
-		}
-		else {
-			// Request unknown WHOIS from upstream from us (if we have one)
-			RR->sw->requestWhois(tPtr, RR->node->now(), addr);
+	try {
+		if (payloadLength() == ZT_ADDRESS_LENGTH) {
+			Identity queried(RR->topology->getIdentity(Address(payload(),ZT_ADDRESS_LENGTH)));
+			if (queried) {
+				Packet outp(peer->address(),RR->identity.address(),Packet::VERB_OK);
+				outp.append((unsigned char)Packet::VERB_WHOIS);
+				outp.append(packetId());
+				queried.serialize(outp,false);
+				outp.armor(peer->key(),true);
+				RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+			} else {
+#ifdef ZT_ENABLE_CLUSTER
+				if (RR->cluster)
+					RR->cluster->sendDistributedQuery(*this);
+#endif
+			}
+		} else {
+			TRACE("dropped WHOIS from %s(%s): missing or invalid address",source().toString().c_str(),_remoteAddress.toString().c_str());
 		}
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_WHOIS,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped WHOIS from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
 	}
-
-	if (count > 0) {
-		Metrics::pkt_ok_out++;
-		outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), RR->identity);
-		_path->send(RR, tPtr, outp.data(), outp.size(), RR->node->now());
-	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_WHOIS, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
-
 	return true;
 }
 
-bool IncomingPacket::_doRENDEZVOUS(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
+bool IncomingPacket::_doRENDEZVOUS(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
 {
-	Metrics::pkt_rendezvous_in++;
-	if (RR->topology->isUpstream(peer->identity())) {
-		const Address with(field(ZT_PROTO_VERB_RENDEZVOUS_IDX_ZTADDRESS, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		const SharedPtr<Peer> rendezvousWith(RR->topology->getPeer(tPtr, with));
-		if (rendezvousWith) {
-			const unsigned int port = at<uint16_t>(ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT);
-			const unsigned int addrlen = (*this)[ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN];
-			if ((port > 0) && ((addrlen == 4) || (addrlen == 16))) {
-				InetAddress atAddr(field(ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRESS, addrlen), addrlen, port);
-				if (RR->node->shouldUsePathForZeroTierTraffic(tPtr, with, _path->localSocket(), atAddr)) {
-					const uint64_t junk = RR->node->prng();
-					RR->node->putPacket(tPtr, _path->localSocket(), atAddr, &junk, 4, 2);	// send low-TTL junk packet to 'open' local NAT(s) and stateful firewalls
-					rendezvousWith->attemptToContactAt(tPtr, _path->localSocket(), atAddr, RR->node->now(), false);
+	try {
+		if (RR->topology->isUpstream(peer->identity())) {
+			const Address with(field(ZT_PROTO_VERB_RENDEZVOUS_IDX_ZTADDRESS,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH);
+			const SharedPtr<Peer> withPeer(RR->topology->getPeer(with));
+			if (withPeer) {
+				const unsigned int port = at<uint16_t>(ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT);
+				const unsigned int addrlen = (*this)[ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN];
+				if ((port > 0)&&((addrlen == 4)||(addrlen == 16))) {
+					peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_RENDEZVOUS,0,Packet::VERB_NOP);
+
+					InetAddress atAddr(field(ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRESS,addrlen),addrlen,port);
+					TRACE("RENDEZVOUS from %s says %s might be at %s, starting NAT-t",peer->address().toString().c_str(),with.toString().c_str(),atAddr.toString().c_str());
+					if (RR->node->shouldUsePathForZeroTierTraffic(_localAddress,atAddr))
+						RR->sw->rendezvous(withPeer,_localAddress,atAddr);
+				} else {
+					TRACE("dropped corrupt RENDEZVOUS from %s(%s) (bad address or port)",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
 				}
+			} else {
+				RR->sw->requestWhois(with);
+				TRACE("ignored RENDEZVOUS from %s(%s) to meet unknown peer %s",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),with.toString().c_str());
 			}
+		} else {
+			TRACE("ignored RENDEZVOUS from %s(%s): not a root server or a network relay",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
 		}
+	} catch ( ... ) {
+		TRACE("dropped RENDEZVOUS from %s(%s): unexpected exception",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
 	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_RENDEZVOUS, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
-
 	return true;
 }
 
-// Returns true if packet appears valid; pos and proto will be set
-static bool _ipv6GetPayload(const uint8_t* frameData, unsigned int frameLen, unsigned int& pos, unsigned int& proto)
+bool IncomingPacket::_doFRAME(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
 {
-	if (frameLen < 40) {
-		return false;
-	}
-	pos = 40;
-	proto = frameData[6];
-	while (pos <= frameLen) {
-		switch (proto) {
-			case 0:		// hop-by-hop options
-			case 43:	// routing
-			case 60:	// destination options
-			case 135:	// mobility options
-				if ((pos + 8) > frameLen) {
-					return false;	// invalid!
-				}
-				proto = frameData[pos];
-				pos += ((unsigned int)frameData[pos + 1] * 8) + 8;
-				break;
-
-			// case 44: // fragment -- we currently can't parse these and they are deprecated in IPv6 anyway
-			// case 50:
-			// case 51: // IPSec ESP and AH -- we have to stop here since this is encrypted stuff
-			default:
-				return true;
-		}
-	}
-	return false;	// overflow == invalid
-}
-
-bool IncomingPacket::_doFRAME(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer, int32_t flowId)
-{
-	Metrics::pkt_frame_in++;
-	int32_t _flowId = ZT_QOS_NO_FLOW;
-
-	if (peer->flowHashingSupported()) {
-		if (size() > ZT_PROTO_VERB_FRAME_IDX_PAYLOAD) {
-			const unsigned int etherType = at<uint16_t>(ZT_PROTO_VERB_FRAME_IDX_ETHERTYPE);
-			const unsigned int frameLen = size() - ZT_PROTO_VERB_FRAME_IDX_PAYLOAD;
-			const uint8_t* const frameData = reinterpret_cast<const uint8_t*>(data()) + ZT_PROTO_VERB_FRAME_IDX_PAYLOAD;
-
-			if (etherType == ZT_ETHERTYPE_IPV4 && (frameLen >= 20)) {
-				uint16_t srcPort = 0;
-				uint16_t dstPort = 0;
-				uint8_t proto = (reinterpret_cast<const uint8_t*>(frameData)[9]);
-				const unsigned int headerLen = 4 * (reinterpret_cast<const uint8_t*>(frameData)[0] & 0xf);
-				switch (proto) {
-					case 0x01:	 // ICMP
-						// flowId = 0x01;
-						break;
-					// All these start with 16-bit source and destination port in that order
-					case 0x06:	 // TCP
-					case 0x11:	 // UDP
-					case 0x84:	 // SCTP
-					case 0x88:	 // UDPLite
-						if (frameLen > (headerLen + 4)) {
-							unsigned int pos = headerLen + 0;
-							srcPort = (reinterpret_cast<const uint8_t*>(frameData)[pos++]) << 8;
-							srcPort |= (reinterpret_cast<const uint8_t*>(frameData)[pos]);
-							pos++;
-							dstPort = (reinterpret_cast<const uint8_t*>(frameData)[pos++]) << 8;
-							dstPort |= (reinterpret_cast<const uint8_t*>(frameData)[pos]);
-							_flowId = dstPort ^ srcPort ^ proto;
-						}
-						break;
-				}
-			}
-
-			if (etherType == ZT_ETHERTYPE_IPV6 && (frameLen >= 40)) {
-				uint16_t srcPort = 0;
-				uint16_t dstPort = 0;
-				unsigned int pos;
-				unsigned int proto;
-				_ipv6GetPayload((const uint8_t*)frameData, frameLen, pos, proto);
-				switch (proto) {
-					case 0x3A:	 // ICMPv6
-						// flowId = 0x3A;
-						break;
-					// All these start with 16-bit source and destination port in that order
-					case 0x06:	 // TCP
-					case 0x11:	 // UDP
-					case 0x84:	 // SCTP
-					case 0x88:	 // UDPLite
-						if (frameLen > (pos + 4)) {
-							srcPort = (reinterpret_cast<const uint8_t*>(frameData)[pos++]) << 8;
-							srcPort |= (reinterpret_cast<const uint8_t*>(frameData)[pos]);
-							pos++;
-							dstPort = (reinterpret_cast<const uint8_t*>(frameData)[pos++]) << 8;
-							dstPort |= (reinterpret_cast<const uint8_t*>(frameData)[pos]);
-							_flowId = dstPort ^ srcPort ^ proto;
-						}
-						break;
-					default:
-						break;
-				}
-			}
-		}
-	}
-
-	const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_FRAME_IDX_NETWORK_ID);
-	const SharedPtr<Network> network(RR->node->network(nwid));
-	bool trustEstablished = false;
-	if (network) {
-		if (network->gate(tPtr, peer)) {
-			trustEstablished = true;
+	try {
+		const SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_FRAME_IDX_NETWORK_ID)));
+		if (network) {
 			if (size() > ZT_PROTO_VERB_FRAME_IDX_PAYLOAD) {
-				const unsigned int etherType = at<uint16_t>(ZT_PROTO_VERB_FRAME_IDX_ETHERTYPE);
-				const MAC sourceMac(peer->address(), nwid);
-				const unsigned int frameLen = size() - ZT_PROTO_VERB_FRAME_IDX_PAYLOAD;
-				const uint8_t* const frameData = reinterpret_cast<const uint8_t*>(data()) + ZT_PROTO_VERB_FRAME_IDX_PAYLOAD;
-				if (network->filterIncomingPacket(tPtr, peer, RR->identity.address(), sourceMac, network->mac(), frameData, frameLen, etherType, 0) > 0) {
-					RR->pm->putFrame(tPtr, nwid, network->userPtr(), sourceMac, network->mac(), etherType, 0, (const void*)frameData, frameLen, _flowId);
-				}
-			}
-		}
-		else {
-			_sendErrorNeedCredentials(RR, tPtr, peer, nwid);
-			return false;
-		}
-	}
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_FRAME, 0, Packet::VERB_NOP, trustEstablished, nwid, _flowId);
-
-	return true;
-}
-
-bool IncomingPacket::_doEXT_FRAME(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer, int32_t flowId)
-{
-	Metrics::pkt_ext_frame_in++;
-
-	int32_t _flowId = ZT_QOS_NO_FLOW;
-	if (peer->flowHashingSupported()) {
-		if (size() > ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD) {
-			const unsigned int etherType = at<uint16_t>(ZT_PROTO_VERB_EXT_FRAME_IDX_ETHERTYPE);
-			const unsigned int frameLen = size() - ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD;
-			const uint8_t* const frameData = reinterpret_cast<const uint8_t*>(data()) + ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD;
-
-			if (etherType == ZT_ETHERTYPE_IPV4 && (frameLen >= 20)) {
-				uint16_t srcPort = 0;
-				uint16_t dstPort = 0;
-				uint8_t proto = (reinterpret_cast<const uint8_t*>(frameData)[9]);
-				const unsigned int headerLen = 4 * (reinterpret_cast<const uint8_t*>(frameData)[0] & 0xf);
-				switch (proto) {
-					case 0x01:	 // ICMP
-						// flowId = 0x01;
-						break;
-					// All these start with 16-bit source and destination port in that order
-					case 0x06:	 // TCP
-					case 0x11:	 // UDP
-					case 0x84:	 // SCTP
-					case 0x88:	 // UDPLite
-						if (frameLen > (headerLen + 4)) {
-							unsigned int pos = headerLen + 0;
-							srcPort = (reinterpret_cast<const uint8_t*>(frameData)[pos++]) << 8;
-							srcPort |= (reinterpret_cast<const uint8_t*>(frameData)[pos]);
-							pos++;
-							dstPort = (reinterpret_cast<const uint8_t*>(frameData)[pos++]) << 8;
-							dstPort |= (reinterpret_cast<const uint8_t*>(frameData)[pos]);
-							_flowId = dstPort ^ srcPort ^ proto;
-						}
-						break;
-				}
-			}
-
-			if (etherType == ZT_ETHERTYPE_IPV6 && (frameLen >= 40)) {
-				uint16_t srcPort = 0;
-				uint16_t dstPort = 0;
-				unsigned int pos;
-				unsigned int proto;
-				_ipv6GetPayload((const uint8_t*)frameData, frameLen, pos, proto);
-				switch (proto) {
-					case 0x3A:	 // ICMPv6
-						// flowId = 0x3A;
-						break;
-					// All these start with 16-bit source and destination port in that order
-					case 0x06:	 // TCP
-					case 0x11:	 // UDP
-					case 0x84:	 // SCTP
-					case 0x88:	 // UDPLite
-						if (frameLen > (pos + 4)) {
-							srcPort = (reinterpret_cast<const uint8_t*>(frameData)[pos++]) << 8;
-							srcPort |= (reinterpret_cast<const uint8_t*>(frameData)[pos]);
-							pos++;
-							dstPort = (reinterpret_cast<const uint8_t*>(frameData)[pos++]) << 8;
-							dstPort |= (reinterpret_cast<const uint8_t*>(frameData)[pos]);
-							_flowId = dstPort ^ srcPort ^ proto;
-						}
-						break;
-					default:
-						break;
-				}
-			}
-		}
-	}
-
-	const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_EXT_FRAME_IDX_NETWORK_ID);
-	const SharedPtr<Network> network(RR->node->network(nwid));
-	if (network) {
-		const unsigned int flags = (*this)[ZT_PROTO_VERB_EXT_FRAME_IDX_FLAGS];
-
-		unsigned int comLen = 0;
-		if ((flags & 0x01) != 0) {	 // inline COM with EXT_FRAME is deprecated but still used with old peers
-			CertificateOfMembership com;
-			comLen = com.deserialize(*this, ZT_PROTO_VERB_EXT_FRAME_IDX_COM);
-			if (com) {
-				network->addCredential(tPtr, com);
-			}
-		}
-
-		if (! network->gate(tPtr, peer)) {
-			RR->t->incomingNetworkAccessDenied(tPtr, network, _path, packetId(), size(), peer->address(), Packet::VERB_EXT_FRAME, true);
-			_sendErrorNeedCredentials(RR, tPtr, peer, nwid);
-			return false;
-		}
-
-		if (size() > ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD) {
-			const unsigned int etherType = at<uint16_t>(comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_ETHERTYPE);
-			const MAC to(field(comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_TO, ZT_PROTO_VERB_EXT_FRAME_LEN_TO), ZT_PROTO_VERB_EXT_FRAME_LEN_TO);
-			const MAC from(field(comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_FROM, ZT_PROTO_VERB_EXT_FRAME_LEN_FROM), ZT_PROTO_VERB_EXT_FRAME_LEN_FROM);
-			const unsigned int frameLen = size() - (comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD);
-			const uint8_t* const frameData = (const uint8_t*)field(comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD, frameLen);
-
-			if ((! from) || (from == network->mac())) {
-				peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_EXT_FRAME, 0, Packet::VERB_NOP, true, nwid, _flowId);	  // trustEstablished because COM is okay
-				return true;
-			}
-
-			switch (network->filterIncomingPacket(tPtr, peer, RR->identity.address(), from, to, frameData, frameLen, etherType, 0)) {
-				case 1:
-					if (from != MAC(peer->address(), nwid)) {
-						if (network->config().permitsBridging(peer->address())) {
-							network->learnBridgeRoute(from, peer->address());
-						}
-						else {
-							RR->t->incomingNetworkFrameDropped(tPtr, network, _path, packetId(), size(), peer->address(), Packet::VERB_EXT_FRAME, from, to, "bridging not allowed (remote)");
-							peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_EXT_FRAME, 0, Packet::VERB_NOP, true, nwid, _flowId);	  // trustEstablished because COM is okay
-							return true;
-						}
-					}
-					else if (to != network->mac()) {
-						if (to.isMulticast()) {
-							if (network->config().multicastLimit == 0) {
-								RR->t->incomingNetworkFrameDropped(tPtr, network, _path, packetId(), size(), peer->address(), Packet::VERB_EXT_FRAME, from, to, "multicast disabled");
-								peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_EXT_FRAME, 0, Packet::VERB_NOP, true, nwid, _flowId);	  // trustEstablished because COM is okay
-								return true;
-							}
-						}
-						else if (! network->config().permitsBridging(RR->identity.address())) {
-							RR->t->incomingNetworkFrameDropped(tPtr, network, _path, packetId(), size(), peer->address(), Packet::VERB_EXT_FRAME, from, to, "bridging not allowed (local)");
-							peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_EXT_FRAME, 0, Packet::VERB_NOP, true, nwid, _flowId);	  // trustEstablished because COM is okay
-							return true;
-						}
-					}
-					// fall through -- 2 means accept regardless of bridging checks or other restrictions
-				case 2:
-					RR->pm->putFrame(tPtr, nwid, network->userPtr(), from, to, etherType, 0, (const void*)frameData, frameLen, _flowId);
-					break;
-			}
-		}
-
-		if ((flags & 0x10) != 0) {	 // ACK requested
-			Packet outp(peer->address(), RR->identity.address(), Packet::VERB_OK);
-			outp.append((uint8_t)Packet::VERB_EXT_FRAME);
-			outp.append((uint64_t)packetId());
-			outp.append((uint64_t)nwid);
-			const int64_t now = RR->node->now();
-			outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), peer->identity());
-			peer->recordOutgoingPacket(_path, outp.packetId(), outp.payloadLength(), outp.verb(), ZT_QOS_NO_FLOW, now);
-			Metrics::pkt_ok_out++;
-			_path->send(RR, tPtr, outp.data(), outp.size(), RR->node->now());
-		}
-
-		peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_EXT_FRAME, 0, Packet::VERB_NOP, true, nwid, _flowId);
-	}
-	else {
-		peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_EXT_FRAME, 0, Packet::VERB_NOP, false, nwid, _flowId);
-	}
-
-	return true;
-}
-
-bool IncomingPacket::_doECHO(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_echo_in++;
-	uint64_t now = RR->node->now();
-	if (! _path->rateGateEchoRequest(now)) {
-		return true;
-	}
-
-	const uint64_t pid = packetId();
-	Packet outp(peer->address(), RR->identity.address(), Packet::VERB_OK);
-	outp.append((unsigned char)Packet::VERB_ECHO);
-	outp.append((uint64_t)pid);
-	if (size() > ZT_PACKET_IDX_PAYLOAD) {
-		outp.append(reinterpret_cast<const unsigned char*>(data()) + ZT_PACKET_IDX_PAYLOAD, size() - ZT_PACKET_IDX_PAYLOAD);
-	}
-	outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), peer->identity());
-	peer->recordOutgoingPacket(_path, outp.packetId(), outp.payloadLength(), outp.verb(), ZT_QOS_NO_FLOW, now);
-	Metrics::pkt_ok_out++;
-	_path->send(RR, tPtr, outp.data(), outp.size(), RR->node->now());
-
-	peer->received(tPtr, _path, hops(), pid, payloadLength(), Packet::VERB_ECHO, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
-
-	return true;
-}
-
-bool IncomingPacket::_doMULTICAST_LIKE(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_multicast_like_in++;
-	const int64_t now = RR->node->now();
-	bool authorized = false;
-	uint64_t lastNwid = 0;
-
-	// Packet contains a series of 18-byte network,MAC,ADI tuples
-	for (unsigned int ptr = ZT_PACKET_IDX_PAYLOAD; ptr < size(); ptr += 18) {
-		const uint64_t nwid = at<uint64_t>(ptr);
-		if (nwid != lastNwid) {
-			lastNwid = nwid;
-			SharedPtr<Network> network(RR->node->network(nwid));
-			if (network) {
-				authorized = network->gate(tPtr, peer);
-			}
-			if (! authorized) {
-				authorized = ((RR->topology->amUpstream()) || (RR->node->localControllerHasAuthorized(now, nwid, peer->address())));
-			}
-		}
-		if (authorized) {
-			RR->mc->add(tPtr, now, nwid, MulticastGroup(MAC(field(ptr + 8, 6), 6), at<uint32_t>(ptr + 14)), peer->address());
-		}
-	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_MULTICAST_LIKE, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
-	return true;
-}
-
-bool IncomingPacket::_doNETWORK_CREDENTIALS(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_network_credentials_in++;
-	if (! peer->rateGateCredentialsReceived(RR->node->now())) {
-		return true;
-	}
-
-	CertificateOfMembership com;
-	Capability cap;
-	Tag tag;
-	Revocation revocation;
-	CertificateOfOwnership coo;
-	bool trustEstablished = false;
-	SharedPtr<Network> network;
-
-	unsigned int p = ZT_PACKET_IDX_PAYLOAD;
-	while ((p < size()) && ((*this)[p] != 0)) {
-		p += com.deserialize(*this, p);
-		if (com) {
-			network = RR->node->network(com.networkId());
-			if (network) {
-				switch (network->addCredential(tPtr, com)) {
-					case Membership::ADD_REJECTED:
-						break;
-					case Membership::ADD_ACCEPTED_NEW:
-					case Membership::ADD_ACCEPTED_REDUNDANT:
-						trustEstablished = true;
-						break;
-					case Membership::ADD_DEFERRED_FOR_WHOIS:
-						return false;
-				}
-			}
-		}
-	}
-	++p;   // skip trailing 0 after COMs if present
-
-	if (p < size()) {	// older ZeroTier versions do not send capabilities, tags, or revocations
-		const unsigned int numCapabilities = at<uint16_t>(p);
-		p += 2;
-		for (unsigned int i = 0; i < numCapabilities; ++i) {
-			p += cap.deserialize(*this, p);
-			if ((! network) || (network->id() != cap.networkId())) {
-				network = RR->node->network(cap.networkId());
-			}
-			if (network) {
-				switch (network->addCredential(tPtr, cap)) {
-					case Membership::ADD_REJECTED:
-						break;
-					case Membership::ADD_ACCEPTED_NEW:
-					case Membership::ADD_ACCEPTED_REDUNDANT:
-						trustEstablished = true;
-						break;
-					case Membership::ADD_DEFERRED_FOR_WHOIS:
-						return false;
-				}
-			}
-		}
-
-		if (p >= size()) {
-			return true;
-		}
-
-		const unsigned int numTags = at<uint16_t>(p);
-		p += 2;
-		for (unsigned int i = 0; i < numTags; ++i) {
-			p += tag.deserialize(*this, p);
-			if ((! network) || (network->id() != tag.networkId())) {
-				network = RR->node->network(tag.networkId());
-			}
-			if (network) {
-				switch (network->addCredential(tPtr, tag)) {
-					case Membership::ADD_REJECTED:
-						break;
-					case Membership::ADD_ACCEPTED_NEW:
-					case Membership::ADD_ACCEPTED_REDUNDANT:
-						trustEstablished = true;
-						break;
-					case Membership::ADD_DEFERRED_FOR_WHOIS:
-						return false;
-				}
-			}
-		}
-
-		if (p >= size()) {
-			return true;
-		}
-
-		const unsigned int numRevocations = at<uint16_t>(p);
-		p += 2;
-		for (unsigned int i = 0; i < numRevocations; ++i) {
-			p += revocation.deserialize(*this, p);
-			if ((! network) || (network->id() != revocation.networkId())) {
-				network = RR->node->network(revocation.networkId());
-			}
-			if (network) {
-				switch (network->addCredential(tPtr, peer->address(), revocation)) {
-					case Membership::ADD_REJECTED:
-						break;
-					case Membership::ADD_ACCEPTED_NEW:
-					case Membership::ADD_ACCEPTED_REDUNDANT:
-						trustEstablished = true;
-						break;
-					case Membership::ADD_DEFERRED_FOR_WHOIS:
-						return false;
-				}
-			}
-		}
-
-		if (p >= size()) {
-			return true;
-		}
-
-		const unsigned int numCoos = at<uint16_t>(p);
-		p += 2;
-		for (unsigned int i = 0; i < numCoos; ++i) {
-			p += coo.deserialize(*this, p);
-			if ((! network) || (network->id() != coo.networkId())) {
-				network = RR->node->network(coo.networkId());
-			}
-			if (network) {
-				switch (network->addCredential(tPtr, coo)) {
-					case Membership::ADD_REJECTED:
-						break;
-					case Membership::ADD_ACCEPTED_NEW:
-					case Membership::ADD_ACCEPTED_REDUNDANT:
-						trustEstablished = true;
-						break;
-					case Membership::ADD_DEFERRED_FOR_WHOIS:
-						return false;
-				}
-			}
-		}
-	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_NETWORK_CREDENTIALS, 0, Packet::VERB_NOP, trustEstablished, (network) ? network->id() : 0, ZT_QOS_NO_FLOW);
-
-	return true;
-}
-
-bool IncomingPacket::_doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_network_config_request_in++;
-	const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_NETWORK_ID);
-	const unsigned int hopCount = hops();
-	const uint64_t requestPacketId = packetId();
-
-	if (RR->localNetworkController) {
-		const unsigned int metaDataLength = (ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT_LEN <= size()) ? at<uint16_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT_LEN) : 0;
-		const char* metaDataBytes = (metaDataLength != 0) ? (const char*)field(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT, metaDataLength) : (const char*)0;
-		const Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY> metaData(metaDataBytes, metaDataLength);
-		RR->localNetworkController->request(nwid, (hopCount > 0) ? InetAddress() : _path->address(), requestPacketId, peer->identity(), metaData);
-	}
-	else {
-		Packet outp(peer->address(), RR->identity.address(), Packet::VERB_ERROR);
-		outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
-		outp.append(requestPacketId);
-		outp.append((unsigned char)Packet::ERROR_UNSUPPORTED_OPERATION);
-		outp.append(nwid);
-		outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), peer->identity());
-		Metrics::pkt_error_out++;
-		Metrics::pkt_error_unsupported_op_out++;
-		_path->send(RR, tPtr, outp.data(), outp.size(), RR->node->now());
-	}
-
-	peer->received(tPtr, _path, hopCount, requestPacketId, payloadLength(), Packet::VERB_NETWORK_CONFIG_REQUEST, 0, Packet::VERB_NOP, false, nwid, ZT_QOS_NO_FLOW);
-
-	return true;
-}
-
-bool IncomingPacket::_doNETWORK_CONFIG(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_network_config_in++;
-	const SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PACKET_IDX_PAYLOAD)));
-	if (network) {
-		const uint64_t configUpdateId = network->handleConfigChunk(tPtr, packetId(), source(), *this, ZT_PACKET_IDX_PAYLOAD);
-		if (configUpdateId) {
-			Packet outp(peer->address(), RR->identity.address(), Packet::VERB_OK);
-			outp.append((uint8_t)Packet::VERB_ECHO);
-			outp.append((uint64_t)packetId());
-			outp.append((uint64_t)network->id());
-			outp.append((uint64_t)configUpdateId);
-			const int64_t now = RR->node->now();
-			outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), peer->identity());
-			peer->recordOutgoingPacket(_path, outp.packetId(), outp.payloadLength(), outp.verb(), ZT_QOS_NO_FLOW, now);
-			Metrics::pkt_ok_out++;
-			_path->send(RR, tPtr, outp.data(), outp.size(), RR->node->now());
-		}
-	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_NETWORK_CONFIG, 0, Packet::VERB_NOP, false, (network) ? network->id() : 0, ZT_QOS_NO_FLOW);
-
-	return true;
-}
-
-bool IncomingPacket::_doMULTICAST_GATHER(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_multicast_gather_in++;
-	const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID);
-	const unsigned int flags = (*this)[ZT_PROTO_VERB_MULTICAST_GATHER_IDX_FLAGS];
-	const MulticastGroup mg(MAC(field(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC, 6), 6), at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_ADI));
-	const unsigned int gatherLimit = at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_GATHER_LIMIT);
-
-	const SharedPtr<Network> network(RR->node->network(nwid));
-
-	if ((flags & 0x01) != 0) {
-		try {
-			CertificateOfMembership com;
-			com.deserialize(*this, ZT_PROTO_VERB_MULTICAST_GATHER_IDX_COM);
-			if ((com) && (network)) {
-				network->addCredential(tPtr, com);
-			}
-		}
-		catch (...) {
-		}	// discard invalid COMs
-	}
-
-	const bool trustEstablished = (network) ? network->gate(tPtr, peer) : false;
-	const int64_t now = RR->node->now();
-	if ((gatherLimit > 0) && ((trustEstablished) || (RR->topology->amUpstream()) || (RR->node->localControllerHasAuthorized(now, nwid, peer->address())))) {
-		Packet outp(peer->address(), RR->identity.address(), Packet::VERB_OK);
-		outp.append((unsigned char)Packet::VERB_MULTICAST_GATHER);
-		outp.append(packetId());
-		outp.append(nwid);
-		mg.mac().appendTo(outp);
-		outp.append((uint32_t)mg.adi());
-		const unsigned int gatheredLocally = RR->mc->gather(peer->address(), nwid, mg, outp, gatherLimit);
-		if (gatheredLocally > 0) {
-			outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), peer->identity());
-			peer->recordOutgoingPacket(_path, outp.packetId(), outp.payloadLength(), outp.verb(), ZT_QOS_NO_FLOW, now);
-			Metrics::pkt_ok_out++;
-			_path->send(RR, tPtr, outp.data(), outp.size(), now);
-		}
-	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_MULTICAST_GATHER, 0, Packet::VERB_NOP, trustEstablished, nwid, ZT_QOS_NO_FLOW);
-
-	return true;
-}
-
-bool IncomingPacket::_doMULTICAST_FRAME(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_multicast_frame_in++;
-	const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_MULTICAST_FRAME_IDX_NETWORK_ID);
-	const unsigned int flags = (*this)[ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS];
-
-	const SharedPtr<Network> network(RR->node->network(nwid));
-	if (network) {
-		// Offset -- size of optional fields added to position of later fields
-		unsigned int offset = 0;
-
-		if ((flags & 0x01) != 0) {
-			// This is deprecated but may still be sent by old peers
-			CertificateOfMembership com;
-			offset += com.deserialize(*this, ZT_PROTO_VERB_MULTICAST_FRAME_IDX_COM);
-			if (com) {
-				network->addCredential(tPtr, com);
-			}
-		}
-
-		if (! network->gate(tPtr, peer)) {
-			_sendErrorNeedCredentials(RR, tPtr, peer, nwid);
-			return false;
-		}
-
-		unsigned int gatherLimit = 0;
-		if ((flags & 0x02) != 0) {
-			gatherLimit = at<uint32_t>(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_GATHER_LIMIT);
-			offset += 4;
-		}
-
-		MAC from;
-		if ((flags & 0x04) != 0) {
-			from.setTo(field(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_SOURCE_MAC, 6), 6);
-			offset += 6;
-		}
-		else {
-			from.fromAddress(peer->address(), nwid);
-		}
-
-		const MulticastGroup to(MAC(field(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_MAC, 6), 6), at<uint32_t>(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_ADI));
-		const unsigned int etherType = at<uint16_t>(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ETHERTYPE);
-		const unsigned int frameLen = size() - (offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FRAME);
-
-		if (network->config().multicastLimit == 0) {
-			RR->t->incomingNetworkFrameDropped(tPtr, network, _path, packetId(), size(), peer->address(), Packet::VERB_MULTICAST_FRAME, from, to.mac(), "multicast disabled");
-			peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_MULTICAST_FRAME, 0, Packet::VERB_NOP, false, nwid, ZT_QOS_NO_FLOW);
-			return true;
-		}
-
-		if ((frameLen > 0) && (frameLen <= ZT_MAX_MTU)) {
-			if (! to.mac().isMulticast()) {
-				RR->t->incomingPacketInvalid(tPtr, _path, packetId(), source(), hops(), Packet::VERB_MULTICAST_FRAME, "destination not multicast");
-				peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_MULTICAST_FRAME, 0, Packet::VERB_NOP, true, nwid, ZT_QOS_NO_FLOW);   // trustEstablished because COM is okay
-				return true;
-			}
-			if ((! from) || (from.isMulticast()) || (from == network->mac())) {
-				RR->t->incomingPacketInvalid(tPtr, _path, packetId(), source(), hops(), Packet::VERB_MULTICAST_FRAME, "invalid source MAC");
-				peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_MULTICAST_FRAME, 0, Packet::VERB_NOP, true, nwid, ZT_QOS_NO_FLOW);   // trustEstablished because COM is okay
-				return true;
-			}
-
-			const uint8_t* const frameData = (const uint8_t*)field(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FRAME, frameLen);
-
-			if ((flags & 0x08) && (network->config().isMulticastReplicator(RR->identity.address()))) {
-				RR->mc->send(tPtr, RR->node->now(), network, peer->address(), to, from, etherType, frameData, frameLen);
-			}
-
-			if (from != MAC(peer->address(), nwid)) {
-				if (network->config().permitsBridging(peer->address())) {
-					network->learnBridgeRoute(from, peer->address());
-				}
-				else {
-					RR->t->incomingNetworkFrameDropped(tPtr, network, _path, packetId(), size(), peer->address(), Packet::VERB_MULTICAST_FRAME, from, to.mac(), "bridging not allowed (remote)");
-					peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_MULTICAST_FRAME, 0, Packet::VERB_NOP, true, nwid, ZT_QOS_NO_FLOW);   // trustEstablished because COM is okay
+				if (!network->isAllowed(peer)) {
+					TRACE("dropped FRAME from %s(%s): not a member of private network %.16llx",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),(unsigned long long)network->id());
+					_sendErrorNeedCertificate(RR,peer,network->id());
 					return true;
 				}
+
+				const unsigned int etherType = at<uint16_t>(ZT_PROTO_VERB_FRAME_IDX_ETHERTYPE);
+				if (!network->config().permitsEtherType(etherType)) {
+					TRACE("dropped FRAME from %s(%s): ethertype %.4x not allowed on %.16llx",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),(unsigned int)etherType,(unsigned long long)network->id());
+					return true;
+				}
+
+				const unsigned int payloadLen = size() - ZT_PROTO_VERB_FRAME_IDX_PAYLOAD;
+				RR->node->putFrame(network->id(),network->userPtr(),MAC(peer->address(),network->id()),network->mac(),etherType,0,field(ZT_PROTO_VERB_FRAME_IDX_PAYLOAD,payloadLen),payloadLen);
 			}
 
-			if (network->filterIncomingPacket(tPtr, peer, RR->identity.address(), from, to.mac(), frameData, frameLen, etherType, 0) > 0) {
-				RR->node->putFrame(tPtr, nwid, network->userPtr(), from, to.mac(), etherType, 0, (const void*)frameData, frameLen);
-			}
+			peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_FRAME,0,Packet::VERB_NOP);
+		} else {
+			TRACE("dropped FRAME from %s(%s): we are not connected to network %.16llx",source().toString().c_str(),_remoteAddress.toString().c_str(),at<uint64_t>(ZT_PROTO_VERB_FRAME_IDX_NETWORK_ID));
 		}
+	} catch ( ... ) {
+		TRACE("dropped FRAME from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doEXT_FRAME(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		SharedPtr<Network> network(RR->node->network(at<uint64_t>(ZT_PROTO_VERB_EXT_FRAME_IDX_NETWORK_ID)));
+		if (network) {
+			if (size() > ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD) {
+				const unsigned int flags = (*this)[ZT_PROTO_VERB_EXT_FRAME_IDX_FLAGS];
+
+				unsigned int comLen = 0;
+				if ((flags & 0x01) != 0) {
+					CertificateOfMembership com;
+					comLen = com.deserialize(*this,ZT_PROTO_VERB_EXT_FRAME_IDX_COM);
+					peer->validateAndSetNetworkMembershipCertificate(network->id(),com);
+				}
+
+				if (!network->isAllowed(peer)) {
+					TRACE("dropped EXT_FRAME from %s(%s): not a member of private network %.16llx",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),network->id());
+					_sendErrorNeedCertificate(RR,peer,network->id());
+					return true;
+				}
+
+				// Everything after flags must be adjusted based on the length
+				// of the certificate, if there was one...
+
+				const unsigned int etherType = at<uint16_t>(comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_ETHERTYPE);
+				if (!network->config().permitsEtherType(etherType)) {
+					TRACE("dropped EXT_FRAME from %s(%s): ethertype %.4x not allowed on network %.16llx",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),(unsigned int)etherType,(unsigned long long)network->id());
+					return true;
+				}
+
+				const MAC to(field(comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_TO,ZT_PROTO_VERB_EXT_FRAME_LEN_TO),ZT_PROTO_VERB_EXT_FRAME_LEN_TO);
+				const MAC from(field(comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_FROM,ZT_PROTO_VERB_EXT_FRAME_LEN_FROM),ZT_PROTO_VERB_EXT_FRAME_LEN_FROM);
+
+				if (to.isMulticast()) {
+					TRACE("dropped EXT_FRAME from %s@%s(%s) to %s: destination is multicast, must use MULTICAST_FRAME",from.toString().c_str(),peer->address().toString().c_str(),_remoteAddress.toString().c_str(),to.toString().c_str());
+					return true;
+				}
+
+				if ((!from)||(from.isMulticast())||(from == network->mac())) {
+					TRACE("dropped EXT_FRAME from %s@%s(%s) to %s: invalid source MAC",from.toString().c_str(),peer->address().toString().c_str(),_remoteAddress.toString().c_str(),to.toString().c_str());
+					return true;
+				}
+
+				if (from != MAC(peer->address(),network->id())) {
+					if (network->config().permitsBridging(peer->address())) {
+						network->learnBridgeRoute(from,peer->address());
+					} else {
+						TRACE("dropped EXT_FRAME from %s@%s(%s) to %s: sender not allowed to bridge into %.16llx",from.toString().c_str(),peer->address().toString().c_str(),_remoteAddress.toString().c_str(),to.toString().c_str(),network->id());
+						return true;
+					}
+				} else if (to != network->mac()) {
+					if (!network->config().permitsBridging(RR->identity.address())) {
+						TRACE("dropped EXT_FRAME from %s@%s(%s) to %s: I cannot bridge to %.16llx or bridging disabled on network",from.toString().c_str(),peer->address().toString().c_str(),_remoteAddress.toString().c_str(),to.toString().c_str(),network->id());
+						return true;
+					}
+				}
+
+				const unsigned int payloadLen = size() - (comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD);
+				RR->node->putFrame(network->id(),network->userPtr(),from,to,etherType,0,field(comLen + ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD,payloadLen),payloadLen);
+			}
+
+			peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_EXT_FRAME,0,Packet::VERB_NOP);
+		} else {
+			TRACE("dropped EXT_FRAME from %s(%s): we are not connected to network %.16llx",source().toString().c_str(),_remoteAddress.toString().c_str(),at<uint64_t>(ZT_PROTO_VERB_FRAME_IDX_NETWORK_ID));
+		}
+	} catch ( ... ) {
+		TRACE("dropped EXT_FRAME from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doECHO(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		const uint64_t pid = packetId();
+		Packet outp(peer->address(),RR->identity.address(),Packet::VERB_OK);
+		outp.append((unsigned char)Packet::VERB_ECHO);
+		outp.append((uint64_t)pid);
+		if (size() > ZT_PACKET_IDX_PAYLOAD)
+			outp.append(reinterpret_cast<const unsigned char *>(data()) + ZT_PACKET_IDX_PAYLOAD,size() - ZT_PACKET_IDX_PAYLOAD);
+		outp.armor(peer->key(),true);
+		RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+		peer->received(_localAddress,_remoteAddress,hops(),pid,Packet::VERB_ECHO,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped ECHO from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doMULTICAST_LIKE(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		const uint64_t now = RR->node->now();
+
+		// Iterate through 18-byte network,MAC,ADI tuples
+		for(unsigned int ptr=ZT_PACKET_IDX_PAYLOAD;ptr<size();ptr+=18) {
+			const uint64_t nwid = at<uint64_t>(ptr);
+			const MulticastGroup group(MAC(field(ptr + 8,6),6),at<uint32_t>(ptr + 14));
+			RR->mc->add(now,nwid,group,peer->address());
+		}
+
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_MULTICAST_LIKE,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped MULTICAST_LIKE from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doNETWORK_MEMBERSHIP_CERTIFICATE(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		CertificateOfMembership com;
+
+		unsigned int ptr = ZT_PACKET_IDX_PAYLOAD;
+		while (ptr < size()) {
+			ptr += com.deserialize(*this,ptr);
+			peer->validateAndSetNetworkMembershipCertificate(com.networkId(),com);
+		}
+
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_NETWORK_MEMBERSHIP_CERTIFICATE,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped NETWORK_MEMBERSHIP_CERTIFICATE from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_NETWORK_ID);
+		const unsigned int metaDataLength = at<uint16_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT_LEN);
+		const Dictionary metaData((const char *)field(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT,metaDataLength),metaDataLength);
+		//const uint64_t haveRevision = ((ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT + metaDataLength + 8) <= size()) ? at<uint64_t>(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT + metaDataLength) : 0ULL;
+
+		const unsigned int h = hops();
+		const uint64_t pid = packetId();
+		peer->received(_localAddress,_remoteAddress,h,pid,Packet::VERB_NETWORK_CONFIG_REQUEST,0,Packet::VERB_NOP);
+
+		if (RR->localNetworkController) {
+			Dictionary netconf;
+			switch(RR->localNetworkController->doNetworkConfigRequest((h > 0) ? InetAddress() : _remoteAddress,RR->identity,peer->identity(),nwid,metaData,netconf)) {
+
+				case NetworkController::NETCONF_QUERY_OK: {
+					const std::string netconfStr(netconf.toString());
+					if (netconfStr.length() > 0xffff) { // sanity check since field ix 16-bit
+						TRACE("NETWORK_CONFIG_REQUEST failed: internal error: netconf size %u is too large",(unsigned int)netconfStr.length());
+					} else {
+						Packet outp(peer->address(),RR->identity.address(),Packet::VERB_OK);
+						outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
+						outp.append(pid);
+						outp.append(nwid);
+						outp.append((uint16_t)netconfStr.length());
+						outp.append(netconfStr.data(),(unsigned int)netconfStr.length());
+						outp.compress();
+						outp.armor(peer->key(),true);
+						if (outp.size() > ZT_PROTO_MAX_PACKET_LENGTH) { // sanity check
+							TRACE("NETWORK_CONFIG_REQUEST failed: internal error: netconf size %u is too large",(unsigned int)netconfStr.length());
+						} else {
+							RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+						}
+					}
+				}	break;
+
+				case NetworkController::NETCONF_QUERY_OBJECT_NOT_FOUND: {
+					Packet outp(peer->address(),RR->identity.address(),Packet::VERB_ERROR);
+					outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
+					outp.append(pid);
+					outp.append((unsigned char)Packet::ERROR_OBJ_NOT_FOUND);
+					outp.append(nwid);
+					outp.armor(peer->key(),true);
+					RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+				}	break;
+
+				case NetworkController::NETCONF_QUERY_ACCESS_DENIED: {
+					Packet outp(peer->address(),RR->identity.address(),Packet::VERB_ERROR);
+					outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
+					outp.append(pid);
+					outp.append((unsigned char)Packet::ERROR_NETWORK_ACCESS_DENIED_);
+					outp.append(nwid);
+					outp.armor(peer->key(),true);
+					RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+				} break;
+
+				case NetworkController::NETCONF_QUERY_INTERNAL_SERVER_ERROR:
+					TRACE("NETWORK_CONFIG_REQUEST failed: internal error: %s",netconf.get("error","(unknown)").c_str());
+					break;
+
+				case NetworkController::NETCONF_QUERY_IGNORE:
+					break;
+
+				default:
+					TRACE("NETWORK_CONFIG_REQUEST failed: invalid return value from NetworkController::doNetworkConfigRequest()");
+					break;
+
+			}
+		} else {
+			Packet outp(peer->address(),RR->identity.address(),Packet::VERB_ERROR);
+			outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
+			outp.append(pid);
+			outp.append((unsigned char)Packet::ERROR_UNSUPPORTED_OPERATION);
+			outp.append(nwid);
+			outp.armor(peer->key(),true);
+			RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+		}
+	} catch ( ... ) {
+		TRACE("dropped NETWORK_CONFIG_REQUEST from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doNETWORK_CONFIG_REFRESH(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		unsigned int ptr = ZT_PACKET_IDX_PAYLOAD;
+		while ((ptr + 8) <= size()) {
+			uint64_t nwid = at<uint64_t>(ptr);
+			SharedPtr<Network> nw(RR->node->network(nwid));
+			if ((nw)&&(peer->address() == nw->controller()))
+				nw->requestConfiguration();
+			ptr += 8;
+		}
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_NETWORK_CONFIG_REFRESH,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped NETWORK_CONFIG_REFRESH from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doMULTICAST_GATHER(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID);
+		const MulticastGroup mg(MAC(field(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC,6),6),at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_ADI));
+		const unsigned int gatherLimit = at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_GATHER_LIMIT);
+
+		//TRACE("<<MC %s(%s) GATHER up to %u in %.16llx/%s",source().toString().c_str(),_remoteAddress.toString().c_str(),gatherLimit,nwid,mg.toString().c_str());
 
 		if (gatherLimit) {
-			Packet outp(source(), RR->identity.address(), Packet::VERB_OK);
-			outp.append((unsigned char)Packet::VERB_MULTICAST_FRAME);
+			Packet outp(peer->address(),RR->identity.address(),Packet::VERB_OK);
+			outp.append((unsigned char)Packet::VERB_MULTICAST_GATHER);
 			outp.append(packetId());
 			outp.append(nwid);
-			to.mac().appendTo(outp);
-			outp.append((uint32_t)to.adi());
-			outp.append((unsigned char)0x02);	// flag 0x02 = contains gather results
-			if (RR->mc->gather(peer->address(), nwid, to, outp, gatherLimit)) {
-				const int64_t now = RR->node->now();
-				outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), peer->identity());
-				peer->recordOutgoingPacket(_path, outp.packetId(), outp.payloadLength(), outp.verb(), ZT_QOS_NO_FLOW, now);
-				Metrics::pkt_ok_out++;
-				_path->send(RR, tPtr, outp.data(), outp.size(), RR->node->now());
+			mg.mac().appendTo(outp);
+			outp.append((uint32_t)mg.adi());
+			const unsigned int gatheredLocally = RR->mc->gather(peer->address(),nwid,mg,outp,gatherLimit);
+			if (gatheredLocally) {
+				outp.armor(peer->key(),true);
+				RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+			}
+
+#ifdef ZT_ENABLE_CLUSTER
+			if ((RR->cluster)&&(gatheredLocally < gatherLimit))
+				RR->cluster->sendDistributedQuery(*this);
+#endif
+		}
+
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_MULTICAST_GATHER,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped MULTICAST_GATHER from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doMULTICAST_FRAME(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		const uint64_t nwid = at<uint64_t>(ZT_PROTO_VERB_MULTICAST_FRAME_IDX_NETWORK_ID);
+		const unsigned int flags = (*this)[ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS];
+
+		const SharedPtr<Network> network(RR->node->network(nwid));
+		if (network) {
+			// Offset -- size of optional fields added to position of later fields
+			unsigned int offset = 0;
+
+			if ((flags & 0x01) != 0) {
+				CertificateOfMembership com;
+				offset += com.deserialize(*this,ZT_PROTO_VERB_MULTICAST_FRAME_IDX_COM);
+				peer->validateAndSetNetworkMembershipCertificate(nwid,com);
+			}
+
+			// Check membership after we've read any included COM, since
+			// that cert might be what we needed.
+			if (!network->isAllowed(peer)) {
+				TRACE("dropped MULTICAST_FRAME from %s(%s): not a member of private network %.16llx",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),(unsigned long long)network->id());
+				_sendErrorNeedCertificate(RR,peer,network->id());
+				return true;
+			}
+
+			unsigned int gatherLimit = 0;
+			if ((flags & 0x02) != 0) {
+				gatherLimit = at<uint32_t>(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_GATHER_LIMIT);
+				offset += 4;
+			}
+
+			MAC from;
+			if ((flags & 0x04) != 0) {
+				from.setTo(field(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_SOURCE_MAC,6),6);
+				offset += 6;
+			} else {
+				from.fromAddress(peer->address(),nwid);
+			}
+
+			const MulticastGroup to(MAC(field(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_MAC,6),6),at<uint32_t>(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_ADI));
+			const unsigned int etherType = at<uint16_t>(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ETHERTYPE);
+			const unsigned int payloadLen = size() - (offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FRAME);
+
+			//TRACE("<<MC FRAME %.16llx/%s from %s@%s flags %.2x length %u",nwid,to.toString().c_str(),from.toString().c_str(),peer->address().toString().c_str(),flags,payloadLen);
+
+			if ((payloadLen > 0)&&(payloadLen <= ZT_IF_MTU)) {
+				if (!to.mac().isMulticast()) {
+					TRACE("dropped MULTICAST_FRAME from %s@%s(%s) to %s: destination is unicast, must use FRAME or EXT_FRAME",from.toString().c_str(),peer->address().toString().c_str(),_remoteAddress.toString().c_str(),to.toString().c_str());
+					return true;
+				}
+				if ((!from)||(from.isMulticast())||(from == network->mac())) {
+					TRACE("dropped MULTICAST_FRAME from %s@%s(%s) to %s: invalid source MAC",from.toString().c_str(),peer->address().toString().c_str(),_remoteAddress.toString().c_str(),to.toString().c_str());
+					return true;
+				}
+
+				if (from != MAC(peer->address(),network->id())) {
+					if (network->config().permitsBridging(peer->address())) {
+						network->learnBridgeRoute(from,peer->address());
+					} else {
+						TRACE("dropped MULTICAST_FRAME from %s@%s(%s) to %s: sender not allowed to bridge into %.16llx",from.toString().c_str(),peer->address().toString().c_str(),_remoteAddress.toString().c_str(),to.toString().c_str(),network->id());
+						return true;
+					}
+				}
+
+				RR->node->putFrame(network->id(),network->userPtr(),from,to.mac(),etherType,0,field(offset + ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FRAME,payloadLen),payloadLen);
+			}
+
+			if (gatherLimit) {
+				Packet outp(source(),RR->identity.address(),Packet::VERB_OK);
+				outp.append((unsigned char)Packet::VERB_MULTICAST_FRAME);
+				outp.append(packetId());
+				outp.append(nwid);
+				to.mac().appendTo(outp);
+				outp.append((uint32_t)to.adi());
+				outp.append((unsigned char)0x02); // flag 0x02 = contains gather results
+				if (RR->mc->gather(peer->address(),nwid,to,outp,gatherLimit)) {
+					outp.armor(peer->key(),true);
+					RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+				}
+			}
+		} // else ignore -- not a member of this network
+
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_MULTICAST_FRAME,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped MULTICAST_FRAME from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		const uint64_t now = RR->node->now();
+
+		// First, subject this to a rate limit
+		if (!peer->shouldRespondToDirectPathPush(now)) {
+			TRACE("dropped PUSH_DIRECT_PATHS from %s(%s): circuit breaker tripped",source().toString().c_str(),_remoteAddress.toString().c_str());
+			return true;
+		}
+
+		// Second, limit addresses by scope and type
+		uint8_t countPerScope[ZT_INETADDRESS_MAX_SCOPE+1][2]; // [][0] is v4, [][1] is v6
+		memset(countPerScope,0,sizeof(countPerScope));
+
+		unsigned int count = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD);
+		unsigned int ptr = ZT_PACKET_IDX_PAYLOAD + 2;
+
+		while (count--) { // if ptr overflows Buffer will throw
+			// TODO: some flags are not yet implemented
+
+			unsigned int flags = (*this)[ptr++];
+			unsigned int extLen = at<uint16_t>(ptr); ptr += 2;
+			ptr += extLen; // unused right now
+			unsigned int addrType = (*this)[ptr++];
+			unsigned int addrLen = (*this)[ptr++];
+
+			switch(addrType) {
+				case 4: {
+					InetAddress a(field(ptr,4),4,at<uint16_t>(ptr + 4));
+
+					bool redundant = false;
+					if ((flags & ZT_PUSH_DIRECT_PATHS_FLAG_CLUSTER_REDIRECT) != 0) {
+						peer->setClusterOptimalPathForAddressFamily(a);
+					} else {
+						redundant = peer->hasActivePathTo(now,a);
+					}
+
+					if ( ((flags & ZT_PUSH_DIRECT_PATHS_FLAG_FORGET_PATH) == 0) && (!redundant) && (RR->node->shouldUsePathForZeroTierTraffic(_localAddress,a)) ) {
+						if (++countPerScope[(int)a.ipScope()][0] <= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) {
+							TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str());
+							peer->sendHELLO(InetAddress(),a,now);
+						} else {
+							TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str());
+						}
+					}
+				}	break;
+				case 6: {
+					InetAddress a(field(ptr,16),16,at<uint16_t>(ptr + 16));
+
+					bool redundant = false;
+					if ((flags & ZT_PUSH_DIRECT_PATHS_FLAG_CLUSTER_REDIRECT) != 0) {
+						peer->setClusterOptimalPathForAddressFamily(a);
+					} else {
+						redundant = peer->hasActivePathTo(now,a);
+					}
+
+					if ( ((flags & ZT_PUSH_DIRECT_PATHS_FLAG_FORGET_PATH) == 0) && (!redundant) && (RR->node->shouldUsePathForZeroTierTraffic(_localAddress,a)) ) {
+						if (++countPerScope[(int)a.ipScope()][1] <= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) {
+							TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str());
+							peer->sendHELLO(InetAddress(),a,now);
+						} else {
+							TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str());
+						}
+					}
+				}	break;
+			}
+			ptr += addrLen;
+		}
+
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_PUSH_DIRECT_PATHS,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped PUSH_DIRECT_PATHS from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doCIRCUIT_TEST(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		const Address originatorAddress(field(ZT_PACKET_IDX_PAYLOAD,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH);
+		SharedPtr<Peer> originator(RR->topology->getPeer(originatorAddress));
+		if (!originator) {
+			RR->sw->requestWhois(originatorAddress);
+			return false;
+		}
+
+		const unsigned int flags = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 5);
+		const uint64_t timestamp = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD + 7);
+		const uint64_t testId = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD + 15);
+
+		// Tracks total length of variable length fields, initialized to originator credential length below
+		unsigned int vlf;
+
+		// Originator credentials
+		const unsigned int originatorCredentialLength = vlf = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 23);
+		uint64_t originatorCredentialNetworkId = 0;
+		if (originatorCredentialLength >= 1) {
+			switch((*this)[ZT_PACKET_IDX_PAYLOAD + 25]) {
+				case 0x01: { // 64-bit network ID, originator must be controller
+					if (originatorCredentialLength >= 9)
+						originatorCredentialNetworkId = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD + 26);
+				}	break;
+				default: break;
 			}
 		}
 
-		peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_MULTICAST_FRAME, 0, Packet::VERB_NOP, true, nwid, ZT_QOS_NO_FLOW);
-	}
+		// Add length of "additional fields," which are currently unused
+		vlf += at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 25 + vlf);
 
-	return true;
-}
-
-bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_push_direct_paths_in++;
-	const int64_t now = RR->node->now();
-
-	if (! peer->rateGatePushDirectPaths(now)) {
-		peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_PUSH_DIRECT_PATHS, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
-		return true;
-	}
-
-	// Second, limit addresses by scope and type
-	uint8_t countPerScope[ZT_INETADDRESS_MAX_SCOPE + 1][2];	  // [][0] is v4, [][1] is v6
-	memset(countPerScope, 0, sizeof(countPerScope));
-
-	unsigned int count = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD);
-	unsigned int ptr = ZT_PACKET_IDX_PAYLOAD + 2;
-
-	while (count--) {	// if ptr overflows Buffer will throw
-		unsigned int flags = (*this)[ptr++];
-		unsigned int extLen = at<uint16_t>(ptr);
-		ptr += 2;
-		ptr += extLen;	 // unused right now
-		unsigned int addrType = (*this)[ptr++];
-		unsigned int addrLen = (*this)[ptr++];
-
-		switch (addrType) {
-			case 4: {
-				const InetAddress a(field(ptr, 4), 4, at<uint16_t>(ptr + 4));
-				if (((flags & ZT_PUSH_DIRECT_PATHS_FLAG_FORGET_PATH) == 0) &&												  // not being told to forget
-					(! (((flags & ZT_PUSH_DIRECT_PATHS_FLAG_CLUSTER_REDIRECT) == 0) && (peer->hasActivePathTo(now, a)))) &&	  // not already known
-					(RR->node->shouldUsePathForZeroTierTraffic(tPtr, peer->address(), _path->localSocket(), a)))			  // should use path
-				{
-					if ((flags & ZT_PUSH_DIRECT_PATHS_FLAG_CLUSTER_REDIRECT) != 0) {
-						peer->clusterRedirect(tPtr, _path, a, now);
-					}
-					else if (++countPerScope[(int)a.ipScope()][0] <= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) {
-						peer->attemptToContactAt(tPtr, InetAddress(), a, now, false);
-					}
-				}
-			} break;
-			case 6: {
-				const InetAddress a(field(ptr, 16), 16, at<uint16_t>(ptr + 16));
-				if (((flags & ZT_PUSH_DIRECT_PATHS_FLAG_FORGET_PATH) == 0) &&												  // not being told to forget
-					(! (((flags & ZT_PUSH_DIRECT_PATHS_FLAG_CLUSTER_REDIRECT) == 0) && (peer->hasActivePathTo(now, a)))) &&	  // not already known
-					(RR->node->shouldUsePathForZeroTierTraffic(tPtr, peer->address(), _path->localSocket(), a)))			  // should use path
-				{
-					if ((flags & ZT_PUSH_DIRECT_PATHS_FLAG_CLUSTER_REDIRECT) != 0) {
-						peer->clusterRedirect(tPtr, _path, a, now);
-					}
-					else if (++countPerScope[(int)a.ipScope()][1] <= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) {
-						peer->attemptToContactAt(tPtr, InetAddress(), a, now, false);
-					}
-				}
-			} break;
+		// Verify signature -- only tests signed by their originators are allowed
+		const unsigned int signatureLength = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 27 + vlf);
+		if (!originator->identity().verify(field(ZT_PACKET_IDX_PAYLOAD,27 + vlf),27 + vlf,field(ZT_PACKET_IDX_PAYLOAD + 29 + vlf,signatureLength),signatureLength)) {
+			TRACE("dropped CIRCUIT_TEST from %s(%s): signature by originator %s invalid",source().toString().c_str(),_remoteAddress.toString().c_str(),originatorAddress.toString().c_str());
+			return true;
 		}
-		ptr += addrLen;
-	}
+		vlf += signatureLength;
 
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_PUSH_DIRECT_PATHS, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
+		// Save this length so we can copy the immutable parts of this test
+		// into the one we send along to next hops.
+		const unsigned int lengthOfSignedPortionAndSignature = 29 + vlf;
 
-	return true;
-}
-
-bool IncomingPacket::_doUSER_MESSAGE(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_user_message_in++;
-	if (likely(size() >= (ZT_PACKET_IDX_PAYLOAD + 8))) {
-		ZT_UserMessage um;
-		um.origin = peer->address().toInt();
-		um.typeId = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD);
-		um.data = reinterpret_cast<const void*>(reinterpret_cast<const uint8_t*>(data()) + ZT_PACKET_IDX_PAYLOAD + 8);
-		um.length = size() - (ZT_PACKET_IDX_PAYLOAD + 8);
-		RR->node->postEvent(tPtr, ZT_EVENT_USER_MESSAGE, reinterpret_cast<const void*>(&um));
-	}
-
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_USER_MESSAGE, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
-
-	return true;
-}
-
-bool IncomingPacket::_doREMOTE_TRACE(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
-{
-	Metrics::pkt_remote_trace_in++;
-	ZT_RemoteTrace rt;
-	const char* ptr = reinterpret_cast<const char*>(data()) + ZT_PACKET_IDX_PAYLOAD;
-	const char* const eof = reinterpret_cast<const char*>(data()) + size();
-	rt.origin = peer->address().toInt();
-	rt.data = const_cast<char*>(ptr);	// start of first string
-	while (ptr < eof) {
-		if (! *ptr) {	// end of string
-			rt.len = (unsigned int)(ptr - rt.data);
-			if ((rt.len > 0) && (rt.len <= ZT_MAX_REMOTE_TRACE_SIZE)) {
-				RR->node->postEvent(tPtr, ZT_EVENT_REMOTE_TRACE, &rt);
+		// Get previous hop's credential, if any
+		const unsigned int previousHopCredentialLength = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 29 + vlf);
+		CertificateOfMembership previousHopCom;
+		if (previousHopCredentialLength >= 1) {
+			switch((*this)[ZT_PACKET_IDX_PAYLOAD + 31 + vlf]) {
+				case 0x01: { // network certificate of membership for previous hop
+					const unsigned int phcl = previousHopCom.deserialize(*this,ZT_PACKET_IDX_PAYLOAD + 32 + vlf);
+					if (phcl != (previousHopCredentialLength - 1)) {
+						TRACE("dropped CIRCUIT_TEST from %s(%s): previous hop COM invalid (%u != %u)",source().toString().c_str(),_remoteAddress.toString().c_str(),phcl,(previousHopCredentialLength - 1));
+						return true;
+					}
+				}	break;
+				default: break;
 			}
-			rt.data = const_cast<char*>(++ptr);	  // start of next string, if any
 		}
-		else {
-			++ptr;
+		vlf += previousHopCredentialLength;
+
+		// Check credentials (signature already verified)
+		NetworkConfig originatorCredentialNetworkConfig;
+		if (originatorCredentialNetworkId) {
+			if (Network::controllerFor(originatorCredentialNetworkId) == originatorAddress) {
+				SharedPtr<Network> nw(RR->node->network(originatorCredentialNetworkId));
+				if ((nw)&&(nw->hasConfig())) {
+					originatorCredentialNetworkConfig = nw->config();
+					if ( ( (originatorCredentialNetworkConfig.isPublic()) || (peer->address() == originatorAddress) || ((originatorCredentialNetworkConfig.com())&&(previousHopCom)&&(originatorCredentialNetworkConfig.com().agreesWith(previousHopCom))) ) ) {
+						TRACE("CIRCUIT_TEST %.16llx received from hop %s(%s) and originator %s with valid network ID credential %.16llx (verified from originator and next hop)",testId,source().toString().c_str(),_remoteAddress.toString().c_str(),originatorAddress.toString().c_str(),originatorCredentialNetworkId);
+					} else {
+						TRACE("dropped CIRCUIT_TEST from %s(%s): originator %s specified network ID %.16llx as credential, and previous hop %s did not supply a valid COM",source().toString().c_str(),_remoteAddress.toString().c_str(),originatorAddress.toString().c_str(),originatorCredentialNetworkId,peer->address().toString().c_str());
+						return true;
+					}
+				} else {
+					TRACE("dropped CIRCUIT_TEST from %s(%s): originator %s specified network ID %.16llx as credential, and we are not a member",source().toString().c_str(),_remoteAddress.toString().c_str(),originatorAddress.toString().c_str(),originatorCredentialNetworkId);
+					return true;
+				}
+			} else {
+				TRACE("dropped CIRCUIT_TEST from %s(%s): originator %s specified network ID as credential, is not controller for %.16llx",source().toString().c_str(),_remoteAddress.toString().c_str(),originatorAddress.toString().c_str(),originatorCredentialNetworkId);
+				return true;
+			}
+		} else {
+			TRACE("dropped CIRCUIT_TEST from %s(%s): originator %s did not specify a credential or credential type",source().toString().c_str(),_remoteAddress.toString().c_str(),originatorAddress.toString().c_str());
+			return true;
 		}
+
+		const uint64_t now = RR->node->now();
+
+		unsigned int breadth = 0;
+		Address nextHop[256]; // breadth is a uin8_t, so this is the max
+		InetAddress nextHopBestPathAddress[256];
+		unsigned int remainingHopsPtr = ZT_PACKET_IDX_PAYLOAD + 33 + vlf;
+		if ((ZT_PACKET_IDX_PAYLOAD + 31 + vlf) < size()) {
+			// unsigned int nextHopFlags = (*this)[ZT_PACKET_IDX_PAYLOAD + 31 + vlf]
+			breadth = (*this)[ZT_PACKET_IDX_PAYLOAD + 32 + vlf];
+			for(unsigned int h=0;h<breadth;++h) {
+				nextHop[h].setTo(field(remainingHopsPtr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH);
+				remainingHopsPtr += ZT_ADDRESS_LENGTH;
+				SharedPtr<Peer> nhp(RR->topology->getPeer(nextHop[h]));
+				if (nhp) {
+					Path *const rp = nhp->getBestPath(now);
+					if (rp)
+						nextHopBestPathAddress[h] = rp->address();
+				}
+			}
+		}
+
+		// Report back to originator, depending on flags and whether we are last hop
+		if ( ((flags & 0x01) != 0) || ((breadth == 0)&&((flags & 0x02) != 0)) ) {
+			Packet outp(originatorAddress,RR->identity.address(),Packet::VERB_CIRCUIT_TEST_REPORT);
+			outp.append((uint64_t)timestamp);
+			outp.append((uint64_t)testId);
+			outp.append((uint64_t)0); // field reserved for future use
+			outp.append((uint8_t)ZT_VENDOR_ZEROTIER);
+			outp.append((uint8_t)ZT_PROTO_VERSION);
+			outp.append((uint8_t)ZEROTIER_ONE_VERSION_MAJOR);
+			outp.append((uint8_t)ZEROTIER_ONE_VERSION_MINOR);
+			outp.append((uint16_t)ZEROTIER_ONE_VERSION_REVISION);
+			outp.append((uint16_t)ZT_PLATFORM_UNSPECIFIED);
+			outp.append((uint16_t)ZT_ARCHITECTURE_UNSPECIFIED);
+			outp.append((uint16_t)0); // error code, currently unused
+			outp.append((uint64_t)0); // flags, currently unused
+			outp.append((uint64_t)packetId());
+			peer->address().appendTo(outp);
+			outp.append((uint8_t)hops());
+			_localAddress.serialize(outp);
+			_remoteAddress.serialize(outp);
+			outp.append((uint16_t)0); // no additional fields
+			outp.append((uint8_t)breadth);
+			for(unsigned int h=0;h<breadth;++h) {
+				nextHop[h].appendTo(outp);
+				nextHopBestPathAddress[h].serialize(outp); // appends 0 if null InetAddress
+			}
+			RR->sw->send(outp,true,0);
+		}
+
+		// If there are next hops, forward the test along through the graph
+		if (breadth > 0) {
+			Packet outp(Address(),RR->identity.address(),Packet::VERB_CIRCUIT_TEST);
+			outp.append(field(ZT_PACKET_IDX_PAYLOAD,lengthOfSignedPortionAndSignature),lengthOfSignedPortionAndSignature);
+			const unsigned int previousHopCredentialPos = outp.size();
+			outp.append((uint16_t)0); // no previous hop credentials: default
+			if ((originatorCredentialNetworkConfig)&&(!originatorCredentialNetworkConfig.isPublic())&&(originatorCredentialNetworkConfig.com())) {
+				outp.append((uint8_t)0x01); // COM
+				originatorCredentialNetworkConfig.com().serialize(outp);
+				outp.setAt<uint16_t>(previousHopCredentialPos,(uint16_t)(outp.size() - (previousHopCredentialPos + 2)));
+			}
+			if (remainingHopsPtr < size())
+				outp.append(field(remainingHopsPtr,size() - remainingHopsPtr),size() - remainingHopsPtr);
+
+			for(unsigned int h=0;h<breadth;++h) {
+				if (RR->identity.address() != nextHop[h]) { // next hops that loop back to the current hop are not valid
+					outp.newInitializationVector();
+					outp.setDestination(nextHop[h]);
+					RR->sw->send(outp,true,originatorCredentialNetworkId);
+				}
+			}
+		}
+
+		peer->received(_localAddress,_remoteAddress,hops(),packetId(),Packet::VERB_CIRCUIT_TEST,0,Packet::VERB_NOP);
+	} catch ( ... ) {
+		TRACE("dropped CIRCUIT_TEST from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doCIRCUIT_TEST_REPORT(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		ZT_CircuitTestReport report;
+		memset(&report,0,sizeof(report));
+
+		report.current = peer->address().toInt();
+		report.upstream = Address(field(ZT_PACKET_IDX_PAYLOAD + 52,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH).toInt();
+		report.testId = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD + 8);
+		report.timestamp = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD);
+		report.remoteTimestamp = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD + 16);
+		report.sourcePacketId = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD + 44);
+		report.flags = at<uint64_t>(ZT_PACKET_IDX_PAYLOAD + 36);
+		report.sourcePacketHopCount = (*this)[ZT_PACKET_IDX_PAYLOAD + 57]; // end of fixed length headers: 58
+		report.errorCode = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 34);
+		report.vendor = (enum ZT_Vendor)((*this)[ZT_PACKET_IDX_PAYLOAD + 24]);
+		report.protocolVersion = (*this)[ZT_PACKET_IDX_PAYLOAD + 25];
+		report.majorVersion = (*this)[ZT_PACKET_IDX_PAYLOAD + 26];
+		report.minorVersion = (*this)[ZT_PACKET_IDX_PAYLOAD + 27];
+		report.revision = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 28);
+		report.platform = (enum ZT_Platform)at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 30);
+		report.architecture = (enum ZT_Architecture)at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 32);
+
+		const unsigned int receivedOnLocalAddressLen = reinterpret_cast<InetAddress *>(&(report.receivedOnLocalAddress))->deserialize(*this,ZT_PACKET_IDX_PAYLOAD + 58);
+		const unsigned int receivedFromRemoteAddressLen = reinterpret_cast<InetAddress *>(&(report.receivedFromRemoteAddress))->deserialize(*this,ZT_PACKET_IDX_PAYLOAD + 58 + receivedOnLocalAddressLen);
+
+		unsigned int nhptr = ZT_PACKET_IDX_PAYLOAD + 58 + receivedOnLocalAddressLen + receivedFromRemoteAddressLen;
+		nhptr += at<uint16_t>(nhptr) + 2; // add "additional field" length, which right now will be zero
+
+		report.nextHopCount = (*this)[nhptr++];
+		if (report.nextHopCount > ZT_CIRCUIT_TEST_MAX_HOP_BREADTH) // sanity check, shouldn't be possible
+			report.nextHopCount = ZT_CIRCUIT_TEST_MAX_HOP_BREADTH;
+		for(unsigned int h=0;h<report.nextHopCount;++h) {
+			report.nextHops[h].address = Address(field(nhptr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH).toInt(); nhptr += ZT_ADDRESS_LENGTH;
+			nhptr += reinterpret_cast<InetAddress *>(&(report.nextHops[h].physicalAddress))->deserialize(*this,nhptr);
+		}
+
+		RR->node->postCircuitTestReport(&report);
+	} catch ( ... ) {
+		TRACE("dropped CIRCUIT_TEST_REPORT from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+bool IncomingPacket::_doREQUEST_PROOF_OF_WORK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer)
+{
+	try {
+		// Right now this is only allowed from root servers -- may be allowed from controllers and relays later.
+		if (RR->topology->isRoot(peer->identity())) {
+			const uint64_t pid = packetId();
+			const unsigned int difficulty = (*this)[ZT_PACKET_IDX_PAYLOAD + 1];
+			const unsigned int challengeLength = at<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 2);
+			if (challengeLength > ZT_PROTO_MAX_PACKET_LENGTH)
+				return true; // sanity check, drop invalid size
+			const unsigned char *challenge = field(ZT_PACKET_IDX_PAYLOAD + 4,challengeLength);
+
+			switch((*this)[ZT_PACKET_IDX_PAYLOAD]) {
+
+				// Salsa20/12+SHA512 hashcash
+				case 0x01: {
+					if (difficulty <= 14) {
+						unsigned char result[16];
+						computeSalsa2012Sha512ProofOfWork(difficulty,challenge,challengeLength,result);
+						TRACE("PROOF_OF_WORK computed for %s: difficulty==%u, challengeLength==%u, result: %.16llx%.16llx",peer->address().toString().c_str(),difficulty,challengeLength,Utils::ntoh(*(reinterpret_cast<const uint64_t *>(result))),Utils::ntoh(*(reinterpret_cast<const uint64_t *>(result + 8))));
+						Packet outp(peer->address(),RR->identity.address(),Packet::VERB_OK);
+						outp.append((unsigned char)Packet::VERB_REQUEST_PROOF_OF_WORK);
+						outp.append(pid);
+						outp.append((uint16_t)sizeof(result));
+						outp.append(result,sizeof(result));
+						outp.armor(peer->key(),true);
+						RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+					} else {
+						Packet outp(peer->address(),RR->identity.address(),Packet::VERB_ERROR);
+						outp.append((unsigned char)Packet::VERB_REQUEST_PROOF_OF_WORK);
+						outp.append(pid);
+						outp.append((unsigned char)Packet::ERROR_INVALID_REQUEST);
+						outp.armor(peer->key(),true);
+						RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
+					}
+				}	break;
+
+				default:
+					TRACE("dropped REQUEST_PROOF_OF_WORK from %s(%s): unrecognized proof of work type",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
+					break;
+			}
+
+			peer->received(_localAddress,_remoteAddress,hops(),pid,Packet::VERB_REQUEST_PROOF_OF_WORK,0,Packet::VERB_NOP);
+		} else {
+			TRACE("dropped REQUEST_PROOF_OF_WORK from %s(%s): not trusted enough",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
+		}
+	} catch ( ... ) {
+		TRACE("dropped REQUEST_PROOF_OF_WORK from %s(%s): unexpected exception",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
+	}
+	return true;
+}
+
+void IncomingPacket::computeSalsa2012Sha512ProofOfWork(unsigned int difficulty,const void *challenge,unsigned int challengeLength,unsigned char result[16])
+{
+	unsigned char salsabuf[131072]; // 131072 == protocol constant, size of memory buffer for this proof of work function
+	char candidatebuf[ZT_PROTO_MAX_PACKET_LENGTH + 256];
+	unsigned char shabuf[ZT_SHA512_DIGEST_LEN];
+	const uint64_t s20iv = 0; // zero IV for Salsa20
+	char *const candidate = (char *)(( ((uintptr_t)&(candidatebuf[0])) | 0xf ) + 1); // align to 16-byte boundary to ensure that uint64_t type punning of initial nonce is okay
+	Salsa20 s20;
+	unsigned int d;
+	unsigned char *p;
+
+	Utils::getSecureRandom(candidate,16);
+	memcpy(candidate + 16,challenge,challengeLength);
+
+	if (difficulty > 512)
+		difficulty = 512; // sanity check
+
+try_salsa2012sha512_again:
+	++*(reinterpret_cast<volatile uint64_t *>(candidate));
+
+	SHA512::hash(shabuf,candidate,16 + challengeLength);
+	s20.init(shabuf,256,&s20iv);
+	memset(salsabuf,0,sizeof(salsabuf));
+	s20.encrypt12(salsabuf,salsabuf,sizeof(salsabuf));
+	SHA512::hash(shabuf,salsabuf,sizeof(salsabuf));
+
+	d = difficulty;
+	p = shabuf;
+	while (d >= 8) {
+		if (*(p++))
+			goto try_salsa2012sha512_again;
+		d -= 8;
+	}
+	if (d > 0) {
+		if ( ((((unsigned int)*p) << d) & 0xff00) != 0 )
+			goto try_salsa2012sha512_again;
 	}
 
-	peer->received(tPtr, _path, hops(), packetId(), payloadLength(), Packet::VERB_REMOTE_TRACE, 0, Packet::VERB_NOP, false, 0, ZT_QOS_NO_FLOW);
+	memcpy(result,candidate,16);
+}
+
+bool IncomingPacket::testSalsa2012Sha512ProofOfWorkResult(unsigned int difficulty,const void *challenge,unsigned int challengeLength,const unsigned char proposedResult[16])
+{
+	unsigned char salsabuf[131072]; // 131072 == protocol constant, size of memory buffer for this proof of work function
+	char candidate[ZT_PROTO_MAX_PACKET_LENGTH + 256];
+	unsigned char shabuf[ZT_SHA512_DIGEST_LEN];
+	const uint64_t s20iv = 0; // zero IV for Salsa20
+	Salsa20 s20;
+	unsigned int d;
+	unsigned char *p;
+
+	if (difficulty > 512)
+		difficulty = 512; // sanity check
+
+	memcpy(candidate,proposedResult,16);
+	memcpy(candidate + 16,challenge,challengeLength);
+
+	SHA512::hash(shabuf,candidate,16 + challengeLength);
+	s20.init(shabuf,256,&s20iv);
+	memset(salsabuf,0,sizeof(salsabuf));
+	s20.encrypt12(salsabuf,salsabuf,sizeof(salsabuf));
+	SHA512::hash(shabuf,salsabuf,sizeof(salsabuf));
+
+	d = difficulty;
+	p = shabuf;
+	while (d >= 8) {
+		if (*(p++))
+			return false;
+		d -= 8;
+	}
+	if (d > 0) {
+		if ( ((((unsigned int)*p) << d) & 0xff00) != 0 )
+			return false;
+	}
 
 	return true;
 }
 
-bool IncomingPacket::_doPATH_NEGOTIATION_REQUEST(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer)
+void IncomingPacket::_sendErrorNeedCertificate(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer,uint64_t nwid)
 {
-	Metrics::pkt_path_negotiation_request_in++;
-	uint64_t now = RR->node->now();
-	if (! peer->rateGatePathNegotiation(now, _path)) {
-		return true;
-	}
-	if (payloadLength() != sizeof(int16_t)) {
-		return true;
-	}
-	int16_t remoteUtility = 0;
-	memcpy(&remoteUtility, payload(), sizeof(int16_t));
-	peer->processIncomingPathNegotiationRequest(now, _path, Utils::ntoh(remoteUtility));
-	return true;
-}
-
-void IncomingPacket::_sendErrorNeedCredentials(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer, const uint64_t nwid)
-{
-	Packet outp(source(), RR->identity.address(), Packet::VERB_ERROR);
-	outp.append((uint8_t)verb());
+	Packet outp(source(),RR->identity.address(),Packet::VERB_ERROR);
+	outp.append((unsigned char)verb());
 	outp.append(packetId());
-	outp.append((uint8_t)Packet::ERROR_NEED_MEMBERSHIP_CERTIFICATE);
+	outp.append((unsigned char)Packet::ERROR_NEED_MEMBERSHIP_CERTIFICATE);
 	outp.append(nwid);
-	outp.armor(peer->key(), true, false, peer->aesKeysIfSupported(), peer->identity());
-	Metrics::pkt_error_out++;
-	Metrics::pkt_error_need_membership_cert_out++;
-	_path->send(RR, tPtr, outp.data(), outp.size(), RR->node->now());
+	outp.armor(peer->key(),true);
+	RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/IncomingPacket.hpp b/node/IncomingPacket.hpp
index ebca8f220..96e46c002 100644
--- a/node/IncomingPacket.hpp
+++ b/node/IncomingPacket.hpp
@@ -1,27 +1,32 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_INCOMINGPACKET_HPP
 #define ZT_INCOMINGPACKET_HPP
 
-#include "MulticastGroup.hpp"
-#include "Packet.hpp"
-#include "Path.hpp"
-#include "Peer.hpp"
-#include "Utils.hpp"
-
 #include <stdexcept>
 
+#include "Packet.hpp"
+#include "InetAddress.hpp"
+#include "Utils.hpp"
+#include "MulticastGroup.hpp"
+#include "Peer.hpp"
+
 /*
  * The big picture:
  *
@@ -46,40 +51,64 @@ class Network;
 /**
  * Subclass of packet that handles the decoding of it
  */
-class IncomingPacket : public Packet {
-  public:
-	IncomingPacket() : Packet(), _receiveTime(0), _path(), _authenticated(false)
+class IncomingPacket : public Packet
+{
+public:
+	IncomingPacket() :
+		Packet(),
+		_receiveTime(0),
+		_localAddress(),
+		_remoteAddress()
 	{
 	}
 
+	IncomingPacket(const IncomingPacket &p)
+	{
+		// All fields including InetAddress are memcpy'able
+		memcpy(this,&p,sizeof(IncomingPacket));
+	}
+
 	/**
 	 * Create a new packet-in-decode
 	 *
 	 * @param data Packet data
 	 * @param len Packet length
-	 * @param path Path over which packet arrived
+	 * @param localAddress Local interface address
+	 * @param remoteAddress Address from which packet came
 	 * @param now Current time
 	 * @throws std::out_of_range Range error processing packet
 	 */
-	IncomingPacket(const void* data, unsigned int len, const SharedPtr<Path>& path, int64_t now) : Packet(data, len), _receiveTime(now), _path(path), _authenticated(false)
+	IncomingPacket(const void *data,unsigned int len,const InetAddress &localAddress,const InetAddress &remoteAddress,uint64_t now) :
+ 		Packet(data,len),
+ 		_receiveTime(now),
+ 		_localAddress(localAddress),
+ 		_remoteAddress(remoteAddress)
 	{
 	}
 
+	inline IncomingPacket &operator=(const IncomingPacket &p)
+	{
+		// All fields including InetAddress are memcpy'able
+		memcpy(this,&p,sizeof(IncomingPacket));
+		return *this;
+	}
+
 	/**
 	 * Init packet-in-decode in place
 	 *
 	 * @param data Packet data
 	 * @param len Packet length
-	 * @param path Path over which packet arrived
+	 * @param localAddress Local interface address
+	 * @param remoteAddress Address from which packet came
 	 * @param now Current time
 	 * @throws std::out_of_range Range error processing packet
 	 */
-	inline void init(const void* data, unsigned int len, const SharedPtr<Path>& path, int64_t now)
+	inline void init(const void *data,unsigned int len,const InetAddress &localAddress,const InetAddress &remoteAddress,uint64_t now)
 	{
-		copyFrom(data, len);
+		copyFrom(data,len);
 		_receiveTime = now;
-		_path = path;
-		_authenticated = false;
+		_localAddress = localAddress;
+		_remoteAddress = remoteAddress;
 	}
 
 	/**
@@ -89,53 +118,78 @@ class IncomingPacket : public Packet {
 	 * about whether the packet was valid. A rejection is 'complete.'
 	 *
 	 * Once true is returned, this must not be called again. The packet's state
-	 * may no longer be valid.
+	 * may no longer be valid. The only exception is deferred decoding. In this
+	 * case true is returned to indicate to the normal decode path that it is
+	 * finished with the packet. The packet will have added itself to the
+	 * deferred queue and will expect tryDecode() to be called one more time
+	 * with deferred set to true.
+	 *
+	 * Deferred decoding is performed by DeferredPackets.cpp and should not be
+	 * done elsewhere. Under deferred decoding packets only get one shot and
+	 * so the return value of tryDecode() is ignored.
 	 *
 	 * @param RR Runtime environment
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
+	 * @param deferred If true, this is a deferred decode and the return is ignored
 	 * @return True if decoding and processing is complete, false if caller should try again
 	 */
-	bool tryDecode(const RuntimeEnvironment* RR, void* tPtr, int32_t flowId);
+	bool tryDecode(const RuntimeEnvironment *RR,bool deferred);
 
 	/**
 	 * @return Time of packet receipt / start of decode
 	 */
-	inline uint64_t receiveTime() const
-	{
-		return _receiveTime;
-	}
+	inline uint64_t receiveTime() const throw() { return _receiveTime; }
 
-  private:
+	/**
+	 * Compute the Salsa20/12+SHA512 proof of work function
+	 *
+	 * @param difficulty Difficulty in bits (max: 64)
+	 * @param challenge Challenge string
+	 * @param challengeLength Length of challenge in bytes (max allowed: ZT_PROTO_MAX_PACKET_LENGTH)
+	 * @param result Buffer to fill with 16-byte result
+	 */
+	static void computeSalsa2012Sha512ProofOfWork(unsigned int difficulty,const void *challenge,unsigned int challengeLength,unsigned char result[16]);
+
+	/**
+	 * Verify the result of Salsa20/12+SHA512 proof of work
+	 *
+	 * @param difficulty Difficulty in bits (max: 64)
+	 * @param challenge Challenge bytes
+	 * @param challengeLength Length of challenge in bytes (max allowed: ZT_PROTO_MAX_PACKET_LENGTH)
+	 * @param proposedResult Result supplied by client
+	 * @return True if result is valid
+	 */
+	static bool testSalsa2012Sha512ProofOfWorkResult(unsigned int difficulty,const void *challenge,unsigned int challengeLength,const unsigned char proposedResult[16]);
+
+private:
 	// These are called internally to handle packet contents once it has
 	// been authenticated, decrypted, decompressed, and classified.
-	bool _doERROR(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doHELLO(const RuntimeEnvironment* RR, void* tPtr, const bool alreadyAuthenticated);
-	bool _doACK(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doQOS_MEASUREMENT(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doOK(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doWHOIS(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doRENDEZVOUS(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doFRAME(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer, int32_t flowId);
-	bool _doEXT_FRAME(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer, int32_t flowId);
-	bool _doECHO(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doMULTICAST_LIKE(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doNETWORK_CREDENTIALS(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doNETWORK_CONFIG(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doMULTICAST_GATHER(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doMULTICAST_FRAME(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doPUSH_DIRECT_PATHS(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doUSER_MESSAGE(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doREMOTE_TRACE(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
-	bool _doPATH_NEGOTIATION_REQUEST(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer);
+	bool _doERROR(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doHELLO(const RuntimeEnvironment *RR,SharedPtr<Peer> &peer); // can be called with NULL peer, while all others cannot
+	bool _doOK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doWHOIS(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doRENDEZVOUS(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doFRAME(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doEXT_FRAME(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doECHO(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doMULTICAST_LIKE(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doNETWORK_MEMBERSHIP_CERTIFICATE(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doNETWORK_CONFIG_REFRESH(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doMULTICAST_GATHER(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doMULTICAST_FRAME(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doCIRCUIT_TEST(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doCIRCUIT_TEST_REPORT(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
+	bool _doREQUEST_PROOF_OF_WORK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer);
 
-	void _sendErrorNeedCredentials(const RuntimeEnvironment* RR, void* tPtr, const SharedPtr<Peer>& peer, const uint64_t nwid);
+	// Send an ERROR_NEED_MEMBERSHIP_CERTIFICATE to a peer indicating that an updated cert is needed to communicate
+	void _sendErrorNeedCertificate(const RuntimeEnvironment *RR,const SharedPtr<Peer> &peer,uint64_t nwid);
 
 	uint64_t _receiveTime;
-	SharedPtr<Path> _path;
-	bool _authenticated;
+	InetAddress _localAddress;
+	InetAddress _remoteAddress;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/InetAddress.cpp b/node/InetAddress.cpp
index 17e297d6c..dca772e8f 100644
--- a/node/InetAddress.cpp
+++ b/node/InetAddress.cpp
@@ -1,284 +1,245 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "InetAddress.hpp"
-
-#include "Constants.hpp"
-#include "Utils.hpp"
-
-#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdint.h>
+
 #include <string>
 
+#include "Constants.hpp"
+#include "InetAddress.hpp"
+#include "Utils.hpp"
+
 namespace ZeroTier {
 
-const InetAddress InetAddress::LO4((const void*)("\x7f\x00\x00\x01"), 4, 0);
-const InetAddress InetAddress::LO6((const void*)("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01"), 16, 0);
+const InetAddress InetAddress::LO4((const void *)("\x7f\x00\x00\x01"),4,0);
+const InetAddress InetAddress::LO6((const void *)("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01"),16,0);
 
 InetAddress::IpScope InetAddress::ipScope() const
+	throw()
 {
-	switch (ss_family) {
+	switch(ss_family) {
+
 		case AF_INET: {
-			const uint32_t ip = Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr);
-			switch (ip >> 24) {
-				case 0x00:
-					return IP_SCOPE_NONE;	// 0.0.0.0/8 (reserved, never used)
-				case 0x06:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 6.0.0.0/8 (US Army)
-				case 0x0a:
-					return IP_SCOPE_PRIVATE;   // 10.0.0.0/8
-				case 0x0b:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 11.0.0.0/8 (US DoD)
-				case 0x15:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 21.0.0.0/8 (US DDN-RVN)
-				case 0x16:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 22.0.0.0/8 (US DISA)
-				case 0x19:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 25.0.0.0/8 (UK Ministry of Defense)
-				case 0x1a:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 26.0.0.0/8 (US DISA)
-				case 0x1c:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 28.0.0.0/8 (US DSI-North)
-				case 0x1d:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 29.0.0.0/8 (US DISA)
-				case 0x1e:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 30.0.0.0/8 (US DISA)
-				case 0x33:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 51.0.0.0/8 (UK Department of Social Security)
-				case 0x37:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 55.0.0.0/8 (US DoD)
-				case 0x38:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 56.0.0.0/8 (US Postal Service)
+			const uint32_t ip = Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr);
+			switch(ip >> 24) {
+				case 0x00: return IP_SCOPE_NONE;                                      // 0.0.0.0/8 (reserved, never used)
+				case 0x06: return IP_SCOPE_PSEUDOPRIVATE;                             // 6.0.0.0/8 (US Army)
+				case 0x0a: return IP_SCOPE_PRIVATE;                                   // 10.0.0.0/8
+				case 0x0b: return IP_SCOPE_PSEUDOPRIVATE;                             // 11.0.0.0/8 (US DoD)
+				case 0x15: return IP_SCOPE_PSEUDOPRIVATE;                             // 21.0.0.0/8 (US DDN-RVN)
+				case 0x16: return IP_SCOPE_PSEUDOPRIVATE;                             // 22.0.0.0/8 (US DISA)
+				case 0x19: return IP_SCOPE_PSEUDOPRIVATE;                             // 25.0.0.0/8 (UK Ministry of Defense)
+				case 0x1a: return IP_SCOPE_PSEUDOPRIVATE;                             // 26.0.0.0/8 (US DISA)
+				case 0x1c: return IP_SCOPE_PSEUDOPRIVATE;                             // 28.0.0.0/8 (US DSI-North)
+				case 0x1d: return IP_SCOPE_PSEUDOPRIVATE;                             // 29.0.0.0/8 (US DISA)
+				case 0x1e: return IP_SCOPE_PSEUDOPRIVATE;                             // 30.0.0.0/8 (US DISA)
+				case 0x2c: return IP_SCOPE_PSEUDOPRIVATE;                             // 44.0.0.0/8 (Amateur Radio)
+				case 0x33: return IP_SCOPE_PSEUDOPRIVATE;                             // 51.0.0.0/8 (UK Department of Social Security)
+				case 0x37: return IP_SCOPE_PSEUDOPRIVATE;                             // 55.0.0.0/8 (US DoD)
+				case 0x38: return IP_SCOPE_PSEUDOPRIVATE;                             // 56.0.0.0/8 (US Postal Service)
 				case 0x64:
-					if ((ip & 0xffc00000) == 0x64400000) {
-						return IP_SCOPE_PRIVATE;   // 100.64.0.0/10
-					}
+					if ((ip & 0xffc00000) == 0x64400000) return IP_SCOPE_SHARED;        // 100.64.0.0/10
 					break;
-				case 0x7f:
-					return IP_SCOPE_LOOPBACK;	// 127.0.0.0/8
+				case 0x7f: return IP_SCOPE_LOOPBACK;                                  // 127.0.0.0/8
 				case 0xa9:
-					if ((ip & 0xffff0000) == 0xa9fe0000) {
-						return IP_SCOPE_LINK_LOCAL;	  // 169.254.0.0/16
-					}
+					if ((ip & 0xffff0000) == 0xa9fe0000) return IP_SCOPE_LINK_LOCAL;    // 169.254.0.0/16
 					break;
 				case 0xac:
-					if ((ip & 0xfff00000) == 0xac100000) {
-						return IP_SCOPE_PRIVATE;   // 172.16.0.0/12
-					}
+					if ((ip & 0xfff00000) == 0xac100000) return IP_SCOPE_PRIVATE;       // 172.16.0.0/12
 					break;
 				case 0xc0:
-					if ((ip & 0xffff0000) == 0xc0a80000) {
-						return IP_SCOPE_PRIVATE;   // 192.168.0.0/16
-					}
-					if ((ip & 0xffffff00) == 0xc0000200) {
-						return IP_SCOPE_PRIVATE;   // 192.0.2.0/24
-					}
+					if ((ip & 0xffff0000) == 0xc0a80000) return IP_SCOPE_PRIVATE;				// 192.168.0.0/16
 					break;
-				case 0xc6:
-					if ((ip & 0xfffe0000) == 0xc6120000) {
-						return IP_SCOPE_PRIVATE;   // 198.18.0.0/15
-					}
-					if ((ip & 0xffffff00) == 0xc6336400) {
-						return IP_SCOPE_PRIVATE;   // 198.51.100.0/24
-					}
-					break;
-				case 0xcb:
-					if ((ip & 0xffffff00) == 0xcb007100) {
-						return IP_SCOPE_PRIVATE;   // 203.0.113.0/24
-					}
-					break;
-				case 0xff:
-					return IP_SCOPE_NONE;	// 255.0.0.0/8 (broadcast, or unused/unusable)
+				case 0xff: return IP_SCOPE_NONE;                                      // 255.0.0.0/8 (broadcast, or unused/unusable)
 			}
-			switch (ip >> 28) {
-				case 0xe:
-					return IP_SCOPE_MULTICAST;	 // 224.0.0.0/4
-				case 0xf:
-					return IP_SCOPE_PSEUDOPRIVATE;	 // 240.0.0.0/4 ("reserved," usually unusable)
+			switch(ip >> 28) {
+				case 0xe: return IP_SCOPE_MULTICAST;                              // 224.0.0.0/4
+				case 0xf: return IP_SCOPE_PSEUDOPRIVATE;                          // 240.0.0.0/4 ("reserved," usually unusable)
 			}
 			return IP_SCOPE_GLOBAL;
-		} break;
+		}	break;
 
 		case AF_INET6: {
-			const unsigned char* ip = reinterpret_cast<const unsigned char*>(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
+			const unsigned char *ip = reinterpret_cast<const unsigned char *>(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr);
 			if ((ip[0] & 0xf0) == 0xf0) {
-				if (ip[0] == 0xff) {
-					return IP_SCOPE_MULTICAST;	 // ff00::/8
-				}
-				if ((ip[0] == 0xfe) && ((ip[1] & 0xc0) == 0x80)) {
+				if (ip[0] == 0xff) return IP_SCOPE_MULTICAST;                              // ff00::/8
+				if ((ip[0] == 0xfe)&&((ip[1] & 0xc0) == 0x80)) {
 					unsigned int k = 2;
-					while ((! ip[k]) && (k < 15)) {
-						++k;
-					}
-					if ((k == 15) && (ip[15] == 0x01)) {
-						return IP_SCOPE_LOOPBACK;	// fe80::1/128
-					}
-					else {
-						return IP_SCOPE_LINK_LOCAL;	  // fe80::/10
-					}
-				}
-				if ((ip[0] & 0xfe) == 0xfc) {
-					return IP_SCOPE_PRIVATE;   // fc00::/7
+					while ((!ip[k])&&(k < 15)) ++k;
+					if ((k == 15)&&(ip[15] == 0x01))
+						return IP_SCOPE_LOOPBACK;                                              // fe80::1/128
+					else return IP_SCOPE_LINK_LOCAL;                                         // fe80::/10
 				}
+				if ((ip[0] & 0xfe) == 0xfc) return IP_SCOPE_PRIVATE;                       // fc00::/7
 			}
-
-			// :::ffff:127.0.0.1
-			// 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0x7f, 0, 0, 1
 			unsigned int k = 0;
-			while ((! ip[k]) && (k < 9)) {
-				++k;
-			}
-			if (k == 9) {
-				if (ip[10] == 0xff && ip[11] == 0xff && ip[12] == 0x7f) {
-					return IP_SCOPE_LOOPBACK;
-				}
-			}
-
-			k = 0;
-			while ((! ip[k]) && (k < 15)) {
-				++k;
-			}
-			if (k == 15) {	 // all 0's except last byte
-				if (ip[15] == 0x01) {
-					return IP_SCOPE_LOOPBACK;	// ::1/128
-				}
-				if (ip[15] == 0x00) {
-					return IP_SCOPE_NONE;	// ::/128
-				}
+			while ((!ip[k])&&(k < 15)) ++k;
+			if (k == 15) { // all 0's except last byte
+				if (ip[15] == 0x01) return IP_SCOPE_LOOPBACK;                              // ::1/128
+				if (ip[15] == 0x00) return IP_SCOPE_NONE;                                  // ::/128
 			}
 			return IP_SCOPE_GLOBAL;
-		} break;
+		}	break;
+
 	}
 
 	return IP_SCOPE_NONE;
 }
 
-void InetAddress::set(const void* ipBytes, unsigned int ipLen, unsigned int port)
+void InetAddress::set(const std::string &ip,unsigned int port)
+	throw()
 {
-	memset(this, 0, sizeof(InetAddress));
+	memset(this,0,sizeof(InetAddress));
+	if (ip.find(':') != std::string::npos) {
+		struct sockaddr_in6 *sin6 = reinterpret_cast<struct sockaddr_in6 *>(this);
+		ss_family = AF_INET6;
+		sin6->sin6_port = Utils::hton((uint16_t)port);
+		if (inet_pton(AF_INET6,ip.c_str(),(void *)&(sin6->sin6_addr.s6_addr)) <= 0)
+			memset(this,0,sizeof(InetAddress));
+	} else {
+		struct sockaddr_in *sin = reinterpret_cast<struct sockaddr_in *>(this);
+		ss_family = AF_INET;
+		sin->sin_port = Utils::hton((uint16_t)port);
+		if (inet_pton(AF_INET,ip.c_str(),(void *)&(sin->sin_addr.s_addr)) <= 0)
+			memset(this,0,sizeof(InetAddress));
+	}
+}
+
+void InetAddress::set(const void *ipBytes,unsigned int ipLen,unsigned int port)
+	throw()
+{
+	memset(this,0,sizeof(InetAddress));
 	if (ipLen == 4) {
 		uint32_t ipb[1];
-		memcpy(ipb, ipBytes, 4);
+		memcpy(ipb,ipBytes,4);
 		ss_family = AF_INET;
-		reinterpret_cast<struct sockaddr_in*>(this)->sin_addr.s_addr = ipb[0];
-		reinterpret_cast<struct sockaddr_in*>(this)->sin_port = Utils::hton((uint16_t)port);
-	}
-	else if (ipLen == 16) {
+		reinterpret_cast<struct sockaddr_in *>(this)->sin_addr.s_addr = ipb[0];
+		reinterpret_cast<struct sockaddr_in *>(this)->sin_port = Utils::hton((uint16_t)port);
+	} else if (ipLen == 16) {
 		ss_family = AF_INET6;
-		memcpy(reinterpret_cast<struct sockaddr_in6*>(this)->sin6_addr.s6_addr, ipBytes, 16);
-		reinterpret_cast<struct sockaddr_in6*>(this)->sin6_port = Utils::hton((uint16_t)port);
+		memcpy(reinterpret_cast<struct sockaddr_in6 *>(this)->sin6_addr.s6_addr,ipBytes,16);
+		reinterpret_cast<struct sockaddr_in6 *>(this)->sin6_port = Utils::hton((uint16_t)port);
 	}
 }
 
-char* InetAddress::toString(char buf[64]) const
+std::string InetAddress::toString() const
 {
-	char* p = toIpString(buf);
-	if (*p) {
-		while (*p) {
-			++p;
-		}
-		*(p++) = '/';
-		Utils::decimal(port(), p);
+	char buf[128];
+	switch(ss_family) {
+		case AF_INET:
+			Utils::snprintf(buf,sizeof(buf),"%d.%d.%d.%d/%d",
+					(int)(reinterpret_cast<const unsigned char *>(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr)))[0],
+					(int)(reinterpret_cast<const unsigned char *>(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr)))[1],
+					(int)(reinterpret_cast<const unsigned char *>(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr)))[2],
+					(int)(reinterpret_cast<const unsigned char *>(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr)))[3],
+					(int)Utils::ntoh((uint16_t)(reinterpret_cast<const struct sockaddr_in *>(this)->sin_port))
+				);
+			return std::string(buf);
+		case AF_INET6:
+			Utils::snprintf(buf,sizeof(buf),"%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x/%d",
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[0]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[1]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[2]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[3]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[4]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[5]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[6]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[7]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[8]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[9]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[10]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[11]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[12]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[13]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[14]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[15]),
+					(int)Utils::ntoh((uint16_t)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_port))
+				);
+			return std::string(buf);
 	}
-	return buf;
+	return std::string();
 }
 
-char* InetAddress::toIpString(char buf[64]) const
+std::string InetAddress::toIpString() const
 {
-	buf[0] = (char)0;
-	switch (ss_family) {
-		case AF_INET: {
-#ifdef _WIN32
-			inet_ntop(AF_INET, (void*)&reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr, buf, INET_ADDRSTRLEN);
-#else
-			inet_ntop(AF_INET, &reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr, buf, INET_ADDRSTRLEN);
-#endif
-		} break;
-
-		case AF_INET6: {
-#ifdef _WIN32
-			inet_ntop(AF_INET6, (void*)reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, buf, INET6_ADDRSTRLEN);
-#else
-			inet_ntop(AF_INET6, reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, buf, INET6_ADDRSTRLEN);
-#endif
-		} break;
+	char buf[128];
+	switch(ss_family) {
+		case AF_INET:
+			Utils::snprintf(buf,sizeof(buf),"%d.%d.%d.%d",
+					(int)(reinterpret_cast<const unsigned char *>(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr)))[0],
+					(int)(reinterpret_cast<const unsigned char *>(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr)))[1],
+					(int)(reinterpret_cast<const unsigned char *>(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr)))[2],
+					(int)(reinterpret_cast<const unsigned char *>(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr)))[3]
+				);
+			return std::string(buf);
+		case AF_INET6:
+			Utils::snprintf(buf,sizeof(buf),"%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x",
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[0]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[1]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[2]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[3]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[4]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[5]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[6]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[7]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[8]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[9]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[10]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[11]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[12]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[13]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[14]),
+					(int)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr[15])
+				);
+			return std::string(buf);
 	}
-	return buf;
+	return std::string();
 }
 
-bool InetAddress::fromString(const char* ipSlashPort)
+void InetAddress::fromString(const std::string &ipSlashPort)
 {
-	char buf[64];
-
-	memset(this, 0, sizeof(InetAddress));
-
-	if (! *ipSlashPort) {
-		return true;
-	}
-	if (! Utils::scopy(buf, sizeof(buf), ipSlashPort)) {
-		return false;
-	}
-
-	char* portAt = buf;
-	while ((*portAt) && (*portAt != '/')) {
-		++portAt;
-	}
-	unsigned int port = 0;
-	if (*portAt) {
-		*(portAt++) = (char)0;
-		port = Utils::strToUInt(portAt) & 0xffff;
-	}
-
-	if (strchr(buf, ':')) {
-		struct sockaddr_in6* const in6 = reinterpret_cast<struct sockaddr_in6*>(this);
-		inet_pton(AF_INET6, buf, &in6->sin6_addr.s6_addr);
-		in6->sin6_family = AF_INET6;
-		in6->sin6_port = Utils::hton((uint16_t)port);
-		return true;
-	}
-	else if (strchr(buf, '.')) {
-		struct sockaddr_in* const in = reinterpret_cast<struct sockaddr_in*>(this);
-		inet_pton(AF_INET, buf, &in->sin_addr.s_addr);
-		in->sin_family = AF_INET;
-		in->sin_port = Utils::hton((uint16_t)port);
-		return true;
-	}
-	else {
-		return false;
+	const std::size_t slashAt = ipSlashPort.find('/');
+	if (slashAt == std::string::npos) {
+		set(ipSlashPort,0);
+	} else {
+		long p = strtol(ipSlashPort.substr(slashAt+1).c_str(),(char **)0,10);
+		if ((p > 0)&&(p <= 0xffff))
+			set(ipSlashPort.substr(0,slashAt),(unsigned int)p);
+		else set(ipSlashPort.substr(0,slashAt),0);
 	}
 }
 
 InetAddress InetAddress::netmask() const
 {
 	InetAddress r(*this);
-	switch (r.ss_family) {
+	switch(r.ss_family) {
 		case AF_INET:
-			reinterpret_cast<struct sockaddr_in*>(&r)->sin_addr.s_addr = Utils::hton((uint32_t)(0xffffffff << (32 - netmaskBits())));
+			reinterpret_cast<struct sockaddr_in *>(&r)->sin_addr.s_addr = Utils::hton((uint32_t)(0xffffffff << (32 - netmaskBits())));
 			break;
 		case AF_INET6: {
 			uint64_t nm[2];
 			const unsigned int bits = netmaskBits();
-			if (bits) {
-				nm[0] = Utils::hton((uint64_t)((bits >= 64) ? 0xffffffffffffffffULL : (0xffffffffffffffffULL << (64 - bits))));
-				nm[1] = Utils::hton((uint64_t)((bits <= 64) ? 0ULL : (0xffffffffffffffffULL << (128 - bits))));
-			}
-			else {
-				nm[0] = 0;
-				nm[1] = 0;
-			}
-			memcpy(reinterpret_cast<struct sockaddr_in6*>(&r)->sin6_addr.s6_addr, nm, 16);
-		} break;
+			nm[0] = Utils::hton((uint64_t)((bits >= 64) ? 0xffffffffffffffffULL : (0xffffffffffffffffULL << (64 - bits))));
+			nm[1] = Utils::hton((uint64_t)((bits <= 64) ? 0ULL : (0xffffffffffffffffULL << (128 - bits))));
+			memcpy(reinterpret_cast<struct sockaddr_in6 *>(&r)->sin6_addr.s6_addr,nm,16);
+		}	break;
 	}
 	return r;
 }
@@ -287,7 +248,7 @@ InetAddress InetAddress::broadcast() const
 {
 	if (ss_family == AF_INET) {
 		InetAddress r(*this);
-		reinterpret_cast<struct sockaddr_in*>(&r)->sin_addr.s_addr |= Utils::hton((uint32_t)(0xffffffff >> netmaskBits()));
+		reinterpret_cast<struct sockaddr_in *>(&r)->sin_addr.s_addr |= Utils::hton((uint32_t)(0xffffffff >> netmaskBits()));
 		return r;
 	}
 	return InetAddress();
@@ -296,66 +257,38 @@ InetAddress InetAddress::broadcast() const
 InetAddress InetAddress::network() const
 {
 	InetAddress r(*this);
-	switch (r.ss_family) {
+	switch(r.ss_family) {
 		case AF_INET:
-			reinterpret_cast<struct sockaddr_in*>(&r)->sin_addr.s_addr &= Utils::hton((uint32_t)(0xffffffff << (32 - netmaskBits())));
+			reinterpret_cast<struct sockaddr_in *>(&r)->sin_addr.s_addr &= Utils::hton((uint32_t)(0xffffffff << (32 - netmaskBits())));
 			break;
 		case AF_INET6: {
 			uint64_t nm[2];
 			const unsigned int bits = netmaskBits();
-			memcpy(nm, reinterpret_cast<struct sockaddr_in6*>(&r)->sin6_addr.s6_addr, 16);
+			memcpy(nm,reinterpret_cast<struct sockaddr_in6 *>(&r)->sin6_addr.s6_addr,16);
 			nm[0] &= Utils::hton((uint64_t)((bits >= 64) ? 0xffffffffffffffffULL : (0xffffffffffffffffULL << (64 - bits))));
 			nm[1] &= Utils::hton((uint64_t)((bits <= 64) ? 0ULL : (0xffffffffffffffffULL << (128 - bits))));
-			memcpy(reinterpret_cast<struct sockaddr_in6*>(&r)->sin6_addr.s6_addr, nm, 16);
-		} break;
+			memcpy(reinterpret_cast<struct sockaddr_in6 *>(&r)->sin6_addr.s6_addr,nm,16);
+		}	break;
 	}
 	return r;
 }
 
-bool InetAddress::isEqualPrefix(const InetAddress& addr) const
+bool InetAddress::containsAddress(const InetAddress &addr) const
 {
 	if (addr.ss_family == ss_family) {
-		switch (ss_family) {
-			case AF_INET6: {
-				const InetAddress mask(netmask());
-				InetAddress addr_mask(addr.netmask());
-				const uint8_t* n = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(&addr_mask)->sin6_addr.s6_addr);
-				const uint8_t* m = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(&mask)->sin6_addr.s6_addr);
-				const uint8_t* a = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(&addr)->sin6_addr.s6_addr);
-				const uint8_t* b = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
-				for (unsigned int i = 0; i < 16; ++i) {
-					if ((a[i] & m[i]) != (b[i] & n[i])) {
-						return false;
-					}
-				}
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-bool InetAddress::containsAddress(const InetAddress& addr) const
-{
-	if (addr.ss_family == ss_family) {
-		switch (ss_family) {
+		switch(ss_family) {
 			case AF_INET: {
 				const unsigned int bits = netmaskBits();
-				if (bits == 0) {
-					return true;
-				}
-				return (
-					(Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in*>(&addr)->sin_addr.s_addr) >> (32 - bits)) == (Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr) >> (32 - bits)));
+				return ( (Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in *>(&addr)->sin_addr.s_addr) >> (32 - bits)) == (Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr) >> (32 - bits)) );
 			}
 			case AF_INET6: {
 				const InetAddress mask(netmask());
-				const uint8_t* m = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(&mask)->sin6_addr.s6_addr);
-				const uint8_t* a = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(&addr)->sin6_addr.s6_addr);
-				const uint8_t* b = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
-				for (unsigned int i = 0; i < 16; ++i) {
-					if ((a[i] & m[i]) != b[i]) {
+				const uint8_t *m = reinterpret_cast<const uint8_t *>(reinterpret_cast<const struct sockaddr_in6 *>(&mask)->sin6_addr.s6_addr);
+				const uint8_t *a = reinterpret_cast<const uint8_t *>(reinterpret_cast<const struct sockaddr_in6 *>(&addr)->sin6_addr.s6_addr);
+				const uint8_t *b = reinterpret_cast<const uint8_t *>(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr);
+				for(unsigned int i=0;i<16;++i) {
+					if ((a[i] & m[i]) != b[i])
 						return false;
-					}
 				}
 				return true;
 			}
@@ -365,36 +298,31 @@ bool InetAddress::containsAddress(const InetAddress& addr) const
 }
 
 bool InetAddress::isNetwork() const
+	throw()
 {
-	switch (ss_family) {
+	switch(ss_family) {
 		case AF_INET: {
 			unsigned int bits = netmaskBits();
-			if (bits <= 0) {
+			if (bits <= 0)
 				return false;
-			}
-			if (bits >= 32) {
+			if (bits >= 32)
 				return false;
-			}
-			uint32_t ip = Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr);
+			uint32_t ip = Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr);
 			return ((ip & (0xffffffff >> bits)) == 0);
 		}
 		case AF_INET6: {
 			unsigned int bits = netmaskBits();
-			if (bits <= 0) {
+			if (bits <= 0)
 				return false;
-			}
-			if (bits >= 128) {
+			if (bits >= 128)
 				return false;
-			}
-			const unsigned char* ip = reinterpret_cast<const unsigned char*>(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
+			const unsigned char *ip = reinterpret_cast<const unsigned char *>(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr);
 			unsigned int p = bits / 8;
-			if ((ip[p++] & (0xff >> (bits % 8))) != 0) {
+			if ((ip[p++] & (0xff >> (bits % 8))) != 0)
 				return false;
-			}
 			while (p < 16) {
-				if (ip[p++]) {
+				if (ip[p++])
 					return false;
-				}
 			}
 			return true;
 		}
@@ -402,74 +330,70 @@ bool InetAddress::isNetwork() const
 	return false;
 }
 
-bool InetAddress::operator==(const InetAddress& a) const
+bool InetAddress::operator==(const InetAddress &a) const
+	throw()
 {
 	if (ss_family == a.ss_family) {
-		switch (ss_family) {
+		switch(ss_family) {
 			case AF_INET:
 				return (
-					(reinterpret_cast<const struct sockaddr_in*>(this)->sin_port == reinterpret_cast<const struct sockaddr_in*>(&a)->sin_port)
-					&& (reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr == reinterpret_cast<const struct sockaddr_in*>(&a)->sin_addr.s_addr));
+					(reinterpret_cast<const struct sockaddr_in *>(this)->sin_port == reinterpret_cast<const struct sockaddr_in *>(&a)->sin_port)&&
+					(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr == reinterpret_cast<const struct sockaddr_in *>(&a)->sin_addr.s_addr));
 				break;
 			case AF_INET6:
 				return (
-					(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_port == reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_port)
-					&& (reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_flowinfo == reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_flowinfo)
-					&& (memcmp(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_addr.s6_addr, 16) == 0)
-					&& (reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_scope_id == reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_scope_id));
+					(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_port == reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_port)&&
+					(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_flowinfo == reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_flowinfo)&&
+					(memcmp(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr,reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_addr.s6_addr,16) == 0)&&
+					(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_scope_id == reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_scope_id));
 				break;
 			default:
-				return (memcmp(this, &a, sizeof(InetAddress)) == 0);
+				return (memcmp(this,&a,sizeof(InetAddress)) == 0);
 		}
 	}
 	return false;
 }
 
-bool InetAddress::operator<(const InetAddress& a) const
+bool InetAddress::operator<(const InetAddress &a) const
+	throw()
 {
-	if (ss_family < a.ss_family) {
+	if (ss_family < a.ss_family)
 		return true;
-	}
 	else if (ss_family == a.ss_family) {
-		switch (ss_family) {
+		switch(ss_family) {
 			case AF_INET:
-				if (reinterpret_cast<const struct sockaddr_in*>(this)->sin_port < reinterpret_cast<const struct sockaddr_in*>(&a)->sin_port) {
+				if (reinterpret_cast<const struct sockaddr_in *>(this)->sin_port < reinterpret_cast<const struct sockaddr_in *>(&a)->sin_port)
 					return true;
-				}
-				else if (reinterpret_cast<const struct sockaddr_in*>(this)->sin_port == reinterpret_cast<const struct sockaddr_in*>(&a)->sin_port) {
-					if (reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr < reinterpret_cast<const struct sockaddr_in*>(&a)->sin_addr.s_addr) {
+				else if (reinterpret_cast<const struct sockaddr_in *>(this)->sin_port == reinterpret_cast<const struct sockaddr_in *>(&a)->sin_port) {
+					if (reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr < reinterpret_cast<const struct sockaddr_in *>(&a)->sin_addr.s_addr)
 						return true;
-					}
 				}
 				break;
 			case AF_INET6:
-				if (reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_port < reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_port) {
+				if (reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_port < reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_port)
 					return true;
-				}
-				else if (reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_port == reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_port) {
-					if (reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_flowinfo < reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_flowinfo) {
+				else if (reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_port == reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_port) {
+					if (reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_flowinfo < reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_flowinfo)
 						return true;
-					}
-					else if (reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_flowinfo == reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_flowinfo) {
-						if (memcmp(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_addr.s6_addr, 16) < 0) {
+					else if (reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_flowinfo == reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_flowinfo) {
+						if (memcmp(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr,reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_addr.s6_addr,16) < 0)
 							return true;
-						}
-						else if (memcmp(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_addr.s6_addr, 16) == 0) {
-							if (reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_scope_id < reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_scope_id) {
+						else if (memcmp(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr,reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_addr.s6_addr,16) == 0) {
+							if (reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_scope_id < reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_scope_id)
 								return true;
-							}
 						}
 					}
 				}
 				break;
 			default:
-				return (memcmp(this, &a, sizeof(InetAddress)) < 0);
+				return (memcmp(this,&a,sizeof(InetAddress)) < 0);
 		}
 	}
 	return false;
 }
 
-InetAddress InetAddress::makeIpv6LinkLocal(const MAC& mac)
+InetAddress InetAddress::makeIpv6LinkLocal(const MAC &mac)
+	throw()
 {
 	struct sockaddr_in6 sin6;
 	sin6.sin6_family = AF_INET6;
@@ -493,10 +417,11 @@ InetAddress InetAddress::makeIpv6LinkLocal(const MAC& mac)
 	return InetAddress(sin6);
 }
 
-InetAddress InetAddress::makeIpv6rfc4193(uint64_t nwid, uint64_t zeroTierAddress)
+InetAddress InetAddress::makeIpv6rfc4193(uint64_t nwid,uint64_t zeroTierAddress)
+	throw()
 {
 	InetAddress r;
-	struct sockaddr_in6* const sin6 = reinterpret_cast<struct sockaddr_in6*>(&r);
+	struct sockaddr_in6 *const sin6 = reinterpret_cast<struct sockaddr_in6 *>(&r);
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_addr.s6_addr[0] = 0xfd;
 	sin6->sin6_addr.s6_addr[1] = (uint8_t)(nwid >> 56);
@@ -514,29 +439,8 @@ InetAddress InetAddress::makeIpv6rfc4193(uint64_t nwid, uint64_t zeroTierAddress
 	sin6->sin6_addr.s6_addr[13] = (uint8_t)(zeroTierAddress >> 16);
 	sin6->sin6_addr.s6_addr[14] = (uint8_t)(zeroTierAddress >> 8);
 	sin6->sin6_addr.s6_addr[15] = (uint8_t)zeroTierAddress;
-	sin6->sin6_port = Utils::hton((uint16_t)88);   // /88 includes 0xfd + network ID, discriminating by device ID below that
+	sin6->sin6_port = Utils::hton((uint16_t)88); // /88 includes 0xfd + network ID, discriminating by device ID below that
 	return r;
 }
 
-InetAddress InetAddress::makeIpv66plane(uint64_t nwid, uint64_t zeroTierAddress)
-{
-	nwid ^= (nwid >> 32);
-	InetAddress r;
-	struct sockaddr_in6* const sin6 = reinterpret_cast<struct sockaddr_in6*>(&r);
-	sin6->sin6_family = AF_INET6;
-	sin6->sin6_addr.s6_addr[0] = 0xfc;
-	sin6->sin6_addr.s6_addr[1] = (uint8_t)(nwid >> 24);
-	sin6->sin6_addr.s6_addr[2] = (uint8_t)(nwid >> 16);
-	sin6->sin6_addr.s6_addr[3] = (uint8_t)(nwid >> 8);
-	sin6->sin6_addr.s6_addr[4] = (uint8_t)nwid;
-	sin6->sin6_addr.s6_addr[5] = (uint8_t)(zeroTierAddress >> 32);
-	sin6->sin6_addr.s6_addr[6] = (uint8_t)(zeroTierAddress >> 24);
-	sin6->sin6_addr.s6_addr[7] = (uint8_t)(zeroTierAddress >> 16);
-	sin6->sin6_addr.s6_addr[8] = (uint8_t)(zeroTierAddress >> 8);
-	sin6->sin6_addr.s6_addr[9] = (uint8_t)zeroTierAddress;
-	sin6->sin6_addr.s6_addr[15] = 0x01;
-	sin6->sin6_port = Utils::hton((uint16_t)40);
-	return r;
-}
-
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/InetAddress.hpp b/node/InetAddress.hpp
index 4e0b89438..b60a5a3a8 100644
--- a/node/InetAddress.hpp
+++ b/node/InetAddress.hpp
@@ -1,28 +1,35 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_INETADDRESS_HPP
 #define ZT_INETADDRESS_HPP
 
-#include "../include/ZeroTierOne.h"
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "MAC.hpp"
-#include "Utils.hpp"
-
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+
+#include <string>
+
+#include "Constants.hpp"
+#include "../include/ZeroTierOne.h"
+#include "Utils.hpp"
+#include "MAC.hpp"
+#include "Buffer.hpp"
 
 namespace ZeroTier {
 
@@ -39,7 +46,8 @@ namespace ZeroTier {
  * sockaddr_storage and used interchangeably. DO NOT change this by e.g.
  * adding non-static fields, since much code depends on this identity.
  */
-struct InetAddress : public sockaddr_storage {
+struct InetAddress : public sockaddr_storage
+{
 	/**
 	 * Loopback IPv4 address (no port)
 	 */
@@ -57,177 +65,135 @@ struct InetAddress : public sockaddr_storage {
 	 * MUST remain that way or Path must be changed to reflect. Also be sure
 	 * to change ZT_INETADDRESS_MAX_SCOPE if the max changes.
 	 */
-	enum IpScope {
-		IP_SCOPE_NONE = 0,			  // NULL or not an IP address
-		IP_SCOPE_MULTICAST = 1,		  // 224.0.0.0 and other V4/V6 multicast IPs
-		IP_SCOPE_LOOPBACK = 2,		  // 127.0.0.1, ::1, etc.
-		IP_SCOPE_PSEUDOPRIVATE = 3,	  // 28.x.x.x, etc. -- unofficially unrouted IPv4 blocks often "bogarted"
-		IP_SCOPE_GLOBAL = 4,		  // globally routable IP address (all others)
-		IP_SCOPE_LINK_LOCAL = 5,	  // 169.254.x.x, IPv6 LL
-		IP_SCOPE_SHARED = 6,		  // currently unused, formerly used for carrier-grade NAT ranges
-		IP_SCOPE_PRIVATE = 7		  // 10.x.x.x, 192.168.x.x, etc.
+	enum IpScope
+	{
+		IP_SCOPE_NONE = 0,          // NULL or not an IP address
+		IP_SCOPE_MULTICAST = 1,     // 224.0.0.0 and other V4/V6 multicast IPs
+		IP_SCOPE_LOOPBACK = 2,      // 127.0.0.1, ::1, etc.
+		IP_SCOPE_PSEUDOPRIVATE = 3, // 28.x.x.x, etc. -- unofficially unrouted IPv4 blocks often "bogarted"
+		IP_SCOPE_GLOBAL = 4,        // globally routable IP address (all others)
+		IP_SCOPE_LINK_LOCAL = 5,    // 169.254.x.x, IPv6 LL
+		IP_SCOPE_SHARED = 6,        // 100.64.0.0/10, shared space for e.g. carrier-grade NAT
+		IP_SCOPE_PRIVATE = 7        // 10.x.x.x, 192.168.x.x, etc.
 	};
 
-	// Can be used with the unordered maps and sets in c++11. We don't use C++11 in the core
-	// but this is safe to put here.
-	struct Hasher {
-		inline std::size_t operator()(const InetAddress& a) const
-		{
-			return (std::size_t)a.hashCode();
-		}
-	};
+	InetAddress() throw() { memset(this,0,sizeof(InetAddress)); }
+	InetAddress(const InetAddress &a) throw() { memcpy(this,&a,sizeof(InetAddress)); }
+	InetAddress(const InetAddress *a) throw() { memcpy(this,a,sizeof(InetAddress)); }
+	InetAddress(const struct sockaddr_storage &ss) throw() { *this = ss; }
+	InetAddress(const struct sockaddr_storage *ss) throw() { *this = ss; }
+	InetAddress(const struct sockaddr &sa) throw() { *this = sa; }
+	InetAddress(const struct sockaddr *sa) throw() { *this = sa; }
+	InetAddress(const struct sockaddr_in &sa) throw() { *this = sa; }
+	InetAddress(const struct sockaddr_in *sa) throw() { *this = sa; }
+	InetAddress(const struct sockaddr_in6 &sa) throw() { *this = sa; }
+	InetAddress(const struct sockaddr_in6 *sa) throw() { *this = sa; }
+	InetAddress(const void *ipBytes,unsigned int ipLen,unsigned int port) throw() { this->set(ipBytes,ipLen,port); }
+	InetAddress(const uint32_t ipv4,unsigned int port) throw() { this->set(&ipv4,4,port); }
+	InetAddress(const std::string &ip,unsigned int port) throw() { this->set(ip,port); }
+	InetAddress(const std::string &ipSlashPort) throw() { this->fromString(ipSlashPort); }
+	InetAddress(const char *ipSlashPort) throw() { this->fromString(std::string(ipSlashPort)); }
 
-	InetAddress()
+	inline InetAddress &operator=(const InetAddress &a)
+		throw()
 	{
-		memset(this, 0, sizeof(InetAddress));
-	}
-	InetAddress(const InetAddress& a)
-	{
-		memcpy(this, &a, sizeof(InetAddress));
-	}
-	InetAddress(const InetAddress* a)
-	{
-		memcpy(this, a, sizeof(InetAddress));
-	}
-	InetAddress(const struct sockaddr_storage& ss)
-	{
-		*this = ss;
-	}
-	InetAddress(const struct sockaddr_storage* ss)
-	{
-		*this = ss;
-	}
-	InetAddress(const struct sockaddr& sa)
-	{
-		*this = sa;
-	}
-	InetAddress(const struct sockaddr* sa)
-	{
-		*this = sa;
-	}
-	InetAddress(const struct sockaddr_in& sa)
-	{
-		*this = sa;
-	}
-	InetAddress(const struct sockaddr_in* sa)
-	{
-		*this = sa;
-	}
-	InetAddress(const struct sockaddr_in6& sa)
-	{
-		*this = sa;
-	}
-	InetAddress(const struct sockaddr_in6* sa)
-	{
-		*this = sa;
-	}
-	InetAddress(const void* ipBytes, unsigned int ipLen, unsigned int port)
-	{
-		this->set(ipBytes, ipLen, port);
-	}
-	InetAddress(const uint32_t ipv4, unsigned int port)
-	{
-		this->set(&ipv4, 4, port);
-	}
-	InetAddress(const char* ipSlashPort)
-	{
-		this->fromString(ipSlashPort);
+		if (&a != this)
+			memcpy(this,&a,sizeof(InetAddress));
+		return *this;
 	}
 
-	inline InetAddress& operator=(const InetAddress& a)
+	inline InetAddress &operator=(const InetAddress *a)
+		throw()
 	{
-		if (&a != this) {
-			memcpy(this, &a, sizeof(InetAddress));
+		if (a != this)
+			memcpy(this,a,sizeof(InetAddress));
+		return *this;
+	}
+
+	inline InetAddress &operator=(const struct sockaddr_storage &ss)
+		throw()
+	{
+		if (reinterpret_cast<const InetAddress *>(&ss) != this)
+			memcpy(this,&ss,sizeof(InetAddress));
+		return *this;
+	}
+
+	inline InetAddress &operator=(const struct sockaddr_storage *ss)
+		throw()
+	{
+		if (reinterpret_cast<const InetAddress *>(ss) != this)
+			memcpy(this,ss,sizeof(InetAddress));
+		return *this;
+	}
+
+	inline InetAddress &operator=(const struct sockaddr_in &sa)
+		throw()
+	{
+		if (reinterpret_cast<const InetAddress *>(&sa) != this) {
+			memset(this,0,sizeof(InetAddress));
+			memcpy(this,&sa,sizeof(struct sockaddr_in));
 		}
 		return *this;
 	}
 
-	inline InetAddress& operator=(const InetAddress* a)
+	inline InetAddress &operator=(const struct sockaddr_in *sa)
+		throw()
 	{
-		if (a != this) {
-			memcpy(this, a, sizeof(InetAddress));
+		if (reinterpret_cast<const InetAddress *>(sa) != this) {
+			memset(this,0,sizeof(InetAddress));
+			memcpy(this,sa,sizeof(struct sockaddr_in));
 		}
 		return *this;
 	}
 
-	inline InetAddress& operator=(const struct sockaddr_storage& ss)
+	inline InetAddress &operator=(const struct sockaddr_in6 &sa)
+		throw()
 	{
-		if (reinterpret_cast<const InetAddress*>(&ss) != this) {
-			memcpy(this, &ss, sizeof(InetAddress));
+		if (reinterpret_cast<const InetAddress *>(&sa) != this) {
+			memset(this,0,sizeof(InetAddress));
+			memcpy(this,&sa,sizeof(struct sockaddr_in6));
 		}
 		return *this;
 	}
 
-	inline InetAddress& operator=(const struct sockaddr_storage* ss)
+	inline InetAddress &operator=(const struct sockaddr_in6 *sa)
+		throw()
 	{
-		if (reinterpret_cast<const InetAddress*>(ss) != this) {
-			memcpy(this, ss, sizeof(InetAddress));
+		if (reinterpret_cast<const InetAddress *>(sa) != this) {
+			memset(this,0,sizeof(InetAddress));
+			memcpy(this,sa,sizeof(struct sockaddr_in6));
 		}
 		return *this;
 	}
 
-	inline InetAddress& operator=(const struct sockaddr_in& sa)
+	inline InetAddress &operator=(const struct sockaddr &sa)
+		throw()
 	{
-		if (reinterpret_cast<const InetAddress*>(&sa) != this) {
-			memset(this, 0, sizeof(InetAddress));
-			memcpy(this, &sa, sizeof(struct sockaddr_in));
-		}
-		return *this;
-	}
-
-	inline InetAddress& operator=(const struct sockaddr_in* sa)
-	{
-		if (reinterpret_cast<const InetAddress*>(sa) != this) {
-			memset(this, 0, sizeof(InetAddress));
-			memcpy(this, sa, sizeof(struct sockaddr_in));
-		}
-		return *this;
-	}
-
-	inline InetAddress& operator=(const struct sockaddr_in6& sa)
-	{
-		if (reinterpret_cast<const InetAddress*>(&sa) != this) {
-			memset(this, 0, sizeof(InetAddress));
-			memcpy(this, &sa, sizeof(struct sockaddr_in6));
-		}
-		return *this;
-	}
-
-	inline InetAddress& operator=(const struct sockaddr_in6* sa)
-	{
-		if (reinterpret_cast<const InetAddress*>(sa) != this) {
-			memset(this, 0, sizeof(InetAddress));
-			memcpy(this, sa, sizeof(struct sockaddr_in6));
-		}
-		return *this;
-	}
-
-	inline InetAddress& operator=(const struct sockaddr& sa)
-	{
-		if (reinterpret_cast<const InetAddress*>(&sa) != this) {
-			memset(this, 0, sizeof(InetAddress));
-			switch (sa.sa_family) {
+		if (reinterpret_cast<const InetAddress *>(&sa) != this) {
+			memset(this,0,sizeof(InetAddress));
+			switch(sa.sa_family) {
 				case AF_INET:
-					memcpy(this, &sa, sizeof(struct sockaddr_in));
+					memcpy(this,&sa,sizeof(struct sockaddr_in));
 					break;
 				case AF_INET6:
-					memcpy(this, &sa, sizeof(struct sockaddr_in6));
+					memcpy(this,&sa,sizeof(struct sockaddr_in6));
 					break;
 			}
 		}
 		return *this;
 	}
 
-	inline InetAddress& operator=(const struct sockaddr* sa)
+	inline InetAddress &operator=(const struct sockaddr *sa)
+		throw()
 	{
-		if (reinterpret_cast<const InetAddress*>(sa) != this) {
-			memset(this, 0, sizeof(InetAddress));
-			switch (sa->sa_family) {
+		if (reinterpret_cast<const InetAddress *>(sa) != this) {
+			memset(this,0,sizeof(InetAddress));
+			switch(sa->sa_family) {
 				case AF_INET:
-					memcpy(this, sa, sizeof(struct sockaddr_in));
+					memcpy(this,sa,sizeof(struct sockaddr_in));
 					break;
 				case AF_INET6:
-					memcpy(this, sa, sizeof(struct sockaddr_in6));
+					memcpy(this,sa,sizeof(struct sockaddr_in6));
 					break;
 			}
 		}
@@ -237,7 +203,17 @@ struct InetAddress : public sockaddr_storage {
 	/**
 	 * @return IP scope classification (e.g. loopback, link-local, private, global)
 	 */
-	IpScope ipScope() const;
+	IpScope ipScope() const
+		throw();
+
+	/**
+	 * Set from a string-format IP and a port
+	 *
+	 * @param ip IP address in V4 or V6 ASCII notation
+	 * @param port Port or 0 for none
+	 */
+	void set(const std::string &ip,unsigned int port)
+		throw();
 
 	/**
 	 * Set from a raw IP and port number
@@ -246,7 +222,8 @@ struct InetAddress : public sockaddr_storage {
 	 * @param ipLen Length of IP address: 4 or 16
 	 * @param port Port number or 0 for none
 	 */
-	void set(const void* ipBytes, unsigned int ipLen, unsigned int port);
+	void set(const void *ipBytes,unsigned int ipLen,unsigned int port)
+		throw();
 
 	/**
 	 * Set the port component
@@ -254,65 +231,43 @@ struct InetAddress : public sockaddr_storage {
 	 * @param port Port, 0 to 65535
 	 */
 	inline void setPort(unsigned int port)
+		throw()
 	{
-		switch (ss_family) {
+		switch(ss_family) {
 			case AF_INET:
-				reinterpret_cast<struct sockaddr_in*>(this)->sin_port = Utils::hton((uint16_t)port);
+				reinterpret_cast<struct sockaddr_in *>(this)->sin_port = Utils::hton((uint16_t)port);
 				break;
 			case AF_INET6:
-				reinterpret_cast<struct sockaddr_in6*>(this)->sin6_port = Utils::hton((uint16_t)port);
+				reinterpret_cast<struct sockaddr_in6 *>(this)->sin6_port = Utils::hton((uint16_t)port);
 				break;
 		}
 	}
 
-	/**
-	 * @return True if this network/netmask route describes a default route (e.g. 0.0.0.0/0)
-	 */
-	inline bool isDefaultRoute() const
-	{
-		switch (ss_family) {
-			case AF_INET:
-				return ((reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr == 0) && (reinterpret_cast<const struct sockaddr_in*>(this)->sin_port == 0));
-			case AF_INET6:
-				const uint8_t* ipb = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
-				for (int i = 0; i < 16; ++i) {
-					if (ipb[i]) {
-						return false;
-					}
-				}
-				return (reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_port == 0);
-		}
-		return false;
-	}
-
 	/**
 	 * @return ASCII IP/port format representation
 	 */
-	char* toString(char buf[64]) const;
+	std::string toString() const;
 
 	/**
 	 * @return IP portion only, in ASCII string format
 	 */
-	char* toIpString(char buf[64]) const;
+	std::string toIpString() const;
 
 	/**
-	 * @param ipSlashPort IP/port (port is optional, will be 0 if not included)
-	 * @return True if address appeared to be valid
+	 * @param ipSlashPort ASCII IP/port format notation
 	 */
-	bool fromString(const char* ipSlashPort);
+	void fromString(const std::string &ipSlashPort);
 
 	/**
 	 * @return Port or 0 if no port component defined
 	 */
 	inline unsigned int port() const
+		throw()
 	{
-		switch (ss_family) {
-			case AF_INET:
-				return Utils::ntoh((uint16_t)(reinterpret_cast<const struct sockaddr_in*>(this)->sin_port));
-			case AF_INET6:
-				return Utils::ntoh((uint16_t)(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_port));
-			default:
-				return 0;
+		switch(ss_family) {
+			case AF_INET: return Utils::ntoh((uint16_t)(reinterpret_cast<const struct sockaddr_in *>(this)->sin_port));
+			case AF_INET6: return Utils::ntoh((uint16_t)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_port));
+			default: return 0;
 		}
 	}
 
@@ -325,25 +280,7 @@ struct InetAddress : public sockaddr_storage {
 	 *
 	 * @return Netmask bits
 	 */
-	inline unsigned int netmaskBits() const
-	{
-		return port();
-	}
-
-	/**
-	 * @return True if netmask bits is valid for the address type
-	 */
-	inline bool netmaskBitsValid() const
-	{
-		const unsigned int n = port();
-		switch (ss_family) {
-			case AF_INET:
-				return (n <= 32);
-			case AF_INET6:
-				return (n <= 128);
-		}
-		return false;
-	}
+	inline unsigned int netmaskBits() const throw() { return port(); }
 
 	/**
 	 * Alias for port()
@@ -353,10 +290,7 @@ struct InetAddress : public sockaddr_storage {
 	 *
 	 * @return Gateway metric
 	 */
-	inline unsigned int metric() const
-	{
-		return port();
-	}
+	inline unsigned int metric() const throw() { return port(); }
 
 	/**
 	 * Construct a full netmask as an InetAddress
@@ -382,144 +316,59 @@ struct InetAddress : public sockaddr_storage {
 	 */
 	InetAddress network() const;
 
-	/**
-	 * Test whether this IPv6 prefix matches the prefix of a given IPv6 address
-	 *
-	 * @param addr Address to check
-	 * @return True if this IPv6 prefix matches the prefix of a given IPv6 address
-	 */
-	bool isEqualPrefix(const InetAddress& addr) const;
-
 	/**
 	 * Test whether this IP/netmask contains this address
 	 *
 	 * @param addr Address to check
 	 * @return True if this IP/netmask (route) contains this address
 	 */
-	bool containsAddress(const InetAddress& addr) const;
+	bool containsAddress(const InetAddress &addr) const;
 
 	/**
 	 * @return True if this is an IPv4 address
 	 */
-	inline bool isV4() const
-	{
-		return (ss_family == AF_INET);
-	}
+	inline bool isV4() const throw() { return (ss_family == AF_INET); }
 
 	/**
 	 * @return True if this is an IPv6 address
 	 */
-	inline bool isV6() const
-	{
-		return (ss_family == AF_INET6);
-	}
+	inline bool isV6() const throw() { return (ss_family == AF_INET6); }
 
 	/**
 	 * @return pointer to raw address bytes or NULL if not available
 	 */
-	inline const void* rawIpData() const
+	inline const void *rawIpData() const
+		throw()
 	{
-		switch (ss_family) {
-			case AF_INET:
-				return (const void*)&(reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr);
-			case AF_INET6:
-				return (const void*)(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
-			default:
-				return 0;
+		switch(ss_family) {
+			case AF_INET: return (const void *)&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr);
+			case AF_INET6: return (const void *)(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr);
+			default: return 0;
 		}
 	}
 
-	/**
-	 * @return InetAddress containing only the IP portion of this address and a zero port, or NULL if not IPv4 or IPv6
-	 */
-	inline InetAddress ipOnly() const
-	{
-		InetAddress r;
-		switch (ss_family) {
-			case AF_INET:
-				r.ss_family = AF_INET;
-				reinterpret_cast<struct sockaddr_in*>(&r)->sin_addr.s_addr = reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr;
-				break;
-			case AF_INET6:
-				r.ss_family = AF_INET6;
-				memcpy(reinterpret_cast<struct sockaddr_in6*>(&r)->sin6_addr.s6_addr, reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, 16);
-				break;
-		}
-		return r;
-	}
-
 	/**
 	 * Performs an IP-only comparison or, if that is impossible, a memcmp()
 	 *
 	 * @param a InetAddress to compare again
 	 * @return True if only IP portions are equal (false for non-IP or null addresses)
 	 */
-	inline bool ipsEqual(const InetAddress& a) const
+	inline bool ipsEqual(const InetAddress &a) const
 	{
 		if (ss_family == a.ss_family) {
-			if (ss_family == AF_INET) {
-				return (reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr == reinterpret_cast<const struct sockaddr_in*>(&a)->sin_addr.s_addr);
-			}
-			if (ss_family == AF_INET6) {
-				return (memcmp(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_addr.s6_addr, 16) == 0);
-			}
-			return (memcmp(this, &a, sizeof(InetAddress)) == 0);
+			if (ss_family == AF_INET)
+				return (reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr == reinterpret_cast<const struct sockaddr_in *>(&a)->sin_addr.s_addr);
+			if (ss_family == AF_INET6)
+				return (memcmp(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr,reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_addr.s6_addr,16) == 0);
+			return (memcmp(this,&a,sizeof(InetAddress)) == 0);
 		}
 		return false;
 	}
 
-	/**
-	 * Performs an IP-only comparison or, if that is impossible, a memcmp()
-	 *
-	 * This version compares only the first 64 bits of IPv6 addresses.
-	 *
-	 * @param a InetAddress to compare again
-	 * @return True if only IP portions are equal (false for non-IP or null addresses)
-	 */
-	inline bool ipsEqual2(const InetAddress& a) const
-	{
-		if (ss_family == a.ss_family) {
-			if (ss_family == AF_INET) {
-				return (reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr == reinterpret_cast<const struct sockaddr_in*>(&a)->sin_addr.s_addr);
-			}
-			if (ss_family == AF_INET6) {
-				return (memcmp(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_addr.s6_addr, 8) == 0);
-			}
-			return (memcmp(this, &a, sizeof(InetAddress)) == 0);
-		}
-		return false;
-	}
-
-	inline unsigned long hashCode() const
-	{
-		if (ss_family == AF_INET) {
-			return ((unsigned long)reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr + (unsigned long)reinterpret_cast<const struct sockaddr_in*>(this)->sin_port);
-		}
-		else if (ss_family == AF_INET6) {
-			unsigned long tmp = reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_port;
-			const uint8_t* a = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
-			for (long i = 0; i < 16; ++i) {
-				reinterpret_cast<uint8_t*>(&tmp)[i % sizeof(tmp)] ^= a[i];
-			}
-			return tmp;
-		}
-		else {
-			unsigned long tmp = reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_port;
-			const uint8_t* a = reinterpret_cast<const uint8_t*>(this);
-			for (long i = 0; i < (long)sizeof(InetAddress); ++i) {
-				reinterpret_cast<uint8_t*>(&tmp)[i % sizeof(tmp)] ^= a[i];
-			}
-			return tmp;
-		}
-	}
-
 	/**
 	 * Set to null/zero
 	 */
-	inline void zero()
-	{
-		memset(this, 0, sizeof(InetAddress));
-	}
+	inline void zero() throw() { memset(this,0,sizeof(InetAddress)); }
 
 	/**
 	 * Check whether this is a network/route rather than an IP assignment
@@ -529,108 +378,29 @@ struct InetAddress : public sockaddr_storage {
 	 *
 	 * @return True if everything after netmask bits is zero
 	 */
-	bool isNetwork() const;
-
-	/**
-	 * Find the total number of prefix bits that match between this IP and another
-	 *
-	 * @param b Second IP to compare with
-	 * @return Number of matching prefix bits or 0 if none match or IPs are of different families (e.g. v4 and v6)
-	 */
-	inline unsigned int matchingPrefixBits(const InetAddress& b) const
-	{
-		unsigned int c = 0;
-		if (ss_family == b.ss_family) {
-			switch (ss_family) {
-				case AF_INET: {
-					uint32_t ip0 = Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr);
-					uint32_t ip1 = Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in*>(&b)->sin_addr.s_addr);
-					while ((ip0 >> 31) == (ip1 >> 31)) {
-						ip0 <<= 1;
-						ip1 <<= 1;
-						if (++c == 32) {
-							break;
-						}
-					}
-				} break;
-				case AF_INET6: {
-					const uint8_t* ip0 = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
-					const uint8_t* ip1 = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(&b)->sin6_addr.s6_addr);
-					for (unsigned int i = 0; i < 16; ++i) {
-						if (ip0[i] == ip1[i]) {
-							c += 8;
-						}
-						else {
-							uint8_t ip0b = ip0[i];
-							uint8_t ip1b = ip1[i];
-							uint8_t bit = 0x80;
-							while (bit != 0) {
-								if ((ip0b & bit) != (ip1b & bit)) {
-									break;
-								}
-								++c;
-								bit >>= 1;
-							}
-							break;
-						}
-					}
-				} break;
-			}
-		}
-		return c;
-	}
-
-	/**
-	 * @return 14-bit (0-16383) hash of this IP's first 24 or 48 bits (for V4 or V6) for rate limiting code, or 0 if non-IP
-	 */
-	inline unsigned long rateGateHash() const
-	{
-		unsigned long h = 0;
-		switch (ss_family) {
-			case AF_INET:
-				h = (Utils::ntoh((uint32_t)reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr) & 0xffffff00) >> 8;
-				h ^= (h >> 14);
-				break;
-			case AF_INET6: {
-				const uint8_t* ip = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr);
-				h = ((unsigned long)ip[0]);
-				h <<= 1;
-				h += ((unsigned long)ip[1]);
-				h <<= 1;
-				h += ((unsigned long)ip[2]);
-				h <<= 1;
-				h += ((unsigned long)ip[3]);
-				h <<= 1;
-				h += ((unsigned long)ip[4]);
-				h <<= 1;
-				h += ((unsigned long)ip[5]);
-			} break;
-		}
-		return (h & 0x3fff);
-	}
+	bool isNetwork() const
+		throw();
 
 	/**
 	 * @return True if address family is non-zero
 	 */
-	inline operator bool() const
-	{
-		return (ss_family != 0);
-	}
+	inline operator bool() const throw() { return (ss_family != 0); }
 
-	template <unsigned int C> inline void serialize(Buffer<C>& b) const
+	template<unsigned int C>
+	inline void serialize(Buffer<C> &b) const
 	{
 		// This is used in the protocol and must be the same as describe in places
 		// like VERB_HELLO in Packet.hpp.
-		switch (ss_family) {
+		switch(ss_family) {
 			case AF_INET:
 				b.append((uint8_t)0x04);
-				b.append(&(reinterpret_cast<const struct sockaddr_in*>(this)->sin_addr.s_addr), 4);
-				b.append((uint16_t)port());	  // just in case sin_port != uint16_t
+				b.append(&(reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr),4);
+				b.append((uint16_t)port()); // just in case sin_port != uint16_t
 				return;
 			case AF_INET6:
 				b.append((uint8_t)0x06);
-				b.append(reinterpret_cast<const struct sockaddr_in6*>(this)->sin6_addr.s6_addr, 16);
-				b.append((uint16_t)port());	  // just in case sin_port != uint16_t
+				b.append(reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr,16);
+				b.append((uint16_t)port()); // just in case sin_port != uint16_t
 				return;
 			default:
 				b.append((uint8_t)0);
@@ -638,11 +408,12 @@ struct InetAddress : public sockaddr_storage {
 		}
 	}
 
-	template <unsigned int C> inline unsigned int deserialize(const Buffer<C>& b, unsigned int startAt = 0)
+	template<unsigned int C>
+	inline unsigned int deserialize(const Buffer<C> &b,unsigned int startAt = 0)
 	{
-		memset(this, 0, sizeof(InetAddress));
+		memset(this,0,sizeof(InetAddress));
 		unsigned int p = startAt;
-		switch (b[p++]) {
+		switch(b[p++]) {
 			case 0:
 				return 1;
 			case 0x01:
@@ -654,51 +425,36 @@ struct InetAddress : public sockaddr_storage {
 			case 0x03:
 				// TODO: Other address types (but accept for forward compatibility)
 				// These could be extended/optional things like AF_UNIX, LTE Direct, shared memory, etc.
-				return (unsigned int)(b.template at<uint16_t>(p) + 3);	 // other addresses begin with 16-bit non-inclusive length
+				return (unsigned int)(b.template at<uint16_t>(p) + 3); // other addresses begin with 16-bit non-inclusive length
 			case 0x04:
 				ss_family = AF_INET;
-				memcpy(&(reinterpret_cast<struct sockaddr_in*>(this)->sin_addr.s_addr), b.field(p, 4), 4);
-				p += 4;
-				reinterpret_cast<struct sockaddr_in*>(this)->sin_port = Utils::hton(b.template at<uint16_t>(p));
-				p += 2;
+				memcpy(&(reinterpret_cast<struct sockaddr_in *>(this)->sin_addr.s_addr),b.field(p,4),4); p += 4;
+				reinterpret_cast<struct sockaddr_in *>(this)->sin_port = Utils::hton(b.template at<uint16_t>(p)); p += 2;
 				break;
 			case 0x06:
 				ss_family = AF_INET6;
-				memcpy(reinterpret_cast<struct sockaddr_in6*>(this)->sin6_addr.s6_addr, b.field(p, 16), 16);
-				p += 16;
-				reinterpret_cast<struct sockaddr_in*>(this)->sin_port = Utils::hton(b.template at<uint16_t>(p));
-				p += 2;
+				memcpy(reinterpret_cast<struct sockaddr_in6 *>(this)->sin6_addr.s6_addr,b.field(p,16),16); p += 16;
+				reinterpret_cast<struct sockaddr_in *>(this)->sin_port = Utils::hton(b.template at<uint16_t>(p)); p += 2;
 				break;
 			default:
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_BAD_ENCODING;
+				throw std::invalid_argument("invalid serialized InetAddress");
 		}
 		return (p - startAt);
 	}
 
-	bool operator==(const InetAddress& a) const;
-	bool operator<(const InetAddress& a) const;
-	inline bool operator!=(const InetAddress& a) const
-	{
-		return ! (*this == a);
-	}
-	inline bool operator>(const InetAddress& a) const
-	{
-		return (a < *this);
-	}
-	inline bool operator<=(const InetAddress& a) const
-	{
-		return ! (a < *this);
-	}
-	inline bool operator>=(const InetAddress& a) const
-	{
-		return ! (*this < a);
-	}
+	bool operator==(const InetAddress &a) const throw();
+	bool operator<(const InetAddress &a) const throw();
+	inline bool operator!=(const InetAddress &a) const throw() { return !(*this == a); }
+	inline bool operator>(const InetAddress &a) const throw() { return (a < *this); }
+	inline bool operator<=(const InetAddress &a) const throw() { return !(a < *this); }
+	inline bool operator>=(const InetAddress &a) const throw() { return !(*this < a); }
 
 	/**
 	 * @param mac MAC address seed
 	 * @return IPv6 link-local address
 	 */
-	static InetAddress makeIpv6LinkLocal(const MAC& mac);
+	static InetAddress makeIpv6LinkLocal(const MAC &mac)
+		throw();
 
 	/**
 	 * Compute private IPv6 unicast address from network ID and ZeroTier address
@@ -741,14 +497,10 @@ struct InetAddress : public sockaddr_storage {
 	 * @param zeroTierAddress 40-bit device address (in least significant 40 bits, highest 24 bits ignored)
 	 * @return IPv6 private unicast address with /88 netmask
 	 */
-	static InetAddress makeIpv6rfc4193(uint64_t nwid, uint64_t zeroTierAddress);
-
-	/**
-	 * Compute a private IPv6 "6plane" unicast address from network ID and ZeroTier address
-	 */
-	static InetAddress makeIpv66plane(uint64_t nwid, uint64_t zeroTierAddress);
+	static InetAddress makeIpv6rfc4193(uint64_t nwid,uint64_t zeroTierAddress)
+		throw();
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/MAC.hpp b/node/MAC.hpp
index 9cf8454da..95623f126 100644
--- a/node/MAC.hpp
+++ b/node/MAC.hpp
@@ -1,103 +1,93 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_MAC_HPP
 #define ZT_MAC_HPP
 
-#include "Address.hpp"
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "Utils.hpp"
-
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
+
+#include "Constants.hpp"
+#include "Utils.hpp"
+#include "Address.hpp"
+#include "Buffer.hpp"
 
 namespace ZeroTier {
 
 /**
  * 48-byte Ethernet MAC address
  */
-class MAC {
-  public:
-	MAC() : _m(0ULL)
-	{
-	}
-	MAC(const MAC& m) : _m(m._m)
-	{
-	}
+class MAC
+{
+public:
+	MAC() throw() : _m(0ULL) {}
+	MAC(const MAC &m) throw() : _m(m._m) {}
 
-	MAC(const unsigned char a, const unsigned char b, const unsigned char c, const unsigned char d, const unsigned char e, const unsigned char f)
-		: _m(((((uint64_t)a) & 0xffULL) << 40) | ((((uint64_t)b) & 0xffULL) << 32) | ((((uint64_t)c) & 0xffULL) << 24) | ((((uint64_t)d) & 0xffULL) << 16) | ((((uint64_t)e) & 0xffULL) << 8) | (((uint64_t)f) & 0xffULL))
-	{
-	}
-	MAC(const void* bits, unsigned int len)
-	{
-		setTo(bits, len);
-	}
-	MAC(const Address& ztaddr, uint64_t nwid)
-	{
-		fromAddress(ztaddr, nwid);
-	}
-	MAC(const uint64_t m) : _m(m & 0xffffffffffffULL)
-	{
-	}
+	MAC(const unsigned char a,const unsigned char b,const unsigned char c,const unsigned char d,const unsigned char e,const unsigned char f) throw() :
+		_m( ((((uint64_t)a) & 0xffULL) << 40) |
+		    ((((uint64_t)b) & 0xffULL) << 32) |
+		    ((((uint64_t)c) & 0xffULL) << 24) |
+		    ((((uint64_t)d) & 0xffULL) << 16) |
+		    ((((uint64_t)e) & 0xffULL) << 8) |
+		    (((uint64_t)f) & 0xffULL) ) {}
+
+	MAC(const char *s) throw() { fromString(s); }
+	MAC(const std::string &s) throw() { fromString(s.c_str()); }
+
+	MAC(const void *bits,unsigned int len) throw() { setTo(bits,len); }
+
+	MAC(const Address &ztaddr,uint64_t nwid) throw() { fromAddress(ztaddr,nwid); }
+
+	MAC(const uint64_t m) throw() : _m(m & 0xffffffffffffULL) {}
 
 	/**
 	 * @return MAC in 64-bit integer
 	 */
-	inline uint64_t toInt() const
-	{
-		return _m;
-	}
+	inline uint64_t toInt() const throw() { return _m; }
 
 	/**
 	 * Set MAC to zero
 	 */
-	inline void zero()
-	{
-		_m = 0ULL;
-	}
+	inline void zero() { _m = 0ULL; }
 
 	/**
 	 * @return True if MAC is non-zero
 	 */
-	inline operator bool() const
-	{
-		return (_m != 0ULL);
-	}
+	inline operator bool() const throw() { return (_m != 0ULL); }
 
 	/**
 	 * @param bits Raw MAC in big-endian byte order
 	 * @param len Length, must be >= 6 or result is zero
 	 */
-	inline void setTo(const void* bits, unsigned int len)
+	inline void setTo(const void *bits,unsigned int len)
+		throw()
 	{
 		if (len < 6) {
 			_m = 0ULL;
 			return;
 		}
-		const unsigned char* b = (const unsigned char*)bits;
-		_m = ((((uint64_t)*b) & 0xff) << 40);
-		++b;
-		_m |= ((((uint64_t)*b) & 0xff) << 32);
-		++b;
-		_m |= ((((uint64_t)*b) & 0xff) << 24);
-		++b;
-		_m |= ((((uint64_t)*b) & 0xff) << 16);
-		++b;
-		_m |= ((((uint64_t)*b) & 0xff) << 8);
-		++b;
+		const unsigned char *b = (const unsigned char *)bits;
+		_m =  ((((uint64_t)*b) & 0xff) << 40); ++b;
+		_m |= ((((uint64_t)*b) & 0xff) << 32); ++b;
+		_m |= ((((uint64_t)*b) & 0xff) << 24); ++b;
+		_m |= ((((uint64_t)*b) & 0xff) << 16); ++b;
+		_m |= ((((uint64_t)*b) & 0xff) << 8); ++b;
 		_m |= (((uint64_t)*b) & 0xff);
 	}
 
@@ -105,12 +95,12 @@ class MAC {
 	 * @param buf Destination buffer for MAC in big-endian byte order
 	 * @param len Length of buffer, must be >= 6 or nothing is copied
 	 */
-	inline void copyTo(void* buf, unsigned int len) const
+	inline void copyTo(void *buf,unsigned int len) const
+		throw()
 	{
-		if (len < 6) {
+		if (len < 6)
 			return;
-		}
-		unsigned char* b = (unsigned char*)buf;
+		unsigned char *b = (unsigned char *)buf;
 		*(b++) = (unsigned char)((_m >> 40) & 0xff);
 		*(b++) = (unsigned char)((_m >> 32) & 0xff);
 		*(b++) = (unsigned char)((_m >> 24) & 0xff);
@@ -124,9 +114,11 @@ class MAC {
 	 *
 	 * @param b Buffer to append to
 	 */
-	template <unsigned int C> inline void appendTo(Buffer<C>& b) const
+	template<unsigned int C>
+	inline void appendTo(Buffer<C> &b) const
+		throw(std::out_of_range)
 	{
-		unsigned char* p = (unsigned char*)b.appendField(6);
+		unsigned char *p = (unsigned char *)b.appendField(6);
 		*(p++) = (unsigned char)((_m >> 40) & 0xff);
 		*(p++) = (unsigned char)((_m >> 32) & 0xff);
 		*(p++) = (unsigned char)((_m >> 24) & 0xff);
@@ -138,25 +130,47 @@ class MAC {
 	/**
 	 * @return True if this is broadcast (all 0xff)
 	 */
-	inline bool isBroadcast() const
-	{
-		return (_m == 0xffffffffffffULL);
-	}
+	inline bool isBroadcast() const throw() { return (_m == 0xffffffffffffULL); }
 
 	/**
 	 * @return True if this is a multicast MAC
 	 */
-	inline bool isMulticast() const
-	{
-		return ((_m & 0x010000000000ULL) != 0ULL);
-	}
+	inline bool isMulticast() const throw() { return ((_m & 0x010000000000ULL) != 0ULL); }
 
 	/**
 	 * @param True if this is a locally-administered MAC
 	 */
-	inline bool isLocallyAdministered() const
+	inline bool isLocallyAdministered() const throw() { return ((_m & 0x020000000000ULL) != 0ULL); }
+
+	/**
+	 * @param s Hex MAC, with or without : delimiters
+	 */
+	inline void fromString(const char *s)
 	{
-		return ((_m & 0x020000000000ULL) != 0ULL);
+		char tmp[8];
+		for(int i=0;i<6;++i)
+			tmp[i] = (char)0;
+		Utils::unhex(s,tmp,6);
+		setTo(tmp,6);
+	}
+
+	/**
+	 * @return MAC address in standard :-delimited hex format
+	 */
+	inline std::string toString() const
+	{
+		char tmp[24];
+		toString(tmp,sizeof(tmp));
+		return std::string(tmp);
+	}
+
+	/**
+	 * @param buf Buffer to contain human-readable MAC
+	 * @param len Length of buffer
+	 */
+	inline void toString(char *buf,unsigned int len) const
+	{
+		Utils::snprintf(buf,len,"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)(*this)[0],(int)(*this)[1],(int)(*this)[2],(int)(*this)[3],(int)(*this)[4],(int)(*this)[5]);
 	}
 
 	/**
@@ -165,10 +179,11 @@ class MAC {
 	 * @param ztaddr ZeroTier address
 	 * @param nwid 64-bit network ID
 	 */
-	inline void fromAddress(const Address& ztaddr, uint64_t nwid)
+	inline void fromAddress(const Address &ztaddr,uint64_t nwid)
+		throw()
 	{
 		uint64_t m = ((uint64_t)firstOctetForNetwork(nwid)) << 40;
-		m |= ztaddr.toInt();   // a is 40 bits
+		m |= ztaddr.toInt(); // a is 40 bits
 		m ^= ((nwid >> 8) & 0xff) << 32;
 		m ^= ((nwid >> 16) & 0xff) << 24;
 		m ^= ((nwid >> 24) & 0xff) << 16;
@@ -180,14 +195,15 @@ class MAC {
 	/**
 	 * Get the ZeroTier address for this MAC on this network (assuming no bridging of course, basic unicast)
 	 *
-	 * This just XORs the next-least-significant 5 bytes of the network ID again to unmask.
+	 * This just XORs the next-lest-significant 5 bytes of the network ID again to unmask.
 	 *
 	 * @param nwid Network ID
 	 */
 	inline Address toAddress(uint64_t nwid) const
+		throw()
 	{
-		uint64_t a = _m & 0xffffffffffULL;	 // least significant 40 bits of MAC are formed from address
-		a ^= ((nwid >> 8) & 0xff) << 32;	 // ... XORed with bits 8-48 of the nwid in little-endian byte order, so unmask it
+		uint64_t a = _m & 0xffffffffffULL; // least significant 40 bits of MAC are formed from address
+		a ^= ((nwid >> 8) & 0xff) << 32; // ... XORed with bits 8-48 of the nwid in little-endian byte order, so unmask it
 		a ^= ((nwid >> 16) & 0xff) << 24;
 		a ^= ((nwid >> 24) & 0xff) << 16;
 		a ^= ((nwid >> 32) & 0xff) << 8;
@@ -200,96 +216,49 @@ class MAC {
 	 * @return First octet of MAC for this network
 	 */
 	static inline unsigned char firstOctetForNetwork(uint64_t nwid)
+		throw()
 	{
-		unsigned char a = ((unsigned char)(nwid & 0xfe) | 0x02);   // locally administered, not multicast, from LSB of network ID
-		return ((a == 0x52) ? 0x32 : a);						   // blacklist 0x52 since it's used by KVM, libvirt, and other popular virtualization engines... seems de-facto standard on Linux
+		unsigned char a = ((unsigned char)(nwid & 0xfe) | 0x02); // locally administered, not multicast, from LSB of network ID
+		return ((a == 0x52) ? 0x32 : a); // blacklist 0x52 since it's used by KVM, libvirt, and other popular virtualization engines... seems de-facto standard on Linux
 	}
 
 	/**
 	 * @param i Value from 0 to 5 (inclusive)
 	 * @return Byte at said position (address interpreted in big-endian order)
 	 */
-	inline unsigned char operator[](unsigned int i) const
-	{
-		return (unsigned char)((_m >> (40 - (i * 8))) & 0xff);
-	}
+	inline unsigned char operator[](unsigned int i) const throw() { return (unsigned char)((_m >> (40 - (i * 8))) & 0xff); }
 
 	/**
 	 * @return 6, which is the number of bytes in a MAC, for container compliance
 	 */
-	inline unsigned int size() const
-	{
-		return 6;
-	}
+	inline unsigned int size() const throw() { return 6; }
 
-	inline unsigned long hashCode() const
-	{
-		return (unsigned long)_m;
-	}
+	inline unsigned long hashCode() const throw() { return (unsigned long)_m; }
 
-	inline char* toString(char buf[18]) const
-	{
-		buf[0] = Utils::HEXCHARS[(_m >> 44) & 0xf];
-		buf[1] = Utils::HEXCHARS[(_m >> 40) & 0xf];
-		buf[2] = ':';
-		buf[3] = Utils::HEXCHARS[(_m >> 36) & 0xf];
-		buf[4] = Utils::HEXCHARS[(_m >> 32) & 0xf];
-		buf[5] = ':';
-		buf[6] = Utils::HEXCHARS[(_m >> 28) & 0xf];
-		buf[7] = Utils::HEXCHARS[(_m >> 24) & 0xf];
-		buf[8] = ':';
-		buf[9] = Utils::HEXCHARS[(_m >> 20) & 0xf];
-		buf[10] = Utils::HEXCHARS[(_m >> 16) & 0xf];
-		buf[11] = ':';
-		buf[12] = Utils::HEXCHARS[(_m >> 12) & 0xf];
-		buf[13] = Utils::HEXCHARS[(_m >> 8) & 0xf];
-		buf[14] = ':';
-		buf[15] = Utils::HEXCHARS[(_m >> 4) & 0xf];
-		buf[16] = Utils::HEXCHARS[_m & 0xf];
-		buf[17] = (char)0;
-		return buf;
-	}
-
-	inline MAC& operator=(const MAC& m)
+	inline MAC &operator=(const MAC &m)
+		throw()
 	{
 		_m = m._m;
 		return *this;
 	}
-	inline MAC& operator=(const uint64_t m)
+	inline MAC &operator=(const uint64_t m)
+		throw()
 	{
 		_m = m;
 		return *this;
 	}
 
-	inline bool operator==(const MAC& m) const
-	{
-		return (_m == m._m);
-	}
-	inline bool operator!=(const MAC& m) const
-	{
-		return (_m != m._m);
-	}
-	inline bool operator<(const MAC& m) const
-	{
-		return (_m < m._m);
-	}
-	inline bool operator<=(const MAC& m) const
-	{
-		return (_m <= m._m);
-	}
-	inline bool operator>(const MAC& m) const
-	{
-		return (_m > m._m);
-	}
-	inline bool operator>=(const MAC& m) const
-	{
-		return (_m >= m._m);
-	}
+	inline bool operator==(const MAC &m) const throw() { return (_m == m._m); }
+	inline bool operator!=(const MAC &m) const throw() { return (_m != m._m); }
+	inline bool operator<(const MAC &m) const throw() { return (_m < m._m); }
+	inline bool operator<=(const MAC &m) const throw() { return (_m <= m._m); }
+	inline bool operator>(const MAC &m) const throw() { return (_m > m._m); }
+	inline bool operator>=(const MAC &m) const throw() { return (_m >= m._m); }
 
-  private:
+private:
 	uint64_t _m;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Membership.cpp b/node/Membership.cpp
deleted file mode 100644
index f09755ffe..000000000
--- a/node/Membership.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "Membership.hpp"
-
-#include "Node.hpp"
-#include "Packet.hpp"
-#include "Peer.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
-#include "Trace.hpp"
-
-#include <algorithm>
-
-namespace ZeroTier {
-
-Membership::Membership() : _lastUpdatedMulticast(0), _comRevocationThreshold(0), _lastPushedCredentials(0), _revocations(4), _remoteTags(4), _remoteCaps(4), _remoteCoos(4)
-{
-}
-
-void Membership::pushCredentials(const RuntimeEnvironment* RR, void* tPtr, const int64_t now, const Address& peerAddress, const NetworkConfig& nconf)
-{
-	const Capability* sendCaps[ZT_MAX_NETWORK_CAPABILITIES];
-	unsigned int sendCapCount = 0;
-	for (unsigned int c = 0; c < nconf.capabilityCount; ++c) {
-		sendCaps[sendCapCount++] = &(nconf.capabilities[c]);
-	}
-
-	const Tag* sendTags[ZT_MAX_NETWORK_TAGS];
-	unsigned int sendTagCount = 0;
-	for (unsigned int t = 0; t < nconf.tagCount; ++t) {
-		sendTags[sendTagCount++] = &(nconf.tags[t]);
-	}
-
-	const CertificateOfOwnership* sendCoos[ZT_MAX_CERTIFICATES_OF_OWNERSHIP];
-	unsigned int sendCooCount = 0;
-	for (unsigned int c = 0; c < nconf.certificateOfOwnershipCount; ++c) {
-		sendCoos[sendCooCount++] = &(nconf.certificatesOfOwnership[c]);
-	}
-
-	unsigned int capPtr = 0;
-	unsigned int tagPtr = 0;
-	unsigned int cooPtr = 0;
-	bool sendCom = (bool)(nconf.com);
-	while ((capPtr < sendCapCount) || (tagPtr < sendTagCount) || (cooPtr < sendCooCount) || (sendCom)) {
-		Packet outp(peerAddress, RR->identity.address(), Packet::VERB_NETWORK_CREDENTIALS);
-
-		if (sendCom) {
-			sendCom = false;
-			nconf.com.serialize(outp);
-		}
-		outp.append((uint8_t)0x00);
-
-		const unsigned int capCountAt = outp.size();
-		outp.addSize(2);
-		unsigned int thisPacketCapCount = 0;
-		while ((capPtr < sendCapCount) && ((outp.size() + sizeof(Capability) + 16) < ZT_PROTO_MAX_PACKET_LENGTH)) {
-			sendCaps[capPtr++]->serialize(outp);
-			++thisPacketCapCount;
-		}
-		outp.setAt(capCountAt, (uint16_t)thisPacketCapCount);
-
-		const unsigned int tagCountAt = outp.size();
-		outp.addSize(2);
-		unsigned int thisPacketTagCount = 0;
-		while ((tagPtr < sendTagCount) && ((outp.size() + sizeof(Tag) + 16) < ZT_PROTO_MAX_PACKET_LENGTH)) {
-			sendTags[tagPtr++]->serialize(outp);
-			++thisPacketTagCount;
-		}
-		outp.setAt(tagCountAt, (uint16_t)thisPacketTagCount);
-
-		// No revocations, these propagate differently
-		outp.append((uint16_t)0);
-
-		const unsigned int cooCountAt = outp.size();
-		outp.addSize(2);
-		unsigned int thisPacketCooCount = 0;
-		while ((cooPtr < sendCooCount) && ((outp.size() + sizeof(CertificateOfOwnership) + 16) < ZT_PROTO_MAX_PACKET_LENGTH)) {
-			sendCoos[cooPtr++]->serialize(outp);
-			++thisPacketCooCount;
-		}
-		outp.setAt(cooCountAt, (uint16_t)thisPacketCooCount);
-
-		outp.compress();
-		RR->sw->send(tPtr, outp, true);
-		Metrics::pkt_network_credentials_out++;
-	}
-
-	_lastPushedCredentials = now;
-}
-
-Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const CertificateOfMembership& com)
-{
-	const int64_t newts = com.timestamp();
-	if (newts <= _comRevocationThreshold) {
-		RR->t->credentialRejected(tPtr, com, "revoked");
-		return ADD_REJECTED;
-	}
-
-	const int64_t oldts = _com.timestamp();
-	if (newts < oldts) {
-		RR->t->credentialRejected(tPtr, com, "old");
-		return ADD_REJECTED;
-	}
-	if (_com == com) {
-		return ADD_ACCEPTED_REDUNDANT;
-	}
-
-	switch (com.verify(RR, tPtr)) {
-		default:
-			RR->t->credentialRejected(tPtr, com, "invalid");
-			return ADD_REJECTED;
-		case 0:
-			// printf("%.16llx %.10llx replacing COM %lld with %lld\n", com.networkId(), com.issuedTo().toInt(), _com.timestamp(), com.timestamp()); fflush(stdout);
-			_com = com;
-			return ADD_ACCEPTED_NEW;
-		case 1:
-			return ADD_DEFERRED_FOR_WHOIS;
-	}
-}
-
-// Template out addCredential() for many cred types to avoid copypasta
-template <typename C>
-static Membership::AddCredentialResult _addCredImpl(Hashtable<uint32_t, C>& remoteCreds, const Hashtable<uint64_t, int64_t>& revocations, const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const C& cred)
-{
-	C* rc = remoteCreds.get(cred.id());
-	if (rc) {
-		if (rc->timestamp() > cred.timestamp()) {
-			RR->t->credentialRejected(tPtr, cred, "old");
-			return Membership::ADD_REJECTED;
-		}
-		if (*rc == cred) {
-			return Membership::ADD_ACCEPTED_REDUNDANT;
-		}
-	}
-
-	const int64_t* const rt = revocations.get(Membership::credentialKey(C::credentialType(), cred.id()));
-	if ((rt) && (*rt >= cred.timestamp())) {
-		RR->t->credentialRejected(tPtr, cred, "revoked");
-		return Membership::ADD_REJECTED;
-	}
-
-	switch (cred.verify(RR, tPtr)) {
-		default:
-			RR->t->credentialRejected(tPtr, cred, "invalid");
-			return Membership::ADD_REJECTED;
-		case 0:
-			if (! rc) {
-				rc = &(remoteCreds[cred.id()]);
-			}
-			*rc = cred;
-			return Membership::ADD_ACCEPTED_NEW;
-		case 1:
-			return Membership::ADD_DEFERRED_FOR_WHOIS;
-	}
-}
-
-Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const Tag& tag)
-{
-	return _addCredImpl<Tag>(_remoteTags, _revocations, RR, tPtr, nconf, tag);
-}
-Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const Capability& cap)
-{
-	return _addCredImpl<Capability>(_remoteCaps, _revocations, RR, tPtr, nconf, cap);
-}
-Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const CertificateOfOwnership& coo)
-{
-	return _addCredImpl<CertificateOfOwnership>(_remoteCoos, _revocations, RR, tPtr, nconf, coo);
-}
-
-Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const Revocation& rev)
-{
-	int64_t* rt;
-	switch (rev.verify(RR, tPtr)) {
-		default:
-			RR->t->credentialRejected(tPtr, rev, "invalid");
-			return ADD_REJECTED;
-		case 0: {
-			const Credential::Type ct = rev.type();
-			switch (ct) {
-				case Credential::CREDENTIAL_TYPE_COM:
-					if (rev.threshold() > _comRevocationThreshold) {
-						_comRevocationThreshold = rev.threshold();
-						return ADD_ACCEPTED_NEW;
-					}
-					return ADD_ACCEPTED_REDUNDANT;
-				case Credential::CREDENTIAL_TYPE_CAPABILITY:
-				case Credential::CREDENTIAL_TYPE_TAG:
-				case Credential::CREDENTIAL_TYPE_COO:
-					rt = &(_revocations[credentialKey(ct, rev.credentialId())]);
-					if (*rt < rev.threshold()) {
-						*rt = rev.threshold();
-						_comRevocationThreshold = rev.threshold();
-						return ADD_ACCEPTED_NEW;
-					}
-					return ADD_ACCEPTED_REDUNDANT;
-				default:
-					RR->t->credentialRejected(tPtr, rev, "invalid");
-					return ADD_REJECTED;
-			}
-		}
-		case 1:
-			return ADD_DEFERRED_FOR_WHOIS;
-	}
-}
-
-void Membership::clean(const int64_t now, const NetworkConfig& nconf)
-{
-	_cleanCredImpl<Tag>(nconf, _remoteTags);
-	_cleanCredImpl<Capability>(nconf, _remoteCaps);
-	_cleanCredImpl<CertificateOfOwnership>(nconf, _remoteCoos);
-}
-
-}	// namespace ZeroTier
diff --git a/node/Membership.hpp b/node/Membership.hpp
deleted file mode 100644
index 962fb55db..000000000
--- a/node/Membership.hpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_MEMBERSHIP_HPP
-#define ZT_MEMBERSHIP_HPP
-
-#include "../include/ZeroTierOne.h"
-#include "Capability.hpp"
-#include "CertificateOfMembership.hpp"
-#include "Constants.hpp"
-#include "Credential.hpp"
-#include "Hashtable.hpp"
-#include "NetworkConfig.hpp"
-#include "Revocation.hpp"
-#include "Tag.hpp"
-
-#include <stdint.h>
-
-#define ZT_MEMBERSHIP_CRED_ID_UNUSED 0xffffffffffffffffULL
-
-namespace ZeroTier {
-
-class RuntimeEnvironment;
-class Network;
-
-/**
- * A container for certificates of membership and other network credentials
- *
- * This is essentially a relational join between Peer and Network.
- *
- * This class is not thread safe. It must be locked externally.
- */
-class Membership {
-  public:
-	enum AddCredentialResult { ADD_REJECTED, ADD_ACCEPTED_NEW, ADD_ACCEPTED_REDUNDANT, ADD_DEFERRED_FOR_WHOIS };
-
-	Membership();
-
-	/**
-	 * Send COM and other credentials to this peer
-	 *
-	 * @param RR Runtime environment
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param now Current time
-	 * @param peerAddress Address of member peer (the one that this Membership describes)
-	 * @param nconf My network config
-	 */
-	void pushCredentials(const RuntimeEnvironment* RR, void* tPtr, const int64_t now, const Address& peerAddress, const NetworkConfig& nconf);
-
-	inline int64_t lastPushedCredentials()
-	{
-		return _lastPushedCredentials;
-	}
-	inline int64_t comTimestamp()
-	{
-		return _com.timestamp();
-	}
-	inline int64_t comRevocationThreshold()
-	{
-		return _comRevocationThreshold;
-	}
-
-	/**
-	 * Check whether we should push MULTICAST_LIKEs to this peer, and update last sent time if true
-	 *
-	 * @param now Current time
-	 * @return True if we should update multicasts
-	 */
-	inline bool multicastLikeGate(const int64_t now)
-	{
-		if ((now - _lastUpdatedMulticast) >= ZT_MULTICAST_ANNOUNCE_PERIOD) {
-			_lastUpdatedMulticast = now;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Check whether the peer represented by this Membership should be allowed on this network at all
-	 *
-	 * @param nconf Our network config
-	 * @param otherNodeIdentity Identity of remote node
-	 * @return True if this peer is allowed on this network at all
-	 */
-	inline bool isAllowedOnNetwork(const NetworkConfig& thisNodeNetworkConfig, const Identity& otherNodeIdentity) const
-	{
-		return thisNodeNetworkConfig.isPublic() || (((_com.timestamp() > _comRevocationThreshold) && (thisNodeNetworkConfig.com.agreesWith(_com, otherNodeIdentity))));
-	}
-
-	inline bool recentlyAssociated(const int64_t now) const
-	{
-		return ((_com) && ((now - _com.timestamp()) < ZT_PEER_ACTIVITY_TIMEOUT));
-	}
-
-	/**
-	 * Check whether the peer represented by this Membership owns a given resource
-	 *
-	 * @tparam Type of resource: InetAddress or MAC
-	 * @param nconf Our network config
-	 * @param r Resource to check
-	 * @return True if this peer has a certificate of ownership for the given resource
-	 */
-	template <typename T> inline bool hasCertificateOfOwnershipFor(const NetworkConfig& nconf, const T& r) const
-	{
-		uint32_t* k = (uint32_t*)0;
-		CertificateOfOwnership* v = (CertificateOfOwnership*)0;
-		Hashtable<uint32_t, CertificateOfOwnership>::Iterator i(*(const_cast<Hashtable<uint32_t, CertificateOfOwnership>*>(&_remoteCoos)));
-		while (i.next(k, v)) {
-			if (_isCredentialTimestampValid(nconf, *v) && (v->owns(r))) {
-				return true;
-			}
-		}
-		return _isV6NDPEmulated(nconf, r);
-	}
-
-	/**
-	 * Get a remote member's tag (if we have it)
-	 *
-	 * @param nconf Network configuration
-	 * @param id Tag ID
-	 * @return Pointer to tag or NULL if not found
-	 */
-	inline const Tag* getTag(const NetworkConfig& nconf, const uint32_t id) const
-	{
-		const Tag* const t = _remoteTags.get(id);
-		return (((t) && (_isCredentialTimestampValid(nconf, *t))) ? t : (Tag*)0);
-	}
-
-	/**
-	 * Validate and add a credential if signature is okay and it's otherwise good
-	 */
-	AddCredentialResult addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const CertificateOfMembership& com);
-
-	/**
-	 * Validate and add a credential if signature is okay and it's otherwise good
-	 */
-	AddCredentialResult addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const Tag& tag);
-
-	/**
-	 * Validate and add a credential if signature is okay and it's otherwise good
-	 */
-	AddCredentialResult addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const Capability& cap);
-
-	/**
-	 * Validate and add a credential if signature is okay and it's otherwise good
-	 */
-	AddCredentialResult addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const CertificateOfOwnership& coo);
-
-	/**
-	 * Validate and add a credential if signature is okay and it's otherwise good
-	 */
-	AddCredentialResult addCredential(const RuntimeEnvironment* RR, void* tPtr, const NetworkConfig& nconf, const Revocation& rev);
-
-	/**
-	 * Clean internal databases of stale entries
-	 *
-	 * @param now Current time
-	 * @param nconf Current network configuration
-	 */
-	void clean(const int64_t now, const NetworkConfig& nconf);
-
-	/**
-	 * Generates a key for the internal use in indexing credentials by type and credential ID
-	 */
-	static uint64_t credentialKey(const Credential::Type& t, const uint32_t i)
-	{
-		return (((uint64_t)t << 32) | (uint64_t)i);
-	}
-
-  private:
-	inline bool _isV6NDPEmulated(const NetworkConfig& nconf, const MAC& m) const
-	{
-		return false;
-	}
-	inline bool _isV6NDPEmulated(const NetworkConfig& nconf, const InetAddress& ip) const
-	{
-		if ((ip.isV6()) && (nconf.ndpEmulation())) {
-			const InetAddress sixpl(InetAddress::makeIpv66plane(nconf.networkId, nconf.issuedTo.toInt()));
-			for (unsigned int i = 0; i < nconf.staticIpCount; ++i) {
-				if (nconf.staticIps[i].ipsEqual(sixpl)) {
-					bool prefixMatches = true;
-					for (unsigned int j = 0; j < 5; ++j) {	 // check for match on /40
-						if ((((const struct sockaddr_in6*)&ip)->sin6_addr.s6_addr)[j] != (((const struct sockaddr_in6*)&sixpl)->sin6_addr.s6_addr)[j]) {
-							prefixMatches = false;
-							break;
-						}
-					}
-					if (prefixMatches) {
-						return true;
-					}
-					break;
-				}
-			}
-
-			const InetAddress rfc4193(InetAddress::makeIpv6rfc4193(nconf.networkId, nconf.issuedTo.toInt()));
-			for (unsigned int i = 0; i < nconf.staticIpCount; ++i) {
-				if (nconf.staticIps[i].ipsEqual(rfc4193)) {
-					bool prefixMatches = true;
-					for (unsigned int j = 0; j < 11; ++j) {	  // check for match on /88
-						if ((((const struct sockaddr_in6*)&ip)->sin6_addr.s6_addr)[j] != (((const struct sockaddr_in6*)&rfc4193)->sin6_addr.s6_addr)[j]) {
-							prefixMatches = false;
-							break;
-						}
-					}
-					if (prefixMatches) {
-						return true;
-					}
-					break;
-				}
-			}
-		}
-		return false;
-	}
-
-	template <typename C> inline bool _isCredentialTimestampValid(const NetworkConfig& nconf, const C& remoteCredential) const
-	{
-		const int64_t ts = remoteCredential.timestamp();
-		if (((ts >= nconf.timestamp) ? (ts - nconf.timestamp) : (nconf.timestamp - ts)) <= nconf.credentialTimeMaxDelta) {
-			const int64_t* threshold = _revocations.get(credentialKey(C::credentialType(), remoteCredential.id()));
-			return ((! threshold) || (ts > *threshold));
-		}
-		return false;
-	}
-
-	template <typename C> inline void _cleanCredImpl(const NetworkConfig& nconf, Hashtable<uint32_t, C>& remoteCreds)
-	{
-		uint32_t* k = (uint32_t*)0;
-		C* v = (C*)0;
-		typename Hashtable<uint32_t, C>::Iterator i(remoteCreds);
-		while (i.next(k, v)) {
-			if (! _isCredentialTimestampValid(nconf, *v)) {
-				remoteCreds.erase(*k);
-			}
-		}
-	}
-
-	// Last time we pushed MULTICAST_LIKE(s)
-	int64_t _lastUpdatedMulticast;
-
-	// Revocation threshold for COM or 0 if none
-	int64_t _comRevocationThreshold;
-
-	// Time we last pushed credentials
-	int64_t _lastPushedCredentials;
-
-	// Remote member's latest network COM
-	CertificateOfMembership _com;
-
-	// Revocations by credentialKey()
-	Hashtable<uint64_t, int64_t> _revocations;
-
-	// Remote credentials that we have received from this member (and that are valid)
-	Hashtable<uint32_t, Tag> _remoteTags;
-	Hashtable<uint32_t, Capability> _remoteCaps;
-	Hashtable<uint32_t, CertificateOfOwnership> _remoteCoos;
-
-  public:
-	class CapabilityIterator {
-	  public:
-		CapabilityIterator(Membership& m, const NetworkConfig& nconf) : _hti(m._remoteCaps), _k((uint32_t*)0), _c((Capability*)0), _m(m), _nconf(nconf)
-		{
-		}
-
-		inline Capability* next()
-		{
-			while (_hti.next(_k, _c)) {
-				if (_m._isCredentialTimestampValid(_nconf, *_c)) {
-					return _c;
-				}
-			}
-			return (Capability*)0;
-		}
-
-	  private:
-		Hashtable<uint32_t, Capability>::Iterator _hti;
-		uint32_t* _k;
-		Capability* _c;
-		Membership& _m;
-		const NetworkConfig& _nconf;
-	};
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/Metrics.cpp b/node/Metrics.cpp
deleted file mode 100644
index 11232cb0e..000000000
--- a/node/Metrics.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c)2013-2023 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-
-// clang-format off
-#include <prometheus/simpleapi.h>
-#include <prometheus/histogram.h>
-// clang-format on
-
-namespace prometheus {
-namespace simpleapi {
-std::shared_ptr<Registry> registry_ptr = std::make_shared<Registry>();
-Registry& registry = *registry_ptr;
-SaveToFile saver;
-}	// namespace simpleapi
-}	// namespace prometheus
-
-namespace ZeroTier {
-namespace Metrics {
-// Packet Type Counts
-prometheus::simpleapi::counter_family_t packets { "zt_packet", "ZeroTier packet type counts" };
-
-// Incoming packets
-prometheus::simpleapi::counter_metric_t pkt_nop_in { packets.Add({ { "packet_type", "nop" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_in { packets.Add({ { "packet_type", "error" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_ack_in { packets.Add({ { "packet_type", "ack" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_qos_in { packets.Add({ { "packet_type", "qos" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_hello_in { packets.Add({ { "packet_type", "hello" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_ok_in { packets.Add({ { "packet_type", "ok" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_whois_in { packets.Add({ { "packet_type", "whois" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_rendezvous_in { packets.Add({ { "packet_type", "rendezvous" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_frame_in { packets.Add({ { "packet_type", "frame" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_ext_frame_in { packets.Add({ { "packet_type", "ext_frame" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_echo_in { packets.Add({ { "packet_type", "echo" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_multicast_like_in { packets.Add({ { "packet_type", "multicast_like" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_network_credentials_in { packets.Add({ { "packet_type", "network_credentials" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_network_config_request_in { packets.Add({ { "packet_type", "network_config_request" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_network_config_in { packets.Add({ { "packet_type", "network_config" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_multicast_gather_in { packets.Add({ { "packet_type", "multicast_gather" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_multicast_frame_in { packets.Add({ { "packet_type", "multicast_frame" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_push_direct_paths_in { packets.Add({ { "packet_type", "push_direct_paths" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_user_message_in { packets.Add({ { "packet_type", "user_message" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_remote_trace_in { packets.Add({ { "packet_type", "remote_trace" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_path_negotiation_request_in { packets.Add({ { "packet_type", "path_negotiation_request" }, { "direction", "rx" } }) };
-
-// Outgoing packets
-prometheus::simpleapi::counter_metric_t pkt_nop_out { packets.Add({ { "packet_type", "nop" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_out { packets.Add({ { "packet_type", "error" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_ack_out { packets.Add({ { "packet_type", "ack" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_qos_out { packets.Add({ { "packet_type", "qos" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_hello_out { packets.Add({ { "packet_type", "hello" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_ok_out { packets.Add({ { "packet_type", "ok" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_whois_out { packets.Add({ { "packet_type", "whois" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_rendezvous_out { packets.Add({ { "packet_type", "rendezvous" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_frame_out { packets.Add({ { "packet_type", "frame" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_ext_frame_out { packets.Add({ { "packet_type", "ext_frame" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_echo_out { packets.Add({ { "packet_type", "echo" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_multicast_like_out { packets.Add({ { "packet_type", "multicast_like" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_network_credentials_out { packets.Add({ { "packet_type", "network_credentials" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_network_config_request_out { packets.Add({ { "packet_type", "network_config_request" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_network_config_out { packets.Add({ { "packet_type", "network_config" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_multicast_gather_out { packets.Add({ { "packet_type", "multicast_gather" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_multicast_frame_out { packets.Add({ { "packet_type", "multicast_frame" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_push_direct_paths_out { packets.Add({ { "packet_type", "push_direct_paths" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_user_message_out { packets.Add({ { "packet_type", "user_message" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_remote_trace_out { packets.Add({ { "packet_type", "remote_trace" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_path_negotiation_request_out { packets.Add({ { "packet_type", "path_negotiation_request" }, { "direction", "tx" } }) };
-
-// Packet Error Counts
-prometheus::simpleapi::counter_family_t packet_errors { "zt_packet_error", "ZeroTier packet errors" };
-
-// Incoming Error Counts
-prometheus::simpleapi::counter_metric_t pkt_error_obj_not_found_in { packet_errors.Add({ { "error_type", "obj_not_found" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_unsupported_op_in { packet_errors.Add({ { "error_type", "unsupported_operation" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_identity_collision_in { packet_errors.Add({ { "error_type", "identity_collision" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_need_membership_cert_in { packet_errors.Add({ { "error_type", "need_membership_certificate" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_network_access_denied_in { packet_errors.Add({ { "error_type", "network_access_denied" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_unwanted_multicast_in { packet_errors.Add({ { "error_type", "unwanted_multicast" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_authentication_required_in { packet_errors.Add({ { "error_type", "authentication_required" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_internal_server_error_in { packet_errors.Add({ { "error_type", "internal_server_error" }, { "direction", "rx" } }) };
-
-// Outgoing Error Counts
-prometheus::simpleapi::counter_metric_t pkt_error_obj_not_found_out { packet_errors.Add({ { "error_type", "obj_not_found" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_unsupported_op_out { packet_errors.Add({ { "error_type", "unsupported_operation" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_identity_collision_out { packet_errors.Add({ { "error_type", "identity_collision" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_need_membership_cert_out { packet_errors.Add({ { "error_type", "need_membership_certificate" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_network_access_denied_out { packet_errors.Add({ { "error_type", "network_access_denied" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_unwanted_multicast_out { packet_errors.Add({ { "error_type", "unwanted_multicast" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_authentication_required_out { packet_errors.Add({ { "error_type", "authentication_required" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t pkt_error_internal_server_error_out { packet_errors.Add({ { "error_type", "internal_server_error" }, { "direction", "tx" } }) };
-
-// Data Sent/Received Metrics
-prometheus::simpleapi::counter_family_t data { "zt_data", "number of bytes ZeroTier has transmitted or received" };
-prometheus::simpleapi::counter_metric_t udp_recv { data.Add({ { "protocol", "udp" }, { "direction", "rx" } }) };
-prometheus::simpleapi::counter_metric_t udp_send { data.Add({ { "protocol", "udp" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t tcp_send { data.Add({ { "protocol", "tcp" }, { "direction", "tx" } }) };
-prometheus::simpleapi::counter_metric_t tcp_recv { data.Add({ { "protocol", "tcp" }, { "direction", "rx" } }) };
-
-// Network Metrics
-prometheus::simpleapi::gauge_metric_t network_num_joined { "zt_num_networks", "number of networks this instance is joined to" };
-prometheus::simpleapi::gauge_family_t network_num_multicast_groups { "zt_network_multicast_groups_subscribed", "number of multicast groups networks are subscribed to" };
-prometheus::simpleapi::counter_family_t network_packets { "zt_network_packets", "number of incoming/outgoing packets per network" };
-
-#ifndef ZT_NO_PEER_METRICS
-// PeerMetrics
-prometheus::CustomFamily<prometheus::Histogram<uint64_t> >& peer_latency = prometheus::Builder<prometheus::Histogram<uint64_t> >().Name("zt_peer_latency").Help("peer latency (ms)").Register(prometheus::simpleapi::registry);
-
-prometheus::simpleapi::gauge_family_t peer_path_count { "zt_peer_path_count", "number of paths to peer" };
-prometheus::simpleapi::counter_family_t peer_packets { "zt_peer_packets", "number of packets to/from a peer" };
-prometheus::simpleapi::counter_family_t peer_packet_errors { "zt_peer_packet_errors", "number of incoming packet errors from a peer" };
-#endif
-
-// General Controller Metrics
-prometheus::simpleapi::gauge_metric_t network_count { "controller_network_count", "number of networks the controller is serving" };
-prometheus::simpleapi::gauge_metric_t member_count { "controller_member_count", "number of network members the controller is serving" };
-prometheus::simpleapi::counter_metric_t network_changes { "controller_network_change_count", "number of times a network configuration is changed" };
-prometheus::simpleapi::counter_metric_t member_changes { "controller_member_change_count", "number of times a network member configuration is changed" };
-prometheus::simpleapi::counter_metric_t member_auths { "controller_member_auth_count", "number of network member auths" };
-prometheus::simpleapi::counter_metric_t member_deauths { "controller_member_deauth_count", "number of network member deauths" };
-
-prometheus::simpleapi::gauge_metric_t network_config_request_queue_size { "controller_network_config_request_queue", "number of entries in the request queue for network configurations" };
-
-prometheus::simpleapi::counter_metric_t sso_expiration_checks { "controller_sso_expiration_checks", "number of sso expiration checks done" };
-
-prometheus::simpleapi::counter_metric_t sso_member_deauth { "controller_sso_timeouts", "number of sso timeouts" };
-
-prometheus::simpleapi::counter_metric_t network_config_request { "controller_network_config_request", "count of config requests handled" };
-prometheus::simpleapi::gauge_metric_t network_config_request_threads { "controller_network_config_request_threads", "number of active network config handling threads" };
-prometheus::simpleapi::counter_metric_t db_get_network { "controller_db_get_network", "counter" };
-prometheus::simpleapi::counter_metric_t db_get_network_and_member { "controller_db_get_network_and_member", "counter" };
-prometheus::simpleapi::counter_metric_t db_get_network_and_member_and_summary { "controller_db_get_networK_and_member_summary", "counter" };
-prometheus::simpleapi::counter_metric_t db_get_member_list { "controller_db_get_member_list", "counter" };
-prometheus::simpleapi::counter_metric_t db_get_network_list { "controller_db_get_network_list", "counter" };
-prometheus::simpleapi::counter_metric_t db_member_change { "controller_db_member_change", "counter" };
-prometheus::simpleapi::counter_metric_t db_network_change { "controller_db_network_change", "counter" };
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-// Central Controller Metrics
-prometheus::simpleapi::counter_metric_t pgsql_mem_notification { "controller_pgsql_member_notifications_received", "number of member change notifications received via pgsql NOTIFY" };
-prometheus::simpleapi::counter_metric_t pgsql_net_notification { "controller_pgsql_network_notifications_received", "number of network change notifications received via pgsql NOTIFY" };
-prometheus::simpleapi::counter_metric_t pgsql_node_checkin { "controller_pgsql_node_checkin_count", "number of node check-ins (pgsql)" };
-prometheus::simpleapi::counter_metric_t pgsql_commit_ticks { "controller_pgsql_commit_ticks", "number of commit ticks run (pgsql)" };
-prometheus::simpleapi::counter_metric_t db_get_sso_info { "controller_db_get_sso_info", "counter" };
-
-prometheus::simpleapi::counter_metric_t redis_mem_notification { "controller_redis_member_notifications_received", "number of member change notifications received via redis" };
-prometheus::simpleapi::counter_metric_t redis_net_notification { "controller_redis_network_notifications_received", "number of network change notifications received via redis" };
-prometheus::simpleapi::counter_metric_t redis_node_checkin { "controller_redis_node_checkin_count", "number of node check-ins (redis)" };
-
-// Central DB Pool Metrics
-prometheus::simpleapi::counter_metric_t conn_counter { "controller_pgsql_connections_created", "number of pgsql connections created" };
-prometheus::simpleapi::counter_metric_t max_pool_size { "controller_pgsql_max_conn_pool_size", "max connection pool size for postgres" };
-prometheus::simpleapi::counter_metric_t min_pool_size { "controller_pgsql_min_conn_pool_size", "minimum connection pool size for postgres" };
-prometheus::simpleapi::gauge_metric_t pool_avail { "controller_pgsql_available_conns", "number of available postgres connections" };
-prometheus::simpleapi::gauge_metric_t pool_in_use { "controller_pgsql_in_use_conns", "number of postgres database connections in use" };
-prometheus::simpleapi::counter_metric_t pool_errors { "controller_pgsql_connection_errors", "number of connection errors the connection pool has seen" };
-#endif
-}	// namespace Metrics
-}	// namespace ZeroTier
diff --git a/node/Metrics.hpp b/node/Metrics.hpp
deleted file mode 100644
index 8c2c4290d..000000000
--- a/node/Metrics.hpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c)2013-2023 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-#ifndef METRICS_H_
-#define METRICS_H_
-
-// clang-format off
-#include <prometheus/simpleapi.h>
-#include <prometheus/histogram.h>
-// clang-format on
-
-namespace prometheus {
-namespace simpleapi {
-extern std::shared_ptr<Registry> registry_ptr;
-}
-}	// namespace prometheus
-
-namespace ZeroTier {
-namespace Metrics {
-// Packet Type Counts
-extern prometheus::simpleapi::counter_family_t packets;
-
-// incoming packets
-extern prometheus::simpleapi::counter_metric_t pkt_nop_in;
-extern prometheus::simpleapi::counter_metric_t pkt_error_in;
-extern prometheus::simpleapi::counter_metric_t pkt_ack_in;
-extern prometheus::simpleapi::counter_metric_t pkt_qos_in;
-extern prometheus::simpleapi::counter_metric_t pkt_hello_in;
-extern prometheus::simpleapi::counter_metric_t pkt_ok_in;
-extern prometheus::simpleapi::counter_metric_t pkt_whois_in;
-extern prometheus::simpleapi::counter_metric_t pkt_rendezvous_in;
-extern prometheus::simpleapi::counter_metric_t pkt_frame_in;
-extern prometheus::simpleapi::counter_metric_t pkt_ext_frame_in;
-extern prometheus::simpleapi::counter_metric_t pkt_echo_in;
-extern prometheus::simpleapi::counter_metric_t pkt_multicast_like_in;
-extern prometheus::simpleapi::counter_metric_t pkt_network_credentials_in;
-extern prometheus::simpleapi::counter_metric_t pkt_network_config_request_in;
-extern prometheus::simpleapi::counter_metric_t pkt_network_config_in;
-extern prometheus::simpleapi::counter_metric_t pkt_multicast_gather_in;
-extern prometheus::simpleapi::counter_metric_t pkt_multicast_frame_in;
-extern prometheus::simpleapi::counter_metric_t pkt_push_direct_paths_in;
-extern prometheus::simpleapi::counter_metric_t pkt_user_message_in;
-extern prometheus::simpleapi::counter_metric_t pkt_remote_trace_in;
-extern prometheus::simpleapi::counter_metric_t pkt_path_negotiation_request_in;
-
-// outgoing packets
-extern prometheus::simpleapi::counter_metric_t pkt_nop_out;
-extern prometheus::simpleapi::counter_metric_t pkt_error_out;
-extern prometheus::simpleapi::counter_metric_t pkt_ack_out;
-extern prometheus::simpleapi::counter_metric_t pkt_qos_out;
-extern prometheus::simpleapi::counter_metric_t pkt_hello_out;
-extern prometheus::simpleapi::counter_metric_t pkt_ok_out;
-extern prometheus::simpleapi::counter_metric_t pkt_whois_out;
-extern prometheus::simpleapi::counter_metric_t pkt_rendezvous_out;
-extern prometheus::simpleapi::counter_metric_t pkt_frame_out;
-extern prometheus::simpleapi::counter_metric_t pkt_ext_frame_out;
-extern prometheus::simpleapi::counter_metric_t pkt_echo_out;
-extern prometheus::simpleapi::counter_metric_t pkt_multicast_like_out;
-extern prometheus::simpleapi::counter_metric_t pkt_network_credentials_out;
-extern prometheus::simpleapi::counter_metric_t pkt_network_config_request_out;
-extern prometheus::simpleapi::counter_metric_t pkt_network_config_out;
-extern prometheus::simpleapi::counter_metric_t pkt_multicast_gather_out;
-extern prometheus::simpleapi::counter_metric_t pkt_multicast_frame_out;
-extern prometheus::simpleapi::counter_metric_t pkt_push_direct_paths_out;
-extern prometheus::simpleapi::counter_metric_t pkt_user_message_out;
-extern prometheus::simpleapi::counter_metric_t pkt_remote_trace_out;
-extern prometheus::simpleapi::counter_metric_t pkt_path_negotiation_request_out;
-
-// Packet Error Counts
-extern prometheus::simpleapi::counter_family_t packet_errors;
-
-// incoming errors
-extern prometheus::simpleapi::counter_metric_t pkt_error_obj_not_found_in;
-extern prometheus::simpleapi::counter_metric_t pkt_error_unsupported_op_in;
-extern prometheus::simpleapi::counter_metric_t pkt_error_identity_collision_in;
-extern prometheus::simpleapi::counter_metric_t pkt_error_need_membership_cert_in;
-extern prometheus::simpleapi::counter_metric_t pkt_error_network_access_denied_in;
-extern prometheus::simpleapi::counter_metric_t pkt_error_unwanted_multicast_in;
-extern prometheus::simpleapi::counter_metric_t pkt_error_authentication_required_in;
-extern prometheus::simpleapi::counter_metric_t pkt_error_internal_server_error_in;
-
-// outgoing errors
-extern prometheus::simpleapi::counter_metric_t pkt_error_obj_not_found_out;
-extern prometheus::simpleapi::counter_metric_t pkt_error_unsupported_op_out;
-extern prometheus::simpleapi::counter_metric_t pkt_error_identity_collision_out;
-extern prometheus::simpleapi::counter_metric_t pkt_error_need_membership_cert_out;
-extern prometheus::simpleapi::counter_metric_t pkt_error_network_access_denied_out;
-extern prometheus::simpleapi::counter_metric_t pkt_error_unwanted_multicast_out;
-extern prometheus::simpleapi::counter_metric_t pkt_error_authentication_required_out;
-extern prometheus::simpleapi::counter_metric_t pkt_error_internal_server_error_out;
-
-// Data Sent/Received Metrics
-extern prometheus::simpleapi::counter_family_t data;
-extern prometheus::simpleapi::counter_metric_t udp_send;
-extern prometheus::simpleapi::counter_metric_t udp_recv;
-extern prometheus::simpleapi::counter_metric_t tcp_send;
-extern prometheus::simpleapi::counter_metric_t tcp_recv;
-
-// Network Metrics
-extern prometheus::simpleapi::gauge_metric_t network_num_joined;
-extern prometheus::simpleapi::gauge_family_t network_num_multicast_groups;
-extern prometheus::simpleapi::counter_family_t network_packets;
-
-#ifndef ZT_NO_PEER_METRICS
-// Peer Metrics
-extern prometheus::CustomFamily<prometheus::Histogram<uint64_t> >& peer_latency;
-extern prometheus::simpleapi::gauge_family_t peer_path_count;
-extern prometheus::simpleapi::counter_family_t peer_packets;
-extern prometheus::simpleapi::counter_family_t peer_packet_errors;
-#endif
-
-// General Controller Metrics
-extern prometheus::simpleapi::gauge_metric_t network_count;
-extern prometheus::simpleapi::gauge_metric_t member_count;
-extern prometheus::simpleapi::counter_metric_t network_changes;
-extern prometheus::simpleapi::counter_metric_t member_changes;
-extern prometheus::simpleapi::counter_metric_t member_auths;
-extern prometheus::simpleapi::counter_metric_t member_deauths;
-
-extern prometheus::simpleapi::gauge_metric_t network_config_request_queue_size;
-extern prometheus::simpleapi::counter_metric_t sso_expiration_checks;
-extern prometheus::simpleapi::counter_metric_t sso_member_deauth;
-extern prometheus::simpleapi::counter_metric_t network_config_request;
-extern prometheus::simpleapi::gauge_metric_t network_config_request_threads;
-
-extern prometheus::simpleapi::counter_metric_t db_get_network;
-extern prometheus::simpleapi::counter_metric_t db_get_network_and_member;
-extern prometheus::simpleapi::counter_metric_t db_get_network_and_member_and_summary;
-extern prometheus::simpleapi::counter_metric_t db_get_member_list;
-extern prometheus::simpleapi::counter_metric_t db_get_network_list;
-extern prometheus::simpleapi::counter_metric_t db_member_change;
-extern prometheus::simpleapi::counter_metric_t db_network_change;
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-// Central Controller Metrics
-extern prometheus::simpleapi::counter_metric_t pgsql_mem_notification;
-extern prometheus::simpleapi::counter_metric_t pgsql_net_notification;
-extern prometheus::simpleapi::counter_metric_t pgsql_node_checkin;
-extern prometheus::simpleapi::counter_metric_t pgsql_commit_ticks;
-extern prometheus::simpleapi::counter_metric_t db_get_sso_info;
-
-extern prometheus::simpleapi::counter_metric_t redis_mem_notification;
-extern prometheus::simpleapi::counter_metric_t redis_net_notification;
-extern prometheus::simpleapi::counter_metric_t redis_node_checkin;
-
-// Central DB Pool Metrics
-extern prometheus::simpleapi::counter_metric_t conn_counter;
-extern prometheus::simpleapi::counter_metric_t max_pool_size;
-extern prometheus::simpleapi::counter_metric_t min_pool_size;
-extern prometheus::simpleapi::gauge_metric_t pool_avail;
-extern prometheus::simpleapi::gauge_metric_t pool_in_use;
-extern prometheus::simpleapi::counter_metric_t pool_errors;
-#endif
-}	// namespace Metrics
-}	// namespace ZeroTier
-
-#endif	 // METRICS_H_
diff --git a/node/MulticastGroup.hpp b/node/MulticastGroup.hpp
index 53905aa42..dbf38998d 100644
--- a/node/MulticastGroup.hpp
+++ b/node/MulticastGroup.hpp
@@ -1,24 +1,31 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_MULTICASTGROUP_HPP
 #define ZT_MULTICASTGROUP_HPP
 
-#include "InetAddress.hpp"
-#include "MAC.hpp"
-
 #include <stdint.h>
 
+#include <string>
+
+#include "MAC.hpp"
+#include "InetAddress.hpp"
+
 namespace ZeroTier {
 
 /**
@@ -36,99 +43,116 @@ namespace ZeroTier {
  *
  * MulticastGroup behaves as an immutable value object.
  */
-class MulticastGroup {
-  public:
-	MulticastGroup() : _mac(), _adi(0)
+class MulticastGroup
+{
+public:
+	MulticastGroup()
+		throw() :
+		_mac(),
+		_adi(0)
 	{
 	}
 
-	MulticastGroup(const MAC& m, uint32_t a) : _mac(m), _adi(a)
+	MulticastGroup(const MAC &m,uint32_t a)
+		throw() :
+		_mac(m),
+		_adi(a)
 	{
 	}
 
+	MulticastGroup(const char *s)
+	{
+		fromString(s);
+	}
+
+	MulticastGroup(const std::string &s)
+	{
+		fromString(s.c_str());
+	}
+
 	/**
 	 * Derive the multicast group used for address resolution (ARP/NDP) for an IP
 	 *
 	 * @param ip IP address (port field is ignored)
-	 * @return Multicast group for ARP/NDP
+	 * @return Multicat group for ARP/NDP
 	 */
-	static inline MulticastGroup deriveMulticastGroupForAddressResolution(const InetAddress& ip)
+	static inline MulticastGroup deriveMulticastGroupForAddressResolution(const InetAddress &ip)
+		throw()
 	{
 		if (ip.isV4()) {
 			// IPv4 wants broadcast MACs, so we shove the V4 address itself into
 			// the Multicast Group ADI field. Making V4 ARP work is basically why
 			// ADI was added, as well as handling other things that want mindless
 			// Ethernet broadcast to all.
-			return MulticastGroup(MAC(0xffffffffffffULL), Utils::ntoh(*((const uint32_t*)ip.rawIpData())));
-		}
-		else if (ip.isV6()) {
+			return MulticastGroup(MAC(0xffffffffffffULL),Utils::ntoh(*((const uint32_t *)ip.rawIpData())));
+		} else if (ip.isV6()) {
 			// IPv6 is better designed in this respect. We can compute the IPv6
 			// multicast address directly from the IP address, and it gives us
 			// 24 bits of uniqueness. Collisions aren't likely to be common enough
 			// to care about.
-			const unsigned char* a = (const unsigned char*)ip.rawIpData();
-			return MulticastGroup(MAC(0x33, 0x33, 0xff, a[13], a[14], a[15]), 0);
+			const unsigned char *a = (const unsigned char *)ip.rawIpData();
+			return MulticastGroup(MAC(0x33,0x33,0xff,a[13],a[14],a[15]),0);
 		}
 		return MulticastGroup();
 	}
 
+	/**
+	 * @return Human readable string representing this group (MAC/ADI in hex)
+	 */
+	inline std::string toString() const
+	{
+		char buf[64];
+		Utils::snprintf(buf,sizeof(buf),"%.2x%.2x%.2x%.2x%.2x%.2x/%.8lx",(unsigned int)_mac[0],(unsigned int)_mac[1],(unsigned int)_mac[2],(unsigned int)_mac[3],(unsigned int)_mac[4],(unsigned int)_mac[5],(unsigned long)_adi);
+		return std::string(buf);
+	}
+
+	/**
+	 * Parse a human-readable multicast group
+	 *
+	 * @param s Multicast group in hex MAC/ADI format
+	 */
+	inline void fromString(const char *s)
+	{
+		char hex[17];
+		unsigned int hexlen = 0;
+		while ((*s)&&(*s != '/')&&(hexlen < (sizeof(hex) - 1)))
+			hex[hexlen++] = *s;
+		hex[hexlen] = (char)0;
+		_mac.fromString(hex);
+		_adi = (*s == '/') ? (uint32_t)Utils::hexStrToULong(s + 1) : (uint32_t)0;
+	}
+
 	/**
 	 * @return Multicast address
 	 */
-	inline const MAC& mac() const
-	{
-		return _mac;
-	}
+	inline const MAC &mac() const throw() { return _mac; }
 
 	/**
 	 * @return Additional distinguishing information
 	 */
-	inline uint32_t adi() const
-	{
-		return _adi;
-	}
+	inline uint32_t adi() const throw() { return _adi; }
 
-	inline unsigned long hashCode() const
-	{
-		return (_mac.hashCode() ^ (unsigned long)_adi);
-	}
+	inline unsigned long hashCode() const throw() { return (_mac.hashCode() ^ (unsigned long)_adi); }
 
-	inline bool operator==(const MulticastGroup& g) const
+	inline bool operator==(const MulticastGroup &g) const throw() { return ((_mac == g._mac)&&(_adi == g._adi)); }
+	inline bool operator!=(const MulticastGroup &g) const throw() { return ((_mac != g._mac)||(_adi != g._adi)); }
+	inline bool operator<(const MulticastGroup &g) const throw()
 	{
-		return ((_mac == g._mac) && (_adi == g._adi));
-	}
-	inline bool operator!=(const MulticastGroup& g) const
-	{
-		return ((_mac != g._mac) || (_adi != g._adi));
-	}
-	inline bool operator<(const MulticastGroup& g) const
-	{
-		if (_mac < g._mac) {
+		if (_mac < g._mac)
 			return true;
-		}
-		else if (_mac == g._mac) {
+		else if (_mac == g._mac)
 			return (_adi < g._adi);
-		}
 		return false;
 	}
-	inline bool operator>(const MulticastGroup& g) const
-	{
-		return (g < *this);
-	}
-	inline bool operator<=(const MulticastGroup& g) const
-	{
-		return ! (g < *this);
-	}
-	inline bool operator>=(const MulticastGroup& g) const
-	{
-		return ! (*this < g);
-	}
+	inline bool operator>(const MulticastGroup &g) const throw() { return (g < *this); }
+	inline bool operator<=(const MulticastGroup &g) const throw() { return !(g < *this); }
+	inline bool operator>=(const MulticastGroup &g) const throw() { return !(*this < g); }
 
-  private:
+private:
 	MAC _mac;
 	uint32_t _adi;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp
index 0d5fd7ce4..250da2eb7 100644
--- a/node/Multicaster.cpp
+++ b/node/Multicaster.cpp
@@ -1,33 +1,41 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
-
-#include "Multicaster.hpp"
-
-#include "CertificateOfMembership.hpp"
-#include "Constants.hpp"
-#include "Network.hpp"
-#include "Node.hpp"
-#include "Packet.hpp"
-#include "Peer.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
 
 #include <algorithm>
 
+#include "Constants.hpp"
+#include "RuntimeEnvironment.hpp"
+#include "SharedPtr.hpp"
+#include "Multicaster.hpp"
+#include "Topology.hpp"
+#include "Switch.hpp"
+#include "Packet.hpp"
+#include "Peer.hpp"
+#include "C25519.hpp"
+#include "CertificateOfMembership.hpp"
+#include "Node.hpp"
+
 namespace ZeroTier {
 
-Multicaster::Multicaster(const RuntimeEnvironment* renv) : RR(renv), _groups(32)
+Multicaster::Multicaster(const RuntimeEnvironment *renv) :
+	RR(renv),
+	_groups(1024),
+	_groups_m()
 {
 }
 
@@ -35,24 +43,24 @@ Multicaster::~Multicaster()
 {
 }
 
-void Multicaster::addMultiple(void* tPtr, int64_t now, uint64_t nwid, const MulticastGroup& mg, const void* addresses, unsigned int count, unsigned int totalKnown)
+void Multicaster::addMultiple(uint64_t now,uint64_t nwid,const MulticastGroup &mg,const void *addresses,unsigned int count,unsigned int totalKnown)
 {
-	const unsigned char* p = (const unsigned char*)addresses;
-	const unsigned char* e = p + (5 * count);
+	const unsigned char *p = (const unsigned char *)addresses;
+	const unsigned char *e = p + (5 * count);
 	Mutex::Lock _l(_groups_m);
-	MulticastGroupStatus& gs = _groups[Multicaster::Key(nwid, mg)];
+	MulticastGroupStatus &gs = _groups[Multicaster::Key(nwid,mg)];
 	while (p != e) {
-		_add(tPtr, now, nwid, mg, gs, Address(p, 5));
+		_add(now,nwid,mg,gs,Address(p,5));
 		p += 5;
 	}
 }
 
-void Multicaster::remove(uint64_t nwid, const MulticastGroup& mg, const Address& member)
+void Multicaster::remove(uint64_t nwid,const MulticastGroup &mg,const Address &member)
 {
 	Mutex::Lock _l(_groups_m);
-	MulticastGroupStatus* s = _groups.get(Multicaster::Key(nwid, mg));
+	MulticastGroupStatus *s = _groups.get(Multicaster::Key(nwid,mg));
 	if (s) {
-		for (std::vector<MulticastGroupMember>::iterator m(s->members.begin()); m != s->members.end(); ++m) {
+		for(std::vector<MulticastGroupMember>::iterator m(s->members.begin());m!=s->members.end();++m) {
 			if (m->address == member) {
 				s->members.erase(m);
 				break;
@@ -61,27 +69,25 @@ void Multicaster::remove(uint64_t nwid, const MulticastGroup& mg, const Address&
 	}
 }
 
-unsigned int Multicaster::gather(const Address& queryingPeer, uint64_t nwid, const MulticastGroup& mg, Buffer<ZT_PROTO_MAX_PACKET_LENGTH>& appendTo, unsigned int limit) const
+unsigned int Multicaster::gather(const Address &queryingPeer,uint64_t nwid,const MulticastGroup &mg,Buffer<ZT_PROTO_MAX_PACKET_LENGTH> &appendTo,unsigned int limit) const
 {
-	unsigned char* p;
-	unsigned int added = 0, i, k, rptr, totalKnown = 0;
-	uint64_t a, picked[(ZT_PROTO_MAX_PACKET_LENGTH / 5) + 2];
+	unsigned char *p;
+	unsigned int added = 0,i,k,rptr,totalKnown = 0;
+	uint64_t a,picked[(ZT_PROTO_MAX_PACKET_LENGTH / 5) + 2];
 
-	if (! limit) {
+	if (!limit)
 		return 0;
-	}
-	else if (limit > 0xffff) {
+	else if (limit > 0xffff)
 		limit = 0xffff;
-	}
 
 	const unsigned int totalAt = appendTo.size();
-	appendTo.addSize(4);   // sizeof(uint32_t)
+	appendTo.addSize(4); // sizeof(uint32_t)
 	const unsigned int addedAt = appendTo.size();
-	appendTo.addSize(2);   // sizeof(uint16_t)
+	appendTo.addSize(2); // sizeof(uint16_t)
 
-	{	// Return myself if I am a member of this group
+	{ // Return myself if I am a member of this group
 		SharedPtr<Network> network(RR->node->network(nwid));
-		if ((network) && (network->subscribedToMulticastGroup(mg, true))) {
+		if ((network)&&(network->subscribedToMulticastGroup(mg,true))) {
 			RR->identity.address().appendTo(appendTo);
 			++totalKnown;
 			++added;
@@ -90,19 +96,19 @@ unsigned int Multicaster::gather(const Address& queryingPeer, uint64_t nwid, con
 
 	Mutex::Lock _l(_groups_m);
 
-	const MulticastGroupStatus* s = _groups.get(Multicaster::Key(nwid, mg));
-	if ((s) && (! s->members.empty())) {
+	const MulticastGroupStatus *s = _groups.get(Multicaster::Key(nwid,mg));
+	if ((s)&&(!s->members.empty())) {
 		totalKnown += (unsigned int)s->members.size();
 
 		// Members are returned in random order so that repeated gather queries
 		// will return different subsets of a large multicast group.
 		k = 0;
-		while ((added < limit) && (k < s->members.size()) && ((appendTo.size() + ZT_ADDRESS_LENGTH) <= ZT_PROTO_MAX_PACKET_LENGTH)) {
+		while ((added < limit)&&(k < s->members.size())&&((appendTo.size() + ZT_ADDRESS_LENGTH) <= ZT_UDP_DEFAULT_PAYLOAD_MTU)) {
 			rptr = (unsigned int)RR->node->prng();
 
-		restart_member_scan:
+restart_member_scan:
 			a = s->members[rptr % (unsigned int)s->members.size()].address.toInt();
-			for (i = 0; i < k; ++i) {
+			for(i=0;i<k;++i) {
 				if (picked[i] == a) {
 					++rptr;
 					goto restart_member_scan;
@@ -110,8 +116,8 @@ unsigned int Multicaster::gather(const Address& queryingPeer, uint64_t nwid, con
 			}
 			picked[k++] = a;
 
-			if (queryingPeer.toInt() != a) {   // do not return the peer that is making the request as a result
-				p = (unsigned char*)appendTo.appendField(ZT_ADDRESS_LENGTH);
+			if (queryingPeer.toInt() != a) { // do not return the peer that is making the request as a result
+				p = (unsigned char *)appendTo.appendField(ZT_ADDRESS_LENGTH);
 				*(p++) = (unsigned char)((a >> 32) & 0xff);
 				*(p++) = (unsigned char)((a >> 24) & 0xff);
 				*(p++) = (unsigned char)((a >> 16) & 0xff);
@@ -122,97 +128,57 @@ unsigned int Multicaster::gather(const Address& queryingPeer, uint64_t nwid, con
 		}
 	}
 
-	appendTo.setAt(totalAt, (uint32_t)totalKnown);
-	appendTo.setAt(addedAt, (uint16_t)added);
+	appendTo.setAt(totalAt,(uint32_t)totalKnown);
+	appendTo.setAt(addedAt,(uint16_t)added);
+
+	//TRACE("..MC Multicaster::gather() attached %u of %u peers for %.16llx/%s (2)",n,(unsigned int)(gs->second.members.size() - skipped),nwid,mg.toString().c_str());
 
 	return added;
 }
 
-std::vector<Address> Multicaster::getMembers(uint64_t nwid, const MulticastGroup& mg, unsigned int limit) const
+std::vector<Address> Multicaster::getMembers(uint64_t nwid,const MulticastGroup &mg,unsigned int limit) const
 {
 	std::vector<Address> ls;
 	Mutex::Lock _l(_groups_m);
-	const MulticastGroupStatus* s = _groups.get(Multicaster::Key(nwid, mg));
-	if (! s) {
+	const MulticastGroupStatus *s = _groups.get(Multicaster::Key(nwid,mg));
+	if (!s)
 		return ls;
-	}
-	for (std::vector<MulticastGroupMember>::const_reverse_iterator m(s->members.rbegin()); m != s->members.rend(); ++m) {
+	for(std::vector<MulticastGroupMember>::const_reverse_iterator m(s->members.rbegin());m!=s->members.rend();++m) {
 		ls.push_back(m->address);
-		if (ls.size() >= limit) {
+		if (ls.size() >= limit)
 			break;
-		}
 	}
 	return ls;
 }
 
-void Multicaster::send(void* tPtr, int64_t now, const SharedPtr<Network>& network, const Address& origin, const MulticastGroup& mg, const MAC& src, unsigned int etherType, const void* data, unsigned int len)
+void Multicaster::send(
+	const CertificateOfMembership *com,
+	unsigned int limit,
+	uint64_t now,
+	uint64_t nwid,
+	const std::vector<Address> &alwaysSendTo,
+	const MulticastGroup &mg,
+	const MAC &src,
+	unsigned int etherType,
+	const void *data,
+	unsigned int len)
 {
-	unsigned long idxbuf[4096];
-	unsigned long* indexes = idxbuf;
-
-	// If we're in hub-and-spoke designated multicast replication mode, see if we
-	// have a multicast replicator active. If so, pick the best and send it
-	// there. If we are a multicast replicator or if none are alive, fall back
-	// to sender replication. Note that bridges do not do this since this would
-	// break bridge route learning. This is sort of an edge case limitation of
-	// the current protocol and could be fixed, but fixing it would add more
-	// complexity than the fix is probably worth. Bridges are generally high
-	// bandwidth nodes.
-	if (! network->config().isActiveBridge(RR->identity.address())) {
-		Address multicastReplicators[ZT_MAX_NETWORK_SPECIALISTS];
-		const unsigned int multicastReplicatorCount = network->config().multicastReplicators(multicastReplicators);
-		if (multicastReplicatorCount) {
-			if (std::find(multicastReplicators, multicastReplicators + multicastReplicatorCount, RR->identity.address()) == (multicastReplicators + multicastReplicatorCount)) {
-				SharedPtr<Peer> bestMulticastReplicator;
-				SharedPtr<Path> bestMulticastReplicatorPath;
-				unsigned int bestMulticastReplicatorLatency = 0xffff;
-				for (unsigned int i = 0; i < multicastReplicatorCount; ++i) {
-					const SharedPtr<Peer> p(RR->topology->getPeerNoCache(multicastReplicators[i]));
-					if ((p) && (p->isAlive(now))) {
-						const SharedPtr<Path> pp(p->getAppropriatePath(now, false));
-						if ((pp) && (pp->latency() < bestMulticastReplicatorLatency)) {
-							bestMulticastReplicatorLatency = pp->latency();
-							bestMulticastReplicatorPath = pp;
-							bestMulticastReplicator = p;
-						}
-					}
-				}
-				if (bestMulticastReplicator) {
-					Packet outp(bestMulticastReplicator->address(), RR->identity.address(), Packet::VERB_MULTICAST_FRAME);
-					outp.append((uint64_t)network->id());
-					outp.append((uint8_t)0x0c);	  // includes source MAC | please replicate
-					((src) ? src : MAC(RR->identity.address(), network->id())).appendTo(outp);
-					mg.mac().appendTo(outp);
-					outp.append((uint32_t)mg.adi());
-					outp.append((uint16_t)etherType);
-					outp.append(data, len);
-					if (! network->config().disableCompression()) {
-						outp.compress();
-					}
-					outp.armor(bestMulticastReplicator->key(), true, false, bestMulticastReplicator->aesKeysIfSupported(), bestMulticastReplicator->identity());
-					Metrics::pkt_multicast_frame_out++;
-					bestMulticastReplicatorPath->send(RR, tPtr, outp.data(), outp.size(), now);
-					return;
-				}
-			}
-		}
-	}
+	unsigned long idxbuf[8194];
+	unsigned long *indexes = idxbuf;
 
 	try {
 		Mutex::Lock _l(_groups_m);
-		MulticastGroupStatus& gs = _groups[Multicaster::Key(network->id(), mg)];
+		MulticastGroupStatus &gs = _groups[Multicaster::Key(nwid,mg)];
 
-		if (! gs.members.empty()) {
+		if (!gs.members.empty()) {
 			// Allocate a memory buffer if group is monstrous
-			if (gs.members.size() > (sizeof(idxbuf) / sizeof(unsigned long))) {
+			if (gs.members.size() > (sizeof(idxbuf) / sizeof(unsigned long)))
 				indexes = new unsigned long[gs.members.size()];
-			}
 
 			// Generate a random permutation of member indexes
-			for (unsigned long i = 0; i < gs.members.size(); ++i) {
+			for(unsigned long i=0;i<gs.members.size();++i)
 				indexes[i] = i;
-			}
-			for (unsigned long i = (unsigned long)gs.members.size() - 1; i > 0; --i) {
+			for(unsigned long i=(unsigned long)gs.members.size()-1;i>0;--i) {
 				unsigned long j = (unsigned long)RR->node->prng() % (i + 1);
 				unsigned long tmp = indexes[j];
 				indexes[j] = indexes[i];
@@ -220,10 +186,6 @@ void Multicaster::send(void* tPtr, int64_t now, const SharedPtr<Network>& networ
 			}
 		}
 
-		Address activeBridges[ZT_MAX_NETWORK_SPECIALISTS];
-		const unsigned int activeBridgeCount = network->config().activeBridges(activeBridges);
-		const unsigned int limit = network->config().multicastLimit;
-
 		if (gs.members.size() >= limit) {
 			// Skip queue if we already have enough members to complete the send operation
 			OutboundMulticast out;
@@ -231,10 +193,10 @@ void Multicaster::send(void* tPtr, int64_t now, const SharedPtr<Network>& networ
 			out.init(
 				RR,
 				now,
-				network->id(),
-				network->config().disableCompression(),
+				nwid,
+				com,
 				limit,
-				1,	 // we'll still gather a little from peers to keep multicast list fresh
+				1, // we'll still gather a little from peers to keep multicast list fresh
 				src,
 				mg,
 				etherType,
@@ -243,143 +205,110 @@ void Multicaster::send(void* tPtr, int64_t now, const SharedPtr<Network>& networ
 
 			unsigned int count = 0;
 
-			for (unsigned int i = 0; i < activeBridgeCount; ++i) {
-				if ((activeBridges[i] != RR->identity.address()) && (activeBridges[i] != origin)) {
-					out.sendOnly(RR, tPtr, activeBridges[i]);	// optimization: don't use dedup log if it's a one-pass send
+			for(std::vector<Address>::const_iterator ast(alwaysSendTo.begin());ast!=alwaysSendTo.end();++ast) {
+				if (*ast != RR->identity.address()) {
+					out.sendOnly(RR,*ast); // optimization: don't use dedup log if it's a one-pass send
+					if (++count >= limit)
+						break;
 				}
 			}
 
 			unsigned long idx = 0;
-			while ((count < limit) && (idx < gs.members.size())) {
-				const Address ma(gs.members[indexes[idx++]].address);
-				if ((std::find(activeBridges, activeBridges + activeBridgeCount, ma) == (activeBridges + activeBridgeCount)) && (ma != origin)) {
-					out.sendOnly(RR, tPtr, ma);	  // optimization: don't use dedup log if it's a one-pass send
+			while ((count < limit)&&(idx < gs.members.size())) {
+				Address ma(gs.members[indexes[idx++]].address);
+				if (std::find(alwaysSendTo.begin(),alwaysSendTo.end(),ma) == alwaysSendTo.end()) {
+					out.sendOnly(RR,ma); // optimization: don't use dedup log if it's a one-pass send
 					++count;
 				}
 			}
-		}
-		else {
-			while (gs.txQueue.size() >= ZT_TX_QUEUE_SIZE) {
-				gs.txQueue.pop_front();
-			}
+		} else {
+			unsigned int gatherLimit = (limit - (unsigned int)gs.members.size()) + 1;
 
-			const unsigned int gatherLimit = (limit - (unsigned int)gs.members.size()) + 1;
-
-			int timerScale = RR->node->lowBandwidthModeEnabled() ? 3 : 1;
-			if ((gs.members.empty()) || ((now - gs.lastExplicitGather) >= (ZT_MULTICAST_EXPLICIT_GATHER_DELAY * timerScale))) {
+			if ((gs.members.empty())||((now - gs.lastExplicitGather) >= ZT_MULTICAST_EXPLICIT_GATHER_DELAY)) {
 				gs.lastExplicitGather = now;
+				SharedPtr<Peer> explicitGatherPeers[2];
+				explicitGatherPeers[0] = RR->topology->getBestRoot();
+				explicitGatherPeers[1] = RR->topology->getPeer(Network::controllerFor(nwid));
+				for(unsigned int k=0;k<2;++k) {
+					const SharedPtr<Peer> &p = explicitGatherPeers[k];
+					if (!p)
+						continue;
+					//TRACE(">>MC upstream GATHER up to %u for group %.16llx/%s",gatherLimit,nwid,mg.toString().c_str());
 
-				Address explicitGatherPeers[16];
-				unsigned int numExplicitGatherPeers = 0;
-
-				SharedPtr<Peer> bestRoot(RR->topology->getUpstreamPeer());
-				if (bestRoot) {
-					explicitGatherPeers[numExplicitGatherPeers++] = bestRoot->address();
-				}
-
-				explicitGatherPeers[numExplicitGatherPeers++] = network->controller();
-
-				Address ac[ZT_MAX_NETWORK_SPECIALISTS];
-				const unsigned int accnt = network->config().alwaysContactAddresses(ac);
-				unsigned int shuffled[ZT_MAX_NETWORK_SPECIALISTS];
-				for (unsigned int i = 0; i < accnt; ++i) {
-					shuffled[i] = i;
-				}
-				for (unsigned int i = 0, k = accnt >> 1; i < k; ++i) {
-					const uint64_t x = RR->node->prng();
-					const unsigned int x1 = shuffled[(unsigned int)x % accnt];
-					const unsigned int x2 = shuffled[(unsigned int)(x >> 32) % accnt];
-					const unsigned int tmp = shuffled[x1];
-					shuffled[x1] = shuffled[x2];
-					shuffled[x2] = tmp;
-				}
-				for (unsigned int i = 0; i < accnt; ++i) {
-					explicitGatherPeers[numExplicitGatherPeers++] = ac[shuffled[i]];
-					if (numExplicitGatherPeers == 16) {
-						break;
+					const CertificateOfMembership *com = (CertificateOfMembership *)0;
+					{
+						SharedPtr<Network> nw(RR->node->network(nwid));
+						if ((nw)&&(nw->hasConfig())&&(nw->config().com())&&(nw->config().isPrivate())&&(p->needsOurNetworkMembershipCertificate(nwid,now,true)))
+							com = &(nw->config().com());
 					}
-				}
 
-				std::vector<Address> anchors(network->config().anchors());
-				for (std::vector<Address>::const_iterator a(anchors.begin()); a != anchors.end(); ++a) {
-					if (*a != RR->identity.address()) {
-						explicitGatherPeers[numExplicitGatherPeers++] = *a;
-						if (numExplicitGatherPeers == 16) {
-							break;
-						}
-					}
-				}
-
-				for (unsigned int k = 0; k < numExplicitGatherPeers; ++k) {
-					const CertificateOfMembership* com = (network) ? ((network->config().com) ? &(network->config().com) : (const CertificateOfMembership*)0) : (const CertificateOfMembership*)0;
-					Packet outp(explicitGatherPeers[k], RR->identity.address(), Packet::VERB_MULTICAST_GATHER);
-					outp.append(network->id());
-					outp.append((uint8_t)((com) ? 0x01 : 0x00));
+					Packet outp(p->address(),RR->identity.address(),Packet::VERB_MULTICAST_GATHER);
+					outp.append(nwid);
+					outp.append((uint8_t)(com ? 0x01 : 0x00));
 					mg.mac().appendTo(outp);
 					outp.append((uint32_t)mg.adi());
 					outp.append((uint32_t)gatherLimit);
-					if (com) {
+					if (com)
 						com->serialize(outp);
-					}
-					RR->node->expectReplyTo(outp.packetId());
-					RR->sw->send(tPtr, outp, true);
-					Metrics::pkt_multicast_gather_out++;
+					RR->sw->send(outp,true,0);
 				}
+				gatherLimit = 0;
 			}
 
 			gs.txQueue.push_back(OutboundMulticast());
-			OutboundMulticast& out = gs.txQueue.back();
+			OutboundMulticast &out = gs.txQueue.back();
 
-			out.init(RR, now, network->id(), network->config().disableCompression(), limit, gatherLimit, src, mg, etherType, data, len);
-
-			if (origin) {
-				out.logAsSent(origin);
-			}
+			out.init(
+				RR,
+				now,
+				nwid,
+				com,
+				limit,
+				gatherLimit,
+				src,
+				mg,
+				etherType,
+				data,
+				len);
 
 			unsigned int count = 0;
 
-			for (unsigned int i = 0; i < activeBridgeCount; ++i) {
-				if (activeBridges[i] != RR->identity.address()) {
-					out.sendAndLog(RR, tPtr, activeBridges[i]);
-					if (++count >= limit) {
+			for(std::vector<Address>::const_iterator ast(alwaysSendTo.begin());ast!=alwaysSendTo.end();++ast) {
+				if (*ast != RR->identity.address()) {
+					out.sendAndLog(RR,*ast);
+					if (++count >= limit)
 						break;
-					}
 				}
 			}
 
 			unsigned long idx = 0;
-			while ((count < limit) && (idx < gs.members.size())) {
+			while ((count < limit)&&(idx < gs.members.size())) {
 				Address ma(gs.members[indexes[idx++]].address);
-				if (std::find(activeBridges, activeBridges + activeBridgeCount, ma) == (activeBridges + activeBridgeCount)) {
-					out.sendAndLog(RR, tPtr, ma);
+				if (std::find(alwaysSendTo.begin(),alwaysSendTo.end(),ma) == alwaysSendTo.end()) {
+					out.sendAndLog(RR,ma);
 					++count;
 				}
 			}
 		}
-	}
-	catch (...) {
-	}	// this is a sanity check to catch any failures and make sure indexes[] still gets deleted
+	} catch ( ... ) {} // this is a sanity check to catch any failures and make sure indexes[] still gets deleted
 
 	// Free allocated memory buffer if any
-	if (indexes != idxbuf) {
-		delete[] indexes;
-	}
+	if (indexes != idxbuf)
+		delete [] indexes;
 }
 
-void Multicaster::clean(int64_t now)
+void Multicaster::clean(uint64_t now)
 {
 	Mutex::Lock _l(_groups_m);
-	Multicaster::Key* k = (Multicaster::Key*)0;
-	MulticastGroupStatus* s = (MulticastGroupStatus*)0;
-	Hashtable<Multicaster::Key, MulticastGroupStatus>::Iterator mm(_groups);
-	while (mm.next(k, s)) {
-		for (std::list<OutboundMulticast>::iterator tx(s->txQueue.begin()); tx != s->txQueue.end();) {
-			if ((tx->expired(now)) || (tx->atLimit())) {
+
+	Multicaster::Key *k = (Multicaster::Key *)0;
+	MulticastGroupStatus *s = (MulticastGroupStatus *)0;
+	Hashtable<Multicaster::Key,MulticastGroupStatus>::Iterator mm(_groups);
+	while (mm.next(k,s)) {
+		for(std::list<OutboundMulticast>::iterator tx(s->txQueue.begin());tx!=s->txQueue.end();) {
+			if ((tx->expired(now))||(tx->atLimit()))
 				s->txQueue.erase(tx++);
-			}
-			else {
-				++tx;
-			}
+			else ++tx;
 		}
 
 		unsigned long count = 0;
@@ -398,51 +327,43 @@ void Multicaster::clean(int64_t now)
 
 		if (count) {
 			s->members.resize(count);
-		}
-		else if (s->txQueue.empty()) {
+		} else if (s->txQueue.empty()) {
 			_groups.erase(*k);
-		}
-		else {
+		} else {
 			s->members.clear();
 		}
 	}
 }
 
-void Multicaster::_add(void* tPtr, int64_t now, uint64_t nwid, const MulticastGroup& mg, MulticastGroupStatus& gs, const Address& member)
+void Multicaster::_add(uint64_t now,uint64_t nwid,const MulticastGroup &mg,MulticastGroupStatus &gs,const Address &member)
 {
 	// assumes _groups_m is locked
 
 	// Do not add self -- even if someone else returns it
-	if (member == RR->identity.address()) {
+	if (member == RR->identity.address())
 		return;
-	}
 
-	std::vector<MulticastGroupMember>::iterator m(std::lower_bound(gs.members.begin(), gs.members.end(), member));
-	if (m != gs.members.end()) {
+	for(std::vector<MulticastGroupMember>::iterator m(gs.members.begin());m!=gs.members.end();++m) {
 		if (m->address == member) {
 			m->timestamp = now;
 			return;
 		}
-		gs.members.insert(m, MulticastGroupMember(member, now));
-	}
-	else {
-		gs.members.push_back(MulticastGroupMember(member, now));
 	}
 
-	for (std::list<OutboundMulticast>::iterator tx(gs.txQueue.begin()); tx != gs.txQueue.end();) {
-		if (tx->atLimit()) {
+	gs.members.push_back(MulticastGroupMember(member,now));
+
+	//TRACE("..MC %s joined multicast group %.16llx/%s via %s",member.toString().c_str(),nwid,mg.toString().c_str(),((learnedFrom) ? learnedFrom.toString().c_str() : "(direct)"));
+
+	for(std::list<OutboundMulticast>::iterator tx(gs.txQueue.begin());tx!=gs.txQueue.end();) {
+		if (tx->atLimit())
 			gs.txQueue.erase(tx++);
-		}
 		else {
-			tx->sendIfNew(RR, tPtr, member);
-			if (tx->atLimit()) {
+			tx->sendIfNew(RR,member);
+			if (tx->atLimit())
 				gs.txQueue.erase(tx++);
-			}
-			else {
-				++tx;
-			}
+			else ++tx;
 		}
 	}
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Multicaster.hpp b/node/Multicaster.hpp
index 0cb6e8f8e..c43c8d938 100644
--- a/node/Multicaster.hpp
+++ b/node/Multicaster.hpp
@@ -1,48 +1,85 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_MULTICASTER_HPP
 #define ZT_MULTICASTER_HPP
 
-#include "Address.hpp"
-#include "Constants.hpp"
-#include "Hashtable.hpp"
-#include "MAC.hpp"
-#include "MulticastGroup.hpp"
-#include "Mutex.hpp"
-#include "OutboundMulticast.hpp"
-#include "SharedPtr.hpp"
-#include "Utils.hpp"
-
-#include <list>
-#include <map>
 #include <stdint.h>
 #include <string.h>
+
+#include <map>
 #include <vector>
+#include <list>
+
+#include "Constants.hpp"
+#include "Hashtable.hpp"
+#include "Address.hpp"
+#include "MAC.hpp"
+#include "MulticastGroup.hpp"
+#include "OutboundMulticast.hpp"
+#include "Utils.hpp"
+#include "Mutex.hpp"
+#include "NonCopyable.hpp"
 
 namespace ZeroTier {
 
 class RuntimeEnvironment;
 class CertificateOfMembership;
 class Packet;
-class Network;
 
 /**
  * Database of known multicast peers within a network
  */
-class Multicaster {
-  public:
-	Multicaster(const RuntimeEnvironment* renv);
+class Multicaster : NonCopyable
+{
+private:
+	struct Key
+	{
+		Key() : nwid(0),mg() {}
+		Key(uint64_t n,const MulticastGroup &g) : nwid(n),mg(g) {}
+
+		uint64_t nwid;
+		MulticastGroup mg;
+
+		inline bool operator==(const Key &k) const throw() { return ((nwid == k.nwid)&&(mg == k.mg)); }
+		inline unsigned long hashCode() const throw() { return (mg.hashCode() ^ (unsigned long)(nwid ^ (nwid >> 32))); }
+	};
+
+	struct MulticastGroupMember
+	{
+		MulticastGroupMember() {}
+		MulticastGroupMember(const Address &a,uint64_t ts) : address(a),timestamp(ts) {}
+
+		Address address;
+		uint64_t timestamp; // time of last notification
+	};
+
+	struct MulticastGroupStatus
+	{
+		MulticastGroupStatus() : lastExplicitGather(0) {}
+
+		uint64_t lastExplicitGather;
+		std::list<OutboundMulticast> txQueue; // pending outbound multicasts
+		std::vector<MulticastGroupMember> members; // members of this group
+	};
+
+public:
+	Multicaster(const RuntimeEnvironment *renv);
 	~Multicaster();
 
 	/**
@@ -53,10 +90,10 @@ class Multicaster {
 	 * @param mg Multicast group
 	 * @param member New member address
 	 */
-	inline void add(void* tPtr, int64_t now, uint64_t nwid, const MulticastGroup& mg, const Address& member)
+	inline void add(uint64_t now,uint64_t nwid,const MulticastGroup &mg,const Address &member)
 	{
 		Mutex::Lock _l(_groups_m);
-		_add(tPtr, now, nwid, mg, _groups[Multicaster::Key(nwid, mg)], member);
+		_add(now,nwid,mg,_groups[Multicaster::Key(nwid,mg)],member);
 	}
 
 	/**
@@ -64,7 +101,6 @@ class Multicaster {
 	 *
 	 * It's up to the caller to check bounds on the array before calling this.
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param now Current time
 	 * @param nwid Network ID
 	 * @param mg Multicast group
@@ -72,7 +108,7 @@ class Multicaster {
 	 * @param count Number of addresses
 	 * @param totalKnown Total number of known addresses as reported by peer
 	 */
-	void addMultiple(void* tPtr, int64_t now, uint64_t nwid, const MulticastGroup& mg, const void* addresses, unsigned int count, unsigned int totalKnown);
+	void addMultiple(uint64_t now,uint64_t nwid,const MulticastGroup &mg,const void *addresses,unsigned int count,unsigned int totalKnown);
 
 	/**
 	 * Remove a multicast group member (if present)
@@ -81,7 +117,7 @@ class Multicaster {
 	 * @param mg Multicast group
 	 * @param member Member to unsubscribe
 	 */
-	void remove(uint64_t nwid, const MulticastGroup& mg, const Address& member);
+	void remove(uint64_t nwid,const MulticastGroup &mg,const Address &member);
 
 	/**
 	 * Append gather results to a packet by choosing registered multicast recipients at random
@@ -101,7 +137,7 @@ class Multicaster {
 	 * @return Number of addresses appended
 	 * @throws std::out_of_range Buffer overflow writing to packet
 	 */
-	unsigned int gather(const Address& queryingPeer, uint64_t nwid, const MulticastGroup& mg, Buffer<ZT_PROTO_MAX_PACKET_LENGTH>& appendTo, unsigned int limit) const;
+	unsigned int gather(const Address &queryingPeer,uint64_t nwid,const MulticastGroup &mg,Buffer<ZT_PROTO_MAX_PACKET_LENGTH> &appendTo,unsigned int limit) const;
 
 	/**
 	 * Get subscribers to a multicast group
@@ -109,112 +145,50 @@ class Multicaster {
 	 * @param nwid Network ID
 	 * @param mg Multicast group
 	 */
-	std::vector<Address> getMembers(uint64_t nwid, const MulticastGroup& mg, unsigned int limit) const;
+	std::vector<Address> getMembers(uint64_t nwid,const MulticastGroup &mg,unsigned int limit) const;
 
 	/**
 	 * Send a multicast
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
+	 * @param com Certificate of membership to include or NULL for none
+	 * @param limit Multicast limit
 	 * @param now Current time
-	 * @param network Network
-	 * @param origin Origin of multicast (to not return to sender) or NULL if none
+	 * @param nwid Network ID
+	 * @param alwaysSendTo Send to these peers first and even if not included in subscriber list
 	 * @param mg Multicast group
 	 * @param src Source Ethernet MAC address or NULL to skip in packet and compute from ZT address (non-bridged mode)
 	 * @param etherType Ethernet frame type
 	 * @param data Packet data
 	 * @param len Length of packet data
 	 */
-	void send(void* tPtr, int64_t now, const SharedPtr<Network>& network, const Address& origin, const MulticastGroup& mg, const MAC& src, unsigned int etherType, const void* data, unsigned int len);
+	void send(
+		const CertificateOfMembership *com,
+		unsigned int limit,
+		uint64_t now,
+		uint64_t nwid,
+		const std::vector<Address> &alwaysSendTo,
+		const MulticastGroup &mg,
+		const MAC &src,
+		unsigned int etherType,
+		const void *data,
+		unsigned int len);
 
 	/**
-	 * Clean database
+	 * Clean up and resort database
 	 *
 	 * @param RR Runtime environment
 	 * @param now Current time
 	 */
-	void clean(int64_t now);
+	void clean(uint64_t now);
 
-  private:
-	struct Key {
-		Key() : nwid(0), mg()
-		{
-		}
-		Key(uint64_t n, const MulticastGroup& g) : nwid(n), mg(g)
-		{
-		}
+private:
+	void _add(uint64_t now,uint64_t nwid,const MulticastGroup &mg,MulticastGroupStatus &gs,const Address &member);
 
-		uint64_t nwid;
-		MulticastGroup mg;
-
-		inline bool operator==(const Key& k) const
-		{
-			return ((nwid == k.nwid) && (mg == k.mg));
-		}
-		inline bool operator!=(const Key& k) const
-		{
-			return ((nwid != k.nwid) || (mg != k.mg));
-		}
-		inline unsigned long hashCode() const
-		{
-			return (mg.hashCode() ^ (unsigned long)(nwid ^ (nwid >> 32)));
-		}
-	};
-
-	struct MulticastGroupMember {
-		MulticastGroupMember()
-		{
-		}
-		MulticastGroupMember(const Address& a, uint64_t ts) : address(a), timestamp(ts)
-		{
-		}
-
-		inline bool operator<(const MulticastGroupMember& a) const
-		{
-			return (address < a.address);
-		}
-		inline bool operator==(const MulticastGroupMember& a) const
-		{
-			return (address == a.address);
-		}
-		inline bool operator!=(const MulticastGroupMember& a) const
-		{
-			return (address != a.address);
-		}
-		inline bool operator<(const Address& a) const
-		{
-			return (address < a);
-		}
-		inline bool operator==(const Address& a) const
-		{
-			return (address == a);
-		}
-		inline bool operator!=(const Address& a) const
-		{
-			return (address != a);
-		}
-
-		Address address;
-		int64_t timestamp;	 // time of last notification
-	};
-
-	struct MulticastGroupStatus {
-		MulticastGroupStatus() : lastExplicitGather(0)
-		{
-		}
-
-		int64_t lastExplicitGather;
-		std::list<OutboundMulticast> txQueue;		 // pending outbound multicasts
-		std::vector<MulticastGroupMember> members;	 // members of this group
-	};
-
-	void _add(void* tPtr, int64_t now, uint64_t nwid, const MulticastGroup& mg, MulticastGroupStatus& gs, const Address& member);
-
-	const RuntimeEnvironment* const RR;
-
-	Hashtable<Multicaster::Key, MulticastGroupStatus> _groups;
+	const RuntimeEnvironment *RR;
+	Hashtable<Multicaster::Key,MulticastGroupStatus> _groups;
 	Mutex _groups_m;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Mutex.hpp b/node/Mutex.hpp
index d708b4571..d451ede03 100644
--- a/node/Mutex.hpp
+++ b/node/Mutex.hpp
@@ -1,35 +1,41 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_MUTEX_HPP
 #define ZT_MUTEX_HPP
 
 #include "Constants.hpp"
+#include "NonCopyable.hpp"
 
 #ifdef __UNIX_LIKE__
 
-#include <pthread.h>
-#include <stdint.h>
 #include <stdlib.h>
+#include <pthread.h>
 
 namespace ZeroTier {
 
-// libpthread based mutex lock
-class Mutex {
-  public:
+class Mutex : NonCopyable
+{
+public:
 	Mutex()
+		throw()
 	{
-		pthread_mutex_init(&_mh, (const pthread_mutexattr_t*)0);
+		pthread_mutex_init(&_mh,(const pthread_mutexattr_t *)0);
 	}
 
 	~Mutex()
@@ -37,24 +43,46 @@ class Mutex {
 		pthread_mutex_destroy(&_mh);
 	}
 
-	inline void lock() const
+	inline void lock()
+		throw()
 	{
-		pthread_mutex_lock(&((const_cast<Mutex*>(this))->_mh));
+		pthread_mutex_lock(&_mh);
+	}
+
+	inline void unlock()
+		throw()
+	{
+		pthread_mutex_unlock(&_mh);
+	}
+
+	inline void lock() const
+		throw()
+	{
+		(const_cast <Mutex *> (this))->lock();
 	}
 
 	inline void unlock() const
+		throw()
 	{
-		pthread_mutex_unlock(&((const_cast<Mutex*>(this))->_mh));
+		(const_cast <Mutex *> (this))->unlock();
 	}
 
-	class Lock {
-	  public:
-		Lock(Mutex& m) : _m(&m)
+	/**
+	 * Uses C++ contexts and constructor/destructor to lock/unlock automatically
+	 */
+	class Lock : NonCopyable
+	{
+	public:
+		Lock(Mutex &m)
+			throw() :
+			_m(&m)
 		{
 			m.lock();
 		}
 
-		Lock(const Mutex& m) : _m(const_cast<Mutex*>(&m))
+		Lock(const Mutex &m)
+			throw() :
+			_m(const_cast<Mutex *>(&m))
 		{
 			_m->lock();
 		}
@@ -64,37 +92,30 @@ class Mutex {
 			_m->unlock();
 		}
 
-	  private:
-		Mutex* const _m;
+	private:
+		Mutex *const _m;
 	};
 
-  private:
-	Mutex(const Mutex&)
-	{
-	}
-	const Mutex& operator=(const Mutex&)
-	{
-		return *this;
-	}
-
+private:
 	pthread_mutex_t _mh;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
-#endif
+#endif // Apple / Linux
 
 #ifdef __WINDOWS__
 
 #include <stdlib.h>
-#include <windows.h>
+#include <Windows.h>
 
 namespace ZeroTier {
 
-// Windows critical section based lock
-class Mutex {
-  public:
+class Mutex : NonCopyable
+{
+public:
 	Mutex()
+		throw()
 	{
 		InitializeCriticalSection(&_cs);
 	}
@@ -105,33 +126,42 @@ class Mutex {
 	}
 
 	inline void lock()
+		throw()
 	{
 		EnterCriticalSection(&_cs);
 	}
 
 	inline void unlock()
+		throw()
 	{
 		LeaveCriticalSection(&_cs);
 	}
 
 	inline void lock() const
+		throw()
 	{
-		(const_cast<Mutex*>(this))->lock();
+		(const_cast <Mutex *> (this))->lock();
 	}
 
 	inline void unlock() const
+		throw()
 	{
-		(const_cast<Mutex*>(this))->unlock();
+		(const_cast <Mutex *> (this))->unlock();
 	}
 
-	class Lock {
-	  public:
-		Lock(Mutex& m) : _m(&m)
+	class Lock : NonCopyable
+	{
+	public:
+		Lock(Mutex &m)
+			throw() :
+			_m(&m)
 		{
 			m.lock();
 		}
 
-		Lock(const Mutex& m) : _m(const_cast<Mutex*>(&m))
+		Lock(const Mutex &m)
+			throw() :
+			_m(const_cast<Mutex *>(&m))
 		{
 			_m->lock();
 		}
@@ -141,24 +171,16 @@ class Mutex {
 			_m->unlock();
 		}
 
-	  private:
-		Mutex* const _m;
+	private:
+		Mutex *const _m;
 	};
 
-  private:
-	Mutex(const Mutex&)
-	{
-	}
-	const Mutex& operator=(const Mutex&)
-	{
-		return *this;
-	}
-
+private:
 	CRITICAL_SECTION _cs;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
-#endif	 // _WIN32
+#endif // _WIN32
 
 #endif
diff --git a/node/Network.cpp b/node/Network.cpp
index 4b5cdd02d..86780861d 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -1,1570 +1,290 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "Network.hpp"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
 
-#include "../include/ZeroTierDebug.h"
-#include "../version.h"
-#include "Address.hpp"
-#include "Buffer.hpp"
 #include "Constants.hpp"
-#include "ECC.hpp"
-#include "InetAddress.hpp"
-#include "MAC.hpp"
-#include "Metrics.hpp"
-#include "NetworkController.hpp"
-#include "Node.hpp"
-#include "Packet.hpp"
-#include "Peer.hpp"
+#include "Network.hpp"
 #include "RuntimeEnvironment.hpp"
 #include "Switch.hpp"
-#include "Trace.hpp"
+#include "Packet.hpp"
+#include "Buffer.hpp"
+#include "NetworkController.hpp"
+#include "Node.hpp"
 
-#include <math.h>
-#include <set>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "../version.h"
 
 namespace ZeroTier {
 
-namespace {
+const ZeroTier::MulticastGroup Network::BROADCAST(ZeroTier::MAC(0xffffffffffffULL),0);
 
-// Returns true if packet appears valid; pos and proto will be set
-static inline bool _ipv6GetPayload(const uint8_t* frameData, unsigned int frameLen, unsigned int& pos, unsigned int& proto)
+Network::Network(const RuntimeEnvironment *renv,uint64_t nwid,void *uptr) :
+	RR(renv),
+	_uPtr(uptr),
+	_id(nwid),
+	_mac(renv->identity.address(),nwid),
+	_enabled(true),
+	_portInitialized(false),
+	_lastConfigUpdate(0),
+	_destroyed(false),
+	_netconfFailure(NETCONF_FAILURE_NONE),
+	_portError(0)
 {
-	if (frameLen < 40) {
-		return false;
-	}
-	pos = 40;
-	proto = frameData[6];
-	while (pos <= frameLen) {
-		switch (proto) {
-			case 0:		// hop-by-hop options
-			case 43:	// routing
-			case 60:	// destination options
-			case 135:	// mobility options
-				if ((pos + 8) > frameLen) {
-					return false;	// invalid!
-				}
-				proto = frameData[pos];
-				pos += ((unsigned int)frameData[pos + 1] * 8) + 8;
-				break;
+	char confn[128],mcdbn[128];
+	Utils::snprintf(confn,sizeof(confn),"networks.d/%.16llx.conf",_id);
+	Utils::snprintf(mcdbn,sizeof(mcdbn),"networks.d/%.16llx.mcerts",_id);
 
-			// case 44: // fragment -- we currently can't parse these and they are deprecated in IPv6 anyway
-			// case 50:
-			// case 51: // IPSec ESP and AH -- we have to stop here since this is encrypted stuff
-			default:
-				return true;
-		}
-	}
-	return false;	// overflow == invalid
-}
+	// These files are no longer used, so clean them.
+	RR->node->dataStoreDelete(mcdbn);
 
-enum _doZtFilterResult { DOZTFILTER_NO_MATCH, DOZTFILTER_DROP, DOZTFILTER_REDIRECT, DOZTFILTER_ACCEPT, DOZTFILTER_SUPER_ACCEPT };
+	if (_id == ZT_TEST_NETWORK_ID) {
+		applyConfiguration(NetworkConfig::createTestNetworkConfig(RR->identity.address()));
 
-static _doZtFilterResult _doZtFilter(
-	const RuntimeEnvironment* RR,
-	Trace::RuleResultLog& rrl,
-	const NetworkConfig& nconf,
-	const Membership* membership,	// can be NULL
-	const bool inbound,
-	const Address& ztSource,
-	Address& ztDest,   // MUTABLE -- is changed on REDIRECT actions
-	const MAC& macSource,
-	const MAC& macDest,
-	const uint8_t* const frameData,
-	const unsigned int frameLen,
-	const unsigned int etherType,
-	const unsigned int vlanId,
-	const ZT_VirtualNetworkRule* rules,	  // cannot be NULL
-	const unsigned int ruleCount,
-	Address& cc,			  // MUTABLE -- set to TEE destination if TEE action is taken or left alone otherwise
-	unsigned int& ccLength,	  // MUTABLE -- set to length of packet payload to TEE
-	bool& ccWatch,			  // MUTABLE -- set to true for WATCH target as opposed to normal TEE
-	uint8_t& qosBucket)		  // MUTABLE -- set to the value of the argument provided to PRIORITY
-{
-	// Set to true if we are a TEE/REDIRECT/WATCH target
-	bool superAccept = false;
-
-	// The default match state for each set of entries starts as 'true' since an
-	// ACTION with no MATCH entries preceding it is always taken.
-	uint8_t thisSetMatches = 1;
-	uint8_t skipDrop = 0;
-
-	rrl.clear();
-
-	// uncomment for easier debugging fprintf
-	// if (!ztDest) { return DOZTFILTER_ACCEPT; }
-#ifdef ZT_TRACE
-	// char buf[40], buf2[40];
-	// fprintf(stderr, "\nsrc %s dest %s inbound: %d ethertype %u", ztSource.toString(buf), ztDest.toString(buf2), inbound, etherType);
-#endif
-
-	for (unsigned int rn = 0; rn < ruleCount; ++rn) {
-		const ZT_VirtualNetworkRuleType rt = (ZT_VirtualNetworkRuleType)(rules[rn].t & 0x3f);
-#ifdef ZT_TRACE
-		// fprintf(stderr, "\n%02u %02d", rn, rt);
-#endif
-
-		// First check if this is an ACTION
-		if ((unsigned int)rt <= (unsigned int)ZT_NETWORK_RULE_ACTION__MAX_ID) {
-			if (thisSetMatches) {
-				switch (rt) {
-					case ZT_NETWORK_RULE_ACTION_PRIORITY:
-						qosBucket = (rules[rn].v.qosBucket <= 8) ? rules[rn].v.qosBucket : 4;	// 4 = default bucket (no priority)
-						return DOZTFILTER_ACCEPT;
-
-					case ZT_NETWORK_RULE_ACTION_DROP: {
-						if (! ! skipDrop) {
-#ifdef ZT_TRACE
-							// fprintf(stderr, "\tskip Drop");
-#endif
-							skipDrop = 0;
-							continue;
-						}
-#ifdef ZT_TRACE
-						// fprintf(stderr, "\tDrop\n");
-#endif
-						return DOZTFILTER_DROP;
-					}
-
-					case ZT_NETWORK_RULE_ACTION_ACCEPT: {
-#ifdef ZT_TRACE
-						// fprintf(stderr, "\tAccept\n");
-#endif
-						return (superAccept ? DOZTFILTER_SUPER_ACCEPT : DOZTFILTER_ACCEPT);	  // match, accept packet
-					}
-
-					// These are initially handled together since preliminary logic is common
-					case ZT_NETWORK_RULE_ACTION_TEE:
-					case ZT_NETWORK_RULE_ACTION_WATCH:
-					case ZT_NETWORK_RULE_ACTION_REDIRECT: {
-						const Address fwdAddr(rules[rn].v.fwd.address);
-						if (fwdAddr == ztSource) {
-							// Skip as no-op since source is target
-						}
-						else if (fwdAddr == RR->identity.address()) {
-							if (inbound) {
-								return DOZTFILTER_SUPER_ACCEPT;
-							}
-							else {
-							}
-						}
-						else if (fwdAddr == ztDest) {
-						}
-						else {
-							if (rt == ZT_NETWORK_RULE_ACTION_REDIRECT) {
-								ztDest = fwdAddr;
-								return DOZTFILTER_REDIRECT;
-							}
-							else {
-								cc = fwdAddr;
-								ccLength = (rules[rn].v.fwd.length != 0) ? ((frameLen < (unsigned int)rules[rn].v.fwd.length) ? frameLen : (unsigned int)rules[rn].v.fwd.length) : frameLen;
-								ccWatch = (rt == ZT_NETWORK_RULE_ACTION_WATCH);
-							}
-						}
-					}
-						continue;
-
-					case ZT_NETWORK_RULE_ACTION_BREAK:
-						return DOZTFILTER_NO_MATCH;
-
-					// Unrecognized ACTIONs are ignored as no-ops
-					default:
-						continue;
-				}
-			}
-			else {
-				// If this is an incoming packet and we are a TEE or REDIRECT target, we should
-				// super-accept if we accept at all. This will cause us to accept redirected or
-				// tee'd packets in spite of MAC and ZT addressing checks.
-				if (inbound) {
-					switch (rt) {
-						case ZT_NETWORK_RULE_ACTION_TEE:
-						case ZT_NETWORK_RULE_ACTION_WATCH:
-						case ZT_NETWORK_RULE_ACTION_REDIRECT:
-							if (RR->identity.address() == rules[rn].v.fwd.address) {
-								superAccept = true;
-							}
-							break;
-						default:
-							break;
-					}
-				}
-
-				thisSetMatches = 1;	  // reset to default true for next batch of entries
-				continue;
-			}
-		}
-
-		// Circuit breaker: no need to evaluate an AND if the set's match state
-		// is currently false since anything AND false is false.
-		if ((! thisSetMatches) && (! (rules[rn].t & 0x40))) {
-			rrl.logSkipped(rn, thisSetMatches);
-			continue;
-		}
-
-		// If this was not an ACTION evaluate next MATCH and update thisSetMatches with (AND [result])
-		uint8_t thisRuleMatches = 0;
-		uint64_t ownershipVerificationMask = 1;		// this magic value means it hasn't been computed yet -- this is done lazily the first time it's needed
-		uint8_t hardYes = (rules[rn].t >> 7) ^ 1;	// XOR with the NOT bit of the rule
-		uint8_t hardNo = (rules[rn].t >> 7) ^ 0;
-
-		switch (rt) {
-			case ZT_NETWORK_RULE_MATCH_SOURCE_ZEROTIER_ADDRESS:
-				thisRuleMatches = (uint8_t)(rules[rn].v.zt == ztSource.toInt());
-				break;
-			case ZT_NETWORK_RULE_MATCH_DEST_ZEROTIER_ADDRESS:
-				thisRuleMatches = (uint8_t)(rules[rn].v.zt == ztDest.toInt());
-				break;
-			case ZT_NETWORK_RULE_MATCH_VLAN_ID:
-				thisRuleMatches = (uint8_t)(rules[rn].v.vlanId == (uint16_t)vlanId);
-				break;
-			case ZT_NETWORK_RULE_MATCH_VLAN_PCP:
-				// NOT SUPPORTED YET
-				thisRuleMatches = (uint8_t)(rules[rn].v.vlanPcp == 0);
-				break;
-			case ZT_NETWORK_RULE_MATCH_VLAN_DEI:
-				// NOT SUPPORTED YET
-				thisRuleMatches = (uint8_t)(rules[rn].v.vlanDei == 0);
-				break;
-			case ZT_NETWORK_RULE_MATCH_MAC_SOURCE:
-				thisRuleMatches = (uint8_t)(MAC(rules[rn].v.mac, 6) == macSource);
-				break;
-			case ZT_NETWORK_RULE_MATCH_MAC_DEST:
-				thisRuleMatches = (uint8_t)(MAC(rules[rn].v.mac, 6) == macDest);
-				break;
-			case ZT_NETWORK_RULE_MATCH_IPV4_SOURCE:
-				if ((etherType == ZT_ETHERTYPE_IPV4) && (frameLen >= 20)) {
-					thisRuleMatches = (uint8_t)(InetAddress((const void*)&(rules[rn].v.ipv4.ip), 4, rules[rn].v.ipv4.mask).containsAddress(InetAddress((const void*)(frameData + 12), 4, 0)));
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-				break;
-			case ZT_NETWORK_RULE_MATCH_IPV4_DEST:
-				if ((etherType == ZT_ETHERTYPE_IPV4) && (frameLen >= 20)) {
-					thisRuleMatches = (uint8_t)(InetAddress((const void*)&(rules[rn].v.ipv4.ip), 4, rules[rn].v.ipv4.mask).containsAddress(InetAddress((const void*)(frameData + 16), 4, 0)));
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-				break;
-			case ZT_NETWORK_RULE_MATCH_IPV6_SOURCE:
-				if ((etherType == ZT_ETHERTYPE_IPV6) && (frameLen >= 40)) {
-					thisRuleMatches = (uint8_t)(InetAddress((const void*)rules[rn].v.ipv6.ip, 16, rules[rn].v.ipv6.mask).containsAddress(InetAddress((const void*)(frameData + 8), 16, 0)));
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-				break;
-			case ZT_NETWORK_RULE_MATCH_IPV6_DEST:
-				if ((etherType == ZT_ETHERTYPE_IPV6) && (frameLen >= 40)) {
-					thisRuleMatches = (uint8_t)(InetAddress((const void*)rules[rn].v.ipv6.ip, 16, rules[rn].v.ipv6.mask).containsAddress(InetAddress((const void*)(frameData + 24), 16, 0)));
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-				break;
-			case ZT_NETWORK_RULE_MATCH_IP_TOS:
-				if ((etherType == ZT_ETHERTYPE_IPV4) && (frameLen >= 20)) {
-					const uint8_t tosMasked = frameData[1] & rules[rn].v.ipTos.mask;
-					thisRuleMatches = (uint8_t)((tosMasked >= rules[rn].v.ipTos.value[0]) && (tosMasked <= rules[rn].v.ipTos.value[1]));
-				}
-				else if ((etherType == ZT_ETHERTYPE_IPV6) && (frameLen >= 40)) {
-					const uint8_t tosMasked = (((frameData[0] << 4) & 0xf0) | ((frameData[1] >> 4) & 0x0f)) & rules[rn].v.ipTos.mask;
-					thisRuleMatches = (uint8_t)((tosMasked >= rules[rn].v.ipTos.value[0]) && (tosMasked <= rules[rn].v.ipTos.value[1]));
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-				break;
-			case ZT_NETWORK_RULE_MATCH_IP_PROTOCOL:
-				if ((etherType == ZT_ETHERTYPE_IPV4) && (frameLen >= 20)) {
-					thisRuleMatches = (uint8_t)(rules[rn].v.ipProtocol == frameData[9]);
-				}
-				else if (etherType == ZT_ETHERTYPE_IPV6) {
-					unsigned int pos = 0, proto = 0;
-					if (_ipv6GetPayload(frameData, frameLen, pos, proto)) {
-						thisRuleMatches = (uint8_t)(rules[rn].v.ipProtocol == (uint8_t)proto);
-					}
-					else {
-						thisRuleMatches = hardNo;
-					}
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-				break;
-			case ZT_NETWORK_RULE_MATCH_ETHERTYPE:
-				thisRuleMatches = (uint8_t)(rules[rn].v.etherType == (uint16_t)etherType);
-				break;
-			case ZT_NETWORK_RULE_MATCH_ICMP:
-				if ((etherType == ZT_ETHERTYPE_IPV4) && (frameLen >= 20)) {
-					if (frameData[9] == 0x01) {	  // IP protocol == ICMP
-						const unsigned int ihl = (frameData[0] & 0xf) * 4;
-						if (frameLen >= (ihl + 2)) {
-							if (rules[rn].v.icmp.type == frameData[ihl]) {
-								if ((rules[rn].v.icmp.flags & 0x01) != 0) {
-									thisRuleMatches = (uint8_t)(frameData[ihl + 1] == rules[rn].v.icmp.code);
-								}
-								else {
-									thisRuleMatches = hardYes;
-								}
-							}
-							else {
-								thisRuleMatches = hardNo;
-							}
-						}
-						else {
-							thisRuleMatches = hardNo;
-						}
-					}
-					else {
-						thisRuleMatches = hardNo;
-					}
-				}
-				else if (etherType == ZT_ETHERTYPE_IPV6) {
-					unsigned int pos = 0, proto = 0;
-					if (_ipv6GetPayload(frameData, frameLen, pos, proto)) {
-						if ((proto == 0x3a) && (frameLen >= (pos + 2))) {
-							if (rules[rn].v.icmp.type == frameData[pos]) {
-								if ((rules[rn].v.icmp.flags & 0x01) != 0) {
-									thisRuleMatches = (uint8_t)(frameData[pos + 1] == rules[rn].v.icmp.code);
-								}
-								else {
-									thisRuleMatches = hardYes;
-								}
-							}
-							else {
-								thisRuleMatches = hardNo;
-							}
-						}
-						else {
-							thisRuleMatches = hardNo;
-						}
-					}
-					else {
-						thisRuleMatches = hardNo;
-					}
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-				break;
-			case ZT_NETWORK_RULE_MATCH_IP_SOURCE_PORT_RANGE:
-			case ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE:
-				if ((etherType == ZT_ETHERTYPE_IPV4) && (frameLen >= 20)) {
-					const unsigned int headerLen = 4 * (frameData[0] & 0xf);
-					int p = -1;
-					switch (frameData[9]) {	  // IP protocol number
-						// All these start with 16-bit source and destination port in that order
-						case 0x06:	 // TCP
-						case 0x11:	 // UDP
-						case 0x84:	 // SCTP
-						case 0x88:	 // UDPLite
-							if (frameLen > (headerLen + 4)) {
-								unsigned int pos = headerLen + ((rt == ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE) ? 2 : 0);
-								p = (int)frameData[pos++] << 8;
-								p |= (int)frameData[pos];
-							}
-							break;
-					}
-
-					thisRuleMatches = (p >= 0) ? (uint8_t)((p >= (int)rules[rn].v.port[0]) && (p <= (int)rules[rn].v.port[1])) : (uint8_t)0;
-				}
-				else if (etherType == ZT_ETHERTYPE_IPV6) {
-					unsigned int pos = 0, proto = 0;
-					if (_ipv6GetPayload(frameData, frameLen, pos, proto)) {
-						int p = -1;
-						switch (proto) {   // IP protocol number
-							// All these start with 16-bit source and destination port in that order
-							case 0x06:	 // TCP
-							case 0x11:	 // UDP
-							case 0x84:	 // SCTP
-							case 0x88:	 // UDPLite
-								if (frameLen > (pos + 4)) {
-									if (rt == ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE) {
-										pos += 2;
-									}
-									p = (int)frameData[pos++] << 8;
-									p |= (int)frameData[pos];
-								}
-								break;
-						}
-						thisRuleMatches = (p > 0) ? (uint8_t)((p >= (int)rules[rn].v.port[0]) && (p <= (int)rules[rn].v.port[1])) : (uint8_t)0;
-					}
-					else {
-						thisRuleMatches = hardNo;
-					}
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-				break;
-			case ZT_NETWORK_RULE_MATCH_CHARACTERISTICS: {
-				uint64_t cf = (inbound) ? ZT_RULE_PACKET_CHARACTERISTICS_INBOUND : 0ULL;
-				if (macDest.isMulticast()) {
-					cf |= ZT_RULE_PACKET_CHARACTERISTICS_MULTICAST;
-				}
-				if (macDest.isBroadcast()) {
-					cf |= ZT_RULE_PACKET_CHARACTERISTICS_BROADCAST;
-				}
-				if (ownershipVerificationMask == 1) {
-					ownershipVerificationMask = 0;
-					InetAddress src;
-					if ((etherType == ZT_ETHERTYPE_IPV4) && (frameLen >= 20)) {
-						src.set((const void*)(frameData + 12), 4, 0);
-					}
-					else if ((etherType == ZT_ETHERTYPE_IPV6) && (frameLen >= 40)) {
-						// IPv6 NDP requires special handling, since the src and dest IPs in the packet are empty or link-local.
-						if ((frameLen >= (40 + 8 + 16)) && (frameData[6] == 0x3a) && ((frameData[40] == 0x87) || (frameData[40] == 0x88))) {
-							if (frameData[40] == 0x87) {
-								// Neighbor solicitations contain no reliable source address, so we implement a small
-								// hack by considering them authenticated. Otherwise you would pretty much have to do
-								// this manually in the rule set for IPv6 to work at all.
-								ownershipVerificationMask |= ZT_RULE_PACKET_CHARACTERISTICS_SENDER_IP_AUTHENTICATED;
-							}
-							else {
-								// Neighbor advertisements on the other hand can absolutely be authenticated.
-								src.set((const void*)(frameData + 40 + 8), 16, 0);
-							}
-						}
-						else {
-							// Other IPv6 packets can be handled normally
-							src.set((const void*)(frameData + 8), 16, 0);
-						}
-					}
-					else if ((etherType == ZT_ETHERTYPE_ARP) && (frameLen >= 28)) {
-						src.set((const void*)(frameData + 14), 4, 0);
-					}
-					if (inbound) {
-						if (membership) {
-							if ((src) && (membership->hasCertificateOfOwnershipFor<InetAddress>(nconf, src))) {
-								ownershipVerificationMask |= ZT_RULE_PACKET_CHARACTERISTICS_SENDER_IP_AUTHENTICATED;
-							}
-							if (membership->hasCertificateOfOwnershipFor<MAC>(nconf, macSource)) {
-								ownershipVerificationMask |= ZT_RULE_PACKET_CHARACTERISTICS_SENDER_MAC_AUTHENTICATED;
-							}
-						}
-					}
-					else {
-						for (unsigned int i = 0; i < nconf.certificateOfOwnershipCount; ++i) {
-							if ((src) && (nconf.certificatesOfOwnership[i].owns(src))) {
-								ownershipVerificationMask |= ZT_RULE_PACKET_CHARACTERISTICS_SENDER_IP_AUTHENTICATED;
-							}
-							if (nconf.certificatesOfOwnership[i].owns(macSource)) {
-								ownershipVerificationMask |= ZT_RULE_PACKET_CHARACTERISTICS_SENDER_MAC_AUTHENTICATED;
-							}
-						}
-					}
-				}
-				cf |= ownershipVerificationMask;
-				if ((etherType == ZT_ETHERTYPE_IPV4) && (frameLen >= 20) && (frameData[9] == 0x06)) {
-					const unsigned int headerLen = 4 * (frameData[0] & 0xf);
-					cf |= (uint64_t)frameData[headerLen + 13];
-					cf |= (((uint64_t)(frameData[headerLen + 12] & 0x0f)) << 8);
-				}
-				else if (etherType == ZT_ETHERTYPE_IPV6) {
-					unsigned int pos = 0, proto = 0;
-					if (_ipv6GetPayload(frameData, frameLen, pos, proto)) {
-						if ((proto == 0x06) && (frameLen > (pos + 14))) {
-							cf |= (uint64_t)frameData[pos + 13];
-							cf |= (((uint64_t)(frameData[pos + 12] & 0x0f)) << 8);
-						}
-					}
-				}
-				thisRuleMatches = (uint8_t)((cf & rules[rn].v.characteristics) != 0);
-			} break;
-			case ZT_NETWORK_RULE_MATCH_FRAME_SIZE_RANGE:
-				thisRuleMatches = (uint8_t)((frameLen >= (unsigned int)rules[rn].v.frameSize[0]) && (frameLen <= (unsigned int)rules[rn].v.frameSize[1]));
-				break;
-			case ZT_NETWORK_RULE_MATCH_RANDOM:
-				thisRuleMatches = (uint8_t)((uint32_t)(RR->node->prng() & 0xffffffffULL) <= rules[rn].v.randomProbability);
-				break;
-			case ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE:
-			case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_AND:
-			case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_OR:
-			case ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_XOR:
-			case ZT_NETWORK_RULE_MATCH_TAGS_EQUAL: {
-				const Tag* const localTag = std::lower_bound(&(nconf.tags[0]), &(nconf.tags[nconf.tagCount]), rules[rn].v.tag.id, Tag::IdComparePredicate());
-				if ((localTag != &(nconf.tags[nconf.tagCount])) && (localTag->id() == rules[rn].v.tag.id)) {
-					const Tag* const remoteTag = ((membership) ? membership->getTag(nconf, rules[rn].v.tag.id) : (const Tag*)0);
-#ifdef ZT_TRACE
-					/*fprintf(stderr, "\tlocal tag [%u: %u] remote tag [%u: %u] match [%u]",
-							!!localTag ? localTag->id() : 0,
-							!!localTag ? localTag->value() : 0,
-							!!remoteTag ? remoteTag->id() : 0,
-							!!remoteTag ? remoteTag->value() : 0,
-							thisRuleMatches);*/
-#endif
-					if (remoteTag) {
-						const uint32_t ltv = localTag->value();
-						const uint32_t rtv = remoteTag->value();
-						if (rt == ZT_NETWORK_RULE_MATCH_TAGS_DIFFERENCE) {
-							const uint32_t diff = (ltv > rtv) ? (ltv - rtv) : (rtv - ltv);
-							thisRuleMatches = (uint8_t)(diff <= rules[rn].v.tag.value);
-						}
-						else if (rt == ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_AND) {
-							thisRuleMatches = (uint8_t)((ltv & rtv) == rules[rn].v.tag.value);
-						}
-						else if (rt == ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_OR) {
-							thisRuleMatches = (uint8_t)((ltv | rtv) == rules[rn].v.tag.value);
-						}
-						else if (rt == ZT_NETWORK_RULE_MATCH_TAGS_BITWISE_XOR) {
-							thisRuleMatches = (uint8_t)((ltv ^ rtv) == rules[rn].v.tag.value);
-						}
-						else if (rt == ZT_NETWORK_RULE_MATCH_TAGS_EQUAL) {
-							thisRuleMatches = (uint8_t)((ltv == rules[rn].v.tag.value) && (rtv == rules[rn].v.tag.value));
-						}
-						else {	 // sanity check, can't really happen
-							thisRuleMatches = hardNo;
-						}
-					}
-					else {
-						if ((inbound) && (! superAccept)) {
-							thisRuleMatches = hardNo;
-#ifdef ZT_TRACE
-							// fprintf(stderr, "\tinbound ");
-#endif
-						}
-						else {
-							// Outbound side is not strict since if we have to match both tags and
-							// we are sending a first packet to a recipient, we probably do not know
-							// about their tags yet. They will filter on inbound and we will filter
-							// once we get their tag. If we are a tee/redirect target we are also
-							// not strict since we likely do not have these tags.
-							skipDrop = 1;
-							thisRuleMatches = hardYes;
-#ifdef ZT_TRACE
-							// fprintf(stderr, "\toutbound ");
-#endif
-						}
-					}
-				}
-				else {
-					thisRuleMatches = hardNo;
-				}
-			} break;
-			case ZT_NETWORK_RULE_MATCH_TAG_SENDER:
-			case ZT_NETWORK_RULE_MATCH_TAG_RECEIVER: {
-				const Tag* const localTag = std::lower_bound(&(nconf.tags[0]), &(nconf.tags[nconf.tagCount]), rules[rn].v.tag.id, Tag::IdComparePredicate());
-#ifdef ZT_TRACE
-				/*const Tag *const remoteTag = ((membership) ? membership->getTag(nconf,rules[rn].v.tag.id) : (const Tag *)0);
-				fprintf(stderr, "\tlocal tag [%u: %u] remote tag [%u: %u] match [%u]",
-						!!localTag ? localTag->id() : 0,
-						!!localTag ? localTag->value() : 0,
-						!!remoteTag ? remoteTag->id() : 0,
-						!!remoteTag ? remoteTag->value() : 0,
-						thisRuleMatches);*/
-#endif
-				if (superAccept) {
-					skipDrop = 1;
-					thisRuleMatches = hardYes;
-				}
-				else if (((rt == ZT_NETWORK_RULE_MATCH_TAG_SENDER) && (inbound)) || ((rt == ZT_NETWORK_RULE_MATCH_TAG_RECEIVER) && (! inbound))) {
-					const Tag* const remoteTag = ((membership) ? membership->getTag(nconf, rules[rn].v.tag.id) : (const Tag*)0);
-					if (remoteTag) {
-						thisRuleMatches = (uint8_t)(remoteTag->value() == rules[rn].v.tag.value);
-					}
-					else {
-						if (rt == ZT_NETWORK_RULE_MATCH_TAG_RECEIVER) {
-							// If we are checking the receiver and this is an outbound packet, we
-							// can't be strict since we may not yet know the receiver's tag.
-							skipDrop = 1;
-							thisRuleMatches = hardYes;
-						}
-						else {
-							thisRuleMatches = hardNo;
-						}
-					}
-				}
-				else {	 // sender and outbound or receiver and inbound
-					if ((localTag != &(nconf.tags[nconf.tagCount])) && (localTag->id() == rules[rn].v.tag.id)) {
-						thisRuleMatches = (uint8_t)(localTag->value() == rules[rn].v.tag.value);
-					}
-					else {
-						thisRuleMatches = hardNo;
-					}
-				}
-			} break;
-			case ZT_NETWORK_RULE_MATCH_INTEGER_RANGE: {
-				uint64_t integer = 0;
-				const unsigned int bits = (rules[rn].v.intRange.format & 63) + 1;
-				const unsigned int bytes = ((bits + 8 - 1) / 8);   // integer ceiling of division by 8
-				if ((rules[rn].v.intRange.format & 0x80) == 0) {
-					// Big-endian
-					unsigned int idx = rules[rn].v.intRange.idx + (8 - bytes);
-					const unsigned int eof = idx + bytes;
-					if (eof <= frameLen) {
-						while (idx < eof) {
-							integer <<= 8;
-							integer |= frameData[idx++];
-						}
-					}
-					integer &= 0xffffffffffffffffULL >> (64 - bits);
-				}
-				else {
-					// Little-endian
-					unsigned int idx = rules[rn].v.intRange.idx;
-					const unsigned int eof = idx + bytes;
-					if (eof <= frameLen) {
-						while (idx < eof) {
-							integer >>= 8;
-							integer |= ((uint64_t)frameData[idx++]) << 56;
-						}
-					}
-					integer >>= (64 - bits);
-				}
-				thisRuleMatches = (uint8_t)((integer >= rules[rn].v.intRange.start) && (integer <= (rules[rn].v.intRange.start + (uint64_t)rules[rn].v.intRange.end)));
-			} break;
-
-			// The result of an unsupported MATCH is configurable at the network
-			// level via a flag.
-			default:
-				thisRuleMatches = (uint8_t)((nconf.flags & ZT_NETWORKCONFIG_FLAG_RULES_RESULT_OF_UNSUPPORTED_MATCH) != 0);
-				break;
-		}
-
-		rrl.log(rn, thisRuleMatches, thisSetMatches);
-
-		if ((rules[rn].t & 0x40)) {
-			thisSetMatches |= (thisRuleMatches ^ ((rules[rn].t >> 7) & 1));
-		}
-		else {
-			thisSetMatches &= (thisRuleMatches ^ ((rules[rn].t >> 7) & 1));
-		}
-	}
-
-	return DOZTFILTER_NO_MATCH;
-}
-
-}	// anonymous namespace
-
-const ZeroTier::MulticastGroup Network::BROADCAST(ZeroTier::MAC(0xffffffffffffULL), 0);
-
-Network::Network(const RuntimeEnvironment* renv, void* tPtr, uint64_t nwid, void* uptr, const NetworkConfig* nconf)
-	: RR(renv)
-	, _uPtr(uptr)
-	, _id(nwid)
-	, _nwidStr(OSUtils::networkIDStr(nwid))
-	, _lastAnnouncedMulticastGroupsUpstream(0)
-	, _mac(renv->identity.address(), nwid)
-	, _portInitialized(false)
-	, _lastConfigUpdate(0)
-	, _destroyed(false)
-	, _netconfFailure(NETCONF_FAILURE_NONE)
-	, _portError(0)
-	, _num_multicast_groups { Metrics::network_num_multicast_groups.Add({ { "network_id", _nwidStr } }) }
-	, _incoming_packets_accepted { Metrics::network_packets.Add({ { "direction", "rx" }, { "network_id", _nwidStr }, { "accepted", "yes" } }) }
-	, _incoming_packets_dropped { Metrics::network_packets.Add({ { "direction", "rx" }, { "network_id", _nwidStr }, { "accepted", "no" } }) }
-	, _outgoing_packets_accepted { Metrics::network_packets.Add({ { "direction", "tx" }, { "network_id", _nwidStr }, { "accepted", "yes" } }) }
-	, _outgoing_packets_dropped { Metrics::network_packets.Add({ { "direction", "tx" }, { "network_id", _nwidStr }, { "accepted", "no" } }) }
-{
-	for (int i = 0; i < ZT_NETWORK_MAX_INCOMING_UPDATES; ++i) {
-		_incomingConfigChunks[i].ts = 0;
-	}
-
-	if (nconf) {
-		this->setConfiguration(tPtr, *nconf, false);
-		_lastConfigUpdate = 0;	 // still want to re-request since it's likely outdated
-	}
-	else {
-		uint64_t tmp[2];
-		tmp[0] = nwid;
-		tmp[1] = 0;
-
-		bool got = false;
-		Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>* dict = new Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>();
+		// Save a one-byte CR to persist membership in the test network
+		RR->node->dataStorePut(confn,"\n",1,false);
+	} else {
+		bool gotConf = false;
 		try {
-			int n = RR->node->stateObjectGet(tPtr, ZT_STATE_OBJECT_NETWORK_CONFIG, tmp, dict->unsafeData(), ZT_NETWORKCONFIG_DICT_CAPACITY - 1);
-			if (n > 1) {
-				NetworkConfig* nconf = new NetworkConfig();
-				try {
-					if (nconf->fromDictionary(*dict)) {
-						this->setConfiguration(tPtr, *nconf, false);
-						_lastConfigUpdate = 0;	 // still want to re-request an update since it's likely outdated
-						got = true;
-					}
-				}
-				catch (...) {
-				}
-				delete nconf;
+			std::string conf(RR->node->dataStoreGet(confn));
+			if (conf.length()) {
+				setConfiguration(Dictionary(conf),false);
+				_lastConfigUpdate = 0; // we still want to re-request a new config from the network
+				gotConf = true;
 			}
-		}
-		catch (...) {
-		}
-		delete dict;
+		} catch ( ... ) {} // ignore invalids, we'll re-request
 
-		if (! got) {
-			RR->node->stateObjectPut(tPtr, ZT_STATE_OBJECT_NETWORK_CONFIG, tmp, "\n", 1);
+		if (!gotConf) {
+			// Save a one-byte CR to persist membership while we request a real netconf
+			RR->node->dataStorePut(confn,"\n",1,false);
 		}
 	}
 
-	if (! _portInitialized) {
+	if (!_portInitialized) {
 		ZT_VirtualNetworkConfig ctmp;
-		memset(&ctmp, 0, sizeof(ZT_VirtualNetworkConfig));
 		_externalConfig(&ctmp);
-		_portError = RR->node->configureVirtualNetworkPort(tPtr, _id, &_uPtr, ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP, &ctmp);
+		_portError = RR->node->configureVirtualNetworkPort(_id,&_uPtr,ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP,&ctmp);
 		_portInitialized = true;
 	}
-
-	Metrics::network_num_joined++;
 }
 
 Network::~Network()
 {
 	ZT_VirtualNetworkConfig ctmp;
 	_externalConfig(&ctmp);
-	Metrics::network_num_joined--;
+
+	char n[128];
 	if (_destroyed) {
-		// This is done in Node::leave() so we can pass tPtr properly
-		// RR->node->configureVirtualNetworkPort((void *)0,_id,&_uPtr,ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY,&ctmp);
-	}
-	else {
-		RR->node->configureVirtualNetworkPort((void*)0, _id, &_uPtr, ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN, &ctmp);
+		RR->node->configureVirtualNetworkPort(_id,&_uPtr,ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY,&ctmp);
+		Utils::snprintf(n,sizeof(n),"networks.d/%.16llx.conf",_id);
+		RR->node->dataStoreDelete(n);
+	} else {
+		RR->node->configureVirtualNetworkPort(_id,&_uPtr,ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN,&ctmp);
 	}
 }
 
-bool Network::filterOutgoingPacket(
-	void* tPtr,
-	const bool noTee,
-	const Address& ztSource,
-	const Address& ztDest,
-	const MAC& macSource,
-	const MAC& macDest,
-	const uint8_t* frameData,
-	const unsigned int frameLen,
-	const unsigned int etherType,
-	const unsigned int vlanId,
-	uint8_t& qosBucket)
-{
-	Address ztFinalDest(ztDest);
-	int localCapabilityIndex = -1;
-	int accept = 0;
-	Trace::RuleResultLog rrl, crrl;
-	Address cc;
-	unsigned int ccLength = 0;
-	bool ccWatch = false;
-
-	Mutex::Lock _l(_lock);
-
-	Membership* const membership = (ztDest) ? _memberships.get(ztDest) : (Membership*)0;
-
-	switch (_doZtFilter(RR, rrl, _config, membership, false, ztSource, ztFinalDest, macSource, macDest, frameData, frameLen, etherType, vlanId, _config.rules, _config.ruleCount, cc, ccLength, ccWatch, qosBucket)) {
-		case DOZTFILTER_NO_MATCH: {
-			for (unsigned int c = 0; c < _config.capabilityCount; ++c) {
-				ztFinalDest = ztDest;	// sanity check, shouldn't be possible if there was no match
-				Address cc2;
-				unsigned int ccLength2 = 0;
-				bool ccWatch2 = false;
-				switch (_doZtFilter(
-					RR,
-					crrl,
-					_config,
-					membership,
-					false,
-					ztSource,
-					ztFinalDest,
-					macSource,
-					macDest,
-					frameData,
-					frameLen,
-					etherType,
-					vlanId,
-					_config.capabilities[c].rules(),
-					_config.capabilities[c].ruleCount(),
-					cc2,
-					ccLength2,
-					ccWatch2,
-					qosBucket)) {
-					case DOZTFILTER_NO_MATCH:
-					case DOZTFILTER_DROP:	// explicit DROP in a capability just terminates its evaluation and is an anti-pattern
-						break;
-
-					case DOZTFILTER_REDIRECT:	// interpreted as ACCEPT but ztFinalDest will have been changed in _doZtFilter()
-					case DOZTFILTER_ACCEPT:
-					case DOZTFILTER_SUPER_ACCEPT:	// no difference in behavior on outbound side in capabilities
-						localCapabilityIndex = (int)c;
-						accept = 1;
-
-						if ((! noTee) && (cc2)) {
-							Packet outp(cc2, RR->identity.address(), Packet::VERB_EXT_FRAME);
-							outp.append(_id);
-							outp.append((uint8_t)(ccWatch2 ? 0x16 : 0x02));
-							macDest.appendTo(outp);
-							macSource.appendTo(outp);
-							outp.append((uint16_t)etherType);
-							outp.append(frameData, ccLength2);
-							outp.compress();
-							RR->sw->send(tPtr, outp, true);
-						}
-
-						break;
-				}
-				if (accept) {
-					break;
-				}
-			}
-		} break;
-
-		case DOZTFILTER_DROP:
-			if (_config.remoteTraceTarget) {
-				RR->t->networkFilter(tPtr, *this, rrl, (Trace::RuleResultLog*)0, (Capability*)0, ztSource, ztDest, macSource, macDest, frameData, frameLen, etherType, vlanId, noTee, false, 0);
-			}
-			return false;
-
-		case DOZTFILTER_REDIRECT:	// interpreted as ACCEPT but ztFinalDest will have been changed in _doZtFilter()
-		case DOZTFILTER_ACCEPT:
-			accept = 1;
-			break;
-
-		case DOZTFILTER_SUPER_ACCEPT:
-			accept = 2;
-			break;
-	}
-
-	if (accept) {
-		_outgoing_packets_accepted++;
-		if ((! noTee) && (cc)) {
-			Packet outp(cc, RR->identity.address(), Packet::VERB_EXT_FRAME);
-			outp.append(_id);
-			outp.append((uint8_t)(ccWatch ? 0x16 : 0x02));
-			macDest.appendTo(outp);
-			macSource.appendTo(outp);
-			outp.append((uint16_t)etherType);
-			outp.append(frameData, ccLength);
-			outp.compress();
-			RR->sw->send(tPtr, outp, true);
-		}
-
-		if ((ztDest != ztFinalDest) && (ztFinalDest)) {
-			Packet outp(ztFinalDest, RR->identity.address(), Packet::VERB_EXT_FRAME);
-			outp.append(_id);
-			outp.append((uint8_t)0x04);
-			macDest.appendTo(outp);
-			macSource.appendTo(outp);
-			outp.append((uint16_t)etherType);
-			outp.append(frameData, frameLen);
-			outp.compress();
-			RR->sw->send(tPtr, outp, true);
-
-			if (_config.remoteTraceTarget) {
-				RR->t->networkFilter(
-					tPtr,
-					*this,
-					rrl,
-					(localCapabilityIndex >= 0) ? &crrl : (Trace::RuleResultLog*)0,
-					(localCapabilityIndex >= 0) ? &(_config.capabilities[localCapabilityIndex]) : (Capability*)0,
-					ztSource,
-					ztDest,
-					macSource,
-					macDest,
-					frameData,
-					frameLen,
-					etherType,
-					vlanId,
-					noTee,
-					false,
-					0);
-			}
-			return false;	// DROP locally, since we redirected
-		}
-		else {
-			if (_config.remoteTraceTarget) {
-				RR->t->networkFilter(
-					tPtr,
-					*this,
-					rrl,
-					(localCapabilityIndex >= 0) ? &crrl : (Trace::RuleResultLog*)0,
-					(localCapabilityIndex >= 0) ? &(_config.capabilities[localCapabilityIndex]) : (Capability*)0,
-					ztSource,
-					ztDest,
-					macSource,
-					macDest,
-					frameData,
-					frameLen,
-					etherType,
-					vlanId,
-					noTee,
-					false,
-					1);
-			}
-			return true;
-		}
-	}
-	else {
-		_outgoing_packets_dropped++;
-		if (_config.remoteTraceTarget) {
-			RR->t->networkFilter(
-				tPtr,
-				*this,
-				rrl,
-				(localCapabilityIndex >= 0) ? &crrl : (Trace::RuleResultLog*)0,
-				(localCapabilityIndex >= 0) ? &(_config.capabilities[localCapabilityIndex]) : (Capability*)0,
-				ztSource,
-				ztDest,
-				macSource,
-				macDest,
-				frameData,
-				frameLen,
-				etherType,
-				vlanId,
-				noTee,
-				false,
-				0);
-		}
-		return false;
-	}
-}
-
-int Network::filterIncomingPacket(
-	void* tPtr,
-	const SharedPtr<Peer>& sourcePeer,
-	const Address& ztDest,
-	const MAC& macSource,
-	const MAC& macDest,
-	const uint8_t* frameData,
-	const unsigned int frameLen,
-	const unsigned int etherType,
-	const unsigned int vlanId)
-{
-	Address ztFinalDest(ztDest);
-	Trace::RuleResultLog rrl, crrl;
-	int accept = 0;
-	Address cc;
-	unsigned int ccLength = 0;
-	bool ccWatch = false;
-	const Capability* c = (Capability*)0;
-
-	uint8_t qosBucket = 255;   // For incoming packets this is a dummy value
-
-	Mutex::Lock _l(_lock);
-
-	Membership& membership = _membership(sourcePeer->address());
-
-	switch (_doZtFilter(RR, rrl, _config, &membership, true, sourcePeer->address(), ztFinalDest, macSource, macDest, frameData, frameLen, etherType, vlanId, _config.rules, _config.ruleCount, cc, ccLength, ccWatch, qosBucket)) {
-		case DOZTFILTER_NO_MATCH: {
-			Membership::CapabilityIterator mci(membership, _config);
-			while ((c = mci.next())) {
-				ztFinalDest = ztDest;	// sanity check, should be unmodified if there was no match
-				Address cc2;
-				unsigned int ccLength2 = 0;
-				bool ccWatch2 = false;
-				switch (_doZtFilter(RR, crrl, _config, &membership, true, sourcePeer->address(), ztFinalDest, macSource, macDest, frameData, frameLen, etherType, vlanId, c->rules(), c->ruleCount(), cc2, ccLength2, ccWatch2, qosBucket)) {
-					case DOZTFILTER_NO_MATCH:
-					case DOZTFILTER_DROP:	// explicit DROP in a capability just terminates its evaluation and is an anti-pattern
-						break;
-					case DOZTFILTER_REDIRECT:	// interpreted as ACCEPT but ztDest will have been changed in _doZtFilter()
-					case DOZTFILTER_ACCEPT:
-						accept = 1;	  // ACCEPT
-						break;
-					case DOZTFILTER_SUPER_ACCEPT:
-						accept = 2;	  // super-ACCEPT
-						break;
-				}
-
-				if (accept) {
-					if (cc2) {
-						Packet outp(cc2, RR->identity.address(), Packet::VERB_EXT_FRAME);
-						outp.append(_id);
-						outp.append((uint8_t)(ccWatch2 ? 0x1c : 0x08));
-						macDest.appendTo(outp);
-						macSource.appendTo(outp);
-						outp.append((uint16_t)etherType);
-						outp.append(frameData, ccLength2);
-						outp.compress();
-						RR->sw->send(tPtr, outp, true);
-					}
-					break;
-				}
-			}
-		} break;
-
-		case DOZTFILTER_DROP:
-			if (_config.remoteTraceTarget) {
-				RR->t->networkFilter(tPtr, *this, rrl, (Trace::RuleResultLog*)0, (Capability*)0, sourcePeer->address(), ztDest, macSource, macDest, frameData, frameLen, etherType, vlanId, false, true, 0);
-			}
-			return 0;	// DROP
-
-		case DOZTFILTER_REDIRECT:	// interpreted as ACCEPT but ztFinalDest will have been changed in _doZtFilter()
-		case DOZTFILTER_ACCEPT:
-			accept = 1;	  // ACCEPT
-			break;
-		case DOZTFILTER_SUPER_ACCEPT:
-			accept = 2;	  // super-ACCEPT
-			break;
-	}
-
-	if (accept) {
-		_incoming_packets_accepted++;
-		if (cc) {
-			Packet outp(cc, RR->identity.address(), Packet::VERB_EXT_FRAME);
-			outp.append(_id);
-			outp.append((uint8_t)(ccWatch ? 0x1c : 0x08));
-			macDest.appendTo(outp);
-			macSource.appendTo(outp);
-			outp.append((uint16_t)etherType);
-			outp.append(frameData, ccLength);
-			outp.compress();
-			RR->sw->send(tPtr, outp, true);
-		}
-
-		if ((ztDest != ztFinalDest) && (ztFinalDest)) {
-			Packet outp(ztFinalDest, RR->identity.address(), Packet::VERB_EXT_FRAME);
-			outp.append(_id);
-			outp.append((uint8_t)0x0a);
-			macDest.appendTo(outp);
-			macSource.appendTo(outp);
-			outp.append((uint16_t)etherType);
-			outp.append(frameData, frameLen);
-			outp.compress();
-			RR->sw->send(tPtr, outp, true);
-
-			if (_config.remoteTraceTarget) {
-				RR->t->networkFilter(tPtr, *this, rrl, (c) ? &crrl : (Trace::RuleResultLog*)0, c, sourcePeer->address(), ztDest, macSource, macDest, frameData, frameLen, etherType, vlanId, false, true, 0);
-			}
-			return 0;	// DROP locally, since we redirected
-		}
-	}
-	else {
-		_incoming_packets_dropped++;
-	}
-
-	if (_config.remoteTraceTarget) {
-		RR->t->networkFilter(tPtr, *this, rrl, (c) ? &crrl : (Trace::RuleResultLog*)0, c, sourcePeer->address(), ztDest, macSource, macDest, frameData, frameLen, etherType, vlanId, false, true, accept);
-	}
-	return accept;
-}
-
-bool Network::subscribedToMulticastGroup(const MulticastGroup& mg, bool includeBridgedGroups) const
+bool Network::subscribedToMulticastGroup(const MulticastGroup &mg,bool includeBridgedGroups) const
 {
 	Mutex::Lock _l(_lock);
-	if (std::binary_search(_myMulticastGroups.begin(), _myMulticastGroups.end(), mg)) {
+	if (std::binary_search(_myMulticastGroups.begin(),_myMulticastGroups.end(),mg))
 		return true;
-	}
-	else if (includeBridgedGroups) {
+	else if (includeBridgedGroups)
 		return _multicastGroupsBehindMe.contains(mg);
-	}
-	return false;
+	else return false;
 }
 
-void Network::multicastSubscribe(void* tPtr, const MulticastGroup& mg)
+void Network::multicastSubscribe(const MulticastGroup &mg)
 {
-	Mutex::Lock _l(_lock);
-	if (! std::binary_search(_myMulticastGroups.begin(), _myMulticastGroups.end(), mg)) {
-		_myMulticastGroups.insert(std::upper_bound(_myMulticastGroups.begin(), _myMulticastGroups.end(), mg), mg);
-		_sendUpdatesToMembers(tPtr, &mg);
-		_num_multicast_groups++;
-	}
-}
-
-void Network::multicastUnsubscribe(const MulticastGroup& mg)
-{
-	Mutex::Lock _l(_lock);
-	std::vector<MulticastGroup>::iterator i(std::lower_bound(_myMulticastGroups.begin(), _myMulticastGroups.end(), mg));
-	if ((i != _myMulticastGroups.end()) && (*i == mg)) {
-		_myMulticastGroups.erase(i);
-		_num_multicast_groups--;
-	}
-}
-
-uint64_t Network::handleConfigChunk(void* tPtr, const uint64_t packetId, const Address& source, const Buffer<ZT_PROTO_MAX_PACKET_LENGTH>& chunk, unsigned int ptr)
-{
-	if (_destroyed) {
-		return 0;
-	}
-
-	const unsigned int start = ptr;
-
-	ptr += 8;	// skip network ID, which is already obviously known
-	const unsigned int chunkLen = chunk.at<uint16_t>(ptr);
-	ptr += 2;
-	const void* chunkData = chunk.field(ptr, chunkLen);
-	ptr += chunkLen;
-
-	NetworkConfig* nc = (NetworkConfig*)0;
-	uint64_t configUpdateId;
 	{
 		Mutex::Lock _l(_lock);
-
-		_IncomingConfigChunk* c = (_IncomingConfigChunk*)0;
-		uint64_t chunkId = 0;
-		unsigned long totalLength, chunkIndex;
-		if (ptr < chunk.size()) {
-			const bool fastPropagate = ((chunk[ptr++] & 0x01) != 0);
-			configUpdateId = chunk.at<uint64_t>(ptr);
-			ptr += 8;
-			totalLength = chunk.at<uint32_t>(ptr);
-			ptr += 4;
-			chunkIndex = chunk.at<uint32_t>(ptr);
-			ptr += 4;
-
-			if (((chunkIndex + chunkLen) > totalLength) || (totalLength >= ZT_NETWORKCONFIG_DICT_CAPACITY)) {	// >= since we need room for a null at the end
-				return 0;
-			}
-			if ((chunk[ptr] != 1) || (chunk.at<uint16_t>(ptr + 1) != ZT_ECC_SIGNATURE_LEN)) {
-				return 0;
-			}
-			const uint8_t* sig = reinterpret_cast<const uint8_t*>(chunk.field(ptr + 3, ZT_ECC_SIGNATURE_LEN));
-
-			// We can use the signature, which is unique per chunk, to get a per-chunk ID for local deduplication use
-			for (unsigned int i = 0; i < 16; ++i) {
-				reinterpret_cast<uint8_t*>(&chunkId)[i & 7] ^= sig[i];
-			}
-
-			// Find existing or new slot for this update and check if this is a duplicate chunk
-			for (int i = 0; i < ZT_NETWORK_MAX_INCOMING_UPDATES; ++i) {
-				if (_incomingConfigChunks[i].updateId == configUpdateId) {
-					c = &(_incomingConfigChunks[i]);
-
-					for (unsigned long j = 0; j < c->haveChunks; ++j) {
-						if (c->haveChunkIds[j] == chunkId) {
-							return 0;
-						}
-					}
-
-					break;
-				}
-				else if ((! c) || (_incomingConfigChunks[i].ts < c->ts)) {
-					c = &(_incomingConfigChunks[i]);
-				}
-			}
-
-			// If it's not a duplicate, check chunk signature
-			const Identity controllerId(RR->topology->getIdentity(tPtr, controller()));
-			if (! controllerId) {	// we should always have the controller identity by now, otherwise how would we have queried it the first time?
-				return 0;
-			}
-			if (! controllerId.verify(chunk.field(start, ptr - start), ptr - start, sig, ZT_ECC_SIGNATURE_LEN)) {
-				return 0;
-			}
-
-			// New properly verified chunks can be flooded "virally" through the network
-			if (fastPropagate) {
-				Address* a = (Address*)0;
-				Membership* m = (Membership*)0;
-				Hashtable<Address, Membership>::Iterator i(_memberships);
-				while (i.next(a, m)) {
-					if ((*a != source) && (*a != controller())) {
-						Packet outp(*a, RR->identity.address(), Packet::VERB_NETWORK_CONFIG);
-						outp.append(reinterpret_cast<const uint8_t*>(chunk.data()) + start, chunk.size() - start);
-						RR->sw->send(tPtr, outp, true);
-					}
-				}
-			}
-		}
-		else if ((source == controller()) || (! source)) {	 // since old chunks aren't signed, only accept from controller itself (or via cluster backplane)
-			// Legacy support for OK(NETWORK_CONFIG_REQUEST) from older controllers
-			chunkId = packetId;
-			configUpdateId = chunkId;
-			totalLength = chunkLen;
-			chunkIndex = 0;
-
-			if (totalLength >= ZT_NETWORKCONFIG_DICT_CAPACITY) {
-				return 0;
-			}
-
-			for (int i = 0; i < ZT_NETWORK_MAX_INCOMING_UPDATES; ++i) {
-				if ((! c) || (_incomingConfigChunks[i].ts < c->ts)) {
-					c = &(_incomingConfigChunks[i]);
-				}
-			}
-		}
-		else {
-			// Single-chunk unsigned legacy configs are only allowed from the controller itself
-			return 0;
-		}
-
-		++c->ts;   // newer is higher, that's all we need
-
-		if (c->updateId != configUpdateId) {
-			c->updateId = configUpdateId;
-			c->haveChunks = 0;
-			c->haveBytes = 0;
-		}
-		if (c->haveChunks >= ZT_NETWORK_MAX_UPDATE_CHUNKS) {
-			return false;
-		}
-		c->haveChunkIds[c->haveChunks++] = chunkId;
-
-		memcpy(c->data.unsafeData() + chunkIndex, chunkData, chunkLen);
-		c->haveBytes += chunkLen;
-
-		if (c->haveBytes == totalLength) {
-			c->data.unsafeData()[c->haveBytes] = (char)0;	// ensure null terminated
-
-			nc = new NetworkConfig();
-			try {
-				if (! nc->fromDictionary(c->data)) {
-					delete nc;
-					nc = (NetworkConfig*)0;
-				}
-			}
-			catch (...) {
-				delete nc;
-				nc = (NetworkConfig*)0;
-			}
-		}
+		if (std::binary_search(_myMulticastGroups.begin(),_myMulticastGroups.end(),mg))
+			return;
+		_myMulticastGroups.push_back(mg);
+		std::sort(_myMulticastGroups.begin(),_myMulticastGroups.end());
 	}
-
-	if (nc) {
-		this->setConfiguration(tPtr, *nc, true);
-		delete nc;
-		return configUpdateId;
-	}
-	else {
-		return 0;
-	}
-
-	return 0;
+	_announceMulticastGroups();
 }
 
-int Network::setConfiguration(void* tPtr, const NetworkConfig& nconf, bool saveToDisk)
+void Network::multicastUnsubscribe(const MulticastGroup &mg)
 {
-	if (_destroyed) {
-		return 0;
-	}
-
-	// _lock is NOT locked when this is called
-	try {
-		if ((nconf.issuedTo != RR->identity.address()) || (nconf.networkId != _id)) {
-			return 0;	// invalid config that is not for us or not for this network
-		}
-		if (_config == nconf) {
-			return 1;	// OK config, but duplicate of what we already have
-		}
-
-		ZT_VirtualNetworkConfig ctmp;
-		bool oldPortInitialized;
-		{	// do things that require lock here, but unlock before calling callbacks
-			Mutex::Lock _l(_lock);
-
-			_config = nconf;
-			_lastConfigUpdate = RR->node->now();
-			_netconfFailure = NETCONF_FAILURE_NONE;
-
-			oldPortInitialized = _portInitialized;
-			_portInitialized = true;
-
-			_externalConfig(&ctmp);
-		}
-
-		_portError = RR->node->configureVirtualNetworkPort(tPtr, _id, &_uPtr, (oldPortInitialized) ? ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE : ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP, &ctmp);
-		_authenticationURL = nconf.authenticationURL;
-
-		if (saveToDisk) {
-			Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>* const d = new Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>();
-			try {
-				if (nconf.toDictionary(*d, false)) {
-					uint64_t tmp[2];
-					tmp[0] = _id;
-					tmp[1] = 0;
-					RR->node->stateObjectPut(tPtr, ZT_STATE_OBJECT_NETWORK_CONFIG, tmp, d->data(), d->sizeBytes());
-				}
-			}
-			catch (...) {
-			}
-			delete d;
-		}
-
-		return 2;	// OK and configuration has changed
-	}
-	catch (...) {
-	}	// ignore invalid configs
-	return 0;
-}
-
-void Network::requestConfiguration(void* tPtr)
-{
-	if (_destroyed) {
-		return;
-	}
-
-	if ((_id >> 56) == 0xff) {
-		if ((_id & 0xffffff) == 0) {
-			const uint16_t startPortRange = (uint16_t)((_id >> 40) & 0xffff);
-			const uint16_t endPortRange = (uint16_t)((_id >> 24) & 0xffff);
-			if (endPortRange >= startPortRange) {
-				NetworkConfig* const nconf = new NetworkConfig();
-
-				nconf->networkId = _id;
-				nconf->timestamp = RR->node->now();
-				nconf->credentialTimeMaxDelta = ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MAX_MAX_DELTA;
-				nconf->revision = 1;
-				nconf->issuedTo = RR->identity.address();
-				nconf->flags = ZT_NETWORKCONFIG_FLAG_ENABLE_IPV6_NDP_EMULATION;
-				nconf->mtu = ZT_DEFAULT_MTU;
-				nconf->multicastLimit = 0;
-				nconf->staticIpCount = 1;
-				nconf->ruleCount = 14;
-				nconf->staticIps[0] = InetAddress::makeIpv66plane(_id, RR->identity.address().toInt());
-
-				// Drop everything but IPv6
-				nconf->rules[0].t = (uint8_t)ZT_NETWORK_RULE_MATCH_ETHERTYPE | 0x80;   // NOT
-				nconf->rules[0].v.etherType = 0x86dd;								   // IPv6
-				nconf->rules[1].t = (uint8_t)ZT_NETWORK_RULE_ACTION_DROP;
-
-				// Allow ICMPv6
-				nconf->rules[2].t = (uint8_t)ZT_NETWORK_RULE_MATCH_IP_PROTOCOL;
-				nconf->rules[2].v.ipProtocol = 0x3a;   // ICMPv6
-				nconf->rules[3].t = (uint8_t)ZT_NETWORK_RULE_ACTION_ACCEPT;
-
-				// Allow destination ports within range
-				nconf->rules[4].t = (uint8_t)ZT_NETWORK_RULE_MATCH_IP_PROTOCOL;
-				nconf->rules[4].v.ipProtocol = 0x11;									 // UDP
-				nconf->rules[5].t = (uint8_t)ZT_NETWORK_RULE_MATCH_IP_PROTOCOL | 0x40;	 // OR
-				nconf->rules[5].v.ipProtocol = 0x06;									 // TCP
-				nconf->rules[6].t = (uint8_t)ZT_NETWORK_RULE_MATCH_IP_DEST_PORT_RANGE;
-				nconf->rules[6].v.port[0] = startPortRange;
-				nconf->rules[6].v.port[1] = endPortRange;
-				nconf->rules[7].t = (uint8_t)ZT_NETWORK_RULE_ACTION_ACCEPT;
-
-				// Allow non-SYN TCP packets to permit non-connection-initiating traffic
-				nconf->rules[8].t = (uint8_t)ZT_NETWORK_RULE_MATCH_CHARACTERISTICS | 0x80;	 // NOT
-				nconf->rules[8].v.characteristics = ZT_RULE_PACKET_CHARACTERISTICS_TCP_SYN;
-				nconf->rules[9].t = (uint8_t)ZT_NETWORK_RULE_ACTION_ACCEPT;
-
-				// Also allow SYN+ACK which are replies to SYN
-				nconf->rules[10].t = (uint8_t)ZT_NETWORK_RULE_MATCH_CHARACTERISTICS;
-				nconf->rules[10].v.characteristics = ZT_RULE_PACKET_CHARACTERISTICS_TCP_SYN;
-				nconf->rules[11].t = (uint8_t)ZT_NETWORK_RULE_MATCH_CHARACTERISTICS;
-				nconf->rules[11].v.characteristics = ZT_RULE_PACKET_CHARACTERISTICS_TCP_ACK;
-				nconf->rules[12].t = (uint8_t)ZT_NETWORK_RULE_ACTION_ACCEPT;
-
-				nconf->rules[13].t = (uint8_t)ZT_NETWORK_RULE_ACTION_DROP;
-
-				nconf->type = ZT_NETWORK_TYPE_PUBLIC;
-
-				nconf->name[0] = 'a';
-				nconf->name[1] = 'd';
-				nconf->name[2] = 'h';
-				nconf->name[3] = 'o';
-				nconf->name[4] = 'c';
-				nconf->name[5] = '-';
-				Utils::hex((uint16_t)startPortRange, nconf->name + 6);
-				nconf->name[10] = '-';
-				Utils::hex((uint16_t)endPortRange, nconf->name + 11);
-				nconf->name[15] = (char)0;
-
-				this->setConfiguration(tPtr, *nconf, false);
-				delete nconf;
-			}
-			else {
-				this->setNotFound(tPtr);
-			}
-		}
-		else if ((_id & 0xff) == 0x01) {
-			// ffAAaaaaaaaaaa01 -- where AA is the IPv4 /8 to use and aaaaaaaaaa is the anchor node for multicast gather and replication
-			const uint64_t myAddress = RR->identity.address().toInt();
-			const uint64_t networkHub = (_id >> 8) & 0xffffffffffULL;
-
-			uint8_t ipv4[4];
-			ipv4[0] = (uint8_t)((_id >> 48) & 0xff);
-			ipv4[1] = (uint8_t)((myAddress >> 16) & 0xff);
-			ipv4[2] = (uint8_t)((myAddress >> 8) & 0xff);
-			ipv4[3] = (uint8_t)(myAddress & 0xff);
-
-			char v4ascii[24];
-			Utils::decimal(ipv4[0], v4ascii);
-
-			NetworkConfig* const nconf = new NetworkConfig();
-
-			nconf->networkId = _id;
-			nconf->timestamp = RR->node->now();
-			nconf->credentialTimeMaxDelta = ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MAX_MAX_DELTA;
-			nconf->revision = 1;
-			nconf->issuedTo = RR->identity.address();
-			nconf->flags = ZT_NETWORKCONFIG_FLAG_ENABLE_IPV6_NDP_EMULATION;
-			nconf->mtu = ZT_DEFAULT_MTU;
-			nconf->multicastLimit = 1024;
-			nconf->specialistCount = (networkHub == 0) ? 0 : 1;
-			nconf->staticIpCount = 2;
-			nconf->ruleCount = 1;
-
-			if (networkHub != 0) {
-				nconf->specialists[0] = networkHub;
-			}
-
-			nconf->staticIps[0] = InetAddress::makeIpv66plane(_id, myAddress);
-			nconf->staticIps[1].set(ipv4, 4, 8);
-
-			nconf->rules[0].t = (uint8_t)ZT_NETWORK_RULE_ACTION_ACCEPT;
-
-			nconf->type = ZT_NETWORK_TYPE_PUBLIC;
-
-			nconf->name[0] = 'a';
-			nconf->name[1] = 'd';
-			nconf->name[2] = 'h';
-			nconf->name[3] = 'o';
-			nconf->name[4] = 'c';
-			nconf->name[5] = '-';
-			unsigned long nn = 6;
-			while ((nconf->name[nn] = v4ascii[nn - 6])) {
-				++nn;
-			}
-			nconf->name[nn++] = '.';
-			nconf->name[nn++] = '0';
-			nconf->name[nn++] = '.';
-			nconf->name[nn++] = '0';
-			nconf->name[nn++] = '.';
-			nconf->name[nn++] = '0';
-			nconf->name[nn++] = (char)0;
-
-			this->setConfiguration(tPtr, *nconf, false);
-			delete nconf;
-		}
-		return;
-	}
-
-	const Address ctrl(controller());
-
-	Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY> rmd;
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_VERSION, (uint64_t)ZT_NETWORKCONFIG_VERSION);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_VENDOR, (uint64_t)ZT_VENDOR_ZEROTIER);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_PROTOCOL_VERSION, (uint64_t)ZT_PROTO_VERSION);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MAJOR_VERSION, (uint64_t)ZEROTIER_ONE_VERSION_MAJOR);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MINOR_VERSION, (uint64_t)ZEROTIER_ONE_VERSION_MINOR);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_REVISION, (uint64_t)ZEROTIER_ONE_VERSION_REVISION);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_MAX_NETWORK_RULES, (uint64_t)ZT_MAX_NETWORK_RULES);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_MAX_NETWORK_CAPABILITIES, (uint64_t)ZT_MAX_NETWORK_CAPABILITIES);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_MAX_CAPABILITY_RULES, (uint64_t)ZT_MAX_CAPABILITY_RULES);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_MAX_NETWORK_TAGS, (uint64_t)ZT_MAX_NETWORK_TAGS);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_FLAGS, (uint64_t)0);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_RULES_ENGINE_REV, (uint64_t)ZT_RULES_ENGINE_REVISION);
-	rmd.add(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_OS_ARCH, ZT_TARGET_NAME);
-
-	RR->t->networkConfigRequestSent(tPtr, *this, ctrl);
-
-	if (ctrl == RR->identity.address()) {
-		if (RR->localNetworkController) {
-			RR->localNetworkController->request(_id, InetAddress(), 0xffffffffffffffffULL, RR->identity, rmd);
-		}
-		else {
-			this->setNotFound(tPtr);
-		}
-		return;
-	}
-
-	Packet outp(ctrl, RR->identity.address(), Packet::VERB_NETWORK_CONFIG_REQUEST);
-	outp.append((uint64_t)_id);
-	const unsigned int rmdSize = rmd.sizeBytes();
-	outp.append((uint16_t)rmdSize);
-	outp.append((const void*)rmd.data(), rmdSize);
-	if (_config) {
-		outp.append((uint64_t)_config.revision);
-		outp.append((uint64_t)_config.timestamp);
-	}
-	else {
-		outp.append((unsigned char)0, 16);
-	}
-	outp.compress();
-	RR->node->expectReplyTo(outp.packetId());
-	RR->sw->send(tPtr, outp, true);
-}
-
-bool Network::gate(void* tPtr, const SharedPtr<Peer>& peer)
-{
-	const int64_t now = RR->node->now();
-	// int64_t comTimestamp = 0;
-	// int64_t comRevocationThreshold = 0;
 	Mutex::Lock _l(_lock);
-	try {
-		if (_config) {
-			Membership* m = _memberships.get(peer->address());
-			// if (m) {
-			//	comTimestamp = m->comTimestamp();
-			//	comRevocationThreshold = m->comRevocationThreshold();
-			// }
-			if ((_config.isPublic()) || ((m) && (m->isAllowedOnNetwork(_config, peer->identity())))) {
-				if (! m) {
-					m = &(_membership(peer->address()));
-				}
-				if (m->multicastLikeGate(now)) {
-					_announceMulticastGroupsTo(tPtr, peer->address(), _allMulticastGroups());
-				}
-				return true;
-			}
-		}
+	std::vector<MulticastGroup> nmg;
+	for(std::vector<MulticastGroup>::const_iterator i(_myMulticastGroups.begin());i!=_myMulticastGroups.end();++i) {
+		if (*i != mg)
+			nmg.push_back(*i);
 	}
-	catch (...) {
-	}
-	// printf("%.16llx %.10llx not allowed, COM ts %lld revocation %lld\n", _id, peer->address().toInt(), comTimestamp, comRevocationThreshold); fflush(stdout);
+	if (nmg.size() != _myMulticastGroups.size())
+		_myMulticastGroups.swap(nmg);
+}
 
+bool Network::tryAnnounceMulticastGroupsTo(const SharedPtr<Peer> &peer)
+{
+	Mutex::Lock _l(_lock);
+	if (
+	    (_isAllowed(peer)) ||
+	    (peer->address() == this->controller()) ||
+	    (RR->topology->isRoot(peer->identity()))
+	   ) {
+		_announceMulticastGroupsTo(peer,_allMulticastGroups());
+		return true;
+	}
 	return false;
 }
 
-bool Network::recentlyAssociatedWith(const Address& addr)
+bool Network::applyConfiguration(const NetworkConfig &conf)
 {
-	Mutex::Lock _l(_lock);
-	const Membership* m = _memberships.get(addr);
-	return ((m) && (m->recentlyAssociated(RR->node->now())));
+	if (_destroyed) // sanity check
+		return false;
+	try {
+		if ((conf.networkId() == _id)&&(conf.issuedTo() == RR->identity.address())) {
+			ZT_VirtualNetworkConfig ctmp;
+			bool portInitialized;
+			{
+				Mutex::Lock _l(_lock);
+				_config = conf;
+				_lastConfigUpdate = RR->node->now();
+				_netconfFailure = NETCONF_FAILURE_NONE;
+				_externalConfig(&ctmp);
+				portInitialized = _portInitialized;
+				_portInitialized = true;
+			}
+			_portError = RR->node->configureVirtualNetworkPort(_id,&_uPtr,(portInitialized) ? ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE : ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP,&ctmp);
+			return true;
+		} else {
+			TRACE("ignored invalid configuration for network %.16llx (configuration contains mismatched network ID or issued-to address)",(unsigned long long)_id);
+		}
+	} catch (std::exception &exc) {
+		TRACE("ignored invalid configuration for network %.16llx (%s)",(unsigned long long)_id,exc.what());
+	} catch ( ... ) {
+		TRACE("ignored invalid configuration for network %.16llx (unknown exception)",(unsigned long long)_id);
+	}
+	return false;
+}
+
+int Network::setConfiguration(const Dictionary &conf,bool saveToDisk)
+{
+	try {
+		NetworkConfig newConfig;
+		newConfig.fromDictionary(conf); // throws if invalid
+		{
+			Mutex::Lock _l(_lock);
+			if (_config == newConfig)
+				return 1; // OK config, but duplicate of what we already have
+		}
+		if (applyConfiguration(newConfig)) {
+			if (saveToDisk) {
+				char n[128];
+				Utils::snprintf(n,sizeof(n),"networks.d/%.16llx.conf",_id);
+				RR->node->dataStorePut(n,conf.toString(),true);
+			}
+			return 2; // OK and configuration has changed
+		}
+	} catch ( ... ) {
+		TRACE("ignored invalid configuration for network %.16llx (dictionary decode failed)",(unsigned long long)_id);
+	}
+	return 0;
+}
+
+void Network::requestConfiguration()
+{
+	if (_id == ZT_TEST_NETWORK_ID) // pseudo-network-ID, uses locally generated static config
+		return;
+
+	if (controller() == RR->identity.address()) {
+		if (RR->localNetworkController) {
+			Dictionary newconf;
+			switch(RR->localNetworkController->doNetworkConfigRequest(InetAddress(),RR->identity,RR->identity,_id,Dictionary(),newconf)) {
+				case NetworkController::NETCONF_QUERY_OK:
+					this->setConfiguration(newconf,true);
+					return;
+				case NetworkController::NETCONF_QUERY_OBJECT_NOT_FOUND:
+					this->setNotFound();
+					return;
+				case NetworkController::NETCONF_QUERY_ACCESS_DENIED:
+					this->setAccessDenied();
+					return;
+				default:
+					return;
+			}
+		} else {
+			this->setNotFound();
+			return;
+		}
+	}
+
+	TRACE("requesting netconf for network %.16llx from controller %s",(unsigned long long)_id,controller().toString().c_str());
+
+	// TODO: in the future we will include things like join tokens here, etc.
+	Dictionary metaData;
+	metaData.setHex(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MAJOR_VERSION,ZEROTIER_ONE_VERSION_MAJOR);
+	metaData.setHex(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MINOR_VERSION,ZEROTIER_ONE_VERSION_MINOR);
+	metaData.setHex(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_REVISION,ZEROTIER_ONE_VERSION_REVISION);
+	std::string mds(metaData.toString());
+
+	Packet outp(controller(),RR->identity.address(),Packet::VERB_NETWORK_CONFIG_REQUEST);
+	outp.append((uint64_t)_id);
+	outp.append((uint16_t)mds.length());
+	outp.append((const void *)mds.data(),(unsigned int)mds.length());
+	if (_config)
+		outp.append((uint64_t)_config.revision());
+	else outp.append((uint64_t)0);
+	RR->sw->send(outp,true,0);
 }
 
 void Network::clean()
 {
-	const int64_t now = RR->node->now();
+	const uint64_t now = RR->node->now();
 	Mutex::Lock _l(_lock);
 
-	if (_destroyed) {
+	if (_destroyed)
 		return;
-	}
 
 	{
-		Hashtable<MulticastGroup, uint64_t>::Iterator i(_multicastGroupsBehindMe);
-		MulticastGroup* mg = (MulticastGroup*)0;
-		uint64_t* ts = (uint64_t*)0;
-		while (i.next(mg, ts)) {
-			if ((now - *ts) > (ZT_MULTICAST_LIKE_EXPIRE * 2)) {
+		Hashtable< MulticastGroup,uint64_t >::Iterator i(_multicastGroupsBehindMe);
+		MulticastGroup *mg = (MulticastGroup *)0;
+		uint64_t *ts = (uint64_t *)0;
+		while (i.next(mg,ts)) {
+			if ((now - *ts) > (ZT_MULTICAST_LIKE_EXPIRE * 2))
 				_multicastGroupsBehindMe.erase(*mg);
-			}
-		}
-	}
-
-	{
-		Address* a = (Address*)0;
-		Membership* m = (Membership*)0;
-		Hashtable<Address, Membership>::Iterator i(_memberships);
-		while (i.next(a, m)) {
-			if (! RR->topology->getPeerNoCache(*a)) {
-				_memberships.erase(*a);
-			}
-			else {
-				m->clean(now, _config);
-			}
 		}
 	}
 }
 
-void Network::learnBridgeRoute(const MAC& mac, const Address& addr)
+void Network::learnBridgeRoute(const MAC &mac,const Address &addr)
 {
 	Mutex::Lock _l(_lock);
 	_remoteBridgeRoutes[mac] = addr;
 
 	// Anti-DOS circuit breaker to prevent nodes from spamming us with absurd numbers of bridge routes
 	while (_remoteBridgeRoutes.size() > ZT_MAX_BRIDGE_ROUTES) {
-		Hashtable<Address, unsigned long> counts;
+		Hashtable< Address,unsigned long > counts;
 		Address maxAddr;
 		unsigned long maxCount = 0;
 
-		MAC* m = (MAC*)0;
-		Address* a = (Address*)0;
+		MAC *m = (MAC *)0;
+		Address *a = (Address *)0;
 
 		// Find the address responsible for the most entries
 		{
-			Hashtable<MAC, Address>::Iterator i(_remoteBridgeRoutes);
-			while (i.next(m, a)) {
+			Hashtable<MAC,Address>::Iterator i(_remoteBridgeRoutes);
+			while (i.next(m,a)) {
 				const unsigned long c = ++counts[*a];
 				if (c > maxCount) {
 					maxCount = c;
@@ -1575,289 +295,193 @@ void Network::learnBridgeRoute(const MAC& mac, const Address& addr)
 
 		// Kill this address from our table, since it's most likely spamming us
 		{
-			Hashtable<MAC, Address>::Iterator i(_remoteBridgeRoutes);
-			while (i.next(m, a)) {
-				if (*a == maxAddr) {
+			Hashtable<MAC,Address>::Iterator i(_remoteBridgeRoutes);
+			while (i.next(m,a)) {
+				if (*a == maxAddr)
 					_remoteBridgeRoutes.erase(*m);
-				}
 			}
 		}
 	}
 }
 
-void Network::learnBridgedMulticastGroup(void* tPtr, const MulticastGroup& mg, int64_t now)
+void Network::learnBridgedMulticastGroup(const MulticastGroup &mg,uint64_t now)
 {
 	Mutex::Lock _l(_lock);
 	const unsigned long tmp = (unsigned long)_multicastGroupsBehindMe.size();
-	_multicastGroupsBehindMe.set(mg, now);
-	if (tmp != _multicastGroupsBehindMe.size()) {
-		_sendUpdatesToMembers(tPtr, &mg);
-	}
+	_multicastGroupsBehindMe.set(mg,now);
+	if (tmp != _multicastGroupsBehindMe.size())
+		_announceMulticastGroups();
 }
 
-Membership::AddCredentialResult Network::addCredential(void* tPtr, const CertificateOfMembership& com)
+void Network::setEnabled(bool enabled)
 {
-	if (com.networkId() != _id) {
-		return Membership::ADD_REJECTED;
-	}
 	Mutex::Lock _l(_lock);
-	return _membership(com.issuedTo()).addCredential(RR, tPtr, _config, com);
-}
-
-Membership::AddCredentialResult Network::addCredential(void* tPtr, const Address& sentFrom, const Revocation& rev)
-{
-	if (rev.networkId() != _id) {
-		return Membership::ADD_REJECTED;
+	if (_enabled != enabled) {
+		_enabled = enabled;
+		ZT_VirtualNetworkConfig ctmp;
+		_externalConfig(&ctmp);
+		_portError = RR->node->configureVirtualNetworkPort(_id,&_uPtr,ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE,&ctmp);
 	}
-
-	Mutex::Lock _l(_lock);
-	Membership& m = _membership(rev.target());
-
-	const Membership::AddCredentialResult result = m.addCredential(RR, tPtr, _config, rev);
-
-	if ((result == Membership::ADD_ACCEPTED_NEW) && (rev.fastPropagate())) {
-		Address* a = (Address*)0;
-		Membership* m = (Membership*)0;
-		Hashtable<Address, Membership>::Iterator i(_memberships);
-		while (i.next(a, m)) {
-			if ((*a != sentFrom) && (*a != rev.signer())) {
-				Packet outp(*a, RR->identity.address(), Packet::VERB_NETWORK_CREDENTIALS);
-				outp.append((uint8_t)0x00);	  // no COM
-				outp.append((uint16_t)0);	  // no capabilities
-				outp.append((uint16_t)0);	  // no tags
-				outp.append((uint16_t)1);	  // one revocation!
-				rev.serialize(outp);
-				outp.append((uint16_t)0);	// no certificates of ownership
-				RR->sw->send(tPtr, outp, true);
-			}
-		}
-	}
-
-	return result;
 }
 
 void Network::destroy()
 {
 	Mutex::Lock _l(_lock);
+	_enabled = false;
 	_destroyed = true;
 }
 
 ZT_VirtualNetworkStatus Network::_status() const
 {
 	// assumes _lock is locked
-	if (_portError) {
+	if (_portError)
 		return ZT_NETWORK_STATUS_PORT_ERROR;
-	}
-	switch (_netconfFailure) {
+	switch(_netconfFailure) {
 		case NETCONF_FAILURE_ACCESS_DENIED:
 			return ZT_NETWORK_STATUS_ACCESS_DENIED;
 		case NETCONF_FAILURE_NOT_FOUND:
 			return ZT_NETWORK_STATUS_NOT_FOUND;
 		case NETCONF_FAILURE_NONE:
 			return ((_config) ? ZT_NETWORK_STATUS_OK : ZT_NETWORK_STATUS_REQUESTING_CONFIGURATION);
-		case NETCONF_FAILURE_AUTHENTICATION_REQUIRED:
-			return ZT_NETWORK_STATUS_AUTHENTICATION_REQUIRED;
 		default:
 			return ZT_NETWORK_STATUS_PORT_ERROR;
 	}
 }
 
-void Network::_externalConfig(ZT_VirtualNetworkConfig* ec) const
+void Network::_externalConfig(ZT_VirtualNetworkConfig *ec) const
 {
 	// assumes _lock is locked
 	ec->nwid = _id;
 	ec->mac = _mac.toInt();
-	if (_config) {
-		Utils::scopy(ec->name, sizeof(ec->name), _config.name);
-	}
-	else {
-		ec->name[0] = (char)0;
-	}
+	if (_config)
+		Utils::scopy(ec->name,sizeof(ec->name),_config.name());
+	else ec->name[0] = (char)0;
 	ec->status = _status();
 	ec->type = (_config) ? (_config.isPrivate() ? ZT_NETWORK_TYPE_PRIVATE : ZT_NETWORK_TYPE_PUBLIC) : ZT_NETWORK_TYPE_PRIVATE;
-	ec->mtu = (_config) ? _config.mtu : ZT_DEFAULT_MTU;
+	ec->mtu = ZT_IF_MTU;
 	ec->dhcp = 0;
 	std::vector<Address> ab(_config.activeBridges());
-	ec->bridge = (std::find(ab.begin(), ab.end(), RR->identity.address()) != ab.end()) ? 1 : 0;
+	ec->bridge = ((_config.allowPassiveBridging())||(std::find(ab.begin(),ab.end(),RR->identity.address()) != ab.end())) ? 1 : 0;
 	ec->broadcastEnabled = (_config) ? (_config.enableBroadcast() ? 1 : 0) : 0;
 	ec->portError = _portError;
-	ec->netconfRevision = (_config) ? (unsigned long)_config.revision : 0;
+	ec->enabled = (_enabled) ? 1 : 0;
+	ec->netconfRevision = (_config) ? (unsigned long)_config.revision() : 0;
 
-	ec->assignedAddressCount = 0;
-	for (unsigned int i = 0; i < ZT_MAX_ZT_ASSIGNED_ADDRESSES; ++i) {
-		if (i < _config.staticIpCount) {
-			memcpy(&(ec->assignedAddresses[i]), &(_config.staticIps[i]), sizeof(struct sockaddr_storage));
-			++ec->assignedAddressCount;
-		}
-		else {
-			memset(&(ec->assignedAddresses[i]), 0, sizeof(struct sockaddr_storage));
-		}
-	}
-
-	ec->routeCount = 0;
-	for (unsigned int i = 0; i < ZT_MAX_NETWORK_ROUTES; ++i) {
-		if (i < _config.routeCount) {
-			memcpy(&(ec->routes[i]), &(_config.routes[i]), sizeof(ZT_VirtualNetworkRoute));
-			++ec->routeCount;
-		}
-		else {
-			memset(&(ec->routes[i]), 0, sizeof(ZT_VirtualNetworkRoute));
-		}
-	}
-
-	ec->multicastSubscriptionCount = (unsigned int)_myMulticastGroups.size();
-	for (unsigned long i = 0; i < (unsigned long)_myMulticastGroups.size(); ++i) {
+	ec->multicastSubscriptionCount = std::min((unsigned int)_myMulticastGroups.size(),(unsigned int)ZT_MAX_NETWORK_MULTICAST_SUBSCRIPTIONS);
+	for(unsigned int i=0;i<ec->multicastSubscriptionCount;++i) {
 		ec->multicastSubscriptions[i].mac = _myMulticastGroups[i].mac().toInt();
 		ec->multicastSubscriptions[i].adi = _myMulticastGroups[i].adi();
 	}
 
-	memcpy(&ec->dns, &_config.dns, sizeof(ZT_VirtualNetworkDNS));
-
-	Utils::scopy(ec->authenticationURL, sizeof(ec->authenticationURL), _authenticationURL.c_str());
-	ec->ssoVersion = _config.ssoVersion;
-	ec->authenticationExpiryTime = _config.authenticationExpiryTime;
-	ec->ssoEnabled = _config.ssoEnabled;
-	Utils::scopy(ec->centralAuthURL, sizeof(ec->centralAuthURL), _config.centralAuthURL);
-	Utils::scopy(ec->issuerURL, sizeof(ec->issuerURL), _config.issuerURL);
-	Utils::scopy(ec->ssoNonce, sizeof(ec->ssoNonce), _config.ssoNonce);
-	Utils::scopy(ec->ssoState, sizeof(ec->ssoState), _config.ssoState);
-	Utils::scopy(ec->ssoClientID, sizeof(ec->ssoClientID), _config.ssoClientID);
-	Utils::scopy(ec->ssoProvider, sizeof(ec->ssoProvider), _config.ssoProvider);
+	std::vector<InetAddress> sips(_config.staticIps());
+	ec->assignedAddressCount = 0;
+	for(unsigned long i=0;i<ZT_MAX_ZT_ASSIGNED_ADDRESSES;++i) {
+		if (i < sips.size()) {
+			memcpy(&(ec->assignedAddresses[i]),&(sips[i]),sizeof(struct sockaddr_storage));
+			++ec->assignedAddressCount;
+		} else memset(&(ec->assignedAddresses[i]),0,sizeof(struct sockaddr_storage));
+	}
 }
 
-void Network::_sendUpdatesToMembers(void* tPtr, const MulticastGroup* const newMulticastGroup)
+bool Network::_isAllowed(const SharedPtr<Peer> &peer) const
 {
 	// Assumes _lock is locked
-	const int64_t now = RR->node->now();
-
-	std::vector<MulticastGroup> groups;
-	if (newMulticastGroup) {
-		groups.push_back(*newMulticastGroup);
+	try {
+		if (!_config)
+			return false;
+		if (_config.isPublic())
+			return true;
+		return ((_config.com())&&(peer->networkMembershipCertificatesAgree(_id,_config.com())));
+	} catch (std::exception &exc) {
+		TRACE("isAllowed() check failed for peer %s: unexpected exception: %s",peer->address().toString().c_str(),exc.what());
+	} catch ( ... ) {
+		TRACE("isAllowed() check failed for peer %s: unexpected exception: unknown exception",peer->address().toString().c_str());
 	}
-	else {
-		groups = _allMulticastGroups();
+	return false; // default position on any failure
+}
+
+class _MulticastAnnounceAll
+{
+public:
+	_MulticastAnnounceAll(const RuntimeEnvironment *renv,Network *nw) :
+		_now(renv->node->now()),
+		_controller(nw->controller()),
+		_network(nw),
+		_rootAddresses(renv->topology->rootAddresses())
+	{}
+	inline void operator()(Topology &t,const SharedPtr<Peer> &p)
+	{
+		if (
+		    (_network->_isAllowed(p)) ||
+		    (p->address() == _controller) ||
+		    (std::find(_rootAddresses.begin(),_rootAddresses.end(),p->address()) != _rootAddresses.end())
+		   ) {
+			peers.push_back(p);
+		}
 	}
+	std::vector< SharedPtr<Peer> > peers;
+private:
+	const uint64_t _now;
+	const Address _controller;
+	Network *const _network;
+	const std::vector<Address> _rootAddresses;
+};
+void Network::_announceMulticastGroups()
+{
+	// Assumes _lock is locked
+	_MulticastAnnounceAll gpfunc(RR,this);
+	RR->topology->eachPeer<_MulticastAnnounceAll &>(gpfunc);
+	std::vector<MulticastGroup> allMulticastGroups(_allMulticastGroups());
+	for(std::vector< SharedPtr<Peer> >::const_iterator i(gpfunc.peers.begin());i!=gpfunc.peers.end();++i)
+		_announceMulticastGroupsTo(*i,allMulticastGroups);
+}
 
-	std::vector<Address> alwaysAnnounceTo;
+void Network::_announceMulticastGroupsTo(const SharedPtr<Peer> &peer,const std::vector<MulticastGroup> &allMulticastGroups) const
+{
+	// Assumes _lock is locked
 
-	if ((newMulticastGroup) || ((now - _lastAnnouncedMulticastGroupsUpstream) >= ZT_MULTICAST_ANNOUNCE_PERIOD)) {
-		if (! newMulticastGroup) {
-			_lastAnnouncedMulticastGroupsUpstream = now;
-		}
-
-		alwaysAnnounceTo = _config.alwaysContactAddresses();
-		if (std::find(alwaysAnnounceTo.begin(), alwaysAnnounceTo.end(), controller()) == alwaysAnnounceTo.end()) {
-			alwaysAnnounceTo.push_back(controller());
-		}
-		const std::vector<Address> upstreams(RR->topology->upstreamAddresses());
-		for (std::vector<Address>::const_iterator a(upstreams.begin()); a != upstreams.end(); ++a) {
-			if (std::find(alwaysAnnounceTo.begin(), alwaysAnnounceTo.end(), *a) == alwaysAnnounceTo.end()) {
-				alwaysAnnounceTo.push_back(*a);
-			}
-		}
-		std::sort(alwaysAnnounceTo.begin(), alwaysAnnounceTo.end());
-
-		for (std::vector<Address>::const_iterator a(alwaysAnnounceTo.begin()); a != alwaysAnnounceTo.end(); ++a) {
-			/*
-			// push COM to non-members so they can do multicast request auth
-			if ( (_config.com) && (!_memberships.contains(*a)) && (*a != RR->identity.address()) ) {
-				Packet outp(*a,RR->identity.address(),Packet::VERB_NETWORK_CREDENTIALS);
-				_config.com.serialize(outp);
-				outp.append((uint8_t)0x00);
-				outp.append((uint16_t)0); // no capabilities
-				outp.append((uint16_t)0); // no tags
-				outp.append((uint16_t)0); // no revocations
-				outp.append((uint16_t)0); // no certificates of ownership
-				RR->sw->send(tPtr,outp,true);
-			}
-			*/
-			_announceMulticastGroupsTo(tPtr, *a, groups);
-		}
+	// We push COMs ahead of MULTICAST_LIKE since they're used for access control -- a COM is a public
+	// credential so "over-sharing" isn't really an issue (and we only do so with roots).
+	if ((_config)&&(_config.com())&&(!_config.isPublic())&&(peer->needsOurNetworkMembershipCertificate(_id,RR->node->now(),true))) {
+		Packet outp(peer->address(),RR->identity.address(),Packet::VERB_NETWORK_MEMBERSHIP_CERTIFICATE);
+		_config.com().serialize(outp);
+		RR->sw->send(outp,true,0);
 	}
 
 	{
-		Address* a = (Address*)0;
-		Membership* m = (Membership*)0;
-		Hashtable<Address, Membership>::Iterator i(_memberships);
-		while (i.next(a, m)) {
-			const Identity remoteIdentity(RR->topology->getIdentity(tPtr, *a));
-			if (remoteIdentity) {
-				if ((m->multicastLikeGate(now) || (newMulticastGroup)) && (m->isAllowedOnNetwork(_config, remoteIdentity)) && (! std::binary_search(alwaysAnnounceTo.begin(), alwaysAnnounceTo.end(), *a))) {
-					_announceMulticastGroupsTo(tPtr, *a, groups);
-				}
+		Packet outp(peer->address(),RR->identity.address(),Packet::VERB_MULTICAST_LIKE);
+
+		for(std::vector<MulticastGroup>::const_iterator mg(allMulticastGroups.begin());mg!=allMulticastGroups.end();++mg) {
+			if ((outp.size() + 18) >= ZT_UDP_DEFAULT_PAYLOAD_MTU) {
+				RR->sw->send(outp,true,0);
+				outp.reset(peer->address(),RR->identity.address(),Packet::VERB_MULTICAST_LIKE);
 			}
-		}
-	}
-}
 
-void Network::_announceMulticastGroupsTo(void* tPtr, const Address& peer, const std::vector<MulticastGroup>& allMulticastGroups)
-{
-	// Assumes _lock is locked
-	Packet* const outp = new Packet(peer, RR->identity.address(), Packet::VERB_MULTICAST_LIKE);
-
-	for (std::vector<MulticastGroup>::const_iterator mg(allMulticastGroups.begin()); mg != allMulticastGroups.end(); ++mg) {
-		if ((outp->size() + 24) >= ZT_PROTO_MAX_PACKET_LENGTH) {
-			outp->compress();
-			RR->sw->send(tPtr, *outp, true);
-			outp->reset(peer, RR->identity.address(), Packet::VERB_MULTICAST_LIKE);
+			// network ID, MAC, ADI
+			outp.append((uint64_t)_id);
+			mg->mac().appendTo(outp);
+			outp.append((uint32_t)mg->adi());
 		}
 
-		// network ID, MAC, ADI
-		outp->append((uint64_t)_id);
-		mg->mac().appendTo(*outp);
-		outp->append((uint32_t)mg->adi());
+		if (outp.size() > ZT_PROTO_MIN_PACKET_LENGTH)
+			RR->sw->send(outp,true,0);
 	}
-
-	if (outp->size() > ZT_PROTO_MIN_PACKET_LENGTH) {
-		outp->compress();
-		RR->sw->send(tPtr, *outp, true);
-	}
-
-	delete outp;
 }
 
 std::vector<MulticastGroup> Network::_allMulticastGroups() const
 {
 	// Assumes _lock is locked
+
 	std::vector<MulticastGroup> mgs;
 	mgs.reserve(_myMulticastGroups.size() + _multicastGroupsBehindMe.size() + 1);
-	mgs.insert(mgs.end(), _myMulticastGroups.begin(), _myMulticastGroups.end());
+	mgs.insert(mgs.end(),_myMulticastGroups.begin(),_myMulticastGroups.end());
 	_multicastGroupsBehindMe.appendKeys(mgs);
-	if ((_config) && (_config.enableBroadcast())) {
+	if ((_config)&&(_config.enableBroadcast()))
 		mgs.push_back(Network::BROADCAST);
-	}
-	std::sort(mgs.begin(), mgs.end());
-	mgs.erase(std::unique(mgs.begin(), mgs.end()), mgs.end());
+	std::sort(mgs.begin(),mgs.end());
+	mgs.erase(std::unique(mgs.begin(),mgs.end()),mgs.end());
+
 	return mgs;
 }
 
-Membership& Network::_membership(const Address& a)
-{
-	// assumes _lock is locked
-	return _memberships[a];
-}
-
-void Network::setAuthenticationRequired(void* tPtr, const char* issuerURL, const char* centralEndpoint, const char* clientID, const char* ssoProvider, const char* nonce, const char* state)
-{
-	Mutex::Lock _l(_lock);
-	_netconfFailure = NETCONF_FAILURE_AUTHENTICATION_REQUIRED;
-	_config.ssoEnabled = true;
-	_config.ssoVersion = 1;
-
-	Utils::scopy(_config.issuerURL, sizeof(_config.issuerURL), issuerURL);
-	Utils::scopy(_config.centralAuthURL, sizeof(_config.centralAuthURL), centralEndpoint);
-	Utils::scopy(_config.ssoClientID, sizeof(_config.ssoClientID), clientID);
-	Utils::scopy(_config.ssoNonce, sizeof(_config.ssoNonce), nonce);
-	Utils::scopy(_config.ssoState, sizeof(_config.ssoState), state);
-	Utils::scopy(_config.ssoProvider, sizeof(_config.ssoProvider), ssoProvider);
-	_sendUpdateEvent(tPtr);
-}
-
-void Network::_sendUpdateEvent(void* tPtr)
-{
-	ZT_VirtualNetworkConfig ctmp;
-	_externalConfig(&ctmp);
-	RR->node->configureVirtualNetworkPort(tPtr, _id, &_uPtr, (_portInitialized) ? ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE : ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP, &ctmp);
-}
-
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Network.hpp b/node/Network.hpp
index a622786c6..5d33151bf 100644
--- a/node/Network.hpp
+++ b/node/Network.hpp
@@ -1,70 +1,68 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_NETWORK_HPP
 #define ZT_NETWORK_HPP
 
-#include "../include/ZeroTierOne.h"
-#include "Address.hpp"
-#include "AtomicCounter.hpp"
-#include "CertificateOfMembership.hpp"
-#include "Constants.hpp"
-#include "Dictionary.hpp"
-#include "Hashtable.hpp"
-#include "MAC.hpp"
-#include "Membership.hpp"
-#include "Metrics.hpp"
-#include "MulticastGroup.hpp"
-#include "Multicaster.hpp"
-#include "Mutex.hpp"
-#include "NetworkConfig.hpp"
-#include "SharedPtr.hpp"
-
-#include <algorithm>
-#include <map>
-#include <stdexcept>
 #include <stdint.h>
-#include <string>
-#include <vector>
 
-#define ZT_NETWORK_MAX_INCOMING_UPDATES 3
-#define ZT_NETWORK_MAX_UPDATE_CHUNKS	((ZT_NETWORKCONFIG_DICT_CAPACITY / 1024) + 1)
+#include "../include/ZeroTierOne.h"
+
+#include <string>
+#include <map>
+#include <vector>
+#include <algorithm>
+#include <stdexcept>
+
+#include "Constants.hpp"
+#include "NonCopyable.hpp"
+#include "Hashtable.hpp"
+#include "Address.hpp"
+#include "Mutex.hpp"
+#include "SharedPtr.hpp"
+#include "AtomicCounter.hpp"
+#include "MulticastGroup.hpp"
+#include "MAC.hpp"
+#include "Dictionary.hpp"
+#include "Multicaster.hpp"
+#include "NetworkConfig.hpp"
+#include "CertificateOfMembership.hpp"
 
 namespace ZeroTier {
 
 class RuntimeEnvironment;
 class Peer;
+class _MulticastAnnounceAll;
 
 /**
  * A virtual LAN
  */
-class Network {
+class Network : NonCopyable
+{
 	friend class SharedPtr<Network>;
+	friend class _MulticastAnnounceAll; // internal function object
 
-  public:
+public:
 	/**
 	 * Broadcast multicast group: ff:ff:ff:ff:ff:ff / 0
 	 */
 	static const MulticastGroup BROADCAST;
 
-	/**
-	 * Compute primary controller device ID from network ID
-	 */
-	static inline Address controllerFor(uint64_t nwid)
-	{
-		return Address(nwid >> 24);
-	}
-
 	/**
 	 * Construct a new network
 	 *
@@ -72,266 +70,200 @@ class Network {
 	 * constructed to actually configure the port.
 	 *
 	 * @param renv Runtime environment
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param nwid Network ID
 	 * @param uptr Arbitrary pointer used by externally-facing API (for user use)
-	 * @param nconf Network config, if known
 	 */
-	Network(const RuntimeEnvironment* renv, void* tPtr, uint64_t nwid, void* uptr, const NetworkConfig* nconf);
+	Network(const RuntimeEnvironment *renv,uint64_t nwid,void *uptr);
 
 	~Network();
 
-	inline uint64_t id() const
-	{
-		return _id;
-	}
-	inline Address controller() const
-	{
-		return Address(_id >> 24);
-	}
-	inline bool multicastEnabled() const
-	{
-		return (_config.multicastLimit > 0);
-	}
-	inline bool hasConfig() const
-	{
-		return (_config);
-	}
-	inline uint64_t lastConfigUpdate() const
-	{
-		return _lastConfigUpdate;
-	}
-	inline ZT_VirtualNetworkStatus status() const
+	/**
+	 * @return Network ID
+	 */
+	inline uint64_t id() const throw() { return _id; }
+
+	/**
+	 * @return Address of network's controller (most significant 40 bits of ID)
+	 */
+	inline Address controller() const throw() { return Address(_id >> 24); }
+
+	/**
+	 * @param nwid Network ID
+	 * @return Address of network's controller
+	 */
+	static inline Address controllerFor(uint64_t nwid) throw() { return Address(nwid >> 24); }
+
+	/**
+	 * @return Multicast group memberships for this network's port (local, not learned via bridging)
+	 */
+	inline std::vector<MulticastGroup> multicastGroups() const
 	{
 		Mutex::Lock _l(_lock);
-		return _status();
-	}
-	inline const NetworkConfig& config() const
-	{
-		return _config;
-	}
-	inline const MAC& mac() const
-	{
-		return _mac;
+		return _myMulticastGroups;
 	}
 
 	/**
-	 * Apply filters to an outgoing packet
-	 *
-	 * This applies filters from our network config and, if that doesn't match,
-	 * our capabilities in ascending order of capability ID. Additional actions
-	 * such as TEE may be taken, and credentials may be pushed, so this is not
-	 * side-effect-free. It's basically step one in sending something over VL2.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param noTee If true, do not TEE anything anywhere (for two-pass filtering as done with multicast and bridging)
-	 * @param ztSource Source ZeroTier address
-	 * @param ztDest Destination ZeroTier address
-	 * @param macSource Ethernet layer source address
-	 * @param macDest Ethernet layer destination address
-	 * @param frameData Ethernet frame data
-	 * @param frameLen Ethernet frame payload length
-	 * @param etherType 16-bit ethernet type ID
-	 * @param vlanId 16-bit VLAN ID
-	 * @return True if packet should be sent, false if dropped or redirected
+	 * @return All multicast groups including learned groups that are behind any bridges we're attached to
 	 */
-	bool filterOutgoingPacket(
-		void* tPtr,
-		const bool noTee,
-		const Address& ztSource,
-		const Address& ztDest,
-		const MAC& macSource,
-		const MAC& macDest,
-		const uint8_t* frameData,
-		const unsigned int frameLen,
-		const unsigned int etherType,
-		const unsigned int vlanId,
-		uint8_t& qosBucket);
+	inline std::vector<MulticastGroup> allMulticastGroups() const
+	{
+		Mutex::Lock _l(_lock);
+		return _allMulticastGroups();
+	}
 
 	/**
-	 * Apply filters to an incoming packet
-	 *
-	 * This applies filters from our network config and, if that doesn't match,
-	 * the peer's capabilities in ascending order of capability ID. If there is
-	 * a match certain actions may be taken such as sending a copy of the packet
-	 * to a TEE or REDIRECT target.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param sourcePeer Source Peer
-	 * @param ztDest Destination ZeroTier address
-	 * @param macSource Ethernet layer source address
-	 * @param macDest Ethernet layer destination address
-	 * @param frameData Ethernet frame data
-	 * @param frameLen Ethernet frame payload length
-	 * @param etherType 16-bit ethernet type ID
-	 * @param vlanId 16-bit VLAN ID
-	 * @return 0 == drop, 1 == accept, 2 == accept even if bridged
-	 */
-	int filterIncomingPacket(
-		void* tPtr,
-		const SharedPtr<Peer>& sourcePeer,
-		const Address& ztDest,
-		const MAC& macSource,
-		const MAC& macDest,
-		const uint8_t* frameData,
-		const unsigned int frameLen,
-		const unsigned int etherType,
-		const unsigned int vlanId);
-
-	/**
-	 * Check whether we are subscribed to a multicast group
-	 *
 	 * @param mg Multicast group
-	 * @param includeBridgedGroups If true, also check groups we've learned via bridging
+	 * @param includeBridgedGroups If true, also include any groups we've learned via bridging
 	 * @return True if this network endpoint / peer is a member
 	 */
-	bool subscribedToMulticastGroup(const MulticastGroup& mg, bool includeBridgedGroups) const;
+	bool subscribedToMulticastGroup(const MulticastGroup &mg,bool includeBridgedGroups) const;
 
 	/**
 	 * Subscribe to a multicast group
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param mg New multicast group
 	 */
-	void multicastSubscribe(void* tPtr, const MulticastGroup& mg);
+	void multicastSubscribe(const MulticastGroup &mg);
 
 	/**
 	 * Unsubscribe from a multicast group
 	 *
 	 * @param mg Multicast group
 	 */
-	void multicastUnsubscribe(const MulticastGroup& mg);
+	void multicastUnsubscribe(const MulticastGroup &mg);
 
 	/**
-	 * Handle an inbound network config chunk
+	 * Announce multicast groups to a peer if that peer is authorized on this network
 	 *
-	 * This is called from IncomingPacket to handle incoming network config
-	 * chunks via OK(NETWORK_CONFIG_REQUEST) or NETWORK_CONFIG. It verifies
-	 * each chunk and once assembled applies the configuration.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param packetId Packet ID or 0 if none (e.g. via cluster path)
-	 * @param source Address of sender of chunk or NULL if none (e.g. via cluster path)
-	 * @param chunk Buffer containing chunk
-	 * @param ptr Index of chunk and related fields in packet
-	 * @return Update ID if update was fully assembled and accepted or 0 otherwise
+	 * @param peer Peer to try to announce multicast groups to
+	 * @return True if peer was authorized and groups were announced
 	 */
-	uint64_t handleConfigChunk(void* tPtr, const uint64_t packetId, const Address& source, const Buffer<ZT_PROTO_MAX_PACKET_LENGTH>& chunk, unsigned int ptr);
+	bool tryAnnounceMulticastGroupsTo(const SharedPtr<Peer> &peer);
 
 	/**
-	 * Set network configuration
+	 * Apply a NetworkConfig to this network
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param nconf Network configuration
-	 * @param saveToDisk Save to disk? Used during loading, should usually be true otherwise.
-	 * @return 0 == bad, 1 == accepted but duplicate/unchanged, 2 == accepted and new
+	 * @param conf Configuration in NetworkConfig form
+	 * @return True if configuration was accepted
 	 */
-	int setConfiguration(void* tPtr, const NetworkConfig& nconf, bool saveToDisk);
+	bool applyConfiguration(const NetworkConfig &conf);
+
+	/**
+	 * Set or update this network's configuration
+	 *
+	 * This decodes a network configuration in key=value dictionary form,
+	 * applies it if valid, and persists it to disk if saveToDisk is true.
+	 *
+	 * @param conf Configuration in key/value dictionary form
+	 * @param saveToDisk IF true (default), write config to disk
+	 * @return 0 -- rejected, 1 -- accepted but not new, 2 -- accepted new config
+	 */
+	int setConfiguration(const Dictionary &conf,bool saveToDisk = true);
 
 	/**
 	 * Set netconf failure to 'access denied' -- called in IncomingPacket when controller reports this
 	 */
-	inline void setAccessDenied(void* tPtr)
+	inline void setAccessDenied()
 	{
 		Mutex::Lock _l(_lock);
 		_netconfFailure = NETCONF_FAILURE_ACCESS_DENIED;
-
-		_sendUpdateEvent(tPtr);
 	}
 
 	/**
-	 * Set netconf failure to 'not found' -- called by IncomingPacket when controller reports this
+	 * Set netconf failure to 'not found' -- called by PacketDecider when controller reports this
 	 */
-	inline void setNotFound(void* tPtr)
+	inline void setNotFound()
 	{
 		Mutex::Lock _l(_lock);
 		_netconfFailure = NETCONF_FAILURE_NOT_FOUND;
-
-		_sendUpdateEvent(tPtr);
 	}
 
-	/**
-	 * Set netconf failure to 'authentication required' possibly with an authorization URL
-	 */
-	inline void setAuthenticationRequired(void* tPtr, const char* url)
-	{
-		Mutex::Lock _l(_lock);
-		_netconfFailure = NETCONF_FAILURE_AUTHENTICATION_REQUIRED;
-		_authenticationURL = (url) ? url : "";
-		_config.ssoEnabled = true;
-		_config.ssoVersion = 0;
-		_sendUpdateEvent(tPtr);
-	}
-
-	/**
-	 * set netconf failure to 'authentication required' along with info needed
-	 * for sso full flow authentication.
-	 */
-	void setAuthenticationRequired(void* tPtr, const char* issuerURL, const char* centralEndpoint, const char* clientID, const char* ssoProvider, const char* nonce, const char* state);
-
 	/**
 	 * Causes this network to request an updated configuration from its master node now
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 */
-	void requestConfiguration(void* tPtr);
+	void requestConfiguration();
 
 	/**
-	 * Determine whether this peer is permitted to communicate on this network
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param peer Peer to check
+	 * @return True if peer is allowed to communicate on this network
 	 */
-	bool gate(void* tPtr, const SharedPtr<Peer>& peer);
+	inline bool isAllowed(const SharedPtr<Peer> &peer) const
+	{
+		Mutex::Lock _l(_lock);
+		return _isAllowed(peer);
+	}
 
 	/**
-	 * Check whether a given peer has recently had an association with this network
-	 *
-	 * This checks whether a peer has communicated with us recently about this
-	 * network and has possessed a valid certificate of membership. This may return
-	 * true even if the peer has been offline for a while or no longer has a valid
-	 * certificate of membership but had one recently.
-	 *
-	 * @param addr Peer address
-	 * @return True if peer has recently associated
-	 */
-	bool recentlyAssociatedWith(const Address& addr);
-
-	/**
-	 * Do periodic cleanup and housekeeping tasks
+	 * Perform cleanup and possibly save state
 	 */
 	void clean();
 
 	/**
-	 * Push state to members such as multicast group memberships and latest COM (if needed)
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
+	 * @return Time of last updated configuration or 0 if none
 	 */
-	inline void sendUpdatesToMembers(void* tPtr)
+	inline uint64_t lastConfigUpdate() const throw() { return _lastConfigUpdate; }
+
+	/**
+	 * @return Status of this network
+	 */
+	inline ZT_VirtualNetworkStatus status() const
 	{
 		Mutex::Lock _l(_lock);
-		_sendUpdatesToMembers(tPtr, (const MulticastGroup*)0);
+		return _status();
 	}
 
+	/**
+	 * @param ec Buffer to fill with externally-visible network configuration
+	 */
+	inline void externalConfig(ZT_VirtualNetworkConfig *ec) const
+	{
+		Mutex::Lock _l(_lock);
+		_externalConfig(ec);
+	}
+
+	/**
+	 * Get current network config
+	 *
+	 * This returns a const reference to the network config in place, which is safe
+	 * to concurrently access but *may* change during access. Normally this isn't a
+	 * problem, but if it is use configCopy().
+	 *
+	 * @return Network configuration (may be a null config if we don't have one yet)
+	 */
+	inline const NetworkConfig &config() const { return _config; }
+
+	/**
+	 * @return A thread-safe copy of our NetworkConfig instead of a const reference
+	 */
+	inline NetworkConfig configCopy() const
+	{
+		Mutex::Lock _l(_lock);
+		return _config;
+	}
+
+	/**
+	 * @return True if this network has a valid config
+	 */
+	inline bool hasConfig() const { return (_config); }
+
+	/**
+	 * @return Ethernet MAC address for this network's local interface
+	 */
+	inline const MAC &mac() const throw() { return _mac; }
+
 	/**
 	 * Find the node on this network that has this MAC behind it (if any)
 	 *
 	 * @param mac MAC address
 	 * @return ZeroTier address of bridge to this MAC
 	 */
-	inline Address findBridgeTo(const MAC& mac) const
+	inline Address findBridgeTo(const MAC &mac) const
 	{
 		Mutex::Lock _l(_lock);
-		const Address* const br = _remoteBridgeRoutes.get(mac);
-		return ((br) ? *br : Address());
-	}
-
-	/**
-	 * @return True if QoS is in effect for this network
-	 */
-	inline bool qosEnabled()
-	{
-		return false;
+		const Address *const br = _remoteBridgeRoutes.get(mac);
+		if (br)
+			return *br;
+		return Address();
 	}
 
 	/**
@@ -340,182 +272,84 @@ class Network {
 	 * @param mac MAC address of destination
 	 * @param addr Bridge this MAC is reachable behind
 	 */
-	void learnBridgeRoute(const MAC& mac, const Address& addr);
+	void learnBridgeRoute(const MAC &mac,const Address &addr);
 
 	/**
 	 * Learn a multicast group that is bridged to our tap device
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param mg Multicast group
 	 * @param now Current time
 	 */
-	void learnBridgedMulticastGroup(void* tPtr, const MulticastGroup& mg, int64_t now);
+	void learnBridgedMulticastGroup(const MulticastGroup &mg,uint64_t now);
 
 	/**
-	 * Validate a credential and learn it if it passes certificate and other checks
+	 * @return True if traffic on this network's tap is enabled
 	 */
-	Membership::AddCredentialResult addCredential(void* tPtr, const CertificateOfMembership& com);
+	inline bool enabled() const throw() { return _enabled; }
 
 	/**
-	 * Validate a credential and learn it if it passes certificate and other checks
+	 * @param enabled Should traffic be allowed on this network?
 	 */
-	inline Membership::AddCredentialResult addCredential(void* tPtr, const Capability& cap)
-	{
-		if (cap.networkId() != _id) {
-			return Membership::ADD_REJECTED;
-		}
-		Mutex::Lock _l(_lock);
-		return _membership(cap.issuedTo()).addCredential(RR, tPtr, _config, cap);
-	}
-
-	/**
-	 * Validate a credential and learn it if it passes certificate and other checks
-	 */
-	inline Membership::AddCredentialResult addCredential(void* tPtr, const Tag& tag)
-	{
-		if (tag.networkId() != _id) {
-			return Membership::ADD_REJECTED;
-		}
-		Mutex::Lock _l(_lock);
-		return _membership(tag.issuedTo()).addCredential(RR, tPtr, _config, tag);
-	}
-
-	/**
-	 * Validate a credential and learn it if it passes certificate and other checks
-	 */
-	Membership::AddCredentialResult addCredential(void* tPtr, const Address& sentFrom, const Revocation& rev);
-
-	/**
-	 * Validate a credential and learn it if it passes certificate and other checks
-	 */
-	inline Membership::AddCredentialResult addCredential(void* tPtr, const CertificateOfOwnership& coo)
-	{
-		if (coo.networkId() != _id) {
-			return Membership::ADD_REJECTED;
-		}
-		Mutex::Lock _l(_lock);
-		return _membership(coo.issuedTo()).addCredential(RR, tPtr, _config, coo);
-	}
-
-	/**
-	 * Force push credentials (COM, etc.) to a peer now
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param to Destination peer address
-	 * @param now Current time
-	 */
-	inline void peerRequestedCredentials(void* tPtr, const Address& to, const int64_t now)
-	{
-		Mutex::Lock _l(_lock);
-		Membership& m = _membership(to);
-		const int64_t lastPushed = m.lastPushedCredentials();
-		if ((lastPushed < _lastConfigUpdate) || ((now - lastPushed) > ZT_PEER_CREDENTIALS_REQUEST_RATE_LIMIT)) {
-			m.pushCredentials(RR, tPtr, now, to, _config);
-		}
-	}
-
-	/**
-	 * Push credentials if we haven't done so in a very long time
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param to Destination peer address
-	 * @param now Current time
-	 */
-	inline void pushCredentialsIfNeeded(void* tPtr, const Address& to, const int64_t now)
-	{
-		Mutex::Lock _l(_lock);
-		Membership& m = _membership(to);
-		const int64_t lastPushed = m.lastPushedCredentials();
-		if ((lastPushed < _lastConfigUpdate) || ((now - lastPushed) > ZT_PEER_ACTIVITY_TIMEOUT)) {
-			m.pushCredentials(RR, tPtr, now, to, _config);
-		}
-	}
+	void setEnabled(bool enabled);
 
 	/**
 	 * Destroy this network
 	 *
-	 * This sets the network to completely remove itself on delete. This also prevents the
-	 * call of the normal port shutdown event on delete.
+	 * This causes the network to disable itself, destroy its tap device, and on
+	 * delete to delete all trace of itself on disk and remove any persistent tap
+	 * device instances. Call this when a network is being removed from the system.
 	 */
 	void destroy();
 
 	/**
-	 * Get this network's config for export via the ZT core API
-	 *
-	 * @param ec Buffer to fill with externally-visible network configuration
+	 * @return Pointer to user PTR (modifiable user ptr used in API)
 	 */
-	inline void externalConfig(ZT_VirtualNetworkConfig* ec) const
-	{
-		Mutex::Lock _l(_lock);
-		_externalConfig(ec);
-	}
+	inline void **userPtr() throw() { return &_uPtr; }
 
-	/**
-	 * @return Externally usable pointer-to-pointer exported via the core API
-	 */
-	inline void** userPtr()
-	{
-		return &_uPtr;
-	}
+	inline bool operator==(const Network &n) const throw() { return (_id == n._id); }
+	inline bool operator!=(const Network &n) const throw() { return (_id != n._id); }
+	inline bool operator<(const Network &n) const throw() { return (_id < n._id); }
+	inline bool operator>(const Network &n) const throw() { return (_id > n._id); }
+	inline bool operator<=(const Network &n) const throw() { return (_id <= n._id); }
+	inline bool operator>=(const Network &n) const throw() { return (_id >= n._id); }
 
-  private:
+private:
 	ZT_VirtualNetworkStatus _status() const;
-	void _externalConfig(ZT_VirtualNetworkConfig* ec) const;   // assumes _lock is locked
-	bool _gate(const SharedPtr<Peer>& peer);
-	void _sendUpdatesToMembers(void* tPtr, const MulticastGroup* const newMulticastGroup);
-	void _announceMulticastGroupsTo(void* tPtr, const Address& peer, const std::vector<MulticastGroup>& allMulticastGroups);
+	void _externalConfig(ZT_VirtualNetworkConfig *ec) const; // assumes _lock is locked
+	bool _isAllowed(const SharedPtr<Peer> &peer) const;
+	void _announceMulticastGroups();
+	void _announceMulticastGroupsTo(const SharedPtr<Peer> &peer,const std::vector<MulticastGroup> &allMulticastGroups) const;
 	std::vector<MulticastGroup> _allMulticastGroups() const;
-	Membership& _membership(const Address& a);
-	void _sendUpdateEvent(void* tPtr);
 
-	const RuntimeEnvironment* const RR;
-	void* _uPtr;
-	const uint64_t _id;
-	std::string _nwidStr;
-	uint64_t _lastAnnouncedMulticastGroupsUpstream;
-	MAC _mac;	// local MAC address
-	bool _portInitialized;
+	const RuntimeEnvironment *RR;
+	void *_uPtr;
+	uint64_t _id;
+	MAC _mac; // local MAC address
+	volatile bool _enabled;
+	volatile bool _portInitialized;
 
-	std::vector<MulticastGroup> _myMulticastGroups;					// multicast groups that we belong to (according to tap)
-	Hashtable<MulticastGroup, uint64_t> _multicastGroupsBehindMe;	// multicast groups that seem to be behind us and when we last saw them (if we are a bridge)
-	Hashtable<MAC, Address> _remoteBridgeRoutes;					// remote addresses where given MACs are reachable (for tracking devices behind remote bridges)
+	std::vector< MulticastGroup > _myMulticastGroups; // multicast groups that we belong to (according to tap)
+	Hashtable< MulticastGroup,uint64_t > _multicastGroupsBehindMe; // multicast groups that seem to be behind us and when we last saw them (if we are a bridge)
+	Hashtable< MAC,Address > _remoteBridgeRoutes; // remote addresses where given MACs are reachable (for tracking devices behind remote bridges)
 
 	NetworkConfig _config;
-	int64_t _lastConfigUpdate;
+	volatile uint64_t _lastConfigUpdate;
 
-	struct _IncomingConfigChunk {
-		_IncomingConfigChunk()
-		{
-			memset(this, 0, sizeof(_IncomingConfigChunk));
-		}
-		uint64_t ts;
-		uint64_t updateId;
-		uint64_t haveChunkIds[ZT_NETWORK_MAX_UPDATE_CHUNKS];
-		unsigned long haveChunks;
-		unsigned long haveBytes;
-		Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> data;
-	};
-	_IncomingConfigChunk _incomingConfigChunks[ZT_NETWORK_MAX_INCOMING_UPDATES];
+	volatile bool _destroyed;
 
-	bool _destroyed;
-
-	enum { NETCONF_FAILURE_NONE, NETCONF_FAILURE_ACCESS_DENIED, NETCONF_FAILURE_NOT_FOUND, NETCONF_FAILURE_INIT_FAILED, NETCONF_FAILURE_AUTHENTICATION_REQUIRED } _netconfFailure;
-	int _portError;	  // return value from port config callback
-	std::string _authenticationURL;
-
-	Hashtable<Address, Membership> _memberships;
+	enum {
+		NETCONF_FAILURE_NONE,
+		NETCONF_FAILURE_ACCESS_DENIED,
+		NETCONF_FAILURE_NOT_FOUND,
+		NETCONF_FAILURE_INIT_FAILED
+	} _netconfFailure;
+	volatile int _portError; // return value from port config callback
 
 	Mutex _lock;
 
 	AtomicCounter __refCount;
-
-	prometheus::simpleapi::gauge_metric_t _num_multicast_groups;
-	prometheus::simpleapi::counter_metric_t _incoming_packets_accepted;
-	prometheus::simpleapi::counter_metric_t _incoming_packets_dropped;
-	prometheus::simpleapi::counter_metric_t _outgoing_packets_accepted;
-	prometheus::simpleapi::counter_metric_t _outgoing_packets_dropped;
 };
 
-}	// namespace ZeroTier
+} // naemspace ZeroTier
 
 #endif
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp
index a51fe1b29..aab9a6500 100644
--- a/node/NetworkConfig.cpp
+++ b/node/NetworkConfig.cpp
@@ -1,593 +1,233 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
+
+#include <stdint.h>
 
 #include "NetworkConfig.hpp"
-
-#include <algorithm>
-#include <stdint.h>
+#include "Utils.hpp"
 
 namespace ZeroTier {
 
-bool NetworkConfig::toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>& d, bool includeLegacy) const
+namespace {
+
+struct ZT_VirtualNetworkStaticDevice_SortByAddress
 {
-	Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY>* tmp = new Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY>();
-	char tmp2[128] = { 0 };
-
-	try {
-		d.clear();
-
-		// Try to put the more human-readable fields first
-
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_VERSION, (uint64_t)ZT_NETWORKCONFIG_VERSION)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID, this->networkId)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_TIMESTAMP, this->timestamp)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_CREDENTIAL_TIME_MAX_DELTA, this->credentialTimeMaxDelta)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_REVISION, this->revision)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO, this->issuedTo.toString(tmp2))) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_TARGET, this->remoteTraceTarget.toString(tmp2))) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_LEVEL, (uint64_t)this->remoteTraceLevel)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_FLAGS, this->flags)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT, (uint64_t)this->multicastLimit)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_TYPE, (uint64_t)this->type)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_NAME, this->name)) {
-			delete tmp;
-			return false;
-		}
-		if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_MTU, (uint64_t)this->mtu)) {
-			delete tmp;
-			return false;
-		}
-
-#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
-		if (includeLegacy) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST_OLD, this->enableBroadcast())) {
-				return false;
-			}
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_PRIVATE_OLD, this->isPrivate())) {
-				return false;
-			}
-
-			std::string v4s;
-			for (unsigned int i = 0; i < staticIpCount; ++i) {
-				if (this->staticIps[i].ss_family == AF_INET) {
-					if (v4s.length() > 0) {
-						v4s.push_back(',');
-					}
-					char buf[64];
-					v4s.append(this->staticIps[i].toString(buf));
-				}
-			}
-			if (v4s.length() > 0) {
-				if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC_OLD, v4s.c_str())) {
-					return false;
-				}
-			}
-			std::string v6s;
-			for (unsigned int i = 0; i < staticIpCount; ++i) {
-				if (this->staticIps[i].ss_family == AF_INET6) {
-					if (v6s.length() > 0) {
-						v6s.push_back(',');
-					}
-					char buf[64];
-					v6s.append(this->staticIps[i].toString(buf));
-				}
-			}
-			if (v6s.length() > 0) {
-				if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC_OLD, v6s.c_str())) {
-					return false;
-				}
-			}
-
-			std::string ets;
-			unsigned int et = 0;
-			ZT_VirtualNetworkRuleType lastrt = ZT_NETWORK_RULE_ACTION_ACCEPT;
-			for (unsigned int i = 0; i < ruleCount; ++i) {
-				ZT_VirtualNetworkRuleType rt = (ZT_VirtualNetworkRuleType)(rules[i].t & 0x7f);
-				if (rt == ZT_NETWORK_RULE_MATCH_ETHERTYPE) {
-					et = rules[i].v.etherType;
-				}
-				else if (rt == ZT_NETWORK_RULE_ACTION_ACCEPT) {
-					if (((int)lastrt < 32) || (lastrt == ZT_NETWORK_RULE_MATCH_ETHERTYPE)) {
-						if (ets.length() > 0) {
-							ets.push_back(',');
-						}
-						char tmp2[16] = { 0 };
-						ets.append(Utils::hex((uint16_t)et, tmp2));
-					}
-					et = 0;
-				}
-				lastrt = rt;
-			}
-			if (ets.length() > 0) {
-				if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES_OLD, ets.c_str())) {
-					return false;
-				}
-			}
-
-			if (this->com) {
-				if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP_OLD, this->com.toString().c_str())) {
-					return false;
-				}
-			}
-
-			std::string ab;
-			for (unsigned int i = 0; i < this->specialistCount; ++i) {
-				if ((this->specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE) != 0) {
-					if (ab.length() > 0) {
-						ab.push_back(',');
-					}
-					char tmp2[16] = { 0 };
-					ab.append(Address(this->specialists[i]).toString(tmp2));
-				}
-			}
-			if (ab.length() > 0) {
-				if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES_OLD, ab.c_str())) {
-					return false;
-				}
-			}
-		}
-#endif	 // ZT_SUPPORT_OLD_STYLE_NETCONF
-
-		// Then add binary blobs
-
-		if (this->com) {
-			tmp->clear();
-			this->com.serialize(*tmp);
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_COM, *tmp)) {
-				return false;
-			}
-		}
-
-		tmp->clear();
-		for (unsigned int i = 0; i < this->capabilityCount; ++i) {
-			this->capabilities[i].serialize(*tmp);
-		}
-		if (tmp->size()) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_CAPABILITIES, *tmp)) {
-				return false;
-			}
-		}
-
-		tmp->clear();
-		for (unsigned int i = 0; i < this->tagCount; ++i) {
-			this->tags[i].serialize(*tmp);
-		}
-		if (tmp->size()) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_TAGS, *tmp)) {
-				return false;
-			}
-		}
-
-		tmp->clear();
-		for (unsigned int i = 0; i < this->certificateOfOwnershipCount; ++i) {
-			this->certificatesOfOwnership[i].serialize(*tmp);
-		}
-		if (tmp->size()) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATES_OF_OWNERSHIP, *tmp)) {
-				return false;
-			}
-		}
-
-		tmp->clear();
-		for (unsigned int i = 0; i < this->specialistCount; ++i) {
-			tmp->append((uint64_t)this->specialists[i]);
-		}
-		if (tmp->size()) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_SPECIALISTS, *tmp)) {
-				return false;
-			}
-		}
-
-		tmp->clear();
-		for (unsigned int i = 0; i < this->routeCount; ++i) {
-			reinterpret_cast<const InetAddress*>(&(this->routes[i].target))->serialize(*tmp);
-			reinterpret_cast<const InetAddress*>(&(this->routes[i].via))->serialize(*tmp);
-			tmp->append((uint16_t)this->routes[i].flags);
-			tmp->append((uint16_t)this->routes[i].metric);
-		}
-		if (tmp->size()) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_ROUTES, *tmp)) {
-				return false;
-			}
-		}
-
-		tmp->clear();
-		for (unsigned int i = 0; i < this->staticIpCount; ++i) {
-			this->staticIps[i].serialize(*tmp);
-		}
-		if (tmp->size()) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_STATIC_IPS, *tmp)) {
-				return false;
-			}
-		}
-
-		if (this->ruleCount) {
-			tmp->clear();
-			Capability::serializeRules(*tmp, rules, ruleCount);
-			if (tmp->size()) {
-				if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_RULES, *tmp)) {
-					return false;
-				}
-			}
-		}
-
-		tmp->clear();
-		DNS::serializeDNS(*tmp, &dns);
-		if (tmp->size()) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_DNS, *tmp)) {
-				return false;
-			}
-		}
-
-		if (this->ssoVersion == 0) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_SSO_VERSION, this->ssoVersion)) {
-				return false;
-			}
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_SSO_ENABLED, this->ssoEnabled)) {
-				return false;
-			}
-
-			if (this->ssoEnabled) {
-				if (this->authenticationURL[0]) {
-					if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL, this->authenticationURL)) {
-						return false;
-					}
-				}
-				if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME, this->authenticationExpiryTime)) {
-					return false;
-				}
-			}
-		}
-		else if (this->ssoVersion == 1) {
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_SSO_VERSION, this->ssoVersion)) {
-				return false;
-			}
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_SSO_ENABLED, this->ssoEnabled)) {
-				return false;
-			}
-			// if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL, this->authenticationURL)) return false;
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_ISSUER_URL, this->issuerURL)) {
-				return false;
-			}
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_CENTRAL_ENDPOINT_URL, this->centralAuthURL)) {
-				return false;
-			}
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_NONCE, this->ssoNonce)) {
-				return false;
-			}
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_STATE, this->ssoState)) {
-				return false;
-			}
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_CLIENT_ID, this->ssoClientID)) {
-				return false;
-			}
-			if (! d.add(ZT_NETWORKCONFIG_DICT_KEY_SSO_PROVIDER, this->ssoProvider)) {
-				return false;
-			}
-		}
-
-		delete tmp;
-	}
-	catch (...) {
-		delete tmp;
-		throw;
+	inline bool operator()(const ZT_VirtualNetworkStaticDevice &a,const ZT_VirtualNetworkStaticDevice &b)
+	{
+		return (a.address < b.address);
 	}
+};
 
-	return true;
+struct ZT_VirtualNetworkRule_SortByRuleNo
+{
+	inline bool operator()(const ZT_VirtualNetworkRule &a,const ZT_VirtualNetworkRule &b)
+	{
+		return (a.ruleNo < b.ruleNo);
+	}
+};
+
+} // anonymous namespace
+
+NetworkConfig NetworkConfig::createTestNetworkConfig(const Address &self)
+{
+	NetworkConfig nc;
+
+	nc._nwid = ZT_TEST_NETWORK_ID;
+	nc._timestamp = 1;
+	nc._revision = 1;
+	nc._issuedTo = self;
+	nc._multicastLimit = ZT_MULTICAST_DEFAULT_LIMIT;
+	nc._allowPassiveBridging = false;
+	nc._type = ZT_NETWORK_TYPE_PUBLIC;
+	nc._enableBroadcast = true;
+
+	nc._rules[nc._ruleCount].ruleNo = 0;
+	nc._rules[nc._ruleCount].vlanId = -1;
+	nc._rules[nc._ruleCount].vlanPcp = -1;
+	nc._rules[nc._ruleCount].etherType = -1;
+	nc._rules[nc._ruleCount].ipTos = -1;
+	nc._rules[nc._ruleCount].ipProtocol = -1;
+	nc._rules[nc._ruleCount].ipSourcePort = -1;
+	nc._rules[nc._ruleCount].ipDestPort = -1;
+	nc._rules[nc._ruleCount].action = ZT_NETWORK_RULE_ACTION_ACCEPT;
+	++nc._ruleCount;
+
+	Utils::snprintf(nc._name,sizeof(nc._name),"ZT_TEST_NETWORK");
+
+	// Make up a V4 IP from 'self' in the 10.0.0.0/8 range -- no
+	// guarantee of uniqueness but collisions are unlikely.
+	uint32_t ip = (uint32_t)((self.toInt() & 0x00ffffff) | 0x0a000000); // 10.x.x.x
+	if ((ip & 0x000000ff) == 0x000000ff) ip ^= 0x00000001; // but not ending in .255
+	if ((ip & 0x000000ff) == 0x00000000) ip ^= 0x00000001; // or .0
+	nc._staticIps[0] = InetAddress(Utils::hton(ip),8);
+
+	// Assign an RFC4193-compliant IPv6 address -- will never collide
+	nc._staticIps[1] = InetAddress::makeIpv6rfc4193(ZT_TEST_NETWORK_ID,self.toInt());
+
+	nc._staticIpCount = 2;
+
+	return nc;
 }
 
-bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>& d)
-{
-	static const NetworkConfig NIL_NC;
-	Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY>* tmp = new Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY>();
-
-	try {
-		*this = NIL_NC;
-
-		// Fields that are always present, new or old
-		this->networkId = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID, 0);
-		if (! this->networkId) {
-			delete tmp;
-			return false;
-		}
-		this->timestamp = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_TIMESTAMP, 0);
-		this->credentialTimeMaxDelta = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_CREDENTIAL_TIME_MAX_DELTA, 0);
-		this->revision = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_REVISION, 0);
-		this->issuedTo = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO, 0);
-		if (! this->issuedTo) {
-			delete tmp;
-			return false;
-		}
-		this->remoteTraceTarget = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_TARGET);
-		this->remoteTraceLevel = (Trace::Level)d.getUI(ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_LEVEL);
-		this->multicastLimit = (unsigned int)d.getUI(ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT, 0);
-		d.get(ZT_NETWORKCONFIG_DICT_KEY_NAME, this->name, sizeof(this->name));
-
-		this->mtu = (unsigned int)d.getUI(ZT_NETWORKCONFIG_DICT_KEY_MTU, ZT_DEFAULT_MTU);
-		if (this->mtu < 1280) {
-			this->mtu = 1280;	// minimum MTU allowed by IPv6 standard and others
-		}
-		else if (this->mtu > ZT_MAX_MTU) {
-			this->mtu = ZT_MAX_MTU;
-		}
-
-		if (d.getUI(ZT_NETWORKCONFIG_DICT_KEY_VERSION, 0) < 6) {
 #ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
-			char tmp2[1024] = { 0 };
 
-			// Decode legacy fields if version is old
-			if (d.getB(ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST_OLD)) {
-				this->flags |= ZT_NETWORKCONFIG_FLAG_ENABLE_BROADCAST;
-			}
-			this->flags |= ZT_NETWORKCONFIG_FLAG_ENABLE_IPV6_NDP_EMULATION;	  // always enable for old-style netconf
-			this->type = (d.getB(ZT_NETWORKCONFIG_DICT_KEY_PRIVATE_OLD, true)) ? ZT_NETWORK_TYPE_PRIVATE : ZT_NETWORK_TYPE_PUBLIC;
+void NetworkConfig::fromDictionary(const Dictionary &d)
+{
+	static const std::string zero("0");
+	static const std::string one("1");
 
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC_OLD, tmp2, sizeof(tmp2)) > 0) {
-				char* saveptr = (char*)0;
-				for (char* f = Utils::stok(tmp2, ",", &saveptr); (f); f = Utils::stok((char*)0, ",", &saveptr)) {
-					if (this->staticIpCount >= ZT_MAX_ZT_ASSIGNED_ADDRESSES) {
-						break;
-					}
-					InetAddress ip(f);
-					if (! ip.isNetwork()) {
-						this->staticIps[this->staticIpCount++] = ip;
-					}
-				}
-			}
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC_OLD, tmp2, sizeof(tmp2)) > 0) {
-				char* saveptr = (char*)0;
-				for (char* f = Utils::stok(tmp2, ",", &saveptr); (f); f = Utils::stok((char*)0, ",", &saveptr)) {
-					if (this->staticIpCount >= ZT_MAX_ZT_ASSIGNED_ADDRESSES) {
-						break;
-					}
-					InetAddress ip(f);
-					if (! ip.isNetwork()) {
-						this->staticIps[this->staticIpCount++] = ip;
-					}
-				}
-			}
+	memset(this,0,sizeof(NetworkConfig));
 
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP_OLD, tmp2, sizeof(tmp2)) > 0) {
-				this->com.fromString(tmp2);
-			}
+	// NOTE: d.get(name) throws if not found, d.get(name,default) returns default
 
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES_OLD, tmp2, sizeof(tmp2)) > 0) {
-				char* saveptr = (char*)0;
-				for (char* f = Utils::stok(tmp2, ",", &saveptr); (f); f = Utils::stok((char*)0, ",", &saveptr)) {
-					unsigned int et = Utils::hexStrToUInt(f) & 0xffff;
-					if ((this->ruleCount + 2) > ZT_MAX_NETWORK_RULES) {
-						break;
-					}
-					if (et > 0) {
-						this->rules[this->ruleCount].t = (uint8_t)ZT_NETWORK_RULE_MATCH_ETHERTYPE;
-						this->rules[this->ruleCount].v.etherType = (uint16_t)et;
-						++this->ruleCount;
-					}
-					this->rules[this->ruleCount++].t = (uint8_t)ZT_NETWORK_RULE_ACTION_ACCEPT;
-				}
-			}
-			else {
-				this->rules[0].t = ZT_NETWORK_RULE_ACTION_ACCEPT;
-				this->ruleCount = 1;
-			}
+	_nwid = Utils::hexStrToU64(d.get(ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID,"0").c_str());
+	if (!_nwid)
+		throw std::invalid_argument("configuration contains zero network ID");
 
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES_OLD, tmp2, sizeof(tmp2)) > 0) {
-				char* saveptr = (char*)0;
-				for (char* f = Utils::stok(tmp2, ",", &saveptr); (f); f = Utils::stok((char*)0, ",", &saveptr)) {
-					this->addSpecialist(Address(Utils::hexStrToU64(f)), ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE);
-				}
-			}
-#else
-			delete tmp;
-			return false;
-#endif	 // ZT_SUPPORT_OLD_STYLE_NETCONF
-		}
-		else {
-			// Otherwise we can use the new fields
-			this->flags = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_FLAGS, 0);
-			this->type = (ZT_VirtualNetworkType)d.getUI(ZT_NETWORKCONFIG_DICT_KEY_TYPE, (uint64_t)ZT_NETWORK_TYPE_PRIVATE);
+	_timestamp = Utils::hexStrToU64(d.get(ZT_NETWORKCONFIG_DICT_KEY_TIMESTAMP,"0").c_str());
+	_revision = Utils::hexStrToU64(d.get(ZT_NETWORKCONFIG_DICT_KEY_REVISION,"1").c_str()); // older controllers don't send this, so default to 1
+	_issuedTo = Address(d.get(ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO,"0"));
 
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_COM, *tmp)) {
-				this->com.deserialize(*tmp, 0);
-			}
+	_multicastLimit = Utils::hexStrToUInt(d.get(ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT,zero).c_str());
+	if (_multicastLimit == 0) _multicastLimit = ZT_MULTICAST_DEFAULT_LIMIT;
 
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_CAPABILITIES, *tmp)) {
-				try {
-					unsigned int p = 0;
-					while (p < tmp->size()) {
-						Capability cap;
-						p += cap.deserialize(*tmp, p);
-						this->capabilities[this->capabilityCount++] = cap;
-					}
-				}
-				catch (...) {
-				}
-				std::sort(&(this->capabilities[0]), &(this->capabilities[this->capabilityCount]));
-			}
+	_allowPassiveBridging = (Utils::hexStrToUInt(d.get(ZT_NETWORKCONFIG_DICT_KEY_ALLOW_PASSIVE_BRIDGING,zero).c_str()) != 0);
+	_enableBroadcast = (Utils::hexStrToUInt(d.get(ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST,one).c_str()) != 0);
+	_type = (Utils::hexStrToUInt(d.get(ZT_NETWORKCONFIG_DICT_KEY_PRIVATE,one).c_str()) != 0) ? ZT_NETWORK_TYPE_PRIVATE : ZT_NETWORK_TYPE_PUBLIC;
 
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_TAGS, *tmp)) {
-				try {
-					unsigned int p = 0;
-					while (p < tmp->size()) {
-						Tag tag;
-						p += tag.deserialize(*tmp, p);
-						this->tags[this->tagCount++] = tag;
-					}
-				}
-				catch (...) {
-				}
-				std::sort(&(this->tags[0]), &(this->tags[this->tagCount]));
-			}
+	std::string nametmp(d.get(ZT_NETWORKCONFIG_DICT_KEY_NAME,""));
+	for(unsigned long i=0;((i<ZT_MAX_NETWORK_SHORT_NAME_LENGTH)&&(i<nametmp.length()));++i)
+		_name[i] = (char)nametmp[i];
+	// we zeroed the entire structure above and _name is ZT_MAX_NETWORK_SHORT_NAME_LENGTH+1, so it will always null-terminate
 
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATES_OF_OWNERSHIP, *tmp)) {
-				unsigned int p = 0;
-				while (p < tmp->size()) {
-					if (certificateOfOwnershipCount < ZT_MAX_CERTIFICATES_OF_OWNERSHIP) {
-						p += certificatesOfOwnership[certificateOfOwnershipCount++].deserialize(*tmp, p);
-					}
-					else {
-						CertificateOfOwnership foo;
-						p += foo.deserialize(*tmp, p);
-					}
-				}
-			}
-
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_SPECIALISTS, *tmp)) {
-				unsigned int p = 0;
-				while ((p + 8) <= tmp->size()) {
-					if (specialistCount < ZT_MAX_NETWORK_SPECIALISTS) {
-						this->specialists[this->specialistCount++] = tmp->at<uint64_t>(p);
-					}
-					p += 8;
-				}
-			}
-
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_ROUTES, *tmp)) {
-				unsigned int p = 0;
-				while ((p < tmp->size()) && (routeCount < ZT_MAX_NETWORK_ROUTES)) {
-					p += reinterpret_cast<InetAddress*>(&(this->routes[this->routeCount].target))->deserialize(*tmp, p);
-					p += reinterpret_cast<InetAddress*>(&(this->routes[this->routeCount].via))->deserialize(*tmp, p);
-					this->routes[this->routeCount].flags = tmp->at<uint16_t>(p);
-					p += 2;
-					this->routes[this->routeCount].metric = tmp->at<uint16_t>(p);
-					p += 2;
-					++this->routeCount;
-				}
-			}
-
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_STATIC_IPS, *tmp)) {
-				unsigned int p = 0;
-				while ((p < tmp->size()) && (staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES)) {
-					p += this->staticIps[this->staticIpCount++].deserialize(*tmp, p);
-				}
-			}
-
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_RULES, *tmp)) {
-				this->ruleCount = 0;
-				unsigned int p = 0;
-				Capability::deserializeRules(*tmp, p, this->rules, this->ruleCount, ZT_MAX_NETWORK_RULES);
-			}
-
-			if (d.get(ZT_NETWORKCONFIG_DICT_KEY_DNS, *tmp)) {
-				unsigned int p = 0;
-				DNS::deserializeDNS(*tmp, p, &dns);
-			}
-
-			this->ssoVersion = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_SSO_VERSION, 0ULL);
-			this->ssoEnabled = d.getB(ZT_NETWORKCONFIG_DICT_KEY_SSO_ENABLED, false);
-
-			if (this->ssoVersion == 0) {
-				// implicit flow
-				if (this->ssoEnabled) {
-					if (d.get(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL, this->authenticationURL, (unsigned int)sizeof(this->authenticationURL)) > 0) {
-						this->authenticationURL[sizeof(this->authenticationURL) - 1] = 0;	// ensure null terminated
-					}
-					else {
-						this->authenticationURL[0] = 0;
-					}
-					this->authenticationExpiryTime = d.getI(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME, 0);
-				}
-				else {
-					this->authenticationURL[0] = 0;
-					this->authenticationExpiryTime = 0;
-				}
-			}
-			else if (this->ssoVersion == 1) {
-				// full flow
-				if (this->ssoEnabled) {
-					if (d.get(ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL, this->authenticationURL, (unsigned int)sizeof(this->authenticationURL)) > 0) {
-						this->authenticationURL[sizeof(this->authenticationURL) - 1] = 0;
-					}
-					if (d.get(ZT_NETWORKCONFIG_DICT_KEY_ISSUER_URL, this->issuerURL, (unsigned int)sizeof(this->issuerURL)) > 0) {
-						this->issuerURL[sizeof(this->issuerURL) - 1] = 0;
-					}
-					if (d.get(ZT_NETWORKCONFIG_DICT_KEY_CENTRAL_ENDPOINT_URL, this->centralAuthURL, (unsigned int)sizeof(this->centralAuthURL)) > 0) {
-						this->centralAuthURL[sizeof(this->centralAuthURL) - 1] = 0;
-					}
-					if (d.get(ZT_NETWORKCONFIG_DICT_KEY_NONCE, this->ssoNonce, (unsigned int)sizeof(this->ssoNonce)) > 0) {
-						this->ssoNonce[sizeof(this->ssoNonce) - 1] = 0;
-					}
-					if (d.get(ZT_NETWORKCONFIG_DICT_KEY_STATE, this->ssoState, (unsigned int)sizeof(this->ssoState)) > 0) {
-						this->ssoState[sizeof(this->ssoState) - 1] = 0;
-					}
-					if (d.get(ZT_NETWORKCONFIG_DICT_KEY_CLIENT_ID, this->ssoClientID, (unsigned int)sizeof(this->ssoClientID)) > 0) {
-						this->ssoClientID[sizeof(this->ssoClientID) - 1] = 0;
-					}
-					if (d.get(ZT_NETWORKCONFIG_DICT_KEY_SSO_PROVIDER, this->ssoProvider, (unsigned int)(sizeof(this->ssoProvider))) > 0) {
-						this->ssoProvider[sizeof(this->ssoProvider) - 1] = 0;
-					}
-					else {
-						strncpy(this->ssoProvider, "default", sizeof(this->ssoProvider));
-						this->ssoProvider[sizeof(this->ssoProvider) - 1] = 0;
-					}
-				}
-				else {
-					this->authenticationURL[0] = 0;
-					this->authenticationExpiryTime = 0;
-					this->centralAuthURL[0] = 0;
-					this->ssoNonce[0] = 0;
-					this->ssoState[0] = 0;
-					this->ssoClientID[0] = 0;
-					this->issuerURL[0] = 0;
-					this->ssoProvider[0] = 0;
-				}
+	std::vector<std::string> activeBridgesSplit(Utils::split(d.get(ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES,"").c_str(),",","",""));
+	for(std::vector<std::string>::const_iterator a(activeBridgesSplit.begin());a!=activeBridgesSplit.end();++a) {
+		if (a->length() == ZT_ADDRESS_LENGTH_HEX) { // ignore empty or garbage fields
+			Address tmp(*a);
+			if (!tmp.isReserved()) {
+				if ((_activeBridgeCount < ZT_MAX_NETWORK_ACTIVE_BRIDGES)&&(std::find(&(_activeBridges[0]),&(_activeBridges[_activeBridgeCount]),tmp) == &(_activeBridges[_activeBridgeCount])))
+					_activeBridges[_activeBridgeCount++] = tmp;
 			}
 		}
-
-		// printf("~~~\n%s\n~~~\n",d.data());
-		// dump();
-		// printf("~~~\n");
-
-		delete tmp;
-		return true;
 	}
-	catch (...) {
-		delete tmp;
-		return false;
+	std::sort(&(_activeBridges[0]),&(_activeBridges[_activeBridgeCount]));
+
+	std::string ipAddrs(d.get(ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC,std::string()));
+	{
+		std::string v6s(d.get(ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC,std::string()));
+		if (v6s.length()) {
+			if (ipAddrs.length())
+				ipAddrs.push_back(',');
+			ipAddrs.append(v6s);
+		}
 	}
+	std::vector<std::string> ipAddrsSplit(Utils::split(ipAddrs.c_str(),",","",""));
+	for(std::vector<std::string>::const_iterator ipstr(ipAddrsSplit.begin());ipstr!=ipAddrsSplit.end();++ipstr) {
+		InetAddress addr(*ipstr);
+		switch(addr.ss_family) {
+			case AF_INET:
+				if ((!addr.netmaskBits())||(addr.netmaskBits() > 32))
+					continue;
+				break;
+			case AF_INET6:
+				if ((!addr.netmaskBits())||(addr.netmaskBits() > 128))
+					continue;
+				break;
+			default: // ignore unrecognized address types or junk/empty fields
+				continue;
+		}
+		if (addr.isNetwork()) {
+			if ((_localRouteCount < ZT_MAX_NETWORK_LOCAL_ROUTES)&&(std::find(&(_localRoutes[0]),&(_localRoutes[_localRouteCount]),addr) == &(_localRoutes[_localRouteCount])))
+				_localRoutes[_localRouteCount++] = addr;
+		} else {
+			if ((_staticIpCount < ZT_MAX_ZT_ASSIGNED_ADDRESSES)&&(std::find(&(_staticIps[0]),&(_staticIps[_staticIpCount]),addr) == &(_staticIps[_staticIpCount])))
+				_staticIps[_staticIpCount++] = addr;
+		}
+	}
+	std::sort(&(_localRoutes[0]),&(_localRoutes[_localRouteCount]));
+	std::sort(&(_staticIps[0]),&(_staticIps[_staticIpCount]));
+
+	std::vector<std::string> gatewaysSplit(Utils::split(d.get(ZT_NETWORKCONFIG_DICT_KEY_GATEWAYS,"").c_str(),",","",""));
+	for(std::vector<std::string>::const_iterator gwstr(gatewaysSplit.begin());gwstr!=gatewaysSplit.end();++gwstr) {
+		InetAddress gw(*gwstr);
+		if ((gw)&&(_gatewayCount < ZT_MAX_NETWORK_GATEWAYS)&&(std::find(&(_gateways[0]),&(_gateways[_gatewayCount]),gw) == &(_gateways[_gatewayCount])))
+			_gateways[_gatewayCount++] = gw;
+	}
+	std::sort(&(_gateways[0]),&(_gateways[_gatewayCount]));
+
+	std::vector<std::string> relaysSplit(Utils::split(d.get(ZT_NETWORKCONFIG_DICT_KEY_RELAYS,"").c_str(),",","",""));
+	for(std::vector<std::string>::const_iterator r(relaysSplit.begin());r!=relaysSplit.end();++r) {
+		if (r->length() >= ZT_ADDRESS_LENGTH_HEX) {
+			Address addr(r->substr(0,ZT_ADDRESS_LENGTH_HEX).c_str());
+			InetAddress phys[2];
+			unsigned int physCount = 0;
+			const std::size_t semi(r->find(';'));
+			if ((semi > ZT_ADDRESS_LENGTH_HEX)&&(semi < (r->length() - 2))) {
+				std::vector<std::string> phySplit(Utils::split(r->substr(semi+1).c_str(),",","",""));
+				for(std::vector<std::string>::const_iterator p(phySplit.begin());((p!=phySplit.end())&&(physCount < 2));++p) {
+					phys[physCount] = InetAddress(*p);
+					if (phys[physCount])
+						++physCount;
+					else phys[physCount].zero();
+				}
+			}
+
+			unsigned int p = _staticCount;
+			for(unsigned int i=0;i<_staticCount;++i) {
+				if (_static[p].address == addr.toInt()) {
+					p = i;
+					break;
+				}
+			}
+			if ((p == _staticCount)&&(_staticCount < ZT_MAX_NETWORK_STATIC_DEVICES))
+				++_staticCount;
+			if (p < ZT_MAX_NETWORK_STATIC_DEVICES) {
+				_static[p].address = Address(r->c_str());
+				for(unsigned int i=0;i<physCount;++i)
+					_static[p].physical[i] = phys[i];
+				_static[p].flags |= ZT_NETWORK_STATIC_DEVICE_IS_RELAY;
+			}
+		}
+	}
+	std::sort(&(_static[0]),&(_static[_staticCount]),ZT_VirtualNetworkStaticDevice_SortByAddress());
+
+	std::vector<std::string> ets(Utils::split(d.get(ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES,"").c_str(),",","",""));
+	int rno = 0;
+	for(std::vector<std::string>::const_iterator et(ets.begin());et!=ets.end();++et) {
+		unsigned int et2 = Utils::hexStrToUInt(et->c_str()) & 0xffff;
+		if (_ruleCount < ZT_MAX_NETWORK_RULES) {
+			memset(&(_rules[_ruleCount]),0,sizeof(ZT_VirtualNetworkRule));
+			_rules[_ruleCount].ruleNo = rno; rno += 10;
+			_rules[_ruleCount].vlanId = -1;
+			_rules[_ruleCount].vlanPcp = -1;
+			_rules[_ruleCount].etherType = (et2 == 0) ? -1 : (int)et2;
+			_rules[_ruleCount].ipTos = -1;
+			_rules[_ruleCount].ipProtocol = -1;
+			_rules[_ruleCount].ipSourcePort = -1;
+			_rules[_ruleCount].ipDestPort = -1;
+			_rules[_ruleCount].action = ZT_NETWORK_RULE_ACTION_ACCEPT;
+			++_ruleCount;
+		}
+	}
+
+	_com.fromString(d.get(ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP,std::string()));
 }
 
-}	// namespace ZeroTier
+#endif // ZT_SUPPORT_OLD_STYLE_NETCONF
+
+} // namespace ZeroTier
diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp
index 30598cf2f..c3cc9cd46 100644
--- a/node/NetworkConfig.hpp
+++ b/node/NetworkConfig.hpp
@@ -1,142 +1,58 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_NETWORKCONFIG_HPP
 #define ZT_NETWORKCONFIG_HPP
 
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <map>
+#include <vector>
+#include <string>
+#include <stdexcept>
+#include <algorithm>
+
 #include "../include/ZeroTierOne.h"
-#include "Address.hpp"
-#include "Buffer.hpp"
-#include "Capability.hpp"
-#include "CertificateOfMembership.hpp"
-#include "CertificateOfOwnership.hpp"
+
 #include "Constants.hpp"
-#include "DNS.hpp"
 #include "Dictionary.hpp"
-#include "Hashtable.hpp"
-#include "Identity.hpp"
+#include "Buffer.hpp"
 #include "InetAddress.hpp"
 #include "MulticastGroup.hpp"
-#include "Tag.hpp"
-#include "Trace.hpp"
-#include "Utils.hpp"
-
-#include <algorithm>
-#include <stdexcept>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <vector>
-
-/**
- * Default time delta for COMs, tags, and capabilities
- */
-#define ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_DFL_MAX_DELTA ((int64_t)(1000 * 60 * 30))
-
-/**
- * Maximum time delta for COMs, tags, and capabilities
- */
-#define ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MAX_MAX_DELTA ((int64_t)(1000 * 60 * 60 * 2))
-
-/**
- * Minimum credential TTL and maxDelta for COM timestamps
- */
-#define ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MIN_MAX_DELTA ((int64_t)(1000 * 60 * 5))
-
-/**
- * Flag: enable broadcast
- */
-#define ZT_NETWORKCONFIG_FLAG_ENABLE_BROADCAST 0x0000000000000002ULL
-
-/**
- * Flag: enable IPv6 NDP emulation for certain V6 address patterns
- */
-#define ZT_NETWORKCONFIG_FLAG_ENABLE_IPV6_NDP_EMULATION 0x0000000000000004ULL
-
-/**
- * Flag: result of unrecognized MATCH entries in a rules table: match if set, no-match if clear
- */
-#define ZT_NETWORKCONFIG_FLAG_RULES_RESULT_OF_UNSUPPORTED_MATCH 0x0000000000000008ULL
-
-/**
- * Flag: disable frame compression
- */
-#define ZT_NETWORKCONFIG_FLAG_DISABLE_COMPRESSION 0x0000000000000010ULL
-
-/**
- * Device can bridge to other Ethernet networks and gets unknown recipient multicasts
- */
-#define ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE 0x0000020000000000ULL
-
-/**
- * Anchors are stable devices on this network that can act like roots when none are up
- */
-#define ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR 0x0000040000000000ULL
-
-/**
- * Designated multicast replicators replicate multicast in place of sender-side replication
- */
-#define ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR 0x0000080000000000ULL
+#include "Address.hpp"
+#include "CertificateOfMembership.hpp"
 
 namespace ZeroTier {
 
-// Dictionary capacity needed for max size network config
-#define ZT_NETWORKCONFIG_DICT_CAPACITY                                                                                                                                                                                                         \
-	(4096 + (sizeof(ZT_VirtualNetworkConfig)) + (sizeof(ZT_VirtualNetworkRule) * ZT_MAX_NETWORK_RULES) + (sizeof(Capability) * ZT_MAX_NETWORK_CAPABILITIES) + (sizeof(Tag) * ZT_MAX_NETWORK_TAGS)                                              \
-	 + (sizeof(CertificateOfOwnership) * ZT_MAX_CERTIFICATES_OF_OWNERSHIP))
-
-// Dictionary capacity needed for max size network meta-data
-#define ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY 1024
-
-// Network config version
-#define ZT_NETWORKCONFIG_VERSION 7
+#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
 
 // Fields for meta-data sent with network config requests
-
-// Network config version
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_VERSION "v"
-// Network config version
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_OS_ARCH "o"
-// Protocol version (see Packet.hpp)
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_PROTOCOL_VERSION "pv"
-// Software vendor
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_VENDOR "vend"
-// Software major version
 #define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MAJOR_VERSION "majv"
-// Software minor version
 #define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MINOR_VERSION "minv"
-// Software revision
 #define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_REVISION "revv"
-// Rules engine revision
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_RULES_ENGINE_REV "revr"
-// Maximum number of rules per network this node can accept
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_MAX_NETWORK_RULES "mr"
-// Maximum number of capabilities this node can accept
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_MAX_NETWORK_CAPABILITIES "mc"
-// Maximum number of rules per capability this node can accept
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_MAX_CAPABILITY_RULES "mcr"
-// Maximum number of tags this node can accept
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_MAX_NETWORK_TAGS "mt"
-// Network join authorization token (if any)
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_AUTH "a"
-// Network configuration meta-data flags
-#define ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_FLAGS "f"
 
-// These dictionary keys are short so they don't take up much room.
-// By convention we use upper case for binary blobs, but it doesn't really matter.
+// These dictionary keys are short so they don't take up much room in
+// netconf response packets.
 
-// network config version
-#define ZT_NETWORKCONFIG_DICT_KEY_VERSION "v"
+// integer(hex)[,integer(hex),...]
+#define ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES "et"
 // network ID
 #define ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID "nwid"
 // integer(hex)
@@ -145,102 +61,34 @@ namespace ZeroTier {
 #define ZT_NETWORKCONFIG_DICT_KEY_REVISION "r"
 // address of member
 #define ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO "id"
-// remote trace target
-#define ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_TARGET "tt"
-// remote trace level
-#define ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_LEVEL "tl"
-// flags(hex)
-#define ZT_NETWORKCONFIG_DICT_KEY_FLAGS "f"
 // integer(hex)
 #define ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT "ml"
-// network type (hex)
-#define ZT_NETWORKCONFIG_DICT_KEY_TYPE "t"
+// 0/1
+#define ZT_NETWORKCONFIG_DICT_KEY_PRIVATE "p"
 // text
 #define ZT_NETWORKCONFIG_DICT_KEY_NAME "n"
-// network MTU
-#define ZT_NETWORKCONFIG_DICT_KEY_MTU "mtu"
-// credential time max delta in ms
-#define ZT_NETWORKCONFIG_DICT_KEY_CREDENTIAL_TIME_MAX_DELTA "ctmd"
-// binary serialized certificate of membership
-#define ZT_NETWORKCONFIG_DICT_KEY_COM "C"
-// specialists (binary array of uint64_t)
-#define ZT_NETWORKCONFIG_DICT_KEY_SPECIALISTS "S"
-// routes (binary blob)
-#define ZT_NETWORKCONFIG_DICT_KEY_ROUTES "RT"
-// static IPs (binary blob)
-#define ZT_NETWORKCONFIG_DICT_KEY_STATIC_IPS "I"
-// rules (binary blob)
-#define ZT_NETWORKCONFIG_DICT_KEY_RULES "R"
-// capabilities (binary blobs)
-#define ZT_NETWORKCONFIG_DICT_KEY_CAPABILITIES "CAP"
-// tags (binary blobs)
-#define ZT_NETWORKCONFIG_DICT_KEY_TAGS "TAG"
-// tags (binary blobs)
-#define ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATES_OF_OWNERSHIP "COO"
-// dns (binary blobs)
-#define ZT_NETWORKCONFIG_DICT_KEY_DNS "DNS"
-// sso enabled
-#define ZT_NETWORKCONFIG_DICT_KEY_SSO_ENABLED "ssoe"
-// so version
-#define ZT_NETWORKCONFIG_DICT_KEY_SSO_VERSION "ssov"
-// authentication URL
-#define ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_URL "aurl"
-// authentication expiry
-#define ZT_NETWORKCONFIG_DICT_KEY_AUTHENTICATION_EXPIRY_TIME "aexpt"
-// oidc issuer URL
-#define ZT_NETWORKCONFIG_DICT_KEY_ISSUER_URL "iurl"
-// central endpoint
-#define ZT_NETWORKCONFIG_DICT_KEY_CENTRAL_ENDPOINT_URL "ssoce"
-// nonce
-#define ZT_NETWORKCONFIG_DICT_KEY_NONCE "sson"
-// state
-#define ZT_NETWORKCONFIG_DICT_KEY_STATE "ssos"
-// client ID
-#define ZT_NETWORKCONFIG_DICT_KEY_CLIENT_ID "ssocid"
-// SSO Provider
-#define ZT_NETWORKCONFIG_DICT_KEY_SSO_PROVIDER "ssop"
-
-// AuthInfo fields -- used by ncSendError for sso
-
-// AuthInfo Version
-#define ZT_AUTHINFO_DICT_KEY_VERSION "aV"
-// authentication URL
-#define ZT_AUTHINFO_DICT_KEY_AUTHENTICATION_URL "aU"
-// issuer URL
-#define ZT_AUTHINFO_DICT_KEY_ISSUER_URL "iU"
-// Central endpoint URL
-#define ZT_AUTHINFO_DICT_KEY_CENTRAL_ENDPOINT_URL "aCU"
-// Nonce
-#define ZT_AUTHINFO_DICT_KEY_NONCE "aN"
-// State
-#define ZT_AUTHINFO_DICT_KEY_STATE "aS"
-// Client ID
-#define ZT_AUTHINFO_DICT_KEY_CLIENT_ID "aCID"
-// SSO Provider
-#define ZT_AUTHINFO_DICT_KEY_SSO_PROVIDER "aSSOp"
-
-// Legacy fields -- these are obsoleted but are included when older clients query
-
-// boolean (now a flag)
-#define ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST_OLD "eb"
+// text
+#define ZT_NETWORKCONFIG_DICT_KEY_DESC "d"
 // IP/bits[,IP/bits,...]
 // Note that IPs that end in all zeroes are routes with no assignment in them.
-#define ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC_OLD "v4s"
+#define ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC "v4s"
 // IP/bits[,IP/bits,...]
 // Note that IPs that end in all zeroes are routes with no assignment in them.
-#define ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC_OLD "v6s"
+#define ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC "v6s"
+// serialized CertificateOfMembership
+#define ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP "com"
 // 0/1
-#define ZT_NETWORKCONFIG_DICT_KEY_PRIVATE_OLD "p"
-// integer(hex)[,integer(hex),...]
-#define ZT_NETWORKCONFIG_DICT_KEY_ALLOWED_ETHERNET_TYPES_OLD "et"
-// string-serialized CertificateOfMembership
-#define ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP_OLD "com"
+#define ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST "eb"
+// 0/1
+#define ZT_NETWORKCONFIG_DICT_KEY_ALLOW_PASSIVE_BRIDGING "pb"
 // node[,node,...]
-#define ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES_OLD "ab"
+#define ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES "ab"
 // node;IP/port[,node;IP/port]
-#define ZT_NETWORKCONFIG_DICT_KEY_RELAYS_OLD "rl"
+#define ZT_NETWORKCONFIG_DICT_KEY_RELAYS "rl"
+// IP/metric[,IP/metric,...]
+#define ZT_NETWORKCONFIG_DICT_KEY_GATEWAYS "gw"
 
-// End legacy fields
+#endif // ZT_SUPPORT_OLD_STYLE_NETCONF
 
 /**
  * Network configuration received from network controller nodes
@@ -248,507 +96,165 @@ namespace ZeroTier {
  * This is a memcpy()'able structure and is safe (in a crash sense) to modify
  * without locks.
  */
-class NetworkConfig {
-  public:
+class NetworkConfig
+{
+public:
+	/**
+	 * Create an instance of a NetworkConfig for the test network ID
+	 *
+	 * The test network ID is defined as ZT_TEST_NETWORK_ID. This is a
+	 * "fake" network with no real controller and default options.
+	 *
+	 * @param self This node's ZT address
+	 * @return Configuration for test network ID
+	 */
+	static NetworkConfig createTestNetworkConfig(const Address &self);
+
 	NetworkConfig()
-		: networkId(0)
-		, timestamp(0)
-		, credentialTimeMaxDelta(0)
-		, revision(0)
-		, issuedTo()
-		, remoteTraceTarget()
-		, flags(0)
-		, remoteTraceLevel(Trace::LEVEL_NORMAL)
-		, mtu(0)
-		, multicastLimit(0)
-		, specialistCount(0)
-		, routeCount(0)
-		, staticIpCount(0)
-		, ruleCount(0)
-		, capabilityCount(0)
-		, tagCount(0)
-		, certificateOfOwnershipCount(0)
-		, capabilities()
-		, tags()
-		, certificatesOfOwnership()
-		, type(ZT_NETWORK_TYPE_PRIVATE)
-		, dnsCount(0)
-		, ssoEnabled(false)
-		, authenticationURL()
-		, authenticationExpiryTime(0)
-		, issuerURL()
-		, centralAuthURL()
-		, ssoNonce()
-		, ssoState()
-		, ssoClientID()
 	{
-		name[0] = 0;
-		memset(specialists, 0, sizeof(uint64_t) * ZT_MAX_NETWORK_SPECIALISTS);
-		memset(routes, 0, sizeof(ZT_VirtualNetworkRoute) * ZT_MAX_NETWORK_ROUTES);
-		memset(staticIps, 0, sizeof(InetAddress) * ZT_MAX_ZT_ASSIGNED_ADDRESSES);
-		memset(rules, 0, sizeof(ZT_VirtualNetworkRule) * ZT_MAX_NETWORK_RULES);
-		memset(&dns, 0, sizeof(ZT_VirtualNetworkDNS));
-		memset(authenticationURL, 0, sizeof(authenticationURL));
-		memset(issuerURL, 0, sizeof(issuerURL));
-		memset(centralAuthURL, 0, sizeof(centralAuthURL));
-		memset(ssoNonce, 0, sizeof(ssoNonce));
-		memset(ssoState, 0, sizeof(ssoState));
-		memset(ssoClientID, 0, sizeof(ssoClientID));
-		strncpy(ssoProvider, "default", sizeof(ssoProvider));
+		memset(this,0,sizeof(NetworkConfig));
+	}
+
+	NetworkConfig(const NetworkConfig &nc)
+	{
+		memcpy(this,&nc,sizeof(NetworkConfig));
+	}
+
+	inline NetworkConfig &operator=(const NetworkConfig &nc)
+	{
+		memcpy(this,&nc,sizeof(NetworkConfig));
+		return *this;
 	}
 
 	/**
-	 * Write this network config to a dictionary for transport
-	 *
-	 * @param d Dictionary
-	 * @param includeLegacy If true, include legacy fields for old node versions
-	 * @return True if dictionary was successfully created, false if e.g. overflow
+	 * @param etherType Ethernet frame type to check
+	 * @return True if allowed on this network
 	 */
-	bool toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>& d, bool includeLegacy) const;
-
-	/**
-	 * Read this network config from a dictionary
-	 *
-	 * @param d Dictionary (non-const since it might be modified during parse, should not be used after call)
-	 * @return True if dictionary was valid and network config successfully initialized
-	 */
-	bool fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>& d);
-
-	/**
-	 * @return True if broadcast (ff:ff:ff:ff:ff:ff) address should work on this network
-	 */
-	inline bool enableBroadcast() const
+	inline bool permitsEtherType(unsigned int etherType) const
 	{
-		return ((this->flags & ZT_NETWORKCONFIG_FLAG_ENABLE_BROADCAST) != 0);
-	}
-
-	/**
-	 * @return True if IPv6 NDP emulation should be allowed for certain "magic" IPv6 address patterns
-	 */
-	inline bool ndpEmulation() const
-	{
-		return ((this->flags & ZT_NETWORKCONFIG_FLAG_ENABLE_IPV6_NDP_EMULATION) != 0);
-	}
-
-	/**
-	 * @return True if frames should not be compressed
-	 */
-	inline bool disableCompression() const
-	{
-#ifndef ZT_DISABLE_COMPRESSION
-		return ((this->flags & ZT_NETWORKCONFIG_FLAG_DISABLE_COMPRESSION) != 0);
-#else
-		/* Compression is disabled for libzt builds since it causes non-obvious chaotic
-		interference with lwIP's TCP congestion algorithm. Compression is also disabled
-		for some NAS builds due to the usage of low-performance processors in certain
-		older and budget models. */
+		for(unsigned int i=0;i<_ruleCount;++i) {
+			if ((_rules[i].etherType < 0)||((unsigned int)_rules[i].etherType == etherType))
+				return (_rules[i].action == ZT_NETWORK_RULE_ACTION_ACCEPT);
+		}
 		return false;
+	}
+
+#ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
+	/**
+	 * Parse an old-style dictionary and fill in structure
+	 *
+	 * @throws std::invalid_argument Invalid dictionary
+	 */
+	void fromDictionary(const Dictionary &d);
 #endif
-	}
 
-	/**
-	 * @return Network type is public (no access control)
-	 */
-	inline bool isPublic() const
+	inline uint64_t networkId() const throw() { return _nwid; }
+	inline uint64_t timestamp() const throw() { return _timestamp; }
+	inline uint64_t revision() const throw() { return _revision; }
+	inline const Address &issuedTo() const throw() { return _issuedTo; }
+	inline unsigned int multicastLimit() const throw() { return _multicastLimit; }
+	inline bool allowPassiveBridging() const throw() { return _allowPassiveBridging; }
+	inline bool enableBroadcast() const throw() { return _enableBroadcast; }
+	inline ZT_VirtualNetworkType type() const throw() { return _type; }
+	inline bool isPublic() const throw() { return (_type == ZT_NETWORK_TYPE_PUBLIC); }
+	inline bool isPrivate() const throw() { return (_type == ZT_NETWORK_TYPE_PRIVATE); }
+	inline const char *name() const throw() { return _name; }
+	inline const CertificateOfMembership &com() const throw() { return _com; }
+
+	inline std::vector<InetAddress> localRoutes() const
 	{
-		return (this->type == ZT_NETWORK_TYPE_PUBLIC);
+		std::vector<InetAddress> r;
+		for(unsigned int i=0;i<_localRouteCount;++i)
+			r.push_back(_localRoutes[i]);
+		return r;
 	}
 
-	/**
-	 * @return Network type is private (certificate access control)
-	 */
-	inline bool isPrivate() const
+	inline std::vector<InetAddress> staticIps() const
 	{
-		return (this->type == ZT_NETWORK_TYPE_PRIVATE);
+		std::vector<InetAddress> r;
+		for(unsigned int i=0;i<_staticIpCount;++i)
+			r.push_back(_staticIps[i]);
+		return r;
+	}
+
+	inline std::vector<InetAddress> gateways() const
+	{
+		std::vector<InetAddress> r;
+		for(unsigned int i=0;i<_gatewayCount;++i)
+			r.push_back(_gateways[i]);
+		return r;
 	}
 
-	/**
-	 * @return ZeroTier addresses of devices on this network designated as active bridges
-	 */
 	inline std::vector<Address> activeBridges() const
 	{
 		std::vector<Address> r;
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE) != 0) {
-				r.push_back(Address(specialists[i]));
-			}
+		for(unsigned int i=0;i<_activeBridgeCount;++i)
+			r.push_back(_activeBridges[i]);
+		return r;
+	}
+
+	inline std::vector<ZT_VirtualNetworkStaticDevice> relays() const
+	{
+		std::vector<ZT_VirtualNetworkStaticDevice> r;
+		for(unsigned int i=0;i<_staticCount;++i) {
+			if ((_static[i].flags & ZT_NETWORK_STATIC_DEVICE_IS_RELAY) != 0)
+				r.push_back(_static[i]);
 		}
 		return r;
 	}
 
-	inline unsigned int activeBridges(Address ab[ZT_MAX_NETWORK_SPECIALISTS]) const
-	{
-		unsigned int c = 0;
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE) != 0) {
-				ab[c++] = specialists[i];
-			}
-		}
-		return c;
-	}
-
-	inline bool isActiveBridge(const Address& a) const
-	{
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if (((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE) != 0) && (a == specialists[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	inline std::vector<Address> anchors() const
-	{
-		std::vector<Address> r;
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR) != 0) {
-				r.push_back(Address(specialists[i]));
-			}
-		}
-		return r;
-	}
-
-	inline std::vector<Address> multicastReplicators() const
-	{
-		std::vector<Address> r;
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR) != 0) {
-				r.push_back(Address(specialists[i]));
-			}
-		}
-		return r;
-	}
-
-	inline unsigned int multicastReplicators(Address mr[ZT_MAX_NETWORK_SPECIALISTS]) const
-	{
-		unsigned int c = 0;
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR) != 0) {
-				mr[c++] = specialists[i];
-			}
-		}
-		return c;
-	}
-
-	inline bool isMulticastReplicator(const Address& a) const
-	{
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if (((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR) != 0) && (a == specialists[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	inline std::vector<Address> alwaysContactAddresses() const
-	{
-		std::vector<Address> r;
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & (ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR | ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR)) != 0) {
-				r.push_back(Address(specialists[i]));
-			}
-		}
-		return r;
-	}
-
-	inline unsigned int alwaysContactAddresses(Address ac[ZT_MAX_NETWORK_SPECIALISTS]) const
-	{
-		unsigned int c = 0;
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & (ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR | ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR)) != 0) {
-				ac[c++] = specialists[i];
-			}
-		}
-		return c;
-	}
-
-	inline void alwaysContactAddresses(Hashtable<Address, std::vector<InetAddress> >& a) const
-	{
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & (ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR | ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR)) != 0) {
-				a[Address(specialists[i])];
-			}
-		}
-	}
+	const ZT_VirtualNetworkStaticDevice &staticDevice(unsigned int i) const { return _static[i]; }
+	unsigned int staticDeviceCount() const { return _staticCount; }
 
 	/**
 	 * @param fromPeer Peer attempting to bridge other Ethernet peers onto network
 	 * @return True if this network allows bridging
 	 */
-	inline bool permitsBridging(const Address& fromPeer) const
+	inline bool permitsBridging(const Address &fromPeer) const
 	{
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((fromPeer == specialists[i]) && ((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_ACTIVE_BRIDGE) != 0)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	inline operator bool() const
-	{
-		return (networkId != 0);
-	}
-	inline bool operator==(const NetworkConfig& nc) const
-	{
-		return (memcmp(this, &nc, sizeof(NetworkConfig)) == 0);
-	}
-	inline bool operator!=(const NetworkConfig& nc) const
-	{
-		return (! (*this == nc));
-	}
-
-	/**
-	 * Add a specialist or mask flags if already present
-	 *
-	 * This masks the existing flags if the specialist is already here or adds
-	 * it otherwise.
-	 *
-	 * @param a Address of specialist
-	 * @param f Flags (OR of specialist role/type flags)
-	 * @return True if successfully masked or added
-	 */
-	inline bool addSpecialist(const Address& a, const uint64_t f)
-	{
-		const uint64_t aint = a.toInt();
-		for (unsigned int i = 0; i < specialistCount; ++i) {
-			if ((specialists[i] & 0xffffffffffULL) == aint) {
-				specialists[i] |= f;
-				return true;
-			}
-		}
-		if (specialistCount < ZT_MAX_NETWORK_SPECIALISTS) {
-			specialists[specialistCount++] = f | aint;
+		if (_allowPassiveBridging)
 			return true;
+		for(unsigned int i=0;i<_activeBridgeCount;++i) {
+			if (_activeBridges[i] == fromPeer)
+				return true;
 		}
 		return false;
 	}
 
-	const Capability* capability(const uint32_t id) const
-	{
-		for (unsigned int i = 0; i < capabilityCount; ++i) {
-			if (capabilities[i].id() == id) {
-				return &(capabilities[i]);
-			}
-		}
-		return (Capability*)0;
-	}
+	inline operator bool() const throw() { return (_nwid != 0); }
 
-	const Tag* tag(const uint32_t id) const
-	{
-		for (unsigned int i = 0; i < tagCount; ++i) {
-			if (tags[i].id() == id) {
-				return &(tags[i]);
-			}
-		}
-		return (Tag*)0;
-	}
+	inline bool operator==(const NetworkConfig &nc) const { return (memcmp(this,&nc,sizeof(NetworkConfig)) == 0); }
+	inline bool operator!=(const NetworkConfig &nc) const { return (!(*this == nc)); }
 
-	/**
-	 * Network ID that this configuration applies to
-	 */
-	uint64_t networkId;
+protected: // protected so that a subclass can fill this out in network controller code
+	uint64_t _nwid;
+	uint64_t _timestamp;
+	uint64_t _revision;
+	Address _issuedTo;
+	unsigned int _multicastLimit;
+	bool _allowPassiveBridging;
+	bool _enableBroadcast;
+	ZT_VirtualNetworkType _type;
 
-	/**
-	 * Controller-side time of config generation/issue
-	 */
-	int64_t timestamp;
+	char _name[ZT_MAX_NETWORK_SHORT_NAME_LENGTH + 1];
 
-	/**
-	 * Max difference between timestamp and tag/capability timestamp
-	 */
-	int64_t credentialTimeMaxDelta;
+	Address _activeBridges[ZT_MAX_NETWORK_ACTIVE_BRIDGES];
+	InetAddress _localRoutes[ZT_MAX_NETWORK_LOCAL_ROUTES];
+	InetAddress _staticIps[ZT_MAX_ZT_ASSIGNED_ADDRESSES];
+	InetAddress _gateways[ZT_MAX_NETWORK_GATEWAYS];
+	ZT_VirtualNetworkStaticDevice _static[ZT_MAX_NETWORK_STATIC_DEVICES];
+	ZT_VirtualNetworkRule _rules[ZT_MAX_NETWORK_RULES];
 
-	/**
-	 * Controller-side revision counter for this configuration
-	 */
-	uint64_t revision;
+	unsigned int _activeBridgeCount;
+	unsigned int _localRouteCount;
+	unsigned int _staticIpCount;
+	unsigned int _gatewayCount;
+	unsigned int _staticCount;
+	unsigned int _ruleCount;
 
-	/**
-	 * Address of device to which this config is issued
-	 */
-	Address issuedTo;
-
-	/**
-	 * If non-NULL, remote traces related to this network are sent here
-	 */
-	Address remoteTraceTarget;
-
-	/**
-	 * Flags (64-bit)
-	 */
-	uint64_t flags;
-
-	/**
-	 * Remote trace level
-	 */
-	Trace::Level remoteTraceLevel;
-
-	/**
-	 * Network MTU
-	 */
-	unsigned int mtu;
-
-	/**
-	 * Maximum number of recipients per multicast (not including active bridges)
-	 */
-	unsigned int multicastLimit;
-
-	/**
-	 * Number of specialists
-	 */
-	unsigned int specialistCount;
-
-	/**
-	 * Number of routes
-	 */
-	unsigned int routeCount;
-
-	/**
-	 * Number of ZT-managed static IP assignments
-	 */
-	unsigned int staticIpCount;
-
-	/**
-	 * Number of rule table entries
-	 */
-	unsigned int ruleCount;
-
-	/**
-	 * Number of capabilities
-	 */
-	unsigned int capabilityCount;
-
-	/**
-	 * Number of tags
-	 */
-	unsigned int tagCount;
-
-	/**
-	 * Number of certificates of ownership
-	 */
-	unsigned int certificateOfOwnershipCount;
-
-	/**
-	 * Specialist devices
-	 *
-	 * For each entry the least significant 40 bits are the device's ZeroTier
-	 * address and the most significant 24 bits are flags indicating its role.
-	 */
-	uint64_t specialists[ZT_MAX_NETWORK_SPECIALISTS];
-
-	/**
-	 * Statically defined "pushed" routes (including default gateways)
-	 */
-	ZT_VirtualNetworkRoute routes[ZT_MAX_NETWORK_ROUTES];
-
-	/**
-	 * Static IP assignments
-	 */
-	InetAddress staticIps[ZT_MAX_ZT_ASSIGNED_ADDRESSES];
-
-	/**
-	 * Base network rules
-	 */
-	ZT_VirtualNetworkRule rules[ZT_MAX_NETWORK_RULES];
-
-	/**
-	 * Capabilities for this node on this network, in ascending order of capability ID
-	 */
-	Capability capabilities[ZT_MAX_NETWORK_CAPABILITIES];
-
-	/**
-	 * Tags for this node on this network, in ascending order of tag ID
-	 */
-	Tag tags[ZT_MAX_NETWORK_TAGS];
-
-	/**
-	 * Certificates of ownership for this network member
-	 */
-	CertificateOfOwnership certificatesOfOwnership[ZT_MAX_CERTIFICATES_OF_OWNERSHIP];
-
-	/**
-	 * Network type (currently just public or private)
-	 */
-	ZT_VirtualNetworkType type;
-
-	/**
-	 * Network short name or empty string if not defined
-	 */
-	char name[ZT_MAX_NETWORK_SHORT_NAME_LENGTH + 1];
-
-	/**
-	 * Certificate of membership (for private networks)
-	 */
-	CertificateOfMembership com;
-
-	/**
-	 * Number of ZT-pushed DNS configurations
-	 */
-	unsigned int dnsCount;
-
-	/**
-	 * ZT pushed DNS configuration
-	 */
-	ZT_VirtualNetworkDNS dns;
-
-	/**
-	 * SSO enabled flag.
-	 */
-	bool ssoEnabled;
-
-	/**
-	 * SSO version
-	 */
-	uint64_t ssoVersion;
-
-	/**
-	 * Authentication URL if authentication is required
-	 */
-	char authenticationURL[2048];
-
-	/**
-	 * Time current authentication expires or 0 if external authentication is disabled
-	 *
-	 * Not used if authVersion >= 1
-	 */
-	uint64_t authenticationExpiryTime;
-
-	/**
-	 * OIDC issuer URL
-	 */
-	char issuerURL[2048];
-
-	/**
-	 * central base URL.
-	 */
-	char centralAuthURL[2048];
-
-	/**
-	 * sso nonce
-	 */
-	char ssoNonce[128];
-
-	/**
-	 * sso state
-	 */
-	char ssoState[256];
-
-	/**
-	 * oidc client id
-	 */
-	char ssoClientID[256];
-
-	/**
-	 * oidc provider
-	 *
-	 * because certain providers require specific scopes to be requested
-	 * and others to be not requested in order to make everything work
-	 * correctly
-	 **/
-	char ssoProvider[64];
+	CertificateOfMembership _com;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/NetworkController.hpp b/node/NetworkController.hpp
index 2b2f237de..9df281283 100644
--- a/node/NetworkController.hpp
+++ b/node/NetworkController.hpp
@@ -1,107 +1,83 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_NETWORKCONFIGMASTER_HPP
 #define ZT_NETWORKCONFIGMASTER_HPP
 
-#include "Address.hpp"
-#include "Constants.hpp"
-#include "Dictionary.hpp"
-#include "NetworkConfig.hpp"
-#include "Revocation.hpp"
-
 #include <stdint.h>
 
+#include "Constants.hpp"
+#include "InetAddress.hpp"
+#include "Dictionary.hpp"
+#include "Address.hpp"
+#include "Identity.hpp"
+
 namespace ZeroTier {
 
-class Identity;
-struct InetAddress;
+class RuntimeEnvironment;
 
 /**
  * Interface for network controller implementations
  */
-class NetworkController {
-  public:
-	enum ErrorCode { NC_ERROR_NONE = 0, NC_ERROR_OBJECT_NOT_FOUND = 1, NC_ERROR_ACCESS_DENIED = 2, NC_ERROR_INTERNAL_SERVER_ERROR = 3, NC_ERROR_AUTHENTICATION_REQUIRED = 4 };
-
+class NetworkController
+{
+public:
 	/**
-	 * Interface for sender used to send pushes and replies
+	 * Return value of doNetworkConfigRequest
 	 */
-	class Sender {
-	  public:
-		/**
-		 * Send a configuration to a remote peer
-		 *
-		 * @param nwid Network ID
-		 * @param requestPacketId Request packet ID to send OK(NETWORK_CONFIG_REQUEST) or 0 to send NETWORK_CONFIG (push)
-		 * @param destination Destination peer Address
-		 * @param nc Network configuration to send
-		 * @param sendLegacyFormatConfig If true, send an old-format network config
-		 */
-		virtual void ncSendConfig(uint64_t nwid, uint64_t requestPacketId, const Address& destination, const NetworkConfig& nc, bool sendLegacyFormatConfig) = 0;
-
-		/**
-		 * Send revocation to a node
-		 *
-		 * @param destination Destination node address
-		 * @param rev Revocation to send
-		 */
-		virtual void ncSendRevocation(const Address& destination, const Revocation& rev) = 0;
-
-		/**
-		 * Send a network configuration request error
-		 *
-		 * If errorData/errorDataSize are provided they must point to a valid serialized
-		 * Dictionary containing error data. They can be null/zero if not specified.
-		 *
-		 * @param nwid Network ID
-		 * @param requestPacketId Request packet ID or 0 if none
-		 * @param destination Destination peer Address
-		 * @param errorCode Error code
-		 * @param errorData Data associated with error or NULL if none
-		 * @param errorDataSize Size of errorData in bytes
-		 */
-		virtual void ncSendError(uint64_t nwid, uint64_t requestPacketId, const Address& destination, NetworkController::ErrorCode errorCode, const void* errorData, unsigned int errorDataSize) = 0;
+	enum ResultCode
+	{
+		NETCONF_QUERY_OK = 0,
+		NETCONF_QUERY_OBJECT_NOT_FOUND = 1,
+		NETCONF_QUERY_ACCESS_DENIED = 2,
+		NETCONF_QUERY_INTERNAL_SERVER_ERROR = 3,
+		NETCONF_QUERY_IGNORE = 4
 	};
 
-	NetworkController()
-	{
-	}
-	virtual ~NetworkController()
-	{
-	}
+	NetworkController() {}
+	virtual ~NetworkController() {}
 
 	/**
-	 * Called when this is added to a Node to initialize and supply info
+	 * Handle a network config request, sending replies if necessary
 	 *
-	 * @param signingId Identity for signing of network configurations, certs, etc.
-	 * @param sender Sender implementation for sending replies or config pushes
-	 */
-	virtual void init(const Identity& signingId, Sender* sender) = 0;
-
-	/**
-	 * Handle a network configuration request
+	 * This call is permitted to block, and may be called concurrently from more
+	 * than one thread. Implementations must use locks if needed.
+	 *
+	 * On internal server errors, the 'error' field in result can be filled in
+	 * to indicate the error.
 	 *
-	 * @param nwid 64-bit network ID
 	 * @param fromAddr Originating wire address or null address if packet is not direct (or from self)
-	 * @param requestPacketId Packet ID of request packet or 0 if not initiated by remote request
-	 * @param identity ZeroTier identity of originating peer
-	 * @param metaData Meta-data bundled with request (if any)
-	 * @return Returns NETCONF_QUERY_OK if result 'nc' is valid, or an error code on error
+	 * @param signingId Identity that should be used to sign results -- must include private key
+	 * @param identity Originating peer ZeroTier identity
+	 * @param nwid 64-bit network ID
+	 * @param metaData Meta-data bundled with request (empty if none)
+	 * @param result Dictionary to receive resulting signed netconf on success
+	 * @return Returns NETCONF_QUERY_OK if result dictionary is valid, or an error code on error
 	 */
-	virtual void request(uint64_t nwid, const InetAddress& fromAddr, uint64_t requestPacketId, const Identity& identity, const Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY>& metaData) = 0;
+	virtual NetworkController::ResultCode doNetworkConfigRequest(
+		const InetAddress &fromAddr,
+		const Identity &signingId,
+		const Identity &identity,
+		uint64_t nwid,
+		const Dictionary &metaData,
+		Dictionary &result) = 0;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Node.cpp b/node/Node.cpp
index ed4b71605..047511727 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -1,47 +1,45 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "Node.hpp"
-
-#include "../version.h"
-#include "Address.hpp"
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "ECC.hpp"
-#include "Identity.hpp"
-#include "Metrics.hpp"
-#include "Multicaster.hpp"
-#include "Network.hpp"
-#include "NetworkController.hpp"
-#include "Packet.hpp"
-#include "PacketMultiplexer.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "SelfAwareness.hpp"
-#include "SharedPtr.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
-#include "Trace.hpp"
-
-#include <stdarg.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
+#include <stdint.h>
 
-// FIXME: remove this suppression and actually fix warnings
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#endif
+#include "../version.h"
+
+#include "Constants.hpp"
+#include "Node.hpp"
+#include "RuntimeEnvironment.hpp"
+#include "NetworkController.hpp"
+#include "Switch.hpp"
+#include "Multicaster.hpp"
+#include "Topology.hpp"
+#include "Buffer.hpp"
+#include "Packet.hpp"
+#include "Address.hpp"
+#include "Identity.hpp"
+#include "SelfAwareness.hpp"
+#include "Cluster.hpp"
+#include "DeferredPackets.hpp"
+
+const struct sockaddr_storage ZT_SOCKADDR_NULL = {0};
 
 namespace ZeroTier {
 
@@ -49,499 +47,355 @@ namespace ZeroTier {
 /* Public Node interface (C++, exposed via CAPI bindings)                   */
 /****************************************************************************/
 
-Node::Node(void* uptr, void* tptr, const struct ZT_Node_Callbacks* callbacks, int64_t now)
-	: _RR(this)
-	, RR(&_RR)
-	, _uPtr(uptr)
-	, _networks(8)
-	, _now(now)
-	, _lastPingCheck(0)
-	, _lastGratuitousPingCheck(0)
-	, _lastHousekeepingRun(0)
-	, _lastMemoizedTraceSettings(0)
-	, _lowBandwidthMode(false)
+Node::Node(
+	uint64_t now,
+	void *uptr,
+	ZT_DataStoreGetFunction dataStoreGetFunction,
+	ZT_DataStorePutFunction dataStorePutFunction,
+	ZT_WirePacketSendFunction wirePacketSendFunction,
+	ZT_VirtualNetworkFrameFunction virtualNetworkFrameFunction,
+	ZT_VirtualNetworkConfigFunction virtualNetworkConfigFunction,
+	ZT_PathCheckFunction pathCheckFunction,
+	ZT_EventCallback eventCallback) :
+	_RR(this),
+	RR(&_RR),
+	_uPtr(uptr),
+	_dataStoreGetFunction(dataStoreGetFunction),
+	_dataStorePutFunction(dataStorePutFunction),
+	_wirePacketSendFunction(wirePacketSendFunction),
+	_virtualNetworkFrameFunction(virtualNetworkFrameFunction),
+	_virtualNetworkConfigFunction(virtualNetworkConfigFunction),
+	_pathCheckFunction(pathCheckFunction),
+	_eventCallback(eventCallback),
+	_networks(),
+	_networks_m(),
+	_prngStreamPtr(0),
+	_now(now),
+	_lastPingCheck(0),
+	_lastHousekeepingRun(0)
 {
-	if (callbacks->version != 0) {
-		throw ZT_EXCEPTION_INVALID_ARGUMENT;
-	}
-	memcpy(&_cb, callbacks, sizeof(ZT_Node_Callbacks));
-
-	// Initialize non-cryptographic PRNG from a good random source
-	Utils::getSecureRandom((void*)_prngState, sizeof(_prngState));
-
 	_online = false;
 
-	memset(_expectingRepliesToBucketPtr, 0, sizeof(_expectingRepliesToBucketPtr));
-	memset(_expectingRepliesTo, 0, sizeof(_expectingRepliesTo));
-	memset(_lastIdentityVerification, 0, sizeof(_lastIdentityVerification));
-	memset((void*)(&_stats), 0, sizeof(_stats));
+	// Use Salsa20 alone as a high-quality non-crypto PRNG
+	{
+		char foo[32];
+		Utils::getSecureRandom(foo,32);
+		_prng.init(foo,256,foo);
+		memset(_prngStream,0,sizeof(_prngStream));
+		_prng.encrypt12(_prngStream,_prngStream,sizeof(_prngStream));
+	}
 
-	uint64_t idtmp[2];
-	idtmp[0] = 0;
-	idtmp[1] = 0;
-	char tmp[2048];
-	int n = stateObjectGet(tptr, ZT_STATE_OBJECT_IDENTITY_SECRET, idtmp, tmp, sizeof(tmp) - 1);
-	if (n > 0) {
-		tmp[n] = (char)0;
-		if (RR->identity.fromString(tmp)) {
-			RR->identity.toString(false, RR->publicIdentityStr);
-			RR->identity.toString(true, RR->secretIdentityStr);
+	{
+		std::string idtmp(dataStoreGet("identity.secret"));
+		if ((!idtmp.length())||(!RR->identity.fromString(idtmp))||(!RR->identity.hasPrivate())) {
+			TRACE("identity.secret not found, generating...");
+			RR->identity.generate();
+			idtmp = RR->identity.toString(true);
+			if (!dataStorePut("identity.secret",idtmp,true))
+				throw std::runtime_error("unable to write identity.secret");
 		}
-		else {
-			throw ZT_EXCEPTION_INVALID_IDENTITY;
-		}
-
-		if (! RR->identity.locallyValidate()) {
-			throw ZT_EXCEPTION_INVALID_IDENTITY;
+		RR->publicIdentityStr = RR->identity.toString(false);
+		RR->secretIdentityStr = RR->identity.toString(true);
+		idtmp = dataStoreGet("identity.public");
+		if (idtmp != RR->publicIdentityStr) {
+			if (!dataStorePut("identity.public",RR->publicIdentityStr,false))
+				throw std::runtime_error("unable to write identity.public");
 		}
 	}
 
-	if (n <= 0) {
-		RR->identity.generate();
-		RR->identity.toString(false, RR->publicIdentityStr);
-		RR->identity.toString(true, RR->secretIdentityStr);
-		idtmp[0] = RR->identity.address().toInt();
-		idtmp[1] = 0;
-		stateObjectPut(tptr, ZT_STATE_OBJECT_IDENTITY_SECRET, idtmp, RR->secretIdentityStr, (unsigned int)strlen(RR->secretIdentityStr));
-		stateObjectPut(tptr, ZT_STATE_OBJECT_IDENTITY_PUBLIC, idtmp, RR->publicIdentityStr, (unsigned int)strlen(RR->publicIdentityStr));
-	}
-	else {
-		idtmp[0] = RR->identity.address().toInt();
-		idtmp[1] = 0;
-		n = stateObjectGet(tptr, ZT_STATE_OBJECT_IDENTITY_PUBLIC, idtmp, tmp, sizeof(tmp) - 1);
-		if ((n > 0) && (n < (int)sizeof(RR->publicIdentityStr)) && (n < (int)sizeof(tmp))) {
-			if (memcmp(tmp, RR->publicIdentityStr, n)) {
-				stateObjectPut(tptr, ZT_STATE_OBJECT_IDENTITY_PUBLIC, idtmp, RR->publicIdentityStr, (unsigned int)strlen(RR->publicIdentityStr));
-			}
-		}
-	}
-
-	char* m = (char*)0;
 	try {
-		const unsigned long ts = sizeof(Trace) + (((sizeof(Trace) & 0xf) != 0) ? (16 - (sizeof(Trace) & 0xf)) : 0);
-		const unsigned long sws = sizeof(Switch) + (((sizeof(Switch) & 0xf) != 0) ? (16 - (sizeof(Switch) & 0xf)) : 0);
-		const unsigned long mcs = sizeof(Multicaster) + (((sizeof(Multicaster) & 0xf) != 0) ? (16 - (sizeof(Multicaster) & 0xf)) : 0);
-		const unsigned long topologys = sizeof(Topology) + (((sizeof(Topology) & 0xf) != 0) ? (16 - (sizeof(Topology) & 0xf)) : 0);
-		const unsigned long sas = sizeof(SelfAwareness) + (((sizeof(SelfAwareness) & 0xf) != 0) ? (16 - (sizeof(SelfAwareness) & 0xf)) : 0);
-		const unsigned long bcs = sizeof(Bond) + (((sizeof(Bond) & 0xf) != 0) ? (16 - (sizeof(Bond) & 0xf)) : 0);
-		const unsigned long pms = sizeof(PacketMultiplexer) + (((sizeof(PacketMultiplexer) & 0xf) != 0) ? (16 - (sizeof(PacketMultiplexer) & 0xf)) : 0);
-
-		m = reinterpret_cast<char*>(::malloc(16 + ts + sws + mcs + topologys + sas + bcs + pms));
-		if (! m) {
-			throw std::bad_alloc();
-		}
-		RR->rtmem = m;
-		while (((uintptr_t)m & 0xf) != 0) {
-			++m;
-		}
-
-		RR->t = new (m) Trace(RR);
-		m += ts;
-		RR->sw = new (m) Switch(RR);
-		m += sws;
-		RR->mc = new (m) Multicaster(RR);
-		m += mcs;
-		RR->topology = new (m) Topology(RR, tptr);
-		m += topologys;
-		RR->sa = new (m) SelfAwareness(RR);
-		m += sas;
-		RR->bc = new (m) Bond(RR);
-		m += bcs;
-		RR->pm = new (m) PacketMultiplexer(RR);
-	}
-	catch (...) {
-		if (RR->sa) {
-			RR->sa->~SelfAwareness();
-		}
-		if (RR->topology) {
-			RR->topology->~Topology();
-		}
-		if (RR->mc) {
-			RR->mc->~Multicaster();
-		}
-		if (RR->sw) {
-			RR->sw->~Switch();
-		}
-		if (RR->t) {
-			RR->t->~Trace();
-		}
-		if (RR->bc) {
-			RR->bc->~Bond();
-		}
-		if (RR->pm) {
-			RR->pm->~PacketMultiplexer();
-		}
-		::free(m);
+		RR->sw = new Switch(RR);
+		RR->mc = new Multicaster(RR);
+		RR->topology = new Topology(RR);
+		RR->sa = new SelfAwareness(RR);
+		RR->dp = new DeferredPackets(RR);
+	} catch ( ... ) {
+		delete RR->dp;
+		delete RR->sa;
+		delete RR->topology;
+		delete RR->mc;
+		delete RR->sw;
 		throw;
 	}
 
-	postEvent(tptr, ZT_EVENT_UP);
+	postEvent(ZT_EVENT_UP);
 }
 
 Node::~Node()
 {
-	{
-		Mutex::Lock _l(_networks_m);
-		_networks.clear();	 // destroy all networks before shutdown
-	}
-	if (RR->sa) {
-		RR->sa->~SelfAwareness();
-	}
-	if (RR->topology) {
-		RR->topology->~Topology();
-	}
-	if (RR->mc) {
-		RR->mc->~Multicaster();
-	}
-	if (RR->sw) {
-		RR->sw->~Switch();
-	}
-	if (RR->t) {
-		RR->t->~Trace();
-	}
-	if (RR->bc) {
-		RR->bc->~Bond();
-	}
-	if (RR->pm) {
-		RR->pm->~PacketMultiplexer();
-	}
-	::free(RR->rtmem);
+	Mutex::Lock _l(_networks_m);
+
+	_networks.clear(); // ensure that networks are destroyed before shutdow
+
+	RR->dpEnabled = 0;
+	delete RR->dp;
+	delete RR->sa;
+	delete RR->topology;
+	delete RR->mc;
+	delete RR->sw;
+#ifdef ZT_ENABLE_CLUSTER
+	delete RR->cluster;
+#endif
 }
 
-ZT_ResultCode Node::processWirePacket(void* tptr, int64_t now, int64_t localSocket, const struct sockaddr_storage* remoteAddress, const void* packetData, unsigned int packetLength, volatile int64_t* nextBackgroundTaskDeadline)
+ZT_ResultCode Node::processWirePacket(
+	uint64_t now,
+	const struct sockaddr_storage *localAddress,
+	const struct sockaddr_storage *remoteAddress,
+	const void *packetData,
+	unsigned int packetLength,
+	volatile uint64_t *nextBackgroundTaskDeadline)
 {
 	_now = now;
-	RR->sw->onRemotePacket(tptr, localSocket, *(reinterpret_cast<const InetAddress*>(remoteAddress)), packetData, packetLength);
+	RR->sw->onRemotePacket(*(reinterpret_cast<const InetAddress *>(localAddress)),*(reinterpret_cast<const InetAddress *>(remoteAddress)),packetData,packetLength);
 	return ZT_RESULT_OK;
 }
 
 ZT_ResultCode Node::processVirtualNetworkFrame(
-	void* tptr,
-	int64_t now,
+	uint64_t now,
 	uint64_t nwid,
 	uint64_t sourceMac,
 	uint64_t destMac,
 	unsigned int etherType,
 	unsigned int vlanId,
-	const void* frameData,
+	const void *frameData,
 	unsigned int frameLength,
-	volatile int64_t* nextBackgroundTaskDeadline)
+	volatile uint64_t *nextBackgroundTaskDeadline)
 {
 	_now = now;
 	SharedPtr<Network> nw(this->network(nwid));
 	if (nw) {
-		RR->sw->onLocalEthernet(tptr, nw, MAC(sourceMac), MAC(destMac), etherType, vlanId, frameData, frameLength);
+		RR->sw->onLocalEthernet(nw,MAC(sourceMac),MAC(destMac),etherType,vlanId,frameData,frameLength);
 		return ZT_RESULT_OK;
-	}
-	else {
-		return ZT_RESULT_ERROR_NETWORK_NOT_FOUND;
-	}
+	} else return ZT_RESULT_ERROR_NETWORK_NOT_FOUND;
 }
 
-void Node::initMultithreading(unsigned int concurrency, bool cpuPinningEnabled)
+class _PingPeersThatNeedPing
 {
-	RR->pm->setUpPostDecodeReceiveThreads(concurrency, cpuPinningEnabled);
-}
-
-// Closure used to ping upstream and active/online peers
-class _PingPeersThatNeedPing {
-  public:
-	_PingPeersThatNeedPing(const RuntimeEnvironment* renv, void* tPtr, Hashtable<Address, std::vector<InetAddress> >& alwaysContact, int64_t now)
-		: RR(renv)
-		, _tPtr(tPtr)
-		, _alwaysContact(alwaysContact)
-		, _now(now)
-		, _bestCurrentUpstream(RR->topology->getUpstreamPeer())
+public:
+	_PingPeersThatNeedPing(const RuntimeEnvironment *renv,uint64_t now,const std::vector<ZT_VirtualNetworkStaticDevice> &relays) :
+		lastReceiveFromUpstream(0),
+		RR(renv),
+		_now(now),
+		_relays(relays),
+		_world(RR->topology->world())
 	{
 	}
 
-	inline void operator()(Topology& t, const SharedPtr<Peer>& p)
+	uint64_t lastReceiveFromUpstream; // tracks last time we got a packet from an 'upstream' peer like a root or a relay
+
+	inline void operator()(Topology &t,const SharedPtr<Peer> &p)
 	{
-		const std::vector<InetAddress>* const alwaysContactEndpoints = _alwaysContact.get(p->address());
-		if (alwaysContactEndpoints) {
-			ZT_PeerRole role = RR->topology->role(p->address());
+		bool upstream = false;
+		InetAddress stableEndpoint4,stableEndpoint6;
 
-			// Contact upstream peers as infrequently as possible
-			int roleBasedTimerScale = (role == ZT_PEER_ROLE_LEAF) ? 2 : 16;
+		// If this is a world root, pick (if possible) both an IPv4 and an IPv6 stable endpoint to use if link isn't currently alive.
+		for(std::vector<World::Root>::const_iterator r(_world.roots().begin());r!=_world.roots().end();++r) {
+			if (r->identity == p->identity()) {
+				upstream = true;
+				for(unsigned long k=0,ptr=(unsigned long)RR->node->prng();k<(unsigned long)r->stableEndpoints.size();++k) {
+					const InetAddress &addr = r->stableEndpoints[ptr++ % r->stableEndpoints.size()];
+					if (!stableEndpoint4) {
+						if (addr.ss_family == AF_INET)
+							stableEndpoint4 = addr;
+					}
+					if (!stableEndpoint6) {
+						if (addr.ss_family == AF_INET6)
+							stableEndpoint6 = addr;
+					}
+				}
+				break;
+			}
+		}
 
-			// Unless we don't any have paths to the roots, then we shouldn't wait a long time to contact them
-			bool hasPaths = p->paths(RR->node->now()).size() > 0;
-			roleBasedTimerScale = (role != ZT_PEER_ROLE_LEAF && ! hasPaths) ? 0 : roleBasedTimerScale;
-
-			if ((RR->node->now() - p->lastSentFullHello()) <= (ZT_PATH_HEARTBEAT_PERIOD * roleBasedTimerScale)) {
+		if (!upstream) {
+			// If I am a root server, only ping other root servers -- roots don't ping "down"
+			// since that would just be a waste of bandwidth and could potentially cause route
+			// flapping in Cluster mode.
+			if (RR->topology->amRoot())
 				return;
-			}
 
-			const unsigned int sent = p->doPingAndKeepalive(_tPtr, _now);
-			bool contacted = (sent != 0);
-
-			if ((sent & 0x1) == 0) {   // bit 0x1 == IPv4 sent
-				for (unsigned long k = 0, ptr = (unsigned long)RR->node->prng(); k < (unsigned long)alwaysContactEndpoints->size(); ++k) {
-					const InetAddress& addr = (*alwaysContactEndpoints)[ptr++ % alwaysContactEndpoints->size()];
-					if (addr.ss_family == AF_INET) {
-						p->sendHELLO(_tPtr, -1, addr, _now);
-						contacted = true;
-						break;
+			// Check for network preferred relays, also considered 'upstream' and thus always
+			// pinged to keep links up. If they have stable addresses we will try them there.
+			for(std::vector<ZT_VirtualNetworkStaticDevice>::const_iterator r(_relays.begin());r!=_relays.end();++r) {
+				if (r->address == p->address().toInt()) {
+					for(unsigned int i=0;i<2;++i) {
+						if (r->physical[i].ss_family == AF_INET)
+							stableEndpoint4 = r->physical[i];
+						else if (r->physical[i].ss_family == AF_INET6)
+							stableEndpoint6 = r->physical[i];
 					}
+					upstream = true;
+					break;
 				}
 			}
-
-			if ((sent & 0x2) == 0) {   // bit 0x2 == IPv6 sent
-				for (unsigned long k = 0, ptr = (unsigned long)RR->node->prng(); k < (unsigned long)alwaysContactEndpoints->size(); ++k) {
-					const InetAddress& addr = (*alwaysContactEndpoints)[ptr++ % alwaysContactEndpoints->size()];
-					if (addr.ss_family == AF_INET6) {
-						p->sendHELLO(_tPtr, -1, addr, _now);
-						contacted = true;
-						break;
-					}
-				}
-			}
-
-			if ((! contacted) && (_bestCurrentUpstream)) {
-				const SharedPtr<Path> up(_bestCurrentUpstream->getAppropriatePath(_now, true));
-				if (up) {
-					p->sendHELLO(_tPtr, up->localSocket(), up->address(), _now);
-				}
-			}
-
-			_alwaysContact.erase(p->address());	  // after this we'll WHOIS all upstreams that remain
 		}
-		else if (p->isActive(_now)) {
-			p->doPingAndKeepalive(_tPtr, _now);
+
+		if (upstream) {
+			// "Upstream" devices are roots and relays and get special treatment -- they stay alive
+			// forever and we try to keep (if available) both IPv4 and IPv6 channels open to them.
+			bool needToContactIndirect = true;
+			if (p->doPingAndKeepalive(_now,AF_INET)) {
+				needToContactIndirect = false;
+			} else {
+				if (stableEndpoint4) {
+					needToContactIndirect = false;
+					p->sendHELLO(InetAddress(),stableEndpoint4,_now);
+				}
+			}
+			if (p->doPingAndKeepalive(_now,AF_INET6)) {
+				needToContactIndirect = false;
+			} else {
+				if (stableEndpoint6) {
+					needToContactIndirect = false;
+					p->sendHELLO(InetAddress(),stableEndpoint6,_now);
+				}
+			}
+
+			if (needToContactIndirect) {
+				// If this is an upstream and we have no stable endpoint for either IPv4 or IPv6,
+				// send a NOP indirectly if possible to see if we can get to this peer in any
+				// way whatsoever. This will e.g. find network preferred relays that lack
+				// stable endpoints by using root servers.
+				Packet outp(p->address(),RR->identity.address(),Packet::VERB_NOP);
+				RR->sw->send(outp,true,0);
+			}
+
+			lastReceiveFromUpstream = std::max(p->lastReceive(),lastReceiveFromUpstream);
+		} else if (p->activelyTransferringFrames(_now)) {
+			// Normal nodes get their preferred link kept alive if the node has generated frame traffic recently
+			p->doPingAndKeepalive(_now,0);
 		}
 	}
 
-  private:
-	const RuntimeEnvironment* RR;
-	void* _tPtr;
-	Hashtable<Address, std::vector<InetAddress> >& _alwaysContact;
-	const int64_t _now;
-	const SharedPtr<Peer> _bestCurrentUpstream;
+private:
+	const RuntimeEnvironment *RR;
+	uint64_t _now;
+	const std::vector<ZT_VirtualNetworkStaticDevice> &_relays;
+	World _world;
 };
 
-ZT_ResultCode Node::processBackgroundTasks(void* tptr, int64_t now, volatile int64_t* nextBackgroundTaskDeadline)
+ZT_ResultCode Node::processBackgroundTasks(uint64_t now,volatile uint64_t *nextBackgroundTaskDeadline)
 {
 	_now = now;
 	Mutex::Lock bl(_backgroundTasksLock);
 
-	// Process background bond tasks
-	unsigned long bondCheckInterval = ZT_PING_CHECK_INTERVAL;
-	if (RR->bc->inUse()) {
-		bondCheckInterval = std::max(RR->bc->minReqMonitorInterval(), ZT_CORE_TIMER_TASK_GRANULARITY);
-		if ((now - _lastGratuitousPingCheck) >= ZT_CORE_TIMER_TASK_GRANULARITY) {
-			_lastGratuitousPingCheck = now;
-			RR->bc->processBackgroundTasks(tptr, now);
-		}
-	}
-
-	unsigned long timeUntilNextPingCheck = _lowBandwidthMode ? (ZT_PING_CHECK_INTERVAL * 5) : ZT_PING_CHECK_INTERVAL;
-	const int64_t timeSinceLastPingCheck = now - _lastPingCheck;
-	if (timeSinceLastPingCheck >= timeUntilNextPingCheck) {
+	unsigned long timeUntilNextPingCheck = ZT_PING_CHECK_INVERVAL;
+	const uint64_t timeSinceLastPingCheck = now - _lastPingCheck;
+	if (timeSinceLastPingCheck >= ZT_PING_CHECK_INVERVAL) {
 		try {
 			_lastPingCheck = now;
 
-			// Get designated VL1 upstreams
-			Hashtable<Address, std::vector<InetAddress> > alwaysContact;
-			RR->topology->getUpstreamsToContact(alwaysContact);
-
-			// Uncomment to dump stats
-			/*
-			for(unsigned int i=0;i<32;i++) {
-				if (_stats.inVerbCounts[i] > 0)
-					printf("%.2x\t%12lld %lld\n",i,(unsigned long long)_stats.inVerbCounts[i],(unsigned long long)_stats.inVerbBytes[i]);
-			}
-			printf("\n");
-			*/
-
-			// Check last receive time on designated upstreams to see if we seem to be online
-			int64_t lastReceivedFromUpstream = 0;
+			// Get relays and networks that need config without leaving the mutex locked
+			std::vector< ZT_VirtualNetworkStaticDevice > networkRelays;
+			std::vector< SharedPtr<Network> > needConfig;
 			{
-				Hashtable<Address, std::vector<InetAddress> >::Iterator i(alwaysContact);
-				Address* upstreamAddress = (Address*)0;
-				std::vector<InetAddress>* upstreamStableEndpoints = (std::vector<InetAddress>*)0;
-				while (i.next(upstreamAddress, upstreamStableEndpoints)) {
-					SharedPtr<Peer> p(RR->topology->getPeerNoCache(*upstreamAddress));
-					if (p) {
-						lastReceivedFromUpstream = std::max(p->lastReceive(), lastReceivedFromUpstream);
+				Mutex::Lock _l(_networks_m);
+				for(std::vector< std::pair< uint64_t,SharedPtr<Network> > >::const_iterator n(_networks.begin());n!=_networks.end();++n) {
+					if (((now - n->second->lastConfigUpdate()) >= ZT_NETWORK_AUTOCONF_DELAY)||(!n->second->hasConfig())) {
+						needConfig.push_back(n->second);
+					}
+					if (n->second->hasConfig()) {
+						std::vector<ZT_VirtualNetworkStaticDevice> r(n->second->config().relays());
+						networkRelays.insert(networkRelays.end(),r.begin(),r.end());
 					}
 				}
 			}
 
-			// Clean up any old local controller auth memorizations.
-			{
-				_localControllerAuthorizations_m.lock();
-				Hashtable<_LocalControllerAuth, int64_t>::Iterator i(_localControllerAuthorizations);
-				_LocalControllerAuth* k = (_LocalControllerAuth*)0;
-				int64_t* v = (int64_t*)0;
-				while (i.next(k, v)) {
-					if ((*v - now) > (ZT_NETWORK_AUTOCONF_DELAY * 3)) {
-						_localControllerAuthorizations.erase(*k);
-					}
-				}
-				_localControllerAuthorizations_m.unlock();
-			}
+			// Request updated configuration for networks that need it
+			for(std::vector< SharedPtr<Network> >::const_iterator n(needConfig.begin());n!=needConfig.end();++n)
+				(*n)->requestConfiguration();
 
-			// Get peers we should stay connected to according to network configs
-			// Also get networks and whether they need config so we only have to do one pass over networks
-			int timerScale = _lowBandwidthMode ? 64 : 1;
-			std::vector<std::pair<SharedPtr<Network>, bool> > networkConfigNeeded;
-			{
-				Mutex::Lock l(_networks_m);
-				Hashtable<uint64_t, SharedPtr<Network> >::Iterator i(_networks);
-				uint64_t* nwid = (uint64_t*)0;
-				SharedPtr<Network>* network = (SharedPtr<Network>*)0;
-				while (i.next(nwid, network)) {
-					(*network)->config().alwaysContactAddresses(alwaysContact);
-					networkConfigNeeded.push_back(std::pair<SharedPtr<Network>, bool>(*network, (((now - (*network)->lastConfigUpdate()) >= ZT_NETWORK_AUTOCONF_DELAY * timerScale) || (! (*network)->hasConfig()))));
-				}
-			}
-
-			// Ping active peers, upstreams, and others that we should always contact
-			_PingPeersThatNeedPing pfunc(RR, tptr, alwaysContact, now);
-			RR->topology->eachPeer<_PingPeersThatNeedPing&>(pfunc);
-
-			// Run WHOIS to create Peer for alwaysContact addresses that could not be contacted
-			{
-				Hashtable<Address, std::vector<InetAddress> >::Iterator i(alwaysContact);
-				Address* upstreamAddress = (Address*)0;
-				std::vector<InetAddress>* upstreamStableEndpoints = (std::vector<InetAddress>*)0;
-				while (i.next(upstreamAddress, upstreamStableEndpoints)) {
-					RR->sw->requestWhois(tptr, now, *upstreamAddress);
-				}
-			}
-
-			// Refresh network config or broadcast network updates to members as needed
-			for (std::vector<std::pair<SharedPtr<Network>, bool> >::const_iterator n(networkConfigNeeded.begin()); n != networkConfigNeeded.end(); ++n) {
-				if (n->second) {
-					n->first->requestConfiguration(tptr);
-				}
-				if (! _lowBandwidthMode) {
-					n->first->sendUpdatesToMembers(tptr);
-				}
-			}
+			// Do pings and keepalives
+			_PingPeersThatNeedPing pfunc(RR,now,networkRelays);
+			RR->topology->eachPeer<_PingPeersThatNeedPing &>(pfunc);
 
 			// Update online status, post status change as event
 			const bool oldOnline = _online;
-			_online = (((now - lastReceivedFromUpstream) < ZT_PEER_ACTIVITY_TIMEOUT) || (RR->topology->amUpstream()));
-			if (oldOnline != _online) {
-				postEvent(tptr, _online ? ZT_EVENT_ONLINE : ZT_EVENT_OFFLINE);
-			}
-		}
-		catch (...) {
+			_online = (((now - pfunc.lastReceiveFromUpstream) < ZT_PEER_ACTIVITY_TIMEOUT)||(RR->topology->amRoot()));
+			if (oldOnline != _online)
+				postEvent(_online ? ZT_EVENT_ONLINE : ZT_EVENT_OFFLINE);
+		} catch ( ... ) {
 			return ZT_RESULT_FATAL_ERROR_INTERNAL;
 		}
-	}
-	else {
+	} else {
 		timeUntilNextPingCheck -= (unsigned long)timeSinceLastPingCheck;
 	}
 
-	if ((now - _lastMemoizedTraceSettings) >= (ZT_HOUSEKEEPING_PERIOD / 4)) {
-		_lastMemoizedTraceSettings = now;
-		RR->t->updateMemoizedSettings();
-	}
-
 	if ((now - _lastHousekeepingRun) >= ZT_HOUSEKEEPING_PERIOD) {
-		_lastHousekeepingRun = now;
 		try {
-			RR->topology->doPeriodicTasks(tptr, now);
+			_lastHousekeepingRun = now;
+			RR->topology->clean(now);
 			RR->sa->clean(now);
 			RR->mc->clean(now);
-		}
-		catch (...) {
+		} catch ( ... ) {
 			return ZT_RESULT_FATAL_ERROR_INTERNAL;
 		}
 	}
 
 	try {
-		*nextBackgroundTaskDeadline = now + (int64_t)std::max(std::min(bondCheckInterval, std::min(timeUntilNextPingCheck, RR->sw->doTimerTasks(tptr, now))), (unsigned long)ZT_CORE_TIMER_TASK_GRANULARITY);
-	}
-	catch (...) {
+#ifdef ZT_ENABLE_CLUSTER
+		// If clustering is enabled we have to call cluster->doPeriodicTasks() very often, so we override normal timer deadline behavior
+		if (RR->cluster) {
+			RR->sw->doTimerTasks(now);
+			RR->cluster->doPeriodicTasks();
+			*nextBackgroundTaskDeadline = now + ZT_CLUSTER_PERIODIC_TASK_PERIOD; // this is really short so just tick at this rate
+		} else {
+#endif
+			*nextBackgroundTaskDeadline = now + (uint64_t)std::max(std::min(timeUntilNextPingCheck,RR->sw->doTimerTasks(now)),(unsigned long)ZT_CORE_TIMER_TASK_GRANULARITY);
+#ifdef ZT_ENABLE_CLUSTER
+		}
+#endif
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 
 	return ZT_RESULT_OK;
 }
 
-ZT_ResultCode Node::join(uint64_t nwid, void* uptr, void* tptr)
+ZT_ResultCode Node::join(uint64_t nwid,void *uptr)
 {
 	Mutex::Lock _l(_networks_m);
-	SharedPtr<Network>& nw = _networks[nwid];
-	if (! nw) {
-		nw = SharedPtr<Network>(new Network(RR, tptr, nwid, uptr, (const NetworkConfig*)0));
-	}
+	SharedPtr<Network> nw = _network(nwid);
+	if(!nw)
+		_networks.push_back(std::pair< uint64_t,SharedPtr<Network> >(nwid,SharedPtr<Network>(new Network(RR,nwid,uptr))));
+	std::sort(_networks.begin(),_networks.end()); // will sort by nwid since it's the first in a pair<>
 	return ZT_RESULT_OK;
 }
 
-ZT_ResultCode Node::leave(uint64_t nwid, void** uptr, void* tptr)
+ZT_ResultCode Node::leave(uint64_t nwid,void **uptr)
 {
-	ZT_VirtualNetworkConfig ctmp;
-	void** nUserPtr = (void**)0;
-	{
-		Mutex::Lock _l(_networks_m);
-		SharedPtr<Network>* nw = _networks.get(nwid);
-		RR->sw->removeNetworkQoSControlBlock(nwid);
-		if (! nw) {
-			return ZT_RESULT_OK;
+	std::vector< std::pair< uint64_t,SharedPtr<Network> > > newn;
+	Mutex::Lock _l(_networks_m);
+	for(std::vector< std::pair< uint64_t,SharedPtr<Network> > >::const_iterator n(_networks.begin());n!=_networks.end();++n) {
+		if (n->first != nwid)
+			newn.push_back(*n);
+		else {
+			if (uptr)
+				*uptr = n->second->userPtr();
+			n->second->destroy();
 		}
-		if (uptr) {
-			*uptr = (*nw)->userPtr();
-		}
-		(*nw)->externalConfig(&ctmp);
-		(*nw)->destroy();
-		nUserPtr = (*nw)->userPtr();
 	}
-
-	if (nUserPtr) {
-		RR->node->configureVirtualNetworkPort(tptr, nwid, nUserPtr, ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY, &ctmp);
-	}
-
-	{
-		Mutex::Lock _l(_networks_m);
-		_networks.erase(nwid);
-	}
-
-	uint64_t tmp[2];
-	tmp[0] = nwid;
-	tmp[1] = 0;
-	RR->node->stateObjectDelete(tptr, ZT_STATE_OBJECT_NETWORK_CONFIG, tmp);
-
+	_networks.swap(newn);
 	return ZT_RESULT_OK;
 }
 
-ZT_ResultCode Node::multicastSubscribe(void* tptr, uint64_t nwid, uint64_t multicastGroup, unsigned long multicastAdi)
+ZT_ResultCode Node::multicastSubscribe(uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi)
 {
 	SharedPtr<Network> nw(this->network(nwid));
 	if (nw) {
-		nw->multicastSubscribe(tptr, MulticastGroup(MAC(multicastGroup), (uint32_t)(multicastAdi & 0xffffffff)));
+		nw->multicastSubscribe(MulticastGroup(MAC(multicastGroup),(uint32_t)(multicastAdi & 0xffffffff)));
 		return ZT_RESULT_OK;
-	}
-	else {
-		return ZT_RESULT_ERROR_NETWORK_NOT_FOUND;
-	}
+	} else return ZT_RESULT_ERROR_NETWORK_NOT_FOUND;
 }
 
-ZT_ResultCode Node::multicastUnsubscribe(uint64_t nwid, uint64_t multicastGroup, unsigned long multicastAdi)
+ZT_ResultCode Node::multicastUnsubscribe(uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi)
 {
 	SharedPtr<Network> nw(this->network(nwid));
 	if (nw) {
-		nw->multicastUnsubscribe(MulticastGroup(MAC(multicastGroup), (uint32_t)(multicastAdi & 0xffffffff)));
+		nw->multicastUnsubscribe(MulticastGroup(MAC(multicastGroup),(uint32_t)(multicastAdi & 0xffffffff)));
 		return ZT_RESULT_OK;
-	}
-	else {
-		return ZT_RESULT_ERROR_NETWORK_NOT_FOUND;
-	}
-}
-
-ZT_ResultCode Node::orbit(void* tptr, uint64_t moonWorldId, uint64_t moonSeed)
-{
-	RR->topology->addMoon(tptr, moonWorldId, Address(moonSeed));
-	return ZT_RESULT_OK;
-}
-
-ZT_ResultCode Node::deorbit(void* tptr, uint64_t moonWorldId)
-{
-	RR->topology->removeMoon(tptr, moonWorldId);
-	return ZT_RESULT_OK;
+	} else return ZT_RESULT_ERROR_NETWORK_NOT_FOUND;
 }
 
 uint64_t Node::address() const
@@ -549,136 +403,102 @@ uint64_t Node::address() const
 	return RR->identity.address().toInt();
 }
 
-void Node::status(ZT_NodeStatus* status) const
+void Node::status(ZT_NodeStatus *status) const
 {
 	status->address = RR->identity.address().toInt();
-	status->publicIdentity = RR->publicIdentityStr;
-	status->secretIdentity = RR->secretIdentityStr;
+	status->worldId = RR->topology->worldId();
+	status->worldTimestamp = RR->topology->worldTimestamp();
+	status->publicIdentity = RR->publicIdentityStr.c_str();
+	status->secretIdentity = RR->secretIdentityStr.c_str();
 	status->online = _online ? 1 : 0;
 }
 
-ZT_PeerList* Node::peers() const
+ZT_PeerList *Node::peers() const
 {
-	std::vector<std::pair<Address, SharedPtr<Peer> > > peers(RR->topology->allPeers());
-	std::sort(peers.begin(), peers.end());
+	std::vector< std::pair< Address,SharedPtr<Peer> > > peers(RR->topology->allPeers());
+	std::sort(peers.begin(),peers.end());
 
-	char* buf = (char*)::malloc(sizeof(ZT_PeerList) + (sizeof(ZT_Peer) * peers.size()));
-	if (! buf) {
-		return (ZT_PeerList*)0;
-	}
-	ZT_PeerList* pl = (ZT_PeerList*)buf;
-	pl->peers = (ZT_Peer*)(buf + sizeof(ZT_PeerList));
+	char *buf = (char *)::malloc(sizeof(ZT_PeerList) + (sizeof(ZT_Peer) * peers.size()));
+	if (!buf)
+		return (ZT_PeerList *)0;
+	ZT_PeerList *pl = (ZT_PeerList *)buf;
+	pl->peers = (ZT_Peer *)(buf + sizeof(ZT_PeerList));
 
 	pl->peerCount = 0;
-	for (std::vector<std::pair<Address, SharedPtr<Peer> > >::iterator pi(peers.begin()); pi != peers.end(); ++pi) {
-		ZT_Peer* p = &(pl->peers[pl->peerCount++]);
+	for(std::vector< std::pair< Address,SharedPtr<Peer> > >::iterator pi(peers.begin());pi!=peers.end();++pi) {
+		ZT_Peer *p = &(pl->peers[pl->peerCount++]);
 		p->address = pi->second->address().toInt();
-		p->isBonded = 0;
+		p->lastUnicastFrame = pi->second->lastUnicastFrame();
+		p->lastMulticastFrame = pi->second->lastMulticastFrame();
 		if (pi->second->remoteVersionKnown()) {
 			p->versionMajor = pi->second->remoteVersionMajor();
 			p->versionMinor = pi->second->remoteVersionMinor();
 			p->versionRev = pi->second->remoteVersionRevision();
-		}
-		else {
+		} else {
 			p->versionMajor = -1;
 			p->versionMinor = -1;
 			p->versionRev = -1;
 		}
-		p->latency = pi->second->latency(_now);
-		if (p->latency >= 0xffff) {
-			p->latency = -1;
-		}
-		p->role = RR->topology->role(pi->second->identity().address());
+		p->latency = pi->second->latency();
+		p->role = RR->topology->isRoot(pi->second->identity()) ? ZT_PEER_ROLE_ROOT : ZT_PEER_ROLE_LEAF;
 
-		std::vector<SharedPtr<Path> > paths(pi->second->paths(_now));
-		SharedPtr<Path> bestp(pi->second->getAppropriatePath(_now, false));
+		std::vector<Path> paths(pi->second->paths());
+		Path *bestPath = pi->second->getBestPath(_now);
 		p->pathCount = 0;
-		for (std::vector<SharedPtr<Path> >::iterator path(paths.begin()); path != paths.end(); ++path) {
-			if ((*path)->valid()) {
-				memcpy(&(p->paths[p->pathCount].address), &((*path)->address()), sizeof(struct sockaddr_storage));
-				p->paths[p->pathCount].localSocket = (*path)->localSocket();
-				p->paths[p->pathCount].localPort = (*path)->localPort();
-				p->paths[p->pathCount].lastSend = (*path)->lastOut();
-				p->paths[p->pathCount].lastReceive = (*path)->lastIn();
-				p->paths[p->pathCount].trustedPathId = RR->topology->getOutboundPathTrust((*path)->address());
-				p->paths[p->pathCount].expired = 0;
-				p->paths[p->pathCount].preferred = ((*path) == bestp) ? 1 : 0;
-				p->paths[p->pathCount].scope = (*path)->ipScope();
-				if (pi->second->bond()) {
-					p->paths[p->pathCount].latencyMean = (*path)->latencyMean();
-					p->paths[p->pathCount].latencyVariance = (*path)->latencyVariance();
-					p->paths[p->pathCount].packetLossRatio = (*path)->packetLossRatio();
-					p->paths[p->pathCount].packetErrorRatio = (*path)->packetErrorRatio();
-					p->paths[p->pathCount].assignedFlowCount = (*path)->assignedFlowCount();
-					p->paths[p->pathCount].relativeQuality = (*path)->relativeQuality();
-					p->paths[p->pathCount].linkSpeed = (*path)->givenLinkSpeed();
-					p->paths[p->pathCount].bonded = (*path)->bonded();
-					p->paths[p->pathCount].eligible = (*path)->eligible();
-					std::string ifname = std::string((*path)->ifname());
-					memset(p->paths[p->pathCount].ifname, 0x0, std::min((int)ifname.length() + 1, ZT_MAX_PHYSIFNAME));
-					memcpy(p->paths[p->pathCount].ifname, ifname.c_str(), std::min((int)ifname.length(), ZT_MAX_PHYSIFNAME));
-				}
-				++p->pathCount;
-			}
-		}
-		if (pi->second->bond()) {
-			p->isBonded = pi->second->bond();
-			p->bondingPolicy = pi->second->bondingPolicy();
-			p->numAliveLinks = pi->second->getNumAliveLinks();
-			p->numTotalLinks = pi->second->getNumTotalLinks();
+		for(std::vector<Path>::iterator path(paths.begin());path!=paths.end();++path) {
+			memcpy(&(p->paths[p->pathCount].address),&(path->address()),sizeof(struct sockaddr_storage));
+			p->paths[p->pathCount].lastSend = path->lastSend();
+			p->paths[p->pathCount].lastReceive = path->lastReceived();
+			p->paths[p->pathCount].active = path->active(_now) ? 1 : 0;
+			p->paths[p->pathCount].preferred = ((bestPath)&&(*path == *bestPath)) ? 1 : 0;
+			++p->pathCount;
 		}
 	}
 
 	return pl;
 }
 
-ZT_VirtualNetworkConfig* Node::networkConfig(uint64_t nwid) const
+ZT_VirtualNetworkConfig *Node::networkConfig(uint64_t nwid) const
 {
 	Mutex::Lock _l(_networks_m);
-	const SharedPtr<Network>* nw = _networks.get(nwid);
-	if (nw) {
-		ZT_VirtualNetworkConfig* nc = (ZT_VirtualNetworkConfig*)::malloc(sizeof(ZT_VirtualNetworkConfig));
-		(*nw)->externalConfig(nc);
+	SharedPtr<Network> nw = _network(nwid);
+	if(nw) {
+		ZT_VirtualNetworkConfig *nc = (ZT_VirtualNetworkConfig *)::malloc(sizeof(ZT_VirtualNetworkConfig));
+		nw->externalConfig(nc);
 		return nc;
 	}
-	return (ZT_VirtualNetworkConfig*)0;
+	return (ZT_VirtualNetworkConfig *)0;
 }
 
-ZT_VirtualNetworkList* Node::networks() const
+ZT_VirtualNetworkList *Node::networks() const
 {
 	Mutex::Lock _l(_networks_m);
 
-	char* buf = (char*)::malloc(sizeof(ZT_VirtualNetworkList) + (sizeof(ZT_VirtualNetworkConfig) * _networks.size()));
-	if (! buf) {
-		return (ZT_VirtualNetworkList*)0;
-	}
-	ZT_VirtualNetworkList* nl = (ZT_VirtualNetworkList*)buf;
-	nl->networks = (ZT_VirtualNetworkConfig*)(buf + sizeof(ZT_VirtualNetworkList));
+	char *buf = (char *)::malloc(sizeof(ZT_VirtualNetworkList) + (sizeof(ZT_VirtualNetworkConfig) * _networks.size()));
+	if (!buf)
+		return (ZT_VirtualNetworkList *)0;
+	ZT_VirtualNetworkList *nl = (ZT_VirtualNetworkList *)buf;
+	nl->networks = (ZT_VirtualNetworkConfig *)(buf + sizeof(ZT_VirtualNetworkList));
 
 	nl->networkCount = 0;
-	Hashtable<uint64_t, SharedPtr<Network> >::Iterator i(*const_cast<Hashtable<uint64_t, SharedPtr<Network> >*>(&_networks));
-	uint64_t* k = (uint64_t*)0;
-	SharedPtr<Network>* v = (SharedPtr<Network>*)0;
-	while (i.next(k, v)) {
-		(*v)->externalConfig(&(nl->networks[nl->networkCount++]));
-	}
+	for(std::vector< std::pair< uint64_t,SharedPtr<Network> > >::const_iterator n(_networks.begin());n!=_networks.end();++n)
+		n->second->externalConfig(&(nl->networks[nl->networkCount++]));
 
 	return nl;
 }
 
-void Node::freeQueryResult(void* qr)
+void Node::freeQueryResult(void *qr)
 {
-	if (qr) {
+	if (qr)
 		::free(qr);
-	}
 }
 
-int Node::addLocalInterfaceAddress(const struct sockaddr_storage* addr)
+int Node::addLocalInterfaceAddress(const struct sockaddr_storage *addr)
 {
-	if (Path::isAddressValidForPath(*(reinterpret_cast<const InetAddress*>(addr)))) {
+	if (Path::isAddressValidForPath(*(reinterpret_cast<const InetAddress *>(addr)))) {
 		Mutex::Lock _l(_directPaths_m);
-		if (std::find(_directPaths.begin(), _directPaths.end(), *(reinterpret_cast<const InetAddress*>(addr))) == _directPaths.end()) {
-			_directPaths.push_back(*(reinterpret_cast<const InetAddress*>(addr)));
+		if (std::find(_directPaths.begin(),_directPaths.end(),*(reinterpret_cast<const InetAddress *>(addr))) == _directPaths.end()) {
+			_directPaths.push_back(*(reinterpret_cast<const InetAddress *>(addr)));
 			return 1;
 		}
 	}
@@ -691,54 +511,179 @@ void Node::clearLocalInterfaceAddresses()
 	_directPaths.clear();
 }
 
-int Node::sendUserMessage(void* tptr, uint64_t dest, uint64_t typeId, const void* data, unsigned int len)
+void Node::setNetconfMaster(void *networkControllerInstance)
 {
-	try {
-		if (RR->identity.address().toInt() != dest) {
-			Packet outp(Address(dest), RR->identity.address(), Packet::VERB_USER_MESSAGE);
-			outp.append(typeId);
-			outp.append(data, len);
-			outp.compress();
-			RR->sw->send(tptr, outp, true);
-			return 1;
-		}
-	}
-	catch (...) {
-	}
-	return 0;
+	RR->localNetworkController = reinterpret_cast<NetworkController *>(networkControllerInstance);
 }
 
-void Node::setNetconfMaster(void* networkControllerInstance)
+ZT_ResultCode Node::circuitTestBegin(ZT_CircuitTest *test,void (*reportCallback)(ZT_Node *,ZT_CircuitTest *,const ZT_CircuitTestReport *))
 {
-	RR->localNetworkController = reinterpret_cast<NetworkController*>(networkControllerInstance);
-	if (networkControllerInstance) {
-		RR->localNetworkController->init(RR->identity, this);
+	if (test->hopCount > 0) {
+		try {
+			Packet outp(Address(),RR->identity.address(),Packet::VERB_CIRCUIT_TEST);
+			RR->identity.address().appendTo(outp);
+			outp.append((uint16_t)((test->reportAtEveryHop != 0) ? 0x03 : 0x02));
+			outp.append((uint64_t)test->timestamp);
+			outp.append((uint64_t)test->testId);
+			outp.append((uint16_t)0); // originator credential length, updated later
+			if (test->credentialNetworkId) {
+				outp.append((uint8_t)0x01);
+				outp.append((uint64_t)test->credentialNetworkId);
+				outp.setAt<uint16_t>(ZT_PACKET_IDX_PAYLOAD + 23,(uint16_t)9);
+			}
+			outp.append((uint16_t)0);
+			C25519::Signature sig(RR->identity.sign(reinterpret_cast<const char *>(outp.data()) + ZT_PACKET_IDX_PAYLOAD,outp.size() - ZT_PACKET_IDX_PAYLOAD));
+			outp.append((uint16_t)sig.size());
+			outp.append(sig.data,(unsigned int)sig.size());
+			outp.append((uint16_t)0); // originator doesn't need an extra credential, since it's the originator
+			for(unsigned int h=1;h<test->hopCount;++h) {
+				outp.append((uint8_t)0);
+				outp.append((uint8_t)(test->hops[h].breadth & 0xff));
+				for(unsigned int a=0;a<test->hops[h].breadth;++a)
+					Address(test->hops[h].addresses[a]).appendTo(outp);
+			}
+
+			for(unsigned int a=0;a<test->hops[0].breadth;++a) {
+				outp.newInitializationVector();
+				outp.setDestination(Address(test->hops[0].addresses[a]));
+				RR->sw->send(outp,true,0);
+			}
+		} catch ( ... ) {
+			return ZT_RESULT_FATAL_ERROR_INTERNAL; // probably indicates FIFO too big for packet
+		}
 	}
+
+	{
+		test->_internalPtr = reinterpret_cast<void *>(reportCallback);
+		Mutex::Lock _l(_circuitTests_m);
+		if (std::find(_circuitTests.begin(),_circuitTests.end(),test) == _circuitTests.end())
+			_circuitTests.push_back(test);
+	}
+
+	return ZT_RESULT_OK;
+}
+
+void Node::circuitTestEnd(ZT_CircuitTest *test)
+{
+	Mutex::Lock _l(_circuitTests_m);
+	for(;;) {
+		std::vector< ZT_CircuitTest * >::iterator ct(std::find(_circuitTests.begin(),_circuitTests.end(),test));
+		if (ct == _circuitTests.end())
+			break;
+		else _circuitTests.erase(ct);
+	}
+}
+
+ZT_ResultCode Node::clusterInit(
+	unsigned int myId,
+	const struct sockaddr_storage *zeroTierPhysicalEndpoints,
+	unsigned int numZeroTierPhysicalEndpoints,
+	int x,
+	int y,
+	int z,
+	void (*sendFunction)(void *,unsigned int,const void *,unsigned int),
+	void *sendFunctionArg,
+	int (*addressToLocationFunction)(void *,const struct sockaddr_storage *,int *,int *,int *),
+	void *addressToLocationFunctionArg)
+{
+#ifdef ZT_ENABLE_CLUSTER
+	if (RR->cluster)
+		return ZT_RESULT_ERROR_BAD_PARAMETER;
+
+	std::vector<InetAddress> eps;
+	for(unsigned int i=0;i<numZeroTierPhysicalEndpoints;++i)
+		eps.push_back(InetAddress(zeroTierPhysicalEndpoints[i]));
+	std::sort(eps.begin(),eps.end());
+	RR->cluster = new Cluster(RR,myId,eps,x,y,z,sendFunction,sendFunctionArg,addressToLocationFunction,addressToLocationFunctionArg);
+
+	return ZT_RESULT_OK;
+#else
+	return ZT_RESULT_ERROR_UNSUPPORTED_OPERATION;
+#endif
+}
+
+ZT_ResultCode Node::clusterAddMember(unsigned int memberId)
+{
+#ifdef ZT_ENABLE_CLUSTER
+	if (!RR->cluster)
+		return ZT_RESULT_ERROR_BAD_PARAMETER;
+	RR->cluster->addMember((uint16_t)memberId);
+	return ZT_RESULT_OK;
+#else
+	return ZT_RESULT_ERROR_UNSUPPORTED_OPERATION;
+#endif
+}
+
+void Node::clusterRemoveMember(unsigned int memberId)
+{
+#ifdef ZT_ENABLE_CLUSTER
+	if (RR->cluster)
+		RR->cluster->removeMember((uint16_t)memberId);
+#endif
+}
+
+void Node::clusterHandleIncomingMessage(const void *msg,unsigned int len)
+{
+#ifdef ZT_ENABLE_CLUSTER
+	if (RR->cluster)
+		RR->cluster->handleIncomingStateMessage(msg,len);
+#endif
+}
+
+void Node::clusterStatus(ZT_ClusterStatus *cs)
+{
+	if (!cs)
+		return;
+#ifdef ZT_ENABLE_CLUSTER
+	if (RR->cluster)
+		RR->cluster->status(*cs);
+	else
+#endif
+	memset(cs,0,sizeof(ZT_ClusterStatus));
+}
+
+void Node::backgroundThreadMain()
+{
+	++RR->dpEnabled;
+	for(;;) {
+		try {
+			if (RR->dp->process() < 0)
+				break;
+		} catch ( ... ) {} // sanity check -- should not throw
+	}
+	--RR->dpEnabled;
 }
 
 /****************************************************************************/
 /* Node methods used only within node/                                      */
 /****************************************************************************/
 
-bool Node::shouldUsePathForZeroTierTraffic(void* tPtr, const Address& ztaddr, const int64_t localSocket, const InetAddress& remoteAddress)
+std::string Node::dataStoreGet(const char *name)
 {
-	if (! Path::isAddressValidForPath(remoteAddress)) {
-		return false;
-	}
+	char buf[1024];
+	std::string r;
+	unsigned long olen = 0;
+	do {
+		long n = _dataStoreGetFunction(reinterpret_cast<ZT_Node *>(this),_uPtr,name,buf,sizeof(buf),(unsigned long)r.length(),&olen);
+		if (n <= 0)
+			return std::string();
+		r.append(buf,n);
+	} while (r.length() < olen);
+	return r;
+}
 
-	if (RR->topology->isProhibitedEndpoint(ztaddr, remoteAddress)) {
+bool Node::shouldUsePathForZeroTierTraffic(const InetAddress &localAddress,const InetAddress &remoteAddress)
+{
+	if (!Path::isAddressValidForPath(remoteAddress))
 		return false;
-	}
 
 	{
 		Mutex::Lock _l(_networks_m);
-		Hashtable<uint64_t, SharedPtr<Network> >::Iterator i(_networks);
-		uint64_t* k = (uint64_t*)0;
-		SharedPtr<Network>* v = (SharedPtr<Network>*)0;
-		while (i.next(k, v)) {
-			if ((*v)->hasConfig()) {
-				for (unsigned int k = 0; k < (*v)->config().staticIpCount; ++k) {
-					if ((*v)->config().staticIps[k].containsAddress(remoteAddress)) {
+		for(std::vector< std::pair< uint64_t, SharedPtr<Network> > >::const_iterator i=_networks.begin();i!=_networks.end();++i) {
+			if (i->second->hasConfig()) {
+				std::vector<InetAddress> sips(i->second->config().staticIps());
+				for(std::vector<InetAddress>::const_iterator a(sips.begin());a!=sips.end();++a) {
+					if (a->containsAddress(remoteAddress)) {
 						return false;
 					}
 				}
@@ -746,176 +691,67 @@ bool Node::shouldUsePathForZeroTierTraffic(void* tPtr, const Address& ztaddr, co
 		}
 	}
 
-	return ((_cb.pathCheckFunction) ? (_cb.pathCheckFunction(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, ztaddr.toInt(), localSocket, reinterpret_cast<const struct sockaddr_storage*>(&remoteAddress)) != 0) : true);
+	if (_pathCheckFunction)
+		return (_pathCheckFunction(reinterpret_cast<ZT_Node *>(this),_uPtr,reinterpret_cast<const struct sockaddr_storage *>(&localAddress),reinterpret_cast<const struct sockaddr_storage *>(&remoteAddress)) != 0);
+	else return true;
 }
 
+#ifdef ZT_TRACE
+void Node::postTrace(const char *module,unsigned int line,const char *fmt,...)
+{
+	static Mutex traceLock;
+
+	va_list ap;
+	char tmp1[1024],tmp2[1024],tmp3[256];
+
+	Mutex::Lock _l(traceLock);
+
+	time_t now = (time_t)(_now / 1000ULL);
+#ifdef __WINDOWS__
+	ctime_s(tmp3,sizeof(tmp3),&now);
+	char *nowstr = tmp3;
+#else
+	char *nowstr = ctime_r(&now,tmp3);
+#endif
+	unsigned long nowstrlen = (unsigned long)strlen(nowstr);
+	if (nowstr[nowstrlen-1] == '\n')
+		nowstr[--nowstrlen] = (char)0;
+	if (nowstr[nowstrlen-1] == '\r')
+		nowstr[--nowstrlen] = (char)0;
+
+	va_start(ap,fmt);
+	vsnprintf(tmp2,sizeof(tmp2),fmt,ap);
+	va_end(ap);
+	tmp2[sizeof(tmp2)-1] = (char)0;
+
+	Utils::snprintf(tmp1,sizeof(tmp1),"[%s] %s:%u %s",nowstr,module,line,tmp2);
+	postEvent(ZT_EVENT_TRACE,tmp1);
+}
+#endif // ZT_TRACE
+
 uint64_t Node::prng()
 {
-	// https://en.wikipedia.org/wiki/Xorshift#xorshift.2B
-	uint64_t x = _prngState[0];
-	const uint64_t y = _prngState[1];
-	_prngState[0] = y;
-	x ^= x << 23;
-	const uint64_t z = x ^ y ^ (x >> 17) ^ (y >> 26);
-	_prngState[1] = z;
-	return z + y;
+	unsigned int p = (++_prngStreamPtr % (sizeof(_prngStream) / sizeof(uint64_t)));
+	if (!p)
+		_prng.encrypt12(_prngStream,_prngStream,sizeof(_prngStream));
+	return _prngStream[p];
 }
 
-ZT_ResultCode Node::setPhysicalPathConfiguration(const struct sockaddr_storage* pathNetwork, const ZT_PhysicalPathConfiguration* pathConfig)
+void Node::postCircuitTestReport(const ZT_CircuitTestReport *report)
 {
-	RR->topology->setPhysicalPathConfiguration(pathNetwork, pathConfig);
-	return ZT_RESULT_OK;
-}
-
-World Node::planet() const
-{
-	return RR->topology->planet();
-}
-
-std::vector<World> Node::moons() const
-{
-	return RR->topology->moons();
-}
-
-void Node::ncSendConfig(uint64_t nwid, uint64_t requestPacketId, const Address& destination, const NetworkConfig& nc, bool sendLegacyFormatConfig)
-{
-	_localControllerAuthorizations_m.lock();
-	_localControllerAuthorizations[_LocalControllerAuth(nwid, destination)] = now();
-	_localControllerAuthorizations_m.unlock();
-
-	if (destination == RR->identity.address()) {
-		SharedPtr<Network> n(network(nwid));
-		if (! n) {
-			return;
-		}
-		n->setConfiguration((void*)0, nc, true);
-	}
-	else {
-		Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>* dconf = new Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>();
-		try {
-			if (nc.toDictionary(*dconf, sendLegacyFormatConfig)) {
-				uint64_t configUpdateId = prng();
-				if (! configUpdateId) {
-					++configUpdateId;
-				}
-
-				const unsigned int totalSize = dconf->sizeBytes();
-				unsigned int chunkIndex = 0;
-				while (chunkIndex < totalSize) {
-					const unsigned int chunkLen = std::min(totalSize - chunkIndex, (unsigned int)(ZT_PROTO_MAX_PACKET_LENGTH - (ZT_PACKET_IDX_PAYLOAD + 256)));
-					Packet outp(destination, RR->identity.address(), (requestPacketId) ? Packet::VERB_OK : Packet::VERB_NETWORK_CONFIG);
-					if (requestPacketId) {
-						outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
-						outp.append(requestPacketId);
-					}
-
-					const unsigned int sigStart = outp.size();
-					outp.append(nwid);
-					outp.append((uint16_t)chunkLen);
-					outp.append((const void*)(dconf->data() + chunkIndex), chunkLen);
-
-					outp.append((uint8_t)0);   // no flags
-					outp.append((uint64_t)configUpdateId);
-					outp.append((uint32_t)totalSize);
-					outp.append((uint32_t)chunkIndex);
-
-					ECC::Signature sig(RR->identity.sign(reinterpret_cast<const uint8_t*>(outp.data()) + sigStart, outp.size() - sigStart));
-					outp.append((uint8_t)1);
-					outp.append((uint16_t)ZT_ECC_SIGNATURE_LEN);
-					outp.append(sig.data, ZT_ECC_SIGNATURE_LEN);
-
-					outp.compress();
-					RR->sw->send((void*)0, outp, true);
-					chunkIndex += chunkLen;
-				}
-			}
-			delete dconf;
-		}
-		catch (...) {
-			delete dconf;
-			throw;
+	std::vector< ZT_CircuitTest * > toNotify;
+	{
+		Mutex::Lock _l(_circuitTests_m);
+		for(std::vector< ZT_CircuitTest * >::iterator i(_circuitTests.begin());i!=_circuitTests.end();++i) {
+			if ((*i)->testId == report->testId)
+				toNotify.push_back(*i);
 		}
 	}
+	for(std::vector< ZT_CircuitTest * >::iterator i(toNotify.begin());i!=toNotify.end();++i)
+		(reinterpret_cast<void (*)(ZT_Node *,ZT_CircuitTest *,const ZT_CircuitTestReport *)>((*i)->_internalPtr))(reinterpret_cast<ZT_Node *>(this),*i,report);
 }
 
-void Node::ncSendRevocation(const Address& destination, const Revocation& rev)
-{
-	if (destination == RR->identity.address()) {
-		SharedPtr<Network> n(network(rev.networkId()));
-		if (! n) {
-			return;
-		}
-		n->addCredential((void*)0, RR->identity.address(), rev);
-	}
-	else {
-		Packet outp(destination, RR->identity.address(), Packet::VERB_NETWORK_CREDENTIALS);
-		outp.append((uint8_t)0x00);
-		outp.append((uint16_t)0);
-		outp.append((uint16_t)0);
-		outp.append((uint16_t)1);
-		rev.serialize(outp);
-		outp.append((uint16_t)0);
-		RR->sw->send((void*)0, outp, true);
-	}
-}
-
-void Node::ncSendError(uint64_t nwid, uint64_t requestPacketId, const Address& destination, NetworkController::ErrorCode errorCode, const void* errorData, unsigned int errorDataSize)
-{
-	if (destination == RR->identity.address()) {
-		SharedPtr<Network> n(network(nwid));
-		if (! n) {
-			return;
-		}
-		switch (errorCode) {
-			case NetworkController::NC_ERROR_OBJECT_NOT_FOUND:
-			case NetworkController::NC_ERROR_INTERNAL_SERVER_ERROR:
-				n->setNotFound(nullptr);
-				break;
-			case NetworkController::NC_ERROR_ACCESS_DENIED:
-				n->setAccessDenied(nullptr);
-				break;
-			case NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED: {
-				// fprintf(stderr, "\n\nGot auth required\n\n");
-				break;
-			}
-
-			default:
-				break;
-		}
-	}
-	else if (requestPacketId) {
-		Packet outp(destination, RR->identity.address(), Packet::VERB_ERROR);
-		outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
-		outp.append(requestPacketId);
-		switch (errorCode) {
-			// case NetworkController::NC_ERROR_OBJECT_NOT_FOUND:
-			// case NetworkController::NC_ERROR_INTERNAL_SERVER_ERROR:
-			default:
-				outp.append((unsigned char)Packet::ERROR_OBJ_NOT_FOUND);
-				Metrics::pkt_error_obj_not_found_out++;
-				break;
-			case NetworkController::NC_ERROR_ACCESS_DENIED:
-				outp.append((unsigned char)Packet::ERROR_NETWORK_ACCESS_DENIED_);
-				Metrics::pkt_error_network_access_denied_out++;
-				break;
-			case NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED:
-				outp.append((unsigned char)Packet::ERROR_NETWORK_AUTHENTICATION_REQUIRED);
-				Metrics::pkt_error_authentication_required_out++;
-				break;
-		}
-
-		outp.append(nwid);
-
-		if ((errorData) && (errorDataSize > 0) && (errorDataSize <= 0xffff)) {
-			outp.append((uint16_t)errorDataSize);
-			outp.append(errorData, errorDataSize);
-		}
-
-		RR->sw->send((void*)0, outp, true);
-	}	// else we can't send an ERROR() in response to nothing, so discard
-}
-
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 /****************************************************************************/
 /* CAPI bindings                                                            */
@@ -923,268 +759,284 @@ void Node::ncSendError(uint64_t nwid, uint64_t requestPacketId, const Address& d
 
 extern "C" {
 
-enum ZT_ResultCode ZT_Node_new(ZT_Node** node, void* uptr, void* tptr, const struct ZT_Node_Callbacks* callbacks, int64_t now)
+enum ZT_ResultCode ZT_Node_new(
+	ZT_Node **node,
+	void *uptr,
+	uint64_t now,
+	ZT_DataStoreGetFunction dataStoreGetFunction,
+	ZT_DataStorePutFunction dataStorePutFunction,
+	ZT_WirePacketSendFunction wirePacketSendFunction,
+	ZT_VirtualNetworkFrameFunction virtualNetworkFrameFunction,
+	ZT_VirtualNetworkConfigFunction virtualNetworkConfigFunction,
+	ZT_PathCheckFunction pathCheckFunction,
+	ZT_EventCallback eventCallback)
 {
-	*node = (ZT_Node*)0;
+	*node = (ZT_Node *)0;
 	try {
-		*node = reinterpret_cast<ZT_Node*>(new ZeroTier::Node(uptr, tptr, callbacks, now));
+		*node = reinterpret_cast<ZT_Node *>(new ZeroTier::Node(now,uptr,dataStoreGetFunction,dataStorePutFunction,wirePacketSendFunction,virtualNetworkFrameFunction,virtualNetworkConfigFunction,pathCheckFunction,eventCallback));
 		return ZT_RESULT_OK;
-	}
-	catch (std::bad_alloc& exc) {
+	} catch (std::bad_alloc &exc) {
 		return ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-	}
-	catch (std::runtime_error& exc) {
+	} catch (std::runtime_error &exc) {
 		return ZT_RESULT_FATAL_ERROR_DATA_STORE_FAILED;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-void ZT_Node_delete(ZT_Node* node)
+void ZT_Node_delete(ZT_Node *node)
 {
 	try {
-		delete (reinterpret_cast<ZeroTier::Node*>(node));
-	}
-	catch (...) {
-	}
+		delete (reinterpret_cast<ZeroTier::Node *>(node));
+	} catch ( ... ) {}
 }
 
-enum ZT_ResultCode
-ZT_Node_processWirePacket(ZT_Node* node, void* tptr, int64_t now, int64_t localSocket, const struct sockaddr_storage* remoteAddress, const void* packetData, unsigned int packetLength, volatile int64_t* nextBackgroundTaskDeadline)
+enum ZT_ResultCode ZT_Node_processWirePacket(
+	ZT_Node *node,
+	uint64_t now,
+	const struct sockaddr_storage *localAddress,
+	const struct sockaddr_storage *remoteAddress,
+	const void *packetData,
+	unsigned int packetLength,
+	volatile uint64_t *nextBackgroundTaskDeadline)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->processWirePacket(tptr, now, localSocket, remoteAddress, packetData, packetLength, nextBackgroundTaskDeadline);
-	}
-	catch (std::bad_alloc& exc) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->processWirePacket(now,localAddress,remoteAddress,packetData,packetLength,nextBackgroundTaskDeadline);
+	} catch (std::bad_alloc &exc) {
 		return ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-	}
-	catch (...) {
-		return ZT_RESULT_OK;   // "OK" since invalid packets are simply dropped, but the system is still up
+	} catch ( ... ) {
+		return ZT_RESULT_OK; // "OK" since invalid packets are simply dropped, but the system is still up
 	}
 }
 
 enum ZT_ResultCode ZT_Node_processVirtualNetworkFrame(
-	ZT_Node* node,
-	void* tptr,
-	int64_t now,
+	ZT_Node *node,
+	uint64_t now,
 	uint64_t nwid,
 	uint64_t sourceMac,
 	uint64_t destMac,
 	unsigned int etherType,
 	unsigned int vlanId,
-	const void* frameData,
+	const void *frameData,
 	unsigned int frameLength,
-	volatile int64_t* nextBackgroundTaskDeadline)
+	volatile uint64_t *nextBackgroundTaskDeadline)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->processVirtualNetworkFrame(tptr, now, nwid, sourceMac, destMac, etherType, vlanId, frameData, frameLength, nextBackgroundTaskDeadline);
-	}
-	catch (std::bad_alloc& exc) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->processVirtualNetworkFrame(now,nwid,sourceMac,destMac,etherType,vlanId,frameData,frameLength,nextBackgroundTaskDeadline);
+	} catch (std::bad_alloc &exc) {
 		return ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-enum ZT_ResultCode ZT_Node_processBackgroundTasks(ZT_Node* node, void* tptr, int64_t now, volatile int64_t* nextBackgroundTaskDeadline)
+enum ZT_ResultCode ZT_Node_processBackgroundTasks(ZT_Node *node,uint64_t now,volatile uint64_t *nextBackgroundTaskDeadline)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->processBackgroundTasks(tptr, now, nextBackgroundTaskDeadline);
-	}
-	catch (std::bad_alloc& exc) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->processBackgroundTasks(now,nextBackgroundTaskDeadline);
+	} catch (std::bad_alloc &exc) {
 		return ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-enum ZT_ResultCode ZT_Node_join(ZT_Node* node, uint64_t nwid, void* uptr, void* tptr)
+enum ZT_ResultCode ZT_Node_join(ZT_Node *node,uint64_t nwid,void *uptr)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->join(nwid, uptr, tptr);
-	}
-	catch (std::bad_alloc& exc) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->join(nwid,uptr);
+	} catch (std::bad_alloc &exc) {
 		return ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-enum ZT_ResultCode ZT_Node_leave(ZT_Node* node, uint64_t nwid, void** uptr, void* tptr)
+enum ZT_ResultCode ZT_Node_leave(ZT_Node *node,uint64_t nwid,void **uptr)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->leave(nwid, uptr, tptr);
-	}
-	catch (std::bad_alloc& exc) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->leave(nwid,uptr);
+	} catch (std::bad_alloc &exc) {
 		return ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-enum ZT_ResultCode ZT_Node_multicastSubscribe(ZT_Node* node, void* tptr, uint64_t nwid, uint64_t multicastGroup, unsigned long multicastAdi)
+enum ZT_ResultCode ZT_Node_multicastSubscribe(ZT_Node *node,uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->multicastSubscribe(tptr, nwid, multicastGroup, multicastAdi);
-	}
-	catch (std::bad_alloc& exc) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->multicastSubscribe(nwid,multicastGroup,multicastAdi);
+	} catch (std::bad_alloc &exc) {
 		return ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-enum ZT_ResultCode ZT_Node_multicastUnsubscribe(ZT_Node* node, uint64_t nwid, uint64_t multicastGroup, unsigned long multicastAdi)
+enum ZT_ResultCode ZT_Node_multicastUnsubscribe(ZT_Node *node,uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->multicastUnsubscribe(nwid, multicastGroup, multicastAdi);
-	}
-	catch (std::bad_alloc& exc) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->multicastUnsubscribe(nwid,multicastGroup,multicastAdi);
+	} catch (std::bad_alloc &exc) {
 		return ZT_RESULT_FATAL_ERROR_OUT_OF_MEMORY;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-enum ZT_ResultCode ZT_Node_orbit(ZT_Node* node, void* tptr, uint64_t moonWorldId, uint64_t moonSeed)
+uint64_t ZT_Node_address(ZT_Node *node)
+{
+	return reinterpret_cast<ZeroTier::Node *>(node)->address();
+}
+
+void ZT_Node_status(ZT_Node *node,ZT_NodeStatus *status)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->orbit(tptr, moonWorldId, moonSeed);
-	}
-	catch (...) {
-		return ZT_RESULT_FATAL_ERROR_INTERNAL;
+		reinterpret_cast<ZeroTier::Node *>(node)->status(status);
+	} catch ( ... ) {}
+}
+
+ZT_PeerList *ZT_Node_peers(ZT_Node *node)
+{
+	try {
+		return reinterpret_cast<ZeroTier::Node *>(node)->peers();
+	} catch ( ... ) {
+		return (ZT_PeerList *)0;
 	}
 }
 
-enum ZT_ResultCode ZT_Node_deorbit(ZT_Node* node, void* tptr, uint64_t moonWorldId)
+ZT_VirtualNetworkConfig *ZT_Node_networkConfig(ZT_Node *node,uint64_t nwid)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->deorbit(tptr, moonWorldId);
-	}
-	catch (...) {
-		return ZT_RESULT_FATAL_ERROR_INTERNAL;
+		return reinterpret_cast<ZeroTier::Node *>(node)->networkConfig(nwid);
+	} catch ( ... ) {
+		return (ZT_VirtualNetworkConfig *)0;
 	}
 }
 
-uint64_t ZT_Node_address(ZT_Node* node)
-{
-	return reinterpret_cast<ZeroTier::Node*>(node)->address();
-}
-
-void ZT_Node_status(ZT_Node* node, ZT_NodeStatus* status)
+ZT_VirtualNetworkList *ZT_Node_networks(ZT_Node *node)
 {
 	try {
-		reinterpret_cast<ZeroTier::Node*>(node)->status(status);
-	}
-	catch (...) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->networks();
+	} catch ( ... ) {
+		return (ZT_VirtualNetworkList *)0;
 	}
 }
 
-ZT_PeerList* ZT_Node_peers(ZT_Node* node)
+void ZT_Node_freeQueryResult(ZT_Node *node,void *qr)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->peers();
-	}
-	catch (...) {
-		return (ZT_PeerList*)0;
-	}
+		reinterpret_cast<ZeroTier::Node *>(node)->freeQueryResult(qr);
+	} catch ( ... ) {}
 }
 
-ZT_VirtualNetworkConfig* ZT_Node_networkConfig(ZT_Node* node, uint64_t nwid)
+int ZT_Node_addLocalInterfaceAddress(ZT_Node *node,const struct sockaddr_storage *addr)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->networkConfig(nwid);
-	}
-	catch (...) {
-		return (ZT_VirtualNetworkConfig*)0;
-	}
-}
-
-ZT_VirtualNetworkList* ZT_Node_networks(ZT_Node* node)
-{
-	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->networks();
-	}
-	catch (...) {
-		return (ZT_VirtualNetworkList*)0;
-	}
-}
-
-void ZT_Node_freeQueryResult(ZT_Node* node, void* qr)
-{
-	try {
-		reinterpret_cast<ZeroTier::Node*>(node)->freeQueryResult(qr);
-	}
-	catch (...) {
-	}
-}
-
-int ZT_Node_addLocalInterfaceAddress(ZT_Node* node, const struct sockaddr_storage* addr)
-{
-	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->addLocalInterfaceAddress(addr);
-	}
-	catch (...) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->addLocalInterfaceAddress(addr);
+	} catch ( ... ) {
 		return 0;
 	}
 }
 
-void ZT_Node_clearLocalInterfaceAddresses(ZT_Node* node)
+void ZT_Node_clearLocalInterfaceAddresses(ZT_Node *node)
 {
 	try {
-		reinterpret_cast<ZeroTier::Node*>(node)->clearLocalInterfaceAddresses();
-	}
-	catch (...) {
-	}
+		reinterpret_cast<ZeroTier::Node *>(node)->clearLocalInterfaceAddresses();
+	} catch ( ... ) {}
 }
 
-int ZT_Node_sendUserMessage(ZT_Node* node, void* tptr, uint64_t dest, uint64_t typeId, const void* data, unsigned int len)
+void ZT_Node_setNetconfMaster(ZT_Node *node,void *networkControllerInstance)
 {
 	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->sendUserMessage(tptr, dest, typeId, data, len);
-	}
-	catch (...) {
-		return 0;
-	}
+		reinterpret_cast<ZeroTier::Node *>(node)->setNetconfMaster(networkControllerInstance);
+	} catch ( ... ) {}
 }
 
-void ZT_Node_setNetconfMaster(ZT_Node* node, void* networkControllerInstance)
+enum ZT_ResultCode ZT_Node_circuitTestBegin(ZT_Node *node,ZT_CircuitTest *test,void (*reportCallback)(ZT_Node *,ZT_CircuitTest *,const ZT_CircuitTestReport *))
 {
 	try {
-		reinterpret_cast<ZeroTier::Node*>(node)->setNetconfMaster(networkControllerInstance);
-	}
-	catch (...) {
-	}
-}
-
-enum ZT_ResultCode ZT_Node_setPhysicalPathConfiguration(ZT_Node* node, const struct sockaddr_storage* pathNetwork, const ZT_PhysicalPathConfiguration* pathConfig)
-{
-	try {
-		return reinterpret_cast<ZeroTier::Node*>(node)->setPhysicalPathConfiguration(pathNetwork, pathConfig);
-	}
-	catch (...) {
+		return reinterpret_cast<ZeroTier::Node *>(node)->circuitTestBegin(test,reportCallback);
+	} catch ( ... ) {
 		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-void ZT_version(int* major, int* minor, int* revision)
+void ZT_Node_circuitTestEnd(ZT_Node *node,ZT_CircuitTest *test)
 {
-	if (major) {
-		*major = ZEROTIER_ONE_VERSION_MAJOR;
-	}
-	if (minor) {
-		*minor = ZEROTIER_ONE_VERSION_MINOR;
-	}
-	if (revision) {
-		*revision = ZEROTIER_ONE_VERSION_REVISION;
+	try {
+		reinterpret_cast<ZeroTier::Node *>(node)->circuitTestEnd(test);
+	} catch ( ... ) {}
+}
+
+enum ZT_ResultCode ZT_Node_clusterInit(
+	ZT_Node *node,
+	unsigned int myId,
+	const struct sockaddr_storage *zeroTierPhysicalEndpoints,
+	unsigned int numZeroTierPhysicalEndpoints,
+	int x,
+	int y,
+	int z,
+	void (*sendFunction)(void *,unsigned int,const void *,unsigned int),
+	void *sendFunctionArg,
+	int (*addressToLocationFunction)(void *,const struct sockaddr_storage *,int *,int *,int *),
+	void *addressToLocationFunctionArg)
+{
+	try {
+		return reinterpret_cast<ZeroTier::Node *>(node)->clusterInit(myId,zeroTierPhysicalEndpoints,numZeroTierPhysicalEndpoints,x,y,z,sendFunction,sendFunctionArg,addressToLocationFunction,addressToLocationFunctionArg);
+	} catch ( ... ) {
+		return ZT_RESULT_FATAL_ERROR_INTERNAL;
 	}
 }
 
-}	// extern "C"
+enum ZT_ResultCode ZT_Node_clusterAddMember(ZT_Node *node,unsigned int memberId)
+{
+	try {
+		return reinterpret_cast<ZeroTier::Node *>(node)->clusterAddMember(memberId);
+	} catch ( ... ) {
+		return ZT_RESULT_FATAL_ERROR_INTERNAL;
+	}
+}
+
+void ZT_Node_clusterRemoveMember(ZT_Node *node,unsigned int memberId)
+{
+	try {
+		reinterpret_cast<ZeroTier::Node *>(node)->clusterRemoveMember(memberId);
+	} catch ( ... ) {}
+}
+
+void ZT_Node_clusterHandleIncomingMessage(ZT_Node *node,const void *msg,unsigned int len)
+{
+	try {
+		reinterpret_cast<ZeroTier::Node *>(node)->clusterHandleIncomingMessage(msg,len);
+	} catch ( ... ) {}
+}
+
+void ZT_Node_clusterStatus(ZT_Node *node,ZT_ClusterStatus *cs)
+{
+	try {
+		reinterpret_cast<ZeroTier::Node *>(node)->clusterStatus(cs);
+	} catch ( ... ) {}
+}
+
+void ZT_Node_backgroundThreadMain(ZT_Node *node)
+{
+	try {
+		reinterpret_cast<ZeroTier::Node *>(node)->backgroundThreadMain();
+	} catch ( ... ) {}
+}
+
+void ZT_version(int *major,int *minor,int *revision,unsigned long *featureFlags)
+{
+	if (major) *major = ZEROTIER_ONE_VERSION_MAJOR;
+	if (minor) *minor = ZEROTIER_ONE_VERSION_MINOR;
+	if (revision) *revision = ZEROTIER_ONE_VERSION_REVISION;
+	if (featureFlags) {
+		*featureFlags = (
+			ZT_FEATURE_FLAG_THREAD_SAFE
+		);
+	}
+}
+
+} // extern "C"
diff --git a/node/Node.hpp b/node/Node.hpp
index 2f1075337..6ac23ca0f 100644
--- a/node/Node.hpp
+++ b/node/Node.hpp
@@ -1,365 +1,319 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_NODE_HPP
 #define ZT_NODE_HPP
 
-#include "../include/ZeroTierOne.h"
-#include "Bond.hpp"
-#include "Constants.hpp"
-#include "Hashtable.hpp"
-#include "InetAddress.hpp"
-#include "MAC.hpp"
-#include "Mutex.hpp"
-#include "Network.hpp"
-#include "NetworkController.hpp"
-#include "Path.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Salsa20.hpp"
-#include "SelfAwareness.hpp"
-
-#include <map>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vector>
 
-// Bit mask for "expecting reply" hash
-#define ZT_EXPECTING_REPLIES_BUCKET_MASK1 255
-#define ZT_EXPECTING_REPLIES_BUCKET_MASK2 31
+#include <map>
+
+#include "Constants.hpp"
+
+#include "../include/ZeroTierOne.h"
+
+#include "RuntimeEnvironment.hpp"
+#include "InetAddress.hpp"
+#include "Mutex.hpp"
+#include "MAC.hpp"
+#include "Network.hpp"
+#include "Path.hpp"
+#include "Salsa20.hpp"
+
+#undef TRACE
+#ifdef ZT_TRACE
+#define TRACE(f,...) RR->node->postTrace(__FILE__,__LINE__,f,##__VA_ARGS__)
+#else
+#define TRACE(f,...) {}
+#endif
 
 namespace ZeroTier {
 
-class World;
-
 /**
  * Implementation of Node object as defined in CAPI
  *
  * The pointer returned by ZT_Node_new() is an instance of this class.
  */
-class Node : public NetworkController::Sender {
-  public:
-	Node(void* uptr, void* tptr, const struct ZT_Node_Callbacks* callbacks, int64_t now);
-	virtual ~Node();
+class Node
+{
+public:
+	Node(
+		uint64_t now,
+		void *uptr,
+		ZT_DataStoreGetFunction dataStoreGetFunction,
+		ZT_DataStorePutFunction dataStorePutFunction,
+		ZT_WirePacketSendFunction wirePacketSendFunction,
+		ZT_VirtualNetworkFrameFunction virtualNetworkFrameFunction,
+		ZT_VirtualNetworkConfigFunction virtualNetworkConfigFunction,
+		ZT_PathCheckFunction pathCheckFunction,
+		ZT_EventCallback eventCallback);
 
-	// Get rid of alignment warnings on 32-bit Windows and possibly improve performance
-#ifdef __WINDOWS__
-	void* operator new(size_t i)
-	{
-		return _mm_malloc(i, 16);
-	}
-	void operator delete(void* p)
-	{
-		_mm_free(p);
-	}
-#endif
+	~Node();
 
 	// Public API Functions ----------------------------------------------------
 
-	ZT_ResultCode processWirePacket(void* tptr, int64_t now, int64_t localSocket, const struct sockaddr_storage* remoteAddress, const void* packetData, unsigned int packetLength, volatile int64_t* nextBackgroundTaskDeadline);
+	ZT_ResultCode processWirePacket(
+		uint64_t now,
+		const struct sockaddr_storage *localAddress,
+		const struct sockaddr_storage *remoteAddress,
+		const void *packetData,
+		unsigned int packetLength,
+		volatile uint64_t *nextBackgroundTaskDeadline);
 	ZT_ResultCode processVirtualNetworkFrame(
-		void* tptr,
-		int64_t now,
+		uint64_t now,
 		uint64_t nwid,
 		uint64_t sourceMac,
 		uint64_t destMac,
 		unsigned int etherType,
 		unsigned int vlanId,
-		const void* frameData,
+		const void *frameData,
 		unsigned int frameLength,
-		volatile int64_t* nextBackgroundTaskDeadline);
-	ZT_ResultCode processBackgroundTasks(void* tptr, int64_t now, volatile int64_t* nextBackgroundTaskDeadline);
-	ZT_ResultCode join(uint64_t nwid, void* uptr, void* tptr);
-	ZT_ResultCode leave(uint64_t nwid, void** uptr, void* tptr);
-	ZT_ResultCode multicastSubscribe(void* tptr, uint64_t nwid, uint64_t multicastGroup, unsigned long multicastAdi);
-	ZT_ResultCode multicastUnsubscribe(uint64_t nwid, uint64_t multicastGroup, unsigned long multicastAdi);
-	ZT_ResultCode orbit(void* tptr, uint64_t moonWorldId, uint64_t moonSeed);
-	ZT_ResultCode deorbit(void* tptr, uint64_t moonWorldId);
+		volatile uint64_t *nextBackgroundTaskDeadline);
+	ZT_ResultCode processBackgroundTasks(uint64_t now,volatile uint64_t *nextBackgroundTaskDeadline);
+	ZT_ResultCode join(uint64_t nwid,void *uptr);
+	ZT_ResultCode leave(uint64_t nwid,void **uptr);
+	ZT_ResultCode multicastSubscribe(uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi);
+	ZT_ResultCode multicastUnsubscribe(uint64_t nwid,uint64_t multicastGroup,unsigned long multicastAdi);
 	uint64_t address() const;
-	void status(ZT_NodeStatus* status) const;
-	ZT_PeerList* peers() const;
-	ZT_VirtualNetworkConfig* networkConfig(uint64_t nwid) const;
-	ZT_VirtualNetworkList* networks() const;
-	void freeQueryResult(void* qr);
-	int addLocalInterfaceAddress(const struct sockaddr_storage* addr);
+	void status(ZT_NodeStatus *status) const;
+	ZT_PeerList *peers() const;
+	ZT_VirtualNetworkConfig *networkConfig(uint64_t nwid) const;
+	ZT_VirtualNetworkList *networks() const;
+	void freeQueryResult(void *qr);
+	int addLocalInterfaceAddress(const struct sockaddr_storage *addr);
 	void clearLocalInterfaceAddresses();
-	int sendUserMessage(void* tptr, uint64_t dest, uint64_t typeId, const void* data, unsigned int len);
-	void setNetconfMaster(void* networkControllerInstance);
+	void setNetconfMaster(void *networkControllerInstance);
+	ZT_ResultCode circuitTestBegin(ZT_CircuitTest *test,void (*reportCallback)(ZT_Node *,ZT_CircuitTest *,const ZT_CircuitTestReport *));
+	void circuitTestEnd(ZT_CircuitTest *test);
+	ZT_ResultCode clusterInit(
+		unsigned int myId,
+		const struct sockaddr_storage *zeroTierPhysicalEndpoints,
+		unsigned int numZeroTierPhysicalEndpoints,
+		int x,
+		int y,
+		int z,
+		void (*sendFunction)(void *,unsigned int,const void *,unsigned int),
+		void *sendFunctionArg,
+		int (*addressToLocationFunction)(void *,const struct sockaddr_storage *,int *,int *,int *),
+		void *addressToLocationFunctionArg);
+	ZT_ResultCode clusterAddMember(unsigned int memberId);
+	void clusterRemoveMember(unsigned int memberId);
+	void clusterHandleIncomingMessage(const void *msg,unsigned int len);
+	void clusterStatus(ZT_ClusterStatus *cs);
+	void backgroundThreadMain();
 
 	// Internal functions ------------------------------------------------------
 
-	inline int64_t now() const
+	/**
+	 * Convenience threadMain() for easy background thread launch
+	 *
+	 * This allows background threads to be launched with Thread::start
+	 * that will run against this node.
+	 */
+	inline void threadMain() throw() { this->backgroundThreadMain(); }
+
+	/**
+	 * @return Time as of last call to run()
+	 */
+	inline uint64_t now() const throw() { return _now; }
+
+	/**
+	 * Enqueue a ZeroTier message to be sent
+	 *
+	 * @param localAddress Local address
+	 * @param addr Destination address
+	 * @param data Packet data
+	 * @param len Packet length
+	 * @param ttl Desired TTL (default: 0 for unchanged/default TTL)
+	 * @return True if packet appears to have been sent
+	 */
+	inline bool putPacket(const InetAddress &localAddress,const InetAddress &addr,const void *data,unsigned int len,unsigned int ttl = 0)
 	{
-		return _now;
+		return (_wirePacketSendFunction(
+			reinterpret_cast<ZT_Node *>(this),
+			_uPtr,
+			reinterpret_cast<const struct sockaddr_storage *>(&localAddress),
+			reinterpret_cast<const struct sockaddr_storage *>(&addr),
+			data,
+			len,
+			ttl) == 0);
 	}
 
-	inline bool putPacket(void* tPtr, const int64_t localSocket, const InetAddress& addr, const void* data, unsigned int len, unsigned int ttl = 0)
+	/**
+	 * Enqueue a frame to be injected into a tap device (port)
+	 *
+	 * @param nwid Network ID
+	 * @param nuptr Network user ptr
+	 * @param source Source MAC
+	 * @param dest Destination MAC
+	 * @param etherType 16-bit ethernet type
+	 * @param vlanId VLAN ID or 0 if none
+	 * @param data Frame data
+	 * @param len Frame length
+	 */
+	inline void putFrame(uint64_t nwid,void **nuptr,const MAC &source,const MAC &dest,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len)
 	{
-		return (_cb.wirePacketSendFunction(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, localSocket, reinterpret_cast<const struct sockaddr_storage*>(&addr), data, len, ttl) == 0);
+		_virtualNetworkFrameFunction(
+			reinterpret_cast<ZT_Node *>(this),
+			_uPtr,
+			nwid,
+			nuptr,
+			source.toInt(),
+			dest.toInt(),
+			etherType,
+			vlanId,
+			data,
+			len);
 	}
 
-	inline void putFrame(void* tPtr, uint64_t nwid, void** nuptr, const MAC& source, const MAC& dest, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len)
-	{
-		_cb.virtualNetworkFrameFunction(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, nwid, nuptr, source.toInt(), dest.toInt(), etherType, vlanId, data, len);
-	}
+	/**
+	 * @param localAddress Local address
+	 * @param remoteAddress Remote address
+	 * @return True if path should be used
+	 */
+	bool shouldUsePathForZeroTierTraffic(const InetAddress &localAddress,const InetAddress &remoteAddress);
 
 	inline SharedPtr<Network> network(uint64_t nwid) const
 	{
 		Mutex::Lock _l(_networks_m);
-		const SharedPtr<Network>* n = _networks.get(nwid);
-		if (n) {
-			return *n;
-		}
-		return SharedPtr<Network>();
+		return _network(nwid);
 	}
 
 	inline bool belongsToNetwork(uint64_t nwid) const
 	{
 		Mutex::Lock _l(_networks_m);
-		return _networks.contains(nwid);
+		for(std::vector< std::pair< uint64_t, SharedPtr<Network> > >::const_iterator i=_networks.begin();i!=_networks.end();++i) {
+			if (i->first == nwid)
+				return true;
+		}
+		return false;
 	}
 
-	inline std::vector<SharedPtr<Network> > allNetworks() const
+	inline std::vector< SharedPtr<Network> > allNetworks() const
 	{
-		std::vector<SharedPtr<Network> > nw;
+		std::vector< SharedPtr<Network> > nw;
 		Mutex::Lock _l(_networks_m);
-		Hashtable<uint64_t, SharedPtr<Network> >::Iterator i(*const_cast<Hashtable<uint64_t, SharedPtr<Network> >*>(&_networks));
-		uint64_t* k = (uint64_t*)0;
-		SharedPtr<Network>* v = (SharedPtr<Network>*)0;
-		while (i.next(k, v)) {
-			nw.push_back(*v);
-		}
+		nw.reserve(_networks.size());
+		for(std::vector< std::pair< uint64_t, SharedPtr<Network> > >::const_iterator i=_networks.begin();i!=_networks.end();++i)
+			nw.push_back(i->second);
 		return nw;
 	}
 
+	/**
+	 * @return Potential direct paths to me a.k.a. local interface addresses
+	 */
 	inline std::vector<InetAddress> directPaths() const
 	{
 		Mutex::Lock _l(_directPaths_m);
 		return _directPaths;
 	}
 
-	inline void postEvent(void* tPtr, ZT_Event ev, const void* md = (const void*)0)
-	{
-		_cb.eventCallback(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, ev, md);
-	}
+	inline bool dataStorePut(const char *name,const void *data,unsigned int len,bool secure) { return (_dataStorePutFunction(reinterpret_cast<ZT_Node *>(this),_uPtr,name,data,len,(int)secure) == 0); }
+	inline bool dataStorePut(const char *name,const std::string &data,bool secure) { return dataStorePut(name,(const void *)data.data(),(unsigned int)data.length(),secure); }
+	inline void dataStoreDelete(const char *name) { _dataStorePutFunction(reinterpret_cast<ZT_Node *>(this),_uPtr,name,(const void *)0,0,0); }
+	std::string dataStoreGet(const char *name);
 
-	inline int configureVirtualNetworkPort(void* tPtr, uint64_t nwid, void** nuptr, ZT_VirtualNetworkConfigOperation op, const ZT_VirtualNetworkConfig* nc)
-	{
-		return _cb.virtualNetworkConfigFunction(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, nwid, nuptr, op, nc);
-	}
+	/**
+	 * Post an event to the external user
+	 *
+	 * @param ev Event type
+	 * @param md Meta-data (default: NULL/none)
+	 */
+	inline void postEvent(ZT_Event ev,const void *md = (const void *)0) { _eventCallback(reinterpret_cast<ZT_Node *>(this),_uPtr,ev,md); }
 
-	inline bool online() const
-	{
-		return _online;
-	}
+	/**
+	 * Update virtual network port configuration
+	 *
+	 * @param nwid Network ID
+	 * @param nuptr Network user ptr
+	 * @param op Configuration operation
+	 * @param nc Network configuration
+	 */
+	inline int configureVirtualNetworkPort(uint64_t nwid,void **nuptr,ZT_VirtualNetworkConfigOperation op,const ZT_VirtualNetworkConfig *nc) { return _virtualNetworkConfigFunction(reinterpret_cast<ZT_Node *>(this),_uPtr,nwid,nuptr,op,nc); }
 
-	inline int stateObjectGet(void* const tPtr, ZT_StateObjectType type, const uint64_t id[2], void* const data, const unsigned int maxlen)
-	{
-		return _cb.stateGetFunction(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, type, id, data, maxlen);
-	}
-	inline void stateObjectPut(void* const tPtr, ZT_StateObjectType type, const uint64_t id[2], const void* const data, const unsigned int len)
-	{
-		_cb.statePutFunction(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, type, id, data, (int)len);
-	}
-	inline void stateObjectDelete(void* const tPtr, ZT_StateObjectType type, const uint64_t id[2])
-	{
-		_cb.statePutFunction(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, type, id, (const void*)0, -1);
-	}
+	/**
+	 * @return True if we appear to be online
+	 */
+	inline bool online() const throw() { return _online; }
 
-	bool shouldUsePathForZeroTierTraffic(void* tPtr, const Address& ztaddr, const int64_t localSocket, const InetAddress& remoteAddress);
-	inline bool externalPathLookup(void* tPtr, const Address& ztaddr, int family, InetAddress& addr)
-	{
-		return ((_cb.pathLookupFunction) ? (_cb.pathLookupFunction(reinterpret_cast<ZT_Node*>(this), _uPtr, tPtr, ztaddr.toInt(), family, reinterpret_cast<struct sockaddr_storage*>(&addr)) != 0) : false);
-	}
+#ifdef ZT_TRACE
+	void postTrace(const char *module,unsigned int line,const char *fmt,...);
+#endif
 
+	/**
+	 * @return Next 64-bit random number (not for cryptographic use)
+	 */
 	uint64_t prng();
-	ZT_ResultCode setPhysicalPathConfiguration(const struct sockaddr_storage* pathNetwork, const ZT_PhysicalPathConfiguration* pathConfig);
-
-	World planet() const;
-	std::vector<World> moons() const;
-
-	inline const Identity& identity() const
-	{
-		return _RR.identity;
-	}
-
-	inline const std::vector<InetAddress> SurfaceAddresses() const
-	{
-		return _RR.sa->whoami();
-	}
-
-	inline Bond* bondController() const
-	{
-		return _RR.bc;
-	}
 
 	/**
-	 * Register that we are expecting a reply to a packet ID
+	 * Post a circuit test report to any listeners for a given test ID
 	 *
-	 * This only uses the most significant bits of the packet ID, both to save space
-	 * and to avoid using the higher bits that can be modified during armor() to
-	 * mask against the packet send counter used for QoS detection.
-	 *
-	 * @param packetId Packet ID to expect reply to
+	 * @param report Report (includes test ID)
 	 */
-	inline void expectReplyTo(const uint64_t packetId)
-	{
-		const unsigned long pid2 = (unsigned long)(packetId >> 32);
-		const unsigned long bucket = (unsigned long)(pid2 & ZT_EXPECTING_REPLIES_BUCKET_MASK1);
-		_expectingRepliesTo[bucket][_expectingRepliesToBucketPtr[bucket]++ & ZT_EXPECTING_REPLIES_BUCKET_MASK2] = (uint32_t)pid2;
-	}
+	void postCircuitTestReport(const ZT_CircuitTestReport *report);
 
-	/**
-	 * Check whether a given packet ID is something we are expecting a reply to
-	 *
-	 * This only uses the most significant bits of the packet ID, both to save space
-	 * and to avoid using the higher bits that can be modified during armor() to
-	 * mask against the packet send counter used for QoS detection.
-	 *
-	 * @param packetId Packet ID to check
-	 * @return True if we're expecting a reply
-	 */
-	inline bool expectingReplyTo(const uint64_t packetId) const
+private:
+	inline SharedPtr<Network> _network(uint64_t nwid) const
 	{
-		const uint32_t pid2 = (uint32_t)(packetId >> 32);
-		const unsigned long bucket = (unsigned long)(pid2 & ZT_EXPECTING_REPLIES_BUCKET_MASK1);
-		for (unsigned long i = 0; i <= ZT_EXPECTING_REPLIES_BUCKET_MASK2; ++i) {
-			if (_expectingRepliesTo[bucket][i] == pid2) {
-				return true;
-			}
+		// assumes _networks_m is locked
+		for(std::vector< std::pair< uint64_t, SharedPtr<Network> > >::const_iterator i=_networks.begin();i!=_networks.end();++i) {
+			if (i->first == nwid)
+				return i->second;
 		}
-		return false;
+		return SharedPtr<Network>();
 	}
 
-	/**
-	 * Check whether we should do potentially expensive identity verification (rate limit)
-	 *
-	 * @param now Current time
-	 * @param from Source address of packet
-	 * @return True if within rate limits
-	 */
-	inline bool rateGateIdentityVerification(const int64_t now, const InetAddress& from)
-	{
-		unsigned long iph = from.rateGateHash();
-		if ((now - _lastIdentityVerification[iph]) >= ZT_IDENTITY_VALIDATION_SOURCE_RATE_LIMIT) {
-			_lastIdentityVerification[iph] = now;
-			return true;
-		}
-		return false;
-	}
-
-	virtual void ncSendConfig(uint64_t nwid, uint64_t requestPacketId, const Address& destination, const NetworkConfig& nc, bool sendLegacyFormatConfig);
-	virtual void ncSendRevocation(const Address& destination, const Revocation& rev);
-	virtual void ncSendError(uint64_t nwid, uint64_t requestPacketId, const Address& destination, NetworkController::ErrorCode errorCode, const void* errorData, unsigned int errorDataSize);
-
-	inline const Address& remoteTraceTarget() const
-	{
-		return _remoteTraceTarget;
-	}
-	inline Trace::Level remoteTraceLevel() const
-	{
-		return _remoteTraceLevel;
-	}
-
-	inline bool localControllerHasAuthorized(const int64_t now, const uint64_t nwid, const Address& addr) const
-	{
-		_localControllerAuthorizations_m.lock();
-		const int64_t* const at = _localControllerAuthorizations.get(_LocalControllerAuth(nwid, addr));
-		_localControllerAuthorizations_m.unlock();
-		if (at) {
-			return ((now - *at) < (ZT_NETWORK_AUTOCONF_DELAY * 3));
-		}
-		return false;
-	}
-
-	inline void statsLogVerb(const unsigned int v, const unsigned int bytes)
-	{
-		++_stats.inVerbCounts[v];
-		_stats.inVerbBytes[v] += (uint64_t)bytes;
-	}
-
-	inline void setLowBandwidthMode(bool isEnabled)
-	{
-		_lowBandwidthMode = isEnabled;
-	}
-
-	inline bool lowBandwidthModeEnabled()
-	{
-		return _lowBandwidthMode;
-	}
-
-	void initMultithreading(unsigned int concurrency, bool cpuPinningEnabled);
-
-  public:
 	RuntimeEnvironment _RR;
-	RuntimeEnvironment* RR;
-	void* _uPtr;   // _uptr (lower case) is reserved in Visual Studio :P
-	ZT_Node_Callbacks _cb;
+	RuntimeEnvironment *RR;
 
-	// For tracking packet IDs to filter out OK/ERROR replies to packets we did not send
-	uint8_t _expectingRepliesToBucketPtr[ZT_EXPECTING_REPLIES_BUCKET_MASK1 + 1];
-	uint32_t _expectingRepliesTo[ZT_EXPECTING_REPLIES_BUCKET_MASK1 + 1][ZT_EXPECTING_REPLIES_BUCKET_MASK2 + 1];
+	void *_uPtr; // _uptr (lower case) is reserved in Visual Studio :P
 
-	// Time of last identity verification indexed by InetAddress.rateGateHash() -- used in IncomingPacket::_doHELLO() via rateGateIdentityVerification()
-	int64_t _lastIdentityVerification[16384];
+	ZT_DataStoreGetFunction _dataStoreGetFunction;
+	ZT_DataStorePutFunction _dataStorePutFunction;
+	ZT_WirePacketSendFunction _wirePacketSendFunction;
+	ZT_VirtualNetworkFrameFunction _virtualNetworkFrameFunction;
+	ZT_VirtualNetworkConfigFunction _virtualNetworkConfigFunction;
+	ZT_PathCheckFunction _pathCheckFunction;
+	ZT_EventCallback _eventCallback;
 
-	// Statistics about stuff happening
-	volatile ZT_NodeStatistics _stats;
-
-	// Map that remembers if we have recently sent a network config to someone
-	// querying us as a controller.
-	struct _LocalControllerAuth {
-		uint64_t nwid, address;
-		_LocalControllerAuth(const uint64_t nwid_, const Address& address_) : nwid(nwid_), address(address_.toInt())
-		{
-		}
-		inline unsigned long hashCode() const
-		{
-			return (unsigned long)(nwid ^ address);
-		}
-		inline bool operator==(const _LocalControllerAuth& a) const
-		{
-			return ((a.nwid == nwid) && (a.address == address));
-		}
-		inline bool operator!=(const _LocalControllerAuth& a) const
-		{
-			return ((a.nwid != nwid) || (a.address != address));
-		}
-	};
-	Hashtable<_LocalControllerAuth, int64_t> _localControllerAuthorizations;
-	Mutex _localControllerAuthorizations_m;
-
-	Hashtable<uint64_t, SharedPtr<Network> > _networks;
+	std::vector< std::pair< uint64_t, SharedPtr<Network> > > _networks;
 	Mutex _networks_m;
 
+	std::vector< ZT_CircuitTest * > _circuitTests;
+	Mutex _circuitTests_m;
+
 	std::vector<InetAddress> _directPaths;
 	Mutex _directPaths_m;
 
 	Mutex _backgroundTasksLock;
 
-	Address _remoteTraceTarget;
-	enum Trace::Level _remoteTraceLevel;
+	unsigned int _prngStreamPtr;
+	Salsa20 _prng;
+	uint64_t _prngStream[16]; // repeatedly encrypted with _prng to yield a high-quality non-crypto PRNG stream
 
-	volatile int64_t _now;
-	int64_t _lastPingCheck;
-	int64_t _lastGratuitousPingCheck;
-	int64_t _lastHousekeepingRun;
-	int64_t _lastMemoizedTraceSettings;
-	volatile int64_t _prngState[2];
+	uint64_t _now;
+	uint64_t _lastPingCheck;
+	uint64_t _lastHousekeepingRun;
 	bool _online;
-	bool _lowBandwidthMode;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/NonCopyable.hpp b/node/NonCopyable.hpp
new file mode 100644
index 000000000..6d4daa86f
--- /dev/null
+++ b/node/NonCopyable.hpp
@@ -0,0 +1,38 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_NONCOPYABLE_HPP__
+#define ZT_NONCOPYABLE_HPP__
+
+namespace ZeroTier {
+
+/**
+ * A simple concept that belongs in the C++ language spec
+ */
+class NonCopyable
+{
+protected:
+	NonCopyable() throw() {}
+private:
+	NonCopyable(const NonCopyable&);
+	const NonCopyable& operator=(const NonCopyable&);
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/node/OutboundMulticast.cpp b/node/OutboundMulticast.cpp
index 702a0333e..eea1132c2 100644
--- a/node/OutboundMulticast.cpp
+++ b/node/OutboundMulticast.cpp
@@ -1,94 +1,113 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
-
-#include "OutboundMulticast.hpp"
 
 #include "Constants.hpp"
-#include "Network.hpp"
-#include "Node.hpp"
-#include "Peer.hpp"
 #include "RuntimeEnvironment.hpp"
+#include "OutboundMulticast.hpp"
 #include "Switch.hpp"
-#include "Topology.hpp"
+#include "Network.hpp"
+#include "CertificateOfMembership.hpp"
+#include "Node.hpp"
 
 namespace ZeroTier {
 
 void OutboundMulticast::init(
-	const RuntimeEnvironment* RR,
+	const RuntimeEnvironment *RR,
 	uint64_t timestamp,
 	uint64_t nwid,
-	bool disableCompression,
+	const CertificateOfMembership *com,
 	unsigned int limit,
 	unsigned int gatherLimit,
-	const MAC& src,
-	const MulticastGroup& dest,
+	const MAC &src,
+	const MulticastGroup &dest,
 	unsigned int etherType,
-	const void* payload,
+	const void *payload,
 	unsigned int len)
 {
-	uint8_t flags = 0;
-
 	_timestamp = timestamp;
 	_nwid = nwid;
-	if (src) {
-		_macSrc = src;
-		flags |= 0x04;
-	}
-	else {
-		_macSrc.fromAddress(RR->identity.address(), nwid);
-	}
-	_macDest = dest.mac();
 	_limit = limit;
-	_frameLen = (len < ZT_MAX_MTU) ? len : ZT_MAX_MTU;
-	_etherType = etherType;
 
-	if (gatherLimit) {
-		flags |= 0x02;
-	}
+	uint8_t flags = 0;
+	if (gatherLimit) flags |= 0x02;
+	if (src) flags |= 0x04;
 
-	_packet.setSource(RR->identity.address());
-	_packet.setVerb(Packet::VERB_MULTICAST_FRAME);
-	_packet.append((uint64_t)nwid);
-	_packet.append(flags);
-	if (gatherLimit) {
-		_packet.append((uint32_t)gatherLimit);
-	}
-	if (src) {
-		src.appendTo(_packet);
-	}
-	dest.mac().appendTo(_packet);
-	_packet.append((uint32_t)dest.adi());
-	_packet.append((uint16_t)etherType);
-	_packet.append(payload, _frameLen);
-	if (! disableCompression) {
-		_packet.compress();
-	}
+	/*
+	TRACE(">>MC %.16llx INIT %.16llx/%s limit %u gatherLimit %u from %s to %s length %u com==%d",
+		(unsigned long long)this,
+		nwid,
+		dest.toString().c_str(),
+		limit,
+		gatherLimit,
+		(src) ? src.toString().c_str() : MAC(RR->identity.address(),nwid).toString().c_str(),
+		dest.toString().c_str(),
+		len,
+		(com) ? 1 : 0);
+	*/
 
-	memcpy(_frameData, payload, _frameLen);
+	_packetNoCom.setSource(RR->identity.address());
+	_packetNoCom.setVerb(Packet::VERB_MULTICAST_FRAME);
+	_packetNoCom.append((uint64_t)nwid);
+	_packetNoCom.append(flags);
+	if (gatherLimit) _packetNoCom.append((uint32_t)gatherLimit);
+	if (src) src.appendTo(_packetNoCom);
+	dest.mac().appendTo(_packetNoCom);
+	_packetNoCom.append((uint32_t)dest.adi());
+	_packetNoCom.append((uint16_t)etherType);
+	_packetNoCom.append(payload,len);
+	_packetNoCom.compress();
+
+	if (com) {
+		_haveCom = true;
+		flags |= 0x01;
+
+		_packetWithCom.setSource(RR->identity.address());
+		_packetWithCom.setVerb(Packet::VERB_MULTICAST_FRAME);
+		_packetWithCom.append((uint64_t)nwid);
+		_packetWithCom.append(flags);
+		com->serialize(_packetWithCom);
+		if (gatherLimit) _packetWithCom.append((uint32_t)gatherLimit);
+		if (src) src.appendTo(_packetWithCom);
+		dest.mac().appendTo(_packetWithCom);
+		_packetWithCom.append((uint32_t)dest.adi());
+		_packetWithCom.append((uint16_t)etherType);
+		_packetWithCom.append(payload,len);
+		_packetWithCom.compress();
+	} else _haveCom = false;
 }
 
-void OutboundMulticast::sendOnly(const RuntimeEnvironment* RR, void* tPtr, const Address& toAddr)
+void OutboundMulticast::sendOnly(const RuntimeEnvironment *RR,const Address &toAddr)
 {
-	const SharedPtr<Network> nw(RR->node->network(_nwid));
-	uint8_t QoSBucket = 255;   // Dummy value
-	if ((nw) && (nw->filterOutgoingPacket(tPtr, true, RR->identity.address(), toAddr, _macSrc, _macDest, _frameData, _frameLen, _etherType, 0, QoSBucket))) {
-		nw->pushCredentialsIfNeeded(tPtr, toAddr, RR->node->now());
-		_packet.newInitializationVector();
-		_packet.setDestination(toAddr);
-		RR->node->expectReplyTo(_packet.packetId());
-		_tmp = _packet;
-		RR->sw->send(tPtr, _tmp, true);
+	if (_haveCom) {
+		SharedPtr<Peer> peer(RR->topology->getPeer(toAddr));
+		if ( (!peer) || (peer->needsOurNetworkMembershipCertificate(_nwid,RR->node->now(),true)) ) {
+			//TRACE(">>MC %.16llx -> %s (with COM)",(unsigned long long)this,toAddr.toString().c_str());
+			_packetWithCom.newInitializationVector();
+			_packetWithCom.setDestination(toAddr);
+			RR->sw->send(_packetWithCom,true,_nwid);
+			return;
+		}
 	}
+
+	//TRACE(">>MC %.16llx -> %s (without COM)",(unsigned long long)this,toAddr.toString().c_str());
+	_packetNoCom.newInitializationVector();
+	_packetNoCom.setDestination(toAddr);
+	RR->sw->send(_packetNoCom,true,_nwid);
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/OutboundMulticast.hpp b/node/OutboundMulticast.hpp
index 542151e2a..3818172e1 100644
--- a/node/OutboundMulticast.hpp
+++ b/node/OutboundMulticast.hpp
@@ -1,29 +1,35 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_OUTBOUNDMULTICAST_HPP
 #define ZT_OUTBOUNDMULTICAST_HPP
 
-#include "Address.hpp"
+#include <stdint.h>
+
+#include <vector>
+#include <algorithm>
+
 #include "Constants.hpp"
 #include "MAC.hpp"
 #include "MulticastGroup.hpp"
+#include "Address.hpp"
 #include "Packet.hpp"
 
-#include <algorithm>
-#include <stdint.h>
-#include <vector>
-
 namespace ZeroTier {
 
 class CertificateOfMembership;
@@ -34,16 +40,15 @@ class RuntimeEnvironment;
  *
  * This object isn't guarded by a mutex; caller must synchronize access.
  */
-class OutboundMulticast {
-  public:
+class OutboundMulticast
+{
+public:
 	/**
 	 * Create an uninitialized outbound multicast
 	 *
 	 * It must be initialized with init().
 	 */
-	OutboundMulticast()
-	{
-	}
+	OutboundMulticast() {}
 
 	/**
 	 * Initialize outbound multicast
@@ -51,7 +56,7 @@ class OutboundMulticast {
 	 * @param RR Runtime environment
 	 * @param timestamp Creation time
 	 * @param nwid Network ID
-	 * @param disableCompression Disable compression of frame payload
+	 * @param com Certificate of membership or NULL if none available
 	 * @param limit Multicast limit for desired number of packets to send
 	 * @param gatherLimit Number to lazily/implicitly gather with this frame or 0 for none
 	 * @param src Source MAC address of frame or NULL to imply compute from sender ZT address
@@ -62,107 +67,79 @@ class OutboundMulticast {
 	 * @throws std::out_of_range Data too large to fit in a MULTICAST_FRAME
 	 */
 	void init(
-		const RuntimeEnvironment* RR,
+		const RuntimeEnvironment *RR,
 		uint64_t timestamp,
 		uint64_t nwid,
-		bool disableCompression,
+		const CertificateOfMembership *com,
 		unsigned int limit,
 		unsigned int gatherLimit,
-		const MAC& src,
-		const MulticastGroup& dest,
+		const MAC &src,
+		const MulticastGroup &dest,
 		unsigned int etherType,
-		const void* payload,
+		const void *payload,
 		unsigned int len);
 
 	/**
 	 * @return Multicast creation time
 	 */
-	inline uint64_t timestamp() const
-	{
-		return _timestamp;
-	}
+	inline uint64_t timestamp() const throw() { return _timestamp; }
 
 	/**
 	 * @param now Current time
 	 * @return True if this multicast is expired (has exceeded transmit timeout)
 	 */
-	inline bool expired(int64_t now) const
-	{
-		return ((now - _timestamp) >= ZT_MULTICAST_TRANSMIT_TIMEOUT);
-	}
+	inline bool expired(uint64_t now) const throw() { return ((now - _timestamp) >= ZT_MULTICAST_TRANSMIT_TIMEOUT); }
 
 	/**
 	 * @return True if this outbound multicast has been sent to enough peers
 	 */
-	inline bool atLimit() const
-	{
-		return (_alreadySentTo.size() >= _limit);
-	}
+	inline bool atLimit() const throw() { return (_alreadySentTo.size() >= _limit); }
 
 	/**
 	 * Just send without checking log
 	 *
 	 * @param RR Runtime environment
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param toAddr Destination address
 	 */
-	void sendOnly(const RuntimeEnvironment* RR, void* tPtr, const Address& toAddr);
+	void sendOnly(const RuntimeEnvironment *RR,const Address &toAddr);
 
 	/**
 	 * Just send and log but do not check sent log
 	 *
 	 * @param RR Runtime environment
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param toAddr Destination address
 	 */
-	inline void sendAndLog(const RuntimeEnvironment* RR, void* tPtr, const Address& toAddr)
-	{
-		_alreadySentTo.push_back(toAddr);
-		sendOnly(RR, tPtr, toAddr);
-	}
-
-	/**
-	 * Log an address as having been used so we will not send there in the future
-	 *
-	 * @param toAddr Address to log as sent
-	 */
-	inline void logAsSent(const Address& toAddr)
+	inline void sendAndLog(const RuntimeEnvironment *RR,const Address &toAddr)
 	{
 		_alreadySentTo.push_back(toAddr);
+		sendOnly(RR,toAddr);
 	}
 
 	/**
 	 * Try to send this to a given peer if it hasn't been sent to them already
 	 *
 	 * @param RR Runtime environment
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param toAddr Destination address
 	 * @return True if address is new and packet was sent to switch, false if duplicate
 	 */
-	inline bool sendIfNew(const RuntimeEnvironment* RR, void* tPtr, const Address& toAddr)
+	inline bool sendIfNew(const RuntimeEnvironment *RR,const Address &toAddr)
 	{
-		if (std::find(_alreadySentTo.begin(), _alreadySentTo.end(), toAddr) == _alreadySentTo.end()) {
-			sendAndLog(RR, tPtr, toAddr);
+		if (std::find(_alreadySentTo.begin(),_alreadySentTo.end(),toAddr) == _alreadySentTo.end()) {
+			sendAndLog(RR,toAddr);
 			return true;
-		}
-		else {
-			return false;
-		}
+		} else return false;
 	}
 
-  private:
+private:
 	uint64_t _timestamp;
 	uint64_t _nwid;
-	MAC _macSrc;
-	MAC _macDest;
 	unsigned int _limit;
-	unsigned int _frameLen;
-	unsigned int _etherType;
-	Packet _packet, _tmp;
+	Packet _packetNoCom;
+	Packet _packetWithCom;
 	std::vector<Address> _alreadySentTo;
-	uint8_t _frameData[ZT_MAX_MTU];
+	bool _haveCom;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Packet.cpp b/node/Packet.cpp
index 88af76105..3330a9279 100644
--- a/node/Packet.cpp
+++ b/node/Packet.cpp
@@ -1,1324 +1,157 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #include "Packet.hpp"
 
-#include "ECC.hpp"
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(ZT_USE_X64_ASM_SALSA2012) && defined(ZT_ARCH_X64)
-#include "../ext/x64-salsa2012-asm/salsa2012.h"
-#endif
-#ifdef ZT_USE_ARM32_NEON_ASM_SALSA2012
-#include "../ext/arm32-neon-salsa2012-asm/salsa2012.h"
-#endif
-
-#ifdef _MSC_VER
-#define FORCE_INLINE static __forceinline
-#include <intrin.h>
-#pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
-#pragma warning(disable : 4293) /* disable: C4293: too large shift (32-bits) */
-#else
-#define FORCE_INLINE static inline
-#endif
-
 namespace ZeroTier {
 
-/************************************************************************** */
+const unsigned char Packet::ZERO_KEY[32] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
 
-/* Set up macros for fast single-pass ASM Salsa20/12 crypto, if we have it */
+//#ifdef ZT_TRACE
 
-// x64 SSE crypto
-#if defined(ZT_USE_X64_ASM_SALSA2012) && defined(ZT_ARCH_X64)
-#define ZT_HAS_FAST_CRYPTO()					  (true)
-#define ZT_FAST_SINGLE_PASS_SALSA2012(b, l, n, k) zt_salsa2012_amd64_xmm6(reinterpret_cast<unsigned char*>(b), (l), reinterpret_cast<const unsigned char*>(n), reinterpret_cast<const unsigned char*>(k))
-#endif
-
-// ARM (32-bit) NEON crypto (must be detected)
-#ifdef ZT_USE_ARM32_NEON_ASM_SALSA2012
-class _FastCryptoChecker {
-  public:
-	_FastCryptoChecker() : canHas(zt_arm_has_neon())
-	{
-	}
-	bool canHas;
-};
-static const _FastCryptoChecker _ZT_FAST_CRYPTO_CHECK;
-#define ZT_HAS_FAST_CRYPTO()					  (_ZT_FAST_CRYPTO_CHECK.canHas)
-#define ZT_FAST_SINGLE_PASS_SALSA2012(b, l, n, k) zt_salsa2012_armneon3_xor(reinterpret_cast<unsigned char*>(b), (const unsigned char*)0, (l), reinterpret_cast<const unsigned char*>(n), reinterpret_cast<const unsigned char*>(k))
-#endif
-
-// No fast crypto available
-#ifndef ZT_HAS_FAST_CRYPTO
-#define ZT_HAS_FAST_CRYPTO() (false)
-#define ZT_FAST_SINGLE_PASS_SALSA2012(b, l, n, k)                                                                                                                                                                                              \
-	{                                                                                                                                                                                                                                          \
-	}
-#endif
-
-/************************************************************************** */
-
-/* LZ4 is shipped encapsulated into Packet in an anonymous namespace.
- *
- * We're doing this as a deliberate workaround for various Linux distribution
- * policies that forbid static linking of support libraries.
- *
- * The reason is that relying on distribution versions of LZ4 has been too
- * big a source of bugs and compatibility issues. The LZ4 API is not stable
- * enough across versions, and dependency hell ensues. So fark it. */
-
-/* Needless to say the code in this anonymous namespace should be considered
- * BSD 2-clause licensed. */
-
-namespace {
-
-/* lz4.h ------------------------------------------------------------------ */
-
-/*
- *  LZ4 - Fast LZ compression algorithm
- *  Header File
- *  Copyright (C) 2011-2016, Yann Collet.
-
-   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-	   * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-	   * Redistributions in binary form must reproduce the above
-   copyright notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with the
-   distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   You can contact the author at :
-	- LZ4 homepage : http://www.lz4.org
-	- LZ4 source repository : https://github.com/lz4/lz4
-*/
-
-/**
-  Introduction
-
-  LZ4 is lossless compression algorithm, providing compression speed at 400 MB/s per core,
-  scalable with multi-cores CPU. It features an extremely fast decoder, with speed in
-  multiple GB/s per core, typically reaching RAM speed limits on multi-core systems.
-
-  The LZ4 compression library provides in-memory compression and decompression functions.
-  Compression can be done in:
-	- a single step (described as Simple Functions)
-	- a single step, reusing a context (described in Advanced Functions)
-	- unbounded multiple steps (described as Streaming compression)
-
-  lz4.h provides block compression functions. It gives full buffer control to user.
-  Decompressing an lz4-compressed block also requires metadata (such as compressed size).
-  Each application is free to encode such metadata in whichever way it wants.
-
-  An additional format, called LZ4 frame specification (doc/lz4_Frame_format.md),
-  take care of encoding standard metadata alongside LZ4-compressed blocks.
-  If your application requires interoperability, it's recommended to use it.
-  A library is provided to take care of it, see lz4frame.h.
-*/
-
-#define LZ4_VERSION_MAJOR		  1 /* for breaking interface changes  */
-#define LZ4_VERSION_MINOR		  7 /* for new (non-breaking) interface capabilities */
-#define LZ4_VERSION_RELEASE		  5 /* for tweaks, bug-fixes, or development */
-#define LZ4_VERSION_NUMBER		  (LZ4_VERSION_MAJOR * 100 * 100 + LZ4_VERSION_MINOR * 100 + LZ4_VERSION_RELEASE)
-#define LZ4_LIB_VERSION			  LZ4_VERSION_MAJOR.LZ4_VERSION_MINOR.LZ4_VERSION_RELEASE
-#define LZ4_QUOTE(str)			  #str
-#define LZ4_EXPAND_AND_QUOTE(str) LZ4_QUOTE(str)
-#define LZ4_VERSION_STRING		  LZ4_EXPAND_AND_QUOTE(LZ4_LIB_VERSION)
-#define LZ4_MEMORY_USAGE		  14
-#define LZ4_MAX_INPUT_SIZE		  0x7E000000 /* 2 113 929 216 bytes */
-#define LZ4_COMPRESSBOUND(isize)  ((unsigned)(isize) > (unsigned)LZ4_MAX_INPUT_SIZE ? 0 : (isize) + ((isize) / 255) + 16)
-
-typedef union LZ4_stream_u LZ4_stream_t; /* incomplete type (defined later) */
-
-static inline void LZ4_resetStream(LZ4_stream_t* streamPtr);
-
-#define LZ4_HASHLOG		  (LZ4_MEMORY_USAGE - 2)
-#define LZ4_HASHTABLESIZE (1 << LZ4_MEMORY_USAGE)
-#define LZ4_HASH_SIZE_U32 (1 << LZ4_HASHLOG) /* required as macro for static allocation */
-
-typedef struct {
-	uint32_t hashTable[LZ4_HASH_SIZE_U32];
-	uint32_t currentOffset;
-	uint32_t initCheck;
-	const uint8_t* dictionary;
-	uint8_t* bufferStart; /* obsolete, used for slideInputBuffer */
-	uint32_t dictSize;
-} LZ4_stream_t_internal;
-
-typedef struct {
-	const uint8_t* externalDict;
-	size_t extDictSize;
-	const uint8_t* prefixEnd;
-	size_t prefixSize;
-} LZ4_streamDecode_t_internal;
-
-#define LZ4_STREAMSIZE_U64 ((1 << (LZ4_MEMORY_USAGE - 3)) + 4)
-#define LZ4_STREAMSIZE	   (LZ4_STREAMSIZE_U64 * sizeof(unsigned long long))
-union LZ4_stream_u {
-	unsigned long long table[LZ4_STREAMSIZE_U64];
-	LZ4_stream_t_internal internal_donotuse;
-}; /* previously typedef'd to LZ4_stream_t */
-
-#define LZ4_STREAMDECODESIZE_U64 4
-#define LZ4_STREAMDECODESIZE	 (LZ4_STREAMDECODESIZE_U64 * sizeof(unsigned long long))
-union LZ4_streamDecode_u {
-	unsigned long long table[LZ4_STREAMDECODESIZE_U64];
-	LZ4_streamDecode_t_internal internal_donotuse;
-}; /* previously typedef'd to LZ4_streamDecode_t */
-
-#ifndef HEAPMODE
-#define HEAPMODE 0
-#endif
-
-#ifdef ZT_NO_TYPE_PUNNING
-#define LZ4_FORCE_MEMORY_ACCESS 0
-#else
-#define LZ4_FORCE_MEMORY_ACCESS 2
-#endif
-
-#if defined(_MSC_VER) && defined(_WIN32_WCE) /* Visual Studio for Windows CE does not support Hardware bit count */
-#define LZ4_FORCE_SW_BITCOUNT
-#endif
-
-#ifndef FORCE_INLINE
-#define FORCE_INLINE static inline
-#endif
-
-#define ALLOCATOR(n, s) calloc(n, s)
-#define FREEMEM			free
-#define MEM_INIT		memset
-
-typedef uint8_t BYTE;
-typedef uint16_t U16;
-typedef uint32_t U32;
-typedef int32_t S32;
-typedef uint64_t U64;
-typedef uintptr_t uptrval;
-typedef uintptr_t reg_t;
-
-static inline unsigned LZ4_isLittleEndian(void)
+const char *Packet::verbString(Verb v)
+	throw()
 {
-	const union {
-		U32 u;
-		BYTE c[4];
-	} one = { 1 }; /* don't use static : performance detrimental */
-	return one.c[0];
+	switch(v) {
+		case VERB_NOP: return "NOP";
+		case VERB_HELLO: return "HELLO";
+		case VERB_ERROR: return "ERROR";
+		case VERB_OK: return "OK";
+		case VERB_WHOIS: return "WHOIS";
+		case VERB_RENDEZVOUS: return "RENDEZVOUS";
+		case VERB_FRAME: return "FRAME";
+		case VERB_EXT_FRAME: return "EXT_FRAME";
+		case VERB_ECHO: return "ECHO";
+		case VERB_MULTICAST_LIKE: return "MULTICAST_LIKE";
+		case VERB_NETWORK_MEMBERSHIP_CERTIFICATE: return "NETWORK_MEMBERSHIP_CERTIFICATE";
+		case VERB_NETWORK_CONFIG_REQUEST: return "NETWORK_CONFIG_REQUEST";
+		case VERB_NETWORK_CONFIG_REFRESH: return "NETWORK_CONFIG_REFRESH";
+		case VERB_MULTICAST_GATHER: return "MULTICAST_GATHER";
+		case VERB_MULTICAST_FRAME: return "MULTICAST_FRAME";
+		case VERB_PUSH_DIRECT_PATHS: return "PUSH_DIRECT_PATHS";
+		case VERB_CIRCUIT_TEST: return "CIRCUIT_TEST";
+		case VERB_CIRCUIT_TEST_REPORT: return "CIRCUIT_TEST_REPORT";
+		case VERB_REQUEST_PROOF_OF_WORK: return "REQUEST_PROOF_OF_WORK";
+	}
+	return "(unknown)";
 }
 
-#if defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS == 2)
-static U16 LZ4_read16(const void* memPtr)
+const char *Packet::errorString(ErrorCode e)
+	throw()
 {
-	return *(const U16*)memPtr;
-}
-static U32 LZ4_read32(const void* memPtr)
-{
-	return *(const U32*)memPtr;
-}
-static reg_t LZ4_read_ARCH(const void* memPtr)
-{
-	return *(const reg_t*)memPtr;
-}
-static void LZ4_write16(void* memPtr, U16 value)
-{
-	*(U16*)memPtr = value;
-}
-static void LZ4_write32(void* memPtr, U32 value)
-{
-	*(U32*)memPtr = value;
-}
-#elif defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS == 1)
-typedef union {
-	U16 u16;
-	U32 u32;
-	reg_t uArch;
-} __attribute__((packed)) unalign;
-static U16 LZ4_read16(const void* ptr)
-{
-	return ((const unalign*)ptr)->u16;
-}
-static U32 LZ4_read32(const void* ptr)
-{
-	return ((const unalign*)ptr)->u32;
-}
-static reg_t LZ4_read_ARCH(const void* ptr)
-{
-	return ((const unalign*)ptr)->uArch;
-}
-static void LZ4_write16(void* memPtr, U16 value)
-{
-	((unalign*)memPtr)->u16 = value;
-}
-static void LZ4_write32(void* memPtr, U32 value)
-{
-	((unalign*)memPtr)->u32 = value;
-}
-#else  /* safe and portable access through memcpy() */
-static inline U16 LZ4_read16(const void* memPtr)
-{
-	U16 val;
-	memcpy(&val, memPtr, sizeof(val));
-	return val;
-}
-static inline U32 LZ4_read32(const void* memPtr)
-{
-	U32 val;
-	memcpy(&val, memPtr, sizeof(val));
-	return val;
-}
-static inline reg_t LZ4_read_ARCH(const void* memPtr)
-{
-	reg_t val;
-	memcpy(&val, memPtr, sizeof(val));
-	return val;
-}
-static inline void LZ4_write16(void* memPtr, U16 value)
-{
-	memcpy(memPtr, &value, sizeof(value));
-}
-static inline void LZ4_write32(void* memPtr, U32 value)
-{
-	memcpy(memPtr, &value, sizeof(value));
-}
-#endif /* LZ4_FORCE_MEMORY_ACCESS */
-
-static inline U16 LZ4_readLE16(const void* memPtr)
-{
-	if (LZ4_isLittleEndian()) {
-		return LZ4_read16(memPtr);
-	}
-	else {
-		const BYTE* p = (const BYTE*)memPtr;
-		return (U16)((U16)p[0] + (p[1] << 8));
+	switch(e) {
+		case ERROR_NONE: return "NONE";
+		case ERROR_INVALID_REQUEST: return "INVALID_REQUEST";
+		case ERROR_BAD_PROTOCOL_VERSION: return "BAD_PROTOCOL_VERSION";
+		case ERROR_OBJ_NOT_FOUND: return "OBJECT_NOT_FOUND";
+		case ERROR_IDENTITY_COLLISION: return "IDENTITY_COLLISION";
+		case ERROR_UNSUPPORTED_OPERATION: return "UNSUPPORTED_OPERATION";
+		case ERROR_NEED_MEMBERSHIP_CERTIFICATE: return "NEED_MEMBERSHIP_CERTIFICATE";
+		case ERROR_NETWORK_ACCESS_DENIED_: return "NETWORK_ACCESS_DENIED";
+		case ERROR_UNWANTED_MULTICAST: return "UNWANTED_MULTICAST";
 	}
+	return "(unknown)";
 }
 
-static inline void LZ4_writeLE16(void* memPtr, U16 value)
+//#endif // ZT_TRACE
+
+void Packet::armor(const void *key,bool encryptPayload)
 {
-	if (LZ4_isLittleEndian()) {
-		LZ4_write16(memPtr, value);
-	}
-	else {
-		BYTE* p = (BYTE*)memPtr;
-		p[0] = (BYTE)value;
-		p[1] = (BYTE)(value >> 8);
-	}
-}
-
-static inline void LZ4_copy8(void* dst, const void* src)
-{
-	memcpy(dst, src, 8);
-}
-
-static inline void LZ4_wildCopy(void* dstPtr, const void* srcPtr, void* dstEnd)
-{
-	BYTE* d = (BYTE*)dstPtr;
-	const BYTE* s = (const BYTE*)srcPtr;
-	BYTE* const e = (BYTE*)dstEnd;
-	do {
-		LZ4_copy8(d, s);
-		d += 8;
-		s += 8;
-	} while (d < e);
-}
-
-#define MINMATCH 4
-
-#define WILDCOPYLENGTH 8
-#define LASTLITERALS   5
-#define MFLIMIT		   (WILDCOPYLENGTH + MINMATCH)
-static const int LZ4_minLength = (MFLIMIT + 1);
-
-#define KB *(1 << 10)
-#define MB *(1 << 20)
-#define GB *(1U << 30)
-
-#define MAXD_LOG	 16
-#define MAX_DISTANCE ((1 << MAXD_LOG) - 1)
-
-#define ML_BITS	 4
-#define ML_MASK	 ((1U << ML_BITS) - 1)
-#define RUN_BITS (8 - ML_BITS)
-#define RUN_MASK ((1U << RUN_BITS) - 1)
-
-#define LZ4_STATIC_ASSERT(c)                                                                                                                                                                                                                   \
-	{                                                                                                                                                                                                                                          \
-		enum { LZ4_static_assert = 1 / (int)(! ! (c)) };                                                                                                                                                                                       \
-	} /* use only *after* variable declarations */
-
-static inline unsigned LZ4_NbCommonBytes(reg_t val)
-{
-	if (LZ4_isLittleEndian()) {
-		if (sizeof(val) == 8) {
-#if defined(_MSC_VER) && defined(_WIN64) && ! defined(LZ4_FORCE_SW_BITCOUNT)
-			unsigned long r = 0;
-			_BitScanForward64(&r, (U64)val);
-			return (int)(r >> 3);
-#elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 3))) && ! defined(LZ4_FORCE_SW_BITCOUNT)
-			return (__builtin_ctzll((U64)val) >> 3);
-#else
-			static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7,
-													 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };
-			return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
-#endif
-		}
-		else /* 32 bits */ {
-#if defined(_MSC_VER) && ! defined(LZ4_FORCE_SW_BITCOUNT)
-			unsigned long r;
-			_BitScanForward(&r, (U32)val);
-			return (int)(r >> 3);
-#elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 3))) && ! defined(LZ4_FORCE_SW_BITCOUNT)
-			return (__builtin_ctz((U32)val) >> 3);
-#else
-			static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };
-			return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
-#endif
-		}
-	}
-	else /* Big Endian CPU */ {
-		if (sizeof(val) == 8) {
-#if defined(_MSC_VER) && defined(_WIN64) && ! defined(LZ4_FORCE_SW_BITCOUNT)
-			unsigned long r = 0;
-			_BitScanReverse64(&r, val);
-			return (unsigned)(r >> 3);
-#elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 3))) && ! defined(LZ4_FORCE_SW_BITCOUNT)
-			return (__builtin_clzll((U64)val) >> 3);
-#else
-			unsigned r;
-			if (! (val >> 32)) {
-				r = 4;
-			}
-			else {
-				r = 0;
-				val >>= 32;
-			}
-			if (! (val >> 16)) {
-				r += 2;
-				val >>= 8;
-			}
-			else {
-				val >>= 24;
-			}
-			r += (! val);
-			return r;
-#endif
-		}
-		else /* 32 bits */ {
-#if defined(_MSC_VER) && ! defined(LZ4_FORCE_SW_BITCOUNT)
-			unsigned long r = 0;
-			_BitScanReverse(&r, (unsigned long)val);
-			return (unsigned)(r >> 3);
-#elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 3))) && ! defined(LZ4_FORCE_SW_BITCOUNT)
-			return (__builtin_clz((U32)val) >> 3);
-#else
-			unsigned r;
-			if (! (val >> 16)) {
-				r = 2;
-				val >>= 8;
-			}
-			else {
-				r = 0;
-				val >>= 24;
-			}
-			r += (! val);
-			return r;
-#endif
-		}
-	}
-}
-
-#define STEPSIZE sizeof(reg_t)
-static inline unsigned LZ4_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* pInLimit)
-{
-	const BYTE* const pStart = pIn;
-
-	while (likely(pIn < pInLimit - (STEPSIZE - 1))) {
-		reg_t const diff = LZ4_read_ARCH(pMatch) ^ LZ4_read_ARCH(pIn);
-		if (! diff) {
-			pIn += STEPSIZE;
-			pMatch += STEPSIZE;
-			continue;
-		}
-		pIn += LZ4_NbCommonBytes(diff);
-		return (unsigned)(pIn - pStart);
-	}
-
-	if ((STEPSIZE == 8) && (pIn < (pInLimit - 3)) && (LZ4_read32(pMatch) == LZ4_read32(pIn))) {
-		pIn += 4;
-		pMatch += 4;
-	}
-	if ((pIn < (pInLimit - 1)) && (LZ4_read16(pMatch) == LZ4_read16(pIn))) {
-		pIn += 2;
-		pMatch += 2;
-	}
-	if ((pIn < pInLimit) && (*pMatch == *pIn)) {
-		pIn++;
-	}
-	return (unsigned)(pIn - pStart);
-}
-
-static const int LZ4_64Klimit = ((64 KB) + (MFLIMIT - 1));
-static const U32 LZ4_skipTrigger = 6; /* Increase this value ==> compression run slower on incompressible data */
-
-typedef enum { notLimited = 0, limitedOutput = 1 } limitedOutput_directive;
-typedef enum { byPtr, byU32, byU16 } tableType_t;
-
-typedef enum { noDict = 0, withPrefix64k, usingExtDict } dict_directive;
-typedef enum { noDictIssue = 0, dictSmall } dictIssue_directive;
-
-typedef enum { endOnOutputSize = 0, endOnInputSize = 1 } endCondition_directive;
-typedef enum { full = 0, partial = 1 } earlyEnd_directive;
-
-static inline int LZ4_compressBound(int isize)
-{
-	return LZ4_COMPRESSBOUND(isize);
-}
-
-static inline U32 LZ4_hash4(U32 sequence, tableType_t const tableType)
-{
-	if (tableType == byU16) {
-		return ((sequence * 2654435761U) >> ((MINMATCH * 8) - (LZ4_HASHLOG + 1)));
-	}
-	else {
-		return ((sequence * 2654435761U) >> ((MINMATCH * 8) - LZ4_HASHLOG));
-	}
-}
-
-static inline U32 LZ4_hash5(U64 sequence, tableType_t const tableType)
-{
-	static const U64 prime5bytes = 889523592379ULL;
-	static const U64 prime8bytes = 11400714785074694791ULL;
-	const U32 hashLog = (tableType == byU16) ? LZ4_HASHLOG + 1 : LZ4_HASHLOG;
-	if (LZ4_isLittleEndian()) {
-		return (U32)(((sequence << 24) * prime5bytes) >> (64 - hashLog));
-	}
-	else {
-		return (U32)(((sequence >> 24) * prime8bytes) >> (64 - hashLog));
-	}
-}
-
-FORCE_INLINE U32 LZ4_hashPosition(const void* const p, tableType_t const tableType)
-{
-	if ((sizeof(reg_t) == 8) && (tableType != byU16)) {
-		return LZ4_hash5(LZ4_read_ARCH(p), tableType);
-	}
-	return LZ4_hash4(LZ4_read32(p), tableType);
-}
-
-static inline void LZ4_putPositionOnHash(const BYTE* p, U32 h, void* tableBase, tableType_t const tableType, const BYTE* srcBase)
-{
-	switch (tableType) {
-		case byPtr: {
-			const BYTE** hashTable = (const BYTE**)tableBase;
-			hashTable[h] = p;
-			return;
-		}
-		case byU32: {
-			U32* hashTable = (U32*)tableBase;
-			hashTable[h] = (U32)(p - srcBase);
-			return;
-		}
-		case byU16: {
-			U16* hashTable = (U16*)tableBase;
-			hashTable[h] = (U16)(p - srcBase);
-			return;
-		}
-	}
-}
-
-FORCE_INLINE void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase)
-{
-	U32 const h = LZ4_hashPosition(p, tableType);
-	LZ4_putPositionOnHash(p, h, tableBase, tableType, srcBase);
-}
-
-static inline const BYTE* LZ4_getPositionOnHash(U32 h, void* tableBase, tableType_t tableType, const BYTE* srcBase)
-{
-	if (tableType == byPtr) {
-		const BYTE** hashTable = (const BYTE**)tableBase;
-		return hashTable[h];
-	}
-	if (tableType == byU32) {
-		const U32* const hashTable = (U32*)tableBase;
-		return hashTable[h] + srcBase;
-	}
-	{ /* default, to ensure a return */
-		const U16* const hashTable = (U16*)tableBase;
-		return hashTable[h] + srcBase;
-	}
-}
-
-FORCE_INLINE const BYTE* LZ4_getPosition(const BYTE* p, void* tableBase, tableType_t tableType, const BYTE* srcBase)
-{
-	U32 const h = LZ4_hashPosition(p, tableType);
-	return LZ4_getPositionOnHash(h, tableBase, tableType, srcBase);
-}
-
-FORCE_INLINE int LZ4_compress_generic(
-	LZ4_stream_t_internal* const cctx,
-	const char* const source,
-	char* const dest,
-	const int inputSize,
-	const int maxOutputSize,
-	const limitedOutput_directive outputLimited,
-	const tableType_t tableType,
-	const dict_directive dict,
-	const dictIssue_directive dictIssue,
-	const U32 acceleration)
-{
-	const BYTE* ip = (const BYTE*)source;
-	const BYTE* base;
-	const BYTE* lowLimit;
-	const BYTE* const lowRefLimit = ip - cctx->dictSize;
-	const BYTE* const dictionary = cctx->dictionary;
-	const BYTE* const dictEnd = dictionary + cctx->dictSize;
-	const ptrdiff_t dictDelta = dictEnd - (const BYTE*)source;
-	const BYTE* anchor = (const BYTE*)source;
-	const BYTE* const iend = ip + inputSize;
-	const BYTE* const mflimit = iend - MFLIMIT;
-	const BYTE* const matchlimit = iend - LASTLITERALS;
-
-	BYTE* op = (BYTE*)dest;
-	BYTE* const olimit = op + maxOutputSize;
-
-	U32 forwardH;
-
-	/* Init conditions */
-	if ((U32)inputSize > (U32)LZ4_MAX_INPUT_SIZE) {
-		return 0; /* Unsupported inputSize, too large (or negative) */
-	}
-	switch (dict) {
-		case noDict:
-		default:
-			base = (const BYTE*)source;
-			lowLimit = (const BYTE*)source;
-			break;
-		case withPrefix64k:
-			base = (const BYTE*)source - cctx->currentOffset;
-			lowLimit = (const BYTE*)source - cctx->dictSize;
-			break;
-		case usingExtDict:
-			base = (const BYTE*)source - cctx->currentOffset;
-			lowLimit = (const BYTE*)source;
-			break;
-	}
-	if ((tableType == byU16) && (inputSize >= LZ4_64Klimit)) {
-		return 0; /* Size too large (not within 64K limit) */
-	}
-	if (inputSize < LZ4_minLength) {
-		goto _last_literals; /* Input too small, no compression (all literals) */
-	}
-
-	/* First Byte */
-	LZ4_putPosition(ip, cctx->hashTable, tableType, base);
-	ip++;
-	forwardH = LZ4_hashPosition(ip, tableType);
-
-	/* Main Loop */
-	for (;;) {
-		ptrdiff_t refDelta = 0;
-		const BYTE* match;
-		BYTE* token;
-
-		/* Find a match */
-		{
-			const BYTE* forwardIp = ip;
-			unsigned step = 1;
-			unsigned searchMatchNb = acceleration << LZ4_skipTrigger;
-			do {
-				U32 const h = forwardH;
-				ip = forwardIp;
-				forwardIp += step;
-				step = (searchMatchNb++ >> LZ4_skipTrigger);
-
-				if (unlikely(forwardIp > mflimit)) {
-					goto _last_literals;
-				}
-
-				match = LZ4_getPositionOnHash(h, cctx->hashTable, tableType, base);
-				if (dict == usingExtDict) {
-					if (match < (const BYTE*)source) {
-						refDelta = dictDelta;
-						lowLimit = dictionary;
-					}
-					else {
-						refDelta = 0;
-						lowLimit = (const BYTE*)source;
-					}
-				}
-				forwardH = LZ4_hashPosition(forwardIp, tableType);
-				LZ4_putPositionOnHash(ip, h, cctx->hashTable, tableType, base);
-
-			} while (((dictIssue == dictSmall) ? (match < lowRefLimit) : 0) || ((tableType == byU16) ? 0 : (match + MAX_DISTANCE < ip)) || (LZ4_read32(match + refDelta) != LZ4_read32(ip)));
-		}
-
-		/* Catch up */
-		while (((ip > anchor) & (match + refDelta > lowLimit)) && (unlikely(ip[-1] == match[refDelta - 1]))) {
-			ip--;
-			match--;
-		}
-
-		/* Encode Literals */
-		{
-			unsigned const litLength = (unsigned)(ip - anchor);
-			token = op++;
-			if ((outputLimited) && /* Check output buffer overflow */
-				(unlikely(op + litLength + (2 + 1 + LASTLITERALS) + (litLength / 255) > olimit))) {
-				return 0;
-			}
-			if (litLength >= RUN_MASK) {
-				int len = (int)litLength - RUN_MASK;
-				*token = (RUN_MASK << ML_BITS);
-				for (; len >= 255; len -= 255) {
-					*op++ = 255;
-				}
-				*op++ = (BYTE)len;
-			}
-			else {
-				*token = (BYTE)(litLength << ML_BITS);
-			}
-
-			/* Copy Literals */
-			LZ4_wildCopy(op, anchor, op + litLength);
-			op += litLength;
-		}
-
-	_next_match:
-		/* Encode Offset */
-		LZ4_writeLE16(op, (U16)(ip - match));
-		op += 2;
-
-		/* Encode MatchLength */
-		{
-			unsigned matchCode;
-
-			if ((dict == usingExtDict) && (lowLimit == dictionary)) {
-				const BYTE* limit;
-				match += refDelta;
-				limit = ip + (dictEnd - match);
-				if (limit > matchlimit) {
-					limit = matchlimit;
-				}
-				matchCode = LZ4_count(ip + MINMATCH, match + MINMATCH, limit);
-				ip += MINMATCH + matchCode;
-				if (ip == limit) {
-					unsigned const more = LZ4_count(ip, (const BYTE*)source, matchlimit);
-					matchCode += more;
-					ip += more;
-				}
-			}
-			else {
-				matchCode = LZ4_count(ip + MINMATCH, match + MINMATCH, matchlimit);
-				ip += MINMATCH + matchCode;
-			}
-
-			if (outputLimited && /* Check output buffer overflow */
-				(unlikely(op + (1 + LASTLITERALS) + (matchCode >> 8) > olimit))) {
-				return 0;
-			}
-			if (matchCode >= ML_MASK) {
-				*token += ML_MASK;
-				matchCode -= ML_MASK;
-				LZ4_write32(op, 0xFFFFFFFF);
-				while (matchCode >= 4 * 255) {
-					op += 4;
-					LZ4_write32(op, 0xFFFFFFFF);
-					matchCode -= 4 * 255;
-				}
-				op += matchCode / 255;
-				*op++ = (BYTE)(matchCode % 255);
-			}
-			else {
-				*token += (BYTE)(matchCode);
-			}
-		}
-
-		anchor = ip;
-
-		/* Test end of chunk */
-		if (ip > mflimit) {
-			break;
-		}
-
-		/* Fill table */
-		LZ4_putPosition(ip - 2, cctx->hashTable, tableType, base);
-
-		/* Test next position */
-		match = LZ4_getPosition(ip, cctx->hashTable, tableType, base);
-		if (dict == usingExtDict) {
-			if (match < (const BYTE*)source) {
-				refDelta = dictDelta;
-				lowLimit = dictionary;
-			}
-			else {
-				refDelta = 0;
-				lowLimit = (const BYTE*)source;
-			}
-		}
-		LZ4_putPosition(ip, cctx->hashTable, tableType, base);
-		if (((dictIssue == dictSmall) ? (match >= lowRefLimit) : 1) && (match + MAX_DISTANCE >= ip) && (LZ4_read32(match + refDelta) == LZ4_read32(ip))) {
-			token = op++;
-			*token = 0;
-			goto _next_match;
-		}
-
-		/* Prepare next loop */
-		forwardH = LZ4_hashPosition(++ip, tableType);
-	}
-
-_last_literals:
-	/* Encode Last Literals */
-	{
-		size_t const lastRun = (size_t)(iend - anchor);
-		if ((outputLimited) && /* Check output buffer overflow */
-			((op - (BYTE*)dest) + lastRun + 1 + ((lastRun + 255 - RUN_MASK) / 255) > (U32)maxOutputSize)) {
-			return 0;
-		}
-		if (lastRun >= RUN_MASK) {
-			size_t accumulator = lastRun - RUN_MASK;
-			*op++ = RUN_MASK << ML_BITS;
-			for (; accumulator >= 255; accumulator -= 255) {
-				*op++ = 255;
-			}
-			*op++ = (BYTE)accumulator;
-		}
-		else {
-			*op++ = (BYTE)(lastRun << ML_BITS);
-		}
-		memcpy(op, anchor, lastRun);
-		op += lastRun;
-	}
-
-	/* End */
-	return (int)(((char*)op) - dest);
-}
-
-static inline int LZ4_compress_fast_extState(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
-{
-	LZ4_stream_t_internal* ctx = &((LZ4_stream_t*)state)->internal_donotuse;
-	LZ4_resetStream((LZ4_stream_t*)state);
-	// if (acceleration < 1) acceleration = ACCELERATION_DEFAULT;
-
-	if (maxOutputSize >= LZ4_compressBound(inputSize)) {
-		if (inputSize < LZ4_64Klimit) {
-			return LZ4_compress_generic(ctx, source, dest, inputSize, 0, notLimited, byU16, noDict, noDictIssue, acceleration);
-		}
-		else {
-			return LZ4_compress_generic(ctx, source, dest, inputSize, 0, notLimited, (sizeof(void*) == 8) ? byU32 : byPtr, noDict, noDictIssue, acceleration);
-		}
-	}
-	else {
-		if (inputSize < LZ4_64Klimit) {
-			return LZ4_compress_generic(ctx, source, dest, inputSize, maxOutputSize, limitedOutput, byU16, noDict, noDictIssue, acceleration);
-		}
-		else {
-			return LZ4_compress_generic(ctx, source, dest, inputSize, maxOutputSize, limitedOutput, (sizeof(void*) == 8) ? byU32 : byPtr, noDict, noDictIssue, acceleration);
-		}
-	}
-}
-
-static inline int LZ4_compress_fast(const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration)
-{
-#if (HEAPMODE)
-	void* ctxPtr = ALLOCATOR(1, sizeof(LZ4_stream_t)); /* malloc-calloc always properly aligned */
-#else
-	LZ4_stream_t ctx;
-	void* const ctxPtr = &ctx;
-#endif
-
-	int const result = LZ4_compress_fast_extState(ctxPtr, source, dest, inputSize, maxOutputSize, acceleration);
-
-#if (HEAPMODE)
-	FREEMEM(ctxPtr);
-#endif
-	return result;
-}
-
-static inline void LZ4_resetStream(LZ4_stream_t* LZ4_stream)
-{
-	MEM_INIT(LZ4_stream, 0, sizeof(LZ4_stream_t));
-}
-
-FORCE_INLINE int LZ4_decompress_generic(
-	const char* const source,
-	char* const dest,
-	int inputSize,
-	int outputSize, /* If endOnInput==endOnInputSize, this value is the max size of Output Buffer. */
-
-	int endOnInput,				 /* endOnOutputSize, endOnInputSize */
-	int partialDecoding,		 /* full, partial */
-	int targetOutputSize,		 /* only used if partialDecoding==partial */
-	int dict,					 /* noDict, withPrefix64k, usingExtDict */
-	const BYTE* const lowPrefix, /* == dest when no prefix */
-	const BYTE* const dictStart, /* only if dict==usingExtDict */
-	const size_t dictSize		 /* note : = 0 if noDict */
-)
-{
-	/* Local Variables */
-	const BYTE* ip = (const BYTE*)source;
-	const BYTE* const iend = ip + inputSize;
-
-	BYTE* op = (BYTE*)dest;
-	BYTE* const oend = op + outputSize;
-	BYTE* cpy;
-	BYTE* oexit = op + targetOutputSize;
-	const BYTE* const lowLimit = lowPrefix - dictSize;
-
-	const BYTE* const dictEnd = (const BYTE*)dictStart + dictSize;
-	const unsigned dec32table[] = { 0, 1, 2, 1, 4, 4, 4, 4 };
-	const int dec64table[] = { 0, 0, 0, -1, 0, 1, 2, 3 };
-
-	const int safeDecode = (endOnInput == endOnInputSize);
-	const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
-
-	/* Special cases */
-	if ((partialDecoding) && (oexit > oend - MFLIMIT)) {
-		oexit = oend - MFLIMIT; /* targetOutputSize too high => decode everything */
-	}
-	if ((endOnInput) && (unlikely(outputSize == 0))) {
-		return ((inputSize == 1) && (*ip == 0)) ? 0 : -1; /* Empty output buffer */
-	}
-	if ((! endOnInput) && (unlikely(outputSize == 0))) {
-		return (*ip == 0 ? 1 : -1);
-	}
-
-	/* Main Loop : decode sequences */
-	while (1) {
-		size_t length;
-		const BYTE* match;
-		size_t offset;
-
-		/* get literal length */
-		unsigned const token = *ip++;
-		if ((length = (token >> ML_BITS)) == RUN_MASK) {
-			unsigned s;
-			do {
-				s = *ip++;
-				length += s;
-			} while (likely(endOnInput ? ip < iend - RUN_MASK : 1) & (s == 255));
-			if ((safeDecode) && unlikely((uptrval)(op) + length < (uptrval)(op))) {
-				goto _output_error; /* overflow detection */
-			}
-			if ((safeDecode) && unlikely((uptrval)(ip) + length < (uptrval)(ip))) {
-				goto _output_error; /* overflow detection */
-			}
-		}
-
-		/* copy literals */
-		cpy = op + length;
-		if (((endOnInput) && ((cpy > (partialDecoding ? oexit : oend - MFLIMIT)) || (ip + length > iend - (2 + 1 + LASTLITERALS)))) || ((! endOnInput) && (cpy > oend - WILDCOPYLENGTH))) {
-			if (partialDecoding) {
-				if (cpy > oend) {
-					goto _output_error; /* Error : write attempt beyond end of output buffer */
-				}
-				if ((endOnInput) && (ip + length > iend)) {
-					goto _output_error; /* Error : read attempt beyond end of input buffer */
-				}
-			}
-			else {
-				if ((! endOnInput) && (cpy != oend)) {
-					goto _output_error; /* Error : block decoding must stop exactly there */
-				}
-				if ((endOnInput) && ((ip + length != iend) || (cpy > oend))) {
-					goto _output_error; /* Error : input must be consumed */
-				}
-			}
-			memcpy(op, ip, length);
-			ip += length;
-			op += length;
-			break; /* Necessarily EOF, due to parsing restrictions */
-		}
-		LZ4_wildCopy(op, ip, cpy);
-		ip += length;
-		op = cpy;
-
-		/* get offset */
-		offset = LZ4_readLE16(ip);
-		ip += 2;
-		match = op - offset;
-		if ((checkOffset) && (unlikely(match < lowLimit))) {
-			goto _output_error; /* Error : offset outside buffers */
-		}
-		LZ4_write32(op, (U32)offset); /* costs ~1%; silence an msan warning when offset==0 */
-
-		/* get matchlength */
-		length = token & ML_MASK;
-		if (length == ML_MASK) {
-			unsigned s;
-			do {
-				s = *ip++;
-				if ((endOnInput) && (ip > iend - LASTLITERALS)) {
-					goto _output_error;
-				}
-				length += s;
-			} while (s == 255);
-			if ((safeDecode) && unlikely((uptrval)(op) + length < (uptrval)op)) {
-				goto _output_error; /* overflow detection */
-			}
-		}
-		length += MINMATCH;
-
-		/* check external dictionary */
-		if ((dict == usingExtDict) && (match < lowPrefix)) {
-			if (unlikely(op + length > oend - LASTLITERALS)) {
-				goto _output_error; /* doesn't respect parsing restriction */
-			}
-
-			if (length <= (size_t)(lowPrefix - match)) {
-				/* match can be copied as a single segment from external dictionary */
-				memmove(op, dictEnd - (lowPrefix - match), length);
-				op += length;
-			}
-			else {
-				/* match encompass external dictionary and current block */
-				size_t const copySize = (size_t)(lowPrefix - match);
-				size_t const restSize = length - copySize;
-				memcpy(op, dictEnd - copySize, copySize);
-				op += copySize;
-				if (restSize > (size_t)(op - lowPrefix)) { /* overlap copy */
-					BYTE* const endOfMatch = op + restSize;
-					const BYTE* copyFrom = lowPrefix;
-					while (op < endOfMatch) {
-						*op++ = *copyFrom++;
-					}
-				}
-				else {
-					memcpy(op, lowPrefix, restSize);
-					op += restSize;
-				}
-			}
-			continue;
-		}
-
-		/* copy match within block */
-		cpy = op + length;
-		if (unlikely(offset < 8)) {
-			const int dec64 = dec64table[offset];
-			op[0] = match[0];
-			op[1] = match[1];
-			op[2] = match[2];
-			op[3] = match[3];
-			match += dec32table[offset];
-			memcpy(op + 4, match, 4);
-			match -= dec64;
-		}
-		else {
-			LZ4_copy8(op, match);
-			match += 8;
-		}
-		op += 8;
-
-		if (unlikely(cpy > oend - 12)) {
-			BYTE* const oCopyLimit = oend - (WILDCOPYLENGTH - 1);
-			if (cpy > oend - LASTLITERALS) {
-				goto _output_error; /* Error : last LASTLITERALS bytes must be literals (uncompressed) */
-			}
-			if (op < oCopyLimit) {
-				LZ4_wildCopy(op, match, oCopyLimit);
-				match += oCopyLimit - op;
-				op = oCopyLimit;
-			}
-			while (op < cpy) {
-				*op++ = *match++;
-			}
-		}
-		else {
-			LZ4_copy8(op, match);
-			if (length > 16) {
-				LZ4_wildCopy(op + 8, match + 8, cpy);
-			}
-		}
-		op = cpy; /* correction */
-	}
-
-	/* end of decoding */
-	if (endOnInput) {
-		return (int)(((char*)op) - dest); /* Nb of output bytes decoded */
-	}
-	else {
-		return (int)(((const char*)ip) - source); /* Nb of input bytes read */
-	}
-	/* Overflow error detected */
-_output_error:
-	return (int)(-(((const char*)ip) - source)) - 1;
-}
-
-static inline int LZ4_decompress_safe(const char* source, char* dest, int compressedSize, int maxDecompressedSize)
-{
-	return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, endOnInputSize, full, 0, noDict, (BYTE*)dest, NULL, 0);
-}
-
-}	// anonymous namespace
-
-/************************************************************************** */
-/************************************************************************** */
-
-const unsigned char Packet::ZERO_KEY[32] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-void Packet::armor(const void* key, bool encryptPayload, bool extendedArmor, const AES aesKeys[2], const Identity& identity)
-{
-	uint8_t* const data = reinterpret_cast<uint8_t*>(unsafeData());
-
-	this->setExtendedArmor(extendedArmor);
-
-	if ((aesKeys) && (encryptPayload)) {
-		setCipher(ZT_PROTO_CIPHER_SUITE__AES_GMAC_SIV);
-
-		uint8_t* const payload = data + ZT_PACKET_IDX_VERB;
-		const unsigned int payloadLen = size() - ZT_PACKET_IDX_VERB;
-
-		AES::GMACSIVEncryptor enc(aesKeys[0], aesKeys[1]);
-		enc.init(Utils::loadMachineEndian<uint64_t>(data + ZT_PACKET_IDX_IV), payload);
-		enc.aad(data + ZT_PACKET_IDX_DEST, 11);
-		enc.update1(payload, payloadLen);
-		enc.finish1();
-		enc.update2(payload, payloadLen);
-		const uint64_t* const tag = enc.finish2();
-
-#ifdef ZT_NO_UNALIGNED_ACCESS
-		Utils::copy<8>(data, tag);
-		Utils::copy<8>(data + ZT_PACKET_IDX_MAC, tag + 1);
-#else
-		*reinterpret_cast<uint64_t*>(data + ZT_PACKET_IDX_IV) = tag[0];
-		*reinterpret_cast<uint64_t*>(data + ZT_PACKET_IDX_MAC) = tag[1];
-#endif
-	}
-	else {
-		setCipher(encryptPayload ? ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012 : ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE);
-
-		uint8_t mangledKey[32];
-		_salsa20MangleKey((const unsigned char*)key, mangledKey);
-
-		if (ZT_HAS_FAST_CRYPTO()) {
-			const unsigned int payloadLen = (encryptPayload) ? (size() - ZT_PACKET_IDX_VERB) : 0;
-			uint64_t keyStream[(ZT_PROTO_MAX_PACKET_LENGTH + 64 + 8) / 8];
-			uint64_t mac[2];
-
-			ZT_FAST_SINGLE_PASS_SALSA2012(keyStream, payloadLen + 64, (data + ZT_PACKET_IDX_IV), mangledKey);
-			Salsa20::memxor(data + ZT_PACKET_IDX_VERB, reinterpret_cast<const uint8_t*>(keyStream + 8), payloadLen);
-			Poly1305::compute(mac, data + ZT_PACKET_IDX_VERB, size() - ZT_PACKET_IDX_VERB, keyStream);
-
-#ifdef ZT_NO_TYPE_PUNNING
-			memcpy(data + ZT_PACKET_IDX_MAC, mac, 8);
-#else
-			(*reinterpret_cast<uint64_t*>(data + ZT_PACKET_IDX_MAC)) = mac[0];
-#endif
-		}
-		else {
-			uint64_t macKey[4];
-			uint64_t mac[2];
-
-			Salsa20 s20(mangledKey, data + ZT_PACKET_IDX_IV);
-			s20.crypt12(ZERO_KEY, macKey, sizeof(macKey));
-
-			uint8_t* const payload = data + ZT_PACKET_IDX_VERB;
-			const unsigned int payloadLen = size() - ZT_PACKET_IDX_VERB;
-			if (encryptPayload) {
-				s20.crypt12(payload, payload, payloadLen);
-			}
-
-			Poly1305::compute(mac, payload, payloadLen, macKey);
-			memcpy(data + ZT_PACKET_IDX_MAC, mac, 8);
-		}
-	}
-
-	/* NOTE: this is currently only ever used with NONE encryption for HELLO packets. */
-	if (extendedArmor) {
-		ECC::Pair ephemeralKeyPair = ECC::generate();
-		uint8_t ephemeralSymmetric[32];
-		ECC::agree(ephemeralKeyPair, identity.publicKey(), ephemeralSymmetric, 32);
-
-		AES cipher(ephemeralSymmetric);
-		AES::CTR aesCtr(cipher);
-		aesCtr.init(data, 0, data + ZT_PACKET_IDX_EXTENDED_ARMOR_START);
-		aesCtr.crypt(data + ZT_PACKET_IDX_EXTENDED_ARMOR_START, size() - ZT_PACKET_IDX_EXTENDED_ARMOR_START);
-		aesCtr.finish();
-
-		this->append(ephemeralKeyPair.pub.data, ZT_ECC_EPHEMERAL_PUBLIC_KEY_LEN);
-	}
-}
-
-bool Packet::dearmor(const void* key, const AES aesKeys[2], const Identity& identity)
-{
-	uint8_t* const data = reinterpret_cast<uint8_t*>(unsafeData());
-	const unsigned int cs = cipher();
-
-	if (extendedArmor() && (cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE)) {
-		if (size() < (ZT_PACKET_IDX_VERB + 1 + ZT_ECC_EPHEMERAL_PUBLIC_KEY_LEN)) {
-			return false;
-		}
-		uint8_t ephemeralSymmetric[32];
-		ECC::Public ephemeralKey;
-		memcpy(ephemeralKey.data, data + (size() - ZT_ECC_EPHEMERAL_PUBLIC_KEY_LEN), ZT_ECC_EPHEMERAL_PUBLIC_KEY_LEN);
-		ECC::agree(identity.privateKeyPair(), ephemeralKey, ephemeralSymmetric, 32);
-
-		AES cipher(ephemeralSymmetric);
-		AES::CTR aesCtr(cipher);
-		aesCtr.init(data, 0, data + ZT_PACKET_IDX_EXTENDED_ARMOR_START);
-		aesCtr.crypt(data + ZT_PACKET_IDX_EXTENDED_ARMOR_START, (size() - ZT_PACKET_IDX_EXTENDED_ARMOR_START) - ZT_ECC_EPHEMERAL_PUBLIC_KEY_LEN);
-		aesCtr.finish();
-
-		this->setSize(size() - ZT_ECC_EPHEMERAL_PUBLIC_KEY_LEN);
-
-		/* Note: both the MAC and the data were encrypted with the ephemeral key. We don't need
-		 * a separate MAC for the ephemeral encryption because the MAC check below is obviously
-		 * going to fail if the ephemeral key was incorrect. */
-	}
-
+	unsigned char mangledKey[32];
+	unsigned char macKey[32];
+	unsigned char mac[16];
 	const unsigned int payloadLen = size() - ZT_PACKET_IDX_VERB;
-	unsigned char* const payload = data + ZT_PACKET_IDX_VERB;
+	unsigned char *const payload = field(ZT_PACKET_IDX_VERB,payloadLen);
 
-	if (cs == ZT_PROTO_CIPHER_SUITE__AES_GMAC_SIV) {
-		if (aesKeys) {
-			uint64_t tag[2];
+	// Set flag now, since it affects key mangle function
+	setCipher(encryptPayload ? ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012 : ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE);
 
-#ifdef ZT_NO_UNALIGNED_ACCESS
-			Utils::copy<8>(tag, data);
-			Utils::copy<8>(tag + 1, data + ZT_PACKET_IDX_MAC);
-#else
-			tag[0] = *reinterpret_cast<uint64_t*>(data + ZT_PACKET_IDX_IV);
-			tag[1] = *reinterpret_cast<uint64_t*>(data + ZT_PACKET_IDX_MAC);
-#endif
+	_salsa20MangleKey((const unsigned char *)key,mangledKey);
+	Salsa20 s20(mangledKey,256,field(ZT_PACKET_IDX_IV,8)/*,ZT_PROTO_SALSA20_ROUNDS*/);
 
-			AES::GMACSIVDecryptor dec(aesKeys[0], aesKeys[1]);
-			dec.init(tag, payload);
-			const uint8_t oldFlags = data[ZT_PACKET_IDX_FLAGS];
-			data[ZT_PACKET_IDX_FLAGS] &= 0xf8;
-			dec.aad(data + ZT_PACKET_IDX_DEST, 11);
-			data[ZT_PACKET_IDX_FLAGS] = oldFlags;
-			dec.update(payload, payloadLen);
-			return dec.finish();
-		}
-	}
-	else if ((cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE) || (cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012)) {
-		uint8_t mangledKey[32];
-		_salsa20MangleKey((const unsigned char*)key, mangledKey);
-		if (ZT_HAS_FAST_CRYPTO()) {
-			uint64_t keyStream[(ZT_PROTO_MAX_PACKET_LENGTH + 64 + 8) / 8];
-			ZT_FAST_SINGLE_PASS_SALSA2012(keyStream, ((cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012) ? (payloadLen + 64) : 64), (data + ZT_PACKET_IDX_IV), mangledKey);
-			uint64_t mac[2];
-			Poly1305::compute(mac, payload, payloadLen, keyStream);
-#ifdef ZT_NO_TYPE_PUNNING
-			if (! Utils::secureEq(mac, data + ZT_PACKET_IDX_MAC, 8)) {
-				return false;
-			}
-#else
-			if ((*reinterpret_cast<const uint64_t*>(data + ZT_PACKET_IDX_MAC)) != mac[0]) {	  // also secure, constant time
-				return false;
-			}
-#endif
-			if (cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012) {
-				Salsa20::memxor(data + ZT_PACKET_IDX_VERB, reinterpret_cast<const uint8_t*>(keyStream + 8), payloadLen);
-			}
-		}
-		else {
-			Salsa20 s20(mangledKey, data + ZT_PACKET_IDX_IV);
-			uint64_t macKey[4];
-			s20.crypt12(ZERO_KEY, macKey, sizeof(macKey));
-			uint64_t mac[2];
-			Poly1305::compute(mac, payload, payloadLen, macKey);
-#ifdef ZT_NO_TYPE_PUNNING
-			if (! Utils::secureEq(mac, data + ZT_PACKET_IDX_MAC, 8)) {
-				return false;
-			}
-#else
-			if ((*reinterpret_cast<const uint64_t*>(data + ZT_PACKET_IDX_MAC)) != mac[0]) {	  // also secure, constant time
-				return false;
-			}
-#endif
-			if (cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012) {
-				s20.crypt12(payload, payload, payloadLen);
-			}
-		}
-		return true;
-	}
+	// MAC key is always the first 32 bytes of the Salsa20 key stream
+	// This is the same construction DJB's NaCl library uses
+	s20.encrypt12(ZERO_KEY,macKey,sizeof(macKey));
 
-	return false;
+	if (encryptPayload)
+		s20.encrypt12(payload,payload,payloadLen);
+
+	Poly1305::compute(mac,payload,payloadLen,macKey);
+	memcpy(field(ZT_PACKET_IDX_MAC,8),mac,8);
 }
 
-void Packet::cryptField(const void* key, unsigned int start, unsigned int len)
+bool Packet::dearmor(const void *key)
 {
-	uint8_t* const data = reinterpret_cast<uint8_t*>(unsafeData());
-	uint8_t iv[8];
-	for (int i = 0; i < 8; ++i) {
-		iv[i] = data[i];
-	}
-	iv[7] &= 0xf8;	 // mask off least significant 3 bits of packet ID / IV since this is unset when this function gets called
-	Salsa20 s20(key, iv);
-	s20.crypt12(data + start, data + start, len);
+	unsigned char mangledKey[32];
+	unsigned char macKey[32];
+	unsigned char mac[16];
+	const unsigned int payloadLen = size() - ZT_PACKET_IDX_VERB;
+	unsigned char *const payload = field(ZT_PACKET_IDX_VERB,payloadLen);
+	unsigned int cs = cipher();
+
+	if ((cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE)||(cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012)) {
+		_salsa20MangleKey((const unsigned char *)key,mangledKey);
+		Salsa20 s20(mangledKey,256,field(ZT_PACKET_IDX_IV,8)/*,ZT_PROTO_SALSA20_ROUNDS*/);
+
+		s20.encrypt12(ZERO_KEY,macKey,sizeof(macKey));
+		Poly1305::compute(mac,payload,payloadLen,macKey);
+		if (!Utils::secureEq(mac,field(ZT_PACKET_IDX_MAC,8),8))
+			return false;
+
+		if (cs == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012)
+			s20.decrypt12(payload,payload,payloadLen);
+
+		return true;
+	} else return false; // unrecognized cipher suite
 }
 
 bool Packet::compress()
 {
-	char* const data = reinterpret_cast<char*>(unsafeData());
-	char buf[ZT_PROTO_MAX_PACKET_LENGTH * 2];
-
-	if ((! compressed()) && (size() > (ZT_PACKET_IDX_PAYLOAD + 64))) {	 // don't bother compressing tiny packets
+	unsigned char buf[ZT_PROTO_MAX_PACKET_LENGTH * 2];
+	if ((!compressed())&&(size() > (ZT_PACKET_IDX_PAYLOAD + 32))) {
 		int pl = (int)(size() - ZT_PACKET_IDX_PAYLOAD);
-		int cl = LZ4_compress_fast(data + ZT_PACKET_IDX_PAYLOAD, buf, pl, ZT_PROTO_MAX_PACKET_LENGTH * 2, 1);
-		if ((cl > 0) && (cl < pl)) {
-			data[ZT_PACKET_IDX_VERB] |= (char)ZT_PROTO_VERB_FLAG_COMPRESSED;
+		int cl = LZ4_compress((const char *)field(ZT_PACKET_IDX_PAYLOAD,(unsigned int)pl),(char *)buf,pl);
+		if ((cl > 0)&&(cl < pl)) {
+			(*this)[ZT_PACKET_IDX_VERB] |= (char)ZT_PROTO_VERB_FLAG_COMPRESSED;
 			setSize((unsigned int)cl + ZT_PACKET_IDX_PAYLOAD);
-			memcpy(data + ZT_PACKET_IDX_PAYLOAD, buf, cl);
+			memcpy(field(ZT_PACKET_IDX_PAYLOAD,(unsigned int)cl),buf,cl);
 			return true;
 		}
 	}
-	data[ZT_PACKET_IDX_VERB] &= (char)(~ZT_PROTO_VERB_FLAG_COMPRESSED);
-
+	(*this)[ZT_PACKET_IDX_VERB] &= (char)(~ZT_PROTO_VERB_FLAG_COMPRESSED);
 	return false;
 }
 
 bool Packet::uncompress()
 {
-	char* const data = reinterpret_cast<char*>(unsafeData());
-	char buf[ZT_PROTO_MAX_PACKET_LENGTH];
-
-	if ((compressed()) && (size() >= ZT_PROTO_MIN_PACKET_LENGTH)) {
+	unsigned char buf[ZT_PROTO_MAX_PACKET_LENGTH];
+	if ((compressed())&&(size() >= ZT_PROTO_MIN_PACKET_LENGTH)) {
 		if (size() > ZT_PACKET_IDX_PAYLOAD) {
 			unsigned int compLen = size() - ZT_PACKET_IDX_PAYLOAD;
-			int ucl = LZ4_decompress_safe((const char*)data + ZT_PACKET_IDX_PAYLOAD, buf, compLen, sizeof(buf));
-			if ((ucl > 0) && (ucl <= (int)(capacity() - ZT_PACKET_IDX_PAYLOAD))) {
+			int ucl = LZ4_decompress_safe((const char *)field(ZT_PACKET_IDX_PAYLOAD,compLen),(char *)buf,compLen,sizeof(buf));
+			if ((ucl > 0)&&(ucl <= (int)(capacity() - ZT_PACKET_IDX_PAYLOAD))) {
 				setSize((unsigned int)ucl + ZT_PACKET_IDX_PAYLOAD);
-				memcpy(data + ZT_PACKET_IDX_PAYLOAD, buf, ucl);
-			}
-			else {
-				return false;
-			}
+				memcpy(field(ZT_PACKET_IDX_PAYLOAD,(unsigned int)ucl),buf,ucl);
+			} else return false;
 		}
-		data[ZT_PACKET_IDX_VERB] &= (char)(~ZT_PROTO_VERB_FLAG_COMPRESSED);
+		(*this)[ZT_PACKET_IDX_VERB] &= (char)(~ZT_PROTO_VERB_FLAG_COMPRESSED);
 	}
-
 	return true;
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Packet.hpp b/node/Packet.hpp
index 804618476..52be4f64a 100644
--- a/node/Packet.hpp
+++ b/node/Packet.hpp
@@ -1,72 +1,60 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_N_PACKET_HPP
 #define ZT_N_PACKET_HPP
 
-#include "AES.hpp"
-#include "Address.hpp"
-#include "Buffer.hpp"
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <string>
+#include <iostream>
+
 #include "Constants.hpp"
-#include "Identity.hpp"
+
+#include "Address.hpp"
 #include "Poly1305.hpp"
 #include "Salsa20.hpp"
 #include "Utils.hpp"
+#include "Buffer.hpp"
 
-#include <iostream>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <string>
+#include "../ext/lz4/lz4.h"
 
 /**
  * Protocol version -- incremented only for major changes
  *
- * 1  - 0.2.0 ... 0.2.5
- * 2  - 0.3.0 ... 0.4.5
- *    + Added signature and originating peer to multicast frame
- *    + Double size of multicast frame bloom filter
- * 3  - 0.5.0 ... 0.6.0
- *    + Yet another multicast redesign
- *    + New crypto completely changes key agreement cipher
- * 4  - 0.6.0 ... 1.0.6
- *    + BREAKING CHANGE: New identity format based on hashcash design
- * 5  - 1.1.0 ... 1.1.5
- *    + Supports echo
- *    + Supports in-band world (root server definition) updates
- *    + Clustering! (Though this will work with protocol v4 clients.)
- *    + Otherwise backward compatible with protocol v4
- * 6  - 1.1.5 ... 1.1.10
- *    + Network configuration format revisions including binary values
- * 7  - 1.1.10 ... 1.1.17
- *    + Introduce trusted paths for local SDN use
- * 8  - 1.1.17 ... 1.2.0
- *    + Multipart network configurations for large network configs
- *    + Tags and Capabilities
- *    + Inline push of CertificateOfMembership deprecated
- * 9  - 1.2.0 ... 1.2.14
- * 10 - 1.4.0 ... 1.4.6
- * 11 - 1.4.7 ... 1.4.8
- *    + Multipath capability and load balancing (beta)
- * 12 - 1.4.8 ... 1.16.0
- *    + AES-GMAC-SIV backported for faster peer-to-peer crypto
- * 13 - 1.16.0 ... CURRENT
- *    + Old deprecated "encrypted" flag removed
- *    + Ephemeral keying with second encryption pass to hide HELLO etc.
- *    + Encrypted HELLO packets to anyone but roots
- *    + Remove deprecated parsing of LAN announcements
+ * 1 - 0.2.0 ... 0.2.5
+ * 2 - 0.3.0 ... 0.4.5
+ *   + Added signature and originating peer to multicast frame
+ *   + Double size of multicast frame bloom filter
+ * 3 - 0.5.0 ... 0.6.0
+ *   + Yet another multicast redesign
+ *   + New crypto completely changes key agreement cipher
+ * 4 - 0.6.0 ... 1.0.6
+ *   + New identity format based on hashcash design
+ * 5 - 1.1.0 ... CURRENT
+ *   + Supports circuit test, proof of work, and echo
+ *   + Supports in-band world (root server definition) updates
+ *   + Clustering! (Though this will work with protocol v4 clients.)
+ *   + Otherwise backward compatible with protocol v4
  */
-#define ZT_PROTO_VERSION 13
+#define ZT_PROTO_VERSION 5
 
 /**
  * Minimum supported protocol version
@@ -105,42 +93,12 @@
 #define ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012 1
 
 /**
- * Cipher suite: NONE
+ * DEPRECATED payload encrypted flag, will be removed for re-use soon.
  *
- * This differs from POLY1305/NONE in that *no* crypto is done, not even
- * authentication. This is for trusted local LAN interconnects for internal
- * SDN use within a data center.
- *
- * For this mode the MAC field becomes a trusted path ID and must match the
- * configured ID of a trusted path or the packet is discarded.
+ * This has been replaced by the two-bit cipher suite selection field where
+ * a value of 0 indicates unencrypted (but authenticated) messages.
  */
-#define ZT_PROTO_CIPHER_SUITE__NO_CRYPTO_TRUSTED_PATH 2
-
-/**
- * AES-GMAC-SIV backported from 2.x
- */
-#define ZT_PROTO_CIPHER_SUITE__AES_GMAC_SIV 3
-
-/**
- * AES-GMAC-SIV first of two keys
- */
-#define ZT_KBKDF_LABEL_AES_GMAC_SIV_K0 '0'
-
-/**
- * AES-GMAC-SIV second of two keys
- */
-#define ZT_KBKDF_LABEL_AES_GMAC_SIV_K1 '1'
-
-/**
- * Header flag indicating ephemeral keying and second encryption pass.
- *
- * If this is set, the packet will have an ephemeral key appended to it its payload
- * will be encrypted with AES-CTR using this ephemeral key and the packet's header
- * as an IV.
- *
- * Note that this is a reuse of a flag that has long been deprecated and ignored.
- */
-#define ZT_PROTO_FLAG_EXTENDED_ARMOR 0x80
+#define ZT_PROTO_FLAG_ENCRYPTED 0x80
 
 /**
  * Header flag indicating that a packet is fragmented
@@ -155,8 +113,66 @@
  */
 #define ZT_PROTO_VERB_FLAG_COMPRESSED 0x80
 
-/*
- * Rounds used for deprecated Salsa20 encryption
+/**
+ * Rounds used for Salsa20 encryption in ZT
+ *
+ * Discussion:
+ *
+ * DJB (Salsa20's designer) designed Salsa20 with a significant margin of 20
+ * rounds, but has said repeatedly that 12 is likely sufficient. So far (as of
+ * July 2015) there are no published attacks against 12 rounds, let alone 20.
+ *
+ * In cryptography, a "break" means something different from what it means in
+ * common discussion. If a cipher is 256 bits strong and someone finds a way
+ * to reduce key search to 254 bits, this constitues a "break" in the academic
+ * literature. 254 bits is still far beyond what can be leveraged to accomplish
+ * a "break" as most people would understand it -- the actual decryption and
+ * reading of traffic.
+ *
+ * Nevertheless, "attacks only get better" as cryptographers like to say. As
+ * a result, they recommend not using anything that's shown any weakness even
+ * if that weakness is so far only meaningful to academics. It may be a sign
+ * of a deeper problem.
+ *
+ * So why choose a lower round count?
+ *
+ * Turns out the speed difference is nontrivial. On a Macbook Pro (Core i3) 20
+ * rounds of SSE-optimized Salsa20 achieves ~508mb/sec/core, while 12 rounds
+ * hits ~832mb/sec/core. ZeroTier is designed for multiple objectives:
+ * security, simplicity, and performance. In this case a deference was made
+ * for performance.
+ *
+ * Meta discussion:
+ *
+ * The cipher is not the thing you should be paranoid about.
+ *
+ * I'll qualify that. If the cipher is known to be weak, like RC4, or has a
+ * key size that is too small, like DES, then yes you should worry about
+ * the cipher.
+ *
+ * But if the cipher is strong and your adversary is anyone other than the
+ * intelligence apparatus of a major superpower, you are fine in that
+ * department.
+ *
+ * Go ahead. Search for the last ten vulnerabilities discovered in SSL. Not
+ * a single one involved the breaking of a cipher. Now broaden your search.
+ * Look for issues with SSH, IPSec, etc. The only cipher-related issues you
+ * will find might involve the use of RC4 or MD5, algorithms with known
+ * issues or small key/digest sizes. But even weak ciphers are difficult to
+ * exploit in the real world -- you usually need a lot of data and a lot of
+ * compute time. No, virtually EVERY security vulnerability you will find
+ * involves a problem with the IMPLEMENTATION not with the cipher.
+ *
+ * A flaw in ZeroTier's protocol or code is incredibly, unbelievably
+ * more likely than a flaw in Salsa20 or any other cipher or cryptographic
+ * primitive it uses. We're talking odds of dying in a car wreck vs. odds of
+ * being personally impacted on the head by a meteorite. Nobody without a
+ * billion dollar budget is going to break into your network by actually
+ * cracking Salsa20/12 (or even /8) in the field.
+ *
+ * So stop worrying about the cipher unless you are, say, the Kremlin and your
+ * adversary is the NSA and the GCHQ. In that case... well that's above my
+ * pay grade. I'll just say defense in depth.
  */
 #define ZT_PROTO_SALSA20_ROUNDS 12
 
@@ -171,23 +187,22 @@
 #define ZT_PUSH_DIRECT_PATHS_FLAG_CLUSTER_REDIRECT 0x02
 
 // Field indexes in packet header
-#define ZT_PACKET_IDX_IV	  0
-#define ZT_PACKET_IDX_DEST	  8
-#define ZT_PACKET_IDX_SOURCE  13
-#define ZT_PACKET_IDX_FLAGS	  18
-#define ZT_PACKET_IDX_MAC	  19
-#define ZT_PACKET_IDX_VERB	  27
+#define ZT_PACKET_IDX_IV 0
+#define ZT_PACKET_IDX_DEST 8
+#define ZT_PACKET_IDX_SOURCE 13
+#define ZT_PACKET_IDX_FLAGS 18
+#define ZT_PACKET_IDX_MAC 19
+#define ZT_PACKET_IDX_VERB 27
 #define ZT_PACKET_IDX_PAYLOAD 28
 
-/**
- * Index where extended armor encryption starts (right after flags, before MAC)
- */
-#define ZT_PACKET_IDX_EXTENDED_ARMOR_START ZT_PACKET_IDX_MAC
-
 /**
  * Packet buffer size (can be changed)
+ *
+ * The current value is big enough for ZT_MAX_PACKET_FRAGMENTS, the pragmatic
+ * packet fragment limit, times the default UDP MTU. Most packets won't be
+ * this big.
  */
-#define ZT_PROTO_MAX_PACKET_LENGTH (ZT_MAX_PACKET_FRAGMENTS * ZT_DEFAULT_PHYSMTU)
+#define ZT_PROTO_MAX_PACKET_LENGTH (ZT_MAX_PACKET_FRAGMENTS * ZT_UDP_DEFAULT_PAYLOAD_MTU)
 
 /**
  * Minimum viable packet length (a.k.a. header length)
@@ -195,12 +210,12 @@
 #define ZT_PROTO_MIN_PACKET_LENGTH ZT_PACKET_IDX_PAYLOAD
 
 // Indexes of fields in fragment header
-#define ZT_PACKET_FRAGMENT_IDX_PACKET_ID		  0
-#define ZT_PACKET_FRAGMENT_IDX_DEST				  8
+#define ZT_PACKET_FRAGMENT_IDX_PACKET_ID 0
+#define ZT_PACKET_FRAGMENT_IDX_DEST 8
 #define ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR 13
-#define ZT_PACKET_FRAGMENT_IDX_FRAGMENT_NO		  14
-#define ZT_PACKET_FRAGMENT_IDX_HOPS				  15
-#define ZT_PACKET_FRAGMENT_IDX_PAYLOAD			  16
+#define ZT_PACKET_FRAGMENT_IDX_FRAGMENT_NO 14
+#define ZT_PACKET_FRAGMENT_IDX_HOPS 15
+#define ZT_PACKET_FRAGMENT_IDX_PAYLOAD 16
 
 /**
  * Magic number found at ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR
@@ -212,96 +227,95 @@
  */
 #define ZT_PROTO_MIN_FRAGMENT_LENGTH ZT_PACKET_FRAGMENT_IDX_PAYLOAD
 
-// Field indices for parsing verbs -------------------------------------------
+// Field incides for parsing verbs -------------------------------------------
 
 // Some verbs have variable-length fields. Those aren't fully defined here
 // yet-- instead they are parsed using relative indexes in IncomingPacket.
 // See their respective handler functions.
 
 #define ZT_PROTO_VERB_HELLO_IDX_PROTOCOL_VERSION (ZT_PACKET_IDX_PAYLOAD)
-#define ZT_PROTO_VERB_HELLO_IDX_MAJOR_VERSION	 (ZT_PROTO_VERB_HELLO_IDX_PROTOCOL_VERSION + 1)
-#define ZT_PROTO_VERB_HELLO_IDX_MINOR_VERSION	 (ZT_PROTO_VERB_HELLO_IDX_MAJOR_VERSION + 1)
-#define ZT_PROTO_VERB_HELLO_IDX_REVISION		 (ZT_PROTO_VERB_HELLO_IDX_MINOR_VERSION + 1)
-#define ZT_PROTO_VERB_HELLO_IDX_TIMESTAMP		 (ZT_PROTO_VERB_HELLO_IDX_REVISION + 2)
-#define ZT_PROTO_VERB_HELLO_IDX_IDENTITY		 (ZT_PROTO_VERB_HELLO_IDX_TIMESTAMP + 8)
+#define ZT_PROTO_VERB_HELLO_IDX_MAJOR_VERSION (ZT_PROTO_VERB_HELLO_IDX_PROTOCOL_VERSION + 1)
+#define ZT_PROTO_VERB_HELLO_IDX_MINOR_VERSION (ZT_PROTO_VERB_HELLO_IDX_MAJOR_VERSION + 1)
+#define ZT_PROTO_VERB_HELLO_IDX_REVISION (ZT_PROTO_VERB_HELLO_IDX_MINOR_VERSION + 1)
+#define ZT_PROTO_VERB_HELLO_IDX_TIMESTAMP (ZT_PROTO_VERB_HELLO_IDX_REVISION + 2)
+#define ZT_PROTO_VERB_HELLO_IDX_IDENTITY (ZT_PROTO_VERB_HELLO_IDX_TIMESTAMP + 8)
 
-#define ZT_PROTO_VERB_ERROR_IDX_IN_RE_VERB		(ZT_PACKET_IDX_PAYLOAD)
+#define ZT_PROTO_VERB_ERROR_IDX_IN_RE_VERB (ZT_PACKET_IDX_PAYLOAD)
 #define ZT_PROTO_VERB_ERROR_IDX_IN_RE_PACKET_ID (ZT_PROTO_VERB_ERROR_IDX_IN_RE_VERB + 1)
-#define ZT_PROTO_VERB_ERROR_IDX_ERROR_CODE		(ZT_PROTO_VERB_ERROR_IDX_IN_RE_PACKET_ID + 8)
-#define ZT_PROTO_VERB_ERROR_IDX_PAYLOAD			(ZT_PROTO_VERB_ERROR_IDX_ERROR_CODE + 1)
+#define ZT_PROTO_VERB_ERROR_IDX_ERROR_CODE (ZT_PROTO_VERB_ERROR_IDX_IN_RE_PACKET_ID + 8)
+#define ZT_PROTO_VERB_ERROR_IDX_PAYLOAD (ZT_PROTO_VERB_ERROR_IDX_ERROR_CODE + 1)
 
-#define ZT_PROTO_VERB_OK_IDX_IN_RE_VERB		 (ZT_PACKET_IDX_PAYLOAD)
+#define ZT_PROTO_VERB_OK_IDX_IN_RE_VERB (ZT_PACKET_IDX_PAYLOAD)
 #define ZT_PROTO_VERB_OK_IDX_IN_RE_PACKET_ID (ZT_PROTO_VERB_OK_IDX_IN_RE_VERB + 1)
-#define ZT_PROTO_VERB_OK_IDX_PAYLOAD		 (ZT_PROTO_VERB_OK_IDX_IN_RE_PACKET_ID + 8)
+#define ZT_PROTO_VERB_OK_IDX_PAYLOAD (ZT_PROTO_VERB_OK_IDX_IN_RE_PACKET_ID + 8)
 
 #define ZT_PROTO_VERB_WHOIS_IDX_ZTADDRESS (ZT_PACKET_IDX_PAYLOAD)
 
-#define ZT_PROTO_VERB_RENDEZVOUS_IDX_FLAGS	   (ZT_PACKET_IDX_PAYLOAD)
+#define ZT_PROTO_VERB_RENDEZVOUS_IDX_FLAGS (ZT_PACKET_IDX_PAYLOAD)
 #define ZT_PROTO_VERB_RENDEZVOUS_IDX_ZTADDRESS (ZT_PROTO_VERB_RENDEZVOUS_IDX_FLAGS + 1)
-#define ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT	   (ZT_PROTO_VERB_RENDEZVOUS_IDX_ZTADDRESS + 5)
-#define ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN   (ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT + 2)
-#define ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRESS   (ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN + 1)
+#define ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT (ZT_PROTO_VERB_RENDEZVOUS_IDX_ZTADDRESS + 5)
+#define ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN (ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT + 2)
+#define ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRESS (ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN + 1)
 
 #define ZT_PROTO_VERB_FRAME_IDX_NETWORK_ID (ZT_PACKET_IDX_PAYLOAD)
-#define ZT_PROTO_VERB_FRAME_IDX_ETHERTYPE  (ZT_PROTO_VERB_FRAME_IDX_NETWORK_ID + 8)
-#define ZT_PROTO_VERB_FRAME_IDX_PAYLOAD	   (ZT_PROTO_VERB_FRAME_IDX_ETHERTYPE + 2)
+#define ZT_PROTO_VERB_FRAME_IDX_ETHERTYPE (ZT_PROTO_VERB_FRAME_IDX_NETWORK_ID + 8)
+#define ZT_PROTO_VERB_FRAME_IDX_PAYLOAD (ZT_PROTO_VERB_FRAME_IDX_ETHERTYPE + 2)
 
 #define ZT_PROTO_VERB_EXT_FRAME_IDX_NETWORK_ID (ZT_PACKET_IDX_PAYLOAD)
 #define ZT_PROTO_VERB_EXT_FRAME_LEN_NETWORK_ID 8
-#define ZT_PROTO_VERB_EXT_FRAME_IDX_FLAGS	   (ZT_PROTO_VERB_EXT_FRAME_IDX_NETWORK_ID + ZT_PROTO_VERB_EXT_FRAME_LEN_NETWORK_ID)
-#define ZT_PROTO_VERB_EXT_FRAME_LEN_FLAGS	   1
-#define ZT_PROTO_VERB_EXT_FRAME_IDX_COM		   (ZT_PROTO_VERB_EXT_FRAME_IDX_FLAGS + ZT_PROTO_VERB_EXT_FRAME_LEN_FLAGS)
-#define ZT_PROTO_VERB_EXT_FRAME_IDX_TO		   (ZT_PROTO_VERB_EXT_FRAME_IDX_FLAGS + ZT_PROTO_VERB_EXT_FRAME_LEN_FLAGS)
-#define ZT_PROTO_VERB_EXT_FRAME_LEN_TO		   6
-#define ZT_PROTO_VERB_EXT_FRAME_IDX_FROM	   (ZT_PROTO_VERB_EXT_FRAME_IDX_TO + ZT_PROTO_VERB_EXT_FRAME_LEN_TO)
-#define ZT_PROTO_VERB_EXT_FRAME_LEN_FROM	   6
-#define ZT_PROTO_VERB_EXT_FRAME_IDX_ETHERTYPE  (ZT_PROTO_VERB_EXT_FRAME_IDX_FROM + ZT_PROTO_VERB_EXT_FRAME_LEN_FROM)
-#define ZT_PROTO_VERB_EXT_FRAME_LEN_ETHERTYPE  2
-#define ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD	   (ZT_PROTO_VERB_EXT_FRAME_IDX_ETHERTYPE + ZT_PROTO_VERB_EXT_FRAME_LEN_ETHERTYPE)
+#define ZT_PROTO_VERB_EXT_FRAME_IDX_FLAGS (ZT_PROTO_VERB_EXT_FRAME_IDX_NETWORK_ID + ZT_PROTO_VERB_EXT_FRAME_LEN_NETWORK_ID)
+#define ZT_PROTO_VERB_EXT_FRAME_LEN_FLAGS 1
+#define ZT_PROTO_VERB_EXT_FRAME_IDX_COM (ZT_PROTO_VERB_EXT_FRAME_IDX_FLAGS + ZT_PROTO_VERB_EXT_FRAME_LEN_FLAGS)
+#define ZT_PROTO_VERB_EXT_FRAME_IDX_TO (ZT_PROTO_VERB_EXT_FRAME_IDX_FLAGS + ZT_PROTO_VERB_EXT_FRAME_LEN_FLAGS)
+#define ZT_PROTO_VERB_EXT_FRAME_LEN_TO 6
+#define ZT_PROTO_VERB_EXT_FRAME_IDX_FROM (ZT_PROTO_VERB_EXT_FRAME_IDX_TO + ZT_PROTO_VERB_EXT_FRAME_LEN_TO)
+#define ZT_PROTO_VERB_EXT_FRAME_LEN_FROM 6
+#define ZT_PROTO_VERB_EXT_FRAME_IDX_ETHERTYPE (ZT_PROTO_VERB_EXT_FRAME_IDX_FROM + ZT_PROTO_VERB_EXT_FRAME_LEN_FROM)
+#define ZT_PROTO_VERB_EXT_FRAME_LEN_ETHERTYPE 2
+#define ZT_PROTO_VERB_EXT_FRAME_IDX_PAYLOAD (ZT_PROTO_VERB_EXT_FRAME_IDX_ETHERTYPE + ZT_PROTO_VERB_EXT_FRAME_LEN_ETHERTYPE)
 
 #define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_NETWORK_ID (ZT_PACKET_IDX_PAYLOAD)
-#define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT_LEN	(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_NETWORK_ID + 8)
-#define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT		(ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT_LEN + 2)
+#define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT_LEN (ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_NETWORK_ID + 8)
+#define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT (ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST_IDX_DICT_LEN + 2)
 
-#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID	(ZT_PACKET_IDX_PAYLOAD)
-#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_FLAGS		(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID + 8)
-#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC			(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_FLAGS + 1)
-#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_ADI			(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC + 6)
+#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID (ZT_PACKET_IDX_PAYLOAD)
+#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_FLAGS (ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID + 8)
+#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC (ZT_PROTO_VERB_MULTICAST_GATHER_IDX_FLAGS + 1)
+#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_ADI (ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC + 6)
 #define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_GATHER_LIMIT (ZT_PROTO_VERB_MULTICAST_GATHER_IDX_ADI + 4)
-#define ZT_PROTO_VERB_MULTICAST_GATHER_IDX_COM			(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_GATHER_LIMIT + 4)
 
 // Note: COM, GATHER_LIMIT, and SOURCE_MAC are optional, and so are specified without size
-#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_NETWORK_ID   (ZT_PACKET_IDX_PAYLOAD)
-#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS		   (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_NETWORK_ID + 8)
-#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_COM		   (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS + 1)
+#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_NETWORK_ID (ZT_PACKET_IDX_PAYLOAD)
+#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_NETWORK_ID + 8)
+#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_COM (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS + 1)
 #define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_GATHER_LIMIT (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS + 1)
-#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_SOURCE_MAC   (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS + 1)
-#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_MAC	   (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS + 1)
-#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_ADI	   (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_MAC + 6)
-#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ETHERTYPE	   (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_ADI + 4)
-#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FRAME		   (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ETHERTYPE + 2)
+#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_SOURCE_MAC (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS + 1)
+#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_MAC (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FLAGS + 1)
+#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_ADI (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_MAC + 6)
+#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ETHERTYPE (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_DEST_ADI + 4)
+#define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FRAME (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ETHERTYPE + 2)
 
-#define ZT_PROTO_VERB_HELLO__OK__IDX_TIMESTAMP		  (ZT_PROTO_VERB_OK_IDX_PAYLOAD)
+#define ZT_PROTO_VERB_HELLO__OK__IDX_TIMESTAMP (ZT_PROTO_VERB_OK_IDX_PAYLOAD)
 #define ZT_PROTO_VERB_HELLO__OK__IDX_PROTOCOL_VERSION (ZT_PROTO_VERB_HELLO__OK__IDX_TIMESTAMP + 8)
-#define ZT_PROTO_VERB_HELLO__OK__IDX_MAJOR_VERSION	  (ZT_PROTO_VERB_HELLO__OK__IDX_PROTOCOL_VERSION + 1)
-#define ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION	  (ZT_PROTO_VERB_HELLO__OK__IDX_MAJOR_VERSION + 1)
-#define ZT_PROTO_VERB_HELLO__OK__IDX_REVISION		  (ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION + 1)
+#define ZT_PROTO_VERB_HELLO__OK__IDX_MAJOR_VERSION (ZT_PROTO_VERB_HELLO__OK__IDX_PROTOCOL_VERSION + 1)
+#define ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION (ZT_PROTO_VERB_HELLO__OK__IDX_MAJOR_VERSION + 1)
+#define ZT_PROTO_VERB_HELLO__OK__IDX_REVISION (ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION + 1)
 
 #define ZT_PROTO_VERB_WHOIS__OK__IDX_IDENTITY (ZT_PROTO_VERB_OK_IDX_PAYLOAD)
 
 #define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_NETWORK_ID (ZT_PROTO_VERB_OK_IDX_PAYLOAD)
-#define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT_LEN	 (ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_NETWORK_ID + 8)
-#define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT		 (ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT_LEN + 2)
+#define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT_LEN (ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_NETWORK_ID + 8)
+#define ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT (ZT_PROTO_VERB_NETWORK_CONFIG_REQUEST__OK__IDX_DICT_LEN + 2)
 
-#define ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_NETWORK_ID	   (ZT_PROTO_VERB_OK_IDX_PAYLOAD)
-#define ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_MAC			   (ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_NETWORK_ID + 8)
-#define ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_ADI			   (ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_MAC + 6)
+#define ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_NETWORK_ID (ZT_PROTO_VERB_OK_IDX_PAYLOAD)
+#define ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_MAC (ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_NETWORK_ID + 8)
+#define ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_ADI (ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_MAC + 6)
 #define ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_GATHER_RESULTS (ZT_PROTO_VERB_MULTICAST_GATHER__OK__IDX_ADI + 4)
 
-#define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_NETWORK_ID			  (ZT_PROTO_VERB_OK_IDX_PAYLOAD)
-#define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_MAC					  (ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_NETWORK_ID + 8)
-#define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_ADI					  (ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_MAC + 6)
-#define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_FLAGS				  (ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_ADI + 4)
+#define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_NETWORK_ID (ZT_PROTO_VERB_OK_IDX_PAYLOAD)
+#define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_MAC (ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_NETWORK_ID + 8)
+#define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_ADI (ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_MAC + 6)
+#define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_FLAGS (ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_ADI + 4)
 #define ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_COM_AND_GATHER_RESULTS (ZT_PROTO_VERB_MULTICAST_FRAME__OK__IDX_FLAGS + 1)
 
 // ---------------------------------------------------------------------------
@@ -312,25 +326,17 @@ namespace ZeroTier {
  * ZeroTier packet
  *
  * Packet format:
- *   <[8] 64-bit packet ID / crypto IV / packet counter>
+ *   <[8] 64-bit random packet ID and crypto initialization vector>
  *   <[5] destination ZT address>
  *   <[5] source ZT address>
- *   <[1] flags/cipher/hops>
- *   <[8] 64-bit MAC (or trusted path ID in trusted path mode)>
+ *   <[1] flags/cipher (top 5 bits) and ZT hop count (last 3 bits)>
+ *   <[8] 64-bit MAC>
  *   [... -- begin encryption envelope -- ...]
- *   <[1] encrypted flags (MS 3 bits) and verb (LS 5 bits)>
+ *   <[1] encrypted flags (top 3 bits) and verb (last 5 bits)>
  *   [... verb-specific payload ...]
  *
  * Packets smaller than 28 bytes are invalid and silently discarded.
  *
- * The 64-bit packet ID is a strongly random value used as a crypto IV.
- * Its least significant 3 bits are also used as a monotonically increasing
- * (and looping) counter for sending packets to a particular recipient. This
- * can be used for link quality monitoring and reporting and has no crypto
- * impact as it does not increase the likelihood of an IV collision. (The
- * crypto we use is not sensitive to the nature of the IV, only that it does
- * not repeat.)
- *
  * The flags/cipher/hops bit field is: FFCCCHHH where C is a 3-bit cipher
  * selection allowing up to 7 cipher suites, F is outside-envelope flags,
  * and H is hop count.
@@ -340,11 +346,18 @@ namespace ZeroTier {
  * immutable. This is because intermediate nodes can increment the hop
  * count up to 7 (protocol max).
  *
+ * A hop count of 7 also indicates that receiving peers should not attempt
+ * to learn direct paths from this packet. (Right now direct paths are only
+ * learned from direct packets anyway.)
+ *
+ * http://tonyarcieri.com/all-the-crypto-code-youve-ever-written-is-probably-broken
+ *
  * For unencrypted packets, MAC is computed on plaintext. Only HELLO is ever
  * sent in the clear, as it's the "here is my public key" message.
  */
-class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
-  public:
+class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH>
+{
+public:
 	/**
 	 * A packet fragment
 	 *
@@ -371,17 +384,23 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 * receipt to authenticate and decrypt; there is no per-fragment MAC. (But if
 	 * fragments are corrupt, the MAC will fail for the whole assembled packet.)
 	 */
-	class Fragment : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
-	  public:
-		Fragment() : Buffer<ZT_PROTO_MAX_PACKET_LENGTH>()
+	class Fragment : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH>
+	{
+	public:
+		Fragment() :
+			Buffer<ZT_PROTO_MAX_PACKET_LENGTH>()
 		{
 		}
 
-		template <unsigned int C2> Fragment(const Buffer<C2>& b) : Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(b)
+		template<unsigned int C2>
+		Fragment(const Buffer<C2> &b)
+	 		throw(std::out_of_range) :
+	 		Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(b)
 		{
 		}
 
-		Fragment(const void* data, unsigned int len) : Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(data, len)
+		Fragment(const void *data,unsigned int len) :
+			Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(data,len)
 		{
 		}
 
@@ -393,10 +412,12 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 * @param fragLen Length of fragment in bytes
 		 * @param fragNo Which fragment (>= 1, since 0 is Packet with end chopped off)
 		 * @param fragTotal Total number of fragments (including 0)
+		 * @throws std::out_of_range Packet size would exceed buffer
 		 */
-		Fragment(const Packet& p, unsigned int fragStart, unsigned int fragLen, unsigned int fragNo, unsigned int fragTotal)
+		Fragment(const Packet &p,unsigned int fragStart,unsigned int fragLen,unsigned int fragNo,unsigned int fragTotal)
+			throw(std::out_of_range)
 		{
-			init(p, fragStart, fragLen, fragNo, fragTotal);
+			init(p,fragStart,fragLen,fragNo,fragTotal);
 		}
 
 		/**
@@ -407,22 +428,23 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 * @param fragLen Length of fragment in bytes
 		 * @param fragNo Which fragment (>= 1, since 0 is Packet with end chopped off)
 		 * @param fragTotal Total number of fragments (including 0)
+		 * @throws std::out_of_range Packet size would exceed buffer
 		 */
-		inline void init(const Packet& p, unsigned int fragStart, unsigned int fragLen, unsigned int fragNo, unsigned int fragTotal)
+		inline void init(const Packet &p,unsigned int fragStart,unsigned int fragLen,unsigned int fragNo,unsigned int fragTotal)
+			throw(std::out_of_range)
 		{
-			if ((fragStart + fragLen) > p.size()) {
-				throw ZT_EXCEPTION_OUT_OF_BOUNDS;
-			}
+			if ((fragStart + fragLen) > p.size())
+				throw std::out_of_range("Packet::Fragment: tried to construct fragment of packet past its length");
 			setSize(fragLen + ZT_PROTO_MIN_FRAGMENT_LENGTH);
 
 			// NOTE: this copies both the IV/packet ID and the destination address.
-			memcpy(field(ZT_PACKET_FRAGMENT_IDX_PACKET_ID, 13), p.field(ZT_PACKET_IDX_IV, 13), 13);
+			memcpy(field(ZT_PACKET_FRAGMENT_IDX_PACKET_ID,13),p.field(ZT_PACKET_IDX_IV,13),13);
 
 			(*this)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] = ZT_PACKET_FRAGMENT_INDICATOR;
 			(*this)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_NO] = (char)(((fragTotal & 0xf) << 4) | (fragNo & 0xf));
 			(*this)[ZT_PACKET_FRAGMENT_IDX_HOPS] = 0;
 
-			memcpy(field(ZT_PACKET_FRAGMENT_IDX_PAYLOAD, fragLen), p.field(fragStart, fragLen), fragLen);
+			memcpy(field(ZT_PACKET_FRAGMENT_IDX_PAYLOAD,fragLen),p.field(fragStart,fragLen),fragLen);
 		}
 
 		/**
@@ -430,50 +452,32 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 *
 		 * @return Destination ZT address
 		 */
-		inline Address destination() const
-		{
-			return Address(field(ZT_PACKET_FRAGMENT_IDX_DEST, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		}
+		inline Address destination() const { return Address(field(ZT_PACKET_FRAGMENT_IDX_DEST,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); }
 
 		/**
 		 * @return True if fragment is of a valid length
 		 */
-		inline bool lengthValid() const
-		{
-			return (size() >= ZT_PACKET_FRAGMENT_IDX_PAYLOAD);
-		}
+		inline bool lengthValid() const { return (size() >= ZT_PACKET_FRAGMENT_IDX_PAYLOAD); }
 
 		/**
 		 * @return ID of packet this is a fragment of
 		 */
-		inline uint64_t packetId() const
-		{
-			return at<uint64_t>(ZT_PACKET_FRAGMENT_IDX_PACKET_ID);
-		}
+		inline uint64_t packetId() const { return at<uint64_t>(ZT_PACKET_FRAGMENT_IDX_PACKET_ID); }
 
 		/**
 		 * @return Total number of fragments in packet
 		 */
-		inline unsigned int totalFragments() const
-		{
-			return (((unsigned int)((*this)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_NO]) >> 4) & 0xf);
-		}
+		inline unsigned int totalFragments() const { return (((unsigned int)((*this)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_NO]) >> 4) & 0xf); }
 
 		/**
 		 * @return Fragment number of this fragment
 		 */
-		inline unsigned int fragmentNumber() const
-		{
-			return ((unsigned int)((*this)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_NO]) & 0xf);
-		}
+		inline unsigned int fragmentNumber() const { return ((unsigned int)((*this)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_NO]) & 0xf); }
 
 		/**
 		 * @return Fragment ZT hop count
 		 */
-		inline unsigned int hops() const
-		{
-			return (unsigned int)((*this)[ZT_PACKET_FRAGMENT_IDX_HOPS]);
-		}
+		inline unsigned int hops() const { return (unsigned int)((*this)[ZT_PACKET_FRAGMENT_IDX_HOPS]); }
 
 		/**
 		 * Increment this packet's hop count
@@ -486,17 +490,14 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		/**
 		 * @return Length of payload in bytes
 		 */
-		inline unsigned int payloadLength() const
-		{
-			return ((size() > ZT_PACKET_FRAGMENT_IDX_PAYLOAD) ? (size() - ZT_PACKET_FRAGMENT_IDX_PAYLOAD) : 0);
-		}
+		inline unsigned int payloadLength() const { return ((size() > ZT_PACKET_FRAGMENT_IDX_PAYLOAD) ? (size() - ZT_PACKET_FRAGMENT_IDX_PAYLOAD) : 0); }
 
 		/**
 		 * @return Raw packet payload
 		 */
-		inline const unsigned char* payload() const
+		inline const unsigned char *payload() const
 		{
-			return field(ZT_PACKET_FRAGMENT_IDX_PAYLOAD, size() - ZT_PACKET_FRAGMENT_IDX_PAYLOAD);
+			return field(ZT_PACKET_FRAGMENT_IDX_PAYLOAD,size() - ZT_PACKET_FRAGMENT_IDX_PAYLOAD);
 		}
 	};
 
@@ -508,56 +509,50 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		/**
 		 * No operation (ignored, no reply)
 		 */
-		VERB_NOP = 0x00,
+		VERB_NOP = 0,
 
 		/**
-		 * Announcement of a node's existence and vitals:
+		 * Announcement of a node's existence:
 		 *   <[1] protocol version>
 		 *   <[1] software major version>
 		 *   <[1] software minor version>
 		 *   <[2] software revision>
-		 *   <[8] timestamp for determining latency>
+		 *   <[8] timestamp (ms since epoch)>
 		 *   <[...] binary serialized identity (see Identity)>
-		 *   <[...] physical destination address of packet>
-		 *   <[8] 64-bit world ID of current planet>
-		 *   <[8] 64-bit timestamp of current planet>
-		 *   [... remainder if packet is encrypted using cryptField() ...]
-		 *   <[2] 16-bit number of moons>
-		 *   [<[1] 8-bit type ID of moon>]
-		 *   [<[8] 64-bit world ID of moon>]
-		 *   [<[8] 64-bit timestamp of moon>]
-		 *   [... additional moon type/ID/timestamp tuples ...]
+		 *   <[1] destination address type>
+		 *   [<[...] destination address>]
+		 *   <[8] 64-bit world ID of current world>
+		 *   <[8] 64-bit timestamp of current world>
 		 *
-		 * HELLO is sent in the clear as it is how peers share their identity
-		 * public keys. A few additional fields are sent in the clear too, but
-		 * these are things that are public info or are easy to determine. As
-		 * of 1.2.0 we have added a few more fields, but since these could have
-		 * the potential to be sensitive we introduced the encryption of the
-		 * remainder of the packet. See cryptField(). Packet MAC is still
-		 * performed of course, so authentication occurs as normal.
+		 * This is the only message that ever must be sent in the clear, since it
+		 * is used to push an identity to a new peer.
 		 *
-		 * Destination address is the actual wire address to which the packet
-		 * was sent. See InetAddress::serialize() for format.
+		 * The destination address is the wire address to which this packet is
+		 * being sent, and in OK is *also* the destination address of the OK
+		 * packet. This can be used by the receiver to detect NAT, learn its real
+		 * external address if behind NAT, and detect changes to its external
+		 * address that require re-establishing connectivity.
+		 *
+		 * Destination address types and formats (not all of these are used now):
+		 *   0x00 - None -- no destination address data present
+		 *   0x01 - Ethernet address -- format: <[6] Ethernet MAC>
+		 *   0x04 - 6-byte IPv4 UDP address/port -- format: <[4] IP>, <[2] port>
+		 *   0x06 - 18-byte IPv6 UDP address/port -- format: <[16] IP>, <[2] port>
 		 *
 		 * OK payload:
-		 *   <[8] HELLO timestamp field echo>
-		 *   <[1] protocol version>
-		 *   <[1] software major version>
-		 *   <[1] software minor version>
-		 *   <[2] software revision>
-		 *   <[...] physical destination address of packet>
-		 *   <[2] 16-bit length of world update(s) or 0 if none>
-		 *   [[...] updates to planets and/or moons]
-		 *
-		 * With the exception of the timestamp, the other fields pertain to the
-		 * respondent who is sending OK and are not echoes.
-		 *
-		 * Note that OK is fully encrypted so no selective cryptField() of
-		 * potentially sensitive fields is needed.
+		 *   <[8] timestamp (echoed from original HELLO)>
+		 *   <[1] protocol version (of responder)>
+		 *   <[1] software major version (of responder)>
+		 *   <[1] software minor version (of responder)>
+		 *   <[2] software revision (of responder)>
+		 *   <[1] destination address type (for this OK, not copied from HELLO)>
+		 *   [<[...] destination address>]
+		 *   <[2] 16-bit length of world update or 0 if none>
+		 *   [[...] world update]
 		 *
 		 * ERROR has no payload.
 		 */
-		VERB_HELLO = 0x01,
+		VERB_HELLO = 1,
 
 		/**
 		 * Error response:
@@ -566,7 +561,7 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 *   <[1] error code>
 		 *   <[...] error-dependent payload>
 		 */
-		VERB_ERROR = 0x02,
+		VERB_ERROR = 2,
 
 		/**
 		 * Success response:
@@ -574,43 +569,50 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 *   <[8] in-re packet ID>
 		 *   <[...] request-specific payload>
 		 */
-		VERB_OK = 0x03,
+		VERB_OK = 3,
 
 		/**
 		 * Query an identity by address:
 		 *   <[5] address to look up>
-		 *   [<[...] additional addresses to look up>
 		 *
 		 * OK response payload:
 		 *   <[...] binary serialized identity>
-		 *  [<[...] additional binary serialized identities>]
 		 *
 		 * If querying a cluster, duplicate OK responses may occasionally occur.
-		 * These must be tolerated, which is easy since they'll have info you
-		 * already have.
+		 * These should be discarded.
 		 *
-		 * If the address is not found, no response is generated. The semantics
-		 * of WHOIS is similar to ARP and NDP in that persistent retrying can
-		 * be performed.
+		 * If the address is not found, no response is generated. WHOIS requests
+		 * will time out much like ARP requests and similar do in L2.
 		 */
-		VERB_WHOIS = 0x04,
+		VERB_WHOIS = 4,
 
 		/**
-		 * Relay-mediated NAT traversal or firewall punching initiation:
+		 * Meet another node at a given protocol address:
 		 *   <[1] flags (unused, currently 0)>
 		 *   <[5] ZeroTier address of peer that might be found at this address>
 		 *   <[2] 16-bit protocol address port>
 		 *   <[1] protocol address length (4 for IPv4, 16 for IPv6)>
 		 *   <[...] protocol address (network byte order)>
 		 *
-		 * An upstream node can send this to inform both sides of a relay of
-		 * information they might use to establish a direct connection.
+		 * This is sent by a relaying node to initiate NAT traversal between two
+		 * peers that are communicating by way of indirect relay. The relay will
+		 * send this to both peers at the same time on a periodic basis, telling
+		 * each where it might find the other on the network.
 		 *
 		 * Upon receipt a peer sends HELLO to establish a direct link.
 		 *
+		 * Nodes should implement rate control, limiting the rate at which they
+		 * respond to these packets to prevent their use in DDOS attacks. Nodes
+		 * may also ignore these messages if a peer is not known or is not being
+		 * actively communicated with.
+		 *
+		 * Unfortunately the physical address format in this message pre-dates
+		 * InetAddress's serialization format. :( ZeroTier is four years old and
+		 * yes we've accumulated a tiny bit of cruft here and there.
+		 *
 		 * No OK or ERROR is generated.
 		 */
-		VERB_RENDEZVOUS = 0x05,
+		VERB_RENDEZVOUS = 5,
 
 		/**
 		 * ZT-to-ZT unicast ethernet frame (shortened EXT_FRAME):
@@ -626,44 +628,31 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 * ERROR may be generated if a membership certificate is needed for a
 		 * closed network. Payload will be network ID.
 		 */
-		VERB_FRAME = 0x06,
+		VERB_FRAME = 6,
 
 		/**
 		 * Full Ethernet frame with MAC addressing and optional fields:
 		 *   <[8] 64-bit network ID>
 		 *   <[1] flags>
+		 *  [<[...] certificate of network membership>]
 		 *   <[6] destination MAC or all zero for destination node>
 		 *   <[6] source MAC or all zero for node of origin>
 		 *   <[2] 16-bit ethertype>
 		 *   <[...] ethernet payload>
 		 *
 		 * Flags:
-		 *   0x01 - Certificate of network membership attached (DEPRECATED)
-		 *   0x02 - Most significant bit of subtype (see below)
-		 *   0x04 - Middle bit of subtype (see below)
-		 *   0x08 - Least significant bit of subtype (see below)
-		 *   0x10 - ACK requested in the form of OK(EXT_FRAME)
+		 *   0x01 - Certificate of network membership is attached
 		 *
-		 * Subtypes (0..7):
-		 *   0x0 - Normal frame (bridging can be determined by checking MAC)
-		 *   0x1 - TEEd outbound frame
-		 *   0x2 - REDIRECTed outbound frame
-		 *   0x3 - WATCHed outbound frame (TEE with ACK, ACK bit also set)
-		 *   0x4 - TEEd inbound frame
-		 *   0x5 - REDIRECTed inbound frame
-		 *   0x6 - WATCHed inbound frame
-		 *   0x7 - (reserved for future use)
+		 * An extended frame carries full MAC addressing, making them a
+		 * superset of VERB_FRAME. They're used for bridging or when we
+		 * want to attach a certificate since FRAME does not support that.
 		 *
-		 * An extended frame carries full MAC addressing, making it a
-		 * superset of VERB_FRAME. It is used for bridged traffic,
-		 * redirected or observed traffic via rules, and can in theory
-		 * be used for multicast though MULTICAST_FRAME exists for that
-		 * purpose and has additional options and capabilities.
+		 * Multicast frames may not be sent as EXT_FRAME.
 		 *
-		 * OK payload (if ACK flag is set):
-		 *   <[8] 64-bit network ID>
+		 * ERROR may be generated if a membership certificate is needed for a
+		 * closed network. Payload will be network ID.
 		 */
-		VERB_EXT_FRAME = 0x07,
+		VERB_EXT_FRAME = 7,
 
 		/**
 		 * ECHO request (a.k.a. ping):
@@ -673,7 +662,7 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 * is generated. Response to ECHO requests is optional and ECHO may be
 		 * ignored if a node detects a possible flood.
 		 */
-		VERB_ECHO = 0x08,
+		VERB_ECHO = 8,
 
 		/**
 		 * Announce interest in multicast group(s):
@@ -687,123 +676,77 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 * controllers and root servers. In the current network, root servers
 		 * will provide the service of final multicast cache.
 		 *
-		 * VERB_NETWORK_CREDENTIALS should be pushed along with this, especially
-		 * if using upstream (e.g. root) nodes as multicast databases. This allows
-		 * GATHERs to be authenticated.
+		 * It is recommended that NETWORK_MEMBERSHIP_CERTIFICATE pushes be sent
+		 * along with MULTICAST_LIKE when pushing LIKEs to peers that do not
+		 * share a network membership (such as root servers), since this can be
+		 * used to authenticate GATHER requests and limit responses to peers
+		 * authorized to talk on a network. (Should be an optional field here,
+		 * but saving one or two packets every five minutes is not worth an
+		 * ugly hack or protocol rev.)
 		 *
 		 * OK/ERROR are not generated.
 		 */
-		VERB_MULTICAST_LIKE = 0x09,
+		VERB_MULTICAST_LIKE = 9,
 
 		/**
-		 * Network credentials push:
-		 *   [<[...] one or more certificates of membership>]
-		 *   <[1] 0x00, null byte marking end of COM array>
-		 *   <[2] 16-bit number of capabilities>
-		 *   <[...] one or more serialized Capability>
-		 *   <[2] 16-bit number of tags>
-		 *   <[...] one or more serialized Tags>
-		 *   <[2] 16-bit number of revocations>
-		 *   <[...] one or more serialized Revocations>
-		 *   <[2] 16-bit number of certificates of ownership>
-		 *   <[...] one or more serialized CertificateOfOwnership>
+		 * Network member certificate replication/push:
+		 *   <[...] serialized certificate of membership>
+		 *   [ ... additional certificates may follow ...]
 		 *
-		 * This can be sent by anyone at any time to push network credentials.
-		 * These will of course only be accepted if they are properly signed.
-		 * Credentials can be for any number of networks.
-		 *
-		 * The use of a zero byte to terminate the COM section is for legacy
-		 * backward compatibility. Newer fields are prefixed with a length.
+		 * This is sent in response to ERROR_NEED_MEMBERSHIP_CERTIFICATE and may
+		 * be pushed at any other time to keep exchanged certificates up to date.
 		 *
 		 * OK/ERROR are not generated.
 		 */
-		VERB_NETWORK_CREDENTIALS = 0x0a,
+		VERB_NETWORK_MEMBERSHIP_CERTIFICATE = 10,
 
 		/**
 		 * Network configuration request:
 		 *   <[8] 64-bit network ID>
 		 *   <[2] 16-bit length of request meta-data dictionary>
 		 *   <[...] string-serialized request meta-data>
-		 *   <[8] 64-bit revision of netconf we currently have>
-		 *   <[8] 64-bit timestamp of netconf we currently have>
+		 *  [<[8] 64-bit revision of netconf we currently have>]
 		 *
 		 * This message requests network configuration from a node capable of
-		 * providing it.
-		 *
-		 * Responses to this are always whole configs intended for the recipient.
-		 * For patches and other updates a NETWORK_CONFIG is sent instead.
-		 *
-		 * It would be valid and correct as of 1.2.0 to use NETWORK_CONFIG always,
-		 * but OK(NETWORK_CONFIG_REQUEST) should be sent for compatibility.
+		 * providing it. If the optional revision is included, a response is
+		 * only generated if there is a newer network configuration available.
 		 *
 		 * OK response payload:
 		 *   <[8] 64-bit network ID>
-		 *   <[2] 16-bit length of network configuration dictionary chunk>
-		 *   <[...] network configuration dictionary (may be incomplete)>
-		 *   [ ... end of legacy single chunk response ... ]
-		 *   <[1] 8-bit flags>
-		 *   <[8] 64-bit config update ID (should never be 0)>
-		 *   <[4] 32-bit total length of assembled dictionary>
-		 *   <[4] 32-bit index of chunk>
-		 *   [ ... end signed portion ... ]
-		 *   <[1] 8-bit chunk signature type>
-		 *   <[2] 16-bit length of chunk signature>
-		 *   <[...] chunk signature>
+		 *   <[2] 16-bit length of network configuration dictionary>
+		 *   <[...] network configuration dictionary>
 		 *
-		 * The chunk signature signs the entire payload of the OK response.
-		 * Currently only one signature type is supported: ed25519 (1).
+		 * OK returns a Dictionary (string serialized) containing the network's
+		 * configuration and IP address assignment information for the querying
+		 * node. It also contains a membership certificate that the querying
+		 * node can push to other peers to demonstrate its right to speak on
+		 * a given network.
 		 *
-		 * Each config chunk is signed to prevent memory exhaustion or
-		 * traffic crowding DOS attacks against config fragment assembly.
-		 *
-		 * If the packet is from the network controller it is permitted to end
-		 * before the config update ID or other chunking related or signature
-		 * fields. This is to support older controllers that don't include
-		 * these fields and may be removed in the future.
+		 * When a new network configuration is received, another config request
+		 * should be sent with the new netconf's revision. This confirms receipt
+		 * and also causes any subsequent changes to rapidly propagate as this
+		 * cycle will repeat until there are no changes. This is optional but
+		 * recommended behavior.
 		 *
 		 * ERROR response payload:
 		 *   <[8] 64-bit network ID>
-		 *   <[2] 16-bit length of error-related data (optional)>
-		 *   <[...] error-related data (optional)>
 		 *
-		 * Error related data is a Dictionary containing things like a URL
-		 * for authentication or a human-readable error message, and is
-		 * optional and may be absent or empty.
+		 * UNSUPPORTED_OPERATION is returned if this service is not supported,
+		 * and OBJ_NOT_FOUND if the queried network ID was not found.
 		 */
-		VERB_NETWORK_CONFIG_REQUEST = 0x0b,
+		VERB_NETWORK_CONFIG_REQUEST = 11,
 
 		/**
-		 * Network configuration data push:
-		 *   <[8] 64-bit network ID>
-		 *   <[2] 16-bit length of network configuration dictionary chunk>
-		 *   <[...] network configuration dictionary (may be incomplete)>
-		 *   <[1] 8-bit flags>
-		 *   <[8] 64-bit config update ID (should never be 0)>
-		 *   <[4] 32-bit total length of assembled dictionary>
-		 *   <[4] 32-bit index of chunk>
-		 *   [ ... end signed portion ... ]
-		 *   <[1] 8-bit chunk signature type>
-		 *   <[2] 16-bit length of chunk signature>
-		 *   <[...] chunk signature>
+		 * Network configuration refresh request:
+		 *   <[...] array of 64-bit network IDs>
 		 *
-		 * This is a direct push variant for network config updates. It otherwise
-		 * carries the same payload as OK(NETWORK_CONFIG_REQUEST) and has the same
-		 * semantics.
+		 * This can be sent by the network controller to inform a node that it
+		 * should now make a NETWORK_CONFIG_REQUEST.
 		 *
-		 * The legacy mode missing the additional chunking fields is not supported
-		 * here.
-		 *
-		 * Flags:
-		 *   0x01 - Use fast propagation
-		 *
-		 * An OK should be sent if the config is successfully received and
-		 * accepted.
-		 *
-		 * OK payload:
-		 *   <[8] 64-bit network ID>
-		 *   <[8] 64-bit config update ID>
+		 * It does not generate an OK or ERROR message, and is treated only as
+		 * a hint to refresh now.
 		 */
-		VERB_NETWORK_CONFIG = 0x0c,
+		VERB_NETWORK_CONFIG_REFRESH = 12,
 
 		/**
 		 * Request endpoints for multicast distribution:
@@ -812,10 +755,10 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 *   <[6] MAC address of multicast group being queried>
 		 *   <[4] 32-bit ADI for multicast group being queried>
 		 *   <[4] 32-bit requested max number of multicast peers>
-		 *   [<[...] network certificate of membership>]
+		 *  [<[...] network certificate of membership>]
 		 *
 		 * Flags:
-		 *   0x01 - COM is attached
+		 *   0x01 - Network certificate of membership is attached
 		 *
 		 * This message asks a peer for additional known endpoints that have
 		 * LIKEd a given multicast group. It's sent when the sender wishes
@@ -825,9 +768,6 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 * More than one OK response can occur if the response is broken up across
 		 * multiple packets or if querying a clustered node.
 		 *
-		 * The COM should be included so that upstream nodes that are not
-		 * members of our network can validate our request.
-		 *
 		 * OK response payload:
 		 *   <[8] 64-bit network ID>
 		 *   <[6] MAC address of multicast group being queried>
@@ -839,12 +779,13 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 *
 		 * ERROR is not generated; queries that return no response are dropped.
 		 */
-		VERB_MULTICAST_GATHER = 0x0d,
+		VERB_MULTICAST_GATHER = 13,
 
 		/**
 		 * Multicast frame:
 		 *   <[8] 64-bit network ID>
 		 *   <[1] flags>
+		 *  [<[...] network certificate of membership>]
 		 *  [<[4] 32-bit implicit gather limit>]
 		 *  [<[6] source MAC>]
 		 *   <[6] destination MAC (multicast address)>
@@ -853,10 +794,9 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 *   <[...] ethernet payload>
 		 *
 		 * Flags:
-		 *   0x01 - Network certificate of membership attached (DEPRECATED)
+		 *   0x01 - Network certificate of membership is attached
 		 *   0x02 - Implicit gather limit field is present
 		 *   0x04 - Source MAC is specified -- otherwise it's computed from sender
-		 *   0x08 - Please replicate (sent to multicast replicators)
 		 *
 		 * OK and ERROR responses are optional. OK may be generated if there are
 		 * implicit gather results or if the recipient wants to send its own
@@ -869,11 +809,11 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 *   <[6] MAC address of multicast group>
 		 *   <[4] 32-bit ADI for multicast group>
 		 *   <[1] flags>
-		 *  [<[...] network certificate of membership (DEPRECATED)>]
+		 *  [<[...] network certficate of membership>]
 		 *  [<[...] implicit gather results if flag 0x01 is set>]
 		 *
 		 * OK flags (same bits as request flags):
-		 *   0x01 - OK includes certificate of network membership (DEPRECATED)
+		 *   0x01 - OK includes certificate of network membership
 		 *   0x02 - OK includes implicit gather results
 		 *
 		 * ERROR response payload:
@@ -881,7 +821,7 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 *   <[6] multicast group MAC>
 		 *   <[4] 32-bit multicast group ADI>
 		 */
-		VERB_MULTICAST_FRAME = 0x0e,
+		VERB_MULTICAST_FRAME = 14,
 
 		/**
 		 * Push of potential endpoints for direct communication:
@@ -911,158 +851,222 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		 * be used unless they are blacklisted explicitly or unless flag 0x01
 		 * is set.
 		 *
+		 * Only a subset of this functionality is currently implemented: basic
+		 * path pushing and learning. Blacklisting and trust are not fully
+		 * implemented yet (encryption is still always used).
+		 *
 		 * OK and ERROR are not generated.
 		 */
-		VERB_PUSH_DIRECT_PATHS = 0x10,
-
-		// 0x11 -- deprecated
+		VERB_PUSH_DIRECT_PATHS = 16,
 
 		/**
-		 * An acknowledgment of receipt of a series of recent packets from another
-		 * peer. This is used to calculate relative throughput values and to detect
-		 * packet loss. Only VERB_FRAME and VERB_EXT_FRAME packets are counted.
+		 * Source-routed circuit test message:
+		 *   <[5] address of originator of circuit test>
+		 *   <[2] 16-bit flags>
+		 *   <[8] 64-bit timestamp>
+		 *   <[8] 64-bit test ID (arbitrary, set by tester)>
+		 *   <[2] 16-bit originator credential length (includes type)>
+		 *   [[1] originator credential type (for authorizing test)]
+		 *   [[...] originator credential]
+		 *   <[2] 16-bit length of additional fields>
+		 *   [[...] additional fields]
+		 *   [ ... end of signed portion of request ... ]
+		 *   <[2] 16-bit length of signature of request>
+		 *   <[...] signature of request by originator>
+		 *   <[2] 16-bit previous hop credential length (including type)>
+		 *   [[1] previous hop credential type]
+		 *   [[...] previous hop credential]
+		 *   <[...] next hop(s) in path>
 		 *
-		 * ACK response format:
-		 *  <[4] 32-bit number of bytes received since last ACK>
+		 * Flags:
+		 *   0x01 - Report back to originator at middle hops
+		 *   0x02 - Report back to originator at last hop
 		 *
-		 * Upon receipt of this packet, the local peer will verify that the correct
-		 * number of bytes were received by the remote peer. If these values do
-		 * not agree that could be an indication of packet loss.
+		 * Originator credential types:
+		 *   0x01 - 64-bit network ID for which originator is controller
 		 *
-		 * Additionally, the local peer knows the interval of time that has
-		 * elapsed since the last received ACK. With this information it can compute
-		 * a rough estimate of the current throughput.
+		 * Previous hop credential types:
+		 *   0x01 - Certificate of network membership
 		 *
-		 * This is sent at a maximum rate of once per every ZT_QOS_ACK_INTERVAL
+		 * Path record format:
+		 *   <[1] 8-bit flags (unused, must be zero)>
+		 *   <[1] 8-bit breadth (number of next hops)>
+		 *   <[...] one or more ZeroTier addresses of next hops>
+		 *
+		 * The circuit test allows a device to send a message that will traverse
+		 * the network along a specified path, with each hop optionally reporting
+		 * back to the tester via VERB_CIRCUIT_TEST_REPORT.
+		 *
+		 * Each circuit test packet includes a digital signature by the originator
+		 * of the request, as well as a credential by which that originator claims
+		 * authorization to perform the test. Currently this signature is ed25519,
+		 * but in the future flags might be used to indicate an alternative
+		 * algorithm. For example, the originator might be a network controller.
+		 * In this case the test might be authorized if the recipient is a member
+		 * of a network controlled by it, and if the previous hop(s) are also
+		 * members. Each hop may include its certificate of network membership.
+		 *
+		 * Circuit test paths consist of a series of records. When a node receives
+		 * an authorized circuit test, it:
+		 *
+		 * (1) Reports back to circuit tester as flags indicate
+		 * (2) Reads and removes the next hop from the packet's path
+		 * (3) Sends the packet along to next hop(s), if any.
+		 *
+		 * It is perfectly legal for a path to contain the same hop more than
+		 * once. In fact, this can be a very useful test to determine if a hop
+		 * can be reached bidirectionally and if so what that connectivity looks
+		 * like.
+		 *
+		 * The breadth field in source-routed path records allows a hop to forward
+		 * to more than one recipient, allowing the tester to specify different
+		 * forms of graph traversal in a test.
+		 *
+		 * There is no hard limit to the number of hops in a test, but it is
+		 * practically limited by the maximum size of a (possibly fragmented)
+		 * ZeroTier packet.
+		 *
+		 * Support for circuit tests is optional. If they are not supported, the
+		 * node should respond with an UNSUPPORTED_OPERATION error. If a circuit
+		 * test request is not authorized, it may be ignored or reported as
+		 * an INVALID_REQUEST. No OK messages are generated, but TEST_REPORT
+		 * messages may be sent (see below).
+		 *
+		 * ERROR packet format:
+		 *   <[8] 64-bit timestamp (echoed from original>
+		 *   <[8] 64-bit test ID (echoed from original)>
 		 */
-		VERB_ACK = 0x12,
+		VERB_CIRCUIT_TEST = 17,
 
 		/**
-		 * A packet containing timing measurements useful for estimating path quality.
-		 * Composed of a list of <packet ID:internal sojourn time> pairs for an
-		 * arbitrary set of recent packets. This is used to sample for latency and
-		 * packet delay variance (PDV, "jitter").
+		 * Circuit test hop report:
+		 *   <[8] 64-bit timestamp (from original test)>
+		 *   <[8] 64-bit test ID (from original test)>
+		 *   <[8] 64-bit reserved field (set to 0, currently unused)>
+		 *   <[1] 8-bit vendor ID (set to 0, currently unused)>
+		 *   <[1] 8-bit reporter protocol version>
+		 *   <[1] 8-bit reporter major version>
+		 *   <[1] 8-bit reporter minor version>
+		 *   <[2] 16-bit reporter revision>
+		 *   <[2] 16-bit reporter OS/platform>
+		 *   <[2] 16-bit reporter architecture>
+		 *   <[2] 16-bit error code (set to 0, currently unused)>
+		 *   <[8] 64-bit report flags (set to 0, currently unused)>
+		 *   <[8] 64-bit source packet ID>
+		 *   <[5] upstream ZeroTier address from which test was received>
+		 *   <[1] 8-bit source packet hop count (ZeroTier hop count)>
+		 *   <[...] local wire address on which packet was received>
+		 *   <[...] remote wire address from which packet was received>
+		 *   <[2] 16-bit length of additional fields>
+		 *   <[...] additional fields>
+		 *   <[1] 8-bit number of next hops (breadth)>
+		 *   <[...] next hop information>
 		 *
-		 * QoS record format:
+		 * Next hop information record format:
+		 *   <[5] ZeroTier address of next hop>
+		 *   <[...] current best direct path address, if any, 0 if none>
 		 *
-		 *  <[8] 64-bit packet ID of previously-received packet>
-		 *  <[1] 8-bit packet sojourn time>
-		 *  <...repeat until end of max 1400 byte packet...>
+		 * Circuit test reports can be sent by hops in a circuit test to report
+		 * back results. They should include information about the sender as well
+		 * as about the paths to which next hops are being sent.
 		 *
-		 * The number of possible records per QoS packet is: (1400 * 8) / 72 = 155
-		 * This packet should be sent very rarely (every few seconds) as it can be
-		 * somewhat large if the connection is saturated. Future versions might use
-		 * a bloom table to probabilistically determine these values in a vastly
-		 * more space-efficient manner.
-		 *
-		 * Note: The 'internal packet sojourn time' is a slight misnomer as it is a
-		 * measure of the amount of time between when a packet was received and the
-		 * egress time of its tracking QoS packet.
-		 *
-		 * This is sent at a maximum rate of once per every
-		 * ZT_QOS_MEASUREMENT_INTERVAL
+		 * If a test report is received and no circuit test was sent, it should be
+		 * ignored. This message generates no OK or ERROR response.
 		 */
-		VERB_QOS_MEASUREMENT = 0x13,
+		VERB_CIRCUIT_TEST_REPORT = 18,
 
 		/**
-		 * A message with arbitrary user-definable content:
-		 *   <[8] 64-bit arbitrary message type ID>
-		 *  [<[...] message payload>]
+		 * Request proof of work:
+		 *   <[1] 8-bit proof of work type>
+		 *   <[1] 8-bit proof of work difficulty>
+		 *   <[2] 16-bit length of proof of work challenge>
+		 *   <[...] proof of work challenge>
 		 *
-		 * This can be used to send arbitrary messages over VL1. It generates no
-		 * OK or ERROR and has no special semantics outside of whatever the user
-		 * (via the ZeroTier core API) chooses to give it.
+		 * This requests that a peer perform a proof of work calucation. It can be
+		 * sent by highly trusted peers (e.g. root servers, network controllers)
+		 * under suspected denial of service conditions in an attempt to filter
+		 * out "non-serious" peers and remain responsive to those proving their
+		 * intent to actually communicate.
 		 *
-		 * Message type IDs less than or equal to 65535 are reserved for use by
-		 * ZeroTier, Inc. itself. We recommend making up random ones for your own
-		 * implementations.
+		 * If the peer obliges to perform the work, it does so and responds with
+		 * an OK containing the result. Otherwise it may ignore the message or
+		 * response with an ERROR_INVALID_REQUEST or ERROR_UNSUPPORTED_OPERATION.
+		 *
+		 * Proof of work type IDs:
+		 *   0x01 - Salsa20/12+SHA512 hashcash function
+		 *
+		 * Salsa20/12+SHA512 is based on the following composite hash function:
+		 *
+		 * (1) Compute SHA512(candidate)
+		 * (2) Use the first 256 bits of the result of #1 as a key to encrypt
+		 *     131072 zero bytes with Salsa20/12 (with a zero IV).
+		 * (3) Compute SHA512(the result of step #2)
+		 * (4) Accept this candiate if the first [difficulty] bits of the result
+		 *     from step #3 are zero. Otherwise generate a new candidate and try
+		 *     again.
+		 *
+		 * This is performed repeatedly on candidates generated by appending the
+		 * supplied challenge to an arbitrary nonce until a valid candidate
+		 * is found. This chosen prepended nonce is then returned as the result
+		 * in OK.
+		 *
+		 * OK payload:
+		 *   <[2] 16-bit length of result>
+		 *   <[...] computed proof of work>
+		 *
+		 * ERROR has no payload.
 		 */
-		VERB_USER_MESSAGE = 0x14,
-
-		/**
-		 * A trace for remote debugging or diagnostics:
-		 *   <[...] null-terminated dictionary containing trace information>
-		 *  [<[...] additional null-terminated dictionaries>]
-		 *
-		 * This message contains a remote trace event. Remote trace events can
-		 * be sent to observers configured at the network level for those that
-		 * pertain directly to activity on a network, or to global observers if
-		 * locally configured.
-		 *
-		 * The instance ID is a random 64-bit value generated by each ZeroTier
-		 * node on startup. This is helpful in identifying traces from different
-		 * members of a cluster.
-		 */
-		VERB_REMOTE_TRACE = 0x15,
-
-		/**
-		 * A request to a peer to use a specific path in a multi-path scenario:
-		 * <[2] 16-bit unsigned integer that encodes a path choice utility>
-		 *
-		 * This is sent when a node operating in multipath mode observes that
-		 * its inbound and outbound traffic aren't going over the same path. The
-		 * node will compute its perceived utility for using its chosen outbound
-		 * path and send this to a peer in an attempt to petition it to send
-		 * its traffic over this same path.
-		 *
-		 * Scenarios:
-		 *
-		 * (1) Remote peer utility is GREATER than ours:
-		 *     - Remote peer will refuse the petition and continue using current path
-		 * (2) Remote peer utility is LESS than than ours:
-		 *     - Remote peer will accept the petition and switch to our chosen path
-		 * (3) Remote peer utility is EQUAL to our own:
-		 *     - To prevent confusion and flapping, both side will agree to use the
-		 *       numerical values of their identities to determine which path to use.
-		 *       The peer with the greatest identity will win.
-		 *
-		 * If a node petitions a peer repeatedly with no effect it will regard
-		 * that as a refusal by the remote peer, in this case if the utility is
-		 * negligible it will voluntarily switch to the remote peer's chosen path.
-		 */
-		VERB_PATH_NEGOTIATION_REQUEST = 0x16
+		VERB_REQUEST_PROOF_OF_WORK = 19
 	};
 
 	/**
 	 * Error codes for VERB_ERROR
 	 */
-	enum ErrorCode {
+	enum ErrorCode
+	{
 		/* No error, not actually used in transit */
-		ERROR_NONE = 0x00,
+		ERROR_NONE = 0,
 
 		/* Invalid request */
-		ERROR_INVALID_REQUEST = 0x01,
+		ERROR_INVALID_REQUEST = 1,
 
 		/* Bad/unsupported protocol version */
-		ERROR_BAD_PROTOCOL_VERSION = 0x02,
+		ERROR_BAD_PROTOCOL_VERSION = 2,
 
 		/* Unknown object queried */
-		ERROR_OBJ_NOT_FOUND = 0x03,
+		ERROR_OBJ_NOT_FOUND = 3,
 
 		/* HELLO pushed an identity whose address is already claimed */
-		ERROR_IDENTITY_COLLISION = 0x04,
+		ERROR_IDENTITY_COLLISION = 4,
 
 		/* Verb or use case not supported/enabled by this node */
-		ERROR_UNSUPPORTED_OPERATION = 0x05,
+		ERROR_UNSUPPORTED_OPERATION = 5,
 
-		/* Network membership certificate update needed */
-		ERROR_NEED_MEMBERSHIP_CERTIFICATE = 0x06,
+		/* Message to private network rejected -- no unexpired certificate on file */
+		ERROR_NEED_MEMBERSHIP_CERTIFICATE = 6,
 
 		/* Tried to join network, but you're not a member */
-		ERROR_NETWORK_ACCESS_DENIED_ = 0x07, /* extra _ at end to avoid Windows name conflict */
+		ERROR_NETWORK_ACCESS_DENIED_ = 7, /* extra _ to avoid Windows name conflict */
 
 		/* Multicasts to this group are not wanted */
-		ERROR_UNWANTED_MULTICAST = 0x08,
-
-		/* Network requires external or 2FA authentication (e.g. SSO). */
-		ERROR_NETWORK_AUTHENTICATION_REQUIRED = 0x09
+		ERROR_UNWANTED_MULTICAST = 8
 	};
 
-	template <unsigned int C2> Packet(const Buffer<C2>& b) : Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(b)
+//#ifdef ZT_TRACE
+	static const char *verbString(Verb v)
+		throw();
+	static const char *errorString(ErrorCode e)
+		throw();
+//#endif
+
+	template<unsigned int C2>
+	Packet(const Buffer<C2> &b) :
+ 		Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(b)
 	{
 	}
 
-	Packet(const void* data, unsigned int len) : Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(data, len)
+	Packet(const void *data,unsigned int len) :
+		Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(data,len)
 	{
 	}
 
@@ -1073,10 +1077,11 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 * Use the header access methods (setDestination() and friends) to fill out
 	 * the header. Payload should be appended; initial size is header size.
 	 */
-	Packet() : Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(ZT_PROTO_MIN_PACKET_LENGTH)
+	Packet() :
+		Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(ZT_PROTO_MIN_PACKET_LENGTH)
 	{
-		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV, 8), 8);
-		(*this)[ZT_PACKET_IDX_FLAGS] = 0;	// zero flags, cipher ID, and hops
+		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV,8),8);
+		(*this)[ZT_PACKET_IDX_FLAGS] = 0; // zero flags, cipher ID, and hops
 	}
 
 	/**
@@ -1088,9 +1093,10 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 * @param prototype Prototype packet
 	 * @param dest Destination ZeroTier address for new packet
 	 */
-	Packet(const Packet& prototype, const Address& dest) : Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(prototype)
+	Packet(const Packet &prototype,const Address &dest) :
+		Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(prototype)
 	{
-		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV, 8), 8);
+		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV,8),8);
 		setDestination(dest);
 	}
 
@@ -1101,12 +1107,13 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 * @param source Source ZT address
 	 * @param v Verb
 	 */
-	Packet(const Address& dest, const Address& source, const Verb v) : Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(ZT_PROTO_MIN_PACKET_LENGTH)
+	Packet(const Address &dest,const Address &source,const Verb v) :
+		Buffer<ZT_PROTO_MAX_PACKET_LENGTH>(ZT_PROTO_MIN_PACKET_LENGTH)
 	{
-		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV, 8), 8);
+		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV,8),8);
 		setDestination(dest);
 		setSource(source);
-		(*this)[ZT_PACKET_IDX_FLAGS] = 0;	// zero flags and hops
+		(*this)[ZT_PACKET_IDX_FLAGS] = 0; // zero flags and hops
 		setVerb(v);
 	}
 
@@ -1117,13 +1124,13 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 * @param source Source ZT address
 	 * @param v Verb
 	 */
-	inline void reset(const Address& dest, const Address& source, const Verb v)
+	inline void reset(const Address &dest,const Address &source,const Verb v)
 	{
 		setSize(ZT_PROTO_MIN_PACKET_LENGTH);
-		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV, 8), 8);
+		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV,8),8);
 		setDestination(dest);
 		setSource(source);
-		(*this)[ZT_PACKET_IDX_FLAGS] = 0;	// zero flags, cipher ID, and hops
+		(*this)[ZT_PACKET_IDX_FLAGS] = 0; // zero flags, cipher ID, and hops
 		setVerb(v);
 	}
 
@@ -1134,66 +1141,45 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 * technically different but otherwise identical copies of the same
 	 * packet.
 	 */
-	inline void newInitializationVector()
-	{
-		Utils::getSecureRandom(field(ZT_PACKET_IDX_IV, 8), 8);
-	}
+	inline void newInitializationVector() { Utils::getSecureRandom(field(ZT_PACKET_IDX_IV,8),8); }
 
 	/**
 	 * Set this packet's destination
 	 *
 	 * @param dest ZeroTier address of destination
 	 */
-	inline void setDestination(const Address& dest)
-	{
-		dest.copyTo(field(ZT_PACKET_IDX_DEST, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-	}
+	inline void setDestination(const Address &dest) { dest.copyTo(field(ZT_PACKET_IDX_DEST,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); }
 
 	/**
 	 * Set this packet's source
 	 *
 	 * @param source ZeroTier address of source
 	 */
-	inline void setSource(const Address& source)
-	{
-		source.copyTo(field(ZT_PACKET_IDX_SOURCE, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-	}
+	inline void setSource(const Address &source) { source.copyTo(field(ZT_PACKET_IDX_SOURCE,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); }
 
 	/**
 	 * Get this packet's destination
 	 *
 	 * @return Destination ZT address
 	 */
-	inline Address destination() const
-	{
-		return Address(field(ZT_PACKET_IDX_DEST, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-	}
+	inline Address destination() const { return Address(field(ZT_PACKET_IDX_DEST,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); }
 
 	/**
 	 * Get this packet's source
 	 *
 	 * @return Source ZT address
 	 */
-	inline Address source() const
-	{
-		return Address(field(ZT_PACKET_IDX_SOURCE, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-	}
+	inline Address source() const { return Address(field(ZT_PACKET_IDX_SOURCE,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); }
 
 	/**
 	 * @return True if packet is of valid length
 	 */
-	inline bool lengthValid() const
-	{
-		return (size() >= ZT_PROTO_MIN_PACKET_LENGTH);
-	}
+	inline bool lengthValid() const { return (size() >= ZT_PROTO_MIN_PACKET_LENGTH); }
 
 	/**
 	 * @return True if packet is fragmented (expect fragments)
 	 */
-	inline bool fragmented() const
-	{
-		return (((unsigned char)(*this)[ZT_PACKET_IDX_FLAGS] & ZT_PROTO_FLAG_FRAGMENTED) != 0);
-	}
+	inline bool fragmented() const { return (((unsigned char)(*this)[ZT_PACKET_IDX_FLAGS] & ZT_PROTO_FLAG_FRAGMENTED) != 0); }
 
 	/**
 	 * Set this packet's fragmented flag
@@ -1202,59 +1188,27 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 */
 	inline void setFragmented(bool f)
 	{
-		if (f) {
+		if (f)
 			(*this)[ZT_PACKET_IDX_FLAGS] |= (char)ZT_PROTO_FLAG_FRAGMENTED;
-		}
-		else {
-			(*this)[ZT_PACKET_IDX_FLAGS] &= (char)(~ZT_PROTO_FLAG_FRAGMENTED);
-		}
-	}
-
-	/**
-	 * @return True if packet is encrypted with an extra ephemeral key
-	 */
-	inline bool extendedArmor() const
-	{
-		return (((unsigned char)(*this)[ZT_PACKET_IDX_FLAGS] & ZT_PROTO_FLAG_EXTENDED_ARMOR) != 0);
-	}
-
-	/**
-	 * Set this packet's extended armor flag
-	 *
-	 * @param f Extended armor flag value
-	 */
-	inline void setExtendedArmor(bool f)
-	{
-		if (f) {
-			(*this)[ZT_PACKET_IDX_FLAGS] |= (char)ZT_PROTO_FLAG_EXTENDED_ARMOR;
-		}
-		else {
-			(*this)[ZT_PACKET_IDX_FLAGS] &= (char)(~ZT_PROTO_FLAG_EXTENDED_ARMOR);
-		}
+		else (*this)[ZT_PACKET_IDX_FLAGS] &= (char)(~ZT_PROTO_FLAG_FRAGMENTED);
 	}
 
 	/**
 	 * @return True if compressed (result only valid if unencrypted)
 	 */
-	inline bool compressed() const
-	{
-		return (((unsigned char)(*this)[ZT_PACKET_IDX_VERB] & ZT_PROTO_VERB_FLAG_COMPRESSED) != 0);
-	}
+	inline bool compressed() const { return (((unsigned char)(*this)[ZT_PACKET_IDX_VERB] & ZT_PROTO_VERB_FLAG_COMPRESSED) != 0); }
 
 	/**
 	 * @return ZeroTier forwarding hops (0 to 7)
 	 */
-	inline unsigned int hops() const
-	{
-		return ((unsigned int)(*this)[ZT_PACKET_IDX_FLAGS] & 0x07);
-	}
+	inline unsigned int hops() const { return ((unsigned int)(*this)[ZT_PACKET_IDX_FLAGS] & 0x07); }
 
 	/**
 	 * Increment this packet's hop count
 	 */
 	inline void incrementHops()
 	{
-		unsigned char& b = (*this)[ZT_PACKET_IDX_FLAGS];
+		unsigned char &b = (*this)[ZT_PACKET_IDX_FLAGS];
 		b = (b & 0xf8) | ((b + 1) & 0x07);
 	}
 
@@ -1263,62 +1217,29 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 */
 	inline unsigned int cipher() const
 	{
+		// Note: this uses the new cipher spec field, which is incompatible with <1.0.0 peers
 		return (((unsigned int)(*this)[ZT_PACKET_IDX_FLAGS] & 0x38) >> 3);
 	}
 
-	/**
-	 * @return Whether this packet is currently encrypted
-	 */
-	inline bool isEncrypted() const
-	{
-		return (cipher() == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012) || (cipher() == ZT_PROTO_CIPHER_SUITE__AES_GMAC_SIV);
-	}
-
 	/**
 	 * Set this packet's cipher suite
 	 */
 	inline void setCipher(unsigned int c)
 	{
-		unsigned char& b = (*this)[ZT_PACKET_IDX_FLAGS];
-		b = (b & 0xc7) | (unsigned char)((c << 3) & 0x38);	 // bits: FFCCCHHH
-	}
-
-	/**
-	 * Get the trusted path ID for this packet (only meaningful if cipher is trusted path)
-	 *
-	 * @return Trusted path ID (from MAC field)
-	 */
-	inline uint64_t trustedPathId() const
-	{
-		return at<uint64_t>(ZT_PACKET_IDX_MAC);
-	}
-
-	/**
-	 * Set this packet's trusted path ID and set the cipher spec to trusted path
-	 *
-	 * @param tpid Trusted path ID
-	 */
-	inline void setTrusted(const uint64_t tpid)
-	{
-		setCipher(ZT_PROTO_CIPHER_SUITE__NO_CRYPTO_TRUSTED_PATH);
-		setAt(ZT_PACKET_IDX_MAC, tpid);
+		unsigned char &b = (*this)[ZT_PACKET_IDX_FLAGS];
+		b = (b & 0xc7) | (unsigned char)((c << 3) & 0x38); // bits: FFCCCHHH
+		// DEPRECATED "encrypted" flag -- used by pre-1.0.3 peers
+		if (c == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012)
+			b |= ZT_PROTO_FLAG_ENCRYPTED;
+		else b &= (~ZT_PROTO_FLAG_ENCRYPTED);
 	}
 
 	/**
 	 * Get this packet's unique ID (the IV field interpreted as uint64_t)
 	 *
-	 * Note that the least significant 3 bits of this ID will change when armor()
-	 * is called to armor the packet for transport. This is because armor() will
-	 * mask the last 3 bits against the send counter for QoS monitoring use prior
-	 * to actually using the IV to encrypt and MAC the packet. Be aware of this
-	 * when grabbing the packetId of a new packet prior to armor/send.
-	 *
 	 * @return Packet ID
 	 */
-	inline uint64_t packetId() const
-	{
-		return at<uint64_t>(ZT_PACKET_IDX_IV);
-	}
+	inline uint64_t packetId() const { return at<uint64_t>(ZT_PACKET_IDX_IV); }
 
 	/**
 	 * Set packet verb
@@ -1328,74 +1249,38 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 *
 	 * @param v New packet verb
 	 */
-	inline void setVerb(Verb v)
-	{
-		(*this)[ZT_PACKET_IDX_VERB] = (char)v;
-	}
+	inline void setVerb(Verb v) { (*this)[ZT_PACKET_IDX_VERB] = (char)v; }
 
 	/**
 	 * @return Packet verb (not including flag bits)
 	 */
-	inline Verb verb() const
-	{
-		return (Verb)((*this)[ZT_PACKET_IDX_VERB] & 0x1f);
-	}
+	inline Verb verb() const { return (Verb)((*this)[ZT_PACKET_IDX_VERB] & 0x1f); }
 
 	/**
 	 * @return Length of packet payload
 	 */
-	inline unsigned int payloadLength() const
-	{
-		return ((size() < ZT_PROTO_MIN_PACKET_LENGTH) ? 0 : (size() - ZT_PROTO_MIN_PACKET_LENGTH));
-	}
+	inline unsigned int payloadLength() const { return ((size() < ZT_PROTO_MIN_PACKET_LENGTH) ? 0 : (size() - ZT_PROTO_MIN_PACKET_LENGTH)); }
 
 	/**
 	 * @return Raw packet payload
 	 */
-	inline const unsigned char* payload() const
-	{
-		return field(ZT_PACKET_IDX_PAYLOAD, size() - ZT_PACKET_IDX_PAYLOAD);
-	}
+	inline const unsigned char *payload() const { return field(ZT_PACKET_IDX_PAYLOAD,size() - ZT_PACKET_IDX_PAYLOAD); }
 
 	/**
 	 * Armor packet for transport
 	 *
 	 * @param key 32-byte key
 	 * @param encryptPayload If true, encrypt packet payload, else just MAC
-	 * @param extendedArmor Use an ephemeral key to encrypt payload (for encrypted HELLO)
-	 * @param identity Identity of packet recipient/destination
-	 * @param aesKeys If non-NULL these are the two keys for AES-GMAC-SIV
 	 */
-	void armor(const void* key, bool encryptPayload, bool extendedArmor, const AES aesKeys[2], const Identity& identity);
+	void armor(const void *key,bool encryptPayload);
 
 	/**
 	 * Verify and (if encrypted) decrypt packet
 	 *
-	 * This does not handle trusted path mode packets and will return false
-	 * for these. These are handled in IncomingPacket if the sending physical
-	 * address and MAC field match a trusted path.
-	 *
 	 * @param key 32-byte key
-	 * @param aesKeys If non-NULL these are the two keys for AES-GMAC-SIV
-	 * @param identity Receiver's identity (must include secret)
 	 * @return False if packet is invalid or failed MAC authenticity check
 	 */
-	bool dearmor(const void* key, const AES aesKeys[2], const Identity& identity);
-
-	/**
-	 * Encrypt/decrypt a separately armored portion of a packet
-	 *
-	 * This is currently only used to mask portions of HELLO as an extra
-	 * security precaution since most of that message is sent in the clear.
-	 *
-	 * This must NEVER be used more than once in the same packet, as doing
-	 * so will result in re-use of the same key stream.
-	 *
-	 * @param key 32-byte key
-	 * @param start Start of encrypted portion
-	 * @param len Length of encrypted portion
-	 */
-	void cryptField(const void* key, unsigned int start, unsigned int len);
+	bool dearmor(const void *key);
 
 	/**
 	 * Attempt to compress payload if not already (must be unencrypted)
@@ -1419,7 +1304,7 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 */
 	bool uncompress();
 
-  private:
+private:
 	static const unsigned char ZERO_KEY[32];
 
 	/**
@@ -1433,15 +1318,14 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 	 * @param in Input key (32 bytes)
 	 * @param out Output buffer (32 bytes)
 	 */
-	inline void _salsa20MangleKey(const unsigned char* in, unsigned char* out) const
+	inline void _salsa20MangleKey(const unsigned char *in,unsigned char *out) const
 	{
-		const unsigned char* d = (const unsigned char*)data();
+		const unsigned char *d = (const unsigned char *)data();
 
 		// IV and source/destination addresses. Using the addresses divides the
 		// key space into two halves-- A->B and B->A (since order will change).
-		for (unsigned int i = 0; i < 18; ++i) {	  // 8 + (ZT_ADDRESS_LENGTH * 2) == 18
+		for(unsigned int i=0;i<18;++i) // 8 + (ZT_ADDRESS_LENGTH * 2) == 18
 			out[i] = in[i] ^ d[i];
-		}
 
 		// Flags, but with hop count masked off. Hop count is altered by forwarding
 		// nodes. It's one of the only parts of a packet modifiable by people
@@ -1451,15 +1335,14 @@ class Packet : public Buffer<ZT_PROTO_MAX_PACKET_LENGTH> {
 		// Raw packet size in bytes -- thus each packet size defines a new
 		// key space.
 		out[19] = in[19] ^ (unsigned char)(size() & 0xff);
-		out[20] = in[20] ^ (unsigned char)((size() >> 8) & 0xff);	// little endian
+		out[20] = in[20] ^ (unsigned char)((size() >> 8) & 0xff); // little endian
 
 		// Rest of raw key is used unchanged
-		for (unsigned int i = 21; i < 32; ++i) {
+		for(unsigned int i=21;i<32;++i)
 			out[i] = in[i];
-		}
 	}
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/PacketMultiplexer.cpp b/node/PacketMultiplexer.cpp
deleted file mode 100644
index f6f3dc847..000000000
--- a/node/PacketMultiplexer.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c)2013-2021 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "PacketMultiplexer.hpp"
-
-#include "Constants.hpp"
-#include "Node.hpp"
-#include "RuntimeEnvironment.hpp"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-namespace ZeroTier {
-
-PacketMultiplexer::PacketMultiplexer(const RuntimeEnvironment* renv)
-{
-	RR = renv;
-};
-
-void PacketMultiplexer::putFrame(void* tPtr, uint64_t nwid, void** nuptr, const MAC& source, const MAC& dest, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len, unsigned int flowId)
-{
-#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__WINDOWS__)
-	RR->node->putFrame(tPtr, nwid, nuptr, source, dest, etherType, vlanId, (const void*)data, len);
-	return;
-#endif
-
-	if (! _enabled) {
-		RR->node->putFrame(tPtr, nwid, nuptr, source, dest, etherType, vlanId, (const void*)data, len);
-		return;
-	}
-
-	PacketRecord* packet;
-	_rxPacketVector_m.lock();
-	if (_rxPacketVector.empty()) {
-		packet = new PacketRecord;
-	}
-	else {
-		packet = _rxPacketVector.back();
-		_rxPacketVector.pop_back();
-	}
-	_rxPacketVector_m.unlock();
-
-	packet->tPtr = tPtr;
-	packet->nwid = nwid;
-	packet->nuptr = nuptr;
-	packet->source = source.toInt();
-	packet->dest = dest.toInt();
-	packet->etherType = etherType;
-	packet->vlanId = vlanId;
-	packet->len = len;
-	packet->flowId = flowId;
-	memcpy(packet->data, data, len);
-
-	int bucket = flowId % _concurrency;
-	_rxPacketQueues[bucket]->postLimit(packet, 2048);
-}
-
-void PacketMultiplexer::setUpPostDecodeReceiveThreads(unsigned int concurrency, bool cpuPinningEnabled)
-{
-#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__WINDOWS__)
-	return;
-#endif
-	_enabled = true;
-	_concurrency = concurrency;
-	bool _enablePinning = cpuPinningEnabled;
-
-	for (unsigned int i = 0; i < _concurrency; ++i) {
-		fprintf(stderr, "Reserved queue for thread %d\n", i);
-		_rxPacketQueues.push_back(new BlockingQueue<PacketRecord*>());
-	}
-
-	// Each thread picks from its own queue to feed into the core
-	for (unsigned int i = 0; i < _concurrency; ++i) {
-		_rxThreads.push_back(std::thread([this, i, _enablePinning]() {
-			fprintf(stderr, "Created post-decode packet ingestion thread %d\n", i);
-
-			PacketRecord* packet = nullptr;
-			for (;;) {
-				if (! _rxPacketQueues[i]->get(packet)) {
-					break;
-				}
-				if (! packet) {
-					break;
-				}
-
-				// fprintf(stderr, "popped packet from queue %d\n", i);
-
-				MAC sourceMac = MAC(packet->source);
-				MAC destMac = MAC(packet->dest);
-
-				RR->node->putFrame(packet->tPtr, packet->nwid, packet->nuptr, sourceMac, destMac, packet->etherType, 0, (const void*)packet->data, packet->len);
-				{
-					Mutex::Lock l(_rxPacketVector_m);
-					_rxPacketVector.push_back(packet);
-				}
-				/*
-				if (ZT_ResultCode_isFatal(err)) {
-					char tmp[256];
-					OSUtils::ztsnprintf(tmp, sizeof(tmp), "error processing packet: %d", (int)err);
-					Mutex::Lock _l(_termReason_m);
-					_termReason = ONE_UNRECOVERABLE_ERROR;
-					_fatalErrorMessage = tmp;
-					this->terminate();
-					break;
-				}
-				*/
-			}
-		}));
-	}
-}
-
-}	// namespace ZeroTier
\ No newline at end of file
diff --git a/node/PacketMultiplexer.hpp b/node/PacketMultiplexer.hpp
deleted file mode 100644
index 4753180ed..000000000
--- a/node/PacketMultiplexer.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c)2013-2021 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_PACKET_MULTIPLEXER_HPP
-#define ZT_PACKET_MULTIPLEXER_HPP
-
-#include "../osdep/BlockingQueue.hpp"
-#include "MAC.hpp"
-#include "Mutex.hpp"
-#include "RuntimeEnvironment.hpp"
-
-#include <thread>
-#include <vector>
-
-namespace ZeroTier {
-
-struct PacketRecord {
-	void* tPtr;
-	uint64_t nwid;
-	void** nuptr;
-	uint64_t source;
-	uint64_t dest;
-	unsigned int etherType;
-	unsigned int vlanId;
-	uint8_t data[ZT_MAX_MTU];
-	unsigned int len;
-	unsigned int flowId;
-};
-
-class PacketMultiplexer {
-  public:
-	const RuntimeEnvironment* RR;
-
-	PacketMultiplexer(const RuntimeEnvironment* renv);
-
-	void setUpPostDecodeReceiveThreads(unsigned int concurrency, bool cpuPinningEnabled);
-
-	void putFrame(void* tPtr, uint64_t nwid, void** nuptr, const MAC& source, const MAC& dest, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len, unsigned int flowId);
-
-	std::vector<BlockingQueue<PacketRecord*>*> _rxPacketQueues;
-
-	unsigned int _concurrency;
-	// pool
-	std::vector<PacketRecord*> _rxPacketVector;
-	std::vector<std::thread> _rxPacketThreads;
-	Mutex _rxPacketVector_m, _rxPacketThreads_m;
-
-	std::vector<std::thread> _rxThreads;
-	unsigned int _rxThreadCount;
-	bool _enabled;
-};
-
-}	// namespace ZeroTier
-
-#endif	 // ZT_PACKET_MULTIPLEXER_HPP
\ No newline at end of file
diff --git a/node/Path.cpp b/node/Path.cpp
index 875f05b4a..5692af66b 100644
--- a/node/Path.cpp
+++ b/node/Path.cpp
@@ -1,30 +1,34 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #include "Path.hpp"
-
-#include "Node.hpp"
 #include "RuntimeEnvironment.hpp"
+#include "Node.hpp"
 
 namespace ZeroTier {
 
-bool Path::send(const RuntimeEnvironment* RR, void* tPtr, const void* data, unsigned int len, int64_t now)
+bool Path::send(const RuntimeEnvironment *RR,const void *data,unsigned int len,uint64_t now)
 {
-	if (RR->node->putPacket(tPtr, _localSocket, _addr, data, len)) {
-		_lastOut = now;
+	if (RR->node->putPacket(_localAddress,address(),data,len)) {
+		sent(now);
 		return true;
 	}
 	return false;
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Path.hpp b/node/Path.hpp
index 2639173ee..c88c2958a 100644
--- a/node/Path.hpp
+++ b/node/Path.hpp
@@ -1,32 +1,53 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_PATH_HPP
 #define ZT_PATH_HPP
 
-#include "AtomicCounter.hpp"
+#include <stdint.h>
+#include <string.h>
+
+#include <stdexcept>
+#include <algorithm>
+
 #include "Constants.hpp"
 #include "InetAddress.hpp"
-#include "Packet.hpp"
-#include "RingBuffer.hpp"
-#include "SharedPtr.hpp"
-#include "Utils.hpp"
 
-#include <algorithm>
-#include <stdexcept>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
+// Note: if you change these flags check the logic below. Some of it depends
+// on these bits being what they are.
+
+/**
+ * Flag indicating that this path is suboptimal
+ *
+ * Clusters set this flag on remote paths if GeoIP or other routing decisions
+ * indicate that a peer should be handed off to another cluster member.
+ */
+#define ZT_PATH_FLAG_CLUSTER_SUBOPTIMAL 0x0001
+
+/**
+ * Flag indicating that this path is optimal
+ *
+ * Peers set this flag on paths that are pushed by a cluster and indicated as
+ * optimal. A second flag is needed since we want to prioritize cluster optimal
+ * paths and de-prioritize sub-optimal paths and for new paths we don't know
+ * which one they are. So we want a trinary state: optimal, suboptimal, unknown.
+ */
+#define ZT_PATH_FLAG_CLUSTER_OPTIMAL 0x0002
 
 /**
  * Maximum return value of preferenceRank()
@@ -38,211 +59,209 @@ namespace ZeroTier {
 class RuntimeEnvironment;
 
 /**
- * A path across the physical network
+ * Base class for paths
+ *
+ * The base Path class is an immutable value.
  */
-class Path {
-	friend class SharedPtr<Path>;
-	friend class Bond;
+class Path
+{
+public:
+	Path() :
+		_lastSend(0),
+		_lastPing(0),
+		_lastKeepalive(0),
+		_lastReceived(0),
+		_addr(),
+		_localAddress(),
+		_flags(0),
+		_ipScope(InetAddress::IP_SCOPE_NONE)
+	{
+	}
+
+	Path(const InetAddress &localAddress,const InetAddress &addr) :
+		_lastSend(0),
+		_lastPing(0),
+		_lastKeepalive(0),
+		_lastReceived(0),
+		_addr(addr),
+		_localAddress(localAddress),
+		_flags(0),
+		_ipScope(addr.ipScope())
+	{
+	}
+
+	inline Path &operator=(const Path &p)
+	{
+		if (this != &p)
+			memcpy(this,&p,sizeof(Path));
+		return *this;
+	}
 
-  public:
 	/**
-	 * Efficient unique key for paths in a Hashtable
+	 * Called when a packet is sent to this remote path
+	 *
+	 * This is called automatically by Path::send().
+	 *
+	 * @param t Time of send
 	 */
-	class HashKey {
-	  public:
-		HashKey()
-		{
-		}
-
-		HashKey(const int64_t l, const InetAddress& r)
-		{
-			if (r.ss_family == AF_INET) {
-				_k[0] = (uint64_t)reinterpret_cast<const struct sockaddr_in*>(&r)->sin_addr.s_addr;
-				_k[1] = (uint64_t)reinterpret_cast<const struct sockaddr_in*>(&r)->sin_port;
-				_k[2] = (uint64_t)l;
-			}
-			else if (r.ss_family == AF_INET6) {
-				memcpy(_k, reinterpret_cast<const struct sockaddr_in6*>(&r)->sin6_addr.s6_addr, 16);
-				_k[2] = ((uint64_t)reinterpret_cast<const struct sockaddr_in6*>(&r)->sin6_port << 32) ^ (uint64_t)l;
-			}
-			else {
-				memcpy(_k, &r, std::min(sizeof(_k), sizeof(InetAddress)));
-				_k[2] += (uint64_t)l;
-			}
-		}
-
-		inline unsigned long hashCode() const
-		{
-			return (unsigned long)(_k[0] + _k[1] + _k[2]);
-		}
-
-		inline bool operator==(const HashKey& k) const
-		{
-			return ((_k[0] == k._k[0]) && (_k[1] == k._k[1]) && (_k[2] == k._k[2]));
-		}
-		inline bool operator!=(const HashKey& k) const
-		{
-			return (! (*this == k));
-		}
-
-	  private:
-		uint64_t _k[3];
-	};
-
-	Path()
-		: _lastOut(0)
-		, _lastIn(0)
-		, _lastTrustEstablishedPacketReceived(0)
-		, _lastEchoRequestReceived(0)
-		, _localPort(0)
-		, _localSocket(-1)
-		, _latencyMean(0.0)
-		, _latencyVariance(0.0)
-		, _packetLossRatio(0.0)
-		, _packetErrorRatio(0.0)
-		, _assignedFlowCount(0)
-		, _valid(true)
-		, _eligible(false)
-		, _bonded(false)
-		, _mtu(0)
-		, _givenLinkSpeed(0)
-		, _relativeQuality(0)
-		, _latency(0xffff)
-		, _addr()
-		, _ipScope(InetAddress::IP_SCOPE_NONE)
-	{
-	}
-
-	Path(const int64_t localSocket, const InetAddress& addr)
-		: _lastOut(0)
-		, _lastIn(0)
-		, _lastTrustEstablishedPacketReceived(0)
-		, _lastEchoRequestReceived(0)
-		, _localPort(0)
-		, _localSocket(localSocket)
-		, _latencyMean(0.0)
-		, _latencyVariance(0.0)
-		, _packetLossRatio(0.0)
-		, _packetErrorRatio(0.0)
-		, _assignedFlowCount(0)
-		, _valid(true)
-		, _eligible(false)
-		, _bonded(false)
-		, _mtu(0)
-		, _givenLinkSpeed(0)
-		, _relativeQuality(0)
-		, _latency(0xffff)
-		, _addr(addr)
-		, _ipScope(addr.ipScope())
-	{
-	}
+	inline void sent(uint64_t t) { _lastSend = t; }
 
 	/**
-	 * Called when a packet is received from this remote path, regardless of content
+	 * Called when we've sent a ping or echo
+	 *
+	 * @param t Time of send
+	 */
+	inline void pinged(uint64_t t) { _lastPing = t; }
+
+	/**
+	 * Called when we send a NAT keepalive
+	 *
+	 * @param t Time of send
+	 */
+	inline void sentKeepalive(uint64_t t) { _lastKeepalive = t; }
+
+	/**
+	 * Called when a packet is received from this remote path
 	 *
 	 * @param t Time of receive
 	 */
-	inline void received(const uint64_t t)
+	inline void received(uint64_t t)
 	{
-		_lastIn = t;
+		_lastReceived = t;
+		_probation = 0;
 	}
 
 	/**
-	 * Set time last trusted packet was received (done in Peer::received())
+	 * @param now Current time
+	 * @return True if this path appears active
 	 */
-	inline void trustedPacketReceived(const uint64_t t)
+	inline bool active(uint64_t now) const
 	{
-		_lastTrustEstablishedPacketReceived = t;
+		return ( ((now - _lastReceived) < ZT_PATH_ACTIVITY_TIMEOUT) && (_probation < ZT_PEER_DEAD_PATH_DETECTION_MAX_PROBATION) );
 	}
 
 	/**
-	 * Send a packet via this path (last out time is also updated)
+	 * Send a packet via this path
 	 *
 	 * @param RR Runtime environment
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param data Packet data
 	 * @param len Packet length
 	 * @param now Current time
 	 * @return True if transport reported success
 	 */
-	bool send(const RuntimeEnvironment* RR, void* tPtr, const void* data, unsigned int len, int64_t now);
+	bool send(const RuntimeEnvironment *RR,const void *data,unsigned int len,uint64_t now);
 
 	/**
-	 * Manually update last sent time
-	 *
-	 * @param t Time of send
+	 * @return Address of local side of this path or NULL if unspecified
 	 */
-	inline void sent(const int64_t t)
-	{
-		_lastOut = t;
-	}
+	inline const InetAddress &localAddress() const throw() { return _localAddress; }
 
 	/**
-	 * Update path latency with a new measurement
-	 *
-	 * @param l Measured latency
+	 * @return Time of last send to this path
 	 */
-	inline void updateLatency(const unsigned int l, int64_t now)
-	{
-		unsigned int pl = _latency;
-		if (pl < 0xffff) {
-			_latency = (pl + l) / 2;
-		}
-		else {
-			_latency = l;
-		}
-	}
+	inline uint64_t lastSend() const throw() { return _lastSend; }
 
 	/**
-	 * @return Local socket as specified by external code
+	 * @return Time we last pinged or dead path checked this link
 	 */
-	inline int64_t localSocket() const
-	{
-		return _localSocket;
-	}
+	inline uint64_t lastPing() const throw() { return _lastPing; }
 
 	/**
-	 * @return Local port corresponding to the localSocket
+	 * @return Time of last keepalive
 	 */
-	inline int64_t localPort() const
-	{
-		return _localPort;
-	}
+	inline uint64_t lastKeepalive() const throw() { return _lastKeepalive; }
+
+	/**
+	 * @return Time of last receive from this path
+	 */
+	inline uint64_t lastReceived() const throw() { return _lastReceived; }
 
 	/**
 	 * @return Physical address
 	 */
-	inline const InetAddress& address() const
-	{
-		return _addr;
-	}
+	inline const InetAddress &address() const throw() { return _addr; }
 
 	/**
 	 * @return IP scope -- faster shortcut for address().ipScope()
 	 */
-	inline InetAddress::IpScope ipScope() const
+	inline InetAddress::IpScope ipScope() const throw() { return _ipScope; }
+
+	/**
+	 * @param f Valuve of ZT_PATH_FLAG_CLUSTER_SUBOPTIMAL and inverse of ZT_PATH_FLAG_CLUSTER_OPTIMAL (both are changed)
+	 */
+	inline void setClusterSuboptimal(bool f)
 	{
-		return _ipScope;
+		if (f) {
+			_flags = (_flags | ZT_PATH_FLAG_CLUSTER_SUBOPTIMAL) & ~ZT_PATH_FLAG_CLUSTER_OPTIMAL;
+		} else {
+			_flags = (_flags | ZT_PATH_FLAG_CLUSTER_OPTIMAL) & ~ZT_PATH_FLAG_CLUSTER_SUBOPTIMAL;
+		}
 	}
 
 	/**
-	 * @return True if path has received a trust established packet (e.g. common network membership) in the past ZT_TRUST_EXPIRATION ms
+	 * @return True if ZT_PATH_FLAG_CLUSTER_SUBOPTIMAL is set
 	 */
-	inline bool trustEstablished(const int64_t now) const
+	inline bool isClusterSuboptimal() const { return ((_flags & ZT_PATH_FLAG_CLUSTER_SUBOPTIMAL) != 0); }
+
+	/**
+	 * @return True if ZT_PATH_FLAG_CLUSTER_OPTIMAL is set
+	 */
+	inline bool isClusterOptimal() const { return ((_flags & ZT_PATH_FLAG_CLUSTER_OPTIMAL) != 0); }
+
+	/**
+	 * @return Preference rank, higher == better (will be less than 255)
+	 */
+	inline unsigned int preferenceRank() const throw()
 	{
-		return ((now - _lastTrustEstablishedPacketReceived) < ZT_TRUST_EXPIRATION);
+		/* First, since the scope enum values in InetAddress.hpp are in order of
+		 * use preference rank, we take that. Then we multiple by two, yielding
+		 * a sequence like 0, 2, 4, 6, etc. Then if it's IPv6 we add one. This
+		 * makes IPv6 addresses of a given scope outrank IPv4 addresses of the
+		 * same scope -- e.g. 1 outranks 0. This makes us prefer IPv6, but not
+		 * if the address scope/class is of a fundamentally lower rank. */
+		return ( ((unsigned int)_ipScope << 1) | (unsigned int)(_addr.ss_family == AF_INET6) );
 	}
 
 	/**
-	 * @return Preference rank, higher == better
+	 * @return This path's overall quality score (higher is better)
 	 */
-	inline unsigned int preferenceRank() const
+	inline uint64_t score() const throw()
 	{
-		// This causes us to rank paths in order of IP scope rank (see InetAddress.hpp) but
-		// within each IP scope class to prefer IPv6 over IPv4.
-		return (((unsigned int)_ipScope << 1) | (unsigned int)(_addr.ss_family == AF_INET6));
+		// This is a little bit convoluted because we try to be branch-free, using multiplication instead of branches for boolean flags
+
+		// Start with the last time this path was active, and add a fudge factor to prevent integer underflow if _lastReceived is 0
+		uint64_t score = _lastReceived + (ZT_PEER_DIRECT_PING_DELAY * (ZT_PEER_DEAD_PATH_DETECTION_MAX_PROBATION + 1));
+
+		// Increase score based on path preference rank, which is based on IP scope and address family
+		score += preferenceRank() * (ZT_PEER_DIRECT_PING_DELAY / ZT_PATH_MAX_PREFERENCE_RANK);
+
+		// Increase score if this is known to be an optimal path to a cluster
+		score += (uint64_t)(_flags & ZT_PATH_FLAG_CLUSTER_OPTIMAL) * (ZT_PEER_DIRECT_PING_DELAY / 2); // /2 because CLUSTER_OPTIMAL is flag 0x0002
+
+		// Decrease score if this is known to be a sub-optimal path to a cluster
+		score -= (uint64_t)(_flags & ZT_PATH_FLAG_CLUSTER_SUBOPTIMAL) * ZT_PEER_DIRECT_PING_DELAY;
+
+		// Penalize for missed ECHO tests in dead path detection
+		score -= (uint64_t)((ZT_PEER_DIRECT_PING_DELAY / 2) * _probation);
+
+		return score;
 	}
 
+	/**
+	 * @return True if path is considered reliable (no NAT keepalives etc. are needed)
+	 */
+	inline bool reliable() const throw()
+	{
+		if (_addr.ss_family == AF_INET)
+			return ((_ipScope != InetAddress::IP_SCOPE_GLOBAL)&&(_ipScope != InetAddress::IP_SCOPE_PSEUDOPRIVATE));
+		return true;
+	}
+
+	/**
+	 * @return True if address is non-NULL
+	 */
+	inline operator bool() const throw() { return (_addr); }
+
 	/**
 	 * Check whether this address is valid for a ZeroTier path
 	 *
@@ -252,10 +271,11 @@ class Path {
 	 * @param a Address to check
 	 * @return True if address is good for ZeroTier path use
 	 */
-	static inline bool isAddressValidForPath(const InetAddress& a)
+	static inline bool isAddressValidForPath(const InetAddress &a)
+		throw()
 	{
-		if ((a.ss_family == AF_INET) || (a.ss_family == AF_INET6)) {
-			switch (a.ipScope()) {
+		if ((a.ss_family == AF_INET)||(a.ss_family == AF_INET6)) {
+			switch(a.ipScope()) {
 				/* Note: we don't do link-local at the moment. Unfortunately these
 				 * cause several issues. The first is that they usually require a
 				 * device qualifier, which we don't handle yet and can't portably
@@ -271,10 +291,9 @@ class Path {
 						// TEMPORARY HACK: for now, we are going to blacklist he.net IPv6
 						// tunnels due to very spotty performance and low MTU issues over
 						// these IPv6 tunnel links.
-						const uint8_t* ipd = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(&a)->sin6_addr.s6_addr);
-						if ((ipd[0] == 0x20) && (ipd[1] == 0x01) && (ipd[2] == 0x04) && (ipd[3] == 0x70)) {
+						const uint8_t *ipd = reinterpret_cast<const uint8_t *>(reinterpret_cast<const struct sockaddr_in6 *>(&a)->sin6_addr.s6_addr);
+						if ((ipd[0] == 0x20)&&(ipd[1] == 0x01)&&(ipd[2] == 0x04)&&(ipd[3] == 0x70))
 							return false;
-						}
 					}
 					return true;
 				default:
@@ -285,210 +304,62 @@ class Path {
 	}
 
 	/**
-	 * @return Latency or 0xffff if unknown
+	 * @return Current path probation count (for dead path detect)
 	 */
-	inline unsigned int latency() const
-	{
-		return _latency;
-	}
+	inline unsigned int probation() const { return _probation; }
 
 	/**
-	 * @return Path quality -- lower is better
+	 * Increase this path's probation violation count (for dead path detect)
 	 */
-	inline long quality(const int64_t now) const
+	inline void increaseProbation() { ++_probation; }
+
+	template<unsigned int C>
+	inline void serialize(Buffer<C> &b) const
 	{
-		const int l = (long)_latency;
-		const int age = (long)std::min((now - _lastIn), (int64_t)(ZT_PATH_HEARTBEAT_PERIOD * 10));	 // set an upper sanity limit to avoid overflow
-		return (((age < (ZT_PATH_HEARTBEAT_PERIOD + 5000)) ? l : (l + 0xffff + age)) * (long)((ZT_INETADDRESS_MAX_SCOPE - _ipScope) + 1));
+		b.append((uint8_t)2); // version
+		b.append((uint64_t)_lastSend);
+		b.append((uint64_t)_lastPing);
+		b.append((uint64_t)_lastKeepalive);
+		b.append((uint64_t)_lastReceived);
+		_addr.serialize(b);
+		_localAddress.serialize(b);
+		b.append((uint16_t)_flags);
+		b.append((uint16_t)_probation);
 	}
 
-	/**
-	 * @return True if this path is alive (receiving heartbeats)
-	 */
-	inline bool alive(const int64_t now) const
+	template<unsigned int C>
+	inline unsigned int deserialize(const Buffer<C> &b,unsigned int startAt = 0)
 	{
-		return (now - _lastIn) < (ZT_PATH_HEARTBEAT_PERIOD + 5000);
+		unsigned int p = startAt;
+		if (b[p++] != 2)
+			throw std::invalid_argument("invalid serialized Path");
+		_lastSend = b.template at<uint64_t>(p); p += 8;
+		_lastPing = b.template at<uint64_t>(p); p += 8;
+		_lastKeepalive = b.template at<uint64_t>(p); p += 8;
+		_lastReceived = b.template at<uint64_t>(p); p += 8;
+		p += _addr.deserialize(b,p);
+		p += _localAddress.deserialize(b,p);
+		_flags = b.template at<uint16_t>(p); p += 2;
+		_probation = b.template at<uint16_t>(p); p += 2;
+		_ipScope = _addr.ipScope();
+		return (p - startAt);
 	}
 
-	/**
-	 * @return True if this path needs a heartbeat
-	 */
-	inline bool needsHeartbeat(const int64_t now) const
-	{
-		return ((now - _lastOut) >= ZT_PATH_HEARTBEAT_PERIOD);
-	}
+	inline bool operator==(const Path &p) const { return ((p._addr == _addr)&&(p._localAddress == _localAddress)); }
+	inline bool operator!=(const Path &p) const { return ((p._addr != _addr)||(p._localAddress != _localAddress)); }
 
-	/**
-	 * @return Last time we sent something
-	 */
-	inline int64_t lastOut() const
-	{
-		return _lastOut;
-	}
-
-	/**
-	 * @return Last time we received anything
-	 */
-	inline int64_t lastIn() const
-	{
-		return _lastIn;
-	}
-
-	/**
-	 * @return the age of the path in terms of receiving packets
-	 */
-	inline int64_t age(int64_t now)
-	{
-		return (now - _lastIn);
-	}
-
-	/**
-	 * @return Time last trust-established packet was received
-	 */
-	inline int64_t lastTrustEstablishedPacketReceived() const
-	{
-		return _lastTrustEstablishedPacketReceived;
-	}
-
-	/**
-	 * Rate limit gate for inbound ECHO requests
-	 */
-	inline bool rateGateEchoRequest(const int64_t now)
-	{
-		if ((now - _lastEchoRequestReceived) >= (ZT_PEER_GENERAL_RATE_LIMIT / 6)) {
-			_lastEchoRequestReceived = now;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @return Mean latency as reported by the bonding layer
-	 */
-	inline float latencyMean() const
-	{
-		return _latencyMean;
-	}
-
-	/**
-	 * @return Latency variance as reported by the bonding layer
-	 */
-	inline float latencyVariance() const
-	{
-		return _latencyVariance;
-	}
-
-	/**
-	 * @return Packet Loss Ratio as reported by the bonding layer
-	 */
-	inline float packetLossRatio() const
-	{
-		return _packetLossRatio;
-	}
-
-	/**
-	 * @return Packet Error Ratio as reported by the bonding layer
-	 */
-	inline float packetErrorRatio() const
-	{
-		return _packetErrorRatio;
-	}
-
-	/**
-	 * @return Number of flows assigned to this path
-	 */
-	inline unsigned int assignedFlowCount() const
-	{
-		return _assignedFlowCount;
-	}
-
-	/**
-	 * @return Whether this path is valid as reported by the bonding layer. The bonding layer
-	 * actually checks with Phy to see if the interface is still up
-	 */
-	inline bool valid() const
-	{
-		return _valid;
-	}
-
-	/**
-	 * @return Whether this path is eligible for use in a bond as reported by the bonding layer
-	 */
-	inline bool eligible() const
-	{
-		return _eligible;
-	}
-
-	/**
-	 * @return Whether this path is bonded as reported by the bonding layer
-	 */
-	inline bool bonded() const
-	{
-		return _bonded;
-	}
-
-	/**
-	 * @return Whether the user-specified MTU for this path (determined by MTU for parent link)
-	 */
-	inline uint16_t mtu() const
-	{
-		return _mtu;
-	}
-
-	/**
-	 * @return Given link capacity as reported by the bonding layer
-	 */
-	inline uint32_t givenLinkSpeed() const
-	{
-		return _givenLinkSpeed;
-	}
-
-	/**
-	 * @return Path's quality as reported by the bonding layer
-	 */
-	inline float relativeQuality() const
-	{
-		return _relativeQuality;
-	}
-
-	/**
-	 * @return Physical interface name that this path lives on
-	 */
-	char* ifname()
-	{
-		return _ifname;
-	}
-
-  private:
-	char _ifname[ZT_MAX_PHYSIFNAME] = {};
-
-	volatile int64_t _lastOut;
-	volatile int64_t _lastIn;
-	volatile int64_t _lastTrustEstablishedPacketReceived;
-
-	int64_t _lastEchoRequestReceived;
-
-	uint16_t _localPort;
-	int64_t _localSocket;
-
-	volatile float _latencyMean;
-	volatile float _latencyVariance;
-	volatile float _packetLossRatio;
-	volatile float _packetErrorRatio;
-	volatile uint16_t _assignedFlowCount;
-	volatile bool _valid;
-	volatile bool _eligible;
-	volatile bool _bonded;
-	volatile uint16_t _mtu;
-	volatile uint32_t _givenLinkSpeed;
-	volatile float _relativeQuality;
-
-	volatile unsigned int _latency;
+private:
+	uint64_t _lastSend;
+	uint64_t _lastPing;
+	uint64_t _lastKeepalive;
+	uint64_t _lastReceived;
 	InetAddress _addr;
-	InetAddress::IpScope _ipScope;	 // memoize this since it's a computed value checked often
-	AtomicCounter __refCount;
+	InetAddress _localAddress;
+	unsigned int _flags;
+	unsigned int _probation;
+	InetAddress::IpScope _ipScope; // memoize this since it's a computed value checked often
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Peer.cpp b/node/Peer.cpp
index 68ed4d64e..cc5810043 100644
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@@ -1,719 +1,558 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
-
-#include "Peer.hpp"
 
 #include "../version.h"
+
 #include "Constants.hpp"
-#include "Identity.hpp"
-#include "InetAddress.hpp"
-#include "Metrics.hpp"
-#include "Network.hpp"
-#include "Packet.hpp"
-#include "RingBuffer.hpp"
-#include "SelfAwareness.hpp"
+#include "Peer.hpp"
+#include "Node.hpp"
 #include "Switch.hpp"
-#include "Trace.hpp"
-#include "Utils.hpp"
+#include "Network.hpp"
+#include "SelfAwareness.hpp"
+#include "Cluster.hpp"
+#include "Packet.hpp"
+
+#include <algorithm>
+
+#define ZT_PEER_PATH_SORT_INTERVAL 5000
 
 namespace ZeroTier {
 
-static unsigned char s_freeRandomByteCounter = 0;
+// Used to send varying values for NAT keepalive
+static uint32_t _natKeepaliveBuf = 0;
 
-Peer::Peer(const RuntimeEnvironment* renv, const Identity& myIdentity, const Identity& peerIdentity)
-	: RR(renv)
-	, _lastReceive(0)
-	, _lastNontrivialReceive(0)
-	, _lastTriedMemorizedPath(0)
-	, _lastDirectPathPushSent(0)
-	, _lastDirectPathPushReceive(0)
-	, _lastCredentialRequestSent(0)
-	, _lastWhoisRequestReceived(0)
-	, _lastCredentialsReceived(0)
-	, _lastTrustEstablishedPacketReceived(0)
-	, _lastSentFullHello(0)
-	, _lastEchoCheck(0)
-	, _freeRandomByte((unsigned char)((uintptr_t)this >> 4) ^ ++s_freeRandomByteCounter)
-	, _vProto(0)
-	, _vMajor(0)
-	, _vMinor(0)
-	, _vRevision(0)
-	, _id(peerIdentity)
-	, _directPathPushCutoffCount(0)
-	, _echoRequestCutoffCount(0)
-	, _localMultipathSupported(false)
-	, _lastComputedAggregateMeanLatency(0)
-#ifndef ZT_NO_PEER_METRICS
-	, _peer_latency { Metrics::peer_latency.Add({ { "node_id", OSUtils::nodeIDStr(peerIdentity.address().toInt()) } }, std::vector<uint64_t> { 1, 3, 6, 10, 30, 60, 100, 300, 600, 1000 }) }
-	, _alive_path_count { Metrics::peer_path_count.Add({ { "node_id", OSUtils::nodeIDStr(peerIdentity.address().toInt()) }, { "status", "alive" } }) }
-	, _dead_path_count { Metrics::peer_path_count.Add({ { "node_id", OSUtils::nodeIDStr(peerIdentity.address().toInt()) }, { "status", "dead" } }) }
-	, _incoming_packet { Metrics::peer_packets.Add({ { "direction", "rx" }, { "node_id", OSUtils::nodeIDStr(peerIdentity.address().toInt()) } }) }
-	, _outgoing_packet { Metrics::peer_packets.Add({ { "direction", "tx" }, { "node_id", OSUtils::nodeIDStr(peerIdentity.address().toInt()) } }) }
-	, _packet_errors { Metrics::peer_packet_errors.Add({ { "node_id", OSUtils::nodeIDStr(peerIdentity.address().toInt()) } }) }
-#endif
+Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Identity &peerIdentity) :
+	RR(renv),
+	_lastUsed(0),
+	_lastReceive(0),
+	_lastUnicastFrame(0),
+	_lastMulticastFrame(0),
+	_lastAnnouncedTo(0),
+	_lastDirectPathPushSent(0),
+	_lastDirectPathPushReceive(0),
+	_lastPathSort(0),
+	_vProto(0),
+	_vMajor(0),
+	_vMinor(0),
+	_vRevision(0),
+	_id(peerIdentity),
+	_numPaths(0),
+	_latency(0),
+	_directPathPushCutoffCount(0),
+	_networkComs(4),
+	_lastPushedComs(4)
 {
-	if (! myIdentity.agree(peerIdentity, _key)) {
-		throw ZT_EXCEPTION_INVALID_ARGUMENT;
-	}
-
-	uint8_t ktmp[ZT_SYMMETRIC_KEY_SIZE];
-	KBKDFHMACSHA384(_key, ZT_KBKDF_LABEL_AES_GMAC_SIV_K0, 0, 0, ktmp);
-	_aesKeys[0].init(ktmp);
-	KBKDFHMACSHA384(_key, ZT_KBKDF_LABEL_AES_GMAC_SIV_K1, 0, 0, ktmp);
-	_aesKeys[1].init(ktmp);
-	Utils::burn(ktmp, ZT_SYMMETRIC_KEY_SIZE);
+	if (!myIdentity.agree(peerIdentity,_key,ZT_PEER_SECRET_KEY_LENGTH))
+		throw std::runtime_error("new peer identity key agreement failed");
 }
 
 void Peer::received(
-	void* tPtr,
-	const SharedPtr<Path>& path,
-	const unsigned int hops,
-	const uint64_t packetId,
-	const unsigned int payloadLength,
-	const Packet::Verb verb,
-	const uint64_t inRePacketId,
-	const Packet::Verb inReVerb,
-	const bool trustEstablished,
-	const uint64_t networkId,
-	const int32_t flowId)
+	const InetAddress &localAddr,
+	const InetAddress &remoteAddr,
+	unsigned int hops,
+	uint64_t packetId,
+	Packet::Verb verb,
+	uint64_t inRePacketId,
+	Packet::Verb inReVerb)
 {
-	const int64_t now = RR->node->now();
-
-	_lastReceive = now;
-	switch (verb) {
-		case Packet::VERB_FRAME:
-		case Packet::VERB_EXT_FRAME:
-		case Packet::VERB_NETWORK_CONFIG_REQUEST:
-		case Packet::VERB_NETWORK_CONFIG:
-		case Packet::VERB_MULTICAST_FRAME:
-			_lastNontrivialReceive = now;
-			break;
-		default:
-			break;
+#ifdef ZT_ENABLE_CLUSTER
+	bool suboptimalPath = false;
+	if ((RR->cluster)&&(hops == 0)) {
+		// Note: findBetterEndpoint() is first since we still want to check
+		// for a better endpoint even if we don't actually send a redirect.
+		InetAddress redirectTo;
+		if ( (verb != Packet::VERB_OK) && (verb != Packet::VERB_ERROR) && (verb != Packet::VERB_RENDEZVOUS) && (verb != Packet::VERB_PUSH_DIRECT_PATHS) && (RR->cluster->findBetterEndpoint(redirectTo,_id.address(),remoteAddr,false)) ) {
+			if (_vProto >= 5) {
+				// For newer peers we can send a more idiomatic verb: PUSH_DIRECT_PATHS.
+				Packet outp(_id.address(),RR->identity.address(),Packet::VERB_PUSH_DIRECT_PATHS);
+				outp.append((uint16_t)1); // count == 1
+				outp.append((uint8_t)ZT_PUSH_DIRECT_PATHS_FLAG_CLUSTER_REDIRECT); // flags: cluster redirect
+				outp.append((uint16_t)0); // no extensions
+				if (redirectTo.ss_family == AF_INET) {
+					outp.append((uint8_t)4);
+					outp.append((uint8_t)6);
+					outp.append(redirectTo.rawIpData(),4);
+				} else {
+					outp.append((uint8_t)6);
+					outp.append((uint8_t)18);
+					outp.append(redirectTo.rawIpData(),16);
+				}
+				outp.append((uint16_t)redirectTo.port());
+				outp.armor(_key,true);
+				RR->node->putPacket(localAddr,remoteAddr,outp.data(),outp.size());
+			} else {
+				// For older peers we use RENDEZVOUS to coax them into contacting us elsewhere.
+				Packet outp(_id.address(),RR->identity.address(),Packet::VERB_RENDEZVOUS);
+				outp.append((uint8_t)0); // no flags
+				RR->identity.address().appendTo(outp);
+				outp.append((uint16_t)redirectTo.port());
+				if (redirectTo.ss_family == AF_INET) {
+					outp.append((uint8_t)4);
+					outp.append(redirectTo.rawIpData(),4);
+				} else {
+					outp.append((uint8_t)16);
+					outp.append(redirectTo.rawIpData(),16);
+				}
+				outp.armor(_key,true);
+				RR->node->putPacket(localAddr,remoteAddr,outp.data(),outp.size());
+			}
+			suboptimalPath = true;
+		}
 	}
-#ifndef ZT_NO_PEER_METRICS
-	_incoming_packet++;
 #endif
-	recordIncomingPacket(path, packetId, payloadLength, verb, flowId, now);
 
-	if (trustEstablished) {
-		_lastTrustEstablishedPacketReceived = now;
-		path->trustedPacketReceived(now);
-	}
+	const uint64_t now = RR->node->now();
+	_lastReceive = now;
+	if ((verb == Packet::VERB_FRAME)||(verb == Packet::VERB_EXT_FRAME))
+		_lastUnicastFrame = now;
+	else if (verb == Packet::VERB_MULTICAST_FRAME)
+		_lastMulticastFrame = now;
 
 	if (hops == 0) {
-		// If this is a direct packet (no hops), update existing paths or learn new ones
-		bool havePath = false;
-		{
-			Mutex::Lock _l(_paths_m);
-			for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-				if (_paths[i].p) {
-					if (_paths[i].p == path) {
-						_paths[i].lr = now;
-						havePath = true;
-						break;
-					}
-					// If same address on same interface then don't learn unless existing path isn't alive (prevents learning loop)
-					if (_paths[i].p->address().ipsEqual(path->address()) && _paths[i].p->localSocket() == path->localSocket()) {
-						if (_paths[i].p->alive(now) && ! _bond) {
-							havePath = true;
-							break;
-						}
-					}
-				}
-				else {
-					break;
-				}
+		bool pathIsConfirmed = false;
+		unsigned int np = _numPaths;
+		for(unsigned int p=0;p<np;++p) {
+			if ((_paths[p].address() == remoteAddr)&&(_paths[p].localAddress() == localAddr)) {
+				_paths[p].received(now);
+#ifdef ZT_ENABLE_CLUSTER
+				_paths[p].setClusterSuboptimal(suboptimalPath);
+#endif
+				pathIsConfirmed = true;
+				break;
 			}
 		}
 
-		if ((! havePath) && RR->node->shouldUsePathForZeroTierTraffic(tPtr, _id.address(), path->localSocket(), path->address())) {
+		if ((!pathIsConfirmed)&&(RR->node->shouldUsePathForZeroTierTraffic(localAddr,remoteAddr))) {
 			if (verb == Packet::VERB_OK) {
-				Mutex::Lock _l(_paths_m);
-				unsigned int oldestPathIdx = ZT_MAX_PEER_NETWORK_PATHS;
-				unsigned int oldestPathAge = 0;
-				unsigned int replacePath = ZT_MAX_PEER_NETWORK_PATHS;
 
-				for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-					if (_paths[i].p) {
-						// Keep track of oldest path as a last resort option
-						unsigned int currAge = _paths[i].p->age(now);
-						if (currAge > oldestPathAge) {
-							oldestPathAge = currAge;
-							oldestPathIdx = i;
-						}
-						if (_paths[i].p->address().ipsEqual(path->address())) {
-							if (_paths[i].p->localSocket() == path->localSocket()) {
-								if (! _paths[i].p->alive(now)) {
-									replacePath = i;
-									break;
-								}
+				Path *slot = (Path *)0;
+				if (np < ZT_MAX_PEER_NETWORK_PATHS) {
+					slot = &(_paths[np++]);
+				} else {
+					uint64_t slotWorstScore = 0xffffffffffffffffULL;
+					for(unsigned int p=0;p<ZT_MAX_PEER_NETWORK_PATHS;++p) {
+						if (!_paths[p].active(now)) {
+							slot = &(_paths[p]);
+							break;
+						} else {
+							const uint64_t score = _paths[p].score();
+							if (score <= slotWorstScore) {
+								slotWorstScore = score;
+								slot = &(_paths[p]);
 							}
 						}
 					}
-					else {
-						replacePath = i;
-						break;
-					}
+				}
+				if (slot) {
+					*slot = Path(localAddr,remoteAddr);
+					slot->received(now);
+#ifdef ZT_ENABLE_CLUSTER
+					slot->setClusterSuboptimal(suboptimalPath);
+#endif
+					_numPaths = np;
 				}
 
-				// If we didn't find a good candidate then resort to replacing oldest path
-				replacePath = (replacePath == ZT_MAX_PEER_NETWORK_PATHS) ? oldestPathIdx : replacePath;
-				if (replacePath != ZT_MAX_PEER_NETWORK_PATHS) {
-					RR->t->peerLearnedNewPath(tPtr, networkId, *this, path, packetId);
-					_paths[replacePath].lr = now;
-					_paths[replacePath].p = path;
-					_paths[replacePath].priority = 1;
-					Mutex::Lock _l(_bond_m);
-					if (_bond) {
-						_bond->nominatePathToBond(_paths[replacePath].p, now);
-					}
-				}
-			}
-			else {
-				Mutex::Lock ltl(_lastTriedPath_m);
+#ifdef ZT_ENABLE_CLUSTER
+				if (RR->cluster)
+					RR->cluster->broadcastHavePeer(_id);
+#endif
 
-				bool triedTooRecently = false;
-				for (std::list<std::pair<Path*, int64_t> >::iterator i(_lastTriedPath.begin()); i != _lastTriedPath.end();) {
-					if ((now - i->second) > 1000) {
-						_lastTriedPath.erase(i++);
-					}
-					else if (i->first == path.ptr()) {
-						++i;
-						triedTooRecently = true;
-					}
-					else {
-						++i;
-					}
+			} else {
+
+				TRACE("got %s via unknown path %s(%s), confirming...",Packet::verbString(verb),_id.address().toString().c_str(),remoteAddr.toString().c_str());
+
+				if ( (_vProto >= 5) && ( !((_vMajor == 1)&&(_vMinor == 1)&&(_vRevision == 0)) ) ) {
+					Packet outp(_id.address(),RR->identity.address(),Packet::VERB_ECHO);
+					outp.armor(_key,true);
+					RR->node->putPacket(localAddr,remoteAddr,outp.data(),outp.size());
+				} else {
+					sendHELLO(localAddr,remoteAddr,now);
 				}
 
-				if (! triedTooRecently) {
-					_lastTriedPath.push_back(std::pair<Path*, int64_t>(path.ptr(), now));
-					attemptToContactAt(tPtr, path->localSocket(), path->address(), now, true);
-					path->sent(now);
-					RR->t->peerConfirmingUnknownPath(tPtr, networkId, *this, path, packetId, verb);
-				}
 			}
 		}
 	}
 
-	// If we have a trust relationship periodically push a message enumerating
-	// all known external addresses for ourselves. If we already have a path this
-	// is done less frequently.
-	if (this->trustEstablished(now)) {
-		const int64_t sinceLastPush = now - _lastDirectPathPushSent;
-		bool lowBandwidth = RR->node->lowBandwidthModeEnabled();
-		int timerScale = lowBandwidth ? 16 : 1;
-		if (sinceLastPush >= ((hops == 0) ? ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH * timerScale : ZT_DIRECT_PATH_PUSH_INTERVAL)) {
-			_lastDirectPathPushSent = now;
-			std::vector<InetAddress> pathsToPush(RR->node->directPaths());
-			std::vector<InetAddress> ma = RR->sa->whoami();
-			pathsToPush.insert(pathsToPush.end(), ma.begin(), ma.end());
-			if (! pathsToPush.empty()) {
-				std::vector<InetAddress>::const_iterator p(pathsToPush.begin());
-				while (p != pathsToPush.end()) {
-					Packet* const outp = new Packet(_id.address(), RR->identity.address(), Packet::VERB_PUSH_DIRECT_PATHS);
-					outp->addSize(2);	// leave room for count
-					unsigned int count = 0;
-					while ((p != pathsToPush.end()) && ((outp->size() + 24) < 1200)) {
-						uint8_t addressType = 4;
-						switch (p->ss_family) {
-							case AF_INET:
-								break;
-							case AF_INET6:
-								addressType = 6;
-								break;
-							default:   // we currently only push IP addresses
-								++p;
-								continue;
-						}
-
-						outp->append((uint8_t)0);	 // no flags
-						outp->append((uint16_t)0);	 // no extensions
-						outp->append(addressType);
-						outp->append((uint8_t)((addressType == 4) ? 6 : 18));
-						outp->append(p->rawIpData(), ((addressType == 4) ? 4 : 16));
-						outp->append((uint16_t)p->port());
-
-						++count;
-						++p;
-					}
-					if (count) {
-						Metrics::pkt_push_direct_paths_out++;
-						outp->setAt(ZT_PACKET_IDX_PAYLOAD, (uint16_t)count);
-						outp->compress();
-						outp->armor(_key, true, false, aesKeysIfSupported(), _id);
-						Metrics::pkt_push_direct_paths_out++;
-						path->send(RR, tPtr, outp->data(), outp->size(), now);
-					}
-					delete outp;
-				}
-			}
-		}
+	if ((now - _lastAnnouncedTo) >= ((ZT_MULTICAST_LIKE_EXPIRE / 2) - 1000)) {
+		_lastAnnouncedTo = now;
+		const std::vector< SharedPtr<Network> > networks(RR->node->allNetworks());
+		for(std::vector< SharedPtr<Network> >::const_iterator n(networks.begin());n!=networks.end();++n)
+			(*n)->tryAnnounceMulticastGroupsTo(SharedPtr<Peer>(this));
 	}
 }
 
-SharedPtr<Path> Peer::getAppropriatePath(int64_t now, bool includeExpired, int32_t flowId)
+void Peer::sendHELLO(const InetAddress &localAddr,const InetAddress &atAddress,uint64_t now,unsigned int ttl)
 {
-	Mutex::Lock _l(_paths_m);
-	Mutex::Lock _lb(_bond_m);
-	if (_bond && _bond->isReady()) {
-		return _bond->getAppropriatePath(now, flowId);
-	}
-	unsigned int bestPath = ZT_MAX_PEER_NETWORK_PATHS;
-	/**
-	 * Send traffic across the highest quality path only. This algorithm will still
-	 * use the old path quality metric from protocol version 9.
-	 */
-	long bestPathQuality = 2147483647;
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p) {
-			if ((includeExpired) || ((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION)) {
-				const long q = _paths[i].p->quality(now) / _paths[i].priority;
-				if (q <= bestPathQuality) {
-					bestPathQuality = q;
-					bestPath = i;
-				}
-			}
-		}
-		else {
-			break;
-		}
-	}
-	if (bestPath != ZT_MAX_PEER_NETWORK_PATHS) {
-		return _paths[bestPath].p;
-	}
-	return SharedPtr<Path>();
-}
-
-void Peer::introduce(void* const tPtr, const int64_t now, const SharedPtr<Peer>& other) const
-{
-	unsigned int myBestV4ByScope[ZT_INETADDRESS_MAX_SCOPE + 1];
-	unsigned int myBestV6ByScope[ZT_INETADDRESS_MAX_SCOPE + 1];
-	long myBestV4QualityByScope[ZT_INETADDRESS_MAX_SCOPE + 1];
-	long myBestV6QualityByScope[ZT_INETADDRESS_MAX_SCOPE + 1];
-	unsigned int theirBestV4ByScope[ZT_INETADDRESS_MAX_SCOPE + 1];
-	unsigned int theirBestV6ByScope[ZT_INETADDRESS_MAX_SCOPE + 1];
-	long theirBestV4QualityByScope[ZT_INETADDRESS_MAX_SCOPE + 1];
-	long theirBestV6QualityByScope[ZT_INETADDRESS_MAX_SCOPE + 1];
-	for (int i = 0; i <= ZT_INETADDRESS_MAX_SCOPE; ++i) {
-		myBestV4ByScope[i] = ZT_MAX_PEER_NETWORK_PATHS;
-		myBestV6ByScope[i] = ZT_MAX_PEER_NETWORK_PATHS;
-		myBestV4QualityByScope[i] = 2147483647;
-		myBestV6QualityByScope[i] = 2147483647;
-		theirBestV4ByScope[i] = ZT_MAX_PEER_NETWORK_PATHS;
-		theirBestV6ByScope[i] = ZT_MAX_PEER_NETWORK_PATHS;
-		theirBestV4QualityByScope[i] = 2147483647;
-		theirBestV6QualityByScope[i] = 2147483647;
-	}
-
-	Mutex::Lock _l1(_paths_m);
-
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p) {
-			const long q = _paths[i].p->quality(now) / _paths[i].priority;
-			const unsigned int s = (unsigned int)_paths[i].p->ipScope();
-			switch (_paths[i].p->address().ss_family) {
-				case AF_INET:
-					if (q <= myBestV4QualityByScope[s]) {
-						myBestV4QualityByScope[s] = q;
-						myBestV4ByScope[s] = i;
-					}
-					break;
-				case AF_INET6:
-					if (q <= myBestV6QualityByScope[s]) {
-						myBestV6QualityByScope[s] = q;
-						myBestV6ByScope[s] = i;
-					}
-					break;
-			}
-		}
-		else {
-			break;
-		}
-	}
-
-	Mutex::Lock _l2(other->_paths_m);
-
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (other->_paths[i].p) {
-			const long q = other->_paths[i].p->quality(now) / other->_paths[i].priority;
-			const unsigned int s = (unsigned int)other->_paths[i].p->ipScope();
-			switch (other->_paths[i].p->address().ss_family) {
-				case AF_INET:
-					if (q <= theirBestV4QualityByScope[s]) {
-						theirBestV4QualityByScope[s] = q;
-						theirBestV4ByScope[s] = i;
-					}
-					break;
-				case AF_INET6:
-					if (q <= theirBestV6QualityByScope[s]) {
-						theirBestV6QualityByScope[s] = q;
-						theirBestV6ByScope[s] = i;
-					}
-					break;
-			}
-		}
-		else {
-			break;
-		}
-	}
-
-	unsigned int mine = ZT_MAX_PEER_NETWORK_PATHS;
-	unsigned int theirs = ZT_MAX_PEER_NETWORK_PATHS;
-
-	for (int s = ZT_INETADDRESS_MAX_SCOPE; s >= 0; --s) {
-		if ((myBestV6ByScope[s] != ZT_MAX_PEER_NETWORK_PATHS) && (theirBestV6ByScope[s] != ZT_MAX_PEER_NETWORK_PATHS)) {
-			mine = myBestV6ByScope[s];
-			theirs = theirBestV6ByScope[s];
-			break;
-		}
-		if ((myBestV4ByScope[s] != ZT_MAX_PEER_NETWORK_PATHS) && (theirBestV4ByScope[s] != ZT_MAX_PEER_NETWORK_PATHS)) {
-			mine = myBestV4ByScope[s];
-			theirs = theirBestV4ByScope[s];
-			break;
-		}
-	}
-
-	if (mine != ZT_MAX_PEER_NETWORK_PATHS) {
-		unsigned int alt = (unsigned int)RR->node->prng() & 1;	 // randomize which hint we send first for black magickal NAT-t reasons
-		const unsigned int completed = alt + 2;
-		while (alt != completed) {
-			if ((alt & 1) == 0) {
-				Packet outp(_id.address(), RR->identity.address(), Packet::VERB_RENDEZVOUS);
-				outp.append((uint8_t)0);
-				other->_id.address().appendTo(outp);
-				outp.append((uint16_t)other->_paths[theirs].p->address().port());
-				if (other->_paths[theirs].p->address().ss_family == AF_INET6) {
-					outp.append((uint8_t)16);
-					outp.append(other->_paths[theirs].p->address().rawIpData(), 16);
-				}
-				else {
-					outp.append((uint8_t)4);
-					outp.append(other->_paths[theirs].p->address().rawIpData(), 4);
-				}
-				outp.armor(_key, true, false, aesKeysIfSupported(), _id);
-				Metrics::pkt_rendezvous_out++;
-				_paths[mine].p->send(RR, tPtr, outp.data(), outp.size(), now);
-			}
-			else {
-				Packet outp(other->_id.address(), RR->identity.address(), Packet::VERB_RENDEZVOUS);
-				outp.append((uint8_t)0);
-				_id.address().appendTo(outp);
-				outp.append((uint16_t)_paths[mine].p->address().port());
-				if (_paths[mine].p->address().ss_family == AF_INET6) {
-					outp.append((uint8_t)16);
-					outp.append(_paths[mine].p->address().rawIpData(), 16);
-				}
-				else {
-					outp.append((uint8_t)4);
-					outp.append(_paths[mine].p->address().rawIpData(), 4);
-				}
-				outp.armor(other->_key, true, false, other->aesKeysIfSupported(), other->identity());
-				Metrics::pkt_rendezvous_out++;
-				other->_paths[theirs].p->send(RR, tPtr, outp.data(), outp.size(), now);
-			}
-			++alt;
-		}
-	}
-}
-
-void Peer::sendHELLO(void* tPtr, const int64_t localSocket, const InetAddress& atAddress, int64_t now)
-{
-	Packet outp(_id.address(), RR->identity.address(), Packet::VERB_HELLO);
-
+	Packet outp(_id.address(),RR->identity.address(),Packet::VERB_HELLO);
 	outp.append((unsigned char)ZT_PROTO_VERSION);
 	outp.append((unsigned char)ZEROTIER_ONE_VERSION_MAJOR);
 	outp.append((unsigned char)ZEROTIER_ONE_VERSION_MINOR);
 	outp.append((uint16_t)ZEROTIER_ONE_VERSION_REVISION);
 	outp.append(now);
-	RR->identity.serialize(outp, false);
+	RR->identity.serialize(outp,false);
 	atAddress.serialize(outp);
+	outp.append((uint64_t)RR->topology->worldId());
+	outp.append((uint64_t)RR->topology->worldTimestamp());
 
-	outp.append((uint64_t)RR->topology->planetWorldId());
-	outp.append((uint64_t)RR->topology->planetWorldTimestamp());
-
-	const unsigned int startCryptedPortionAt = outp.size();
-
-	std::vector<World> moons(RR->topology->moons());
-	std::vector<uint64_t> moonsWanted(RR->topology->moonsWanted());
-	outp.append((uint16_t)(moons.size() + moonsWanted.size()));
-	for (std::vector<World>::const_iterator m(moons.begin()); m != moons.end(); ++m) {
-		outp.append((uint8_t)m->type());
-		outp.append((uint64_t)m->id());
-		outp.append((uint64_t)m->timestamp());
-	}
-	for (std::vector<uint64_t>::const_iterator m(moonsWanted.begin()); m != moonsWanted.end(); ++m) {
-		outp.append((uint8_t)World::TYPE_MOON);
-		outp.append(*m);
-		outp.append((uint64_t)0);
-	}
-
-	outp.cryptField(_key, startCryptedPortionAt, outp.size() - startCryptedPortionAt);
-
-	Metrics::pkt_hello_out++;
-
-	if (atAddress) {
-		outp.armor(_key, false, true, nullptr, _id);
-		RR->node->expectReplyTo(outp.packetId());
-		RR->node->putPacket(tPtr, RR->node->lowBandwidthModeEnabled() ? localSocket : -1, atAddress, outp.data(), outp.size());
-	}
-	else {
-		RR->node->expectReplyTo(outp.packetId());
-		RR->sw->send(tPtr, outp, true);
-	}
+	outp.armor(_key,false); // HELLO is sent in the clear
+	RR->node->putPacket(localAddr,atAddress,outp.data(),outp.size(),ttl);
 }
 
-void Peer::attemptToContactAt(void* tPtr, const int64_t localSocket, const InetAddress& atAddress, int64_t now, bool sendFullHello)
+bool Peer::doPingAndKeepalive(uint64_t now,int inetAddressFamily)
 {
-	if ((! sendFullHello) && (_vProto >= 5) && (! ((_vMajor == 1) && (_vMinor == 1) && (_vRevision == 0)))) {
-		Packet outp(_id.address(), RR->identity.address(), Packet::VERB_ECHO);
-		outp.armor(_key, true, false, aesKeysIfSupported(), _id);
-		Metrics::pkt_echo_out++;
-		RR->node->expectReplyTo(outp.packetId());
-		RR->node->putPacket(tPtr, localSocket, atAddress, outp.data(), outp.size());
+	Path *p = (Path *)0;
+
+	if (inetAddressFamily != 0) {
+		p = _getBestPath(now,inetAddressFamily);
+	} else {
+		p = _getBestPath(now);
 	}
-	else {
-		sendHELLO(tPtr, localSocket, atAddress, now);
+
+	if (p) {
+		if ((now - p->lastReceived()) >= ZT_PEER_DIRECT_PING_DELAY) {
+			//TRACE("PING %s(%s) after %llums/%llums send/receive inactivity",_id.address().toString().c_str(),p->address().toString().c_str(),now - p->lastSend(),now - p->lastReceived());
+			sendHELLO(p->localAddress(),p->address(),now);
+			p->sent(now);
+			p->pinged(now);
+		} else if ( ((now - std::max(p->lastSend(),p->lastKeepalive())) >= ZT_NAT_KEEPALIVE_DELAY) && (!p->reliable()) ) {
+			//TRACE("NAT keepalive %s(%s) after %llums/%llums send/receive inactivity",_id.address().toString().c_str(),p->address().toString().c_str(),now - p->lastSend(),now - p->lastReceived());
+			_natKeepaliveBuf += (uint32_t)((now * 0x9e3779b1) >> 1); // tumble this around to send constantly varying (meaningless) payloads
+			RR->node->putPacket(p->localAddress(),p->address(),&_natKeepaliveBuf,sizeof(_natKeepaliveBuf));
+			p->sentKeepalive(now);
+		} else {
+			//TRACE("no PING or NAT keepalive: addr==%s reliable==%d %llums/%llums send/receive inactivity",p->address().toString().c_str(),(int)p->reliable(),now - p->lastSend(),now - p->lastReceived());
+		}
+		return true;
 	}
+
+	return false;
 }
 
-void Peer::tryMemorizedPath(void* tPtr, int64_t now)
+bool Peer::pushDirectPaths(const InetAddress &localAddr,const InetAddress &toAddress,uint64_t now,bool force,bool includePrivatePaths)
 {
-	if ((now - _lastTriedMemorizedPath) >= ZT_TRY_MEMORIZED_PATH_INTERVAL) {
-		_lastTriedMemorizedPath = now;
-		InetAddress mp;
-		if (RR->node->externalPathLookup(tPtr, _id.address(), -1, mp)) {
-			attemptToContactAt(tPtr, -1, mp, now, true);
-		}
+#ifdef ZT_ENABLE_CLUSTER
+	// Cluster mode disables normal PUSH_DIRECT_PATHS in favor of cluster-based peer redirection
+	if (RR->cluster)
+		return false;
+#endif
+
+	if (!force) {
+		if ((now - _lastDirectPathPushSent) < ZT_DIRECT_PATH_PUSH_INTERVAL)
+			return false;
+		else _lastDirectPathPushSent = now;
 	}
-}
 
-void Peer::performMultipathStateCheck(void* tPtr, int64_t now)
-{
-	Mutex::Lock _l(_bond_m);
-	/**
-	 * Check for conditions required for multipath bonding and create a bond
-	 * if allowed.
-	 */
-	int numAlivePaths = 0;
-	bool atLeastOneNonExpired = false;
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p) {
-			if (_paths[i].p->alive(now)) {
-				numAlivePaths++;
-			}
-			if ((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION) {
-				atLeastOneNonExpired = true;
-			}
-		}
+	std::vector<InetAddress> pathsToPush;
+
+	std::vector<InetAddress> dps(RR->node->directPaths());
+	for(std::vector<InetAddress>::const_iterator i(dps.begin());i!=dps.end();++i) {
+		if ((includePrivatePaths)||(i->ipScope() == InetAddress::IP_SCOPE_GLOBAL))
+			pathsToPush.push_back(*i);
 	}
-	if (_bond) {
-		if (numAlivePaths == 0 && ! atLeastOneNonExpired) {
-			_bond = SharedPtr<Bond>();
-			RR->bc->destroyBond(_id.address().toInt());
-		}
-		return;
-	}
-	_localMultipathSupported = ((numAlivePaths >= 1) && (RR->bc->inUse()) && (ZT_PROTO_VERSION > 9));
-	if (_localMultipathSupported && ! _bond) {
-		if (RR->bc) {
-			_bond = RR->bc->createBond(RR, this);
-			/**
-			 * Allow new bond to retroactively learn all paths known to this peer
-			 */
-			if (_bond) {
-				for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-					if (_paths[i].p) {
-						_bond->nominatePathToBond(_paths[i].p, now);
-					}
-				}
-			}
-		}
-	}
-}
 
-unsigned int Peer::doPingAndKeepalive(void* tPtr, int64_t now)
-{
-	unsigned int sent = 0;
-	{
-		Mutex::Lock _l(_paths_m);
-
-		performMultipathStateCheck(tPtr, now);
-
-		const bool sendFullHello = ((now - _lastSentFullHello) >= ZT_PEER_PING_PERIOD);
-		if (sendFullHello) {
-			_lastSentFullHello = now;
-		}
-
-		// Right now we only keep pinging links that have the maximum priority. The
-		// priority is used to track cluster redirections, meaning that when a cluster
-		// redirects us its redirect target links override all other links and we
-		// let those old links expire.
-		long maxPriority = 0;
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p) {
-				maxPriority = std::max(_paths[i].priority, maxPriority);
-			}
-			else {
+	std::vector<InetAddress> sym(RR->sa->getSymmetricNatPredictions());
+	for(unsigned long i=0,added=0;i<sym.size();++i) {
+		InetAddress tmp(sym[(unsigned long)RR->node->prng() % sym.size()]);
+		if (std::find(pathsToPush.begin(),pathsToPush.end(),tmp) == pathsToPush.end()) {
+			pathsToPush.push_back(tmp);
+			if (++added >= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY)
 				break;
-			}
 		}
-
-		bool deletionOccurred = false;
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p) {
-				// Clean expired and reduced priority paths
-				if (((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION) && (_paths[i].priority == maxPriority)) {
-					if ((sendFullHello) || (_paths[i].p->needsHeartbeat(now))) {
-						attemptToContactAt(tPtr, _paths[i].p->localSocket(), _paths[i].p->address(), now, sendFullHello);
-						_paths[i].p->sent(now);
-						sent |= (_paths[i].p->address().ss_family == AF_INET) ? 0x1 : 0x2;
-					}
-				}
-				else {
-					_paths[i] = _PeerPath();
-					deletionOccurred = true;
-				}
-			}
-			if (! _paths[i].p || deletionOccurred) {
-				for (unsigned int j = i; j < ZT_MAX_PEER_NETWORK_PATHS; ++j) {
-					if (_paths[j].p && i != j) {
-						_paths[i] = _paths[j];
-						_paths[j] = _PeerPath();
-						break;
-					}
-				}
-				deletionOccurred = false;
-			}
-		}
-#ifndef ZT_NO_PEER_METRICS
-		uint16_t alive_path_count_tmp = 0, dead_path_count_tmp = 0;
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p) {
-				if (_paths[i].p->alive(now)) {
-					alive_path_count_tmp++;
-				}
-				else {
-					dead_path_count_tmp++;
-				}
-			}
-		}
-		_alive_path_count = alive_path_count_tmp;
-		_dead_path_count = dead_path_count_tmp;
-#endif
 	}
-#ifndef ZT_NO_PEER_METRICS
-	_peer_latency.Observe(latency(now));
-#endif
-	return sent;
-}
-
-void Peer::clusterRedirect(void* tPtr, const SharedPtr<Path>& originatingPath, const InetAddress& remoteAddress, const int64_t now)
-{
-	SharedPtr<Path> np(RR->topology->getPath(originatingPath->localSocket(), remoteAddress));
-	RR->t->peerRedirected(tPtr, 0, *this, np);
-
-	attemptToContactAt(tPtr, originatingPath->localSocket(), remoteAddress, now, true);
+	if (pathsToPush.empty())
+		return false;
 
+#ifdef ZT_TRACE
 	{
-		Mutex::Lock _l(_paths_m);
+		std::string ps;
+		for(std::vector<InetAddress>::const_iterator p(pathsToPush.begin());p!=pathsToPush.end();++p) {
+			if (ps.length() > 0)
+				ps.push_back(',');
+			ps.append(p->toString());
+		}
+		TRACE("pushing %u direct paths to %s: %s",(unsigned int)pathsToPush.size(),_id.address().toString().c_str(),ps.c_str());
+	}
+#endif
 
-		// New priority is higher than the priority of the originating path (if known)
-		long newPriority = 1;
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p) {
-				if (_paths[i].p == originatingPath) {
-					newPriority = _paths[i].priority;
+	std::vector<InetAddress>::const_iterator p(pathsToPush.begin());
+	while (p != pathsToPush.end()) {
+		Packet outp(_id.address(),RR->identity.address(),Packet::VERB_PUSH_DIRECT_PATHS);
+		outp.addSize(2); // leave room for count
+
+		unsigned int count = 0;
+		while ((p != pathsToPush.end())&&((outp.size() + 24) < 1200)) {
+			uint8_t addressType = 4;
+			switch(p->ss_family) {
+				case AF_INET:
 					break;
-				}
+				case AF_INET6:
+					addressType = 6;
+					break;
+				default: // we currently only push IP addresses
+					++p;
+					continue;
 			}
-			else {
-				break;
-			}
-		}
-		newPriority += 2;
 
-		// Erase any paths with lower priority than this one or that are duplicate
-		// IPs and add this path.
-		unsigned int j = 0;
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p) {
-				if ((_paths[i].priority >= newPriority) && (! _paths[i].p->address().ipsEqual2(remoteAddress))) {
-					if (i != j) {
-						_paths[j] = _paths[i];
+			outp.append((uint8_t)0); // no flags
+			outp.append((uint16_t)0); // no extensions
+			outp.append(addressType);
+			outp.append((uint8_t)((addressType == 4) ? 6 : 18));
+			outp.append(p->rawIpData(),((addressType == 4) ? 4 : 16));
+			outp.append((uint16_t)p->port());
+
+			++count;
+			++p;
+		}
+
+		if (count) {
+			outp.setAt(ZT_PACKET_IDX_PAYLOAD,(uint16_t)count);
+			outp.armor(_key,true);
+			RR->node->putPacket(localAddr,toAddress,outp.data(),outp.size(),0);
+		}
+	}
+
+	return true;
+}
+
+bool Peer::resetWithinScope(InetAddress::IpScope scope,uint64_t now)
+{
+	unsigned int np = _numPaths;
+	unsigned int x = 0;
+	unsigned int y = 0;
+	while (x < np) {
+		if (_paths[x].address().ipScope() == scope) {
+			// Resetting a path means sending a HELLO and then forgetting it. If we
+			// get OK(HELLO) then it will be re-learned.
+			sendHELLO(_paths[x].localAddress(),_paths[x].address(),now);
+		} else {
+			_paths[y++] = _paths[x];
+		}
+		++x;
+	}
+	_numPaths = y;
+	return (y < np);
+}
+
+void Peer::getBestActiveAddresses(uint64_t now,InetAddress &v4,InetAddress &v6) const
+{
+	uint64_t bestV4 = 0,bestV6 = 0;
+	for(unsigned int p=0,np=_numPaths;p<np;++p) {
+		if (_paths[p].active(now)) {
+			uint64_t lr = _paths[p].lastReceived();
+			if (lr) {
+				if (_paths[p].address().isV4()) {
+					if (lr >= bestV4) {
+						bestV4 = lr;
+						v4 = _paths[p].address();
+					}
+				} else if (_paths[p].address().isV6()) {
+					if (lr >= bestV6) {
+						bestV6 = lr;
+						v6 = _paths[p].address();
 					}
-					++j;
 				}
 			}
 		}
-		if (j < ZT_MAX_PEER_NETWORK_PATHS) {
-			_paths[j].lr = now;
-			_paths[j].p = np;
-			_paths[j].priority = newPriority;
-			++j;
-			while (j < ZT_MAX_PEER_NETWORK_PATHS) {
-				_paths[j].lr = 0;
-				_paths[j].p.zero();
-				_paths[j].priority = 1;
-				++j;
+	}
+}
+
+bool Peer::networkMembershipCertificatesAgree(uint64_t nwid,const CertificateOfMembership &com) const
+{
+	Mutex::Lock _l(_networkComs_m);
+	const _NetworkCom *ourCom = _networkComs.get(nwid);
+	if (ourCom)
+		return ourCom->com.agreesWith(com);
+	return false;
+}
+
+bool Peer::validateAndSetNetworkMembershipCertificate(uint64_t nwid,const CertificateOfMembership &com)
+{
+	// Sanity checks
+	if ((!com)||(com.issuedTo() != _id.address()))
+		return false;
+
+	// Return true if we already have this *exact* COM
+	{
+		Mutex::Lock _l(_networkComs_m);
+		_NetworkCom *ourCom = _networkComs.get(nwid);
+		if ((ourCom)&&(ourCom->com == com))
+			return true;
+	}
+
+	// Check signature, log and return if cert is invalid
+	if (com.signedBy() != Network::controllerFor(nwid)) {
+		TRACE("rejected network membership certificate for %.16llx signed by %s: signer not a controller of this network",(unsigned long long)nwid,com.signedBy().toString().c_str());
+		return false; // invalid signer
+	}
+
+	if (com.signedBy() == RR->identity.address()) {
+
+		// We are the controller: RR->identity.address() == controller() == cert.signedBy()
+		// So, verify that we signed th cert ourself
+		if (!com.verify(RR->identity)) {
+			TRACE("rejected network membership certificate for %.16llx self signed by %s: signature check failed",(unsigned long long)nwid,com.signedBy().toString().c_str());
+			return false; // invalid signature
+		}
+
+	} else {
+
+		SharedPtr<Peer> signer(RR->topology->getPeer(com.signedBy()));
+
+		if (!signer) {
+			// This would be rather odd, since this is our controller... could happen
+			// if we get packets before we've gotten config.
+			RR->sw->requestWhois(com.signedBy());
+			return false; // signer unknown
+		}
+
+		if (!com.verify(signer->identity())) {
+			TRACE("rejected network membership certificate for %.16llx signed by %s: signature check failed",(unsigned long long)nwid,com.signedBy().toString().c_str());
+			return false; // invalid signature
+		}
+	}
+
+	// If we made it past all those checks, add or update cert in our cert info store
+	{
+		Mutex::Lock _l(_networkComs_m);
+		_networkComs.set(nwid,_NetworkCom(RR->node->now(),com));
+	}
+
+	return true;
+}
+
+bool Peer::needsOurNetworkMembershipCertificate(uint64_t nwid,uint64_t now,bool updateLastPushedTime)
+{
+	Mutex::Lock _l(_networkComs_m);
+	uint64_t &lastPushed = _lastPushedComs[nwid];
+	const uint64_t tmp = lastPushed;
+	if (updateLastPushedTime)
+		lastPushed = now;
+	return ((now - tmp) >= (ZT_NETWORK_AUTOCONF_DELAY / 3));
+}
+
+void Peer::clean(uint64_t now)
+{
+	{
+		unsigned int np = _numPaths;
+		unsigned int x = 0;
+		unsigned int y = 0;
+		while (x < np) {
+			if (_paths[x].active(now))
+				_paths[y++] = _paths[x];
+			++x;
+		}
+		_numPaths = y;
+	}
+
+	{
+		Mutex::Lock _l(_networkComs_m);
+		{
+			uint64_t *k = (uint64_t *)0;
+			_NetworkCom *v = (_NetworkCom *)0;
+			Hashtable< uint64_t,_NetworkCom >::Iterator i(_networkComs);
+			while (i.next(k,v)) {
+				if ( (!RR->node->belongsToNetwork(*k)) && ((now - v->ts) >= ZT_PEER_NETWORK_COM_EXPIRATION) )
+					_networkComs.erase(*k);
+			}
+		}
+		{
+			uint64_t *k = (uint64_t *)0;
+			uint64_t *v = (uint64_t *)0;
+			Hashtable< uint64_t,uint64_t >::Iterator i(_lastPushedComs);
+			while (i.next(k,v)) {
+				if ((now - *v) > (ZT_NETWORK_AUTOCONF_DELAY * 2))
+					_lastPushedComs.erase(*k);
 			}
 		}
 	}
 }
 
-void Peer::resetWithinScope(void* tPtr, InetAddress::IpScope scope, int inetAddressFamily, int64_t now)
+void Peer::_doDeadPathDetection(Path &p,const uint64_t now)
 {
-	Mutex::Lock _l(_paths_m);
-	for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-		if (_paths[i].p) {
-			if ((_paths[i].p->address().ss_family == inetAddressFamily) && (_paths[i].p->ipScope() == scope)) {
-				attemptToContactAt(tPtr, _paths[i].p->localSocket(), _paths[i].p->address(), now, false);
-				_paths[i].p->sent(now);
-				_paths[i].lr = 0;	// path will not be used unless it speaks again
-			}
+	/* Dead path detection: if we have sent something to this peer and have not
+	 * yet received a reply, double check this path. The majority of outbound
+	 * packets including Ethernet frames do generate some kind of reply either
+	 * immediately or at some point in the near future. This will occasionally
+	 * (every NO_ANSWER_TIMEOUT ms) check paths unnecessarily if traffic that
+	 * does not generate a response is being sent such as multicast announcements
+	 * or frames belonging to unidirectional UDP protocols, but the cost is very
+	 * tiny and the benefit in reliability is very large. This takes care of many
+	 * failure modes including crap NATs that forget links and spurious changes
+	 * to physical network topology that cannot be otherwise detected.
+	 *
+	 * Each time we do this we increment a probation counter in the path. This
+	 * counter is reset on any packet receive over this path. If it reaches the
+	 * MAX_PROBATION threshold the path is considred dead. */
+
+	if (
+	     (p.lastSend() > p.lastReceived()) &&
+			 ((p.lastSend() - p.lastReceived()) >= ZT_PEER_DEAD_PATH_DETECTION_NO_ANSWER_TIMEOUT) &&
+			 ((now - p.lastPing()) >= ZT_PEER_DEAD_PATH_DETECTION_NO_ANSWER_TIMEOUT) &&
+			 (!p.isClusterSuboptimal()) &&
+			 (!RR->topology->amRoot())
+		 ) {
+		TRACE("%s(%s) does not seem to be answering in a timely manner, checking if dead (probation == %u)",_id.address().toString().c_str(),p.address().toString().c_str(),p.probation());
+
+		if ( (_vProto >= 5) && ( !((_vMajor == 1)&&(_vMinor == 1)&&(_vRevision == 0)) ) ) {
+			Packet outp(_id.address(),RR->identity.address(),Packet::VERB_ECHO);
+			outp.armor(_key,true);
+			p.send(RR,outp.data(),outp.size(),now);
+			p.pinged(now);
+		} else {
+			sendHELLO(p.localAddress(),p.address(),now);
+			p.sent(now);
+			p.pinged(now);
 		}
-		else {
-			break;
+
+		p.increaseProbation();
+	}
+}
+
+Path *Peer::_getBestPath(const uint64_t now)
+{
+	Path *bestPath = (Path *)0;
+	uint64_t bestPathScore = 0;
+	for(unsigned int i=0;i<_numPaths;++i) {
+		const uint64_t score = _paths[i].score();
+		if ((score >= bestPathScore)&&(_paths[i].active(now))) {
+			bestPathScore = score;
+			bestPath = &(_paths[i]);
 		}
 	}
+	if (bestPath)
+		_doDeadPathDetection(*bestPath,now);
+	return bestPath;
 }
 
-void Peer::recordOutgoingPacket(const SharedPtr<Path>& path, const uint64_t packetId, uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now)
+Path *Peer::_getBestPath(const uint64_t now,int inetAddressFamily)
 {
-#ifndef ZT_NO_PEER_METRICS
-	_outgoing_packet++;
-#endif
-	if (_localMultipathSupported && _bond) {
-		_bond->recordOutgoingPacket(path, packetId, payloadLength, verb, flowId, now);
+	Path *bestPath = (Path *)0;
+	uint64_t bestPathScore = 0;
+	for(unsigned int i=0;i<_numPaths;++i) {
+		const uint64_t score = _paths[i].score();
+		if (((int)_paths[i].address().ss_family == inetAddressFamily)&&(score >= bestPathScore)&&(_paths[i].active(now))) {
+			bestPathScore = score;
+			bestPath = &(_paths[i]);
+		}
 	}
+	if (bestPath)
+		_doDeadPathDetection(*bestPath,now);
+	return bestPath;
 }
 
-void Peer::recordIncomingInvalidPacket(const SharedPtr<Path>& path)
-{
-#ifndef ZT_NO_PEER_METRICS
-	_packet_errors++;
-#endif
-	if (_localMultipathSupported && _bond) {
-		_bond->recordIncomingInvalidPacket(path);
-	}
-}
-
-void Peer::recordIncomingPacket(const SharedPtr<Path>& path, const uint64_t packetId, uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now)
-{
-	if (_localMultipathSupported && _bond) {
-		_bond->recordIncomingPacket(path, packetId, payloadLength, verb, flowId, now);
-	}
-}
-
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Peer.hpp b/node/Peer.hpp
index 62524dee1..445535c8f 100644
--- a/node/Peer.hpp
+++ b/node/Peer.hpp
@@ -1,61 +1,67 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_PEER_HPP
 #define ZT_PEER_HPP
 
-#include "../include/ZeroTierOne.h"
-#include "AES.hpp"
-#include "Address.hpp"
-#include "AtomicCounter.hpp"
-#include "Bond.hpp"
+#include <stdint.h>
+
 #include "Constants.hpp"
-#include "Hashtable.hpp"
+
+#include <algorithm>
+#include <utility>
+#include <vector>
+#include <stdexcept>
+
+#include "../include/ZeroTierOne.h"
+
+#include "RuntimeEnvironment.hpp"
+#include "CertificateOfMembership.hpp"
+#include "Path.hpp"
+#include "Address.hpp"
+#include "Utils.hpp"
 #include "Identity.hpp"
 #include "InetAddress.hpp"
-#include "Metrics.hpp"
-#include "Mutex.hpp"
-#include "Node.hpp"
 #include "Packet.hpp"
-#include "Path.hpp"
-#include "RuntimeEnvironment.hpp"
 #include "SharedPtr.hpp"
-#include "Utils.hpp"
+#include "AtomicCounter.hpp"
+#include "Hashtable.hpp"
+#include "Mutex.hpp"
+#include "NonCopyable.hpp"
 
-#include <list>
-#include <vector>
-
-#define ZT_PEER_MAX_SERIALIZED_STATE_SIZE (sizeof(Peer) + 32 + (sizeof(Path) * 2))
+// Very rough computed estimate: (8 + 256 + 80 + (16 * 64) + (128 * 256) + (128 * 16))
+// 1048576 provides tons of headroom -- overflow would just cause peer not to be persisted
+#define ZT_PEER_SUGGESTED_SERIALIZATION_BUFFER_SIZE 1048576
 
 namespace ZeroTier {
 
 /**
  * Peer on P2P Network (virtual layer 1)
  */
-class Peer {
+class Peer : NonCopyable
+{
 	friend class SharedPtr<Peer>;
-	friend class SharedPtr<Bond>;
-	friend class Switch;
-	friend class Bond;
 
-  private:
-	Peer() = delete;   // disabled to prevent bugs -- should not be constructed uninitialized
+private:
+	Peer() {} // disabled to prevent bugs -- should not be constructed uninitialized
 
-  public:
-	~Peer()
-	{
-		Utils::burn(_key, sizeof(_key));
-	}
+public:
+	~Peer() { Utils::burn(_key,sizeof(_key)); }
 
 	/**
 	 * Construct a new peer
@@ -65,23 +71,29 @@ class Peer {
 	 * @param peerIdentity Identity of peer
 	 * @throws std::runtime_error Key agreement with peer's identity failed
 	 */
-	Peer(const RuntimeEnvironment* renv, const Identity& myIdentity, const Identity& peerIdentity);
+	Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Identity &peerIdentity);
+
+	/**
+	 * @return Time peer record was last used in any way
+	 */
+	inline uint64_t lastUsed() const throw() { return _lastUsed; }
+
+	/**
+	 * Log a use of this peer record (done by Topology when peers are looked up)
+	 *
+	 * @param now New time of last use
+	 */
+	inline void use(uint64_t now) throw() { _lastUsed = now; }
 
 	/**
 	 * @return This peer's ZT address (short for identity().address())
 	 */
-	inline const Address& address() const
-	{
-		return _id.address();
-	}
+	inline const Address &address() const throw() { return _id.address(); }
 
 	/**
 	 * @return This peer's identity
 	 */
-	inline const Identity& identity() const
-	{
-		return _id;
-	}
+	inline const Identity &identity() const throw() { return _id; }
 
 	/**
 	 * Log receipt of an authenticated packet
@@ -89,259 +101,154 @@ class Peer {
 	 * This is called by the decode pipe when a packet is proven to be authentic
 	 * and appears to be valid.
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param path Path over which packet was received
+	 * @param RR Runtime environment
+	 * @param localAddr Local address
+	 * @param remoteAddr Internet address of sender
 	 * @param hops ZeroTier (not IP) hops
 	 * @param packetId Packet ID
 	 * @param verb Packet verb
 	 * @param inRePacketId Packet ID in reply to (default: none)
 	 * @param inReVerb Verb in reply to (for OK/ERROR, default: VERB_NOP)
-	 * @param trustEstablished If true, some form of non-trivial trust (like allowed in network) has been established
-	 * @param networkId Network ID if this pertains to a network, or 0 otherwise
 	 */
 	void received(
-		void* tPtr,
-		const SharedPtr<Path>& path,
-		const unsigned int hops,
-		const uint64_t packetId,
-		const unsigned int payloadLength,
-		const Packet::Verb verb,
-		const uint64_t inRePacketId,
-		const Packet::Verb inReVerb,
-		const bool trustEstablished,
-		const uint64_t networkId,
-		const int32_t flowId);
+		const InetAddress &localAddr,
+		const InetAddress &remoteAddr,
+		unsigned int hops,
+		uint64_t packetId,
+		Packet::Verb verb,
+		uint64_t inRePacketId = 0,
+		Packet::Verb inReVerb = Packet::VERB_NOP);
 
 	/**
-	 * Check whether we have an active path to this peer via the given address
+	 * Get the current best direct path to this peer
 	 *
+	 * @param now Current time
+	 * @return Best path or NULL if there are no active direct paths
+	 */
+	inline Path *getBestPath(uint64_t now) { return _getBestPath(now); }
+
+	/**
 	 * @param now Current time
 	 * @param addr Remote address
 	 * @return True if we have an active path to this destination
 	 */
-	inline bool hasActivePathTo(int64_t now, const InetAddress& addr) const
+	inline bool hasActivePathTo(uint64_t now,const InetAddress &addr) const
 	{
-		Mutex::Lock _l(_paths_m);
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (_paths[i].p) {
-				if (((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION) && (_paths[i].p->address() == addr)) {
-					return true;
-				}
-			}
-			else {
-				break;
-			}
+		for(unsigned int p=0;p<_numPaths;++p) {
+			if ((_paths[p].active(now))&&(_paths[p].address() == addr))
+				return true;
 		}
 		return false;
 	}
 
 	/**
-	 * Send via best direct path
+	 * Set all paths in the same ss_family that are not this one to cluster suboptimal
+	 *
+	 * Addresses in other families are not affected.
+	 *
+	 * @param addr Address to make exclusive
+	 */
+	inline void setClusterOptimalPathForAddressFamily(const InetAddress &addr)
+	{
+		for(unsigned int p=0;p<_numPaths;++p) {
+			if (_paths[p].address().ss_family == addr.ss_family) {
+				_paths[p].setClusterSuboptimal(_paths[p].address() != addr);
+			}
+		}
+	}
+
+	/**
+	 * Send via best path
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param data Packet data
 	 * @param len Packet length
 	 * @param now Current time
-	 * @param force If true, send even if path is not alive
-	 * @return True if we actually sent something
+	 * @return Path used on success or NULL on failure
 	 */
-	inline bool sendDirect(void* tPtr, const void* data, unsigned int len, int64_t now, bool force)
+	inline Path *send(const void *data,unsigned int len,uint64_t now)
 	{
-		SharedPtr<Path> bp(getAppropriatePath(now, force));
-		if (bp) {
-			return bp->send(RR, tPtr, data, len, now);
+		Path *const bestPath = getBestPath(now);
+		if (bestPath) {
+			if (bestPath->send(RR,data,len,now))
+				return bestPath;
 		}
-		return false;
+		return (Path *)0;
 	}
 
-	/**
-	 * Record incoming packets to
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param path Path over which packet was received
-	 * @param packetId Packet ID
-	 * @param payloadLength Length of packet data payload
-	 * @param verb Packet verb
-	 * @param flowId Flow ID
-	 * @param now Current time
-	 */
-	void recordIncomingPacket(const SharedPtr<Path>& path, const uint64_t packetId, uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now);
-
-	/**
-	 *
-	 * @param path Path over which packet is being sent
-	 * @param packetId Packet ID
-	 * @param payloadLength Length of packet data payload
-	 * @param verb Packet verb
-	 * @param flowId Flow ID
-	 * @param now Current time
-	 */
-	void recordOutgoingPacket(const SharedPtr<Path>& path, const uint64_t packetId, uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now);
-
-	/**
-	 * Record an invalid incoming packet. This packet failed
-	 * MAC/compression/cipher checks and will now contribute to a
-	 * Packet Error Ratio (PER).
-	 *
-	 * @param path Path over which packet was received
-	 */
-	void recordIncomingInvalidPacket(const SharedPtr<Path>& path);
-
-	/**
-	 * Get the most appropriate direct path based on current multipath and QoS configuration
-	 *
-	 * @param now Current time
-	 * @param includeExpired If true, include even expired paths
-	 * @return Best current path or NULL if none
-	 */
-	SharedPtr<Path> getAppropriatePath(int64_t now, bool includeExpired, int32_t flowId = -1);
-
-	/**
-	 * Send VERB_RENDEZVOUS to this and another peer via the best common IP scope and path
-	 */
-	void introduce(void* const tPtr, const int64_t now, const SharedPtr<Peer>& other) const;
-
 	/**
 	 * Send a HELLO to this peer at a specified physical address
 	 *
-	 * No statistics or sent times are updated here.
+	 * This does not update any statistics. It's used to send initial HELLOs
+	 * for NAT traversal and path verification.
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param localSocket Local source socket
+	 * @param localAddr Local address
 	 * @param atAddress Destination address
 	 * @param now Current time
+	 * @param ttl Desired IP TTL (default: 0 to leave alone)
 	 */
-	void sendHELLO(void* tPtr, const int64_t localSocket, const InetAddress& atAddress, int64_t now);
-
-	/**
-	 * Send ECHO (or HELLO for older peers) to this peer at the given address
-	 *
-	 * No statistics or sent times are updated here.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param localSocket Local source socket
-	 * @param atAddress Destination address
-	 * @param now Current time
-	 * @param sendFullHello If true, always send a full HELLO instead of just an ECHO
-	 */
-	void attemptToContactAt(void* tPtr, const int64_t localSocket, const InetAddress& atAddress, int64_t now, bool sendFullHello);
-
-	/**
-	 * Try a memorized or statically defined path if any are known
-	 *
-	 * Under the hood this is done periodically based on ZT_TRY_MEMORIZED_PATH_INTERVAL.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param now Current time
-	 */
-	void tryMemorizedPath(void* tPtr, int64_t now);
-
-	/**
-	 * A check to be performed periodically which determines whether multipath communication is
-	 * possible with this peer. This check should be performed early in the life-cycle of the peer
-	 * as well as during the process of learning new paths.
-	 */
-	void performMultipathStateCheck(void* tPtr, int64_t now);
+	void sendHELLO(const InetAddress &localAddr,const InetAddress &atAddress,uint64_t now,unsigned int ttl = 0);
 
 	/**
 	 * Send pings or keepalives depending on configured timeouts
 	 *
-	 * This also cleans up some internal data structures. It's called periodically from Node.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param now Current time
-	 * @param inetAddressFamily Keep this address family alive, or -1 for any
-	 * @return 0 if nothing sent or bit mask: bit 0x1 if IPv4 sent, bit 0x2 if IPv6 sent (0x3 means both sent)
+	 * @param inetAddressFamily Keep this address family alive, or 0 to simply pick current best ignoring family
+	 * @return True if at least one direct path seems alive
 	 */
-	unsigned int doPingAndKeepalive(void* tPtr, int64_t now);
+	bool doPingAndKeepalive(uint64_t now,int inetAddressFamily);
 
 	/**
-	 * Process a cluster redirect sent by this peer
+	 * Push direct paths back to self if we haven't done so in the configured timeout
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param originatingPath Path from which redirect originated
-	 * @param remoteAddress Remote address
+	 * @param localAddr Local address
+	 * @param toAddress Remote address to send push to (usually from path)
 	 * @param now Current time
+	 * @param force If true, push regardless of rate limit
+	 * @param includePrivatePaths If true, include local interface address paths (should only be done to peers with a trust relationship)
+	 * @return True if something was actually sent
 	 */
-	void clusterRedirect(void* tPtr, const SharedPtr<Path>& originatingPath, const InetAddress& remoteAddress, const int64_t now);
+	bool pushDirectPaths(const InetAddress &localAddr,const InetAddress &toAddress,uint64_t now,bool force,bool includePrivatePaths);
 
 	/**
-	 * Reset paths within a given IP scope and address family
-	 *
-	 * Resetting a path involves sending an ECHO to it and then deactivating
-	 * it until or unless it responds. This is done when we detect a change
-	 * to our external IP or another system change that might invalidate
-	 * many or all current paths.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param scope IP scope
-	 * @param inetAddressFamily Family e.g. AF_INET
-	 * @param now Current time
+	 * @return All known direct paths to this peer (active or inactive)
 	 */
-	void resetWithinScope(void* tPtr, InetAddress::IpScope scope, int inetAddressFamily, int64_t now);
-
-	/**
-	 * @param now Current time
-	 * @return All known paths to this peer
-	 */
-	inline std::vector<SharedPtr<Path> > paths(const int64_t now) const
+	inline std::vector<Path> paths() const
 	{
-		std::vector<SharedPtr<Path> > pp;
-		Mutex::Lock _l(_paths_m);
-		for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-			if (! _paths[i].p) {
-				break;
-			}
-			pp.push_back(_paths[i].p);
-		}
+		std::vector<Path> pp;
+		for(unsigned int p=0,np=_numPaths;p<np;++p)
+			pp.push_back(_paths[p]);
 		return pp;
 	}
 
 	/**
 	 * @return Time of last receive of anything, whether direct or relayed
 	 */
-	inline int64_t lastReceive() const
-	{
-		return _lastReceive;
-	}
+	inline uint64_t lastReceive() const throw() { return _lastReceive; }
 
 	/**
-	 * @return True if we've heard from this peer in less than ZT_PEER_ACTIVITY_TIMEOUT
+	 * @return Time of most recent unicast frame received
 	 */
-	inline bool isAlive(const int64_t now) const
-	{
-		return ((now - _lastReceive) < ZT_PEER_ACTIVITY_TIMEOUT);
-	}
+	inline uint64_t lastUnicastFrame() const throw() { return _lastUnicastFrame; }
+
+	/**
+	 * @return Time of most recent multicast frame received
+	 */
+	inline uint64_t lastMulticastFrame() const throw() { return _lastMulticastFrame; }
+
+	/**
+	 * @return Time of most recent frame of any kind (unicast or multicast)
+	 */
+	inline uint64_t lastFrame() const throw() { return std::max(_lastUnicastFrame,_lastMulticastFrame); }
 
 	/**
 	 * @return True if this peer has sent us real network traffic recently
 	 */
-	inline int64_t isActive(int64_t now) const
-	{
-		return ((now - _lastNontrivialReceive) < ZT_PEER_ACTIVITY_TIMEOUT);
-	}
-
-	inline int64_t lastSentFullHello()
-	{
-		return _lastSentFullHello;
-	}
+	inline uint64_t activelyTransferringFrames(uint64_t now) const throw() { return ((now - lastFrame()) < ZT_PEER_ACTIVITY_TIMEOUT); }
 
 	/**
-	 * @return Latency in milliseconds of best/aggregate path or 0xffff if unknown / no paths
+	 * @return Latency in milliseconds or 0 if unknown
 	 */
-	inline unsigned int latency(const int64_t now)
-	{
-		if (_localMultipathSupported) {
-			return (int)_lastComputedAggregateMeanLatency;
-		}
-		else {
-			SharedPtr<Path> bp(getAppropriatePath(now, false));
-			if (bp) {
-				return (unsigned int)bp->latency();
-			}
-			return 0xffff;
-		}
-	}
+	inline unsigned int latency() const { return _latency; }
 
 	/**
 	 * This computes a quality score for relays and root servers
@@ -354,26 +261,71 @@ class Peer {
 	 *
 	 * @return Relay quality score computed from latency and other factors, lower is better
 	 */
-	inline unsigned int relayQuality(const int64_t now)
+	inline unsigned int relayQuality(const uint64_t now) const
 	{
 		const uint64_t tsr = now - _lastReceive;
-		if (tsr >= ZT_PEER_ACTIVITY_TIMEOUT) {
+		if (tsr >= ZT_PEER_ACTIVITY_TIMEOUT)
 			return (~(unsigned int)0);
-		}
-		unsigned int l = latency(now);
-		if (! l) {
+		unsigned int l = _latency;
+		if (!l)
 			l = 0xffff;
-		}
-		return (l * (((unsigned int)tsr / (ZT_PEER_PING_PERIOD + 1000)) + 1));
+		return (l * (((unsigned int)tsr / (ZT_PEER_DIRECT_PING_DELAY + 1000)) + 1));
 	}
 
+	/**
+	 * Update latency with a new direct measurment
+	 *
+	 * @param l Direct latency measurment in ms
+	 */
+	inline void addDirectLatencyMeasurment(unsigned int l)
+	{
+		unsigned int ol = _latency;
+		if ((ol > 0)&&(ol < 10000))
+			_latency = (ol + std::min(l,(unsigned int)65535)) / 2;
+		else _latency = std::min(l,(unsigned int)65535);
+	}
+
+	/**
+	 * @param now Current time
+	 * @return True if this peer has at least one active direct path
+	 */
+	inline bool hasActiveDirectPath(uint64_t now) const
+	{
+		for(unsigned int p=0;p<_numPaths;++p) {
+			if (_paths[p].active(now))
+				return true;
+		}
+		return false;
+	}
+
+#ifdef ZT_ENABLE_CLUSTER
+	/**
+	 * @param now Current time
+	 * @return True if this peer has at least one active direct path that is not cluster-suboptimal
+	 */
+	inline bool hasClusterOptimalPath(uint64_t now) const
+	{
+		for(unsigned int p=0,np=_numPaths;p<np;++p) {
+			if ((_paths[p].active(now))&&(!_paths[p].isClusterSuboptimal()))
+				return true;
+		}
+		return false;
+	}
+#endif
+
+	/**
+	 * Reset paths within a given scope
+	 *
+	 * @param scope IP scope of paths to reset
+	 * @param now Current time
+	 * @return True if at least one path was forgotten
+	 */
+	bool resetWithinScope(InetAddress::IpScope scope,uint64_t now);
+
 	/**
 	 * @return 256-bit secret symmetric encryption key
 	 */
-	inline const unsigned char* key() const
-	{
-		return _key;
-	}
+	inline const unsigned char *key() const throw() { return _key; }
 
 	/**
 	 * Set the currently known remote version of this peer's client
@@ -383,7 +335,7 @@ class Peer {
 	 * @param vmin Minor version
 	 * @param vrev Revision
 	 */
-	inline void setRemoteVersion(unsigned int vproto, unsigned int vmaj, unsigned int vmin, unsigned int vrev)
+	inline void setRemoteVersion(unsigned int vproto,unsigned int vmaj,unsigned int vmin,unsigned int vrev)
 	{
 		_vProto = (uint16_t)vproto;
 		_vMajor = (uint16_t)vmaj;
@@ -391,362 +343,272 @@ class Peer {
 		_vRevision = (uint16_t)vrev;
 	}
 
-	inline unsigned int remoteVersionProtocol() const
-	{
-		return _vProto;
-	}
-	inline unsigned int remoteVersionMajor() const
-	{
-		return _vMajor;
-	}
-	inline unsigned int remoteVersionMinor() const
-	{
-		return _vMinor;
-	}
-	inline unsigned int remoteVersionRevision() const
-	{
-		return _vRevision;
-	}
+	inline unsigned int remoteVersionProtocol() const throw() { return _vProto; }
+	inline unsigned int remoteVersionMajor() const throw() { return _vMajor; }
+	inline unsigned int remoteVersionMinor() const throw() { return _vMinor; }
+	inline unsigned int remoteVersionRevision() const throw() { return _vRevision; }
 
-	inline bool remoteVersionKnown() const
-	{
-		return ((_vMajor > 0) || (_vMinor > 0) || (_vRevision > 0));
-	}
+	inline bool remoteVersionKnown() const throw() { return ((_vMajor > 0)||(_vMinor > 0)||(_vRevision > 0)); }
 
 	/**
-	 * @return True if peer has received a trust established packet (e.g. common network membership) in the past ZT_TRUST_EXPIRATION ms
+	 * Get most recently active path addresses for IPv4 and/or IPv6
+	 *
+	 * Note that v4 and v6 are not modified if they are not found, so
+	 * initialize these to a NULL address to be able to check.
+	 *
+	 * @param now Current time
+	 * @param v4 Result parameter to receive active IPv4 address, if any
+	 * @param v6 Result parameter to receive active IPv6 address, if any
 	 */
-	inline bool trustEstablished(const int64_t now) const
-	{
-		return ((now - _lastTrustEstablishedPacketReceived) < ZT_TRUST_EXPIRATION);
-	}
+	void getBestActiveAddresses(uint64_t now,InetAddress &v4,InetAddress &v6) const;
 
 	/**
-	 * Rate limit gate for VERB_PUSH_DIRECT_PATHS
+	 * Check network COM agreement with this peer
+	 *
+	 * @param nwid Network ID
+	 * @param com Another certificate of membership
+	 * @return True if supplied COM agrees with ours, false if not or if we don't have one
 	 */
-	inline bool rateGatePushDirectPaths(const int64_t now)
+	bool networkMembershipCertificatesAgree(uint64_t nwid,const CertificateOfMembership &com) const;
+
+	/**
+	 * Check the validity of the COM and add/update if valid and new
+	 *
+	 * @param nwid Network ID
+	 * @param com Externally supplied COM
+	 */
+	bool validateAndSetNetworkMembershipCertificate(uint64_t nwid,const CertificateOfMembership &com);
+
+	/**
+	 * @param nwid Network ID
+	 * @param now Current time
+	 * @param updateLastPushedTime If true, go ahead and update the last pushed time regardless of return value
+	 * @return Whether or not this peer needs another COM push from us
+	 */
+	bool needsOurNetworkMembershipCertificate(uint64_t nwid,uint64_t now,bool updateLastPushedTime);
+
+	/**
+	 * Perform periodic cleaning operations
+	 *
+	 * @param now Current time
+	 */
+	void clean(uint64_t now);
+
+	/**
+	 * Update direct path push stats and return true if we should respond
+	 *
+	 * This is a circuit breaker to make VERB_PUSH_DIRECT_PATHS not particularly
+	 * useful as a DDOS amplification attack vector. Otherwise a malicious peer
+	 * could send loads of these and cause others to bombard arbitrary IPs with
+	 * traffic.
+	 *
+	 * @param now Current time
+	 * @return True if we should respond
+	 */
+	inline bool shouldRespondToDirectPathPush(const uint64_t now)
 	{
-		if ((now - _lastDirectPathPushReceive) <= ZT_PUSH_DIRECT_PATHS_CUTOFF_TIME) {
+		if ((now - _lastDirectPathPushReceive) <= ZT_PUSH_DIRECT_PATHS_CUTOFF_TIME)
 			++_directPathPushCutoffCount;
-		}
-		else {
-			_directPathPushCutoffCount = 0;
-		}
+		else _directPathPushCutoffCount = 0;
 		_lastDirectPathPushReceive = now;
 		return (_directPathPushCutoffCount < ZT_PUSH_DIRECT_PATHS_CUTOFF_LIMIT);
 	}
 
 	/**
-	 * Rate limit gate for VERB_NETWORK_CREDENTIALS
-	 */
-	inline bool rateGateCredentialsReceived(const int64_t now)
-	{
-		if ((now - _lastCredentialsReceived) >= ZT_PEER_CREDENTIALS_RATE_LIMIT) {
-			_lastCredentialsReceived = now;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Rate limit gate for sending of ERROR_NEED_MEMBERSHIP_CERTIFICATE
-	 */
-	inline bool rateGateRequestCredentials(const int64_t now)
-	{
-		if ((now - _lastCredentialRequestSent) >= ZT_PEER_GENERAL_RATE_LIMIT) {
-			_lastCredentialRequestSent = now;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Rate limit gate for inbound WHOIS requests
-	 */
-	inline bool rateGateInboundWhoisRequest(const int64_t now)
-	{
-		if ((now - _lastWhoisRequestReceived) >= ZT_PEER_WHOIS_RATE_LIMIT) {
-			_lastWhoisRequestReceived = now;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * See definition in Bond
-	 */
-	inline bool rateGateQoS(int64_t now, SharedPtr<Path>& path)
-	{
-		Mutex::Lock _l(_bond_m);
-		if (_bond) {
-			return _bond->rateGateQoS(now, path);
-		}
-		return false;	// Default behavior. If there is no bond, we drop these
-	}
-
-	/**
-	 * See definition in Bond
-	 */
-	void receivedQoS(const SharedPtr<Path>& path, int64_t now, int count, uint64_t* rx_id, uint16_t* rx_ts)
-	{
-		Mutex::Lock _l(_bond_m);
-		if (_bond) {
-			_bond->receivedQoS(path, now, count, rx_id, rx_ts);
-		}
-	}
-
-	/**
-	 * See definition in Bond
-	 */
-	void processIncomingPathNegotiationRequest(uint64_t now, SharedPtr<Path>& path, int16_t remoteUtility)
-	{
-		Mutex::Lock _l(_bond_m);
-		if (_bond) {
-			_bond->processIncomingPathNegotiationRequest(now, path, remoteUtility);
-		}
-	}
-
-	/**
-	 * See definition in Bond
-	 */
-	inline bool rateGatePathNegotiation(int64_t now, SharedPtr<Path>& path)
-	{
-		Mutex::Lock _l(_bond_m);
-		if (_bond) {
-			return _bond->rateGatePathNegotiation(now, path);
-		}
-		return false;	// Default behavior. If there is no bond, we drop these
-	}
-
-	/**
-	 * See definition in Bond
-	 */
-	bool flowHashingSupported()
-	{
-		Mutex::Lock _l(_bond_m);
-		if (_bond) {
-			return _bond->flowHashingSupported();
-		}
-		return false;
-	}
-
-	/**
-	 * Serialize a peer for storage in local cache
+	 * Find a common set of addresses by which two peers can link, if any
 	 *
-	 * This does not serialize everything, just non-ephemeral information.
+	 * @param a Peer A
+	 * @param b Peer B
+	 * @param now Current time
+	 * @return Pair: B's address (to send to A), A's address (to send to B)
 	 */
-	template <unsigned int C> inline void serializeForCache(Buffer<C>& b) const
+	static inline std::pair<InetAddress,InetAddress> findCommonGround(const Peer &a,const Peer &b,uint64_t now)
 	{
-		b.append((uint8_t)2);
+		std::pair<InetAddress,InetAddress> v4,v6;
+		b.getBestActiveAddresses(now,v4.first,v6.first);
+		a.getBestActiveAddresses(now,v4.second,v6.second);
+		if ((v6.first)&&(v6.second)) // prefer IPv6 if both have it since NAT-t is (almost) unnecessary
+			return v6;
+		else if ((v4.first)&&(v4.second))
+			return v4;
+		else return std::pair<InetAddress,InetAddress>();
+	}
 
-		_id.serialize(b);
+	template<unsigned int C>
+	inline void serialize(Buffer<C> &b) const
+	{
+		Mutex::Lock _l(_networkComs_m);
 
+		const unsigned int recSizePos = b.size();
+		b.addSize(4); // space for uint32_t field length
+
+		b.append((uint16_t)1); // version of serialized Peer data
+
+		_id.serialize(b,false);
+
+		b.append((uint64_t)_lastUsed);
+		b.append((uint64_t)_lastReceive);
+		b.append((uint64_t)_lastUnicastFrame);
+		b.append((uint64_t)_lastMulticastFrame);
+		b.append((uint64_t)_lastAnnouncedTo);
+		b.append((uint64_t)_lastDirectPathPushSent);
+		b.append((uint64_t)_lastDirectPathPushReceive);
+		b.append((uint64_t)_lastPathSort);
 		b.append((uint16_t)_vProto);
 		b.append((uint16_t)_vMajor);
 		b.append((uint16_t)_vMinor);
 		b.append((uint16_t)_vRevision);
+		b.append((uint32_t)_latency);
+		b.append((uint16_t)_directPathPushCutoffCount);
 
+		b.append((uint16_t)_numPaths);
+		for(unsigned int i=0;i<_numPaths;++i)
+			_paths[i].serialize(b);
+
+		b.append((uint32_t)_networkComs.size());
 		{
-			Mutex::Lock _l(_paths_m);
-			unsigned int pc = 0;
-			for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-				if (_paths[i].p) {
-					++pc;
-				}
-				else {
-					break;
-				}
-			}
-			b.append((uint16_t)pc);
-			for (unsigned int i = 0; i < pc; ++i) {
-				_paths[i].p->address().serialize(b);
+			uint64_t *k = (uint64_t *)0;
+			_NetworkCom *v = (_NetworkCom *)0;
+			Hashtable<uint64_t,_NetworkCom>::Iterator i(const_cast<Peer *>(this)->_networkComs);
+			while (i.next(k,v)) {
+				b.append((uint64_t)*k);
+				b.append((uint64_t)v->ts);
+				v->com.serialize(b);
 			}
 		}
+
+		b.append((uint32_t)_lastPushedComs.size());
+		{
+			uint64_t *k = (uint64_t *)0;
+			uint64_t *v = (uint64_t *)0;
+			Hashtable<uint64_t,uint64_t>::Iterator i(const_cast<Peer *>(this)->_lastPushedComs);
+			while (i.next(k,v)) {
+				b.append((uint64_t)*k);
+				b.append((uint64_t)*v);
+			}
+		}
+
+		b.template setAt<uint32_t>(recSizePos,(uint32_t)(b.size() - (recSizePos + 4))); // set size
 	}
 
-	template <unsigned int C> inline static SharedPtr<Peer> deserializeFromCache(int64_t now, void* tPtr, Buffer<C>& b, const RuntimeEnvironment* renv)
+	/**
+	 * Create a new Peer from a serialized instance
+	 *
+	 * @param renv Runtime environment
+	 * @param myIdentity This node's identity
+	 * @param b Buffer containing serialized Peer data
+	 * @param p Pointer to current position in buffer, will be updated in place as buffer is read (value/result)
+	 * @return New instance of Peer or NULL if serialized data was corrupt or otherwise invalid (may also throw an exception via Buffer)
+	 */
+	template<unsigned int C>
+	static inline SharedPtr<Peer> deserializeNew(const RuntimeEnvironment *renv,const Identity &myIdentity,const Buffer<C> &b,unsigned int &p)
 	{
-		try {
-			unsigned int ptr = 0;
-			if (b[ptr++] != 2) {
-				return SharedPtr<Peer>();
-			}
+		const unsigned int recSize = b.template at<uint32_t>(p); p += 4;
+		if ((p + recSize) > b.size())
+			return SharedPtr<Peer>(); // size invalid
+		if (b.template at<uint16_t>(p) != 1)
+			return SharedPtr<Peer>(); // version mismatch
+		p += 2;
 
-			Identity id;
-			ptr += id.deserialize(b, ptr);
-			if (! id) {
-				return SharedPtr<Peer>();
-			}
-
-			SharedPtr<Peer> p(new Peer(renv, renv->identity, id));
-
-			p->_vProto = b.template at<uint16_t>(ptr);
-			ptr += 2;
-			p->_vMajor = b.template at<uint16_t>(ptr);
-			ptr += 2;
-			p->_vMinor = b.template at<uint16_t>(ptr);
-			ptr += 2;
-			p->_vRevision = b.template at<uint16_t>(ptr);
-			ptr += 2;
-
-			// When we deserialize from the cache we don't actually restore paths. We
-			// just try them and then re-learn them if they happen to still be up.
-			// Paths are fairly ephemeral in the real world in most cases.
-			const unsigned int tryPathCount = b.template at<uint16_t>(ptr);
-			ptr += 2;
-			for (unsigned int i = 0; i < tryPathCount; ++i) {
-				InetAddress inaddr;
-				try {
-					ptr += inaddr.deserialize(b, ptr);
-					if (inaddr) {
-						p->attemptToContactAt(tPtr, -1, inaddr, now, true);
-					}
-				}
-				catch (...) {
-					break;
-				}
-			}
-
-			return p;
-		}
-		catch (...) {
+		Identity npid;
+		p += npid.deserialize(b,p);
+		if (!npid)
 			return SharedPtr<Peer>();
+
+		SharedPtr<Peer> np(new Peer(renv,myIdentity,npid));
+
+		np->_lastUsed = b.template at<uint64_t>(p); p += 8;
+		np->_lastReceive = b.template at<uint64_t>(p); p += 8;
+		np->_lastUnicastFrame = b.template at<uint64_t>(p); p += 8;
+		np->_lastMulticastFrame = b.template at<uint64_t>(p); p += 8;
+		np->_lastAnnouncedTo = b.template at<uint64_t>(p); p += 8;
+		np->_lastDirectPathPushSent = b.template at<uint64_t>(p); p += 8;
+		np->_lastDirectPathPushReceive = b.template at<uint64_t>(p); p += 8;
+		np->_lastPathSort = b.template at<uint64_t>(p); p += 8;
+		np->_vProto = b.template at<uint16_t>(p); p += 2;
+		np->_vMajor = b.template at<uint16_t>(p); p += 2;
+		np->_vMinor = b.template at<uint16_t>(p); p += 2;
+		np->_vRevision = b.template at<uint16_t>(p); p += 2;
+		np->_latency = b.template at<uint32_t>(p); p += 4;
+		np->_directPathPushCutoffCount = b.template at<uint16_t>(p); p += 2;
+
+		const unsigned int numPaths = b.template at<uint16_t>(p); p += 2;
+		for(unsigned int i=0;i<numPaths;++i) {
+			if (i < ZT_MAX_PEER_NETWORK_PATHS) {
+				p += np->_paths[np->_numPaths++].deserialize(b,p);
+			} else {
+				// Skip any paths beyond max, but still read stream
+				Path foo;
+				p += foo.deserialize(b,p);
+			}
 		}
-	}
 
-	/**
-	 * @return The bonding policy used to reach this peer
-	 */
-	SharedPtr<Bond> bond()
-	{
-		return _bond;
-	}
-
-	/**
-	 * @return The bonding policy used to reach this peer
-	 */
-	inline int8_t bondingPolicy()
-	{
-		Mutex::Lock _l(_bond_m);
-		if (_bond) {
-			return _bond->policy();
+		const unsigned int numNetworkComs = b.template at<uint32_t>(p); p += 4;
+		for(unsigned int i=0;i<numNetworkComs;++i) {
+			_NetworkCom &c = np->_networkComs[b.template at<uint64_t>(p)]; p += 8;
+			c.ts = b.template at<uint64_t>(p); p += 8;
+			p += c.com.deserialize(b,p);
 		}
-		return ZT_BOND_POLICY_NONE;
-	}
 
-	/**
-	 * @return the number of links in this bond which are considered alive
-	 */
-	inline uint8_t getNumAliveLinks()
-	{
-		Mutex::Lock _l(_paths_m);
-		if (_bond) {
-			return _bond->getNumAliveLinks();
+		const unsigned int numLastPushed = b.template at<uint32_t>(p); p += 4;
+		for(unsigned int i=0;i<numLastPushed;++i) {
+			const uint64_t nwid = b.template at<uint64_t>(p); p += 8;
+			const uint64_t ts = b.template at<uint64_t>(p); p += 8;
+			np->_lastPushedComs.set(nwid,ts);
 		}
-		return 0;
+
+		return np;
 	}
 
-	/**
-	 * @return the number of links in this bond
-	 */
-	inline uint8_t getNumTotalLinks()
-	{
-		Mutex::Lock _l(_paths_m);
-		if (_bond) {
-			return _bond->getNumTotalLinks();
-		}
-		return 0;
-	}
+private:
+	void _doDeadPathDetection(Path &p,const uint64_t now);
+	Path *_getBestPath(const uint64_t now);
+	Path *_getBestPath(const uint64_t now,int inetAddressFamily);
 
-	// inline const AES *aesKeysIfSupported() const
-	//{ return (const AES *)0; }
-
-	inline const AES* aesKeysIfSupported() const
-	{
-		return (_vProto >= 12) ? _aesKeys : (const AES*)0;
-	}
-
-	inline const AES* aesKeys() const
-	{
-		return _aesKeys;
-	}
-
-  private:
-	struct _PeerPath {
-		_PeerPath() : lr(0), p(), priority(1)
-		{
-		}
-		int64_t lr;	  // time of last valid ZeroTier packet
-		SharedPtr<Path> p;
-		long priority;	 // >= 1, higher is better
-	};
-
-	uint8_t _key[ZT_SYMMETRIC_KEY_SIZE];
-	AES _aesKeys[2];
-
-	const RuntimeEnvironment* RR;
-
-	int64_t _lastReceive;			  // direct or indirect
-	int64_t _lastNontrivialReceive;	  // frames, things like netconf, etc.
-	int64_t _lastTriedMemorizedPath;
-	int64_t _lastDirectPathPushSent;
-	int64_t _lastDirectPathPushReceive;
-	int64_t _lastCredentialRequestSent;
-	int64_t _lastWhoisRequestReceived;
-	int64_t _lastCredentialsReceived;
-	int64_t _lastTrustEstablishedPacketReceived;
-	int64_t _lastSentFullHello;
-	int64_t _lastEchoCheck;
-
-	unsigned char _freeRandomByte;
+	unsigned char _key[ZT_PEER_SECRET_KEY_LENGTH]; // computed with key agreement, not serialized
 
+	const RuntimeEnvironment *RR;
+	uint64_t _lastUsed;
+	uint64_t _lastReceive; // direct or indirect
+	uint64_t _lastUnicastFrame;
+	uint64_t _lastMulticastFrame;
+	uint64_t _lastAnnouncedTo;
+	uint64_t _lastDirectPathPushSent;
+	uint64_t _lastDirectPathPushReceive;
+	uint64_t _lastPathSort;
 	uint16_t _vProto;
 	uint16_t _vMajor;
 	uint16_t _vMinor;
 	uint16_t _vRevision;
-
-	std::list<std::pair<Path*, int64_t> > _lastTriedPath;
-	Mutex _lastTriedPath_m;
-
-	_PeerPath _paths[ZT_MAX_PEER_NETWORK_PATHS];
-	Mutex _paths_m;
-	Mutex _bond_m;
-
-	bool _isLeaf;
-
 	Identity _id;
-
+	Path _paths[ZT_MAX_PEER_NETWORK_PATHS];
+	unsigned int _numPaths;
+	unsigned int _latency;
 	unsigned int _directPathPushCutoffCount;
-	unsigned int _echoRequestCutoffCount;
+
+	struct _NetworkCom
+	{
+		_NetworkCom() {}
+		_NetworkCom(uint64_t t,const CertificateOfMembership &c) : ts(t),com(c) {}
+		uint64_t ts;
+		CertificateOfMembership com;
+	};
+	Hashtable<uint64_t,_NetworkCom> _networkComs;
+	Hashtable<uint64_t,uint64_t> _lastPushedComs;
+	Mutex _networkComs_m;
 
 	AtomicCounter __refCount;
-
-	bool _localMultipathSupported;
-
-	volatile bool _shouldCollectPathStatistics;
-
-	int32_t _lastComputedAggregateMeanLatency;
-
-	SharedPtr<Bond> _bond;
-
-#ifndef ZT_NO_PEER_METRICS
-	prometheus::Histogram<uint64_t>& _peer_latency;
-	prometheus::simpleapi::gauge_metric_t _alive_path_count;
-	prometheus::simpleapi::gauge_metric_t _dead_path_count;
-	prometheus::simpleapi::counter_metric_t _incoming_packet;
-	prometheus::simpleapi::counter_metric_t _outgoing_packet;
-	prometheus::simpleapi::counter_metric_t _packet_errors;
-#endif
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 // Add a swap() for shared ptr's to peers to speed up peer sorts
 namespace std {
-template <> inline void swap(ZeroTier::SharedPtr<ZeroTier::Peer>& a, ZeroTier::SharedPtr<ZeroTier::Peer>& b)
-{
-	a.swap(b);
+	template<>
+	inline void swap(ZeroTier::SharedPtr<ZeroTier::Peer> &a,ZeroTier::SharedPtr<ZeroTier::Peer> &b)
+	{
+		a.swap(b);
+	}
 }
-}	// namespace std
 
 #endif
diff --git a/node/Poly1305.cpp b/node/Poly1305.cpp
index 78d1c1da4..b78071f65 100644
--- a/node/Poly1305.cpp
+++ b/node/Poly1305.cpp
@@ -4,70 +4,169 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "Constants.hpp"
 #include "Poly1305.hpp"
 
-#include "Constants.hpp"
-
-#include <stdint.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #ifdef __WINDOWS__
-#pragma warning(disable : 4146)
+#pragma warning(disable: 4146)
 #endif
 
 namespace ZeroTier {
 
+#if 0
+
+// "Naive" implementation, which is slower... might still want this on some older
+// or weird platforms if the later versions have issues.
+
+static inline void add(unsigned int h[17],const unsigned int c[17])
+{
+  unsigned int j;
+  unsigned int u;
+  u = 0;
+  for (j = 0;j < 17;++j) { u += h[j] + c[j]; h[j] = u & 255; u >>= 8; }
+}
+
+static inline void squeeze(unsigned int h[17])
+{
+  unsigned int j;
+  unsigned int u;
+  u = 0;
+  for (j = 0;j < 16;++j) { u += h[j]; h[j] = u & 255; u >>= 8; }
+  u += h[16]; h[16] = u & 3;
+  u = 5 * (u >> 2);
+  for (j = 0;j < 16;++j) { u += h[j]; h[j] = u & 255; u >>= 8; }
+  u += h[16]; h[16] = u;
+}
+
+static const unsigned int minusp[17] = {
+  5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252
+} ;
+
+static inline void freeze(unsigned int h[17])
+{
+  unsigned int horig[17];
+  unsigned int j;
+  unsigned int negative;
+  for (j = 0;j < 17;++j) horig[j] = h[j];
+  add(h,minusp);
+  negative = -(h[16] >> 7);
+  for (j = 0;j < 17;++j) h[j] ^= negative & (horig[j] ^ h[j]);
+}
+
+static inline void mulmod(unsigned int h[17],const unsigned int r[17])
+{
+  unsigned int hr[17];
+  unsigned int i;
+  unsigned int j;
+  unsigned int u;
+
+  for (i = 0;i < 17;++i) {
+    u = 0;
+    for (j = 0;j <= i;++j) u += h[j] * r[i - j];
+    for (j = i + 1;j < 17;++j) u += 320 * h[j] * r[i + 17 - j];
+    hr[i] = u;
+  }
+  for (i = 0;i < 17;++i) h[i] = hr[i];
+  squeeze(h);
+}
+
+static inline int crypto_onetimeauth(unsigned char *out,const unsigned char *in,unsigned long long inlen,const unsigned char *k)
+{
+  unsigned int j;
+  unsigned int r[17];
+  unsigned int h[17];
+  unsigned int c[17];
+
+  r[0] = k[0];
+  r[1] = k[1];
+  r[2] = k[2];
+  r[3] = k[3] & 15;
+  r[4] = k[4] & 252;
+  r[5] = k[5];
+  r[6] = k[6];
+  r[7] = k[7] & 15;
+  r[8] = k[8] & 252;
+  r[9] = k[9];
+  r[10] = k[10];
+  r[11] = k[11] & 15;
+  r[12] = k[12] & 252;
+  r[13] = k[13];
+  r[14] = k[14];
+  r[15] = k[15] & 15;
+  r[16] = 0;
+
+  for (j = 0;j < 17;++j) h[j] = 0;
+
+  while (inlen > 0) {
+    for (j = 0;j < 17;++j) c[j] = 0;
+    for (j = 0;(j < 16) && (j < inlen);++j) c[j] = in[j];
+    c[j] = 1;
+    in += j; inlen -= j;
+    add(h,c);
+    mulmod(h,r);
+  }
+
+  freeze(h);
+
+  for (j = 0;j < 16;++j) c[j] = k[j + 16];
+  c[16] = 0;
+  add(h,c);
+  for (j = 0;j < 16;++j) out[j] = h[j];
+  return 0;
+}
+
+void Poly1305::compute(void *auth,const void *data,unsigned int len,const void *key)
+	throw()
+{
+	crypto_onetimeauth((unsigned char *)auth,(const unsigned char *)data,len,(const unsigned char *)key);
+}
+
+#endif
+
 namespace {
 
 typedef struct poly1305_context {
-	size_t aligner;
-	unsigned char opaque[136];
+  size_t aligner;
+  unsigned char opaque[136];
 } poly1305_context;
 
-#if (defined(_MSC_VER) || defined(__GNUC__)) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64))
+#if (defined(_MSC_VER) || defined(__GNUC__)) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__))
 
 //////////////////////////////////////////////////////////////////////////////
 // 128-bit implementation for MSC and GCC from Poly1305-donna
 
 #if defined(_MSC_VER)
-#include <intrin.h>
+  #include <intrin.h>
 
-typedef struct uint128_t {
-	unsigned long long lo;
-	unsigned long long hi;
-} uint128_t;
+  typedef struct uint128_t {
+    unsigned long long lo;
+    unsigned long long hi;
+  } uint128_t;
 
-#define MUL(out, x, y) out.lo = _umul128((x), (y), &out.hi)
-#define ADD(out, in)                                                                                                                                                                                                                           \
-	{                                                                                                                                                                                                                                          \
-		unsigned long long t = out.lo;                                                                                                                                                                                                         \
-		out.lo += in.lo;                                                                                                                                                                                                                       \
-		out.hi += (out.lo < t) + in.hi;                                                                                                                                                                                                        \
-	}
-#define ADDLO(out, in)                                                                                                                                                                                                                         \
-	{                                                                                                                                                                                                                                          \
-		unsigned long long t = out.lo;                                                                                                                                                                                                         \
-		out.lo += in;                                                                                                                                                                                                                          \
-		out.hi += (out.lo < t);                                                                                                                                                                                                                \
-	}
-#define SHR(in, shift) (__shiftright128(in.lo, in.hi, (shift)))
-#define LO(in)		   (in.lo)
+  #define MUL(out, x, y) out.lo = _umul128((x), (y), &out.hi)
+  #define ADD(out, in) { unsigned long long t = out.lo; out.lo += in.lo; out.hi += (out.lo < t) + in.hi; }
+  #define ADDLO(out, in) { unsigned long long t = out.lo; out.lo += in; out.hi += (out.lo < t); }
+  #define SHR(in, shift) (__shiftright128(in.lo, in.hi, (shift)))
+  #define LO(in) (in.lo)
 
 //  #define POLY1305_NOINLINE __declspec(noinline)
 #elif defined(__GNUC__)
-#if defined(__SIZEOF_INT128__)
-typedef unsigned __int128 uint128_t;
-#else
-typedef unsigned uint128_t __attribute__((mode(TI)));
-#endif
+  #if defined(__SIZEOF_INT128__)
+    typedef unsigned __int128 uint128_t;
+  #else
+    typedef unsigned uint128_t __attribute__((mode(TI)));
+  #endif
 
-#define MUL(out, x, y) out = ((uint128_t)x * y)
-#define ADD(out, in)   out += in
-#define ADDLO(out, in) out += in
-#define SHR(in, shift) (unsigned long long)(in >> (shift))
-#define LO(in)		   (unsigned long long)(in)
+  #define MUL(out, x, y) out = ((uint128_t)x * y)
+  #define ADD(out, in) out += in
+  #define ADDLO(out, in) out += in
+  #define SHR(in, shift) (unsigned long long)(in >> (shift))
+  #define LO(in) (unsigned long long)(in)
 
 //  #define POLY1305_NOINLINE __attribute__((noinline))
 #endif
@@ -76,228 +175,188 @@ typedef unsigned uint128_t __attribute__((mode(TI)));
 
 /* 17 + sizeof(size_t) + 8*sizeof(unsigned long long) */
 typedef struct poly1305_state_internal_t {
-	unsigned long long r[3];
-	unsigned long long h[3];
-	unsigned long long pad[2];
-	size_t leftover;
-	unsigned char buffer[poly1305_block_size];
-	unsigned char final;
+  unsigned long long r[3];
+  unsigned long long h[3];
+  unsigned long long pad[2];
+  size_t leftover;
+  unsigned char buffer[poly1305_block_size];
+  unsigned char final;
 } poly1305_state_internal_t;
 
-#if defined(ZT_NO_TYPE_PUNNING) || (__BYTE_ORDER != __LITTLE_ENDIAN)
-static inline unsigned long long U8TO64(const unsigned char* p)
-{
-	return (
-		((unsigned long long)(p[0] & 0xff)) | ((unsigned long long)(p[1] & 0xff) << 8) | ((unsigned long long)(p[2] & 0xff) << 16) | ((unsigned long long)(p[3] & 0xff) << 24) | ((unsigned long long)(p[4] & 0xff) << 32)
-		| ((unsigned long long)(p[5] & 0xff) << 40) | ((unsigned long long)(p[6] & 0xff) << 48) | ((unsigned long long)(p[7] & 0xff) << 56));
-}
-#else
-#define U8TO64(p) (*reinterpret_cast<const unsigned long long*>(p))
-#endif
-
-#if defined(ZT_NO_TYPE_PUNNING) || (__BYTE_ORDER != __LITTLE_ENDIAN)
-static inline void U64TO8(unsigned char* p, unsigned long long v)
-{
-	p[0] = (v) & 0xff;
-	p[1] = (v >> 8) & 0xff;
-	p[2] = (v >> 16) & 0xff;
-	p[3] = (v >> 24) & 0xff;
-	p[4] = (v >> 32) & 0xff;
-	p[5] = (v >> 40) & 0xff;
-	p[6] = (v >> 48) & 0xff;
-	p[7] = (v >> 56) & 0xff;
-}
-#else
-#define U64TO8(p, v) ((*reinterpret_cast<unsigned long long*>(p)) = (v))
-#endif
-
-static inline void poly1305_init(poly1305_context* ctx, const unsigned char key[32])
-{
-	poly1305_state_internal_t* st = (poly1305_state_internal_t*)ctx;
-	unsigned long long t0, t1;
-
-	/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
-	t0 = U8TO64(&key[0]);
-	t1 = U8TO64(&key[8]);
-
-	st->r[0] = (t0) & 0xffc0fffffff;
-	st->r[1] = ((t0 >> 44) | (t1 << 20)) & 0xfffffc0ffff;
-	st->r[2] = ((t1 >> 24)) & 0x00ffffffc0f;
-
-	/* h = 0 */
-	st->h[0] = 0;
-	st->h[1] = 0;
-	st->h[2] = 0;
-
-	/* save pad for later */
-	st->pad[0] = U8TO64(&key[16]);
-	st->pad[1] = U8TO64(&key[24]);
-
-	st->leftover = 0;
-	st->final = 0;
+/* interpret eight 8 bit unsigned integers as a 64 bit unsigned integer in little endian */
+static inline unsigned long long
+U8TO64(const unsigned char *p) {
+  return
+    (((unsigned long long)(p[0] & 0xff)      ) |
+     ((unsigned long long)(p[1] & 0xff) <<  8) |
+     ((unsigned long long)(p[2] & 0xff) << 16) |
+     ((unsigned long long)(p[3] & 0xff) << 24) |
+     ((unsigned long long)(p[4] & 0xff) << 32) |
+     ((unsigned long long)(p[5] & 0xff) << 40) |
+     ((unsigned long long)(p[6] & 0xff) << 48) |
+     ((unsigned long long)(p[7] & 0xff) << 56));
 }
 
-static inline void poly1305_blocks(poly1305_state_internal_t* st, const unsigned char* m, size_t bytes)
-{
-	const unsigned long long hibit = (st->final) ? 0 : ((unsigned long long)1 << 40); /* 1 << 128 */
-	unsigned long long r0, r1, r2;
-	unsigned long long s1, s2;
-	unsigned long long h0, h1, h2;
-	unsigned long long c;
-	uint128_t d0, d1, d2, d;
-
-	r0 = st->r[0];
-	r1 = st->r[1];
-	r2 = st->r[2];
-
-	h0 = st->h[0];
-	h1 = st->h[1];
-	h2 = st->h[2];
-
-	s1 = r1 * (5 << 2);
-	s2 = r2 * (5 << 2);
-
-	while (bytes >= poly1305_block_size) {
-		unsigned long long t0, t1;
-
-		/* h += m[i] */
-		t0 = U8TO64(&m[0]);
-		t1 = U8TO64(&m[8]);
-
-		h0 += ((t0) & 0xfffffffffff);
-		h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff);
-		h2 += (((t1 >> 24)) & 0x3ffffffffff) | hibit;
-
-		/* h *= r */
-		MUL(d0, h0, r0);
-		MUL(d, h1, s2);
-		ADD(d0, d);
-		MUL(d, h2, s1);
-		ADD(d0, d);
-		MUL(d1, h0, r1);
-		MUL(d, h1, r0);
-		ADD(d1, d);
-		MUL(d, h2, s2);
-		ADD(d1, d);
-		MUL(d2, h0, r2);
-		MUL(d, h1, r1);
-		ADD(d2, d);
-		MUL(d, h2, r0);
-		ADD(d2, d);
-
-		/* (partial) h %= p */
-		c = SHR(d0, 44);
-		h0 = LO(d0) & 0xfffffffffff;
-		ADDLO(d1, c);
-		c = SHR(d1, 44);
-		h1 = LO(d1) & 0xfffffffffff;
-		ADDLO(d2, c);
-		c = SHR(d2, 42);
-		h2 = LO(d2) & 0x3ffffffffff;
-		h0 += c * 5;
-		c = (h0 >> 44);
-		h0 = h0 & 0xfffffffffff;
-		h1 += c;
-
-		m += poly1305_block_size;
-		bytes -= poly1305_block_size;
-	}
-
-	st->h[0] = h0;
-	st->h[1] = h1;
-	st->h[2] = h2;
+/* store a 64 bit unsigned integer as eight 8 bit unsigned integers in little endian */
+static inline void
+U64TO8(unsigned char *p, unsigned long long v) {
+  p[0] = (v      ) & 0xff;
+  p[1] = (v >>  8) & 0xff;
+  p[2] = (v >> 16) & 0xff;
+  p[3] = (v >> 24) & 0xff;
+  p[4] = (v >> 32) & 0xff;
+  p[5] = (v >> 40) & 0xff;
+  p[6] = (v >> 48) & 0xff;
+  p[7] = (v >> 56) & 0xff;
 }
 
-static inline void poly1305_finish(poly1305_context* ctx, unsigned char mac[16])
-{
-	poly1305_state_internal_t* st = (poly1305_state_internal_t*)ctx;
-	unsigned long long h0, h1, h2, c;
-	unsigned long long g0, g1, g2;
-	unsigned long long t0, t1;
+static inline void
+poly1305_init(poly1305_context *ctx, const unsigned char key[32]) {
+  poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx;
+  unsigned long long t0,t1;
 
-	/* process the remaining block */
-	if (st->leftover) {
-		size_t i = st->leftover;
-		st->buffer[i] = 1;
-		for (i = i + 1; i < poly1305_block_size; i++) {
-			st->buffer[i] = 0;
-		}
-		st->final = 1;
-		poly1305_blocks(st, st->buffer, poly1305_block_size);
-	}
+  /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
+  t0 = U8TO64(&key[0]);
+  t1 = U8TO64(&key[8]);
 
-	/* fully carry h */
-	h0 = st->h[0];
-	h1 = st->h[1];
-	h2 = st->h[2];
+  st->r[0] = ( t0                    ) & 0xffc0fffffff;
+  st->r[1] = ((t0 >> 44) | (t1 << 20)) & 0xfffffc0ffff;
+  st->r[2] = ((t1 >> 24)             ) & 0x00ffffffc0f;
 
-	c = (h1 >> 44);
-	h1 &= 0xfffffffffff;
-	h2 += c;
-	c = (h2 >> 42);
-	h2 &= 0x3ffffffffff;
-	h0 += c * 5;
-	c = (h0 >> 44);
-	h0 &= 0xfffffffffff;
-	h1 += c;
-	c = (h1 >> 44);
-	h1 &= 0xfffffffffff;
-	h2 += c;
-	c = (h2 >> 42);
-	h2 &= 0x3ffffffffff;
-	h0 += c * 5;
-	c = (h0 >> 44);
-	h0 &= 0xfffffffffff;
-	h1 += c;
+  /* h = 0 */
+  st->h[0] = 0;
+  st->h[1] = 0;
+  st->h[2] = 0;
 
-	/* compute h + -p */
-	g0 = h0 + 5;
-	c = (g0 >> 44);
-	g0 &= 0xfffffffffff;
-	g1 = h1 + c;
-	c = (g1 >> 44);
-	g1 &= 0xfffffffffff;
-	g2 = h2 + c - ((unsigned long long)1 << 42);
+  /* save pad for later */
+  st->pad[0] = U8TO64(&key[16]);
+  st->pad[1] = U8TO64(&key[24]);
 
-	/* select h if h < p, or h + -p if h >= p */
-	c = (g2 >> ((sizeof(unsigned long long) * 8) - 1)) - 1;
-	g0 &= c;
-	g1 &= c;
-	g2 &= c;
-	c = ~c;
-	h0 = (h0 & c) | g0;
-	h1 = (h1 & c) | g1;
-	h2 = (h2 & c) | g2;
+  st->leftover = 0;
+  st->final = 0;
+}
 
-	/* h = (h + pad) */
-	t0 = st->pad[0];
-	t1 = st->pad[1];
+static inline void
+poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m, size_t bytes) {
+  const unsigned long long hibit = (st->final) ? 0 : ((unsigned long long)1 << 40); /* 1 << 128 */
+  unsigned long long r0,r1,r2;
+  unsigned long long s1,s2;
+  unsigned long long h0,h1,h2;
+  unsigned long long c;
+  uint128_t d0,d1,d2,d;
 
-	h0 += ((t0) & 0xfffffffffff);
-	c = (h0 >> 44);
-	h0 &= 0xfffffffffff;
-	h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff) + c;
-	c = (h1 >> 44);
-	h1 &= 0xfffffffffff;
-	h2 += (((t1 >> 24)) & 0x3ffffffffff) + c;
-	h2 &= 0x3ffffffffff;
+  r0 = st->r[0];
+  r1 = st->r[1];
+  r2 = st->r[2];
 
-	/* mac = h % (2^128) */
-	h0 = ((h0) | (h1 << 44));
-	h1 = ((h1 >> 20) | (h2 << 24));
+  h0 = st->h[0];
+  h1 = st->h[1];
+  h2 = st->h[2];
 
-	U64TO8(&mac[0], h0);
-	U64TO8(&mac[8], h1);
+  s1 = r1 * (5 << 2);
+  s2 = r2 * (5 << 2);
 
-	/* zero out the state */
-	st->h[0] = 0;
-	st->h[1] = 0;
-	st->h[2] = 0;
-	st->r[0] = 0;
-	st->r[1] = 0;
-	st->r[2] = 0;
-	st->pad[0] = 0;
-	st->pad[1] = 0;
+  while (bytes >= poly1305_block_size) {
+    unsigned long long t0,t1;
+
+    /* h += m[i] */
+    t0 = U8TO64(&m[0]);
+    t1 = U8TO64(&m[8]);
+
+    h0 += (( t0                    ) & 0xfffffffffff);
+    h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff);
+    h2 += (((t1 >> 24)             ) & 0x3ffffffffff) | hibit;
+
+    /* h *= r */
+    MUL(d0, h0, r0); MUL(d, h1, s2); ADD(d0, d); MUL(d, h2, s1); ADD(d0, d);
+    MUL(d1, h0, r1); MUL(d, h1, r0); ADD(d1, d); MUL(d, h2, s2); ADD(d1, d);
+    MUL(d2, h0, r2); MUL(d, h1, r1); ADD(d2, d); MUL(d, h2, r0); ADD(d2, d);
+
+    /* (partial) h %= p */
+                  c = SHR(d0, 44); h0 = LO(d0) & 0xfffffffffff;
+    ADDLO(d1, c); c = SHR(d1, 44); h1 = LO(d1) & 0xfffffffffff;
+    ADDLO(d2, c); c = SHR(d2, 42); h2 = LO(d2) & 0x3ffffffffff;
+    h0  += c * 5; c = (h0 >> 44);  h0 =    h0  & 0xfffffffffff;
+    h1  += c;
+
+    m += poly1305_block_size;
+    bytes -= poly1305_block_size;
+  }
+
+  st->h[0] = h0;
+  st->h[1] = h1;
+  st->h[2] = h2;
+}
+
+static inline void
+poly1305_finish(poly1305_context *ctx, unsigned char mac[16]) {
+  poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx;
+  unsigned long long h0,h1,h2,c;
+  unsigned long long g0,g1,g2;
+  unsigned long long t0,t1;
+
+  /* process the remaining block */
+  if (st->leftover) {
+    size_t i = st->leftover;
+    st->buffer[i] = 1;
+    for (i = i + 1; i < poly1305_block_size; i++)
+      st->buffer[i] = 0;
+    st->final = 1;
+    poly1305_blocks(st, st->buffer, poly1305_block_size);
+  }
+
+  /* fully carry h */
+  h0 = st->h[0];
+  h1 = st->h[1];
+  h2 = st->h[2];
+
+               c = (h1 >> 44); h1 &= 0xfffffffffff;
+  h2 += c;     c = (h2 >> 42); h2 &= 0x3ffffffffff;
+  h0 += c * 5; c = (h0 >> 44); h0 &= 0xfffffffffff;
+  h1 += c;     c = (h1 >> 44); h1 &= 0xfffffffffff;
+  h2 += c;     c = (h2 >> 42); h2 &= 0x3ffffffffff;
+  h0 += c * 5; c = (h0 >> 44); h0 &= 0xfffffffffff;
+  h1 += c;
+
+  /* compute h + -p */
+  g0 = h0 + 5; c = (g0 >> 44); g0 &= 0xfffffffffff;
+  g1 = h1 + c; c = (g1 >> 44); g1 &= 0xfffffffffff;
+  g2 = h2 + c - ((unsigned long long)1 << 42);
+
+  /* select h if h < p, or h + -p if h >= p */
+  c = (g2 >> ((sizeof(unsigned long long) * 8) - 1)) - 1;
+  g0 &= c;
+  g1 &= c;
+  g2 &= c;
+  c = ~c;
+  h0 = (h0 & c) | g0;
+  h1 = (h1 & c) | g1;
+  h2 = (h2 & c) | g2;
+
+  /* h = (h + pad) */
+  t0 = st->pad[0];
+  t1 = st->pad[1];
+
+  h0 += (( t0                    ) & 0xfffffffffff)    ; c = (h0 >> 44); h0 &= 0xfffffffffff;
+  h1 += (((t0 >> 44) | (t1 << 20)) & 0xfffffffffff) + c; c = (h1 >> 44); h1 &= 0xfffffffffff;
+  h2 += (((t1 >> 24)             ) & 0x3ffffffffff) + c;                 h2 &= 0x3ffffffffff;
+
+  /* mac = h % (2^128) */
+  h0 = ((h0      ) | (h1 << 44));
+  h1 = ((h1 >> 20) | (h2 << 24));
+
+  U64TO8(&mac[0], h0);
+  U64TO8(&mac[8], h1);
+
+  /* zero out the state */
+  st->h[0] = 0;
+  st->h[1] = 0;
+  st->h[2] = 0;
+  st->r[0] = 0;
+  st->r[1] = 0;
+  st->r[2] = 0;
+  st->pad[0] = 0;
+  st->pad[1] = 0;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -311,291 +370,259 @@ static inline void poly1305_finish(poly1305_context* ctx, unsigned char mac[16])
 
 /* 17 + sizeof(size_t) + 14*sizeof(unsigned long) */
 typedef struct poly1305_state_internal_t {
-	unsigned long r[5];
-	unsigned long h[5];
-	unsigned long pad[4];
-	size_t leftover;
-	unsigned char buffer[poly1305_block_size];
-	unsigned char final;
+  unsigned long r[5];
+  unsigned long h[5];
+  unsigned long pad[4];
+  size_t leftover;
+  unsigned char buffer[poly1305_block_size];
+  unsigned char final;
 } poly1305_state_internal_t;
 
 /* interpret four 8 bit unsigned integers as a 32 bit unsigned integer in little endian */
-static unsigned long U8TO32(const unsigned char* p)
-{
-	return (((unsigned long)(p[0] & 0xff)) | ((unsigned long)(p[1] & 0xff) << 8) | ((unsigned long)(p[2] & 0xff) << 16) | ((unsigned long)(p[3] & 0xff) << 24));
+static unsigned long
+U8TO32(const unsigned char *p) {
+  return
+    (((unsigned long)(p[0] & 0xff)      ) |
+       ((unsigned long)(p[1] & 0xff) <<  8) |
+         ((unsigned long)(p[2] & 0xff) << 16) |
+         ((unsigned long)(p[3] & 0xff) << 24));
 }
 
 /* store a 32 bit unsigned integer as four 8 bit unsigned integers in little endian */
-static void U32TO8(unsigned char* p, unsigned long v)
-{
-	p[0] = (v) & 0xff;
-	p[1] = (v >> 8) & 0xff;
-	p[2] = (v >> 16) & 0xff;
-	p[3] = (v >> 24) & 0xff;
+static void
+U32TO8(unsigned char *p, unsigned long v) {
+  p[0] = (v      ) & 0xff;
+  p[1] = (v >>  8) & 0xff;
+  p[2] = (v >> 16) & 0xff;
+  p[3] = (v >> 24) & 0xff;
 }
 
-static inline void poly1305_init(poly1305_context* ctx, const unsigned char key[32])
-{
-	poly1305_state_internal_t* st = (poly1305_state_internal_t*)ctx;
+static inline void
+poly1305_init(poly1305_context *ctx, const unsigned char key[32]) {
+  poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx;
 
-	/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
-	st->r[0] = (U8TO32(&key[0])) & 0x3ffffff;
-	st->r[1] = (U8TO32(&key[3]) >> 2) & 0x3ffff03;
-	st->r[2] = (U8TO32(&key[6]) >> 4) & 0x3ffc0ff;
-	st->r[3] = (U8TO32(&key[9]) >> 6) & 0x3f03fff;
-	st->r[4] = (U8TO32(&key[12]) >> 8) & 0x00fffff;
+  /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
+  st->r[0] = (U8TO32(&key[ 0])     ) & 0x3ffffff;
+  st->r[1] = (U8TO32(&key[ 3]) >> 2) & 0x3ffff03;
+  st->r[2] = (U8TO32(&key[ 6]) >> 4) & 0x3ffc0ff;
+  st->r[3] = (U8TO32(&key[ 9]) >> 6) & 0x3f03fff;
+  st->r[4] = (U8TO32(&key[12]) >> 8) & 0x00fffff;
 
-	/* h = 0 */
-	st->h[0] = 0;
-	st->h[1] = 0;
-	st->h[2] = 0;
-	st->h[3] = 0;
-	st->h[4] = 0;
+  /* h = 0 */
+  st->h[0] = 0;
+  st->h[1] = 0;
+  st->h[2] = 0;
+  st->h[3] = 0;
+  st->h[4] = 0;
 
-	/* save pad for later */
-	st->pad[0] = U8TO32(&key[16]);
-	st->pad[1] = U8TO32(&key[20]);
-	st->pad[2] = U8TO32(&key[24]);
-	st->pad[3] = U8TO32(&key[28]);
+  /* save pad for later */
+  st->pad[0] = U8TO32(&key[16]);
+  st->pad[1] = U8TO32(&key[20]);
+  st->pad[2] = U8TO32(&key[24]);
+  st->pad[3] = U8TO32(&key[28]);
 
-	st->leftover = 0;
-	st->final = 0;
+  st->leftover = 0;
+  st->final = 0;
 }
 
-static inline void poly1305_blocks(poly1305_state_internal_t* st, const unsigned char* m, size_t bytes)
-{
-	const unsigned long hibit = (st->final) ? 0 : (1 << 24); /* 1 << 128 */
-	unsigned long r0, r1, r2, r3, r4;
-	unsigned long s1, s2, s3, s4;
-	unsigned long h0, h1, h2, h3, h4;
-	unsigned long long d0, d1, d2, d3, d4;
-	unsigned long c;
+static inline void
+poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m, size_t bytes) {
+  const unsigned long hibit = (st->final) ? 0 : (1 << 24); /* 1 << 128 */
+  unsigned long r0,r1,r2,r3,r4;
+  unsigned long s1,s2,s3,s4;
+  unsigned long h0,h1,h2,h3,h4;
+  unsigned long long d0,d1,d2,d3,d4;
+  unsigned long c;
 
-	r0 = st->r[0];
-	r1 = st->r[1];
-	r2 = st->r[2];
-	r3 = st->r[3];
-	r4 = st->r[4];
+  r0 = st->r[0];
+  r1 = st->r[1];
+  r2 = st->r[2];
+  r3 = st->r[3];
+  r4 = st->r[4];
 
-	s1 = r1 * 5;
-	s2 = r2 * 5;
-	s3 = r3 * 5;
-	s4 = r4 * 5;
+  s1 = r1 * 5;
+  s2 = r2 * 5;
+  s3 = r3 * 5;
+  s4 = r4 * 5;
 
-	h0 = st->h[0];
-	h1 = st->h[1];
-	h2 = st->h[2];
-	h3 = st->h[3];
-	h4 = st->h[4];
+  h0 = st->h[0];
+  h1 = st->h[1];
+  h2 = st->h[2];
+  h3 = st->h[3];
+  h4 = st->h[4];
 
-	while (bytes >= poly1305_block_size) {
-		/* h += m[i] */
-		h0 += (U8TO32(m + 0)) & 0x3ffffff;
-		h1 += (U8TO32(m + 3) >> 2) & 0x3ffffff;
-		h2 += (U8TO32(m + 6) >> 4) & 0x3ffffff;
-		h3 += (U8TO32(m + 9) >> 6) & 0x3ffffff;
-		h4 += (U8TO32(m + 12) >> 8) | hibit;
+  while (bytes >= poly1305_block_size) {
+    /* h += m[i] */
+    h0 += (U8TO32(m+ 0)     ) & 0x3ffffff;
+    h1 += (U8TO32(m+ 3) >> 2) & 0x3ffffff;
+    h2 += (U8TO32(m+ 6) >> 4) & 0x3ffffff;
+    h3 += (U8TO32(m+ 9) >> 6) & 0x3ffffff;
+    h4 += (U8TO32(m+12) >> 8) | hibit;
 
-		/* h *= r */
-		d0 = ((unsigned long long)h0 * r0) + ((unsigned long long)h1 * s4) + ((unsigned long long)h2 * s3) + ((unsigned long long)h3 * s2) + ((unsigned long long)h4 * s1);
-		d1 = ((unsigned long long)h0 * r1) + ((unsigned long long)h1 * r0) + ((unsigned long long)h2 * s4) + ((unsigned long long)h3 * s3) + ((unsigned long long)h4 * s2);
-		d2 = ((unsigned long long)h0 * r2) + ((unsigned long long)h1 * r1) + ((unsigned long long)h2 * r0) + ((unsigned long long)h3 * s4) + ((unsigned long long)h4 * s3);
-		d3 = ((unsigned long long)h0 * r3) + ((unsigned long long)h1 * r2) + ((unsigned long long)h2 * r1) + ((unsigned long long)h3 * r0) + ((unsigned long long)h4 * s4);
-		d4 = ((unsigned long long)h0 * r4) + ((unsigned long long)h1 * r3) + ((unsigned long long)h2 * r2) + ((unsigned long long)h3 * r1) + ((unsigned long long)h4 * r0);
+    /* h *= r */
+    d0 = ((unsigned long long)h0 * r0) + ((unsigned long long)h1 * s4) + ((unsigned long long)h2 * s3) + ((unsigned long long)h3 * s2) + ((unsigned long long)h4 * s1);
+    d1 = ((unsigned long long)h0 * r1) + ((unsigned long long)h1 * r0) + ((unsigned long long)h2 * s4) + ((unsigned long long)h3 * s3) + ((unsigned long long)h4 * s2);
+    d2 = ((unsigned long long)h0 * r2) + ((unsigned long long)h1 * r1) + ((unsigned long long)h2 * r0) + ((unsigned long long)h3 * s4) + ((unsigned long long)h4 * s3);
+    d3 = ((unsigned long long)h0 * r3) + ((unsigned long long)h1 * r2) + ((unsigned long long)h2 * r1) + ((unsigned long long)h3 * r0) + ((unsigned long long)h4 * s4);
+    d4 = ((unsigned long long)h0 * r4) + ((unsigned long long)h1 * r3) + ((unsigned long long)h2 * r2) + ((unsigned long long)h3 * r1) + ((unsigned long long)h4 * r0);
 
-		/* (partial) h %= p */
-		c = (unsigned long)(d0 >> 26);
-		h0 = (unsigned long)d0 & 0x3ffffff;
-		d1 += c;
-		c = (unsigned long)(d1 >> 26);
-		h1 = (unsigned long)d1 & 0x3ffffff;
-		d2 += c;
-		c = (unsigned long)(d2 >> 26);
-		h2 = (unsigned long)d2 & 0x3ffffff;
-		d3 += c;
-		c = (unsigned long)(d3 >> 26);
-		h3 = (unsigned long)d3 & 0x3ffffff;
-		d4 += c;
-		c = (unsigned long)(d4 >> 26);
-		h4 = (unsigned long)d4 & 0x3ffffff;
-		h0 += c * 5;
-		c = (h0 >> 26);
-		h0 = h0 & 0x3ffffff;
-		h1 += c;
+    /* (partial) h %= p */
+                  c = (unsigned long)(d0 >> 26); h0 = (unsigned long)d0 & 0x3ffffff;
+    d1 += c;      c = (unsigned long)(d1 >> 26); h1 = (unsigned long)d1 & 0x3ffffff;
+    d2 += c;      c = (unsigned long)(d2 >> 26); h2 = (unsigned long)d2 & 0x3ffffff;
+    d3 += c;      c = (unsigned long)(d3 >> 26); h3 = (unsigned long)d3 & 0x3ffffff;
+    d4 += c;      c = (unsigned long)(d4 >> 26); h4 = (unsigned long)d4 & 0x3ffffff;
+    h0 += c * 5;  c =                (h0 >> 26); h0 =                h0 & 0x3ffffff;
+    h1 += c;
 
-		m += poly1305_block_size;
-		bytes -= poly1305_block_size;
-	}
+    m += poly1305_block_size;
+    bytes -= poly1305_block_size;
+  }
 
-	st->h[0] = h0;
-	st->h[1] = h1;
-	st->h[2] = h2;
-	st->h[3] = h3;
-	st->h[4] = h4;
+  st->h[0] = h0;
+  st->h[1] = h1;
+  st->h[2] = h2;
+  st->h[3] = h3;
+  st->h[4] = h4;
 }
 
-static inline void poly1305_finish(poly1305_context* ctx, unsigned char mac[16])
-{
-	poly1305_state_internal_t* st = (poly1305_state_internal_t*)ctx;
-	unsigned long h0, h1, h2, h3, h4, c;
-	unsigned long g0, g1, g2, g3, g4;
-	unsigned long long f;
-	unsigned long mask;
+static inline void
+poly1305_finish(poly1305_context *ctx, unsigned char mac[16]) {
+  poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx;
+  unsigned long h0,h1,h2,h3,h4,c;
+  unsigned long g0,g1,g2,g3,g4;
+  unsigned long long f;
+  unsigned long mask;
 
-	/* process the remaining block */
-	if (st->leftover) {
-		size_t i = st->leftover;
-		st->buffer[i++] = 1;
-		for (; i < poly1305_block_size; i++) {
-			st->buffer[i] = 0;
-		}
-		st->final = 1;
-		poly1305_blocks(st, st->buffer, poly1305_block_size);
-	}
+  /* process the remaining block */
+  if (st->leftover) {
+    size_t i = st->leftover;
+    st->buffer[i++] = 1;
+    for (; i < poly1305_block_size; i++)
+      st->buffer[i] = 0;
+    st->final = 1;
+    poly1305_blocks(st, st->buffer, poly1305_block_size);
+  }
 
-	/* fully carry h */
-	h0 = st->h[0];
-	h1 = st->h[1];
-	h2 = st->h[2];
-	h3 = st->h[3];
-	h4 = st->h[4];
+  /* fully carry h */
+  h0 = st->h[0];
+  h1 = st->h[1];
+  h2 = st->h[2];
+  h3 = st->h[3];
+  h4 = st->h[4];
 
-	c = h1 >> 26;
-	h1 = h1 & 0x3ffffff;
-	h2 += c;
-	c = h2 >> 26;
-	h2 = h2 & 0x3ffffff;
-	h3 += c;
-	c = h3 >> 26;
-	h3 = h3 & 0x3ffffff;
-	h4 += c;
-	c = h4 >> 26;
-	h4 = h4 & 0x3ffffff;
-	h0 += c * 5;
-	c = h0 >> 26;
-	h0 = h0 & 0x3ffffff;
-	h1 += c;
+               c = h1 >> 26; h1 = h1 & 0x3ffffff;
+  h2 +=     c; c = h2 >> 26; h2 = h2 & 0x3ffffff;
+  h3 +=     c; c = h3 >> 26; h3 = h3 & 0x3ffffff;
+  h4 +=     c; c = h4 >> 26; h4 = h4 & 0x3ffffff;
+  h0 += c * 5; c = h0 >> 26; h0 = h0 & 0x3ffffff;
+  h1 +=     c;
 
-	/* compute h + -p */
-	g0 = h0 + 5;
-	c = g0 >> 26;
-	g0 &= 0x3ffffff;
-	g1 = h1 + c;
-	c = g1 >> 26;
-	g1 &= 0x3ffffff;
-	g2 = h2 + c;
-	c = g2 >> 26;
-	g2 &= 0x3ffffff;
-	g3 = h3 + c;
-	c = g3 >> 26;
-	g3 &= 0x3ffffff;
-	g4 = h4 + c - (1 << 26);
+  /* compute h + -p */
+  g0 = h0 + 5; c = g0 >> 26; g0 &= 0x3ffffff;
+  g1 = h1 + c; c = g1 >> 26; g1 &= 0x3ffffff;
+  g2 = h2 + c; c = g2 >> 26; g2 &= 0x3ffffff;
+  g3 = h3 + c; c = g3 >> 26; g3 &= 0x3ffffff;
+  g4 = h4 + c - (1 << 26);
 
-	/* select h if h < p, or h + -p if h >= p */
-	mask = (g4 >> ((sizeof(unsigned long) * 8) - 1)) - 1;
-	g0 &= mask;
-	g1 &= mask;
-	g2 &= mask;
-	g3 &= mask;
-	g4 &= mask;
-	mask = ~mask;
-	h0 = (h0 & mask) | g0;
-	h1 = (h1 & mask) | g1;
-	h2 = (h2 & mask) | g2;
-	h3 = (h3 & mask) | g3;
-	h4 = (h4 & mask) | g4;
+  /* select h if h < p, or h + -p if h >= p */
+  mask = (g4 >> ((sizeof(unsigned long) * 8) - 1)) - 1;
+  g0 &= mask;
+  g1 &= mask;
+  g2 &= mask;
+  g3 &= mask;
+  g4 &= mask;
+  mask = ~mask;
+  h0 = (h0 & mask) | g0;
+  h1 = (h1 & mask) | g1;
+  h2 = (h2 & mask) | g2;
+  h3 = (h3 & mask) | g3;
+  h4 = (h4 & mask) | g4;
 
-	/* h = h % (2^128) */
-	h0 = ((h0) | (h1 << 26)) & 0xffffffff;
-	h1 = ((h1 >> 6) | (h2 << 20)) & 0xffffffff;
-	h2 = ((h2 >> 12) | (h3 << 14)) & 0xffffffff;
-	h3 = ((h3 >> 18) | (h4 << 8)) & 0xffffffff;
+  /* h = h % (2^128) */
+  h0 = ((h0      ) | (h1 << 26)) & 0xffffffff;
+  h1 = ((h1 >>  6) | (h2 << 20)) & 0xffffffff;
+  h2 = ((h2 >> 12) | (h3 << 14)) & 0xffffffff;
+  h3 = ((h3 >> 18) | (h4 <<  8)) & 0xffffffff;
 
-	/* mac = (h + pad) % (2^128) */
-	f = (unsigned long long)h0 + st->pad[0];
-	h0 = (unsigned long)f;
-	f = (unsigned long long)h1 + st->pad[1] + (f >> 32);
-	h1 = (unsigned long)f;
-	f = (unsigned long long)h2 + st->pad[2] + (f >> 32);
-	h2 = (unsigned long)f;
-	f = (unsigned long long)h3 + st->pad[3] + (f >> 32);
-	h3 = (unsigned long)f;
+  /* mac = (h + pad) % (2^128) */
+  f = (unsigned long long)h0 + st->pad[0]            ; h0 = (unsigned long)f;
+  f = (unsigned long long)h1 + st->pad[1] + (f >> 32); h1 = (unsigned long)f;
+  f = (unsigned long long)h2 + st->pad[2] + (f >> 32); h2 = (unsigned long)f;
+  f = (unsigned long long)h3 + st->pad[3] + (f >> 32); h3 = (unsigned long)f;
 
-	U32TO8(mac + 0, h0);
-	U32TO8(mac + 4, h1);
-	U32TO8(mac + 8, h2);
-	U32TO8(mac + 12, h3);
+  U32TO8(mac +  0, h0);
+  U32TO8(mac +  4, h1);
+  U32TO8(mac +  8, h2);
+  U32TO8(mac + 12, h3);
 
-	/* zero out the state */
-	st->h[0] = 0;
-	st->h[1] = 0;
-	st->h[2] = 0;
-	st->h[3] = 0;
-	st->h[4] = 0;
-	st->r[0] = 0;
-	st->r[1] = 0;
-	st->r[2] = 0;
-	st->r[3] = 0;
-	st->r[4] = 0;
-	st->pad[0] = 0;
-	st->pad[1] = 0;
-	st->pad[2] = 0;
-	st->pad[3] = 0;
+  /* zero out the state */
+  st->h[0] = 0;
+  st->h[1] = 0;
+  st->h[2] = 0;
+  st->h[3] = 0;
+  st->h[4] = 0;
+  st->r[0] = 0;
+  st->r[1] = 0;
+  st->r[2] = 0;
+  st->r[3] = 0;
+  st->r[4] = 0;
+  st->pad[0] = 0;
+  st->pad[1] = 0;
+  st->pad[2] = 0;
+  st->pad[3] = 0;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif	 // MSC/GCC or not
+#endif // MSC/GCC or not
 
-static inline void poly1305_update(poly1305_context* ctx, const unsigned char* m, size_t bytes)
-{
-	poly1305_state_internal_t* st = (poly1305_state_internal_t*)ctx;
-	size_t i;
+static inline void
+poly1305_update(poly1305_context *ctx, const unsigned char *m, size_t bytes) {
+  poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx;
+  size_t i;
 
-	/* handle leftover */
-	if (st->leftover) {
-		size_t want = (poly1305_block_size - st->leftover);
-		if (want > bytes) {
-			want = bytes;
-		}
-		for (i = 0; i < want; i++) {
-			st->buffer[st->leftover + i] = m[i];
-		}
-		bytes -= want;
-		m += want;
-		st->leftover += want;
-		if (st->leftover < poly1305_block_size) {
-			return;
-		}
-		poly1305_blocks(st, st->buffer, poly1305_block_size);
-		st->leftover = 0;
-	}
+  /* handle leftover */
+  if (st->leftover) {
+    size_t want = (poly1305_block_size - st->leftover);
+    if (want > bytes)
+      want = bytes;
+    for (i = 0; i < want; i++)
+      st->buffer[st->leftover + i] = m[i];
+    bytes -= want;
+    m += want;
+    st->leftover += want;
+    if (st->leftover < poly1305_block_size)
+      return;
+    poly1305_blocks(st, st->buffer, poly1305_block_size);
+    st->leftover = 0;
+  }
 
-	/* process full blocks */
-	if (bytes >= poly1305_block_size) {
-		size_t want = (bytes & ~(poly1305_block_size - 1));
-		poly1305_blocks(st, m, want);
-		m += want;
-		bytes -= want;
-	}
+  /* process full blocks */
+  if (bytes >= poly1305_block_size) {
+    size_t want = (bytes & ~(poly1305_block_size - 1));
+    poly1305_blocks(st, m, want);
+    m += want;
+    bytes -= want;
+  }
 
-	/* store leftover */
-	if (bytes) {
-		for (i = 0; i < bytes; i++) {
-			st->buffer[st->leftover + i] = m[i];
-		}
-		st->leftover += bytes;
-	}
+  /* store leftover */
+  if (bytes) {
+    for (i = 0; i < bytes; i++)
+      st->buffer[st->leftover + i] = m[i];
+    st->leftover += bytes;
+  }
 }
 
-}	// anonymous namespace
+} // anonymous namespace
 
-void Poly1305::compute(void* auth, const void* data, unsigned int len, const void* key)
+void Poly1305::compute(void *auth,const void *data,unsigned int len,const void *key)
+  throw()
 {
-	poly1305_context ctx;
-	poly1305_init(&ctx, reinterpret_cast<const unsigned char*>(key));
-	poly1305_update(&ctx, reinterpret_cast<const unsigned char*>(data), (size_t)len);
-	poly1305_finish(&ctx, reinterpret_cast<unsigned char*>(auth));
+  poly1305_context ctx;
+  poly1305_init(&ctx,reinterpret_cast<const unsigned char *>(key));
+  poly1305_update(&ctx,reinterpret_cast<const unsigned char *>(data),(size_t)len);
+  poly1305_finish(&ctx,reinterpret_cast<unsigned char *>(auth));
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Poly1305.hpp b/node/Poly1305.hpp
index e5c3a8547..62d57546e 100644
--- a/node/Poly1305.hpp
+++ b/node/Poly1305.hpp
@@ -1,15 +1,20 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_POLY1305_HPP
 #define ZT_POLY1305_HPP
@@ -30,8 +35,9 @@ namespace ZeroTier {
  * keystream as a one-time-use key. These 32 bytes are then discarded and
  * the packet is encrypted with the next N bytes.
  */
-class Poly1305 {
-  public:
+class Poly1305
+{
+public:
 	/**
 	 * Compute a one-time authentication code
 	 *
@@ -40,9 +46,10 @@ class Poly1305 {
 	 * @param len Length of data to authenticate in bytes
 	 * @param key 32-byte one-time use key to authenticate data (must not be reused)
 	 */
-	static void compute(void* auth, const void* data, unsigned int len, const void* key);
+	static void compute(void *auth,const void *data,unsigned int len,const void *key)
+		throw();
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/README.md b/node/README.md
deleted file mode 100644
index 1728400c3..000000000
--- a/node/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-ZeroTier Network Hypervisor Core
-======
-
-This directory contains the *real* ZeroTier: a completely OS-independent global virtual Ethernet switch engine. This is where the magic happens.
-
-Give it wire packets and it gives you Ethernet packets, and vice versa. The core contains absolutely no actual I/O, port configuration, or other OS-specific code (except Utils::getSecureRandom()). It provides a simple C API via [/include/ZeroTierOne.h](../include/ZeroTierOne.h). It's designed to be small and maximally portable for future use on small embedded and special purpose systems.
-
-Code in here follows these guidelines:
-
- - Keep it minimal, especially in terms of code footprint and memory use.
- - There should be no OS-dependent code here unless absolutely necessary (e.g. getSecureRandom).
- - If it's not part of the core virtual Ethernet switch it does not belong here.
- - No C++11 or C++14 since older and embedded compilers don't support it yet and this should be maximally portable.
- - Minimize the use of complex C++ features since at some point we might end up "minus-minus'ing" this code if doing so proves necessary to port to tiny embedded systems.
diff --git a/node/Revocation.cpp b/node/Revocation.cpp
deleted file mode 100644
index 6da98f269..000000000
--- a/node/Revocation.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "Revocation.hpp"
-
-#include "Identity.hpp"
-#include "Network.hpp"
-#include "Node.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
-
-namespace ZeroTier {
-
-int Revocation::verify(const RuntimeEnvironment* RR, void* tPtr) const
-{
-	if ((! _signedBy) || (_signedBy != Network::controllerFor(_networkId))) {
-		return -1;
-	}
-	const Identity id(RR->topology->getIdentity(tPtr, _signedBy));
-	if (! id) {
-		RR->sw->requestWhois(tPtr, RR->node->now(), _signedBy);
-		return 1;
-	}
-	try {
-		Buffer<sizeof(Revocation) + 64> tmp;
-		this->serialize(tmp, true);
-		return (id.verify(tmp.data(), tmp.size(), _signature) ? 0 : -1);
-	}
-	catch (...) {
-		return -1;
-	}
-}
-
-}	// namespace ZeroTier
diff --git a/node/Revocation.hpp b/node/Revocation.hpp
deleted file mode 100644
index b6edccf57..000000000
--- a/node/Revocation.hpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_REVOCATION_HPP
-#define ZT_REVOCATION_HPP
-
-#include "../include/ZeroTierOne.h"
-#include "Address.hpp"
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "Credential.hpp"
-#include "ECC.hpp"
-#include "Identity.hpp"
-#include "Utils.hpp"
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/**
- * Flag: fast propagation via rumor mill algorithm
- */
-#define ZT_REVOCATION_FLAG_FAST_PROPAGATE 0x1ULL
-
-namespace ZeroTier {
-
-class RuntimeEnvironment;
-
-/**
- * Revocation certificate to instantaneously revoke a COM, capability, or tag
- */
-class Revocation : public Credential {
-  public:
-	static inline Credential::Type credentialType()
-	{
-		return Credential::CREDENTIAL_TYPE_REVOCATION;
-	}
-
-	Revocation() : _id(0), _credentialId(0), _networkId(0), _threshold(0), _flags(0), _target(), _signedBy(), _type(Credential::CREDENTIAL_TYPE_NULL)
-	{
-		memset(_signature.data, 0, sizeof(_signature.data));
-	}
-
-	/**
-	 * @param i ID (arbitrary for revocations, currently random)
-	 * @param nwid Network ID
-	 * @param cid Credential ID being revoked (0 for all or for COMs, which lack IDs)
-	 * @param thr Revocation time threshold before which credentials will be revoked
-	 * @param fl Flags
-	 * @param tgt Target node whose credential(s) are being revoked
-	 * @param ct Credential type being revoked
-	 */
-	Revocation(const uint32_t i, const uint64_t nwid, const uint32_t cid, const int64_t thr, const uint64_t fl, const Address& tgt, const Credential::Type ct)
-		: _id(i)
-		, _credentialId(cid)
-		, _networkId(nwid)
-		, _threshold(thr)
-		, _flags(fl)
-		, _target(tgt)
-		, _signedBy()
-		, _type(ct)
-	{
-		memset(_signature.data, 0, sizeof(_signature.data));
-	}
-
-	inline uint32_t id() const
-	{
-		return _id;
-	}
-	inline uint32_t credentialId() const
-	{
-		return _credentialId;
-	}
-	inline uint64_t networkId() const
-	{
-		return _networkId;
-	}
-	inline int64_t threshold() const
-	{
-		return _threshold;
-	}
-	inline const Address& target() const
-	{
-		return _target;
-	}
-	inline const Address& signer() const
-	{
-		return _signedBy;
-	}
-	inline Credential::Type type() const
-	{
-		return _type;
-	}
-
-	inline bool fastPropagate() const
-	{
-		return ((_flags & ZT_REVOCATION_FLAG_FAST_PROPAGATE) != 0);
-	}
-
-	/**
-	 * @param signer Signing identity, must have private key
-	 * @return True if signature was successful
-	 */
-	inline bool sign(const Identity& signer)
-	{
-		if (signer.hasPrivate()) {
-			Buffer<sizeof(Revocation) + 64> tmp;
-			_signedBy = signer.address();
-			this->serialize(tmp, true);
-			_signature = signer.sign(tmp.data(), tmp.size());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Verify this revocation's signature
-	 *
-	 * @param RR Runtime environment to provide for peer lookup, etc.
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @return 0 == OK, 1 == waiting for WHOIS, -1 == BAD signature or chain
-	 */
-	int verify(const RuntimeEnvironment* RR, void* tPtr) const;
-
-	template <unsigned int C> inline void serialize(Buffer<C>& b, const bool forSign = false) const
-	{
-		if (forSign) {
-			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-
-		b.append((uint32_t)0);	 // 4 unused bytes, currently set to 0
-		b.append(_id);
-		b.append(_networkId);
-		b.append((uint32_t)0);	 // 4 unused bytes, currently set to 0
-		b.append(_credentialId);
-		b.append(_threshold);
-		b.append(_flags);
-		_target.appendTo(b);
-		_signedBy.appendTo(b);
-		b.append((uint8_t)_type);
-
-		if (! forSign) {
-			b.append((uint8_t)1);	// 1 == Ed25519 signature
-			b.append((uint16_t)ZT_ECC_SIGNATURE_LEN);
-			b.append(_signature.data, ZT_ECC_SIGNATURE_LEN);
-		}
-
-		// This is the size of any additional fields, currently 0.
-		b.append((uint16_t)0);
-
-		if (forSign) {
-			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-	}
-
-	template <unsigned int C> inline unsigned int deserialize(const Buffer<C>& b, unsigned int startAt = 0)
-	{
-		*this = Revocation();
-
-		unsigned int p = startAt;
-
-		p += 4;	  // 4 bytes, currently unused
-		_id = b.template at<uint32_t>(p);
-		p += 4;
-		_networkId = b.template at<uint64_t>(p);
-		p += 8;
-		p += 4;	  // 4 bytes, currently unused
-		_credentialId = b.template at<uint32_t>(p);
-		p += 4;
-		_threshold = (int64_t)b.template at<uint64_t>(p);
-		p += 8;
-		_flags = b.template at<uint64_t>(p);
-		p += 8;
-		_target.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		p += ZT_ADDRESS_LENGTH;
-		_signedBy.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		p += ZT_ADDRESS_LENGTH;
-		_type = (Credential::Type)b[p++];
-
-		if (b[p++] == 1) {
-			if (b.template at<uint16_t>(p) == ZT_ECC_SIGNATURE_LEN) {
-				p += 2;
-				memcpy(_signature.data, b.field(p, ZT_ECC_SIGNATURE_LEN), ZT_ECC_SIGNATURE_LEN);
-				p += ZT_ECC_SIGNATURE_LEN;
-			}
-			else {
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_CRYPTOGRAPHIC_TOKEN;
-			}
-		}
-		else {
-			p += 2 + b.template at<uint16_t>(p);
-		}
-
-		p += 2 + b.template at<uint16_t>(p);
-		if (p > b.size()) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-		}
-
-		return (p - startAt);
-	}
-
-  private:
-	uint32_t _id;
-	uint32_t _credentialId;
-	uint64_t _networkId;
-	int64_t _threshold;
-	uint64_t _flags;
-	Address _target;
-	Address _signedBy;
-	Credential::Type _type;
-	ECC::Signature _signature;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/RingBuffer.hpp b/node/RingBuffer.hpp
deleted file mode 100644
index f99562894..000000000
--- a/node/RingBuffer.hpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (c)2013-2020 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_RINGBUFFER_H
-#define ZT_RINGBUFFER_H
-
-#include <algorithm>
-#include <cstdint>
-#include <math.h>
-#include <memory.h>
-#include <stdlib.h>
-#include <typeinfo>
-
-namespace ZeroTier {
-
-/**
- * A circular buffer
- *
- * For fast handling of continuously-evolving variables (such as path quality metrics).
- * Using this, we can maintain longer sliding historical windows for important path
- * metrics without the need for potentially expensive calls to memcpy/memmove.
- *
- * Some basic statistical functionality is implemented here in an attempt
- * to reduce the complexity of code needed to interact with this type of buffer.
- */
-
-template <class T, size_t S> class RingBuffer {
-  private:
-	T buf[S];
-	size_t begin;
-	size_t end;
-	bool wrap;
-
-  public:
-	RingBuffer() : begin(0), end(0), wrap(false)
-	{
-		memset(buf, 0, sizeof(T) * S);
-	}
-
-	/**
-	 * @return A pointer to the underlying buffer
-	 */
-	inline T* get_buf()
-	{
-		return buf + begin;
-	}
-
-	/**
-	 * Adjust buffer index pointer as if we copied data in
-	 * @param n Number of elements to copy in
-	 * @return Number of elements we copied in
-	 */
-	inline size_t produce(size_t n)
-	{
-		n = std::min(n, getFree());
-		if (n == 0) {
-			return n;
-		}
-		const size_t first_chunk = std::min(n, S - end);
-		end = (end + first_chunk) % S;
-		if (first_chunk < n) {
-			const size_t second_chunk = n - first_chunk;
-			end = (end + second_chunk) % S;
-		}
-		if (begin == end) {
-			wrap = true;
-		}
-		return n;
-	}
-
-	/**
-	 * Fast erase, O(1).
-	 * Merely reset the buffer pointer, doesn't erase contents
-	 */
-	inline void reset()
-	{
-		consume(count());
-	}
-
-	/**
-	 * adjust buffer index pointer as if we copied data out
-	 * @param n Number of elements we copied from the buffer
-	 * @return Number of elements actually available from the buffer
-	 */
-	inline size_t consume(size_t n)
-	{
-		n = std::min(n, count());
-		if (n == 0) {
-			return n;
-		}
-		if (wrap) {
-			wrap = false;
-		}
-		const size_t first_chunk = std::min(n, S - begin);
-		begin = (begin + first_chunk) % S;
-		if (first_chunk < n) {
-			const size_t second_chunk = n - first_chunk;
-			begin = (begin + second_chunk) % S;
-		}
-		return n;
-	}
-
-	/**
-	 * @param data Buffer that is to be written to the ring
-	 * @param n Number of elements to write to the buffer
-	 */
-	inline size_t write(const T* data, size_t n)
-	{
-		n = std::min(n, getFree());
-		if (n == 0) {
-			return n;
-		}
-		const size_t first_chunk = std::min(n, S - end);
-		memcpy(buf + end, data, first_chunk * sizeof(T));
-		end = (end + first_chunk) % S;
-		if (first_chunk < n) {
-			const size_t second_chunk = n - first_chunk;
-			memcpy(buf + end, data + first_chunk, second_chunk * sizeof(T));
-			end = (end + second_chunk) % S;
-		}
-		if (begin == end) {
-			wrap = true;
-		}
-		return n;
-	}
-
-	/**
-	 * Place a single value on the buffer. If the buffer is full, consume a value first.
-	 *
-	 * @param value A single value to be placed in the buffer
-	 */
-	inline void push(const T value)
-	{
-		if (count() == S) {
-			consume(1);
-		}
-		const size_t first_chunk = std::min((size_t)1, S - end);
-		*(buf + end) = value;
-		end = (end + first_chunk) % S;
-		if (begin == end) {
-			wrap = true;
-		}
-	}
-
-	/**
-	 * @return The most recently pushed element on the buffer
-	 */
-	inline T get_most_recent()
-	{
-		return *(buf + end);
-	}
-
-	/**
-	 * @param dest Destination buffer
-	 * @param n Size (in terms of number of elements) of the destination buffer
-	 * @return Number of elements read from the buffer
-	 */
-	inline size_t read(T* dest, size_t n)
-	{
-		n = std::min(n, count());
-		if (n == 0) {
-			return n;
-		}
-		if (wrap) {
-			wrap = false;
-		}
-		const size_t first_chunk = std::min(n, S - begin);
-		memcpy(dest, buf + begin, first_chunk * sizeof(T));
-		begin = (begin + first_chunk) % S;
-		if (first_chunk < n) {
-			const size_t second_chunk = n - first_chunk;
-			memcpy(dest + first_chunk, buf + begin, second_chunk * sizeof(T));
-			begin = (begin + second_chunk) % S;
-		}
-		return n;
-	}
-
-	/**
-	 * Return how many elements are in the buffer, O(1).
-	 *
-	 * @return The number of elements in the buffer
-	 */
-	inline size_t count()
-	{
-		if (end == begin) {
-			return wrap ? S : 0;
-		}
-		else if (end > begin) {
-			return end - begin;
-		}
-		else {
-			return S + end - begin;
-		}
-	}
-
-	/**
-	 * @return The number of slots that are unused in the buffer
-	 */
-	inline size_t getFree()
-	{
-		return S - count();
-	}
-
-	/**
-	 * @return The arithmetic mean of the contents of the buffer
-	 */
-	inline float mean()
-	{
-		size_t iterator = begin;
-		float subtotal = 0;
-		size_t curr_cnt = count();
-		for (size_t i = 0; i < curr_cnt; i++) {
-			iterator = (iterator + S - 1) % curr_cnt;
-			subtotal += (float)*(buf + iterator);
-		}
-		return curr_cnt ? subtotal / (float)curr_cnt : 0;
-	}
-
-	/**
-	 * @return The arithmetic mean of the most recent 'n' elements of the buffer
-	 */
-	inline float mean(size_t n)
-	{
-		n = n < S ? n : S;
-		size_t iterator = begin;
-		float subtotal = 0;
-		size_t curr_cnt = count();
-		for (size_t i = 0; i < n; i++) {
-			iterator = (iterator + S - 1) % curr_cnt;
-			subtotal += (float)*(buf + iterator);
-		}
-		return curr_cnt ? subtotal / (float)curr_cnt : 0;
-	}
-
-	/**
-	 * @return The sum of the contents of the buffer
-	 */
-	inline float sum()
-	{
-		size_t iterator = begin;
-		float total = 0;
-		size_t curr_cnt = count();
-		for (size_t i = 0; i < curr_cnt; i++) {
-			iterator = (iterator + S - 1) % curr_cnt;
-			total += (float)*(buf + iterator);
-		}
-		return total;
-	}
-
-	/**
-	 * @return The sample standard deviation of element values
-	 */
-	inline float stddev()
-	{
-		return sqrt(variance());
-	}
-
-	/**
-	 * @return The variance of element values
-	 */
-	inline float variance()
-	{
-		size_t iterator = begin;
-		float cached_mean = mean();
-		size_t curr_cnt = count();
-		T sum_of_squared_deviations = 0;
-		for (size_t i = 0; i < curr_cnt; i++) {
-			iterator = (iterator + S - 1) % curr_cnt;
-			float deviation = (buf[i] - cached_mean);
-			sum_of_squared_deviations += (T)(deviation * deviation);
-		}
-		float variance = (float)sum_of_squared_deviations / (float)(S - 1);
-		return variance;
-	}
-
-	/**
-	 * @return The number of elements of zero value
-	 */
-	inline size_t zeroCount()
-	{
-		size_t iterator = begin;
-		size_t zeros = 0;
-		size_t curr_cnt = count();
-		for (size_t i = 0; i < curr_cnt; i++) {
-			iterator = (iterator + S - 1) % curr_cnt;
-			if (*(buf + iterator) == 0) {
-				zeros++;
-			}
-		}
-		return zeros;
-	}
-
-	/**
-	 * @param value Value to match against in buffer
-	 * @return The number of values held in the ring buffer which match a given value
-	 */
-	inline size_t countValue(T value)
-	{
-		size_t iterator = begin;
-		size_t cnt = 0;
-		size_t curr_cnt = count();
-		for (size_t i = 0; i < curr_cnt; i++) {
-			iterator = (iterator + S - 1) % curr_cnt;
-			if (*(buf + iterator) == value) {
-				cnt++;
-			}
-		}
-		return cnt;
-	}
-
-	/**
-	 * Print the contents of the buffer
-	 */
-	/*
-	inline void dump()
-	{
-		size_t iterator = begin;
-		for (size_t i=0; i<S; i++) {
-			iterator = (iterator + S - 1) % S;
-			if (typeid(T) == typeid(int)) {
-				fprintf(stderr, "buf[%2zu]=%2d\n", iterator, (int)*(buf + iterator));
-			}
-			else {
-				fprintf(stderr, "buf[%2zu]=%2f\n", iterator, (float)*(buf + iterator));
-			}
-		}
-	}
-	*/
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/RuntimeEnvironment.hpp b/node/RuntimeEnvironment.hpp
index f55955ee8..1f527733c 100644
--- a/node/RuntimeEnvironment.hpp
+++ b/node/RuntimeEnvironment.hpp
@@ -1,24 +1,29 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_RUNTIMEENVIRONMENT_HPP
 #define ZT_RUNTIMEENVIRONMENT_HPP
 
+#include <string>
+
 #include "Constants.hpp"
 #include "Identity.hpp"
-#include "Utils.hpp"
-
-#include <string.h>
+#include "Mutex.hpp"
 
 namespace ZeroTier {
 
@@ -29,55 +34,65 @@ class Node;
 class Multicaster;
 class NetworkController;
 class SelfAwareness;
-class Trace;
-class Bond;
-class PacketMultiplexer;
+class Cluster;
+class DeferredPackets;
 
 /**
  * Holds global state for an instance of ZeroTier::Node
  */
-class RuntimeEnvironment {
-  public:
-	RuntimeEnvironment(Node* n) : node(n), localNetworkController((NetworkController*)0), rtmem((void*)0), sw((Switch*)0), mc((Multicaster*)0), topology((Topology*)0), sa((SelfAwareness*)0)
+class RuntimeEnvironment
+{
+public:
+	RuntimeEnvironment(Node *n) :
+		node(n)
+		,identity()
+		,localNetworkController((NetworkController *)0)
+		,sw((Switch *)0)
+		,mc((Multicaster *)0)
+		,topology((Topology *)0)
+		,sa((SelfAwareness *)0)
+		,dp((DeferredPackets *)0)
+#ifdef ZT_ENABLE_CLUSTER
+		,cluster((Cluster *)0)
+#endif
+		,dpEnabled(0)
 	{
-		publicIdentityStr[0] = (char)0;
-		secretIdentityStr[0] = (char)0;
-	}
-
-	~RuntimeEnvironment()
-	{
-		Utils::burn(secretIdentityStr, sizeof(secretIdentityStr));
 	}
 
 	// Node instance that owns this RuntimeEnvironment
-	Node* const node;
+	Node *const node;
+
+	// This node's identity
+	Identity identity;
+	std::string publicIdentityStr;
+	std::string secretIdentityStr;
 
 	// This is set externally to an instance of this base class
-	NetworkController* localNetworkController;
+	NetworkController *localNetworkController;
 
-	// Memory actually occupied by Trace, Switch, etc.
-	void* rtmem;
-
-	/* Order matters a bit here. These are constructed in this order
+	/*
+	 * Order matters a bit here. These are constructed in this order
 	 * and then deleted in the opposite order on Node exit. The order ensures
 	 * that things that are needed are there before they're needed.
 	 *
-	 * These are constant and never null after startup unless indicated. */
+	 * These are constant and never null after startup unless indicated.
+	 */
 
-	Trace* t;
-	Switch* sw;
-	Multicaster* mc;
-	Topology* topology;
-	SelfAwareness* sa;
-	Bond* bc;
-	PacketMultiplexer* pm;
+	Switch *sw;
+	Multicaster *mc;
+	Topology *topology;
+	SelfAwareness *sa;
+	DeferredPackets *dp;
 
-	// This node's identity and string representations thereof
-	Identity identity;
-	char publicIdentityStr[ZT_IDENTITY_STRING_BUFFER_LENGTH];
-	char secretIdentityStr[ZT_IDENTITY_STRING_BUFFER_LENGTH];
+#ifdef ZT_ENABLE_CLUSTER
+	Cluster *cluster;
+#endif
+
+	// This is set to >0 if background threads are waiting on deferred
+	// packets, otherwise 'dp' should not be used.
+	volatile int dpEnabled;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/SHA512.cpp b/node/SHA512.cpp
index 8b3ae9189..76737d371 100644
--- a/node/SHA512.cpp
+++ b/node/SHA512.cpp
@@ -1,276 +1,352 @@
-// This code is public domain, taken from a PD crypto source file on GitHub.
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "SHA512.hpp"
-
 #include "Utils.hpp"
 
-#include <algorithm>
-
 namespace ZeroTier {
 
-#ifndef ZT_HAVE_NATIVE_SHA512
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
 
-namespace {
+// Code taken from NaCl by D. J. Bernstein and others
+// Public domain
 
-struct sha512_state {
-	uint64_t length, state[8];
-	unsigned long curlen;
-	uint8_t buf[128];
+/*
+20080913
+D. J. Bernstein
+Public domain.
+*/
+
+#define uint64 uint64_t
+
+#ifdef ZT_NO_TYPE_PUNNING
+
+static uint64 load_bigendian(const unsigned char *x)
+{
+  return
+      (uint64) (x[7]) \
+  | (((uint64) (x[6])) << 8) \
+  | (((uint64) (x[5])) << 16) \
+  | (((uint64) (x[4])) << 24) \
+  | (((uint64) (x[3])) << 32) \
+  | (((uint64) (x[2])) << 40) \
+  | (((uint64) (x[1])) << 48) \
+  | (((uint64) (x[0])) << 56)
+  ;
+}
+
+static void store_bigendian(unsigned char *x,uint64 u)
+{
+  x[7] = u; u >>= 8;
+  x[6] = u; u >>= 8;
+  x[5] = u; u >>= 8;
+  x[4] = u; u >>= 8;
+  x[3] = u; u >>= 8;
+  x[2] = u; u >>= 8;
+  x[1] = u; u >>= 8;
+  x[0] = u;
+}
+
+#else // !ZT_NO_TYPE_PUNNING
+
+#define load_bigendian(x) Utils::ntoh(*((const uint64_t *)(x)))
+#define store_bigendian(x,u) (*((uint64_t *)(x)) = Utils::hton((u)))
+
+#endif // ZT_NO_TYPE_PUNNING
+
+#define SHR(x,c) ((x) >> (c))
+#define ROTR(x,c) (((x) >> (c)) | ((x) << (64 - (c))))
+
+#define Ch(x,y,z) ((x & y) ^ (~x & z))
+#define Maj(x,y,z) ((x & y) ^ (x & z) ^ (y & z))
+#define Sigma0(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39))
+#define Sigma1(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41))
+#define sigma0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x,7))
+#define sigma1(x) (ROTR(x,19) ^ ROTR(x,61) ^ SHR(x,6))
+
+#define M(w0,w14,w9,w1) w0 = sigma1(w14) + w9 + sigma0(w1) + w0;
+
+#define EXPAND \
+  M(w0 ,w14,w9 ,w1 ) \
+  M(w1 ,w15,w10,w2 ) \
+  M(w2 ,w0 ,w11,w3 ) \
+  M(w3 ,w1 ,w12,w4 ) \
+  M(w4 ,w2 ,w13,w5 ) \
+  M(w5 ,w3 ,w14,w6 ) \
+  M(w6 ,w4 ,w15,w7 ) \
+  M(w7 ,w5 ,w0 ,w8 ) \
+  M(w8 ,w6 ,w1 ,w9 ) \
+  M(w9 ,w7 ,w2 ,w10) \
+  M(w10,w8 ,w3 ,w11) \
+  M(w11,w9 ,w4 ,w12) \
+  M(w12,w10,w5 ,w13) \
+  M(w13,w11,w6 ,w14) \
+  M(w14,w12,w7 ,w15) \
+  M(w15,w13,w8 ,w0 )
+
+#define F(w,k) \
+  T1 = h + Sigma1(e) + Ch(e,f,g) + k + w; \
+  T2 = Sigma0(a) + Maj(a,b,c); \
+  h = g; \
+  g = f; \
+  f = e; \
+  e = d + T1; \
+  d = c; \
+  c = b; \
+  b = a; \
+  a = T1 + T2;
+
+static inline int crypto_hashblocks(unsigned char *statebytes,const unsigned char *in,unsigned long long inlen)
+{
+  uint64 state[8];
+  uint64 a;
+  uint64 b;
+  uint64 c;
+  uint64 d;
+  uint64 e;
+  uint64 f;
+  uint64 g;
+  uint64 h;
+  uint64 T1;
+  uint64 T2;
+
+  a = load_bigendian(statebytes +  0); state[0] = a;
+  b = load_bigendian(statebytes +  8); state[1] = b;
+  c = load_bigendian(statebytes + 16); state[2] = c;
+  d = load_bigendian(statebytes + 24); state[3] = d;
+  e = load_bigendian(statebytes + 32); state[4] = e;
+  f = load_bigendian(statebytes + 40); state[5] = f;
+  g = load_bigendian(statebytes + 48); state[6] = g;
+  h = load_bigendian(statebytes + 56); state[7] = h;
+
+  while (inlen >= 128) {
+    uint64 w0  = load_bigendian(in +   0);
+    uint64 w1  = load_bigendian(in +   8);
+    uint64 w2  = load_bigendian(in +  16);
+    uint64 w3  = load_bigendian(in +  24);
+    uint64 w4  = load_bigendian(in +  32);
+    uint64 w5  = load_bigendian(in +  40);
+    uint64 w6  = load_bigendian(in +  48);
+    uint64 w7  = load_bigendian(in +  56);
+    uint64 w8  = load_bigendian(in +  64);
+    uint64 w9  = load_bigendian(in +  72);
+    uint64 w10 = load_bigendian(in +  80);
+    uint64 w11 = load_bigendian(in +  88);
+    uint64 w12 = load_bigendian(in +  96);
+    uint64 w13 = load_bigendian(in + 104);
+    uint64 w14 = load_bigendian(in + 112);
+    uint64 w15 = load_bigendian(in + 120);
+
+    F(w0 ,0x428a2f98d728ae22ULL)
+    F(w1 ,0x7137449123ef65cdULL)
+    F(w2 ,0xb5c0fbcfec4d3b2fULL)
+    F(w3 ,0xe9b5dba58189dbbcULL)
+    F(w4 ,0x3956c25bf348b538ULL)
+    F(w5 ,0x59f111f1b605d019ULL)
+    F(w6 ,0x923f82a4af194f9bULL)
+    F(w7 ,0xab1c5ed5da6d8118ULL)
+    F(w8 ,0xd807aa98a3030242ULL)
+    F(w9 ,0x12835b0145706fbeULL)
+    F(w10,0x243185be4ee4b28cULL)
+    F(w11,0x550c7dc3d5ffb4e2ULL)
+    F(w12,0x72be5d74f27b896fULL)
+    F(w13,0x80deb1fe3b1696b1ULL)
+    F(w14,0x9bdc06a725c71235ULL)
+    F(w15,0xc19bf174cf692694ULL)
+
+    EXPAND
+
+    F(w0 ,0xe49b69c19ef14ad2ULL)
+    F(w1 ,0xefbe4786384f25e3ULL)
+    F(w2 ,0x0fc19dc68b8cd5b5ULL)
+    F(w3 ,0x240ca1cc77ac9c65ULL)
+    F(w4 ,0x2de92c6f592b0275ULL)
+    F(w5 ,0x4a7484aa6ea6e483ULL)
+    F(w6 ,0x5cb0a9dcbd41fbd4ULL)
+    F(w7 ,0x76f988da831153b5ULL)
+    F(w8 ,0x983e5152ee66dfabULL)
+    F(w9 ,0xa831c66d2db43210ULL)
+    F(w10,0xb00327c898fb213fULL)
+    F(w11,0xbf597fc7beef0ee4ULL)
+    F(w12,0xc6e00bf33da88fc2ULL)
+    F(w13,0xd5a79147930aa725ULL)
+    F(w14,0x06ca6351e003826fULL)
+    F(w15,0x142929670a0e6e70ULL)
+
+    EXPAND
+
+    F(w0 ,0x27b70a8546d22ffcULL)
+    F(w1 ,0x2e1b21385c26c926ULL)
+    F(w2 ,0x4d2c6dfc5ac42aedULL)
+    F(w3 ,0x53380d139d95b3dfULL)
+    F(w4 ,0x650a73548baf63deULL)
+    F(w5 ,0x766a0abb3c77b2a8ULL)
+    F(w6 ,0x81c2c92e47edaee6ULL)
+    F(w7 ,0x92722c851482353bULL)
+    F(w8 ,0xa2bfe8a14cf10364ULL)
+    F(w9 ,0xa81a664bbc423001ULL)
+    F(w10,0xc24b8b70d0f89791ULL)
+    F(w11,0xc76c51a30654be30ULL)
+    F(w12,0xd192e819d6ef5218ULL)
+    F(w13,0xd69906245565a910ULL)
+    F(w14,0xf40e35855771202aULL)
+    F(w15,0x106aa07032bbd1b8ULL)
+
+    EXPAND
+
+    F(w0 ,0x19a4c116b8d2d0c8ULL)
+    F(w1 ,0x1e376c085141ab53ULL)
+    F(w2 ,0x2748774cdf8eeb99ULL)
+    F(w3 ,0x34b0bcb5e19b48a8ULL)
+    F(w4 ,0x391c0cb3c5c95a63ULL)
+    F(w5 ,0x4ed8aa4ae3418acbULL)
+    F(w6 ,0x5b9cca4f7763e373ULL)
+    F(w7 ,0x682e6ff3d6b2b8a3ULL)
+    F(w8 ,0x748f82ee5defb2fcULL)
+    F(w9 ,0x78a5636f43172f60ULL)
+    F(w10,0x84c87814a1f0ab72ULL)
+    F(w11,0x8cc702081a6439ecULL)
+    F(w12,0x90befffa23631e28ULL)
+    F(w13,0xa4506cebde82bde9ULL)
+    F(w14,0xbef9a3f7b2c67915ULL)
+    F(w15,0xc67178f2e372532bULL)
+
+    EXPAND
+
+    F(w0 ,0xca273eceea26619cULL)
+    F(w1 ,0xd186b8c721c0c207ULL)
+    F(w2 ,0xeada7dd6cde0eb1eULL)
+    F(w3 ,0xf57d4f7fee6ed178ULL)
+    F(w4 ,0x06f067aa72176fbaULL)
+    F(w5 ,0x0a637dc5a2c898a6ULL)
+    F(w6 ,0x113f9804bef90daeULL)
+    F(w7 ,0x1b710b35131c471bULL)
+    F(w8 ,0x28db77f523047d84ULL)
+    F(w9 ,0x32caab7b40c72493ULL)
+    F(w10,0x3c9ebe0a15c9bebcULL)
+    F(w11,0x431d67c49c100d4cULL)
+    F(w12,0x4cc5d4becb3e42b6ULL)
+    F(w13,0x597f299cfc657e2aULL)
+    F(w14,0x5fcb6fab3ad6faecULL)
+    F(w15,0x6c44198c4a475817ULL)
+
+    a += state[0];
+    b += state[1];
+    c += state[2];
+    d += state[3];
+    e += state[4];
+    f += state[5];
+    g += state[6];
+    h += state[7];
+
+    state[0] = a;
+    state[1] = b;
+    state[2] = c;
+    state[3] = d;
+    state[4] = e;
+    state[5] = f;
+    state[6] = g;
+    state[7] = h;
+
+    in += 128;
+    inlen -= 128;
+  }
+
+  store_bigendian(statebytes +  0,state[0]);
+  store_bigendian(statebytes +  8,state[1]);
+  store_bigendian(statebytes + 16,state[2]);
+  store_bigendian(statebytes + 24,state[3]);
+  store_bigendian(statebytes + 32,state[4]);
+  store_bigendian(statebytes + 40,state[5]);
+  store_bigendian(statebytes + 48,state[6]);
+  store_bigendian(statebytes + 56,state[7]);
+
+  return 0;
+}
+
+#define blocks crypto_hashblocks
+
+static const unsigned char iv[64] = {
+  0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08,
+  0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b,
+  0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b,
+  0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1,
+  0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1,
+  0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f,
+  0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b,
+  0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79
 };
 
-static const uint64_t K[80] = { 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL,
-								0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
-								0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL,
-								0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
-								0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL,
-								0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
-								0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL,
-								0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
-								0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL };
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
 
-#define STORE64H(x, y) Utils::storeBigEndian<uint64_t>(y, x)
-#define LOAD64H(x, y)  x = Utils::loadBigEndian<uint64_t>(y)
-#define ROL64c(x, y)   (((x) << (y)) | ((x) >> (64 - (y))))
-#define ROR64c(x, y)   (((x) >> (y)) | ((x) << (64 - (y))))
-#define Ch(x, y, z)	   (z ^ (x & (y ^ z)))
-#define Maj(x, y, z)   (((x | y) & z) | (x & y))
-#define S(x, n)		   ROR64c(x, n)
-#define R(x, n)		   ((x) >> (n))
-#define Sigma0(x)	   (S(x, 28) ^ S(x, 34) ^ S(x, 39))
-#define Sigma1(x)	   (S(x, 14) ^ S(x, 18) ^ S(x, 41))
-#define Gamma0(x)	   (S(x, 1) ^ S(x, 8) ^ R(x, 7))
-#define Gamma1(x)	   (S(x, 19) ^ S(x, 61) ^ R(x, 6))
-
-static ZT_INLINE void sha512_compress(sha512_state* const md, uint8_t* const buf)
+void SHA512::hash(void *digest,const void *data,unsigned int len)
 {
-	uint64_t S[8], W[80], t0, t1;
-	int i;
+  unsigned char h[64];
+  unsigned char padded[256];
+  int i;
+  uint64_t bytes = len;
 
-	for (i = 0; i < 8; i++) {
-		S[i] = md->state[i];
-	}
-	for (i = 0; i < 16; i++) {
-		LOAD64H(W[i], buf + (8 * i));
-	}
-	for (i = 16; i < 80; i++) {
-		W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
-	}
+  const unsigned char *in = (const unsigned char *)data;
+  unsigned int inlen = len;
 
-#define RND(a, b, c, d, e, f, g, h, i)                                                                                                                                                                                                         \
-	t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i];                                                                                                                                                                                            \
-	t1 = Sigma0(a) + Maj(a, b, c);                                                                                                                                                                                                             \
-	d += t0;                                                                                                                                                                                                                                   \
-	h = t0 + t1;
+  for (i = 0;i < 64;++i) h[i] = iv[i];
 
-	for (i = 0; i < 80; i += 8) {
-		RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i + 0);
-		RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], i + 1);
-		RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], i + 2);
-		RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], i + 3);
-		RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], i + 4);
-		RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], i + 5);
-		RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], i + 6);
-		RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], i + 7);
-	}
+  blocks(h,in,inlen);
+  in += inlen;
+  inlen &= 127;
+  in -= inlen;
 
-	for (i = 0; i < 8; i++) {
-		md->state[i] = md->state[i] + S[i];
-	}
+  for (i = 0;i < (int)inlen;++i) padded[i] = in[i];
+  padded[inlen] = 0x80;
+
+  if (inlen < 112) {
+    for (i = inlen + 1;i < 119;++i) padded[i] = 0;
+    padded[119] = (unsigned char)((bytes >> 61) & 0xff);
+    padded[120] = (unsigned char)((bytes >> 53) & 0xff);
+    padded[121] = (unsigned char)((bytes >> 45) & 0xff);
+    padded[122] = (unsigned char)((bytes >> 37) & 0xff);
+    padded[123] = (unsigned char)((bytes >> 29) & 0xff);
+    padded[124] = (unsigned char)((bytes >> 21) & 0xff);
+    padded[125] = (unsigned char)((bytes >> 13) & 0xff);
+    padded[126] = (unsigned char)((bytes >> 5) & 0xff);
+    padded[127] = (unsigned char)((bytes << 3) & 0xff);
+    blocks(h,padded,128);
+  } else {
+    for (i = inlen + 1;i < 247;++i) padded[i] = 0;
+    padded[247] = (unsigned char)((bytes >> 61) & 0xff);
+    padded[248] = (unsigned char)((bytes >> 53) & 0xff);
+    padded[249] = (unsigned char)((bytes >> 45) & 0xff);
+    padded[250] = (unsigned char)((bytes >> 37) & 0xff);
+    padded[251] = (unsigned char)((bytes >> 29) & 0xff);
+    padded[252] = (unsigned char)((bytes >> 21) & 0xff);
+    padded[253] = (unsigned char)((bytes >> 13) & 0xff);
+    padded[254] = (unsigned char)((bytes >> 5) & 0xff);
+    padded[255] = (unsigned char)((bytes << 3) & 0xff);
+    blocks(h,padded,256);
+  }
+
+  for (i = 0;i < 64;++i) ((unsigned char *)digest)[i] = h[i];
 }
 
-static ZT_INLINE void sha384_init(sha512_state* const md)
-{
-	md->curlen = 0;
-	md->length = 0;
-	md->state[0] = 0xcbbb9d5dc1059ed8ULL;
-	md->state[1] = 0x629a292a367cd507ULL;
-	md->state[2] = 0x9159015a3070dd17ULL;
-	md->state[3] = 0x152fecd8f70e5939ULL;
-	md->state[4] = 0x67332667ffc00b31ULL;
-	md->state[5] = 0x8eb44a8768581511ULL;
-	md->state[6] = 0xdb0c2e0d64f98fa7ULL;
-	md->state[7] = 0x47b5481dbefa4fa4ULL;
-}
-
-static ZT_INLINE void sha512_init(sha512_state* const md)
-{
-	md->curlen = 0;
-	md->length = 0;
-	md->state[0] = 0x6a09e667f3bcc908ULL;
-	md->state[1] = 0xbb67ae8584caa73bULL;
-	md->state[2] = 0x3c6ef372fe94f82bULL;
-	md->state[3] = 0xa54ff53a5f1d36f1ULL;
-	md->state[4] = 0x510e527fade682d1ULL;
-	md->state[5] = 0x9b05688c2b3e6c1fULL;
-	md->state[6] = 0x1f83d9abfb41bd6bULL;
-	md->state[7] = 0x5be0cd19137e2179ULL;
-}
-
-static void sha512_process(sha512_state* const md, const uint8_t* in, unsigned long inlen)
-{
-	while (inlen > 0) {
-		if (md->curlen == 0 && inlen >= 128) {
-			sha512_compress(md, (uint8_t*)in);
-			md->length += 128 * 8;
-			in += 128;
-			inlen -= 128;
-		}
-		else {
-			unsigned long n = std::min(inlen, (128 - md->curlen));
-			Utils::copy(md->buf + md->curlen, in, n);
-			md->curlen += n;
-			in += n;
-			inlen -= n;
-			if (md->curlen == 128) {
-				sha512_compress(md, md->buf);
-				md->length += 8 * 128;
-				md->curlen = 0;
-			}
-		}
-	}
-}
-
-static ZT_INLINE void sha512_done(sha512_state* const md, uint8_t* out)
-{
-	int i;
-
-	md->length += md->curlen * 8ULL;
-	md->buf[md->curlen++] = (uint8_t)0x80;
-
-	if (md->curlen > 112) {
-		while (md->curlen < 128) {
-			md->buf[md->curlen++] = (uint8_t)0;
-		}
-		sha512_compress(md, md->buf);
-		md->curlen = 0;
-	}
-
-	while (md->curlen < 120) {
-		md->buf[md->curlen++] = (uint8_t)0;
-	}
-
-	STORE64H(md->length, md->buf + 120);
-	sha512_compress(md, md->buf);
-
-	for (i = 0; i < 8; i++) {
-		STORE64H(md->state[i], out + (8 * i));
-	}
-}
-
-}	// anonymous namespace
-
-void SHA512(void* digest, const void* data, unsigned int len)
-{
-	sha512_state state;
-	sha512_init(&state);
-	sha512_process(&state, (uint8_t*)data, (unsigned long)len);
-	sha512_done(&state, (uint8_t*)digest);
-}
-
-void SHA384(void* digest, const void* data, unsigned int len)
-{
-	uint8_t tmp[64];
-	sha512_state state;
-	sha384_init(&state);
-	sha512_process(&state, (uint8_t*)data, (unsigned long)len);
-	sha512_done(&state, tmp);
-	Utils::copy<48>(digest, tmp);
-}
-
-void SHA384(void* digest, const void* data0, unsigned int len0, const void* data1, unsigned int len1)
-{
-	uint8_t tmp[64];
-	sha512_state state;
-	sha384_init(&state);
-	sha512_process(&state, (uint8_t*)data0, (unsigned long)len0);
-	sha512_process(&state, (uint8_t*)data1, (unsigned long)len1);
-	sha512_done(&state, tmp);
-	Utils::copy<48>(digest, tmp);
-}
-
-#endif	 // !ZT_HAVE_NATIVE_SHA512
-
-void HMACSHA384(const uint8_t key[ZT_SYMMETRIC_KEY_SIZE], const void* msg, const unsigned int msglen, uint8_t mac[48])
-{
-	uint64_t kInPadded[16];	  // input padded key
-	uint64_t outer[22];		  // output padded key | H(input padded key | msg)
-
-	const uint64_t k0 = Utils::loadMachineEndian<uint64_t>(key);
-	const uint64_t k1 = Utils::loadMachineEndian<uint64_t>(key + 8);
-	const uint64_t k2 = Utils::loadMachineEndian<uint64_t>(key + 16);
-	const uint64_t k3 = Utils::loadMachineEndian<uint64_t>(key + 24);
-	const uint64_t k4 = Utils::loadMachineEndian<uint64_t>(key + 32);
-	const uint64_t k5 = Utils::loadMachineEndian<uint64_t>(key + 40);
-
-	const uint64_t ipad = 0x3636363636363636ULL;
-	kInPadded[0] = k0 ^ ipad;
-	kInPadded[1] = k1 ^ ipad;
-	kInPadded[2] = k2 ^ ipad;
-	kInPadded[3] = k3 ^ ipad;
-	kInPadded[4] = k4 ^ ipad;
-	kInPadded[5] = k5 ^ ipad;
-	kInPadded[6] = ipad;
-	kInPadded[7] = ipad;
-	kInPadded[8] = ipad;
-	kInPadded[9] = ipad;
-	kInPadded[10] = ipad;
-	kInPadded[11] = ipad;
-	kInPadded[12] = ipad;
-	kInPadded[13] = ipad;
-	kInPadded[14] = ipad;
-	kInPadded[15] = ipad;
-
-	const uint64_t opad = 0x5c5c5c5c5c5c5c5cULL;
-	outer[0] = k0 ^ opad;
-	outer[1] = k1 ^ opad;
-	outer[2] = k2 ^ opad;
-	outer[3] = k3 ^ opad;
-	outer[4] = k4 ^ opad;
-	outer[5] = k5 ^ opad;
-	outer[6] = opad;
-	outer[7] = opad;
-	outer[8] = opad;
-	outer[9] = opad;
-	outer[10] = opad;
-	outer[11] = opad;
-	outer[12] = opad;
-	outer[13] = opad;
-	outer[14] = opad;
-	outer[15] = opad;
-
-	// H(output padded key | H(input padded key | msg))
-	SHA384(reinterpret_cast<uint8_t*>(outer) + 128, kInPadded, 128, msg, msglen);
-	SHA384(mac, outer, 176);
-}
-
-void KBKDFHMACSHA384(const uint8_t key[ZT_SYMMETRIC_KEY_SIZE], const char label, const char context, const uint32_t iter, uint8_t out[ZT_SYMMETRIC_KEY_SIZE])
-{
-	uint8_t kbkdfMsg[13];
-
-	Utils::storeBigEndian<uint32_t>(kbkdfMsg, (uint32_t)iter);
-
-	kbkdfMsg[4] = (uint8_t)'Z';
-	kbkdfMsg[5] = (uint8_t)'T';	  // preface our labels with something ZT-specific
-	kbkdfMsg[6] = (uint8_t)label;
-	kbkdfMsg[7] = 0;
-
-	kbkdfMsg[8] = (uint8_t)context;
-
-	// Output key length: 384 bits (as 32-bit big-endian value)
-	kbkdfMsg[9] = 0;
-	kbkdfMsg[10] = 0;
-	kbkdfMsg[11] = 0x01;
-	kbkdfMsg[12] = 0x80;
-
-	static_assert(ZT_SYMMETRIC_KEY_SIZE == ZT_SHA384_DIGEST_SIZE, "sizeof(out) != ZT_SHA384_DIGEST_SIZE");
-	HMACSHA384(key, &kbkdfMsg, sizeof(kbkdfMsg), out);
-}
-
-}	// namespace ZeroTier
-
-// Internally re-export to included C code, which includes some fast crypto code ported in on some platforms.
-// This eliminates the need to link against a third party SHA512() from this code
-extern "C" void ZT_sha512internal(void* digest, const void* data, unsigned int len)
-{
-	ZeroTier::SHA512(digest, data, len);
-}
+} // namespace ZeroTier
diff --git a/node/SHA512.hpp b/node/SHA512.hpp
index 3849856ef..639a7dfdd 100644
--- a/node/SHA512.hpp
+++ b/node/SHA512.hpp
@@ -1,88 +1,37 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_SHA512_HPP
 #define ZT_SHA512_HPP
 
-#include "Constants.hpp"
-
-#ifdef __APPLE__
-#include <CommonCrypto/CommonDigest.h>
-#endif
-
-#define ZT_SHA512_DIGEST_SIZE 64
-#define ZT_SHA384_DIGEST_SIZE 48
-#define ZT_SHA512_BLOCK_SIZE  128
-#define ZT_SHA384_BLOCK_SIZE  128
-
-#define ZT_HMACSHA384_LEN 48
+#define ZT_SHA512_DIGEST_LEN 64
 
 namespace ZeroTier {
 
-// SHA384 and SHA512 are actually in the standard libraries on MacOS and iOS
-#ifdef __APPLE__
-#define ZT_HAVE_NATIVE_SHA512 1
-static ZT_INLINE void SHA512(void* digest, const void* data, unsigned int len)
-{
-	CC_SHA512_CTX ctx;
-	CC_SHA512_Init(&ctx);
-	CC_SHA512_Update(&ctx, data, len);
-	CC_SHA512_Final(reinterpret_cast<unsigned char*>(digest), &ctx);
-}
-static ZT_INLINE void SHA384(void* digest, const void* data, unsigned int len)
-{
-	CC_SHA512_CTX ctx;
-	CC_SHA384_Init(&ctx);
-	CC_SHA384_Update(&ctx, data, len);
-	CC_SHA384_Final(reinterpret_cast<unsigned char*>(digest), &ctx);
-}
-static ZT_INLINE void SHA384(void* digest, const void* data0, unsigned int len0, const void* data1, unsigned int len1)
-{
-	CC_SHA512_CTX ctx;
-	CC_SHA384_Init(&ctx);
-	CC_SHA384_Update(&ctx, data0, len0);
-	CC_SHA384_Update(&ctx, data1, len1);
-	CC_SHA384_Final(reinterpret_cast<unsigned char*>(digest), &ctx);
-}
-#endif
-
-#ifndef ZT_HAVE_NATIVE_SHA512
-void SHA512(void* digest, const void* data, unsigned int len);
-void SHA384(void* digest, const void* data, unsigned int len);
-void SHA384(void* digest, const void* data0, unsigned int len0, const void* data1, unsigned int len1);
-#endif
-
 /**
- * Compute HMAC SHA-384 using a 256-bit key
- *
- * @param key Secret key
- * @param msg Message to HMAC
- * @param msglen Length of message
- * @param mac Buffer to fill with result
+ * SHA-512 digest algorithm
  */
-void HMACSHA384(const uint8_t key[ZT_SYMMETRIC_KEY_SIZE], const void* msg, unsigned int msglen, uint8_t mac[48]);
+class SHA512
+{
+public:
+	static void hash(void *digest,const void *data,unsigned int len);
+};
 
-/**
- * Compute KBKDF (key-based key derivation function) using HMAC-SHA-384 as a PRF
- *
- * @param key Source master key
- * @param label A label indicating the key's purpose in the ZeroTier system
- * @param context An arbitrary "context" or zero if not applicable
- * @param iter Key iteration for generation of multiple keys for the same label/context
- * @param out Output to receive derived key
- */
-void KBKDFHMACSHA384(const uint8_t key[ZT_SYMMETRIC_KEY_SIZE], char label, char context, uint32_t iter, uint8_t out[ZT_SYMMETRIC_KEY_SIZE]);
-
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Salsa20.cpp b/node/Salsa20.cpp
index ad7ad5289..3aa19ac62 100644
--- a/node/Salsa20.cpp
+++ b/node/Salsa20.cpp
@@ -7,125 +7,129 @@
  * Since the original was public domain, this is too.
  */
 
+#include "Constants.hpp"
 #include "Salsa20.hpp"
 
-#include "Constants.hpp"
+#define ROTATE(v,c) (((v) << (c)) | ((v) >> (32 - (c))))
+#define XOR(v,w) ((v) ^ (w))
+#define PLUS(v,w) ((uint32_t)((v) + (w)))
 
-#define ROTATE(v, c) (((v) << (c)) | ((v) >> (32 - (c))))
-#define XOR(v, w)	 ((v) ^ (w))
-#define PLUS(v, w)	 ((uint32_t)((v) + (w)))
-
-// Set up load/store macros with appropriate endianness (we don't use these in SSE mode)
+// Set up laod/store macros with appropriate endianness (we don't use these in SSE mode)
 #ifndef ZT_SALSA20_SSE
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 
 #ifdef ZT_NO_TYPE_PUNNING
 // Slower version that does not use type punning
-#define U8TO32_LITTLE(p) (((uint32_t)(p)[0]) | ((uint32_t)(p)[1] << 8) | ((uint32_t)(p)[2] << 16) | ((uint32_t)(p)[3] << 24))
-static inline void U32TO8_LITTLE(uint8_t* const c, const uint32_t v)
-{
-	c[0] = (uint8_t)v;
-	c[1] = (uint8_t)(v >> 8);
-	c[2] = (uint8_t)(v >> 16);
-	c[3] = (uint8_t)(v >> 24);
-}
+#define U8TO32_LITTLE(p) ( ((uint32_t)(p)[0]) | ((uint32_t)(p)[1] << 8) | ((uint32_t)(p)[2] << 16) | ((uint32_t)(p)[3] << 24) )
+static inline void U32TO8_LITTLE(uint8_t *const c,const uint32_t v) { c[0] = (uint8_t)v; c[1] = (uint8_t)(v >> 8); c[2] = (uint8_t)(v >> 16); c[3] = (uint8_t)(v >> 24); }
 #else
 // Fast version that just does 32-bit load/store
-#define U8TO32_LITTLE(p)	(*((const uint32_t*)((const void*)(p))))
-#define U32TO8_LITTLE(c, v) *((uint32_t*)((void*)(c))) = (v)
-#endif	 // ZT_NO_TYPE_PUNNING
+#define U8TO32_LITTLE(p) (*((const uint32_t *)((const void *)(p))))
+#define U32TO8_LITTLE(c,v) *((uint32_t *)((void *)(c))) = (v)
+#endif // ZT_NO_TYPE_PUNNING
 
-#else	// __BYTE_ORDER == __BIG_ENDIAN (we don't support anything else... does MIDDLE_ENDIAN even still exist?)
+#else // __BYTE_ORDER == __BIG_ENDIAN (we don't support anything else... does MIDDLE_ENDIAN even still exist?)
 
 #ifdef __GNUC__
 
 // Use GNUC builtin bswap macros on big-endian machines if available
-#define U8TO32_LITTLE(p)	__builtin_bswap32(*((const uint32_t*)((const void*)(p))))
-#define U32TO8_LITTLE(c, v) *((uint32_t*)((void*)(c))) = __builtin_bswap32((v))
+#define U8TO32_LITTLE(p) __builtin_bswap32(*((const uint32_t *)((const void *)(p))))
+#define U32TO8_LITTLE(c,v) *((uint32_t *)((void *)(c))) = __builtin_bswap32((v))
 
-#else	// no __GNUC__
+#else // no __GNUC__
 
 // Otherwise do it the slow, manual way on BE machines
-#define U8TO32_LITTLE(p) (((uint32_t)(p)[0]) | ((uint32_t)(p)[1] << 8) | ((uint32_t)(p)[2] << 16) | ((uint32_t)(p)[3] << 24))
-static inline void U32TO8_LITTLE(uint8_t* const c, const uint32_t v)
-{
-	c[0] = (uint8_t)v;
-	c[1] = (uint8_t)(v >> 8);
-	c[2] = (uint8_t)(v >> 16);
-	c[3] = (uint8_t)(v >> 24);
-}
+#define U8TO32_LITTLE(p) ( ((uint32_t)(p)[0]) | ((uint32_t)(p)[1] << 8) | ((uint32_t)(p)[2] << 16) | ((uint32_t)(p)[3] << 24) )
+static inline void U32TO8_LITTLE(uint8_t *const c,const uint32_t v) { c[0] = (uint8_t)v; c[1] = (uint8_t)(v >> 8); c[2] = (uint8_t)(v >> 16); c[3] = (uint8_t)(v >> 24); }
 
-#endif	 // __GNUC__ or not
+#endif // __GNUC__ or not
 
-#endif	 // __BYTE_ORDER little or big?
+#endif // __BYTE_ORDER little or big?
 
-#endif	 // !ZT_SALSA20_SSE
+#endif // !ZT_SALSA20_SSE
 
 // Statically compute and define SSE constants
 #ifdef ZT_SALSA20_SSE
-class _s20sseconsts {
-  public:
+class _s20sseconsts
+{
+public:
 	_s20sseconsts()
 	{
 		maskLo32 = _mm_shuffle_epi32(_mm_cvtsi32_si128(-1), _MM_SHUFFLE(1, 0, 1, 0));
 		maskHi32 = _mm_slli_epi64(maskLo32, 32);
 	}
-	__m128i maskLo32, maskHi32;
+	__m128i maskLo32,maskHi32;
 };
 static const _s20sseconsts _S20SSECONSTANTS;
 #endif
 
 namespace ZeroTier {
 
-void Salsa20::init(const void* key, const void* iv)
+void Salsa20::init(const void *key,unsigned int kbits,const void *iv)
+	throw()
 {
 #ifdef ZT_SALSA20_SSE
-	const uint32_t* const k = (const uint32_t*)key;
+	const uint32_t *k = (const uint32_t *)key;
+
 	_state.i[0] = 0x61707865;
-	_state.i[1] = 0x3320646e;
-	_state.i[2] = 0x79622d32;
 	_state.i[3] = 0x6b206574;
-	_state.i[4] = k[3];
-	_state.i[5] = 0;
-	_state.i[6] = k[7];
-	_state.i[7] = k[2];
-	_state.i[8] = 0;
-	_state.i[9] = k[6];
-	_state.i[10] = k[1];
-	_state.i[11] = ((const uint32_t*)iv)[1];
-	_state.i[12] = k[5];
 	_state.i[13] = k[0];
-	_state.i[14] = ((const uint32_t*)iv)[0];
-	_state.i[15] = k[4];
+	_state.i[10] = k[1];
+	_state.i[7] = k[2];
+	_state.i[4] = k[3];
+	if (kbits == 256) {
+		k += 4;
+		_state.i[1] = 0x3320646e;
+		_state.i[2] = 0x79622d32;
+	} else {
+		_state.i[1] = 0x3120646e;
+		_state.i[2] = 0x79622d36;
+	}
+	_state.i[15] = k[0];
+	_state.i[12] = k[1];
+	_state.i[9] = k[2];
+	_state.i[6] = k[3];
+	_state.i[14] = ((const uint32_t *)iv)[0];
+	_state.i[11] = ((const uint32_t *)iv)[1];
+	_state.i[5] = 0;
+	_state.i[8] = 0;
 #else
-	const char* const constants = "expand 32-byte k";
-	const uint8_t* const k = (const uint8_t*)key;
-	_state.i[0] = U8TO32_LITTLE(constants + 0);
+	const char *constants;
+	const uint8_t *k = (const uint8_t *)key;
+
 	_state.i[1] = U8TO32_LITTLE(k + 0);
 	_state.i[2] = U8TO32_LITTLE(k + 4);
 	_state.i[3] = U8TO32_LITTLE(k + 8);
 	_state.i[4] = U8TO32_LITTLE(k + 12);
+	if (kbits == 256) { /* recommended */
+		k += 16;
+		constants = "expand 32-byte k";
+	} else { /* kbits == 128 */
+		constants = "expand 16-byte k";
+	}
 	_state.i[5] = U8TO32_LITTLE(constants + 4);
-	_state.i[6] = U8TO32_LITTLE(((const uint8_t*)iv) + 0);
-	_state.i[7] = U8TO32_LITTLE(((const uint8_t*)iv) + 4);
+	_state.i[6] = U8TO32_LITTLE(((const uint8_t *)iv) + 0);
+	_state.i[7] = U8TO32_LITTLE(((const uint8_t *)iv) + 4);
 	_state.i[8] = 0;
 	_state.i[9] = 0;
 	_state.i[10] = U8TO32_LITTLE(constants + 8);
-	_state.i[11] = U8TO32_LITTLE(k + 16);
-	_state.i[12] = U8TO32_LITTLE(k + 20);
-	_state.i[13] = U8TO32_LITTLE(k + 24);
-	_state.i[14] = U8TO32_LITTLE(k + 28);
+	_state.i[11] = U8TO32_LITTLE(k + 0);
+	_state.i[12] = U8TO32_LITTLE(k + 4);
+	_state.i[13] = U8TO32_LITTLE(k + 8);
+	_state.i[14] = U8TO32_LITTLE(k + 12);
 	_state.i[15] = U8TO32_LITTLE(constants + 12);
+	_state.i[0] = U8TO32_LITTLE(constants + 0);
 #endif
 }
 
-void Salsa20::crypt12(const void* in, void* out, unsigned int bytes)
+void Salsa20::encrypt12(const void *in,void *out,unsigned int bytes)
+	throw()
 {
 	uint8_t tmp[64];
-	const uint8_t* m = (const uint8_t*)in;
-	uint8_t* c = (uint8_t*)out;
-	uint8_t* ctarget = c;
+	const uint8_t *m = (const uint8_t *)in;
+	uint8_t *c = (uint8_t *)out;
+	uint8_t *ctarget = c;
 	unsigned int i;
 
 #ifndef ZT_SALSA20_SSE
@@ -133,9 +137,8 @@ void Salsa20::crypt12(const void* in, void* out, unsigned int bytes)
 	uint32_t j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
 #endif
 
-	if (! bytes) {
+	if (!bytes)
 		return;
-	}
 
 #ifndef ZT_SALSA20_SSE
 	j0 = _state.i[0];
@@ -158,19 +161,18 @@ void Salsa20::crypt12(const void* in, void* out, unsigned int bytes)
 
 	for (;;) {
 		if (bytes < 64) {
-			for (i = 0; i < bytes; ++i) {
+			for (i = 0;i < bytes;++i)
 				tmp[i] = m[i];
-			}
 			m = tmp;
 			ctarget = c;
 			c = tmp;
 		}
 
 #ifdef ZT_SALSA20_SSE
-		__m128i X0 = _mm_loadu_si128((const __m128i*)&(_state.v[0]));
-		__m128i X1 = _mm_loadu_si128((const __m128i*)&(_state.v[1]));
-		__m128i X2 = _mm_loadu_si128((const __m128i*)&(_state.v[2]));
-		__m128i X3 = _mm_loadu_si128((const __m128i*)&(_state.v[3]));
+		__m128i X0 = _mm_loadu_si128((const __m128i *)&(_state.v[0]));
+		__m128i X1 = _mm_loadu_si128((const __m128i *)&(_state.v[1]));
+		__m128i X2 = _mm_loadu_si128((const __m128i *)&(_state.v[2]));
+		__m128i X3 = _mm_loadu_si128((const __m128i *)&(_state.v[3]));
 		__m128i T;
 		__m128i X0s = X0;
 		__m128i X1s = X1;
@@ -321,23 +323,23 @@ void Salsa20::crypt12(const void* in, void* out, unsigned int bytes)
 		X2 = _mm_shuffle_epi32(X2, 0x4E);
 		X3 = _mm_shuffle_epi32(X3, 0x93);
 
-		X0 = _mm_add_epi32(X0s, X0);
-		X1 = _mm_add_epi32(X1s, X1);
-		X2 = _mm_add_epi32(X2s, X2);
-		X3 = _mm_add_epi32(X3s, X3);
+		X0 = _mm_add_epi32(X0s,X0);
+		X1 = _mm_add_epi32(X1s,X1);
+		X2 = _mm_add_epi32(X2s,X2);
+		X3 = _mm_add_epi32(X3s,X3);
 
 		__m128i k02 = _mm_shuffle_epi32(_mm_or_si128(_mm_slli_epi64(X0, 32), _mm_srli_epi64(X3, 32)), _MM_SHUFFLE(0, 1, 2, 3));
 		__m128i k13 = _mm_shuffle_epi32(_mm_or_si128(_mm_slli_epi64(X1, 32), _mm_srli_epi64(X0, 32)), _MM_SHUFFLE(0, 1, 2, 3));
 		__m128i k20 = _mm_or_si128(_mm_and_si128(X2, _S20SSECONSTANTS.maskLo32), _mm_and_si128(X1, _S20SSECONSTANTS.maskHi32));
 		__m128i k31 = _mm_or_si128(_mm_and_si128(X3, _S20SSECONSTANTS.maskLo32), _mm_and_si128(X2, _S20SSECONSTANTS.maskHi32));
-		_mm_storeu_ps(reinterpret_cast<float*>(c), _mm_castsi128_ps(_mm_xor_si128(_mm_unpackhi_epi64(k02, k20), _mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float*>(m))))));
-		_mm_storeu_ps(reinterpret_cast<float*>(c) + 4, _mm_castsi128_ps(_mm_xor_si128(_mm_unpackhi_epi64(k13, k31), _mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float*>(m) + 4)))));
-		_mm_storeu_ps(reinterpret_cast<float*>(c) + 8, _mm_castsi128_ps(_mm_xor_si128(_mm_unpacklo_epi64(k20, k02), _mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float*>(m) + 8)))));
-		_mm_storeu_ps(reinterpret_cast<float*>(c) + 12, _mm_castsi128_ps(_mm_xor_si128(_mm_unpacklo_epi64(k31, k13), _mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float*>(m) + 12)))));
+		_mm_storeu_ps(reinterpret_cast<float *>(c),_mm_castsi128_ps(_mm_xor_si128(_mm_unpackhi_epi64(k02,k20),_mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float *>(m))))));
+		_mm_storeu_ps(reinterpret_cast<float *>(c) + 4,_mm_castsi128_ps(_mm_xor_si128(_mm_unpackhi_epi64(k13,k31),_mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float *>(m) + 4)))));
+		_mm_storeu_ps(reinterpret_cast<float *>(c) + 8,_mm_castsi128_ps(_mm_xor_si128(_mm_unpacklo_epi64(k20,k02),_mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float *>(m) + 8)))));
+		_mm_storeu_ps(reinterpret_cast<float *>(c) + 12,_mm_castsi128_ps(_mm_xor_si128(_mm_unpacklo_epi64(k31,k13),_mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float *>(m) + 12)))));
 
-		if (! (++_state.i[8])) {
-			++_state.i[5];	 // state reordered for SSE
-							 /* stopping at 2^70 bytes per nonce is user's responsibility */
+		if (!(++_state.i[8])) {
+			++_state.i[5]; // state reordered for SSE
+			/* stopping at 2^70 bytes per nonce is user's responsibility */
 		}
 #else
 		x0 = j0;
@@ -358,244 +360,244 @@ void Salsa20::crypt12(const void* in, void* out, unsigned int bytes)
 		x15 = j15;
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
-		x0 = PLUS(x0, j0);
-		x1 = PLUS(x1, j1);
-		x2 = PLUS(x2, j2);
-		x3 = PLUS(x3, j3);
-		x4 = PLUS(x4, j4);
-		x5 = PLUS(x5, j5);
-		x6 = PLUS(x6, j6);
-		x7 = PLUS(x7, j7);
-		x8 = PLUS(x8, j8);
-		x9 = PLUS(x9, j9);
-		x10 = PLUS(x10, j10);
-		x11 = PLUS(x11, j11);
-		x12 = PLUS(x12, j12);
-		x13 = PLUS(x13, j13);
-		x14 = PLUS(x14, j14);
-		x15 = PLUS(x15, j15);
+		x0 = PLUS(x0,j0);
+		x1 = PLUS(x1,j1);
+		x2 = PLUS(x2,j2);
+		x3 = PLUS(x3,j3);
+		x4 = PLUS(x4,j4);
+		x5 = PLUS(x5,j5);
+		x6 = PLUS(x6,j6);
+		x7 = PLUS(x7,j7);
+		x8 = PLUS(x8,j8);
+		x9 = PLUS(x9,j9);
+		x10 = PLUS(x10,j10);
+		x11 = PLUS(x11,j11);
+		x12 = PLUS(x12,j12);
+		x13 = PLUS(x13,j13);
+		x14 = PLUS(x14,j14);
+		x15 = PLUS(x15,j15);
 
-		U32TO8_LITTLE(c + 0, XOR(x0, U8TO32_LITTLE(m + 0)));
-		U32TO8_LITTLE(c + 4, XOR(x1, U8TO32_LITTLE(m + 4)));
-		U32TO8_LITTLE(c + 8, XOR(x2, U8TO32_LITTLE(m + 8)));
-		U32TO8_LITTLE(c + 12, XOR(x3, U8TO32_LITTLE(m + 12)));
-		U32TO8_LITTLE(c + 16, XOR(x4, U8TO32_LITTLE(m + 16)));
-		U32TO8_LITTLE(c + 20, XOR(x5, U8TO32_LITTLE(m + 20)));
-		U32TO8_LITTLE(c + 24, XOR(x6, U8TO32_LITTLE(m + 24)));
-		U32TO8_LITTLE(c + 28, XOR(x7, U8TO32_LITTLE(m + 28)));
-		U32TO8_LITTLE(c + 32, XOR(x8, U8TO32_LITTLE(m + 32)));
-		U32TO8_LITTLE(c + 36, XOR(x9, U8TO32_LITTLE(m + 36)));
-		U32TO8_LITTLE(c + 40, XOR(x10, U8TO32_LITTLE(m + 40)));
-		U32TO8_LITTLE(c + 44, XOR(x11, U8TO32_LITTLE(m + 44)));
-		U32TO8_LITTLE(c + 48, XOR(x12, U8TO32_LITTLE(m + 48)));
-		U32TO8_LITTLE(c + 52, XOR(x13, U8TO32_LITTLE(m + 52)));
-		U32TO8_LITTLE(c + 56, XOR(x14, U8TO32_LITTLE(m + 56)));
-		U32TO8_LITTLE(c + 60, XOR(x15, U8TO32_LITTLE(m + 60)));
+		U32TO8_LITTLE(c + 0,XOR(x0,U8TO32_LITTLE(m + 0)));
+		U32TO8_LITTLE(c + 4,XOR(x1,U8TO32_LITTLE(m + 4)));
+		U32TO8_LITTLE(c + 8,XOR(x2,U8TO32_LITTLE(m + 8)));
+		U32TO8_LITTLE(c + 12,XOR(x3,U8TO32_LITTLE(m + 12)));
+		U32TO8_LITTLE(c + 16,XOR(x4,U8TO32_LITTLE(m + 16)));
+		U32TO8_LITTLE(c + 20,XOR(x5,U8TO32_LITTLE(m + 20)));
+		U32TO8_LITTLE(c + 24,XOR(x6,U8TO32_LITTLE(m + 24)));
+		U32TO8_LITTLE(c + 28,XOR(x7,U8TO32_LITTLE(m + 28)));
+		U32TO8_LITTLE(c + 32,XOR(x8,U8TO32_LITTLE(m + 32)));
+		U32TO8_LITTLE(c + 36,XOR(x9,U8TO32_LITTLE(m + 36)));
+		U32TO8_LITTLE(c + 40,XOR(x10,U8TO32_LITTLE(m + 40)));
+		U32TO8_LITTLE(c + 44,XOR(x11,U8TO32_LITTLE(m + 44)));
+		U32TO8_LITTLE(c + 48,XOR(x12,U8TO32_LITTLE(m + 48)));
+		U32TO8_LITTLE(c + 52,XOR(x13,U8TO32_LITTLE(m + 52)));
+		U32TO8_LITTLE(c + 56,XOR(x14,U8TO32_LITTLE(m + 56)));
+		U32TO8_LITTLE(c + 60,XOR(x15,U8TO32_LITTLE(m + 60)));
 
-		if (! (++j8)) {
+		if (!(++j8)) {
 			++j9;
 			/* stopping at 2^70 bytes per nonce is user's responsibility */
 		}
@@ -603,9 +605,8 @@ void Salsa20::crypt12(const void* in, void* out, unsigned int bytes)
 
 		if (bytes <= 64) {
 			if (bytes < 64) {
-				for (i = 0; i < bytes; ++i) {
+				for (i = 0;i < bytes;++i)
 					ctarget[i] = c[i];
-				}
 			}
 
 #ifndef ZT_SALSA20_SSE
@@ -622,12 +623,13 @@ void Salsa20::crypt12(const void* in, void* out, unsigned int bytes)
 	}
 }
 
-void Salsa20::crypt20(const void* in, void* out, unsigned int bytes)
+void Salsa20::encrypt20(const void *in,void *out,unsigned int bytes)
+	throw()
 {
 	uint8_t tmp[64];
-	const uint8_t* m = (const uint8_t*)in;
-	uint8_t* c = (uint8_t*)out;
-	uint8_t* ctarget = c;
+	const uint8_t *m = (const uint8_t *)in;
+	uint8_t *c = (uint8_t *)out;
+	uint8_t *ctarget = c;
 	unsigned int i;
 
 #ifndef ZT_SALSA20_SSE
@@ -635,9 +637,8 @@ void Salsa20::crypt20(const void* in, void* out, unsigned int bytes)
 	uint32_t j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
 #endif
 
-	if (! bytes) {
+	if (!bytes)
 		return;
-	}
 
 #ifndef ZT_SALSA20_SSE
 	j0 = _state.i[0];
@@ -660,19 +661,18 @@ void Salsa20::crypt20(const void* in, void* out, unsigned int bytes)
 
 	for (;;) {
 		if (bytes < 64) {
-			for (i = 0; i < bytes; ++i) {
+			for (i = 0;i < bytes;++i)
 				tmp[i] = m[i];
-			}
 			m = tmp;
 			ctarget = c;
 			c = tmp;
 		}
 
 #ifdef ZT_SALSA20_SSE
-		__m128i X0 = _mm_loadu_si128((const __m128i*)&(_state.v[0]));
-		__m128i X1 = _mm_loadu_si128((const __m128i*)&(_state.v[1]));
-		__m128i X2 = _mm_loadu_si128((const __m128i*)&(_state.v[2]));
-		__m128i X3 = _mm_loadu_si128((const __m128i*)&(_state.v[3]));
+		__m128i X0 = _mm_loadu_si128((const __m128i *)&(_state.v[0]));
+		__m128i X1 = _mm_loadu_si128((const __m128i *)&(_state.v[1]));
+		__m128i X2 = _mm_loadu_si128((const __m128i *)&(_state.v[2]));
+		__m128i X3 = _mm_loadu_si128((const __m128i *)&(_state.v[3]));
 		__m128i T;
 		__m128i X0s = X0;
 		__m128i X1s = X1;
@@ -919,23 +919,23 @@ void Salsa20::crypt20(const void* in, void* out, unsigned int bytes)
 		X2 = _mm_shuffle_epi32(X2, 0x4E);
 		X3 = _mm_shuffle_epi32(X3, 0x93);
 
-		X0 = _mm_add_epi32(X0s, X0);
-		X1 = _mm_add_epi32(X1s, X1);
-		X2 = _mm_add_epi32(X2s, X2);
-		X3 = _mm_add_epi32(X3s, X3);
+		X0 = _mm_add_epi32(X0s,X0);
+		X1 = _mm_add_epi32(X1s,X1);
+		X2 = _mm_add_epi32(X2s,X2);
+		X3 = _mm_add_epi32(X3s,X3);
 
 		__m128i k02 = _mm_shuffle_epi32(_mm_or_si128(_mm_slli_epi64(X0, 32), _mm_srli_epi64(X3, 32)), _MM_SHUFFLE(0, 1, 2, 3));
 		__m128i k13 = _mm_shuffle_epi32(_mm_or_si128(_mm_slli_epi64(X1, 32), _mm_srli_epi64(X0, 32)), _MM_SHUFFLE(0, 1, 2, 3));
 		__m128i k20 = _mm_or_si128(_mm_and_si128(X2, _S20SSECONSTANTS.maskLo32), _mm_and_si128(X1, _S20SSECONSTANTS.maskHi32));
 		__m128i k31 = _mm_or_si128(_mm_and_si128(X3, _S20SSECONSTANTS.maskLo32), _mm_and_si128(X2, _S20SSECONSTANTS.maskHi32));
-		_mm_storeu_ps(reinterpret_cast<float*>(c), _mm_castsi128_ps(_mm_xor_si128(_mm_unpackhi_epi64(k02, k20), _mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float*>(m))))));
-		_mm_storeu_ps(reinterpret_cast<float*>(c) + 4, _mm_castsi128_ps(_mm_xor_si128(_mm_unpackhi_epi64(k13, k31), _mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float*>(m) + 4)))));
-		_mm_storeu_ps(reinterpret_cast<float*>(c) + 8, _mm_castsi128_ps(_mm_xor_si128(_mm_unpacklo_epi64(k20, k02), _mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float*>(m) + 8)))));
-		_mm_storeu_ps(reinterpret_cast<float*>(c) + 12, _mm_castsi128_ps(_mm_xor_si128(_mm_unpacklo_epi64(k31, k13), _mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float*>(m) + 12)))));
+		_mm_storeu_ps(reinterpret_cast<float *>(c),_mm_castsi128_ps(_mm_xor_si128(_mm_unpackhi_epi64(k02,k20),_mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float *>(m))))));
+		_mm_storeu_ps(reinterpret_cast<float *>(c) + 4,_mm_castsi128_ps(_mm_xor_si128(_mm_unpackhi_epi64(k13,k31),_mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float *>(m) + 4)))));
+		_mm_storeu_ps(reinterpret_cast<float *>(c) + 8,_mm_castsi128_ps(_mm_xor_si128(_mm_unpacklo_epi64(k20,k02),_mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float *>(m) + 8)))));
+		_mm_storeu_ps(reinterpret_cast<float *>(c) + 12,_mm_castsi128_ps(_mm_xor_si128(_mm_unpacklo_epi64(k31,k13),_mm_castps_si128(_mm_loadu_ps(reinterpret_cast<const float *>(m) + 12)))));
 
-		if (! (++_state.i[8])) {
-			++_state.i[5];	 // state reordered for SSE
-							 /* stopping at 2^70 bytes per nonce is user's responsibility */
+		if (!(++_state.i[8])) {
+			++_state.i[5]; // state reordered for SSE
+			/* stopping at 2^70 bytes per nonce is user's responsibility */
 		}
 #else
 		x0 = j0;
@@ -956,380 +956,380 @@ void Salsa20::crypt20(const void* in, void* out, unsigned int bytes)
 		x15 = j15;
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
 		// 2X round -------------------------------------------------------------
-		x4 = XOR(x4, ROTATE(PLUS(x0, x12), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x4, x0), 9));
-		x12 = XOR(x12, ROTATE(PLUS(x8, x4), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x12, x8), 18));
-		x9 = XOR(x9, ROTATE(PLUS(x5, x1), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x9, x5), 9));
-		x1 = XOR(x1, ROTATE(PLUS(x13, x9), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x1, x13), 18));
-		x14 = XOR(x14, ROTATE(PLUS(x10, x6), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x14, x10), 9));
-		x6 = XOR(x6, ROTATE(PLUS(x2, x14), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x6, x2), 18));
-		x3 = XOR(x3, ROTATE(PLUS(x15, x11), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x3, x15), 9));
-		x11 = XOR(x11, ROTATE(PLUS(x7, x3), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x11, x7), 18));
-		x1 = XOR(x1, ROTATE(PLUS(x0, x3), 7));
-		x2 = XOR(x2, ROTATE(PLUS(x1, x0), 9));
-		x3 = XOR(x3, ROTATE(PLUS(x2, x1), 13));
-		x0 = XOR(x0, ROTATE(PLUS(x3, x2), 18));
-		x6 = XOR(x6, ROTATE(PLUS(x5, x4), 7));
-		x7 = XOR(x7, ROTATE(PLUS(x6, x5), 9));
-		x4 = XOR(x4, ROTATE(PLUS(x7, x6), 13));
-		x5 = XOR(x5, ROTATE(PLUS(x4, x7), 18));
-		x11 = XOR(x11, ROTATE(PLUS(x10, x9), 7));
-		x8 = XOR(x8, ROTATE(PLUS(x11, x10), 9));
-		x9 = XOR(x9, ROTATE(PLUS(x8, x11), 13));
-		x10 = XOR(x10, ROTATE(PLUS(x9, x8), 18));
-		x12 = XOR(x12, ROTATE(PLUS(x15, x14), 7));
-		x13 = XOR(x13, ROTATE(PLUS(x12, x15), 9));
-		x14 = XOR(x14, ROTATE(PLUS(x13, x12), 13));
-		x15 = XOR(x15, ROTATE(PLUS(x14, x13), 18));
+		 x4 = XOR( x4,ROTATE(PLUS( x0,x12), 7));
+		 x8 = XOR( x8,ROTATE(PLUS( x4, x0), 9));
+		x12 = XOR(x12,ROTATE(PLUS( x8, x4),13));
+		 x0 = XOR( x0,ROTATE(PLUS(x12, x8),18));
+		 x9 = XOR( x9,ROTATE(PLUS( x5, x1), 7));
+		x13 = XOR(x13,ROTATE(PLUS( x9, x5), 9));
+		 x1 = XOR( x1,ROTATE(PLUS(x13, x9),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x1,x13),18));
+		x14 = XOR(x14,ROTATE(PLUS(x10, x6), 7));
+		 x2 = XOR( x2,ROTATE(PLUS(x14,x10), 9));
+		 x6 = XOR( x6,ROTATE(PLUS( x2,x14),13));
+		x10 = XOR(x10,ROTATE(PLUS( x6, x2),18));
+		 x3 = XOR( x3,ROTATE(PLUS(x15,x11), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x3,x15), 9));
+		x11 = XOR(x11,ROTATE(PLUS( x7, x3),13));
+		x15 = XOR(x15,ROTATE(PLUS(x11, x7),18));
+		 x1 = XOR( x1,ROTATE(PLUS( x0, x3), 7));
+		 x2 = XOR( x2,ROTATE(PLUS( x1, x0), 9));
+		 x3 = XOR( x3,ROTATE(PLUS( x2, x1),13));
+		 x0 = XOR( x0,ROTATE(PLUS( x3, x2),18));
+		 x6 = XOR( x6,ROTATE(PLUS( x5, x4), 7));
+		 x7 = XOR( x7,ROTATE(PLUS( x6, x5), 9));
+		 x4 = XOR( x4,ROTATE(PLUS( x7, x6),13));
+		 x5 = XOR( x5,ROTATE(PLUS( x4, x7),18));
+		x11 = XOR(x11,ROTATE(PLUS(x10, x9), 7));
+		 x8 = XOR( x8,ROTATE(PLUS(x11,x10), 9));
+		 x9 = XOR( x9,ROTATE(PLUS( x8,x11),13));
+		x10 = XOR(x10,ROTATE(PLUS( x9, x8),18));
+		x12 = XOR(x12,ROTATE(PLUS(x15,x14), 7));
+		x13 = XOR(x13,ROTATE(PLUS(x12,x15), 9));
+		x14 = XOR(x14,ROTATE(PLUS(x13,x12),13));
+		x15 = XOR(x15,ROTATE(PLUS(x14,x13),18));
 
-		x0 = PLUS(x0, j0);
-		x1 = PLUS(x1, j1);
-		x2 = PLUS(x2, j2);
-		x3 = PLUS(x3, j3);
-		x4 = PLUS(x4, j4);
-		x5 = PLUS(x5, j5);
-		x6 = PLUS(x6, j6);
-		x7 = PLUS(x7, j7);
-		x8 = PLUS(x8, j8);
-		x9 = PLUS(x9, j9);
-		x10 = PLUS(x10, j10);
-		x11 = PLUS(x11, j11);
-		x12 = PLUS(x12, j12);
-		x13 = PLUS(x13, j13);
-		x14 = PLUS(x14, j14);
-		x15 = PLUS(x15, j15);
+		x0 = PLUS(x0,j0);
+		x1 = PLUS(x1,j1);
+		x2 = PLUS(x2,j2);
+		x3 = PLUS(x3,j3);
+		x4 = PLUS(x4,j4);
+		x5 = PLUS(x5,j5);
+		x6 = PLUS(x6,j6);
+		x7 = PLUS(x7,j7);
+		x8 = PLUS(x8,j8);
+		x9 = PLUS(x9,j9);
+		x10 = PLUS(x10,j10);
+		x11 = PLUS(x11,j11);
+		x12 = PLUS(x12,j12);
+		x13 = PLUS(x13,j13);
+		x14 = PLUS(x14,j14);
+		x15 = PLUS(x15,j15);
 
-		U32TO8_LITTLE(c + 0, XOR(x0, U8TO32_LITTLE(m + 0)));
-		U32TO8_LITTLE(c + 4, XOR(x1, U8TO32_LITTLE(m + 4)));
-		U32TO8_LITTLE(c + 8, XOR(x2, U8TO32_LITTLE(m + 8)));
-		U32TO8_LITTLE(c + 12, XOR(x3, U8TO32_LITTLE(m + 12)));
-		U32TO8_LITTLE(c + 16, XOR(x4, U8TO32_LITTLE(m + 16)));
-		U32TO8_LITTLE(c + 20, XOR(x5, U8TO32_LITTLE(m + 20)));
-		U32TO8_LITTLE(c + 24, XOR(x6, U8TO32_LITTLE(m + 24)));
-		U32TO8_LITTLE(c + 28, XOR(x7, U8TO32_LITTLE(m + 28)));
-		U32TO8_LITTLE(c + 32, XOR(x8, U8TO32_LITTLE(m + 32)));
-		U32TO8_LITTLE(c + 36, XOR(x9, U8TO32_LITTLE(m + 36)));
-		U32TO8_LITTLE(c + 40, XOR(x10, U8TO32_LITTLE(m + 40)));
-		U32TO8_LITTLE(c + 44, XOR(x11, U8TO32_LITTLE(m + 44)));
-		U32TO8_LITTLE(c + 48, XOR(x12, U8TO32_LITTLE(m + 48)));
-		U32TO8_LITTLE(c + 52, XOR(x13, U8TO32_LITTLE(m + 52)));
-		U32TO8_LITTLE(c + 56, XOR(x14, U8TO32_LITTLE(m + 56)));
-		U32TO8_LITTLE(c + 60, XOR(x15, U8TO32_LITTLE(m + 60)));
+		U32TO8_LITTLE(c + 0,XOR(x0,U8TO32_LITTLE(m + 0)));
+		U32TO8_LITTLE(c + 4,XOR(x1,U8TO32_LITTLE(m + 4)));
+		U32TO8_LITTLE(c + 8,XOR(x2,U8TO32_LITTLE(m + 8)));
+		U32TO8_LITTLE(c + 12,XOR(x3,U8TO32_LITTLE(m + 12)));
+		U32TO8_LITTLE(c + 16,XOR(x4,U8TO32_LITTLE(m + 16)));
+		U32TO8_LITTLE(c + 20,XOR(x5,U8TO32_LITTLE(m + 20)));
+		U32TO8_LITTLE(c + 24,XOR(x6,U8TO32_LITTLE(m + 24)));
+		U32TO8_LITTLE(c + 28,XOR(x7,U8TO32_LITTLE(m + 28)));
+		U32TO8_LITTLE(c + 32,XOR(x8,U8TO32_LITTLE(m + 32)));
+		U32TO8_LITTLE(c + 36,XOR(x9,U8TO32_LITTLE(m + 36)));
+		U32TO8_LITTLE(c + 40,XOR(x10,U8TO32_LITTLE(m + 40)));
+		U32TO8_LITTLE(c + 44,XOR(x11,U8TO32_LITTLE(m + 44)));
+		U32TO8_LITTLE(c + 48,XOR(x12,U8TO32_LITTLE(m + 48)));
+		U32TO8_LITTLE(c + 52,XOR(x13,U8TO32_LITTLE(m + 52)));
+		U32TO8_LITTLE(c + 56,XOR(x14,U8TO32_LITTLE(m + 56)));
+		U32TO8_LITTLE(c + 60,XOR(x15,U8TO32_LITTLE(m + 60)));
 
-		if (! (++j8)) {
+		if (!(++j8)) {
 			++j9;
 			/* stopping at 2^70 bytes per nonce is user's responsibility */
 		}
@@ -1337,9 +1337,8 @@ void Salsa20::crypt20(const void* in, void* out, unsigned int bytes)
 
 		if (bytes <= 64) {
 			if (bytes < 64) {
-				for (i = 0; i < bytes; ++i) {
+				for (i = 0;i < bytes;++i)
 					ctarget[i] = c[i];
-				}
 			}
 
 #ifndef ZT_SALSA20_SSE
@@ -1356,4 +1355,4 @@ void Salsa20::crypt20(const void* in, void* out, unsigned int bytes)
 	}
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Salsa20.hpp b/node/Salsa20.hpp
index 9efaa1b9f..7e4c1e53a 100644
--- a/node/Salsa20.hpp
+++ b/node/Salsa20.hpp
@@ -7,157 +7,109 @@
 #ifndef ZT_SALSA20_HPP
 #define ZT_SALSA20_HPP
 
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
 #include "Constants.hpp"
 #include "Utils.hpp"
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if (! defined(ZT_SALSA20_SSE)) && (defined(__SSE2__) || (defined(__WINDOWS__) && ! defined(__MINGW32__) && ! defined(_M_ARM64)))
+#if (!defined(ZT_SALSA20_SSE)) && (defined(__SSE2__) || defined(__WINDOWS__))
 #define ZT_SALSA20_SSE 1
 #endif
 
 #ifdef ZT_SALSA20_SSE
 #include <emmintrin.h>
-#endif	 // ZT_SALSA20_SSE
+#endif // ZT_SALSA20_SSE
 
 namespace ZeroTier {
 
 /**
  * Salsa20 stream cipher
  */
-class Salsa20 {
-  public:
-	Salsa20()
-	{
-	}
-	~Salsa20()
-	{
-		Utils::burn(&_state, sizeof(_state));
-	}
+class Salsa20
+{
+public:
+	Salsa20() throw() {}
+
+	~Salsa20() { Utils::burn(&_state,sizeof(_state)); }
 
 	/**
-	 * XOR d with s
-	 *
-	 * This is done efficiently using e.g. SSE if available. It's used when
-	 * alternative Salsa20 implementations are used in Packet and is here
-	 * since this is where all the SSE stuff is already included.
-	 *
-	 * @param d Destination to XOR
-	 * @param s Source bytes to XOR with destination
-	 * @param len Length of s and d
-	 */
-	static inline void memxor(uint8_t* d, const uint8_t* s, unsigned int len)
-	{
-#ifdef ZT_SALSA20_SSE
-		while (len >= 128) {
-			__m128i s0 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(s));
-			__m128i s1 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(s + 16));
-			__m128i s2 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(s + 32));
-			__m128i s3 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(s + 48));
-			__m128i s4 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(s + 64));
-			__m128i s5 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(s + 80));
-			__m128i s6 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(s + 96));
-			__m128i s7 = _mm_loadu_si128(reinterpret_cast<const __m128i*>(s + 112));
-			__m128i d0 = _mm_loadu_si128(reinterpret_cast<__m128i*>(d));
-			__m128i d1 = _mm_loadu_si128(reinterpret_cast<__m128i*>(d + 16));
-			__m128i d2 = _mm_loadu_si128(reinterpret_cast<__m128i*>(d + 32));
-			__m128i d3 = _mm_loadu_si128(reinterpret_cast<__m128i*>(d + 48));
-			__m128i d4 = _mm_loadu_si128(reinterpret_cast<__m128i*>(d + 64));
-			__m128i d5 = _mm_loadu_si128(reinterpret_cast<__m128i*>(d + 80));
-			__m128i d6 = _mm_loadu_si128(reinterpret_cast<__m128i*>(d + 96));
-			__m128i d7 = _mm_loadu_si128(reinterpret_cast<__m128i*>(d + 112));
-			d0 = _mm_xor_si128(d0, s0);
-			d1 = _mm_xor_si128(d1, s1);
-			d2 = _mm_xor_si128(d2, s2);
-			d3 = _mm_xor_si128(d3, s3);
-			d4 = _mm_xor_si128(d4, s4);
-			d5 = _mm_xor_si128(d5, s5);
-			d6 = _mm_xor_si128(d6, s6);
-			d7 = _mm_xor_si128(d7, s7);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d), d0);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d + 16), d1);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d + 32), d2);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d + 48), d3);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d + 64), d4);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d + 80), d5);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d + 96), d6);
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d + 112), d7);
-			s += 128;
-			d += 128;
-			len -= 128;
-		}
-		while (len >= 16) {
-			_mm_storeu_si128(reinterpret_cast<__m128i*>(d), _mm_xor_si128(_mm_loadu_si128(reinterpret_cast<__m128i*>(d)), _mm_loadu_si128(reinterpret_cast<const __m128i*>(s))));
-			s += 16;
-			d += 16;
-			len -= 16;
-		}
-#else
-#ifndef ZT_NO_TYPE_PUNNING
-		while (len >= 16) {
-			(*reinterpret_cast<uint64_t*>(d)) ^= (*reinterpret_cast<const uint64_t*>(s));
-			s += 8;
-			d += 8;
-			(*reinterpret_cast<uint64_t*>(d)) ^= (*reinterpret_cast<const uint64_t*>(s));
-			s += 8;
-			d += 8;
-			len -= 16;
-		}
-#endif
-#endif
-		while (len) {
-			--len;
-			*(d++) ^= *(s++);
-		}
-	}
-
-	/**
-	 * @param key 256-bit (32 byte) key
+	 * @param key Key bits
+	 * @param kbits Number of key bits: 128 or 256 (recommended)
 	 * @param iv 64-bit initialization vector
 	 */
-	Salsa20(const void* key, const void* iv)
+	Salsa20(const void *key,unsigned int kbits,const void *iv)
+		throw()
 	{
-		init(key, iv);
+		init(key,kbits,iv);
 	}
 
 	/**
 	 * Initialize cipher
 	 *
 	 * @param key Key bits
+	 * @param kbits Number of key bits: 128 or 256 (recommended)
 	 * @param iv 64-bit initialization vector
 	 */
-	void init(const void* key, const void* iv);
+	void init(const void *key,unsigned int kbits,const void *iv)
+		throw();
 
 	/**
-	 * Encrypt/decrypt data using Salsa20/12
+	 * Encrypt data using Salsa20/12
 	 *
 	 * @param in Input data
 	 * @param out Output buffer
 	 * @param bytes Length of data
 	 */
-	void crypt12(const void* in, void* out, unsigned int bytes);
+	void encrypt12(const void *in,void *out,unsigned int bytes)
+		throw();
 
 	/**
-	 * Encrypt/decrypt data using Salsa20/20
+	 * Encrypt data using Salsa20/20
 	 *
 	 * @param in Input data
 	 * @param out Output buffer
 	 * @param bytes Length of data
 	 */
-	void crypt20(const void* in, void* out, unsigned int bytes);
+	void encrypt20(const void *in,void *out,unsigned int bytes)
+		throw();
 
-  private:
+	/**
+	 * Decrypt data
+	 *
+	 * @param in Input data
+	 * @param out Output buffer
+	 * @param bytes Length of data
+	 */
+	inline void decrypt12(const void *in,void *out,unsigned int bytes)
+		throw()
+	{
+		encrypt12(in,out,bytes);
+	}
+
+	/**
+	 * Decrypt data
+	 *
+	 * @param in Input data
+	 * @param out Output buffer
+	 * @param bytes Length of data
+	 */
+	inline void decrypt20(const void *in,void *out,unsigned int bytes)
+		throw()
+	{
+		encrypt20(in,out,bytes);
+	}
+
+private:
 	union {
 #ifdef ZT_SALSA20_SSE
 		__m128i v[4];
-#endif	 // ZT_SALSA20_SSE
+#endif // ZT_SALSA20_SSE
 		uint32_t i[16];
 	} _state;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/SelfAwareness.cpp b/node/SelfAwareness.cpp
index c73dd4b05..8bed0c511 100644
--- a/node/SelfAwareness.cpp
+++ b/node/SelfAwareness.cpp
@@ -1,131 +1,187 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "SelfAwareness.hpp"
-
-#include "Constants.hpp"
-#include "Node.hpp"
-#include "Packet.hpp"
-#include "Peer.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
-#include "Trace.hpp"
-
-#include <set>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <set>
 #include <vector>
 
+#include "Constants.hpp"
+#include "SelfAwareness.hpp"
+#include "RuntimeEnvironment.hpp"
+#include "Node.hpp"
+#include "Topology.hpp"
+#include "Packet.hpp"
+#include "Peer.hpp"
+#include "Switch.hpp"
+
 // Entry timeout -- make it fairly long since this is just to prevent stale buildup
-#define ZT_SELFAWARENESS_ENTRY_TIMEOUT 600000
+#define ZT_SELFAWARENESS_ENTRY_TIMEOUT 3600000
 
 namespace ZeroTier {
 
-class _ResetWithinScope {
-  public:
-	_ResetWithinScope(void* tPtr, int64_t now, int inetAddressFamily, InetAddress::IpScope scope) : _now(now), _tPtr(tPtr), _family(inetAddressFamily), _scope(scope)
+class _ResetWithinScope
+{
+public:
+	_ResetWithinScope(uint64_t now,InetAddress::IpScope scope) :
+		_now(now),
+		_scope(scope) {}
+
+	inline void operator()(Topology &t,const SharedPtr<Peer> &p)
 	{
+		if (p->resetWithinScope(_scope,_now))
+			peersReset.push_back(p);
 	}
 
-	inline void operator()(Topology& t, const SharedPtr<Peer>& p)
-	{
-		p->resetWithinScope(_tPtr, _scope, _family, _now);
-	}
+	std::vector< SharedPtr<Peer> > peersReset;
 
-  private:
+private:
 	uint64_t _now;
-	void* _tPtr;
-	int _family;
 	InetAddress::IpScope _scope;
 };
 
-SelfAwareness::SelfAwareness(const RuntimeEnvironment* renv) : RR(renv), _phy(128)
+SelfAwareness::SelfAwareness(const RuntimeEnvironment *renv) :
+	RR(renv),
+	_phy(32)
 {
 }
 
-void SelfAwareness::iam(void* tPtr, const Address& reporter, const int64_t receivedOnLocalSocket, const InetAddress& reporterPhysicalAddress, const InetAddress& myPhysicalAddress, bool trusted, int64_t now)
+SelfAwareness::~SelfAwareness()
+{
+}
+
+void SelfAwareness::iam(const Address &reporter,const InetAddress &receivedOnLocalAddress,const InetAddress &reporterPhysicalAddress,const InetAddress &myPhysicalAddress,bool trusted,uint64_t now)
 {
 	const InetAddress::IpScope scope = myPhysicalAddress.ipScope();
 
-	if ((scope != reporterPhysicalAddress.ipScope()) || (scope == InetAddress::IP_SCOPE_NONE) || (scope == InetAddress::IP_SCOPE_LOOPBACK) || (scope == InetAddress::IP_SCOPE_MULTICAST)) {
+	if ((scope != reporterPhysicalAddress.ipScope())||(scope == InetAddress::IP_SCOPE_NONE)||(scope == InetAddress::IP_SCOPE_LOOPBACK)||(scope == InetAddress::IP_SCOPE_MULTICAST))
 		return;
-	}
 
 	Mutex::Lock _l(_phy_m);
-	PhySurfaceEntry& entry = _phy[PhySurfaceKey(reporter, receivedOnLocalSocket, reporterPhysicalAddress, scope)];
+	PhySurfaceEntry &entry = _phy[PhySurfaceKey(reporter,receivedOnLocalAddress,reporterPhysicalAddress,scope)];
 
-	if ((trusted) && ((now - entry.ts) < ZT_SELFAWARENESS_ENTRY_TIMEOUT) && (! entry.mySurface.ipsEqual(myPhysicalAddress))) {
+	if ( (trusted) && ((now - entry.ts) < ZT_SELFAWARENESS_ENTRY_TIMEOUT) && (!entry.mySurface.ipsEqual(myPhysicalAddress)) ) {
 		// Changes to external surface reported by trusted peers causes path reset in this scope
-		RR->t->resettingPathsInScope(tPtr, reporter, reporterPhysicalAddress, myPhysicalAddress, scope);
-
 		entry.mySurface = myPhysicalAddress;
 		entry.ts = now;
-		entry.trusted = trusted;
+		TRACE("physical address %s for scope %u as seen from %s(%s) differs from %s, resetting paths in scope",myPhysicalAddress.toString().c_str(),(unsigned int)scope,reporter.toString().c_str(),reporterPhysicalAddress.toString().c_str(),entry.mySurface.toString().c_str());
 
 		// Erase all entries in this scope that were not reported from this remote address to prevent 'thrashing'
 		// due to multiple reports of endpoint change.
 		// Don't use 'entry' after this since hash table gets modified.
 		{
-			Hashtable<PhySurfaceKey, PhySurfaceEntry>::Iterator i(_phy);
-			PhySurfaceKey* k = (PhySurfaceKey*)0;
-			PhySurfaceEntry* e = (PhySurfaceEntry*)0;
-			while (i.next(k, e)) {
-				if ((k->reporterPhysicalAddress != reporterPhysicalAddress) && (k->scope == scope)) {
+			Hashtable< PhySurfaceKey,PhySurfaceEntry >::Iterator i(_phy);
+			PhySurfaceKey *k = (PhySurfaceKey *)0;
+			PhySurfaceEntry *e = (PhySurfaceEntry *)0;
+			while (i.next(k,e)) {
+				if ((k->reporterPhysicalAddress != reporterPhysicalAddress)&&(k->scope == scope))
 					_phy.erase(*k);
-				}
 			}
 		}
 
-		// Reset all paths within this scope and address family
-		_ResetWithinScope rset(tPtr, now, myPhysicalAddress.ss_family, (InetAddress::IpScope)scope);
-		RR->topology->eachPeer<_ResetWithinScope&>(rset);
-	}
-	else {
+		// Reset all paths within this scope
+		_ResetWithinScope rset(now,(InetAddress::IpScope)scope);
+		RR->topology->eachPeer<_ResetWithinScope &>(rset);
+
+		// Send a NOP to all peers for whom we forgot a path. This will cause direct
+		// links to be re-established if possible, possibly using a root server or some
+		// other relay.
+		for(std::vector< SharedPtr<Peer> >::const_iterator p(rset.peersReset.begin());p!=rset.peersReset.end();++p) {
+			if ((*p)->activelyTransferringFrames(now)) {
+				Packet outp((*p)->address(),RR->identity.address(),Packet::VERB_NOP);
+				RR->sw->send(outp,true,0);
+			}
+		}
+	} else {
 		// Otherwise just update DB to use to determine external surface info
 		entry.mySurface = myPhysicalAddress;
 		entry.ts = now;
-		entry.trusted = trusted;
 	}
 }
 
-std::vector<InetAddress> SelfAwareness::whoami()
-{
-	std::vector<InetAddress> surfaceAddresses;
-	Mutex::Lock _l(_phy_m);
-	Hashtable<PhySurfaceKey, PhySurfaceEntry>::Iterator i(_phy);
-	PhySurfaceKey* k = (PhySurfaceKey*)0;
-	PhySurfaceEntry* e = (PhySurfaceEntry*)0;
-	while (i.next(k, e)) {
-		if (std::find(surfaceAddresses.begin(), surfaceAddresses.end(), e->mySurface) == surfaceAddresses.end()) {
-			surfaceAddresses.push_back(e->mySurface);
-		}
-	}
-	return surfaceAddresses;
-}
-
-void SelfAwareness::clean(int64_t now)
+void SelfAwareness::clean(uint64_t now)
 {
 	Mutex::Lock _l(_phy_m);
-	Hashtable<PhySurfaceKey, PhySurfaceEntry>::Iterator i(_phy);
-	PhySurfaceKey* k = (PhySurfaceKey*)0;
-	PhySurfaceEntry* e = (PhySurfaceEntry*)0;
-	while (i.next(k, e)) {
-		if ((now - e->ts) >= ZT_SELFAWARENESS_ENTRY_TIMEOUT) {
+	Hashtable< PhySurfaceKey,PhySurfaceEntry >::Iterator i(_phy);
+	PhySurfaceKey *k = (PhySurfaceKey *)0;
+	PhySurfaceEntry *e = (PhySurfaceEntry *)0;
+	while (i.next(k,e)) {
+		if ((now - e->ts) >= ZT_SELFAWARENESS_ENTRY_TIMEOUT)
 			_phy.erase(*k);
-		}
 	}
 }
 
-}	// namespace ZeroTier
+std::vector<InetAddress> SelfAwareness::getSymmetricNatPredictions()
+{
+	/* This is based on ideas and strategies found here:
+	 * https://tools.ietf.org/html/draft-takeda-symmetric-nat-traversal-00
+	 *
+	 * In short: a great many symmetric NATs allocate ports sequentially.
+	 * This is common on enterprise and carrier grade NATs as well as consumer
+	 * devices. This code generates a list of "you might try this" addresses by
+	 * extrapolating likely port assignments from currently known external
+	 * global IPv4 surfaces. These can then be included in a PUSH_DIRECT_PATHS
+	 * message to another peer, causing it to possibly try these addresses and
+	 * bust our local symmetric NAT. It works often enough to be worth the
+	 * extra bit of code and does no harm in cases where it fails. */
+
+	// Gather unique surfaces indexed by local received-on address and flag
+	// us as behind a symmetric NAT if there is more than one.
+	std::map< InetAddress,std::set<InetAddress> > surfaces;
+	bool symmetric = false;
+	{
+		Mutex::Lock _l(_phy_m);
+		Hashtable< PhySurfaceKey,PhySurfaceEntry >::Iterator i(_phy);
+		PhySurfaceKey *k = (PhySurfaceKey *)0;
+		PhySurfaceEntry *e = (PhySurfaceEntry *)0;
+		while (i.next(k,e)) {
+			if ((e->mySurface.ss_family == AF_INET)&&(e->mySurface.ipScope() == InetAddress::IP_SCOPE_GLOBAL)) {
+				std::set<InetAddress> &s = surfaces[k->receivedOnLocalAddress];
+				s.insert(e->mySurface);
+				symmetric = symmetric||(s.size() > 1);
+			}
+		}
+	}
+
+	// If we appear to be symmetrically NATed, generate and return extrapolations
+	// of those surfaces. Since PUSH_DIRECT_PATHS is sent multiple times, we
+	// probabilistically generate extrapolations of anywhere from +1 to +5 to
+	// increase the odds that it will work "eventually".
+	if (symmetric) {
+		std::vector<InetAddress> r;
+		for(std::map< InetAddress,std::set<InetAddress> >::iterator si(surfaces.begin());si!=surfaces.end();++si) {
+			for(std::set<InetAddress>::iterator i(si->second.begin());i!=si->second.end();++i) {
+				InetAddress ipp(*i);
+				unsigned int p = ipp.port() + 1 + ((unsigned int)RR->node->prng() & 3);
+				if (p >= 65535)
+					p -= 64510; // NATs seldom use ports <=1024 so wrap to 1025
+				ipp.setPort(p);
+				if ((si->second.count(ipp) == 0)&&(std::find(r.begin(),r.end(),ipp) == r.end())) {
+					r.push_back(ipp);
+				}
+			}
+		}
+		return r;
+	}
+
+	return std::vector<InetAddress>();
+}
+
+} // namespace ZeroTier
diff --git a/node/SelfAwareness.hpp b/node/SelfAwareness.hpp
index 527537003..06c264a91 100644
--- a/node/SelfAwareness.hpp
+++ b/node/SelfAwareness.hpp
@@ -1,23 +1,28 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_SELFAWARENESS_HPP
 #define ZT_SELFAWARENESS_HPP
 
-#include "Address.hpp"
 #include "Constants.hpp"
-#include "Hashtable.hpp"
 #include "InetAddress.hpp"
+#include "Hashtable.hpp"
+#include "Address.hpp"
 #include "Mutex.hpp"
 
 namespace ZeroTier {
@@ -27,9 +32,11 @@ class RuntimeEnvironment;
 /**
  * Tracks changes to this peer's real world addresses
  */
-class SelfAwareness {
-  public:
-	SelfAwareness(const RuntimeEnvironment* renv);
+class SelfAwareness
+{
+public:
+	SelfAwareness(const RuntimeEnvironment *renv);
+	~SelfAwareness();
 
 	/**
 	 * Called when a trusted remote peer informs us of our external network address
@@ -41,64 +48,51 @@ class SelfAwareness {
 	 * @param trusted True if this peer is trusted as an authority to inform us of external address changes
 	 * @param now Current time
 	 */
-	void iam(void* tPtr, const Address& reporter, const int64_t receivedOnLocalSocket, const InetAddress& reporterPhysicalAddress, const InetAddress& myPhysicalAddress, bool trusted, int64_t now);
-
-	/**
-	 * Return all known external surface addresses reported by peers
-	 *
-	 * @return A vector of InetAddress(es)
-	 */
-	std::vector<InetAddress> whoami();
+	void iam(const Address &reporter,const InetAddress &receivedOnLocalAddress,const InetAddress &reporterPhysicalAddress,const InetAddress &myPhysicalAddress,bool trusted,uint64_t now);
 
 	/**
 	 * Clean up database periodically
 	 *
 	 * @param now Current time
 	 */
-	void clean(int64_t now);
+	void clean(uint64_t now);
 
-  private:
-	struct PhySurfaceKey {
+	/**
+	 * If we appear to be behind a symmetric NAT, get predictions for possible external endpoints
+	 *
+	 * @return Symmetric NAT predictions or empty vector if none
+	 */
+	std::vector<InetAddress> getSymmetricNatPredictions();
+
+private:
+	struct PhySurfaceKey
+	{
 		Address reporter;
-		int64_t receivedOnLocalSocket;
+		InetAddress receivedOnLocalAddress;
 		InetAddress reporterPhysicalAddress;
 		InetAddress::IpScope scope;
 
-		PhySurfaceKey() : reporter(), scope(InetAddress::IP_SCOPE_NONE)
-		{
-		}
-		PhySurfaceKey(const Address& r, const int64_t rol, const InetAddress& ra, InetAddress::IpScope s) : reporter(r), receivedOnLocalSocket(rol), reporterPhysicalAddress(ra), scope(s)
-		{
-		}
+		PhySurfaceKey() : reporter(),scope(InetAddress::IP_SCOPE_NONE) {}
+		PhySurfaceKey(const Address &r,const InetAddress &rol,const InetAddress &ra,InetAddress::IpScope s) : reporter(r),receivedOnLocalAddress(rol),reporterPhysicalAddress(ra),scope(s) {}
 
-		inline unsigned long hashCode() const
-		{
-			return ((unsigned long)reporter.toInt() + (unsigned long)scope);
-		}
-		inline bool operator==(const PhySurfaceKey& k) const
-		{
-			return ((reporter == k.reporter) && (receivedOnLocalSocket == k.receivedOnLocalSocket) && (reporterPhysicalAddress == k.reporterPhysicalAddress) && (scope == k.scope));
-		}
+		inline unsigned long hashCode() const throw() { return ((unsigned long)reporter.toInt() + (unsigned long)scope); }
+		inline bool operator==(const PhySurfaceKey &k) const throw() { return ((reporter == k.reporter)&&(receivedOnLocalAddress == k.receivedOnLocalAddress)&&(reporterPhysicalAddress == k.reporterPhysicalAddress)&&(scope == k.scope)); }
 	};
-	struct PhySurfaceEntry {
+	struct PhySurfaceEntry
+	{
 		InetAddress mySurface;
 		uint64_t ts;
-		bool trusted;
 
-		PhySurfaceEntry() : mySurface(), ts(0), trusted(false)
-		{
-		}
-		PhySurfaceEntry(const InetAddress& a, const uint64_t t) : mySurface(a), ts(t), trusted(false)
-		{
-		}
+		PhySurfaceEntry() : mySurface(),ts(0) {}
+		PhySurfaceEntry(const InetAddress &a,const uint64_t t) : mySurface(a),ts(t) {}
 	};
 
-	const RuntimeEnvironment* RR;
+	const RuntimeEnvironment *RR;
 
-	Hashtable<PhySurfaceKey, PhySurfaceEntry> _phy;
+	Hashtable< PhySurfaceKey,PhySurfaceEntry > _phy;
 	Mutex _phy_m;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/SharedPtr.hpp b/node/SharedPtr.hpp
index ef720cab8..3ff5ed18a 100644
--- a/node/SharedPtr.hpp
+++ b/node/SharedPtr.hpp
@@ -1,61 +1,81 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_SHAREDPTR_HPP
 #define ZT_SHAREDPTR_HPP
 
-#include "AtomicCounter.hpp"
 #include "Mutex.hpp"
+#include "AtomicCounter.hpp"
 
 namespace ZeroTier {
 
 /**
- * Simple zero-overhead introspective reference counted pointer
+ * Simple reference counted pointer
  *
  * This is an introspective shared pointer. Classes that need to be reference
  * counted must list this as a 'friend' and must have a private instance of
- * AtomicCounter called __refCount.
+ * AtomicCounter called __refCount. They should also have private destructors,
+ * since only this class should delete them.
+ *
+ * Because this is introspective, it is safe to apply to a naked pointer
+ * multiple times provided there is always at least one holding SharedPtr.
+ *
+ * Once C++11 is ubiquitous, this and a few other things like Thread might get
+ * torn out for their standard equivalents.
  */
-template <typename T> class SharedPtr {
-  public:
-	SharedPtr() : _ptr((T*)0)
+template<typename T>
+class SharedPtr
+{
+public:
+	SharedPtr()
+		throw() :
+		_ptr((T *)0)
 	{
 	}
-	SharedPtr(T* obj) : _ptr(obj)
+
+	SharedPtr(T *obj)
+		throw() :
+		_ptr(obj)
 	{
 		++obj->__refCount;
 	}
-	SharedPtr(const SharedPtr& sp) : _ptr(sp._getAndInc())
+
+	SharedPtr(const SharedPtr &sp)
+		throw() :
+		_ptr(sp._getAndInc())
 	{
 	}
 
 	~SharedPtr()
 	{
 		if (_ptr) {
-			if (--_ptr->__refCount <= 0) {
+			if (--_ptr->__refCount <= 0)
 				delete _ptr;
-			}
 		}
 	}
 
-	inline SharedPtr& operator=(const SharedPtr& sp)
+	inline SharedPtr &operator=(const SharedPtr &sp)
 	{
 		if (_ptr != sp._ptr) {
-			T* p = sp._getAndInc();
+			T *p = sp._getAndInc();
 			if (_ptr) {
-				if (--_ptr->__refCount <= 0) {
+				if (--_ptr->__refCount <= 0)
 					delete _ptr;
-				}
 			}
 			_ptr = p;
 		}
@@ -70,9 +90,8 @@ template <typename T> class SharedPtr {
 	 *
 	 * @param ptr Naked pointer to assign
 	 */
-	inline void set(T* ptr)
+	inline void setToUnsafe(T *ptr)
 	{
-		zero();
 		++ptr->__refCount;
 		_ptr = ptr;
 	}
@@ -82,94 +101,54 @@ template <typename T> class SharedPtr {
 	 *
 	 * @param with Pointer to swap with
 	 */
-	inline void swap(SharedPtr& with)
+	inline void swap(SharedPtr &with)
+		throw()
 	{
-		T* tmp = _ptr;
+		T *tmp = _ptr;
 		_ptr = with._ptr;
 		with._ptr = tmp;
 	}
 
-	inline operator bool() const
-	{
-		return (_ptr != (T*)0);
-	}
-	inline T& operator*() const
-	{
-		return *_ptr;
-	}
-	inline T* operator->() const
-	{
-		return _ptr;
-	}
+	inline operator bool() const throw() { return (_ptr != (T *)0); }
+	inline T &operator*() const throw() { return *_ptr; }
+	inline T *operator->() const throw() { return _ptr; }
 
 	/**
 	 * @return Raw pointer to held object
 	 */
-	inline T* ptr() const
-	{
-		return _ptr;
-	}
+	inline T *ptr() const throw() { return _ptr; }
 
 	/**
-	 * Set this pointer to NULL
+	 * Set this pointer to null
 	 */
 	inline void zero()
 	{
 		if (_ptr) {
-			if (--_ptr->__refCount <= 0) {
+			if (--_ptr->__refCount <= 0)
 				delete _ptr;
-			}
-			_ptr = (T*)0;
 		}
+		_ptr = (T *)0;
 	}
 
-	/**
-	 * @return Number of references according to this object's ref count or 0 if NULL
-	 */
-	inline int references()
-	{
-		if (_ptr) {
-			return _ptr->__refCount.load();
-		}
-		return 0;
-	}
+	inline bool operator==(const SharedPtr &sp) const throw() { return (_ptr == sp._ptr); }
+	inline bool operator!=(const SharedPtr &sp) const throw() { return (_ptr != sp._ptr); }
+	inline bool operator>(const SharedPtr &sp) const throw() { return (_ptr > sp._ptr); }
+	inline bool operator<(const SharedPtr &sp) const throw() { return (_ptr < sp._ptr); }
+	inline bool operator>=(const SharedPtr &sp) const throw() { return (_ptr >= sp._ptr); }
+	inline bool operator<=(const SharedPtr &sp) const throw() { return (_ptr <= sp._ptr); }
 
-	inline bool operator==(const SharedPtr& sp) const
+private:
+	inline T *_getAndInc() const
+		throw()
 	{
-		return (_ptr == sp._ptr);
-	}
-	inline bool operator!=(const SharedPtr& sp) const
-	{
-		return (_ptr != sp._ptr);
-	}
-	inline bool operator>(const SharedPtr& sp) const
-	{
-		return (_ptr > sp._ptr);
-	}
-	inline bool operator<(const SharedPtr& sp) const
-	{
-		return (_ptr < sp._ptr);
-	}
-	inline bool operator>=(const SharedPtr& sp) const
-	{
-		return (_ptr >= sp._ptr);
-	}
-	inline bool operator<=(const SharedPtr& sp) const
-	{
-		return (_ptr <= sp._ptr);
-	}
-
-  private:
-	inline T* _getAndInc() const
-	{
-		if (_ptr) {
+		if (_ptr)
 			++_ptr->__refCount;
-		}
 		return _ptr;
 	}
-	T* _ptr;
+
+	T *_ptr;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Switch.cpp b/node/Switch.cpp
index 6b0e2b081..9dbabdca7 100644
--- a/node/Switch.cpp
+++ b/node/Switch.cpp
@@ -1,256 +1,292 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "Switch.hpp"
-
-#include "../include/ZeroTierOne.h"
-#include "../version.h"
-#include "Constants.hpp"
-#include "InetAddress.hpp"
-#include "Metrics.hpp"
-#include "Node.hpp"
-#include "Packet.hpp"
-#include "Peer.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "SelfAwareness.hpp"
-#include "Topology.hpp"
-#include "Trace.hpp"
-
-#include <algorithm>
-#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <algorithm>
 #include <utility>
+#include <stdexcept>
+
+#include "../version.h"
+#include "../include/ZeroTierOne.h"
+
+#include "Constants.hpp"
+#include "RuntimeEnvironment.hpp"
+#include "Switch.hpp"
+#include "Node.hpp"
+#include "InetAddress.hpp"
+#include "Topology.hpp"
+#include "Peer.hpp"
+#include "SelfAwareness.hpp"
+#include "Packet.hpp"
+#include "Cluster.hpp"
 
 namespace ZeroTier {
 
-Switch::Switch(const RuntimeEnvironment* renv) : RR(renv), _lastBeaconResponse(0), _lastCheckedQueues(0), _lastUniteAttempt(8)	 // only really used on root servers and upstreams, and it'll grow there just fine
+#ifdef ZT_TRACE
+static const char *etherTypeName(const unsigned int etherType)
+{
+	switch(etherType) {
+		case ZT_ETHERTYPE_IPV4:  return "IPV4";
+		case ZT_ETHERTYPE_ARP:   return "ARP";
+		case ZT_ETHERTYPE_RARP:  return "RARP";
+		case ZT_ETHERTYPE_ATALK: return "ATALK";
+		case ZT_ETHERTYPE_AARP:  return "AARP";
+		case ZT_ETHERTYPE_IPX_A: return "IPX_A";
+		case ZT_ETHERTYPE_IPX_B: return "IPX_B";
+		case ZT_ETHERTYPE_IPV6:  return "IPV6";
+	}
+	return "UNKNOWN";
+}
+#endif // ZT_TRACE
+
+Switch::Switch(const RuntimeEnvironment *renv) :
+	RR(renv),
+	_lastBeaconResponse(0),
+	_outstandingWhoisRequests(32),
+	_lastUniteAttempt(8) // only really used on root servers and upstreams, and it'll grow there just fine
 {
 }
 
-// Returns true if packet appears valid; pos and proto will be set
-static bool _ipv6GetPayload(const uint8_t* frameData, unsigned int frameLen, unsigned int& pos, unsigned int& proto)
+Switch::~Switch()
 {
-	if (frameLen < 40) {
-		return false;
-	}
-	pos = 40;
-	proto = frameData[6];
-	while (pos <= frameLen) {
-		switch (proto) {
-			case 0:		// hop-by-hop options
-			case 43:	// routing
-			case 60:	// destination options
-			case 135:	// mobility options
-				if ((pos + 8) > frameLen) {
-					return false;	// invalid!
-				}
-				proto = frameData[pos];
-				pos += ((unsigned int)frameData[pos + 1] * 8) + 8;
-				break;
-
-			// case 44: // fragment -- we currently can't parse these and they are deprecated in IPv6 anyway
-			// case 50:
-			// case 51: // IPSec ESP and AH -- we have to stop here since this is encrypted stuff
-			default:
-				return true;
-		}
-	}
-	return false;	// overflow == invalid
 }
 
-void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAddress& fromAddr, const void* data, unsigned int len)
+void Switch::onRemotePacket(const InetAddress &localAddr,const InetAddress &fromAddr,const void *data,unsigned int len)
 {
-	int32_t flowId = ZT_QOS_NO_FLOW;
 	try {
-		const int64_t now = RR->node->now();
+		const uint64_t now = RR->node->now();
 
-		const SharedPtr<Path> path(RR->topology->getPath(localSocket, fromAddr));
-		path->received(now);
+		if (len == 13) {
+			/* LEGACY: before VERB_PUSH_DIRECT_PATHS, peers used broadcast
+			 * announcements on the LAN to solve the 'same network problem.' We
+			 * no longer send these, but we'll listen for them for a while to
+			 * locate peers with versions <1.0.4. */
 
-		if (len > ZT_PROTO_MIN_FRAGMENT_LENGTH) {
-			if (reinterpret_cast<const uint8_t*>(data)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] == ZT_PACKET_FRAGMENT_INDICATOR) {
+			Address beaconAddr(reinterpret_cast<const char *>(data) + 8,5);
+			if (beaconAddr == RR->identity.address())
+				return;
+			if (!RR->node->shouldUsePathForZeroTierTraffic(localAddr,fromAddr))
+				return;
+			SharedPtr<Peer> peer(RR->topology->getPeer(beaconAddr));
+			if (peer) { // we'll only respond to beacons from known peers
+				if ((now - _lastBeaconResponse) >= 2500) { // limit rate of responses
+					_lastBeaconResponse = now;
+					Packet outp(peer->address(),RR->identity.address(),Packet::VERB_NOP);
+					outp.armor(peer->key(),true);
+					RR->node->putPacket(localAddr,fromAddr,outp.data(),outp.size());
+				}
+			}
+
+		} else if (len > ZT_PROTO_MIN_FRAGMENT_LENGTH) { // min length check is important!
+			if (reinterpret_cast<const uint8_t *>(data)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] == ZT_PACKET_FRAGMENT_INDICATOR) {
 				// Handle fragment ----------------------------------------------------
 
-				Packet::Fragment fragment(data, len);
+				Packet::Fragment fragment(data,len);
 				const Address destination(fragment.destination());
 
 				if (destination != RR->identity.address()) {
-					if ((! RR->topology->amUpstream()) && (! path->trustEstablished(now))) {
-						return;
-					}
-
+					// Fragment is not for us, so try to relay it
 					if (fragment.hops() < ZT_RELAY_MAX_HOPS) {
 						fragment.incrementHops();
 
 						// Note: we don't bother initiating NAT-t for fragments, since heads will set that off.
 						// It wouldn't hurt anything, just redundant and unnecessary.
-						SharedPtr<Peer> relayTo = RR->topology->getPeer(tPtr, destination);
-						if ((! relayTo) || (! relayTo->sendDirect(tPtr, fragment.data(), fragment.size(), now, false))) {
-							// Don't know peer or no direct path -- so relay via someone upstream
-							relayTo = RR->topology->getUpstreamPeer();
-							if (relayTo) {
-								relayTo->sendDirect(tPtr, fragment.data(), fragment.size(), now, true);
+						SharedPtr<Peer> relayTo = RR->topology->getPeer(destination);
+						if ((!relayTo)||(!relayTo->send(fragment.data(),fragment.size(),now))) {
+#ifdef ZT_ENABLE_CLUSTER
+							if (RR->cluster) {
+								RR->cluster->sendViaCluster(Address(),destination,fragment.data(),fragment.size(),false);
+								return;
 							}
+#endif
+
+							// Don't know peer or no direct path -- so relay via root server
+							relayTo = RR->topology->getBestRoot();
+							if (relayTo)
+								relayTo->send(fragment.data(),fragment.size(),now);
 						}
+					} else {
+						TRACE("dropped relay [fragment](%s) -> %s, max hops exceeded",fromAddr.toString().c_str(),destination.toString().c_str());
 					}
-				}
-				else {
+				} else {
 					// Fragment looks like ours
 					const uint64_t fragmentPacketId = fragment.packetId();
 					const unsigned int fragmentNumber = fragment.fragmentNumber();
 					const unsigned int totalFragments = fragment.totalFragments();
 
-					if ((totalFragments <= ZT_MAX_PACKET_FRAGMENTS) && (fragmentNumber < ZT_MAX_PACKET_FRAGMENTS) && (fragmentNumber > 0) && (totalFragments > 1)) {
+					if ((totalFragments <= ZT_MAX_PACKET_FRAGMENTS)&&(fragmentNumber < ZT_MAX_PACKET_FRAGMENTS)&&(fragmentNumber > 0)&&(totalFragments > 1)) {
 						// Fragment appears basically sane. Its fragment number must be
 						// 1 or more, since a Packet with fragmented bit set is fragment 0.
 						// Total fragments must be more than 1, otherwise why are we
 						// seeing a Packet::Fragment?
 
-						RXQueueEntry* const rq = _findRXQueueEntry(fragmentPacketId);
-						Mutex::Lock rql(rq->lock);
-						if (rq->packetId != fragmentPacketId) {
-							// No packet found, so we received a fragment without its head.
+						Mutex::Lock _l(_rxQueue_m);
+						RXQueueEntry *const rq = _findRXQueueEntry(now,fragmentPacketId);
+
+						if ((!rq->timestamp)||(rq->packetId != fragmentPacketId)) {
+							// No packet found, so we received a fragment without its head.
+							//TRACE("fragment (%u/%u) of %.16llx from %s",fragmentNumber + 1,totalFragments,fragmentPacketId,fromAddr.toString().c_str());
 
-							rq->flowId = flowId;
 							rq->timestamp = now;
 							rq->packetId = fragmentPacketId;
 							rq->frags[fragmentNumber - 1] = fragment;
-							rq->totalFragments = totalFragments;	   // total fragment count is known
-							rq->haveFragments = 1 << fragmentNumber;   // we have only this fragment
+							rq->totalFragments = totalFragments; // total fragment count is known
+							rq->haveFragments = 1 << fragmentNumber; // we have only this fragment
 							rq->complete = false;
-						}
-						else if (! (rq->haveFragments & (1 << fragmentNumber))) {
+						} else if (!(rq->haveFragments & (1 << fragmentNumber))) {
 							// We have other fragments and maybe the head, so add this one and check
+							//TRACE("fragment (%u/%u) of %.16llx from %s",fragmentNumber + 1,totalFragments,fragmentPacketId,fromAddr.toString().c_str());
 
 							rq->frags[fragmentNumber - 1] = fragment;
 							rq->totalFragments = totalFragments;
 
 							if (Utils::countBits(rq->haveFragments |= (1 << fragmentNumber)) == totalFragments) {
 								// We have all fragments -- assemble and process full Packet
+								//TRACE("packet %.16llx is complete, assembling and processing...",fragmentPacketId);
 
-								for (unsigned int f = 1; f < totalFragments; ++f) {
-									rq->frag0.append(rq->frags[f - 1].payload(), rq->frags[f - 1].payloadLength());
-								}
+								for(unsigned int f=1;f<totalFragments;++f)
+									rq->frag0.append(rq->frags[f - 1].payload(),rq->frags[f - 1].payloadLength());
 
-								if (rq->frag0.tryDecode(RR, tPtr, flowId)) {
-									rq->timestamp = 0;	 // packet decoded, free entry
-								}
-								else {
-									rq->complete = true;   // set complete flag but leave entry since it probably needs WHOIS or something
+								if (rq->frag0.tryDecode(RR,false)) {
+									rq->timestamp = 0; // packet decoded, free entry
+								} else {
+									rq->complete = true; // set complete flag but leave entry since it probably needs WHOIS or something
 								}
 							}
-						}	// else this is a duplicate fragment, ignore
+						} // else this is a duplicate fragment, ignore
 					}
 				}
 
 				// --------------------------------------------------------------------
-			}
-			else if (len >= ZT_PROTO_MIN_PACKET_LENGTH) {	// min length check is important!
+			} else if (len >= ZT_PROTO_MIN_PACKET_LENGTH) { // min length check is important!
 				// Handle packet head -------------------------------------------------
 
-				const Address destination(reinterpret_cast<const uint8_t*>(data) + 8, ZT_ADDRESS_LENGTH);
-				const Address source(reinterpret_cast<const uint8_t*>(data) + 13, ZT_ADDRESS_LENGTH);
+				// See packet format in Packet.hpp to understand this
+				const uint64_t packetId = (
+					(((uint64_t)reinterpret_cast<const uint8_t *>(data)[0]) << 56) |
+					(((uint64_t)reinterpret_cast<const uint8_t *>(data)[1]) << 48) |
+					(((uint64_t)reinterpret_cast<const uint8_t *>(data)[2]) << 40) |
+					(((uint64_t)reinterpret_cast<const uint8_t *>(data)[3]) << 32) |
+					(((uint64_t)reinterpret_cast<const uint8_t *>(data)[4]) << 24) |
+					(((uint64_t)reinterpret_cast<const uint8_t *>(data)[5]) << 16) |
+					(((uint64_t)reinterpret_cast<const uint8_t *>(data)[6]) << 8) |
+					((uint64_t)reinterpret_cast<const uint8_t *>(data)[7])
+				);
+				const Address destination(reinterpret_cast<const uint8_t *>(data) + 8,ZT_ADDRESS_LENGTH);
+				const Address source(reinterpret_cast<const uint8_t *>(data) + 13,ZT_ADDRESS_LENGTH);
 
-				if (source == RR->identity.address()) {
+				// Catch this and toss it -- it would never work, but it could happen if we somehow
+				// mistakenly guessed an address we're bound to as a destination for another peer.
+				if (source == RR->identity.address())
 					return;
-				}
+
+				//TRACE("<< %.16llx %s -> %s (size: %u)",(unsigned long long)packet->packetId(),source.toString().c_str(),destination.toString().c_str(),packet->size());
 
 				if (destination != RR->identity.address()) {
-					if ((! RR->topology->amUpstream()) && (! path->trustEstablished(now)) && (source != RR->identity.address())) {
-						return;
-					}
-
-					Packet packet(data, len);
+					Packet packet(data,len);
 
+					// Packet is not for us, so try to relay it
 					if (packet.hops() < ZT_RELAY_MAX_HOPS) {
 						packet.incrementHops();
-						SharedPtr<Peer> relayTo = RR->topology->getPeer(tPtr, destination);
-						if ((relayTo) && (relayTo->sendDirect(tPtr, packet.data(), packet.size(), now, false))) {
-							if ((source != RR->identity.address()) && (_shouldUnite(now, source, destination))) {
-								const SharedPtr<Peer> sourcePeer(RR->topology->getPeer(tPtr, source));
-								if (sourcePeer) {
-									relayTo->introduce(tPtr, now, sourcePeer);
-								}
+
+						SharedPtr<Peer> relayTo = RR->topology->getPeer(destination);
+						if ((relayTo)&&((relayTo->send(packet.data(),packet.size(),now)))) {
+							Mutex::Lock _l(_lastUniteAttempt_m);
+							uint64_t &luts = _lastUniteAttempt[_LastUniteKey(source,destination)];
+							if ((now - luts) >= ZT_MIN_UNITE_INTERVAL) {
+								luts = now;
+								unite(source,destination);
 							}
-						}
-						else {
-							relayTo = RR->topology->getUpstreamPeer();
-							if ((relayTo) && (relayTo->address() != source)) {
-								if (relayTo->sendDirect(tPtr, packet.data(), packet.size(), now, true)) {
-									const SharedPtr<Peer> sourcePeer(RR->topology->getPeer(tPtr, source));
-									if (sourcePeer) {
-										relayTo->introduce(tPtr, now, sourcePeer);
-									}
+						} else {
+#ifdef ZT_ENABLE_CLUSTER
+							if (RR->cluster) {
+								bool shouldUnite;
+								{
+									Mutex::Lock _l(_lastUniteAttempt_m);
+									uint64_t &luts = _lastUniteAttempt[_LastUniteKey(source,destination)];
+									shouldUnite = ((now - luts) >= ZT_MIN_UNITE_INTERVAL);
+									if (shouldUnite)
+										luts = now;
 								}
+								RR->cluster->sendViaCluster(source,destination,packet.data(),packet.size(),shouldUnite);
+								return;
 							}
+#endif
+							relayTo = RR->topology->getBestRoot(&source,1,true);
+							if (relayTo)
+								relayTo->send(packet.data(),packet.size(),now);
 						}
+					} else {
+						TRACE("dropped relay %s(%s) -> %s, max hops exceeded",packet.source().toString().c_str(),fromAddr.toString().c_str(),destination.toString().c_str());
 					}
-				}
-				else if ((reinterpret_cast<const uint8_t*>(data)[ZT_PACKET_IDX_FLAGS] & ZT_PROTO_FLAG_FRAGMENTED) != 0) {
+				} else if ((reinterpret_cast<const uint8_t *>(data)[ZT_PACKET_IDX_FLAGS] & ZT_PROTO_FLAG_FRAGMENTED) != 0) {
 					// Packet is the head of a fragmented packet series
 
-					const uint64_t packetId =
-						((((uint64_t)reinterpret_cast<const uint8_t*>(data)[0]) << 56) | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[1]) << 48) | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[2]) << 40)
-						 | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[3]) << 32) | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[4]) << 24) | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[5]) << 16)
-						 | (((uint64_t)reinterpret_cast<const uint8_t*>(data)[6]) << 8) | ((uint64_t)reinterpret_cast<const uint8_t*>(data)[7]));
+					Mutex::Lock _l(_rxQueue_m);
+					RXQueueEntry *const rq = _findRXQueueEntry(now,packetId);
 
-					RXQueueEntry* const rq = _findRXQueueEntry(packetId);
-					Mutex::Lock rql(rq->lock);
-					if (rq->packetId != packetId) {
+					if ((!rq->timestamp)||(rq->packetId != packetId)) {
 						// If we have no other fragments yet, create an entry and save the head
+						//TRACE("fragment (0/?) of %.16llx from %s",pid,fromAddr.toString().c_str());
 
-						rq->flowId = flowId;
 						rq->timestamp = now;
 						rq->packetId = packetId;
-						rq->frag0.init(data, len, path, now);
+						rq->frag0.init(data,len,localAddr,fromAddr,now);
 						rq->totalFragments = 0;
 						rq->haveFragments = 1;
 						rq->complete = false;
-					}
-					else if (! (rq->haveFragments & 1)) {
+					} else if (!(rq->haveFragments & 1)) {
 						// If we have other fragments but no head, see if we are complete with the head
 
-						if ((rq->totalFragments > 1) && (Utils::countBits(rq->haveFragments |= 1) == rq->totalFragments)) {
+						if ((rq->totalFragments > 1)&&(Utils::countBits(rq->haveFragments |= 1) == rq->totalFragments)) {
 							// We have all fragments -- assemble and process full Packet
+							//TRACE("packet %.16llx is complete, assembling and processing...",pid);
 
-							rq->frag0.init(data, len, path, now);
-							for (unsigned int f = 1; f < rq->totalFragments; ++f) {
-								rq->frag0.append(rq->frags[f - 1].payload(), rq->frags[f - 1].payloadLength());
-							}
+							rq->frag0.init(data,len,localAddr,fromAddr,now);
+							for(unsigned int f=1;f<rq->totalFragments;++f)
+								rq->frag0.append(rq->frags[f - 1].payload(),rq->frags[f - 1].payloadLength());
 
-							if (rq->frag0.tryDecode(RR, tPtr, flowId)) {
-								rq->timestamp = 0;	 // packet decoded, free entry
+							if (rq->frag0.tryDecode(RR,false)) {
+								rq->timestamp = 0; // packet decoded, free entry
+							} else {
+								rq->complete = true; // set complete flag but leave entry since it probably needs WHOIS or something
 							}
-							else {
-								rq->complete = true;   // set complete flag but leave entry since it probably needs WHOIS or something
-							}
-						}
-						else {
+						} else {
 							// Still waiting on more fragments, but keep the head
-							rq->frag0.init(data, len, path, now);
+							rq->frag0.init(data,len,localAddr,fromAddr,now);
 						}
-					}	// else this is a duplicate head, ignore
-				}
-				else {
+					} // else this is a duplicate head, ignore
+				} else {
 					// Packet is unfragmented, so just process it
-					IncomingPacket packet(data, len, path, now);
-					if (! packet.tryDecode(RR, tPtr, flowId)) {
-						RXQueueEntry* const rq = _nextRXQueueEntry();
-						Mutex::Lock rql(rq->lock);
-						rq->flowId = flowId;
+					IncomingPacket packet(data,len,localAddr,fromAddr,now);
+					if (!packet.tryDecode(RR,false)) {
+						Mutex::Lock _l(_rxQueue_m);
+						RXQueueEntry *rq = &(_rxQueue[ZT_RX_QUEUE_SIZE - 1]);
+						unsigned long i = ZT_RX_QUEUE_SIZE - 1;
+						while ((i)&&(rq->timestamp)) {
+							RXQueueEntry *tmp = &(_rxQueue[--i]);
+							if (tmp->timestamp < rq->timestamp)
+								rq = tmp;
+						}
 						rq->timestamp = now;
-						rq->packetId = packet.packetId();
+						rq->packetId = packetId;
 						rq->frag0 = packet;
 						rq->totalFragments = 1;
 						rq->haveFragments = 1;
@@ -261,324 +297,185 @@ void Switch::onRemotePacket(void* tPtr, const int64_t localSocket, const InetAdd
 				// --------------------------------------------------------------------
 			}
 		}
+	} catch (std::exception &ex) {
+		TRACE("dropped packet from %s: unexpected exception: %s",fromAddr.toString().c_str(),ex.what());
+	} catch ( ... ) {
+		TRACE("dropped packet from %s: unexpected exception: (unknown)",fromAddr.toString().c_str());
 	}
-	catch (...) {
-	}	// sanity check, should be caught elsewhere
 }
 
-void Switch::onLocalEthernet(void* tPtr, const SharedPtr<Network>& network, const MAC& from, const MAC& to, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len)
+void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,const MAC &to,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len)
 {
-	if (! network->hasConfig()) {
+	if (!network->hasConfig())
+		return;
+
+	// Sanity check -- bridge loop? OS problem?
+	if (to == network->mac())
+		return;
+
+	// Check to make sure this protocol is allowed on this network
+	if (!network->config().permitsEtherType(etherType)) {
+		TRACE("%.16llx: ignored tap: %s -> %s: ethertype %s not allowed on network %.16llx",network->id(),from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType),(unsigned long long)network->id());
 		return;
 	}
 
 	// Check if this packet is from someone other than the tap -- i.e. bridged in
-	bool fromBridged;
-	if ((fromBridged = (from != network->mac()))) {
-		if (! network->config().permitsBridging(RR->identity.address())) {
-			RR->t->outgoingNetworkFrameDropped(tPtr, network, from, to, etherType, vlanId, len, "not a bridge");
+	bool fromBridged = false;
+	if (from != network->mac()) {
+		if (!network->config().permitsBridging(RR->identity.address())) {
+			TRACE("%.16llx: %s -> %s %s not forwarded, bridging disabled or this peer not a bridge",network->id(),from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType));
 			return;
 		}
-	}
-
-	uint8_t qosBucket = ZT_AQM_DEFAULT_BUCKET;
-
-	/**
-	 * A pseudo-unique identifier used by balancing and bonding policies to
-	 * categorize individual flows/conversations for assignment to a specific
-	 * physical path. This identifier consists of the source port and
-	 * destination port of the encapsulated frame.
-	 *
-	 * A flowId of -1 will indicate that there is no preference for how this
-	 * packet shall be sent. An example of this would be an ICMP packet.
-	 */
-
-	int32_t flowId = ZT_QOS_NO_FLOW;
-
-	if (etherType == ZT_ETHERTYPE_IPV4 && (len >= 20)) {
-		uint16_t srcPort = 0;
-		uint16_t dstPort = 0;
-		uint8_t proto = (reinterpret_cast<const uint8_t*>(data)[9]);
-		const unsigned int headerLen = 4 * (reinterpret_cast<const uint8_t*>(data)[0] & 0xf);
-		switch (proto) {
-			case 0x01:	 // ICMP
-				// flowId = 0x01;
-				break;
-			// All these start with 16-bit source and destination port in that order
-			case 0x06:	 // TCP
-			case 0x11:	 // UDP
-			case 0x84:	 // SCTP
-			case 0x88:	 // UDPLite
-				if (len > (headerLen + 4)) {
-					unsigned int pos = headerLen + 0;
-					srcPort = (reinterpret_cast<const uint8_t*>(data)[pos++]) << 8;
-					srcPort |= (reinterpret_cast<const uint8_t*>(data)[pos]);
-					pos++;
-					dstPort = (reinterpret_cast<const uint8_t*>(data)[pos++]) << 8;
-					dstPort |= (reinterpret_cast<const uint8_t*>(data)[pos]);
-					flowId = dstPort ^ srcPort ^ proto;
-				}
-				break;
-		}
-	}
-
-	if (etherType == ZT_ETHERTYPE_IPV6 && (len >= 40)) {
-		uint16_t srcPort = 0;
-		uint16_t dstPort = 0;
-		unsigned int pos;
-		unsigned int proto;
-		_ipv6GetPayload((const uint8_t*)data, len, pos, proto);
-		switch (proto) {
-			case 0x3A:	 // ICMPv6
-				// flowId = 0x3A;
-				break;
-			// All these start with 16-bit source and destination port in that order
-			case 0x06:	 // TCP
-			case 0x11:	 // UDP
-			case 0x84:	 // SCTP
-			case 0x88:	 // UDPLite
-				if (len > (pos + 4)) {
-					srcPort = (reinterpret_cast<const uint8_t*>(data)[pos++]) << 8;
-					srcPort |= (reinterpret_cast<const uint8_t*>(data)[pos]);
-					pos++;
-					dstPort = (reinterpret_cast<const uint8_t*>(data)[pos++]) << 8;
-					dstPort |= (reinterpret_cast<const uint8_t*>(data)[pos]);
-					flowId = dstPort ^ srcPort ^ proto;
-				}
-				break;
-			default:
-				break;
-		}
+		fromBridged = true;
 	}
 
 	if (to.isMulticast()) {
-		MulticastGroup multicastGroup(to, 0);
+		// Destination is a multicast address (including broadcast)
+		MulticastGroup mg(to,0);
 
 		if (to.isBroadcast()) {
-			if ((etherType == ZT_ETHERTYPE_ARP) && (len >= 28)
-				&& ((((const uint8_t*)data)[2] == 0x08) && (((const uint8_t*)data)[3] == 0x00) && (((const uint8_t*)data)[4] == 6) && (((const uint8_t*)data)[5] == 4) && (((const uint8_t*)data)[7] == 0x01))) {
+			if ( (etherType == ZT_ETHERTYPE_ARP) && (len >= 28) && ((((const uint8_t *)data)[2] == 0x08)&&(((const uint8_t *)data)[3] == 0x00)&&(((const uint8_t *)data)[4] == 6)&&(((const uint8_t *)data)[5] == 4)&&(((const uint8_t *)data)[7] == 0x01)) ) {
 				/* IPv4 ARP is one of the few special cases that we impose upon what is
 				 * otherwise a straightforward Ethernet switch emulation. Vanilla ARP
 				 * is dumb old broadcast and simply doesn't scale. ZeroTier multicast
 				 * groups have an additional field called ADI (additional distinguishing
-				 * information) which was added specifically for ARP though it could
+			   * information) which was added specifically for ARP though it could
 				 * be used for other things too. We then take ARP broadcasts and turn
 				 * them into multicasts by stuffing the IP address being queried into
 				 * the 32-bit ADI field. In practice this uses our multicast pub/sub
 				 * system to implement a kind of extended/distributed ARP table. */
-				multicastGroup = MulticastGroup::deriveMulticastGroupForAddressResolution(InetAddress(((const unsigned char*)data) + 24, 4, 0));
-			}
-			else if (! network->config().enableBroadcast()) {
+				mg = MulticastGroup::deriveMulticastGroupForAddressResolution(InetAddress(((const unsigned char *)data) + 24,4,0));
+			} else if (!network->config().enableBroadcast()) {
 				// Don't transmit broadcasts if this network doesn't want them
-				RR->t->outgoingNetworkFrameDropped(tPtr, network, from, to, etherType, vlanId, len, "broadcast disabled");
+				TRACE("%.16llx: dropped broadcast since ff:ff:ff:ff:ff:ff is not enabled",network->id());
 				return;
 			}
-		}
-		else if ((etherType == ZT_ETHERTYPE_IPV6) && (len >= (40 + 8 + 16))) {
-			// IPv6 NDP emulation for certain very special patterns of private IPv6 addresses -- if enabled
-			if ((network->config().ndpEmulation()) && (reinterpret_cast<const uint8_t*>(data)[6] == 0x3a) && (reinterpret_cast<const uint8_t*>(data)[40] == 0x87)) {   // ICMPv6 neighbor solicitation
-				Address v6EmbeddedAddress;
-				const uint8_t* const pkt6 = reinterpret_cast<const uint8_t*>(data) + 40 + 8;
-				const uint8_t* my6 = (const uint8_t*)0;
-
-				// ZT-RFC4193 address: fdNN:NNNN:NNNN:NNNN:NN99:93DD:DDDD:DDDD / 88 (one /128 per actual host)
-
-				// ZT-6PLANE address:  fcXX:XXXX:XXDD:DDDD:DDDD:####:####:#### / 40 (one /80 per actual host)
-				// (XX - lower 32 bits of network ID XORed with higher 32 bits)
-
-				// For these to work, we must have a ZT-managed address assigned in one of the
-				// above formats, and the query must match its prefix.
-				for (unsigned int sipk = 0; sipk < network->config().staticIpCount; ++sipk) {
-					const InetAddress* const sip = &(network->config().staticIps[sipk]);
-					if (sip->ss_family == AF_INET6) {
-						my6 = reinterpret_cast<const uint8_t*>(reinterpret_cast<const struct sockaddr_in6*>(&(*sip))->sin6_addr.s6_addr);
-						const unsigned int sipNetmaskBits = Utils::ntoh((uint16_t)reinterpret_cast<const struct sockaddr_in6*>(&(*sip))->sin6_port);
-						if ((sipNetmaskBits == 88) && (my6[0] == 0xfd) && (my6[9] == 0x99) && (my6[10] == 0x93)) {	 // ZT-RFC4193 /88 ???
+		} else if ((etherType == ZT_ETHERTYPE_IPV6)&&(len >= (40 + 8 + 16))) {
+			/* IPv6 NDP emulation on ZeroTier-RFC4193 addressed networks! This allows
+			 * for multicast-free operation in IPv6 networks, which both improves
+			 * performance and is friendlier to mobile and (especially) IoT devices.
+			 * In the future there may be a no-multicast build option for embedded
+			 * and IoT use and this will be the preferred addressing mode. Note that
+			 * it plays nice with our L2 emulation philosophy and even with bridging.
+			 * While "real" devices behind the bridge can't have ZT-RFC4193 addresses
+			 * themselves, they can look these addresses up with NDP and it will
+			 * work just fine. */
+			if ((reinterpret_cast<const uint8_t *>(data)[6] == 0x3a)&&(reinterpret_cast<const uint8_t *>(data)[40] == 0x87)) { // ICMPv6 neighbor solicitation
+				std::vector<InetAddress> sips(network->config().staticIps());
+				for(std::vector<InetAddress>::const_iterator sip(sips.begin());sip!=sips.end();++sip) {
+					if ((sip->ss_family == AF_INET6)&&(Utils::ntoh((uint16_t)reinterpret_cast<const struct sockaddr_in6 *>(&(*sip))->sin6_port) == 88)) {
+						const uint8_t *my6 = reinterpret_cast<const uint8_t *>(reinterpret_cast<const struct sockaddr_in6 *>(&(*sip))->sin6_addr.s6_addr);
+						if ((my6[0] == 0xfd)&&(my6[9] == 0x99)&&(my6[10] == 0x93)) { // ZT-RFC4193 == fd__:____:____:____:__99:93__:____:____ / 88
+							const uint8_t *pkt6 = reinterpret_cast<const uint8_t *>(data) + 40 + 8;
 							unsigned int ptr = 0;
 							while (ptr != 11) {
-								if (pkt6[ptr] != my6[ptr]) {
+								if (pkt6[ptr] != my6[ptr])
 									break;
-								}
 								++ptr;
 							}
-							if (ptr == 11) {   // prefix match!
-								v6EmbeddedAddress.setTo(pkt6 + ptr, 5);
-								break;
-							}
-						}
-						else if (sipNetmaskBits == 40) {   // ZT-6PLANE /40 ???
-							const uint32_t nwid32 = (uint32_t)((network->id() ^ (network->id() >> 32)) & 0xffffffff);
-							if ((my6[0] == 0xfc) && (my6[1] == (uint8_t)((nwid32 >> 24) & 0xff)) && (my6[2] == (uint8_t)((nwid32 >> 16) & 0xff)) && (my6[3] == (uint8_t)((nwid32 >> 8) & 0xff)) && (my6[4] == (uint8_t)(nwid32 & 0xff))) {
-								unsigned int ptr = 0;
-								while (ptr != 5) {
-									if (pkt6[ptr] != my6[ptr]) {
-										break;
-									}
-									++ptr;
-								}
-								if (ptr == 5) {	  // prefix match!
-									v6EmbeddedAddress.setTo(pkt6 + ptr, 5);
-									break;
+							if (ptr == 11) { // /88 matches an assigned address on this network
+								const Address atPeer(pkt6 + ptr,5);
+								if (atPeer != RR->identity.address()) {
+									const MAC atPeerMac(atPeer,network->id());
+									TRACE("ZT-RFC4193 NDP emulation: %.16llx: forging response for %s/%s",network->id(),atPeer.toString().c_str(),atPeerMac.toString().c_str());
+
+									uint8_t adv[72];
+									adv[0] = 0x60; adv[1] = 0x00; adv[2] = 0x00; adv[3] = 0x00;
+									adv[4] = 0x00; adv[5] = 0x20;
+									adv[6] = 0x3a; adv[7] = 0xff;
+									for(int i=0;i<16;++i) adv[8 + i] = pkt6[i];
+									for(int i=0;i<16;++i) adv[24 + i] = my6[i];
+									adv[40] = 0x88; adv[41] = 0x00;
+									adv[42] = 0x00; adv[43] = 0x00; // future home of checksum
+									adv[44] = 0x60; adv[45] = 0x00; adv[46] = 0x00; adv[47] = 0x00;
+									for(int i=0;i<16;++i) adv[48 + i] = pkt6[i];
+									adv[64] = 0x02; adv[65] = 0x01;
+									adv[66] = atPeerMac[0]; adv[67] = atPeerMac[1]; adv[68] = atPeerMac[2]; adv[69] = atPeerMac[3]; adv[70] = atPeerMac[4]; adv[71] = atPeerMac[5];
+
+									uint16_t pseudo_[36];
+									uint8_t *const pseudo = reinterpret_cast<uint8_t *>(pseudo_);
+									for(int i=0;i<32;++i) pseudo[i] = adv[8 + i];
+									pseudo[32] = 0x00; pseudo[33] = 0x00; pseudo[34] = 0x00; pseudo[35] = 0x20;
+									pseudo[36] = 0x00; pseudo[37] = 0x00; pseudo[38] = 0x00; pseudo[39] = 0x3a;
+									for(int i=0;i<32;++i) pseudo[40 + i] = adv[40 + i];
+									uint32_t checksum = 0;
+									for(int i=0;i<36;++i) checksum += Utils::hton(pseudo_[i]);
+									while ((checksum >> 16)) checksum = (checksum & 0xffff) + (checksum >> 16);
+									checksum = ~checksum;
+									adv[42] = (checksum >> 8) & 0xff;
+									adv[43] = checksum & 0xff;
+
+									RR->node->putFrame(network->id(),network->userPtr(),atPeerMac,from,ZT_ETHERTYPE_IPV6,0,adv,72);
+									return; // stop processing: we have handled this frame with a spoofed local reply so no need to send it anywhere
 								}
 							}
 						}
 					}
 				}
-
-				if ((v6EmbeddedAddress) && (v6EmbeddedAddress != RR->identity.address())) {
-					const MAC peerMac(v6EmbeddedAddress, network->id());
-
-					uint8_t adv[72];
-					adv[0] = 0x60;
-					adv[1] = 0x00;
-					adv[2] = 0x00;
-					adv[3] = 0x00;
-					adv[4] = 0x00;
-					adv[5] = 0x20;
-					adv[6] = 0x3a;
-					adv[7] = 0xff;
-					for (int i = 0; i < 16; ++i) {
-						adv[8 + i] = pkt6[i];
-					}
-					for (int i = 0; i < 16; ++i) {
-						adv[24 + i] = my6[i];
-					}
-					adv[40] = 0x88;
-					adv[41] = 0x00;
-					adv[42] = 0x00;
-					adv[43] = 0x00;	  // future home of checksum
-					adv[44] = 0x60;
-					adv[45] = 0x00;
-					adv[46] = 0x00;
-					adv[47] = 0x00;
-					for (int i = 0; i < 16; ++i) {
-						adv[48 + i] = pkt6[i];
-					}
-					adv[64] = 0x02;
-					adv[65] = 0x01;
-					adv[66] = peerMac[0];
-					adv[67] = peerMac[1];
-					adv[68] = peerMac[2];
-					adv[69] = peerMac[3];
-					adv[70] = peerMac[4];
-					adv[71] = peerMac[5];
-
-					uint16_t pseudo_[36];
-					uint8_t* const pseudo = reinterpret_cast<uint8_t*>(pseudo_);
-					for (int i = 0; i < 32; ++i) {
-						pseudo[i] = adv[8 + i];
-					}
-					pseudo[32] = 0x00;
-					pseudo[33] = 0x00;
-					pseudo[34] = 0x00;
-					pseudo[35] = 0x20;
-					pseudo[36] = 0x00;
-					pseudo[37] = 0x00;
-					pseudo[38] = 0x00;
-					pseudo[39] = 0x3a;
-					for (int i = 0; i < 32; ++i) {
-						pseudo[40 + i] = adv[40 + i];
-					}
-					uint32_t checksum = 0;
-					for (int i = 0; i < 36; ++i) {
-						checksum += Utils::hton(pseudo_[i]);
-					}
-					while ((checksum >> 16)) {
-						checksum = (checksum & 0xffff) + (checksum >> 16);
-					}
-					checksum = ~checksum;
-					adv[42] = (checksum >> 8) & 0xff;
-					adv[43] = checksum & 0xff;
-
-					//
-					// call on separate background thread
-					// this prevents problems related to trying to do rx while inside of doing tx, such as acquiring same lock recursively
-					//
-
-					std::thread([=]() { RR->node->putFrame(tPtr, network->id(), network->userPtr(), peerMac, from, ZT_ETHERTYPE_IPV6, 0, adv, 72); }).detach();
-
-					return;	  // NDP emulation done. We have forged a "fake" reply, so no need to send actual NDP query.
-				}	// else no NDP emulation
-			}	// else no NDP emulation
-		}
-
-		// Check this after NDP emulation, since that has to be allowed in exactly this case
-		if (network->config().multicastLimit == 0) {
-			RR->t->outgoingNetworkFrameDropped(tPtr, network, from, to, etherType, vlanId, len, "multicast disabled");
-			return;
+			}
 		}
 
 		/* Learn multicast groups for bridged-in hosts.
 		 * Note that some OSes, most notably Linux, do this for you by learning
 		 * multicast addresses on bridge interfaces and subscribing each slave.
 		 * But in that case this does no harm, as the sets are just merged. */
-		if (fromBridged) {
-			network->learnBridgedMulticastGroup(tPtr, multicastGroup, RR->node->now());
-		}
+		if (fromBridged)
+			network->learnBridgedMulticastGroup(mg,RR->node->now());
 
-		// First pass sets noTee to false, but noTee is set to true in OutboundMulticast to prevent duplicates.
-		if (! network->filterOutgoingPacket(tPtr, false, RR->identity.address(), Address(), from, to, (const uint8_t*)data, len, etherType, vlanId, qosBucket)) {
-			RR->t->outgoingNetworkFrameDropped(tPtr, network, from, to, etherType, vlanId, len, "filter blocked");
-			return;
-		}
+		//TRACE("%.16llx: MULTICAST %s -> %s %s %u",network->id(),from.toString().c_str(),mg.toString().c_str(),etherTypeName(etherType),len);
 
-		RR->mc->send(tPtr, RR->node->now(), network, Address(), multicastGroup, (fromBridged) ? from : MAC(), etherType, data, len);
+		RR->mc->send(
+			((!network->config().isPublic())&&(network->config().com())) ? &(network->config().com()) : (const CertificateOfMembership *)0,
+			network->config().multicastLimit(),
+			RR->node->now(),
+			network->id(),
+			network->config().activeBridges(),
+			mg,
+			(fromBridged) ? from : MAC(),
+			etherType,
+			data,
+			len);
+
+		return;
 	}
-	else if (to == network->mac()) {
-		// Destination is this node, so just reinject it
 
-		//
-		// same pattern as putFrame call above
-		//
-		std::thread([=]() { RR->node->putFrame(tPtr, network->id(), network->userPtr(), from, to, etherType, vlanId, data, len); }).detach();
-	}
-	else if (to[0] == MAC::firstOctetForNetwork(network->id())) {
+	if (to[0] == MAC::firstOctetForNetwork(network->id())) {
 		// Destination is another ZeroTier peer on the same network
 
-		Address toZT(to.toAddress(network->id()));	 // since in-network MACs are derived from addresses and network IDs, we can reverse this
-		SharedPtr<Peer> toPeer(RR->topology->getPeer(tPtr, toZT));
-
-		if (! network->filterOutgoingPacket(tPtr, false, RR->identity.address(), toZT, from, to, (const uint8_t*)data, len, etherType, vlanId, qosBucket)) {
-			RR->t->outgoingNetworkFrameDropped(tPtr, network, from, to, etherType, vlanId, len, "filter blocked");
-			return;
-		}
-
-		network->pushCredentialsIfNeeded(tPtr, toZT, RR->node->now());
-
-		if (! fromBridged) {
-			Packet outp(toZT, RR->identity.address(), Packet::VERB_FRAME);
+		Address toZT(to.toAddress(network->id())); // since in-network MACs are derived from addresses and network IDs, we can reverse this
+		SharedPtr<Peer> toPeer(RR->topology->getPeer(toZT));
+		const bool includeCom = ( (network->config().isPrivate()) && (network->config().com()) && ((!toPeer)||(toPeer->needsOurNetworkMembershipCertificate(network->id(),RR->node->now(),true))) );
+		if ((fromBridged)||(includeCom)) {
+			Packet outp(toZT,RR->identity.address(),Packet::VERB_EXT_FRAME);
 			outp.append(network->id());
-			outp.append((uint16_t)etherType);
-			outp.append(data, len);
-			// 1.4.8: disable compression for unicast as it almost never helps
-			// if (!network->config().disableCompression())
-			//	outp.compress();
-			aqm_enqueue(tPtr, network, outp, true, qosBucket, flowId);
-		}
-		else {
-			Packet outp(toZT, RR->identity.address(), Packet::VERB_EXT_FRAME);
-			outp.append(network->id());
-			outp.append((unsigned char)0x00);
+			if (includeCom) {
+				outp.append((unsigned char)0x01); // 0x01 -- COM included
+				network->config().com().serialize(outp);
+			} else {
+				outp.append((unsigned char)0x00);
+			}
 			to.appendTo(outp);
 			from.appendTo(outp);
 			outp.append((uint16_t)etherType);
-			outp.append(data, len);
-			// 1.4.8: disable compression for unicast as it almost never helps
-			// if (!network->config().disableCompression())
-			//	outp.compress();
-			aqm_enqueue(tPtr, network, outp, true, qosBucket, flowId);
+			outp.append(data,len);
+			outp.compress();
+			send(outp,true,network->id());
+		} else {
+			Packet outp(toZT,RR->identity.address(),Packet::VERB_FRAME);
+			outp.append(network->id());
+			outp.append((uint16_t)etherType);
+			outp.append(data,len);
+			outp.compress();
+			send(outp,true,network->id());
 		}
-	}
-	else {
-		// Destination is bridged behind a remote peer
 
-		// We filter with a NULL destination ZeroTier address first. Filtrations
-		// for each ZT destination are also done below. This is the same rationale
-		// and design as for multicast.
-		if (! network->filterOutgoingPacket(tPtr, false, RR->identity.address(), Address(), from, to, (const uint8_t*)data, len, etherType, vlanId, qosBucket)) {
-			RR->t->outgoingNetworkFrameDropped(tPtr, network, from, to, etherType, vlanId, len, "filter blocked");
-			return;
-		}
+		//TRACE("%.16llx: UNICAST: %s -> %s etherType==%s(%.4x) vlanId==%u len==%u fromBridged==%d includeCom==%d",network->id(),from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType),etherType,vlanId,len,(int)fromBridged,(int)includeCom);
+
+		return;
+	}
+
+	{
+		// Destination is bridged behind a remote peer
 
 		Address bridges[ZT_MAX_BRIDGE_SPAM];
 		unsigned int numBridges = 0;
@@ -586,11 +483,10 @@ void Switch::onLocalEthernet(void* tPtr, const SharedPtr<Network>& network, cons
 		/* Create an array of up to ZT_MAX_BRIDGE_SPAM recipients for this bridged frame. */
 		bridges[0] = network->findBridgeTo(to);
 		std::vector<Address> activeBridges(network->config().activeBridges());
-		if ((bridges[0]) && (bridges[0] != RR->identity.address()) && (network->config().permitsBridging(bridges[0]))) {
+		if ((bridges[0])&&(bridges[0] != RR->identity.address())&&(network->config().permitsBridging(bridges[0]))) {
 			/* We have a known bridge route for this MAC, send it there. */
 			++numBridges;
-		}
-		else if (! activeBridges.empty()) {
+		} else if (!activeBridges.empty()) {
 			/* If there is no known route, spam to up to ZT_MAX_BRIDGE_SPAM active
 			 * bridges. If someone responds, we'll learn the route. */
 			std::vector<Address>::const_iterator ab(activeBridges.begin());
@@ -600,629 +496,366 @@ void Switch::onLocalEthernet(void* tPtr, const SharedPtr<Network>& network, cons
 					bridges[numBridges++] = *ab;
 					++ab;
 				}
-			}
-			else {
+			} else {
 				// Otherwise pick a random set of them
 				while (numBridges < ZT_MAX_BRIDGE_SPAM) {
-					if (ab == activeBridges.end()) {
+					if (ab == activeBridges.end())
 						ab = activeBridges.begin();
-					}
 					if (((unsigned long)RR->node->prng() % (unsigned long)activeBridges.size()) == 0) {
 						bridges[numBridges++] = *ab;
 						++ab;
-					}
-					else {
-						++ab;
-					}
+					} else ++ab;
 				}
 			}
 		}
 
-		for (unsigned int b = 0; b < numBridges; ++b) {
-			if (network->filterOutgoingPacket(tPtr, true, RR->identity.address(), bridges[b], from, to, (const uint8_t*)data, len, etherType, vlanId, qosBucket)) {
-				Packet outp(bridges[b], RR->identity.address(), Packet::VERB_EXT_FRAME);
-				outp.append(network->id());
-				outp.append((uint8_t)0x00);
-				to.appendTo(outp);
-				from.appendTo(outp);
-				outp.append((uint16_t)etherType);
-				outp.append(data, len);
-				// 1.4.8: disable compression for unicast as it almost never helps
-				// if (!network->config().disableCompression())
-				//	outp.compress();
-				aqm_enqueue(tPtr, network, outp, true, qosBucket, flowId);
-			}
-			else {
-				RR->t->outgoingNetworkFrameDropped(tPtr, network, from, to, etherType, vlanId, len, "filter blocked (bridge replication)");
+		for(unsigned int b=0;b<numBridges;++b) {
+			SharedPtr<Peer> bridgePeer(RR->topology->getPeer(bridges[b]));
+			Packet outp(bridges[b],RR->identity.address(),Packet::VERB_EXT_FRAME);
+			outp.append(network->id());
+			if ( (network->config().isPrivate()) && (network->config().com()) && ((!bridgePeer)||(bridgePeer->needsOurNetworkMembershipCertificate(network->id(),RR->node->now(),true))) ) {
+				outp.append((unsigned char)0x01); // 0x01 -- COM included
+				network->config().com().serialize(outp);
+			} else {
+				outp.append((unsigned char)0);
 			}
+			to.appendTo(outp);
+			from.appendTo(outp);
+			outp.append((uint16_t)etherType);
+			outp.append(data,len);
+			outp.compress();
+			send(outp,true,network->id());
 		}
 	}
 }
 
-void Switch::aqm_enqueue(void* tPtr, const SharedPtr<Network>& network, Packet& packet, bool encrypt, int qosBucket, int32_t flowId)
+void Switch::send(const Packet &packet,bool encrypt,uint64_t nwid)
 {
-	if (! network->qosEnabled()) {
-		send(tPtr, packet, encrypt, flowId);
-		return;
-	}
-	NetworkQoSControlBlock* nqcb = _netQueueControlBlock[network->id()];
-	if (! nqcb) {
-		nqcb = new NetworkQoSControlBlock();
-		_netQueueControlBlock[network->id()] = nqcb;
-		// Initialize ZT_QOS_NUM_BUCKETS queues and place them in the INACTIVE list
-		// These queues will be shuffled between the new/old/inactive lists by the enqueue/dequeue algorithm
-		for (int i = 0; i < ZT_AQM_NUM_BUCKETS; i++) {
-			nqcb->inactiveQueues.push_back(new ManagedQueue(i));
-		}
-	}
-	// Don't apply QoS scheduling to ZT protocol traffic
-	if (packet.verb() != Packet::VERB_FRAME && packet.verb() != Packet::VERB_EXT_FRAME) {
-		send(tPtr, packet, encrypt, flowId);
-	}
-
-	_aqm_m.lock();
-
-	// Enqueue packet and move queue to appropriate list
-
-	const Address dest(packet.destination());
-	TXQueueEntry* txEntry = new TXQueueEntry(dest, RR->node->now(), packet, encrypt, flowId);
-
-	ManagedQueue* selectedQueue = nullptr;
-	for (size_t i = 0; i < ZT_AQM_NUM_BUCKETS; i++) {
-		if (i < nqcb->oldQueues.size()) {	// search old queues first (I think this is best since old would imply most recent usage of the queue)
-			if (nqcb->oldQueues[i]->id == qosBucket) {
-				selectedQueue = nqcb->oldQueues[i];
-			}
-		}
-		if (i < nqcb->newQueues.size()) {	// search new queues (this would imply not often-used queues)
-			if (nqcb->newQueues[i]->id == qosBucket) {
-				selectedQueue = nqcb->newQueues[i];
-			}
-		}
-		if (i < nqcb->inactiveQueues.size()) {	 // search inactive queues
-			if (nqcb->inactiveQueues[i]->id == qosBucket) {
-				selectedQueue = nqcb->inactiveQueues[i];
-				// move queue to end of NEW queue list
-				selectedQueue->byteCredit = ZT_AQM_QUANTUM;
-				// DEBUG_INFO("moving q=%p from INACTIVE to NEW list", selectedQueue);
-				nqcb->newQueues.push_back(selectedQueue);
-				nqcb->inactiveQueues.erase(nqcb->inactiveQueues.begin() + i);
-			}
-		}
-	}
-	if (! selectedQueue) {
-		_aqm_m.unlock();
+	if (packet.destination() == RR->identity.address()) {
+		TRACE("BUG: caught attempt to send() to self, ignored");
 		return;
 	}
 
-	selectedQueue->q.push_back(txEntry);
-	selectedQueue->byteLength += txEntry->packet.payloadLength();
-	nqcb->_currEnqueuedPackets++;
+	//TRACE(">> %s to %s (%u bytes, encrypt==%d, nwid==%.16llx)",Packet::verbString(packet.verb()),packet.destination().toString().c_str(),packet.size(),(int)encrypt,nwid);
 
-	// DEBUG_INFO("nq=%2lu, oq=%2lu, iq=%2lu, nqcb.size()=%3d, bucket=%2d, q=%p", nqcb->newQueues.size(), nqcb->oldQueues.size(), nqcb->inactiveQueues.size(), nqcb->_currEnqueuedPackets, qosBucket, selectedQueue);
-
-	// Drop a packet if necessary
-	ManagedQueue* selectedQueueToDropFrom = nullptr;
-	if (nqcb->_currEnqueuedPackets > ZT_AQM_MAX_ENQUEUED_PACKETS) {
-		// DEBUG_INFO("too many enqueued packets (%d), finding packet to drop", nqcb->_currEnqueuedPackets);
-		int maxQueueLength = 0;
-		for (size_t i = 0; i < ZT_AQM_NUM_BUCKETS; i++) {
-			if (i < nqcb->oldQueues.size()) {
-				if (nqcb->oldQueues[i]->byteLength > maxQueueLength) {
-					maxQueueLength = nqcb->oldQueues[i]->byteLength;
-					selectedQueueToDropFrom = nqcb->oldQueues[i];
-				}
-			}
-			if (i < nqcb->newQueues.size()) {
-				if (nqcb->newQueues[i]->byteLength > maxQueueLength) {
-					maxQueueLength = nqcb->newQueues[i]->byteLength;
-					selectedQueueToDropFrom = nqcb->newQueues[i];
-				}
-			}
-			if (i < nqcb->inactiveQueues.size()) {
-				if (nqcb->inactiveQueues[i]->byteLength > maxQueueLength) {
-					maxQueueLength = nqcb->inactiveQueues[i]->byteLength;
-					selectedQueueToDropFrom = nqcb->inactiveQueues[i];
-				}
-			}
-		}
-		if (selectedQueueToDropFrom) {
-			// DEBUG_INFO("dropping packet from head of largest queue (%d payload bytes)", maxQueueLength);
-			int sizeOfDroppedPacket = selectedQueueToDropFrom->q.front()->packet.payloadLength();
-			delete selectedQueueToDropFrom->q.front();
-			selectedQueueToDropFrom->q.pop_front();
-			selectedQueueToDropFrom->byteLength -= sizeOfDroppedPacket;
-			nqcb->_currEnqueuedPackets--;
-		}
-	}
-	_aqm_m.unlock();
-	aqm_dequeue(tPtr);
-}
-
-uint64_t Switch::control_law(uint64_t t, int count)
-{
-	return (uint64_t)(t + ZT_AQM_INTERVAL / sqrt(count));
-}
-
-Switch::dqr Switch::dodequeue(ManagedQueue* q, uint64_t now)
-{
-	dqr r;
-	r.ok_to_drop = false;
-	r.p = q->q.front();
-
-	if (r.p == NULL) {
-		q->first_above_time = 0;
-		return r;
-	}
-	uint64_t sojourn_time = now - r.p->creationTime;
-	if (sojourn_time < ZT_AQM_TARGET || q->byteLength <= ZT_DEFAULT_MTU) {
-		// went below - stay below for at least interval
-		q->first_above_time = 0;
-	}
-	else {
-		if (q->first_above_time == 0) {
-			// just went above from below. if still above at
-			// first_above_time, will say it's ok to drop.
-			q->first_above_time = now + ZT_AQM_INTERVAL;
-		}
-		else if (now >= q->first_above_time) {
-			r.ok_to_drop = true;
-		}
-	}
-	return r;
-}
-
-Switch::TXQueueEntry* Switch::CoDelDequeue(ManagedQueue* q, bool isNew, uint64_t now)
-{
-	dqr r = dodequeue(q, now);
-
-	if (q->dropping) {
-		if (! r.ok_to_drop) {
-			q->dropping = false;
-		}
-		while (now >= q->drop_next && q->dropping) {
-			q->q.pop_front();	// drop
-			r = dodequeue(q, now);
-			if (! r.ok_to_drop) {
-				// leave dropping state
-				q->dropping = false;
-			}
-			else {
-				++(q->count);
-				// schedule the next drop.
-				q->drop_next = control_law(q->drop_next, q->count);
-			}
-		}
-	}
-	else if (r.ok_to_drop) {
-		q->q.pop_front();	// drop
-		r = dodequeue(q, now);
-		q->dropping = true;
-		q->count = (q->count > 2 && now - q->drop_next < 8 * ZT_AQM_INTERVAL) ? q->count - 2 : 1;
-		q->drop_next = control_law(now, q->count);
-	}
-	return r.p;
-}
-
-void Switch::aqm_dequeue(void* tPtr)
-{
-	// Cycle through network-specific QoS control blocks
-	for (std::map<uint64_t, NetworkQoSControlBlock*>::iterator nqcb(_netQueueControlBlock.begin()); nqcb != _netQueueControlBlock.end();) {
-		if (! (*nqcb).second->_currEnqueuedPackets) {
-			return;
-		}
-
-		uint64_t now = RR->node->now();
-		TXQueueEntry* entryToEmit = nullptr;
-		std::vector<ManagedQueue*>* currQueues = &((*nqcb).second->newQueues);
-		std::vector<ManagedQueue*>* oldQueues = &((*nqcb).second->oldQueues);
-		std::vector<ManagedQueue*>* inactiveQueues = &((*nqcb).second->inactiveQueues);
-
-		_aqm_m.lock();
-
-		// Attempt dequeue from queues in NEW list
-		bool examiningNewQueues = true;
-		while (currQueues->size()) {
-			ManagedQueue* queueAtFrontOfList = currQueues->front();
-			if (queueAtFrontOfList->byteCredit < 0) {
-				queueAtFrontOfList->byteCredit += ZT_AQM_QUANTUM;
-				// Move to list of OLD queues
-				// DEBUG_INFO("moving q=%p from NEW to OLD list", queueAtFrontOfList);
-				oldQueues->push_back(queueAtFrontOfList);
-				currQueues->erase(currQueues->begin());
-			}
-			else {
-				entryToEmit = CoDelDequeue(queueAtFrontOfList, examiningNewQueues, now);
-				if (! entryToEmit) {
-					// Move to end of list of OLD queues
-					// DEBUG_INFO("moving q=%p from NEW to OLD list", queueAtFrontOfList);
-					oldQueues->push_back(queueAtFrontOfList);
-					currQueues->erase(currQueues->begin());
-				}
-				else {
-					int len = entryToEmit->packet.payloadLength();
-					queueAtFrontOfList->byteLength -= len;
-					queueAtFrontOfList->byteCredit -= len;
-					// Send the packet!
-					queueAtFrontOfList->q.pop_front();
-					send(tPtr, entryToEmit->packet, entryToEmit->encrypt, entryToEmit->flowId);
-					(*nqcb).second->_currEnqueuedPackets--;
-				}
-				if (queueAtFrontOfList) {
-					// DEBUG_INFO("dequeuing from q=%p, len=%lu in NEW list (byteCredit=%d)", queueAtFrontOfList, queueAtFrontOfList->q.size(), queueAtFrontOfList->byteCredit);
-				}
-				break;
-			}
-		}
-
-		// Attempt dequeue from queues in OLD list
-		examiningNewQueues = false;
-		currQueues = &((*nqcb).second->oldQueues);
-		while (currQueues->size()) {
-			ManagedQueue* queueAtFrontOfList = currQueues->front();
-			if (queueAtFrontOfList->byteCredit < 0) {
-				queueAtFrontOfList->byteCredit += ZT_AQM_QUANTUM;
-				oldQueues->push_back(queueAtFrontOfList);
-				currQueues->erase(currQueues->begin());
-			}
-			else {
-				entryToEmit = CoDelDequeue(queueAtFrontOfList, examiningNewQueues, now);
-				if (! entryToEmit) {
-					// DEBUG_INFO("moving q=%p from OLD to INACTIVE list", queueAtFrontOfList);
-					//  Move to inactive list of queues
-					inactiveQueues->push_back(queueAtFrontOfList);
-					currQueues->erase(currQueues->begin());
-				}
-				else {
-					int len = entryToEmit->packet.payloadLength();
-					queueAtFrontOfList->byteLength -= len;
-					queueAtFrontOfList->byteCredit -= len;
-					queueAtFrontOfList->q.pop_front();
-					send(tPtr, entryToEmit->packet, entryToEmit->encrypt, entryToEmit->flowId);
-					(*nqcb).second->_currEnqueuedPackets--;
-				}
-				if (queueAtFrontOfList) {
-					// DEBUG_INFO("dequeuing from q=%p, len=%lu in OLD list (byteCredit=%d)", queueAtFrontOfList, queueAtFrontOfList->q.size(), queueAtFrontOfList->byteCredit);
-				}
-				break;
-			}
-		}
-		nqcb++;
-		_aqm_m.unlock();
-	}
-}
-
-void Switch::removeNetworkQoSControlBlock(uint64_t nwid)
-{
-	NetworkQoSControlBlock* nq = _netQueueControlBlock[nwid];
-	if (nq) {
-		_netQueueControlBlock.erase(nwid);
-		delete nq;
-		nq = NULL;
-	}
-}
-
-void Switch::send(void* tPtr, Packet& packet, bool encrypt, int32_t flowId)
-{
-	const Address dest(packet.destination());
-	if (dest == RR->identity.address()) {
-		return;
-	}
-	_recordOutgoingPacketMetrics(packet);
-	if (! _trySend(tPtr, packet, encrypt, flowId)) {
-		{
-			Mutex::Lock _l(_txQueue_m);
-			if (_txQueue.size() >= ZT_TX_QUEUE_SIZE) {
-				_txQueue.pop_front();
-			}
-			_txQueue.push_back(TXQueueEntry(dest, RR->node->now(), packet, encrypt, flowId));
-		}
-		if (! RR->topology->getPeer(tPtr, dest)) {
-			requestWhois(tPtr, RR->node->now(), dest);
-		}
-	}
-}
-
-void Switch::requestWhois(void* tPtr, const int64_t now, const Address& addr)
-{
-	if (addr == RR->identity.address()) {
-		return;
-	}
-
-	{
-		Mutex::Lock _l(_lastSentWhoisRequest_m);
-		int64_t& last = _lastSentWhoisRequest[addr];
-		if ((now - last) < ZT_WHOIS_RETRY_DELAY) {
-			return;
-		}
-		else {
-			last = now;
-		}
-	}
-
-	const SharedPtr<Peer> upstream(RR->topology->getUpstreamPeer());
-	if (upstream) {
-		int32_t flowId = ZT_QOS_NO_FLOW;
-		Packet outp(upstream->address(), RR->identity.address(), Packet::VERB_WHOIS);
-		addr.appendTo(outp);
-		send(tPtr, outp, true, flowId);
-	}
-}
-
-void Switch::doAnythingWaitingForPeer(void* tPtr, const SharedPtr<Peer>& peer)
-{
-	{
-		Mutex::Lock _l(_lastSentWhoisRequest_m);
-		_lastSentWhoisRequest.erase(peer->address());
-	}
-
-	const int64_t now = RR->node->now();
-	for (unsigned int ptr = 0; ptr < ZT_RX_QUEUE_SIZE; ++ptr) {
-		RXQueueEntry* const rq = &(_rxQueue[ptr]);
-		Mutex::Lock rql(rq->lock);
-		if ((rq->timestamp) && (rq->complete)) {
-			if ((rq->frag0.tryDecode(RR, tPtr, rq->flowId)) || ((now - rq->timestamp) > ZT_RECEIVE_QUEUE_TIMEOUT)) {
-				rq->timestamp = 0;
-			}
-		}
-	}
-
-	{
+	if (!_trySend(packet,encrypt,nwid)) {
 		Mutex::Lock _l(_txQueue_m);
-		for (std::list<TXQueueEntry>::iterator txi(_txQueue.begin()); txi != _txQueue.end();) {
+		_txQueue.push_back(TXQueueEntry(packet.destination(),RR->node->now(),packet,encrypt,nwid));
+	}
+}
+
+bool Switch::unite(const Address &p1,const Address &p2)
+{
+	if ((p1 == RR->identity.address())||(p2 == RR->identity.address()))
+		return false;
+	SharedPtr<Peer> p1p = RR->topology->getPeer(p1);
+	if (!p1p)
+		return false;
+	SharedPtr<Peer> p2p = RR->topology->getPeer(p2);
+	if (!p2p)
+		return false;
+
+	const uint64_t now = RR->node->now();
+
+	std::pair<InetAddress,InetAddress> cg(Peer::findCommonGround(*p1p,*p2p,now));
+	if ((!(cg.first))||(cg.first.ipScope() != cg.second.ipScope()))
+		return false;
+
+	TRACE("unite: %s(%s) <> %s(%s)",p1.toString().c_str(),cg.second.toString().c_str(),p2.toString().c_str(),cg.first.toString().c_str());
+
+	/* Tell P1 where to find P2 and vice versa, sending the packets to P1 and
+	 * P2 in randomized order in terms of which gets sent first. This is done
+	 * since in a few cases NAT-t can be sensitive to slight timing differences
+	 * in terms of when the two peers initiate. Normally this is accounted for
+	 * by the nearly-simultaneous RENDEZVOUS kickoff from the relay, but
+	 * given that relay are hosted on cloud providers this can in some
+	 * cases have a few ms of latency between packet departures. By randomizing
+	 * the order we make each attempted NAT-t favor one or the other going
+	 * first, meaning if it doesn't succeed the first time it might the second
+	 * and so forth. */
+	unsigned int alt = (unsigned int)RR->node->prng() & 1;
+	unsigned int completed = alt + 2;
+	while (alt != completed) {
+		if ((alt & 1) == 0) {
+			// Tell p1 where to find p2.
+			Packet outp(p1,RR->identity.address(),Packet::VERB_RENDEZVOUS);
+			outp.append((unsigned char)0);
+			p2.appendTo(outp);
+			outp.append((uint16_t)cg.first.port());
+			if (cg.first.isV6()) {
+				outp.append((unsigned char)16);
+				outp.append(cg.first.rawIpData(),16);
+			} else {
+				outp.append((unsigned char)4);
+				outp.append(cg.first.rawIpData(),4);
+			}
+			outp.armor(p1p->key(),true);
+			p1p->send(outp.data(),outp.size(),now);
+		} else {
+			// Tell p2 where to find p1.
+			Packet outp(p2,RR->identity.address(),Packet::VERB_RENDEZVOUS);
+			outp.append((unsigned char)0);
+			p1.appendTo(outp);
+			outp.append((uint16_t)cg.second.port());
+			if (cg.second.isV6()) {
+				outp.append((unsigned char)16);
+				outp.append(cg.second.rawIpData(),16);
+			} else {
+				outp.append((unsigned char)4);
+				outp.append(cg.second.rawIpData(),4);
+			}
+			outp.armor(p2p->key(),true);
+			p2p->send(outp.data(),outp.size(),now);
+		}
+		++alt; // counts up and also flips LSB
+	}
+
+	return true;
+}
+
+void Switch::rendezvous(const SharedPtr<Peer> &peer,const InetAddress &localAddr,const InetAddress &atAddr)
+{
+	TRACE("sending NAT-t message to %s(%s)",peer->address().toString().c_str(),atAddr.toString().c_str());
+	const uint64_t now = RR->node->now();
+	peer->sendHELLO(localAddr,atAddr,now,2); // first attempt: send low-TTL packet to 'open' local NAT
+	{
+		Mutex::Lock _l(_contactQueue_m);
+		_contactQueue.push_back(ContactQueueEntry(peer,now + ZT_NAT_T_TACTICAL_ESCALATION_DELAY,localAddr,atAddr));
+	}
+}
+
+void Switch::requestWhois(const Address &addr)
+{
+	bool inserted = false;
+	{
+		Mutex::Lock _l(_outstandingWhoisRequests_m);
+		WhoisRequest &r = _outstandingWhoisRequests[addr];
+		if (r.lastSent) {
+			r.retries = 0; // reset retry count if entry already existed, but keep waiting and retry again after normal timeout
+		} else {
+			r.lastSent = RR->node->now();
+			inserted = true;
+		}
+	}
+	if (inserted)
+		_sendWhoisRequest(addr,(const Address *)0,0);
+}
+
+void Switch::doAnythingWaitingForPeer(const SharedPtr<Peer> &peer)
+{
+	{	// cancel pending WHOIS since we now know this peer
+		Mutex::Lock _l(_outstandingWhoisRequests_m);
+		_outstandingWhoisRequests.erase(peer->address());
+	}
+
+	{	// finish processing any packets waiting on peer's public key / identity
+		Mutex::Lock _l(_rxQueue_m);
+		unsigned long i = ZT_RX_QUEUE_SIZE;
+		while (i) {
+			RXQueueEntry *rq = &(_rxQueue[--i]);
+			if ((rq->timestamp)&&(rq->complete)) {
+				if (rq->frag0.tryDecode(RR,false))
+					rq->timestamp = 0;
+			}
+		}
+	}
+
+	{	// finish sending any packets waiting on peer's public key / identity
+		Mutex::Lock _l(_txQueue_m);
+		for(std::list< TXQueueEntry >::iterator txi(_txQueue.begin());txi!=_txQueue.end();) {
 			if (txi->dest == peer->address()) {
-				if (_trySend(tPtr, txi->packet, txi->encrypt, txi->flowId)) {
+				if (_trySend(txi->packet,txi->encrypt,txi->nwid))
 					_txQueue.erase(txi++);
-				}
-				else {
-					++txi;
-				}
-			}
-			else {
-				++txi;
-			}
+				else ++txi;
+			} else ++txi;
 		}
 	}
 }
 
-unsigned long Switch::doTimerTasks(void* tPtr, int64_t now)
+unsigned long Switch::doTimerTasks(uint64_t now)
 {
-	const uint64_t timeSinceLastCheck = now - _lastCheckedQueues;
-	if (timeSinceLastCheck < ZT_WHOIS_RETRY_DELAY) {
-		return (unsigned long)(ZT_WHOIS_RETRY_DELAY - timeSinceLastCheck);
-	}
-	_lastCheckedQueues = now;
+	unsigned long nextDelay = 0xffffffff; // ceiling delay, caller will cap to minimum
 
-	std::vector<Address> needWhois;
-	{
+	{	// Iterate through NAT traversal strategies for entries in contact queue
+		Mutex::Lock _l(_contactQueue_m);
+		for(std::list<ContactQueueEntry>::iterator qi(_contactQueue.begin());qi!=_contactQueue.end();) {
+			if (now >= qi->fireAtTime) {
+				if (!qi->peer->pushDirectPaths(qi->localAddr,qi->inaddr,now,true,false))
+					qi->peer->sendHELLO(qi->localAddr,qi->inaddr,now);
+				_contactQueue.erase(qi++);
+				continue;
+				/* Old symmetric NAT buster code, obsoleted by port prediction alg in SelfAwareness but left around for now in case we revert
+				if (qi->strategyIteration == 0) {
+					// First strategy: send packet directly to destination
+					qi->peer->sendHELLO(qi->localAddr,qi->inaddr,now);
+				} else if (qi->strategyIteration <= 3) {
+					// Strategies 1-3: try escalating ports for symmetric NATs that remap sequentially
+					InetAddress tmpaddr(qi->inaddr);
+					int p = (int)qi->inaddr.port() + qi->strategyIteration;
+					if (p > 65535)
+						p -= 64511;
+					tmpaddr.setPort((unsigned int)p);
+					qi->peer->sendHELLO(qi->localAddr,tmpaddr,now);
+				} else {
+					// All strategies tried, expire entry
+					_contactQueue.erase(qi++);
+					continue;
+				}
+				++qi->strategyIteration;
+				qi->fireAtTime = now + ZT_NAT_T_TACTICAL_ESCALATION_DELAY;
+				nextDelay = std::min(nextDelay,(unsigned long)ZT_NAT_T_TACTICAL_ESCALATION_DELAY);
+				*/
+			} else {
+				nextDelay = std::min(nextDelay,(unsigned long)(qi->fireAtTime - now));
+			}
+			++qi; // if qi was erased, loop will have continued before here
+		}
+	}
+
+	{	// Retry outstanding WHOIS requests
+		Mutex::Lock _l(_outstandingWhoisRequests_m);
+		Hashtable< Address,WhoisRequest >::Iterator i(_outstandingWhoisRequests);
+		Address *a = (Address *)0;
+		WhoisRequest *r = (WhoisRequest *)0;
+		while (i.next(a,r)) {
+			const unsigned long since = (unsigned long)(now - r->lastSent);
+			if (since >= ZT_WHOIS_RETRY_DELAY) {
+				if (r->retries >= ZT_MAX_WHOIS_RETRIES) {
+					TRACE("WHOIS %s timed out",a->toString().c_str());
+					_outstandingWhoisRequests.erase(*a);
+				} else {
+					r->lastSent = now;
+					r->peersConsulted[r->retries] = _sendWhoisRequest(*a,r->peersConsulted,r->retries);
+					++r->retries;
+					TRACE("WHOIS %s (retry %u)",a->toString().c_str(),r->retries);
+					nextDelay = std::min(nextDelay,(unsigned long)ZT_WHOIS_RETRY_DELAY);
+				}
+			} else {
+				nextDelay = std::min(nextDelay,ZT_WHOIS_RETRY_DELAY - since);
+			}
+		}
+	}
+
+	{	// Time out TX queue packets that never got WHOIS lookups or other info.
 		Mutex::Lock _l(_txQueue_m);
-
-		for (std::list<TXQueueEntry>::iterator txi(_txQueue.begin()); txi != _txQueue.end();) {
-			if (_trySend(tPtr, txi->packet, txi->encrypt, txi->flowId)) {
+		for(std::list< TXQueueEntry >::iterator txi(_txQueue.begin());txi!=_txQueue.end();) {
+			if (_trySend(txi->packet,txi->encrypt,txi->nwid))
 				_txQueue.erase(txi++);
-			}
 			else if ((now - txi->creationTime) > ZT_TRANSMIT_QUEUE_TIMEOUT) {
+				TRACE("TX %s -> %s timed out",txi->packet.source().toString().c_str(),txi->packet.destination().toString().c_str());
 				_txQueue.erase(txi++);
-			}
-			else {
-				if (! RR->topology->getPeer(tPtr, txi->dest)) {
-					needWhois.push_back(txi->dest);
-				}
-				++txi;
-			}
-		}
-	}
-	for (std::vector<Address>::const_iterator i(needWhois.begin()); i != needWhois.end(); ++i) {
-		requestWhois(tPtr, now, *i);
-	}
-
-	for (unsigned int ptr = 0; ptr < ZT_RX_QUEUE_SIZE; ++ptr) {
-		RXQueueEntry* const rq = &(_rxQueue[ptr]);
-		Mutex::Lock rql(rq->lock);
-		if ((rq->timestamp) && (rq->complete)) {
-			if ((rq->frag0.tryDecode(RR, tPtr, rq->flowId)) || ((now - rq->timestamp) > ZT_RECEIVE_QUEUE_TIMEOUT)) {
-				rq->timestamp = 0;
-			}
-			else {
-				const Address src(rq->frag0.source());
-				if (! RR->topology->getPeer(tPtr, src)) {
-					requestWhois(tPtr, now, src);
-				}
-			}
+			} else ++txi;
 		}
 	}
 
-	{
+	{	// Remove really old last unite attempt entries to keep table size controlled
 		Mutex::Lock _l(_lastUniteAttempt_m);
-		Hashtable<_LastUniteKey, uint64_t>::Iterator i(_lastUniteAttempt);
-		_LastUniteKey* k = (_LastUniteKey*)0;
-		uint64_t* v = (uint64_t*)0;
-		while (i.next(k, v)) {
-			if ((now - *v) >= (ZT_MIN_UNITE_INTERVAL * 8)) {
+		Hashtable< _LastUniteKey,uint64_t >::Iterator i(_lastUniteAttempt);
+		_LastUniteKey *k = (_LastUniteKey *)0;
+		uint64_t *v = (uint64_t *)0;
+		while (i.next(k,v)) {
+			if ((now - *v) >= (ZT_MIN_UNITE_INTERVAL * 8))
 				_lastUniteAttempt.erase(*k);
-			}
 		}
 	}
 
-	{
-		Mutex::Lock _l(_lastSentWhoisRequest_m);
-		Hashtable<Address, int64_t>::Iterator i(_lastSentWhoisRequest);
-		Address* a = (Address*)0;
-		int64_t* ts = (int64_t*)0;
-		while (i.next(a, ts)) {
-			if ((now - *ts) > (ZT_WHOIS_RETRY_DELAY * 2)) {
-				_lastSentWhoisRequest.erase(*a);
-			}
-		}
-	}
-
-	return ZT_WHOIS_RETRY_DELAY;
+	return nextDelay;
 }
 
-bool Switch::_shouldUnite(const int64_t now, const Address& source, const Address& destination)
+Address Switch::_sendWhoisRequest(const Address &addr,const Address *peersAlreadyConsulted,unsigned int numPeersAlreadyConsulted)
 {
-	Mutex::Lock _l(_lastUniteAttempt_m);
-	uint64_t& ts = _lastUniteAttempt[_LastUniteKey(source, destination)];
-	if ((now - ts) >= ZT_MIN_UNITE_INTERVAL) {
-		ts = now;
-		return true;
+	SharedPtr<Peer> root(RR->topology->getBestRoot(peersAlreadyConsulted,numPeersAlreadyConsulted,false));
+	if (root) {
+		Packet outp(root->address(),RR->identity.address(),Packet::VERB_WHOIS);
+		addr.appendTo(outp);
+		outp.armor(root->key(),true);
+		if (root->send(outp.data(),outp.size(),RR->node->now()))
+			return root->address();
 	}
-	return false;
+	return Address();
 }
 
-bool Switch::_trySend(void* tPtr, Packet& packet, bool encrypt, int32_t flowId)
+bool Switch::_trySend(const Packet &packet,bool encrypt,uint64_t nwid)
 {
-	SharedPtr<Path> viaPath;
-	const int64_t now = RR->node->now();
-	const Address destination(packet.destination());
+	SharedPtr<Peer> peer(RR->topology->getPeer(packet.destination()));
 
-	const SharedPtr<Peer> peer(RR->topology->getPeer(tPtr, destination));
 	if (peer) {
-		if ((peer->bondingPolicy() == ZT_BOND_POLICY_BROADCAST) && (packet.verb() == Packet::VERB_FRAME || packet.verb() == Packet::VERB_EXT_FRAME)) {
-			const SharedPtr<Peer> relay(RR->topology->getUpstreamPeer());
-			Mutex::Lock _l(peer->_paths_m);
-			for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
-				if (peer->_paths[i].p && peer->_paths[i].p->alive(now)) {
-					uint16_t userSpecifiedMtu = peer->_paths[i].p->mtu();
-					_sendViaSpecificPath(tPtr, peer, peer->_paths[i].p, userSpecifiedMtu, now, packet, encrypt, flowId);
+		const uint64_t now = RR->node->now();
+
+		SharedPtr<Network> network;
+		if (nwid) {
+			network = RR->node->network(nwid);
+			if ((!network)||(!network->hasConfig()))
+				return false; // we probably just left this network, let its packets die
+		}
+
+		Path *viaPath = peer->getBestPath(now);
+		SharedPtr<Peer> relay;
+
+		if (!viaPath) {
+			if (network) {
+				unsigned int bestq = ~((unsigned int)0); // max unsigned int since quality is lower==better
+				for(unsigned int ri=0;ri<network->config().staticDeviceCount();++ri) {
+					const ZT_VirtualNetworkStaticDevice &r = network->config().staticDevice(ri);
+					if ((r.address != peer->address().toInt())&&((r.flags & ZT_NETWORK_STATIC_DEVICE_IS_RELAY) != 0)) {
+						SharedPtr<Peer> rp(RR->topology->getPeer(Address(r.address)));
+						if (rp) {
+							const unsigned int q = rp->relayQuality(now);
+							if (q < bestq) {
+								bestq = q;
+								rp.swap(relay);
+							}
+						}
+					}
 				}
 			}
+
+			if (!relay)
+				relay = RR->topology->getBestRoot();
+
+			if ( (!relay) || (!(viaPath = relay->getBestPath(now))) )
+				return false;
+		}
+		// viaPath will not be null if we make it here
+
+		// Push possible direct paths to us if we are relaying
+		if (relay) {
+			peer->pushDirectPaths(viaPath->localAddress(),viaPath->address(),now,false,( (network)&&(network->isAllowed(peer)) ));
+			viaPath->sent(now);
+		}
+
+		Packet tmp(packet);
+
+		unsigned int chunkSize = std::min(tmp.size(),(unsigned int)ZT_UDP_DEFAULT_PAYLOAD_MTU);
+		tmp.setFragmented(chunkSize < tmp.size());
+
+		tmp.armor(peer->key(),encrypt);
+
+		if (viaPath->send(RR,tmp.data(),chunkSize,now)) {
+			if (chunkSize < tmp.size()) {
+				// Too big for one packet, fragment the rest
+				unsigned int fragStart = chunkSize;
+				unsigned int remaining = tmp.size() - chunkSize;
+				unsigned int fragsRemaining = (remaining / (ZT_UDP_DEFAULT_PAYLOAD_MTU - ZT_PROTO_MIN_FRAGMENT_LENGTH));
+				if ((fragsRemaining * (ZT_UDP_DEFAULT_PAYLOAD_MTU - ZT_PROTO_MIN_FRAGMENT_LENGTH)) < remaining)
+					++fragsRemaining;
+				unsigned int totalFragments = fragsRemaining + 1;
+
+				for(unsigned int fno=1;fno<totalFragments;++fno) {
+					chunkSize = std::min(remaining,(unsigned int)(ZT_UDP_DEFAULT_PAYLOAD_MTU - ZT_PROTO_MIN_FRAGMENT_LENGTH));
+					Packet::Fragment frag(tmp,fragStart,chunkSize,fno,totalFragments);
+					viaPath->send(RR,frag.data(),frag.size(),now);
+					fragStart += chunkSize;
+					remaining -= chunkSize;
+				}
+			}
+
 			return true;
 		}
-		else {
-			viaPath = peer->getAppropriatePath(now, false, flowId);
-			if (! viaPath) {
-				peer->tryMemorizedPath(tPtr, now);	 // periodically attempt memorized or statically defined paths, if any are known
-				const SharedPtr<Peer> relay(RR->topology->getUpstreamPeer());
-				if ((! relay) || (! (viaPath = relay->getAppropriatePath(now, false, flowId)))) {
-					if (! (viaPath = peer->getAppropriatePath(now, true, flowId))) {
-						return false;
-					}
-				}
-			}
-			if (viaPath) {
-				uint16_t userSpecifiedMtu = viaPath->mtu();
-				_sendViaSpecificPath(tPtr, peer, viaPath, userSpecifiedMtu, now, packet, encrypt, flowId);
-				return true;
-			}
-		}
+	} else {
+		requestWhois(packet.destination());
 	}
 	return false;
 }
 
-void Switch::_sendViaSpecificPath(void* tPtr, SharedPtr<Peer> peer, SharedPtr<Path> viaPath, uint16_t userSpecifiedMtu, int64_t now, Packet& packet, bool encrypt, int32_t flowId)
-{
-	unsigned int mtu = ZT_DEFAULT_PHYSMTU;
-	uint64_t trustedPathId = 0;
-	RR->topology->getOutboundPathInfo(viaPath->address(), mtu, trustedPathId);
-
-	if (userSpecifiedMtu > 0) {
-		mtu = userSpecifiedMtu;
-	}
-	unsigned int chunkSize = std::min(packet.size(), mtu);
-	packet.setFragmented(chunkSize < packet.size());
-
-	if (trustedPathId) {
-		packet.setTrusted(trustedPathId);
-	}
-	else {
-		if (! packet.isEncrypted()) {
-			packet.armor(peer->key(), encrypt, false, peer->aesKeysIfSupported(), peer->identity());
-		}
-		RR->node->expectReplyTo(packet.packetId());
-	}
-
-	peer->recordOutgoingPacket(viaPath, packet.packetId(), packet.payloadLength(), packet.verb(), flowId, now);
-
-	if (viaPath->send(RR, tPtr, packet.data(), chunkSize, now)) {
-		if (chunkSize < packet.size()) {
-			// Too big for one packet, fragment the rest
-			unsigned int fragStart = chunkSize;
-			unsigned int remaining = packet.size() - chunkSize;
-			unsigned int fragsRemaining = (remaining / (mtu - ZT_PROTO_MIN_FRAGMENT_LENGTH));
-			if ((fragsRemaining * (mtu - ZT_PROTO_MIN_FRAGMENT_LENGTH)) < remaining) {
-				++fragsRemaining;
-			}
-			const unsigned int totalFragments = fragsRemaining + 1;
-
-			for (unsigned int fno = 1; fno < totalFragments; ++fno) {
-				chunkSize = std::min(remaining, (unsigned int)(mtu - ZT_PROTO_MIN_FRAGMENT_LENGTH));
-				Packet::Fragment frag(packet, fragStart, chunkSize, fno, totalFragments);
-				viaPath->send(RR, tPtr, frag.data(), frag.size(), now);
-				fragStart += chunkSize;
-				remaining -= chunkSize;
-			}
-		}
-	}
-}
-
-void Switch::_recordOutgoingPacketMetrics(const Packet& p)
-{
-	switch (p.verb()) {
-		case Packet::VERB_NOP:
-			Metrics::pkt_nop_out++;
-			break;
-		case Packet::VERB_HELLO:
-			Metrics::pkt_hello_out++;
-			break;
-		case Packet::VERB_ERROR:
-			Metrics::pkt_error_out++;
-			break;
-		case Packet::VERB_OK:
-			Metrics::pkt_ok_out++;
-			break;
-		case Packet::VERB_WHOIS:
-			Metrics::pkt_whois_out++;
-			break;
-		case Packet::VERB_RENDEZVOUS:
-			Metrics::pkt_rendezvous_out++;
-			break;
-		case Packet::VERB_FRAME:
-			Metrics::pkt_frame_out++;
-			break;
-		case Packet::VERB_EXT_FRAME:
-			Metrics::pkt_ext_frame_out++;
-			break;
-		case Packet::VERB_ECHO:
-			Metrics::pkt_echo_out++;
-			break;
-		case Packet::VERB_MULTICAST_LIKE:
-			Metrics::pkt_multicast_like_out++;
-			break;
-		case Packet::VERB_NETWORK_CREDENTIALS:
-			Metrics::pkt_network_credentials_out++;
-			break;
-		case Packet::VERB_NETWORK_CONFIG_REQUEST:
-			Metrics::pkt_network_config_request_out++;
-			break;
-		case Packet::VERB_NETWORK_CONFIG:
-			Metrics::pkt_network_config_out++;
-			break;
-		case Packet::VERB_MULTICAST_GATHER:
-			Metrics::pkt_multicast_gather_out++;
-			break;
-		case Packet::VERB_MULTICAST_FRAME:
-			Metrics::pkt_multicast_frame_out++;
-			break;
-		case Packet::VERB_PUSH_DIRECT_PATHS:
-			Metrics::pkt_push_direct_paths_out++;
-			break;
-		case Packet::VERB_ACK:
-			Metrics::pkt_ack_out++;
-			break;
-		case Packet::VERB_QOS_MEASUREMENT:
-			Metrics::pkt_qos_out++;
-			break;
-		case Packet::VERB_USER_MESSAGE:
-			Metrics::pkt_user_message_out++;
-			break;
-		case Packet::VERB_REMOTE_TRACE:
-			Metrics::pkt_remote_trace_out++;
-			break;
-		case Packet::VERB_PATH_NEGOTIATION_REQUEST:
-			Metrics::pkt_path_negotiation_request_out++;
-			break;
-	}
-}
-
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Switch.hpp b/node/Switch.hpp
index cf8270d43..ce4f00a16 100644
--- a/node/Switch.hpp
+++ b/node/Switch.hpp
@@ -1,45 +1,42 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_N_SWITCH_HPP
 #define ZT_N_SWITCH_HPP
 
-#include "Constants.hpp"
-#include "Hashtable.hpp"
-#include "IncomingPacket.hpp"
-#include "InetAddress.hpp"
-#include "MAC.hpp"
-#include "Mutex.hpp"
-#include "Network.hpp"
-#include "Packet.hpp"
-#include "SharedPtr.hpp"
-#include "Topology.hpp"
-#include "Utils.hpp"
-
-#include <list>
 #include <map>
 #include <set>
 #include <vector>
+#include <list>
 
-/* Ethernet frame types that might be relevant to us */
-#define ZT_ETHERTYPE_IPV4  0x0800
-#define ZT_ETHERTYPE_ARP   0x0806
-#define ZT_ETHERTYPE_RARP  0x8035
-#define ZT_ETHERTYPE_ATALK 0x809b
-#define ZT_ETHERTYPE_AARP  0x80f3
-#define ZT_ETHERTYPE_IPX_A 0x8137
-#define ZT_ETHERTYPE_IPX_B 0x8138
-#define ZT_ETHERTYPE_IPV6  0x86dd
+#include "Constants.hpp"
+#include "Mutex.hpp"
+#include "MAC.hpp"
+#include "NonCopyable.hpp"
+#include "Packet.hpp"
+#include "Utils.hpp"
+#include "InetAddress.hpp"
+#include "Topology.hpp"
+#include "Array.hpp"
+#include "Network.hpp"
+#include "SharedPtr.hpp"
+#include "IncomingPacket.hpp"
+#include "Hashtable.hpp"
 
 namespace ZeroTier {
 
@@ -54,40 +51,25 @@ class Peer;
  * packets from tap devices, and this sends them where they need to go and
  * wraps/unwraps accordingly. It also handles queues and timeouts and such.
  */
-class Switch {
-	struct ManagedQueue;
-	struct TXQueueEntry;
-
-	friend class SharedPtr<Peer>;
-
-	typedef struct {
-		TXQueueEntry* p;
-		bool ok_to_drop;
-	} dqr;
-
-  public:
-	Switch(const RuntimeEnvironment* renv);
+class Switch : NonCopyable
+{
+public:
+	Switch(const RuntimeEnvironment *renv);
+	~Switch();
 
 	/**
 	 * Called when a packet is received from the real network
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param localSocket Local I/O socket as supplied by external code
+	 * @param localAddr Local interface address
 	 * @param fromAddr Internet IP address of origin
 	 * @param data Packet data
 	 * @param len Packet length
 	 */
-	void onRemotePacket(void* tPtr, const int64_t localSocket, const InetAddress& fromAddr, const void* data, unsigned int len);
-
-	/**
-	 * Returns whether our bonding or balancing policy is aware of flows.
-	 */
-	bool isFlowAware();
+	void onRemotePacket(const InetAddress &localAddr,const InetAddress &fromAddr,const void *data,unsigned int len);
 
 	/**
 	 * Called when a packet comes from a local Ethernet tap
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param network Which network's TAP did this packet come from?
 	 * @param from Originating MAC address
 	 * @param to Destination MAC address
@@ -96,63 +78,7 @@ class Switch {
 	 * @param data Ethernet payload
 	 * @param len Frame length
 	 */
-	void onLocalEthernet(void* tPtr, const SharedPtr<Network>& network, const MAC& from, const MAC& to, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len);
-
-	/**
-	 * Determines the next drop schedule for packets in the TX queue
-	 *
-	 * @param t Current time
-	 * @param count Number of packets dropped this round
-	 */
-	uint64_t control_law(uint64_t t, int count);
-
-	/**
-	 * Selects a packet eligible for transmission from a TX queue. According to the control law, multiple packets
-	 * may be intentionally dropped before a packet is returned to the AQM scheduler.
-	 *
-	 * @param q The TX queue that is being dequeued from
-	 * @param now Current time
-	 */
-	dqr dodequeue(ManagedQueue* q, uint64_t now);
-
-	/**
-	 * Presents a packet to the AQM scheduler.
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param network Network that the packet shall be sent over
-	 * @param packet Packet to be sent
-	 * @param encrypt Encrypt packet payload? (always true except for HELLO)
-	 * @param qosBucket Which bucket the rule-system determined this packet should fall into
-	 */
-	void aqm_enqueue(void* tPtr, const SharedPtr<Network>& network, Packet& packet, bool encrypt, int qosBucket, int32_t flowId = ZT_QOS_NO_FLOW);
-
-	/**
-	 * Performs a single AQM cycle and dequeues and transmits all eligible packets on all networks
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 */
-	void aqm_dequeue(void* tPtr);
-
-	/**
-	 * Calls the dequeue mechanism and adjust queue state variables
-	 *
-	 * @param q The TX queue that is being dequeued from
-	 * @param isNew Whether or not this queue is in the NEW list
-	 * @param now Current time
-	 */
-	Switch::TXQueueEntry* CoDelDequeue(ManagedQueue* q, bool isNew, uint64_t now);
-
-	/**
-	 * Removes QoS Queues and flow state variables for a specific network. These queues are created
-	 * automatically upon the transmission of the first packet from this peer to another peer on the
-	 * given network.
-	 *
-	 * The reason for existence of queues and flow state variables specific to each network is so that
-	 * each network's QoS rules function independently.
-	 *
-	 * @param nwid Network ID
-	 */
-	void removeNetworkQoSControlBlock(uint64_t nwid);
+	void onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,const MAC &to,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len);
 
 	/**
 	 * Send a packet to a ZeroTier address (destination in packet)
@@ -166,30 +92,51 @@ class Switch {
 	 * Needless to say, the packet's source must be this node. Otherwise it
 	 * won't be encrypted right. (This is not used for relaying.)
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param packet Packet to send (buffer may be modified)
+	 * The network ID should only be specified for frames and other actual
+	 * network traffic. Other traffic such as controller requests and regular
+	 * protocol messages should specify zero.
+	 *
+	 * @param packet Packet to send
 	 * @param encrypt Encrypt packet payload? (always true except for HELLO)
+	 * @param nwid Related network ID or 0 if message is not in-network traffic
 	 */
-	void send(void* tPtr, Packet& packet, bool encrypt, int32_t flowId = ZT_QOS_NO_FLOW);
+	void send(const Packet &packet,bool encrypt,uint64_t nwid);
+
+	/**
+	 * Send RENDEZVOUS to two peers to permit them to directly connect
+	 *
+	 * This only works if both peers are known, with known working direct
+	 * links to this peer. The best link for each peer is sent to the other.
+	 *
+	 * @param p1 One of two peers (order doesn't matter)
+	 * @param p2 Second of pair
+	 */
+	bool unite(const Address &p1,const Address &p2);
+
+	/**
+	 * Attempt NAT traversal to peer at a given physical address
+	 *
+	 * @param peer Peer to contact
+	 * @param localAddr Local interface address
+	 * @param atAddr Address of peer
+	 */
+	void rendezvous(const SharedPtr<Peer> &peer,const InetAddress &localAddr,const InetAddress &atAddr);
 
 	/**
 	 * Request WHOIS on a given address
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param now Current time
 	 * @param addr Address to look up
 	 */
-	void requestWhois(void* tPtr, const int64_t now, const Address& addr);
+	void requestWhois(const Address &addr);
 
 	/**
 	 * Run any processes that are waiting for this peer's identity
 	 *
 	 * Called when we learn of a peer's identity from HELLO, OK(WHOIS), etc.
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param peer New peer
 	 */
-	void doAnythingWaitingForPeer(void* tPtr, const SharedPtr<Peer>& peer);
+	void doAnythingWaitingForPeer(const SharedPtr<Peer> &peer);
 
 	/**
 	 * Perform retries and other periodic timer tasks
@@ -197,137 +144,125 @@ class Switch {
 	 * This can return a very long delay if there are no pending timer
 	 * tasks. The caller should cap this comparatively vs. other values.
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param now Current time
 	 * @return Number of milliseconds until doTimerTasks() should be run again
 	 */
-	unsigned long doTimerTasks(void* tPtr, int64_t now);
+	unsigned long doTimerTasks(uint64_t now);
 
-  private:
-	bool _shouldUnite(const int64_t now, const Address& source, const Address& destination);
-	bool _trySend(void* tPtr, Packet& packet, bool encrypt, int32_t flowId = ZT_QOS_NO_FLOW);	// packet is modified if return is true
-	void _sendViaSpecificPath(void* tPtr, SharedPtr<Peer> peer, SharedPtr<Path> viaPath, uint16_t userSpecifiedMtu, int64_t now, Packet& packet, bool encrypt, int32_t flowId);
-	void _recordOutgoingPacketMetrics(const Packet& p);
+private:
+	Address _sendWhoisRequest(const Address &addr,const Address *peersAlreadyConsulted,unsigned int numPeersAlreadyConsulted);
+	bool _trySend(const Packet &packet,bool encrypt,uint64_t nwid);
 
-	const RuntimeEnvironment* const RR;
-	int64_t _lastBeaconResponse;
-	volatile int64_t _lastCheckedQueues;
+	const RuntimeEnvironment *const RR;
+	uint64_t _lastBeaconResponse;
 
-	// Time we last sent a WHOIS request for each address
-	Hashtable<Address, int64_t> _lastSentWhoisRequest;
-	Mutex _lastSentWhoisRequest_m;
+	// Outstanding WHOIS requests and how many retries they've undergone
+	struct WhoisRequest
+	{
+		WhoisRequest() : lastSent(0),retries(0) {}
+		uint64_t lastSent;
+		Address peersConsulted[ZT_MAX_WHOIS_RETRIES]; // by retry
+		unsigned int retries; // 0..ZT_MAX_WHOIS_RETRIES
+	};
+	Hashtable< Address,WhoisRequest > _outstandingWhoisRequests;
+	Mutex _outstandingWhoisRequests_m;
 
 	// Packets waiting for WHOIS replies or other decode info or missing fragments
-	struct RXQueueEntry {
-		RXQueueEntry() : timestamp(0)
-		{
-		}
-		volatile int64_t timestamp;	  // 0 if entry is not in use
-		volatile uint64_t packetId;
-		IncomingPacket frag0;								   // head of packet
-		Packet::Fragment frags[ZT_MAX_PACKET_FRAGMENTS - 1];   // later fragments (if any)
-		unsigned int totalFragments;						   // 0 if only frag0 received, waiting for frags
-		uint32_t haveFragments;								   // bit mask, LSB to MSB
-		volatile bool complete;								   // if true, packet is complete
-		volatile int32_t flowId;
-		Mutex lock;
+	struct RXQueueEntry
+	{
+		RXQueueEntry() : timestamp(0) {}
+		uint64_t timestamp; // 0 if entry is not in use
+		uint64_t packetId;
+		IncomingPacket frag0; // head of packet
+		Packet::Fragment frags[ZT_MAX_PACKET_FRAGMENTS - 1]; // later fragments (if any)
+		unsigned int totalFragments; // 0 if only frag0 received, waiting for frags
+		uint32_t haveFragments; // bit mask, LSB to MSB
+		bool complete; // if true, packet is complete
 	};
 	RXQueueEntry _rxQueue[ZT_RX_QUEUE_SIZE];
-	AtomicCounter _rxQueuePtr;
+	Mutex _rxQueue_m;
 
-	// Returns matching or next available RX queue entry
-	inline RXQueueEntry* _findRXQueueEntry(uint64_t packetId)
+	/* Returns the matching or oldest entry. Caller must check timestamp and
+	 * packet ID to determine which. */
+	inline RXQueueEntry *_findRXQueueEntry(uint64_t now,uint64_t packetId)
 	{
-		const unsigned int current = static_cast<unsigned int>(_rxQueuePtr.load());
-		for (unsigned int k = 1; k <= ZT_RX_QUEUE_SIZE; ++k) {
-			RXQueueEntry* rq = &(_rxQueue[(current - k) % ZT_RX_QUEUE_SIZE]);
-			if ((rq->packetId == packetId) && (rq->timestamp)) {
+		RXQueueEntry *rq;
+		RXQueueEntry *oldest = &(_rxQueue[ZT_RX_QUEUE_SIZE - 1]);
+		unsigned long i = ZT_RX_QUEUE_SIZE;
+		while (i) {
+			rq = &(_rxQueue[--i]);
+			if ((rq->packetId == packetId)&&(rq->timestamp))
 				return rq;
-			}
+			if ((now - rq->timestamp) >= ZT_RX_QUEUE_EXPIRE)
+				rq->timestamp = 0;
+			if (rq->timestamp < oldest->timestamp)
+				oldest = rq;
 		}
-		++_rxQueuePtr;
-		return &(_rxQueue[static_cast<unsigned int>(current) % ZT_RX_QUEUE_SIZE]);
-	}
-
-	// Returns current entry in rx queue ring buffer and increments ring pointer
-	inline RXQueueEntry* _nextRXQueueEntry()
-	{
-		return &(_rxQueue[static_cast<unsigned int>((++_rxQueuePtr) - 1) % ZT_RX_QUEUE_SIZE]);
+		return oldest;
 	}
 
 	// ZeroTier-layer TX queue entry
-	struct TXQueueEntry {
-		TXQueueEntry()
-		{
-		}
-		TXQueueEntry(Address d, uint64_t ct, const Packet& p, bool enc, int32_t fid) : dest(d), creationTime(ct), packet(p), encrypt(enc), flowId(fid)
-		{
-		}
+	struct TXQueueEntry
+	{
+		TXQueueEntry() {}
+		TXQueueEntry(Address d,uint64_t ct,const Packet &p,bool enc,uint64_t nw) :
+			dest(d),
+			creationTime(ct),
+			nwid(nw),
+			packet(p),
+			encrypt(enc) {}
 
 		Address dest;
 		uint64_t creationTime;
-		Packet packet;	 // unencrypted/unMAC'd packet -- this is done at send time
+		uint64_t nwid;
+		Packet packet; // unencrypted/unMAC'd packet -- this is done at send time
 		bool encrypt;
-		int32_t flowId;
 	};
-	std::list<TXQueueEntry> _txQueue;
+	std::list< TXQueueEntry > _txQueue;
 	Mutex _txQueue_m;
-	Mutex _aqm_m;
 
 	// Tracks sending of VERB_RENDEZVOUS to relaying peers
-	struct _LastUniteKey {
-		_LastUniteKey() : x(0), y(0)
-		{
-		}
-		_LastUniteKey(const Address& a1, const Address& a2)
+	struct _LastUniteKey
+	{
+		_LastUniteKey() : x(0),y(0) {}
+		_LastUniteKey(const Address &a1,const Address &a2)
 		{
 			if (a1 > a2) {
 				x = a2.toInt();
 				y = a1.toInt();
-			}
-			else {
+			} else {
 				x = a1.toInt();
 				y = a2.toInt();
 			}
 		}
-		inline unsigned long hashCode() const
-		{
-			return ((unsigned long)x ^ (unsigned long)y);
-		}
-		inline bool operator==(const _LastUniteKey& k) const
-		{
-			return ((x == k.x) && (y == k.y));
-		}
-		uint64_t x, y;
+		inline unsigned long hashCode() const throw() { return ((unsigned long)x ^ (unsigned long)y); }
+		inline bool operator==(const _LastUniteKey &k) const throw() { return ((x == k.x)&&(y == k.y)); }
+		uint64_t x,y;
 	};
-	Hashtable<_LastUniteKey, uint64_t> _lastUniteAttempt;	// key is always sorted in ascending order, for set-like behavior
+	Hashtable< _LastUniteKey,uint64_t > _lastUniteAttempt; // key is always sorted in ascending order, for set-like behavior
 	Mutex _lastUniteAttempt_m;
 
-	// Queue with additional flow state variables
-	struct ManagedQueue {
-		ManagedQueue(int id) : id(id), byteCredit(ZT_AQM_QUANTUM), byteLength(0), dropping(false)
-		{
-		}
-		int id;
-		int byteCredit;
-		int byteLength;
-		uint64_t first_above_time;
-		uint32_t count;
-		uint64_t drop_next;
-		bool dropping;
-		uint64_t drop_next_time;
-		std::list<TXQueueEntry*> q;
+	// Active attempts to contact remote peers, including state of multi-phase NAT traversal
+	struct ContactQueueEntry
+	{
+		ContactQueueEntry() {}
+		ContactQueueEntry(const SharedPtr<Peer> &p,uint64_t ft,const InetAddress &laddr,const InetAddress &a) :
+			peer(p),
+			fireAtTime(ft),
+			inaddr(a),
+			localAddr(laddr),
+			strategyIteration(0) {}
+
+		SharedPtr<Peer> peer;
+		uint64_t fireAtTime;
+		InetAddress inaddr;
+		InetAddress localAddr;
+		unsigned int strategyIteration;
 	};
-	// To implement fq_codel we need to maintain a queue of queues
-	struct NetworkQoSControlBlock {
-		int _currEnqueuedPackets;
-		std::vector<ManagedQueue*> newQueues;
-		std::vector<ManagedQueue*> oldQueues;
-		std::vector<ManagedQueue*> inactiveQueues;
-	};
-	std::map<uint64_t, NetworkQoSControlBlock*> _netQueueControlBlock;
+	std::list<ContactQueueEntry> _contactQueue;
+	Mutex _contactQueue_m;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Tag.cpp b/node/Tag.cpp
deleted file mode 100644
index a1ce0c0ed..000000000
--- a/node/Tag.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "Tag.hpp"
-
-#include "Identity.hpp"
-#include "Network.hpp"
-#include "Node.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Topology.hpp"
-
-namespace ZeroTier {
-
-int Tag::verify(const RuntimeEnvironment* RR, void* tPtr) const
-{
-	if ((! _signedBy) || (_signedBy != Network::controllerFor(_networkId))) {
-		return -1;
-	}
-	const Identity id(RR->topology->getIdentity(tPtr, _signedBy));
-	if (! id) {
-		RR->sw->requestWhois(tPtr, RR->node->now(), _signedBy);
-		return 1;
-	}
-	try {
-		Buffer<(sizeof(Tag) * 2)> tmp;
-		this->serialize(tmp, true);
-		return (id.verify(tmp.data(), tmp.size(), _signature) ? 0 : -1);
-	}
-	catch (...) {
-		return -1;
-	}
-}
-
-}	// namespace ZeroTier
diff --git a/node/Tag.hpp b/node/Tag.hpp
deleted file mode 100644
index 0243264af..000000000
--- a/node/Tag.hpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_TAG_HPP
-#define ZT_TAG_HPP
-
-#include "Address.hpp"
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "Credential.hpp"
-#include "ECC.hpp"
-#include "Identity.hpp"
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-namespace ZeroTier {
-
-class RuntimeEnvironment;
-
-/**
- * A tag that can be associated with members and matched in rules
- *
- * Capabilities group rules, while tags group members subject to those
- * rules. Tag values can be matched in rules, and tags relevant to a
- * capability are presented along with it.
- *
- * E.g. a capability might be "can speak Samba/CIFS within your
- * department." This cap might have a rule to allow TCP/137 but
- * only if a given tag ID's value matches between two peers. The
- * capability is what members can do, while the tag is who they are.
- * Different departments might have tags with the same ID but different
- * values.
- *
- * Unlike capabilities tags are signed only by the issuer and are never
- * transferable.
- */
-class Tag : public Credential {
-  public:
-	static inline Credential::Type credentialType()
-	{
-		return Credential::CREDENTIAL_TYPE_TAG;
-	}
-
-	Tag() : _id(0), _value(0), _networkId(0), _ts(0)
-	{
-		memset(_signature.data, 0, sizeof(_signature.data));
-	}
-
-	/**
-	 * @param nwid Network ID
-	 * @param ts Timestamp
-	 * @param issuedTo Address to which this tag was issued
-	 * @param id Tag ID
-	 * @param value Tag value
-	 */
-	Tag(const uint64_t nwid, const int64_t ts, const Address& issuedTo, const uint32_t id, const uint32_t value) : _id(id), _value(value), _networkId(nwid), _ts(ts), _issuedTo(issuedTo), _signedBy()
-	{
-		memset(_signature.data, 0, sizeof(_signature.data));
-	}
-
-	inline uint32_t id() const
-	{
-		return _id;
-	}
-	inline const uint32_t& value() const
-	{
-		return _value;
-	}
-	inline uint64_t networkId() const
-	{
-		return _networkId;
-	}
-	inline int64_t timestamp() const
-	{
-		return _ts;
-	}
-	inline const Address& issuedTo() const
-	{
-		return _issuedTo;
-	}
-	inline const Address& signedBy() const
-	{
-		return _signedBy;
-	}
-
-	/**
-	 * Sign this tag
-	 *
-	 * @param signer Signing identity, must have private key
-	 * @return True if signature was successful
-	 */
-	inline bool sign(const Identity& signer)
-	{
-		if (signer.hasPrivate()) {
-			Buffer<sizeof(Tag) + 64> tmp;
-			_signedBy = signer.address();
-			this->serialize(tmp, true);
-			_signature = signer.sign(tmp.data(), tmp.size());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Check this tag's signature
-	 *
-	 * @param RR Runtime environment to allow identity lookup for signedBy
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @return 0 == OK, 1 == waiting for WHOIS, -1 == BAD signature or tag
-	 */
-	int verify(const RuntimeEnvironment* RR, void* tPtr) const;
-
-	template <unsigned int C> inline void serialize(Buffer<C>& b, const bool forSign = false) const
-	{
-		if (forSign) {
-			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-
-		b.append(_networkId);
-		b.append(_ts);
-		b.append(_id);
-		b.append(_value);
-
-		_issuedTo.appendTo(b);
-		_signedBy.appendTo(b);
-		if (! forSign) {
-			b.append((uint8_t)1);						// 1 == Ed25519
-			b.append((uint16_t)ZT_ECC_SIGNATURE_LEN);	// length of signature
-			b.append(_signature.data, ZT_ECC_SIGNATURE_LEN);
-		}
-
-		b.append((uint16_t)0);	 // length of additional fields, currently 0
-
-		if (forSign) {
-			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-	}
-
-	template <unsigned int C> inline unsigned int deserialize(const Buffer<C>& b, unsigned int startAt = 0)
-	{
-		unsigned int p = startAt;
-
-		*this = Tag();
-
-		_networkId = b.template at<uint64_t>(p);
-		p += 8;
-		_ts = b.template at<uint64_t>(p);
-		p += 8;
-		_id = b.template at<uint32_t>(p);
-		p += 4;
-
-		_value = b.template at<uint32_t>(p);
-		p += 4;
-
-		_issuedTo.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		p += ZT_ADDRESS_LENGTH;
-		_signedBy.setTo(b.field(p, ZT_ADDRESS_LENGTH), ZT_ADDRESS_LENGTH);
-		p += ZT_ADDRESS_LENGTH;
-		if (b[p++] == 1) {
-			if (b.template at<uint16_t>(p) != ZT_ECC_SIGNATURE_LEN) {
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_CRYPTOGRAPHIC_TOKEN;
-			}
-			p += 2;
-			memcpy(_signature.data, b.field(p, ZT_ECC_SIGNATURE_LEN), ZT_ECC_SIGNATURE_LEN);
-			p += ZT_ECC_SIGNATURE_LEN;
-		}
-		else {
-			p += 2 + b.template at<uint16_t>(p);
-		}
-
-		p += 2 + b.template at<uint16_t>(p);
-		if (p > b.size()) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-		}
-
-		return (p - startAt);
-	}
-
-	// Provides natural sort order by ID
-	inline bool operator<(const Tag& t) const
-	{
-		return (_id < t._id);
-	}
-
-	inline bool operator==(const Tag& t) const
-	{
-		return (memcmp(this, &t, sizeof(Tag)) == 0);
-	}
-	inline bool operator!=(const Tag& t) const
-	{
-		return (memcmp(this, &t, sizeof(Tag)) != 0);
-	}
-
-	// For searching sorted arrays or lists of Tags by ID
-	struct IdComparePredicate {
-		inline bool operator()(const Tag& a, const Tag& b) const
-		{
-			return (a.id() < b.id());
-		}
-		inline bool operator()(const uint32_t a, const Tag& b) const
-		{
-			return (a < b.id());
-		}
-		inline bool operator()(const Tag& a, const uint32_t b) const
-		{
-			return (a.id() < b);
-		}
-		inline bool operator()(const Tag* a, const Tag* b) const
-		{
-			return (a->id() < b->id());
-		}
-		inline bool operator()(const Tag* a, const Tag& b) const
-		{
-			return (a->id() < b.id());
-		}
-		inline bool operator()(const Tag& a, const Tag* b) const
-		{
-			return (a.id() < b->id());
-		}
-		inline bool operator()(const uint32_t a, const Tag* b) const
-		{
-			return (a < b->id());
-		}
-		inline bool operator()(const Tag* a, const uint32_t b) const
-		{
-			return (a->id() < b);
-		}
-		inline bool operator()(const uint32_t a, const uint32_t b) const
-		{
-			return (a < b);
-		}
-	};
-
-  private:
-	uint32_t _id;
-	uint32_t _value;
-	uint64_t _networkId;
-	int64_t _ts;
-	Address _issuedTo;
-	Address _signedBy;
-	ECC::Signature _signature;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/Topology.cpp b/node/Topology.cpp
index fc7e4ad1b..21ed78a72 100644
--- a/node/Topology.cpp
+++ b/node/Topology.cpp
@@ -1,467 +1,366 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "Topology.hpp"
-
-#include "Buffer.hpp"
 #include "Constants.hpp"
+#include "Topology.hpp"
+#include "RuntimeEnvironment.hpp"
+#include "Node.hpp"
 #include "Network.hpp"
 #include "NetworkConfig.hpp"
-#include "Node.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
+#include "Buffer.hpp"
 
 namespace ZeroTier {
 
-#define ZT_DEFAULT_WORLD_LENGTH 570
-static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0xea, 0xc9, 0x0a, 0x00, 0x00, 0x01, 0x7e, 0xe9, 0x57, 0x60, 0xcd, 0xb8, 0xb3, 0x88, 0xa4, 0x69, 0x22, 0x14, 0x91, 0xaa, 0x9a, 0xcd, 0x66, 0xcc, 0x76, 0x4c, 0xde, 0xfd, 0x56, 0x03, 0x9f, 0x10,
-	0x67, 0xae, 0x15, 0xe6, 0x9c, 0x6f, 0xb4, 0x2d, 0x7b, 0x55, 0x33, 0x0e, 0x3f, 0xda, 0xac, 0x52, 0x9c, 0x07, 0x92, 0xfd, 0x73, 0x40, 0xa6, 0xaa, 0x21, 0xab, 0xa8, 0xa4, 0x89, 0xfd, 0xae, 0xa4, 0x4a, 0x39, 0xbf, 0x2d, 0x00, 0x65,
-	0x9a, 0xc9, 0xc8, 0x18, 0xeb, 0x36, 0x00, 0x92, 0x76, 0x37, 0xef, 0x4d, 0x14, 0x04, 0xa4, 0x4d, 0x54, 0x46, 0x84, 0x85, 0x13, 0x79, 0x75, 0x1f, 0xaa, 0x79, 0xb4, 0xc4, 0xea, 0x85, 0x04, 0x01, 0x75, 0xea, 0x06, 0x58, 0x60, 0x48,
-	0x24, 0x02, 0xe1, 0xeb, 0x34, 0x20, 0x52, 0x00, 0x0e, 0x62, 0x90, 0x06, 0x1a, 0x9b, 0xe0, 0xcd, 0x29, 0x3c, 0x8b, 0x55, 0xf1, 0xc3, 0xd2, 0x52, 0x48, 0x08, 0xaf, 0xc5, 0x49, 0x22, 0x08, 0x0e, 0x35, 0x39, 0xa7, 0x5a, 0xdd, 0xc3,
-	0xce, 0xf0, 0xf6, 0xad, 0x26, 0x0d, 0x58, 0x82, 0x93, 0xbb, 0x77, 0x86, 0xe7, 0x1e, 0xfa, 0x4b, 0x90, 0x57, 0xda, 0xd9, 0x86, 0x7a, 0xfe, 0x12, 0xdd, 0x04, 0xca, 0xfe, 0x9e, 0xfe, 0xb9, 0x00, 0xcc, 0xde, 0xf7, 0x6b, 0xc7, 0xb9,
-	0x7d, 0xed, 0x90, 0x4e, 0xab, 0xc5, 0xdf, 0x09, 0x88, 0x6d, 0x9c, 0x15, 0x14, 0xa6, 0x10, 0x03, 0x6c, 0xb9, 0x13, 0x9c, 0xc2, 0x14, 0x00, 0x1a, 0x29, 0x58, 0x97, 0x8e, 0xfc, 0xec, 0x15, 0x71, 0x2d, 0xd3, 0x94, 0x8c, 0x6e, 0x6b,
-	0x3a, 0x8e, 0x89, 0x3d, 0xf0, 0x1f, 0xf4, 0x93, 0xd1, 0xf8, 0xd9, 0x80, 0x6a, 0x86, 0x0c, 0x54, 0x20, 0x57, 0x1b, 0xf0, 0x00, 0x02, 0x04, 0x68, 0xc2, 0x08, 0x86, 0x27, 0x09, 0x06, 0x26, 0x05, 0x98, 0x80, 0x02, 0x00, 0x12, 0x00,
-	0x00, 0x30, 0x05, 0x71, 0x0e, 0x34, 0x00, 0x51, 0x27, 0x09, 0x77, 0x8c, 0xde, 0x71, 0x90, 0x00, 0x3f, 0x66, 0x81, 0xa9, 0x9e, 0x5a, 0xd1, 0x89, 0x5e, 0x9f, 0xba, 0x33, 0xe6, 0x21, 0x2d, 0x44, 0x54, 0xe1, 0x68, 0xbc, 0xec, 0x71,
-	0x12, 0x10, 0x1b, 0xf0, 0x00, 0x95, 0x6e, 0xd8, 0xe9, 0x2e, 0x42, 0x89, 0x2c, 0xb6, 0xf2, 0xec, 0x41, 0x08, 0x81, 0xa8, 0x4a, 0xb1, 0x9d, 0xa5, 0x0e, 0x12, 0x87, 0xba, 0x3d, 0x92, 0x6c, 0x3a, 0x1f, 0x75, 0x5c, 0xcc, 0xf2, 0x99,
-	0xa1, 0x20, 0x70, 0x55, 0x00, 0x02, 0x04, 0x67, 0xc3, 0x67, 0x42, 0x27, 0x09, 0x06, 0x26, 0x05, 0x98, 0x80, 0x04, 0x00, 0x00, 0xc3, 0x02, 0x54, 0xf2, 0xbc, 0xa1, 0xf7, 0x00, 0x19, 0x27, 0x09, 0x62, 0xf8, 0x65, 0xae, 0x71, 0x00,
-	0xe2, 0x07, 0x6c, 0x57, 0xde, 0x87, 0x0e, 0x62, 0x88, 0xd7, 0xd5, 0xe7, 0x40, 0x44, 0x08, 0xb1, 0x54, 0x5e, 0xfc, 0xa3, 0x7d, 0x67, 0xf7, 0x7b, 0x87, 0xe9, 0xe5, 0x41, 0x68, 0xc2, 0x5d, 0x3e, 0xf1, 0xa9, 0xab, 0xf2, 0x90, 0x5e,
-	0xa5, 0xe7, 0x85, 0xc0, 0x1d, 0xff, 0x23, 0x88, 0x7a, 0xd4, 0x23, 0x2d, 0x95, 0xc7, 0xa8, 0xfd, 0x2c, 0x27, 0x11, 0x1a, 0x72, 0xbd, 0x15, 0x93, 0x22, 0xdc, 0x00, 0x02, 0x04, 0x32, 0x07, 0xfc, 0x8a, 0x27, 0x09, 0x06, 0x20, 0x01,
-	0x49, 0xf0, 0xd0, 0xdb, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x27, 0x09, 0xca, 0xfe, 0x04, 0xeb, 0xa9, 0x00, 0x6c, 0x6a, 0x9d, 0x1d, 0xea, 0x55, 0xc1, 0x61, 0x6b, 0xfe, 0x2a, 0x2b, 0x8f, 0x0f, 0xf9, 0xa8,
-	0xca, 0xca, 0xf7, 0x03, 0x74, 0xfb, 0x1f, 0x39, 0xe3, 0xbe, 0xf8, 0x1c, 0xbf, 0xeb, 0xef, 0x17, 0xb7, 0x22, 0x82, 0x68, 0xa0, 0xa2, 0xa2, 0x9d, 0x34, 0x88, 0xc7, 0x52, 0x56, 0x5c, 0x6c, 0x96, 0x5c, 0xbd, 0x65, 0x06, 0xec, 0x24,
-	0x39, 0x7c, 0xc8, 0xa5, 0xd9, 0xd1, 0x52, 0x85, 0xa8, 0x7f, 0x00, 0x02, 0x04, 0x54, 0x11, 0x35, 0x9b, 0x27, 0x09, 0x06, 0x2a, 0x02, 0x6e, 0xa0, 0xd4, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x93, 0x27, 0x09
-};
+// 2015-11-16 -- The Fabulous Four (should have named them after Beatles!)
+//#define ZT_DEFAULT_WORLD_LENGTH 494
+//static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {0x01,0x00,0x00,0x00,0x00,0x08,0xea,0xc9,0x0a,0x00,0x00,0x01,0x51,0x11,0x70,0xb2,0xfb,0xb8,0xb3,0x88,0xa4,0x69,0x22,0x14,0x91,0xaa,0x9a,0xcd,0x66,0xcc,0x76,0x4c,0xde,0xfd,0x56,0x03,0x9f,0x10,0x67,0xae,0x15,0xe6,0x9c,0x6f,0xb4,0x2d,0x7b,0x55,0x33,0x0e,0x3f,0xda,0xac,0x52,0x9c,0x07,0x92,0xfd,0x73,0x40,0xa6,0xaa,0x21,0xab,0xa8,0xa4,0x89,0xfd,0xae,0xa4,0x4a,0x39,0xbf,0x2d,0x00,0x65,0x9a,0xc9,0xc8,0x18,0xeb,0x80,0x31,0xa4,0x65,0x95,0x45,0x06,0x1c,0xfb,0xc2,0x4e,0x5d,0xe7,0x0a,0x40,0x7a,0x97,0xce,0x36,0xa2,0x3d,0x05,0xca,0x87,0xc7,0x59,0x27,0x5c,0x8b,0x0d,0x4c,0xb4,0xbb,0x26,0x2f,0x77,0x17,0x5e,0xb7,0x4d,0xb8,0xd3,0xb4,0xe9,0x23,0x5d,0xcc,0xa2,0x71,0xa8,0xdf,0xf1,0x23,0xa3,0xb2,0x66,0x74,0xea,0xe5,0xdc,0x8d,0xef,0xd3,0x0a,0xa9,0xac,0xcb,0xda,0x93,0xbd,0x6c,0xcd,0x43,0x1d,0xa7,0x98,0x6a,0xde,0x70,0xc0,0xc6,0x1c,0xaf,0xf0,0xfd,0x7f,0x8a,0xb9,0x76,0x13,0xe1,0xde,0x4f,0xf3,0xd6,0x13,0x04,0x7e,0x19,0x87,0x6a,0xba,0x00,0x2a,0x6e,0x2b,0x23,0x18,0x93,0x0f,0x60,0xeb,0x09,0x7f,0x70,0xd0,0xf4,0xb0,0x28,0xb2,0xcd,0x6d,0x3d,0x0c,0x63,0xc0,0x14,0xb9,0x03,0x9f,0xf3,0x53,0x90,0xe4,0x11,0x81,0xf2,0x16,0xfb,0x2e,0x6f,0xa8,0xd9,0x5c,0x1e,0xe9,0x66,0x71,0x56,0x41,0x19,0x05,0xc3,0xdc,0xcf,0xea,0x78,0xd8,0xc6,0xdf,0xaf,0xba,0x68,0x81,0x70,0xb3,0xfa,0x00,0x01,0x04,0xc6,0xc7,0x61,0xdc,0x27,0x09,0x88,0x41,0x40,0x8a,0x2e,0x00,0xbb,0x1d,0x31,0xf2,0xc3,0x23,0xe2,0x64,0xe9,0xe6,0x41,0x72,0xc1,0xa7,0x4f,0x77,0x89,0x95,0x55,0xed,0x10,0x75,0x1c,0xd5,0x6e,0x86,0x40,0x5c,0xde,0x11,0x8d,0x02,0xdf,0xfe,0x55,0x5d,0x46,0x2c,0xcf,0x6a,0x85,0xb5,0x63,0x1c,0x12,0x35,0x0c,0x8d,0x5d,0xc4,0x09,0xba,0x10,0xb9,0x02,0x5d,0x0f,0x44,0x5c,0xf4,0x49,0xd9,0x2b,0x1c,0x00,0x01,0x04,0x6b,0xbf,0x2e,0xd2,0x27,0x09,0x8a,0xcf,0x05,0x9f,0xe3,0x00,0x48,0x2f,0x6e,0xe5,0xdf,0xe9,0x02,0x31,0x9b,0x41,0x9d,0xe5,0xbd,0xc7,0x65,0x20,0x9c,0x0e,0xcd,0xa3,0x8c,0x4d,0x6e,0x4f,0xcf,0x0d,0x33,0x65,0x83,0x98,0xb4,0x52,0x7d,0xcd,0x22,0xf9,0x31,0x12,0xfb,0x9b,0xef,0xd0,0x2f,0xd7,0x8b,0xf7,0x26,0x1b,0x33,0x3f,0xc1,0x05,0xd1,0x92,0xa6,0x23,0xca,0x9e,0x50,0xfc,0x60,0xb3,0x74,0xa5,0x00,0x01,0x04,0xa2,0xf3,0x4d,0x6f,0x27,0x09,0x9d,0x21,0x90,0x39,0xf3,0x00,0x01,0xf0,0x92,0x2a,0x98,0xe3,0xb3,0x4e,0xbc,0xbf,0xf3,0x33,0x26,0x9d,0xc2,0x65,0xd7,0xa0,0x20,0xaa,0xb6,0x9d,0x72,0xbe,0x4d,0x4a,0xcc,0x9c,0x8c,0x92,0x94,0x78,0x57,0x71,0x25,0x6c,0xd1,0xd9,0x42,0xa9,0x0d,0x1b,0xd1,0xd2,0xdc,0xa3,0xea,0x84,0xef,0x7d,0x85,0xaf,0xe6,0x61,0x1f,0xb4,0x3f,0xf0,0xb7,0x41,0x26,0xd9,0x0a,0x6e,0x00,0x01,0x04,0x80,0xc7,0xc5,0xd9,0x27,0x09};
 
-Topology::Topology(const RuntimeEnvironment* renv, void* tPtr) : RR(renv), _numConfiguredPhysicalPaths(0), _amUpstream(false)
+// 2015-11-20 -- Alice and Bob are live, and we're now IPv6 dual-stack!
+//#define ZT_DEFAULT_WORLD_LENGTH 792
+//static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {0x01,0x00,0x00,0x00,0x00,0x08,0xea,0xc9,0x0a,0x00,0x00,0x01,0x51,0x26,0x6f,0x7c,0x8a,0xb8,0xb3,0x88,0xa4,0x69,0x22,0x14,0x91,0xaa,0x9a,0xcd,0x66,0xcc,0x76,0x4c,0xde,0xfd,0x56,0x03,0x9f,0x10,0x67,0xae,0x15,0xe6,0x9c,0x6f,0xb4,0x2d,0x7b,0x55,0x33,0x0e,0x3f,0xda,0xac,0x52,0x9c,0x07,0x92,0xfd,0x73,0x40,0xa6,0xaa,0x21,0xab,0xa8,0xa4,0x89,0xfd,0xae,0xa4,0x4a,0x39,0xbf,0x2d,0x00,0x65,0x9a,0xc9,0xc8,0x18,0xeb,0xe8,0x0a,0xf5,0xbc,0xf8,0x3d,0x97,0xcd,0xc3,0xf8,0xe2,0x41,0x16,0x42,0x0f,0xc7,0x76,0x8e,0x07,0xf3,0x7e,0x9e,0x7d,0x1b,0xb3,0x23,0x21,0x79,0xce,0xb9,0xd0,0xcb,0xb5,0x94,0x7b,0x89,0x21,0x57,0x72,0xf6,0x70,0xa1,0xdd,0x67,0x38,0xcf,0x45,0x45,0xc2,0x8d,0x46,0xec,0x00,0x2c,0xe0,0x2a,0x63,0x3f,0x63,0x8d,0x33,0x08,0x51,0x07,0x77,0x81,0x5b,0x32,0x49,0xae,0x87,0x89,0xcf,0x31,0xaa,0x41,0xf1,0x52,0x97,0xdc,0xa2,0x55,0xe1,0x4a,0x6e,0x3c,0x04,0xf0,0x4f,0x8a,0x0e,0xe9,0xca,0xec,0x24,0x30,0x04,0x9d,0x21,0x90,0x39,0xf3,0x00,0x01,0xf0,0x92,0x2a,0x98,0xe3,0xb3,0x4e,0xbc,0xbf,0xf3,0x33,0x26,0x9d,0xc2,0x65,0xd7,0xa0,0x20,0xaa,0xb6,0x9d,0x72,0xbe,0x4d,0x4a,0xcc,0x9c,0x8c,0x92,0x94,0x78,0x57,0x71,0x25,0x6c,0xd1,0xd9,0x42,0xa9,0x0d,0x1b,0xd1,0xd2,0xdc,0xa3,0xea,0x84,0xef,0x7d,0x85,0xaf,0xe6,0x61,0x1f,0xb4,0x3f,0xf0,0xb7,0x41,0x26,0xd9,0x0a,0x6e,0x00,0x0c,0x04,0xbc,0xa6,0x5e,0xb1,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x7d,0x00,0x01,0x27,0x09,0x04,0x9a,0x42,0xc5,0x21,0x27,0x09,0x06,0x2c,0x0f,0xf8,0x50,0x01,0x54,0x01,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x27,0x09,0x04,0x9f,0xcb,0x61,0xab,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,0x54,0x60,0x01,0x27,0x09,0x04,0xa9,0x39,0x8f,0x68,0x27,0x09,0x06,0x26,0x07,0xf0,0xd0,0x1d,0x01,0x00,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x27,0x09,0x04,0x6b,0xaa,0xc5,0x0e,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x02,0x00,0xe0,0x01,0x27,0x09,0x04,0x80,0xc7,0xc5,0xd9,0x27,0x09,0x06,0x24,0x00,0x61,0x80,0x00,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0xb7,0x40,0x01,0x27,0x09,0x88,0x41,0x40,0x8a,0x2e,0x00,0xbb,0x1d,0x31,0xf2,0xc3,0x23,0xe2,0x64,0xe9,0xe6,0x41,0x72,0xc1,0xa7,0x4f,0x77,0x89,0x95,0x55,0xed,0x10,0x75,0x1c,0xd5,0x6e,0x86,0x40,0x5c,0xde,0x11,0x8d,0x02,0xdf,0xfe,0x55,0x5d,0x46,0x2c,0xcf,0x6a,0x85,0xb5,0x63,0x1c,0x12,0x35,0x0c,0x8d,0x5d,0xc4,0x09,0xba,0x10,0xb9,0x02,0x5d,0x0f,0x44,0x5c,0xf4,0x49,0xd9,0x2b,0x1c,0x00,0x0c,0x04,0x2d,0x20,0xc6,0x82,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x64,0x00,0x81,0xc3,0x54,0x00,0x00,0xff,0xfe,0x18,0x1d,0x61,0x27,0x09,0x04,0x2e,0x65,0xa0,0xf9,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x6a,0x30,0x01,0x27,0x09,0x04,0x6b,0xbf,0x2e,0xd2,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x68,0x00,0x83,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x27,0x09,0x04,0x2d,0x20,0xf6,0xb3,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x58,0x00,0x8b,0xf8,0x54,0x00,0x00,0xff,0xfe,0x15,0xb3,0x9a,0x27,0x09,0x04,0x2d,0x20,0xf8,0x57,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x70,0x00,0x9b,0xc9,0x54,0x00,0x00,0xff,0xfe,0x15,0xc4,0xf5,0x27,0x09,0x04,0x9f,0xcb,0x02,0x9a,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x0c,0xad,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x26,0x70,0x01,0x27,0x09,0x7e,0x19,0x87,0x6a,0xba,0x00,0x2a,0x6e,0x2b,0x23,0x18,0x93,0x0f,0x60,0xeb,0x09,0x7f,0x70,0xd0,0xf4,0xb0,0x28,0xb2,0xcd,0x6d,0x3d,0x0c,0x63,0xc0,0x14,0xb9,0x03,0x9f,0xf3,0x53,0x90,0xe4,0x11,0x81,0xf2,0x16,0xfb,0x2e,0x6f,0xa8,0xd9,0x5c,0x1e,0xe9,0x66,0x71,0x56,0x41,0x19,0x05,0xc3,0xdc,0xcf,0xea,0x78,0xd8,0xc6,0xdf,0xaf,0xba,0x68,0x81,0x70,0xb3,0xfa,0x00,0x01,0x04,0xc6,0xc7,0x61,0xdc,0x27,0x09,0x8a,0xcf,0x05,0x9f,0xe3,0x00,0x48,0x2f,0x6e,0xe5,0xdf,0xe9,0x02,0x31,0x9b,0x41,0x9d,0xe5,0xbd,0xc7,0x65,0x20,0x9c,0x0e,0xcd,0xa3,0x8c,0x4d,0x6e,0x4f,0xcf,0x0d,0x33,0x65,0x83,0x98,0xb4,0x52,0x7d,0xcd,0x22,0xf9,0x31,0x12,0xfb,0x9b,0xef,0xd0,0x2f,0xd7,0x8b,0xf7,0x26,0x1b,0x33,0x3f,0xc1,0x05,0xd1,0x92,0xa6,0x23,0xca,0x9e,0x50,0xfc,0x60,0xb3,0x74,0xa5,0x00,0x01,0x04,0xa2,0xf3,0x4d,0x6f,0x27,0x09};
+
+// 2015-12-17 -- Old New York root is dead, old SF still alive
+//#define ZT_DEFAULT_WORLD_LENGTH 732
+//static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {0x01,0x00,0x00,0x00,0x00,0x08,0xea,0xc9,0x0a,0x00,0x00,0x01,0x51,0xb1,0x7e,0x39,0x9d,0xb8,0xb3,0x88,0xa4,0x69,0x22,0x14,0x91,0xaa,0x9a,0xcd,0x66,0xcc,0x76,0x4c,0xde,0xfd,0x56,0x03,0x9f,0x10,0x67,0xae,0x15,0xe6,0x9c,0x6f,0xb4,0x2d,0x7b,0x55,0x33,0x0e,0x3f,0xda,0xac,0x52,0x9c,0x07,0x92,0xfd,0x73,0x40,0xa6,0xaa,0x21,0xab,0xa8,0xa4,0x89,0xfd,0xae,0xa4,0x4a,0x39,0xbf,0x2d,0x00,0x65,0x9a,0xc9,0xc8,0x18,0xeb,0x8a,0xca,0xf2,0x3d,0x71,0x2e,0xc2,0x39,0x45,0x66,0xb3,0xe9,0x39,0x79,0xb1,0x55,0xc4,0xa9,0xfc,0xbc,0xfc,0x55,0xaf,0x8a,0x2f,0x38,0xc8,0xcd,0xe9,0x02,0x5b,0x86,0xa9,0x72,0xf7,0x16,0x00,0x35,0xb7,0x84,0xc9,0xfc,0xe4,0xfa,0x96,0x8b,0xf4,0x1e,0xba,0x60,0x9f,0x85,0x14,0xc2,0x07,0x4b,0xfd,0xd1,0x6c,0x19,0x69,0xd3,0xf9,0x09,0x9c,0x9d,0xe3,0xb9,0x8f,0x11,0x78,0x71,0xa7,0x4a,0x05,0xd8,0xcc,0x60,0xa2,0x06,0x66,0x9f,0x47,0xc2,0x71,0xb8,0x54,0x80,0x9c,0x45,0x16,0x10,0xa9,0xd0,0xbd,0xf7,0x03,0x9d,0x21,0x90,0x39,0xf3,0x00,0x01,0xf0,0x92,0x2a,0x98,0xe3,0xb3,0x4e,0xbc,0xbf,0xf3,0x33,0x26,0x9d,0xc2,0x65,0xd7,0xa0,0x20,0xaa,0xb6,0x9d,0x72,0xbe,0x4d,0x4a,0xcc,0x9c,0x8c,0x92,0x94,0x78,0x57,0x71,0x25,0x6c,0xd1,0xd9,0x42,0xa9,0x0d,0x1b,0xd1,0xd2,0xdc,0xa3,0xea,0x84,0xef,0x7d,0x85,0xaf,0xe6,0x61,0x1f,0xb4,0x3f,0xf0,0xb7,0x41,0x26,0xd9,0x0a,0x6e,0x00,0x0c,0x04,0xbc,0xa6,0x5e,0xb1,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x7d,0x00,0x01,0x27,0x09,0x04,0x9a,0x42,0xc5,0x21,0x27,0x09,0x06,0x2c,0x0f,0xf8,0x50,0x01,0x54,0x01,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x27,0x09,0x04,0x9f,0xcb,0x61,0xab,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,0x54,0x60,0x01,0x27,0x09,0x04,0xa9,0x39,0x8f,0x68,0x27,0x09,0x06,0x26,0x07,0xf0,0xd0,0x1d,0x01,0x00,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x27,0x09,0x04,0x6b,0xaa,0xc5,0x0e,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x02,0x00,0xe0,0x01,0x27,0x09,0x04,0x80,0xc7,0xc5,0xd9,0x27,0x09,0x06,0x24,0x00,0x61,0x80,0x00,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0xb7,0x40,0x01,0x27,0x09,0x88,0x41,0x40,0x8a,0x2e,0x00,0xbb,0x1d,0x31,0xf2,0xc3,0x23,0xe2,0x64,0xe9,0xe6,0x41,0x72,0xc1,0xa7,0x4f,0x77,0x89,0x95,0x55,0xed,0x10,0x75,0x1c,0xd5,0x6e,0x86,0x40,0x5c,0xde,0x11,0x8d,0x02,0xdf,0xfe,0x55,0x5d,0x46,0x2c,0xcf,0x6a,0x85,0xb5,0x63,0x1c,0x12,0x35,0x0c,0x8d,0x5d,0xc4,0x09,0xba,0x10,0xb9,0x02,0x5d,0x0f,0x44,0x5c,0xf4,0x49,0xd9,0x2b,0x1c,0x00,0x0c,0x04,0x2d,0x20,0xc6,0x82,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x64,0x00,0x81,0xc3,0x54,0x00,0x00,0xff,0xfe,0x18,0x1d,0x61,0x27,0x09,0x04,0x2e,0x65,0xa0,0xf9,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x6a,0x30,0x01,0x27,0x09,0x04,0x6b,0xbf,0x2e,0xd2,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x68,0x00,0x83,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x27,0x09,0x04,0x2d,0x20,0xf6,0xb3,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x58,0x00,0x8b,0xf8,0x54,0x00,0x00,0xff,0xfe,0x15,0xb3,0x9a,0x27,0x09,0x04,0x2d,0x20,0xf8,0x57,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x70,0x00,0x9b,0xc9,0x54,0x00,0x00,0xff,0xfe,0x15,0xc4,0xf5,0x27,0x09,0x04,0x9f,0xcb,0x02,0x9a,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x0c,0xad,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x26,0x70,0x01,0x27,0x09,0x7e,0x19,0x87,0x6a,0xba,0x00,0x2a,0x6e,0x2b,0x23,0x18,0x93,0x0f,0x60,0xeb,0x09,0x7f,0x70,0xd0,0xf4,0xb0,0x28,0xb2,0xcd,0x6d,0x3d,0x0c,0x63,0xc0,0x14,0xb9,0x03,0x9f,0xf3,0x53,0x90,0xe4,0x11,0x81,0xf2,0x16,0xfb,0x2e,0x6f,0xa8,0xd9,0x5c,0x1e,0xe9,0x66,0x71,0x56,0x41,0x19,0x05,0xc3,0xdc,0xcf,0xea,0x78,0xd8,0xc6,0xdf,0xaf,0xba,0x68,0x81,0x70,0xb3,0xfa,0x00,0x02,0x04,0xc6,0xc7,0x61,0xdc,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0xc5,0xf0,0x01,0x27,0x09};
+
+// 2016-01-13 -- Old San Francisco 1.0.1 root is dead, now we're just on Alice and Bob!
+#define ZT_DEFAULT_WORLD_LENGTH 634
+static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {0x01,0x00,0x00,0x00,0x00,0x08,0xea,0xc9,0x0a,0x00,0x00,0x01,0x52,0x3c,0x32,0x50,0x1a,0xb8,0xb3,0x88,0xa4,0x69,0x22,0x14,0x91,0xaa,0x9a,0xcd,0x66,0xcc,0x76,0x4c,0xde,0xfd,0x56,0x03,0x9f,0x10,0x67,0xae,0x15,0xe6,0x9c,0x6f,0xb4,0x2d,0x7b,0x55,0x33,0x0e,0x3f,0xda,0xac,0x52,0x9c,0x07,0x92,0xfd,0x73,0x40,0xa6,0xaa,0x21,0xab,0xa8,0xa4,0x89,0xfd,0xae,0xa4,0x4a,0x39,0xbf,0x2d,0x00,0x65,0x9a,0xc9,0xc8,0x18,0xeb,0x4a,0xf7,0x86,0xa8,0x40,0xd6,0x52,0xea,0xae,0x9e,0x7a,0xbf,0x4c,0x97,0x66,0xab,0x2d,0x6f,0xaf,0xc9,0x2b,0x3a,0xff,0xed,0xd6,0x30,0x3e,0xc4,0x6a,0x65,0xf2,0xbd,0x83,0x52,0xf5,0x40,0xe9,0xcc,0x0d,0x6e,0x89,0x3f,0x9a,0xa0,0xb8,0xdf,0x42,0xd2,0x2f,0x84,0xe6,0x03,0x26,0x0f,0xa8,0xe3,0xcc,0x05,0x05,0x03,0xef,0x12,0x80,0x0d,0xce,0x3e,0xb6,0x58,0x3b,0x1f,0xa8,0xad,0xc7,0x25,0xf9,0x43,0x71,0xa7,0x5c,0x9a,0xc7,0xe1,0xa3,0xb8,0x88,0xd0,0x71,0x6c,0x94,0x99,0x73,0x41,0x0b,0x1b,0x48,0x84,0x02,0x9d,0x21,0x90,0x39,0xf3,0x00,0x01,0xf0,0x92,0x2a,0x98,0xe3,0xb3,0x4e,0xbc,0xbf,0xf3,0x33,0x26,0x9d,0xc2,0x65,0xd7,0xa0,0x20,0xaa,0xb6,0x9d,0x72,0xbe,0x4d,0x4a,0xcc,0x9c,0x8c,0x92,0x94,0x78,0x57,0x71,0x25,0x6c,0xd1,0xd9,0x42,0xa9,0x0d,0x1b,0xd1,0xd2,0xdc,0xa3,0xea,0x84,0xef,0x7d,0x85,0xaf,0xe6,0x61,0x1f,0xb4,0x3f,0xf0,0xb7,0x41,0x26,0xd9,0x0a,0x6e,0x00,0x0c,0x04,0xbc,0xa6,0x5e,0xb1,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x7d,0x00,0x01,0x27,0x09,0x04,0x9a,0x42,0xc5,0x21,0x27,0x09,0x06,0x2c,0x0f,0xf8,0x50,0x01,0x54,0x01,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x27,0x09,0x04,0x9f,0xcb,0x61,0xab,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,0x54,0x60,0x01,0x27,0x09,0x04,0xa9,0x39,0x8f,0x68,0x27,0x09,0x06,0x26,0x07,0xf0,0xd0,0x1d,0x01,0x00,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x27,0x09,0x04,0x6b,0xaa,0xc5,0x0e,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x02,0x00,0xe0,0x01,0x27,0x09,0x04,0x80,0xc7,0xc5,0xd9,0x27,0x09,0x06,0x24,0x00,0x61,0x80,0x00,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0xb7,0x40,0x01,0x27,0x09,0x88,0x41,0x40,0x8a,0x2e,0x00,0xbb,0x1d,0x31,0xf2,0xc3,0x23,0xe2,0x64,0xe9,0xe6,0x41,0x72,0xc1,0xa7,0x4f,0x77,0x89,0x95,0x55,0xed,0x10,0x75,0x1c,0xd5,0x6e,0x86,0x40,0x5c,0xde,0x11,0x8d,0x02,0xdf,0xfe,0x55,0x5d,0x46,0x2c,0xcf,0x6a,0x85,0xb5,0x63,0x1c,0x12,0x35,0x0c,0x8d,0x5d,0xc4,0x09,0xba,0x10,0xb9,0x02,0x5d,0x0f,0x44,0x5c,0xf4,0x49,0xd9,0x2b,0x1c,0x00,0x0c,0x04,0x2d,0x20,0xc6,0x82,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x64,0x00,0x81,0xc3,0x54,0x00,0x00,0xff,0xfe,0x18,0x1d,0x61,0x27,0x09,0x04,0x2e,0x65,0xa0,0xf9,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x6a,0x30,0x01,0x27,0x09,0x04,0x6b,0xbf,0x2e,0xd2,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x68,0x00,0x83,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x27,0x09,0x04,0x2d,0x20,0xf6,0xb3,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x58,0x00,0x8b,0xf8,0x54,0x00,0x00,0xff,0xfe,0x15,0xb3,0x9a,0x27,0x09,0x04,0x2d,0x20,0xf8,0x57,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x70,0x00,0x9b,0xc9,0x54,0x00,0x00,0xff,0xfe,0x15,0xc4,0xf5,0x27,0x09,0x04,0x9f,0xcb,0x02,0x9a,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x0c,0xad,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x26,0x70,0x01,0x27,0x09};
+
+Topology::Topology(const RuntimeEnvironment *renv) :
+	RR(renv),
+	_amRoot(false)
 {
-	uint8_t tmp[ZT_WORLD_MAX_SERIALIZED_LENGTH];
-	uint64_t idtmp[2];
-	idtmp[0] = 0;
-	idtmp[1] = 0;
-	int n = RR->node->stateObjectGet(tPtr, ZT_STATE_OBJECT_PLANET, idtmp, tmp, sizeof(tmp));
-	if (n > 0) {
-		try {
-			World cachedPlanet;
-			cachedPlanet.deserialize(Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH>(tmp, (unsigned int)n), 0);
-			addWorld(tPtr, cachedPlanet, false);
-		}
-		catch (...) {
-		}	// ignore invalid cached planets
-	}
+	std::string alls(RR->node->dataStoreGet("peers.save"));
+	const uint8_t *all = reinterpret_cast<const uint8_t *>(alls.data());
+	RR->node->dataStoreDelete("peers.save");
 
-	World defaultPlanet;
-	{
-		Buffer<ZT_DEFAULT_WORLD_LENGTH> wtmp(ZT_DEFAULT_WORLD, ZT_DEFAULT_WORLD_LENGTH);
-		defaultPlanet.deserialize(wtmp, 0);	  // throws on error, which would indicate a bad static variable up top
+	Buffer<ZT_PEER_SUGGESTED_SERIALIZATION_BUFFER_SIZE> *deserializeBuf = new Buffer<ZT_PEER_SUGGESTED_SERIALIZATION_BUFFER_SIZE>();
+	unsigned int ptr = 0;
+	while ((ptr + 4) < alls.size()) {
+		try {
+			const unsigned int reclen = ( // each Peer serialized record is prefixed by a record length
+					((((unsigned int)all[ptr]) & 0xff) << 24) |
+					((((unsigned int)all[ptr + 1]) & 0xff) << 16) |
+					((((unsigned int)all[ptr + 2]) & 0xff) << 8) |
+					(((unsigned int)all[ptr + 3]) & 0xff)
+				);
+			unsigned int pos = 0;
+			deserializeBuf->copyFrom(all + ptr,reclen + 4);
+			SharedPtr<Peer> p(Peer::deserializeNew(RR,RR->identity,*deserializeBuf,pos));
+			ptr += pos;
+			if (!p)
+				break; // stop if invalid records
+			if (p->address() != RR->identity.address())
+				_peers.set(p->address(),p);
+		} catch ( ... ) {
+			break; // stop if invalid records
+		}
 	}
-	addWorld(tPtr, defaultPlanet, false);
+	delete deserializeBuf;
+
+	clean(RR->node->now());
+
+	std::string dsWorld(RR->node->dataStoreGet("world"));
+	World cachedWorld;
+	if (dsWorld.length() > 0) {
+		try {
+			Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> dswtmp(dsWorld.data(),(unsigned int)dsWorld.length());
+			cachedWorld.deserialize(dswtmp,0);
+		} catch ( ... ) {
+			cachedWorld = World(); // clear if cached world is invalid
+		}
+	}
+	World defaultWorld;
+	{
+		Buffer<ZT_DEFAULT_WORLD_LENGTH> wtmp(ZT_DEFAULT_WORLD,ZT_DEFAULT_WORLD_LENGTH);
+		defaultWorld.deserialize(wtmp,0); // throws on error, which would indicate a bad static variable up top
+	}
+	if (cachedWorld.shouldBeReplacedBy(defaultWorld,false)) {
+		_setWorld(defaultWorld);
+		if (dsWorld.length() > 0)
+			RR->node->dataStoreDelete("world");
+	} else _setWorld(cachedWorld);
 }
 
 Topology::~Topology()
 {
-	Hashtable<Address, SharedPtr<Peer> >::Iterator i(_peers);
-	Address* a = (Address*)0;
-	SharedPtr<Peer>* p = (SharedPtr<Peer>*)0;
-	while (i.next(a, p)) {
-		_savePeer((void*)0, *p);
+	Buffer<ZT_PEER_SUGGESTED_SERIALIZATION_BUFFER_SIZE> *pbuf = 0;
+	try {
+		pbuf = new Buffer<ZT_PEER_SUGGESTED_SERIALIZATION_BUFFER_SIZE>();
+		std::string all;
+
+		Address *a = (Address *)0;
+		SharedPtr<Peer> *p = (SharedPtr<Peer> *)0;
+		Hashtable< Address,SharedPtr<Peer> >::Iterator i(_peers);
+		while (i.next(a,p)) {
+			if (std::find(_rootAddresses.begin(),_rootAddresses.end(),*a) == _rootAddresses.end()) {
+				pbuf->clear();
+				try {
+					(*p)->serialize(*pbuf);
+					try {
+						all.append((const char *)pbuf->data(),pbuf->size());
+					} catch ( ... ) {
+						return; // out of memory? just skip
+					}
+				} catch ( ... ) {} // peer too big? shouldn't happen, but it so skip
+			}
+		}
+
+		RR->node->dataStorePut("peers.save",all,true);
+
+		delete pbuf;
+	} catch ( ... ) {
+		delete pbuf;
 	}
 }
 
-SharedPtr<Peer> Topology::addPeer(void* tPtr, const SharedPtr<Peer>& peer)
+SharedPtr<Peer> Topology::addPeer(const SharedPtr<Peer> &peer)
 {
+#ifdef ZT_TRACE
+	if ((!peer)||(peer->address() == RR->identity.address())) {
+		if (!peer)
+			fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add NULL peer" ZT_EOL_S);
+		else fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add peer for self" ZT_EOL_S);
+		abort();
+	}
+#endif
+
 	SharedPtr<Peer> np;
 	{
-		Mutex::Lock _l(_peers_m);
-		SharedPtr<Peer>& hp = _peers[peer->address()];
-		if (! hp) {
+		Mutex::Lock _l(_lock);
+		SharedPtr<Peer> &hp = _peers[peer->address()];
+		if (!hp)
 			hp = peer;
-		}
 		np = hp;
 	}
+
+	np->use(RR->node->now());
+	saveIdentity(np->identity());
+
 	return np;
 }
 
-SharedPtr<Peer> Topology::getPeer(void* tPtr, const Address& zta)
+SharedPtr<Peer> Topology::getPeer(const Address &zta)
 {
 	if (zta == RR->identity.address()) {
+		TRACE("BUG: ignored attempt to getPeer() for self, returned NULL");
 		return SharedPtr<Peer>();
 	}
 
 	{
-		Mutex::Lock _l(_peers_m);
-		const SharedPtr<Peer>* const ap = _peers.get(zta);
+		Mutex::Lock _l(_lock);
+		const SharedPtr<Peer> *const ap = _peers.get(zta);
 		if (ap) {
+			(*ap)->use(RR->node->now());
 			return *ap;
 		}
 	}
 
 	try {
-		Buffer<ZT_PEER_MAX_SERIALIZED_STATE_SIZE> buf;
-		uint64_t idbuf[2];
-		idbuf[0] = zta.toInt();
-		idbuf[1] = 0;
-		int len = RR->node->stateObjectGet(tPtr, ZT_STATE_OBJECT_PEER, idbuf, buf.unsafeData(), ZT_PEER_MAX_SERIALIZED_STATE_SIZE);
-		if (len > 0) {
-			buf.setSize(len);
-			Mutex::Lock _l(_peers_m);
-			SharedPtr<Peer>& ap = _peers[zta];
-			if (ap) {
+		Identity id(_getIdentity(zta));
+		if (id) {
+			SharedPtr<Peer> np(new Peer(RR,RR->identity,id));
+			{
+				Mutex::Lock _l(_lock);
+				SharedPtr<Peer> &ap = _peers[zta];
+				if (!ap)
+					ap.swap(np);
+				ap->use(RR->node->now());
 				return ap;
 			}
-			ap = Peer::deserializeFromCache(RR->node->now(), tPtr, buf, RR);
-			if (! ap) {
-				_peers.erase(zta);
-			}
-			return SharedPtr<Peer>();
 		}
-	}
-	catch (...) {
-	}	// ignore invalid identities or other strange failures
+	} catch ( ... ) {
+		fprintf(stderr,"EXCEPTION in getPeer() part 2\n");
+		abort();
+	} // invalid identity on disk?
 
 	return SharedPtr<Peer>();
 }
 
-Identity Topology::getIdentity(void* tPtr, const Address& zta)
+Identity Topology::getIdentity(const Address &zta)
 {
-	if (zta == RR->identity.address()) {
-		return RR->identity;
-	}
-	else {
-		Mutex::Lock _l(_peers_m);
-		const SharedPtr<Peer>* const ap = _peers.get(zta);
-		if (ap) {
+	{
+		Mutex::Lock _l(_lock);
+		const SharedPtr<Peer> *const ap = _peers.get(zta);
+		if (ap)
 			return (*ap)->identity();
+	}
+	return _getIdentity(zta);
+}
+
+void Topology::saveIdentity(const Identity &id)
+{
+	if (id) {
+		char p[128];
+		Utils::snprintf(p,sizeof(p),"iddb.d/%.10llx",(unsigned long long)id.address().toInt());
+		RR->node->dataStorePut(p,id.toString(false),false);
+	}
+}
+
+SharedPtr<Peer> Topology::getBestRoot(const Address *avoid,unsigned int avoidCount,bool strictAvoid)
+{
+	const uint64_t now = RR->node->now();
+	Mutex::Lock _l(_lock);
+
+	if (_amRoot) {
+		/* If I am a root server, the "best" root server is the one whose address
+		 * is numerically greater than mine (with wrap at top of list). This
+		 * causes packets searching for a route to pretty much literally
+		 * circumnavigate the globe rather than bouncing between just two. */
+
+		for(unsigned long p=0;p<_rootAddresses.size();++p) {
+			if (_rootAddresses[p] == RR->identity.address()) {
+				for(unsigned long q=1;q<_rootAddresses.size();++q) {
+					const SharedPtr<Peer> *const nextsn = _peers.get(_rootAddresses[(p + q) % _rootAddresses.size()]);
+					if ((nextsn)&&((*nextsn)->hasActiveDirectPath(now))) {
+						(*nextsn)->use(now);
+						return *nextsn;
+					}
+				}
+				break;
+			}
 		}
+
+	} else {
+		/* If I am not a root server, the best root server is the active one with
+		 * the lowest quality score. (lower == better) */
+
+		unsigned int bestQualityOverall = ~((unsigned int)0);
+		unsigned int bestQualityNotAvoid = ~((unsigned int)0);
+		const SharedPtr<Peer> *bestOverall = (const SharedPtr<Peer> *)0;
+		const SharedPtr<Peer> *bestNotAvoid = (const SharedPtr<Peer> *)0;
+
+		for(std::vector< SharedPtr<Peer> >::const_iterator r(_rootPeers.begin());r!=_rootPeers.end();++r) {
+			bool avoiding = false;
+			for(unsigned int i=0;i<avoidCount;++i) {
+				if (avoid[i] == (*r)->address()) {
+					avoiding = true;
+					break;
+				}
+			}
+			const unsigned int q = (*r)->relayQuality(now);
+			if (q <= bestQualityOverall) {
+				bestQualityOverall = q;
+				bestOverall = &(*r);
+			}
+			if ((!avoiding)&&(q <= bestQualityNotAvoid)) {
+				bestQualityNotAvoid = q;
+				bestNotAvoid = &(*r);
+			}
+		}
+
+		if (bestNotAvoid) {
+			(*bestNotAvoid)->use(now);
+			return *bestNotAvoid;
+		} else if ((!strictAvoid)&&(bestOverall)) {
+			(*bestOverall)->use(now);
+			return *bestOverall;
+		}
+
+	}
+
+	return SharedPtr<Peer>();
+}
+
+bool Topology::isUpstream(const Identity &id) const
+{
+	if (isRoot(id))
+		return true;
+	std::vector< SharedPtr<Network> > nws(RR->node->allNetworks());
+	for(std::vector< SharedPtr<Network> >::const_iterator nw(nws.begin());nw!=nws.end();++nw) {
+		if ((*nw)->hasConfig()) {
+			for(unsigned int r=0;r<(*nw)->config().staticDeviceCount();++r) {
+				if ((((*nw)->config().staticDevice(r).flags & ZT_NETWORK_STATIC_DEVICE_IS_RELAY) != 0)&&((*nw)->config().staticDevice(r).address == id.address().toInt()))
+					return true;
+			}
+		}
+	}
+	return false;
+}
+
+bool Topology::worldUpdateIfValid(const World &newWorld)
+{
+	Mutex::Lock _l(_lock);
+	if (_world.shouldBeReplacedBy(newWorld,true)) {
+		_setWorld(newWorld);
+		try {
+			Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> dswtmp;
+			newWorld.serialize(dswtmp,false);
+			RR->node->dataStorePut("world",dswtmp.data(),dswtmp.size(),false);
+		} catch ( ... ) {
+			RR->node->dataStoreDelete("world");
+		}
+		return true;
+	}
+	return false;
+}
+
+void Topology::clean(uint64_t now)
+{
+	Mutex::Lock _l(_lock);
+	Hashtable< Address,SharedPtr<Peer> >::Iterator i(_peers);
+	Address *a = (Address *)0;
+	SharedPtr<Peer> *p = (SharedPtr<Peer> *)0;
+	while (i.next(a,p)) {
+		if (((now - (*p)->lastUsed()) >= ZT_PEER_IN_MEMORY_EXPIRATION)&&(std::find(_rootAddresses.begin(),_rootAddresses.end(),*a) == _rootAddresses.end())) {
+			_peers.erase(*a);
+		} else {
+			(*p)->clean(now);
+		}
+	}
+}
+
+Identity Topology::_getIdentity(const Address &zta)
+{
+	char p[128];
+	Utils::snprintf(p,sizeof(p),"iddb.d/%.10llx",(unsigned long long)zta.toInt());
+	std::string ids(RR->node->dataStoreGet(p));
+	if (ids.length() > 0) {
+		try {
+			return Identity(ids);
+		} catch ( ... ) {} // ignore invalid IDs
 	}
 	return Identity();
 }
 
-SharedPtr<Peer> Topology::getUpstreamPeer()
+void Topology::_setWorld(const World &newWorld)
 {
-	const int64_t now = RR->node->now();
-	unsigned int bestq = ~((unsigned int)0);
-	const SharedPtr<Peer>* best = (const SharedPtr<Peer>*)0;
-
-	Mutex::Lock _l2(_peers_m);
-	Mutex::Lock _l1(_upstreams_m);
-
-	for (std::vector<Address>::const_iterator a(_upstreamAddresses.begin()); a != _upstreamAddresses.end(); ++a) {
-		const SharedPtr<Peer>* p = _peers.get(*a);
-		if (p) {
-			const unsigned int q = (*p)->relayQuality(now);
-			if (q <= bestq) {
-				bestq = q;
-				best = p;
-			}
-		}
-	}
-
-	if (! best) {
-		return SharedPtr<Peer>();
-	}
-	return *best;
-}
-
-bool Topology::isUpstream(const Identity& id) const
-{
-	Mutex::Lock _l(_upstreams_m);
-	return (std::find(_upstreamAddresses.begin(), _upstreamAddresses.end(), id.address()) != _upstreamAddresses.end());
-}
-
-bool Topology::shouldAcceptWorldUpdateFrom(const Address& addr) const
-{
-	Mutex::Lock _l(_upstreams_m);
-	if (std::find(_upstreamAddresses.begin(), _upstreamAddresses.end(), addr) != _upstreamAddresses.end()) {
-		return true;
-	}
-	for (std::vector<std::pair<uint64_t, Address> >::const_iterator s(_moonSeeds.begin()); s != _moonSeeds.end(); ++s) {
-		if (s->second == addr) {
-			return true;
-		}
-	}
-	return false;
-}
-
-ZT_PeerRole Topology::role(const Address& ztaddr) const
-{
-	Mutex::Lock _l(_upstreams_m);
-	if (std::find(_upstreamAddresses.begin(), _upstreamAddresses.end(), ztaddr) != _upstreamAddresses.end()) {
-		for (std::vector<World::Root>::const_iterator i(_planet.roots().begin()); i != _planet.roots().end(); ++i) {
-			if (i->identity.address() == ztaddr) {
-				return ZT_PEER_ROLE_PLANET;
-			}
-		}
-		return ZT_PEER_ROLE_MOON;
-	}
-	return ZT_PEER_ROLE_LEAF;
-}
-
-bool Topology::isProhibitedEndpoint(const Address& ztaddr, const InetAddress& ipaddr) const
-{
-	Mutex::Lock _l(_upstreams_m);
-
-	// For roots the only permitted addresses are those defined. This adds just a little
-	// bit of extra security against spoofing, replaying, etc.
-	if (std::find(_upstreamAddresses.begin(), _upstreamAddresses.end(), ztaddr) != _upstreamAddresses.end()) {
-		for (std::vector<World::Root>::const_iterator r(_planet.roots().begin()); r != _planet.roots().end(); ++r) {
-			if (r->identity.address() == ztaddr) {
-				if (r->stableEndpoints.empty()) {
-					return false;	// no stable endpoints specified, so allow dynamic paths
-				}
-				for (std::vector<InetAddress>::const_iterator e(r->stableEndpoints.begin()); e != r->stableEndpoints.end(); ++e) {
-					if (ipaddr.ipsEqual(*e)) {
-						return false;
-					}
-				}
-			}
-		}
-		for (std::vector<World>::const_iterator m(_moons.begin()); m != _moons.end(); ++m) {
-			for (std::vector<World::Root>::const_iterator r(m->roots().begin()); r != m->roots().end(); ++r) {
-				if (r->identity.address() == ztaddr) {
-					if (r->stableEndpoints.empty()) {
-						return false;	// no stable endpoints specified, so allow dynamic paths
-					}
-					for (std::vector<InetAddress>::const_iterator e(r->stableEndpoints.begin()); e != r->stableEndpoints.end(); ++e) {
-						if (ipaddr.ipsEqual(*e)) {
-							return false;
-						}
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	return false;
-}
-
-bool Topology::addWorld(void* tPtr, const World& newWorld, bool alwaysAcceptNew)
-{
-	if ((newWorld.type() != World::TYPE_PLANET) && (newWorld.type() != World::TYPE_MOON)) {
-		return false;
-	}
-
-	Mutex::Lock _l2(_peers_m);
-	Mutex::Lock _l1(_upstreams_m);
-
-	World* existing = (World*)0;
-	switch (newWorld.type()) {
-		case World::TYPE_PLANET:
-			existing = &_planet;
-			break;
-		case World::TYPE_MOON:
-			for (std::vector<World>::iterator m(_moons.begin()); m != _moons.end(); ++m) {
-				if (m->id() == newWorld.id()) {
-					existing = &(*m);
-					break;
-				}
-			}
-			break;
-		default:
-			return false;
-	}
-
-	if (existing) {
-		if (existing->shouldBeReplacedBy(newWorld)) {
-			*existing = newWorld;
-		}
-		else {
-			return false;
-		}
-	}
-	else if (newWorld.type() == World::TYPE_MOON) {
-		if (alwaysAcceptNew) {
-			_moons.push_back(newWorld);
-			existing = &(_moons.back());
-		}
-		else {
-			for (std::vector<std::pair<uint64_t, Address> >::iterator m(_moonSeeds.begin()); m != _moonSeeds.end(); ++m) {
-				if (m->first == newWorld.id()) {
-					for (std::vector<World::Root>::const_iterator r(newWorld.roots().begin()); r != newWorld.roots().end(); ++r) {
-						if (r->identity.address() == m->second) {
-							_moonSeeds.erase(m);
-							_moons.push_back(newWorld);
-							existing = &(_moons.back());
-							break;
-						}
-					}
-					if (existing) {
-						break;
-					}
-				}
-			}
-		}
-		if (! existing) {
-			return false;
-		}
-	}
-	else {
-		return false;
-	}
-
-	try {
-		Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> sbuf;
-		existing->serialize(sbuf, false);
-		uint64_t idtmp[2];
-		idtmp[0] = existing->id();
-		idtmp[1] = 0;
-		RR->node->stateObjectPut(tPtr, (existing->type() == World::TYPE_PLANET) ? ZT_STATE_OBJECT_PLANET : ZT_STATE_OBJECT_MOON, idtmp, sbuf.data(), sbuf.size());
-	}
-	catch (...) {
-	}
-
-	_memoizeUpstreams(tPtr);
-
-	return true;
-}
-
-void Topology::addMoon(void* tPtr, const uint64_t id, const Address& seed)
-{
-	char tmp[ZT_WORLD_MAX_SERIALIZED_LENGTH];
-	uint64_t idtmp[2];
-	idtmp[0] = id;
-	idtmp[1] = 0;
-	int n = RR->node->stateObjectGet(tPtr, ZT_STATE_OBJECT_MOON, idtmp, tmp, sizeof(tmp));
-	if (n > 0) {
-		try {
-			World w;
-			w.deserialize(Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH>(tmp, (unsigned int)n));
-			if ((w.type() == World::TYPE_MOON) && (w.id() == id)) {
-				addWorld(tPtr, w, true);
-				return;
-			}
-		}
-		catch (...) {
-		}
-	}
-
-	if (seed) {
-		Mutex::Lock _l(_upstreams_m);
-		if (std::find(_moonSeeds.begin(), _moonSeeds.end(), std::pair<uint64_t, Address>(id, seed)) == _moonSeeds.end()) {
-			_moonSeeds.push_back(std::pair<uint64_t, Address>(id, seed));
-		}
-	}
-}
-
-void Topology::removeMoon(void* tPtr, const uint64_t id)
-{
-	Mutex::Lock _l2(_peers_m);
-	Mutex::Lock _l1(_upstreams_m);
-
-	std::vector<World> nm;
-	for (std::vector<World>::const_iterator m(_moons.begin()); m != _moons.end(); ++m) {
-		if (m->id() != id) {
-			nm.push_back(*m);
-		}
-		else {
-			uint64_t idtmp[2];
-			idtmp[0] = id;
-			idtmp[1] = 0;
-			RR->node->stateObjectDelete(tPtr, ZT_STATE_OBJECT_MOON, idtmp);
-		}
-	}
-	_moons.swap(nm);
-
-	std::vector<std::pair<uint64_t, Address> > cm;
-	for (std::vector<std::pair<uint64_t, Address> >::const_iterator m(_moonSeeds.begin()); m != _moonSeeds.end(); ++m) {
-		if (m->first != id) {
-			cm.push_back(*m);
-		}
-	}
-	_moonSeeds.swap(cm);
-
-	_memoizeUpstreams(tPtr);
-}
-
-void Topology::doPeriodicTasks(void* tPtr, int64_t now)
-{
-	{
-		Mutex::Lock _l1(_peers_m);
-		Mutex::Lock _l2(_upstreams_m);
-		Hashtable<Address, SharedPtr<Peer> >::Iterator i(_peers);
-		Address* a = (Address*)0;
-		SharedPtr<Peer>* p = (SharedPtr<Peer>*)0;
-		while (i.next(a, p)) {
-			if ((! (*p)->isAlive(now)) && (std::find(_upstreamAddresses.begin(), _upstreamAddresses.end(), *a) == _upstreamAddresses.end())) {
-				_savePeer(tPtr, *p);
-				_peers.erase(*a);
-			}
-		}
-	}
-
-	{
-		Mutex::Lock _l(_paths_m);
-		Hashtable<Path::HashKey, SharedPtr<Path> >::Iterator i(_paths);
-		Path::HashKey* k = (Path::HashKey*)0;
-		SharedPtr<Path>* p = (SharedPtr<Path>*)0;
-		while (i.next(k, p)) {
-			if (p->references() <= 1) {
-				_paths.erase(*k);
+	// assumed _lock is locked (or in constructor)
+	_world = newWorld;
+	_amRoot = false;
+	_rootAddresses.clear();
+	_rootPeers.clear();
+	for(std::vector<World::Root>::const_iterator r(_world.roots().begin());r!=_world.roots().end();++r) {
+		_rootAddresses.push_back(r->identity.address());
+		if (r->identity.address() == RR->identity.address()) {
+			_amRoot = true;
+		} else {
+			SharedPtr<Peer> *rp = _peers.get(r->identity.address());
+			if (rp) {
+				_rootPeers.push_back(*rp);
+			} else {
+				SharedPtr<Peer> newrp(new Peer(RR,RR->identity,r->identity));
+				_peers.set(r->identity.address(),newrp);
+				_rootPeers.push_back(newrp);
 			}
 		}
 	}
 }
 
-void Topology::_memoizeUpstreams(void* tPtr)
-{
-	// assumes _upstreams_m and _peers_m are locked
-	_upstreamAddresses.clear();
-	_amUpstream = false;
-
-	for (std::vector<World::Root>::const_iterator i(_planet.roots().begin()); i != _planet.roots().end(); ++i) {
-		const Identity& id = i->identity;
-		if (id == RR->identity) {
-			_amUpstream = true;
-		}
-		else if (std::find(_upstreamAddresses.begin(), _upstreamAddresses.end(), id.address()) == _upstreamAddresses.end()) {
-			_upstreamAddresses.push_back(id.address());
-			SharedPtr<Peer>& hp = _peers[id.address()];
-			if (! hp) {
-				hp = new Peer(RR, RR->identity, id);
-			}
-		}
-	}
-
-	for (std::vector<World>::const_iterator m(_moons.begin()); m != _moons.end(); ++m) {
-		for (std::vector<World::Root>::const_iterator i(m->roots().begin()); i != m->roots().end(); ++i) {
-			if (i->identity == RR->identity) {
-				_amUpstream = true;
-			}
-			else if (std::find(_upstreamAddresses.begin(), _upstreamAddresses.end(), i->identity.address()) == _upstreamAddresses.end()) {
-				_upstreamAddresses.push_back(i->identity.address());
-				SharedPtr<Peer>& hp = _peers[i->identity.address()];
-				if (! hp) {
-					hp = new Peer(RR, RR->identity, i->identity);
-				}
-			}
-		}
-	}
-
-	std::sort(_upstreamAddresses.begin(), _upstreamAddresses.end());
-}
-
-void Topology::_savePeer(void* tPtr, const SharedPtr<Peer>& peer)
-{
-	try {
-		Buffer<ZT_PEER_MAX_SERIALIZED_STATE_SIZE> buf;
-		peer->serializeForCache(buf);
-		uint64_t tmpid[2];
-		tmpid[0] = peer->address().toInt();
-		tmpid[1] = 0;
-		RR->node->stateObjectPut(tPtr, ZT_STATE_OBJECT_PEER, tmpid, buf.data(), buf.size());
-	}
-	catch (...) {
-	}	// sanity check, discard invalid entries
-}
-
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/node/Topology.hpp b/node/Topology.hpp
index 746cb30ce..86fbb011f 100644
--- a/node/Topology.hpp
+++ b/node/Topology.hpp
@@ -1,36 +1,41 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_TOPOLOGY_HPP
 #define ZT_TOPOLOGY_HPP
 
-#include "../include/ZeroTierOne.h"
-#include "Address.hpp"
-#include "Constants.hpp"
-#include "Hashtable.hpp"
-#include "Identity.hpp"
-#include "InetAddress.hpp"
-#include "Mutex.hpp"
-#include "Path.hpp"
-#include "Peer.hpp"
-#include "World.hpp"
-
-#include <algorithm>
-#include <stdexcept>
 #include <stdio.h>
 #include <string.h>
-#include <utility>
+
 #include <vector>
+#include <stdexcept>
+#include <algorithm>
+#include <utility>
+
+#include "Constants.hpp"
+
+#include "Address.hpp"
+#include "Identity.hpp"
+#include "Peer.hpp"
+#include "Mutex.hpp"
+#include "InetAddress.hpp"
+#include "Hashtable.hpp"
+#include "World.hpp"
 
 namespace ZeroTier {
 
@@ -39,9 +44,10 @@ class RuntimeEnvironment;
 /**
  * Database of network topology
  */
-class Topology {
-  public:
-	Topology(const RuntimeEnvironment* renv, void* tPtr);
+class Topology
+{
+public:
+	Topology(const RuntimeEnvironment *renv);
 	~Topology();
 
 	/**
@@ -50,27 +56,18 @@ class Topology {
 	 * This will not replace existing peers. In that case the existing peer
 	 * record is returned.
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param peer Peer to add
 	 * @return New or existing peer (should replace 'peer')
 	 */
-	SharedPtr<Peer> addPeer(void* tPtr, const SharedPtr<Peer>& peer);
+	SharedPtr<Peer> addPeer(const SharedPtr<Peer> &peer);
 
 	/**
 	 * Get a peer from its address
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
 	 * @param zta ZeroTier address of peer
 	 * @return Peer or NULL if not found
 	 */
-	SharedPtr<Peer> getPeer(void* tPtr, const Address& zta);
-
-	/**
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param zta ZeroTier address of peer
-	 * @return Identity or NULL identity if not found
-	 */
-	Identity getIdentity(void* tPtr, const Address& zta);
+	SharedPtr<Peer> getPeer(const Address &zta);
 
 	/**
 	 * Get a peer only if it is presently in memory (no disk cache)
@@ -82,217 +79,130 @@ class Topology {
 	 *
 	 * @param zta ZeroTier address
 	 */
-	inline SharedPtr<Peer> getPeerNoCache(const Address& zta)
+	inline SharedPtr<Peer> getPeerNoCache(const Address &zta)
 	{
-		Mutex::Lock _l(_peers_m);
-		const SharedPtr<Peer>* const ap = _peers.get(zta);
-		if (ap) {
+		Mutex::Lock _l(_lock);
+		const SharedPtr<Peer> *const ap = _peers.get(zta);
+		if (ap)
 			return *ap;
-		}
 		return SharedPtr<Peer>();
 	}
 
 	/**
-	 * Get a Path object for a given local and remote physical address, creating if needed
+	 * Get the identity of a peer
 	 *
-	 * @param l Local socket
-	 * @param r Remote address
-	 * @return Pointer to canonicalized Path object
+	 * @param zta ZeroTier address of peer
+	 * @return Identity or NULL Identity if not found
 	 */
-	inline SharedPtr<Path> getPath(const int64_t l, const InetAddress& r)
-	{
-		Mutex::Lock _l(_paths_m);
-		SharedPtr<Path>& p = _paths[Path::HashKey(l, r)];
-		if (! p) {
-			p.set(new Path(l, r));
-		}
-		return p;
-	}
+	Identity getIdentity(const Address &zta);
 
 	/**
-	 * Get the current best upstream peer
+	 * Cache an identity
 	 *
-	 * @return Upstream or NULL if none available
+	 * This is done automatically on addPeer(), and so is only useful for
+	 * cluster identity replication.
+	 *
+	 * @param id Identity to cache
 	 */
-	SharedPtr<Peer> getUpstreamPeer();
+	void saveIdentity(const Identity &id);
+
+	/**
+	 * Get the current favorite root server
+	 *
+	 * @return Root server with lowest latency or NULL if none
+	 */
+	inline SharedPtr<Peer> getBestRoot() { return getBestRoot((const Address *)0,0,false); }
+
+	/**
+	 * Get the best root server, avoiding root servers listed in an array
+	 *
+	 * This will get the best root server (lowest latency, etc.) but will
+	 * try to avoid the listed root servers, only using them if no others
+	 * are available.
+	 *
+	 * @param avoid Nodes to avoid
+	 * @param avoidCount Number of nodes to avoid
+	 * @param strictAvoid If false, consider avoided root servers anyway if no non-avoid root servers are available
+	 * @return Root server or NULL if none available
+	 */
+	SharedPtr<Peer> getBestRoot(const Address *avoid,unsigned int avoidCount,bool strictAvoid);
+
+	/**
+	 * @param id Identity to check
+	 * @return True if this is a designated root server in this world
+	 */
+	inline bool isRoot(const Identity &id) const
+	{
+		Mutex::Lock _l(_lock);
+		return (std::find(_rootAddresses.begin(),_rootAddresses.end(),id.address()) != _rootAddresses.end());
+	}
 
 	/**
 	 * @param id Identity to check
 	 * @return True if this is a root server or a network preferred relay from one of our networks
 	 */
-	bool isUpstream(const Identity& id) const;
+	bool isUpstream(const Identity &id) const;
 
 	/**
-	 * @param addr Address to check
-	 * @return True if we should accept a world update from this address
+	 * @return Vector of root server addresses
 	 */
-	bool shouldAcceptWorldUpdateFrom(const Address& addr) const;
-
-	/**
-	 * @param ztaddr ZeroTier address
-	 * @return Peer role for this device
-	 */
-	ZT_PeerRole role(const Address& ztaddr) const;
-
-	/**
-	 * Check for prohibited endpoints
-	 *
-	 * Right now this returns true if the designated ZT address is a root and if
-	 * the IP (IP only, not port) does not equal any of the IPs defined in the
-	 * current World. This is an extra little security feature in case root keys
-	 * get appropriated or something.
-	 *
-	 * Otherwise it returns false.
-	 *
-	 * @param ztaddr ZeroTier address
-	 * @param ipaddr IP address
-	 * @return True if this ZT/IP pair should not be allowed to be used
-	 */
-	bool isProhibitedEndpoint(const Address& ztaddr, const InetAddress& ipaddr) const;
-
-	/**
-	 * Gets upstreams to contact and their stable endpoints (if known)
-	 *
-	 * @param eps Hash table to fill with addresses and their stable endpoints
-	 */
-	inline void getUpstreamsToContact(Hashtable<Address, std::vector<InetAddress> >& eps) const
+	inline std::vector<Address> rootAddresses() const
 	{
-		Mutex::Lock _l(_upstreams_m);
-		for (std::vector<World::Root>::const_iterator i(_planet.roots().begin()); i != _planet.roots().end(); ++i) {
-			if (i->identity != RR->identity) {
-				std::vector<InetAddress>& ips = eps[i->identity.address()];
-				for (std::vector<InetAddress>::const_iterator j(i->stableEndpoints.begin()); j != i->stableEndpoints.end(); ++j) {
-					if (std::find(ips.begin(), ips.end(), *j) == ips.end()) {
-						ips.push_back(*j);
-					}
-				}
-			}
-		}
-		for (std::vector<World>::const_iterator m(_moons.begin()); m != _moons.end(); ++m) {
-			for (std::vector<World::Root>::const_iterator i(m->roots().begin()); i != m->roots().end(); ++i) {
-				if (i->identity != RR->identity) {
-					std::vector<InetAddress>& ips = eps[i->identity.address()];
-					for (std::vector<InetAddress>::const_iterator j(i->stableEndpoints.begin()); j != i->stableEndpoints.end(); ++j) {
-						if (std::find(ips.begin(), ips.end(), *j) == ips.end()) {
-							ips.push_back(*j);
-						}
-					}
-				}
-			}
-		}
-		for (std::vector<std::pair<uint64_t, Address> >::const_iterator m(_moonSeeds.begin()); m != _moonSeeds.end(); ++m) {
-			eps[m->second];
-		}
+		Mutex::Lock _l(_lock);
+		return _rootAddresses;
 	}
 
 	/**
-	 * @return Vector of active upstream addresses (including roots)
+	 * @return Current World (copy)
 	 */
-	inline std::vector<Address> upstreamAddresses() const
+	inline World world() const
 	{
-		Mutex::Lock _l(_upstreams_m);
-		return _upstreamAddresses;
+		Mutex::Lock _l(_lock);
+		return _world;
 	}
 
 	/**
-	 * @return Current moons
+	 * @return Current world ID
 	 */
-	inline std::vector<World> moons() const
+	inline uint64_t worldId() const
 	{
-		Mutex::Lock _l(_upstreams_m);
-		return _moons;
+		return _world.id(); // safe to read without lock, and used from within eachPeer() so don't lock
 	}
 
 	/**
-	 * @return Moon IDs we are waiting for from seeds
+	 * @return Current world timestamp
 	 */
-	inline std::vector<uint64_t> moonsWanted() const
+	inline uint64_t worldTimestamp() const
 	{
-		Mutex::Lock _l(_upstreams_m);
-		std::vector<uint64_t> mw;
-		for (std::vector<std::pair<uint64_t, Address> >::const_iterator s(_moonSeeds.begin()); s != _moonSeeds.end(); ++s) {
-			if (std::find(mw.begin(), mw.end(), s->first) == mw.end()) {
-				mw.push_back(s->first);
-			}
-		}
-		return mw;
-	}
-
-	/**
-	 * @return Current planet
-	 */
-	inline World planet() const
-	{
-		Mutex::Lock _l(_upstreams_m);
-		return _planet;
-	}
-
-	/**
-	 * @return Current planet's world ID
-	 */
-	inline uint64_t planetWorldId() const
-	{
-		return _planet.id();   // safe to read without lock, and used from within eachPeer() so don't lock
-	}
-
-	/**
-	 * @return Current planet's world timestamp
-	 */
-	inline uint64_t planetWorldTimestamp() const
-	{
-		return _planet.timestamp();	  // safe to read without lock, and used from within eachPeer() so don't lock
+		return _world.timestamp(); // safe to read without lock, and used from within eachPeer() so don't lock
 	}
 
 	/**
 	 * Validate new world and update if newer and signature is okay
 	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param newWorld A new or updated planet or moon to learn
-	 * @param alwaysAcceptNew If true, always accept new moons even if we're not waiting for one
-	 * @return True if it was valid and newer than current (or totally new for moons)
+	 * @param newWorld Potential new world definition revision
+	 * @return True if an update actually occurred
 	 */
-	bool addWorld(void* tPtr, const World& newWorld, bool alwaysAcceptNew);
-
-	/**
-	 * Add a moon
-	 *
-	 * This loads it from moons.d if present, and if not adds it to
-	 * a list of moons that we want to contact.
-	 *
-	 * @param id Moon ID
-	 * @param seed If non-NULL, an address of any member of the moon to contact
-	 */
-	void addMoon(void* tPtr, const uint64_t id, const Address& seed);
-
-	/**
-	 * Remove a moon
-	 *
-	 * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
-	 * @param id Moon's world ID
-	 */
-	void removeMoon(void* tPtr, const uint64_t id);
+	bool worldUpdateIfValid(const World &newWorld);
 
 	/**
 	 * Clean and flush database
 	 */
-	void doPeriodicTasks(void* tPtr, int64_t now);
+	void clean(uint64_t now);
 
 	/**
 	 * @param now Current time
 	 * @return Number of peers with active direct paths
 	 */
-	inline unsigned long countActive(int64_t now) const
+	inline unsigned long countActive(uint64_t now) const
 	{
 		unsigned long cnt = 0;
-		Mutex::Lock _l(_peers_m);
-		Hashtable<Address, SharedPtr<Peer> >::Iterator i(const_cast<Topology*>(this)->_peers);
-		Address* a = (Address*)0;
-		SharedPtr<Peer>* p = (SharedPtr<Peer>*)0;
-		while (i.next(a, p)) {
-			const SharedPtr<Path> pp((*p)->getAppropriatePath(now, false));
-			if (pp) {
-				++cnt;
-			}
+		Mutex::Lock _l(_lock);
+		Hashtable< Address,SharedPtr<Peer> >::Iterator i(const_cast<Topology *>(this)->_peers);
+		Address *a = (Address *)0;
+		SharedPtr<Peer> *p = (SharedPtr<Peer> *)0;
+		while (i.next(a,p)) {
+			cnt += (unsigned long)((*p)->hasActiveDirectPath(now));
 		}
 		return cnt;
 	}
@@ -300,172 +210,63 @@ class Topology {
 	/**
 	 * Apply a function or function object to all peers
 	 *
+	 * Note: explicitly template this by reference if you want the object
+	 * passed by reference instead of copied.
+	 *
+	 * Warning: be careful not to use features in these that call any other
+	 * methods of Topology that may lock _lock, otherwise a recursive lock
+	 * and deadlock or lock corruption may occur.
+	 *
 	 * @param f Function to apply
 	 * @tparam F Function or function object type
 	 */
-	template <typename F> inline void eachPeer(F f)
+	template<typename F>
+	inline void eachPeer(F f)
 	{
-		Mutex::Lock _l(_peers_m);
-		Hashtable<Address, SharedPtr<Peer> >::Iterator i(_peers);
-		Address* a = (Address*)0;
-		SharedPtr<Peer>* p = (SharedPtr<Peer>*)0;
-		while (i.next(a, p)) {
-			f(*this, *((const SharedPtr<Peer>*)p));
+		Mutex::Lock _l(_lock);
+		Hashtable< Address,SharedPtr<Peer> >::Iterator i(_peers);
+		Address *a = (Address *)0;
+		SharedPtr<Peer> *p = (SharedPtr<Peer> *)0;
+		while (i.next(a,p)) {
+#ifdef ZT_TRACE
+			if (!(*p)) {
+				fprintf(stderr,"FATAL BUG: eachPeer() caught NULL peer for %s -- peer pointers in Topology should NEVER be NULL" ZT_EOL_S,a->toString().c_str());
+				abort();
+			}
+#endif
+			f(*this,*((const SharedPtr<Peer> *)p));
 		}
 	}
 
 	/**
 	 * @return All currently active peers by address (unsorted)
 	 */
-	inline std::vector<std::pair<Address, SharedPtr<Peer> > > allPeers() const
+	inline std::vector< std::pair< Address,SharedPtr<Peer> > > allPeers() const
 	{
-		Mutex::Lock _l(_peers_m);
+		Mutex::Lock _l(_lock);
 		return _peers.entries();
 	}
 
 	/**
-	 * @return True if I am a root server in a planet or moon
+	 * @return True if I am a root server in the current World
 	 */
-	inline bool amUpstream() const
-	{
-		return _amUpstream;
-	}
+	inline bool amRoot() const throw() { return _amRoot; }
 
-	/**
-	 * Get info about a path
-	 *
-	 * The supplied result variables are not modified if no special config info is found.
-	 *
-	 * @param physicalAddress Physical endpoint address
-	 * @param mtu Variable set to MTU
-	 * @param trustedPathId Variable set to trusted path ID
-	 */
-	inline void getOutboundPathInfo(const InetAddress& physicalAddress, unsigned int& mtu, uint64_t& trustedPathId)
-	{
-		for (unsigned int i = 0, j = _numConfiguredPhysicalPaths; i < j; ++i) {
-			if (_physicalPathConfig[i].first.containsAddress(physicalAddress)) {
-				trustedPathId = _physicalPathConfig[i].second.trustedPathId;
-				mtu = _physicalPathConfig[i].second.mtu;
-				return;
-			}
-		}
-	}
+private:
+	Identity _getIdentity(const Address &zta);
+	void _setWorld(const World &newWorld);
 
-	/**
-	 * Get the payload MTU for an outbound physical path (returns default if not configured)
-	 *
-	 * @param physicalAddress Physical endpoint address
-	 * @return MTU
-	 */
-	inline unsigned int getOutboundPathMtu(const InetAddress& physicalAddress)
-	{
-		for (unsigned int i = 0, j = _numConfiguredPhysicalPaths; i < j; ++i) {
-			if (_physicalPathConfig[i].first.containsAddress(physicalAddress)) {
-				return _physicalPathConfig[i].second.mtu;
-			}
-		}
-		return ZT_DEFAULT_PHYSMTU;
-	}
+	const RuntimeEnvironment *const RR;
 
-	/**
-	 * Get the outbound trusted path ID for a physical address, or 0 if none
-	 *
-	 * @param physicalAddress Physical address to which we are sending the packet
-	 * @return Trusted path ID or 0 if none (0 is not a valid trusted path ID)
-	 */
-	inline uint64_t getOutboundPathTrust(const InetAddress& physicalAddress)
-	{
-		for (unsigned int i = 0, j = _numConfiguredPhysicalPaths; i < j; ++i) {
-			if (_physicalPathConfig[i].first.containsAddress(physicalAddress)) {
-				return _physicalPathConfig[i].second.trustedPathId;
-			}
-		}
-		return 0;
-	}
+	World _world;
+	Hashtable< Address,SharedPtr<Peer> > _peers;
+	std::vector< Address > _rootAddresses;
+	std::vector< SharedPtr<Peer> > _rootPeers;
+	bool _amRoot;
 
-	/**
-	 * Check whether in incoming trusted path marked packet is valid
-	 *
-	 * @param physicalAddress Originating physical address
-	 * @param trustedPathId Trusted path ID from packet (from MAC field)
-	 */
-	inline bool shouldInboundPathBeTrusted(const InetAddress& physicalAddress, const uint64_t trustedPathId)
-	{
-		for (unsigned int i = 0, j = _numConfiguredPhysicalPaths; i < j; ++i) {
-			if ((_physicalPathConfig[i].second.trustedPathId == trustedPathId) && (_physicalPathConfig[i].first.containsAddress(physicalAddress))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Set or clear physical path configuration (called via Node::setPhysicalPathConfiguration)
-	 */
-	inline void setPhysicalPathConfiguration(const struct sockaddr_storage* pathNetwork, const ZT_PhysicalPathConfiguration* pathConfig)
-	{
-		if (! pathNetwork) {
-			_numConfiguredPhysicalPaths = 0;
-		}
-		else {
-			std::map<InetAddress, ZT_PhysicalPathConfiguration> cpaths;
-			for (unsigned int i = 0, j = _numConfiguredPhysicalPaths; i < j; ++i) {
-				cpaths[_physicalPathConfig[i].first] = _physicalPathConfig[i].second;
-			}
-
-			if (pathConfig) {
-				ZT_PhysicalPathConfiguration pc(*pathConfig);
-
-				if (pc.mtu <= 0) {
-					pc.mtu = ZT_DEFAULT_PHYSMTU;
-				}
-				else if (pc.mtu < ZT_MIN_PHYSMTU) {
-					pc.mtu = ZT_MIN_PHYSMTU;
-				}
-				else if (pc.mtu > ZT_MAX_PHYSMTU) {
-					pc.mtu = ZT_MAX_PHYSMTU;
-				}
-
-				cpaths[*(reinterpret_cast<const InetAddress*>(pathNetwork))] = pc;
-			}
-			else {
-				cpaths.erase(*(reinterpret_cast<const InetAddress*>(pathNetwork)));
-			}
-
-			unsigned int cnt = 0;
-			for (std::map<InetAddress, ZT_PhysicalPathConfiguration>::const_iterator i(cpaths.begin()); ((i != cpaths.end()) && (cnt < ZT_MAX_CONFIGURABLE_PATHS)); ++i) {
-				_physicalPathConfig[cnt].first = i->first;
-				_physicalPathConfig[cnt].second = i->second;
-				++cnt;
-			}
-			_numConfiguredPhysicalPaths = cnt;
-		}
-	}
-
-  private:
-	Identity _getIdentity(void* tPtr, const Address& zta);
-	void _memoizeUpstreams(void* tPtr);
-	void _savePeer(void* tPtr, const SharedPtr<Peer>& peer);
-
-	const RuntimeEnvironment* const RR;
-
-	std::pair<InetAddress, ZT_PhysicalPathConfiguration> _physicalPathConfig[ZT_MAX_CONFIGURABLE_PATHS];
-	volatile unsigned int _numConfiguredPhysicalPaths;
-
-	Hashtable<Address, SharedPtr<Peer> > _peers;
-	Mutex _peers_m;
-
-	Hashtable<Path::HashKey, SharedPtr<Path> > _paths;
-	Mutex _paths_m;
-
-	World _planet;
-	std::vector<World> _moons;
-	std::vector<std::pair<uint64_t, Address> > _moonSeeds;
-	std::vector<Address> _upstreamAddresses;
-	bool _amUpstream;
-	Mutex _upstreams_m;	  // locks worlds, upstream info, moon info, etc.
+	Mutex _lock;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/Trace.cpp b/node/Trace.cpp
deleted file mode 100644
index 982047093..000000000
--- a/node/Trace.cpp
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-// #define ZT_TRACE
-
-#include "Trace.hpp"
-
-#include "../include/ZeroTierDebug.h"
-#include "Capability.hpp"
-#include "CertificateOfMembership.hpp"
-#include "CertificateOfOwnership.hpp"
-#include "Dictionary.hpp"
-#include "Node.hpp"
-#include "Revocation.hpp"
-#include "RuntimeEnvironment.hpp"
-#include "Switch.hpp"
-#include "Tag.hpp"
-#include "Utils.hpp"
-
-#include <stdarg.h>
-#include <stdio.h>
-
-namespace ZeroTier {
-
-#ifdef ZT_TRACE
-static void ZT_LOCAL_TRACE(void* const tPtr, const RuntimeEnvironment* const RR, const char* const fmt, ...)
-{
-	char traceMsgBuf[1024];
-	va_list ap;
-	va_start(ap, fmt);
-	vsnprintf(traceMsgBuf, sizeof(traceMsgBuf), fmt, ap);
-	va_end(ap);
-	traceMsgBuf[sizeof(traceMsgBuf) - 1] = (char)0;
-	RR->node->postEvent(tPtr, ZT_EVENT_TRACE, traceMsgBuf);
-}
-#else
-#define ZT_LOCAL_TRACE(...)
-#endif
-
-void Trace::resettingPathsInScope(void* const tPtr, const Address& reporter, const InetAddress& reporterPhysicalAddress, const InetAddress& myPhysicalAddress, const InetAddress::IpScope scope)
-{
-	char tmp[128];
-
-	ZT_LOCAL_TRACE(tPtr, RR, "RESET and revalidate paths in scope %d; new phy address %s reported by trusted peer %.10llx", (int)scope, myPhysicalAddress.toIpString(tmp), reporter.toInt());
-
-	Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-	d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__RESETTING_PATHS_IN_SCOPE_S);
-	d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, reporter);
-	d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, reporterPhysicalAddress.toString(tmp));
-	d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_PHYADDR, myPhysicalAddress.toString(tmp));
-	d.add(ZT_REMOTE_TRACE_FIELD__IP_SCOPE, (uint64_t)scope);
-
-	if (_globalTarget) {
-		_send(tPtr, d, _globalTarget);
-	}
-	_spamToAllNetworks(tPtr, d, Trace::LEVEL_NORMAL);
-}
-
-void Trace::peerConfirmingUnknownPath(void* const tPtr, const uint64_t networkId, Peer& peer, const SharedPtr<Path>& path, const uint64_t packetId, const Packet::Verb verb)
-{
-	char tmp[128];
-	if (! path) {
-		return;	  // sanity check
-	}
-
-	ZT_LOCAL_TRACE(tPtr, RR, "trying unknown path %s to %.10llx (packet %.16llx verb %d local socket %lld network %.16llx)", path->address().toString(tmp), peer.address().toInt(), packetId, verb, path->localSocket(), networkId);
-
-	std::pair<Address, Trace::Level> byn;
-	if (networkId) {
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(networkId, byn);
-	}
-
-	if ((_globalTarget) || (byn.first)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID, packetId);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB, (uint64_t)verb);
-		if (networkId) {
-			d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, networkId);
-		}
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, peer.address());
-		if (path) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, path->address().toString(tmp));
-			d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET, path->localSocket());
-		}
-
-		if (_globalTarget) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if (byn.first) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::bondStateMessage(void* const tPtr, char* msg)
-{
-	ZT_LOCAL_TRACE(tPtr, RR, "%s", msg);
-}
-
-void Trace::peerLearnedNewPath(void* const tPtr, const uint64_t networkId, Peer& peer, const SharedPtr<Path>& newPath, const uint64_t packetId)
-{
-	char tmp[128];
-	if (! newPath) {
-		return;	  // sanity check
-	}
-
-	ZT_LOCAL_TRACE(tPtr, RR, "learned new path %s to %.10llx (packet %.16llx local socket %lld network %.16llx)", newPath->address().toString(tmp), peer.address().toInt(), packetId, newPath->localSocket(), networkId);
-
-	std::pair<Address, Trace::Level> byn;
-	if (networkId) {
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(networkId, byn);
-	}
-
-	if ((_globalTarget) || (byn.first)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID, packetId);
-		if (networkId) {
-			d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, networkId);
-		}
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, peer.address());
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, newPath->address().toString(tmp));
-		d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET, newPath->localSocket());
-
-		if (_globalTarget) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if (byn.first) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::peerRedirected(void* const tPtr, const uint64_t networkId, Peer& peer, const SharedPtr<Path>& newPath)
-{
-	char tmp[128];
-	if (! newPath) {
-		return;	  // sanity check
-	}
-
-	ZT_LOCAL_TRACE(tPtr, RR, "explicit redirect from %.10llx to path %s", peer.address().toInt(), newPath->address().toString(tmp));
-
-	std::pair<Address, Trace::Level> byn;
-	if (networkId) {
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(networkId, byn);
-	}
-
-	if ((_globalTarget) || (byn.first)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED_S);
-		if (networkId) {
-			d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, networkId);
-		}
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, peer.address());
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, newPath->address().toString(tmp));
-		d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET, newPath->localSocket());
-
-		if (_globalTarget) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if (byn.first) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::outgoingNetworkFrameDropped(void* const tPtr, const SharedPtr<Network>& network, const MAC& sourceMac, const MAC& destMac, const unsigned int etherType, const unsigned int vlanId, const unsigned int frameLen, const char* reason)
-{
-#ifdef ZT_TRACE
-	char tmp[128], tmp2[128];
-#endif
-	if (! network) {
-		return;	  // sanity check
-	}
-
-	ZT_LOCAL_TRACE(tPtr, RR, "%.16llx DROP frame %s -> %s etherType %.4x size %u (%s)", network->id(), sourceMac.toString(tmp), destMac.toString(tmp2), etherType, frameLen, (reason) ? reason : "unknown reason");
-
-	std::pair<Address, Trace::Level> byn;
-	{
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(network->id(), byn);
-	}
-
-	if (((_globalTarget) && ((int)_globalLevel >= (int)Trace::LEVEL_VERBOSE)) || ((byn.first) && ((int)byn.second >= (int)Trace::LEVEL_VERBOSE))) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__OUTGOING_NETWORK_FRAME_DROPPED_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, network->id());
-		d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC, sourceMac.toInt());
-		d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC, destMac.toInt());
-		d.add(ZT_REMOTE_TRACE_FIELD__ETHERTYPE, (uint64_t)etherType);
-		d.add(ZT_REMOTE_TRACE_FIELD__VLAN_ID, (uint64_t)vlanId);
-		d.add(ZT_REMOTE_TRACE_FIELD__FRAME_LENGTH, (uint64_t)frameLen);
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		if ((_globalTarget) && ((int)_globalLevel >= (int)Trace::LEVEL_VERBOSE)) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if ((byn.first) && ((int)byn.second >= (int)Trace::LEVEL_VERBOSE)) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::incomingNetworkAccessDenied(
-	void* const tPtr,
-	const SharedPtr<Network>& network,
-	const SharedPtr<Path>& path,
-	const uint64_t packetId,
-	const unsigned int packetLength,
-	const Address& source,
-	const Packet::Verb verb,
-	bool credentialsRequested)
-{
-	char tmp[128];
-	if (! network) {
-		return;	  // sanity check
-	}
-
-	ZT_LOCAL_TRACE(
-		tPtr,
-		RR,
-		"%.16llx DENIED packet from %.10llx(%s) verb %d size %u%s",
-		network->id(),
-		source.toInt(),
-		(path) ? (path->address().toString(tmp)) : "???",
-		(int)verb,
-		packetLength,
-		credentialsRequested ? " (credentials requested)" : " (credentials not requested)");
-
-	std::pair<Address, Trace::Level> byn;
-	{
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(network->id(), byn);
-	}
-
-	if (((_globalTarget) && ((int)_globalLevel >= (int)Trace::LEVEL_VERBOSE)) || ((byn.first) && ((int)byn.second >= (int)Trace::LEVEL_VERBOSE))) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_ACCESS_DENIED_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID, packetId);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB, (uint64_t)verb);
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, source);
-		if (path) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, path->address().toString(tmp));
-			d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET, path->localSocket());
-		}
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, network->id());
-
-		if ((_globalTarget) && ((int)_globalLevel >= (int)Trace::LEVEL_VERBOSE)) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if ((byn.first) && ((int)byn.second >= (int)Trace::LEVEL_VERBOSE)) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::incomingNetworkFrameDropped(
-	void* const tPtr,
-	const SharedPtr<Network>& network,
-	const SharedPtr<Path>& path,
-	const uint64_t packetId,
-	const unsigned int packetLength,
-	const Address& source,
-	const Packet::Verb verb,
-	const MAC& sourceMac,
-	const MAC& destMac,
-	const char* reason)
-{
-	char tmp[128];
-	if (! network) {
-		return;	  // sanity check
-	}
-
-	ZT_LOCAL_TRACE(tPtr, RR, "%.16llx DROPPED frame from %.10llx(%s) verb %d size %u", network->id(), source.toInt(), (path) ? (path->address().toString(tmp)) : "???", (int)verb, packetLength);
-
-	std::pair<Address, Trace::Level> byn;
-	{
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(network->id(), byn);
-	}
-
-	if (((_globalTarget) && ((int)_globalLevel >= (int)Trace::LEVEL_VERBOSE)) || ((byn.first) && ((int)byn.second >= (int)Trace::LEVEL_VERBOSE))) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_FRAME_DROPPED_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID, packetId);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB, (uint64_t)verb);
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, source);
-		if (path) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, path->address().toString(tmp));
-			d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET, path->localSocket());
-		}
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, network->id());
-		d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC, sourceMac.toInt());
-		d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC, destMac.toInt());
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		if ((_globalTarget) && ((int)_globalLevel >= (int)Trace::LEVEL_VERBOSE)) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if ((byn.first) && ((int)byn.second >= (int)Trace::LEVEL_VERBOSE)) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::incomingPacketMessageAuthenticationFailure(void* const tPtr, const SharedPtr<Path>& path, const uint64_t packetId, const Address& source, const unsigned int hops, const char* reason)
-{
-	char tmp[128];
-
-	ZT_LOCAL_TRACE(tPtr, RR, "MAC failed for packet %.16llx from %.10llx(%s)", packetId, source.toInt(), (path) ? path->address().toString(tmp) : "???");
-
-	if ((_globalTarget) && ((int)_globalLevel >= Trace::LEVEL_DEBUG)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID, packetId);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_HOPS, (uint64_t)hops);
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, source);
-		if (path) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, path->address().toString(tmp));
-			d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET, path->localSocket());
-		}
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		_send(tPtr, d, _globalTarget);
-	}
-}
-
-void Trace::incomingPacketInvalid(void* const tPtr, const SharedPtr<Path>& path, const uint64_t packetId, const Address& source, const unsigned int hops, const Packet::Verb verb, const char* reason)
-{
-	char tmp[128];
-
-	ZT_LOCAL_TRACE(tPtr, RR, "INVALID packet %.16llx from %.10llx(%s) (%s)", packetId, source.toInt(), (path) ? path->address().toString(tmp) : "???", (reason) ? reason : "unknown reason");
-
-	if ((_globalTarget) && ((int)_globalLevel >= Trace::LEVEL_DEBUG)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID, packetId);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB, (uint64_t)verb);
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, source);
-		if (path) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, path->address().toString(tmp));
-			d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET, path->localSocket());
-		}
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_HOPS, (uint64_t)hops);
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		_send(tPtr, d, _globalTarget);
-	}
-}
-
-void Trace::incomingPacketDroppedHELLO(void* const tPtr, const SharedPtr<Path>& path, const uint64_t packetId, const Address& source, const char* reason)
-{
-	char tmp[128];
-
-	ZT_LOCAL_TRACE(tPtr, RR, "DROPPED HELLO from %.10llx(%s) (%s)", source.toInt(), (path) ? path->address().toString(tmp) : "???", (reason) ? reason : "???");
-
-	if ((_globalTarget) && ((int)_globalLevel >= Trace::LEVEL_DEBUG)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID, packetId);
-		d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR, source);
-		if (path) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR, path->address().toString(tmp));
-			d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET, path->localSocket());
-		}
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		_send(tPtr, d, _globalTarget);
-	}
-}
-
-void Trace::networkConfigRequestSent(void* const tPtr, const Network& network, const Address& controller)
-{
-	ZT_LOCAL_TRACE(tPtr, RR, "requesting configuration for network %.16llx", network.id());
-	if ((_globalTarget) && ((int)_globalLevel >= Trace::LEVEL_DEBUG)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__NETWORK_CONFIG_REQUEST_SENT_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, network.id());
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_CONTROLLER_ID, controller);
-		_send(tPtr, d, _globalTarget);
-	}
-}
-
-void Trace::networkFilter(
-	void* const tPtr,
-	const Network& network,
-	const RuleResultLog& primaryRuleSetLog,
-	const RuleResultLog* const matchingCapabilityRuleSetLog,
-	const Capability* const matchingCapability,
-	const Address& ztSource,
-	const Address& ztDest,
-	const MAC& macSource,
-	const MAC& macDest,
-	const uint8_t* const frameData,
-	const unsigned int frameLen,
-	const unsigned int etherType,
-	const unsigned int vlanId,
-	const bool noTee,
-	const bool inbound,
-	const int accept)
-{
-	std::pair<Address, Trace::Level> byn;
-	{
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(network.id(), byn);
-	}
-
-	if (((_globalTarget) && ((int)_globalLevel >= (int)Trace::LEVEL_RULES)) || ((byn.first) && ((int)byn.second >= (int)Trace::LEVEL_RULES))) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__NETWORK_FILTER_TRACE_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, network.id());
-		d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_ZTADDR, ztSource);
-		d.add(ZT_REMOTE_TRACE_FIELD__DEST_ZTADDR, ztDest);
-		d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC, macSource.toInt());
-		d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC, macDest.toInt());
-		d.add(ZT_REMOTE_TRACE_FIELD__ETHERTYPE, (uint64_t)etherType);
-		d.add(ZT_REMOTE_TRACE_FIELD__VLAN_ID, (uint64_t)vlanId);
-		d.add(ZT_REMOTE_TRACE_FIELD__FILTER_FLAG_NOTEE, noTee ? "1" : "0");
-		d.add(ZT_REMOTE_TRACE_FIELD__FILTER_FLAG_INBOUND, inbound ? "1" : "0");
-		d.add(ZT_REMOTE_TRACE_FIELD__FILTER_RESULT, (int64_t)accept);
-		d.add(ZT_REMOTE_TRACE_FIELD__FILTER_BASE_RULE_LOG, (const char*)primaryRuleSetLog.data(), (int)primaryRuleSetLog.sizeBytes());
-		if (matchingCapabilityRuleSetLog) {
-			d.add(ZT_REMOTE_TRACE_FIELD__FILTER_CAP_RULE_LOG, (const char*)matchingCapabilityRuleSetLog->data(), (int)matchingCapabilityRuleSetLog->sizeBytes());
-		}
-		if (matchingCapability) {
-			d.add(ZT_REMOTE_TRACE_FIELD__FILTER_CAP_ID, (uint64_t)matchingCapability->id());
-		}
-		d.add(ZT_REMOTE_TRACE_FIELD__FRAME_LENGTH, (uint64_t)frameLen);
-		if (frameLen > 0) {
-			d.add(ZT_REMOTE_TRACE_FIELD__FRAME_DATA, (const char*)frameData, (frameLen > 256) ? (int)256 : (int)frameLen);
-		}
-
-		if ((_globalTarget) && ((int)_globalLevel >= (int)Trace::LEVEL_RULES)) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if ((byn.first) && ((int)byn.second >= (int)Trace::LEVEL_RULES)) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::credentialRejected(void* const tPtr, const CertificateOfMembership& c, const char* reason)
-{
-	std::pair<Address, Trace::Level> byn;
-	if (c.networkId()) {
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(c.networkId(), byn);
-	}
-
-	if ((_globalTarget) || (byn.first)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, c.networkId());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE, (uint64_t)c.credentialType());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID, (uint64_t)c.id());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP, c.timestamp());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO, c.issuedTo());
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		if (_globalTarget) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if (byn.first) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::credentialRejected(void* const tPtr, const CertificateOfOwnership& c, const char* reason)
-{
-	std::pair<Address, Trace::Level> byn;
-	if (c.networkId()) {
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(c.networkId(), byn);
-	}
-
-	if ((_globalTarget) || (byn.first)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, c.networkId());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE, (uint64_t)c.credentialType());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID, (uint64_t)c.id());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP, c.timestamp());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO, c.issuedTo());
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		if (_globalTarget) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if (byn.first) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::credentialRejected(void* const tPtr, const Capability& c, const char* reason)
-{
-	std::pair<Address, Trace::Level> byn;
-	if (c.networkId()) {
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(c.networkId(), byn);
-	}
-
-	if ((_globalTarget) || (byn.first)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, c.networkId());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE, (uint64_t)c.credentialType());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID, (uint64_t)c.id());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP, c.timestamp());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO, c.issuedTo());
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		if (_globalTarget) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if (byn.first) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::credentialRejected(void* const tPtr, const Tag& c, const char* reason)
-{
-	std::pair<Address, Trace::Level> byn;
-	if (c.networkId()) {
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(c.networkId(), byn);
-	}
-
-	if ((_globalTarget) || (byn.first)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, c.networkId());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE, (uint64_t)c.credentialType());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID, (uint64_t)c.id());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP, c.timestamp());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO, c.issuedTo());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_INFO, (uint64_t)c.value());
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		if (_globalTarget) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if (byn.first) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::credentialRejected(void* const tPtr, const Revocation& c, const char* reason)
-{
-	std::pair<Address, Trace::Level> byn;
-	if (c.networkId()) {
-		Mutex::Lock l(_byNet_m);
-		_byNet.get(c.networkId(), byn);
-	}
-
-	if ((_globalTarget) || (byn.first)) {
-		Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
-		d.add(ZT_REMOTE_TRACE_FIELD__EVENT, ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
-		d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID, c.networkId());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE, (uint64_t)c.credentialType());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID, (uint64_t)c.id());
-		d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_REVOCATION_TARGET, c.target());
-		if (reason) {
-			d.add(ZT_REMOTE_TRACE_FIELD__REASON, reason);
-		}
-
-		if (_globalTarget) {
-			_send(tPtr, d, _globalTarget);
-		}
-		if (byn.first) {
-			_send(tPtr, d, byn.first);
-		}
-	}
-}
-
-void Trace::updateMemoizedSettings()
-{
-	_globalTarget = RR->node->remoteTraceTarget();
-	_globalLevel = RR->node->remoteTraceLevel();
-	const std::vector<SharedPtr<Network> > nws(RR->node->allNetworks());
-	{
-		Mutex::Lock l(_byNet_m);
-		_byNet.clear();
-		for (std::vector<SharedPtr<Network> >::const_iterator n(nws.begin()); n != nws.end(); ++n) {
-			const Address dest((*n)->config().remoteTraceTarget);
-			if (dest) {
-				std::pair<Address, Trace::Level>& m = _byNet[(*n)->id()];
-				m.first = dest;
-				m.second = (*n)->config().remoteTraceLevel;
-			}
-		}
-	}
-}
-
-void Trace::_send(void* const tPtr, const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE>& d, const Address& dest)
-{
-	Packet outp(dest, RR->identity.address(), Packet::VERB_REMOTE_TRACE);
-	outp.appendCString(d.data());
-	outp.compress();
-	RR->sw->send(tPtr, outp, true);
-}
-
-void Trace::_spamToAllNetworks(void* const tPtr, const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE>& d, const Level level)
-{
-	Mutex::Lock l(_byNet_m);
-	Hashtable<uint64_t, std::pair<Address, Trace::Level> >::Iterator i(_byNet);
-	uint64_t* k = (uint64_t*)0;
-	std::pair<Address, Trace::Level>* v = (std::pair<Address, Trace::Level>*)0;
-	while (i.next(k, v)) {
-		if ((v) && (v->first) && ((int)v->second >= (int)level)) {
-			_send(tPtr, d, v->first);
-		}
-	}
-}
-
-}	// namespace ZeroTier
diff --git a/node/Trace.hpp b/node/Trace.hpp
deleted file mode 100644
index 991974c50..000000000
--- a/node/Trace.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_TRACE_HPP
-#define ZT_TRACE_HPP
-
-#include "../include/ZeroTierOne.h"
-#include "Constants.hpp"
-#include "Credential.hpp"
-#include "Dictionary.hpp"
-#include "Hashtable.hpp"
-#include "InetAddress.hpp"
-#include "Mutex.hpp"
-#include "Packet.hpp"
-#include "SharedPtr.hpp"
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-namespace ZeroTier {
-
-class RuntimeEnvironment;
-class Address;
-class Identity;
-class Peer;
-class Path;
-class Network;
-class NetworkConfig;
-class MAC;
-class CertificateOfMembership;
-class CertificateOfOwnership;
-class Revocation;
-class Tag;
-class Capability;
-
-/**
- * Remote tracing and trace logging handler
- */
-class Trace {
-  public:
-	/**
-	 * Trace verbosity level
-	 */
-	enum Level { LEVEL_NORMAL = 0, LEVEL_VERBOSE = 10, LEVEL_RULES = 15, LEVEL_DEBUG = 20, LEVEL_INSANE = 30 };
-
-	/**
-	 * Filter rule evaluation result log
-	 *
-	 * Each rule in a rule set gets a four-bit log entry. A log entry
-	 * of zero means not evaluated. Otherwise each four-bit log entry
-	 * contains two two-bit values of 01 for 'false' and 10 for 'true'.
-	 * As with four-bit rules an 00 value here means this was not
-	 * evaluated or was not relevant.
-	 */
-	class RuleResultLog {
-	  public:
-		RuleResultLog()
-		{
-		}
-
-		inline void log(const unsigned int rn, const uint8_t thisRuleMatches, const uint8_t thisSetMatches)
-		{
-			_l[rn >> 1] |= (((thisRuleMatches + 1) << 2) | (thisSetMatches + 1)) << ((rn & 1) << 2);
-		}
-		inline void logSkipped(const unsigned int rn, const uint8_t thisSetMatches)
-		{
-			_l[rn >> 1] |= (thisSetMatches + 1) << ((rn & 1) << 2);
-		}
-
-		inline void clear()
-		{
-			memset(_l, 0, sizeof(_l));
-		}
-
-		inline const uint8_t* data() const
-		{
-			return _l;
-		}
-		inline unsigned int sizeBytes() const
-		{
-			return (ZT_MAX_NETWORK_RULES / 2);
-		}
-
-	  private:
-		uint8_t _l[ZT_MAX_NETWORK_RULES / 2];
-	};
-
-	Trace(const RuntimeEnvironment* renv) : RR(renv), _byNet(8)
-	{
-	}
-
-	void resettingPathsInScope(void* const tPtr, const Address& reporter, const InetAddress& reporterPhysicalAddress, const InetAddress& myPhysicalAddress, const InetAddress::IpScope scope);
-
-	void peerConfirmingUnknownPath(void* const tPtr, const uint64_t networkId, Peer& peer, const SharedPtr<Path>& path, const uint64_t packetId, const Packet::Verb verb);
-
-	void bondStateMessage(void* const tPtr, char* msg);
-
-	void peerLearnedNewPath(void* const tPtr, const uint64_t networkId, Peer& peer, const SharedPtr<Path>& newPath, const uint64_t packetId);
-	void peerRedirected(void* const tPtr, const uint64_t networkId, Peer& peer, const SharedPtr<Path>& newPath);
-
-	void incomingPacketMessageAuthenticationFailure(void* const tPtr, const SharedPtr<Path>& path, const uint64_t packetId, const Address& source, const unsigned int hops, const char* reason);
-	void incomingPacketInvalid(void* const tPtr, const SharedPtr<Path>& path, const uint64_t packetId, const Address& source, const unsigned int hops, const Packet::Verb verb, const char* reason);
-	void incomingPacketDroppedHELLO(void* const tPtr, const SharedPtr<Path>& path, const uint64_t packetId, const Address& source, const char* reason);
-
-	void outgoingNetworkFrameDropped(void* const tPtr, const SharedPtr<Network>& network, const MAC& sourceMac, const MAC& destMac, const unsigned int etherType, const unsigned int vlanId, const unsigned int frameLen, const char* reason);
-	void incomingNetworkAccessDenied(
-		void* const tPtr,
-		const SharedPtr<Network>& network,
-		const SharedPtr<Path>& path,
-		const uint64_t packetId,
-		const unsigned int packetLength,
-		const Address& source,
-		const Packet::Verb verb,
-		bool credentialsRequested);
-	void incomingNetworkFrameDropped(
-		void* const tPtr,
-		const SharedPtr<Network>& network,
-		const SharedPtr<Path>& path,
-		const uint64_t packetId,
-		const unsigned int packetLength,
-		const Address& source,
-		const Packet::Verb verb,
-		const MAC& sourceMac,
-		const MAC& destMac,
-		const char* reason);
-
-	void networkConfigRequestSent(void* const tPtr, const Network& network, const Address& controller);
-	void networkFilter(
-		void* const tPtr,
-		const Network& network,
-		const RuleResultLog& primaryRuleSetLog,
-		const RuleResultLog* const matchingCapabilityRuleSetLog,
-		const Capability* const matchingCapability,
-		const Address& ztSource,
-		const Address& ztDest,
-		const MAC& macSource,
-		const MAC& macDest,
-		const uint8_t* const frameData,
-		const unsigned int frameLen,
-		const unsigned int etherType,
-		const unsigned int vlanId,
-		const bool noTee,
-		const bool inbound,
-		const int accept);
-
-	void credentialRejected(void* const tPtr, const CertificateOfMembership& c, const char* reason);
-	void credentialRejected(void* const tPtr, const CertificateOfOwnership& c, const char* reason);
-	void credentialRejected(void* const tPtr, const Capability& c, const char* reason);
-	void credentialRejected(void* const tPtr, const Tag& c, const char* reason);
-	void credentialRejected(void* const tPtr, const Revocation& c, const char* reason);
-
-	void updateMemoizedSettings();
-
-  private:
-	const RuntimeEnvironment* const RR;
-
-	void _send(void* const tPtr, const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE>& d, const Address& dest);
-	void _spamToAllNetworks(void* const tPtr, const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE>& d, const Level level);
-
-	Address _globalTarget;
-	Trace::Level _globalLevel;
-	Hashtable<uint64_t, std::pair<Address, Trace::Level> > _byNet;
-	Mutex _byNet_m;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/node/Utils.cpp b/node/Utils.cpp
index ad838a7fb..00aeea337 100644
--- a/node/Utils.cpp
+++ b/node/Utils.cpp
@@ -1,226 +1,149 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <time.h>
+#include <sys/stat.h>
 
 #include "Constants.hpp"
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <time.h>
-
 #ifdef __UNIX_LIKE__
-#include <dirent.h>
+#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/uio.h>
-#include <unistd.h>
-#ifdef ZT_ARCH_ARM_HAS_NEON
-#ifdef __LINUX__
-#include <sys/auxv.h>
-#endif
-#endif
+#include <dirent.h>
 #endif
 
 #ifdef __WINDOWS__
-#include <intrin.h>
 #include <wincrypt.h>
 #endif
 
+#include "Utils.hpp"
 #include "Mutex.hpp"
 #include "Salsa20.hpp"
-#include "Utils.hpp"
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-#if defined(__ANDROID__) && defined(__aarch64__)
-#include <asm/hwcap.h>
-#endif
-
-#ifdef ZT_ARCH_ARM_HAS_NEON
-
-#ifdef __LINUX__
-#include <asm/hwcap.h>
-#include <sys/auxv.h>
-#endif
-
-#if defined(__FreeBSD__)
-#include <elf.h>
-#include <sys/auxv.h>
-static inline long getauxval(int caps)
-{
-	long hwcaps = 0;
-	elf_aux_info(caps, &hwcaps, sizeof(hwcaps));
-	return hwcaps;
-}
-#endif
-
-// If these are not even defined, obviously they are not supported.
-#ifndef HWCAP_AES
-#define HWCAP_AES 0
-#endif
-#ifndef HWCAP_CRC32
-#define HWCAP_CRC32 0
-#endif
-#ifndef HWCAP_PMULL
-#define HWCAP_PMULL 0
-#endif
-#ifndef HWCAP_SHA1
-#define HWCAP_SHA1 0
-#endif
-#ifndef HWCAP_SHA2
-#define HWCAP_SHA2 0
-#endif
-
-#endif	 // ZT_ARCH_ARM_HAS_NEON
 
 namespace ZeroTier {
 
-const uint64_t Utils::ZERO256[4] = { 0ULL, 0ULL, 0ULL, 0ULL };
+const char Utils::HEXCHARS[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };
 
-const char Utils::HEXCHARS[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
-#ifdef ZT_ARCH_ARM_HAS_NEON
-Utils::ARMCapabilities::ARMCapabilities() noexcept
+static void _Utils_doBurn(char *ptr,unsigned int len)
 {
-#ifdef __APPLE__
+	for(unsigned int i=0;i<len;++i)
+		ptr[i] = (char)0;
+}
+void (*volatile _Utils_doBurn_ptr)(char *,unsigned int) = _Utils_doBurn;
+void Utils::burn(void *ptr,unsigned int len)
+	throw()
+{
+	// Ridiculous hack: call _doBurn() via a volatile function pointer to
+	// hold down compiler optimizers and beat them mercilessly until they
+	// cry and mumble something about never eliding secure memory zeroing
+	// again.
+	(_Utils_doBurn_ptr)((char *)ptr,len);
+}
 
-	this->aes = true;
-	this->crc32 = true;
-	this->pmull = true;
-	this->sha1 = true;
-	this->sha2 = true;
-
-#else
-
-#ifdef HWCAP2_AES
-	if (sizeof(void*) == 4) {
-		const long hwcaps2 = getauxval(AT_HWCAP2);
-		this->aes = (hwcaps2 & HWCAP2_AES) != 0;
-		this->crc32 = (hwcaps2 & HWCAP2_CRC32) != 0;
-		this->pmull = (hwcaps2 & HWCAP2_PMULL) != 0;
-		this->sha1 = (hwcaps2 & HWCAP2_SHA1) != 0;
-		this->sha2 = (hwcaps2 & HWCAP2_SHA2) != 0;
+std::string Utils::hex(const void *data,unsigned int len)
+{
+	std::string r;
+	r.reserve(len * 2);
+	for(unsigned int i=0;i<len;++i) {
+		r.push_back(HEXCHARS[(((const unsigned char *)data)[i] & 0xf0) >> 4]);
+		r.push_back(HEXCHARS[((const unsigned char *)data)[i] & 0x0f]);
 	}
-	else {
-#endif
-		const long hwcaps = getauxval(AT_HWCAP);
-		this->aes = (hwcaps & HWCAP_AES) != 0;
-		this->crc32 = (hwcaps & HWCAP_CRC32) != 0;
-		this->pmull = (hwcaps & HWCAP_PMULL) != 0;
-		this->sha1 = (hwcaps & HWCAP_SHA1) != 0;
-		this->sha2 = (hwcaps & HWCAP_SHA2) != 0;
-#ifdef HWCAP2_AES
+	return r;
+}
+
+std::string Utils::unhex(const char *hex,unsigned int maxlen)
+{
+	int n = 1;
+	unsigned char c,b = 0;
+	const char *eof = hex + maxlen;
+	std::string r;
+
+	if (!maxlen)
+		return r;
+
+	while ((c = (unsigned char)*(hex++))) {
+		if ((c >= 48)&&(c <= 57)) { // 0..9
+			if ((n ^= 1))
+				r.push_back((char)(b | (c - 48)));
+			else b = (c - 48) << 4;
+		} else if ((c >= 65)&&(c <= 70)) { // A..F
+			if ((n ^= 1))
+				r.push_back((char)(b | (c - (65 - 10))));
+			else b = (c - (65 - 10)) << 4;
+		} else if ((c >= 97)&&(c <= 102)) { // a..f
+			if ((n ^= 1))
+				r.push_back((char)(b | (c - (97 - 10))));
+			else b = (c - (97 - 10)) << 4;
+		}
+		if (hex == eof)
+			break;
 	}
-#endif
 
-#endif	 // __APPLE__
+	return r;
 }
 
-const Utils::ARMCapabilities Utils::ARMCAP;
-#endif
-
-#ifdef ZT_ARCH_X64
-
-Utils::CPUIDRegisters::CPUIDRegisters() noexcept
+unsigned int Utils::unhex(const char *hex,unsigned int maxlen,void *buf,unsigned int len)
 {
-	uint32_t eax, ebx, ecx, edx;
+	int n = 1;
+	unsigned char c,b = 0;
+	unsigned int l = 0;
+	const char *eof = hex + maxlen;
 
-#ifdef __WINDOWS__
-	int regs[4];
-	__cpuid(regs, 1);
-	eax = (uint32_t)regs[0];
-	ebx = (uint32_t)regs[1];
-	ecx = (uint32_t)regs[2];
-	edx = (uint32_t)regs[3];
-#else
-	__asm__ __volatile__("cpuid" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) : "a"(1), "c"(0));
-#endif
-
-	rdrand = ((ecx & (1U << 30U)) != 0);
-	aes = (((ecx & (1U << 25U)) != 0) && ((ecx & (1U << 19U)) != 0) && ((ecx & (1U << 1U)) != 0));
-	avx = ((ecx & (1U << 25U)) != 0);
-
-#ifdef __WINDOWS__
-	__cpuid(regs, 7);
-	eax = (uint32_t)regs[0];
-	ebx = (uint32_t)regs[1];
-	ecx = (uint32_t)regs[2];
-	edx = (uint32_t)regs[3];
-#else
-	__asm__ __volatile__("cpuid" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) : "a"(7), "c"(0));
-#endif
-
-	vaes = aes && avx && ((ecx & (1U << 9U)) != 0);
-	vpclmulqdq = aes && avx && ((ecx & (1U << 10U)) != 0);
-	avx2 = avx && ((ebx & (1U << 5U)) != 0);
-	avx512f = avx && ((ebx & (1U << 16U)) != 0);
-	sha = ((ebx & (1U << 29U)) != 0);
-	fsrm = ((edx & (1U << 4U)) != 0);
-}
-
-const Utils::CPUIDRegisters Utils::CPUID;
-#endif
-
-// Crazy hack to force memory to be securely zeroed in spite of the best efforts of optimizing compilers.
-static void _Utils_doBurn(volatile uint8_t* ptr, unsigned int len)
-{
-	volatile uint8_t* const end = ptr + len;
-	while (ptr != end) {
-		*(ptr++) = (uint8_t)0;
-	}
-}
-static void (*volatile _Utils_doBurn_ptr)(volatile uint8_t*, unsigned int) = _Utils_doBurn;
-void Utils::burn(void* ptr, unsigned int len)
-{
-	(_Utils_doBurn_ptr)((volatile uint8_t*)ptr, len);
-}
-
-static unsigned long _Utils_itoa(unsigned long n, char* s)
-{
-	if (n == 0) {
+	if (!maxlen)
 		return 0;
+
+	while ((c = (unsigned char)*(hex++))) {
+		if ((c >= 48)&&(c <= 57)) { // 0..9
+			if ((n ^= 1)) {
+				if (l >= len) break;
+				((unsigned char *)buf)[l++] = (b | (c - 48));
+			} else b = (c - 48) << 4;
+		} else if ((c >= 65)&&(c <= 70)) { // A..F
+			if ((n ^= 1)) {
+				if (l >= len) break;
+				((unsigned char *)buf)[l++] = (b | (c - (65 - 10)));
+			} else b = (c - (65 - 10)) << 4;
+		} else if ((c >= 97)&&(c <= 102)) { // a..f
+			if ((n ^= 1)) {
+				if (l >= len) break;
+				((unsigned char *)buf)[l++] = (b | (c - (97 - 10)));
+			} else b = (c - (97 - 10)) << 4;
+		}
+		if (hex == eof)
+			break;
 	}
-	unsigned long pos = _Utils_itoa(n / 10, s);
-	if (pos >= 22) {   // sanity check, should be impossible
-		pos = 22;
-	}
-	s[pos] = '0' + (char)(n % 10);
-	return pos + 1;
-}
-char* Utils::decimal(unsigned long n, char s[24])
-{
-	if (n == 0) {
-		s[0] = '0';
-		s[1] = (char)0;
-		return s;
-	}
-	s[_Utils_itoa(n, s)] = (char)0;
-	return s;
+
+	return l;
 }
 
-void Utils::getSecureRandom(void* buf, unsigned int bytes)
+void Utils::getSecureRandom(void *buf,unsigned int bytes)
 {
 	static Mutex globalLock;
 	static Salsa20 s20;
 	static bool s20Initialized = false;
-	static uint8_t randomBuf[65536];
-	static unsigned int randomPtr = sizeof(randomBuf);
 
 	Mutex::Lock _l(globalLock);
 
@@ -231,76 +154,130 @@ void Utils::getSecureRandom(void* buf, unsigned int bytes)
 	 * a bit of extra entropy and further randomizing the result, and comes
 	 * at almost no cost and with no real downside if the random source is
 	 * good. */
-	if (! s20Initialized) {
+	if (!s20Initialized) {
 		s20Initialized = true;
 		uint64_t s20Key[4];
-		s20Key[0] = (uint64_t)time(0);	 // system clock
-		s20Key[1] = (uint64_t)buf;		 // address of buf
-		s20Key[2] = (uint64_t)s20Key;	 // address of s20Key[]
-		s20Key[3] = (uint64_t)&s20;		 // address of s20
-		s20.init(s20Key, s20Key);
+		s20Key[0] = (uint64_t)time(0); // system clock
+		s20Key[1] = (uint64_t)buf; // address of buf
+		s20Key[2] = (uint64_t)s20Key; // address of s20Key[]
+		s20Key[3] = (uint64_t)&s20; // address of s20
+		s20.init(s20Key,256,s20Key);
 	}
 
 #ifdef __WINDOWS__
 
 	static HCRYPTPROV cryptProvider = NULL;
 
-	for (unsigned int i = 0; i < bytes; ++i) {
-		if (randomPtr >= sizeof(randomBuf)) {
-			if (cryptProvider == NULL) {
-				if (! CryptAcquireContextA(&cryptProvider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
-					fprintf(stderr, "FATAL ERROR: Utils::getSecureRandom() unable to obtain WinCrypt context!\r\n");
-					exit(1);
-				}
-			}
-			if (! CryptGenRandom(cryptProvider, (DWORD)sizeof(randomBuf), (BYTE*)randomBuf)) {
-				fprintf(stderr, "FATAL ERROR: Utils::getSecureRandom() CryptGenRandom failed!\r\n");
-				exit(1);
-			}
-			randomPtr = 0;
-			s20.crypt12(randomBuf, randomBuf, sizeof(randomBuf));
-			s20.init(randomBuf, randomBuf);
+	if (cryptProvider == NULL) {
+		if (!CryptAcquireContextA(&cryptProvider,NULL,NULL,PROV_RSA_FULL,CRYPT_VERIFYCONTEXT|CRYPT_SILENT)) {
+			fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() unable to obtain WinCrypt context!\r\n");
+			exit(1);
+			return;
 		}
-		((uint8_t*)buf)[i] = randomBuf[randomPtr++];
+	}
+	if (!CryptGenRandom(cryptProvider,(DWORD)bytes,(BYTE *)buf)) {
+		fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() CryptGenRandom failed!\r\n");
+		exit(1);
 	}
 
-#else	// not __WINDOWS__
+#else // not __WINDOWS__
 
+	static char randomBuf[131072];
+	static unsigned int randomPtr = sizeof(randomBuf);
 	static int devURandomFd = -1;
 
-	if (devURandomFd < 0) {
-		devURandomFd = ::open("/dev/urandom", O_RDONLY);
-		if (devURandomFd < 0) {
-			fprintf(stderr, "FATAL ERROR: Utils::getSecureRandom() unable to open /dev/urandom\n");
+	if (devURandomFd <= 0) {
+		devURandomFd = ::open("/dev/urandom",O_RDONLY);
+		if (devURandomFd <= 0) {
+			fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() unable to open /dev/urandom\n");
 			exit(1);
 			return;
 		}
 	}
 
-	for (unsigned int i = 0; i < bytes; ++i) {
+	for(unsigned int i=0;i<bytes;++i) {
 		if (randomPtr >= sizeof(randomBuf)) {
-			for (;;) {
-				if ((int)::read(devURandomFd, randomBuf, sizeof(randomBuf)) != (int)sizeof(randomBuf)) {
+			for(;;) {
+				if ((int)::read(devURandomFd,randomBuf,sizeof(randomBuf)) != (int)sizeof(randomBuf)) {
 					::close(devURandomFd);
-					devURandomFd = ::open("/dev/urandom", O_RDONLY);
-					if (devURandomFd < 0) {
-						fprintf(stderr, "FATAL ERROR: Utils::getSecureRandom() unable to open /dev/urandom\n");
+					devURandomFd = ::open("/dev/urandom",O_RDONLY);
+					if (devURandomFd <= 0) {
+						fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() unable to open /dev/urandom\n");
 						exit(1);
 						return;
 					}
-				}
-				else {
-					break;
-				}
+				} else break;
 			}
 			randomPtr = 0;
-			s20.crypt12(randomBuf, randomBuf, sizeof(randomBuf));
-			s20.init(randomBuf, randomBuf);
 		}
-		((uint8_t*)buf)[i] = randomBuf[randomPtr++];
+		((char *)buf)[i] = randomBuf[randomPtr++];
 	}
 
-#endif	 // __WINDOWS__ or not
+#endif // __WINDOWS__ or not
+
+	s20.encrypt12(buf,buf,bytes);
 }
 
-}	// namespace ZeroTier
+std::vector<std::string> Utils::split(const char *s,const char *const sep,const char *esc,const char *quot)
+{
+	std::vector<std::string> fields;
+	std::string buf;
+
+	if (!esc)
+		esc = "";
+	if (!quot)
+		quot = "";
+
+	bool escapeState = false;
+	char quoteState = 0;
+	while (*s) {
+		if (escapeState) {
+			escapeState = false;
+			buf.push_back(*s);
+		} else if (quoteState) {
+			if (*s == quoteState) {
+				quoteState = 0;
+				fields.push_back(buf);
+				buf.clear();
+			} else buf.push_back(*s);
+		} else {
+			const char *quotTmp;
+			if (strchr(esc,*s))
+				escapeState = true;
+			else if ((buf.size() <= 0)&&((quotTmp = strchr(quot,*s))))
+				quoteState = *quotTmp;
+			else if (strchr(sep,*s)) {
+				if (buf.size() > 0) {
+					fields.push_back(buf);
+					buf.clear();
+				} // else skip runs of seperators
+			} else buf.push_back(*s);
+		}
+		++s;
+	}
+
+	if (buf.size())
+		fields.push_back(buf);
+
+	return fields;
+}
+
+unsigned int Utils::snprintf(char *buf,unsigned int len,const char *fmt,...)
+	throw(std::length_error)
+{
+	va_list ap;
+
+	va_start(ap,fmt);
+	int n = (int)vsnprintf(buf,len,fmt,ap);
+	va_end(ap);
+
+	if ((n >= (int)len)||(n < 0)) {
+		if (len)
+			buf[len - 1] = (char)0;
+		throw std::length_error("buf[] overflow in Utils::snprintf");
+	}
+
+	return (unsigned int)n;
+}
+
+} // namespace ZeroTier
diff --git a/node/Utils.hpp b/node/Utils.hpp
index 76241ab56..3f4cc7658 100644
--- a/node/Utils.hpp
+++ b/node/Utils.hpp
@@ -1,113 +1,45 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_UTILS_HPP
 #define ZT_UTILS_HPP
 
-#include <algorithm>
-#include <map>
-#include <stdexcept>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
-#include <string>
 #include <time.h>
-#include <vector>
 
-#if defined(__FreeBSD__)
-#include <sys/endian.h>
-#endif
+#include <string>
+#include <stdexcept>
+#include <vector>
+#include <map>
 
 #include "Constants.hpp"
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define ZT_CONST_TO_BE_UINT16(x) ((uint16_t)((uint16_t)((uint16_t)(x) << 8U) | (uint16_t)((uint16_t)(x) >> 8U)))
-#define ZT_CONST_TO_BE_UINT64(x)                                                                                                                                                                                                               \
-	((((uint64_t)(x) & 0x00000000000000ffULL) << 56U) | (((uint64_t)(x) & 0x000000000000ff00ULL) << 40U) | (((uint64_t)(x) & 0x0000000000ff0000ULL) << 24U) | (((uint64_t)(x) & 0x00000000ff000000ULL) << 8U)                                  \
-	 | (((uint64_t)(x) & 0x000000ff00000000ULL) >> 8U) | (((uint64_t)(x) & 0x0000ff0000000000ULL) >> 24U) | (((uint64_t)(x) & 0x00ff000000000000ULL) >> 40U) | (((uint64_t)(x) & 0xff00000000000000ULL) >> 56U))
-#else
-#define ZT_CONST_TO_BE_UINT16(x) ((uint16_t)(x))
-#define ZT_CONST_TO_BE_UINT64(x) ((uint64_t)(x))
-#endif
-
-#define ZT_ROR64(x, r) (((x) >> (r)) | ((x) << (64 - (r))))
-#define ZT_ROL64(x, r) (((x) << (r)) | ((x) >> (64 - (r))))
-#define ZT_ROR32(x, r) (((x) >> (r)) | ((x) << (32 - (r))))
-#define ZT_ROL32(x, r) (((x) << (r)) | ((x) >> (32 - (r))))
-
 namespace ZeroTier {
 
 /**
  * Miscellaneous utility functions and global constants
  */
-class Utils {
-  public:
-	static const uint64_t ZERO256[4];
-
-#ifdef ZT_ARCH_ARM_HAS_NEON
-	struct ARMCapabilities {
-		ARMCapabilities() noexcept;
-
-		bool aes;
-		bool crc32;
-		bool pmull;
-		bool sha1;
-		bool sha2;
-	};
-	static const ARMCapabilities ARMCAP;
-#endif
-
-#ifdef ZT_ARCH_X64
-	struct CPUIDRegisters {
-		CPUIDRegisters() noexcept;
-
-		bool rdrand;
-		bool aes;
-		bool avx;
-		bool vaes;		   // implies AVX
-		bool vpclmulqdq;   // implies AVX
-		bool avx2;
-		bool avx512f;
-		bool sha;
-		bool fsrm;
-	};
-	static const CPUIDRegisters CPUID;
-#endif
-
-	/**
-	 * Compute the log2 (most significant bit set) of a 32-bit integer
-	 *
-	 * @param v Integer to compute
-	 * @return log2 or 0 if v is 0
-	 */
-	static inline unsigned int log2(uint32_t v)
-	{
-		uint32_t r = (v > 0xffff) << 4;
-		v >>= r;
-		uint32_t shift = (v > 0xff) << 3;
-		v >>= shift;
-		r |= shift;
-		shift = (v > 0xf) << 2;
-		v >>= shift;
-		r |= shift;
-		shift = (v > 0x3) << 1;
-		v >>= shift;
-		r |= shift;
-		r |= (v >> 1);
-		return (unsigned int)r;
-	}
-
+class Utils
+{
+public:
 	/**
 	 * Perform a time-invariant binary comparison
 	 *
@@ -116,205 +48,58 @@ class Utils {
 	 * @param len Length of strings
 	 * @return True if strings are equal
 	 */
-	static inline bool secureEq(const void* a, const void* b, unsigned int len)
+	static inline bool secureEq(const void *a,const void *b,unsigned int len)
+		throw()
 	{
 		uint8_t diff = 0;
-		for (unsigned int i = 0; i < len; ++i) {
-			diff |= ((reinterpret_cast<const uint8_t*>(a))[i] ^ (reinterpret_cast<const uint8_t*>(b))[i]);
-		}
+		for(unsigned int i=0;i<len;++i)
+			diff |= ( (reinterpret_cast<const uint8_t *>(a))[i] ^ (reinterpret_cast<const uint8_t *>(b))[i] );
 		return (diff == 0);
 	}
 
 	/**
 	 * Securely zero memory, avoiding compiler optimizations and such
 	 */
-	static void burn(void* ptr, unsigned int len);
+	static void burn(void *ptr,unsigned int len)
+		throw();
 
 	/**
-	 * @param n Number to convert
-	 * @param s Buffer, at least 24 bytes in size
-	 * @return String containing 'n' in base 10 form
+	 * Convert binary data to hexadecimal
+	 *
+	 * @param data Data to convert to hex
+	 * @param len Length of data
+	 * @return Hexadecimal string
 	 */
-	static char* decimal(unsigned long n, char s[24]);
+	static std::string hex(const void *data,unsigned int len);
+	static inline std::string hex(const std::string &data) { return hex(data.data(),(unsigned int)data.length()); }
 
-	static inline char* hex(uint64_t i, char s[17])
-	{
-		s[0] = HEXCHARS[(i >> 60) & 0xf];
-		s[1] = HEXCHARS[(i >> 56) & 0xf];
-		s[2] = HEXCHARS[(i >> 52) & 0xf];
-		s[3] = HEXCHARS[(i >> 48) & 0xf];
-		s[4] = HEXCHARS[(i >> 44) & 0xf];
-		s[5] = HEXCHARS[(i >> 40) & 0xf];
-		s[6] = HEXCHARS[(i >> 36) & 0xf];
-		s[7] = HEXCHARS[(i >> 32) & 0xf];
-		s[8] = HEXCHARS[(i >> 28) & 0xf];
-		s[9] = HEXCHARS[(i >> 24) & 0xf];
-		s[10] = HEXCHARS[(i >> 20) & 0xf];
-		s[11] = HEXCHARS[(i >> 16) & 0xf];
-		s[12] = HEXCHARS[(i >> 12) & 0xf];
-		s[13] = HEXCHARS[(i >> 8) & 0xf];
-		s[14] = HEXCHARS[(i >> 4) & 0xf];
-		s[15] = HEXCHARS[i & 0xf];
-		s[16] = (char)0;
-		return s;
-	}
+	/**
+	 * Convert hexadecimal to binary data
+	 *
+	 * This ignores all non-hex characters, just stepping over them and
+	 * continuing. Upper and lower case are supported for letters a-f.
+	 *
+	 * @param hex Hexadecimal ASCII code (non-hex chars are ignored, stops at zero or maxlen)
+	 * @param maxlen Maximum length of hex string buffer
+	 * @return Binary data
+	 */
+	static std::string unhex(const char *hex,unsigned int maxlen);
+	static inline std::string unhex(const std::string &hex) { return unhex(hex.c_str(),(unsigned int)hex.length()); }
 
-	static inline char* hex10(uint64_t i, char s[11])
-	{
-		s[0] = HEXCHARS[(i >> 36) & 0xf];
-		s[1] = HEXCHARS[(i >> 32) & 0xf];
-		s[2] = HEXCHARS[(i >> 28) & 0xf];
-		s[3] = HEXCHARS[(i >> 24) & 0xf];
-		s[4] = HEXCHARS[(i >> 20) & 0xf];
-		s[5] = HEXCHARS[(i >> 16) & 0xf];
-		s[6] = HEXCHARS[(i >> 12) & 0xf];
-		s[7] = HEXCHARS[(i >> 8) & 0xf];
-		s[8] = HEXCHARS[(i >> 4) & 0xf];
-		s[9] = HEXCHARS[i & 0xf];
-		s[10] = (char)0;
-		return s;
-	}
-
-	static inline char* hex(uint32_t i, char s[9])
-	{
-		s[0] = HEXCHARS[(i >> 28) & 0xf];
-		s[1] = HEXCHARS[(i >> 24) & 0xf];
-		s[2] = HEXCHARS[(i >> 20) & 0xf];
-		s[3] = HEXCHARS[(i >> 16) & 0xf];
-		s[4] = HEXCHARS[(i >> 12) & 0xf];
-		s[5] = HEXCHARS[(i >> 8) & 0xf];
-		s[6] = HEXCHARS[(i >> 4) & 0xf];
-		s[7] = HEXCHARS[i & 0xf];
-		s[8] = (char)0;
-		return s;
-	}
-
-	static inline char* hex(uint16_t i, char s[5])
-	{
-		s[0] = HEXCHARS[(i >> 12) & 0xf];
-		s[1] = HEXCHARS[(i >> 8) & 0xf];
-		s[2] = HEXCHARS[(i >> 4) & 0xf];
-		s[3] = HEXCHARS[i & 0xf];
-		s[4] = (char)0;
-		return s;
-	}
-
-	static inline char* hex(uint8_t i, char s[3])
-	{
-		s[0] = HEXCHARS[(i >> 4) & 0xf];
-		s[1] = HEXCHARS[i & 0xf];
-		s[2] = (char)0;
-		return s;
-	}
-
-	static inline char* hex(const void* d, unsigned int l, char* s)
-	{
-		char* const save = s;
-		for (unsigned int i = 0; i < l; ++i) {
-			const unsigned int b = reinterpret_cast<const uint8_t*>(d)[i];
-			*(s++) = HEXCHARS[b >> 4];
-			*(s++) = HEXCHARS[b & 0xf];
-		}
-		*s = (char)0;
-		return save;
-	}
-
-	static inline unsigned int unhex(const char* h, void* buf, unsigned int buflen)
-	{
-		unsigned int l = 0;
-		while (l < buflen) {
-			uint8_t hc = *(reinterpret_cast<const uint8_t*>(h++));
-			if (! hc) {
-				break;
-			}
-
-			uint8_t c = 0;
-			if ((hc >= 48) && (hc <= 57)) {	  // 0..9
-				c = hc - 48;
-			}
-			else if ((hc >= 97) && (hc <= 102)) {	// a..f
-				c = hc - 87;
-			}
-			else if ((hc >= 65) && (hc <= 70)) {   // A..F
-				c = hc - 55;
-			}
-
-			hc = *(reinterpret_cast<const uint8_t*>(h++));
-			if (! hc) {
-				break;
-			}
-
-			c <<= 4;
-			if ((hc >= 48) && (hc <= 57)) {
-				c |= hc - 48;
-			}
-			else if ((hc >= 97) && (hc <= 102)) {
-				c |= hc - 87;
-			}
-			else if ((hc >= 65) && (hc <= 70)) {
-				c |= hc - 55;
-			}
-
-			reinterpret_cast<uint8_t*>(buf)[l++] = c;
-		}
-		return l;
-	}
-
-	static inline unsigned int unhex(const char* h, unsigned int hlen, void* buf, unsigned int buflen)
-	{
-		unsigned int l = 0;
-		const char* hend = h + hlen;
-		while (l < buflen) {
-			if (h == hend) {
-				break;
-			}
-			uint8_t hc = *(reinterpret_cast<const uint8_t*>(h++));
-			if (! hc) {
-				break;
-			}
-
-			uint8_t c = 0;
-			if ((hc >= 48) && (hc <= 57)) {
-				c = hc - 48;
-			}
-			else if ((hc >= 97) && (hc <= 102)) {
-				c = hc - 87;
-			}
-			else if ((hc >= 65) && (hc <= 70)) {
-				c = hc - 55;
-			}
-
-			if (h == hend) {
-				break;
-			}
-			hc = *(reinterpret_cast<const uint8_t*>(h++));
-			if (! hc) {
-				break;
-			}
-
-			c <<= 4;
-			if ((hc >= 48) && (hc <= 57)) {
-				c |= hc - 48;
-			}
-			else if ((hc >= 97) && (hc <= 102)) {
-				c |= hc - 87;
-			}
-			else if ((hc >= 65) && (hc <= 70)) {
-				c |= hc - 55;
-			}
-
-			reinterpret_cast<uint8_t*>(buf)[l++] = c;
-		}
-		return l;
-	}
-
-	static inline float normalize(float value, float bigMin, float bigMax, float targetMin, float targetMax)
-	{
-		float bigSpan = bigMax - bigMin;
-		float smallSpan = targetMax - targetMin;
-		float valueScaled = (value - bigMin) / bigSpan;
-		return targetMin + valueScaled * smallSpan;
-	}
+	/**
+	 * Convert hexadecimal to binary data
+	 *
+	 * This ignores all non-hex characters, just stepping over them and
+	 * continuing. Upper and lower case are supported for letters a-f.
+	 *
+	 * @param hex Hexadecimal ASCII
+	 * @param maxlen Maximum length of hex string buffer
+	 * @param buf Buffer to fill
+	 * @param len Length of buffer
+	 * @return Number of characters actually written
+	 */
+	static unsigned int unhex(const char *hex,unsigned int maxlen,void *buf,unsigned int len);
+	static inline unsigned int unhex(const std::string &hex,void *buf,unsigned int len) { return unhex(hex.c_str(),(unsigned int)hex.length(),buf,len); }
 
 	/**
 	 * Generate secure random bytes
@@ -325,7 +110,18 @@ class Utils {
 	 * @param buf Buffer to fill
 	 * @param bytes Number of random bytes to generate
 	 */
-	static void getSecureRandom(void* buf, unsigned int bytes);
+	static void getSecureRandom(void *buf,unsigned int bytes);
+
+	/**
+	 * Split a string by delimiter, with optional escape and quote characters
+	 *
+	 * @param s String to split
+	 * @param sep One or more separators
+	 * @param esc Zero or more escape characters
+	 * @param quot Zero or more quote characters
+	 * @return Vector of tokens
+	 */
+	static std::vector<std::string> split(const char *s,const char *const sep,const char *esc,const char *quot);
 
 	/**
 	 * Tokenize a string (alias for strtok_r or strtok_s depending on platform)
@@ -334,105 +130,114 @@ class Utils {
 	 * @param delim Delimiters
 	 * @param saveptr Pointer to a char * for temporary reentrant storage
 	 */
-	static inline char* stok(char* str, const char* delim, char** saveptr)
+	static inline char *stok(char *str,const char *delim,char **saveptr)
+		throw()
 	{
 #ifdef __WINDOWS__
-		return strtok_s(str, delim, saveptr);
+		return strtok_s(str,delim,saveptr);
 #else
-		return strtok_r(str, delim, saveptr);
+		return strtok_r(str,delim,saveptr);
 #endif
 	}
 
-	static inline unsigned int strToUInt(const char* s)
+	// String to number converters -- defined here to permit portability
+	// ifdefs for platforms that lack some of the strtoXX functions.
+	static inline unsigned int strToUInt(const char *s)
+		throw()
 	{
-		return (unsigned int)strtoul(s, (char**)0, 10);
+		return (unsigned int)strtoul(s,(char **)0,10);
 	}
-	static inline int strToInt(const char* s)
+	static inline int strToInt(const char *s)
+		throw()
 	{
-		return (int)strtol(s, (char**)0, 10);
+		return (int)strtol(s,(char **)0,10);
 	}
-	static inline unsigned long strToULong(const char* s)
+	static inline unsigned long strToULong(const char *s)
+		throw()
 	{
-		return strtoul(s, (char**)0, 10);
+		return strtoul(s,(char **)0,10);
 	}
-	static inline long strToLong(const char* s)
+	static inline long strToLong(const char *s)
+		throw()
 	{
-		return strtol(s, (char**)0, 10);
+		return strtol(s,(char **)0,10);
 	}
-	static inline double strToDouble(const char* s)
-	{
-		return strtod(s, NULL);
-	}
-	static inline unsigned long long strToU64(const char* s)
+	static inline unsigned long long strToU64(const char *s)
+		throw()
 	{
 #ifdef __WINDOWS__
-		return (unsigned long long)_strtoui64(s, (char**)0, 10);
+		return (unsigned long long)_strtoui64(s,(char **)0,10);
 #else
-		return strtoull(s, (char**)0, 10);
+		return strtoull(s,(char **)0,10);
 #endif
 	}
-	static inline long long strTo64(const char* s)
+	static inline long long strTo64(const char *s)
+		throw()
 	{
 #ifdef __WINDOWS__
-		return (long long)_strtoi64(s, (char**)0, 10);
+		return (long long)_strtoi64(s,(char **)0,10);
 #else
-		return strtoll(s, (char**)0, 10);
+		return strtoll(s,(char **)0,10);
 #endif
 	}
-	static inline unsigned int hexStrToUInt(const char* s)
+	static inline unsigned int hexStrToUInt(const char *s)
+		throw()
 	{
-		return (unsigned int)strtoul(s, (char**)0, 16);
+		return (unsigned int)strtoul(s,(char **)0,16);
 	}
-	static inline int hexStrToInt(const char* s)
+	static inline int hexStrToInt(const char *s)
+		throw()
 	{
-		return (int)strtol(s, (char**)0, 16);
+		return (int)strtol(s,(char **)0,16);
 	}
-	static inline unsigned long hexStrToULong(const char* s)
+	static inline unsigned long hexStrToULong(const char *s)
+		throw()
 	{
-		return strtoul(s, (char**)0, 16);
+		return strtoul(s,(char **)0,16);
 	}
-	static inline long hexStrToLong(const char* s)
+	static inline long hexStrToLong(const char *s)
+		throw()
 	{
-		return strtol(s, (char**)0, 16);
+		return strtol(s,(char **)0,16);
 	}
-	static inline unsigned long long hexStrToU64(const char* s)
+	static inline unsigned long long hexStrToU64(const char *s)
+		throw()
 	{
 #ifdef __WINDOWS__
-		return (unsigned long long)_strtoui64(s, (char**)0, 16);
+		return (unsigned long long)_strtoui64(s,(char **)0,16);
 #else
-		return strtoull(s, (char**)0, 16);
+		return strtoull(s,(char **)0,16);
 #endif
 	}
-	static inline long long hexStrTo64(const char* s)
+	static inline long long hexStrTo64(const char *s)
+		throw()
 	{
 #ifdef __WINDOWS__
-		return (long long)_strtoi64(s, (char**)0, 16);
+		return (long long)_strtoi64(s,(char **)0,16);
 #else
-		return strtoll(s, (char**)0, 16);
+		return strtoll(s,(char **)0,16);
 #endif
 	}
+	static inline double strToDouble(const char *s)
+		throw()
+	{
+		return strtod(s,(char **)0);
+	}
 
 	/**
-	 * Perform a safe C string copy, ALWAYS null-terminating the result
+	 * Perform a safe C string copy
 	 *
-	 * This will never ever EVER result in dest[] not being null-terminated
-	 * regardless of any input parameter (other than len==0 which is invalid).
-	 *
-	 * @param dest Destination buffer (must not be NULL)
-	 * @param len Length of dest[] (if zero, false is returned and nothing happens)
-	 * @param src Source string (if NULL, dest will receive a zero-length string and true is returned)
+	 * @param dest Destination buffer
+	 * @param len Length of buffer
+	 * @param src Source string
 	 * @return True on success, false on overflow (buffer will still be 0-terminated)
 	 */
-	static inline bool scopy(char* dest, unsigned int len, const char* src)
+	static inline bool scopy(char *dest,unsigned int len,const char *src)
+		throw()
 	{
-		if (! len) {
-			return false;	// sanity check
-		}
-		if (! src) {
-			*dest = (char)0;
-			return true;
-		}
-		char* end = dest + len;
+		if (!len)
+			return false; // sanity check
+		char *end = dest + len;
 		while ((*dest++ = *src++)) {
 			if (dest == end) {
 				*(--dest) = (char)0;
@@ -442,6 +247,21 @@ class Utils {
 		return true;
 	}
 
+	/**
+	 * Variant of snprintf that is portable and throws an exception
+	 *
+	 * This just wraps the local implementation whatever it's called, while
+	 * performing a few other checks and adding exceptions for overflow.
+	 *
+	 * @param buf Buffer to write to
+	 * @param len Length of buffer in bytes
+	 * @param fmt Format string
+	 * @param ... Format arguments
+	 * @throws std::length_error buf[] too short (buf[] will still be left null-terminated)
+	 */
+	static unsigned int snprintf(char *buf,unsigned int len,const char *fmt,...)
+		throw(std::length_error);
+
 	/**
 	 * Count the number of bits set in an integer
 	 *
@@ -449,26 +269,13 @@ class Utils {
 	 * @return Number of bits set in this integer (0-32)
 	 */
 	static inline uint32_t countBits(uint32_t v)
+		throw()
 	{
 		v = v - ((v >> 1) & (uint32_t)0x55555555);
 		v = (v & (uint32_t)0x33333333) + ((v >> 2) & (uint32_t)0x33333333);
 		return ((((v + (v >> 4)) & (uint32_t)0xF0F0F0F) * (uint32_t)0x1010101) >> 24);
 	}
 
-	/**
-	 * Count the number of bits set in an integer
-	 *
-	 * @param v 64-bit integer
-	 * @return Number of bits set in this integer (0-64)
-	 */
-	static inline uint64_t countBits(uint64_t v)
-	{
-		v = v - ((v >> 1) & (uint64_t)~(uint64_t)0 / 3);
-		v = (v & (uint64_t)~(uint64_t)0 / 15 * 3) + ((v >> 2) & (uint64_t)~(uint64_t)0 / 15 * 3);
-		v = (v + (v >> 4)) & (uint64_t)~(uint64_t)0 / 255 * 15;
-		return (uint64_t)(v * ((uint64_t)~(uint64_t)0 / 255)) >> 56;
-	}
-
 	/**
 	 * Check if a memory buffer is all-zero
 	 *
@@ -476,400 +283,110 @@ class Utils {
 	 * @param len Length of memory
 	 * @return True if memory is all zero
 	 */
-	static inline bool isZero(const void* p, unsigned int len)
+	static inline bool isZero(const void *p,unsigned int len)
+		throw()
 	{
-		for (unsigned int i = 0; i < len; ++i) {
-			if (((const unsigned char*)p)[i]) {
+		for(unsigned int i=0;i<len;++i) {
+			if (((const unsigned char *)p)[i])
 				return false;
-			}
 		}
 		return true;
 	}
 
-	/**
-	 * Unconditionally swap bytes regardless of host byte order
-	 *
-	 * @param n Integer to swap
-	 * @return Integer with bytes reversed
-	 */
-	static ZT_INLINE uint64_t swapBytes(const uint64_t n) noexcept
+	// Byte swappers for big/little endian conversion
+	static inline uint8_t hton(uint8_t n) throw() { return n; }
+	static inline int8_t hton(int8_t n) throw() { return n; }
+	static inline uint16_t hton(uint16_t n) throw() { return htons(n); }
+	static inline int16_t hton(int16_t n) throw() { return (int16_t)htons((uint16_t)n); }
+	static inline uint32_t hton(uint32_t n) throw() { return htonl(n); }
+	static inline int32_t hton(int32_t n) throw() { return (int32_t)htonl((uint32_t)n); }
+	static inline uint64_t hton(uint64_t n)
+		throw()
 	{
-#ifdef __GNUC__
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#if defined(__GNUC__) && (!defined(__OpenBSD__))
 		return __builtin_bswap64(n);
 #else
-#ifdef _MSC_VER
-		return (uint64_t)_byteswap_uint64((unsigned __int64)n);
+		return (
+			((n & 0x00000000000000FFULL) << 56) |
+			((n & 0x000000000000FF00ULL) << 40) |
+			((n & 0x0000000000FF0000ULL) << 24) |
+			((n & 0x00000000FF000000ULL) <<  8) |
+			((n & 0x000000FF00000000ULL) >>  8) |
+			((n & 0x0000FF0000000000ULL) >> 24) |
+			((n & 0x00FF000000000000ULL) >> 40) |
+			((n & 0xFF00000000000000ULL) >> 56)
+		);
+#endif
+#else
+		return n;
+#endif
+	}
+	static inline int64_t hton(int64_t n) throw() { return (int64_t)hton((uint64_t)n); }
+
+	static inline uint8_t ntoh(uint8_t n) throw() { return n; }
+	static inline int8_t ntoh(int8_t n) throw() { return n; }
+	static inline uint16_t ntoh(uint16_t n) throw() { return ntohs(n); }
+	static inline int16_t ntoh(int16_t n) throw() { return (int16_t)ntohs((uint16_t)n); }
+	static inline uint32_t ntoh(uint32_t n) throw() { return ntohl(n); }
+	static inline int32_t ntoh(int32_t n) throw() { return (int32_t)ntohl((uint32_t)n); }
+	static inline uint64_t ntoh(uint64_t n)
+		throw()
+	{
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#if defined(__GNUC__) && !defined(__OpenBSD__)
+		return __builtin_bswap64(n);
 #else
 		return (
-			((n & 0x00000000000000ffULL) << 56) | ((n & 0x000000000000ff00ULL) << 40) | ((n & 0x0000000000ff0000ULL) << 24) | ((n & 0x00000000ff000000ULL) << 8) | ((n & 0x000000ff00000000ULL) >> 8) | ((n & 0x0000ff0000000000ULL) >> 24)
-			| ((n & 0x00ff000000000000ULL) >> 40) | ((n & 0xff00000000000000ULL) >> 56));
+			((n & 0x00000000000000FFULL) << 56) |
+			((n & 0x000000000000FF00ULL) << 40) |
+			((n & 0x0000000000FF0000ULL) << 24) |
+			((n & 0x00000000FF000000ULL) <<  8) |
+			((n & 0x000000FF00000000ULL) >>  8) |
+			((n & 0x0000FF0000000000ULL) >> 24) |
+			((n & 0x00FF000000000000ULL) >> 40) |
+			((n & 0xFF00000000000000ULL) >> 56)
+		);
 #endif
-#endif
-	}
-
-	/**
-	 * Unconditionally swap bytes regardless of host byte order
-	 *
-	 * @param n Integer to swap
-	 * @return Integer with bytes reversed
-	 */
-	static ZT_INLINE uint32_t swapBytes(const uint32_t n) noexcept
-	{
-#if defined(__GNUC__)
-		return __builtin_bswap32(n);
-#else
-#ifdef _MSC_VER
-		return (uint32_t)_byteswap_ulong((unsigned long)n);
-#else
-		return htonl(n);
-#endif
-#endif
-	}
-
-	/**
-	 * Unconditionally swap bytes regardless of host byte order
-	 *
-	 * @param n Integer to swap
-	 * @return Integer with bytes reversed
-	 */
-	static ZT_INLINE uint16_t swapBytes(const uint16_t n) noexcept
-	{
-#if defined(__GNUC__)
-		return __builtin_bswap16(n);
-#else
-#ifdef _MSC_VER
-		return (uint16_t)_byteswap_ushort((unsigned short)n);
-#else
-		return htons(n);
-#endif
-#endif
-	}
-
-	// These are helper adapters to load and swap integer types special cased by size
-	// to work with all typedef'd variants, signed/unsigned, etc.
-	template <typename I, unsigned int S> class _swap_bytes_bysize;
-
-	template <typename I> class _swap_bytes_bysize<I, 1> {
-	  public:
-		static ZT_INLINE I s(const I n) noexcept
-		{
-			return n;
-		}
-	};
-
-	template <typename I> class _swap_bytes_bysize<I, 2> {
-	  public:
-		static ZT_INLINE I s(const I n) noexcept
-		{
-			return (I)swapBytes((uint16_t)n);
-		}
-	};
-
-	template <typename I> class _swap_bytes_bysize<I, 4> {
-	  public:
-		static ZT_INLINE I s(const I n) noexcept
-		{
-			return (I)swapBytes((uint32_t)n);
-		}
-	};
-
-	template <typename I> class _swap_bytes_bysize<I, 8> {
-	  public:
-		static ZT_INLINE I s(const I n) noexcept
-		{
-			return (I)swapBytes((uint64_t)n);
-		}
-	};
-
-	template <typename I, unsigned int S> class _load_be_bysize;
-
-	template <typename I> class _load_be_bysize<I, 1> {
-	  public:
-		static ZT_INLINE I l(const uint8_t* const p) noexcept
-		{
-			return p[0];
-		}
-	};
-
-	template <typename I> class _load_be_bysize<I, 2> {
-	  public:
-		static ZT_INLINE I l(const uint8_t* const p) noexcept
-		{
-			return (I)(((unsigned int)p[0] << 8U) | (unsigned int)p[1]);
-		}
-	};
-
-	template <typename I> class _load_be_bysize<I, 4> {
-	  public:
-		static ZT_INLINE I l(const uint8_t* const p) noexcept
-		{
-			return (I)(((uint32_t)p[0] << 24U) | ((uint32_t)p[1] << 16U) | ((uint32_t)p[2] << 8U) | (uint32_t)p[3]);
-		}
-	};
-
-	template <typename I> class _load_be_bysize<I, 8> {
-	  public:
-		static ZT_INLINE I l(const uint8_t* const p) noexcept
-		{
-			return (I)(((uint64_t)p[0] << 56U) | ((uint64_t)p[1] << 48U) | ((uint64_t)p[2] << 40U) | ((uint64_t)p[3] << 32U) | ((uint64_t)p[4] << 24U) | ((uint64_t)p[5] << 16U) | ((uint64_t)p[6] << 8U) | (uint64_t)p[7]);
-		}
-	};
-
-	template <typename I, unsigned int S> class _load_le_bysize;
-
-	template <typename I> class _load_le_bysize<I, 1> {
-	  public:
-		static ZT_INLINE I l(const uint8_t* const p) noexcept
-		{
-			return p[0];
-		}
-	};
-
-	template <typename I> class _load_le_bysize<I, 2> {
-	  public:
-		static ZT_INLINE I l(const uint8_t* const p) noexcept
-		{
-			return (I)((unsigned int)p[0] | ((unsigned int)p[1] << 8U));
-		}
-	};
-
-	template <typename I> class _load_le_bysize<I, 4> {
-	  public:
-		static ZT_INLINE I l(const uint8_t* const p) noexcept
-		{
-			return (I)((uint32_t)p[0] | ((uint32_t)p[1] << 8U) | ((uint32_t)p[2] << 16U) | ((uint32_t)p[3] << 24U));
-		}
-	};
-
-	template <typename I> class _load_le_bysize<I, 8> {
-	  public:
-		static ZT_INLINE I l(const uint8_t* const p) noexcept
-		{
-			return (I)((uint64_t)p[0] | ((uint64_t)p[1] << 8U) | ((uint64_t)p[2] << 16U) | ((uint64_t)p[3] << 24U) | ((uint64_t)p[4] << 32U) | ((uint64_t)p[5] << 40U) | ((uint64_t)p[6] << 48U) | ((uint64_t)p[7]) << 56U);
-		}
-	};
-
-	/**
-	 * Convert any signed or unsigned integer type to big-endian ("network") byte order
-	 *
-	 * @tparam I Integer type (usually inferred)
-	 * @param n Value to convert
-	 * @return Value in big-endian order
-	 */
-	template <typename I> static ZT_INLINE I hton(const I n) noexcept
-	{
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-		return _swap_bytes_bysize<I, sizeof(I)>::s(n);
 #else
 		return n;
 #endif
 	}
+	static inline int64_t ntoh(int64_t n) throw() { return (int64_t)ntoh((uint64_t)n); }
 
 	/**
-	 * Convert any signed or unsigned integer type to host byte order from big-endian ("network") byte order
+	 * Compare Peer version tuples
 	 *
-	 * @tparam I Integer type (usually inferred)
-	 * @param n Value to convert
-	 * @return Value in host byte order
+	 * @return -1, 0, or 1 based on whether first tuple is less than, equal to, or greater than second
 	 */
-	template <typename I> static ZT_INLINE I ntoh(const I n) noexcept
+	static inline int compareVersion(unsigned int maj1,unsigned int min1,unsigned int rev1,unsigned int maj2,unsigned int min2,unsigned int rev2)
+		throw()
 	{
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-		return _swap_bytes_bysize<I, sizeof(I)>::s(n);
-#else
-		return n;
-#endif
-	}
-
-	/**
-	 * Copy bits from memory into an integer type without modifying their order
-	 *
-	 * @tparam I Type to load
-	 * @param p Byte stream, must be at least sizeof(I) in size
-	 * @return Loaded raw integer
-	 */
-	template <typename I> static ZT_INLINE I loadMachineEndian(const void* const p) noexcept
-	{
-#ifdef ZT_NO_UNALIGNED_ACCESS
-		I tmp;
-		for (int i = 0; i < (int)sizeof(I); ++i) {
-			reinterpret_cast<uint8_t*>(&tmp)[i] = reinterpret_cast<const uint8_t*>(p)[i];
+		if (maj1 > maj2)
+			return 1;
+		else if (maj1 < maj2)
+			return -1;
+		else {
+			if (min1 > min2)
+				return 1;
+			else if (min1 < min2)
+				return -1;
+			else {
+				if (rev1 > rev2)
+					return 1;
+				else if (rev1 < rev2)
+					return -1;
+				else return 0;
+			}
 		}
-		return tmp;
-#else
-		return *reinterpret_cast<const I*>(p);
-#endif
-	}
-
-	/**
-	 * Copy bits from memory into an integer type without modifying their order
-	 *
-	 * @tparam I Type to store
-	 * @param p Byte array (must be at least sizeof(I))
-	 * @param i Integer to store
-	 */
-	template <typename I> static ZT_INLINE void storeMachineEndian(void* const p, const I i) noexcept
-	{
-#ifdef ZT_NO_UNALIGNED_ACCESS
-		for (unsigned int k = 0; k < sizeof(I); ++k) {
-			reinterpret_cast<uint8_t*>(p)[k] = reinterpret_cast<const uint8_t*>(&i)[k];
-		}
-#else
-		*reinterpret_cast<I*>(p) = i;
-#endif
-	}
-
-	/**
-	 * Decode a big-endian value from a byte stream
-	 *
-	 * @tparam I Type to decode (should be unsigned e.g. uint32_t or uint64_t)
-	 * @param p Byte stream, must be at least sizeof(I) in size
-	 * @return Decoded integer
-	 */
-	template <typename I> static ZT_INLINE I loadBigEndian(const void* const p) noexcept
-	{
-#ifdef ZT_NO_UNALIGNED_ACCESS
-		return _load_be_bysize<I, sizeof(I)>::l(reinterpret_cast<const uint8_t*>(p));
-#else
-		return ntoh(*reinterpret_cast<const I*>(p));
-#endif
-	}
-
-	/**
-	 * Save an integer in big-endian format
-	 *
-	 * @tparam I Integer type to store (usually inferred)
-	 * @param p Byte stream to write (must be at least sizeof(I))
-	 * #param i Integer to write
-	 */
-	template <typename I> static ZT_INLINE void storeBigEndian(void* const p, I i) noexcept
-	{
-#ifdef ZT_NO_UNALIGNED_ACCESS
-		storeMachineEndian(p, hton(i));
-#else
-		*reinterpret_cast<I*>(p) = hton(i);
-#endif
-	}
-
-	/**
-	 * Decode a little-endian value from a byte stream
-	 *
-	 * @tparam I Type to decode
-	 * @param p Byte stream, must be at least sizeof(I) in size
-	 * @return Decoded integer
-	 */
-	template <typename I> static ZT_INLINE I loadLittleEndian(const void* const p) noexcept
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN || defined(ZT_NO_UNALIGNED_ACCESS)
-		return _load_le_bysize<I, sizeof(I)>::l(reinterpret_cast<const uint8_t*>(p));
-#else
-		return *reinterpret_cast<const I*>(p);
-#endif
-	}
-
-	/**
-	 * Save an integer in little-endian format
-	 *
-	 * @tparam I Integer type to store (usually inferred)
-	 * @param p Byte stream to write (must be at least sizeof(I))
-	 * #param i Integer to write
-	 */
-	template <typename I> static ZT_INLINE void storeLittleEndian(void* const p, const I i) noexcept
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		storeMachineEndian(p, _swap_bytes_bysize<I, sizeof(I)>::s(i));
-#else
-#ifdef ZT_NO_UNALIGNED_ACCESS
-		storeMachineEndian(p, i);
-#else
-		*reinterpret_cast<I*>(p) = i;
-#endif
-#endif
-	}
-
-	/**
-	 * Copy memory block whose size is known at compile time.
-	 *
-	 * @tparam L Size of memory
-	 * @param dest Destination memory
-	 * @param src Source memory
-	 */
-	template <unsigned long L> static ZT_INLINE void copy(void* dest, const void* src) noexcept
-	{
-#if defined(ZT_ARCH_X64) && defined(__GNUC__)
-		uintptr_t l = L;
-		__asm__ __volatile__("cld ; rep movsb" : "+c"(l), "+S"(src), "+D"(dest)::"memory");
-#else
-		memcpy(dest, src, L);
-#endif
-	}
-
-	/**
-	 * Copy memory block whose size is known at run time
-	 *
-	 * @param dest Destination memory
-	 * @param src Source memory
-	 * @param len Bytes to copy
-	 */
-	static ZT_INLINE void copy(void* dest, const void* src, unsigned long len) noexcept
-	{
-#if defined(ZT_ARCH_X64) && defined(__GNUC__)
-		__asm__ __volatile__("cld ; rep movsb" : "+c"(len), "+S"(src), "+D"(dest)::"memory");
-#else
-		memcpy(dest, src, len);
-#endif
-	}
-
-	/**
-	 * Zero memory block whose size is known at compile time
-	 *
-	 * @tparam L Size in bytes
-	 * @param dest Memory to zero
-	 */
-	template <unsigned long L> static ZT_INLINE void zero(void* dest) noexcept
-	{
-#if defined(ZT_ARCH_X64) && defined(__GNUC__)
-		uintptr_t l = L;
-		__asm__ __volatile__("cld ; rep stosb" : "+c"(l), "+D"(dest) : "a"(0) : "memory");
-#else
-		memset(dest, 0, L);
-#endif
-	}
-
-	/**
-	 * Zero memory block whose size is known at run time
-	 *
-	 * @param dest Memory to zero
-	 * @param len Size in bytes
-	 */
-	static ZT_INLINE void zero(void* dest, unsigned long len) noexcept
-	{
-#if defined(ZT_ARCH_X64) && defined(__GNUC__)
-		__asm__ __volatile__("cld ; rep stosb" : "+c"(len), "+D"(dest) : "a"(0) : "memory");
-#else
-		memset(dest, 0, len);
-#endif
 	}
 
 	/**
 	 * Hexadecimal characters 0-f
 	 */
 	static const char HEXCHARS[16];
-
-	/*
-	 * Remove `-` and `:` from a MAC address (in-place).
-	 *
-	 * @param mac The MAC address
-	 */
-	static inline void cleanMac(std::string& mac)
-	{
-		auto start = mac.begin();
-		auto end = mac.end();
-		auto new_end = std::remove_if(start, end, [](char c) { return c == 45 || c == 58; });
-		mac.erase(new_end, end);
-	}
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/node/World.hpp b/node/World.hpp
index 6806a01b9..fdada2ad2 100644
--- a/node/World.hpp
+++ b/node/World.hpp
@@ -1,27 +1,32 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_WORLD_HPP
 #define ZT_WORLD_HPP
 
-#include "Buffer.hpp"
-#include "Constants.hpp"
-#include "ECC.hpp"
-#include "Identity.hpp"
-#include "InetAddress.hpp"
-
-#include <string>
 #include <vector>
+#include <string>
+
+#include "Constants.hpp"
+#include "InetAddress.hpp"
+#include "Identity.hpp"
+#include "Buffer.hpp"
+#include "C25519.hpp"
 
 /**
  * Maximum number of roots (sanity limit, okay to increase)
@@ -41,7 +46,17 @@
 /**
  * The (more than) maximum length of a serialized World
  */
-#define ZT_WORLD_MAX_SERIALIZED_LENGTH (((1024 + (32 * ZT_WORLD_MAX_STABLE_ENDPOINTS_PER_ROOT)) * ZT_WORLD_MAX_ROOTS) + ZT_ECC_PUBLIC_KEY_SET_LEN + ZT_ECC_SIGNATURE_LEN + 128)
+#define ZT_WORLD_MAX_SERIALIZED_LENGTH (((1024 + (32 * ZT_WORLD_MAX_STABLE_ENDPOINTS_PER_ROOT)) * ZT_WORLD_MAX_ROOTS) + ZT_C25519_PUBLIC_KEY_LEN + ZT_C25519_SIGNATURE_LEN + 128)
+
+/**
+ * World ID indicating null / empty World object
+ */
+#define ZT_WORLD_ID_NULL 0
+
+/**
+ * World ID for a test network with ephemeral or temporary roots
+ */
+#define ZT_WORLD_ID_TESTNET 1
 
 /**
  * World ID for Earth
@@ -75,109 +90,68 @@ namespace ZeroTier {
  * orbits, the Moon (about 1.3 light seconds), and nearby Lagrange points. A
  * world ID for Mars and nearby space is defined but not yet used, and a test
  * world ID is provided for testing purposes.
+ *
+ * If you absolutely must run your own "unofficial" ZeroTier network, please
+ * define your world IDs above 0xffffffff (4294967295). Code to make a World
+ * is in mkworld.cpp in the parent directory and must be edited to change
+ * settings.
  */
-class World {
-  public:
-	/**
-	 * World type -- do not change IDs
-	 */
-	enum Type {
-		TYPE_NULL = 0,
-		TYPE_PLANET = 1,   // Planets, of which there is currently one (Earth)
-		TYPE_MOON = 127	   // Moons, which are user-created and many
-	};
-
-	/**
-	 * Upstream server definition in world/moon
-	 */
-	struct Root {
+class World
+{
+public:
+	struct Root
+	{
 		Identity identity;
 		std::vector<InetAddress> stableEndpoints;
 
-		inline bool operator==(const Root& r) const
-		{
-			return ((identity == r.identity) && (stableEndpoints == r.stableEndpoints));
-		}
-		inline bool operator!=(const Root& r) const
-		{
-			return (! (*this == r));
-		}
-		inline bool operator<(const Root& r) const
-		{
-			return (identity < r.identity);
-		}	// for sorting
+		inline bool operator==(const Root &r) const throw() { return ((identity == r.identity)&&(stableEndpoints == r.stableEndpoints)); }
+		inline bool operator!=(const Root &r) const throw() { return (!(*this == r)); }
+		inline bool operator<(const Root &r) const throw() { return (identity < r.identity); } // for sorting
 	};
 
 	/**
 	 * Construct an empty / null World
 	 */
-	World() : _id(0), _ts(0), _type(TYPE_NULL)
-	{
-	}
+	World() :
+		_id(ZT_WORLD_ID_NULL),
+		_ts(0) {}
 
 	/**
 	 * @return Root servers for this world and their stable endpoints
 	 */
-	inline const std::vector<World::Root>& roots() const
-	{
-		return _roots;
-	}
-
-	/**
-	 * @return World type: planet or moon
-	 */
-	inline Type type() const
-	{
-		return _type;
-	}
+	inline const std::vector<World::Root> &roots() const throw() { return _roots; }
 
 	/**
 	 * @return World unique identifier
 	 */
-	inline uint64_t id() const
-	{
-		return _id;
-	}
+	inline uint64_t id() const throw() { return _id; }
 
 	/**
 	 * @return World definition timestamp
 	 */
-	inline uint64_t timestamp() const
-	{
-		return _ts;
-	}
-
-	/**
-	 * @return C25519 signature
-	 */
-	inline const ECC::Signature& signature() const
-	{
-		return _signature;
-	}
-
-	/**
-	 * @return Public key that must sign next update
-	 */
-	inline const ECC::Public& updatesMustBeSignedBy() const
-	{
-		return _updatesMustBeSignedBy;
-	}
+	inline uint64_t timestamp() const throw() { return _ts; }
 
 	/**
 	 * Check whether a world update should replace this one
 	 *
+	 * A new world update is valid if it is for the same world ID, is newer,
+	 * and is signed by the current world's signing key. If this world object
+	 * is null, it can always be updated.
+	 *
 	 * @param update Candidate update
-	 * @return True if update is newer than current, matches its ID and type, and is properly signed (or if current is NULL)
+	 * @param fullSignatureCheck Perform full cryptographic signature check (true == yes, false == skip)
+	 * @return True if update is newer than current and is properly signed
 	 */
-	inline bool shouldBeReplacedBy(const World& update)
+	inline bool shouldBeReplacedBy(const World &update,bool fullSignatureCheck)
 	{
-		if ((_id == 0) || (_type == TYPE_NULL)) {
+		if (_id == ZT_WORLD_ID_NULL)
 			return true;
-		}
-		if ((_id == update._id) && (_ts < update._ts) && (_type == update._type)) {
-			Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> tmp;
-			update.serialize(tmp, true);
-			return ECC::verify(_updatesMustBeSignedBy, tmp.data(), tmp.size(), update._signature);
+		if ((_id == update._id)&&(_ts < update._ts)) {
+			if (fullSignatureCheck) {
+				Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> tmp;
+				update.serialize(tmp,true);
+				return C25519::verify(_updateSigningKey,tmp.data(),tmp.size(),update._signature);
+			} else return true;
 		}
 		return false;
 	}
@@ -185,140 +159,74 @@ class World {
 	/**
 	 * @return True if this World is non-empty
 	 */
-	inline operator bool() const
-	{
-		return (_type != TYPE_NULL);
-	}
+	inline operator bool() const throw() { return (_id != ZT_WORLD_ID_NULL); }
 
-	template <unsigned int C> inline void serialize(Buffer<C>& b, bool forSign = false) const
+	template<unsigned int C>
+	inline void serialize(Buffer<C> &b,bool forSign = false) const
 	{
-		if (forSign) {
+		if (forSign)
 			b.append((uint64_t)0x7f7f7f7f7f7f7f7fULL);
-		}
-
-		b.append((uint8_t)_type);
+		b.append((uint8_t)0x01); // version -- only one valid value for now
 		b.append((uint64_t)_id);
 		b.append((uint64_t)_ts);
-		b.append(_updatesMustBeSignedBy.data, ZT_ECC_PUBLIC_KEY_SET_LEN);
-		if (! forSign) {
-			b.append(_signature.data, ZT_ECC_SIGNATURE_LEN);
-		}
+		b.append(_updateSigningKey.data,ZT_C25519_PUBLIC_KEY_LEN);
+		if (!forSign)
+			b.append(_signature.data,ZT_C25519_SIGNATURE_LEN);
 		b.append((uint8_t)_roots.size());
-		for (std::vector<Root>::const_iterator r(_roots.begin()); r != _roots.end(); ++r) {
+		for(std::vector<Root>::const_iterator r(_roots.begin());r!=_roots.end();++r) {
 			r->identity.serialize(b);
 			b.append((uint8_t)r->stableEndpoints.size());
-			for (std::vector<InetAddress>::const_iterator ep(r->stableEndpoints.begin()); ep != r->stableEndpoints.end(); ++ep) {
+			for(std::vector<InetAddress>::const_iterator ep(r->stableEndpoints.begin());ep!=r->stableEndpoints.end();++ep)
 				ep->serialize(b);
-			}
 		}
-		if (_type == TYPE_MOON) {
-			b.append((uint16_t)0);	 // no attached dictionary (for future use)
-		}
-
-		if (forSign) {
+		if (forSign)
 			b.append((uint64_t)0xf7f7f7f7f7f7f7f7ULL);
-		}
 	}
 
-	template <unsigned int C> inline unsigned int deserialize(const Buffer<C>& b, unsigned int startAt = 0)
+	template<unsigned int C>
+	inline unsigned int deserialize(const Buffer<C> &b,unsigned int startAt = 0)
 	{
 		unsigned int p = startAt;
 
 		_roots.clear();
 
-		switch ((Type)b[p++]) {
-			case TYPE_NULL:	  // shouldn't ever really happen in serialized data but it's not invalid
-				_type = TYPE_NULL;
-				break;
-			case TYPE_PLANET:
-				_type = TYPE_PLANET;
-				break;
-			case TYPE_MOON:
-				_type = TYPE_MOON;
-				break;
-			default:
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_TYPE;
-		}
+		if (b[p++] != 0x01)
+			throw std::invalid_argument("invalid World serialized version");
 
-		_id = b.template at<uint64_t>(p);
-		p += 8;
-		_ts = b.template at<uint64_t>(p);
-		p += 8;
-		memcpy(_updatesMustBeSignedBy.data, b.field(p, ZT_ECC_PUBLIC_KEY_SET_LEN), ZT_ECC_PUBLIC_KEY_SET_LEN);
-		p += ZT_ECC_PUBLIC_KEY_SET_LEN;
-		memcpy(_signature.data, b.field(p, ZT_ECC_SIGNATURE_LEN), ZT_ECC_SIGNATURE_LEN);
-		p += ZT_ECC_SIGNATURE_LEN;
-		const unsigned int numRoots = (unsigned int)b[p++];
-		if (numRoots > ZT_WORLD_MAX_ROOTS) {
-			throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-		}
-		for (unsigned int k = 0; k < numRoots; ++k) {
+		_id = b.template at<uint64_t>(p); p += 8;
+		_ts = b.template at<uint64_t>(p); p += 8;
+		memcpy(_updateSigningKey.data,b.field(p,ZT_C25519_PUBLIC_KEY_LEN),ZT_C25519_PUBLIC_KEY_LEN); p += ZT_C25519_PUBLIC_KEY_LEN;
+		memcpy(_signature.data,b.field(p,ZT_C25519_SIGNATURE_LEN),ZT_C25519_SIGNATURE_LEN); p += ZT_C25519_SIGNATURE_LEN;
+		unsigned int numRoots = b[p++];
+		if (numRoots > ZT_WORLD_MAX_ROOTS)
+			throw std::invalid_argument("too many roots in World");
+		for(unsigned int k=0;k<numRoots;++k) {
 			_roots.push_back(Root());
-			Root& r = _roots.back();
-			p += r.identity.deserialize(b, p);
+			Root &r = _roots.back();
+			p += r.identity.deserialize(b,p);
 			unsigned int numStableEndpoints = b[p++];
-			if (numStableEndpoints > ZT_WORLD_MAX_STABLE_ENDPOINTS_PER_ROOT) {
-				throw ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW;
-			}
-			for (unsigned int kk = 0; kk < numStableEndpoints; ++kk) {
+			if (numStableEndpoints > ZT_WORLD_MAX_STABLE_ENDPOINTS_PER_ROOT)
+				throw std::invalid_argument("too many stable endpoints in World/Root");
+			for(unsigned int kk=0;kk<numStableEndpoints;++kk) {
 				r.stableEndpoints.push_back(InetAddress());
-				p += r.stableEndpoints.back().deserialize(b, p);
+				p += r.stableEndpoints.back().deserialize(b,p);
 			}
 		}
-		if (_type == TYPE_MOON) {
-			p += b.template at<uint16_t>(p) + 2;
-		}
 
 		return (p - startAt);
 	}
 
-	inline bool operator==(const World& w) const
-	{
-		return (
-			(_id == w._id) && (_ts == w._ts) && (memcmp(_updatesMustBeSignedBy.data, w._updatesMustBeSignedBy.data, ZT_ECC_PUBLIC_KEY_SET_LEN) == 0) && (memcmp(_signature.data, w._signature.data, ZT_ECC_SIGNATURE_LEN) == 0)
-			&& (_roots == w._roots) && (_type == w._type));
-	}
-	inline bool operator!=(const World& w) const
-	{
-		return (! (*this == w));
-	}
+	inline bool operator==(const World &w) const throw() { return ((_id == w._id)&&(_ts == w._ts)&&(_updateSigningKey == w._updateSigningKey)&&(_signature == w._signature)&&(_roots == w._roots)); }
+	inline bool operator!=(const World &w) const throw() { return (!(*this == w)); }
 
-	/**
-	 * Create a World object signed with a key pair
-	 *
-	 * @param t World type
-	 * @param id World ID
-	 * @param ts World timestamp / revision
-	 * @param sk Key that must be used to sign the next future update to this world
-	 * @param roots Roots and their stable endpoints
-	 * @param signWith Key to sign this World with (can have the same public as the next-update signing key, but doesn't have to)
-	 * @return Signed World object
-	 */
-	static inline World make(World::Type t, uint64_t id, uint64_t ts, const ECC::Public& sk, const std::vector<World::Root>& roots, const ECC::Pair& signWith)
-	{
-		World w;
-		w._id = id;
-		w._ts = ts;
-		w._type = t;
-		w._updatesMustBeSignedBy = sk;
-		w._roots = roots;
-
-		Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> tmp;
-		w.serialize(tmp, true);
-		w._signature = ECC::sign(signWith, tmp.data(), tmp.size());
-
-		return w;
-	}
-
-  protected:
+protected:
 	uint64_t _id;
 	uint64_t _ts;
-	Type _type;
-	ECC::Public _updatesMustBeSignedBy;
-	ECC::Signature _signature;
+	C25519::Public _updateSigningKey;
+	C25519::Signature _signature;
 	std::vector<Root> _roots;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/objects.mk b/objects.mk
index 238481a42..d11e2812d 100644
--- a/objects.mk
+++ b/objects.mk
@@ -1,16 +1,15 @@
-CORE_OBJS=\
-	node/AES.o \
-	node/AES_aesni.o \
-	node/AES_armcrypto.o \
-	node/ECC.o \
-	node/Capability.o \
+OBJS=\
+	ext/lz4/lz4.o \
+	ext/json-parser/json.o \
+	ext/http-parser/http_parser.o \
+	node/C25519.o \
 	node/CertificateOfMembership.o \
-	node/CertificateOfOwnership.o \
+	node/Cluster.o \
+	node/DeferredPackets.o \
+	node/Dictionary.o \
 	node/Identity.o \
 	node/IncomingPacket.o \
 	node/InetAddress.o \
-	node/Membership.o \
-	node/Metrics.o \
 	node/Multicaster.o \
 	node/Network.o \
 	node/NetworkConfig.o \
@@ -20,31 +19,14 @@ CORE_OBJS=\
 	node/Path.o \
 	node/Peer.o \
 	node/Poly1305.o \
-	node/Revocation.o \
 	node/Salsa20.o \
 	node/SelfAwareness.o \
 	node/SHA512.o \
 	node/Switch.o \
-	node/Tag.o \
 	node/Topology.o \
-	node/Trace.o \
 	node/Utils.o \
-	node/Bond.o \
-	node/PacketMultiplexer.o \
-	osdep/OSUtils.o
-
-ONE_OBJS=\
-	controller/EmbeddedNetworkController.o \
-	controller/DBMirrorSet.o \
-	controller/DB.o \
-	controller/FileDB.o \
-	controller/LFDB.o \
-	controller/CtlUtil.o \
-	controller/CV1.o \
-	controller/CV2.o \
-	osdep/EthernetTap.o \
-	osdep/ManagedRoute.o \
+	osdep/BackgroundResolver.o \
 	osdep/Http.o \
-	service/SoftwareUpdater.o \
-	service/OneService.o
-
+	osdep/OSUtils.o \
+	service/ClusterGeoIpService.o \
+	service/ControlPlane.o
diff --git a/one.cpp b/one.cpp
index e5c9042ab..f68e3cec6 100644
--- a/one.cpp
+++ b/one.cpp
@@ -1,20 +1,20 @@
 /*
- * Copyright (c)2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#include "node/ECC.hpp"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,82 +26,44 @@
 #include "node/Constants.hpp"
 
 #ifdef __WINDOWS__
-// clang-format off
-#include <winsock2.h>
-#include <windows.h>
+#include <WinSock2.h>
+#include <Windows.h>
 #include <tchar.h>
 #include <wchar.h>
 #include <lmcons.h>
 #include <newdev.h>
 #include <atlbase.h>
-#include <iphlpapi.h>
-#include <iomanip>
-#include <shlobj.h>
 #include "osdep/WindowsEthernetTap.hpp"
 #include "windows/ZeroTierOne/ServiceInstaller.h"
 #include "windows/ZeroTierOne/ServiceBase.h"
 #include "windows/ZeroTierOne/ZeroTierOneService.h"
-// clang-format on
 #else
 #include <unistd.h>
 #include <pwd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/uio.h>
-#include <dirent.h>
 #include <signal.h>
-#ifdef __LINUX__
-#include <sys/prctl.h>
-#include <sys/syscall.h>
-#include <sys/wait.h>
-#include <net/if.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-#include <sys/ioctl.h>
-#include "osdep/ExtOsdep.hpp"
-#ifndef ZT_NO_CAPABILITIES
-#include <linux/capability.h>
-#include <linux/securebits.h>
-#endif
-#endif
 #endif
 
 #include <string>
 #include <stdexcept>
-#include <iostream>
-#include <sstream>
-#include <algorithm>
 
 #include "version.h"
 #include "include/ZeroTierOne.h"
 
+#include "ext/json-parser/json.h"
+
 #include "node/Identity.hpp"
 #include "node/CertificateOfMembership.hpp"
 #include "node/Utils.hpp"
 #include "node/NetworkController.hpp"
-#include "node/Buffer.hpp"
-#include "node/World.hpp"
 
 #include "osdep/OSUtils.hpp"
 #include "osdep/Http.hpp"
-#include "osdep/Thread.hpp"
-
-#include "node/Bond.hpp"
 
 #include "service/OneService.hpp"
 
-#include <nlohmann/json.hpp>
-
-#ifdef __APPLE__
-#include <SystemConfiguration/SystemConfiguration.h>
-#include <CoreServices/CoreServices.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-#endif
-
 #define ZT_PID_PATH "zerotier-one.pid"
 
 using namespace ZeroTier;
@@ -109,52 +71,41 @@ using namespace ZeroTier;
 static OneService *volatile zt1Service = (OneService *)0;
 
 #define PROGRAM_NAME "ZeroTier One"
-#define COPYRIGHT_NOTICE "Copyright (c) 2020 ZeroTier, Inc."
-#define LICENSE_GRANT "Licensed under the ZeroTier BSL 1.1 (see LICENSE.txt)"
+#define COPYRIGHT_NOTICE "Copyright © 2011–2016 ZeroTier, Inc."
+#define LICENSE_GRANT \
+	"This is free software: you may copy, modify, and/or distribute this" ZT_EOL_S \
+	"work under the terms of the GNU General Public License, version 3 or" ZT_EOL_S \
+	"later as published by the Free Software Foundation." ZT_EOL_S \
+	"No warranty expressed or implied." ZT_EOL_S
 
 /****************************************************************************/
 /* zerotier-cli personality                                                 */
 /****************************************************************************/
 
-// This is getting deprecated soon in favor of the stuff in cli/
-
 static void cliPrintHelp(const char *pn,FILE *out)
 {
 	fprintf(out,
-		"%s version %d.%d.%d build %d (platform %d arch %d)" ZT_EOL_S,
+		"%s version %d.%d.%d" ZT_EOL_S,
 		PROGRAM_NAME,
-		ZEROTIER_ONE_VERSION_MAJOR, ZEROTIER_ONE_VERSION_MINOR, ZEROTIER_ONE_VERSION_REVISION, ZEROTIER_ONE_VERSION_BUILD,
-		ZT_BUILD_PLATFORM, ZT_BUILD_ARCHITECTURE);
+		ZEROTIER_ONE_VERSION_MAJOR, ZEROTIER_ONE_VERSION_MINOR, ZEROTIER_ONE_VERSION_REVISION);
 	fprintf(out,
 		COPYRIGHT_NOTICE ZT_EOL_S
 		LICENSE_GRANT ZT_EOL_S);
-	fprintf(out,"Usage: %s [-switches] <command/path> [<args>]" ZT_EOL_S"" ZT_EOL_S,pn);
-	fprintf(out,"Available switches:" ZT_EOL_S);
-	fprintf(out,"  -h                      - Display this help" ZT_EOL_S);
-	fprintf(out,"  -v                      - Show version" ZT_EOL_S);
-	fprintf(out,"  -j                      - Display full raw JSON output" ZT_EOL_S);
-	fprintf(out,"  -D<path>                - ZeroTier home path for parameter auto-detect" ZT_EOL_S);
-	fprintf(out,"  -p<port>                - HTTP port (default: auto)" ZT_EOL_S);
-	fprintf(out,"  -T<token>               - Authentication token (default: auto)" ZT_EOL_S);
-	fprintf(out,ZT_EOL_S"Available commands:" ZT_EOL_S);
-	fprintf(out,"  info                    - Display status info" ZT_EOL_S);
-	fprintf(out,"  listpeers               - List all peers" ZT_EOL_S);
-	fprintf(out,"  peers                   - List all peers (prettier)" ZT_EOL_S);
-	fprintf(out,"  listnetworks            - List all networks" ZT_EOL_S);
-	fprintf(out,"  join <network ID>          - Join a network" ZT_EOL_S);
-	fprintf(out,"  leave <network ID>         - Leave a network" ZT_EOL_S);
-	fprintf(out,"  set <network ID> <setting> - Set a network setting" ZT_EOL_S);
-	fprintf(out,"  get <network ID> <setting> - Get a network setting" ZT_EOL_S);
-	fprintf(out,"  listmoons               - List moons (federated root sets)" ZT_EOL_S);
-	fprintf(out,"  orbit <world ID> <seed> - Join a moon via any member root" ZT_EOL_S);
-	fprintf(out,"  deorbit <world ID>      - Leave a moon" ZT_EOL_S);
-	fprintf(out,"  dump                    - Debug settings dump for support" ZT_EOL_S);
-	fprintf(out,ZT_EOL_S"Available settings:" ZT_EOL_S);
-	fprintf(out,"  Settings to use with [get/set] may include property names from " ZT_EOL_S);
-	fprintf(out,"  the JSON output of \"zerotier-cli -j listnetworks\". Additionally, " ZT_EOL_S);
-	fprintf(out,"  (ip, ip4, ip6, ip6plane, and ip6prefix can be used). For instance:" ZT_EOL_S);
-	fprintf(out,"  zerotier-cli get <network ID> ip6plane will return the 6PLANE address" ZT_EOL_S);
-	fprintf(out,"  assigned to this node." ZT_EOL_S);
+	fprintf(out,"Usage: %s [-switches] <command/path> [<args>]"ZT_EOL_S""ZT_EOL_S,pn);
+	fprintf(out,"Available switches:"ZT_EOL_S);
+	fprintf(out,"  -h                 - Display this help"ZT_EOL_S);
+	fprintf(out,"  -v                 - Show version"ZT_EOL_S);
+	fprintf(out,"  -j                 - Display full raw JSON output"ZT_EOL_S);
+	fprintf(out,"  -D<path>           - ZeroTier home path for parameter auto-detect"ZT_EOL_S);
+	fprintf(out,"  -p<port>           - HTTP port (default: auto)"ZT_EOL_S);
+	fprintf(out,"  -T<token>          - Authentication token (default: auto)"ZT_EOL_S);
+	//fprintf(out,"  -H<ip>             - HTTP server bind address (default: 127.0.0.1)"ZT_EOL_S);
+	fprintf(out,ZT_EOL_S"Available commands:"ZT_EOL_S);
+	fprintf(out,"  info               - Display status info"ZT_EOL_S);
+	fprintf(out,"  listpeers          - List all peers"ZT_EOL_S);
+	fprintf(out,"  listnetworks       - List all networks"ZT_EOL_S);
+	fprintf(out,"  join <network>     - Join a network"ZT_EOL_S);
+	fprintf(out,"  leave <network>    - Leave a network"ZT_EOL_S);
 }
 
 static std::string cliFixJsonCRs(const std::string &s)
@@ -175,7 +126,10 @@ static int cli(int argc,char **argv)
 #endif
 {
 	unsigned int port = 0;
-	std::string homeDir,command,arg1,arg2,arg3,arg4,authToken;
+	std::string homeDir;
+	std::string command;
+	std::string arg1;
+	std::string authToken;
 	std::string ip("127.0.0.1");
 	bool json = false;
 	for(int i=1;i<argc;++i) {
@@ -237,7 +191,7 @@ static int cli(int argc,char **argv)
 						cliPrintHelp(argv[0],stdout);
 						return 1;
 					}
-					printf("%d.%d.%d" ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION);
+					printf("%d.%d.%d"ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION);
 					return 0;
 
 				case 'h':
@@ -247,9 +201,7 @@ static int cli(int argc,char **argv)
 					return 0;
 			}
 		} else {
-			if (arg1.length())
-				arg2 = argv[i];
-			else if (command.length())
+			if (command.length())
 				arg1 = argv[i];
 			else command = argv[i];
 		}
@@ -257,10 +209,9 @@ static int cli(int argc,char **argv)
 	if (!homeDir.length())
 		homeDir = OneService::platformDefaultHomePath();
 
-	// TODO: cleanup this logic
 	if ((!port)||(!authToken.length())) {
 		if (!homeDir.length()) {
-			fprintf(stderr,"%s: missing port or authentication token and no home directory specified to auto-detect" ZT_EOL_S,argv[0]);
+			fprintf(stderr,"%s: missing port or authentication token and no home directory specified to auto-detect"ZT_EOL_S,argv[0]);
 			return 2;
 		}
 
@@ -269,7 +220,7 @@ static int cli(int argc,char **argv)
 			OSUtils::readFile((homeDir + ZT_PATH_SEPARATOR_S + "zerotier-one.port").c_str(),portStr);
 			port = Utils::strToUInt(portStr.c_str());
 			if ((port == 0)||(port > 0xffff)) {
-				fprintf(stderr,"%s: missing port and zerotier-one.port not found in %s" ZT_EOL_S,argv[0],homeDir.c_str());
+				fprintf(stderr,"%s: missing port and zerotier-one.port not found in %s"ZT_EOL_S,argv[0],homeDir.c_str());
 				return 2;
 			}
 		}
@@ -282,16 +233,16 @@ static int cli(int argc,char **argv)
 				if (hd) {
 					char p[4096];
 #ifdef __APPLE__
-					OSUtils::ztsnprintf(p,sizeof(p),"%s/Library/Application Support/ZeroTier/One/authtoken.secret",hd);
+					Utils::snprintf(p,sizeof(p),"%s/Library/Application Support/ZeroTier/One/authtoken.secret",hd);
 #else
-					OSUtils::ztsnprintf(p,sizeof(p),"%s/.zeroTierOneAuthToken",hd);
+					Utils::snprintf(p,sizeof(p),"%s/.zeroTierOneAuthToken",hd);
 #endif
 					OSUtils::readFile(p,authToken);
 				}
 			}
 #endif
 			if (!authToken.length()) {
-				fprintf(stderr,"%s: authtoken.secret not found or readable in %s (try again as root)" ZT_EOL_S,argv[0],homeDir.c_str());
+				fprintf(stderr,"%s: missing authentication token and authtoken.secret not found (or readable) in %s"ZT_EOL_S,argv[0],homeDir.c_str());
 				return 2;
 			}
 		}
@@ -300,7 +251,7 @@ static int cli(int argc,char **argv)
 	InetAddress addr;
 	{
 		char addrtmp[256];
-		OSUtils::ztsnprintf(addrtmp,sizeof(addrtmp),"%s/%u",ip.c_str(),port);
+		Utils::snprintf(addrtmp,sizeof(addrtmp),"%s/%u",ip.c_str(),port);
 		addr = InetAddress(addrtmp);
 	}
 
@@ -320,527 +271,235 @@ static int cli(int argc,char **argv)
 			responseHeaders,
 			responseBody);
 		if (scode == 200) {
-			printf("%s", cliFixJsonCRs(responseBody).c_str());
+			printf("%s",cliFixJsonCRs(responseBody).c_str());
 			return 0;
 		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
+			printf("%u %s %s"ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
 			return 1;
 		}
 	} else if ((command == "info")||(command == "status")) {
-		const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/status",requestHeaders,responseHeaders,responseBody);
-
-		if (scode == 0) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-
-		nlohmann::json j;
-		try {
-			j = OSUtils::jsonParse(responseBody);
-		} catch (std::exception &exc) {
-			printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-			return 1;
-		} catch ( ... ) {
-			printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-			return 1;
-		}
-
+		unsigned int scode = Http::GET(
+			1024 * 1024 * 16,
+			60000,
+			(const struct sockaddr *)&addr,
+			"/status",
+			requestHeaders,
+			responseHeaders,
+			responseBody);
 		if (scode == 200) {
 			if (json) {
-				printf("%s" ZT_EOL_S,OSUtils::jsonDump(j).c_str());
+				printf("%s",cliFixJsonCRs(responseBody).c_str());
+				return 0;
 			} else {
-				if (j.is_object()) {
-					printf("200 info %s %s %s" ZT_EOL_S,
-						OSUtils::jsonString(j["address"],"-").c_str(),
-						OSUtils::jsonString(j["version"],"-").c_str(),
-						((j["tcpFallbackActive"]) ? "TUNNELED" : ((j["online"]) ? "ONLINE" : "OFFLINE")));
+				json_value *j = json_parse(responseBody.c_str(),responseBody.length());
+				bool good = false;
+				if (j) {
+					if (j->type == json_object) {
+						const char *address = (const char *)0;
+						bool online = false;
+						const char *version = (const char *)0;
+						for(unsigned int k=0;k<j->u.object.length;++k) {
+							if ((!strcmp(j->u.object.values[k].name,"address"))&&(j->u.object.values[k].value->type == json_string))
+								address = j->u.object.values[k].value->u.string.ptr;
+							else if ((!strcmp(j->u.object.values[k].name,"version"))&&(j->u.object.values[k].value->type == json_string))
+								version = j->u.object.values[k].value->u.string.ptr;
+							else if ((!strcmp(j->u.object.values[k].name,"online"))&&(j->u.object.values[k].value->type == json_boolean))
+								online = (j->u.object.values[k].value->u.boolean != 0);
+						}
+						if ((address)&&(version)) {
+							printf("200 info %s %s %s"ZT_EOL_S,address,(online ? "ONLINE" : "OFFLINE"),version);
+							good = true;
+						}
+					}
+					json_value_free(j);
+				}
+				if (good) {
+					return 0;
+				} else {
+					printf("%u %s invalid JSON response"ZT_EOL_S,scode,command.c_str());
+					return 1;
 				}
 			}
-			return 0;
 		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
+			printf("%u %s %s"ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
 			return 1;
 		}
 	} else if (command == "listpeers") {
-		const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/peer",requestHeaders,responseHeaders,responseBody);
-
-		if (scode == 0) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-
-		nlohmann::json j;
-		try {
-			j = OSUtils::jsonParse(responseBody);
-		} catch (std::exception &exc) {
-			printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-			return 1;
-		} catch ( ... ) {
-			printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-			return 1;
-		}
-
+		unsigned int scode = Http::GET(
+			1024 * 1024 * 16,
+			60000,
+			(const struct sockaddr *)&addr,
+			"/peer",
+			requestHeaders,
+			responseHeaders,
+			responseBody);
 		if (scode == 200) {
 			if (json) {
-				printf("%s" ZT_EOL_S,OSUtils::jsonDump(j).c_str());
+				printf("%s",cliFixJsonCRs(responseBody).c_str());
+				return 0;
 			} else {
-				printf("200 listpeers <ztaddr> <path> <latency> <version> <role>" ZT_EOL_S);
-				if (j.is_array()) {
-					for(unsigned long k=0;k<j.size();++k) {
-						nlohmann::json &p = j[k];
-						std::string bestPath;
-						nlohmann::json &paths = p["paths"];
-						if (paths.is_array()) {
-							for(unsigned long i=0;i<paths.size();++i) {
-								nlohmann::json &path = paths[i];
-								if (path["preferred"]) {
-									char tmp[256];
-									std::string addr = path["address"];
-									const int64_t now = OSUtils::now();
-									int64_t lastSendDiff = (uint64_t)path["lastSend"] ? now - (uint64_t)path["lastSend"] : -1;
-									int64_t lastReceiveDiff = (uint64_t)path["lastReceive"] ? now - (uint64_t)path["lastReceive"] : -1;
-									OSUtils::ztsnprintf(tmp,sizeof(tmp),"%s;%lld;%lld",addr.c_str(),lastSendDiff,lastReceiveDiff);
-									bestPath = tmp;
-									break;
-								}
-							}
-						}
-						if (bestPath.length() == 0) bestPath = "-";
-						char ver[128];
-						int64_t vmaj = p["versionMajor"];
-						int64_t vmin = p["versionMinor"];
-						int64_t vrev = p["versionRev"];
-						if (vmaj >= 0) {
-							OSUtils::ztsnprintf(ver,sizeof(ver),"%lld.%lld.%lld",vmaj,vmin,vrev);
-						} else {
-							ver[0] = '-';
-							ver[1] = (char)0;
-						}
-						printf("200 listpeers %s %s %d %s %s" ZT_EOL_S,
-							OSUtils::jsonString(p["address"],"-").c_str(),
-							bestPath.c_str(),
-							(int)OSUtils::jsonInt(p["latency"],0),
-							ver,
-							OSUtils::jsonString(p["role"],"-").c_str());
-					}
-				}
-			}
-			return 0;
-		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-			return 1;
-		}
-	} else if (command == "peers") {
-		const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/peer",requestHeaders,responseHeaders,responseBody);
-
-		if (scode == 0) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-
-		nlohmann::json j;
-		try {
-			j = OSUtils::jsonParse(responseBody);
-		} catch (std::exception &exc) {
-			printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-			return 1;
-		} catch ( ... ) {
-			printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-			return 1;
-		}
-
-		if (scode == 200) {
-			if (json) {
-				printf("%s" ZT_EOL_S,OSUtils::jsonDump(j).c_str());
-			} else {
-				bool anyTunneled = false;
-				printf("200 peers\n<ztaddr>   <ver>  <role> <lat> <link>   <lastTX> <lastRX> <path>" ZT_EOL_S);
-				if (j.is_array()) {
-					for(unsigned long k=0;k<j.size();++k) {
-						nlohmann::json &p = j[k];
-						std::string bestPath;
-						nlohmann::json &paths = p["paths"];
-						if (p["tunneled"]) {
-							anyTunneled = true;
-						}
-						if (paths.is_array()) {
-							for(unsigned long i=0;i<paths.size();++i) {
-								nlohmann::json &path = paths[i];
-								if (path["preferred"]) {
-									char tmp[256];
-									std::string addr = path["address"];
-									const int64_t now = OSUtils::now();
-									int64_t lastSendDiff = (uint64_t)path["lastSend"] ? now - (uint64_t)path["lastSend"] : -1;
-									int64_t lastReceiveDiff = (uint64_t)path["lastReceive"] ? now - (uint64_t)path["lastReceive"] : -1;
-									OSUtils::ztsnprintf(tmp,sizeof(tmp),"%-8lld %-8lld %s",lastSendDiff,lastReceiveDiff,addr.c_str());
-									if (p["tunneled"]) {
-										bestPath = std::string("RELAY ") + tmp;
+				printf("200 listpeers <ztaddr> <paths> <latency> <version> <role>"ZT_EOL_S);
+				json_value *j = json_parse(responseBody.c_str(),responseBody.length());
+				if (j) {
+					if (j->type == json_array) {
+						for(unsigned int p=0;p<j->u.array.length;++p) {
+							json_value *jp = j->u.array.values[p];
+							if (jp->type == json_object) {
+								const char *address = (const char *)0;
+								std::string paths;
+								int64_t latency = 0;
+								int64_t versionMajor = -1,versionMinor = -1,versionRev = -1;
+								const char *role = (const char *)0;
+								for(unsigned int k=0;k<jp->u.object.length;++k) {
+									if ((!strcmp(jp->u.object.values[k].name,"address"))&&(jp->u.object.values[k].value->type == json_string))
+										address = jp->u.object.values[k].value->u.string.ptr;
+									else if ((!strcmp(jp->u.object.values[k].name,"versionMajor"))&&(jp->u.object.values[k].value->type == json_integer))
+										versionMajor = jp->u.object.values[k].value->u.integer;
+									else if ((!strcmp(jp->u.object.values[k].name,"versionMinor"))&&(jp->u.object.values[k].value->type == json_integer))
+										versionMinor = jp->u.object.values[k].value->u.integer;
+									else if ((!strcmp(jp->u.object.values[k].name,"versionRev"))&&(jp->u.object.values[k].value->type == json_integer))
+										versionRev = jp->u.object.values[k].value->u.integer;
+									else if ((!strcmp(jp->u.object.values[k].name,"role"))&&(jp->u.object.values[k].value->type == json_string))
+										role = jp->u.object.values[k].value->u.string.ptr;
+									else if ((!strcmp(jp->u.object.values[k].name,"latency"))&&(jp->u.object.values[k].value->type == json_integer))
+										latency = jp->u.object.values[k].value->u.integer;
+									else if ((!strcmp(jp->u.object.values[k].name,"paths"))&&(jp->u.object.values[k].value->type == json_array)) {
+										for(unsigned int pp=0;pp<jp->u.object.values[k].value->u.array.length;++pp) {
+											json_value *jpath = jp->u.object.values[k].value->u.array.values[pp];
+											if (jpath->type == json_object) {
+												const char *paddr = (const char *)0;
+												int64_t lastSend = 0;
+												int64_t lastReceive = 0;
+												bool preferred = false;
+												bool active = false;
+												for(unsigned int kk=0;kk<jpath->u.object.length;++kk) {
+													if ((!strcmp(jpath->u.object.values[kk].name,"address"))&&(jpath->u.object.values[kk].value->type == json_string))
+														paddr = jpath->u.object.values[kk].value->u.string.ptr;
+													else if ((!strcmp(jpath->u.object.values[kk].name,"lastSend"))&&(jpath->u.object.values[kk].value->type == json_integer))
+														lastSend = jpath->u.object.values[kk].value->u.integer;
+													else if ((!strcmp(jpath->u.object.values[kk].name,"lastReceive"))&&(jpath->u.object.values[kk].value->type == json_integer))
+														lastReceive = jpath->u.object.values[kk].value->u.integer;
+													else if ((!strcmp(jpath->u.object.values[kk].name,"preferred"))&&(jpath->u.object.values[kk].value->type == json_boolean))
+														preferred = (jpath->u.object.values[kk].value->u.boolean != 0);
+													else if ((!strcmp(jpath->u.object.values[kk].name,"active"))&&(jpath->u.object.values[kk].value->type == json_boolean))
+														active = (jpath->u.object.values[kk].value->u.boolean != 0);
+												}
+												if ((paddr)&&(active)) {
+													int64_t now = (int64_t)OSUtils::now();
+													if (lastSend > 0)
+														lastSend = now - lastSend;
+													if (lastReceive > 0)
+														lastReceive = now - lastReceive;
+													char pathtmp[256];
+													Utils::snprintf(pathtmp,sizeof(pathtmp),"%s;%lld;%lld;%s",
+														paddr,
+														lastSend,
+														lastReceive,
+														(preferred ? "preferred" : "active"));
+													if (paths.length())
+														paths.push_back(',');
+													paths.append(pathtmp);
+												}
+											}
+										}
 									}
+								}
+								if ((address)&&(role)) {
+									char verstr[64];
+									if ((versionMajor >= 0)&&(versionMinor >= 0)&&(versionRev >= 0))
+										Utils::snprintf(verstr,sizeof(verstr),"%lld.%lld.%lld",versionMajor,versionMinor,versionRev);
 									else {
-										bestPath = std::string("DIRECT   ") + tmp;
+										verstr[0] = '-';
+										verstr[1] = (char)0;
 									}
-									break;
+									printf("200 listpeers %s %s %lld %s %s"ZT_EOL_S,address,(paths.length()) ? paths.c_str() : "-",(long long)latency,verstr,role);
 								}
 							}
 						}
-						if (bestPath.length() == 0) {
-							bestPath = "RELAY";
-						}
-						char ver[128];
-						int64_t vmaj = p["versionMajor"];
-						int64_t vmin = p["versionMinor"];
-						int64_t vrev = p["versionRev"];
-						if (vmaj >= 0) {
-							OSUtils::ztsnprintf(ver,sizeof(ver),"%lld.%lld.%lld",vmaj,vmin,vrev);
-						} else {
-							ver[0] = '-';
-							ver[1] = (char)0;
-						}
-						printf("%s %-6s %-6s %5d %s" ZT_EOL_S,
-							OSUtils::jsonString(p["address"],"-").c_str(),
-							ver,
-							OSUtils::jsonString(p["role"],"-").c_str(),
-							(int)OSUtils::jsonInt(p["latency"],0),
-							bestPath.c_str());
 					}
+					json_value_free(j);
 				}
-				if (anyTunneled) {
-					printf("NOTE: Currently tunneling through a TCP relay. Ensure that UDP is not blocked.\n");
-				}
+				return 0;
 			}
-			return 0;
 		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-			return 1;
-		}
-	} else if (command == "bond") {
-		/* zerotier-cli bond <cmd> */
-		if (arg1.empty()) {
-			printf("(bond) command is missing required arguments" ZT_EOL_S);
-			return 2;
-		}
-		/* zerotier-cli bond list */
-		if (arg1 == "list") {
-			const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/peer",requestHeaders,responseHeaders,responseBody);
-			if (scode == 0) {
-				printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-				return 1;
-			}
-			nlohmann::json j;
-			try {
-				j = OSUtils::jsonParse(responseBody);
-			} catch (std::exception &exc) {
-				printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-				return 1;
-			} catch ( ... ) {
-				printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-				return 1;
-			}
-			if (scode == 200) {
-				if (json) {
-					printf("%s" ZT_EOL_S,OSUtils::jsonDump(j).c_str());
-				} else {
-					bool bFoundBond = false;
-					printf("    <peer>                        <bondtype>     <links>" ZT_EOL_S);
-					if (j.is_array()) {
-						for(unsigned long k=0;k<j.size();++k) {
-							nlohmann::json &p = j[k];
-							bool isBonded = p["isBonded"];
-							if (isBonded) {
-								int8_t bondingPolicyCode = p["bondingPolicyCode"];
-								int8_t numAliveLinks = p["numAliveLinks"];
-								int8_t numTotalLinks = p["numTotalLinks"];
-								bFoundBond = true;
-								std::string policyStr = "none";
-								if (bondingPolicyCode >= ZT_BOND_POLICY_NONE && bondingPolicyCode <= ZT_BOND_POLICY_BALANCE_AWARE) {
-									policyStr = Bond::getPolicyStrByCode(bondingPolicyCode);
-								}
-								printf("%10s  %32s         %d/%d" ZT_EOL_S,
-									OSUtils::jsonString(p ["address"],"-").c_str(),
-									policyStr.c_str(),
-									numAliveLinks,
-									numTotalLinks);
-							}
-						}
-					}
-					if (!bFoundBond) {
-						printf("      NONE\t\t\t\tNONE\t    NONE       NONE" ZT_EOL_S);
-					}
-				}
-				return 0;
-			} else {
-				printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-				return 1;
-			}
-		}
-		else if (arg1 == "setmtu") { /* zerotier-cli bond setmtu <mtu> <iface> <ip> */
-			requestHeaders["Content-Type"] = "application/json";
-			requestHeaders["Content-Length"] = "2";
-			if (argc == 8) {
-				arg2 = argv[5];
-				arg3 = argv[6];
-				arg4 = argv[7];
-			}
-			unsigned int scode = Http::POST(
-				1024 * 1024 * 16,
-				60000,
-				(const struct sockaddr *)&addr,
-				(std::string("/bond/") + arg1 + "/" + arg2 + "/" + arg3 + "/" + arg4).c_str(),
-				requestHeaders,
-				"{}",
-				2,
-				responseHeaders,
-				responseBody);
-			if (scode == 200) {
-				printf("200 setmtu OK" ZT_EOL_S);
-				return 0;
-			} else {
-				printf("%d Failed to set MTU: %s" ZT_EOL_S, scode, responseBody.c_str());
-				return 1;
-			}
-			return 0;
-		}
-		else if (arg1.length() == 10) {
-			if (arg2 == "rotate") { /* zerotier-cli bond <peerId> rotate */
-				requestHeaders["Content-Type"] = "application/json";
-				requestHeaders["Content-Length"] = "2";
-				unsigned int scode = Http::POST(
-					1024 * 1024 * 16,
-					60000,
-					(const struct sockaddr *)&addr,
-					(std::string("/bond/") + arg2 + "/" + arg1).c_str(),
-					requestHeaders,
-					"{}",
-					2,
-					responseHeaders,
-					responseBody);
-				if (scode == 200) {
-					if (json) {
-						printf("%s",cliFixJsonCRs(responseBody).c_str());
-					} else {
-						printf("200 rotate OK" ZT_EOL_S);
-					}
-					return 0;
-				} else {
-					printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-					return 1;
-				}
-				return 0;
-			}
-			if (arg2 == "show") {
-				//fprintf(stderr, "zerotier-cli bond <peerId> show\n");
-				const unsigned int scode = Http::GET(
-					1024 * 1024 * 16,60000,
-					(const struct sockaddr *)&addr,(std::string("/bond/") + arg2 + "/" + arg1).c_str(),
-					requestHeaders,
-					responseHeaders,
-					responseBody);
-				if (scode == 0) {
-					printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-					return 1;
-				}
-				nlohmann::json j;
-				try {
-					j = OSUtils::jsonParse(responseBody);
-				} catch (std::exception &exc) {
-					printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-					return 1;
-				} catch ( ... ) {
-					printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-					return 1;
-				}
-				if (scode == 200) {
-					if (json) {
-						printf("%s" ZT_EOL_S,OSUtils::jsonDump(j).c_str());
-					} else {
-						int numAliveLinks = OSUtils::jsonInt(j["numAliveLinks"],0);
-						int numTotalLinks = OSUtils::jsonInt(j["numTotalLinks"],0);
-						printf("Peer                   : %s\n", arg1.c_str());
-						printf("Bond                   : %s\n", OSUtils::jsonString(j["bondingPolicyStr"],"-").c_str());
-						printf("Link Select Method     : %d\n", (int)OSUtils::jsonInt(j["linkSelectMethod"],0));
-						printf("Links                  : %d/%d\n", numAliveLinks, numTotalLinks);
-						printf("Failover Interval (ms) : %d\n", (int)OSUtils::jsonInt(j["failoverInterval"],0));
-						printf("Up Delay (ms)          : %d\n", (int)OSUtils::jsonInt(j["upDelay"],0));
-						printf("Down Delay (ms)        : %d\n", (int)OSUtils::jsonInt(j["downDelay"],0));
-						printf("Packets Per Link       : %d\n", (int)OSUtils::jsonInt(j["packetsPerLink"],0));
-						nlohmann::json &p = j["paths"];
-						if (p.is_array()) {
-							printf("\nidx"
-							"                  interface"
-							"                                  "
-							"path               socket             local port\n");
-							for(int i=0; i<120; i++) { printf("-"); }
-							printf("\n");
-							for (int i=0; i<p.size(); i++)
-							{
-								printf("%2d: %26s %51s %.16llx %12d\n",
-									i,
-									OSUtils::jsonString(p[i]["ifname"],"-").c_str(),
-									OSUtils::jsonString(p[i]["address"],"-").c_str(),
-									(unsigned long long)OSUtils::jsonInt(p[i]["localSocket"],0),
-									(uint16_t)OSUtils::jsonInt(p[i]["localPort"],0)
-									);
-							}
-							printf("\nidx     lat      pdv    "
-							"capacity    qual      "
-							"rx_age      tx_age  eligible  bonded   flows\n");
-							for(int i=0; i<120; i++) { printf("-"); }
-							printf("\n");
-							for (int i=0; i<p.size(); i++)
-							{
-								printf("%2d: %8.2f %8.2f %10d %7.4f %11d %11d %9d %7d %7d\n",
-									i,
-									OSUtils::jsonDouble(p[i]["latencyMean"], 0),
-									OSUtils::jsonDouble(p[i]["latencyVariance"], 0),
-									(int)OSUtils::jsonInt(p[i]["givenLinkSpeed"], 0),
-									OSUtils::jsonDouble(p[i]["relativeQuality"], 0),
-									(int)OSUtils::jsonInt(p[i]["lastInAge"], 0),
-									(int)OSUtils::jsonInt(p[i]["lastOutAge"], 0),
-									(int)OSUtils::jsonInt(p[i]["eligible"],0),
-									(int)OSUtils::jsonInt(p[i]["bonded"],0),
-									(int)OSUtils::jsonInt(p[i]["assignedFlowCount"],0));
-							}
-						}
-					}
-					return 0;
-				} else {
-					printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-					return 1;
-				}
-				return 2;
-			}
-		}
-
-		/* zerotier-cli bond command was malformed in some way */
-		printf("(bond) command is missing required arguments" ZT_EOL_S);
-		return 2;
-	} else if (command == "listbonds") {
-		const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/peer",requestHeaders,responseHeaders,responseBody);
-
-		if (scode == 0) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-
-		nlohmann::json j;
-		try {
-			j = OSUtils::jsonParse(responseBody);
-		} catch (std::exception &exc) {
-			printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-			return 1;
-		} catch ( ... ) {
-			printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-			return 1;
-		}
-
-		if (scode == 200) {
-			if (json) {
-				printf("%s" ZT_EOL_S,OSUtils::jsonDump(j).c_str());
-			} else {
-				bool bFoundBond = false;
-				printf("    <peer>                        <bondtype>     <links>" ZT_EOL_S);
-				if (j.is_array()) {
-					for(unsigned long k=0;k<j.size();++k) {
-						nlohmann::json &p = j[k];
-						bool isBonded = p["isBonded"];
-						if (isBonded) {
-							int8_t bondingPolicyCode = p["bondingPolicyCode"];
-							int8_t numAliveLinks = p["numAliveLinks"];
-							int8_t numTotalLinks = p["numTotalLinks"];
-							bFoundBond = true;
-							std::string policyStr = "none";
-							if (bondingPolicyCode >= ZT_BOND_POLICY_NONE && bondingPolicyCode <= ZT_BOND_POLICY_BALANCE_AWARE) {
-								policyStr = Bond::getPolicyStrByCode(bondingPolicyCode);
-							}
-							printf("%10s  %32s         %d/%d" ZT_EOL_S,
-								OSUtils::jsonString(p["address"],"-").c_str(),
-								policyStr.c_str(),
-								numAliveLinks,
-								numTotalLinks);
-						}
-					}
-				}
-				if (!bFoundBond) {
-					printf("      NONE\t\t\t\tNONE\t    NONE       NONE" ZT_EOL_S);
-				}
-			}
-			return 0;
-		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
+			printf("%u %s %s"ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
 			return 1;
 		}
 	} else if (command == "listnetworks") {
-		const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/network",requestHeaders,responseHeaders,responseBody);
-
-		if (scode == 0) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-
-		nlohmann::json j;
-		try {
-			j = OSUtils::jsonParse(responseBody);
-		} catch (std::exception &exc) {
-			printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-			return 1;
-		} catch ( ... ) {
-			printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-			return 1;
-		}
-
+		unsigned int scode = Http::GET(
+			1024 * 1024 * 16,
+			60000,
+			(const struct sockaddr *)&addr,
+			"/network",
+			requestHeaders,
+			responseHeaders,
+			responseBody);
 		if (scode == 200) {
 			if (json) {
-				printf("%s" ZT_EOL_S,OSUtils::jsonDump(j).c_str());
+				printf("%s",cliFixJsonCRs(responseBody).c_str());
+				return 0;
 			} else {
-				printf("200 listnetworks <nwid> <name> <mac> <status> <type> <dev> <ZT assigned ips>" ZT_EOL_S);
-				if (j.is_array()) {
-					for(unsigned long i=0;i<j.size();++i) {
-						nlohmann::json &n = j[i];
-						if (n.is_object()) {
-							std::string aa;
-							nlohmann::json &assignedAddresses = n["assignedAddresses"];
-							if (assignedAddresses.is_array()) {
-								for(unsigned long j=0;j<assignedAddresses.size();++j) {
-									nlohmann::json &addr = assignedAddresses[j];
-									if (addr.is_string()) {
-										if (aa.length() > 0) aa.push_back(',');
-										aa.append(addr.get<std::string>());
+				printf("200 listnetworks <nwid> <name> <mac> <status> <type> <dev> <ZT assigned ips>"ZT_EOL_S);
+				json_value *j = json_parse(responseBody.c_str(),responseBody.length());
+				if (j) {
+					if (j->type == json_array) {
+						for(unsigned int p=0;p<j->u.array.length;++p) {
+							json_value *jn = j->u.array.values[p];
+							if (jn->type == json_object) {
+								const char *nwid = (const char *)0;
+								const char *name = "";
+								const char *mac = (const char *)0;
+								const char *status = (const char *)0;
+								const char *type = (const char *)0;
+								const char *portDeviceName = "";
+								std::string ips;
+								for(unsigned int k=0;k<jn->u.object.length;++k) {
+									if ((!strcmp(jn->u.object.values[k].name,"nwid"))&&(jn->u.object.values[k].value->type == json_string))
+										nwid = jn->u.object.values[k].value->u.string.ptr;
+									else if ((!strcmp(jn->u.object.values[k].name,"name"))&&(jn->u.object.values[k].value->type == json_string))
+										name = jn->u.object.values[k].value->u.string.ptr;
+									else if ((!strcmp(jn->u.object.values[k].name,"mac"))&&(jn->u.object.values[k].value->type == json_string))
+										mac = jn->u.object.values[k].value->u.string.ptr;
+									else if ((!strcmp(jn->u.object.values[k].name,"status"))&&(jn->u.object.values[k].value->type == json_string))
+										status = jn->u.object.values[k].value->u.string.ptr;
+									else if ((!strcmp(jn->u.object.values[k].name,"type"))&&(jn->u.object.values[k].value->type == json_string))
+										type = jn->u.object.values[k].value->u.string.ptr;
+									else if ((!strcmp(jn->u.object.values[k].name,"portDeviceName"))&&(jn->u.object.values[k].value->type == json_string))
+										portDeviceName = jn->u.object.values[k].value->u.string.ptr;
+									else if ((!strcmp(jn->u.object.values[k].name,"assignedAddresses"))&&(jn->u.object.values[k].value->type == json_array)) {
+										for(unsigned int a=0;a<jn->u.object.values[k].value->u.array.length;++a) {
+											json_value *aa = jn->u.object.values[k].value->u.array.values[a];
+											if (aa->type == json_string) {
+												if (ips.length())
+													ips.push_back(',');
+												ips.append(aa->u.string.ptr);
+											}
+										}
 									}
 								}
-							}
-							if (aa.length() == 0) aa = "-";
-							const std::string status = OSUtils::jsonString(n["status"],"-");
-							printf("200 listnetworks %s %s %s %s %s %s %s" ZT_EOL_S,
-								OSUtils::jsonString(n["nwid"],"-").c_str(),
-								OSUtils::jsonString(n["name"],"-").c_str(),
-								OSUtils::jsonString(n["mac"],"-").c_str(),
-								status.c_str(),
-								OSUtils::jsonString(n["type"],"-").c_str(),
-								OSUtils::jsonString(n["portDeviceName"],"-").c_str(),
-								aa.c_str());
-							if (OSUtils::jsonBool(n["ssoEnabled"], false)) {
-								uint64_t authenticationExpiryTime = n["authenticationExpiryTime"];
-								if (status == "AUTHENTICATION_REQUIRED") {
-									printf("    AUTH EXPIRED, URL: %s" ZT_EOL_S, OSUtils::jsonString(n["authenticationURL"], "(null)").c_str());
-								} else if (status == "OK") {
-									int64_t expiresIn = ((int64_t)authenticationExpiryTime - OSUtils::now()) / 1000LL;
-									if (expiresIn >= 0) {
-										printf("    AUTH OK, expires in: %lld seconds" ZT_EOL_S, expiresIn);
-									}
+								if ((nwid)&&(mac)&&(status)&&(type)) {
+									printf("200 listnetworks %s %s %s %s %s %s %s"ZT_EOL_S,
+										nwid,
+										(((name)&&(name[0])) ? name : "-"),
+										mac,
+										status,
+										type,
+										(((portDeviceName)&&(portDeviceName[0])) ? portDeviceName : "-"),
+										((ips.length() > 0) ? ips.c_str() : "-"));
 								}
 							}
 						}
 					}
+					json_value_free(j);
 				}
 			}
-			return 0;
 		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
+			printf("%u %s %s"ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
 			return 1;
 		}
 	} else if (command == "join") {
 		if (arg1.length() != 16) {
-			printf("invalid network id" ZT_EOL_S);
+			cliPrintHelp(argv[0],stderr);
 			return 2;
 		}
 		requestHeaders["Content-Type"] = "application/json";
@@ -859,16 +518,16 @@ static int cli(int argc,char **argv)
 			if (json) {
 				printf("%s",cliFixJsonCRs(responseBody).c_str());
 			} else {
-				printf("200 join OK" ZT_EOL_S);
+				printf("200 join OK"ZT_EOL_S);
 			}
 			return 0;
 		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
+			printf("%u %s %s"ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
 			return 1;
 		}
 	} else if (command == "leave") {
 		if (arg1.length() != 16) {
-			printf("invalid network id" ZT_EOL_S);
+			cliPrintHelp(argv[0],stderr);
 			return 2;
 		}
 		unsigned int scode = Http::DEL(
@@ -883,531 +542,13 @@ static int cli(int argc,char **argv)
 			if (json) {
 				printf("%s",cliFixJsonCRs(responseBody).c_str());
 			} else {
-				printf("200 leave OK" ZT_EOL_S);
+				printf("200 leave OK"ZT_EOL_S);
 			}
 			return 0;
 		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
+			printf("%u %s %s"ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
 			return 1;
 		}
-	} else if (command == "listmoons") {
-		const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/moon",requestHeaders,responseHeaders,responseBody);
-
-		if (scode == 0) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-
-		nlohmann::json j;
-		try {
-			j = OSUtils::jsonParse(responseBody);
-		} catch (std::exception &exc) {
-			printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-			return 1;
-		} catch ( ... ) {
-			printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-			return 1;
-		}
-
-		if (scode == 200) {
-			printf("%s" ZT_EOL_S,OSUtils::jsonDump(j).c_str());
-			return 0;
-		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-			return 1;
-		}
-	} else if (command == "orbit") {
-		const uint64_t worldId = Utils::hexStrToU64(arg1.c_str());
-		const uint64_t seed = Utils::hexStrToU64(arg2.c_str());
-		if ((worldId)&&(seed)) {
-			char jsons[1024];
-			OSUtils::ztsnprintf(jsons,sizeof(jsons),"{\"seed\":\"%s\"}",arg2.c_str());
-			char cl[128];
-			OSUtils::ztsnprintf(cl,sizeof(cl),"%u",(unsigned int)strlen(jsons));
-			requestHeaders["Content-Type"] = "application/json";
-			requestHeaders["Content-Length"] = cl;
-			unsigned int scode = Http::POST(
-				1024 * 1024 * 16,
-				60000,
-				(const struct sockaddr *)&addr,
-				(std::string("/moon/") + arg1).c_str(),
-				requestHeaders,
-				jsons,
-				(unsigned long)strlen(jsons),
-				responseHeaders,
-				responseBody);
-			if (scode == 200) {
-				printf("200 orbit OK" ZT_EOL_S);
-				return 0;
-			} else {
-				printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-				return 1;
-			}
-		}
-	} else if (command == "deorbit") {
-		unsigned int scode = Http::DEL(
-			1024 * 1024 * 16,
-			60000,
-			(const struct sockaddr *)&addr,
-			(std::string("/moon/") + arg1).c_str(),
-			requestHeaders,
-			responseHeaders,
-			responseBody);
-		if (scode == 200) {
-			if (json) {
-				printf("%s",cliFixJsonCRs(responseBody).c_str());
-			} else {
-				printf("200 deorbit OK" ZT_EOL_S);
-			}
-			return 0;
-		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-			return 1;
-		}
-	} else if (command == "set") {
-		if (arg1.length() != 16) {
-			fprintf(stderr,"invalid format: must be a 16-digit (network) ID\n");
-			return 2;
-		}
-		if (!arg2.length()) {
-			fprintf(stderr,"invalid format: include a property name to set\n");
-			return 2;
-		}
-		std::size_t eqidx = arg2.find('=');
-		if (eqidx != std::string::npos) {
-			if ((arg2.substr(0,eqidx) == "allowManaged")||(arg2.substr(0,eqidx) == "allowGlobal")||(arg2.substr(0,eqidx) == "allowDefault")||(arg2.substr(0,eqidx) == "allowDNS")) {
-				char jsons[1024];
-				OSUtils::ztsnprintf(jsons,sizeof(jsons),"{\"%s\":%s}",
-					arg2.substr(0,eqidx).c_str(),
-					(((arg2.substr(eqidx,2) == "=t")||(arg2.substr(eqidx,2) == "=1")) ? "true" : "false"));
-				char cl[128];
-				OSUtils::ztsnprintf(cl,sizeof(cl),"%u",(unsigned int)strlen(jsons));
-				requestHeaders["Content-Type"] = "application/json";
-				requestHeaders["Content-Length"] = cl;
-				unsigned int scode = Http::POST(
-					1024 * 1024 * 16,
-					60000,
-					(const struct sockaddr *)&addr,
-					(std::string("/network/") + arg1).c_str(),
-					requestHeaders,
-					jsons,
-					(unsigned long)strlen(jsons),
-					responseHeaders,
-					responseBody);
-				if (scode == 200) {
-					printf("%s",cliFixJsonCRs(responseBody).c_str());
-					return 0;
-				} else {
-					printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-					return 1;
-				}
-			}
-		} else {
-			cliPrintHelp(argv[0],stderr);
-			return 2;
-		}
-	} else if (command == "get") {
-		if (arg1.length() != 16) {
-			fprintf(stderr,"invalid format: must be a 16-digit (network) ID\n");
-			return 2;
-		}
-		if (!arg2.length()) {
-			fprintf(stderr,"invalid format: include a property name to get\n");
-			return 2;
-		}
-		const unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/network",requestHeaders,responseHeaders,responseBody);
-		if (scode == 0) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-		nlohmann::json j;
-		try {
-			j = OSUtils::jsonParse(responseBody);
-		} catch (std::exception &exc) {
-			printf("%u %s invalid JSON response (%s)" ZT_EOL_S,scode,command.c_str(),exc.what());
-			return 1;
-		} catch ( ... ) {
-			printf("%u %s invalid JSON response (unknown exception)" ZT_EOL_S,scode,command.c_str());
-			return 1;
-		}
-		bool bNetworkFound = false;
-		if (j.is_array()) {
-			for(unsigned long i=0;i<j.size();++i) {
-				nlohmann::json &n = j[i];
-				if (n.is_object()) {
-					if (n["id"] == arg1) {
-						bNetworkFound = true;
-						std::string aa;
-						if (arg2 != "ip" && arg2 != "ip4" && arg2 != "ip6" && arg2 != "ip6plane" && arg2 != "ip6prefix") {
-							aa.append(OSUtils::jsonString(n[arg2],"-")); // Standard network property field
-							if (aa == "-") {
-								printf("error, unknown property name\n");
-								break;
-							}
-							printf("%s\n",aa.c_str());
-							break;
-						}
-						nlohmann::json &assignedAddresses = n["assignedAddresses"];
-						if (assignedAddresses.is_array()) {
-							int matchingIdxs[ZT_MAX_ZT_ASSIGNED_ADDRESSES];
-							int addressCountOfType = 0;
-							for (int k = 0; k<std::min(ZT_MAX_ZT_ASSIGNED_ADDRESSES, (int)assignedAddresses.size());++k) {
-								nlohmann::json &addr = assignedAddresses[k];
-								if ((arg2 == "ip4" && addr.get<std::string>().find('.') != std::string::npos)
-									|| ((arg2.find("ip6") == 0) && addr.get<std::string>().find(":") != std::string::npos)
-									|| (arg2 == "ip")
-									) {
-									matchingIdxs[addressCountOfType++] = k;
-								}
-							}
-							for (int k=0; k<addressCountOfType; k++) {
-								nlohmann::json &addr = assignedAddresses[matchingIdxs[k]];
-								if (!addr.is_string()) {
-									continue;
-								}
-								if (arg2.find("ip6p") == 0) {
-									if (arg2 == "ip6plane") {
-										if (addr.get<std::string>().find("fc") == 0) {
-											aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find('/')));
-											if (k < addressCountOfType-1) aa.append("\n");
-										}
-									}
-									if (arg2 == "ip6prefix") {
-										if (addr.get<std::string>().find("fc") == 0) {
-											aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find('/')).substr(0,24));
-											if (k < addressCountOfType-1) aa.append("\n");
-										}
-									}
-								}
-								else {
-									aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find('/')));
-									if (k < addressCountOfType-1) aa.append("\n");
-								}
-							}
-						}
-						printf("%s\n",aa.c_str());
-					}
-				}
-			}
-		}
-		if (!bNetworkFound) {
-			fprintf(stderr,"unknown network ID, check that you are a member of the network\n");
-		}
-		if (scode == 200) {
-			return 0;
-		} else {
-			printf("%u %s %s" ZT_EOL_S,scode,command.c_str(),responseBody.c_str());
-			return 1;
-		}
-	} else if (command == "dump") {
-		std::stringstream dump;
-		dump << "platform: ";
-#ifdef __APPLE__
-		dump << "macOS" << ZT_EOL_S;
-#elif defined(_WIN32)
-		dump << "Windows" << ZT_EOL_S;
-#elif defined(__LINUX__)
-		dump << "Linux" << ZT_EOL_S;
-#else
-		dump << "other unix based OS" << ZT_EOL_S;
-#endif
-		dump << "zerotier version: " << ZEROTIER_ONE_VERSION_MAJOR << "."
-			<< ZEROTIER_ONE_VERSION_MINOR << "." << ZEROTIER_ONE_VERSION_REVISION << ZT_EOL_S << ZT_EOL_S;
-
-		// grab status
-		dump << "status" << ZT_EOL_S << "------" << ZT_EOL_S;
-		unsigned int scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/status",requestHeaders,responseHeaders,responseBody);
-		if (scode != 200) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-		dump << responseBody << ZT_EOL_S;
-
-		responseHeaders.clear();
-		responseBody = "";
-
-		// grab network list
-		dump << ZT_EOL_S << "networks" << ZT_EOL_S << "--------" << ZT_EOL_S;
-		scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/network",requestHeaders,responseHeaders,responseBody);
-		if (scode != 200) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-		dump << responseBody << ZT_EOL_S;
-
-		responseHeaders.clear();
-		responseBody = "";
-
-		// list peers
-		dump << ZT_EOL_S << "peers" << ZT_EOL_S << "-----" << ZT_EOL_S;
-		scode = Http::GET(1024 * 1024 * 16,60000,(const struct sockaddr *)&addr,"/peer",requestHeaders,responseHeaders,responseBody);
-		if (scode != 200) {
-			printf("Error connecting to the ZeroTier service: %s\n\nPlease check that the service is running and that TCP port 9993 can be contacted via 127.0.0.1." ZT_EOL_S, responseBody.c_str());
-			return 1;
-		}
-		dump << responseBody << ZT_EOL_S;
-
-		// Bonds don't need to be queried separately since their data originates from "/peer" responses anyway
-
-		responseHeaders.clear();
-		responseBody = "";
-
-		dump << ZT_EOL_S << "local.conf" << ZT_EOL_S << "----------" << ZT_EOL_S;
-		std::string localConf;
-		OSUtils::readFile((homeDir + ZT_PATH_SEPARATOR_S + "local.conf").c_str(), localConf);
-		if (localConf.empty()) {
-			dump << "None Present" << ZT_EOL_S;
-		}
-		else {
-			dump << localConf << ZT_EOL_S;
-		}
-
-		dump << ZT_EOL_S << "Network Interfaces" << ZT_EOL_S << "------------------" << ZT_EOL_S << ZT_EOL_S;
-#ifdef __APPLE__
-		CFArrayRef interfaces = SCNetworkInterfaceCopyAll();
-		CFIndex size = CFArrayGetCount(interfaces);
-		for(CFIndex i = 0; i < size; ++i) {
-			SCNetworkInterfaceRef iface = (SCNetworkInterfaceRef)CFArrayGetValueAtIndex(interfaces, i);
-
-			dump << "Interface " << i << ZT_EOL_S << "-----------" << ZT_EOL_S;
-			CFStringRef tmp = SCNetworkInterfaceGetBSDName(iface);
-			char stringBuffer[512] = {};
-			CFStringGetCString(tmp,stringBuffer, sizeof(stringBuffer), kCFStringEncodingUTF8);
-			dump << "Name: " << stringBuffer << ZT_EOL_S;
-			std::string ifName(stringBuffer);
-			int mtuCur, mtuMin, mtuMax;
-			SCNetworkInterfaceCopyMTU(iface, &mtuCur, &mtuMin, &mtuMax);
-			dump << "MTU: " << mtuCur << ZT_EOL_S;
-			tmp = SCNetworkInterfaceGetHardwareAddressString(iface);
-			CFStringGetCString(tmp, stringBuffer, sizeof(stringBuffer), kCFStringEncodingUTF8);
-			dump << "MAC: " << stringBuffer << ZT_EOL_S;
-			tmp = SCNetworkInterfaceGetInterfaceType(iface);
-			CFStringGetCString(tmp, stringBuffer, sizeof(stringBuffer), kCFStringEncodingUTF8);
-			dump << "Type: " << stringBuffer << ZT_EOL_S;
-			dump << "Addresses:" << ZT_EOL_S;
-
-			struct ifaddrs *ifap, *ifa;
-			void *addr;
-			getifaddrs(&ifap);
-			for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-				if (strcmp(ifName.c_str(), ifa->ifa_name) == 0) {
-					if (ifa->ifa_addr->sa_family == AF_INET) {
-						struct sockaddr_in *ipv4 = (struct sockaddr_in*)ifa->ifa_addr;
-						addr = &ipv4->sin_addr;
-					} else if (ifa->ifa_addr->sa_family == AF_INET6) {
-						struct sockaddr_in6 *ipv6 = (struct sockaddr_in6*)ifa->ifa_addr;
-						addr = &ipv6->sin6_addr;
-					} else {
-						continue;
-					}
-					inet_ntop(ifa->ifa_addr->sa_family, addr, stringBuffer, sizeof(stringBuffer));
-					dump << stringBuffer << ZT_EOL_S;
-				}
-			}
-
-			dump << ZT_EOL_S;
-		}
-
-
-		FSRef fsref;
-		UInt8 path[PATH_MAX];
-		if (FSFindFolder(kUserDomain, kDesktopFolderType, kDontCreateFolder, &fsref) == noErr &&
-				FSRefMakePath(&fsref, path, sizeof(path)) == noErr) {
-
-		} else if (getenv("SUDO_USER")) {
-			sprintf((char*)path, "/Users/%s/Desktop", getenv("SUDO_USER"));
-		} else {
-			fprintf(stdout, "%s", dump.str().c_str());
-			return 0;
-		}
-
-		sprintf((char*)path, "%s%szerotier_dump.txt", (char*)path, ZT_PATH_SEPARATOR_S);
-
-		fprintf(stdout, "Writing dump to: %s\n", path);
-		int fd = open((char*)path, O_CREAT|O_RDWR,0664);
-		if (fd == -1) {
-			fprintf(stderr, "Error creating file.\n");
-			return 1;
-		}
-		write(fd, dump.str().c_str(), dump.str().size());
-		close(fd);
-#elif defined(_WIN32)
-		ULONG buffLen = 16384;
-		PIP_ADAPTER_ADDRESSES addresses;
-
-		ULONG ret = 0;
-		do {
-			addresses = (PIP_ADAPTER_ADDRESSES)malloc(buffLen);
-
-			ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, addresses, &buffLen);
-			if (ret == ERROR_BUFFER_OVERFLOW) {
-				free(addresses);
-				addresses = NULL;
-			}
-			else {
-				break;
-			}
-		} while (ret == ERROR_BUFFER_OVERFLOW);
-
-		int i = 0;
-		if (ret == NO_ERROR) {
-			PIP_ADAPTER_ADDRESSES curAddr = addresses;
-			while (curAddr) {
-				dump << "Interface " << i << ZT_EOL_S << "-----------" << ZT_EOL_S;
-				dump << "Name: " << curAddr->AdapterName << ZT_EOL_S;
-				dump << "MTU: " << curAddr->Mtu << ZT_EOL_S;
-				dump << "MAC: ";
-				char macBuffer[64] = {};
-				sprintf(macBuffer, "%02x:%02x:%02x:%02x:%02x:%02x",
-					curAddr->PhysicalAddress[0],
-					curAddr->PhysicalAddress[1],
-					curAddr->PhysicalAddress[2],
-					curAddr->PhysicalAddress[3],
-					curAddr->PhysicalAddress[4],
-					curAddr->PhysicalAddress[5]);
-				dump << macBuffer << ZT_EOL_S;
-				dump << "Type: " << curAddr->IfType << ZT_EOL_S;
-				dump << "Addresses:" << ZT_EOL_S;
-				PIP_ADAPTER_UNICAST_ADDRESS pUnicast = NULL;
-				pUnicast = curAddr->FirstUnicastAddress;
-				if (pUnicast) {
-					for (int j = 0; pUnicast != NULL; ++j) {
-						char buf[128] = {};
-						DWORD bufLen = 128;
-						LPSOCKADDR a = pUnicast->Address.lpSockaddr;
-						WSAAddressToStringA(
-							pUnicast->Address.lpSockaddr,
-							pUnicast->Address.iSockaddrLength,
-							NULL,
-							buf,
-							&bufLen
-						);
-						dump << buf << ZT_EOL_S;
-						pUnicast = pUnicast->Next;
-					}
-				}
-
-				curAddr = curAddr->Next;
-				++i;
-			}
-		}
-		if (addresses) {
-			free(addresses);
-			addresses = NULL;
-		}
-
-		char path[MAX_PATH + 1] = {};
-		if (SHGetFolderPathA(NULL, CSIDL_DESKTOP, NULL, 0, path) == S_OK) {
-			sprintf(path, "%s%szerotier_dump.txt", path, ZT_PATH_SEPARATOR_S);
-			fprintf(stdout, "Writing dump to: %s\n", path);
-			HANDLE file = CreateFileA(
-				path,
-				GENERIC_WRITE,
-				0,
-				NULL,
-				CREATE_ALWAYS,
-				FILE_ATTRIBUTE_NORMAL,
-				NULL
-			);
-			if (file == INVALID_HANDLE_VALUE) {
-				fprintf(stdout, "%s", dump.str().c_str());
-				return 0;
-			}
-
-			BOOL err = WriteFile(
-				file,
-				dump.str().c_str(),
-				dump.str().size(),
-				NULL,
-				NULL
-			);
-			if (err = FALSE) {
-				fprintf(stderr, "Error writing file");
-				return 1;
-			}
-			CloseHandle(file);
-		}
-		else {
-			fprintf(stdout, "%s", dump.str().c_str());
-		}
-#elif defined(__LINUX__)
-		struct ifreq ifr;
-		struct ifconf ifc;
-		char buf[1024];
-		char stringBuffer[128];
-
-		int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
-
-		ifc.ifc_len = sizeof(buf);
-		ifc.ifc_buf = buf;
-		ioctl(sock, SIOCGIFCONF, &ifc);
-
-		struct ifreq *it = ifc.ifc_req;
-		const struct ifreq * const end = it + (ifc.ifc_len / sizeof(struct ifreq));
-		int count = 0;
-		for(; it != end; ++it) {
-			strcpy(ifr.ifr_name, it->ifr_name);
-			if(ioctl(sock, SIOCGIFFLAGS, &ifr) == 0) {
-				if (!(ifr.ifr_flags & IFF_LOOPBACK)) { // skip loopback
-					dump << "Interface " << count++ << ZT_EOL_S << "-----------" << ZT_EOL_S;
-					dump << "Name: " << ifr.ifr_name << ZT_EOL_S;
-					if (ioctl(sock, SIOCGIFMTU, &ifr) == 0) {
-						dump << "MTU: " << ifr.ifr_mtu << ZT_EOL_S;
-					}
-					if (ioctl(sock, SIOCGIFHWADDR, &ifr) == 0) {
-						unsigned char mac_addr[6];
-						memcpy(mac_addr, ifr.ifr_hwaddr.sa_data, 6);
-						char macStr[18];
-						sprintf(macStr, "%02x:%02x:%02x:%02x:%02x:%02x",
-								mac_addr[0],
-								mac_addr[1],
-								mac_addr[2],
-								mac_addr[3],
-								mac_addr[4],
-								mac_addr[5]);
-						dump << "MAC: " << macStr << ZT_EOL_S;
-					}
-
-					dump << "Addresses: " << ZT_EOL_S;
-					struct ifaddrs *ifap, *ifa;
-					void *addr;
-					getifaddrs(&ifap);
-					for(ifa = ifap; ifa; ifa = ifa->ifa_next) {
-						if(strcmp(ifr.ifr_name, ifa->ifa_name) == 0 && ifa->ifa_addr != NULL) {
-							if(ifa->ifa_addr->sa_family == AF_INET) {
-								struct sockaddr_in *ipv4 = (struct sockaddr_in*)ifa->ifa_addr;
-								addr = &ipv4->sin_addr;
-							} else if (ifa->ifa_addr->sa_family == AF_INET6) {
-								struct sockaddr_in6 *ipv6 = (struct sockaddr_in6*)ifa->ifa_addr;
-								addr = &ipv6->sin6_addr;
-							} else {
-								continue;
-							}
-							inet_ntop(ifa->ifa_addr->sa_family, addr, stringBuffer, sizeof(stringBuffer));
-							dump << stringBuffer << ZT_EOL_S;
-						}
-					}
-				}
-			}
-		}
-		close(sock);
-		char cwd[16384];
-		getcwd(cwd, sizeof(cwd));
-		sprintf(cwd, "%s%szerotier_dump.txt", cwd, ZT_PATH_SEPARATOR_S);
-		fprintf(stdout, "Writing dump to: %s\n", cwd);
-		int fd = open(cwd, O_CREAT|O_RDWR,0664);
-		if (fd == -1) {
-			fprintf(stderr, "Error creating file.\n");
-			return 1;
-		}
-		write(fd, dump.str().c_str(), dump.str().size());
-		close(fd);
-#else
-	fprintf(stderr, "%s", dump.str().c_str());
-#endif
-
-		// fprintf(stderr, "%s\n", dump.str().c_str());
-
 	} else {
 		cliPrintHelp(argv[0],stderr);
 		return 0;
@@ -1429,14 +570,13 @@ static void idtoolPrintHelp(FILE *out,const char *pn)
 	fprintf(out,
 		COPYRIGHT_NOTICE ZT_EOL_S
 		LICENSE_GRANT ZT_EOL_S);
-	fprintf(out,"Usage: %s <command> [<args>]" ZT_EOL_S"" ZT_EOL_S"Commands:" ZT_EOL_S,pn);
-	fprintf(out,"  generate [<identity.secret>] [<identity.public>] [<vanity>]" ZT_EOL_S);
-	fprintf(out,"  validate <identity.secret/public>" ZT_EOL_S);
-	fprintf(out,"  getpublic <identity.secret>" ZT_EOL_S);
-	fprintf(out,"  sign <identity.secret> <file>" ZT_EOL_S);
-	fprintf(out,"  verify <identity.secret/public> <file> <signature>" ZT_EOL_S);
-	fprintf(out,"  initmoon <identity.public of first seed>" ZT_EOL_S);
-	fprintf(out,"  genmoon <moon json>" ZT_EOL_S);
+	fprintf(out,"Usage: %s <command> [<args>]"ZT_EOL_S""ZT_EOL_S"Commands:"ZT_EOL_S,pn);
+	fprintf(out,"  generate [<identity.secret>] [<identity.public>]"ZT_EOL_S);
+	fprintf(out,"  validate <identity.secret/public>"ZT_EOL_S);
+	fprintf(out,"  getpublic <identity.secret>"ZT_EOL_S);
+	fprintf(out,"  sign <identity.secret> <file>"ZT_EOL_S);
+	fprintf(out,"  verify <identity.secret/public> <file> <signature>"ZT_EOL_S);
+	fprintf(out,"  mkcom <identity.secret> [<id,value,maxDelta> ...] (hexadecimal integers)"ZT_EOL_S);
 }
 
 static Identity getIdFromArg(char *arg)
@@ -1448,7 +588,7 @@ static Identity getIdFromArg(char *arg)
 	} else { // identity is to be read from a file
 		std::string idser;
 		if (OSUtils::readFile(arg,idser)) {
-			if (id.fromString(idser.c_str()))
+			if (id.fromString(idser))
 				return id;
 		}
 	}
@@ -1467,41 +607,20 @@ static int idtool(int argc,char **argv)
 	}
 
 	if (!strcmp(argv[1],"generate")) {
-		uint64_t vanity = 0;
-		int vanityBits = 0;
-		if (argc >= 5) {
-			vanity = Utils::hexStrToU64(argv[4]) & 0xffffffffffULL;
-			vanityBits = 4 * (int)strlen(argv[4]);
-			if (vanityBits > 40)
-				vanityBits = 40;
-		}
-
 		Identity id;
-		for(;;) {
-			id.generate();
-			if ((id.address().toInt() >> (40 - vanityBits)) == vanity) {
-				if (vanityBits > 0) {
-					fprintf(stderr,"vanity address: found %.10llx !\n",(unsigned long long)id.address().toInt());
-				}
-				break;
-			} else {
-				fprintf(stderr,"vanity address: tried %.10llx looking for first %d bits of %.10llx\n",(unsigned long long)id.address().toInt(),vanityBits,(unsigned long long)(vanity << (40 - vanityBits)));
-			}
-		}
-
-		char idtmp[1024];
-		std::string idser = id.toString(true,idtmp);
+		id.generate();
+		std::string idser = id.toString(true);
 		if (argc >= 3) {
 			if (!OSUtils::writeFile(argv[2],idser)) {
-				fprintf(stderr,"Error writing to %s" ZT_EOL_S,argv[2]);
+				fprintf(stderr,"Error writing to %s"ZT_EOL_S,argv[2]);
 				return 1;
-			} else printf("%s written" ZT_EOL_S,argv[2]);
+			} else printf("%s written"ZT_EOL_S,argv[2]);
 			if (argc >= 4) {
-				idser = id.toString(false,idtmp);
+				idser = id.toString(false);
 				if (!OSUtils::writeFile(argv[3],idser)) {
-					fprintf(stderr,"Error writing to %s" ZT_EOL_S,argv[3]);
+					fprintf(stderr,"Error writing to %s"ZT_EOL_S,argv[3]);
 					return 1;
-				} else printf("%s written" ZT_EOL_S,argv[3]);
+				} else printf("%s written"ZT_EOL_S,argv[3]);
 			}
 		} else printf("%s",idser.c_str());
 	} else if (!strcmp(argv[1],"validate")) {
@@ -1512,14 +631,14 @@ static int idtool(int argc,char **argv)
 
 		Identity id = getIdFromArg(argv[2]);
 		if (!id) {
-			fprintf(stderr,"Identity argument invalid or file unreadable: %s" ZT_EOL_S,argv[2]);
+			fprintf(stderr,"Identity argument invalid or file unreadable: %s"ZT_EOL_S,argv[2]);
 			return 1;
 		}
 
 		if (!id.locallyValidate()) {
-			fprintf(stderr,"%s FAILED validation." ZT_EOL_S,argv[2]);
+			fprintf(stderr,"%s FAILED validation."ZT_EOL_S,argv[2]);
 			return 1;
-		} else printf("%s is a valid identity" ZT_EOL_S,argv[2]);
+		} else printf("%s is a valid identity"ZT_EOL_S,argv[2]);
 	} else if (!strcmp(argv[1],"getpublic")) {
 		if (argc < 3) {
 			idtoolPrintHelp(stdout,argv[0]);
@@ -1528,12 +647,11 @@ static int idtool(int argc,char **argv)
 
 		Identity id = getIdFromArg(argv[2]);
 		if (!id) {
-			fprintf(stderr,"Identity argument invalid or file unreadable: %s" ZT_EOL_S,argv[2]);
+			fprintf(stderr,"Identity argument invalid or file unreadable: %s"ZT_EOL_S,argv[2]);
 			return 1;
 		}
 
-		char idtmp[1024];
-		printf("%s",id.toString(false,idtmp));
+		printf("%s",id.toString(false).c_str());
 	} else if (!strcmp(argv[1],"sign")) {
 		if (argc < 4) {
 			idtoolPrintHelp(stdout,argv[0]);
@@ -1542,148 +660,75 @@ static int idtool(int argc,char **argv)
 
 		Identity id = getIdFromArg(argv[2]);
 		if (!id) {
-			fprintf(stderr,"Identity argument invalid or file unreadable: %s" ZT_EOL_S,argv[2]);
+			fprintf(stderr,"Identity argument invalid or file unreadable: %s"ZT_EOL_S,argv[2]);
 			return 1;
 		}
 
 		if (!id.hasPrivate()) {
-			fprintf(stderr,"%s does not contain a private key (must use private to sign)" ZT_EOL_S,argv[2]);
+			fprintf(stderr,"%s does not contain a private key (must use private to sign)"ZT_EOL_S,argv[2]);
 			return 1;
 		}
 
 		std::string inf;
 		if (!OSUtils::readFile(argv[3],inf)) {
-			fprintf(stderr,"%s is not readable" ZT_EOL_S,argv[3]);
+			fprintf(stderr,"%s is not readable"ZT_EOL_S,argv[3]);
 			return 1;
 		}
-		ECC::Signature signature = id.sign(inf.data(),(unsigned int)inf.length());
-		char hexbuf[1024];
-		printf("%s",Utils::hex(signature.data,ZT_ECC_SIGNATURE_LEN,hexbuf));
+		C25519::Signature signature = id.sign(inf.data(),(unsigned int)inf.length());
+		printf("%s",Utils::hex(signature.data,(unsigned int)signature.size()).c_str());
 	} else if (!strcmp(argv[1],"verify")) {
-		if (argc < 5) {
+		if (argc < 4) {
 			idtoolPrintHelp(stdout,argv[0]);
 			return 1;
 		}
 
 		Identity id = getIdFromArg(argv[2]);
 		if (!id) {
-			fprintf(stderr,"Identity argument invalid or file unreadable: %s" ZT_EOL_S,argv[2]);
+			fprintf(stderr,"Identity argument invalid or file unreadable: %s"ZT_EOL_S,argv[2]);
 			return 1;
 		}
 
 		std::string inf;
 		if (!OSUtils::readFile(argv[3],inf)) {
-			fprintf(stderr,"%s is not readable" ZT_EOL_S,argv[3]);
+			fprintf(stderr,"%s is not readable"ZT_EOL_S,argv[3]);
 			return 1;
 		}
 
-		char buf[4096];
-		std::string signature(buf,Utils::unhex(argv[4],buf,(unsigned int)sizeof(buf)));
+		std::string signature(Utils::unhex(argv[4]));
 		if ((signature.length() > ZT_ADDRESS_LENGTH)&&(id.verify(inf.data(),(unsigned int)inf.length(),signature.data(),(unsigned int)signature.length()))) {
-			printf("%s signature valid" ZT_EOL_S,argv[3]);
+			printf("%s signature valid"ZT_EOL_S,argv[3]);
 		} else {
-			signature.clear();
-			if (OSUtils::readFile(argv[4],signature)) {
-				signature.assign(buf,Utils::unhex(signature.c_str(),buf,(unsigned int)sizeof(buf)));
-				if ((signature.length() > ZT_ADDRESS_LENGTH)&&(id.verify(inf.data(),(unsigned int)inf.length(),signature.data(),(unsigned int)signature.length()))) {
-					printf("%s signature valid" ZT_EOL_S,argv[3]);
-				} else {
-					fprintf(stderr,"%s signature check FAILED" ZT_EOL_S,argv[3]);
-					return 1;
-				}
-			} else {
-				fprintf(stderr,"%s signature check FAILED" ZT_EOL_S,argv[3]);
-				return 1;
-			}
+			fprintf(stderr,"%s signature check FAILED"ZT_EOL_S,argv[3]);
+			return 1;
 		}
-	} else if (!strcmp(argv[1],"initmoon")) {
+	} else if (!strcmp(argv[1],"mkcom")) {
 		if (argc < 3) {
 			idtoolPrintHelp(stdout,argv[0]);
-		} else {
-			const Identity id = getIdFromArg(argv[2]);
-			if (!id) {
-				fprintf(stderr,"%s is not a valid identity" ZT_EOL_S,argv[2]);
-				return 1;
-			}
-
-			ECC::Pair kp(ECC::generate());
-
-			char idtmp[4096];
-			nlohmann::json mj;
-			mj["objtype"] = "world";
-			mj["worldType"] = "moon";
-			mj["updatesMustBeSignedBy"] = mj["signingKey"] = Utils::hex(kp.pub.data,ZT_ECC_PUBLIC_KEY_SET_LEN,idtmp);
-			mj["signingKey_SECRET"] = Utils::hex(kp.priv.data,ZT_ECC_PRIVATE_KEY_SET_LEN,idtmp);
-			mj["id"] = id.address().toString(idtmp);
-			nlohmann::json seedj;
-			seedj["identity"] = id.toString(false,idtmp);
-			seedj["stableEndpoints"] = nlohmann::json::array();
-			(mj["roots"] = nlohmann::json::array()).push_back(seedj);
-			std::string mjd(OSUtils::jsonDump(mj));
-
-			printf("%s" ZT_EOL_S,mjd.c_str());
+			return 1;
 		}
-	} else if (!strcmp(argv[1],"genmoon")) {
-		if (argc < 3) {
-			idtoolPrintHelp(stdout,argv[0]);
-		} else {
-			std::string buf;
-			if (!OSUtils::readFile(argv[2],buf)) {
-				fprintf(stderr,"cannot read %s" ZT_EOL_S,argv[2]);
-				return 1;
-			}
-			nlohmann::json mj(OSUtils::jsonParse(buf));
 
-			const uint64_t id = Utils::hexStrToU64(OSUtils::jsonString(mj["id"],"0").c_str());
-			if (!id) {
-				fprintf(stderr,"ID in %s is invalid" ZT_EOL_S,argv[2]);
-				return 1;
-			}
-
-			World::Type t;
-			if (mj["worldType"] == "moon") {
-				t = World::TYPE_MOON;
-			} else if (mj["worldType"] == "planet") {
-				t = World::TYPE_PLANET;
-			} else {
-				fprintf(stderr,"invalid worldType" ZT_EOL_S);
-				return 1;
-			}
-
-			ECC::Pair signingKey;
-			ECC::Public updatesMustBeSignedBy;
-			Utils::unhex(OSUtils::jsonString(mj["signingKey"],"").c_str(),signingKey.pub.data,ZT_ECC_PUBLIC_KEY_SET_LEN);
-			Utils::unhex(OSUtils::jsonString(mj["signingKey_SECRET"],"").c_str(),signingKey.priv.data,ZT_ECC_PRIVATE_KEY_SET_LEN);
-			Utils::unhex(OSUtils::jsonString(mj["updatesMustBeSignedBy"],"").c_str(),updatesMustBeSignedBy.data,ZT_ECC_PUBLIC_KEY_SET_LEN);
-
-			std::vector<World::Root> roots;
-			nlohmann::json &rootsj = mj["roots"];
-			if (rootsj.is_array()) {
-				for(unsigned long i=0;i<(unsigned long)rootsj.size();++i) {
-					nlohmann::json &r = rootsj[i];
-					if (r.is_object()) {
-						roots.push_back(World::Root());
-						roots.back().identity = Identity(OSUtils::jsonString(r["identity"],"").c_str());
-						nlohmann::json &stableEndpointsj = r["stableEndpoints"];
-						if (stableEndpointsj.is_array()) {
-							for(unsigned long k=0;k<(unsigned long)stableEndpointsj.size();++k)
-								roots.back().stableEndpoints.push_back(InetAddress(OSUtils::jsonString(stableEndpointsj[k],"").c_str()));
-							std::sort(roots.back().stableEndpoints.begin(),roots.back().stableEndpoints.end());
-						}
-					}
-				}
-			}
-			std::sort(roots.begin(),roots.end());
-
-			const int64_t now = OSUtils::now();
-			World w(World::make(t,id,now,updatesMustBeSignedBy,roots,signingKey));
-			Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> wbuf;
-			w.serialize(wbuf);
-			char fn[128];
-			OSUtils::ztsnprintf(fn,sizeof(fn),"%.16llx.moon",w.id());
-			OSUtils::writeFile(fn,wbuf.data(),wbuf.size());
-			printf("wrote %s (signed world with timestamp %llu)" ZT_EOL_S,fn,(unsigned long long)now);
+		Identity id = getIdFromArg(argv[2]);
+		if ((!id)||(!id.hasPrivate())) {
+			fprintf(stderr,"Identity argument invalid, does not include private key, or file unreadable: %s"ZT_EOL_S,argv[2]);
+			return 1;
 		}
+
+		CertificateOfMembership com;
+		for(int a=3;a<argc;++a) {
+			std::vector<std::string> params(Utils::split(argv[a],",","",""));
+			if (params.size() == 3) {
+				uint64_t qId = Utils::hexStrToU64(params[0].c_str());
+				uint64_t qValue = Utils::hexStrToU64(params[1].c_str());
+				uint64_t qMaxDelta = Utils::hexStrToU64(params[2].c_str());
+				com.setQualifier(qId,qValue,qMaxDelta);
+			}
+		}
+		if (!com.sign(id)) {
+			fprintf(stderr,"Signature of certificate of membership failed."ZT_EOL_S);
+			return 1;
+		}
+
+		printf("%s",com.toString().c_str());
 	} else {
 		idtoolPrintHelp(stdout,argv[0]);
 		return 1;
@@ -1700,13 +745,8 @@ static int idtool(int argc,char **argv)
 static void _sighandlerHup(int sig)
 {
 }
-static void _sighandlerReallyQuit(int sig)
-{
-	exit(0);
-}
 static void _sighandlerQuit(int sig)
 {
-	alarm(5); // force exit after 5s
 	OneService *s = zt1Service;
 	if (s)
 		s->terminate();
@@ -1714,147 +754,6 @@ static void _sighandlerQuit(int sig)
 }
 #endif
 
-// Drop privileges on Linux, if supported by libc etc. and "zerotier-one" user exists on system
-#if defined(__LINUX__) && !defined(ZT_NO_CAPABILITIES)
-#ifndef PR_CAP_AMBIENT
-#define PR_CAP_AMBIENT 47
-#define PR_CAP_AMBIENT_IS_SET 1
-#define PR_CAP_AMBIENT_RAISE 2
-#define PR_CAP_AMBIENT_LOWER 3
-#define PR_CAP_AMBIENT_CLEAR_ALL 4
-#endif
-#define ZT_LINUX_USER "zerotier-one"
-#define ZT_HAVE_DROP_PRIVILEGES 1
-namespace {
-
-// libc doesn't export capset, it is instead located in libcap
-// We ignore libcap and call it manually.
-struct cap_header_struct {
-	__u32 version;
-	int pid;
-};
-struct cap_data_struct {
-	__u32 effective;
-	__u32 permitted;
-	__u32 inheritable;
-};
-static inline int _zt_capset(cap_header_struct* hdrp, cap_data_struct* datap) { return syscall(SYS_capset, hdrp, datap); }
-
-static void _notDropping(const char *procName,const std::string &homeDir)
-{
-	struct stat buf;
-	if (lstat(homeDir.c_str(),&buf) < 0) {
-		if (buf.st_uid != 0 || buf.st_gid != 0) {
-			fprintf(stderr, "%s: FATAL: failed to drop privileges and can't run as root since privileges were previously dropped (home directory not owned by root)" ZT_EOL_S,procName);
-			exit(1);
-		}
-	}
-	fprintf(stderr, "%s: WARNING: failed to drop privileges (kernel may not support required prctl features), running as root" ZT_EOL_S,procName);
-}
-
-static int _setCapabilities(int flags)
-{
-	cap_header_struct capheader = {_LINUX_CAPABILITY_VERSION_1, 0};
-	cap_data_struct capdata;
-	capdata.inheritable = capdata.permitted = capdata.effective = flags;
-	return _zt_capset(&capheader, &capdata);
-}
-
-static void _recursiveChown(const char *path,uid_t uid,gid_t gid)
-{
-	struct dirent de;
-	struct dirent *dptr;
-	lchown(path,uid,gid);
-	DIR *d = opendir(path);
-	if (!d)
-		return;
-	dptr = (struct dirent *)0;
-	for(;;) {
-		if (readdir_r(d,&de,&dptr) != 0)
-			break;
-		if (!dptr)
-			break;
-		if ((strcmp(dptr->d_name,".") != 0)&&(strcmp(dptr->d_name,"..") != 0)&&(strlen(dptr->d_name) > 0)) {
-			std::string p(path);
-			p.push_back(ZT_PATH_SEPARATOR);
-			p.append(dptr->d_name);
-			_recursiveChown(p.c_str(),uid,gid); // will just fail and return on regular files
-		}
-	}
-	closedir(d);
-}
-
-static void dropPrivileges(const char *procName,const std::string &homeDir)
-{
-	if (getuid() != 0)
-		return;
-
-	// dropPrivileges switches to zerotier-one user while retaining CAP_NET_ADMIN
-	// and CAP_NET_RAW capabilities.
-	struct passwd *targetUser = getpwnam(ZT_LINUX_USER);
-	if (!targetUser)
-		return;
-
-	if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, CAP_NET_RAW, 0, 0) < 0) {
-		// Kernel has no support for ambient capabilities.
-		_notDropping(procName,homeDir);
-		return;
-	}
-	if (prctl(PR_SET_SECUREBITS, SECBIT_KEEP_CAPS | SECBIT_NOROOT) < 0) {
-		_notDropping(procName,homeDir);
-		return;
-	}
-
-	// Change ownership of our home directory if everything looks good (does nothing if already chown'd)
-	_recursiveChown(homeDir.c_str(),targetUser->pw_uid,targetUser->pw_gid);
-
-	if (_setCapabilities((1 << CAP_NET_ADMIN) | (1 << CAP_NET_RAW) | (1 << CAP_SETUID) | (1 << CAP_SETGID) | (1 << CAP_NET_BIND_SERVICE)) < 0) {
-		_notDropping(procName,homeDir);
-		return;
-	}
-
-	int oldDumpable = prctl(PR_GET_DUMPABLE);
-	if (prctl(PR_SET_DUMPABLE, 0) < 0) {
-		// Disable ptracing. Otherwise there is a small window when previous
-		// compromised ZeroTier process could ptrace us, when we still have CAP_SETUID.
-		// (this is mitigated anyway on most distros by ptrace_scope=1)
-		fprintf(stderr,"%s: FATAL: prctl(PR_SET_DUMPABLE) failed while attempting to relinquish root permissions" ZT_EOL_S,procName);
-		exit(1);
-	}
-
-	// Relinquish root
-	if (setgid(targetUser->pw_gid) < 0) {
-		perror("setgid");
-		exit(1);
-	}
-	if (setuid(targetUser->pw_uid) < 0) {
-		perror("setuid");
-		exit(1);
-	}
-
-	if (_setCapabilities((1 << CAP_NET_ADMIN) | (1 << CAP_NET_RAW) | (1 << CAP_NET_BIND_SERVICE)) < 0) {
-		fprintf(stderr,"%s: FATAL: unable to drop capabilities after relinquishing root" ZT_EOL_S,procName);
-		exit(1);
-	}
-
-	if (prctl(PR_SET_DUMPABLE, oldDumpable) < 0) {
-		fprintf(stderr,"%s: FATAL: prctl(PR_SET_DUMPABLE) failed while attempting to relinquish root permissions" ZT_EOL_S,procName);
-		exit(1);
-	}
-
-	if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_ADMIN, 0, 0) < 0) {
-		fprintf(stderr,"%s: FATAL: prctl(PR_CAP_AMBIENT,PR_CAP_AMBIENT_RAISE,CAP_NET_ADMIN) failed while attempting to relinquish root permissions" ZT_EOL_S,procName);
-		exit(1);
-	}
-	if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_RAW, 0, 0) < 0) {
-		fprintf(stderr,"%s: FATAL: prctl(PR_CAP_AMBIENT,PR_CAP_AMBIENT_RAISE,CAP_NET_RAW) failed while attempting to relinquish root permissions" ZT_EOL_S,procName);
-		exit(1);
-	}
-}
-
-} // anonymous namespace
-#endif // __LINUX__
-
 /****************************************************************************/
 /* Windows helper functions and signal handlers                             */
 /****************************************************************************/
@@ -1876,7 +775,6 @@ static BOOL WINAPI _winConsoleCtrlHandler(DWORD dwCtrlType)
 	return FALSE;
 }
 
-// TODO: revisit this with https://support.microsoft.com/en-us/help/947709/how-to-use-the-netsh-advfirewall-firewall-context-instead-of-the-netsh
 static void _winPokeAHole()
 {
 	char myPath[MAX_PATH];
@@ -2018,112 +916,46 @@ static void printHelp(const char *cn,FILE *out)
 	fprintf(out,
 		COPYRIGHT_NOTICE ZT_EOL_S
 		LICENSE_GRANT ZT_EOL_S);
-	fprintf(out,"Usage: %s [-switches] [home directory]" ZT_EOL_S"" ZT_EOL_S,cn);
-	fprintf(out,"Available switches:" ZT_EOL_S);
-	fprintf(out,"  -h                - Display this help" ZT_EOL_S);
-	fprintf(out,"  -v                - Show version" ZT_EOL_S);
-	fprintf(out,"  -U                - Skip privilege check and do not attempt to drop privileges" ZT_EOL_S);
-	fprintf(out,"  -p<port>          - Port for UDP and TCP/HTTP (default: 9993, 0 for random)" ZT_EOL_S);
+	std::string updateUrl(OneService::autoUpdateUrl());
+	if (updateUrl.length())
+		fprintf(out,"Automatic updates enabled:"ZT_EOL_S"  %s"ZT_EOL_S"  (all updates are securely authenticated by 256-bit ECDSA signature)"ZT_EOL_S""ZT_EOL_S,updateUrl.c_str());
+	fprintf(out,"Usage: %s [-switches] [home directory]"ZT_EOL_S""ZT_EOL_S,cn);
+	fprintf(out,"Available switches:"ZT_EOL_S);
+	fprintf(out,"  -h                - Display this help"ZT_EOL_S);
+	fprintf(out,"  -v                - Show version"ZT_EOL_S);
+	fprintf(out,"  -U                - Run as unprivileged user (skip privilege check)"ZT_EOL_S);
+	fprintf(out,"  -p<port>          - Port for UDP and TCP/HTTP (default: 9993, 0 for random)"ZT_EOL_S);
 
 #ifdef __UNIX_LIKE__
-	fprintf(out,"  -d                - Fork and run as daemon (Unix-ish OSes)" ZT_EOL_S);
+	fprintf(out,"  -d                - Fork and run as daemon (Unix-ish OSes)"ZT_EOL_S);
 #endif // __UNIX_LIKE__
 
 #ifdef __WINDOWS__
-	fprintf(out,"  -C                - Run from command line instead of as service (Windows)" ZT_EOL_S);
-	fprintf(out,"  -I                - Install Windows service (Windows)" ZT_EOL_S);
-	fprintf(out,"  -R                - Uninstall Windows service (Windows)" ZT_EOL_S);
-	fprintf(out,"  -D                - Remove all instances of Windows tap device (Windows)" ZT_EOL_S);
+	fprintf(out,"  -C                - Run from command line instead of as service (Windows)"ZT_EOL_S);
+	fprintf(out,"  -I                - Install Windows service (Windows)"ZT_EOL_S);
+	fprintf(out,"  -R                - Uninstall Windows service (Windows)"ZT_EOL_S);
+	fprintf(out,"  -D                - Remove all instances of Windows tap device (Windows)"ZT_EOL_S);
 #endif // __WINDOWS__
 
-	fprintf(out,"  -i                - Generate and manage identities (zerotier-idtool)" ZT_EOL_S);
-	fprintf(out,"  -q                - Query API (zerotier-cli)" ZT_EOL_S);
+	fprintf(out,"  -i                - Generate and manage identities (zerotier-idtool)"ZT_EOL_S);
+	fprintf(out,"  -q                - Query API (zerotier-cli)"ZT_EOL_S);
 }
 
-class _OneServiceRunner
-{
-public:
-	_OneServiceRunner(const char *pn,const std::string &hd,unsigned int p) : progname(pn),returnValue(0),port(p),homeDir(hd) {}
-	void threadMain()
-		throw()
-	{
-		try {
-			for(;;) {
-				zt1Service = OneService::newInstance(homeDir.c_str(),port);
-				switch(zt1Service->run()) {
-					case OneService::ONE_STILL_RUNNING: // shouldn't happen, run() won't return until done
-					case OneService::ONE_NORMAL_TERMINATION:
-						break;
-					case OneService::ONE_UNRECOVERABLE_ERROR:
-						fprintf(stderr,"%s: fatal error: %s" ZT_EOL_S,progname,zt1Service->fatalErrorMessage().c_str());
-						returnValue = 1;
-						break;
-					case OneService::ONE_IDENTITY_COLLISION: {
-						delete zt1Service;
-						zt1Service = (OneService *)0;
-						std::string oldid;
-						OSUtils::readFile((homeDir + ZT_PATH_SEPARATOR_S + "identity.secret").c_str(),oldid);
-						if (oldid.length()) {
-							OSUtils::writeFile((homeDir + ZT_PATH_SEPARATOR_S + "identity.secret.saved_after_collision").c_str(),oldid);
-							OSUtils::rm((homeDir + ZT_PATH_SEPARATOR_S + "identity.secret").c_str());
-							OSUtils::rm((homeDir + ZT_PATH_SEPARATOR_S + "identity.public").c_str());
-						}
-					}	continue; // restart!
-				}
-				break; // terminate loop -- normally we don't keep restarting
-			}
-
-			delete zt1Service;
-			zt1Service = (OneService *)0;
-		} catch ( ... ) {
-			fprintf(stderr,"%s: unexpected exception starting main OneService instance" ZT_EOL_S,progname);
-			returnValue = 1;
-		}
-	}
-	const char *progname;
-	unsigned int returnValue;
-	unsigned int port;
-	const std::string &homeDir;
-};
-
 #ifdef __WINDOWS__
-int __cdecl _tmain(int argc, _TCHAR* argv[])
+int _tmain(int argc, _TCHAR* argv[])
 #else
 int main(int argc,char **argv)
 #endif
 {
-#if defined(__LINUX__) && ( (!defined(__GLIBC__)) || ((__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 18)) )
-	// This corrects for systems with abnormally small defaults (musl) and also
-	// shrinks the stack on systems with large defaults to save a bit of memory.
-	pthread_attr_t tattr;
-	pthread_attr_init(&tattr);
-	pthread_attr_setstacksize(&tattr,1048576);
-	pthread_setattr_default_np(&tattr);
-	pthread_attr_destroy(&tattr);
-#endif
-
 #ifdef __UNIX_LIKE__
 	signal(SIGHUP,&_sighandlerHup);
 	signal(SIGPIPE,SIG_IGN);
-	signal(SIGIO,SIG_IGN);
 	signal(SIGUSR1,SIG_IGN);
 	signal(SIGUSR2,SIG_IGN);
-	signal(SIGALRM,&_sighandlerReallyQuit);
+	signal(SIGALRM,SIG_IGN);
 	signal(SIGINT,&_sighandlerQuit);
 	signal(SIGTERM,&_sighandlerQuit);
 	signal(SIGQUIT,&_sighandlerQuit);
-	signal(SIGINT,&_sighandlerQuit);
-
-#ifdef ZT_EXTOSDEP
-	int extosdepFd1 = -1;
-	int extosdepFd2 = -1;
-	for(int i=1;i<argc;++i) {
-		if (argv[i][0] != '-' || argv[i][1] != 'x') continue;
-		if (sscanf(argv[i] + 2, "%d,%d", &extosdepFd1, &extosdepFd2) == 2) break;
-		fprintf(stderr, "bad extosdepFd\n");
-		return 1;
-	}
-#endif // ZT_EXTOSDEP
 
 	/* Ensure that there are no inherited file descriptors open from a previous
 	 * incarnation. This is a hack to ensure that GitHub issue #61 or variants
@@ -2132,12 +964,8 @@ int main(int argc,char **argv)
 		int mfd = STDIN_FILENO;
 		if (STDOUT_FILENO > mfd) mfd = STDOUT_FILENO;
 		if (STDERR_FILENO > mfd) mfd = STDERR_FILENO;
-		for(int f=mfd+1;f<1024;++f) {
-#ifdef ZT_EXTOSDEP
-			if (f == extosdepFd1 || f == extosdepFd2) continue;
-#endif // ZT_EXTOSDEP
+		for(int f=mfd+1;f<1024;++f)
 			::close(f);
-		}
 	}
 
 	bool runAsDaemon = false;
@@ -2188,14 +1016,14 @@ int main(int argc,char **argv)
 					break;
 
 				case 'v': // Display version
-					printf("%d.%d.%d" ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION);
+					printf("%d.%d.%d"ZT_EOL_S,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION);
 					return 0;
 
 				case 'i': // Invoke idtool personality
 					if (argv[i][2]) {
 						printHelp(argv[0],stdout);
 						return 0;
-					} else return idtool(argc-1,argv+1);
+					} else return idtool(argc,argv);
 
 				case 'q': // Invoke cli personality
 					if (argv[i][2]) {
@@ -2210,12 +1038,12 @@ int main(int argc,char **argv)
 
 				case 'I': { // Install this binary as a Windows service
 						if (IsCurrentUserLocalAdministrator() != TRUE) {
-							fprintf(stderr,"%s: must be run as a local administrator." ZT_EOL_S,argv[0]);
+							fprintf(stderr,"%s: must be run as a local administrator."ZT_EOL_S,argv[0]);
 							return 1;
 						}
 						std::string ret(InstallService(ZT_SERVICE_NAME,ZT_SERVICE_DISPLAY_NAME,ZT_SERVICE_START_TYPE,ZT_SERVICE_DEPENDENCIES,ZT_SERVICE_ACCOUNT,ZT_SERVICE_PASSWORD));
 						if (ret.length()) {
-							fprintf(stderr,"%s: unable to install service: %s" ZT_EOL_S,argv[0],ret.c_str());
+							fprintf(stderr,"%s: unable to install service: %s"ZT_EOL_S,argv[0],ret.c_str());
 							return 3;
 						}
 						return 0;
@@ -2223,12 +1051,12 @@ int main(int argc,char **argv)
 
 				case 'R': { // Uninstall this binary as Windows service
 						if (IsCurrentUserLocalAdministrator() != TRUE) {
-							fprintf(stderr,"%s: must be run as a local administrator." ZT_EOL_S,argv[0]);
+							fprintf(stderr,"%s: must be run as a local administrator."ZT_EOL_S,argv[0]);
 							return 1;
 						}
 						std::string ret(UninstallService(ZT_SERVICE_NAME));
 						if (ret.length()) {
-							fprintf(stderr,"%s: unable to uninstall service: %s" ZT_EOL_S,argv[0],ret.c_str());
+							fprintf(stderr,"%s: unable to uninstall service: %s"ZT_EOL_S,argv[0],ret.c_str());
 							return 3;
 						}
 						return 0;
@@ -2237,15 +1065,13 @@ int main(int argc,char **argv)
 				case 'D': {
 						std::string err = WindowsEthernetTap::destroyAllPersistentTapDevices();
 						if (err.length() > 0) {
-							fprintf(stderr,"%s: unable to uninstall one or more persistent tap devices: %s" ZT_EOL_S,argv[0],err.c_str());
+							fprintf(stderr,"%s: unable to uninstall one or more persistent tap devices: %s"ZT_EOL_S,argv[0],err.c_str());
 							return 3;
 						}
 						return 0;
 					} break;
 #endif // __WINDOWS__
-#ifdef ZT_EXTOSDEP
-				case 'x': break;
-#endif
+
 				case 'h':
 				case '?':
 				default:
@@ -2265,10 +1091,10 @@ int main(int argc,char **argv)
 	if (!homeDir.length())
 		homeDir = OneService::platformDefaultHomePath();
 	if (!homeDir.length()) {
-		fprintf(stderr,"%s: no home path specified and no platform default available" ZT_EOL_S,argv[0]);
+		fprintf(stderr,"%s: no home path specified and no platform default available"ZT_EOL_S,argv[0]);
 		return 1;
 	} else {
-		std::vector<std::string> hpsp(OSUtils::split(homeDir.c_str(),ZT_PATH_SEPARATOR_S,"",""));
+		std::vector<std::string> hpsp(Utils::split(homeDir.c_str(),ZT_PATH_SEPARATOR_S,"",""));
 		std::string ptmp;
 		if (homeDir[0] == ZT_PATH_SEPARATOR)
 			ptmp.push_back(ZT_PATH_SEPARATOR);
@@ -2278,49 +1104,22 @@ int main(int argc,char **argv)
 			ptmp.append(*pi);
 			if ((*pi != ".")&&(*pi != "..")) {
 				if (!OSUtils::mkdir(ptmp))
-					throw std::runtime_error("home path does not exist, and could not create. Please verify local system permissions.");
+					throw std::runtime_error("home path does not exist, and could not create");
 			}
 		}
 	}
 
-	// Check and fix permissions on critical files at startup
-	try {
-		char p[4096];
-		OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "identity.secret", homeDir.c_str());
-		if (OSUtils::fileExists(p)) {
-			OSUtils::lockDownFile(p, false);
-		}
-	}
-	catch (...) {
-	}
-
-	try {
-		char p[4096];
-		OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "authtoken.secret", homeDir.c_str());
-		if (OSUtils::fileExists(p)) {
-			OSUtils::lockDownFile(p, false);
-		}
-	}
-	catch (...) {
-	}
-
-	// This can be removed once the new controller code has been around for many versions
-	if (OSUtils::fileExists((homeDir + ZT_PATH_SEPARATOR_S + "controller.db").c_str(),true)) {
-		fprintf(stderr,"%s: FATAL: an old controller.db exists in %s -- see instructions in controller/README.md for how to migrate!" ZT_EOL_S,argv[0],homeDir.c_str());
-		return 1;
-	}
-
 #ifdef __UNIX_LIKE__
 #ifndef ZT_ONE_NO_ROOT_CHECK
 	if ((!skipRootCheck)&&(getuid() != 0)) {
-		fprintf(stderr,"%s: must be run as root (uid 0)" ZT_EOL_S,argv[0]);
+		fprintf(stderr,"%s: must be run as root (uid 0)"ZT_EOL_S,argv[0]);
 		return 1;
 	}
 #endif // !ZT_ONE_NO_ROOT_CHECK
 	if (runAsDaemon) {
 		long p = (long)fork();
 		if (p < 0) {
-			fprintf(stderr,"%s: could not fork" ZT_EOL_S,argv[0]);
+			fprintf(stderr,"%s: could not fork"ZT_EOL_S,argv[0]);
 			return 1;
 		} else if (p > 0)
 			return 0; // forked
@@ -2337,7 +1136,7 @@ int main(int argc,char **argv)
 		// Running in "interactive" mode (mostly for debugging)
 		if (IsCurrentUserLocalAdministrator() != TRUE) {
 			if (!skipRootCheck) {
-				fprintf(stderr,"%s: must be run as a local administrator." ZT_EOL_S,argv[0]);
+				fprintf(stderr,"%s: must be run as a local administrator."ZT_EOL_S,argv[0]);
 				return 1;
 			}
 		} else {
@@ -2348,22 +1147,17 @@ int main(int argc,char **argv)
 	} else {
 		// Running from service manager
 		_winPokeAHole();
-		ZeroTierOneService zt1WindowsService;
-		if (CServiceBase::Run(zt1WindowsService) == TRUE) {
+		ZeroTierOneService zt1Service;
+		if (CServiceBase::Run(zt1Service) == TRUE) {
 			return 0;
 		} else {
-			fprintf(stderr,"%s: unable to start service (try -h for help)" ZT_EOL_S,argv[0]);
+			fprintf(stderr,"%s: unable to start service (try -h for help)"ZT_EOL_S,argv[0]);
 			return 1;
 		}
 	}
 #endif // __WINDOWS__
 
 #ifdef __UNIX_LIKE__
-#ifdef ZT_HAVE_DROP_PRIVILEGES
-	if (!skipRootCheck)
-		dropPrivileges(argv[0],homeDir);
-#endif
-
 	std::string pidPath(homeDir + ZT_PATH_SEPARATOR_S + ZT_PID_PATH);
 	{
 		// Write .pid file to home folder
@@ -2375,22 +1169,39 @@ int main(int argc,char **argv)
 	}
 #endif // __UNIX_LIKE__
 
-#ifdef ZT_EXTOSDEP
-	if (extosdepFd1 < 0) {
-		fprintf(stderr, "no extosdepFd specified\n");
-		OSUtils::rm(pidPath.c_str());
-		return 1;
-	}
-	ExtOsdep::init(extosdepFd1, extosdepFd2);
-#endif
+	unsigned int returnValue = 0;
 
-	_OneServiceRunner thr(argv[0],homeDir,port);
-	thr.threadMain();
-	//Thread::join(Thread::start(&thr));
+	for(;;) {
+		zt1Service = OneService::newInstance(homeDir.c_str(),port);
+		switch(zt1Service->run()) {
+			case OneService::ONE_STILL_RUNNING: // shouldn't happen, run() won't return until done
+			case OneService::ONE_NORMAL_TERMINATION:
+				break;
+			case OneService::ONE_UNRECOVERABLE_ERROR:
+				fprintf(stderr,"%s: fatal error: %s"ZT_EOL_S,argv[0],zt1Service->fatalErrorMessage().c_str());
+				returnValue = 1;
+				break;
+			case OneService::ONE_IDENTITY_COLLISION: {
+				delete zt1Service;
+				zt1Service = (OneService *)0;
+				std::string oldid;
+				OSUtils::readFile((homeDir + ZT_PATH_SEPARATOR_S + "identity.secret").c_str(),oldid);
+				if (oldid.length()) {
+					OSUtils::writeFile((homeDir + ZT_PATH_SEPARATOR_S + "identity.secret.saved_after_collision").c_str(),oldid);
+					OSUtils::rm((homeDir + ZT_PATH_SEPARATOR_S + "identity.secret").c_str());
+					OSUtils::rm((homeDir + ZT_PATH_SEPARATOR_S + "identity.public").c_str());
+				}
+			}	continue; // restart!
+		}
+		break; // terminate loop -- normally we don't keep restarting
+	}
+
+	delete zt1Service;
+	zt1Service = (OneService *)0;
 
 #ifdef __UNIX_LIKE__
 	OSUtils::rm(pidPath.c_str());
 #endif
 
-	return thr.returnValue;
+	return returnValue;
 }
diff --git a/osdep/Arp.cpp b/osdep/Arp.cpp
index 8b307eb58..fcc122f0e 100644
--- a/osdep/Arp.cpp
+++ b/osdep/Arp.cpp
@@ -1,38 +1,44 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
-
-#include "Arp.hpp"
-
-#include "OSUtils.hpp"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
+
+#include "Arp.hpp"
+#include "OSUtils.hpp"
 
 namespace ZeroTier {
 
-static const uint8_t ARP_REQUEST_HEADER[8] = { 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x01 };
-static const uint8_t ARP_RESPONSE_HEADER[8] = { 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x02 };
+static const uint8_t ARP_REQUEST_HEADER[8] = { 0x00,0x01,0x08,0x00,0x06,0x04,0x00,0x01 };
+static const uint8_t ARP_RESPONSE_HEADER[8] = { 0x00,0x01,0x08,0x00,0x06,0x04,0x00,0x02 };
 
-Arp::Arp() : _cache(256), _lastCleaned(OSUtils::now())
+Arp::Arp() :
+	_cache(256),
+	_lastCleaned(OSUtils::now())
 {
 }
 
-void Arp::addLocal(uint32_t ip, const MAC& mac)
+void Arp::addLocal(uint32_t ip,const MAC &mac)
 {
-	_ArpEntry& e = _cache[ip];
-	e.lastQuerySent = 0;		  // local IP
-	e.lastResponseReceived = 0;	  // local IP
+	_ArpEntry &e = _cache[ip];
+	e.lastQuerySent = 0; // local IP
+	e.lastResponseReceived = 0; // local IP
 	e.mac = mac;
 	e.local = true;
 }
@@ -42,7 +48,7 @@ void Arp::remove(uint32_t ip)
 	_cache.erase(ip);
 }
 
-uint32_t Arp::processIncomingArp(const void* arp, unsigned int len, void* response, unsigned int& responseLen, MAC& responseDest)
+uint32_t Arp::processIncomingArp(const void *arp,unsigned int len,void *response,unsigned int &responseLen,MAC &responseDest)
 {
 	const uint64_t now = OSUtils::now();
 	uint32_t ip = 0;
@@ -51,26 +57,25 @@ uint32_t Arp::processIncomingArp(const void* arp, unsigned int len, void* respon
 	responseDest.zero();
 
 	if (len >= 28) {
-		if (! memcmp(arp, ARP_REQUEST_HEADER, 8)) {
+		if (!memcmp(arp,ARP_REQUEST_HEADER,8)) {
 			// Respond to ARP requests for locally-known IPs
-			_ArpEntry* targetEntry = _cache.get(reinterpret_cast<const uint32_t*>(arp)[6]);
-			if ((targetEntry) && (targetEntry->local)) {
-				memcpy(response, ARP_RESPONSE_HEADER, 8);
-				targetEntry->mac.copyTo(reinterpret_cast<uint8_t*>(response) + 8, 6);
-				memcpy(reinterpret_cast<uint8_t*>(response) + 14, reinterpret_cast<const uint8_t*>(arp) + 24, 4);
-				memcpy(reinterpret_cast<uint8_t*>(response) + 18, reinterpret_cast<const uint8_t*>(arp) + 8, 10);
+			_ArpEntry *targetEntry = _cache.get(reinterpret_cast<const uint32_t *>(arp)[6]);
+			if ((targetEntry)&&(targetEntry->local)) {
+				memcpy(response,ARP_RESPONSE_HEADER,8);
+				targetEntry->mac.copyTo(reinterpret_cast<uint8_t *>(response) + 8,6);
+				memcpy(reinterpret_cast<uint8_t *>(response) + 14,reinterpret_cast<const uint8_t *>(arp) + 24,4);
+				memcpy(reinterpret_cast<uint8_t *>(response) + 18,reinterpret_cast<const uint8_t *>(arp) + 8,10);
 				responseLen = 28;
-				responseDest.setTo(reinterpret_cast<const uint8_t*>(arp) + 8, 6);
+				responseDest.setTo(reinterpret_cast<const uint8_t *>(arp) + 8,6);
 			}
-		}
-		else if (! memcmp(arp, ARP_RESPONSE_HEADER, 8)) {
+		} else if (!memcmp(arp,ARP_RESPONSE_HEADER,8)) {
 			// Learn cache entries for remote IPs from relevant ARP replies
 			uint32_t responseIp = 0;
-			memcpy(&responseIp, reinterpret_cast<const uint8_t*>(arp) + 14, 4);
-			_ArpEntry* queryEntry = _cache.get(responseIp);
-			if ((queryEntry) && (! queryEntry->local) && ((now - queryEntry->lastQuerySent) <= ZT_ARP_QUERY_MAX_TTL)) {
+			memcpy(&responseIp,reinterpret_cast<const uint8_t *>(arp) + 14,4);
+			_ArpEntry *queryEntry = _cache.get(responseIp);
+			if ((queryEntry)&&(!queryEntry->local)&&((now - queryEntry->lastQuerySent) <= ZT_ARP_QUERY_MAX_TTL)) {
 				queryEntry->lastResponseReceived = now;
-				queryEntry->mac.setTo(reinterpret_cast<const uint8_t*>(arp) + 8, 6);
+				queryEntry->mac.setTo(reinterpret_cast<const uint8_t *>(arp) + 8,6);
 				ip = responseIp;
 			}
 		}
@@ -78,11 +83,11 @@ uint32_t Arp::processIncomingArp(const void* arp, unsigned int len, void* respon
 
 	if ((now - _lastCleaned) >= ZT_ARP_EXPIRE) {
 		_lastCleaned = now;
-		Hashtable<uint32_t, _ArpEntry>::Iterator i(_cache);
-		uint32_t* k = (uint32_t*)0;
-		_ArpEntry* v = (_ArpEntry*)0;
-		while (i.next(k, v)) {
-			if ((! v->local) && ((now - v->lastResponseReceived) >= ZT_ARP_EXPIRE))
+		Hashtable< uint32_t,_ArpEntry >::Iterator i(_cache);
+		uint32_t *k = (uint32_t *)0;
+		_ArpEntry *v = (_ArpEntry *)0;
+		while (i.next(k,v)) {
+			if ((!v->local)&&((now - v->lastResponseReceived) >= ZT_ARP_EXPIRE))
 				_cache.erase(*k);
 		}
 	}
@@ -90,32 +95,27 @@ uint32_t Arp::processIncomingArp(const void* arp, unsigned int len, void* respon
 	return ip;
 }
 
-MAC Arp::query(const MAC& localMac, uint32_t localIp, uint32_t targetIp, void* query, unsigned int& queryLen, MAC& queryDest)
+MAC Arp::query(const MAC &localMac,uint32_t localIp,uint32_t targetIp,void *query,unsigned int &queryLen,MAC &queryDest)
 {
 	const uint64_t now = OSUtils::now();
 
-	_ArpEntry& e = _cache[targetIp];
+	_ArpEntry &e = _cache[targetIp];
 
-	if (((e.mac) && ((now - e.lastResponseReceived) >= (ZT_ARP_EXPIRE / 3))) || ((! e.mac) && ((now - e.lastQuerySent) >= ZT_ARP_QUERY_INTERVAL))) {
+	if ( ((e.mac)&&((now - e.lastResponseReceived) >= (ZT_ARP_EXPIRE / 3))) ||
+	     ((!e.mac)&&((now - e.lastQuerySent) >= ZT_ARP_QUERY_INTERVAL)) ) {
 		e.lastQuerySent = now;
 
-		uint8_t* q = reinterpret_cast<uint8_t*>(query);
-		memcpy(q, ARP_REQUEST_HEADER, 8);
-		q += 8;	  // ARP request header information, always the same
-		localMac.copyTo(q, 6);
-		q += 6;	  // sending host MAC address
-		memcpy(q, &localIp, 4);
-		q += 4;	  // sending host IP (IP already in big-endian byte order)
-		memset(q, 0, 6);
-		q += 6;					   // sending zeros for target MAC address as thats what we want to find
-		memcpy(q, &targetIp, 4);   // target IP address for resolution (IP already in big-endian byte order)
+		uint8_t *q = reinterpret_cast<uint8_t *>(query);
+		memcpy(q,ARP_REQUEST_HEADER,8); q += 8; // ARP request header information, always the same
+		localMac.copyTo(q,6); q += 6; // sending host MAC address
+        memcpy(q,&localIp,4); q += 4; // sending host IP (IP already in big-endian byte order)
+		memset(q,0,6); q += 6; // sending zeros for target MAC address as thats what we want to find
+		memcpy(q,&targetIp,4); // target IP address for resolution (IP already in big-endian byte order)
 		queryLen = 28;
 		if (e.mac)
-			queryDest = e.mac;	 // confirmation query, send directly to address holder
-		else
-			queryDest = (uint64_t)0xffffffffffffULL;   // broadcast query
-	}
-	else {
+			queryDest = e.mac; // confirmation query, send directly to address holder
+		else queryDest = (uint64_t)0xffffffffffffULL; // broadcast query
+	} else {
 		queryLen = 0;
 		queryDest.zero();
 	}
@@ -123,4 +123,4 @@ MAC Arp::query(const MAC& localMac, uint32_t localIp, uint32_t targetIp, void* q
 	return e.mac;
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/osdep/Arp.hpp b/osdep/Arp.hpp
index 51257ef5e..5f0d199a8 100644
--- a/osdep/Arp.hpp
+++ b/osdep/Arp.hpp
@@ -1,26 +1,32 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_ARP_HPP
 #define ZT_ARP_HPP
 
+#include <stdint.h>
+
+#include <utility>
+
 #include "../node/Constants.hpp"
 #include "../node/Hashtable.hpp"
 #include "../node/MAC.hpp"
 
-#include <stdint.h>
-#include <utility>
-
 /**
  * Maximum possible ARP length
  *
@@ -66,8 +72,9 @@ namespace ZeroTier {
  * This class is not thread-safe and must be guarded if used in multi-threaded
  * code.
  */
-class Arp {
-  public:
+class Arp
+{
+public:
 	Arp();
 
 	/**
@@ -76,7 +83,7 @@ class Arp {
 	 * @param mac Our local MAC address
 	 * @param ip IP in big-endian byte order (sin_addr.s_addr)
 	 */
-	void addLocal(uint32_t ip, const MAC& mac);
+	void addLocal(uint32_t ip,const MAC &mac);
 
 	/**
 	 * Delete a local IP entry or a cached ARP entry
@@ -101,7 +108,7 @@ class Arp {
 	 * @param responseDest Destination of response, or set to null if no response
 	 * @return IP address learned or 0 if no new IPs in cache
 	 */
-	uint32_t processIncomingArp(const void* arp, unsigned int len, void* response, unsigned int& responseLen, MAC& responseDest);
+	uint32_t processIncomingArp(const void *arp,unsigned int len,void *response,unsigned int &responseLen,MAC &responseDest);
 
 	/**
 	 * Get the MAC corresponding to an IP, generating a query if needed
@@ -113,30 +120,29 @@ class Arp {
 	 * MAC returned is non-null.
 	 *
 	 * @param localMac Local MAC address of host interface
-	 * @param localIp Local IP address of host interface
+     * @param localIp Local IP address of host interface
 	 * @param targetIp IP to look up
 	 * @param query Buffer for generated query -- MUST be a minimum of ZT_ARP_BUF_LENGTH in size
 	 * @param queryLen Length of generated query, or set to 0 if no query generated
 	 * @param queryDest Destination of query, or set to null if no query generated
 	 * @return MAC or 0 if no cached entry for this IP
 	 */
-	MAC query(const MAC& localMac, uint32_t localIp, uint32_t targetIp, void* query, unsigned int& queryLen, MAC& queryDest);
+	MAC query(const MAC &localMac,uint32_t localIp,uint32_t targetIp,void *query,unsigned int &queryLen,MAC &queryDest);
 
-  private:
-	struct _ArpEntry {
-		_ArpEntry() : lastQuerySent(0), lastResponseReceived(0), mac(), local(false)
-		{
-		}
-		uint64_t lastQuerySent;			 // Time last query was sent or 0 for local IP
-		uint64_t lastResponseReceived;	 // Time of last ARP response or 0 for local IP
-		MAC mac;						 // MAC address of device responsible for IP or null if not known yet
-		bool local;						 // True if this is a local ARP entry
+private:
+	struct _ArpEntry
+	{
+		_ArpEntry() : lastQuerySent(0),lastResponseReceived(0),mac(),local(false) {}
+		uint64_t lastQuerySent; // Time last query was sent or 0 for local IP
+		uint64_t lastResponseReceived; // Time of last ARP response or 0 for local IP
+		MAC mac; // MAC address of device responsible for IP or null if not known yet
+		bool local; // True if this is a local ARP entry
 	};
 
-	Hashtable<uint32_t, _ArpEntry> _cache;
+	Hashtable< uint32_t,_ArpEntry > _cache;
 	uint64_t _lastCleaned;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/osdep/BSDEthernetTap.cpp b/osdep/BSDEthernetTap.cpp
index e1e0d42e5..3e0c22642 100644
--- a/osdep/BSDEthernetTap.cpp
+++ b/osdep/BSDEthernetTap.cpp
@@ -1,94 +1,93 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "BSDEthernetTap.hpp"
-
-#include "../node/Constants.hpp"
-#include "../node/Mutex.hpp"
-#include "../node/Utils.hpp"
-#include "OSUtils.hpp"
-
-#include <algorithm>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <ifaddrs.h>
-#include <map>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <pthread_np.h>
-#include <sched.h>
-#include <set>
-#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
-#include <sys/cdefs.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/wait.h>
+#include <errno.h>
+
 #include <unistd.h>
+#include <signal.h>
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <sys/select.h>
+#include <sys/cdefs.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <ifaddrs.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/route.h>
+
+#include <string>
+#include <map>
+#include <set>
+#include <algorithm>
 #include <utility>
 
+#include "../node/Constants.hpp"
+#include "../node/Utils.hpp"
+#include "../node/Mutex.hpp"
+#include "OSUtils.hpp"
+#include "BSDEthernetTap.hpp"
+
 #define ZT_BASE32_CHARS "0123456789abcdefghijklmnopqrstuv"
-#define ZT_TAP_BUF_SIZE (1024 * 16)
 
 // ff:ff:ff:ff:ff:ff with no ADI
-static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff), 0);
+static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff),0);
 
 namespace ZeroTier {
 
 BSDEthernetTap::BSDEthernetTap(
-	const char* homePath,
-	unsigned int concurrency,
-	bool pinning,
-	const MAC& mac,
+	const char *homePath,
+	const MAC &mac,
 	unsigned int mtu,
 	unsigned int metric,
 	uint64_t nwid,
-	const char* friendlyName,
-	void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-	void* arg)
-	: _handler(handler)
-	, _concurrency(concurrency)
-	, _pinning(pinning)
-	, _arg(arg)
-	, _nwid(nwid)
-	, _mtu(mtu)
-	, _metric(metric)
-	, _fd(0)
-	, _enabled(true)
-	, _lastIfAddrsUpdate(0)
+	const char *friendlyName,
+	void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+	void *arg) :
+	_handler(handler),
+	_arg(arg),
+	_nwid(nwid),
+	_mtu(mtu),
+	_metric(metric),
+	_fd(0),
+	_enabled(true)
 {
 	static Mutex globalTapCreateLock;
-	char devpath[64], ethaddr[64], mtustr[32], metstr[32], tmpdevname[32];
-
-	Mutex::Lock _gl(globalTapCreateLock);
-
-#ifdef __FreeBSD__
-	/* FreeBSD allows long interface names and interface renaming */
+	char devpath[64],ethaddr[64],mtustr[32],metstr[32],tmpdevname[32];
+	struct stat stattmp;
 
+	// On FreeBSD at least we can rename, so use nwid to generate a deterministic unique zt#### name using base32
+	// As a result we don't use desiredDevice
 	_dev = "zt";
 	_dev.push_back(ZT_BASE32_CHARS[(unsigned long)((nwid >> 60) & 0x1f)]);
 	_dev.push_back(ZT_BASE32_CHARS[(unsigned long)((nwid >> 55) & 0x1f)]);
@@ -104,93 +103,68 @@ BSDEthernetTap::BSDEthernetTap(
 	_dev.push_back(ZT_BASE32_CHARS[(unsigned long)((nwid >> 5) & 0x1f)]);
 	_dev.push_back(ZT_BASE32_CHARS[(unsigned long)(nwid & 0x1f)]);
 
+	Mutex::Lock _gl(globalTapCreateLock);
+
+	if (mtu > 2800)
+		throw std::runtime_error("max tap MTU is 2800");
+
+	// On BSD we create taps and they can have high numbers, so use ones starting
+	// at 9993 to not conflict with other stuff. Then we rename it to zt<base32 of nwid>
 	std::vector<std::string> devFiles(OSUtils::listDirectory("/dev"));
-	for (int i = 9993; i < (9993 + 128); ++i) {
-		OSUtils::ztsnprintf(tmpdevname, sizeof(tmpdevname), "tap%d", i);
-		OSUtils::ztsnprintf(devpath, sizeof(devpath), "/dev/%s", tmpdevname);
-		if (std::find(devFiles.begin(), devFiles.end(), std::string(tmpdevname)) == devFiles.end()) {
+	for(int i=9993;i<(9993+128);++i) {
+		Utils::snprintf(tmpdevname,sizeof(tmpdevname),"tap%d",i);
+		Utils::snprintf(devpath,sizeof(devpath),"/dev/%s",tmpdevname);
+		if (std::find(devFiles.begin(),devFiles.end(),std::string(tmpdevname)) == devFiles.end()) {
 			long cpid = (long)vfork();
 			if (cpid == 0) {
-#ifdef ZT_TRACE
-				fprintf(stderr, "DEBUG: ifconfig %s create" ZT_EOL_S, tmpdevname);
-#endif
-				::execl("/sbin/ifconfig", "/sbin/ifconfig", tmpdevname, "create", (const char*)0);
+				::execl("/sbin/ifconfig","/sbin/ifconfig",tmpdevname,"create",(const char *)0);
 				::_exit(-1);
-			}
-			else if (cpid > 0) {
+			} else if (cpid > 0) {
 				int exitcode = -1;
-				::waitpid(cpid, &exitcode, 0);
-			}
-			else
-				throw std::runtime_error("fork() failed");
+				::waitpid(cpid,&exitcode,0);
+			} else throw std::runtime_error("fork() failed");
 
-			struct stat stattmp;
-			if (! stat(devpath, &stattmp)) {
+			if (!stat(devpath,&stattmp)) {
 				cpid = (long)vfork();
 				if (cpid == 0) {
-#ifdef ZT_TRACE
-					fprintf(stderr, "DEBUG: ifconfig %s name %s" ZT_EOL_S, tmpdevname, _dev.c_str());
-#endif
-					::execl("/sbin/ifconfig", "/sbin/ifconfig", tmpdevname, "name", _dev.c_str(), (const char*)0);
+					::execl("/sbin/ifconfig","/sbin/ifconfig",tmpdevname,"name",_dev.c_str(),(const char *)0);
 					::_exit(-1);
-				}
-				else if (cpid > 0) {
+				} else if (cpid > 0) {
 					int exitcode = -1;
-					::waitpid(cpid, &exitcode, 0);
+					::waitpid(cpid,&exitcode,0);
 					if (exitcode)
 						throw std::runtime_error("ifconfig rename operation failed");
-				}
-				else
-					throw std::runtime_error("fork() failed");
+				} else throw std::runtime_error("fork() failed");
 
-				_fd = ::open(devpath, O_RDWR);
+				_fd = ::open(devpath,O_RDWR);
 				if (_fd > 0)
 					break;
-				else
-					throw std::runtime_error("unable to open created tap device");
-			}
-			else {
+				else throw std::runtime_error("unable to open created tap device");
+			} else {
 				throw std::runtime_error("cannot find /dev node for newly created tap device");
 			}
 		}
 	}
-#else
-	/* Other BSDs like OpenBSD only have a limited number of tap devices that cannot be renamed */
-
-	for (int i = 0; i < 64; ++i) {
-		OSUtils::ztsnprintf(tmpdevname, sizeof(tmpdevname), "tap%d", i);
-		OSUtils::ztsnprintf(devpath, sizeof(devpath), "/dev/%s", tmpdevname);
-		_fd = ::open(devpath, O_RDWR);
-		if (_fd > 0) {
-			_dev = tmpdevname;
-			break;
-		}
-	}
-#endif
 
 	if (_fd <= 0)
 		throw std::runtime_error("unable to open TAP device or no more devices available");
 
-	if (fcntl(_fd, F_SETFL, fcntl(_fd, F_GETFL) & ~O_NONBLOCK) == -1) {
+	if (fcntl(_fd,F_SETFL,fcntl(_fd,F_GETFL) & ~O_NONBLOCK) == -1) {
 		::close(_fd);
 		throw std::runtime_error("unable to set flags on file descriptor for TAP device");
 	}
 
 	// Configure MAC address and MTU, bring interface up
-	OSUtils::ztsnprintf(ethaddr, sizeof(ethaddr), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", (int)mac[0], (int)mac[1], (int)mac[2], (int)mac[3], (int)mac[4], (int)mac[5]);
-	OSUtils::ztsnprintf(mtustr, sizeof(mtustr), "%u", _mtu);
-	OSUtils::ztsnprintf(metstr, sizeof(metstr), "%u", _metric);
+	Utils::snprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
+	Utils::snprintf(mtustr,sizeof(mtustr),"%u",_mtu);
+	Utils::snprintf(metstr,sizeof(metstr),"%u",_metric);
 	long cpid = (long)vfork();
 	if (cpid == 0) {
-#ifdef ZT_TRACE
-		fprintf(stderr, "DEBUG: ifconfig %s lladdr %s mtu %s metric %s up" ZT_EOL_S, _dev.c_str(), ethaddr, mtustr, metstr);
-#endif
-		::execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "lladdr", ethaddr, "mtu", mtustr, "metric", metstr, "up", (const char*)0);
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"lladdr",ethaddr,"mtu",mtustr,"metric",metstr,"up",(const char *)0);
 		::_exit(-1);
-	}
-	else if (cpid > 0) {
+	} else if (cpid > 0) {
 		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
+		::waitpid(cpid,&exitcode,0);
 		if (exitcode) {
 			::close(_fd);
 			throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
@@ -198,7 +172,7 @@ BSDEthernetTap::BSDEthernetTap(
 	}
 
 	// Set close-on-exec so that devices cannot persist if we fork/exec for update
-	fcntl(_fd, F_SETFD, fcntl(_fd, F_GETFD) | FD_CLOEXEC);
+	fcntl(_fd,F_SETFD,fcntl(_fd,F_GETFD) | FD_CLOEXEC);
 
 	::pipe(_shutdownSignalPipe);
 
@@ -207,25 +181,19 @@ BSDEthernetTap::BSDEthernetTap(
 
 BSDEthernetTap::~BSDEthernetTap()
 {
-	::write(_shutdownSignalPipe[1], "\0", 1);	// causes thread to exit
+	::write(_shutdownSignalPipe[1],"\0",1); // causes thread to exit
+	Thread::join(_thread);
 	::close(_fd);
 	::close(_shutdownSignalPipe[0]);
 	::close(_shutdownSignalPipe[1]);
+
 	long cpid = (long)vfork();
 	if (cpid == 0) {
-#ifdef ZT_TRACE
-		fprintf(stderr, "DEBUG: ifconfig %s destroy" ZT_EOL_S, _dev.c_str());
-#endif
-		::execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "destroy", (const char*)0);
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"destroy",(const char *)0);
 		::_exit(-1);
-	}
-	else if (cpid > 0) {
+	} else if (cpid > 0) {
 		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
-	}
-	Thread::join(_thread);
-	for (std::thread& t : _rxThreads) {
-		t.join();
+		::waitpid(cpid,&exitcode,0);
 	}
 }
 
@@ -239,66 +207,56 @@ bool BSDEthernetTap::enabled() const
 	return _enabled;
 }
 
-static bool ___removeIp(const std::string& _dev, const InetAddress& ip)
+static bool ___removeIp(const std::string &_dev,const InetAddress &ip)
 {
 	long cpid = (long)vfork();
 	if (cpid == 0) {
-		char ipbuf[64];
-#ifdef ZT_TRACE
-		fprintf(stderr, "DEBUG: ifconfig %s inet %s -alias" ZT_EOL_S, _dev.c_str(), ip.toIpString(ipbuf));
-#endif
-		execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "inet", ip.toIpString(ipbuf), "-alias", (const char*)0);
+		execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"inet",ip.toIpString().c_str(),"-alias",(const char *)0);
 		_exit(-1);
-	}
-	else if (cpid > 0) {
+	} else if (cpid > 0) {
 		int exitcode = -1;
-		waitpid(cpid, &exitcode, 0);
+		waitpid(cpid,&exitcode,0);
 		return (exitcode == 0);
 	}
-	return false;	// never reached, make compiler shut up about return value
+	return false; // never reached, make compiler shut up about return value
 }
 
-bool BSDEthernetTap::addIp(const InetAddress& ip)
+bool BSDEthernetTap::addIp(const InetAddress &ip)
 {
-	if (! ip)
+	if (!ip)
 		return false;
 
 	std::vector<InetAddress> allIps(ips());
-	if (std::find(allIps.begin(), allIps.end(), ip) != allIps.end())
-		return true;   // IP/netmask already assigned
+	if (std::find(allIps.begin(),allIps.end(),ip) != allIps.end())
+		return true; // IP/netmask already assigned
 
 	// Remove and reconfigure if address is the same but netmask is different
-	for (std::vector<InetAddress>::iterator i(allIps.begin()); i != allIps.end(); ++i) {
-		if ((i->ipsEqual(ip)) && (i->netmaskBits() != ip.netmaskBits())) {
-			if (___removeIp(_dev, *i))
+	for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
+		if ((i->ipsEqual(ip))&&(i->netmaskBits() != ip.netmaskBits())) {
+			if (___removeIp(_dev,*i))
 				break;
 		}
 	}
 
 	long cpid = (long)vfork();
 	if (cpid == 0) {
-		char tmp[128];
-#ifdef ZT_TRACE
-		fprintf(stderr, "DEBUG: ifconfig %s %s %s alias" ZT_EOL_S, _dev.c_str(), ip.isV4() ? "inet" : "inet6", ip.toString(tmp));
-#endif
-		::execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), ip.isV4() ? "inet" : "inet6", ip.toString(tmp), "alias", (const char*)0);
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),ip.isV4() ? "inet" : "inet6",ip.toString().c_str(),"alias",(const char *)0);
 		::_exit(-1);
-	}
-	else if (cpid > 0) {
+	} else if (cpid > 0) {
 		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
+		::waitpid(cpid,&exitcode,0);
 		return (exitcode == 0);
 	}
 	return false;
 }
 
-bool BSDEthernetTap::removeIp(const InetAddress& ip)
+bool BSDEthernetTap::removeIp(const InetAddress &ip)
 {
-	if (! ip)
+	if (!ip)
 		return false;
 	std::vector<InetAddress> allIps(ips());
-	if (std::find(allIps.begin(), allIps.end(), ip) != allIps.end()) {
-		if (___removeIp(_dev, ip))
+	if (std::find(allIps.begin(),allIps.end(),ip) != allIps.end()) {
+		if (___removeIp(_dev,ip))
 			return true;
 	}
 	return false;
@@ -306,35 +264,28 @@ bool BSDEthernetTap::removeIp(const InetAddress& ip)
 
 std::vector<InetAddress> BSDEthernetTap::ips() const
 {
-	uint64_t now = OSUtils::now();
-
-	if ((now - _lastIfAddrsUpdate) <= GETIFADDRS_CACHE_TIME) {
-		return _ifaddrs;
-	}
-	_lastIfAddrsUpdate = now;
-
-	struct ifaddrs* ifa = (struct ifaddrs*)0;
+	struct ifaddrs *ifa = (struct ifaddrs *)0;
 	if (getifaddrs(&ifa))
 		return std::vector<InetAddress>();
 
 	std::vector<InetAddress> r;
 
-	struct ifaddrs* p = ifa;
+	struct ifaddrs *p = ifa;
 	while (p) {
-		if ((! strcmp(p->ifa_name, _dev.c_str())) && (p->ifa_addr) && (p->ifa_netmask) && (p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
-			switch (p->ifa_addr->sa_family) {
+		if ((!strcmp(p->ifa_name,_dev.c_str()))&&(p->ifa_addr)&&(p->ifa_netmask)&&(p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
+			switch(p->ifa_addr->sa_family) {
 				case AF_INET: {
-					struct sockaddr_in* sin = (struct sockaddr_in*)p->ifa_addr;
-					struct sockaddr_in* nm = (struct sockaddr_in*)p->ifa_netmask;
-					r.push_back(InetAddress(&(sin->sin_addr.s_addr), 4, Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
-				} break;
+					struct sockaddr_in *sin = (struct sockaddr_in *)p->ifa_addr;
+					struct sockaddr_in *nm = (struct sockaddr_in *)p->ifa_netmask;
+					r.push_back(InetAddress(&(sin->sin_addr.s_addr),4,Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
+				}	break;
 				case AF_INET6: {
-					struct sockaddr_in6* sin = (struct sockaddr_in6*)p->ifa_addr;
-					struct sockaddr_in6* nm = (struct sockaddr_in6*)p->ifa_netmask;
+					struct sockaddr_in6 *sin = (struct sockaddr_in6 *)p->ifa_addr;
+					struct sockaddr_in6 *nm = (struct sockaddr_in6 *)p->ifa_netmask;
 					uint32_t b[4];
-					memcpy(b, nm->sin6_addr.s6_addr, sizeof(b));
-					r.push_back(InetAddress(sin->sin6_addr.s6_addr, 16, Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
-				} break;
+					memcpy(b,nm->sin6_addr.s6_addr,sizeof(b));
+					r.push_back(InetAddress(sin->sin6_addr.s6_addr,16,Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
+				}	break;
 			}
 		}
 		p = p->ifa_next;
@@ -343,24 +294,22 @@ std::vector<InetAddress> BSDEthernetTap::ips() const
 	if (ifa)
 		freeifaddrs(ifa);
 
-	std::sort(r.begin(), r.end());
-	std::unique(r.begin(), r.end());
-
-	_ifaddrs = r;
+	std::sort(r.begin(),r.end());
+	std::unique(r.begin(),r.end());
 
 	return r;
 }
 
-void BSDEthernetTap::put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len)
+void BSDEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
 {
-	char putBuf[ZT_MAX_MTU + 64];
-	if ((_fd > 0) && (len <= _mtu) && (_enabled)) {
-		to.copyTo(putBuf, 6);
-		from.copyTo(putBuf + 6, 6);
-		*((uint16_t*)(putBuf + 12)) = htons((uint16_t)etherType);
-		memcpy(putBuf + 14, data, len);
+	char putBuf[4096];
+	if ((_fd > 0)&&(len <= _mtu)&&(_enabled)) {
+		to.copyTo(putBuf,6);
+		from.copyTo(putBuf + 6,6);
+		*((uint16_t *)(putBuf + 12)) = htons((uint16_t)etherType);
+		memcpy(putBuf + 14,data,len);
 		len += 14;
-		::write(_fd, putBuf, len);
+		::write(_fd,putBuf,len);
 	}
 }
 
@@ -369,148 +318,144 @@ std::string BSDEthernetTap::deviceName() const
 	return _dev;
 }
 
-void BSDEthernetTap::setFriendlyName(const char* friendlyName)
+void BSDEthernetTap::setFriendlyName(const char *friendlyName)
 {
 }
 
-void BSDEthernetTap::scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed)
+void BSDEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
 {
 	std::vector<MulticastGroup> newGroups;
 
-#ifndef __OpenBSD__
-	struct ifmaddrs* ifmap = (struct ifmaddrs*)0;
-	if (! getifmaddrs(&ifmap)) {
-		struct ifmaddrs* p = ifmap;
+	struct ifmaddrs *ifmap = (struct ifmaddrs *)0;
+	if (!getifmaddrs(&ifmap)) {
+		struct ifmaddrs *p = ifmap;
 		while (p) {
 			if (p->ifma_addr->sa_family == AF_LINK) {
-				struct sockaddr_dl* in = (struct sockaddr_dl*)p->ifma_name;
-				struct sockaddr_dl* la = (struct sockaddr_dl*)p->ifma_addr;
-				if ((la->sdl_alen == 6) && (in->sdl_nlen <= _dev.length()) && (! memcmp(_dev.data(), in->sdl_data, in->sdl_nlen)))
-					newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen, 6), 0));
+				struct sockaddr_dl *in = (struct sockaddr_dl *)p->ifma_name;
+				struct sockaddr_dl *la = (struct sockaddr_dl *)p->ifma_addr;
+				if ((la->sdl_alen == 6)&&(in->sdl_nlen <= _dev.length())&&(!memcmp(_dev.data(),in->sdl_data,in->sdl_nlen)))
+					newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen,6),0));
 			}
 			p = p->ifma_next;
 		}
 		freeifmaddrs(ifmap);
 	}
-#endif	 // __OpenBSD__
 
 	std::vector<InetAddress> allIps(ips());
-	for (std::vector<InetAddress>::iterator ip(allIps.begin()); ip != allIps.end(); ++ip)
+	for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
 		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
 
-	std::sort(newGroups.begin(), newGroups.end());
-	std::unique(newGroups.begin(), newGroups.end());
+	std::sort(newGroups.begin(),newGroups.end());
+	std::unique(newGroups.begin(),newGroups.end());
 
-	for (std::vector<MulticastGroup>::iterator m(newGroups.begin()); m != newGroups.end(); ++m) {
-		if (! std::binary_search(_multicastGroups.begin(), _multicastGroups.end(), *m))
+	for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
+		if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
 			added.push_back(*m);
 	}
-	for (std::vector<MulticastGroup>::iterator m(_multicastGroups.begin()); m != _multicastGroups.end(); ++m) {
-		if (! std::binary_search(newGroups.begin(), newGroups.end(), *m))
+	for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
+		if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
 			removed.push_back(*m);
 	}
 
 	_multicastGroups.swap(newGroups);
 }
 
-void BSDEthernetTap::setMtu(unsigned int mtu)
+/*
+bool BSDEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
 {
-	if (mtu != _mtu) {
-		_mtu = mtu;
-		long cpid = (long)vfork();
-		if (cpid == 0) {
-			char tmp[64];
-			OSUtils::ztsnprintf(tmp, sizeof(tmp), "%u", mtu);
-#ifdef ZT_TRACE
-			fprintf(stderr, "DEBUG: ifconfig %s mtu %s" ZT_EOL_S, _dev.c_str(), tmp);
-#endif
-			execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "mtu", tmp, (const char*)0);
-			_exit(-1);
+	std::set<MulticastGroup> newGroups;
+	struct ifmaddrs *ifmap = (struct ifmaddrs *)0;
+	if (!getifmaddrs(&ifmap)) {
+		struct ifmaddrs *p = ifmap;
+		while (p) {
+			if (p->ifma_addr->sa_family == AF_LINK) {
+				struct sockaddr_dl *in = (struct sockaddr_dl *)p->ifma_name;
+				struct sockaddr_dl *la = (struct sockaddr_dl *)p->ifma_addr;
+				if ((la->sdl_alen == 6)&&(in->sdl_nlen <= _dev.length())&&(!memcmp(_dev.data(),in->sdl_data,in->sdl_nlen)))
+					newGroups.insert(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen,6),0));
+			}
+			p = p->ifma_next;
 		}
-		else if (cpid > 0) {
-			int exitcode = -1;
-			waitpid(cpid, &exitcode, 0);
+		freeifmaddrs(ifmap);
+	}
+
+	{
+		std::set<InetAddress> allIps(ips());
+		for(std::set<InetAddress>::const_iterator i(allIps.begin());i!=allIps.end();++i)
+			newGroups.insert(MulticastGroup::deriveMulticastGroupForAddressResolution(*i));
+	}
+
+	bool changed = false;
+
+	for(std::set<MulticastGroup>::iterator mg(newGroups.begin());mg!=newGroups.end();++mg) {
+		if (!groups.count(*mg)) {
+			groups.insert(*mg);
+			changed = true;
 		}
 	}
-}
+	for(std::set<MulticastGroup>::iterator mg(groups.begin());mg!=groups.end();) {
+		if ((!newGroups.count(*mg))&&(*mg != _blindWildcardMulticastGroup)) {
+			groups.erase(mg++);
+			changed = true;
+		} else ++mg;
+	}
 
-void BSDEthernetTap::threadMain() throw()
+	return changed;
+}
+*/
+
+void BSDEthernetTap::threadMain()
+	throw()
 {
+	fd_set readfds,nullfds;
+	MAC to,from;
+	int n,nfds,r;
+	char getBuf[8194];
+
 	// Wait for a moment after startup -- wait for Network to finish
 	// constructing itself.
 	Thread::sleep(500);
 
-#ifndef __OpenBSD__
-	bool pinning = _pinning;
+	FD_ZERO(&readfds);
+	FD_ZERO(&nullfds);
+	nfds = (int)std::max(_shutdownSignalPipe[0],_fd) + 1;
 
-	for (unsigned int i = 0; i < _concurrency; ++i) {
-		_rxThreads.push_back(std::thread([this, i, pinning] {
-			if (pinning) {
-				int pinCore = i % _concurrency;
-				fprintf(stderr, "Pinning thread %d to core %d\n", i, pinCore);
-				pthread_t self = pthread_self();
-				cpu_set_t cpuset;
-				CPU_ZERO(&cpuset);
-				CPU_SET(pinCore, &cpuset);
-				// int rc = sched_setaffinity(self, sizeof(cpu_set_t), &cpuset);
-				int rc = pthread_setaffinity_np(self, sizeof(cpu_set_t), &cpuset);
-				if (rc != 0) {
-					fprintf(stderr, "Failed to pin thread %d to core %d: %s\n", i, pinCore, strerror(errno));
-					exit(1);
-				}
-			}
-#endif	 // __OpenBSD__
+	r = 0;
+	for(;;) {
+		FD_SET(_shutdownSignalPipe[0],&readfds);
+		FD_SET(_fd,&readfds);
+		select(nfds,&readfds,&nullfds,&nullfds,(struct timeval *)0);
 
-			uint8_t b[ZT_TAP_BUF_SIZE];
-			MAC to, from;
-			fd_set readfds, nullfds;
-			int n, nfds, r;
+		if (FD_ISSET(_shutdownSignalPipe[0],&readfds)) // writes to shutdown pipe terminate thread
+			break;
 
-			FD_ZERO(&readfds);
-			FD_ZERO(&nullfds);
-			nfds = (int)std::max(_shutdownSignalPipe[0], _fd) + 1;
-
-			r = 0;
-
-			for (;;) {
-				FD_SET(_shutdownSignalPipe[0], &readfds);
-				FD_SET(_fd, &readfds);
-				select(nfds, &readfds, &nullfds, &nullfds, (struct timeval*)0);
-
-				if (FD_ISSET(_shutdownSignalPipe[0], &readfds))	  // writes to shutdown pipe terminate thread
+		if (FD_ISSET(_fd,&readfds)) {
+			n = (int)::read(_fd,getBuf + r,sizeof(getBuf) - r);
+			if (n < 0) {
+				if ((errno != EINTR)&&(errno != ETIMEDOUT))
 					break;
+			} else {
+				// Some tap drivers like to send the ethernet frame and the
+				// payload in two chunks, so handle that by accumulating
+				// data until we have at least a frame.
+				r += n;
+				if (r > 14) {
+					if (r > ((int)_mtu + 14)) // sanity check for weird TAP behavior on some platforms
+						r = _mtu + 14;
 
-				if (FD_ISSET(_fd, &readfds)) {
-					n = (int)::read(_fd, b + r, sizeof(b) - r);
-					if (n < 0) {
-						if ((errno != EINTR) && (errno != ETIMEDOUT))
-							break;
+					if (_enabled) {
+						to.setTo(getBuf,6);
+						from.setTo(getBuf + 6,6);
+						unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]);
+						// TODO: VLAN support
+						_handler(_arg,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14);
 					}
-					else {
-						// Some tap drivers like to send the ethernet frame and the
-						// payload in two chunks, so handle that by accumulating
-						// data until we have at least a frame.
-						r += n;
-						if (r > 14) {
-							if (r > ((int)_mtu + 14))	// sanity check for weird TAP behavior on some platforms
-								r = _mtu + 14;
 
-							if (_enabled) {
-								to.setTo(b, 6);
-								from.setTo(b + 6, 6);
-								unsigned int etherType = ntohs(((const uint16_t*)b)[6]);
-								_handler(_arg, (void*)0, _nwid, from, to, etherType, 0, (const void*)(b + 14), r - 14);
-							}
-
-							r = 0;
-						}
-					}
+					r = 0;
 				}
 			}
-#ifndef __OpenBSD__
-		}));
+		}
 	}
-#endif	 // __OpenBSD__
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/osdep/BSDEthernetTap.hpp b/osdep/BSDEthernetTap.hpp
index 1f382ba7e..1bb48d311 100644
--- a/osdep/BSDEthernetTap.hpp
+++ b/osdep/BSDEthernetTap.hpp
@@ -1,71 +1,69 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_BSDETHERNETTAP_HPP
 #define ZT_BSDETHERNETTAP_HPP
 
-#include "../node/Constants.hpp"
-#include "../node/MAC.hpp"
-#include "../node/MulticastGroup.hpp"
-#include "EthernetTap.hpp"
-#include "Thread.hpp"
-
-#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <string>
-#include <thread>
 #include <vector>
+#include <stdexcept>
+
+#include "../node/Constants.hpp"
+#include "../node/MulticastGroup.hpp"
+#include "../node/MAC.hpp"
+#include "Thread.hpp"
 
 namespace ZeroTier {
 
-class BSDEthernetTap : public EthernetTap {
-  public:
+class BSDEthernetTap
+{
+public:
 	BSDEthernetTap(
-		const char* homePath,
-		unsigned int concurrency,
-		bool pinning,
-		const MAC& mac,
+		const char *homePath,
+		const MAC &mac,
 		unsigned int mtu,
 		unsigned int metric,
 		uint64_t nwid,
-		const char* friendlyName,
-		void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-		void* arg);
+		const char *friendlyName,
+		void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+		void *arg);
 
-	virtual ~BSDEthernetTap();
+	~BSDEthernetTap();
 
-	virtual void setEnabled(bool en);
-	virtual bool enabled() const;
-	virtual bool addIp(const InetAddress& ip);
-	virtual bool removeIp(const InetAddress& ip);
-	virtual std::vector<InetAddress> ips() const;
-	virtual void put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len);
-	virtual std::string deviceName() const;
-	virtual void setFriendlyName(const char* friendlyName);
-	virtual void scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed);
-	virtual void setMtu(unsigned int mtu);
-	virtual void setDns(const char* domain, const std::vector<InetAddress>& servers)
-	{
-	}
+	void setEnabled(bool en);
+	bool enabled() const;
+	bool addIp(const InetAddress &ip);
+	bool removeIp(const InetAddress &ip);
+	std::vector<InetAddress> ips() const;
+	void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
+	std::string deviceName() const;
+	void setFriendlyName(const char *friendlyName);
+	void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
 
-	void threadMain() throw();
+	void threadMain()
+		throw();
 
-  private:
-	void (*_handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int);
-	void* _arg;
-	unsigned int _concurrency;
-	bool _pinning;
+private:
+	void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
+	void *_arg;
 	uint64_t _nwid;
 	Thread _thread;
 	std::string _dev;
@@ -75,11 +73,8 @@ class BSDEthernetTap : public EthernetTap {
 	int _fd;
 	int _shutdownSignalPipe[2];
 	volatile bool _enabled;
-	mutable std::vector<InetAddress> _ifaddrs;
-	mutable uint64_t _lastIfAddrsUpdate;
-	std::vector<std::thread> _rxThreads;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/osdep/BackgroundResolver.cpp b/osdep/BackgroundResolver.cpp
new file mode 100644
index 000000000..ffcfdbae6
--- /dev/null
+++ b/osdep/BackgroundResolver.cpp
@@ -0,0 +1,121 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "OSUtils.hpp"
+#include "Thread.hpp"
+#include "BackgroundResolver.hpp"
+
+namespace ZeroTier {
+
+/*
+ * We can't actually abort a job. This is a legacy characteristic of the
+ * ancient synchronous resolver APIs. So to abort jobs, we just abandon
+ * them by setting their parent to null.
+ */
+class BackgroundResolverJob
+{
+public:
+	std::string name;
+	BackgroundResolver *volatile parent;
+	Mutex lock;
+
+	void threadMain()
+		throw()
+	{
+		std::vector<InetAddress> ips;
+		try {
+			ips = OSUtils::resolve(name.c_str());
+		} catch ( ... ) {}
+		{
+			Mutex::Lock _l(lock);
+			BackgroundResolver *p = parent;
+			if (p)
+				p->_postResult(ips);
+		}
+		delete this;
+	}
+};
+
+BackgroundResolver::BackgroundResolver(const char *name) :
+	_name(name),
+	_job((BackgroundResolverJob *)0),
+	_callback(0),
+	_arg((void *)0),
+	_ips(),
+	_lock()
+{
+}
+
+BackgroundResolver::~BackgroundResolver()
+{
+	abort();
+}
+
+std::vector<InetAddress> BackgroundResolver::get() const
+{
+	Mutex::Lock _l(_lock);
+	return _ips;
+}
+
+void BackgroundResolver::resolveNow(void (*callback)(BackgroundResolver *,void *),void *arg)
+{
+	Mutex::Lock _l(_lock);
+
+	if (_job) {
+		Mutex::Lock _l2(_job->lock);
+		_job->parent = (BackgroundResolver *)0;
+		_job = (BackgroundResolverJob *)0;
+	}
+
+	BackgroundResolverJob *j = new BackgroundResolverJob();
+	j->name = _name;
+	j->parent = this;
+
+	_job = j;
+	_callback = callback;
+	_arg = arg;
+
+	_jobThread = Thread::start(j);
+}
+
+void BackgroundResolver::abort()
+{
+	Mutex::Lock _l(_lock);
+	if (_job) {
+		Mutex::Lock _l2(_job->lock);
+		_job->parent = (BackgroundResolver *)0;
+		_job = (BackgroundResolverJob *)0;
+	}
+}
+
+void BackgroundResolver::_postResult(const std::vector<InetAddress> &ips)
+{
+	void (*cb)(BackgroundResolver *,void *);
+	void *a;
+	{
+		Mutex::Lock _l(_lock);
+		_job = (BackgroundResolverJob *)0;
+		cb = _callback;
+		a = _arg;
+		_ips = ips;
+	}
+	if (cb)
+		cb(this,a);
+}
+
+} // namespace ZeroTier
diff --git a/osdep/BackgroundResolver.hpp b/osdep/BackgroundResolver.hpp
new file mode 100644
index 000000000..ba895487f
--- /dev/null
+++ b/osdep/BackgroundResolver.hpp
@@ -0,0 +1,118 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_BACKGROUNDRESOLVER_HPP
+#define ZT_BACKGROUNDRESOLVER_HPP
+
+#include <vector>
+#include <string>
+
+#include "../node/Constants.hpp"
+#include "../node/Mutex.hpp"
+#include "../node/InetAddress.hpp"
+#include "../node/NonCopyable.hpp"
+#include "Thread.hpp"
+
+namespace ZeroTier {
+
+class BackgroundResolverJob;
+
+/**
+ * A simple background resolver
+ */
+class BackgroundResolver : NonCopyable
+{
+	friend class BackgroundResolverJob;
+
+public:
+	/**
+	 * Construct a new resolver
+	 *
+	 * resolveNow() must be called to actually initiate background resolution.
+	 *
+	 * @param name Name to resolve
+	 */
+	BackgroundResolver(const char *name);
+
+	~BackgroundResolver();
+
+	/**
+	 * @return Most recent resolver results or empty vector if none
+	 */
+	std::vector<InetAddress> get() const;
+
+	/**
+	 * Launch a background resolve job now
+	 *
+	 * If a resolve job is currently in progress, it is aborted and another
+	 * job is started.
+	 *
+	 * Note that jobs can't actually be aborted due to the limitations of the
+	 * ancient synchronous OS resolver APIs. As a result, in progress jobs
+	 * that are aborted are simply abandoned. Don't call this too frequently
+	 * or background threads might pile up.
+	 *
+	 * @param callback Callback function to receive notification or NULL if none
+	 * @praam arg Second argument to callback function
+	 */
+	void resolveNow(void (*callback)(BackgroundResolver *,void *) = 0,void *arg = 0);
+
+	/**
+	 * Abort (abandon) any current resolve jobs
+	 */
+	void abort();
+
+	/**
+	 * @return True if a background job is in progress
+	 */
+	inline bool running() const
+	{
+		Mutex::Lock _l(_lock);
+		return (_job != (BackgroundResolverJob *)0);
+	}
+
+	/**
+	 * Wait for pending job to complete (if any)
+	 */
+	inline void wait() const
+	{
+		Thread t;
+		{
+			Mutex::Lock _l(_lock);
+			if (!_job)
+				return;
+			t = _jobThread;
+		}
+		Thread::join(t);
+	}
+
+private:
+	void _postResult(const std::vector<InetAddress> &ips);
+
+	std::string _name;
+	BackgroundResolverJob *_job;
+	Thread _jobThread;
+	void (*_callback)(BackgroundResolver *,void *);
+	void *_arg;
+	std::vector<InetAddress> _ips;
+	Mutex _lock;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp
index 6bb6a0890..b68e6dac6 100644
--- a/osdep/Binder.hpp
+++ b/osdep/Binder.hpp
@@ -1,15 +1,20 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_BINDER_HPP
 #define ZT_BINDER_HPP
@@ -22,56 +27,37 @@
 #include <string.h>
 
 #ifdef __WINDOWS__
-#include <iphlpapi.h>
+#include <WinSock2.h>
+#include <Windows.h>
+#include <ShlObj.h>
 #include <netioapi.h>
-#include <shlobj.h>
-#include <windows.h>
-#include <winsock2.h>
+#include <iphlpapi.h>
 #else
-#include <ifaddrs.h>
-#include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#ifdef __LINUX__
-#include <linux/if_addr.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-#endif
+#include <ifaddrs.h>
 #endif
 
-#if (defined(__unix__) || defined(__APPLE__)) && ! defined(__LINUX__) && ! defined(ZT_SDK)
-#include <net/if.h>
-#if TARGET_OS_OSX
-#include <netinet6/in6_var.h>
-#endif
-#include <sys/ioctl.h>
-#endif
+#include <string>
+#include <vector>
+#include <algorithm>
+#include <utility>
 
+#include "../node/NonCopyable.hpp"
 #include "../node/InetAddress.hpp"
 #include "../node/Mutex.hpp"
-#include "../node/Utils.hpp"
-#include "../osdep/ExtOsdep.hpp"
-#include "OSUtils.hpp"
+
 #include "Phy.hpp"
 
-#include <algorithm>
-#include <atomic>
-#include <map>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-// Period between refreshes of bindings
+/**
+ * Period between binder rescans/refreshes
+ *
+ * OneService also does this on detected restarts.
+ */
 #define ZT_BINDER_REFRESH_PERIOD 30000
 
-// Max number of bindings
-#define ZT_BINDER_MAX_BINDINGS 256
-
-// Maximum physical interface name length. This number is gigantic because of Windows.
-#define ZT_MAX_PHYSIFNAME 256
-
 namespace ZeroTier {
 
 /**
@@ -85,34 +71,40 @@ namespace ZeroTier {
  * On OSes that do not support local port enumeration or where this is not
  * meaningful, this degrades to binding to wildcard.
  */
-class Binder {
-  private:
-	struct _Binding {
-		_Binding() : udpSock((PhySocket*)0)
-		{
-		}
-		PhySocket* udpSock;
+class Binder : NonCopyable
+{
+private:
+	struct _Binding
+	{
+		_Binding() :
+			udpSock((PhySocket *)0),
+			tcpListenSock((PhySocket *)0),
+			address() {}
+
+		PhySocket *udpSock;
+		PhySocket *tcpListenSock;
 		InetAddress address;
-		char ifname[256] = {};
 	};
 
-  public:
-	Binder() : _bindingCount(0)
-	{
-	}
+public:
+	Binder() {}
 
 	/**
-	 * Close all bound ports, should be called on shutdown
+	 * Close all bound ports
+	 *
+	 * This should be called on shutdown. It closes listen sockets and UDP ports
+	 * but not TCP connections from any TCP listen sockets.
 	 *
 	 * @param phy Physical interface
 	 */
-	template <typename PHY_HANDLER_TYPE> void closeAll(Phy<PHY_HANDLER_TYPE>& phy)
+	template<typename PHY_HANDLER_TYPE>
+	void closeAll(Phy<PHY_HANDLER_TYPE> &phy)
 	{
 		Mutex::Lock _l(_lock);
-		for (unsigned int b = 0, c = _bindingCount; b < c; ++b) {
-			phy.close(_bindings[b].udpSock, false);
+		for(typename std::vector<_Binding>::const_iterator i(_bindings.begin());i!=_bindings.end();++i) {
+			phy.close(i->udpSock,false);
+			phy.close(i->tcpListenSock,false);
 		}
-		_bindingCount = 0;
 	}
 
 	/**
@@ -122,446 +114,208 @@ class Binder {
 	 * changes, on startup, or periodically (e.g. every 30-60s).
 	 *
 	 * @param phy Physical interface
-	 * @param ports Ports to bind on all interfaces
-	 * @param portCount Number of ports
-	 * @param explicitBind If present, override interface IP detection and bind to these (if possible)
-	 * @param ifChecker Interface checker function to see if an interface should be used
+	 * @param port Port to bind to on all interfaces (TCP and UDP)
+	 * @param ignoreInterfacesByName Ignore these interfaces by name
+	 * @param ignoreInterfacesByNamePrefix Ignore these interfaces by name-prefix (starts-with, e.g. zt ignores zt*)
+	 * @param ignoreInterfacesByAddress Ignore these interfaces by address
 	 * @tparam PHY_HANDLER_TYPE Type for Phy<> template
 	 * @tparam INTERFACE_CHECKER Type for class containing shouldBindInterface() method
 	 */
-	template <typename PHY_HANDLER_TYPE, typename INTERFACE_CHECKER> void refresh(Phy<PHY_HANDLER_TYPE>& phy, unsigned int* ports, unsigned int portCount, const std::vector<InetAddress> explicitBind, INTERFACE_CHECKER& ifChecker)
+	template<typename PHY_HANDLER_TYPE,typename INTERFACE_CHECKER>
+	void refresh(Phy<PHY_HANDLER_TYPE> &phy,unsigned int port,INTERFACE_CHECKER &ifChecker)
 	{
-		std::map<InetAddress, std::string> localIfAddrs;
-		PhySocket* udps;
+		std::vector<InetAddress> localIfAddrs;
+		std::vector<_Binding> newBindings;
+		std::vector<std::string>::const_iterator si;
+		std::vector<InetAddress>::const_iterator ii;
+		typename std::vector<_Binding>::const_iterator bi;
+		PhySocket *udps;
+		//PhySocket *tcps;
+		InetAddress ip;
 		Mutex::Lock _l(_lock);
-		bool interfacesEnumerated = true;
 
-		if (explicitBind.empty()) {
-#ifdef ZT_EXTOSDEP
-			std::map<InetAddress, std::string> addrs;
-			interfacesEnumerated = ExtOsdep::getBindAddrs(addrs);
-			for (auto& a : addrs) {
-				auto ip = a.first;
-				switch (ip.ipScope()) {
-					default:
-						break;
-					case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
-					case InetAddress::IP_SCOPE_GLOBAL:
-					case InetAddress::IP_SCOPE_SHARED:
-					case InetAddress::IP_SCOPE_PRIVATE:
-						for (int x = 0; x < (int)portCount; ++x) {
-							ip.setPort(ports[x]);
-							localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, a.second));
-						}
-						break;
-				}
-			}
-#else	// ZT_EXTOSDEP
 #ifdef __WINDOWS__
 
-			char aabuf[32768];
-			ULONG aalen = sizeof(aabuf);
-			if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER, (void*)0, reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf), &aalen) == NO_ERROR) {
-				PIP_ADAPTER_ADDRESSES a = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf);
-				while (a) {
-					PIP_ADAPTER_UNICAST_ADDRESS ua = a->FirstUnicastAddress;
-					while (ua) {
-						// Don't bind temporary/random IPv6 addresses
-						if (ua->SuffixOrigin != IpSuffixOriginRandom) {
-							InetAddress ip(ua->Address.lpSockaddr);
-							char strBuf[128] = { 0 };
-							wcstombs(strBuf, a->FriendlyName, sizeof(strBuf));
-							if (ifChecker.shouldBindInterface(strBuf, ip)) {
-								switch (ip.ipScope()) {
-									default:
-										break;
-									case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
-									case InetAddress::IP_SCOPE_GLOBAL:
-									case InetAddress::IP_SCOPE_SHARED:
-									case InetAddress::IP_SCOPE_PRIVATE:
-										for (int x = 0; x < (int)portCount; ++x) {
-											ip.setPort(ports[x]);
-											localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, std::string()));
-										}
-										break;
-								}
-							}
-						}
-						ua = ua->Next;
-					}
-					a = a->Next;
-				}
-			}
-			else {
-				interfacesEnumerated = false;
-			}
-
-#else	// not __WINDOWS__
-
-			/* On Linux we use an alternative method if available since getifaddrs()
-			 * gets very slow when there are lots of network namespaces. This won't
-			 * work unless /proc/PID/net/if_inet6 exists and it may not on some
-			 * embedded systems, so revert to getifaddrs() there. */
-
-#ifdef __LINUX__
-			char fn[256], tmp[256];
-			std::set<std::string> ifnames;
-			const unsigned long pid = (unsigned long)getpid();
-
-			// Get all device names
-			OSUtils::ztsnprintf(fn, sizeof(fn), "/proc/%lu/net/dev", pid);
-			FILE* procf = fopen(fn, "r");
-			if (procf) {
-				while (fgets(tmp, sizeof(tmp), procf)) {
-					tmp[255] = 0;
-					char* saveptr = (char*)0;
-					for (char* f = Utils::stok(tmp, " \t\r\n:|", &saveptr); (f); f = Utils::stok((char*)0, " \t\r\n:|", &saveptr)) {
-						if ((strcmp(f, "Inter-") != 0) && (strcmp(f, "face") != 0) && (f[0] != 0))
-							ifnames.insert(f);
-						break;	 // we only want the first field
-					}
-				}
-				fclose(procf);
-			}
-			else {
-				interfacesEnumerated = false;
-			}
-
-			// Get IPv6 addresses (and any device names we don't already know)
-			OSUtils::ztsnprintf(fn, sizeof(fn), "/proc/%lu/net/if_inet6", pid);
-			procf = fopen(fn, "r");
-			if (procf) {
-				while (fgets(tmp, sizeof(tmp), procf)) {
-					tmp[255] = 0;
-					char* saveptr = (char*)0;
-					unsigned char ipbits[16];
-					memset(ipbits, 0, sizeof(ipbits));
-					char* devname = (char*)0;
-					int flags = 0;
-					int n = 0;
-					for (char* f = Utils::stok(tmp, " \t\r\n", &saveptr); (f); f = Utils::stok((char*)0, " \t\r\n", &saveptr)) {
-						switch (n++) {
-							case 0:	  // IP in hex
-								Utils::unhex(f, 32, ipbits, 16);
-								break;
-							case 4:
-								flags = atoi(f);
-								break;
-							case 5:	  // device name
-								devname = f;
-								break;
-						}
-					}
-
-					if ((flags & IFA_F_TEMPORARY) != 0) {
-						continue;
-					}
-					if (devname) {
-						ifnames.insert(devname);
-						InetAddress ip(ipbits, 16, 0);
-						if (ifChecker.shouldBindInterface(devname, ip)) {
-							switch (ip.ipScope()) {
-								default:
-									break;
-								case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
-								case InetAddress::IP_SCOPE_GLOBAL:
-								case InetAddress::IP_SCOPE_SHARED:
-								case InetAddress::IP_SCOPE_PRIVATE:
-									for (int x = 0; x < (int)portCount; ++x) {
-										ip.setPort(ports[x]);
-										localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, std::string(devname)));
-									}
-									break;
-							}
-						}
-					}
-				}
-				fclose(procf);
-			}
-
-			// Get IPv4 addresses for each device
-			if (! ifnames.empty()) {
-				const int controlfd = (int)socket(AF_INET, SOCK_DGRAM, 0);
-				struct ifconf configuration;
-				configuration.ifc_len = 0;
-				configuration.ifc_buf = nullptr;
-
-				if (controlfd < 0)
-					goto ip4_address_error;
-				if (ioctl(controlfd, SIOCGIFCONF, &configuration) < 0)
-					goto ip4_address_error;
-				configuration.ifc_buf = (char*)malloc(configuration.ifc_len);
-				if (ioctl(controlfd, SIOCGIFCONF, &configuration) < 0)
-					goto ip4_address_error;
-
-				for (int i = 0; i < (int)(configuration.ifc_len / sizeof(ifreq)); i++) {
-					struct ifreq& request = configuration.ifc_req[i];
-					struct sockaddr* addr = &request.ifr_ifru.ifru_addr;
-					if (addr->sa_family != AF_INET)
-						continue;
-					std::string ifname = request.ifr_ifrn.ifrn_name;
-					// name can either be just interface name or interface name followed by ':' and arbitrary label
-					if (ifname.find(':') != std::string::npos)
-						ifname = ifname.substr(0, ifname.find(':'));
-
-					InetAddress ip(&(((struct sockaddr_in*)addr)->sin_addr), 4, 0);
-					if (ifChecker.shouldBindInterface(ifname.c_str(), ip)) {
-						switch (ip.ipScope()) {
-							default:
-								break;
+		char aabuf[32768];
+		ULONG aalen = sizeof(aabuf);
+		if (GetAdaptersAddresses(AF_UNSPEC,GAA_FLAG_SKIP_ANYCAST|GAA_FLAG_SKIP_MULTICAST|GAA_FLAG_SKIP_DNS_SERVER,(void *)0,reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf),&aalen) == NO_ERROR) {
+			PIP_ADAPTER_ADDRESSES a = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf);
+			while (a) {
+				PIP_ADAPTER_UNICAST_ADDRESS ua = a->FirstUnicastAddress;
+				while (ua) {
+					InetAddress ip(ua->Address.lpSockaddr);
+					if (ifChecker.shouldBindInterface("",ip)) {
+						switch(ip.ipScope()) {
+							default: break;
 							case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
 							case InetAddress::IP_SCOPE_GLOBAL:
+							//case InetAddress::IP_SCOPE_LINK_LOCAL:
 							case InetAddress::IP_SCOPE_SHARED:
 							case InetAddress::IP_SCOPE_PRIVATE:
-								for (int x = 0; x < (int)portCount; ++x) {
-									ip.setPort(ports[x]);
-									localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, ifname));
-								}
+								ip.setPort(port);
+								localIfAddrs.push_back(ip);
+								break;
+						}
+					}
+					ua = ua->Next;
+				}
+				a = a->Next;
+			}
+		}
+
+#else // not __WINDOWS__
+
+		struct ifaddrs *ifatbl = (struct ifaddrs *)0;
+		struct ifaddrs *ifa;
+		if ((getifaddrs(&ifatbl) == 0)&&(ifatbl)) {
+			ifa = ifatbl;
+			while (ifa) {
+				if ((ifa->ifa_name)&&(ifa->ifa_addr)) {
+					ip = *(ifa->ifa_addr);
+					if (ifChecker.shouldBindInterface(ifa->ifa_name,ip)) {
+						switch(ip.ipScope()) {
+							default: break;
+							case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
+							case InetAddress::IP_SCOPE_GLOBAL:
+							//case InetAddress::IP_SCOPE_LINK_LOCAL:
+							case InetAddress::IP_SCOPE_SHARED:
+							case InetAddress::IP_SCOPE_PRIVATE:
+								ip.setPort(port);
+								localIfAddrs.push_back(ip);
 								break;
 						}
 					}
 				}
-
-			ip4_address_error:
-				free(configuration.ifc_buf);
-				if (controlfd > 0)
-					close(controlfd);
-			}
-
-			const bool gotViaProc = (! localIfAddrs.empty());
-#else
-			const bool gotViaProc = false;
-#endif
-
-			//
-			// prevent:
-			// warning: unused variable 'gotViaProc'
-			//
-			(void)gotViaProc;
-
-#if ! defined(__ANDROID__)	 // getifaddrs() freeifaddrs() not available on Android
-			if (! gotViaProc) {
-				struct ifaddrs* ifatbl = (struct ifaddrs*)0;
-				struct ifaddrs* ifa;
-#if (defined(__unix__) || defined(__APPLE__)) && ! defined(__LINUX__) && ! defined(ZT_SDK)
-				// set up an IPv6 socket so we can check the state of interfaces via SIOCGIFAFLAG_IN6
-				int infoSock = socket(AF_INET6, SOCK_DGRAM, 0);
-#endif
-				if ((getifaddrs(&ifatbl) == 0) && (ifatbl)) {
-					ifa = ifatbl;
-					while (ifa) {
-						if ((ifa->ifa_name) && (ifa->ifa_addr)) {
-							InetAddress ip = *(ifa->ifa_addr);
-#if (defined(__unix__) || defined(__APPLE__)) && ! defined(__LINUX__) && ! defined(ZT_SDK) && TARGET_OS_OSX
-							// Check if the address is an IPv6 Temporary Address, macOS/BSD version
-							if (ifa->ifa_addr->sa_family == AF_INET6) {
-								struct sockaddr_in6* sa6 = (struct sockaddr_in6*)ifa->ifa_addr;
-								struct in6_ifreq ifr6;
-								memset(&ifr6, 0, sizeof(ifr6));
-								strcpy(ifr6.ifr_name, ifa->ifa_name);
-								ifr6.ifr_ifru.ifru_addr = *sa6;
-
-								int flags = 0;
-								if (ioctl(infoSock, SIOCGIFAFLAG_IN6, (unsigned long long)&ifr6) != -1) {
-									flags = ifr6.ifr_ifru.ifru_flags6;
-								}
-
-								// if this is a temporary IPv6 address, skip to the next address
-								if (flags & IN6_IFF_TEMPORARY) {
-#ifdef ZT_TRACE
-									char buf[64];
-									fprintf(stderr, "skip binding to temporary IPv6 address: %s\n", ip.toIpString(buf));
-#endif
-									ifa = ifa->ifa_next;
-									continue;
-								}
-							}
-#endif
-							if (ifChecker.shouldBindInterface(ifa->ifa_name, ip)) {
-								switch (ip.ipScope()) {
-									default:
-										break;
-									case InetAddress::IP_SCOPE_PSEUDOPRIVATE:
-									case InetAddress::IP_SCOPE_GLOBAL:
-									case InetAddress::IP_SCOPE_SHARED:
-									case InetAddress::IP_SCOPE_PRIVATE:
-										for (int x = 0; x < (int)portCount; ++x) {
-											ip.setPort(ports[x]);
-											localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, std::string(ifa->ifa_name)));
-										}
-										break;
-								}
-							}
-						}
-						ifa = ifa->ifa_next;
-					}
-					freeifaddrs(ifatbl);
-				}
-				else {
-					interfacesEnumerated = false;
-				}
-#if (defined(__unix__) || defined(__APPLE__)) && ! defined(__LINUX__) && ! defined(ZT_SDK)
-				close(infoSock);
-#endif
-			}
-#endif
-
-#endif
-
-#endif	 // ZT_EXTOSDEP
-		}
-		else {
-			for (std::vector<InetAddress>::const_iterator i(explicitBind.begin()); i != explicitBind.end(); ++i) {
-				InetAddress ip = InetAddress(*i);
-				for (int x = 0; x < (int)portCount; ++x) {
-					ip.setPort(ports[x]);
-					localIfAddrs.insert(std::pair<InetAddress, std::string>(ip, std::string()));
-				}
+				ifa = ifa->ifa_next;
 			}
+			freeifaddrs(ifatbl);
 		}
 
+#endif
+
 		// Default to binding to wildcard if we can't enumerate addresses
-		if (! interfacesEnumerated && localIfAddrs.empty()) {
-			for (int x = 0; x < (int)portCount; ++x) {
-				localIfAddrs.insert(std::pair<InetAddress, std::string>(InetAddress((uint32_t)0, ports[x]), std::string()));
-				localIfAddrs.insert(std::pair<InetAddress, std::string>(InetAddress((const void*)"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16, ports[x]), std::string()));
+		if (localIfAddrs.size() == 0) {
+			localIfAddrs.push_back(InetAddress((uint32_t)0,port));
+			localIfAddrs.push_back(InetAddress((const void *)"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",16,port));
+		}
+
+		// Close any old bindings to anything that doesn't exist anymore
+		for(bi=_bindings.begin();bi!=_bindings.end();++bi) {
+			if (std::find(localIfAddrs.begin(),localIfAddrs.end(),bi->address) == localIfAddrs.end()) {
+				phy.close(bi->udpSock,false);
+				phy.close(bi->tcpListenSock,false);
 			}
 		}
 
-		const unsigned int oldBindingCount = _bindingCount;
-		_bindingCount = 0;
-
-		// Save bindings that are still valid, close those that are not
-		for (unsigned int b = 0; b < oldBindingCount; ++b) {
-			if (localIfAddrs.find(_bindings[b].address) != localIfAddrs.end()) {
-				if (_bindingCount != b)
-					_bindings[(unsigned int)_bindingCount] = _bindings[b];
-				++_bindingCount;
-			}
-			else {
-				PhySocket* const udps = _bindings[b].udpSock;
-				_bindings[b].udpSock = (PhySocket*)0;
-				phy.close(udps, false);
-			}
-		}
-
-		// Create new bindings for those not already bound
-		for (std::map<InetAddress, std::string>::const_iterator ii(localIfAddrs.begin()); ii != localIfAddrs.end(); ++ii) {
-			unsigned int bi = 0;
-			while (bi != _bindingCount) {
-				if (_bindings[bi].address == ii->first)
+		for(ii=localIfAddrs.begin();ii!=localIfAddrs.end();++ii) {
+			// Copy over bindings that still are valid
+			for(bi=_bindings.begin();bi!=_bindings.end();++bi) {
+				if (bi->address == *ii) {
+					newBindings.push_back(*bi);
 					break;
-				++bi;
+				}
 			}
-			if (bi == _bindingCount) {
-				udps = phy.udpBind(reinterpret_cast<const struct sockaddr*>(&(ii->first)), (void*)0, ZT_UDP_DESIRED_BUF_SIZE);
+
+			// Add new bindings
+			if (bi == _bindings.end()) {
+				udps = phy.udpBind(reinterpret_cast<const struct sockaddr *>(&(*ii)),(void *)0,ZT_UDP_DESIRED_BUF_SIZE);
 				if (udps) {
-#ifdef __LINUX__
-					// Bind Linux sockets to their device so routes that we manage do not override physical routes (wish all platforms had this!)
-					if (ii->second.length() > 0) {
-						char tmp[256];
-						Utils::scopy(tmp, sizeof(tmp), ii->second.c_str());
-						int fd = (int)Phy<PHY_HANDLER_TYPE>::getDescriptor(udps);
-						if (fd >= 0) {
-							setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, tmp, strlen(tmp));
-						}
-					}
-#endif	 // __LINUX__
-					if (_bindingCount < ZT_BINDER_MAX_BINDINGS) {
-						_bindings[_bindingCount].udpSock = udps;
-						_bindings[_bindingCount].address = ii->first;
-						memcpy(_bindings[_bindingCount].ifname, (char*)ii->second.c_str(), (int)ii->second.length());
-						++_bindingCount;
-					}
-				}
-				else {
-					phy.close(udps, false);
+					//tcps = phy.tcpListen(reinterpret_cast<const struct sockaddr *>(&ii),(void *)0);
+					//if (tcps) {
+						newBindings.push_back(_Binding());
+						newBindings.back().udpSock = udps;
+						//newBindings.back().tcpListenSock = tcps;
+						newBindings.back().address = *ii;
+					//} else {
+					//	phy.close(udps,false);
+					//}
 				}
 			}
 		}
+
+		/*
+		for(bi=newBindings.begin();bi!=newBindings.end();++bi) {
+			printf("Binder: bound to %s\n",bi->address.toString().c_str());
+		}
+		*/
+
+		// Swapping pointers and then letting the old one fall out of scope is faster than copying again
+		_bindings.swap(newBindings);
+	}
+
+	/**
+	 * Send a UDP packet from the specified local interface, or all
+	 *
+	 * Unfortunately even by examining the routing table there is no ultimately
+	 * robust way to tell where we might reach another host that works in all
+	 * environments. As a result, we send packets with null (wildcard) local
+	 * addresses from *every* bound interface.
+	 *
+	 * These are typically initial HELLOs, path probes, etc., since normal
+	 * conversations will have a local endpoint address. So the cost is low and
+	 * if the peer is not reachable via that route then the packet will go
+	 * nowhere and nothing will happen.
+	 *
+	 * It will of course only send via interface bindings of the same socket
+	 * family. No point in sending V4 via V6 or vice versa.
+	 *
+	 * In any case on most hosts there's only one or two interfaces that we
+	 * will use, so none of this is particularly costly.
+	 *
+	 * @param local Local interface address or null address for 'all'
+	 * @param remote Remote address
+	 * @param data Data to send
+	 * @param len Length of data
+	 * @param v4ttl If non-zero, send this packet with the specified IP TTL (IPv4 only)
+	 */
+	template<typename PHY_HANDLER_TYPE>
+	inline bool udpSend(Phy<PHY_HANDLER_TYPE> &phy,const InetAddress &local,const InetAddress &remote,const void *data,unsigned int len,unsigned int v4ttl = 0) const
+	{
+		Mutex::Lock _l(_lock);
+		if (local) {
+			for(typename std::vector<_Binding>::const_iterator i(_bindings.begin());i!=_bindings.end();++i) {
+				if (i->address == local) {
+					if ((v4ttl)&&(local.ss_family == AF_INET))
+						phy.setIp4UdpTtl(i->udpSock,v4ttl);
+					const bool result = phy.udpSend(i->udpSock,reinterpret_cast<const struct sockaddr *>(&remote),data,len);
+					if ((v4ttl)&&(local.ss_family == AF_INET))
+						phy.setIp4UdpTtl(i->udpSock,255);
+					return result;
+				}
+			}
+			return false;
+		} else {
+			bool result = false;
+			for(typename std::vector<_Binding>::const_iterator i(_bindings.begin());i!=_bindings.end();++i) {
+				if (i->address.ss_family == remote.ss_family) {
+					if ((v4ttl)&&(remote.ss_family == AF_INET))
+						phy.setIp4UdpTtl(i->udpSock,v4ttl);
+					result |= phy.udpSend(i->udpSock,reinterpret_cast<const struct sockaddr *>(&remote),data,len);
+					if ((v4ttl)&&(remote.ss_family == AF_INET))
+						phy.setIp4UdpTtl(i->udpSock,255);
+				}
+			}
+			return result;
+		}
 	}
 
 	/**
 	 * @return All currently bound local interface addresses
 	 */
-	inline std::vector<InetAddress> allBoundLocalInterfaceAddresses() const
+	inline std::vector<InetAddress> allBoundLocalInterfaceAddresses()
 	{
-		std::vector<InetAddress> aa;
 		Mutex::Lock _l(_lock);
-		for (unsigned int b = 0, c = _bindingCount; b < c; ++b)
-			aa.push_back(_bindings[b].address);
+		std::vector<InetAddress> aa;
+		for(std::vector<_Binding>::const_iterator i(_bindings.begin());i!=_bindings.end();++i)
+			aa.push_back(i->address);
 		return aa;
 	}
 
-	/**
-	 * Send from all bound UDP sockets
-	 */
-	template <typename PHY_HANDLER_TYPE> inline bool udpSendAll(Phy<PHY_HANDLER_TYPE>& phy, const struct sockaddr_storage* addr, const void* data, unsigned int len, unsigned int ttl)
-	{
-		bool r = false;
-		Mutex::Lock _l(_lock);
-		for (unsigned int b = 0, c = _bindingCount; b < c; ++b) {
-			if (ttl)
-				phy.setIp4UdpTtl(_bindings[b].udpSock, ttl);
-			if (phy.udpSend(_bindings[b].udpSock, (const struct sockaddr*)addr, data, len))
-				r = true;
-			if (ttl)
-				phy.setIp4UdpTtl(_bindings[b].udpSock, 255);
-		}
-		return r;
-	}
-
-	/**
-	 * @param addr Address to check
-	 * @return True if this is a bound local interface address
-	 */
-	inline bool isBoundLocalInterfaceAddress(const InetAddress& addr) const
-	{
-		Mutex::Lock _l(_lock);
-		for (unsigned int b = 0; b < _bindingCount; ++b) {
-			if (_bindings[b].address == addr)
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Quickly check that a UDP socket is valid
-	 *
-	 * @param udpSock UDP socket to check
-	 * @return True if socket is currently bound/allocated
-	 */
-	inline bool isUdpSocketValid(PhySocket* const udpSock)
-	{
-		for (unsigned int b = 0, c = _bindingCount; b < c; ++b) {
-			if (_bindings[b].udpSock == udpSock)
-				return (b < _bindingCount);	  // double check atomic which may have changed
-		}
-		return false;
-	}
-
-	/**
-	 * @param s Socket object
-	 * @param nameBuf Buffer to store name of interface which this Socket object is bound to
-	 * @param buflen Length of buffer to copy name into
-	 */
-	void getIfName(PhySocket* s, char* nameBuf, int buflen) const
-	{
-		Mutex::Lock _l(_lock);
-		for (unsigned int b = 0, c = _bindingCount; b < c; ++b) {
-			if (_bindings[b].udpSock == s) {
-				memcpy(nameBuf, _bindings[b].ifname, buflen);
-				break;
-			}
-		}
-	}
-
-  private:
-	_Binding _bindings[ZT_BINDER_MAX_BINDINGS];
-	std::atomic<unsigned int> _bindingCount;
+private:
+	std::vector<_Binding> _bindings;
 	Mutex _lock;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/osdep/BlockingQueue.hpp b/osdep/BlockingQueue.hpp
deleted file mode 100644
index f377aa0bf..000000000
--- a/osdep/BlockingQueue.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_BLOCKINGQUEUE_HPP
-#define ZT_BLOCKINGQUEUE_HPP
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <mutex>
-#include <queue>
-#include <vector>
-
-namespace ZeroTier {
-
-/**
- * Simple C++11 thread-safe queue
- *
- * Do not use in node/ since we have not gone C++11 there yet.
- */
-template <class T> class BlockingQueue {
-  public:
-	BlockingQueue(void) : r(true)
-	{
-	}
-
-	inline void post(T t)
-	{
-		std::lock_guard<std::mutex> lock(m);
-		q.push(t);
-		c.notify_one();
-	}
-
-	inline void postLimit(T t, const unsigned long limit)
-	{
-		std::unique_lock<std::mutex> lock(m);
-		for (;;) {
-			if (q.size() < limit) {
-				q.push(t);
-				c.notify_one();
-				break;
-			}
-			if (! r)
-				break;
-			gc.wait(lock);
-		}
-	}
-
-	inline void stop(void)
-	{
-		std::lock_guard<std::mutex> lock(m);
-		r = false;
-		c.notify_all();
-		gc.notify_all();
-	}
-
-	inline bool get(T& value)
-	{
-		std::unique_lock<std::mutex> lock(m);
-		if (! r)
-			return false;
-		while (q.empty()) {
-			c.wait(lock);
-			if (! r) {
-				gc.notify_all();
-				return false;
-			}
-		}
-		value = q.front();
-		q.pop();
-		gc.notify_all();
-		return true;
-	}
-
-	inline std::vector<T> drain()
-	{
-		std::vector<T> v;
-		while (! q.empty()) {
-			v.push_back(q.front());
-			q.pop();
-		}
-		return v;
-	}
-
-	enum TimedWaitResult { OK, TIMED_OUT, STOP };
-
-	inline TimedWaitResult get(T& value, const unsigned long ms)
-	{
-		const std::chrono::milliseconds ms2 { ms };
-		std::unique_lock<std::mutex> lock(m);
-		if (! r)
-			return STOP;
-		while (q.empty()) {
-			if (c.wait_for(lock, ms2) == std::cv_status::timeout)
-				return ((r) ? TIMED_OUT : STOP);
-			else if (! r)
-				return STOP;
-		}
-		value = q.front();
-		q.pop();
-		return OK;
-	}
-
-	inline size_t size() const
-	{
-		return q.size();
-	}
-
-  private:
-	std::queue<T> q;
-	mutable std::mutex m;
-	mutable std::condition_variable c, gc;
-	std::atomic_bool r;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/EthernetTap.cpp b/osdep/EthernetTap.cpp
deleted file mode 100644
index 128ce0cfe..000000000
--- a/osdep/EthernetTap.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "EthernetTap.hpp"
-
-#include "OSUtils.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef ZT_SDK
-
-#include "../controller/EmbeddedNetworkController.hpp"
-#include "../include/VirtualTap.hpp"
-#include "../node/Node.hpp"
-
-#else
-
-#ifdef __APPLE__
-#include "MacEthernetTap.hpp"
-#include "MacKextEthernetTap.hpp"
-
-#include <sys/sysctl.h>
-#endif	 // __APPLE__
-
-#ifdef __LINUX__
-#include "ExtOsdep.hpp"
-#include "LinuxEthernetTap.hpp"
-#endif	 // __LINUX__
-
-#ifdef __WINDOWS__
-#include "WindowsEthernetTap.hpp"
-#endif	 // __WINDOWS__
-
-#ifdef __FreeBSD__
-#include "BSDEthernetTap.hpp"
-#endif	 // __FreeBSD__
-
-#ifdef __NetBSD__
-#include "NetBSDEthernetTap.hpp"
-#endif	 // __NetBSD__
-
-#ifdef __OpenBSD__
-#include "BSDEthernetTap.hpp"
-#endif	 // __OpenBSD__
-
-#endif
-
-namespace ZeroTier {
-
-std::shared_ptr<EthernetTap> EthernetTap::newInstance(
-	const char* tapDeviceType,	 // OS-specific, NULL for default
-	unsigned int concurrency,
-	bool pinning,
-	const char* homePath,
-	const MAC& mac,
-	unsigned int mtu,
-	unsigned int metric,
-	uint64_t nwid,
-	const char* friendlyName,
-	void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-	void* arg)
-{
-#ifdef ZT_SDK
-
-	return std::shared_ptr<EthernetTap>(new VirtualTap(homePath, mac, mtu, metric, nwid, friendlyName, handler, arg));
-
-#else	// not ZT_SDK
-
-#ifdef __APPLE__
-	char osrelease[256];
-	size_t size = sizeof(osrelease);
-	if (sysctlbyname("kern.osrelease", osrelease, &size, nullptr, 0) == 0) {
-		char* dotAt = strchr(osrelease, '.');
-		if (dotAt) {
-			*dotAt = (char)0;
-			// The "feth" virtual Ethernet device type appeared in Darwin 17.x.x. Older versions
-			// (Sierra and earlier) must use the a kernel extension.
-			if (strtol(osrelease, (char**)0, 10) < 17) {
-				return std::shared_ptr<EthernetTap>(new MacKextEthernetTap(homePath, mac, mtu, metric, nwid, friendlyName, handler, arg));
-			}
-			else {
-				return std::shared_ptr<EthernetTap>(new MacEthernetTap(homePath, mac, mtu, metric, nwid, friendlyName, handler, arg));
-			}
-		}
-	}
-#endif	 // __APPLE__
-
-#ifdef __LINUX__
-#ifdef ZT_EXTOSDEP
-	return std::shared_ptr<EthernetTap>(new ExtOsdepTap(homePath, mac, mtu, metric, nwid, friendlyName, handler, arg));
-#else
-	return std::shared_ptr<EthernetTap>(new LinuxEthernetTap(homePath, concurrency, pinning, mac, mtu, metric, nwid, friendlyName, handler, arg));
-#endif	 // ZT_EXTOSDEP
-#endif	 // __LINUX__
-
-#ifdef __WINDOWS__
-	HRESULT hres = CoInitializeEx(0, COINIT_MULTITHREADED);
-	if (FAILED(hres)) {
-		throw std::runtime_error("WinEthernetTap: COM initialization failed");
-	}
-
-	static bool _comInit = false;
-	static Mutex _comInit_m;
-
-	{
-		Mutex::Lock l(_comInit_m);
-		if (! _comInit) {
-			hres = CoInitializeSecurity(NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_PKT, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL);
-			if (FAILED(hres)) {
-				CoUninitialize();
-				fprintf(stderr, "WinEthernetTap: Failed to initialize security");
-				throw std::runtime_error("WinEthernetTap: Failed to initialize security");
-			}
-			_comInit = true;
-		}
-	}
-	return std::shared_ptr<EthernetTap>(new WindowsEthernetTap(homePath, mac, mtu, metric, nwid, friendlyName, handler, arg));
-#endif	 // __WINDOWS__
-
-#ifdef __FreeBSD__
-	return std::shared_ptr<EthernetTap>(new BSDEthernetTap(homePath, concurrency, pinning, mac, mtu, metric, nwid, friendlyName, handler, arg));
-#endif	 // __FreeBSD__
-
-#ifdef __NetBSD__
-	return std::shared_ptr<EthernetTap>(new NetBSDEthernetTap(homePath, mac, mtu, metric, nwid, friendlyName, handler, arg));
-#endif	 // __NetBSD__
-
-#ifdef __OpenBSD__
-	return std::shared_ptr<EthernetTap>(new BSDEthernetTap(homePath, concurrency, pinning, mac, mtu, metric, nwid, friendlyName, handler, arg));
-#endif	 // __OpenBSD__
-
-#endif	 // ZT_SDK?
-
-	return std::shared_ptr<EthernetTap>();
-}
-
-EthernetTap::EthernetTap()
-{
-}
-EthernetTap::~EthernetTap()
-{
-}
-
-bool EthernetTap::addIps(std::vector<InetAddress> ips)
-{
-	for (std::vector<InetAddress>::const_iterator i(ips.begin()); i != ips.end(); ++i) {
-		if (! addIp(*i))
-			return false;
-	}
-	return true;
-}
-
-std::string EthernetTap::friendlyName() const
-{
-	// Most platforms do not have this.
-	return std::string();
-}
-
-}	// namespace ZeroTier
diff --git a/osdep/EthernetTap.hpp b/osdep/EthernetTap.hpp
deleted file mode 100644
index aaabfeb60..000000000
--- a/osdep/EthernetTap.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_ETHERNETTAP_HPP
-#define ZT_ETHERNETTAP_HPP
-
-#include "../node/Constants.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/MAC.hpp"
-#include "../node/MulticastGroup.hpp"
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#define GETIFADDRS_CACHE_TIME 1000
-
-namespace ZeroTier {
-
-class EthernetTap {
-  public:
-	static std::shared_ptr<EthernetTap> newInstance(
-		const char* tapDeviceType,	 // OS-specific, NULL for default
-		unsigned int concurrency,
-		bool pinning,
-		const char* homePath,
-		const MAC& mac,
-		unsigned int mtu,
-		unsigned int metric,
-		uint64_t nwid,
-		const char* friendlyName,
-		void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-		void* arg);
-
-	EthernetTap();
-	virtual ~EthernetTap();
-
-	virtual void setEnabled(bool en) = 0;
-	virtual bool enabled() const = 0;
-	virtual bool addIp(const InetAddress& ip) = 0;
-	virtual bool addIps(std::vector<InetAddress> ips);	 // uses addIp() unless overridden
-	virtual bool removeIp(const InetAddress& ip) = 0;
-	virtual std::vector<InetAddress> ips() const = 0;
-	virtual void put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len) = 0;
-	virtual std::string deviceName() const = 0;
-	virtual void setFriendlyName(const char* friendlyName) = 0;
-	virtual std::string friendlyName() const;
-	virtual void scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed) = 0;
-	virtual void setMtu(unsigned int mtu) = 0;
-	virtual void setDns(const char* domain, const std::vector<InetAddress>& servers) = 0;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/ExtOsdep.cpp b/osdep/ExtOsdep.cpp
deleted file mode 100644
index 47543ae4d..000000000
--- a/osdep/ExtOsdep.cpp
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "ExtOsdep.hpp"
-
-#include "../node/AtomicCounter.hpp"
-
-#include <fcntl.h>
-#include <iostream>
-#include <list>
-#include <sys/times.h>
-#include <unistd.h>
-
-#define ZT_TAP_BUF_SIZE 16384
-
-namespace ZeroTier {
-
-static int eodFd = -1;
-static Mutex eodMutex;
-static int eodMgmtFd = -1;
-
-struct EodRoute {
-	InetAddress target;
-	InetAddress via;
-	InetAddress src;
-	std::string ifname;
-};
-static std::list<EodRoute> allRoutes;
-
-template <typename T> static void __eodSend(const T& t)
-{
-	write(eodFd, &t, sizeof(t));
-}
-
-static void strncpyx(char* dest, const char* src, size_t n)
-{
-	strncpy(dest, src, n);
-	if (n > 1) {
-		dest[n - 1] = 0;
-	}
-}
-
-static int __eodWait(unsigned char msg, unsigned char* d, unsigned l, unsigned maxl = 0, int* recvfd = nullptr)
-{
-	if (! maxl) {
-		maxl = l;
-	}
-	auto start = times(NULL);
-	while (1) {
-		msghdr mh;
-		iovec iov;
-		struct {
-			size_t cmsg_len;
-			int cmsg_level;
-			int cmsg_type;
-			int fd;
-		} __attribute__((packed)) cmsg;
-		memset(&mh, 0, sizeof(mh));
-		mh.msg_iov = &iov;
-		mh.msg_iovlen = 1;
-		if (recvfd) {
-			mh.msg_control = &cmsg;
-			mh.msg_controllen = sizeof(cmsg);
-		}
-		iov.iov_base = d;
-		iov.iov_len = maxl;
-
-		int r = recvmsg(eodFd, &mh, MSG_TRUNC | MSG_CMSG_CLOEXEC);
-		if (r > 0) {
-			if (recvfd && mh.msg_controllen >= sizeof(cmsg) && cmsg.cmsg_len == sizeof(cmsg) && cmsg.cmsg_level == SOL_SOCKET && cmsg.cmsg_type == SCM_RIGHTS) {
-				*recvfd = cmsg.fd;
-				fprintf(stderr, "eodWait: received fd %d\n", *recvfd);
-			}
-
-			if (d[0] != msg) {
-				fprintf(stderr, "eodWait: wrong msg, expected %u got %u\n", msg, d[0]);
-				return -1;
-			}
-			if ((unsigned)r < l || (unsigned)r > maxl) {
-				fprintf(stderr, "eodWait: wrong len, expected %u got %d\n", l, r);
-				return -1;
-			}
-			return r;
-		}
-		if (times(NULL) - start > 500) {
-			fprintf(stderr, "eodWait: timeout\n");
-			return -1;
-		}
-		usleep(100000);
-	}
-}
-
-template <typename T> static bool __eodWait(unsigned msg, T& t)
-{
-	return __eodWait(msg, (unsigned char*)&t, sizeof(T)) == (int)sizeof(T);
-}
-
-template <typename M, typename R> static bool __eodXchg(const M& m, unsigned rm, R& r)
-{
-	__eodSend(m);
-	return __eodWait(rm, r);
-}
-
-template <typename M, typename R> static bool eodXchg(const M& m, unsigned rm, R& r)
-{
-	Mutex::Lock l(eodMutex);
-	return __eodXchg(m, rm, r);
-}
-
-void ExtOsdep::init(int fd1, int fd2)
-{
-	eodFd = fd1;
-	eodMgmtFd = fd2;
-	fcntl(eodMgmtFd, F_SETFL, O_NONBLOCK);
-}
-
-void ExtOsdep::started(int* f, void** cp)
-{
-	*f = eodMgmtFd;
-	*cp = (void*)eodMgmtFd;
-
-	unsigned char msg = ZT_EOD_MSG_STARTED;
-	Mutex::Lock l(eodMutex);
-	__eodSend(msg);
-}
-
-static std::string mgmtrd;
-static std::string mgmtwr;
-
-bool ExtOsdep::mgmtWritable(void* cookie)
-{
-	if (cookie != (void*)eodMgmtFd) {
-		return false;
-	}
-	if (mgmtwr.size() == 0) {
-		return true;
-	}
-	auto sz = write(eodMgmtFd, mgmtwr.data(), mgmtwr.size());
-	if (sz <= 0) {
-		return false;
-	}
-	mgmtwr.erase(mgmtwr.begin(), mgmtwr.begin() + sz);
-	return mgmtwr.empty();
-}
-
-bool ExtOsdep::mgmtRecv(void* cookie, void* data, unsigned long len, std::function<unsigned(unsigned, const std::string&, const std::string&, std::string&)> cb)
-{
-	if (cookie != (void*)eodMgmtFd) {
-		return false;
-	}
-	mgmtrd.append((char*)data, len);
-	while (1) {
-		auto req = (zt_eod_mgmt_req*)mgmtrd.data();
-		if (mgmtrd.size() < sizeof(*req)) {
-			break;
-		}
-		unsigned reqsz = sizeof(*req) + req->pathlen + req->datalen;
-		if (mgmtrd.size() < reqsz) {
-			break;
-		}
-
-		std::string resp;
-		char* p = (char*)req->data;
-		zt_eod_mgmt_reply rep;
-		rep.scode = cb(req->method, std::string(p, p + req->pathlen), std::string(p + req->pathlen, p + req->pathlen + req->datalen), resp);
-		rep.datalen = resp.size();
-
-		mgmtrd.erase(mgmtrd.begin(), mgmtrd.begin() + reqsz);
-
-		mgmtwr.append((char*)&rep, sizeof(rep));
-		mgmtwr.append(resp);
-
-		auto sz = write(eodMgmtFd, mgmtwr.data(), mgmtwr.size());
-		if (sz > 0) {
-			mgmtwr.erase(mgmtwr.begin(), mgmtwr.begin() + sz);
-		}
-	}
-	return ! mgmtwr.empty();
-}
-
-void ExtOsdep::routeAddDel(bool add, const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifname)
-{
-	Mutex::Lock l(eodMutex);
-
-	std::string ifn;
-	if (ifname) {
-		ifn = ifname;
-	}
-	if (add) {
-		for (auto x = allRoutes.begin(); x != allRoutes.end(); ++x) {
-			if (x->target == target && x->via == via && x->src == src && x->ifname == ifn) {
-				return;
-			}
-		}
-		allRoutes.push_back({ target, via, src, ifn });
-	}
-	else {
-		bool found = false;
-		for (auto x = allRoutes.begin(); x != allRoutes.end(); ++x) {
-			if (x->target == target && x->via == via && x->src == src && x->ifname == ifn) {
-				allRoutes.erase(x);
-				found = true;
-				break;
-			}
-		}
-		if (! found) {
-			return;
-		}
-	}
-
-	zt_eod_msg_route req;
-	memset(&req, 0, sizeof(req));
-	req.cmd = add ? ZT_EOD_MSG_ADDROUTE : ZT_EOD_MSG_DELROUTE;
-	req.afi = target.isV4() ? 1 : 2;
-	req.dstlen = target.netmaskBits();
-	memcpy(req.dst, target.rawIpData(), target.isV4() ? 4 : 16);
-	if (ifname) {
-		strncpyx(req.dev, ifname, sizeof(req.dev));
-	}
-	if (via) {
-		memcpy(req.gw, via.rawIpData(), target.isV4() ? 4 : 16);
-	}
-	if (src) {
-		memcpy(req.src, src.rawIpData(), target.isV4() ? 4 : 16);
-	}
-
-	unsigned char resp;
-	__eodXchg(req, add ? ZT_EOD_MSG_ADDROUTERESP : ZT_EOD_MSG_DELROUTERESP, resp);
-}
-
-bool ExtOsdep::getBindAddrs(std::map<InetAddress, std::string>& ret)
-{
-	Mutex::Lock l(eodMutex);
-
-	unsigned char req = ZT_EOD_MSG_GETBINDADDRS;
-	__eodSend(req);
-
-	zt_eod_msg_getbindaddrsresp* resp;
-	unsigned char buf[ZT_EOD_MAXMSGSIZE];
-	int r = __eodWait(ZT_EOD_MSG_GETBINDADDRSRESP, (unsigned char*)buf, sizeof(*resp), sizeof(buf));
-	if (r < (int)sizeof(*resp)) {
-		return false;
-	}
-
-	int c = (r - (int)sizeof(*resp)) / sizeof(resp->addrs[0]);
-	resp = (zt_eod_msg_getbindaddrsresp*)buf;
-	for (int i = 0; i < c; ++i) {
-		ret[InetAddress(resp->addrs[i].data, resp->addrs[i].afi == 1 ? 4 : 16, resp->addrs[i].len)] = resp->addrs[i].ifname;
-	}
-
-	return resp->result;
-}
-
-ExtOsdepTap::ExtOsdepTap(
-	const char* homePath,
-	const MAC& mac,
-	unsigned int mtu,
-	unsigned int metric,
-	uint64_t nwid,
-	const char* friendlyName,
-	void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-	void* arg)
-	: _handler(handler)
-	, _arg(arg)
-	, _nwid(nwid)
-	, _mac(mac)
-	, _homePath(homePath)
-	, _mtu(mtu)
-	, _fd(0)
-	, _enabled(true)
-	, _run(true)
-{
-	zt_eod_msg_addtap req;
-	req.cmd = ZT_EOD_MSG_ADDTAP;
-	req.nwid = nwid;
-	req.mtu = mtu;
-	req.metric = metric;
-	strncpyx(req.fname, friendlyName, sizeof(req.fname));
-	mac.copyTo(req.mac, 6);
-
-	zt_eod_msg_addtapresp resp;
-
-	Mutex::Lock l(eodMutex);
-	__eodSend(req);
-	_fd = -1;
-	if (__eodWait(ZT_EOD_MSG_ADDTAPRESP, (unsigned char*)&resp, sizeof(resp), sizeof(resp), &_fd) != sizeof(resp)) {
-		throw std::runtime_error(std::string("could not create TAP"));
-	}
-
-	_dev = resp.name;
-	if (_dev.empty() || _fd < 0) {
-		throw std::runtime_error(std::string("could not create TAP"));
-	}
-
-	fcntl(_fd, F_SETFL, O_NONBLOCK);
-
-	(void)::pipe(_shutdownSignalPipe);
-	for (unsigned int t = 0; t < 2; ++t) {
-		_tapReaderThread[t] = std::thread([this, t] {
-			fd_set readfds, nullfds;
-			int n, nfds, r;
-			void* buf = nullptr;
-			std::vector<void*> buffers;
-
-			if (! _run) {
-				return;
-			}
-
-			FD_ZERO(&readfds);
-			FD_ZERO(&nullfds);
-			nfds = (int)std::max(_shutdownSignalPipe[0], _fd) + 1;
-
-			r = 0;
-			for (;;) {
-				FD_SET(_shutdownSignalPipe[0], &readfds);
-				FD_SET(_fd, &readfds);
-				select(nfds, &readfds, &nullfds, &nullfds, (struct timeval*)0);
-
-				if (FD_ISSET(_shutdownSignalPipe[0], &readfds)) {	// writes to shutdown pipe terminate thread
-					break;
-				}
-
-				if (FD_ISSET(_fd, &readfds)) {
-					for (;;) {	 // read until there are no more packets, then return to outer select() loop
-						if (! buf) {
-							// To reduce use of the mutex, we keep a local buffer vector and
-							// swap (which is a pointer swap) with the global one when it's
-							// empty. This retrieves a batch of buffers to use.
-							if (buffers.empty()) {
-								std::lock_guard<std::mutex> l(_buffers_l);
-								buffers.swap(_buffers);
-							}
-							if (buffers.empty()) {
-								buf = malloc(ZT_TAP_BUF_SIZE);
-								if (! buf) {
-									break;
-								}
-							}
-							else {
-								buf = buffers.back();
-								buffers.pop_back();
-							}
-						}
-
-						n = (int)::read(_fd, reinterpret_cast<uint8_t*>(buf) + r, ZT_TAP_BUF_SIZE - r);
-						if (n > 0) {
-							// Some tap drivers like to send the ethernet frame and the
-							// payload in two chunks, so handle that by accumulating
-							// data until we have at least a frame.
-							r += n;
-							if (r > 14) {
-								if (r > ((int)_mtu + 14)) {	  // sanity check for weird TAP behavior on some platforms
-									r = _mtu + 14;
-								}
-
-								if (_enabled && _tapqsize.load() < 1000) {
-									++_tapqsize;
-									_tapq.post(std::pair<void*, int>(buf, r));
-									buf = nullptr;
-								}
-
-								r = 0;
-							}
-						}
-						else {
-							r = 0;
-							break;
-						}
-					}
-				}
-			}
-		});
-	}
-
-	_tapProcessorThread = std::thread([this] {
-		MAC to, from;
-		std::pair<void*, int> qi;
-		while (_tapq.get(qi)) {
-			--_tapqsize;
-			uint8_t* const b = reinterpret_cast<uint8_t*>(qi.first);
-			if (b) {
-				to.setTo(b, 6);
-				from.setTo(b + 6, 6);
-				unsigned int etherType = Utils::ntoh(((const uint16_t*)b)[6]);
-				_handler(_arg, nullptr, _nwid, from, to, etherType, 0, (const void*)(b + 14), (unsigned int)(qi.second - 14));
-				{
-					std::lock_guard<std::mutex> l(_buffers_l);
-					if (_buffers.size() < 128) {
-						_buffers.push_back(qi.first);
-					}
-					else {
-						free(qi.first);
-					}
-				}
-			}
-			else {
-				break;
-			}
-		}
-	});
-}
-
-ExtOsdepTap::~ExtOsdepTap()
-{
-	_run = false;
-
-	(void)::write(_shutdownSignalPipe[1], "\0", 1);	  // causes reader thread(s) to exit
-	_tapq.post(std::pair<void*, int>(nullptr, 0));	  // causes processor thread to exit
-
-	_tapReaderThread[0].join();
-	_tapReaderThread[1].join();
-	_tapProcessorThread.join();
-
-	::close(_fd);
-	::close(_shutdownSignalPipe[0]);
-	::close(_shutdownSignalPipe[1]);
-
-	for (std::vector<void*>::iterator i(_buffers.begin()); i != _buffers.end(); ++i) {
-		free(*i);
-	}
-	std::vector<std::pair<void*, int> > dv(_tapq.drain());
-	for (std::vector<std::pair<void*, int> >::iterator i(dv.begin()); i != dv.end(); ++i) {
-		if (i->first) {
-			free(i->first);
-		}
-	}
-
-	zt_eod_msg_deltap req;
-	req.cmd = ZT_EOD_MSG_DELTAP;
-	strcpy(req.name, _dev.c_str());
-
-	unsigned char resp;
-	eodXchg(req, ZT_EOD_MSG_DELTAPRESP, resp);
-}
-
-void ExtOsdepTap::setEnabled(bool en)
-{
-	_enabled = en;
-}
-
-bool ExtOsdepTap::enabled() const
-{
-	return _enabled;
-}
-
-void ExtOsdepTap::doRemoveIp(const InetAddress& ip)
-{
-	zt_eod_msg_ip req;
-	req.cmd = ZT_EOD_MSG_DELIP;
-	strcpy(req.name, _dev.c_str());
-	req.afi = ip.isV4() ? 1 : 2;
-	req.len = ip.netmaskBits();
-	memcpy(req.data, ip.rawIpData(), ip.isV4() ? 4 : 16);
-
-	unsigned char resp;
-	__eodXchg(req, ZT_EOD_MSG_DELIPRESP, resp);
-}
-
-bool ExtOsdepTap::addIp(const InetAddress& ip)
-{
-	Mutex::Lock l(eodMutex);
-
-	for (auto i = allIps.begin(); i != allIps.end(); ++i) {
-		if (*i == ip) {
-			return true;
-		}
-		if (i->ipsEqual(ip)) {
-			doRemoveIp(*i);
-		}
-	}
-
-	zt_eod_msg_ip req;
-	req.cmd = ZT_EOD_MSG_ADDIP;
-	strcpy(req.name, _dev.c_str());
-	req.afi = ip.isV4() ? 1 : 2;
-	req.len = ip.netmaskBits();
-	memcpy(req.data, ip.rawIpData(), ip.isV4() ? 4 : 16);
-
-	unsigned char resp;
-	__eodXchg(req, ZT_EOD_MSG_ADDIPRESP, resp);
-
-	allIps.push_back(ip);
-
-	return true;
-}
-bool ExtOsdepTap::addIps(std::vector<InetAddress> ips)
-{
-	return false;
-}
-
-bool ExtOsdepTap::removeIp(const InetAddress& ip)
-{
-	Mutex::Lock l(eodMutex);
-	for (auto i = allIps.begin(); i != allIps.end(); ++i) {
-		if (*i == ip) {
-			doRemoveIp(*i);
-			return true;
-		}
-	}
-	return false;
-}
-std::vector<InetAddress> ExtOsdepTap::ips() const
-{
-	std::vector<InetAddress> ret;
-
-	Mutex::Lock l(eodMutex);
-
-	zt_eod_msg_getips req;
-	req.cmd = ZT_EOD_MSG_GETIPS;
-	strcpy(req.name, _dev.c_str());
-	__eodSend(req);
-
-	zt_eod_msg_getipsresp* resp;
-	unsigned char buf[ZT_EOD_MAXMSGSIZE];
-	int r = __eodWait(ZT_EOD_MSG_GETIPSRESP, (unsigned char*)buf, sizeof(*resp), sizeof(buf));
-	if (r < (int)sizeof(*resp)) {
-		return ret;
-	}
-
-	int c = (r - (int)sizeof(*resp)) / sizeof(resp->addrs[0]);
-	resp = (zt_eod_msg_getipsresp*)buf;
-	for (int i = 0; i < c; ++i) {
-		ret.push_back(InetAddress(resp->addrs[i].data, resp->addrs[i].afi == 1 ? 4 : 16, resp->addrs[i].len));
-	}
-
-	return ret;
-}
-void ExtOsdepTap::put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len)
-{
-	char putBuf[ZT_MAX_MTU + 64];
-	if ((_fd > 0) && (len <= _mtu) && (_enabled)) {
-		to.copyTo(putBuf, 6);
-		from.copyTo(putBuf + 6, 6);
-		*((uint16_t*)(putBuf + 12)) = htons((uint16_t)etherType);
-		memcpy(putBuf + 14, data, len);
-		len += 14;
-		(void)::write(_fd, putBuf, len);
-	}
-}
-std::string ExtOsdepTap::deviceName() const
-{
-	return _dev;
-}
-void ExtOsdepTap::setFriendlyName(const char* friendlyName)
-{
-}
-
-void ExtOsdepTap::scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed)
-{
-	char *ptr, *ptr2;
-	unsigned char mac[6];
-	std::vector<MulticastGroup> newGroups;
-
-	int fd = ::open("/proc/net/dev_mcast", O_RDONLY);
-	if (fd > 0) {
-		char buf[131072];
-		int n = (int)::read(fd, buf, sizeof(buf));
-		if ((n > 0) && (n < (int)sizeof(buf))) {
-			buf[n] = (char)0;
-			for (char* l = strtok_r(buf, "\r\n", &ptr); (l); l = strtok_r((char*)0, "\r\n", &ptr)) {
-				int fno = 0;
-				char* devname = (char*)0;
-				char* mcastmac = (char*)0;
-				for (char* f = strtok_r(l, " \t", &ptr2); (f); f = strtok_r((char*)0, " \t", &ptr2)) {
-					if (fno == 1) {
-						devname = f;
-					}
-					else if (fno == 4) {
-						mcastmac = f;
-					}
-					++fno;
-				}
-				if ((devname) && (! strcmp(devname, _dev.c_str())) && (mcastmac) && (Utils::unhex(mcastmac, mac, 6) == 6)) {
-					newGroups.push_back(MulticastGroup(MAC(mac, 6), 0));
-				}
-			}
-		}
-		::close(fd);
-	}
-
-	std::vector<InetAddress> allIps(ips());
-	for (std::vector<InetAddress>::iterator ip(allIps.begin()); ip != allIps.end(); ++ip) {
-		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
-	}
-
-	std::sort(newGroups.begin(), newGroups.end());
-	newGroups.erase(std::unique(newGroups.begin(), newGroups.end()), newGroups.end());
-
-	for (std::vector<MulticastGroup>::iterator m(newGroups.begin()); m != newGroups.end(); ++m) {
-		if (! std::binary_search(_multicastGroups.begin(), _multicastGroups.end(), *m)) {
-			added.push_back(*m);
-		}
-	}
-	for (std::vector<MulticastGroup>::iterator m(_multicastGroups.begin()); m != _multicastGroups.end(); ++m) {
-		if (! std::binary_search(newGroups.begin(), newGroups.end(), *m)) {
-			removed.push_back(*m);
-		}
-	}
-
-	_multicastGroups.swap(newGroups);
-}
-void ExtOsdepTap::setMtu(unsigned int mtu)
-{
-	if (mtu == _mtu) {
-		return;
-	}
-	_mtu = mtu;
-
-	zt_eod_msg_setmtu req;
-	req.cmd = ZT_EOD_MSG_SETMTU;
-	strcpy(req.name, _dev.c_str());
-	req.mtu = mtu;
-
-	unsigned char resp;
-	eodXchg(req, ZT_EOD_MSG_SETMTURESP, resp);
-}
-
-}	// namespace ZeroTier
diff --git a/osdep/ExtOsdep.hpp b/osdep/ExtOsdep.hpp
deleted file mode 100644
index f16893ced..000000000
--- a/osdep/ExtOsdep.hpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_EXTOSDEP_HPP
-#define ZT_EXTOSDEP_HPP
-
-#ifdef ZT_EXTOSDEP
-
-#include <stdint.h>
-
-#define ZT_EOD_MAXMSGSIZE (64 * 1024)
-
-#define ZT_EOD_MSG_STARTED			1	// no data
-#define ZT_EOD_MSG_ADDTAP			2
-#define ZT_EOD_MSG_ADDTAPRESP		3
-#define ZT_EOD_MSG_DELTAP			4
-#define ZT_EOD_MSG_DELTAPRESP		5	// no data
-#define ZT_EOD_MSG_SETMTU			6
-#define ZT_EOD_MSG_SETMTURESP		7
-#define ZT_EOD_MSG_ADDIP			8
-#define ZT_EOD_MSG_ADDIPRESP		9
-#define ZT_EOD_MSG_DELIP			10
-#define ZT_EOD_MSG_DELIPRESP		11
-#define ZT_EOD_MSG_GETIPS			12
-#define ZT_EOD_MSG_GETIPSRESP		13
-#define ZT_EOD_MSG_GETBINDADDRS		14
-#define ZT_EOD_MSG_GETBINDADDRSRESP 15
-#define ZT_EOD_MSG_ADDROUTE			16
-#define ZT_EOD_MSG_ADDROUTERESP		17
-#define ZT_EOD_MSG_DELROUTE			18
-#define ZT_EOD_MSG_DELROUTERESP		19
-
-struct zt_eod_msg_addtap {
-	unsigned char cmd;
-	uint64_t nwid;
-	uint32_t mtu;
-	uint32_t metric;
-	char fname[128];
-	unsigned char mac[6];
-} __attribute__((packed));
-
-struct zt_eod_msg_addtapresp {
-	unsigned char cmd;
-	char name[16];
-} __attribute__((packed));
-
-struct zt_eod_msg_deltap {
-	unsigned char cmd;
-	char name[16];
-} __attribute__((packed));
-
-struct zt_eod_msg_setmtu {
-	unsigned char cmd;
-	char name[16];
-	unsigned mtu;
-} __attribute__((packed));
-
-struct zt_eod_msg_ip {
-	unsigned char cmd;
-	char name[16];
-	unsigned char afi;	 // 1 ip, 2 ip6
-	unsigned char len;	 // bits in mask
-	unsigned char data[16];
-} __attribute__((packed));
-
-struct zt_eod_msg_getips {
-	unsigned char cmd;
-	char name[16];
-} __attribute__((packed));
-
-struct zt_eod_msg_getipsresp {
-	unsigned char cmd;
-	struct addr {
-		unsigned char afi;
-		unsigned char len;
-		unsigned char data[16];
-	} __attribute__((packed)) addrs[0];
-} __attribute__((packed));
-#define ZT_EOD_GETIPSRESP_MAXADDRS ((ZT_EOD_MAXMSGSIZE - sizeof(zt_eod_msg_getipsresp)) / sizeof(zt_eod_msg_getipsresp::addr))
-
-struct zt_eod_msg_getbindaddrsresp {
-	unsigned char cmd;
-	unsigned char result;
-	struct addr {
-		unsigned char afi;
-		unsigned char len;
-		unsigned char data[16];
-		char ifname[16];
-	} __attribute__((packed)) addrs[0];
-} __attribute__((packed));
-#define ZT_EOD_GETBINDADDRSRESP_MAXADDRS ((ZT_EOD_MAXMSGSIZE - sizeof(zt_eod_msg_getbindaddrsresp)) / sizeof(zt_eod_msg_getbindaddrsresp::addr))
-
-struct zt_eod_msg_route {
-	unsigned char cmd;
-	unsigned char afi;	 // 1 ip, 2 ip6
-	unsigned char dstlen;
-	unsigned char dst[16];
-	unsigned char gw[16];
-	char dev[16];
-	unsigned char src[16];
-} __attribute__((packed));
-
-struct zt_eod_mgmt_req {
-	uint32_t method;
-	uint32_t pathlen;
-	uint32_t datalen;
-	unsigned char data[0];
-} __attribute__((packed));
-
-struct zt_eod_mgmt_reply {
-	uint32_t scode;
-	uint32_t datalen;
-	unsigned char data[0];
-} __attribute__((packed));
-
-#ifndef ZT_EXTOSDEP_IFACEONLY
-
-#include "../node/AtomicCounter.hpp"
-#include "../node/Hashtable.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/MAC.hpp"
-#include "../node/Mutex.hpp"
-#include "BlockingQueue.hpp"
-#include "EthernetTap.hpp"
-#include "Thread.hpp"
-
-#include <atomic>
-#include <functional>
-#include <mutex>
-#include <string>
-#include <thread>
-
-namespace ZeroTier {
-
-class ExtOsdep {
-  public:
-	static void init(int, int);
-	static void started(int*, void**);
-
-	static void routeAddDel(bool, const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifaceName);
-	static bool getBindAddrs(std::map<InetAddress, std::string>&);
-
-	static bool mgmtRecv(void* cookie, void* data, unsigned long len, std::function<unsigned(unsigned, const std::string&, const std::string&, std::string&)>);
-	static bool mgmtWritable(void*);
-};
-
-class ExtOsdepTap : public EthernetTap {
-  public:
-	ExtOsdepTap(
-		const char* homePath,
-		const MAC& mac,
-		unsigned int mtu,
-		unsigned int metric,
-		uint64_t nwid,
-		const char* friendlyName,
-		void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-		void* arg);
-
-	virtual ~ExtOsdepTap();
-
-	virtual void setEnabled(bool en);
-	virtual bool enabled() const;
-	virtual bool addIp(const InetAddress& ip);
-	virtual bool addIps(std::vector<InetAddress> ips);
-	virtual bool removeIp(const InetAddress& ip);
-	virtual std::vector<InetAddress> ips() const;
-	virtual void put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len);
-	virtual std::string deviceName() const;
-	virtual void setFriendlyName(const char* friendlyName);
-	virtual void scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed);
-	virtual void setMtu(unsigned int mtu);
-	virtual void setDns(const char* domain, const std::vector<InetAddress>& servers)
-	{
-	}
-
-  private:
-	void (*_handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int);
-	void* _arg;
-	uint64_t _nwid;
-	MAC _mac;
-	std::string _homePath;
-	std::string _dev;
-	std::vector<MulticastGroup> _multicastGroups;
-	unsigned int _mtu;
-	int _fd;
-	int _shutdownSignalPipe[2];
-	std::atomic_bool _enabled;
-	std::atomic_bool _run;
-	std::thread _tapReaderThread[2];
-	std::thread _tapProcessorThread;
-	std::mutex _buffers_l;
-	std::vector<void*> _buffers;
-	BlockingQueue<std::pair<void*, int> > _tapq;
-	AtomicCounter _tapqsize;
-
-	std::vector<InetAddress> allIps;
-	void doRemoveIp(const InetAddress&);
-};
-
-}	// namespace ZeroTier
-
-#endif	 // ZT_EXTOSDEP_IFACEONLY
-#endif	 // ZT_EXTOSDEP
-
-#endif
diff --git a/osdep/Http.cpp b/osdep/Http.cpp
index 4b7879e82..6e3135de5 100644
--- a/osdep/Http.cpp
+++ b/osdep/Http.cpp
@@ -1,118 +1,103 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "Http.hpp"
-
-#include "../node/Constants.hpp"
-#include "../node/Utils.hpp"
-#include "OSUtils.hpp"
-#include "Phy.hpp"
-
-#include <stdint.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 
-#ifdef ZT_USE_SYSTEM_HTTP_PARSER
-#include <http_parser.h>
-#else
+#include "Http.hpp"
+#include "Phy.hpp"
+#include "OSUtils.hpp"
+#include "../node/Constants.hpp"
+#include "../node/Utils.hpp"
 #include "../ext/http-parser/http_parser.h"
-#endif
 
 namespace ZeroTier {
 
 namespace {
 
-static int ShttpOnMessageBegin(http_parser* parser);
-static int ShttpOnUrl(http_parser* parser, const char* ptr, size_t length);
-#if (HTTP_PARSER_VERSION_MAJOR >= 2) && (HTTP_PARSER_VERSION_MINOR >= 2)
-static int ShttpOnStatus(http_parser* parser, const char* ptr, size_t length);
-#else
-static int ShttpOnStatus(http_parser* parser);
-#endif
-static int ShttpOnHeaderField(http_parser* parser, const char* ptr, size_t length);
-static int ShttpOnValue(http_parser* parser, const char* ptr, size_t length);
-static int ShttpOnHeadersComplete(http_parser* parser);
-static int ShttpOnBody(http_parser* parser, const char* ptr, size_t length);
-static int ShttpOnMessageComplete(http_parser* parser);
+static int ShttpOnMessageBegin(http_parser *parser);
+static int ShttpOnUrl(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnStatus(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnHeaderField(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnValue(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnHeadersComplete(http_parser *parser);
+static int ShttpOnBody(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnMessageComplete(http_parser *parser);
+static const struct http_parser_settings HTTP_PARSER_SETTINGS = {
+	ShttpOnMessageBegin,
+	ShttpOnUrl,
+	ShttpOnStatus,
+	ShttpOnHeaderField,
+	ShttpOnValue,
+	ShttpOnHeadersComplete,
+	ShttpOnBody,
+	ShttpOnMessageComplete
+};
 
-#if (HTTP_PARSER_VERSION_MAJOR >= 2) && (HTTP_PARSER_VERSION_MINOR >= 1)
-static const struct http_parser_settings HTTP_PARSER_SETTINGS = { ShttpOnMessageBegin, ShttpOnUrl, ShttpOnStatus, ShttpOnHeaderField, ShttpOnValue, ShttpOnHeadersComplete, ShttpOnBody, ShttpOnMessageComplete };
-#else
-static const struct http_parser_settings HTTP_PARSER_SETTINGS = { ShttpOnMessageBegin, ShttpOnUrl, ShttpOnHeaderField, ShttpOnValue, ShttpOnHeadersComplete, ShttpOnBody, ShttpOnMessageComplete };
-#endif
-
-struct HttpPhyHandler {
+struct HttpPhyHandler
+{
 	// not used
-	inline void phyOnDatagram(PhySocket* sock, void** uptr, const struct sockaddr* localAddr, const struct sockaddr* from, void* data, unsigned long len)
-	{
-	}
-	inline void phyOnTcpAccept(PhySocket* sockL, PhySocket* sockN, void** uptrL, void** uptrN, const struct sockaddr* from)
-	{
-	}
+	inline void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *localAddr,const struct sockaddr *from,void *data,unsigned long len) {}
+	inline void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from) {}
 
-	inline void phyOnTcpConnect(PhySocket* sock, void** uptr, bool success)
+	inline void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success)
 	{
 		if (success) {
-			phy->setNotifyWritable(sock, true);
-		}
-		else {
+			phy->setNotifyWritable(sock,true);
+		} else {
 			*responseBody = "connection failed";
 			error = true;
 			done = true;
 		}
 	}
 
-	inline void phyOnTcpClose(PhySocket* sock, void** uptr)
+	inline void phyOnTcpClose(PhySocket *sock,void **uptr)
 	{
 		done = true;
 	}
 
-	inline void phyOnTcpData(PhySocket* sock, void** uptr, void* data, unsigned long len)
+	inline void phyOnTcpData(PhySocket *sock,void **uptr,void *data,unsigned long len)
 	{
 		lastActivity = OSUtils::now();
-		http_parser_execute(&parser, &HTTP_PARSER_SETTINGS, (const char*)data, len);
-		if ((parser.upgrade) || (parser.http_errno != HPE_OK))
+		http_parser_execute(&parser,&HTTP_PARSER_SETTINGS,(const char *)data,len);
+		if ((parser.upgrade)||(parser.http_errno != HPE_OK))
 			phy->close(sock);
 	}
 
-	inline void phyOnTcpWritable(PhySocket* sock, void** uptr)
+	inline void phyOnTcpWritable(PhySocket *sock,void **uptr)
 	{
-		if (writePtr < (unsigned long)writeBuf.length()) {
-			long n = phy->streamSend(sock, writeBuf.data() + writePtr, (unsigned long)writeBuf.length() - writePtr, true);
+		if (writePtr < writeSize) {
+			long n = phy->streamSend(sock,writeBuf + writePtr,writeSize - writePtr,true);
 			if (n > 0)
 				writePtr += n;
 		}
-		if (writePtr >= (unsigned long)writeBuf.length())
-			phy->setNotifyWritable(sock, false);
+		if (writePtr >= writeSize)
+			phy->setNotifyWritable(sock,false);
 	}
 
-	inline void phyOnFileDescriptorActivity(PhySocket* sock, void** uptr, bool readable, bool writable)
-	{
-	}
+	inline void phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,bool readable,bool writable) {}
 #ifdef __UNIX_LIKE__
-	inline void phyOnUnixAccept(PhySocket* sockL, PhySocket* sockN, void** uptrL, void** uptrN)
-	{
-	}
-	inline void phyOnUnixClose(PhySocket* sock, void** uptr)
-	{
-	}
-	inline void phyOnUnixData(PhySocket* sock, void** uptr, void* data, unsigned long len)
-	{
-	}
-	inline void phyOnUnixWritable(PhySocket* sock, void** uptr)
-	{
-	}
-#endif	 // __UNIX_LIKE__
+	inline void phyOnUnixAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN) {}
+	inline void phyOnUnixClose(PhySocket *sock,void **uptr) {}
+	inline void phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len) {}
+	inline void phyOnUnixWritable(PhySocket *sock,void **uptr) {}
+#endif // __UNIX_LIKE__
 
 	http_parser parser;
 	std::string currentHeaderField;
@@ -120,100 +105,95 @@ struct HttpPhyHandler {
 	unsigned long messageSize;
 	unsigned long writePtr;
 	uint64_t lastActivity;
-	std::string writeBuf;
+	unsigned long writeSize;
+	char writeBuf[32768];
 
 	unsigned long maxResponseSize;
-	std::map<std::string, std::string>* responseHeaders;
-	std::string* responseBody;
+	std::map<std::string,std::string> *responseHeaders;
+	std::string *responseBody;
 	bool error;
 	bool done;
 
-	Phy<HttpPhyHandler*>* phy;
-	PhySocket* sock;
+	Phy<HttpPhyHandler *> *phy;
+	PhySocket *sock;
 };
 
-static int ShttpOnMessageBegin(http_parser* parser)
+static int ShttpOnMessageBegin(http_parser *parser)
 {
 	return 0;
 }
-static int ShttpOnUrl(http_parser* parser, const char* ptr, size_t length)
+static int ShttpOnUrl(http_parser *parser,const char *ptr,size_t length)
 {
 	return 0;
 }
-#if (HTTP_PARSER_VERSION_MAJOR >= 2) && (HTTP_PARSER_VERSION_MINOR >= 2)
-static int ShttpOnStatus(http_parser* parser, const char* ptr, size_t length)
-#else
-static int ShttpOnStatus(http_parser* parser)
-#endif
+static int ShttpOnStatus(http_parser *parser,const char *ptr,size_t length)
 {
-	/*
 	HttpPhyHandler *hh = reinterpret_cast<HttpPhyHandler *>(parser->data);
 	hh->messageSize += (unsigned long)length;
 	if (hh->messageSize > hh->maxResponseSize)
 		return -1;
-	*/
 	return 0;
 }
-static int ShttpOnHeaderField(http_parser* parser, const char* ptr, size_t length)
+static int ShttpOnHeaderField(http_parser *parser,const char *ptr,size_t length)
 {
-	HttpPhyHandler* hh = reinterpret_cast<HttpPhyHandler*>(parser->data);
+	HttpPhyHandler *hh = reinterpret_cast<HttpPhyHandler *>(parser->data);
 	hh->messageSize += (unsigned long)length;
 	if (hh->messageSize > hh->maxResponseSize)
 		return -1;
-	if ((hh->currentHeaderField.length()) && (hh->currentHeaderValue.length())) {
+	if ((hh->currentHeaderField.length())&&(hh->currentHeaderValue.length())) {
 		(*hh->responseHeaders)[hh->currentHeaderField] = hh->currentHeaderValue;
 		hh->currentHeaderField = "";
 		hh->currentHeaderValue = "";
 	}
-	for (size_t i = 0; i < length; ++i)
+	for(size_t i=0;i<length;++i)
 		hh->currentHeaderField.push_back(OSUtils::toLower(ptr[i]));
 	return 0;
 }
-static int ShttpOnValue(http_parser* parser, const char* ptr, size_t length)
+static int ShttpOnValue(http_parser *parser,const char *ptr,size_t length)
 {
-	HttpPhyHandler* hh = reinterpret_cast<HttpPhyHandler*>(parser->data);
+	HttpPhyHandler *hh = reinterpret_cast<HttpPhyHandler *>(parser->data);
 	hh->messageSize += (unsigned long)length;
 	if (hh->messageSize > hh->maxResponseSize)
 		return -1;
-	hh->currentHeaderValue.append(ptr, length);
+	hh->currentHeaderValue.append(ptr,length);
 	return 0;
 }
-static int ShttpOnHeadersComplete(http_parser* parser)
+static int ShttpOnHeadersComplete(http_parser *parser)
 {
-	HttpPhyHandler* hh = reinterpret_cast<HttpPhyHandler*>(parser->data);
-	if ((hh->currentHeaderField.length()) && (hh->currentHeaderValue.length()))
+	HttpPhyHandler *hh = reinterpret_cast<HttpPhyHandler *>(parser->data);
+	if ((hh->currentHeaderField.length())&&(hh->currentHeaderValue.length()))
 		(*hh->responseHeaders)[hh->currentHeaderField] = hh->currentHeaderValue;
 	return 0;
 }
-static int ShttpOnBody(http_parser* parser, const char* ptr, size_t length)
+static int ShttpOnBody(http_parser *parser,const char *ptr,size_t length)
 {
-	HttpPhyHandler* hh = reinterpret_cast<HttpPhyHandler*>(parser->data);
+	HttpPhyHandler *hh = reinterpret_cast<HttpPhyHandler *>(parser->data);
 	hh->messageSize += (unsigned long)length;
 	if (hh->messageSize > hh->maxResponseSize)
 		return -1;
-	hh->responseBody->append(ptr, length);
+	hh->responseBody->append(ptr,length);
 	return 0;
 }
-static int ShttpOnMessageComplete(http_parser* parser)
+static int ShttpOnMessageComplete(http_parser *parser)
 {
-	HttpPhyHandler* hh = reinterpret_cast<HttpPhyHandler*>(parser->data);
+	HttpPhyHandler *hh = reinterpret_cast<HttpPhyHandler *>(parser->data);
 	hh->phy->close(hh->sock);
 	return 0;
 }
 
-}	// anonymous namespace
+} // anonymous namespace
 
 unsigned int Http::_do(
-	const char* method,
+	const char *method,
 	unsigned long maxResponseSize,
 	unsigned long timeout,
-	const struct sockaddr* remoteAddress,
-	const char* path,
-	const std::map<std::string, std::string>& requestHeaders,
-	const void* requestBody,
+	const struct sockaddr *remoteAddress,
+	const char *path,
+	const std::map<std::string,std::string> &requestHeaders,
+	const void *requestBody,
 	unsigned long requestBodyLength,
-	std::map<std::string, std::string>& responseHeaders,
-	std::string& responseBody)
+	std::map<std::string,std::string> &responseHeaders,
+	std::string &responseBody)
 {
 	try {
 		responseHeaders.clear();
@@ -221,53 +201,49 @@ unsigned int Http::_do(
 
 		HttpPhyHandler handler;
 
-		http_parser_init(&(handler.parser), HTTP_RESPONSE);
-		handler.parser.data = (void*)&handler;
+		http_parser_init(&(handler.parser),HTTP_RESPONSE);
+		handler.parser.data = (void *)&handler;
 		handler.messageSize = 0;
 		handler.writePtr = 0;
 		handler.lastActivity = OSUtils::now();
 
 		try {
-			char tmp[1024];
-			OSUtils::ztsnprintf(tmp, sizeof(tmp), "%s %s HTTP/1.1\r\n", method, path);
-			handler.writeBuf.append(tmp);
-			for (std::map<std::string, std::string>::const_iterator h(requestHeaders.begin()); h != requestHeaders.end(); ++h) {
-				OSUtils::ztsnprintf(tmp, sizeof(tmp), "%s: %s\r\n", h->first.c_str(), h->second.c_str());
-				handler.writeBuf.append(tmp);
+			handler.writeSize = Utils::snprintf(handler.writeBuf,sizeof(handler.writeBuf),"%s %s HTTP/1.1\r\n",method,path);
+			for(std::map<std::string,std::string>::const_iterator h(requestHeaders.begin());h!=requestHeaders.end();++h)
+				handler.writeSize += Utils::snprintf(handler.writeBuf + handler.writeSize,sizeof(handler.writeBuf) - handler.writeSize,"%s: %s\r\n",h->first.c_str(),h->second.c_str());
+			handler.writeSize += Utils::snprintf(handler.writeBuf + handler.writeSize,sizeof(handler.writeBuf) - handler.writeSize,"\r\n");
+			if ((requestBody)&&(requestBodyLength)) {
+				if ((handler.writeSize + requestBodyLength) > sizeof(handler.writeBuf)) {
+					responseBody = "request too large";
+					return 0;
+				}
+				memcpy(handler.writeBuf + handler.writeSize,requestBody,requestBodyLength);
+				handler.writeSize += requestBodyLength;
 			}
-			handler.writeBuf.append("\r\n");
-			if ((requestBody) && (requestBodyLength))
-				handler.writeBuf.append((const char*)requestBody, requestBodyLength);
-		}
-		catch (...) {
+		} catch ( ... ) {
 			responseBody = "request too large";
 			return 0;
 		}
 
-		if (maxResponseSize) {
-			handler.maxResponseSize = maxResponseSize;
-		}
-		else {
-			handler.maxResponseSize = 2147483647;
-		}
+		handler.maxResponseSize = maxResponseSize;
 		handler.responseHeaders = &responseHeaders;
 		handler.responseBody = &responseBody;
 		handler.error = false;
 		handler.done = false;
 
-		Phy<HttpPhyHandler*> phy(&handler, true, true);
+		Phy<HttpPhyHandler *> phy(&handler,true,true);
 
 		bool instantConnect = false;
 		handler.phy = &phy;
-		handler.sock = phy.tcpConnect((const struct sockaddr*)remoteAddress, instantConnect, (void*)0, true);
-		if (! handler.sock) {
+		handler.sock = phy.tcpConnect((const struct sockaddr *)remoteAddress,instantConnect,(void *)0,true);
+		if (!handler.sock) {
 			responseBody = "connection failed (2)";
 			return 0;
 		}
 
-		while (! handler.done) {
+		while (!handler.done) {
 			phy.poll(timeout / 2);
-			if ((timeout) && ((unsigned long)(OSUtils::now() - handler.lastActivity) > timeout)) {
+			if ((timeout)&&((unsigned long)(OSUtils::now() - handler.lastActivity) > timeout)) {
 				phy.close(handler.sock);
 				responseBody = "timed out";
 				return 0;
@@ -275,15 +251,13 @@ unsigned int Http::_do(
 		}
 
 		return ((handler.error) ? 0 : ((handler.parser.http_errno != HPE_OK) ? 0 : handler.parser.status_code));
-	}
-	catch (std::exception& exc) {
+	} catch (std::exception &exc) {
 		responseBody = exc.what();
 		return 0;
-	}
-	catch (...) {
+	} catch ( ... ) {
 		responseBody = "unknown exception";
 		return 0;
 	}
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/osdep/Http.hpp b/osdep/Http.hpp
index 2e4783226..1ecf4eece 100644
--- a/osdep/Http.hpp
+++ b/osdep/Http.hpp
@@ -1,36 +1,39 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_HTTP_HPP
 #define ZT_HTTP_HPP
 
+#include <string>
 #include <map>
 #include <stdexcept>
-#include <string>
 
 #if defined(_WIN32) || defined(_WIN64)
-// clang-format off
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-// clang-format on
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+#include <Windows.h>
 #else
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
+#include <unistd.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #endif
 
 namespace ZeroTier {
@@ -38,8 +41,9 @@ namespace ZeroTier {
 /**
  * Simple synchronous HTTP client used for updater and cli
  */
-class Http {
-  public:
+class Http
+{
+public:
 	/**
 	 * Make HTTP GET request
 	 *
@@ -47,16 +51,26 @@ class Http {
 	 *
 	 * @return HTTP status code or 0 on error (responseBody will contain error message)
 	 */
-	static inline unsigned int
-	GET(unsigned long maxResponseSize,
+	static inline unsigned int GET(
+		unsigned long maxResponseSize,
 		unsigned long timeout,
-		const struct sockaddr* remoteAddress,
-		const char* path,
-		const std::map<std::string, std::string>& requestHeaders,
-		std::map<std::string, std::string>& responseHeaders,
-		std::string& responseBody)
+		const struct sockaddr *remoteAddress,
+		const char *path,
+		const std::map<std::string,std::string> &requestHeaders,
+		std::map<std::string,std::string> &responseHeaders,
+		std::string &responseBody)
 	{
-		return _do("GET", maxResponseSize, timeout, remoteAddress, path, requestHeaders, (const void*)0, 0, responseHeaders, responseBody);
+		return _do(
+			"GET",
+			maxResponseSize,
+			timeout,
+			remoteAddress,
+			path,
+			requestHeaders,
+			(const void *)0,
+			0,
+			responseHeaders,
+			responseBody);
 	}
 
 	/**
@@ -66,16 +80,26 @@ class Http {
 	 *
 	 * @return HTTP status code or 0 on error (responseBody will contain error message)
 	 */
-	static inline unsigned int
-	DEL(unsigned long maxResponseSize,
+	static inline unsigned int DEL(
+		unsigned long maxResponseSize,
 		unsigned long timeout,
-		const struct sockaddr* remoteAddress,
-		const char* path,
-		const std::map<std::string, std::string>& requestHeaders,
-		std::map<std::string, std::string>& responseHeaders,
-		std::string& responseBody)
+		const struct sockaddr *remoteAddress,
+		const char *path,
+		const std::map<std::string,std::string> &requestHeaders,
+		std::map<std::string,std::string> &responseHeaders,
+		std::string &responseBody)
 	{
-		return _do("DELETE", maxResponseSize, timeout, remoteAddress, path, requestHeaders, (const void*)0, 0, responseHeaders, responseBody);
+		return _do(
+			"DELETE",
+			maxResponseSize,
+			timeout,
+			remoteAddress,
+			path,
+			requestHeaders,
+			(const void *)0,
+			0,
+			responseHeaders,
+			responseBody);
 	}
 
 	/**
@@ -90,54 +114,41 @@ class Http {
 	static inline unsigned int POST(
 		unsigned long maxResponseSize,
 		unsigned long timeout,
-		const struct sockaddr* remoteAddress,
-		const char* path,
-		const std::map<std::string, std::string>& requestHeaders,
-		const void* postData,
+		const struct sockaddr *remoteAddress,
+		const char *path,
+		const std::map<std::string,std::string> &requestHeaders,
+		const void *postData,
 		unsigned long postDataLength,
-		std::map<std::string, std::string>& responseHeaders,
-		std::string& responseBody)
+		std::map<std::string,std::string> &responseHeaders,
+		std::string &responseBody)
 	{
-		return _do("POST", maxResponseSize, timeout, remoteAddress, path, requestHeaders, postData, postDataLength, responseHeaders, responseBody);
+		return _do(
+			"POST",
+			maxResponseSize,
+			timeout,
+			remoteAddress,
+			path,
+			requestHeaders,
+			postData,
+			postDataLength,
+			responseHeaders,
+			responseBody);
 	}
 
-	/**
-	 * Make HTTP PUT request
-	 *
-	 * It is the responsibility of the caller to set all headers. With PUT, the
-	 * Content-Length and Content-Type headers must be set or the PUT will not
-	 * work.
-	 *
-	 * @return HTTP status code or 0 on error (responseBody will contain error message)
-	 */
-	static inline unsigned int
-	PUT(unsigned long maxResponseSize,
-		unsigned long timeout,
-		const struct sockaddr* remoteAddress,
-		const char* path,
-		const std::map<std::string, std::string>& requestHeaders,
-		const void* postData,
-		unsigned long postDataLength,
-		std::map<std::string, std::string>& responseHeaders,
-		std::string& responseBody)
-	{
-		return _do("PUT", maxResponseSize, timeout, remoteAddress, path, requestHeaders, postData, postDataLength, responseHeaders, responseBody);
-	}
-
-  private:
-	static unsigned int
-	_do(const char* method,
+private:
+	static unsigned int _do(
+		const char *method,
 		unsigned long maxResponseSize,
 		unsigned long timeout,
-		const struct sockaddr* remoteAddress,
-		const char* path,
-		const std::map<std::string, std::string>& requestHeaders,
-		const void* requestBody,
+		const struct sockaddr *remoteAddress,
+		const char *path,
+		const std::map<std::string,std::string> &requestHeaders,
+		const void *requestBody,
 		unsigned long requestBodyLength,
-		std::map<std::string, std::string>& responseHeaders,
-		std::string& responseBody);
+		std::map<std::string,std::string> &responseHeaders,
+		std::string &responseBody);
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/osdep/LinuxEthernetTap.cpp b/osdep/LinuxEthernetTap.cpp
index 5fe37216d..c66b7a38b 100644
--- a/osdep/LinuxEthernetTap.cpp
+++ b/osdep/LinuxEthernetTap.cpp
@@ -1,375 +1,192 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wrestrict"
-#endif
-
-#include "../node/Constants.hpp"
-
-#ifdef __LINUX__
-
-#include "../node/Dictionary.hpp"
-#include "../node/Mutex.hpp"
-#include "../node/Utils.hpp"
-#include "LinuxEthernetTap.hpp"
-#include "LinuxNetLink.hpp"
-#include "OSUtils.hpp"
-
-#include <algorithm>
-#include <arpa/inet.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <ifaddrs.h>
-#include <linux/if.h>
-#include <linux/if_addr.h>
-#include <linux/if_ether.h>
-#include <linux/if_tun.h>
-#include <net/if_arp.h>
-#include <netinet/in.h>
-#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <sys/wait.h>
 #include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <sys/select.h>
+#include <netinet/in.h>
+#include <net/if_arp.h>
+#include <arpa/inet.h>
+#include <linux/if.h>
+#include <linux/if_tun.h>
+#include <linux/if_addr.h>
+#include <linux/if_ether.h>
+#include <ifaddrs.h>
+
+#include <algorithm>
 #include <utility>
 
-#ifndef IFNAMSIZ
-#define IFNAMSIZ 16
-#endif
-
-#define ZT_TAP_BUF_SIZE (1024 * 16)
+#include "../node/Constants.hpp"
+#include "../node/Utils.hpp"
+#include "../node/Mutex.hpp"
+#include "../node/Dictionary.hpp"
+#include "OSUtils.hpp"
+#include "LinuxEthernetTap.hpp"
 
 // ff:ff:ff:ff:ff:ff with no ADI
-static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff), 0);
+static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff),0);
 
 namespace ZeroTier {
 
-// determine if we're running a really old linux kernel.
-// Kernels in the 2.6.x series don't behave the same when bringing up
-// the tap devices.
-//
-// Returns true if the kernel major version is < 3
-bool isOldLinuxKernel()
-{
-	struct utsname buffer;
-	char* p;
-	long ver[16];
-	int i = 0;
-	if (uname(&buffer) != 0) {
-		perror("uname");
-		exit(EXIT_FAILURE);
-	}
-
-	p = buffer.release;
-
-	while (*p) {
-		if (isdigit(*p)) {
-			ver[i] = strtol(p, &p, 10);
-			i++;
-		}
-		else {
-			p++;
-		}
-	}
-
-	return ver[0] < 3;
-}
-
-static const char _base32_chars[32] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '2', '3', '4', '5', '6', '7' };
-static void _base32_5_to_8(const uint8_t* in, char* out)
-{
-	out[0] = _base32_chars[(in[0]) >> 3];
-	out[1] = _base32_chars[(in[0] & 0x07) << 2 | (in[1] & 0xc0) >> 6];
-	out[2] = _base32_chars[(in[1] & 0x3e) >> 1];
-	out[3] = _base32_chars[(in[1] & 0x01) << 4 | (in[2] & 0xf0) >> 4];
-	out[4] = _base32_chars[(in[2] & 0x0f) << 1 | (in[3] & 0x80) >> 7];
-	out[5] = _base32_chars[(in[3] & 0x7c) >> 2];
-	out[6] = _base32_chars[(in[3] & 0x03) << 3 | (in[4] & 0xe0) >> 5];
-	out[7] = _base32_chars[(in[4] & 0x1f)];
-}
+static Mutex __tapCreateLock;
 
 LinuxEthernetTap::LinuxEthernetTap(
-	const char* homePath,
-	unsigned int concurrency,
-	bool pinning,
-	const MAC& mac,
+	const char *homePath,
+	const MAC &mac,
 	unsigned int mtu,
 	unsigned int metric,
 	uint64_t nwid,
-	const char* friendlyName,
-	void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-	void* arg)
-	: _handler(handler)
-	, _arg(arg)
-	, _nwid(nwid)
-	, _mac(mac)
-	, _homePath(homePath)
-	, _mtu(mtu)
-	, _fd(0)
-	, _enabled(true)
-	, _run(true)
-	, _lastIfAddrsUpdate(0)
+	const char *friendlyName,
+	void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+	void *arg) :
+	_handler(handler),
+	_arg(arg),
+	_nwid(nwid),
+	_homePath(homePath),
+	_mtu(mtu),
+	_fd(0),
+	_enabled(true)
 {
-	static std::mutex s_tapCreateLock;
-	char procpath[128], nwids[32];
+	char procpath[128],nwids[32];
 	struct stat sbuf;
 
-	// Create only one tap at a time globally.
-	std::lock_guard<std::mutex> tapCreateLock(s_tapCreateLock);
+	Utils::snprintf(nwids,sizeof(nwids),"%.16llx",nwid);
 
-	// Make sure Linux netlink is initialized.
-	(void)LinuxNetLink::getInstance();
+	Mutex::Lock _l(__tapCreateLock); // create only one tap at a time, globally
 
-	OSUtils::ztsnprintf(nwids, sizeof(nwids), "%.16llx", nwid);
+	if (mtu > 2800)
+		throw std::runtime_error("max tap MTU is 2800");
 
-	_fd = ::open("/dev/net/tun", O_RDWR);
+	_fd = ::open("/dev/net/tun",O_RDWR);
 	if (_fd <= 0) {
-		_fd = ::open("/dev/tun", O_RDWR);
+		_fd = ::open("/dev/tun",O_RDWR);
 		if (_fd <= 0)
 			throw std::runtime_error(std::string("could not open TUN/TAP device: ") + strerror(errno));
 	}
 
 	struct ifreq ifr;
-	memset(&ifr, 0, sizeof(ifr));
+	memset(&ifr,0,sizeof(ifr));
 
-	// Restore device names from legacy devicemap, but for new devices we use a base32-based
-	// canonical device name.
-	std::map<std::string, std::string> globalDeviceMap;
-	FILE* devmapf = fopen((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(), "r");
-	if (devmapf) {
-		char buf[256];
-		while (fgets(buf, sizeof(buf), devmapf)) {
-			char* x = (char*)0;
-			char* y = (char*)0;
-			char* saveptr = (char*)0;
-			for (char* f = Utils::stok(buf, "\r\n=", &saveptr); (f); f = Utils::stok((char*)0, "\r\n=", &saveptr)) {
-				if (! x)
-					x = f;
-				else if (! y)
-					y = f;
-				else
-					break;
-			}
-			if ((x) && (y) && (x[0]) && (y[0]))
-				globalDeviceMap[x] = y;
-		}
-		fclose(devmapf);
-	}
+	// Try to recall our last device name, or pick an unused one if that fails.
 	bool recalledDevice = false;
-	std::map<std::string, std::string>::const_iterator gdmEntry = globalDeviceMap.find(nwids);
-	if (gdmEntry != globalDeviceMap.end()) {
-		Utils::scopy(ifr.ifr_name, sizeof(ifr.ifr_name), gdmEntry->second.c_str());
-		OSUtils::ztsnprintf(procpath, sizeof(procpath), "/proc/sys/net/ipv4/conf/%s", ifr.ifr_name);
-		recalledDevice = (stat(procpath, &sbuf) != 0);
+	std::string devmapbuf;
+	Dictionary devmap;
+	if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmapbuf)) {
+		devmap.fromString(devmapbuf);
+		std::string desiredDevice(devmap.get(nwids,""));
+		if (desiredDevice.length() > 2) {
+			Utils::scopy(ifr.ifr_name,sizeof(ifr.ifr_name),desiredDevice.c_str());
+			Utils::snprintf(procpath,sizeof(procpath),"/proc/sys/net/ipv4/conf/%s",ifr.ifr_name);
+			recalledDevice = (stat(procpath,&sbuf) != 0);
+		}
 	}
 
-	if (! recalledDevice) {
-#ifdef __SYNOLOGY__
-		int devno = 50;
+	if (!recalledDevice) {
+		int devno = 0;
 		do {
-			OSUtils::ztsnprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "eth%d", devno++);
-			OSUtils::ztsnprintf(procpath, sizeof(procpath), "/proc/sys/net/ipv4/conf/%s", ifr.ifr_name);
-		} while (stat(procpath, &sbuf) == 0);	// try zt#++ until we find one that does not exist
-#else
-		uint64_t trial = 0;	  // incremented in the very unlikely event of a name collision with another network
-		do {
-			const uint64_t nwid40 = (nwid ^ (nwid >> 24)) + trial++;
-			uint8_t tmp2[5];
-			char tmp3[11];
-			tmp2[0] = (uint8_t)((nwid40 >> 32) & 0xff);
-			tmp2[1] = (uint8_t)((nwid40 >> 24) & 0xff);
-			tmp2[2] = (uint8_t)((nwid40 >> 16) & 0xff);
-			tmp2[3] = (uint8_t)((nwid40 >> 8) & 0xff);
-			tmp2[4] = (uint8_t)(nwid40 & 0xff);
-			tmp3[0] = 'z';
-			tmp3[1] = 't';
-			_base32_5_to_8(tmp2, tmp3 + 2);
-			tmp3[10] = (char)0;
-			memcpy(ifr.ifr_name, tmp3, 11);
-			OSUtils::ztsnprintf(procpath, sizeof(procpath), "/proc/sys/net/ipv4/conf/%s", ifr.ifr_name);
-		} while (stat(procpath, &sbuf) == 0);
-#endif
+			Utils::snprintf(ifr.ifr_name,sizeof(ifr.ifr_name),"zt%d",devno++);
+			Utils::snprintf(procpath,sizeof(procpath),"/proc/sys/net/ipv4/conf/%s",ifr.ifr_name);
+		} while (stat(procpath,&sbuf) == 0); // try zt#++ until we find one that does not exist
 	}
 
 	ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
-	if (ioctl(_fd, TUNSETIFF, (void*)&ifr) < 0) {
+	if (ioctl(_fd,TUNSETIFF,(void *)&ifr) < 0) {
 		::close(_fd);
 		throw std::runtime_error("unable to configure TUN/TAP device for TAP operation");
 	}
 
-	::ioctl(_fd, TUNSETPERSIST, 0);	  // valgrind may generate a false alarm here
 	_dev = ifr.ifr_name;
-	::fcntl(_fd, F_SETFD, fcntl(_fd, F_GETFD) | FD_CLOEXEC);
 
-	(void)::pipe(_shutdownSignalPipe);
+	::ioctl(_fd,TUNSETPERSIST,0); // valgrind may generate a false alarm here
 
-	for (unsigned int i = 0; i < concurrency; ++i) {
-		_rxThreads.push_back(std::thread([this, i, concurrency, pinning] {
-			if (pinning) {
-				int pinCore = i % concurrency;
-				fprintf(stderr, "Pinning tap thread %d to core %d\n", i, pinCore);
-				pthread_t self = pthread_self();
-				cpu_set_t cpuset;
-				CPU_ZERO(&cpuset);
-				CPU_SET(pinCore, &cpuset);
-				int rc = pthread_setaffinity_np(self, sizeof(cpu_set_t), &cpuset);
-				if (rc != 0) {
-					fprintf(stderr, "Failed to pin tap thread %d to core %d: %s\n", i, pinCore, strerror(errno));
-					exit(1);
-				}
-			}
-
-			uint8_t b[ZT_TAP_BUF_SIZE];
-			fd_set readfds, nullfds;
-			int n, nfds, r;
-			if (i == 0) {
-				struct ifreq ifr;
-				memset(&ifr, 0, sizeof(ifr));
-				strcpy(ifr.ifr_name, _dev.c_str());
-
-				const int sock = socket(AF_INET, SOCK_DGRAM, 0);
-				if (sock <= 0)
-					return;
-
-				if (ioctl(sock, SIOCGIFFLAGS, (void*)&ifr) < 0) {
-					::close(sock);
-					printf("WARNING: ioctl() failed setting up Linux tap device (bring interface up)\n");
-					return;
-				}
-
-				ifr.ifr_ifru.ifru_hwaddr.sa_family = ARPHRD_ETHER;
-				_mac.copyTo(ifr.ifr_ifru.ifru_hwaddr.sa_data, 6);
-				if (ioctl(sock, SIOCSIFHWADDR, (void*)&ifr) < 0) {
-					::close(sock);
-					printf("WARNING: ioctl() failed setting up Linux tap device (set MAC)\n");
-					return;
-				}
-
-				usleep(100000);
-
-				if (isOldLinuxKernel()) {
-					ifr.ifr_ifru.ifru_mtu = (int)_mtu;
-					if (ioctl(sock, SIOCSIFMTU, (void*)&ifr) < 0) {
-						::close(sock);
-						printf("WARNING: ioctl() failed setting up Linux tap device (set MTU)\n");
-						return;
-					}
-
-					usleep(100000);
-				}
-
-				ifr.ifr_flags |= IFF_MULTICAST;
-				ifr.ifr_flags |= IFF_UP;
-				if (ioctl(sock, SIOCSIFFLAGS, (void*)&ifr) < 0) {
-					::close(sock);
-					printf("WARNING: ioctl() failed setting up Linux tap device (bring interface up)\n");
-					return;
-				}
-
-				usleep(100000);
-
-				if (! isOldLinuxKernel()) {
-					ifr.ifr_ifru.ifru_hwaddr.sa_family = ARPHRD_ETHER;
-					_mac.copyTo(ifr.ifr_ifru.ifru_hwaddr.sa_data, 6);
-					if (ioctl(sock, SIOCSIFHWADDR, (void*)&ifr) < 0) {
-						::close(sock);
-						printf("WARNING: ioctl() failed setting up Linux tap device (set MAC)\n");
-						return;
-					}
-
-					ifr.ifr_ifru.ifru_mtu = (int)_mtu;
-					if (ioctl(sock, SIOCSIFMTU, (void*)&ifr) < 0) {
-						::close(sock);
-						printf("WARNING: ioctl() failed setting up Linux tap device (set MTU)\n");
-						return;
-					}
-				}
-
-				fcntl(_fd, F_SETFL, O_NONBLOCK);
-
-				::close(sock);
-			}
-
-			if (! _run) {
-				return;
-			}
-
-			FD_ZERO(&readfds);
-			FD_ZERO(&nullfds);
-			nfds = (int)std::max(_shutdownSignalPipe[0], _fd) + 1;
-
-			r = 0;
-			for (;;) {
-				FD_SET(_shutdownSignalPipe[0], &readfds);
-				FD_SET(_fd, &readfds);
-				select(nfds, &readfds, &nullfds, &nullfds, (struct timeval*)0);
-
-				if (FD_ISSET(_shutdownSignalPipe[0], &readfds)) {
-					break;
-				}
-				if (FD_ISSET(_fd, &readfds)) {
-					for (;;) {
-						// read until there are no more packets, then return to outer select() loop
-						n = (int)::read(_fd, b + r, ZT_TAP_BUF_SIZE - r);
-						if (n > 0) {
-							// Some tap drivers like to send the ethernet frame and the
-							// payload in two chunks, so handle that by accumulating
-							// data until we have at least a frame.
-							r += n;
-							if (r > 14) {
-								if (r > ((int)_mtu + 14))	// sanity check for weird TAP behavior on some platforms
-									r = _mtu + 14;
-
-								if (_enabled) {
-									MAC to(b, 6), from(b + 6, 6);
-									unsigned int etherType = Utils::ntoh(((const uint16_t*)b)[6]);
-									_handler(_arg, nullptr, _nwid, from, to, etherType, 0, (const void*)(b + 14), (unsigned int)(r - 14));
-								}
-
-								r = 0;
-							}
-						}
-						else {
-							r = 0;
-							break;
-						}
-					}
-				}
-			}
-		}));
+	// Open an arbitrary socket to talk to netlink
+	int sock = socket(AF_INET,SOCK_DGRAM,0);
+	if (sock <= 0) {
+		::close(_fd);
+		throw std::runtime_error("unable to open netlink socket");
 	}
+
+	// Set MAC address
+	ifr.ifr_ifru.ifru_hwaddr.sa_family = ARPHRD_ETHER;
+	mac.copyTo(ifr.ifr_ifru.ifru_hwaddr.sa_data,6);
+	if (ioctl(sock,SIOCSIFHWADDR,(void *)&ifr) < 0) {
+		::close(_fd);
+		::close(sock);
+		throw std::runtime_error("unable to configure TAP hardware (MAC) address");
+		return;
+	}
+
+	// Set MTU
+	ifr.ifr_ifru.ifru_mtu = (int)mtu;
+	if (ioctl(sock,SIOCSIFMTU,(void *)&ifr) < 0) {
+		::close(_fd);
+		::close(sock);
+		throw std::runtime_error("unable to configure TAP MTU");
+	}
+
+	if (fcntl(_fd,F_SETFL,fcntl(_fd,F_GETFL) & ~O_NONBLOCK) == -1) {
+		::close(_fd);
+		throw std::runtime_error("unable to set flags on file descriptor for TAP device");
+	}
+
+	/* Bring interface up */
+	if (ioctl(sock,SIOCGIFFLAGS,(void *)&ifr) < 0) {
+		::close(_fd);
+		::close(sock);
+		throw std::runtime_error("unable to get TAP interface flags");
+	}
+	ifr.ifr_flags |= IFF_UP;
+	if (ioctl(sock,SIOCSIFFLAGS,(void *)&ifr) < 0) {
+		::close(_fd);
+		::close(sock);
+		throw std::runtime_error("unable to set TAP interface flags");
+	}
+
+	::close(sock);
+
+	// Set close-on-exec so that devices cannot persist if we fork/exec for update
+	::fcntl(_fd,F_SETFD,fcntl(_fd,F_GETFD) | FD_CLOEXEC);
+
+	::pipe(_shutdownSignalPipe);
+
+	devmap[nwids] = _dev;
+	OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmap.toString());
+
+	_thread = Thread::start(this);
 }
 
 LinuxEthernetTap::~LinuxEthernetTap()
 {
-	_run = false;
-	(void)::write(_shutdownSignalPipe[1], "\0", 1);
+	::write(_shutdownSignalPipe[1],"\0",1); // causes thread to exit
+	Thread::join(_thread);
 	::close(_fd);
 	::close(_shutdownSignalPipe[0]);
 	::close(_shutdownSignalPipe[1]);
-	for (std::thread& t : _rxThreads) {
-		t.join();
-	}
 }
 
 void LinuxEthernetTap::setEnabled(bool en)
@@ -382,77 +199,62 @@ bool LinuxEthernetTap::enabled() const
 	return _enabled;
 }
 
-static bool ___removeIp(const std::string& _dev, const InetAddress& ip)
+static bool ___removeIp(const std::string &_dev,const InetAddress &ip)
 {
-	LinuxNetLink::getInstance().removeAddress(ip, _dev.c_str());
-	return true;
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
+		setenv("PATH", "/sbin:/bin:/usr/sbin:/usr/bin", 1);
+		::execlp("ip","ip","addr","del",ip.toString().c_str(),"dev",_dev.c_str(),(const char *)0);
+		::_exit(-1);
+	} else {
+		int exitcode = -1;
+		::waitpid(cpid,&exitcode,0);
+		return (exitcode == 0);
+	}
 }
 
-bool LinuxEthernetTap::addIps(std::vector<InetAddress> ips)
+bool LinuxEthernetTap::addIp(const InetAddress &ip)
 {
-#ifdef __SYNOLOGY__
-	std::string filepath = "/etc/sysconfig/network-scripts/ifcfg-" + _dev;
-	std::string cfg_contents = "DEVICE=" + _dev + "\nBOOTPROTO=static";
-	int ip4 = 0, ip6 = 0, ip4_tot = 0, ip6_tot = 0;
-
-	for (int i = 0; i < (int)ips.size(); i++) {
-		if (ips[i].isV4())
-			ip4_tot++;
-		else
-			ip6_tot++;
-	}
-	// Assemble and write contents of ifcfg-dev file
-	for (int i = 0; i < (int)ips.size(); i++) {
-		if (ips[i].isV4()) {
-			char iptmp[64], iptmp2[64];
-			std::string numstr4 = ip4_tot > 1 ? std::to_string(ip4) : "";
-			cfg_contents += "\nIPADDR" + numstr4 + "=" + ips[i].toIpString(iptmp) + "\nNETMASK" + numstr4 + "=" + ips[i].netmask().toIpString(iptmp2) + "\n";
-			ip4++;
-		}
-		else {
-			char iptmp[64], iptmp2[64];
-			std::string numstr6 = ip6_tot > 1 ? std::to_string(ip6) : "";
-			cfg_contents += "\nIPV6ADDR" + numstr6 + "=" + ips[i].toIpString(iptmp) + "\nNETMASK" + numstr6 + "=" + ips[i].netmask().toIpString(iptmp2) + "\n";
-			ip6++;
-		}
-	}
-	OSUtils::writeFile(filepath.c_str(), cfg_contents.c_str(), cfg_contents.length());
-	// Finally, add IPs
-	for (int i = 0; i < (int)ips.size(); i++) {
-		LinuxNetLink::getInstance().addAddress(ips[i], _dev.c_str());
-	}
-	return true;
-#endif	 // __SYNOLOGY__
-	return false;
-}
-
-bool LinuxEthernetTap::addIp(const InetAddress& ip)
-{
-	if (! ip)
+	if (!ip)
 		return false;
 
 	std::vector<InetAddress> allIps(ips());
-	if (std::binary_search(allIps.begin(), allIps.end(), ip))
+	if (std::binary_search(allIps.begin(),allIps.end(),ip))
 		return true;
 
 	// Remove and reconfigure if address is the same but netmask is different
-	for (std::vector<InetAddress>::iterator i(allIps.begin()); i != allIps.end(); ++i) {
+	for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
 		if (i->ipsEqual(ip))
-			___removeIp(_dev, *i);
+			___removeIp(_dev,*i);
 	}
 
-	LinuxNetLink::getInstance().addAddress(ip, _dev.c_str());
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
+		setenv("PATH", "/sbin:/bin:/usr/sbin:/usr/bin", 1);
+		if (ip.isV4()) {
+			::execlp("ip","ip","addr","add",ip.toString().c_str(),"broadcast",ip.broadcast().toIpString().c_str(),"dev",_dev.c_str(),(const char *)0);
+		} else {
+			::execlp("ip","ip","addr","add",ip.toString().c_str(),"dev",_dev.c_str(),(const char *)0);
+		}
+		::_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		::waitpid(cpid,&exitcode,0);
+		return (exitcode == 0);
+	}
 
-	return true;
+	return false;
 }
 
-bool LinuxEthernetTap::removeIp(const InetAddress& ip)
+bool LinuxEthernetTap::removeIp(const InetAddress &ip)
 {
-	if (! ip)
+	if (!ip)
 		return true;
 	std::vector<InetAddress> allIps(ips());
-	if (std::find(allIps.begin(), allIps.end(), ip) != allIps.end()) {
-		if (___removeIp(_dev, ip))
+	if (!std::binary_search(allIps.begin(),allIps.end(),ip)) {
+		if (___removeIp(_dev,ip))
 			return true;
 	}
 	return false;
@@ -460,35 +262,28 @@ bool LinuxEthernetTap::removeIp(const InetAddress& ip)
 
 std::vector<InetAddress> LinuxEthernetTap::ips() const
 {
-	uint64_t now = OSUtils::now();
-
-	if ((now - _lastIfAddrsUpdate) <= GETIFADDRS_CACHE_TIME) {
-		return _ifaddrs;
-	}
-	_lastIfAddrsUpdate = now;
-
-	struct ifaddrs* ifa = (struct ifaddrs*)0;
+	struct ifaddrs *ifa = (struct ifaddrs *)0;
 	if (getifaddrs(&ifa))
 		return std::vector<InetAddress>();
 
 	std::vector<InetAddress> r;
 
-	struct ifaddrs* p = ifa;
+	struct ifaddrs *p = ifa;
 	while (p) {
-		if ((! strcmp(p->ifa_name, _dev.c_str())) && (p->ifa_addr) && (p->ifa_netmask) && (p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
-			switch (p->ifa_addr->sa_family) {
+		if ((!strcmp(p->ifa_name,_dev.c_str()))&&(p->ifa_addr)&&(p->ifa_netmask)&&(p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
+			switch(p->ifa_addr->sa_family) {
 				case AF_INET: {
-					struct sockaddr_in* sin = (struct sockaddr_in*)p->ifa_addr;
-					struct sockaddr_in* nm = (struct sockaddr_in*)p->ifa_netmask;
-					r.push_back(InetAddress(&(sin->sin_addr.s_addr), 4, Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
-				} break;
+					struct sockaddr_in *sin = (struct sockaddr_in *)p->ifa_addr;
+					struct sockaddr_in *nm = (struct sockaddr_in *)p->ifa_netmask;
+					r.push_back(InetAddress(&(sin->sin_addr.s_addr),4,Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
+				}	break;
 				case AF_INET6: {
-					struct sockaddr_in6* sin = (struct sockaddr_in6*)p->ifa_addr;
-					struct sockaddr_in6* nm = (struct sockaddr_in6*)p->ifa_netmask;
+					struct sockaddr_in6 *sin = (struct sockaddr_in6 *)p->ifa_addr;
+					struct sockaddr_in6 *nm = (struct sockaddr_in6 *)p->ifa_netmask;
 					uint32_t b[4];
-					memcpy(b, nm->sin6_addr.s6_addr, sizeof(b));
-					r.push_back(InetAddress(sin->sin6_addr.s6_addr, 16, Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
-				} break;
+					memcpy(b,nm->sin6_addr.s6_addr,sizeof(b));
+					r.push_back(InetAddress(sin->sin6_addr.s6_addr,16,Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
+				}	break;
 			}
 		}
 		p = p->ifa_next;
@@ -497,24 +292,22 @@ std::vector<InetAddress> LinuxEthernetTap::ips() const
 	if (ifa)
 		freeifaddrs(ifa);
 
-	std::sort(r.begin(), r.end());
-	r.erase(std::unique(r.begin(), r.end()), r.end());
-
-	_ifaddrs = r;
+	std::sort(r.begin(),r.end());
+	std::unique(r.begin(),r.end());
 
 	return r;
 }
 
-void LinuxEthernetTap::put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len)
+void LinuxEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
 {
-	char putBuf[ZT_MAX_MTU + 64];
-	if ((_fd > 0) && (len <= _mtu) && (_enabled)) {
-		to.copyTo(putBuf, 6);
-		from.copyTo(putBuf + 6, 6);
-		*((uint16_t*)(putBuf + 12)) = htons((uint16_t)etherType);
-		memcpy(putBuf + 14, data, len);
+	char putBuf[8194];
+	if ((_fd > 0)&&(len <= _mtu)&&(_enabled)) {
+		to.copyTo(putBuf,6);
+		from.copyTo(putBuf + 6,6);
+		*((uint16_t *)(putBuf + 12)) = htons((uint16_t)etherType);
+		memcpy(putBuf + 14,data,len);
 		len += 14;
-		(void)::write(_fd, putBuf, len);
+		::write(_fd,putBuf,len);
 	}
 }
 
@@ -523,77 +316,109 @@ std::string LinuxEthernetTap::deviceName() const
 	return _dev;
 }
 
-void LinuxEthernetTap::setFriendlyName(const char* friendlyName)
+void LinuxEthernetTap::setFriendlyName(const char *friendlyName)
 {
 }
 
-void LinuxEthernetTap::scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed)
+void LinuxEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
 {
-	char *ptr, *ptr2;
+	char *ptr,*ptr2;
 	unsigned char mac[6];
 	std::vector<MulticastGroup> newGroups;
 
-	int fd = ::open("/proc/net/dev_mcast", O_RDONLY);
+	int fd = ::open("/proc/net/dev_mcast",O_RDONLY);
 	if (fd > 0) {
 		char buf[131072];
-		int n = (int)::read(fd, buf, sizeof(buf));
-		if ((n > 0) && (n < (int)sizeof(buf))) {
+		int n = (int)::read(fd,buf,sizeof(buf));
+		if ((n > 0)&&(n < (int)sizeof(buf))) {
 			buf[n] = (char)0;
-			for (char* l = strtok_r(buf, "\r\n", &ptr); (l); l = strtok_r((char*)0, "\r\n", &ptr)) {
+			for(char *l=strtok_r(buf,"\r\n",&ptr);(l);l=strtok_r((char *)0,"\r\n",&ptr)) {
 				int fno = 0;
-				char* devname = (char*)0;
-				char* mcastmac = (char*)0;
-				for (char* f = strtok_r(l, " \t", &ptr2); (f); f = strtok_r((char*)0, " \t", &ptr2)) {
+				char *devname = (char *)0;
+				char *mcastmac = (char *)0;
+				for(char *f=strtok_r(l," \t",&ptr2);(f);f=strtok_r((char *)0," \t",&ptr2)) {
 					if (fno == 1)
 						devname = f;
 					else if (fno == 4)
 						mcastmac = f;
 					++fno;
 				}
-				if ((devname) && (! strcmp(devname, _dev.c_str())) && (mcastmac) && (Utils::unhex(mcastmac, mac, 6) == 6))
-					newGroups.push_back(MulticastGroup(MAC(mac, 6), 0));
+				if ((devname)&&(!strcmp(devname,_dev.c_str()))&&(mcastmac)&&(Utils::unhex(mcastmac,mac,6) == 6))
+					newGroups.push_back(MulticastGroup(MAC(mac,6),0));
 			}
 		}
 		::close(fd);
 	}
 
 	std::vector<InetAddress> allIps(ips());
-	for (std::vector<InetAddress>::iterator ip(allIps.begin()); ip != allIps.end(); ++ip)
+	for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
 		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
 
-	std::sort(newGroups.begin(), newGroups.end());
-	newGroups.erase(std::unique(newGroups.begin(), newGroups.end()), newGroups.end());
+	std::sort(newGroups.begin(),newGroups.end());
+	std::unique(newGroups.begin(),newGroups.end());
 
-	for (std::vector<MulticastGroup>::iterator m(newGroups.begin()); m != newGroups.end(); ++m) {
-		if (! std::binary_search(_multicastGroups.begin(), _multicastGroups.end(), *m))
+	for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
+		if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
 			added.push_back(*m);
 	}
-	for (std::vector<MulticastGroup>::iterator m(_multicastGroups.begin()); m != _multicastGroups.end(); ++m) {
-		if (! std::binary_search(newGroups.begin(), newGroups.end(), *m))
+	for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
+		if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
 			removed.push_back(*m);
 	}
 
 	_multicastGroups.swap(newGroups);
 }
 
-void LinuxEthernetTap::setMtu(unsigned int mtu)
+void LinuxEthernetTap::threadMain()
+	throw()
 {
-	if (_mtu != mtu) {
-		_mtu = mtu;
-		int sock = socket(AF_INET, SOCK_DGRAM, 0);
-		if (sock > 0) {
-			struct ifreq ifr;
-			memset(&ifr, 0, sizeof(ifr));
-			strcpy(ifr.ifr_name, _dev.c_str());
-			ifr.ifr_ifru.ifru_mtu = (int)mtu;
-			if (ioctl(sock, SIOCSIFMTU, (void*)&ifr) < 0) {
-				printf("WARNING: ioctl() failed updating existing Linux tap device (set MTU)\n");
+	fd_set readfds,nullfds;
+	MAC to,from;
+	int n,nfds,r;
+	char getBuf[8194];
+
+	Thread::sleep(500);
+
+	FD_ZERO(&readfds);
+	FD_ZERO(&nullfds);
+	nfds = (int)std::max(_shutdownSignalPipe[0],_fd) + 1;
+
+	r = 0;
+	for(;;) {
+		FD_SET(_shutdownSignalPipe[0],&readfds);
+		FD_SET(_fd,&readfds);
+		select(nfds,&readfds,&nullfds,&nullfds,(struct timeval *)0);
+
+		if (FD_ISSET(_shutdownSignalPipe[0],&readfds)) // writes to shutdown pipe terminate thread
+			break;
+
+		if (FD_ISSET(_fd,&readfds)) {
+			n = (int)::read(_fd,getBuf + r,sizeof(getBuf) - r);
+			if (n < 0) {
+				if ((errno != EINTR)&&(errno != ETIMEDOUT))
+					break;
+			} else {
+				// Some tap drivers like to send the ethernet frame and the
+				// payload in two chunks, so handle that by accumulating
+				// data until we have at least a frame.
+				r += n;
+				if (r > 14) {
+					if (r > ((int)_mtu + 14)) // sanity check for weird TAP behavior on some platforms
+						r = _mtu + 14;
+
+					if (_enabled) {
+						to.setTo(getBuf,6);
+						from.setTo(getBuf + 6,6);
+						unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]);
+						// TODO: VLAN support
+						_handler(_arg,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14);
+					}
+
+					r = 0;
+				}
 			}
-			close(sock);
 		}
 	}
 }
 
-}	// namespace ZeroTier
-
-#endif	 // __LINUX__
+} // namespace ZeroTier
diff --git a/osdep/LinuxEthernetTap.hpp b/osdep/LinuxEthernetTap.hpp
index fe8079360..cbb58efb0 100644
--- a/osdep/LinuxEthernetTap.hpp
+++ b/osdep/LinuxEthernetTap.hpp
@@ -1,84 +1,81 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_LINUXETHERNETTAP_HPP
 #define ZT_LINUXETHERNETTAP_HPP
 
-#include "../node/MulticastGroup.hpp"
-#include "BlockingQueue.hpp"
-#include "EthernetTap.hpp"
-
-#include <array>
-#include <atomic>
-#include <mutex>
-#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <string>
-#include <thread>
 #include <vector>
+#include <stdexcept>
+
+#include "../node/MulticastGroup.hpp"
+#include "Thread.hpp"
 
 namespace ZeroTier {
 
-class LinuxEthernetTap : public EthernetTap {
-  public:
+/**
+ * Linux Ethernet tap using kernel tun/tap driver
+ */
+class LinuxEthernetTap
+{
+public:
 	LinuxEthernetTap(
-		const char* homePath,
-		unsigned int concurrency,
-		bool pinning,
-		const MAC& mac,
+		const char *homePath,
+		const MAC &mac,
 		unsigned int mtu,
 		unsigned int metric,
 		uint64_t nwid,
-		const char* friendlyName,
-		void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-		void* arg);
+		const char *friendlyName,
+		void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+		void *arg);
 
-	virtual ~LinuxEthernetTap();
+	~LinuxEthernetTap();
 
-	virtual void setEnabled(bool en);
-	virtual bool enabled() const;
-	virtual bool addIp(const InetAddress& ip);
-	virtual bool addIps(std::vector<InetAddress> ips);
-	virtual bool removeIp(const InetAddress& ip);
-	virtual std::vector<InetAddress> ips() const;
-	virtual void put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len);
-	virtual std::string deviceName() const;
-	virtual void setFriendlyName(const char* friendlyName);
-	virtual void scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed);
-	virtual void setMtu(unsigned int mtu);
-	virtual void setDns(const char* domain, const std::vector<InetAddress>& servers)
-	{
-	}
+	void setEnabled(bool en);
+	bool enabled() const;
+	bool addIp(const InetAddress &ip);
+	bool removeIp(const InetAddress &ip);
+	std::vector<InetAddress> ips() const;
+	void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
+	std::string deviceName() const;
+	void setFriendlyName(const char *friendlyName);
+	void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
 
-  private:
-	void (*_handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int);
-	void* _arg;
+	void threadMain()
+		throw();
+
+private:
+	void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
+	void *_arg;
 	uint64_t _nwid;
-	MAC _mac;
+	Thread _thread;
 	std::string _homePath;
 	std::string _dev;
 	std::vector<MulticastGroup> _multicastGroups;
 	unsigned int _mtu;
 	int _fd;
 	int _shutdownSignalPipe[2];
-	std::atomic_bool _enabled;
-	std::atomic_bool _run;
-	mutable std::vector<InetAddress> _ifaddrs;
-	mutable uint64_t _lastIfAddrsUpdate;
-	std::vector<std::thread> _rxThreads;
+	volatile bool _enabled;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/osdep/LinuxNetLink.cpp b/osdep/LinuxNetLink.cpp
deleted file mode 100644
index 5e7ee5a1d..000000000
--- a/osdep/LinuxNetLink.cpp
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "../node/Constants.hpp"
-
-#include <cerrno>
-
-// #define ZT_NETLINK_TRACE
-
-#ifdef __LINUX__
-
-#include "LinuxNetLink.hpp"
-
-#include <linux/if_tun.h>
-#include <unistd.h>
-
-#ifndef IFNAMSIZ
-#define IFNAMSIZ 16
-#endif
-const int ZT_RTE_METRIC = 5000;
-
-namespace ZeroTier {
-
-struct nl_route_req {
-	struct nlmsghdr nl;
-	struct rtmsg rt;
-	char buf[8192];
-};
-
-struct nl_if_req {
-	struct nlmsghdr nl;
-	struct ifinfomsg ifa;
-	char buf[8192];
-};
-
-struct nl_adr_req {
-	struct nlmsghdr nl;
-	struct ifaddrmsg ifa;
-	char buf[8192];
-};
-
-LinuxNetLink::LinuxNetLink() : _t(), _running(false), _seq(0), _interfaces(), _if_m(), _fd(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)), _la({ 0 })
-{
-	// set socket timeout to 1 sec so we're not permablocking recv() calls
-	_setSocketTimeout(_fd, 1);
-
-	_la.nl_family = AF_NETLINK;
-	_la.nl_pid = 0;	  // getpid()+1;
-	_la.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_ROUTE | RTMGRP_IPV6_ROUTE | RTMGRP_NOTIFY;
-	if (bind(_fd, (struct sockaddr*)&_la, sizeof(_la))) {
-		fprintf(stderr, "Error connecting to RTNETLINK: %s\n", strerror(errno));
-		::exit(1);
-	}
-
-	_requestIPv4Routes();
-	_requestIPv6Routes();
-	_requestInterfaceList();
-
-	_running = true;
-	_t = Thread::start(this);
-}
-
-LinuxNetLink::~LinuxNetLink()
-{
-	_running = false;
-	Thread::join(_t);
-	::close(_fd);
-}
-
-void LinuxNetLink::_setSocketTimeout(int fd, int seconds)
-{
-	struct timeval tv;
-	tv.tv_sec = seconds;
-	tv.tv_usec = 0;
-	if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) != 0) {
-#ifdef ZT_NETLINK_TRACE
-		fprintf(stderr, "setsockopt failed: %s\n", strerror(errno));
-#endif
-	}
-}
-
-#define ZT_NL_BUF_SIZE 16384
-int LinuxNetLink::_doRecv(int fd)
-{
-	char* buf = nullptr;
-	if (posix_memalign((void**)&buf, 16, ZT_NL_BUF_SIZE) != 0) {
-		fprintf(stderr, "malloc failed!\n");
-		::exit(1);
-	}
-	if (! buf) {
-		fprintf(stderr, "malloc failed!\n");
-		::exit(1);
-	}
-
-	char* p = NULL;
-	struct nlmsghdr* nlp;
-	int nll = 0;
-	int rtn = 0;
-	p = buf;
-
-	for (;;) {
-		rtn = recv(fd, p, ZT_NL_BUF_SIZE - nll, 0);
-
-		if (rtn > 0) {
-			nlp = (struct nlmsghdr*)p;
-
-			if (nlp->nlmsg_type == NLMSG_ERROR && (nlp->nlmsg_flags & NLM_F_ACK) != NLM_F_ACK) {
-				struct nlmsgerr* err = (struct nlmsgerr*)NLMSG_DATA(nlp);
-				if (err->error != 0) {
-#ifdef ZT_NETLINK_TRACE
-					fprintf(stderr, "rtnetlink error: %s\n", strerror(-(err->error)));
-#endif
-				}
-				p = buf;
-				nll = 0;
-				break;
-			}
-
-			if (nlp->nlmsg_type == NLMSG_NOOP) {
-				break;
-			}
-
-			if ((nlp->nlmsg_flags & NLM_F_MULTI) == NLM_F_MULTI || (nlp->nlmsg_type == NLMSG_DONE)) {
-				if (nlp->nlmsg_type == NLMSG_DONE) {
-					_processMessage(nlp, nll);
-					p = buf;
-					nll = 0;
-					break;
-				}
-				p += rtn;
-				nll += rtn;
-			}
-
-			if (nlp->nlmsg_type == NLMSG_OVERRUN) {
-#ifdef ZT_NETLINK_TRACE
-				fprintf(stderr, "NLMSG_OVERRUN: Data lost\n");
-#endif
-				p = buf;
-				nll = 0;
-				break;
-			}
-
-			nll += rtn;
-
-			_processMessage(nlp, nll);
-
-			p = buf;
-			nll = 0;
-			break;
-		}
-		else {
-			break;
-		}
-	}
-
-	free(buf);
-
-	return rtn;
-}
-
-void LinuxNetLink::threadMain() throw()
-{
-	int rtn = 0;
-	while (_running) {
-		rtn = _doRecv(_fd);
-		if (rtn <= 0) {
-			Thread::sleep(250);
-			continue;
-		}
-	}
-}
-
-void LinuxNetLink::_processMessage(struct nlmsghdr* nlp, int nll)
-{
-	for (; NLMSG_OK(nlp, nll); nlp = NLMSG_NEXT(nlp, nll)) {
-		switch (nlp->nlmsg_type) {
-			case RTM_NEWLINK:
-				_linkAdded(nlp);
-				break;
-			case RTM_DELLINK:
-				_linkDeleted(nlp);
-				break;
-			case RTM_NEWADDR:
-				_ipAddressAdded(nlp);
-				break;
-			case RTM_DELADDR:
-				_ipAddressDeleted(nlp);
-				break;
-			case RTM_NEWROUTE:
-				_routeAdded(nlp);
-				break;
-			case RTM_DELROUTE:
-				_routeDeleted(nlp);
-				break;
-			default:
-				break;
-		}
-	}
-}
-
-void LinuxNetLink::_ipAddressAdded(struct nlmsghdr* nlp)
-{
-#ifdef ZT_NETLINK_TRACE
-	struct ifaddrmsg* ifap = (struct ifaddrmsg*)NLMSG_DATA(nlp);
-	struct rtattr* rtap = (struct rtattr*)IFA_RTA(ifap);
-	int ifal = IFA_PAYLOAD(nlp);
-
-	char addr[40] = { 0 };
-	char local[40] = { 0 };
-	char label[40] = { 0 };
-	char bcast[40] = { 0 };
-
-	for (; RTA_OK(rtap, ifal); rtap = RTA_NEXT(rtap, ifal)) {
-		switch (rtap->rta_type) {
-			case IFA_ADDRESS:
-				inet_ntop(ifap->ifa_family, RTA_DATA(rtap), addr, 40);
-				break;
-			case IFA_LOCAL:
-				inet_ntop(ifap->ifa_family, RTA_DATA(rtap), local, 40);
-				break;
-			case IFA_LABEL:
-				memcpy(label, RTA_DATA(rtap), 40);
-				break;
-			case IFA_BROADCAST:
-				inet_ntop(ifap->ifa_family, RTA_DATA(rtap), bcast, 40);
-				break;
-		}
-	}
-
-	fprintf(stderr, "Added IP Address %s local: %s label: %s broadcast: %s\n", addr, local, label, bcast);
-#endif
-}
-
-void LinuxNetLink::_ipAddressDeleted(struct nlmsghdr* nlp)
-{
-#ifdef ZT_NETLINK_TRACE
-	struct ifaddrmsg* ifap = (struct ifaddrmsg*)NLMSG_DATA(nlp);
-	struct rtattr* rtap = (struct rtattr*)IFA_RTA(ifap);
-	int ifal = IFA_PAYLOAD(nlp);
-
-	char addr[40] = { 0 };
-	char local[40] = { 0 };
-	char label[40] = { 0 };
-	char bcast[40] = { 0 };
-
-	for (; RTA_OK(rtap, ifal); rtap = RTA_NEXT(rtap, ifal)) {
-		switch (rtap->rta_type) {
-			case IFA_ADDRESS:
-				inet_ntop(ifap->ifa_family, RTA_DATA(rtap), addr, 40);
-				break;
-			case IFA_LOCAL:
-				inet_ntop(ifap->ifa_family, RTA_DATA(rtap), local, 40);
-				break;
-			case IFA_LABEL:
-				memcpy(label, RTA_DATA(rtap), 40);
-				break;
-			case IFA_BROADCAST:
-				inet_ntop(ifap->ifa_family, RTA_DATA(rtap), bcast, 40);
-				break;
-		}
-	}
-
-	fprintf(stderr, "Removed IP Address %s local: %s label: %s broadcast: %s\n", addr, local, label, bcast);
-#endif
-}
-
-void LinuxNetLink::_routeAdded(struct nlmsghdr* nlp)
-{
-	char dsts[40] = { 0 };
-	char gws[40] = { 0 };
-	char srcs[40] = { 0 };
-	char ifs[16] = { 0 };
-	char ms[24] = { 0 };
-
-	struct rtmsg* rtp = (struct rtmsg*)NLMSG_DATA(nlp);
-	struct rtattr* rtap = (struct rtattr*)RTM_RTA(rtp);
-	int rtl = RTM_PAYLOAD(nlp);
-
-	Route r;
-	bool wecare = false;
-
-	for (; RTA_OK(rtap, rtl); rtap = RTA_NEXT(rtap, rtl)) {
-		switch (rtap->rta_type) {
-			case RTA_DST:
-				switch (rtp->rtm_family) {
-					case AF_INET:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), dsts, 24);
-						r.target.set(RTA_DATA(rtap), 4, 0);
-						wecare = true;
-						break;
-					case AF_INET6:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), dsts, 24);
-						r.target.set(RTA_DATA(rtap), 16, 0);
-						wecare = true;
-						break;
-				}
-				break;
-			case RTA_SRC:
-				switch (rtp->rtm_family) {
-					case AF_INET:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), srcs, 24);
-						r.src.set(RTA_DATA(rtap), 4, 0);
-						wecare = true;
-						break;
-					case AF_INET6:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), srcs, 24);
-						r.src.set(RTA_DATA(rtap), 16, 0);
-						wecare = true;
-						break;
-				}
-				break;
-			case RTA_GATEWAY:
-				switch (rtp->rtm_family) {
-					case AF_INET:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), gws, 24);
-						r.via.set(RTA_DATA(rtap), 4, 0);
-						wecare = true;
-						break;
-					case AF_INET6:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), gws, 24);
-						r.via.set(RTA_DATA(rtap), 16, 0);
-						wecare = true;
-						break;
-				}
-				break;
-			case RTA_OIF:
-				switch (rtp->rtm_family) {
-					case AF_INET:
-						r.ifidx = *((int*)RTA_DATA(rtap));
-						wecare = true;
-						break;
-					case AF_INET6:
-						r.ifidx = *((int*)RTA_DATA(rtap));
-						wecare = true;
-						break;
-				}
-				sprintf(ifs, "%d", *((int*)RTA_DATA(rtap)));
-				break;
-		}
-	}
-
-	if (wecare) {
-		Mutex::Lock rl(_routes_m);
-		_routes[r.target].insert(r);
-	}
-
-#ifdef ZT_NETLINK_TRACE
-	sprintf(ms, "%d", rtp->rtm_dst_len);
-	fprintf(stderr, "Route Added: dst %s/%s gw %s src %s if %s\n", dsts, ms, gws, srcs, ifs);
-#endif
-}
-
-void LinuxNetLink::_routeDeleted(struct nlmsghdr* nlp)
-{
-	char dsts[40] = { 0 };
-	char gws[40] = { 0 };
-	char srcs[40] = { 0 };
-	char ifs[16] = { 0 };
-	char ms[24] = { 0 };
-
-	struct rtmsg* rtp = (struct rtmsg*)NLMSG_DATA(nlp);
-	struct rtattr* rtap = (struct rtattr*)RTM_RTA(rtp);
-	int rtl = RTM_PAYLOAD(nlp);
-
-	Route r;
-	bool wecare = false;
-
-	for (; RTA_OK(rtap, rtl); rtap = RTA_NEXT(rtap, rtl)) {
-		switch (rtap->rta_type) {
-			case RTA_DST:
-				switch (rtp->rtm_family) {
-					case AF_INET:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), dsts, 24);
-						r.target.set(RTA_DATA(rtap), 4, 0);
-						wecare = true;
-						break;
-					case AF_INET6:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), dsts, 24);
-						r.target.set(RTA_DATA(rtap), 16, 0);
-						wecare = true;
-						break;
-				}
-				break;
-			case RTA_SRC:
-				switch (rtp->rtm_family) {
-					case AF_INET:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), srcs, 24);
-						r.src.set(RTA_DATA(rtap), 4, 0);
-						wecare = true;
-						break;
-					case AF_INET6:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), srcs, 24);
-						r.src.set(RTA_DATA(rtap), 16, 0);
-						wecare = true;
-						break;
-				}
-				break;
-			case RTA_GATEWAY:
-				switch (rtp->rtm_family) {
-					case AF_INET:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), gws, 24);
-						r.via.set(RTA_DATA(rtap), 4, 0);
-						wecare = true;
-						break;
-					case AF_INET6:
-						inet_ntop(rtp->rtm_family, RTA_DATA(rtap), gws, 24);
-						r.via.set(RTA_DATA(rtap), 16, 0);
-						wecare = true;
-						break;
-				}
-				break;
-			case RTA_OIF:
-				switch (rtp->rtm_family) {
-					case AF_INET:
-						r.ifidx = *((int*)RTA_DATA(rtap));
-						wecare = true;
-						break;
-					case AF_INET6:
-						r.ifidx = *((int*)RTA_DATA(rtap));
-						wecare = true;
-						break;
-				}
-				sprintf(ifs, "%d", *((int*)RTA_DATA(rtap)));
-				break;
-		}
-	}
-
-	if (wecare) {
-		Mutex::Lock rl(_routes_m);
-		_routes[r.target].erase(r);
-	}
-
-#ifdef ZT_NETLINK_TRACE
-	sprintf(ms, "%d", rtp->rtm_dst_len);
-	fprintf(stderr, "Route Deleted: dst %s/%s gw %s src %s if %s\n", dsts, ms, gws, srcs, ifs);
-#endif
-}
-
-void LinuxNetLink::_linkAdded(struct nlmsghdr* nlp)
-{
-	unsigned char mac_bin[6] = { 0 };
-	unsigned int mtu = 0;
-	char ifname[IFNAMSIZ] = { 0 };
-
-	struct ifinfomsg* ifip = (struct ifinfomsg*)NLMSG_DATA(nlp);
-	struct rtattr* rtap = (struct rtattr*)IFLA_RTA(ifip);
-	int ifil = RTM_PAYLOAD(nlp);
-
-	const char* ptr = (const char*)0;
-	for (; RTA_OK(rtap, ifil); rtap = RTA_NEXT(rtap, ifil)) {
-		switch (rtap->rta_type) {
-			case IFLA_ADDRESS:
-				ptr = (const char*)RTA_DATA(rtap);
-				memcpy(mac_bin, ptr, 6);
-				break;
-			case IFLA_IFNAME:
-				ptr = (const char*)RTA_DATA(rtap);
-				memcpy(ifname, ptr, strlen(ptr));
-				break;
-			case IFLA_MTU:
-				memcpy(&mtu, RTA_DATA(rtap), sizeof(unsigned int));
-				break;
-		}
-	}
-
-	{
-		Mutex::Lock l(_if_m);
-		struct iface_entry& entry = _interfaces[ifip->ifi_index];
-		entry.index = ifip->ifi_index;
-		memcpy(entry.ifacename, ifname, sizeof(ifname));
-		snprintf(
-			entry.mac,
-			sizeof(entry.mac),
-			"%.02x:%.02x:%.02x:%.02x:%.02x:%.02x",
-			(unsigned int)mac_bin[0],
-			(unsigned int)mac_bin[1],
-			(unsigned int)mac_bin[2],
-			(unsigned int)mac_bin[3],
-			(unsigned int)mac_bin[4],
-			(unsigned int)mac_bin[5]);
-		memcpy(entry.mac_bin, mac_bin, 6);
-		entry.mtu = mtu;
-	}
-}
-
-void LinuxNetLink::_linkDeleted(struct nlmsghdr* nlp)
-{
-	unsigned int mtu = 0;
-	char ifname[40] = { 0 };
-
-	struct ifinfomsg* ifip = (struct ifinfomsg*)NLMSG_DATA(nlp);
-	struct rtattr* rtap = (struct rtattr*)IFLA_RTA(ifip);
-	int ifil = RTM_PAYLOAD(nlp);
-
-	const char* ptr = (const char*)0;
-	for (; RTA_OK(rtap, ifil); rtap = RTA_NEXT(rtap, ifil)) {
-		switch (rtap->rta_type) {
-			case IFLA_IFNAME:
-				ptr = (const char*)RTA_DATA(rtap);
-				memcpy(ifname, ptr, strlen(ptr));
-				break;
-			case IFLA_MTU:
-				memcpy(&mtu, RTA_DATA(rtap), sizeof(unsigned int));
-				break;
-		}
-	}
-
-	{
-		Mutex::Lock l(_if_m);
-		if (_interfaces.contains(ifip->ifi_index)) {
-			_interfaces.erase(ifip->ifi_index);
-		}
-	}
-}
-
-void LinuxNetLink::_requestIPv4Routes()
-{
-	int fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (fd == -1) {
-		fprintf(stderr, "Error opening RTNETLINK socket: %s\n", strerror(errno));
-		return;
-	}
-
-	_setSocketTimeout(fd);
-
-	struct sockaddr_nl la;
-	la.nl_family = AF_NETLINK;
-	la.nl_pid = 0;	 // getpid();
-	la.nl_groups = RTMGRP_IPV4_ROUTE;
-	if (bind(fd, (struct sockaddr*)&la, sizeof(la))) {
-		fprintf(stderr, "Error binding RTNETLINK (_requestIPv4Routes #1): %s\n", strerror(errno));
-		close(fd);
-		return;
-	}
-
-	struct nl_route_req req;
-	bzero(&req, sizeof(req));
-	req.nl.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-	req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-	req.nl.nlmsg_type = RTM_GETROUTE;
-	req.nl.nlmsg_pid = 0;
-	req.nl.nlmsg_seq = ++_seq;
-	req.rt.rtm_family = AF_INET;
-	req.rt.rtm_table = RT_TABLE_MAIN;
-
-	struct sockaddr_nl pa;
-	bzero(&pa, sizeof(pa));
-	pa.nl_family = AF_NETLINK;
-
-	struct msghdr msg;
-	bzero(&msg, sizeof(msg));
-	msg.msg_name = (void*)&pa;
-	msg.msg_namelen = sizeof(pa);
-
-	struct iovec iov;
-	bzero(&iov, sizeof(iov));
-	iov.iov_base = (void*)&req.nl;
-	iov.iov_len = req.nl.nlmsg_len;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-
-	sendmsg(fd, &msg, 0);
-
-	_doRecv(fd);
-
-	close(fd);
-}
-
-void LinuxNetLink::_requestIPv6Routes()
-{
-	int fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (fd == -1) {
-		fprintf(stderr, "Error opening RTNETLINK socket: %s\n", strerror(errno));
-		return;
-	}
-
-	_setSocketTimeout(fd);
-
-	struct sockaddr_nl la;
-	la.nl_family = AF_NETLINK;
-	la.nl_pid = 0;	 // getpid();
-	la.nl_groups = RTMGRP_IPV6_ROUTE;
-	if (bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
-		fprintf(stderr, "Error binding RTNETLINK (_requestIPv6Routes #1): %s\n", strerror(errno));
-		close(fd);
-		return;
-	}
-
-	struct nl_route_req req;
-	bzero(&req, sizeof(req));
-	req.nl.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-	req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-	req.nl.nlmsg_type = RTM_GETROUTE;
-	req.nl.nlmsg_pid = 0;
-	req.nl.nlmsg_seq = ++_seq;
-	req.rt.rtm_family = AF_INET6;
-	req.rt.rtm_table = RT_TABLE_MAIN;
-
-	struct sockaddr_nl pa;
-	bzero(&pa, sizeof(pa));
-	pa.nl_family = AF_NETLINK;
-
-	struct msghdr msg;
-	bzero(&msg, sizeof(msg));
-	msg.msg_name = (void*)&pa;
-	msg.msg_namelen = sizeof(pa);
-
-	struct iovec iov;
-	bzero(&iov, sizeof(iov));
-	iov.iov_base = (void*)&req.nl;
-	iov.iov_len = req.nl.nlmsg_len;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-
-	sendmsg(fd, &msg, 0);
-
-	_doRecv(fd);
-
-	close(fd);
-}
-
-void LinuxNetLink::_requestInterfaceList()
-{
-	int fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (fd == -1) {
-		fprintf(stderr, "Error opening RTNETLINK socket: %s\n", strerror(errno));
-		return;
-	}
-
-	_setSocketTimeout(fd);
-
-	struct sockaddr_nl la;
-	la.nl_family = AF_NETLINK;
-	la.nl_pid = 0;	 // getpid();
-	la.nl_groups = RTMGRP_LINK;
-	if (bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
-		fprintf(stderr, "Error binding RTNETLINK (_requestInterfaceList #1): %s\n", strerror(errno));
-		close(fd);
-		return;
-	}
-
-	struct nl_if_req req;
-	bzero(&req, sizeof(req));
-	req.nl.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
-	req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-	req.nl.nlmsg_type = RTM_GETLINK;
-	req.nl.nlmsg_pid = 0;
-	req.nl.nlmsg_seq = ++_seq;
-	req.ifa.ifi_family = AF_UNSPEC;
-
-	struct sockaddr_nl pa;
-	bzero(&pa, sizeof(pa));
-	pa.nl_family = AF_NETLINK;
-
-	struct msghdr msg;
-	bzero(&msg, sizeof(msg));
-	msg.msg_name = (void*)&pa;
-	msg.msg_namelen = sizeof(pa);
-
-	struct iovec iov;
-	bzero(&iov, sizeof(iov));
-	iov.iov_base = (void*)&req.nl;
-	iov.iov_len = req.nl.nlmsg_len;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	sendmsg(fd, &msg, 0);
-
-	_doRecv(fd);
-
-	close(fd);
-}
-
-void LinuxNetLink::addRoute(const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifaceName)
-{
-	if (! target)
-		return;
-
-	int fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (fd == -1) {
-		fprintf(stderr, "Error opening RTNETLINK socket: %s\n", strerror(errno));
-		return;
-	}
-
-	_setSocketTimeout(fd);
-
-	struct sockaddr_nl la;
-	bzero(&la, sizeof(la));
-	la.nl_family = AF_NETLINK;
-	la.nl_pid = 0;	 // getpid();
-
-	if (bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
-		fprintf(stderr, "Error binding RTNETLINK (addRoute #1): %s\n", strerror(errno));
-		close(fd);
-		return;
-	}
-
-#ifdef ZT_NETLINK_TRACE
-	char tmp[64];
-	char tmp2[64];
-	char tmp3[64];
-	fprintf(stderr, "Adding Route. target: %s via: %s src: %s iface: %s\n", target.toString(tmp), via.toString(tmp2), src.toString(tmp3), ifaceName);
-#endif
-
-	int rtl = sizeof(struct rtmsg);
-	struct nl_route_req req;
-	bzero(&req, sizeof(req));
-
-	struct rtattr* rtap = (struct rtattr*)req.buf;
-	rtap->rta_type = RTA_DST;
-	if (target.isV4()) {
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-		memcpy(RTA_DATA(rtap), &((struct sockaddr_in*)&target)->sin_addr, sizeof(struct in_addr));
-	}
-	else {
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in6_addr));
-		memcpy(RTA_DATA(rtap), &((struct sockaddr_in6*)&target)->sin6_addr, sizeof(struct in6_addr));
-	}
-	rtl += rtap->rta_len;
-
-	if (via) {
-		/*
-		 *  Setting a metric keeps zerotier routes from taking priority over physical
-		 *  At best the computer would use zerotier through the router instead of the LAN.
-		 *  At worst it stops working at all.
-		 *
-		 *  default via 192.168.82.1 dev eth0 proto dhcp src 192.168.82.169 metric 202
-		 *  10.147.17.0/24 dev zt5u4uptmb proto kernel scope link src 10.147.17.94
-		 *  192.168.82.0/24 dev eth0 proto dhcp scope link src 192.168.82.169 metric 202
-		 *  192.168.82.0/24 via 10.147.17.1 dev zt5u4uptmb proto static metric 5000
-		 *
-		 */
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = RTA_PRIORITY;
-		rtap->rta_len = RTA_LENGTH(sizeof(ZT_RTE_METRIC));
-		memcpy(RTA_DATA(rtap), &ZT_RTE_METRIC, sizeof(ZT_RTE_METRIC));
-		rtl += rtap->rta_len;
-
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = RTA_GATEWAY;
-		if (via.isV4()) {
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-			memcpy(RTA_DATA(rtap), &((struct sockaddr_in*)&via)->sin_addr, sizeof(struct in_addr));
-		}
-		else {
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in6_addr));
-			memcpy(RTA_DATA(rtap), &((struct sockaddr_in6*)&via)->sin6_addr, sizeof(struct in6_addr));
-		}
-		rtl += rtap->rta_len;
-	}
-	else if (src) {
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = RTA_SRC;
-		if (src.isV4()) {
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-			memcpy(RTA_DATA(rtap), &((struct sockaddr_in*)&src)->sin_addr, sizeof(struct in_addr));
-		}
-		else {
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in6_addr));
-			memcpy(RTA_DATA(rtap), &((struct sockaddr_in6*)&src)->sin6_addr, sizeof(struct in6_addr));
-		}
-		req.rt.rtm_src_len = src.netmaskBits();
-	}
-
-	if (ifaceName != NULL) {
-		int interface_index = _indexForInterface(ifaceName);
-		if (interface_index != -1) {
-			rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-			rtap->rta_type = RTA_OIF;
-			rtap->rta_len = RTA_LENGTH(sizeof(int));
-			memcpy(RTA_DATA(rtap), &interface_index, sizeof(int));
-			rtl += rtap->rta_len;
-		}
-	}
-
-	req.nl.nlmsg_len = NLMSG_LENGTH(rtl);
-	req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_EXCL | NLM_F_CREATE | NLM_F_ACK;
-	req.nl.nlmsg_type = RTM_NEWROUTE;
-	req.nl.nlmsg_pid = 0;
-	req.nl.nlmsg_seq = ++_seq;
-	req.rt.rtm_family = target.ss_family;
-	req.rt.rtm_table = RT_TABLE_MAIN;
-	req.rt.rtm_protocol = RTPROT_STATIC;
-	req.rt.rtm_scope = RT_SCOPE_UNIVERSE;
-	req.rt.rtm_type = RTN_UNICAST;
-	req.rt.rtm_dst_len = target.netmaskBits();
-	req.rt.rtm_flags = 0;
-
-	struct sockaddr_nl pa;
-	bzero(&pa, sizeof(pa));
-	pa.nl_family = AF_NETLINK;
-
-	struct msghdr msg;
-	bzero(&msg, sizeof(msg));
-	msg.msg_name = (void*)&pa;
-	msg.msg_namelen = sizeof(pa);
-
-	struct iovec iov;
-	bzero(&iov, sizeof(iov));
-	iov.iov_base = (void*)&req.nl;
-	iov.iov_len = req.nl.nlmsg_len;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	sendmsg(fd, &msg, 0);
-
-	_doRecv(fd);
-
-	close(fd);
-}
-
-void LinuxNetLink::delRoute(const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifaceName)
-{
-	if (! target)
-		return;
-
-	int fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (fd == -1) {
-		fprintf(stderr, "Error opening RTNETLINK socket: %s\n", strerror(errno));
-		return;
-	}
-
-	_setSocketTimeout(fd);
-
-	struct sockaddr_nl la;
-	la.nl_family = AF_NETLINK;
-	la.nl_pid = 0;	 // getpid();
-
-	if (bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
-		fprintf(stderr, "Error binding RTNETLINK (delRoute #1): %s\n", strerror(errno));
-		close(fd);
-		return;
-	}
-
-#ifdef ZT_NETLINK_TRACE
-	char tmp[64];
-	char tmp2[64];
-	char tmp3[64];
-	fprintf(stderr, "Removing Route. target: %s via: %s src: %s iface: %s\n", target.toString(tmp), via.toString(tmp2), src.toString(tmp3), ifaceName);
-#endif
-
-	int rtl = sizeof(struct rtmsg);
-	struct nl_route_req req;
-	bzero(&req, sizeof(req));
-
-	struct rtattr* rtap = (struct rtattr*)req.buf;
-	rtap->rta_type = RTA_DST;
-	if (target.isV4()) {
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-		memcpy(RTA_DATA(rtap), &((struct sockaddr_in*)&target)->sin_addr, sizeof(struct in_addr));
-	}
-	else {
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in6_addr));
-		memcpy(RTA_DATA(rtap), &((struct sockaddr_in6*)&target)->sin6_addr, sizeof(struct in6_addr));
-	}
-	rtl += rtap->rta_len;
-
-	if (via) {
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = RTA_GATEWAY;
-		if (via.isV4()) {
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-			memcpy(RTA_DATA(rtap), &((struct sockaddr_in*)&via)->sin_addr, sizeof(struct in_addr));
-		}
-		else {
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in6_addr));
-			memcpy(RTA_DATA(rtap), &((struct sockaddr_in6*)&via)->sin6_addr, sizeof(struct in6_addr));
-		}
-		rtl += rtap->rta_len;
-	}
-	else if (src) {
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = RTA_SRC;
-		if (src.isV4()) {
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-			memcpy(RTA_DATA(rtap), &((struct sockaddr_in*)&src)->sin_addr, sizeof(struct in_addr));
-		}
-		else {
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in6_addr));
-			memcpy(RTA_DATA(rtap), &((struct sockaddr_in6*)&src)->sin6_addr, sizeof(struct in6_addr));
-		}
-		req.rt.rtm_src_len = src.netmaskBits();
-	}
-
-	if (ifaceName != NULL) {
-		int interface_index = _indexForInterface(ifaceName);
-		if (interface_index != -1) {
-			rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-			rtap->rta_type = RTA_OIF;
-			rtap->rta_len = RTA_LENGTH(sizeof(int));
-			memcpy(RTA_DATA(rtap), &interface_index, sizeof(int));
-			rtl += rtap->rta_len;
-		}
-	}
-
-	req.nl.nlmsg_len = NLMSG_LENGTH(rtl);
-	req.nl.nlmsg_flags = NLM_F_REQUEST;
-	req.nl.nlmsg_type = RTM_DELROUTE;
-	req.nl.nlmsg_pid = 0;
-	req.nl.nlmsg_seq = ++_seq;
-	req.rt.rtm_family = target.ss_family;
-	req.rt.rtm_table = RT_TABLE_MAIN;
-	req.rt.rtm_protocol = RTPROT_STATIC;
-	req.rt.rtm_scope = RT_SCOPE_UNIVERSE;
-	req.rt.rtm_type = RTN_UNICAST;
-	req.rt.rtm_dst_len = target.netmaskBits();
-	req.rt.rtm_flags = 0;
-
-	struct sockaddr_nl pa;
-	bzero(&pa, sizeof(pa));
-	pa.nl_family = AF_NETLINK;
-
-	struct msghdr msg;
-	bzero(&msg, sizeof(msg));
-	msg.msg_name = (void*)&pa;
-	msg.msg_namelen = sizeof(pa);
-
-	struct iovec iov;
-	bzero(&iov, sizeof(iov));
-	iov.iov_base = (void*)&req.nl;
-	iov.iov_len = req.nl.nlmsg_len;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	sendmsg(fd, &msg, 0);
-
-	_doRecv(fd);
-
-	close(fd);
-}
-
-void LinuxNetLink::addAddress(const InetAddress& addr, const char* iface)
-{
-	int fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (fd == -1) {
-		fprintf(stderr, "Error opening RTNETLINK socket: %s\n", strerror(errno));
-		return;
-	}
-
-	_setSocketTimeout(fd);
-
-	struct sockaddr_nl la;
-	memset(&la, 0, sizeof(la));
-	la.nl_family = AF_NETLINK;
-	la.nl_pid = 0;	 // getpid();
-	if (addr.isV4()) {
-		la.nl_groups = RTMGRP_IPV4_IFADDR;
-	}
-	else {
-		la.nl_groups = RTMGRP_IPV6_IFADDR;
-	}
-
-	if (bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
-		fprintf(stderr, "Error binding RTNETLINK (addAddress #1): %s\n", strerror(errno));
-		close(fd);
-		return;
-	}
-
-#ifdef ZT_NETLINK_TRACE
-	char tmp[128];
-	fprintf(stderr, "Adding IP address %s to interface %s\n", addr.toString(tmp), iface);
-#endif
-
-	int interface_index = _indexForInterface(iface);
-	for (int reps = 0; interface_index == -1 && reps < 10; ++reps) {
-		Thread::sleep(100);
-		interface_index = _indexForInterface(iface);
-	}
-
-	if (interface_index == -1) {
-		fprintf(stderr, "Unable to find index for interface %s\n", iface);
-		close(fd);
-		return;
-	}
-
-	int rtl = sizeof(struct ifaddrmsg);
-	struct nl_adr_req req;
-	bzero(&req, sizeof(struct nl_adr_req));
-
-	struct rtattr* rtap = (struct rtattr*)req.buf;
-	;
-	if (addr.isV4()) {
-		struct sockaddr_in* addr_v4 = (struct sockaddr_in*)&addr;
-		rtap->rta_type = IFA_ADDRESS;
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-		memcpy(RTA_DATA(rtap), &addr_v4->sin_addr, sizeof(struct in_addr));
-		rtl += rtap->rta_len;
-
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = IFA_LOCAL;
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-		memcpy(RTA_DATA(rtap), &addr_v4->sin_addr, sizeof(struct in_addr));
-		rtl += rtap->rta_len;
-
-		InetAddress broadcast = addr.broadcast();
-		if (broadcast) {
-			rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-			struct sockaddr_in* bcast = (struct sockaddr_in*)&broadcast;
-			rtap->rta_type = IFA_BROADCAST;
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-			memcpy(RTA_DATA(rtap), &bcast->sin_addr, sizeof(struct in_addr));
-			rtl += rtap->rta_len;
-		}
-	}
-	else {	 // V6
-		rtap->rta_type = IFA_ADDRESS;
-		struct sockaddr_in6* addr_v6 = (struct sockaddr_in6*)&addr;
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in6_addr));
-		memcpy(RTA_DATA(rtap), &addr_v6->sin6_addr, sizeof(struct in6_addr));
-		rtl += rtap->rta_len;
-	}
-
-	if (iface) {
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = IFA_LABEL;
-		rtap->rta_len = RTA_LENGTH(strlen(iface));
-		memcpy(RTA_DATA(rtap), iface, strlen(iface));
-		rtl += rtap->rta_len;
-	}
-
-	req.nl.nlmsg_len = NLMSG_LENGTH(rtl);
-	req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL;
-	req.nl.nlmsg_type = RTM_NEWADDR;
-	req.nl.nlmsg_pid = 0;
-	req.nl.nlmsg_seq = ++_seq;
-	req.ifa.ifa_family = addr.ss_family;
-	req.ifa.ifa_prefixlen = addr.port();
-	req.ifa.ifa_flags = IFA_F_PERMANENT;
-	req.ifa.ifa_scope = 0;
-	req.ifa.ifa_index = interface_index;
-
-	struct sockaddr_nl pa;
-	bzero(&pa, sizeof(sockaddr_nl));
-	pa.nl_family = AF_NETLINK;
-
-	struct msghdr msg;
-	bzero(&msg, sizeof(msg));
-	msg.msg_name = (void*)&pa;
-	msg.msg_namelen = sizeof(pa);
-
-	struct iovec iov;
-	iov.iov_base = (void*)&req.nl;
-	iov.iov_len = req.nl.nlmsg_len;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	sendmsg(fd, &msg, 0);
-
-	_doRecv(fd);
-
-	close(fd);
-}
-
-void LinuxNetLink::removeAddress(const InetAddress& addr, const char* iface)
-{
-	int fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (fd == -1) {
-		fprintf(stderr, "Error opening RTNETLINK socket: %s\n", strerror(errno));
-		return;
-	}
-
-	_setSocketTimeout(fd);
-
-	struct sockaddr_nl la;
-	la.nl_family = AF_NETLINK;
-	la.nl_pid = 0;	 // getpid();
-	if (addr.isV4()) {
-		la.nl_groups = RTMGRP_IPV4_IFADDR;
-	}
-	else {
-		la.nl_groups = RTMGRP_IPV6_IFADDR;
-	}
-	if (bind(fd, (struct sockaddr*)&la, sizeof(struct sockaddr_nl))) {
-		fprintf(stderr, "Error binding RTNETLINK (removeAddress #1): %s\n", strerror(errno));
-		close(fd);
-		return;
-	}
-
-#ifdef ZT_NETLINK_TRACE
-	char tmp[128];
-	fprintf(stderr, "Removing IP address %s from interface %s\n", addr.toString(tmp), iface);
-#endif
-
-	int interface_index = _indexForInterface(iface);
-
-	if (interface_index == -1) {
-		fprintf(stderr, "Unable to find index for interface %s\n", iface);
-		close(fd);
-		return;
-	}
-
-	int rtl = sizeof(struct ifaddrmsg);
-	struct nl_adr_req req;
-	bzero(&req, sizeof(struct nl_adr_req));
-
-	struct rtattr* rtap = (struct rtattr*)req.buf;
-	if (addr.isV4()) {
-		struct sockaddr_in* addr_v4 = (struct sockaddr_in*)&addr;
-		rtap->rta_type = IFA_ADDRESS;
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-		memcpy(RTA_DATA(rtap), &addr_v4->sin_addr, sizeof(struct in_addr));
-		rtl += rtap->rta_len;
-
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = IFA_LOCAL;
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-		memcpy(RTA_DATA(rtap), &addr_v4->sin_addr, sizeof(struct in_addr));
-		rtl += rtap->rta_len;
-
-		InetAddress broadcast = addr.broadcast();
-		if (broadcast) {
-			rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-			struct sockaddr_in* bcast = (struct sockaddr_in*)&broadcast;
-			rtap->rta_type = IFA_BROADCAST;
-			rtap->rta_len = RTA_LENGTH(sizeof(struct in_addr));
-			memcpy(RTA_DATA(rtap), &bcast->sin_addr, sizeof(struct in_addr));
-			rtl += rtap->rta_len;
-		}
-	}
-	else {	 // V6
-		rtap->rta_type = IFA_ADDRESS;
-		struct sockaddr_in6* addr_v6 = (struct sockaddr_in6*)&addr;
-		rtap->rta_len = RTA_LENGTH(sizeof(struct in6_addr));
-		memcpy(RTA_DATA(rtap), &addr_v6->sin6_addr, sizeof(struct in6_addr));
-		rtl += rtap->rta_len;
-	}
-
-	if (iface) {
-		rtap = (struct rtattr*)(((char*)rtap) + rtap->rta_len);
-		rtap->rta_type = IFA_LABEL;
-		rtap->rta_len = RTA_LENGTH(strlen(iface));
-		memcpy(RTA_DATA(rtap), iface, strlen(iface));
-		rtl += rtap->rta_len;
-	}
-
-	req.nl.nlmsg_len = NLMSG_LENGTH(rtl);
-	req.nl.nlmsg_flags = NLM_F_REQUEST;
-	req.nl.nlmsg_type = RTM_DELADDR;
-	req.nl.nlmsg_pid = 0;
-	req.nl.nlmsg_seq = ++_seq;
-	req.ifa.ifa_family = addr.ss_family;
-	req.ifa.ifa_prefixlen = addr.port();
-	req.ifa.ifa_flags = IFA_F_PERMANENT;
-	req.ifa.ifa_scope = 0;
-	req.ifa.ifa_index = interface_index;
-
-	struct sockaddr_nl pa;
-	bzero(&pa, sizeof(sockaddr_nl));
-	pa.nl_family = AF_NETLINK;
-
-	struct msghdr msg;
-	bzero(&msg, sizeof(msg));
-	msg.msg_name = (void*)&pa;
-	msg.msg_namelen = sizeof(pa);
-
-	struct iovec iov;
-	iov.iov_base = (void*)&req.nl;
-	iov.iov_len = req.nl.nlmsg_len;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	sendmsg(fd, &msg, 0);
-
-	_doRecv(fd);
-
-	close(fd);
-}
-
-bool LinuxNetLink::routeIsSet(const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifname)
-{
-	Mutex::Lock rl(_routes_m);
-	const std::set<LinuxNetLink::Route>& rs = _routes[target];
-	for (std::set<LinuxNetLink::Route>::const_iterator ri(rs.begin()); ri != rs.end(); ++ri) {
-		if ((ri->via == via) && (ri->src == src)) {
-			if (ifname) {
-				Mutex::Lock ifl(_if_m);
-				const iface_entry* ife = _interfaces.get(ri->ifidx);
-				if ((ife) && (! strncmp(ife->ifacename, ifname, IFNAMSIZ)))
-					return true;
-			}
-			else {
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-int LinuxNetLink::_indexForInterface(const char* iface)
-{
-	Mutex::Lock l(_if_m);
-	int interface_index = -1;
-	Hashtable<int, iface_entry>::Iterator iter(_interfaces);
-	int* k = NULL;
-	iface_entry* v = NULL;
-	while (iter.next(k, v)) {
-		if (strcmp(iface, v->ifacename) == 0) {
-			interface_index = v->index;
-			break;
-		}
-	}
-	return interface_index;
-}
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/LinuxNetLink.hpp b/osdep/LinuxNetLink.hpp
deleted file mode 100644
index 6f99130ae..000000000
--- a/osdep/LinuxNetLink.hpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_LINUX_NETLINK_HPP
-#define ZT_LINUX_NETLINK_HPP
-
-#include "../node/Constants.hpp"
-
-#ifdef __LINUX__
-
-#include <asm/types.h>
-#include <linux/rtnetlink.h>
-#include <map>
-#include <set>
-#include <sys/socket.h>
-#include <vector>
-// #include <linux/if.h>
-
-#include "../node/Hashtable.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/MAC.hpp"
-#include "../node/Mutex.hpp"
-#include "Thread.hpp"
-
-namespace ZeroTier {
-
-/**
- * Interface with Linux's RTNETLINK
- */
-class LinuxNetLink {
-  private:
-	LinuxNetLink();
-	~LinuxNetLink();
-
-  public:
-	struct Route {
-		InetAddress target;
-		InetAddress via;
-		InetAddress src;
-		int ifidx;
-
-		inline bool operator==(const Route& r) const
-		{
-			return ((target == r.target) && (via == r.via) && (src == r.src) && (ifidx == r.ifidx));
-		}
-		inline bool operator!=(const Route& r) const
-		{
-			return (! (*this == r));
-		}
-		inline bool operator<(const Route& r) const
-		{
-			if (target < r.target) {
-				return true;
-			}
-			else if (target == r.target) {
-				if (via < r.via) {
-					return true;
-				}
-				else if (via == r.via) {
-					if (src < r.src) {
-						return true;
-					}
-					else if (src == r.src) {
-						return (ifidx < r.ifidx);
-					}
-				}
-			}
-			return false;
-		}
-		inline bool operator>(const Route& r) const
-		{
-			return (r < *this);
-		}
-		inline bool operator<=(const Route& r) const
-		{
-			return ! (r < *this);
-		}
-		inline bool operator>=(const Route& r) const
-		{
-			return ! (*this < r);
-		}
-	};
-
-	static LinuxNetLink& getInstance()
-	{
-		static LinuxNetLink instance;
-		return instance;
-	}
-
-	LinuxNetLink(LinuxNetLink const&) = delete;
-	void operator=(LinuxNetLink const&) = delete;
-
-	void addRoute(const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifaceName);
-	void delRoute(const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifaceName);
-
-	void addAddress(const InetAddress& addr, const char* iface);
-	void removeAddress(const InetAddress& addr, const char* iface);
-
-	bool routeIsSet(const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* ifname);
-
-	void threadMain() throw();
-
-  private:
-	int _doRecv(int fd);
-
-	void _processMessage(struct nlmsghdr* nlp, int nll);
-	void _routeAdded(struct nlmsghdr* nlp);
-	void _routeDeleted(struct nlmsghdr* nlp);
-	void _linkAdded(struct nlmsghdr* nlp);
-	void _linkDeleted(struct nlmsghdr* nlp);
-	void _ipAddressAdded(struct nlmsghdr* nlp);
-	void _ipAddressDeleted(struct nlmsghdr* nlp);
-
-	void _requestInterfaceList();
-	void _requestIPv4Routes();
-	void _requestIPv6Routes();
-
-	int _indexForInterface(const char* iface);
-
-	void _setSocketTimeout(int fd, int seconds = 1);
-
-	Thread _t;
-	bool _running;
-
-	uint32_t _seq;
-
-	std::map<InetAddress, std::set<LinuxNetLink::Route> > _routes;
-	Mutex _routes_m;
-
-	struct iface_entry {
-		iface_entry()
-		{
-			memset(this, 0, sizeof(iface_entry));
-		}
-		int index;
-		char ifacename[16];	  // IFNAMSIZ on Linux == 16
-		char mac[18];
-		char mac_bin[6];
-		unsigned int mtu;
-	};
-	Hashtable<int, iface_entry> _interfaces;
-	Mutex _if_m;
-
-	// socket communication vars;
-	int _fd;
-	struct sockaddr_nl _la;
-};
-
-}	// namespace ZeroTier
-
-#endif
-
-#endif	 // ZT_LINUX_NETLINK_HPPS
\ No newline at end of file
diff --git a/osdep/MacDNSHelper.hpp b/osdep/MacDNSHelper.hpp
deleted file mode 100644
index 69ea58d3b..000000000
--- a/osdep/MacDNSHelper.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef MAC_DNS_HELPER
-#define MAC_DNS_HELPER
-
-#include "../node/InetAddress.hpp"
-#include "../node/MAC.hpp"
-
-#include <vector>
-
-namespace ZeroTier {
-
-class MacDNSHelper {
-  public:
-	static void setDNS(uint64_t nwid, const char* domain, const std::vector<InetAddress>& servers);
-	static void removeDNS(uint64_t nwid);
-	static bool addIps4(uint64_t nwid, const MAC mac, const char* dev, const std::vector<InetAddress>& addrs);
-	static bool addIps6(uint64_t nwid, const MAC mac, const char* dev, const std::vector<InetAddress>& addrs);
-	static bool removeIps4(uint64_t nwid);
-	static bool removeIps6(uint64_t nwid);
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/MacDNSHelper.mm b/osdep/MacDNSHelper.mm
deleted file mode 100644
index 5e170e172..000000000
--- a/osdep/MacDNSHelper.mm
+++ /dev/null
@@ -1,347 +0,0 @@
-#include "MacDNSHelper.hpp"
-
-#include <stdio.h>
-
-#include <SystemConfiguration/SystemConfiguration.h>
-
-namespace ZeroTier {
-
-static void printKeys (const void* key, const void* value, void* context) {
-  CFShow(key);
-  CFShow(value);
-}
-
-void MacDNSHelper::setDNS(uint64_t nwid, const char *domain, const std::vector<InetAddress> &servers)
-{
-    SCDynamicStoreRef ds = SCDynamicStoreCreate(NULL, CFSTR("zerotier"), NULL, NULL);
-
-    CFStringRef *s = new CFStringRef[4];
-    for (unsigned int i = 0; i < servers.size(); ++i) {
-        char buf[64];
-        ZeroTier::InetAddress a = servers[i];
-        const char *ipStr = a.toIpString(buf);
-        s[i] = CFStringCreateWithCString(NULL, ipStr, kCFStringEncodingUTF8);
-    }
-
-    CFArrayRef serverArray = CFArrayCreate(NULL, (const void**)s, servers.size(), &kCFTypeArrayCallBacks);
-
-    CFStringRef keys[3];
-    keys[0] = CFSTR("SupplementalMatchDomains");
-    keys[1] = CFSTR("ServerAddresses");
-    keys[2] = CFSTR("SearchDomains");
-
-    CFStringRef cfdomain = CFStringCreateWithCString(NULL, domain, kCFStringEncodingUTF8);
-    CFStringRef cfdomain2 = CFStringCreateWithCString(NULL, domain, kCFStringEncodingUTF8);
-    CFArrayRef domainArray = CFArrayCreate(NULL, (const void**)&cfdomain, 1, &kCFTypeArrayCallBacks);
-    CFArrayRef domainArray2 = CFArrayCreate(NULL, (const void**)&cfdomain2, 1, &kCFTypeArrayCallBacks);
-
-    CFTypeRef values[3];
-    values[0] = domainArray;
-    values[1] = serverArray;
-    values[2] = domainArray2;
-
-    CFDictionaryRef dict = CFDictionaryCreate(NULL,
-        (const void**)keys, (const void**)values, 3, &kCFCopyStringDictionaryKeyCallBacks,
-        &kCFTypeDictionaryValueCallBacks);
-
-    char buf[256] = {0};
-    sprintf(buf, "State:/Network/Service/%.16llx/DNS", nwid);
-    CFStringRef key = CFStringCreateWithCString(NULL, buf, kCFStringEncodingUTF8);
-    CFArrayRef list = SCDynamicStoreCopyKeyList(ds, key);
-    CFIndex i = 0, j = CFArrayGetCount(list);
-    bool dnsServersChanged = true;
-    CFPropertyListRef oldDNSServers = NULL;
-    if (j > 0) {
-        oldDNSServers = SCDynamicStoreCopyValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i));
-        dnsServersChanged = !CFEqual(oldDNSServers,dict);
-    }
-    if (dnsServersChanged) {
-        bool ret = TRUE;
-        if (j <= 0) {
-            ret &= SCDynamicStoreAddValue(ds, key, dict);
-        } else {
-            ret &= SCDynamicStoreSetValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i), dict);
-        }
-        if (!ret) {
-            fprintf(stderr, "Error writing DNS configuration\n");
-        }
-    }
-    if (oldDNSServers != NULL) {
-        CFRelease(oldDNSServers);
-    }
-    CFRelease(list);
-    CFRelease(key);
-    CFRelease(dict);
-    CFRelease(domainArray);
-    CFRelease(domainArray2);
-    CFRelease(cfdomain);
-    CFRelease(cfdomain2);
-    CFRelease(serverArray);
-    for (int i = 0; i < servers.size(); ++i) {
-        CFRelease(s[i]);
-    }
-    delete[] s;
-    CFRelease(ds);
-}
-
-void MacDNSHelper::removeDNS(uint64_t nwid)
-{
-    SCDynamicStoreRef ds = SCDynamicStoreCreate(NULL, CFSTR("zerotier"), NULL, NULL);
-
-    char buf[256] = {0};
-    sprintf(buf, "State:/Network/Service/%.16llx/DNS", nwid);
-    CFStringRef key = CFStringCreateWithCString(NULL, buf, kCFStringEncodingUTF8);
-    SCDynamicStoreRemoveValue(ds, key);
-    CFRelease(key);
-    CFRelease(ds);
-}
-
-// Make macOS believe we do in fact have ipv6 connectivity and that it should resolve dns names
-// over ipv6 if we ask for them.
-// Originally I planned to put all the v6 ip addresses from the network into the config.
-// But only the link local address is necessary and sufficient. Added other v6 addresses
-// doesn't do anything.
-//
-// As of Monterey we need IPv4 set up too.
-
-bool MacDNSHelper::addIps4(uint64_t nwid, const MAC mac, const char *dev, const std::vector<InetAddress>& addrs)
-{
-    const char* ipStr = {0};
-    char buf2[256] = {0};
-
-    bool hasV4 = false;
-    for (unsigned int i = 0; i < addrs.size(); ++i) {
-        if (addrs[i].isV4()) {
-            hasV4 = true;
-
-            ipStr = addrs[i].toIpString(buf2);
-
-            break;
-        }
-    }
-
-    if (!hasV4) {
-        MacDNSHelper::removeIps4(nwid);
-        return true;
-    }
-
-
-    SCDynamicStoreRef ds = SCDynamicStoreCreate(NULL, CFSTR("zerotier"), NULL, NULL);
-    char buf[256] = { 0 };
-    sprintf(buf, "State:/Network/Service/%.16llx/IPv4", nwid);
-
-
-    CFStringRef key = CFStringCreateWithCString(NULL, buf, kCFStringEncodingUTF8);
-
-    CFStringRef cfaddr = CFStringCreateWithCString(NULL, ipStr, kCFStringEncodingUTF8);
-    CFArrayRef addrArray = CFArrayCreate(NULL, (const void**)&cfaddr, 1, &kCFTypeArrayCallBacks);
-
-    CFStringRef cfdev = CFStringCreateWithCString(NULL, dev, kCFStringEncodingUTF8);
-
-    CFStringRef cfserver = CFStringCreateWithCString(NULL, "127.0.0.1", kCFStringEncodingUTF8);
-    // using the ip from the zerotier network breaks routing on the mac
-    CFStringRef cfrouter = CFStringCreateWithCString(NULL, "127.0.0.1", kCFStringEncodingUTF8);
-
-    const int SIZE = 4;
-    CFStringRef keys[SIZE];
-    keys[0] = CFSTR("Addresses");
-    keys[1] = CFSTR("InterfaceName");
-    keys[2] = CFSTR("ServerAddress");
-    keys[3] = CFSTR("Router");
-
-    CFTypeRef values[SIZE];
-    values[0] = addrArray;
-    values[1] = cfdev;
-    values[2] = cfserver;
-    values[3] = cfrouter;
-
-
-    CFDictionaryRef dict = CFDictionaryCreate(NULL,
-        (const void**)keys, (const void**)values, SIZE, &kCFCopyStringDictionaryKeyCallBacks,
-        &kCFTypeDictionaryValueCallBacks);
-
-    // CFDictionaryApplyFunction(dict, printKeys, NULL);
-
-    CFArrayRef list = SCDynamicStoreCopyKeyList(ds, key);
-    CFIndex i = 0, j = CFArrayGetCount(list);
-    bool addrsChanged = true;
-    CFPropertyListRef oldAddrs = NULL;
-
-    bool ret = TRUE;
-    if (j > 0) {
-        oldAddrs = SCDynamicStoreCopyValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i));
-        addrsChanged = !CFEqual(oldAddrs,dict);
-    }
-    if (addrsChanged) {
-        if (j <= 0) {
-            ret &= SCDynamicStoreAddValue(ds, key, dict);
-        } else {
-            ret &= SCDynamicStoreSetValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i), dict);
-        }
-        if (!ret) {
-            fprintf(stderr, "Error writing IPv6 configuration\n");
-        }
-    }
-    if (oldAddrs != NULL) {
-        CFRelease(oldAddrs);
-    }
-
-    CFRelease(cfaddr);
-
-    CFRelease(addrArray);
-    CFRelease(cfdev);
-    CFRelease(cfserver);
-    CFRelease(cfrouter);
-
-    CFRelease(ds);
-    CFRelease(key);
-
-    // for (unsigned int i = 0; i < SIZE; ++i) {
-    //     values[i] = NULL;
-    // }
-
-    CFRelease(list);
-    CFRelease(dict);
-
-    return ret;
-
-}
-bool MacDNSHelper::addIps6(uint64_t nwid, const MAC mac, const char *dev, const std::vector<InetAddress>& addrs)
-{
-    bool hasV6 = false;
-    for (unsigned int i = 0; i < addrs.size(); ++i) {
-        if (addrs[i].isV6()) {
-            hasV6 = true;
-            break;
-        }
-    }
-
-    if (!hasV6) {
-        MacDNSHelper::removeIps6(nwid);
-        return true;
-    }
-
-
-    SCDynamicStoreRef ds = SCDynamicStoreCreate(NULL, CFSTR("zerotier"), NULL, NULL);
-    char buf[256] = { 0 };
-    sprintf(buf, "State:/Network/Service/%.16llx/IPv6", nwid);
-
-    InetAddress ll = InetAddress::makeIpv6LinkLocal(mac);
-    char buf2[256] = {0};
-    const char* llStr = ll.toIpString(buf2);
-
-
-    CFStringRef key = CFStringCreateWithCString(NULL, buf, kCFStringEncodingUTF8);
-
-    CFStringRef cfaddr = CFStringCreateWithCString(NULL, llStr, kCFStringEncodingUTF8);
-    CFStringRef cfprefixes = CFStringCreateWithCString(NULL, "64", kCFStringEncodingUTF8);
-    CFStringRef cfdestaddrs = CFStringCreateWithCString(NULL, "::ffff:ffff:ffff:ffff:0:0", kCFStringEncodingUTF8);
-    CFStringRef cfflags = CFStringCreateWithCString(NULL, "0", kCFStringEncodingUTF8);
-
-    CFArrayRef addrArray = CFArrayCreate(NULL, (const void**)&cfaddr, 1, &kCFTypeArrayCallBacks);
-    CFArrayRef prefixArray = CFArrayCreate(NULL, (const void**)&cfprefixes, 1, &kCFTypeArrayCallBacks);
-    CFArrayRef destArray = CFArrayCreate(NULL, (const void**)&cfdestaddrs, 1, &kCFTypeArrayCallBacks);
-    CFArrayRef flagsArray = CFArrayCreate(NULL, (const void**)&cfflags, 1, &kCFTypeArrayCallBacks);
-    CFStringRef cfdev = CFStringCreateWithCString(NULL, dev, kCFStringEncodingUTF8);
-
-    const int SIZE = 5;
-    CFStringRef keys[SIZE];
-    keys[0] = CFSTR("Addresses");
-    keys[1] = CFSTR("DestAddresses");
-    keys[2] = CFSTR("Flags");
-    keys[3] = CFSTR("InterfaceName");
-    keys[4] = CFSTR("PrefixLength");
-
-    CFTypeRef values[SIZE];
-    values[0] = addrArray;
-    values[1] = destArray;
-    values[2] = flagsArray;
-    // values[3] = devArray;
-    values[3] = cfdev;
-    values[4] = prefixArray;
-
-
-    CFDictionaryRef dict = CFDictionaryCreate(NULL,
-        (const void**)keys, (const void**)values, SIZE, &kCFCopyStringDictionaryKeyCallBacks,
-        &kCFTypeDictionaryValueCallBacks);
-
-    // CFDictionaryApplyFunction(dict, printKeys, NULL);
-
-    CFArrayRef list = SCDynamicStoreCopyKeyList(ds, key);
-    CFIndex i = 0, j = CFArrayGetCount(list);
-    bool addrsChanged = true;
-    CFPropertyListRef oldAddrs = NULL;
-
-    bool ret = TRUE;
-    if (j > 0) {
-        oldAddrs = SCDynamicStoreCopyValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i));
-        addrsChanged = !CFEqual(oldAddrs,dict);
-    }
-    if (addrsChanged) {
-        if (j <= 0) {
-            ret &= SCDynamicStoreAddValue(ds, key, dict);
-        } else {
-            ret &= SCDynamicStoreSetValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i), dict);
-        }
-        if (!ret) {
-            fprintf(stderr, "Error writing IPv6 configuration\n");
-        }
-    }
-    if (oldAddrs != NULL) {
-        CFRelease(oldAddrs);
-    }
-
-    CFRelease(cfaddr);
-    CFRelease(cfprefixes);
-    CFRelease(cfdestaddrs);
-    CFRelease(cfflags);
-
-    CFRelease(addrArray);
-    CFRelease(prefixArray);
-    CFRelease(destArray);
-    CFRelease(flagsArray);
-    CFRelease(cfdev);
-
-    CFRelease(ds);
-    CFRelease(key);
-
-    // for (unsigned int i = 0; i < SIZE; ++i) {
-    //     values[i] = NULL;
-    // }
-
-    CFRelease(list);
-    CFRelease(dict);
-
-    return ret;
-}
-bool MacDNSHelper::removeIps6(uint64_t nwid)
-{
-    SCDynamicStoreRef ds = SCDynamicStoreCreate(NULL, CFSTR("zerotier"), NULL, NULL);
-
-    char buf[256] = {0};
-    sprintf(buf, "State:/Network/Service/%.16llx/IPv6", nwid);
-    CFStringRef key = CFStringCreateWithCString(NULL, buf, kCFStringEncodingUTF8);
-    bool res = SCDynamicStoreRemoveValue(ds, key);
-    CFRelease(key);
-    CFRelease(ds);
-
-    return res;
-}
-
-
-bool MacDNSHelper::removeIps4(uint64_t nwid)
-{
-    SCDynamicStoreRef ds = SCDynamicStoreCreate(NULL, CFSTR("zerotier"), NULL, NULL);
-
-    char buf[256] = {0};
-    sprintf(buf, "State:/Network/Service/%.16llx/IPv4", nwid);
-    CFStringRef key = CFStringCreateWithCString(NULL, buf, kCFStringEncodingUTF8);
-    bool res = SCDynamicStoreRemoveValue(ds, key);
-    CFRelease(key);
-    CFRelease(ds);
-
-    return res;
-}
-
-
-}
diff --git a/osdep/MacEthernetTap.cpp b/osdep/MacEthernetTap.cpp
deleted file mode 100644
index 09278855b..000000000
--- a/osdep/MacEthernetTap.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "../node/Constants.hpp"
-
-#ifdef __APPLE__
-
-#include "../node/Dictionary.hpp"
-#include "../node/Mutex.hpp"
-#include "../node/Utils.hpp"
-#include "MacDNSHelper.hpp"
-#include "MacEthernetTap.hpp"
-#include "MacEthernetTapAgent.h"
-#include "OSUtils.hpp"
-
-#include <algorithm>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <filesystem>
-#include <ifaddrs.h>
-#include <map>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <set>
-#include <signal.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <string>
-#include <sys/cdefs.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff), 0);
-
-#define MACOS_FETH_MAX_MTU_SYSCTL "net.link.fake.max_mtu"
-
-namespace ZeroTier {
-
-static Mutex globalTapCreateLock;
-static bool globalTapInitialized = false;
-static bool fethMaxMtuAdjusted = false;
-
-MacEthernetTap::MacEthernetTap(
-	const char* homePath,
-	const MAC& mac,
-	unsigned int mtu,
-	unsigned int metric,
-	uint64_t nwid,
-	const char* friendlyName,
-	void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void* data, unsigned int len),
-	void* arg)
-	: _handler(handler)
-	, _arg(arg)
-	, _nwid(nwid)
-	, _homePath(homePath)
-	, _mtu(mtu)
-	, _metric(metric)
-	, _devNo(0)
-	, _agentStdin(-1)
-	, _agentStdout(-1)
-	, _agentStderr(-1)
-	, _agentStdin2(-1)
-	, _agentStdout2(-1)
-	, _agentStderr2(-1)
-	, _agentPid(-1)
-	, _enabled(true)
-	, _lastIfAddrsUpdate(0)
-{
-	char ethaddr[64], mtustr[16], devnostr[16], devstr[16], metricstr[16];
-	OSUtils::ztsnprintf(ethaddr, sizeof(ethaddr), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", (int)mac[0], (int)mac[1], (int)mac[2], (int)mac[3], (int)mac[4], (int)mac[5]);
-	OSUtils::ztsnprintf(mtustr, sizeof(mtustr), "%u", mtu);
-	OSUtils::ztsnprintf(metricstr, sizeof(metricstr), "%u", metric);
-
-	std::string agentPath(homePath);
-	agentPath.push_back(ZT_PATH_SEPARATOR);
-	agentPath.append("MacEthernetTapAgent");
-	if (! OSUtils::fileExists(agentPath.c_str()))
-		throw std::runtime_error("MacEthernetTapAgent not present in ZeroTier home");
-
-	Mutex::Lock _gl(globalTapCreateLock);	// only make one at a time
-
-	if (! fethMaxMtuAdjusted) {
-		fethMaxMtuAdjusted = true;
-		int old_mtu = 0;
-		size_t old_mtu_len = sizeof(old_mtu);
-		int mtu = 10000;
-		sysctlbyname(MACOS_FETH_MAX_MTU_SYSCTL, &old_mtu, &old_mtu_len, &mtu, sizeof(mtu));
-	}
-
-	// Destroy all feth devices on first tap start in case ZeroTier did not exit cleanly last time.
-	// We leave interfaces less than feth100 alone in case something else is messing with feth devices.
-	if (! globalTapInitialized) {
-		globalTapInitialized = true;
-		struct ifaddrs* ifa = (struct ifaddrs*)0;
-		std::set<std::string> deleted;
-		if (! getifaddrs(&ifa)) {
-			struct ifaddrs* p = ifa;
-			while (p) {
-				int nameLen = (int)strlen(p->ifa_name);
-				// Delete feth# from feth0 to feth9999, but don't touch >10000.
-				if ((! strncmp(p->ifa_name, "feth", 4)) && (nameLen >= 5) && (nameLen <= 8) && (deleted.count(std::string(p->ifa_name)) == 0)) {
-					deleted.insert(std::string(p->ifa_name));
-					const char* args[4];
-					args[0] = "/sbin/ifconfig";
-					args[1] = p->ifa_name;
-					args[2] = "destroy";
-					args[3] = (char*)0;
-					const pid_t pid = vfork();
-					if (pid == 0) {
-						execv(args[0], const_cast<char**>(args));
-						_exit(-1);
-					}
-					else if (pid > 0) {
-						int rv = 0;
-						waitpid(pid, &rv, 0);
-					}
-				}
-				p = p->ifa_next;
-			}
-			freeifaddrs(ifa);
-		}
-	}
-
-	unsigned int devNo = 100 + ((nwid ^ (nwid >> 32) ^ (nwid >> 48)) % 4900);
-	for (;;) {
-		OSUtils::ztsnprintf(devnostr, sizeof(devnostr), "%u", devNo);
-		OSUtils::ztsnprintf(devstr, sizeof(devstr), "feth%u", devNo);
-		bool duplicate = false;
-		struct ifaddrs* ifa = (struct ifaddrs*)0;
-		if (! getifaddrs(&ifa)) {
-			struct ifaddrs* p = ifa;
-			while (p) {
-				if (! strcmp(p->ifa_name, devstr)) {
-					duplicate = true;
-					break;
-				}
-				p = p->ifa_next;
-			}
-			freeifaddrs(ifa);
-		}
-		if (duplicate) {
-			devNo = (devNo + 1) % 5000;
-			if (devNo < 100)
-				devNo = 100;
-		}
-		else {
-			_dev = devstr;
-			_devNo = devNo;
-			break;
-		}
-	}
-
-	if (::pipe(_shutdownSignalPipe))
-		throw std::runtime_error("pipe creation failed");
-
-	int agentStdin[2];
-	int agentStdout[2];
-	int agentStderr[2];
-	if (::pipe(agentStdin))
-		throw std::runtime_error("pipe creation failed");
-	if (::pipe(agentStdout))
-		throw std::runtime_error("pipe creation failed");
-	if (::pipe(agentStderr))
-		throw std::runtime_error("pipe creation failed");
-	_agentStdin = agentStdin[1];
-	_agentStdout = agentStdout[0];
-	_agentStderr = agentStderr[0];
-	_agentStdin2 = agentStdin[0];
-	_agentStdout2 = agentStdout[1];
-	_agentStderr2 = agentStderr[1];
-	long apid = (long)fork();
-	if (apid < 0) {
-		throw std::runtime_error("fork failed");
-	}
-	else if (apid == 0) {
-		::dup2(agentStdin[0], STDIN_FILENO);
-		::dup2(agentStdout[1], STDOUT_FILENO);
-		::dup2(agentStderr[1], STDERR_FILENO);
-		::close(agentStdin[0]);
-		::close(agentStdin[1]);
-		::close(agentStdout[0]);
-		::close(agentStdout[1]);
-		::close(agentStderr[0]);
-		::close(agentStderr[1]);
-		::execl(agentPath.c_str(), agentPath.c_str(), devnostr, ethaddr, mtustr, metricstr, (char*)0);
-		::_exit(-1);
-	}
-	else {
-		_agentPid = apid;
-
-		// Wait up to 10 seconds for the subprocess to actually create the device. This prevents
-		// things like routes from being created before the device exists.
-		for (int waitLoops = 0;; ++waitLoops) {
-			struct ifaddrs* ifa = (struct ifaddrs*)0;
-			if (! getifaddrs(&ifa)) {
-				struct ifaddrs* p = ifa;
-				while (p) {
-					if ((p->ifa_name) && (! strcmp(devstr, p->ifa_name))) {
-						waitLoops = -1;
-						break;
-					}
-					p = p->ifa_next;
-				}
-				freeifaddrs(ifa);
-			}
-			if (waitLoops == -1) {
-				break;
-			}
-			else if (waitLoops >= 100) {   // 10 seconds
-				throw std::runtime_error("feth device creation timed out");
-			}
-			Thread::sleep(100);
-		}
-	}
-
-	_thread = Thread::start(this);
-}
-
-MacEthernetTap::~MacEthernetTap()
-{
-	char tmp[64];
-	const char* args[4];
-	pid_t pid0, pid1;
-
-	MacDNSHelper::removeDNS(_nwid);
-	MacDNSHelper::removeIps4(_nwid);
-	MacDNSHelper::removeIps6(_nwid);
-
-	Mutex::Lock _gl(globalTapCreateLock);
-	::write(_shutdownSignalPipe[1], "\0", 1);	// causes thread to exit
-
-	int ec = 0;
-	::kill(_agentPid, SIGKILL);
-	::waitpid(_agentPid, &ec, 0);
-
-	args[0] = "/sbin/ifconfig";
-	args[1] = _dev.c_str();
-	args[2] = "destroy";
-	args[3] = (char*)0;
-	pid0 = vfork();
-	if (pid0 == 0) {
-		execv(args[0], const_cast<char**>(args));
-		_exit(-1);
-	}
-
-	snprintf(tmp, sizeof(tmp), "feth%u", _devNo + 5000);
-	// args[0] = "/sbin/ifconfig";
-	args[1] = tmp;
-	// args[2] = "destroy";
-	// args[3] = (char *)0;
-	pid1 = vfork();
-	if (pid1 == 0) {
-		execv(args[0], const_cast<char**>(args));
-		_exit(-1);
-	}
-
-	if (pid0 > 0) {
-		int rv = 0;
-		waitpid(pid0, &rv, 0);
-	}
-	if (pid1 > 0) {
-		int rv = 0;
-		waitpid(pid1, &rv, 0);
-	}
-
-	Thread::join(_thread);
-}
-
-void MacEthernetTap::setEnabled(bool en)
-{
-	_enabled = en;
-}
-bool MacEthernetTap::enabled() const
-{
-	return _enabled;
-}
-
-bool MacEthernetTap::addIp(const InetAddress& ip)
-{
-	char tmp[128];
-
-	if (! ip)
-		return false;
-
-	std::string cmd;
-	cmd.push_back((char)ZT_MACETHERNETTAPAGENT_STDIN_CMD_IFCONFIG);
-	cmd.append((ip.ss_family == AF_INET6) ? "inet6" : "inet");
-	cmd.push_back(0);
-	cmd.append(ip.toString(tmp));
-	cmd.push_back(0);
-	cmd.append("alias");
-	cmd.push_back(0);
-
-	uint16_t l = (uint16_t)cmd.length();
-	_putLock.lock();
-	write(_agentStdin, &l, 2);
-	write(_agentStdin, cmd.data(), cmd.length());
-	_putLock.unlock();
-
-	return true;
-}
-
-bool MacEthernetTap::removeIp(const InetAddress& ip)
-{
-	char tmp[128];
-
-	if (! ip)
-		return false;
-
-	std::string cmd;
-	cmd.push_back((char)ZT_MACETHERNETTAPAGENT_STDIN_CMD_IFCONFIG);
-	cmd.append((ip.ss_family == AF_INET6) ? "inet6" : "inet");
-	cmd.push_back(0);
-	cmd.append(ip.toString(tmp));
-	cmd.push_back(0);
-	cmd.append("-alias");
-	cmd.push_back(0);
-
-	uint16_t l = (uint16_t)cmd.length();
-	_putLock.lock();
-	write(_agentStdin, &l, 2);
-	write(_agentStdin, cmd.data(), cmd.length());
-	_putLock.unlock();
-
-	return true;
-}
-
-std::vector<InetAddress> MacEthernetTap::ips() const
-{
-	uint64_t now = OSUtils::now();
-
-	if ((now - _lastIfAddrsUpdate) <= GETIFADDRS_CACHE_TIME) {
-		return _ifaddrs;
-	}
-	_lastIfAddrsUpdate = now;
-
-	struct ifaddrs* ifa = (struct ifaddrs*)0;
-	std::vector<InetAddress> r;
-
-	if (! getifaddrs(&ifa)) {
-		struct ifaddrs* p = ifa;
-		while (p) {
-			if ((p->ifa_name) && (! strcmp(p->ifa_name, _dev.c_str())) && (p->ifa_addr)) {
-				switch (p->ifa_addr->sa_family) {
-					case AF_INET: {
-						struct sockaddr_in* sin = (struct sockaddr_in*)p->ifa_addr;
-						struct sockaddr_in* nm = (struct sockaddr_in*)p->ifa_netmask;
-						r.push_back(InetAddress(&(sin->sin_addr.s_addr), 4, Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
-					} break;
-					case AF_INET6: {
-						struct sockaddr_in6* sin = (struct sockaddr_in6*)p->ifa_addr;
-						struct sockaddr_in6* nm = (struct sockaddr_in6*)p->ifa_netmask;
-						uint32_t b[4];
-						memcpy(b, nm->sin6_addr.s6_addr, sizeof(b));
-						r.push_back(InetAddress(sin->sin6_addr.s6_addr, 16, Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
-					} break;
-				}
-			}
-			p = p->ifa_next;
-		}
-		freeifaddrs(ifa);
-	}
-	std::sort(r.begin(), r.end());
-	r.erase(std::unique(r.begin(), r.end()), r.end());
-
-	_ifaddrs = r;
-
-	return r;
-}
-
-void MacEthernetTap::put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len)
-{
-	struct iovec iov[3];
-	unsigned char hdr[15];
-	uint16_t l;
-	if ((_agentStdin > 0) && (len <= _mtu) && (_enabled)) {
-		hdr[0] = ZT_MACETHERNETTAPAGENT_STDIN_CMD_PACKET;
-		to.copyTo(hdr + 1, 6);
-		from.copyTo(hdr + 7, 6);
-		hdr[13] = (unsigned char)((etherType >> 8) & 0xff);
-		hdr[14] = (unsigned char)(etherType & 0xff);
-		l = (uint16_t)(len + 15);
-		iov[0].iov_base = &l;
-		iov[0].iov_len = 2;
-		iov[1].iov_base = hdr;
-		iov[1].iov_len = 15;
-		iov[2].iov_base = const_cast<void*>(data);
-		iov[2].iov_len = len;
-		_putLock.lock();
-		writev(_agentStdin, iov, 3);
-		_putLock.unlock();
-	}
-}
-
-std::string MacEthernetTap::deviceName() const
-{
-	return _dev;
-}
-void MacEthernetTap::setFriendlyName(const char* friendlyName)
-{
-}
-
-void MacEthernetTap::scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed)
-{
-	std::vector<MulticastGroup> newGroups;
-
-	struct ifmaddrs* ifmap = (struct ifmaddrs*)0;
-	if (! getifmaddrs(&ifmap)) {
-		struct ifmaddrs* p = ifmap;
-		while (p) {
-			if (p->ifma_addr->sa_family == AF_LINK) {
-				struct sockaddr_dl* in = (struct sockaddr_dl*)p->ifma_name;
-				struct sockaddr_dl* la = (struct sockaddr_dl*)p->ifma_addr;
-				if ((la->sdl_alen == 6) && (in->sdl_nlen <= _dev.length()) && (! memcmp(_dev.data(), in->sdl_data, in->sdl_nlen)))
-					newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen, 6), 0));
-			}
-			p = p->ifma_next;
-		}
-		freeifmaddrs(ifmap);
-	}
-
-	std::vector<InetAddress> allIps(ips());
-	for (std::vector<InetAddress>::iterator ip(allIps.begin()); ip != allIps.end(); ++ip)
-		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
-
-	std::sort(newGroups.begin(), newGroups.end());
-	newGroups.erase(std::unique(newGroups.begin(), newGroups.end()), newGroups.end());
-
-	for (std::vector<MulticastGroup>::iterator m(newGroups.begin()); m != newGroups.end(); ++m) {
-		if (! std::binary_search(_multicastGroups.begin(), _multicastGroups.end(), *m))
-			added.push_back(*m);
-	}
-	for (std::vector<MulticastGroup>::iterator m(_multicastGroups.begin()); m != _multicastGroups.end(); ++m) {
-		if (! std::binary_search(newGroups.begin(), newGroups.end(), *m))
-			removed.push_back(*m);
-	}
-
-	_multicastGroups.swap(newGroups);
-}
-
-void MacEthernetTap::setMtu(unsigned int mtu)
-{
-	if (_mtu != mtu) {
-		char tmp[16];
-		std::string cmd;
-		cmd.push_back((char)ZT_MACETHERNETTAPAGENT_STDIN_CMD_IFCONFIG);
-		cmd.append("mtu");
-		cmd.push_back(0);
-		OSUtils::ztsnprintf(tmp, sizeof(tmp), "%u", mtu);
-		cmd.append(tmp);
-		cmd.push_back(0);
-		uint16_t l = (uint16_t)cmd.length();
-		_putLock.lock();
-		write(_agentStdin, &l, 2);
-		write(_agentStdin, cmd.data(), cmd.length());
-		_putLock.unlock();
-		_mtu = mtu;
-	}
-}
-
-#define ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE 131072
-
-void MacEthernetTap::threadMain() throw()
-{
-	char agentReadBuf[ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE];
-	char agentStderrBuf[256];
-	fd_set readfds, nullfds;
-	MAC to, from;
-
-	Thread::sleep(250);
-
-	const int nfds = std::max(std::max(_shutdownSignalPipe[0], _agentStdout), _agentStderr) + 1;
-	long agentReadPtr = 0;
-	fcntl(_agentStdout, F_SETFL, fcntl(_agentStdout, F_GETFL) | O_NONBLOCK);
-	fcntl(_agentStderr, F_SETFL, fcntl(_agentStderr, F_GETFL) | O_NONBLOCK);
-
-	FD_ZERO(&readfds);
-	FD_ZERO(&nullfds);
-	for (;;) {
-		FD_SET(_shutdownSignalPipe[0], &readfds);
-		FD_SET(_agentStdout, &readfds);
-		FD_SET(_agentStderr, &readfds);
-		select(nfds, &readfds, &nullfds, &nullfds, (struct timeval*)0);
-
-		if (FD_ISSET(_shutdownSignalPipe[0], &readfds))
-			break;
-
-		if (FD_ISSET(_agentStdout, &readfds)) {
-			long n = (long)read(_agentStdout, agentReadBuf + agentReadPtr, ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE - agentReadPtr);
-			if (n > 0) {
-				agentReadPtr += n;
-				while (agentReadPtr >= 2) {
-					long len = *((uint16_t*)agentReadBuf);
-					if (agentReadPtr >= (len + 2)) {
-						char* msg = agentReadBuf + 2;
-
-						if ((len > 14) && (_enabled)) {
-							to.setTo(msg, 6);
-							from.setTo(msg + 6, 6);
-							_handler(_arg, (void*)0, _nwid, from, to, ntohs(((const uint16_t*)msg)[6]), 0, (const void*)(msg + 14), (unsigned int)len - 14);
-						}
-
-						if (agentReadPtr > (len + 2)) {
-							memmove(agentReadBuf, agentReadBuf + len + 2, agentReadPtr -= (len + 2));
-						}
-						else {
-							agentReadPtr = 0;
-						}
-					}
-					else {
-						break;
-					}
-				}
-			}
-		}
-
-		if (FD_ISSET(_agentStderr, &readfds)) {
-			read(_agentStderr, agentStderrBuf, sizeof(agentStderrBuf));
-			/*
-			const ssize_t n = read(_agentStderr,agentStderrBuf,sizeof(agentStderrBuf));
-			if (n > 0)
-				write(STDERR_FILENO,agentStderrBuf,(size_t)n);
-			*/
-		}
-	}
-
-	::close(_agentStdin);
-	::close(_agentStdout);
-	::close(_agentStderr);
-	::close(_agentStdin2);
-	::close(_agentStdout2);
-	::close(_agentStderr2);
-	::close(_shutdownSignalPipe[0]);
-	::close(_shutdownSignalPipe[1]);
-}
-
-void MacEthernetTap::setDns(const char* domain, const std::vector<InetAddress>& servers)
-{
-	MacDNSHelper::setDNS(this->_nwid, domain, servers);
-}
-
-}	// namespace ZeroTier
-
-#endif	 // __APPLE__
diff --git a/osdep/MacEthernetTap.hpp b/osdep/MacEthernetTap.hpp
deleted file mode 100644
index ac774360c..000000000
--- a/osdep/MacEthernetTap.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_OSXETHERNETTAP_HPP
-#define ZT_OSXETHERNETTAP_HPP
-
-#include "../node/Constants.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/MAC.hpp"
-#include "../node/MulticastGroup.hpp"
-#include "../node/Mutex.hpp"
-#include "EthernetTap.hpp"
-#include "Thread.hpp"
-
-#include <stdexcept>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string>
-#include <vector>
-
-namespace ZeroTier {
-
-class MacEthernetTap : public EthernetTap {
-  public:
-	MacEthernetTap(
-		const char* homePath,
-		const MAC& mac,
-		unsigned int mtu,
-		unsigned int metric,
-		uint64_t nwid,
-		const char* friendlyName,
-		void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-		void* arg);
-
-	virtual ~MacEthernetTap();
-
-	virtual void setEnabled(bool en);
-	virtual bool enabled() const;
-	virtual bool addIp(const InetAddress& ip);
-	virtual bool removeIp(const InetAddress& ip);
-	virtual std::vector<InetAddress> ips() const;
-	virtual void put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len);
-	virtual std::string deviceName() const;
-	virtual void setFriendlyName(const char* friendlyName);
-	virtual void scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed);
-	virtual void setMtu(unsigned int mtu);
-	virtual void setDns(const char* domain, const std::vector<InetAddress>& servers);
-
-	void threadMain() throw();
-
-  private:
-	void (*_handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int);
-	void* _arg;
-	uint64_t _nwid;
-	Thread _thread;
-	std::string _homePath;
-	std::string _dev;
-	std::vector<MulticastGroup> _multicastGroups;
-	Mutex _putLock;
-	unsigned int _mtu;
-	unsigned int _metric;
-	unsigned int _devNo;
-	int _shutdownSignalPipe[2];
-	int _agentStdin, _agentStdout, _agentStderr, _agentStdin2, _agentStdout2, _agentStderr2;
-	long _agentPid;
-	volatile bool _enabled;
-	mutable std::vector<InetAddress> _ifaddrs;
-	mutable uint64_t _lastIfAddrsUpdate;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/MacEthernetTapAgent.c b/osdep/MacEthernetTapAgent.c
deleted file mode 100644
index e74c66940..000000000
--- a/osdep/MacEthernetTapAgent.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-/*
- * This creates a pair of feth devices with the lower numbered device
- * being the ZeroTier virtual interface and the other being the device
- * used to actually read and write packets. The latter gets no IP config
- * and is only used for I/O. The behavior of feth is similar to the
- * veth pairs that exist on Linux.
- *
- * The feth device has only existed since MacOS Sierra, but that's fairly
- * long ago in Mac terms.
- *
- * I/O with feth must be done using two different sockets. The BPF socket
- * is used to receive packets, while an AF_NDRV (low-level network driver
- * access) socket must be used to inject. AF_NDRV can't read IP frames
- * since BSD doesn't forward packets out the NDRV tap if they've already
- * been handled, and while BPF can inject its MTU for injected packets
- * is limited to 2048. AF_NDRV packet injection is required to inject
- * ZeroTier's large MTU frames.
- *
- * All this stuff is basically undocumented. A lot of tracing through
- * the Darwin/XNU kernel source was required to figure out how to make
- * this actually work.
- *
- * We hope to develop a DriverKit-based driver in the near-mid future to
- * replace this weird hack, but it works for now through Big Sur in our
- * testing.
- *
- * See also:
- *
- * https://apple.stackexchange.com/questions/337715/fake-ethernet-interfaces-feth-if-fake-anyone-ever-seen-this
- * https://opensource.apple.com/source/xnu/xnu-4570.41.2/bsd/net/if_fake.c.auto.html
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#include <sys/select.h>
-#include <sys/cdefs.h>
-#include <sys/uio.h>
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-#include <sys/resource.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <net/bpf.h>
-#include <net/route.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/ndrv.h>
-#include <netinet/in_var.h>
-#include <netinet/icmp6.h>
-#include <netinet6/in6_var.h>
-#include <netinet6/nd6.h>
-#include <ifaddrs.h>
-
-#include "../version.h"
-#include "MacEthernetTapAgent.h"
-
-#ifndef SIOCAUTOCONF_START
-#define SIOCAUTOCONF_START _IOWR('i', 132, struct in6_ifreq)    /* accept rtadvd on this interface */
-#endif
-#ifndef SIOCAUTOCONF_STOP
-#define SIOCAUTOCONF_STOP _IOWR('i', 133, struct in6_ifreq)    /* stop accepting rtadv for this interface */
-#endif
-
-#define P_IFCONFIG "/sbin/ifconfig"
-
-static unsigned char s_pktReadBuf[131072] __attribute__ ((__aligned__(16)));
-static unsigned char s_stdinReadBuf[131072] __attribute__ ((__aligned__(16)));
-static char s_deviceName[IFNAMSIZ];
-static char s_peerDeviceName[IFNAMSIZ];
-static int s_bpffd = -1;
-static int s_ndrvfd = -1;
-static pid_t s_parentPid;
-
-static void configureIpv6Parameters(const char *ifname,int performNUD,int acceptRouterAdverts)
-{
-	struct in6_ndireq nd;
-	struct in6_ifreq ifr;
-
-	int s = socket(AF_INET6,SOCK_DGRAM,0);
-	if (s <= 0)
-		return;
-
-	memset(&nd,0,sizeof(nd));
-	strncpy(nd.ifname,ifname,sizeof(nd.ifname));
-
-	if (ioctl(s,SIOCGIFINFO_IN6,&nd)) {
-		close(s);
-		return;
-	}
-
-	unsigned long oldFlags = (unsigned long)nd.ndi.flags;
-
-	if (performNUD)
-		nd.ndi.flags |= ND6_IFF_PERFORMNUD;
-	else nd.ndi.flags &= ~ND6_IFF_PERFORMNUD;
-
-	if (oldFlags != (unsigned long)nd.ndi.flags) {
-		if (ioctl(s,SIOCSIFINFO_FLAGS,&nd)) {
-			close(s);
-			return;
-		}
-	}
-
-	memset(&ifr,0,sizeof(ifr));
-	strncpy(ifr.ifr_name,ifname,sizeof(ifr.ifr_name));
-	if (ioctl(s,acceptRouterAdverts ? SIOCAUTOCONF_START : SIOCAUTOCONF_STOP,&ifr)) {
-		close(s);
-		return;
-	}
-
-	close(s);
-}
-
-static int run(const char *path,...)
-{
-	va_list ap;
-	char *args[16];
-	int argNo = 1;
-
-	va_start(ap,path);
-	args[0] = (char *)path;
-	for(;argNo<15;++argNo) {
-		args[argNo] = va_arg(ap,char *);
-		if (!args[argNo]) {
-			break;
-		}
-	}
-	args[argNo++] = (char *)0;
-	va_end(ap);
-
-	pid_t pid = fork();
-	if (pid < 0) {
-		return -1;
-	} else if (pid == 0) {
-		dup2(STDERR_FILENO,STDOUT_FILENO);
-		execv(args[0],args);
-		_exit(-1);
-	}
-	int rv = 0;
-	waitpid(pid,&rv,0);
-	return rv;
-}
-
-static void die()
-{
-	if (s_ndrvfd >= 0)
-		close(s_ndrvfd);
-	if (s_bpffd >= 0)
-		close(s_bpffd);
-	if (s_peerDeviceName[0])
-		run("/sbin/ifconfig",s_peerDeviceName,"destroy",(char *)0);
-	if (s_deviceName[0])
-		run("/sbin/ifconfig",s_deviceName,"destroy",(char *)0);
-}
-
-static inline void close_inherited_fds()
-{
-	struct rlimit lim;
-	getrlimit(RLIMIT_NOFILE, &lim);
-	for (int i=3,j=(int)lim.rlim_cur;i<j;++i)
-		close(i);
-}
-
-int main(int argc,char **argv)
-{
-	char buf[128];
-	struct ifreq ifr;
-	u_int fl;
-	fd_set rfds,wfds,efds;
-	struct iovec iov[2];
-
-	s_deviceName[0] = 0;
-	s_peerDeviceName[0] = 0;
-	s_parentPid = getppid();
-
-	atexit(&die);
-	signal(SIGIO,SIG_IGN);
-	signal(SIGCHLD,SIG_IGN);
-	signal(SIGPIPE,SIG_IGN);
-	signal(SIGUSR1,SIG_IGN);
-	signal(SIGUSR2,SIG_IGN);
-	signal(SIGALRM,SIG_IGN);
-	signal(SIGQUIT,&exit);
-	signal(SIGTERM,&exit);
-	signal(SIGKILL,&exit);
-	signal(SIGINT,&exit);
-	signal(SIGPIPE,&exit);
-
-	close_inherited_fds();
-
-	if (getuid() != 0) {
-		if (setuid(0) != 0) {
-			fprintf(stderr,"E must be run as root or with root setuid bit on executable\n");
-			return ZT_MACETHERNETTAPAGENT_EXIT_CODE_INVALID_REQUEST;
-		}
-	}
-
-	if (argc < 5) {
-		fprintf(stderr,"E invalid or missing argument(s) (usage: MacEthernetTapAgent <0-4999> <mac> <mtu> <metric>)\n");
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_INVALID_REQUEST;
-	}
-	const int deviceNo = atoi(argv[1]);
-	if ((deviceNo < 0)||(deviceNo > 4999)) {
-		fprintf(stderr,"E invalid or missing argument(s) (usage: MacEthernetTapAgent <0-4999> <mac> <mtu> <metric>)\n");
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_INVALID_REQUEST;
-	}
-	const char *mac = argv[2];
-	const char *mtu = argv[3];
-	const char *metric = argv[4];
-
-	s_ndrvfd = socket(AF_NDRV,SOCK_RAW,0);
-	if (s_ndrvfd < 0) {
-		fprintf(stderr,"E unable to open AF_NDRV socket\n");
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-
-	snprintf(s_deviceName,sizeof(s_deviceName),"feth%d",deviceNo);
-	snprintf(s_peerDeviceName,sizeof(s_peerDeviceName),"feth%d",deviceNo+5000);
-	if (run(P_IFCONFIG,s_peerDeviceName,"create",(char *)0) != 0) {
-		fprintf(stderr,"E unable to create %s\n",s_deviceName);
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-	usleep(10);
-	if (run(P_IFCONFIG,s_deviceName,"create",(char *)0) != 0) {
-		fprintf(stderr,"E unable to create %s\n",s_deviceName);
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-	run(P_IFCONFIG,s_deviceName,"lladdr",mac,(char *)0);
-	usleep(10);
-	run(P_IFCONFIG,s_peerDeviceName,"peer",s_deviceName,(char *)0);
-	usleep(10);
-	run(P_IFCONFIG,s_peerDeviceName,"mtu",mtu,"up",(char *)0);
-	usleep(10);
-	run(P_IFCONFIG,s_deviceName,"mtu",mtu,"metric",metric,"up",(char *)0);
-	usleep(10);
-	configureIpv6Parameters(s_deviceName,1,0);
-	usleep(10);
-
-	struct sockaddr_ndrv nd;
-	nd.snd_len = sizeof(struct sockaddr_ndrv);
-	nd.snd_family = AF_NDRV;
-	memcpy(nd.snd_name,s_peerDeviceName,sizeof(nd.snd_name));
-	if (bind(s_ndrvfd,(struct sockaddr *)&nd,sizeof(nd)) != 0) {
-		fprintf(stderr,"E unable to bind AF_NDRV socket\n");
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-	if (connect(s_ndrvfd,(struct sockaddr *)&nd,sizeof(nd)) != 0) {
-		fprintf(stderr,"E unable to connect AF_NDRV socket\n");
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-
-	/* Start at /dev/bpf1 since some simple bpf-using net utilities hard-code /dev/bpf0.
-	 * Things like libpcap are smart enough to search. */
-	for(int bpfno=1;bpfno<5000;++bpfno) {
-		char tmp[32];
-		snprintf(tmp,sizeof(tmp),"/dev/bpf%d",bpfno);
-		s_bpffd = open(tmp,O_RDWR);
-		if (s_bpffd >= 0) {
-			break;
-		}
-	}
-	if (s_bpffd < 0) {
-		fprintf(stderr,"E unable to open bpf device\n");
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-
-	fl = sizeof(s_pktReadBuf);
-	if (ioctl(s_bpffd,BIOCSBLEN,&fl) != 0) {
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-	const size_t readPktSize = (size_t)fl;
-	fl = 1;
-	if (ioctl(s_bpffd,BIOCIMMEDIATE,&fl) != 0) {
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-	fl = 0;
-	if (ioctl(s_bpffd,BIOCSSEESENT,&fl) != 0) {
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-	memset(&ifr,0,sizeof(ifr));
-	memcpy(ifr.ifr_name,s_peerDeviceName,IFNAMSIZ);
-	if (ioctl(s_bpffd,BIOCSETIF,&ifr) != 0) {
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-	fl = 1;
-	if (ioctl(s_bpffd,BIOCSHDRCMPLT,&fl) != 0) {
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-	fl = 1;
-	if (ioctl(s_bpffd,BIOCPROMISC,&fl) != 0) {
-		return ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE;
-	}
-
-	fprintf(stderr,"I %s %s %d.%d.%d.%d\n",s_deviceName,s_peerDeviceName,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION,ZEROTIER_ONE_VERSION_BUILD);
-
-	FD_ZERO(&rfds);
-	FD_ZERO(&wfds);
-	FD_ZERO(&efds);
-	long stdinReadPtr = 0;
-	for(;;) {
-		FD_SET(STDIN_FILENO,&rfds);
-		FD_SET(s_bpffd,&rfds);
-		if (select(s_bpffd+1,&rfds,&wfds,&efds,(struct timeval *)0) < 0) {
-			if ((errno == EAGAIN)||(errno == EINTR)) {
-				usleep(10);
-				continue;
-			}
-			return ZT_MACETHERNETTAPAGENT_EXIT_CODE_READ_ERROR;
-		}
-
-		if (FD_ISSET(s_bpffd,&rfds)) {
-			long n = (long)read(s_bpffd,s_pktReadBuf,readPktSize);
-			if (n > 0) {
-				for(unsigned char *p=s_pktReadBuf,*eof=p+n;p<eof;) {
-					struct bpf_hdr *h = (struct bpf_hdr *)p;
-					if ((h->bh_caplen > 0)&&((p + h->bh_hdrlen + h->bh_caplen) <= eof)) {
-						uint16_t len = (uint16_t)h->bh_caplen;
-						iov[0].iov_base = &len;
-						iov[0].iov_len = 2;
-						iov[1].iov_base = p + h->bh_hdrlen;
-						iov[1].iov_len = h->bh_caplen;
-						writev(STDOUT_FILENO,iov,2);
-					}
-					p += BPF_WORDALIGN(h->bh_hdrlen + h->bh_caplen);
-				}
-			}
-		}
-
-		if (FD_ISSET(STDIN_FILENO,&rfds)) {
-			long n = (long)read(STDIN_FILENO,s_stdinReadBuf + stdinReadPtr,sizeof(s_stdinReadBuf) - stdinReadPtr);
-			if (n > 0) {
-				stdinReadPtr += n;
-				while (stdinReadPtr >= 2) {
-					long len = *((uint16_t *)s_stdinReadBuf);
-					if (stdinReadPtr >= (len + 2)) {
-						if (len > 0) {
-							unsigned char *msg = s_stdinReadBuf + 2;
-
-							switch(msg[0]) {
-								case ZT_MACETHERNETTAPAGENT_STDIN_CMD_PACKET:
-									if (len > 1) {
-										if (write(s_ndrvfd,msg+1,len-1) < 0) {
-											fprintf(stderr,"E inject failed size==%ld errno==%d\n",len-1,errno);
-										}
-									}
-									break;
-
-								case ZT_MACETHERNETTAPAGENT_STDIN_CMD_IFCONFIG: {
-									char *args[16];
-									args[0] = P_IFCONFIG;
-									args[1] = s_deviceName;
-									int argNo = 2;
-									for(int argPtr=0,k=1,l=(int)len;k<l;++k) {
-										if (!msg[k]) {
-											if (argPtr > 0) {
-												argPtr = 0;
-												++argNo;
-												if (argNo >= 15) {
-													break;
-												}
-											}
-										} else {
-											if (argPtr == 0) {
-												args[argNo] = (char *)(msg + k);
-											}
-											argPtr++;
-										}
-									}
-									args[argNo] = (char *)0;
-									if (argNo > 2) {
-										pid_t pid = fork();
-										if (pid < 0) {
-											return -1;
-										} else if (pid == 0) {
-											dup2(STDERR_FILENO,STDOUT_FILENO);
-											execv(args[0],args);
-											_exit(-1);
-										}
-										int rv = 0;
-										waitpid(pid,&rv,0);
-									}
-								}	break;
-
-								case ZT_MACETHERNETTAPAGENT_STDIN_CMD_EXIT:
-									return ZT_MACETHERNETTAPAGENT_EXIT_CODE_SUCCESS;
-
-								default:
-									fprintf(stderr,"E unrecognized message type over pipe from host process: %d (length: %d)\n",(int)msg[0],(int)len);
-									break;
-							}
-						}
-
-						if (stdinReadPtr > (len + 2)) {
-							memmove(s_stdinReadBuf,s_stdinReadBuf + len + 2,stdinReadPtr -= (len + 2));
-						} else {
-							stdinReadPtr = 0;
-						}
-					} else {
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	return ZT_MACETHERNETTAPAGENT_EXIT_CODE_SUCCESS;
-}
diff --git a/osdep/MacEthernetTapAgent.h b/osdep/MacEthernetTapAgent.h
deleted file mode 100644
index da6e34195..000000000
--- a/osdep/MacEthernetTapAgent.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_MACETHERNETTAPAGENT_H
-#define ZT_MACETHERNETTAPAGENT_H
-
-#define ZT_MACETHERNETTAPAGENT_EXIT_CODE_SUCCESS 0
-#define ZT_MACETHERNETTAPAGENT_EXIT_CODE_INVALID_REQUEST -1
-#define ZT_MACETHERNETTAPAGENT_EXIT_CODE_UNABLE_TO_CREATE -2
-#define ZT_MACETHERNETTAPAGENT_EXIT_CODE_READ_ERROR -3
-
-#define ZT_MACETHERNETTAPAGENT_STDIN_CMD_PACKET 0
-#define ZT_MACETHERNETTAPAGENT_STDIN_CMD_IFCONFIG 1
-#define ZT_MACETHERNETTAPAGENT_STDIN_CMD_EXIT 2
-
-#define ZT_MACETHERNETTAPAGENT_DEFAULT_SYSTEM_PATH "/Library/Application Support/ZeroTier/One/MacEthernetTapAgent"
-
-#endif
diff --git a/osdep/MacKextEthernetTap.cpp b/osdep/MacKextEthernetTap.cpp
deleted file mode 100644
index b7fa97947..000000000
--- a/osdep/MacKextEthernetTap.cpp
+++ /dev/null
@@ -1,704 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "MacDNSHelper.hpp"
-
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/route.h>
-#include <netinet/icmp6.h>
-#include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet6/in6_var.h>
-#include <signal.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/cdefs.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-// OSX compile fix... in6_var defines this in a struct which namespaces it for C++ ... why?!?
-struct prf_ra {
-	u_char onlink : 1;
-	u_char autonomous : 1;
-	u_char reserved : 6;
-} prf_ra;
-
-#include <ifaddrs.h>
-#include <netinet6/nd6.h>
-
-// These are KERNEL_PRIVATE... why?
-#ifndef SIOCAUTOCONF_START
-#define SIOCAUTOCONF_START _IOWR('i', 132, struct in6_ifreq) /* accept rtadvd on this interface */
-#endif
-#ifndef SIOCAUTOCONF_STOP
-#define SIOCAUTOCONF_STOP _IOWR('i', 133, struct in6_ifreq) /* stop accepting rtadv for this interface */
-#endif
-
-// --------------------------------------------------------------------------
-// --------------------------------------------------------------------------
-// This source is from:
-// http://www.opensource.apple.com/source/Libinfo/Libinfo-406.17/gen.subproj/getifmaddrs.c?txt
-// It's here because OSX 10.6 does not have this convenience function.
-
-#define SALIGN		   (sizeof(uint32_t) - 1)
-#define SA_RLEN(sa)	   ((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : (SALIGN + 1))
-#define MAX_SYSCTL_TRY 5
-#define RTA_MASKS	   (RTA_GATEWAY | RTA_IFP | RTA_IFA)
-
-/* FreeBSD uses NET_RT_IFMALIST and RTM_NEWMADDR from <sys/socket.h> */
-/* We can use NET_RT_IFLIST2 and RTM_NEWMADDR2 on Darwin */
-// #define DARWIN_COMPAT
-
-// #ifdef DARWIN_COMPAT
-#define GIM_SYSCTL_MIB NET_RT_IFLIST2
-#define GIM_RTM_ADDR   RTM_NEWMADDR2
-// #else
-// #define GIM_SYSCTL_MIB NET_RT_IFMALIST
-// #define GIM_RTM_ADDR RTM_NEWMADDR
-// #endif
-
-// Not in 10.6 includes so use our own
-struct _intl_ifmaddrs {
-	struct _intl_ifmaddrs* ifma_next;
-	struct sockaddr* ifma_name;
-	struct sockaddr* ifma_addr;
-	struct sockaddr* ifma_lladdr;
-};
-
-static inline int _intl_getifmaddrs(struct _intl_ifmaddrs** pif)
-{
-	int icnt = 1;
-	int dcnt = 0;
-	int ntry = 0;
-	size_t len;
-	size_t needed;
-	int mib[6];
-	int i;
-	char* buf;
-	char* data;
-	char* next;
-	char* p;
-	struct ifma_msghdr2* ifmam;
-	struct _intl_ifmaddrs *ifa, *ift;
-	struct rt_msghdr* rtm;
-	struct sockaddr* sa;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0; /* protocol */
-	mib[3] = 0; /* wildcard address family */
-	mib[4] = GIM_SYSCTL_MIB;
-	mib[5] = 0; /* no flags */
-	do {
-		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-			return (-1);
-		if ((buf = (char*)malloc(needed)) == NULL)
-			return (-1);
-		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
-				free(buf);
-				return (-1);
-			}
-			free(buf);
-			buf = NULL;
-		}
-	} while (buf == NULL);
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr*)(void*)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-			case GIM_RTM_ADDR:
-				ifmam = (struct ifma_msghdr2*)(void*)rtm;
-				if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
-					break;
-				icnt++;
-				p = (char*)(ifmam + 1);
-				for (i = 0; i < RTAX_MAX; i++) {
-					if ((RTA_MASKS & ifmam->ifmam_addrs & (1 << i)) == 0)
-						continue;
-					sa = (struct sockaddr*)(void*)p;
-					len = SA_RLEN(sa);
-					dcnt += len;
-					p += len;
-				}
-				break;
-		}
-	}
-
-	data = (char*)malloc(sizeof(struct _intl_ifmaddrs) * icnt + dcnt);
-	if (data == NULL) {
-		free(buf);
-		return (-1);
-	}
-
-	ifa = (struct _intl_ifmaddrs*)(void*)data;
-	data += sizeof(struct _intl_ifmaddrs) * icnt;
-
-	memset(ifa, 0, sizeof(struct _intl_ifmaddrs) * icnt);
-	ift = ifa;
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr*)(void*)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-
-		switch (rtm->rtm_type) {
-			case GIM_RTM_ADDR:
-				ifmam = (struct ifma_msghdr2*)(void*)rtm;
-				if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
-					break;
-
-				p = (char*)(ifmam + 1);
-				for (i = 0; i < RTAX_MAX; i++) {
-					if ((RTA_MASKS & ifmam->ifmam_addrs & (1 << i)) == 0)
-						continue;
-					sa = (struct sockaddr*)(void*)p;
-					len = SA_RLEN(sa);
-					switch (i) {
-						case RTAX_GATEWAY:
-							ift->ifma_lladdr = (struct sockaddr*)(void*)data;
-							memcpy(data, p, len);
-							data += len;
-							break;
-
-						case RTAX_IFP:
-							ift->ifma_name = (struct sockaddr*)(void*)data;
-							memcpy(data, p, len);
-							data += len;
-							break;
-
-						case RTAX_IFA:
-							ift->ifma_addr = (struct sockaddr*)(void*)data;
-							memcpy(data, p, len);
-							data += len;
-							break;
-
-						default:
-							data += len;
-							break;
-					}
-					p += len;
-				}
-				ift->ifma_next = ift + 1;
-				ift = ift->ifma_next;
-				break;
-		}
-	}
-
-	free(buf);
-
-	if (ift > ifa) {
-		ift--;
-		ift->ifma_next = NULL;
-		*pif = ifa;
-	}
-	else {
-		*pif = NULL;
-		free(ifa);
-	}
-	return (0);
-}
-
-static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs* ifmp)
-{
-	free(ifmp);
-}
-
-// --------------------------------------------------------------------------
-// --------------------------------------------------------------------------
-
-#include "../node/Constants.hpp"
-#include "../node/Dictionary.hpp"
-#include "../node/Mutex.hpp"
-#include "../node/Utils.hpp"
-#include "MacKextEthernetTap.hpp"
-#include "OSUtils.hpp"
-
-#include <algorithm>
-#include <map>
-#include <set>
-#include <string>
-
-// ff:ff:ff:ff:ff:ff with no ADI
-static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff), 0);
-
-static inline bool _setIpv6Stuff(const char* ifname, bool performNUD, bool acceptRouterAdverts)
-{
-	struct in6_ndireq nd;
-	struct in6_ifreq ifr;
-
-	int s = socket(AF_INET6, SOCK_DGRAM, 0);
-	if (s <= 0)
-		return false;
-
-	memset(&nd, 0, sizeof(nd));
-	strncpy(nd.ifname, ifname, sizeof(nd.ifname));
-
-	if (ioctl(s, SIOCGIFINFO_IN6, &nd)) {
-		close(s);
-		return false;
-	}
-
-	unsigned long oldFlags = (unsigned long)nd.ndi.flags;
-
-	if (performNUD)
-		nd.ndi.flags |= ND6_IFF_PERFORMNUD;
-	else
-		nd.ndi.flags &= ~ND6_IFF_PERFORMNUD;
-
-	if (oldFlags != (unsigned long)nd.ndi.flags) {
-		if (ioctl(s, SIOCSIFINFO_FLAGS, &nd)) {
-			close(s);
-			return false;
-		}
-	}
-
-	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-	if (ioctl(s, acceptRouterAdverts ? SIOCAUTOCONF_START : SIOCAUTOCONF_STOP, &ifr)) {
-		close(s);
-		return false;
-	}
-
-	close(s);
-	return true;
-}
-
-namespace ZeroTier {
-
-static long globalTapsRunning = 0;
-static Mutex globalTapCreateLock;
-
-MacKextEthernetTap::MacKextEthernetTap(
-	const char* homePath,
-	const MAC& mac,
-	unsigned int mtu,
-	unsigned int metric,
-	uint64_t nwid,
-	const char* friendlyName,
-	void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void* data, unsigned int len),
-	void* arg)
-	: _handler(handler)
-	, _arg(arg)
-	, _nwid(nwid)
-	, _homePath(homePath)
-	, _mtu(mtu)
-	, _metric(metric)
-	, _fd(0)
-	, _enabled(true)
-{
-	char devpath[64], ethaddr[64], mtustr[32], metstr[32], nwids[32];
-	struct stat stattmp;
-
-	OSUtils::ztsnprintf(nwids, sizeof(nwids), "%.16llx", nwid);
-
-	Mutex::Lock _gl(globalTapCreateLock);
-
-	if (::stat("/dev/zt0", &stattmp)) {
-		long kextpid = (long)fork();
-		if (kextpid == 0) {
-			::chdir(homePath);
-			OSUtils::redirectUnixOutputs("/dev/null", (const char*)0);
-			::execl("/sbin/kextload", "/sbin/kextload", "-q", "-repository", homePath, "tap.kext", (const char*)0);
-			::_exit(-1);
-		}
-		else if (kextpid > 0) {
-			int exitcode = -1;
-			::waitpid(kextpid, &exitcode, 0);
-		}
-		::usleep(500);	 // give tap device driver time to start up and try again
-		if (::stat("/dev/zt0", &stattmp))
-			throw std::runtime_error("/dev/zt# tap devices do not exist and cannot load tap.kext");
-	}
-
-	// Try to reopen the last device we had, if we had one and it's still unused.
-	std::map<std::string, std::string> globalDeviceMap;
-	FILE* devmapf = fopen((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(), "r");
-	if (devmapf) {
-		char buf[256];
-		while (fgets(buf, sizeof(buf), devmapf)) {
-			char* x = (char*)0;
-			char* y = (char*)0;
-			char* saveptr = (char*)0;
-			for (char* f = Utils::stok(buf, "\r\n=", &saveptr); (f); f = Utils::stok((char*)0, "\r\n=", &saveptr)) {
-				if (! x)
-					x = f;
-				else if (! y)
-					y = f;
-				else
-					break;
-			}
-			if ((x) && (y) && (x[0]) && (y[0]))
-				globalDeviceMap[x] = y;
-		}
-		fclose(devmapf);
-	}
-	bool recalledDevice = false;
-	std::map<std::string, std::string>::const_iterator gdmEntry = globalDeviceMap.find(nwids);
-	if (gdmEntry != globalDeviceMap.end()) {
-		std::string devpath("/dev/");
-		devpath.append(gdmEntry->second);
-		if (stat(devpath.c_str(), &stattmp) == 0) {
-			_fd = ::open(devpath.c_str(), O_RDWR);
-			if (_fd > 0) {
-				_dev = gdmEntry->second;
-				recalledDevice = true;
-			}
-		}
-	}
-
-	// Open the first unused tap device if we didn't recall a previous one.
-	if (! recalledDevice) {
-		for (int i = 0; i < 64; ++i) {
-			OSUtils::ztsnprintf(devpath, sizeof(devpath), "/dev/zt%d", i);
-			if (stat(devpath, &stattmp))
-				throw std::runtime_error("no more TAP devices available");
-			_fd = ::open(devpath, O_RDWR);
-			if (_fd > 0) {
-				char foo[16];
-				OSUtils::ztsnprintf(foo, sizeof(foo), "zt%d", i);
-				_dev = foo;
-				break;
-			}
-		}
-	}
-
-	if (_fd <= 0)
-		throw std::runtime_error("unable to open TAP device or no more devices available");
-
-	if (fcntl(_fd, F_SETFL, fcntl(_fd, F_GETFL) & ~O_NONBLOCK) == -1) {
-		::close(_fd);
-		throw std::runtime_error("unable to set flags on file descriptor for TAP device");
-	}
-
-	// Configure MAC address and MTU, bring interface up
-	OSUtils::ztsnprintf(ethaddr, sizeof(ethaddr), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", (int)mac[0], (int)mac[1], (int)mac[2], (int)mac[3], (int)mac[4], (int)mac[5]);
-	OSUtils::ztsnprintf(mtustr, sizeof(mtustr), "%u", _mtu);
-	OSUtils::ztsnprintf(metstr, sizeof(metstr), "%u", _metric);
-	long cpid = (long)fork();
-	if (cpid == 0) {
-		::execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "lladdr", ethaddr, "mtu", mtustr, "metric", metstr, "up", (const char*)0);
-		::_exit(-1);
-	}
-	else if (cpid > 0) {
-		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
-		if (exitcode) {
-			::close(_fd);
-			throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
-		}
-	}
-
-	_setIpv6Stuff(_dev.c_str(), true, false);
-
-	// Set close-on-exec so that devices cannot persist if we fork/exec for update
-	fcntl(_fd, F_SETFD, fcntl(_fd, F_GETFD) | FD_CLOEXEC);
-
-	::pipe(_shutdownSignalPipe);
-
-	++globalTapsRunning;
-
-	globalDeviceMap[nwids] = _dev;
-	devmapf = fopen((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(), "w");
-	if (devmapf) {
-		gdmEntry = globalDeviceMap.begin();
-		while (gdmEntry != globalDeviceMap.end()) {
-			fprintf(devmapf, "%s=%s\n", gdmEntry->first.c_str(), gdmEntry->second.c_str());
-			++gdmEntry;
-		}
-		fclose(devmapf);
-	}
-
-	_thread = Thread::start(this);
-}
-
-MacKextEthernetTap::~MacKextEthernetTap()
-{
-	MacDNSHelper::removeDNS(_nwid);
-
-	::write(_shutdownSignalPipe[1], "\0", 1);	// causes thread to exit
-	Thread::join(_thread);
-	for (std::thread& t : _rxThreads) {
-		t.join();
-	}
-	::close(_fd);
-	::close(_shutdownSignalPipe[0]);
-	::close(_shutdownSignalPipe[1]);
-
-	{
-		Mutex::Lock _gl(globalTapCreateLock);
-		if (--globalTapsRunning <= 0) {
-			globalTapsRunning = 0;	 // sanity check -- should not be possible
-
-			char tmp[16384];
-			sprintf(tmp, "%s/%s", _homePath.c_str(), "tap.kext");
-			long kextpid = (long)fork();
-			if (kextpid == 0) {
-				OSUtils::redirectUnixOutputs("/dev/null", (const char*)0);
-				::execl("/sbin/kextunload", "/sbin/kextunload", tmp, (const char*)0);
-				::_exit(-1);
-			}
-			else if (kextpid > 0) {
-				int exitcode = -1;
-				::waitpid(kextpid, &exitcode, 0);
-			}
-		}
-	}
-}
-
-void MacKextEthernetTap::setEnabled(bool en)
-{
-	_enabled = en;
-	// TODO: interface status change
-}
-
-bool MacKextEthernetTap::enabled() const
-{
-	return _enabled;
-}
-
-bool MacKextEthernetTap::addIp(const InetAddress& ip)
-{
-	if (! ip)
-		return false;
-
-	long cpid = (long)fork();
-	if (cpid == 0) {
-		char tmp[128];
-		::execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), (ip.ss_family == AF_INET6) ? "inet6" : "inet", ip.toString(tmp), "alias", (const char*)0);
-		::_exit(-1);
-	}
-	else if (cpid > 0) {
-		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
-		return (exitcode == 0);
-	}	// else return false...
-
-	return false;
-}
-
-bool MacKextEthernetTap::removeIp(const InetAddress& ip)
-{
-	if (! ip)
-		return true;
-	std::vector<InetAddress> allIps(ips());
-	for (std::vector<InetAddress>::iterator i(allIps.begin()); i != allIps.end(); ++i) {
-		if (*i == ip) {
-			long cpid = (long)fork();
-			if (cpid == 0) {
-				char tmp[128];
-				execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), (ip.ss_family == AF_INET6) ? "inet6" : "inet", ip.toIpString(tmp), "-alias", (const char*)0);
-				_exit(-1);
-			}
-			else if (cpid > 0) {
-				int exitcode = -1;
-				waitpid(cpid, &exitcode, 0);
-				return (exitcode == 0);
-			}
-		}
-	}
-	return false;
-}
-
-std::vector<InetAddress> MacKextEthernetTap::ips() const
-{
-	struct ifaddrs* ifa = (struct ifaddrs*)0;
-	if (getifaddrs(&ifa))
-		return std::vector<InetAddress>();
-
-	std::vector<InetAddress> r;
-
-	struct ifaddrs* p = ifa;
-	while (p) {
-		if ((! strcmp(p->ifa_name, _dev.c_str())) && (p->ifa_addr) && (p->ifa_netmask) && (p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
-			switch (p->ifa_addr->sa_family) {
-				case AF_INET: {
-					struct sockaddr_in* sin = (struct sockaddr_in*)p->ifa_addr;
-					struct sockaddr_in* nm = (struct sockaddr_in*)p->ifa_netmask;
-					r.push_back(InetAddress(&(sin->sin_addr.s_addr), 4, Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
-				} break;
-				case AF_INET6: {
-					struct sockaddr_in6* sin = (struct sockaddr_in6*)p->ifa_addr;
-					struct sockaddr_in6* nm = (struct sockaddr_in6*)p->ifa_netmask;
-					uint32_t b[4];
-					memcpy(b, nm->sin6_addr.s6_addr, sizeof(b));
-					r.push_back(InetAddress(sin->sin6_addr.s6_addr, 16, Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
-				} break;
-			}
-		}
-		p = p->ifa_next;
-	}
-
-	if (ifa)
-		freeifaddrs(ifa);
-
-	std::sort(r.begin(), r.end());
-	r.erase(std::unique(r.begin(), r.end()), r.end());
-
-	return r;
-}
-
-void MacKextEthernetTap::put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len)
-{
-	char putBuf[ZT_MAX_MTU + 64];
-	if ((_fd > 0) && (len <= _mtu) && (_enabled)) {
-		to.copyTo(putBuf, 6);
-		from.copyTo(putBuf + 6, 6);
-		*((uint16_t*)(putBuf + 12)) = htons((uint16_t)etherType);
-		memcpy(putBuf + 14, data, len);
-		len += 14;
-		::write(_fd, putBuf, len);
-	}
-}
-
-std::string MacKextEthernetTap::deviceName() const
-{
-	return _dev;
-}
-
-void MacKextEthernetTap::setFriendlyName(const char* friendlyName)
-{
-}
-
-void MacKextEthernetTap::scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed)
-{
-	std::vector<MulticastGroup> newGroups;
-
-	struct _intl_ifmaddrs* ifmap = (struct _intl_ifmaddrs*)0;
-	if (! _intl_getifmaddrs(&ifmap)) {
-		struct _intl_ifmaddrs* p = ifmap;
-		while (p) {
-			if (p->ifma_addr->sa_family == AF_LINK) {
-				struct sockaddr_dl* in = (struct sockaddr_dl*)p->ifma_name;
-				struct sockaddr_dl* la = (struct sockaddr_dl*)p->ifma_addr;
-				if ((la->sdl_alen == 6) && (in->sdl_nlen <= _dev.length()) && (! memcmp(_dev.data(), in->sdl_data, in->sdl_nlen)))
-					newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen, 6), 0));
-			}
-			p = p->ifma_next;
-		}
-		_intl_freeifmaddrs(ifmap);
-	}
-
-	std::vector<InetAddress> allIps(ips());
-	for (std::vector<InetAddress>::iterator ip(allIps.begin()); ip != allIps.end(); ++ip)
-		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
-
-	std::sort(newGroups.begin(), newGroups.end());
-	std::unique(newGroups.begin(), newGroups.end());
-
-	for (std::vector<MulticastGroup>::iterator m(newGroups.begin()); m != newGroups.end(); ++m) {
-		if (! std::binary_search(_multicastGroups.begin(), _multicastGroups.end(), *m))
-			added.push_back(*m);
-	}
-	for (std::vector<MulticastGroup>::iterator m(_multicastGroups.begin()); m != _multicastGroups.end(); ++m) {
-		if (! std::binary_search(newGroups.begin(), newGroups.end(), *m))
-			removed.push_back(*m);
-	}
-
-	_multicastGroups.swap(newGroups);
-}
-
-void MacKextEthernetTap::setMtu(unsigned int mtu)
-{
-	if (mtu != _mtu) {
-		_mtu = mtu;
-		long cpid = (long)fork();
-		if (cpid == 0) {
-			char tmp[64];
-			OSUtils::ztsnprintf(tmp, sizeof(tmp), "%u", mtu);
-			execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "mtu", tmp, (const char*)0);
-			_exit(-1);
-		}
-		else if (cpid > 0) {
-			int exitcode = -1;
-			waitpid(cpid, &exitcode, 0);
-		}
-	}
-}
-
-void MacKextEthernetTap::threadMain() throw()
-{
-	fd_set readfds, nullfds;
-	MAC to, from;
-	int n, nfds, r;
-	char getBuf[ZT_MAX_MTU + 64];
-
-	Thread::sleep(500);
-
-	FD_ZERO(&readfds);
-	FD_ZERO(&nullfds);
-	nfds = (int)std::max(_shutdownSignalPipe[0], _fd) + 1;
-
-	r = 0;
-	for (;;) {
-		FD_SET(_shutdownSignalPipe[0], &readfds);
-		FD_SET(_fd, &readfds);
-		select(nfds, &readfds, &nullfds, &nullfds, (struct timeval*)0);
-
-		if (FD_ISSET(_shutdownSignalPipe[0], &readfds))	  // writes to shutdown pipe terminate thread
-			break;
-
-		if (FD_ISSET(_fd, &readfds)) {
-			n = (int)::read(_fd, getBuf + r, sizeof(getBuf) - r);
-			if (n < 0) {
-				if ((errno != EINTR) && (errno != ETIMEDOUT))
-					break;
-			}
-			else {
-				// Some tap drivers like to send the ethernet frame and the
-				// payload in two chunks, so handle that by accumulating
-				// data until we have at least a frame.
-				r += n;
-				if (r > 14) {
-					if (r > ((int)_mtu + 14))	// sanity check for weird TAP behavior on some platforms
-						r = _mtu + 14;
-
-					if (_enabled) {
-						to.setTo(getBuf, 6);
-						from.setTo(getBuf + 6, 6);
-						unsigned int etherType = ntohs(((const uint16_t*)getBuf)[6]);
-						// TODO: VLAN support
-						_handler(_arg, (void*)0, _nwid, from, to, etherType, 0, (const void*)(getBuf + 14), r - 14);
-					}
-
-					r = 0;
-				}
-			}
-		}
-	}
-}
-
-void MacKextEthernetTap::setDns(const char* domain, const std::vector<InetAddress>& servers)
-{
-	MacDNSHelper::setDNS(_nwid, domain, servers);
-}
-
-}	// namespace ZeroTier
diff --git a/osdep/MacKextEthernetTap.hpp b/osdep/MacKextEthernetTap.hpp
deleted file mode 100644
index aac51c32f..000000000
--- a/osdep/MacKextEthernetTap.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_MacKextEthernetTap_HPP
-#define ZT_MacKextEthernetTap_HPP
-
-#include "../node/Constants.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/MAC.hpp"
-#include "../node/MulticastGroup.hpp"
-#include "EthernetTap.hpp"
-#include "Thread.hpp"
-
-#include <stdexcept>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string>
-#include <thread>
-#include <vector>
-
-namespace ZeroTier {
-
-class MacKextEthernetTap : public EthernetTap {
-  public:
-	MacKextEthernetTap(
-		const char* homePath,
-		const MAC& mac,
-		unsigned int mtu,
-		unsigned int metric,
-		uint64_t nwid,
-		const char* friendlyName,
-		void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-		void* arg);
-
-	virtual ~MacKextEthernetTap();
-
-	virtual void setEnabled(bool en);
-	virtual bool enabled() const;
-	virtual bool addIp(const InetAddress& ip);
-	virtual bool removeIp(const InetAddress& ip);
-	virtual std::vector<InetAddress> ips() const;
-	virtual void put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len);
-	virtual std::string deviceName() const;
-	virtual void setFriendlyName(const char* friendlyName);
-	virtual void scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed);
-	virtual void setMtu(unsigned int mtu);
-	virtual void setDns(const char* domain, const std::vector<InetAddress>& servers);
-
-	void threadMain() throw();
-
-  private:
-	void (*_handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int);
-	void* _arg;
-	uint64_t _nwid;
-	Thread _thread;
-	std::string _homePath;
-	std::string _dev;
-	std::vector<MulticastGroup> _multicastGroups;
-	unsigned int _mtu;
-	unsigned int _metric;
-	int _fd;
-	int _shutdownSignalPipe[2];
-	volatile bool _enabled;
-	std::vector<std::thread> _rxThreads;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp
deleted file mode 100644
index 9d0245565..000000000
--- a/osdep/ManagedRoute.cpp
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "../node/Constants.hpp"
-#include "../osdep/OSUtils.hpp"
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __WINDOWS__
-#include <IPHlpApi.h>
-#include <netioapi.h>
-#include <windows.h>
-#include <winsock2.h>
-#endif
-
-#ifdef __UNIX_LIKE__
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#ifndef ZT_SDK
-#include <net/route.h>
-#endif
-#include <net/if.h>
-#ifdef __BSD__
-#include <net/if_dl.h>
-#include <sys/sysctl.h>
-#endif
-#include <ifaddrs.h>
-#endif
-
-#include "ManagedRoute.hpp"
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-#ifdef __LINUX__
-#include "ExtOsdep.hpp"
-#include "LinuxNetLink.hpp"
-#endif
-
-#define ZT_BSD_ROUTE_CMD "/sbin/route"
-
-namespace ZeroTier {
-
-namespace {
-
-// Fork a target into two more specific targets e.g. 0.0.0.0/0 -> 0.0.0.0/1, 128.0.0.0/1
-// If the target is already maximally-specific, 'right' will be unchanged and 'left' will be 't'
-static void _forkTarget(const InetAddress& t, InetAddress& left, InetAddress& right)
-{
-	const unsigned int bits = t.netmaskBits() + 1;
-	left = t;
-	if (t.ss_family == AF_INET) {
-		if (bits <= 32) {
-			left.setPort(bits);
-			right = t;
-			reinterpret_cast<struct sockaddr_in*>(&right)->sin_addr.s_addr ^= Utils::hton((uint32_t)(1 << (32 - bits)));
-			right.setPort(bits);
-		}
-		else {
-			right.zero();
-		}
-	}
-	else if (t.ss_family == AF_INET6) {
-		if (bits <= 128) {
-			left.setPort(bits);
-			right = t;
-			uint8_t* b = reinterpret_cast<uint8_t*>(reinterpret_cast<struct sockaddr_in6*>(&right)->sin6_addr.s6_addr);
-			b[bits / 8] ^= 1 << (8 - (bits % 8));
-			right.setPort(bits);
-		}
-		else {
-			right.zero();
-		}
-	}
-}
-
-struct _RTE {
-	InetAddress target;
-	InetAddress via;
-	char device[128];
-	int metric;
-	bool ifscope;
-	bool isDefault;
-};
-
-#ifdef __BSD__	 // ------------------------------------------------------------
-#define ZT_ROUTING_SUPPORT_FOUND 1
-
-#ifndef ZT_SDK
-static std::vector<_RTE> _getRTEs(const InetAddress& target, bool contains)
-{
-	std::vector<_RTE> rtes;
-	int mib[6];
-	size_t needed;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;
-	mib[3] = 0;
-	mib[4] = NET_RT_DUMP;
-	mib[5] = 0;
-	if (! sysctl(mib, 6, NULL, &needed, NULL, 0)) {
-		if (needed <= 0)
-			return rtes;
-
-		char* buf = (char*)::malloc(needed);
-		if (buf) {
-			if (! sysctl(mib, 6, buf, &needed, NULL, 0)) {
-				struct rt_msghdr* rtm;
-				for (char *next = buf, *end = buf + needed; next < end;) {
-					rtm = (struct rt_msghdr*)next;
-					char* saptr = (char*)(rtm + 1);
-					char* saend = next + rtm->rtm_msglen;
-
-					InetAddress sa_t, sa_v;
-					int deviceIndex = -9999;
-					bool isDefault = false;
-
-					if (((rtm->rtm_flags & RTF_LLINFO) == 0) && ((rtm->rtm_flags & RTF_HOST) == 0) && ((rtm->rtm_flags & RTF_UP) != 0) && ((rtm->rtm_flags & RTF_MULTICAST) == 0)) {
-						int which = 0;
-						while (saptr < saend) {
-							struct sockaddr* sa = (struct sockaddr*)saptr;
-							unsigned int salen = sa->sa_len;
-							if (! salen)
-								break;
-
-							// Skip missing fields in rtm_addrs bit field
-							while ((rtm->rtm_addrs & 1) == 0) {
-								rtm->rtm_addrs >>= 1;
-								++which;
-								if (which > 6)
-									break;
-							}
-							if (which > 6)
-								break;
-
-							rtm->rtm_addrs >>= 1;
-							switch (which++) {
-								case 0:
-									// printf("RTA_DST\n");
-									if (sa->sa_family == AF_INET6) {
-										struct sockaddr_in6* sin6 = (struct sockaddr_in6*)sa;
-										if ((sin6->sin6_addr.s6_addr[0] == 0xfe) && ((sin6->sin6_addr.s6_addr[1] & 0xc0) == 0x80)) {
-											// BSD uses this fucking strange in-band signaling method to encode device scope IDs for IPv6 addresses... probably a holdover from very early versions of the spec.
-											unsigned int interfaceIndex = ((((unsigned int)sin6->sin6_addr.s6_addr[2]) << 8) & 0xff) | (((unsigned int)sin6->sin6_addr.s6_addr[3]) & 0xff);
-											sin6->sin6_addr.s6_addr[2] = 0;
-											sin6->sin6_addr.s6_addr[3] = 0;
-											if (! sin6->sin6_scope_id)
-												sin6->sin6_scope_id = interfaceIndex;
-										}
-
-#ifdef __APPLE__
-										isDefault = IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr) && ! (rtm->rtm_flags & RTF_IFSCOPE);
-#endif
-									}
-									else {
-										struct sockaddr_in* sin4 = (struct sockaddr_in*)sa;
-										isDefault = sin4->sin_addr.s_addr == 0;
-									}
-									sa_t = *sa;
-									break;
-								case 1:
-									// printf("RTA_GATEWAY\n");
-									switch (sa->sa_family) {
-										case AF_LINK:
-											// deviceIndex = (int)((const struct sockaddr_dl *)sa)->sdl_index;
-										case AF_INET:
-										case AF_INET6:
-											sa_v = *sa;
-											break;
-									}
-									break;
-								case 2: {
-									// printf("RTA_NETMASK\n");
-									if (sa_t.ss_family == AF_INET6) {
-										salen = sizeof(struct sockaddr_in6);
-										unsigned int bits = 0;
-										for (int i = 0; i < 16; ++i) {
-											unsigned char c = (unsigned char)((const struct sockaddr_in6*)sa)->sin6_addr.s6_addr[i];
-											if (c == 0xff)
-												bits += 8;
-											else
-												break;
-										}
-										sa_t.setPort(bits);
-									}
-									else if (sa_t.ss_family == AF_INET) {
-										salen = sizeof(struct sockaddr_in);
-										sa_t.setPort((unsigned int)Utils::countBits((uint32_t)((const struct sockaddr_in*)sa)->sin_addr.s_addr));
-									}
-								} break;
-									/*
-									case 3:
-										//printf("RTA_GENMASK\n");
-										break;
-									case 4:
-										//printf("RTA_IFP\n");
-										break;
-									case 5:
-										//printf("RTA_IFA\n");
-										break;
-									case 6:
-										//printf("RTA_AUTHOR\n");
-										break;
-									*/
-							}
-
-							saptr += salen;
-						}
-
-						deviceIndex = rtm->rtm_index;
-
-						if (((contains) && (sa_t.containsAddress(target))) || (sa_t == target)) {
-							rtes.push_back(_RTE());
-							rtes.back().target = sa_t;
-							rtes.back().via = sa_v;
-							rtes.back().isDefault = isDefault;
-							if (deviceIndex >= 0) {
-								if_indextoname(deviceIndex, rtes.back().device);
-							}
-							else {
-								rtes.back().device[0] = (char)0;
-							}
-							rtes.back().metric = ((int)rtm->rtm_rmx.rmx_hopcount < 0) ? 0 : (int)rtm->rtm_rmx.rmx_hopcount;
-						}
-					}
-
-					next = saend;
-				}
-			}
-
-			::free(buf);
-		}
-	}
-
-	return rtes;
-}
-#endif
-
-static void _routeCmd(const char* op, const InetAddress& target, const InetAddress& via, const char* ifscope, const char* localInterface)
-{
-	// char f1[1024],f2[1024]; printf("cmd %s %s %s %s %s\n",op,target.toString(f1),via.toString(f2),ifscope,localInterface);
-	long p = (long)fork();
-	if (p > 0) {
-		int exitcode = -1;
-		::waitpid(p, &exitcode, 0);
-	}
-	else if (p == 0) {
-		::close(STDOUT_FILENO);
-		::close(STDERR_FILENO);
-		char ttmp[64];
-		char iptmp[64];
-		if (via) {
-			if ((ifscope) && (ifscope[0])) {
-#ifdef ZT_TRACE
-				fprintf(stderr, "DEBUG: route %s -ifscope %s %s %s" ZT_EOL_S, ifscope, ((target.ss_family == AF_INET6) ? "-inet6" : "-inet"), target.toString(ttmp), via.toIpString(iptmp));
-#endif
-				::execl(ZT_BSD_ROUTE_CMD, ZT_BSD_ROUTE_CMD, op, "-ifscope", ifscope, ((target.ss_family == AF_INET6) ? "-inet6" : "-inet"), target.toString(ttmp), via.toIpString(iptmp), (const char*)0);
-			}
-			else {
-#ifdef ZT_TRACE
-				fprintf(stderr, "DEBUG: route %s %s %s %s" ZT_EOL_S, op, ((target.ss_family == AF_INET6) ? "-inet6" : "-inet"), target.toString(ttmp), via.toIpString(iptmp));
-#endif
-				::execl(ZT_BSD_ROUTE_CMD, ZT_BSD_ROUTE_CMD, op, ((target.ss_family == AF_INET6) ? "-inet6" : "-inet"), target.toString(ttmp), via.toIpString(iptmp), (const char*)0);
-			}
-		}
-		else if ((localInterface) && (localInterface[0])) {
-			if ((ifscope) && (ifscope[0])) {
-#ifdef ZT_TRACE
-				fprintf(stderr, "DEBUG: route %s -ifscope %s %s %s -interface %s" ZT_EOL_S, op, ifscope, ((target.ss_family == AF_INET6) ? "-inet6" : "-inet"), target.toString(ttmp), localInterface);
-#endif
-				::execl(ZT_BSD_ROUTE_CMD, ZT_BSD_ROUTE_CMD, op, "-ifscope", ifscope, ((target.ss_family == AF_INET6) ? "-inet6" : "-inet"), target.toString(ttmp), "-interface", localInterface, (const char*)0);
-			}
-			else {
-#ifdef ZT_TRACE
-				fprintf(stderr, "DEBUG: route %s %s %s -interface %s" ZT_EOL_S, op, ((target.ss_family == AF_INET6) ? "-inet6" : "-inet"), target.toString(ttmp), localInterface);
-#endif
-				::execl(ZT_BSD_ROUTE_CMD, ZT_BSD_ROUTE_CMD, op, ((target.ss_family == AF_INET6) ? "-inet6" : "-inet"), target.toString(ttmp), "-interface", localInterface, (const char*)0);
-			}
-		}
-		::_exit(-1);
-	}
-}
-
-#endif	 // __BSD__ ------------------------------------------------------------
-
-#ifdef __LINUX__   // ----------------------------------------------------------
-#define ZT_ROUTING_SUPPORT_FOUND 1
-
-// This has been replaced by LinuxNetLink
-
-#endif	 // __LINUX__ ----------------------------------------------------------
-
-#ifdef __WINDOWS__	 // --------------------------------------------------------
-#define ZT_ROUTING_SUPPORT_FOUND 1
-
-static bool _winRoute(bool del, const NET_LUID& interfaceLuid, const NET_IFINDEX& interfaceIndex, const InetAddress& target, const InetAddress& via)
-{
-	MIB_IPFORWARD_ROW2 rtrow;
-	InitializeIpForwardEntry(&rtrow);
-	rtrow.InterfaceLuid.Value = interfaceLuid.Value;
-	rtrow.InterfaceIndex = interfaceIndex;
-	if (target.ss_family == AF_INET) {
-		rtrow.DestinationPrefix.Prefix.si_family = AF_INET;
-		rtrow.DestinationPrefix.Prefix.Ipv4.sin_family = AF_INET;
-		rtrow.DestinationPrefix.Prefix.Ipv4.sin_addr.S_un.S_addr = reinterpret_cast<const struct sockaddr_in*>(&target)->sin_addr.S_un.S_addr;
-		if (via.ss_family == AF_INET) {
-			rtrow.NextHop.si_family = AF_INET;
-			rtrow.NextHop.Ipv4.sin_family = AF_INET;
-			rtrow.NextHop.Ipv4.sin_addr.S_un.S_addr = reinterpret_cast<const struct sockaddr_in*>(&via)->sin_addr.S_un.S_addr;
-		}
-	}
-	else if (target.ss_family == AF_INET6) {
-		rtrow.DestinationPrefix.Prefix.si_family = AF_INET6;
-		rtrow.DestinationPrefix.Prefix.Ipv6.sin6_family = AF_INET6;
-		memcpy(rtrow.DestinationPrefix.Prefix.Ipv6.sin6_addr.u.Byte, reinterpret_cast<const struct sockaddr_in6*>(&target)->sin6_addr.u.Byte, 16);
-		if (via.ss_family == AF_INET6) {
-			rtrow.NextHop.si_family = AF_INET6;
-			rtrow.NextHop.Ipv6.sin6_family = AF_INET6;
-			memcpy(rtrow.NextHop.Ipv6.sin6_addr.u.Byte, reinterpret_cast<const struct sockaddr_in6*>(&via)->sin6_addr.u.Byte, 16);
-		}
-	}
-	else {
-		return false;
-	}
-	rtrow.DestinationPrefix.PrefixLength = target.netmaskBits();
-	rtrow.SitePrefixLength = rtrow.DestinationPrefix.PrefixLength;
-	rtrow.ValidLifetime = 0xffffffff;
-	rtrow.PreferredLifetime = 0xffffffff;
-	rtrow.Metric = -1;
-	rtrow.Protocol = MIB_IPPROTO_NETMGMT;
-	rtrow.Loopback = FALSE;
-	rtrow.AutoconfigureAddress = FALSE;
-	rtrow.Publish = FALSE;
-	rtrow.Immortal = FALSE;
-	rtrow.Age = 0;
-	rtrow.Origin = NlroManual;
-	if (del) {
-		return (DeleteIpForwardEntry2(&rtrow) == NO_ERROR);
-	}
-	else {
-		NTSTATUS r = CreateIpForwardEntry2(&rtrow);
-		if (r == NO_ERROR) {
-			return true;
-		}
-		else if (r == ERROR_OBJECT_ALREADY_EXISTS) {
-			return (SetIpForwardEntry2(&rtrow) == NO_ERROR);
-		}
-		else {
-			return false;
-		}
-	}
-}
-
-static bool _winHasRoute(const NET_LUID& interfaceLuid, const NET_IFINDEX& interfaceIndex, const InetAddress& target, const InetAddress& via)
-{
-	MIB_IPFORWARD_ROW2 rtrow;
-	InitializeIpForwardEntry(&rtrow);
-	rtrow.InterfaceLuid.Value = interfaceLuid.Value;
-	rtrow.InterfaceIndex = interfaceIndex;
-	if (target.ss_family == AF_INET) {
-		rtrow.DestinationPrefix.Prefix.si_family = AF_INET;
-		rtrow.DestinationPrefix.Prefix.Ipv4.sin_family = AF_INET;
-		rtrow.DestinationPrefix.Prefix.Ipv4.sin_addr.S_un.S_addr = reinterpret_cast<const struct sockaddr_in*>(&target)->sin_addr.S_un.S_addr;
-		if (via.ss_family == AF_INET) {
-			rtrow.NextHop.si_family = AF_INET;
-			rtrow.NextHop.Ipv4.sin_family = AF_INET;
-			rtrow.NextHop.Ipv4.sin_addr.S_un.S_addr = reinterpret_cast<const struct sockaddr_in*>(&via)->sin_addr.S_un.S_addr;
-		}
-	}
-	else if (target.ss_family == AF_INET6) {
-		rtrow.DestinationPrefix.Prefix.si_family = AF_INET6;
-		rtrow.DestinationPrefix.Prefix.Ipv6.sin6_family = AF_INET6;
-		memcpy(rtrow.DestinationPrefix.Prefix.Ipv6.sin6_addr.u.Byte, reinterpret_cast<const struct sockaddr_in6*>(&target)->sin6_addr.u.Byte, 16);
-		if (via.ss_family == AF_INET6) {
-			rtrow.NextHop.si_family = AF_INET6;
-			rtrow.NextHop.Ipv6.sin6_family = AF_INET6;
-			memcpy(rtrow.NextHop.Ipv6.sin6_addr.u.Byte, reinterpret_cast<const struct sockaddr_in6*>(&via)->sin6_addr.u.Byte, 16);
-		}
-	}
-	else {
-		return false;
-	}
-	rtrow.DestinationPrefix.PrefixLength = target.netmaskBits();
-	rtrow.SitePrefixLength = rtrow.DestinationPrefix.PrefixLength;
-	return (GetIpForwardEntry2(&rtrow) == NO_ERROR);
-}
-
-#endif	 // __WINDOWS__ --------------------------------------------------------
-
-#ifndef ZT_ROUTING_SUPPORT_FOUND
-#error                                                                                                                                                                                                                                         \
-	"ManagedRoute.cpp has no support for managing routes on this platform! You'll need to check and see if one of the existing ones will work and make sure proper defines are set, or write one. Please do a GitHub pull request if you do this for a new OS."
-#endif
-
-}	// anonymous namespace
-
-ManagedRoute::ManagedRoute(const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* device)
-{
-	_target = target;
-	_via = via;
-	_src = src;
-
-	if (_via.ss_family == AF_INET) {
-		_via.setPort(32);
-	}
-	else if (_via.ss_family == AF_INET6) {
-		_via.setPort(128);
-	}
-
-	if (_src.ss_family == AF_INET) {
-		_src.setPort(32);
-	}
-	else if (_src.ss_family == AF_INET6) {
-		_src.setPort(128);
-	}
-
-	Utils::scopy(_device, sizeof(_device), device);
-	_systemDevice[0] = (char)0;
-}
-
-ManagedRoute::~ManagedRoute()
-{
-	this->remove();
-}
-
-/* Linux NOTE: for default route override, some Linux distributions will
- * require a change to the rp_filter parameter. A value of '1' will prevent
- * default route override from working properly.
- *
- * sudo sysctl -w net.ipv4.conf.all.rp_filter=2
- *
- * Add to /etc/sysctl.conf or /etc/sysctl.d/... to make permanent.
- *
- * This is true of CentOS/RHEL 6+ and possibly others. This is because
- * Linux default route override implies asymmetric routes, which then
- * trigger Linux's "martian packet" filter. */
-
-#ifndef ZT_SDK
-bool ManagedRoute::sync()
-{
-#ifdef __WINDOWS__
-	NET_LUID interfaceLuid;
-	interfaceLuid.Value = (ULONG64)Utils::hexStrToU64(_device);	  // on Windows we use the hex LUID as the "interface name" for ManagedRoute
-	NET_IFINDEX interfaceIndex = -1;
-	if (ConvertInterfaceLuidToIndex(&interfaceLuid, &interfaceIndex) != NO_ERROR)
-		return false;
-#endif
-
-	InetAddress leftt, rightt;
-	if (_target.netmaskBits() == 0)	  // bifurcate only the default route
-		_forkTarget(_target, leftt, rightt);
-	else
-		leftt = _target;
-
-#ifdef __BSD__	 // ------------------------------------------------------------
-
-	if (_device[0]) {
-		bool haveDevice = false;
-		struct ifaddrs* ifa = (struct ifaddrs*)0;
-		if (! getifaddrs(&ifa)) {
-			struct ifaddrs* p = ifa;
-			while (p) {
-				if ((p->ifa_name) && (! strcmp(_device, p->ifa_name))) {
-					haveDevice = true;
-					break;
-				}
-				p = p->ifa_next;
-			}
-			freeifaddrs(ifa);
-		}
-		if (! haveDevice)
-			return false;
-	}
-
-	std::vector<_RTE> rtes(_getRTEs(_target, false));
-
-	bool hasRoute = false;
-	for (std::vector<_RTE>::iterator r(rtes.begin()); r != rtes.end(); ++r) {
-		hasRoute = _target == r->target && _via.ipOnly() == r->via.ipOnly() && (strcmp(r->device, _device) == 0);
-		if (hasRoute) {
-			break;
-		}
-	}
-
-	// char buf[255];
-	// fprintf(stderr, "hasRoute %d %s\n", !!hasRoute, _target.toString(buf));
-
-	if (! hasRoute) {
-		if (_target && _target.netmaskBits() == 0) {   // Allow Default
-			InetAddress newSystemVia;
-			char newSystemDevice[128];
-			newSystemDevice[0] = (char)0;
-
-			// if our routes got deleted
-			// delete the systemd via that we had added with -ifscope
-			if (_systemVia && ! ! _systemDevice[0]) {
-				_routeCmd("delete", _target, _systemVia, _systemDevice, (const char*)0);
-			}
-
-			_systemVia = newSystemVia;
-			Utils::scopy(_systemDevice, sizeof(_systemDevice), newSystemDevice);
-			// If macos has a network hiccup, it deletes what the route we set, and it's own physical routes.
-			// if !hasRoute (our 0.0.0.0 has been deleted), the OS has changed stuff
-			// So don't assume _systemX are valid anymore. Always get for _system{Via,Device}
-
-			// Find system default route that this route should override
-			// We need to put it back when default route is turned off
-			for (std::vector<_RTE>::iterator r(rtes.begin()); r != rtes.end(); ++r) {
-				if (r->via) {
-					if (r->isDefault == 1 && (strcmp(r->device, _device) != 0)) {
-						// char buf[255];
-						// fprintf(stderr, "system device1  %s  %s\n", r->via.toString(buf), r->device);
-
-						newSystemVia = r->via;
-						Utils::scopy(newSystemDevice, sizeof(newSystemDevice), r->device);
-						break;
-					}
-				}
-			}
-
-			if (newSystemVia) {
-				_systemVia = newSystemVia;
-			}
-			if (newSystemDevice[0]) {
-				Utils::scopy(_systemDevice, sizeof(_systemDevice), newSystemDevice);
-			}
-
-			// if there's no newSystemVia, the OS might not have
-			// ipv4 or ipv6 connectivity.
-			// we should still add our ZeroTier ipv4 or 6 routes though
-
-			if (! ! _systemVia && ! ! _systemDevice[0]) {
-				_routeCmd("delete", _target, _systemVia, (const char*)0, (const char*)0);
-			}
-
-			_routeCmd("add", _target, _via, (const char*)0, (const char*)0);
-
-			if (! ! _systemVia && ! ! _systemDevice[0]) {
-				_routeCmd("add", _target, _systemVia, _systemDevice, (const char*)0);
-			}
-
-			_applied[_target] = true;
-		}
-		else {
-			// Do Non-Default route commands
-			_applied[_target] = true;
-			_routeCmd("add", leftt, _via, (const char*)0, (_via) ? (const char*)0 : _device);
-		}
-	}
-
-#endif	 // __BSD__ ------------------------------------------------------------
-
-#ifdef __LINUX__   // ----------------------------------------------------------
-
-#ifdef ZT_EXTOSDEP
-	_applied[_target] = false;
-	ExtOsdep::routeAddDel(true, _target, _via, _src, _device);
-#else
-	if ((leftt) && (! LinuxNetLink::getInstance().routeIsSet(leftt, _via, _src, _device))) {
-		_applied[leftt] = false;   // boolean unused
-		LinuxNetLink::getInstance().addRoute(leftt, _via, _src, _device);
-	}
-	if ((rightt) && (! LinuxNetLink::getInstance().routeIsSet(rightt, _via, _src, _device))) {
-		_applied[rightt] = false;	// boolean unused
-		LinuxNetLink::getInstance().addRoute(rightt, _via, _src, _device);
-	}
-#endif	 // ZT_EXTOSDEP
-
-#endif	 // __LINUX__ ----------------------------------------------------------
-
-#ifdef __WINDOWS__	 // --------------------------------------------------------
-
-	if ((! _applied.count(leftt)) || (! _winHasRoute(interfaceLuid, interfaceIndex, leftt, _via))) {
-		_applied[leftt] = false;   // boolean unused
-		_winRoute(false, interfaceLuid, interfaceIndex, leftt, _via);
-	}
-	if ((rightt) && ((! _applied.count(rightt)) || (! _winHasRoute(interfaceLuid, interfaceIndex, rightt, _via)))) {
-		_applied[rightt] = false;	// boolean unused
-		_winRoute(false, interfaceLuid, interfaceIndex, rightt, _via);
-	}
-
-#endif	 // __WINDOWS__ --------------------------------------------------------
-
-	return true;
-}
-#endif
-
-void ManagedRoute::remove()
-{
-#ifdef __WINDOWS__
-	NET_LUID interfaceLuid;
-	interfaceLuid.Value = (ULONG64)Utils::hexStrToU64(_device);	  // on Windows we use the hex LUID as the "interface name" for ManagedRoute
-	NET_IFINDEX interfaceIndex = -1;
-	if (ConvertInterfaceLuidToIndex(&interfaceLuid, &interfaceIndex) != NO_ERROR)
-		return;
-#endif
-
-#ifdef __BSD__
-#endif	 // __BSD__ ------------------------------------------------------------
-
-	for (std::map<InetAddress, bool>::iterator r(_applied.begin()); r != _applied.end(); ++r) {
-#ifdef __BSD__	 // ------------------------------------------------------------
-		if (_target && _target.netmaskBits() == 0) {
-			_routeCmd("delete", _target, _via, (const char*)0, (const char*)0);
-			if (_systemVia && _systemDevice[0]) {
-				_routeCmd("delete", _target, _systemVia, _systemDevice, (const char*)0);
-
-				_routeCmd("add", _target, _systemVia, (const char*)0, (const char*)0);
-			}
-		}
-		else {
-			_routeCmd("delete", _target, _via, (const char*)0, _via ? (const char*)0 : _device);
-		}
-		break;
-#endif	 // __BSD__ ------------------------------------------------------------
-
-#ifdef __LINUX__   // ----------------------------------------------------------
-				   //_routeCmd("del",r->first,_via,(_via) ? (const char *)0 : _device);
-#ifdef ZT_EXTOSDEP
-		ExtOsdep::routeAddDel(false, r->first, _via, _src, (_via) ? (const char*)0 : _device);
-#else
-		LinuxNetLink::getInstance().delRoute(r->first, _via, _src, (_via) ? (const char*)0 : _device);
-#endif	 // ZT_EXTOSDEP
-#endif	 // __LINUX__ ----------------------------------------------------------
-
-#ifdef __WINDOWS__	 // --------------------------------------------------------
-		_winRoute(true, interfaceLuid, interfaceIndex, r->first, _via);
-#endif	 // __WINDOWS__ --------------------------------------------------------
-	}
-
-	_target.zero();
-	_via.zero();
-	_systemVia.zero();
-	_device[0] = (char)0;
-	_systemDevice[0] = (char)0;
-	_applied.clear();
-}
-
-}	// namespace ZeroTier
diff --git a/osdep/ManagedRoute.hpp b/osdep/ManagedRoute.hpp
deleted file mode 100644
index e30be8263..000000000
--- a/osdep/ManagedRoute.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_MANAGEDROUTE_HPP
-#define ZT_MANAGEDROUTE_HPP
-
-#include "../node/AtomicCounter.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/SharedPtr.hpp"
-#include "../node/Utils.hpp"
-
-#include <map>
-#include <stdexcept>
-#include <stdlib.h>
-#include <string.h>
-#include <vector>
-
-namespace ZeroTier {
-
-/**
- * A ZT-managed route that used C++ RAII semantics to automatically clean itself up on deallocate
- */
-class ManagedRoute {
-	friend class SharedPtr<ManagedRoute>;
-
-  public:
-	ManagedRoute(const InetAddress& target, const InetAddress& via, const InetAddress& src, const char* device);
-	~ManagedRoute();
-
-	/**
-	 * Set or update currently set route
-	 *
-	 * This must be called periodically for routes that shadow others so that
-	 * shadow routes can be updated. In some cases it has no effect
-	 *
-	 * @return True if route add/update was successful
-	 */
-	bool sync();
-
-	/**
-	 * Remove and clear this ManagedRoute
-	 *
-	 * This does nothing if this ManagedRoute is not set or has already been
-	 * removed. If this is not explicitly called it is called automatically on
-	 * destruct.
-	 */
-	void remove();
-
-	inline const InetAddress& target() const
-	{
-		return _target;
-	}
-	inline const InetAddress& via() const
-	{
-		return _via;
-	}
-	inline const InetAddress& src() const
-	{
-		return _src;
-	}
-	inline const char* device() const
-	{
-		return _device;
-	}
-
-  private:
-	ManagedRoute(const ManagedRoute&)
-	{
-	}
-	inline ManagedRoute& operator=(const ManagedRoute&)
-	{
-		return *this;
-	}
-
-	InetAddress _target;
-	InetAddress _via;
-	InetAddress _src;
-	InetAddress _systemVia;					// for route overrides
-	std::map<InetAddress, bool> _applied;	// routes currently applied
-	char _device[128];
-	char _systemDevice[128];   // for route overrides
-
-	AtomicCounter __refCount;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/NeighborDiscovery.cpp b/osdep/NeighborDiscovery.cpp
deleted file mode 100644
index dd2114a3d..000000000
--- a/osdep/NeighborDiscovery.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "NeighborDiscovery.hpp"
-
-#include "../include/ZeroTierOne.h"
-#include "OSUtils.hpp"
-
-#include <assert.h>
-
-namespace ZeroTier {
-
-uint16_t calc_checksum(uint16_t* addr, int len)
-{
-	int count = len;
-	uint32_t sum = 0;
-	uint16_t answer = 0;
-
-	// Sum up 2-byte values until none or only one byte left.
-	while (count > 1) {
-		sum += *(addr++);
-		count -= 2;
-	}
-
-	// Add left-over byte, if any.
-	if (count > 0) {
-		sum += *(uint8_t*)addr;
-	}
-
-	// Fold 32-bit sum into 16 bits; we lose information by doing this,
-	// increasing the chances of a collision.
-	// sum = (lower 16 bits) + (upper 16 bits shifted right 16 bits)
-	while (sum >> 16) {
-		sum = (sum & 0xffff) + (sum >> 16);
-	}
-
-	// Checksum is one's compliment of sum.
-	answer = ~sum;
-
-	return (answer);
-}
-
-struct _pseudo_header {
-	uint8_t sourceAddr[16];
-	uint8_t targetAddr[16];
-	uint32_t length;
-	uint8_t zeros[3];
-	uint8_t next;	// 58
-};
-
-struct _option {
-	_option(int optionType) : type(optionType), length(8)
-	{
-		memset(mac, 0, sizeof(mac));
-	}
-
-	uint8_t type;
-	uint8_t length;
-	uint8_t mac[6];
-};
-
-struct _neighbor_solicitation {
-	_neighbor_solicitation() : type(135), code(0), checksum(0), option(1)
-	{
-		memset(&reserved, 0, sizeof(reserved));
-		memset(target, 0, sizeof(target));
-	}
-
-	void calculateChecksum(const sockaddr_storage& sourceIp, const sockaddr_storage& destIp)
-	{
-		_pseudo_header ph;
-		memset(&ph, 0, sizeof(_pseudo_header));
-		const sockaddr_in6* src = (const sockaddr_in6*)&sourceIp;
-		const sockaddr_in6* dest = (const sockaddr_in6*)&destIp;
-
-		memcpy(ph.sourceAddr, &src->sin6_addr, sizeof(struct in6_addr));
-		memcpy(ph.targetAddr, &dest->sin6_addr, sizeof(struct in6_addr));
-		ph.next = 58;
-		ph.length = htonl(sizeof(_neighbor_solicitation));
-
-		size_t len = sizeof(_pseudo_header) + sizeof(_neighbor_solicitation);
-		uint8_t* tmp = (uint8_t*)malloc(len);
-		memcpy(tmp, &ph, sizeof(_pseudo_header));
-		memcpy(tmp + sizeof(_pseudo_header), this, sizeof(_neighbor_solicitation));
-
-		checksum = calc_checksum((uint16_t*)tmp, (int)len);
-
-		free(tmp);
-		tmp = NULL;
-	}
-
-	uint8_t type;	// 135
-	uint8_t code;	// 0
-	uint16_t checksum;
-	uint32_t reserved;
-	uint8_t target[16];
-	_option option;
-};
-
-struct _neighbor_advertisement {
-	_neighbor_advertisement() : type(136), code(0), checksum(0), rso(0x40), option(2)
-	{
-		memset(padding, 0, sizeof(padding));
-		memset(target, 0, sizeof(target));
-	}
-
-	void calculateChecksum(const sockaddr_storage& sourceIp, const sockaddr_storage& destIp)
-	{
-		_pseudo_header ph;
-		memset(&ph, 0, sizeof(_pseudo_header));
-		const sockaddr_in6* src = (const sockaddr_in6*)&sourceIp;
-		const sockaddr_in6* dest = (const sockaddr_in6*)&destIp;
-
-		memcpy(ph.sourceAddr, &src->sin6_addr, sizeof(struct in6_addr));
-		memcpy(ph.targetAddr, &dest->sin6_addr, sizeof(struct in6_addr));
-		ph.next = 58;
-		ph.length = htonl(sizeof(_neighbor_advertisement));
-
-		size_t len = sizeof(_pseudo_header) + sizeof(_neighbor_advertisement);
-		uint8_t* tmp = (uint8_t*)malloc(len);
-		memcpy(tmp, &ph, sizeof(_pseudo_header));
-		memcpy(tmp + sizeof(_pseudo_header), this, sizeof(_neighbor_advertisement));
-
-		checksum = calc_checksum((uint16_t*)tmp, (int)len);
-
-		free(tmp);
-		tmp = NULL;
-	}
-
-	uint8_t type;	// 136
-	uint8_t code;	// 0
-	uint16_t checksum;
-	uint8_t rso;
-	uint8_t padding[3];
-	uint8_t target[16];
-	_option option;
-};
-
-NeighborDiscovery::NeighborDiscovery() : _cache(256), _lastCleaned(OSUtils::now())
-{
-}
-
-void NeighborDiscovery::addLocal(const sockaddr_storage& address, const MAC& mac)
-{
-	_NDEntry& e = _cache[InetAddress(address)];
-	e.lastQuerySent = 0;
-	e.lastResponseReceived = 0;
-	e.mac = mac;
-	e.local = true;
-}
-
-void NeighborDiscovery::remove(const sockaddr_storage& address)
-{
-	_cache.erase(InetAddress(address));
-}
-
-sockaddr_storage NeighborDiscovery::processIncomingND(const uint8_t* nd, unsigned int len, const sockaddr_storage& localIp, uint8_t* response, unsigned int& responseLen, MAC& responseDest)
-{
-	assert(sizeof(_neighbor_solicitation) == 28);
-	assert(sizeof(_neighbor_advertisement) == 32);
-
-	const uint64_t now = OSUtils::now();
-	sockaddr_storage ip = { 0 };
-
-	if (len >= sizeof(_neighbor_solicitation) && nd[0] == 0x87) {
-		// respond to Neighbor Solicitation request for local address
-		_neighbor_solicitation solicitation;
-		memcpy(&solicitation, nd, len);
-		InetAddress targetAddress(solicitation.target, 16, 0);
-		_NDEntry* targetEntry = _cache.get(targetAddress);
-		if (targetEntry && targetEntry->local) {
-			_neighbor_advertisement adv;
-			targetEntry->mac.copyTo(adv.option.mac, 6);
-			memcpy(adv.target, solicitation.target, 16);
-			adv.calculateChecksum(localIp, targetAddress);
-			memcpy(response, &adv, sizeof(_neighbor_advertisement));
-			responseLen = sizeof(_neighbor_advertisement);
-			responseDest.setTo(solicitation.option.mac, 6);
-		}
-	}
-	else if (len >= sizeof(_neighbor_advertisement) && nd[0] == 0x88) {
-		_neighbor_advertisement adv;
-		memcpy(&adv, nd, len);
-		InetAddress responseAddress(adv.target, 16, 0);
-		_NDEntry* queryEntry = _cache.get(responseAddress);
-		if (queryEntry && ! queryEntry->local && (now - queryEntry->lastQuerySent <= ZT_ND_QUERY_MAX_TTL)) {
-			queryEntry->lastResponseReceived = now;
-			queryEntry->mac.setTo(adv.option.mac, 6);
-			ip = responseAddress;
-		}
-	}
-
-	if ((now - _lastCleaned) >= ZT_ND_EXPIRE) {
-		_lastCleaned = now;
-		Hashtable<InetAddress, _NDEntry>::Iterator i(_cache);
-		InetAddress* k = NULL;
-		_NDEntry* v = NULL;
-		while (i.next(k, v)) {
-			if (! v->local && (now - v->lastResponseReceived) >= ZT_ND_EXPIRE) {
-				_cache.erase(*k);
-			}
-		}
-	}
-
-	return ip;
-}
-
-MAC NeighborDiscovery::query(const MAC& localMac, const sockaddr_storage& localIp, const sockaddr_storage& targetIp, uint8_t* query, unsigned int& queryLen, MAC& queryDest)
-{
-	const uint64_t now = OSUtils::now();
-
-	InetAddress localAddress(localIp);
-	localAddress.setPort(0);
-	InetAddress targetAddress(targetIp);
-	targetAddress.setPort(0);
-
-	_NDEntry& e = _cache[targetAddress];
-
-	if ((e.mac && ((now - e.lastResponseReceived) >= (ZT_ND_EXPIRE / 3))) || (! e.mac && ((now - e.lastQuerySent) >= ZT_ND_QUERY_INTERVAL))) {
-		e.lastQuerySent = now;
-
-		_neighbor_solicitation ns;
-		memcpy(ns.target, targetAddress.rawIpData(), 16);
-		localMac.copyTo(ns.option.mac, 6);
-		ns.calculateChecksum(localIp, targetIp);
-		if (e.mac) {
-			queryDest = e.mac;
-		}
-		else {
-			queryDest = (uint64_t)0xffffffffffffULL;
-		}
-	}
-	else {
-		queryLen = 0;
-		queryDest.zero();
-	}
-
-	return e.mac;
-}
-
-}	// namespace ZeroTier
diff --git a/osdep/NeighborDiscovery.hpp b/osdep/NeighborDiscovery.hpp
deleted file mode 100644
index fe5d790b0..000000000
--- a/osdep/NeighborDiscovery.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_NEIGHBORDISCOVERY_HPP
-#define ZT_NEIGHBORDISCOVERY_HPP
-
-#include "../node/Hashtable.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/MAC.hpp"
-
-#define ZT_ND_QUERY_INTERVAL 2000
-
-#define ZT_ND_QUERY_MAX_TTL 5000
-
-#define ZT_ND_EXPIRE 600000
-
-namespace ZeroTier {
-
-class NeighborDiscovery {
-  public:
-	NeighborDiscovery();
-
-	/**
-	 * Set a local IP entry that we should respond to Neighbor Requests withPrefix64k
-	 *
-	 * @param mac Our local MAC address
-	 * @param ip Our IPv6 address
-	 */
-	void addLocal(const sockaddr_storage& address, const MAC& mac);
-
-	/**
-	 * Delete a local IP entry or cached Neighbor entry
-	 *
-	 * @param address IPv6 address to remove
-	 */
-	void remove(const sockaddr_storage& address);
-
-	sockaddr_storage processIncomingND(const uint8_t* nd, unsigned int len, const sockaddr_storage& localIp, uint8_t* response, unsigned int& responseLen, MAC& responseDest);
-
-	MAC query(const MAC& localMac, const sockaddr_storage& localIp, const sockaddr_storage& targetIp, uint8_t* query, unsigned int& queryLen, MAC& queryDest);
-
-  private:
-	struct _NDEntry {
-		_NDEntry() : lastQuerySent(0), lastResponseReceived(0), mac(), local(false)
-		{
-		}
-		uint64_t lastQuerySent;
-		uint64_t lastResponseReceived;
-		MAC mac;
-		bool local;
-	};
-
-	Hashtable<InetAddress, _NDEntry> _cache;
-	uint64_t _lastCleaned;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/NetBSDEthernetTap.cpp b/osdep/NetBSDEthernetTap.cpp
deleted file mode 100644
index 0508246b0..000000000
--- a/osdep/NetBSDEthernetTap.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "NetBSDEthernetTap.hpp"
-
-#include "../node/Constants.hpp"
-#include "../node/Mutex.hpp"
-#include "../node/Utils.hpp"
-#include "OSUtils.hpp"
-#include "freebsd_getifmaddrs.h"
-
-#include <algorithm>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <ifaddrs.h>
-#include <iostream>
-#include <map>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <set>
-#include <signal.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <string>
-#include <sys/cdefs.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <utility>
-using namespace std;
-#define ZT_BASE32_CHARS "0123456789abcdefghijklmnopqrstuv"
-
-// ff:ff:ff:ff:ff:ff with no ADI
-static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff), 0);
-
-namespace ZeroTier {
-
-NetBSDEthernetTap::NetBSDEthernetTap(
-	const char* homePath,
-	const MAC& mac,
-	unsigned int mtu,
-	unsigned int metric,
-	uint64_t nwid,
-	const char* friendlyName,
-	void (*handler)(void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-	void* arg)
-	: _handler(handler)
-	, _arg(arg)
-	, _nwid(nwid)
-	, _mtu(mtu)
-	, _metric(metric)
-	, _fd(0)
-	, _enabled(true)
-{
-	static Mutex globalTapCreateLock;
-	char devpath[64], ethaddr[64], mtustr[32], metstr[32], tmpdevname[32];
-	struct stat stattmp;
-
-	Mutex::Lock _gl(globalTapCreateLock);
-
-	if (mtu > 2800)
-		throw std::runtime_error("max tap MTU is 2800");
-
-	// we can create /dev/tap*
-	std::vector<std::string> devFiles(OSUtils::listDirectory("/dev"));
-	for (int i = 9993; i < (9993 + 128); ++i) {
-		Utils::snprintf(tmpdevname, sizeof(tmpdevname), "tap%d", i);
-		Utils::snprintf(devpath, sizeof(devpath), "/dev/%s", tmpdevname);
-		if (std::find(devFiles.begin(), devFiles.end(), std::string(tmpdevname)) == devFiles.end()) {
-			long cpid = (long)vfork();
-			if (cpid == 0) {
-				::execl("/sbin/ifconfig", "/sbin/ifconfig", tmpdevname, "create", (const char*)0);
-				::_exit(-1);
-			}
-			else if (cpid > 0) {
-				int exitcode = -1;
-				::waitpid(cpid, &exitcode, 0);
-			}
-			else
-				throw std::runtime_error("fork() failed");
-
-			cpid = (long)vfork();
-			if (cpid == 0) {
-				string tmp;
-				sprintf((char*)tmp.c_str(), "%d", i);
-				string minor = tmp.c_str();
-				::execl("/sbin/mknod", "/sbin/mknod", devpath, "c", "169", minor.c_str(), (const char*)0);
-				// http://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/sys/conf/majors
-				// major 169 => tap
-				::_exit(-1);
-			}
-			else if (cpid > 0) {
-				int exitcode = -1;
-				::waitpid(cpid, &exitcode, 0);
-			}
-			else
-				throw std::runtime_error("fork() failed");
-
-			cerr << "created device " << devpath << endl;
-
-			_dev = tmpdevname;
-			_fd = ::open(devpath, O_RDWR);
-			if (! stat(devpath, &stattmp)) {
-				if (_fd > 0)
-					break;
-				else
-					throw std::runtime_error("unable to open created tap device ");
-			}
-			else {
-				throw std::runtime_error("cannot find /dev node for newly created tap device");
-			}
-		}
-	}
-
-	if (_fd <= 0)
-		throw std::runtime_error("unable to open TAP device or no more devices available");
-
-	if (fcntl(_fd, F_SETFL, fcntl(_fd, F_GETFL) & ~O_NONBLOCK) == -1) {
-		::close(_fd);
-		throw std::runtime_error("unable to set flags on file descriptor for TAP device");
-	}
-
-	// Configure MAC address and MTU, bring interface up
-	Utils::snprintf(ethaddr, sizeof(ethaddr), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", (int)mac[0], (int)mac[1], (int)mac[2], (int)mac[3], (int)mac[4], (int)mac[5]);
-	Utils::snprintf(mtustr, sizeof(mtustr), "%u", _mtu);
-	Utils::snprintf(metstr, sizeof(metstr), "%u", _metric);
-	long cpid = (long)vfork();
-	if (cpid == 0) {
-		::execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "link", ethaddr, "mtu", mtustr, "metric", metstr, "up", (const char*)0);
-		::_exit(-1);
-	}
-	else if (cpid > 0) {
-		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
-		if (exitcode) {
-			::close(_fd);
-			throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
-		}
-	}
-
-	// ifconfig link seems to be different from address
-	// https://wiki.netbsd.org/tutorials/faking_a_mac_address/
-	cpid = (long)vfork();
-	if (cpid == 0) {
-		string cmdline = "net.link.tap." + string(_dev);
-		cmdline += "=" + string(ethaddr);
-		::execl("/sbin/sysctl", "/sbin/sysctl", "-w", cmdline.c_str(), (const char*)0);
-		::_exit(-1);
-	}
-	else if (cpid > 0) {
-		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
-		if (exitcode) {
-			::close(_fd);
-			throw std::runtime_error("sysctl failure setting link-layer address and activating tap interface");
-		}
-	}
-
-	// Set close-on-exec so that devices cannot persist if we fork/exec for update
-	fcntl(_fd, F_SETFD, fcntl(_fd, F_GETFD) | FD_CLOEXEC);
-
-	::pipe(_shutdownSignalPipe);
-
-	_thread = Thread::start(this);
-}
-
-NetBSDEthernetTap::~NetBSDEthernetTap()
-{
-	::write(_shutdownSignalPipe[1], "\0", 1);	// causes thread to exit
-	Thread::join(_thread);
-	::close(_fd);
-	::close(_shutdownSignalPipe[0]);
-	::close(_shutdownSignalPipe[1]);
-
-	long cpid = (long)vfork();
-	if (cpid == 0) {
-		::execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "destroy", (const char*)0);
-		::_exit(-1);
-	}
-	else if (cpid > 0) {
-		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
-	}
-
-	cpid = (long)vfork();
-	if (cpid == 0) {
-		string tmp = "/dev/";
-		tmp += _dev.c_str();
-		::execl("/bin/rm", "/bin/rm", tmp.c_str(), (const char*)0);
-		::_exit(-1);
-	}
-	else if (cpid > 0) {
-		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
-	}
-	else
-		throw std::runtime_error("fork() failed");
-}
-
-void NetBSDEthernetTap::setEnabled(bool en)
-{
-	_enabled = en;
-}
-
-bool NetBSDEthernetTap::enabled() const
-{
-	return _enabled;
-}
-
-static bool ___removeIp(const std::string& _dev, const InetAddress& ip)
-{
-	long cpid = (long)vfork();
-	if (cpid == 0) {
-		execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), "inet", ip.toIpString().c_str(), "-alias", (const char*)0);
-		_exit(-1);
-	}
-	else if (cpid > 0) {
-		int exitcode = -1;
-		waitpid(cpid, &exitcode, 0);
-		return (exitcode == 0);
-	}
-	return false;	// never reached, make compiler shut up about return value
-}
-
-bool NetBSDEthernetTap::addIp(const InetAddress& ip)
-{
-	if (! ip)
-		return false;
-
-	std::vector<InetAddress> allIps(ips());
-	if (std::find(allIps.begin(), allIps.end(), ip) != allIps.end())
-		return true;   // IP/netmask already assigned
-
-	// Remove and reconfigure if address is the same but netmask is different
-	for (std::vector<InetAddress>::iterator i(allIps.begin()); i != allIps.end(); ++i) {
-		if ((i->ipsEqual(ip)) && (i->netmaskBits() != ip.netmaskBits())) {
-			if (___removeIp(_dev, *i))
-				break;
-		}
-	}
-
-	long cpid = (long)vfork();
-	if (cpid == 0) {
-		::execl("/sbin/ifconfig", "/sbin/ifconfig", _dev.c_str(), ip.isV4() ? "inet" : "inet6", ip.toString().c_str(), "alias", (const char*)0);
-		::_exit(-1);
-	}
-	else if (cpid > 0) {
-		int exitcode = -1;
-		::waitpid(cpid, &exitcode, 0);
-		return (exitcode == 0);
-	}
-	return false;
-}
-
-bool NetBSDEthernetTap::removeIp(const InetAddress& ip)
-{
-	if (! ip)
-		return false;
-	std::vector<InetAddress> allIps(ips());
-	if (std::find(allIps.begin(), allIps.end(), ip) != allIps.end()) {
-		if (___removeIp(_dev, ip))
-			return true;
-	}
-	return false;
-}
-
-std::vector<InetAddress> NetBSDEthernetTap::ips() const
-{
-	struct ifaddrs* ifa = (struct ifaddrs*)0;
-	if (getifaddrs(&ifa))
-		return std::vector<InetAddress>();
-
-	std::vector<InetAddress> r;
-
-	struct ifaddrs* p = ifa;
-	while (p) {
-		if ((! strcmp(p->ifa_name, _dev.c_str())) && (p->ifa_addr) && (p->ifa_netmask) && (p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
-			switch (p->ifa_addr->sa_family) {
-				case AF_INET: {
-					struct sockaddr_in* sin = (struct sockaddr_in*)p->ifa_addr;
-					struct sockaddr_in* nm = (struct sockaddr_in*)p->ifa_netmask;
-					r.push_back(InetAddress(&(sin->sin_addr.s_addr), 4, Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
-				} break;
-				case AF_INET6: {
-					struct sockaddr_in6* sin = (struct sockaddr_in6*)p->ifa_addr;
-					struct sockaddr_in6* nm = (struct sockaddr_in6*)p->ifa_netmask;
-					uint32_t b[4];
-					memcpy(b, nm->sin6_addr.s6_addr, sizeof(b));
-					r.push_back(InetAddress(sin->sin6_addr.s6_addr, 16, Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
-				} break;
-			}
-		}
-		p = p->ifa_next;
-	}
-
-	if (ifa)
-		freeifaddrs(ifa);
-
-	std::sort(r.begin(), r.end());
-	std::unique(r.begin(), r.end());
-
-	return r;
-}
-
-void NetBSDEthernetTap::put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len)
-{
-	char putBuf[4096];
-	if ((_fd > 0) && (len <= _mtu) && (_enabled)) {
-		to.copyTo(putBuf, 6);
-		from.copyTo(putBuf + 6, 6);
-		*((uint16_t*)(putBuf + 12)) = htons((uint16_t)etherType);
-		memcpy(putBuf + 14, data, len);
-		len += 14;
-		::write(_fd, putBuf, len);
-	}
-}
-
-std::string NetBSDEthernetTap::deviceName() const
-{
-	return _dev;
-}
-
-void NetBSDEthernetTap::setFriendlyName(const char* friendlyName)
-{
-}
-
-void NetBSDEthernetTap::scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed)
-{
-	std::vector<MulticastGroup> newGroups;
-
-	struct ifmaddrs* ifmap = (struct ifmaddrs*)0;
-	if (! getifmaddrs(&ifmap)) {
-		struct ifmaddrs* p = ifmap;
-		while (p) {
-			if (p->ifma_addr->sa_family == AF_LINK) {
-				struct sockaddr_dl* in = (struct sockaddr_dl*)p->ifma_name;
-				struct sockaddr_dl* la = (struct sockaddr_dl*)p->ifma_addr;
-				if ((la->sdl_alen == 6) && (in->sdl_nlen <= _dev.length()) && (! memcmp(_dev.data(), in->sdl_data, in->sdl_nlen)))
-					newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen, 6), 0));
-			}
-			p = p->ifma_next;
-		}
-		freeifmaddrs(ifmap);
-	}
-
-	std::vector<InetAddress> allIps(ips());
-	for (std::vector<InetAddress>::iterator ip(allIps.begin()); ip != allIps.end(); ++ip)
-		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
-
-	std::sort(newGroups.begin(), newGroups.end());
-	std::unique(newGroups.begin(), newGroups.end());
-
-	for (std::vector<MulticastGroup>::iterator m(newGroups.begin()); m != newGroups.end(); ++m) {
-		if (! std::binary_search(_multicastGroups.begin(), _multicastGroups.end(), *m))
-			added.push_back(*m);
-	}
-	for (std::vector<MulticastGroup>::iterator m(_multicastGroups.begin()); m != _multicastGroups.end(); ++m) {
-		if (! std::binary_search(newGroups.begin(), newGroups.end(), *m))
-			removed.push_back(*m);
-	}
-
-	_multicastGroups.swap(newGroups);
-}
-
-/*
-bool NetBSDEthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
-{
-	std::set<MulticastGroup> newGroups;
-	struct ifmaddrs *ifmap = (struct ifmaddrs *)0;
-	if (!getifmaddrs(&ifmap)) {
-		struct ifmaddrs *p = ifmap;
-		while (p) {
-			if (p->ifma_addr->sa_family == AF_LINK) {
-				struct sockaddr_dl *in = (struct sockaddr_dl *)p->ifma_name;
-				struct sockaddr_dl *la = (struct sockaddr_dl *)p->ifma_addr;
-				if ((la->sdl_alen == 6)&&(in->sdl_nlen <= _dev.length())&&(!memcmp(_dev.data(),in->sdl_data,in->sdl_nlen)))
-					newGroups.insert(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen,6),0));
-			}
-			p = p->ifma_next;
-		}
-		freeifmaddrs(ifmap);
-	}
-
-	{
-		std::set<InetAddress> allIps(ips());
-		for(std::set<InetAddress>::const_iterator i(allIps.begin());i!=allIps.end();++i)
-			newGroups.insert(MulticastGroup::deriveMulticastGroupForAddressResolution(*i));
-	}
-
-	bool changed = false;
-
-	for(std::set<MulticastGroup>::iterator mg(newGroups.begin());mg!=newGroups.end();++mg) {
-		if (!groups.count(*mg)) {
-			groups.insert(*mg);
-			changed = true;
-		}
-	}
-	for(std::set<MulticastGroup>::iterator mg(groups.begin());mg!=groups.end();) {
-		if ((!newGroups.count(*mg))&&(*mg != _blindWildcardMulticastGroup)) {
-			groups.erase(mg++);
-			changed = true;
-		} else ++mg;
-	}
-
-	return changed;
-}
-*/
-
-void NetBSDEthernetTap::threadMain() throw()
-{
-	fd_set readfds, nullfds;
-	MAC to, from;
-	int n, nfds, r;
-	char getBuf[8194];
-
-	// Wait for a moment after startup -- wait for Network to finish
-	// constructing itself.
-	Thread::sleep(500);
-
-	FD_ZERO(&readfds);
-	FD_ZERO(&nullfds);
-	nfds = (int)std::max(_shutdownSignalPipe[0], _fd) + 1;
-
-	r = 0;
-	for (;;) {
-		FD_SET(_shutdownSignalPipe[0], &readfds);
-		FD_SET(_fd, &readfds);
-		select(nfds, &readfds, &nullfds, &nullfds, (struct timeval*)0);
-
-		if (FD_ISSET(_shutdownSignalPipe[0], &readfds))	  // writes to shutdown pipe terminate thread
-			break;
-
-		if (FD_ISSET(_fd, &readfds)) {
-			n = (int)::read(_fd, getBuf + r, sizeof(getBuf) - r);
-			if (n < 0) {
-				if ((errno != EINTR) && (errno != ETIMEDOUT))
-					break;
-			}
-			else {
-				// Some tap drivers like to send the ethernet frame and the
-				// payload in two chunks, so handle that by accumulating
-				// data until we have at least a frame.
-				r += n;
-				if (r > 14) {
-					if (r > ((int)_mtu + 14))	// sanity check for weird TAP behavior on some platforms
-						r = _mtu + 14;
-
-					if (_enabled) {
-						to.setTo(getBuf, 6);
-						from.setTo(getBuf + 6, 6);
-						unsigned int etherType = ntohs(((const uint16_t*)getBuf)[6]);
-						// TODO: VLAN support
-						_handler(_arg, _nwid, from, to, etherType, 0, (const void*)(getBuf + 14), r - 14);
-					}
-
-					r = 0;
-				}
-			}
-		}
-	}
-}
-
-}	// namespace ZeroTier
diff --git a/osdep/NetBSDEthernetTap.hpp b/osdep/NetBSDEthernetTap.hpp
deleted file mode 100644
index b505cb504..000000000
--- a/osdep/NetBSDEthernetTap.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_NetBSDEthernetTap_HPP
-#define ZT_NetBSDEthernetTap_HPP
-
-#include "../node/Constants.hpp"
-#include "../node/MAC.hpp"
-#include "../node/MulticastGroup.hpp"
-#include "EthernetTap.hpp"
-#include "Thread.hpp"
-
-#include <stdexcept>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string>
-#include <vector>
-
-namespace ZeroTier {
-
-class NetBSDEthernetTap : public EthernetTap {
-  public:
-	NetBSDEthernetTap(
-		const char* homePath,
-		const MAC& mac,
-		unsigned int mtu,
-		unsigned int metric,
-		uint64_t nwid,
-		const char* friendlyName,
-		void (*handler)(void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-		void* arg);
-
-	virtual ~NetBSDEthernetTap();
-
-	virtual void setEnabled(bool en);
-	virtual bool enabled() const;
-	virtual bool addIp(const InetAddress& ip);
-	virtual bool removeIp(const InetAddress& ip);
-	virtual std::vector<InetAddress> ips() const;
-	virtual void put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len);
-	virtual std::string deviceName() const;
-	virtual void setFriendlyName(const char* friendlyName);
-	virtual void scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed);
-	virtual void setDns(const char* domain, const std::vector<InetAddress>& servers)
-	{
-	}
-
-	void threadMain() throw();
-
-  private:
-	void (*_handler)(void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int);
-	void* _arg;
-	uint64_t _nwid;
-	Thread _thread;
-	std::string _dev;
-	std::vector<MulticastGroup> _multicastGroups;
-	unsigned int _mtu;
-	unsigned int _metric;
-	int _fd;
-	int _shutdownSignalPipe[2];
-	volatile bool _enabled;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp
index 41d144f1b..829322a30 100644
--- a/osdep/OSUtils.cpp
+++ b/osdep/OSUtils.cpp
@@ -1,140 +1,101 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <sys/stat.h>
 
 #include "../node/Constants.hpp"
-#include "../node/Utils.hpp"
-
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 
 #ifdef __UNIX_LIKE__
-#include <dirent.h>
+#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <netdb.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/uio.h>
-#include <unistd.h>
+#include <dirent.h>
+#include <netdb.h>
 #endif
 
 #ifdef __WINDOWS__
-#include <iphlpapi.h>
-#include <netioapi.h>
-#include <shlobj.h>
 #include <wincrypt.h>
-#include <windows.h>
 #endif
 
 #include "OSUtils.hpp"
 
-#ifdef __GCC__
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 namespace ZeroTier {
 
-unsigned int OSUtils::ztsnprintf(char* buf, unsigned int len, const char* fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	int n = (int)vsnprintf(buf, len, fmt, ap);
-	va_end(ap);
-
-	if ((n >= (int)len) || (n < 0)) {
-		if (len)
-			buf[len - 1] = (char)0;
-		throw std::length_error("buf[] overflow");
-	}
-
-	return (unsigned int)n;
-}
-
-std::string OSUtils::networkIDStr(const uint64_t nwid)
-{
-	char tmp[32] = {};
-	ztsnprintf(tmp, sizeof(tmp), "%.16" PRIx64, nwid);
-	return std::string(tmp);
-}
-
-std::string OSUtils::nodeIDStr(const uint64_t nid)
-{
-	char tmp[32] = {};
-	ztsnprintf(tmp, sizeof(tmp), "%.10" PRIx64, nid);
-	return std::string(tmp);
-}
-
 #ifdef __UNIX_LIKE__
-bool OSUtils::redirectUnixOutputs(const char* stdoutPath, const char* stderrPath) throw()
+bool OSUtils::redirectUnixOutputs(const char *stdoutPath,const char *stderrPath)
+	throw()
 {
-	int fdout = ::open(stdoutPath, O_WRONLY | O_CREAT, 0600);
+	int fdout = ::open(stdoutPath,O_WRONLY|O_CREAT,0600);
 	if (fdout > 0) {
 		int fderr;
 		if (stderrPath) {
-			fderr = ::open(stderrPath, O_WRONLY | O_CREAT, 0600);
+			fderr = ::open(stderrPath,O_WRONLY|O_CREAT,0600);
 			if (fderr <= 0) {
 				::close(fdout);
 				return false;
 			}
-		}
-		else
-			fderr = fdout;
+		} else fderr = fdout;
 		::close(STDOUT_FILENO);
 		::close(STDERR_FILENO);
-		::dup2(fdout, STDOUT_FILENO);
-		::dup2(fderr, STDERR_FILENO);
+		::dup2(fdout,STDOUT_FILENO);
+		::dup2(fderr,STDERR_FILENO);
 		return true;
 	}
 	return false;
 }
-#endif	 // __UNIX_LIKE__
+#endif // __UNIX_LIKE__
 
-std::vector<std::string> OSUtils::listDirectory(const char* path, bool includeDirectories)
+std::vector<std::string> OSUtils::listDirectory(const char *path)
 {
 	std::vector<std::string> r;
 
 #ifdef __WINDOWS__
 	HANDLE hFind;
 	WIN32_FIND_DATAA ffd;
-	if ((hFind = FindFirstFileA((std::string(path) + "\\*").c_str(), &ffd)) != INVALID_HANDLE_VALUE) {
+	if ((hFind = FindFirstFileA((std::string(path) + "\\*").c_str(),&ffd)) != INVALID_HANDLE_VALUE) {
 		do {
-			if ((strcmp(ffd.cFileName, ".")) && (strcmp(ffd.cFileName, "..")) && (((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) || (((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0) && (includeDirectories))))
+			if ((strcmp(ffd.cFileName,"."))&&(strcmp(ffd.cFileName,".."))&&((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0))
 				r.push_back(std::string(ffd.cFileName));
-		} while (FindNextFileA(hFind, &ffd));
+		} while (FindNextFileA(hFind,&ffd));
 		FindClose(hFind);
 	}
 #else
 	struct dirent de;
-	struct dirent* dptr;
-	DIR* d = opendir(path);
-	if (! d)
+	struct dirent *dptr;
+	DIR *d = opendir(path);
+	if (!d)
 		return r;
-	dptr = (struct dirent*)0;
-	for (;;) {
-		if (readdir_r(d, &de, &dptr))
+	dptr = (struct dirent *)0;
+	for(;;) {
+		if (readdir_r(d,&de,&dptr))
 			break;
 		if (dptr) {
-			if ((strcmp(dptr->d_name, ".")) && (strcmp(dptr->d_name, "..")) && ((dptr->d_type != DT_DIR) || (includeDirectories)))
+			if ((strcmp(dptr->d_name,"."))&&(strcmp(dptr->d_name,".."))&&(dptr->d_type != DT_DIR))
 				r.push_back(std::string(dptr->d_name));
-		}
-		else
-			break;
+		} else break;
 	}
 	closedir(d);
 #endif
@@ -142,118 +103,10 @@ std::vector<std::string> OSUtils::listDirectory(const char* path, bool includeDi
 	return r;
 }
 
-long OSUtils::cleanDirectory(const char* path, const int64_t olderThan)
-{
-	long cleaned = 0;
-
-#ifdef __WINDOWS__
-	HANDLE hFind;
-	WIN32_FIND_DATAA ffd;
-	LARGE_INTEGER date, adjust;
-	adjust.QuadPart = 11644473600000 * 10000;
-	char tmp[4096];
-	if ((hFind = FindFirstFileA((std::string(path) + "\\*").c_str(), &ffd)) != INVALID_HANDLE_VALUE) {
-		do {
-			if ((strcmp(ffd.cFileName, ".")) && (strcmp(ffd.cFileName, "..")) && ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)) {
-				date.HighPart = ffd.ftLastWriteTime.dwHighDateTime;
-				date.LowPart = ffd.ftLastWriteTime.dwLowDateTime;
-				if (date.QuadPart > 0) {
-					date.QuadPart -= adjust.QuadPart;
-					if ((int64_t)((date.QuadPart / 10000000) * 1000) < olderThan) {
-						ztsnprintf(tmp, sizeof(tmp), "%s\\%s", path, ffd.cFileName);
-						if (DeleteFileA(tmp))
-							++cleaned;
-					}
-				}
-			}
-		} while (FindNextFileA(hFind, &ffd));
-		FindClose(hFind);
-	}
-#else
-	struct dirent de;
-	struct dirent* dptr;
-	struct stat st;
-	char tmp[4096];
-	DIR* d = opendir(path);
-	if (! d)
-		return -1;
-	dptr = (struct dirent*)0;
-	for (;;) {
-		if (readdir_r(d, &de, &dptr))
-			break;
-		if (dptr) {
-			if ((strcmp(dptr->d_name, ".")) && (strcmp(dptr->d_name, "..")) && (dptr->d_type == DT_REG)) {
-				ztsnprintf(tmp, sizeof(tmp), "%s/%s", path, dptr->d_name);
-				if (stat(tmp, &st) == 0) {
-					int64_t mt = (int64_t)(st.st_mtime);
-					if ((mt > 0) && ((mt * 1000) < olderThan)) {
-						if (unlink(tmp) == 0)
-							++cleaned;
-					}
-				}
-			}
-		}
-		else
-			break;
-	}
-	closedir(d);
-#endif
-
-	return cleaned;
-}
-
-bool OSUtils::rmDashRf(const char* path)
-{
-#ifdef __WINDOWS__
-	HANDLE hFind;
-	WIN32_FIND_DATAA ffd;
-	if ((hFind = FindFirstFileA((std::string(path) + "\\*").c_str(), &ffd)) != INVALID_HANDLE_VALUE) {
-		do {
-			if ((strcmp(ffd.cFileName, ".") != 0) && (strcmp(ffd.cFileName, "..") != 0)) {
-				if ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-					if (DeleteFileA((std::string(path) + ZT_PATH_SEPARATOR_S + ffd.cFileName).c_str()) == FALSE)
-						return false;
-				}
-				else {
-					if (! rmDashRf((std::string(path) + ZT_PATH_SEPARATOR_S + ffd.cFileName).c_str()))
-						return false;
-				}
-			}
-		} while (FindNextFileA(hFind, &ffd));
-		FindClose(hFind);
-	}
-	return (RemoveDirectoryA(path) != FALSE);
-#else
-	struct dirent de;
-	struct dirent* dptr;
-	DIR* d = opendir(path);
-	if (! d)
-		return true;
-	dptr = (struct dirent*)0;
-	for (;;) {
-		if (readdir_r(d, &de, &dptr) != 0)
-			break;
-		if (! dptr)
-			break;
-		if ((strcmp(dptr->d_name, ".") != 0) && (strcmp(dptr->d_name, "..") != 0) && (strlen(dptr->d_name) > 0)) {
-			std::string p(path);
-			p.push_back(ZT_PATH_SEPARATOR);
-			p.append(dptr->d_name);
-			if (unlink(p.c_str()) != 0) {	// unlink first will remove symlinks instead of recursing them
-				if (! rmDashRf(p.c_str()))
-					return false;
-			}
-		}
-	}
-	closedir(d);
-	return (rmdir(path) == 0);
-#endif
-}
-
-void OSUtils::lockDownFile(const char* path, bool isDir)
+void OSUtils::lockDownFile(const char *path,bool isDir)
 {
 #ifdef __UNIX_LIKE__
-	chmod(path, isDir ? 0700 : 0600);
+	chmod(path,isDir ? 0700 : 0600);
 #else
 #ifdef __WINDOWS__
 	{
@@ -261,29 +114,19 @@ void OSUtils::lockDownFile(const char* path, bool isDir)
 		PROCESS_INFORMATION processInfo;
 
 		startupInfo.cb = sizeof(startupInfo);
-		memset(&startupInfo, 0, sizeof(STARTUPINFOA));
-		memset(&processInfo, 0, sizeof(PROCESS_INFORMATION));
-		if (CreateProcessA(NULL, (LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /inheritance:d /Q").c_str(), NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
-			WaitForSingleObject(processInfo.hProcess, INFINITE);
+		memset(&startupInfo,0,sizeof(STARTUPINFOA));
+		memset(&processInfo,0,sizeof(PROCESS_INFORMATION));
+		if (CreateProcessA(NULL,(LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /inheritance:d /Q").c_str(),NULL,NULL,FALSE,CREATE_NO_WINDOW,NULL,NULL,&startupInfo,&processInfo)) {
+			WaitForSingleObject(processInfo.hProcess,INFINITE);
 			CloseHandle(processInfo.hProcess);
 			CloseHandle(processInfo.hThread);
 		}
 
 		startupInfo.cb = sizeof(startupInfo);
-		memset(&startupInfo, 0, sizeof(STARTUPINFOA));
-		memset(&processInfo, 0, sizeof(PROCESS_INFORMATION));
-		if (CreateProcessA(NULL, (LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /remove *S-1-5-32-545 /Q").c_str(), NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
-			WaitForSingleObject(processInfo.hProcess, INFINITE);
-			CloseHandle(processInfo.hProcess);
-			CloseHandle(processInfo.hThread);
-		}
-
-		// Remove 'Everyone' group from R/RX access
-		startupInfo.cb = sizeof(startupInfo);
-		memset(&startupInfo, 0, sizeof(STARTUPINFOA));
-		memset(&processInfo, 0, sizeof(PROCESS_INFORMATION));
-		if (CreateProcessA(NULL, (LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /remove:g Everyone /t /c /Q").c_str(), NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
-			WaitForSingleObject(processInfo.hProcess, INFINITE);
+		memset(&startupInfo,0,sizeof(STARTUPINFOA));
+		memset(&processInfo,0,sizeof(PROCESS_INFORMATION));
+		if (CreateProcessA(NULL,(LPSTR)(std::string("C:\\Windows\\System32\\icacls.exe \"") + path + "\" /remove *S-1-5-32-545 /Q").c_str(),NULL,NULL,FALSE,CREATE_NO_WINDOW,NULL,NULL,&startupInfo,&processInfo)) {
+			WaitForSingleObject(processInfo.hProcess,INFINITE);
 			CloseHandle(processInfo.hProcess);
 			CloseHandle(processInfo.hThread);
 		}
@@ -292,28 +135,28 @@ void OSUtils::lockDownFile(const char* path, bool isDir)
 #endif
 }
 
-uint64_t OSUtils::getLastModified(const char* path)
+uint64_t OSUtils::getLastModified(const char *path)
 {
 	struct stat s;
-	if (stat(path, &s))
+	if (stat(path,&s))
 		return 0;
 	return (((uint64_t)s.st_mtime) * 1000ULL);
 }
 
-bool OSUtils::fileExists(const char* path, bool followLinks)
+bool OSUtils::fileExists(const char *path,bool followLinks)
 {
 	struct stat s;
 #ifdef __UNIX_LIKE__
-	if (! followLinks)
-		return (lstat(path, &s) == 0);
+	if (!followLinks)
+		return (lstat(path,&s) == 0);
 #endif
-	return (stat(path, &s) == 0);
+	return (stat(path,&s) == 0);
 }
 
-int64_t OSUtils::getFileSize(const char* path)
+int64_t OSUtils::getFileSize(const char *path)
 {
 	struct stat s;
-	if (stat(path, &s))
+	if (stat(path,&s))
 		return -1;
 #ifdef __WINDOWS__
 	return s.st_size;
@@ -324,17 +167,44 @@ int64_t OSUtils::getFileSize(const char* path)
 	return -1;
 }
 
-bool OSUtils::readFile(const char* path, std::string& buf)
+std::vector<InetAddress> OSUtils::resolve(const char *name)
 {
-	char tmp[16384];
-	FILE* f = fopen(path, "rb");
+	std::vector<InetAddress> r;
+	std::vector<InetAddress>::iterator i;
+	InetAddress tmp;
+	struct addrinfo *ai = (struct addrinfo *)0,*p;
+	if (!getaddrinfo(name,(const char *)0,(const struct addrinfo *)0,&ai)) {
+		try {
+			p = ai;
+			while (p) {
+				if ((p->ai_addr)&&((p->ai_addr->sa_family == AF_INET)||(p->ai_addr->sa_family == AF_INET6))) {
+					tmp = *(p->ai_addr);
+					for(i=r.begin();i!=r.end();++i) {
+						if (i->ipsEqual(tmp))
+							goto skip_add_inetaddr;
+					}
+					r.push_back(tmp);
+				}
+skip_add_inetaddr:
+				p = p->ai_next;
+			}
+		} catch ( ... ) {}
+		freeaddrinfo(ai);
+	}
+	std::sort(r.begin(),r.end());
+	return r;
+}
+
+bool OSUtils::readFile(const char *path,std::string &buf)
+{
+	char tmp[1024];
+	FILE *f = fopen(path,"rb");
 	if (f) {
-		for (;;) {
-			long n = (long)fread(tmp, 1, sizeof(tmp), f);
+		for(;;) {
+			long n = (long)fread(tmp,1,sizeof(tmp),f);
 			if (n > 0)
-				buf.append(tmp, n);
-			else
-				break;
+				buf.append(tmp,n);
+			else break;
 		}
 		fclose(f);
 		return true;
@@ -342,15 +212,14 @@ bool OSUtils::readFile(const char* path, std::string& buf)
 	return false;
 }
 
-bool OSUtils::writeFile(const char* path, const void* buf, unsigned int len)
+bool OSUtils::writeFile(const char *path,const void *buf,unsigned int len)
 {
-	FILE* f = fopen(path, "wb");
+	FILE *f = fopen(path,"wb");
 	if (f) {
-		if ((long)fwrite(buf, 1, len, f) != (long)len) {
+		if ((long)fwrite(buf,1,len,f) != (long)len) {
 			fclose(f);
 			return false;
-		}
-		else {
+		} else {
 			fclose(f);
 			return true;
 		}
@@ -358,275 +227,7 @@ bool OSUtils::writeFile(const char* path, const void* buf, unsigned int len)
 	return false;
 }
 
-std::vector<std::string> OSUtils::split(const char* s, const char* const sep, const char* esc, const char* quot)
-{
-	std::vector<std::string> fields;
-	std::string buf;
-
-	if (! esc)
-		esc = "";
-	if (! quot)
-		quot = "";
-
-	bool escapeState = false;
-	char quoteState = 0;
-	while (*s) {
-		if (escapeState) {
-			escapeState = false;
-			buf.push_back(*s);
-		}
-		else if (quoteState) {
-			if (*s == quoteState) {
-				quoteState = 0;
-				fields.push_back(buf);
-				buf.clear();
-			}
-			else
-				buf.push_back(*s);
-		}
-		else {
-			const char* quotTmp;
-			if (strchr(esc, *s))
-				escapeState = true;
-			else if ((buf.size() <= 0) && ((quotTmp = strchr(quot, *s))))
-				quoteState = *quotTmp;
-			else if (strchr(sep, *s)) {
-				if (! buf.empty()) {
-					fields.push_back(buf);
-					buf.clear();
-				}	// else skip runs of separators
-			}
-			else
-				buf.push_back(*s);
-		}
-		++s;
-	}
-
-	if (buf.size())
-		fields.push_back(buf);
-
-	return fields;
-}
-
-std::string OSUtils::platformDefaultHomePath()
-{
-#ifdef __QNAP__
-	char* cmd = "/sbin/getcfg zerotier Install_Path -f /etc/config/qpkg.conf";
-	char buf[128];
-	FILE* fp;
-	if ((fp = popen(cmd, "r")) == NULL) {
-		printf("Error opening pipe!\n");
-		return NULL;
-	}
-	while (fgets(buf, 128, fp) != NULL) {}
-	if (pclose(fp)) {
-		printf("Command not found or exited with error status\n");
-		return NULL;
-	}
-	std::string homeDir = std::string(buf);
-	homeDir.erase(std::remove(homeDir.begin(), homeDir.end(), '\n'), homeDir.end());
-	return homeDir;
-#endif
-#ifdef __UBIQUITI__
-	// Only persistent location after firmware upgrades
-	return std::string("/config/zerotier-one");
-#endif
-
-	// Check for user-defined environment variable before using defaults
-#ifdef __WINDOWS__
-	DWORD bufferSize = 65535;
-	std::string userDefinedPath;
-	bufferSize = GetEnvironmentVariable("ZEROTIER_HOME", &userDefinedPath[0], bufferSize);
-	if (bufferSize) {
-		return userDefinedPath;
-	}
-#else
-	if (const char* userDefinedPath = getenv("ZEROTIER_HOME")) {
-		return std::string(userDefinedPath);
-	}
-#endif
-
-	// Finally, resort to using default paths if no user-defined path was provided
-#ifdef __UNIX_LIKE__
-
-#ifdef __APPLE__
-	// /Library/... on Apple
-	return std::string("/Library/Application Support/ZeroTier/One");
-#else
-
-#ifdef __BSD__
-	// BSD likes /var/db instead of /var/lib
-	return std::string("/var/db/zerotier-one");
-#else
-	// Use /var/lib for Linux and other *nix
-	return std::string("/var/lib/zerotier-one");
-#endif
-
-#endif
-
-#else	// not __UNIX_LIKE__
-
-#ifdef __WINDOWS__
-	// Look up app data folder on Windows, e.g. C:\ProgramData\...
-	char buf[16384];
-	if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_COMMON_APPDATA, NULL, 0, buf)))
-		return (std::string(buf) + "\\ZeroTier\\One");
-	else
-		return std::string("C:\\ZeroTier\\One");
-#else
-
-	return (std::string(ZT_PATH_SEPARATOR_S) + "ZeroTier" + ZT_PATH_SEPARATOR_S + "One");	// UNKNOWN PLATFORM
-
-#endif
-
-#endif	 // __UNIX_LIKE__ or not...
-}
-
-#ifndef OMIT_JSON_SUPPORT
-// Inline these massive JSON operations in one place only to reduce binary footprint and compile time
-nlohmann::json OSUtils::jsonParse(const std::string& buf)
-{
-	return nlohmann::json::parse(buf.c_str());
-}
-std::string OSUtils::jsonDump(const nlohmann::json& j, int indentation)
-{
-	return j.dump(indentation);
-}
-
-uint64_t OSUtils::jsonInt(const nlohmann::json& jv, const uint64_t dfl)
-{
-	try {
-		if (jv.is_number()) {
-			return (uint64_t)jv;
-		}
-		else if (jv.is_string()) {
-			std::string s = jv;
-			return Utils::strToU64(s.c_str());
-		}
-		else if (jv.is_boolean()) {
-			return ((bool)jv ? 1ULL : 0ULL);
-		}
-	}
-	catch (...) {
-	}
-	return dfl;
-}
-
-double OSUtils::jsonDouble(const nlohmann::json& jv, const double dfl)
-{
-	try {
-		if (jv.is_number()) {
-			return (double)jv;
-		}
-		else if (jv.is_string()) {
-			std::string s = jv;
-			return Utils::strToDouble(s.c_str());
-		}
-		else if (jv.is_boolean()) {
-			return (double)jv;
-		}
-	}
-	catch (...) {
-	}
-	return dfl;
-}
-
-uint64_t OSUtils::jsonIntHex(const nlohmann::json& jv, const uint64_t dfl)
-{
-	try {
-		if (jv.is_number()) {
-			return (uint64_t)jv;
-		}
-		else if (jv.is_string()) {
-			std::string s = jv;
-			return Utils::hexStrToU64(s.c_str());
-		}
-		else if (jv.is_boolean()) {
-			return ((bool)jv ? 1ULL : 0ULL);
-		}
-	}
-	catch (...) {
-	}
-	return dfl;
-}
-
-bool OSUtils::jsonBool(const nlohmann::json& jv, const bool dfl)
-{
-	try {
-		if (jv.is_boolean()) {
-			return (bool)jv;
-		}
-		else if (jv.is_number()) {
-			return ((uint64_t)jv > 0ULL);
-		}
-		else if (jv.is_string()) {
-			std::string s = jv;
-			if (s.length() > 0) {
-				switch (s[0]) {
-					case 't':
-					case 'T':
-					case '1':
-						return true;
-				}
-			}
-			return false;
-		}
-	}
-	catch (...) {
-	}
-	return dfl;
-}
-
-std::string OSUtils::jsonString(const nlohmann::json& jv, const char* dfl)
-{
-	try {
-		if (jv.is_string()) {
-			return jv;
-		}
-		else if (jv.is_number()) {
-			char tmp[64];
-			ztsnprintf(tmp, sizeof(tmp), "%llu", (uint64_t)jv);
-			return tmp;
-		}
-		else if (jv.is_boolean()) {
-			return ((bool)jv ? std::string("1") : std::string("0"));
-		}
-	}
-	catch (...) {
-	}
-	return std::string((dfl) ? dfl : "");
-}
-
-std::string OSUtils::jsonBinFromHex(const nlohmann::json& jv)
-{
-	std::string s(jsonString(jv, ""));
-	if (s.length() > 0) {
-		unsigned int buflen = (unsigned int)((s.length() / 2) + 1);
-		char* buf = new char[buflen];
-		try {
-			unsigned int l = Utils::unhex(s.c_str(), buf, buflen);
-			std::string b(buf, l);
-			delete[] buf;
-			return b;
-		}
-		catch (...) {
-			delete[] buf;
-		}
-	}
-	return std::string();
-}
-
-#endif	 // OMIT_JSON_SUPPORT
-
 // Used to convert HTTP header names to ASCII lower case
-const unsigned char OSUtils::TOLOWER_TABLE[256] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c,
-													0x1d, 0x1e, 0x1f, ' ',	'!',  '"',	'#',  '$',	'%',  '&',	0x27, '(',	')',  '*',	'+',  ',',	'-',  '.',	'/',  '0',	'1',  '2',	'3',  '4',	'5',  '6',	'7',  '8',	'9',
-													':',  ';',	'<',  '=',	'>',  '?',	'@',  'a',	'b',  'c',	'd',  'e',	'f',  'g',	'h',  'i',	'j',  'k',	'l',  'm',	'n',  'o',	'p',  'q',	'r',  's',	't',  'u',	'v',
-													'w',  'x',	'y',  'z',	'{',  '|',	'}',  '~',	'_',  '`',	'a',  'b',	'c',  'd',	'e',  'f',	'g',  'h',	'i',  'j',	'k',  'l',	'm',  'n',	'o',  'p',	'q',  'r',	's',
-													't',  'u',	'v',  'w',	'x',  'y',	'z',  '{',	'|',  '}',	'~',  0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90,
-													0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad,
-													0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca,
-													0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-													0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff };
+const unsigned char OSUtils::TOLOWER_TABLE[256] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, ' ', '!', '"', '#', '$', '%', '&', 0x27, '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '@', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~', '_', '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~', 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/osdep/OSUtils.hpp b/osdep/OSUtils.hpp
index c105612f7..80f7bfe08 100644
--- a/osdep/OSUtils.hpp
+++ b/osdep/OSUtils.hpp
@@ -1,48 +1,48 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_OSUTILS_HPP
 #define ZT_OSUTILS_HPP
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <time.h>
+
+#include <string>
+#include <stdexcept>
+#include <vector>
+#include <map>
+
 #include "../node/Constants.hpp"
 #include "../node/InetAddress.hpp"
 
-#include <map>
-#include <stdexcept>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <vector>
-
 #ifdef __WINDOWS__
-#include <shlwapi.h>
-#include <windows.h>
-#include <winsock2.h>
+#include <WinSock2.h>
+#include <Windows.h>
+#include <Shlwapi.h>
 #else
-#include <arpa/inet.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
 #include <unistd.h>
-#ifdef __LINUX__
-#include <sys/syscall.h>
-#endif
-#endif
-
-#ifndef OMIT_JSON_SUPPORT
-#include <nlohmann/json.hpp>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <arpa/inet.h>
 #endif
 
 namespace ZeroTier {
@@ -50,38 +50,9 @@ namespace ZeroTier {
 /**
  * Miscellaneous utility functions and global constants
  */
-class OSUtils {
-  public:
-	/**
-	 * Variant of snprintf that is portable and throws an exception
-	 *
-	 * This just wraps the local implementation whatever it's called, while
-	 * performing a few other checks and adding exceptions for overflow.
-	 *
-	 * @param buf Buffer to write to
-	 * @param len Length of buffer in bytes
-	 * @param fmt Format string
-	 * @param ... Format arguments
-	 * @throws std::length_error buf[] too short (buf[] will still be left null-terminated)
-	 */
-	static unsigned int ztsnprintf(char* buf, unsigned int len, const char* fmt, ...);
-
-	/**
-	 * Converts a uint64_t network ID into a string
-	 *
-	 * @param nwid network ID
-	 * @throws std::length_error buf[] too short (buf[] will still be left null-terminated)
-	 */
-	static std::string networkIDStr(const uint64_t nwid);
-
-	/**
-	 * Converts a uint64_t node ID into a string
-	 *
-	 * @param nid node ID
-	 * @throws std::length_error buf[] too short (buf[] will still be left null-terminated)
-	 */
-	static std::string nodeIDStr(const uint64_t nid);
-
+class OSUtils
+{
+public:
 #ifdef __UNIX_LIKE__
 	/**
 	 * Close STDOUT_FILENO and STDERR_FILENO and replace them with output to given path
@@ -93,8 +64,9 @@ class OSUtils {
 	 * @param stderrPath Path to file to use for stderr, or NULL for same as stdout (default)
 	 * @return True on success
 	 */
-	static bool redirectUnixOutputs(const char* stdoutPath, const char* stderrPath = (const char*)0) throw();
-#endif	 // __UNIX_LIKE__
+	static bool redirectUnixOutputs(const char *stdoutPath,const char *stderrPath = (const char *)0)
+		throw();
+#endif // __UNIX_LIKE__
 
 	/**
 	 * Delete a file
@@ -102,7 +74,8 @@ class OSUtils {
 	 * @param path Path to delete
 	 * @return True if delete was successful
 	 */
-	static inline bool rm(const char* path)
+	static inline bool rm(const char *path)
+		throw()
 	{
 #ifdef __WINDOWS__
 		return (DeleteFileA(path) != FALSE);
@@ -110,64 +83,31 @@ class OSUtils {
 		return (unlink(path) == 0);
 #endif
 	}
-	static inline bool rm(const std::string& path)
-	{
-		return rm(path.c_str());
-	}
+	static inline bool rm(const std::string &path) throw() { return rm(path.c_str()); }
 
-	static inline bool mkdir(const char* path)
+	static inline bool mkdir(const char *path)
 	{
 #ifdef __WINDOWS__
 		if (::PathIsDirectoryA(path))
 			return true;
-		return (::CreateDirectoryA(path, NULL) == TRUE);
+		return (::CreateDirectoryA(path,NULL) == TRUE);
 #else
-		if (::mkdir(path, 0755) != 0)
+		if (::mkdir(path,0755) != 0)
 			return (errno == EEXIST);
 		return true;
 #endif
 	}
-	static inline bool mkdir(const std::string& path)
-	{
-		return OSUtils::mkdir(path.c_str());
-	}
-
-	static inline bool rename(const char* o, const char* n)
-	{
-#ifdef __WINDOWS__
-		DeleteFileA(n);
-		return (::rename(o, n) == 0);
-#else
-		return (::rename(o, n) == 0);
-#endif
-	}
+	static inline bool mkdir(const std::string &path) throw() { return OSUtils::mkdir(path.c_str()); }
 
 	/**
 	 * List a directory's contents
 	 *
+	 * This returns only files, not sub-directories.
+	 *
 	 * @param path Path to list
-	 * @param includeDirectories If true, include directories as well as files
-	 * @return Names of files in directory (without path prepended)
+	 * @return Names of files in directory
 	 */
-	static std::vector<std::string> listDirectory(const char* path, bool includeDirectories = false);
-
-	/**
-	 * Clean a directory of files whose last modified time is older than this
-	 *
-	 * This ignores directories, symbolic links, and other special files.
-	 *
-	 * @param olderThan Last modified older than timestamp (ms since epoch)
-	 * @return Number of cleaned files or negative on fatal error
-	 */
-	static long cleanDirectory(const char* path, const int64_t olderThan);
-
-	/**
-	 * Delete a directory and all its files and subdirectories recursively
-	 *
-	 * @param path Path to delete
-	 * @return True on success
-	 */
-	static bool rmDashRf(const char* path);
+	static std::vector<std::string> listDirectory(const char *path);
 
 	/**
 	 * Set modes on a file to something secure
@@ -178,7 +118,7 @@ class OSUtils {
 	 * @param path Path to lock
 	 * @param isDir True if this is a directory
 	 */
-	static void lockDownFile(const char* path, bool isDir);
+	static void lockDownFile(const char *path,bool isDir);
 
 	/**
 	 * Get file last modification time
@@ -189,20 +129,20 @@ class OSUtils {
 	 * @param path Path to file to get time
 	 * @return Last modification time in ms since epoch or 0 if not found
 	 */
-	static uint64_t getLastModified(const char* path);
+	static uint64_t getLastModified(const char *path);
 
 	/**
 	 * @param path Path to check
 	 * @param followLinks Follow links (on platforms with that concept)
 	 * @return True if file or directory exists at path location
 	 */
-	static bool fileExists(const char* path, bool followLinks = true);
+	static bool fileExists(const char *path,bool followLinks = true);
 
 	/**
 	 * @param path Path to file
 	 * @return File size or -1 if nonexistent or other failure
 	 */
-	static int64_t getFileSize(const char* path);
+	static int64_t getFileSize(const char *path);
 
 	/**
 	 * Get IP (v4 and/or v6) addresses for a given host
@@ -212,29 +152,52 @@ class OSUtils {
 	 * @param name Host name
 	 * @return IP addresses in InetAddress sort order or empty vector if not found
 	 */
-	static std::vector<InetAddress> resolve(const char* name);
+	static std::vector<InetAddress> resolve(const char *name);
 
 	/**
 	 * @return Current time in milliseconds since epoch
 	 */
-	static inline int64_t now()
+	static inline uint64_t now()
+		throw()
 	{
 #ifdef __WINDOWS__
 		FILETIME ft;
 		SYSTEMTIME st;
 		ULARGE_INTEGER tmp;
 		GetSystemTime(&st);
-		SystemTimeToFileTime(&st, &ft);
+		SystemTimeToFileTime(&st,&ft);
 		tmp.LowPart = ft.dwLowDateTime;
 		tmp.HighPart = ft.dwHighDateTime;
-		return (int64_t)(((tmp.QuadPart - 116444736000000000LL) / 10000L) + st.wMilliseconds);
+		return ( ((tmp.QuadPart - 116444736000000000ULL) / 10000L) + st.wMilliseconds );
 #else
 		struct timeval tv;
-		gettimeofday(&tv, (struct timezone*)0);
-		return ((1000LL * (int64_t)tv.tv_sec) + (int64_t)(tv.tv_usec / 1000));
+		gettimeofday(&tv,(struct timezone *)0);
+		return ( (1000ULL * (uint64_t)tv.tv_sec) + (uint64_t)(tv.tv_usec / 1000) );
 #endif
 	};
 
+	/**
+	 * @return Current time in seconds since epoch, to the highest available resolution
+	 */
+	static inline double nowf()
+		throw()
+	{
+#ifdef __WINDOWS__
+		FILETIME ft;
+		SYSTEMTIME st;
+		ULARGE_INTEGER tmp;
+		GetSystemTime(&st);
+		SystemTimeToFileTime(&st,&ft);
+		tmp.LowPart = ft.dwLowDateTime;
+		tmp.HighPart = ft.dwHighDateTime;
+		return (((double)(tmp.QuadPart - 116444736000000000ULL)) / 10000000.0);
+#else
+		struct timeval tv;
+		gettimeofday(&tv,(struct timezone *)0);
+		return ( ((double)tv.tv_sec) + (((double)tv.tv_usec) / 1000000.0) );
+#endif
+	}
+
 	/**
 	 * Read the full contents of a file into a string buffer
 	 *
@@ -245,7 +208,7 @@ class OSUtils {
 	 * @param buf Buffer to fill
 	 * @return True if open and read successful
 	 */
-	static bool readFile(const char* path, std::string& buf);
+	static bool readFile(const char *path,std::string &buf);
 
 	/**
 	 * Write a block of data to disk, replacing any current file contents
@@ -255,18 +218,7 @@ class OSUtils {
 	 * @param len Length of buffer
 	 * @return True if entire file was successfully written
 	 */
-	static bool writeFile(const char* path, const void* buf, unsigned int len);
-
-	/**
-	 * Split a string by delimiter, with optional escape and quote characters
-	 *
-	 * @param s String to split
-	 * @param sep One or more separators
-	 * @param esc Zero or more escape characters
-	 * @param quot Zero or more quote characters
-	 * @return Vector of tokens
-	 */
-	static std::vector<std::string> split(const char* s, const char* const sep, const char* esc, const char* quot);
+	static bool writeFile(const char *path,const void *buf,unsigned int len);
 
 	/**
 	 * Write a block of data to disk, replacing any current file contents
@@ -275,40 +227,18 @@ class OSUtils {
 	 * @param s Data to write
 	 * @return True if entire file was successfully written
 	 */
-	static inline bool writeFile(const char* path, const std::string& s)
-	{
-		return writeFile(path, s.data(), (unsigned int)s.length());
-	}
+	static inline bool writeFile(const char *path,const std::string &s) { return writeFile(path,s.data(),(unsigned int)s.length()); }
 
 	/**
 	 * @param c ASCII character to convert
 	 * @return Lower case ASCII character or unchanged if not a letter
 	 */
-	static inline char toLower(char c) throw()
-	{
-		return (char)OSUtils::TOLOWER_TABLE[(unsigned long)c];
-	}
+	static inline char toLower(char c) throw() { return (char)OSUtils::TOLOWER_TABLE[(unsigned long)c]; }
 
-	/**
-	 * @return Platform default ZeroTier One home path
-	 */
-	static std::string platformDefaultHomePath();
-
-#ifndef OMIT_JSON_SUPPORT
-	static nlohmann::json jsonParse(const std::string& buf);
-	static std::string jsonDump(const nlohmann::json& j, int indentation = 1);
-	static uint64_t jsonInt(const nlohmann::json& jv, const uint64_t dfl);
-	static double jsonDouble(const nlohmann::json& jv, const double dfl);
-	static uint64_t jsonIntHex(const nlohmann::json& jv, const uint64_t dfl);
-	static bool jsonBool(const nlohmann::json& jv, const bool dfl);
-	static std::string jsonString(const nlohmann::json& jv, const char* dfl);
-	static std::string jsonBinFromHex(const nlohmann::json& jv);
-#endif	 // OMIT_JSON_SUPPORT
-
-  private:
+private:
 	static const unsigned char TOLOWER_TABLE[256];
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/osdep/OSXEthernetTap.cpp b/osdep/OSXEthernetTap.cpp
new file mode 100644
index 000000000..8ffd2bffc
--- /dev/null
+++ b/osdep/OSXEthernetTap.cpp
@@ -0,0 +1,658 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <unistd.h>
+#include <signal.h>
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <sys/select.h>
+#include <sys/cdefs.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/route.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <netinet6/in6_var.h>
+#include <netinet/in_var.h>
+#include <netinet/icmp6.h>
+
+// OSX compile fix... in6_var defines this in a struct which namespaces it for C++ ... why?!?
+struct prf_ra {
+	u_char onlink : 1;
+	u_char autonomous : 1;
+	u_char reserved : 6;
+} prf_ra;
+
+#include <netinet6/nd6.h>
+#include <ifaddrs.h>
+
+// These are KERNEL_PRIVATE... why?
+#ifndef SIOCAUTOCONF_START
+#define SIOCAUTOCONF_START _IOWR('i', 132, struct in6_ifreq)    /* accept rtadvd on this interface */
+#endif
+#ifndef SIOCAUTOCONF_STOP
+#define SIOCAUTOCONF_STOP _IOWR('i', 133, struct in6_ifreq)    /* stop accepting rtadv for this interface */
+#endif
+
+// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+// This source is from:
+// http://www.opensource.apple.com/source/Libinfo/Libinfo-406.17/gen.subproj/getifmaddrs.c?txt
+// It's here because OSX 10.6 does not have this convenience function.
+
+#define	SALIGN	(sizeof(uint32_t) - 1)
+#define	SA_RLEN(sa)	((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : \
+(SALIGN + 1))
+#define	MAX_SYSCTL_TRY	5
+#define	RTA_MASKS	(RTA_GATEWAY | RTA_IFP | RTA_IFA)
+
+/* FreeBSD uses NET_RT_IFMALIST and RTM_NEWMADDR from <sys/socket.h> */
+/* We can use NET_RT_IFLIST2 and RTM_NEWMADDR2 on Darwin */
+//#define DARWIN_COMPAT
+
+//#ifdef DARWIN_COMPAT
+#define GIM_SYSCTL_MIB NET_RT_IFLIST2
+#define GIM_RTM_ADDR RTM_NEWMADDR2
+//#else
+//#define GIM_SYSCTL_MIB NET_RT_IFMALIST
+//#define GIM_RTM_ADDR RTM_NEWMADDR
+//#endif
+
+// Not in 10.6 includes so use our own
+struct _intl_ifmaddrs {
+	struct _intl_ifmaddrs *ifma_next;
+	struct sockaddr *ifma_name;
+	struct sockaddr *ifma_addr;
+	struct sockaddr *ifma_lladdr;
+};
+
+static inline int _intl_getifmaddrs(struct _intl_ifmaddrs **pif)
+{
+	int icnt = 1;
+	int dcnt = 0;
+	int ntry = 0;
+	size_t len;
+	size_t needed;
+	int mib[6];
+	int i;
+	char *buf;
+	char *data;
+	char *next;
+	char *p;
+	struct ifma_msghdr2 *ifmam;
+	struct _intl_ifmaddrs *ifa, *ift;
+	struct rt_msghdr *rtm;
+	struct sockaddr *sa;
+
+	mib[0] = CTL_NET;
+	mib[1] = PF_ROUTE;
+	mib[2] = 0;             /* protocol */
+	mib[3] = 0;             /* wildcard address family */
+	mib[4] = GIM_SYSCTL_MIB;
+	mib[5] = 0;             /* no flags */
+	do {
+		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+			return (-1);
+		if ((buf = (char *)malloc(needed)) == NULL)
+			return (-1);
+		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
+			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
+				free(buf);
+				return (-1);
+			}
+			free(buf);
+			buf = NULL;
+		}
+	} while (buf == NULL);
+
+	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
+		rtm = (struct rt_msghdr *)(void *)next;
+		if (rtm->rtm_version != RTM_VERSION)
+			continue;
+		switch (rtm->rtm_type) {
+			case GIM_RTM_ADDR:
+				ifmam = (struct ifma_msghdr2 *)(void *)rtm;
+				if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
+					break;
+				icnt++;
+				p = (char *)(ifmam + 1);
+				for (i = 0; i < RTAX_MAX; i++) {
+					if ((RTA_MASKS & ifmam->ifmam_addrs &
+						 (1 << i)) == 0)
+						continue;
+					sa = (struct sockaddr *)(void *)p;
+					len = SA_RLEN(sa);
+					dcnt += len;
+					p += len;
+				}
+				break;
+		}
+	}
+
+	data = (char *)malloc(sizeof(struct _intl_ifmaddrs) * icnt + dcnt);
+	if (data == NULL) {
+		free(buf);
+		return (-1);
+	}
+
+	ifa = (struct _intl_ifmaddrs *)(void *)data;
+	data += sizeof(struct _intl_ifmaddrs) * icnt;
+
+	memset(ifa, 0, sizeof(struct _intl_ifmaddrs) * icnt);
+	ift = ifa;
+
+	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
+		rtm = (struct rt_msghdr *)(void *)next;
+		if (rtm->rtm_version != RTM_VERSION)
+			continue;
+
+		switch (rtm->rtm_type) {
+			case GIM_RTM_ADDR:
+				ifmam = (struct ifma_msghdr2 *)(void *)rtm;
+				if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
+					break;
+
+				p = (char *)(ifmam + 1);
+				for (i = 0; i < RTAX_MAX; i++) {
+					if ((RTA_MASKS & ifmam->ifmam_addrs &
+						 (1 << i)) == 0)
+						continue;
+					sa = (struct sockaddr *)(void *)p;
+					len = SA_RLEN(sa);
+					switch (i) {
+						case RTAX_GATEWAY:
+							ift->ifma_lladdr =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						case RTAX_IFP:
+							ift->ifma_name =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						case RTAX_IFA:
+							ift->ifma_addr =
+							(struct sockaddr *)(void *)data;
+							memcpy(data, p, len);
+							data += len;
+							break;
+
+						default:
+							data += len;
+							break;
+					}
+					p += len;
+				}
+				ift->ifma_next = ift + 1;
+				ift = ift->ifma_next;
+				break;
+		}
+	}
+
+	free(buf);
+
+	if (ift > ifa) {
+		ift--;
+		ift->ifma_next = NULL;
+		*pif = ifa;
+	} else {
+		*pif = NULL;
+		free(ifa);
+	}
+	return (0);
+}
+
+static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs *ifmp)
+{
+	free(ifmp);
+}
+
+// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+
+#include <string>
+#include <map>
+#include <set>
+#include <algorithm>
+
+#include "../node/Constants.hpp"
+#include "../node/Utils.hpp"
+#include "../node/Mutex.hpp"
+#include "../node/Dictionary.hpp"
+#include "OSUtils.hpp"
+#include "OSXEthernetTap.hpp"
+
+// ff:ff:ff:ff:ff:ff with no ADI
+static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff),0);
+
+static inline bool _setIpv6Stuff(const char *ifname,bool performNUD,bool acceptRouterAdverts)
+{
+	struct in6_ndireq nd;
+	struct in6_ifreq ifr;
+
+	int s = socket(AF_INET6,SOCK_DGRAM,0);
+	if (s <= 0)
+		return false;
+
+	memset(&nd,0,sizeof(nd));
+	strncpy(nd.ifname,ifname,sizeof(nd.ifname));
+
+	if (ioctl(s,SIOCGIFINFO_IN6,&nd)) {
+		close(s);
+		return false;
+	}
+
+	unsigned long oldFlags = (unsigned long)nd.ndi.flags;
+
+	if (performNUD)
+		nd.ndi.flags |= ND6_IFF_PERFORMNUD;
+	else nd.ndi.flags &= ~ND6_IFF_PERFORMNUD;
+
+	if (oldFlags != (unsigned long)nd.ndi.flags) {
+		if (ioctl(s,SIOCSIFINFO_FLAGS,&nd)) {
+			close(s);
+			return false;
+		}
+	}
+
+	memset(&ifr,0,sizeof(ifr));
+	strncpy(ifr.ifr_name,ifname,sizeof(ifr.ifr_name));
+	if (ioctl(s,acceptRouterAdverts ? SIOCAUTOCONF_START : SIOCAUTOCONF_STOP,&ifr)) {
+		close(s);
+		return false;
+	}
+
+	close(s);
+	return true;
+}
+
+namespace ZeroTier {
+
+static long globalTapsRunning = 0;
+static Mutex globalTapCreateLock;
+
+OSXEthernetTap::OSXEthernetTap(
+	const char *homePath,
+	const MAC &mac,
+	unsigned int mtu,
+	unsigned int metric,
+	uint64_t nwid,
+	const char *friendlyName,
+	void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *data,unsigned int len),
+	void *arg) :
+	_handler(handler),
+	_arg(arg),
+	_nwid(nwid),
+	_homePath(homePath),
+	_mtu(mtu),
+	_metric(metric),
+	_fd(0),
+	_enabled(true)
+{
+	char devpath[64],ethaddr[64],mtustr[32],metstr[32],nwids[32];
+	struct stat stattmp;
+
+	Utils::snprintf(nwids,sizeof(nwids),"%.16llx",nwid);
+
+	if (mtu > 2800)
+		throw std::runtime_error("max tap MTU is 2800");
+
+	Mutex::Lock _gl(globalTapCreateLock);
+
+	if (::stat("/dev/zt0",&stattmp)) {
+		long kextpid = (long)vfork();
+		if (kextpid == 0) {
+			::chdir(homePath);
+			OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
+			::execl("/sbin/kextload","/sbin/kextload","-q","-repository",homePath,"tap.kext",(const char *)0);
+			::_exit(-1);
+		} else if (kextpid > 0) {
+			int exitcode = -1;
+			::waitpid(kextpid,&exitcode,0);
+		}
+		::usleep(500); // give tap device driver time to start up and try again
+		if (::stat("/dev/zt0",&stattmp))
+			throw std::runtime_error("/dev/zt# tap devices do not exist and cannot load tap.kext");
+	}
+
+	// Try to reopen the last device we had, if we had one and it's still unused.
+	bool recalledDevice = false;
+	std::string devmapbuf;
+	Dictionary devmap;
+	if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmapbuf)) {
+		devmap.fromString(devmapbuf);
+		std::string desiredDevice(devmap.get(nwids,""));
+		if (desiredDevice.length() > 2) {
+			Utils::snprintf(devpath,sizeof(devpath),"/dev/%s",desiredDevice.c_str());
+			if (stat(devpath,&stattmp) == 0) {
+				_fd = ::open(devpath,O_RDWR);
+				if (_fd > 0) {
+					_dev = desiredDevice;
+					recalledDevice = true;
+				}
+			}
+		}
+	}
+
+	// Open the first unused tap device if we didn't recall a previous one.
+	if (!recalledDevice) {
+		for(int i=0;i<64;++i) {
+			Utils::snprintf(devpath,sizeof(devpath),"/dev/zt%d",i);
+			if (stat(devpath,&stattmp))
+				throw std::runtime_error("no more TAP devices available");
+			_fd = ::open(devpath,O_RDWR);
+			if (_fd > 0) {
+				char foo[16];
+				Utils::snprintf(foo,sizeof(foo),"zt%d",i);
+				_dev = foo;
+				break;
+			}
+		}
+	}
+
+	if (_fd <= 0)
+		throw std::runtime_error("unable to open TAP device or no more devices available");
+
+	if (fcntl(_fd,F_SETFL,fcntl(_fd,F_GETFL) & ~O_NONBLOCK) == -1) {
+		::close(_fd);
+		throw std::runtime_error("unable to set flags on file descriptor for TAP device");
+	}
+
+	// Configure MAC address and MTU, bring interface up
+	Utils::snprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
+	Utils::snprintf(mtustr,sizeof(mtustr),"%u",_mtu);
+	Utils::snprintf(metstr,sizeof(metstr),"%u",_metric);
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"lladdr",ethaddr,"mtu",mtustr,"metric",metstr,"up",(const char *)0);
+		::_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		::waitpid(cpid,&exitcode,0);
+		if (exitcode) {
+			::close(_fd);
+			throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
+		}
+	}
+
+	_setIpv6Stuff(_dev.c_str(),true,false);
+
+	// Set close-on-exec so that devices cannot persist if we fork/exec for update
+	fcntl(_fd,F_SETFD,fcntl(_fd,F_GETFD) | FD_CLOEXEC);
+
+	::pipe(_shutdownSignalPipe);
+
+	++globalTapsRunning;
+
+	devmap[nwids] = _dev;
+	OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmap.toString());
+
+	_thread = Thread::start(this);
+}
+
+OSXEthernetTap::~OSXEthernetTap()
+{
+	::write(_shutdownSignalPipe[1],"\0",1); // causes thread to exit
+	Thread::join(_thread);
+
+	::close(_fd);
+	::close(_shutdownSignalPipe[0]);
+	::close(_shutdownSignalPipe[1]);
+
+	{
+		Mutex::Lock _gl(globalTapCreateLock);
+		if (--globalTapsRunning <= 0) {
+			globalTapsRunning = 0; // sanity check -- should not be possible
+
+			char tmp[16384];
+			sprintf(tmp,"%s/%s",_homePath.c_str(),"tap.kext");
+			long kextpid = (long)vfork();
+			if (kextpid == 0) {
+				OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
+				::execl("/sbin/kextunload","/sbin/kextunload",tmp,(const char *)0);
+				::_exit(-1);
+			} else if (kextpid > 0) {
+				int exitcode = -1;
+				::waitpid(kextpid,&exitcode,0);
+			}
+		}
+	}
+}
+
+void OSXEthernetTap::setEnabled(bool en)
+{
+	_enabled = en;
+	// TODO: interface status change
+}
+
+bool OSXEthernetTap::enabled() const
+{
+	return _enabled;
+}
+
+bool OSXEthernetTap::addIp(const InetAddress &ip)
+{
+	if (!ip)
+		return false;
+
+	long cpid = (long)vfork();
+	if (cpid == 0) {
+		::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),ip.isV4() ? "inet" : "inet6",ip.toString().c_str(),"alias",(const char *)0);
+		::_exit(-1);
+	} else if (cpid > 0) {
+		int exitcode = -1;
+		::waitpid(cpid,&exitcode,0);
+		return (exitcode == 0);
+	} // else return false...
+
+	return false;
+}
+
+bool OSXEthernetTap::removeIp(const InetAddress &ip)
+{
+	if (!ip)
+		return true;
+	std::vector<InetAddress> allIps(ips());
+	for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
+		if (*i == ip) {
+			long cpid = (long)vfork();
+			if (cpid == 0) {
+				execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"inet",ip.toIpString().c_str(),"-alias",(const char *)0);
+				_exit(-1);
+			} else if (cpid > 0) {
+				int exitcode = -1;
+				waitpid(cpid,&exitcode,0);
+				return (exitcode == 0);
+			}
+		}
+	}
+	return false;
+}
+
+std::vector<InetAddress> OSXEthernetTap::ips() const
+{
+	struct ifaddrs *ifa = (struct ifaddrs *)0;
+	if (getifaddrs(&ifa))
+		return std::vector<InetAddress>();
+
+	std::vector<InetAddress> r;
+
+	struct ifaddrs *p = ifa;
+	while (p) {
+		if ((!strcmp(p->ifa_name,_dev.c_str()))&&(p->ifa_addr)&&(p->ifa_netmask)&&(p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
+			switch(p->ifa_addr->sa_family) {
+				case AF_INET: {
+					struct sockaddr_in *sin = (struct sockaddr_in *)p->ifa_addr;
+					struct sockaddr_in *nm = (struct sockaddr_in *)p->ifa_netmask;
+					r.push_back(InetAddress(&(sin->sin_addr.s_addr),4,Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
+				}	break;
+				case AF_INET6: {
+					struct sockaddr_in6 *sin = (struct sockaddr_in6 *)p->ifa_addr;
+					struct sockaddr_in6 *nm = (struct sockaddr_in6 *)p->ifa_netmask;
+					uint32_t b[4];
+					memcpy(b,nm->sin6_addr.s6_addr,sizeof(b));
+					r.push_back(InetAddress(sin->sin6_addr.s6_addr,16,Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
+				}	break;
+			}
+		}
+		p = p->ifa_next;
+	}
+
+	if (ifa)
+		freeifaddrs(ifa);
+
+	std::sort(r.begin(),r.end());
+	r.erase(std::unique(r.begin(),r.end()),r.end());
+
+	return r;
+}
+
+void OSXEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
+{
+	char putBuf[4096];
+	if ((_fd > 0)&&(len <= _mtu)&&(_enabled)) {
+		to.copyTo(putBuf,6);
+		from.copyTo(putBuf + 6,6);
+		*((uint16_t *)(putBuf + 12)) = htons((uint16_t)etherType);
+		memcpy(putBuf + 14,data,len);
+		len += 14;
+		::write(_fd,putBuf,len);
+	}
+}
+
+std::string OSXEthernetTap::deviceName() const
+{
+	return _dev;
+}
+
+void OSXEthernetTap::setFriendlyName(const char *friendlyName)
+{
+}
+
+void OSXEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
+{
+	std::vector<MulticastGroup> newGroups;
+
+	struct _intl_ifmaddrs *ifmap = (struct _intl_ifmaddrs *)0;
+	if (!_intl_getifmaddrs(&ifmap)) {
+		struct _intl_ifmaddrs *p = ifmap;
+		while (p) {
+			if (p->ifma_addr->sa_family == AF_LINK) {
+				struct sockaddr_dl *in = (struct sockaddr_dl *)p->ifma_name;
+				struct sockaddr_dl *la = (struct sockaddr_dl *)p->ifma_addr;
+				if ((la->sdl_alen == 6)&&(in->sdl_nlen <= _dev.length())&&(!memcmp(_dev.data(),in->sdl_data,in->sdl_nlen)))
+					newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen,6),0));
+			}
+			p = p->ifma_next;
+		}
+		_intl_freeifmaddrs(ifmap);
+	}
+
+	std::vector<InetAddress> allIps(ips());
+	for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
+		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
+
+	std::sort(newGroups.begin(),newGroups.end());
+	std::unique(newGroups.begin(),newGroups.end());
+
+	for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
+		if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
+			added.push_back(*m);
+	}
+	for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
+		if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
+			removed.push_back(*m);
+	}
+
+	_multicastGroups.swap(newGroups);
+}
+
+void OSXEthernetTap::threadMain()
+	throw()
+{
+	fd_set readfds,nullfds;
+	MAC to,from;
+	int n,nfds,r;
+	char getBuf[8194];
+
+	Thread::sleep(500);
+
+	FD_ZERO(&readfds);
+	FD_ZERO(&nullfds);
+	nfds = (int)std::max(_shutdownSignalPipe[0],_fd) + 1;
+
+	r = 0;
+	for(;;) {
+		FD_SET(_shutdownSignalPipe[0],&readfds);
+		FD_SET(_fd,&readfds);
+		select(nfds,&readfds,&nullfds,&nullfds,(struct timeval *)0);
+
+		if (FD_ISSET(_shutdownSignalPipe[0],&readfds)) // writes to shutdown pipe terminate thread
+			break;
+
+		if (FD_ISSET(_fd,&readfds)) {
+			n = (int)::read(_fd,getBuf + r,sizeof(getBuf) - r);
+			if (n < 0) {
+				if ((errno != EINTR)&&(errno != ETIMEDOUT))
+					break;
+			} else {
+				// Some tap drivers like to send the ethernet frame and the
+				// payload in two chunks, so handle that by accumulating
+				// data until we have at least a frame.
+				r += n;
+				if (r > 14) {
+					if (r > ((int)_mtu + 14)) // sanity check for weird TAP behavior on some platforms
+						r = _mtu + 14;
+
+					if (_enabled) {
+						to.setTo(getBuf,6);
+						from.setTo(getBuf + 6,6);
+						unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]);
+						// TODO: VLAN support
+						_handler(_arg,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14);
+					}
+
+					r = 0;
+				}
+			}
+		}
+	}
+}
+
+} // namespace ZeroTier
diff --git a/osdep/OSXEthernetTap.hpp b/osdep/OSXEthernetTap.hpp
new file mode 100644
index 000000000..de48f9a48
--- /dev/null
+++ b/osdep/OSXEthernetTap.hpp
@@ -0,0 +1,86 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_OSXETHERNETTAP_HPP
+#define ZT_OSXETHERNETTAP_HPP
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#include "../node/Constants.hpp"
+#include "../node/MAC.hpp"
+#include "../node/InetAddress.hpp"
+#include "../node/MulticastGroup.hpp"
+
+#include "Thread.hpp"
+
+namespace ZeroTier {
+
+/**
+ * OSX Ethernet tap using ZeroTier kernel extension zt# devices
+ */
+class OSXEthernetTap
+{
+public:
+	OSXEthernetTap(
+		const char *homePath,
+		const MAC &mac,
+		unsigned int mtu,
+		unsigned int metric,
+		uint64_t nwid,
+		const char *friendlyName,
+		void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+		void *arg);
+
+	~OSXEthernetTap();
+
+	void setEnabled(bool en);
+	bool enabled() const;
+	bool addIp(const InetAddress &ip);
+	bool removeIp(const InetAddress &ip);
+	std::vector<InetAddress> ips() const;
+	void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
+	std::string deviceName() const;
+	void setFriendlyName(const char *friendlyName);
+	void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
+
+	void threadMain()
+		throw();
+
+private:
+	void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
+	void *_arg;
+	uint64_t _nwid;
+	Thread _thread;
+	std::string _homePath;
+	std::string _dev;
+	std::vector<MulticastGroup> _multicastGroups;
+	unsigned int _mtu;
+	unsigned int _metric;
+	int _fd;
+	int _shutdownSignalPipe[2];
+	volatile bool _enabled;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/osdep/Phy.hpp b/osdep/Phy.hpp
index 5b1a5fed9..c32a36fd7 100644
--- a/osdep/Phy.hpp
+++ b/osdep/Phy.hpp
@@ -1,55 +1,59 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_PHY_HPP
 #define ZT_PHY_HPP
 
-#include <list>
-#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <list>
+#include <stdexcept>
+
 #if defined(_WIN32) || defined(_WIN64)
 
-#include <windows.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+#include <Windows.h>
 
-#define ZT_PHY_SOCKFD_TYPE			 SOCKET
-#define ZT_PHY_SOCKFD_NULL			 (INVALID_SOCKET)
-#define ZT_PHY_SOCKFD_VALID(s)		 ((s) != INVALID_SOCKET)
-#define ZT_PHY_CLOSE_SOCKET(s)		 ::closesocket(s)
-#define ZT_PHY_MAX_SOCKETS			 (FD_SETSIZE)
-#define ZT_PHY_MAX_INTERCEPTS		 ZT_PHY_MAX_SOCKETS
+#define ZT_PHY_SOCKFD_TYPE SOCKET
+#define ZT_PHY_SOCKFD_NULL (INVALID_SOCKET)
+#define ZT_PHY_SOCKFD_VALID(s) ((s) != INVALID_SOCKET)
+#define ZT_PHY_CLOSE_SOCKET(s) ::closesocket(s)
+#define ZT_PHY_MAX_SOCKETS (FD_SETSIZE)
+#define ZT_PHY_MAX_INTERCEPTS ZT_PHY_MAX_SOCKETS
 #define ZT_PHY_SOCKADDR_STORAGE_TYPE struct sockaddr_storage
 
-#else	// not Windows
+#else // not Windows
 
-#include "../node/Metrics.hpp"
-
-#include <arpa/inet.h>
 #include <errno.h>
-#include <fcntl.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
 #include <signal.h>
-#include <sys/select.h>
-#include <sys/socket.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/select.h>
+#include <sys/socket.h>
 #include <sys/un.h>
-#include <unistd.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 
 #if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux)
 #ifndef IPV6_DONTFRAG
@@ -57,15 +61,15 @@
 #endif
 #endif
 
-#define ZT_PHY_SOCKFD_TYPE			 int
-#define ZT_PHY_SOCKFD_NULL			 (-1)
-#define ZT_PHY_SOCKFD_VALID(s)		 ((s) > -1)
-#define ZT_PHY_CLOSE_SOCKET(s)		 ::close(s)
-#define ZT_PHY_MAX_SOCKETS			 (FD_SETSIZE)
-#define ZT_PHY_MAX_INTERCEPTS		 ZT_PHY_MAX_SOCKETS
+#define ZT_PHY_SOCKFD_TYPE int
+#define ZT_PHY_SOCKFD_NULL (-1)
+#define ZT_PHY_SOCKFD_VALID(s) ((s) > -1)
+#define ZT_PHY_CLOSE_SOCKET(s) ::close(s)
+#define ZT_PHY_MAX_SOCKETS (FD_SETSIZE)
+#define ZT_PHY_MAX_INTERCEPTS ZT_PHY_MAX_SOCKETS
 #define ZT_PHY_SOCKADDR_STORAGE_TYPE struct sockaddr_storage
 
-#endif	 // Windows or not
+#endif // Windows or not
 
 namespace ZeroTier {
 
@@ -121,12 +125,15 @@ typedef void PhySocket;
  * This isn't thread-safe with the exception of whack(), which is safe to
  * call from another thread to abort poll().
  */
-template <typename HANDLER_PTR_TYPE> class Phy {
-  private:
+template <typename HANDLER_PTR_TYPE>
+class Phy
+{
+private:
 	HANDLER_PTR_TYPE _handler;
 
-	enum PhySocketType {
-		ZT_PHY_SOCKET_CLOSED = 0x00,   // socket is closed, will be removed on next poll()
+	enum PhySocketType
+	{
+		ZT_PHY_SOCKET_CLOSED = 0x00, // socket is closed, will be removed on next poll()
 		ZT_PHY_SOCKET_TCP_OUT_PENDING = 0x01,
 		ZT_PHY_SOCKET_TCP_OUT_CONNECTED = 0x02,
 		ZT_PHY_SOCKET_TCP_IN = 0x03,
@@ -137,15 +144,12 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 		ZT_PHY_SOCKET_UNIX_LISTEN = 0x08
 	};
 
-	struct PhySocketImpl {
-		PhySocketImpl()
-		{
-		}
+	struct PhySocketImpl
+	{
 		PhySocketType type;
 		ZT_PHY_SOCKFD_TYPE sock;
-		void* uptr;	  // user-settable pointer
-		uint16_t localPort;
-		ZT_PHY_SOCKADDR_STORAGE_TYPE saddr;	  // remote for TCP_OUT and TCP_IN, local for TCP_LISTEN, RAW, and UDP
+		void *uptr; // user-settable pointer
+		ZT_PHY_SOCKADDR_STORAGE_TYPE saddr; // remote for TCP_OUT and TCP_IN, local for TCP_LISTEN, RAW, and UDP
 	};
 
 	std::list<PhySocketImpl> _socks;
@@ -162,13 +166,14 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	bool _noDelay;
 	bool _noCheck;
 
-  public:
+public:
 	/**
 	 * @param handler Pointer of type HANDLER_PTR_TYPE to handler
 	 * @param noDelay If true, disable TCP NAGLE algorithm on TCP sockets
 	 * @param noCheck If true, attempt to set UDP SO_NO_CHECK option to disable sending checksums
 	 */
-	Phy(HANDLER_PTR_TYPE handler, bool noDelay, bool noCheck) : _handler(handler)
+	Phy(HANDLER_PTR_TYPE handler,bool noDelay,bool noCheck) :
+		_handler(handler)
 	{
 		FD_ZERO(&_readfds);
 		FD_ZERO(&_writefds);
@@ -180,7 +185,7 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 		{	// hack copied from StackOverflow, behaves a bit like pipe() on *nix systems
 			struct sockaddr_in inaddr;
 			struct sockaddr addr;
-			SOCKET lst = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+			SOCKET lst=::socket(AF_INET, SOCK_STREAM,IPPROTO_TCP);
 			if (lst == INVALID_SOCKET)
 				throw std::runtime_error("unable to create pipes for select() abort");
 			memset(&inaddr, 0, sizeof(inaddr));
@@ -188,24 +193,24 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 			inaddr.sin_family = AF_INET;
 			inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 			inaddr.sin_port = 0;
-			int yes = 1;
-			setsockopt(lst, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes));
-			bind(lst, (struct sockaddr*)&inaddr, sizeof(inaddr));
-			listen(lst, 1);
-			int len = sizeof(inaddr);
-			getsockname(lst, &addr, &len);
-			pipes[0] = ::socket(AF_INET, SOCK_STREAM, 0);
+			int yes=1;
+			setsockopt(lst,SOL_SOCKET,SO_REUSEADDR,(char*)&yes,sizeof(yes));
+			bind(lst,(struct sockaddr *)&inaddr,sizeof(inaddr));
+			listen(lst,1);
+			int len=sizeof(inaddr);
+			getsockname(lst, &addr,&len);
+			pipes[0]=::socket(AF_INET, SOCK_STREAM,0);
 			if (pipes[0] == INVALID_SOCKET)
 				throw std::runtime_error("unable to create pipes for select() abort");
-			connect(pipes[0], &addr, len);
-			pipes[1] = accept(lst, 0, 0);
+			connect(pipes[0],&addr,len);
+			pipes[1]=accept(lst,0,0);
 			closesocket(lst);
 		}
-#else	 // not Windows
+#else // not Windows
 		int pipes[2];
 		if (::pipe(pipes))
 			throw std::runtime_error("unable to create pipes for select() abort");
-#endif	 // Windows or not
+#endif // Windows or not
 
 		_nfds = (pipes[0] > pipes[1]) ? (long)pipes[0] : (long)pipes[1];
 		_whackReceiveSocket = pipes[0];
@@ -216,9 +221,9 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 
 	~Phy()
 	{
-		for (typename std::list<PhySocketImpl>::const_iterator s(_socks.begin()); s != _socks.end(); ++s) {
+		for(typename std::list<PhySocketImpl>::const_iterator s(_socks.begin());s!=_socks.end();++s) {
 			if (s->type != ZT_PHY_SOCKET_CLOSED)
-				this->close((PhySocket*)&(*s), true);
+				this->close((PhySocket *)&(*s),true);
 		}
 		ZT_PHY_CLOSE_SOCKET(_whackReceiveSocket);
 		ZT_PHY_CLOSE_SOCKET(_whackSendSocket);
@@ -228,31 +233,13 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param s Socket object
 	 * @return Underlying OS-type (usually int or long) file descriptor associated with object
 	 */
-	static inline ZT_PHY_SOCKFD_TYPE getDescriptor(PhySocket* s) throw()
-	{
-		return reinterpret_cast<PhySocketImpl*>(s)->sock;
-	}
+	static inline ZT_PHY_SOCKFD_TYPE getDescriptor(PhySocket *s) throw() { return reinterpret_cast<PhySocketImpl *>(s)->sock; }
 
 	/**
 	 * @param s Socket object
 	 * @return Pointer to user object
 	 */
-	static inline void** getuptr(PhySocket* s) throw()
-	{
-		return &(reinterpret_cast<PhySocketImpl*>(s)->uptr);
-	}
-
-	/**
-	 * Return the local port corresponding to this PhySocket
-	 *
-	 * @param s Socket object
-	 *
-	 * @return Local port corresponding to this PhySocket
-	 */
-	static inline uint16_t getLocalPort(PhySocket* s) throw()
-	{
-		return reinterpret_cast<PhySocketImpl*>(s)->localPort;
-	}
+	static inline void** getuptr(PhySocket *s) throw() { return &(reinterpret_cast<PhySocketImpl *>(s)->uptr); }
 
 	/**
 	 * Cause poll() to stop waiting immediately
@@ -263,27 +250,21 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	inline void whack()
 	{
 #if defined(_WIN32) || defined(_WIN64)
-		::send(_whackSendSocket, (const char*)this, 1, 0);
+		::send(_whackSendSocket,(const char *)this,1,0);
 #else
-		(void)(::write(_whackSendSocket, (PhySocket*)this, 1));
+		::write(_whackSendSocket,(PhySocket *)this,1);
 #endif
 	}
 
 	/**
 	 * @return Number of open sockets
 	 */
-	inline unsigned long count() const throw()
-	{
-		return _socks.size();
-	}
+	inline unsigned long count() const throw() { return _socks.size(); }
 
 	/**
 	 * @return Maximum number of sockets allowed
 	 */
-	inline unsigned long maxCount() const throw()
-	{
-		return ZT_PHY_MAX_SOCKETS;
-	}
+	inline unsigned long maxCount() const throw() { return ZT_PHY_MAX_SOCKETS; }
 
 	/**
 	 * Wrap a raw file descriptor in a PhySocket structure
@@ -306,26 +287,25 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param uptr User pointer to supply to callbacks
 	 * @return PhySocket wrapping fd or NULL on failure (out of memory or too many sockets)
 	 */
-	inline PhySocket* wrapSocket(ZT_PHY_SOCKFD_TYPE fd, void* uptr = (void*)0)
+	inline PhySocket *wrapSocket(ZT_PHY_SOCKFD_TYPE fd,void *uptr = (void *)0)
 	{
 		if (_socks.size() >= ZT_PHY_MAX_SOCKETS)
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		try {
 			_socks.push_back(PhySocketImpl());
+		} catch ( ... ) {
+			return (PhySocket *)0;
 		}
-		catch (...) {
-			return (PhySocket*)0;
-		}
-		PhySocketImpl& sws = _socks.back();
+		PhySocketImpl &sws = _socks.back();
 		if ((long)fd > _nfds)
 			_nfds = (long)fd;
-		FD_SET(fd, &_readfds);
+		FD_SET(fd,&_readfds);
 		sws.type = ZT_PHY_SOCKET_UNIX_IN; /* TODO: Type was changed to allow for CBs with new RPC model */
 		sws.sock = fd;
 		sws.uptr = uptr;
-		memset(&(sws.saddr), 0, sizeof(struct sockaddr_storage));
+		memset(&(sws.saddr),0,sizeof(struct sockaddr_storage));
 		// no sockaddr for this socket type, leave saddr null
-		return (PhySocket*)&sws;
+		return (PhySocket *)&sws;
 	}
 
 	/**
@@ -336,29 +316,29 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param bufferSize Desired socket receive/send buffer size -- will set as close to this as possible (default: 0, leave alone)
 	 * @return Socket or NULL on failure to bind
 	 */
-	inline PhySocket* udpBind(const struct sockaddr* localAddress, void* uptr = (void*)0, int bufferSize = 0)
+	inline PhySocket *udpBind(const struct sockaddr *localAddress,void *uptr = (void *)0,int bufferSize = 0)
 	{
 		if (_socks.size() >= ZT_PHY_MAX_SOCKETS)
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 
-		ZT_PHY_SOCKFD_TYPE s = ::socket(localAddress->sa_family, SOCK_DGRAM, 0);
-		if (! ZT_PHY_SOCKFD_VALID(s))
-			return (PhySocket*)0;
+		ZT_PHY_SOCKFD_TYPE s = ::socket(localAddress->sa_family,SOCK_DGRAM,0);
+		if (!ZT_PHY_SOCKFD_VALID(s))
+			return (PhySocket *)0;
 
 		if (bufferSize > 0) {
 			int bs = bufferSize;
 			while (bs >= 65536) {
 				int tmpbs = bs;
-				if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, (const char*)&tmpbs, sizeof(tmpbs)) == 0)
+				if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 					break;
-				bs -= 4096;
+				bs -= 16384;
 			}
 			bs = bufferSize;
 			while (bs >= 65536) {
 				int tmpbs = bs;
-				if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, (const char*)&tmpbs, sizeof(tmpbs)) == 0)
+				if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 					break;
-				bs -= 4096;
+				bs -= 16384;
 			}
 		}
 
@@ -366,93 +346,72 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 		{
 			BOOL f;
 			if (localAddress->sa_family == AF_INET6) {
-				f = TRUE;
-				setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&f, sizeof(f));
-				f = FALSE;
-				setsockopt(s, IPPROTO_IPV6, IPV6_DONTFRAG, (const char*)&f, sizeof(f));
+				f = TRUE; setsockopt(s,IPPROTO_IPV6,IPV6_V6ONLY,(const char *)&f,sizeof(f));
+				f = FALSE; setsockopt(s,IPPROTO_IPV6,IPV6_DONTFRAG,(const char *)&f,sizeof(f));
 			}
-			f = FALSE;
-			setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&f, sizeof(f));
-			f = TRUE;
-			setsockopt(s, SOL_SOCKET, SO_BROADCAST, (const char*)&f, sizeof(f));
+			f = FALSE; setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(const char *)&f,sizeof(f));
+			f = TRUE; setsockopt(s,SOL_SOCKET,SO_BROADCAST,(const char *)&f,sizeof(f));
 		}
-#else	// not Windows
+#else // not Windows
 		{
 			int f;
 			if (localAddress->sa_family == AF_INET6) {
-				f = 1;
-				setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&f, sizeof(f));
+				f = 1; setsockopt(s,IPPROTO_IPV6,IPV6_V6ONLY,(void *)&f,sizeof(f));
 #ifdef IPV6_MTU_DISCOVER
-				f = 0;
-				setsockopt(s, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &f, sizeof(f));
+				f = 0; setsockopt(s,IPPROTO_IPV6,IPV6_MTU_DISCOVER,&f,sizeof(f));
 #endif
 #ifdef IPV6_DONTFRAG
-				f = 0;
-				setsockopt(s, IPPROTO_IPV6, IPV6_DONTFRAG, &f, sizeof(f));
+				f = 0; setsockopt(s,IPPROTO_IPV6,IPV6_DONTFRAG,&f,sizeof(f));
 #endif
 			}
-			f = 0;
-			setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*)&f, sizeof(f));
-			f = 1;
-			setsockopt(s, SOL_SOCKET, SO_BROADCAST, (void*)&f, sizeof(f));
+			f = 0; setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(void *)&f,sizeof(f));
+			f = 1; setsockopt(s,SOL_SOCKET,SO_BROADCAST,(void *)&f,sizeof(f));
 #ifdef IP_DONTFRAG
-			f = 0;
-			setsockopt(s, IPPROTO_IP, IP_DONTFRAG, &f, sizeof(f));
+			f = 0; setsockopt(s,IPPROTO_IP,IP_DONTFRAG,&f,sizeof(f));
 #endif
 #ifdef IP_MTU_DISCOVER
-			f = 0;
-			setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, &f, sizeof(f));
+			f = 0; setsockopt(s,IPPROTO_IP,IP_MTU_DISCOVER,&f,sizeof(f));
 #endif
 #ifdef SO_NO_CHECK
 			// For now at least we only set SO_NO_CHECK on IPv4 sockets since some
 			// IPv6 stacks incorrectly discard zero checksum packets. May remove
 			// this restriction later once broken stuff dies more.
-			if ((localAddress->sa_family == AF_INET) && (_noCheck)) {
-				f = 1;
-				setsockopt(s, SOL_SOCKET, SO_NO_CHECK, (void*)&f, sizeof(f));
+			if ((localAddress->sa_family == AF_INET)&&(_noCheck)) {
+				f = 1; setsockopt(s,SOL_SOCKET,SO_NO_CHECK,(void *)&f,sizeof(f));
 			}
 #endif
 		}
-#endif	 // Windows or not
+#endif // Windows or not
 
-		if (::bind(s, localAddress, (localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
+		if (::bind(s,localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
 
 #if defined(_WIN32) || defined(_WIN64)
-		{
-			u_long iMode = 1;
-			ioctlsocket(s, FIONBIO, &iMode);
-		}
+		{ u_long iMode=1; ioctlsocket(s,FIONBIO,&iMode); }
 #else
-		fcntl(s, F_SETFL, O_NONBLOCK);
+		fcntl(s,F_SETFL,O_NONBLOCK);
 #endif
 
 		try {
 			_socks.push_back(PhySocketImpl());
-		}
-		catch (...) {
+		} catch ( ... ) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
-		PhySocketImpl& sws = _socks.back();
+		PhySocketImpl &sws = _socks.back();
 
 		if ((long)s > _nfds)
 			_nfds = (long)s;
-		FD_SET(s, &_readfds);
+		FD_SET(s,&_readfds);
 		sws.type = ZT_PHY_SOCKET_UDP;
 		sws.sock = s;
 		sws.uptr = uptr;
+		memset(&(sws.saddr),0,sizeof(struct sockaddr_storage));
+		memcpy(&(sws.saddr),localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
 
-#ifdef __UNIX_LIKE__
-		struct sockaddr_in* sin = (struct sockaddr_in*)localAddress;
-		sws.localPort = htons(sin->sin_port);
-#endif
-		memset(&(sws.saddr), 0, sizeof(struct sockaddr_storage));
-		memcpy(&(sws.saddr), localAddress, (localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
-
-		return (PhySocket*)&sws;
+		return (PhySocket *)&sws;
 	}
 
 	/**
@@ -461,15 +420,15 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param ttl New TTL (0 or >255 will set it to 255)
 	 * @return True on success
 	 */
-	inline bool setIp4UdpTtl(PhySocket* sock, unsigned int ttl)
+	inline bool setIp4UdpTtl(PhySocket *sock,unsigned int ttl)
 	{
-		PhySocketImpl& sws = *(reinterpret_cast<PhySocketImpl*>(sock));
+		PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
 #if defined(_WIN32) || defined(_WIN64)
-		DWORD tmp = ((ttl == 0) || (ttl > 255)) ? 255 : (DWORD)ttl;
-		return (::setsockopt(sws.sock, IPPROTO_IP, IP_TTL, (const char*)&tmp, sizeof(tmp)) == 0);
+		DWORD tmp = ((ttl == 0)||(ttl > 255)) ? 255 : (DWORD)ttl;
+		return (::setsockopt(sws.sock,IPPROTO_IP,IP_TTL,(const char *)&tmp,sizeof(tmp)) == 0);
 #else
-		int tmp = ((ttl == 0) || (ttl > 255)) ? 255 : (int)ttl;
-		return (::setsockopt(sws.sock, IPPROTO_IP, IP_TTL, (void*)&tmp, sizeof(tmp)) == 0);
+		int tmp = ((ttl == 0)||(ttl > 255)) ? 255 : (int)ttl;
+		return (::setsockopt(sws.sock,IPPROTO_IP,IP_TTL,(void *)&tmp,sizeof(tmp)) == 0);
 #endif
 	}
 
@@ -482,20 +441,14 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param len Length of packet
 	 * @return True if packet appears to have been sent successfully
 	 */
-	inline bool udpSend(PhySocket* sock, const struct sockaddr* remoteAddress, const void* data, unsigned long len)
+	inline bool udpSend(PhySocket *sock,const struct sockaddr *remoteAddress,const void *data,unsigned long len)
 	{
-		PhySocketImpl& sws = *(reinterpret_cast<PhySocketImpl*>(sock));
-		bool sent = false;
+		PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
 #if defined(_WIN32) || defined(_WIN64)
-		sent = ((long)::sendto(sws.sock, reinterpret_cast<const char*>(data), len, 0, remoteAddress, (remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) == (long)len);
+		return ((long)::sendto(sws.sock,reinterpret_cast<const char *>(data),len,0,remoteAddress,(remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) == (long)len);
 #else
-		sent = ((long)::sendto(sws.sock, data, len, 0, remoteAddress, (remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) == (long)len);
+		return ((long)::sendto(sws.sock,data,len,0,remoteAddress,(remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) == (long)len);
 #endif
-		if (sent) {
-			Metrics::udp_send += len;
-		}
-
-		return sent;
 	}
 
 #ifdef __UNIX_LIKE__
@@ -506,56 +459,55 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param uptr Arbitrary pointer to associate
 	 * @return PhySocket or NULL if cannot bind
 	 */
-	inline PhySocket* unixListen(const char* path, void* uptr = (void*)0)
+	inline PhySocket *unixListen(const char *path,void *uptr = (void *)0)
 	{
 		struct sockaddr_un sun;
 
 		if (_socks.size() >= ZT_PHY_MAX_SOCKETS)
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 
-		memset(&sun, 0, sizeof(sun));
+		memset(&sun,0,sizeof(sun));
 		sun.sun_family = AF_UNIX;
 		if (strlen(path) >= sizeof(sun.sun_path))
-			return (PhySocket*)0;
-		strcpy(sun.sun_path, path);
+			return (PhySocket *)0;
+		strcpy(sun.sun_path,path);
 
-		ZT_PHY_SOCKFD_TYPE s = ::socket(PF_UNIX, SOCK_STREAM, 0);
-		if (! ZT_PHY_SOCKFD_VALID(s))
-			return (PhySocket*)0;
+		ZT_PHY_SOCKFD_TYPE s = ::socket(PF_UNIX,SOCK_STREAM,0);
+		if (!ZT_PHY_SOCKFD_VALID(s))
+			return (PhySocket *)0;
 
-		::fcntl(s, F_SETFL, O_NONBLOCK);
+		::fcntl(s,F_SETFL,O_NONBLOCK);
 
 		::unlink(path);
-		if (::bind(s, (struct sockaddr*)&sun, sizeof(struct sockaddr_un)) != 0) {
+		if (::bind(s,(struct sockaddr *)&sun,sizeof(struct sockaddr_un)) != 0) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
-		if (::listen(s, 128) != 0) {
+		if (::listen(s,128) != 0) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
 
 		try {
 			_socks.push_back(PhySocketImpl());
-		}
-		catch (...) {
+		} catch ( ... ) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
-		PhySocketImpl& sws = _socks.back();
+		PhySocketImpl &sws = _socks.back();
 
 		if ((long)s > _nfds)
 			_nfds = (long)s;
-		FD_SET(s, &_readfds);
+		FD_SET(s,&_readfds);
 		sws.type = ZT_PHY_SOCKET_UNIX_LISTEN;
 		sws.sock = s;
 		sws.uptr = uptr;
-		memset(&(sws.saddr), 0, sizeof(struct sockaddr_storage));
-		memcpy(&(sws.saddr), &sun, sizeof(struct sockaddr_un));
+		memset(&(sws.saddr),0,sizeof(struct sockaddr_storage));
+		memcpy(&(sws.saddr),&sun,sizeof(struct sockaddr_un));
 
-		return (PhySocket*)&sws;
+		return (PhySocket *)&sws;
 	}
-#endif	 // __UNIX_LIKE__
+#endif // __UNIX_LIKE__
 
 	/**
 	 * Bind a local listen socket to listen for new TCP connections
@@ -564,69 +516,62 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param uptr Initial value of uptr for new socket (default: NULL)
 	 * @return Socket or NULL on failure to bind
 	 */
-	inline PhySocket* tcpListen(const struct sockaddr* localAddress, void* uptr = (void*)0)
+	inline PhySocket *tcpListen(const struct sockaddr *localAddress,void *uptr = (void *)0)
 	{
 		if (_socks.size() >= ZT_PHY_MAX_SOCKETS)
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 
-		ZT_PHY_SOCKFD_TYPE s = ::socket(localAddress->sa_family, SOCK_STREAM, 0);
-		if (! ZT_PHY_SOCKFD_VALID(s))
-			return (PhySocket*)0;
+		ZT_PHY_SOCKFD_TYPE s = ::socket(localAddress->sa_family,SOCK_STREAM,0);
+		if (!ZT_PHY_SOCKFD_VALID(s))
+			return (PhySocket *)0;
 
 #if defined(_WIN32) || defined(_WIN64)
 		{
 			BOOL f;
-			f = TRUE;
-			::setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&f, sizeof(f));
-			f = TRUE;
-			::setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&f, sizeof(f));
-			f = (_noDelay ? TRUE : FALSE);
-			setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&f, sizeof(f));
-			u_long iMode = 1;
-			ioctlsocket(s, FIONBIO, &iMode);
+			f = TRUE; ::setsockopt(s,IPPROTO_IPV6,IPV6_V6ONLY,(const char *)&f,sizeof(f));
+			f = TRUE; ::setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(const char *)&f,sizeof(f));
+			f = (_noDelay ? TRUE : FALSE); setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f));
+			u_long iMode=1;
+			ioctlsocket(s,FIONBIO,&iMode);
 		}
 #else
 		{
 			int f;
-			f = 1;
-			::setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&f, sizeof(f));
-			f = 1;
-			::setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*)&f, sizeof(f));
-			f = (_noDelay ? 1 : 0);
-			setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&f, sizeof(f));
-			fcntl(s, F_SETFL, O_NONBLOCK);
+			f = 1; ::setsockopt(s,IPPROTO_IPV6,IPV6_V6ONLY,(void *)&f,sizeof(f));
+			f = 1; ::setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(void *)&f,sizeof(f));
+			f = (_noDelay ? 1 : 0); setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f));
+			fcntl(s,F_SETFL,O_NONBLOCK);
 		}
 #endif
 
-		if (::bind(s, localAddress, (localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
+		if (::bind(s,localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
 
-		if (::listen(s, 1024)) {
+		if (::listen(s,1024)) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
 
 		try {
 			_socks.push_back(PhySocketImpl());
-		}
-		catch (...) {
+		} catch ( ... ) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
-		PhySocketImpl& sws = _socks.back();
+		PhySocketImpl &sws = _socks.back();
 
 		if ((long)s > _nfds)
 			_nfds = (long)s;
-		FD_SET(s, &_readfds);
+		FD_SET(s,&_readfds);
 		sws.type = ZT_PHY_SOCKET_TCP_LISTEN;
 		sws.sock = s;
 		sws.uptr = uptr;
-		memset(&(sws.saddr), 0, sizeof(struct sockaddr_storage));
-		memcpy(&(sws.saddr), localAddress, (localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
+		memset(&(sws.saddr),0,sizeof(struct sockaddr_storage));
+		memcpy(&(sws.saddr),localAddress,(localAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
 
-		return (PhySocket*)&sws;
+		return (PhySocket *)&sws;
 	}
 
 	/**
@@ -651,48 +596,38 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param callConnectHandler If true, call TCP connect handler even if result is known before function exit (default: true)
 	 * @return New socket or NULL on failure
 	 */
-	inline PhySocket* tcpConnect(const struct sockaddr* remoteAddress, bool& connected, void* uptr = (void*)0, bool callConnectHandler = true)
+	inline PhySocket *tcpConnect(const struct sockaddr *remoteAddress,bool &connected,void *uptr = (void *)0,bool callConnectHandler = true)
 	{
 		if (_socks.size() >= ZT_PHY_MAX_SOCKETS)
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 
-		ZT_PHY_SOCKFD_TYPE s = ::socket(remoteAddress->sa_family, SOCK_STREAM, 0);
-		if (! ZT_PHY_SOCKFD_VALID(s)) {
+		ZT_PHY_SOCKFD_TYPE s = ::socket(remoteAddress->sa_family,SOCK_STREAM,0);
+		if (!ZT_PHY_SOCKFD_VALID(s)) {
 			connected = false;
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
 
 #if defined(_WIN32) || defined(_WIN64)
 		{
 			BOOL f;
-			if (remoteAddress->sa_family == AF_INET6) {
-				f = TRUE;
-				::setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&f, sizeof(f));
-			}
-			f = TRUE;
-			::setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&f, sizeof(f));
-			f = (_noDelay ? TRUE : FALSE);
-			setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&f, sizeof(f));
-			u_long iMode = 1;
-			ioctlsocket(s, FIONBIO, &iMode);
+			if (remoteAddress->sa_family == AF_INET6) { f = TRUE; ::setsockopt(s,IPPROTO_IPV6,IPV6_V6ONLY,(const char *)&f,sizeof(f)); }
+			f = TRUE; ::setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(const char *)&f,sizeof(f));
+			f = (_noDelay ? TRUE : FALSE); setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f));
+			u_long iMode=1;
+			ioctlsocket(s,FIONBIO,&iMode);
 		}
 #else
 		{
 			int f;
-			if (remoteAddress->sa_family == AF_INET6) {
-				f = 1;
-				::setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&f, sizeof(f));
-			}
-			f = 1;
-			::setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*)&f, sizeof(f));
-			f = (_noDelay ? 1 : 0);
-			setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&f, sizeof(f));
-			fcntl(s, F_SETFL, O_NONBLOCK);
+			if (remoteAddress->sa_family == AF_INET6) { f = 1; ::setsockopt(s,IPPROTO_IPV6,IPV6_V6ONLY,(void *)&f,sizeof(f)); }
+			f = 1; ::setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(void *)&f,sizeof(f));
+			f = (_noDelay ? 1 : 0); setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f));
+			fcntl(s,F_SETFL,O_NONBLOCK);
 		}
 #endif
 
 		connected = true;
-		if (::connect(s, remoteAddress, (remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
+		if (::connect(s,remoteAddress,(remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))) {
 			connected = false;
 #if defined(_WIN32) || defined(_WIN64)
 			if (WSAGetLastError() != WSAEWOULDBLOCK) {
@@ -700,46 +635,42 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 			if (errno != EINPROGRESS) {
 #endif
 				ZT_PHY_CLOSE_SOCKET(s);
-				return (PhySocket*)0;
-			}	// else connection is proceeding asynchronously...
+				return (PhySocket *)0;
+			} // else connection is proceeding asynchronously...
 		}
 
 		try {
 			_socks.push_back(PhySocketImpl());
-		}
-		catch (...) {
+		} catch ( ... ) {
 			ZT_PHY_CLOSE_SOCKET(s);
-			return (PhySocket*)0;
+			return (PhySocket *)0;
 		}
-		PhySocketImpl& sws = _socks.back();
+		PhySocketImpl &sws = _socks.back();
 
 		if ((long)s > _nfds)
 			_nfds = (long)s;
 		if (connected) {
-			FD_SET(s, &_readfds);
+			FD_SET(s,&_readfds);
 			sws.type = ZT_PHY_SOCKET_TCP_OUT_CONNECTED;
-		}
-		else {
-			FD_SET(s, &_writefds);
+		} else {
+			FD_SET(s,&_writefds);
 #if defined(_WIN32) || defined(_WIN64)
-			FD_SET(s, &_exceptfds);
+			FD_SET(s,&_exceptfds);
 #endif
 			sws.type = ZT_PHY_SOCKET_TCP_OUT_PENDING;
 		}
 		sws.sock = s;
 		sws.uptr = uptr;
-		memset(&(sws.saddr), 0, sizeof(struct sockaddr_storage));
-		memcpy(&(sws.saddr), remoteAddress, (remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
+		memset(&(sws.saddr),0,sizeof(struct sockaddr_storage));
+		memcpy(&(sws.saddr),remoteAddress,(remoteAddress->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
 
-		if ((callConnectHandler) && (connected)) {
+		if ((callConnectHandler)&&(connected)) {
 			try {
-				_handler->phyOnTcpConnect((PhySocket*)&sws, &(sws.uptr), true);
-			}
-			catch (...) {
-			}
+				_handler->phyOnTcpConnect((PhySocket *)&sws,&(sws.uptr),true);
+			} catch ( ... ) {}
 		}
 
-		return (PhySocket*)&sws;
+		return (PhySocket *)&sws;
 	}
 
 	/**
@@ -749,26 +680,25 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * until one works.
 	 *
 	 * @param sock Socket
-	 * @param receiveBufferSize Desired size of receive buffer
-	 * @param sendBufferSize Desired size of send buffer
+	 * @param bufferSize Desired buffer sizes
 	 */
-	inline void setBufferSizes(const PhySocket* sock, int receiveBufferSize, int sendBufferSize)
+	inline void setBufferSizes(const PhySocket *sock,int bufferSize)
 	{
-		PhySocketImpl& sws = *(reinterpret_cast<PhySocketImpl*>(sock));
-		if (receiveBufferSize > 0) {
-			while (receiveBufferSize > 0) {
-				int tmpbs = receiveBufferSize;
-				if (::setsockopt(sws.sock, SOL_SOCKET, SO_RCVBUF, (const char*)&tmpbs, sizeof(tmpbs)) == 0)
+		PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
+		if (bufferSize > 0) {
+			int bs = bufferSize;
+			while (bs >= 65536) {
+				int tmpbs = bs;
+				if (::setsockopt(sws.sock,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 					break;
-				receiveBufferSize -= 16384;
+				bs -= 16384;
 			}
-		}
-		if (sendBufferSize > 0) {
-			while (sendBufferSize > 0) {
-				int tmpbs = sendBufferSize;
-				if (::setsockopt(sws.sock, SOL_SOCKET, SO_SNDBUF, (const char*)&tmpbs, sizeof(tmpbs)) == 0)
+			bs = bufferSize;
+			while (bs >= 65536) {
+				int tmpbs = bs;
+				if (::setsockopt(sws.sock,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 					break;
-				sendBufferSize -= 16384;
+				bs -= 16384;
 			}
 		}
 	}
@@ -788,29 +718,29 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param callCloseHandler If true, call close handler on socket closing failure condition (default: true)
 	 * @return Number of bytes actually sent or -1 on fatal error (socket closure)
 	 */
-	inline long streamSend(PhySocket* sock, const void* data, unsigned long len, bool callCloseHandler = true)
+	inline long streamSend(PhySocket *sock,const void *data,unsigned long len,bool callCloseHandler = true)
 	{
-		PhySocketImpl& sws = *(reinterpret_cast<PhySocketImpl*>(sock));
+		PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
 #if defined(_WIN32) || defined(_WIN64)
-		long n = (long)::send(sws.sock, reinterpret_cast<const char*>(data), len, 0);
+		long n = (long)::send(sws.sock,reinterpret_cast<const char *>(data),len,0);
 		if (n == SOCKET_ERROR) {
-			switch (WSAGetLastError()) {
-				case WSAEINTR:
-				case WSAEWOULDBLOCK:
-					return 0;
-				default:
-					this->close(sock, callCloseHandler);
-					return -1;
-			}
+				switch(WSAGetLastError()) {
+					case WSAEINTR:
+					case WSAEWOULDBLOCK:
+						return 0;
+					default:
+						this->close(sock,callCloseHandler);
+						return -1;
+				}
 		}
-#else	// not Windows
-		long n = (long)::send(sws.sock, data, len, 0);
+#else // not Windows
+		long n = (long)::send(sws.sock,data,len,0);
 		if (n < 0) {
-			switch (errno) {
+			switch(errno) {
 #ifdef EAGAIN
 				case EAGAIN:
 #endif
-#if defined(EWOULDBLOCK) && (! defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
+#if defined(EWOULDBLOCK) && ( !defined(EAGAIN) || (EWOULDBLOCK != EAGAIN) )
 				case EWOULDBLOCK:
 #endif
 #ifdef EINTR
@@ -818,11 +748,11 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 #endif
 					return 0;
 				default:
-					this->close(sock, callCloseHandler);
+					this->close(sock,callCloseHandler);
 					return -1;
 			}
 		}
-#endif	 // Windows or not
+#endif // Windows or not
 		return n;
 	}
 
@@ -840,16 +770,16 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param callCloseHandler If true, call close handler on socket closing failure condition (default: true)
 	 * @return Number of bytes actually sent or -1 on fatal error (socket closure)
 	 */
-	inline long unixSend(PhySocket* sock, const void* data, unsigned long len, bool callCloseHandler = true)
+	inline long unixSend(PhySocket *sock,const void *data,unsigned long len,bool callCloseHandler = true)
 	{
-		PhySocketImpl& sws = *(reinterpret_cast<PhySocketImpl*>(sock));
-		long n = (long)::write(sws.sock, data, len);
+		PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
+		long n = (long)::write(sws.sock,data,len);
 		if (n < 0) {
-			switch (errno) {
+			switch(errno) {
 #ifdef EAGAIN
 				case EAGAIN:
 #endif
-#if defined(EWOULDBLOCK) && (! defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
+#if defined(EWOULDBLOCK) && ( !defined(EAGAIN) || (EWOULDBLOCK != EAGAIN) )
 				case EWOULDBLOCK:
 #endif
 #ifdef EINTR
@@ -857,13 +787,13 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 #endif
 					return 0;
 				default:
-					this->close(sock, callCloseHandler);
+					this->close(sock,callCloseHandler);
 					return -1;
 			}
 		}
 		return n;
 	}
-#endif	 // __UNIX_LIKE__
+#endif // __UNIX_LIKE__
 
 	/**
 	 * For streams, sets whether we want to be notified that the socket is writable
@@ -877,14 +807,13 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param sock Stream connection socket
 	 * @param notifyWritable Want writable notifications?
 	 */
-	inline void setNotifyWritable(PhySocket* sock, bool notifyWritable)
+	inline const void setNotifyWritable(PhySocket *sock,bool notifyWritable)
 	{
-		PhySocketImpl& sws = *(reinterpret_cast<PhySocketImpl*>(sock));
+		PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
 		if (notifyWritable) {
-			FD_SET(sws.sock, &_writefds);
-		}
-		else {
-			FD_CLR(sws.sock, &_writefds);
+			FD_SET(sws.sock,&_writefds);
+		} else {
+			FD_CLR(sws.sock,&_writefds);
 		}
 	}
 
@@ -898,14 +827,13 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param sock Socket to modify
 	 * @param notifyReadable True if socket should be monitored for readability
 	 */
-	inline void setNotifyReadable(PhySocket* sock, bool notifyReadable)
+	inline const void setNotifyReadable(PhySocket *sock,bool notifyReadable)
 	{
-		PhySocketImpl& sws = *(reinterpret_cast<PhySocketImpl*>(sock));
+		PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
 		if (notifyReadable) {
-			FD_SET(sws.sock, &_readfds);
-		}
-		else {
-			FD_CLR(sws.sock, &_readfds);
+			FD_SET(sws.sock,&_readfds);
+		} else {
+			FD_CLR(sws.sock,&_readfds);
 		}
 	}
 
@@ -923,268 +851,195 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 		char buf[131072];
 		struct sockaddr_storage ss;
 		struct timeval tv;
-		fd_set rfds, wfds, efds;
+		fd_set rfds,wfds,efds;
 
-		memcpy(&rfds, &_readfds, sizeof(rfds));
-		memcpy(&wfds, &_writefds, sizeof(wfds));
+		memcpy(&rfds,&_readfds,sizeof(rfds));
+		memcpy(&wfds,&_writefds,sizeof(wfds));
 #if defined(_WIN32) || defined(_WIN64)
-		memcpy(&efds, &_exceptfds, sizeof(efds));
+		memcpy(&efds,&_exceptfds,sizeof(efds));
 #else
 		FD_ZERO(&efds);
 #endif
 
 		tv.tv_sec = (long)(timeout / 1000);
 		tv.tv_usec = (long)((timeout % 1000) * 1000);
-		if (::select((int)_nfds + 1, &rfds, &wfds, &efds, (timeout > 0) ? &tv : (struct timeval*)0) <= 0)
+		if (::select((int)_nfds + 1,&rfds,&wfds,&efds,(timeout > 0) ? &tv : (struct timeval *)0) <= 0)
 			return;
 
-		if (FD_ISSET(_whackReceiveSocket, &rfds)) {
+		if (FD_ISSET(_whackReceiveSocket,&rfds)) {
 			char tmp[16];
 #if defined(_WIN32) || defined(_WIN64)
-			::recv(_whackReceiveSocket, tmp, 16, 0);
+			::recv(_whackReceiveSocket,tmp,16,0);
 #else
-			::read(_whackReceiveSocket, tmp, 16);
+			::read(_whackReceiveSocket,tmp,16);
 #endif
 		}
 
-		for (typename std::list<PhySocketImpl>::iterator s(_socks.begin()); s != _socks.end();) {
+		for(typename std::list<PhySocketImpl>::iterator s(_socks.begin());s!=_socks.end();) {
 			switch (s->type) {
+
 				case ZT_PHY_SOCKET_TCP_OUT_PENDING:
 #if defined(_WIN32) || defined(_WIN64)
-					if (FD_ISSET(s->sock, &efds)) {
-						this->close((PhySocket*)&(*s), true);
-					}
-					else   // ... if
+					if (FD_ISSET(s->sock,&efds)) {
+						this->close((PhySocket *)&(*s),true);
+					} else // ... if
 #endif
-						if (FD_ISSET(s->sock, &wfds)) {
+					if (FD_ISSET(s->sock,&wfds)) {
 						socklen_t slen = sizeof(ss);
-						if (::getpeername(s->sock, (struct sockaddr*)&ss, &slen) != 0) {
-							this->close((PhySocket*)&(*s), true);
-						}
-						else {
+						if (::getpeername(s->sock,(struct sockaddr *)&ss,&slen) != 0) {
+							this->close((PhySocket *)&(*s),true);
+						} else {
 							s->type = ZT_PHY_SOCKET_TCP_OUT_CONNECTED;
-							FD_SET(s->sock, &_readfds);
-							FD_CLR(s->sock, &_writefds);
+							FD_SET(s->sock,&_readfds);
+							FD_CLR(s->sock,&_writefds);
 #if defined(_WIN32) || defined(_WIN64)
-							FD_CLR(s->sock, &_exceptfds);
+							FD_CLR(s->sock,&_exceptfds);
 #endif
 							try {
-								_handler->phyOnTcpConnect((PhySocket*)&(*s), &(s->uptr), true);
-							}
-							catch (...) {
-							}
+								_handler->phyOnTcpConnect((PhySocket *)&(*s),&(s->uptr),true);
+							} catch ( ... ) {}
 						}
 					}
 					break;
 
 				case ZT_PHY_SOCKET_TCP_OUT_CONNECTED:
 				case ZT_PHY_SOCKET_TCP_IN: {
-					ZT_PHY_SOCKFD_TYPE sock = s->sock;	 // if closed, s->sock becomes invalid as s is no longer dereferencable
-					if (FD_ISSET(sock, &rfds)) {
-						long n = (long)::recv(sock, buf, sizeof(buf), 0);
+					ZT_PHY_SOCKFD_TYPE sock = s->sock; // if closed, s->sock becomes invalid as s is no longer dereferencable
+					if (FD_ISSET(sock,&rfds)) {
+						long n = (long)::recv(sock,buf,sizeof(buf),0);
 						if (n <= 0) {
-							this->close((PhySocket*)&(*s), true);
-						}
-						else {
+							this->close((PhySocket *)&(*s),true);
+						} else {
 							try {
-								_handler->phyOnTcpData((PhySocket*)&(*s), &(s->uptr), (void*)buf, (unsigned long)n);
-							}
-							catch (...) {
-							}
+								_handler->phyOnTcpData((PhySocket *)&(*s),&(s->uptr),(void *)buf,(unsigned long)n);
+							} catch ( ... ) {}
 						}
 					}
-					if ((FD_ISSET(sock, &wfds)) && (FD_ISSET(sock, &_writefds))) {
+					if ((FD_ISSET(sock,&wfds))&&(FD_ISSET(sock,&_writefds))) {
 						try {
-							_handler->phyOnTcpWritable((PhySocket*)&(*s), &(s->uptr));
-						}
-						catch (...) {
-						}
+							_handler->phyOnTcpWritable((PhySocket *)&(*s),&(s->uptr));
+						} catch ( ... ) {}
 					}
-				} break;
+				}	break;
 
 				case ZT_PHY_SOCKET_TCP_LISTEN:
-					if (FD_ISSET(s->sock, &rfds)) {
-						memset(&ss, 0, sizeof(ss));
+					if (FD_ISSET(s->sock,&rfds)) {
+						memset(&ss,0,sizeof(ss));
 						socklen_t slen = sizeof(ss);
-						ZT_PHY_SOCKFD_TYPE newSock = ::accept(s->sock, (struct sockaddr*)&ss, &slen);
+						ZT_PHY_SOCKFD_TYPE newSock = ::accept(s->sock,(struct sockaddr *)&ss,&slen);
 						if (ZT_PHY_SOCKFD_VALID(newSock)) {
 							if (_socks.size() >= ZT_PHY_MAX_SOCKETS) {
 								ZT_PHY_CLOSE_SOCKET(newSock);
-							}
-							else {
+							} else {
 #if defined(_WIN32) || defined(_WIN64)
-								{
-									BOOL f = (_noDelay ? TRUE : FALSE);
-									setsockopt(newSock, IPPROTO_TCP, TCP_NODELAY, (char*)&f, sizeof(f));
-								}
-								{
-									u_long iMode = 1;
-									ioctlsocket(newSock, FIONBIO, &iMode);
-								}
+								{ BOOL f = (_noDelay ? TRUE : FALSE); setsockopt(newSock,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f)); }
+								{ u_long iMode=1; ioctlsocket(newSock,FIONBIO,&iMode); }
 #else
-								{
-									int f = (_noDelay ? 1 : 0);
-									setsockopt(newSock, IPPROTO_TCP, TCP_NODELAY, (char*)&f, sizeof(f));
-								}
-								fcntl(newSock, F_SETFL, O_NONBLOCK);
+								{ int f = (_noDelay ? 1 : 0); setsockopt(newSock,IPPROTO_TCP,TCP_NODELAY,(char *)&f,sizeof(f)); }
+								fcntl(newSock,F_SETFL,O_NONBLOCK);
 #endif
 								_socks.push_back(PhySocketImpl());
-								PhySocketImpl& sws = _socks.back();
-								FD_SET(newSock, &_readfds);
+								PhySocketImpl &sws = _socks.back();
+								FD_SET(newSock,&_readfds);
 								if ((long)newSock > _nfds)
 									_nfds = (long)newSock;
 								sws.type = ZT_PHY_SOCKET_TCP_IN;
 								sws.sock = newSock;
-								sws.uptr = (void*)0;
-								memcpy(&(sws.saddr), &ss, sizeof(struct sockaddr_storage));
+								sws.uptr = (void *)0;
+								memcpy(&(sws.saddr),&ss,sizeof(struct sockaddr_storage));
 								try {
-									_handler->phyOnTcpAccept((PhySocket*)&(*s), (PhySocket*)&(_socks.back()), &(s->uptr), &(sws.uptr), (const struct sockaddr*)&(sws.saddr));
-								}
-								catch (...) {
-								}
+									_handler->phyOnTcpAccept((PhySocket *)&(*s),(PhySocket *)&(_socks.back()),&(s->uptr),&(sws.uptr),(const struct sockaddr *)&(sws.saddr));
+								} catch ( ... ) {}
 							}
 						}
 					}
 					break;
 
 				case ZT_PHY_SOCKET_UDP:
-					if (FD_ISSET(s->sock, &rfds)) {
-#if (defined(__linux__) || defined(linux) || defined(__linux)) && defined(MSG_WAITFORONE)
-#define RECVMMSG_WINDOW_SIZE 128
-#define RECVMMSG_BUF_SIZE	 1500
-						iovec iovs[RECVMMSG_WINDOW_SIZE];
-						uint8_t bufs[RECVMMSG_WINDOW_SIZE][RECVMMSG_BUF_SIZE];
-						sockaddr_storage addrs[RECVMMSG_WINDOW_SIZE];
-						memset(addrs, 0, sizeof(addrs));
-						mmsghdr mm[RECVMMSG_WINDOW_SIZE];
-						memset(mm, 0, sizeof(mm));
-						for (int i = 0; i < RECVMMSG_WINDOW_SIZE; ++i) {
-							iovs[i].iov_base = (void*)bufs[i];
-							iovs[i].iov_len = RECVMMSG_BUF_SIZE;
-							mm[i].msg_hdr.msg_name = (void*)&(addrs[i]);
-							mm[i].msg_hdr.msg_iov = &(iovs[i]);
-							mm[i].msg_hdr.msg_iovlen = 1;
-						}
-						for (int k = 0; k < 1024; ++k) {
-							for (int i = 0; i < RECVMMSG_WINDOW_SIZE; ++i) {
-								mm[i].msg_hdr.msg_namelen = sizeof(sockaddr_storage);
-								mm[i].msg_len = 0;
-							}
-							int received_count = recvmmsg(s->sock, mm, RECVMMSG_WINDOW_SIZE, MSG_WAITFORONE, nullptr);
-							if (received_count > 0) {
-								for (int i = 0; i < received_count; ++i) {
-									long n = (long)mm[i].msg_len;
-									if (n > 0) {
-										try {
-											_handler->phyOnDatagram((PhySocket*)&(*s), &(s->uptr), (const struct sockaddr*)&(s->saddr), (const struct sockaddr*)&(addrs[i]), bufs[i], (unsigned long)n);
-										}
-										catch (...) {
-										}
-									}
-								}
-							}
-							else {
-								break;
-							}
-						}
-#else
-						for (int k = 0; k < 1024; ++k) {
-							memset(&ss, 0, sizeof(ss));
+					if (FD_ISSET(s->sock,&rfds)) {
+						for(;;) {
+							memset(&ss,0,sizeof(ss));
 							socklen_t slen = sizeof(ss);
-							long n = (long)::recvfrom(s->sock, buf, sizeof(buf), 0, (struct sockaddr*)&ss, &slen);
+							long n = (long)::recvfrom(s->sock,buf,sizeof(buf),0,(struct sockaddr *)&ss,&slen);
 							if (n > 0) {
 								try {
-									_handler->phyOnDatagram((PhySocket*)&(*s), &(s->uptr), (const struct sockaddr*)&(s->saddr), (const struct sockaddr*)&ss, (void*)buf, (unsigned long)n);
-								}
-								catch (...) {
-								}
-							}
-							else if (n < 0)
+									_handler->phyOnDatagram((PhySocket *)&(*s),&(s->uptr),(const struct sockaddr *)&(s->saddr),(const struct sockaddr *)&ss,(void *)buf,(unsigned long)n);
+								} catch ( ... ) {}
+							} else if (n < 0)
 								break;
 						}
-#endif
 					}
 					break;
 
 				case ZT_PHY_SOCKET_UNIX_IN: {
 #ifdef __UNIX_LIKE__
-					ZT_PHY_SOCKFD_TYPE sock = s->sock;	 // if closed, s->sock becomes invalid as s is no longer dereferencable
-					if ((FD_ISSET(sock, &wfds)) && (FD_ISSET(sock, &_writefds))) {
+					ZT_PHY_SOCKFD_TYPE sock = s->sock; // if closed, s->sock becomes invalid as s is no longer dereferencable
+					if ((FD_ISSET(sock,&wfds))&&(FD_ISSET(sock,&_writefds))) {
 						try {
-							_handler->phyOnUnixWritable((PhySocket*)&(*s), &(s->uptr));
-						}
-						catch (...) {
-						}
+							_handler->phyOnUnixWritable((PhySocket *)&(*s),&(s->uptr),false);
+						} catch ( ... ) {}
 					}
-					if (FD_ISSET(sock, &rfds)) {
-						long n = (long)::read(sock, buf, sizeof(buf));
+					if (FD_ISSET(sock,&rfds)) {
+						long n = (long)::read(sock,buf,sizeof(buf));
 						if (n <= 0) {
-							this->close((PhySocket*)&(*s), true);
-						}
-						else {
+							this->close((PhySocket *)&(*s),true);
+						} else {
 							try {
-								_handler->phyOnUnixData((PhySocket*)&(*s), &(s->uptr), (void*)buf, (unsigned long)n);
-							}
-							catch (...) {
-							}
+								_handler->phyOnUnixData((PhySocket *)&(*s),&(s->uptr),(void *)buf,(unsigned long)n);
+							} catch ( ... ) {}
 						}
 					}
-#endif	 // __UNIX_LIKE__
-				} break;
+#endif // __UNIX_LIKE__
+				}	break;
 
 				case ZT_PHY_SOCKET_UNIX_LISTEN:
 #ifdef __UNIX_LIKE__
-					if (FD_ISSET(s->sock, &rfds)) {
-						memset(&ss, 0, sizeof(ss));
+					if (FD_ISSET(s->sock,&rfds)) {
+						memset(&ss,0,sizeof(ss));
 						socklen_t slen = sizeof(ss);
-						ZT_PHY_SOCKFD_TYPE newSock = ::accept(s->sock, (struct sockaddr*)&ss, &slen);
+						ZT_PHY_SOCKFD_TYPE newSock = ::accept(s->sock,(struct sockaddr *)&ss,&slen);
 						if (ZT_PHY_SOCKFD_VALID(newSock)) {
 							if (_socks.size() >= ZT_PHY_MAX_SOCKETS) {
 								ZT_PHY_CLOSE_SOCKET(newSock);
-							}
-							else {
-								fcntl(newSock, F_SETFL, O_NONBLOCK);
+							} else {
+								fcntl(newSock,F_SETFL,O_NONBLOCK);
 								_socks.push_back(PhySocketImpl());
-								PhySocketImpl& sws = _socks.back();
-								FD_SET(newSock, &_readfds);
+								PhySocketImpl &sws = _socks.back();
+								FD_SET(newSock,&_readfds);
 								if ((long)newSock > _nfds)
 									_nfds = (long)newSock;
 								sws.type = ZT_PHY_SOCKET_UNIX_IN;
 								sws.sock = newSock;
-								sws.uptr = (void*)0;
-								memcpy(&(sws.saddr), &ss, sizeof(struct sockaddr_storage));
+								sws.uptr = (void *)0;
+								memcpy(&(sws.saddr),&ss,sizeof(struct sockaddr_storage));
 								try {
 									//_handler->phyOnUnixAccept((PhySocket *)&(*s),(PhySocket *)&(_socks.back()),&(s->uptr),&(sws.uptr));
-								}
-								catch (...) {
-								}
+								} catch ( ... ) {}
 							}
 						}
 					}
-#endif	 // __UNIX_LIKE__
+#endif // __UNIX_LIKE__
 					break;
 
 				case ZT_PHY_SOCKET_FD: {
 					ZT_PHY_SOCKFD_TYPE sock = s->sock;
-					const bool readable = ((FD_ISSET(sock, &rfds)) && (FD_ISSET(sock, &_readfds)));
-					const bool writable = ((FD_ISSET(sock, &wfds)) && (FD_ISSET(sock, &_writefds)));
-					if ((readable) || (writable)) {
+					const bool readable = ((FD_ISSET(sock,&rfds))&&(FD_ISSET(sock,&_readfds)));
+					const bool writable = ((FD_ISSET(sock,&wfds))&&(FD_ISSET(sock,&_writefds)));
+					if ((readable)||(writable)) {
 						try {
 							//_handler->phyOnFileDescriptorActivity((PhySocket *)&(*s),&(s->uptr),readable,writable);
-						}
-						catch (...) {
-						}
+						} catch ( ... ) {}
 					}
-				} break;
+				}	break;
 
 				default:
 					break;
+
 			}
 
 			if (s->type == ZT_PHY_SOCKET_CLOSED)
 				_socks.erase(s++);
-			else
-				++s;
+			else ++s;
 		}
 	}
 
@@ -1192,18 +1047,18 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	 * @param sock Socket to close
 	 * @param callHandlers If true, call handlers for TCP connect (success: false) or close (default: true)
 	 */
-	inline void close(PhySocket* sock, bool callHandlers = true)
+	inline void close(PhySocket *sock,bool callHandlers = true)
 	{
-		if (! sock)
+		if (!sock)
 			return;
-		PhySocketImpl& sws = *(reinterpret_cast<PhySocketImpl*>(sock));
+		PhySocketImpl &sws = *(reinterpret_cast<PhySocketImpl *>(sock));
 		if (sws.type == ZT_PHY_SOCKET_CLOSED)
 			return;
 
-		FD_CLR(sws.sock, &_readfds);
-		FD_CLR(sws.sock, &_writefds);
+		FD_CLR(sws.sock,&_readfds);
+		FD_CLR(sws.sock,&_writefds);
 #if defined(_WIN32) || defined(_WIN64)
-		FD_CLR(sws.sock, &_exceptfds);
+		FD_CLR(sws.sock,&_exceptfds);
 #endif
 
 		if (sws.type != ZT_PHY_SOCKET_FD)
@@ -1211,34 +1066,28 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 
 #ifdef __UNIX_LIKE__
 		if (sws.type == ZT_PHY_SOCKET_UNIX_LISTEN)
-			::unlink(((struct sockaddr_un*)(&(sws.saddr)))->sun_path);
-#endif	 // __UNIX_LIKE__
+			::unlink(((struct sockaddr_un *)(&(sws.saddr)))->sun_path);
+#endif // __UNIX_LIKE__
 
 		if (callHandlers) {
-			switch (sws.type) {
+			switch(sws.type) {
 				case ZT_PHY_SOCKET_TCP_OUT_PENDING:
 					try {
-						_handler->phyOnTcpConnect(sock, &(sws.uptr), false);
-					}
-					catch (...) {
-					}
+						_handler->phyOnTcpConnect(sock,&(sws.uptr),false);
+					} catch ( ... ) {}
 					break;
 				case ZT_PHY_SOCKET_TCP_OUT_CONNECTED:
 				case ZT_PHY_SOCKET_TCP_IN:
 					try {
-						_handler->phyOnTcpClose(sock, &(sws.uptr));
-					}
-					catch (...) {
-					}
+						_handler->phyOnTcpClose(sock,&(sws.uptr));
+					} catch ( ... ) {}
 					break;
 				case ZT_PHY_SOCKET_UNIX_IN:
 #ifdef __UNIX_LIKE__
 					try {
-						_handler->phyOnUnixClose(sock, &(sws.uptr));
-					}
-					catch (...) {
-					}
-#endif	 // __UNIX_LIKE__
+						_handler->phyOnUnixClose(sock,&(sws.uptr));
+					} catch ( ... ) {}
+#endif // __UNIX_LIKE__
 					break;
 				default:
 					break;
@@ -1252,8 +1101,8 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 			long nfds = (long)_whackSendSocket;
 			if ((long)_whackReceiveSocket > nfds)
 				nfds = (long)_whackReceiveSocket;
-			for (typename std::list<PhySocketImpl>::iterator s(_socks.begin()); s != _socks.end(); ++s) {
-				if ((s->type != ZT_PHY_SOCKET_CLOSED) && ((long)s->sock > nfds))
+			for(typename std::list<PhySocketImpl>::iterator s(_socks.begin());s!=_socks.end();++s) {
+				if ((s->type != ZT_PHY_SOCKET_CLOSED)&&((long)s->sock > nfds))
 					nfds = (long)s->sock;
 			}
 			_nfds = nfds;
@@ -1261,6 +1110,6 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 	}
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/osdep/PortMapper.cpp b/osdep/PortMapper.cpp
index 1b5af9fd9..888cd6515 100644
--- a/osdep/PortMapper.cpp
+++ b/osdep/PortMapper.cpp
@@ -1,37 +1,36 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifdef ZT_USE_MINIUPNPC
 
 // Uncomment to dump debug messages
-// #define ZT_PORTMAPPER_TRACE 1
-
-#ifdef __ANDROID__
-#include <android/log.h>
-#define PM_TRACE(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, "PortMapper", __VA_ARGS__))
-#else
-#define PM_TRACE(...) fprintf(stderr, __VA_ARGS__)
-#endif
-
-#include "../node/Utils.hpp"
-#include "OSUtils.hpp"
-#include "PortMapper.hpp"
+//#define ZT_PORTMAPPER_TRACE 1
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <string>
 
+#include "../node/Utils.hpp"
+#include "OSUtils.hpp"
+#include "PortMapper.hpp"
+
 // These must be defined to get rid of dynamic export stuff in libminiupnpc and libnatpmp
 #ifdef __WINDOWS__
 #ifndef MINIUPNP_STATICLIB
@@ -42,96 +41,63 @@
 #endif
 #endif
 
-#ifdef ZT_USE_SYSTEM_MINIUPNPC
-#include <miniupnpc/miniupnpc.h>
-#include <miniupnpc/upnpcommands.h>
-#else
 #include "../ext/miniupnpc/miniupnpc.h"
 #include "../ext/miniupnpc/upnpcommands.h"
-#endif
-
-#ifdef ZT_USE_SYSTEM_NATPMP
-#include <natpmp.h>
-#else
-#ifdef __ANDROID__
-#include "natpmp.h"
-#else
 #include "../ext/libnatpmp/natpmp.h"
-#endif
-#endif
 
 namespace ZeroTier {
 
-class PortMapperImpl {
-  public:
-	PortMapperImpl(int localUdpPortToMap, const char* un) : run(true), localPort(localUdpPortToMap), uniqueName(un)
+class PortMapperImpl
+{
+public:
+	PortMapperImpl(int localUdpPortToMap,const char *un) :
+		run(true),
+		localPort(localUdpPortToMap),
+		uniqueName(un)
 	{
 	}
 
-	~PortMapperImpl()
-	{
-	}
+	~PortMapperImpl() {}
 
-	void threadMain() throw()
+	void threadMain()
+		throw()
 	{
-		int mode = 0;	// 0 == NAT-PMP, 1 == UPnP
-		int retrytime = 500;
+		int mode = 0; // 0 == NAT-PMP, 1 == UPnP
 
 #ifdef ZT_PORTMAPPER_TRACE
-		fprintf(stderr, "PortMapper: started for UDP port %d" ZT_EOL_S, localPort);
+		fprintf(stderr,"PortMapper: started for UDP port %d"ZT_EOL_S,localPort);
 #endif
 
 		while (run) {
-			{
-				// use initnatpmp to check if we can bind a port at all
-				natpmp_t _natpmp;
-				int result = initnatpmp(&_natpmp, 0, 0);
-				if (result == NATPMP_ERR_CANNOTGETGATEWAY || result == NATPMP_ERR_SOCKETERROR) {
-					closenatpmp(&_natpmp);
-#ifdef ZT_PORTMAPPER_TRACE
-					PM_TRACE("PortMapper: init failed %d. You might not have an internet connection yet. Trying again in %d" ZT_EOL_S, result, retrytime);
-#endif
-					Thread::sleep(retrytime);
-					retrytime = retrytime * 2;
-					if (retrytime > ZT_PORTMAPPER_REFRESH_DELAY / 10) {
-						retrytime = ZT_PORTMAPPER_REFRESH_DELAY / 10;
-					}
-					continue;
-				}
-				else {
-					closenatpmp(&_natpmp);
-					retrytime = 500;
-				}
-			}
+
 			// ---------------------------------------------------------------------
 			// NAT-PMP mode (preferred)
 			// ---------------------------------------------------------------------
 			if (mode == 0) {
-				natpmp_t natpmp;
-				natpmpresp_t response;
+			  natpmp_t natpmp;
+			  natpmpresp_t response;
 				int r = 0;
 
 				bool natPmpSuccess = false;
-				for (int tries = 0; tries < 60; ++tries) {
+				for(int tries=0;tries<60;++tries) {
 					int tryPort = (int)localPort + tries;
 					if (tryPort >= 65535)
 						tryPort = (tryPort - 65535) + 1025;
 
-					memset(&natpmp, 0, sizeof(natpmp));
-					memset(&response, 0, sizeof(response));
+					memset(&natpmp,0,sizeof(natpmp));
+					memset(&response,0,sizeof(response));
 
-					if (initnatpmp(&natpmp, 0, 0) != 0) {
+					if (initnatpmp(&natpmp,0,0) != 0) {
 						mode = 1;
-						closenatpmp(&natpmp);
 #ifdef ZT_PORTMAPPER_TRACE
-						PM_TRACE("PortMapper: NAT-PMP: init failed, switching to UPnP mode" ZT_EOL_S);
+						fprintf(stderr,"PortMapper: NAT-PMP: init failed, switching to UPnP mode"ZT_EOL_S);
 #endif
 						break;
 					}
 
 					InetAddress publicAddress;
 					sendpublicaddressrequest(&natpmp);
-					int64_t myTimeout = OSUtils::now() + 5000;
+					uint64_t myTimeout = OSUtils::now() + 5000;
 					do {
 						fd_set fds;
 						struct timeval timeout;
@@ -144,34 +110,32 @@ class PortMapperImpl {
 							break;
 					} while (r == NATPMP_TRYAGAIN);
 					if (r == 0) {
-						publicAddress = InetAddress((uint32_t)response.pnu.publicaddress.addr.s_addr, 0);
-					}
-					else {
+						publicAddress = InetAddress((uint32_t)response.pnu.publicaddress.addr.s_addr,0);
+					} else {
 #ifdef ZT_PORTMAPPER_TRACE
-						PM_TRACE("PortMapper: NAT-PMP: request for external address failed, aborting..." ZT_EOL_S);
+						fprintf(stderr,"PortMapper: NAT-PMP: request for external address failed, aborting..."ZT_EOL_S);
 #endif
 						closenatpmp(&natpmp);
 						break;
 					}
 
-					sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_UDP, localPort, tryPort, (ZT_PORTMAPPER_REFRESH_DELAY * 2) / 1000);
+				  sendnewportmappingrequest(&natpmp,NATPMP_PROTOCOL_UDP,localPort,tryPort,(ZT_PORTMAPPER_REFRESH_DELAY * 2) / 1000);
 					myTimeout = OSUtils::now() + 10000;
 					do {
-						fd_set fds;
-						struct timeval timeout;
-						FD_ZERO(&fds);
-						FD_SET(natpmp.s, &fds);
-						getnatpmprequesttimeout(&natpmp, &timeout);
-						select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
-						r = readnatpmpresponseorretry(&natpmp, &response);
+				    fd_set fds;
+				    struct timeval timeout;
+				    FD_ZERO(&fds);
+				    FD_SET(natpmp.s, &fds);
+				    getnatpmprequesttimeout(&natpmp, &timeout);
+				    select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
+				    r = readnatpmpresponseorretry(&natpmp, &response);
 						if (OSUtils::now() >= myTimeout)
 							break;
-					} while (r == NATPMP_TRYAGAIN);
+				  } while (r == NATPMP_TRYAGAIN);
 					if (r == 0) {
 						publicAddress.setPort(response.pnu.newportmapping.mappedpublicport);
 #ifdef ZT_PORTMAPPER_TRACE
-						char paddr[128];
-						PM_TRACE("PortMapper: NAT-PMP: mapped %u to %s" ZT_EOL_S, (unsigned int)localPort, publicAddress.toString(paddr));
+						fprintf(stderr,"PortMapper: NAT-PMP: mapped %u to %s"ZT_EOL_S,(unsigned int)localPort,publicAddress.toString().c_str());
 #endif
 						Mutex::Lock sl(surface_l);
 						surface.clear();
@@ -179,19 +143,17 @@ class PortMapperImpl {
 						natPmpSuccess = true;
 						closenatpmp(&natpmp);
 						break;
-					}
-					else {
+					} else {
 						closenatpmp(&natpmp);
 						// continue
 					}
 				}
 
-				if (! natPmpSuccess) {
+				if (!natPmpSuccess) {
 					mode = 1;
 #ifdef ZT_PORTMAPPER_TRACE
-					PM_TRACE("PortMapper: NAT-PMP: request failed, switching to UPnP mode" ZT_EOL_S);
+					fprintf(stderr,"PortMapper: NAT-PMP: request failed, switching to UPnP mode"ZT_EOL_S);
 #endif
-					continue;
 				}
 			}
 			// ---------------------------------------------------------------------
@@ -201,66 +163,65 @@ class PortMapperImpl {
 			// ---------------------------------------------------------------------
 			if (mode == 1) {
 				char lanaddr[4096];
-				char externalip[4096];	 // no range checking? so make these buffers larger than any UDP packet a uPnP server could send us as a precaution :P
+				char externalip[4096]; // no range checking? so make these buffers larger than any UDP packet a uPnP server could send us as a precaution :P
 				char inport[16];
 				char outport[16];
 				struct UPNPUrls urls;
 				struct IGDdatas data;
 
 				int upnpError = 0;
-				UPNPDev* devlist = upnpDiscoverAll(5000, (const char*)0, (const char*)0, 0, 0, 2, &upnpError);
+				UPNPDev *devlist = upnpDiscoverAll(5000,(const char *)0,(const char *)0,0,0,2,&upnpError);
 				if (devlist) {
+
 #ifdef ZT_PORTMAPPER_TRACE
 					{
-						UPNPDev* dev = devlist;
+						UPNPDev *dev = devlist;
 						while (dev) {
-							PM_TRACE("PortMapper: found UPnP device at URL '%s': %s" ZT_EOL_S, dev->descURL, dev->st);
+							fprintf(stderr,"PortMapper: found UPnP device at URL '%s': %s"ZT_EOL_S,dev->descURL,dev->st);
 							dev = dev->pNext;
 						}
 					}
 #endif
 
-					memset(lanaddr, 0, sizeof(lanaddr));
-					memset(externalip, 0, sizeof(externalip));
-					memset(&urls, 0, sizeof(urls));
-					memset(&data, 0, sizeof(data));
-					OSUtils::ztsnprintf(inport, sizeof(inport), "%d", localPort);
+					memset(lanaddr,0,sizeof(lanaddr));
+					memset(externalip,0,sizeof(externalip));
+					memset(&urls,0,sizeof(urls));
+					memset(&data,0,sizeof(data));
+					Utils::snprintf(inport,sizeof(inport),"%d",localPort);
 
-					int foundValidIGD = 0;
-					if ((foundValidIGD = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr))) && (lanaddr[0])) {
+					if ((UPNP_GetValidIGD(devlist,&urls,&data,lanaddr,sizeof(lanaddr)))&&(lanaddr[0])) {
 #ifdef ZT_PORTMAPPER_TRACE
-						PM_TRACE("PortMapper: UPnP: my LAN IP address: %s" ZT_EOL_S, lanaddr);
+						fprintf(stderr,"PortMapper: UPnP: my LAN IP address: %s"ZT_EOL_S,lanaddr);
 #endif
-						if ((UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalip) == UPNPCOMMAND_SUCCESS) && (externalip[0])) {
+						if ((UPNP_GetExternalIPAddress(urls.controlURL,data.first.servicetype,externalip) == UPNPCOMMAND_SUCCESS)&&(externalip[0])) {
 #ifdef ZT_PORTMAPPER_TRACE
-							PM_TRACE("PortMapper: UPnP: my external IP address: %s" ZT_EOL_S, externalip);
+							fprintf(stderr,"PortMapper: UPnP: my external IP address: %s"ZT_EOL_S,externalip);
 #endif
 
-							for (int tries = 0; tries < 60; ++tries) {
+							for(int tries=0;tries<60;++tries) {
 								int tryPort = (int)localPort + tries;
 								if (tryPort >= 65535)
 									tryPort = (tryPort - 65535) + 1025;
-								OSUtils::ztsnprintf(outport, sizeof(outport), "%u", tryPort);
+								Utils::snprintf(outport,sizeof(outport),"%u",tryPort);
 
 								// First check and see if this port is already mapped to the
 								// same unique name. If so, keep this mapping and don't try
 								// to map again since this can break buggy routers. But don't
 								// fail if this command fails since not all routers support it.
 								{
-									char haveIntClient[128];   // 128 == big enough for all these as per miniupnpc "documentation"
+									char haveIntClient[128]; // 128 == big enough for all these as per miniupnpc "documentation"
 									char haveIntPort[128];
 									char haveDesc[128];
 									char haveEnabled[128];
 									char haveLeaseDuration[128];
-									memset(haveIntClient, 0, sizeof(haveIntClient));
-									memset(haveIntPort, 0, sizeof(haveIntPort));
-									memset(haveDesc, 0, sizeof(haveDesc));
-									memset(haveEnabled, 0, sizeof(haveEnabled));
-									memset(haveLeaseDuration, 0, sizeof(haveLeaseDuration));
-									if ((UPNP_GetSpecificPortMappingEntry(urls.controlURL, data.first.servicetype, outport, "UDP", (const char*)0, haveIntClient, haveIntPort, haveDesc, haveEnabled, haveLeaseDuration) == UPNPCOMMAND_SUCCESS)
-										&& (uniqueName == haveDesc)) {
+									memset(haveIntClient,0,sizeof(haveIntClient));
+									memset(haveIntPort,0,sizeof(haveIntPort));
+									memset(haveDesc,0,sizeof(haveDesc));
+									memset(haveEnabled,0,sizeof(haveEnabled));
+									memset(haveLeaseDuration,0,sizeof(haveLeaseDuration));
+									if ((UPNP_GetSpecificPortMappingEntry(urls.controlURL,data.first.servicetype,outport,"UDP",(const char *)0,haveIntClient,haveIntPort,haveDesc,haveEnabled,haveLeaseDuration) == UPNPCOMMAND_SUCCESS)&&(uniqueName == haveDesc)) {
 #ifdef ZT_PORTMAPPER_TRACE
-										PM_TRACE("PortMapper: UPnP: reusing previously reserved external port: %s" ZT_EOL_S, outport);
+										fprintf(stderr,"PortMapper: UPnP: reusing previously reserved external port: %s"ZT_EOL_S,outport);
 #endif
 										Mutex::Lock sl(surface_l);
 										surface.clear();
@@ -273,9 +234,9 @@ class PortMapperImpl {
 
 								// Try to map this port
 								int mapResult = 0;
-								if ((mapResult = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, outport, inport, lanaddr, uniqueName.c_str(), "UDP", (const char*)0, "0")) == UPNPCOMMAND_SUCCESS) {
+								if ((mapResult = UPNP_AddPortMapping(urls.controlURL,data.first.servicetype,outport,inport,lanaddr,uniqueName.c_str(),"UDP",(const char *)0,"0")) == UPNPCOMMAND_SUCCESS) {
 #ifdef ZT_PORTMAPPER_TRACE
-									PM_TRACE("PortMapper: UPnP: reserved external port: %s" ZT_EOL_S, outport);
+									fprintf(stderr,"PortMapper: UPnP: reserved external port: %s"ZT_EOL_S,outport);
 #endif
 									Mutex::Lock sl(surface_l);
 									surface.clear();
@@ -283,45 +244,40 @@ class PortMapperImpl {
 									tmp.setPort(tryPort);
 									surface.push_back(tmp);
 									break;
-								}
-								else {
+								} else {
 #ifdef ZT_PORTMAPPER_TRACE
-									PM_TRACE("PortMapper: UPnP: UPNP_AddPortMapping(%s) failed: %d" ZT_EOL_S, outport, mapResult);
+									fprintf(stderr,"PortMapper: UPnP: UPNP_AddPortMapping(%s) failed: %d"ZT_EOL_S,outport,mapResult);
 #endif
 									Thread::sleep(1000);
 								}
 							}
-						}
-						else {
+
+						} else {
 							mode = 0;
 #ifdef ZT_PORTMAPPER_TRACE
-							PM_TRACE("PortMapper: UPnP: UPNP_GetExternalIPAddress failed, returning to NAT-PMP mode" ZT_EOL_S);
+							fprintf(stderr,"PortMapper: UPnP: UPNP_GetExternalIPAddress failed, returning to NAT-PMP mode"ZT_EOL_S);
 #endif
 						}
-					}
-					else {
+					} else {
 						mode = 0;
 #ifdef ZT_PORTMAPPER_TRACE
-						PM_TRACE("PortMapper: UPnP: UPNP_GetValidIGD failed, returning to NAT-PMP mode" ZT_EOL_S);
+						fprintf(stderr,"PortMapper: UPnP: UPNP_GetValidIGD failed, returning to NAT-PMP mode"ZT_EOL_S);
 #endif
 					}
+
 					freeUPNPDevlist(devlist);
 
-					if (foundValidIGD) {
-						FreeUPNPUrls(&urls);
-					}
-				}
-				else {
+				} else {
 					mode = 0;
 #ifdef ZT_PORTMAPPER_TRACE
-					PM_TRACE("PortMapper: upnpDiscover failed, returning to NAT-PMP mode: %d" ZT_EOL_S, upnpError);
+					fprintf(stderr,"PortMapper: upnpDiscover failed, returning to NAT-PMP mode: %d"ZT_EOL_S,upnpError);
 #endif
 				}
 			}
 			// ---------------------------------------------------------------------
 
 #ifdef ZT_PORTMAPPER_TRACE
-			PM_TRACE("UPNPClient: rescanning in %d ms" ZT_EOL_S, ZT_PORTMAPPER_REFRESH_DELAY);
+			fprintf(stderr,"UPNPClient: rescanning in %d ms"ZT_EOL_S,ZT_PORTMAPPER_REFRESH_DELAY);
 #endif
 			Thread::sleep(ZT_PORTMAPPER_REFRESH_DELAY);
 		}
@@ -337,9 +293,9 @@ class PortMapperImpl {
 	std::vector<InetAddress> surface;
 };
 
-PortMapper::PortMapper(int localUdpPortToMap, const char* uniqueName)
+PortMapper::PortMapper(int localUdpPortToMap,const char *uniqueName)
 {
-	_impl = new PortMapperImpl(localUdpPortToMap, uniqueName);
+	_impl = new PortMapperImpl(localUdpPortToMap,uniqueName);
 	Thread::start(_impl);
 }
 
@@ -354,6 +310,6 @@ std::vector<InetAddress> PortMapper::get() const
 	return _impl->surface;
 }
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
-#endif	 // ZT_USE_MINIUPNPC
+#endif // ZT_USE_MINIUPNPC
diff --git a/osdep/PortMapper.hpp b/osdep/PortMapper.hpp
index e65064772..0b8d15fce 100644
--- a/osdep/PortMapper.hpp
+++ b/osdep/PortMapper.hpp
@@ -1,28 +1,33 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifdef ZT_USE_MINIUPNPC
 
 #ifndef ZT_PORTMAPPER_HPP
 #define ZT_PORTMAPPER_HPP
 
+#include <vector>
+
 #include "../node/Constants.hpp"
 #include "../node/InetAddress.hpp"
 #include "../node/Mutex.hpp"
 #include "Thread.hpp"
 
-#include <vector>
-
 /**
  * How frequently should we refresh our UPNP/NAT-PnP/whatever state?
  */
@@ -35,17 +40,18 @@ class PortMapperImpl;
 /**
  * UPnP/NAT-PnP port mapping "daemon"
  */
-class PortMapper {
+class PortMapper
+{
 	friend class PortMapperImpl;
 
-  public:
+public:
 	/**
 	 * Create and start port mapper service
 	 *
 	 * @param localUdpPortToMap Port we want visible to the outside world
 	 * @param name Unique name of this endpoint (based on ZeroTier address)
 	 */
-	PortMapper(int localUdpPortToMap, const char* uniqueName);
+	PortMapper(int localUdpPortToMap,const char *uniqueName);
 
 	~PortMapper();
 
@@ -54,12 +60,12 @@ class PortMapper {
 	 */
 	std::vector<InetAddress> get() const;
 
-  private:
-	PortMapperImpl* _impl;
+private:
+	PortMapperImpl *_impl;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
 
-#endif	 // ZT_USE_MINIUPNPC
+#endif // ZT_USE_MINIUPNPC
diff --git a/osdep/RoutingTable.cpp b/osdep/RoutingTable.cpp
new file mode 100644
index 000000000..40523898e
--- /dev/null
+++ b/osdep/RoutingTable.cpp
@@ -0,0 +1,608 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../node/Constants.hpp"
+
+#ifdef __WINDOWS__
+#include <WinSock2.h>
+#include <Windows.h>
+#include <netioapi.h>
+#include <IPHlpApi.h>
+#endif
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __UNIX_LIKE__
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/route.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <ifaddrs.h>
+#endif
+
+#include <vector>
+#include <algorithm>
+#include <utility>
+
+#include "RoutingTable.hpp"
+
+#define ZT_BSD_ROUTE_CMD "/sbin/route"
+#define ZT_LINUX_IP_COMMAND "/sbin/ip"
+
+namespace ZeroTier {
+
+// ---------------------------------------------------------------------------
+
+#ifdef __LINUX__
+
+std::vector<RoutingTable::Entry> RoutingTable::get(bool includeLinkLocal,bool includeLoopback)
+{
+	char buf[131072];
+	char *stmp,*stmp2;
+	std::vector<RoutingTable::Entry> entries;
+
+	{
+		int fd = ::open("/proc/net/route",O_RDONLY);
+		if (fd <= 0)
+			buf[0] = (char)0;
+		else {
+			int n = (int)::read(fd,buf,sizeof(buf) - 1);
+			::close(fd);
+			if (n < 0) n = 0;
+			buf[n] = (char)0;
+		}
+	}
+
+	int lineno = 0;
+	for(char *line=Utils::stok(buf,"\r\n",&stmp);(line);line=Utils::stok((char *)0,"\r\n",&stmp)) {
+		if (lineno == 0) {
+			++lineno;
+			continue; // skip header
+		}
+
+		char *iface = (char *)0;
+		uint32_t destination = 0;
+		uint32_t gateway = 0;
+		int metric = 0;
+		uint32_t mask = 0;
+
+		int fno = 0;
+		for(char *f=Utils::stok(line,"\t \r\n",&stmp2);(f);f=Utils::stok((char *)0,"\t \r\n",&stmp2)) {
+			switch(fno) {
+				case 0: iface = f; break;
+				case 1: destination = (uint32_t)Utils::hexStrToULong(f); break;
+				case 2: gateway = (uint32_t)Utils::hexStrToULong(f); break;
+				case 6: metric = (int)Utils::strToInt(f); break;
+				case 7: mask = (uint32_t)Utils::hexStrToULong(f); break;
+			}
+			++fno;
+		}
+
+		if ((iface)&&(destination)) {
+			RoutingTable::Entry e;
+			if (destination)
+				e.destination.set(&destination,4,Utils::countBits(mask));
+			e.gateway.set(&gateway,4,0);
+			e.deviceIndex = 0; // not used on Linux
+			e.metric = metric;
+			Utils::scopy(e.device,sizeof(e.device),iface);
+			if ((e.destination)&&((includeLinkLocal)||(!e.destination.isLinkLocal()))&&((includeLoopback)||((!e.destination.isLoopback())&&(!e.gateway.isLoopback())&&(strcmp(iface,"lo")))))
+				entries.push_back(e);
+		}
+
+		++lineno;
+	}
+
+	{
+		int fd = ::open("/proc/net/ipv6_route",O_RDONLY);
+		if (fd <= 0)
+			buf[0] = (char)0;
+		else {
+			int n = (int)::read(fd,buf,sizeof(buf) - 1);
+			::close(fd);
+			if (n < 0) n = 0;
+			buf[n] = (char)0;
+		}
+	}
+
+	for(char *line=Utils::stok(buf,"\r\n",&stmp);(line);line=Utils::stok((char *)0,"\r\n",&stmp)) {
+		char *destination = (char *)0;
+		unsigned int destPrefixLen = 0;
+		char *gateway = (char *)0; // next hop in ipv6 terminology
+		int metric = 0;
+		char *device = (char *)0;
+
+		int fno = 0;
+		for(char *f=Utils::stok(line,"\t \r\n",&stmp2);(f);f=Utils::stok((char *)0,"\t \r\n",&stmp2)) {
+			switch(fno) {
+				case 0: destination = f; break;
+				case 1: destPrefixLen = (unsigned int)Utils::hexStrToULong(f); break;
+				case 4: gateway = f; break;
+				case 5: metric = (int)Utils::hexStrToLong(f); break;
+				case 9: device = f; break;
+			}
+			++fno;
+		}
+
+		if ((device)&&(destination)) {
+			unsigned char tmp[16];
+			RoutingTable::Entry e;
+			Utils::unhex(destination,tmp,16);
+			if ((!Utils::isZero(tmp,16))&&(tmp[0] != 0xff))
+				e.destination.set(tmp,16,destPrefixLen);
+			Utils::unhex(gateway,tmp,16);
+			e.gateway.set(tmp,16,0);
+			e.deviceIndex = 0; // not used on Linux
+			e.metric = metric;
+			Utils::scopy(e.device,sizeof(e.device),device);
+			if ((e.destination)&&((includeLinkLocal)||(!e.destination.isLinkLocal()))&&((includeLoopback)||((!e.destination.isLoopback())&&(!e.gateway.isLoopback())&&(strcmp(device,"lo")))))
+				entries.push_back(e);
+		}
+	}
+
+	std::sort(entries.begin(),entries.end());
+	return entries;
+}
+
+RoutingTable::Entry RoutingTable::set(const InetAddress &destination,const InetAddress &gateway,const char *device,int metric,bool ifscope)
+{
+	char metstr[128];
+
+	if ((!gateway)&&((!device)||(!device[0])))
+		return RoutingTable::Entry();
+
+	Utils::snprintf(metstr,sizeof(metstr),"%d",metric);
+
+	if (metric < 0) {
+		long pid = (long)vfork();
+		if (pid == 0) {
+			if (gateway) {
+				if ((device)&&(device[0])) {
+					::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,"route","del",destination.toString().c_str(),"via",gateway.toIpString().c_str(),"dev",device,(const char *)0);
+				} else {
+					::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,"route","del",destination.toString().c_str(),"via",gateway.toIpString().c_str(),(const char *)0);
+				}
+			} else {
+				::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,"route","del",destination.toString().c_str(),"dev",device,(const char *)0);
+			}
+			::_exit(-1);
+		} else if (pid > 0) {
+			int exitcode = -1;
+			::waitpid(pid,&exitcode,0);
+		}
+	} else {
+		long pid = (long)vfork();
+		if (pid == 0) {
+			if (gateway) {
+				if ((device)&&(device[0])) {
+					::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,"route","replace",destination.toString().c_str(),"metric",metstr,"via",gateway.toIpString().c_str(),"dev",device,(const char *)0);
+				} else {
+					::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,"route","replace",destination.toString().c_str(),"metric",metstr,"via",gateway.toIpString().c_str(),(const char *)0);
+				}
+			} else {
+				::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,"route","replace",destination.toString().c_str(),"metric",metstr,"dev",device,(const char *)0);
+			}
+			::_exit(-1);
+		} else if (pid > 0) {
+			int exitcode = -1;
+			::waitpid(pid,&exitcode,0);
+		}
+	}
+
+	std::vector<RoutingTable::Entry> rtab(get(true,true));
+	std::vector<RoutingTable::Entry>::iterator bestEntry(rtab.end());
+	for(std::vector<RoutingTable::Entry>::iterator e(rtab.begin());e!=rtab.end();++e) {
+		if ((e->destination == destination)&&(e->gateway.ipsEqual(gateway))) {
+			if ((device)&&(device[0])) {
+				if (!strcmp(device,e->device)) {
+					if (metric == e->metric)
+						bestEntry = e;
+				}
+			}
+			if (bestEntry == rtab.end())
+				bestEntry = e;
+		}
+	}
+	if (bestEntry != rtab.end())
+		return *bestEntry;
+
+	return RoutingTable::Entry();
+}
+
+#endif // __LINUX__
+
+// ---------------------------------------------------------------------------
+
+#ifdef __BSD__
+
+std::vector<RoutingTable::Entry> RoutingTable::get(bool includeLinkLocal,bool includeLoopback)
+{
+	std::vector<RoutingTable::Entry> entries;
+	int mib[6];
+	size_t needed;
+
+	mib[0] = CTL_NET;
+	mib[1] = PF_ROUTE;
+	mib[2] = 0;
+	mib[3] = 0;
+	mib[4] = NET_RT_DUMP;
+	mib[5] = 0;
+	if (!sysctl(mib,6,NULL,&needed,NULL,0)) {
+		if (needed <= 0)
+			return entries;
+
+		char *buf = (char *)::malloc(needed);
+		if (buf) {
+			if (!sysctl(mib,6,buf,&needed,NULL,0)) {
+		    struct rt_msghdr *rtm;
+				for(char *next=buf,*end=buf+needed;next<end;) {
+					rtm = (struct rt_msghdr *)next;
+					char *saptr = (char *)(rtm + 1);
+					char *saend = next + rtm->rtm_msglen;
+
+					if (((rtm->rtm_flags & RTF_LLINFO) == 0)&&((rtm->rtm_flags & RTF_HOST) == 0)&&((rtm->rtm_flags & RTF_UP) != 0)&&((rtm->rtm_flags & RTF_MULTICAST) == 0)) {
+						RoutingTable::Entry e;
+						e.deviceIndex = -9999; // unset
+
+						int which = 0;
+						while (saptr < saend) {
+							struct sockaddr *sa = (struct sockaddr *)saptr;
+							unsigned int salen = sa->sa_len;
+							if (!salen)
+								break;
+
+							// Skip missing fields in rtm_addrs bit field
+							while ((rtm->rtm_addrs & 1) == 0) {
+								rtm->rtm_addrs >>= 1;
+								++which;
+								if (which > 6)
+									break;
+							}
+							if (which > 6)
+								break;
+
+							rtm->rtm_addrs >>= 1;
+							switch(which++) {
+								case 0:
+									//printf("RTA_DST\n");
+									if (sa->sa_family == AF_INET6) {
+										struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa;
+										// Nobody expects the Spanish inquisition!
+										if ((sin6->sin6_addr.s6_addr[0] == 0xfe)&&((sin6->sin6_addr.s6_addr[1] & 0xc0) == 0x80)) {
+											// Our chief weapon is... in-band signaling!
+											// Seriously who in the living fuck thought this was a good idea and
+											// then had the sadistic idea to not document it anywhere? Of course it's
+											// not like there is any documentation on BSD sysctls anyway.
+											unsigned int interfaceIndex = ((((unsigned int)sin6->sin6_addr.s6_addr[2]) << 8) & 0xff) | (((unsigned int)sin6->sin6_addr.s6_addr[3]) & 0xff);
+											sin6->sin6_addr.s6_addr[2] = 0;
+											sin6->sin6_addr.s6_addr[3] = 0;
+											if (!sin6->sin6_scope_id)
+												sin6->sin6_scope_id = interfaceIndex;
+										}
+									}
+									e.destination = *sa;
+									break;
+								case 1:
+									//printf("RTA_GATEWAY\n");
+									switch(sa->sa_family) {
+										case AF_LINK:
+											e.deviceIndex = (int)((const struct sockaddr_dl *)sa)->sdl_index;
+											break;
+										case AF_INET:
+										case AF_INET6:
+											e.gateway = *sa;
+											break;
+									}
+									break;
+								case 2: {
+									if (e.destination.isV6()) {
+										salen = sizeof(struct sockaddr_in6); // Confess!
+										unsigned int bits = 0;
+										for(int i=0;i<16;++i) {
+											unsigned char c = (unsigned char)((const struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[i];
+											if (c == 0xff)
+												bits += 8;
+											else break;
+											/* must they be multiples of 8? Most of the BSD source I can find says yes..?
+											else {
+												while ((c & 0x80) == 0x80) {
+													++bits;
+													c <<= 1;
+												}
+												break;
+											}
+											*/
+										}
+										e.destination.setPort(bits);
+									} else {
+										salen = sizeof(struct sockaddr_in); // Confess!
+										e.destination.setPort((unsigned int)Utils::countBits((uint32_t)((const struct sockaddr_in *)sa)->sin_addr.s_addr));
+									}
+									//printf("RTA_NETMASK\n");
+								}	break;
+								/*
+								case 3:
+									//printf("RTA_GENMASK\n");
+									break;
+								case 4:
+									//printf("RTA_IFP\n");
+									break;
+								case 5:
+									//printf("RTA_IFA\n");
+									break;
+								case 6:
+									//printf("RTA_AUTHOR\n");
+									break;
+								*/
+							}
+
+							saptr += salen;
+						}
+
+						e.metric = (int)rtm->rtm_rmx.rmx_hopcount;
+						if (e.metric < 0)
+							e.metric = 0;
+
+						InetAddress::IpScope dscope = e.destination.ipScope();
+						if ( ((includeLinkLocal)||(dscope != InetAddress::IP_SCOPE_LINK_LOCAL)) && ((includeLoopback)||((dscope != InetAddress::IP_SCOPE_LOOPBACK) && (e.gateway.ipScope() != InetAddress::IP_SCOPE_LOOPBACK) )))
+							entries.push_back(e);
+					}
+
+					next = saend;
+				}
+			}
+
+			::free(buf);
+		}
+	}
+
+	for(std::vector<ZeroTier::RoutingTable::Entry>::iterator e1(entries.begin());e1!=entries.end();++e1) {
+		if ((!e1->device[0])&&(e1->deviceIndex >= 0))
+			if_indextoname(e1->deviceIndex,e1->device);
+	}
+	for(std::vector<ZeroTier::RoutingTable::Entry>::iterator e1(entries.begin());e1!=entries.end();++e1) {
+		if ((!e1->device[0])&&(e1->gateway)) {
+			int bestMetric = 9999999;
+			for(std::vector<ZeroTier::RoutingTable::Entry>::iterator e2(entries.begin());e2!=entries.end();++e2) {
+				if ((e2->destination.containsAddress(e1->gateway))&&(e2->metric <= bestMetric)) {
+					bestMetric = e2->metric;
+					Utils::scopy(e1->device,sizeof(e1->device),e2->device);
+				}
+			}
+		}
+	}
+
+	std::sort(entries.begin(),entries.end());
+
+	return entries;
+}
+
+RoutingTable::Entry RoutingTable::set(const InetAddress &destination,const InetAddress &gateway,const char *device,int metric,bool ifscope)
+{
+	if ((!gateway)&&((!device)||(!device[0])))
+		return RoutingTable::Entry();
+
+	std::vector<RoutingTable::Entry> rtab(get(true,true));
+
+	for(std::vector<RoutingTable::Entry>::iterator e(rtab.begin());e!=rtab.end();++e) {
+		if (e->destination == destination) {
+			if (((!device)||(!device[0]))||(!strcmp(device,e->device))) {
+				long p = (long)fork();
+				if (p > 0) {
+					int exitcode = -1;
+					::waitpid(p,&exitcode,0);
+				} else if (p == 0) {
+					::close(STDOUT_FILENO);
+					::close(STDERR_FILENO);
+					::execl(ZT_BSD_ROUTE_CMD,ZT_BSD_ROUTE_CMD,"delete",(destination.isV6() ? "-inet6" : "-inet"),destination.toString().c_str(),(const char *)0);
+					::_exit(-1);
+				}
+			}
+		}
+	}
+
+	if (metric < 0)
+		return RoutingTable::Entry();
+
+	{
+		char hcstr[64];
+		Utils::snprintf(hcstr,sizeof(hcstr),"%d",metric);
+		long p = (long)fork();
+		if (p > 0) {
+			int exitcode = -1;
+			::waitpid(p,&exitcode,0);
+		} else if (p == 0) {
+			::close(STDOUT_FILENO);
+			::close(STDERR_FILENO);
+			if (gateway) {
+				::execl(ZT_BSD_ROUTE_CMD,ZT_BSD_ROUTE_CMD,"add",(destination.isV6() ? "-inet6" : "-inet"),destination.toString().c_str(),gateway.toIpString().c_str(),"-hopcount",hcstr,(const char *)0);
+			} else if ((device)&&(device[0])) {
+				::execl(ZT_BSD_ROUTE_CMD,ZT_BSD_ROUTE_CMD,"add",(destination.isV6() ? "-inet6" : "-inet"),destination.toString().c_str(),"-interface",device,"-hopcount",hcstr,(const char *)0);
+			}
+			::_exit(-1);
+		}
+	}
+
+	rtab = get(true,true);
+	std::vector<RoutingTable::Entry>::iterator bestEntry(rtab.end());
+	for(std::vector<RoutingTable::Entry>::iterator e(rtab.begin());e!=rtab.end();++e) {
+		if ((e->destination == destination)&&(e->gateway.ipsEqual(gateway))) {
+			if ((device)&&(device[0])) {
+				if (!strcmp(device,e->device)) {
+					if (metric == e->metric)
+						bestEntry = e;
+				}
+			}
+			if (bestEntry == rtab.end())
+				bestEntry = e;
+		}
+	}
+	if (bestEntry != rtab.end())
+		return *bestEntry;
+
+	return RoutingTable::Entry();
+}
+
+#endif // __BSD__
+
+// ---------------------------------------------------------------------------
+
+#ifdef __WINDOWS__
+
+static void _copyInetAddressToSockaddrInet(const InetAddress &a,SOCKADDR_INET &sinet)
+{
+	memset(&sinet,0,sizeof(sinet));
+	if (a.isV4()) {
+		sinet.Ipv4.sin_addr.S_un.S_addr = *((const uint32_t *)a.rawIpData());
+		sinet.Ipv4.sin_family = AF_INET;
+		sinet.Ipv4.sin_port = htons(a.port());
+	} else if (a.isV6()) {
+		memcpy(sinet.Ipv6.sin6_addr.u.Byte,a.rawIpData(),16);
+		sinet.Ipv6.sin6_family = AF_INET6;
+		sinet.Ipv6.sin6_port = htons(a.port());
+	}
+}
+
+std::vector<RoutingTable::Entry> RoutingTable::get(bool includeLinkLocal,bool includeLoopback) const
+{
+	std::vector<RoutingTable::Entry> entries;
+	PMIB_IPFORWARD_TABLE2 rtbl = NULL;
+
+	if (GetIpForwardTable2(AF_UNSPEC,&rtbl) != NO_ERROR)
+		return entries;
+	if (!rtbl)
+		return entries;
+
+	for(ULONG r=0;r<rtbl->NumEntries;++r) {
+		RoutingTable::Entry e;
+		switch(rtbl->Table[r].DestinationPrefix.Prefix.si_family) {
+			case AF_INET:
+				e.destination.set(&(rtbl->Table[r].DestinationPrefix.Prefix.Ipv4.sin_addr.S_un.S_addr),4,rtbl->Table[r].DestinationPrefix.PrefixLength);
+				break;
+			case AF_INET6:
+				e.destination.set(rtbl->Table[r].DestinationPrefix.Prefix.Ipv6.sin6_addr.u.Byte,16,rtbl->Table[r].DestinationPrefix.PrefixLength);
+				break;
+		}
+		switch(rtbl->Table[r].NextHop.si_family) {
+			case AF_INET:
+				e.gateway.set(&(rtbl->Table[r].NextHop.Ipv4.sin_addr.S_un.S_addr),4,0);
+				break;
+			case AF_INET6:
+				e.gateway.set(rtbl->Table[r].NextHop.Ipv6.sin6_addr.u.Byte,16,0);
+				break;
+		}
+		e.deviceIndex = (int)rtbl->Table[r].InterfaceIndex;
+		e.metric = (int)rtbl->Table[r].Metric;
+		ConvertInterfaceLuidToNameA(&(rtbl->Table[r].InterfaceLuid),e.device,sizeof(e.device));
+		if ((e.destination)&&((includeLinkLocal)||(!e.destination.isLinkLocal()))&&((includeLoopback)||((!e.destination.isLoopback())&&(!e.gateway.isLoopback()))))
+			entries.push_back(e);
+	}
+
+	FreeMibTable(rtbl);
+	std::sort(entries.begin(),entries.end());
+	return entries;
+}
+
+RoutingTable::Entry RoutingTable::set(const InetAddress &destination,const InetAddress &gateway,const char *device,int metric,bool ifscope)
+{
+	NET_LUID luid;
+	luid.Value = 0;
+	if (ConvertInterfaceNameToLuidA(device,&luid) != NO_ERROR)
+		return RoutingTable::Entry();
+
+	bool needCreate = true;
+	PMIB_IPFORWARD_TABLE2 rtbl = NULL;
+	if (GetIpForwardTable2(AF_UNSPEC,&rtbl) != NO_ERROR)
+		return RoutingTable::Entry();
+	if (!rtbl)
+		return RoutingTable::Entry();
+	for(ULONG r=0;r<rtbl->NumEntries;++r) {
+		if (rtbl->Table[r].InterfaceLuid.Value == luid.Value) {
+			InetAddress rdest;
+			switch(rtbl->Table[r].DestinationPrefix.Prefix.si_family) {
+				case AF_INET:
+					rdest.set(&(rtbl->Table[r].DestinationPrefix.Prefix.Ipv4.sin_addr.S_un.S_addr),4,rtbl->Table[r].DestinationPrefix.PrefixLength);
+					break;
+				case AF_INET6:
+					rdest.set(rtbl->Table[r].DestinationPrefix.Prefix.Ipv6.sin6_addr.u.Byte,16,rtbl->Table[r].DestinationPrefix.PrefixLength);
+					break;
+			}
+			if (rdest == destination) {
+				if (metric >= 0) {
+					_copyInetAddressToSockaddrInet(gateway,rtbl->Table[r].NextHop);
+					rtbl->Table[r].Metric = metric;
+					SetIpForwardEntry2(&(rtbl->Table[r]));
+					needCreate = false;
+				} else {
+					DeleteIpForwardEntry2(&(rtbl->Table[r]));
+					FreeMibTable(rtbl);
+					return RoutingTable::Entry();
+				}
+			}
+		}
+	}
+	FreeMibTable(rtbl);
+
+	if ((metric >= 0)&&(needCreate)) {
+		MIB_IPFORWARD_ROW2 nr;
+		InitializeIpForwardEntry(&nr);
+		nr.InterfaceLuid.Value = luid.Value;
+		_copyInetAddressToSockaddrInet(destination,nr.DestinationPrefix.Prefix);
+		nr.DestinationPrefix.PrefixLength = destination.netmaskBits();
+		_copyInetAddressToSockaddrInet(gateway,nr.NextHop);
+		nr.Metric = metric;
+		nr.Protocol = MIB_IPPROTO_NETMGMT;
+		DWORD result = CreateIpForwardEntry2(&nr);
+		if (result != NO_ERROR)
+			return RoutingTable::Entry();
+	}
+
+	std::vector<RoutingTable::Entry> rtab(get(true,true));
+	std::vector<RoutingTable::Entry>::iterator bestEntry(rtab.end());
+	for(std::vector<RoutingTable::Entry>::iterator e(rtab.begin());e!=rtab.end();++e) {
+		if ((e->destination == destination)&&(e->gateway.ipsEqual(gateway))) {
+			if ((device)&&(device[0])) {
+				if (!strcmp(device,e->device)) {
+					if (metric == e->metric)
+						bestEntry = e;
+				}
+			}
+			if (bestEntry == rtab.end())
+				bestEntry = e;
+		}
+	}
+	if (bestEntry != rtab.end())
+		return *bestEntry;
+	return RoutingTable::Entry();
+}
+
+#endif // __WINDOWS__
+
+// ---------------------------------------------------------------------------
+
+} // namespace ZeroTier
diff --git a/osdep/RoutingTable.hpp b/osdep/RoutingTable.hpp
new file mode 100644
index 000000000..6f4301363
--- /dev/null
+++ b/osdep/RoutingTable.hpp
@@ -0,0 +1,92 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_ROUTINGTABLE_HPP
+#define ZT_ROUTINGTABLE_HPP
+
+#include <vector>
+
+#include "../node/Constants.hpp"
+#include "../node/InetAddress.hpp"
+
+namespace ZeroTier {
+
+class RoutingTable
+{
+public:
+	struct Entry
+	{
+		/**
+		 * Destination IP and netmask bits (CIDR format)
+		 */
+		InetAddress destination;
+
+		/**
+		 * Gateway or null address if direct link-level route, netmask/port part of InetAddress not used
+		 */
+		InetAddress gateway;
+
+		/**
+		 * System device index or ID (not included in comparison operators, may not be set on all platforms)
+		 */
+		int deviceIndex;
+
+		/**
+		 * Metric or hop count -- higher = lower routing priority
+		 */
+		int metric;
+
+		/**
+		 * Interface scoped route? (always false if not meaningful on this OS)
+		 */
+		bool ifscope;
+
+		/**
+		 * System device name (may be empty if it doesn't exist or isn't important on this OS)
+		 */
+		char device[128];
+
+		/**
+		 * @return True if at least one required field is present (object is not null)
+		 */
+		inline operator bool() const { return ((destination)||(gateway)); }
+	};
+
+	/**
+	 * Get routing table
+	 *
+	 * @param includeLinkLocal Include link-local IPs?
+	 * @param includeLoopback Include loopback routes?
+	 */
+	static std::vector<RoutingTable::Entry> get(bool includeLinkLocal,bool includeLoopback);
+
+	/**
+	 * Add or replace a routing table entry
+	 *
+	 * @param destination Route destination
+	 * @param gateway Gateway or null if local
+	 * @param device Device name (if applicable)
+	 * @param metric Route metric (if applicable)
+	 * @param ifscope Interface bound route? If so, device must be set. (only applicable on some OSes)
+	 */
+	static RoutingTable::Entry set(const InetAddress &destination,const InetAddress &gateway,const char *device,int metric,bool ifscope);
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/osdep/Thread.hpp b/osdep/Thread.hpp
index abebd4374..7fb38d8b0 100644
--- a/osdep/Thread.hpp
+++ b/osdep/Thread.hpp
@@ -1,70 +1,76 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_THREAD_HPP
 #define ZT_THREAD_HPP
 
-#include "../node/Constants.hpp"
-
 #include <stdexcept>
 
+#include "../node/Constants.hpp"
+
 #ifdef __WINDOWS__
 
-#include "../node/Mutex.hpp"
-
+#include <WinSock2.h>
+#include <Windows.h>
 #include <string.h>
-#include <windows.h>
-#include <winsock2.h>
+#include "../node/Mutex.hpp"
 
 namespace ZeroTier {
 
-template <typename C> static DWORD WINAPI ___zt_threadMain(LPVOID lpParam)
+template<typename C>
+static DWORD WINAPI ___zt_threadMain(LPVOID lpParam)
 {
 	try {
-		((C*)lpParam)->threadMain();
-	}
-	catch (...) {
-	}
+		((C *)lpParam)->threadMain();
+	} catch ( ... ) {}
 	return 0;
 }
 
-class Thread {
-  public:
+class Thread
+{
+public:
 	Thread()
+		throw()
 	{
 		_th = NULL;
 		_tid = 0;
 	}
 
-	template <typename C> static inline Thread start(C* instance)
+	template<typename C>
+	static inline Thread start(C *instance)
+		throw(std::runtime_error)
 	{
 		Thread t;
-		t._th = CreateThread(NULL, 0, &___zt_threadMain<C>, (LPVOID)instance, 0, &t._tid);
+		t._th = CreateThread(NULL,0,&___zt_threadMain<C>,(LPVOID)instance,0,&t._tid);
 		if (t._th == NULL)
 			throw std::runtime_error("CreateThread() failed");
 		return t;
 	}
 
-	static inline void join(const Thread& t)
+	static inline void join(const Thread &t)
 	{
 		if (t._th != NULL) {
-			for (;;) {
+			for(;;) {
 				DWORD ec = STILL_ACTIVE;
-				GetExitCodeThread(t._th, &ec);
+				GetExitCodeThread(t._th,&ec);
 				if (ec == STILL_ACTIVE)
-					WaitForSingleObject(t._th, 1000);
-				else
-					break;
+					WaitForSingleObject(t._th,1000);
+				else break;
 			}
 		}
 	}
@@ -75,64 +81,65 @@ class Thread {
 	}
 
 	// Not available on *nix platforms
-	static inline void cancelIO(const Thread& t)
+	static inline void cancelIO(const Thread &t)
 	{
-#if ! defined(__MINGW32__) && ! defined(__MINGW64__)   // CancelSynchronousIo not available in MSYS2
 		if (t._th != NULL)
 			CancelSynchronousIo(t._th);
-#endif
 	}
 
-	inline operator bool() const
-	{
-		return (_th != NULL);
-	}
+	inline operator bool() const throw() { return (_th != NULL); }
 
-  private:
+private:
 	HANDLE _th;
 	DWORD _tid;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #else
 
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <pthread.h>
 #include <unistd.h>
 
 namespace ZeroTier {
 
-template <typename C> static void* ___zt_threadMain(void* instance)
+template<typename C>
+static void *___zt_threadMain(void *instance)
 {
 	try {
-		((C*)instance)->threadMain();
-	}
-	catch (...) {
-	}
-	return (void*)0;
+		((C *)instance)->threadMain();
+	} catch ( ... ) {}
+	return (void *)0;
 }
 
 /**
  * A thread identifier, and static methods to start and join threads
  */
-class Thread {
-  public:
+class Thread
+{
+public:
 	Thread()
+		throw()
 	{
-		memset(this, 0, sizeof(Thread));
+		memset(&_tid,0,sizeof(_tid));
+		_started = false;
 	}
 
-	Thread(const Thread& t)
+	Thread(const Thread &t)
+		throw()
 	{
-		memcpy(this, &t, sizeof(Thread));
+		memcpy(&_tid,&(t._tid),sizeof(_tid));
+		_started = t._started;
 	}
 
-	inline Thread& operator=(const Thread& t)
+	inline Thread &operator=(const Thread &t)
+		throw()
 	{
-		memcpy(this, &t, sizeof(Thread));
+		memcpy(&_tid,&(t._tid),sizeof(_tid));
+		_started = t._started;
 		return *this;
 	}
 
@@ -144,22 +151,14 @@ class Thread {
 	 * @throws std::runtime_error Unable to create thread
 	 * @tparam C Class containing threadMain()
 	 */
-	template <typename C> static inline Thread start(C* instance)
+	template<typename C>
+	static inline Thread start(C *instance)
+		throw(std::runtime_error)
 	{
 		Thread t;
-		pthread_attr_t tattr;
-		pthread_attr_init(&tattr);
-		// This corrects for systems with abnormally small defaults (musl) and also
-		// shrinks the stack on systems with large defaults to save a bit of memory.
-		pthread_attr_setstacksize(&tattr, ZT_THREAD_MIN_STACK_SIZE);
-		if (pthread_create(&t._tid, &tattr, &___zt_threadMain<C>, instance)) {
-			pthread_attr_destroy(&tattr);
+		t._started = true;
+		if (pthread_create(&t._tid,(const pthread_attr_t *)0,&___zt_threadMain<C>,instance))
 			throw std::runtime_error("pthread_create() failed, unable to create thread");
-		}
-		else {
-			t._started = true;
-			pthread_attr_destroy(&tattr);
-		}
 		return t;
 	}
 
@@ -168,10 +167,10 @@ class Thread {
 	 *
 	 * @param t Thread to join
 	 */
-	static inline void join(const Thread& t)
+	static inline void join(const Thread &t)
 	{
 		if (t._started)
-			pthread_join(t._tid, (void**)0);
+			pthread_join(t._tid,(void **)0);
 	}
 
 	/**
@@ -179,23 +178,17 @@ class Thread {
 	 *
 	 * @param ms Number of milliseconds to sleep
 	 */
-	static inline void sleep(unsigned long ms)
-	{
-		usleep(ms * 1000);
-	}
+	static inline void sleep(unsigned long ms) { usleep(ms * 1000); }
 
-	inline operator bool() const
-	{
-		return (_started);
-	}
+	inline operator bool() const throw() { return (_started); }
 
-  private:
+private:
 	pthread_t _tid;
 	volatile bool _started;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
-#endif	 // __WINDOWS__ / !__WINDOWS__
+#endif // __WINDOWS__ / !__WINDOWS__
 
 #endif
diff --git a/osdep/WinDNSHelper.cpp b/osdep/WinDNSHelper.cpp
deleted file mode 100644
index 88b39e56d..000000000
--- a/osdep/WinDNSHelper.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-#include "WinDNSHelper.hpp"
-
-#include <WbemIdl.h>
-#include <comdef.h>
-#include <sstream>
-#include <string>
-#include <strsafe.h>
-#include <vector>
-
-#define MAX_KEY_LENGTH 255
-#define MAX_VALUE_NAME 16383
-
-namespace ZeroTier {
-
-BOOL RegDelnodeRecurse(HKEY hKeyRoot, LPTSTR lpSubKey)
-{
-	LPTSTR lpEnd;
-	LONG lResult;
-	DWORD dwSize;
-	TCHAR szName[MAX_PATH];
-	HKEY hKey;
-	FILETIME ftWrite;
-
-	// First, see if we can delete the key without having
-	// to recurse.
-
-	lResult = RegDeleteKey(hKeyRoot, lpSubKey);
-
-	if (lResult == ERROR_SUCCESS)
-		return TRUE;
-
-	lResult = RegOpenKeyEx(hKeyRoot, lpSubKey, 0, KEY_READ, &hKey);
-
-	if (lResult != ERROR_SUCCESS) {
-		if (lResult == ERROR_FILE_NOT_FOUND) {
-			return TRUE;
-		}
-		else {
-			return FALSE;
-		}
-	}
-
-	// Check for an ending slash and add one if it is missing.
-
-	lpEnd = lpSubKey + lstrlen(lpSubKey);
-
-	if (*(lpEnd - 1) != TEXT('\\')) {
-		*lpEnd = TEXT('\\');
-		lpEnd++;
-		*lpEnd = TEXT('\0');
-	}
-
-	// Enumerate the keys
-
-	dwSize = MAX_PATH;
-	lResult = RegEnumKeyEx(hKey, 0, szName, &dwSize, NULL, NULL, NULL, &ftWrite);
-
-	if (lResult == ERROR_SUCCESS) {
-		do {
-			*lpEnd = TEXT('\0');
-			StringCchCat(lpSubKey, MAX_PATH * 2, szName);
-
-			if (! RegDelnodeRecurse(hKeyRoot, lpSubKey)) {
-				break;
-			}
-
-			dwSize = MAX_PATH;
-
-			lResult = RegEnumKeyEx(hKey, 0, szName, &dwSize, NULL, NULL, NULL, &ftWrite);
-
-		} while (lResult == ERROR_SUCCESS);
-	}
-
-	lpEnd--;
-	*lpEnd = TEXT('\0');
-
-	RegCloseKey(hKey);
-
-	// Try again to delete the key.
-
-	lResult = RegDeleteKey(hKeyRoot, lpSubKey);
-
-	if (lResult == ERROR_SUCCESS)
-		return TRUE;
-
-	return FALSE;
-}
-
-//*************************************************************
-//
-//  RegDelnode()
-//
-//  Purpose:    Deletes a registry key and all its subkeys / values.
-//
-//  Parameters: hKeyRoot    -   Root key
-//              lpSubKey    -   SubKey to delete
-//
-//  Return:     TRUE if successful.
-//              FALSE if an error occurs.
-//
-//*************************************************************
-
-BOOL RegDelnode(HKEY hKeyRoot, LPCTSTR lpSubKey)
-{
-	TCHAR szDelKey[MAX_PATH * 2];
-
-	StringCchCopy(szDelKey, MAX_PATH * 2, lpSubKey);
-	return RegDelnodeRecurse(hKeyRoot, szDelKey);
-}
-std::vector<std::string> getSubKeys(const char* key)
-{
-	std::vector<std::string> subkeys;
-	HKEY hKey;
-	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {
-		TCHAR achKey[MAX_KEY_LENGTH];		   // buffer for subkey name
-		DWORD cbName;						   // size of name string
-		TCHAR achClass[MAX_PATH] = TEXT("");   // buffer for class name
-		DWORD cchClassName = MAX_PATH;		   // size of class string
-		DWORD cSubKeys = 0;					   // number of subkeys
-		DWORD cbMaxSubKey;					   // longest subkey size
-		DWORD cchMaxClass;					   // longest class string
-		DWORD cValues;						   // number of values for key
-		DWORD cchMaxValue;					   // longest value name
-		DWORD cbMaxValueData;				   // longest value data
-		DWORD cbSecurityDescriptor;			   // size of security descriptor
-		FILETIME ftLastWriteTime;			   // last write time
-
-		DWORD i, retCode;
-
-		TCHAR achValue[MAX_VALUE_NAME];
-		DWORD cchValue = MAX_VALUE_NAME;
-
-		retCode = RegQueryInfoKey(
-			hKey,					 // key handle
-			achClass,				 // buffer for class name
-			&cchClassName,			 // size of class string
-			NULL,					 // reserved
-			&cSubKeys,				 // number of subkeys
-			&cbMaxSubKey,			 // longest subkey size
-			&cchMaxClass,			 // longest class string
-			&cValues,				 // number of values for this key
-			&cchMaxValue,			 // longest value name
-			&cbMaxValueData,		 // longest value data
-			&cbSecurityDescriptor,	 // security descriptor
-			&ftLastWriteTime);		 // last write time
-
-		for (i = 0; i < cSubKeys; ++i) {
-			cbName = MAX_KEY_LENGTH;
-			retCode = RegEnumKeyEx(hKey, i, achKey, &cbName, NULL, NULL, NULL, &ftLastWriteTime);
-			if (retCode == ERROR_SUCCESS) {
-				subkeys.push_back(achKey);
-			}
-		}
-	}
-	RegCloseKey(hKey);
-	return subkeys;
-}
-
-std::vector<std::string> getValueList(const char* key)
-{
-	std::vector<std::string> values;
-	HKEY hKey;
-	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {
-		TCHAR achKey[MAX_KEY_LENGTH];		   // buffer for subkey name
-		DWORD cbName;						   // size of name string
-		TCHAR achClass[MAX_PATH] = TEXT("");   // buffer for class name
-		DWORD cchClassName = MAX_PATH;		   // size of class string
-		DWORD cSubKeys = 0;					   // number of subkeys
-		DWORD cbMaxSubKey;					   // longest subkey size
-		DWORD cchMaxClass;					   // longest class string
-		DWORD cValues;						   // number of values for key
-		DWORD cchMaxValue;					   // longest value name
-		DWORD cbMaxValueData;				   // longest value data
-		DWORD cbSecurityDescriptor;			   // size of security descriptor
-		FILETIME ftLastWriteTime;			   // last write time
-
-		DWORD i, retCode;
-
-		TCHAR achValue[MAX_VALUE_NAME];
-		DWORD cchValue = MAX_VALUE_NAME;
-
-		retCode = RegQueryInfoKey(
-			hKey,					 // key handle
-			achClass,				 // buffer for class name
-			&cchClassName,			 // size of class string
-			NULL,					 // reserved
-			&cSubKeys,				 // number of subkeys
-			&cbMaxSubKey,			 // longest subkey size
-			&cchMaxClass,			 // longest class string
-			&cValues,				 // number of values for this key
-			&cchMaxValue,			 // longest value name
-			&cbMaxValueData,		 // longest value data
-			&cbSecurityDescriptor,	 // security descriptor
-			&ftLastWriteTime);		 // last write time
-
-		for (i = 0, retCode = ERROR_SUCCESS; i < cValues; ++i) {
-			cchValue = MAX_VALUE_NAME;
-			achValue[0] = '\0';
-			retCode = RegEnumValue(hKey, i, achValue, &cchValue, NULL, NULL, NULL, NULL);
-			if (retCode == ERROR_SUCCESS) {
-				values.push_back(achValue);
-			}
-		}
-	}
-	RegCloseKey(hKey);
-	return values;
-}
-
-std::pair<bool, std::string> WinDNSHelper::hasDNSConfig(uint64_t nwid)
-{
-	char networkStr[20] = { 0 };
-	sprintf(networkStr, "%.16llx", nwid);
-
-	const char* baseKey = "SYSTEM\\CurrentControlSet\\Services\\Dnscache\\Parameters\\DnsPolicyConfig";
-	auto subkeys = getSubKeys(baseKey);
-	for (auto it = subkeys.begin(); it != subkeys.end(); ++it) {
-		char sub[MAX_KEY_LENGTH] = { 0 };
-		sprintf(sub, "%s\\%s", baseKey, it->c_str());
-		auto dnsRecords = getValueList(sub);
-		for (auto it2 = dnsRecords.begin(); it2 != dnsRecords.end(); ++it2) {
-			if ((*it2) == "Comment") {
-				HKEY hKey;
-				if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, sub, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {
-					char buf[16384] = { 0 };
-					DWORD size = sizeof(buf);
-					DWORD retCode = RegGetValueA(HKEY_LOCAL_MACHINE, sub, it2->c_str(), RRF_RT_REG_SZ, NULL, &buf, &size);
-					if (retCode == ERROR_SUCCESS) {
-						if (std::string(networkStr) == std::string(buf)) {
-							RegCloseKey(hKey);
-							return std::make_pair(true, std::string(sub));
-						}
-					}
-					else {
-					}
-				}
-				RegCloseKey(hKey);
-			}
-		}
-	}
-
-	return std::make_pair(false, std::string());
-}
-
-void WinDNSHelper::setDNS(uint64_t nwid, const char* domain, const std::vector<InetAddress>& servers)
-{
-	auto hasConfig = hasDNSConfig(nwid);
-
-	std::stringstream ss;
-	for (auto it = servers.begin(); it != servers.end(); ++it) {
-		char ipaddr[256] = { 0 };
-		ss << it->toIpString(ipaddr);
-		if ((it + 1) != servers.end()) {
-			ss << ";";
-		}
-	}
-	std::string serverValue = ss.str();
-
-	if (hasConfig.first) {
-		// update existing config
-		HKEY dnsKey;
-		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, hasConfig.second.c_str(), 0, KEY_READ | KEY_WRITE, &dnsKey) == ERROR_SUCCESS) {
-			auto retCode = RegSetKeyValueA(dnsKey, NULL, "GenericDNSServers", REG_SZ, serverValue.data(), (DWORD)serverValue.length());
-			if (retCode != ERROR_SUCCESS) {
-				fprintf(stderr, "Error writing dns servers: %d\n", retCode);
-			}
-		}
-	}
-	else {
-		// add new config
-		const char* baseKey = "SYSTEM\\CurrentControlSet\\Services\\Dnscache\\Parameters\\DnsPolicyConfig";
-		GUID guid;
-		CoCreateGuid(&guid);
-		wchar_t guidTmp[128] = { 0 };
-		char guidStr[128] = { 0 };
-		StringFromGUID2(guid, guidTmp, 128);
-		wcstombs(guidStr, guidTmp, 128);
-		char fullKey[MAX_KEY_LENGTH] = { 0 };
-		sprintf(fullKey, "%s\\%s", baseKey, guidStr);
-		HKEY dnsKey;
-		RegCreateKeyA(HKEY_LOCAL_MACHINE, fullKey, &dnsKey);
-		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, fullKey, 0, KEY_READ | KEY_WRITE, &dnsKey) == ERROR_SUCCESS) {
-			char nwString[32] = { 0 };
-			sprintf(nwString, "%.16llx", nwid);
-			RegSetKeyValueA(dnsKey, NULL, "Comment", REG_SZ, nwString, strlen(nwString));
-
-			DWORD configOpts = 8;
-			RegSetKeyValueA(dnsKey, NULL, "ConfigOptions", REG_DWORD, &configOpts, sizeof(DWORD));
-			RegSetKeyValueA(dnsKey, NULL, "DisplayName", REG_SZ, "", 0);
-			RegSetKeyValueA(dnsKey, NULL, "GenericDNSServers", REG_SZ, serverValue.data(), serverValue.length());
-			RegSetKeyValueA(dnsKey, NULL, "IPSECCARestriction", REG_SZ, "", 0);
-			std::string d = "." + std::string(domain);
-			RegSetKeyValueA(dnsKey, NULL, "Name", REG_MULTI_SZ, d.data(), d.length());
-			DWORD version = 2;
-			RegSetKeyValueA(dnsKey, NULL, "Version", REG_DWORD, &version, sizeof(DWORD));
-		}
-	}
-}
-
-void WinDNSHelper::removeDNS(uint64_t nwid)
-{
-	auto hasConfig = hasDNSConfig(nwid);
-	if (hasConfig.first) {
-		RegDelnode(HKEY_LOCAL_MACHINE, hasConfig.second.c_str());
-	}
-}
-
-}	// namespace ZeroTier
\ No newline at end of file
diff --git a/osdep/WinDNSHelper.hpp b/osdep/WinDNSHelper.hpp
deleted file mode 100644
index 8a9916da1..000000000
--- a/osdep/WinDNSHelper.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef WIN_DNS_HELPER_H_
-#define WIN_DNS_HELPER_H_
-
-#include "../node/InetAddress.hpp"
-
-#include <cstdint>
-#include <vector>
-
-namespace ZeroTier {
-
-class WinDNSHelper {
-  public:
-	static void setDNS(uint64_t nwid, const char* domain, const std::vector<InetAddress>& servers);
-	static void removeDNS(uint64_t nwid);
-
-  private:
-	static std::pair<bool, std::string> hasDNSConfig(uint64_t nwid);
-};
-
-}	// namespace ZeroTier
-
-#endif
\ No newline at end of file
diff --git a/osdep/WinFWHelper.cpp b/osdep/WinFWHelper.cpp
deleted file mode 100644
index 5f657d60b..000000000
--- a/osdep/WinFWHelper.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-#include "WinFWHelper.hpp"
-
-namespace ZeroTier {
-
-void ZeroTier::WinFWHelper::newICMPRule(const InetAddress& ip, uint64_t nwid)
-{
-	char nwString[32] = { 0 };
-	char ipbuf[64];
-
-	sprintf(nwString, "%.16llx", nwid);
-	std::string nwString2 = { nwString };
-
-	ip.toString(ipbuf);
-
-	if (ip.isV4()) {
-		WinFWHelper::newICMPv4Rule(ipbuf, nwid);
-	}
-	else {
-		WinFWHelper::newICMPv6Rule(ipbuf, nwid);
-	}
-}
-
-void ZeroTier::WinFWHelper::removeICMPRule(const InetAddress& ip, uint64_t nwid)
-{
-	char nwString[32] = { 0 };
-	char ipbuf[64];
-
-	sprintf(nwString, "%.16llx", nwid);
-	std::string nwString2 = { nwString };
-
-	ip.toString(ipbuf);
-
-	if (ip.isV4()) {
-		WinFWHelper::removeICMPv4Rule(ipbuf, nwid);
-	}
-	else {
-		WinFWHelper::removeICMPv6Rule(ipbuf, nwid);
-	}
-}
-
-void WinFWHelper::newICMPv4Rule(std::string address, uint64_t nwid)
-{
-	// allows icmp, scoped to a specific ip address and interface name
-
-	char nwString[32] = { 0 };
-	sprintf(nwString, "%.16llx", nwid);
-	std::string nwString2 = { nwString };
-
-	std::string cmd = R"(C:\Windows\System32\WindowsPowershell\v1.0\powershell.exe "New-NetFirewallRule -DisplayName zerotier-icmpv4-)" + nwString2 + address + R"( -InterfaceAlias 'ZeroTier One `[)" + nwString2 + R"(`]')"
-					  + " -Protocol ICMPv4 -Action Allow" + " -LocalAddress " + address + "\"\r\n";
-
-	_run(cmd);
-}
-
-void WinFWHelper::newICMPv6Rule(std::string address, uint64_t nwid)
-{
-	// allows icmp, scoped to a specific ip address and interface name
-
-	char nwString[32] = { 0 };
-	sprintf(nwString, "%.16llx", nwid);
-	std::string nwString2 = { nwString };
-
-	std::string cmd = R"(C:\Windows\System32\WindowsPowershell\v1.0\powershell.exe "New-NetFirewallRule -DisplayName zerotier-icmpv6-)" + nwString2 + address + R"( -InterfaceAlias 'ZeroTier One `[)" + nwString2 + R"(`]')"
-					  + " -Protocol ICMPv6 -Action Allow" + " -LocalAddress " + address + "\"\r\n";
-
-	_run(cmd);
-}
-
-void WinFWHelper::removeICMPv4Rule(std::string addr, uint64_t nwid)
-{
-	// removes 1 icmp firewall rule
-
-	char nwString[32] = { 0 };
-	sprintf(nwString, "%.16llx", nwid);
-	std::string nwString2 = { nwString };
-
-	std::string cmd = R"(C:\Windows\System32\WindowsPowershell\v1.0\powershell.exe "Remove-NetFirewallRule -DisplayName zerotier-icmpv4-)" + nwString2 + addr + "\"\r\n";
-
-	_run(cmd);
-}
-
-void WinFWHelper::removeICMPv6Rule(std::string addr, uint64_t nwid)
-{
-	// removes 1 icmp firewall rule
-
-	char nwString[32] = { 0 };
-	sprintf(nwString, "%.16llx", nwid);
-	std::string nwString2 = { nwString };
-
-	std::string cmd = R"(C:\Windows\System32\WindowsPowershell\v1.0\powershell.exe "Remove-NetFirewallRule -DisplayName zerotier-icmpv6-)" + nwString2 + addr + "\"\r\n";
-
-	_run(cmd);
-}
-
-void WinFWHelper::removeICMPv4Rules(uint64_t nwid)
-{
-	// removes all icmp firewall rules for this network id
-
-	char nwString[32] = { 0 };
-	sprintf(nwString, "%.16llx", nwid);
-	std::string nwString2 = { nwString };
-
-	std::string cmd = R"(C:\Windows\System32\WindowsPowershell\v1.0\powershell.exe "Remove-NetFirewallRule -DisplayName zerotier-icmpv4-)" + nwString2 + "*\" \r\n";
-
-	_run(cmd);
-}
-
-void WinFWHelper::removeICMPv6Rules(uint64_t nwid)
-{
-	// removes all icmp firewall rules for this network id
-
-	char nwString[32] = { 0 };
-	sprintf(nwString, "%.16llx", nwid);
-	std::string nwString2 = { nwString };
-
-	std::string cmd = R"(C:\Windows\System32\WindowsPowershell\v1.0\powershell.exe "Remove-NetFirewallRule -DisplayName zerotier-icmpv6-)" + nwString2 + "*\" \r\n";
-
-	_run(cmd);
-}
-
-void WinFWHelper::removeICMPRules()
-{
-	// removes all icmp firewall rules for all networks
-
-	std::string cmd = R"(C:\Windows\System32\WindowsPowershell\v1.0\powershell.exe "Remove-NetFirewallRule -DisplayName zerotier-icmp*)" + std::string("\r\n");
-
-	_run(cmd);
-}
-
-void WinFWHelper::removeICMPRules(uint64_t nwid)
-{
-	// removes all icmp firewall rules for this network
-	WinFWHelper::removeICMPv4Rules(nwid);
-	WinFWHelper::removeICMPv6Rules(nwid);
-}
-
-void WinFWHelper::_run(std::string cmd)
-{
-#ifdef ZT_DEBUG
-	fprintf(stderr, cmd.c_str());
-#endif
-
-	STARTUPINFOA startupInfo;
-	PROCESS_INFORMATION processInfo;
-	startupInfo.cb = sizeof(startupInfo);
-	memset(&startupInfo, 0, sizeof(STARTUPINFOA));
-	memset(&processInfo, 0, sizeof(PROCESS_INFORMATION));
-
-	if (CreateProcessA(NULL, (LPSTR)cmd.c_str(), NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startupInfo, &processInfo)) {
-		WaitForSingleObject(processInfo.hProcess, INFINITE);
-
-		CloseHandle(processInfo.hProcess);
-		CloseHandle(processInfo.hThread);
-	}
-}
-
-}	// namespace ZeroTier
\ No newline at end of file
diff --git a/osdep/WinFWHelper.hpp b/osdep/WinFWHelper.hpp
deleted file mode 100644
index 43c41e47e..000000000
--- a/osdep/WinFWHelper.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef WIN_FW_HELPER_H_
-#define WIN_FW_HELPER_H_
-
-#include "../node/InetAddress.hpp"
-
-#include <cstdint>
-#include <vector>
-
-namespace ZeroTier {
-
-class WinFWHelper {
-  public:
-	static void newICMPRule(const InetAddress& ip, uint64_t nwid);
-	static void removeICMPRule(const InetAddress& ip, uint64_t nwid);
-	static void removeICMPRules(uint64_t nwid);
-	static void removeICMPRules();
-
-  private:
-	static void _run(std::string cmd);
-	static void newICMPv4Rule(std::string address, uint64_t nwid);
-	static void newICMPv6Rule(std::string address, uint64_t nwid);
-	static void removeICMPv4Rule(std::string address, uint64_t nwid);
-	static void removeICMPv6Rule(std::string address, uint64_t nwid);
-	static void removeICMPv4Rules(uint64_t nwid);
-	static void removeICMPv6Rules(uint64_t nwid);
-};
-
-}	// namespace ZeroTier
-
-#endif
\ No newline at end of file
diff --git a/osdep/WindowsEthernetTap.cpp b/osdep/WindowsEthernetTap.cpp
index 3043868ae..d60c0d548 100644
--- a/osdep/WindowsEthernetTap.cpp
+++ b/osdep/WindowsEthernetTap.cpp
@@ -1,174 +1,169 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "WindowsEthernetTap.hpp"
-
-#include "../node/Constants.hpp"
-#include "../node/Mutex.hpp"
-#include "../node/Utils.hpp"
-#include "..\windows\TapDriver6\tap-windows.h"
-#include "OSUtils.hpp"
-#include "WinDNSHelper.hpp"
-
-#include <IPHlpApi.h>
-#include <SetupAPI.h>
-#include <atlbase.h>
-#include <cfgmgr32.h>
-#include <iostream>
-#include <malloc.h>
-#include <netcon.h>
-#include <netioapi.h>
-#include <netlistmgr.h>
-#include <newdev.h>
-#include <nldef.h>
-#include <set>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
+#include <WinSock2.h>
+#include <Windows.h>
 #include <tchar.h>
-#include <wchar.h>
-#include <windows.h>
+#include <malloc.h>
 #include <winreg.h>
-#include <winsock2.h>
+#include <wchar.h>
 #include <ws2ipdef.h>
-#include <ws2tcpip.h>
+#include <WS2tcpip.h>
+#include <IPHlpApi.h>
+#include <nldef.h>
+#include <netioapi.h>
+#include <atlbase.h>
+#include <netlistmgr.h>
+#include <nldef.h>
+#include <SetupAPI.h>
+#include <newdev.h>
+#include <cfgmgr32.h>
+
+#include <iostream>
+#include <set>
+
+#include "../node/Constants.hpp"
+#include "../node/Utils.hpp"
+#include "../node/Mutex.hpp"
+
+#include "WindowsEthernetTap.hpp"
+#include "OSUtils.hpp"
+
+#include "..\windows\TapDriver6\tap-windows.h"
 
 // Create a fake unused default route to force detection of network type on networks without gateways
 #define ZT_WINDOWS_CREATE_FAKE_DEFAULT_ROUTE
 
 // Function signatures of dynamically loaded functions, from newdev.h, setupapi.h, and cfgmgr32.h
-typedef BOOL(WINAPI* UpdateDriverForPlugAndPlayDevicesA_t)(_In_opt_ HWND hwndParent, _In_ LPCSTR HardwareId, _In_ LPCSTR FullInfPath, _In_ DWORD InstallFlags, _Out_opt_ PBOOL bRebootRequired);
-typedef BOOL(WINAPI* SetupDiGetINFClassA_t)(_In_ PCSTR InfName, _Out_ LPGUID ClassGuid, _Out_writes_(ClassNameSize) PSTR ClassName, _In_ DWORD ClassNameSize, _Out_opt_ PDWORD RequiredSize);
-typedef HDEVINFO(WINAPI* SetupDiCreateDeviceInfoList_t)(_In_opt_ CONST GUID* ClassGuid, _In_opt_ HWND hwndParent);
-typedef BOOL(WINAPI* SetupDiCreateDeviceInfoA_t)(
-	_In_ HDEVINFO DeviceInfoSet,
-	_In_ PCSTR DeviceName,
-	_In_ CONST GUID* ClassGuid,
-	_In_opt_ PCSTR DeviceDescription,
-	_In_opt_ HWND hwndParent,
-	_In_ DWORD CreationFlags,
-	_Out_opt_ PSP_DEVINFO_DATA DeviceInfoData);
-typedef BOOL(
-	WINAPI* SetupDiSetDeviceRegistryPropertyA_t)(_In_ HDEVINFO DeviceInfoSet, _Inout_ PSP_DEVINFO_DATA DeviceInfoData, _In_ DWORD Property, _In_reads_bytes_opt_(PropertyBufferSize) CONST BYTE* PropertyBuffer, _In_ DWORD PropertyBufferSize);
-typedef BOOL(WINAPI* SetupDiCallClassInstaller_t)(_In_ DI_FUNCTION InstallFunction, _In_ HDEVINFO DeviceInfoSet, _In_opt_ PSP_DEVINFO_DATA DeviceInfoData);
-typedef BOOL(WINAPI* SetupDiDestroyDeviceInfoList_t)(_In_ HDEVINFO DeviceInfoSet);
-typedef HDEVINFO(
-	WINAPI* SetupDiGetClassDevsExA_t)(_In_opt_ CONST GUID* ClassGuid, _In_opt_ PCSTR Enumerator, _In_opt_ HWND hwndParent, _In_ DWORD Flags, _In_opt_ HDEVINFO DeviceInfoSet, _In_opt_ PCSTR MachineName, _Reserved_ PVOID Reserved);
-typedef BOOL(WINAPI* SetupDiOpenDeviceInfoA_t)(_In_ HDEVINFO DeviceInfoSet, _In_ PCSTR DeviceInstanceId, _In_opt_ HWND hwndParent, _In_ DWORD OpenFlags, _Out_opt_ PSP_DEVINFO_DATA DeviceInfoData);
-typedef BOOL(WINAPI* SetupDiEnumDeviceInfo_t)(_In_ HDEVINFO DeviceInfoSet, _In_ DWORD MemberIndex, _Out_ PSP_DEVINFO_DATA DeviceInfoData);
-typedef BOOL(
-	WINAPI* SetupDiSetClassInstallParamsA_t)(_In_ HDEVINFO DeviceInfoSet, _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, _In_reads_bytes_opt_(ClassInstallParamsSize) PSP_CLASSINSTALL_HEADER ClassInstallParams, _In_ DWORD ClassInstallParamsSize);
-typedef CONFIGRET(WINAPI* CM_Get_Device_ID_ExA_t)(_In_ DEVINST dnDevInst, _Out_writes_(BufferLen) PSTR Buffer, _In_ ULONG BufferLen, _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine);
-typedef BOOL(
-	WINAPI* SetupDiGetDeviceInstanceIdA_t)(_In_ HDEVINFO DeviceInfoSet, _In_ PSP_DEVINFO_DATA DeviceInfoData, _Out_writes_opt_(DeviceInstanceIdSize) PSTR DeviceInstanceId, _In_ DWORD DeviceInstanceIdSize, _Out_opt_ PDWORD RequiredSize);
+typedef BOOL (WINAPI *UpdateDriverForPlugAndPlayDevicesA_t)(_In_opt_ HWND hwndParent,_In_ LPCSTR HardwareId,_In_ LPCSTR FullInfPath,_In_ DWORD InstallFlags,_Out_opt_ PBOOL bRebootRequired);
+typedef BOOL (WINAPI *SetupDiGetINFClassA_t)(_In_ PCSTR InfName,_Out_ LPGUID ClassGuid,_Out_writes_(ClassNameSize) PSTR ClassName,_In_ DWORD ClassNameSize,_Out_opt_ PDWORD RequiredSize);
+typedef HDEVINFO (WINAPI *SetupDiCreateDeviceInfoList_t)(_In_opt_ CONST GUID *ClassGuid,_In_opt_ HWND hwndParent);
+typedef BOOL (WINAPI *SetupDiCreateDeviceInfoA_t)(_In_ HDEVINFO DeviceInfoSet,_In_ PCSTR DeviceName,_In_ CONST GUID *ClassGuid,_In_opt_ PCSTR DeviceDescription,_In_opt_ HWND hwndParent,_In_ DWORD CreationFlags,_Out_opt_ PSP_DEVINFO_DATA DeviceInfoData);
+typedef BOOL (WINAPI *SetupDiSetDeviceRegistryPropertyA_t)(_In_ HDEVINFO DeviceInfoSet,_Inout_ PSP_DEVINFO_DATA DeviceInfoData,_In_ DWORD Property,_In_reads_bytes_opt_(PropertyBufferSize) CONST BYTE *PropertyBuffer,_In_ DWORD PropertyBufferSize);
+typedef BOOL (WINAPI *SetupDiCallClassInstaller_t)(_In_ DI_FUNCTION InstallFunction,_In_ HDEVINFO DeviceInfoSet,_In_opt_ PSP_DEVINFO_DATA DeviceInfoData);
+typedef BOOL (WINAPI *SetupDiDestroyDeviceInfoList_t)(_In_ HDEVINFO DeviceInfoSet);
+typedef HDEVINFO (WINAPI *SetupDiGetClassDevsExA_t)(_In_opt_ CONST GUID *ClassGuid,_In_opt_ PCSTR Enumerator,_In_opt_ HWND hwndParent,_In_ DWORD Flags,_In_opt_ HDEVINFO DeviceInfoSet,_In_opt_ PCSTR MachineName,_Reserved_ PVOID Reserved);
+typedef BOOL (WINAPI *SetupDiOpenDeviceInfoA_t)(_In_ HDEVINFO DeviceInfoSet,_In_ PCSTR DeviceInstanceId,_In_opt_ HWND hwndParent,_In_ DWORD OpenFlags,_Out_opt_ PSP_DEVINFO_DATA DeviceInfoData);
+typedef BOOL (WINAPI *SetupDiEnumDeviceInfo_t)(_In_ HDEVINFO DeviceInfoSet,_In_ DWORD MemberIndex,_Out_ PSP_DEVINFO_DATA DeviceInfoData);
+typedef BOOL (WINAPI *SetupDiSetClassInstallParamsA_t)(_In_ HDEVINFO DeviceInfoSet,_In_opt_ PSP_DEVINFO_DATA DeviceInfoData,_In_reads_bytes_opt_(ClassInstallParamsSize) PSP_CLASSINSTALL_HEADER ClassInstallParams,_In_ DWORD ClassInstallParamsSize);
+typedef CONFIGRET (WINAPI *CM_Get_Device_ID_ExA_t)(_In_ DEVINST dnDevInst,_Out_writes_(BufferLen) PSTR Buffer,_In_ ULONG BufferLen,_In_ ULONG ulFlags,_In_opt_ HMACHINE hMachine);
+typedef BOOL (WINAPI *SetupDiGetDeviceInstanceIdA_t)(_In_ HDEVINFO DeviceInfoSet,_In_ PSP_DEVINFO_DATA DeviceInfoData,_Out_writes_opt_(DeviceInstanceIdSize) PSTR DeviceInstanceId,_In_ DWORD DeviceInstanceIdSize,_Out_opt_ PDWORD RequiredSize);
 
 namespace ZeroTier {
 
 namespace {
 
 // Static/singleton class that when initialized loads a bunch of environment information and a few dynamically loaded DLLs
-class WindowsEthernetTapEnv {
-  public:
+class WindowsEthernetTapEnv
+{
+public:
 	WindowsEthernetTapEnv()
 	{
 #ifdef _WIN64
 		is64Bit = TRUE;
-		// tapDriverPath = "\\tap-windows\\x64\\zttap300.inf";
+		tapDriverPath = "\\tap-windows\\x64\\zttap300.inf";
 #else
 		is64Bit = FALSE;
-		IsWow64Process(GetCurrentProcess(), &is64Bit);
+		IsWow64Process(GetCurrentProcess(),&is64Bit);
 		if (is64Bit) {
-			fprintf(stderr, "FATAL: you must use the 64-bit ZeroTier One service on 64-bit Windows systems\r\n");
+			fprintf(stderr,"FATAL: you must use the 64-bit ZeroTier One service on 64-bit Windows systems\r\n");
 			_exit(1);
 		}
-		// tapDriverPath = "\\tap-windows\\x86\\zttap300.inf";
+		tapDriverPath = "\\tap-windows\\x86\\zttap300.inf";
 #endif
 		tapDriverName = "zttap300";
-		tapDriverPath = "\\zttap300.inf";
 
 		setupApiMod = LoadLibraryA("setupapi.dll");
-		if (! setupApiMod) {
-			fprintf(stderr, "FATAL: unable to dynamically load setupapi.dll\r\n");
+		if (!setupApiMod) {
+			fprintf(stderr,"FATAL: unable to dynamically load setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiGetINFClassA = (SetupDiGetINFClassA_t)GetProcAddress(setupApiMod, "SetupDiGetINFClassA"))) {
-			fprintf(stderr, "FATAL: SetupDiGetINFClassA not found in setupapi.dll\r\n");
+		if (!(this->SetupDiGetINFClassA = (SetupDiGetINFClassA_t)GetProcAddress(setupApiMod,"SetupDiGetINFClassA"))) {
+			fprintf(stderr,"FATAL: SetupDiGetINFClassA not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiCreateDeviceInfoList = (SetupDiCreateDeviceInfoList_t)GetProcAddress(setupApiMod, "SetupDiCreateDeviceInfoList"))) {
-			fprintf(stderr, "FATAL: SetupDiCreateDeviceInfoList not found in setupapi.dll\r\n");
+		if (!(this->SetupDiCreateDeviceInfoList = (SetupDiCreateDeviceInfoList_t)GetProcAddress(setupApiMod,"SetupDiCreateDeviceInfoList"))) {
+			fprintf(stderr,"FATAL: SetupDiCreateDeviceInfoList not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiCreateDeviceInfoA = (SetupDiCreateDeviceInfoA_t)GetProcAddress(setupApiMod, "SetupDiCreateDeviceInfoA"))) {
-			fprintf(stderr, "FATAL: SetupDiCreateDeviceInfoA not found in setupapi.dll\r\n");
+		if (!(this->SetupDiCreateDeviceInfoA = (SetupDiCreateDeviceInfoA_t)GetProcAddress(setupApiMod,"SetupDiCreateDeviceInfoA"))) {
+			fprintf(stderr,"FATAL: SetupDiCreateDeviceInfoA not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiSetDeviceRegistryPropertyA = (SetupDiSetDeviceRegistryPropertyA_t)GetProcAddress(setupApiMod, "SetupDiSetDeviceRegistryPropertyA"))) {
-			fprintf(stderr, "FATAL: SetupDiSetDeviceRegistryPropertyA not found in setupapi.dll\r\n");
+		if (!(this->SetupDiSetDeviceRegistryPropertyA = (SetupDiSetDeviceRegistryPropertyA_t)GetProcAddress(setupApiMod,"SetupDiSetDeviceRegistryPropertyA"))) {
+			fprintf(stderr,"FATAL: SetupDiSetDeviceRegistryPropertyA not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiCallClassInstaller = (SetupDiCallClassInstaller_t)GetProcAddress(setupApiMod, "SetupDiCallClassInstaller"))) {
-			fprintf(stderr, "FATAL: SetupDiCallClassInstaller not found in setupapi.dll\r\n");
+		if (!(this->SetupDiCallClassInstaller = (SetupDiCallClassInstaller_t)GetProcAddress(setupApiMod,"SetupDiCallClassInstaller"))) {
+			fprintf(stderr,"FATAL: SetupDiCallClassInstaller not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiDestroyDeviceInfoList = (SetupDiDestroyDeviceInfoList_t)GetProcAddress(setupApiMod, "SetupDiDestroyDeviceInfoList"))) {
-			fprintf(stderr, "FATAL: SetupDiDestroyDeviceInfoList not found in setupapi.dll\r\n");
+		if (!(this->SetupDiDestroyDeviceInfoList = (SetupDiDestroyDeviceInfoList_t)GetProcAddress(setupApiMod,"SetupDiDestroyDeviceInfoList"))) {
+			fprintf(stderr,"FATAL: SetupDiDestroyDeviceInfoList not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiGetClassDevsExA = (SetupDiGetClassDevsExA_t)GetProcAddress(setupApiMod, "SetupDiGetClassDevsExA"))) {
-			fprintf(stderr, "FATAL: SetupDiGetClassDevsExA not found in setupapi.dll\r\n");
+		if (!(this->SetupDiGetClassDevsExA = (SetupDiGetClassDevsExA_t)GetProcAddress(setupApiMod,"SetupDiGetClassDevsExA"))) {
+			fprintf(stderr,"FATAL: SetupDiGetClassDevsExA not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiOpenDeviceInfoA = (SetupDiOpenDeviceInfoA_t)GetProcAddress(setupApiMod, "SetupDiOpenDeviceInfoA"))) {
-			fprintf(stderr, "FATAL: SetupDiOpenDeviceInfoA not found in setupapi.dll\r\n");
+		if (!(this->SetupDiOpenDeviceInfoA = (SetupDiOpenDeviceInfoA_t)GetProcAddress(setupApiMod,"SetupDiOpenDeviceInfoA"))) {
+			fprintf(stderr,"FATAL: SetupDiOpenDeviceInfoA not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiEnumDeviceInfo = (SetupDiEnumDeviceInfo_t)GetProcAddress(setupApiMod, "SetupDiEnumDeviceInfo"))) {
-			fprintf(stderr, "FATAL: SetupDiEnumDeviceInfo not found in setupapi.dll\r\n");
+		if (!(this->SetupDiEnumDeviceInfo = (SetupDiEnumDeviceInfo_t)GetProcAddress(setupApiMod,"SetupDiEnumDeviceInfo"))) {
+			fprintf(stderr,"FATAL: SetupDiEnumDeviceInfo not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiSetClassInstallParamsA = (SetupDiSetClassInstallParamsA_t)GetProcAddress(setupApiMod, "SetupDiSetClassInstallParamsA"))) {
-			fprintf(stderr, "FATAL: SetupDiSetClassInstallParamsA not found in setupapi.dll\r\n");
+		if (!(this->SetupDiSetClassInstallParamsA = (SetupDiSetClassInstallParamsA_t)GetProcAddress(setupApiMod,"SetupDiSetClassInstallParamsA"))) {
+			fprintf(stderr,"FATAL: SetupDiSetClassInstallParamsA not found in setupapi.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->SetupDiGetDeviceInstanceIdA = (SetupDiGetDeviceInstanceIdA_t)GetProcAddress(setupApiMod, "SetupDiGetDeviceInstanceIdA"))) {
-			fprintf(stderr, "FATAL: SetupDiGetDeviceInstanceIdA not found in setupapi.dll\r\n");
+		if (!(this->SetupDiGetDeviceInstanceIdA = (SetupDiGetDeviceInstanceIdA_t)GetProcAddress(setupApiMod,"SetupDiGetDeviceInstanceIdA"))) {
+			fprintf(stderr,"FATAL: SetupDiGetDeviceInstanceIdA not found in setupapi.dll\r\n");
 			_exit(1);
 		}
 
 		newDevMod = LoadLibraryA("newdev.dll");
-		if (! newDevMod) {
-			fprintf(stderr, "FATAL: unable to dynamically load newdev.dll\r\n");
+		if (!newDevMod) {
+			fprintf(stderr,"FATAL: unable to dynamically load newdev.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->UpdateDriverForPlugAndPlayDevicesA = (UpdateDriverForPlugAndPlayDevicesA_t)GetProcAddress(newDevMod, "UpdateDriverForPlugAndPlayDevicesA"))) {
-			fprintf(stderr, "FATAL: UpdateDriverForPlugAndPlayDevicesA not found in newdev.dll\r\n");
+		if (!(this->UpdateDriverForPlugAndPlayDevicesA = (UpdateDriverForPlugAndPlayDevicesA_t)GetProcAddress(newDevMod,"UpdateDriverForPlugAndPlayDevicesA"))) {
+			fprintf(stderr,"FATAL: UpdateDriverForPlugAndPlayDevicesA not found in newdev.dll\r\n");
 			_exit(1);
 		}
 
 		cfgMgrMod = LoadLibraryA("cfgmgr32.dll");
-		if (! cfgMgrMod) {
-			fprintf(stderr, "FATAL: unable to dynamically load cfgmgr32.dll\r\n");
+		if (!cfgMgrMod) {
+			fprintf(stderr,"FATAL: unable to dynamically load cfgmgr32.dll\r\n");
 			_exit(1);
 		}
-		if (! (this->CM_Get_Device_ID_ExA = (CM_Get_Device_ID_ExA_t)GetProcAddress(cfgMgrMod, "CM_Get_Device_ID_ExA"))) {
-			fprintf(stderr, "FATAL: CM_Get_Device_ID_ExA not found in cfgmgr32.dll\r\n");
+		if (!(this->CM_Get_Device_ID_ExA = (CM_Get_Device_ID_ExA_t)GetProcAddress(cfgMgrMod,"CM_Get_Device_ID_ExA"))) {
+			fprintf(stderr,"FATAL: CM_Get_Device_ID_ExA not found in cfgmgr32.dll\r\n");
 			_exit(1);
 		}
 	}
 
-	BOOL is64Bit;	// is the system 64-bit, regardless of whether this binary is or not
+	BOOL is64Bit; // is the system 64-bit, regardless of whether this binary is or not
 	std::string tapDriverPath;
 	std::string tapDriverName;
 
@@ -188,7 +183,7 @@ class WindowsEthernetTapEnv {
 
 	CM_Get_Device_ID_ExA_t CM_Get_Device_ID_ExA;
 
-  private:
+private:
 	HMODULE setupApiMod;
 	HMODULE newDevMod;
 	HMODULE cfgMgrMod;
@@ -201,37 +196,37 @@ static Mutex _systemTapInitLock;
 // Only perform installation or uninstallation options one at a time
 static Mutex _systemDeviceManagementLock;
 
-}	// anonymous namespace
+} // anonymous namespace
 
-std::string WindowsEthernetTap::addNewPersistentTapDevice(const char* pathToInf, std::string& deviceInstanceId)
+std::string WindowsEthernetTap::addNewPersistentTapDevice(const char *pathToInf,std::string &deviceInstanceId)
 {
 	Mutex::Lock _l(_systemDeviceManagementLock);
 
 	GUID classGuid;
 	char className[1024];
-	if (! WINENV.SetupDiGetINFClassA(pathToInf, &classGuid, className, sizeof(className), (PDWORD)0)) {
+	if (!WINENV.SetupDiGetINFClassA(pathToInf,&classGuid,className,sizeof(className),(PDWORD)0)) {
 		return std::string("SetupDiGetINFClassA() failed -- unable to read zttap driver INF file");
 	}
 
-	HDEVINFO deviceInfoSet = WINENV.SetupDiCreateDeviceInfoList(&classGuid, (HWND)0);
+	HDEVINFO deviceInfoSet = WINENV.SetupDiCreateDeviceInfoList(&classGuid,(HWND)0);
 	if (deviceInfoSet == INVALID_HANDLE_VALUE) {
 		return std::string("SetupDiCreateDeviceInfoList() failed");
 	}
 
 	SP_DEVINFO_DATA deviceInfoData;
-	memset(&deviceInfoData, 0, sizeof(deviceInfoData));
+	memset(&deviceInfoData,0,sizeof(deviceInfoData));
 	deviceInfoData.cbSize = sizeof(deviceInfoData);
-	if (! WINENV.SetupDiCreateDeviceInfoA(deviceInfoSet, className, &classGuid, (PCSTR)0, (HWND)0, DICD_GENERATE_ID, &deviceInfoData)) {
+	if (!WINENV.SetupDiCreateDeviceInfoA(deviceInfoSet,className,&classGuid,(PCSTR)0,(HWND)0,DICD_GENERATE_ID,&deviceInfoData)) {
 		WINENV.SetupDiDestroyDeviceInfoList(deviceInfoSet);
 		return std::string("SetupDiCreateDeviceInfoA() failed");
 	}
 
-	if (! WINENV.SetupDiSetDeviceRegistryPropertyA(deviceInfoSet, &deviceInfoData, SPDRP_HARDWAREID, (const BYTE*)WINENV.tapDriverName.c_str(), (DWORD)(WINENV.tapDriverName.length() + 1))) {
+	if (!WINENV.SetupDiSetDeviceRegistryPropertyA(deviceInfoSet,&deviceInfoData,SPDRP_HARDWAREID,(const BYTE *)WINENV.tapDriverName.c_str(),(DWORD)(WINENV.tapDriverName.length() + 1))) {
 		WINENV.SetupDiDestroyDeviceInfoList(deviceInfoSet);
 		return std::string("SetupDiSetDeviceRegistryPropertyA() failed");
 	}
 
-	if (! WINENV.SetupDiCallClassInstaller(DIF_REGISTERDEVICE, deviceInfoSet, &deviceInfoData)) {
+	if (!WINENV.SetupDiCallClassInstaller(DIF_REGISTERDEVICE,deviceInfoSet,&deviceInfoData)) {
 		WINENV.SetupDiDestroyDeviceInfoList(deviceInfoSet);
 		return std::string("SetupDiCallClassInstaller(DIF_REGISTERDEVICE) failed");
 	}
@@ -239,25 +234,23 @@ std::string WindowsEthernetTap::addNewPersistentTapDevice(const char* pathToInf,
 	// HACK: During upgrades, this can fail while the installer is still running. So make 60 attempts
 	// with a 1s delay between each attempt.
 	bool driverInstalled = false;
-	for (int retryCounter = 0; retryCounter < 60; ++retryCounter) {
+	for(int retryCounter=0;retryCounter<60;++retryCounter) {
 		BOOL rebootRequired = FALSE;
-		if (WINENV.UpdateDriverForPlugAndPlayDevicesA((HWND)0, WINENV.tapDriverName.c_str(), pathToInf, INSTALLFLAG_FORCE | INSTALLFLAG_NONINTERACTIVE, &rebootRequired)) {
+		if (WINENV.UpdateDriverForPlugAndPlayDevicesA((HWND)0,WINENV.tapDriverName.c_str(),pathToInf,INSTALLFLAG_FORCE|INSTALLFLAG_NONINTERACTIVE,&rebootRequired)) {
 			driverInstalled = true;
 			break;
-		}
-		else
-			Sleep(1000);
+		} else Sleep(1000);
 	}
-	if (! driverInstalled) {
+	if (!driverInstalled) {
 		WINENV.SetupDiDestroyDeviceInfoList(deviceInfoSet);
 		return std::string("UpdateDriverForPlugAndPlayDevices() failed (made 60 attempts)");
 	}
 
 	char iidbuf[1024];
 	DWORD iidReqSize = sizeof(iidbuf);
-	if (WINENV.SetupDiGetDeviceInstanceIdA(deviceInfoSet, &deviceInfoData, iidbuf, sizeof(iidbuf), &iidReqSize)) {
+	if (WINENV.SetupDiGetDeviceInstanceIdA(deviceInfoSet,&deviceInfoData,iidbuf,sizeof(iidbuf),&iidReqSize)) {
 		deviceInstanceId = iidbuf;
-	}	// failure here is not fatal since we only need this on Vista and 2008 -- other versions fill it into the registry automatically
+	} // failure here is not fatal since we only need this on Vista and 2008 -- other versions fill it into the registry automatically
 
 	WINENV.SetupDiDestroyDeviceInfoList(deviceInfoSet);
 
@@ -273,41 +266,39 @@ std::string WindowsEthernetTap::destroyAllLegacyPersistentTapDevices()
 	std::set<std::string> instanceIdPathsToRemove;
 	{
 		HKEY nwAdapters;
-		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, KEY_READ | KEY_WRITE, &nwAdapters) != ERROR_SUCCESS)
+		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}",0,KEY_READ|KEY_WRITE,&nwAdapters) != ERROR_SUCCESS)
 			return std::string("Could not open registry key");
 
-		for (DWORD subkeyIndex = 0;; ++subkeyIndex) {
+		for(DWORD subkeyIndex=0;;++subkeyIndex) {
 			DWORD type;
 			DWORD dataLen;
 			DWORD subkeyNameLen = sizeof(subkeyName);
 			DWORD subkeyClassLen = sizeof(subkeyClass);
 			FILETIME lastWriteTime;
-			if (RegEnumKeyExA(nwAdapters, subkeyIndex, subkeyName, &subkeyNameLen, (DWORD*)0, subkeyClass, &subkeyClassLen, &lastWriteTime) == ERROR_SUCCESS) {
+			if (RegEnumKeyExA(nwAdapters,subkeyIndex,subkeyName,&subkeyNameLen,(DWORD *)0,subkeyClass,&subkeyClassLen,&lastWriteTime) == ERROR_SUCCESS) {
 				type = 0;
 				dataLen = sizeof(data);
-				if (RegGetValueA(nwAdapters, subkeyName, "ComponentId", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS) {
+				if (RegGetValueA(nwAdapters,subkeyName,"ComponentId",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) {
 					data[dataLen] = '\0';
 
-					if ((! strnicmp(data, "zttap", 5)) && (WINENV.tapDriverName != data)) {
+					if ((!strnicmp(data,"zttap",5))&&(WINENV.tapDriverName != data)) {
 						std::string instanceIdPath;
 						type = 0;
 						dataLen = sizeof(data);
-						if (RegGetValueA(nwAdapters, subkeyName, "DeviceInstanceID", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS)
-							instanceIdPath.assign(data, dataLen);
+						if (RegGetValueA(nwAdapters,subkeyName,"DeviceInstanceID",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS)
+							instanceIdPath.assign(data,dataLen);
 						if (instanceIdPath.length() != 0)
 							instanceIdPathsToRemove.insert(instanceIdPath);
 					}
 				}
-			}
-			else
-				break;	 // end of list or failure
+			} else break; // end of list or failure
 		}
 
 		RegCloseKey(nwAdapters);
 	}
 
 	std::string errlist;
-	for (std::set<std::string>::iterator iidp(instanceIdPathsToRemove.begin()); iidp != instanceIdPathsToRemove.end(); ++iidp) {
+	for(std::set<std::string>::iterator iidp(instanceIdPathsToRemove.begin());iidp!=instanceIdPathsToRemove.end();++iidp) {
 		std::string err = deletePersistentTapDevice(iidp->c_str());
 		if (err.length() > 0) {
 			if (errlist.length() > 0)
@@ -327,41 +318,39 @@ std::string WindowsEthernetTap::destroyAllPersistentTapDevices()
 	std::set<std::string> instanceIdPathsToRemove;
 	{
 		HKEY nwAdapters;
-		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, KEY_READ | KEY_WRITE, &nwAdapters) != ERROR_SUCCESS)
+		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}",0,KEY_READ|KEY_WRITE,&nwAdapters) != ERROR_SUCCESS)
 			return std::string("Could not open registry key");
 
-		for (DWORD subkeyIndex = 0;; ++subkeyIndex) {
+		for(DWORD subkeyIndex=0;;++subkeyIndex) {
 			DWORD type;
 			DWORD dataLen;
 			DWORD subkeyNameLen = sizeof(subkeyName);
 			DWORD subkeyClassLen = sizeof(subkeyClass);
 			FILETIME lastWriteTime;
-			if (RegEnumKeyExA(nwAdapters, subkeyIndex, subkeyName, &subkeyNameLen, (DWORD*)0, subkeyClass, &subkeyClassLen, &lastWriteTime) == ERROR_SUCCESS) {
+			if (RegEnumKeyExA(nwAdapters,subkeyIndex,subkeyName,&subkeyNameLen,(DWORD *)0,subkeyClass,&subkeyClassLen,&lastWriteTime) == ERROR_SUCCESS) {
 				type = 0;
 				dataLen = sizeof(data);
-				if (RegGetValueA(nwAdapters, subkeyName, "ComponentId", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS) {
+				if (RegGetValueA(nwAdapters,subkeyName,"ComponentId",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) {
 					data[dataLen] = '\0';
 
-					if (! strnicmp(data, "zttap", 5)) {
+					if (!strnicmp(data,"zttap",5)) {
 						std::string instanceIdPath;
 						type = 0;
 						dataLen = sizeof(data);
-						if (RegGetValueA(nwAdapters, subkeyName, "DeviceInstanceID", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS)
-							instanceIdPath.assign(data, dataLen);
+						if (RegGetValueA(nwAdapters,subkeyName,"DeviceInstanceID",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS)
+							instanceIdPath.assign(data,dataLen);
 						if (instanceIdPath.length() != 0)
 							instanceIdPathsToRemove.insert(instanceIdPath);
 					}
 				}
-			}
-			else
-				break;	 // end of list or failure
+			} else break; // end of list or failure
 		}
 
 		RegCloseKey(nwAdapters);
 	}
 
 	std::string errlist;
-	for (std::set<std::string>::iterator iidp(instanceIdPathsToRemove.begin()); iidp != instanceIdPathsToRemove.end(); ++iidp) {
+	for(std::set<std::string>::iterator iidp(instanceIdPathsToRemove.begin());iidp!=instanceIdPathsToRemove.end();++iidp) {
 		std::string err = deletePersistentTapDevice(iidp->c_str());
 		if (err.length() > 0) {
 			if (errlist.length() > 0)
@@ -372,12 +361,12 @@ std::string WindowsEthernetTap::destroyAllPersistentTapDevices()
 	return errlist;
 }
 
-std::string WindowsEthernetTap::deletePersistentTapDevice(const char* instanceId)
+std::string WindowsEthernetTap::deletePersistentTapDevice(const char *instanceId)
 {
 	char iid[256];
 	SP_REMOVEDEVICE_PARAMS rmdParams;
 
-	memset(&rmdParams, 0, sizeof(rmdParams));
+	memset(&rmdParams,0,sizeof(rmdParams));
 	rmdParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
 	rmdParams.ClassInstallHeader.InstallFunction = DIF_REMOVE;
 	rmdParams.Scope = DI_REMOVEDEVICE_GLOBAL;
@@ -385,22 +374,22 @@ std::string WindowsEthernetTap::deletePersistentTapDevice(const char* instanceId
 
 	Mutex::Lock _l(_systemDeviceManagementLock);
 
-	HDEVINFO devInfo = WINENV.SetupDiGetClassDevsExA((const GUID*)0, (PCSTR)0, (HWND)0, DIGCF_ALLCLASSES, (HDEVINFO)0, (PCSTR)0, (PVOID)0);
+	HDEVINFO devInfo = WINENV.SetupDiGetClassDevsExA((const GUID *)0,(PCSTR)0,(HWND)0,DIGCF_ALLCLASSES,(HDEVINFO)0,(PCSTR)0,(PVOID)0);
 	if (devInfo == INVALID_HANDLE_VALUE)
 		return std::string("SetupDiGetClassDevsExA() failed");
-	WINENV.SetupDiOpenDeviceInfoA(devInfo, instanceId, (HWND)0, 0, (PSP_DEVINFO_DATA)0);
+	WINENV.SetupDiOpenDeviceInfoA(devInfo,instanceId,(HWND)0,0,(PSP_DEVINFO_DATA)0);
 
 	SP_DEVINFO_DATA devInfoData;
-	memset(&devInfoData, 0, sizeof(devInfoData));
+	memset(&devInfoData,0,sizeof(devInfoData));
 	devInfoData.cbSize = sizeof(devInfoData);
-	for (DWORD devIndex = 0; WINENV.SetupDiEnumDeviceInfo(devInfo, devIndex, &devInfoData); devIndex++) {
-		if ((WINENV.CM_Get_Device_ID_ExA(devInfoData.DevInst, iid, sizeof(iid), 0, (HMACHINE)0) == CR_SUCCESS) && (! strcmp(iid, instanceId))) {
-			if (! WINENV.SetupDiSetClassInstallParamsA(devInfo, &devInfoData, &rmdParams.ClassInstallHeader, sizeof(rmdParams))) {
+	for(DWORD devIndex=0;WINENV.SetupDiEnumDeviceInfo(devInfo,devIndex,&devInfoData);devIndex++) {
+		if ((WINENV.CM_Get_Device_ID_ExA(devInfoData.DevInst,iid,sizeof(iid),0,(HMACHINE)0) == CR_SUCCESS)&&(!strcmp(iid,instanceId))) {
+			if (!WINENV.SetupDiSetClassInstallParamsA(devInfo,&devInfoData,&rmdParams.ClassInstallHeader,sizeof(rmdParams))) {
 				WINENV.SetupDiDestroyDeviceInfoList(devInfo);
 				return std::string("SetupDiSetClassInstallParams() failed");
 			}
 
-			if (! WINENV.SetupDiCallClassInstaller(DIF_REMOVE, devInfo, &devInfoData)) {
+			if (!WINENV.SetupDiCallClassInstaller(DIF_REMOVE,devInfo,&devInfoData)) {
 				WINENV.SetupDiDestroyDeviceInfoList(devInfo);
 				return std::string("SetupDiCallClassInstaller(DIF_REMOVE) failed");
 			}
@@ -414,42 +403,42 @@ std::string WindowsEthernetTap::deletePersistentTapDevice(const char* instanceId
 	return std::string("instance ID not found");
 }
 
-bool WindowsEthernetTap::setPersistentTapDeviceState(const char* instanceId, bool enabled)
+bool WindowsEthernetTap::setPersistentTapDeviceState(const char *instanceId,bool enabled)
 {
 	char iid[256];
 	SP_PROPCHANGE_PARAMS params;
 
 	Mutex::Lock _l(_systemDeviceManagementLock);
 
-	HDEVINFO devInfo = WINENV.SetupDiGetClassDevsExA((const GUID*)0, (PCSTR)0, (HWND)0, DIGCF_ALLCLASSES, (HDEVINFO)0, (PCSTR)0, (PVOID)0);
+	HDEVINFO devInfo = WINENV.SetupDiGetClassDevsExA((const GUID *)0,(PCSTR)0,(HWND)0,DIGCF_ALLCLASSES,(HDEVINFO)0,(PCSTR)0,(PVOID)0);
 	if (devInfo == INVALID_HANDLE_VALUE)
 		return false;
-	WINENV.SetupDiOpenDeviceInfoA(devInfo, instanceId, (HWND)0, 0, (PSP_DEVINFO_DATA)0);
+	WINENV.SetupDiOpenDeviceInfoA(devInfo,instanceId,(HWND)0,0,(PSP_DEVINFO_DATA)0);
 
 	SP_DEVINFO_DATA devInfoData;
-	memset(&devInfoData, 0, sizeof(devInfoData));
+	memset(&devInfoData,0,sizeof(devInfoData));
 	devInfoData.cbSize = sizeof(devInfoData);
-	for (DWORD devIndex = 0; WINENV.SetupDiEnumDeviceInfo(devInfo, devIndex, &devInfoData); devIndex++) {
-		if ((WINENV.CM_Get_Device_ID_ExA(devInfoData.DevInst, iid, sizeof(iid), 0, (HMACHINE)0) == CR_SUCCESS) && (! strcmp(iid, instanceId))) {
-			memset(&params, 0, sizeof(params));
+	for(DWORD devIndex=0;WINENV.SetupDiEnumDeviceInfo(devInfo,devIndex,&devInfoData);devIndex++) {
+		if ((WINENV.CM_Get_Device_ID_ExA(devInfoData.DevInst,iid,sizeof(iid),0,(HMACHINE)0) == CR_SUCCESS)&&(!strcmp(iid,instanceId))) {
+			memset(&params,0,sizeof(params));
 			params.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
 			params.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE;
 			params.StateChange = enabled ? DICS_ENABLE : DICS_DISABLE;
 			params.Scope = DICS_FLAG_GLOBAL;
 			params.HwProfile = 0;
 
-			WINENV.SetupDiSetClassInstallParamsA(devInfo, &devInfoData, &params.ClassInstallHeader, sizeof(params));
-			WINENV.SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, devInfo, &devInfoData);
+			WINENV.SetupDiSetClassInstallParamsA(devInfo,&devInfoData,&params.ClassInstallHeader,sizeof(params));
+			WINENV.SetupDiCallClassInstaller(DIF_PROPERTYCHANGE,devInfo,&devInfoData);
 
-			memset(&params, 0, sizeof(params));
+			memset(&params,0,sizeof(params));
 			params.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
 			params.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE;
 			params.StateChange = enabled ? DICS_ENABLE : DICS_DISABLE;
 			params.Scope = DICS_FLAG_CONFIGSPECIFIC;
 			params.HwProfile = 0;
 
-			WINENV.SetupDiSetClassInstallParamsA(devInfo, &devInfoData, &params.ClassInstallHeader, sizeof(params));
-			WINENV.SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, devInfo, &devInfoData);
+			WINENV.SetupDiSetClassInstallParamsA(devInfo,&devInfoData,&params.ClassInstallHeader,sizeof(params));
+			WINENV.SetupDiCallClassInstaller(DIF_PROPERTYCHANGE,devInfo,&devInfoData);
 
 			WINENV.SetupDiDestroyDeviceInfoList(devInfo);
 			return true;
@@ -461,218 +450,212 @@ bool WindowsEthernetTap::setPersistentTapDeviceState(const char* instanceId, boo
 }
 
 WindowsEthernetTap::WindowsEthernetTap(
-	const char* hp,
-	const MAC& mac,
+	const char *hp,
+	const MAC &mac,
 	unsigned int mtu,
 	unsigned int metric,
 	uint64_t nwid,
-	const char* friendlyName,
-	void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-	void* arg)
-	: _handler(handler)
-	, _arg(arg)
-	, _mac(mac)
-	, _nwid(nwid)
-	, _mtu(mtu)
-	, _tap(INVALID_HANDLE_VALUE)
-	, _friendlyName(friendlyName)
-	, _injectSemaphore(INVALID_HANDLE_VALUE)
-	, _pathToHelpers(hp)
-	, _run(true)
-	, _initialized(false)
-	, _enabled(true)
-	, _lastIfAddrsUpdate(0)
+	const char *friendlyName,
+	void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+	void *arg) :
+	_handler(handler),
+	_arg(arg),
+	_mac(mac),
+	_nwid(nwid),
+	_tap(INVALID_HANDLE_VALUE),
+	_injectSemaphore(INVALID_HANDLE_VALUE),
+	_pathToHelpers(hp),
+	_run(true),
+	_initialized(false),
+	_enabled(true)
 {
 	char subkeyName[1024];
 	char subkeyClass[1024];
 	char data[1024];
 	char tag[24];
+	std::string mySubkeyName;
+
+	if (mtu > 2800)
+		throw std::runtime_error("MTU too large.");
 
 	// We "tag" registry entries with the network ID to identify persistent devices
-	OSUtils::ztsnprintf(tag, sizeof(tag), "%.16llx", (unsigned long long)nwid);
+	Utils::snprintf(tag,sizeof(tag),"%.16llx",(unsigned long long)nwid);
 
 	Mutex::Lock _l(_systemTapInitLock);
 
 	HKEY nwAdapters;
-	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, KEY_READ | KEY_WRITE, &nwAdapters) != ERROR_SUCCESS)
+	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}",0,KEY_READ|KEY_WRITE,&nwAdapters) != ERROR_SUCCESS)
 		throw std::runtime_error("unable to open registry key for network adapter enumeration");
 
 	// Look for the tap instance that corresponds with this network
-	for (DWORD subkeyIndex = 0;; ++subkeyIndex) {
+	for(DWORD subkeyIndex=0;;++subkeyIndex) {
 		DWORD type;
 		DWORD dataLen;
 		DWORD subkeyNameLen = sizeof(subkeyName);
 		DWORD subkeyClassLen = sizeof(subkeyClass);
 		FILETIME lastWriteTime;
-		if (RegEnumKeyExA(nwAdapters, subkeyIndex, subkeyName, &subkeyNameLen, (DWORD*)0, subkeyClass, &subkeyClassLen, &lastWriteTime) == ERROR_SUCCESS) {
+		if (RegEnumKeyExA(nwAdapters,subkeyIndex,subkeyName,&subkeyNameLen,(DWORD *)0,subkeyClass,&subkeyClassLen,&lastWriteTime) == ERROR_SUCCESS) {
 			type = 0;
 			dataLen = sizeof(data);
-			if (RegGetValueA(nwAdapters, subkeyName, "ComponentId", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS) {
+			if (RegGetValueA(nwAdapters,subkeyName,"ComponentId",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) {
 				data[dataLen] = (char)0;
 
 				if (WINENV.tapDriverName == data) {
 					std::string instanceId;
 					type = 0;
 					dataLen = sizeof(data);
-					if (RegGetValueA(nwAdapters, subkeyName, "NetCfgInstanceId", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS)
-						instanceId.assign(data, dataLen);
+					if (RegGetValueA(nwAdapters,subkeyName,"NetCfgInstanceId",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS)
+						instanceId.assign(data,dataLen);
 
 					std::string instanceIdPath;
 					type = 0;
 					dataLen = sizeof(data);
-					if (RegGetValueA(nwAdapters, subkeyName, "DeviceInstanceID", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS)
-						instanceIdPath.assign(data, dataLen);
+					if (RegGetValueA(nwAdapters,subkeyName,"DeviceInstanceID",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS)
+						instanceIdPath.assign(data,dataLen);
 
-					if ((_netCfgInstanceId.length() == 0) && (instanceId.length() != 0) && (instanceIdPath.length() != 0)) {
+					if ((_netCfgInstanceId.length() == 0)&&(instanceId.length() != 0)&&(instanceIdPath.length() != 0)) {
 						type = 0;
 						dataLen = sizeof(data);
-						if (RegGetValueA(nwAdapters, subkeyName, "_ZeroTierTapIdentifier", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS) {
+						if (RegGetValueA(nwAdapters,subkeyName,"_ZeroTierTapIdentifier",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) {
 							data[dataLen] = '\0';
-							if (! strcmp(data, tag)) {
+							if (!strcmp(data,tag)) {
 								_netCfgInstanceId = instanceId;
 								_deviceInstanceId = instanceIdPath;
 
-								_mySubkeyName = subkeyName;
-								break;	 // found it!
+								mySubkeyName = subkeyName;
+								break; // found it!
 							}
 						}
 					}
 				}
 			}
-		}
-		else
-			break;	 // no more subkeys or error occurred enumerating them
+		} else break; // no more subkeys or error occurred enumerating them
 	}
 
 	// If there is no device, try to create one
 	bool creatingNewDevice = (_netCfgInstanceId.length() == 0);
 	std::string newDeviceInstanceId;
 	if (creatingNewDevice) {
-		for (int getNewAttemptCounter = 0; getNewAttemptCounter < 2; ++getNewAttemptCounter) {
-			for (DWORD subkeyIndex = 0;; ++subkeyIndex) {
+		for(int getNewAttemptCounter=0;getNewAttemptCounter<2;++getNewAttemptCounter) {
+			for(DWORD subkeyIndex=0;;++subkeyIndex) {
 				DWORD type;
 				DWORD dataLen;
 				DWORD subkeyNameLen = sizeof(subkeyName);
 				DWORD subkeyClassLen = sizeof(subkeyClass);
 				FILETIME lastWriteTime;
-				if (RegEnumKeyExA(nwAdapters, subkeyIndex, subkeyName, &subkeyNameLen, (DWORD*)0, subkeyClass, &subkeyClassLen, &lastWriteTime) == ERROR_SUCCESS) {
+				if (RegEnumKeyExA(nwAdapters,subkeyIndex,subkeyName,&subkeyNameLen,(DWORD *)0,subkeyClass,&subkeyClassLen,&lastWriteTime) == ERROR_SUCCESS) {
 					type = 0;
 					dataLen = sizeof(data);
-					if (RegGetValueA(nwAdapters, subkeyName, "ComponentId", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS) {
+					if (RegGetValueA(nwAdapters,subkeyName,"ComponentId",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) {
 						data[dataLen] = '\0';
 
 						if (WINENV.tapDriverName == data) {
 							type = 0;
 							dataLen = sizeof(data);
-							if ((RegGetValueA(nwAdapters, subkeyName, "_ZeroTierTapIdentifier", RRF_RT_ANY, &type, (PVOID)data, &dataLen) != ERROR_SUCCESS) || (dataLen <= 0)) {
+							if ((RegGetValueA(nwAdapters,subkeyName,"_ZeroTierTapIdentifier",RRF_RT_ANY,&type,(PVOID)data,&dataLen) != ERROR_SUCCESS)||(dataLen <= 0)) {
 								type = 0;
 								dataLen = sizeof(data);
-								if (RegGetValueA(nwAdapters, subkeyName, "NetCfgInstanceId", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS) {
-									RegSetKeyValueA(nwAdapters, subkeyName, "_ZeroTierTapIdentifier", REG_SZ, tag, (DWORD)(strlen(tag) + 1));
+								if (RegGetValueA(nwAdapters,subkeyName,"NetCfgInstanceId",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS) {
+									RegSetKeyValueA(nwAdapters,subkeyName,"_ZeroTierTapIdentifier",REG_SZ,tag,(DWORD)(strlen(tag)+1));
 
-									_netCfgInstanceId.assign(data, dataLen);
+									_netCfgInstanceId.assign(data,dataLen);
 
 									type = 0;
 									dataLen = sizeof(data);
-									if (RegGetValueA(nwAdapters, subkeyName, "DeviceInstanceID", RRF_RT_ANY, &type, (PVOID)data, &dataLen) == ERROR_SUCCESS)
-										_deviceInstanceId.assign(data, dataLen);
+									if (RegGetValueA(nwAdapters,subkeyName,"DeviceInstanceID",RRF_RT_ANY,&type,(PVOID)data,&dataLen) == ERROR_SUCCESS)
+										_deviceInstanceId.assign(data,dataLen);
 
-									_mySubkeyName = subkeyName;
+									mySubkeyName = subkeyName;
 
 									// Disable DHCP by default on new devices
 									HKEY tcpIpInterfaces;
-									if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\services\\Tcpip\\Parameters\\Interfaces", 0, KEY_READ | KEY_WRITE, &tcpIpInterfaces) == ERROR_SUCCESS) {
+									if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\services\\Tcpip\\Parameters\\Interfaces",0,KEY_READ|KEY_WRITE,&tcpIpInterfaces) == ERROR_SUCCESS) {
 										DWORD enable = 0;
-										RegSetKeyValueA(tcpIpInterfaces, _netCfgInstanceId.c_str(), "EnableDHCP", REG_DWORD, &enable, sizeof(enable));
+										RegSetKeyValueA(tcpIpInterfaces,_netCfgInstanceId.c_str(),"EnableDHCP",REG_DWORD,&enable,sizeof(enable));
 										RegCloseKey(tcpIpInterfaces);
 									}
 
-									break;	 // found an unused zttap device
+									break; // found an unused zttap device
 								}
 							}
 						}
 					}
-				}
-				else
-					break;	 // no more keys or error occurred
+				} else break; // no more keys or error occurred
 			}
 
 			if (_netCfgInstanceId.length() > 0) {
-				break;	 // found an unused zttap device
-			}
-			else {
+				break; // found an unused zttap device
+			} else {
 				// no unused zttap devices, so create one
-				std::string errm = addNewPersistentTapDevice((std::string(_pathToHelpers) + WINENV.tapDriverPath).c_str(), newDeviceInstanceId);
+				std::string errm = addNewPersistentTapDevice((std::string(_pathToHelpers) + WINENV.tapDriverPath).c_str(),newDeviceInstanceId);
 				if (errm.length() > 0)
-					throw std::runtime_error(std::string("unable to create new device instance: ") + errm);
+					throw std::runtime_error(std::string("unable to create new device instance: ")+errm);
 			}
 		}
 	}
 
 	if (_netCfgInstanceId.length() > 0) {
 		char tmps[64];
-		unsigned int tmpsl = OSUtils::ztsnprintf(tmps, sizeof(tmps), "%.2X-%.2X-%.2X-%.2X-%.2X-%.2X", (unsigned int)mac[0], (unsigned int)mac[1], (unsigned int)mac[2], (unsigned int)mac[3], (unsigned int)mac[4], (unsigned int)mac[5]) + 1;
-		RegSetKeyValueA(nwAdapters, _mySubkeyName.c_str(), "NetworkAddress", REG_SZ, tmps, tmpsl);
-		RegSetKeyValueA(nwAdapters, _mySubkeyName.c_str(), "MAC", REG_SZ, tmps, tmpsl);
-		tmpsl = OSUtils::ztsnprintf(tmps, sizeof(tmps), "%d", mtu);
-		RegSetKeyValueA(nwAdapters, _mySubkeyName.c_str(), "MTU", REG_SZ, tmps, tmpsl);
+		unsigned int tmpsl = Utils::snprintf(tmps,sizeof(tmps),"%.2X-%.2X-%.2X-%.2X-%.2X-%.2X",(unsigned int)mac[0],(unsigned int)mac[1],(unsigned int)mac[2],(unsigned int)mac[3],(unsigned int)mac[4],(unsigned int)mac[5]) + 1;
+		RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"NetworkAddress",REG_SZ,tmps,tmpsl);
+		RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"MAC",REG_SZ,tmps,tmpsl);
+		DWORD tmp = mtu;
+		RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"MTU",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp));
 
-		DWORD tmp = 0;
-		RegSetKeyValueA(nwAdapters, _mySubkeyName.c_str(), "*NdisDeviceType", REG_DWORD, (LPCVOID)&tmp, sizeof(tmp));
+		tmp = 0;
+		RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"*NdisDeviceType",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp));
 		tmp = IF_TYPE_ETHERNET_CSMACD;
-		RegSetKeyValueA(nwAdapters, _mySubkeyName.c_str(), "*IfType", REG_DWORD, (LPCVOID)&tmp, sizeof(tmp));
+		RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"*IfType",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp));
 
 		if (creatingNewDevice) {
 			// Vista/2008 does not set this
 			if (newDeviceInstanceId.length() > 0)
-				RegSetKeyValueA(nwAdapters, _mySubkeyName.c_str(), "DeviceInstanceID", REG_SZ, newDeviceInstanceId.c_str(), (DWORD)newDeviceInstanceId.length());
+				RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"DeviceInstanceID",REG_SZ,newDeviceInstanceId.c_str(),(DWORD)newDeviceInstanceId.length());
 
 			// Set EnableDHCP to 0 by default on new devices
 			tmp = 0;
-			RegSetKeyValueA(nwAdapters, _mySubkeyName.c_str(), "EnableDHCP", REG_DWORD, (LPCVOID)&tmp, sizeof(tmp));
+			RegSetKeyValueA(nwAdapters,mySubkeyName.c_str(),"EnableDHCP",REG_DWORD,(LPCVOID)&tmp,sizeof(tmp));
 		}
 		RegCloseKey(nwAdapters);
-	}
-	else {
+	} else {
 		RegCloseKey(nwAdapters);
 		throw std::runtime_error("unable to find or create tap adapter");
 	}
 
 	{
-		char nobraces[128];	  // strip braces from GUID before converting it, because Windows
-		const char* nbtmp1 = _netCfgInstanceId.c_str();
-		char* nbtmp2 = nobraces;
+		char nobraces[128]; // strip braces from GUID before converting it, because Windows
+		const char *nbtmp1 = _netCfgInstanceId.c_str();
+		char *nbtmp2 = nobraces;
 		while (*nbtmp1) {
-			if ((*nbtmp1 != '{') && (*nbtmp1 != '}'))
+			if ((*nbtmp1 != '{')&&(*nbtmp1 != '}'))
 				*nbtmp2++ = *nbtmp1;
 			++nbtmp1;
 		}
 		*nbtmp2 = (char)0;
-		if (UuidFromStringA((RPC_CSTR)nobraces, &_deviceGuid) != RPC_S_OK)
+		if (UuidFromStringA((RPC_CSTR)nobraces,&_deviceGuid) != RPC_S_OK)
 			throw std::runtime_error("unable to convert instance ID GUID to native GUID (invalid NetCfgInstanceId in registry?)");
 	}
 
 	// Get the LUID, which is one of like four fucking ways to refer to a network device in Windows
-	if (ConvertInterfaceGuidToLuid(&_deviceGuid, &_deviceLuid) != NO_ERROR)
+	if (ConvertInterfaceGuidToLuid(&_deviceGuid,&_deviceLuid) != NO_ERROR)
 		throw std::runtime_error("unable to convert device interface GUID to LUID");
 
-	//_initialized = true;
+	_initialized = true;
 
 	if (friendlyName)
 		setFriendlyName(friendlyName);
 
-	_injectSemaphore = CreateSemaphore(NULL, 0, 1, NULL);
+	_injectSemaphore = CreateSemaphore(NULL,0,1,NULL);
 	_thread = Thread::start(this);
 }
 
 WindowsEthernetTap::~WindowsEthernetTap()
 {
-	WinDNSHelper::removeDNS(_nwid);
 	_run = false;
-	ReleaseSemaphore(_injectSemaphore, 1, NULL);
+	ReleaseSemaphore(_injectSemaphore,1,NULL);
 	Thread::join(_thread);
 	CloseHandle(_injectSemaphore);
-	setPersistentTapDeviceState(_deviceInstanceId.c_str(), false);
+	setPersistentTapDeviceState(_deviceInstanceId.c_str(),false);
 }
 
 void WindowsEthernetTap::setEnabled(bool en)
@@ -685,68 +668,61 @@ bool WindowsEthernetTap::enabled() const
 	return _enabled;
 }
 
-bool WindowsEthernetTap::addIp(const InetAddress& ip)
+bool WindowsEthernetTap::addIp(const InetAddress &ip)
 {
-	if (! ip.netmaskBits())	  // sanity check... netmask of 0.0.0.0 is WUT?
+	if (!ip.netmaskBits()) // sanity check... netmask of 0.0.0.0 is WUT?
 		return false;
-
 	Mutex::Lock _l(_assignedIps_m);
-	if (std::find(_assignedIps.begin(), _assignedIps.end(), ip) != _assignedIps.end())
+	if (std::find(_assignedIps.begin(),_assignedIps.end(),ip) != _assignedIps.end())
 		return true;
 	_assignedIps.push_back(ip);
 	_syncIps();
 	return true;
 }
 
-bool WindowsEthernetTap::removeIp(const InetAddress& ip)
+bool WindowsEthernetTap::removeIp(const InetAddress &ip)
 {
-	if (ip.isV6())
-		return true;
-
 	{
 		Mutex::Lock _l(_assignedIps_m);
-		std::vector<InetAddress>::iterator aip(std::find(_assignedIps.begin(), _assignedIps.end(), ip));
+		std::vector<InetAddress>::iterator aip(std::find(_assignedIps.begin(),_assignedIps.end(),ip));
 		if (aip != _assignedIps.end())
 			_assignedIps.erase(aip);
 	}
 
-	if (! _initialized)
+	if (!_initialized)
 		return false;
 
 	try {
-		MIB_UNICASTIPADDRESS_TABLE* ipt = (MIB_UNICASTIPADDRESS_TABLE*)0;
-		if (GetUnicastIpAddressTable(AF_UNSPEC, &ipt) == NO_ERROR) {
-			if ((ipt) && (ipt->NumEntries > 0)) {
-				for (DWORD i = 0; i < (DWORD)ipt->NumEntries; ++i) {
+		MIB_UNICASTIPADDRESS_TABLE *ipt = (MIB_UNICASTIPADDRESS_TABLE *)0;
+		if (GetUnicastIpAddressTable(AF_UNSPEC,&ipt) == NO_ERROR) {
+			if ((ipt)&&(ipt->NumEntries > 0)) {
+				for(DWORD i=0;i<(DWORD)ipt->NumEntries;++i) {
 					if (ipt->Table[i].InterfaceLuid.Value == _deviceLuid.Value) {
 						InetAddress addr;
-						switch (ipt->Table[i].Address.si_family) {
+						switch(ipt->Table[i].Address.si_family) {
 							case AF_INET:
-								addr.set(&(ipt->Table[i].Address.Ipv4.sin_addr.S_un.S_addr), 4, ipt->Table[i].OnLinkPrefixLength);
+								addr.set(&(ipt->Table[i].Address.Ipv4.sin_addr.S_un.S_addr),4,ipt->Table[i].OnLinkPrefixLength);
 								break;
 							case AF_INET6:
-								addr.set(ipt->Table[i].Address.Ipv6.sin6_addr.u.Byte, 16, ipt->Table[i].OnLinkPrefixLength);
+								addr.set(ipt->Table[i].Address.Ipv6.sin6_addr.u.Byte,16,ipt->Table[i].OnLinkPrefixLength);
 								if (addr.ipScope() == InetAddress::IP_SCOPE_LINK_LOCAL)
-									continue;	// can't remove link-local IPv6 addresses
+									continue; // can't remove link-local IPv6 addresses
 								break;
 						}
 						if (addr == ip) {
 							DeleteUnicastIpAddressEntry(&(ipt->Table[i]));
 							FreeMibTable(ipt);
 
-							if (ip.isV4()) {
-								std::vector<std::string> regIps(_getRegistryIPv4Value("IPAddress"));
-								std::vector<std::string> regSubnetMasks(_getRegistryIPv4Value("SubnetMask"));
-								char ipbuf[64];
-								std::string ipstr(ip.toIpString(ipbuf));
-								for (std::vector<std::string>::iterator rip(regIps.begin()), rm(regSubnetMasks.begin()); ((rip != regIps.end()) && (rm != regSubnetMasks.end())); ++rip, ++rm) {
-									if (*rip == ipstr) {
-										regIps.erase(rip);
-										regSubnetMasks.erase(rm);
-										_setRegistryIPv4Value("IPAddress", regIps);
-										_setRegistryIPv4Value("SubnetMask", regSubnetMasks);
-										break;
-									}
+							std::vector<std::string> regIps(_getRegistryIPv4Value("IPAddress"));
+							std::vector<std::string> regSubnetMasks(_getRegistryIPv4Value("SubnetMask"));
+							std::string ipstr(ip.toIpString());
+							for(std::vector<std::string>::iterator rip(regIps.begin()),rm(regSubnetMasks.begin());((rip!=regIps.end())&&(rm!=regSubnetMasks.end()));++rip,++rm) {
+								if (*rip == ipstr) {
+									regIps.erase(rip);
+									regSubnetMasks.erase(rm);
+									_setRegistryIPv4Value("IPAddress",regIps);
+									_setRegistryIPv4Value("SubnetMask",regSubnetMasks);
+									break;
 								}
 							}
 
@@ -757,166 +733,88 @@ bool WindowsEthernetTap::removeIp(const InetAddress& ip)
 			}
 			FreeMibTable((PVOID)ipt);
 		}
-	}
-	catch (...) {
-	}
+	} catch ( ... ) {}
 	return false;
 }
 
 std::vector<InetAddress> WindowsEthernetTap::ips() const
 {
-	static const InetAddress linkLocalLoopback("fe80::1/64");	// what is this and why does Windows assign it?
+	static const InetAddress linkLocalLoopback("fe80::1",64); // what is this and why does Windows assign it?
 	std::vector<InetAddress> addrs;
 
-	if (! _initialized)
+	if (!_initialized)
 		return addrs;
 
-	uint64_t now = OSUtils::now();
-
-	if ((now - _lastIfAddrsUpdate) <= GETIFADDRS_CACHE_TIME) {
-		return _ifaddrs;
-	}
-
-	_lastIfAddrsUpdate = now;
-
 	try {
-		MIB_UNICASTIPADDRESS_TABLE* ipt = (MIB_UNICASTIPADDRESS_TABLE*)0;
-		if (GetUnicastIpAddressTable(AF_UNSPEC, &ipt) == NO_ERROR) {
-			if ((ipt) && (ipt->NumEntries > 0)) {
-				for (DWORD i = 0; i < (DWORD)ipt->NumEntries; ++i) {
+		MIB_UNICASTIPADDRESS_TABLE *ipt = (MIB_UNICASTIPADDRESS_TABLE *)0;
+		if (GetUnicastIpAddressTable(AF_UNSPEC,&ipt) == NO_ERROR) {
+			if ((ipt)&&(ipt->NumEntries > 0)) {
+				for(DWORD i=0;i<(DWORD)ipt->NumEntries;++i) {
 					if (ipt->Table[i].InterfaceLuid.Value == _deviceLuid.Value) {
-						switch (ipt->Table[i].Address.si_family) {
+						switch(ipt->Table[i].Address.si_family) {
 							case AF_INET: {
-								InetAddress ip(&(ipt->Table[i].Address.Ipv4.sin_addr.S_un.S_addr), 4, ipt->Table[i].OnLinkPrefixLength);
+								InetAddress ip(&(ipt->Table[i].Address.Ipv4.sin_addr.S_un.S_addr),4,ipt->Table[i].OnLinkPrefixLength);
 								if (ip != InetAddress::LO4)
 									addrs.push_back(ip);
-							} break;
+							}	break;
 							case AF_INET6: {
-								InetAddress ip(ipt->Table[i].Address.Ipv6.sin6_addr.u.Byte, 16, ipt->Table[i].OnLinkPrefixLength);
-								if ((ip != linkLocalLoopback) && (ip != InetAddress::LO6))
+								InetAddress ip(ipt->Table[i].Address.Ipv6.sin6_addr.u.Byte,16,ipt->Table[i].OnLinkPrefixLength);
+								if ((ip != linkLocalLoopback)&&(ip != InetAddress::LO6))
 									addrs.push_back(ip);
-							} break;
+							}	break;
 						}
 					}
 				}
 			}
 			FreeMibTable(ipt);
 		}
-	}
-	catch (...) {
-	}	// sanity check, shouldn't happen unless out of memory
+	} catch ( ... ) {} // sanity check, shouldn't happen unless out of memory
 
-	std::sort(addrs.begin(), addrs.end());
-	addrs.erase(std::unique(addrs.begin(), addrs.end()), addrs.end());
-
-	_ifaddrs = addrs;
+	std::sort(addrs.begin(),addrs.end());
+	addrs.erase(std::unique(addrs.begin(),addrs.end()),addrs.end());
 
 	return addrs;
 }
 
-void WindowsEthernetTap::put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len)
+void WindowsEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
 {
-	if ((! _initialized) || (! _enabled) || (_tap == INVALID_HANDLE_VALUE) || (len > _mtu))
+	if ((!_initialized)||(!_enabled)||(_tap == INVALID_HANDLE_VALUE)||(len > (ZT_IF_MTU)))
 		return;
 
 	Mutex::Lock _l(_injectPending_m);
-	_injectPending.emplace();
-	_injectPending.back().len = len + 14;
-	char* const d = _injectPending.back().data;
-	to.copyTo(d, 6);
-	from.copyTo(d + 6, 6);
+	_injectPending.push( std::pair<Array<char,ZT_IF_MTU + 32>,unsigned int>(Array<char,ZT_IF_MTU + 32>(),len + 14) );
+	char *d = _injectPending.back().first.data;
+	to.copyTo(d,6);
+	from.copyTo(d + 6,6);
 	d[12] = (char)((etherType >> 8) & 0xff);
 	d[13] = (char)(etherType & 0xff);
-	memcpy(d + 14, data, len);
+	memcpy(d + 14,data,len);
 
-	ReleaseSemaphore(_injectSemaphore, 1, NULL);
+	ReleaseSemaphore(_injectSemaphore,1,NULL);
 }
 
 std::string WindowsEthernetTap::deviceName() const
 {
 	char tmp[1024];
-	if (ConvertInterfaceLuidToNameA(&_deviceLuid, tmp, sizeof(tmp)) != NO_ERROR)
+	if (ConvertInterfaceLuidToNameA(&_deviceLuid,tmp,sizeof(tmp)) != NO_ERROR)
 		return std::string("[ConvertInterfaceLuidToName() failed]");
 	return std::string(tmp);
 }
 
-void WindowsEthernetTap::setFriendlyName(const char* dn)
+void WindowsEthernetTap::setFriendlyName(const char *dn)
 {
-	if (! _initialized)
+	if (!_initialized)
 		return;
-
 	HKEY ifp;
-	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, (std::string("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\") + _netCfgInstanceId).c_str(), 0, KEY_READ | KEY_WRITE, &ifp) == ERROR_SUCCESS) {
-		RegSetKeyValueA(ifp, "Connection", "Name", REG_SZ, (LPCVOID)dn, (DWORD)(strlen(dn) + 1));
+	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,(std::string("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\") + _netCfgInstanceId).c_str(),0,KEY_READ|KEY_WRITE,&ifp) == ERROR_SUCCESS) {
+		RegSetKeyValueA(ifp,"Connection","Name",REG_SZ,(LPCVOID)dn,(DWORD)(strlen(dn)+1));
 		RegCloseKey(ifp);
 	}
-
-	HRESULT hr = S_OK;
-
-	INetSharingManager* nsm;
-	hr = CoCreateInstance(__uuidof(NetSharingManager), NULL, CLSCTX_ALL, __uuidof(INetSharingManager), (void**)&nsm);
-	if (hr != S_OK)
-		return;
-
-	bool found = false;
-	INetSharingEveryConnectionCollection* nsecc = nullptr;
-	hr = nsm->get_EnumEveryConnection(&nsecc);
-	if (! nsecc) {
-		fprintf(stderr, "Failed to get NSM connections");
-		return;
-	}
-
-	IEnumVARIANT* ev = nullptr;
-	IUnknown* unk = nullptr;
-	hr = nsecc->get__NewEnum(&unk);
-	if (unk) {
-		hr = unk->QueryInterface(__uuidof(IEnumVARIANT), (void**)&ev);
-		unk->Release();
-	}
-	if (ev) {
-		VARIANT v;
-		VariantInit(&v);
-
-		while ((S_OK == ev->Next(1, &v, NULL)) && found == FALSE) {
-			if (V_VT(&v) == VT_UNKNOWN) {
-				INetConnection* nc = nullptr;
-				V_UNKNOWN(&v)->QueryInterface(__uuidof(INetConnection), (void**)&nc);
-				if (nc) {
-					NETCON_PROPERTIES* ncp = nullptr;
-					nc->GetProperties(&ncp);
-
-					if (ncp != nullptr) {
-						GUID curId = ncp->guidId;
-						if (curId == _deviceGuid) {
-							wchar_t wtext[255];
-							mbstowcs(wtext, dn, strlen(dn) + 1);
-							nc->Rename(wtext);
-							found = true;
-						}
-					}
-					nc->Release();
-				}
-			}
-			VariantClear(&v);
-		}
-		ev->Release();
-	}
-	nsecc->Release();
-
-	_friendlyName_m.lock();
-	_friendlyName = dn;
-	_friendlyName_m.unlock();
 }
 
-std::string WindowsEthernetTap::friendlyName() const
+void WindowsEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
 {
-	Mutex::Lock l(_friendlyName_m);
-	return _friendlyName;
-}
-
-void WindowsEthernetTap::scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed)
-{
-	if (! _initialized)
+	if (!_initialized)
 		return;
 	HANDLE t = _tap;
 	if (t == INVALID_HANDLE_VALUE)
@@ -929,91 +827,64 @@ void WindowsEthernetTap::scanMulticastGroups(std::vector<MulticastGroup>& added,
 	// pretty much anything work... IPv4, IPv6, IPX, oldskool Netbios, who knows...
 	unsigned char mcastbuf[TAP_WIN_IOCTL_GET_MULTICAST_MEMBERSHIPS_OUTPUT_BUF_SIZE];
 	DWORD bytesReturned = 0;
-	if (DeviceIoControl(t, TAP_WIN_IOCTL_GET_MULTICAST_MEMBERSHIPS, (LPVOID)mcastbuf, sizeof(mcastbuf), (LPVOID)mcastbuf, sizeof(mcastbuf), &bytesReturned, NULL)) {
-		if ((bytesReturned > 0) && (bytesReturned <= TAP_WIN_IOCTL_GET_MULTICAST_MEMBERSHIPS_OUTPUT_BUF_SIZE)) {   // sanity check
+	if (DeviceIoControl(t,TAP_WIN_IOCTL_GET_MULTICAST_MEMBERSHIPS,(LPVOID)0,0,(LPVOID)mcastbuf,sizeof(mcastbuf),&bytesReturned,NULL)) {
+		if ((bytesReturned > 0)&&(bytesReturned <= TAP_WIN_IOCTL_GET_MULTICAST_MEMBERSHIPS_OUTPUT_BUF_SIZE)) { // sanity check
 			MAC mac;
 			DWORD i = 0;
 			while ((i + 6) <= bytesReturned) {
-				mac.setTo(mcastbuf + i, 6);
+				mac.setTo(mcastbuf + i,6);
 				i += 6;
-				if ((mac.isMulticast()) && (! mac.isBroadcast())) {
+				if ((mac.isMulticast())&&(!mac.isBroadcast())) {
 					// exclude the nulls that may be returned or any other junk Windows puts in there
-					newGroups.push_back(MulticastGroup(mac, 0));
+					newGroups.push_back(MulticastGroup(mac,0));
 				}
 			}
 		}
 	}
 
 	std::vector<InetAddress> allIps(ips());
-	for (std::vector<InetAddress>::iterator ip(allIps.begin()); ip != allIps.end(); ++ip)
+	for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
 		newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
 
-	std::sort(newGroups.begin(), newGroups.end());
-	newGroups.erase(std::unique(newGroups.begin(), newGroups.end()), newGroups.end());
+	std::sort(newGroups.begin(),newGroups.end());
+	newGroups.erase(std::unique(newGroups.begin(),newGroups.end()),newGroups.end());
 
-	for (std::vector<MulticastGroup>::iterator m(newGroups.begin()); m != newGroups.end(); ++m) {
-		if (! std::binary_search(_multicastGroups.begin(), _multicastGroups.end(), *m))
+	for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
+		if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
 			added.push_back(*m);
 	}
-	for (std::vector<MulticastGroup>::iterator m(_multicastGroups.begin()); m != _multicastGroups.end(); ++m) {
-		if (! std::binary_search(newGroups.begin(), newGroups.end(), *m))
+	for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
+		if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
 			removed.push_back(*m);
 	}
 
 	_multicastGroups.swap(newGroups);
 }
 
-void WindowsEthernetTap::setMtu(unsigned int mtu)
+void WindowsEthernetTap::threadMain()
+	throw()
 {
-	if (mtu != _mtu) {
-		_mtu = mtu;
-		HKEY nwAdapters;
-		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, KEY_READ | KEY_WRITE, &nwAdapters) == ERROR_SUCCESS) {
-			char tmps[64];
-			unsigned int tmpsl = OSUtils::ztsnprintf(tmps, sizeof(tmps), "%d", mtu);
-			RegSetKeyValueA(nwAdapters, _mySubkeyName.c_str(), "MTU", REG_SZ, tmps, tmpsl);
-			RegCloseKey(nwAdapters);
-		}
-	}
-}
-
-NET_IFINDEX WindowsEthernetTap::interfaceIndex() const
-{
-	NET_IFINDEX idx = -1;
-	if (ConvertInterfaceLuidToIndex(&_deviceLuid, &idx) == NO_ERROR)
-		return idx;
-	return -1;
-}
-
-void WindowsEthernetTap::threadMain() throw()
-{
-	HRESULT hres = CoInitializeEx(0, COINIT_MULTITHREADED);
-	if (FAILED(hres)) {
-		fprintf(stderr, "WinEthernetTap: COM initialization failed");
-		return;
-	}
-
-	char tapReadBuf[ZT_MAX_MTU + 32];
+	char tapReadBuf[ZT_IF_MTU + 32];
 	char tapPath[128];
 	HANDLE wait4[3];
-	OVERLAPPED tapOvlRead, tapOvlWrite;
+	OVERLAPPED tapOvlRead,tapOvlWrite;
 
-	OSUtils::ztsnprintf(tapPath, sizeof(tapPath), "\\\\.\\Global\\%s.tap", _netCfgInstanceId.c_str());
+	Utils::snprintf(tapPath,sizeof(tapPath),"\\\\.\\Global\\%s.tap",_netCfgInstanceId.c_str());
 
 	try {
 		while (_run) {
 			// Because Windows
 			Sleep(250);
-			setPersistentTapDeviceState(_deviceInstanceId.c_str(), false);
+			setPersistentTapDeviceState(_deviceInstanceId.c_str(),false);
 			Sleep(250);
-			setPersistentTapDeviceState(_deviceInstanceId.c_str(), true);
+			setPersistentTapDeviceState(_deviceInstanceId.c_str(),true);
 			Sleep(250);
-			setPersistentTapDeviceState(_deviceInstanceId.c_str(), false);
+			setPersistentTapDeviceState(_deviceInstanceId.c_str(),false);
 			Sleep(250);
-			setPersistentTapDeviceState(_deviceInstanceId.c_str(), true);
+			setPersistentTapDeviceState(_deviceInstanceId.c_str(),true);
 			Sleep(250);
 
-			_tap = CreateFileA(tapPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED, NULL);
+			_tap = CreateFileA(tapPath,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_SYSTEM|FILE_FLAG_OVERLAPPED,NULL);
 			if (_tap == INVALID_HANDLE_VALUE) {
 				Sleep(250);
 				continue;
@@ -1022,7 +893,7 @@ void WindowsEthernetTap::threadMain() throw()
 			{
 				uint32_t tmpi = 1;
 				DWORD bytesReturned = 0;
-				DeviceIoControl(_tap, TAP_WIN_IOCTL_SET_MEDIA_STATUS, &tmpi, sizeof(tmpi), &tmpi, sizeof(tmpi), &bytesReturned, NULL);
+				DeviceIoControl(_tap,TAP_WIN_IOCTL_SET_MEDIA_STATUS,&tmpi,sizeof(tmpi),&tmpi,sizeof(tmpi),&bytesReturned,NULL);
 			}
 
 #ifdef ZT_WINDOWS_CREATE_FAKE_DEFAULT_ROUTE
@@ -1062,14 +933,14 @@ void WindowsEthernetTap::threadMain() throw()
 				 * the routing table before doing so.
 				 *
 				 * Like Jesse Pinkman would say: "YEEEEAAH BITCH!" */
-				const uint32_t fakeIp = htonl(0x19fffffe);	 // 25.255.255.254 -- unrouted IPv4 block
-				for (int i = 0; i < 8; ++i) {
+				const uint32_t fakeIp = htonl(0x19fffffe); // 25.255.255.254 -- unrouted IPv4 block
+				for(int i=0;i<8;++i) {
 					MIB_IPNET_ROW2 ipnr;
-					memset(&ipnr, 0, sizeof(ipnr));
+					memset(&ipnr,0,sizeof(ipnr));
 					ipnr.Address.si_family = AF_INET;
 					ipnr.Address.Ipv4.sin_addr.s_addr = fakeIp;
 					ipnr.InterfaceLuid.Value = _deviceLuid.Value;
-					ipnr.PhysicalAddress[0] = _mac[0] ^ 0x10;	// just make something up that's consistent and not part of this net
+					ipnr.PhysicalAddress[0] = _mac[0] ^ 0x10; // just make something up that's consistent and not part of this net
 					ipnr.PhysicalAddress[1] = 0x00;
 					ipnr.PhysicalAddress[2] = (UCHAR)((_deviceGuid.Data1 >> 24) & 0xff);
 					ipnr.PhysicalAddress[3] = (UCHAR)((_deviceGuid.Data1 >> 16) & 0xff);
@@ -1084,24 +955,22 @@ void WindowsEthernetTap::threadMain() throw()
 					DWORD result = CreateIpNetEntry2(&ipnr);
 					if (result != NO_ERROR)
 						Sleep(250);
-					else
-						break;
+					else break;
 				}
-				for (int i = 0; i < 8; ++i) {
+				for(int i=0;i<8;++i) {
 					MIB_IPFORWARD_ROW2 nr;
-					memset(&nr, 0, sizeof(nr));
+					memset(&nr,0,sizeof(nr));
 					InitializeIpForwardEntry(&nr);
 					nr.InterfaceLuid.Value = _deviceLuid.Value;
-					nr.DestinationPrefix.Prefix.si_family = AF_INET;   // rest is left as 0.0.0.0/0
+					nr.DestinationPrefix.Prefix.si_family = AF_INET; // rest is left as 0.0.0.0/0
 					nr.NextHop.si_family = AF_INET;
 					nr.NextHop.Ipv4.sin_addr.s_addr = fakeIp;
-					nr.Metric = 9999;	// do not use as real default route
+					nr.Metric = 9999; // do not use as real default route
 					nr.Protocol = MIB_IPPROTO_NETMGMT;
 					DWORD result = CreateIpForwardEntry2(&nr);
 					if (result != NO_ERROR)
 						Sleep(250);
-					else
-						break;
+					else break;
 				}
 			}
 #endif
@@ -1112,31 +981,21 @@ void WindowsEthernetTap::threadMain() throw()
 				_syncIps();
 			}
 
-			memset(&tapOvlRead, 0, sizeof(tapOvlRead));
-			tapOvlRead.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-			memset(&tapOvlWrite, 0, sizeof(tapOvlWrite));
-			tapOvlWrite.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+			memset(&tapOvlRead,0,sizeof(tapOvlRead));
+			tapOvlRead.hEvent = CreateEvent(NULL,TRUE,FALSE,NULL);
+			memset(&tapOvlWrite,0,sizeof(tapOvlWrite));
+			tapOvlWrite.hEvent = CreateEvent(NULL,TRUE,FALSE,NULL);
 
 			wait4[0] = _injectSemaphore;
 			wait4[1] = tapOvlRead.hEvent;
-			wait4[2] = tapOvlWrite.hEvent;	 // only included if writeInProgress is true
+			wait4[2] = tapOvlWrite.hEvent; // only included if writeInProgress is true
 
-			ReadFile(_tap, tapReadBuf, sizeof(tapReadBuf), NULL, &tapOvlRead);
+			ReadFile(_tap,tapReadBuf,sizeof(tapReadBuf),NULL,&tapOvlRead);
 			bool writeInProgress = false;
 			ULONGLONG timeOfLastBorkCheck = GetTickCount64();
-			_initialized = true;
-			unsigned int oldmtu = _mtu;
-
-			setFriendlyName(_friendlyName.c_str());
-
 			while (_run) {
-				DWORD waitResult = WaitForMultipleObjectsEx(writeInProgress ? 3 : 2, wait4, FALSE, 2500, TRUE);
-				if (! _run)
-					break;	 // will also break outer while(_run) since _run is false
-
-				// Check for changes in MTU and break to restart tap device to reconfigure in this case
-				if (_mtu != oldmtu)
-					break;
+				DWORD waitResult = WaitForMultipleObjectsEx(writeInProgress ? 3 : 2,wait4,FALSE,2500,TRUE);
+				if (!_run) break; // will also break outer while(_run)
 
 				// Check for issues with adapter and close/reopen if any are detected. This
 				// check fixes a while boatload of Windows adapter 'coma' issues after
@@ -1148,13 +1007,7 @@ void WindowsEthernetTap::threadMain() throw()
 						timeOfLastBorkCheck = tc;
 						char aabuf[16384];
 						ULONG aalen = sizeof(aabuf);
-						if (GetAdaptersAddresses(
-								AF_UNSPEC,
-								GAA_FLAG_SKIP_UNICAST | GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME,
-								(void*)0,
-								reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf),
-								&aalen)
-							== NO_ERROR) {
+						if (GetAdaptersAddresses(AF_UNSPEC,GAA_FLAG_SKIP_UNICAST|GAA_FLAG_SKIP_ANYCAST|GAA_FLAG_SKIP_MULTICAST|GAA_FLAG_SKIP_DNS_SERVER|GAA_FLAG_SKIP_FRIENDLY_NAME,(void *)0,reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf),&aalen) == NO_ERROR) {
 							bool isBorked = false;
 
 							PIP_ADAPTER_ADDRESSES aa = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(aabuf);
@@ -1174,26 +1027,25 @@ void WindowsEthernetTap::threadMain() throw()
 					}
 				}
 
-				if ((waitResult == WAIT_TIMEOUT) || (waitResult == WAIT_FAILED)) {
-					Sleep(250);	  // guard against spinning under some conditions
+				if ((waitResult == WAIT_TIMEOUT)||(waitResult == WAIT_FAILED)) {
+					Sleep(250); // guard against spinning under some conditions
 					continue;
 				}
 
 				if (HasOverlappedIoCompleted(&tapOvlRead)) {
 					DWORD bytesRead = 0;
-					if (GetOverlappedResult(_tap, &tapOvlRead, &bytesRead, FALSE)) {
-						if ((bytesRead > 14) && (_enabled)) {
-							MAC to(tapReadBuf, 6);
-							MAC from(tapReadBuf + 6, 6);
+					if (GetOverlappedResult(_tap,&tapOvlRead,&bytesRead,FALSE)) {
+						if ((bytesRead > 14)&&(_enabled)) {
+							MAC to(tapReadBuf,6);
+							MAC from(tapReadBuf + 6,6);
 							unsigned int etherType = ((((unsigned int)tapReadBuf[12]) & 0xff) << 8) | (((unsigned int)tapReadBuf[13]) & 0xff);
 							try {
-								_handler(_arg, (void*)0, _nwid, from, to, etherType, 0, tapReadBuf + 14, bytesRead - 14);
-							}
-							catch (...) {
-							}	// handlers should not throw
+								// TODO: decode vlans
+								_handler(_arg,_nwid,from,to,etherType,0,tapReadBuf + 14,bytesRead - 14);
+							} catch ( ... ) {} // handlers should not throw
 						}
 					}
-					ReadFile(_tap, tapReadBuf, ZT_MAX_MTU + 32, NULL, &tapOvlRead);
+					ReadFile(_tap,tapReadBuf,ZT_IF_MTU + 32,NULL,&tapOvlRead);
 				}
 
 				if (writeInProgress) {
@@ -1201,15 +1053,11 @@ void WindowsEthernetTap::threadMain() throw()
 						writeInProgress = false;
 						_injectPending_m.lock();
 						_injectPending.pop();
-					}
-					else
-						continue;	// still writing, so skip code below and wait
-				}
-				else
-					_injectPending_m.lock();
+					} else continue; // still writing, so skip code below and wait
+				} else _injectPending_m.lock();
 
-				if (! _injectPending.empty()) {
-					WriteFile(_tap, _injectPending.front().data, _injectPending.front().len, NULL, &tapOvlWrite);
+				if (!_injectPending.empty()) {
+					WriteFile(_tap,_injectPending.front().first.data,_injectPending.front().second,NULL,&tapOvlWrite);
 					writeInProgress = true;
 				}
 
@@ -1225,21 +1073,18 @@ void WindowsEthernetTap::threadMain() throw()
 
 			// We will restart and re-open the tap unless _run == false
 		}
-	}
-	catch (...) {
-	}	// catch unexpected exceptions -- this should not happen but would prevent program crash or other weird issues since threads should not throw
-	CoUninitialize();
+	} catch ( ... ) {} // catch unexpected exceptions -- this should not happen but would prevent program crash or other weird issues since threads should not throw
 }
 
 NET_IFINDEX WindowsEthernetTap::_getDeviceIndex()
 {
-	MIB_IF_TABLE2* ift = (MIB_IF_TABLE2*)0;
+	MIB_IF_TABLE2 *ift = (MIB_IF_TABLE2 *)0;
 
-	if (GetIfTable2Ex(MibIfTableRaw, &ift) != NO_ERROR)
+	if (GetIfTable2Ex(MibIfTableRaw,&ift) != NO_ERROR)
 		throw std::runtime_error("GetIfTable2Ex() failed");
 
 	if (ift->NumEntries > 0) {
-		for (ULONG i = 0; i < ift->NumEntries; ++i) {
+		for(ULONG i=0;i<ift->NumEntries;++i) {
 			if (ift->Table[i].InterfaceLuid.Value == _deviceLuid.Value) {
 				NET_IFINDEX idx = ift->Table[i].InterfaceIndex;
 				FreeMibTable(ift);
@@ -1253,32 +1098,30 @@ NET_IFINDEX WindowsEthernetTap::_getDeviceIndex()
 	throw std::runtime_error("interface not found");
 }
 
-std::vector<std::string> WindowsEthernetTap::_getRegistryIPv4Value(const char* regKey)
+std::vector<std::string> WindowsEthernetTap::_getRegistryIPv4Value(const char *regKey)
 {
 	std::vector<std::string> value;
 	HKEY tcpIpInterfaces;
-	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\services\\Tcpip\\Parameters\\Interfaces", 0, KEY_READ | KEY_WRITE, &tcpIpInterfaces) == ERROR_SUCCESS) {
+	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\services\\Tcpip\\Parameters\\Interfaces",0,KEY_READ|KEY_WRITE,&tcpIpInterfaces) == ERROR_SUCCESS) {
 		char buf[16384];
 		DWORD len = sizeof(buf);
 		DWORD kt = REG_MULTI_SZ;
-		if (RegGetValueA(tcpIpInterfaces, _netCfgInstanceId.c_str(), regKey, 0, &kt, &buf, &len) == ERROR_SUCCESS) {
-			switch (kt) {
+		if (RegGetValueA(tcpIpInterfaces,_netCfgInstanceId.c_str(),regKey,0,&kt,&buf,&len) == ERROR_SUCCESS) {
+			switch(kt) {
 				case REG_SZ:
 					if (len > 0)
 						value.push_back(std::string(buf));
 					break;
 				case REG_MULTI_SZ: {
-					for (DWORD k = 0, s = 0; k < len; ++k) {
-						if (! buf[k]) {
+					for(DWORD k=0,s=0;k<len;++k) {
+						if (!buf[k]) {
 							if (s < k) {
 								value.push_back(std::string(buf + s));
 								s = k + 1;
-							}
-							else
-								break;
+							} else break;
 						}
 					}
-				} break;
+				}	break;
 			}
 		}
 		RegCloseKey(tcpIpInterfaces);
@@ -1286,21 +1129,20 @@ std::vector<std::string> WindowsEthernetTap::_getRegistryIPv4Value(const char* r
 	return value;
 }
 
-void WindowsEthernetTap::_setRegistryIPv4Value(const char* regKey, const std::vector<std::string>& value)
+void WindowsEthernetTap::_setRegistryIPv4Value(const char *regKey,const std::vector<std::string> &value)
 {
 	std::string regMulti;
-	for (std::vector<std::string>::const_iterator s(value.begin()); s != value.end(); ++s) {
+	for(std::vector<std::string>::const_iterator s(value.begin());s!=value.end();++s) {
 		regMulti.append(*s);
 		regMulti.push_back((char)0);
 	}
 	HKEY tcpIpInterfaces;
-	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\services\\Tcpip\\Parameters\\Interfaces", 0, KEY_READ | KEY_WRITE, &tcpIpInterfaces) == ERROR_SUCCESS) {
+	if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\services\\Tcpip\\Parameters\\Interfaces",0,KEY_READ|KEY_WRITE,&tcpIpInterfaces) == ERROR_SUCCESS) {
 		if (regMulti.length() > 0) {
 			regMulti.push_back((char)0);
-			RegSetKeyValueA(tcpIpInterfaces, _netCfgInstanceId.c_str(), regKey, REG_MULTI_SZ, regMulti.data(), (DWORD)regMulti.length());
-		}
-		else {
-			RegDeleteKeyValueA(tcpIpInterfaces, _netCfgInstanceId.c_str(), regKey);
+			RegSetKeyValueA(tcpIpInterfaces,_netCfgInstanceId.c_str(),regKey,REG_MULTI_SZ,regMulti.data(),(DWORD)regMulti.length());
+		} else {
+			RegDeleteKeyValueA(tcpIpInterfaces,_netCfgInstanceId.c_str(),regKey);
 		}
 		RegCloseKey(tcpIpInterfaces);
 	}
@@ -1310,32 +1152,29 @@ void WindowsEthernetTap::_syncIps()
 {
 	// assumes _assignedIps_m is locked
 
-	if (! _initialized)
+	if (!_initialized)
 		return;
 
 	std::vector<InetAddress> haveIps(ips());
 
-	for (std::vector<InetAddress>::const_iterator aip(_assignedIps.begin()); aip != _assignedIps.end(); ++aip) {
-		if (std::find(haveIps.begin(), haveIps.end(), *aip) == haveIps.end()) {
+	for(std::vector<InetAddress>::const_iterator aip(_assignedIps.begin());aip!=_assignedIps.end();++aip) {
+		if (std::find(haveIps.begin(),haveIps.end(),*aip) == haveIps.end()) {
 			MIB_UNICASTIPADDRESS_ROW ipr;
 
 			InitializeUnicastIpAddressEntry(&ipr);
 			if (aip->isV4()) {
 				ipr.Address.Ipv4.sin_family = AF_INET;
-				ipr.Address.Ipv4.sin_addr.S_un.S_addr = *((const uint32_t*)aip->rawIpData());
+				ipr.Address.Ipv4.sin_addr.S_un.S_addr = *((const uint32_t *)aip->rawIpData());
 				ipr.OnLinkPrefixLength = aip->netmaskBits();
 				if (ipr.OnLinkPrefixLength >= 32)
 					continue;
-			}
-			else if (aip->isV6()) {
+			} else if (aip->isV6()) {
 				ipr.Address.Ipv6.sin6_family = AF_INET6;
-				memcpy(ipr.Address.Ipv6.sin6_addr.u.Byte, aip->rawIpData(), 16);
+				memcpy(ipr.Address.Ipv6.sin6_addr.u.Byte,aip->rawIpData(),16);
 				ipr.OnLinkPrefixLength = aip->netmaskBits();
 				if (ipr.OnLinkPrefixLength >= 128)
 					continue;
-			}
-			else
-				continue;
+			} else continue;
 
 			ipr.PrefixOrigin = IpPrefixOriginManual;
 			ipr.SuffixOrigin = IpSuffixOriginManual;
@@ -1348,24 +1187,16 @@ void WindowsEthernetTap::_syncIps()
 			CreateUnicastIpAddressEntry(&ipr);
 		}
 
-		if (aip->isV4()) {
-			char ipbuf[64];
-			std::string ipStr(aip->toIpString(ipbuf));
-			std::vector<std::string> regIps(_getRegistryIPv4Value("IPAddress"));
-			if (std::find(regIps.begin(), regIps.end(), ipStr) == regIps.end()) {
-				std::vector<std::string> regSubnetMasks(_getRegistryIPv4Value("SubnetMask"));
-				regIps.push_back(ipStr);
-				regSubnetMasks.push_back(aip->netmask().toIpString(ipbuf));
-				_setRegistryIPv4Value("IPAddress", regIps);
-				_setRegistryIPv4Value("SubnetMask", regSubnetMasks);
-			}
+		std::string ipStr(aip->toString());
+		std::vector<std::string> regIps(_getRegistryIPv4Value("IPAddress"));
+		if (std::find(regIps.begin(),regIps.end(),ipStr) == regIps.end()) {
+			std::vector<std::string> regSubnetMasks(_getRegistryIPv4Value("SubnetMask"));
+			regIps.push_back(ipStr);
+			regSubnetMasks.push_back(aip->netmask().toIpString());
+			_setRegistryIPv4Value("IPAddress",regIps);
+			_setRegistryIPv4Value("SubnetMask",regSubnetMasks);
 		}
 	}
 }
 
-void WindowsEthernetTap::setDns(const char* domain, const std::vector<InetAddress>& servers)
-{
-	WinDNSHelper::setDNS(_nwid, domain, servers);
-}
-
-}	// namespace ZeroTier
+} // namespace ZeroTier
diff --git a/osdep/WindowsEthernetTap.hpp b/osdep/WindowsEthernetTap.hpp
index fded64bc1..547412624 100644
--- a/osdep/WindowsEthernetTap.hpp
+++ b/osdep/WindowsEthernetTap.hpp
@@ -1,37 +1,45 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_WINDOWSETHERNETTAP_HPP
 #define ZT_WINDOWSETHERNETTAP_HPP
 
-#include "../node/Constants.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/MulticastGroup.hpp"
-#include "../node/Mutex.hpp"
-#include "../osdep/Thread.hpp"
-#include "EthernetTap.hpp"
-
-#include <ifdef.h>
-#include <queue>
-#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <ifdef.h>
+
 #include <string>
+#include <queue>
+#include <stdexcept>
+
+#include "../node/Constants.hpp"
+#include "../node/Mutex.hpp"
+#include "../node/Array.hpp"
+#include "../node/MulticastGroup.hpp"
+#include "../node/InetAddress.hpp"
+#include "../osdep/Thread.hpp"
 
 namespace ZeroTier {
 
-class WindowsEthernetTap : public EthernetTap {
-  public:
+class WindowsEthernetTap
+{
+public:
 	/**
 	 * Installs a new instance of the ZT tap driver
 	 *
@@ -39,7 +47,7 @@ class WindowsEthernetTap : public EthernetTap {
 	 * @param deviceInstanceId Buffer to fill with device instance ID on success (and if SetupDiGetDeviceInstanceIdA succeeds, which it should)
 	 * @return Empty string on success, otherwise an error message
 	 */
-	static std::string addNewPersistentTapDevice(const char* pathToInf, std::string& deviceInstanceId);
+	static std::string addNewPersistentTapDevice(const char *pathToInf,std::string &deviceInstanceId);
 
 	/**
 	 * Uninstalls all persistent tap devices that have legacy drivers
@@ -56,12 +64,12 @@ class WindowsEthernetTap : public EthernetTap {
 	static std::string destroyAllPersistentTapDevices();
 
 	/**
-	 * Uninstalls a specific persistent tap device by instance ID
+	 * Uninstall a specific persistent tap device by instance ID
 	 *
 	 * @param instanceId Device instance ID
 	 * @return Empty string on success, otherwise an error message
 	 */
-	static std::string deletePersistentTapDevice(const char* instanceId);
+	static std::string deletePersistentTapDevice(const char *instanceId);
 
 	/**
 	 * Disable a persistent tap device by instance ID
@@ -70,65 +78,47 @@ class WindowsEthernetTap : public EthernetTap {
 	 * @param enabled Enable device?
 	 * @return True if device was found and disabled
 	 */
-	static bool setPersistentTapDeviceState(const char* instanceId, bool enabled);
+	static bool setPersistentTapDeviceState(const char *instanceId,bool enabled);
 
 	WindowsEthernetTap(
-		const char* hp,
-		const MAC& mac,
+		const char *hp,
+		const MAC &mac,
 		unsigned int mtu,
 		unsigned int metric,
 		uint64_t nwid,
-		const char* friendlyName,
-		void (*handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int),
-		void* arg);
+		const char *friendlyName,
+		void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
+		void *arg);
 
-	virtual ~WindowsEthernetTap();
+	~WindowsEthernetTap();
 
-	virtual void setEnabled(bool en);
-	virtual bool enabled() const;
-	virtual bool addIp(const InetAddress& ip);
-	virtual bool removeIp(const InetAddress& ip);
-	virtual std::vector<InetAddress> ips() const;
-	virtual void put(const MAC& from, const MAC& to, unsigned int etherType, const void* data, unsigned int len);
-	virtual std::string deviceName() const;
-	virtual void setFriendlyName(const char* friendlyName);
-	virtual std::string friendlyName() const;
-	virtual void scanMulticastGroups(std::vector<MulticastGroup>& added, std::vector<MulticastGroup>& removed);
-	virtual void setMtu(unsigned int mtu);
-	virtual void setDns(const char* domain, const std::vector<InetAddress>& servers);
+	void setEnabled(bool en);
+	bool enabled() const;
+	bool addIp(const InetAddress &ip);
+	bool removeIp(const InetAddress &ip);
+	std::vector<InetAddress> ips() const;
+	void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
+	std::string deviceName() const;
+	void setFriendlyName(const char *friendlyName);
+	void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
 
-	inline const NET_LUID& luid() const
-	{
-		return _deviceLuid;
-	}
-	inline const GUID& guid() const
-	{
-		return _deviceGuid;
-	}
-	inline const std::string& instanceId() const
-	{
-		return _deviceInstanceId;
-	}
-	NET_IFINDEX interfaceIndex() const;
+	inline const NET_LUID &luid() const { return _deviceLuid; }
+	inline const GUID &guid() const { return _deviceGuid; }
+	inline const std::string &instanceId() const { return _deviceInstanceId; }
 
-	void threadMain() throw();
+	void threadMain()
+		throw();
 
-	bool isInitialized() const
-	{
-		return _initialized;
-	};
-
-  private:
-	NET_IFINDEX _getDeviceIndex();	 // throws on failure
-	std::vector<std::string> _getRegistryIPv4Value(const char* regKey);
-	void _setRegistryIPv4Value(const char* regKey, const std::vector<std::string>& value);
+private:
+	NET_IFINDEX _getDeviceIndex(); // throws on failure
+	std::vector<std::string> _getRegistryIPv4Value(const char *regKey);
+	void _setRegistryIPv4Value(const char *regKey,const std::vector<std::string> &value);
 	void _syncIps();
 
-	void (*_handler)(void*, void*, uint64_t, const MAC&, const MAC&, unsigned int, unsigned int, const void*, unsigned int);
-	void* _arg;
+	void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
+	void *_arg;
 	MAC _mac;
 	uint64_t _nwid;
-	volatile unsigned int _mtu;
 	Thread _thread;
 
 	volatile HANDLE _tap;
@@ -138,20 +128,13 @@ class WindowsEthernetTap : public EthernetTap {
 	NET_LUID _deviceLuid;
 	std::string _netCfgInstanceId;
 	std::string _deviceInstanceId;
-	std::string _mySubkeyName;
-	std::string _friendlyName;
-	Mutex _friendlyName_m;
 
-	std::vector<InetAddress> _assignedIps;	 // IPs assigned with addIp
+	std::vector<InetAddress> _assignedIps; // IPs assigned with addIp
 	Mutex _assignedIps_m;
 
 	std::vector<MulticastGroup> _multicastGroups;
 
-	struct _InjectPending {
-		unsigned int len;
-		char data[ZT_MAX_MTU + 32];
-	};
-	std::queue<_InjectPending> _injectPending;
+	std::queue< std::pair< Array<char,ZT_IF_MTU + 32>,unsigned int > > _injectPending;
 	Mutex _injectPending_m;
 
 	std::string _pathToHelpers;
@@ -159,11 +142,8 @@ class WindowsEthernetTap : public EthernetTap {
 	volatile bool _run;
 	volatile bool _initialized;
 	volatile bool _enabled;
-
-	mutable std::vector<InetAddress> _ifaddrs;
-	mutable uint64_t _lastIfAddrsUpdate;
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/osdep/freebsd_getifmaddrs.c b/osdep/freebsd_getifmaddrs.c
deleted file mode 100644
index 8b1741466..000000000
--- a/osdep/freebsd_getifmaddrs.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-	this BSD licensed code is from https://github.com/freebsd/freebsd/blob/386ddae58459341ec567604707805814a2128a57/lib/libc/net/getifmaddrs.c
-	as in older OS X there is no getifmaddrs() and related functions is NetBSD
-*/
-
-#define	NET_RT_IFMALIST	4		/* return multicast address list */
-#define	RTM_NEWMADDR	0xf    /* mcast group membership being added to if */
-
-
-/*
- * Copyright (c) 2003 Bruce M. Simpson.
- * All rights reserved
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-/*
-__FBSDID("$FreeBSD$");
-
-#include "namespace.h"*/
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <errno.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-//#include "un-namespace.h"
-
-#define	SALIGN	(sizeof(long) - 1)
-#define	SA_RLEN(sa)	((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : \
-			    (SALIGN + 1))
-#define	MAX_SYSCTL_TRY	5
-#define	RTA_MASKS	(RTA_GATEWAY | RTA_IFP | RTA_IFA)
-
-int
-getifmaddrs(struct ifmaddrs **pif)
-{
-	int icnt = 1;
-	int dcnt = 0;
-	int ntry = 0;
-	size_t len;
-	size_t needed;
-	int mib[6];
-	int i;
-	char *buf;
-	char *data;
-	char *next;
-	char *p;
-	struct ifma_msghdr *ifmam;
-	struct ifmaddrs *ifa, *ift;
-	struct rt_msghdr *rtm;
-	struct sockaddr *sa;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;             /* protocol */
-	mib[3] = 0;             /* wildcard address family */
-	mib[4] = NET_RT_IFMALIST;
-	mib[5] = 0;             /* no flags */
-	do {
-		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-			return (-1);
-		if ((buf = malloc(needed)) == NULL)
-			return (-1);
-		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
-				free(buf);
-				return (-1);
-			}
-			free(buf);
-			buf = NULL;
-		}
-	} while (buf == NULL);
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_NEWMADDR:
-			ifmam = (struct ifma_msghdr *)(void *)rtm;
-			if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
-				break;
-			icnt++;
-			p = (char *)(ifmam + 1);
-			for (i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifmam->ifmam_addrs &
-				    (1 << i)) == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				dcnt += len;
-				p += len;
-			}
-			break;
-		}
-	}
-
-	data = malloc(sizeof(struct ifmaddrs) * icnt + dcnt);
-	if (data == NULL) {
-		free(buf);
-		return (-1);
-	}
-
-	ifa = (struct ifmaddrs *)(void *)data;
-	data += sizeof(struct ifmaddrs) * icnt;
-
-	memset(ifa, 0, sizeof(struct ifmaddrs) * icnt);
-	ift = ifa;
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-
-		switch (rtm->rtm_type) {
-		case RTM_NEWMADDR:
-			ifmam = (struct ifma_msghdr *)(void *)rtm;
-			if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
-				break;
-
-			p = (char *)(ifmam + 1);
-			for (i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifmam->ifmam_addrs &
-				    (1 << i)) == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				switch (i) {
-				case RTAX_GATEWAY:
-					ift->ifma_lladdr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_IFP:
-					ift->ifma_name =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_IFA:
-					ift->ifma_addr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				default:
-					data += len;
-					break;
-				}
-				p += len;
-			}
-			ift->ifma_next = ift + 1;
-			ift = ift->ifma_next;
-			break;
-		}
-	}
-
-	free(buf);
-
-	if (ift > ifa) {
-		ift--;
-		ift->ifma_next = NULL;
-		*pif = ifa;
-	} else {
-		*pif = NULL;
-		free(ifa);
-	}
-	return (0);
-}
-
-void
-freeifmaddrs(struct ifmaddrs *ifmp)
-{
-
-	free(ifmp);
-}
diff --git a/osdep/freebsd_getifmaddrs.h b/osdep/freebsd_getifmaddrs.h
deleted file mode 100644
index 963c422d3..000000000
--- a/osdep/freebsd_getifmaddrs.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	this BSD code is from https://github.com/freebsd/freebsd/blob/386ddae58459341ec567604707805814a2128a57/include/ifaddrs.h
-	as in older OS X there is no getifmaddrs() and related functions is NetBSD
-*/
-
-/*	$FreeBSD$	*/
-
-/*
- * Copyright (c) 1995, 1999
- *	Berkeley Software Design, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI ifaddrs.h,v 2.5 2000/02/23 14:51:59 dab Exp
- */
-
-#ifndef	_freebsd_getifmaddrs.h_
-#define	_freebsd_getifmaddrs.h_
-
-/*
- * This may have been defined in <net/if.h>.  Note that if <net/if.h> is
- * to be included it must be included before this header file.
- */
-#ifndef	ifa_broadaddr
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-#endif
-
-struct ifmaddrs {
-	struct ifmaddrs	*ifma_next;
-	struct sockaddr	*ifma_name;
-	struct sockaddr	*ifma_addr;
-	struct sockaddr	*ifma_lladdr;
-};
-
-#include <sys/cdefs.h>
-
-
-/*
- * Message format for use in obtaining information about multicast addresses
- * from the routing socket.
- */
-struct ifma_msghdr {
-	int	ifmam_msglen;	/* to skip over non-understood messages */
-	int	ifmam_version;	/* future binary compatibility */
-	int	ifmam_type;     /* message type */
-	int	ifmam_addrs;	/* like rtm_addrs */
-	int	ifmam_flags;	/* value of ifa_flags */
-	int	ifmam_index;	/* index for associated ifp */
-};
-
-
-extern int getifaddrs(struct ifaddrs **);
-extern void freeifaddrs(struct ifaddrs *);
-extern int getifmaddrs(struct ifmaddrs **);
-extern void freeifmaddrs(struct ifmaddrs *);
-#include "freebsd_getifmaddrs.c"
-
-
-#endif
diff --git a/pkg/README.md b/pkg/README.md
deleted file mode 100644
index 0bd8ef00b..000000000
--- a/pkg/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Third-party packaging
-=====
-
-For package documentation see the `Devices` section here: [docs.zerotier.com](https://docs.zerotier.com/)
diff --git a/pkg/asustor/Dockerfile b/pkg/asustor/Dockerfile
deleted file mode 100644
index 4d304c9c0..000000000
--- a/pkg/asustor/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# vim: ft=dockerfile
-
-FROM ubuntu:20.04
-
-RUN apt-get update -qq && apt-get install python2.7 -y
-
-COPY apkg-tools.py /apkg-tools.py
-
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/pkg/asustor/build.sh b/pkg/asustor/build.sh
deleted file mode 100755
index 8e6be5139..000000000
--- a/pkg/asustor/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-build_packages()
-{
-  sudo docker run -v $(pwd):/zto ztasustor
-}
-
-build_container()
-{
-  sudo docker build -t ztasustor . --load
-}
-
-"$@"
diff --git a/pkg/asustor/entrypoint.sh b/pkg/asustor/entrypoint.sh
deleted file mode 100755
index 97ab15017..000000000
--- a/pkg/asustor/entrypoint.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-ZTO_VER=$(git describe --abbrev=0 --tags)
-ZTO_COMMIT=$(git rev-parse HEAD)
-ZTO_DESC=$(jq -r '.desc' ../config.json)
-
-# Clean up any pre-existing packages
-find pkg/asustor -type f -name "*.apk" -exec rm -rvf {} \;
-# Copy current license
-cp ../../LICENSE.txt zerotier/control/license.txt
-# Configure package data
-tmp="config-tmp.json"
-jq --arg a "$ZTO_VER" '.general.version = $a' pkg/asustor/zerotier/CONTROL/config.json > $tmp && mv $tmp pkg/asustor/zerotier/CONTROL/config.json
-echo $ZTO_DESC > pkg/asustor/zerotier/CONTROL/description.txt
-
-# Copy binaries into pkg directory
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-aarch64 pkg/asustor/zerotier/bin/zerotier-one.aarch64
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-i386 pkg/asustor/zerotier/bin/zerotier-one.i386
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-x86_64 pkg/asustor/zerotier/bin/zerotier-one.x86-64
-
-# Package
-python pkg/asustor/apkg-tools.py create pkg/asustor/zerotier
-rm -rf output/asustor
-mkdir -p output/asustor
-mv ./*.apk output/asustor
-
-# Show output product
-cat pkg/asustor/zerotier/CONTROL/config.json
-tree output/asustor
diff --git a/pkg/asustor/zerotier/CONTROL/config.json b/pkg/asustor/zerotier/CONTROL/config.json
deleted file mode 100644
index ec3bd67ac..000000000
--- a/pkg/asustor/zerotier/CONTROL/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "general": {
-    "package": "zerotier",
-    "name": "ZeroTier",
-    "version": "1.8.6",
-    "depends": [],
-    "conflicts": [],
-    "developer": "ZeroTier, Inc.",
-    "maintainer": "ZeroTier, Inc.",
-    "email": "support@zerotier.com",
-    "website": "http://www.zerotier.com/",
-    "architecture": "any",
-    "firmware": "2.1.0"
-  }
-}
diff --git a/pkg/asustor/zerotier/CONTROL/description.txt b/pkg/asustor/zerotier/CONTROL/description.txt
deleted file mode 100644
index 95d6b8540..000000000
--- a/pkg/asustor/zerotier/CONTROL/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Securely connect any device, anywhere.
diff --git a/pkg/asustor/zerotier/CONTROL/icon.png b/pkg/asustor/zerotier/CONTROL/icon.png
deleted file mode 100644
index b32d3230f..000000000
Binary files a/pkg/asustor/zerotier/CONTROL/icon.png and /dev/null differ
diff --git a/pkg/asustor/zerotier/CONTROL/license.txt b/pkg/asustor/zerotier/CONTROL/license.txt
deleted file mode 100644
index 06a3fad64..000000000
--- a/pkg/asustor/zerotier/CONTROL/license.txt
+++ /dev/null
@@ -1,149 +0,0 @@
------------------------------------------------------------------------------
-
-Business Source License 1.1
-
-License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
-"Business Source License" is a trademark of MariaDB Corporation Ab.
-
------------------------------------------------------------------------------
-
-Parameters
-
-Licensor:             ZeroTier, Inc.
-Licensed Work:        ZeroTier Network Virtualization Engine 1.4.4
-                      The Licensed Work is (c)2019 ZeroTier, Inc.
-Additional Use Grant: You may make use of the Licensed Work, provided you
-                      do not use it in any of the following ways:
-
-                      * Sell hosted ZeroTier services as a "SaaS" Product
-
-                      (1) Operate or sell access to ZeroTier root servers,
-                      network controllers, or authorization key or certificate
-                      generation components of the Licensed Work as a
-                      for-profit service, regardless of whether the use of
-                      these components is sold alone or is bundled with other
-                      services. Note that this does not apply to the use of
-                      ZeroTier behind the scenes to operate a service not
-                      related to ZeroTier network administration.
-
-                      * Create Non-Open-Source Commercial Derivative Works
-
-                      (2) Link or directly include the Licensed Work in a
-                      commercial or for-profit application or other product
-                      not distributed under an Open Source Initiative (OSI)
-                      compliant license. See: https://opensource.org/licenses
-
-                      (3) Remove the name, logo, copyright, or other branding
-                      material from the Licensed Work to create a "rebranded"
-                      or "white labeled" version to distribute as part of
-                      any commercial or for-profit product or service.
-
-                      * Certain Government Uses
-
-                      (4) Use or deploy the Licensed Work in a government
-                      setting in support of any active government function
-                      or operation with the exception of the following:
-                      physical or mental health care, family and social
-                      services, social welfare, senior care, child care, and
-                      the care of persons with disabilities.
-
-Change Date:          2026-01-01
-
-Change License:       Apache License version 2.0 as published by the Apache
-                      Software Foundation
-											https://www.apache.org/licenses/
-
-Alternative Licensing
-
-If you would like to use the Licensed Work in any way that conflicts with
-the stipulations of the Additional Use Grant, contact ZeroTier, Inc. to
-obtain an alternative commercial license.
-
-Visit us on the web at: https://www.zerotier.com/
-
-Notice
-
-The Business Source License (this document, or the "License") is not an Open
-Source license. However, the Licensed Work will eventually be made available
-under an Open Source License, as stated in this License.
-
-For more information on the use of the Business Source License for ZeroTier
-products, please visit our pricing page which contains license details and
-and license FAQ: https://zerotier.com/pricing
-
-For more information on the use of the Business Source License generally,
-please visit the Adopting and Developing Business Source License FAQ at
-https://mariadb.com/bsl-faq-adopting.
-
------------------------------------------------------------------------------
-
-Business Source License 1.1
-
-Terms
-
-The Licensor hereby grants you the right to copy, modify, create derivative
-works, redistribute, and make non-production use of the Licensed Work. The
-Licensor may make an Additional Use Grant, above, permitting limited
-production use.
-
-Effective on the Change Date, or the fourth anniversary of the first publicly
-available distribution of a specific version of the Licensed Work under this
-License, whichever comes first, the Licensor hereby grants you rights under
-the terms of the Change License, and the rights granted in the paragraph
-above terminate.
-
-If your use of the Licensed Work does not comply with the requirements
-currently in effect as described in this License, you must purchase a
-commercial license from the Licensor, its affiliated entities, or authorized
-resellers, or you must refrain from using the Licensed Work.
-
-All copies of the original and modified Licensed Work, and derivative works
-of the Licensed Work, are subject to this License. This License applies
-separately for each version of the Licensed Work and the Change Date may vary
-for each version of the Licensed Work released by Licensor.
-
-You must conspicuously display this License on each original or modified copy
-of the Licensed Work. If you receive the Licensed Work in original or
-modified form from a third party, the terms and conditions set forth in this
-License apply to your use of that work.
-
-Any use of the Licensed Work in violation of this License will automatically
-terminate your rights under this License for the current and all other
-versions of the Licensed Work.
-
-This License does not grant you any right in any trademark or logo of
-Licensor or its affiliates (provided that you may use a trademark or logo of
-Licensor as expressly required by this License).
-
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
-AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
-EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
-TITLE.
-
------------------------------------------------------------------------------
-
-MariaDB hereby grants you permission to use this License’s text to license
-your works, and to refer to it using the trademark "Business Source License",
-as long as you comply with the Covenants of Licensor below.
-
-Covenants of Licensor
-
-In consideration of the right to use this License’s text and the "Business
-Source License" name and trademark, Licensor covenants to MariaDB, and to all
-other recipients of the licensed work to be provided by Licensor:
-
-1. To specify as the Change License the GPL Version 2.0 or any later version,
-   or a license that is compatible with GPL Version 2.0 or a later version,
-   where "compatible" means that software provided under the Change License can
-   be included in a program with software provided under GPL Version 2.0 or a
-   later version. Licensor may specify additional Change Licenses without
-   limitation.
-
-2. To either: (a) specify an additional grant of rights to use that does not
-   impose any additional restriction on the right granted in this License, as
-   the Additional Use Grant; or (b) insert the text "None".
-
-3. To specify a Change Date.
-
-4. Not to modify this License in any other way.
diff --git a/pkg/asustor/zerotier/CONTROL/post-install.sh b/pkg/asustor/zerotier/CONTROL/post-install.sh
deleted file mode 100755
index d38a90e00..000000000
--- a/pkg/asustor/zerotier/CONTROL/post-install.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-APKG_PKG_DIR=/usr/local/AppCentral/zerotier
-
-case "$APKG_PKG_STATUS" in
-
-	install)
-		modprobe tun
-		mkdir -p /usr/local/bin
-		mv ${APKG_PKG_DIR}/bin/zerotier-one.${AS_NAS_ARCH} ${APKG_PKG_DIR}/bin/zerotier-one
-		ln -s ${APKG_PKG_DIR}/bin/zerotier-one /usr/local/bin/zerotier-cli
-		ln -s ${APKG_PKG_DIR}/bin/zerotier-one /usr/local/bin/zerotier-idtool
-		ln -s $APKG_PKG_DIR/data /var/lib/zerotier-one
-		;;
-	upgrade)
-		# post upgrade script here (restore data)
-		# cp -af $APKG_TEMP_DIR/* $APKG_PKG_DIR/etc/.
-		;;
-	*)
-		;;
-
-esac
-
-exit 0
diff --git a/pkg/asustor/zerotier/CONTROL/post-uninstall.sh b/pkg/asustor/zerotier/CONTROL/post-uninstall.sh
deleted file mode 100755
index 89283643a..000000000
--- a/pkg/asustor/zerotier/CONTROL/post-uninstall.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rm -rf /var/lib/zerotier-one/
diff --git a/pkg/asustor/zerotier/CONTROL/pre-uninstall.sh b/pkg/asustor/zerotier/CONTROL/pre-uninstall.sh
deleted file mode 100755
index e69de29bb..000000000
diff --git a/pkg/asustor/zerotier/CONTROL/start-stop.sh b/pkg/asustor/zerotier/CONTROL/start-stop.sh
deleted file mode 100755
index aead7684f..000000000
--- a/pkg/asustor/zerotier/CONTROL/start-stop.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. /etc/script/lib/command.sh
-
-APKG_PKG_DIR=/usr/local/AppCentral/zerotier
-
-case $1 in
-
-	start)
-		modprobe tun
-		# start script here
-		$APKG_PKG_DIR/bin/zerotier-one $APKG_PKG_DIR/data -d
-		;;
-
-	stop)
-		# stop script here
-		pkill zerotier
-		;;
-
-	*)
-		echo "usage: $0 {start|stop}"
-		exit 1
-		;;
-esac
-
-exit 0
diff --git a/pkg/asustor/zerotier/apkg-version b/pkg/asustor/zerotier/apkg-version
deleted file mode 100644
index cd5ac039d..000000000
--- a/pkg/asustor/zerotier/apkg-version
+++ /dev/null
@@ -1 +0,0 @@
-2.0
diff --git a/pkg/asustor/zerotier/www/index.html b/pkg/asustor/zerotier/www/index.html
deleted file mode 100644
index 7e166257b..000000000
--- a/pkg/asustor/zerotier/www/index.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="header">
-  <h2 id="zerotier">ZeroTier</h2>
-</div>
-
-<p>Welcome! ZeroTier is a peer-to-peer encrypted virtual networking solution that enables you to create Local Area Networks with static IP assignments for all of your devices. Access your NAS from anywhere in the world with a single IP and without the need of cloud services backhauling your traffic. To use the CLI:</p>
-<h2 id="using-the-cli-via-ssh-">Using the CLI via SSH:</h2>
-<ol>
-<li><p>Using your (admin) account, enable SSH:</p>
-<ul>
-<li><strong><code>Services</code></strong> -&gt; <strong><code>Terminal</code></strong> -&gt; <strong><code>Enable SSH</code></strong> (set to port <code>22</code>)</li>
-</ul>
-</li>
-<li><p>From a computer, open a terminal and SSH into your NAS device:</p>
-<ul>
-<li><strong><code>ssh admin@your_nas_device_lan_ip</code></strong></li>
-</ul>
-</li>
-<li><p>Create account and network ID at <a href="https://my.zerotier.com">my.zerotier.com</a></p>
-<ul>
-<li><em>Note: This account is merely to administer your network. Your traffic is not handled by ZeroTier except in the case where a direct connection cannot be established. This is a courtesy service we offer for free that you can disable if you&#39;d like. In any case, your traffic is <a href="https://www.zerotier.com/manual/#2_1_3">fully encrypted</a> end-to-end.</em></li>
-</ul>
-</li>
-<li><p>Join your device to the network:</p>
-<ul>
-<li><strong><code>zerotier-cli join your_network_id</code></strong></li>
-</ul>
-</li>
-<li><p>Use <a href="https://my.zerotier.com">my.zerotier.com</a> to authorize your NAS device to join your network.</p>
-</li>
-</ol>
-<h2 id="help-and-support-in-order-of-relevance-">Help and support (in order of relevance)</h2>
-<ul>
-<li>Github Repository: <a href="https://github.com/zerotier/ZeroTierNAS/issues">https://github.com/zerotier/ZeroTierNAS</a></li>
-<li>Forums: <a href="https://discuss.zerotier.com">https://discuss.zerotier.com</a></li>
-<li>Contact: <a href="mailto:support@zerotier.com">support@zerotier.com</a></li>
-</ul>
-
-<div class="footer">
-  <h2 id="zerotier"><h2>
-</div>
-
-<style>
-.header {
-  padding: 1px;
-  text-align: center;
-  background: #F2B464;
-  color: black;
-  font-size: 30px;
-}
-
-.footer {
-  padding: 1px;
-  text-align: center;
-  background: #F2B464;
-  color: black;
-  font-size: 30px;
-}
-</style>
diff --git a/pkg/config.json b/pkg/config.json
deleted file mode 100644
index 33cf05e15..000000000
--- a/pkg/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"version": "1.8.7",
-	"rev": "1",
-	"desc": "Securely connect any device, anywhere.",
-	"email": "support@zerotier.com"
-}
diff --git a/pkg/qnap/Dockerfile b/pkg/qnap/Dockerfile
deleted file mode 100644
index 3deb161cb..000000000
--- a/pkg/qnap/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim: ft=dockerfile
-
-FROM ubuntu:20.04
-
-# COPY zerotier/qbuild /qbuild
-
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/pkg/qnap/build.sh b/pkg/qnap/build.sh
deleted file mode 100755
index 6d4f4d0b5..000000000
--- a/pkg/qnap/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-build_packages()
-{
-  sudo docker run -v $(pwd):/zto ztqnap
-}
-
-build_container()
-{
-  sudo docker build -t ztqnap . --load
-}
-
-"$@"
diff --git a/pkg/qnap/entrypoint.sh b/pkg/qnap/entrypoint.sh
deleted file mode 100755
index d236a5429..000000000
--- a/pkg/qnap/entrypoint.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-ZTO_VER=$(git describe --abbrev=0 --tags)
-ZTO_COMMIT=$(git rev-parse HEAD)
-ZTO_DESC=$(jq -r '.desc' ../config.json)
-
-mkdir -p pkg/qnap/zerotier/arm_64
-mkdir -p pkg/qnap/zerotier/arm_x09
-mkdir -p pkg/qnap/zerotier/arm_x10
-mkdir -p pkg/qnap/zerotier/arm_x12
-mkdir -p pkg/qnap/zerotier/arm_x19
-mkdir -p pkg/qnap/zerotier/arm_x31
-mkdir -p pkg/qnap/zerotier/arm_x41
-mkdir -p pkg/qnap/zerotier/x86_64
-mkdir -p pkg/qnap/zerotier/x86
-mkdir -p pkg/qnap/zerotier/x86_ce53xx
-
-cat > pkg/qnap/zerotier/qpkg.cfg <<- EOM
-# Update package config
-# Name of the packaged application.
-QPKG_NAME="zerotier"
-# Name of the display application.
-QPKG_DISPLAY_NAME="ZeroTier"
-# Version of the packaged application.
-QPKG_VER="$ZTO_VER"
-# Author or maintainer of the package
-QPKG_AUTHOR="ZeroTier, Inc."
-# License for the packaged application
-QPKG_LICENSE="BUSL-1.1"
-# One-line description of the packaged application
-QPKG_SUMMARY="$ZTO_DESC"
-
-# Preferred number in start/stop sequence.
-QPKG_RC_NUM="101"
-# Init-script used to control the start and stop of the installed application.
-QPKG_SERVICE_PROGRAM="zerotier.sh"
-
-# Specifies any packages required for the current package to operate.
-QPKG_REQUIRE="QVPN Service"
-# Specifies what packages cannot be installed if the current package
-# is to operate properly.
-#QPKG_CONFLICT="Python, OPT/sed"
-# Name of configuration file (multiple definitions are allowed).
-#QPKG_CONFIG="myApp.conf"
-#QPKG_CONFIG="/etc/config/myApp.conf"
-# Port number used by service program.
-QPKG_SERVICE_PORT="9993"
-
-# Minimum QTS version requirement
-QTS_MINI_VERSION="4.1.0"
-# Maximum QTS version requirement
-QTS_MAX_VERSION="5.0.0"
-
-# Location of icons for the packaged application.
-QDK_DATA_DIR_ICONS="icons"
-EOM
-
-# Copy binaries into pkg directory
-# See: https://github.com/qnap-dev/QDK
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-aarch64 pkg/qnap/zerotier/arm_64/zerotier-one
-#cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-armv5tejl pkg/qnap/zerotier/arm-x09/zerotier-one
-#cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-armv5tel pkg/qnap/zerotier/arm-x19/zerotier-one
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-armhf pkg/qnap/zerotier/arm-x31/zerotier-one
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-armhf pkg/qnap/zerotier/arm-x41/zerotier-one
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-i386 pkg/qnap/zerotier/x86/zerotier-one
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-x86_64 pkg/qnap/zerotier/x86_64/zerotier-one
-cp -vf output/static/zerotier-one.${ZTO_VER}.alpine-i386 pkg/qnap/zerotier/x86_ce53xx/zerotier-one
-
-rm -rf output/qnap/*
-
-pushd pkg/qnap/zerotier
-./qbuild #--build-arch arm-x31
-cp -f build/* ../../../output/qnap
-
-# Show output product
-cd popd
diff --git a/pkg/qnap/qdk.conf b/pkg/qnap/qdk.conf
deleted file mode 100644
index 90942b431..000000000
--- a/pkg/qnap/qdk.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-QDK_VERSION=2.3.11
-QDK_PATH_P=`pwd | awk 'BEGIN { FS = "QDK" } ; { print $1 }'`
-QDK_PATH="${QDK_PATH_P}/QDK"
diff --git a/pkg/qnap/zerotier/Makefile b/pkg/qnap/zerotier/Makefile
deleted file mode 100644
index caea3915f..000000000
--- a/pkg/qnap/zerotier/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-.PHONY: all
-
-all:
-	@$(CC) -o qpkg_encrypt qpkg_encrypt.c
-
-clean:
-	rm -rf /bin/qpkg_encrypt
diff --git a/pkg/qnap/zerotier/arm_64/.gitkeep b/pkg/qnap/zerotier/arm_64/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/arm_x09/.gitkeep b/pkg/qnap/zerotier/arm_x09/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/arm_x10/.gitkeep b/pkg/qnap/zerotier/arm_x10/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/arm_x12/.gitkeep b/pkg/qnap/zerotier/arm_x12/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/arm_x19/.gitkeep b/pkg/qnap/zerotier/arm_x19/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/arm_x31/.gitkeep b/pkg/qnap/zerotier/arm_x31/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/arm_x41/.gitkeep b/pkg/qnap/zerotier/arm_x41/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/config/.gitkeep b/pkg/qnap/zerotier/config/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/icons/.gitkeep b/pkg/qnap/zerotier/icons/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/icons/ZeroTier.gif b/pkg/qnap/zerotier/icons/ZeroTier.gif
deleted file mode 100644
index db1b190c4..000000000
Binary files a/pkg/qnap/zerotier/icons/ZeroTier.gif and /dev/null differ
diff --git a/pkg/qnap/zerotier/icons/ZeroTier_80.gif b/pkg/qnap/zerotier/icons/ZeroTier_80.gif
deleted file mode 100644
index db1b190c4..000000000
Binary files a/pkg/qnap/zerotier/icons/ZeroTier_80.gif and /dev/null differ
diff --git a/pkg/qnap/zerotier/icons/ZeroTier_gray.gif b/pkg/qnap/zerotier/icons/ZeroTier_gray.gif
deleted file mode 100644
index a04faa18e..000000000
Binary files a/pkg/qnap/zerotier/icons/ZeroTier_gray.gif and /dev/null differ
diff --git a/pkg/qnap/zerotier/package_routines b/pkg/qnap/zerotier/package_routines
deleted file mode 100644
index e80c71458..000000000
--- a/pkg/qnap/zerotier/package_routines
+++ /dev/null
@@ -1,158 +0,0 @@
-######################################################################
-# List of available definitions (it's not necessary to uncomment them)
-######################################################################
-###### Command definitions #####
-#CMD_AWK="/bin/awk"
-#CMD_CAT="/bin/cat"
-#CMD_CHMOD="/bin/chmod"
-#CMD_CHOWN="/bin/chown"
-#CMD_CP="/bin/cp"
-#CMD_CUT="/bin/cut"
-#CMD_DATE="/bin/date"
-#CMD_ECHO="/bin/echo"
-#CMD_EXPR="/usr/bin/expr"
-#CMD_FIND="/usr/bin/find"
-#CMD_GETCFG="/sbin/getcfg"
-#CMD_GREP="/bin/grep"
-#CMD_GZIP="/bin/gzip"
-#CMD_HOSTNAME="/bin/hostname"
-#CMD_LN="/bin/ln"
-#CMD_LOG_TOOL="/sbin/log_tool"
-#CMD_MD5SUM="/bin/md5sum"
-#CMD_MKDIR="/bin/mkdir"
-#CMD_MV="/bin/mv"
-#CMD_RM="/bin/rm"
-#CMD_RMDIR="/bin/rmdir"
-#CMD_SED="/bin/sed"
-#CMD_SETCFG="/sbin/setcfg"
-#CMD_SLEEP="/bin/sleep"
-#CMD_SORT="/usr/bin/sort"
-#CMD_SYNC="/bin/sync"
-#CMD_TAR="/bin/tar"
-#CMD_TOUCH="/bin/touch"
-#CMD_WGET="/usr/bin/wget"
-#CMD_WLOG="/sbin/write_log"
-#CMD_XARGS="/usr/bin/xargs"
-#CMD_7Z="/usr/local/sbin/7z"
-#
-###### System definitions #####
-#SYS_EXTRACT_DIR="$(pwd)"
-#SYS_CONFIG_DIR="/etc/config"
-#SYS_INIT_DIR="/etc/init.d"
-#SYS_STARTUP_DIR="/etc/rcS.d"
-#SYS_SHUTDOWN_DIR="/etc/rcK.d"
-#SYS_RSS_IMG_DIR="/home/httpd/RSS/images"
-#SYS_QPKG_DATA_FILE_GZIP="./data.tar.gz"
-#SYS_QPKG_DATA_FILE_BZIP2="./data.tar.bz2"
-#SYS_QPKG_DATA_FILE_7ZIP="./data.tar.7z"
-#SYS_QPKG_DATA_CONFIG_FILE="./conf.tar.gz"
-#SYS_QPKG_DATA_MD5SUM_FILE="./md5sum"
-#SYS_QPKG_DATA_PACKAGES_FILE="./Packages.gz"
-#SYS_QPKG_CONFIG_FILE="$SYS_CONFIG_DIR/qpkg.conf"
-#SYS_QPKG_CONF_FIELD_QPKGFILE="QPKG_File"
-#SYS_QPKG_CONF_FIELD_NAME="Name"
-#SYS_QPKG_CONF_FIELD_VERSION="Version"
-#SYS_QPKG_CONF_FIELD_ENABLE="Enable"
-#SYS_QPKG_CONF_FIELD_DATE="Date"
-#SYS_QPKG_CONF_FIELD_SHELL="Shell"
-#SYS_QPKG_CONF_FIELD_INSTALL_PATH="Install_Path"
-#SYS_QPKG_CONF_FIELD_CONFIG_PATH="Config_Path"
-#SYS_QPKG_CONF_FIELD_WEBUI="WebUI"
-#SYS_QPKG_CONF_FIELD_WEBPORT="Web_Port"
-#SYS_QPKG_CONF_FIELD_SERVICEPORT="Service_Port"
-#SYS_QPKG_CONF_FIELD_SERVICE_PIDFILE="Pid_File"
-#SYS_QPKG_CONF_FIELD_AUTHOR="Author"
-#SYS_QPKG_CONF_FIELD_RC_NUMBER="RC_Number"
-## The following variables are assigned values at run-time.
-#SYS_HOSTNAME=$($CMD_HOSTNAME)
-## Data file name (one of SYS_QPKG_DATA_FILE_GZIP, SYS_QPKG_DATA_FILE_BZIP2,
-## or SYS_QPKG_DATA_FILE_7ZIP)
-#SYS_QPKG_DATA_FILE=
-## Base location.
-#SYS_QPKG_BASE=""
-## Base location of QPKG installed packages.
-#SYS_QPKG_INSTALL_PATH=""
-## Location of installed software.
-#SYS_QPKG_DIR=""
-## If the QPKG should be enabled or disabled after the installation/upgrade.
-#SYS_QPKG_SERVICE_ENABLED=""
-## Architecture of the device the QPKG is installed on.
-#SYS_CPU_ARCH=""
-## Name and location of system shares
-#SYS_PUBLIC_SHARE=""
-#SYS_PUBLIC_PATH=""
-#SYS_DOWNLOAD_SHARE=""
-#SYS_DOWNLOAD_PATH=""
-#SYS_MULTIMEDIA_SHARE=""
-#SYS_MULTIMEDIA_PATH=""
-#SYS_RECORDINGS_SHARE=""
-#SYS_RECORDINGS_PATH=""
-#SYS_USB_SHARE=""
-#SYS_USB_PATH=""
-#SYS_WEB_SHARE=""
-#SYS_WEB_PATH=""
-## Path to ipkg or opkg package tool if installed.
-#CMD_PKG_TOOL=
-#
-
-######################################################################
-# All package specific functions shall call 'err_log MSG' if an error
-# is detected that shall terminate the installation.
-######################################################################
-
-######################################################################
-# Define any package specific operations that shall be performed when
-# the package is removed.
-######################################################################
-
-#PKG_PRE_REMOVE="{
-#}"
-
-PKG_MAIN_REMOVE="{
-	rm -rf /usr/sbin/zerotier-cli
-	# all identity files are stored in the Install_Path and will be removed automatically
-}"
-
-#PKG_POST_REMOVE="{
-#}"
-
-######################################################################
-# Define any package specific initialization that shall be performed
-# before the package is installed.
-######################################################################
-
-pkg_init()
-{
-	modprobe tun
-}
-
-
-######################################################################
-# Define any package specific requirement checks that shall be
-# performed before the package is installed.
-######################################################################
-
-#pkg_check_requirement()
-#{
-#}
-
-######################################################################
-# Define any package specific operations that shall be performed when
-# the package is installed.
-######################################################################
-
-#pkg_pre_install()
-#{
-#	log "pkg_pre_install"
-#}
-
-#pkg_install()
-#{
-#	log "pkg_install"
-#}
-
-pkg_post_install()
-{
-	log $SYS_QPKG_INSTALL_PATH
-	modprobe tun
-}
diff --git a/pkg/qnap/zerotier/qpkg.cfg b/pkg/qnap/zerotier/qpkg.cfg
deleted file mode 100644
index ed641da90..000000000
--- a/pkg/qnap/zerotier/qpkg.cfg
+++ /dev/null
@@ -1,99 +0,0 @@
-# Update package config
-# Name of the packaged application.
-QPKG_NAME="zerotier"
-# Name of the display application.
-QPKG_DISPLAY_NAME="ZeroTier"
-# Version of the packaged application.
-QPKG_VER="1.8.4"
-# Author or maintainer of the package
-QPKG_AUTHOR="ZeroTier, Inc."
-# License for the packaged application
-QPKG_LICENSE="BUSL-1.1"
-# One-line description of the packaged application
-QPKG_SUMMARY="Securely connect any device, anywhere."
-
-# Preferred number in start/stop sequence.
-QPKG_RC_NUM="101"
-# Init-script used to control the start and stop of the installed application.
-QPKG_SERVICE_PROGRAM="zerotier.sh"
-
-# Specifies any packages required for the current package to operate.
-QPKG_REQUIRE="QVPN Service"
-# Specifies what packages cannot be installed if the current package
-# is to operate properly.
-#QPKG_CONFLICT="Python, OPT/sed"
-# Name of configuration file (multiple definitions are allowed).
-#QPKG_CONFIG="myApp.conf"
-#QPKG_CONFIG="/etc/config/myApp.conf"
-# Port number used by service program.
-QPKG_SERVICE_PORT="9993"
-# Location of file with running service's PID
-#QPKG_SERVICE_PIDFILE="/var/lib/zerotier-one/zerotier-one.pid"
-# Relative path to web interface
-#QPKG_WEBUI=""
-# Port number for the web interface.
-#QPKG_WEB_PORT=""
-# Port number for the SSL web interface.
-#QPKG_WEB_SSL_PORT=""
-
-# Use QTS HTTP Proxy and set Proxy_Path in the qpkg.conf.
-# When the QPKG has its own HTTP service port, and want clients to connect via QTS HTTP port (default 8080).
-# Usually use this option when the QPKG need to connect via myQNAPcloud service.
-#QPKG_USE_PROXY="1"
-#QPKG_PROXY_PATH="/qpkg_name"
-
-#Desktop Application (since 4.1)
-# Set value to 1 means to open the QPKG's Web UI inside QTS desktop instead of new window.
-#QPKG_DESKTOP_APP="1"
-# Desktop Application Window default inner width (since 4.1) (not over 1178)
-#QPKG_DESKTOP_APP_WIN_WIDTH=""
-# Desktop Application Window default inner width (since 4.1) (not over 600)
-#QPKG_DESKTOP_APP_WIN_HEIGHT=""
-
-# Minimum QTS version requirement
-QTS_MINI_VERSION="4.1.0"
-# Maximum QTS version requirement
-QTS_MAX_VERSION="5.0.0"
-
-# Select volume
-# 1: support installation
-# 2: support migration
-# 3 (1+2): support both installation and migration
-#QPKG_VOLUME_SELECT="0"
-
-# Set timeout for QPKG enable and QPKG disable (since 4.1.0)
-# Format in seconds (enable, disable)
-#QPKG_TIMEOUT="10,30"
-
-# Visible setting for the QPKG that has web UI, show this QPKG on the Main menu of
-# 1(default): administrators, 2: all NAS users.
-#QPKG_VISIBLE="2"
-
-# Location of the chroot environment (only TS-x09)
-#QPKG_ROOTFS=""
-# Init-script used to controls the start and stop of the
-# installed application (only TS-x09)
-#QPKG_SERVICE_PROGRAM_CHROOT=""
-
-# Location of icons for the packaged application.
-QDK_DATA_DIR_ICONS="icons"
-# Location of files specific to arm-x09 packages.
-#QDK_DATA_DIR_X09="arm-x09"
-# Location of files specific to arm-x19 packages.
-#QDK_DATA_DIR_X19="arm-x19"
-# Location of files specific to arm-x31 packages.
-#QDK_DATA_DIR_X31="arm-x31"
-# Location of files specific to arm-x41 packages.
-#QDK_DATA_DIR_X41="arm_al"
-# Location of files specific to x86 packages.
-#QDK_DATA_DIR_X86="x86"
-# Location of files specific to x86 (64-bit) packages.
-#QDK_DATA_DIR_X86_64="x86_64"
-# Location of files common to all architectures.
-#QDK_DATA_DIR_SHARED="shared"
-# Location of configuration files.
-#QDK_DATA_DIR_CONFIG="config"
-# Name of local data package.
-#QDK_DATA_FILE=""
-# Name of extra package (multiple definitions are allowed).
-#QDK_EXTRA_FILE=""
diff --git a/pkg/qnap/zerotier/shared/.gitkeep b/pkg/qnap/zerotier/shared/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/shared/.qpkg_icon.gif b/pkg/qnap/zerotier/shared/.qpkg_icon.gif
deleted file mode 100644
index 900f2d4cd..000000000
Binary files a/pkg/qnap/zerotier/shared/.qpkg_icon.gif and /dev/null differ
diff --git a/pkg/qnap/zerotier/shared/.qpkg_icon_80.gif b/pkg/qnap/zerotier/shared/.qpkg_icon_80.gif
deleted file mode 100644
index 900f2d4cd..000000000
Binary files a/pkg/qnap/zerotier/shared/.qpkg_icon_80.gif and /dev/null differ
diff --git a/pkg/qnap/zerotier/shared/.qpkg_icon_gray.gif b/pkg/qnap/zerotier/shared/.qpkg_icon_gray.gif
deleted file mode 100644
index db7c8fd1e..000000000
Binary files a/pkg/qnap/zerotier/shared/.qpkg_icon_gray.gif and /dev/null differ
diff --git a/pkg/qnap/zerotier/shared/zerotier.sh b/pkg/qnap/zerotier/shared/zerotier.sh
deleted file mode 100755
index a5c1aa55e..000000000
--- a/pkg/qnap/zerotier/shared/zerotier.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-CONF=/etc/config/qpkg.conf
-QPKG_NAME="zerotier"
-QPKG_ROOT=`/sbin/getcfg $QPKG_NAME Install_Path -f ${CONF}`
-APACHE_ROOT=/share/`/sbin/getcfg SHARE_DEF defWeb -d Qweb -f /etc/config/def_share.info`
-case "$1" in
-  start)
-    modprobe tun
-    ln -s $QPKG_ROOT/zerotier-one /usr/sbin/zerotier-cli
-    ln -s $QPKG_ROOT/zerotier-one /usr/bin/zerotier-cli
-    ln -s $QPKG_ROOT /var/lib/zerotier-one
-    ENABLED=$(/sbin/getcfg $QPKG_NAME Enable -u -d FALSE -f $CONF)
-    if [ "$ENABLED" != "TRUE" ]; then
-        echo "$QPKG_NAME is disabled."
-        exit 1
-    fi
-    $QPKG_ROOT/zerotier-one $QPKG_ROOT -d
-    ;;
-
-  stop)
-    killall zerotier-one
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac
-
-exit 0
diff --git a/pkg/qnap/zerotier/x86/.gitkeep b/pkg/qnap/zerotier/x86/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/x86_64/.gitkeep b/pkg/qnap/zerotier/x86_64/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/qnap/zerotier/x86_ce53xx/.gitkeep b/pkg/qnap/zerotier/x86_ce53xx/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkg/snap/snapcraft.yaml b/pkg/snap/snapcraft.yaml
deleted file mode 100644
index 57a2ed8e1..000000000
--- a/pkg/snap/snapcraft.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-name: zerotier
-summary: Securely connect any device, anywhere.
-description: |
-
-  ZeroTier is a software-based managed Ethernet switch for planet Earth. Use it to connect your
-  desktop clients, servers, phones, NAS, or even individual applications (using our SDK).
-
-  This snap contains ZeroTier One, a service that provides ZeroTier network connectivity and
-  makes joining virtual networks as easy as joining IRC or Slack channels. Apps for Android
-  and iOS are available for free in the Google Play and Apple app stores.
-
-  ZeroTier eliminates the LAN/WAN distinction and makes VPNs, tunnels, proxies, and other kludges
-  arising from the inflexible nature of physical networks obsolete. Everything is encrypted
-  end-to-end and traffic takes the most direct (peer to peer) path available.
-
-  Install (be sure to use sudo)
-
-    sudo snap install zerotier
-
-  Join your network
-
-    sudo zerotier join <nwid>
-    sudo zerotier status
-
-  Approve your new node in ZeroTier Central (https://my.zerotier.com)! Welcome online!
-
-adopt-info: one
-confinement: strict
-grade: stable
-base: core18
-
-apps:
-  one:
-    # Add -U to prevent attempting to drop privileges since snaps have their
-    # own containment mechanism. Otherwise, if a user named "zerotier-one"
-    # exists on the system, the setgid or related calls will fail.
-    command: usr/sbin/zerotier-one -U
-    daemon: simple
-    plugs:
-      - network
-      - network-bind
-      - network-control
-
-  # For backwards compatibility with old package (e.g. zerotier.cli)
-  # Should be removed someday
-  cli:
-    command: usr/sbin/zerotier-cli
-    plugs:
-      - network
-
-  zerotier:
-    command: usr/sbin/zerotier-cli
-    plugs:
-      - network
-
-  idtool:
-    command: usr/sbin/zerotier-idtool
-    plugs:
-      - network
-
-layout:
-  /var/lib/zerotier-one:
-    bind: $SNAP_COMMON
-
-parts:
-  one:
-    plugin: make
-    source: https://github.com/zerotier/zerotierone.git
-    source-branch: "master"
-    build-packages:
-      - build-essential
-      - libc++-dev
-    make-parameters:
-      - ZT_SSO_SUPPORTED=0
-    filesets:
-      binaries:
-        - usr/sbin/zerotier-one
-        - usr/sbin/zerotier-cli
-        - usr/sbin/zerotier-idtool
-    prime:
-      - $binaries
-    override-build: |
-      snapcraftctl build
-      # Grab the version string from the newly-compiled binary.
-      snapcraftctl set-version "$(./zerotier-one -v)"
-slots:
-  zerotier-control:
-    interface: content
-    read:
-      - $SNAP_COMMON
diff --git a/pkg/synology/Dockerfile.spksrc b/pkg/synology/Dockerfile.spksrc
deleted file mode 100644
index 70f0532e6..000000000
--- a/pkg/synology/Dockerfile.spksrc
+++ /dev/null
@@ -1,20 +0,0 @@
-# vim: ft=dockerfile
-
-FROM debian:buster
-
-ENV LANG C.UTF-8
-
-# Manage i386 arch
-RUN dpkg --add-architecture i386
-
-RUN apt-get update && apt-get install --no-install-recommends -y make imagemagick curl jq wget procps intltool
-
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Volume pointing to spksrc sources
-VOLUME /spksrc
-
-WORKDIR /spksrc
-
-COPY syn-pkg-entrypoint.sh /syn-pkg-entrypoint.sh
-ENTRYPOINT ["/syn-pkg-entrypoint.sh"]
diff --git a/pkg/synology/README.md b/pkg/synology/README.md
deleted file mode 100644
index 242e9e0db..000000000
--- a/pkg/synology/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## Package for Synology's DSM 6
-
-Documentation and downloads: [docs.zerotier.com/devices/synology](https://docs.zerotier.com/devices/synology)
-
-
-```
-./build.sh build
-```
diff --git a/pkg/synology/build.sh b/pkg/synology/build.sh
deleted file mode 100755
index c59757fd2..000000000
--- a/pkg/synology/build.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/bash
-
-ZTO_VER=$(jq -r '.version' synology/config.json)
-PKG_REV=$(jq -r '.rev' synology/config.json)
-echo $ZTO_VER-$PKG_REV
-ZTO_DESC=$(jq -r '.desc' synology/config.json)
-echo $ZTO_DESC
-ZTO_EMAIL=$(jq -r '.email' synology/config.json)
-echo $ZTO_EMAIL
-read -p "Confirm details [y/n] ? " -n 1 -r; echo; if [[ ! $REPLY =~ ^[Yy]$ ]]; then echo "Exiting."; exit; fi
-
-build_environment()
-{
-  git clone https://github.com/SynoCommunity/spksrc.git
-  sudo docker build --load -t zt-spksrc -f Dockerfile.spksrc .
-}
-
-generate_package_sources()
-{
-  # Clean up any intermediate files
-  sudo make -C spksrc clean
-  rm -rf spksrc/distrib/*
-  rm -rf spksrc/packages/*
-  rm -rf spksrc/distrib/*source.tar.gz*
-  rm -rf spksrc/cross/*
-  mkdir -p spksrc/cross/zerotier
-
-  # Generate the SPK contents
-
-  # Copy package scripts to spksrc so they're accessible to container
-  rm -rf spksrc/dsm6-pkg
-  cp -rf dsm6-pkg spksrc/dsm6-pkg
-
-  TAB="$(printf '\t')"
-
-  cd ..
-
-  # Generate ZTO source tarball used by spksrc
-  git ls-files -z | xargs -0 tar -czvf source.tar.gz
-  mkdir -p synology/spksrc/distrib
-  cp source.tar.gz synology/spksrc/distrib/source.tar.gz
-
-cat > synology/spksrc/cross/zerotier/digests <<- EOM
-source.tar.gz SHA1 $(sha1sum source.tar.gz | awk '{print $1}')
-source.tar.gz SHA256 $(sha256sum source.tar.gz | awk '{print $1}')
-source.tar.gz MD5 $(md5sum source.tar.gz | awk '{print $1}')
-EOM
-
-  cd -
-
-
-  STAGING_DIR='$(STAGING_DIR)'
-  RUN='$(RUN)'
-
-cat > spksrc/cross/zerotier/Makefile <<- EOM
-PKG_NAME = ZeroTierOne
-PKG_VERS = $ZTO_VER
-PKG_EXT = tar.gz
-PKG_DIST_NAME = source.tar.gz
-PKG_DIR =
-PKG_DIST_SITE = http://localhost:8000
-DEPENDS =
-GNU_CONFIGURE = 1
-CONFIGURE_ARGS = HAVE_CXX=yes
-
-INSTALL_TARGET = zerotier_custom_install
-CONFIGURE_TARGET = zerotier_custom_configure
-
-ENV += ZT_SYNOLOGY=1
-
-include ../../mk/spksrc.cross-cc.mk
-
-.PHONY: zerotier_custom_install
-zerotier_custom_install:
-${TAB}$RUN mkdir -p $STAGING_DIR/bin
-${TAB}$RUN cp zerotier-one $STAGING_DIR/bin/zerotier-one
-EOM
-
-cat > spksrc/cross/zerotier/PLIST <<- EOM
-bin:bin/zerotier-one
-EOM
-
-  #
-  # Set up (spk) directory contents
-  #
-  rm -rf spksrc/spk/*
-  mkdir -p spksrc/spk/zerotier
-
-  STAGING_DIR='$(STAGING_DIR)'
-  WORK_DIR='$(WORK_DIR)'
-  PRODUCT_DIR='$(PRODUCT_DIR)'
-
-cat > spksrc/spk/zerotier/Makefile <<- EOM
-SPK_NAME = zerotier
-SPK_VERS = $ZTO_VER
-SPK_REV = $PKG_REV
-SPK_ICON = /spksrc/dsm6-pkg/PACKAGE_ICON_256.png
-DEPENDS = cross/zerotier
-MAINTAINER = ZeroTier, Inc.
-DESCRIPTION = $ZTO_DESC
-LICENSE  = BUSL-1.1
-CHANGELOG =
-HOMEPAGE = https://my.zerotier.com
-REPORT_URL = https://github.com/zerotier/ZeroTierOne/issues
-DISPLAY_NAME = ZeroTier
-PRODUCT_DIR = $WORK_DIR
-
-STARTABLE = yes
-REQUIRED_DSM = 6.2.4
-
-ENV += ZT_SYNOLOGY=1
-
-SSS_SCRIPT = ../../dsm6-pkg/start-stop-status.sh
-
-PRE_STRIP_TARGET = zerotier_install
-
-include ../../mk/spksrc.spk.mk
-
-.PHONY: zerotier_install
-zerotier_install:
-${TAB}install -m 755 -d $STAGING_DIR/bin
-${TAB}install -m 755 $PRODUCT_DIR/zerotier-one $STAGING_DIR/bin/zerotier-one
-EOM
-
-cat > spksrc/spk/zerotier/PLIST <<- EOM
-bin:bin/zerotier-one
-EOM
-}
-
-build()
-{
-  pushd synology
-  build_environment
-  generate_package_sources
-  sudo docker run -it -v $(pwd)/spksrc:/spksrc zt-spksrc /bin/bash
-  popd
-}
-
-"$@"
diff --git a/pkg/synology/dsm6-pkg/PACKAGE_ICON.png b/pkg/synology/dsm6-pkg/PACKAGE_ICON.png
deleted file mode 100644
index ff7785f08..000000000
Binary files a/pkg/synology/dsm6-pkg/PACKAGE_ICON.png and /dev/null differ
diff --git a/pkg/synology/dsm6-pkg/PACKAGE_ICON_256.png b/pkg/synology/dsm6-pkg/PACKAGE_ICON_256.png
deleted file mode 100644
index bf89cb127..000000000
Binary files a/pkg/synology/dsm6-pkg/PACKAGE_ICON_256.png and /dev/null differ
diff --git a/pkg/synology/dsm6-pkg/scripts/postinst b/pkg/synology/dsm6-pkg/scripts/postinst
deleted file mode 100644
index c52d3c26b..000000000
--- a/pkg/synology/dsm6-pkg/scripts/postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 0
diff --git a/pkg/synology/dsm6-pkg/scripts/postuninst b/pkg/synology/dsm6-pkg/scripts/postuninst
deleted file mode 100644
index c52d3c26b..000000000
--- a/pkg/synology/dsm6-pkg/scripts/postuninst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 0
diff --git a/pkg/synology/dsm6-pkg/scripts/postupgrade b/pkg/synology/dsm6-pkg/scripts/postupgrade
deleted file mode 100644
index 039e4d006..000000000
--- a/pkg/synology/dsm6-pkg/scripts/postupgrade
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 0
diff --git a/pkg/synology/dsm6-pkg/scripts/preinst b/pkg/synology/dsm6-pkg/scripts/preinst
deleted file mode 100644
index 039e4d006..000000000
--- a/pkg/synology/dsm6-pkg/scripts/preinst
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 0
diff --git a/pkg/synology/dsm6-pkg/scripts/preuninst b/pkg/synology/dsm6-pkg/scripts/preuninst
deleted file mode 100644
index c52d3c26b..000000000
--- a/pkg/synology/dsm6-pkg/scripts/preuninst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 0
diff --git a/pkg/synology/dsm6-pkg/scripts/preupgrade b/pkg/synology/dsm6-pkg/scripts/preupgrade
deleted file mode 100644
index 039e4d006..000000000
--- a/pkg/synology/dsm6-pkg/scripts/preupgrade
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 0
diff --git a/pkg/synology/dsm6-pkg/service-setup.sh b/pkg/synology/dsm6-pkg/service-setup.sh
deleted file mode 100644
index 136072cb7..000000000
--- a/pkg/synology/dsm6-pkg/service-setup.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-
-service_postinst()
-{
-	exit 0
-}
-
-service_postuninst()
-{
-	exit 0
-}
-
-service_postupgrade()
-{
-	exit 0
-}
-
-service_preinst()
-{
-	exit 0
-}
-
-service_preuninst()
-{
-	exit 0
-}
-
-service_preupgrade()
-{
-	exit 0
-}
diff --git a/pkg/synology/dsm6-pkg/start-stop-status.sh b/pkg/synology/dsm6-pkg/start-stop-status.sh
deleted file mode 100755
index c03f7e2ff..000000000
--- a/pkg/synology/dsm6-pkg/start-stop-status.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-
-PKGVAR=/var/packages/zerotier/var
-
-ZTO_PID_FILE="$PKGVAR/zerotier-one.pid"
-WAT_PID_FILE="$PKGVAR/zerotier-watchdog.pid"
-ZTO_LOG_FILE="$PKGVAR/zerotier-one.log"
-
-log()
-{
-    local timestamp=$(date --iso-8601=second)
-    echo "$timestamp $1" >> $ZTO_LOG_FILE
-}
-
-configure_tun()
-{
-    log "Checking for TUN device"
-    # Create /dev/net/tun if needed
-    if ( [ ! -c /dev/net/tun ] ); then
-        if ( [ ! -d /dev/net ] ); then
-            mkdir -m 755 /dev/net
-        fi
-        log "Adding TUN device"
-        mknod /dev/net/tun c 10 200
-        chmod 0755 /dev/net/tun
-    fi
-
-    # Load TUN kernel module
-    if ( !( lsmod | grep -q "^tun\s" ) ); then
-        log "Loading TUN kernel module"
-        insmod /lib/modules/tun.ko
-    fi
-}
-
-configure_cli()
-{
-    # Create ZT CLI symlinks if needed
-    mkdir -p /usr/local/bin/
-    ln -s $SYNOPKG_PKGDEST/bin/zerotier-one /usr/local/bin/zerotier-cli
-    ln -s $SYNOPKG_PKGDEST/bin/zerotier-one /usr/local/bin/zerotier-idtool
-    rm -rf /var/lib/zerotier-one
-    ln -s /var/packages/zerotier/var /var/lib/zerotier-one
-}
-
-apply_routes()
-{
-    echo $BASHPID >> $WAT_PID_FILE
-    log "Started Watchdog ($(cat $WAT_PID_FILE))"
-
-    # Wait for ZT service to come online before attempting queries
-    sleep 15
-
-    # Loop until killed, check for required routes and add if needed
-    while true
-    do
-        NETWORK_COUNT=$(zerotier-cli -j listnetworks | jq -r '. | length')
-        if [ "$NETWORK_COUNT" -gt 0 ]; then
-            for ((j=0; j<=$((NETWORK_COUNT-1)); j++))
-            do
-                ROUTE_COUNT=$(zerotier-cli -j listnetworks | jq -r '.['$j'].routes | length')
-                for ((k=0; k<=$((ROUTE_COUNT-1)); k++))
-                do
-                    ROUTE=$(zerotier-cli -j listnetworks | jq -r '.['$j'].routes['$k'].target')
-                    EXIST=$(ip route show $ROUTE | wc -l)
-                    if [ $EXIST -eq 0 ];
-                    then
-                        IFNAME=$(zerotier-cli -j listnetworks | jq -r '.['$j'] | .portDeviceName')
-                        ip route add $ROUTE dev $IFNAME
-                        log "Added route $ROUTE to dev $IFNAME"
-                        # Routes will be deleted when ZT brings the interface down
-                    fi
-                done
-            done
-        fi
-        sleep 15
-    done
-}
-
-configure_routes()
-{
-    if [ -r "${WAT_PID_FILE}" ]; then
-        exit 0
-    else
-        apply_routes &
-    fi
-}
-
-start_daemon()
-{
-    ${SYNOPKG_PKGDEST}/bin/zerotier-one $PKGVAR -d
-    echo $(pidof zerotier-one) > ${ZTO_PID_FILE}
-    log "Started ZeroTier ($(cat $ZTO_PID_FILE))"
-}
-
-stop_daemon() {
-    if [ -r "$ZTO_PID_FILE" ]; then
-        local ZTO_PID=$(cat "${ZTO_PID_FILE}")
-        log "Stopped ZeroTier ($(cat $ZTO_PID_FILE))"
-        kill -TERM $ZTO_PID
-        wait_for_status 1 || kill -KILL $PID >> $LOG_FILE 2>&1
-        rm -f $ZTO_PID_FILE > /dev/null
-    fi
-    if [ -r "$WAT_PID_FILE" ]; then
-        local WAT_PID=$(cat "${WAT_PID_FILE}")
-        log "Stopped Watchdog ($(cat $WAT_PID_FILE))"
-        kill -TERM $WAT_PID
-        rm -f $WAT_PID_FILE > /dev/null
-    fi
-}
-
-daemon_status()
-{
-    if [ -f $ZTO_PID_FILE ] && kill -0 `cat $ZTO_PID_FILE` > /dev/null 2>&1; then
-        return
-    fi
-    rm -f $ZTO_PID_FILE
-    return 1
-}
-
-wait_for_status()
-{
-    counter=$2
-    while [ $counter -gt 0 ]; do
-        daemon_status
-        [ $? -eq $1 ] && return
-        let counter=counter-1
-        sleep 1
-    done
-    return 1
-}
-
-case "$1" in
-  start)
-    if ( pidof zerotier-one ); then
-        exit 0
-    else
-        configure_tun
-        configure_cli
-        start_daemon
-        configure_routes
-    fi
-    ;;
-  stop)
-    if ( pidof zerotier-one ); then
-        stop_daemon
-    else
-        exit 0
-    fi
-    ;;
-  status)
-    if ( pidof zerotier-one ); then
-        exit 0
-    else
-        exit 1
-    fi
-    ;;
-  *)
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/pkg/synology/dsm7-docker/Dockerfile b/pkg/synology/dsm7-docker/Dockerfile
deleted file mode 100644
index 5441d37a7..000000000
--- a/pkg/synology/dsm7-docker/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-# vim: ft=dockerfile
-
-FROM alpine:latest as builder
-
-WORKDIR /src
-RUN apk add --no-cache rust cargo \
-  && apk add  openssl-dev \
-  && apk add --update alpine-sdk linux-headers \
-  && git clone --quiet https://github.com/zerotier/ZeroTierOne.git /src \
-  && git reset --quiet --hard ${ZTO_COMMIT} \
-  && make -f make-linux.mk
-
-FROM alpine:latest
-LABEL version=${ZTO_VER}
-LABEL description="ZeroTier One docker image for Synology NAS"
-
-RUN apk add --update --no-cache bash jq libc6-compat libstdc++
-
-EXPOSE 9993/udp
-ENV MAX_WAIT_SECS SLEEP_TIME
-
-COPY --from=builder /src/zerotier-one /usr/sbin/
-RUN mkdir -p /var/lib/zerotier-one \
-  && ln -s /usr/sbin/zerotier-one /usr/sbin/zerotier-idtool \
-  && ln -s /usr/sbin/zerotier-one /usr/sbin/zerotier-cli
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/pkg/synology/dsm7-docker/README.md b/pkg/synology/dsm7-docker/README.md
deleted file mode 100644
index 99cd979cf..000000000
--- a/pkg/synology/dsm7-docker/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## Docker image for Synology's DSM7
-
-Documentation: [docs.zerotier.com/devices/synology](https://docs.zerotier.com/devices/synology)
-
-### Build & Push changes to DockerHub
-```shell
-./build.sh build
-```
diff --git a/pkg/synology/dsm7-docker/build.sh b/pkg/synology/dsm7-docker/build.sh
deleted file mode 100755
index 1706ac686..000000000
--- a/pkg/synology/dsm7-docker/build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-ZTO_VER=$(git describe --tags $(git rev-list --tags --max-count=1))
-ZTO_COMMIT=$(git rev-parse HEAD)
-
-build() {
-  sudo docker login --username=${DOCKERHUB_USERNAME}
-
-  sudo docker buildx build \
-    --push \
-    --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
-    --tag zerotier/zerotier-synology:${ZTO_VER} \
-    --tag zerotier/zerotier-synology:latest \
-    --build-arg ZTO_COMMIT=${ZTO_COMMIT} \
-    --build-arg ZTO_VER=${ZTO_VER} \
-    .
-}
-
-"$@"
diff --git a/pkg/synology/dsm7-docker/entrypoint.sh b/pkg/synology/dsm7-docker/entrypoint.sh
deleted file mode 100755
index e760518b3..000000000
--- a/pkg/synology/dsm7-docker/entrypoint.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-set -uo pipefail
-
-trap 'trap " " SIGTERM; kill 0; wait' SIGTERM SIGQUIT SIGINT
-
-echo "Starting Zerotier-One"
-zerotier-one -d
-
-echo "Wait for ZT service to come online before attempting queries..."
-MAX_WAIT_SECS="${MAX_WAIT_SECS:-90}"
-SLEEP_TIME="${SLEEP_TIME:-15}"
-if [[ "$SLEEP_TIME" -le 0 ]]
-then
-  SLEEP_TIME=1
-fi
-
-iterations=$((MAX_WAIT_SECS/SLEEP_TIME))
-online=false
-
-for ((s=0; s<=iterations; s++))
-do
-    online="$(zerotier-cli -j info | jq '.online' 2>/dev/null)"
-    if [[ "$online" == "true" ]]
-    then
-        break
-    fi
-    sleep "$SLEEP_TIME"
-    echo " ."
-done
-
-if [[ "$online" != "true" ]]
-then
-    echo "Waited $MAX_WAIT_SECS for zerotier-one to start, exiting." >&2
-    exit 1
-fi
-echo "done."
-
-(
-echo "Starting route helper"
-while true
-do
-    if ! NETWORK_LIST="$(zerotier-cli -j listnetworks)"
-    then
-      echo "Route helper: $NETWORK_LIST" >&2
-      exit 1
-    fi
-    NETWORK_COUNT="$(jq -r '. | length' <<< "$NETWORK_LIST")"
-    if [[ "$NETWORK_COUNT" -gt 0 ]]
-    then
-        for ((j=0; j<=$((NETWORK_COUNT-1)); j++))
-        do
-            ALLOW_DEFAULT="$(jq -r '.['$j'].allowDefault' <<< "$NETWORK_LIST")"
-            ROUTE_COUNT="$(jq -r '.['$j'].routes | length' <<< "$NETWORK_LIST")"
-            for ((k=0; k<=$((ROUTE_COUNT-1)); k++))
-            do
-                ROUTE="$(jq -r '.['$j'].routes['$k'].target' <<< "$NETWORK_LIST")"
-                VIA="$(jq -r '.['$j'].routes['$k'].via' <<< "$NETWORK_LIST")"
-                if [[ -n "$ROUTE" ]]
-                then
-                    # check if route is default and allowDefault enabled for this network
-                    if [[ "$ROUTE" == "0.0.0.0/0" && "$ALLOW_DEFAULT" == "false" ]]
-                    then
-                      continue
-                    fi
-                    EXIST="$(ip -o route show "$ROUTE")"
-                    if [[ -z "${EXIST}" && "$VIA" == "null" ]]
-                    then
-                        IFNAME="$(jq -r '.['$j'] | .portDeviceName' <<< "$NETWORK_LIST")"
-                        echo " Adding route $ROUTE to dev $IFNAME"
-                        ip route add "$ROUTE" dev "$IFNAME"
-                        # Routes will be deleted when ZT brings the interface down
-                    fi
-                fi
-            done
-        done
-    fi
-    sleep 15
-done ) &
-
-wait
-
diff --git a/pkg/synology/syn-pkg-entrypoint.sh b/pkg/synology/syn-pkg-entrypoint.sh
deleted file mode 100755
index 1764e8e6c..000000000
--- a/pkg/synology/syn-pkg-entrypoint.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-pushd spk/zerotier
-
-make arch-x64-6.2.4
-make arch-braswell-6.2.4
-# make arch-88f6281-6.2.4 #(std11)
-# make arch-monaco-6.2.4 #(ZT_AES_NO_ACCEL=1)
-# make arch-hi3535-6.2.4 #(take out -mfloat-abi=hard)
-# make arch-comcerto2k-6.2.4 #(ZT_AES_NO_ACCEL=1, remove all flags from arm hf section)
-# make arch-alpine4k-6.2.4 #(problem?)
-# make arch-alpine-6.2.4 #(problem?)
-make arch-aarch64-6.2.4
-make arch-apollolake-6.2.4
-make arch-armada370-6.2.4
-make arch-armada375-6.2.4
-make arch-armada37xx-6.2.4
-make arch-armada38x-6.2.4
-make arch-armadaxp-6.2.4
-make arch-armv7-6.2.4
-make arch-avoton-6.2.4
-make arch-broadwell-6.2.4
-make arch-broadwellnk-6.2.4
-make arch-bromolow-6.2.4
-make arch-cedarview-6.2.4
-make arch-denverton-6.2.4
-make arch-evansport-6.2.4
-make arch-geminilake-6.2.4
-make arch-grantley-6.2.4
-make arch-kvmx64-6.2.4
-make arch-dockerx64-6.2.3
-make arch-purley-6.2.4
-make arch-qoriq-6.2.4
-make arch-rtd1296-6.2.4
-make arch-v1000-6.2.4
-make arch-x86-6.2.4
-
-popd
diff --git a/pkg/wd/Dockerfile b/pkg/wd/Dockerfile
deleted file mode 100644
index fd8b6774b..000000000
--- a/pkg/wd/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# vim: ft=dockerfile
-
-FROM ubuntu:20.04
-
-COPY mksapkg-OS5 /mksapkg-OS5
-
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
-
diff --git a/pkg/wd/build.sh b/pkg/wd/build.sh
deleted file mode 100755
index a28efbb08..000000000
--- a/pkg/wd/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-build_packages()
-{
-  sudo docker run -v $(pwd):/zto ztwd
-}
-
-build_container()
-{
-  sudo docker build -t ztwd . --load
-}
-
-"$@"
diff --git a/pkg/wd/entrypoint.sh b/pkg/wd/entrypoint.sh
deleted file mode 100755
index 8e10c9ffe..000000000
--- a/pkg/wd/entrypoint.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-ZTO_VER=$(git describe --abbrev=0 --tags)
-ZTO_COMMIT=$(git rev-parse HEAD)
-ZTO_DESC=$(jq -r '.desc' ../config.json)
-
-generate_new_pkg_spec()
-{
-  cat > zerotier/apkg.rc <<- EOM
-Package: zerotier
-Section: Apps
-Version: $ZTO_VER
-Packager: ZeroTier, Inc.
-Email: contact@zerotier.com
-Homepage: http://www.zerotier.com
-Description: $ZTO_DESC
-AddonShowName: ZeroTier
-Icon: zerotier.png
-AddonIndexPage: index.html
-AddonUsedPort: 9993
-InstDepend:
-InstConflict:
-StartDepend:
-StartConflict:
-CenterType:1
-UserControl:0
-MinFWVer:
-MaxFWVer:
-IndividualFlag:
-
-EOM
-}
-
-pkg_x64()
-{
-  MKSAPKG=../mksapkg-OS5
-  chmod a+x $MKSAPKG
-  BIN_SRC_DIR=..
-
-  pushd zerotier
-
-  cp -f $BIN_SRC_DIR/zerotier-one bin/zerotier-one
-  $MKSAPKG -E -s -m WDMyCloudDL2100
-  $MKSAPKG -E -s -m WDMyCloudDL4100
-  $MKSAPKG -E -s -m MyCloudPR4100
-  $MKSAPKG -E -s -m MyCloudPR2100
-
-  popd
-}
-
-pkg_armhf()
-{
-  MKSAPKG=../mksapkg-OS5
-  chmod a+x $MKSAPKG
-  BIN_SRC_DIR=..
-
-  pushd zerotier
-  cp -f $BIN_SRC_DIR/zerotier-one bin/zerotier-one
-
-  # MyCloudEX2Ultra (Armada A385)
-  $MKSAPKG -E -s -m MyCloudEX2Ultra
-  # WDMyCloudEX4100 (Armada A385)
-  $MKSAPKG -E -s -m WDMyCloudEX4100
-  # WDMyCloudEX2100 (Armada A385)
-  $MKSAPKG -E -s -m WDMyCloudEX2100
-  # WDMyCloudEX4 (Armada A300)
-  $MKSAPKG -E -s -m WDMyCloudEX4
-  # WDMyCloudEX2 (Armada A370)
-  $MKSAPKG -E -s -m WDMyCloudEX2
-  # WDMyCloudMirrorGen2 (Armada A385)
-  $MKSAPKG -E -s -m WDMyCloudMirrorGen2
-  # WDMyCloudMirror (Armada A370)
-  $MKSAPKG -E -s -m WDMyCloudMirror
-  # WDCloud (Armada A375 (2 cores, 1GHz each, armhf, ARMv7l, Cortex A9, vfp, neon))
-  $MKSAPKG -E -s -m WDCloud
-
-  popd
-}
-
-normalize-filenames()
-{
-  for f in *'('*')'*
-  do
-     mv -i "$f" "${f/(*)/}"
-  done
-}
-
-clean()
-{
-  rm -rf *.bin zerotier/apkg.sign
-}
-
-generate_new_pkg_spec
-pkg_x64
-pkg_armhf
-normalize-filenames
-
-"$@"
diff --git a/pkg/wd/zerotier/apkg.rc b/pkg/wd/zerotier/apkg.rc
deleted file mode 100644
index c01af66d1..000000000
--- a/pkg/wd/zerotier/apkg.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-Package: zerotier
-Section: Apps
-Version: 1.8.8
-Packager: ZeroTier, Inc.
-Email: contact@zerotier.com
-Homepage: http://www.zerotier.com
-Description: Securely connect any device, anywhere.
-AddonShowName: ZeroTier
-Icon: zerotier.png
-AddonIndexPage: index.html
-AddonUsedPort: 9993
-InstDepend:
-InstConflict:
-StartDepend:
-StartConflict:
-CenterType:1
-UserControl:0
-MinFWVer:
-MaxFWVer:
-IndividualFlag:
-
diff --git a/pkg/wd/zerotier/apkg.xml b/pkg/wd/zerotier/apkg.xml
deleted file mode 100644
index 6ce296cc6..000000000
--- a/pkg/wd/zerotier/apkg.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-  <apkg>
-    <item>
-      <procudt_id>0</procudt_id>
-      <custom_id>20</custom_id>
-      <model_id>8</model_id>
-      <app_id>11</app_id>
-      <user_control>0</user_control>
-      <center_type>1</center_type>
-      <individual_flag>0</individual_flag>
-      <name>zerotier</name>
-      <show>ZeroTier</show>
-      <enable>1</enable>
-      <version>1.8.8</version>
-      <date>20220425</date>
-      <inst_date/>
-      <path/>
-      <ps_name/>
-      <url>index.html</url>
-      <url_port>9993</url_port>
-      <apkg_version>2</apkg_version>
-      <packager>ZeroTier, Inc.</packager>
-      <email>contact@zerotier.com</email>
-      <homepage>http://www.zerotier.com</homepage>
-      <inst_depend/>
-      <inst_conflict/>
-      <start_depend/>
-      <start_conflict/>
-      <description>Securely connect any device, anywhere.</description>
-      <icon>zerotier.png</icon>
-      <MinFWVer/>
-      <MaxFWVer/>
-      <Hidden/>
-    </item>
-  </apkg>
-</config>
diff --git a/pkg/wd/zerotier/clean.sh b/pkg/wd/zerotier/clean.sh
deleted file mode 100755
index 0b6a9b312..000000000
--- a/pkg/wd/zerotier/clean.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-rm -f /usr/bin/zerotier-one  2> /dev/null
-rm -f /usr/sbin/zerotier-one  2> /dev/null
-
-rm -f /usr/bin/zerotier-cli  2> /dev/null
-rm -f /usr/sbin/zerotier-cli  2> /dev/null
diff --git a/pkg/wd/zerotier/init.sh b/pkg/wd/zerotier/init.sh
deleted file mode 100755
index e17d6c186..000000000
--- a/pkg/wd/zerotier/init.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-install_path=$1
-
-ln -s $install_path/bin/zerotier-one /usr/sbin/zerotier-one
-ln -s $install_path/bin/zerotier-one /usr/sbin/zerotier-cli
-ln -s $install_path/bin/zerotier-one /usr/bin/zerotier-one
-ln -s $install_path/bin/zerotier-one /usr/bin/zerotier-cli
-
-ln -s $install_path/ /var/lib/zerotier-one
-
-APKG_PATH=$(readlink -f $1)
-WEBPATH="/var/www/apps/zerotier/"
-mkdir -p $WEBPATH
-ln -sf ${APKG_PATH}/web/* $WEBPATH
\ No newline at end of file
diff --git a/pkg/wd/zerotier/install.sh b/pkg/wd/zerotier/install.sh
deleted file mode 100755
index 3ea51d268..000000000
--- a/pkg/wd/zerotier/install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-path_src=$1
-path_des=$2
-mv $path_src $path_des
diff --git a/pkg/wd/zerotier/preinst.sh b/pkg/wd/zerotier/preinst.sh
deleted file mode 100755
index 1a2485251..000000000
--- a/pkg/wd/zerotier/preinst.sh
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/sh
diff --git a/pkg/wd/zerotier/remove.sh b/pkg/wd/zerotier/remove.sh
deleted file mode 100755
index f1f97b41d..000000000
--- a/pkg/wd/zerotier/remove.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-path=$1
-rm -f /usr/bin/zerotier-one  2> /dev/null
-rm -f /usr/sbin/zerotier-one  2> /dev/null
-
-rm -f /usr/bin/zerotier-cli  2> /dev/null
-rm -f /usr/sbin/zerotier-cli  2> /dev/null
-
-rm -rf $path
diff --git a/pkg/wd/zerotier/start.sh b/pkg/wd/zerotier/start.sh
deleted file mode 100755
index 71a62a839..000000000
--- a/pkg/wd/zerotier/start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-/usr/bin/zerotier-one -d
\ No newline at end of file
diff --git a/pkg/wd/zerotier/stop.sh b/pkg/wd/zerotier/stop.sh
deleted file mode 100755
index a357a9ebf..000000000
--- a/pkg/wd/zerotier/stop.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-killall zerotier-one
diff --git a/pkg/wd/zerotier/web/index.html b/pkg/wd/zerotier/web/index.html
deleted file mode 100644
index d6b235c66..000000000
--- a/pkg/wd/zerotier/web/index.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="header">
-  <h2 id="zerotier">ZeroTier</h2>
-</div>
-
-<p>Welcome! ZeroTier is a peer-to-peer encrypted virtual networking solution that enables you to create Local Area Networks with static IP assignments for all of your devices. Access your NAS from anywhere in the world with a single IP and without the need of cloud services backhauling your traffic. To use the CLI:</p>
-<h2 id="using-the-cli-via-ssh-">Using the CLI via SSH:</h2>
-<ol>
-<li><p>Using your (sshd) account, enable SSH:</p>
-<ul>
-<li><strong><code>Settings</code></strong> -&gt; <strong><code>Network</code></strong> -&gt; <strong><code>SSH</code></strong></li>
-</ul>
-</li>
-<li><p>From a computer, open a terminal and SSH into your NAS device:</p>
-<ul>
-<li><strong><code>ssh sshd@your_nas_device_lan_ip</code></strong></li>
-</ul>
-</li>
-<li><p>Create account and network ID at <a href="https://my.zerotier.com">my.zerotier.com</a></p>
-<ul>
-<li><em>Note: This account is merely to administer your network. Your traffic is not handled by ZeroTier except in the case where a direct connection cannot be established. This is a courtesy service we offer for free that you can disable if you&#39;d like. In any case, your traffic is <a href="https://www.zerotier.com/manual/#2_1_3">fully encrypted</a> end-to-end.</em></li>
-</ul>
-</li>
-<li><p>Join your device to the network:</p>
-<ul>
-<li><strong><code>zerotier-cli join your_network_id</code></strong></li>
-</ul>
-</li>
-<li><p>Use <a href="https://my.zerotier.com">my.zerotier.com</a> to authorize your NAS device to join your network.</p>
-</li>
-</ol>
-<h2 id="help-and-support-in-order-of-relevance-">Help and support (in order of relevance)</h2>
-<ul>
-<li>Github Repository: <a href="https://github.com/zerotier/ZeroTierNAS/issues">https://github.com/zerotier/ZeroTierNAS</a></li>
-<li>Forums: <a href="https://discuss.zerotier.com">https://discuss.zerotier.com</a></li>
-<li>Contact: <a href="mailto:contact@zerotier.com">contact@zerotier.com</a></li>
-</ul>
-
-<div class="footer">
-  <h2 id="zerotier"><h2>
-</div>
-
-<style>
-.header {
-  padding: 1px;
-  text-align: center;
-  background: #F2B464;
-  color: black;
-  font-size: 30px;
-}
-
-.footer {
-  padding: 1px;
-  text-align: center;
-  background: #F2B464;
-  color: black;
-  font-size: 30px;
-}
-</style>
diff --git a/pkg/wd/zerotier/web/zerotier.png b/pkg/wd/zerotier/web/zerotier.png
deleted file mode 100644
index cd864eb99..000000000
Binary files a/pkg/wd/zerotier/web/zerotier.png and /dev/null differ
diff --git a/pkg/wd/zerotier/zerotier.png b/pkg/wd/zerotier/zerotier.png
deleted file mode 100644
index cd864eb99..000000000
Binary files a/pkg/wd/zerotier/zerotier.png and /dev/null differ
diff --git a/rule-compiler/README.md b/rule-compiler/README.md
deleted file mode 100644
index 1ceeb713f..000000000
--- a/rule-compiler/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-ZeroTier Rules Compiler
-======
-
-This script converts ZeroTier rules in human-readable format into rules suitable for import into a ZeroTier network controller. It's the script that is used in the rules editor on [ZeroTier Central](https://my.zerotier.com/).
-
-A command line interface is included that may be invoked as: `node cli.js <rules script>`.
-
-See the [manual](https://www.zerotier.com/manual.shtml) for information about the rules engine and rules script syntax.
diff --git a/rule-compiler/cli.js b/rule-compiler/cli.js
deleted file mode 100644
index 75235ac86..000000000
--- a/rule-compiler/cli.js
+++ /dev/null
@@ -1,47 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-var RuleCompiler = require('./rule-compiler.js');
-
-if (process.argv.length < 3) {
-	console.log('Usage: node cli.js <rules script>');
-	process.exit(1);
-}
-
-var rules = [];
-var caps = {};
-var tags = {};
-var err = RuleCompiler.compile(fs.readFileSync(process.argv[2]).toString(),rules,caps,tags);
-
-if (err) {
-	console.error('ERROR parsing '+process.argv[2]+' line '+err[0]+' column '+err[1]+': '+err[2]);
-	process.exit(1);
-} else {
-	let capsArray = [];
-	let capabilitiesByName = {};
-	for(let n in caps) {
-		capsArray.push(caps[n]);
-		capabilitiesByName[n] = caps[n].id;
-	}
-	let tagsArray = [];
-	for(let n in tags) {
-		let t = tags[n];
-		let dfl = t['default'];
-		tagsArray.push({
-			'id': t.id,
-			'default': (((dfl)||(dfl === 0)) ? dfl : null)
-		});
-	}
-
-	console.log(JSON.stringify({
-		config: {
-			rules: rules,
-			capabilities: capsArray,
-			tags: tagsArray
-		},
-		capabilitiesByName: capabilitiesByName,
-		tagsByName: tags
-	},null,1));
-
-	process.exit(0);
-}
diff --git a/rule-compiler/examples/capabilities-and-tags.ztrules b/rule-compiler/examples/capabilities-and-tags.ztrules
deleted file mode 100644
index 9b35f28da..000000000
--- a/rule-compiler/examples/capabilities-and-tags.ztrules
+++ /dev/null
@@ -1,40 +0,0 @@
-# This is a default rule set that allows IPv4 and IPv6 traffic.
-# You can edit as needed. If your rule set gets large we recommend
-# cutting and pasting it somewhere to keep a backup.
-
-# Drop all Ethernet frame types that are not IPv4 or IPv6
-drop
-	not ethertype 0x0800 # IPv4
-	not ethertype 0x0806 # IPv4 ARP
-	not ethertype 0x86dd # IPv6
-;
-
-# Capability: outgoing SSH
-cap ssh
-	id 1000
-	accept
-		ipprotocol tcp
-		dport 22
-	;
-;
-
-# A tag indicating which department people belong to
-tag department
-	id 1000
-	enum 100 sales
-	enum 200 marketing
-	enum 300 accounting
-	enum 400 engineering
-;
-
-# Accept all traffic between members of the same department
-accept
-	tdiff department 0
-;
-
-# You can insert other drop, tee, etc. rules here. This rule
-# set ends with a blanket accept, making it permissive by
-# default.
-
-accept;
-
diff --git a/rule-compiler/package.json b/rule-compiler/package.json
deleted file mode 100644
index 1db006b3a..000000000
--- a/rule-compiler/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "zerotier-rule-compiler",
-  "version": "1.2.2-2",
-  "description": "ZeroTier Rule Script Compiler",
-  "main": "cli.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/zerotier/ZeroTierOne/rule-compiler"
-  },
-  "keywords": [
-    "ZeroTier"
-  ],
-  "author": "ZeroTier, Inc. <contact@zerotier.com>",
-  "license": "GPL-2.0"
-}
diff --git a/rule-compiler/rule-compiler.js b/rule-compiler/rule-compiler.js
deleted file mode 100644
index 81bd5e06c..000000000
--- a/rule-compiler/rule-compiler.js
+++ /dev/null
@@ -1,917 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-'use strict';
-
-// Names for bits in characteristics -- 0==LSB, 63==MSB
-const CHARACTERISTIC_BITS = {
-	'inbound': 63,
-	'multicast': 62,
-	'broadcast': 61,
-	'ipauth': 60,
-	'macauth': 59,
-	'tcp_fin': 0,
-	'tcp_syn': 1,
-	'tcp_rst': 2,
-	'tcp_psh': 3,
-	'tcp_ack': 4,
-	'tcp_urg': 5,
-	'tcp_ece': 6,
-	'tcp_cwr': 7,
-	'tcp_ns': 8,
-	'tcp_rs2': 9,
-	'tcp_rs1': 10,
-	'tcp_rs0': 11
-};
-
-// Shorthand names for common ethernet types
-const ETHERTYPES = {
-	'ipv4': 0x0800,
-	'arp': 0x0806,
-	'wol': 0x0842,
-	'rarp': 0x8035,
-	'ipv6': 0x86dd,
-	'atalk': 0x809b,
-	'aarp': 0x80f3,
-	'ipx_a': 0x8137,
-	'ipx_b': 0x8138
-};
-
-// Shorthand names for common IP protocols
-const IP_PROTOCOLS = {
-	'icmp': 0x01,
-	'icmp4': 0x01,
-	'icmpv4': 0x01,
-	'igmp': 0x02,
-	'ipip': 0x04,
-	'tcp': 0x06,
-	'egp': 0x08,
-	'igp': 0x09,
-	'udp': 0x11,
-	'rdp': 0x1b,
-	'esp': 0x32,
-	'ah': 0x33,
-	'icmp6': 0x3a,
-	'icmpv6': 0x3a,
-	'l2tp': 0x73,
-	'sctp': 0x84,
-	'udplite': 0x88
-};
-
-// Keywords that open new blocks that must be terminated by a semicolon
-const OPEN_BLOCK_KEYWORDS = {
-	'macro': true,
-	'tag': true,
-	'cap': true,
-	'drop': true,
-	'accept': true,
-	'tee': true,
-	'watch': true,
-	'redirect': true,
-	'break': true,
-	'priority': true
-};
-
-// Reserved words that can't be used as tag, capability, or rule set names
-const RESERVED_WORDS = {
-	'macro': true,
-	'tag': true,
-	'cap': true,
-	'default': true,
-
-	'drop': true,
-	'accept': true,
-	'tee': true,
-	'watch': true,
-	'redirect': true,
-	'break': true,
-	'priority': true,
-
-	'ztsrc': true,
-	'ztdest': true,
-	'vlan': true,
-	'vlanpcp': true,
-	'vlandei': true,
-	'ethertype': true,
-	'macsrc': true,
-	'macdest': true,
-	'ipsrc': true,
-	'ipdest': true,
-	'iptos': true,
-	'ipprotocol': true,
-	'icmp': true,
-	'sport': true,
-	'dport': true,
-	'chr': true,
-	'framesize': true,
-	'random': true,
-	'tand': true,
-	'tor': true,
-	'txor': true,
-	'tdiff': true,
-	'teq': true,
-	'tseq': true,
-	'treq': true,
-
-	'type': true,
-	'enum': true,
-	'class': true,
-	'define': true,
-	'import': true,
-	'include': true,
-	'log': true,
-	'not': true,
-	'xor': true,
-	'or': true,
-	'and': true,
-	'set': true,
-	'var': true,
-	'let': true
-};
-
-const KEYWORD_TO_API_MAP = {
-	'drop': 'ACTION_DROP',
-	'accept': 'ACTION_ACCEPT',
-	'tee': 'ACTION_TEE',
-	'watch': 'ACTION_WATCH',
-	'redirect': 'ACTION_REDIRECT',
-	'break': 'ACTION_BREAK',
-	'priority': 'ACTION_PRIORITY',
-
-	'ztsrc': 'MATCH_SOURCE_ZEROTIER_ADDRESS',
-	'ztdest': 'MATCH_DEST_ZEROTIER_ADDRESS',
-	'vlan': 'MATCH_VLAN_ID',
-	'vlanpcp': 'MATCH_VLAN_PCP',
-	'vlandei': 'MATCH_VLAN_DEI',
-	'ethertype': 'MATCH_ETHERTYPE',
-	'macsrc': 'MATCH_MAC_SOURCE',
-	'macdest': 'MATCH_MAC_DEST',
-	//'ipsrc': '', // special handling since we programmatically differentiate between V4 and V6
-	//'ipdest': '', // special handling
-	'iptos': 'MATCH_IP_TOS',
-	'ipprotocol': 'MATCH_IP_PROTOCOL',
-	'icmp': 'MATCH_ICMP',
-	'sport': 'MATCH_IP_SOURCE_PORT_RANGE',
-	'dport': 'MATCH_IP_DEST_PORT_RANGE',
-	'chr': 'MATCH_CHARACTERISTICS',
-	'framesize': 'MATCH_FRAME_SIZE_RANGE',
-	'random': 'MATCH_RANDOM',
-	'tand': 'MATCH_TAGS_BITWISE_AND',
-	'tor': 'MATCH_TAGS_BITWISE_OR',
-	'txor': 'MATCH_TAGS_BITWISE_XOR',
-	'tdiff': 'MATCH_TAGS_DIFFERENCE',
-	'teq': 'MATCH_TAGS_EQUAL',
-	'tseq': 'MATCH_TAG_SENDER',
-	'treq': 'MATCH_TAG_RECEIVER'
-};
-
-// Number of args for each match
-const MATCH_ARG_COUNTS = {
-	'ztsrc': 1,
-	'ztdest': 1,
-	'vlan': 1,
-	'vlanpcp': 1,
-	'vlandei': 1,
-	'ethertype': 1,
-	'macsrc': 1,
-	'macdest': 1,
-	'ipsrc': 1,
-	'ipdest': 1,
-	'iptos': 2,
-	'ipprotocol': 1,
-	'icmp': 2,
-	'sport': 1,
-	'dport': 1,
-	'chr': 1,
-	'framesize': 1,
-	'random': 1,
-	'tand': 2,
-	'tor': 2,
-	'txor': 2,
-	'tdiff': 2,
-	'teq': 2,
-	'tseq': 2,
-	'treq': 2
-};
-
-// Regex of all alphanumeric characters in Unicode
-const INTL_ALPHANUM_REGEX = new RegExp('[0-9A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]');
-
-// Checks whether something is a valid capability, tag, or macro name
-function _isValidName(n) {
-	if ((typeof n !== 'string') || (n.length === 0)) return false;
-	if ("0123456789".indexOf(n.charAt(0)) >= 0) return false;
-	for (let i = 0; i < n.length; ++i) {
-		let c = n.charAt(i);
-		if ((c !== '_') && (!INTL_ALPHANUM_REGEX.test(c))) return false;
-	}
-	return true;
-}
-
-// Regexes for checking the basic syntactic validity of IP addresses
-const IPV6_REGEX = new RegExp('(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))');
-const IPV4_REGEX = new RegExp('((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])');
-
-function _parseNum(n) {
-	try {
-		if ((typeof n !== 'string') || (n.length === 0))
-			return -1;
-		n = n.toLowerCase();
-		if ((n.length > 2) && (n.substr(0, 2) === '0x'))
-			n = parseInt(n.substr(2), 16);
-		else n = parseInt(n, 10);
-		return (((typeof n === 'number') && (n !== null) && (!isNaN(n))) ? n : -1);
-	} catch (e) {
-		return -1;
-	}
-}
-
-function _cleanMac(m) {
-	m = m.toLowerCase();
-	var m2 = '';
-	let charcount = 0;
-	for (let i = 0; ((i < m.length) && (m2.length < 17)); ++i) {
-		let c = m.charAt(i);
-		if ("0123456789abcdef".indexOf(c) >= 0) {
-			m2 += c;
-			charcount++;
-			if ((m2.length > 0) && (m2.length !== 17) && (charcount >= 2)) {
-				m2 += ':';
-				charcount = 0;
-			}
-		}
-	}
-	return m2;
-}
-
-function _cleanHex(m) {
-	m = m.toLowerCase();
-	var m2 = '';
-	for (let i = 0; i < m.length; ++i) {
-		let c = m.charAt(i);
-		if ("0123456789abcdef".indexOf(c) >= 0)
-			m2 += c;
-	}
-	return m2;
-}
-
-function _renderMatches(mtree, rules, macros, caps, tags, params) {
-	let not = false;
-	let or = false;
-	for (let k = 0; k < mtree.length; ++k) {
-		let match = (typeof mtree[k][0] === 'string') ? mtree[k][0].toLowerCase() : '';
-		if ((match.length === 0) || (match === 'and')) { // AND is the default
-			continue;
-		} else if (match === 'not') {
-			not = true;
-		} else if (match === 'or') {
-			or = true;
-		} else {
-			let args = [];
-			let argCount = MATCH_ARG_COUNTS[match];
-			if (!argCount)
-				return [mtree[k][1], mtree[k][2], 'Unrecognized match type "' + match + '".'];
-			for (let i = 0; i < argCount; ++i) {
-				if (++k >= mtree.length)
-					return [mtree[k - 1][1], mtree[k - 1][2], 'Missing argument(s) to match.'];
-				let arg = mtree[k][0];
-				if ((typeof arg !== 'string') || (arg in RESERVED_WORDS) || (arg.length === 0))
-					return [mtree[k - 1][1], mtree[k - 1][2], 'Missing argument(s) to match (invalid argument or argument is reserved word).'];
-				if (arg.charAt(0) === '$') {
-					let tmp = params[arg];
-					if (typeof tmp === 'undefined')
-						return [mtree[k][1], mtree[k][2], 'Undefined variable name.'];
-					args.push([tmp, mtree[k][1], mtree[k][2]]);
-				} else {
-					args.push(mtree[k]);
-				}
-			}
-
-			switch (match) {
-				case 'ztsrc':
-				case 'ztdest': {
-					let zt = _cleanHex(args[0][0]);
-					if (zt.length !== 10)
-						return [args[0][1], args[0][2], 'Invalid ZeroTier address.'];
-					rules.push({
-						'type': KEYWORD_TO_API_MAP[match],
-						'not': not,
-						'or': or,
-						'zt': zt
-					});
-				} break;
-
-				case 'vlan':
-				case 'vlanpcp':
-				case 'vlandei':
-				case 'ethertype':
-				case 'ipprotocol': {
-					let num = null;
-					switch (match) {
-						case 'ethertype': num = ETHERTYPES[args[0][0]]; break;
-						case 'ipprotocol': num = IP_PROTOCOLS[args[0][0]]; break;
-					}
-					if (typeof num !== 'number')
-						num = _parseNum(args[0][0]);
-					if ((typeof num !== 'number') || (num < 0) || (num > 0xffffffff) || (num === null))
-						return [args[0][1], args[0][2], 'Invalid numeric value.'];
-					let r = {
-						'type': KEYWORD_TO_API_MAP[match],
-						'not': not,
-						'or': or
-					};
-					switch (match) {
-						case 'vlan': r['vlanId'] = num; break;
-						case 'vlanpcp': r['vlanPcp'] = num; break;
-						case 'vlandei': r['vlanDei'] = num; break;
-						case 'ethertype': r['etherType'] = num; break;
-						case 'ipprotocol': r['ipProtocol'] = num; break;
-					}
-					rules.push(r);
-				} break;
-
-				case 'random': {
-					let num = parseFloat(args[0][0]) || 0.0;
-					if (num < 0.0) num = 0.0;
-					if (num > 1.0) num = 1.0;
-					rules.push({
-						'type': KEYWORD_TO_API_MAP[match],
-						'not': not,
-						'or': or,
-						'probability': Math.floor(4294967295 * num)
-					});
-				} break;
-
-				case 'macsrc':
-				case 'macdest': {
-					let mac = _cleanMac(args[0][0]);
-					if (mac.length !== 17)
-						return [args[0][1], args[0][2], 'Invalid MAC address.'];
-					rules.push({
-						'type': KEYWORD_TO_API_MAP[match],
-						'not': not,
-						'or': or,
-						'mac': mac
-					});
-				} break;
-
-				case 'ipsrc':
-				case 'ipdest': {
-					let ip = args[0][0];
-					let slashIdx = ip.indexOf('/');
-					if (slashIdx <= 0)
-						return [args[0][1], args[0][2], 'Missing /bits netmask length designation in IP.'];
-					let ipOnly = ip.substr(0, slashIdx);
-					if (IPV6_REGEX.test(ipOnly)) {
-						rules.push({
-							'type': ((match === 'ipsrc') ? 'MATCH_IPV6_SOURCE' : 'MATCH_IPV6_DEST'),
-							'not': not,
-							'or': or,
-							'ip': ip
-						});
-					} else if (IPV4_REGEX.test(ipOnly)) {
-						rules.push({
-							'type': ((match === 'ipsrc') ? 'MATCH_IPV4_SOURCE' : 'MATCH_IPV4_DEST'),
-							'not': not,
-							'or': or,
-							'ip': ip
-						});
-					} else {
-						return [args[0][1], args[0][2], 'Invalid IP address (not valid IPv4 or IPv6).'];
-					}
-				} break;
-
-				case 'icmp': {
-					let icmpType = _parseNum(args[0][0]);
-					if ((icmpType < 0) || (icmpType > 0xff))
-						return [args[0][1], args[0][2], 'Missing or invalid ICMP type.'];
-					let icmpCode = _parseNum(args[1][0]); // -1 okay, indicates don't match code
-					if (icmpCode > 0xff)
-						return [args[1][1], args[1][2], 'Invalid ICMP code (use -1 for none).'];
-					rules.push({
-						'type': 'MATCH_ICMP',
-						'not': not,
-						'or': or,
-						'icmpType': icmpType,
-						'icmpCode': ((icmpCode < 0) ? null : icmpCode)
-					});
-				} break;
-
-				case 'sport':
-				case 'dport':
-				case 'framesize': {
-					let arg = args[0][0];
-					let fn = null;
-					let tn = null;
-					if (arg.indexOf('-') > 0) {
-						let asplit = arg.split('-');
-						if (asplit.length !== 2) {
-							return [args[0][1], args[0][2], 'Invalid numeric range.'];
-						} else {
-							fn = _parseNum(asplit[0]);
-							tn = _parseNum(asplit[1]);
-						}
-					} else {
-						fn = _parseNum(arg);
-						tn = fn;
-					}
-					if ((fn < 0) || (fn > 0xffff) || (tn < 0) || (tn > 0xffff) || (tn < fn))
-						return [args[0][1], args[0][2], 'Invalid numeric range.'];
-					rules.push({
-						'type': KEYWORD_TO_API_MAP[match],
-						'not': not,
-						'or': or,
-						'start': fn,
-						'end': tn
-					});
-				} break;
-
-				case 'iptos': {
-					let mask = _parseNum(args[0][0]);
-					if ((typeof mask !== 'number') || (mask < 0) || (mask > 0xff) || (mask === null))
-						return [args[0][1], args[0][2], 'Invalid mask.'];
-					let arg = args[1][0];
-					let fn = null;
-					let tn = null;
-					if (arg.indexOf('-') > 0) {
-						let asplit = arg.split('-');
-						if (asplit.length !== 2) {
-							return [args[1][1], args[1][2], 'Invalid value range.'];
-						} else {
-							fn = _parseNum(asplit[0]);
-							tn = _parseNum(asplit[1]);
-						}
-					} else {
-						fn = _parseNum(arg);
-						tn = fn;
-					}
-					if ((fn < 0) || (fn > 0xff) || (tn < 0) || (tn > 0xff) || (tn < fn))
-						return [args[1][1], args[1][2], 'Invalid value range.'];
-					rules.push({
-						'type': 'MATCH_IP_TOS',
-						'not': not,
-						'or': or,
-						'mask': mask,
-						'start': fn,
-						'end': tn
-					});
-				} break;
-
-				case 'chr': {
-					let chrb = args[0][0].split(/[,]+/);
-					let maskhi = 0;
-					let masklo = 0;
-					for (let i = 0; i < chrb.length; ++i) {
-						if (chrb[i].length > 0) {
-							let tmp = CHARACTERISTIC_BITS[chrb[i]];
-							let bit = (typeof tmp === 'number') ? tmp : _parseNum(chrb[i]);
-							if ((bit < 0) || (bit > 63))
-								return [args[0][1], args[0][2], 'Invalid bit index (range 0-63) or unrecognized name.'];
-							if (bit >= 32)
-								maskhi |= Math.abs(1 << (bit - 32));
-							else masklo |= Math.abs(1 << bit);
-						}
-					}
-					maskhi = Math.abs(maskhi).toString(16);
-					while (maskhi.length < 8) maskhi = '0' + maskhi;
-					masklo = Math.abs(masklo).toString(16);
-					while (masklo.length < 8) masklo = '0' + masklo;
-					rules.push({
-						'type': 'MATCH_CHARACTERISTICS',
-						'not': not,
-						'or': or,
-						'mask': (maskhi + masklo)
-					});
-				} break;
-
-				case 'tand':
-				case 'tor':
-				case 'txor':
-				case 'tdiff':
-				case 'teq':
-				case 'tseq':
-				case 'treq': {
-					let tag = tags[args[0][0]];
-					let tagId = -1;
-					let tagValue = -1;
-					if (tag) {
-						tagId = tag.id;
-						tagValue = args[1][0];
-						if (tagValue in tag.flags)
-							tagValue = tag.flags[tagValue];
-						else if (tagValue in tag.enums)
-							tagValue = tag.enums[tagValue];
-						else tagValue = _parseNum(tagValue);
-					} else {
-						tagId = _parseNum(args[0][0]);
-						tagValue = _parseNum(args[1][0]);
-					}
-					if ((tagId < 0) || (tagId > 0xffffffff))
-						return [args[0][1], args[0][2], 'Undefined tag name and invalid tag value.'];
-					if ((tagValue < 0) || (tagValue > 0xffffffff))
-						return [args[1][1], args[1][2], 'Invalid tag value or unrecognized flag/enum name.'];
-					rules.push({
-						'type': KEYWORD_TO_API_MAP[match],
-						'not': not,
-						'or': or,
-						'id': tagId,
-						'value': tagValue
-					});
-				} break;
-			}
-
-			not = false;
-			or = false;
-		}
-	}
-	return null;
-}
-
-function _renderActions(rtree, rules, macros, caps, tags, params) {
-	for (let k = 0; k < rtree.length; ++k) {
-		let action = (typeof rtree[k][0] === 'string') ? rtree[k][0].toLowerCase() : '';
-		if (action.length === 0) {
-			continue;
-		} else if (action === 'include') {
-			if ((k + 1) >= rtree.length)
-				return [rtree[k][1], rtree[k][2], 'Include directive is missing a macro name.'];
-			let macroName = rtree[k + 1][0];
-			++k;
-
-			let macroParamArray = [];
-			let parenIdx = macroName.indexOf('(');
-			if (parenIdx > 0) {
-				let pns = macroName.substr(parenIdx + 1).split(/[,)]+/);
-				for (let k = 0; k < pns.length; ++k) {
-					if (pns[k].length > 0)
-						macroParamArray.push(pns[k]);
-				}
-				macroName = macroName.substr(0, parenIdx);
-			}
-
-			let macro = macros[macroName];
-			if (!macro)
-				return [rtree[k][1], rtree[k][2], 'Macro name not found.'];
-			let macroParams = {};
-			for (let param in macro.params) {
-				let pidx = macro.params[param];
-				if (pidx >= macroParamArray.length)
-					return [rtree[k][1], rtree[k][2], 'Missing one or more required macro parameter.'];
-				macroParams[param] = macroParamArray[pidx];
-			}
-
-			let err = _renderActions(macro.rules, rules, macros, caps, tags, macroParams);
-			if (err !== null)
-				return err;
-		} else if ((action === 'drop') || (action === 'accept') || (action === 'break')) { // actions without arguments
-			if (((k + 1) < rtree.length) && (Array.isArray(rtree[k + 1][0]))) {
-				let mtree = rtree[k + 1]; ++k;
-				let err = _renderMatches(mtree, rules, macros, caps, tags, params);
-				if (err !== null)
-					return err;
-			}
-			rules.push({
-				'type': KEYWORD_TO_API_MAP[action]
-			});
-		} else if ((action === 'tee') || (action === 'watch')) { // actions with arguments (ZeroTier address)
-			if (((k + 1) < rtree.length) && (Array.isArray(rtree[k + 1][0])) && (rtree[k + 1][0].length >= 2)) {
-				let mtree = rtree[k + 1]; ++k;
-				let maxLength = _parseNum(mtree[0][0]);
-				if ((maxLength < -1) || (maxLength > 0xffff))
-					return [mtree[0][1], mtree[1][2], 'Tee/watch max packet length to forward invalid or out of range.'];
-				let target = mtree[1][0];
-				if ((typeof target !== 'string') || (target.length !== 10))
-					return [mtree[1][1], mtree[1][2], 'Missing or invalid ZeroTier address target for tee/watch.'];
-				let err = _renderMatches(mtree.slice(2), rules, macros, caps, tags, params);
-				if (err !== null)
-					return err;
-				rules.push({
-					'type': KEYWORD_TO_API_MAP[action],
-					'address': target,
-					'length': maxLength
-				});
-			} else {
-				return [rtree[k][1], rtree[k][2], 'The tee and watch actions require two paremters (max length or 0 for all, target).'];
-			}
-		} else if (action === 'redirect') {
-			if (((k + 1) < rtree.length) && (Array.isArray(rtree[k + 1][0])) && (rtree[k + 1][0].length >= 1)) {
-				let mtree = rtree[k + 1]; ++k;
-				let target = mtree[0][0];
-				if ((typeof target !== 'string') || (target.length !== 10))
-					return [mtree[0][1], mtree[0][2], 'Missing or invalid ZeroTier address target for redirect.'];
-				let err = _renderMatches(mtree.slice(1), rules, macros, caps, tags, params);
-				if (err !== null)
-					return err;
-				rules.push({
-					'type': KEYWORD_TO_API_MAP[action],
-					'address': target
-				});
-			} else {
-				return [rtree[k][1], rtree[k][2], 'The redirect action requires a target parameter.'];
-			}
-		} else {
-			return [rtree[k][1], rtree[k][2], 'Unrecognized action or directive in rule set.'];
-		}
-	}
-
-	return null;
-}
-
-function compile(src, rules, caps, tags) {
-	try {
-		if (typeof src !== 'string')
-			return [0, 0, '"src" parameter must be a string.'];
-
-		// Pass 1: parse source into a tree of arrays of elements. Each element is a 3-item
-		// tuple consisting of string, line number, and character index in line to enable
-		// informative error messages to be returned.
-
-		var blockStack = [[]];
-		var curr = ['', -1, -1];
-		var skipRestOfLine = false;
-		for (let idx = 0, lineNo = 1, lineIdx = 0; idx < src.length; ++idx, ++lineIdx) {
-			let ch = src.charAt(idx);
-			if (skipRestOfLine) {
-				if ((ch === '\r') || (ch === '\n')) {
-					skipRestOfLine = false;
-					++lineNo;
-					lineIdx = 0;
-				}
-			} else {
-				switch (ch) {
-					case '\n':
-						++lineNo;
-						lineIdx = 0;
-					case '\r':
-					case '\t':
-					case ' ':
-						if (curr[0].length > 0) {
-							let endOfBlock = false;
-							if (curr[0].charAt(curr[0].length - 1) === ';') {
-								endOfBlock = true;
-								curr[0] = curr[0].substr(0, curr[0].length - 1);
-							}
-
-							if (curr[0].length > 0) {
-								blockStack[blockStack.length - 1].push(curr);
-							}
-							if ((endOfBlock) && (blockStack.length > 1) && (blockStack[blockStack.length - 1].length > 0)) {
-								blockStack[blockStack.length - 2].push(blockStack[blockStack.length - 1]);
-								blockStack.pop();
-							} else if (curr[0] in OPEN_BLOCK_KEYWORDS) {
-								blockStack.push([]);
-							}
-
-							curr = ['', -1, -1];
-						}
-						break;
-					default:
-						if (curr[0].length === 0) {
-							if (ch === '#') {
-								skipRestOfLine = true;
-								continue;
-							} else {
-								curr[1] = lineNo;
-								curr[2] = lineIdx;
-							}
-						}
-						curr[0] += ch;
-						break;
-				}
-			}
-		}
-
-		if (curr[0].length > 0) {
-			if (curr[0].charAt(curr[0].length - 1) === ';')
-				curr[0] = curr[0].substr(0, curr[0].length - 1);
-			if (curr[0].length > 0)
-				blockStack[blockStack.length - 1].push(curr);
-		}
-		while ((blockStack.length > 1) && (blockStack[blockStack.length - 1].length > 0)) {
-			blockStack[blockStack.length - 2].push(blockStack[blockStack.length - 1]);
-			blockStack.pop();
-		}
-		var parsed = blockStack[0];
-
-		// Pass 2: parse tree into capabilities, tags, rule sets, and document-level rules.
-
-		let baseRuleTree = [];
-		let macros = {};
-		for (let i = 0; i < parsed.length; ++i) {
-			let keyword = (typeof parsed[i][0] === 'string') ? parsed[i][0].toLowerCase() : null;
-			if (keyword === 'macro') {
-				// Define macros
-
-				if (((i + 1) >= parsed.length) || (!Array.isArray(parsed[i + 1])) || (parsed[i + 1].length < 1) || (!Array.isArray(parsed[i + 1][0])))
-					return [parsed[i][1], parsed[i][2], 'Macro definition is missing name.'];
-				let macro = parsed[++i];
-				let macroName = macro[0][0].toLowerCase();
-
-				let params = {};
-				let parenIdx = macroName.indexOf('(');
-				if (parenIdx > 0) {
-					let pns = macroName.substr(parenIdx + 1).split(/[,)]+/);
-					for (let k = 0; k < pns.length; ++k) {
-						if (pns[k].length > 0)
-							params[pns[k]] = k;
-					}
-					macroName = macroName.substr(0, parenIdx);
-				}
-
-				if (!_isValidName(macroName))
-					return [macro[0][1], macro[0][2], 'Invalid macro name.'];
-				if (macroName in RESERVED_WORDS)
-					return [macro[0][1], macro[0][2], 'Macro name is a reserved word.'];
-
-				if (macroName in macros)
-					return [macro[0][1], macro[0][2], 'Multiple definition of macro name.'];
-
-				macros[macroName] = {
-					params: params,
-					rules: macro.slice(1)
-				};
-			} else if (keyword === 'tag') {
-				// Define tags
-
-				if (((i + 1) >= parsed.length) || (!Array.isArray(parsed[i + 1])) || (parsed[i + 1].length < 1) || (!Array.isArray(parsed[i + 1][0])))
-					return [parsed[i][1], parsed[i][2], 'Tag definition is missing name.'];
-				let tag = parsed[++i];
-				let tagName = tag[0][0].toLowerCase();
-
-				if (!_isValidName(tagName))
-					return [tag[0][1], tag[0][2], 'Invalid tag name.'];
-				if (tagName in RESERVED_WORDS)
-					return [tag[0][1], tag[0][2], 'Tag name is a reserved word.'];
-
-				if (tagName in tags)
-					return [tag[0][1], tag[0][2], 'Multiple definition of tag name.'];
-
-				let flags = {};
-				let enums = {};
-				let id = -1;
-				let dfl = null;
-				for (let k = 1; k < tag.length; ++k) {
-					let tkeyword = tag[k][0].toLowerCase();
-					if (tkeyword === 'id') {
-						if (id >= 0)
-							return [tag[k][1], tag[k][2], 'Duplicate tag id definition.'];
-						if ((k + 1) >= tag.length)
-							return [tag[k][1], tag[k][2], 'Missing numeric value for ID.'];
-						id = _parseNum(tag[++k][0]);
-						if ((id < 0) || (id > 0xffffffff))
-							return [tag[k][1], tag[k][2], 'Invalid or out of range tag ID.'];
-					} else if (tkeyword === 'default') {
-						if (dfl !== null)
-							return [tag[k][1], tag[k][2], 'Duplicate tag default directive.'];
-						if ((k + 1) >= tag.length)
-							return [tag[k][1], tag[k][2], 'Missing value for default.'];
-						dfl = tag[++k][0];
-					} else if (tkeyword === 'flag') {
-						if ((k + 2) >= tag.length)
-							return [tag[k][1], tag[k][2], 'Missing tag flag name or bit index.'];
-						++k;
-						let bits = tag[k][0].split(/[,]+/);
-						let mask = 0;
-						for (let j = 0; j < bits.length; ++j) {
-							let b = bits[j].toLowerCase();
-							if (b in flags) {
-								mask |= flags[b];
-							} else {
-								b = _parseNum(b);
-								if ((b < 0) || (b > 31))
-									return [tag[k][1], tag[k][2], 'Bit index invalid, out of range, or references an undefined flag name.'];
-								mask |= (1 << b);
-							}
-						}
-						let flagName = tag[++k][0].toLowerCase();
-						if (!_isValidName(flagName))
-							return [tag[k][1], tag[k][2], 'Invalid or reserved flag name.'];
-						if (flagName in flags)
-							return [tag[k][1], tag[k][2], 'Duplicate flag name in tag definition.'];
-						flags[flagName] = mask;
-					} else if (tkeyword === 'enum') {
-						if ((k + 2) >= tag.length)
-							return [tag[k][1], tag[k][2], 'Missing tag enum name or value.'];
-						++k;
-						let value = _parseNum(tag[k][0]);
-						if ((value < 0) || (value > 0xffffffff))
-							return [tag[k][1], tag[k][2], 'Tag enum value invalid or out of range.'];
-						let enumName = tag[++k][0].toLowerCase();
-						if (!_isValidName(enumName))
-							return [tag[k][1], tag[k][2], 'Invalid or reserved tag enum name.'];
-						if (enumName in enums)
-							return [tag[k][1], tag[k][2], 'Duplicate enum name in tag definition.'];
-						enums[enumName] = value;
-					} else {
-						return [tag[k][1], tag[k][2], 'Unrecognized keyword in tag definition.'];
-					}
-				}
-				if (id < 0)
-					return [tag[0][1], tag[0][2], 'Tag definition is missing a numeric ID.'];
-
-				if (typeof dfl === 'string') {
-					let dfl2 = enums[dfl];
-					if (typeof dfl2 === 'number') {
-						dfl = dfl2;
-					} else {
-						dfl2 = flags[dfl];
-						if (typeof dfl2 === 'number') {
-							dfl = dfl2;
-						} else {
-							dfl = Math.abs(parseInt(dfl) || 0) & 0xffffffff;
-						}
-					}
-				} else if (typeof dfl === 'number') {
-					dfl = Math.abs(dfl) & 0xffffffff;
-				}
-
-				tags[tagName] = {
-					'id': id,
-					'default': dfl,
-					'enums': enums,
-					'flags': flags
-				};
-			} else if (keyword === 'cap') {
-				// Define capabilities
-
-				if (((i + 1) >= parsed.length) || (!Array.isArray(parsed[i + 1])) || (parsed[i + 1].length < 1) || (!Array.isArray(parsed[i + 1][0])))
-					return [parsed[i][1], parsed[i][2], 'Capability definition is missing name.'];
-				let cap = parsed[++i];
-				let capName = cap[0][0].toLowerCase();
-
-				if (!_isValidName(capName))
-					return [cap[0][1], cap[0][2], 'Invalid capability name.'];
-				if (capName in RESERVED_WORDS)
-					return [cap[0][1], cap[0][2], 'Capability name is a reserved word.'];
-
-				if (capName in caps)
-					return [cap[0][1], cap[0][2], 'Multiple definition of capability name.'];
-
-				let capRules = [];
-				let id = -1;
-				let dfl = false;
-				for (let k = 1; k < cap.length; ++k) {
-					let dn = (typeof cap[k][0] === 'string') ? cap[k][0].toLowerCase() : null;
-					if (dn === 'id') {
-						if (id >= 0)
-							return [cap[k][1], cap[k][2], 'Duplicate id directive in capability definition.'];
-						if ((k + 1) >= cap.length)
-							return [cap[k][1], cap[k][2], 'Missing value for ID.'];
-						id = _parseNum(cap[++k][0]);
-						if ((id < 0) || (id > 0xffffffff))
-							return [cap[k - 1][1], cap[k - 1][2], 'Invalid or out of range capability ID.'];
-						for (let cn in caps) {
-							if (caps[cn].id === id)
-								return [cap[k - 1][1], cap[k - 1][2], 'Duplicate capability ID.'];
-						}
-					} else if (dn === 'default') {
-						dfl = true;
-					} else {
-						capRules.push(cap[k]);
-					}
-				}
-				if (id < 0)
-					return [cap[0][1], cap[0][2], 'Capability definition is missing a numeric ID.'];
-
-				caps[capName] = {
-					'id': id,
-					'default': dfl,
-					'rules': capRules
-				};
-			} else {
-				baseRuleTree.push(parsed[i]);
-			}
-		}
-
-		// Pass 3: render low-level ZeroTier rules arrays for capabilities and base.
-
-		for (let capName in caps) {
-			let r = [];
-			let err = _renderActions(caps[capName].rules, r, macros, caps, tags, {});
-			if (err !== null)
-				return err;
-			caps[capName].rules = r;
-		}
-
-		let err = _renderActions(baseRuleTree, rules, macros, caps, tags, {});
-		if (err !== null)
-			return err;
-
-		return null;
-	} catch (e) {
-		console.log(e.stack);
-		return [0, 0, 'Unexpected exception: ' + e.toString()];
-	}
-}
-
-exports.compile = compile;
diff --git a/rustybits/Cargo.lock b/rustybits/Cargo.lock
deleted file mode 100644
index 68835bddd..000000000
--- a/rustybits/Cargo.lock
+++ /dev/null
@@ -1,4207 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
-
-[[package]]
-name = "anyhow"
-version = "1.0.98"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
-
-[[package]]
-name = "async-trait"
-version = "0.1.88"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
-[[package]]
-name = "axum"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
-dependencies = [
- "axum-core",
- "bytes",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "sync_wrapper 1.0.2",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
-dependencies = [
- "bytes",
- "futures-core",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "rustversion",
- "sync_wrapper 1.0.2",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "backoff"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
-dependencies = [
- "getrandom 0.2.16",
- "instant",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "base16ct"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "base64ct"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
-
-[[package]]
-name = "cbindgen"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc"
-dependencies = [
- "clap",
- "heck 0.3.3",
- "indexmap 1.9.3",
- "log",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "syn 1.0.109",
- "tempfile",
- "toml",
-]
-
-[[package]]
-name = "cc"
-version = "1.2.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
-
-[[package]]
-name = "chrono"
-version = "0.4.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-link",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
-[[package]]
-name = "crypto-bigint"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "generic-array",
- "rand_core 0.6.4",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373b7c5dbd637569a2cca66e8d66b8c446a1e7bf064ea321d265d7b3dfe7c97e"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest",
- "fiat-crypto",
- "rustc_version",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.11.1",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "der"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
-dependencies = [
- "const-oid",
- "pem-rfc7468",
- "zeroize",
-]
-
-[[package]]
-name = "deranged"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
-dependencies = [
- "powerfmt",
- "serde",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
-dependencies = [
- "derive_builder_core",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "derive_more"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "unicode-xid",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "const-oid",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "downcast"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
-
-[[package]]
-name = "ecdsa"
-version = "0.16.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
-dependencies = [
- "der",
- "digest",
- "elliptic-curve",
- "rfc6979",
- "signature",
- "spki",
-]
-
-[[package]]
-name = "ed25519"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
-dependencies = [
- "pkcs8",
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "serde",
- "sha2",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.13.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "digest",
- "ff",
- "generic-array",
- "group",
- "hkdf",
- "pem-rfc7468",
- "pkcs8",
- "rand_core 0.6.4",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "enum-iterator"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c280b9e6b3ae19e152d8e31cf47f18389781e119d4013a2a2bb0180e5facc635"
-dependencies = [
- "enum-iterator-derive",
-]
-
-[[package]]
-name = "enum-iterator-derive"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "enum_dispatch"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
-dependencies = [
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "erased-serde"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
-dependencies = [
- "serde",
- "typeid",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
-dependencies = [
- "libc",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "ff"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
-dependencies = [
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "fiat-crypto"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24"
-
-[[package]]
-name = "fixedbitset"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foldhash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fragile"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
-
-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "futures-retry"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde5a672a61f96552aa5ed9fd9c81c3fbdae4be9b1e205d6eaf17c83705adc0f"
-dependencies = [
- "futures",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
-
-[[package]]
-name = "futures-task"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
-[[package]]
-name = "futures-util"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
- "zeroize",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
-[[package]]
-name = "governor"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be93b4ec2e4710b04d9264c0c7350cdd62a8c20e5e4ac732552ebb8f0debe8eb"
-dependencies = [
- "cfg-if",
- "dashmap",
- "futures-sink",
- "futures-timer",
- "futures-util",
- "getrandom 0.3.3",
- "no-std-compat",
- "nonzero_ext",
- "parking_lot",
- "portable-atomic",
- "quanta",
- "rand 0.9.1",
- "smallvec",
- "spinning_top",
- "web-time",
-]
-
-[[package]]
-name = "group"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
-dependencies = [
- "ff",
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.10.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http 1.3.1",
- "indexmap 2.10.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
-dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hkdf"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
-dependencies = [
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.12",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http 1.3.1",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
-dependencies = [
- "bytes",
- "futures-core",
- "http 1.3.1",
- "http-body 1.0.1",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "hyper"
-version = "0.14.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.27",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2 0.4.11",
- "http 1.3.1",
- "http-body 1.0.1",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-timeout"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
-dependencies = [
- "hyper 1.6.0",
- "hyper-util",
- "pin-project-lite",
- "tokio",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper 0.14.32",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "hyper 1.6.0",
- "libc",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "log",
- "wasm-bindgen",
- "windows-core 0.61.2",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "icu_collections"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
-dependencies = [
- "displaydoc",
- "potential_utf",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locale_core"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
-
-[[package]]
-name = "icu_properties"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locale_core",
- "icu_properties_data",
- "icu_provider",
- "potential_utf",
- "zerotrie",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
-
-[[package]]
-name = "icu_provider"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
-dependencies = [
- "displaydoc",
- "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerotrie",
- "zerovec",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.4",
- "serde",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "inventory"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83"
-dependencies = [
- "rustversion",
-]
-
-[[package]]
-name = "io-uring"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
-dependencies = [
- "bitflags 2.9.1",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
-
-[[package]]
-name = "js-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "jwt"
-version = "0.16.0"
-source = "git+https://github.com/glimberg/rust-jwt#61a9291fdeec747c6edf14f4fa0caf235136c168"
-dependencies = [
- "base64 0.13.1",
- "crypto-common",
- "digest",
- "hmac",
- "serde",
- "serde_json",
- "sha2",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-dependencies = [
- "spin",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.174"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
-
-[[package]]
-name = "libm"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
-
-[[package]]
-name = "litemap"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
-
-[[package]]
-name = "lock_api"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-
-[[package]]
-name = "lru"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
-dependencies = [
- "hashbrown 0.15.4",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "matchit"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
-
-[[package]]
-name = "memchr"
-version = "2.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
-dependencies = [
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "mockall"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2"
-dependencies = [
- "cfg-if",
- "downcast",
- "fragile",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "multimap"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
-
-[[package]]
-name = "native-tls"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework 2.11.1",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "no-std-compat"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-
-[[package]]
-name = "nonzero_ext"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
-
-[[package]]
-name = "ntapi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-bigint-dig"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
-dependencies = [
- "byteorder",
- "lazy_static",
- "libm",
- "num-integer",
- "num-iter",
- "num-traits",
- "rand 0.8.5",
- "smallvec",
- "zeroize",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "oauth2"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "getrandom 0.2.16",
- "http 0.2.12",
- "rand 0.8.5",
- "reqwest",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "sha2",
- "thiserror 1.0.69",
- "url",
-]
-
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
-
-[[package]]
-name = "openidconnect"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f47e80a9cfae4462dd29c41e987edd228971d6565553fbc14b8a11e666d91590"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "dyn-clone",
- "ed25519-dalek",
- "hmac",
- "http 0.2.12",
- "itertools 0.10.5",
- "log",
- "oauth2",
- "p256",
- "p384",
- "rand 0.8.5",
- "rsa",
- "serde",
- "serde-value",
- "serde_derive",
- "serde_json",
- "serde_path_to_error",
- "serde_plain",
- "serde_with",
- "sha2",
- "subtle",
- "thiserror 1.0.69",
- "url",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
-dependencies = [
- "bitflags 2.9.1",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "opentelemetry"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf416e4cb72756655126f7dd7bb0af49c674f4c1b9903e80c009e0c37e552e6"
-dependencies = [
- "futures-core",
- "futures-sink",
- "js-sys",
- "pin-project-lite",
- "thiserror 2.0.12",
- "tracing",
-]
-
-[[package]]
-name = "ordered-float"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "p256"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p384"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "pem-rfc7468"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-dependencies = [
- "base64ct",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "petgraph"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
-dependencies = [
- "fixedbitset",
- "indexmap 2.10.0",
-]
-
-[[package]]
-name = "pid"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c931ef9756cd5e3fa3d395bfe09df4dfa6f0612c6ca8f6b12927d17ca34e36"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkcs1"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
-dependencies = [
- "der",
- "pkcs8",
- "spki",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-dependencies = [
- "der",
- "spki",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-
-[[package]]
-name = "portable-atomic"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
-
-[[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "potential_utf"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
-dependencies = [
- "zerovec",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "predicates"
-version = "3.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
-dependencies = [
- "anstyle",
- "predicates-core",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.2.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a"
-dependencies = [
- "proc-macro2",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "primeorder"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
-dependencies = [
- "elliptic-curve",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "prost"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
-dependencies = [
- "heck 0.5.0",
- "itertools 0.14.0",
- "log",
- "multimap",
- "once_cell",
- "petgraph",
- "prettyplease",
- "prost",
- "prost-types",
- "regex",
- "syn 2.0.104",
- "tempfile",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
-dependencies = [
- "anyhow",
- "itertools 0.14.0",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "prost-wkt"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497e1e938f0c09ef9cabe1d49437b4016e03e8f82fbbe5d1c62a9b61b9decae1"
-dependencies = [
- "chrono",
- "inventory",
- "prost",
- "serde",
- "serde_derive",
- "serde_json",
- "typetag",
-]
-
-[[package]]
-name = "prost-wkt-build"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b8bf115b70a7aa5af1fd5d6e9418492e9ccb6e4785e858c938e28d132a884b"
-dependencies = [
- "heck 0.5.0",
- "prost",
- "prost-build",
- "prost-types",
- "quote",
-]
-
-[[package]]
-name = "prost-wkt-types"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cdde6df0a98311c839392ca2f2f0bcecd545f86a62b4e3c6a49c336e970fe5"
-dependencies = [
- "chrono",
- "prost",
- "prost-build",
- "prost-types",
- "prost-wkt",
- "prost-wkt-build",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "quanta"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
-dependencies = [
- "crossbeam-utils",
- "libc",
- "once_cell",
- "raw-cpuid",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
-dependencies = [
- "rand_chacha 0.9.0",
- "rand_core 0.9.3",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.9.3",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
-dependencies = [
- "getrandom 0.3.3",
-]
-
-[[package]]
-name = "raw-cpuid"
-version = "11.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "ref-cast"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.27",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "rfc6979"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
-dependencies = [
- "hmac",
- "subtle",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom 0.2.16",
- "libc",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ringbuf"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe47b720588c8702e34b5979cb3271a8b1842c7cb6f57408efa70c779363488c"
-dependencies = [
- "crossbeam-utils",
- "portable-atomic",
- "portable-atomic-util",
-]
-
-[[package]]
-name = "rsa"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
-dependencies = [
- "const-oid",
- "digest",
- "num-bigint-dig",
- "num-integer",
- "num-traits",
- "pkcs1",
- "pkcs8",
- "rand_core 0.6.4",
- "signature",
- "spki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustfsm"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#49a0af54ff88b13c5b906a74df8f283601c2b962"
-dependencies = [
- "rustfsm_procmacro",
- "rustfsm_trait",
-]
-
-[[package]]
-name = "rustfsm_procmacro"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#49a0af54ff88b13c5b906a74df8f283601c2b962"
-dependencies = [
- "derive_more",
- "proc-macro2",
- "quote",
- "rustfsm_trait",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "rustfsm_trait"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#49a0af54ff88b13c5b906a74df8f283601c2b962"
-
-[[package]]
-name = "rustix"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
-dependencies = [
- "bitflags 2.9.1",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
-dependencies = [
- "log",
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
-dependencies = [
- "openssl-probe",
- "rustls-pki-types",
- "schannel",
- "security-framework 3.2.0",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64 0.21.7",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
-dependencies = [
- "zeroize",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.103.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
-
-[[package]]
-name = "ryu"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-
-[[package]]
-name = "schannel"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "schemars"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "sec1"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
-dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.9.1",
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
-dependencies = [
- "bitflags 2.9.1",
- "core-foundation 0.10.1",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
-
-[[package]]
-name = "serde"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-value"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
-dependencies = [
- "ordered-float",
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.140"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
-dependencies = [
- "itoa",
- "serde",
-]
-
-[[package]]
-name = "serde_plain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_with"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
-dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.10.0",
- "schemars 0.9.0",
- "schemars 1.0.4",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "signature"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-dependencies = [
- "digest",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
-[[package]]
-name = "slab"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
-
-[[package]]
-name = "slotmap"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-
-[[package]]
-name = "smeeclient"
-version = "0.1.0"
-dependencies = [
- "cbindgen",
- "serde",
- "temporal-client",
- "temporal-sdk",
- "temporal-sdk-core-protos",
- "tokio",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "spinning_top"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
-
-[[package]]
-name = "synstructure"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.33.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01"
-dependencies = [
- "core-foundation-sys",
- "libc",
- "memchr",
- "ntapi",
- "windows",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
-dependencies = [
- "fastrand",
- "getrandom 0.3.3",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "temporal-client"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#49a0af54ff88b13c5b906a74df8f283601c2b962"
-dependencies = [
- "anyhow",
- "async-trait",
- "backoff",
- "base64 0.22.1",
- "bytes",
- "derive_builder",
- "derive_more",
- "futures-retry",
- "futures-util",
- "http 1.3.1",
- "http-body-util",
- "hyper 1.6.0",
- "hyper-util",
- "opentelemetry",
- "parking_lot",
- "slotmap",
- "temporal-sdk-core-api",
- "temporal-sdk-core-protos",
- "thiserror 2.0.12",
- "tokio",
- "tonic",
- "tower",
- "tracing",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "temporal-sdk"
-version = "0.1.0-alpha.1"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#49a0af54ff88b13c5b906a74df8f283601c2b962"
-dependencies = [
- "anyhow",
- "async-trait",
- "derive_more",
- "futures-util",
- "parking_lot",
- "prost-wkt-types",
- "serde",
- "temporal-client",
- "temporal-sdk-core",
- "temporal-sdk-core-api",
- "temporal-sdk-core-protos",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "temporal-sdk-core"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#49a0af54ff88b13c5b906a74df8f283601c2b962"
-dependencies = [
- "anyhow",
- "async-trait",
- "crossbeam-channel",
- "crossbeam-queue",
- "crossbeam-utils",
- "dashmap",
- "derive_builder",
- "derive_more",
- "enum-iterator",
- "enum_dispatch",
- "futures-channel",
- "futures-util",
- "governor",
- "itertools 0.14.0",
- "lru",
- "mockall",
- "parking_lot",
- "pid",
- "pin-project",
- "prost",
- "prost-wkt-types",
- "rand 0.9.1",
- "ringbuf",
- "rustfsm",
- "serde",
- "serde_json",
- "siphasher",
- "slotmap",
- "sysinfo",
- "temporal-client",
- "temporal-sdk-core-api",
- "temporal-sdk-core-protos",
- "thiserror 2.0.12",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tonic",
- "tracing",
- "tracing-subscriber",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "temporal-sdk-core-api"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#49a0af54ff88b13c5b906a74df8f283601c2b962"
-dependencies = [
- "async-trait",
- "derive_builder",
- "derive_more",
- "opentelemetry",
- "prost",
- "serde_json",
- "temporal-sdk-core-protos",
- "thiserror 2.0.12",
- "tonic",
- "tracing",
- "tracing-core",
- "url",
-]
-
-[[package]]
-name = "temporal-sdk-core-protos"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#49a0af54ff88b13c5b906a74df8f283601c2b962"
-dependencies = [
- "anyhow",
- "base64 0.22.1",
- "derive_more",
- "prost",
- "prost-build",
- "prost-wkt",
- "prost-wkt-build",
- "prost-wkt-types",
- "rand 0.9.1",
- "serde",
- "serde_json",
- "thiserror 2.0.12",
- "tonic",
- "tonic-build",
- "uuid",
-]
-
-[[package]]
-name = "termtree"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl 1.0.69",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
-dependencies = [
- "thiserror-impl 2.0.12",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "time"
-version = "0.3.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
-
-[[package]]
-name = "time-macros"
-version = "0.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "tinystr"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
-[[package]]
-name = "tokio"
-version = "1.46.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
-dependencies = [
- "backtrace",
- "bytes",
- "io-uring",
- "libc",
- "mio",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "slab",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
-dependencies = [
- "rustls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tonic"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9"
-dependencies = [
- "async-trait",
- "axum",
- "base64 0.22.1",
- "bytes",
- "h2 0.4.11",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.6.0",
- "hyper-timeout",
- "hyper-util",
- "percent-encoding",
- "pin-project",
- "prost",
- "rustls-native-certs",
- "socket2",
- "tokio",
- "tokio-rustls",
- "tokio-stream",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tonic-build"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac6f67be712d12f0b41328db3137e0d0757645d8904b4cb7d51cd9c2279e847"
-dependencies = [
- "prettyplease",
- "proc-macro2",
- "prost-build",
- "prost-types",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "tower"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
-dependencies = [
- "futures-core",
- "futures-util",
- "indexmap 2.10.0",
- "pin-project-lite",
- "slab",
- "sync_wrapper 1.0.2",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
-[[package]]
-name = "tracing"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "parking_lot",
- "regex",
- "sharded-slab",
- "thread_local",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "typeid"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
-
-[[package]]
-name = "typenum"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
-
-[[package]]
-name = "typetag"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f22b40dd7bfe8c14230cf9702081366421890435b2d625fa92b4acc4c3de6f"
-dependencies = [
- "erased-serde",
- "inventory",
- "once_cell",
- "serde",
- "typetag-impl",
-]
-
-[[package]]
-name = "typetag-impl"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
-[[package]]
-name = "uuid"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
-dependencies = [
- "getrandom 0.3.3",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-
-[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
-dependencies = [
- "wit-bindgen-rt",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
-dependencies = [
- "cfg-if",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "web-time"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
-dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
-dependencies = [
- "windows-implement 0.57.0",
- "windows-interface 0.57.0",
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-dependencies = [
- "windows-implement 0.60.0",
- "windows-interface 0.59.1",
- "windows-link",
- "windows-result 0.3.4",
- "windows-strings",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.60.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
-dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "writeable"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
-
-[[package]]
-name = "yoke"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "synstructure",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "synstructure",
-]
-
-[[package]]
-name = "zeroidc"
-version = "0.1.0"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "cbindgen",
- "jwt",
- "openidconnect",
- "reqwest",
- "serde",
- "thiserror 1.0.69",
- "time",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zerotrie"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
diff --git a/rustybits/Cargo.toml b/rustybits/Cargo.toml
deleted file mode 100644
index 3de352217..000000000
--- a/rustybits/Cargo.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[workspace]
-resolver = "2"
-members = ["smeeclient", "zeroidc"]
-
-[profile.release]
-strip = "debuginfo"
diff --git a/rustybits/rustfmt.toml b/rustybits/rustfmt.toml
deleted file mode 100644
index 9b1e1eefb..000000000
--- a/rustybits/rustfmt.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-#unstable_features = true
-max_width = 120
-#use_small_heuristics = "Max"
-edition = "2021"
-#empty_item_single_line = true
-newline_style = "Unix"
-struct_lit_width = 60
-tab_spaces = 4
-use_small_heuristics = "Default"
-#fn_single_line = true
-#hex_literal_case = "Lower"
-#merge_imports = true
-#group_imports = "StdExternalCrate"
-single_line_if_else_max_width = 0
-use_try_shorthand = true
diff --git a/rustybits/smeeclient/Cargo.toml b/rustybits/smeeclient/Cargo.toml
deleted file mode 100644
index 6f32da35d..000000000
--- a/rustybits/smeeclient/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "smeeclient"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["staticlib", "rlib"]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-serde = { version = "1", features = ["derive"] }
-temporal-sdk = { git = "https://github.com/temporalio/sdk-core", branch = "master" }
-temporal-client = { git = "https://github.com/temporalio/sdk-core", branch = "master", features = ["telemetry"] }
-temporal-sdk-core-protos = { git = "https://github.com/temporalio/sdk-core", branch = "master" }
-tokio = { version = "1.43", features = ["full"] }
-url = { version = "2" }
-uuid = { version = "1.4", features = ["v4"] }
-
-[build-dependencies]
-cbindgen = "0.20"
diff --git a/rustybits/smeeclient/build.rs b/rustybits/smeeclient/build.rs
deleted file mode 100644
index 73e97bcc6..000000000
--- a/rustybits/smeeclient/build.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-extern crate cbindgen;
-
-use cbindgen::{Config, Language};
-use std::env;
-use std::path::PathBuf;
-
-fn main() {
-    let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-
-    let package_name = env::var("CARGO_PKG_NAME").unwrap();
-    let output_file = target_dir().join(format!("{package_name}.h")).display().to_string();
-
-    let config = Config {
-        language: Language::C,
-        cpp_compat: true,
-        namespace: Some(String::from("smeeclient")),
-        ..Default::default()
-    };
-
-    cbindgen::generate_with_config(&crate_dir, config)
-        .unwrap()
-        .write_to_file(&output_file);
-}
-
-/// Find the location of the `target/` directory. Note that this may be
-/// overridden by `cmake`, so we also need to check the `CARGO_TARGET_DIR`
-/// variable.
-fn target_dir() -> PathBuf {
-    if let Ok(target) = env::var("CARGO_TARGET_DIR") {
-        PathBuf::from(target)
-    } else {
-        PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
-            .join("..")
-            .join("target")
-    }
-}
diff --git a/rustybits/smeeclient/rustfmt.toml b/rustybits/smeeclient/rustfmt.toml
deleted file mode 120000
index 39f97b043..000000000
--- a/rustybits/smeeclient/rustfmt.toml
+++ /dev/null
@@ -1 +0,0 @@
-../rustfmt.toml
\ No newline at end of file
diff --git a/rustybits/smeeclient/src/ext.rs b/rustybits/smeeclient/src/ext.rs
deleted file mode 100644
index b5517d866..000000000
--- a/rustybits/smeeclient/src/ext.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c)2021 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-
-#![allow(clippy::uninlined_format_args, clippy::missing_safety_doc)]
-
-use std::ffi::CStr;
-use std::os::raw::c_char;
-
-use crate::NetworkJoinedParams;
-use crate::SmeeClient;
-
-#[no_mangle]
-pub unsafe extern "C" fn smee_client_new(
-    temporal_url: *const c_char,
-    namespace: *const c_char,
-    task_queue: *const c_char,
-) -> *mut SmeeClient {
-    let url = unsafe {
-        assert!(!temporal_url.is_null());
-        CStr::from_ptr(temporal_url).to_str().unwrap()
-    };
-
-    let ns = unsafe {
-        assert!(!namespace.is_null());
-        CStr::from_ptr(namespace).to_str().unwrap()
-    };
-
-    let tq = unsafe {
-        assert!(!task_queue.is_null());
-        CStr::from_ptr(task_queue).to_str().unwrap()
-    };
-
-    match SmeeClient::new(url, ns, tq) {
-        Ok(c) => Box::into_raw(Box::new(c)),
-        Err(e) => {
-            println!("error creating smee client instance: {}", e);
-            std::ptr::null_mut()
-        }
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn smee_client_delete(ptr: *mut SmeeClient) {
-    if ptr.is_null() {
-        return;
-    }
-    let smee = unsafe {
-        assert!(!ptr.is_null());
-        Box::from_raw(&mut *ptr)
-    };
-
-    smee.shutdown();
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn smee_client_notify_network_joined(
-    smee_instance: *mut SmeeClient,
-    network_id: *const c_char,
-    member_id: *const c_char,
-) -> bool {
-    let nwid = unsafe {
-        assert!(!network_id.is_null());
-        CStr::from_ptr(network_id).to_str().unwrap()
-    };
-
-    let mem_id = unsafe {
-        assert!(!member_id.is_null());
-        CStr::from_ptr(member_id).to_str().unwrap()
-    };
-
-    let smee = unsafe {
-        assert!(!smee_instance.is_null());
-        &mut *smee_instance
-    };
-
-    let params = NetworkJoinedParams::new(nwid, mem_id);
-
-    match smee.notify_network_joined(params) {
-        Ok(()) => true,
-        Err(e) => {
-            println!("error notifying network joined: {0}", e);
-            false
-        }
-    }
-}
diff --git a/rustybits/smeeclient/src/lib.rs b/rustybits/smeeclient/src/lib.rs
deleted file mode 100644
index 649bb0632..000000000
--- a/rustybits/smeeclient/src/lib.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c)2023 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-
-pub mod ext;
-
-use serde::{Deserialize, Serialize};
-use std::str::FromStr;
-use std::time::Duration;
-use temporal_client::{Client, ClientOptionsBuilder, RetryClient, WorkflowClientTrait, WorkflowOptions};
-use temporal_sdk_core_protos::{
-    coresdk::AsJsonPayloadExt,
-    temporal::api::enums::v1::{WorkflowIdConflictPolicy, WorkflowIdReusePolicy},
-};
-use url::Url;
-use uuid::Uuid;
-
-const CLIENT_NAME: &str = "SmeeClient-Rust";
-const CLIENT_VERSION: &str = "0.1";
-const NETWORK_JOINED_WORKFLOW: &str = "NetworkJoinedWorkflow";
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-pub struct NetworkJoinedParams {
-    #[serde(rename = "NetworkID")]
-    pub network_id: String,
-
-    #[serde(rename = "MemberID")]
-    pub member_id: String,
-}
-
-impl NetworkJoinedParams {
-    fn new(network_id: &str, member_id: &str) -> Self {
-        Self {
-            network_id: network_id.to_string(),
-            member_id: member_id.to_string(),
-        }
-    }
-}
-
-pub struct SmeeClient {
-    tokio_rt: tokio::runtime::Runtime,
-    client: RetryClient<Client>,
-    task_queue: String,
-}
-
-impl SmeeClient {
-    pub fn new(temporal_url: &str, namespace: &str, task_queue: &str) -> Result<Self, Box<dyn std::error::Error>> {
-        // start tokio runtime.  Required by temporal
-        let rt = tokio::runtime::Runtime::new()?;
-
-        let c = ClientOptionsBuilder::default()
-            .target_url(Url::from_str(temporal_url).unwrap())
-            .client_name(CLIENT_NAME)
-            .client_version(CLIENT_VERSION)
-            .build()?;
-
-        let con = rt.block_on(async { c.connect(namespace.to_string(), None).await })?;
-
-        Ok(Self {
-            tokio_rt: rt,
-            client: con,
-            task_queue: task_queue.to_string(),
-        })
-    }
-
-    pub fn notify_network_joined(&self, params: NetworkJoinedParams) -> Result<(), Box<dyn std::error::Error>> {
-        println!("notifying network joined");
-        let options = WorkflowOptions {
-            id_reuse_policy: WorkflowIdReusePolicy::RejectDuplicate,
-            id_conflict_policy: WorkflowIdConflictPolicy::Fail,
-            execution_timeout: None,
-            completion_callbacks: Default::default(),
-            links: Default::default(),
-            priority: None,
-            run_timeout: None,
-            task_timeout: None,
-            cron_schedule: None,
-            search_attributes: None,
-            enable_eager_workflow_start: false,
-            retry_policy: Some(Default::default()),
-        };
-
-        let payload = vec![params.as_json_payload()?];
-
-        let workflow_id = Uuid::new_v4();
-
-        self.tokio_rt.block_on(async {
-            println!("calilng start_workflow");
-            self.client
-                .start_workflow(
-                    payload,
-                    self.task_queue.clone(),
-                    workflow_id.hyphenated().to_string(),
-                    String::from(NETWORK_JOINED_WORKFLOW),
-                    None,
-                    options,
-                )
-                .await
-        })?;
-
-        Ok(())
-    }
-
-    pub fn shutdown(self) {
-        self.tokio_rt.shutdown_timeout(Duration::from_secs(5))
-    }
-}
diff --git a/rustybits/zeroidc.vcxproj b/rustybits/zeroidc.vcxproj
deleted file mode 100644
index 833437238..000000000
--- a/rustybits/zeroidc.vcxproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{175C340F-F5BA-4CB1-88AD-533B102E3799}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>cargo build -p zeroidc --release --target=x86_64-pc-windows-msvc</NMakeBuildCommandLine>
-    <NMakeOutput>
-    </NMakeOutput>
-    <NMakeCleanCommandLine>cargo clean</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>cargo clean &amp; cargo build -p zeroidc --release --target=x86_64-pc-windows-msvc</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <NMakeBuildCommandLine>cargo build -p zeroidc --release --target=aarch64-pc-windows-msvc</NMakeBuildCommandLine>
-    <NMakeOutput />
-    <NMakeCleanCommandLine>cargo clean</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>cargo clean &amp; cargo build -p zeroidc --release --target=aarch64-pc-windows-msvc</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>cargo build -p zeroidc --target=i686-pc-windows-msvc</NMakeBuildCommandLine>
-    <NMakeOutput>
-    </NMakeOutput>
-    <NMakeCleanCommandLine>cargo clean</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>cargo clean &amp; cargo build -p zeroidc --target=i686-pc-windows-msvc</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>cargo build -p zeroidc --target=x86_64-pc-windows-msvc</NMakeBuildCommandLine>
-    <NMakeOutput>
-    </NMakeOutput>
-    <NMakeCleanCommandLine>cargo clean</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>cargo clean &amp; cargo build -p zeroidc --target=x86_64-pc-windows-msvc</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <NMakeBuildCommandLine>cargo build -p zeroidc --target=aarch64-pc-windows-msvc</NMakeBuildCommandLine>
-    <NMakeOutput />
-    <NMakeCleanCommandLine>cargo clean</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>cargo clean &amp; cargo build -p zeroidc --target=aarch64-pc-windows-msvc</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>cargo build --release -p zeroidc --target=i686-pc-windows-msvc</NMakeBuildCommandLine>
-    <NMakeOutput>
-    </NMakeOutput>
-    <NMakeCleanCommandLine>cargo clean</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>cargo clean &amp; cargo build -p zeroidc --release --target=i686-pc-windows-msvc</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="src\ext.rs" />
-    <None Include="src\lib.rs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="target\zeroidc.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/rustybits/zeroidc.vcxproj.filters b/rustybits/zeroidc.vcxproj.filters
deleted file mode 100644
index 432c20f81..000000000
--- a/rustybits/zeroidc.vcxproj.filters
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="src\ext.rs">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="src\lib.rs">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="target\zeroidc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/rustybits/zeroidc/.cargo/config.toml b/rustybits/zeroidc/.cargo/config.toml
deleted file mode 100644
index 5326b3647..000000000
--- a/rustybits/zeroidc/.cargo/config.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[target.x86_64-apple-darwin]
-rustflags=["-C", "link-arg=-mmacosx-version-min=10.13"]
-
-[target.aarch64-apple-darwin]
-rustflags=["-C", "link-arg=-mmacosx-version-min=10.13"]
-
-[target.x86_64-pc-windows-msvc]
-rustflags = ["-C", "target-feature=+crt-static"]
-
-[target.i686-pc-windows-msvc]
-rustflags = ["-C", "target-feature=+crt-static"]
diff --git a/rustybits/zeroidc/.gitattributes b/rustybits/zeroidc/.gitattributes
deleted file mode 100644
index ba3a8fca8..000000000
--- a/rustybits/zeroidc/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-# disable autocrlf because it doesn't mix well with
-# vendored rust packages
-* text=false
diff --git a/rustybits/zeroidc/Cargo.toml b/rustybits/zeroidc/Cargo.toml
deleted file mode 100644
index e38c80e69..000000000
--- a/rustybits/zeroidc/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "zeroidc"
-version = "0.1.0"
-edition = "2021"
-build = "build.rs"
-publish = false
-
-[lib]
-crate-type = ["staticlib", "rlib"]
-
-[dependencies]
-openidconnect = { version = "3.4", default-features = false, features = [
-    "reqwest",
-    "native-tls",
-    "accept-rfc3339-timestamps",
-] }
-base64 = "0.21"
-url = "2.3"
-reqwest = "0.11"
-jwt = { version = "0.16", git = "https://github.com/glimberg/rust-jwt" }
-serde = "1.0"
-time = { version = "~0.3", features = ["formatting"] }
-bytes = "1.3"
-thiserror = "1"
-tokio = { version = ">=1.24" }
-
-[build-dependencies]
-cbindgen = "0.20"
diff --git a/rustybits/zeroidc/build.rs b/rustybits/zeroidc/build.rs
deleted file mode 100644
index fbb256fc6..000000000
--- a/rustybits/zeroidc/build.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-extern crate cbindgen;
-
-use cbindgen::{Config, Language};
-use std::env;
-use std::path::PathBuf;
-
-fn main() {
-    let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-
-    let package_name = env::var("CARGO_PKG_NAME").unwrap();
-    let output_file = target_dir().join(format!("{package_name}.h")).display().to_string();
-
-    let config = Config {
-        language: Language::C,
-        cpp_compat: true,
-        namespace: Some(String::from("zeroidc")),
-        ..Default::default()
-    };
-
-    cbindgen::generate_with_config(&crate_dir, config)
-        .unwrap()
-        .write_to_file(&output_file);
-}
-
-/// Find the location of the `target/` directory. Note that this may be
-/// overridden by `cmake`, so we also need to check the `CARGO_TARGET_DIR`
-/// variable.
-fn target_dir() -> PathBuf {
-    if let Ok(target) = env::var("CARGO_TARGET_DIR") {
-        PathBuf::from(target)
-    } else {
-        PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
-            .join("..")
-            .join("target")
-    }
-}
diff --git a/rustybits/zeroidc/rustfmt.toml b/rustybits/zeroidc/rustfmt.toml
deleted file mode 120000
index 39f97b043..000000000
--- a/rustybits/zeroidc/rustfmt.toml
+++ /dev/null
@@ -1 +0,0 @@
-../rustfmt.toml
\ No newline at end of file
diff --git a/rustybits/zeroidc/src/error.rs b/rustybits/zeroidc/src/error.rs
deleted file mode 100644
index 4495254d1..000000000
--- a/rustybits/zeroidc/src/error.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c)2022 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum ZeroIDCError {
-    #[error(transparent)]
-    DiscoveryError(#[from] openidconnect::DiscoveryError<openidconnect::reqwest::Error<reqwest::Error>>),
-
-    #[error(transparent)]
-    ParseError(#[from] url::ParseError),
-}
-
-#[derive(Error, Debug)]
-#[error("SSO Exchange Error: {message:}")]
-pub struct SSOExchangeError {
-    message: String,
-}
-
-impl SSOExchangeError {
-    pub fn new(message: String) -> Self {
-        SSOExchangeError { message }
-    }
-}
diff --git a/rustybits/zeroidc/src/ext.rs b/rustybits/zeroidc/src/ext.rs
deleted file mode 100644
index f0ba8b4b4..000000000
--- a/rustybits/zeroidc/src/ext.rs
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c)2021 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-
-use std::ffi::{CStr, CString};
-use std::os::raw::c_char;
-use url::Url;
-
-use crate::ZeroIDC;
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_new(
-    issuer: *const c_char,
-    client_id: *const c_char,
-    auth_endpoint: *const c_char,
-    provider: *const c_char,
-    web_listen_port: u16,
-) -> *mut ZeroIDC {
-    if issuer.is_null() {
-        println!("issuer is null");
-        return std::ptr::null_mut();
-    }
-
-    if client_id.is_null() {
-        println!("client_id is null");
-        return std::ptr::null_mut();
-    }
-
-    if provider.is_null() {
-        println!("provider is null");
-        return std::ptr::null_mut();
-    }
-
-    if auth_endpoint.is_null() {
-        println!("auth_endpoint is null");
-        return std::ptr::null_mut();
-    }
-
-    let issuer = unsafe { CStr::from_ptr(issuer) };
-    let client_id = unsafe { CStr::from_ptr(client_id) };
-    let provider = unsafe { CStr::from_ptr(provider) };
-    let auth_endpoint = unsafe { CStr::from_ptr(auth_endpoint) };
-    match ZeroIDC::new(
-        issuer.to_str().unwrap(),
-        client_id.to_str().unwrap(),
-        provider.to_str().unwrap(),
-        auth_endpoint.to_str().unwrap(),
-        web_listen_port,
-    ) {
-        Ok(idc) => Box::into_raw(Box::new(idc)),
-        Err(s) => {
-            println!("Error creating ZeroIDC instance: {}", s);
-            std::ptr::null_mut()
-        }
-    }
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_delete(ptr: *mut ZeroIDC) {
-    if ptr.is_null() {
-        return;
-    }
-    let idc = unsafe {
-        assert!(!ptr.is_null());
-        &mut *ptr
-    };
-    idc.stop();
-
-    unsafe {
-        let _ = Box::from_raw(ptr);
-    }
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_start(ptr: *mut ZeroIDC) {
-    let idc = unsafe {
-        assert!(!ptr.is_null());
-        &mut *ptr
-    };
-    idc.start();
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_stop(ptr: *mut ZeroIDC) {
-    let idc = unsafe {
-        assert!(!ptr.is_null());
-        &mut *ptr
-    };
-    idc.stop();
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_is_running(ptr: *mut ZeroIDC) -> bool {
-    let idc = unsafe {
-        assert!(!ptr.is_null());
-        &mut *ptr
-    };
-
-    idc.is_running()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_get_exp_time(ptr: *mut ZeroIDC) -> u64 {
-    let id = unsafe {
-        assert!(!ptr.is_null());
-        &mut *ptr
-    };
-
-    id.get_exp_time()
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_set_nonce_and_csrf(
-    ptr: *mut ZeroIDC,
-    csrf_token: *const c_char,
-    nonce: *const c_char,
-) {
-    let idc = unsafe {
-        assert!(!ptr.is_null());
-        &mut *ptr
-    };
-
-    if csrf_token.is_null() {
-        println!("csrf_token is null");
-        return;
-    }
-
-    if nonce.is_null() {
-        println!("nonce is null");
-        return;
-    }
-
-    let csrf_token = unsafe { CStr::from_ptr(csrf_token) }.to_str().unwrap().to_string();
-    let nonce = unsafe { CStr::from_ptr(nonce) }.to_str().unwrap().to_string();
-
-    idc.set_nonce_and_csrf(csrf_token, nonce);
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn free_cstr(s: *mut c_char) {
-    if s.is_null() {
-        println!("passed a null object");
-        return;
-    }
-
-    unsafe {
-        let _ = CString::from_raw(s);
-    }
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_get_auth_url(ptr: *mut ZeroIDC) -> *mut c_char {
-    if ptr.is_null() {
-        println!("passed a null object");
-        return std::ptr::null_mut();
-    }
-    let idc = unsafe { &mut *ptr };
-
-    let s = CString::new(idc.auth_url()).unwrap();
-    s.into_raw()
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_token_exchange(idc: *mut ZeroIDC, code: *const c_char) -> *mut c_char {
-    if idc.is_null() {
-        println!("idc is null");
-        return std::ptr::null_mut();
-    }
-
-    if code.is_null() {
-        println!("code is null");
-        return std::ptr::null_mut();
-    }
-    let idc = unsafe { &mut *idc };
-
-    let code = unsafe { CStr::from_ptr(code) }.to_str().unwrap();
-
-    let ret = idc.do_token_exchange(code);
-    match ret {
-        Ok(ret) => {
-            #[cfg(debug_assertions)]
-            {
-                println!("do_token_exchange ret: {}", ret);
-            }
-            let ret = CString::new(ret).unwrap();
-            ret.into_raw()
-        }
-        Err(e) => {
-            #[cfg(debug_assertions)]
-            {
-                println!("do_token_exchange err: {}", e);
-            }
-            let errstr = format!("{{\"errorMessage\": \"{}\"}}", e);
-            let ret = CString::new(errstr).unwrap();
-            ret.into_raw()
-        }
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_get_url_param_value(param: *const c_char, path: *const c_char) -> *mut c_char {
-    if param.is_null() {
-        println!("param is null");
-        return std::ptr::null_mut();
-    }
-    if path.is_null() {
-        println!("path is null");
-        return std::ptr::null_mut();
-    }
-    let param = unsafe { CStr::from_ptr(param) }.to_str().unwrap();
-    let path = unsafe { CStr::from_ptr(path) }.to_str().unwrap();
-
-    let url = "http://localhost:9993".to_string() + path;
-    let url = Url::parse(&url).unwrap();
-
-    let pairs = url.query_pairs();
-    for p in pairs {
-        if p.0 == param {
-            let s = CString::new(p.1.into_owned()).unwrap();
-            return s.into_raw();
-        }
-    }
-
-    std::ptr::null_mut()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_network_id_from_state(state: *const c_char) -> *mut c_char {
-    if state.is_null() {
-        println!("state is null");
-        return std::ptr::null_mut();
-    }
-
-    let state = unsafe { CStr::from_ptr(state) }.to_str().unwrap();
-
-    let split = state.split('_');
-    let split = split.collect::<Vec<&str>>();
-    if split.len() != 2 {
-        return std::ptr::null_mut();
-    }
-
-    let s = CString::new(split[1]).unwrap();
-    s.into_raw()
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-#[no_mangle]
-pub unsafe extern "C" fn zeroidc_kick_refresh_thread(idc: *mut ZeroIDC) {
-    if idc.is_null() {
-        println!("idc is null");
-        return;
-    }
-    let idc = unsafe { &mut *idc };
-
-    idc.kick_refresh_thread();
-}
diff --git a/rustybits/zeroidc/src/lib.rs b/rustybits/zeroidc/src/lib.rs
deleted file mode 100644
index 493d90d7e..000000000
--- a/rustybits/zeroidc/src/lib.rs
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
- * Copyright (c)2021 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-
-#![allow(
-    clippy::uninlined_format_args,
-    clippy::missing_safety_doc,
-    clippy::option_map_unit_fn
-)]
-
-pub mod error;
-pub mod ext;
-
-extern crate base64;
-extern crate bytes;
-extern crate openidconnect;
-extern crate time;
-extern crate url;
-
-use crate::error::*;
-
-use bytes::Bytes;
-use jwt::Token;
-use openidconnect::core::{CoreClient, CoreProviderMetadata, CoreResponseType};
-use openidconnect::reqwest::http_client;
-use openidconnect::{
-    AccessToken, AccessTokenHash, AuthenticationFlow, AuthorizationCode, ClientId, CsrfToken, IssuerUrl, Nonce,
-    OAuth2TokenResponse, PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, RefreshToken, Scope, TokenResponse,
-};
-use std::error::Error;
-use std::str::from_utf8;
-use std::sync::{Arc, Mutex};
-use std::thread::{sleep, spawn, JoinHandle};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-#[cfg(debug_assertions)]
-use time::{format_description, OffsetDateTime};
-
-use url::Url;
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-pub struct ZeroIDC {
-    inner: Arc<Mutex<Inner>>,
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-struct Inner {
-    running: bool,
-    auth_endpoint: String,
-    provider: String,
-    oidc_thread: Option<JoinHandle<()>>,
-    oidc_client: Option<openidconnect::core::CoreClient>,
-    access_token: Option<AccessToken>,
-    refresh_token: Option<RefreshToken>,
-    exp_time: u64,
-    kick: bool,
-
-    url: Option<Url>,
-    csrf_token: Option<CsrfToken>,
-    nonce: Option<Nonce>,
-    pkce_verifier: Option<PkceCodeVerifier>,
-}
-
-impl Inner {
-    #[inline]
-    fn as_opt(&mut self) -> Option<&mut Inner> {
-        Some(self)
-    }
-}
-
-fn csrf_func(csrf_token: String) -> Box<dyn Fn() -> CsrfToken> {
-    Box::new(move || CsrfToken::new(csrf_token.to_string()))
-}
-
-fn nonce_func(nonce: String) -> Box<dyn Fn() -> Nonce> {
-    Box::new(move || Nonce::new(nonce.to_string()))
-}
-
-#[cfg(debug_assertions)]
-fn systemtime_strftime<T>(dt: T, format: &str) -> String
-where
-    T: Into<OffsetDateTime>,
-{
-    let f = format_description::parse(format);
-    match f {
-        Ok(f) => match dt.into().format(&f) {
-            Ok(s) => s,
-            Err(_e) => "".to_string(),
-        },
-        Err(_e) => "".to_string(),
-    }
-}
-
-#[cfg(any(
-    all(target_os = "linux", target_arch = "x86"),
-    all(target_os = "linux", target_arch = "x86_64"),
-    all(target_os = "linux", target_arch = "aarch64"),
-    target_os = "windows",
-    target_os = "macos",
-))]
-impl ZeroIDC {
-    pub fn new(
-        issuer: &str,
-        client_id: &str,
-        provider: &str,
-        auth_ep: &str,
-        local_web_port: u16,
-    ) -> Result<ZeroIDC, ZeroIDCError> {
-        let idc = ZeroIDC {
-            inner: Arc::new(Mutex::new(Inner {
-                running: false,
-                provider: provider.to_string(),
-                auth_endpoint: auth_ep.to_string(),
-                oidc_thread: None,
-                oidc_client: None,
-                access_token: None,
-                refresh_token: None,
-                exp_time: 0,
-                kick: false,
-
-                url: None,
-                csrf_token: None,
-                nonce: None,
-                pkce_verifier: None,
-            })),
-        };
-
-        println!(
-            "issuer: {}, client_id: {}, auth_endpoint: {}, local_web_port: {}",
-            issuer, client_id, auth_ep, local_web_port
-        );
-        let iss = IssuerUrl::new(issuer.to_string())?;
-
-        let provider_meta = CoreProviderMetadata::discover(&iss, http_client)?;
-
-        let r = format!("http://localhost:{}/sso", local_web_port);
-        let redir_url = Url::parse(&r)?;
-
-        let redirect = RedirectUrl::new(redir_url.to_string())?;
-
-        idc.inner.lock().unwrap().oidc_client = Some(
-            CoreClient::from_provider_metadata(provider_meta, ClientId::new(client_id.to_string()), None)
-                .set_redirect_uri(redirect)
-                .set_auth_type(openidconnect::AuthType::RequestBody),
-        );
-
-        Ok(idc)
-    }
-
-    fn kick_refresh_thread(&mut self) {
-        let local = Arc::clone(&self.inner);
-        local.lock().unwrap().kick = true;
-    }
-
-    fn start(&mut self) {
-        let local = Arc::clone(&self.inner);
-
-        if !local.lock().unwrap().running {
-            let inner_local = Arc::clone(&self.inner);
-            local.lock().unwrap().oidc_thread = Some(spawn(move || {
-                inner_local.lock().unwrap().running = true;
-                let mut running = true;
-
-                // Keep a copy of the initial nonce used to get the tokens
-                // Will be needed later when verifying the responses from refresh tokens
-                let nonce = inner_local.lock().unwrap().nonce.clone();
-
-                while running {
-                    let exp = UNIX_EPOCH + Duration::from_secs(inner_local.lock().unwrap().exp_time);
-                    let now = SystemTime::now();
-
-                    #[cfg(debug_assertions)]
-                    {
-                        println!(
-                            "refresh token thread tick, now: {}, exp: {}",
-                            systemtime_strftime(now, "[year]-[month]-[day] [hour]:[minute]:[second]"),
-                            systemtime_strftime(exp, "[year]-[month]-[day] [hour]:[minute]:[second]")
-                        );
-                    }
-                    let refresh_token = inner_local.lock().unwrap().refresh_token.clone();
-
-                    if let Some(refresh_token) = refresh_token {
-                        let should_kick = inner_local.lock().unwrap().kick;
-                        if now >= (exp - Duration::from_secs(30)) || should_kick {
-                            if should_kick {
-                                #[cfg(debug_assertions)]
-                                {
-                                    println!("refresh thread kicked");
-                                }
-                                inner_local.lock().unwrap().kick = false;
-                            }
-
-                            #[cfg(debug_assertions)]
-                            {
-                                println!("Refresh Token: {}", refresh_token.secret());
-                            }
-
-                            let token_response = inner_local.lock().unwrap().oidc_client.as_ref().map(|c| {
-                                let res = c.exchange_refresh_token(&refresh_token).request(http_client);
-
-                                res
-                            });
-
-                            if let Some(res) = token_response {
-                                match res {
-                                    Ok(res) => {
-                                        match res.id_token() {
-                                            Some(id_token) => {
-                                                let n = match nonce.clone() {
-                                                    Some(n) => n.secret().to_string(),
-                                                    None => "".to_string(),
-                                                };
-
-                                                let params = [
-                                                    ("id_token", id_token.to_string()),
-                                                    ("state", "refresh".to_string()),
-                                                    ("extra_nonce", n),
-                                                ];
-                                                #[cfg(debug_assertions)]
-                                                {
-                                                    println!("New ID token: {}", id_token.to_string());
-                                                }
-                                                let client = reqwest::blocking::Client::new();
-                                                let r = client
-                                                    .post(inner_local.lock().unwrap().auth_endpoint.clone())
-                                                    .form(&params)
-                                                    .send();
-
-                                                match r {
-                                                    Ok(r) => {
-                                                        if r.status().is_success() {
-                                                            #[cfg(debug_assertions)]
-                                                            {
-                                                                println!("hit url: {}", r.url().as_str());
-                                                                println!("status: {}", r.status());
-                                                            }
-
-                                                            let access_token = res.access_token();
-                                                            let idt = &id_token.to_string();
-
-                                                            let t: Result<
-                                                                Token<jwt::Header, jwt::Claims, jwt::Unverified<'_>>,
-                                                                jwt::Error,
-                                                            > = Token::parse_unverified(idt);
-
-                                                            if let Ok(t) = t {
-                                                                let claims = t.claims().registered.clone();
-                                                                match claims.expiration {
-                                                                    Some(exp) => {
-                                                                        println!("exp: {}", exp);
-                                                                        inner_local.lock().unwrap().exp_time = exp;
-                                                                    }
-                                                                    None => {
-                                                                        panic!("expiration is None.  This shouldn't happen")
-                                                                    }
-                                                                }
-                                                            } else {
-                                                                panic!("error parsing claims");
-                                                            }
-
-                                                            inner_local.lock().unwrap().access_token =
-                                                                Some(access_token.clone());
-                                                            if let Some(t) = res.refresh_token() {
-                                                                // println!("New Refresh Token: {}", t.secret());
-                                                                inner_local.lock().unwrap().refresh_token =
-                                                                    Some(t.clone());
-                                                            }
-                                                            #[cfg(debug_assertions)]
-                                                            {
-                                                                println!("Central post succeeded");
-                                                            }
-                                                        } else {
-                                                            println!("Central post failed: {}", r.status());
-                                                            println!("hit url: {}", r.url().as_str());
-                                                            println!("Status: {}", r.status());
-                                                            if let Ok(body) = r.bytes() {
-                                                                if let Ok(body) = std::str::from_utf8(&body) {
-                                                                    println!("Body: {}", body);
-                                                                }
-                                                            }
-
-                                                            inner_local.lock().unwrap().exp_time = 0;
-                                                            inner_local.lock().unwrap().running = false;
-                                                        }
-                                                    }
-                                                    Err(e) => {
-                                                        println!("Central post failed: {}", e);
-                                                        println!("hit url: {}", e.url().unwrap().as_str());
-                                                        println!("Status: {}", e.status().unwrap());
-                                                        inner_local.lock().unwrap().exp_time = 0;
-                                                        inner_local.lock().unwrap().running = false;
-                                                    }
-                                                }
-                                            }
-                                            None => {
-                                                println!("no id token?!?");
-                                                inner_local.lock().unwrap().exp_time = 0;
-                                                inner_local.lock().unwrap().running = false;
-                                            }
-                                        }
-                                    }
-                                    Err(e) => {
-                                        println!("token error: {}", e);
-                                        inner_local.lock().unwrap().exp_time = 0;
-                                        inner_local.lock().unwrap().running = false;
-                                    }
-                                }
-                            } else {
-                                println!("token response??");
-                                inner_local.lock().unwrap().exp_time = 0;
-                                inner_local.lock().unwrap().running = false;
-                            }
-                        } else {
-                            #[cfg(debug_assertions)]
-                            println!("waiting to refresh");
-                        }
-                    } else {
-                        println!("no refresh token?");
-                        inner_local.lock().unwrap().exp_time = 0;
-                        inner_local.lock().unwrap().running = false;
-                    }
-
-                    sleep(Duration::from_secs(1));
-                    {
-                        running = inner_local.lock().unwrap().running;
-                    }
-                }
-                // end run loop
-
-                println!("thread done!");
-                inner_local.lock().unwrap().running = false;
-                println!("set idc thread running flag to false");
-            }));
-        }
-    }
-
-    pub fn stop(&mut self) {
-        let local = self.inner.clone();
-        if self.is_running() {
-            local.lock().unwrap().running = false;
-        }
-    }
-
-    pub fn is_running(&mut self) -> bool {
-        let local = Arc::clone(&self.inner);
-        let running = local.lock().unwrap().running;
-
-        running
-    }
-
-    pub fn get_exp_time(&mut self) -> u64 {
-        return self.inner.lock().unwrap().exp_time;
-    }
-
-    pub fn set_nonce_and_csrf(&mut self, csrf_token: String, nonce: String) {
-        let local = Arc::clone(&self.inner);
-        (*local.lock().expect("can't lock inner")).as_opt().map(|i| {
-            if i.running {
-                println!("refresh thread running. not setting new nonce or csrf");
-                return;
-            }
-
-            let need_verifier = i.pkce_verifier.is_none();
-
-            let csrf_diff = if let Some(csrf) = i.csrf_token.clone() {
-                *csrf.secret() != csrf_token
-            } else {
-                false
-            };
-
-            let nonce_diff = if let Some(n) = i.nonce.clone() {
-                *n.secret() != nonce
-            } else {
-                false
-            };
-
-            if need_verifier || csrf_diff || nonce_diff {
-                let (pkce_challenge, pkce_verifier) = PkceCodeChallenge::new_random_sha256();
-                let r = i.oidc_client.as_ref().map(|c| {
-                    let mut auth_builder = c
-                        .authorize_url(
-                            AuthenticationFlow::<CoreResponseType>::AuthorizationCode,
-                            csrf_func(csrf_token),
-                            nonce_func(nonce),
-                        )
-                        .set_pkce_challenge(pkce_challenge);
-                    match i.provider.as_str() {
-                        "auth0" => {
-                            auth_builder = auth_builder
-                                .add_scope(Scope::new("profile".to_string()))
-                                .add_scope(Scope::new("email".to_string()))
-                                .add_scope(Scope::new("offline_access".to_string()));
-                        }
-                        "okta" => {
-                            auth_builder = auth_builder
-                                .add_scope(Scope::new("profile".to_string()))
-                                .add_scope(Scope::new("email".to_string()))
-                                .add_scope(Scope::new("groups".to_string()))
-                                .add_scope(Scope::new("offline_access".to_string()));
-                        }
-                        "keycloak" => {
-                            auth_builder = auth_builder
-                                .add_scope(Scope::new("profile".to_string()))
-                                .add_scope(Scope::new("email".to_string()));
-                        }
-                        "onelogin" => {
-                            auth_builder = auth_builder
-                                .add_scope(Scope::new("profile".to_string()))
-                                .add_scope(Scope::new("email".to_string()))
-                                .add_scope(Scope::new("groups".to_string()))
-                        }
-                        "default" => {
-                            auth_builder = auth_builder
-                                .add_scope(Scope::new("profile".to_string()))
-                                .add_scope(Scope::new("email".to_string()))
-                                .add_scope(Scope::new("offline_access".to_string()));
-                        }
-                        _ => {
-                            auth_builder = auth_builder
-                                .add_scope(Scope::new("profile".to_string()))
-                                .add_scope(Scope::new("email".to_string()))
-                                .add_scope(Scope::new("offline_access".to_string()));
-                        }
-                    }
-
-                    auth_builder.url()
-                });
-
-                if let Some(r) = r {
-                    i.url = Some(r.0);
-                    i.csrf_token = Some(r.1);
-                    i.nonce = Some(r.2);
-                    i.pkce_verifier = Some(pkce_verifier);
-                }
-            }
-        });
-    }
-
-    pub fn auth_url(&self) -> String {
-        let url = (*self.inner.lock().expect("can't lock inner"))
-            .as_opt()
-            .map(|i| match i.url.clone() {
-                Some(u) => u.to_string(),
-                _ => "".to_string(),
-            });
-
-        match url {
-            Some(url) => url,
-            None => "".to_string(),
-        }
-    }
-
-    pub fn do_token_exchange(&mut self, code: &str) -> Result<String, SSOExchangeError> {
-        let local = Arc::clone(&self.inner);
-        let mut should_start = false;
-        let res = (*local.lock().unwrap()).as_opt().map(|i| {
-            if let Some(verifier) = i.pkce_verifier.take() {
-                let token_response = i.oidc_client.as_ref().map(|c| {
-                    println!("auth code: {}", code);
-
-                    let r = c
-                        .exchange_code(AuthorizationCode::new(code.to_string()))
-                        .set_pkce_verifier(verifier)
-                        .request(http_client);
-
-                    // validate the token hashes
-                    match r {
-                        Ok(res) => {
-                            let n = match i.nonce.clone() {
-                                Some(n) => n,
-                                None => {
-                                    println!("no nonce");
-                                    i.running = false;
-                                    return None;
-                                }
-                            };
-
-                            let id = match res.id_token() {
-                                Some(t) => t,
-                                None => {
-                                    println!("no id token");
-                                    i.running = false;
-                                    return None;
-                                }
-                            };
-
-                            let claims = match id.claims(&c.id_token_verifier(), &n) {
-                                Ok(c) => c,
-                                Err(_e) => {
-                                    println!("no claims");
-                                    i.running = false;
-                                    return None;
-                                }
-                            };
-
-                            let signing_algo = match id.signing_alg() {
-                                Ok(s) => s,
-                                Err(_) => {
-                                    println!("no signing algorithm");
-                                    i.running = false;
-                                    return None;
-                                }
-                            };
-
-                            if let Some(expected_hash) = claims.access_token_hash() {
-                                let actual_hash = match AccessTokenHash::from_token(res.access_token(), &signing_algo) {
-                                    Ok(h) => h,
-                                    Err(e) => {
-                                        println!("Error hashing access token: {}", e);
-                                        i.running = false;
-                                        return None;
-                                    }
-                                };
-
-                                if actual_hash != *expected_hash {
-                                    println!("token hash error");
-                                    i.running = false;
-                                    return None;
-                                }
-                            }
-                            Some(res)
-                        }
-                        Err(e) => {
-                            println!("token response error: {:?}", e.to_string());
-                            println!("\t {:?}", e.source());
-                            i.running = false;
-                            None
-                        }
-                    }
-                });
-
-                if let Some(Some(tok)) = token_response {
-                    let id_token = tok.id_token().unwrap();
-                    #[cfg(debug_assertions)]
-                    {
-                        println!("ID token: {}", id_token.to_string());
-                    }
-
-                    let mut split = "".to_string();
-                    if let Some(tok) = i.csrf_token.clone() {
-                        split = tok.secret().to_owned();
-                    }
-
-                    let split = split.split('_').collect::<Vec<&str>>();
-
-                    if split.len() == 2 {
-                        let params = [("id_token", id_token.to_string()), ("state", split[0].to_string())];
-                        let client = reqwest::blocking::Client::new();
-                        let res = client.post(i.auth_endpoint.clone()).form(&params).send();
-
-                        match res {
-                            Ok(res) => {
-                                if res.status() == 200 {
-                                    #[cfg(debug_assertions)]
-                                    {
-                                        println!("hit url: {}", res.url().as_str());
-                                        println!("Status: {}", res.status());
-                                    }
-
-                                    let idt = &id_token.to_string();
-
-                                    let t: Result<Token<jwt::Header, jwt::Claims, jwt::Unverified<'_>>, jwt::Error> =
-                                        Token::parse_unverified(idt);
-
-                                    if let Ok(t) = t {
-                                        let claims = t.claims().registered.clone();
-                                        match claims.expiration {
-                                            Some(exp) => {
-                                                i.exp_time = exp;
-                                                println!("Set exp time to: {:?}", i.exp_time);
-                                            }
-                                            None => {
-                                                panic!("expiration is None.  This shouldn't happen");
-                                            }
-                                        }
-                                    } else {
-                                        panic!("Failed to parse token");
-                                    }
-
-                                    i.access_token = Some(tok.access_token().clone());
-                                    if let Some(t) = tok.refresh_token() {
-                                        i.refresh_token = Some(t.clone());
-                                        should_start = true;
-                                    }
-                                    #[cfg(debug_assertions)]
-                                    {
-                                        let access_token = tok.access_token();
-                                        println!("Access Token: {}", access_token.secret());
-
-                                        let refresh_token = tok.refresh_token();
-                                        println!("Refresh Token: {}", refresh_token.unwrap().secret());
-                                    }
-
-                                    let bytes = match res.bytes() {
-                                        Ok(bytes) => bytes,
-                                        Err(_) => Bytes::from(""),
-                                    };
-
-                                    let bytes = match from_utf8(bytes.as_ref()) {
-                                        Ok(bytes) => bytes.to_string(),
-                                        Err(_) => "".to_string(),
-                                    };
-
-                                    Ok(bytes)
-                                } else if res.status() == 402 {
-                                    i.running = false;
-                                    Err(SSOExchangeError::new(
-                                        "additional license seats required. Please contact your network administrator."
-                                            .to_string(),
-                                    ))
-                                } else {
-                                    i.running = false;
-                                    Err(SSOExchangeError::new("error from central endpoint".to_string()))
-                                }
-                            }
-                            Err(res) => {
-                                println!("error result: {}", res);
-                                println!("hit url: {}", i.auth_endpoint.clone());
-                                println!("Post error: {}", res);
-                                i.exp_time = 0;
-                                i.running = false;
-                                Err(SSOExchangeError::new("error from central endpoint".to_string()))
-                            }
-                        }
-                    } else {
-                        i.running = false;
-                        Err(SSOExchangeError::new("error splitting state token".to_string()))
-                    }
-                } else {
-                    i.running = false;
-                    Err(SSOExchangeError::new("invalid token response".to_string()))
-                }
-            } else {
-                i.running = false;
-                Err(SSOExchangeError::new("invalid pkce verifier".to_string()))
-            }
-        });
-        if should_start {
-            self.start();
-        }
-        match res {
-            Some(res) => res,
-            _ => Err(SSOExchangeError::new("invalid result".to_string())),
-        }
-    }
-}
diff --git a/selftest.cpp b/selftest.cpp
index 1c5f7c1a1..33ec9e402 100644
--- a/selftest.cpp
+++ b/selftest.cpp
@@ -1,56 +1,61 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include "node/Buffer.hpp"
-#include "node/CertificateOfMembership.hpp"
-#include "node/Constants.hpp"
-#include "node/Dictionary.hpp"
-#include "node/ECC.hpp"
-#include "node/Hashtable.hpp"
-#include "node/Identity.hpp"
-#include "node/IncomingPacket.hpp"
-#include "node/InetAddress.hpp"
-#include "node/MAC.hpp"
-#include "node/NetworkConfig.hpp"
-#include "node/Node.hpp"
-#include "node/Packet.hpp"
-#include "node/Peer.hpp"
-#include "node/Poly1305.hpp"
-#include "node/RuntimeEnvironment.hpp"
-#include "node/SHA512.hpp"
-#include "node/Salsa20.hpp"
-#include "node/Utils.hpp"
-#include "osdep/OSUtils.hpp"
-#include "osdep/Phy.hpp"
-#include "osdep/PortMapper.hpp"
-#include "osdep/Thread.hpp"
-
-#include <iostream>
-#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
-#include <thread>
 #include <time.h>
+
+#include <stdexcept>
+#include <iostream>
+#include <string>
 #include <vector>
 
-#if defined(ZT_USE_X64_ASM_SALSA2012) && defined(ZT_ARCH_X64)
-#include "ext/x64-salsa2012-asm/salsa2012.h"
-#endif
-#ifdef ZT_USE_ARM32_NEON_ASM_SALSA2012
-#include "ext/arm32-neon-salsa2012-asm/salsa2012.h"
-#endif
+#include "node/Constants.hpp"
+#include "node/Hashtable.hpp"
+#include "node/RuntimeEnvironment.hpp"
+#include "node/InetAddress.hpp"
+#include "node/Utils.hpp"
+#include "node/Identity.hpp"
+#include "node/Buffer.hpp"
+#include "node/Packet.hpp"
+#include "node/Salsa20.hpp"
+#include "node/MAC.hpp"
+#include "node/NetworkConfig.hpp"
+#include "node/Peer.hpp"
+#include "node/Dictionary.hpp"
+#include "node/SHA512.hpp"
+#include "node/C25519.hpp"
+#include "node/Poly1305.hpp"
+#include "node/CertificateOfMembership.hpp"
+#include "node/Node.hpp"
+#include "node/IncomingPacket.hpp"
+
+#include "osdep/OSUtils.hpp"
+#include "osdep/Phy.hpp"
+#include "osdep/Http.hpp"
+#include "osdep/BackgroundResolver.hpp"
+#include "osdep/PortMapper.hpp"
+#include "osdep/Thread.hpp"
+
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+#include "controller/SqliteNetworkController.hpp"
+#endif // ZT_ENABLE_NETWORK_CONTROLLER
 
 #ifdef __WINDOWS__
 #include <tchar.h>
@@ -60,1176 +65,526 @@ using namespace ZeroTier;
 
 //////////////////////////////////////////////////////////////////////////////
 
-#define KNOWN_GOOD_IDENTITY                                                                                                                                                                                                                    \
-    "8e4df28b72:0:ac3d46abe0c21f3cfe7a6c8d6a85cfcffcb82fbd55af6a4d6350657c68200843fa2e16f9418bbd9702cae365f2af5fb4c420908b803a681d4daef6114d78a2d7:"                                                                                           \
-    "bd8dd6e4ce7022d2f812797a80c6ee8ad180dc4ebf301dec8b06d1be08832bddd63a2f1cfa7b2c504474c75bdc8898ba476ef92e8e2d0509f8441985171ff16e"
-#define KNOWN_BAD_IDENTITY                                                                                                                                                                                                                     \
-    "9e4df28b72:0:ac3d46abe0c21f3cfe7a6c8d6a85cfcffcb82fbd55af6a4d6350657c68200843fa2e16f9418bbd9702cae365f2af5fb4c420908b803a681d4daef6114d78a2d7:"                                                                                           \
-    "bd8dd6e4ce7022d2f812797a80c6ee8ad180dc4ebf301dec8b06d1be08832bddd63a2f1cfa7b2c504474c75bdc8898ba476ef92e8e2d0509f8441985171ff16e"
+#define KNOWN_GOOD_IDENTITY "8e4df28b72:0:ac3d46abe0c21f3cfe7a6c8d6a85cfcffcb82fbd55af6a4d6350657c68200843fa2e16f9418bbd9702cae365f2af5fb4c420908b803a681d4daef6114d78a2d7:bd8dd6e4ce7022d2f812797a80c6ee8ad180dc4ebf301dec8b06d1be08832bddd63a2f1cfa7b2c504474c75bdc8898ba476ef92e8e2d0509f8441985171ff16e"
+#define KNOWN_BAD_IDENTITY "9e4df28b72:0:ac3d46abe0c21f3cfe7a6c8d6a85cfcffcb82fbd55af6a4d6350657c68200843fa2e16f9418bbd9702cae365f2af5fb4c420908b803a681d4daef6114d78a2d7:bd8dd6e4ce7022d2f812797a80c6ee8ad180dc4ebf301dec8b06d1be08832bddd63a2f1cfa7b2c504474c75bdc8898ba476ef92e8e2d0509f8441985171ff16e"
 
-static const unsigned char s20TV0Key[32] = { 0x0f, 0x62, 0xb5, 0x08, 0x5b, 0xae, 0x01, 0x54, 0xa7, 0xfa, 0x4d, 0xa0, 0xf3, 0x46, 0x99, 0xec, 0x3f, 0x92, 0xe5, 0x38, 0x8b, 0xde, 0x31, 0x84, 0xd7, 0x2a, 0x7d, 0xd0, 0x23, 0x76, 0xc9, 0x1c };
-static const unsigned char s20TV0Iv[8] = { 0x28, 0x8f, 0xf6, 0x5d, 0xc4, 0x2b, 0x92, 0xf9 };
-static const unsigned char s20TV0Ks[64] = { 0x5e, 0x5e, 0x71, 0xf9, 0x01, 0x99, 0x34, 0x03, 0x04, 0xab, 0xb2, 0x2a, 0x37, 0xb6, 0x62, 0x5b, 0xf8, 0x83, 0xfb, 0x89, 0xce, 0x3b, 0x21, 0xf5, 0x4a, 0x10, 0xb8, 0x10, 0x66, 0xef, 0x87, 0xda,
-                                            0x30, 0xb7, 0x76, 0x99, 0xaa, 0x73, 0x79, 0xda, 0x59, 0x5c, 0x77, 0xdd, 0x59, 0x54, 0x2d, 0xa2, 0x08, 0xe5, 0x95, 0x4f, 0x89, 0xe4, 0x0e, 0xb7, 0xaa, 0x80, 0xa8, 0x4a, 0x61, 0x76, 0x66, 0x3f };
+static const unsigned char s20TV0Key[32] = { 0x0f,0x62,0xb5,0x08,0x5b,0xae,0x01,0x54,0xa7,0xfa,0x4d,0xa0,0xf3,0x46,0x99,0xec,0x3f,0x92,0xe5,0x38,0x8b,0xde,0x31,0x84,0xd7,0x2a,0x7d,0xd0,0x23,0x76,0xc9,0x1c };
+static const unsigned char s20TV0Iv[8] = { 0x28,0x8f,0xf6,0x5d,0xc4,0x2b,0x92,0xf9 };
+static const unsigned char s20TV0Ks[64] = { 0x5e,0x5e,0x71,0xf9,0x01,0x99,0x34,0x03,0x04,0xab,0xb2,0x2a,0x37,0xb6,0x62,0x5b,0xf8,0x83,0xfb,0x89,0xce,0x3b,0x21,0xf5,0x4a,0x10,0xb8,0x10,0x66,0xef,0x87,0xda,0x30,0xb7,0x76,0x99,0xaa,0x73,0x79,0xda,0x59,0x5c,0x77,0xdd,0x59,0x54,0x2d,0xa2,0x08,0xe5,0x95,0x4f,0x89,0xe4,0x0e,0xb7,0xaa,0x80,0xa8,0x4a,0x61,0x76,0x66,0x3f };
 
-static const unsigned char s2012TV0Key[32] = { 0x0f, 0x62, 0xb5, 0x08, 0x5b, 0xae, 0x01, 0x54, 0xa7, 0xfa, 0x4d, 0xa0, 0xf3, 0x46, 0x99, 0xec, 0x3f, 0x92, 0xe5, 0x38, 0x8b, 0xde, 0x31, 0x84, 0xd7, 0x2a, 0x7d, 0xd0, 0x23, 0x76, 0xc9, 0x1c };
-static const unsigned char s2012TV0Iv[8] = { 0x28, 0x8f, 0xf6, 0x5d, 0xc4, 0x2b, 0x92, 0xf9 };
-static const unsigned char s2012TV0Ks[64] = { 0x99, 0xDB, 0x33, 0xAD, 0x11, 0xCE, 0x0C, 0xCB, 0x3B, 0xFD, 0xBF, 0x8D, 0x0C, 0x18, 0x16, 0x04, 0x52, 0xD0, 0x14, 0xCD, 0xE9, 0x89, 0xB4, 0xC4, 0x11, 0xA5, 0x59, 0xFF, 0x7C, 0x20, 0xA1, 0x69,
-                                              0xE6, 0xDC, 0x99, 0x09, 0xD8, 0x16, 0xBE, 0xCE, 0xDC, 0x40, 0x63, 0xCE, 0x07, 0xCE, 0xA8, 0x28, 0xF4, 0x4B, 0xF9, 0xB6, 0xC9, 0xA0, 0xA0, 0xB2, 0x00, 0xE1, 0xB5, 0x2A, 0xF4, 0x18, 0x59, 0xC5 };
+static const unsigned char s2012TV0Key[32] = { 0x0f,0x62,0xb5,0x08,0x5b,0xae,0x01,0x54,0xa7,0xfa,0x4d,0xa0,0xf3,0x46,0x99,0xec,0x3f,0x92,0xe5,0x38,0x8b,0xde,0x31,0x84,0xd7,0x2a,0x7d,0xd0,0x23,0x76,0xc9,0x1c };
+static const unsigned char s2012TV0Iv[8] = { 0x28,0x8f,0xf6,0x5d,0xc4,0x2b,0x92,0xf9 };
+static const unsigned char s2012TV0Ks[64] = { 0x99,0xDB,0x33,0xAD,0x11,0xCE,0x0C,0xCB,0x3B,0xFD,0xBF,0x8D,0x0C,0x18,0x16,0x04,0x52,0xD0,0x14,0xCD,0xE9,0x89,0xB4,0xC4,0x11,0xA5,0x59,0xFF,0x7C,0x20,0xA1,0x69,0xE6,0xDC,0x99,0x09,0xD8,0x16,0xBE,0xCE,0xDC,0x40,0x63,0xCE,0x07,0xCE,0xA8,0x28,0xF4,0x4B,0xF9,0xB6,0xC9,0xA0,0xA0,0xB2,0x00,0xE1,0xB5,0x2A,0xF4,0x18,0x59,0xC5 };
 
-static const unsigned char poly1305TV0Input[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-static const unsigned char poly1305TV0Key[32] = {
-    0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x33, 0x32, 0x2d, 0x62, 0x79, 0x74, 0x65, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35
-};
-static const unsigned char poly1305TV0Tag[16] = { 0x49, 0xec, 0x78, 0x09, 0x0e, 0x48, 0x1e, 0xc6, 0xc2, 0x6b, 0x33, 0xb9, 0x1c, 0xcc, 0x03, 0x07 };
+static const unsigned char poly1305TV0Input[32] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+static const unsigned char poly1305TV0Key[32] = { 0x74,0x68,0x69,0x73,0x20,0x69,0x73,0x20,0x33,0x32,0x2d,0x62,0x79,0x74,0x65,0x20,0x6b,0x65,0x79,0x20,0x66,0x6f,0x72,0x20,0x50,0x6f,0x6c,0x79,0x31,0x33,0x30,0x35 };
+static const unsigned char poly1305TV0Tag[16] = { 0x49,0xec,0x78,0x09,0x0e,0x48,0x1e,0xc6,0xc2,0x6b,0x33,0xb9,0x1c,0xcc,0x03,0x07 };
 
-static const unsigned char poly1305TV1Input[12] = { 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x21 };
-static const unsigned char poly1305TV1Key[32] = {
-    0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x33, 0x32, 0x2d, 0x62, 0x79, 0x74, 0x65, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35
-};
-static const unsigned char poly1305TV1Tag[16] = { 0xa6, 0xf7, 0x45, 0x00, 0x8f, 0x81, 0xc9, 0x16, 0xa2, 0x0d, 0xcc, 0x74, 0xee, 0xf2, 0xb2, 0xf0 };
+static const unsigned char poly1305TV1Input[12] = { 0x48,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21 };
+static const unsigned char poly1305TV1Key[32] = { 0x74,0x68,0x69,0x73,0x20,0x69,0x73,0x20,0x33,0x32,0x2d,0x62,0x79,0x74,0x65,0x20,0x6b,0x65,0x79,0x20,0x66,0x6f,0x72,0x20,0x50,0x6f,0x6c,0x79,0x31,0x33,0x30,0x35 };
+static const unsigned char poly1305TV1Tag[16] = { 0xa6,0xf7,0x45,0x00,0x8f,0x81,0xc9,0x16,0xa2,0x0d,0xcc,0x74,0xee,0xf2,0xb2,0xf0 };
 
-static const char* sha512TV0Input = "supercalifragilisticexpealidocious";
-static const unsigned char sha512TV0Digest[64] = { 0x18, 0x2a, 0x85, 0x59, 0x69, 0xe5, 0xd3, 0xe6, 0xcb, 0xf6, 0x05, 0x24, 0xad, 0xf2, 0x88, 0xd1, 0xbb, 0xf2, 0x52, 0x92, 0x81, 0x24,
-                                                   0x31, 0xf6, 0xd2, 0x52, 0xf1, 0xdb, 0xc1, 0xcb, 0x44, 0xdf, 0x21, 0x57, 0x3d, 0xe1, 0xb0, 0x6b, 0x68, 0x75, 0x95, 0x9f, 0x3b, 0x6f,
-                                                   0x87, 0xb1, 0x13, 0x81, 0xd0, 0xbc, 0x79, 0x2c, 0x43, 0x3a, 0x13, 0x55, 0x3c, 0xe0, 0x84, 0xc2, 0x92, 0x55, 0x31, 0x1c };
+static const char *sha512TV0Input = "supercalifragilisticexpealidocious";
+static const unsigned char sha512TV0Digest[64] = { 0x18,0x2a,0x85,0x59,0x69,0xe5,0xd3,0xe6,0xcb,0xf6,0x05,0x24,0xad,0xf2,0x88,0xd1,0xbb,0xf2,0x52,0x92,0x81,0x24,0x31,0xf6,0xd2,0x52,0xf1,0xdb,0xc1,0xcb,0x44,0xdf,0x21,0x57,0x3d,0xe1,0xb0,0x6b,0x68,0x75,0x95,0x9f,0x3b,0x6f,0x87,0xb1,0x13,0x81,0xd0,0xbc,0x79,0x2c,0x43,0x3a,0x13,0x55,0x3c,0xe0,0x84,0xc2,0x92,0x55,0x31,0x1c };
 
-struct C25519TestVector {
-    unsigned char pub1[64];
-    unsigned char priv1[64];
-    unsigned char pub2[64];
-    unsigned char priv2[64];
-    unsigned char agreement[64];
-    unsigned char agreementSignedBy1[96];
-    unsigned char agreementSignedBy2[96];
+struct C25519TestVector
+{
+	unsigned char pub1[64];
+	unsigned char priv1[64];
+	unsigned char pub2[64];
+	unsigned char priv2[64];
+	unsigned char agreement[64];
+	unsigned char agreementSignedBy1[96];
+	unsigned char agreementSignedBy2[96];
 };
 
 #define ZT_NUM_C25519_TEST_VECTORS 32
 
 static const C25519TestVector C25519_TEST_VECTORS[ZT_NUM_C25519_TEST_VECTORS] = {
-    { { 0xa1, 0xfc, 0x7a, 0xb4, 0x6d, 0xdf, 0x7d, 0xcf, 0xe7, 0xec, 0x75, 0xe5, 0xfa, 0xdd, 0x11, 0xcb, 0xcc, 0x37, 0xf8, 0x84, 0x5d, 0x1c, 0x92, 0x4e, 0x09, 0x89, 0x65, 0xfc, 0xd8, 0xe9, 0x5a, 0x30,
-        0xda, 0xe4, 0x86, 0xa3, 0x35, 0xb4, 0x19, 0x0c, 0xbc, 0x7b, 0xcb, 0x3e, 0xb9, 0x4c, 0xbd, 0x16, 0xe8, 0x3d, 0x13, 0x2b, 0xc9, 0xc3, 0x39, 0xea, 0xf1, 0x42, 0xe7, 0x6f, 0x69, 0x78, 0x9a, 0xb7 },
-      { 0xe5, 0xf3, 0x7b, 0xd4, 0x0e, 0xc9, 0xdc, 0x77, 0x50, 0x86, 0xdc, 0xf4, 0x2e, 0xbc, 0xdb, 0x27, 0xf0, 0x73, 0xd4, 0x58, 0x73, 0xc4, 0x4b, 0x71, 0x8b, 0x3c, 0xc5, 0x4f, 0xa8, 0x7c, 0xa4, 0x84,
-        0xd9, 0x96, 0x23, 0x73, 0xb4, 0x03, 0x16, 0xbf, 0x1e, 0xa1, 0x2d, 0xd8, 0xc4, 0x8a, 0xe7, 0x82, 0x10, 0xda, 0xc9, 0xe5, 0x45, 0x9b, 0x01, 0xdc, 0x73, 0xa6, 0xc9, 0x17, 0xa8, 0x15, 0x31, 0x6d },
-      { 0x3e, 0x49, 0xa4, 0x0e, 0x3a, 0xaf, 0xa3, 0x07, 0x3d, 0xf7, 0x2a, 0xec, 0x43, 0xb1, 0xd4, 0x09, 0x1a, 0xcb, 0x8e, 0x92, 0xf9, 0x65, 0x95, 0x04, 0x6d, 0x2d, 0x9b, 0x34, 0xa3, 0xbf, 0x51, 0x00,
-        0xe2, 0xee, 0x23, 0xf5, 0x28, 0x0a, 0xa9, 0xb1, 0x57, 0x0b, 0x96, 0x56, 0x62, 0xba, 0x12, 0x94, 0xaf, 0xc6, 0x5f, 0xb5, 0x61, 0x43, 0x0f, 0xde, 0x0b, 0xab, 0xfa, 0x4f, 0xfe, 0xc5, 0xe7, 0x18 },
-      { 0x00, 0x4d, 0x41, 0x8d, 0xe4, 0x69, 0x23, 0xae, 0x98, 0xc4, 0x3e, 0x77, 0x0f, 0x1d, 0x94, 0x5d, 0x29, 0x3e, 0x94, 0x5a, 0x38, 0x39, 0x20, 0x0f, 0xd3, 0x6f, 0x76, 0xa2, 0x29, 0x02, 0x03, 0xcb,
-        0x0b, 0x7f, 0x4f, 0x1a, 0x29, 0x51, 0x13, 0x33, 0x7c, 0x99, 0xb3, 0x81, 0x82, 0x39, 0x44, 0x05, 0x97, 0xfb, 0x0d, 0xf2, 0x93, 0xa2, 0x40, 0x94, 0xf4, 0xff, 0x5d, 0x09, 0x61, 0xe4, 0x5f, 0x76 },
-      { 0xab, 0xce, 0xd2, 0x24, 0xe8, 0x93, 0xb0, 0xe7, 0x72, 0x14, 0xdc, 0xbb, 0x7d, 0x0f, 0xd8, 0x94, 0x16, 0x9e, 0xb5, 0x7f, 0xd7, 0x19, 0x5f, 0x3e, 0x2d, 0x45, 0xd5, 0xf7, 0x90, 0x0b, 0x3e, 0x05,
-        0x18, 0x2e, 0x2b, 0xf4, 0xfa, 0xd4, 0xec, 0x62, 0x4a, 0x4f, 0x48, 0x50, 0xaf, 0x1c, 0xe8, 0x9f, 0x1a, 0xe1, 0x3d, 0x70, 0x49, 0x00, 0xa7, 0xe3, 0x5b, 0x1e, 0xa1, 0x9b, 0x68, 0x1e, 0xa1, 0x73 },
-      { 0xed, 0xb6, 0xd0, 0xf0, 0x06, 0x6e, 0x33, 0x9c, 0x86, 0xfb, 0xe8, 0xc3, 0x6c, 0x8d, 0xde, 0xdd, 0xa6, 0xa0, 0x2d, 0xb9, 0x07, 0x29, 0xa3, 0x13, 0xbb, 0xa4, 0xba, 0xec, 0x48, 0xc8, 0xf4, 0x56,
-        0x82, 0x79, 0xe2, 0xb1, 0xd3, 0x3d, 0x83, 0x9f, 0x10, 0xe8, 0x52, 0xe6, 0x8b, 0x1c, 0x33, 0x9e, 0x2b, 0xd2, 0xdb, 0x62, 0x1c, 0x56, 0xfd, 0x50, 0x40, 0x77, 0x81, 0xab, 0x21, 0x67, 0x3e, 0x09,
-        0x4f, 0xf2, 0x51, 0xac, 0x7d, 0xe7, 0xd1, 0x5d, 0x4b, 0xe2, 0x08, 0xc6, 0x3f, 0x6a, 0x4d, 0xc8, 0x5d, 0x74, 0xf6, 0x3b, 0xec, 0x8e, 0xc6, 0x0c, 0x32, 0x27, 0x2f, 0x9c, 0x09, 0x48, 0x59, 0x10 },
-      { 0x23, 0x0f, 0xa3, 0xe2, 0x69, 0xce, 0xb9, 0xb9, 0xd1, 0x1c, 0x4e, 0xab, 0x63, 0xc9, 0x2e, 0x1e, 0x7e, 0xa2, 0xa2, 0xa0, 0x49, 0x2e, 0x78, 0xe4, 0x8a, 0x02, 0x3b, 0xa7, 0xab, 0x1f, 0xd4, 0xce,
-        0x05, 0xe2, 0x80, 0x09, 0x09, 0x3c, 0x61, 0xc7, 0x10, 0x3a, 0x9c, 0xf4, 0x95, 0xac, 0x89, 0x6f, 0x23, 0xb3, 0x09, 0xe2, 0x24, 0x3f, 0xf6, 0x96, 0x02, 0x36, 0x41, 0x16, 0x32, 0xe1, 0x66, 0x05,
-        0x4f, 0xf2, 0x51, 0xac, 0x7d, 0xe7, 0xd1, 0x5d, 0x4b, 0xe2, 0x08, 0xc6, 0x3f, 0x6a, 0x4d, 0xc8, 0x5d, 0x74, 0xf6, 0x3b, 0xec, 0x8e, 0xc6, 0x0c, 0x32, 0x27, 0x2f, 0x9c, 0x09, 0x48, 0x59, 0x10 } },
-    { { 0xfd, 0x81, 0x14, 0xf1, 0x67, 0x07, 0x44, 0xbb, 0x93, 0x84, 0xa2, 0xdc, 0x36, 0xdc, 0xcc, 0xb3, 0x9e, 0x82, 0xd4, 0x8b, 0x42, 0x56, 0xfb, 0xf2, 0x6e, 0x83, 0x3b, 0x16, 0x2c, 0x29, 0xfb, 0x39,
-        0x29, 0x48, 0x85, 0xe3, 0xe3, 0xf7, 0xe7, 0x80, 0x49, 0xd3, 0x01, 0x30, 0x5a, 0x2c, 0x3f, 0x4c, 0xea, 0x13, 0xeb, 0xda, 0xf4, 0x56, 0x75, 0x8d, 0x50, 0x1e, 0x19, 0x2d, 0x29, 0x2b, 0xfb, 0xdb },
-      { 0x85, 0x34, 0x4d, 0xf7, 0x39, 0xbf, 0x98, 0x79, 0x8c, 0x98, 0xeb, 0x8d, 0x61, 0x27, 0xec, 0x87, 0x56, 0xcd, 0xd0, 0xa6, 0x55, 0x77, 0xee, 0xf0, 0x20, 0xd0, 0x59, 0x39, 0x95, 0xab, 0x29, 0x82,
-        0x8e, 0x61, 0xf8, 0xad, 0xed, 0xb6, 0x27, 0xc3, 0xd8, 0x16, 0xce, 0x67, 0x78, 0xe2, 0x04, 0x4b, 0x0c, 0x2d, 0x2f, 0xc3, 0x24, 0x72, 0xbc, 0x53, 0xbd, 0xfe, 0x39, 0x23, 0xd4, 0xaf, 0x27, 0x84 },
-      { 0x11, 0xbe, 0x5f, 0x5a, 0x73, 0xe7, 0x42, 0xef, 0xff, 0x3c, 0x47, 0x6a, 0x0e, 0x6b, 0x9e, 0x96, 0x21, 0xa3, 0xdf, 0x49, 0xe9, 0x3f, 0x40, 0xfc, 0xab, 0xb3, 0x66, 0xd3, 0x3d, 0xfa, 0x02, 0x29,
-        0xf3, 0x43, 0x45, 0x3c, 0x70, 0xa3, 0x5d, 0x39, 0xf7, 0xc0, 0x6a, 0xcd, 0xfa, 0x1d, 0xbe, 0x3b, 0x91, 0x41, 0xe4, 0xb0, 0x60, 0xc0, 0x22, 0xf7, 0x2c, 0x11, 0x2b, 0x1c, 0x5f, 0x24, 0xef, 0x53 },
-      { 0xfd, 0x3f, 0x09, 0x06, 0xc9, 0x39, 0x8d, 0x48, 0xfa, 0x6b, 0xc9, 0x80, 0xbf, 0xf6, 0xd6, 0x76, 0xb3, 0x62, 0x70, 0x88, 0x4f, 0xde, 0xde, 0xb9, 0xb4, 0xf0, 0xce, 0xf3, 0x74, 0x0d, 0xea, 0x00,
-        0x9e, 0x9c, 0x29, 0xe1, 0xa2, 0x1b, 0xbd, 0xb5, 0x83, 0xcc, 0x12, 0xd8, 0x48, 0x08, 0x5b, 0xe5, 0xd6, 0xf9, 0x11, 0x5c, 0xe0, 0xd9, 0xc3, 0x3c, 0x26, 0xbd, 0x69, 0x9f, 0x5c, 0x6f, 0x0c, 0x6f },
-      { 0xca, 0xd4, 0x76, 0x32, 0x8b, 0xbe, 0x0c, 0x65, 0x75, 0x43, 0x73, 0xc2, 0xf2, 0xfd, 0x7f, 0xeb, 0xe4, 0x62, 0xc5, 0x0d, 0x0f, 0xf9, 0x01, 0xc8, 0xb9, 0xfa, 0xca, 0xb4, 0x12, 0x1c, 0xb4, 0xac,
-        0x0e, 0x5f, 0x18, 0xfc, 0x0c, 0x7f, 0x2a, 0x55, 0xc5, 0xfd, 0x4d, 0x83, 0xb2, 0x02, 0x31, 0x6a, 0x3f, 0x14, 0xee, 0x9d, 0x11, 0xa8, 0x06, 0xad, 0xeb, 0x93, 0x19, 0x79, 0xb1, 0xf2, 0x78, 0x05 },
-      { 0x85, 0xe6, 0xe2, 0xf2, 0x96, 0xe7, 0xa2, 0x8b, 0x7e, 0x36, 0xbd, 0x7b, 0xf4, 0x28, 0x6a, 0xd7, 0xbc, 0x2a, 0x6a, 0x59, 0xfd, 0xc0, 0xc8, 0x3d, 0x50, 0x0f, 0x0c, 0x2b, 0x12, 0x3a, 0x75, 0xc7,
-        0x56, 0xbb, 0x7f, 0x7d, 0x4e, 0xd4, 0x03, 0xb8, 0x7b, 0xde, 0xde, 0x99, 0x65, 0x9e, 0xc4, 0xa6, 0x6e, 0xfe, 0x00, 0x88, 0xeb, 0x9d, 0xa4, 0xa9, 0x9d, 0x37, 0xc9, 0x4a, 0xcf, 0x69, 0xc4, 0x01,
-        0xba, 0xa8, 0xce, 0xeb, 0x72, 0xcb, 0x64, 0x8b, 0x9f, 0xc1, 0x1f, 0x9a, 0x9e, 0x99, 0xcc, 0x39, 0xec, 0xd9, 0xbb, 0xd9, 0xce, 0xc2, 0x74, 0x6f, 0xd0, 0x2a, 0xb9, 0xc6, 0xe3, 0xf5, 0xe7, 0xf4 },
-      { 0xb1, 0x39, 0x50, 0xb1, 0x1a, 0x08, 0x42, 0x2b, 0xdd, 0x6d, 0x20, 0x9f, 0x0f, 0x37, 0xba, 0x69, 0x97, 0x21, 0x30, 0x7a, 0x71, 0x2f, 0xce, 0x98, 0x09, 0x04, 0xa2, 0x98, 0x6a, 0xed, 0x02, 0x1d,
-        0x5d, 0x30, 0x8f, 0x03, 0x47, 0x6b, 0x89, 0xfd, 0xf7, 0x1a, 0xca, 0x46, 0x6f, 0x51, 0x69, 0x9a, 0x2b, 0x18, 0x77, 0xe4, 0xad, 0x0d, 0x7a, 0x66, 0xd2, 0x2c, 0x28, 0xa0, 0xd3, 0x0a, 0x99, 0x0d,
-        0xba, 0xa8, 0xce, 0xeb, 0x72, 0xcb, 0x64, 0x8b, 0x9f, 0xc1, 0x1f, 0x9a, 0x9e, 0x99, 0xcc, 0x39, 0xec, 0xd9, 0xbb, 0xd9, 0xce, 0xc2, 0x74, 0x6f, 0xd0, 0x2a, 0xb9, 0xc6, 0xe3, 0xf5, 0xe7, 0xf4 } },
-    { { 0x02, 0x3a, 0x7e, 0x0c, 0x6d, 0x96, 0x3c, 0x5d, 0x44, 0x56, 0x5d, 0xc1, 0x49, 0x94, 0x35, 0x12, 0x9d, 0xff, 0x8a, 0x5d, 0x91, 0x74, 0xa8, 0x15, 0xee, 0x5d, 0x1e, 0x72, 0xbe, 0x86, 0x15, 0x68,
-        0xe7, 0x36, 0xa2, 0x4a, 0xb8, 0xa2, 0xa4, 0x4c, 0xd8, 0x95, 0xe3, 0xc7, 0xbb, 0x32, 0x21, 0x90, 0x64, 0x52, 0x32, 0xeb, 0x26, 0xd3, 0x4f, 0xf0, 0x8e, 0x27, 0x40, 0xea, 0xed, 0xdb, 0xf5, 0xc4 },
-      { 0x76, 0x99, 0x64, 0x70, 0xf4, 0x50, 0xc8, 0xcc, 0x4a, 0x5a, 0xa5, 0x0f, 0xeb, 0x2d, 0xc7, 0x0e, 0x73, 0xd0, 0x65, 0x7d, 0xc3, 0xce, 0x73, 0x03, 0x20, 0x2f, 0xad, 0x65, 0xfd, 0x12, 0xe4, 0x7f,
-        0xfd, 0x45, 0x3a, 0x6e, 0xc5, 0x9a, 0x06, 0x67, 0x0e, 0xa6, 0x7b, 0x21, 0x49, 0x2d, 0x01, 0x1b, 0x8e, 0x03, 0x6e, 0x10, 0x08, 0x0c, 0x68, 0xd9, 0x60, 0x47, 0xa4, 0xe2, 0x52, 0xfd, 0x3c, 0xf4 },
-      { 0xa3, 0xe2, 0x5f, 0x16, 0x39, 0x78, 0x96, 0xf7, 0x47, 0x6f, 0x93, 0x5d, 0x27, 0x7b, 0x58, 0xe0, 0xc5, 0xdb, 0x71, 0x7d, 0xa9, 0x6f, 0xf8, 0x8b, 0x69, 0xdd, 0x50, 0xea, 0x91, 0x0d, 0x66, 0x77,
-        0xaf, 0x8f, 0xd5, 0x9f, 0x8a, 0x26, 0x69, 0x4c, 0x64, 0x37, 0x62, 0x81, 0x6f, 0x05, 0x9a, 0x08, 0x0d, 0xe1, 0x69, 0x24, 0x77, 0x3f, 0x50, 0xb2, 0x49, 0x4d, 0x93, 0xef, 0x2e, 0x87, 0xff, 0xde },
-      { 0xb3, 0x32, 0xe2, 0x67, 0x79, 0x32, 0x5f, 0x64, 0x47, 0x49, 0x1c, 0xd3, 0x8f, 0x95, 0x44, 0xfd, 0x4c, 0x7e, 0xbf, 0x6b, 0xb7, 0xaf, 0x2c, 0xdd, 0x8f, 0xa5, 0xd8, 0x2f, 0xbf, 0xa0, 0x8a, 0x6b,
-        0x58, 0x25, 0xc9, 0x12, 0x23, 0x6f, 0xe6, 0x05, 0xa8, 0xd0, 0x68, 0x6e, 0x0c, 0xee, 0x70, 0xe4, 0xa3, 0x86, 0x51, 0x04, 0x6d, 0xca, 0xd5, 0xed, 0xcf, 0x74, 0x1d, 0x60, 0x9e, 0x86, 0x2d, 0x05 },
-      { 0x91, 0xf4, 0x5f, 0x4a, 0xcb, 0xd8, 0xfd, 0x5f, 0xb9, 0x3d, 0x04, 0xb8, 0xec, 0x35, 0x85, 0x4f, 0x58, 0x20, 0xd1, 0x1f, 0x47, 0xc4, 0xf4, 0xcb, 0x21, 0x4e, 0x9a, 0xf1, 0x6e, 0xbf, 0xe3, 0xd3,
-        0x62, 0xe3, 0x82, 0xf6, 0xba, 0xa8, 0xdf, 0x92, 0xe2, 0x3c, 0xe5, 0xf0, 0x16, 0x8a, 0xeb, 0xa4, 0xbb, 0xc7, 0x81, 0xaf, 0x15, 0x19, 0x87, 0x5f, 0xb7, 0xe0, 0x4c, 0x12, 0xff, 0x2c, 0xa9, 0xc8 },
-      { 0xaf, 0x85, 0xe0, 0x36, 0x43, 0xdf, 0x41, 0x17, 0xda, 0xde, 0x5e, 0xb6, 0x33, 0xd0, 0xce, 0x62, 0x70, 0x5f, 0x85, 0x24, 0x6c, 0x3e, 0x1b, 0xe1, 0x52, 0xc1, 0x9b, 0x1c, 0xcd, 0x61, 0x80, 0x9c,
-        0xa0, 0xe8, 0x18, 0xee, 0x40, 0x91, 0x93, 0x82, 0xdb, 0x33, 0x44, 0xff, 0xd4, 0xf6, 0x6f, 0x5d, 0xf0, 0x0e, 0x92, 0x92, 0x81, 0x55, 0x46, 0x06, 0xac, 0x58, 0x81, 0x3b, 0x04, 0xc7, 0xf7, 0x0d,
-        0xd2, 0x0c, 0x08, 0x6d, 0x46, 0xdb, 0x43, 0x28, 0x31, 0xd8, 0xcd, 0x87, 0x50, 0xbb, 0xd3, 0x07, 0xf5, 0x72, 0x0b, 0x15, 0x7c, 0x16, 0xab, 0x03, 0xd9, 0x4b, 0x07, 0x38, 0x97, 0xe8, 0xd6, 0xb5 },
-      { 0x93, 0xff, 0x6d, 0xc3, 0x62, 0xf7, 0xcc, 0x20, 0x95, 0xc2, 0x2f, 0x7d, 0x1d, 0x9b, 0xd1, 0x63, 0xfc, 0x61, 0x47, 0xb3, 0x22, 0x0f, 0xca, 0xb0, 0x16, 0xcf, 0x29, 0x53, 0x46, 0x97, 0xb1, 0x36,
-        0x46, 0xac, 0x48, 0x13, 0x92, 0xe4, 0x46, 0x68, 0xcf, 0x09, 0x4e, 0xfa, 0x59, 0x45, 0x24, 0x08, 0xdb, 0xb4, 0x6f, 0x20, 0x55, 0x12, 0xd9, 0x75, 0x9d, 0x8e, 0x0b, 0xf8, 0x63, 0xe0, 0xf9, 0x01,
-        0xd2, 0x0c, 0x08, 0x6d, 0x46, 0xdb, 0x43, 0x28, 0x31, 0xd8, 0xcd, 0x87, 0x50, 0xbb, 0xd3, 0x07, 0xf5, 0x72, 0x0b, 0x15, 0x7c, 0x16, 0xab, 0x03, 0xd9, 0x4b, 0x07, 0x38, 0x97, 0xe8, 0xd6, 0xb5 } },
-    { { 0x14, 0x35, 0xa6, 0x7d, 0xc1, 0xb5, 0x71, 0xca, 0x42, 0x50, 0x90, 0xa7, 0x72, 0x85, 0xbe, 0x78, 0x7a, 0x5f, 0x83, 0x1e, 0xbe, 0xef, 0x6a, 0xbe, 0x48, 0xc5, 0x68, 0x14, 0x0c, 0xf7, 0x44, 0x5c,
-        0x2e, 0xfd, 0x1b, 0xcc, 0xee, 0x09, 0x23, 0x82, 0x31, 0xad, 0xaf, 0x4b, 0x73, 0x9c, 0xf2, 0x88, 0x3c, 0xf3, 0xb5, 0x43, 0x8b, 0x53, 0xf9, 0xac, 0x17, 0x86, 0x1c, 0xc2, 0x53, 0x43, 0xec, 0x03 },
-      { 0x7b, 0x36, 0x6c, 0xcc, 0xb5, 0xb2, 0x23, 0x3d, 0x7c, 0xe5, 0xe7, 0xcf, 0x06, 0xe2, 0x32, 0x0b, 0xc5, 0x3b, 0x7f, 0x86, 0x40, 0xfc, 0xaf, 0xba, 0x94, 0xe0, 0x88, 0x58, 0x5b, 0xac, 0xe8, 0xc3,
-        0xe8, 0xc3, 0xdf, 0xc4, 0x45, 0x29, 0xe8, 0xf0, 0x1c, 0x10, 0x0d, 0x50, 0x81, 0x29, 0x30, 0xa8, 0x27, 0xb5, 0x3e, 0xb8, 0x25, 0xf1, 0x17, 0x30, 0xc6, 0x05, 0xe3, 0x3e, 0x45, 0x38, 0xa8, 0x3c },
-      { 0xce, 0xd9, 0x45, 0x28, 0xb0, 0xce, 0xa5, 0x47, 0xa8, 0x29, 0x32, 0x76, 0x99, 0x73, 0x8d, 0x74, 0xf9, 0xed, 0x0a, 0xd0, 0xf1, 0xd8, 0x7e, 0x44, 0x63, 0x9e, 0x9a, 0xcf, 0x7c, 0x35, 0x8a, 0x29,
-        0xbb, 0x71, 0x66, 0x8d, 0xa7, 0xfc, 0x05, 0x3d, 0xd4, 0x4b, 0x65, 0x20, 0xf5, 0xa4, 0x64, 0xd8, 0x9d, 0x16, 0x80, 0x9c, 0xb2, 0x3c, 0x3e, 0xd4, 0x9d, 0x09, 0x88, 0x8e, 0xbb, 0x58, 0xf8, 0x77 },
-      { 0xe1, 0x29, 0xb3, 0x16, 0xe6, 0xa0, 0xdb, 0x64, 0x08, 0x36, 0xdc, 0x33, 0xad, 0x8b, 0x30, 0x26, 0x17, 0x56, 0xd7, 0x34, 0x17, 0xd1, 0xdd, 0x23, 0x38, 0x58, 0x25, 0x01, 0x42, 0x5a, 0x9d, 0x18,
-        0x3e, 0xac, 0x31, 0xfa, 0x43, 0x28, 0xc4, 0x65, 0xfb, 0x30, 0x2f, 0x8c, 0x16, 0x52, 0x32, 0x1b, 0x19, 0xb7, 0x31, 0xf6, 0x67, 0xa7, 0xd8, 0xed, 0x9a, 0xa3, 0x95, 0x01, 0xd7, 0xb9, 0xe7, 0xcc },
-      { 0x81, 0x2d, 0x11, 0xa9, 0x11, 0xf1, 0x22, 0xe2, 0x67, 0x70, 0xc4, 0xba, 0x34, 0xa1, 0x75, 0x8c, 0xf6, 0x0c, 0x63, 0xe7, 0x01, 0x3c, 0x64, 0x6c, 0xe8, 0xd0, 0xf8, 0x8e, 0x88, 0xdf, 0x5c, 0x61,
-        0x68, 0x5d, 0x1f, 0xeb, 0x83, 0x1f, 0x40, 0xb8, 0xa8, 0x56, 0x57, 0x26, 0x81, 0x2c, 0xa3, 0x0e, 0x48, 0x4c, 0x45, 0x4d, 0x0d, 0x3d, 0x6e, 0x99, 0x52, 0xbd, 0x0b, 0xd8, 0x05, 0xc5, 0xf9, 0x61 },
-      { 0x92, 0x45, 0xbe, 0xe6, 0xb4, 0x7a, 0xfa, 0x28, 0xd4, 0x5b, 0x6b, 0x17, 0xc6, 0x13, 0x61, 0x5d, 0x5f, 0xd7, 0x90, 0xbb, 0x89, 0x35, 0x7a, 0x02, 0x50, 0x57, 0x56, 0x5f, 0x19, 0xb5, 0xb6, 0xc5,
-        0x77, 0x1e, 0x1b, 0xc0, 0xd7, 0x7a, 0x29, 0xbd, 0xe7, 0x24, 0x01, 0x2d, 0x37, 0xc0, 0x38, 0x6f, 0xc8, 0x35, 0xa1, 0x1b, 0xe0, 0xea, 0x16, 0xad, 0xbc, 0xdc, 0xd4, 0x8d, 0x4e, 0x71, 0xdb, 0x05,
-        0x9e, 0xb5, 0x53, 0x6b, 0x5c, 0xf1, 0x7d, 0x15, 0x8b, 0xd7, 0xc7, 0x8b, 0x89, 0x9d, 0xfd, 0x28, 0x7c, 0xa1, 0x31, 0xe2, 0xf0, 0x2c, 0x3a, 0x8d, 0x0e, 0x23, 0x85, 0x4e, 0xf0, 0xd1, 0xc0, 0x83 },
-      { 0x7b, 0x88, 0xeb, 0x45, 0x1c, 0x7f, 0xfd, 0xbe, 0xba, 0xac, 0x53, 0x28, 0x59, 0xe8, 0xad, 0x28, 0xf1, 0x97, 0x2d, 0x6c, 0x31, 0xa6, 0xae, 0x47, 0x10, 0x69, 0x68, 0x55, 0xa6, 0x9c, 0x03, 0x62,
-        0xb7, 0x2f, 0x31, 0x46, 0x2a, 0x2b, 0x98, 0xdd, 0xe9, 0xf9, 0xfe, 0x77, 0x71, 0x41, 0x54, 0xf8, 0x59, 0x02, 0x7a, 0xe3, 0x45, 0x67, 0xb6, 0xf7, 0x94, 0x31, 0x3e, 0x62, 0x62, 0x2a, 0xf9, 0x0a,
-        0x9e, 0xb5, 0x53, 0x6b, 0x5c, 0xf1, 0x7d, 0x15, 0x8b, 0xd7, 0xc7, 0x8b, 0x89, 0x9d, 0xfd, 0x28, 0x7c, 0xa1, 0x31, 0xe2, 0xf0, 0x2c, 0x3a, 0x8d, 0x0e, 0x23, 0x85, 0x4e, 0xf0, 0xd1, 0xc0, 0x83 } },
-    { { 0x27, 0x4d, 0x84, 0x08, 0x95, 0x84, 0xc8, 0xeb, 0x1c, 0x9a, 0x0f, 0xca, 0x09, 0x6f, 0x48, 0x8b, 0x2b, 0x06, 0xa0, 0xae, 0xf2, 0xe3, 0x8a, 0xfe, 0xd7, 0x52, 0x4b, 0xf2, 0xc6, 0x7c, 0xc1, 0x55,
-        0x87, 0x2e, 0x5a, 0xb4, 0xc2, 0x43, 0x0a, 0x0d, 0xd0, 0x00, 0xa8, 0xe1, 0x46, 0x68, 0x79, 0xd8, 0x8c, 0x01, 0x36, 0xb7, 0x5a, 0x61, 0x04, 0xe9, 0x7e, 0xbb, 0xc9, 0xee, 0xaa, 0x12, 0x13, 0xda },
-      { 0x78, 0x66, 0xd0, 0xa2, 0x50, 0x82, 0x8d, 0xb0, 0xa0, 0x20, 0xac, 0xa4, 0xb6, 0xa0, 0x31, 0xf7, 0x7d, 0x93, 0x37, 0x67, 0xbb, 0x60, 0xa2, 0x1e, 0x36, 0xce, 0x3d, 0x48, 0x1d, 0x79, 0x99, 0xa5,
-        0x19, 0xd8, 0x89, 0x1b, 0xcb, 0x14, 0x87, 0xb7, 0x62, 0xfd, 0xd2, 0xef, 0xbb, 0x13, 0x41, 0x4d, 0xf1, 0x77, 0x5c, 0x7f, 0x6c, 0x3b, 0x94, 0x7d, 0xb4, 0xba, 0x87, 0x3e, 0xc8, 0xe1, 0x3c, 0x0a },
-      { 0xd9, 0x9e, 0x14, 0x89, 0xd6, 0xf8, 0x49, 0xa2, 0xe2, 0x19, 0xfe, 0x94, 0xaa, 0xf7, 0x35, 0xf9, 0x4a, 0xf8, 0xf3, 0x18, 0x68, 0x96, 0x47, 0xc6, 0x23, 0x7c, 0xb0, 0x53, 0xcb, 0xd8, 0x90, 0x31,
-        0xb7, 0x50, 0x0e, 0x06, 0xc3, 0x84, 0x75, 0xf1, 0xac, 0x16, 0x4d, 0xc1, 0xbe, 0xf1, 0x80, 0x33, 0x47, 0x56, 0x6f, 0x33, 0x94, 0x5c, 0x81, 0x03, 0x4c, 0x2f, 0x6d, 0xac, 0x73, 0xba, 0x91, 0x3c },
-      { 0x2f, 0xa9, 0xb6, 0xe8, 0x73, 0xe2, 0xef, 0x6d, 0x6d, 0xd7, 0x2e, 0xa0, 0x51, 0x61, 0x24, 0x81, 0x8c, 0xa8, 0x47, 0x40, 0xe1, 0xc7, 0x75, 0x79, 0xc8, 0xec, 0xb2, 0x23, 0x41, 0xad, 0x61, 0x3b,
-        0xea, 0x8a, 0xdf, 0x63, 0xed, 0xe1, 0x8e, 0x50, 0x70, 0x6e, 0x86, 0xed, 0xb0, 0xba, 0x27, 0x48, 0x8e, 0xb9, 0x63, 0x39, 0x78, 0x58, 0x4f, 0x1e, 0xbc, 0x45, 0xf3, 0xf2, 0x3a, 0x73, 0x9b, 0x8c },
-      { 0xad, 0x42, 0xc5, 0x84, 0xca, 0xe1, 0xe1, 0x23, 0x2a, 0x73, 0x15, 0x3c, 0x9a, 0xfe, 0x85, 0x8d, 0xa3, 0x2c, 0xcf, 0x46, 0x8d, 0x7f, 0x1c, 0x61, 0xd7, 0x0e, 0xb1, 0xa6, 0xb4, 0xae, 0xab, 0x63,
-        0xc4, 0x0e, 0xf2, 0xa0, 0x5d, 0xa6, 0xf3, 0x5d, 0x35, 0x41, 0xea, 0x03, 0x91, 0xb1, 0x3a, 0x07, 0xe6, 0xed, 0x6c, 0x8c, 0xcb, 0x75, 0x27, 0xf1, 0x26, 0x58, 0xf0, 0x62, 0x57, 0xe4, 0x33, 0x00 },
-      { 0x1f, 0xed, 0x53, 0xc6, 0xef, 0x38, 0x26, 0xa4, 0x18, 0x88, 0x8f, 0x5c, 0x49, 0x1c, 0x15, 0x7d, 0x77, 0x90, 0x06, 0x39, 0xe0, 0x7c, 0x25, 0xed, 0x79, 0x05, 0x66, 0xe0, 0x5e, 0x94, 0xe3, 0x46,
-        0x6f, 0x96, 0xd8, 0xc1, 0x11, 0xa4, 0x11, 0x6f, 0x78, 0x42, 0x8e, 0x89, 0xc7, 0xc3, 0xed, 0xd2, 0x9e, 0x68, 0x47, 0x79, 0x89, 0x23, 0x70, 0x14, 0x21, 0x60, 0x2d, 0xfe, 0x37, 0x4b, 0xc8, 0x0a,
-        0x16, 0x73, 0x7c, 0xc4, 0x55, 0x3f, 0x25, 0x04, 0x08, 0x75, 0x74, 0x68, 0xbc, 0xe4, 0x3a, 0xae, 0x4c, 0x0e, 0xd2, 0x85, 0xa1, 0xbc, 0x81, 0xc0, 0xc9, 0xfe, 0x9a, 0x44, 0x7b, 0x83, 0xdf, 0xc7 },
-      { 0x27, 0x77, 0x97, 0x84, 0x0f, 0x2d, 0x8d, 0x33, 0xb8, 0x4e, 0xdb, 0x8b, 0xea, 0x58, 0x52, 0x88, 0x95, 0x88, 0x55, 0x5f, 0xb8, 0xc4, 0xc9, 0xd6, 0x1f, 0x1e, 0xee, 0x60, 0xb5, 0xeb, 0x78, 0x72,
-        0xb5, 0xe5, 0x22, 0x2b, 0x7f, 0x5e, 0xc7, 0x9b, 0x29, 0x55, 0x8e, 0x2a, 0xfc, 0x65, 0x55, 0x4a, 0x02, 0xad, 0x64, 0x06, 0xd4, 0x25, 0xe1, 0x96, 0x6f, 0xee, 0x96, 0xcd, 0x29, 0xc6, 0x64, 0x00,
-        0x16, 0x73, 0x7c, 0xc4, 0x55, 0x3f, 0x25, 0x04, 0x08, 0x75, 0x74, 0x68, 0xbc, 0xe4, 0x3a, 0xae, 0x4c, 0x0e, 0xd2, 0x85, 0xa1, 0xbc, 0x81, 0xc0, 0xc9, 0xfe, 0x9a, 0x44, 0x7b, 0x83, 0xdf, 0xc7 } },
-    { { 0x5e, 0xc5, 0x5b, 0x9c, 0xdb, 0x14, 0x05, 0x18, 0x6b, 0xe2, 0x1d, 0x16, 0x77, 0x22, 0x0e, 0xd2, 0xe4, 0x57, 0x82, 0x6e, 0x5b, 0xc5, 0x6a, 0xb9, 0x34, 0x20, 0xdb, 0x72, 0xe2, 0xe1, 0xeb, 0x1b,
-        0x34, 0x00, 0x04, 0xbf, 0x83, 0xf6, 0x4f, 0x12, 0x45, 0x08, 0xf0, 0x95, 0x2a, 0xdc, 0x3a, 0x14, 0xb3, 0x29, 0x0b, 0x99, 0xcd, 0x73, 0x31, 0xbd, 0x04, 0xbb, 0x49, 0x1c, 0xde, 0xcf, 0x09, 0x9e },
-      { 0x15, 0x80, 0x3e, 0x2a, 0xfb, 0xc0, 0x8d, 0x62, 0x19, 0x27, 0x83, 0x04, 0xcc, 0xf5, 0xd1, 0xbb, 0x40, 0x41, 0xbe, 0x93, 0x59, 0x6e, 0x27, 0x6d, 0x95, 0x24, 0x0a, 0x07, 0x27, 0x86, 0x10, 0x75,
-        0xf7, 0x0a, 0x11, 0xfc, 0x53, 0xd0, 0x4c, 0x15, 0xf8, 0x6e, 0x22, 0x3f, 0xeb, 0x12, 0x97, 0x8a, 0x3d, 0x69, 0xd8, 0x96, 0xc9, 0x53, 0x10, 0x9c, 0x02, 0x95, 0xe4, 0xd3, 0x1a, 0xd5, 0x43, 0x82 },
-      { 0x40, 0x09, 0x2c, 0x17, 0x7e, 0xba, 0xce, 0x1f, 0xfc, 0xc1, 0x8e, 0xc3, 0x1c, 0xa2, 0x34, 0x52, 0x78, 0x16, 0x23, 0x71, 0x82, 0x40, 0xf8, 0x6d, 0x67, 0x65, 0x67, 0x50, 0x53, 0xd9, 0xc8, 0x5e,
-        0x7e, 0x8a, 0x98, 0xa3, 0xc6, 0x2a, 0x4d, 0x27, 0xf3, 0xb9, 0xbb, 0xae, 0x43, 0x29, 0x6e, 0x02, 0x1c, 0xe9, 0x01, 0xd6, 0xcd, 0xd8, 0x91, 0x44, 0x95, 0x2b, 0x9e, 0xa5, 0x4f, 0xd0, 0x00, 0xb9 },
-      { 0x3a, 0xe8, 0x3d, 0xb3, 0x32, 0xdc, 0xc2, 0xc8, 0xe3, 0x36, 0x2f, 0xc9, 0x30, 0x3a, 0xc0, 0x76, 0x56, 0xd3, 0x0b, 0x06, 0xbe, 0x8f, 0xe7, 0xf1, 0x66, 0x61, 0x25, 0x42, 0x28, 0xdc, 0x08, 0x81,
-        0x84, 0x3a, 0x57, 0x96, 0x27, 0xa6, 0xcf, 0xd6, 0x8f, 0x35, 0xa2, 0xc3, 0x76, 0x86, 0x4f, 0xcf, 0x5f, 0xa1, 0x85, 0x28, 0x4f, 0x4a, 0x3a, 0xbb, 0x5c, 0x25, 0x4b, 0xcc, 0x46, 0xfe, 0xf2, 0x04 },
-      { 0x62, 0xc8, 0xa2, 0x0a, 0x59, 0xb8, 0x97, 0xd2, 0x68, 0x94, 0x00, 0x3b, 0x01, 0xac, 0x91, 0x6e, 0x97, 0x8e, 0x08, 0xe3, 0xfe, 0x9f, 0x9e, 0x9f, 0x4b, 0xcc, 0x5d, 0x1d, 0xb9, 0xbf, 0x07, 0x83,
-        0xfe, 0x51, 0x2a, 0xdf, 0x79, 0x2e, 0x07, 0xc9, 0x98, 0x9b, 0xbe, 0xb6, 0xe4, 0x0a, 0x20, 0x44, 0x86, 0xea, 0xb1, 0x61, 0x58, 0x11, 0x32, 0x8e, 0x7b, 0xb9, 0x67, 0x2d, 0xf0, 0x78, 0xb2, 0x93 },
-      { 0x1a, 0x65, 0xb3, 0x6f, 0xa2, 0x45, 0x29, 0x53, 0xd7, 0x23, 0x4d, 0xff, 0x8e, 0xe9, 0xb9, 0xef, 0x16, 0xa0, 0xdd, 0x48, 0xdf, 0x70, 0xd2, 0xe1, 0x56, 0xca, 0xd1, 0xd0, 0x4a, 0x9d, 0x63, 0x92,
-        0x2b, 0xfd, 0x7b, 0x87, 0x39, 0x3c, 0x12, 0xc7, 0xe5, 0x91, 0x31, 0x95, 0x78, 0xc4, 0x58, 0x95, 0x89, 0x6e, 0x2c, 0x90, 0xb4, 0x0b, 0xb2, 0xfe, 0x52, 0xc0, 0x86, 0xc4, 0x2e, 0x56, 0x97, 0x0c,
-        0x20, 0xf2, 0xbc, 0x6a, 0x9b, 0x89, 0xfb, 0xe9, 0x85, 0x95, 0xd6, 0x22, 0x5e, 0x4d, 0x6d, 0x83, 0x9d, 0xf4, 0xbe, 0x66, 0x05, 0x32, 0xb6, 0xe2, 0xf1, 0x96, 0x42, 0xa4, 0xc8, 0x8c, 0x1b, 0xec },
-      { 0x43, 0x85, 0xff, 0xb9, 0xcf, 0x04, 0x83, 0x40, 0x70, 0x3a, 0x9c, 0x48, 0xb4, 0xc2, 0x99, 0x3b, 0xa0, 0x39, 0xf1, 0x39, 0x58, 0x7f, 0xd2, 0x49, 0x94, 0x3c, 0xc3, 0xe1, 0xb6, 0x56, 0x38, 0x55,
-        0x6f, 0xb5, 0x1a, 0x90, 0xa2, 0x04, 0x2f, 0x19, 0xf8, 0xb1, 0x65, 0x5a, 0xad, 0xcd, 0x1c, 0x56, 0x42, 0x38, 0xc2, 0x52, 0x09, 0xd6, 0x41, 0x98, 0x5d, 0x5f, 0xa5, 0xe7, 0xc2, 0x55, 0xa1, 0x09,
-        0x20, 0xf2, 0xbc, 0x6a, 0x9b, 0x89, 0xfb, 0xe9, 0x85, 0x95, 0xd6, 0x22, 0x5e, 0x4d, 0x6d, 0x83, 0x9d, 0xf4, 0xbe, 0x66, 0x05, 0x32, 0xb6, 0xe2, 0xf1, 0x96, 0x42, 0xa4, 0xc8, 0x8c, 0x1b, 0xec } },
-    { { 0xf2, 0x4a, 0x96, 0x57, 0xc3, 0x2f, 0xe6, 0x9f, 0xed, 0x7f, 0xcc, 0xe9, 0xea, 0xbe, 0xd2, 0x23, 0x4e, 0x47, 0x13, 0xd9, 0x53, 0x19, 0x31, 0x14, 0x0a, 0xd3, 0x9b, 0x95, 0xa7, 0x9c, 0x88, 0x5e,
-        0x08, 0xb2, 0x16, 0xda, 0x45, 0x61, 0x1d, 0x6b, 0xdf, 0xb1, 0x14, 0x0c, 0x66, 0xfd, 0x3a, 0xbe, 0x25, 0xdc, 0xfd, 0xcd, 0xcc, 0x5e, 0x28, 0x77, 0x5a, 0xa9, 0x8b, 0x84, 0x77, 0x26, 0x9d, 0xa6 },
-      { 0xea, 0xde, 0x4d, 0xab, 0x09, 0x02, 0xbf, 0x90, 0xf8, 0xae, 0x8b, 0x50, 0x01, 0xb2, 0x9d, 0x7c, 0x0a, 0x3b, 0x60, 0xda, 0x34, 0xa9, 0xbb, 0x4d, 0xa5, 0x53, 0x18, 0x65, 0xec, 0xaa, 0xc9, 0x29,
-        0xb2, 0xf7, 0x74, 0x14, 0x63, 0x5f, 0x88, 0xcf, 0x4e, 0x70, 0x1b, 0x11, 0x64, 0x73, 0x15, 0x6b, 0x5a, 0x8c, 0xb8, 0x4e, 0x0f, 0x83, 0xae, 0x4b, 0x5c, 0x52, 0x1c, 0x6a, 0x0f, 0x54, 0x77, 0xc8 },
-      { 0xae, 0xff, 0x55, 0xbf, 0x78, 0xb5, 0xde, 0x33, 0xeb, 0x87, 0xea, 0x13, 0x7d, 0x36, 0x22, 0x06, 0x32, 0xc4, 0x7e, 0xca, 0x65, 0x37, 0xcc, 0x83, 0x0e, 0xda, 0x54, 0xb3, 0xd2, 0xe6, 0xe7, 0x7f,
-        0xe1, 0x90, 0x11, 0x25, 0x16, 0x83, 0x25, 0x43, 0xb4, 0x38, 0x06, 0xbb, 0x6c, 0x62, 0x7d, 0x84, 0x1f, 0xf3, 0x7b, 0xeb, 0xae, 0x50, 0xd8, 0xfb, 0xb9, 0xf2, 0xf9, 0xc3, 0x6f, 0x59, 0xb7, 0xb0 },
-      { 0x95, 0x15, 0x83, 0x19, 0x56, 0x9c, 0x11, 0xd8, 0x31, 0x87, 0x1d, 0xe3, 0x3f, 0x07, 0x89, 0xb2, 0xcb, 0x81, 0xf0, 0xeb, 0x0b, 0x1e, 0x74, 0x08, 0xa2, 0x4a, 0x0e, 0x82, 0xc6, 0x45, 0x8c, 0x32,
-        0xb4, 0x8f, 0xfd, 0x76, 0xeb, 0x5e, 0xc7, 0x62, 0xdc, 0xcb, 0xee, 0xad, 0xcf, 0xcf, 0xea, 0x33, 0x9d, 0xb0, 0x02, 0x64, 0x66, 0x77, 0x14, 0x97, 0x0c, 0x6e, 0x79, 0xe8, 0x58, 0x32, 0x0f, 0xe6 },
-      { 0xcb, 0x2f, 0xaf, 0x53, 0xd8, 0x41, 0x48, 0x41, 0x6f, 0x36, 0x78, 0x80, 0x83, 0x5c, 0x0d, 0x4c, 0x1b, 0xf4, 0x39, 0xe0, 0x34, 0x4f, 0xc2, 0xb2, 0x4e, 0xf0, 0xac, 0xc2, 0xf8, 0x15, 0x7a, 0x81,
-        0x9f, 0x46, 0x2b, 0xe3, 0xb9, 0x39, 0x05, 0x89, 0xa2, 0xda, 0x1a, 0x63, 0x51, 0xb4, 0x78, 0x0f, 0xfe, 0x2f, 0x9d, 0xce, 0x99, 0x38, 0xa9, 0x7e, 0xcb, 0x80, 0x57, 0x9f, 0xa2, 0x28, 0x0f, 0x6a },
-      { 0x1b, 0xec, 0x67, 0x50, 0xd1, 0x28, 0x65, 0x55, 0xb8, 0xde, 0x3b, 0x2e, 0x1e, 0x33, 0xd8, 0x1b, 0xba, 0x2e, 0x78, 0x6a, 0xb8, 0x0b, 0x8c, 0xa0, 0x55, 0x34, 0x25, 0x90, 0x9a, 0xe2, 0xf5, 0xaa,
-        0x95, 0x0c, 0x6f, 0x2a, 0xb0, 0x92, 0x1d, 0x48, 0x5b, 0x56, 0x8c, 0x82, 0x8f, 0xa7, 0x15, 0x75, 0x26, 0x61, 0x85, 0xc8, 0x7d, 0xda, 0xf5, 0x2a, 0xf3, 0x3c, 0x34, 0xc1, 0x20, 0x67, 0xbb, 0x04,
-        0xec, 0x7c, 0xe2, 0xcb, 0x31, 0xcf, 0x23, 0xda, 0x5d, 0x8a, 0x05, 0x00, 0x9b, 0x23, 0x34, 0xd0, 0xed, 0x56, 0x10, 0x0a, 0x90, 0x6b, 0x73, 0x26, 0x6b, 0xf0, 0xd7, 0xbc, 0xd8, 0xc7, 0x89, 0xc8 },
-      { 0x90, 0x43, 0x54, 0x87, 0x44, 0x00, 0x07, 0xca, 0xa8, 0x2b, 0xec, 0x55, 0xa0, 0xd2, 0x8c, 0x07, 0x03, 0xaa, 0x61, 0x1a, 0x7d, 0x0f, 0x90, 0x13, 0x67, 0x99, 0x46, 0x20, 0xcd, 0x70, 0xcb, 0xa7,
-        0x96, 0xdf, 0x0c, 0x13, 0xc4, 0x41, 0x11, 0xd6, 0xc3, 0x33, 0x02, 0x96, 0x4f, 0x1d, 0xbd, 0x06, 0xa9, 0xa1, 0x31, 0x0a, 0xc3, 0xdf, 0x6d, 0x52, 0x6c, 0xc6, 0xbe, 0xc5, 0xb6, 0x2a, 0xb1, 0x0f,
-        0xec, 0x7c, 0xe2, 0xcb, 0x31, 0xcf, 0x23, 0xda, 0x5d, 0x8a, 0x05, 0x00, 0x9b, 0x23, 0x34, 0xd0, 0xed, 0x56, 0x10, 0x0a, 0x90, 0x6b, 0x73, 0x26, 0x6b, 0xf0, 0xd7, 0xbc, 0xd8, 0xc7, 0x89, 0xc8 } },
-    { { 0x4f, 0x3a, 0xdd, 0x0f, 0xcf, 0x7f, 0x27, 0xda, 0x27, 0xc4, 0xa6, 0x2b, 0x6b, 0xd1, 0x9f, 0x59, 0x73, 0x5f, 0xd4, 0xb7, 0xf0, 0x86, 0x16, 0xc9, 0xdd, 0xa6, 0xf9, 0x9b, 0x17, 0xb2, 0xb9, 0x71,
-        0xe7, 0x4c, 0xa1, 0x17, 0x79, 0xe0, 0xcc, 0xae, 0x10, 0xec, 0x28, 0x3a, 0x09, 0xf2, 0x8b, 0x34, 0x9c, 0xac, 0x16, 0x2a, 0xa9, 0x21, 0xe8, 0xa7, 0x18, 0xc0, 0xc4, 0x9f, 0x30, 0xa0, 0x25, 0x62 },
-      { 0x23, 0x4c, 0xd4, 0xae, 0x52, 0x30, 0xf6, 0x64, 0xb9, 0xe1, 0x47, 0xca, 0xf8, 0xf3, 0x3a, 0x6b, 0x8b, 0xf3, 0x29, 0xe2, 0x9b, 0x5d, 0xbb, 0x0a, 0x60, 0x52, 0x03, 0x40, 0x53, 0x5c, 0x9e, 0x35,
-        0x03, 0xd4, 0xec, 0xd7, 0x67, 0xf4, 0x92, 0xd2, 0x98, 0x96, 0xf2, 0xa7, 0xf4, 0x25, 0x6a, 0x80, 0x9c, 0x75, 0xc6, 0xf2, 0x1f, 0x67, 0x11, 0x00, 0x0d, 0xda, 0x1e, 0xb2, 0x58, 0xa7, 0x8c, 0x39 },
-      { 0x55, 0x1b, 0x80, 0xbb, 0xf3, 0xc5, 0x1a, 0x84, 0x34, 0xf5, 0x0a, 0x8a, 0x8a, 0xe1, 0x8c, 0xea, 0xa6, 0xfb, 0xd0, 0x26, 0xc9, 0xa2, 0x30, 0x37, 0x3e, 0xba, 0x98, 0xfe, 0x81, 0x8a, 0x52, 0x37,
-        0x0b, 0x74, 0x4e, 0x3d, 0x26, 0x8f, 0x82, 0x4b, 0xc0, 0x6a, 0x01, 0x10, 0x91, 0x8f, 0x89, 0xb5, 0x62, 0x3f, 0x1e, 0x70, 0xcc, 0x25, 0x77, 0x39, 0x74, 0x88, 0xdd, 0xbc, 0xbe, 0x72, 0x08, 0x63 },
-      { 0xe2, 0x9a, 0x46, 0xd2, 0x74, 0xdc, 0x0f, 0x8a, 0xa3, 0xbd, 0x20, 0xb7, 0xc7, 0xd9, 0x83, 0x4b, 0x58, 0xa6, 0xe3, 0xbd, 0xc5, 0x00, 0xb6, 0x18, 0x04, 0x25, 0x81, 0xbd, 0x99, 0xb3, 0xb1, 0x2a,
-        0x7a, 0x68, 0x6d, 0xe1, 0x3e, 0x23, 0x8d, 0x29, 0x9e, 0x7a, 0x30, 0x56, 0x4c, 0x22, 0xb6, 0xf4, 0x7d, 0x7d, 0x4f, 0xfd, 0x76, 0xa5, 0x9d, 0x05, 0x41, 0x7c, 0x7a, 0x2d, 0x7b, 0xbe, 0xcf, 0x73 },
-      { 0x7b, 0xae, 0x11, 0x86, 0x8a, 0x38, 0xbd, 0x56, 0x3c, 0xf3, 0x3c, 0x9c, 0x49, 0xa4, 0x68, 0x0f, 0x2b, 0xdf, 0xf2, 0xa1, 0xbc, 0xc2, 0xed, 0x08, 0x09, 0x96, 0xd0, 0x7e, 0x9b, 0xe3, 0x0a, 0x72,
-        0x13, 0x03, 0xd4, 0x35, 0x0a, 0x94, 0x60, 0x09, 0x4a, 0xaa, 0xca, 0x35, 0x8e, 0xed, 0x12, 0xdd, 0x26, 0x8f, 0xf8, 0xa9, 0xa2, 0x8a, 0x7f, 0xac, 0xf3, 0x09, 0xc7, 0x22, 0xc5, 0x73, 0xec, 0xa0 },
-      { 0xe9, 0xc5, 0x57, 0x0d, 0x85, 0xbf, 0x10, 0xe2, 0xd1, 0xf5, 0xd7, 0x22, 0xe9, 0x6a, 0x67, 0x8d, 0xd3, 0x9f, 0x1a, 0xef, 0x7f, 0xc0, 0x2b, 0xe1, 0xfd, 0x2c, 0xc2, 0x5f, 0x39, 0xf9, 0x34, 0xd0,
-        0x87, 0x94, 0x41, 0x8a, 0x65, 0xa5, 0x20, 0x48, 0xa4, 0x20, 0x5f, 0x7a, 0xc7, 0x37, 0x00, 0x60, 0x59, 0x84, 0x2a, 0x1d, 0xff, 0x02, 0xc3, 0xe8, 0x20, 0xaa, 0x39, 0x13, 0xac, 0xf3, 0xd7, 0x05,
-        0xbd, 0xef, 0x11, 0x66, 0x71, 0xb8, 0x9f, 0x1e, 0xe5, 0xee, 0x2e, 0x37, 0xfb, 0x34, 0xed, 0xc5, 0xa4, 0x40, 0x6e, 0x38, 0x31, 0x0a, 0x1c, 0xaf, 0x0d, 0xd3, 0x98, 0xac, 0x12, 0x40, 0xea, 0x9c },
-      { 0xc6, 0xcd, 0x7a, 0xbd, 0x14, 0xdb, 0xe4, 0xed, 0xbf, 0x46, 0x70, 0x23, 0xbd, 0xdb, 0xc3, 0xce, 0x60, 0xd5, 0x6b, 0x17, 0x4c, 0x23, 0xfa, 0x78, 0x05, 0xcc, 0x18, 0xed, 0x42, 0x03, 0xa5, 0xb7,
-        0xdf, 0x28, 0x0e, 0xd4, 0x5d, 0x31, 0xd8, 0xb9, 0xdc, 0xe9, 0xf6, 0x26, 0xc5, 0xe1, 0xb3, 0x80, 0x0d, 0x62, 0xaf, 0x2d, 0xbd, 0xd6, 0xe4, 0xbb, 0x16, 0x82, 0xc8, 0x13, 0x2a, 0x6f, 0xb9, 0x06,
-        0xbd, 0xef, 0x11, 0x66, 0x71, 0xb8, 0x9f, 0x1e, 0xe5, 0xee, 0x2e, 0x37, 0xfb, 0x34, 0xed, 0xc5, 0xa4, 0x40, 0x6e, 0x38, 0x31, 0x0a, 0x1c, 0xaf, 0x0d, 0xd3, 0x98, 0xac, 0x12, 0x40, 0xea, 0x9c } },
-    { { 0x6f, 0x46, 0xcd, 0x96, 0xc4, 0x13, 0xf4, 0x11, 0x62, 0x49, 0x8c, 0x5c, 0x78, 0x27, 0xef, 0xc8, 0xb9, 0xe2, 0x7d, 0xf1, 0x0d, 0x37, 0xf2, 0xfe, 0x85, 0x35, 0x82, 0x60, 0x23, 0xb6, 0x7b, 0x17,
-        0xd2, 0x91, 0xef, 0x01, 0x9e, 0x99, 0x35, 0xab, 0xc7, 0xfb, 0xa1, 0xa3, 0x13, 0x44, 0x3f, 0x3c, 0x16, 0xcb, 0xd8, 0xf0, 0xbf, 0x9e, 0x65, 0x4d, 0x07, 0xe0, 0xfd, 0x8e, 0x32, 0x61, 0x95, 0xd5 },
-      { 0xb7, 0x81, 0x16, 0x2f, 0xcb, 0xa4, 0x30, 0x4e, 0x6d, 0xf5, 0xf0, 0x3f, 0xfe, 0xd9, 0x81, 0x20, 0xa6, 0x0e, 0x2b, 0xa8, 0xc5, 0xed, 0x0d, 0x9a, 0x28, 0x9c, 0xe3, 0xa9, 0xb7, 0xbf, 0x87, 0x0f,
-        0xa5, 0xf9, 0x33, 0xe7, 0xa6, 0x7f, 0x9b, 0xac, 0xb6, 0xcc, 0xaf, 0xfc, 0xa7, 0x4a, 0x4d, 0x36, 0x39, 0xa9, 0xb6, 0xf5, 0x09, 0xde, 0x8d, 0x37, 0x11, 0x07, 0xd1, 0x8a, 0xf5, 0x7b, 0x66, 0xe1 },
-      { 0xcc, 0xe0, 0x07, 0x62, 0xbe, 0x10, 0x8c, 0x3a, 0xa2, 0x96, 0x5d, 0x11, 0xc7, 0xd5, 0x50, 0xc3, 0xbb, 0x55, 0x21, 0xc5, 0x40, 0x27, 0x7d, 0xdb, 0xad, 0xd2, 0x61, 0x2a, 0x42, 0x5f, 0x94, 0x23,
-        0x77, 0x83, 0x3a, 0x99, 0xe8, 0xda, 0x79, 0x8c, 0x1e, 0xa8, 0x44, 0x04, 0xec, 0xf5, 0xd1, 0x55, 0x1e, 0x58, 0xf1, 0x6e, 0x4d, 0x27, 0xa4, 0x91, 0xec, 0x59, 0xc8, 0x17, 0x36, 0x58, 0x2a, 0x1f },
-      { 0x6d, 0xf8, 0x73, 0xa3, 0x38, 0x61, 0x1d, 0x95, 0x09, 0xde, 0xe5, 0x26, 0x1b, 0x15, 0x16, 0xfb, 0xf5, 0x16, 0xa8, 0xf3, 0x9e, 0x3a, 0x6b, 0xb5, 0x8c, 0xee, 0xa8, 0x66, 0x79, 0xc3, 0x9e, 0xb4,
-        0xe1, 0xc2, 0x85, 0x0e, 0x86, 0x10, 0x5a, 0x4e, 0x8b, 0x4c, 0x0a, 0x7a, 0xd8, 0x8a, 0x48, 0xf4, 0xa0, 0x79, 0x37, 0xe3, 0xa5, 0x90, 0x05, 0x5e, 0xbd, 0xa1, 0xf6, 0x09, 0x58, 0x9c, 0x6f, 0x09 },
-      { 0x66, 0x47, 0x6d, 0x60, 0x06, 0x2d, 0x90, 0x8f, 0xae, 0x6c, 0x01, 0xe9, 0xb0, 0xf9, 0x6b, 0xa5, 0x4a, 0xe1, 0xdb, 0xd3, 0x64, 0x42, 0x37, 0x5c, 0x11, 0x40, 0x7a, 0xce, 0x4e, 0x83, 0xc3, 0x2c,
-        0x2e, 0xd2, 0x67, 0x76, 0xfb, 0x8c, 0x5d, 0xab, 0xe8, 0xb8, 0xd6, 0x2b, 0xf8, 0x86, 0xff, 0x96, 0xf3, 0xa8, 0x0e, 0x2b, 0x1a, 0x68, 0xf5, 0xe4, 0xee, 0x49, 0xa6, 0x8c, 0x41, 0x1f, 0x97, 0xbf },
-      { 0x81, 0x92, 0x4e, 0xc6, 0xab, 0x00, 0xdd, 0xf9, 0xf9, 0xb7, 0xe0, 0x0a, 0xa9, 0x3f, 0x0a, 0xf9, 0x32, 0x73, 0xf6, 0x22, 0xec, 0x95, 0xd9, 0x20, 0x8a, 0x3f, 0xeb, 0x0d, 0xc7, 0x79, 0x6f, 0xb3,
-        0x85, 0xf4, 0xe1, 0x11, 0xe1, 0xcc, 0xaa, 0x1b, 0xfd, 0xf3, 0x43, 0xff, 0x66, 0x73, 0x0f, 0x09, 0xcc, 0xa4, 0x6c, 0xb8, 0x2a, 0x0f, 0x53, 0x58, 0x63, 0x32, 0x06, 0xd9, 0x6b, 0x1a, 0x14, 0x04,
-        0x85, 0x3f, 0x2f, 0x2b, 0x05, 0xfb, 0xed, 0xe9, 0x08, 0x0d, 0x21, 0x49, 0xc9, 0x79, 0xdf, 0x6f, 0x77, 0x89, 0xd7, 0x74, 0x09, 0x57, 0x1a, 0xd2, 0xa7, 0x43, 0xbf, 0x08, 0x8e, 0x98, 0xbc, 0x2f },
-      { 0xe3, 0xb1, 0xc4, 0x81, 0xe6, 0xec, 0x07, 0x58, 0xa4, 0xcb, 0x7e, 0xd5, 0xae, 0x9d, 0x43, 0xf1, 0xb7, 0xe2, 0x0a, 0x1f, 0xd5, 0xe8, 0x14, 0xba, 0x22, 0xff, 0xb7, 0x20, 0x76, 0x08, 0xdc, 0x9a,
-        0x44, 0x4c, 0x1c, 0xcd, 0x38, 0x4d, 0xb5, 0xd8, 0xa9, 0x1b, 0x9d, 0xbb, 0x13, 0x5a, 0x6c, 0xe9, 0x5d, 0xa4, 0x42, 0x0e, 0xde, 0x9a, 0x47, 0x8a, 0x2a, 0x97, 0x42, 0x86, 0x87, 0x98, 0x3f, 0x04,
-        0x85, 0x3f, 0x2f, 0x2b, 0x05, 0xfb, 0xed, 0xe9, 0x08, 0x0d, 0x21, 0x49, 0xc9, 0x79, 0xdf, 0x6f, 0x77, 0x89, 0xd7, 0x74, 0x09, 0x57, 0x1a, 0xd2, 0xa7, 0x43, 0xbf, 0x08, 0x8e, 0x98, 0xbc, 0x2f } },
-    { { 0xff, 0xe3, 0x69, 0x7b, 0x62, 0x45, 0x40, 0x5f, 0x1c, 0x49, 0x65, 0xd6, 0xae, 0x24, 0x16, 0x84, 0xfa, 0x69, 0x6c, 0x1f, 0x6c, 0x65, 0xee, 0x52, 0xe9, 0x6c, 0x54, 0xc7, 0x31, 0x9b, 0xc2, 0x74,
-        0x4f, 0xc0, 0x16, 0xb8, 0xf8, 0x75, 0x5f, 0x45, 0xb5, 0xf3, 0xa0, 0xd9, 0xbe, 0x25, 0x82, 0xbd, 0x3c, 0x03, 0xe0, 0x14, 0x15, 0x6a, 0xd5, 0x64, 0x08, 0x65, 0x13, 0x33, 0xc2, 0xab, 0xe0, 0x45 },
-      { 0x6f, 0x5a, 0x90, 0x80, 0x25, 0x13, 0xc2, 0xa7, 0xfe, 0x1c, 0xa1, 0x07, 0x81, 0x4b, 0x09, 0xd3, 0xbd, 0xda, 0x55, 0xa8, 0xaa, 0x62, 0x19, 0x03, 0xe9, 0x9f, 0x77, 0xef, 0xff, 0xd4, 0x5e, 0x53,
-        0xbc, 0x9d, 0x71, 0xb8, 0xc4, 0xc2, 0x85, 0xb9, 0xb4, 0x3d, 0x95, 0xb8, 0xfd, 0x44, 0xb7, 0xc8, 0x6f, 0x93, 0x15, 0x04, 0x16, 0x7e, 0x01, 0xf2, 0x09, 0x23, 0x96, 0x69, 0xe5, 0x65, 0x52, 0x34 },
-      { 0xaf, 0xfe, 0x4f, 0x34, 0x4e, 0xfe, 0x51, 0xa5, 0xb2, 0xd8, 0x31, 0x74, 0x7b, 0xae, 0xfb, 0xb9, 0x33, 0xc1, 0xdc, 0x66, 0xe6, 0x95, 0x9e, 0xce, 0x77, 0x7d, 0x55, 0x3c, 0xa6, 0x6c, 0x09, 0x23,
-        0x5a, 0x1a, 0x5e, 0x1a, 0x41, 0xd3, 0xad, 0x5f, 0x86, 0xd0, 0x14, 0xf5, 0xe0, 0xda, 0xf1, 0xce, 0x19, 0x90, 0x45, 0x0c, 0x4c, 0xb1, 0xd3, 0xc8, 0x4c, 0xdb, 0x7e, 0x49, 0xf5, 0xac, 0xde, 0xff },
-      { 0x1b, 0x9b, 0x6b, 0x30, 0xd3, 0x19, 0x37, 0x83, 0xad, 0x05, 0xca, 0xba, 0x22, 0x85, 0x33, 0x7f, 0x55, 0x60, 0xe3, 0x14, 0x8c, 0x39, 0x87, 0xd1, 0x4c, 0x21, 0x27, 0xa0, 0xae, 0x4a, 0x56, 0x15,
-        0x50, 0x6c, 0x99, 0xca, 0xff, 0xde, 0x10, 0xc6, 0x9f, 0x6c, 0x70, 0xd1, 0x66, 0xb4, 0x87, 0xd8, 0xfc, 0x46, 0xf2, 0xcf, 0x0c, 0xd8, 0xc3, 0x14, 0x5d, 0x27, 0xbd, 0xed, 0x32, 0x36, 0x7c, 0xed },
-      { 0x64, 0x6b, 0x74, 0xc7, 0x60, 0x36, 0xc5, 0xe4, 0xb6, 0xde, 0x02, 0x1a, 0x09, 0xaf, 0x65, 0xb1, 0x94, 0xa3, 0xf4, 0x95, 0xf5, 0xb0, 0xef, 0x86, 0xb5, 0x13, 0x26, 0x0b, 0xe8, 0xc5, 0x5c, 0x77,
-        0xf5, 0xe6, 0xb6, 0x10, 0x36, 0x87, 0xa3, 0xd2, 0x7c, 0x17, 0x2c, 0xb9, 0xb0, 0x90, 0x9e, 0x8c, 0x0a, 0x7d, 0x73, 0xb2, 0x29, 0xeb, 0xa7, 0x85, 0xd7, 0x04, 0x14, 0xf9, 0x77, 0xb7, 0xf4, 0x89 },
-      { 0x7f, 0x1c, 0x5a, 0x57, 0x14, 0xf6, 0x30, 0x07, 0xf9, 0xfe, 0x42, 0x98, 0xcb, 0x3d, 0xac, 0x04, 0x30, 0x0d, 0xc6, 0xd0, 0x4f, 0x8a, 0xbc, 0xdd, 0x3e, 0xc3, 0xb7, 0x74, 0xc8, 0x3b, 0x1a, 0xcc,
-        0x6a, 0x54, 0x9e, 0xb9, 0xbe, 0xf0, 0x7c, 0x35, 0x35, 0x1a, 0x50, 0x4c, 0xc2, 0x38, 0x41, 0x46, 0xc8, 0xc4, 0x81, 0x2b, 0x26, 0x56, 0x6f, 0x8a, 0x9f, 0x74, 0x87, 0xe0, 0x01, 0x82, 0xe2, 0x09,
-        0xf3, 0x9a, 0xc5, 0x33, 0x5a, 0x7d, 0xb6, 0xbb, 0xff, 0x20, 0x4d, 0xc1, 0x99, 0x3d, 0xcc, 0x5a, 0xc7, 0xd1, 0xbe, 0x4c, 0xcf, 0xc8, 0x09, 0x79, 0x15, 0x5e, 0x0c, 0xc6, 0x26, 0x36, 0xe6, 0xd9 },
-      { 0x4d, 0x2f, 0x08, 0x84, 0x32, 0xcf, 0xe0, 0x3b, 0xa8, 0x3e, 0xa5, 0xf8, 0x3a, 0xe8, 0xa9, 0x04, 0x5a, 0x74, 0x67, 0xcb, 0x41, 0x22, 0xc5, 0xc4, 0x9a, 0xa5, 0xc1, 0xa7, 0x94, 0x8b, 0xa5, 0x35,
-        0x00, 0x00, 0x1a, 0xaf, 0xfb, 0xed, 0x40, 0xb8, 0x2b, 0x28, 0xf1, 0xb1, 0x02, 0xd3, 0x8b, 0xc0, 0x32, 0x4a, 0xa5, 0x0a, 0xa4, 0xc3, 0xbf, 0xb3, 0xf5, 0xb7, 0x65, 0x8e, 0x88, 0xdf, 0xd0, 0x0e,
-        0xf3, 0x9a, 0xc5, 0x33, 0x5a, 0x7d, 0xb6, 0xbb, 0xff, 0x20, 0x4d, 0xc1, 0x99, 0x3d, 0xcc, 0x5a, 0xc7, 0xd1, 0xbe, 0x4c, 0xcf, 0xc8, 0x09, 0x79, 0x15, 0x5e, 0x0c, 0xc6, 0x26, 0x36, 0xe6, 0xd9 } },
-    { { 0xc8, 0x8e, 0x1c, 0xea, 0x02, 0x6a, 0xfd, 0x88, 0x8b, 0xa9, 0x9d, 0xdd, 0xba, 0xea, 0x77, 0x30, 0x88, 0x1a, 0x93, 0x49, 0xda, 0x05, 0x18, 0xbb, 0x4a, 0x6a, 0x11, 0xc4, 0x48, 0x72, 0x77, 0x1f,
-        0x6e, 0x2b, 0x9a, 0xe3, 0x27, 0xbe, 0xe1, 0x75, 0x32, 0x30, 0xa6, 0x12, 0x26, 0x44, 0xbf, 0xb2, 0xa5, 0x51, 0x0b, 0x48, 0x3a, 0xea, 0xc5, 0xd4, 0x24, 0x3f, 0x4e, 0xe8, 0xe5, 0xc3, 0xfb, 0xc2 },
-      { 0xcb, 0x56, 0x3c, 0x00, 0x28, 0x15, 0x72, 0x16, 0x23, 0x4e, 0x2e, 0x2c, 0x8c, 0xe8, 0x7c, 0x44, 0x82, 0x2a, 0xe0, 0x57, 0xa3, 0x0a, 0xc4, 0x42, 0xb5, 0x07, 0xe1, 0x1b, 0x78, 0x8b, 0x3d, 0x4d,
-        0xcb, 0xe4, 0x56, 0x72, 0x0b, 0x85, 0x52, 0xd8, 0x55, 0xe2, 0xcd, 0x38, 0xd2, 0x83, 0xb6, 0x05, 0xd2, 0x9f, 0x63, 0x9e, 0x7f, 0xca, 0xe5, 0x95, 0x36, 0x61, 0x9b, 0xca, 0x09, 0x27, 0x53, 0x82 },
-      { 0x24, 0x67, 0x10, 0xd6, 0x8a, 0x1a, 0x8e, 0xb8, 0x53, 0xef, 0xb7, 0x67, 0x2a, 0xfd, 0xb8, 0xd6, 0xe3, 0xf7, 0x41, 0x95, 0x8c, 0x50, 0xca, 0x1d, 0x21, 0x21, 0x41, 0xd1, 0xef, 0x2d, 0x9b, 0x53,
-        0xa9, 0x42, 0xcd, 0xda, 0x6d, 0x12, 0x1b, 0xbd, 0x0a, 0xe1, 0x4d, 0x95, 0xc6, 0xaa, 0x40, 0xfd, 0x98, 0xfb, 0x26, 0x21, 0x5e, 0xaf, 0x8e, 0x6b, 0xc9, 0x36, 0x2c, 0x66, 0x31, 0x24, 0x45, 0x87 },
-      { 0x5e, 0xf9, 0x1d, 0x10, 0xb5, 0x79, 0x1f, 0x80, 0x85, 0x90, 0xc3, 0x7f, 0x2b, 0x73, 0xbf, 0x83, 0x0b, 0x5d, 0x46, 0xae, 0x79, 0xef, 0x09, 0x71, 0x29, 0xfb, 0x83, 0xde, 0x1f, 0xe2, 0xdb, 0x1b,
-        0xa2, 0x22, 0xee, 0x50, 0x21, 0x9d, 0x9c, 0x35, 0x14, 0x48, 0x13, 0xa5, 0xd1, 0x68, 0xf4, 0x61, 0x1f, 0xd7, 0xe2, 0xd6, 0x42, 0x1c, 0xdc, 0x58, 0xec, 0x8b, 0x03, 0x6b, 0xdf, 0x64, 0x06, 0x30 },
-      { 0xf9, 0xa6, 0x88, 0x74, 0x07, 0x19, 0x15, 0x38, 0xaf, 0xac, 0x07, 0x10, 0xe0, 0xd9, 0x22, 0xf3, 0x78, 0xb0, 0xbf, 0x60, 0xa3, 0x0f, 0xea, 0x0f, 0xa8, 0x64, 0xa9, 0xa3, 0x82, 0xe1, 0x4c, 0x29,
-        0x36, 0x22, 0x6d, 0x43, 0x9c, 0xde, 0x22, 0xbf, 0xc6, 0x85, 0xf7, 0xe9, 0xe0, 0x79, 0x80, 0xfe, 0x9d, 0xd6, 0x24, 0xbd, 0x29, 0xa4, 0x8c, 0x35, 0x21, 0x87, 0x45, 0x7f, 0x88, 0xd9, 0x9a, 0x9d },
-      { 0x49, 0x43, 0x19, 0x14, 0xcc, 0x4a, 0x11, 0x01, 0x05, 0xd1, 0x4e, 0x39, 0x6d, 0xb0, 0x22, 0x65, 0x32, 0x6e, 0x67, 0x04, 0x50, 0x85, 0x53, 0x42, 0x90, 0x2c, 0xc0, 0x63, 0x2f, 0xbd, 0x15, 0x90,
-        0x1b, 0x3f, 0x03, 0x90, 0x16, 0x7f, 0x7b, 0x49, 0x74, 0xd0, 0x3d, 0x81, 0x80, 0x1e, 0x9e, 0x2e, 0xa9, 0x13, 0x6a, 0x10, 0x14, 0xc1, 0xfd, 0xf9, 0x25, 0x3a, 0x1d, 0x52, 0x93, 0x0a, 0x77, 0x03,
-        0xa2, 0xdd, 0xce, 0x9f, 0x2a, 0x35, 0xc9, 0x93, 0x7c, 0xa2, 0x2c, 0xf6, 0x38, 0x73, 0xb3, 0xab, 0x7f, 0x55, 0xb6, 0x62, 0xa2, 0x8d, 0x6a, 0x3e, 0x88, 0x04, 0x9b, 0xa2, 0x19, 0x64, 0x55, 0x01 },
-      { 0x22, 0x03, 0x49, 0x58, 0x76, 0x3c, 0x85, 0x45, 0x5e, 0x73, 0x78, 0x8f, 0x65, 0xc9, 0x50, 0xf8, 0xd7, 0x16, 0x92, 0xa4, 0xd1, 0x79, 0xce, 0xf3, 0x00, 0x34, 0x38, 0xb8, 0xcc, 0x96, 0x9f, 0xa6,
-        0x87, 0x28, 0xcb, 0x19, 0x28, 0xad, 0x83, 0xb5, 0x09, 0x96, 0x54, 0xe8, 0x2a, 0xb9, 0x9b, 0xff, 0x60, 0x85, 0x31, 0x28, 0x62, 0x36, 0xd2, 0x0e, 0xad, 0x2a, 0xe1, 0x84, 0x80, 0xeb, 0x6f, 0x00,
-        0xa2, 0xdd, 0xce, 0x9f, 0x2a, 0x35, 0xc9, 0x93, 0x7c, 0xa2, 0x2c, 0xf6, 0x38, 0x73, 0xb3, 0xab, 0x7f, 0x55, 0xb6, 0x62, 0xa2, 0x8d, 0x6a, 0x3e, 0x88, 0x04, 0x9b, 0xa2, 0x19, 0x64, 0x55, 0x01 } },
-    { { 0xeb, 0x18, 0x95, 0x94, 0x5f, 0x15, 0x8c, 0xb8, 0x4d, 0x6e, 0x7d, 0xc0, 0x96, 0x6c, 0x52, 0xa2, 0x5f, 0x43, 0x67, 0xc2, 0x3a, 0x10, 0x5b, 0xf1, 0x8f, 0x21, 0x89, 0x06, 0x77, 0xe9, 0xab, 0x2e,
-        0xcd, 0x17, 0x9c, 0x9a, 0xd7, 0x89, 0x7e, 0x53, 0x58, 0x60, 0x9b, 0xce, 0x90, 0xd9, 0x13, 0x2d, 0x78, 0xc4, 0x2c, 0x1c, 0x4c, 0xe8, 0x23, 0x70, 0xff, 0xa0, 0x42, 0x98, 0x25, 0x40, 0xd6, 0xd8 },
-      { 0xb6, 0xfb, 0xdd, 0x5d, 0x35, 0xf2, 0x2b, 0x89, 0xda, 0x8e, 0x90, 0xee, 0x03, 0x4e, 0x75, 0xdb, 0x4c, 0x45, 0xc8, 0x00, 0xde, 0x06, 0x27, 0xde, 0x44, 0xb5, 0x5b, 0xc7, 0x56, 0xc3, 0xf5, 0xbb,
-        0xee, 0xa6, 0x21, 0xd4, 0xd9, 0xb9, 0x24, 0x9c, 0x4c, 0xbc, 0x23, 0xe5, 0xeb, 0x05, 0xb6, 0xd0, 0xd0, 0xbf, 0x49, 0x95, 0x01, 0xb4, 0x97, 0xad, 0xb5, 0x71, 0x8d, 0x4b, 0x32, 0xd0, 0xdd, 0x1a },
-      { 0xfd, 0x11, 0xd7, 0xe4, 0x46, 0xcd, 0xd8, 0x44, 0x89, 0x0a, 0xe7, 0x44, 0x59, 0xe9, 0xcf, 0x9f, 0xd6, 0xf1, 0x74, 0x56, 0x04, 0x78, 0xfa, 0x29, 0x46, 0x8a, 0x8d, 0x1b, 0xbe, 0x41, 0x92, 0x1c,
-        0x8d, 0x74, 0x01, 0x1b, 0xc1, 0xf8, 0x26, 0xf4, 0xc2, 0x68, 0xc3, 0x23, 0x8c, 0x68, 0x7c, 0x0a, 0xad, 0xdd, 0x50, 0x10, 0xcf, 0xdb, 0x78, 0xc5, 0x79, 0x28, 0x37, 0x63, 0x92, 0x1a, 0x1d, 0xea },
-      { 0xd2, 0x2a, 0xf0, 0x66, 0x15, 0x8b, 0xcb, 0x83, 0xcf, 0x34, 0xa1, 0x33, 0x6b, 0xd5, 0xa8, 0x98, 0x3b, 0xd7, 0x09, 0x0d, 0x70, 0xa5, 0x8a, 0xc0, 0x73, 0xcf, 0xde, 0x59, 0xd5, 0x13, 0x41, 0xd2,
-        0x43, 0x8b, 0xb4, 0xc3, 0x5b, 0x6f, 0xf1, 0xed, 0x47, 0x76, 0xe6, 0x5e, 0xb8, 0x2a, 0x7e, 0x20, 0x91, 0xa0, 0x9d, 0xc1, 0xa2, 0x0a, 0x6d, 0x97, 0x7d, 0xeb, 0xe3, 0x64, 0x5f, 0x86, 0xff, 0x3e },
-      { 0x45, 0xd8, 0xdc, 0xe4, 0x3a, 0x3a, 0x44, 0xdc, 0x7f, 0xa8, 0x92, 0x11, 0x1b, 0x4f, 0xfa, 0xcf, 0x21, 0xff, 0xfb, 0x20, 0xb0, 0x02, 0x6d, 0x0e, 0x1c, 0xde, 0xe8, 0x51, 0xd8, 0x2c, 0x72, 0x0e,
-        0xbf, 0xf6, 0x9a, 0xd3, 0xd3, 0xfe, 0xfa, 0x98, 0x4e, 0xc2, 0xf0, 0x16, 0xda, 0x39, 0x93, 0xc4, 0xe0, 0x33, 0x9a, 0x43, 0xe8, 0x7a, 0xc5, 0x0f, 0x0b, 0xa4, 0x45, 0xf0, 0x5e, 0x7a, 0xa9, 0x42 },
-      { 0xdb, 0x4e, 0x17, 0x76, 0x8b, 0x3c, 0x98, 0x7f, 0x58, 0x76, 0x97, 0xc9, 0x3f, 0x99, 0x01, 0x05, 0x42, 0x7e, 0xfd, 0x83, 0x99, 0xaa, 0x19, 0xb5, 0x72, 0x4c, 0x69, 0xed, 0x6e, 0x21, 0x79, 0x6e,
-        0x3b, 0x71, 0xe5, 0xab, 0x23, 0x84, 0xe7, 0xfe, 0x58, 0x2b, 0x0d, 0x1e, 0x75, 0x7c, 0x29, 0xb3, 0x2d, 0x66, 0xc2, 0x45, 0x88, 0xac, 0x86, 0x29, 0xe4, 0xaa, 0x9e, 0x71, 0xa1, 0x88, 0xf9, 0x06,
-        0xda, 0xa3, 0xdd, 0x7b, 0x6c, 0xd9, 0xc9, 0x73, 0xe9, 0x56, 0xd1, 0xee, 0x5b, 0xf9, 0xae, 0xc0, 0x29, 0xbe, 0x20, 0x6c, 0xc7, 0xf9, 0xc5, 0x2d, 0x6d, 0xad, 0x8f, 0x49, 0xf8, 0x17, 0xdb, 0x7a },
-      { 0xb8, 0xb7, 0xec, 0xeb, 0x3e, 0x40, 0x77, 0x6c, 0xab, 0x10, 0xfe, 0x9f, 0xd1, 0x40, 0xfe, 0xd2, 0x88, 0x8e, 0xb0, 0x55, 0xae, 0x75, 0xb1, 0xcc, 0x9d, 0x6c, 0x11, 0x28, 0x95, 0x38, 0x9f, 0xb9,
-        0x59, 0xe2, 0x29, 0xc3, 0xbc, 0x09, 0x16, 0x1f, 0x17, 0x9e, 0x15, 0x78, 0x09, 0x61, 0x07, 0x9e, 0xad, 0x67, 0x98, 0xa9, 0x24, 0xff, 0xf9, 0x4b, 0xa2, 0x76, 0x09, 0xa0, 0xd7, 0x1b, 0xed, 0x05,
-        0xda, 0xa3, 0xdd, 0x7b, 0x6c, 0xd9, 0xc9, 0x73, 0xe9, 0x56, 0xd1, 0xee, 0x5b, 0xf9, 0xae, 0xc0, 0x29, 0xbe, 0x20, 0x6c, 0xc7, 0xf9, 0xc5, 0x2d, 0x6d, 0xad, 0x8f, 0x49, 0xf8, 0x17, 0xdb, 0x7a } },
-    { { 0xc3, 0x92, 0x4d, 0x01, 0x9c, 0xea, 0x5a, 0x8d, 0xbd, 0x5c, 0x12, 0x58, 0x6d, 0x03, 0x26, 0xbf, 0xa4, 0xdd, 0xf7, 0x26, 0xa4, 0x0d, 0x22, 0xe0, 0xbd, 0xcc, 0x6f, 0x30, 0x9e, 0xf9, 0x4c, 0x1f,
-        0x03, 0x52, 0xab, 0x38, 0xe9, 0x9c, 0x08, 0x9c, 0x09, 0xe5, 0x87, 0x5c, 0x24, 0x1a, 0xe2, 0x75, 0xcb, 0x18, 0x8a, 0x63, 0x50, 0xd1, 0x23, 0x45, 0x49, 0x93, 0x40, 0x2c, 0x09, 0xd4, 0xac, 0x39 },
-      { 0xd4, 0xe7, 0xb7, 0x05, 0xfd, 0xd6, 0xf3, 0x57, 0xfb, 0xc2, 0x2f, 0x2c, 0x71, 0x80, 0xf5, 0xc3, 0xa6, 0x0a, 0x23, 0x9d, 0x1d, 0xa8, 0x68, 0x10, 0x8a, 0xfa, 0x68, 0x9d, 0x2b, 0xcf, 0x96, 0xa9,
-        0xe6, 0x0e, 0x07, 0x32, 0x23, 0x09, 0x87, 0x16, 0xc5, 0xbb, 0x76, 0x22, 0xfc, 0xb4, 0x59, 0x6d, 0x67, 0xfd, 0x29, 0x51, 0x95, 0x4c, 0xe2, 0x8c, 0x18, 0xab, 0xda, 0x84, 0xc3, 0x62, 0x80, 0x14 },
-      { 0xc9, 0xa1, 0xfe, 0xc3, 0x48, 0x0d, 0xee, 0x54, 0x44, 0xff, 0x9c, 0x46, 0x04, 0x0e, 0x74, 0xda, 0xa4, 0x6a, 0x56, 0x02, 0x5f, 0x76, 0x0e, 0xb5, 0xc1, 0xc9, 0xe9, 0xb2, 0x6e, 0x07, 0x49, 0x0c,
-        0xf7, 0x4b, 0xee, 0xd6, 0x0a, 0xad, 0x94, 0x03, 0x58, 0x2d, 0x60, 0x95, 0xf8, 0x16, 0x7b, 0x49, 0x0b, 0x01, 0x66, 0x3e, 0x17, 0x01, 0xe5, 0x54, 0x7d, 0xd7, 0xbb, 0x10, 0xd1, 0xad, 0xad, 0x79 },
-      { 0xb2, 0xd8, 0x10, 0x29, 0xeb, 0xb8, 0x4e, 0x2b, 0x39, 0x85, 0x5c, 0xb3, 0xdc, 0xf5, 0x87, 0xca, 0xca, 0x9c, 0x7a, 0x8c, 0x2b, 0x08, 0xe8, 0x25, 0xe2, 0xcf, 0x70, 0xe2, 0xe6, 0xfb, 0xdb, 0x0c,
-        0xc3, 0x0d, 0x71, 0x11, 0x83, 0x65, 0xf2, 0x71, 0x08, 0x1b, 0x32, 0x6e, 0x6c, 0x51, 0x50, 0xf1, 0xf6, 0x4b, 0x54, 0x63, 0x16, 0x7f, 0xfd, 0x80, 0x05, 0x61, 0x63, 0xf1, 0x80, 0x6a, 0x0b, 0xfd },
-      { 0xa7, 0x4b, 0x75, 0x38, 0x90, 0x64, 0x96, 0x7b, 0xda, 0x5e, 0x08, 0x9b, 0x80, 0xc4, 0x72, 0x3f, 0x73, 0xb2, 0xdb, 0xd3, 0x4a, 0xed, 0xa4, 0xdc, 0x5c, 0x79, 0xe5, 0x0f, 0x7a, 0xd3, 0x0c, 0xac,
-        0xf9, 0x99, 0x5c, 0x1a, 0x0f, 0xb3, 0x1a, 0x0f, 0x5c, 0xc3, 0x9e, 0x1a, 0x2b, 0xfa, 0xc3, 0xf0, 0x40, 0xe5, 0x5f, 0x36, 0xd2, 0x98, 0x31, 0xa1, 0xaf, 0x18, 0x5f, 0xae, 0x92, 0xf3, 0x9e, 0xc0 },
-      { 0xf9, 0xbf, 0x52, 0xe6, 0xd3, 0xe1, 0x5d, 0xd3, 0x30, 0xf3, 0xa1, 0x0c, 0xc8, 0x5a, 0x97, 0x55, 0xab, 0x67, 0x67, 0xd0, 0x00, 0x62, 0x7b, 0x80, 0x70, 0xbf, 0x24, 0xd0, 0x09, 0x8b, 0x07, 0x77,
-        0xeb, 0x3e, 0xf0, 0x5d, 0xdf, 0x7b, 0xa9, 0x7d, 0xa4, 0x6a, 0x0d, 0xf1, 0xac, 0x83, 0x7d, 0x64, 0xb5, 0xf4, 0xc6, 0xc4, 0x12, 0x0c, 0x55, 0x9f, 0x67, 0xbb, 0xd5, 0xe3, 0xd3, 0xdb, 0x17, 0x0f,
-        0x90, 0x2f, 0x8f, 0xc9, 0xfd, 0x4e, 0x6c, 0x8b, 0xe6, 0x99, 0xfa, 0xda, 0x8f, 0x1f, 0xe6, 0xc3, 0xeb, 0xd8, 0x14, 0x20, 0xcc, 0x3c, 0x1c, 0x23, 0x77, 0x28, 0x9b, 0x22, 0x9a, 0x5a, 0x0c, 0x43 },
-      { 0xa2, 0x78, 0x37, 0xc9, 0x63, 0xe1, 0x31, 0x36, 0xc2, 0x58, 0xac, 0xca, 0xbb, 0xa2, 0x84, 0xaa, 0xb3, 0x82, 0xe2, 0x19, 0xb7, 0x14, 0x96, 0x27, 0x77, 0xfa, 0xa1, 0x02, 0xaa, 0xff, 0x55, 0x82,
-        0xba, 0xc0, 0x38, 0x1a, 0x69, 0x35, 0x48, 0x87, 0xc2, 0xeb, 0x48, 0x08, 0xea, 0xc5, 0x6b, 0xfc, 0x84, 0x60, 0x4e, 0xce, 0xd7, 0xd2, 0x86, 0x8b, 0x76, 0xf3, 0x46, 0xe1, 0x87, 0x1f, 0xff, 0x09,
-        0x90, 0x2f, 0x8f, 0xc9, 0xfd, 0x4e, 0x6c, 0x8b, 0xe6, 0x99, 0xfa, 0xda, 0x8f, 0x1f, 0xe6, 0xc3, 0xeb, 0xd8, 0x14, 0x20, 0xcc, 0x3c, 0x1c, 0x23, 0x77, 0x28, 0x9b, 0x22, 0x9a, 0x5a, 0x0c, 0x43 } },
-    { { 0x0e, 0xa6, 0x0c, 0xef, 0x12, 0xd6, 0x7d, 0x71, 0xd4, 0x88, 0x73, 0x86, 0x9a, 0x88, 0x8f, 0x5b, 0xd1, 0xb6, 0x12, 0xc4, 0x93, 0x8b, 0x5f, 0xee, 0xdd, 0x9c, 0x2a, 0x7f, 0x4d, 0xfd, 0xba, 0x00,
-        0x09, 0x45, 0x77, 0xd2, 0xcf, 0xcd, 0x3a, 0x6f, 0x27, 0x44, 0xe2, 0x55, 0x3e, 0x79, 0x88, 0x4d, 0x5f, 0x38, 0x34, 0xe8, 0xe7, 0xc6, 0x3a, 0xde, 0xef, 0x99, 0x15, 0xea, 0x88, 0x79, 0xd7, 0xca },
-      { 0xa0, 0x9a, 0x0a, 0x3a, 0x42, 0x35, 0x54, 0x78, 0xb9, 0x82, 0x52, 0xb4, 0xc8, 0x5c, 0x4a, 0x03, 0xa1, 0xb9, 0x27, 0xcc, 0x99, 0xec, 0x03, 0xdf, 0xdd, 0x6e, 0xde, 0xef, 0x8f, 0x7f, 0xdc, 0x5a,
-        0xc3, 0xcb, 0x0e, 0xa2, 0x7e, 0x93, 0xe6, 0xdd, 0xbd, 0xf1, 0x1b, 0x03, 0x29, 0x63, 0x72, 0x11, 0x72, 0x3d, 0x24, 0x6f, 0xdf, 0x8e, 0xed, 0xa4, 0xe2, 0x2a, 0x4c, 0x00, 0xe2, 0xc4, 0x55, 0x1b },
-      { 0xb2, 0xf1, 0xff, 0xf6, 0x3a, 0x26, 0xe1, 0x74, 0x52, 0xba, 0xee, 0x28, 0xb6, 0x56, 0x90, 0x59, 0xde, 0x92, 0x5f, 0x84, 0xd1, 0x87, 0xe2, 0x64, 0xce, 0xdc, 0x94, 0x3c, 0xb4, 0xf8, 0x01, 0x0a,
-        0x86, 0x2f, 0xfe, 0x79, 0x03, 0x72, 0xfc, 0x26, 0x21, 0xc3, 0x1e, 0xec, 0x63, 0x29, 0x64, 0xcb, 0x5f, 0xcc, 0xb6, 0x78, 0xf7, 0xc8, 0xd1, 0xf8, 0x5c, 0xc4, 0x4b, 0xc0, 0xc3, 0x75, 0x3e, 0x46 },
-      { 0x03, 0x4b, 0xb9, 0xd1, 0x50, 0xa3, 0x79, 0xbe, 0x74, 0xa3, 0xb5, 0xd8, 0x28, 0x1b, 0x6d, 0x72, 0x68, 0x0a, 0x9b, 0x19, 0xc9, 0x13, 0xc4, 0x04, 0x94, 0x0a, 0xcb, 0x72, 0xff, 0x7d, 0xb6, 0x9a,
-        0x1c, 0xfd, 0xe4, 0xa3, 0x75, 0x13, 0x57, 0x36, 0xfe, 0x4a, 0xf6, 0xbc, 0xca, 0xd9, 0x34, 0x9b, 0xef, 0x90, 0x02, 0xd9, 0xbd, 0xdd, 0x6f, 0x22, 0x54, 0x36, 0xb2, 0x3f, 0x22, 0x65, 0xef, 0xe7 },
-      { 0x04, 0xd4, 0x43, 0xe8, 0x8c, 0xc4, 0xfb, 0xe5, 0x55, 0xd0, 0xa4, 0xea, 0x20, 0xf8, 0xe1, 0x8f, 0xc2, 0xbc, 0x1f, 0x55, 0xf1, 0x8d, 0xda, 0xc0, 0x85, 0xa4, 0xef, 0x36, 0x97, 0x22, 0x8b, 0x8e,
-        0x77, 0x4c, 0x1a, 0xa4, 0xa0, 0x6f, 0xe1, 0xdc, 0x32, 0x47, 0xc4, 0x3a, 0xd8, 0x8a, 0xbd, 0x19, 0x30, 0x1c, 0x96, 0x7a, 0xb2, 0x23, 0x7c, 0x16, 0x03, 0xa7, 0x4f, 0xfd, 0xa6, 0x50, 0xd9, 0xf7 },
-      { 0xdf, 0xc2, 0x59, 0xd2, 0xa9, 0x9b, 0x1e, 0xca, 0xf0, 0x39, 0x2f, 0xf8, 0xc2, 0xf3, 0x91, 0x55, 0x1b, 0xba, 0x81, 0x3a, 0x67, 0x1a, 0xd4, 0xf4, 0xb0, 0x9f, 0xb6, 0x18, 0x38, 0x65, 0x3e, 0x67,
-        0xa0, 0x37, 0xc2, 0x9a, 0xc7, 0xee, 0x72, 0x8e, 0x13, 0x64, 0xd1, 0x0a, 0xda, 0xbd, 0x8d, 0xa4, 0x28, 0x55, 0x3a, 0x2c, 0x78, 0x41, 0xc6, 0xfc, 0x1c, 0x0f, 0xf8, 0xd7, 0x5f, 0xe6, 0xde, 0x0b,
-        0xd5, 0xc0, 0xaa, 0x2c, 0x5c, 0xac, 0x46, 0xeb, 0xa4, 0x35, 0x2a, 0xab, 0x00, 0x2e, 0xc0, 0x8b, 0x42, 0x65, 0x2f, 0x2f, 0x13, 0x84, 0x60, 0x15, 0xa3, 0x69, 0xee, 0xab, 0x0e, 0x50, 0xbf, 0x5f },
-      { 0xc1, 0xb0, 0xac, 0x4c, 0xfa, 0x62, 0x52, 0x22, 0xae, 0x8c, 0x94, 0x38, 0xd9, 0x6e, 0x10, 0x94, 0xe7, 0xaa, 0xc0, 0x92, 0x93, 0x06, 0x55, 0xf9, 0x2e, 0xd9, 0x10, 0x4d, 0xcb, 0x82, 0x19, 0x1f,
-        0x27, 0x16, 0x81, 0xdd, 0xea, 0x7a, 0xa8, 0xce, 0x5a, 0xdd, 0x37, 0x77, 0x24, 0x57, 0xfb, 0x40, 0x3d, 0x1b, 0x48, 0x88, 0xda, 0xce, 0xe8, 0xd2, 0xed, 0xe0, 0x6e, 0x29, 0xeb, 0xdb, 0x95, 0x09,
-        0xd5, 0xc0, 0xaa, 0x2c, 0x5c, 0xac, 0x46, 0xeb, 0xa4, 0x35, 0x2a, 0xab, 0x00, 0x2e, 0xc0, 0x8b, 0x42, 0x65, 0x2f, 0x2f, 0x13, 0x84, 0x60, 0x15, 0xa3, 0x69, 0xee, 0xab, 0x0e, 0x50, 0xbf, 0x5f } },
-    { { 0x3a, 0x79, 0x39, 0x60, 0xe9, 0x93, 0xad, 0x78, 0xf9, 0x0b, 0x99, 0x64, 0x71, 0x76, 0xad, 0xdc, 0x63, 0xa3, 0x38, 0xbf, 0x0a, 0x36, 0x22, 0xcf, 0x4f, 0x84, 0x3e, 0x34, 0xaf, 0x0b, 0xd4, 0x5c,
-        0xc0, 0xa4, 0x01, 0x7c, 0x07, 0xc3, 0xb4, 0xcb, 0xdb, 0x39, 0xdd, 0x39, 0xc7, 0x5c, 0xbd, 0xcf, 0x61, 0x8b, 0x72, 0x74, 0xd6, 0x85, 0xdc, 0x5c, 0x08, 0x93, 0x6d, 0xe6, 0xf1, 0xeb, 0xb9, 0x7c },
-      { 0x71, 0x12, 0x20, 0xbb, 0x37, 0xa6, 0xd8, 0x71, 0xf7, 0x58, 0xaa, 0xbd, 0x30, 0xfb, 0xac, 0x94, 0x62, 0x45, 0xf0, 0x1a, 0xc3, 0x4a, 0x07, 0x78, 0x6d, 0x17, 0xf5, 0x8d, 0x69, 0x3d, 0x2e, 0x15,
-        0x96, 0x48, 0x1a, 0xb0, 0x7e, 0xdd, 0xf5, 0x2d, 0xe1, 0x56, 0xfc, 0xe9, 0x26, 0x91, 0x51, 0xfe, 0x5e, 0x2a, 0xdc, 0x23, 0x89, 0x09, 0x14, 0xe6, 0x17, 0xa9, 0x14, 0x8c, 0x8c, 0xe8, 0xe3, 0x71 },
-      { 0xe4, 0xd0, 0xa7, 0x5a, 0xce, 0x93, 0x1d, 0x55, 0xa2, 0x3d, 0xdd, 0x7e, 0x10, 0x66, 0x6d, 0xc6, 0x5c, 0x87, 0x9f, 0x7a, 0x52, 0x5e, 0x76, 0x3f, 0x09, 0x9e, 0xe5, 0x8e, 0x60, 0x39, 0x5e, 0x3c,
-        0x28, 0x31, 0xa4, 0x12, 0x39, 0xfd, 0xba, 0xda, 0xc8, 0x59, 0xdd, 0x5b, 0x26, 0x78, 0x8f, 0x33, 0xd2, 0xc8, 0x22, 0x77, 0x49, 0xcf, 0x34, 0x61, 0xbe, 0x7a, 0xa6, 0x31, 0xbe, 0xe5, 0xab, 0xc2 },
-      { 0x60, 0xf5, 0x52, 0xbd, 0xb1, 0x9e, 0x06, 0xa3, 0x94, 0xad, 0xe0, 0x82, 0x33, 0x7c, 0x41, 0x17, 0x5b, 0x8a, 0xbc, 0x7c, 0xce, 0xd1, 0x7e, 0xfd, 0x39, 0x17, 0xfd, 0x90, 0x5a, 0x53, 0x89, 0x27,
-        0x9f, 0x27, 0x7a, 0x08, 0xb2, 0x66, 0xda, 0xb5, 0xbf, 0x3b, 0x80, 0xe2, 0x1a, 0x30, 0x80, 0x45, 0x13, 0xf3, 0x4b, 0x0c, 0x4a, 0xe9, 0x0a, 0x6e, 0xf2, 0x3e, 0xa3, 0x70, 0x3d, 0x89, 0xd3, 0xb2 },
-      { 0x23, 0x41, 0x08, 0x8d, 0xa8, 0x0b, 0x6a, 0xe0, 0x65, 0xb1, 0x42, 0x50, 0x49, 0xdd, 0xd3, 0xe8, 0x89, 0x13, 0x7a, 0x04, 0xf0, 0xd6, 0x2f, 0x6e, 0x73, 0xcd, 0xdc, 0x10, 0xbb, 0x02, 0x6b, 0xa2,
-        0x25, 0x58, 0xa3, 0x08, 0x37, 0x7c, 0x8b, 0x1f, 0x4a, 0x81, 0x38, 0x88, 0xbd, 0xf4, 0x4f, 0x24, 0xe8, 0xd6, 0x9f, 0x2f, 0x13, 0xeb, 0x79, 0x60, 0x80, 0x90, 0x52, 0x6b, 0x8e, 0xed, 0xcb, 0x77 },
-      { 0x5b, 0x88, 0x63, 0xaf, 0xf9, 0xe2, 0x44, 0x23, 0xc8, 0x02, 0xe0, 0x22, 0x15, 0x3d, 0x2a, 0xb7, 0x40, 0x76, 0xe8, 0x95, 0xfd, 0xa9, 0xe3, 0x85, 0x94, 0xa3, 0xbb, 0xce, 0x61, 0x19, 0x0d, 0xe2,
-        0x95, 0xdf, 0x81, 0x11, 0x53, 0x77, 0xcd, 0xf2, 0xd8, 0x4f, 0xbf, 0x19, 0x6a, 0x3d, 0x4b, 0xda, 0xa4, 0x56, 0xa4, 0xcd, 0x9d, 0x4f, 0x52, 0x53, 0x7d, 0xd8, 0xac, 0xe0, 0xfb, 0x9a, 0x71, 0x0c,
-        0x59, 0xf9, 0x0b, 0x03, 0xf1, 0x7b, 0xaf, 0x33, 0xc3, 0xe5, 0x1e, 0x8d, 0x4f, 0xbe, 0x21, 0xed, 0x6b, 0x15, 0xdd, 0xd2, 0xeb, 0x7c, 0xe4, 0x59, 0x6c, 0xf9, 0x91, 0xc1, 0x3a, 0x3a, 0xb6, 0x2b },
-      { 0x5e, 0x54, 0xe5, 0x1b, 0x3d, 0x2c, 0x00, 0x80, 0xdd, 0xe4, 0x10, 0x50, 0x98, 0xb6, 0x0e, 0x3a, 0xf7, 0xde, 0x67, 0x2c, 0x8e, 0x7b, 0xb4, 0x73, 0x0b, 0xc7, 0x12, 0xb0, 0x66, 0x6b, 0x3b, 0x99,
-        0xd9, 0x33, 0x78, 0x5f, 0x45, 0xe5, 0xec, 0x15, 0x02, 0xfa, 0x8b, 0x86, 0xfd, 0xe0, 0xb7, 0x84, 0x72, 0xf2, 0x68, 0x5c, 0xd6, 0x2e, 0x37, 0xe9, 0x49, 0x32, 0x2f, 0xcd, 0xcd, 0x1e, 0x99, 0x0f,
-        0x59, 0xf9, 0x0b, 0x03, 0xf1, 0x7b, 0xaf, 0x33, 0xc3, 0xe5, 0x1e, 0x8d, 0x4f, 0xbe, 0x21, 0xed, 0x6b, 0x15, 0xdd, 0xd2, 0xeb, 0x7c, 0xe4, 0x59, 0x6c, 0xf9, 0x91, 0xc1, 0x3a, 0x3a, 0xb6, 0x2b } },
-    { { 0xfc, 0xb9, 0x4e, 0x4e, 0x11, 0xfe, 0xe1, 0xc5, 0xc7, 0x49, 0x54, 0xd2, 0x2f, 0x13, 0x34, 0x7c, 0x91, 0x7d, 0x98, 0x43, 0xe4, 0xb7, 0x48, 0xea, 0xe8, 0x26, 0xcb, 0x26, 0x1f, 0xe4, 0x99, 0x10,
-        0xb9, 0x34, 0xc2, 0xac, 0xa3, 0x2c, 0xbd, 0x9e, 0x80, 0xd4, 0x12, 0x3b, 0xb3, 0xf0, 0x01, 0xae, 0x91, 0x9f, 0xba, 0x77, 0x32, 0x4d, 0x9d, 0xac, 0x1f, 0x8d, 0xad, 0xa7, 0x46, 0x44, 0x85, 0xfb },
-      { 0x65, 0x05, 0x0b, 0xd2, 0x41, 0xd3, 0x58, 0x2a, 0x14, 0xbc, 0x7b, 0x15, 0x4a, 0x6a, 0x6a, 0x18, 0x71, 0x09, 0x25, 0x33, 0xac, 0x73, 0x53, 0xab, 0xd9, 0x0d, 0x8d, 0xdf, 0x95, 0x59, 0x7e, 0x02,
-        0x4c, 0x03, 0x11, 0x5c, 0xdc, 0x80, 0x19, 0xd5, 0x13, 0x66, 0x7f, 0xf7, 0xd7, 0x23, 0x18, 0x40, 0x84, 0x16, 0x6b, 0x52, 0x82, 0x96, 0x05, 0x1b, 0xfa, 0xcb, 0x4b, 0x77, 0x00, 0x12, 0xa0, 0x28 },
-      { 0x13, 0xe0, 0x16, 0x1e, 0x24, 0x24, 0xe9, 0xde, 0x9c, 0x86, 0xa9, 0xcf, 0x02, 0x96, 0xdf, 0x8c, 0x64, 0xcb, 0x3d, 0x7d, 0x8a, 0x2a, 0x73, 0x18, 0x20, 0xc8, 0xb0, 0xac, 0x10, 0xa0, 0x52, 0x0c,
-        0x6c, 0x17, 0xd9, 0xbd, 0x3c, 0x3e, 0xe5, 0x0c, 0x4a, 0xdb, 0x59, 0xcc, 0x59, 0x15, 0x08, 0x1e, 0xfe, 0xaa, 0xe3, 0xd6, 0xa1, 0x37, 0xd6, 0xd5, 0x6d, 0x8e, 0xcd, 0x57, 0xa9, 0x81, 0xb3, 0x43 },
-      { 0x46, 0x28, 0x2b, 0xa0, 0xe5, 0xe3, 0xf0, 0x72, 0xa7, 0xbc, 0x8d, 0xec, 0x45, 0x31, 0x6e, 0xdb, 0xb2, 0x4b, 0x20, 0xbf, 0x64, 0x74, 0x26, 0x70, 0x9b, 0xd6, 0xd3, 0x7f, 0x9f, 0xc1, 0x59, 0x03,
-        0x2d, 0xda, 0x6f, 0xaa, 0x7c, 0x92, 0xc6, 0xe0, 0xe8, 0xaa, 0x1e, 0x26, 0xf0, 0x1e, 0xcc, 0xef, 0x6d, 0x87, 0x04, 0x3c, 0xed, 0x52, 0x15, 0xb3, 0x9f, 0x01, 0x4e, 0xe3, 0x3c, 0xb6, 0xbb, 0xac },
-      { 0x86, 0x1a, 0x25, 0x8e, 0x41, 0x85, 0xf9, 0xba, 0x98, 0x15, 0xb1, 0xec, 0x50, 0xb4, 0xd0, 0xab, 0x55, 0x54, 0xbb, 0x3b, 0x61, 0xfc, 0x54, 0xf3, 0x09, 0xea, 0xaa, 0x6e, 0xbf, 0x03, 0xc3, 0x58,
-        0x1d, 0x24, 0xb5, 0xd5, 0x45, 0x5a, 0x7a, 0x14, 0xc3, 0x6a, 0xa9, 0xd8, 0x6f, 0x41, 0xc3, 0xb4, 0x9a, 0x05, 0x71, 0xbc, 0x23, 0x67, 0xc2, 0xa8, 0xf5, 0x7b, 0x69, 0xa5, 0xe1, 0x7a, 0x35, 0x1d },
-      { 0x3b, 0xf5, 0xa8, 0xc0, 0x2a, 0x7d, 0x85, 0x88, 0xd4, 0xf4, 0x26, 0xd3, 0xf4, 0xe3, 0x52, 0x35, 0x37, 0x06, 0x1e, 0x71, 0xc2, 0x3b, 0x7b, 0xeb, 0xf0, 0x07, 0x30, 0x6b, 0x37, 0x31, 0xb9, 0x27,
-        0xd8, 0x0b, 0x17, 0xae, 0xff, 0xd4, 0x7c, 0x59, 0xd7, 0x2d, 0xea, 0xcb, 0x92, 0x2f, 0x93, 0xc7, 0xd7, 0xc3, 0xaf, 0x75, 0x73, 0x6a, 0x3f, 0x89, 0xe5, 0x13, 0x0c, 0x28, 0x47, 0xf4, 0xa4, 0x07,
-        0xfb, 0xd9, 0x77, 0xb4, 0x1e, 0xb2, 0x70, 0xca, 0x85, 0x22, 0x58, 0xc6, 0x0b, 0x19, 0xc2, 0xa5, 0xba, 0xc3, 0xc9, 0xb6, 0x4a, 0xdb, 0x7d, 0x4d, 0x66, 0xde, 0xeb, 0x8c, 0x1a, 0x23, 0xb8, 0x4c },
-      { 0x8c, 0x57, 0x0e, 0x9f, 0x0a, 0xb2, 0xf4, 0x07, 0xdd, 0x7b, 0x46, 0xf8, 0xa0, 0xb1, 0x33, 0x4c, 0x2b, 0x1e, 0x1a, 0xe0, 0x28, 0x17, 0x14, 0xba, 0x14, 0x06, 0x40, 0x1f, 0x30, 0x0a, 0x19, 0xcd,
-        0xe7, 0xca, 0xfb, 0xdb, 0xb9, 0x76, 0xf8, 0x8a, 0x81, 0x3d, 0x03, 0x86, 0x7e, 0x66, 0x75, 0x1d, 0xec, 0xff, 0x6b, 0xa7, 0xea, 0x4c, 0x8c, 0x60, 0xd2, 0x1f, 0x72, 0x11, 0x4c, 0x5d, 0xeb, 0x01,
-        0xfb, 0xd9, 0x77, 0xb4, 0x1e, 0xb2, 0x70, 0xca, 0x85, 0x22, 0x58, 0xc6, 0x0b, 0x19, 0xc2, 0xa5, 0xba, 0xc3, 0xc9, 0xb6, 0x4a, 0xdb, 0x7d, 0x4d, 0x66, 0xde, 0xeb, 0x8c, 0x1a, 0x23, 0xb8, 0x4c } },
-    { { 0x05, 0x64, 0x16, 0x53, 0xbb, 0xb2, 0x6e, 0x81, 0xfc, 0xe6, 0xec, 0xc8, 0x0c, 0xc1, 0x75, 0x59, 0x23, 0xe2, 0x4b, 0xd8, 0x6a, 0x70, 0x34, 0x50, 0x37, 0xc6, 0xc2, 0xbd, 0x27, 0xfd, 0xad, 0x4c,
-        0xee, 0xe4, 0xf7, 0xfc, 0x91, 0x05, 0x48, 0x3c, 0xd4, 0x09, 0x78, 0x00, 0xce, 0x15, 0x37, 0xdc, 0xe7, 0xce, 0x48, 0x09, 0x3e, 0x7f, 0x01, 0x9b, 0x03, 0xc8, 0x2f, 0x9b, 0xe6, 0x42, 0xe1, 0x71 },
-      { 0x64, 0xbf, 0x63, 0x91, 0xe5, 0x3e, 0x90, 0x89, 0x96, 0xea, 0x59, 0x51, 0x60, 0x7b, 0x5f, 0xfe, 0x0f, 0x76, 0x86, 0x19, 0x45, 0x82, 0xd9, 0x5e, 0x1a, 0xd1, 0xf6, 0x04, 0xc6, 0xaa, 0x71, 0xda,
-        0x80, 0xed, 0x75, 0x51, 0xc8, 0x9a, 0x27, 0x09, 0xc3, 0x50, 0xe4, 0x14, 0xa1, 0xc3, 0xf8, 0x3a, 0x6c, 0x84, 0xff, 0x87, 0xd5, 0xf0, 0xb0, 0x3c, 0x5a, 0x57, 0x14, 0x90, 0xc7, 0x31, 0xf8, 0x47 },
-      { 0x88, 0x7d, 0xcc, 0x81, 0x2b, 0xbb, 0x7e, 0x96, 0xbe, 0x78, 0xe1, 0xb1, 0xf2, 0xed, 0x6f, 0xd8, 0xff, 0xbd, 0x7f, 0x8e, 0xe5, 0xeb, 0x7f, 0x7b, 0xca, 0xaf, 0x9b, 0x08, 0x1a, 0x77, 0x69, 0x1d,
-        0xc2, 0xa4, 0x7c, 0x4d, 0xa6, 0x74, 0x8e, 0x33, 0x24, 0xff, 0x43, 0xe1, 0x8c, 0x59, 0xae, 0x5f, 0x95, 0xa4, 0x35, 0x9e, 0x61, 0xb8, 0xcc, 0x4c, 0x87, 0xb9, 0x76, 0x53, 0x20, 0xa3, 0xf3, 0xf5 },
-      { 0x13, 0x2a, 0xcc, 0x07, 0xb1, 0x5f, 0xc7, 0xf1, 0x08, 0x0e, 0x7d, 0x7e, 0x26, 0x56, 0xd8, 0x16, 0x9c, 0xae, 0xac, 0xc4, 0xf5, 0x9c, 0x15, 0x67, 0xae, 0xc4, 0xcc, 0x3f, 0xc0, 0xaf, 0x53, 0x28,
-        0x1f, 0x65, 0x14, 0xe5, 0x7f, 0x0c, 0xf5, 0x7a, 0xe3, 0x93, 0xc1, 0xa3, 0xd1, 0x4a, 0x09, 0x7d, 0x24, 0xab, 0x22, 0xc4, 0xc4, 0xce, 0x85, 0x37, 0x86, 0xa8, 0x9c, 0x39, 0x33, 0xba, 0x1b, 0x83 },
-      { 0x6d, 0x3e, 0x92, 0x5a, 0xa8, 0xfa, 0xe6, 0x71, 0x98, 0xa8, 0x82, 0x38, 0xcc, 0xed, 0xd6, 0x92, 0x7e, 0x3e, 0xcb, 0xb2, 0x82, 0x92, 0x7a, 0x56, 0x9e, 0xd6, 0x29, 0x45, 0x42, 0x04, 0x76, 0x82,
-        0xa5, 0xfc, 0xd9, 0x0c, 0x12, 0x4c, 0x98, 0x04, 0x2a, 0x3a, 0x98, 0x01, 0xb8, 0x62, 0xe8, 0xe6, 0x7c, 0x51, 0xe3, 0x7d, 0x97, 0xf5, 0x45, 0xb4, 0x13, 0xdf, 0x15, 0x68, 0xc3, 0x00, 0x75, 0x40 },
-      { 0x7e, 0x89, 0x3d, 0x7c, 0x78, 0x36, 0x3c, 0x85, 0xda, 0xb6, 0x9b, 0x6d, 0xbc, 0x52, 0x7d, 0xc6, 0xaa, 0xfd, 0x90, 0x62, 0xe4, 0xc4, 0x1a, 0x5a, 0x2e, 0xa1, 0x57, 0xd7, 0xda, 0x57, 0xf4, 0x58,
-        0xc5, 0x23, 0x61, 0x21, 0xe1, 0x93, 0xfa, 0x06, 0x22, 0xed, 0x41, 0x66, 0x24, 0x47, 0xb9, 0xed, 0xc8, 0x84, 0x25, 0x28, 0x39, 0xec, 0xfb, 0x29, 0xa1, 0xcd, 0xe1, 0x9d, 0x02, 0x48, 0x6f, 0x0a,
-        0xe2, 0x9f, 0x98, 0xfd, 0x3d, 0x18, 0xa1, 0x24, 0x9c, 0xc6, 0x75, 0xb8, 0x99, 0x76, 0x2a, 0xa4, 0x9e, 0xb1, 0x97, 0x2d, 0x1c, 0x99, 0x65, 0x5f, 0x1f, 0xda, 0x14, 0x4f, 0x10, 0x49, 0xf1, 0x7a },
-      { 0x2c, 0xec, 0x27, 0x63, 0xd2, 0x77, 0x14, 0x2d, 0x01, 0x18, 0x10, 0xe0, 0x23, 0x1b, 0xa2, 0x25, 0x61, 0xd4, 0x52, 0xd9, 0x90, 0xde, 0x97, 0x7e, 0xb8, 0xfa, 0x38, 0x25, 0xf2, 0x91, 0x07, 0x3e,
-        0xc4, 0xa9, 0x3e, 0xb5, 0x67, 0x02, 0x28, 0x94, 0x5c, 0x34, 0xa1, 0x0a, 0x5c, 0x54, 0x53, 0xd9, 0xb4, 0xc4, 0x5a, 0x8e, 0x57, 0x18, 0xc3, 0x35, 0xea, 0x47, 0x75, 0xe0, 0x44, 0x01, 0x71, 0x09,
-        0xe2, 0x9f, 0x98, 0xfd, 0x3d, 0x18, 0xa1, 0x24, 0x9c, 0xc6, 0x75, 0xb8, 0x99, 0x76, 0x2a, 0xa4, 0x9e, 0xb1, 0x97, 0x2d, 0x1c, 0x99, 0x65, 0x5f, 0x1f, 0xda, 0x14, 0x4f, 0x10, 0x49, 0xf1, 0x7a } },
-    { { 0x41, 0x10, 0xd9, 0x7f, 0xb8, 0x83, 0x9e, 0x42, 0x43, 0x7a, 0xb0, 0x6d, 0xa6, 0xcf, 0xa5, 0x7a, 0x50, 0x93, 0x2d, 0x13, 0x94, 0x37, 0xa8, 0x92, 0x26, 0x1f, 0xad, 0xe0, 0x25, 0x19, 0x91, 0x62,
-        0x28, 0xfb, 0x18, 0xbf, 0x89, 0xb0, 0x42, 0x80, 0x14, 0xcd, 0xd2, 0x72, 0x84, 0x1c, 0xfd, 0xe5, 0xc3, 0x71, 0x3c, 0x3f, 0x12, 0x5e, 0xdd, 0x53, 0x39, 0xf6, 0x4b, 0x9f, 0xb3, 0x5c, 0xe3, 0x15 },
-      { 0xd0, 0xc7, 0x18, 0x4d, 0x68, 0x9f, 0xdd, 0xec, 0x81, 0xf8, 0xc6, 0x0e, 0x83, 0x43, 0x23, 0x3d, 0xfc, 0xf3, 0x66, 0x55, 0xa8, 0x65, 0x8b, 0xd7, 0x9b, 0x3c, 0x74, 0x23, 0xcd, 0xae, 0x60, 0xe7,
-        0x61, 0xed, 0x2c, 0x7e, 0xe7, 0xa7, 0x63, 0x7d, 0x72, 0x47, 0x6a, 0x33, 0x1c, 0xaa, 0x81, 0xba, 0x6f, 0xd4, 0x00, 0xe7, 0xa9, 0x58, 0xb2, 0xad, 0xee, 0x3f, 0x9c, 0x70, 0xff, 0x2f, 0x13, 0x6f },
-      { 0x56, 0x7b, 0x19, 0x66, 0x42, 0x9a, 0x99, 0x51, 0x23, 0x4f, 0xb6, 0xe7, 0xcf, 0x98, 0xff, 0x20, 0x5a, 0xc3, 0x0e, 0x36, 0xc9, 0xc6, 0x20, 0x25, 0x0c, 0x56, 0x98, 0xfb, 0xbd, 0xd6, 0x66, 0x4f,
-        0x6f, 0x94, 0x85, 0x8a, 0x35, 0xf3, 0x50, 0xad, 0x87, 0xde, 0x95, 0x9e, 0xae, 0x2a, 0xd8, 0xdd, 0x78, 0x87, 0x96, 0x2b, 0xe0, 0x12, 0x95, 0xd9, 0x3b, 0xb2, 0x2a, 0x06, 0xe2, 0xf0, 0x06, 0xd4 },
-      { 0x42, 0x24, 0xdd, 0x0a, 0xd1, 0x11, 0x31, 0x7e, 0x56, 0x45, 0xb0, 0x0e, 0x86, 0xc1, 0x5d, 0x8c, 0x03, 0x01, 0xb8, 0x33, 0x20, 0xbd, 0x08, 0x10, 0xe5, 0x70, 0x92, 0x2b, 0x5b, 0x86, 0xd3, 0x50,
-        0x4c, 0x1e, 0xe3, 0xd1, 0x2a, 0x4e, 0x40, 0x02, 0x19, 0x0b, 0xf6, 0x91, 0xd9, 0x9e, 0xaa, 0x54, 0x7c, 0x3d, 0xba, 0xc5, 0x5a, 0x9e, 0xb2, 0xbb, 0x4e, 0x0d, 0x5b, 0xdd, 0x90, 0xc9, 0x7b, 0xc2 },
-      { 0x54, 0x95, 0xd5, 0xdc, 0x7e, 0x7e, 0xec, 0xd4, 0x67, 0x08, 0xdc, 0x58, 0xa9, 0x80, 0x8a, 0x03, 0x6a, 0xf8, 0x40, 0xca, 0x0d, 0x5b, 0x6c, 0xe4, 0xc9, 0x71, 0xa5, 0xaf, 0x2a, 0xaa, 0xe8, 0x95,
-        0x45, 0xe7, 0xe2, 0xc3, 0x47, 0x84, 0xc6, 0xbe, 0xe5, 0x65, 0xaf, 0xcd, 0x7c, 0x20, 0x5f, 0x8b, 0x19, 0x61, 0xe4, 0xc9, 0xc1, 0x86, 0xa5, 0x6f, 0x96, 0xf3, 0x9c, 0x13, 0x28, 0x1b, 0xcf, 0x07 },
-      { 0xc4, 0x7f, 0xf2, 0x6f, 0xcc, 0x4a, 0xf8, 0xa4, 0x1f, 0x1d, 0x6e, 0x5e, 0x30, 0xb2, 0x99, 0x8f, 0x5d, 0x7c, 0x26, 0x1c, 0x52, 0x6f, 0xd0, 0x33, 0xa7, 0xf8, 0xca, 0x2a, 0xc3, 0x8c, 0xa8, 0xd1,
-        0x50, 0x4f, 0xa7, 0xe8, 0xf2, 0x10, 0x4c, 0xcd, 0x8a, 0x31, 0x03, 0xc8, 0x93, 0x2c, 0xd7, 0xe4, 0x21, 0xdb, 0xa2, 0x62, 0x7b, 0x1f, 0x28, 0x14, 0x69, 0x7e, 0x87, 0xac, 0xf9, 0xb4, 0x97, 0x00,
-        0x62, 0x86, 0x14, 0xd7, 0xe4, 0x65, 0xdd, 0x9e, 0x1c, 0x64, 0x5f, 0x3e, 0xef, 0xfe, 0xa6, 0x60, 0x68, 0x91, 0x94, 0x8a, 0x1c, 0x89, 0xae, 0xe4, 0xcf, 0x3a, 0xdd, 0xc0, 0xb4, 0x47, 0xe8, 0x8f },
-      { 0x12, 0x80, 0x00, 0xda, 0xce, 0xc4, 0x80, 0x8f, 0xa9, 0xa1, 0x5d, 0x98, 0x7d, 0x2c, 0xb2, 0x9c, 0x71, 0xde, 0x62, 0x89, 0x6a, 0xe1, 0x92, 0xd7, 0x96, 0xdc, 0xcd, 0xc8, 0x08, 0x0e, 0x48, 0xbf,
-        0x2a, 0x53, 0x72, 0x90, 0x31, 0x71, 0x49, 0x02, 0xda, 0x4e, 0x19, 0x05, 0x10, 0xcb, 0x41, 0x97, 0x44, 0xdc, 0x2d, 0x1e, 0x48, 0xe5, 0x0e, 0x41, 0x9d, 0x7d, 0x03, 0xa3, 0xe2, 0x65, 0xd4, 0x01,
-        0x62, 0x86, 0x14, 0xd7, 0xe4, 0x65, 0xdd, 0x9e, 0x1c, 0x64, 0x5f, 0x3e, 0xef, 0xfe, 0xa6, 0x60, 0x68, 0x91, 0x94, 0x8a, 0x1c, 0x89, 0xae, 0xe4, 0xcf, 0x3a, 0xdd, 0xc0, 0xb4, 0x47, 0xe8, 0x8f } },
-    { { 0x00, 0x4b, 0x0b, 0xf5, 0x1f, 0x07, 0x1e, 0x23, 0xe3, 0x93, 0x7b, 0x31, 0x41, 0x2a, 0x0a, 0x50, 0x35, 0xe2, 0xbb, 0xfe, 0x51, 0x77, 0x6c, 0xc9, 0xc5, 0x13, 0xb9, 0x87, 0x79, 0x65, 0x68, 0x20,
-        0xcc, 0x09, 0x90, 0xa9, 0xe4, 0xef, 0x9f, 0x1a, 0xe1, 0x69, 0x76, 0x14, 0x82, 0x42, 0x88, 0x4b, 0xdc, 0xe0, 0x10, 0x22, 0xe2, 0xd6, 0x36, 0x7c, 0x0b, 0xd9, 0x08, 0xea, 0xfa, 0xe4, 0xfd, 0x45 },
-      { 0x57, 0x5c, 0x1e, 0x20, 0xb4, 0xae, 0x9e, 0x9d, 0x04, 0xfb, 0x1a, 0xd7, 0x23, 0xd8, 0x8a, 0x6b, 0x1b, 0xb2, 0xef, 0xa9, 0x06, 0x38, 0xbb, 0x9b, 0x43, 0x2e, 0xf1, 0x81, 0x0b, 0x76, 0xec, 0x20,
-        0x46, 0x1b, 0xc4, 0x71, 0x19, 0x3e, 0x79, 0xe8, 0xcf, 0xea, 0xdc, 0x4b, 0x3f, 0x0b, 0xeb, 0x05, 0x13, 0x1a, 0x2c, 0xfe, 0x16, 0xe9, 0xf0, 0xc4, 0x9c, 0x41, 0xab, 0x45, 0x1b, 0xba, 0x05, 0xec },
-      { 0x06, 0x0b, 0x73, 0xec, 0x30, 0x74, 0x0d, 0x8d, 0x13, 0x4b, 0xef, 0xac, 0x3b, 0x05, 0xb6, 0xed, 0x2b, 0x05, 0xd1, 0xa7, 0x65, 0xb0, 0xcb, 0x69, 0x00, 0xeb, 0x47, 0xe3, 0x1c, 0x07, 0x8b, 0x15,
-        0xbf, 0x69, 0xff, 0x27, 0xb4, 0xdb, 0x77, 0xaf, 0xe9, 0x9a, 0xfb, 0xb2, 0x28, 0xa4, 0xf9, 0x05, 0xe4, 0x3c, 0x66, 0x56, 0x00, 0x1a, 0x2c, 0x41, 0xf2, 0xe1, 0x11, 0x09, 0xfa, 0xe1, 0x50, 0x49 },
-      { 0xbc, 0x4d, 0x6f, 0x75, 0x79, 0x77, 0x64, 0x6b, 0xec, 0xac, 0x1a, 0x26, 0x73, 0x9c, 0xf3, 0xf1, 0x4d, 0x79, 0xbe, 0x6f, 0x0c, 0x07, 0x22, 0xd1, 0xa1, 0x31, 0x75, 0xa8, 0x9c, 0xb6, 0x00, 0x63,
-        0x0d, 0x40, 0x17, 0xec, 0x83, 0xda, 0x82, 0x2c, 0x3b, 0xfd, 0x90, 0xe3, 0xbc, 0xc2, 0x2c, 0xf5, 0x3e, 0x41, 0xe9, 0x98, 0x57, 0xa2, 0xb7, 0xce, 0x5f, 0x31, 0xbb, 0x0b, 0x05, 0x61, 0x0f, 0x55 },
-      { 0xb7, 0xab, 0xb2, 0x84, 0xf1, 0x67, 0x24, 0x16, 0x61, 0xe9, 0x20, 0x33, 0x0b, 0xff, 0x22, 0x61, 0x70, 0xa0, 0x5d, 0xf6, 0xa8, 0x33, 0xc9, 0x30, 0x73, 0xe5, 0x89, 0x36, 0x59, 0xea, 0xa8, 0xe7,
-        0x03, 0xf6, 0x14, 0xc1, 0x79, 0xb6, 0x42, 0xa5, 0xc8, 0x6c, 0xb8, 0x94, 0x29, 0x24, 0x00, 0x09, 0xb5, 0x54, 0x3f, 0xe1, 0x6b, 0xfb, 0x4d, 0x2d, 0xa9, 0x9a, 0x02, 0xa1, 0xa5, 0x09, 0xf4, 0xcb },
-      { 0x92, 0xfa, 0x18, 0x84, 0x3e, 0xdb, 0xdf, 0x7d, 0x87, 0xd6, 0x2d, 0x07, 0x05, 0x2c, 0xba, 0xe4, 0x30, 0x76, 0xa2, 0xe8, 0x71, 0x3b, 0x1b, 0x93, 0x5b, 0xce, 0x2e, 0xec, 0x50, 0x6e, 0x4a, 0x0b,
-        0x2d, 0xbe, 0xa3, 0x76, 0x92, 0xf8, 0xc8, 0x4a, 0x71, 0x66, 0xec, 0xfa, 0x36, 0xc5, 0xdb, 0xab, 0x99, 0x9c, 0xbf, 0x99, 0x07, 0xe8, 0xfe, 0xf4, 0x2f, 0x90, 0x16, 0x5d, 0xdc, 0xbe, 0xfa, 0x08,
-        0x93, 0xde, 0x13, 0xf5, 0x32, 0x45, 0x9a, 0xde, 0xa2, 0x5d, 0xb9, 0xe0, 0x38, 0x4c, 0x6a, 0xcc, 0x13, 0x46, 0x27, 0x28, 0xbf, 0xf8, 0x7a, 0x9c, 0x2e, 0xde, 0x6f, 0xfe, 0xe1, 0x86, 0x41, 0x79 },
-      { 0xa7, 0x32, 0x52, 0x76, 0x4f, 0x3e, 0x1b, 0xab, 0x82, 0x18, 0x14, 0xe7, 0x42, 0x32, 0xb8, 0xa4, 0x98, 0xde, 0xa4, 0xd7, 0xae, 0x42, 0x84, 0xda, 0x71, 0xf7, 0x78, 0x40, 0x56, 0x94, 0x64, 0x49,
-        0x34, 0x37, 0xeb, 0xe3, 0x05, 0x4c, 0xb9, 0xbb, 0xce, 0xb2, 0x72, 0xc0, 0x75, 0x1c, 0xc4, 0xd5, 0x1e, 0x3a, 0xc1, 0x43, 0xda, 0xd1, 0x81, 0x82, 0xa9, 0xd5, 0x0e, 0x0a, 0x5e, 0xc2, 0xd7, 0x04,
-        0x93, 0xde, 0x13, 0xf5, 0x32, 0x45, 0x9a, 0xde, 0xa2, 0x5d, 0xb9, 0xe0, 0x38, 0x4c, 0x6a, 0xcc, 0x13, 0x46, 0x27, 0x28, 0xbf, 0xf8, 0x7a, 0x9c, 0x2e, 0xde, 0x6f, 0xfe, 0xe1, 0x86, 0x41, 0x79 } },
-    { { 0xa3, 0xdf, 0x4a, 0xfd, 0xe6, 0x74, 0xb8, 0xeb, 0xed, 0xe7, 0x7e, 0xd2, 0xae, 0xf8, 0x40, 0x80, 0x3a, 0x55, 0x58, 0x1d, 0x6b, 0xa4, 0x32, 0x6c, 0x15, 0xbb, 0x67, 0xdf, 0x9e, 0xb5, 0x70, 0x4b,
-        0x7f, 0x4d, 0xfe, 0x34, 0x42, 0x0c, 0x4d, 0xe3, 0x97, 0x87, 0x6d, 0x08, 0xe8, 0x4d, 0x8a, 0xa9, 0xbc, 0xbf, 0x1b, 0xb7, 0x66, 0x32, 0xf4, 0x7f, 0x93, 0xca, 0xa4, 0xd2, 0x8f, 0x02, 0x7b, 0xfa },
-      { 0xea, 0xac, 0xdf, 0x25, 0x39, 0xf3, 0x28, 0xb6, 0xbe, 0xa8, 0x4a, 0x32, 0x59, 0x4b, 0x4f, 0xb5, 0xd2, 0xf7, 0xf5, 0x75, 0x43, 0x8b, 0xb3, 0x6a, 0x98, 0x8c, 0x14, 0xc9, 0x3f, 0x7e, 0x5c, 0x05,
-        0xf0, 0xeb, 0x1d, 0xc5, 0xe6, 0x1b, 0x5d, 0x7f, 0x38, 0x5d, 0x9a, 0xbe, 0xc8, 0x97, 0x09, 0x65, 0x62, 0x88, 0x99, 0xda, 0x95, 0x13, 0x93, 0xd9, 0xa3, 0x19, 0x0a, 0xa7, 0x4a, 0xb2, 0x81, 0xa4 },
-      { 0x6e, 0x70, 0x65, 0xaa, 0x1b, 0x16, 0xcb, 0xc1, 0x59, 0x6b, 0xc9, 0x4d, 0xd1, 0x0a, 0x9d, 0x8c, 0x76, 0x70, 0x3c, 0xc1, 0xc1, 0x66, 0xa6, 0x9f, 0xfc, 0xca, 0xb0, 0x3f, 0x0e, 0xe9, 0xa9, 0x36,
-        0x09, 0x4f, 0x94, 0xf3, 0x32, 0x25, 0x34, 0xf6, 0xe4, 0xf9, 0x0b, 0x0c, 0xe6, 0xe0, 0x6d, 0x9e, 0xa5, 0x52, 0x82, 0x9c, 0xd4, 0x43, 0xa4, 0xd1, 0xd1, 0x63, 0x20, 0xce, 0xbc, 0x4f, 0x43, 0xdc },
-      { 0x35, 0xd6, 0xc1, 0x68, 0xa6, 0xd7, 0xd3, 0x36, 0x82, 0x2a, 0x0f, 0x29, 0x3e, 0xd6, 0x15, 0x29, 0x19, 0x73, 0x14, 0x78, 0x87, 0x86, 0xca, 0x9f, 0x6e, 0x17, 0xea, 0xaf, 0x24, 0x37, 0xd6, 0xb4,
-        0xb0, 0xee, 0x84, 0x90, 0x2d, 0x18, 0xbd, 0x26, 0xc3, 0xd4, 0x39, 0x4f, 0x45, 0xfa, 0x2f, 0x70, 0xf2, 0xe2, 0x2a, 0x2a, 0x5c, 0x65, 0x15, 0xcb, 0xaf, 0x92, 0x9a, 0xfc, 0x06, 0xe0, 0x8a, 0x1b },
-      { 0x5d, 0xfa, 0xc0, 0x2b, 0xc3, 0x94, 0x19, 0xb4, 0xd6, 0x13, 0xe3, 0xcf, 0x91, 0xad, 0x8c, 0xe1, 0x97, 0x46, 0xfe, 0xea, 0x74, 0xe0, 0x0c, 0x03, 0xf7, 0x2e, 0x51, 0xa7, 0xf2, 0xbc, 0xce, 0xe8,
-        0x6b, 0xfd, 0x2f, 0x54, 0x52, 0x12, 0x00, 0x8d, 0x95, 0x91, 0xc3, 0xf6, 0x25, 0xf8, 0x65, 0x6a, 0x9c, 0x79, 0x6b, 0x71, 0xc0, 0x0c, 0x29, 0xfb, 0xe7, 0x14, 0x9f, 0x2f, 0x1a, 0x07, 0x53, 0x50 },
-      { 0xe9, 0xd4, 0x46, 0x0b, 0x51, 0x3f, 0xf1, 0xbe, 0x0a, 0x23, 0xa5, 0x38, 0xa0, 0xe3, 0x70, 0x14, 0x63, 0xf0, 0x94, 0xbb, 0x1c, 0x4f, 0x23, 0x05, 0x1b, 0x62, 0x40, 0x9b, 0xf9, 0x52, 0x1b, 0x41,
-        0x51, 0x57, 0x2a, 0x99, 0x73, 0xda, 0xe1, 0xcf, 0xc5, 0x4c, 0x65, 0x3a, 0xc2, 0x9d, 0x73, 0xda, 0xc9, 0x59, 0xf1, 0xdf, 0xab, 0x2b, 0x27, 0xe1, 0x59, 0x8b, 0xa7, 0x48, 0xf9, 0x36, 0xcb, 0x08,
-        0xe3, 0x5e, 0x1d, 0xdd, 0xf9, 0x20, 0x4f, 0x64, 0xa9, 0x26, 0x74, 0x97, 0xf2, 0x2d, 0x31, 0xac, 0x8c, 0x20, 0x77, 0x09, 0xa9, 0x8f, 0xed, 0x23, 0x77, 0x7e, 0xd7, 0x34, 0x93, 0x84, 0xe7, 0xaa },
-      { 0xaa, 0xf7, 0x64, 0xdf, 0x34, 0x59, 0x1c, 0x2c, 0xbc, 0x47, 0x08, 0x6a, 0x25, 0xbf, 0x9d, 0x48, 0x54, 0xcf, 0xa0, 0x6c, 0xfc, 0xd4, 0x10, 0x39, 0x9f, 0x64, 0x46, 0xce, 0xd9, 0x95, 0x28, 0x89,
-        0xdf, 0x94, 0x5e, 0x74, 0x0b, 0x55, 0x46, 0x82, 0xd9, 0x3d, 0x82, 0x97, 0x7d, 0xd0, 0x3e, 0xd7, 0xf6, 0x6f, 0xaa, 0x97, 0x3e, 0xdf, 0xa7, 0xde, 0xe3, 0xc5, 0xaf, 0xd3, 0xa0, 0x5a, 0x30, 0x0d,
-        0xe3, 0x5e, 0x1d, 0xdd, 0xf9, 0x20, 0x4f, 0x64, 0xa9, 0x26, 0x74, 0x97, 0xf2, 0x2d, 0x31, 0xac, 0x8c, 0x20, 0x77, 0x09, 0xa9, 0x8f, 0xed, 0x23, 0x77, 0x7e, 0xd7, 0x34, 0x93, 0x84, 0xe7, 0xaa } },
-    { { 0x96, 0x4e, 0xf2, 0x1e, 0x3a, 0xe5, 0x77, 0xbf, 0xa7, 0x1c, 0x3d, 0x66, 0x08, 0x06, 0xca, 0x55, 0x43, 0x7a, 0x08, 0xf8, 0xff, 0x55, 0xb3, 0xbc, 0x9a, 0x83, 0x9a, 0x2e, 0xe6, 0x97, 0x14, 0x32,
-        0x36, 0x57, 0x5c, 0xa4, 0x04, 0x78, 0xb1, 0x92, 0xf4, 0x23, 0x94, 0xe6, 0x2a, 0xef, 0xd4, 0xe7, 0xc4, 0x02, 0x9f, 0xa9, 0x79, 0x77, 0x61, 0x90, 0xd6, 0xdb, 0x6e, 0x28, 0x7e, 0xc0, 0x1d, 0x70 },
-      { 0xc5, 0xd1, 0x5c, 0x34, 0x15, 0xa9, 0x1e, 0x42, 0x2a, 0x1b, 0x0d, 0xf0, 0x56, 0x83, 0x10, 0xc3, 0xc9, 0x21, 0xfd, 0x05, 0xfa, 0x51, 0x0e, 0x11, 0x28, 0xcc, 0x84, 0xac, 0x35, 0xb5, 0xd8, 0xc8,
-        0x5c, 0x80, 0x11, 0x1f, 0x60, 0x1c, 0x72, 0x25, 0x82, 0x45, 0xb5, 0x4f, 0x66, 0x6b, 0x52, 0xb1, 0xf7, 0x28, 0x0f, 0x80, 0x76, 0x44, 0xdc, 0x15, 0x70, 0x39, 0xe9, 0xaf, 0xc7, 0x0a, 0xa0, 0x43 },
-      { 0xff, 0x20, 0x5e, 0x3b, 0x75, 0xe9, 0x38, 0x7c, 0xa3, 0x5c, 0x8b, 0x1a, 0xec, 0x17, 0x8d, 0xf0, 0xef, 0xb3, 0x53, 0x9b, 0x16, 0xa9, 0x44, 0xf9, 0x34, 0x45, 0x13, 0x66, 0x80, 0x24, 0xdc, 0x22,
-        0x0e, 0x51, 0x94, 0xed, 0xe6, 0x83, 0x36, 0x32, 0x63, 0x23, 0x1b, 0xf8, 0x78, 0xb4, 0x04, 0x7f, 0x5a, 0x50, 0x54, 0x12, 0x19, 0x04, 0x61, 0xdd, 0x25, 0xf0, 0x48, 0x29, 0x04, 0xc1, 0x44, 0xe2 },
-      { 0x46, 0x32, 0x2d, 0xc7, 0xbc, 0x05, 0x2a, 0xd3, 0xb5, 0xce, 0x7d, 0x47, 0x5e, 0xfc, 0x90, 0x38, 0xef, 0xfa, 0x6f, 0x42, 0xf0, 0x66, 0x05, 0x89, 0x7c, 0x9a, 0xc1, 0xfd, 0xa2, 0xe8, 0xa7, 0x38,
-        0x18, 0x6d, 0x7f, 0x9e, 0xfb, 0xbd, 0x06, 0x0c, 0x70, 0xd7, 0x29, 0x10, 0x88, 0x04, 0x9f, 0x24, 0x28, 0x9d, 0xc7, 0x84, 0xdf, 0xb6, 0xec, 0xb2, 0xc7, 0x1b, 0xd1, 0xc1, 0x9d, 0x56, 0xb0, 0x83 },
-      { 0xda, 0xd7, 0x34, 0xee, 0x62, 0x13, 0x8f, 0x47, 0xad, 0xb4, 0x9c, 0x98, 0xe4, 0xc5, 0xb3, 0x29, 0x31, 0x11, 0x64, 0xad, 0xf5, 0x0b, 0x60, 0xe1, 0x0e, 0x18, 0x28, 0x30, 0x3c, 0xa2, 0xe3, 0x29,
-        0x89, 0x0a, 0x7e, 0x18, 0xba, 0x30, 0x9e, 0x7d, 0x53, 0xf1, 0x82, 0xd5, 0x27, 0xe5, 0xf3, 0xab, 0x15, 0xcd, 0x62, 0x7e, 0xdf, 0xf0, 0x0e, 0x42, 0xfa, 0x6b, 0x7b, 0x54, 0xd2, 0x74, 0x19, 0x8f },
-      { 0x29, 0x4d, 0x28, 0x80, 0x62, 0xb5, 0x77, 0xbb, 0x69, 0x70, 0xb0, 0xb7, 0x10, 0x2e, 0xed, 0xfc, 0x13, 0x34, 0x93, 0x7f, 0xd8, 0xfc, 0xb5, 0x7b, 0xfe, 0x34, 0x0a, 0xa3, 0x95, 0x5b, 0xb1, 0xa7,
-        0xc6, 0xab, 0x82, 0x79, 0x25, 0x23, 0x94, 0x12, 0xa4, 0x34, 0xec, 0x23, 0xca, 0xcb, 0xd0, 0xa3, 0xf9, 0x31, 0x32, 0xce, 0x50, 0x31, 0x73, 0x23, 0x98, 0x94, 0xe3, 0x08, 0xd9, 0x1e, 0xc3, 0x0b,
-        0x39, 0xe3, 0x3b, 0xf2, 0xe8, 0xb7, 0x26, 0x28, 0x9d, 0xb3, 0x12, 0x8d, 0x16, 0xca, 0x89, 0x26, 0xa9, 0x1c, 0xa3, 0x1f, 0x36, 0x10, 0x60, 0x6a, 0x29, 0x85, 0xe7, 0x2c, 0xee, 0xc1, 0xb6, 0xae },
-      { 0x68, 0xed, 0x3c, 0x64, 0xe6, 0x87, 0xf0, 0x14, 0x64, 0xfc, 0x38, 0x3a, 0x0f, 0xd9, 0x7a, 0x5b, 0x52, 0x32, 0x10, 0xca, 0xc6, 0x83, 0x0b, 0xae, 0x17, 0x0e, 0xfe, 0x77, 0xe0, 0xe7, 0x83, 0xa1,
-        0x2c, 0x78, 0x62, 0x9c, 0x79, 0x08, 0x2b, 0xd4, 0x85, 0x72, 0x27, 0x8d, 0x97, 0x78, 0x62, 0x33, 0x34, 0xeb, 0x5c, 0xde, 0x5d, 0xaa, 0x4d, 0xfa, 0xd1, 0x67, 0xa4, 0xea, 0x45, 0xad, 0xf9, 0x06,
-        0x39, 0xe3, 0x3b, 0xf2, 0xe8, 0xb7, 0x26, 0x28, 0x9d, 0xb3, 0x12, 0x8d, 0x16, 0xca, 0x89, 0x26, 0xa9, 0x1c, 0xa3, 0x1f, 0x36, 0x10, 0x60, 0x6a, 0x29, 0x85, 0xe7, 0x2c, 0xee, 0xc1, 0xb6, 0xae } },
-    { { 0xd9, 0x64, 0xb2, 0xe1, 0x9f, 0x0a, 0x35, 0xfc, 0x9f, 0xc3, 0xa5, 0x2a, 0xa3, 0x84, 0xb4, 0xf3, 0x23, 0xc4, 0xf3, 0x5a, 0x9d, 0xf8, 0x7f, 0x35, 0xa9, 0xf5, 0x5b, 0x68, 0xfc, 0x19, 0x69, 0x63,
-        0x6a, 0x13, 0x19, 0x32, 0xcc, 0x9d, 0x0c, 0x3c, 0x7d, 0xdd, 0x85, 0x16, 0xa8, 0xd9, 0x2b, 0x75, 0x08, 0x4b, 0x9a, 0xa5, 0x6e, 0xf3, 0xe9, 0xeb, 0xed, 0x5d, 0x2e, 0xfd, 0x2e, 0x0c, 0x60, 0xa2 },
-      { 0x0f, 0xf6, 0x8c, 0x3f, 0x6e, 0xee, 0x56, 0x4f, 0x43, 0x6f, 0x54, 0xbd, 0x7a, 0xe4, 0xbe, 0xa8, 0x77, 0x05, 0x99, 0xe7, 0x9e, 0x59, 0x22, 0x85, 0x9b, 0xc6, 0xe4, 0x2a, 0x61, 0x9c, 0x19, 0xb1,
-        0x5a, 0xeb, 0x7a, 0xf8, 0x41, 0x4e, 0xe5, 0x2a, 0xd0, 0xf7, 0x44, 0xf0, 0x16, 0xea, 0x0c, 0x04, 0x19, 0x6c, 0xb6, 0x30, 0x3c, 0x6e, 0x2d, 0x79, 0x9a, 0x8f, 0x08, 0x90, 0x11, 0xf1, 0xc0, 0x4d },
-      { 0x68, 0xe7, 0x1d, 0x40, 0xf1, 0x07, 0xc0, 0xc6, 0xb2, 0x87, 0x9c, 0xa2, 0x19, 0x43, 0x7a, 0xdf, 0x8a, 0x5a, 0x0f, 0xe2, 0x24, 0x97, 0xa0, 0x38, 0x79, 0x20, 0x38, 0xa9, 0x9c, 0x77, 0xc4, 0x37,
-        0xa6, 0x02, 0xe0, 0x93, 0x47, 0xa4, 0x55, 0x21, 0xc2, 0x69, 0xbe, 0x09, 0x05, 0xaa, 0x87, 0x28, 0xf1, 0x95, 0x2f, 0xdb, 0xf0, 0xbf, 0xd2, 0x9e, 0x5e, 0x3a, 0xfa, 0xc6, 0x2f, 0x13, 0x09, 0xaf },
-      { 0xe1, 0x9e, 0xc8, 0x4f, 0xc9, 0xdd, 0x61, 0x60, 0x94, 0xbc, 0xd3, 0xd6, 0xde, 0x11, 0x6e, 0xec, 0x84, 0xc4, 0xdd, 0xbe, 0x20, 0x46, 0x6c, 0xef, 0xf6, 0x9d, 0x37, 0x07, 0x53, 0x72, 0x57, 0xf9,
-        0x02, 0xb5, 0x64, 0x1f, 0xe2, 0x56, 0xa4, 0x38, 0x6d, 0xa4, 0xed, 0x23, 0x9e, 0xa3, 0xf4, 0x4d, 0x77, 0x52, 0xdc, 0x8c, 0x51, 0xfc, 0x88, 0x18, 0xbc, 0x83, 0x2a, 0xac, 0xc1, 0x1d, 0x3d, 0x59 },
-      { 0x08, 0x4f, 0x78, 0x21, 0xfd, 0x4b, 0x85, 0x86, 0x4e, 0x25, 0xdd, 0x47, 0x60, 0x7f, 0x7e, 0xc6, 0xd3, 0xa1, 0xab, 0x91, 0x3f, 0xeb, 0xf6, 0x40, 0x7e, 0x1b, 0xbd, 0x99, 0x9c, 0x7c, 0x2f, 0x4f,
-        0xca, 0x68, 0xa5, 0xf6, 0x8c, 0x1e, 0xcb, 0xb8, 0x76, 0xe2, 0x87, 0x5b, 0x49, 0x68, 0x97, 0x2c, 0x21, 0x5c, 0x7c, 0x93, 0x79, 0x9a, 0x95, 0xa1, 0x3a, 0x49, 0xc9, 0x6d, 0x34, 0x6b, 0xa1, 0x98 },
-      { 0xb9, 0x88, 0x25, 0x9a, 0x3b, 0x53, 0x56, 0xa1, 0x48, 0x0f, 0xf0, 0x92, 0xde, 0x4e, 0x3e, 0x3a, 0xcf, 0x02, 0xdc, 0x5c, 0xc2, 0xc3, 0x78, 0xad, 0x8a, 0x0c, 0x3c, 0xc7, 0xdd, 0xdd, 0x71, 0x6e,
-        0x3f, 0xd9, 0x3a, 0x57, 0x2a, 0x19, 0xa5, 0x3b, 0x5c, 0x46, 0x7b, 0xc9, 0x0f, 0x16, 0xb3, 0x58, 0xa6, 0x85, 0xfa, 0x91, 0x2c, 0x9a, 0x9c, 0x12, 0xb6, 0xd6, 0x7d, 0x9a, 0xf0, 0x9d, 0xe9, 0x02,
-        0xad, 0x12, 0x87, 0xda, 0x85, 0x58, 0x6b, 0xff, 0x68, 0x96, 0x05, 0x33, 0xba, 0x7f, 0x08, 0xf9, 0xa9, 0xa2, 0xa9, 0x46, 0x43, 0xe5, 0x03, 0x12, 0xe4, 0xbe, 0x74, 0xaa, 0x46, 0x4e, 0x51, 0xb3 },
-      { 0x61, 0x70, 0x17, 0x50, 0x26, 0xfa, 0x51, 0x83, 0xe0, 0xca, 0xa9, 0xb1, 0xc3, 0xc4, 0x83, 0xa9, 0xb6, 0x43, 0x6b, 0x7a, 0x5b, 0xe4, 0x21, 0x5a, 0x6b, 0xd4, 0x34, 0xf8, 0xee, 0x95, 0x86, 0x2d,
-        0x03, 0xbf, 0xca, 0xd0, 0xfa, 0x68, 0x53, 0xb2, 0x97, 0x50, 0xad, 0x89, 0x2f, 0x99, 0x63, 0x67, 0x18, 0x57, 0x1f, 0x57, 0x41, 0xbc, 0xb7, 0xc0, 0x18, 0xe7, 0xb6, 0xf3, 0x0f, 0xc4, 0x49, 0x0d,
-        0xad, 0x12, 0x87, 0xda, 0x85, 0x58, 0x6b, 0xff, 0x68, 0x96, 0x05, 0x33, 0xba, 0x7f, 0x08, 0xf9, 0xa9, 0xa2, 0xa9, 0x46, 0x43, 0xe5, 0x03, 0x12, 0xe4, 0xbe, 0x74, 0xaa, 0x46, 0x4e, 0x51, 0xb3 } },
-    { { 0xc5, 0xdf, 0x86, 0x8f, 0xf1, 0xa7, 0xad, 0x57, 0xfd, 0xb4, 0x53, 0xc3, 0x92, 0x1b, 0x9e, 0x2e, 0xdd, 0xc5, 0xa4, 0x3b, 0x72, 0xa6, 0x9b, 0x4a, 0x15, 0xca, 0x35, 0xed, 0x3c, 0x1a, 0x3b, 0x38,
-        0x36, 0xd6, 0xf2, 0x03, 0xb6, 0x97, 0x1f, 0xcb, 0x40, 0x5d, 0x3c, 0x25, 0xfc, 0xe7, 0xff, 0xc6, 0xbe, 0x61, 0xe1, 0x98, 0x31, 0x13, 0xa9, 0xbe, 0x05, 0x86, 0xfe, 0x5c, 0xf6, 0xcc, 0xaa, 0xf5 },
-      { 0xd2, 0x57, 0x19, 0x98, 0xf8, 0x74, 0x90, 0xb7, 0x69, 0x6e, 0xdd, 0x44, 0xf1, 0x8b, 0xb1, 0x9c, 0xfd, 0x5b, 0x6b, 0xc0, 0x45, 0xf2, 0x49, 0xa5, 0x4b, 0xff, 0x8b, 0x7f, 0x87, 0xe3, 0xf9, 0x71,
-        0xab, 0xfa, 0xc8, 0x17, 0xed, 0xeb, 0x19, 0xc6, 0x3c, 0xee, 0x78, 0xba, 0x89, 0x97, 0x49, 0x85, 0x39, 0x68, 0x29, 0x88, 0x0b, 0x1c, 0xd1, 0x42, 0x8b, 0xe8, 0x1a, 0x3b, 0xeb, 0x4d, 0xef, 0x3b },
-      { 0xea, 0xfb, 0xec, 0x27, 0xc3, 0x92, 0xc3, 0x68, 0x0d, 0x3c, 0x5b, 0x20, 0x20, 0x9c, 0x96, 0xa7, 0x39, 0xfa, 0x80, 0x91, 0xef, 0x86, 0x7d, 0xa8, 0x87, 0xf6, 0xef, 0x14, 0x01, 0x46, 0xf0, 0x68,
-        0x0a, 0x8b, 0xae, 0x83, 0x91, 0x7e, 0xa0, 0x14, 0x14, 0xde, 0xf9, 0xa8, 0xfd, 0x67, 0x57, 0x17, 0x20, 0x46, 0x43, 0x49, 0x07, 0xf0, 0x3e, 0xc8, 0xbe, 0x66, 0xaf, 0x58, 0x3a, 0xbd, 0xd8, 0x00 },
-      { 0x35, 0xf5, 0xc8, 0x2c, 0x0e, 0x4b, 0x56, 0xe0, 0xef, 0x08, 0x34, 0x38, 0x57, 0xe9, 0xde, 0xdb, 0x1d, 0xe1, 0x28, 0x05, 0x01, 0xed, 0x62, 0x3d, 0xa9, 0x6e, 0xea, 0x5b, 0x95, 0x09, 0xe0, 0x04,
-        0x46, 0xff, 0xdc, 0x34, 0xf6, 0xf7, 0x63, 0xb1, 0x76, 0xb8, 0x3c, 0x03, 0xef, 0x36, 0x0f, 0x82, 0x1b, 0x5b, 0x6f, 0xe2, 0x86, 0xd9, 0x10, 0x01, 0xe6, 0x73, 0x75, 0x0d, 0x50, 0x30, 0x11, 0x68 },
-      { 0x27, 0xb6, 0x3b, 0x78, 0x79, 0xf3, 0x22, 0x78, 0x8f, 0x0c, 0x14, 0x8b, 0x3f, 0x68, 0xc2, 0xab, 0x9f, 0x9f, 0x05, 0x70, 0x7e, 0xee, 0x4b, 0x1b, 0x6b, 0xfc, 0x04, 0x72, 0xca, 0xf1, 0x9a, 0xba,
-        0xe3, 0x65, 0x9d, 0xdb, 0x01, 0x33, 0xc5, 0xdb, 0xf6, 0x87, 0xe4, 0x73, 0x5a, 0x0f, 0x94, 0xa9, 0x2e, 0xfe, 0x8f, 0x3e, 0xd1, 0x0a, 0x6d, 0xa1, 0x21, 0x2a, 0x92, 0x8c, 0x4b, 0x43, 0x13, 0x2f },
-      { 0xa3, 0xa8, 0x3b, 0xb4, 0x4f, 0x8a, 0xac, 0xab, 0x8a, 0x4c, 0x39, 0x7e, 0xb8, 0x2f, 0xb1, 0x01, 0x2e, 0xbe, 0x0e, 0x7d, 0x28, 0x8a, 0x18, 0x4a, 0xda, 0x58, 0x1a, 0xfb, 0x95, 0x97, 0xf3, 0x63,
-        0x58, 0xbe, 0x8c, 0x30, 0x13, 0x9b, 0xba, 0x9f, 0x4e, 0xac, 0x8d, 0x95, 0xf2, 0x07, 0xbb, 0x85, 0xa1, 0x41, 0x4c, 0x33, 0xe3, 0x58, 0x8e, 0x5c, 0xa1, 0x05, 0x45, 0xab, 0x5c, 0x0c, 0xe4, 0x02,
-        0xc3, 0xa0, 0xa0, 0x72, 0xdb, 0x9a, 0x9d, 0xbf, 0x13, 0x29, 0x94, 0x70, 0x8b, 0xe4, 0xe8, 0xdb, 0x0e, 0x0b, 0xd0, 0xa0, 0x25, 0xad, 0x71, 0xa0, 0x27, 0x9c, 0x1d, 0x77, 0xb0, 0x98, 0xa8, 0x03 },
-      { 0xe1, 0x84, 0xa5, 0xea, 0xa5, 0xd8, 0x1b, 0x29, 0xce, 0xd7, 0xa3, 0x72, 0xa7, 0xc9, 0xa5, 0xea, 0xf1, 0x02, 0xf3, 0x0c, 0xb0, 0x65, 0x12, 0xbc, 0xa4, 0xf2, 0x5d, 0x69, 0x00, 0xa4, 0x7f, 0x5a,
-        0x52, 0x09, 0xb6, 0x7b, 0x30, 0xf2, 0x99, 0x03, 0x39, 0x9d, 0xee, 0x6f, 0xb5, 0xf7, 0x9e, 0x7a, 0x97, 0x8b, 0x81, 0x03, 0x8c, 0xdd, 0x35, 0xfc, 0x1f, 0x0a, 0xc6, 0xa4, 0x60, 0x7b, 0xc8, 0x0a,
-        0xc3, 0xa0, 0xa0, 0x72, 0xdb, 0x9a, 0x9d, 0xbf, 0x13, 0x29, 0x94, 0x70, 0x8b, 0xe4, 0xe8, 0xdb, 0x0e, 0x0b, 0xd0, 0xa0, 0x25, 0xad, 0x71, 0xa0, 0x27, 0x9c, 0x1d, 0x77, 0xb0, 0x98, 0xa8, 0x03 } },
-    { { 0x67, 0xe9, 0x62, 0x76, 0x3a, 0x90, 0x9b, 0x6b, 0x19, 0x1d, 0x65, 0xb2, 0x2a, 0x2f, 0xf7, 0x50, 0xaa, 0x54, 0xa5, 0xbb, 0x53, 0xb5, 0xf9, 0xee, 0x0c, 0x04, 0x3a, 0x3c, 0x29, 0x4b, 0x66, 0x3e,
-        0x7b, 0xb6, 0xaa, 0xd2, 0x10, 0x89, 0xcc, 0x89, 0x2c, 0x47, 0xbe, 0x23, 0xd6, 0x52, 0x81, 0x5d, 0xc8, 0xbc, 0x49, 0xd6, 0x6a, 0xcd, 0x62, 0x99, 0x30, 0xff, 0x16, 0xa5, 0x50, 0x44, 0xd8, 0x7a },
-      { 0xd6, 0xcd, 0xfe, 0xd4, 0x44, 0x4a, 0x9e, 0x90, 0x44, 0x73, 0x8a, 0xff, 0xbb, 0x82, 0x08, 0xb6, 0x7f, 0xf2, 0x87, 0xcb, 0xa5, 0x0b, 0x56, 0xd3, 0x9e, 0x91, 0xb8, 0x52, 0x6b, 0x25, 0xa6, 0x5d,
-        0x50, 0xaf, 0x9b, 0xd5, 0xfb, 0x9f, 0x7e, 0x2d, 0x57, 0xdf, 0x30, 0x78, 0x8d, 0x1a, 0xc3, 0xac, 0x9c, 0x5a, 0xbf, 0xab, 0x5a, 0x0d, 0xc9, 0xb6, 0x4b, 0x18, 0xd4, 0xe7, 0x55, 0x40, 0xde, 0x7e },
-      { 0xc2, 0xa9, 0x7e, 0x5c, 0x26, 0xf4, 0x7d, 0xce, 0x9e, 0x73, 0xae, 0x50, 0xde, 0xe7, 0xa6, 0xf9, 0x8b, 0x57, 0xf9, 0x7a, 0x4c, 0x38, 0x82, 0xf6, 0x30, 0x80, 0x12, 0xf7, 0xf6, 0x66, 0x80, 0x46,
-        0x4d, 0x41, 0x53, 0x63, 0xd9, 0x65, 0x90, 0xe7, 0xee, 0x24, 0x07, 0xb0, 0x4f, 0xeb, 0x3e, 0x8e, 0x83, 0x21, 0xa3, 0x40, 0x03, 0xc0, 0x64, 0x52, 0xc6, 0xb2, 0x12, 0x9d, 0x8d, 0x86, 0xdd, 0x19 },
-      { 0xe2, 0xd5, 0x49, 0x5e, 0x2a, 0x6e, 0x4e, 0xd9, 0x31, 0x26, 0x53, 0x13, 0x98, 0x5e, 0x2f, 0x23, 0xea, 0xa0, 0x30, 0xee, 0xef, 0x62, 0x2b, 0xdc, 0x93, 0x65, 0x90, 0xad, 0x9a, 0xf1, 0x74, 0x12,
-        0xf5, 0x24, 0x33, 0xcc, 0xc3, 0xda, 0x42, 0x54, 0xa6, 0x6c, 0x86, 0x99, 0xb9, 0xb5, 0xf7, 0x07, 0x90, 0xd8, 0x85, 0x7f, 0x69, 0xfb, 0x19, 0x2a, 0x2c, 0xc0, 0x11, 0x81, 0x64, 0x37, 0x38, 0x07 },
-      { 0xc7, 0xb3, 0xf5, 0xe4, 0x4b, 0x55, 0xcf, 0xd8, 0x2b, 0x72, 0xde, 0x62, 0xfc, 0x66, 0xea, 0x82, 0xee, 0x2e, 0xe5, 0x4f, 0x66, 0xba, 0x19, 0x63, 0x01, 0x0b, 0x2d, 0x89, 0xb4, 0xaa, 0x76, 0xb3,
-        0x7e, 0xc5, 0xbe, 0xdd, 0x57, 0x90, 0x5e, 0xff, 0x5b, 0x9a, 0x71, 0xe1, 0x47, 0xf9, 0xec, 0xe5, 0xf0, 0x19, 0x89, 0x17, 0x65, 0x3e, 0x56, 0x4a, 0x98, 0xb2, 0x3c, 0x3b, 0xf0, 0x14, 0x13, 0x1b },
-      { 0xc0, 0x72, 0x26, 0x96, 0x6b, 0xf5, 0x50, 0xa1, 0x65, 0xcd, 0xfe, 0x92, 0xa5, 0x5a, 0xb3, 0x56, 0x27, 0x5b, 0x2f, 0x4a, 0x8f, 0x67, 0xaa, 0xf4, 0xa1, 0x6e, 0x3c, 0x66, 0xcc, 0xb7, 0x71, 0x70,
-        0xff, 0x70, 0x1f, 0x9e, 0x09, 0xae, 0x31, 0xcb, 0x2a, 0xd5, 0x8a, 0x38, 0xa9, 0xaf, 0xbc, 0x94, 0xa2, 0xa8, 0xe9, 0x77, 0x1c, 0xc3, 0xfa, 0xd1, 0x45, 0xd2, 0xe2, 0xff, 0x7d, 0xf2, 0x44, 0x00,
-        0xa0, 0xc3, 0xc1, 0xdd, 0xa0, 0x4c, 0xfb, 0xed, 0x1a, 0xbd, 0x0c, 0x05, 0x3b, 0xa9, 0xc8, 0x98, 0xb0, 0x7d, 0x6a, 0x77, 0xcb, 0x08, 0x70, 0x64, 0x31, 0x9d, 0x9c, 0x7b, 0x40, 0x9e, 0xbb, 0xf4 },
-      { 0xbc, 0x88, 0x9d, 0x36, 0xae, 0xbc, 0x92, 0x47, 0x63, 0x85, 0x41, 0xe3, 0x1e, 0x1c, 0x39, 0xf5, 0xd3, 0xc2, 0x0a, 0x7d, 0x18, 0x7a, 0x8f, 0xd3, 0x0c, 0x37, 0x50, 0x28, 0x35, 0x93, 0x77, 0x4b,
-        0xcb, 0xba, 0x35, 0x4e, 0x94, 0x48, 0xe4, 0x0c, 0xa7, 0x36, 0x4f, 0x74, 0x2b, 0xf9, 0xb5, 0xb5, 0xeb, 0x91, 0x50, 0x3c, 0x67, 0x9b, 0x4d, 0x25, 0xd4, 0x0e, 0x0d, 0xb9, 0x5b, 0x77, 0xf3, 0x0e,
-        0xa0, 0xc3, 0xc1, 0xdd, 0xa0, 0x4c, 0xfb, 0xed, 0x1a, 0xbd, 0x0c, 0x05, 0x3b, 0xa9, 0xc8, 0x98, 0xb0, 0x7d, 0x6a, 0x77, 0xcb, 0x08, 0x70, 0x64, 0x31, 0x9d, 0x9c, 0x7b, 0x40, 0x9e, 0xbb, 0xf4 } },
-    { { 0x44, 0xdd, 0x62, 0x9e, 0x0f, 0xee, 0x20, 0x11, 0x37, 0xfc, 0xd0, 0x5c, 0xe4, 0xe1, 0x0a, 0xb8, 0xc2, 0xe0, 0x9c, 0x2c, 0x3e, 0x1b, 0x31, 0x1c, 0xdb, 0xa3, 0x84, 0x9a, 0xb7, 0x4e, 0x40, 0x74,
-        0x21, 0xfd, 0xfc, 0x65, 0xbd, 0x38, 0x8a, 0x55, 0x6f, 0x1e, 0xc3, 0x14, 0xfc, 0x66, 0x04, 0x7b, 0xc4, 0x61, 0xb0, 0xcb, 0xfa, 0xdd, 0x50, 0x45, 0x4b, 0x2e, 0xf0, 0x6d, 0x0f, 0x26, 0x6d, 0xbf },
-      { 0xe6, 0xbc, 0x35, 0x73, 0xb3, 0x11, 0x38, 0xc6, 0x31, 0x82, 0x96, 0x80, 0x1d, 0xa9, 0xd9, 0x17, 0x85, 0x4e, 0xad, 0x0f, 0x5c, 0xb7, 0xe8, 0x78, 0x62, 0x2f, 0x3c, 0x10, 0x0e, 0xdc, 0xf2, 0x7e,
-        0xf5, 0x02, 0x6d, 0x1a, 0x50, 0xc2, 0x50, 0x7d, 0x0d, 0x14, 0x77, 0x77, 0xfc, 0xbe, 0x23, 0x02, 0x81, 0x0a, 0xdc, 0xa3, 0x16, 0xfd, 0xab, 0xb9, 0x7c, 0xb6, 0x7e, 0x8a, 0xde, 0x1f, 0x22, 0xeb },
-      { 0xab, 0xf3, 0xea, 0x63, 0xc0, 0x25, 0xa2, 0xc7, 0x6a, 0xfe, 0x91, 0x4a, 0x0a, 0x91, 0xdd, 0x6d, 0x6f, 0x8c, 0xf9, 0xa8, 0x1c, 0x9f, 0xb5, 0xe5, 0xd2, 0xac, 0xe6, 0x51, 0x9a, 0xd3, 0x87, 0x17,
-        0x82, 0x12, 0x0a, 0x58, 0x99, 0x7f, 0x81, 0x2d, 0x8d, 0x27, 0x2d, 0x1b, 0xb0, 0x02, 0x7e, 0x0d, 0xd6, 0x18, 0x89, 0x5e, 0x0c, 0x2b, 0x57, 0xa6, 0x56, 0x35, 0xff, 0x71, 0x4e, 0xb0, 0x49, 0x38 },
-      { 0x36, 0xdf, 0x1d, 0x1c, 0xf6, 0xa7, 0x4d, 0x87, 0x7e, 0x2c, 0x3f, 0xb4, 0xda, 0xd7, 0x80, 0x71, 0x0b, 0xf3, 0x2a, 0x47, 0x20, 0xe6, 0x9a, 0x3d, 0x17, 0x9a, 0x97, 0xc9, 0x4e, 0x53, 0xa6, 0xe2,
-        0x23, 0xea, 0x94, 0x4d, 0xf9, 0xeb, 0x2c, 0x03, 0x2c, 0x88, 0xa2, 0xe6, 0xc5, 0x94, 0xa5, 0x6f, 0xc3, 0x98, 0xa9, 0x8b, 0xa7, 0x41, 0x7d, 0xd3, 0x82, 0x01, 0x13, 0xb6, 0x0f, 0x39, 0x1e, 0xd2 },
-      { 0x08, 0x28, 0xc3, 0x1c, 0xec, 0x21, 0x3a, 0xb4, 0x4c, 0xb1, 0xfa, 0xb9, 0x0c, 0xfe, 0xc2, 0x50, 0xc5, 0x99, 0x62, 0xa0, 0x11, 0x74, 0xcf, 0x05, 0x1e, 0x2b, 0xdf, 0x6d, 0x22, 0x8e, 0x6e, 0x55,
-        0x19, 0x21, 0x9c, 0xa1, 0x98, 0x56, 0x45, 0x90, 0x40, 0x3a, 0x8e, 0xad, 0x76, 0x4d, 0xd3, 0x95, 0x27, 0x67, 0x4e, 0x02, 0x16, 0xc3, 0xfe, 0x5a, 0x79, 0x4e, 0x2d, 0x6f, 0xd0, 0xe4, 0x4f, 0x62 },
-      { 0x40, 0x14, 0xe1, 0x88, 0x3d, 0xcc, 0x51, 0xcb, 0x98, 0x86, 0x06, 0x4d, 0xe4, 0x52, 0x71, 0xe2, 0x2e, 0x2b, 0x80, 0xfd, 0x81, 0x65, 0xaf, 0x93, 0x31, 0x87, 0xe0, 0xff, 0x31, 0xab, 0xff, 0x53,
-        0x0e, 0x2d, 0xb1, 0x47, 0xe6, 0x44, 0xb7, 0x29, 0xab, 0x0f, 0x51, 0x3a, 0x53, 0x84, 0x36, 0x58, 0x8c, 0x5f, 0x7b, 0x65, 0x6a, 0xb7, 0x6f, 0xdc, 0xad, 0xc1, 0xa3, 0xe4, 0x21, 0xfc, 0x22, 0x0e,
-        0xc1, 0x10, 0xd1, 0x7d, 0x9f, 0xd3, 0x1e, 0x33, 0xb4, 0xca, 0xb9, 0xff, 0xd8, 0x27, 0xb8, 0xca, 0xde, 0x49, 0x6f, 0xdc, 0xf0, 0xe8, 0x70, 0x36, 0xdb, 0x90, 0x00, 0x07, 0x9e, 0x77, 0x39, 0xfe },
-      { 0xc9, 0x93, 0x4b, 0xe6, 0x47, 0x7e, 0x1d, 0x86, 0x15, 0x46, 0xe8, 0x27, 0xf5, 0x84, 0x67, 0x4e, 0x42, 0xe3, 0x2b, 0x8a, 0x4e, 0x90, 0x7b, 0x87, 0xcc, 0xdf, 0xaa, 0x04, 0x06, 0x05, 0xe6, 0x72,
-        0xff, 0x6f, 0x44, 0x1b, 0x08, 0xad, 0x79, 0x3e, 0xb7, 0xdd, 0xd7, 0x2c, 0x73, 0xf0, 0xf0, 0xc4, 0x6e, 0xb7, 0x37, 0xe1, 0x02, 0xf5, 0x42, 0xe7, 0xef, 0xa1, 0xdd, 0x50, 0x9a, 0xc5, 0x8d, 0x00,
-        0xc1, 0x10, 0xd1, 0x7d, 0x9f, 0xd3, 0x1e, 0x33, 0xb4, 0xca, 0xb9, 0xff, 0xd8, 0x27, 0xb8, 0xca, 0xde, 0x49, 0x6f, 0xdc, 0xf0, 0xe8, 0x70, 0x36, 0xdb, 0x90, 0x00, 0x07, 0x9e, 0x77, 0x39, 0xfe } },
-    { { 0x3e, 0x0c, 0x21, 0xc4, 0x3d, 0x64, 0x61, 0xc1, 0x9d, 0xa1, 0x83, 0x10, 0x74, 0x1d, 0x56, 0x12, 0xaf, 0x29, 0x5c, 0x6c, 0x12, 0x48, 0x0a, 0xc7, 0xe5, 0x12, 0xb6, 0x42, 0x6b, 0x54, 0xf4, 0x42,
-        0x0c, 0x43, 0x42, 0x2e, 0x78, 0xc2, 0xe7, 0x26, 0x09, 0x41, 0x4a, 0x2f, 0xa1, 0xb0, 0x1f, 0xcd, 0x63, 0x76, 0x1e, 0xa1, 0x6f, 0xf6, 0xe2, 0xc2, 0x08, 0x89, 0x0d, 0x28, 0xbf, 0x1b, 0x56, 0x5b },
-      { 0x3e, 0x2e, 0xf2, 0xcc, 0x81, 0xca, 0xa7, 0x5d, 0x01, 0xd2, 0x82, 0xfd, 0x45, 0xee, 0xc0, 0xf5, 0x49, 0x3b, 0xe2, 0xa4, 0x2a, 0x4d, 0x5f, 0x40, 0x0d, 0xbc, 0xb9, 0x3d, 0x6e, 0xda, 0xe2, 0x86,
-        0xe1, 0x23, 0x8b, 0x5f, 0x0d, 0xa2, 0x35, 0x15, 0x1d, 0x22, 0x23, 0xa5, 0x69, 0x56, 0x34, 0x78, 0xb3, 0xb3, 0x55, 0xef, 0x63, 0x8a, 0x17, 0x63, 0xda, 0xf0, 0x64, 0x99, 0x8a, 0x8a, 0xba, 0xd6 },
-      { 0x68, 0x79, 0x36, 0xa7, 0x6b, 0xe3, 0x76, 0x1c, 0xe3, 0x38, 0x0b, 0xa3, 0x91, 0xb6, 0xb0, 0x82, 0x37, 0xfa, 0x52, 0x74, 0xf1, 0xb5, 0xd5, 0xd9, 0x07, 0x06, 0x9e, 0xda, 0x87, 0x6b, 0x0f, 0x24,
-        0x4f, 0xbe, 0xc9, 0xff, 0x03, 0x41, 0xaf, 0x77, 0x68, 0xed, 0xe7, 0x71, 0xba, 0x2d, 0xde, 0x27, 0xa1, 0xbf, 0xa8, 0xa7, 0x30, 0x7c, 0xcb, 0x79, 0x72, 0x89, 0x1a, 0xdc, 0xc1, 0xe4, 0xb2, 0x9d },
-      { 0x94, 0xa3, 0x11, 0xf4, 0x44, 0x80, 0xd0, 0xa3, 0x47, 0x93, 0x36, 0xe2, 0xbd, 0x04, 0xe4, 0x74, 0x3d, 0x00, 0x60, 0xad, 0xd0, 0x2d, 0x86, 0x66, 0xa1, 0x72, 0x1a, 0xb9, 0x1c, 0x14, 0xa2, 0x9b,
-        0x4b, 0x04, 0x7d, 0x5b, 0xcd, 0xf8, 0x01, 0x33, 0xde, 0x34, 0x10, 0x29, 0xc4, 0x72, 0x56, 0xff, 0x11, 0xcd, 0xd8, 0x61, 0x2c, 0xb6, 0xb7, 0xf4, 0x24, 0x8b, 0x44, 0xb4, 0xe7, 0x34, 0x50, 0xb8 },
-      { 0x72, 0xf6, 0xd4, 0xa3, 0x24, 0xf9, 0xef, 0xf4, 0x55, 0x8d, 0x3c, 0x07, 0xca, 0x10, 0xdd, 0x54, 0x87, 0x13, 0x32, 0x78, 0x5c, 0x64, 0x10, 0x08, 0x62, 0x7e, 0xf4, 0x34, 0x0f, 0x1c, 0xcd, 0xcc,
-        0x3b, 0x42, 0xfe, 0x60, 0x41, 0x70, 0x2c, 0x6b, 0xd4, 0x6c, 0xf7, 0xb8, 0x24, 0xf6, 0xd7, 0x07, 0xb3, 0x46, 0xb0, 0x7d, 0x14, 0x24, 0x9b, 0x72, 0x79, 0xf4, 0x23, 0x2a, 0xec, 0x02, 0xe7, 0x69 },
-      { 0xe5, 0xbe, 0x84, 0xc3, 0x92, 0x47, 0x15, 0xd3, 0xac, 0x06, 0x44, 0x72, 0x41, 0xeb, 0xb6, 0x5a, 0x17, 0x06, 0x90, 0xd9, 0x55, 0x3d, 0xe4, 0x87, 0x7d, 0x5a, 0x11, 0x9f, 0x02, 0x6d, 0xd3, 0x4e,
-        0x71, 0xd1, 0x5e, 0x16, 0x9f, 0xb2, 0xc0, 0x7f, 0xcb, 0x78, 0x8b, 0x89, 0x11, 0xae, 0x43, 0xe8, 0x85, 0xb7, 0xf9, 0xc8, 0x48, 0x5a, 0xb2, 0x96, 0xaf, 0x8f, 0xab, 0x71, 0x84, 0x9d, 0x40, 0x09,
-        0x30, 0xd4, 0x32, 0x6e, 0xa2, 0x77, 0x97, 0x71, 0x37, 0xce, 0x22, 0x6b, 0xca, 0xc9, 0x79, 0xef, 0xc0, 0xb2, 0xb4, 0x3d, 0x30, 0xbf, 0x77, 0xe9, 0xc3, 0x8d, 0xec, 0x15, 0x04, 0x08, 0xfa, 0x15 },
-      { 0x4b, 0xf3, 0x7f, 0xb2, 0x78, 0x75, 0x45, 0xd4, 0xce, 0x5e, 0x3d, 0xaf, 0x92, 0x63, 0x3d, 0x90, 0xc0, 0xa7, 0x23, 0x62, 0x7f, 0x37, 0x58, 0x8d, 0x12, 0xe0, 0xb8, 0x6c, 0x46, 0x38, 0xaa, 0xf7,
-        0xe1, 0x03, 0x9e, 0x1f, 0x31, 0xf9, 0x5a, 0xa4, 0x59, 0x0d, 0xec, 0xc5, 0x1f, 0x17, 0x88, 0x25, 0xcc, 0xed, 0x69, 0x2b, 0x91, 0x73, 0x6a, 0x3f, 0xcb, 0xe5, 0x9c, 0x1e, 0x26, 0x3e, 0xec, 0x0b,
-        0x30, 0xd4, 0x32, 0x6e, 0xa2, 0x77, 0x97, 0x71, 0x37, 0xce, 0x22, 0x6b, 0xca, 0xc9, 0x79, 0xef, 0xc0, 0xb2, 0xb4, 0x3d, 0x30, 0xbf, 0x77, 0xe9, 0xc3, 0x8d, 0xec, 0x15, 0x04, 0x08, 0xfa, 0x15 } },
-    { { 0xc5, 0x1d, 0xcd, 0x70, 0xb2, 0x9e, 0x53, 0x29, 0x05, 0x78, 0x83, 0x5d, 0x56, 0x30, 0x89, 0xee, 0x02, 0xd7, 0xac, 0x57, 0x0a, 0xd2, 0xa0, 0x9c, 0x96, 0x0c, 0xbf, 0xf2, 0x30, 0xbf, 0x1a, 0x2b,
-        0xee, 0x0e, 0x9f, 0x1e, 0x1c, 0x65, 0x7d, 0xb5, 0x48, 0xad, 0x6f, 0x51, 0xa0, 0x91, 0x61, 0xe4, 0xe6, 0x83, 0x9f, 0x58, 0x7c, 0x76, 0x2b, 0x52, 0x94, 0x87, 0x3c, 0x8d, 0x36, 0x4c, 0x37, 0x3c },
-      { 0x59, 0x3b, 0x0d, 0x38, 0xab, 0x93, 0xca, 0xfb, 0x67, 0x44, 0x30, 0x96, 0xec, 0xbd, 0x00, 0x1d, 0x93, 0xd0, 0xb3, 0x3d, 0x3c, 0xd4, 0x4e, 0x3d, 0xd8, 0x29, 0x93, 0xb2, 0xb3, 0x77, 0xfc, 0x57,
-        0x31, 0x20, 0xe3, 0x90, 0x0d, 0xf4, 0x91, 0x2f, 0x8b, 0x43, 0xce, 0xfe, 0x99, 0x03, 0x03, 0xa2, 0x90, 0x8d, 0xcf, 0xa8, 0xc0, 0x21, 0x00, 0xca, 0xcc, 0xcb, 0x4b, 0x2f, 0xa5, 0x39, 0xa8, 0x0b },
-      { 0xca, 0xf6, 0xf9, 0xbb, 0x53, 0xcb, 0x97, 0x76, 0xb6, 0x9c, 0x2c, 0x18, 0x21, 0x43, 0x13, 0x48, 0x13, 0xc9, 0x0e, 0xeb, 0x40, 0xea, 0xce, 0x1f, 0x3a, 0xe9, 0xd2, 0x9e, 0x29, 0xdb, 0xe2, 0x79,
-        0xe2, 0x1a, 0x9f, 0x84, 0x9d, 0xe4, 0x55, 0x82, 0x17, 0xeb, 0x87, 0xf6, 0xc3, 0xef, 0xcd, 0x54, 0x14, 0xee, 0xc8, 0x5b, 0xd7, 0x67, 0x05, 0xe2, 0x34, 0xa2, 0x7e, 0x81, 0x83, 0x21, 0x7a, 0x02 },
-      { 0xc5, 0x03, 0xd9, 0x75, 0xdf, 0x17, 0x15, 0xe3, 0x5b, 0x7b, 0x4f, 0x66, 0x9c, 0x15, 0x4e, 0x01, 0xdf, 0x3d, 0x16, 0xb6, 0x52, 0xcc, 0xcf, 0x28, 0x40, 0xdb, 0x20, 0xee, 0x8b, 0x69, 0xb1, 0x2b,
-        0xc0, 0x6e, 0xe4, 0xd2, 0xf5, 0xd1, 0x49, 0x3f, 0xf3, 0x0a, 0x12, 0xcd, 0x13, 0xbd, 0x9d, 0x3d, 0x5b, 0x28, 0x5c, 0xb0, 0x0d, 0x0e, 0xb6, 0xed, 0xec, 0x65, 0xeb, 0x25, 0x28, 0x2e, 0x65, 0x2f },
-      { 0xed, 0xa7, 0x05, 0xc1, 0xa6, 0x81, 0xf2, 0x7a, 0x69, 0x68, 0x17, 0x8e, 0xf7, 0xc9, 0x14, 0x80, 0x9f, 0x81, 0xfe, 0x16, 0xfd, 0x81, 0x93, 0xb4, 0x0b, 0x05, 0x5b, 0x4e, 0xef, 0x6e, 0x7a, 0x67,
-        0x9d, 0x99, 0x4c, 0x17, 0xcd, 0x1c, 0x16, 0xfd, 0x31, 0x35, 0xd5, 0x3e, 0xa3, 0x00, 0xbf, 0xbe, 0xda, 0xd6, 0xe2, 0x37, 0x9b, 0x13, 0x1b, 0xca, 0x29, 0x90, 0x4b, 0xf2, 0x09, 0x57, 0x2f, 0xe9 },
-      { 0xd7, 0xba, 0x23, 0xd3, 0xa0, 0x6e, 0x14, 0x6a, 0xf0, 0x77, 0xb7, 0xe6, 0xe3, 0xc9, 0x3b, 0x38, 0xbb, 0xe7, 0xbe, 0x54, 0x75, 0xf8, 0xb7, 0x42, 0x29, 0xe2, 0x83, 0xde, 0x20, 0x22, 0x41, 0xcf,
-        0x5f, 0x6f, 0x80, 0x60, 0xf3, 0x44, 0x04, 0x21, 0xd5, 0x03, 0x68, 0x42, 0xde, 0x81, 0xea, 0xe8, 0x7e, 0x5b, 0x80, 0x0f, 0x1b, 0x2d, 0x06, 0xc7, 0xce, 0xe9, 0x46, 0xc7, 0xf7, 0xb3, 0xa2, 0x02,
-        0x21, 0xb5, 0x4d, 0xc2, 0x36, 0xea, 0xe6, 0x7b, 0xb3, 0x61, 0xe6, 0x18, 0x40, 0x5b, 0xce, 0x5b, 0xc2, 0xee, 0xa5, 0xde, 0xe9, 0xe6, 0xe0, 0xa8, 0x58, 0x58, 0x03, 0x34, 0x26, 0x27, 0x65, 0x2a },
-      { 0xfa, 0x43, 0xa6, 0xc4, 0x32, 0xa1, 0x2f, 0xb6, 0x37, 0x05, 0xf4, 0xa4, 0xa7, 0x36, 0xdd, 0x1c, 0x45, 0x10, 0x95, 0x83, 0x67, 0x89, 0x79, 0x18, 0x34, 0xad, 0xe7, 0x57, 0x7f, 0x0d, 0x48, 0x9b,
-        0x14, 0xdf, 0x5f, 0xc8, 0xd7, 0x0f, 0x78, 0x47, 0x88, 0x20, 0xff, 0x7f, 0xb1, 0x21, 0x27, 0x14, 0x58, 0x32, 0x12, 0xfb, 0x97, 0xe0, 0x81, 0x0e, 0x92, 0xf4, 0x5c, 0x0e, 0x44, 0x48, 0x4e, 0x01,
-        0x21, 0xb5, 0x4d, 0xc2, 0x36, 0xea, 0xe6, 0x7b, 0xb3, 0x61, 0xe6, 0x18, 0x40, 0x5b, 0xce, 0x5b, 0xc2, 0xee, 0xa5, 0xde, 0xe9, 0xe6, 0xe0, 0xa8, 0x58, 0x58, 0x03, 0x34, 0x26, 0x27, 0x65, 0x2a } },
-    { { 0x1e, 0x89, 0x12, 0xe8, 0xab, 0xca, 0xeb, 0x96, 0x78, 0x43, 0x89, 0x79, 0x26, 0x61, 0x86, 0x2e, 0x37, 0xd7, 0x94, 0xb5, 0xb9, 0xf7, 0xc9, 0xe7, 0x04, 0x6c, 0x96, 0x1c, 0x54, 0x0d, 0xb0, 0x6c,
-        0xd3, 0x68, 0x9b, 0x53, 0xa7, 0x56, 0x34, 0x1b, 0x65, 0xff, 0xf9, 0xee, 0xf1, 0xc6, 0xfd, 0x7e, 0xa8, 0x42, 0x59, 0x60, 0x06, 0x5f, 0xc2, 0x89, 0x8b, 0xfc, 0xf8, 0x6c, 0x9a, 0x0d, 0xb1, 0x36 },
-      { 0x52, 0x3d, 0x83, 0x25, 0x0f, 0x57, 0x81, 0x76, 0x7b, 0x21, 0xf7, 0x96, 0xd6, 0x1f, 0xfe, 0xd7, 0x7c, 0xc1, 0x32, 0xb5, 0xbc, 0x05, 0x46, 0xdb, 0x6f, 0x25, 0xd8, 0x7a, 0x68, 0xe2, 0x01, 0x81,
-        0xf8, 0x9a, 0xc5, 0x29, 0x78, 0x1c, 0x01, 0xc5, 0x4d, 0x61, 0x4e, 0x75, 0xdf, 0x9f, 0xc3, 0x22, 0x96, 0x7c, 0xf9, 0xa7, 0xed, 0x41, 0x6f, 0x64, 0xfd, 0xd4, 0x61, 0x58, 0x0d, 0x49, 0xc9, 0xa4 },
-      { 0x4a, 0xf7, 0xda, 0xef, 0xe0, 0x3b, 0x33, 0x19, 0x79, 0x02, 0x7a, 0xbb, 0xd3, 0x53, 0xf4, 0x8c, 0x8a, 0x16, 0xfb, 0xbd, 0x35, 0xd9, 0x70, 0xb2, 0x0a, 0x06, 0x05, 0x14, 0xd0, 0x9e, 0xf6, 0x13,
-        0x44, 0xbb, 0xb7, 0x93, 0x86, 0x1b, 0x3c, 0xb0, 0x54, 0xa7, 0x48, 0xc2, 0xa7, 0x10, 0xda, 0x65, 0xb2, 0xdb, 0x0f, 0x85, 0x23, 0x57, 0x77, 0x44, 0x23, 0x20, 0x6d, 0x2e, 0xde, 0x20, 0x01, 0xed },
-      { 0x9c, 0xb8, 0x68, 0xeb, 0xbb, 0x8b, 0xaf, 0x81, 0x9c, 0x2f, 0x90, 0x4c, 0xc2, 0x62, 0x17, 0xfc, 0xf2, 0xa5, 0xab, 0x4c, 0x2e, 0x69, 0xcb, 0x82, 0x5f, 0x4c, 0x3c, 0x82, 0xcd, 0x6a, 0xcb, 0x15,
-        0xa2, 0xfc, 0x50, 0x54, 0x5e, 0x2e, 0x83, 0x52, 0x48, 0x29, 0x51, 0xcc, 0x50, 0xaa, 0x27, 0xa3, 0xf3, 0x71, 0xdb, 0x2c, 0x1c, 0xa9, 0x8a, 0xa5, 0x95, 0xab, 0x3e, 0x6f, 0xcd, 0xba, 0x22, 0x7c },
-      { 0xf7, 0x5d, 0xb5, 0x20, 0x65, 0xfe, 0xa9, 0xe7, 0x1f, 0x8e, 0xd6, 0xc0, 0xf2, 0x3f, 0x1b, 0x8c, 0x7a, 0x02, 0x54, 0xd8, 0xa7, 0x0e, 0x6f, 0x68, 0x94, 0x81, 0xff, 0x30, 0x0e, 0x6d, 0x1a, 0x96,
-        0x1b, 0x86, 0x07, 0xaa, 0xbf, 0x37, 0xc5, 0x5e, 0x26, 0xa2, 0xdf, 0x0b, 0xd0, 0x7f, 0x94, 0x35, 0x30, 0xa4, 0x9e, 0x47, 0xaf, 0xad, 0x9c, 0xc9, 0x02, 0x21, 0x55, 0x94, 0x04, 0x13, 0xff, 0x64 },
-      { 0x9c, 0x8d, 0x18, 0x63, 0x83, 0xad, 0x01, 0xcc, 0xbb, 0xe6, 0x00, 0xda, 0x15, 0xce, 0xc6, 0x6e, 0x7a, 0x37, 0x6a, 0x81, 0x44, 0xb3, 0xfc, 0xb7, 0xcd, 0x05, 0xee, 0x4a, 0x6f, 0x29, 0xe4, 0x79,
-        0x63, 0x52, 0x7e, 0x14, 0xc9, 0x14, 0x77, 0xa8, 0x19, 0x94, 0x03, 0xc6, 0x51, 0x57, 0xf1, 0xcc, 0x11, 0x29, 0xde, 0x86, 0x08, 0xfe, 0x41, 0x02, 0x71, 0xb7, 0xbf, 0xd7, 0xe7, 0x83, 0x3e, 0x0c,
-        0x9a, 0x59, 0x7e, 0xe8, 0x61, 0x36, 0x56, 0x9a, 0xbf, 0x64, 0xfd, 0xf3, 0xb7, 0xb9, 0x2f, 0x9e, 0x56, 0x1f, 0x57, 0x45, 0x2e, 0x19, 0x0f, 0x6f, 0x70, 0x01, 0xc2, 0x48, 0x05, 0x23, 0x9b, 0x2f },
-      { 0xb5, 0x4e, 0xe7, 0xcc, 0x7b, 0x66, 0x7a, 0xf8, 0xec, 0xcd, 0x1b, 0x0c, 0x0f, 0xec, 0x04, 0x27, 0xa0, 0x61, 0xfd, 0x12, 0x2d, 0xab, 0xc9, 0xc5, 0x8e, 0xee, 0x36, 0xc2, 0xef, 0x67, 0xd5, 0x87,
-        0x95, 0x6c, 0x12, 0xb7, 0x12, 0x81, 0x55, 0xe0, 0x7b, 0xdb, 0x8f, 0x67, 0xea, 0x04, 0x55, 0x91, 0x9b, 0x50, 0x65, 0x05, 0xc1, 0xf1, 0x0b, 0x04, 0x91, 0x66, 0x3c, 0x32, 0x53, 0x72, 0x01, 0x04,
-        0x9a, 0x59, 0x7e, 0xe8, 0x61, 0x36, 0x56, 0x9a, 0xbf, 0x64, 0xfd, 0xf3, 0xb7, 0xb9, 0x2f, 0x9e, 0x56, 0x1f, 0x57, 0x45, 0x2e, 0x19, 0x0f, 0x6f, 0x70, 0x01, 0xc2, 0x48, 0x05, 0x23, 0x9b, 0x2f } },
-    { { 0xc8, 0x37, 0x10, 0xdc, 0xdb, 0xfc, 0x51, 0x91, 0xae, 0x37, 0xa4, 0xe0, 0xcf, 0xbb, 0xdd, 0x92, 0x93, 0x5f, 0x6b, 0xd6, 0x81, 0xbf, 0x9b, 0x24, 0x5e, 0x0d, 0xf1, 0xe4, 0x04, 0x89, 0xd1, 0x1b,
-        0xb2, 0x68, 0x56, 0x3a, 0xdc, 0x59, 0xd0, 0x8a, 0x93, 0x37, 0x5d, 0xa5, 0x40, 0x5e, 0xfe, 0xc9, 0x41, 0x0b, 0x8a, 0x50, 0xd2, 0xa0, 0x94, 0x86, 0xf7, 0x46, 0x3b, 0x7e, 0x1d, 0xea, 0x2b, 0xa8 },
-      { 0x1b, 0xe2, 0xe6, 0x48, 0x86, 0xa8, 0x65, 0xfd, 0x2b, 0xae, 0xc7, 0x7d, 0x41, 0xee, 0xb2, 0x80, 0x33, 0x1c, 0x0a, 0xdc, 0x42, 0xea, 0x99, 0xd0, 0x1f, 0x6d, 0xc8, 0x80, 0x51, 0x70, 0xd4, 0x19,
-        0xae, 0xfc, 0x66, 0x16, 0xa2, 0x53, 0x27, 0x19, 0x7a, 0xf2, 0x9a, 0x25, 0x0c, 0x39, 0x8c, 0xbf, 0xe7, 0xa3, 0x7a, 0xd6, 0xa3, 0x43, 0x62, 0xd2, 0x4a, 0xc2, 0xf1, 0x96, 0x7e, 0xe3, 0x83, 0x13 },
-      { 0xf5, 0xb1, 0x2a, 0xc5, 0x4d, 0xcc, 0xdf, 0x56, 0xde, 0x92, 0x96, 0x46, 0x03, 0x11, 0xfc, 0xa0, 0xbc, 0xa2, 0x22, 0xf7, 0x25, 0x74, 0x2a, 0x1f, 0x27, 0x34, 0x18, 0xe8, 0x06, 0xa4, 0x77, 0x26,
-        0x1a, 0x51, 0x5e, 0xfb, 0x77, 0xbc, 0x55, 0xb1, 0xf8, 0xa5, 0x19, 0x23, 0x00, 0x97, 0xf7, 0xbb, 0xe4, 0xcd, 0x41, 0x9e, 0xd9, 0x5e, 0x0c, 0x6b, 0x1b, 0x8a, 0xba, 0x52, 0x93, 0xbe, 0x2c, 0xf3 },
-      { 0xb3, 0x02, 0xeb, 0x44, 0x3c, 0x05, 0xae, 0x9c, 0x94, 0xa9, 0x1f, 0x72, 0x41, 0xbc, 0x81, 0x66, 0x5f, 0x50, 0xc0, 0x57, 0xb4, 0x44, 0xf0, 0xe1, 0x2a, 0xa9, 0x88, 0x69, 0xa6, 0x1c, 0x05, 0x85,
-        0xda, 0xc7, 0xb2, 0xe1, 0x8c, 0x2f, 0x7c, 0x49, 0x37, 0xa2, 0xf2, 0x56, 0xab, 0x12, 0x9f, 0x12, 0x4b, 0x1b, 0x73, 0x75, 0x3f, 0x30, 0x0f, 0x40, 0xf1, 0xf9, 0x1d, 0xa7, 0x2c, 0x98, 0x8c, 0x91 },
-      { 0xcb, 0xd3, 0x39, 0x60, 0x56, 0xe3, 0xbd, 0x65, 0x86, 0x1a, 0x58, 0x40, 0xc0, 0xa4, 0xc4, 0x8b, 0xe5, 0xf7, 0x49, 0x0a, 0xf2, 0x09, 0x51, 0x32, 0x6e, 0x06, 0x5a, 0x27, 0x19, 0x78, 0x2e, 0x3a,
-        0x04, 0xf9, 0x34, 0x80, 0x49, 0x39, 0x93, 0xcd, 0x89, 0x67, 0x7b, 0xc0, 0x8d, 0x9d, 0x8d, 0x4c, 0x83, 0x20, 0x80, 0xfc, 0x00, 0xf2, 0x8a, 0x8f, 0xa4, 0x4d, 0x8e, 0x8f, 0x58, 0x51, 0x5b, 0x71 },
-      { 0x71, 0x3f, 0x90, 0x41, 0xb8, 0x74, 0xbc, 0x7a, 0x85, 0xf5, 0xab, 0xca, 0x7e, 0xf2, 0x70, 0x41, 0xbc, 0x36, 0xb5, 0xc3, 0x4e, 0xf1, 0x2b, 0x17, 0x35, 0x40, 0xdb, 0x3c, 0xdb, 0xd2, 0xec, 0x0b,
-        0x99, 0xc1, 0x43, 0x17, 0xad, 0x38, 0x45, 0x2d, 0x07, 0x31, 0xd7, 0xb6, 0x95, 0x1c, 0x89, 0x25, 0xe4, 0x89, 0x97, 0xd3, 0xcf, 0x11, 0x2f, 0x63, 0x31, 0x51, 0xa2, 0x18, 0xfc, 0x12, 0x04, 0x0a,
-        0xb0, 0x33, 0xce, 0x0b, 0x57, 0xc0, 0x8c, 0x58, 0x25, 0xf8, 0x9b, 0x50, 0x22, 0x1c, 0x5c, 0x7b, 0x02, 0xc7, 0xed, 0xfc, 0x98, 0x8b, 0xbd, 0xd2, 0x4e, 0xfc, 0x78, 0x91, 0x7f, 0x4c, 0x99, 0x24 },
-      { 0xfc, 0x46, 0xe4, 0x85, 0x0c, 0x52, 0x14, 0xf8, 0x8a, 0xa4, 0x97, 0x17, 0x10, 0xb2, 0x93, 0xef, 0xa0, 0x66, 0x3c, 0xfd, 0x61, 0x42, 0x24, 0x30, 0x70, 0x4b, 0xfd, 0x0b, 0x86, 0xc8, 0x97, 0xd7,
-        0x04, 0xc2, 0xa6, 0x61, 0x41, 0xaf, 0xcc, 0x1d, 0x52, 0xc9, 0xf3, 0xca, 0xe1, 0x90, 0x7c, 0xbd, 0xce, 0xaf, 0x30, 0xc4, 0xb4, 0x7d, 0x81, 0x7e, 0xbd, 0xe2, 0x09, 0x70, 0x1e, 0x6b, 0xb9, 0x03,
-        0xb0, 0x33, 0xce, 0x0b, 0x57, 0xc0, 0x8c, 0x58, 0x25, 0xf8, 0x9b, 0x50, 0x22, 0x1c, 0x5c, 0x7b, 0x02, 0xc7, 0xed, 0xfc, 0x98, 0x8b, 0xbd, 0xd2, 0x4e, 0xfc, 0x78, 0x91, 0x7f, 0x4c, 0x99, 0x24 } },
-    { { 0x5f, 0x01, 0x6d, 0xec, 0x82, 0x02, 0x96, 0x47, 0x74, 0xd9, 0x73, 0x2e, 0x2e, 0x17, 0x00, 0xb6, 0xe0, 0xa4, 0x13, 0x17, 0xae, 0x7f, 0x85, 0xcb, 0xff, 0xe7, 0x96, 0x99, 0xdb, 0x9f, 0xad, 0x21,
-        0x60, 0xd9, 0x12, 0xdc, 0x41, 0x01, 0x33, 0x66, 0x4c, 0x24, 0x8b, 0x25, 0x17, 0xd7, 0x22, 0x14, 0x12, 0x4d, 0xad, 0x82, 0x9a, 0x85, 0x69, 0x5e, 0x35, 0x10, 0xe0, 0xd7, 0x1a, 0x82, 0x88, 0x14 },
-      { 0xab, 0x5f, 0x2c, 0x7d, 0xa2, 0xe5, 0x67, 0x5f, 0xe4, 0x92, 0x03, 0x93, 0xd7, 0x13, 0xa1, 0xfa, 0x4a, 0xb7, 0x18, 0x4a, 0x8e, 0x8c, 0x78, 0x9a, 0x0c, 0x60, 0x02, 0xe8, 0x2d, 0x50, 0x05, 0x0f,
-        0x92, 0xee, 0x9f, 0x81, 0xde, 0x6b, 0x20, 0xe4, 0x9b, 0x17, 0x2e, 0x99, 0x0f, 0x01, 0x31, 0xa7, 0xc5, 0xc4, 0x53, 0x70, 0xda, 0x03, 0xc6, 0xf7, 0x22, 0x87, 0x98, 0x87, 0x19, 0x36, 0xa6, 0x49 },
-      { 0x93, 0xab, 0x22, 0xc4, 0x39, 0x6c, 0x97, 0x80, 0xd2, 0xe2, 0x36, 0xfa, 0x31, 0x74, 0x67, 0xcc, 0x50, 0x1b, 0x95, 0xbe, 0x77, 0xe0, 0xd1, 0x00, 0x74, 0x04, 0xe1, 0x4d, 0xca, 0x44, 0x35, 0x72,
-        0x74, 0x69, 0x82, 0x23, 0x56, 0x9b, 0xcc, 0x34, 0x5a, 0xcb, 0xa2, 0xa3, 0x31, 0x12, 0x4a, 0x84, 0x4c, 0xe9, 0x37, 0x3a, 0x58, 0xf8, 0x79, 0x65, 0x4a, 0x66, 0x79, 0x82, 0xf4, 0x5d, 0x75, 0xc3 },
-      { 0x2d, 0x5d, 0xac, 0x4f, 0xb5, 0x00, 0x68, 0x3b, 0x5f, 0x2e, 0xdd, 0xcb, 0x14, 0x4a, 0x7f, 0xad, 0x12, 0x45, 0x91, 0xd1, 0x84, 0xd8, 0x14, 0xff, 0xcb, 0x64, 0x43, 0x6d, 0x65, 0xe7, 0x19, 0x68,
-        0x2b, 0x5e, 0x53, 0x05, 0x74, 0x66, 0xed, 0xac, 0x2f, 0x5a, 0x8f, 0x70, 0x96, 0xab, 0x29, 0xf3, 0x9a, 0x59, 0xa2, 0xe2, 0xef, 0xd3, 0xc9, 0xd7, 0x53, 0xf8, 0xf5, 0xa3, 0xd6, 0xf4, 0x34, 0xf8 },
-      { 0x1d, 0x14, 0xf3, 0xfd, 0xb0, 0x66, 0x20, 0xff, 0xfc, 0x79, 0x47, 0xc7, 0x4c, 0xe9, 0x45, 0x67, 0xf5, 0x97, 0x14, 0xea, 0x7c, 0x63, 0xc5, 0x3f, 0x0b, 0x46, 0xe0, 0x88, 0xd6, 0x9b, 0x67, 0x71,
-        0xba, 0xa6, 0x15, 0x28, 0x94, 0x54, 0x83, 0x68, 0x00, 0x3a, 0x33, 0xa6, 0x1a, 0x05, 0x6a, 0x68, 0x72, 0x98, 0x48, 0x71, 0xea, 0x5b, 0x47, 0xf5, 0x80, 0x46, 0xa9, 0x57, 0x84, 0xec, 0xad, 0xfc },
-      { 0xa3, 0x1d, 0x87, 0xd3, 0x28, 0x62, 0xc6, 0xf7, 0xdb, 0xfb, 0xfa, 0xfc, 0xf3, 0x27, 0x5c, 0x31, 0xd3, 0x32, 0x26, 0x0e, 0x0f, 0x41, 0x49, 0xec, 0x05, 0x16, 0xf7, 0xa5, 0x63, 0xb3, 0xbc, 0xe5,
-        0x0d, 0x1e, 0x6f, 0x97, 0x4f, 0x68, 0x40, 0xc0, 0xd4, 0x6c, 0x4f, 0x9e, 0x25, 0xd0, 0xab, 0x8d, 0x2a, 0xb9, 0x3e, 0x06, 0x4d, 0x9d, 0x3d, 0x2d, 0x79, 0x8d, 0x93, 0xdc, 0xfc, 0x6f, 0x0b, 0x04,
-        0x48, 0x7c, 0x19, 0x5c, 0xa9, 0xc8, 0x44, 0xe5, 0xf6, 0x4f, 0x51, 0xd8, 0x72, 0x63, 0x41, 0xda, 0x62, 0xac, 0x78, 0x73, 0xb3, 0x3e, 0xc8, 0xb2, 0xf1, 0x3f, 0x89, 0xf2, 0x0e, 0x95, 0xdf, 0xed },
-      { 0xfd, 0x69, 0xb1, 0x9a, 0xdb, 0xae, 0x95, 0x87, 0xe2, 0xc6, 0x8a, 0x97, 0x0c, 0xee, 0xc4, 0x22, 0x60, 0x4e, 0x96, 0xa9, 0x72, 0xb9, 0x6f, 0x86, 0x97, 0xa8, 0xdf, 0x83, 0xc5, 0x18, 0x18, 0x6e,
-        0xc9, 0x43, 0x30, 0x7e, 0x5b, 0xcf, 0x37, 0x0f, 0xc1, 0xd7, 0xe5, 0xab, 0xb1, 0x31, 0xe0, 0x97, 0xc7, 0x53, 0xb7, 0xfd, 0xd7, 0xdf, 0x00, 0x43, 0x0e, 0x41, 0x62, 0x80, 0x0b, 0xe3, 0xe0, 0x06,
-        0x48, 0x7c, 0x19, 0x5c, 0xa9, 0xc8, 0x44, 0xe5, 0xf6, 0x4f, 0x51, 0xd8, 0x72, 0x63, 0x41, 0xda, 0x62, 0xac, 0x78, 0x73, 0xb3, 0x3e, 0xc8, 0xb2, 0xf1, 0x3f, 0x89, 0xf2, 0x0e, 0x95, 0xdf, 0xed } },
-    { { 0x98, 0x29, 0xf7, 0x57, 0xfd, 0xbd, 0x44, 0x3f, 0xd9, 0x90, 0x98, 0x19, 0x97, 0xf2, 0x60, 0x27, 0xfd, 0x08, 0xfc, 0x8a, 0xc6, 0xaf, 0x87, 0x22, 0x7f, 0x74, 0x4a, 0x80, 0xaf, 0x72, 0x00, 0x01,
-        0x70, 0x9b, 0x47, 0x2a, 0xd2, 0x8e, 0x41, 0x0a, 0xea, 0x6a, 0xdf, 0xb7, 0x61, 0x54, 0x89, 0x5e, 0x01, 0x9f, 0x76, 0x64, 0x29, 0xee, 0x8d, 0x85, 0x20, 0xff, 0x30, 0x58, 0xc2, 0xa3, 0x2a, 0x56 },
-      { 0xea, 0x69, 0x8e, 0x6b, 0x8e, 0xdd, 0x55, 0x22, 0x45, 0x61, 0xd4, 0x92, 0x66, 0x8e, 0x96, 0xaf, 0x7e, 0x40, 0x28, 0x72, 0xc4, 0x46, 0xe7, 0x88, 0xd4, 0x6c, 0x74, 0xb7, 0x48, 0x7f, 0xe8, 0xe1,
-        0x5e, 0xa5, 0x85, 0x62, 0x8f, 0xd6, 0xfc, 0x27, 0x0a, 0xb2, 0x4b, 0x38, 0x94, 0x59, 0x52, 0x0d, 0x6a, 0x4d, 0xe5, 0x61, 0xce, 0x0d, 0x44, 0x03, 0xa6, 0x2a, 0xc2, 0xd4, 0xd4, 0xe2, 0x71, 0xe3 },
-      { 0x40, 0xf0, 0x82, 0xf0, 0x8d, 0xaa, 0xad, 0xa9, 0x9f, 0x9b, 0x85, 0x02, 0xcf, 0x57, 0x15, 0x41, 0x13, 0x59, 0xf2, 0xba, 0xdd, 0xbf, 0x93, 0xe5, 0x40, 0x2e, 0xaf, 0xdd, 0x43, 0x52, 0xc8, 0x7f,
-        0x40, 0xad, 0x91, 0x5b, 0x58, 0xd1, 0xa1, 0xe8, 0x6f, 0x77, 0xc3, 0x41, 0x35, 0x5e, 0xf7, 0x03, 0xba, 0xe4, 0xed, 0x2c, 0x28, 0x59, 0xd6, 0x48, 0xfe, 0x50, 0xcc, 0xf9, 0x80, 0xd1, 0x49, 0xd1 },
-      { 0xd7, 0xa5, 0xd9, 0x13, 0xdf, 0x7d, 0xf6, 0xc6, 0x25, 0x0f, 0x52, 0xc2, 0x57, 0x61, 0x20, 0xf2, 0xf0, 0xdb, 0x47, 0x49, 0x56, 0xaf, 0x89, 0x11, 0xa7, 0x8d, 0x09, 0x3a, 0xfe, 0x45, 0x43, 0xef,
-        0x9f, 0x0c, 0x42, 0xaf, 0xa8, 0xcc, 0x60, 0x48, 0xc0, 0x1c, 0x7c, 0xbe, 0x01, 0xe2, 0x88, 0xcc, 0x6c, 0x3e, 0x97, 0x91, 0xf3, 0xd9, 0xb2, 0xb2, 0x09, 0x7e, 0x35, 0xb1, 0x78, 0xb4, 0x03, 0xf6 },
-      { 0x08, 0xc4, 0x1a, 0x3a, 0xc3, 0xe3, 0x26, 0xbd, 0x8d, 0xee, 0x5d, 0xf0, 0xba, 0xb6, 0x65, 0xff, 0x77, 0xc0, 0x99, 0xd1, 0xca, 0xdc, 0xf5, 0x4b, 0x50, 0x50, 0x0a, 0x9e, 0x13, 0x33, 0x76, 0x86,
-        0x9b, 0x39, 0x79, 0x78, 0x73, 0x5c, 0x2f, 0x69, 0xa9, 0x9e, 0x0b, 0xeb, 0x11, 0x1e, 0x12, 0xaa, 0xc1, 0x09, 0x83, 0x0f, 0xca, 0xcb, 0x95, 0x10, 0xde, 0x85, 0xe3, 0x75, 0x62, 0x4a, 0xc2, 0x4c },
-      { 0x68, 0x78, 0x6c, 0xce, 0x2f, 0x72, 0x80, 0xfe, 0x83, 0x88, 0x63, 0x37, 0xa7, 0xa1, 0x5a, 0x0b, 0x84, 0x8a, 0xda, 0x28, 0x84, 0xf1, 0x6a, 0x63, 0x24, 0x1c, 0x72, 0xda, 0x84, 0xee, 0x1d, 0xe0,
-        0x77, 0xf0, 0xf6, 0xce, 0x7e, 0x79, 0x0a, 0x55, 0x03, 0x01, 0x13, 0x0f, 0xf7, 0x6b, 0x45, 0xe7, 0xcb, 0xfd, 0xb0, 0x37, 0x93, 0x4b, 0x40, 0x69, 0xe0, 0x77, 0x67, 0x72, 0x65, 0xee, 0x35, 0x08,
-        0x00, 0xc0, 0x07, 0x10, 0xd8, 0x6e, 0x55, 0x83, 0x5a, 0xbc, 0xfa, 0x67, 0x80, 0x8f, 0xfa, 0x21, 0x3e, 0x56, 0x53, 0x5b, 0xbc, 0x9d, 0xff, 0x16, 0xd9, 0x57, 0xcf, 0x2b, 0x78, 0x06, 0x5a, 0x89 },
-      { 0xdf, 0x32, 0x1a, 0x01, 0x84, 0xe5, 0xb8, 0x2c, 0x70, 0x6c, 0xeb, 0xd1, 0xf0, 0xb4, 0x9b, 0x32, 0xc8, 0xd0, 0x81, 0xc4, 0xea, 0xb2, 0x7c, 0x32, 0x1a, 0x02, 0x61, 0xf2, 0xd9, 0x4d, 0xe5, 0x85,
-        0xad, 0xfc, 0xc6, 0x70, 0xee, 0x85, 0x77, 0x07, 0x9b, 0x5d, 0x5f, 0x88, 0xef, 0xb6, 0xd8, 0xdf, 0x2b, 0xa2, 0x4d, 0x90, 0x11, 0x2d, 0x38, 0x3f, 0xa8, 0x84, 0xf0, 0x76, 0xdd, 0x31, 0xd0, 0x09,
-        0x00, 0xc0, 0x07, 0x10, 0xd8, 0x6e, 0x55, 0x83, 0x5a, 0xbc, 0xfa, 0x67, 0x80, 0x8f, 0xfa, 0x21, 0x3e, 0x56, 0x53, 0x5b, 0xbc, 0x9d, 0xff, 0x16, 0xd9, 0x57, 0xcf, 0x2b, 0x78, 0x06, 0x5a, 0x89 } },
-    { { 0x25, 0x87, 0x1e, 0x6f, 0xe8, 0xd0, 0xde, 0x1d, 0xd5, 0xf2, 0xd3, 0x5b, 0xff, 0x9e, 0x67, 0x99, 0x60, 0xb4, 0x0e, 0xb7, 0x98, 0x1b, 0x2a, 0x3a, 0x9c, 0xec, 0xc1, 0xe1, 0x2e, 0x2b, 0xc0, 0x3e,
-        0x3c, 0xfb, 0x64, 0x91, 0x72, 0xc6, 0x7e, 0x57, 0x47, 0x00, 0x97, 0xbf, 0x8e, 0x0e, 0xbf, 0xad, 0xd9, 0x28, 0x86, 0x7c, 0xfd, 0x41, 0x91, 0xae, 0x2d, 0xee, 0xc0, 0xb2, 0x32, 0x7d, 0x99, 0x7d },
-      { 0x63, 0xc1, 0xf9, 0x61, 0x9c, 0x9e, 0x1a, 0xd7, 0xca, 0xa3, 0x71, 0xd6, 0x34, 0x3d, 0xa7, 0x08, 0x36, 0x0c, 0xec, 0x37, 0x35, 0x94, 0x1a, 0x45, 0xa9, 0xfa, 0xf2, 0xb5, 0x25, 0x92, 0xbf, 0xd1,
-        0x1e, 0xca, 0xdd, 0x5a, 0x23, 0xad, 0x9e, 0x45, 0xc3, 0x66, 0xcb, 0x8f, 0xda, 0xa3, 0xd1, 0xe6, 0x27, 0x38, 0x11, 0x54, 0x67, 0x31, 0x03, 0x64, 0x35, 0xe0, 0x68, 0x0b, 0x93, 0xee, 0x81, 0x17 },
-      { 0x8b, 0x01, 0xe9, 0x99, 0x54, 0x54, 0x73, 0x15, 0x0b, 0xac, 0x38, 0x7b, 0xe9, 0xe3, 0x17, 0x4f, 0x02, 0x3e, 0xe3, 0x8e, 0xda, 0x41, 0xa0, 0x9d, 0x10, 0xe0, 0xda, 0x11, 0xfe, 0xec, 0x2f, 0x42,
-        0xe7, 0xc8, 0xb3, 0xde, 0x2f, 0x7b, 0xfd, 0xdf, 0x7c, 0x34, 0x3b, 0x5e, 0xac, 0x22, 0x8c, 0x99, 0x3d, 0xa1, 0xa9, 0xd9, 0x81, 0xb6, 0x51, 0xc8, 0xaf, 0x3e, 0x75, 0xed, 0x45, 0xcf, 0xf7, 0xb9 },
-      { 0xaf, 0xe9, 0x9c, 0x16, 0x4a, 0x8f, 0x3b, 0x0f, 0xef, 0x71, 0x2f, 0xaa, 0x8d, 0x7d, 0xce, 0xed, 0xea, 0x31, 0x93, 0xaf, 0x2c, 0x75, 0xc6, 0xfa, 0xda, 0x3e, 0xa6, 0xea, 0x2a, 0x3e, 0x7b, 0x72,
-        0xb6, 0xf8, 0xd7, 0x9a, 0x88, 0xcb, 0x0b, 0x81, 0x97, 0x24, 0x29, 0x3b, 0x11, 0x23, 0x69, 0xc2, 0xff, 0x98, 0x39, 0x25, 0x99, 0xae, 0xe1, 0x07, 0x3e, 0x97, 0xde, 0x10, 0x21, 0x23, 0x7a, 0x2d },
-      { 0xbe, 0x2f, 0xb9, 0x4c, 0x41, 0x5a, 0x9a, 0xf6, 0xfb, 0xf8, 0x26, 0x9d, 0x81, 0x7f, 0x39, 0x91, 0xaf, 0x5b, 0xf1, 0xd7, 0x93, 0x0a, 0xdf, 0x18, 0x19, 0x4a, 0x80, 0x74, 0x14, 0x98, 0x2b, 0xf2,
-        0x3b, 0x25, 0xc5, 0xe8, 0xfc, 0x07, 0x3f, 0x5d, 0xa1, 0x39, 0x27, 0x4e, 0x1c, 0xd2, 0x7a, 0xfe, 0x3e, 0x7b, 0x03, 0x35, 0x15, 0x9e, 0x35, 0x2b, 0xd0, 0xbe, 0x67, 0x48, 0x42, 0xdd, 0xa4, 0xdd },
-      { 0xbd, 0xcd, 0xd7, 0xbf, 0xb1, 0x0a, 0xdb, 0x9f, 0x85, 0x42, 0xba, 0xf4, 0xc8, 0xff, 0xb0, 0xe1, 0x9a, 0x18, 0x6d, 0x1a, 0xe0, 0x37, 0xc1, 0xa2, 0xe1, 0x1c, 0x38, 0x55, 0x14, 0xbf, 0x64, 0x67,
-        0x84, 0x47, 0xb6, 0x0a, 0xf6, 0x93, 0xf1, 0x10, 0xab, 0x09, 0xf0, 0x60, 0x84, 0xe2, 0x4e, 0x4b, 0x5e, 0xa2, 0xd2, 0xd1, 0x19, 0x22, 0xd7, 0xc4, 0x85, 0x13, 0x23, 0xa3, 0x6a, 0xb6, 0x75, 0x0f,
-        0x43, 0xe6, 0xde, 0x7b, 0x67, 0x2a, 0x73, 0x77, 0x9e, 0xb4, 0x94, 0x6c, 0xc3, 0x9a, 0x67, 0x51, 0xcf, 0xe9, 0x47, 0x46, 0x0e, 0x3a, 0x12, 0x7d, 0x7c, 0x66, 0x73, 0x6c, 0xd5, 0x4a, 0x21, 0x4d },
-      { 0x89, 0x7e, 0xd0, 0xbf, 0x2e, 0x9f, 0x0c, 0xff, 0x6e, 0x56, 0x25, 0x9b, 0x79, 0x99, 0x52, 0x27, 0xc2, 0x3a, 0xaa, 0xf0, 0x47, 0x6d, 0xed, 0x05, 0xa1, 0xeb, 0x9c, 0x92, 0x28, 0x7f, 0x1b, 0xc8,
-        0x1c, 0x57, 0x76, 0xab, 0x05, 0xe3, 0xd3, 0xb7, 0xa3, 0xf5, 0xac, 0xa8, 0x21, 0x33, 0x7c, 0xb7, 0xe7, 0xc2, 0xd0, 0x25, 0x6f, 0xdf, 0x34, 0xd1, 0xb0, 0x34, 0x41, 0x46, 0x30, 0x9c, 0x76, 0x07,
-        0x43, 0xe6, 0xde, 0x7b, 0x67, 0x2a, 0x73, 0x77, 0x9e, 0xb4, 0x94, 0x6c, 0xc3, 0x9a, 0x67, 0x51, 0xcf, 0xe9, 0x47, 0x46, 0x0e, 0x3a, 0x12, 0x7d, 0x7c, 0x66, 0x73, 0x6c, 0xd5, 0x4a, 0x21, 0x4d } }
+	{{0xa1,0xfc,0x7a,0xb4,0x6d,0xdf,0x7d,0xcf,0xe7,0xec,0x75,0xe5,0xfa,0xdd,0x11,0xcb,0xcc,0x37,0xf8,0x84,0x5d,0x1c,0x92,0x4e,0x09,0x89,0x65,0xfc,0xd8,0xe9,0x5a,0x30,0xda,0xe4,0x86,0xa3,0x35,0xb4,0x19,0x0c,0xbc,0x7b,0xcb,0x3e,0xb9,0x4c,0xbd,0x16,0xe8,0x3d,0x13,0x2b,0xc9,0xc3,0x39,0xea,0xf1,0x42,0xe7,0x6f,0x69,0x78,0x9a,0xb7},{0xe5,0xf3,0x7b,0xd4,0x0e,0xc9,0xdc,0x77,0x50,0x86,0xdc,0xf4,0x2e,0xbc,0xdb,0x27,0xf0,0x73,0xd4,0x58,0x73,0xc4,0x4b,0x71,0x8b,0x3c,0xc5,0x4f,0xa8,0x7c,0xa4,0x84,0xd9,0x96,0x23,0x73,0xb4,0x03,0x16,0xbf,0x1e,0xa1,0x2d,0xd8,0xc4,0x8a,0xe7,0x82,0x10,0xda,0xc9,0xe5,0x45,0x9b,0x01,0xdc,0x73,0xa6,0xc9,0x17,0xa8,0x15,0x31,0x6d},{0x3e,0x49,0xa4,0x0e,0x3a,0xaf,0xa3,0x07,0x3d,0xf7,0x2a,0xec,0x43,0xb1,0xd4,0x09,0x1a,0xcb,0x8e,0x92,0xf9,0x65,0x95,0x04,0x6d,0x2d,0x9b,0x34,0xa3,0xbf,0x51,0x00,0xe2,0xee,0x23,0xf5,0x28,0x0a,0xa9,0xb1,0x57,0x0b,0x96,0x56,0x62,0xba,0x12,0x94,0xaf,0xc6,0x5f,0xb5,0x61,0x43,0x0f,0xde,0x0b,0xab,0xfa,0x4f,0xfe,0xc5,0xe7,0x18},{0x00,0x4d,0x41,0x8d,0xe4,0x69,0x23,0xae,0x98,0xc4,0x3e,0x77,0x0f,0x1d,0x94,0x5d,0x29,0x3e,0x94,0x5a,0x38,0x39,0x20,0x0f,0xd3,0x6f,0x76,0xa2,0x29,0x02,0x03,0xcb,0x0b,0x7f,0x4f,0x1a,0x29,0x51,0x13,0x33,0x7c,0x99,0xb3,0x81,0x82,0x39,0x44,0x05,0x97,0xfb,0x0d,0xf2,0x93,0xa2,0x40,0x94,0xf4,0xff,0x5d,0x09,0x61,0xe4,0x5f,0x76},{0xab,0xce,0xd2,0x24,0xe8,0x93,0xb0,0xe7,0x72,0x14,0xdc,0xbb,0x7d,0x0f,0xd8,0x94,0x16,0x9e,0xb5,0x7f,0xd7,0x19,0x5f,0x3e,0x2d,0x45,0xd5,0xf7,0x90,0x0b,0x3e,0x05,0x18,0x2e,0x2b,0xf4,0xfa,0xd4,0xec,0x62,0x4a,0x4f,0x48,0x50,0xaf,0x1c,0xe8,0x9f,0x1a,0xe1,0x3d,0x70,0x49,0x00,0xa7,0xe3,0x5b,0x1e,0xa1,0x9b,0x68,0x1e,0xa1,0x73},{0xed,0xb6,0xd0,0xf0,0x06,0x6e,0x33,0x9c,0x86,0xfb,0xe8,0xc3,0x6c,0x8d,0xde,0xdd,0xa6,0xa0,0x2d,0xb9,0x07,0x29,0xa3,0x13,0xbb,0xa4,0xba,0xec,0x48,0xc8,0xf4,0x56,0x82,0x79,0xe2,0xb1,0xd3,0x3d,0x83,0x9f,0x10,0xe8,0x52,0xe6,0x8b,0x1c,0x33,0x9e,0x2b,0xd2,0xdb,0x62,0x1c,0x56,0xfd,0x50,0x40,0x77,0x81,0xab,0x21,0x67,0x3e,0x09,0x4f,0xf2,0x51,0xac,0x7d,0xe7,0xd1,0x5d,0x4b,0xe2,0x08,0xc6,0x3f,0x6a,0x4d,0xc8,0x5d,0x74,0xf6,0x3b,0xec,0x8e,0xc6,0x0c,0x32,0x27,0x2f,0x9c,0x09,0x48,0x59,0x10},{0x23,0x0f,0xa3,0xe2,0x69,0xce,0xb9,0xb9,0xd1,0x1c,0x4e,0xab,0x63,0xc9,0x2e,0x1e,0x7e,0xa2,0xa2,0xa0,0x49,0x2e,0x78,0xe4,0x8a,0x02,0x3b,0xa7,0xab,0x1f,0xd4,0xce,0x05,0xe2,0x80,0x09,0x09,0x3c,0x61,0xc7,0x10,0x3a,0x9c,0xf4,0x95,0xac,0x89,0x6f,0x23,0xb3,0x09,0xe2,0x24,0x3f,0xf6,0x96,0x02,0x36,0x41,0x16,0x32,0xe1,0x66,0x05,0x4f,0xf2,0x51,0xac,0x7d,0xe7,0xd1,0x5d,0x4b,0xe2,0x08,0xc6,0x3f,0x6a,0x4d,0xc8,0x5d,0x74,0xf6,0x3b,0xec,0x8e,0xc6,0x0c,0x32,0x27,0x2f,0x9c,0x09,0x48,0x59,0x10}},
+	{{0xfd,0x81,0x14,0xf1,0x67,0x07,0x44,0xbb,0x93,0x84,0xa2,0xdc,0x36,0xdc,0xcc,0xb3,0x9e,0x82,0xd4,0x8b,0x42,0x56,0xfb,0xf2,0x6e,0x83,0x3b,0x16,0x2c,0x29,0xfb,0x39,0x29,0x48,0x85,0xe3,0xe3,0xf7,0xe7,0x80,0x49,0xd3,0x01,0x30,0x5a,0x2c,0x3f,0x4c,0xea,0x13,0xeb,0xda,0xf4,0x56,0x75,0x8d,0x50,0x1e,0x19,0x2d,0x29,0x2b,0xfb,0xdb},{0x85,0x34,0x4d,0xf7,0x39,0xbf,0x98,0x79,0x8c,0x98,0xeb,0x8d,0x61,0x27,0xec,0x87,0x56,0xcd,0xd0,0xa6,0x55,0x77,0xee,0xf0,0x20,0xd0,0x59,0x39,0x95,0xab,0x29,0x82,0x8e,0x61,0xf8,0xad,0xed,0xb6,0x27,0xc3,0xd8,0x16,0xce,0x67,0x78,0xe2,0x04,0x4b,0x0c,0x2d,0x2f,0xc3,0x24,0x72,0xbc,0x53,0xbd,0xfe,0x39,0x23,0xd4,0xaf,0x27,0x84},{0x11,0xbe,0x5f,0x5a,0x73,0xe7,0x42,0xef,0xff,0x3c,0x47,0x6a,0x0e,0x6b,0x9e,0x96,0x21,0xa3,0xdf,0x49,0xe9,0x3f,0x40,0xfc,0xab,0xb3,0x66,0xd3,0x3d,0xfa,0x02,0x29,0xf3,0x43,0x45,0x3c,0x70,0xa3,0x5d,0x39,0xf7,0xc0,0x6a,0xcd,0xfa,0x1d,0xbe,0x3b,0x91,0x41,0xe4,0xb0,0x60,0xc0,0x22,0xf7,0x2c,0x11,0x2b,0x1c,0x5f,0x24,0xef,0x53},{0xfd,0x3f,0x09,0x06,0xc9,0x39,0x8d,0x48,0xfa,0x6b,0xc9,0x80,0xbf,0xf6,0xd6,0x76,0xb3,0x62,0x70,0x88,0x4f,0xde,0xde,0xb9,0xb4,0xf0,0xce,0xf3,0x74,0x0d,0xea,0x00,0x9e,0x9c,0x29,0xe1,0xa2,0x1b,0xbd,0xb5,0x83,0xcc,0x12,0xd8,0x48,0x08,0x5b,0xe5,0xd6,0xf9,0x11,0x5c,0xe0,0xd9,0xc3,0x3c,0x26,0xbd,0x69,0x9f,0x5c,0x6f,0x0c,0x6f},{0xca,0xd4,0x76,0x32,0x8b,0xbe,0x0c,0x65,0x75,0x43,0x73,0xc2,0xf2,0xfd,0x7f,0xeb,0xe4,0x62,0xc5,0x0d,0x0f,0xf9,0x01,0xc8,0xb9,0xfa,0xca,0xb4,0x12,0x1c,0xb4,0xac,0x0e,0x5f,0x18,0xfc,0x0c,0x7f,0x2a,0x55,0xc5,0xfd,0x4d,0x83,0xb2,0x02,0x31,0x6a,0x3f,0x14,0xee,0x9d,0x11,0xa8,0x06,0xad,0xeb,0x93,0x19,0x79,0xb1,0xf2,0x78,0x05},{0x85,0xe6,0xe2,0xf2,0x96,0xe7,0xa2,0x8b,0x7e,0x36,0xbd,0x7b,0xf4,0x28,0x6a,0xd7,0xbc,0x2a,0x6a,0x59,0xfd,0xc0,0xc8,0x3d,0x50,0x0f,0x0c,0x2b,0x12,0x3a,0x75,0xc7,0x56,0xbb,0x7f,0x7d,0x4e,0xd4,0x03,0xb8,0x7b,0xde,0xde,0x99,0x65,0x9e,0xc4,0xa6,0x6e,0xfe,0x00,0x88,0xeb,0x9d,0xa4,0xa9,0x9d,0x37,0xc9,0x4a,0xcf,0x69,0xc4,0x01,0xba,0xa8,0xce,0xeb,0x72,0xcb,0x64,0x8b,0x9f,0xc1,0x1f,0x9a,0x9e,0x99,0xcc,0x39,0xec,0xd9,0xbb,0xd9,0xce,0xc2,0x74,0x6f,0xd0,0x2a,0xb9,0xc6,0xe3,0xf5,0xe7,0xf4},{0xb1,0x39,0x50,0xb1,0x1a,0x08,0x42,0x2b,0xdd,0x6d,0x20,0x9f,0x0f,0x37,0xba,0x69,0x97,0x21,0x30,0x7a,0x71,0x2f,0xce,0x98,0x09,0x04,0xa2,0x98,0x6a,0xed,0x02,0x1d,0x5d,0x30,0x8f,0x03,0x47,0x6b,0x89,0xfd,0xf7,0x1a,0xca,0x46,0x6f,0x51,0x69,0x9a,0x2b,0x18,0x77,0xe4,0xad,0x0d,0x7a,0x66,0xd2,0x2c,0x28,0xa0,0xd3,0x0a,0x99,0x0d,0xba,0xa8,0xce,0xeb,0x72,0xcb,0x64,0x8b,0x9f,0xc1,0x1f,0x9a,0x9e,0x99,0xcc,0x39,0xec,0xd9,0xbb,0xd9,0xce,0xc2,0x74,0x6f,0xd0,0x2a,0xb9,0xc6,0xe3,0xf5,0xe7,0xf4}},
+	{{0x02,0x3a,0x7e,0x0c,0x6d,0x96,0x3c,0x5d,0x44,0x56,0x5d,0xc1,0x49,0x94,0x35,0x12,0x9d,0xff,0x8a,0x5d,0x91,0x74,0xa8,0x15,0xee,0x5d,0x1e,0x72,0xbe,0x86,0x15,0x68,0xe7,0x36,0xa2,0x4a,0xb8,0xa2,0xa4,0x4c,0xd8,0x95,0xe3,0xc7,0xbb,0x32,0x21,0x90,0x64,0x52,0x32,0xeb,0x26,0xd3,0x4f,0xf0,0x8e,0x27,0x40,0xea,0xed,0xdb,0xf5,0xc4},{0x76,0x99,0x64,0x70,0xf4,0x50,0xc8,0xcc,0x4a,0x5a,0xa5,0x0f,0xeb,0x2d,0xc7,0x0e,0x73,0xd0,0x65,0x7d,0xc3,0xce,0x73,0x03,0x20,0x2f,0xad,0x65,0xfd,0x12,0xe4,0x7f,0xfd,0x45,0x3a,0x6e,0xc5,0x9a,0x06,0x67,0x0e,0xa6,0x7b,0x21,0x49,0x2d,0x01,0x1b,0x8e,0x03,0x6e,0x10,0x08,0x0c,0x68,0xd9,0x60,0x47,0xa4,0xe2,0x52,0xfd,0x3c,0xf4},{0xa3,0xe2,0x5f,0x16,0x39,0x78,0x96,0xf7,0x47,0x6f,0x93,0x5d,0x27,0x7b,0x58,0xe0,0xc5,0xdb,0x71,0x7d,0xa9,0x6f,0xf8,0x8b,0x69,0xdd,0x50,0xea,0x91,0x0d,0x66,0x77,0xaf,0x8f,0xd5,0x9f,0x8a,0x26,0x69,0x4c,0x64,0x37,0x62,0x81,0x6f,0x05,0x9a,0x08,0x0d,0xe1,0x69,0x24,0x77,0x3f,0x50,0xb2,0x49,0x4d,0x93,0xef,0x2e,0x87,0xff,0xde},{0xb3,0x32,0xe2,0x67,0x79,0x32,0x5f,0x64,0x47,0x49,0x1c,0xd3,0x8f,0x95,0x44,0xfd,0x4c,0x7e,0xbf,0x6b,0xb7,0xaf,0x2c,0xdd,0x8f,0xa5,0xd8,0x2f,0xbf,0xa0,0x8a,0x6b,0x58,0x25,0xc9,0x12,0x23,0x6f,0xe6,0x05,0xa8,0xd0,0x68,0x6e,0x0c,0xee,0x70,0xe4,0xa3,0x86,0x51,0x04,0x6d,0xca,0xd5,0xed,0xcf,0x74,0x1d,0x60,0x9e,0x86,0x2d,0x05},{0x91,0xf4,0x5f,0x4a,0xcb,0xd8,0xfd,0x5f,0xb9,0x3d,0x04,0xb8,0xec,0x35,0x85,0x4f,0x58,0x20,0xd1,0x1f,0x47,0xc4,0xf4,0xcb,0x21,0x4e,0x9a,0xf1,0x6e,0xbf,0xe3,0xd3,0x62,0xe3,0x82,0xf6,0xba,0xa8,0xdf,0x92,0xe2,0x3c,0xe5,0xf0,0x16,0x8a,0xeb,0xa4,0xbb,0xc7,0x81,0xaf,0x15,0x19,0x87,0x5f,0xb7,0xe0,0x4c,0x12,0xff,0x2c,0xa9,0xc8},{0xaf,0x85,0xe0,0x36,0x43,0xdf,0x41,0x17,0xda,0xde,0x5e,0xb6,0x33,0xd0,0xce,0x62,0x70,0x5f,0x85,0x24,0x6c,0x3e,0x1b,0xe1,0x52,0xc1,0x9b,0x1c,0xcd,0x61,0x80,0x9c,0xa0,0xe8,0x18,0xee,0x40,0x91,0x93,0x82,0xdb,0x33,0x44,0xff,0xd4,0xf6,0x6f,0x5d,0xf0,0x0e,0x92,0x92,0x81,0x55,0x46,0x06,0xac,0x58,0x81,0x3b,0x04,0xc7,0xf7,0x0d,0xd2,0x0c,0x08,0x6d,0x46,0xdb,0x43,0x28,0x31,0xd8,0xcd,0x87,0x50,0xbb,0xd3,0x07,0xf5,0x72,0x0b,0x15,0x7c,0x16,0xab,0x03,0xd9,0x4b,0x07,0x38,0x97,0xe8,0xd6,0xb5},{0x93,0xff,0x6d,0xc3,0x62,0xf7,0xcc,0x20,0x95,0xc2,0x2f,0x7d,0x1d,0x9b,0xd1,0x63,0xfc,0x61,0x47,0xb3,0x22,0x0f,0xca,0xb0,0x16,0xcf,0x29,0x53,0x46,0x97,0xb1,0x36,0x46,0xac,0x48,0x13,0x92,0xe4,0x46,0x68,0xcf,0x09,0x4e,0xfa,0x59,0x45,0x24,0x08,0xdb,0xb4,0x6f,0x20,0x55,0x12,0xd9,0x75,0x9d,0x8e,0x0b,0xf8,0x63,0xe0,0xf9,0x01,0xd2,0x0c,0x08,0x6d,0x46,0xdb,0x43,0x28,0x31,0xd8,0xcd,0x87,0x50,0xbb,0xd3,0x07,0xf5,0x72,0x0b,0x15,0x7c,0x16,0xab,0x03,0xd9,0x4b,0x07,0x38,0x97,0xe8,0xd6,0xb5}},
+	{{0x14,0x35,0xa6,0x7d,0xc1,0xb5,0x71,0xca,0x42,0x50,0x90,0xa7,0x72,0x85,0xbe,0x78,0x7a,0x5f,0x83,0x1e,0xbe,0xef,0x6a,0xbe,0x48,0xc5,0x68,0x14,0x0c,0xf7,0x44,0x5c,0x2e,0xfd,0x1b,0xcc,0xee,0x09,0x23,0x82,0x31,0xad,0xaf,0x4b,0x73,0x9c,0xf2,0x88,0x3c,0xf3,0xb5,0x43,0x8b,0x53,0xf9,0xac,0x17,0x86,0x1c,0xc2,0x53,0x43,0xec,0x03},{0x7b,0x36,0x6c,0xcc,0xb5,0xb2,0x23,0x3d,0x7c,0xe5,0xe7,0xcf,0x06,0xe2,0x32,0x0b,0xc5,0x3b,0x7f,0x86,0x40,0xfc,0xaf,0xba,0x94,0xe0,0x88,0x58,0x5b,0xac,0xe8,0xc3,0xe8,0xc3,0xdf,0xc4,0x45,0x29,0xe8,0xf0,0x1c,0x10,0x0d,0x50,0x81,0x29,0x30,0xa8,0x27,0xb5,0x3e,0xb8,0x25,0xf1,0x17,0x30,0xc6,0x05,0xe3,0x3e,0x45,0x38,0xa8,0x3c},{0xce,0xd9,0x45,0x28,0xb0,0xce,0xa5,0x47,0xa8,0x29,0x32,0x76,0x99,0x73,0x8d,0x74,0xf9,0xed,0x0a,0xd0,0xf1,0xd8,0x7e,0x44,0x63,0x9e,0x9a,0xcf,0x7c,0x35,0x8a,0x29,0xbb,0x71,0x66,0x8d,0xa7,0xfc,0x05,0x3d,0xd4,0x4b,0x65,0x20,0xf5,0xa4,0x64,0xd8,0x9d,0x16,0x80,0x9c,0xb2,0x3c,0x3e,0xd4,0x9d,0x09,0x88,0x8e,0xbb,0x58,0xf8,0x77},{0xe1,0x29,0xb3,0x16,0xe6,0xa0,0xdb,0x64,0x08,0x36,0xdc,0x33,0xad,0x8b,0x30,0x26,0x17,0x56,0xd7,0x34,0x17,0xd1,0xdd,0x23,0x38,0x58,0x25,0x01,0x42,0x5a,0x9d,0x18,0x3e,0xac,0x31,0xfa,0x43,0x28,0xc4,0x65,0xfb,0x30,0x2f,0x8c,0x16,0x52,0x32,0x1b,0x19,0xb7,0x31,0xf6,0x67,0xa7,0xd8,0xed,0x9a,0xa3,0x95,0x01,0xd7,0xb9,0xe7,0xcc},{0x81,0x2d,0x11,0xa9,0x11,0xf1,0x22,0xe2,0x67,0x70,0xc4,0xba,0x34,0xa1,0x75,0x8c,0xf6,0x0c,0x63,0xe7,0x01,0x3c,0x64,0x6c,0xe8,0xd0,0xf8,0x8e,0x88,0xdf,0x5c,0x61,0x68,0x5d,0x1f,0xeb,0x83,0x1f,0x40,0xb8,0xa8,0x56,0x57,0x26,0x81,0x2c,0xa3,0x0e,0x48,0x4c,0x45,0x4d,0x0d,0x3d,0x6e,0x99,0x52,0xbd,0x0b,0xd8,0x05,0xc5,0xf9,0x61},{0x92,0x45,0xbe,0xe6,0xb4,0x7a,0xfa,0x28,0xd4,0x5b,0x6b,0x17,0xc6,0x13,0x61,0x5d,0x5f,0xd7,0x90,0xbb,0x89,0x35,0x7a,0x02,0x50,0x57,0x56,0x5f,0x19,0xb5,0xb6,0xc5,0x77,0x1e,0x1b,0xc0,0xd7,0x7a,0x29,0xbd,0xe7,0x24,0x01,0x2d,0x37,0xc0,0x38,0x6f,0xc8,0x35,0xa1,0x1b,0xe0,0xea,0x16,0xad,0xbc,0xdc,0xd4,0x8d,0x4e,0x71,0xdb,0x05,0x9e,0xb5,0x53,0x6b,0x5c,0xf1,0x7d,0x15,0x8b,0xd7,0xc7,0x8b,0x89,0x9d,0xfd,0x28,0x7c,0xa1,0x31,0xe2,0xf0,0x2c,0x3a,0x8d,0x0e,0x23,0x85,0x4e,0xf0,0xd1,0xc0,0x83},{0x7b,0x88,0xeb,0x45,0x1c,0x7f,0xfd,0xbe,0xba,0xac,0x53,0x28,0x59,0xe8,0xad,0x28,0xf1,0x97,0x2d,0x6c,0x31,0xa6,0xae,0x47,0x10,0x69,0x68,0x55,0xa6,0x9c,0x03,0x62,0xb7,0x2f,0x31,0x46,0x2a,0x2b,0x98,0xdd,0xe9,0xf9,0xfe,0x77,0x71,0x41,0x54,0xf8,0x59,0x02,0x7a,0xe3,0x45,0x67,0xb6,0xf7,0x94,0x31,0x3e,0x62,0x62,0x2a,0xf9,0x0a,0x9e,0xb5,0x53,0x6b,0x5c,0xf1,0x7d,0x15,0x8b,0xd7,0xc7,0x8b,0x89,0x9d,0xfd,0x28,0x7c,0xa1,0x31,0xe2,0xf0,0x2c,0x3a,0x8d,0x0e,0x23,0x85,0x4e,0xf0,0xd1,0xc0,0x83}},
+	{{0x27,0x4d,0x84,0x08,0x95,0x84,0xc8,0xeb,0x1c,0x9a,0x0f,0xca,0x09,0x6f,0x48,0x8b,0x2b,0x06,0xa0,0xae,0xf2,0xe3,0x8a,0xfe,0xd7,0x52,0x4b,0xf2,0xc6,0x7c,0xc1,0x55,0x87,0x2e,0x5a,0xb4,0xc2,0x43,0x0a,0x0d,0xd0,0x00,0xa8,0xe1,0x46,0x68,0x79,0xd8,0x8c,0x01,0x36,0xb7,0x5a,0x61,0x04,0xe9,0x7e,0xbb,0xc9,0xee,0xaa,0x12,0x13,0xda},{0x78,0x66,0xd0,0xa2,0x50,0x82,0x8d,0xb0,0xa0,0x20,0xac,0xa4,0xb6,0xa0,0x31,0xf7,0x7d,0x93,0x37,0x67,0xbb,0x60,0xa2,0x1e,0x36,0xce,0x3d,0x48,0x1d,0x79,0x99,0xa5,0x19,0xd8,0x89,0x1b,0xcb,0x14,0x87,0xb7,0x62,0xfd,0xd2,0xef,0xbb,0x13,0x41,0x4d,0xf1,0x77,0x5c,0x7f,0x6c,0x3b,0x94,0x7d,0xb4,0xba,0x87,0x3e,0xc8,0xe1,0x3c,0x0a},{0xd9,0x9e,0x14,0x89,0xd6,0xf8,0x49,0xa2,0xe2,0x19,0xfe,0x94,0xaa,0xf7,0x35,0xf9,0x4a,0xf8,0xf3,0x18,0x68,0x96,0x47,0xc6,0x23,0x7c,0xb0,0x53,0xcb,0xd8,0x90,0x31,0xb7,0x50,0x0e,0x06,0xc3,0x84,0x75,0xf1,0xac,0x16,0x4d,0xc1,0xbe,0xf1,0x80,0x33,0x47,0x56,0x6f,0x33,0x94,0x5c,0x81,0x03,0x4c,0x2f,0x6d,0xac,0x73,0xba,0x91,0x3c},{0x2f,0xa9,0xb6,0xe8,0x73,0xe2,0xef,0x6d,0x6d,0xd7,0x2e,0xa0,0x51,0x61,0x24,0x81,0x8c,0xa8,0x47,0x40,0xe1,0xc7,0x75,0x79,0xc8,0xec,0xb2,0x23,0x41,0xad,0x61,0x3b,0xea,0x8a,0xdf,0x63,0xed,0xe1,0x8e,0x50,0x70,0x6e,0x86,0xed,0xb0,0xba,0x27,0x48,0x8e,0xb9,0x63,0x39,0x78,0x58,0x4f,0x1e,0xbc,0x45,0xf3,0xf2,0x3a,0x73,0x9b,0x8c},{0xad,0x42,0xc5,0x84,0xca,0xe1,0xe1,0x23,0x2a,0x73,0x15,0x3c,0x9a,0xfe,0x85,0x8d,0xa3,0x2c,0xcf,0x46,0x8d,0x7f,0x1c,0x61,0xd7,0x0e,0xb1,0xa6,0xb4,0xae,0xab,0x63,0xc4,0x0e,0xf2,0xa0,0x5d,0xa6,0xf3,0x5d,0x35,0x41,0xea,0x03,0x91,0xb1,0x3a,0x07,0xe6,0xed,0x6c,0x8c,0xcb,0x75,0x27,0xf1,0x26,0x58,0xf0,0x62,0x57,0xe4,0x33,0x00},{0x1f,0xed,0x53,0xc6,0xef,0x38,0x26,0xa4,0x18,0x88,0x8f,0x5c,0x49,0x1c,0x15,0x7d,0x77,0x90,0x06,0x39,0xe0,0x7c,0x25,0xed,0x79,0x05,0x66,0xe0,0x5e,0x94,0xe3,0x46,0x6f,0x96,0xd8,0xc1,0x11,0xa4,0x11,0x6f,0x78,0x42,0x8e,0x89,0xc7,0xc3,0xed,0xd2,0x9e,0x68,0x47,0x79,0x89,0x23,0x70,0x14,0x21,0x60,0x2d,0xfe,0x37,0x4b,0xc8,0x0a,0x16,0x73,0x7c,0xc4,0x55,0x3f,0x25,0x04,0x08,0x75,0x74,0x68,0xbc,0xe4,0x3a,0xae,0x4c,0x0e,0xd2,0x85,0xa1,0xbc,0x81,0xc0,0xc9,0xfe,0x9a,0x44,0x7b,0x83,0xdf,0xc7},{0x27,0x77,0x97,0x84,0x0f,0x2d,0x8d,0x33,0xb8,0x4e,0xdb,0x8b,0xea,0x58,0x52,0x88,0x95,0x88,0x55,0x5f,0xb8,0xc4,0xc9,0xd6,0x1f,0x1e,0xee,0x60,0xb5,0xeb,0x78,0x72,0xb5,0xe5,0x22,0x2b,0x7f,0x5e,0xc7,0x9b,0x29,0x55,0x8e,0x2a,0xfc,0x65,0x55,0x4a,0x02,0xad,0x64,0x06,0xd4,0x25,0xe1,0x96,0x6f,0xee,0x96,0xcd,0x29,0xc6,0x64,0x00,0x16,0x73,0x7c,0xc4,0x55,0x3f,0x25,0x04,0x08,0x75,0x74,0x68,0xbc,0xe4,0x3a,0xae,0x4c,0x0e,0xd2,0x85,0xa1,0xbc,0x81,0xc0,0xc9,0xfe,0x9a,0x44,0x7b,0x83,0xdf,0xc7}},
+	{{0x5e,0xc5,0x5b,0x9c,0xdb,0x14,0x05,0x18,0x6b,0xe2,0x1d,0x16,0x77,0x22,0x0e,0xd2,0xe4,0x57,0x82,0x6e,0x5b,0xc5,0x6a,0xb9,0x34,0x20,0xdb,0x72,0xe2,0xe1,0xeb,0x1b,0x34,0x00,0x04,0xbf,0x83,0xf6,0x4f,0x12,0x45,0x08,0xf0,0x95,0x2a,0xdc,0x3a,0x14,0xb3,0x29,0x0b,0x99,0xcd,0x73,0x31,0xbd,0x04,0xbb,0x49,0x1c,0xde,0xcf,0x09,0x9e},{0x15,0x80,0x3e,0x2a,0xfb,0xc0,0x8d,0x62,0x19,0x27,0x83,0x04,0xcc,0xf5,0xd1,0xbb,0x40,0x41,0xbe,0x93,0x59,0x6e,0x27,0x6d,0x95,0x24,0x0a,0x07,0x27,0x86,0x10,0x75,0xf7,0x0a,0x11,0xfc,0x53,0xd0,0x4c,0x15,0xf8,0x6e,0x22,0x3f,0xeb,0x12,0x97,0x8a,0x3d,0x69,0xd8,0x96,0xc9,0x53,0x10,0x9c,0x02,0x95,0xe4,0xd3,0x1a,0xd5,0x43,0x82},{0x40,0x09,0x2c,0x17,0x7e,0xba,0xce,0x1f,0xfc,0xc1,0x8e,0xc3,0x1c,0xa2,0x34,0x52,0x78,0x16,0x23,0x71,0x82,0x40,0xf8,0x6d,0x67,0x65,0x67,0x50,0x53,0xd9,0xc8,0x5e,0x7e,0x8a,0x98,0xa3,0xc6,0x2a,0x4d,0x27,0xf3,0xb9,0xbb,0xae,0x43,0x29,0x6e,0x02,0x1c,0xe9,0x01,0xd6,0xcd,0xd8,0x91,0x44,0x95,0x2b,0x9e,0xa5,0x4f,0xd0,0x00,0xb9},{0x3a,0xe8,0x3d,0xb3,0x32,0xdc,0xc2,0xc8,0xe3,0x36,0x2f,0xc9,0x30,0x3a,0xc0,0x76,0x56,0xd3,0x0b,0x06,0xbe,0x8f,0xe7,0xf1,0x66,0x61,0x25,0x42,0x28,0xdc,0x08,0x81,0x84,0x3a,0x57,0x96,0x27,0xa6,0xcf,0xd6,0x8f,0x35,0xa2,0xc3,0x76,0x86,0x4f,0xcf,0x5f,0xa1,0x85,0x28,0x4f,0x4a,0x3a,0xbb,0x5c,0x25,0x4b,0xcc,0x46,0xfe,0xf2,0x04},{0x62,0xc8,0xa2,0x0a,0x59,0xb8,0x97,0xd2,0x68,0x94,0x00,0x3b,0x01,0xac,0x91,0x6e,0x97,0x8e,0x08,0xe3,0xfe,0x9f,0x9e,0x9f,0x4b,0xcc,0x5d,0x1d,0xb9,0xbf,0x07,0x83,0xfe,0x51,0x2a,0xdf,0x79,0x2e,0x07,0xc9,0x98,0x9b,0xbe,0xb6,0xe4,0x0a,0x20,0x44,0x86,0xea,0xb1,0x61,0x58,0x11,0x32,0x8e,0x7b,0xb9,0x67,0x2d,0xf0,0x78,0xb2,0x93},{0x1a,0x65,0xb3,0x6f,0xa2,0x45,0x29,0x53,0xd7,0x23,0x4d,0xff,0x8e,0xe9,0xb9,0xef,0x16,0xa0,0xdd,0x48,0xdf,0x70,0xd2,0xe1,0x56,0xca,0xd1,0xd0,0x4a,0x9d,0x63,0x92,0x2b,0xfd,0x7b,0x87,0x39,0x3c,0x12,0xc7,0xe5,0x91,0x31,0x95,0x78,0xc4,0x58,0x95,0x89,0x6e,0x2c,0x90,0xb4,0x0b,0xb2,0xfe,0x52,0xc0,0x86,0xc4,0x2e,0x56,0x97,0x0c,0x20,0xf2,0xbc,0x6a,0x9b,0x89,0xfb,0xe9,0x85,0x95,0xd6,0x22,0x5e,0x4d,0x6d,0x83,0x9d,0xf4,0xbe,0x66,0x05,0x32,0xb6,0xe2,0xf1,0x96,0x42,0xa4,0xc8,0x8c,0x1b,0xec},{0x43,0x85,0xff,0xb9,0xcf,0x04,0x83,0x40,0x70,0x3a,0x9c,0x48,0xb4,0xc2,0x99,0x3b,0xa0,0x39,0xf1,0x39,0x58,0x7f,0xd2,0x49,0x94,0x3c,0xc3,0xe1,0xb6,0x56,0x38,0x55,0x6f,0xb5,0x1a,0x90,0xa2,0x04,0x2f,0x19,0xf8,0xb1,0x65,0x5a,0xad,0xcd,0x1c,0x56,0x42,0x38,0xc2,0x52,0x09,0xd6,0x41,0x98,0x5d,0x5f,0xa5,0xe7,0xc2,0x55,0xa1,0x09,0x20,0xf2,0xbc,0x6a,0x9b,0x89,0xfb,0xe9,0x85,0x95,0xd6,0x22,0x5e,0x4d,0x6d,0x83,0x9d,0xf4,0xbe,0x66,0x05,0x32,0xb6,0xe2,0xf1,0x96,0x42,0xa4,0xc8,0x8c,0x1b,0xec}},
+	{{0xf2,0x4a,0x96,0x57,0xc3,0x2f,0xe6,0x9f,0xed,0x7f,0xcc,0xe9,0xea,0xbe,0xd2,0x23,0x4e,0x47,0x13,0xd9,0x53,0x19,0x31,0x14,0x0a,0xd3,0x9b,0x95,0xa7,0x9c,0x88,0x5e,0x08,0xb2,0x16,0xda,0x45,0x61,0x1d,0x6b,0xdf,0xb1,0x14,0x0c,0x66,0xfd,0x3a,0xbe,0x25,0xdc,0xfd,0xcd,0xcc,0x5e,0x28,0x77,0x5a,0xa9,0x8b,0x84,0x77,0x26,0x9d,0xa6},{0xea,0xde,0x4d,0xab,0x09,0x02,0xbf,0x90,0xf8,0xae,0x8b,0x50,0x01,0xb2,0x9d,0x7c,0x0a,0x3b,0x60,0xda,0x34,0xa9,0xbb,0x4d,0xa5,0x53,0x18,0x65,0xec,0xaa,0xc9,0x29,0xb2,0xf7,0x74,0x14,0x63,0x5f,0x88,0xcf,0x4e,0x70,0x1b,0x11,0x64,0x73,0x15,0x6b,0x5a,0x8c,0xb8,0x4e,0x0f,0x83,0xae,0x4b,0x5c,0x52,0x1c,0x6a,0x0f,0x54,0x77,0xc8},{0xae,0xff,0x55,0xbf,0x78,0xb5,0xde,0x33,0xeb,0x87,0xea,0x13,0x7d,0x36,0x22,0x06,0x32,0xc4,0x7e,0xca,0x65,0x37,0xcc,0x83,0x0e,0xda,0x54,0xb3,0xd2,0xe6,0xe7,0x7f,0xe1,0x90,0x11,0x25,0x16,0x83,0x25,0x43,0xb4,0x38,0x06,0xbb,0x6c,0x62,0x7d,0x84,0x1f,0xf3,0x7b,0xeb,0xae,0x50,0xd8,0xfb,0xb9,0xf2,0xf9,0xc3,0x6f,0x59,0xb7,0xb0},{0x95,0x15,0x83,0x19,0x56,0x9c,0x11,0xd8,0x31,0x87,0x1d,0xe3,0x3f,0x07,0x89,0xb2,0xcb,0x81,0xf0,0xeb,0x0b,0x1e,0x74,0x08,0xa2,0x4a,0x0e,0x82,0xc6,0x45,0x8c,0x32,0xb4,0x8f,0xfd,0x76,0xeb,0x5e,0xc7,0x62,0xdc,0xcb,0xee,0xad,0xcf,0xcf,0xea,0x33,0x9d,0xb0,0x02,0x64,0x66,0x77,0x14,0x97,0x0c,0x6e,0x79,0xe8,0x58,0x32,0x0f,0xe6},{0xcb,0x2f,0xaf,0x53,0xd8,0x41,0x48,0x41,0x6f,0x36,0x78,0x80,0x83,0x5c,0x0d,0x4c,0x1b,0xf4,0x39,0xe0,0x34,0x4f,0xc2,0xb2,0x4e,0xf0,0xac,0xc2,0xf8,0x15,0x7a,0x81,0x9f,0x46,0x2b,0xe3,0xb9,0x39,0x05,0x89,0xa2,0xda,0x1a,0x63,0x51,0xb4,0x78,0x0f,0xfe,0x2f,0x9d,0xce,0x99,0x38,0xa9,0x7e,0xcb,0x80,0x57,0x9f,0xa2,0x28,0x0f,0x6a},{0x1b,0xec,0x67,0x50,0xd1,0x28,0x65,0x55,0xb8,0xde,0x3b,0x2e,0x1e,0x33,0xd8,0x1b,0xba,0x2e,0x78,0x6a,0xb8,0x0b,0x8c,0xa0,0x55,0x34,0x25,0x90,0x9a,0xe2,0xf5,0xaa,0x95,0x0c,0x6f,0x2a,0xb0,0x92,0x1d,0x48,0x5b,0x56,0x8c,0x82,0x8f,0xa7,0x15,0x75,0x26,0x61,0x85,0xc8,0x7d,0xda,0xf5,0x2a,0xf3,0x3c,0x34,0xc1,0x20,0x67,0xbb,0x04,0xec,0x7c,0xe2,0xcb,0x31,0xcf,0x23,0xda,0x5d,0x8a,0x05,0x00,0x9b,0x23,0x34,0xd0,0xed,0x56,0x10,0x0a,0x90,0x6b,0x73,0x26,0x6b,0xf0,0xd7,0xbc,0xd8,0xc7,0x89,0xc8},{0x90,0x43,0x54,0x87,0x44,0x00,0x07,0xca,0xa8,0x2b,0xec,0x55,0xa0,0xd2,0x8c,0x07,0x03,0xaa,0x61,0x1a,0x7d,0x0f,0x90,0x13,0x67,0x99,0x46,0x20,0xcd,0x70,0xcb,0xa7,0x96,0xdf,0x0c,0x13,0xc4,0x41,0x11,0xd6,0xc3,0x33,0x02,0x96,0x4f,0x1d,0xbd,0x06,0xa9,0xa1,0x31,0x0a,0xc3,0xdf,0x6d,0x52,0x6c,0xc6,0xbe,0xc5,0xb6,0x2a,0xb1,0x0f,0xec,0x7c,0xe2,0xcb,0x31,0xcf,0x23,0xda,0x5d,0x8a,0x05,0x00,0x9b,0x23,0x34,0xd0,0xed,0x56,0x10,0x0a,0x90,0x6b,0x73,0x26,0x6b,0xf0,0xd7,0xbc,0xd8,0xc7,0x89,0xc8}},
+	{{0x4f,0x3a,0xdd,0x0f,0xcf,0x7f,0x27,0xda,0x27,0xc4,0xa6,0x2b,0x6b,0xd1,0x9f,0x59,0x73,0x5f,0xd4,0xb7,0xf0,0x86,0x16,0xc9,0xdd,0xa6,0xf9,0x9b,0x17,0xb2,0xb9,0x71,0xe7,0x4c,0xa1,0x17,0x79,0xe0,0xcc,0xae,0x10,0xec,0x28,0x3a,0x09,0xf2,0x8b,0x34,0x9c,0xac,0x16,0x2a,0xa9,0x21,0xe8,0xa7,0x18,0xc0,0xc4,0x9f,0x30,0xa0,0x25,0x62},{0x23,0x4c,0xd4,0xae,0x52,0x30,0xf6,0x64,0xb9,0xe1,0x47,0xca,0xf8,0xf3,0x3a,0x6b,0x8b,0xf3,0x29,0xe2,0x9b,0x5d,0xbb,0x0a,0x60,0x52,0x03,0x40,0x53,0x5c,0x9e,0x35,0x03,0xd4,0xec,0xd7,0x67,0xf4,0x92,0xd2,0x98,0x96,0xf2,0xa7,0xf4,0x25,0x6a,0x80,0x9c,0x75,0xc6,0xf2,0x1f,0x67,0x11,0x00,0x0d,0xda,0x1e,0xb2,0x58,0xa7,0x8c,0x39},{0x55,0x1b,0x80,0xbb,0xf3,0xc5,0x1a,0x84,0x34,0xf5,0x0a,0x8a,0x8a,0xe1,0x8c,0xea,0xa6,0xfb,0xd0,0x26,0xc9,0xa2,0x30,0x37,0x3e,0xba,0x98,0xfe,0x81,0x8a,0x52,0x37,0x0b,0x74,0x4e,0x3d,0x26,0x8f,0x82,0x4b,0xc0,0x6a,0x01,0x10,0x91,0x8f,0x89,0xb5,0x62,0x3f,0x1e,0x70,0xcc,0x25,0x77,0x39,0x74,0x88,0xdd,0xbc,0xbe,0x72,0x08,0x63},{0xe2,0x9a,0x46,0xd2,0x74,0xdc,0x0f,0x8a,0xa3,0xbd,0x20,0xb7,0xc7,0xd9,0x83,0x4b,0x58,0xa6,0xe3,0xbd,0xc5,0x00,0xb6,0x18,0x04,0x25,0x81,0xbd,0x99,0xb3,0xb1,0x2a,0x7a,0x68,0x6d,0xe1,0x3e,0x23,0x8d,0x29,0x9e,0x7a,0x30,0x56,0x4c,0x22,0xb6,0xf4,0x7d,0x7d,0x4f,0xfd,0x76,0xa5,0x9d,0x05,0x41,0x7c,0x7a,0x2d,0x7b,0xbe,0xcf,0x73},{0x7b,0xae,0x11,0x86,0x8a,0x38,0xbd,0x56,0x3c,0xf3,0x3c,0x9c,0x49,0xa4,0x68,0x0f,0x2b,0xdf,0xf2,0xa1,0xbc,0xc2,0xed,0x08,0x09,0x96,0xd0,0x7e,0x9b,0xe3,0x0a,0x72,0x13,0x03,0xd4,0x35,0x0a,0x94,0x60,0x09,0x4a,0xaa,0xca,0x35,0x8e,0xed,0x12,0xdd,0x26,0x8f,0xf8,0xa9,0xa2,0x8a,0x7f,0xac,0xf3,0x09,0xc7,0x22,0xc5,0x73,0xec,0xa0},{0xe9,0xc5,0x57,0x0d,0x85,0xbf,0x10,0xe2,0xd1,0xf5,0xd7,0x22,0xe9,0x6a,0x67,0x8d,0xd3,0x9f,0x1a,0xef,0x7f,0xc0,0x2b,0xe1,0xfd,0x2c,0xc2,0x5f,0x39,0xf9,0x34,0xd0,0x87,0x94,0x41,0x8a,0x65,0xa5,0x20,0x48,0xa4,0x20,0x5f,0x7a,0xc7,0x37,0x00,0x60,0x59,0x84,0x2a,0x1d,0xff,0x02,0xc3,0xe8,0x20,0xaa,0x39,0x13,0xac,0xf3,0xd7,0x05,0xbd,0xef,0x11,0x66,0x71,0xb8,0x9f,0x1e,0xe5,0xee,0x2e,0x37,0xfb,0x34,0xed,0xc5,0xa4,0x40,0x6e,0x38,0x31,0x0a,0x1c,0xaf,0x0d,0xd3,0x98,0xac,0x12,0x40,0xea,0x9c},{0xc6,0xcd,0x7a,0xbd,0x14,0xdb,0xe4,0xed,0xbf,0x46,0x70,0x23,0xbd,0xdb,0xc3,0xce,0x60,0xd5,0x6b,0x17,0x4c,0x23,0xfa,0x78,0x05,0xcc,0x18,0xed,0x42,0x03,0xa5,0xb7,0xdf,0x28,0x0e,0xd4,0x5d,0x31,0xd8,0xb9,0xdc,0xe9,0xf6,0x26,0xc5,0xe1,0xb3,0x80,0x0d,0x62,0xaf,0x2d,0xbd,0xd6,0xe4,0xbb,0x16,0x82,0xc8,0x13,0x2a,0x6f,0xb9,0x06,0xbd,0xef,0x11,0x66,0x71,0xb8,0x9f,0x1e,0xe5,0xee,0x2e,0x37,0xfb,0x34,0xed,0xc5,0xa4,0x40,0x6e,0x38,0x31,0x0a,0x1c,0xaf,0x0d,0xd3,0x98,0xac,0x12,0x40,0xea,0x9c}},
+	{{0x6f,0x46,0xcd,0x96,0xc4,0x13,0xf4,0x11,0x62,0x49,0x8c,0x5c,0x78,0x27,0xef,0xc8,0xb9,0xe2,0x7d,0xf1,0x0d,0x37,0xf2,0xfe,0x85,0x35,0x82,0x60,0x23,0xb6,0x7b,0x17,0xd2,0x91,0xef,0x01,0x9e,0x99,0x35,0xab,0xc7,0xfb,0xa1,0xa3,0x13,0x44,0x3f,0x3c,0x16,0xcb,0xd8,0xf0,0xbf,0x9e,0x65,0x4d,0x07,0xe0,0xfd,0x8e,0x32,0x61,0x95,0xd5},{0xb7,0x81,0x16,0x2f,0xcb,0xa4,0x30,0x4e,0x6d,0xf5,0xf0,0x3f,0xfe,0xd9,0x81,0x20,0xa6,0x0e,0x2b,0xa8,0xc5,0xed,0x0d,0x9a,0x28,0x9c,0xe3,0xa9,0xb7,0xbf,0x87,0x0f,0xa5,0xf9,0x33,0xe7,0xa6,0x7f,0x9b,0xac,0xb6,0xcc,0xaf,0xfc,0xa7,0x4a,0x4d,0x36,0x39,0xa9,0xb6,0xf5,0x09,0xde,0x8d,0x37,0x11,0x07,0xd1,0x8a,0xf5,0x7b,0x66,0xe1},{0xcc,0xe0,0x07,0x62,0xbe,0x10,0x8c,0x3a,0xa2,0x96,0x5d,0x11,0xc7,0xd5,0x50,0xc3,0xbb,0x55,0x21,0xc5,0x40,0x27,0x7d,0xdb,0xad,0xd2,0x61,0x2a,0x42,0x5f,0x94,0x23,0x77,0x83,0x3a,0x99,0xe8,0xda,0x79,0x8c,0x1e,0xa8,0x44,0x04,0xec,0xf5,0xd1,0x55,0x1e,0x58,0xf1,0x6e,0x4d,0x27,0xa4,0x91,0xec,0x59,0xc8,0x17,0x36,0x58,0x2a,0x1f},{0x6d,0xf8,0x73,0xa3,0x38,0x61,0x1d,0x95,0x09,0xde,0xe5,0x26,0x1b,0x15,0x16,0xfb,0xf5,0x16,0xa8,0xf3,0x9e,0x3a,0x6b,0xb5,0x8c,0xee,0xa8,0x66,0x79,0xc3,0x9e,0xb4,0xe1,0xc2,0x85,0x0e,0x86,0x10,0x5a,0x4e,0x8b,0x4c,0x0a,0x7a,0xd8,0x8a,0x48,0xf4,0xa0,0x79,0x37,0xe3,0xa5,0x90,0x05,0x5e,0xbd,0xa1,0xf6,0x09,0x58,0x9c,0x6f,0x09},{0x66,0x47,0x6d,0x60,0x06,0x2d,0x90,0x8f,0xae,0x6c,0x01,0xe9,0xb0,0xf9,0x6b,0xa5,0x4a,0xe1,0xdb,0xd3,0x64,0x42,0x37,0x5c,0x11,0x40,0x7a,0xce,0x4e,0x83,0xc3,0x2c,0x2e,0xd2,0x67,0x76,0xfb,0x8c,0x5d,0xab,0xe8,0xb8,0xd6,0x2b,0xf8,0x86,0xff,0x96,0xf3,0xa8,0x0e,0x2b,0x1a,0x68,0xf5,0xe4,0xee,0x49,0xa6,0x8c,0x41,0x1f,0x97,0xbf},{0x81,0x92,0x4e,0xc6,0xab,0x00,0xdd,0xf9,0xf9,0xb7,0xe0,0x0a,0xa9,0x3f,0x0a,0xf9,0x32,0x73,0xf6,0x22,0xec,0x95,0xd9,0x20,0x8a,0x3f,0xeb,0x0d,0xc7,0x79,0x6f,0xb3,0x85,0xf4,0xe1,0x11,0xe1,0xcc,0xaa,0x1b,0xfd,0xf3,0x43,0xff,0x66,0x73,0x0f,0x09,0xcc,0xa4,0x6c,0xb8,0x2a,0x0f,0x53,0x58,0x63,0x32,0x06,0xd9,0x6b,0x1a,0x14,0x04,0x85,0x3f,0x2f,0x2b,0x05,0xfb,0xed,0xe9,0x08,0x0d,0x21,0x49,0xc9,0x79,0xdf,0x6f,0x77,0x89,0xd7,0x74,0x09,0x57,0x1a,0xd2,0xa7,0x43,0xbf,0x08,0x8e,0x98,0xbc,0x2f},{0xe3,0xb1,0xc4,0x81,0xe6,0xec,0x07,0x58,0xa4,0xcb,0x7e,0xd5,0xae,0x9d,0x43,0xf1,0xb7,0xe2,0x0a,0x1f,0xd5,0xe8,0x14,0xba,0x22,0xff,0xb7,0x20,0x76,0x08,0xdc,0x9a,0x44,0x4c,0x1c,0xcd,0x38,0x4d,0xb5,0xd8,0xa9,0x1b,0x9d,0xbb,0x13,0x5a,0x6c,0xe9,0x5d,0xa4,0x42,0x0e,0xde,0x9a,0x47,0x8a,0x2a,0x97,0x42,0x86,0x87,0x98,0x3f,0x04,0x85,0x3f,0x2f,0x2b,0x05,0xfb,0xed,0xe9,0x08,0x0d,0x21,0x49,0xc9,0x79,0xdf,0x6f,0x77,0x89,0xd7,0x74,0x09,0x57,0x1a,0xd2,0xa7,0x43,0xbf,0x08,0x8e,0x98,0xbc,0x2f}},
+	{{0xff,0xe3,0x69,0x7b,0x62,0x45,0x40,0x5f,0x1c,0x49,0x65,0xd6,0xae,0x24,0x16,0x84,0xfa,0x69,0x6c,0x1f,0x6c,0x65,0xee,0x52,0xe9,0x6c,0x54,0xc7,0x31,0x9b,0xc2,0x74,0x4f,0xc0,0x16,0xb8,0xf8,0x75,0x5f,0x45,0xb5,0xf3,0xa0,0xd9,0xbe,0x25,0x82,0xbd,0x3c,0x03,0xe0,0x14,0x15,0x6a,0xd5,0x64,0x08,0x65,0x13,0x33,0xc2,0xab,0xe0,0x45},{0x6f,0x5a,0x90,0x80,0x25,0x13,0xc2,0xa7,0xfe,0x1c,0xa1,0x07,0x81,0x4b,0x09,0xd3,0xbd,0xda,0x55,0xa8,0xaa,0x62,0x19,0x03,0xe9,0x9f,0x77,0xef,0xff,0xd4,0x5e,0x53,0xbc,0x9d,0x71,0xb8,0xc4,0xc2,0x85,0xb9,0xb4,0x3d,0x95,0xb8,0xfd,0x44,0xb7,0xc8,0x6f,0x93,0x15,0x04,0x16,0x7e,0x01,0xf2,0x09,0x23,0x96,0x69,0xe5,0x65,0x52,0x34},{0xaf,0xfe,0x4f,0x34,0x4e,0xfe,0x51,0xa5,0xb2,0xd8,0x31,0x74,0x7b,0xae,0xfb,0xb9,0x33,0xc1,0xdc,0x66,0xe6,0x95,0x9e,0xce,0x77,0x7d,0x55,0x3c,0xa6,0x6c,0x09,0x23,0x5a,0x1a,0x5e,0x1a,0x41,0xd3,0xad,0x5f,0x86,0xd0,0x14,0xf5,0xe0,0xda,0xf1,0xce,0x19,0x90,0x45,0x0c,0x4c,0xb1,0xd3,0xc8,0x4c,0xdb,0x7e,0x49,0xf5,0xac,0xde,0xff},{0x1b,0x9b,0x6b,0x30,0xd3,0x19,0x37,0x83,0xad,0x05,0xca,0xba,0x22,0x85,0x33,0x7f,0x55,0x60,0xe3,0x14,0x8c,0x39,0x87,0xd1,0x4c,0x21,0x27,0xa0,0xae,0x4a,0x56,0x15,0x50,0x6c,0x99,0xca,0xff,0xde,0x10,0xc6,0x9f,0x6c,0x70,0xd1,0x66,0xb4,0x87,0xd8,0xfc,0x46,0xf2,0xcf,0x0c,0xd8,0xc3,0x14,0x5d,0x27,0xbd,0xed,0x32,0x36,0x7c,0xed},{0x64,0x6b,0x74,0xc7,0x60,0x36,0xc5,0xe4,0xb6,0xde,0x02,0x1a,0x09,0xaf,0x65,0xb1,0x94,0xa3,0xf4,0x95,0xf5,0xb0,0xef,0x86,0xb5,0x13,0x26,0x0b,0xe8,0xc5,0x5c,0x77,0xf5,0xe6,0xb6,0x10,0x36,0x87,0xa3,0xd2,0x7c,0x17,0x2c,0xb9,0xb0,0x90,0x9e,0x8c,0x0a,0x7d,0x73,0xb2,0x29,0xeb,0xa7,0x85,0xd7,0x04,0x14,0xf9,0x77,0xb7,0xf4,0x89},{0x7f,0x1c,0x5a,0x57,0x14,0xf6,0x30,0x07,0xf9,0xfe,0x42,0x98,0xcb,0x3d,0xac,0x04,0x30,0x0d,0xc6,0xd0,0x4f,0x8a,0xbc,0xdd,0x3e,0xc3,0xb7,0x74,0xc8,0x3b,0x1a,0xcc,0x6a,0x54,0x9e,0xb9,0xbe,0xf0,0x7c,0x35,0x35,0x1a,0x50,0x4c,0xc2,0x38,0x41,0x46,0xc8,0xc4,0x81,0x2b,0x26,0x56,0x6f,0x8a,0x9f,0x74,0x87,0xe0,0x01,0x82,0xe2,0x09,0xf3,0x9a,0xc5,0x33,0x5a,0x7d,0xb6,0xbb,0xff,0x20,0x4d,0xc1,0x99,0x3d,0xcc,0x5a,0xc7,0xd1,0xbe,0x4c,0xcf,0xc8,0x09,0x79,0x15,0x5e,0x0c,0xc6,0x26,0x36,0xe6,0xd9},{0x4d,0x2f,0x08,0x84,0x32,0xcf,0xe0,0x3b,0xa8,0x3e,0xa5,0xf8,0x3a,0xe8,0xa9,0x04,0x5a,0x74,0x67,0xcb,0x41,0x22,0xc5,0xc4,0x9a,0xa5,0xc1,0xa7,0x94,0x8b,0xa5,0x35,0x00,0x00,0x1a,0xaf,0xfb,0xed,0x40,0xb8,0x2b,0x28,0xf1,0xb1,0x02,0xd3,0x8b,0xc0,0x32,0x4a,0xa5,0x0a,0xa4,0xc3,0xbf,0xb3,0xf5,0xb7,0x65,0x8e,0x88,0xdf,0xd0,0x0e,0xf3,0x9a,0xc5,0x33,0x5a,0x7d,0xb6,0xbb,0xff,0x20,0x4d,0xc1,0x99,0x3d,0xcc,0x5a,0xc7,0xd1,0xbe,0x4c,0xcf,0xc8,0x09,0x79,0x15,0x5e,0x0c,0xc6,0x26,0x36,0xe6,0xd9}},
+	{{0xc8,0x8e,0x1c,0xea,0x02,0x6a,0xfd,0x88,0x8b,0xa9,0x9d,0xdd,0xba,0xea,0x77,0x30,0x88,0x1a,0x93,0x49,0xda,0x05,0x18,0xbb,0x4a,0x6a,0x11,0xc4,0x48,0x72,0x77,0x1f,0x6e,0x2b,0x9a,0xe3,0x27,0xbe,0xe1,0x75,0x32,0x30,0xa6,0x12,0x26,0x44,0xbf,0xb2,0xa5,0x51,0x0b,0x48,0x3a,0xea,0xc5,0xd4,0x24,0x3f,0x4e,0xe8,0xe5,0xc3,0xfb,0xc2},{0xcb,0x56,0x3c,0x00,0x28,0x15,0x72,0x16,0x23,0x4e,0x2e,0x2c,0x8c,0xe8,0x7c,0x44,0x82,0x2a,0xe0,0x57,0xa3,0x0a,0xc4,0x42,0xb5,0x07,0xe1,0x1b,0x78,0x8b,0x3d,0x4d,0xcb,0xe4,0x56,0x72,0x0b,0x85,0x52,0xd8,0x55,0xe2,0xcd,0x38,0xd2,0x83,0xb6,0x05,0xd2,0x9f,0x63,0x9e,0x7f,0xca,0xe5,0x95,0x36,0x61,0x9b,0xca,0x09,0x27,0x53,0x82},{0x24,0x67,0x10,0xd6,0x8a,0x1a,0x8e,0xb8,0x53,0xef,0xb7,0x67,0x2a,0xfd,0xb8,0xd6,0xe3,0xf7,0x41,0x95,0x8c,0x50,0xca,0x1d,0x21,0x21,0x41,0xd1,0xef,0x2d,0x9b,0x53,0xa9,0x42,0xcd,0xda,0x6d,0x12,0x1b,0xbd,0x0a,0xe1,0x4d,0x95,0xc6,0xaa,0x40,0xfd,0x98,0xfb,0x26,0x21,0x5e,0xaf,0x8e,0x6b,0xc9,0x36,0x2c,0x66,0x31,0x24,0x45,0x87},{0x5e,0xf9,0x1d,0x10,0xb5,0x79,0x1f,0x80,0x85,0x90,0xc3,0x7f,0x2b,0x73,0xbf,0x83,0x0b,0x5d,0x46,0xae,0x79,0xef,0x09,0x71,0x29,0xfb,0x83,0xde,0x1f,0xe2,0xdb,0x1b,0xa2,0x22,0xee,0x50,0x21,0x9d,0x9c,0x35,0x14,0x48,0x13,0xa5,0xd1,0x68,0xf4,0x61,0x1f,0xd7,0xe2,0xd6,0x42,0x1c,0xdc,0x58,0xec,0x8b,0x03,0x6b,0xdf,0x64,0x06,0x30},{0xf9,0xa6,0x88,0x74,0x07,0x19,0x15,0x38,0xaf,0xac,0x07,0x10,0xe0,0xd9,0x22,0xf3,0x78,0xb0,0xbf,0x60,0xa3,0x0f,0xea,0x0f,0xa8,0x64,0xa9,0xa3,0x82,0xe1,0x4c,0x29,0x36,0x22,0x6d,0x43,0x9c,0xde,0x22,0xbf,0xc6,0x85,0xf7,0xe9,0xe0,0x79,0x80,0xfe,0x9d,0xd6,0x24,0xbd,0x29,0xa4,0x8c,0x35,0x21,0x87,0x45,0x7f,0x88,0xd9,0x9a,0x9d},{0x49,0x43,0x19,0x14,0xcc,0x4a,0x11,0x01,0x05,0xd1,0x4e,0x39,0x6d,0xb0,0x22,0x65,0x32,0x6e,0x67,0x04,0x50,0x85,0x53,0x42,0x90,0x2c,0xc0,0x63,0x2f,0xbd,0x15,0x90,0x1b,0x3f,0x03,0x90,0x16,0x7f,0x7b,0x49,0x74,0xd0,0x3d,0x81,0x80,0x1e,0x9e,0x2e,0xa9,0x13,0x6a,0x10,0x14,0xc1,0xfd,0xf9,0x25,0x3a,0x1d,0x52,0x93,0x0a,0x77,0x03,0xa2,0xdd,0xce,0x9f,0x2a,0x35,0xc9,0x93,0x7c,0xa2,0x2c,0xf6,0x38,0x73,0xb3,0xab,0x7f,0x55,0xb6,0x62,0xa2,0x8d,0x6a,0x3e,0x88,0x04,0x9b,0xa2,0x19,0x64,0x55,0x01},{0x22,0x03,0x49,0x58,0x76,0x3c,0x85,0x45,0x5e,0x73,0x78,0x8f,0x65,0xc9,0x50,0xf8,0xd7,0x16,0x92,0xa4,0xd1,0x79,0xce,0xf3,0x00,0x34,0x38,0xb8,0xcc,0x96,0x9f,0xa6,0x87,0x28,0xcb,0x19,0x28,0xad,0x83,0xb5,0x09,0x96,0x54,0xe8,0x2a,0xb9,0x9b,0xff,0x60,0x85,0x31,0x28,0x62,0x36,0xd2,0x0e,0xad,0x2a,0xe1,0x84,0x80,0xeb,0x6f,0x00,0xa2,0xdd,0xce,0x9f,0x2a,0x35,0xc9,0x93,0x7c,0xa2,0x2c,0xf6,0x38,0x73,0xb3,0xab,0x7f,0x55,0xb6,0x62,0xa2,0x8d,0x6a,0x3e,0x88,0x04,0x9b,0xa2,0x19,0x64,0x55,0x01}},
+	{{0xeb,0x18,0x95,0x94,0x5f,0x15,0x8c,0xb8,0x4d,0x6e,0x7d,0xc0,0x96,0x6c,0x52,0xa2,0x5f,0x43,0x67,0xc2,0x3a,0x10,0x5b,0xf1,0x8f,0x21,0x89,0x06,0x77,0xe9,0xab,0x2e,0xcd,0x17,0x9c,0x9a,0xd7,0x89,0x7e,0x53,0x58,0x60,0x9b,0xce,0x90,0xd9,0x13,0x2d,0x78,0xc4,0x2c,0x1c,0x4c,0xe8,0x23,0x70,0xff,0xa0,0x42,0x98,0x25,0x40,0xd6,0xd8},{0xb6,0xfb,0xdd,0x5d,0x35,0xf2,0x2b,0x89,0xda,0x8e,0x90,0xee,0x03,0x4e,0x75,0xdb,0x4c,0x45,0xc8,0x00,0xde,0x06,0x27,0xde,0x44,0xb5,0x5b,0xc7,0x56,0xc3,0xf5,0xbb,0xee,0xa6,0x21,0xd4,0xd9,0xb9,0x24,0x9c,0x4c,0xbc,0x23,0xe5,0xeb,0x05,0xb6,0xd0,0xd0,0xbf,0x49,0x95,0x01,0xb4,0x97,0xad,0xb5,0x71,0x8d,0x4b,0x32,0xd0,0xdd,0x1a},{0xfd,0x11,0xd7,0xe4,0x46,0xcd,0xd8,0x44,0x89,0x0a,0xe7,0x44,0x59,0xe9,0xcf,0x9f,0xd6,0xf1,0x74,0x56,0x04,0x78,0xfa,0x29,0x46,0x8a,0x8d,0x1b,0xbe,0x41,0x92,0x1c,0x8d,0x74,0x01,0x1b,0xc1,0xf8,0x26,0xf4,0xc2,0x68,0xc3,0x23,0x8c,0x68,0x7c,0x0a,0xad,0xdd,0x50,0x10,0xcf,0xdb,0x78,0xc5,0x79,0x28,0x37,0x63,0x92,0x1a,0x1d,0xea},{0xd2,0x2a,0xf0,0x66,0x15,0x8b,0xcb,0x83,0xcf,0x34,0xa1,0x33,0x6b,0xd5,0xa8,0x98,0x3b,0xd7,0x09,0x0d,0x70,0xa5,0x8a,0xc0,0x73,0xcf,0xde,0x59,0xd5,0x13,0x41,0xd2,0x43,0x8b,0xb4,0xc3,0x5b,0x6f,0xf1,0xed,0x47,0x76,0xe6,0x5e,0xb8,0x2a,0x7e,0x20,0x91,0xa0,0x9d,0xc1,0xa2,0x0a,0x6d,0x97,0x7d,0xeb,0xe3,0x64,0x5f,0x86,0xff,0x3e},{0x45,0xd8,0xdc,0xe4,0x3a,0x3a,0x44,0xdc,0x7f,0xa8,0x92,0x11,0x1b,0x4f,0xfa,0xcf,0x21,0xff,0xfb,0x20,0xb0,0x02,0x6d,0x0e,0x1c,0xde,0xe8,0x51,0xd8,0x2c,0x72,0x0e,0xbf,0xf6,0x9a,0xd3,0xd3,0xfe,0xfa,0x98,0x4e,0xc2,0xf0,0x16,0xda,0x39,0x93,0xc4,0xe0,0x33,0x9a,0x43,0xe8,0x7a,0xc5,0x0f,0x0b,0xa4,0x45,0xf0,0x5e,0x7a,0xa9,0x42},{0xdb,0x4e,0x17,0x76,0x8b,0x3c,0x98,0x7f,0x58,0x76,0x97,0xc9,0x3f,0x99,0x01,0x05,0x42,0x7e,0xfd,0x83,0x99,0xaa,0x19,0xb5,0x72,0x4c,0x69,0xed,0x6e,0x21,0x79,0x6e,0x3b,0x71,0xe5,0xab,0x23,0x84,0xe7,0xfe,0x58,0x2b,0x0d,0x1e,0x75,0x7c,0x29,0xb3,0x2d,0x66,0xc2,0x45,0x88,0xac,0x86,0x29,0xe4,0xaa,0x9e,0x71,0xa1,0x88,0xf9,0x06,0xda,0xa3,0xdd,0x7b,0x6c,0xd9,0xc9,0x73,0xe9,0x56,0xd1,0xee,0x5b,0xf9,0xae,0xc0,0x29,0xbe,0x20,0x6c,0xc7,0xf9,0xc5,0x2d,0x6d,0xad,0x8f,0x49,0xf8,0x17,0xdb,0x7a},{0xb8,0xb7,0xec,0xeb,0x3e,0x40,0x77,0x6c,0xab,0x10,0xfe,0x9f,0xd1,0x40,0xfe,0xd2,0x88,0x8e,0xb0,0x55,0xae,0x75,0xb1,0xcc,0x9d,0x6c,0x11,0x28,0x95,0x38,0x9f,0xb9,0x59,0xe2,0x29,0xc3,0xbc,0x09,0x16,0x1f,0x17,0x9e,0x15,0x78,0x09,0x61,0x07,0x9e,0xad,0x67,0x98,0xa9,0x24,0xff,0xf9,0x4b,0xa2,0x76,0x09,0xa0,0xd7,0x1b,0xed,0x05,0xda,0xa3,0xdd,0x7b,0x6c,0xd9,0xc9,0x73,0xe9,0x56,0xd1,0xee,0x5b,0xf9,0xae,0xc0,0x29,0xbe,0x20,0x6c,0xc7,0xf9,0xc5,0x2d,0x6d,0xad,0x8f,0x49,0xf8,0x17,0xdb,0x7a}},
+	{{0xc3,0x92,0x4d,0x01,0x9c,0xea,0x5a,0x8d,0xbd,0x5c,0x12,0x58,0x6d,0x03,0x26,0xbf,0xa4,0xdd,0xf7,0x26,0xa4,0x0d,0x22,0xe0,0xbd,0xcc,0x6f,0x30,0x9e,0xf9,0x4c,0x1f,0x03,0x52,0xab,0x38,0xe9,0x9c,0x08,0x9c,0x09,0xe5,0x87,0x5c,0x24,0x1a,0xe2,0x75,0xcb,0x18,0x8a,0x63,0x50,0xd1,0x23,0x45,0x49,0x93,0x40,0x2c,0x09,0xd4,0xac,0x39},{0xd4,0xe7,0xb7,0x05,0xfd,0xd6,0xf3,0x57,0xfb,0xc2,0x2f,0x2c,0x71,0x80,0xf5,0xc3,0xa6,0x0a,0x23,0x9d,0x1d,0xa8,0x68,0x10,0x8a,0xfa,0x68,0x9d,0x2b,0xcf,0x96,0xa9,0xe6,0x0e,0x07,0x32,0x23,0x09,0x87,0x16,0xc5,0xbb,0x76,0x22,0xfc,0xb4,0x59,0x6d,0x67,0xfd,0x29,0x51,0x95,0x4c,0xe2,0x8c,0x18,0xab,0xda,0x84,0xc3,0x62,0x80,0x14},{0xc9,0xa1,0xfe,0xc3,0x48,0x0d,0xee,0x54,0x44,0xff,0x9c,0x46,0x04,0x0e,0x74,0xda,0xa4,0x6a,0x56,0x02,0x5f,0x76,0x0e,0xb5,0xc1,0xc9,0xe9,0xb2,0x6e,0x07,0x49,0x0c,0xf7,0x4b,0xee,0xd6,0x0a,0xad,0x94,0x03,0x58,0x2d,0x60,0x95,0xf8,0x16,0x7b,0x49,0x0b,0x01,0x66,0x3e,0x17,0x01,0xe5,0x54,0x7d,0xd7,0xbb,0x10,0xd1,0xad,0xad,0x79},{0xb2,0xd8,0x10,0x29,0xeb,0xb8,0x4e,0x2b,0x39,0x85,0x5c,0xb3,0xdc,0xf5,0x87,0xca,0xca,0x9c,0x7a,0x8c,0x2b,0x08,0xe8,0x25,0xe2,0xcf,0x70,0xe2,0xe6,0xfb,0xdb,0x0c,0xc3,0x0d,0x71,0x11,0x83,0x65,0xf2,0x71,0x08,0x1b,0x32,0x6e,0x6c,0x51,0x50,0xf1,0xf6,0x4b,0x54,0x63,0x16,0x7f,0xfd,0x80,0x05,0x61,0x63,0xf1,0x80,0x6a,0x0b,0xfd},{0xa7,0x4b,0x75,0x38,0x90,0x64,0x96,0x7b,0xda,0x5e,0x08,0x9b,0x80,0xc4,0x72,0x3f,0x73,0xb2,0xdb,0xd3,0x4a,0xed,0xa4,0xdc,0x5c,0x79,0xe5,0x0f,0x7a,0xd3,0x0c,0xac,0xf9,0x99,0x5c,0x1a,0x0f,0xb3,0x1a,0x0f,0x5c,0xc3,0x9e,0x1a,0x2b,0xfa,0xc3,0xf0,0x40,0xe5,0x5f,0x36,0xd2,0x98,0x31,0xa1,0xaf,0x18,0x5f,0xae,0x92,0xf3,0x9e,0xc0},{0xf9,0xbf,0x52,0xe6,0xd3,0xe1,0x5d,0xd3,0x30,0xf3,0xa1,0x0c,0xc8,0x5a,0x97,0x55,0xab,0x67,0x67,0xd0,0x00,0x62,0x7b,0x80,0x70,0xbf,0x24,0xd0,0x09,0x8b,0x07,0x77,0xeb,0x3e,0xf0,0x5d,0xdf,0x7b,0xa9,0x7d,0xa4,0x6a,0x0d,0xf1,0xac,0x83,0x7d,0x64,0xb5,0xf4,0xc6,0xc4,0x12,0x0c,0x55,0x9f,0x67,0xbb,0xd5,0xe3,0xd3,0xdb,0x17,0x0f,0x90,0x2f,0x8f,0xc9,0xfd,0x4e,0x6c,0x8b,0xe6,0x99,0xfa,0xda,0x8f,0x1f,0xe6,0xc3,0xeb,0xd8,0x14,0x20,0xcc,0x3c,0x1c,0x23,0x77,0x28,0x9b,0x22,0x9a,0x5a,0x0c,0x43},{0xa2,0x78,0x37,0xc9,0x63,0xe1,0x31,0x36,0xc2,0x58,0xac,0xca,0xbb,0xa2,0x84,0xaa,0xb3,0x82,0xe2,0x19,0xb7,0x14,0x96,0x27,0x77,0xfa,0xa1,0x02,0xaa,0xff,0x55,0x82,0xba,0xc0,0x38,0x1a,0x69,0x35,0x48,0x87,0xc2,0xeb,0x48,0x08,0xea,0xc5,0x6b,0xfc,0x84,0x60,0x4e,0xce,0xd7,0xd2,0x86,0x8b,0x76,0xf3,0x46,0xe1,0x87,0x1f,0xff,0x09,0x90,0x2f,0x8f,0xc9,0xfd,0x4e,0x6c,0x8b,0xe6,0x99,0xfa,0xda,0x8f,0x1f,0xe6,0xc3,0xeb,0xd8,0x14,0x20,0xcc,0x3c,0x1c,0x23,0x77,0x28,0x9b,0x22,0x9a,0x5a,0x0c,0x43}},
+	{{0x0e,0xa6,0x0c,0xef,0x12,0xd6,0x7d,0x71,0xd4,0x88,0x73,0x86,0x9a,0x88,0x8f,0x5b,0xd1,0xb6,0x12,0xc4,0x93,0x8b,0x5f,0xee,0xdd,0x9c,0x2a,0x7f,0x4d,0xfd,0xba,0x00,0x09,0x45,0x77,0xd2,0xcf,0xcd,0x3a,0x6f,0x27,0x44,0xe2,0x55,0x3e,0x79,0x88,0x4d,0x5f,0x38,0x34,0xe8,0xe7,0xc6,0x3a,0xde,0xef,0x99,0x15,0xea,0x88,0x79,0xd7,0xca},{0xa0,0x9a,0x0a,0x3a,0x42,0x35,0x54,0x78,0xb9,0x82,0x52,0xb4,0xc8,0x5c,0x4a,0x03,0xa1,0xb9,0x27,0xcc,0x99,0xec,0x03,0xdf,0xdd,0x6e,0xde,0xef,0x8f,0x7f,0xdc,0x5a,0xc3,0xcb,0x0e,0xa2,0x7e,0x93,0xe6,0xdd,0xbd,0xf1,0x1b,0x03,0x29,0x63,0x72,0x11,0x72,0x3d,0x24,0x6f,0xdf,0x8e,0xed,0xa4,0xe2,0x2a,0x4c,0x00,0xe2,0xc4,0x55,0x1b},{0xb2,0xf1,0xff,0xf6,0x3a,0x26,0xe1,0x74,0x52,0xba,0xee,0x28,0xb6,0x56,0x90,0x59,0xde,0x92,0x5f,0x84,0xd1,0x87,0xe2,0x64,0xce,0xdc,0x94,0x3c,0xb4,0xf8,0x01,0x0a,0x86,0x2f,0xfe,0x79,0x03,0x72,0xfc,0x26,0x21,0xc3,0x1e,0xec,0x63,0x29,0x64,0xcb,0x5f,0xcc,0xb6,0x78,0xf7,0xc8,0xd1,0xf8,0x5c,0xc4,0x4b,0xc0,0xc3,0x75,0x3e,0x46},{0x03,0x4b,0xb9,0xd1,0x50,0xa3,0x79,0xbe,0x74,0xa3,0xb5,0xd8,0x28,0x1b,0x6d,0x72,0x68,0x0a,0x9b,0x19,0xc9,0x13,0xc4,0x04,0x94,0x0a,0xcb,0x72,0xff,0x7d,0xb6,0x9a,0x1c,0xfd,0xe4,0xa3,0x75,0x13,0x57,0x36,0xfe,0x4a,0xf6,0xbc,0xca,0xd9,0x34,0x9b,0xef,0x90,0x02,0xd9,0xbd,0xdd,0x6f,0x22,0x54,0x36,0xb2,0x3f,0x22,0x65,0xef,0xe7},{0x04,0xd4,0x43,0xe8,0x8c,0xc4,0xfb,0xe5,0x55,0xd0,0xa4,0xea,0x20,0xf8,0xe1,0x8f,0xc2,0xbc,0x1f,0x55,0xf1,0x8d,0xda,0xc0,0x85,0xa4,0xef,0x36,0x97,0x22,0x8b,0x8e,0x77,0x4c,0x1a,0xa4,0xa0,0x6f,0xe1,0xdc,0x32,0x47,0xc4,0x3a,0xd8,0x8a,0xbd,0x19,0x30,0x1c,0x96,0x7a,0xb2,0x23,0x7c,0x16,0x03,0xa7,0x4f,0xfd,0xa6,0x50,0xd9,0xf7},{0xdf,0xc2,0x59,0xd2,0xa9,0x9b,0x1e,0xca,0xf0,0x39,0x2f,0xf8,0xc2,0xf3,0x91,0x55,0x1b,0xba,0x81,0x3a,0x67,0x1a,0xd4,0xf4,0xb0,0x9f,0xb6,0x18,0x38,0x65,0x3e,0x67,0xa0,0x37,0xc2,0x9a,0xc7,0xee,0x72,0x8e,0x13,0x64,0xd1,0x0a,0xda,0xbd,0x8d,0xa4,0x28,0x55,0x3a,0x2c,0x78,0x41,0xc6,0xfc,0x1c,0x0f,0xf8,0xd7,0x5f,0xe6,0xde,0x0b,0xd5,0xc0,0xaa,0x2c,0x5c,0xac,0x46,0xeb,0xa4,0x35,0x2a,0xab,0x00,0x2e,0xc0,0x8b,0x42,0x65,0x2f,0x2f,0x13,0x84,0x60,0x15,0xa3,0x69,0xee,0xab,0x0e,0x50,0xbf,0x5f},{0xc1,0xb0,0xac,0x4c,0xfa,0x62,0x52,0x22,0xae,0x8c,0x94,0x38,0xd9,0x6e,0x10,0x94,0xe7,0xaa,0xc0,0x92,0x93,0x06,0x55,0xf9,0x2e,0xd9,0x10,0x4d,0xcb,0x82,0x19,0x1f,0x27,0x16,0x81,0xdd,0xea,0x7a,0xa8,0xce,0x5a,0xdd,0x37,0x77,0x24,0x57,0xfb,0x40,0x3d,0x1b,0x48,0x88,0xda,0xce,0xe8,0xd2,0xed,0xe0,0x6e,0x29,0xeb,0xdb,0x95,0x09,0xd5,0xc0,0xaa,0x2c,0x5c,0xac,0x46,0xeb,0xa4,0x35,0x2a,0xab,0x00,0x2e,0xc0,0x8b,0x42,0x65,0x2f,0x2f,0x13,0x84,0x60,0x15,0xa3,0x69,0xee,0xab,0x0e,0x50,0xbf,0x5f}},
+	{{0x3a,0x79,0x39,0x60,0xe9,0x93,0xad,0x78,0xf9,0x0b,0x99,0x64,0x71,0x76,0xad,0xdc,0x63,0xa3,0x38,0xbf,0x0a,0x36,0x22,0xcf,0x4f,0x84,0x3e,0x34,0xaf,0x0b,0xd4,0x5c,0xc0,0xa4,0x01,0x7c,0x07,0xc3,0xb4,0xcb,0xdb,0x39,0xdd,0x39,0xc7,0x5c,0xbd,0xcf,0x61,0x8b,0x72,0x74,0xd6,0x85,0xdc,0x5c,0x08,0x93,0x6d,0xe6,0xf1,0xeb,0xb9,0x7c},{0x71,0x12,0x20,0xbb,0x37,0xa6,0xd8,0x71,0xf7,0x58,0xaa,0xbd,0x30,0xfb,0xac,0x94,0x62,0x45,0xf0,0x1a,0xc3,0x4a,0x07,0x78,0x6d,0x17,0xf5,0x8d,0x69,0x3d,0x2e,0x15,0x96,0x48,0x1a,0xb0,0x7e,0xdd,0xf5,0x2d,0xe1,0x56,0xfc,0xe9,0x26,0x91,0x51,0xfe,0x5e,0x2a,0xdc,0x23,0x89,0x09,0x14,0xe6,0x17,0xa9,0x14,0x8c,0x8c,0xe8,0xe3,0x71},{0xe4,0xd0,0xa7,0x5a,0xce,0x93,0x1d,0x55,0xa2,0x3d,0xdd,0x7e,0x10,0x66,0x6d,0xc6,0x5c,0x87,0x9f,0x7a,0x52,0x5e,0x76,0x3f,0x09,0x9e,0xe5,0x8e,0x60,0x39,0x5e,0x3c,0x28,0x31,0xa4,0x12,0x39,0xfd,0xba,0xda,0xc8,0x59,0xdd,0x5b,0x26,0x78,0x8f,0x33,0xd2,0xc8,0x22,0x77,0x49,0xcf,0x34,0x61,0xbe,0x7a,0xa6,0x31,0xbe,0xe5,0xab,0xc2},{0x60,0xf5,0x52,0xbd,0xb1,0x9e,0x06,0xa3,0x94,0xad,0xe0,0x82,0x33,0x7c,0x41,0x17,0x5b,0x8a,0xbc,0x7c,0xce,0xd1,0x7e,0xfd,0x39,0x17,0xfd,0x90,0x5a,0x53,0x89,0x27,0x9f,0x27,0x7a,0x08,0xb2,0x66,0xda,0xb5,0xbf,0x3b,0x80,0xe2,0x1a,0x30,0x80,0x45,0x13,0xf3,0x4b,0x0c,0x4a,0xe9,0x0a,0x6e,0xf2,0x3e,0xa3,0x70,0x3d,0x89,0xd3,0xb2},{0x23,0x41,0x08,0x8d,0xa8,0x0b,0x6a,0xe0,0x65,0xb1,0x42,0x50,0x49,0xdd,0xd3,0xe8,0x89,0x13,0x7a,0x04,0xf0,0xd6,0x2f,0x6e,0x73,0xcd,0xdc,0x10,0xbb,0x02,0x6b,0xa2,0x25,0x58,0xa3,0x08,0x37,0x7c,0x8b,0x1f,0x4a,0x81,0x38,0x88,0xbd,0xf4,0x4f,0x24,0xe8,0xd6,0x9f,0x2f,0x13,0xeb,0x79,0x60,0x80,0x90,0x52,0x6b,0x8e,0xed,0xcb,0x77},{0x5b,0x88,0x63,0xaf,0xf9,0xe2,0x44,0x23,0xc8,0x02,0xe0,0x22,0x15,0x3d,0x2a,0xb7,0x40,0x76,0xe8,0x95,0xfd,0xa9,0xe3,0x85,0x94,0xa3,0xbb,0xce,0x61,0x19,0x0d,0xe2,0x95,0xdf,0x81,0x11,0x53,0x77,0xcd,0xf2,0xd8,0x4f,0xbf,0x19,0x6a,0x3d,0x4b,0xda,0xa4,0x56,0xa4,0xcd,0x9d,0x4f,0x52,0x53,0x7d,0xd8,0xac,0xe0,0xfb,0x9a,0x71,0x0c,0x59,0xf9,0x0b,0x03,0xf1,0x7b,0xaf,0x33,0xc3,0xe5,0x1e,0x8d,0x4f,0xbe,0x21,0xed,0x6b,0x15,0xdd,0xd2,0xeb,0x7c,0xe4,0x59,0x6c,0xf9,0x91,0xc1,0x3a,0x3a,0xb6,0x2b},{0x5e,0x54,0xe5,0x1b,0x3d,0x2c,0x00,0x80,0xdd,0xe4,0x10,0x50,0x98,0xb6,0x0e,0x3a,0xf7,0xde,0x67,0x2c,0x8e,0x7b,0xb4,0x73,0x0b,0xc7,0x12,0xb0,0x66,0x6b,0x3b,0x99,0xd9,0x33,0x78,0x5f,0x45,0xe5,0xec,0x15,0x02,0xfa,0x8b,0x86,0xfd,0xe0,0xb7,0x84,0x72,0xf2,0x68,0x5c,0xd6,0x2e,0x37,0xe9,0x49,0x32,0x2f,0xcd,0xcd,0x1e,0x99,0x0f,0x59,0xf9,0x0b,0x03,0xf1,0x7b,0xaf,0x33,0xc3,0xe5,0x1e,0x8d,0x4f,0xbe,0x21,0xed,0x6b,0x15,0xdd,0xd2,0xeb,0x7c,0xe4,0x59,0x6c,0xf9,0x91,0xc1,0x3a,0x3a,0xb6,0x2b}},
+	{{0xfc,0xb9,0x4e,0x4e,0x11,0xfe,0xe1,0xc5,0xc7,0x49,0x54,0xd2,0x2f,0x13,0x34,0x7c,0x91,0x7d,0x98,0x43,0xe4,0xb7,0x48,0xea,0xe8,0x26,0xcb,0x26,0x1f,0xe4,0x99,0x10,0xb9,0x34,0xc2,0xac,0xa3,0x2c,0xbd,0x9e,0x80,0xd4,0x12,0x3b,0xb3,0xf0,0x01,0xae,0x91,0x9f,0xba,0x77,0x32,0x4d,0x9d,0xac,0x1f,0x8d,0xad,0xa7,0x46,0x44,0x85,0xfb},{0x65,0x05,0x0b,0xd2,0x41,0xd3,0x58,0x2a,0x14,0xbc,0x7b,0x15,0x4a,0x6a,0x6a,0x18,0x71,0x09,0x25,0x33,0xac,0x73,0x53,0xab,0xd9,0x0d,0x8d,0xdf,0x95,0x59,0x7e,0x02,0x4c,0x03,0x11,0x5c,0xdc,0x80,0x19,0xd5,0x13,0x66,0x7f,0xf7,0xd7,0x23,0x18,0x40,0x84,0x16,0x6b,0x52,0x82,0x96,0x05,0x1b,0xfa,0xcb,0x4b,0x77,0x00,0x12,0xa0,0x28},{0x13,0xe0,0x16,0x1e,0x24,0x24,0xe9,0xde,0x9c,0x86,0xa9,0xcf,0x02,0x96,0xdf,0x8c,0x64,0xcb,0x3d,0x7d,0x8a,0x2a,0x73,0x18,0x20,0xc8,0xb0,0xac,0x10,0xa0,0x52,0x0c,0x6c,0x17,0xd9,0xbd,0x3c,0x3e,0xe5,0x0c,0x4a,0xdb,0x59,0xcc,0x59,0x15,0x08,0x1e,0xfe,0xaa,0xe3,0xd6,0xa1,0x37,0xd6,0xd5,0x6d,0x8e,0xcd,0x57,0xa9,0x81,0xb3,0x43},{0x46,0x28,0x2b,0xa0,0xe5,0xe3,0xf0,0x72,0xa7,0xbc,0x8d,0xec,0x45,0x31,0x6e,0xdb,0xb2,0x4b,0x20,0xbf,0x64,0x74,0x26,0x70,0x9b,0xd6,0xd3,0x7f,0x9f,0xc1,0x59,0x03,0x2d,0xda,0x6f,0xaa,0x7c,0x92,0xc6,0xe0,0xe8,0xaa,0x1e,0x26,0xf0,0x1e,0xcc,0xef,0x6d,0x87,0x04,0x3c,0xed,0x52,0x15,0xb3,0x9f,0x01,0x4e,0xe3,0x3c,0xb6,0xbb,0xac},{0x86,0x1a,0x25,0x8e,0x41,0x85,0xf9,0xba,0x98,0x15,0xb1,0xec,0x50,0xb4,0xd0,0xab,0x55,0x54,0xbb,0x3b,0x61,0xfc,0x54,0xf3,0x09,0xea,0xaa,0x6e,0xbf,0x03,0xc3,0x58,0x1d,0x24,0xb5,0xd5,0x45,0x5a,0x7a,0x14,0xc3,0x6a,0xa9,0xd8,0x6f,0x41,0xc3,0xb4,0x9a,0x05,0x71,0xbc,0x23,0x67,0xc2,0xa8,0xf5,0x7b,0x69,0xa5,0xe1,0x7a,0x35,0x1d},{0x3b,0xf5,0xa8,0xc0,0x2a,0x7d,0x85,0x88,0xd4,0xf4,0x26,0xd3,0xf4,0xe3,0x52,0x35,0x37,0x06,0x1e,0x71,0xc2,0x3b,0x7b,0xeb,0xf0,0x07,0x30,0x6b,0x37,0x31,0xb9,0x27,0xd8,0x0b,0x17,0xae,0xff,0xd4,0x7c,0x59,0xd7,0x2d,0xea,0xcb,0x92,0x2f,0x93,0xc7,0xd7,0xc3,0xaf,0x75,0x73,0x6a,0x3f,0x89,0xe5,0x13,0x0c,0x28,0x47,0xf4,0xa4,0x07,0xfb,0xd9,0x77,0xb4,0x1e,0xb2,0x70,0xca,0x85,0x22,0x58,0xc6,0x0b,0x19,0xc2,0xa5,0xba,0xc3,0xc9,0xb6,0x4a,0xdb,0x7d,0x4d,0x66,0xde,0xeb,0x8c,0x1a,0x23,0xb8,0x4c},{0x8c,0x57,0x0e,0x9f,0x0a,0xb2,0xf4,0x07,0xdd,0x7b,0x46,0xf8,0xa0,0xb1,0x33,0x4c,0x2b,0x1e,0x1a,0xe0,0x28,0x17,0x14,0xba,0x14,0x06,0x40,0x1f,0x30,0x0a,0x19,0xcd,0xe7,0xca,0xfb,0xdb,0xb9,0x76,0xf8,0x8a,0x81,0x3d,0x03,0x86,0x7e,0x66,0x75,0x1d,0xec,0xff,0x6b,0xa7,0xea,0x4c,0x8c,0x60,0xd2,0x1f,0x72,0x11,0x4c,0x5d,0xeb,0x01,0xfb,0xd9,0x77,0xb4,0x1e,0xb2,0x70,0xca,0x85,0x22,0x58,0xc6,0x0b,0x19,0xc2,0xa5,0xba,0xc3,0xc9,0xb6,0x4a,0xdb,0x7d,0x4d,0x66,0xde,0xeb,0x8c,0x1a,0x23,0xb8,0x4c}},
+	{{0x05,0x64,0x16,0x53,0xbb,0xb2,0x6e,0x81,0xfc,0xe6,0xec,0xc8,0x0c,0xc1,0x75,0x59,0x23,0xe2,0x4b,0xd8,0x6a,0x70,0x34,0x50,0x37,0xc6,0xc2,0xbd,0x27,0xfd,0xad,0x4c,0xee,0xe4,0xf7,0xfc,0x91,0x05,0x48,0x3c,0xd4,0x09,0x78,0x00,0xce,0x15,0x37,0xdc,0xe7,0xce,0x48,0x09,0x3e,0x7f,0x01,0x9b,0x03,0xc8,0x2f,0x9b,0xe6,0x42,0xe1,0x71},{0x64,0xbf,0x63,0x91,0xe5,0x3e,0x90,0x89,0x96,0xea,0x59,0x51,0x60,0x7b,0x5f,0xfe,0x0f,0x76,0x86,0x19,0x45,0x82,0xd9,0x5e,0x1a,0xd1,0xf6,0x04,0xc6,0xaa,0x71,0xda,0x80,0xed,0x75,0x51,0xc8,0x9a,0x27,0x09,0xc3,0x50,0xe4,0x14,0xa1,0xc3,0xf8,0x3a,0x6c,0x84,0xff,0x87,0xd5,0xf0,0xb0,0x3c,0x5a,0x57,0x14,0x90,0xc7,0x31,0xf8,0x47},{0x88,0x7d,0xcc,0x81,0x2b,0xbb,0x7e,0x96,0xbe,0x78,0xe1,0xb1,0xf2,0xed,0x6f,0xd8,0xff,0xbd,0x7f,0x8e,0xe5,0xeb,0x7f,0x7b,0xca,0xaf,0x9b,0x08,0x1a,0x77,0x69,0x1d,0xc2,0xa4,0x7c,0x4d,0xa6,0x74,0x8e,0x33,0x24,0xff,0x43,0xe1,0x8c,0x59,0xae,0x5f,0x95,0xa4,0x35,0x9e,0x61,0xb8,0xcc,0x4c,0x87,0xb9,0x76,0x53,0x20,0xa3,0xf3,0xf5},{0x13,0x2a,0xcc,0x07,0xb1,0x5f,0xc7,0xf1,0x08,0x0e,0x7d,0x7e,0x26,0x56,0xd8,0x16,0x9c,0xae,0xac,0xc4,0xf5,0x9c,0x15,0x67,0xae,0xc4,0xcc,0x3f,0xc0,0xaf,0x53,0x28,0x1f,0x65,0x14,0xe5,0x7f,0x0c,0xf5,0x7a,0xe3,0x93,0xc1,0xa3,0xd1,0x4a,0x09,0x7d,0x24,0xab,0x22,0xc4,0xc4,0xce,0x85,0x37,0x86,0xa8,0x9c,0x39,0x33,0xba,0x1b,0x83},{0x6d,0x3e,0x92,0x5a,0xa8,0xfa,0xe6,0x71,0x98,0xa8,0x82,0x38,0xcc,0xed,0xd6,0x92,0x7e,0x3e,0xcb,0xb2,0x82,0x92,0x7a,0x56,0x9e,0xd6,0x29,0x45,0x42,0x04,0x76,0x82,0xa5,0xfc,0xd9,0x0c,0x12,0x4c,0x98,0x04,0x2a,0x3a,0x98,0x01,0xb8,0x62,0xe8,0xe6,0x7c,0x51,0xe3,0x7d,0x97,0xf5,0x45,0xb4,0x13,0xdf,0x15,0x68,0xc3,0x00,0x75,0x40},{0x7e,0x89,0x3d,0x7c,0x78,0x36,0x3c,0x85,0xda,0xb6,0x9b,0x6d,0xbc,0x52,0x7d,0xc6,0xaa,0xfd,0x90,0x62,0xe4,0xc4,0x1a,0x5a,0x2e,0xa1,0x57,0xd7,0xda,0x57,0xf4,0x58,0xc5,0x23,0x61,0x21,0xe1,0x93,0xfa,0x06,0x22,0xed,0x41,0x66,0x24,0x47,0xb9,0xed,0xc8,0x84,0x25,0x28,0x39,0xec,0xfb,0x29,0xa1,0xcd,0xe1,0x9d,0x02,0x48,0x6f,0x0a,0xe2,0x9f,0x98,0xfd,0x3d,0x18,0xa1,0x24,0x9c,0xc6,0x75,0xb8,0x99,0x76,0x2a,0xa4,0x9e,0xb1,0x97,0x2d,0x1c,0x99,0x65,0x5f,0x1f,0xda,0x14,0x4f,0x10,0x49,0xf1,0x7a},{0x2c,0xec,0x27,0x63,0xd2,0x77,0x14,0x2d,0x01,0x18,0x10,0xe0,0x23,0x1b,0xa2,0x25,0x61,0xd4,0x52,0xd9,0x90,0xde,0x97,0x7e,0xb8,0xfa,0x38,0x25,0xf2,0x91,0x07,0x3e,0xc4,0xa9,0x3e,0xb5,0x67,0x02,0x28,0x94,0x5c,0x34,0xa1,0x0a,0x5c,0x54,0x53,0xd9,0xb4,0xc4,0x5a,0x8e,0x57,0x18,0xc3,0x35,0xea,0x47,0x75,0xe0,0x44,0x01,0x71,0x09,0xe2,0x9f,0x98,0xfd,0x3d,0x18,0xa1,0x24,0x9c,0xc6,0x75,0xb8,0x99,0x76,0x2a,0xa4,0x9e,0xb1,0x97,0x2d,0x1c,0x99,0x65,0x5f,0x1f,0xda,0x14,0x4f,0x10,0x49,0xf1,0x7a}},
+	{{0x41,0x10,0xd9,0x7f,0xb8,0x83,0x9e,0x42,0x43,0x7a,0xb0,0x6d,0xa6,0xcf,0xa5,0x7a,0x50,0x93,0x2d,0x13,0x94,0x37,0xa8,0x92,0x26,0x1f,0xad,0xe0,0x25,0x19,0x91,0x62,0x28,0xfb,0x18,0xbf,0x89,0xb0,0x42,0x80,0x14,0xcd,0xd2,0x72,0x84,0x1c,0xfd,0xe5,0xc3,0x71,0x3c,0x3f,0x12,0x5e,0xdd,0x53,0x39,0xf6,0x4b,0x9f,0xb3,0x5c,0xe3,0x15},{0xd0,0xc7,0x18,0x4d,0x68,0x9f,0xdd,0xec,0x81,0xf8,0xc6,0x0e,0x83,0x43,0x23,0x3d,0xfc,0xf3,0x66,0x55,0xa8,0x65,0x8b,0xd7,0x9b,0x3c,0x74,0x23,0xcd,0xae,0x60,0xe7,0x61,0xed,0x2c,0x7e,0xe7,0xa7,0x63,0x7d,0x72,0x47,0x6a,0x33,0x1c,0xaa,0x81,0xba,0x6f,0xd4,0x00,0xe7,0xa9,0x58,0xb2,0xad,0xee,0x3f,0x9c,0x70,0xff,0x2f,0x13,0x6f},{0x56,0x7b,0x19,0x66,0x42,0x9a,0x99,0x51,0x23,0x4f,0xb6,0xe7,0xcf,0x98,0xff,0x20,0x5a,0xc3,0x0e,0x36,0xc9,0xc6,0x20,0x25,0x0c,0x56,0x98,0xfb,0xbd,0xd6,0x66,0x4f,0x6f,0x94,0x85,0x8a,0x35,0xf3,0x50,0xad,0x87,0xde,0x95,0x9e,0xae,0x2a,0xd8,0xdd,0x78,0x87,0x96,0x2b,0xe0,0x12,0x95,0xd9,0x3b,0xb2,0x2a,0x06,0xe2,0xf0,0x06,0xd4},{0x42,0x24,0xdd,0x0a,0xd1,0x11,0x31,0x7e,0x56,0x45,0xb0,0x0e,0x86,0xc1,0x5d,0x8c,0x03,0x01,0xb8,0x33,0x20,0xbd,0x08,0x10,0xe5,0x70,0x92,0x2b,0x5b,0x86,0xd3,0x50,0x4c,0x1e,0xe3,0xd1,0x2a,0x4e,0x40,0x02,0x19,0x0b,0xf6,0x91,0xd9,0x9e,0xaa,0x54,0x7c,0x3d,0xba,0xc5,0x5a,0x9e,0xb2,0xbb,0x4e,0x0d,0x5b,0xdd,0x90,0xc9,0x7b,0xc2},{0x54,0x95,0xd5,0xdc,0x7e,0x7e,0xec,0xd4,0x67,0x08,0xdc,0x58,0xa9,0x80,0x8a,0x03,0x6a,0xf8,0x40,0xca,0x0d,0x5b,0x6c,0xe4,0xc9,0x71,0xa5,0xaf,0x2a,0xaa,0xe8,0x95,0x45,0xe7,0xe2,0xc3,0x47,0x84,0xc6,0xbe,0xe5,0x65,0xaf,0xcd,0x7c,0x20,0x5f,0x8b,0x19,0x61,0xe4,0xc9,0xc1,0x86,0xa5,0x6f,0x96,0xf3,0x9c,0x13,0x28,0x1b,0xcf,0x07},{0xc4,0x7f,0xf2,0x6f,0xcc,0x4a,0xf8,0xa4,0x1f,0x1d,0x6e,0x5e,0x30,0xb2,0x99,0x8f,0x5d,0x7c,0x26,0x1c,0x52,0x6f,0xd0,0x33,0xa7,0xf8,0xca,0x2a,0xc3,0x8c,0xa8,0xd1,0x50,0x4f,0xa7,0xe8,0xf2,0x10,0x4c,0xcd,0x8a,0x31,0x03,0xc8,0x93,0x2c,0xd7,0xe4,0x21,0xdb,0xa2,0x62,0x7b,0x1f,0x28,0x14,0x69,0x7e,0x87,0xac,0xf9,0xb4,0x97,0x00,0x62,0x86,0x14,0xd7,0xe4,0x65,0xdd,0x9e,0x1c,0x64,0x5f,0x3e,0xef,0xfe,0xa6,0x60,0x68,0x91,0x94,0x8a,0x1c,0x89,0xae,0xe4,0xcf,0x3a,0xdd,0xc0,0xb4,0x47,0xe8,0x8f},{0x12,0x80,0x00,0xda,0xce,0xc4,0x80,0x8f,0xa9,0xa1,0x5d,0x98,0x7d,0x2c,0xb2,0x9c,0x71,0xde,0x62,0x89,0x6a,0xe1,0x92,0xd7,0x96,0xdc,0xcd,0xc8,0x08,0x0e,0x48,0xbf,0x2a,0x53,0x72,0x90,0x31,0x71,0x49,0x02,0xda,0x4e,0x19,0x05,0x10,0xcb,0x41,0x97,0x44,0xdc,0x2d,0x1e,0x48,0xe5,0x0e,0x41,0x9d,0x7d,0x03,0xa3,0xe2,0x65,0xd4,0x01,0x62,0x86,0x14,0xd7,0xe4,0x65,0xdd,0x9e,0x1c,0x64,0x5f,0x3e,0xef,0xfe,0xa6,0x60,0x68,0x91,0x94,0x8a,0x1c,0x89,0xae,0xe4,0xcf,0x3a,0xdd,0xc0,0xb4,0x47,0xe8,0x8f}},
+	{{0x00,0x4b,0x0b,0xf5,0x1f,0x07,0x1e,0x23,0xe3,0x93,0x7b,0x31,0x41,0x2a,0x0a,0x50,0x35,0xe2,0xbb,0xfe,0x51,0x77,0x6c,0xc9,0xc5,0x13,0xb9,0x87,0x79,0x65,0x68,0x20,0xcc,0x09,0x90,0xa9,0xe4,0xef,0x9f,0x1a,0xe1,0x69,0x76,0x14,0x82,0x42,0x88,0x4b,0xdc,0xe0,0x10,0x22,0xe2,0xd6,0x36,0x7c,0x0b,0xd9,0x08,0xea,0xfa,0xe4,0xfd,0x45},{0x57,0x5c,0x1e,0x20,0xb4,0xae,0x9e,0x9d,0x04,0xfb,0x1a,0xd7,0x23,0xd8,0x8a,0x6b,0x1b,0xb2,0xef,0xa9,0x06,0x38,0xbb,0x9b,0x43,0x2e,0xf1,0x81,0x0b,0x76,0xec,0x20,0x46,0x1b,0xc4,0x71,0x19,0x3e,0x79,0xe8,0xcf,0xea,0xdc,0x4b,0x3f,0x0b,0xeb,0x05,0x13,0x1a,0x2c,0xfe,0x16,0xe9,0xf0,0xc4,0x9c,0x41,0xab,0x45,0x1b,0xba,0x05,0xec},{0x06,0x0b,0x73,0xec,0x30,0x74,0x0d,0x8d,0x13,0x4b,0xef,0xac,0x3b,0x05,0xb6,0xed,0x2b,0x05,0xd1,0xa7,0x65,0xb0,0xcb,0x69,0x00,0xeb,0x47,0xe3,0x1c,0x07,0x8b,0x15,0xbf,0x69,0xff,0x27,0xb4,0xdb,0x77,0xaf,0xe9,0x9a,0xfb,0xb2,0x28,0xa4,0xf9,0x05,0xe4,0x3c,0x66,0x56,0x00,0x1a,0x2c,0x41,0xf2,0xe1,0x11,0x09,0xfa,0xe1,0x50,0x49},{0xbc,0x4d,0x6f,0x75,0x79,0x77,0x64,0x6b,0xec,0xac,0x1a,0x26,0x73,0x9c,0xf3,0xf1,0x4d,0x79,0xbe,0x6f,0x0c,0x07,0x22,0xd1,0xa1,0x31,0x75,0xa8,0x9c,0xb6,0x00,0x63,0x0d,0x40,0x17,0xec,0x83,0xda,0x82,0x2c,0x3b,0xfd,0x90,0xe3,0xbc,0xc2,0x2c,0xf5,0x3e,0x41,0xe9,0x98,0x57,0xa2,0xb7,0xce,0x5f,0x31,0xbb,0x0b,0x05,0x61,0x0f,0x55},{0xb7,0xab,0xb2,0x84,0xf1,0x67,0x24,0x16,0x61,0xe9,0x20,0x33,0x0b,0xff,0x22,0x61,0x70,0xa0,0x5d,0xf6,0xa8,0x33,0xc9,0x30,0x73,0xe5,0x89,0x36,0x59,0xea,0xa8,0xe7,0x03,0xf6,0x14,0xc1,0x79,0xb6,0x42,0xa5,0xc8,0x6c,0xb8,0x94,0x29,0x24,0x00,0x09,0xb5,0x54,0x3f,0xe1,0x6b,0xfb,0x4d,0x2d,0xa9,0x9a,0x02,0xa1,0xa5,0x09,0xf4,0xcb},{0x92,0xfa,0x18,0x84,0x3e,0xdb,0xdf,0x7d,0x87,0xd6,0x2d,0x07,0x05,0x2c,0xba,0xe4,0x30,0x76,0xa2,0xe8,0x71,0x3b,0x1b,0x93,0x5b,0xce,0x2e,0xec,0x50,0x6e,0x4a,0x0b,0x2d,0xbe,0xa3,0x76,0x92,0xf8,0xc8,0x4a,0x71,0x66,0xec,0xfa,0x36,0xc5,0xdb,0xab,0x99,0x9c,0xbf,0x99,0x07,0xe8,0xfe,0xf4,0x2f,0x90,0x16,0x5d,0xdc,0xbe,0xfa,0x08,0x93,0xde,0x13,0xf5,0x32,0x45,0x9a,0xde,0xa2,0x5d,0xb9,0xe0,0x38,0x4c,0x6a,0xcc,0x13,0x46,0x27,0x28,0xbf,0xf8,0x7a,0x9c,0x2e,0xde,0x6f,0xfe,0xe1,0x86,0x41,0x79},{0xa7,0x32,0x52,0x76,0x4f,0x3e,0x1b,0xab,0x82,0x18,0x14,0xe7,0x42,0x32,0xb8,0xa4,0x98,0xde,0xa4,0xd7,0xae,0x42,0x84,0xda,0x71,0xf7,0x78,0x40,0x56,0x94,0x64,0x49,0x34,0x37,0xeb,0xe3,0x05,0x4c,0xb9,0xbb,0xce,0xb2,0x72,0xc0,0x75,0x1c,0xc4,0xd5,0x1e,0x3a,0xc1,0x43,0xda,0xd1,0x81,0x82,0xa9,0xd5,0x0e,0x0a,0x5e,0xc2,0xd7,0x04,0x93,0xde,0x13,0xf5,0x32,0x45,0x9a,0xde,0xa2,0x5d,0xb9,0xe0,0x38,0x4c,0x6a,0xcc,0x13,0x46,0x27,0x28,0xbf,0xf8,0x7a,0x9c,0x2e,0xde,0x6f,0xfe,0xe1,0x86,0x41,0x79}},
+	{{0xa3,0xdf,0x4a,0xfd,0xe6,0x74,0xb8,0xeb,0xed,0xe7,0x7e,0xd2,0xae,0xf8,0x40,0x80,0x3a,0x55,0x58,0x1d,0x6b,0xa4,0x32,0x6c,0x15,0xbb,0x67,0xdf,0x9e,0xb5,0x70,0x4b,0x7f,0x4d,0xfe,0x34,0x42,0x0c,0x4d,0xe3,0x97,0x87,0x6d,0x08,0xe8,0x4d,0x8a,0xa9,0xbc,0xbf,0x1b,0xb7,0x66,0x32,0xf4,0x7f,0x93,0xca,0xa4,0xd2,0x8f,0x02,0x7b,0xfa},{0xea,0xac,0xdf,0x25,0x39,0xf3,0x28,0xb6,0xbe,0xa8,0x4a,0x32,0x59,0x4b,0x4f,0xb5,0xd2,0xf7,0xf5,0x75,0x43,0x8b,0xb3,0x6a,0x98,0x8c,0x14,0xc9,0x3f,0x7e,0x5c,0x05,0xf0,0xeb,0x1d,0xc5,0xe6,0x1b,0x5d,0x7f,0x38,0x5d,0x9a,0xbe,0xc8,0x97,0x09,0x65,0x62,0x88,0x99,0xda,0x95,0x13,0x93,0xd9,0xa3,0x19,0x0a,0xa7,0x4a,0xb2,0x81,0xa4},{0x6e,0x70,0x65,0xaa,0x1b,0x16,0xcb,0xc1,0x59,0x6b,0xc9,0x4d,0xd1,0x0a,0x9d,0x8c,0x76,0x70,0x3c,0xc1,0xc1,0x66,0xa6,0x9f,0xfc,0xca,0xb0,0x3f,0x0e,0xe9,0xa9,0x36,0x09,0x4f,0x94,0xf3,0x32,0x25,0x34,0xf6,0xe4,0xf9,0x0b,0x0c,0xe6,0xe0,0x6d,0x9e,0xa5,0x52,0x82,0x9c,0xd4,0x43,0xa4,0xd1,0xd1,0x63,0x20,0xce,0xbc,0x4f,0x43,0xdc},{0x35,0xd6,0xc1,0x68,0xa6,0xd7,0xd3,0x36,0x82,0x2a,0x0f,0x29,0x3e,0xd6,0x15,0x29,0x19,0x73,0x14,0x78,0x87,0x86,0xca,0x9f,0x6e,0x17,0xea,0xaf,0x24,0x37,0xd6,0xb4,0xb0,0xee,0x84,0x90,0x2d,0x18,0xbd,0x26,0xc3,0xd4,0x39,0x4f,0x45,0xfa,0x2f,0x70,0xf2,0xe2,0x2a,0x2a,0x5c,0x65,0x15,0xcb,0xaf,0x92,0x9a,0xfc,0x06,0xe0,0x8a,0x1b},{0x5d,0xfa,0xc0,0x2b,0xc3,0x94,0x19,0xb4,0xd6,0x13,0xe3,0xcf,0x91,0xad,0x8c,0xe1,0x97,0x46,0xfe,0xea,0x74,0xe0,0x0c,0x03,0xf7,0x2e,0x51,0xa7,0xf2,0xbc,0xce,0xe8,0x6b,0xfd,0x2f,0x54,0x52,0x12,0x00,0x8d,0x95,0x91,0xc3,0xf6,0x25,0xf8,0x65,0x6a,0x9c,0x79,0x6b,0x71,0xc0,0x0c,0x29,0xfb,0xe7,0x14,0x9f,0x2f,0x1a,0x07,0x53,0x50},{0xe9,0xd4,0x46,0x0b,0x51,0x3f,0xf1,0xbe,0x0a,0x23,0xa5,0x38,0xa0,0xe3,0x70,0x14,0x63,0xf0,0x94,0xbb,0x1c,0x4f,0x23,0x05,0x1b,0x62,0x40,0x9b,0xf9,0x52,0x1b,0x41,0x51,0x57,0x2a,0x99,0x73,0xda,0xe1,0xcf,0xc5,0x4c,0x65,0x3a,0xc2,0x9d,0x73,0xda,0xc9,0x59,0xf1,0xdf,0xab,0x2b,0x27,0xe1,0x59,0x8b,0xa7,0x48,0xf9,0x36,0xcb,0x08,0xe3,0x5e,0x1d,0xdd,0xf9,0x20,0x4f,0x64,0xa9,0x26,0x74,0x97,0xf2,0x2d,0x31,0xac,0x8c,0x20,0x77,0x09,0xa9,0x8f,0xed,0x23,0x77,0x7e,0xd7,0x34,0x93,0x84,0xe7,0xaa},{0xaa,0xf7,0x64,0xdf,0x34,0x59,0x1c,0x2c,0xbc,0x47,0x08,0x6a,0x25,0xbf,0x9d,0x48,0x54,0xcf,0xa0,0x6c,0xfc,0xd4,0x10,0x39,0x9f,0x64,0x46,0xce,0xd9,0x95,0x28,0x89,0xdf,0x94,0x5e,0x74,0x0b,0x55,0x46,0x82,0xd9,0x3d,0x82,0x97,0x7d,0xd0,0x3e,0xd7,0xf6,0x6f,0xaa,0x97,0x3e,0xdf,0xa7,0xde,0xe3,0xc5,0xaf,0xd3,0xa0,0x5a,0x30,0x0d,0xe3,0x5e,0x1d,0xdd,0xf9,0x20,0x4f,0x64,0xa9,0x26,0x74,0x97,0xf2,0x2d,0x31,0xac,0x8c,0x20,0x77,0x09,0xa9,0x8f,0xed,0x23,0x77,0x7e,0xd7,0x34,0x93,0x84,0xe7,0xaa}},
+	{{0x96,0x4e,0xf2,0x1e,0x3a,0xe5,0x77,0xbf,0xa7,0x1c,0x3d,0x66,0x08,0x06,0xca,0x55,0x43,0x7a,0x08,0xf8,0xff,0x55,0xb3,0xbc,0x9a,0x83,0x9a,0x2e,0xe6,0x97,0x14,0x32,0x36,0x57,0x5c,0xa4,0x04,0x78,0xb1,0x92,0xf4,0x23,0x94,0xe6,0x2a,0xef,0xd4,0xe7,0xc4,0x02,0x9f,0xa9,0x79,0x77,0x61,0x90,0xd6,0xdb,0x6e,0x28,0x7e,0xc0,0x1d,0x70},{0xc5,0xd1,0x5c,0x34,0x15,0xa9,0x1e,0x42,0x2a,0x1b,0x0d,0xf0,0x56,0x83,0x10,0xc3,0xc9,0x21,0xfd,0x05,0xfa,0x51,0x0e,0x11,0x28,0xcc,0x84,0xac,0x35,0xb5,0xd8,0xc8,0x5c,0x80,0x11,0x1f,0x60,0x1c,0x72,0x25,0x82,0x45,0xb5,0x4f,0x66,0x6b,0x52,0xb1,0xf7,0x28,0x0f,0x80,0x76,0x44,0xdc,0x15,0x70,0x39,0xe9,0xaf,0xc7,0x0a,0xa0,0x43},{0xff,0x20,0x5e,0x3b,0x75,0xe9,0x38,0x7c,0xa3,0x5c,0x8b,0x1a,0xec,0x17,0x8d,0xf0,0xef,0xb3,0x53,0x9b,0x16,0xa9,0x44,0xf9,0x34,0x45,0x13,0x66,0x80,0x24,0xdc,0x22,0x0e,0x51,0x94,0xed,0xe6,0x83,0x36,0x32,0x63,0x23,0x1b,0xf8,0x78,0xb4,0x04,0x7f,0x5a,0x50,0x54,0x12,0x19,0x04,0x61,0xdd,0x25,0xf0,0x48,0x29,0x04,0xc1,0x44,0xe2},{0x46,0x32,0x2d,0xc7,0xbc,0x05,0x2a,0xd3,0xb5,0xce,0x7d,0x47,0x5e,0xfc,0x90,0x38,0xef,0xfa,0x6f,0x42,0xf0,0x66,0x05,0x89,0x7c,0x9a,0xc1,0xfd,0xa2,0xe8,0xa7,0x38,0x18,0x6d,0x7f,0x9e,0xfb,0xbd,0x06,0x0c,0x70,0xd7,0x29,0x10,0x88,0x04,0x9f,0x24,0x28,0x9d,0xc7,0x84,0xdf,0xb6,0xec,0xb2,0xc7,0x1b,0xd1,0xc1,0x9d,0x56,0xb0,0x83},{0xda,0xd7,0x34,0xee,0x62,0x13,0x8f,0x47,0xad,0xb4,0x9c,0x98,0xe4,0xc5,0xb3,0x29,0x31,0x11,0x64,0xad,0xf5,0x0b,0x60,0xe1,0x0e,0x18,0x28,0x30,0x3c,0xa2,0xe3,0x29,0x89,0x0a,0x7e,0x18,0xba,0x30,0x9e,0x7d,0x53,0xf1,0x82,0xd5,0x27,0xe5,0xf3,0xab,0x15,0xcd,0x62,0x7e,0xdf,0xf0,0x0e,0x42,0xfa,0x6b,0x7b,0x54,0xd2,0x74,0x19,0x8f},{0x29,0x4d,0x28,0x80,0x62,0xb5,0x77,0xbb,0x69,0x70,0xb0,0xb7,0x10,0x2e,0xed,0xfc,0x13,0x34,0x93,0x7f,0xd8,0xfc,0xb5,0x7b,0xfe,0x34,0x0a,0xa3,0x95,0x5b,0xb1,0xa7,0xc6,0xab,0x82,0x79,0x25,0x23,0x94,0x12,0xa4,0x34,0xec,0x23,0xca,0xcb,0xd0,0xa3,0xf9,0x31,0x32,0xce,0x50,0x31,0x73,0x23,0x98,0x94,0xe3,0x08,0xd9,0x1e,0xc3,0x0b,0x39,0xe3,0x3b,0xf2,0xe8,0xb7,0x26,0x28,0x9d,0xb3,0x12,0x8d,0x16,0xca,0x89,0x26,0xa9,0x1c,0xa3,0x1f,0x36,0x10,0x60,0x6a,0x29,0x85,0xe7,0x2c,0xee,0xc1,0xb6,0xae},{0x68,0xed,0x3c,0x64,0xe6,0x87,0xf0,0x14,0x64,0xfc,0x38,0x3a,0x0f,0xd9,0x7a,0x5b,0x52,0x32,0x10,0xca,0xc6,0x83,0x0b,0xae,0x17,0x0e,0xfe,0x77,0xe0,0xe7,0x83,0xa1,0x2c,0x78,0x62,0x9c,0x79,0x08,0x2b,0xd4,0x85,0x72,0x27,0x8d,0x97,0x78,0x62,0x33,0x34,0xeb,0x5c,0xde,0x5d,0xaa,0x4d,0xfa,0xd1,0x67,0xa4,0xea,0x45,0xad,0xf9,0x06,0x39,0xe3,0x3b,0xf2,0xe8,0xb7,0x26,0x28,0x9d,0xb3,0x12,0x8d,0x16,0xca,0x89,0x26,0xa9,0x1c,0xa3,0x1f,0x36,0x10,0x60,0x6a,0x29,0x85,0xe7,0x2c,0xee,0xc1,0xb6,0xae}},
+	{{0xd9,0x64,0xb2,0xe1,0x9f,0x0a,0x35,0xfc,0x9f,0xc3,0xa5,0x2a,0xa3,0x84,0xb4,0xf3,0x23,0xc4,0xf3,0x5a,0x9d,0xf8,0x7f,0x35,0xa9,0xf5,0x5b,0x68,0xfc,0x19,0x69,0x63,0x6a,0x13,0x19,0x32,0xcc,0x9d,0x0c,0x3c,0x7d,0xdd,0x85,0x16,0xa8,0xd9,0x2b,0x75,0x08,0x4b,0x9a,0xa5,0x6e,0xf3,0xe9,0xeb,0xed,0x5d,0x2e,0xfd,0x2e,0x0c,0x60,0xa2},{0x0f,0xf6,0x8c,0x3f,0x6e,0xee,0x56,0x4f,0x43,0x6f,0x54,0xbd,0x7a,0xe4,0xbe,0xa8,0x77,0x05,0x99,0xe7,0x9e,0x59,0x22,0x85,0x9b,0xc6,0xe4,0x2a,0x61,0x9c,0x19,0xb1,0x5a,0xeb,0x7a,0xf8,0x41,0x4e,0xe5,0x2a,0xd0,0xf7,0x44,0xf0,0x16,0xea,0x0c,0x04,0x19,0x6c,0xb6,0x30,0x3c,0x6e,0x2d,0x79,0x9a,0x8f,0x08,0x90,0x11,0xf1,0xc0,0x4d},{0x68,0xe7,0x1d,0x40,0xf1,0x07,0xc0,0xc6,0xb2,0x87,0x9c,0xa2,0x19,0x43,0x7a,0xdf,0x8a,0x5a,0x0f,0xe2,0x24,0x97,0xa0,0x38,0x79,0x20,0x38,0xa9,0x9c,0x77,0xc4,0x37,0xa6,0x02,0xe0,0x93,0x47,0xa4,0x55,0x21,0xc2,0x69,0xbe,0x09,0x05,0xaa,0x87,0x28,0xf1,0x95,0x2f,0xdb,0xf0,0xbf,0xd2,0x9e,0x5e,0x3a,0xfa,0xc6,0x2f,0x13,0x09,0xaf},{0xe1,0x9e,0xc8,0x4f,0xc9,0xdd,0x61,0x60,0x94,0xbc,0xd3,0xd6,0xde,0x11,0x6e,0xec,0x84,0xc4,0xdd,0xbe,0x20,0x46,0x6c,0xef,0xf6,0x9d,0x37,0x07,0x53,0x72,0x57,0xf9,0x02,0xb5,0x64,0x1f,0xe2,0x56,0xa4,0x38,0x6d,0xa4,0xed,0x23,0x9e,0xa3,0xf4,0x4d,0x77,0x52,0xdc,0x8c,0x51,0xfc,0x88,0x18,0xbc,0x83,0x2a,0xac,0xc1,0x1d,0x3d,0x59},{0x08,0x4f,0x78,0x21,0xfd,0x4b,0x85,0x86,0x4e,0x25,0xdd,0x47,0x60,0x7f,0x7e,0xc6,0xd3,0xa1,0xab,0x91,0x3f,0xeb,0xf6,0x40,0x7e,0x1b,0xbd,0x99,0x9c,0x7c,0x2f,0x4f,0xca,0x68,0xa5,0xf6,0x8c,0x1e,0xcb,0xb8,0x76,0xe2,0x87,0x5b,0x49,0x68,0x97,0x2c,0x21,0x5c,0x7c,0x93,0x79,0x9a,0x95,0xa1,0x3a,0x49,0xc9,0x6d,0x34,0x6b,0xa1,0x98},{0xb9,0x88,0x25,0x9a,0x3b,0x53,0x56,0xa1,0x48,0x0f,0xf0,0x92,0xde,0x4e,0x3e,0x3a,0xcf,0x02,0xdc,0x5c,0xc2,0xc3,0x78,0xad,0x8a,0x0c,0x3c,0xc7,0xdd,0xdd,0x71,0x6e,0x3f,0xd9,0x3a,0x57,0x2a,0x19,0xa5,0x3b,0x5c,0x46,0x7b,0xc9,0x0f,0x16,0xb3,0x58,0xa6,0x85,0xfa,0x91,0x2c,0x9a,0x9c,0x12,0xb6,0xd6,0x7d,0x9a,0xf0,0x9d,0xe9,0x02,0xad,0x12,0x87,0xda,0x85,0x58,0x6b,0xff,0x68,0x96,0x05,0x33,0xba,0x7f,0x08,0xf9,0xa9,0xa2,0xa9,0x46,0x43,0xe5,0x03,0x12,0xe4,0xbe,0x74,0xaa,0x46,0x4e,0x51,0xb3},{0x61,0x70,0x17,0x50,0x26,0xfa,0x51,0x83,0xe0,0xca,0xa9,0xb1,0xc3,0xc4,0x83,0xa9,0xb6,0x43,0x6b,0x7a,0x5b,0xe4,0x21,0x5a,0x6b,0xd4,0x34,0xf8,0xee,0x95,0x86,0x2d,0x03,0xbf,0xca,0xd0,0xfa,0x68,0x53,0xb2,0x97,0x50,0xad,0x89,0x2f,0x99,0x63,0x67,0x18,0x57,0x1f,0x57,0x41,0xbc,0xb7,0xc0,0x18,0xe7,0xb6,0xf3,0x0f,0xc4,0x49,0x0d,0xad,0x12,0x87,0xda,0x85,0x58,0x6b,0xff,0x68,0x96,0x05,0x33,0xba,0x7f,0x08,0xf9,0xa9,0xa2,0xa9,0x46,0x43,0xe5,0x03,0x12,0xe4,0xbe,0x74,0xaa,0x46,0x4e,0x51,0xb3}},
+	{{0xc5,0xdf,0x86,0x8f,0xf1,0xa7,0xad,0x57,0xfd,0xb4,0x53,0xc3,0x92,0x1b,0x9e,0x2e,0xdd,0xc5,0xa4,0x3b,0x72,0xa6,0x9b,0x4a,0x15,0xca,0x35,0xed,0x3c,0x1a,0x3b,0x38,0x36,0xd6,0xf2,0x03,0xb6,0x97,0x1f,0xcb,0x40,0x5d,0x3c,0x25,0xfc,0xe7,0xff,0xc6,0xbe,0x61,0xe1,0x98,0x31,0x13,0xa9,0xbe,0x05,0x86,0xfe,0x5c,0xf6,0xcc,0xaa,0xf5},{0xd2,0x57,0x19,0x98,0xf8,0x74,0x90,0xb7,0x69,0x6e,0xdd,0x44,0xf1,0x8b,0xb1,0x9c,0xfd,0x5b,0x6b,0xc0,0x45,0xf2,0x49,0xa5,0x4b,0xff,0x8b,0x7f,0x87,0xe3,0xf9,0x71,0xab,0xfa,0xc8,0x17,0xed,0xeb,0x19,0xc6,0x3c,0xee,0x78,0xba,0x89,0x97,0x49,0x85,0x39,0x68,0x29,0x88,0x0b,0x1c,0xd1,0x42,0x8b,0xe8,0x1a,0x3b,0xeb,0x4d,0xef,0x3b},{0xea,0xfb,0xec,0x27,0xc3,0x92,0xc3,0x68,0x0d,0x3c,0x5b,0x20,0x20,0x9c,0x96,0xa7,0x39,0xfa,0x80,0x91,0xef,0x86,0x7d,0xa8,0x87,0xf6,0xef,0x14,0x01,0x46,0xf0,0x68,0x0a,0x8b,0xae,0x83,0x91,0x7e,0xa0,0x14,0x14,0xde,0xf9,0xa8,0xfd,0x67,0x57,0x17,0x20,0x46,0x43,0x49,0x07,0xf0,0x3e,0xc8,0xbe,0x66,0xaf,0x58,0x3a,0xbd,0xd8,0x00},{0x35,0xf5,0xc8,0x2c,0x0e,0x4b,0x56,0xe0,0xef,0x08,0x34,0x38,0x57,0xe9,0xde,0xdb,0x1d,0xe1,0x28,0x05,0x01,0xed,0x62,0x3d,0xa9,0x6e,0xea,0x5b,0x95,0x09,0xe0,0x04,0x46,0xff,0xdc,0x34,0xf6,0xf7,0x63,0xb1,0x76,0xb8,0x3c,0x03,0xef,0x36,0x0f,0x82,0x1b,0x5b,0x6f,0xe2,0x86,0xd9,0x10,0x01,0xe6,0x73,0x75,0x0d,0x50,0x30,0x11,0x68},{0x27,0xb6,0x3b,0x78,0x79,0xf3,0x22,0x78,0x8f,0x0c,0x14,0x8b,0x3f,0x68,0xc2,0xab,0x9f,0x9f,0x05,0x70,0x7e,0xee,0x4b,0x1b,0x6b,0xfc,0x04,0x72,0xca,0xf1,0x9a,0xba,0xe3,0x65,0x9d,0xdb,0x01,0x33,0xc5,0xdb,0xf6,0x87,0xe4,0x73,0x5a,0x0f,0x94,0xa9,0x2e,0xfe,0x8f,0x3e,0xd1,0x0a,0x6d,0xa1,0x21,0x2a,0x92,0x8c,0x4b,0x43,0x13,0x2f},{0xa3,0xa8,0x3b,0xb4,0x4f,0x8a,0xac,0xab,0x8a,0x4c,0x39,0x7e,0xb8,0x2f,0xb1,0x01,0x2e,0xbe,0x0e,0x7d,0x28,0x8a,0x18,0x4a,0xda,0x58,0x1a,0xfb,0x95,0x97,0xf3,0x63,0x58,0xbe,0x8c,0x30,0x13,0x9b,0xba,0x9f,0x4e,0xac,0x8d,0x95,0xf2,0x07,0xbb,0x85,0xa1,0x41,0x4c,0x33,0xe3,0x58,0x8e,0x5c,0xa1,0x05,0x45,0xab,0x5c,0x0c,0xe4,0x02,0xc3,0xa0,0xa0,0x72,0xdb,0x9a,0x9d,0xbf,0x13,0x29,0x94,0x70,0x8b,0xe4,0xe8,0xdb,0x0e,0x0b,0xd0,0xa0,0x25,0xad,0x71,0xa0,0x27,0x9c,0x1d,0x77,0xb0,0x98,0xa8,0x03},{0xe1,0x84,0xa5,0xea,0xa5,0xd8,0x1b,0x29,0xce,0xd7,0xa3,0x72,0xa7,0xc9,0xa5,0xea,0xf1,0x02,0xf3,0x0c,0xb0,0x65,0x12,0xbc,0xa4,0xf2,0x5d,0x69,0x00,0xa4,0x7f,0x5a,0x52,0x09,0xb6,0x7b,0x30,0xf2,0x99,0x03,0x39,0x9d,0xee,0x6f,0xb5,0xf7,0x9e,0x7a,0x97,0x8b,0x81,0x03,0x8c,0xdd,0x35,0xfc,0x1f,0x0a,0xc6,0xa4,0x60,0x7b,0xc8,0x0a,0xc3,0xa0,0xa0,0x72,0xdb,0x9a,0x9d,0xbf,0x13,0x29,0x94,0x70,0x8b,0xe4,0xe8,0xdb,0x0e,0x0b,0xd0,0xa0,0x25,0xad,0x71,0xa0,0x27,0x9c,0x1d,0x77,0xb0,0x98,0xa8,0x03}},
+	{{0x67,0xe9,0x62,0x76,0x3a,0x90,0x9b,0x6b,0x19,0x1d,0x65,0xb2,0x2a,0x2f,0xf7,0x50,0xaa,0x54,0xa5,0xbb,0x53,0xb5,0xf9,0xee,0x0c,0x04,0x3a,0x3c,0x29,0x4b,0x66,0x3e,0x7b,0xb6,0xaa,0xd2,0x10,0x89,0xcc,0x89,0x2c,0x47,0xbe,0x23,0xd6,0x52,0x81,0x5d,0xc8,0xbc,0x49,0xd6,0x6a,0xcd,0x62,0x99,0x30,0xff,0x16,0xa5,0x50,0x44,0xd8,0x7a},{0xd6,0xcd,0xfe,0xd4,0x44,0x4a,0x9e,0x90,0x44,0x73,0x8a,0xff,0xbb,0x82,0x08,0xb6,0x7f,0xf2,0x87,0xcb,0xa5,0x0b,0x56,0xd3,0x9e,0x91,0xb8,0x52,0x6b,0x25,0xa6,0x5d,0x50,0xaf,0x9b,0xd5,0xfb,0x9f,0x7e,0x2d,0x57,0xdf,0x30,0x78,0x8d,0x1a,0xc3,0xac,0x9c,0x5a,0xbf,0xab,0x5a,0x0d,0xc9,0xb6,0x4b,0x18,0xd4,0xe7,0x55,0x40,0xde,0x7e},{0xc2,0xa9,0x7e,0x5c,0x26,0xf4,0x7d,0xce,0x9e,0x73,0xae,0x50,0xde,0xe7,0xa6,0xf9,0x8b,0x57,0xf9,0x7a,0x4c,0x38,0x82,0xf6,0x30,0x80,0x12,0xf7,0xf6,0x66,0x80,0x46,0x4d,0x41,0x53,0x63,0xd9,0x65,0x90,0xe7,0xee,0x24,0x07,0xb0,0x4f,0xeb,0x3e,0x8e,0x83,0x21,0xa3,0x40,0x03,0xc0,0x64,0x52,0xc6,0xb2,0x12,0x9d,0x8d,0x86,0xdd,0x19},{0xe2,0xd5,0x49,0x5e,0x2a,0x6e,0x4e,0xd9,0x31,0x26,0x53,0x13,0x98,0x5e,0x2f,0x23,0xea,0xa0,0x30,0xee,0xef,0x62,0x2b,0xdc,0x93,0x65,0x90,0xad,0x9a,0xf1,0x74,0x12,0xf5,0x24,0x33,0xcc,0xc3,0xda,0x42,0x54,0xa6,0x6c,0x86,0x99,0xb9,0xb5,0xf7,0x07,0x90,0xd8,0x85,0x7f,0x69,0xfb,0x19,0x2a,0x2c,0xc0,0x11,0x81,0x64,0x37,0x38,0x07},{0xc7,0xb3,0xf5,0xe4,0x4b,0x55,0xcf,0xd8,0x2b,0x72,0xde,0x62,0xfc,0x66,0xea,0x82,0xee,0x2e,0xe5,0x4f,0x66,0xba,0x19,0x63,0x01,0x0b,0x2d,0x89,0xb4,0xaa,0x76,0xb3,0x7e,0xc5,0xbe,0xdd,0x57,0x90,0x5e,0xff,0x5b,0x9a,0x71,0xe1,0x47,0xf9,0xec,0xe5,0xf0,0x19,0x89,0x17,0x65,0x3e,0x56,0x4a,0x98,0xb2,0x3c,0x3b,0xf0,0x14,0x13,0x1b},{0xc0,0x72,0x26,0x96,0x6b,0xf5,0x50,0xa1,0x65,0xcd,0xfe,0x92,0xa5,0x5a,0xb3,0x56,0x27,0x5b,0x2f,0x4a,0x8f,0x67,0xaa,0xf4,0xa1,0x6e,0x3c,0x66,0xcc,0xb7,0x71,0x70,0xff,0x70,0x1f,0x9e,0x09,0xae,0x31,0xcb,0x2a,0xd5,0x8a,0x38,0xa9,0xaf,0xbc,0x94,0xa2,0xa8,0xe9,0x77,0x1c,0xc3,0xfa,0xd1,0x45,0xd2,0xe2,0xff,0x7d,0xf2,0x44,0x00,0xa0,0xc3,0xc1,0xdd,0xa0,0x4c,0xfb,0xed,0x1a,0xbd,0x0c,0x05,0x3b,0xa9,0xc8,0x98,0xb0,0x7d,0x6a,0x77,0xcb,0x08,0x70,0x64,0x31,0x9d,0x9c,0x7b,0x40,0x9e,0xbb,0xf4},{0xbc,0x88,0x9d,0x36,0xae,0xbc,0x92,0x47,0x63,0x85,0x41,0xe3,0x1e,0x1c,0x39,0xf5,0xd3,0xc2,0x0a,0x7d,0x18,0x7a,0x8f,0xd3,0x0c,0x37,0x50,0x28,0x35,0x93,0x77,0x4b,0xcb,0xba,0x35,0x4e,0x94,0x48,0xe4,0x0c,0xa7,0x36,0x4f,0x74,0x2b,0xf9,0xb5,0xb5,0xeb,0x91,0x50,0x3c,0x67,0x9b,0x4d,0x25,0xd4,0x0e,0x0d,0xb9,0x5b,0x77,0xf3,0x0e,0xa0,0xc3,0xc1,0xdd,0xa0,0x4c,0xfb,0xed,0x1a,0xbd,0x0c,0x05,0x3b,0xa9,0xc8,0x98,0xb0,0x7d,0x6a,0x77,0xcb,0x08,0x70,0x64,0x31,0x9d,0x9c,0x7b,0x40,0x9e,0xbb,0xf4}},
+	{{0x44,0xdd,0x62,0x9e,0x0f,0xee,0x20,0x11,0x37,0xfc,0xd0,0x5c,0xe4,0xe1,0x0a,0xb8,0xc2,0xe0,0x9c,0x2c,0x3e,0x1b,0x31,0x1c,0xdb,0xa3,0x84,0x9a,0xb7,0x4e,0x40,0x74,0x21,0xfd,0xfc,0x65,0xbd,0x38,0x8a,0x55,0x6f,0x1e,0xc3,0x14,0xfc,0x66,0x04,0x7b,0xc4,0x61,0xb0,0xcb,0xfa,0xdd,0x50,0x45,0x4b,0x2e,0xf0,0x6d,0x0f,0x26,0x6d,0xbf},{0xe6,0xbc,0x35,0x73,0xb3,0x11,0x38,0xc6,0x31,0x82,0x96,0x80,0x1d,0xa9,0xd9,0x17,0x85,0x4e,0xad,0x0f,0x5c,0xb7,0xe8,0x78,0x62,0x2f,0x3c,0x10,0x0e,0xdc,0xf2,0x7e,0xf5,0x02,0x6d,0x1a,0x50,0xc2,0x50,0x7d,0x0d,0x14,0x77,0x77,0xfc,0xbe,0x23,0x02,0x81,0x0a,0xdc,0xa3,0x16,0xfd,0xab,0xb9,0x7c,0xb6,0x7e,0x8a,0xde,0x1f,0x22,0xeb},{0xab,0xf3,0xea,0x63,0xc0,0x25,0xa2,0xc7,0x6a,0xfe,0x91,0x4a,0x0a,0x91,0xdd,0x6d,0x6f,0x8c,0xf9,0xa8,0x1c,0x9f,0xb5,0xe5,0xd2,0xac,0xe6,0x51,0x9a,0xd3,0x87,0x17,0x82,0x12,0x0a,0x58,0x99,0x7f,0x81,0x2d,0x8d,0x27,0x2d,0x1b,0xb0,0x02,0x7e,0x0d,0xd6,0x18,0x89,0x5e,0x0c,0x2b,0x57,0xa6,0x56,0x35,0xff,0x71,0x4e,0xb0,0x49,0x38},{0x36,0xdf,0x1d,0x1c,0xf6,0xa7,0x4d,0x87,0x7e,0x2c,0x3f,0xb4,0xda,0xd7,0x80,0x71,0x0b,0xf3,0x2a,0x47,0x20,0xe6,0x9a,0x3d,0x17,0x9a,0x97,0xc9,0x4e,0x53,0xa6,0xe2,0x23,0xea,0x94,0x4d,0xf9,0xeb,0x2c,0x03,0x2c,0x88,0xa2,0xe6,0xc5,0x94,0xa5,0x6f,0xc3,0x98,0xa9,0x8b,0xa7,0x41,0x7d,0xd3,0x82,0x01,0x13,0xb6,0x0f,0x39,0x1e,0xd2},{0x08,0x28,0xc3,0x1c,0xec,0x21,0x3a,0xb4,0x4c,0xb1,0xfa,0xb9,0x0c,0xfe,0xc2,0x50,0xc5,0x99,0x62,0xa0,0x11,0x74,0xcf,0x05,0x1e,0x2b,0xdf,0x6d,0x22,0x8e,0x6e,0x55,0x19,0x21,0x9c,0xa1,0x98,0x56,0x45,0x90,0x40,0x3a,0x8e,0xad,0x76,0x4d,0xd3,0x95,0x27,0x67,0x4e,0x02,0x16,0xc3,0xfe,0x5a,0x79,0x4e,0x2d,0x6f,0xd0,0xe4,0x4f,0x62},{0x40,0x14,0xe1,0x88,0x3d,0xcc,0x51,0xcb,0x98,0x86,0x06,0x4d,0xe4,0x52,0x71,0xe2,0x2e,0x2b,0x80,0xfd,0x81,0x65,0xaf,0x93,0x31,0x87,0xe0,0xff,0x31,0xab,0xff,0x53,0x0e,0x2d,0xb1,0x47,0xe6,0x44,0xb7,0x29,0xab,0x0f,0x51,0x3a,0x53,0x84,0x36,0x58,0x8c,0x5f,0x7b,0x65,0x6a,0xb7,0x6f,0xdc,0xad,0xc1,0xa3,0xe4,0x21,0xfc,0x22,0x0e,0xc1,0x10,0xd1,0x7d,0x9f,0xd3,0x1e,0x33,0xb4,0xca,0xb9,0xff,0xd8,0x27,0xb8,0xca,0xde,0x49,0x6f,0xdc,0xf0,0xe8,0x70,0x36,0xdb,0x90,0x00,0x07,0x9e,0x77,0x39,0xfe},{0xc9,0x93,0x4b,0xe6,0x47,0x7e,0x1d,0x86,0x15,0x46,0xe8,0x27,0xf5,0x84,0x67,0x4e,0x42,0xe3,0x2b,0x8a,0x4e,0x90,0x7b,0x87,0xcc,0xdf,0xaa,0x04,0x06,0x05,0xe6,0x72,0xff,0x6f,0x44,0x1b,0x08,0xad,0x79,0x3e,0xb7,0xdd,0xd7,0x2c,0x73,0xf0,0xf0,0xc4,0x6e,0xb7,0x37,0xe1,0x02,0xf5,0x42,0xe7,0xef,0xa1,0xdd,0x50,0x9a,0xc5,0x8d,0x00,0xc1,0x10,0xd1,0x7d,0x9f,0xd3,0x1e,0x33,0xb4,0xca,0xb9,0xff,0xd8,0x27,0xb8,0xca,0xde,0x49,0x6f,0xdc,0xf0,0xe8,0x70,0x36,0xdb,0x90,0x00,0x07,0x9e,0x77,0x39,0xfe}},
+	{{0x3e,0x0c,0x21,0xc4,0x3d,0x64,0x61,0xc1,0x9d,0xa1,0x83,0x10,0x74,0x1d,0x56,0x12,0xaf,0x29,0x5c,0x6c,0x12,0x48,0x0a,0xc7,0xe5,0x12,0xb6,0x42,0x6b,0x54,0xf4,0x42,0x0c,0x43,0x42,0x2e,0x78,0xc2,0xe7,0x26,0x09,0x41,0x4a,0x2f,0xa1,0xb0,0x1f,0xcd,0x63,0x76,0x1e,0xa1,0x6f,0xf6,0xe2,0xc2,0x08,0x89,0x0d,0x28,0xbf,0x1b,0x56,0x5b},{0x3e,0x2e,0xf2,0xcc,0x81,0xca,0xa7,0x5d,0x01,0xd2,0x82,0xfd,0x45,0xee,0xc0,0xf5,0x49,0x3b,0xe2,0xa4,0x2a,0x4d,0x5f,0x40,0x0d,0xbc,0xb9,0x3d,0x6e,0xda,0xe2,0x86,0xe1,0x23,0x8b,0x5f,0x0d,0xa2,0x35,0x15,0x1d,0x22,0x23,0xa5,0x69,0x56,0x34,0x78,0xb3,0xb3,0x55,0xef,0x63,0x8a,0x17,0x63,0xda,0xf0,0x64,0x99,0x8a,0x8a,0xba,0xd6},{0x68,0x79,0x36,0xa7,0x6b,0xe3,0x76,0x1c,0xe3,0x38,0x0b,0xa3,0x91,0xb6,0xb0,0x82,0x37,0xfa,0x52,0x74,0xf1,0xb5,0xd5,0xd9,0x07,0x06,0x9e,0xda,0x87,0x6b,0x0f,0x24,0x4f,0xbe,0xc9,0xff,0x03,0x41,0xaf,0x77,0x68,0xed,0xe7,0x71,0xba,0x2d,0xde,0x27,0xa1,0xbf,0xa8,0xa7,0x30,0x7c,0xcb,0x79,0x72,0x89,0x1a,0xdc,0xc1,0xe4,0xb2,0x9d},{0x94,0xa3,0x11,0xf4,0x44,0x80,0xd0,0xa3,0x47,0x93,0x36,0xe2,0xbd,0x04,0xe4,0x74,0x3d,0x00,0x60,0xad,0xd0,0x2d,0x86,0x66,0xa1,0x72,0x1a,0xb9,0x1c,0x14,0xa2,0x9b,0x4b,0x04,0x7d,0x5b,0xcd,0xf8,0x01,0x33,0xde,0x34,0x10,0x29,0xc4,0x72,0x56,0xff,0x11,0xcd,0xd8,0x61,0x2c,0xb6,0xb7,0xf4,0x24,0x8b,0x44,0xb4,0xe7,0x34,0x50,0xb8},{0x72,0xf6,0xd4,0xa3,0x24,0xf9,0xef,0xf4,0x55,0x8d,0x3c,0x07,0xca,0x10,0xdd,0x54,0x87,0x13,0x32,0x78,0x5c,0x64,0x10,0x08,0x62,0x7e,0xf4,0x34,0x0f,0x1c,0xcd,0xcc,0x3b,0x42,0xfe,0x60,0x41,0x70,0x2c,0x6b,0xd4,0x6c,0xf7,0xb8,0x24,0xf6,0xd7,0x07,0xb3,0x46,0xb0,0x7d,0x14,0x24,0x9b,0x72,0x79,0xf4,0x23,0x2a,0xec,0x02,0xe7,0x69},{0xe5,0xbe,0x84,0xc3,0x92,0x47,0x15,0xd3,0xac,0x06,0x44,0x72,0x41,0xeb,0xb6,0x5a,0x17,0x06,0x90,0xd9,0x55,0x3d,0xe4,0x87,0x7d,0x5a,0x11,0x9f,0x02,0x6d,0xd3,0x4e,0x71,0xd1,0x5e,0x16,0x9f,0xb2,0xc0,0x7f,0xcb,0x78,0x8b,0x89,0x11,0xae,0x43,0xe8,0x85,0xb7,0xf9,0xc8,0x48,0x5a,0xb2,0x96,0xaf,0x8f,0xab,0x71,0x84,0x9d,0x40,0x09,0x30,0xd4,0x32,0x6e,0xa2,0x77,0x97,0x71,0x37,0xce,0x22,0x6b,0xca,0xc9,0x79,0xef,0xc0,0xb2,0xb4,0x3d,0x30,0xbf,0x77,0xe9,0xc3,0x8d,0xec,0x15,0x04,0x08,0xfa,0x15},{0x4b,0xf3,0x7f,0xb2,0x78,0x75,0x45,0xd4,0xce,0x5e,0x3d,0xaf,0x92,0x63,0x3d,0x90,0xc0,0xa7,0x23,0x62,0x7f,0x37,0x58,0x8d,0x12,0xe0,0xb8,0x6c,0x46,0x38,0xaa,0xf7,0xe1,0x03,0x9e,0x1f,0x31,0xf9,0x5a,0xa4,0x59,0x0d,0xec,0xc5,0x1f,0x17,0x88,0x25,0xcc,0xed,0x69,0x2b,0x91,0x73,0x6a,0x3f,0xcb,0xe5,0x9c,0x1e,0x26,0x3e,0xec,0x0b,0x30,0xd4,0x32,0x6e,0xa2,0x77,0x97,0x71,0x37,0xce,0x22,0x6b,0xca,0xc9,0x79,0xef,0xc0,0xb2,0xb4,0x3d,0x30,0xbf,0x77,0xe9,0xc3,0x8d,0xec,0x15,0x04,0x08,0xfa,0x15}},
+	{{0xc5,0x1d,0xcd,0x70,0xb2,0x9e,0x53,0x29,0x05,0x78,0x83,0x5d,0x56,0x30,0x89,0xee,0x02,0xd7,0xac,0x57,0x0a,0xd2,0xa0,0x9c,0x96,0x0c,0xbf,0xf2,0x30,0xbf,0x1a,0x2b,0xee,0x0e,0x9f,0x1e,0x1c,0x65,0x7d,0xb5,0x48,0xad,0x6f,0x51,0xa0,0x91,0x61,0xe4,0xe6,0x83,0x9f,0x58,0x7c,0x76,0x2b,0x52,0x94,0x87,0x3c,0x8d,0x36,0x4c,0x37,0x3c},{0x59,0x3b,0x0d,0x38,0xab,0x93,0xca,0xfb,0x67,0x44,0x30,0x96,0xec,0xbd,0x00,0x1d,0x93,0xd0,0xb3,0x3d,0x3c,0xd4,0x4e,0x3d,0xd8,0x29,0x93,0xb2,0xb3,0x77,0xfc,0x57,0x31,0x20,0xe3,0x90,0x0d,0xf4,0x91,0x2f,0x8b,0x43,0xce,0xfe,0x99,0x03,0x03,0xa2,0x90,0x8d,0xcf,0xa8,0xc0,0x21,0x00,0xca,0xcc,0xcb,0x4b,0x2f,0xa5,0x39,0xa8,0x0b},{0xca,0xf6,0xf9,0xbb,0x53,0xcb,0x97,0x76,0xb6,0x9c,0x2c,0x18,0x21,0x43,0x13,0x48,0x13,0xc9,0x0e,0xeb,0x40,0xea,0xce,0x1f,0x3a,0xe9,0xd2,0x9e,0x29,0xdb,0xe2,0x79,0xe2,0x1a,0x9f,0x84,0x9d,0xe4,0x55,0x82,0x17,0xeb,0x87,0xf6,0xc3,0xef,0xcd,0x54,0x14,0xee,0xc8,0x5b,0xd7,0x67,0x05,0xe2,0x34,0xa2,0x7e,0x81,0x83,0x21,0x7a,0x02},{0xc5,0x03,0xd9,0x75,0xdf,0x17,0x15,0xe3,0x5b,0x7b,0x4f,0x66,0x9c,0x15,0x4e,0x01,0xdf,0x3d,0x16,0xb6,0x52,0xcc,0xcf,0x28,0x40,0xdb,0x20,0xee,0x8b,0x69,0xb1,0x2b,0xc0,0x6e,0xe4,0xd2,0xf5,0xd1,0x49,0x3f,0xf3,0x0a,0x12,0xcd,0x13,0xbd,0x9d,0x3d,0x5b,0x28,0x5c,0xb0,0x0d,0x0e,0xb6,0xed,0xec,0x65,0xeb,0x25,0x28,0x2e,0x65,0x2f},{0xed,0xa7,0x05,0xc1,0xa6,0x81,0xf2,0x7a,0x69,0x68,0x17,0x8e,0xf7,0xc9,0x14,0x80,0x9f,0x81,0xfe,0x16,0xfd,0x81,0x93,0xb4,0x0b,0x05,0x5b,0x4e,0xef,0x6e,0x7a,0x67,0x9d,0x99,0x4c,0x17,0xcd,0x1c,0x16,0xfd,0x31,0x35,0xd5,0x3e,0xa3,0x00,0xbf,0xbe,0xda,0xd6,0xe2,0x37,0x9b,0x13,0x1b,0xca,0x29,0x90,0x4b,0xf2,0x09,0x57,0x2f,0xe9},{0xd7,0xba,0x23,0xd3,0xa0,0x6e,0x14,0x6a,0xf0,0x77,0xb7,0xe6,0xe3,0xc9,0x3b,0x38,0xbb,0xe7,0xbe,0x54,0x75,0xf8,0xb7,0x42,0x29,0xe2,0x83,0xde,0x20,0x22,0x41,0xcf,0x5f,0x6f,0x80,0x60,0xf3,0x44,0x04,0x21,0xd5,0x03,0x68,0x42,0xde,0x81,0xea,0xe8,0x7e,0x5b,0x80,0x0f,0x1b,0x2d,0x06,0xc7,0xce,0xe9,0x46,0xc7,0xf7,0xb3,0xa2,0x02,0x21,0xb5,0x4d,0xc2,0x36,0xea,0xe6,0x7b,0xb3,0x61,0xe6,0x18,0x40,0x5b,0xce,0x5b,0xc2,0xee,0xa5,0xde,0xe9,0xe6,0xe0,0xa8,0x58,0x58,0x03,0x34,0x26,0x27,0x65,0x2a},{0xfa,0x43,0xa6,0xc4,0x32,0xa1,0x2f,0xb6,0x37,0x05,0xf4,0xa4,0xa7,0x36,0xdd,0x1c,0x45,0x10,0x95,0x83,0x67,0x89,0x79,0x18,0x34,0xad,0xe7,0x57,0x7f,0x0d,0x48,0x9b,0x14,0xdf,0x5f,0xc8,0xd7,0x0f,0x78,0x47,0x88,0x20,0xff,0x7f,0xb1,0x21,0x27,0x14,0x58,0x32,0x12,0xfb,0x97,0xe0,0x81,0x0e,0x92,0xf4,0x5c,0x0e,0x44,0x48,0x4e,0x01,0x21,0xb5,0x4d,0xc2,0x36,0xea,0xe6,0x7b,0xb3,0x61,0xe6,0x18,0x40,0x5b,0xce,0x5b,0xc2,0xee,0xa5,0xde,0xe9,0xe6,0xe0,0xa8,0x58,0x58,0x03,0x34,0x26,0x27,0x65,0x2a}},
+	{{0x1e,0x89,0x12,0xe8,0xab,0xca,0xeb,0x96,0x78,0x43,0x89,0x79,0x26,0x61,0x86,0x2e,0x37,0xd7,0x94,0xb5,0xb9,0xf7,0xc9,0xe7,0x04,0x6c,0x96,0x1c,0x54,0x0d,0xb0,0x6c,0xd3,0x68,0x9b,0x53,0xa7,0x56,0x34,0x1b,0x65,0xff,0xf9,0xee,0xf1,0xc6,0xfd,0x7e,0xa8,0x42,0x59,0x60,0x06,0x5f,0xc2,0x89,0x8b,0xfc,0xf8,0x6c,0x9a,0x0d,0xb1,0x36},{0x52,0x3d,0x83,0x25,0x0f,0x57,0x81,0x76,0x7b,0x21,0xf7,0x96,0xd6,0x1f,0xfe,0xd7,0x7c,0xc1,0x32,0xb5,0xbc,0x05,0x46,0xdb,0x6f,0x25,0xd8,0x7a,0x68,0xe2,0x01,0x81,0xf8,0x9a,0xc5,0x29,0x78,0x1c,0x01,0xc5,0x4d,0x61,0x4e,0x75,0xdf,0x9f,0xc3,0x22,0x96,0x7c,0xf9,0xa7,0xed,0x41,0x6f,0x64,0xfd,0xd4,0x61,0x58,0x0d,0x49,0xc9,0xa4},{0x4a,0xf7,0xda,0xef,0xe0,0x3b,0x33,0x19,0x79,0x02,0x7a,0xbb,0xd3,0x53,0xf4,0x8c,0x8a,0x16,0xfb,0xbd,0x35,0xd9,0x70,0xb2,0x0a,0x06,0x05,0x14,0xd0,0x9e,0xf6,0x13,0x44,0xbb,0xb7,0x93,0x86,0x1b,0x3c,0xb0,0x54,0xa7,0x48,0xc2,0xa7,0x10,0xda,0x65,0xb2,0xdb,0x0f,0x85,0x23,0x57,0x77,0x44,0x23,0x20,0x6d,0x2e,0xde,0x20,0x01,0xed},{0x9c,0xb8,0x68,0xeb,0xbb,0x8b,0xaf,0x81,0x9c,0x2f,0x90,0x4c,0xc2,0x62,0x17,0xfc,0xf2,0xa5,0xab,0x4c,0x2e,0x69,0xcb,0x82,0x5f,0x4c,0x3c,0x82,0xcd,0x6a,0xcb,0x15,0xa2,0xfc,0x50,0x54,0x5e,0x2e,0x83,0x52,0x48,0x29,0x51,0xcc,0x50,0xaa,0x27,0xa3,0xf3,0x71,0xdb,0x2c,0x1c,0xa9,0x8a,0xa5,0x95,0xab,0x3e,0x6f,0xcd,0xba,0x22,0x7c},{0xf7,0x5d,0xb5,0x20,0x65,0xfe,0xa9,0xe7,0x1f,0x8e,0xd6,0xc0,0xf2,0x3f,0x1b,0x8c,0x7a,0x02,0x54,0xd8,0xa7,0x0e,0x6f,0x68,0x94,0x81,0xff,0x30,0x0e,0x6d,0x1a,0x96,0x1b,0x86,0x07,0xaa,0xbf,0x37,0xc5,0x5e,0x26,0xa2,0xdf,0x0b,0xd0,0x7f,0x94,0x35,0x30,0xa4,0x9e,0x47,0xaf,0xad,0x9c,0xc9,0x02,0x21,0x55,0x94,0x04,0x13,0xff,0x64},{0x9c,0x8d,0x18,0x63,0x83,0xad,0x01,0xcc,0xbb,0xe6,0x00,0xda,0x15,0xce,0xc6,0x6e,0x7a,0x37,0x6a,0x81,0x44,0xb3,0xfc,0xb7,0xcd,0x05,0xee,0x4a,0x6f,0x29,0xe4,0x79,0x63,0x52,0x7e,0x14,0xc9,0x14,0x77,0xa8,0x19,0x94,0x03,0xc6,0x51,0x57,0xf1,0xcc,0x11,0x29,0xde,0x86,0x08,0xfe,0x41,0x02,0x71,0xb7,0xbf,0xd7,0xe7,0x83,0x3e,0x0c,0x9a,0x59,0x7e,0xe8,0x61,0x36,0x56,0x9a,0xbf,0x64,0xfd,0xf3,0xb7,0xb9,0x2f,0x9e,0x56,0x1f,0x57,0x45,0x2e,0x19,0x0f,0x6f,0x70,0x01,0xc2,0x48,0x05,0x23,0x9b,0x2f},{0xb5,0x4e,0xe7,0xcc,0x7b,0x66,0x7a,0xf8,0xec,0xcd,0x1b,0x0c,0x0f,0xec,0x04,0x27,0xa0,0x61,0xfd,0x12,0x2d,0xab,0xc9,0xc5,0x8e,0xee,0x36,0xc2,0xef,0x67,0xd5,0x87,0x95,0x6c,0x12,0xb7,0x12,0x81,0x55,0xe0,0x7b,0xdb,0x8f,0x67,0xea,0x04,0x55,0x91,0x9b,0x50,0x65,0x05,0xc1,0xf1,0x0b,0x04,0x91,0x66,0x3c,0x32,0x53,0x72,0x01,0x04,0x9a,0x59,0x7e,0xe8,0x61,0x36,0x56,0x9a,0xbf,0x64,0xfd,0xf3,0xb7,0xb9,0x2f,0x9e,0x56,0x1f,0x57,0x45,0x2e,0x19,0x0f,0x6f,0x70,0x01,0xc2,0x48,0x05,0x23,0x9b,0x2f}},
+	{{0xc8,0x37,0x10,0xdc,0xdb,0xfc,0x51,0x91,0xae,0x37,0xa4,0xe0,0xcf,0xbb,0xdd,0x92,0x93,0x5f,0x6b,0xd6,0x81,0xbf,0x9b,0x24,0x5e,0x0d,0xf1,0xe4,0x04,0x89,0xd1,0x1b,0xb2,0x68,0x56,0x3a,0xdc,0x59,0xd0,0x8a,0x93,0x37,0x5d,0xa5,0x40,0x5e,0xfe,0xc9,0x41,0x0b,0x8a,0x50,0xd2,0xa0,0x94,0x86,0xf7,0x46,0x3b,0x7e,0x1d,0xea,0x2b,0xa8},{0x1b,0xe2,0xe6,0x48,0x86,0xa8,0x65,0xfd,0x2b,0xae,0xc7,0x7d,0x41,0xee,0xb2,0x80,0x33,0x1c,0x0a,0xdc,0x42,0xea,0x99,0xd0,0x1f,0x6d,0xc8,0x80,0x51,0x70,0xd4,0x19,0xae,0xfc,0x66,0x16,0xa2,0x53,0x27,0x19,0x7a,0xf2,0x9a,0x25,0x0c,0x39,0x8c,0xbf,0xe7,0xa3,0x7a,0xd6,0xa3,0x43,0x62,0xd2,0x4a,0xc2,0xf1,0x96,0x7e,0xe3,0x83,0x13},{0xf5,0xb1,0x2a,0xc5,0x4d,0xcc,0xdf,0x56,0xde,0x92,0x96,0x46,0x03,0x11,0xfc,0xa0,0xbc,0xa2,0x22,0xf7,0x25,0x74,0x2a,0x1f,0x27,0x34,0x18,0xe8,0x06,0xa4,0x77,0x26,0x1a,0x51,0x5e,0xfb,0x77,0xbc,0x55,0xb1,0xf8,0xa5,0x19,0x23,0x00,0x97,0xf7,0xbb,0xe4,0xcd,0x41,0x9e,0xd9,0x5e,0x0c,0x6b,0x1b,0x8a,0xba,0x52,0x93,0xbe,0x2c,0xf3},{0xb3,0x02,0xeb,0x44,0x3c,0x05,0xae,0x9c,0x94,0xa9,0x1f,0x72,0x41,0xbc,0x81,0x66,0x5f,0x50,0xc0,0x57,0xb4,0x44,0xf0,0xe1,0x2a,0xa9,0x88,0x69,0xa6,0x1c,0x05,0x85,0xda,0xc7,0xb2,0xe1,0x8c,0x2f,0x7c,0x49,0x37,0xa2,0xf2,0x56,0xab,0x12,0x9f,0x12,0x4b,0x1b,0x73,0x75,0x3f,0x30,0x0f,0x40,0xf1,0xf9,0x1d,0xa7,0x2c,0x98,0x8c,0x91},{0xcb,0xd3,0x39,0x60,0x56,0xe3,0xbd,0x65,0x86,0x1a,0x58,0x40,0xc0,0xa4,0xc4,0x8b,0xe5,0xf7,0x49,0x0a,0xf2,0x09,0x51,0x32,0x6e,0x06,0x5a,0x27,0x19,0x78,0x2e,0x3a,0x04,0xf9,0x34,0x80,0x49,0x39,0x93,0xcd,0x89,0x67,0x7b,0xc0,0x8d,0x9d,0x8d,0x4c,0x83,0x20,0x80,0xfc,0x00,0xf2,0x8a,0x8f,0xa4,0x4d,0x8e,0x8f,0x58,0x51,0x5b,0x71},{0x71,0x3f,0x90,0x41,0xb8,0x74,0xbc,0x7a,0x85,0xf5,0xab,0xca,0x7e,0xf2,0x70,0x41,0xbc,0x36,0xb5,0xc3,0x4e,0xf1,0x2b,0x17,0x35,0x40,0xdb,0x3c,0xdb,0xd2,0xec,0x0b,0x99,0xc1,0x43,0x17,0xad,0x38,0x45,0x2d,0x07,0x31,0xd7,0xb6,0x95,0x1c,0x89,0x25,0xe4,0x89,0x97,0xd3,0xcf,0x11,0x2f,0x63,0x31,0x51,0xa2,0x18,0xfc,0x12,0x04,0x0a,0xb0,0x33,0xce,0x0b,0x57,0xc0,0x8c,0x58,0x25,0xf8,0x9b,0x50,0x22,0x1c,0x5c,0x7b,0x02,0xc7,0xed,0xfc,0x98,0x8b,0xbd,0xd2,0x4e,0xfc,0x78,0x91,0x7f,0x4c,0x99,0x24},{0xfc,0x46,0xe4,0x85,0x0c,0x52,0x14,0xf8,0x8a,0xa4,0x97,0x17,0x10,0xb2,0x93,0xef,0xa0,0x66,0x3c,0xfd,0x61,0x42,0x24,0x30,0x70,0x4b,0xfd,0x0b,0x86,0xc8,0x97,0xd7,0x04,0xc2,0xa6,0x61,0x41,0xaf,0xcc,0x1d,0x52,0xc9,0xf3,0xca,0xe1,0x90,0x7c,0xbd,0xce,0xaf,0x30,0xc4,0xb4,0x7d,0x81,0x7e,0xbd,0xe2,0x09,0x70,0x1e,0x6b,0xb9,0x03,0xb0,0x33,0xce,0x0b,0x57,0xc0,0x8c,0x58,0x25,0xf8,0x9b,0x50,0x22,0x1c,0x5c,0x7b,0x02,0xc7,0xed,0xfc,0x98,0x8b,0xbd,0xd2,0x4e,0xfc,0x78,0x91,0x7f,0x4c,0x99,0x24}},
+	{{0x5f,0x01,0x6d,0xec,0x82,0x02,0x96,0x47,0x74,0xd9,0x73,0x2e,0x2e,0x17,0x00,0xb6,0xe0,0xa4,0x13,0x17,0xae,0x7f,0x85,0xcb,0xff,0xe7,0x96,0x99,0xdb,0x9f,0xad,0x21,0x60,0xd9,0x12,0xdc,0x41,0x01,0x33,0x66,0x4c,0x24,0x8b,0x25,0x17,0xd7,0x22,0x14,0x12,0x4d,0xad,0x82,0x9a,0x85,0x69,0x5e,0x35,0x10,0xe0,0xd7,0x1a,0x82,0x88,0x14},{0xab,0x5f,0x2c,0x7d,0xa2,0xe5,0x67,0x5f,0xe4,0x92,0x03,0x93,0xd7,0x13,0xa1,0xfa,0x4a,0xb7,0x18,0x4a,0x8e,0x8c,0x78,0x9a,0x0c,0x60,0x02,0xe8,0x2d,0x50,0x05,0x0f,0x92,0xee,0x9f,0x81,0xde,0x6b,0x20,0xe4,0x9b,0x17,0x2e,0x99,0x0f,0x01,0x31,0xa7,0xc5,0xc4,0x53,0x70,0xda,0x03,0xc6,0xf7,0x22,0x87,0x98,0x87,0x19,0x36,0xa6,0x49},{0x93,0xab,0x22,0xc4,0x39,0x6c,0x97,0x80,0xd2,0xe2,0x36,0xfa,0x31,0x74,0x67,0xcc,0x50,0x1b,0x95,0xbe,0x77,0xe0,0xd1,0x00,0x74,0x04,0xe1,0x4d,0xca,0x44,0x35,0x72,0x74,0x69,0x82,0x23,0x56,0x9b,0xcc,0x34,0x5a,0xcb,0xa2,0xa3,0x31,0x12,0x4a,0x84,0x4c,0xe9,0x37,0x3a,0x58,0xf8,0x79,0x65,0x4a,0x66,0x79,0x82,0xf4,0x5d,0x75,0xc3},{0x2d,0x5d,0xac,0x4f,0xb5,0x00,0x68,0x3b,0x5f,0x2e,0xdd,0xcb,0x14,0x4a,0x7f,0xad,0x12,0x45,0x91,0xd1,0x84,0xd8,0x14,0xff,0xcb,0x64,0x43,0x6d,0x65,0xe7,0x19,0x68,0x2b,0x5e,0x53,0x05,0x74,0x66,0xed,0xac,0x2f,0x5a,0x8f,0x70,0x96,0xab,0x29,0xf3,0x9a,0x59,0xa2,0xe2,0xef,0xd3,0xc9,0xd7,0x53,0xf8,0xf5,0xa3,0xd6,0xf4,0x34,0xf8},{0x1d,0x14,0xf3,0xfd,0xb0,0x66,0x20,0xff,0xfc,0x79,0x47,0xc7,0x4c,0xe9,0x45,0x67,0xf5,0x97,0x14,0xea,0x7c,0x63,0xc5,0x3f,0x0b,0x46,0xe0,0x88,0xd6,0x9b,0x67,0x71,0xba,0xa6,0x15,0x28,0x94,0x54,0x83,0x68,0x00,0x3a,0x33,0xa6,0x1a,0x05,0x6a,0x68,0x72,0x98,0x48,0x71,0xea,0x5b,0x47,0xf5,0x80,0x46,0xa9,0x57,0x84,0xec,0xad,0xfc},{0xa3,0x1d,0x87,0xd3,0x28,0x62,0xc6,0xf7,0xdb,0xfb,0xfa,0xfc,0xf3,0x27,0x5c,0x31,0xd3,0x32,0x26,0x0e,0x0f,0x41,0x49,0xec,0x05,0x16,0xf7,0xa5,0x63,0xb3,0xbc,0xe5,0x0d,0x1e,0x6f,0x97,0x4f,0x68,0x40,0xc0,0xd4,0x6c,0x4f,0x9e,0x25,0xd0,0xab,0x8d,0x2a,0xb9,0x3e,0x06,0x4d,0x9d,0x3d,0x2d,0x79,0x8d,0x93,0xdc,0xfc,0x6f,0x0b,0x04,0x48,0x7c,0x19,0x5c,0xa9,0xc8,0x44,0xe5,0xf6,0x4f,0x51,0xd8,0x72,0x63,0x41,0xda,0x62,0xac,0x78,0x73,0xb3,0x3e,0xc8,0xb2,0xf1,0x3f,0x89,0xf2,0x0e,0x95,0xdf,0xed},{0xfd,0x69,0xb1,0x9a,0xdb,0xae,0x95,0x87,0xe2,0xc6,0x8a,0x97,0x0c,0xee,0xc4,0x22,0x60,0x4e,0x96,0xa9,0x72,0xb9,0x6f,0x86,0x97,0xa8,0xdf,0x83,0xc5,0x18,0x18,0x6e,0xc9,0x43,0x30,0x7e,0x5b,0xcf,0x37,0x0f,0xc1,0xd7,0xe5,0xab,0xb1,0x31,0xe0,0x97,0xc7,0x53,0xb7,0xfd,0xd7,0xdf,0x00,0x43,0x0e,0x41,0x62,0x80,0x0b,0xe3,0xe0,0x06,0x48,0x7c,0x19,0x5c,0xa9,0xc8,0x44,0xe5,0xf6,0x4f,0x51,0xd8,0x72,0x63,0x41,0xda,0x62,0xac,0x78,0x73,0xb3,0x3e,0xc8,0xb2,0xf1,0x3f,0x89,0xf2,0x0e,0x95,0xdf,0xed}},
+	{{0x98,0x29,0xf7,0x57,0xfd,0xbd,0x44,0x3f,0xd9,0x90,0x98,0x19,0x97,0xf2,0x60,0x27,0xfd,0x08,0xfc,0x8a,0xc6,0xaf,0x87,0x22,0x7f,0x74,0x4a,0x80,0xaf,0x72,0x00,0x01,0x70,0x9b,0x47,0x2a,0xd2,0x8e,0x41,0x0a,0xea,0x6a,0xdf,0xb7,0x61,0x54,0x89,0x5e,0x01,0x9f,0x76,0x64,0x29,0xee,0x8d,0x85,0x20,0xff,0x30,0x58,0xc2,0xa3,0x2a,0x56},{0xea,0x69,0x8e,0x6b,0x8e,0xdd,0x55,0x22,0x45,0x61,0xd4,0x92,0x66,0x8e,0x96,0xaf,0x7e,0x40,0x28,0x72,0xc4,0x46,0xe7,0x88,0xd4,0x6c,0x74,0xb7,0x48,0x7f,0xe8,0xe1,0x5e,0xa5,0x85,0x62,0x8f,0xd6,0xfc,0x27,0x0a,0xb2,0x4b,0x38,0x94,0x59,0x52,0x0d,0x6a,0x4d,0xe5,0x61,0xce,0x0d,0x44,0x03,0xa6,0x2a,0xc2,0xd4,0xd4,0xe2,0x71,0xe3},{0x40,0xf0,0x82,0xf0,0x8d,0xaa,0xad,0xa9,0x9f,0x9b,0x85,0x02,0xcf,0x57,0x15,0x41,0x13,0x59,0xf2,0xba,0xdd,0xbf,0x93,0xe5,0x40,0x2e,0xaf,0xdd,0x43,0x52,0xc8,0x7f,0x40,0xad,0x91,0x5b,0x58,0xd1,0xa1,0xe8,0x6f,0x77,0xc3,0x41,0x35,0x5e,0xf7,0x03,0xba,0xe4,0xed,0x2c,0x28,0x59,0xd6,0x48,0xfe,0x50,0xcc,0xf9,0x80,0xd1,0x49,0xd1},{0xd7,0xa5,0xd9,0x13,0xdf,0x7d,0xf6,0xc6,0x25,0x0f,0x52,0xc2,0x57,0x61,0x20,0xf2,0xf0,0xdb,0x47,0x49,0x56,0xaf,0x89,0x11,0xa7,0x8d,0x09,0x3a,0xfe,0x45,0x43,0xef,0x9f,0x0c,0x42,0xaf,0xa8,0xcc,0x60,0x48,0xc0,0x1c,0x7c,0xbe,0x01,0xe2,0x88,0xcc,0x6c,0x3e,0x97,0x91,0xf3,0xd9,0xb2,0xb2,0x09,0x7e,0x35,0xb1,0x78,0xb4,0x03,0xf6},{0x08,0xc4,0x1a,0x3a,0xc3,0xe3,0x26,0xbd,0x8d,0xee,0x5d,0xf0,0xba,0xb6,0x65,0xff,0x77,0xc0,0x99,0xd1,0xca,0xdc,0xf5,0x4b,0x50,0x50,0x0a,0x9e,0x13,0x33,0x76,0x86,0x9b,0x39,0x79,0x78,0x73,0x5c,0x2f,0x69,0xa9,0x9e,0x0b,0xeb,0x11,0x1e,0x12,0xaa,0xc1,0x09,0x83,0x0f,0xca,0xcb,0x95,0x10,0xde,0x85,0xe3,0x75,0x62,0x4a,0xc2,0x4c},{0x68,0x78,0x6c,0xce,0x2f,0x72,0x80,0xfe,0x83,0x88,0x63,0x37,0xa7,0xa1,0x5a,0x0b,0x84,0x8a,0xda,0x28,0x84,0xf1,0x6a,0x63,0x24,0x1c,0x72,0xda,0x84,0xee,0x1d,0xe0,0x77,0xf0,0xf6,0xce,0x7e,0x79,0x0a,0x55,0x03,0x01,0x13,0x0f,0xf7,0x6b,0x45,0xe7,0xcb,0xfd,0xb0,0x37,0x93,0x4b,0x40,0x69,0xe0,0x77,0x67,0x72,0x65,0xee,0x35,0x08,0x00,0xc0,0x07,0x10,0xd8,0x6e,0x55,0x83,0x5a,0xbc,0xfa,0x67,0x80,0x8f,0xfa,0x21,0x3e,0x56,0x53,0x5b,0xbc,0x9d,0xff,0x16,0xd9,0x57,0xcf,0x2b,0x78,0x06,0x5a,0x89},{0xdf,0x32,0x1a,0x01,0x84,0xe5,0xb8,0x2c,0x70,0x6c,0xeb,0xd1,0xf0,0xb4,0x9b,0x32,0xc8,0xd0,0x81,0xc4,0xea,0xb2,0x7c,0x32,0x1a,0x02,0x61,0xf2,0xd9,0x4d,0xe5,0x85,0xad,0xfc,0xc6,0x70,0xee,0x85,0x77,0x07,0x9b,0x5d,0x5f,0x88,0xef,0xb6,0xd8,0xdf,0x2b,0xa2,0x4d,0x90,0x11,0x2d,0x38,0x3f,0xa8,0x84,0xf0,0x76,0xdd,0x31,0xd0,0x09,0x00,0xc0,0x07,0x10,0xd8,0x6e,0x55,0x83,0x5a,0xbc,0xfa,0x67,0x80,0x8f,0xfa,0x21,0x3e,0x56,0x53,0x5b,0xbc,0x9d,0xff,0x16,0xd9,0x57,0xcf,0x2b,0x78,0x06,0x5a,0x89}},
+	{{0x25,0x87,0x1e,0x6f,0xe8,0xd0,0xde,0x1d,0xd5,0xf2,0xd3,0x5b,0xff,0x9e,0x67,0x99,0x60,0xb4,0x0e,0xb7,0x98,0x1b,0x2a,0x3a,0x9c,0xec,0xc1,0xe1,0x2e,0x2b,0xc0,0x3e,0x3c,0xfb,0x64,0x91,0x72,0xc6,0x7e,0x57,0x47,0x00,0x97,0xbf,0x8e,0x0e,0xbf,0xad,0xd9,0x28,0x86,0x7c,0xfd,0x41,0x91,0xae,0x2d,0xee,0xc0,0xb2,0x32,0x7d,0x99,0x7d},{0x63,0xc1,0xf9,0x61,0x9c,0x9e,0x1a,0xd7,0xca,0xa3,0x71,0xd6,0x34,0x3d,0xa7,0x08,0x36,0x0c,0xec,0x37,0x35,0x94,0x1a,0x45,0xa9,0xfa,0xf2,0xb5,0x25,0x92,0xbf,0xd1,0x1e,0xca,0xdd,0x5a,0x23,0xad,0x9e,0x45,0xc3,0x66,0xcb,0x8f,0xda,0xa3,0xd1,0xe6,0x27,0x38,0x11,0x54,0x67,0x31,0x03,0x64,0x35,0xe0,0x68,0x0b,0x93,0xee,0x81,0x17},{0x8b,0x01,0xe9,0x99,0x54,0x54,0x73,0x15,0x0b,0xac,0x38,0x7b,0xe9,0xe3,0x17,0x4f,0x02,0x3e,0xe3,0x8e,0xda,0x41,0xa0,0x9d,0x10,0xe0,0xda,0x11,0xfe,0xec,0x2f,0x42,0xe7,0xc8,0xb3,0xde,0x2f,0x7b,0xfd,0xdf,0x7c,0x34,0x3b,0x5e,0xac,0x22,0x8c,0x99,0x3d,0xa1,0xa9,0xd9,0x81,0xb6,0x51,0xc8,0xaf,0x3e,0x75,0xed,0x45,0xcf,0xf7,0xb9},{0xaf,0xe9,0x9c,0x16,0x4a,0x8f,0x3b,0x0f,0xef,0x71,0x2f,0xaa,0x8d,0x7d,0xce,0xed,0xea,0x31,0x93,0xaf,0x2c,0x75,0xc6,0xfa,0xda,0x3e,0xa6,0xea,0x2a,0x3e,0x7b,0x72,0xb6,0xf8,0xd7,0x9a,0x88,0xcb,0x0b,0x81,0x97,0x24,0x29,0x3b,0x11,0x23,0x69,0xc2,0xff,0x98,0x39,0x25,0x99,0xae,0xe1,0x07,0x3e,0x97,0xde,0x10,0x21,0x23,0x7a,0x2d},{0xbe,0x2f,0xb9,0x4c,0x41,0x5a,0x9a,0xf6,0xfb,0xf8,0x26,0x9d,0x81,0x7f,0x39,0x91,0xaf,0x5b,0xf1,0xd7,0x93,0x0a,0xdf,0x18,0x19,0x4a,0x80,0x74,0x14,0x98,0x2b,0xf2,0x3b,0x25,0xc5,0xe8,0xfc,0x07,0x3f,0x5d,0xa1,0x39,0x27,0x4e,0x1c,0xd2,0x7a,0xfe,0x3e,0x7b,0x03,0x35,0x15,0x9e,0x35,0x2b,0xd0,0xbe,0x67,0x48,0x42,0xdd,0xa4,0xdd},{0xbd,0xcd,0xd7,0xbf,0xb1,0x0a,0xdb,0x9f,0x85,0x42,0xba,0xf4,0xc8,0xff,0xb0,0xe1,0x9a,0x18,0x6d,0x1a,0xe0,0x37,0xc1,0xa2,0xe1,0x1c,0x38,0x55,0x14,0xbf,0x64,0x67,0x84,0x47,0xb6,0x0a,0xf6,0x93,0xf1,0x10,0xab,0x09,0xf0,0x60,0x84,0xe2,0x4e,0x4b,0x5e,0xa2,0xd2,0xd1,0x19,0x22,0xd7,0xc4,0x85,0x13,0x23,0xa3,0x6a,0xb6,0x75,0x0f,0x43,0xe6,0xde,0x7b,0x67,0x2a,0x73,0x77,0x9e,0xb4,0x94,0x6c,0xc3,0x9a,0x67,0x51,0xcf,0xe9,0x47,0x46,0x0e,0x3a,0x12,0x7d,0x7c,0x66,0x73,0x6c,0xd5,0x4a,0x21,0x4d},{0x89,0x7e,0xd0,0xbf,0x2e,0x9f,0x0c,0xff,0x6e,0x56,0x25,0x9b,0x79,0x99,0x52,0x27,0xc2,0x3a,0xaa,0xf0,0x47,0x6d,0xed,0x05,0xa1,0xeb,0x9c,0x92,0x28,0x7f,0x1b,0xc8,0x1c,0x57,0x76,0xab,0x05,0xe3,0xd3,0xb7,0xa3,0xf5,0xac,0xa8,0x21,0x33,0x7c,0xb7,0xe7,0xc2,0xd0,0x25,0x6f,0xdf,0x34,0xd1,0xb0,0x34,0x41,0x46,0x30,0x9c,0x76,0x07,0x43,0xe6,0xde,0x7b,0x67,0x2a,0x73,0x77,0x9e,0xb4,0x94,0x6c,0xc3,0x9a,0x67,0x51,0xcf,0xe9,0x47,0x46,0x0e,0x3a,0x12,0x7d,0x7c,0x66,0x73,0x6c,0xd5,0x4a,0x21,0x4d}}
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
+static unsigned char fuzzbuf[1048576];
+
 static int testCrypto()
 {
-    static unsigned char buf1[16384];
-    static unsigned char buf2[sizeof(buf1)], buf3[sizeof(buf1)];
-    static char hexbuf[1024];
+	unsigned char buf1[16384];
+	unsigned char buf2[sizeof(buf1)],buf3[sizeof(buf1)];
 
-    for (int i = 0; i < 3; ++i) {
-        Utils::getSecureRandom(buf1, 64);
-        std::cout << "[crypto] getSecureRandom: " << Utils::hex(buf1, 64, hexbuf) << std::endl;
-    }
+	for(int i=0;i<3;++i) {
+		Utils::getSecureRandom(buf1,64);
+		std::cout << "[crypto] getSecureRandom: " << Utils::hex(buf1,64) << std::endl;
+	}
 
-    std::cout << "[crypto] Testing Salsa20... ";
-    std::cout.flush();
-    for (unsigned int i = 0; i < 4; ++i) {
-        for (unsigned int k = 0; k < sizeof(buf1); ++k)
-            buf1[k] = (unsigned char)rand();
-        memset(buf2, 0, sizeof(buf2));
-        memset(buf3, 0, sizeof(buf3));
-        Salsa20 s20;
-        s20.init("12345678123456781234567812345678", "12345678");
-        s20.crypt20(buf1, buf2, sizeof(buf1));
-        s20.init("12345678123456781234567812345678", "12345678");
-        s20.crypt20(buf2, buf3, sizeof(buf2));
-        if (memcmp(buf1, buf3, sizeof(buf1))) {
-            std::cout << "FAIL (encrypt/decrypt test)" << std::endl;
-            return -1;
-        }
-    }
-    Salsa20 s20(s20TV0Key, s20TV0Iv);
-    memset(buf1, 0, sizeof(buf1));
-    memset(buf2, 0, sizeof(buf2));
-    s20.crypt20(buf1, buf2, 64);
-    if (memcmp(buf2, s20TV0Ks, 64)) {
-        std::cout << "FAIL (test vector 0)" << std::endl;
-        return -1;
-    }
-    s20.init(s2012TV0Key, s2012TV0Iv);
-    memset(buf1, 0, sizeof(buf1));
-    memset(buf2, 0, sizeof(buf2));
-    s20.crypt12(buf1, buf2, 64);
-    if (memcmp(buf2, s2012TV0Ks, 64)) {
-        std::cout << "FAIL (test vector 1)" << std::endl;
-        return -1;
-    }
-    std::cout << "PASS" << std::endl;
+	std::cout << "[crypto] Testing Salsa20... "; std::cout.flush();
+	for(unsigned int i=0;i<4;++i) {
+		for(unsigned int k=0;k<sizeof(buf1);++k)
+			buf1[k] = (unsigned char)rand();
+		memset(buf2,0,sizeof(buf2));
+		memset(buf3,0,sizeof(buf3));
+		Salsa20 s20;
+		s20.init("12345678123456781234567812345678",256,"12345678");
+		s20.encrypt20(buf1,buf2,sizeof(buf1));
+		s20.init("12345678123456781234567812345678",256,"12345678");
+		s20.decrypt20(buf2,buf3,sizeof(buf2));
+		if (memcmp(buf1,buf3,sizeof(buf1))) {
+			std::cout << "FAIL (encrypt/decrypt test)" << std::endl;
+			return -1;
+		}
+	}
+	Salsa20 s20(s20TV0Key,256,s20TV0Iv);
+	memset(buf1,0,sizeof(buf1));
+	memset(buf2,0,sizeof(buf2));
+	s20.encrypt20(buf1,buf2,64);
+	if (memcmp(buf2,s20TV0Ks,64)) {
+		std::cout << "FAIL (test vector 0)" << std::endl;
+		return -1;
+	}
+	s20.init(s2012TV0Key,256,s2012TV0Iv);
+	memset(buf1,0,sizeof(buf1));
+	memset(buf2,0,sizeof(buf2));
+	s20.encrypt12(buf1,buf2,64);
+	if (memcmp(buf2,s2012TV0Ks,64)) {
+		std::cout << "FAIL (test vector 1)" << std::endl;
+		return -1;
+	}
+	std::cout << "PASS" << std::endl;
 
 #ifdef ZT_SALSA20_SSE
-    std::cout << "[crypto] Salsa20 SSE: ENABLED" << std::endl;
+	std::cout << "[crypto] Salsa20 SSE: ENABLED" << std::endl;
 #else
-    std::cout << "[crypto] Salsa20 SSE: DISABLED" << std::endl;
+	std::cout << "[crypto] Salsa20 SSE: DISABLED" << std::endl;
 #endif
 
-    std::cout << "[crypto] Benchmarking Salsa20/12... ";
-    std::cout.flush();
-    {
-        unsigned char* bb = (unsigned char*)::malloc(1234567);
-        for (unsigned int i = 0; i < 1234567; ++i)
-            bb[i] = (unsigned char)i;
-        Salsa20 s20(s20TV0Key, s20TV0Iv);
-        long double bytes = 0.0;
-        uint64_t start = OSUtils::now();
-        for (unsigned int i = 0; i < 200; ++i) {
-            s20.crypt12(bb, bb, 1234567);
-            bytes += 1234567.0;
-        }
-        uint64_t end = OSUtils::now();
-        SHA512(buf1, bb, 1234567);
-        std::cout << ((bytes / 1048576.0) / ((long double)(end - start) / 1024.0)) << " MiB/second (" << Utils::hex(buf1, 16, hexbuf) << ')' << std::endl;
-        ::free((void*)bb);
-    }
+	std::cout << "[crypto] Benchmarking Salsa20/12... "; std::cout.flush();
+	{
+		unsigned char *bb = (unsigned char *)::malloc(1234567);
+		for(unsigned int i=0;i<1234567;++i)
+			bb[i] = (unsigned char)i;
+		Salsa20 s20(s20TV0Key,256,s20TV0Iv);
+		double bytes = 0.0;
+		uint64_t start = OSUtils::now();
+		for(unsigned int i=0;i<200;++i) {
+			s20.encrypt12(bb,bb,1234567);
+			bytes += 1234567.0;
+		}
+		uint64_t end = OSUtils::now();
+		SHA512::hash(buf1,bb,1234567);
+		std::cout << ((bytes / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second (" << Utils::hex(buf1,16) << ')' << std::endl;
+		::free((void *)bb);
+	}
 
-#if defined(ZT_USE_X64_ASM_SALSA2012) && defined(ZT_ARCH_X64)
-    std::cout << "[crypto] Benchmarking Salsa20/12 fast x64 ASM... ";
-    std::cout.flush();
-    {
-        unsigned char* bb = (unsigned char*)::malloc(1234567);
-        double bytes = 0.0;
-        uint64_t start = OSUtils::now();
-        for (unsigned int i = 0; i < 200; ++i) {
-            zt_salsa2012_amd64_xmm6(bb, 1234567, s20TV0Iv, s20TV0Key);
-            bytes += 1234567.0;
-        }
-        uint64_t end = OSUtils::now();
-        std::cout << ((bytes / 1048576.0) / ((double)(end - start) / 1024.0)) << " MiB/second" << std::endl;
-        ::free((void*)bb);
-    }
-#endif
+	std::cout << "[crypto] Benchmarking Salsa20/20... "; std::cout.flush();
+	{
+		unsigned char *bb = (unsigned char *)::malloc(1234567);
+		for(unsigned int i=0;i<1234567;++i)
+			bb[i] = (unsigned char)i;
+		Salsa20 s20(s20TV0Key,256,s20TV0Iv);
+		double bytes = 0.0;
+		uint64_t start = OSUtils::now();
+		for(unsigned int i=0;i<200;++i) {
+			s20.encrypt20(bb,bb,1234567);
+			bytes += 1234567.0;
+		}
+		uint64_t end = OSUtils::now();
+		SHA512::hash(buf1,bb,1234567);
+		std::cout << ((bytes / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second (" << Utils::hex(buf1,16) << ')' << std::endl;
+		::free((void *)bb);
+	}
 
-#ifdef ZT_USE_ARM32_NEON_ASM_SALSA2012
-    if (zt_arm_has_neon()) {
-        std::cout << "[crypto] Benchmarking Salsa20/12 fast arm32/neon ASM... ";
-        std::cout.flush();
-        {
-            unsigned char* bb = (unsigned char*)::malloc(1234567);
-            double bytes = 0.0;
-            uint64_t start = OSUtils::now();
-            for (unsigned int i = 0; i < 200; ++i) {
-                zt_salsa2012_armneon3_xor(bb, (const unsigned char*)0, 1234567, s20TV0Iv, s20TV0Key);
-                bytes += 1234567.0;
-            }
-            uint64_t end = OSUtils::now();
-            std::cout << ((bytes / 1048576.0) / ((double)(end - start) / 1024.0)) << " MiB/second" << std::endl;
-            ::free((void*)bb);
-        }
-    }
-#endif
+	std::cout << "[crypto] Testing SHA-512... "; std::cout.flush();
+	SHA512::hash(buf1,sha512TV0Input,(unsigned int)strlen(sha512TV0Input));
+	if (memcmp(buf1,sha512TV0Digest,64)) {
+		std::cout << "FAIL" << std::endl;
+		return -1;
+	}
+	std::cout << "PASS" << std::endl;
 
-    std::cout << "[crypto] Benchmarking Salsa20/20... ";
-    std::cout.flush();
-    {
-        unsigned char* bb = (unsigned char*)::malloc(1234567);
-        for (unsigned int i = 0; i < 1234567; ++i)
-            bb[i] = (unsigned char)i;
-        Salsa20 s20(s20TV0Key, s20TV0Iv);
-        long double bytes = 0.0;
-        uint64_t start = OSUtils::now();
-        for (unsigned int i = 0; i < 200; ++i) {
-            s20.crypt20(bb, bb, 1234567);
-            bytes += 1234567.0;
-        }
-        uint64_t end = OSUtils::now();
-        SHA512(buf1, bb, 1234567);
-        std::cout << ((bytes / 1048576.0) / ((long double)(end - start) / 1024.0)) << " MiB/second (" << Utils::hex(buf1, 16, hexbuf) << ')' << std::endl;
-        ::free((void*)bb);
-    }
+	std::cout << "[crypto] Testing Poly1305... "; std::cout.flush();
+	Poly1305::compute(buf1,poly1305TV0Input,sizeof(poly1305TV0Input),poly1305TV0Key);
+	if (memcmp(buf1,poly1305TV0Tag,16)) {
+		std::cout << "FAIL (1)" << std::endl;
+		return -1;
+	}
+	Poly1305::compute(buf1,poly1305TV1Input,sizeof(poly1305TV1Input),poly1305TV1Key);
+	if (memcmp(buf1,poly1305TV1Tag,16)) {
+		std::cout << "FAIL (2)" << std::endl;
+		return -1;
+	}
+	std::cout << "PASS" << std::endl;
 
-    /*
-    {
-        AES k0,k1;
-        k0.init("00000000000000000000000000000000");
-        k1.init("11111111111111111111111111111111");
-        uint8_t test_pt[65536];
-        uint8_t test_ct[65536];
-        uint8_t test_aad[65536];
-        uint8_t ct_hash[48];
-        char hex_tmp[128];
-        for(unsigned int i=0;i<65536;++i) {
-            test_pt[i] = (uint8_t)i;
-            test_aad[i] = (uint8_t)i;
-        }
-        AES::GMACSIVEncryptor enc(k0,k1);
-        for(unsigned int test_length=0;test_length<65536;test_length+=777) {
-            memset(test_ct, 0, test_length);
-            enc.init((uint64_t)test_length, test_ct);
-            enc.aad(test_aad, test_length);
-            enc.update1(test_pt, test_length);
-            enc.finish1();
-            enc.update2(test_pt, test_length);
-            const void *tag = enc.finish2();
-            SHA384(ct_hash, test_ct, test_length);
-            std::cout << "(" << test_length << ", \"" << Utils::hex(ct_hash, 48, hex_tmp) << "\", \"" << Utils::hex(tag, 16, hex_tmp) << "\")," <<std::endl;
-        }
-    }
-    */
+	std::cout << "[crypto] Benchmarking Poly1305... "; std::cout.flush();
+	{
+		unsigned char *bb = (unsigned char *)::malloc(1234567);
+		for(unsigned int i=0;i<1234567;++i)
+			bb[i] = (unsigned char)i;
+		double bytes = 0.0;
+		uint64_t start = OSUtils::now();
+		for(unsigned int i=0;i<200;++i) {
+			Poly1305::compute(buf1,bb,1234567,poly1305TV0Key);
+			bytes += 1234567.0;
+		}
+		uint64_t end = OSUtils::now();
+		std::cout << ((bytes / 1048576.0) / ((double)(end - start) / 1000.0)) << " MiB/second" << std::endl;
+		::free((void *)bb);
+	}
 
-    std::cout << "[crypto] Benchmarking AES-GMAC-SIV... ";
-    std::cout.flush();
-    {
-        uint64_t end, start = OSUtils::now();
-        uint64_t bytes = 0;
-        AES k0, k1;
-        k0.init(buf1);
-        k1.init(buf2);
-        AES::GMACSIVEncryptor enc(k0, k1);
-        for (;;) {
-            for (unsigned int i = 0; i < 10000; ++i) {
-                enc.init(i, buf2);
-                enc.update1(buf1, sizeof(buf1));
-                enc.finish1();
-                enc.update2(buf1, sizeof(buf1));
-                enc.finish2();
-                buf1[0] = buf2[0];
-                bytes += sizeof(buf1);
-            }
-            end = OSUtils::now();
-            if ((end - start) >= 5000)
-                break;
-        }
-        std::cout << (((double)bytes / 1048576.0) / ((double)(end - start) / 1024.0)) << " MiB/second" << std::endl;
-    }
+	/*
+	for(unsigned int d=8;d<=10;++d) {
+		for(int k=0;k<8;++k) {
+			std::cout << "[crypto] computeSalsa2012Sha512ProofOfWork(" << d << ",\"foobarbaz\",9) == "; std::cout.flush();
+			unsigned char result[16];
+			uint64_t start = OSUtils::now();
+			IncomingPacket::computeSalsa2012Sha512ProofOfWork(d,"foobarbaz",9,result);
+			uint64_t end = OSUtils::now();
+			std::cout << Utils::hex(result,16) << " -- valid: " << IncomingPacket::testSalsa2012Sha512ProofOfWorkResult(d,"foobarbaz",9,result) << ", " << (end - start) << "ms" << std::endl;
+		}
+	}
+	*/
 
-    std::cout << "[crypto] Testing SHA-512... ";
-    std::cout.flush();
-    SHA512(buf1, sha512TV0Input, (unsigned int)strlen(sha512TV0Input));
-    if (memcmp(buf1, sha512TV0Digest, 64)) {
-        std::cout << "FAIL" << std::endl;
-        return -1;
-    }
-    std::cout << "PASS" << std::endl;
+	std::cout << "[crypto] Testing C25519 and Ed25519 against test vectors... "; std::cout.flush();
+	for(int k=0;k<ZT_NUM_C25519_TEST_VECTORS;++k) {
+		C25519::Pair p1,p2;
+		memcpy(p1.pub.data,C25519_TEST_VECTORS[k].pub1,p1.pub.size());
+		memcpy(p1.priv.data,C25519_TEST_VECTORS[k].priv1,p1.priv.size());
+		memcpy(p2.pub.data,C25519_TEST_VECTORS[k].pub2,p2.pub.size());
+		memcpy(p2.priv.data,C25519_TEST_VECTORS[k].priv2,p2.priv.size());
+		C25519::agree(p1,p2.pub,buf1,64);
+		C25519::agree(p2,p1.pub,buf2,64);
+		if (memcmp(buf1,buf2,64)) {
+			std::cout << "FAIL (1)" << std::endl;
+			return -1;
+		}
+		if (memcmp(buf1,C25519_TEST_VECTORS[k].agreement,64)) {
+			std::cout << "FAIL (2)" << std::endl;
+			return -1;
+		}
+		C25519::Signature sig1 = C25519::sign(p1,buf1,64);
+		if (memcmp(sig1.data,C25519_TEST_VECTORS[k].agreementSignedBy1,64)) {
+			std::cout << "FAIL (3)" << std::endl;
+			return -1;
+		}
+		C25519::Signature sig2 = C25519::sign(p2,buf1,64);
+		if (memcmp(sig2.data,C25519_TEST_VECTORS[k].agreementSignedBy2,64)) {
+			std::cout << "FAIL (4)" << std::endl;
+			return -1;
+		}
+	}
+	std::cout << "PASS" << std::endl;
 
-    std::cout << "[crypto] Testing Poly1305... ";
-    std::cout.flush();
-    Poly1305::compute(buf1, poly1305TV0Input, sizeof(poly1305TV0Input), poly1305TV0Key);
-    if (memcmp(buf1, poly1305TV0Tag, 16)) {
-        std::cout << "FAIL (1)" << std::endl;
-        return -1;
-    }
-    Poly1305::compute(buf1, poly1305TV1Input, sizeof(poly1305TV1Input), poly1305TV1Key);
-    if (memcmp(buf1, poly1305TV1Tag, 16)) {
-        std::cout << "FAIL (2)" << std::endl;
-        return -1;
-    }
-    std::cout << "PASS" << std::endl;
+	std::cout << "[crypto] Testing C25519 ECC key agreement... "; std::cout.flush();
+	for(unsigned int i=0;i<100;++i) {
+		memset(buf1,64,sizeof(buf1));
+		memset(buf2,64,sizeof(buf2));
+		memset(buf3,64,sizeof(buf3));
+		C25519::Pair p1 = C25519::generate();
+		C25519::Pair p2 = C25519::generate();
+		C25519::Pair p3 = C25519::generate();
+		C25519::agree(p1,p2.pub,buf1,64);
+		C25519::agree(p2,p1.pub,buf2,64);
+		C25519::agree(p3,p1.pub,buf3,64);
+		// p1<>p2 should equal p1<>p2
+		if (memcmp(buf1,buf2,64)) {
+			std::cout << "FAIL (1)" << std::endl;
+			return -1;
+		}
+		// p2<>p1 should not equal p3<>p1
+		if (!memcmp(buf2,buf3,64)) {
+			std::cout << "FAIL (2)" << std::endl;
+			return -1;
+		}
+	}
+	std::cout << "PASS" << std::endl;
 
-    std::cout << "[crypto] Benchmarking Poly1305... ";
-    std::cout.flush();
-    {
-        unsigned char* bb = (unsigned char*)::malloc(1234567);
-        for (unsigned int i = 0; i < 1234567; ++i)
-            bb[i] = (unsigned char)i;
-        long double bytes = 0.0;
-        uint64_t start = OSUtils::now();
-        for (unsigned int i = 0; i < 200; ++i) {
-            Poly1305::compute(buf1, bb, 1234567, poly1305TV0Key);
-            bytes += 1234567.0;
-        }
-        uint64_t end = OSUtils::now();
-        std::cout << ((bytes / 1048576.0) / ((long double)(end - start) / 1000.0)) << " MiB/second" << std::endl;
-        ::free((void*)bb);
-    }
+	std::cout << "[crypto] Testing Ed25519 ECC signatures... "; std::cout.flush();
+	C25519::Pair didntSign = C25519::generate();
+	for(unsigned int i=0;i<10;++i) {
+		C25519::Pair p1 = C25519::generate();
+		for(unsigned int k=0;k<sizeof(buf1);++k)
+			buf1[k] = (unsigned char)rand();
+		C25519::Signature sig = C25519::sign(p1,buf1,sizeof(buf1));
+		if (!C25519::verify(p1.pub,buf1,sizeof(buf1),sig)) {
+			std::cout << "FAIL (1)" << std::endl;
+			return -1;
+		}
+		++buf1[17];
+		if (C25519::verify(p1.pub,buf1,sizeof(buf1),sig)) {
+			std::cout << "FAIL (2)" << std::endl;
+			return -1;
+		}
+		--buf1[17];
+		if (!C25519::verify(p1.pub,buf1,sizeof(buf1),sig)) {
+			std::cout << "FAIL (3)" << std::endl;
+			return -1;
+		}
+		if (C25519::verify(didntSign.pub,buf1,sizeof(buf1),sig)) {
+			std::cout << "FAIL (2)" << std::endl;
+			return -1;
+		}
+		for(unsigned int k=0;k<64;++k) {
+			C25519::Signature sig2(sig);
+			sig2.data[rand() % sig2.size()] ^= (unsigned char)(1 << (rand() & 7));
+			if (C25519::verify(p1.pub,buf1,sizeof(buf1),sig2)) {
+				std::cout << "FAIL (5)" << std::endl;
+				return -1;
+			}
+		}
+	}
+	std::cout << "PASS" << std::endl;
 
-    /*
-    for(unsigned int d=8;d<=10;++d) {
-        for(int k=0;k<8;++k) {
-            std::cout << "[crypto] computeSalsa2012Sha512ProofOfWork(" << d << ",\"foobarbaz\",9) == "; std::cout.flush();
-            unsigned char result[16];
-            uint64_t start = OSUtils::now();
-            IncomingPacket::computeSalsa2012Sha512ProofOfWork(d,"foobarbaz",9,result);
-            uint64_t end = OSUtils::now();
-            std::cout << Utils::hex(result,16) << " -- valid: " << IncomingPacket::testSalsa2012Sha512ProofOfWorkResult(d,"foobarbaz",9,result) << ", " << (end - start) << "ms" << std::endl;
-        }
-    }
-    */
-
-    std::cout << "[crypto] Testing C25519 and Ed25519 against test vectors... ";
-    std::cout.flush();
-    for (int k = 0; k < ZT_NUM_C25519_TEST_VECTORS; ++k) {
-        ECC::Pair p1, p2;
-        memcpy(p1.pub.data, C25519_TEST_VECTORS[k].pub1, ZT_ECC_PUBLIC_KEY_SET_LEN);
-        memcpy(p1.priv.data, C25519_TEST_VECTORS[k].priv1, ZT_ECC_PRIVATE_KEY_SET_LEN);
-        memcpy(p2.pub.data, C25519_TEST_VECTORS[k].pub2, ZT_ECC_PUBLIC_KEY_SET_LEN);
-        memcpy(p2.priv.data, C25519_TEST_VECTORS[k].priv2, ZT_ECC_PRIVATE_KEY_SET_LEN);
-        ECC::agree(p1, p2.pub, buf1, 64);
-        ECC::agree(p2, p1.pub, buf2, 64);
-        if (memcmp(buf1, buf2, 64)) {
-            std::cout << "FAIL (1)" << std::endl;
-            return -1;
-        }
-        if (memcmp(buf1, C25519_TEST_VECTORS[k].agreement, 64)) {
-            std::cout << "FAIL (2)" << std::endl;
-            return -1;
-        }
-        ECC::Signature sig1 = ECC::sign(p1, buf1, 64);
-        if (memcmp(sig1.data, C25519_TEST_VECTORS[k].agreementSignedBy1, 64)) {
-            std::cout << "FAIL (3)" << std::endl;
-            return -1;
-        }
-        ECC::Signature sig2 = ECC::sign(p2, buf1, 64);
-        if (memcmp(sig2.data, C25519_TEST_VECTORS[k].agreementSignedBy2, 64)) {
-            std::cout << "FAIL (4)" << std::endl;
-            return -1;
-        }
-    }
-    std::cout << "PASS" << std::endl;
-
-    std::cout << "[crypto] Testing C25519 ECC key agreement... ";
-    std::cout.flush();
-    for (unsigned int i = 0; i < 100; ++i) {
-        memset(buf1, 64, sizeof(buf1));
-        memset(buf2, 64, sizeof(buf2));
-        memset(buf3, 64, sizeof(buf3));
-        ECC::Pair p1 = ECC::generate();
-        ECC::Pair p2 = ECC::generate();
-        ECC::Pair p3 = ECC::generate();
-        ECC::agree(p1, p2.pub, buf1, 64);
-        ECC::agree(p2, p1.pub, buf2, 64);
-        ECC::agree(p3, p1.pub, buf3, 64);
-        // p1<>p2 should equal p2<>p1
-        if (memcmp(buf1, buf2, 64)) {
-            std::cout << "FAIL (1)" << std::endl;
-            return -1;
-        }
-        // p2<>p1 should not equal p3<>p1
-        if (! memcmp(buf2, buf3, 64)) {
-            std::cout << "FAIL (2)" << std::endl;
-            return -1;
-        }
-    }
-    std::cout << "PASS" << std::endl;
-
-    std::cout << "[crypto] Benchmarking C25519 ECC key agreement... ";
-    std::cout.flush();
-    ECC::Pair bp[8];
-    for (int k = 0; k < 8; ++k)
-        bp[k] = ECC::generate();
-    uint64_t st = OSUtils::now();
-    for (unsigned int k = 0; k < 50; ++k) {
-        ECC::agree(bp[~k & 7], bp[k & 7].pub, buf1, 64);
-    }
-    uint64_t et = OSUtils::now();
-    std::cout << ((double)(et - st) / 50.0) << "ms per agreement." << std::endl;
-
-    std::cout << "[crypto] Testing Ed25519 ECC signatures... ";
-    std::cout.flush();
-    ECC::Pair didntSign = ECC::generate();
-    for (unsigned int i = 0; i < 10; ++i) {
-        ECC::Pair p1 = ECC::generate();
-        for (unsigned int k = 0; k < sizeof(buf1); ++k)
-            buf1[k] = (unsigned char)rand();
-        ECC::Signature sig = ECC::sign(p1, buf1, sizeof(buf1));
-        if (! ECC::verify(p1.pub, buf1, sizeof(buf1), sig)) {
-            std::cout << "FAIL (1)" << std::endl;
-            return -1;
-        }
-        ++buf1[17];
-        if (ECC::verify(p1.pub, buf1, sizeof(buf1), sig)) {
-            std::cout << "FAIL (2)" << std::endl;
-            return -1;
-        }
-        --buf1[17];
-        if (! ECC::verify(p1.pub, buf1, sizeof(buf1), sig)) {
-            std::cout << "FAIL (3)" << std::endl;
-            return -1;
-        }
-        if (ECC::verify(didntSign.pub, buf1, sizeof(buf1), sig)) {
-            std::cout << "FAIL (2)" << std::endl;
-            return -1;
-        }
-        for (unsigned int k = 0; k < 64; ++k) {
-            ECC::Signature sig2(sig);
-            sig2.data[rand() % ZT_ECC_SIGNATURE_LEN] ^= (unsigned char)(1 << (rand() & 7));
-            if (ECC::verify(p1.pub, buf1, sizeof(buf1), sig2)) {
-                std::cout << "FAIL (5)" << std::endl;
-                return -1;
-            }
-        }
-    }
-    std::cout << "PASS" << std::endl;
-
-    std::cout << "[crypto] Benchmarking Ed25519 ECC signatures... ";
-    std::cout.flush();
-    st = OSUtils::now();
-    for (int k = 0; k < 1000; ++k) {
-        ECC::Signature sig;
-        ECC::sign(didntSign.priv, didntSign.pub, buf1, sizeof(buf1), sig.data);
-    }
-    et = OSUtils::now();
-    std::cout << ((double)(et - st) / 50.0) << "ms per signature." << std::endl;
-
-    return 0;
+	return 0;
 }
 
 static int testIdentity()
 {
-    Identity id;
-    Buffer<512> buf;
-    char buf2[1024];
+	Identity id;
+	Buffer<512> buf;
 
-    std::cout << "[identity] Validate known-good identity... ";
-    std::cout.flush();
-    if (! id.fromString(KNOWN_GOOD_IDENTITY)) {
-        std::cout << "FAIL (1)" << std::endl;
-        return -1;
-    }
-    const uint64_t vst = OSUtils::now();
-    for (int k = 0; k < 10; ++k) {
-        if (! id.locallyValidate()) {
-            std::cout << "FAIL (2)" << std::endl;
-            return -1;
-        }
-    }
-    const uint64_t vet = OSUtils::now();
-    std::cout << "PASS (" << ((double)(vet - vst) / 10.0) << "ms per validation)" << std::endl;
+	std::cout << "[identity] Validate known-good identity... "; std::cout.flush();
+	if (!id.fromString(KNOWN_GOOD_IDENTITY)) {
+		std::cout << "FAIL (1)" << std::endl;
+		return -1;
+	}
+	if (!id.locallyValidate()) {
+		std::cout << "FAIL (2)" << std::endl;
+		return -1;
+	}
+	std::cout << "PASS" << std::endl;
 
-    std::cout << "[identity] Validate known-bad identity... ";
-    std::cout.flush();
-    if (! id.fromString(KNOWN_BAD_IDENTITY)) {
-        std::cout << "FAIL (1)" << std::endl;
-        return -1;
-    }
-    if (id.locallyValidate()) {
-        std::cout << "FAIL (2)" << std::endl;
-        return -1;
-    }
-    std::cout << "PASS (i.e. it failed)" << std::endl;
+	std::cout << "[identity] Validate known-bad identity... "; std::cout.flush();
+	if (!id.fromString(KNOWN_BAD_IDENTITY)) {
+		std::cout << "FAIL (1)" << std::endl;
+		return -1;
+	}
+	if (id.locallyValidate()) {
+		std::cout << "FAIL (2)" << std::endl;
+		return -1;
+	}
+	std::cout << "PASS (i.e. it failed)" << std::endl;
 
-    for (unsigned int k = 0; k < 4; ++k) {
-        std::cout << "[identity] Generate identity... ";
-        std::cout.flush();
-        uint64_t genstart = OSUtils::now();
-        id.generate();
-        uint64_t genend = OSUtils::now();
-        std::cout << "(took " << (genend - genstart) << "ms): " << id.toString(true, buf2) << std::endl;
-        std::cout << "[identity] Locally validate identity: ";
-        if (id.locallyValidate()) {
-            std::cout << "PASS" << std::endl;
-        }
-        else {
-            std::cout << "FAIL" << std::endl;
-            return -1;
-        }
-    }
+	for(unsigned int k=0;k<4;++k) {
+		std::cout << "[identity] Generate identity... "; std::cout.flush();
+		uint64_t genstart = OSUtils::now();
+		id.generate();
+		uint64_t genend = OSUtils::now();
+		std::cout << "(took " << (genend - genstart) << "ms): " << id.toString(true) << std::endl;
+		std::cout << "[identity] Locally validate identity: ";
+		if (id.locallyValidate()) {
+			std::cout << "PASS" << std::endl;
+		} else {
+			std::cout << "FAIL" << std::endl;
+			return -1;
+		}
+	}
 
-    {
-        Identity id2;
-        buf.clear();
-        id.serialize(buf, true);
-        id2.deserialize(buf);
-        std::cout << "[identity] Serialize and deserialize (w/private): ";
-        if ((id == id2) && (id2.locallyValidate())) {
-            std::cout << "PASS" << std::endl;
-        }
-        else {
-            std::cout << "FAIL" << std::endl;
-            return -1;
-        }
-    }
+	{
+		Identity id2;
+		buf.clear();
+		id.serialize(buf,true);
+		id2.deserialize(buf);
+		std::cout << "[identity] Serialize and deserialize (w/private): ";
+		if ((id == id2)&&(id2.locallyValidate())) {
+			std::cout << "PASS" << std::endl;
+		} else {
+			std::cout << "FAIL" << std::endl;
+			return -1;
+		}
+	}
 
-    {
-        Identity id2;
-        buf.clear();
-        id.serialize(buf, false);
-        id2.deserialize(buf);
-        std::cout << "[identity] Serialize and deserialize (no private): ";
-        if ((id == id2) && (id2.locallyValidate())) {
-            std::cout << "PASS" << std::endl;
-        }
-        else {
-            std::cout << "FAIL" << std::endl;
-            return -1;
-        }
-    }
+	{
+		Identity id2;
+		buf.clear();
+		id.serialize(buf,false);
+		id2.deserialize(buf);
+		std::cout << "[identity] Serialize and deserialize (no private): ";
+		if ((id == id2)&&(id2.locallyValidate())) {
+			std::cout << "PASS" << std::endl;
+		} else {
+			std::cout << "FAIL" << std::endl;
+			return -1;
+		}
+	}
 
-    {
-        Identity id2;
-        id2.fromString(id.toString(true, buf2));
-        std::cout << "[identity] Serialize and deserialize (ASCII w/private): ";
-        if ((id == id2) && (id2.locallyValidate())) {
-            std::cout << "PASS" << std::endl;
-        }
-        else {
-            std::cout << "FAIL" << std::endl;
-            return -1;
-        }
-    }
+	{
+		Identity id2;
+		id2.fromString(id.toString(true).c_str());
+		std::cout << "[identity] Serialize and deserialize (ASCII w/private): ";
+		if ((id == id2)&&(id2.locallyValidate())) {
+			std::cout << "PASS" << std::endl;
+		} else {
+			std::cout << "FAIL" << std::endl;
+			return -1;
+		}
+	}
 
-    {
-        Identity id2;
-        id2.fromString(id.toString(false, buf2));
-        std::cout << "[identity] Serialize and deserialize (ASCII no private): ";
-        if ((id == id2) && (id2.locallyValidate())) {
-            std::cout << "PASS" << std::endl;
-        }
-        else {
-            std::cout << "FAIL" << std::endl;
-            return -1;
-        }
-    }
+	{
+		Identity id2;
+		id2.fromString(id.toString(false).c_str());
+		std::cout << "[identity] Serialize and deserialize (ASCII no private): ";
+		if ((id == id2)&&(id2.locallyValidate())) {
+			std::cout << "PASS" << std::endl;
+		} else {
+			std::cout << "FAIL" << std::endl;
+			return -1;
+		}
+	}
 
-    return 0;
+	return 0;
 }
 
 static int testCertificate()
 {
-    char buf[4096];
+	Identity authority;
+	std::cout << "[certificate] Generating identity to act as authority... "; std::cout.flush();
+	authority.generate();
+	std::cout << authority.address().toString() << std::endl;
 
-    Identity authority;
-    std::cout << "[certificate] Generating identity to act as authority... ";
-    std::cout.flush();
-    authority.generate();
-    std::cout << authority.address().toString(buf) << std::endl;
+	Identity idA,idB;
+	std::cout << "[certificate] Generating identities A and B... "; std::cout.flush();
+	idA.generate();
+	idB.generate();
+	std::cout << idA.address().toString() << ", " << idB.address().toString() << std::endl;
 
-    Identity idA, idB;
-    std::cout << "[certificate] Generating identities A and B... ";
-    std::cout.flush();
-    idA.generate();
-    idB.generate();
-    std::cout << idA.address().toString(buf) << ", " << idB.address().toString(buf) << std::endl;
+	std::cout << "[certificate] Generating certificates A and B...";
+	CertificateOfMembership cA(10000,100,1,idA.address());
+	CertificateOfMembership cB(10099,100,1,idB.address());
+	std::cout << std::endl;
 
-    std::cout << "[certificate] Generating certificates A and B...";
-    CertificateOfMembership cA(10000, 100, 1, idA);
-    CertificateOfMembership cB(10099, 100, 1, idB);
-    std::cout << std::endl;
+	std::cout << "[certificate] Signing certificates A and B with authority...";
+	cA.sign(authority);
+	cB.sign(authority);
+	std::cout << std::endl;
 
-    std::cout << "[certificate] Signing certificates A and B with authority...";
-    cA.sign(authority);
-    cB.sign(authority);
-    std::cout << std::endl;
+	//std::cout << "[certificate] A: " << cA.toString() << std::endl;
+	//std::cout << "[certificate] B: " << cB.toString() << std::endl;
 
-    // std::cout << "[certificate] A: " << cA.toString() << std::endl;
-    // std::cout << "[certificate] B: " << cB.toString() << std::endl;
+	std::cout << "[certificate] A agrees with B and B with A... ";
+	if (cA.agreesWith(cB))
+		std::cout << "yes, ";
+	else {
+		std::cout << "FAIL" << std::endl;
+		return -1;
+	}
+	if (cB.agreesWith(cA))
+		std::cout << "yes." << std::endl;
+	else {
+		std::cout << "FAIL" << std::endl;
+		return -1;
+	}
 
-    std::cout << "[certificate] A agrees with B and B with A... ";
-    if (cA.agreesWith(cB, idB))
-        std::cout << "yes, ";
-    else {
-        std::cout << "FAIL" << std::endl;
-        return -1;
-    }
-    if (cB.agreesWith(cA, idA))
-        std::cout << "yes." << std::endl;
-    else {
-        std::cout << "FAIL" << std::endl;
-        return -1;
-    }
+	std::cout << "[certificate] Testing string serialization... ";
+	CertificateOfMembership copyA(cA.toString());
+	CertificateOfMembership copyB(cB.toString());
+	if (copyA != cA) {
+		std::cout << "FAIL" << std::endl;
+		return -1;
+	}
+	if (copyB != cB) {
+		std::cout << "FAIL" << std::endl;
+		return -1;
+	}
+	std::cout << "PASS" << std::endl;
 
-    std::cout << "[certificate] Generating two certificates that should not agree...";
-    cA = CertificateOfMembership(10000, 100, 1, idA);
-    cB = CertificateOfMembership(10101, 100, 1, idB);
-    std::cout << std::endl;
+	std::cout << "[certificate] Generating two certificates that should not agree...";
+	cA = CertificateOfMembership(10000,100,1,idA.address());
+	cB = CertificateOfMembership(10101,100,1,idB.address());
+	std::cout << std::endl;
 
-    std::cout << "[certificate] A agrees with B and B with A... ";
-    if (! cA.agreesWith(cB, idB))
-        std::cout << "no, ";
-    else {
-        std::cout << "FAIL" << std::endl;
-        return -1;
-    }
-    if (! cB.agreesWith(cA, idA))
-        std::cout << "no." << std::endl;
-    else {
-        std::cout << "FAIL" << std::endl;
-        return -1;
-    }
+	std::cout << "[certificate] A agrees with B and B with A... ";
+	if (!cA.agreesWith(cB))
+		std::cout << "no, ";
+	else {
+		std::cout << "FAIL" << std::endl;
+		return -1;
+	}
+	if (!cB.agreesWith(cA))
+		std::cout << "no." << std::endl;
+	else {
+		std::cout << "FAIL" << std::endl;
+		return -1;
+	}
 
-    return 0;
+	return 0;
 }
 
 static int testPacket()
 {
-    unsigned char salsaKey[32];
-    Packet a, b;
+	unsigned char salsaKey[32];
+	Packet a,b;
 
-    a.burn();
-    b.burn();
+	a.burn();
+	b.burn();
 
-    for (unsigned int i = 0; i < 32; ++i)
-        salsaKey[i] = (unsigned char)rand();
+	for(unsigned int i=0;i<32;++i)
+		salsaKey[i] = (unsigned char)rand();
 
-    std::cout << "[packet] Testing Packet encoder/decoder... ";
+	std::cout << "[packet] Testing Packet encoder/decoder... ";
 
-    a.reset(Address(), Address(), Packet::VERB_HELLO);
-    for (int i = 0; i < 32; ++i)
-        a.append("supercalifragilisticexpealidocious", (unsigned int)strlen("supercalifragilisticexpealidocious"));
+	a.reset(Address(),Address(),Packet::VERB_HELLO);
+	for(int i=0;i<32;++i)
+		a.append("supercalifragilisticexpealidocious",(unsigned int)strlen("supercalifragilisticexpealidocious"));
 
-    b = a;
-    if (a != b) {
-        std::cout << "FAIL (assign)" << std::endl;
-        return -1;
-    }
+	b = a;
+	if (a != b) {
+		std::cout << "FAIL (assign)" << std::endl;
+		return -1;
+	}
 
-    a.compress();
-    unsigned int complen = a.size();
-    a.uncompress();
+	a.compress();
+	unsigned int complen = a.size();
+	a.uncompress();
 
-    std::cout << "(compressed: " << complen << ", decompressed: " << a.size() << ") ";
-    if (a != b) {
-        std::cout << "FAIL (compression)" << std::endl;
-        return -1;
-    }
+	std::cout << "(compressed: " << complen << ", decompressed: " << a.size() << ") ";
+	if (a != b) {
+		std::cout << "FAIL (compresssion)" << std::endl;
+		return -1;
+	}
 
-    /*
-    a.armor(salsaKey, true, false, nullptr);
-    if (! a.dearmor(salsaKey, nullptr)) {
-        std::cout << "FAIL (encrypt-decrypt/verify)" << std::endl;
-        return -1;
-    }
-    */
+	a.armor(salsaKey,true);
+	if (!a.dearmor(salsaKey)) {
+		std::cout << "FAIL (encrypt-decrypt/verify)" << std::endl;
+		return -1;
+	}
 
-    std::cout << "PASS" << std::endl;
-    return 0;
+	std::cout << "PASS" << std::endl;
+	return 0;
 }
 
 static int testOther()
 {
-    char buf[1024];
-    char buf2[4096];
-    char buf3[1024];
-
-    std::cout << "[other] Testing hex/unhex... ";
-    std::cout.flush();
-    Utils::getSecureRandom(buf, (unsigned int)sizeof(buf));
-    Utils::hex(buf, (unsigned int)sizeof(buf), buf2);
-    Utils::unhex(buf2, buf3, (unsigned int)sizeof(buf3));
-    if (memcmp(buf, buf3, sizeof(buf)) == 0) {
-        std::cout << "PASS" << std::endl;
-    }
-    else {
-        std::cout << "FAIL!" << std::endl;
-        buf2[78] = 0;
-        std::cout << buf2 << std::endl;
-        Utils::hex(buf3, (unsigned int)sizeof(buf3), buf2);
-        buf2[78] = 0;
-        std::cout << buf2 << std::endl;
-        return -1;
-    }
-
-    std::cout << "[other] Testing InetAddress encode/decode...";
-    std::cout.flush();
-    std::cout << " " << InetAddress("127.0.0.1/9993").toString(buf);
-    std::cout << " " << InetAddress("feed:dead:babe:dead:beef:f00d:1234:5678/12345").toString(buf);
-    std::cout << " " << InetAddress("0/9993").toString(buf);
-    std::cout << " " << InetAddress("").toString(buf);
-    std::cout << std::endl;
-
-#if 0
 	std::cout << "[other] Testing Hashtable... "; std::cout.flush();
 	{
 		Hashtable<uint64_t,std::string> ht;
@@ -1393,305 +748,370 @@ static int testOther()
 		}
 	}
 	std::cout << "PASS" << std::endl;
-#endif
 
-    std::cout << "[other] Testing/fuzzing Dictionary... ";
-    std::cout.flush();
-    for (int k = 0; k < 1000; ++k) {
-        Dictionary<8194>* test = new Dictionary<8194>();
-        char key[32][16];
-        char value[32][128];
-        memset(key, 0, sizeof(key));
-        memset(value, 0, sizeof(value));
-        for (unsigned int q = 0; q < 32; ++q) {
-            Utils::hex((uint32_t)((rand() % 1000) + (q * 1000)), key[q]);
-            int r = rand() % 128;
-            for (int x = 0; x < r; ++x)
-                value[q][x] = ("0123456789\0\t\r\n= ")[rand() % 16];
-            value[q][r] = (char)0;
-            test->add(key[q], value[q], r);
-        }
-        for (unsigned int q = 0; q < 1024; ++q) {
-            int r = rand() % 32;
-            char tmp[128];
-            if (test->get(key[r], tmp, sizeof(tmp)) >= 0) {
-                if (strcmp(value[r], tmp)) {
-                    std::cout << "FAILED (invalid value '" << value[r] << "' != '" << tmp << "')!" << std::endl;
-                    return -1;
-                }
-            }
-            else {
-                std::cout << "FAILED (can't find key '" << key[r] << "')!" << std::endl;
-                return -1;
-            }
-        }
-        delete test;
-    }
-    int foo = 0;
-    volatile int* volatile bar = &foo;   // force compiler not to optimize out test.get() below
-    for (int k = 0; k < 200; ++k) {
-        int r = rand() % 8194;
-        unsigned char* tmp = new unsigned char[8194];
-        for (int q = 0; q < r; ++q)
-            tmp[q] = (unsigned char)((rand() % 254) + 1);      // don't put nulls since those will always just terminate scan
-        tmp[r] = (r % 32) ? (char)(rand() & 0xff) : (char)0;   // every 32nd iteration don't terminate the string maybe...
-        Dictionary<8194>* test = new Dictionary<8194>((const char*)tmp);
-        for (unsigned int q = 0; q < 100; ++q) {
-            char tmp[128];
-            for (unsigned int x = 0; x < 128; ++x)
-                tmp[x] = (char)(rand() & 0xff);
-            tmp[127] = (char)0;
-            char value[8194];
-            *bar += test->get(tmp, value, sizeof(value));
-        }
-        delete test;
-        delete[] tmp;
-    }
-    std::cout << "PASS (junk value to prevent optimization-out of test: " << foo << ")" << std::endl;
+	std::cout << "[other] Testing hex encode/decode... "; std::cout.flush();
+	for(unsigned int k=0;k<1000;++k) {
+		unsigned int flen = (rand() % 8194) + 1;
+		for(unsigned int i=0;i<flen;++i)
+			fuzzbuf[i] = (unsigned char)(rand() & 0xff);
+		std::string dec = Utils::unhex(Utils::hex(fuzzbuf,flen).c_str());
+		if ((dec.length() != flen)||(memcmp(dec.data(),fuzzbuf,dec.length()))) {
+			std::cout << "FAILED!" << std::endl;
+			std::cout << Utils::hex(fuzzbuf,flen) << std::endl;
+			std::cout << Utils::hex(dec.data(),(unsigned int)dec.length()) << std::endl;
+			return -1;
+		}
+	}
+	std::cout << "PASS" << std::endl;
 
-    return 0;
+	std::cout << "[other] Testing Dictionary... "; std::cout.flush();
+	for(int k=0;k<1000;++k) {
+		Dictionary a,b;
+		int nk = rand() % 32;
+		for(int q=0;q<nk;++q) {
+			std::string k,v;
+			int kl = (rand() % 512);
+			int vl = (rand() % 512);
+			for(int i=0;i<kl;++i)
+				k.push_back((char)rand());
+			for(int i=0;i<vl;++i)
+				v.push_back((char)rand());
+			a[k] = v;
+		}
+		std::string aser = a.toString();
+		b.fromString(aser);
+		if (a != b) {
+			std::cout << "FAIL!" << std::endl;
+			return -1;
+		}
+	}
+	std::cout << "PASS" << std::endl;
+
+	return 0;
 }
 
-#define ZT_TEST_PHY_NUM_UDP_PACKETS          10000
-#define ZT_TEST_PHY_UDP_PACKET_SIZE          1000
-#define ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS   10
+#define ZT_TEST_PHY_NUM_UDP_PACKETS 10000
+#define ZT_TEST_PHY_UDP_PACKET_SIZE 1000
+#define ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS 10
 #define ZT_TEST_PHY_NUM_INVALID_TCP_CONNECTS 2
-#define ZT_TEST_PHY_TCP_MESSAGE_SIZE         1000000
-#define ZT_TEST_PHY_TIMEOUT_MS               20000
+#define ZT_TEST_PHY_TCP_MESSAGE_SIZE 1000000
+#define ZT_TEST_PHY_TIMEOUT_MS 20000
 static unsigned long phyTestUdpPacketCount = 0;
 static unsigned long phyTestTcpByteCount = 0;
 static unsigned long phyTestTcpConnectSuccessCount = 0;
 static unsigned long phyTestTcpConnectFailCount = 0;
 static unsigned long phyTestTcpAcceptCount = 0;
 struct TestPhyHandlers;
-static Phy<TestPhyHandlers*>* testPhyInstance = (Phy<TestPhyHandlers*>*)0;
-struct TestPhyHandlers {
-    inline void phyOnDatagram(PhySocket* sock, void** uptr, const struct sockaddr* localAddr, const struct sockaddr* from, void* data, unsigned long len)
-    {
-        ++phyTestUdpPacketCount;
-    }
+static Phy<TestPhyHandlers *> *testPhyInstance = (Phy<TestPhyHandlers *> *)0;
+struct TestPhyHandlers
+{
+	inline void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *localAddr,const struct sockaddr *from,void *data,unsigned long len)
+	{
+		++phyTestUdpPacketCount;
+	}
 
-    inline void phyOnTcpConnect(PhySocket* sock, void** uptr, bool success)
-    {
-        if (success) {
-            ++phyTestTcpConnectSuccessCount;
-        }
-        else {
-            ++phyTestTcpConnectFailCount;
-        }
-    }
+	inline void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success)
+	{
+		if (success) {
+			++phyTestTcpConnectSuccessCount;
+		} else {
+			++phyTestTcpConnectFailCount;
+		}
+	}
 
-    inline void phyOnTcpAccept(PhySocket* sockL, PhySocket* sockN, void** uptrL, void** uptrN, const struct sockaddr* from)
-    {
-        ++phyTestTcpAcceptCount;
-        *uptrN = new std::string(ZT_TEST_PHY_TCP_MESSAGE_SIZE, (char)0xff);
-        testPhyInstance->setNotifyWritable(sockN, true);
-    }
+	inline void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from)
+	{
+		++phyTestTcpAcceptCount;
+		*uptrN = new std::string(ZT_TEST_PHY_TCP_MESSAGE_SIZE,(char)0xff);
+		testPhyInstance->setNotifyWritable(sockN,true);
+	}
 
-    inline void phyOnTcpClose(PhySocket* sock, void** uptr)
-    {
-        delete (std::string*)*uptr;   // delete testMessage if any
-    }
+	inline void phyOnTcpClose(PhySocket *sock,void **uptr)
+	{
+		delete (std::string *)*uptr; // delete testMessage if any
+	}
 
-    inline void phyOnTcpData(PhySocket* sock, void** uptr, void* data, unsigned long len)
-    {
-        phyTestTcpByteCount += len;
-    }
+	inline void phyOnTcpData(PhySocket *sock,void **uptr,void *data,unsigned long len)
+	{
+		phyTestTcpByteCount += len;
+	}
 
-    inline void phyOnTcpWritable(PhySocket* sock, void** uptr)
-    {
-        std::string* testMessage = (std::string*)*uptr;
-        if ((testMessage) && (testMessage->length() > 0)) {
-            long sent = testPhyInstance->streamSend(sock, (const void*)testMessage->data(), (unsigned long)testMessage->length(), true);
-            if (sent > 0)
-                testMessage->erase(0, sent);
-        }
-        if ((! testMessage) || (! testMessage->length())) {
-            testPhyInstance->close(sock, true);
-        }
-    }
+	inline void phyOnTcpWritable(PhySocket *sock,void **uptr)
+	{
+		std::string *testMessage = (std::string *)*uptr;
+		if ((testMessage)&&(testMessage->length() > 0)) {
+			long sent = testPhyInstance->streamSend(sock,(const void *)testMessage->data(),(unsigned long)testMessage->length(),true);
+			if (sent > 0)
+				testMessage->erase(0,sent);
+		}
+		if ((!testMessage)||(!testMessage->length())) {
+			testPhyInstance->close(sock,true);
+		}
+	}
 
 #ifdef __UNIX_LIKE__
-    inline void phyOnUnixAccept(PhySocket* sockL, PhySocket* sockN, void** uptrL, void** uptrN)
-    {
-    }
-    inline void phyOnUnixClose(PhySocket* sock, void** uptr)
-    {
-    }
-    inline void phyOnUnixData(PhySocket* sock, void** uptr, void* data, unsigned long len)
-    {
-    }
-    inline void phyOnUnixWritable(PhySocket* sock, void** uptr)
-    {
-    }
-#endif   // __UNIX_LIKE__
+	inline void phyOnUnixAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN) {}
+	inline void phyOnUnixClose(PhySocket *sock,void **uptr) {}
+	inline void phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len) {}
+	inline void phyOnUnixWritable(PhySocket *sock,void **uptr,bool b) {}
+#endif // __UNIX_LIKE__
 
-    inline void phyOnFileDescriptorActivity(PhySocket* sock, void** uptr, bool readable, bool writable)
-    {
-    }
+	inline void phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,bool readable,bool writable) {}
 };
 static int testPhy()
 {
-    char udpTestPayload[ZT_TEST_PHY_UDP_PACKET_SIZE];
-    memset(udpTestPayload, 0xff, sizeof(udpTestPayload));
+	char udpTestPayload[ZT_TEST_PHY_UDP_PACKET_SIZE];
+	memset(udpTestPayload,0xff,sizeof(udpTestPayload));
 
-    struct sockaddr_in bindaddr;
-    memset(&bindaddr, 0, sizeof(bindaddr));
-    bindaddr.sin_family = AF_INET;
-    bindaddr.sin_port = Utils::hton((uint16_t)60002);
-    bindaddr.sin_addr.s_addr = Utils::hton((uint32_t)0x7f000001);
-    struct sockaddr_in invalidAddr;
-    memset(&bindaddr, 0, sizeof(bindaddr));
-    bindaddr.sin_family = AF_INET;
-    bindaddr.sin_port = Utils::hton((uint16_t)60004);
-    bindaddr.sin_addr.s_addr = Utils::hton((uint32_t)0x7f000001);
+	struct sockaddr_in bindaddr;
+	memset(&bindaddr,0,sizeof(bindaddr));
+	bindaddr.sin_family = AF_INET;
+	bindaddr.sin_port = Utils::hton((uint16_t)60002);
+	bindaddr.sin_addr.s_addr = Utils::hton((uint32_t)0x7f000001);
+	struct sockaddr_in invalidAddr;
+	memset(&bindaddr,0,sizeof(bindaddr));
+	bindaddr.sin_family = AF_INET;
+	bindaddr.sin_port = Utils::hton((uint16_t)60004);
+	bindaddr.sin_addr.s_addr = Utils::hton((uint32_t)0x7f000001);
 
-    std::cout << "[phy] Creating phy endpoint..." << std::endl;
-    TestPhyHandlers testPhyHandlers;
-    testPhyInstance = new Phy<TestPhyHandlers*>(&testPhyHandlers, false, true);
+	std::cout << "[phy] Creating phy endpoint..." << std::endl;
+	TestPhyHandlers testPhyHandlers;
+	testPhyInstance = new Phy<TestPhyHandlers *>(&testPhyHandlers,false,true);
 
-    std::cout << "[phy] Binding UDP listen socket to 127.0.0.1/60002... ";
-    PhySocket* udpListenSock = testPhyInstance->udpBind((const struct sockaddr*)&bindaddr);
-    if (! udpListenSock) {
-        std::cout << "FAILED." << std::endl;
-        return -1;
-    }
-    std::cout << "OK" << std::endl;
+	std::cout << "[phy] Binding UDP listen socket to 127.0.0.1/60002... ";
+	PhySocket *udpListenSock = testPhyInstance->udpBind((const struct sockaddr *)&bindaddr);
+	if (!udpListenSock) {
+		std::cout << "FAILED." << std::endl;
+		return -1;
+	}
+	std::cout << "OK" << std::endl;
 
-    std::cout << "[phy] Binding TCP listen socket to 127.0.0.1/60002... ";
-    PhySocket* tcpListenSock = testPhyInstance->tcpListen((const struct sockaddr*)&bindaddr);
-    if (! tcpListenSock) {
-        std::cout << "FAILED." << std::endl;
-        return -1;
-    }
-    std::cout << "OK" << std::endl;
+	std::cout << "[phy] Binding TCP listen socket to 127.0.0.1/60002... ";
+	PhySocket *tcpListenSock = testPhyInstance->tcpListen((const struct sockaddr *)&bindaddr);
+	if (!tcpListenSock) {
+		std::cout << "FAILED." << std::endl;
+		return -1;
+	}
+	std::cout << "OK" << std::endl;
 
-    unsigned long phyTestUdpPacketsSent = 0;
-    unsigned long phyTestTcpValidConnectionsAttempted = 0;
-    unsigned long phyTestTcpInvalidConnectionsAttempted = 0;
+	unsigned long phyTestUdpPacketsSent = 0;
+	unsigned long phyTestTcpValidConnectionsAttempted = 0;
+	unsigned long phyTestTcpInvalidConnectionsAttempted = 0;
 
-    std::cout << "[phy] Testing UDP send/receive... ";
-    std::cout.flush();
-    uint64_t timeoutAt = OSUtils::now() + ZT_TEST_PHY_TIMEOUT_MS;
-    while ((OSUtils::now() < timeoutAt) && (phyTestUdpPacketCount < ZT_TEST_PHY_NUM_UDP_PACKETS)) {
-        if (phyTestUdpPacketsSent < ZT_TEST_PHY_NUM_UDP_PACKETS) {
-            if (! testPhyInstance->udpSend(udpListenSock, (const struct sockaddr*)&bindaddr, udpTestPayload, sizeof(udpTestPayload))) {
-                std::cout << "FAILED." << std::endl;
-                return -1;
-            }
-            else
-                ++phyTestUdpPacketsSent;
-        }
-        testPhyInstance->poll(100);
-    }
-    std::cout << "got " << phyTestUdpPacketCount << " packets, OK" << std::endl;
+	std::cout << "[phy] Testing UDP send/receive... "; std::cout.flush();
+	uint64_t timeoutAt = OSUtils::now() + ZT_TEST_PHY_TIMEOUT_MS;
+	while ((OSUtils::now() < timeoutAt)&&(phyTestUdpPacketCount < ZT_TEST_PHY_NUM_UDP_PACKETS)) {
+		if (phyTestUdpPacketsSent < ZT_TEST_PHY_NUM_UDP_PACKETS) {
+			if (!testPhyInstance->udpSend(udpListenSock,(const struct sockaddr *)&bindaddr,udpTestPayload,sizeof(udpTestPayload))) {
+				std::cout << "FAILED." << std::endl;
+				return -1;
+			} else ++phyTestUdpPacketsSent;
+		}
+		testPhyInstance->poll(100);
+	}
+	std::cout << "got " << phyTestUdpPacketCount << " packets, OK" << std::endl;
 
-    std::cout << "[phy] Testing TCP... ";
-    std::cout.flush();
-    timeoutAt = OSUtils::now() + ZT_TEST_PHY_TIMEOUT_MS;
-    while ((OSUtils::now() < timeoutAt) && (phyTestTcpByteCount < (ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS * ZT_TEST_PHY_TCP_MESSAGE_SIZE))) {
-        if (phyTestTcpValidConnectionsAttempted < ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS) {
-            ++phyTestTcpValidConnectionsAttempted;
-            bool connected = false;
-            if (! testPhyInstance->tcpConnect((const struct sockaddr*)&bindaddr, connected, (void*)0, true))
-                ++phyTestTcpConnectFailCount;
-        }
-        if (phyTestTcpInvalidConnectionsAttempted < ZT_TEST_PHY_NUM_INVALID_TCP_CONNECTS) {
-            ++phyTestTcpInvalidConnectionsAttempted;
-            bool connected = false;
-            if (! testPhyInstance->tcpConnect((const struct sockaddr*)&invalidAddr, connected, (void*)0, true))
-                ++phyTestTcpConnectFailCount;
-        }
-        testPhyInstance->poll(100);
-    }
-    if (phyTestTcpByteCount < (ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS * ZT_TEST_PHY_TCP_MESSAGE_SIZE)) {
-        std::cout << "got " << phyTestTcpConnectSuccessCount << " connect successes, " << phyTestTcpConnectFailCount << " failures, and " << phyTestTcpByteCount << " bytes, FAILED." << std::endl;
-        return -1;
-    }
-    else {
-        std::cout << "got " << phyTestTcpConnectSuccessCount << " connect successes, " << phyTestTcpConnectFailCount << " failures, and " << phyTestTcpByteCount << " bytes, OK" << std::endl;
-    }
+	std::cout << "[phy] Testing TCP... "; std::cout.flush();
+	timeoutAt = OSUtils::now() + ZT_TEST_PHY_TIMEOUT_MS;
+	while ((OSUtils::now() < timeoutAt)&&(phyTestTcpByteCount < (ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS * ZT_TEST_PHY_TCP_MESSAGE_SIZE))) {
+		if (phyTestTcpValidConnectionsAttempted < ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS) {
+			++phyTestTcpValidConnectionsAttempted;
+			bool connected = false;
+			if (!testPhyInstance->tcpConnect((const struct sockaddr *)&bindaddr,connected,(void *)0,true))
+				++phyTestTcpConnectFailCount;
+		}
+		if (phyTestTcpInvalidConnectionsAttempted < ZT_TEST_PHY_NUM_INVALID_TCP_CONNECTS) {
+			++phyTestTcpInvalidConnectionsAttempted;
+			bool connected = false;
+			if (!testPhyInstance->tcpConnect((const struct sockaddr *)&invalidAddr,connected,(void *)0,true))
+				++phyTestTcpConnectFailCount;
+		}
+		testPhyInstance->poll(100);
+	}
+	if (phyTestTcpByteCount < (ZT_TEST_PHY_NUM_VALID_TCP_CONNECTS * ZT_TEST_PHY_TCP_MESSAGE_SIZE)) {
+		std::cout << "got " << phyTestTcpConnectSuccessCount << " connect successes, " << phyTestTcpConnectFailCount << " failures, and " << phyTestTcpByteCount << " bytes, FAILED." << std::endl;
+		return -1;
+	} else {
+		std::cout << "got " << phyTestTcpConnectSuccessCount << " connect successes, " << phyTestTcpConnectFailCount << " failures, and " << phyTestTcpByteCount << " bytes, OK" << std::endl;
+	}
 
-    return 0;
+	return 0;
+}
+
+static int testSqliteNetworkController()
+{
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+
+	OSUtils::rm("./selftest_network_controller.db");
+
+	try {
+		std::cout << "[network-controller] Generating signing identity..." << std::endl;
+		Identity signingId;
+		signingId.generate();
+
+		{
+			std::cout << "[network-controller] Creating database..." << std::endl;
+			SqliteNetworkController controller("./selftest_network_controller.db");
+			std::cout << "[network-controller] Closing database..." << std::endl;
+		}
+
+		{
+			std::cout << "[network-controller] Re-opening database..." << std::endl;
+			SqliteNetworkController controller("./selftest_network_controller.db");
+			std::cout << "[network-controller] Closing database..." << std::endl;
+		}
+	} catch (std::runtime_error &exc) {
+		std::cout << "FAIL! (unexpected exception: " << exc.what() << ")" << std::endl;
+		return -1;
+	} catch ( ... ) {
+		std::cout << "FAIL! (unexpected exception: ...)" << std::endl;
+		return -1;
+	}
+
+	OSUtils::rm("./selftest_network_controller.db");
+
+#endif // ZT_ENABLE_NETWORK_CONTROLLER
+	return 0;
+}
+
+static int testResolver()
+{
+	std::cout << "[resolver] Testing BackgroundResolver..."; std::cout.flush();
+
+	BackgroundResolver r("tcp-fallback.zerotier.com");
+	r.resolveNow();
+	r.wait();
+
+	std::vector<InetAddress> ips(r.get());
+	for(std::vector<InetAddress>::const_iterator ip(ips.begin());ip!=ips.end();++ip) {
+		std::cout << ' ' << ip->toString();
+	}
+	std::cout << std::endl;
+
+	return 0;
+}
+
+static int testHttp()
+{
+	std::map<std::string,std::string> requestHeaders,responseHeaders;
+	std::string responseBody;
+
+	InetAddress downloadZerotierDotCom;
+	std::vector<InetAddress> rr(OSUtils::resolve("download.zerotier.com"));
+	if (rr.empty()) {
+		std::cout << "[http] Resolve of download.zerotier.com failed, skipping." << std::endl;
+		return 0;
+	} else {
+		for(std::vector<InetAddress>::iterator r(rr.begin());r!=rr.end();++r) {
+			std::cout << "[http] download.zerotier.com: " << r->toString() << std::endl;
+			if (r->isV4())
+				downloadZerotierDotCom = *r;
+		}
+	}
+	downloadZerotierDotCom.setPort(80);
+
+	std::cout << "[http] GET http://download.zerotier.com/dev/1k @" << downloadZerotierDotCom.toString() << " ... "; std::cout.flush();
+	requestHeaders["Host"] = "download.zerotier.com";
+	unsigned int sc = Http::GET(1024 * 1024 * 16,60000,reinterpret_cast<const struct sockaddr *>(&downloadZerotierDotCom),"/dev/1k",requestHeaders,responseHeaders,responseBody);
+	std::cout << sc << " " << responseBody.length() << " bytes ";
+	if (sc == 0)
+		std::cout << "ERROR: " << responseBody << std::endl;
+	else std::cout << "DONE" << std::endl;
+
+	std::cout << "[http] GET http://download.zerotier.com/dev/4m @" << downloadZerotierDotCom.toString() << " ... "; std::cout.flush();
+	requestHeaders["Host"] = "download.zerotier.com";
+	sc = Http::GET(1024 * 1024 * 16,60000,reinterpret_cast<const struct sockaddr *>(&downloadZerotierDotCom),"/dev/4m",requestHeaders,responseHeaders,responseBody);
+	std::cout << sc << " " << responseBody.length() << " bytes ";
+	if (sc == 0)
+		std::cout << "ERROR: " << responseBody << std::endl;
+	else std::cout << "DONE" << std::endl;
+
+	downloadZerotierDotCom = InetAddress("1.0.0.1/1234");
+	std::cout << "[http] GET @" << downloadZerotierDotCom.toString() << " ... "; std::cout.flush();
+	sc = Http::GET(1024 * 1024 * 16,2500,reinterpret_cast<const struct sockaddr *>(&downloadZerotierDotCom),"/dev/4m",requestHeaders,responseHeaders,responseBody);
+	std::cout << sc << " (should be 0, time out)" << std::endl;
+
+	return 0;
 }
 
 #ifdef __WINDOWS__
-int __cdecl _tmain(int argc, _TCHAR* argv[])
+int _tmain(int argc, _TCHAR* argv[])
 #else
-int main(int argc, char** argv)
+int main(int argc,char **argv)
 #endif
 {
-    int r = 0;
+	int r = 0;
 
 #ifdef __WINDOWS__
-    WSADATA wsaData;
-    WSAStartup(MAKEWORD(2, 2), &wsaData);
+	WSADATA wsaData;
+	WSAStartup(MAKEWORD(2,2),&wsaData);
 #endif
 
-    // Code to generate the C25519 test vectors -- did this once and then
-    // put these up top so that we can ensure that every platform produces
-    // the same result.
-    /*
-    for(int k=0;k<32;++k) {
-        ECC::Pair p1 = ECC::generate();
-        ECC::Pair p2 = ECC::generate();
-        unsigned char agg[64];
-        ECC::agree(p1,p2.pub,agg,64);
-        ECC::Signature sig1 = ECC::sign(p1,agg,64);
-        ECC::Signature sig2 = ECC::sign(p2,agg,64);
-        printf("{{");
-        for(int i=0;i<64;++i)
-            printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)p1.pub.data[i]);
-        printf("},{");
-        for(int i=0;i<64;++i)
-            printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)p1.priv.data[i]);
-        printf("},{");
-        for(int i=0;i<64;++i)
-            printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)p2.pub.data[i]);
-        printf("},{");
-        for(int i=0;i<64;++i)
-            printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)p2.priv.data[i]);
-        printf("},{");
-        for(int i=0;i<64;++i)
-            printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)agg[i]);
-        printf("},{");
-        for(int i=0;i<96;++i)
-            printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)sig1.data[i]);
-        printf("},{");
-        for(int i=0;i<96;++i)
-            printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)sig2.data[i]);
-        printf("}}\n");
-    }
-    exit(0);
-    */
+	// Code to generate the C25519 test vectors -- did this once and then
+	// put these up top so that we can ensure that every platform produces
+	// the same result.
+	/*
+	for(int k=0;k<32;++k) {
+		C25519::Pair p1 = C25519::generate();
+		C25519::Pair p2 = C25519::generate();
+		unsigned char agg[64];
+		C25519::agree(p1,p2.pub,agg,64);
+		C25519::Signature sig1 = C25519::sign(p1,agg,64);
+		C25519::Signature sig2 = C25519::sign(p2,agg,64);
+		printf("{{");
+		for(int i=0;i<64;++i)
+			printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)p1.pub.data[i]);
+		printf("},{");
+		for(int i=0;i<64;++i)
+			printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)p1.priv.data[i]);
+		printf("},{");
+		for(int i=0;i<64;++i)
+			printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)p2.pub.data[i]);
+		printf("},{");
+		for(int i=0;i<64;++i)
+			printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)p2.priv.data[i]);
+		printf("},{");
+		for(int i=0;i<64;++i)
+			printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)agg[i]);
+		printf("},{");
+		for(int i=0;i<96;++i)
+			printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)sig1.data[i]);
+		printf("},{");
+		for(int i=0;i<96;++i)
+			printf("%s0x%.2x",((i > 0) ? "," : ""),(unsigned int)sig2.data[i]);
+		printf("}}\n");
+	}
+	exit(0);
+	*/
 
-    std::cout << "[info] sizeof(void *) == " << sizeof(void*) << std::endl;
-    std::cout << "[info] OSUtils::now() == " << OSUtils::now() << std::endl;
-    std::cout << "[info] hardware concurrency == " << std::thread::hardware_concurrency() << std::endl;
-    std::cout << "[info] sizeof(NetworkConfig) == " << sizeof(ZeroTier::NetworkConfig) << std::endl;
+	std::cout << "[info] sizeof(void *) == " << sizeof(void *) << std::endl;
+	std::cout << "[info] sizeof(NetworkConfig) == " << sizeof(ZeroTier::NetworkConfig) << std::endl;
 
-    srand((unsigned int)time(0));
+	srand((unsigned int)time(0));
 
-    ///*
-    r |= testOther();
-    r |= testCrypto();
-    r |= testPacket();
-    r |= testIdentity();
-    r |= testCertificate();
-    r |= testPhy();
-    //*/
+	///*
+	r |= testSqliteNetworkController();
+	r |= testOther();
+	r |= testCrypto();
+	r |= testPacket();
+	r |= testIdentity();
+	r |= testCertificate();
+	r |= testPhy();
+	r |= testResolver();
+	//r |= testHttp();
+	//*/
 
-    if (r)
-        std::cout << std::endl << "SOMETHING FAILED!" << std::endl;
+	if (r)
+		std::cout << std::endl << "SOMETHING FAILED!" << std::endl;
 
-    /*
+	/*
 #ifdef ZT_USE_MINIUPNPC
-    std::cout << std::endl;
-    std::cout << "[portmapper] Starting port mapper and waiting forever... use CTRL+C to exit. (enable ZT_PORTMAPPER_TRACE in PortMapper.cpp for output)" << std::endl;
-    PortMapper mapper(12345,"ZeroTier/__selftest");
-    Thread::sleep(0xffffffff);
+	std::cout << std::endl;
+	std::cout << "[portmapper] Starting port mapper and waiting forever... use CTRL+C to exit. (enable ZT_PORTMAPPER_TRACE in PortMapper.cpp for output)" << std::endl;
+	PortMapper mapper(12345,"ZeroTier/__selftest");
+	Thread::sleep(0xffffffff);
 #endif
-    */
+	*/
 
-    return r;
+	return r;
 }
diff --git a/service/ClusterDefinition.hpp b/service/ClusterDefinition.hpp
new file mode 100644
index 000000000..441cc04de
--- /dev/null
+++ b/service/ClusterDefinition.hpp
@@ -0,0 +1,160 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_CLUSTERDEFINITION_HPP
+#define ZT_CLUSTERDEFINITION_HPP
+
+#ifdef ZT_ENABLE_CLUSTER
+
+#include <vector>
+#include <algorithm>
+
+#include "../node/Constants.hpp"
+#include "../node/Utils.hpp"
+#include "../node/NonCopyable.hpp"
+#include "../osdep/OSUtils.hpp"
+
+#include "ClusterGeoIpService.hpp"
+
+namespace ZeroTier {
+
+/**
+ * Parser for cluster definition file
+ */
+class ClusterDefinition : NonCopyable
+{
+public:
+	struct MemberDefinition
+	{
+		MemberDefinition() : id(0),x(0),y(0),z(0) { name[0] = (char)0; }
+
+		unsigned int id;
+		int x,y,z;
+		char name[256];
+		InetAddress clusterEndpoint;
+		std::vector<InetAddress> zeroTierEndpoints;
+	};
+
+	/**
+	 * Load and initialize cluster definition and GeoIP data if any
+	 *
+	 * @param myAddress My ZeroTier address
+	 * @param pathToClusterFile Path to cluster definition file
+	 * @throws std::runtime_error Invalid cluster definition or unable to load data
+	 */
+	ClusterDefinition(uint64_t myAddress,const char *pathToClusterFile)
+	{
+		std::string cf;
+		if (!OSUtils::readFile(pathToClusterFile,cf))
+			return;
+
+		char myAddressStr[64];
+		Utils::snprintf(myAddressStr,sizeof(myAddressStr),"%.10llx",myAddress);
+
+		std::vector<std::string> lines(Utils::split(cf.c_str(),"\r\n","",""));
+		for(std::vector<std::string>::iterator l(lines.begin());l!=lines.end();++l) {
+			std::vector<std::string> fields(Utils::split(l->c_str()," \t","",""));
+			if ((fields.size() < 5)||(fields[0][0] == '#')||(fields[0] != myAddressStr))
+				continue;
+
+			// <address> geo <CSV path> <ip start column> <ip end column> <latitutde column> <longitude column>
+			if (fields[1] == "geo") {
+				if ((fields.size() >= 7)&&(OSUtils::fileExists(fields[2].c_str()))) {
+					int ipStartColumn = Utils::strToInt(fields[3].c_str());
+					int ipEndColumn = Utils::strToInt(fields[4].c_str());
+					int latitudeColumn = Utils::strToInt(fields[5].c_str());
+					int longitudeColumn = Utils::strToInt(fields[6].c_str());
+					if (_geo.load(fields[2].c_str(),ipStartColumn,ipEndColumn,latitudeColumn,longitudeColumn) <= 0)
+						throw std::runtime_error(std::string("failed to load geo-ip data from ")+fields[2]);
+				}
+				continue;
+			}
+
+			// <address> <ID> <name> <backplane IP/port(s)> <ZT frontplane IP/port(s)> <x,y,z>
+			int id = Utils::strToUInt(fields[1].c_str());
+			if ((id < 0)||(id > ZT_CLUSTER_MAX_MEMBERS))
+				throw std::runtime_error(std::string("invalid cluster member ID: ")+fields[1]);
+			MemberDefinition &md = _md[id];
+
+			md.id = (unsigned int)id;
+			if (fields.size() >= 6) {
+				std::vector<std::string> xyz(Utils::split(fields[5].c_str(),",","",""));
+				md.x = (xyz.size() > 0) ? Utils::strToInt(xyz[0].c_str()) : 0;
+				md.y = (xyz.size() > 1) ? Utils::strToInt(xyz[1].c_str()) : 0;
+				md.z = (xyz.size() > 2) ? Utils::strToInt(xyz[2].c_str()) : 0;
+			}
+			Utils::scopy(md.name,sizeof(md.name),fields[2].c_str());
+			md.clusterEndpoint.fromString(fields[3]);
+			if (!md.clusterEndpoint)
+				continue;
+			std::vector<std::string> zips(Utils::split(fields[4].c_str(),",","",""));
+			for(std::vector<std::string>::iterator zip(zips.begin());zip!=zips.end();++zip) {
+				InetAddress i;
+				i.fromString(*zip);
+				if (i)
+					md.zeroTierEndpoints.push_back(i);
+			}
+
+			_ids.push_back((unsigned int)id);
+		}
+
+		std::sort(_ids.begin(),_ids.end());
+	}
+
+	/**
+	 * @return All member definitions in this cluster by ID (ID is array index)
+	 */
+	inline const MemberDefinition &operator[](unsigned int id) const throw() { return _md[id]; }
+
+	/**
+	 * @return Number of members in this cluster
+	 */
+	inline unsigned int size() const throw() { return (unsigned int)_ids.size(); }
+
+	/**
+	 * @return IDs of members in this cluster sorted by ID
+	 */
+	inline const std::vector<unsigned int> &ids() const throw() { return _ids; }
+
+	/**
+	 * @return GeoIP service for this cluster
+	 */
+	inline ClusterGeoIpService &geo() throw() { return _geo; }
+
+	/**
+	 * @return A vector (new copy) containing all cluster members
+	 */
+	inline std::vector<MemberDefinition> members() const
+	{
+		std::vector<MemberDefinition> m;
+		for(std::vector<unsigned int>::const_iterator i(_ids.begin());i!=_ids.end();++i)
+			m.push_back(_md[*i]);
+		return m;
+	}
+
+private:
+	MemberDefinition _md[ZT_CLUSTER_MAX_MEMBERS];
+	std::vector<unsigned int> _ids;
+	ClusterGeoIpService _geo;
+};
+
+} // namespace ZeroTier
+
+#endif // ZT_ENABLE_CLUSTER
+
+#endif
diff --git a/service/ClusterGeoIpService.cpp b/service/ClusterGeoIpService.cpp
new file mode 100644
index 000000000..3ad697537
--- /dev/null
+++ b/service/ClusterGeoIpService.cpp
@@ -0,0 +1,235 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef ZT_ENABLE_CLUSTER
+
+#include <math.h>
+
+#include <cmath>
+
+#include "ClusterGeoIpService.hpp"
+
+#include "../node/Utils.hpp"
+#include "../osdep/OSUtils.hpp"
+
+#define ZT_CLUSTERGEOIPSERVICE_FILE_MODIFICATION_CHECK_EVERY 10000
+
+namespace ZeroTier {
+
+ClusterGeoIpService::ClusterGeoIpService() :
+	_pathToCsv(),
+	_ipStartColumn(-1),
+	_ipEndColumn(-1),
+	_latitudeColumn(-1),
+	_longitudeColumn(-1),
+	_lastFileCheckTime(0),
+	_csvModificationTime(0),
+	_csvFileSize(0)
+{
+}
+
+ClusterGeoIpService::~ClusterGeoIpService()
+{
+}
+
+bool ClusterGeoIpService::locate(const InetAddress &ip,int &x,int &y,int &z)
+{
+	Mutex::Lock _l(_lock);
+
+	if ((_pathToCsv.length() > 0)&&((OSUtils::now() - _lastFileCheckTime) > ZT_CLUSTERGEOIPSERVICE_FILE_MODIFICATION_CHECK_EVERY)) {
+		_lastFileCheckTime = OSUtils::now();
+		if ((_csvFileSize != OSUtils::getFileSize(_pathToCsv.c_str()))||(_csvModificationTime != OSUtils::getLastModified(_pathToCsv.c_str())))
+			_load(_pathToCsv.c_str(),_ipStartColumn,_ipEndColumn,_latitudeColumn,_longitudeColumn);
+	}
+
+	/* We search by looking up the upper bound of the sorted vXdb vectors
+	 * and then iterating down for a matching IP range. We stop when we hit
+	 * the beginning or an entry whose start and end are before the IP we
+	 * are searching. */
+
+	if ((ip.ss_family == AF_INET)&&(_v4db.size() > 0)) {
+		_V4E key;
+		key.start = Utils::ntoh((uint32_t)(reinterpret_cast<const struct sockaddr_in *>(&ip)->sin_addr.s_addr));
+		std::vector<_V4E>::const_iterator i(std::upper_bound(_v4db.begin(),_v4db.end(),key));
+		while (i != _v4db.begin()) {
+			--i;
+			if ((key.start >= i->start)&&(key.start <= i->end)) {
+				x = i->x;
+				y = i->y;
+				z = i->z;
+				//printf("%s : %f,%f %d,%d,%d\n",ip.toIpString().c_str(),i->lat,i->lon,x,y,z);
+				return true;
+			} else if ((key.start > i->start)&&(key.start > i->end))
+				break;
+		}
+	} else if ((ip.ss_family == AF_INET6)&&(_v6db.size() > 0)) {
+		_V6E key;
+		memcpy(key.start,reinterpret_cast<const struct sockaddr_in6 *>(&ip)->sin6_addr.s6_addr,16);
+		std::vector<_V6E>::const_iterator i(std::upper_bound(_v6db.begin(),_v6db.end(),key));
+		while (i != _v6db.begin()) {
+			--i;
+			const int s_vs_s = memcmp(key.start,i->start,16);
+			const int s_vs_e = memcmp(key.start,i->end,16);
+			if ((s_vs_s >= 0)&&(s_vs_e <= 0)) {
+				x = i->x;
+				y = i->y;
+				z = i->z;
+				//printf("%s : %f,%f %d,%d,%d\n",ip.toIpString().c_str(),i->lat,i->lon,x,y,z);
+				return true;
+			} else if ((s_vs_s > 0)&&(s_vs_e > 0))
+				break;
+		}
+	}
+
+	return false;
+}
+
+void ClusterGeoIpService::_parseLine(const char *line,std::vector<_V4E> &v4db,std::vector<_V6E> &v6db,int ipStartColumn,int ipEndColumn,int latitudeColumn,int longitudeColumn)
+{
+	std::vector<std::string> ls(Utils::split(line,",\t","\\","\"'"));
+	if ( ((ipStartColumn >= 0)&&(ipStartColumn < (int)ls.size()))&&
+	     ((ipEndColumn >= 0)&&(ipEndColumn < (int)ls.size()))&&
+	     ((latitudeColumn >= 0)&&(latitudeColumn < (int)ls.size()))&&
+	     ((longitudeColumn >= 0)&&(longitudeColumn < (int)ls.size())) ) {
+		InetAddress ipStart(ls[ipStartColumn].c_str(),0);
+		InetAddress ipEnd(ls[ipEndColumn].c_str(),0);
+		const double lat = strtod(ls[latitudeColumn].c_str(),(char **)0);
+		const double lon = strtod(ls[longitudeColumn].c_str(),(char **)0);
+
+		if ((ipStart.ss_family == ipEnd.ss_family)&&(ipStart)&&(ipEnd)&&(std::isfinite(lat))&&(std::isfinite(lon))) {
+			const double latRadians = lat * 0.01745329251994; // PI / 180
+			const double lonRadians = lon * 0.01745329251994; // PI / 180
+			const double cosLat = cos(latRadians);
+			const int x = (int)round((-6371.0) * cosLat * cos(lonRadians)); // 6371 == Earth's approximate radius in kilometers
+			const int y = (int)round(6371.0 * sin(latRadians));
+			const int z = (int)round(6371.0 * cosLat * sin(lonRadians));
+
+			if (ipStart.ss_family == AF_INET) {
+				v4db.push_back(_V4E());
+				v4db.back().start = Utils::ntoh((uint32_t)(reinterpret_cast<const struct sockaddr_in *>(&ipStart)->sin_addr.s_addr));
+				v4db.back().end = Utils::ntoh((uint32_t)(reinterpret_cast<const struct sockaddr_in *>(&ipEnd)->sin_addr.s_addr));
+				v4db.back().lat = (float)lat;
+				v4db.back().lon = (float)lon;
+				v4db.back().x = x;
+				v4db.back().y = y;
+				v4db.back().z = z;
+				//printf("%s - %s : %d,%d,%d\n",ipStart.toIpString().c_str(),ipEnd.toIpString().c_str(),x,y,z);
+			} else if (ipStart.ss_family == AF_INET6) {
+				v6db.push_back(_V6E());
+				memcpy(v6db.back().start,reinterpret_cast<const struct sockaddr_in6 *>(&ipStart)->sin6_addr.s6_addr,16);
+				memcpy(v6db.back().end,reinterpret_cast<const struct sockaddr_in6 *>(&ipEnd)->sin6_addr.s6_addr,16);
+				v6db.back().lat = (float)lat;
+				v6db.back().lon = (float)lon;
+				v6db.back().x = x;
+				v6db.back().y = y;
+				v6db.back().z = z;
+				//printf("%s - %s : %d,%d,%d\n",ipStart.toIpString().c_str(),ipEnd.toIpString().c_str(),x,y,z);
+			}
+		}
+	}
+}
+
+long ClusterGeoIpService::_load(const char *pathToCsv,int ipStartColumn,int ipEndColumn,int latitudeColumn,int longitudeColumn)
+{
+	// assumes _lock is locked
+
+	FILE *f = fopen(pathToCsv,"rb");
+	if (!f)
+		return -1;
+
+	std::vector<_V4E> v4db;
+	std::vector<_V6E> v6db;
+	v4db.reserve(16777216);
+	v6db.reserve(16777216);
+
+	char buf[4096];
+	char linebuf[1024];
+	unsigned int lineptr = 0;
+	for(;;) {
+		int n = (int)fread(buf,1,sizeof(buf),f);
+		if (n <= 0)
+			break;
+		for(int i=0;i<n;++i) {
+			if ((buf[i] == '\r')||(buf[i] == '\n')||(buf[i] == (char)0)) {
+				if (lineptr) {
+					linebuf[lineptr] = (char)0;
+					_parseLine(linebuf,v4db,v6db,ipStartColumn,ipEndColumn,latitudeColumn,longitudeColumn);
+				}
+				lineptr = 0;
+			} else if (lineptr < (unsigned int)sizeof(linebuf))
+				linebuf[lineptr++] = buf[i];
+		}
+	}
+	if (lineptr) {
+		linebuf[lineptr] = (char)0;
+		_parseLine(linebuf,v4db,v6db,ipStartColumn,ipEndColumn,latitudeColumn,longitudeColumn);
+	}
+
+	fclose(f);
+
+	if ((v4db.size() > 0)||(v6db.size() > 0)) {
+		std::sort(v4db.begin(),v4db.end());
+		std::sort(v6db.begin(),v6db.end());
+
+		_pathToCsv = pathToCsv;
+		_ipStartColumn = ipStartColumn;
+		_ipEndColumn = ipEndColumn;
+		_latitudeColumn = latitudeColumn;
+		_longitudeColumn = longitudeColumn;
+
+		_lastFileCheckTime = OSUtils::now();
+		_csvModificationTime = OSUtils::getLastModified(pathToCsv);
+		_csvFileSize = OSUtils::getFileSize(pathToCsv);
+
+		_v4db.swap(v4db);
+		_v6db.swap(v6db);
+
+		return (long)(_v4db.size() + _v6db.size());
+	} else {
+		return 0;
+	}
+}
+
+} // namespace ZeroTier
+
+#endif // ZT_ENABLE_CLUSTER
+
+/*
+int main(int argc,char **argv)
+{
+	char buf[1024];
+
+	ZeroTier::ClusterGeoIpService gip;
+	printf("loading...\n");
+	gip.load("/Users/api/Code/ZeroTier/Infrastructure/root-servers/zerotier-one/cluster-geoip.csv",0,1,5,6);
+	printf("... done!\n"); fflush(stdout);
+
+	while (gets(buf)) { // unsafe, testing only
+		ZeroTier::InetAddress addr(buf,0);
+		printf("looking up: %s\n",addr.toString().c_str()); fflush(stdout);
+		int x = 0,y = 0,z = 0;
+		if (gip.locate(addr,x,y,z)) {
+			//printf("%s: %d,%d,%d\n",addr.toString().c_str(),x,y,z); fflush(stdout);
+		} else {
+			printf("%s: not found!\n",addr.toString().c_str()); fflush(stdout);
+		}
+	}
+
+	return 0;
+}
+*/
diff --git a/service/ClusterGeoIpService.hpp b/service/ClusterGeoIpService.hpp
new file mode 100644
index 000000000..ff2fcdb8a
--- /dev/null
+++ b/service/ClusterGeoIpService.hpp
@@ -0,0 +1,143 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_CLUSTERGEOIPSERVICE_HPP
+#define ZT_CLUSTERGEOIPSERVICE_HPP
+
+#ifdef ZT_ENABLE_CLUSTER
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <vector>
+#include <string>
+#include <algorithm>
+
+#include "../node/Constants.hpp"
+#include "../node/Mutex.hpp"
+#include "../node/NonCopyable.hpp"
+#include "../node/InetAddress.hpp"
+
+namespace ZeroTier {
+
+/**
+ * Loads a GeoIP CSV into memory for fast lookup, reloading as needed
+ *
+ * This was designed around the CSV from https://db-ip.com but can be used
+ * with any similar GeoIP CSV database that is presented in the form of an
+ * IP range and lat/long coordinates.
+ *
+ * It loads the whole database into memory, which can be kind of large. If
+ * the CSV file changes, the changes are loaded automatically.
+ */
+class ClusterGeoIpService : NonCopyable
+{
+public:
+	ClusterGeoIpService();
+	~ClusterGeoIpService();
+
+	/**
+	 * Load or reload CSV file
+	 *
+	 * CSV column indexes start at zero. CSVs can be quoted with single or
+	 * double quotes. Whitespace before or after commas is ignored. Backslash
+	 * may be used for escaping whitespace as well.
+	 *
+	 * @param pathToCsv Path to (uncompressed) CSV file
+	 * @param ipStartColumn Column with IP range start
+	 * @param ipEndColumn Column with IP range end (inclusive)
+	 * @param latitudeColumn Column with latitude
+	 * @param longitudeColumn Column with longitude
+	 * @return Number of valid records loaded or -1 on error (invalid file, not found, etc.)
+	 */
+	inline long load(const char *pathToCsv,int ipStartColumn,int ipEndColumn,int latitudeColumn,int longitudeColumn)
+	{
+		Mutex::Lock _l(_lock);
+		return _load(pathToCsv,ipStartColumn,ipEndColumn,latitudeColumn,longitudeColumn);
+	}
+
+	/**
+	 * Attempt to locate an IP
+	 *
+	 * This returns true if x, y, and z are set. If the return value is false
+	 * the values of x, y, and z are undefined.
+	 *
+	 * @param ip IPv4 or IPv6 address
+	 * @param x Reference to variable to receive X
+	 * @param y Reference to variable to receive Y
+	 * @param z Reference to variable to receive Z
+	 * @return True if coordinates were set
+	 */
+	bool locate(const InetAddress &ip,int &x,int &y,int &z);
+
+	/**
+	 * @return True if IP database/service is available for queries (otherwise locate() will always be false)
+	 */
+	inline bool available() const
+	{
+		Mutex::Lock _l(_lock);
+		return ((_v4db.size() + _v6db.size()) > 0);
+	}
+
+private:
+	struct _V4E
+	{
+		uint32_t start;
+		uint32_t end;
+		float lat,lon;
+		int16_t x,y,z;
+
+		inline bool operator<(const _V4E &e) const { return (start < e.start); }
+	};
+
+	struct _V6E
+	{
+		uint8_t start[16];
+		uint8_t end[16];
+		float lat,lon;
+		int16_t x,y,z;
+
+		inline bool operator<(const _V6E &e) const { return (memcmp(start,e.start,16) < 0); }
+	};
+
+	static void _parseLine(const char *line,std::vector<_V4E> &v4db,std::vector<_V6E> &v6db,int ipStartColumn,int ipEndColumn,int latitudeColumn,int longitudeColumn);
+	long _load(const char *pathToCsv,int ipStartColumn,int ipEndColumn,int latitudeColumn,int longitudeColumn);
+
+	std::string _pathToCsv;
+	int _ipStartColumn;
+	int _ipEndColumn;
+	int _latitudeColumn;
+	int _longitudeColumn;
+
+	uint64_t _lastFileCheckTime;
+	uint64_t _csvModificationTime;
+	int64_t _csvFileSize;
+
+	std::vector<_V4E> _v4db;
+	std::vector<_V6E> _v6db;
+
+	Mutex _lock;
+};
+
+} // namespace ZeroTier
+
+#endif // ZT_ENABLE_CLUSTER
+
+#endif
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp
new file mode 100644
index 000000000..060f49e2e
--- /dev/null
+++ b/service/ControlPlane.cpp
@@ -0,0 +1,582 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ControlPlane.hpp"
+#include "OneService.hpp"
+
+#include "../version.h"
+#include "../include/ZeroTierOne.h"
+
+#include "../ext/http-parser/http_parser.h"
+
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+#include "../controller/SqliteNetworkController.hpp"
+#endif
+
+#include "../node/InetAddress.hpp"
+#include "../node/Node.hpp"
+#include "../node/Utils.hpp"
+#include "../osdep/OSUtils.hpp"
+
+namespace ZeroTier {
+
+static std::string _jsonEscape(const char *s)
+{
+	std::string buf;
+	for(const char *p=s;(*p);++p) {
+		switch(*p) {
+			case '\t': buf.append("\\t");  break;
+			case '\b': buf.append("\\b");  break;
+			case '\r': buf.append("\\r");  break;
+			case '\n': buf.append("\\n");  break;
+			case '\f': buf.append("\\f");  break;
+			case '"':  buf.append("\\\""); break;
+			case '\\': buf.append("\\\\"); break;
+			case '/':  buf.append("\\/");  break;
+			default:   buf.push_back(*p);  break;
+		}
+	}
+	return buf;
+}
+static std::string _jsonEscape(const std::string &s) { return _jsonEscape(s.c_str()); }
+
+static std::string _jsonEnumerate(const ZT_MulticastGroup *mg,unsigned int count)
+{
+	std::string buf;
+	char tmp[128];
+	buf.push_back('[');
+	for(unsigned int i=0;i<count;++i) {
+		if (i > 0)
+			buf.push_back(',');
+		Utils::snprintf(tmp,sizeof(tmp),"\"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\\/%.8lx\"",
+			(unsigned int)((mg[i].mac >> 40) & 0xff),
+			(unsigned int)((mg[i].mac >> 32) & 0xff),
+			(unsigned int)((mg[i].mac >> 24) & 0xff),
+			(unsigned int)((mg[i].mac >> 16) & 0xff),
+			(unsigned int)((mg[i].mac >> 8) & 0xff),
+			(unsigned int)(mg[i].mac & 0xff),
+			(unsigned long)(mg[i].adi));
+		buf.append(tmp);
+	}
+	buf.push_back(']');
+	return buf;
+}
+
+static std::string _jsonEnumerate(const struct sockaddr_storage *ss,unsigned int count)
+{
+	std::string buf;
+	buf.push_back('[');
+	for(unsigned int i=0;i<count;++i) {
+		if (i > 0)
+			buf.push_back(',');
+		buf.push_back('"');
+		buf.append(_jsonEscape(reinterpret_cast<const InetAddress *>(&(ss[i]))->toString()));
+		buf.push_back('"');
+	}
+	buf.push_back(']');
+	return buf;
+}
+
+static void _jsonAppend(unsigned int depth,std::string &buf,const ZT_VirtualNetworkConfig *nc,const std::string &portDeviceName)
+{
+	char json[4096];
+	char prefix[32];
+
+	if (depth >= sizeof(prefix)) // sanity check -- shouldn't be possible
+		return;
+	for(unsigned int i=0;i<depth;++i)
+		prefix[i] = '\t';
+	prefix[depth] = '\0';
+
+	const char *nstatus = "",*ntype = "";
+	switch(nc->status) {
+		case ZT_NETWORK_STATUS_REQUESTING_CONFIGURATION: nstatus = "REQUESTING_CONFIGURATION"; break;
+		case ZT_NETWORK_STATUS_OK:                       nstatus = "OK"; break;
+		case ZT_NETWORK_STATUS_ACCESS_DENIED:            nstatus = "ACCESS_DENIED"; break;
+		case ZT_NETWORK_STATUS_NOT_FOUND:                nstatus = "NOT_FOUND"; break;
+		case ZT_NETWORK_STATUS_PORT_ERROR:               nstatus = "PORT_ERROR"; break;
+		case ZT_NETWORK_STATUS_CLIENT_TOO_OLD:           nstatus = "CLIENT_TOO_OLD"; break;
+	}
+	switch(nc->type) {
+		case ZT_NETWORK_TYPE_PRIVATE:                    ntype = "PRIVATE"; break;
+		case ZT_NETWORK_TYPE_PUBLIC:                     ntype = "PUBLIC"; break;
+	}
+
+	Utils::snprintf(json,sizeof(json),
+		"%s{\n"
+		"%s\t\"nwid\": \"%.16llx\",\n"
+		"%s\t\"mac\": \"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\",\n"
+		"%s\t\"name\": \"%s\",\n"
+		"%s\t\"status\": \"%s\",\n"
+		"%s\t\"type\": \"%s\",\n"
+		"%s\t\"mtu\": %u,\n"
+		"%s\t\"dhcp\": %s,\n"
+		"%s\t\"bridge\": %s,\n"
+		"%s\t\"broadcastEnabled\": %s,\n"
+		"%s\t\"portError\": %d,\n"
+		"%s\t\"netconfRevision\": %lu,\n"
+		"%s\t\"multicastSubscriptions\": %s,\n"
+		"%s\t\"assignedAddresses\": %s,\n"
+		"%s\t\"portDeviceName\": \"%s\"\n"
+		"%s}",
+		prefix,
+		prefix,nc->nwid,
+		prefix,(unsigned int)((nc->mac >> 40) & 0xff),(unsigned int)((nc->mac >> 32) & 0xff),(unsigned int)((nc->mac >> 24) & 0xff),(unsigned int)((nc->mac >> 16) & 0xff),(unsigned int)((nc->mac >> 8) & 0xff),(unsigned int)(nc->mac & 0xff),
+		prefix,_jsonEscape(nc->name).c_str(),
+		prefix,nstatus,
+		prefix,ntype,
+		prefix,nc->mtu,
+		prefix,(nc->dhcp == 0) ? "false" : "true",
+		prefix,(nc->bridge == 0) ? "false" : "true",
+		prefix,(nc->broadcastEnabled == 0) ? "false" : "true",
+		prefix,nc->portError,
+		prefix,nc->netconfRevision,
+		prefix,_jsonEnumerate(nc->multicastSubscriptions,nc->multicastSubscriptionCount).c_str(),
+		prefix,_jsonEnumerate(nc->assignedAddresses,nc->assignedAddressCount).c_str(),
+		prefix,_jsonEscape(portDeviceName).c_str(),
+		prefix);
+	buf.append(json);
+}
+
+static std::string _jsonEnumerate(unsigned int depth,const ZT_PeerPhysicalPath *pp,unsigned int count)
+{
+	char json[1024];
+	char prefix[32];
+
+	if (depth >= sizeof(prefix)) // sanity check -- shouldn't be possible
+		return std::string();
+	for(unsigned int i=0;i<depth;++i)
+		prefix[i] = '\t';
+	prefix[depth] = '\0';
+
+	std::string buf;
+	for(unsigned int i=0;i<count;++i) {
+		if (i > 0)
+			buf.push_back(',');
+		Utils::snprintf(json,sizeof(json),
+			"{\n"
+			"%s\t\"address\": \"%s\",\n"
+			"%s\t\"lastSend\": %llu,\n"
+			"%s\t\"lastReceive\": %llu,\n"
+			"%s\t\"active\": %s,\n"
+			"%s\t\"preferred\": %s\n"
+			"%s}",
+			prefix,_jsonEscape(reinterpret_cast<const InetAddress *>(&(pp[i].address))->toString()).c_str(),
+			prefix,pp[i].lastSend,
+			prefix,pp[i].lastReceive,
+			prefix,(pp[i].active == 0) ? "false" : "true",
+			prefix,(pp[i].preferred == 0) ? "false" : "true",
+			prefix);
+		buf.append(json);
+	}
+	return buf;
+}
+
+static void _jsonAppend(unsigned int depth,std::string &buf,const ZT_Peer *peer)
+{
+	char json[1024];
+	char prefix[32];
+
+	if (depth >= sizeof(prefix)) // sanity check -- shouldn't be possible
+		return;
+	for(unsigned int i=0;i<depth;++i)
+		prefix[i] = '\t';
+	prefix[depth] = '\0';
+
+	const char *prole = "";
+	switch(peer->role) {
+		case ZT_PEER_ROLE_LEAF:  prole = "LEAF"; break;
+		case ZT_PEER_ROLE_RELAY: prole = "RELAY"; break;
+		case ZT_PEER_ROLE_ROOT:  prole = "ROOT"; break;
+	}
+
+	Utils::snprintf(json,sizeof(json),
+		"%s{\n"
+		"%s\t\"address\": \"%.10llx\",\n"
+		"%s\t\"lastUnicastFrame\": %llu,\n"
+		"%s\t\"lastMulticastFrame\": %llu,\n"
+		"%s\t\"versionMajor\": %d,\n"
+		"%s\t\"versionMinor\": %d,\n"
+		"%s\t\"versionRev\": %d,\n"
+		"%s\t\"version\": \"%d.%d.%d\",\n"
+		"%s\t\"latency\": %u,\n"
+		"%s\t\"role\": \"%s\",\n"
+		"%s\t\"paths\": [%s]\n"
+		"%s}",
+		prefix,
+		prefix,peer->address,
+		prefix,peer->lastUnicastFrame,
+		prefix,peer->lastMulticastFrame,
+		prefix,peer->versionMajor,
+		prefix,peer->versionMinor,
+		prefix,peer->versionRev,
+		prefix,peer->versionMajor,peer->versionMinor,peer->versionRev,
+		prefix,peer->latency,
+		prefix,prole,
+		prefix,_jsonEnumerate(depth+1,peer->paths,peer->pathCount).c_str(),
+		prefix);
+	buf.append(json);
+}
+
+ControlPlane::ControlPlane(OneService *svc,Node *n,const char *uiStaticPath) :
+	_svc(svc),
+	_node(n),
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+	_controller((SqliteNetworkController *)0),
+#endif
+	_uiStaticPath((uiStaticPath) ? uiStaticPath : "")
+{
+}
+
+ControlPlane::~ControlPlane()
+{
+}
+
+unsigned int ControlPlane::handleRequest(
+	const InetAddress &fromAddress,
+	unsigned int httpMethod,
+	const std::string &path,
+	const std::map<std::string,std::string> &headers,
+	const std::string &body,
+	std::string &responseBody,
+	std::string &responseContentType)
+{
+	char json[8194];
+	unsigned int scode = 404;
+	std::vector<std::string> ps(Utils::split(path.c_str(),"/","",""));
+	std::map<std::string,std::string> urlArgs;
+	Mutex::Lock _l(_lock);
+
+	if (!((fromAddress.ipsEqual(InetAddress::LO4))||(fromAddress.ipsEqual(InetAddress::LO6))))
+		return 403; // Forbidden: we only allow access from localhost right now
+
+	/* Note: this is kind of restricted in what it'll take. It does not support
+	 * URL encoding, and /'s in URL args will screw it up. But the only URL args
+	 * it really uses in ?jsonp=funcionName, and otherwise it just takes simple
+	 * paths to simply-named resources. */
+	if (ps.size() > 0) {
+		std::size_t qpos = ps[ps.size() - 1].find('?');
+		if (qpos != std::string::npos) {
+			std::string args(ps[ps.size() - 1].substr(qpos + 1));
+			ps[ps.size() - 1] = ps[ps.size() - 1].substr(0,qpos);
+			std::vector<std::string> asplit(Utils::split(args.c_str(),"&","",""));
+			for(std::vector<std::string>::iterator a(asplit.begin());a!=asplit.end();++a) {
+				std::size_t eqpos = a->find('=');
+				if (eqpos == std::string::npos)
+					urlArgs[*a] = "";
+				else urlArgs[a->substr(0,eqpos)] = a->substr(eqpos + 1);
+			}
+		}
+	} else {
+		ps.push_back(std::string("index.html"));
+	}
+
+	bool isAuth = false;
+	{
+		std::map<std::string,std::string>::const_iterator ah(headers.find("x-zt1-auth"));
+		if ((ah != headers.end())&&(_authTokens.count(ah->second) > 0)) {
+			isAuth = true;
+		} else {
+			ah = urlArgs.find("auth");
+			if ((ah != urlArgs.end())&&(_authTokens.count(ah->second) > 0))
+				isAuth = true;
+		}
+	}
+
+	if (httpMethod == HTTP_GET) {
+
+		std::string ext;
+		std::size_t dotIdx = ps[0].find_last_of('.');
+		if (dotIdx != std::string::npos)
+			ext = ps[0].substr(dotIdx);
+
+		if ((ps.size() == 1)&&(ext.length() >= 2)&&(ext[0] == '.')) {
+			/* Static web pages can be served without authentication to enable a simple web
+			 * UI. This is still only allowed from approved IP addresses. Anything with a
+			 * dot in the first path element (e.g. foo.html) is considered a static page,
+			 * as nothing in the API is so named. */
+
+			if (_uiStaticPath.length() > 0) {
+				if (ext == ".html")
+					responseContentType = "text/html";
+				else if (ext == ".js")
+					responseContentType = "application/javascript";
+				else if (ext == ".jsx")
+					responseContentType = "text/jsx";
+				else if (ext == ".json")
+					responseContentType = "application/json";
+				else if (ext == ".css")
+					responseContentType = "text/css";
+				else if (ext == ".png")
+					responseContentType = "image/png";
+				else if (ext == ".jpg")
+					responseContentType = "image/jpeg";
+				else if (ext == ".gif")
+					responseContentType = "image/gif";
+				else if (ext == ".txt")
+					responseContentType = "text/plain";
+				else if (ext == ".xml")
+					responseContentType = "text/xml";
+				else if (ext == ".svg")
+					responseContentType = "image/svg+xml";
+				else responseContentType = "application/octet-stream";
+				scode = OSUtils::readFile((_uiStaticPath + ZT_PATH_SEPARATOR_S + ps[0]).c_str(),responseBody) ? 200 : 404;
+			} else {
+				scode = 404;
+			}
+
+		} else if (isAuth) {
+			/* Things that require authentication -- a.k.a. everything but static web app pages. */
+
+			if (ps[0] == "status") {
+				responseContentType = "application/json";
+
+				ZT_NodeStatus status;
+				_node->status(&status);
+
+				std::string clusterJson;
+#ifdef ZT_ENABLE_CLUSTER
+				{
+					ZT_ClusterStatus cs;
+					_node->clusterStatus(&cs);
+
+					if (cs.clusterSize >= 1) {
+						char t[1024];
+						Utils::snprintf(t,sizeof(t),"{\n\t\t\"myId\": %u,\n\t\t\"clusterSize\": %u,\n\t\t\"members\": [",cs.myId,cs.clusterSize);
+						clusterJson.append(t);
+						for(unsigned int i=0;i<cs.clusterSize;++i) {
+							Utils::snprintf(t,sizeof(t),"%s\t\t\t{\n\t\t\t\t\"id\": %u,\n\t\t\t\t\"msSinceLastHeartbeat\": %u,\n\t\t\t\t\"alive\": %s,\n\t\t\t\t\"x\": %d,\n\t\t\t\t\"y\": %d,\n\t\t\t\t\"z\": %d,\n\t\t\t\t\"load\": %llu,\n\t\t\t\t\"peers\": %llu\n\t\t\t}",
+								((i == 0) ? "\n" : ",\n"),
+								cs.members[i].id,
+								cs.members[i].msSinceLastHeartbeat,
+								(cs.members[i].alive != 0) ? "true" : "false",
+								cs.members[i].x,
+								cs.members[i].y,
+								cs.members[i].z,
+								cs.members[i].load,
+								cs.members[i].peers);
+							clusterJson.append(t);
+						}
+						clusterJson.append(" ]\n\t\t}");
+					}
+				}
+#endif
+
+				Utils::snprintf(json,sizeof(json),
+					"{\n"
+					"\t\"address\": \"%.10llx\",\n"
+					"\t\"publicIdentity\": \"%s\",\n"
+					"\t\"worldId\": %llu,\n"
+					"\t\"worldTimestamp\": %llu,\n"
+					"\t\"online\": %s,\n"
+					"\t\"tcpFallbackActive\": %s,\n"
+					"\t\"versionMajor\": %d,\n"
+					"\t\"versionMinor\": %d,\n"
+					"\t\"versionRev\": %d,\n"
+					"\t\"version\": \"%d.%d.%d\",\n"
+					"\t\"clock\": %llu,\n"
+					"\t\"cluster\": %s\n"
+					"}\n",
+					status.address,
+					status.publicIdentity,
+					status.worldId,
+					status.worldTimestamp,
+					(status.online) ? "true" : "false",
+					(_svc->tcpFallbackActive()) ? "true" : "false",
+					ZEROTIER_ONE_VERSION_MAJOR,
+					ZEROTIER_ONE_VERSION_MINOR,
+					ZEROTIER_ONE_VERSION_REVISION,
+					ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION,
+					(unsigned long long)OSUtils::now(),
+					((clusterJson.length() > 0) ? clusterJson.c_str() : "null"));
+				responseBody = json;
+				scode = 200;
+			} else if (ps[0] == "config") {
+				responseContentType = "application/json";
+				responseBody = "{}"; // TODO
+				scode = 200;
+			} else if (ps[0] == "network") {
+				ZT_VirtualNetworkList *nws = _node->networks();
+				if (nws) {
+					if (ps.size() == 1) {
+						// Return [array] of all networks
+						responseContentType = "application/json";
+						responseBody = "[\n";
+						for(unsigned long i=0;i<nws->networkCount;++i) {
+							if (i > 0)
+								responseBody.append(",");
+							_jsonAppend(1,responseBody,&(nws->networks[i]),_svc->portDeviceName(nws->networks[i].nwid));
+						}
+						responseBody.append("\n]\n");
+						scode = 200;
+					} else if (ps.size() == 2) {
+						// Return a single network by ID or 404 if not found
+						uint64_t wantnw = Utils::hexStrToU64(ps[1].c_str());
+						for(unsigned long i=0;i<nws->networkCount;++i) {
+							if (nws->networks[i].nwid == wantnw) {
+								responseContentType = "application/json";
+								_jsonAppend(0,responseBody,&(nws->networks[i]),_svc->portDeviceName(nws->networks[i].nwid));
+								responseBody.push_back('\n');
+								scode = 200;
+								break;
+							}
+						}
+					} // else 404
+					_node->freeQueryResult((void *)nws);
+				} else scode = 500;
+			} else if (ps[0] == "peer") {
+				ZT_PeerList *pl = _node->peers();
+				if (pl) {
+					if (ps.size() == 1) {
+						// Return [array] of all peers
+						responseContentType = "application/json";
+						responseBody = "[\n";
+						for(unsigned long i=0;i<pl->peerCount;++i) {
+							if (i > 0)
+								responseBody.append(",\n");
+							_jsonAppend(1,responseBody,&(pl->peers[i]));
+						}
+						responseBody.append("\n]\n");
+						scode = 200;
+					} else if (ps.size() == 2) {
+						// Return a single peer by ID or 404 if not found
+						uint64_t wantp = Utils::hexStrToU64(ps[1].c_str());
+						for(unsigned long i=0;i<pl->peerCount;++i) {
+							if (pl->peers[i].address == wantp) {
+								responseContentType = "application/json";
+								_jsonAppend(0,responseBody,&(pl->peers[i]));
+								responseBody.push_back('\n');
+								scode = 200;
+								break;
+							}
+						}
+					} // else 404
+					_node->freeQueryResult((void *)pl);
+				} else scode = 500;
+			} else if (ps[0] == "newIdentity") {
+				// Return a newly generated ZeroTier identity -- this is primarily for debugging
+				// and testing to make it easy for automated test scripts to generate test IDs.
+				Identity newid;
+				newid.generate();
+				responseBody = newid.toString(true);
+				responseContentType = "text/plain";
+				scode = 200;
+			} else {
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+				if (_controller)
+					scode = _controller->handleControlPlaneHttpGET(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
+				else scode = 404;
+#else
+				scode = 404;
+#endif
+			}
+
+		} else scode = 401; // isAuth == false
+
+	} else if ((httpMethod == HTTP_POST)||(httpMethod == HTTP_PUT)) {
+
+		if (isAuth) {
+
+			if (ps[0] == "config") {
+				// TODO
+			} else if (ps[0] == "network") {
+				if (ps.size() == 2) {
+					uint64_t wantnw = Utils::hexStrToU64(ps[1].c_str());
+					_node->join(wantnw,(void *)0); // does nothing if we are a member
+					ZT_VirtualNetworkList *nws = _node->networks();
+					if (nws) {
+						for(unsigned long i=0;i<nws->networkCount;++i) {
+							if (nws->networks[i].nwid == wantnw) {
+								responseContentType = "application/json";
+								_jsonAppend(0,responseBody,&(nws->networks[i]),_svc->portDeviceName(nws->networks[i].nwid));
+								responseBody.push_back('\n');
+								scode = 200;
+								break;
+							}
+						}
+						_node->freeQueryResult((void *)nws);
+					} else scode = 500;
+				}
+			} else {
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+				if (_controller)
+					scode = _controller->handleControlPlaneHttpPOST(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
+				else scode = 404;
+#else
+				scode = 404;
+#endif
+			}
+
+		} else scode = 401; // isAuth == false
+
+	} else if (httpMethod == HTTP_DELETE) {
+
+		if (isAuth) {
+
+			if (ps[0] == "config") {
+				// TODO
+			} else if (ps[0] == "network") {
+				ZT_VirtualNetworkList *nws = _node->networks();
+				if (nws) {
+					if (ps.size() == 2) {
+						uint64_t wantnw = Utils::hexStrToU64(ps[1].c_str());
+						for(unsigned long i=0;i<nws->networkCount;++i) {
+							if (nws->networks[i].nwid == wantnw) {
+								_node->leave(wantnw,(void **)0);
+								responseBody = "true";
+								responseContentType = "application/json";
+								scode = 200;
+								break;
+							}
+						}
+					} // else 404
+					_node->freeQueryResult((void *)nws);
+				} else scode = 500;
+			} else {
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+				if (_controller)
+					scode = _controller->handleControlPlaneHttpDELETE(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
+				else scode = 404;
+#else
+				scode = 404;
+#endif
+			}
+
+		} else {
+			scode = 401; // isAuth = false
+		}
+
+	} else {
+		scode = 400;
+		responseBody = "Method not supported.";
+	}
+
+	// Wrap result in jsonp function call if the user included a jsonp= url argument.
+	// Also double-check isAuth since forbidding this without auth feels safer.
+	std::map<std::string,std::string>::const_iterator jsonp(urlArgs.find("jsonp"));
+	if ((isAuth)&&(jsonp != urlArgs.end())&&(responseContentType == "application/json")) {
+		if (responseBody.length() > 0)
+			responseBody = jsonp->second + "(" + responseBody + ");";
+		else responseBody = jsonp->second + "(null);";
+		responseContentType = "application/javascript";
+	}
+
+	return scode;
+}
+
+} // namespace ZeroTier
diff --git a/service/ControlPlane.hpp b/service/ControlPlane.hpp
new file mode 100644
index 000000000..08a9d6e08
--- /dev/null
+++ b/service/ControlPlane.hpp
@@ -0,0 +1,102 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZT_ONE_CONTROLPLANE_HPP
+#define ZT_ONE_CONTROLPLANE_HPP
+
+#include <string>
+#include <map>
+#include <set>
+
+#include "../include/ZeroTierOne.h"
+
+#include "../node/Mutex.hpp"
+
+namespace ZeroTier {
+
+class OneService;
+class Node;
+class SqliteNetworkController;
+struct InetAddress;
+
+/**
+ * HTTP control plane and static web server
+ */
+class ControlPlane
+{
+public:
+	ControlPlane(OneService *svc,Node *n,const char *uiStaticPath);
+	~ControlPlane();
+
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+	/**
+	 * Set controller, which will be available under /controller
+	 *
+	 * @param c Network controller instance
+	 */
+	inline void setController(SqliteNetworkController *c)
+	{
+		Mutex::Lock _l(_lock);
+		_controller = c;
+	}
+#endif
+
+	/**
+	 * Add an authentication token for API access
+	 */
+	inline void addAuthToken(const char *tok)
+	{
+		Mutex::Lock _l(_lock);
+		_authTokens.insert(std::string(tok));
+	}
+
+	/**
+	 * Handle HTTP request
+	 *
+	 * @param fromAddress Originating IP address of request
+	 * @param httpMethod HTTP method (as defined in ext/http-parser/http_parser.h)
+	 * @param path Request path
+	 * @param headers Request headers
+	 * @param body Request body
+	 * @param responseBody Result parameter: fill with response data
+	 * @param responseContentType Result parameter: fill with content type
+	 * @return HTTP response code
+	 */
+	unsigned int handleRequest(
+		const InetAddress &fromAddress,
+		unsigned int httpMethod,
+		const std::string &path,
+		const std::map<std::string,std::string> &headers,
+		const std::string &body,
+		std::string &responseBody,
+		std::string &responseContentType);
+
+private:
+	OneService *const _svc;
+	Node *const _node;
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+	SqliteNetworkController *_controller;
+#endif
+	std::string _uiStaticPath;
+	std::set<std::string> _authTokens;
+	Mutex _lock;
+};
+
+} // namespace ZeroTier
+
+#endif
diff --git a/service/OneService.cpp b/service/OneService.cpp
index f2895dda1..6f51430f1 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -1,158 +1,119 @@
 /*
- * Copyright (c)2013-2020 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
-#include <algorithm>
-#include <condition_variable>
-#include <exception>
-#include <list>
-#include <map>
-#include <mutex>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+
 #include <string>
-#include <thread>
+#include <map>
+#include <set>
 #include <vector>
+#include <algorithm>
 
-#ifdef __FreeBSD__
-#include <pthread_np.h>
-#include <sched.h>
-#endif
-
+#include "../version.h"
 #include "../include/ZeroTierOne.h"
-#include "../node/Bond.hpp"
+
+#include "../ext/http-parser/http_parser.h"
+
 #include "../node/Constants.hpp"
-#include "../node/Identity.hpp"
-#include "../node/InetAddress.hpp"
-#include "../node/MAC.hpp"
 #include "../node/Mutex.hpp"
 #include "../node/Node.hpp"
-#include "../node/PacketMultiplexer.hpp"
-#include "../node/Peer.hpp"
-#include "../node/Poly1305.hpp"
-#include "../node/SHA512.hpp"
-#include "../node/Salsa20.hpp"
 #include "../node/Utils.hpp"
-#include "../node/World.hpp"
-#include "../osdep/Binder.hpp"
-#include "../osdep/BlockingQueue.hpp"
-#include "../osdep/ExtOsdep.hpp"
-#include "../osdep/Http.hpp"
-#include "../osdep/ManagedRoute.hpp"
-#include "../osdep/OSUtils.hpp"
+#include "../node/InetAddress.hpp"
+#include "../node/MAC.hpp"
+#include "../node/Identity.hpp"
+
 #include "../osdep/Phy.hpp"
+#include "../osdep/Thread.hpp"
+#include "../osdep/OSUtils.hpp"
+#include "../osdep/Http.hpp"
+#include "../osdep/BackgroundResolver.hpp"
 #include "../osdep/PortMapper.hpp"
-#include "../version.h"
+#include "../osdep/Binder.hpp"
+
 #include "OneService.hpp"
-#include "SoftwareUpdater.hpp"
+#include "ControlPlane.hpp"
+#include "ClusterGeoIpService.hpp"
+#include "ClusterDefinition.hpp"
 
-#include <cpp-httplib/httplib.h>
+/**
+ * Uncomment to enable UDP breakage switch
+ *
+ * If this is defined, the presence of a file called /tmp/ZT_BREAK_UDP
+ * will cause direct UDP TX/RX to stop working. This can be used to
+ * test TCP tunneling fallback and other robustness features. Deleting
+ * this file will cause it to start working again.
+ */
+//#define ZT_BREAK_UDP
 
-#ifdef ZT_OPENTELEMETRY_ENABLED
-#include "opentelemetry/exporters/memory/in_memory_data.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"
-#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-#include "opentelemetry/sdk/metrics/metric_reader.h"
-#include "opentelemetry/sdk/metrics/provider.h"
-#include "opentelemetry/sdk/resource/resource.h"
-#include "opentelemetry/sdk/trace/batch_span_processor.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
-#include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/provider.h"
-#include "opentelemetry/sdk/trace/samplers/trace_id_ratio.h"
-#include "opentelemetry/sdk/trace/tracer.h"
-#include "opentelemetry/sdk/trace/tracer_context.h"
-#include "opentelemetry/sdk/trace/tracer_provider.h"
-#include "opentelemetry/trace/provider.h"
-
-namespace sdktrace = opentelemetry::v1::sdk::trace;
-namespace sdkmetrics = opentelemetry::v1::sdk::metrics;
-namespace sdklogs = opentelemetry::v1::sdk::logs;
-namespace sdkresource = opentelemetry::v1::sdk::resource;
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+#include "../controller/SqliteNetworkController.hpp"
 #else
-#include "opentelemetry/logs/logger.h"
-#include "opentelemetry/metrics/provider.h"
-#include "opentelemetry/trace/provider.h"
-#endif
-
-#if ZT_SSO_ENABLED
-#include <zeroidc.h>
-#endif
+class SqliteNetworkController;
+#endif // ZT_ENABLE_NETWORK_CONTROLLER
 
 #ifdef __WINDOWS__
-#include <iphlpapi.h>
+#include <WinSock2.h>
+#include <Windows.h>
+#include <ShlObj.h>
 #include <netioapi.h>
-#include <shlobj.h>
-#include <windows.h>
-#include <winsock2.h>
-// #include <unistd.h>
-#define stat _stat
+#include <iphlpapi.h>
 #else
-#include <ifaddrs.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <ifaddrs.h>
 #endif
 
+// Include the right tap device driver for this platform -- add new platforms here
+#ifdef ZT_SERVICE_NETCON
+
+// In network containers builds, use the virtual netcon endpoint instead of a tun/tap port driver
+#include "../netcon/NetconEthernetTap.hpp"
+namespace ZeroTier { typedef NetconEthernetTap EthernetTap; }
+
+#else // not ZT_SERVICE_NETCON so pick a tap driver
+
 #ifdef __APPLE__
-#include "../osdep/MacDNSHelper.hpp"
-#elif defined(__WINDOWS__)
-#include "../osdep/WinDNSHelper.hpp"
-#include "../osdep/WinFWHelper.hpp"
-#endif
-
-#ifdef ZT_USE_SYSTEM_HTTP_PARSER
-#include <http_parser.h>
-#else
-#include "../ext/http-parser/http_parser.h"
-#endif
-
-#include "../node/Metrics.hpp"
-
-#if ZT_VAULT_SUPPORT
-extern "C" {
-#include <curl/curl.h>
-}
-#endif
-
-#include <inja/inja.hpp>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-#include "../controller/EmbeddedNetworkController.hpp"
-#include "../controller/PostgreSQL.hpp"
-#include "../controller/Redis.hpp"
-#include "../osdep/EthernetTap.hpp"
+#include "../osdep/OSXEthernetTap.hpp"
+namespace ZeroTier { typedef OSXEthernetTap EthernetTap; }
+#endif // __APPLE__
+#ifdef __LINUX__
+#include "../osdep/LinuxEthernetTap.hpp"
+namespace ZeroTier { typedef LinuxEthernetTap EthernetTap; }
+#endif // __LINUX__
 #ifdef __WINDOWS__
 #include "../osdep/WindowsEthernetTap.hpp"
-#endif
+namespace ZeroTier { typedef WindowsEthernetTap EthernetTap; }
+#endif // __WINDOWS__
+#ifdef __FreeBSD__
+#include "../osdep/BSDEthernetTap.hpp"
+namespace ZeroTier { typedef BSDEthernetTap EthernetTap; }
+#endif // __FreeBSD__
 
-#ifndef ZT_SOFTWARE_UPDATE_DEFAULT
-#define ZT_SOFTWARE_UPDATE_DEFAULT "disable"
-#endif
+#endif // ZT_SERVICE_NETCON
 
 // Sanity limits for HTTP
 #define ZT_MAX_HTTP_MESSAGE_SIZE (1024 * 1024 * 64)
-#define ZT_MAX_HTTP_CONNECTIONS	 65536
+#define ZT_MAX_HTTP_CONNECTIONS 64
 
 // Interface metric for ZeroTier taps -- this ensures that if we are on WiFi and also
 // bridged via ZeroTier to the same LAN traffic will (if the OS is sane) prefer WiFi.
@@ -161,10 +122,12 @@ using json = nlohmann::json;
 // How often to check for new multicast subscriptions on a tap device
 #define ZT_TAP_CHECK_MULTICAST_INTERVAL 5000
 
-// TCP fallback relay (run by ZeroTier, Inc. -- this will eventually go away)
-#ifndef ZT_SDK
-#define ZT_TCP_FALLBACK_RELAY "204.80.128.1/443"
-#endif
+// Path under ZT1 home for controller database if controller is enabled
+#define ZT_CONTROLLER_DB_PATH "controller.db"
+
+// TCP fallback relay host -- geo-distributed using Amazon Route53 geo-aware DNS
+#define ZT_TCP_FALLBACK_RELAY "tcp-fallback.zerotier.com"
+#define ZT_TCP_FALLBACK_RELAY_PORT 443
 
 // Frequency at which we re-resolve the TCP fallback relay
 #define ZT_TCP_FALLBACK_RERESOLVE_DELAY 86400000
@@ -175,732 +138,357 @@ using json = nlohmann::json;
 // How often to check for local interface addresses
 #define ZT_LOCAL_INTERFACE_CHECK_INTERVAL 60000
 
-// Maximum write buffer size for outgoing TCP connections (sanity limit)
-#define ZT_TCP_MAX_WRITEQ_SIZE 33554432
-
-// TCP activity timeout
-#define ZT_TCP_ACTIVITY_TIMEOUT 60000
-
-#if ZT_VAULT_SUPPORT
-size_t curlResponseWrite(void* ptr, size_t size, size_t nmemb, std::string* data)
-{
-	data->append((char*)ptr, size * nmemb);
-	return size * nmemb;
-}
-#endif
-
 namespace ZeroTier {
 
-std::string ssoResponseTemplate = R"""(
-<!doctype html>
-<html class="no-js" lang="">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="x-ua-compatible" content="ie=edge">
-        <title>Network SSO Login {{ networkId }}</title>
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <style type="text/css">
-         html,body {
-             background: #eeeeee;
-             margin: 0;
-             padding: 0;
-             font-family: "System Sans Serif";
-             font-weight: normal;
-             font-size: 12pt;
-             height: 100%;
-             width: 100%;
-         }
-
-         .container {
-             position: absolute;
-             left: 50%;
-             top: 50%;
-             -webkit-transform: translate(-50%, -50%);
-             transform: translate(-50%, -50%);
-         }
-         .iconwrapper {
-             margin: 10px 10px 10px 10px;
-         }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <div class="iconwrapper">
-                <svg id="Layer_1" width="225px" height="225px" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 225 225"><defs><style>.cls-1{fill:#fdb25d;}.cls-2{fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:6.99px;}</style></defs><rect class="cls-1" width="225" height="225" rx="35.74"/><line class="cls-2" x1="25.65" y1="32.64" x2="199.35" y2="32.64"/><line class="cls-2" x1="112.5" y1="201.02" x2="112.5" y2="32.64"/><circle class="cls-2" cx="112.5" cy="115.22" r="56.54"/></svg>
-            </div>
-            <div class="text">{{ messageText }}</div>
-        </div>
-    </body>
-</html>
-)""";
-
-bool bearerTokenValid(const std::string authHeader, const std::string& checkToken)
-{
-	std::vector<std::string> tokens = OSUtils::split(authHeader.c_str(), " ", NULL, NULL);
-	if (tokens.size() != 2) {
-		return false;
-	}
-
-	std::string bearer = tokens[0];
-	std::string token = tokens[1];
-	std::transform(bearer.begin(), bearer.end(), bearer.begin(), [](unsigned char c) { return std::tolower(c); });
-	if (bearer != "bearer") {
-		return false;
-	}
-
-	if (token != checkToken) {
-		return false;
-	}
-
-	return true;
-}
-
-#if ZT_DEBUG == 1
-std::string dump_headers(const httplib::Headers& headers)
-{
-	std::string s;
-	char buf[BUFSIZ];
-
-	for (auto it = headers.begin(); it != headers.end(); ++it) {
-		const auto& x = *it;
-		snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
-		s += buf;
-	}
-
-	return s;
-}
-
-std::string http_log(const httplib::Request& req, const httplib::Response& res)
-{
-	std::string s;
-	char buf[BUFSIZ];
-
-	s += "================================\n";
-
-	snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(), req.version.c_str(), req.path.c_str());
-	s += buf;
-
-	std::string query;
-	for (auto it = req.params.begin(); it != req.params.end(); ++it) {
-		const auto& x = *it;
-		snprintf(buf, sizeof(buf), "%c%s=%s", (it == req.params.begin()) ? '?' : '&', x.first.c_str(), x.second.c_str());
-		query += buf;
-	}
-	snprintf(buf, sizeof(buf), "%s\n", query.c_str());
-	s += buf;
-
-	s += dump_headers(req.headers);
-
-	s += "--------------------------------\n";
-
-	snprintf(buf, sizeof(buf), "%d %s\n", res.status, res.version.c_str());
-	s += buf;
-	s += dump_headers(res.headers);
-	s += "\n";
-
-	if (! res.body.empty()) {
-		s += res.body;
-	}
-
-	s += "\n";
-
-	return s;
-}
-#endif
-
-// Configured networks
-class NetworkState {
-  public:
-	NetworkState()
-		: _webPort(9993)
-		, _tap((EthernetTap*)0)
-#if ZT_SSO_ENABLED
-		, _idc(nullptr)
-#endif
-	{
-		// Real defaults are in network 'up' code in network event handler
-		_settings.allowManaged = true;
-		_settings.allowGlobal = false;
-		_settings.allowDefault = false;
-		_settings.allowDNS = false;
-		memset(&_config, 0, sizeof(ZT_VirtualNetworkConfig));
-	}
-
-	~NetworkState()
-	{
-		this->_managedRoutes.clear();
-		this->_tap.reset();
-
-#if ZT_SSO_ENABLED
-		if (_idc) {
-			zeroidc::zeroidc_stop(_idc);
-			zeroidc::zeroidc_delete(_idc);
-			_idc = nullptr;
-		}
-#endif
-	}
-
-	void setWebPort(unsigned int port)
-	{
-		_webPort = port;
-	}
-
-	void setTap(std::shared_ptr<EthernetTap> tap)
-	{
-		this->_tap = tap;
-	}
-
-	std::shared_ptr<EthernetTap> tap() const
-	{
-		return _tap;
-	}
-
-	OneService::NetworkSettings settings() const
-	{
-		return _settings;
-	}
-
-	void setSettings(const OneService::NetworkSettings& settings)
-	{
-		_settings = settings;
-	}
-
-	void setAllowManaged(bool allow)
-	{
-		_settings.allowManaged = allow;
-	}
-
-	bool allowManaged() const
-	{
-		return _settings.allowManaged;
-	}
-
-	void setAllowGlobal(bool allow)
-	{
-		_settings.allowGlobal = allow;
-	}
-
-	bool allowGlobal() const
-	{
-		return _settings.allowGlobal;
-	}
-
-	void setAllowDefault(bool allow)
-	{
-		_settings.allowDefault = allow;
-	}
-
-	bool allowDefault() const
-	{
-		return _settings.allowDefault;
-	}
-
-	void setAllowDNS(bool allow)
-	{
-		_settings.allowDNS = allow;
-	}
-
-	bool allowDNS() const
-	{
-		return _settings.allowDNS;
-	}
-
-	std::vector<InetAddress> allowManagedWhitelist() const
-	{
-		return _settings.allowManagedWhitelist;
-	}
-
-	void addToAllowManagedWhiteList(const InetAddress& addr)
-	{
-		_settings.allowManagedWhitelist.push_back(addr);
-	}
-
-	const ZT_VirtualNetworkConfig& config()
-	{
-		return _config;
-	}
-
-	void setConfig(const ZT_VirtualNetworkConfig* nwc)
-	{
-		memcpy(&_config, nwc, sizeof(ZT_VirtualNetworkConfig));
-
-		if (_config.ssoEnabled && _config.ssoVersion == 1) {
-#if ZT_SSO_ENABLED
-			if (_idc == nullptr) {
-				assert(_config.issuerURL != nullptr);
-				assert(_config.ssoClientID != nullptr);
-				assert(_config.centralAuthURL != nullptr);
-				assert(_config.ssoProvider != nullptr);
-
-				_idc = zeroidc::zeroidc_new(_config.issuerURL, _config.ssoClientID, _config.centralAuthURL, _config.ssoProvider, _webPort);
-
-				if (_idc == nullptr) {
-					fprintf(stderr, "idc is null\n");
-					return;
-				}
-			}
-
-			zeroidc::zeroidc_set_nonce_and_csrf(_idc, _config.ssoState, _config.ssoNonce);
-
-			char* url = zeroidc::zeroidc_get_auth_url(_idc);
-			memcpy(_config.authenticationURL, url, strlen(url));
-			_config.authenticationURL[strlen(url)] = 0;
-			zeroidc::free_cstr(url);
-
-			if (zeroidc::zeroidc_is_running(_idc) && nwc->status == ZT_NETWORK_STATUS_AUTHENTICATION_REQUIRED) {
-				zeroidc::zeroidc_kick_refresh_thread(_idc);
-			}
-#endif
-		}
-	}
-
-	std::vector<InetAddress>& managedIps()
-	{
-		return _managedIps;
-	}
-
-	void setManagedIps(const std::vector<InetAddress>& managedIps)
-	{
-		_managedIps = managedIps;
-	}
-
-	std::map<InetAddress, SharedPtr<ManagedRoute> >& managedRoutes()
-	{
-		return _managedRoutes;
-	}
-
-	char* doTokenExchange(const char* code)
-	{
-		char* ret = nullptr;
-#if ZT_SSO_ENABLED
-		if (_idc == nullptr) {
-			fprintf(stderr, "ainfo or idc null\n");
-			return ret;
-		}
-
-		ret = zeroidc::zeroidc_token_exchange(_idc, code);
-		zeroidc::zeroidc_set_nonce_and_csrf(_idc, _config.ssoState, _config.ssoNonce);
-
-		char* url = zeroidc::zeroidc_get_auth_url(_idc);
-		memcpy(_config.authenticationURL, url, strlen(url));
-		_config.authenticationURL[strlen(url)] = 0;
-		zeroidc::free_cstr(url);
-#endif
-		return ret;
-	}
-
-	uint64_t getExpiryTime()
-	{
-#if ZT_SSO_ENABLED
-		if (_idc == nullptr) {
-			fprintf(stderr, "idc is null\n");
-			return 0;
-		}
-		return zeroidc::zeroidc_get_exp_time(_idc);
-#else
-		return 0;
-#endif
-	}
-
-  private:
-	unsigned int _webPort;
-	std::shared_ptr<EthernetTap> _tap;
-	ZT_VirtualNetworkConfig _config;   // memcpy() of raw config from core
-	std::vector<InetAddress> _managedIps;
-	std::map<InetAddress, SharedPtr<ManagedRoute> > _managedRoutes;
-	OneService::NetworkSettings _settings;
-#if ZT_SSO_ENABLED
-	zeroidc::ZeroIDC* _idc;
-#endif
-};
-
 namespace {
 
-static const InetAddress NULL_INET_ADDR;
+#ifdef ZT_AUTO_UPDATE
+#define ZT_AUTO_UPDATE_MAX_HTTP_RESPONSE_SIZE (1024 * 1024 * 64)
+#define ZT_AUTO_UPDATE_CHECK_PERIOD 21600000
+class BackgroundSoftwareUpdateChecker
+{
+public:
+	bool isValidSigningIdentity(const Identity &id)
+	{
+		return (
+			/* 0001 - 0004 : obsolete, used in old versions */
+		  /* 0005 */   (id == Identity("ba57ea350e:0:9d4be6d7f86c5660d5ee1951a3d759aa6e12a84fc0c0b74639500f1dbc1a8c566622e7d1c531967ebceb1e9d1761342f88324a8ba520c93c35f92f35080fa23f"))
+		  /* 0006 */ ||(id == Identity("5067b21b83:0:8af477730f5055c48135b84bed6720a35bca4c0e34be4060a4c636288b1ec22217eb22709d610c66ed464c643130c51411bbb0294eef12fbe8ecc1a1e2c63a7a"))
+		  /* 0007 */ ||(id == Identity("4f5e97a8f1:0:57880d056d7baeb04bbc057d6f16e6cb41388570e87f01492fce882485f65a798648595610a3ad49885604e7fb1db2dd3c2c534b75e42c3c0b110ad07b4bb138"))
+		  /* 0008 */ ||(id == Identity("580bbb8e15:0:ad5ef31155bebc6bc413991992387e083fed26d699997ef76e7c947781edd47d1997161fa56ba337b1a2b44b129fd7c7197ce5185382f06011bc88d1363b4ddd"))
+		);
+	}
 
-// Fake TLS hello for TCP tunnel outgoing connections (TUNNELED mode)
-static const char ZT_TCP_TUNNEL_HELLO[9] = {
-	0x17, 0x03, 0x03, 0x00, 0x04, (char)ZEROTIER_ONE_VERSION_MAJOR, (char)ZEROTIER_ONE_VERSION_MINOR, (char)((ZEROTIER_ONE_VERSION_REVISION >> 8) & 0xff), (char)(ZEROTIER_ONE_VERSION_REVISION & 0xff)
+	void doUpdateCheck()
+	{
+		std::string url(OneService::autoUpdateUrl());
+		if ((url.length() <= 7)||(url.substr(0,7) != "http://"))
+			return;
+
+		std::string httpHost;
+		std::string httpPath;
+		{
+			std::size_t slashIdx = url.substr(7).find_first_of('/');
+			if (slashIdx == std::string::npos) {
+				httpHost = url.substr(7);
+				httpPath = "/";
+			} else {
+				httpHost = url.substr(7,slashIdx);
+				httpPath = url.substr(slashIdx + 7);
+			}
+		}
+		if (httpHost.length() == 0)
+			return;
+
+		std::vector<InetAddress> ips(OSUtils::resolve(httpHost.c_str()));
+		for(std::vector<InetAddress>::iterator ip(ips.begin());ip!=ips.end();++ip) {
+			if (!ip->port())
+				ip->setPort(80);
+			std::string nfoPath = httpPath + "LATEST.nfo";
+			std::map<std::string,std::string> requestHeaders,responseHeaders;
+			std::string body;
+			requestHeaders["Host"] = httpHost;
+			unsigned int scode = Http::GET(ZT_AUTO_UPDATE_MAX_HTTP_RESPONSE_SIZE,60000,reinterpret_cast<const struct sockaddr *>(&(*ip)),nfoPath.c_str(),requestHeaders,responseHeaders,body);
+			//fprintf(stderr,"UPDATE %s %s %u %lu\n",ip->toString().c_str(),nfoPath.c_str(),scode,body.length());
+			if ((scode == 200)&&(body.length() > 0)) {
+				/* NFO fields:
+				 *
+				 * file=<filename>
+				 * signedBy=<signing identity>
+				 * ed25519=<ed25519 ECC signature of archive>
+				 * vMajor=<major version>
+				 * vMinor=<minor version>
+				 * vRevision=<revision> */
+				Dictionary nfo(body);
+
+				unsigned int vMajor = Utils::strToUInt(nfo.get("vMajor","0").c_str());
+				unsigned int vMinor = Utils::strToUInt(nfo.get("vMinor","0").c_str());
+				unsigned int vRevision = Utils::strToUInt(nfo.get("vRevision","0").c_str());
+				if (Utils::compareVersion(vMajor,vMinor,vRevision,ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION) <= 0) {
+					//fprintf(stderr,"UPDATE %u.%u.%u is not newer than our version\n",vMajor,vMinor,vRevision);
+					return;
+				}
+
+				Identity signedBy;
+				if ((!signedBy.fromString(nfo.get("signedBy","")))||(!isValidSigningIdentity(signedBy))) {
+					//fprintf(stderr,"UPDATE invalid signedBy or not authorized signing identity.\n");
+					return;
+				}
+
+				std::string filePath(nfo.get("file",""));
+				if ((!filePath.length())||(filePath.find("..") != std::string::npos))
+					return;
+				filePath = httpPath + filePath;
+
+				std::string fileData;
+				if (Http::GET(ZT_AUTO_UPDATE_MAX_HTTP_RESPONSE_SIZE,60000,reinterpret_cast<const struct sockaddr *>(&(*ip)),filePath.c_str(),requestHeaders,responseHeaders,fileData) != 200) {
+					//fprintf(stderr,"UPDATE GET %s failed\n",filePath.c_str());
+					return;
+				}
+
+				std::string ed25519(Utils::unhex(nfo.get("ed25519","")));
+				if ((ed25519.length() == 0)||(!signedBy.verify(fileData.data(),(unsigned int)fileData.length(),ed25519.data(),(unsigned int)ed25519.length()))) {
+					//fprintf(stderr,"UPDATE %s failed signature check!\n",filePath.c_str());
+					return;
+				}
+
+				/* --------------------------------------------------------------- */
+				/* We made it! Begin OS-specific installation code. */
+
+#ifdef __APPLE__
+				/* OSX version is in the form of a MacOSX .pkg file, so we will
+				 * launch installer (normally in /usr/sbin) to install it. It will
+				 * then turn around and shut down the service, update files, and
+				 * relaunch. */
+				{
+					char bashp[128],pkgp[128];
+					Utils::snprintf(bashp,sizeof(bashp),"/tmp/ZeroTierOne-update-%u.%u.%u.sh",vMajor,vMinor,vRevision);
+					Utils::snprintf(pkgp,sizeof(pkgp),"/tmp/ZeroTierOne-update-%u.%u.%u.pkg",vMajor,vMinor,vRevision);
+					FILE *pkg = fopen(pkgp,"w");
+					if ((!pkg)||(fwrite(fileData.data(),fileData.length(),1,pkg) != 1)) {
+						fclose(pkg);
+						unlink(bashp);
+						unlink(pkgp);
+						fprintf(stderr,"UPDATE error writing %s\n",pkgp);
+						return;
+					}
+					fclose(pkg);
+					FILE *bash = fopen(bashp,"w");
+					if (!bash) {
+						fclose(pkg);
+						unlink(bashp);
+						unlink(pkgp);
+						fprintf(stderr,"UPDATE error writing %s\n",bashp);
+						return;
+					}
+					fprintf(bash,
+						"#!/bin/bash\n"
+						"export PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin\n"
+						"sleep 1\n"
+						"installer -pkg \"%s\" -target /\n"
+						"sleep 1\n"
+						"rm -f \"%s\" \"%s\"\n"
+						"exit 0\n",
+						pkgp,
+						pkgp,
+						bashp);
+					fclose(bash);
+					long pid = (long)vfork();
+					if (pid == 0) {
+						setsid(); // detach from parent so that shell isn't killed when parent is killed
+						signal(SIGHUP,SIG_IGN);
+						signal(SIGTERM,SIG_IGN);
+						signal(SIGQUIT,SIG_IGN);
+						execl("/bin/bash","/bin/bash",bashp,(char *)0);
+						exit(0);
+					}
+				}
+#endif // __APPLE__
+
+#ifdef __WINDOWS__
+				/* Windows version comes in the form of .MSI package that
+				 * takes care of everything. */
+				{
+					char tempp[512],batp[512],msip[512],cmdline[512];
+					if (GetTempPathA(sizeof(tempp),tempp) <= 0)
+						return;
+					CreateDirectoryA(tempp,(LPSECURITY_ATTRIBUTES)0);
+					Utils::snprintf(batp,sizeof(batp),"%s\\ZeroTierOne-update-%u.%u.%u.bat",tempp,vMajor,vMinor,vRevision);
+					Utils::snprintf(msip,sizeof(msip),"%s\\ZeroTierOne-update-%u.%u.%u.msi",tempp,vMajor,vMinor,vRevision);
+					FILE *msi = fopen(msip,"wb");
+					if ((!msi)||(fwrite(fileData.data(),(size_t)fileData.length(),1,msi) != 1)) {
+						fclose(msi);
+						return;
+					}
+					fclose(msi);
+					FILE *bat = fopen(batp,"wb");
+					if (!bat)
+						return;
+					fprintf(bat,
+						"TIMEOUT.EXE /T 1 /NOBREAK\r\n"
+						"NET.EXE STOP \"ZeroTierOneService\"\r\n"
+						"TIMEOUT.EXE /T 1 /NOBREAK\r\n"
+						"MSIEXEC.EXE /i \"%s\" /qn\r\n"
+						"TIMEOUT.EXE /T 1 /NOBREAK\r\n"
+						"NET.EXE START \"ZeroTierOneService\"\r\n"
+						"DEL \"%s\"\r\n"
+						"DEL \"%s\"\r\n",
+						msip,
+						msip,
+						batp);
+					fclose(bat);
+					STARTUPINFOA si;
+					PROCESS_INFORMATION pi;
+					memset(&si,0,sizeof(si));
+					memset(&pi,0,sizeof(pi));
+					Utils::snprintf(cmdline,sizeof(cmdline),"CMD.EXE /c \"%s\"",batp);
+					CreateProcessA(NULL,cmdline,NULL,NULL,FALSE,CREATE_NO_WINDOW|CREATE_NEW_PROCESS_GROUP,NULL,NULL,&si,&pi);
+				}
+#endif // __WINDOWS__
+
+				/* --------------------------------------------------------------- */
+
+				return;
+			} // else try to fetch from next IP address
+		}
+	}
+
+	void threadMain()
+		throw()
+	{
+		try {
+			this->doUpdateCheck();
+		} catch ( ... ) {}
+	}
 };
+static BackgroundSoftwareUpdateChecker backgroundSoftwareUpdateChecker;
+#endif // ZT_AUTO_UPDATE
 
-static std::string _trimString(const std::string& s)
+static bool isBlacklistedLocalInterfaceForZeroTierTraffic(const char *ifn)
+{
+#if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux)
+	if ((ifn[0] == 'l')&&(ifn[1] == 'o')) return true; // loopback
+	if ((ifn[0] == 'z')&&(ifn[1] == 't')) return true; // sanity check: zt#
+	if ((ifn[0] == 't')&&(ifn[1] == 'u')&&(ifn[2] == 'n')) return true; // tun# is probably an OpenVPN tunnel or similar
+	if ((ifn[0] == 't')&&(ifn[1] == 'a')&&(ifn[2] == 'p')) return true; // tap# is probably an OpenVPN tunnel or similar
+#endif
+
+#ifdef __APPLE__
+	if ((ifn[0] == 'l')&&(ifn[1] == 'o')) return true; // loopback
+	if ((ifn[0] == 'z')&&(ifn[1] == 't')) return true; // sanity check: zt#
+	if ((ifn[0] == 't')&&(ifn[1] == 'u')&&(ifn[2] == 'n')) return true; // tun# is probably an OpenVPN tunnel or similar
+	if ((ifn[0] == 't')&&(ifn[1] == 'a')&&(ifn[2] == 'p')) return true; // tap# is probably an OpenVPN tunnel or similar
+	if ((ifn[0] == 'u')&&(ifn[1] == 't')&&(ifn[2] == 'u')&&(ifn[3] == 'n')) return true; // ... as is utun#
+#endif
+
+	return false;
+}
+
+static std::string _trimString(const std::string &s)
 {
 	unsigned long end = (unsigned long)s.length();
 	while (end) {
 		char c = s[end - 1];
-		if ((c == ' ') || (c == '\r') || (c == '\n') || (! c) || (c == '\t'))
+		if ((c == ' ')||(c == '\r')||(c == '\n')||(!c)||(c == '\t'))
 			--end;
-		else
-			break;
+		else break;
 	}
 	unsigned long start = 0;
 	while (start < end) {
 		char c = s[start];
-		if ((c == ' ') || (c == '\r') || (c == '\n') || (! c) || (c == '\t'))
+		if ((c == ' ')||(c == '\r')||(c == '\n')||(!c)||(c == '\t'))
 			++start;
-		else
-			break;
+		else break;
 	}
-	return s.substr(start, end - start);
-}
-
-static void _networkToJson(nlohmann::json& nj, NetworkState& ns)
-{
-	char tmp[256];
-
-	const char *nstatus = "", *ntype = "";
-	switch (ns.config().status) {
-		case ZT_NETWORK_STATUS_REQUESTING_CONFIGURATION:
-			nstatus = "REQUESTING_CONFIGURATION";
-			break;
-		case ZT_NETWORK_STATUS_OK:
-			nstatus = "OK";
-			break;
-		case ZT_NETWORK_STATUS_ACCESS_DENIED:
-			nstatus = "ACCESS_DENIED";
-			break;
-		case ZT_NETWORK_STATUS_NOT_FOUND:
-			nstatus = "NOT_FOUND";
-			break;
-		case ZT_NETWORK_STATUS_PORT_ERROR:
-			nstatus = "PORT_ERROR";
-			break;
-		case ZT_NETWORK_STATUS_CLIENT_TOO_OLD:
-			nstatus = "CLIENT_TOO_OLD";
-			break;
-		case ZT_NETWORK_STATUS_AUTHENTICATION_REQUIRED:
-			nstatus = "AUTHENTICATION_REQUIRED";
-			break;
-	}
-	switch (ns.config().type) {
-		case ZT_NETWORK_TYPE_PRIVATE:
-			ntype = "PRIVATE";
-			break;
-		case ZT_NETWORK_TYPE_PUBLIC:
-			ntype = "PUBLIC";
-			break;
-	}
-
-	OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.16llx", ns.config().nwid);
-	nj["id"] = tmp;
-	nj["nwid"] = tmp;
-	OSUtils::ztsnprintf(
-		tmp,
-		sizeof(tmp),
-		"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
-		(unsigned int)((ns.config().mac >> 40) & 0xff),
-		(unsigned int)((ns.config().mac >> 32) & 0xff),
-		(unsigned int)((ns.config().mac >> 24) & 0xff),
-		(unsigned int)((ns.config().mac >> 16) & 0xff),
-		(unsigned int)((ns.config().mac >> 8) & 0xff),
-		(unsigned int)(ns.config().mac & 0xff));
-	nj["mac"] = tmp;
-	nj["name"] = ns.config().name;
-	nj["status"] = nstatus;
-	nj["type"] = ntype;
-	nj["mtu"] = ns.config().mtu;
-	nj["dhcp"] = (bool)(ns.config().dhcp != 0);
-	nj["bridge"] = (bool)(ns.config().bridge != 0);
-	nj["broadcastEnabled"] = (bool)(ns.config().broadcastEnabled != 0);
-	nj["portError"] = ns.config().portError;
-	nj["netconfRevision"] = ns.config().netconfRevision;
-	nj["portDeviceName"] = ns.tap()->deviceName();
-
-	OneService::NetworkSettings localSettings = ns.settings();
-
-	nj["allowManaged"] = localSettings.allowManaged;
-	nj["allowGlobal"] = localSettings.allowGlobal;
-	nj["allowDefault"] = localSettings.allowDefault;
-	nj["allowDNS"] = localSettings.allowDNS;
-
-	nlohmann::json aa = nlohmann::json::array();
-	for (unsigned int i = 0; i < ns.config().assignedAddressCount; ++i) {
-		aa.push_back(reinterpret_cast<const InetAddress*>(&(ns.config().assignedAddresses[i]))->toString(tmp));
-	}
-	nj["assignedAddresses"] = aa;
-
-	nlohmann::json ra = nlohmann::json::array();
-	for (unsigned int i = 0; i < ns.config().routeCount; ++i) {
-		nlohmann::json rj;
-		rj["target"] = reinterpret_cast<const InetAddress*>(&(ns.config().routes[i].target))->toString(tmp);
-		if (ns.config().routes[i].via.ss_family == ns.config().routes[i].target.ss_family)
-			rj["via"] = reinterpret_cast<const InetAddress*>(&(ns.config().routes[i].via))->toIpString(tmp);
-		else
-			rj["via"] = nlohmann::json();
-		rj["flags"] = (int)ns.config().routes[i].flags;
-		rj["metric"] = (int)ns.config().routes[i].metric;
-		ra.push_back(rj);
-	}
-	nj["routes"] = ra;
-
-	nlohmann::json mca = nlohmann::json::array();
-	for (unsigned int i = 0; i < ns.config().multicastSubscriptionCount; ++i) {
-		nlohmann::json m;
-		m["mac"] = MAC(ns.config().multicastSubscriptions[i].mac).toString(tmp);
-		m["adi"] = ns.config().multicastSubscriptions[i].adi;
-		mca.push_back(m);
-	}
-	nj["multicastSubscriptions"] = mca;
-
-	nlohmann::json m;
-	m["domain"] = ns.config().dns.domain;
-	m["servers"] = nlohmann::json::array();
-	for (int j = 0; j < ZT_MAX_DNS_SERVERS; ++j) {
-		InetAddress a(ns.config().dns.server_addr[j]);
-		if (a.isV4() || a.isV6()) {
-			char buf[256];
-			m["servers"].push_back(a.toIpString(buf));
-		}
-	}
-	nj["dns"] = m;
-	if (ns.config().ssoEnabled) {
-		const char* authURL = ns.config().authenticationURL;
-		// fprintf(stderr, "Auth URL: %s\n", authURL);
-		nj["authenticationURL"] = authURL;
-		nj["authenticationExpiryTime"] = (ns.getExpiryTime() * 1000);
-		nj["ssoEnabled"] = ns.config().ssoEnabled;
-	}
-}
-
-static void _peerToJson(nlohmann::json& pj, const ZT_Peer* peer, SharedPtr<Bond>& bond, bool isTunneled)
-{
-	char tmp[256];
-
-	const char* prole = "";
-	switch (peer->role) {
-		case ZT_PEER_ROLE_LEAF:
-			prole = "LEAF";
-			break;
-		case ZT_PEER_ROLE_MOON:
-			prole = "MOON";
-			break;
-		case ZT_PEER_ROLE_PLANET:
-			prole = "PLANET";
-			break;
-	}
-
-	OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.10llx", peer->address);
-	pj["address"] = tmp;
-	pj["versionMajor"] = peer->versionMajor;
-	pj["versionMinor"] = peer->versionMinor;
-	pj["versionRev"] = peer->versionRev;
-	OSUtils::ztsnprintf(tmp, sizeof(tmp), "%d.%d.%d", peer->versionMajor, peer->versionMinor, peer->versionRev);
-	pj["version"] = tmp;
-	pj["latency"] = peer->latency;
-	pj["role"] = prole;
-	pj["isBonded"] = peer->isBonded;
-	pj["tunneled"] = isTunneled;
-	if (bond && peer->isBonded) {
-		pj["bondingPolicyCode"] = peer->bondingPolicy;
-		pj["bondingPolicyStr"] = Bond::getPolicyStrByCode(peer->bondingPolicy);
-		pj["numAliveLinks"] = peer->numAliveLinks;
-		pj["numTotalLinks"] = peer->numTotalLinks;
-		pj["failoverInterval"] = bond->getFailoverInterval();
-		pj["downDelay"] = bond->getDownDelay();
-		pj["upDelay"] = bond->getUpDelay();
-		pj["packetsPerLink"] = bond->getPacketsPerLink();
-	}
-
-	nlohmann::json pa = nlohmann::json::array();
-	for (unsigned int i = 0; i < peer->pathCount; ++i) {
-		int64_t lastSend = peer->paths[i].lastSend;
-		int64_t lastReceive = peer->paths[i].lastReceive;
-		nlohmann::json j;
-		j["address"] = reinterpret_cast<const InetAddress*>(&(peer->paths[i].address))->toString(tmp);
-		j["lastSend"] = (lastSend < 0) ? 0 : lastSend;
-		j["lastReceive"] = (lastReceive < 0) ? 0 : lastReceive;
-		j["trustedPathId"] = peer->paths[i].trustedPathId;
-		j["active"] = (bool)(peer->paths[i].expired == 0);
-		j["expired"] = (bool)(peer->paths[i].expired != 0);
-		j["preferred"] = (bool)(peer->paths[i].preferred != 0);
-		j["localSocket"] = peer->paths[i].localSocket;
-		j["localPort"] = peer->paths[i].localPort;
-		if (bond && peer->isBonded) {
-			uint64_t now = OSUtils::now();
-			j["ifname"] = std::string(peer->paths[i].ifname);
-			j["latencyMean"] = peer->paths[i].latencyMean;
-			j["latencyVariance"] = peer->paths[i].latencyVariance;
-			j["packetLossRatio"] = peer->paths[i].packetLossRatio;
-			j["packetErrorRatio"] = peer->paths[i].packetErrorRatio;
-			j["assignedFlowCount"] = peer->paths[i].assignedFlowCount;
-			j["lastInAge"] = (now - lastReceive);
-			j["lastOutAge"] = (now - lastSend);
-			j["bonded"] = peer->paths[i].bonded;
-			j["eligible"] = peer->paths[i].eligible;
-			j["givenLinkSpeed"] = peer->paths[i].linkSpeed;
-			j["relativeQuality"] = peer->paths[i].relativeQuality;
-		}
-		pa.push_back(j);
-	}
-	pj["paths"] = pa;
-}
-
-static void _moonToJson(nlohmann::json& mj, const World& world)
-{
-	char tmp[4096];
-	OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.16llx", world.id());
-	mj["id"] = tmp;
-	mj["timestamp"] = world.timestamp();
-	mj["signature"] = Utils::hex(world.signature().data, ZT_ECC_SIGNATURE_LEN, tmp);
-	mj["updatesMustBeSignedBy"] = Utils::hex(world.updatesMustBeSignedBy().data, ZT_ECC_PUBLIC_KEY_SET_LEN, tmp);
-	nlohmann::json ra = nlohmann::json::array();
-	for (std::vector<World::Root>::const_iterator r(world.roots().begin()); r != world.roots().end(); ++r) {
-		nlohmann::json rj;
-		rj["identity"] = r->identity.toString(false, tmp);
-		nlohmann::json eps = nlohmann::json::array();
-		for (std::vector<InetAddress>::const_iterator a(r->stableEndpoints.begin()); a != r->stableEndpoints.end(); ++a)
-			eps.push_back(a->toString(tmp));
-		rj["stableEndpoints"] = eps;
-		ra.push_back(rj);
-	}
-	mj["roots"] = ra;
-	mj["waiting"] = false;
+	return s.substr(start,end - start);
 }
 
 class OneServiceImpl;
 
-static int SnodeVirtualNetworkConfigFunction(ZT_Node* node, void* uptr, void* tptr, uint64_t nwid, void** nuptr, enum ZT_VirtualNetworkConfigOperation op, const ZT_VirtualNetworkConfig* nwconf);
-static void SnodeEventCallback(ZT_Node* node, void* uptr, void* tptr, enum ZT_Event event, const void* metaData);
-static void SnodeStatePutFunction(ZT_Node* node, void* uptr, void* tptr, enum ZT_StateObjectType type, const uint64_t id[2], const void* data, int len);
-static int SnodeStateGetFunction(ZT_Node* node, void* uptr, void* tptr, enum ZT_StateObjectType type, const uint64_t id[2], void* data, unsigned int maxlen);
-static int SnodeWirePacketSendFunction(ZT_Node* node, void* uptr, void* tptr, int64_t localSocket, const struct sockaddr_storage* addr, const void* data, unsigned int len, unsigned int ttl);
-static void SnodeVirtualNetworkFrameFunction(ZT_Node* node, void* uptr, void* tptr, uint64_t nwid, void** nuptr, uint64_t sourceMac, uint64_t destMac, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len);
-static int SnodePathCheckFunction(ZT_Node* node, void* uptr, void* tptr, uint64_t ztaddr, int64_t localSocket, const struct sockaddr_storage* remoteAddr);
-static int SnodePathLookupFunction(ZT_Node* node, void* uptr, void* tptr, uint64_t ztaddr, int family, struct sockaddr_storage* result);
-static void StapFrameHandler(void* uptr, void* tptr, uint64_t nwid, const MAC& from, const MAC& to, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len);
+static int SnodeVirtualNetworkConfigFunction(ZT_Node *node,void *uptr,uint64_t nwid,void **nuptr,enum ZT_VirtualNetworkConfigOperation op,const ZT_VirtualNetworkConfig *nwconf);
+static void SnodeEventCallback(ZT_Node *node,void *uptr,enum ZT_Event event,const void *metaData);
+static long SnodeDataStoreGetFunction(ZT_Node *node,void *uptr,const char *name,void *buf,unsigned long bufSize,unsigned long readIndex,unsigned long *totalSize);
+static int SnodeDataStorePutFunction(ZT_Node *node,void *uptr,const char *name,const void *data,unsigned long len,int secure);
+static int SnodeWirePacketSendFunction(ZT_Node *node,void *uptr,const struct sockaddr_storage *localAddr,const struct sockaddr_storage *addr,const void *data,unsigned int len,unsigned int ttl);
+static void SnodeVirtualNetworkFrameFunction(ZT_Node *node,void *uptr,uint64_t nwid,void **nuptr,uint64_t sourceMac,uint64_t destMac,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len);
+static int SnodePathCheckFunction(ZT_Node *node,void *uptr,const struct sockaddr_storage *localAddr,const struct sockaddr_storage *remoteAddr);
 
-static int ShttpOnMessageBegin(http_parser* parser);
-static int ShttpOnUrl(http_parser* parser, const char* ptr, size_t length);
-#if (HTTP_PARSER_VERSION_MAJOR >= 2) && (HTTP_PARSER_VERSION_MINOR >= 2)
-static int ShttpOnStatus(http_parser* parser, const char* ptr, size_t length);
-#else
-static int ShttpOnStatus(http_parser* parser);
-#endif
-static int ShttpOnHeaderField(http_parser* parser, const char* ptr, size_t length);
-static int ShttpOnValue(http_parser* parser, const char* ptr, size_t length);
-static int ShttpOnHeadersComplete(http_parser* parser);
-static int ShttpOnBody(http_parser* parser, const char* ptr, size_t length);
-static int ShttpOnMessageComplete(http_parser* parser);
-
-#if (HTTP_PARSER_VERSION_MAJOR >= 2) && (HTTP_PARSER_VERSION_MINOR >= 1)
-static const struct http_parser_settings HTTP_PARSER_SETTINGS = { ShttpOnMessageBegin, ShttpOnUrl, ShttpOnStatus, ShttpOnHeaderField, ShttpOnValue, ShttpOnHeadersComplete, ShttpOnBody, ShttpOnMessageComplete };
-#else
-static const struct http_parser_settings HTTP_PARSER_SETTINGS = { ShttpOnMessageBegin, ShttpOnUrl, ShttpOnHeaderField, ShttpOnValue, ShttpOnHeadersComplete, ShttpOnBody, ShttpOnMessageComplete };
+#ifdef ZT_ENABLE_CLUSTER
+static void SclusterSendFunction(void *uptr,unsigned int toMemberId,const void *data,unsigned int len);
+static int SclusterGeoIpFunction(void *uptr,const struct sockaddr_storage *addr,int *x,int *y,int *z);
 #endif
 
-/**
- * A TCP connection and related state and buffers
- */
-struct TcpConnection {
+static void StapFrameHandler(void *uptr,uint64_t nwid,const MAC &from,const MAC &to,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len);
+
+static int ShttpOnMessageBegin(http_parser *parser);
+static int ShttpOnUrl(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnStatus(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnHeaderField(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnValue(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnHeadersComplete(http_parser *parser);
+static int ShttpOnBody(http_parser *parser,const char *ptr,size_t length);
+static int ShttpOnMessageComplete(http_parser *parser);
+static const struct http_parser_settings HTTP_PARSER_SETTINGS = {
+	ShttpOnMessageBegin,
+	ShttpOnUrl,
+	ShttpOnStatus,
+	ShttpOnHeaderField,
+	ShttpOnValue,
+	ShttpOnHeadersComplete,
+	ShttpOnBody,
+	ShttpOnMessageComplete
+};
+
+struct TcpConnection
+{
 	enum {
-		TCP_UNCATEGORIZED_INCOMING,	  // uncategorized incoming connection
 		TCP_HTTP_INCOMING,
-		TCP_HTTP_OUTGOING,
-		TCP_TUNNEL_OUTGOING	  // TUNNELED mode proxy outbound connection
+		TCP_HTTP_OUTGOING, // not currently used
+		TCP_TUNNEL_OUTGOING // fale-SSL outgoing tunnel -- HTTP-related fields are not used
 	} type;
 
-	OneServiceImpl* parent;
-	PhySocket* sock;
-	InetAddress remoteAddr;
-	uint64_t lastReceive;
-
-	// Used for inbound HTTP connections
+	bool shouldKeepAlive;
+	OneServiceImpl *parent;
+	PhySocket *sock;
+	InetAddress from;
 	http_parser parser;
 	unsigned long messageSize;
+	uint64_t lastActivity;
+
 	std::string currentHeaderField;
 	std::string currentHeaderValue;
+
 	std::string url;
 	std::string status;
-	std::map<std::string, std::string> headers;
+	std::map< std::string,std::string > headers;
+	std::string body;
 
-	std::string readq;
-	std::string writeq;
-	Mutex writeq_m;
+	std::string writeBuf;
+	Mutex writeBuf_m;
 };
 
-struct PacketRecord {
-	uint64_t now;
-	int64_t sock;
-	struct sockaddr_storage from;
-	unsigned int size;
-	uint8_t data[ZT_MAX_MTU];
-};
+// Used to pseudo-randomize local source port picking
+static volatile unsigned int _udpPortPickerCounter = 0;
 
-class OneServiceImpl : public OneService {
-  public:
+class OneServiceImpl : public OneService
+{
+public:
 	// begin member variables --------------------------------------------------
 
 	const std::string _homePath;
-	std::string _authToken;
-	std::string _metricsToken;
-	std::string _controllerDbPath;
-	const std::string _networksPath;
-	const std::string _moonsPath;
-
-	EmbeddedNetworkController* _controller;
-	Phy<OneServiceImpl*> _phy;
-	Node* _node;
-	SoftwareUpdater* _updater;
-	bool _updateAutoApply;
-
-	httplib::Server _controlPlane;
-	httplib::Server _controlPlaneV6;
-	std::thread _serverThread;
-	std::thread _serverThreadV6;
-	bool _serverThreadRunning;
-	bool _serverThreadRunningV6;
-
-	BlockingQueue<PacketRecord*> _rxPacketQueue;
-	std::vector<PacketRecord*> _rxPacketVector;
-	std::vector<std::thread> _rxPacketThreads;
-	Mutex _rxPacketVector_m, _rxPacketThreads_m;
-	bool _multicoreEnabled;
-	bool _cpuPinningEnabled;
-	unsigned int _concurrency;
-
-	bool _allowTcpFallbackRelay;
-	bool _forceTcpRelay;
-	bool _allowSecondaryPort;
-	bool _enableWebServer;
-
-	unsigned int _primaryPort;
-	unsigned int _secondaryPort;
-	unsigned int _tertiaryPort;
-	volatile unsigned int _udpPortPickerCounter;
-
-	// Local configuration and memo-ized information from it
-	json _localConfig;
-	Hashtable<uint64_t, std::vector<InetAddress> > _v4Hints;
-	Hashtable<uint64_t, std::vector<InetAddress> > _v6Hints;
-	Hashtable<uint64_t, std::vector<InetAddress> > _v4Blacklists;
-	Hashtable<uint64_t, std::vector<InetAddress> > _v6Blacklists;
-	std::vector<InetAddress> _globalV4Blacklist;
-	std::vector<InetAddress> _globalV6Blacklist;
-	std::vector<InetAddress> _allowManagementFrom;
-	std::vector<std::string> _interfacePrefixBlacklist;
-	Mutex _localConfig_m;
-
-	std::vector<InetAddress> explicitBind;
+	BackgroundResolver _tcpFallbackResolver;
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+	SqliteNetworkController *_controller;
+#endif
+	Phy<OneServiceImpl *> _phy;
+	Node *_node;
 
 	/*
-	 * To attempt to handle NAT/gateway craziness we use three local UDP ports:
+	 * To properly handle NAT/gateway craziness we use three local UDP ports:
 	 *
 	 * [0] is the normal/default port, usually 9993
-	 * [1] is a port derived from our ZeroTier address
+	 * [1] is a port dervied from our ZeroTier address
 	 * [2] is a port computed from the normal/default for use with uPnP/NAT-PMP mappings
 	 *
 	 * [2] exists because on some gateways trying to do regular NAT-t interferes
 	 * destructively with uPnP port mapping behavior in very weird buggy ways.
 	 * It's only used if uPnP/NAT-PMP is enabled in this build.
 	 */
+
+	Binder _bindings[3];
 	unsigned int _ports[3];
-	Binder _binder;
+	uint16_t _portsBE[3]; // ports in big-endian network byte order as in sockaddr
+
+	// Sockets for JSON API -- bound only to V4 and V6 localhost
+	PhySocket *_v4TcpControlSocket;
+	PhySocket *_v6TcpControlSocket;
+
+	// JSON API handler
+	ControlPlane *_controlPlane;
 
 	// Time we last received a packet from a global address
 	uint64_t _lastDirectReceiveFromGlobal;
 #ifdef ZT_TCP_FALLBACK_RELAY
-	InetAddress _fallbackRelayAddress;
 	uint64_t _lastSendToGlobalV4;
 #endif
 
@@ -908,15 +496,16 @@ class OneServiceImpl : public OneService {
 	uint64_t _lastRestart;
 
 	// Deadline for the next background task service function
-	volatile int64_t _nextBackgroundTaskDeadline;
+	volatile uint64_t _nextBackgroundTaskDeadline;
 
-	std::map<uint64_t, NetworkState> _nets;
-	Mutex _nets_m;
+	// Tap devices by network ID
+	std::map< uint64_t,EthernetTap * > _taps;
+	std::map< uint64_t,std::vector<InetAddress> > _tapAssignedIps; // ZeroTier assigned IPs, not user or dhcp assigned
+	Mutex _taps_m;
 
 	// Active TCP/IP connections
-	std::vector<TcpConnection*> _tcpConnections;
-	Mutex _tcpConnections_m;
-	TcpConnection* _tcpFallbackTunnel;
+	std::set< TcpConnection * > _tcpConnections; // no mutex for this since it's done in the main loop thread only
+	TcpConnection *_tcpFallbackTunnel;
 
 	// Termination status information
 	ReasonForTermination _termReason;
@@ -924,747 +513,407 @@ class OneServiceImpl : public OneService {
 	Mutex _termReason_m;
 
 	// uPnP/NAT-PMP port mapper if enabled
-	bool _portMappingEnabled;	// local.conf settings
 #ifdef ZT_USE_MINIUPNPC
-	PortMapper* _portMapper;
+	PortMapper *_portMapper;
 #endif
 
-	// HashiCorp Vault Settings
-#if ZT_VAULT_SUPPORT
-	bool _vaultEnabled;
-	std::string _vaultURL;
-	std::string _vaultToken;
-	std::string _vaultPath;	  // defaults to cubbyhole/zerotier/identity.secret for per-access key storage
+	// Cluster management instance if enabled
+#ifdef ZT_ENABLE_CLUSTER
+	PhySocket *_clusterMessageSocket;
+	ClusterDefinition *_clusterDefinition;
+	unsigned int _clusterMemberId;
 #endif
 
 	// Set to false to force service to stop
 	volatile bool _run;
 	Mutex _run_m;
 
-	RedisConfig* _rc;
-	std::string _ssoRedirectURL;
-
-#ifdef ZT_OPENTELEMETRY_ENABLED
-
-	opentelemetry::nostd::shared_ptr<opentelemetry::v1::trace::TracerProvider> _traceProvider;
-	std::string _exporterEndpoint;
-	double _exporterSampleRate;
-#endif
-
 	// end member variables ----------------------------------------------------
 
-	OneServiceImpl(const char* hp, unsigned int port)
-		: _homePath((hp) ? hp : ".")
-		, _controllerDbPath(_homePath + ZT_PATH_SEPARATOR_S "controller.d")
-		, _networksPath(_homePath + ZT_PATH_SEPARATOR_S "networks.d")
-		, _moonsPath(_homePath + ZT_PATH_SEPARATOR_S "moons.d")
-		, _controller((EmbeddedNetworkController*)0)
-		, _phy(this, false, true)
-		, _node((Node*)0)
-		, _updater((SoftwareUpdater*)0)
-		, _updateAutoApply(false)
-		, _controlPlane()
-		, _controlPlaneV6()
-		, _serverThread()
-		, _serverThreadV6()
-		, _serverThreadRunning(false)
-		, _serverThreadRunningV6(false)
-		, _forceTcpRelay(false)
-		, _primaryPort(port)
-		, _udpPortPickerCounter(0)
-		, _lastDirectReceiveFromGlobal(0)
+	OneServiceImpl(const char *hp,unsigned int port) :
+		_homePath((hp) ? hp : ".")
+		,_tcpFallbackResolver(ZT_TCP_FALLBACK_RELAY)
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+		,_controller((SqliteNetworkController *)0)
+#endif
+		,_phy(this,false,true)
+		,_node((Node *)0)
+		,_controlPlane((ControlPlane *)0)
+		,_lastDirectReceiveFromGlobal(0)
 #ifdef ZT_TCP_FALLBACK_RELAY
-		, _fallbackRelayAddress(ZT_TCP_FALLBACK_RELAY)
-		, _lastSendToGlobalV4(0)
+		,_lastSendToGlobalV4(0)
 #endif
-		, _lastRestart(0)
-		, _nextBackgroundTaskDeadline(0)
-		, _tcpFallbackTunnel((TcpConnection*)0)
-		, _termReason(ONE_STILL_RUNNING)
-		, _portMappingEnabled(true)
+		,_lastRestart(0)
+		,_nextBackgroundTaskDeadline(0)
+		,_tcpFallbackTunnel((TcpConnection *)0)
+		,_termReason(ONE_STILL_RUNNING)
 #ifdef ZT_USE_MINIUPNPC
-		, _portMapper((PortMapper*)0)
+		,_portMapper((PortMapper *)0)
 #endif
-#ifdef ZT_VAULT_SUPPORT
-		, _vaultEnabled(false)
-		, _vaultURL()
-		, _vaultToken()
-		, _vaultPath("cubbyhole/zerotier")
-#endif
-		, _run(true)
-		, _rc(NULL)
-		, _ssoRedirectURL()
-#ifdef ZT_OPENTELEMETRY_ENABLED
-		, _traceProvider(nullptr)
-		, _exporterEndpoint()
-		, _exporterSampleRate(1.0)
+#ifdef ZT_ENABLE_CLUSTER
+		,_clusterMessageSocket((PhySocket *)0)
+		,_clusterDefinition((ClusterDefinition *)0)
+		,_clusterMemberId(0)
 #endif
+		,_run(true)
 	{
 		_ports[0] = 0;
 		_ports[1] = 0;
 		_ports[2] = 0;
 
-		prometheus::simpleapi::saver.set_registry(prometheus::simpleapi::registry_ptr);
-		prometheus::simpleapi::saver.set_delay(std::chrono::seconds(5));
-		prometheus::simpleapi::saver.set_out_file(_homePath + ZT_PATH_SEPARATOR + "metrics.prom");
+		// The control socket is bound to the default/static port on localhost. If we
+		// can do this, we have successfully allocated a port. The binders will take
+		// care of binding non-local addresses for ZeroTier traffic.
+		const int portTrials = (port == 0) ? 256 : 1; // if port is 0, pick random
+		for(int k=0;k<portTrials;++k) {
+			if (port == 0) {
+				unsigned int randp = 0;
+				Utils::getSecureRandom(&randp,sizeof(randp));
+				port = 20000 + (randp % 45500);
+			}
 
-#if ZT_VAULT_SUPPORT
-		curl_global_init(CURL_GLOBAL_DEFAULT);
-#endif
+			if (_trialBind(port)) {
+				struct sockaddr_in in4;
+				memset(&in4,0,sizeof(in4));
+				in4.sin_family = AF_INET;
+				in4.sin_addr.s_addr = Utils::hton((uint32_t)0x7f000001); // right now we just listen for TCP @127.0.0.1
+				in4.sin_port = Utils::hton((uint16_t)port);
+				_v4TcpControlSocket = _phy.tcpListen((const struct sockaddr *)&in4,this);
+
+				struct sockaddr_in6 in6;
+				memset((void *)&in6,0,sizeof(in6));
+				in6.sin6_family = AF_INET6;
+				in6.sin6_port = in4.sin_port;
+				in6.sin6_addr.s6_addr[15] = 1; // IPv6 localhost == ::1
+				_v6TcpControlSocket = _phy.tcpListen((const struct sockaddr *)&in6,this);
+
+				// We must bind one of IPv4 or IPv6 -- support either failing to support hosts that
+				// have only IPv4 or only IPv6 stacks.
+				if ((_v4TcpControlSocket)||(_v6TcpControlSocket)) {
+					_ports[0] = port;
+					break;
+				} else {
+					if (_v4TcpControlSocket)
+						_phy.close(_v4TcpControlSocket,false);
+					if (_v6TcpControlSocket)
+						_phy.close(_v6TcpControlSocket,false);
+					port = 0;
+				}
+			} else {
+				port = 0;
+			}
+		}
+
+		if (_ports[0] == 0)
+			throw std::runtime_error("cannot bind to local control interface port");
+
+		char portstr[64];
+		Utils::snprintf(portstr,sizeof(portstr),"%u",_ports[0]);
+		OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "zerotier-one.port").c_str(),std::string(portstr));
 	}
 
 	virtual ~OneServiceImpl()
 	{
-#ifdef __WINDOWS__
-		WinFWHelper::removeICMPRules();
+		for(int i=0;i<3;++i)
+			_bindings[i].closeAll(_phy);
+
+		_phy.close(_v4TcpControlSocket);
+		_phy.close(_v6TcpControlSocket);
+
+#ifdef ZT_ENABLE_CLUSTER
+		_phy.close(_clusterMessageSocket);
 #endif
 
-		_rxPacketQueue.stop();
-		_rxPacketThreads_m.lock();
-		for (auto t = _rxPacketThreads.begin(); t != _rxPacketThreads.end(); ++t) {
-			t->join();
-		}
-		_rxPacketThreads_m.unlock();
-		_binder.closeAll(_phy);
-
-#if ZT_VAULT_SUPPORT
-		curl_global_cleanup();
-#endif
-
-		_controlPlane.stop();
-		if (_serverThreadRunning) {
-			_serverThread.join();
-		}
-		_controlPlaneV6.stop();
-		if (_serverThreadRunningV6) {
-			_serverThreadV6.join();
-		}
-		_rxPacketVector_m.lock();
-		while (! _rxPacketVector.empty()) {
-			delete _rxPacketVector.back();
-			_rxPacketVector.pop_back();
-		}
-		_rxPacketVector_m.unlock();
-
 #ifdef ZT_USE_MINIUPNPC
 		delete _portMapper;
 #endif
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
 		delete _controller;
-		delete _rc;
-	}
-
-	void setUpMultithreading()
-	{
-#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__WINDOWS__)
-		return;
 #endif
-		_node->initMultithreading(_concurrency, _cpuPinningEnabled);
-		bool pinning = _cpuPinningEnabled;
-	}
-
-#ifdef ZT_OPENTELEMETRY_ENABLED
-	void initTracing()
-	{
-		if (! _exporterEndpoint.empty() && _exporterSampleRate > 0.0) {
-			fprintf(stderr, "OpenTelemetry tracing enabled with endpoint %s and sample rate %.2f\n", _exporterEndpoint.c_str(), _exporterSampleRate);
-			// Set up OpenTelemetry exporter and tracer provider
-			opentelemetry::v1::exporter::otlp::OtlpGrpcExporterOptions opts;
-			opts.endpoint = _exporterEndpoint + "/v1/traces";
-			auto exporter = std::unique_ptr<opentelemetry::exporter::otlp::OtlpGrpcExporter>(new opentelemetry::exporter::otlp::OtlpGrpcExporter(opts));
-
-			sdktrace::BatchSpanProcessorOptions batch_options {};
-			batch_options.schedule_delay_millis = std::chrono::milliseconds(5000);	 // 5 seconds
-
-			auto processor = std::unique_ptr<sdktrace::SpanProcessor>(new sdktrace::BatchSpanProcessor(std::move(exporter), batch_options));
-			auto processors = std::vector<std::unique_ptr<sdktrace::SpanProcessor> >();
-			processors.push_back(std::move(processor));
-
-			char buf[256];
-			auto versionString = std::stringstream();
-			versionString << ZEROTIER_ONE_VERSION_MAJOR << "." << ZEROTIER_ONE_VERSION_MINOR << "." << ZEROTIER_ONE_VERSION_REVISION;
-			auto resource_attributes = sdkresource::ResourceAttributes { { "service.version", versionString.str() }, { "service.node_id", _node->identity().address().toString(buf) }, { "service.namespace", "com.zerotier.zerotier-one" } };
-			auto resource = sdkresource::Resource::Create(resource_attributes);
-
-			auto sampler = std::unique_ptr<sdktrace::Sampler>(new sdktrace::TraceIdRatioBasedSampler(_exporterSampleRate));
-			auto tracer_context = std::make_unique<sdktrace::TracerContext>(std::move(processors), resource, std::move(sampler));
-			_traceProvider = opentelemetry::nostd::shared_ptr<sdktrace::TracerProvider>(new sdktrace::TracerProvider(std::move(tracer_context)));
-			sdktrace::Provider::SetTracerProvider(_traceProvider);
-		}
-	}
-
-	void initMetrics()
-	{
-		if (! _exporterEndpoint.empty()) {
-			// Set up OpenTelemetry metrics exporter
-			// opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
-			// opts.endpoint = _exporterEndpoint + "/v1/metrics";
-			// auto exporter = std::unique_ptr<opentelemetry::exporter::otlp::OtlpGrpcExporter>(new opentelemetry::exporter::otlp::OtlpGrpcExporter(opts));
-			// auto processor = std::unique_ptr<sdkmetrics::MetricReader>(new sdkmetrics::PeriodicExportingMetricReader(std::move(exporter)));
-			// auto meter_provider = opentelemetry::v1::nostd::shared_ptr<sdkmetrics::MeterProvider>(new sdkmetrics::MeterProvider(std::move(processor)));
-			// sdkmetrics::Provider::SetMeterProvider(meter_provider);
-		}
-	}
-
-	void initLogging()
-	{
-		if (! _exporterEndpoint.empty()) {
-			// Set up OpenTelemetry logging exporter
-			// opentelemetry::exporter::otlp::OtlpGrpcExporterOptions opts;
-			// opts.endpoint = _exporterEndpoint + "/v1/logs";
-			// auto exporter = std::unique_ptr<opentelemetry::exporter::otlp::OtlpGrpcExporter>(new opentelemetry::exporter::otlp::OtlpGrpcExporter(opts));
-			// auto processor = std::unique_ptr<opentelemetry::v1::sdk::logs::LogRecordProcessor>(new opentelemetry::v1::sdk::logs::SimpleLogRecordProcessor(std::move(exporter)));
-			// auto logger_provider = opentelemetry::nostd::shared_ptr<opentelemetry::v1::sdk::logs::LoggerProvider>(new opentelemetry::v1::sdk::logs::LoggerProvider(std::move(processor)));
-			// opentelemetry::logs::Provider::SetLoggerProvider(logger_provider);
-		}
-	}
+#ifdef ZT_ENABLE_CLUSTER
+		delete _clusterDefinition;
 #endif
+	}
 
 	virtual ReasonForTermination run()
 	{
 		try {
+			std::string authToken;
 			{
-				const std::string authTokenPath(_homePath + ZT_PATH_SEPARATOR_S "authtoken.secret");
-				if (! OSUtils::readFile(authTokenPath.c_str(), _authToken)) {
+				std::string authTokenPath(_homePath + ZT_PATH_SEPARATOR_S + "authtoken.secret");
+				if (!OSUtils::readFile(authTokenPath.c_str(),authToken)) {
 					unsigned char foo[24];
-					Utils::getSecureRandom(foo, sizeof(foo));
-					_authToken = "";
-					for (unsigned int i = 0; i < sizeof(foo); ++i)
-						_authToken.push_back("abcdefghijklmnopqrstuvwxyz0123456789"[(unsigned long)foo[i] % 36]);
-					if (! OSUtils::writeFile(authTokenPath.c_str(), _authToken)) {
+					Utils::getSecureRandom(foo,sizeof(foo));
+					authToken = "";
+					for(unsigned int i=0;i<sizeof(foo);++i)
+						authToken.push_back("abcdefghijklmnopqrstuvwxyz0123456789"[(unsigned long)foo[i] % 36]);
+					if (!OSUtils::writeFile(authTokenPath.c_str(),authToken)) {
 						Mutex::Lock _l(_termReason_m);
 						_termReason = ONE_UNRECOVERABLE_ERROR;
-						_fatalErrorMessage = "authtoken.secret could not be written (try running with -U to prevent dropping of privileges)";
+						_fatalErrorMessage = "authtoken.secret could not be written";
 						return _termReason;
-					}
-					else {
-						OSUtils::lockDownFile(authTokenPath.c_str(), false);
+					} else {
+						OSUtils::lockDownFile(authTokenPath.c_str(),false);
 					}
 				}
-				_authToken = _trimString(_authToken);
 			}
+			authToken = _trimString(authToken);
 
-			{
-				const std::string metricsTokenPath(_homePath + ZT_PATH_SEPARATOR_S "metricstoken.secret");
-				if (! OSUtils::readFile(metricsTokenPath.c_str(), _metricsToken)) {
-					unsigned char foo[24];
-					Utils::getSecureRandom(foo, sizeof(foo));
-					_metricsToken = "";
-					for (unsigned int i = 0; i < sizeof(foo); ++i)
-						_metricsToken.push_back("abcdefghijklmnopqrstuvwxyz0123456789"[(unsigned long)foo[i] % 36]);
-					if (! OSUtils::writeFile(metricsTokenPath.c_str(), _metricsToken)) {
-						Mutex::Lock _l(_termReason_m);
-						_termReason = ONE_UNRECOVERABLE_ERROR;
-						_fatalErrorMessage = "metricstoken.secret could not be written (try running with -U to prevent dropping of privileges)";
-						return _termReason;
-					}
-					else {
-						OSUtils::lockDownFile(metricsTokenPath.c_str(), false);
-					}
-				}
-				_metricsToken = _trimString(_metricsToken);
-			}
+			_node = new Node(
+				OSUtils::now(),
+				this,
+				SnodeDataStoreGetFunction,
+				SnodeDataStorePutFunction,
+				SnodeWirePacketSendFunction,
+				SnodeVirtualNetworkFrameFunction,
+				SnodeVirtualNetworkConfigFunction,
+				SnodePathCheckFunction,
+				SnodeEventCallback);
 
-			{
-				struct ZT_Node_Callbacks cb;
-				cb.version = 0;
-				cb.stateGetFunction = SnodeStateGetFunction;
-				cb.statePutFunction = SnodeStatePutFunction;
-				cb.wirePacketSendFunction = SnodeWirePacketSendFunction;
-				cb.virtualNetworkFrameFunction = SnodeVirtualNetworkFrameFunction;
-				cb.virtualNetworkConfigFunction = SnodeVirtualNetworkConfigFunction;
-				cb.eventCallback = SnodeEventCallback;
-				cb.pathCheckFunction = SnodePathCheckFunction;
-				cb.pathLookupFunction = SnodePathLookupFunction;
-				_node = new Node(this, (void*)0, &cb, OSUtils::now());
-			}
-
-			// local.conf
-			readLocalSettings();
-			applyLocalConfig();
-
-#ifdef ZT_OPENTELEMETRY_ENABLED
-			fprintf(stderr, "OneServiceImpl::run: initializing OpenTelemetry...\n");
-			initTracing();
-			initMetrics();
-			initLogging();
-#endif
-
-			// Save original port number to show it if bind error
-			const int _configuredPort = _primaryPort;
-
-			// Make sure we can use the primary port, and hunt for one if configured to do so
-			const int portTrials = (_primaryPort == 0) ? 256 : 1;	// if port is 0, pick random
-			for (int k = 0; k < portTrials; ++k) {
-				if (_primaryPort == 0) {
-					unsigned int randp = 0;
-					Utils::getSecureRandom(&randp, sizeof(randp));
-					_primaryPort = 20000 + (randp % 45500);
-				}
-				if (_trialBind(_primaryPort)) {
-					_ports[0] = _primaryPort;
-				}
-				else {
-					_primaryPort = 0;
-				}
-			}
-			if (_ports[0] == 0) {
-				Mutex::Lock _l(_termReason_m);
-				_termReason = ONE_UNRECOVERABLE_ERROR;
-				_fatalErrorMessage = std::string("cannot bind to local control interface port ") + std::to_string(_configuredPort);
-				return _termReason;
-			}
-
-			// Save primary port to a file so CLIs and GUIs can learn it easily
-			char portstr[64];
-			OSUtils::ztsnprintf(portstr, sizeof(portstr), "%u", _ports[0]);
-			OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S "zerotier-one.port").c_str(), std::string(portstr));
-
-			// Attempt to bind to a secondary port.
+			// Attempt to bind to a secondary port chosen from our ZeroTier address.
 			// This exists because there are buggy NATs out there that fail if more
 			// than one device behind the same NAT tries to use the same internal
-			// private address port number. Buggy NATs are a running theme.
-			//
-			// This used to pick the secondary port based on the node ID until we
-			// discovered another problem: buggy routers and malicious traffic
-			// "detection".  A lot of routers have such things built in these days
-			// and mis-detect ZeroTier traffic as malicious and block it resulting
-			// in a node that appears to be in a coma.  Secondary ports are now
-			// randomized on startup.
-			if (_allowSecondaryPort) {
-				if (_secondaryPort) {
-					_ports[1] = _secondaryPort;
-				}
-				else {
-					_ports[1] = _getRandomPort();
+			// private address port number.
+			_ports[1] = 20000 + ((unsigned int)_node->address() % 45500);
+			for(int i=0;;++i) {
+				if (i > 1000) {
+					_ports[1] = 0;
+					break;
+				} else if (++_ports[1] >= 65536) {
+					_ports[1] = 20000;
 				}
+				if (_trialBind(_ports[1]))
+					break;
 			}
-#ifdef ZT_USE_MINIUPNPC
-			if (_portMappingEnabled) {
-				// If we're running uPnP/NAT-PMP, bind a *third* port for that. We can't
-				// use the other two ports for that because some NATs do really funky
-				// stuff with ports that are explicitly mapped that breaks things.
-				if (_tertiaryPort) {
-					_ports[2] = _tertiaryPort;
-				}
-				else {
-					_ports[2] = _tertiaryPort = _getRandomPort();
-				}
 
+#ifdef ZT_USE_MINIUPNPC
+			// If we're running uPnP/NAT-PMP, bind a *third* port for that. We can't
+			// use the other two ports for that because some NATs do really funky
+			// stuff with ports that are explicitly mapped that breaks things.
+			if (_ports[1]) {
+				_ports[2] = _ports[1];
+				for(int i=0;;++i) {
+					if (i > 1000) {
+						_ports[2] = 0;
+						break;
+					} else if (++_ports[2] >= 65536) {
+						_ports[2] = 20000;
+					}
+					if (_trialBind(_ports[2]))
+						break;
+				}
 				if (_ports[2]) {
 					char uniqueName[64];
-					OSUtils::ztsnprintf(uniqueName, sizeof(uniqueName), "ZeroTier/%.10llx@%u", _node->address(), _ports[2]);
-					_portMapper = new PortMapper(_ports[2], uniqueName);
+					Utils::snprintf(uniqueName,sizeof(uniqueName),"ZeroTier/%.10llx@%u",_node->address(),_ports[2]);
+					_portMapper = new PortMapper(_ports[2],uniqueName);
 				}
 			}
 #endif
 
-#ifdef ZT_EXTOSDEP
-			{
-				int mgmtfd;
-				void* mgmtcookie;
-				ExtOsdep::started(&mgmtfd, &mgmtcookie);
-				_phy.wrapSocket(mgmtfd, mgmtcookie);
+			for(int i=0;i<3;++i)
+				_portsBE[i] = Utils::hton((uint16_t)_ports[i]);
+
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+			_controller = new SqliteNetworkController(_node,(_homePath + ZT_PATH_SEPARATOR_S + ZT_CONTROLLER_DB_PATH).c_str(),(_homePath + ZT_PATH_SEPARATOR_S + "circuitTestResults.d").c_str());
+			_node->setNetconfMaster((void *)_controller);
+#endif
+
+#ifdef ZT_ENABLE_CLUSTER
+			if (OSUtils::fileExists((_homePath + ZT_PATH_SEPARATOR_S + "cluster").c_str())) {
+				_clusterDefinition = new ClusterDefinition(_node->address(),(_homePath + ZT_PATH_SEPARATOR_S + "cluster").c_str());
+				if (_clusterDefinition->size() > 0) {
+					std::vector<ClusterDefinition::MemberDefinition> members(_clusterDefinition->members());
+					for(std::vector<ClusterDefinition::MemberDefinition>::iterator m(members.begin());m!=members.end();++m) {
+						PhySocket *cs = _phy.udpBind(reinterpret_cast<const struct sockaddr *>(&(m->clusterEndpoint)));
+						if (cs) {
+							if (_clusterMessageSocket) {
+								_phy.close(_clusterMessageSocket,false);
+								_phy.close(cs,false);
+
+								Mutex::Lock _l(_termReason_m);
+								_termReason = ONE_UNRECOVERABLE_ERROR;
+								_fatalErrorMessage = "Cluster: can't determine my cluster member ID: able to bind more than one cluster message socket IP/port!";
+								return _termReason;
+							}
+							_clusterMessageSocket = cs;
+							_clusterMemberId = m->id;
+						}
+					}
+
+					if (!_clusterMessageSocket) {
+						Mutex::Lock _l(_termReason_m);
+						_termReason = ONE_UNRECOVERABLE_ERROR;
+						_fatalErrorMessage = "Cluster: can't determine my cluster member ID: unable to bind to any cluster message socket IP/port.";
+						return _termReason;
+					}
+
+					const ClusterDefinition::MemberDefinition &me = (*_clusterDefinition)[_clusterMemberId];
+					InetAddress endpoints[255];
+					unsigned int numEndpoints = 0;
+					for(std::vector<InetAddress>::const_iterator i(me.zeroTierEndpoints.begin());i!=me.zeroTierEndpoints.end();++i)
+						endpoints[numEndpoints++] = *i;
+
+					if (_node->clusterInit(_clusterMemberId,reinterpret_cast<const struct sockaddr_storage *>(endpoints),numEndpoints,me.x,me.y,me.z,&SclusterSendFunction,this,_clusterDefinition->geo().available() ? &SclusterGeoIpFunction : 0,this) == ZT_RESULT_OK) {
+						std::vector<ClusterDefinition::MemberDefinition> members(_clusterDefinition->members());
+						for(std::vector<ClusterDefinition::MemberDefinition>::iterator m(members.begin());m!=members.end();++m) {
+							if (m->id != _clusterMemberId)
+								_node->clusterAddMember(m->id);
+						}
+					}
+				} else {
+					delete _clusterDefinition;
+					_clusterDefinition = (ClusterDefinition *)0;
+				}
 			}
 #endif
 
-			// Delete legacy iddb.d if present (cleanup)
-			OSUtils::rmDashRf((_homePath + ZT_PATH_SEPARATOR_S "iddb.d").c_str());
+			_controlPlane = new ControlPlane(this,_node,(_homePath + ZT_PATH_SEPARATOR_S + "ui").c_str());
+			_controlPlane->addAuthToken(authToken.c_str());
 
-			// Network controller is now enabled by default for desktop and server
-			_controller = new EmbeddedNetworkController(_node, _homePath.c_str(), _controllerDbPath.c_str(), _ports[0], _rc);
-			if (! _ssoRedirectURL.empty()) {
-				_controller->setSSORedirectURL(_ssoRedirectURL);
-			}
-			_node->setNetconfMaster((void*)_controller);
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
+			_controlPlane->setController(_controller);
+#endif
 
-			startHTTPControlPlane();
-
-			// Join existing networks in networks.d
-			{
-				std::vector<std::string> networksDotD(OSUtils::listDirectory((_homePath + ZT_PATH_SEPARATOR_S "networks.d").c_str()));
-				for (std::vector<std::string>::iterator f(networksDotD.begin()); f != networksDotD.end(); ++f) {
+			{	// Remember networks from previous session
+				std::vector<std::string> networksDotD(OSUtils::listDirectory((_homePath + ZT_PATH_SEPARATOR_S + "networks.d").c_str()));
+				for(std::vector<std::string>::iterator f(networksDotD.begin());f!=networksDotD.end();++f) {
 					std::size_t dot = f->find_last_of('.');
-					if ((dot == 16) && (f->substr(16) == ".conf"))
-						_node->join(Utils::hexStrToU64(f->substr(0, dot).c_str()), (void*)0, (void*)0);
+					if ((dot == 16)&&(f->substr(16) == ".conf"))
+						_node->join(Utils::hexStrToU64(f->substr(0,dot).c_str()),(void *)0);
 				}
 			}
 
-			// Orbit existing moons in moons.d
-			{
-				std::vector<std::string> moonsDotD(OSUtils::listDirectory((_homePath + ZT_PATH_SEPARATOR_S "moons.d").c_str()));
-				for (std::vector<std::string>::iterator f(moonsDotD.begin()); f != moonsDotD.end(); ++f) {
-					std::size_t dot = f->find_last_of('.');
-					if ((dot == 16) && (f->substr(16) == ".moon"))
-						_node->orbit((void*)0, Utils::hexStrToU64(f->substr(0, dot).c_str()), 0);
-				}
-			}
+			// Start two background threads to handle expensive ops out of line
+			Thread::start(_node);
+			Thread::start(_node);
 
-			// Main I/O loop
 			_nextBackgroundTaskDeadline = 0;
-			int64_t clockShouldBe = OSUtils::now();
+			uint64_t clockShouldBe = OSUtils::now();
 			_lastRestart = clockShouldBe;
-			int64_t lastTapMulticastGroupCheck = 0;
-			int64_t lastBindRefresh = 0;
-			int64_t lastUpdateCheck = clockShouldBe;
-			int64_t lastCleanedPeersDb = 0;
-			int64_t lastLocalConfFileCheck = OSUtils::now();
-			int64_t lastOnline = lastLocalConfFileCheck;
-
-			for (;;) {
+			uint64_t lastTapMulticastGroupCheck = 0;
+			uint64_t lastTcpFallbackResolve = 0;
+			uint64_t lastBindRefresh = 0;
+			uint64_t lastLocalInterfaceAddressCheck = (OSUtils::now() - ZT_LOCAL_INTERFACE_CHECK_INTERVAL) + 15000; // do this in 15s to give portmapper time to configure and other things time to settle
+#ifdef ZT_AUTO_UPDATE
+			uint64_t lastSoftwareUpdateCheck = 0;
+#endif // ZT_AUTO_UPDATE
+			for(;;) {
 				_run_m.lock();
-				if (! _run) {
+				if (!_run) {
 					_run_m.unlock();
 					_termReason_m.lock();
 					_termReason = ONE_NORMAL_TERMINATION;
 					_termReason_m.unlock();
 					break;
-				}
-				else {
+				} else {
 					_run_m.unlock();
 				}
 
-				const int64_t now = OSUtils::now();
+				const uint64_t now = OSUtils::now();
 
 				// Attempt to detect sleep/wake events by detecting delay overruns
 				bool restarted = false;
-				if ((now > clockShouldBe) && ((now - clockShouldBe) > 10000)) {
+				if ((now > clockShouldBe)&&((now - clockShouldBe) > 10000)) {
 					_lastRestart = now;
 					restarted = true;
 				}
 
-				// Check for updates (if enabled)
-				if ((_updater) && ((now - lastUpdateCheck) > 10000)) {
-					lastUpdateCheck = now;
-					if (_updater->check(now) && _updateAutoApply)
-						_updater->apply();
-				}
-
-				// Reload local.conf if anything changed recently
-				if ((now - lastLocalConfFileCheck) >= ZT_LOCAL_CONF_FILE_CHECK_INTERVAL) {
-					lastLocalConfFileCheck = now;
-					struct stat result;
-					if (stat((_homePath + ZT_PATH_SEPARATOR_S "local.conf").c_str(), &result) == 0) {
-						int64_t mod_time = result.st_mtime * 1000;
-						if ((now - mod_time) <= ZT_LOCAL_CONF_FILE_CHECK_INTERVAL) {
-							readLocalSettings();
-							applyLocalConfig();
-						}
-					}
-				}
-
-				// Refresh bindings in case device's interfaces have changed, and also sync routes to update any shadow routes (e.g. shadow default)
-				if (((now - lastBindRefresh) >= (_node->bondController()->inUse() ? ZT_BINDER_REFRESH_PERIOD / 4 : ZT_BINDER_REFRESH_PERIOD)) || restarted) {
-					// If secondary port is not configured to a constant value and we've been offline for a while,
-					// bind a new secondary port. This is a workaround for a "coma" issue caused by buggy NATs that stop
-					// working on one port after a while.
-					if (_secondaryPort == 0) {
-						if (_node->online()) {
-							lastOnline = now;
-						}
-						else if (now - lastOnline > (ZT_PEER_PING_PERIOD * 2) || restarted) {
-							lastOnline = now;	// don't keep changing the port before we have a chance to connect
-							_ports[1] = _getRandomPort();
-
-#if ZT_DEBUG == 1
-							fprintf(stderr, "Randomized secondary port. Now it's %d\n", _ports[1]);
-#endif
-						}
-					}
-
-					unsigned int p[3];
-					unsigned int pc = 0;
-					for (int i = 0; i < 3; ++i) {
-						if (_ports[i])
-							p[pc++] = _ports[i];
-					}
-					if (! _forceTcpRelay) {
-						// Only bother binding UDP ports if we aren't forcing TCP-relay mode
-						_binder.refresh(_phy, p, pc, explicitBind, *this);
-					}
-
+				// Refresh bindings in case device's interfaces have changed
+				if (((now - lastBindRefresh) >= ZT_BINDER_REFRESH_PERIOD)||(restarted)) {
 					lastBindRefresh = now;
-
-					// Sync information about physical network interfaces
-					_node->clearLocalInterfaceAddresses();
-#ifdef ZT_USE_MINIUPNPC
-					if (_portMapper) {
-						std::vector<InetAddress> mappedAddresses(_portMapper->get());
-						for (std::vector<InetAddress>::const_iterator ext(mappedAddresses.begin()); ext != mappedAddresses.end(); ++ext)
-							_node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage*>(&(*ext)));
-					}
-#endif
-					std::vector<InetAddress> boundAddrs(_binder.allBoundLocalInterfaceAddresses());
-					for (std::vector<InetAddress>::const_iterator i(boundAddrs.begin()); i != boundAddrs.end(); ++i) {
-						_node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage*>(&(*i)));
-					}
-
-					{
-						Mutex::Lock _l(_nets_m);
-						for (std::map<uint64_t, NetworkState>::iterator n(_nets.begin()); n != _nets.end(); ++n) {
-							if (n->second.tap())
-								syncManagedStuff(n->second, false, true, false);
+					for(int i=0;i<3;++i) {
+						if (_ports[i]) {
+							_bindings[i].refresh(_phy,_ports[i],*this);
 						}
 					}
 				}
 
-				// Run background task processor in core if it's time to do so
-				int64_t dl = _nextBackgroundTaskDeadline;
+				uint64_t dl = _nextBackgroundTaskDeadline;
 				if (dl <= now) {
-					_node->processBackgroundTasks((void*)0, now, &_nextBackgroundTaskDeadline);
+					_node->processBackgroundTasks(now,&_nextBackgroundTaskDeadline);
 					dl = _nextBackgroundTaskDeadline;
 				}
 
-				// Close TCP fallback tunnel if we have direct UDP
-				if (! _forceTcpRelay && (_tcpFallbackTunnel) && ((now - _lastDirectReceiveFromGlobal) < (ZT_TCP_FALLBACK_AFTER / 2))) {
-					_phy.close(_tcpFallbackTunnel->sock);
+#ifdef ZT_AUTO_UPDATE
+				if ((now - lastSoftwareUpdateCheck) >= ZT_AUTO_UPDATE_CHECK_PERIOD) {
+					lastSoftwareUpdateCheck = now;
+					Thread::start(&backgroundSoftwareUpdateChecker);
+				}
+#endif // ZT_AUTO_UPDATE
+
+				if ((now - lastTcpFallbackResolve) >= ZT_TCP_FALLBACK_RERESOLVE_DELAY) {
+					lastTcpFallbackResolve = now;
+					_tcpFallbackResolver.resolveNow();
 				}
 
-				// Sync multicast group memberships
+				if ((_tcpFallbackTunnel)&&((now - _lastDirectReceiveFromGlobal) < (ZT_TCP_FALLBACK_AFTER / 2)))
+					_phy.close(_tcpFallbackTunnel->sock);
+
 				if ((now - lastTapMulticastGroupCheck) >= ZT_TAP_CHECK_MULTICAST_INTERVAL) {
 					lastTapMulticastGroupCheck = now;
-					std::vector<std::pair<uint64_t, std::pair<std::vector<MulticastGroup>, std::vector<MulticastGroup> > > > mgChanges;
-					{
-						Mutex::Lock _l(_nets_m);
-						mgChanges.reserve(_nets.size() + 1);
-						for (std::map<uint64_t, NetworkState>::const_iterator n(_nets.begin()); n != _nets.end(); ++n) {
-							if (n->second.tap()) {
-								mgChanges.push_back(std::pair<uint64_t, std::pair<std::vector<MulticastGroup>, std::vector<MulticastGroup> > >(n->first, std::pair<std::vector<MulticastGroup>, std::vector<MulticastGroup> >()));
-								n->second.tap()->scanMulticastGroups(mgChanges.back().second.first, mgChanges.back().second.second);
-							}
-						}
-					}
-					for (std::vector<std::pair<uint64_t, std::pair<std::vector<MulticastGroup>, std::vector<MulticastGroup> > > >::iterator c(mgChanges.begin()); c != mgChanges.end(); ++c) {
-						for (std::vector<MulticastGroup>::iterator m(c->second.first.begin()); m != c->second.first.end(); ++m)
-							_node->multicastSubscribe((void*)0, c->first, m->mac().toInt(), m->adi());
-						for (std::vector<MulticastGroup>::iterator m(c->second.second.begin()); m != c->second.second.end(); ++m)
-							_node->multicastUnsubscribe(c->first, m->mac().toInt(), m->adi());
+					Mutex::Lock _l(_taps_m);
+					for(std::map< uint64_t,EthernetTap *>::const_iterator t(_taps.begin());t!=_taps.end();++t) {
+						std::vector<MulticastGroup> added,removed;
+						t->second->scanMulticastGroups(added,removed);
+						for(std::vector<MulticastGroup>::iterator m(added.begin());m!=added.end();++m)
+							_node->multicastSubscribe(t->first,m->mac().toInt(),m->adi());
+						for(std::vector<MulticastGroup>::iterator m(removed.begin());m!=removed.end();++m)
+							_node->multicastUnsubscribe(t->first,m->mac().toInt(),m->adi());
 					}
 				}
 
-				// Clean peers.d periodically
-				if ((now - lastCleanedPeersDb) >= 3600000) {
-					lastCleanedPeersDb = now;
-					OSUtils::cleanDirectory((_homePath + ZT_PATH_SEPARATOR_S "peers.d").c_str(), now - 2592000000LL);	// delete older than 30 days
+				if ((now - lastLocalInterfaceAddressCheck) >= ZT_LOCAL_INTERFACE_CHECK_INTERVAL) {
+					lastLocalInterfaceAddressCheck = now;
+
+					_node->clearLocalInterfaceAddresses();
+
+#ifdef ZT_USE_MINIUPNPC
+					if (_portMapper) {
+						std::vector<InetAddress> mappedAddresses(_portMapper->get());
+						for(std::vector<InetAddress>::const_iterator ext(mappedAddresses.begin());ext!=mappedAddresses.end();++ext)
+							_node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage *>(&(*ext)));
+					}
+#endif
+
+					std::vector<InetAddress> boundAddrs(_bindings[0].allBoundLocalInterfaceAddresses());
+					for(std::vector<InetAddress>::const_iterator i(boundAddrs.begin());i!=boundAddrs.end();++i)
+						_node->addLocalInterfaceAddress(reinterpret_cast<const struct sockaddr_storage *>(&(*i)));
 				}
 
-				const unsigned long delay = (dl > now) ? (unsigned long)(dl - now) : 500;
-				clockShouldBe = now + (int64_t)delay;
+				const unsigned long delay = (dl > now) ? (unsigned long)(dl - now) : 100;
+				clockShouldBe = now + (uint64_t)delay;
 				_phy.poll(delay);
 			}
-		}
-		catch (std::exception& e) {
+		} catch (std::exception &exc) {
 			Mutex::Lock _l(_termReason_m);
 			_termReason = ONE_UNRECOVERABLE_ERROR;
-			_fatalErrorMessage = std::string("unexpected exception in main thread: ") + e.what();
-		}
-		catch (int e) {
+			_fatalErrorMessage = exc.what();
+		} catch ( ... ) {
 			Mutex::Lock _l(_termReason_m);
 			_termReason = ONE_UNRECOVERABLE_ERROR;
-			switch (e) {
-				case ZT_EXCEPTION_OUT_OF_BOUNDS: {
-					_fatalErrorMessage = "out of bounds exception";
-					break;
-				}
-				case ZT_EXCEPTION_OUT_OF_MEMORY: {
-					_fatalErrorMessage = "out of memory";
-					break;
-				}
-				case ZT_EXCEPTION_PRIVATE_KEY_REQUIRED: {
-					_fatalErrorMessage = "private key required";
-					break;
-				}
-				case ZT_EXCEPTION_INVALID_ARGUMENT: {
-					_fatalErrorMessage = "invalid argument";
-					break;
-				}
-				case ZT_EXCEPTION_INVALID_IDENTITY: {
-					_fatalErrorMessage = "invalid identity loaded from disk. Please remove identity.public and identity.secret from " + _homePath + " and try again";
-					break;
-				}
-				case ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_TYPE: {
-					_fatalErrorMessage = "invalid serialized data: invalid type";
-					break;
-				}
-				case ZT_EXCEPTION_INVALID_SERIALIZED_DATA_OVERFLOW: {
-					_fatalErrorMessage = "invalid serialized data: overflow";
-					break;
-				}
-				case ZT_EXCEPTION_INVALID_SERIALIZED_DATA_INVALID_CRYPTOGRAPHIC_TOKEN: {
-					_fatalErrorMessage = "invalid serialized data: invalid cryptographic token";
-					break;
-				}
-				case ZT_EXCEPTION_INVALID_SERIALIZED_DATA_BAD_ENCODING: {
-					_fatalErrorMessage = "invalid serialized data: bad encoding";
-					break;
-				}
-				default: {
-					_fatalErrorMessage = "unexpected exception code: " + std::to_string(e);
-					break;
-				}
-			}
-		}
-		catch (...) {
-			Mutex::Lock _l(_termReason_m);
-			_termReason = ONE_UNRECOVERABLE_ERROR;
-			_fatalErrorMessage = "unexpected exception in main thread: unknown exception";
+			_fatalErrorMessage = "unexpected exception in main thread";
 		}
 
 		try {
-			Mutex::Lock _l(_tcpConnections_m);
-			while (! _tcpConnections.empty())
+			while (!_tcpConnections.empty())
 				_phy.close((*_tcpConnections.begin())->sock);
-		}
-		catch (...) {
-		}
+		} catch ( ... ) {}
 
 		{
-			Mutex::Lock _l(_nets_m);
-			_nets.clear();
+			Mutex::Lock _l(_taps_m);
+			for(std::map< uint64_t,EthernetTap * >::iterator t(_taps.begin());t!=_taps.end();++t)
+				delete t->second;
+			_taps.clear();
 		}
 
-		delete _updater;
-		_updater = (SoftwareUpdater*)0;
+		delete _controlPlane;
+		_controlPlane = (ControlPlane *)0;
 		delete _node;
-		_node = (Node*)0;
+		_node = (Node *)0;
 
 		return _termReason;
 	}
 
-	void readLocalSettings()
-	{
-		// Read local configuration
-		std::map<InetAddress, ZT_PhysicalPathConfiguration> ppc;
-
-		// LEGACY: support old "trustedpaths" flat file
-		FILE* trustpaths = fopen((_homePath + ZT_PATH_SEPARATOR_S "trustedpaths").c_str(), "r");
-		if (trustpaths) {
-			fprintf(stderr, "WARNING: 'trustedpaths' flat file format is deprecated in favor of path definitions in local.conf" ZT_EOL_S);
-			char buf[1024];
-			while (fgets(buf, sizeof(buf), trustpaths)) {
-				int fno = 0;
-				char* saveptr = (char*)0;
-				uint64_t trustedPathId = 0;
-				InetAddress trustedPathNetwork;
-				for (char* f = Utils::stok(buf, "=\r\n \t", &saveptr); (f); f = Utils::stok((char*)0, "=\r\n \t", &saveptr)) {
-					if (fno == 0) {
-						trustedPathId = Utils::hexStrToU64(f);
-					}
-					else if (fno == 1) {
-						trustedPathNetwork = InetAddress(f);
-					}
-					else
-						break;
-					++fno;
-				}
-				if ((trustedPathId != 0) && ((trustedPathNetwork.ss_family == AF_INET) || (trustedPathNetwork.ss_family == AF_INET6)) && (trustedPathNetwork.netmaskBits() > 0)) {
-					ppc[trustedPathNetwork].trustedPathId = trustedPathId;
-					ppc[trustedPathNetwork].mtu = 0;   // use default
-				}
-			}
-			fclose(trustpaths);
-		}
-
-		// Read local config file
-		Mutex::Lock _l2(_localConfig_m);
-		std::string lcbuf;
-		if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S "local.conf").c_str(), lcbuf)) {
-			if (lcbuf.length() > 0) {
-				try {
-					_localConfig = OSUtils::jsonParse(lcbuf);
-					if (! _localConfig.is_object()) {
-						fprintf(stderr, "ERROR: unable to parse local.conf (root element is not a JSON object)" ZT_EOL_S);
-						exit(1);
-					}
-				}
-				catch (...) {
-					fprintf(stderr, "ERROR: unable to parse local.conf (invalid JSON)" ZT_EOL_S);
-					exit(1);
-				}
-			}
-		}
-
-		// Make a copy so lookups don't modify in place;
-		json lc(_localConfig);
-
-		// Get any trusted paths in local.conf (we'll parse the rest of physical[] elsewhere)
-		json& physical = lc["physical"];
-		if (physical.is_object()) {
-			for (json::iterator phy(physical.begin()); phy != physical.end(); ++phy) {
-				InetAddress net(OSUtils::jsonString(phy.key(), "").c_str());
-				if (net) {
-					if (phy.value().is_object()) {
-						uint64_t tpid;
-						if ((tpid = OSUtils::jsonInt(phy.value()["trustedPathId"], 0ULL)) != 0ULL) {
-							if ((net.ss_family == AF_INET) || (net.ss_family == AF_INET6))
-								ppc[net].trustedPathId = tpid;
-						}
-						ppc[net].mtu = (int)OSUtils::jsonInt(phy.value()["mtu"], 0ULL);	  // 0 means use default
-					}
-				}
-			}
-		}
-
-		json& settings = lc["settings"];
-		if (settings.is_object()) {
-			// Allow controller DB path to be put somewhere else
-			const std::string cdbp(OSUtils::jsonString(settings["controllerDbPath"], ""));
-			if (cdbp.length() > 0)
-				_controllerDbPath = cdbp;
-
-			_ssoRedirectURL = OSUtils::jsonString(settings["ssoRedirectURL"], "");
-
-#ifdef ZT_CONTROLLER_USE_LIBPQ
-			// TODO:  Redis config
-			json& redis = settings["redis"];
-			if (redis.is_object() && _rc == NULL) {
-				_rc = new RedisConfig;
-				_rc->hostname = OSUtils::jsonString(redis["hostname"], "");
-				_rc->port = OSUtils::jsonInt(redis["port"], 0);
-				_rc->password = OSUtils::jsonString(redis["password"], "");
-				_rc->clusterMode = OSUtils::jsonBool(redis["clusterMode"], false);
-			}
-#endif
-
-#ifdef ZT_OPENTELEMETRY_ENABLED
-			json& otel = settings["otel"];
-			if (otel.is_object()) {
-				_exporterEndpoint = OSUtils::jsonString(otel["exporterEndpoint"], "");
-				_exporterSampleRate = OSUtils::jsonDouble(otel["exporterSampleRate"], 1.0f);
-				if (_exporterEndpoint.empty()) {
-					fprintf(stderr, "WARNING: OpenTelemetry exporter endpoint is not set. Traces will not be exported." ZT_EOL_S);
-				}
-				if (_exporterSampleRate <= 0.0) {
-					fprintf(stderr, "WARNING: OpenTelemetry exporter sample rate is not set or invalid. Traces will not be exported." ZT_EOL_S);
-				}
-			}
-			else {
-				fprintf(stderr, "WARNING: OpenTelemetry exporter settings are not set. Traces will not be exported." ZT_EOL_S);
-			}
-#else
-			fprintf(stderr, "WARNING: OpenTelemetry support is not enabled. Traces will not be exported." ZT_EOL_S);
-#endif
-
-			// Bind to wildcard instead of to specific interfaces (disables full tunnel capability)
-			json& bind = settings["bind"];
-			if (bind.is_array()) {
-				for (unsigned long i = 0; i < bind.size(); ++i) {
-					const std::string ips(OSUtils::jsonString(bind[i], ""));
-					if (ips.length() > 0) {
-						InetAddress ip(ips.c_str());
-						if ((ip.ss_family == AF_INET) || (ip.ss_family == AF_INET6))
-							explicitBind.push_back(ip);
-					}
-				}
-			}
-		}
-
-		// Set trusted paths if there are any
-		if (! ppc.empty()) {
-			for (std::map<InetAddress, ZT_PhysicalPathConfiguration>::iterator i(ppc.begin()); i != ppc.end(); ++i)
-				_node->setPhysicalPathConfiguration(reinterpret_cast<const struct sockaddr_storage*>(&(i->first)), &(i->second));
-		}
-	}
-
 	virtual ReasonForTermination reasonForTermination() const
 	{
 		Mutex::Lock _l(_termReason_m);
@@ -1679,1586 +928,56 @@ class OneServiceImpl : public OneService {
 
 	virtual std::string portDeviceName(uint64_t nwid) const
 	{
-		Mutex::Lock _l(_nets_m);
-		std::map<uint64_t, NetworkState>::const_iterator n(_nets.find(nwid));
-		if ((n != _nets.end()) && (n->second.tap()))
-			return n->second.tap()->deviceName();
-		else
-			return std::string();
+		Mutex::Lock _l(_taps_m);
+		std::map< uint64_t,EthernetTap * >::const_iterator t(_taps.find(nwid));
+		if (t != _taps.end())
+			return t->second->deviceName();
+		return std::string();
 	}
 
-#ifdef ZT_SDK
-	virtual std::string givenHomePath()
+	virtual bool tcpFallbackActive() const
 	{
-		return _homePath;
+		return (_tcpFallbackTunnel != (TcpConnection *)0);
 	}
 
-	void getRoutes(uint64_t nwid, void* routeArray, unsigned int* numRoutes)
-	{
-		Mutex::Lock _l(_nets_m);
-		NetworkState& n = _nets[nwid];
-		*numRoutes = *numRoutes < n.config().routeCount ? *numRoutes : n.config().routeCount;
-		for (unsigned int i = 0; i < *numRoutes; i++) {
-			ZT_VirtualNetworkRoute* vnr = (ZT_VirtualNetworkRoute*)routeArray;
-			memcpy(&vnr[i], &(n.config().routes[i]), sizeof(ZT_VirtualNetworkRoute));
-		}
-	}
-
-	virtual Node* getNode()
-	{
-		return _node;
-	}
-#endif	 // ZT_SDK
-
 	virtual void terminate()
 	{
 		_run_m.lock();
-
 		_run = false;
 		_run_m.unlock();
 		_phy.whack();
 	}
 
-	virtual bool getNetworkSettings(const uint64_t nwid, NetworkSettings& settings) const
+	// Begin private implementation methods
+
+	inline void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *localAddr,const struct sockaddr *from,void *data,unsigned long len)
 	{
-		Mutex::Lock _l(_nets_m);
-		std::map<uint64_t, NetworkState>::const_iterator n(_nets.find(nwid));
-		if (n == _nets.end())
-			return false;
-		settings = n->second.settings();
-		return true;
-	}
-
-	virtual bool setNetworkSettings(const uint64_t nwid, const NetworkSettings& settings)
-	{
-		char nlcpath[4096];
-		OSUtils::ztsnprintf(nlcpath, sizeof(nlcpath), "%s" ZT_PATH_SEPARATOR_S "%.16llx.local.conf", _networksPath.c_str(), nwid);
-		FILE* out = fopen(nlcpath, "w");
-		if (out) {
-			fprintf(out, "allowManaged=%d\n", (int)settings.allowManaged);
-			fprintf(out, "allowGlobal=%d\n", (int)settings.allowGlobal);
-			fprintf(out, "allowDefault=%d\n", (int)settings.allowDefault);
-			fprintf(out, "allowDNS=%d\n", (int)settings.allowDNS);
-			fclose(out);
-		}
-
-		return true;
-	}
-
-	// Internal HTTP Control Plane
-	void startHTTPControlPlane()
-	{
-		// control plane endpoints
-		std::string bondShowPath = "/bond/show/([0-9a-fA-F]{10})";
-		std::string bondRotatePath = "/bond/rotate/([0-9a-fA-F]{10})";
-		std::string setBondMtuPath = "/bond/setmtu/([0-9]{1,6})/([a-zA-Z0-9_]{1,16})/([0-9a-fA-F\\.\\:]{1,39})";
-		std::string configPath = "/config";
-		std::string configPostPath = "/config/settings";
-		std::string healthPath = "/health";
-		std::string moonListPath = "/moon";
-		std::string moonPath = "/moon/([0-9a-fA-F]{10})";
-		std::string networkListPath = "/network";
-		std::string networkPath = "/network/([0-9a-fA-F]{16})";
-		std::string peerListPath = "/peer";
-		std::string peerPath = "/peer/([0-9a-fA-F]{10})";
-		std::string statusPath = "/status";
-		std::string metricsPath = "/metrics";
-
-		std::vector<std::string> noAuthEndpoints { "/sso", "/health" };
-
-		auto setContent = [=](const httplib::Request& req, httplib::Response& res, std::string content) {
-			if (req.has_param("jsonp")) {
-				if (content.length() > 0) {
-					res.set_content(req.get_param_value("jsonp") + "(" + content + ");", "application/javascript");
-				}
-				else {
-					res.set_content(req.get_param_value("jsonp") + "(null);", "application/javascript");
-				}
-			}
-			else {
-				if (content.length() > 0) {
-					res.set_content(content, "application/json");
-				}
-				else {
-					res.set_content("{}", "application/json");
-				}
-			}
-		};
-
-		//
-		// static file server for app ui'
-		//
-		if (_enableWebServer) {
-			static std::string appUiPath = "/app";
-			static char appUiDir[16384];
-			sprintf(appUiDir, "%s%s", _homePath.c_str(), appUiPath.c_str());
-
-			auto ret = _controlPlane.set_mount_point(appUiPath, appUiDir);
-			_controlPlaneV6.set_mount_point(appUiPath, appUiDir);
-			if (! ret) {
-				fprintf(stderr, "Mounting app directory failed. Creating it. Path: %s - Dir: %s\n", appUiPath.c_str(), appUiDir);
-				if (! OSUtils::mkdir(appUiDir)) {
-					fprintf(stderr, "Could not create app directory either. Path: %s - Dir: %s\n", appUiPath.c_str(), appUiDir);
-				}
-				else {
-					ret = _controlPlane.set_mount_point(appUiPath, appUiDir);
-					_controlPlaneV6.set_mount_point(appUiPath, appUiDir);
-					if (! ret) {
-						fprintf(stderr, "Really could not create and mount directory. Path: %s - Dir: %s\nWeb apps won't work.\n", appUiPath.c_str(), appUiDir);
-					}
-				}
-			}
-
-			if (ret) {
-				// fallback to /index.html for paths that don't exist for SPAs
-				auto indexFallbackGet = [](const httplib::Request& req, httplib::Response& res) {
-					// fprintf(stderr, "fallback \n");
-
-					auto match = req.matches[1];
-					if (match.matched) {
-						// fallback
-						char indexHtmlPath[16384];
-						sprintf(indexHtmlPath, "%s/%s/%s", appUiDir, match.str().c_str(), "index.html");
-						// fprintf(stderr, "fallback path %s\n", indexHtmlPath);
-
-						std::string indexHtml;
-
-						if (! OSUtils::readFile(indexHtmlPath, indexHtml)) {
-							res.status = 500;
-							return;
-						}
-
-						res.set_content(indexHtml.c_str(), "text/html");
-					}
-					else {
-						res.status = 500;
-						return;
-					}
-				};
-
-				auto slashRedirect = [](const httplib::Request& req, httplib::Response& res) {
-					// fprintf(stderr, "redirect \n");
-
-					// add .html
-					std::string htmlFile;
-					char htmlPath[16384];
-					sprintf(htmlPath, "%s%s%s", appUiDir, (req.path).substr(appUiPath.length()).c_str(), ".html");
-					// fprintf(stderr, "path: %s\n", htmlPath);
-					if (OSUtils::readFile(htmlPath, htmlFile)) {
-						res.set_content(htmlFile.c_str(), "text/html");
-						return;
-					}
-					else {
-						res.status = 301;
-						res.set_header("location", req.path + "/");
-					}
-				};
-
-				// auto missingAssetGet = [&, setContent](const httplib::Request &req, httplib::Response &res) {
-				// 	fprintf(stderr, "missing \n");
-				// 	res.status = 404;
-				// 	std::string html = "oops";
-				// 	res.set_content(html, "text/plain");
-				// 	res.set_header("Content-Type", "text/plain");
-				// 	return;
-				// };
-
-				// auto fix no trailing slash by adding .html or redirecting to path/
-				_controlPlane.Get(appUiPath + R"((/[\w|-]+)+$)", slashRedirect);
-				_controlPlaneV6.Get(appUiPath + R"((/[\w|-]+)+$)", slashRedirect);
-
-				// // 404 missing assets for *.ext paths
-				//   s.Get(appUiPath + R"(/\.\w+$)", missingAssetGet);
-				// sv6.Get(appUiPath + R"(/\.\w+$)", missingAssetGet);
-
-				// fallback to index.html for unknown paths/files
-				_controlPlane.Get(appUiPath + R"((/[\w|-]+)(/[\w|-]+)*/$)", indexFallbackGet);
-				_controlPlaneV6.Get(appUiPath + R"((/[\w|-]+)(/[\w|-]+)*/$)", indexFallbackGet);
-			}
-		}
-
-		auto authCheck = [=](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::authCheck");
-			auto scope = tracer->WithActiveSpan(span);
-
-			if (req.path == "/metrics") {
-				auto mspan = tracer->StartSpan("http_control_plane::metricsAuth");
-				auto mscope = tracer->WithActiveSpan(mspan);
-				if (req.has_header("x-zt1-auth")) {
-					std::string token = req.get_header_value("x-zt1-auth");
-					if (token == _metricsToken || token == _authToken) {
-						return httplib::Server::HandlerResponse::Unhandled;
-					}
-				}
-				else if (req.has_param("auth")) {
-					std::string token = req.get_param_value("auth");
-					if (token == _metricsToken || token == _authToken) {
-						return httplib::Server::HandlerResponse::Unhandled;
-					}
-				}
-				else if (req.has_header("authorization")) {
-					std::string auth = req.get_header_value("authorization");
-					if (bearerTokenValid(auth, _metricsToken) || bearerTokenValid(auth, _authToken)) {
-						return httplib::Server::HandlerResponse::Unhandled;
-					}
-				}
-
-				span->SetAttribute("auth", "failed");
-				setContent(req, res, "{}");
-				res.status = 401;
-				return httplib::Server::HandlerResponse::Handled;
-			}
-			else {
-				std::string r = req.remote_addr;
-				InetAddress remoteAddr(r.c_str());
-
-				bool ipAllowed = false;
-				bool isAuth = false;
-				// If localhost, allow
-				if (remoteAddr.ipScope() == InetAddress::IP_SCOPE_LOOPBACK) {
-					ipAllowed = true;
-				}
-
-				if (! ipAllowed) {
-					for (auto i = _allowManagementFrom.begin(); i != _allowManagementFrom.end(); ++i) {
-						if (i->containsAddress(remoteAddr)) {
-							ipAllowed = true;
-							break;
-						}
-					}
-				}
-
-				if (ipAllowed) {
-					// auto-pass endpoints in `noAuthEndpoints`.  No auth token required
-					if (std::find(noAuthEndpoints.begin(), noAuthEndpoints.end(), req.path) != noAuthEndpoints.end()) {
-						isAuth = true;
-					}
-
-					// Web Apps base path
-					if (req.path.rfind("/app", 0) == 0) {	// starts with /app
-						isAuth = true;
-					}
-
-					if (! isAuth) {
-						// check auth token
-						if (req.has_header("x-zt1-auth")) {
-							std::string token = req.get_header_value("x-zt1-auth");
-							if (token == _authToken) {
-								isAuth = true;
-							}
-						}
-						else if (req.has_param("auth")) {
-							std::string token = req.get_param_value("auth");
-							if (token == _authToken) {
-								isAuth = true;
-							}
-						}
-						else if (req.has_header("authorization")) {
-							std::string auth = req.get_header_value("authorization");
-							isAuth = bearerTokenValid(auth, _authToken);
-						}
-					}
-				}
-
-				span->SetAttribute("ipAllowed", ipAllowed);
-
-				if (ipAllowed && isAuth) {
-					return httplib::Server::HandlerResponse::Unhandled;
-				}
-
-				span->SetAttribute("auth", "failed");
-				setContent(req, res, "{}");
-				res.status = 401;
-				return httplib::Server::HandlerResponse::Handled;
-			}
-		};
-
-		auto bondShow = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::bondShow");
-			auto scope = tracer->WithActiveSpan(span);
-
-			if (! _node->bondController()->inUse()) {
-				setContent(req, res, "");
-				res.status = 400;
-				return;
-			}
-
-			ZT_PeerList* pl = _node->peers();
-			if (pl) {
-				bool foundBond = false;
-				auto id = req.matches[1];
-				auto out = json::object();
-				uint64_t wantp = Utils::hexStrToU64(id.str().c_str());
-				for (unsigned long i = 0; i < pl->peerCount; ++i) {
-					if (pl->peers[i].address == wantp) {
-						SharedPtr<Bond> bond = _node->bondController()->getBondByPeerId(wantp);
-						if (bond) {
-							_peerToJson(out, &(pl->peers[i]), bond, (_tcpFallbackTunnel != (TcpConnection*)0));
-							setContent(req, res, out.dump());
-							foundBond = true;
-						}
-						else {
-							setContent(req, res, "");
-							res.status = 400;
-						}
-						break;
-					}
-				}
-				if (! foundBond) {
-					setContent(req, res, "");
-					res.status = 400;
-				}
-			}
-			_node->freeQueryResult((void*)pl);
-		};
-		_controlPlane.Get(bondShowPath, bondShow);
-		_controlPlaneV6.Get(bondShowPath, bondShow);
-
-		auto bondRotate = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::bondRotate");
-			auto scope = tracer->WithActiveSpan(span);
-
-			if (! _node->bondController()->inUse()) {
-				setContent(req, res, "");
-				res.status = 400;
-				return;
-			}
-			auto bondID = req.matches[1];
-			uint64_t id = Utils::hexStrToU64(bondID.str().c_str());
-			SharedPtr<Bond> bond = _node->bondController()->getBondByPeerId(id);
-			if (bond) {
-				if (bond->abForciblyRotateLink()) {
-					res.status = 200;
-				}
-				else {
-					res.status = 400;
-				}
-			}
-			else {
-				fprintf(stderr, "unable to find bond to peer %llx\n", (unsigned long long)id);
-				res.status = 400;
-			}
-			setContent(req, res, "{}");
-		};
-		_controlPlane.Post(bondRotatePath, bondRotate);
-		_controlPlane.Put(bondRotatePath, bondRotate);
-		_controlPlaneV6.Post(bondRotatePath, bondRotate);
-		_controlPlaneV6.Put(bondRotatePath, bondRotate);
-
-		auto setMtu = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::setMtu");
-			auto scope = tracer->WithActiveSpan(span);
-
-			if (! _node->bondController()->inUse()) {
-				setContent(req, res, "Bonding layer isn't active yet");
-				res.status = 400;
-				return;
-			}
-			uint32_t mtu = atoi(req.matches[1].str().c_str());
-			if (mtu < 68 || mtu > 65535) {
-				setContent(req, res, "Specified MTU is not reasonable");
-				res.status = 400;
-				return;
-			}
-			res.status = _node->bondController()->setAllMtuByTuple(mtu, req.matches[2].str().c_str(), req.matches[3].str().c_str()) ? 200 : 400;
-			if (res.status == 400) {
-				setContent(req, res, "Unable to find specified link");
-				return;
-			}
-			setContent(req, res, "{}");
-		};
-		_controlPlane.Post(setBondMtuPath, setMtu);
-		_controlPlane.Put(setBondMtuPath, setMtu);
-		_controlPlaneV6.Post(setBondMtuPath, setMtu);
-		_controlPlaneV6.Put(setBondMtuPath, setMtu);
-
-		auto getConfig = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::getConfig");
-			auto scope = tracer->WithActiveSpan(span);
-
-			std::string config;
-			{
-				Mutex::Lock lc(_localConfig_m);
-				config = _localConfig.dump();
-			}
-			if (config == "null") {
-				config = "{}";
-			}
-			setContent(req, res, config);
-		};
-		_controlPlane.Get(configPath, getConfig);
-		_controlPlaneV6.Get(configPath, getConfig);
-
-		auto configPost = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::configPost");
-			auto scope = tracer->WithActiveSpan(span);
-
-			json j(OSUtils::jsonParse(req.body));
-			if (j.is_object()) {
-				Mutex::Lock lcl(_localConfig_m);
-				json lc(_localConfig);
-				for (json::const_iterator s(j.begin()); s != j.end(); ++s) {
-					lc["settings"][s.key()] = s.value();
-				}
-				std::string lcStr = OSUtils::jsonDump(lc, 4);
-				if (OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S "local.conf").c_str(), lcStr)) {
-					_localConfig = lc;
-				}
-			}
-			setContent(req, res, "{}");
-		};
-		_controlPlane.Post(configPostPath, configPost);
-		_controlPlane.Put(configPostPath, configPost);
-		_controlPlaneV6.Post(configPostPath, configPost);
-		_controlPlaneV6.Put(configPostPath, configPost);
-
-		auto healthGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::healthGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			json out = json::object();
-
-			char tmp[256];
-
-			ZT_NodeStatus status;
-			_node->status(&status);
-
-			out["online"] = (bool)(status.online != 0);
-			out["versionMajor"] = ZEROTIER_ONE_VERSION_MAJOR;
-			out["versionMinor"] = ZEROTIER_ONE_VERSION_MINOR;
-			out["versionRev"] = ZEROTIER_ONE_VERSION_REVISION;
-			out["versionBuild"] = ZEROTIER_ONE_VERSION_BUILD;
-			OSUtils::ztsnprintf(tmp, sizeof(tmp), "%d.%d.%d", ZEROTIER_ONE_VERSION_MAJOR, ZEROTIER_ONE_VERSION_MINOR, ZEROTIER_ONE_VERSION_REVISION);
-			out["version"] = tmp;
-			out["clock"] = OSUtils::now();
-
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Get(healthPath, healthGet);
-		_controlPlaneV6.Get(healthPath, healthGet);
-
-		auto moonListGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::moonListGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			std::vector<World> moons(_node->moons());
-
-			auto out = json::array();
-			for (auto i = moons.begin(); i != moons.end(); ++i) {
-				json mj;
-				_moonToJson(mj, *i);
-				out.push_back(mj);
-			}
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Get(moonListPath, moonListGet);
-		_controlPlaneV6.Get(moonListPath, moonListGet);
-
-		auto moonGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::moonGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			std::vector<World> moons(_node->moons());
-			auto input = req.matches[1];
-			auto out = json::object();
-			const uint64_t id = Utils::hexStrToU64(input.str().c_str());
-			for (auto i = moons.begin(); i != moons.end(); ++i) {
-				if (i->id() == id) {
-					_moonToJson(out, *i);
-					break;
-				}
-			}
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Get(moonPath, moonGet);
-		_controlPlaneV6.Get(moonPath, moonGet);
-
-		auto moonPost = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::moonPost");
-			auto scope = tracer->WithActiveSpan(span);
-
-			auto input = req.matches[1];
-			uint64_t seed = 0;
-			try {
-				json j(OSUtils::jsonParse(req.body));
-				if (j.is_object()) {
-					seed = Utils::hexStrToU64(OSUtils::jsonString(j["seed"], "0").c_str());
-				}
-			}
-			catch (...) {
-				// discard invalid JSON
-			}
-
-			std::vector<World> moons(_node->moons());
-			const uint64_t id = Utils::hexStrToU64(input.str().c_str());
-			bool found = false;
-			auto out = json::object();
-			for (std::vector<World>::const_iterator m(moons.begin()); m != moons.end(); ++m) {
-				if (m->id() == id) {
-					_moonToJson(out, *m);
-					found = true;
-					break;
-				}
-			}
-
-			if (! found && seed != 0) {
-				char tmp[64];
-				OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.16llx", id);
-				out["id"] = tmp;
-				out["roots"] = json::array();
-				out["timestamp"] = 0;
-				out["signature"] = json();
-				out["updatesMustBeSignedBy"] = json();
-				out["waiting"] = true;
-				_node->orbit((void*)0, id, seed);
-			}
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Post(moonPath, moonPost);
-		_controlPlane.Put(moonPath, moonPost);
-		_controlPlaneV6.Post(moonPath, moonPost);
-		_controlPlaneV6.Put(moonPath, moonPost);
-
-		auto moonDelete = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::moonDelete");
-			auto scope = tracer->WithActiveSpan(span);
-
-			auto input = req.matches[1];
-			uint64_t id = Utils::hexStrToU64(input.str().c_str());
-			auto out = json::object();
-			_node->deorbit((void*)0, id);
-			out["result"] = true;
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Delete(moonPath, moonDelete);
-
-		auto networkListGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::networkListGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			Mutex::Lock _l(_nets_m);
-			auto out = json::array();
-
-			for (auto it = _nets.begin(); it != _nets.end(); ++it) {
-				NetworkState& ns = it->second;
-				json nj;
-				_networkToJson(nj, ns);
-				out.push_back(nj);
-			}
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Get(networkListPath, networkListGet);
-		_controlPlaneV6.Get(networkListPath, networkListGet);
-
-		auto networkGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::networkGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			Mutex::Lock _l(_nets_m);
-
-			auto input = req.matches[1];
-			const uint64_t nwid = Utils::hexStrToU64(input.str().c_str());
-			if (_nets.find(nwid) != _nets.end()) {
-				auto out = json::object();
-				NetworkState& ns = _nets[nwid];
-				_networkToJson(out, ns);
-				setContent(req, res, out.dump());
-				return;
-			}
-			setContent(req, res, "");
-			res.status = 404;
-		};
-		_controlPlane.Get(networkPath, networkGet);
-		_controlPlaneV6.Get(networkPath, networkGet);
-
-		auto networkPost = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::networkPost");
-			auto scope = tracer->WithActiveSpan(span);
-
-			auto input = req.matches[1];
-			uint64_t wantnw = Utils::hexStrToU64(input.str().c_str());
-			_node->join(wantnw, (void*)0, (void*)0);
-			auto out = json::object();
-			Mutex::Lock l(_nets_m);
-			bool allowDefault = false;
-
-			if (! _nets.empty()) {
-				NetworkState& ns = _nets[wantnw];
-				try {
-					json j(OSUtils::jsonParse(req.body));
-
-					json& allowManaged = j["allowManaged"];
-					if (allowManaged.is_boolean()) {
-						ns.setAllowManaged((bool)allowManaged);
-					}
-					json& allowGlobal = j["allowGlobal"];
-					if (allowGlobal.is_boolean()) {
-						ns.setAllowGlobal((bool)allowGlobal);
-					}
-					json& _allowDefault = j["allowDefault"];
-					if (_allowDefault.is_boolean()) {
-						allowDefault = _allowDefault;
-						ns.setAllowDefault((bool)allowDefault);
-					}
-					json& allowDNS = j["allowDNS"];
-					if (allowDNS.is_boolean()) {
-						ns.setAllowDNS((bool)allowDNS);
-					}
-				}
-				catch (...) {
-					// discard invalid JSON
-				}
-				setNetworkSettings(wantnw, ns.settings());
-				if (ns.tap()) {
-					syncManagedStuff(ns, true, true, true);
-				}
-
-				_networkToJson(out, ns);
-			}
-#ifdef __FreeBSD__
-			if (! ! allowDefault) {
-				res.status = 400;
-				setContent(req, res, "Allow Default does not work properly on FreeBSD. See #580");
-			}
-			else {
-				setContent(req, res, out.dump());
-			}
-#else
-			setContent(req, res, out.dump());
-#endif
-		};
-		_controlPlane.Post(networkPath, networkPost);
-		_controlPlane.Put(networkPath, networkPost);
-		_controlPlaneV6.Post(networkPath, networkPost);
-		_controlPlaneV6.Put(networkPath, networkPost);
-
-		auto networkDelete = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::networkDelete");
-			auto scope = tracer->WithActiveSpan(span);
-
-			auto input = req.matches[1];
-			auto out = json::object();
-			ZT_VirtualNetworkList* nws = _node->networks();
-			uint64_t wantnw = Utils::hexStrToU64(input.str().c_str());
-			for (unsigned long i = 0; i < nws->networkCount; ++i) {
-				if (nws->networks[i].nwid == wantnw) {
-					_node->leave(wantnw, (void**)0, (void*)0);
-					out["result"] = true;
-				}
-			}
-			_node->freeQueryResult((void*)nws);
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Delete(networkPath, networkDelete);
-		_controlPlaneV6.Delete(networkPath, networkDelete);
-
-		auto peerListGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::peerListGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			ZT_PeerList* pl = _node->peers();
-			auto out = nlohmann::json::array();
-
-			for (unsigned long i = 0; i < pl->peerCount; ++i) {
-				nlohmann::json pj;
-				SharedPtr<Bond> bond = SharedPtr<Bond>();
-				if (pl->peers[i].isBonded) {
-					const uint64_t id = pl->peers[i].address;
-					bond = _node->bondController()->getBondByPeerId(id);
-				}
-				_peerToJson(pj, &(pl->peers[i]), bond, (_tcpFallbackTunnel != (TcpConnection*)0));
-				out.push_back(pj);
-			}
-			_node->freeQueryResult((void*)pl);
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Get(peerListPath, peerListGet);
-		_controlPlaneV6.Get(peerListPath, peerListGet);
-
-		auto peerGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::peerGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			ZT_PeerList* pl = _node->peers();
-
-			auto input = req.matches[1];
-			uint64_t wantp = Utils::hexStrToU64(input.str().c_str());
-			auto out = json::object();
-			for (unsigned long i = 0; i < pl->peerCount; ++i) {
-				if (pl->peers[i].address == wantp) {
-					SharedPtr<Bond> bond = SharedPtr<Bond>();
-					if (pl->peers[i].isBonded) {
-						bond = _node->bondController()->getBondByPeerId(wantp);
-					}
-					_peerToJson(out, &(pl->peers[i]), bond, (_tcpFallbackTunnel != (TcpConnection*)0));
-					break;
-				}
-			}
-			_node->freeQueryResult((void*)pl);
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Get(peerPath, peerGet);
-		_controlPlaneV6.Get(peerPath, peerGet);
-
-		auto statusGet = [&, setContent](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::statusGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			ZT_NodeStatus status;
-			_node->status(&status);
-
-			auto out = json::object();
-			char tmp[256] = {};
-
-			OSUtils::ztsnprintf(tmp, sizeof(tmp), "%.10llx", status.address);
-			out["address"] = tmp;
-			out["publicIdentity"] = status.publicIdentity;
-			out["online"] = (bool)(status.online != 0);
-			out["tcpFallbackActive"] = (_tcpFallbackTunnel != (TcpConnection*)0);
-			out["versionMajor"] = ZEROTIER_ONE_VERSION_MAJOR;
-			out["versionMinor"] = ZEROTIER_ONE_VERSION_MINOR;
-			out["versionRev"] = ZEROTIER_ONE_VERSION_REVISION;
-			out["versionBuild"] = ZEROTIER_ONE_VERSION_BUILD;
-			OSUtils::ztsnprintf(tmp, sizeof(tmp), "%d.%d.%d", ZEROTIER_ONE_VERSION_MAJOR, ZEROTIER_ONE_VERSION_MINOR, ZEROTIER_ONE_VERSION_REVISION);
-			out["version"] = tmp;
-			out["clock"] = OSUtils::now();
-
-			{
-				Mutex::Lock _l(_localConfig_m);
-				out["config"] = _localConfig;
-			}
-			json& settings = out["config"]["settings"];
-			settings["allowTcpFallbackRelay"] = OSUtils::jsonBool(settings["allowTcpFallbackRelay"], _allowTcpFallbackRelay);
-			settings["forceTcpRelay"] = OSUtils::jsonBool(settings["forceTcpRelay"], _forceTcpRelay);
-			settings["primaryPort"] = OSUtils::jsonInt(settings["primaryPort"], (uint64_t)_primaryPort) & 0xffff;
-			settings["secondaryPort"] = OSUtils::jsonInt(settings["secondaryPort"], (uint64_t)_ports[1]) & 0xffff;
-			settings["tertiaryPort"] = OSUtils::jsonInt(settings["tertiaryPort"], (uint64_t)_tertiaryPort) & 0xffff;
-			settings["homeDir"] = _homePath;
-			// Enumerate all local address/port pairs that this node is listening on
-			std::vector<InetAddress> boundAddrs(_binder.allBoundLocalInterfaceAddresses());
-			auto boundAddrArray = json::array();
-			for (int i = 0; i < boundAddrs.size(); i++) {
-				char ipBuf[64] = { 0 };
-				boundAddrs[i].toString(ipBuf);
-				boundAddrArray.push_back(ipBuf);
-			}
-			settings["listeningOn"] = boundAddrArray;
-			// Enumerate all external address/port pairs that are reported for this node
-			std::vector<InetAddress> surfaceAddrs = _node->SurfaceAddresses();
-			auto surfaceAddrArray = json::array();
-			for (int i = 0; i < surfaceAddrs.size(); i++) {
-				char ipBuf[64] = { 0 };
-				surfaceAddrs[i].toString(ipBuf);
-				surfaceAddrArray.push_back(ipBuf);
-			}
-			settings["surfaceAddresses"] = surfaceAddrArray;
-
-#ifdef ZT_USE_MINIUPNPC
-			settings["portMappingEnabled"] = OSUtils::jsonBool(settings["portMappingEnabled"], true);
-#else
-			settings["portMappingEnabled"] = false;	  // not supported in build
-#endif
-#ifndef ZT_SDK
-			settings["softwareUpdate"] = OSUtils::jsonString(settings["softwareUpdate"], ZT_SOFTWARE_UPDATE_DEFAULT);
-			settings["softwareUpdateChannel"] = OSUtils::jsonString(settings["softwareUpdateChannel"], ZT_SOFTWARE_UPDATE_DEFAULT_CHANNEL);
-#endif
-			const World planet(_node->planet());
-			out["planetWorldId"] = planet.id();
-			out["planetWorldTimestamp"] = planet.timestamp();
-
-			setContent(req, res, out.dump());
-		};
-		_controlPlane.Get(statusPath, statusGet);
-		_controlPlaneV6.Get(statusPath, statusGet);
-
-#if ZT_SSO_ENABLED
-		std::string ssoPath = "/sso";
-		auto ssoGet = [this](const httplib::Request& req, httplib::Response& res) {
-			std::string htmlTemplatePath = _homePath + ZT_PATH_SEPARATOR + "sso-auth.template.html";
-			std::string htmlTemplate;
-			if (! OSUtils::readFile(htmlTemplatePath.c_str(), htmlTemplate)) {
-				htmlTemplate = ssoResponseTemplate;
-			}
-
-			std::string responseContentType = "text/html";
-			std::string responseBody = "";
-			json outData;
-
-			if (req.has_param("error")) {
-				std::string error = req.get_param_value("error");
-				std::string desc = req.get_param_value("error_description");
-
-				json data;
-				outData["isError"] = true;
-				outData["messageText"] = (std::string("ERROR ") + error + std::string(": ") + desc);
-				responseBody = inja::render(htmlTemplate, outData);
-
-				res.set_content(responseBody, responseContentType);
-				res.status = 500;
-				return;
-			}
-
-			// SSO redirect handling
-			std::string state = req.get_param_value("state");
-			char* nwid = zeroidc::zeroidc_network_id_from_state(state.c_str());
-
-			outData["networkId"] = std::string(nwid);
-
-			const uint64_t id = Utils::hexStrToU64(nwid);
-
-			zeroidc::free_cstr(nwid);
-
-			Mutex::Lock l(_nets_m);
-			if (_nets.find(id) != _nets.end()) {
-				NetworkState& ns = _nets[id];
-				std::string code = req.get_param_value("code");
-				char* ret = ns.doTokenExchange(code.c_str());
-				json ssoResult = json::parse(ret);
-				if (ssoResult.is_object()) {
-					if (ssoResult.contains("errorMessage")) {
-						outData["isError"] = true;
-						outData["messageText"] = ssoResult["errorMessage"];
-						responseBody = inja::render(htmlTemplate, outData);
-						res.set_content(responseBody, responseContentType);
-						res.status = 500;
-					}
-					else {
-						outData["isError"] = false;
-						outData["messageText"] = "Authentication Successful. You may now access the network.";
-						responseBody = inja::render(htmlTemplate, outData);
-						res.set_content(responseBody, responseContentType);
-					}
-				}
-				else {
-					// not an object? We got a problem
-					outData["isError"] = true;
-					outData["messageText"] = "ERROR: Unkown SSO response. Please contact your administrator.";
-					responseBody = inja::render(htmlTemplate, outData);
-					res.set_content(responseBody, responseContentType);
-					res.status = 500;
-				}
-
-				zeroidc::free_cstr(ret);
-			}
-		};
-		_controlPlane.Get(ssoPath, ssoGet);
-		_controlPlaneV6.Get(ssoPath, ssoGet);
-#endif
-		auto metricsGet = [this](const httplib::Request& req, httplib::Response& res) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::metricsGet");
-			auto scope = tracer->WithActiveSpan(span);
-
-			std::string statspath = _homePath + ZT_PATH_SEPARATOR + "metrics.prom";
-			std::string metrics;
-			if (OSUtils::readFile(statspath.c_str(), metrics)) {
-				res.set_content(metrics, "text/plain");
-			}
-			else {
-				res.set_content("{}", "application/json");
-				res.status = 500;
-			}
-		};
-		_controlPlane.Get(metricsPath, metricsGet);
-		_controlPlaneV6.Get(metricsPath, metricsGet);
-
-		auto exceptionHandler = [&, setContent](const httplib::Request& req, httplib::Response& res, std::exception_ptr ep) {
-			auto provider = opentelemetry::trace::Provider::GetTracerProvider();
-			auto tracer = provider->GetTracer("http_control_plane");
-			auto span = tracer->StartSpan("http_control_plane::exceptionHandler");
-			auto scope = tracer->WithActiveSpan(span);
-
-			char buf[1024];
-			auto fmt = "{\"error\": %d, \"description\": \"%s\"}";
-			try {
-				std::rethrow_exception(ep);
-			}
-			catch (std::exception& e) {
-				snprintf(buf, sizeof(buf), fmt, 500, e.what());
-			}
-			catch (...) {
-				snprintf(buf, sizeof(buf), fmt, 500, "Unknown Exception");
-			}
-			setContent(req, res, buf);
-			res.status = 500;
-		};
-		_controlPlane.set_exception_handler(exceptionHandler);
-		_controlPlaneV6.set_exception_handler(exceptionHandler);
-
-		if (_controller) {
-			_controller->configureHTTPControlPlane(_controlPlane, _controlPlaneV6, setContent);
-		}
-
-#ifndef ZT_EXTOSDEP
-		_controlPlane.set_pre_routing_handler(authCheck);
-#endif	 // ZT_EXTOSDEP
-		_controlPlaneV6.set_pre_routing_handler(authCheck);
-
-#if ZT_DEBUG == 1
-		_controlPlane.set_logger([](const httplib::Request& req, const httplib::Response& res) { fprintf(stderr, "%s", http_log(req, res).c_str()); });
-		_controlPlaneV6.set_logger([](const httplib::Request& req, const httplib::Response& res) { fprintf(stderr, "%s", http_log(req, res).c_str()); });
-#endif
-		if (_primaryPort == 0) {
-			fprintf(stderr, "unable to determine local control port");
-			exit(-1);
-		}
-
-#ifndef ZT_EXTOSDEP
-		bool v4controlPlaneBound = false;
-		_controlPlane.set_address_family(AF_INET);
-		if (_controlPlane.bind_to_port("0.0.0.0", _primaryPort)) {
-			_serverThread = std::thread([&] {
-				_serverThreadRunning = true;
-				fprintf(stderr, "Starting Control Plane...\n");
-				if (! _controlPlane.listen_after_bind()) {
-					fprintf(stderr, "Error on listen_after_bind()\n");
-				}
-				fprintf(stderr, "Control Plane Stopped\n");
-				_serverThreadRunning = false;
-			});
-			v4controlPlaneBound = true;
-		}
-		else {
-			fprintf(stderr, "Error binding control plane to 0.0.0.0:%d\n", _primaryPort);
-			v4controlPlaneBound = false;
-		}
-
-		bool v6controlPlaneBound = false;
-		_controlPlaneV6.set_address_family(AF_INET6);
-		if (_controlPlaneV6.bind_to_port("::", _primaryPort)) {
-			_serverThreadV6 = std::thread([&] {
-				_serverThreadRunningV6 = true;
-				fprintf(stderr, "Starting V6 Control Plane...\n");
-				if (! _controlPlaneV6.listen_after_bind()) {
-					fprintf(stderr, "Error on V6 listen_after_bind()\n");
-				}
-				fprintf(stderr, "V6 Control Plane Stopped\n");
-				_serverThreadRunningV6 = false;
-			});
-			v6controlPlaneBound = true;
-		}
-		else {
-			fprintf(stderr, "Error binding control plane to [::]:%d\n", _primaryPort);
-			v6controlPlaneBound = false;
-		}
-
-		if (! v4controlPlaneBound && ! v6controlPlaneBound) {
-			fprintf(stderr, "ERROR: Could not bind control plane. Exiting...\n");
-			exit(-1);
-		}
-#endif	 // ZT_EXTOSDEP
-	}
-
-	// Must be called after _localConfig is read or modified
-	void applyLocalConfig()
-	{
-		Mutex::Lock _l(_localConfig_m);
-		json lc(_localConfig);
-
-		_v4Hints.clear();
-		_v6Hints.clear();
-		_v4Blacklists.clear();
-		_v6Blacklists.clear();
-		json& virt = lc["virtual"];
-		if (virt.is_object()) {
-			for (json::iterator v(virt.begin()); v != virt.end(); ++v) {
-				const std::string nstr = v.key();
-				if ((nstr.length() == ZT_ADDRESS_LENGTH_HEX) && (v.value().is_object())) {
-					const Address ztaddr(Utils::hexStrToU64(nstr.c_str()));
-					if (ztaddr) {
-						const uint64_t ztaddr2 = ztaddr.toInt();
-						std::vector<InetAddress>& v4h = _v4Hints[ztaddr2];
-						std::vector<InetAddress>& v6h = _v6Hints[ztaddr2];
-						std::vector<InetAddress>& v4b = _v4Blacklists[ztaddr2];
-						std::vector<InetAddress>& v6b = _v6Blacklists[ztaddr2];
-
-						json& tryAddrs = v.value()["try"];
-						if (tryAddrs.is_array()) {
-							for (unsigned long i = 0; i < tryAddrs.size(); ++i) {
-								const InetAddress ip(OSUtils::jsonString(tryAddrs[i], "").c_str());
-								if (ip.ss_family == AF_INET)
-									v4h.push_back(ip);
-								else if (ip.ss_family == AF_INET6)
-									v6h.push_back(ip);
-							}
-						}
-						json& blAddrs = v.value()["blacklist"];
-						if (blAddrs.is_array()) {
-							for (unsigned long i = 0; i < blAddrs.size(); ++i) {
-								const InetAddress ip(OSUtils::jsonString(blAddrs[i], "").c_str());
-								if (ip.ss_family == AF_INET)
-									v4b.push_back(ip);
-								else if (ip.ss_family == AF_INET6)
-									v6b.push_back(ip);
-							}
-						}
-
-						if (v4h.empty())
-							_v4Hints.erase(ztaddr2);
-						if (v6h.empty())
-							_v6Hints.erase(ztaddr2);
-						if (v4b.empty())
-							_v4Blacklists.erase(ztaddr2);
-						if (v6b.empty())
-							_v6Blacklists.erase(ztaddr2);
-					}
-				}
-			}
-		}
-
-		_globalV4Blacklist.clear();
-		_globalV6Blacklist.clear();
-		json& physical = lc["physical"];
-		if (physical.is_object()) {
-			for (json::iterator phy(physical.begin()); phy != physical.end(); ++phy) {
-				const InetAddress net(OSUtils::jsonString(phy.key(), "").c_str());
-				if ((net) && (net.netmaskBits() > 0)) {
-					if (phy.value().is_object()) {
-						if (OSUtils::jsonBool(phy.value()["blacklist"], false)) {
-							if (net.ss_family == AF_INET)
-								_globalV4Blacklist.push_back(net);
-							else if (net.ss_family == AF_INET6)
-								_globalV6Blacklist.push_back(net);
-						}
-					}
-				}
-			}
-		}
-
-		_allowManagementFrom.clear();
-		_interfacePrefixBlacklist.clear();
-
-		json& settings = lc["settings"];
-
-		if (! _node->bondController()->inUse()) {
-			_node->bondController()->setBinder(&_binder);
-			// defaultBondingPolicy
-			std::string defaultBondingPolicyStr(OSUtils::jsonString(settings["defaultBondingPolicy"], ""));
-			int defaultBondingPolicy = _node->bondController()->getPolicyCodeByStr(defaultBondingPolicyStr);
-			_node->bondController()->setBondingLayerDefaultPolicy(defaultBondingPolicy);
-			_node->bondController()->setBondingLayerDefaultPolicyStr(defaultBondingPolicyStr);	 // Used if custom policy
-			// Custom Policies
-			json& customBondingPolicies = settings["policies"];
-			for (json::iterator policyItr = customBondingPolicies.begin(); policyItr != customBondingPolicies.end(); ++policyItr) {
-				// Custom Policy
-				std::string customPolicyStr(policyItr.key());
-				json& customPolicy = policyItr.value();
-				std::string basePolicyStr(OSUtils::jsonString(customPolicy["basePolicy"], ""));
-				if (basePolicyStr.empty()) {
-					fprintf(stderr, "error: no base policy was specified for custom policy (%s)\n", customPolicyStr.c_str());
-				}
-				int basePolicyCode = _node->bondController()->getPolicyCodeByStr(basePolicyStr);
-				if (basePolicyCode == ZT_BOND_POLICY_NONE) {
-					fprintf(stderr, "error: custom policy (%s) is invalid, unknown base policy (%s).\n", customPolicyStr.c_str(), basePolicyStr.c_str());
-					continue;
-				}
-				if (_node->bondController()->getPolicyCodeByStr(customPolicyStr) != ZT_BOND_POLICY_NONE) {
-					fprintf(stderr, "error: custom policy (%s) will be ignored, cannot use standard policy names for custom policies.\n", customPolicyStr.c_str());
-					continue;
-				}
-				// New bond, used as a copy template for new instances
-				SharedPtr<Bond> newTemplateBond = new Bond(NULL, basePolicyStr, customPolicyStr, SharedPtr<Peer>());
-				newTemplateBond->setPolicy(basePolicyCode);
-				// Custom link quality spec
-				json& linkQualitySpec = customPolicy["linkQuality"];
-				if (linkQualitySpec.size() == ZT_QOS_PARAMETER_SIZE) {
-					float weights[ZT_QOS_PARAMETER_SIZE] = {};
-					weights[ZT_QOS_LAT_MAX_IDX] = (float)OSUtils::jsonDouble(linkQualitySpec["lat_max"], 0.0);
-					weights[ZT_QOS_PDV_MAX_IDX] = (float)OSUtils::jsonDouble(linkQualitySpec["pdv_max"], 0.0);
-					weights[ZT_QOS_PLR_MAX_IDX] = (float)OSUtils::jsonDouble(linkQualitySpec["plr_max"], 0.0);
-					weights[ZT_QOS_PER_MAX_IDX] = (float)OSUtils::jsonDouble(linkQualitySpec["per_max"], 0.0);
-					weights[ZT_QOS_LAT_WEIGHT_IDX] = (float)OSUtils::jsonDouble(linkQualitySpec["lat_weight"], 0.0);
-					weights[ZT_QOS_PDV_WEIGHT_IDX] = (float)OSUtils::jsonDouble(linkQualitySpec["pdv_weight"], 0.0);
-					weights[ZT_QOS_PLR_WEIGHT_IDX] = (float)OSUtils::jsonDouble(linkQualitySpec["plr_weight"], 0.0);
-					weights[ZT_QOS_PER_WEIGHT_IDX] = (float)OSUtils::jsonDouble(linkQualitySpec["per_weight"], 0.0);
-					newTemplateBond->setUserLinkQualitySpec(weights, ZT_QOS_PARAMETER_SIZE);
-				}
-				// Bond-specific properties
-				newTemplateBond->setUpDelay(OSUtils::jsonInt(customPolicy["upDelay"], -1));
-				newTemplateBond->setDownDelay(OSUtils::jsonInt(customPolicy["downDelay"], -1));
-				newTemplateBond->setFailoverInterval(OSUtils::jsonInt(customPolicy["failoverInterval"], ZT_BOND_FAILOVER_DEFAULT_INTERVAL));
-				newTemplateBond->setPacketsPerLink(OSUtils::jsonInt(customPolicy["packetsPerLink"], -1));
-
-				// Policy-Specific link set
-				json& links = customPolicy["links"];
-				for (json::iterator linkItr = links.begin(); linkItr != links.end(); ++linkItr) {
-					std::string linkNameStr(linkItr.key());
-					json& link = linkItr.value();
-					bool enabled = OSUtils::jsonInt(link["enabled"], true);
-					uint32_t capacity = OSUtils::jsonInt(link["capacity"], 0);
-					uint8_t ipvPref = OSUtils::jsonInt(link["ipvPref"], 0);
-					uint16_t mtu = OSUtils::jsonInt(link["mtu"], 0);
-					std::string failoverToStr(OSUtils::jsonString(link["failoverTo"], ""));
-					// Mode
-					std::string linkModeStr(OSUtils::jsonString(link["mode"], "spare"));
-					uint8_t linkMode = ZT_BOND_SLAVE_MODE_SPARE;
-					if (linkModeStr == "primary") {
-						linkMode = ZT_BOND_SLAVE_MODE_PRIMARY;
-					}
-					if (linkModeStr == "spare") {
-						linkMode = ZT_BOND_SLAVE_MODE_SPARE;
-					}
-					// ipvPref
-					if ((ipvPref != 0) && (ipvPref != 4) && (ipvPref != 6) && (ipvPref != 46) && (ipvPref != 64)) {
-						fprintf(stderr, "error: invalid ipvPref value (%d), link disabled.\n", ipvPref);
-						enabled = false;
-					}
-					if (linkMode == ZT_BOND_SLAVE_MODE_SPARE && failoverToStr.length()) {
-						fprintf(stderr, "error: cannot specify failover links for spares, link disabled.\n");
-						failoverToStr = "";
-						enabled = false;
-					}
-					_node->bondController()->addCustomLink(customPolicyStr, new Link(linkNameStr, ipvPref, mtu, capacity, enabled, linkMode, failoverToStr));
-				}
-				// Check for new field name first, fall back to legacy field name for backward compatibility
-				std::string linkSelectMethodStr;
-				if (customPolicy.contains("linkSelectMethod")) {
-					linkSelectMethodStr = OSUtils::jsonString(customPolicy["linkSelectMethod"], "always");
-				} else {
-					linkSelectMethodStr = OSUtils::jsonString(customPolicy["activeReselect"], "always");
-					if (customPolicy.contains("activeReselect")) {
-						fprintf(stderr, "warning: 'activeReselect' is deprecated, please use 'linkSelectMethod' instead in policy '%s'\n", customPolicyStr.c_str());
-					}
-				}
-				
-				if (linkSelectMethodStr == "always") {
-					newTemplateBond->setLinkSelectMethod(ZT_BOND_RESELECTION_POLICY_ALWAYS);
-				}
-				if (linkSelectMethodStr == "better") {
-					newTemplateBond->setLinkSelectMethod(ZT_BOND_RESELECTION_POLICY_BETTER);
-				}
-				if (linkSelectMethodStr == "failure") {
-					newTemplateBond->setLinkSelectMethod(ZT_BOND_RESELECTION_POLICY_FAILURE);
-				}
-				if (linkSelectMethodStr == "optimize") {
-					newTemplateBond->setLinkSelectMethod(ZT_BOND_RESELECTION_POLICY_OPTIMIZE);
-				}
-				if (newTemplateBond->getLinkSelectMethod() < 0 || newTemplateBond->getLinkSelectMethod() > 3) {
-					fprintf(stderr, "warning: invalid value (%s) for linkSelectMethod, assuming mode: always\n", linkSelectMethodStr.c_str());
-				}
-				if (! _node->bondController()->addCustomPolicy(newTemplateBond)) {
-					fprintf(stderr, "error: a custom policy of this name (%s) already exists.\n", customPolicyStr.c_str());
-				}
-			}
-			// Peer-specific bonding
-			json& peerSpecificBonds = settings["peerSpecificBonds"];
-			for (json::iterator peerItr = peerSpecificBonds.begin(); peerItr != peerSpecificBonds.end(); ++peerItr) {
-				_node->bondController()->assignBondingPolicyToPeer(std::stoull(peerItr.key(), 0, 16), peerItr.value());
-			}
-			// Check settings
-			if (defaultBondingPolicyStr.length() && ! defaultBondingPolicy && ! _node->bondController()->inUse()) {
-				fprintf(stderr, "error: unknown policy (%s) specified by defaultBondingPolicy, bond disabled.\n", defaultBondingPolicyStr.c_str());
-			}
-		}
-
-		// bondingPolicy cannot be used with allowTcpFallbackRelay
-		bool _forceTcpRelayTmp = (OSUtils::jsonBool(settings["forceTcpRelay"], false));
-		bool _bondInUse = _node->bondController()->inUse();
-		if (_forceTcpRelayTmp && _bondInUse) {
-			fprintf(stderr, "Warning: forceTcpRelay cannot be used with multipath. Disabling forceTcpRelay\n");
-		}
-		_allowTcpFallbackRelay = (OSUtils::jsonBool(settings["allowTcpFallbackRelay"], true) && ! _node->bondController()->inUse());
-		_forceTcpRelay = (_forceTcpRelayTmp && ! _node->bondController()->inUse());
-		_enableWebServer = (OSUtils::jsonBool(settings["enableWebServer"], false));
-
-#ifdef ZT_TCP_FALLBACK_RELAY
-		_fallbackRelayAddress = InetAddress(OSUtils::jsonString(settings["tcpFallbackRelay"], ZT_TCP_FALLBACK_RELAY).c_str());
-#endif
-		_primaryPort = (unsigned int)OSUtils::jsonInt(settings["primaryPort"], (uint64_t)_primaryPort) & 0xffff;
-		_allowSecondaryPort = OSUtils::jsonBool(settings["allowSecondaryPort"], true);
-		_secondaryPort = (unsigned int)OSUtils::jsonInt(settings["secondaryPort"], 0);
-		_tertiaryPort = (unsigned int)OSUtils::jsonInt(settings["tertiaryPort"], 0);
-		if (_secondaryPort != 0 || _tertiaryPort != 0) {
-			fprintf(stderr, "WARNING: using manually-specified secondary and/or tertiary ports. This can cause NAT issues." ZT_EOL_S);
-		}
-		_portMappingEnabled = OSUtils::jsonBool(settings["portMappingEnabled"], true);
-		_node->setLowBandwidthMode(OSUtils::jsonBool(settings["lowBandwidthMode"], false));
-#if defined(__LINUX__) || defined(__FreeBSD__)
-		_multicoreEnabled = OSUtils::jsonBool(settings["multicoreEnabled"], false);
-		_concurrency = OSUtils::jsonInt(settings["concurrency"], 1);
-		_cpuPinningEnabled = OSUtils::jsonBool(settings["cpuPinningEnabled"], false);
-		if (_multicoreEnabled) {
-			unsigned int maxConcurrency = std::thread::hardware_concurrency();
-			if (_concurrency <= 1 || _concurrency >= maxConcurrency) {
-				unsigned int conservativeDefault = (std::thread::hardware_concurrency() >= 4 ? 2 : 1);
-				fprintf(stderr, "Concurrency level provided (%d) is invalid, assigning conservative default value of (%d)\n", _concurrency, conservativeDefault);
-				_concurrency = conservativeDefault;
-			}
-			setUpMultithreading();
-		}
-		else {
-			// Force values in case the user accidentally defined them with multicore disabled
-			_concurrency = 1;
-			_cpuPinningEnabled = false;
-		}
-#else
-		_multicoreEnabled = false;
-		_concurrency = 1;
-		_cpuPinningEnabled = false;
-#endif
-
-#ifndef ZT_SDK
-		const std::string up(OSUtils::jsonString(settings["softwareUpdate"], ZT_SOFTWARE_UPDATE_DEFAULT));
-		const bool udist = OSUtils::jsonBool(settings["softwareUpdateDist"], false);
-		if (((up == "apply") || (up == "download")) || (udist)) {
-			if (! _updater)
-				_updater = new SoftwareUpdater(*_node, _homePath);
-			_updateAutoApply = (up == "apply");
-			_updater->setUpdateDistribution(udist);
-			_updater->setChannel(OSUtils::jsonString(settings["softwareUpdateChannel"], ZT_SOFTWARE_UPDATE_DEFAULT_CHANNEL));
-		}
-		else {
-			delete _updater;
-			_updater = (SoftwareUpdater*)0;
-			_updateAutoApply = false;
-		}
-#endif
-
-		json& ignoreIfs = settings["interfacePrefixBlacklist"];
-		if (ignoreIfs.is_array()) {
-			for (unsigned long i = 0; i < ignoreIfs.size(); ++i) {
-				const std::string tmp(OSUtils::jsonString(ignoreIfs[i], ""));
-				if (tmp.length() > 0)
-					_interfacePrefixBlacklist.push_back(tmp);
-			}
-		}
-
-		json& amf = settings["allowManagementFrom"];
-		if (amf.is_array()) {
-			for (unsigned long i = 0; i < amf.size(); ++i) {
-				const InetAddress nw(OSUtils::jsonString(amf[i], "").c_str());
-				if (nw)
-					_allowManagementFrom.push_back(nw);
-			}
-		}
-	}
-
-#if ZT_VAULT_SUPPORT
-	json& vault = settings["vault"];
-	if (vault.is_object()) {
-		const std::string url(OSUtils::jsonString(vault["vaultURL"], "").c_str());
-		if (! url.empty()) {
-			_vaultURL = url;
-		}
-
-		const std::string token(OSUtils::jsonString(vault["vaultToken"], "").c_str());
-		if (! token.empty()) {
-			_vaultToken = token;
-		}
-
-		const std::string path(OSUtils::jsonString(vault["vaultPath"], "").c_str());
-		if (! path.empty()) {
-			_vaultPath = path;
-		}
-	}
-
-	// also check environment variables for values.  Environment variables
-	// will override local.conf variables
-	const std::string envURL(getenv("VAULT_ADDR"));
-	if (! envURL.empty()) {
-		_vaultURL = envURL;
-	}
-
-	const std::string envToken(getenv("VAULT_TOKEN"));
-	if (! envToken.empty()) {
-		_vaultToken = envToken;
-	}
-
-	const std::string envPath(getenv("VAULT_PATH"));
-	if (! envPath.empty()) {
-		_vaultPath = envPath;
-	}
-
-	if (! _vaultURL.empty() && ! _vaultToken.empty()) {
-		_vaultEnabled = true;
-	}
-#endif
-
-	// Checks if a managed IP or route target is allowed
-	bool checkIfManagedIsAllowed(const NetworkState& n, const InetAddress& target)
-	{
-		if (! n.allowManaged())
-			return false;
-
-		if (! n.allowManagedWhitelist().empty()) {
-			bool allowed = false;
-			for (InetAddress addr : n.allowManagedWhitelist()) {
-				if (addr.containsAddress(target) && addr.netmaskBits() <= target.netmaskBits()) {
-					allowed = true;
-					break;
-				}
-			}
-			if (! allowed)
-				return false;
-		}
-
-		if (target.isDefaultRoute())
-			return n.allowDefault();
-		switch (target.ipScope()) {
-			case InetAddress::IP_SCOPE_NONE:
-			case InetAddress::IP_SCOPE_MULTICAST:
-			case InetAddress::IP_SCOPE_LOOPBACK:
-			case InetAddress::IP_SCOPE_LINK_LOCAL:
-				return false;
-			case InetAddress::IP_SCOPE_GLOBAL:
-				return n.allowGlobal();
-			default:
-				return true;
-		}
-	}
-
-	// Match only an IP from a vector of IPs -- used in syncManagedStuff()
-	inline bool matchIpOnly(const std::set<InetAddress>& ips, const InetAddress& ip) const
-	{
-		for (std::set<InetAddress>::const_iterator i(ips.begin()); i != ips.end(); ++i) {
-			if (i->ipsEqual(ip))
-				return true;
-		}
-		return false;
-	}
-
-	// Apply or update managed IPs for a configured network (be sure n.tap exists)
-	void syncManagedStuff(NetworkState& n, bool syncIps, bool syncRoutes, bool syncDns)
-	{
-		char ipbuf[64];
-
-		// assumes _nets_m is locked
-		if (syncIps) {
-			std::vector<InetAddress> newManagedIps;
-			newManagedIps.reserve(n.config().assignedAddressCount);
-
-#ifdef __APPLE__
-			std::vector<InetAddress> newManagedIps2;
-			newManagedIps2.reserve(n.config().assignedAddressCount);
-#endif
-
-			for (unsigned int i = 0; i < n.config().assignedAddressCount; ++i) {
-				const InetAddress* ii = reinterpret_cast<const InetAddress*>(&(n.config().assignedAddresses[i]));
-				if (checkIfManagedIsAllowed(n, *ii))
-					newManagedIps.push_back(*ii);
-			}
-			std::sort(newManagedIps.begin(), newManagedIps.end());
-			newManagedIps.erase(std::unique(newManagedIps.begin(), newManagedIps.end()), newManagedIps.end());
-
-			for (std::vector<InetAddress>::iterator ip(n.managedIps().begin()); ip != n.managedIps().end(); ++ip) {
-				if (std::find(newManagedIps.begin(), newManagedIps.end(), *ip) == newManagedIps.end()) {
-					if (! n.tap()->removeIp(*ip))
-						fprintf(stderr, "ERROR: unable to remove ip address %s" ZT_EOL_S, ip->toString(ipbuf));
-
-#ifdef __WINDOWS__
-					WinFWHelper::removeICMPRule(*ip, n.config().nwid);
-#endif
-				}
-			}
-
-			for (std::vector<InetAddress>::iterator ip(newManagedIps.begin()); ip != newManagedIps.end(); ++ip) {
-#ifdef __APPLE__
-				// We can't add multiple addresses to an interface on macOs unless we futz with the netmask.
-				// see `man ifconfig`, alias section
-				// "If the address is on the same subnet as the first network address for this interface, a non-conflicting netmask must be given.  Usually 0xffffffff is most appropriate."
-
-				auto same_subnet = [ip](InetAddress i) { return ip->network() == i.network(); };
-#endif
-
-				if (std::find(n.managedIps().begin(), n.managedIps().end(), *ip) == n.managedIps().end()) {
-#ifdef __APPLE__
-					// if same subnet as a previously added address
-					if (std::find_if(n.managedIps().begin(), n.managedIps().end(), same_subnet) != n.managedIps().end() || std::find_if(newManagedIps2.begin(), newManagedIps2.end(), same_subnet) != newManagedIps2.end()) {
-						if (ip->isV4()) {
-							ip->setPort(32);
-						}
-						else {
-							ip->setPort(128);
-						}
-					}
-					else {
-						newManagedIps2.push_back(*ip);
-					}
-#endif
-
-					if (! n.tap()->addIp(*ip)) {
-						fprintf(stderr, "ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf));
-					}
-					else {
-#ifdef __WINDOWS__
-						WinFWHelper::newICMPRule(*ip, n.config().nwid);
-#endif
-					}
-				}
-			}
-
-#ifdef __APPLE__
-			if (! MacDNSHelper::addIps6(n.config().nwid, n.config().mac, n.tap()->deviceName().c_str(), newManagedIps)) {
-				fprintf(stderr, "ERROR: unable to add v6 addresses to system configuration" ZT_EOL_S);
-			}
-
-			if (! MacDNSHelper::addIps4(n.config().nwid, n.config().mac, n.tap()->deviceName().c_str(), newManagedIps)) {
-				fprintf(stderr, "ERROR: unable to add v4 addresses to system configuration" ZT_EOL_S);
-			}
-#endif
-			n.setManagedIps(newManagedIps);
-		}
-
-		if (syncRoutes) {
-			// Get tap device name (use LUID in hex on Windows) and IP addresses.
-#if defined(__WINDOWS__) && ! defined(ZT_SDK)
-			char tapdevbuf[64];
-			OSUtils::ztsnprintf(tapdevbuf, sizeof(tapdevbuf), "%.16llx", (unsigned long long)((WindowsEthernetTap*)(n.tap().get()))->luid().Value);
-			std::string tapdev(tapdevbuf);
-#else
-			std::string tapdev(n.tap()->deviceName());
-#endif
-
-			std::vector<InetAddress> tapIps(n.tap()->ips());
-			std::set<InetAddress> myIps(tapIps.begin(), tapIps.end());
-			for (unsigned int i = 0; i < n.config().assignedAddressCount; ++i)
-				myIps.insert(InetAddress(n.config().assignedAddresses[i]));
-
-			std::set<InetAddress> haveRouteTargets;
-			for (unsigned int i = 0; i < n.config().routeCount; ++i) {
-				const InetAddress* const target = reinterpret_cast<const InetAddress*>(&(n.config().routes[i].target));
-				const InetAddress* const via = reinterpret_cast<const InetAddress*>(&(n.config().routes[i].via));
-
-				// Make sure we are allowed to set this managed route, and that 'via' is not our IP. The latter
-				// avoids setting routes via the router on the router.
-				if ((! checkIfManagedIsAllowed(n, *target)) || ((via->ss_family == target->ss_family) && (matchIpOnly(myIps, *via))))
-					continue;
-
-				// Find an IP on the interface that can be a source IP, abort if no IPs assigned.
-				const InetAddress* src = nullptr;
-				unsigned int mostMatchingPrefixBits = 0;
-				for (std::set<InetAddress>::const_iterator i(myIps.begin()); i != myIps.end(); ++i) {
-					const unsigned int matchingPrefixBits = i->matchingPrefixBits(*target);
-					if (matchingPrefixBits >= mostMatchingPrefixBits && ((target->isV4() && i->isV4()) || (target->isV6() && i->isV6()))) {
-						mostMatchingPrefixBits = matchingPrefixBits;
-						src = &(*i);
-					}
-				}
-				if (! src)
-					continue;
-
-				// Ignore routes implied by local managed IPs since adding the IP adds the route.
-				// Apple on the other hand seems to need this at least on some versions.
-#ifndef __APPLE__
-				bool haveRoute = false;
-				for (std::vector<InetAddress>::iterator ip(n.managedIps().begin()); ip != n.managedIps().end(); ++ip) {
-					if ((target->netmaskBits() == ip->netmaskBits()) && (target->containsAddress(*ip))) {
-						haveRoute = true;
-						break;
-					}
-				}
-				if (haveRoute)
-					continue;
-#endif
-
-				haveRouteTargets.insert(*target);
-
-#ifndef ZT_SDK
-				SharedPtr<ManagedRoute>& mr = n.managedRoutes()[*target];
-				if (! mr)
-					mr.set(new ManagedRoute(*target, *via, *src, tapdev.c_str()));
-#endif
-			}
-
-			for (std::map<InetAddress, SharedPtr<ManagedRoute> >::iterator r(n.managedRoutes().begin()); r != n.managedRoutes().end();) {
-				if (haveRouteTargets.find(r->first) == haveRouteTargets.end())
-					n.managedRoutes().erase(r++);
-				else
-					++r;
-			}
-
-			// Sync device-local managed routes first, then indirect results. That way
-			// we don't get destination unreachable for routes that are via things
-			// that do not yet have routes in the system.
-			for (std::map<InetAddress, SharedPtr<ManagedRoute> >::iterator r(n.managedRoutes().begin()); r != n.managedRoutes().end(); ++r) {
-				if (! r->second->via())
-					r->second->sync();
-			}
-			for (std::map<InetAddress, SharedPtr<ManagedRoute> >::iterator r(n.managedRoutes().begin()); r != n.managedRoutes().end(); ++r) {
-				if (r->second->via() && (! r->second->target().isDefaultRoute() || _node->online())) {
-					r->second->sync();
-				}
-			}
-		}
-
-		if (syncDns) {
-			if (n.allowDNS()) {
-				if (strlen(n.config().dns.domain) != 0) {
-					std::vector<InetAddress> servers;
-					for (int j = 0; j < ZT_MAX_DNS_SERVERS; ++j) {
-						InetAddress a(n.config().dns.server_addr[j]);
-						if (a.isV4() || a.isV6()) {
-							servers.push_back(a);
-						}
-					}
-					n.tap()->setDns(n.config().dns.domain, servers);
-				}
-			}
-			else {
-#ifdef __APPLE__
-				MacDNSHelper::removeDNS(n.config().nwid);
-#elif defined(__WINDOWS__)
-				WinDNSHelper::removeDNS(n.config().nwid);
-#endif
-			}
-		}
-	}
-
-	// =========================================================================
-	// Handlers for Node and Phy<> callbacks
-	// =========================================================================
-
-	inline void phyOnDatagram(PhySocket* sock, void** uptr, const struct sockaddr* localAddr, const struct sockaddr* from, void* data, unsigned long len)
-	{
-		if (_forceTcpRelay) {
+#ifdef ZT_ENABLE_CLUSTER
+		if (sock == _clusterMessageSocket) {
+			_lastDirectReceiveFromGlobal = OSUtils::now();
+			_node->clusterHandleIncomingMessage(data,len);
 			return;
 		}
-		Metrics::udp_recv += len;
-		const uint64_t now = OSUtils::now();
-		if ((len >= 16) && (reinterpret_cast<const InetAddress*>(from)->ipScope() == InetAddress::IP_SCOPE_GLOBAL)) {
-			_lastDirectReceiveFromGlobal = now;
-		}
-		const ZT_ResultCode rc = _node->processWirePacket(nullptr, now, reinterpret_cast<int64_t>(sock), reinterpret_cast<const struct sockaddr_storage*>(from), data, len, &_nextBackgroundTaskDeadline);
+#endif
+
+#ifdef ZT_BREAK_UDP
+		if (OSUtils::fileExists("/tmp/ZT_BREAK_UDP"))
+			return;
+#endif
+
+		if ((len >= 16)&&(reinterpret_cast<const InetAddress *>(from)->ipScope() == InetAddress::IP_SCOPE_GLOBAL))
+			_lastDirectReceiveFromGlobal = OSUtils::now();
+
+		const ZT_ResultCode rc = _node->processWirePacket(
+			OSUtils::now(),
+			reinterpret_cast<const struct sockaddr_storage *>(localAddr),
+			(const struct sockaddr_storage *)from, // Phy<> uses sockaddr_storage, so it'll always be that big
+			data,
+			len,
+			&_nextBackgroundTaskDeadline);
 		if (ZT_ResultCode_isFatal(rc)) {
 			char tmp[256];
-			OSUtils::ztsnprintf(tmp, sizeof(tmp), "fatal error code from processWirePacket: %d", (int)rc);
+			Utils::snprintf(tmp,sizeof(tmp),"fatal error code from processWirePacket: %d",(int)rc);
 			Mutex::Lock _l(_termReason_m);
 			_termReason = ONE_UNRECOVERABLE_ERROR;
 			_fatalErrorMessage = tmp;
@@ -3266,1031 +985,580 @@ class OneServiceImpl : public OneService {
 		}
 	}
 
-	inline void phyOnTcpConnect(PhySocket* sock, void** uptr, bool success)
+	inline void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success)
 	{
-		if (! success) {
-			phyOnTcpClose(sock, uptr);
+		if (!success)
 			return;
-		}
 
-		TcpConnection* const tc = reinterpret_cast<TcpConnection*>(*uptr);
-		if (! tc) {	  // sanity check
-			_phy.close(sock, true);
-			return;
-		}
+		// Outgoing TCP connections are always TCP fallback tunnel connections.
+
+		TcpConnection *tc = new TcpConnection();
+		_tcpConnections.insert(tc);
+
+		tc->type = TcpConnection::TCP_TUNNEL_OUTGOING;
+		tc->shouldKeepAlive = true;
+		tc->parent = this;
 		tc->sock = sock;
+		// from and parser are not used
+		tc->messageSize = 0; // unused
+		tc->lastActivity = OSUtils::now();
+		// HTTP stuff is not used
+		tc->writeBuf = "";
+		*uptr = (void *)tc;
 
-		if (tc->type == TcpConnection::TCP_TUNNEL_OUTGOING) {
-			if (_tcpFallbackTunnel)
-				_phy.close(_tcpFallbackTunnel->sock);
-			_tcpFallbackTunnel = tc;
-			_phy.streamSend(sock, ZT_TCP_TUNNEL_HELLO, sizeof(ZT_TCP_TUNNEL_HELLO));
-		}
-		else {
-			_phy.close(sock, true);
-		}
+		// Send "hello" message
+		tc->writeBuf.push_back((char)0x17);
+		tc->writeBuf.push_back((char)0x03);
+		tc->writeBuf.push_back((char)0x03); // fake TLS 1.2 header
+		tc->writeBuf.push_back((char)0x00);
+		tc->writeBuf.push_back((char)0x04); // mlen == 4
+		tc->writeBuf.push_back((char)ZEROTIER_ONE_VERSION_MAJOR);
+		tc->writeBuf.push_back((char)ZEROTIER_ONE_VERSION_MINOR);
+		tc->writeBuf.push_back((char)((ZEROTIER_ONE_VERSION_REVISION >> 8) & 0xff));
+		tc->writeBuf.push_back((char)(ZEROTIER_ONE_VERSION_REVISION & 0xff));
+		_phy.setNotifyWritable(sock,true);
+
+		_tcpFallbackTunnel = tc;
 	}
 
-	inline void phyOnTcpAccept(PhySocket* sockL, PhySocket* sockN, void** uptrL, void** uptrN, const struct sockaddr* from)
+	inline void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from)
 	{
-		if (! from) {
-			_phy.close(sockN, false);
+		if ((!from)||(reinterpret_cast<const InetAddress *>(from)->ipScope() != InetAddress::IP_SCOPE_LOOPBACK)) {
+			// Non-Loopback: deny (for now)
+			_phy.close(sockN,false);
 			return;
-		}
-		else {
-#ifdef ZT_SDK
-			// Immediately close new local connections. The intention is to prevent the backplane from being accessed when operating as libzt
-			if (! allowHttpBackplaneManagement && ((InetAddress*)from)->ipScope() == InetAddress::IP_SCOPE_LOOPBACK) {
-				_phy.close(sockN, false);
-				return;
-			}
-#endif
-			TcpConnection* tc = new TcpConnection();
-			{
-				Mutex::Lock _l(_tcpConnections_m);
-				_tcpConnections.push_back(tc);
-			}
-
-			tc->type = TcpConnection::TCP_UNCATEGORIZED_INCOMING;
+		} else {
+			// Loopback == HTTP JSON API request
+			TcpConnection *tc = new TcpConnection();
+			_tcpConnections.insert(tc);
+			tc->type = TcpConnection::TCP_HTTP_INCOMING;
+			tc->shouldKeepAlive = true;
 			tc->parent = this;
 			tc->sock = sockN;
-			tc->remoteAddr = from;
-			tc->lastReceive = OSUtils::now();
-			http_parser_init(&(tc->parser), HTTP_REQUEST);
-			tc->parser.data = (void*)tc;
+			tc->from = from;
+			http_parser_init(&(tc->parser),HTTP_REQUEST);
+			tc->parser.data = (void *)tc;
 			tc->messageSize = 0;
-
-			*uptrN = (void*)tc;
+			tc->lastActivity = OSUtils::now();
+			tc->currentHeaderField = "";
+			tc->currentHeaderValue = "";
+			tc->url = "";
+			tc->status = "";
+			tc->headers.clear();
+			tc->body = "";
+			tc->writeBuf = "";
+			*uptrN = (void *)tc;
 		}
 	}
 
-	void phyOnTcpClose(PhySocket* sock, void** uptr)
+	inline void phyOnTcpClose(PhySocket *sock,void **uptr)
 	{
-		TcpConnection* tc = (TcpConnection*)*uptr;
+		TcpConnection *tc = (TcpConnection *)*uptr;
 		if (tc) {
-			if (tc == _tcpFallbackTunnel) {
-				_tcpFallbackTunnel = (TcpConnection*)0;
-			}
-			{
-				Mutex::Lock _l(_tcpConnections_m);
-				_tcpConnections.erase(std::remove(_tcpConnections.begin(), _tcpConnections.end(), tc), _tcpConnections.end());
-			}
+			if (tc == _tcpFallbackTunnel)
+				_tcpFallbackTunnel = (TcpConnection *)0;
+			_tcpConnections.erase(tc);
 			delete tc;
 		}
 	}
 
-	void phyOnTcpData(PhySocket* sock, void** uptr, void* data, unsigned long len)
+	inline void phyOnTcpData(PhySocket *sock,void **uptr,void *data,unsigned long len)
 	{
-		try {
-			if (! len)
-				return;	  // sanity check, should never happen
-			Metrics::tcp_recv += len;
-			TcpConnection* tc = reinterpret_cast<TcpConnection*>(*uptr);
-			tc->lastReceive = OSUtils::now();
-			switch (tc->type) {
-				case TcpConnection::TCP_UNCATEGORIZED_INCOMING:
+		TcpConnection *tc = reinterpret_cast<TcpConnection *>(*uptr);
+		switch(tc->type) {
+
+			case TcpConnection::TCP_HTTP_INCOMING:
+			case TcpConnection::TCP_HTTP_OUTGOING:
+				http_parser_execute(&(tc->parser),&HTTP_PARSER_SETTINGS,(const char *)data,len);
+				if ((tc->parser.upgrade)||(tc->parser.http_errno != HPE_OK)) {
+					_phy.close(sock);
 					return;
-
-				case TcpConnection::TCP_HTTP_INCOMING:
-				case TcpConnection::TCP_HTTP_OUTGOING:
-					http_parser_execute(&(tc->parser), &HTTP_PARSER_SETTINGS, (const char*)data, len);
-					if ((tc->parser.upgrade) || (tc->parser.http_errno != HPE_OK))
-						_phy.close(sock);
-					return;
-
-				case TcpConnection::TCP_TUNNEL_OUTGOING:
-					tc->readq.append((const char*)data, len);
-					while (tc->readq.length() >= 5) {
-						const char* data = tc->readq.data();
-						const unsigned long mlen = (((((unsigned long)data[3]) & 0xff) << 8) | (((unsigned long)data[4]) & 0xff));
-						if (tc->readq.length() >= (mlen + 5)) {
-							InetAddress from;
-
-							unsigned long plen = mlen;	 // payload length, modified if there's an IP header
-							data += 5;					 // skip forward past pseudo-TLS junk and mlen
-							if (plen == 4) {
-								// Hello message, which isn't sent by proxy and would be ignored by client
-							}
-							else if (plen) {
-								// Messages should contain IPv4 or IPv6 source IP address data
-								switch (data[0]) {
-									case 4:	  // IPv4
-										if (plen >= 7) {
-											from.set((const void*)(data + 1), 4, ((((unsigned int)data[5]) & 0xff) << 8) | (((unsigned int)data[6]) & 0xff));
-											data += 7;	 // type + 4 byte IP + 2 byte port
-											plen -= 7;
-										}
-										else {
-											_phy.close(sock);
-											return;
-										}
-										break;
-									case 6:	  // IPv6
-										if (plen >= 19) {
-											from.set((const void*)(data + 1), 16, ((((unsigned int)data[17]) & 0xff) << 8) | (((unsigned int)data[18]) & 0xff));
-											data += 19;	  // type + 16 byte IP + 2 byte port
-											plen -= 19;
-										}
-										else {
-											_phy.close(sock);
-											return;
-										}
-										break;
-									case 0:	  // none/omitted
-										++data;
-										--plen;
-										break;
-									default:   // invalid address type
-										_phy.close(sock);
-										return;
-								}
-
-								if (from) {
-									InetAddress fakeTcpLocalInterfaceAddress((uint32_t)0xffffffff, 0xffff);
-									const ZT_ResultCode rc = _node->processWirePacket((void*)0, OSUtils::now(), -1, reinterpret_cast<struct sockaddr_storage*>(&from), data, plen, &_nextBackgroundTaskDeadline);
-									if (ZT_ResultCode_isFatal(rc)) {
-										char tmp[256];
-										OSUtils::ztsnprintf(tmp, sizeof(tmp), "fatal error code from processWirePacket: %d", (int)rc);
-										Mutex::Lock _l(_termReason_m);
-										_termReason = ONE_UNRECOVERABLE_ERROR;
-										_fatalErrorMessage = tmp;
-										this->terminate();
-										_phy.close(sock);
-										return;
-									}
-								}
-							}
-
-							if (tc->readq.length() > (mlen + 5))
-								tc->readq.erase(tc->readq.begin(), tc->readq.begin() + (mlen + 5));
-							else
-								tc->readq.clear();
-						}
-						else
-							break;
-					}
-					return;
-			}
-		}
-		catch (...) {
-			_phy.close(sock);
-		}
-	}
-
-	inline void phyOnTcpWritable(PhySocket* sock, void** uptr)
-	{
-		TcpConnection* tc = reinterpret_cast<TcpConnection*>(*uptr);
-		bool closeit = false;
-		{
-			Mutex::Lock _l(tc->writeq_m);
-			if (tc->writeq.length() > 0) {
-				long sent = (long)_phy.streamSend(sock, tc->writeq.data(), (unsigned long)tc->writeq.length(), true);
-				Metrics::tcp_send += sent;
-				if (sent > 0) {
-					if ((unsigned long)sent >= (unsigned long)tc->writeq.length()) {
-						tc->writeq.clear();
-						_phy.setNotifyWritable(sock, false);
-
-						if (tc->type == TcpConnection::TCP_HTTP_INCOMING)
-							closeit = true;	  // HTTP keep alive not supported
-					}
-					else {
-						tc->writeq.erase(tc->writeq.begin(), tc->writeq.begin() + sent);
-					}
-				}
-			}
-			else {
-				_phy.setNotifyWritable(sock, false);
-			}
-		}
-		if (closeit)
-			_phy.close(sock);
-	}
-
-	inline void phyOnFileDescriptorActivity(PhySocket* sock, void** uptr, bool readable, bool writable)
-	{
-	}
-	inline void phyOnUnixAccept(PhySocket* sockL, PhySocket* sockN, void** uptrL, void** uptrN)
-	{
-	}
-	inline void phyOnUnixClose(PhySocket* sock, void** uptr)
-	{
-	}
-	inline void phyOnUnixData(PhySocket* sock, void** uptr, void* data, unsigned long len)
-	{
-#ifdef ZT_EXTOSDEP
-		if (ExtOsdep::mgmtRecv(*uptr, data, len, [&](unsigned method, const std::string& path, const std::string& data, std::string& resp) {
-				// fprintf(stderr, "mgmtRecv: %u %s %s\n", method, path.c_str(), data.c_str());
-				httplib::Request req;
-				httplib::Response res;
-				req.path = "/" + path;
-				if (method == 1)
-					req.method = "GET";
-				else if (method == 3)
-					req.method = "POST";
-				else if (method == 0)
-					req.method = "DELETE";
-				struct S : public httplib::Stream {
-					const char* ptr;
-					unsigned size;
-					S(const std::string& s) : ptr(s.c_str()), size(s.size())
-					{
-					}
-					virtual bool is_readable() const
-					{
-						return true;
-					}
-					virtual bool is_writable() const
-					{
-						return true;
-					}
-					virtual ssize_t read(char* p, size_t sz)
-					{
-						// fprintf(stderr, "S::read %d\n", (int)size);
-						if (sz > (size_t)size)
-							sz = size;
-						memcpy(p, ptr, sz);
-						size -= (unsigned)sz;
-						ptr += sz;
-						return (ssize_t)sz;
-					}
-					virtual ssize_t write(const char* ptr, size_t size)
-					{
-						// fprintf(stderr, "S::write %d\n", (int)size);
-						return size;
-					}
-					virtual void get_remote_ip_and_port(std::string& ip, int& port) const
-					{
-					}
-					virtual void get_local_ip_and_port(std::string& ip, int& port) const {};
-					virtual socket_t socket() const
-					{
-						return 0;
-					}
-				};
-				S s(data);
-
-				bool x = _controlPlane.routing(req, res, s);
-				// fprintf(stderr, "mgmtRecv: done, x %d status %u body %s\n", x, res.status, res.body.c_str());
-				resp = res.body;
-				return res.status;
-			}))
-			_phy.setNotifyWritable(sock, true);
-#endif
-	}
-	inline void phyOnUnixWritable(PhySocket* sock, void** uptr)
-	{
-#ifdef ZT_EXTOSDEP
-		if (ExtOsdep::mgmtWritable(*uptr))
-			_phy.setNotifyWritable(sock, false);
-#endif
-	}
-
-	inline int nodeVirtualNetworkConfigFunction(uint64_t nwid, void** nuptr, enum ZT_VirtualNetworkConfigOperation op, const ZT_VirtualNetworkConfig* nwc)
-	{
-		Mutex::Lock _l(_nets_m);
-		NetworkState& n = _nets[nwid];
-		n.setWebPort(_primaryPort);
-
-		switch (op) {
-			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP:
-				if (! n.tap()) {
-					try {
-						char friendlyName[128];
-						OSUtils::ztsnprintf(friendlyName, sizeof(friendlyName), "ZeroTier One [%.16llx]", nwid);
-
-						n.setTap(EthernetTap::newInstance(nullptr, _concurrency, _cpuPinningEnabled, _homePath.c_str(), MAC(nwc->mac), nwc->mtu, (unsigned int)ZT_IF_METRIC, nwid, friendlyName, StapFrameHandler, (void*)this));
-						*nuptr = (void*)&n;
-
-						char nlcpath[256];
-						OSUtils::ztsnprintf(nlcpath, sizeof(nlcpath), "%s" ZT_PATH_SEPARATOR_S "networks.d" ZT_PATH_SEPARATOR_S "%.16llx.local.conf", _homePath.c_str(), nwid);
-						std::string nlcbuf;
-						if (OSUtils::readFile(nlcpath, nlcbuf)) {
-							Dictionary<4096> nc;
-							nc.load(nlcbuf.c_str());
-							Buffer<1024> allowManaged;
-							if (nc.get("allowManaged", allowManaged) && allowManaged.size() > 0) {
-								std::string addresses(allowManaged.begin(), allowManaged.size());
-								if (allowManaged.size() <= 5) {	  // untidy parsing for backward compatibility
-									if (allowManaged[0] == '1' || allowManaged[0] == 't' || allowManaged[0] == 'T') {
-										n.setAllowManaged(true);
-									}
-									else {
-										n.setAllowManaged(false);
-									}
-								}
-								else {
-									// this should be a list of IP addresses
-									n.setAllowManaged(true);
-									size_t pos = 0;
-									while (true) {
-										size_t nextPos = addresses.find(',', pos);
-										std::string address = addresses.substr(pos, (nextPos == std::string::npos ? addresses.size() : nextPos) - pos);
-										n.addToAllowManagedWhiteList(InetAddress(address.c_str()));
-										if (nextPos == std::string::npos)
-											break;
-										pos = nextPos + 1;
-									}
-								}
-							}
-							else {
-								n.setAllowManaged(true);
-							}
-							n.setAllowGlobal(nc.getB("allowGlobal", false));
-							n.setAllowDefault(nc.getB("allowDefault", false));
-							n.setAllowDNS(nc.getB("allowDNS", false));
-						}
-					}
-					catch (std::exception& exc) {
-#ifdef __WINDOWS__
-						FILE* tapFailLog = fopen((_homePath + ZT_PATH_SEPARATOR_S "port_error_log.txt").c_str(), "a");
-						if (tapFailLog) {
-							fprintf(tapFailLog, "%.16llx: %s" ZT_EOL_S, (unsigned long long)nwid, exc.what());
-							fclose(tapFailLog);
-						}
-#else
-						fprintf(stderr, "ERROR: unable to configure virtual network port: %s" ZT_EOL_S, exc.what());
-#endif
-						_nets.erase(nwid);
-						return -999;
-					}
-					catch (...) {
-						return -999;   // tap init failed
-					}
-				}
-				// After setting up tap, fall through to CONFIG_UPDATE since we also want to do this...
-
-			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE:
-				n.setConfig(nwc);
-
-				if (n.tap()) {	 // sanity check
-#if defined(__WINDOWS__) && ! defined(ZT_SDK)
-					// wait for up to 5 seconds for the WindowsEthernetTap to actually be initialized
-					//
-					// without WindowsEthernetTap::isInitialized() returning true, the won't actually
-					// be online yet and setting managed routes on it will fail.
-					const int MAX_SLEEP_COUNT = 500;
-					for (int i = 0; ! ((WindowsEthernetTap*)(n.tap().get()))->isInitialized() && i < MAX_SLEEP_COUNT; i++) {
-						Sleep(10);
-					}
-#endif
-					syncManagedStuff(n, true, true, true);
-					n.tap()->setMtu(nwc->mtu);
-				}
-				else {
-					_nets.erase(nwid);
-					return -999;   // tap init failed
 				}
 				break;
 
-			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN:
-			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY:
-				if (n.tap()) {	 // sanity check
-#if defined(__WINDOWS__) && ! defined(ZT_SDK)
-					std::string winInstanceId(((WindowsEthernetTap*)(n.tap().get()))->instanceId());
+			case TcpConnection::TCP_TUNNEL_OUTGOING:
+				tc->body.append((const char *)data,len);
+				while (tc->body.length() >= 5) {
+					const char *data = tc->body.data();
+					const unsigned long mlen = ( ((((unsigned long)data[3]) & 0xff) << 8) | (((unsigned long)data[4]) & 0xff) );
+					if (tc->body.length() >= (mlen + 5)) {
+						InetAddress from;
+
+						unsigned long plen = mlen; // payload length, modified if there's an IP header
+						data += 5; // skip forward past pseudo-TLS junk and mlen
+						if (plen == 4) {
+							// Hello message, which isn't sent by proxy and would be ignored by client
+						} else if (plen) {
+							// Messages should contain IPv4 or IPv6 source IP address data
+							switch(data[0]) {
+								case 4: // IPv4
+									if (plen >= 7) {
+										from.set((const void *)(data + 1),4,((((unsigned int)data[5]) & 0xff) << 8) | (((unsigned int)data[6]) & 0xff));
+										data += 7; // type + 4 byte IP + 2 byte port
+										plen -= 7;
+									} else {
+										_phy.close(sock);
+										return;
+									}
+									break;
+								case 6: // IPv6
+									if (plen >= 19) {
+										from.set((const void *)(data + 1),16,((((unsigned int)data[17]) & 0xff) << 8) | (((unsigned int)data[18]) & 0xff));
+										data += 19; // type + 16 byte IP + 2 byte port
+										plen -= 19;
+									} else {
+										_phy.close(sock);
+										return;
+									}
+									break;
+								case 0: // none/omitted
+									++data;
+									--plen;
+									break;
+								default: // invalid address type
+									_phy.close(sock);
+									return;
+							}
+
+							if (from) {
+								InetAddress fakeTcpLocalInterfaceAddress((uint32_t)0xffffffff,0xffff);
+								const ZT_ResultCode rc = _node->processWirePacket(
+									OSUtils::now(),
+									reinterpret_cast<struct sockaddr_storage *>(&fakeTcpLocalInterfaceAddress),
+									reinterpret_cast<struct sockaddr_storage *>(&from),
+									data,
+									plen,
+									&_nextBackgroundTaskDeadline);
+								if (ZT_ResultCode_isFatal(rc)) {
+									char tmp[256];
+									Utils::snprintf(tmp,sizeof(tmp),"fatal error code from processWirePacket: %d",(int)rc);
+									Mutex::Lock _l(_termReason_m);
+									_termReason = ONE_UNRECOVERABLE_ERROR;
+									_fatalErrorMessage = tmp;
+									this->terminate();
+									_phy.close(sock);
+									return;
+								}
+							}
+						}
+
+						if (tc->body.length() > (mlen + 5))
+							tc->body = tc->body.substr(mlen + 5);
+						else tc->body = "";
+					} else break;
+				}
+				break;
+
+		}
+	}
+
+	inline void phyOnTcpWritable(PhySocket *sock,void **uptr)
+	{
+		TcpConnection *tc = reinterpret_cast<TcpConnection *>(*uptr);
+		Mutex::Lock _l(tc->writeBuf_m);
+		if (tc->writeBuf.length() > 0) {
+			long sent = (long)_phy.streamSend(sock,tc->writeBuf.data(),(unsigned long)tc->writeBuf.length(),true);
+			if (sent > 0) {
+				tc->lastActivity = OSUtils::now();
+				if ((unsigned long)sent >= (unsigned long)tc->writeBuf.length()) {
+					tc->writeBuf = "";
+					_phy.setNotifyWritable(sock,false);
+					if (!tc->shouldKeepAlive)
+						_phy.close(sock); // will call close handler to delete from _tcpConnections
+				} else {
+					tc->writeBuf = tc->writeBuf.substr(sent);
+				}
+			}
+		} else {
+			_phy.setNotifyWritable(sock,false);
+		}
+	}
+
+	inline void phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,bool readable,bool writable) {}
+	inline void phyOnUnixAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN) {}
+	inline void phyOnUnixClose(PhySocket *sock,void **uptr) {}
+	inline void phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len) {}
+	inline void phyOnUnixWritable(PhySocket *sock,void **uptr,bool lwip_invoked) {}
+
+	inline int nodeVirtualNetworkConfigFunction(uint64_t nwid,void **nuptr,enum ZT_VirtualNetworkConfigOperation op,const ZT_VirtualNetworkConfig *nwc)
+	{
+		Mutex::Lock _l(_taps_m);
+		std::map< uint64_t,EthernetTap * >::iterator t(_taps.find(nwid));
+		switch(op) {
+			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP:
+				if (t == _taps.end()) {
+					try {
+						char friendlyName[1024];
+						Utils::snprintf(friendlyName,sizeof(friendlyName),"ZeroTier One [%.16llx]",nwid);
+						t = _taps.insert(std::pair< uint64_t,EthernetTap *>(nwid,new EthernetTap(
+							_homePath.c_str(),
+							MAC(nwc->mac),
+							nwc->mtu,
+							(unsigned int)ZT_IF_METRIC,
+							nwid,
+							friendlyName,
+							StapFrameHandler,
+							(void *)this))).first;
+						*nuptr = (void *)t->second;
+					} catch (std::exception &exc) {
+#ifdef __WINDOWS__
+						FILE *tapFailLog = fopen((_homePath + ZT_PATH_SEPARATOR_S"port_error_log.txt").c_str(),"a");
+						if (tapFailLog) {
+							fprintf(tapFailLog,"%.16llx: %s"ZT_EOL_S,(unsigned long long)nwid,exc.what());
+							fclose(tapFailLog);
+						}
+#else
+						fprintf(stderr,"ERROR: unable to configure virtual network port: %s"ZT_EOL_S,exc.what());
 #endif
-					*nuptr = (void*)0;
-					n.tap().reset();
-					_nets.erase(nwid);
-#if defined(__WINDOWS__) && ! defined(ZT_SDK)
-					if ((op == ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY) && (winInstanceId.length() > 0)) {
-						WindowsEthernetTap::deletePersistentTapDevice(winInstanceId.c_str());
-						WinFWHelper::removeICMPRules(nwid);
-					}
-#endif
-					if (op == ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY) {
-						char nlcpath[256];
-						OSUtils::ztsnprintf(nlcpath, sizeof(nlcpath), "%s" ZT_PATH_SEPARATOR_S "networks.d" ZT_PATH_SEPARATOR_S "%.16llx.local.conf", _homePath.c_str(), nwid);
-						OSUtils::rm(nlcpath);
+						return -999;
+					} catch ( ... ) {
+						return -999; // tap init failed
 					}
 				}
-				else {
-					_nets.erase(nwid);
+				// fall through...
+			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE:
+				if (t != _taps.end()) {
+					t->second->setEnabled(nwc->enabled != 0);
+
+					std::vector<InetAddress> &assignedIps = _tapAssignedIps[nwid];
+					std::vector<InetAddress> newAssignedIps;
+					for(unsigned int i=0;i<nwc->assignedAddressCount;++i)
+						newAssignedIps.push_back(InetAddress(nwc->assignedAddresses[i]));
+					std::sort(newAssignedIps.begin(),newAssignedIps.end());
+					newAssignedIps.erase(std::unique(newAssignedIps.begin(),newAssignedIps.end()),newAssignedIps.end());
+					for(std::vector<InetAddress>::iterator ip(newAssignedIps.begin());ip!=newAssignedIps.end();++ip) {
+						if (!std::binary_search(assignedIps.begin(),assignedIps.end(),*ip))
+							if (!t->second->addIp(*ip))
+								fprintf(stderr,"ERROR: unable to add ip address %s"ZT_EOL_S, ip->toString().c_str());
+					}
+					for(std::vector<InetAddress>::iterator ip(assignedIps.begin());ip!=assignedIps.end();++ip) {
+						if (!std::binary_search(newAssignedIps.begin(),newAssignedIps.end(),*ip))
+							if (!t->second->removeIp(*ip))
+								fprintf(stderr,"ERROR: unable to remove ip address %s"ZT_EOL_S, ip->toString().c_str());
+					}
+					assignedIps.swap(newAssignedIps);
+				} else {
+					return -999; // tap init failed
+				}
+				break;
+			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DOWN:
+			case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY:
+				if (t != _taps.end()) {
+#ifdef __WINDOWS__
+					std::string winInstanceId(t->second->instanceId());
+#endif
+					*nuptr = (void *)0;
+					delete t->second;
+					_taps.erase(t);
+					_tapAssignedIps.erase(nwid);
+#ifdef __WINDOWS__
+					if ((op == ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_DESTROY)&&(winInstanceId.length() > 0))
+						WindowsEthernetTap::deletePersistentTapDevice(winInstanceId.c_str());
+#endif
 				}
 				break;
 		}
 		return 0;
 	}
 
-	inline void nodeEventCallback(enum ZT_Event event, const void* metaData)
+	inline void nodeEventCallback(enum ZT_Event event,const void *metaData)
 	{
-		switch (event) {
+		switch(event) {
 			case ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION: {
 				Mutex::Lock _l(_termReason_m);
 				_termReason = ONE_IDENTITY_COLLISION;
 				_fatalErrorMessage = "identity/address collision";
 				this->terminate();
-			} break;
+			}	break;
 
 			case ZT_EVENT_TRACE: {
 				if (metaData) {
-					::fprintf(stderr, "%s" ZT_EOL_S, (const char*)metaData);
+					::fprintf(stderr,"%s"ZT_EOL_S,(const char *)metaData);
 					::fflush(stderr);
 				}
-			} break;
-
-			case ZT_EVENT_USER_MESSAGE: {
-				const ZT_UserMessage* um = reinterpret_cast<const ZT_UserMessage*>(metaData);
-				if ((um->typeId == ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE) && (_updater)) {
-					_updater->handleSoftwareUpdateUserMessage(um->origin, um->data, um->length);
-				}
-			} break;
-
-			case ZT_EVENT_REMOTE_TRACE: {
-				const ZT_RemoteTrace* rt = reinterpret_cast<const ZT_RemoteTrace*>(metaData);
-				if ((rt) && (rt->len > 0) && (rt->len <= ZT_MAX_REMOTE_TRACE_SIZE) && (rt->data))
-					_controller->handleRemoteTrace(*rt);
-			}
+			}	break;
 
 			default:
 				break;
 		}
 	}
 
-#if ZT_VAULT_SUPPORT
-	inline bool nodeVaultPutIdentity(enum ZT_StateObjectType type, const void* data, int len)
+	inline long nodeDataStoreGetFunction(const char *name,void *buf,unsigned long bufSize,unsigned long readIndex,unsigned long *totalSize)
 	{
-		bool retval = false;
-		if (type != ZT_STATE_OBJECT_IDENTITY_PUBLIC && type != ZT_STATE_OBJECT_IDENTITY_SECRET) {
-			return retval;
+		std::string p(_dataStorePrepPath(name));
+		if (!p.length())
+			return -2;
+
+		FILE *f = fopen(p.c_str(),"rb");
+		if (!f)
+			return -1;
+		if (fseek(f,0,SEEK_END) != 0) {
+			fclose(f);
+			return -2;
+		}
+		long ts = ftell(f);
+		if (ts < 0) {
+			fclose(f);
+			return -2;
+		}
+		*totalSize = (unsigned long)ts;
+		if (fseek(f,(long)readIndex,SEEK_SET) != 0) {
+			fclose(f);
+			return -2;
+		}
+		long n = (long)fread(buf,1,bufSize,f);
+		fclose(f);
+		return n;
+	}
+
+	inline int nodeDataStorePutFunction(const char *name,const void *data,unsigned long len,int secure)
+	{
+		std::string p(_dataStorePrepPath(name));
+		if (!p.length())
+			return -2;
+
+		if (!data) {
+			OSUtils::rm(p.c_str());
+			return 0;
 		}
 
-		CURL* curl = curl_easy_init();
-		if (curl) {
-			char token[512] = { 0 };
-			snprintf(token, sizeof(token), "X-Vault-Token: %s", _vaultToken.c_str());
+		FILE *f = fopen(p.c_str(),"wb");
+		if (!f)
+			return -1;
+		if (fwrite(data,len,1,f) == 1) {
+			fclose(f);
+			if (secure)
+				OSUtils::lockDownFile(p.c_str(),false);
+			return 0;
+		} else {
+			fclose(f);
+			OSUtils::rm(p.c_str());
+			return -1;
+		}
+	}
 
-			struct curl_slist* chunk = NULL;
-			chunk = curl_slist_append(chunk, token);
+	inline int nodeWirePacketSendFunction(const struct sockaddr_storage *localAddr,const struct sockaddr_storage *addr,const void *data,unsigned int len,unsigned int ttl)
+	{
+		unsigned int fromBindingNo = 0;
 
-			char content_type[512] = { 0 };
-			snprintf(content_type, sizeof(content_type), "Content-Type: application/json");
-
-			chunk = curl_slist_append(chunk, content_type);
-
-			curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
-
-			char url[2048] = { 0 };
-			snprintf(url, sizeof(url), "%s/v1/%s", _vaultURL.c_str(), _vaultPath.c_str());
-
-			curl_easy_setopt(curl, CURLOPT_URL, url);
-
-			json d = json::object();
-			if (type == ZT_STATE_OBJECT_IDENTITY_PUBLIC) {
-				std::string key((const char*)data, len);
-				d["public"] = key;
-			}
-			else if (type == ZT_STATE_OBJECT_IDENTITY_SECRET) {
-				std::string key((const char*)data, len);
-				d["secret"] = key;
+		if (addr->ss_family == AF_INET) {
+			if (reinterpret_cast<const struct sockaddr_in *>(localAddr)->sin_port == 0) {
+				// If sender is sending from wildcard (null address), choose the secondary backup
+				// port 1/4 of the time. (but only for IPv4)
+				fromBindingNo = (++_udpPortPickerCounter & 0x4) >> 2;
+				if (!_ports[fromBindingNo])
+					fromBindingNo = 0;
+			} else {
+				const uint16_t lp = reinterpret_cast<const struct sockaddr_in *>(localAddr)->sin_port;
+				if (lp == _portsBE[1])
+					fromBindingNo = 1;
+				else if (lp == _portsBE[2])
+					fromBindingNo = 2;
 			}
 
-			if (! d.empty()) {
-				std::string post = d.dump();
-
-				if (! post.empty()) {
-					curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post.c_str());
-					curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, post.length());
-
-#ifndef NDEBUG
-					curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
-#endif
-
-					CURLcode res = curl_easy_perform(curl);
-					if (res == CURLE_OK) {
-						long response_code = 0;
-						curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
-						if (response_code == 200 || response_code == 204) {
-							retval = true;
+#ifdef ZT_TCP_FALLBACK_RELAY
+			// TCP fallback tunnel support, currently IPv4 only
+			if ((len >= 16)&&(reinterpret_cast<const InetAddress *>(addr)->ipScope() == InetAddress::IP_SCOPE_GLOBAL)) {
+				// Engage TCP tunnel fallback if we haven't received anything valid from a global
+				// IP address in ZT_TCP_FALLBACK_AFTER milliseconds. If we do start getting
+				// valid direct traffic we'll stop using it and close the socket after a while.
+				const uint64_t now = OSUtils::now();
+				if (((now - _lastDirectReceiveFromGlobal) > ZT_TCP_FALLBACK_AFTER)&&((now - _lastRestart) > ZT_TCP_FALLBACK_AFTER)) {
+					if (_tcpFallbackTunnel) {
+						Mutex::Lock _l(_tcpFallbackTunnel->writeBuf_m);
+						if (!_tcpFallbackTunnel->writeBuf.length())
+							_phy.setNotifyWritable(_tcpFallbackTunnel->sock,true);
+						unsigned long mlen = len + 7;
+						_tcpFallbackTunnel->writeBuf.push_back((char)0x17);
+						_tcpFallbackTunnel->writeBuf.push_back((char)0x03);
+						_tcpFallbackTunnel->writeBuf.push_back((char)0x03); // fake TLS 1.2 header
+						_tcpFallbackTunnel->writeBuf.push_back((char)((mlen >> 8) & 0xff));
+						_tcpFallbackTunnel->writeBuf.push_back((char)(mlen & 0xff));
+						_tcpFallbackTunnel->writeBuf.push_back((char)4); // IPv4
+						_tcpFallbackTunnel->writeBuf.append(reinterpret_cast<const char *>(reinterpret_cast<const void *>(&(reinterpret_cast<const struct sockaddr_in *>(addr)->sin_addr.s_addr))),4);
+						_tcpFallbackTunnel->writeBuf.append(reinterpret_cast<const char *>(reinterpret_cast<const void *>(&(reinterpret_cast<const struct sockaddr_in *>(addr)->sin_port))),2);
+						_tcpFallbackTunnel->writeBuf.append((const char *)data,len);
+					} else if (((now - _lastSendToGlobalV4) < ZT_TCP_FALLBACK_AFTER)&&((now - _lastSendToGlobalV4) > (ZT_PING_CHECK_INVERVAL / 2))) {
+						std::vector<InetAddress> tunnelIps(_tcpFallbackResolver.get());
+						if (tunnelIps.empty()) {
+							if (!_tcpFallbackResolver.running())
+								_tcpFallbackResolver.resolveNow();
+						} else {
+							bool connected = false;
+							InetAddress addr(tunnelIps[(unsigned long)now % tunnelIps.size()]);
+							addr.setPort(ZT_TCP_FALLBACK_RELAY_PORT);
+							_phy.tcpConnect(reinterpret_cast<const struct sockaddr *>(&addr),connected);
 						}
 					}
 				}
+				_lastSendToGlobalV4 = now;
 			}
-
-			curl_easy_cleanup(curl);
-			curl = NULL;
-			curl_slist_free_all(chunk);
-			chunk = NULL;
-		}
-
-		return retval;
-	}
-#endif
-
-	inline void nodeStatePutFunction(enum ZT_StateObjectType type, const uint64_t id[2], const void* data, int len)
-	{
-#if ZT_VAULT_SUPPORT
-		if (_vaultEnabled && (type == ZT_STATE_OBJECT_IDENTITY_SECRET || type == ZT_STATE_OBJECT_IDENTITY_PUBLIC)) {
-			if (nodeVaultPutIdentity(type, data, len)) {
-				// value successfully written to Vault
-				return;
+#endif // ZT_TCP_FALLBACK_RELAY
+		} else if (addr->ss_family == AF_INET6) {
+			if (reinterpret_cast<const struct sockaddr_in6 *>(localAddr)->sin6_port != 0) {
+				const uint16_t lp = reinterpret_cast<const struct sockaddr_in6 *>(localAddr)->sin6_port;
+				if (lp == _portsBE[1])
+					fromBindingNo = 1;
+				else if (lp == _portsBE[2])
+					fromBindingNo = 2;
 			}
-			// else fallback to disk
-		}
-#endif
-		char p[1024];
-		FILE* f;
-		bool secure = false;
-		char dirname[1024];
-		dirname[0] = 0;
-
-		switch (type) {
-			case ZT_STATE_OBJECT_IDENTITY_PUBLIC:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "identity.public", _homePath.c_str());
-				break;
-			case ZT_STATE_OBJECT_IDENTITY_SECRET:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "identity.secret", _homePath.c_str());
-				secure = true;
-				break;
-			case ZT_STATE_OBJECT_PLANET:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "planet", _homePath.c_str());
-				break;
-			case ZT_STATE_OBJECT_MOON:
-				OSUtils::ztsnprintf(dirname, sizeof(dirname), "%s" ZT_PATH_SEPARATOR_S "moons.d", _homePath.c_str());
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "%.16llx.moon", dirname, (unsigned long long)id[0]);
-				break;
-			case ZT_STATE_OBJECT_NETWORK_CONFIG:
-				OSUtils::ztsnprintf(dirname, sizeof(dirname), "%s" ZT_PATH_SEPARATOR_S "networks.d", _homePath.c_str());
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "%.16llx.conf", dirname, (unsigned long long)id[0]);
-				break;
-			case ZT_STATE_OBJECT_PEER:
-				OSUtils::ztsnprintf(dirname, sizeof(dirname), "%s" ZT_PATH_SEPARATOR_S "peers.d", _homePath.c_str());
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "%.10llx.peer", dirname, (unsigned long long)id[0]);
-				break;
-			default:
-				return;
-		}
-
-		if ((len >= 0) && (data)) {
-			// Check to see if we've already written this first. This reduces
-			// redundant writes and I/O overhead on most platforms and has
-			// little effect on others.
-			f = fopen(p, "rb");
-			if (f) {
-				char* const buf = (char*)malloc(len * 4);
-				if (buf) {
-					long l = (long)fread(buf, 1, (size_t)(len * 4), f);
-					fclose(f);
-					if ((l == (long)len) && (memcmp(data, buf, l) == 0)) {
-						free(buf);
-						return;
-					}
-					free(buf);
-				}
-			}
-
-			f = fopen(p, "wb");
-			if ((! f) && (dirname[0])) {   // create subdirectory if it does not exist
-				OSUtils::mkdir(dirname);
-				f = fopen(p, "wb");
-			}
-			if (f) {
-				if (fwrite(data, len, 1, f) != 1)
-					fprintf(stderr, "WARNING: unable to write to file: %s (I/O error)" ZT_EOL_S, p);
-				fclose(f);
-				if (secure)
-					OSUtils::lockDownFile(p, false);
-			}
-			else {
-				fprintf(stderr, "WARNING: unable to write to file: %s (unable to open)" ZT_EOL_S, p);
-			}
-		}
-		else {
-			OSUtils::rm(p);
-		}
-	}
-
-#if ZT_VAULT_SUPPORT
-	inline int nodeVaultGetIdentity(enum ZT_StateObjectType type, void* data, unsigned int maxlen)
-	{
-		if (type != ZT_STATE_OBJECT_IDENTITY_SECRET && type != ZT_STATE_OBJECT_IDENTITY_PUBLIC) {
+		} else {
 			return -1;
 		}
 
-		int ret = -1;
-		CURL* curl = curl_easy_init();
-		if (curl) {
-			char token[512] = { 0 };
-			snprintf(token, sizeof(token), "X-Vault-Token: %s", _vaultToken.c_str());
-
-			struct curl_slist* chunk = NULL;
-			chunk = curl_slist_append(chunk, token);
-			curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
-
-			char url[2048] = { 0 };
-			snprintf(url, sizeof(url), "%s/v1/%s", _vaultURL.c_str(), _vaultPath.c_str());
-
-			curl_easy_setopt(curl, CURLOPT_URL, url);
-
-			std::string response;
-			std::string res_headers;
-
-			curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlResponseWrite);
-			curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-			curl_easy_setopt(curl, CURLOPT_HEADERDATA, &res_headers);
-
-#ifndef NDEBUG
-			curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+#ifdef ZT_BREAK_UDP
+		if (OSUtils::fileExists("/tmp/ZT_BREAK_UDP"))
+			return 0; // silently break UDP
 #endif
 
-			CURLcode res = curl_easy_perform(curl);
-
-			if (res == CURLE_OK) {
-				long response_code = 0;
-				curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
-				if (response_code == 200) {
-					try {
-						json payload = json::parse(response);
-						if (! payload["data"].is_null()) {
-							json& d = payload["data"];
-							if (type == ZT_STATE_OBJECT_IDENTITY_SECRET) {
-								std::string secret = OSUtils::jsonString(d["secret"], "");
-
-								if (! secret.empty()) {
-									ret = (int)secret.length();
-									memcpy(data, secret.c_str(), ret);
-								}
-							}
-							else if (type == ZT_STATE_OBJECT_IDENTITY_PUBLIC) {
-								std::string pub = OSUtils::jsonString(d["public"], "");
-
-								if (! pub.empty()) {
-									ret = (int)pub.length();
-									memcpy(data, pub.c_str(), ret);
-								}
-							}
-						}
-					}
-					catch (...) {
-						ret = -1;
-					}
-				}
-			}
-
-			curl_easy_cleanup(curl);
-			curl = NULL;
-			curl_slist_free_all(chunk);
-			chunk = NULL;
-		}
-		return ret;
-	}
-#endif
-
-	inline int nodeStateGetFunction(enum ZT_StateObjectType type, const uint64_t id[2], void* data, unsigned int maxlen)
-	{
-#if ZT_VAULT_SUPPORT
-		if (_vaultEnabled && (type == ZT_STATE_OBJECT_IDENTITY_SECRET || type == ZT_STATE_OBJECT_IDENTITY_PUBLIC)) {
-			int retval = nodeVaultGetIdentity(type, data, maxlen);
-			if (retval >= 0)
-				return retval;
-
-			// else continue file based lookup
-		}
-#endif
-		char p[4096];
-		switch (type) {
-			case ZT_STATE_OBJECT_IDENTITY_PUBLIC:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "identity.public", _homePath.c_str());
-				break;
-			case ZT_STATE_OBJECT_IDENTITY_SECRET:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "identity.secret", _homePath.c_str());
-				break;
-			case ZT_STATE_OBJECT_PLANET:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "planet", _homePath.c_str());
-				break;
-			case ZT_STATE_OBJECT_MOON:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "moons.d" ZT_PATH_SEPARATOR_S "%.16llx.moon", _homePath.c_str(), (unsigned long long)id[0]);
-				break;
-			case ZT_STATE_OBJECT_NETWORK_CONFIG:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "networks.d" ZT_PATH_SEPARATOR_S "%.16llx.conf", _homePath.c_str(), (unsigned long long)id[0]);
-				break;
-			case ZT_STATE_OBJECT_PEER:
-				OSUtils::ztsnprintf(p, sizeof(p), "%s" ZT_PATH_SEPARATOR_S "peers.d" ZT_PATH_SEPARATOR_S "%.10llx.peer", _homePath.c_str(), (unsigned long long)id[0]);
-				break;
-			default:
-				return -1;
-		}
-		FILE* f = fopen(p, "rb");
-		if (f) {
-			int n = (int)fread(data, 1, maxlen, f);
-			fclose(f);
-#if ZT_VAULT_SUPPORT
-			if (_vaultEnabled && (type == ZT_STATE_OBJECT_IDENTITY_SECRET || type == ZT_STATE_OBJECT_IDENTITY_PUBLIC)) {
-				// If we've gotten here while Vault is enabled, Vault does not know the key and it's been
-				// read from disk instead.
-				//
-				// We should put the value in Vault and remove the local file.
-				if (nodeVaultPutIdentity(type, data, n)) {
-					unlink(p);
-				}
-			}
-#endif
-			if (n >= 0)
-				return n;
-		}
-		return -1;
+		return (_bindings[fromBindingNo].udpSend(_phy,*(reinterpret_cast<const InetAddress *>(localAddr)),*(reinterpret_cast<const InetAddress *>(addr)),data,len,ttl)) ? 0 : -1;
 	}
 
-	inline int nodeWirePacketSendFunction(const int64_t localSocket, const struct sockaddr_storage* addr, const void* data, unsigned int len, unsigned int ttl)
+	inline void nodeVirtualNetworkFrameFunction(uint64_t nwid,void **nuptr,uint64_t sourceMac,uint64_t destMac,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len)
 	{
-#ifdef ZT_TCP_FALLBACK_RELAY
-		if (_allowTcpFallbackRelay) {
-			if (addr->ss_family == AF_INET) {
-				// TCP fallback tunnel support, currently IPv4 only
-				if ((len >= 16) && (reinterpret_cast<const InetAddress*>(addr)->ipScope() == InetAddress::IP_SCOPE_GLOBAL)) {
-					// Engage TCP tunnel fallback if we haven't received anything valid from a global
-					// IP address in ZT_TCP_FALLBACK_AFTER milliseconds. If we do start getting
-					// valid direct traffic we'll stop using it and close the socket after a while.
-					const int64_t now = OSUtils::now();
-					if (_forceTcpRelay || (((now - _lastDirectReceiveFromGlobal) > ZT_TCP_FALLBACK_AFTER) && ((now - _lastRestart) > ZT_TCP_FALLBACK_AFTER))) {
-						if (_tcpFallbackTunnel) {
-							bool flushNow = false;
-							{
-								Mutex::Lock _l(_tcpFallbackTunnel->writeq_m);
-								if (_tcpFallbackTunnel->writeq.size() < (1024 * 64)) {
-									if (_tcpFallbackTunnel->writeq.length() == 0) {
-										_phy.setNotifyWritable(_tcpFallbackTunnel->sock, true);
-										flushNow = true;
-									}
-									const unsigned long mlen = len + 7;
-									_tcpFallbackTunnel->writeq.push_back((char)0x17);
-									_tcpFallbackTunnel->writeq.push_back((char)0x03);
-									_tcpFallbackTunnel->writeq.push_back((char)0x03);	// fake TLS 1.2 header
-									_tcpFallbackTunnel->writeq.push_back((char)((mlen >> 8) & 0xff));
-									_tcpFallbackTunnel->writeq.push_back((char)(mlen & 0xff));
-									_tcpFallbackTunnel->writeq.push_back((char)4);	 // IPv4
-									_tcpFallbackTunnel->writeq.append(reinterpret_cast<const char*>(reinterpret_cast<const void*>(&(reinterpret_cast<const struct sockaddr_in*>(addr)->sin_addr.s_addr))), 4);
-									_tcpFallbackTunnel->writeq.append(reinterpret_cast<const char*>(reinterpret_cast<const void*>(&(reinterpret_cast<const struct sockaddr_in*>(addr)->sin_port))), 2);
-									_tcpFallbackTunnel->writeq.append((const char*)data, len);
-								}
-							}
-							if (flushNow) {
-								void* tmpptr = (void*)_tcpFallbackTunnel;
-								phyOnTcpWritable(_tcpFallbackTunnel->sock, &tmpptr);
-							}
-						}
-						else if (_forceTcpRelay || (((now - _lastSendToGlobalV4) < ZT_TCP_FALLBACK_AFTER) && ((now - _lastSendToGlobalV4) > (ZT_PING_CHECK_INTERVAL / 2)))) {
-							const InetAddress addr(_fallbackRelayAddress);
-							TcpConnection* tc = new TcpConnection();
-							{
-								Mutex::Lock _l(_tcpConnections_m);
-								_tcpConnections.push_back(tc);
-							}
-							tc->type = TcpConnection::TCP_TUNNEL_OUTGOING;
-							tc->remoteAddr = addr;
-							tc->lastReceive = OSUtils::now();
-							tc->parent = this;
-							tc->sock = (PhySocket*)0;	// set in connect handler
-							tc->messageSize = 0;
-							bool connected = false;
-							_phy.tcpConnect(reinterpret_cast<const struct sockaddr*>(&addr), connected, (void*)tc, true);
-						}
-					}
-					_lastSendToGlobalV4 = now;
-				}
-			}
-		}
-		if (_forceTcpRelay) {
-			// Shortcut here so that we don't emit any UDP packets
-			return 0;
-		}
-#endif	 // ZT_TCP_FALLBACK_RELAY
-
-		// Even when relaying we still send via UDP. This way if UDP starts
-		// working we can instantly "fail forward" to it and stop using TCP
-		// proxy fallback, which is slow.
-		if ((localSocket != -1) && (localSocket != 0) && (_binder.isUdpSocketValid((PhySocket*)((uintptr_t)localSocket)))) {
-			if ((ttl) && (addr->ss_family == AF_INET)) {
-				_phy.setIp4UdpTtl((PhySocket*)((uintptr_t)localSocket), ttl);
-			}
-			const bool r = _phy.udpSend((PhySocket*)((uintptr_t)localSocket), (const struct sockaddr*)addr, data, len);
-			if ((ttl) && (addr->ss_family == AF_INET)) {
-				_phy.setIp4UdpTtl((PhySocket*)((uintptr_t)localSocket), 255);
-			}
-			return ((r) ? 0 : -1);
-		}
-		else {
-			return ((_binder.udpSendAll(_phy, addr, data, len, ttl)) ? 0 : -1);
-		}
-	}
-
-	inline void nodeVirtualNetworkFrameFunction(uint64_t nwid, void** nuptr, uint64_t sourceMac, uint64_t destMac, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len)
-	{
-		NetworkState* n = reinterpret_cast<NetworkState*>(*nuptr);
-		if ((! n) || (! n->tap())) {
+		EthernetTap *tap = reinterpret_cast<EthernetTap *>(*nuptr);
+		if (!tap)
 			return;
-		}
-		n->tap()->put(MAC(sourceMac), MAC(destMac), etherType, data, len);
+		tap->put(MAC(sourceMac),MAC(destMac),etherType,data,len);
 	}
 
-	inline int nodePathCheckFunction(uint64_t ztaddr, const int64_t localSocket, const struct sockaddr_storage* remoteAddr)
+	inline int nodePathCheckFunction(const struct sockaddr_storage *localAddr,const struct sockaddr_storage *remoteAddr)
 	{
-		// Make sure we're not trying to do ZeroTier-over-ZeroTier
-		{
-			Mutex::Lock _l(_nets_m);
-			for (std::map<uint64_t, NetworkState>::const_iterator n(_nets.begin()); n != _nets.end(); ++n) {
-				if (n->second.tap()) {
-					std::vector<InetAddress> ips(n->second.tap()->ips());
-					for (std::vector<InetAddress>::const_iterator i(ips.begin()); i != ips.end(); ++i) {
-						if (i->containsAddress(*(reinterpret_cast<const InetAddress*>(remoteAddr)))) {
-							return 0;
-						}
+		Mutex::Lock _l(_taps_m);
+		for(std::map< uint64_t,EthernetTap * >::const_iterator t(_taps.begin());t!=_taps.end();++t) {
+			if (t->second) {
+				std::vector<InetAddress> ips(t->second->ips());
+				for(std::vector<InetAddress>::const_iterator i(ips.begin());i!=ips.end();++i) {
+					if (i->containsAddress(*(reinterpret_cast<const InetAddress *>(remoteAddr)))) {
+						return 0;
 					}
 				}
 			}
 		}
-
-		/* Note: I do not think we need to scan for overlap with managed routes
-		 * because of the "route forking" and interface binding that we do. This
-		 * ensures (we hope) that ZeroTier traffic will still take the physical
-		 * path even if its managed routes override this for other traffic. Will
-		 * revisit if we see recursion problems. */
-
-		// Check blacklists
-		const Hashtable<uint64_t, std::vector<InetAddress> >* blh = (const Hashtable<uint64_t, std::vector<InetAddress> >*)0;
-		const std::vector<InetAddress>* gbl = (const std::vector<InetAddress>*)0;
-		if (remoteAddr->ss_family == AF_INET) {
-			blh = &_v4Blacklists;
-			gbl = &_globalV4Blacklist;
-		}
-		else if (remoteAddr->ss_family == AF_INET6) {
-			blh = &_v6Blacklists;
-			gbl = &_globalV6Blacklist;
-		}
-		if (blh) {
-			Mutex::Lock _l(_localConfig_m);
-			const std::vector<InetAddress>* l = blh->get(ztaddr);
-			if (l) {
-				for (std::vector<InetAddress>::const_iterator a(l->begin()); a != l->end(); ++a) {
-					if (a->containsAddress(*reinterpret_cast<const InetAddress*>(remoteAddr)))
-						return 0;
-				}
-			}
-		}
-		if (gbl) {
-			for (std::vector<InetAddress>::const_iterator a(gbl->begin()); a != gbl->end(); ++a) {
-				if (a->containsAddress(*reinterpret_cast<const InetAddress*>(remoteAddr)))
-					return 0;
-			}
-		}
 		return 1;
 	}
 
-	inline int nodePathLookupFunction(uint64_t ztaddr, int family, struct sockaddr_storage* result)
+	inline void tapFrameHandler(uint64_t nwid,const MAC &from,const MAC &to,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len)
 	{
-		const Hashtable<uint64_t, std::vector<InetAddress> >* lh = (const Hashtable<uint64_t, std::vector<InetAddress> >*)0;
-		if (family < 0)
-			lh = (_node->prng() & 1) ? &_v4Hints : &_v6Hints;
-		else if (family == AF_INET)
-			lh = &_v4Hints;
-		else if (family == AF_INET6)
-			lh = &_v6Hints;
-		else
-			return 0;
-		const std::vector<InetAddress>* l = lh->get(ztaddr);
-		if ((l) && (! l->empty())) {
-			memcpy(result, &((*l)[(unsigned long)_node->prng() % l->size()]), sizeof(struct sockaddr_storage));
-			return 1;
+		_node->processVirtualNetworkFrame(OSUtils::now(),nwid,from.toInt(),to.toInt(),etherType,vlanId,data,len,&_nextBackgroundTaskDeadline);
+	}
+
+	inline void onHttpRequestToServer(TcpConnection *tc)
+	{
+		char tmpn[256];
+		std::string data;
+		std::string contentType("text/plain"); // default if not changed in handleRequest()
+		unsigned int scode = 404;
+
+		try {
+			if (_controlPlane)
+				scode = _controlPlane->handleRequest(tc->from,tc->parser.method,tc->url,tc->headers,tc->body,data,contentType);
+			else scode = 500;
+		} catch ( ... ) {
+			scode = 500;
 		}
-		else
-			return 0;
-	}
 
-	inline void tapFrameHandler(uint64_t nwid, const MAC& from, const MAC& to, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len)
-	{
-		_node->processVirtualNetworkFrame((void*)0, OSUtils::now(), nwid, from.toInt(), to.toInt(), etherType, vlanId, data, len, &_nextBackgroundTaskDeadline);
-	}
-
-	inline void onHttpResponseFromClient(TcpConnection* tc)
-	{
-		_phy.close(tc->sock);
-	}
-
-	bool shouldBindInterface(const char* ifname, const InetAddress& ifaddr)
-	{
-#if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux)
-		if ((ifname[0] == 'l') && (ifname[1] == 'o'))
-			return false;	// loopback
-		if ((ifname[0] == 'z') && (ifname[1] == 't'))
-			return false;	// sanity check: zt#
-		if ((ifname[0] == 't') && (ifname[1] == 'u') && (ifname[2] == 'n'))
-			return false;	// tun# is probably an OpenVPN tunnel or similar
-		if ((ifname[0] == 't') && (ifname[1] == 'a') && (ifname[2] == 'p'))
-			return false;	// tap# is probably an OpenVPN tunnel or similar
-#endif
-
-#ifdef __APPLE__
-		if ((ifname[0] == 'f') && (ifname[1] == 'e') && (ifname[2] == 't') && (ifname[3] == 'h'))
-			return false;	// ... as is feth#
-		if ((ifname[0] == 'l') && (ifname[1] == 'o'))
-			return false;	// loopback
-		if ((ifname[0] == 'z') && (ifname[1] == 't'))
-			return false;	// sanity check: zt#
-		if ((ifname[0] == 't') && (ifname[1] == 'u') && (ifname[2] == 'n'))
-			return false;	// tun# is probably an OpenVPN tunnel or similar
-		if ((ifname[0] == 't') && (ifname[1] == 'a') && (ifname[2] == 'p'))
-			return false;	// tap# is probably an OpenVPN tunnel or similar
-		if ((ifname[0] == 'u') && (ifname[1] == 't') && (ifname[2] == 'u') && (ifname[3] == 'n'))
-			return false;	// ... as is utun#
-#endif
-
-#ifdef __FreeBSD__
-		if ((ifname[0] == 'l') && (ifname[1] == 'o'))
-			return false;	// loopback
-		if ((ifname[0] == 'z') && (ifname[1] == 't'))
-			return false;	// sanity check: zt#
-#endif
-
-		{
-			Mutex::Lock _l(_localConfig_m);
-			for (std::vector<std::string>::const_iterator p(_interfacePrefixBlacklist.begin()); p != _interfacePrefixBlacklist.end(); ++p) {
-				if (! strncmp(p->c_str(), ifname, p->length()))
-					return false;
-			}
+		const char *scodestr;
+		switch(scode) {
+			case 200: scodestr = "OK"; break;
+			case 400: scodestr = "Bad Request"; break;
+			case 401: scodestr = "Unauthorized"; break;
+			case 403: scodestr = "Forbidden"; break;
+			case 404: scodestr = "Not Found"; break;
+			case 500: scodestr = "Internal Server Error"; break;
+			case 501: scodestr = "Not Implemented"; break;
+			case 503: scodestr = "Service Unavailable"; break;
+			default: scodestr = "Error"; break;
 		}
+
+		Utils::snprintf(tmpn,sizeof(tmpn),"HTTP/1.1 %.3u %s\r\nCache-Control: no-cache\r\nPragma: no-cache\r\n",scode,scodestr);
 		{
-			// Check global blacklists
-			const std::vector<InetAddress>* gbl = (const std::vector<InetAddress>*)0;
-			if (ifaddr.ss_family == AF_INET) {
-				gbl = &_globalV4Blacklist;
-			}
-			else if (ifaddr.ss_family == AF_INET6) {
-				gbl = &_globalV6Blacklist;
-			}
-			if (gbl) {
-				Mutex::Lock _l(_localConfig_m);
-				for (std::vector<InetAddress>::const_iterator a(gbl->begin()); a != gbl->end(); ++a) {
-					if (a->containsAddress(ifaddr))
+			Mutex::Lock _l(tc->writeBuf_m);
+			tc->writeBuf.assign(tmpn);
+			tc->writeBuf.append("Content-Type: ");
+			tc->writeBuf.append(contentType);
+			Utils::snprintf(tmpn,sizeof(tmpn),"\r\nContent-Length: %lu\r\n",(unsigned long)data.length());
+			tc->writeBuf.append(tmpn);
+			if (!tc->shouldKeepAlive)
+				tc->writeBuf.append("Connection: close\r\n");
+			tc->writeBuf.append("\r\n");
+			if (tc->parser.method != HTTP_HEAD)
+				tc->writeBuf.append(data);
+		}
+
+		_phy.setNotifyWritable(tc->sock,true);
+	}
+
+	inline void onHttpResponseFromClient(TcpConnection *tc)
+	{
+		if (!tc->shouldKeepAlive)
+			_phy.close(tc->sock); // will call close handler, which deletes from _tcpConnections
+	}
+
+	bool shouldBindInterface(const char *ifname,const InetAddress &ifaddr)
+	{
+		if (isBlacklistedLocalInterfaceForZeroTierTraffic(ifname))
+			return false;
+
+		Mutex::Lock _l(_taps_m);
+		for(std::map< uint64_t,EthernetTap * >::const_iterator t(_taps.begin());t!=_taps.end();++t) {
+			if (t->second) {
+				std::vector<InetAddress> ips(t->second->ips());
+				for(std::vector<InetAddress>::const_iterator i(ips.begin());i!=ips.end();++i) {
+					if (i->ipsEqual(ifaddr))
 						return false;
 				}
 			}
 		}
-		{
-			Mutex::Lock _l(_nets_m);
-			for (std::map<uint64_t, NetworkState>::const_iterator n(_nets.begin()); n != _nets.end(); ++n) {
-				if (n->second.tap()) {
-					std::vector<InetAddress> ips(n->second.tap()->ips());
-					for (std::vector<InetAddress>::const_iterator i(ips.begin()); i != ips.end(); ++i) {
-						if (i->ipsEqual(ifaddr))
-							return false;
-					}
-#ifdef _WIN32
-					if (n->second.tap()->friendlyName() == ifname)
-						return false;
-#endif
-				}
-			}
-		}
 
 		return true;
 	}
 
-	unsigned int _getRandomPort()
+	std::string _dataStorePrepPath(const char *name) const
 	{
-		unsigned int randp = 0;
-		Utils::getSecureRandom(&randp, sizeof(randp));
-		randp = 20000 + (randp % 45500);
-		for (int i = 0;; ++i) {
-			if (i > 1000) {
-				return 0;
-			}
-			else if (++randp >= 65536) {
-				randp = 20000;
-			}
-			if (_trialBind(randp))
-				break;
+		std::string p(_homePath);
+		p.push_back(ZT_PATH_SEPARATOR);
+		char lastc = (char)0;
+		for(const char *n=name;(*n);++n) {
+			if ((*n == '.')&&(lastc == '.'))
+				return std::string(); // don't allow ../../ stuff as a precaution
+			if (*n == '/') {
+				OSUtils::mkdir(p.c_str());
+				p.push_back(ZT_PATH_SEPARATOR);
+			} else p.push_back(*n);
+			lastc = *n;
 		}
-		return randp;
+		return p;
 	}
 
 	bool _trialBind(unsigned int port)
 	{
 		struct sockaddr_in in4;
 		struct sockaddr_in6 in6;
-		PhySocket* tb;
+		PhySocket *tb;
 
-		memset(&in4, 0, sizeof(in4));
+		memset(&in4,0,sizeof(in4));
 		in4.sin_family = AF_INET;
 		in4.sin_port = Utils::hton((uint16_t)port);
-		tb = _phy.udpBind(reinterpret_cast<const struct sockaddr*>(&in4), (void*)0, 0);
+		tb = _phy.udpBind(reinterpret_cast<const struct sockaddr *>(&in4),(void *)0,0);
 		if (tb) {
-			_phy.close(tb, false);
-			tb = _phy.tcpListen(reinterpret_cast<const struct sockaddr*>(&in4), (void*)0);
+			_phy.close(tb,false);
+			tb = _phy.tcpListen(reinterpret_cast<const struct sockaddr *>(&in4),(void *)0);
 			if (tb) {
-				_phy.close(tb, false);
+				_phy.close(tb,false);
 				return true;
 			}
 		}
 
-		memset(&in6, 0, sizeof(in6));
+		memset(&in6,0,sizeof(in6));
 		in6.sin6_family = AF_INET6;
 		in6.sin6_port = Utils::hton((uint16_t)port);
-		tb = _phy.udpBind(reinterpret_cast<const struct sockaddr*>(&in6), (void*)0, 0);
+		tb = _phy.udpBind(reinterpret_cast<const struct sockaddr *>(&in6),(void *)0,0);
 		if (tb) {
-			_phy.close(tb, false);
-			tb = _phy.tcpListen(reinterpret_cast<const struct sockaddr*>(&in6), (void*)0);
+			_phy.close(tb,false);
+			tb = _phy.tcpListen(reinterpret_cast<const struct sockaddr *>(&in6),(void *)0);
 			if (tb) {
-				_phy.close(tb, false);
+				_phy.close(tb,false);
 				return true;
 			}
 		}
@@ -4299,135 +1567,185 @@ class OneServiceImpl : public OneService {
 	}
 };
 
-static int SnodeVirtualNetworkConfigFunction(ZT_Node* node, void* uptr, void* tptr, uint64_t nwid, void** nuptr, enum ZT_VirtualNetworkConfigOperation op, const ZT_VirtualNetworkConfig* nwconf)
-{
-	return reinterpret_cast<OneServiceImpl*>(uptr)->nodeVirtualNetworkConfigFunction(nwid, nuptr, op, nwconf);
-}
-static void SnodeEventCallback(ZT_Node* node, void* uptr, void* tptr, enum ZT_Event event, const void* metaData)
-{
-	reinterpret_cast<OneServiceImpl*>(uptr)->nodeEventCallback(event, metaData);
-}
-static void SnodeStatePutFunction(ZT_Node* node, void* uptr, void* tptr, enum ZT_StateObjectType type, const uint64_t id[2], const void* data, int len)
-{
-	reinterpret_cast<OneServiceImpl*>(uptr)->nodeStatePutFunction(type, id, data, len);
-}
-static int SnodeStateGetFunction(ZT_Node* node, void* uptr, void* tptr, enum ZT_StateObjectType type, const uint64_t id[2], void* data, unsigned int maxlen)
-{
-	return reinterpret_cast<OneServiceImpl*>(uptr)->nodeStateGetFunction(type, id, data, maxlen);
-}
-static int SnodeWirePacketSendFunction(ZT_Node* node, void* uptr, void* tptr, int64_t localSocket, const struct sockaddr_storage* addr, const void* data, unsigned int len, unsigned int ttl)
-{
-	return reinterpret_cast<OneServiceImpl*>(uptr)->nodeWirePacketSendFunction(localSocket, addr, data, len, ttl);
-}
-static void SnodeVirtualNetworkFrameFunction(ZT_Node* node, void* uptr, void* tptr, uint64_t nwid, void** nuptr, uint64_t sourceMac, uint64_t destMac, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len)
-{
-	reinterpret_cast<OneServiceImpl*>(uptr)->nodeVirtualNetworkFrameFunction(nwid, nuptr, sourceMac, destMac, etherType, vlanId, data, len);
-}
-static int SnodePathCheckFunction(ZT_Node* node, void* uptr, void* tptr, uint64_t ztaddr, int64_t localSocket, const struct sockaddr_storage* remoteAddr)
-{
-	return reinterpret_cast<OneServiceImpl*>(uptr)->nodePathCheckFunction(ztaddr, localSocket, remoteAddr);
-}
-static int SnodePathLookupFunction(ZT_Node* node, void* uptr, void* tptr, uint64_t ztaddr, int family, struct sockaddr_storage* result)
-{
-	return reinterpret_cast<OneServiceImpl*>(uptr)->nodePathLookupFunction(ztaddr, family, result);
-}
-static void StapFrameHandler(void* uptr, void* tptr, uint64_t nwid, const MAC& from, const MAC& to, unsigned int etherType, unsigned int vlanId, const void* data, unsigned int len)
-{
-	reinterpret_cast<OneServiceImpl*>(uptr)->tapFrameHandler(nwid, from, to, etherType, vlanId, data, len);
-}
+static int SnodeVirtualNetworkConfigFunction(ZT_Node *node,void *uptr,uint64_t nwid,void **nuptr,enum ZT_VirtualNetworkConfigOperation op,const ZT_VirtualNetworkConfig *nwconf)
+{ return reinterpret_cast<OneServiceImpl *>(uptr)->nodeVirtualNetworkConfigFunction(nwid,nuptr,op,nwconf); }
+static void SnodeEventCallback(ZT_Node *node,void *uptr,enum ZT_Event event,const void *metaData)
+{ reinterpret_cast<OneServiceImpl *>(uptr)->nodeEventCallback(event,metaData); }
+static long SnodeDataStoreGetFunction(ZT_Node *node,void *uptr,const char *name,void *buf,unsigned long bufSize,unsigned long readIndex,unsigned long *totalSize)
+{ return reinterpret_cast<OneServiceImpl *>(uptr)->nodeDataStoreGetFunction(name,buf,bufSize,readIndex,totalSize); }
+static int SnodeDataStorePutFunction(ZT_Node *node,void *uptr,const char *name,const void *data,unsigned long len,int secure)
+{ return reinterpret_cast<OneServiceImpl *>(uptr)->nodeDataStorePutFunction(name,data,len,secure); }
+static int SnodeWirePacketSendFunction(ZT_Node *node,void *uptr,const struct sockaddr_storage *localAddr,const struct sockaddr_storage *addr,const void *data,unsigned int len,unsigned int ttl)
+{ return reinterpret_cast<OneServiceImpl *>(uptr)->nodeWirePacketSendFunction(localAddr,addr,data,len,ttl); }
+static void SnodeVirtualNetworkFrameFunction(ZT_Node *node,void *uptr,uint64_t nwid,void **nuptr,uint64_t sourceMac,uint64_t destMac,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len)
+{ reinterpret_cast<OneServiceImpl *>(uptr)->nodeVirtualNetworkFrameFunction(nwid,nuptr,sourceMac,destMac,etherType,vlanId,data,len); }
+static int SnodePathCheckFunction(ZT_Node *node,void *uptr,const struct sockaddr_storage *localAddr,const struct sockaddr_storage *remoteAddr)
+{ return reinterpret_cast<OneServiceImpl *>(uptr)->nodePathCheckFunction(localAddr,remoteAddr); }
 
-static int ShttpOnMessageBegin(http_parser* parser)
+#ifdef ZT_ENABLE_CLUSTER
+static void SclusterSendFunction(void *uptr,unsigned int toMemberId,const void *data,unsigned int len)
 {
-	TcpConnection* tc = reinterpret_cast<TcpConnection*>(parser->data);
+	OneServiceImpl *const impl = reinterpret_cast<OneServiceImpl *>(uptr);
+	const ClusterDefinition::MemberDefinition &md = (*(impl->_clusterDefinition))[toMemberId];
+	if (md.clusterEndpoint)
+		impl->_phy.udpSend(impl->_clusterMessageSocket,reinterpret_cast<const struct sockaddr *>(&(md.clusterEndpoint)),data,len);
+}
+static int SclusterGeoIpFunction(void *uptr,const struct sockaddr_storage *addr,int *x,int *y,int *z)
+{
+	OneServiceImpl *const impl = reinterpret_cast<OneServiceImpl *>(uptr);
+	return (int)(impl->_clusterDefinition->geo().locate(*(reinterpret_cast<const InetAddress *>(addr)),*x,*y,*z));
+}
+#endif
+
+static void StapFrameHandler(void *uptr,uint64_t nwid,const MAC &from,const MAC &to,unsigned int etherType,unsigned int vlanId,const void *data,unsigned int len)
+{ reinterpret_cast<OneServiceImpl *>(uptr)->tapFrameHandler(nwid,from,to,etherType,vlanId,data,len); }
+
+static int ShttpOnMessageBegin(http_parser *parser)
+{
+	TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
 	tc->currentHeaderField = "";
 	tc->currentHeaderValue = "";
 	tc->messageSize = 0;
-	tc->url.clear();
-	tc->status.clear();
+	tc->url = "";
+	tc->status = "";
 	tc->headers.clear();
-	tc->readq.clear();
+	tc->body = "";
 	return 0;
 }
-static int ShttpOnUrl(http_parser* parser, const char* ptr, size_t length)
+static int ShttpOnUrl(http_parser *parser,const char *ptr,size_t length)
 {
-	TcpConnection* tc = reinterpret_cast<TcpConnection*>(parser->data);
+	TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
 	tc->messageSize += (unsigned long)length;
 	if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
 		return -1;
-	tc->url.append(ptr, length);
+	tc->url.append(ptr,length);
 	return 0;
 }
-#if (HTTP_PARSER_VERSION_MAJOR >= 2) && (HTTP_PARSER_VERSION_MINOR >= 2)
-static int ShttpOnStatus(http_parser* parser, const char* ptr, size_t length)
-#else
-static int ShttpOnStatus(http_parser* parser)
-#endif
+static int ShttpOnStatus(http_parser *parser,const char *ptr,size_t length)
 {
-	return 0;
-}
-static int ShttpOnHeaderField(http_parser* parser, const char* ptr, size_t length)
-{
-	TcpConnection* tc = reinterpret_cast<TcpConnection*>(parser->data);
+	TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
 	tc->messageSize += (unsigned long)length;
 	if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
 		return -1;
-	if ((tc->currentHeaderField.length()) && (tc->currentHeaderValue.length())) {
+	tc->status.append(ptr,length);
+	return 0;
+}
+static int ShttpOnHeaderField(http_parser *parser,const char *ptr,size_t length)
+{
+	TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
+	tc->messageSize += (unsigned long)length;
+	if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
+		return -1;
+	if ((tc->currentHeaderField.length())&&(tc->currentHeaderValue.length())) {
 		tc->headers[tc->currentHeaderField] = tc->currentHeaderValue;
 		tc->currentHeaderField = "";
 		tc->currentHeaderValue = "";
 	}
-	for (size_t i = 0; i < length; ++i)
+	for(size_t i=0;i<length;++i)
 		tc->currentHeaderField.push_back(OSUtils::toLower(ptr[i]));
 	return 0;
 }
-static int ShttpOnValue(http_parser* parser, const char* ptr, size_t length)
+static int ShttpOnValue(http_parser *parser,const char *ptr,size_t length)
 {
-	TcpConnection* tc = reinterpret_cast<TcpConnection*>(parser->data);
+	TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
 	tc->messageSize += (unsigned long)length;
 	if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
 		return -1;
-	tc->currentHeaderValue.append(ptr, length);
+	tc->currentHeaderValue.append(ptr,length);
 	return 0;
 }
-static int ShttpOnHeadersComplete(http_parser* parser)
+static int ShttpOnHeadersComplete(http_parser *parser)
 {
-	TcpConnection* tc = reinterpret_cast<TcpConnection*>(parser->data);
-	if ((tc->currentHeaderField.length()) && (tc->currentHeaderValue.length()))
+	TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
+	if ((tc->currentHeaderField.length())&&(tc->currentHeaderValue.length()))
 		tc->headers[tc->currentHeaderField] = tc->currentHeaderValue;
 	return 0;
 }
-static int ShttpOnBody(http_parser* parser, const char* ptr, size_t length)
+static int ShttpOnBody(http_parser *parser,const char *ptr,size_t length)
 {
-	TcpConnection* tc = reinterpret_cast<TcpConnection*>(parser->data);
+	TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
 	tc->messageSize += (unsigned long)length;
 	if (tc->messageSize > ZT_MAX_HTTP_MESSAGE_SIZE)
 		return -1;
-	tc->readq.append(ptr, length);
+	tc->body.append(ptr,length);
 	return 0;
 }
-static int ShttpOnMessageComplete(http_parser* parser)
+static int ShttpOnMessageComplete(http_parser *parser)
 {
-	TcpConnection* tc = reinterpret_cast<TcpConnection*>(parser->data);
-	if (tc->type == TcpConnection::TCP_HTTP_INCOMING) {}
-	else {
+	TcpConnection *tc = reinterpret_cast<TcpConnection *>(parser->data);
+	tc->shouldKeepAlive = (http_should_keep_alive(parser) != 0);
+	tc->lastActivity = OSUtils::now();
+	if (tc->type == TcpConnection::TCP_HTTP_INCOMING) {
+		tc->parent->onHttpRequestToServer(tc);
+	} else {
 		tc->parent->onHttpResponseFromClient(tc);
 	}
 	return 0;
 }
 
-}	// anonymous namespace
+} // anonymous namespace
 
 std::string OneService::platformDefaultHomePath()
 {
-	return OSUtils::platformDefaultHomePath();
+#ifdef __UNIX_LIKE__
+
+#ifdef __APPLE__
+	// /Library/... on Apple
+	return std::string("/Library/Application Support/ZeroTier/One");
+#else
+
+#ifdef __BSD__
+	// BSD likes /var/db instead of /var/lib
+	return std::string("/var/db/zerotier-one");
+#else
+	// Use /var/lib for Linux and other *nix
+	return std::string("/var/lib/zerotier-one");
+#endif
+
+#endif
+
+#else // not __UNIX_LIKE__
+
+#ifdef __WINDOWS__
+	// Look up app data folder on Windows, e.g. C:\ProgramData\...
+	char buf[16384];
+	if (SUCCEEDED(SHGetFolderPathA(NULL,CSIDL_COMMON_APPDATA,NULL,0,buf)))
+		return (std::string(buf) + "\\ZeroTier\\One");
+	else return std::string("C:\\ZeroTier\\One");
+#else
+
+	return std::string(); // UNKNOWN PLATFORM
+
+#endif
+
+#endif // __UNIX_LIKE__ or not...
 }
 
-OneService* OneService::newInstance(const char* hp, unsigned int port)
-{
-	return new OneServiceImpl(hp, port);
-}
-OneService::~OneService()
+std::string OneService::autoUpdateUrl()
 {
+#ifdef ZT_AUTO_UPDATE
+
+/*
+#if defined(__LINUX__) && ( defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__i386) )
+	if (sizeof(void *) == 8)
+		return "http://download.zerotier.com/ZeroTierOneInstaller-linux-x64-LATEST.nfo";
+	else return "http://download.zerotier.com/ZeroTierOneInstaller-linux-x86-LATEST.nfo";
+#endif
+*/
+
+#if defined(__APPLE__) && ( defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__i386) )
+	return "http://download.zerotier.com/update/mac_intel/";
+#endif
+
+#ifdef __WINDOWS__
+	return "http://download.zerotier.com/update/win_intel/";
+#endif
+
+#endif // ZT_AUTO_UPDATE
+	return std::string();
 }
 
-}	// namespace ZeroTier
+OneService *OneService::newInstance(const char *hp,unsigned int port) { return new OneServiceImpl(hp,port); }
+OneService::~OneService() {}
+
+} // namespace ZeroTier
diff --git a/service/OneService.hpp b/service/OneService.hpp
index f63c70b26..21e80d3fc 100644
--- a/service/OneService.hpp
+++ b/service/OneService.hpp
@@ -1,45 +1,51 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef ZT_ONESERVICE_HPP
 #define ZT_ONESERVICE_HPP
 
 #include <string>
-#include <vector>
 
 namespace ZeroTier {
 
-#ifdef ZT_SDK
-class VirtualTap;
-// Use the virtual libzt endpoint instead of a tun/tap port driver
-namespace ZeroTier {
-typedef VirtualTap EthernetTap;
-}
-#endif
-
-// Forward declaration so we can avoid dragging everything in
-struct InetAddress;
-class Node;
-
 /**
  * Local service for ZeroTier One as system VPN/NFV provider
+ *
+ * If built with ZT_ENABLE_NETWORK_CONTROLLER defined, this includes and
+ * runs controller/SqliteNetworkController with a database called
+ * controller.db in the specified home directory.
+ *
+ * If built with ZT_AUTO_UPDATE, an official ZeroTier update URL is
+ * periodically checked and updates are automatically downloaded, verified
+ * against a built-in list of update signing keys, and installed. This is
+ * only supported for certain platforms.
+ *
+ * If built with ZT_ENABLE_CLUSTER, a 'cluster' file is checked and if
+ * present is read to determine the identity of other cluster members.
  */
-class OneService {
-  public:
+class OneService
+{
+public:
 	/**
 	 * Returned by node main if/when it terminates
 	 */
-	enum ReasonForTermination {
+	enum ReasonForTermination
+	{
 		/**
 		 * Instance is still running
 		 */
@@ -61,42 +67,16 @@ class OneService {
 		ONE_IDENTITY_COLLISION = 3
 	};
 
-	/**
-	 * Local settings for each network
-	 */
-	struct NetworkSettings {
-		/**
-		 * Allow this network to configure IP addresses and routes?
-		 */
-		bool allowManaged;
-
-		/**
-		 * Whitelist of addresses that can be configured by this network.
-		 * If empty and allowManaged is true, allow all private/pseudoprivate addresses.
-		 */
-		std::vector<InetAddress> allowManagedWhitelist;
-
-		/**
-		 * Allow configuration of IPs and routes within global (Internet) IP space?
-		 */
-		bool allowGlobal;
-
-		/**
-		 * Allow overriding of system default routes for "full tunnel" operation?
-		 */
-		bool allowDefault;
-
-		/**
-		 * Allow configuration of DNS for the network
-		 */
-		bool allowDNS;
-	};
-
 	/**
 	 * @return Platform default home path or empty string if this platform doesn't have one
 	 */
 	static std::string platformDefaultHomePath();
 
+	/**
+	 * @return Auto-update URL or empty string if auto-updates unsupported or not enabled
+	 */
+	static std::string autoUpdateUrl();
+
 	/**
 	 * Create a new instance of the service
 	 *
@@ -110,7 +90,9 @@ class OneService {
 	 * @param hp Home path
 	 * @param port TCP and UDP port for packets and HTTP control (if 0, pick random port)
 	 */
-	static OneService* newInstance(const char* hp, unsigned int port);
+	static OneService *newInstance(
+		const char *hp,
+		unsigned int port);
 
 	virtual ~OneService();
 
@@ -138,67 +120,29 @@ class OneService {
 	 */
 	virtual std::string portDeviceName(uint64_t nwid) const = 0;
 
-#ifdef ZT_SDK
 	/**
-	 * Whether we allow access to the service via local HTTP requests (disabled by default in libzt)
+	 * @return True if TCP fallback is currently active
 	 */
-	bool allowHttpBackplaneManagement = false;
-	/**
-	 * @return Reference to the Node
-	 */
-	virtual Node* getNode() = 0;
-	/**
-	 * Fills out a structure with network-specific route information
-	 */
-	virtual void getRoutes(uint64_t nwid, void* routeArray, unsigned int* numRoutes) = 0;
-#endif
+	virtual bool tcpFallbackActive() const = 0;
 
 	/**
 	 * Terminate background service (can be called from other threads)
 	 */
 	virtual void terminate() = 0;
 
-	/**
-	 * Get local settings for a network
-	 *
-	 * @param nwid Network ID
-	 * @param settings Buffer to fill with local network settings
-	 * @return True if network was found and settings is filled
-	 */
-	virtual bool getNetworkSettings(const uint64_t nwid, NetworkSettings& settings) const = 0;
-
-	/**
-	 * Set local settings for a network
-	 *
-	 * @param nwid Network ID
-	 * @param settings New network local settings
-	 * @return True if network was found and setting modified
-	 */
-	virtual bool setNetworkSettings(const uint64_t nwid, const NetworkSettings& settings) = 0;
-
 	/**
 	 * @return True if service is still running
 	 */
-	inline bool isRunning() const
-	{
-		return (this->reasonForTermination() == ONE_STILL_RUNNING);
-	}
+	inline bool isRunning() const { return (this->reasonForTermination() == ONE_STILL_RUNNING); }
 
-  protected:
-	OneService()
-	{
-	}
+protected:
+	OneService() {}
 
-  private:
-	OneService(const OneService& one)
-	{
-	}
-	inline OneService& operator=(const OneService& one)
-	{
-		return *this;
-	}
+private:
+	OneService(const OneService &one) {}
+	inline OneService &operator=(const OneService &one) { return *this; }
 };
 
-}	// namespace ZeroTier
+} // namespace ZeroTier
 
 #endif
diff --git a/service/README.md b/service/README.md
index 94e920a58..05f340d82 100644
--- a/service/README.md
+++ b/service/README.md
@@ -1,78 +1,9 @@
 ZeroTier One Network Virtualization Service
 ======
 
-This is the actual implementation of ZeroTier One, a service providing connectivity to ZeroTier virtual networks for desktops, laptops, servers, VMs, etc. (Mobile versions for iOS and Android have their own implementations in native Java and Objective C that leverage only the ZeroTier core engine.)
+This is the common background service implementation for ZeroTier One, the VPN-like OS-level network virtualization service.
 
-### Local Configuration File
-
-A file called `local.conf` in the ZeroTier [home](https://github.com/zerotier/ZeroTierOne/blob/6faca86bb424d0b9643b6efa50571f73310d8276/README.md) folder contains configuration options that apply to the local node. (It does not exist unless you create it). It can be used to set up trusted paths, blacklist physical paths, set up physical path hints for certain nodes, and define trusted upstream devices (federated roots). In a large deployment it can be deployed using a tool like Puppet, Chef, SaltStack, etc. to set a uniform configuration across systems.
-
-It's a JSON format file that can also be edited and rewritten by ZeroTier One itself, so ensure that proper JSON formatting is used. To validate your config, paste it into a website like [jsonlint.com](https://jsonlint.com), or use a tool like `jq`. 
-
-Check the output of `zerotier-cli info -j` to see if your configuration is being loaded.
-
-Settings available in `local.conf` (this is not valid JSON, and JSON does not allow comments):
-
-```javascript
-{
-	"physical": { /* Settings that apply to physical L2/L3 network paths. */
-		"NETWORK/bits": { /* Network e.g. 10.0.0.0/24 or fd00::/32 */
-			"blacklist": true|false, /* If true, blacklist this path for all ZeroTier traffic */
-			"trustedPathId": 0|!0, /* If present and nonzero, define this as a trusted path (see below) */
-			"mtu": 0|!0 /* if present and non-zero, set UDP maximum payload MTU for this path */
-		} /* ,... additional networks */
-	},
-	"virtual": { /* Settings applied to ZeroTier virtual network devices (VL1) */
-		"##########": { /* 10-digit ZeroTier address */
-			"try": [ "IP/port"/*,...*/ ], /* Hints on where to reach this peer if no upstreams/roots are online */
-			"blacklist": [ "NETWORK/bits"/*,...*/ ] /* Blacklist a physical path for only this peer. */
-		}
-	},
-	"settings": { /* Other global settings */
-		"primaryPort": 1-65535, /* If set, override default port of 9993 and any command line port */
-		"secondaryPort": 1-65535, /* If set, override default random secondary port */
-		"tertiaryPort": 1-65535, /* If set, override default random tertiary port */
-		"portMappingEnabled": true|false, /* If true (the default), try to use uPnP or NAT-PMP to map ports */
-		"allowSecondaryPort": true|false /* false will also disable secondary port */
-		"softwareUpdate": "apply"|"download"|"disable", /* Automatically apply updates, just download, or disable built-in software updates */
-		"softwareUpdateChannel": "release"|"beta", /* Software update channel */
-		"softwareUpdateDist": true|false, /* If true, distribute software updates (only really useful to ZeroTier, Inc. itself, default is false) */
-		"interfacePrefixBlacklist": [ "XXX",... ], /* Array of interface name prefixes (e.g. eth for eth#) to blacklist for ZT traffic */
-		"allowManagementFrom": [ "NETWORK/bits", ...] |null, /* If non-NULL, allow JSON/HTTP management from this IP network. Default is 127.0.0.1 only. */
-		"bind": [ "ip",... ], /* If present and non-null, bind to these IPs instead of to each interface (wildcard IP allowed) */
-		"allowTcpFallbackRelay": true|false, /* Allow or disallow establishment of TCP relay connections (true by default) */
-		"multipathMode": 0|1|2 /* multipath mode: none (0), random (1), proportional (2) */
-	}
-}
-```
-
- * **trustedPathId**: A trusted path is a physical network over which encryption and authentication are not required. This provides a performance boost but sacrifices all ZeroTier's security features when communicating over this path. Only use this if you know what you are doing and really need the performance! To set up a trusted path, all devices using it *MUST* have the *same trusted path ID* for the same network. Trusted path IDs are arbitrary positive non-zero integers. For example a group of devices on a LAN with IPs in 10.0.0.0/24 could use it as a fast trusted path if they all had the same trusted path ID of "25" defined for that network.
-
-An example `local.conf`:
-
-```javascript
-{
-	"physical": {
-		"10.0.0.0/24": {
-			"blacklist": true
-		},
-		"10.10.10.0/24": {
-			"trustedPathId": 101010024
-		},
-	},
-	"virtual": {
-		"feedbeef12": {
-			"role": "UPSTREAM",
-			"try": [ "10.10.20.1/9993" ],
-			"blacklist": [ "192.168.0.0/24" ]
-		}
-	},
-	"settings": {
-		"softwareUpdate": "apply",
-		"softwareUpdateChannel": "release"
-	}
-}
-```
+It provides a ready-made core I/O loop and a local HTTP-based JSON control bus for controlling the service. This control bus HTTP server can also serve the files in ui/ if this folder's contents are installed in the ZeroTier home folder. The ui/ implements a React-based HTML5 user interface which is then wrappered for various platforms via MacGap, Windows .NET WebControl, etc. It can also be used locally from scripts or via *curl*.
 
 ### Network Virtualization Service API
 
@@ -90,20 +21,30 @@ A *jsonp* URL argument may be supplied to request JSONP encapsulation. A JSONP r
  * Methods: GET
  * Returns: { object }
 
-| Field                 | Type          | Description                                       | Writable |
-| --------------------- | ------------- | ------------------------------------------------- | -------- |
-| address               | string        | 10-digit hex ZeroTier address of this node        | no       |
-| publicIdentity        | string        | This node's ZeroTier identity.public              | no       |
-| worldId               | integer       | ZeroTier world ID (never changes except for test) | no       |
-| worldTimestamp        | integer       | Timestamp of most recent world definition         | no       |
-| online                | boolean       | If true at least one upstream peer is reachable   | no       |
-| tcpFallbackActive     | boolean       | If true we are using slow TCP fallback            | no       |
-| relayPolicy           | string        | Relay policy: ALWAYS, TRUSTED, or NEVER           | no       |
-| versionMajor          | integer       | Software major version                            | no       |
-| versionMinor          | integer       | Software minor version                            | no       |
-| versionRev            | integer       | Software revision                                 | no       |
-| version               | string        | major.minor.revision                              | no       |
-| clock                 | integer       | Current system clock at node (ms since epoch)     | no       |
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td><td><b>Writable</b></td></tr>
+<tr><td>address</td><td>string</td><td>10-digit hexadecimal ZeroTier address of this node</td><td>no</td></tr>
+<tr><td>publicIdentity</td><td>string</td><td>Full public ZeroTier identity of this node</td><td>no</td></tr>
+<tr><td>online</td><td>boolean</td><td>Does this node appear to have upstream network access?</td><td>no</td></tr>
+<tr><td>tcpFallbackActive</td><td>boolean</td><td>Is TCP fallback mode active?</td><td>no</td></tr>
+<tr><td>versionMajor</td><td>integer</td><td>ZeroTier major version</td><td>no</td></tr>
+<tr><td>versionMinor</td><td>integer</td><td>ZeroTier minor version</td><td>no</td></tr>
+<tr><td>versionRev</td><td>integer</td><td>ZeroTier revision</td><td>no</td></tr>
+<tr><td>version</td><td>string</td><td>Version in major.minor.rev format</td><td>no</td></tr>
+<tr><td>clock</td><td>integer</td><td>Node system clock in ms since epoch</td><td>no</td></tr>
+</table>
+
+#### /config
+
+ * Purpose: Get or set local configuration
+ * Methods: GET, POST
+ * Returns: { object }
+
+No local configuration options are exposed yet.
+
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td><td><b>Writable</b></td></tr>
+</table>
 
 #### /network
 
@@ -123,36 +64,23 @@ To join a network, POST to it. Since networks have no mandatory writable paramet
 
 Most network settings are not writable, as they are defined by the network controller.
 
-| Field                 | Type          | Description                                       | Writable |
-| --------------------- | ------------- | ------------------------------------------------- | -------- |
-| id                    | string        | 16-digit hex network ID                           | no       |
-| nwid                  | string        | 16-digit hex network ID (legacy field)            | no       |
-| mac                   | string        | MAC address of network device for this network    | no       |
-| name                  | string        | Short name of this network (from controller)      | no       |
-| status                | string        | Network status (OK, ACCESS_DENIED, etc.)          | no       |
-| type                  | string        | Network type (PUBLIC or PRIVATE)                  | no       |
-| mtu                   | integer       | Ethernet MTU                                      | no       |
-| dhcp                  | boolean       | If true, DHCP should be used to get IP info       | no       |
-| bridge                | boolean       | If true, this device can bridge others            | no       |
-| broadcastEnabled      | boolean       | If true ff:ff:ff:ff:ff:ff broadcasts work         | no       |
-| portError             | integer       | Error code returned by underlying tap driver      | no       |
-| netconfRevision       | integer       | Network configuration revision ID                 | no       |
-| assignedAddresses     | [string]      | Array of ZeroTier-assigned IP addresses (/bits)   | no       |
-| routes                | [object]      | Array of ZeroTier-assigned routes (see below)     | no       |
-| portDeviceName        | string        | Name of virtual network device (if any)           | no       |
-| allowManaged          | boolean       | Allow IP and route management                     | yes      |
-| allowGlobal           | boolean       | Allow IPs and routes that overlap with global IPs | yes      |
-| allowDefault          | boolean       | Allow overriding of system default route          | yes      |
-| allowDNS              | boolean       | Allow configuration of DNS on network             | yes      |
-
-Route objects:
-
-| Field                 | Type          | Description                                       | Writable |
-| --------------------- | ------------- | ------------------------------------------------- | -------- |
-| target                | string        | Target network / netmask bits                     | no       |
-| via                   | string        | Gateway IP address (next hop) or null for LAN     | no       |
-| flags                 | integer       | Flags, currently always 0                         | no       |
-| metric                | integer       | Route metric (not currently used)                 | no       |
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td><td><b>Writable</b></td></tr>
+<tr><td>nwid</td><td>string</td><td>16-digit hex network ID</td><td>no</td></tr>
+<tr><td>mac</td><td>string</td><td>Ethernet MAC address of virtual network port</td><td>no</td></tr>
+<tr><td>name</td><td>string</td><td>Network short name as configured on network controller</td><td>no</td></tr>
+<tr><td>status</td><td>string</td><td>Network status: OK, ACCESS_DENIED, PORT_ERROR, etc.</td><td>no</td></tr>
+<tr><td>type</td><td>string</td><td>Network type, currently PUBLIC or PRIVATE</td><td>no</td></tr>
+<tr><td>mtu</td><td>integer</td><td>Ethernet MTU</td><td>no</td></tr>
+<tr><td>dhcp</td><td>boolean</td><td>If true, DHCP may be used to obtain an IP address</td><td>no</td></tr>
+<tr><td>bridge</td><td>boolean</td><td>If true, this node may bridge in other Ethernet devices</td><td>no</td></tr>
+<tr><td>broadcastEnabled</td><td>boolean</td><td>Is Ethernet broadcast (ff:ff:ff:ff:ff:ff) allowed?</td><td>no</td></tr>
+<tr><td>portError</td><td>integer</td><td>Error code (if any) returned by underlying OS "tap" driver</td><td>no</td></tr>
+<tr><td>netconfRevision</td><td>integer</td><td>Network configuration revision ID</td><td>no</td></tr>
+<tr><td>multicastSubscriptions</td><td>[string]</td><td>Multicast memberships as array of MAC/ADI tuples</td><td>no</td></tr>
+<tr><td>assignedAddresses</td><td>[string]</td><td>ZeroTier-managed IP address assignments as array of IP/netmask bits tuples</td><td>no</td></tr>
+<tr><td>portDeviceName</td><td>string</td><td>OS-specific network device name (if available)</td><td>no</td></tr>
+</table>
 
 #### /peer
 
@@ -164,29 +92,161 @@ Getting /peer returns an array of peer objects for all current peers. See below
 
 #### /peer/\<address\>
 
- * Purpose: Get or set information about a peer
- * Methods: GET, POST
+ * Purpose: Get information about a peer
+ * Methods: GET
  * Returns: { object }
 
-| Field                 | Type          | Description                                       | Writable |
-| --------------------- | ------------- | ------------------------------------------------- | -------- |
-| address               | string        | 10-digit hex ZeroTier address of peer             | no       |
-| versionMajor          | integer       | Major version of remote (if known)                | no       |
-| versionMinor          | integer       | Minor version of remote (if known)                | no       |
-| versionRev            | integer       | Software revision of remote (if known)            | no       |
-| version               | string        | major.minor.revision                              | no       |
-| latency               | integer       | Latency in milliseconds if known                  | no       |
-| role                  | string        | LEAF, UPSTREAM, ROOT or PLANET                    | no       |
-| paths                 | [object]      | Currently active physical paths (see below)       | no       |
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td><td><b>Writable</b></td></tr>
+<tr><td>address</td><td>string</td><td>10-digit hex ZeroTier address</td><td>no</td></tr>
+<tr><td>lastUnicastFrame</td><td>integer</td><td>Time of last unicast frame in ms since epoch</td><td>no</td></tr>
+<tr><td>lastMulticastFrame</td><td>integer</td><td>Time of last multicast frame in ms since epoch</td><td>no</td></tr>
+<tr><td>versionMajor</td><td>integer</td><td>Major version of remote if known</td><td>no</td></tr>
+<tr><td>versionMinor</td><td>integer</td><td>Minor version of remote if known</td><td>no</td></tr>
+<tr><td>versionRev</td><td>integer</td><td>Revision of remote if known</td><td>no</td></tr>
+<tr><td>version</td><td>string</td><td>Version in major.minor.rev format</td><td>no</td></tr>
+<tr><td>latency</td><td>integer</td><td>Latency in milliseconds if known</td><td>no</td></tr>
+<tr><td>role</td><td>string</td><td>LEAF, HUB, or ROOTSERVER</td><td>no</td></tr>
+<tr><td>paths</td><td>[object]</td><td>Array of path objects (see below)</td><td>no</td></tr>
+</table>
 
-Path objects:
+Path objects describe direct physical paths to peer. If no path objects are listed, peer is only reachable via indirect relay fallback. Path object format is:
 
-| Field                 | Type          | Description                                       | Writable |
-| --------------------- | ------------- | ------------------------------------------------- | -------- |
-| address               | string        | Physical socket address e.g. IP/port              | no       |
-| lastSend              | integer       | Time of last send through this path               | no       |
-| lastReceive           | integer       | Time of last receive through this path            | no       |
-| active                | boolean       | Is this path in use?                              | no       |
-| expired               | boolean       | Is this path expired?                             | no       |
-| preferred             | boolean       | Is this a current preferred path?                 | no       |
-| trustedPathId         | integer       | If nonzero this is a trusted path (unencrypted)   | no       |
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td><td><b>Writable</b></td></tr>
+<tr><td>address</td><td>string</td><td>Physical socket address e.g. IP/port for UDP</td><td>no</td></tr>
+<tr><td>lastSend</td><td>integer</td><td>Last send via this path in ms since epoch</td><td>no</td></tr>
+<tr><td>lastReceive</td><td>integer</td><td>Last receive via this path in ms since epoch</td><td>no</td></tr>
+<tr><td>fixed</td><td>boolean</td><td>If true, this is a statically-defined "fixed" path</td><td>no</td></tr>
+<tr><td>preferred</td><td>boolean</td><td>If true, this is the current preferred path</td><td>no</td></tr>
+</table>
+
+### Network Controller API
+
+If ZeroTier One was built with *ZT\_ENABLE\_NETWORK\_CONTROLLER* defined, the following API paths are available. Otherwise these paths will return 404.
+
+#### /controller
+
+ * Purpose: Check for controller function and return controller status
+ * Methods: GET
+ * Returns: { object }
+
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td><td><b>Writable</b></td></tr>
+<tr><td>controller</td><td>boolean</td><td>Always 'true' if controller is running</td><td>no</td></tr>
+<tr><td>apiVersion</td><td>integer</td><td>JSON API version, currently 1</td><td>no</td></tr>
+<tr><td>clock</td><td>integer</td><td>Controller system clock in ms since epoch</td><td>no</td></tr>
+</table>
+
+#### /controller/network
+
+ * Purpose: List all networks hosted by this controller
+ * Methods: GET
+ * Returns: [ string, ... ]
+
+This returns an array of 16-digit hexadecimal network IDs. Unlike /network under the top-level API, it does not dump full network information for all networks as this may be quite large for a large controller.
+
+#### /controller/network/\<network ID\>
+
+ * Purpose: Create, configure, and delete hosted networks
+ * Methods: GET, POST, DELETE
+ * Returns: { object }
+
+By making queries to this path you can create, configure, and delete networks. DELETE is final, so don't do it unless you really mean it.
+
+It's important to understand how network IDs work. The first ten digits (most significant 40 bits) of a network ID are the ZeroTier address of the controller. This is how clients find it. The last six digits (least significant 24 bits) are arbitrary and serve to identify the network uniquely on the controller.
+
+Thus a network's first ten digits *must* be the controller's address. If your controller is *deadbeef01*, then the networks it controls must have IDs like *deadbeef01feed02* or *deadbeef01beef03*. This API however *does not* enforce this requirement. It will allow you to add arbitrary network IDs, but they won't work since clients will never be able to find them. To create a new network with a random last six digits safely and atomically, you can POST to */controller/network/##########\_\_\_\_\_\_* where ########## is the controller's address and the underscores are as shown. This will pick a random unallocated network ID, which will be returned in the 'nwid' field of the returned JSON object.
+
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td><td><b>Writable</b></td></tr>
+<tr><td>nwid</td><td>string</td><td>16-digit hex network ID</td><td>no</td></tr>
+<tr><td>name</td><td>string</td><td>Short network name (max: 127 chars)</td><td>yes</td></tr>
+<tr><td>private</td><td>boolean</td><td>False if public network, true for access control</td><td>yes</td></tr>
+<tr><td>enableBroadcast</td><td>boolean</td><td>True to allow Ethernet broadcast (ff:ff:ff:ff:ff:ff)</td><td>yes</td></tr>
+<tr><td>allowPassiveBridging</td><td>boolean</td><td>True to allow any member to bridge (experimental!)</td><td>yes</td></tr>
+<tr><td>v4AssignMode</td><td>string</td><td>'none', 'zt', or 'dhcp' (see below)</td><td>yes</td></tr>
+<tr><td>v6AssignMode</td><td>string</td><td>'none', 'zt', or 'dhcp' (see below)</td><td>yes</td></tr>
+<tr><td>multicastLimit</td><td>integer</td><td>Maximum number of multicast recipients per multicast/broadcast address</td><td>yes</td></tr>
+<tr><td>creationTime</td><td>integer</td><td>Time network was created in ms since epoch</td><td>no</td></tr>
+<tr><td>revision</td><td>integer</td><td>Network config revision number</td><td>no</td></tr>
+<tr><td>memberRevisionCounter</td><td>integer</td><td>Current value of network revision counter (incremented after every member add or revision)</td><td>no</td></tr>
+<tr><td>clock</td><td>integer</td><td>Current clock in ms since epoch (for convenience)</td><td>no</td></tr>
+<tr><td>authorizedMemberCount</td><td>integer</td><td>Number of authorized members</td><td>no</td></tr>
+<tr><td>relays</td><td>[object]</td><td>Array of network-specific relay nodes (see below)</td><td>yes</td></tr>
+<tr><td>ipLocalRoutes</td><td>[string]</td><td>Array of IP network/netmask entries corresponding to networks routed directly via this interface (e.g. 10.0.0.0/8 to route 10.0.0.0 via this interface)</td></tr>
+<tr><td>ipAssignmentPools</td><td>[object]</td><td>Array of IP auto-assignment pools for 'zt' assignment mode</td><td>yes</td></tr>
+<tr><td>rules</td><td>[object]</td><td>Array of network flow rules (see below)</td><td>yes</td></tr>
+</table>
+
+The network member list includes both authorized and unauthorized members. DELETE unauthorized members to remove them from the list. Relays, IP assignment pools, and rules are edited via direct POSTs to the network object. New values replace all previous values.
+
+Networks must have rules. If there are no rules, the default action is 'deny'. As also documented in the Rule object definition below, rules currently only support etherType and allow/deny. Thus to make a functioning network, add etherType allow entries for IPV4/ARP and/or IPv6. Alternately you can add a null allow entry to allow all traffic, causing the network to behave like a normal pass-through switch.
+
+**Relay object format:**
+
+Relay objects define network-specific preferred relay nodes. Traffic to peers on this network will preferentially use these relays if they are available, and otherwise will fall back to the global rootserver infrastructure.
+
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td></tr>
+<tr><td>address</td><td>string</td><td>10-digit ZeroTier address of relay node</td></tr>
+<tr><td>phyAddress</td><td>string</td><td>Fixed path address in IP/port format e.g. 192.168.1.1/9993</td></tr>
+</table>
+
+**IP assignment pool object format:**
+
+IP assignment pools are only used if they are within a network specified in ipLocalRoutes.
+
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td></tr>
+<tr><td>ipRangeStart</td><td>string</td><td>Start of IP assignment range</td></tr>
+<tr><td>ipRangeEnd</td><td>string</td><td>End of IP assignment range</td></tr>
+</table>
+
+**Rule object format:**
+
+ * **Note**: at the moment, <u>only rules specifying allowed Ethernet types are used</u>. The database supports a richer rule set, but this is not implemented yet in the client. <u>Other types of rules will have no effect</u> (yet).
+
+Rules are matched in order of ruleNo. If no rules match, the default action is 'drop'. To allow all traffic, create a single rule with all *null* fields and an action of 'accept'.
+
+Rule object fields can be *null*, in which case they are omitted from the object. A null field indicates "no match on this criteria."
+
+IP related fields apply only to Ethernet frames of type IPv4 or IPV6. Otherwise they are ignored.
+
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td></tr>
+<tr><td>ruleNo</td><td>integer</td><td>User-defined rule ID and sort order</td></tr>
+<tr><td>nodeId</td><td>string</td><td>10-digit hex ZeroTier address of node if this rule is local to only one member</td></tr>
+<tr><td>sourcePort</td><td>string</td><td>10-digit hex ZeroTier address of source port on virtual switch (source device address)</td></tr>
+<tr><td>destPort</td><td>string</td><td>10-digit hex ZeroTier address of destination port on virtual switch (destination device address)</td></tr>
+<tr><td>vlanId</td><td>integer</td><td>Ethernet VLAN ID</td></tr>
+<tr><td>vlanPcp</td><td>integer</td><td>Ethernet VLAN priority code point (PCP) ID</td></tr>
+<tr><td>etherType</td><td>integer</td><td>Ethernet frame type</td></tr>
+<tr><td>macSource</td><td>string</td><td>Ethernet source MAC address</td></tr>
+<tr><td>macDest</td><td>string</td><td>Ethernet destination MAC address</td></tr>
+<tr><td>ipSource</td><td>string</td><td>Source IP address</td></tr>
+<tr><td>ipDest</td><td>string</td><td>Destination IP address</td></tr>
+<tr><td>ipTos</td><td>integer</td><td>IP TOS field</td></tr>
+<tr><td>ipProtocol</td><td>integer</td><td>IP protocol</td></tr>
+<tr><td>ipSourcePort</td><td>integer</td><td>IP source port</td></tr>
+<tr><td>ipDestPort</td><td>integer</td><td>IP destination port</td></tr>
+<tr><td>action</td><td>string</td><td>Rule action: accept, drop, etc.</td></tr>
+</table>
+
+#### /controller/network/\<network ID\>/member/\<address\>
+
+ * Purpose: Create, authorize, or remove a network member
+ * Methods: GET, POST, DELETE
+ * Returns: { object }
+
+<table>
+<tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td><td><b>Writable</b></td></tr>
+<tr><td>nwid</td><td>string</td><td>16-digit hex network ID</td><td>no</td></tr>
+<tr><td>clock</td><td>integer</td><td>Current clock in ms since epoch (for convenience)</td><td>no</td></tr>
+<tr><td>address</td><td>string</td><td>10-digit hex ZeroTier address</td><td>no</td></tr>
+<tr><td>authorized</td><td>boolean</td><td>Is member authorized?</td><td>yes</td></tr>
+<tr><td>activeBridge</td><td>boolean</td><td>This member is an active network bridge</td><td>yes</td></tr>
+<tr><td>identity</td><td>string</td><td>Full ZeroTier identity of member</td><td>no</td></tr>
+<tr><td>ipAssignments</td><td>[string]</td><td>Array of IP/bits IP assignments</td><td>yes</td></tr>
+<tr><td>memberRevision</td><td>integer</td><td>Member revision counter value from network at time of last revision or member creation</td><td>no</td></tr>
+</table>
diff --git a/service/SoftwareUpdater.cpp b/service/SoftwareUpdater.cpp
deleted file mode 100644
index 978370f68..000000000
--- a/service/SoftwareUpdater.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#include "../node/Constants.hpp"
-#include "../version.h"
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __WINDOWS__
-#include <iphlpapi.h>
-#include <netioapi.h>
-#include <shlobj.h>
-#include <windows.h>
-#include <winsock2.h>
-#else
-#include <ifaddrs.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#endif
-
-#include "../node/Buffer.hpp"
-#include "../node/Node.hpp"
-#include "../node/SHA512.hpp"
-#include "../node/Utils.hpp"
-#include "../osdep/OSUtils.hpp"
-#include "SoftwareUpdater.hpp"
-
-namespace ZeroTier {
-
-static int _compareVersion(unsigned int maj1, unsigned int min1, unsigned int rev1, unsigned int b1, unsigned int maj2, unsigned int min2, unsigned int rev2, unsigned int b2)
-{
-	if (maj1 > maj2) {
-		return 1;
-	}
-	else if (maj1 < maj2) {
-		return -1;
-	}
-	else {
-		if (min1 > min2) {
-			return 1;
-		}
-		else if (min1 < min2) {
-			return -1;
-		}
-		else {
-			if (rev1 > rev2) {
-				return 1;
-			}
-			else if (rev1 < rev2) {
-				return -1;
-			}
-			else {
-				if (b1 > b2) {
-					return 1;
-				}
-				else if (b1 < b2) {
-					return -1;
-				}
-				else {
-					return 0;
-				}
-			}
-		}
-	}
-}
-
-SoftwareUpdater::SoftwareUpdater(Node& node, const std::string& homePath) : _node(node), _lastCheckTime(0), _homePath(homePath), _channel(ZT_SOFTWARE_UPDATE_DEFAULT_CHANNEL), _distLog((FILE*)0), _latestValid(false), _downloadLength(0)
-{
-	OSUtils::rm((_homePath + ZT_PATH_SEPARATOR_S ZT_SOFTWARE_UPDATE_BIN_FILENAME).c_str());
-}
-
-SoftwareUpdater::~SoftwareUpdater()
-{
-	if (_distLog)
-		fclose(_distLog);
-}
-
-void SoftwareUpdater::setUpdateDistribution(bool distribute)
-{
-	_dist.clear();
-	if (distribute) {
-		_distLog = fopen((_homePath + ZT_PATH_SEPARATOR_S "update-dist.log").c_str(), "a");
-
-		const std::string udd(_homePath + ZT_PATH_SEPARATOR_S "update-dist.d");
-		const std::vector<std::string> ud(OSUtils::listDirectory(udd.c_str()));
-		for (std::vector<std::string>::const_iterator u(ud.begin()); u != ud.end(); ++u) {
-			// Each update has a companion .json file describing it. Other files are ignored.
-			if ((u->length() > 5) && (u->substr(u->length() - 5, 5) == ".json")) {
-				std::string buf;
-				if (OSUtils::readFile((udd + ZT_PATH_SEPARATOR_S + *u).c_str(), buf)) {
-					try {
-						_D d;
-						d.meta = OSUtils::jsonParse(buf);	// throws on invalid JSON
-
-						// If update meta is called e.g. foo.exe.json, then foo.exe is the update itself
-						const std::string binPath(udd + ZT_PATH_SEPARATOR_S + u->substr(0, u->length() - 5));
-						const std::string metaHash(OSUtils::jsonBinFromHex(d.meta[ZT_SOFTWARE_UPDATE_JSON_UPDATE_HASH]));
-						if ((metaHash.length() == 64) && (OSUtils::readFile(binPath.c_str(), d.bin))) {
-							std::array<uint8_t, 64> sha512;
-							SHA512(sha512.data(), d.bin.data(), (unsigned int)d.bin.length());
-							if (! memcmp(sha512.data(), metaHash.data(), 64)) {					// double check that hash in JSON is correct
-								d.meta[ZT_SOFTWARE_UPDATE_JSON_UPDATE_SIZE] = d.bin.length();	// override with correct value -- setting this in meta json is optional
-								std::array<uint8_t, 16> shakey;
-								memcpy(shakey.data(), sha512.data(), 16);
-								_dist[shakey] = d;
-								if (_distLog) {
-									fprintf(_distLog, ".......... INIT: DISTRIBUTING %s (%u bytes)" ZT_EOL_S, binPath.c_str(), (unsigned int)d.bin.length());
-									fflush(_distLog);
-								}
-							}
-						}
-					}
-					catch (...) {
-					}	// ignore bad meta JSON, etc.
-				}
-			}
-		}
-	}
-	else {
-		if (_distLog) {
-			fclose(_distLog);
-			_distLog = (FILE*)0;
-		}
-	}
-}
-
-void SoftwareUpdater::handleSoftwareUpdateUserMessage(uint64_t origin, const void* data, unsigned int len)
-{
-	if (! len)
-		return;
-	const MessageVerb v = (MessageVerb) reinterpret_cast<const uint8_t*>(data)[0];
-	try {
-		switch (v) {
-			case VERB_GET_LATEST:
-			case VERB_LATEST: {
-				nlohmann::json req = OSUtils::jsonParse(std::string(reinterpret_cast<const char*>(data) + 1, len - 1));	  // throws on invalid JSON
-				if (req.is_object()) {
-					const unsigned int rvMaj = (unsigned int)OSUtils::jsonInt(req[ZT_SOFTWARE_UPDATE_JSON_VERSION_MAJOR], 0);
-					const unsigned int rvMin = (unsigned int)OSUtils::jsonInt(req[ZT_SOFTWARE_UPDATE_JSON_VERSION_MINOR], 0);
-					const unsigned int rvRev = (unsigned int)OSUtils::jsonInt(req[ZT_SOFTWARE_UPDATE_JSON_VERSION_REVISION], 0);
-					const unsigned int rvBld = (unsigned int)OSUtils::jsonInt(req[ZT_SOFTWARE_UPDATE_JSON_VERSION_BUILD], 0);
-					const unsigned int rvPlatform = (unsigned int)OSUtils::jsonInt(req[ZT_SOFTWARE_UPDATE_JSON_PLATFORM], 0);
-					const unsigned int rvArch = (unsigned int)OSUtils::jsonInt(req[ZT_SOFTWARE_UPDATE_JSON_ARCHITECTURE], 0);
-					const unsigned int rvVendor = (unsigned int)OSUtils::jsonInt(req[ZT_SOFTWARE_UPDATE_JSON_VENDOR], 0);
-					const std::string rvChannel(OSUtils::jsonString(req[ZT_SOFTWARE_UPDATE_JSON_CHANNEL], ""));
-
-					if (v == VERB_GET_LATEST) {
-						if (! _dist.empty()) {
-							const nlohmann::json* latest = (const nlohmann::json*)0;
-							const std::string expectedSigner = OSUtils::jsonString(req[ZT_SOFTWARE_UPDATE_JSON_EXPECT_SIGNED_BY], "");
-							unsigned int bestVMaj = rvMaj;
-							unsigned int bestVMin = rvMin;
-							unsigned int bestVRev = rvRev;
-							unsigned int bestVBld = rvBld;
-							for (std::map<std::array<uint8_t, 16>, _D>::const_iterator d(_dist.begin()); d != _dist.end(); ++d) {
-								// The arch field in update description .json files can be an array for e.g. multi-arch update files
-								const nlohmann::json& dvArch2 = d->second.meta[ZT_SOFTWARE_UPDATE_JSON_ARCHITECTURE];
-								std::vector<unsigned int> dvArch;
-								if (dvArch2.is_array()) {
-									for (unsigned long i = 0; i < dvArch2.size(); ++i)
-										dvArch.push_back((unsigned int)OSUtils::jsonInt(dvArch2[i], 0));
-								}
-								else {
-									dvArch.push_back((unsigned int)OSUtils::jsonInt(dvArch2, 0));
-								}
-
-								if ((OSUtils::jsonInt(d->second.meta[ZT_SOFTWARE_UPDATE_JSON_PLATFORM], 0) == rvPlatform) && (std::find(dvArch.begin(), dvArch.end(), rvArch) != dvArch.end())
-									&& (OSUtils::jsonInt(d->second.meta[ZT_SOFTWARE_UPDATE_JSON_VENDOR], 0) == rvVendor) && (OSUtils::jsonString(d->second.meta[ZT_SOFTWARE_UPDATE_JSON_CHANNEL], "") == rvChannel)
-									&& (OSUtils::jsonString(d->second.meta[ZT_SOFTWARE_UPDATE_JSON_UPDATE_SIGNED_BY], "") == expectedSigner)) {
-									const unsigned int dvMaj = (unsigned int)OSUtils::jsonInt(d->second.meta[ZT_SOFTWARE_UPDATE_JSON_VERSION_MAJOR], 0);
-									const unsigned int dvMin = (unsigned int)OSUtils::jsonInt(d->second.meta[ZT_SOFTWARE_UPDATE_JSON_VERSION_MINOR], 0);
-									const unsigned int dvRev = (unsigned int)OSUtils::jsonInt(d->second.meta[ZT_SOFTWARE_UPDATE_JSON_VERSION_REVISION], 0);
-									const unsigned int dvBld = (unsigned int)OSUtils::jsonInt(d->second.meta[ZT_SOFTWARE_UPDATE_JSON_VERSION_BUILD], 0);
-									if (_compareVersion(dvMaj, dvMin, dvRev, dvBld, bestVMaj, bestVMin, bestVRev, bestVBld) > 0) {
-										latest = &(d->second.meta);
-										bestVMaj = dvMaj;
-										bestVMin = dvMin;
-										bestVRev = dvRev;
-										bestVBld = dvBld;
-									}
-								}
-							}
-							if (latest) {
-								std::string lj;
-								lj.push_back((char)VERB_LATEST);
-								lj.append(OSUtils::jsonDump(*latest));
-								_node.sendUserMessage((void*)0, origin, ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE, lj.data(), (unsigned int)lj.length());
-								if (_distLog) {
-									fprintf(
-										_distLog,
-										"%.10llx GET_LATEST %u.%u.%u_%u platform %u arch %u vendor %u channel %s -> LATEST %u.%u.%u_%u" ZT_EOL_S,
-										(unsigned long long)origin,
-										rvMaj,
-										rvMin,
-										rvRev,
-										rvBld,
-										rvPlatform,
-										rvArch,
-										rvVendor,
-										rvChannel.c_str(),
-										bestVMaj,
-										bestVMin,
-										bestVRev,
-										bestVBld);
-									fflush(_distLog);
-								}
-							}
-						}	// else no reply, since we have nothing to distribute
-					}
-					else {	 // VERB_LATEST
-
-						if ((origin == ZT_SOFTWARE_UPDATE_SERVICE) && (_compareVersion(rvMaj, rvMin, rvRev, rvBld, ZEROTIER_ONE_VERSION_MAJOR, ZEROTIER_ONE_VERSION_MINOR, ZEROTIER_ONE_VERSION_REVISION, ZEROTIER_ONE_VERSION_BUILD) > 0)
-							&& (OSUtils::jsonString(req[ZT_SOFTWARE_UPDATE_JSON_UPDATE_SIGNED_BY], "") == ZT_SOFTWARE_UPDATE_SIGNING_AUTHORITY)) {
-							const unsigned long len = (unsigned long)OSUtils::jsonInt(req[ZT_SOFTWARE_UPDATE_JSON_UPDATE_SIZE], 0);
-							const std::string hash = OSUtils::jsonBinFromHex(req[ZT_SOFTWARE_UPDATE_JSON_UPDATE_HASH]);
-							if ((len <= ZT_SOFTWARE_UPDATE_MAX_SIZE) && (hash.length() >= 16)) {
-								if (_latestMeta != req) {
-									_latestMeta = req;
-									_latestValid = false;
-									OSUtils::rm((_homePath + ZT_PATH_SEPARATOR_S ZT_SOFTWARE_UPDATE_BIN_FILENAME).c_str());
-									_download = std::string();
-									memcpy(_downloadHashPrefix.data(), hash.data(), 16);
-									_downloadLength = len;
-								}
-
-								if ((_downloadLength > 0) && (_download.length() < _downloadLength)) {
-									Buffer<128> gd;
-									gd.append((uint8_t)VERB_GET_DATA);
-									gd.append(_downloadHashPrefix.data(), 16);
-									gd.append((uint32_t)_download.length());
-									_node.sendUserMessage((void*)0, ZT_SOFTWARE_UPDATE_SERVICE, ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE, gd.data(), gd.size());
-								}
-							}
-						}
-					}
-				}
-			} break;
-
-			case VERB_GET_DATA:
-				if ((len >= 21) && (! _dist.empty())) {
-					unsigned long idx = (unsigned long)*(reinterpret_cast<const uint8_t*>(data) + 17) << 24;
-					idx |= (unsigned long)*(reinterpret_cast<const uint8_t*>(data) + 18) << 16;
-					idx |= (unsigned long)*(reinterpret_cast<const uint8_t*>(data) + 19) << 8;
-					idx |= (unsigned long)*(reinterpret_cast<const uint8_t*>(data) + 20);
-					std::array<uint8_t, 16> shakey;
-					memcpy(shakey.data(), reinterpret_cast<const uint8_t*>(data) + 1, 16);
-					std::map<std::array<uint8_t, 16>, _D>::iterator d(_dist.find(shakey));
-					if ((d != _dist.end()) && (idx < (unsigned long)d->second.bin.length())) {
-						Buffer<ZT_SOFTWARE_UPDATE_CHUNK_SIZE + 128> buf;
-						buf.append((uint8_t)VERB_DATA);
-						buf.append(reinterpret_cast<const uint8_t*>(data) + 1, 16);
-						buf.append((uint32_t)idx);
-						buf.append(d->second.bin.data() + idx, std::min((unsigned long)ZT_SOFTWARE_UPDATE_CHUNK_SIZE, (unsigned long)(d->second.bin.length() - idx)));
-						_node.sendUserMessage((void*)0, origin, ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE, buf.data(), buf.size());
-					}
-				}
-				break;
-
-			case VERB_DATA:
-				if ((len >= 21) && (_downloadLength > 0) && (! memcmp(_downloadHashPrefix.data(), reinterpret_cast<const uint8_t*>(data) + 1, 16))) {
-					unsigned long idx = (unsigned long)*(reinterpret_cast<const uint8_t*>(data) + 17) << 24;
-					idx |= (unsigned long)*(reinterpret_cast<const uint8_t*>(data) + 18) << 16;
-					idx |= (unsigned long)*(reinterpret_cast<const uint8_t*>(data) + 19) << 8;
-					idx |= (unsigned long)*(reinterpret_cast<const uint8_t*>(data) + 20);
-					if (idx == (unsigned long)_download.length()) {
-						_download.append(reinterpret_cast<const char*>(data) + 21, len - 21);
-						if (_download.length() < _downloadLength) {
-							Buffer<128> gd;
-							gd.append((uint8_t)VERB_GET_DATA);
-							gd.append(_downloadHashPrefix.data(), 16);
-							gd.append((uint32_t)_download.length());
-							_node.sendUserMessage((void*)0, ZT_SOFTWARE_UPDATE_SERVICE, ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE, gd.data(), gd.size());
-						}
-					}
-				}
-				break;
-
-			default:
-				if (_distLog) {
-					fprintf(_distLog, "%.10llx WARNING: bad update message verb==%u length==%u (unrecognized verb)" ZT_EOL_S, (unsigned long long)origin, (unsigned int)v, len);
-					fflush(_distLog);
-				}
-				break;
-		}
-	}
-	catch (...) {
-		if (_distLog) {
-			fprintf(_distLog, "%.10llx WARNING: bad update message verb==%u length==%u (unexpected exception, likely invalid JSON)" ZT_EOL_S, (unsigned long long)origin, (unsigned int)v, len);
-			fflush(_distLog);
-		}
-	}
-}
-
-bool SoftwareUpdater::check(const int64_t now)
-{
-	if ((now - _lastCheckTime) >= ZT_SOFTWARE_UPDATE_CHECK_PERIOD) {
-		_lastCheckTime = now;
-		char tmp[512];
-		const unsigned int len = OSUtils::ztsnprintf(
-			tmp,
-			sizeof(tmp),
-			"%c{\"" ZT_SOFTWARE_UPDATE_JSON_VERSION_MAJOR "\":%d,"
-			"\"" ZT_SOFTWARE_UPDATE_JSON_VERSION_MINOR "\":%d,"
-			"\"" ZT_SOFTWARE_UPDATE_JSON_VERSION_REVISION "\":%d,"
-			"\"" ZT_SOFTWARE_UPDATE_JSON_VERSION_BUILD "\":%d,"
-			"\"" ZT_SOFTWARE_UPDATE_JSON_EXPECT_SIGNED_BY "\":\"%s\","
-			"\"" ZT_SOFTWARE_UPDATE_JSON_PLATFORM "\":%d,"
-			"\"" ZT_SOFTWARE_UPDATE_JSON_ARCHITECTURE "\":%d,"
-			"\"" ZT_SOFTWARE_UPDATE_JSON_VENDOR "\":%d,"
-			"\"" ZT_SOFTWARE_UPDATE_JSON_CHANNEL "\":\"%s\"}",
-			(char)VERB_GET_LATEST,
-			ZEROTIER_ONE_VERSION_MAJOR,
-			ZEROTIER_ONE_VERSION_MINOR,
-			ZEROTIER_ONE_VERSION_REVISION,
-			ZEROTIER_ONE_VERSION_BUILD,
-			ZT_SOFTWARE_UPDATE_SIGNING_AUTHORITY,
-			ZT_BUILD_PLATFORM,
-			ZT_BUILD_ARCHITECTURE,
-			(int)ZT_VENDOR_ZEROTIER,
-			_channel.c_str());
-		_node.sendUserMessage((void*)0, ZT_SOFTWARE_UPDATE_SERVICE, ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE, tmp, len);
-	}
-
-	if (_latestValid)
-		return true;
-
-	if (_downloadLength > 0) {
-		if (_download.length() >= _downloadLength) {
-			// This is the very important security validation part that makes sure
-			// this software update doesn't have cooties.
-
-			const std::string binPath(_homePath + ZT_PATH_SEPARATOR_S ZT_SOFTWARE_UPDATE_BIN_FILENAME);
-			try {
-				// (1) Check the hash itself to make sure the image is basically okay
-				uint8_t sha512[64];
-				SHA512(sha512, _download.data(), (unsigned int)_download.length());
-				char hexbuf[(64 * 2) + 2];
-				if (OSUtils::jsonString(_latestMeta[ZT_SOFTWARE_UPDATE_JSON_UPDATE_HASH], "") == Utils::hex(sha512, 64, hexbuf)) {
-					// (2) Check signature by signing authority
-					const std::string sig(OSUtils::jsonBinFromHex(_latestMeta[ZT_SOFTWARE_UPDATE_JSON_UPDATE_SIGNATURE]));
-					if (Identity(ZT_SOFTWARE_UPDATE_SIGNING_AUTHORITY).verify(_download.data(), (unsigned int)_download.length(), sig.data(), (unsigned int)sig.length())) {
-						// (3) Try to save file, and if so we are good.
-						OSUtils::rm(binPath.c_str());
-						if (OSUtils::writeFile(binPath.c_str(), _download)) {
-							OSUtils::lockDownFile(binPath.c_str(), false);
-							_latestValid = true;
-							_download = std::string();
-							_downloadLength = 0;
-							return true;
-						}
-					}
-				}
-			}
-			catch (...) {
-			}	// any exception equals verification failure
-
-			// If we get here, checks failed.
-			OSUtils::rm(binPath.c_str());
-			_latestMeta = nlohmann::json();
-			_latestValid = false;
-			_download = std::string();
-			_downloadLength = 0;
-		}
-		else {
-			Buffer<128> gd;
-			gd.append((uint8_t)VERB_GET_DATA);
-			gd.append(_downloadHashPrefix.data(), 16);
-			gd.append((uint32_t)_download.length());
-			_node.sendUserMessage((void*)0, ZT_SOFTWARE_UPDATE_SERVICE, ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE, gd.data(), gd.size());
-		}
-	}
-
-	return false;
-}
-
-void SoftwareUpdater::apply()
-{
-	std::string updatePath(_homePath + ZT_PATH_SEPARATOR_S ZT_SOFTWARE_UPDATE_BIN_FILENAME);
-	if ((_latestMeta.is_object()) && (_latestValid) && (OSUtils::fileExists(updatePath.c_str(), false))) {
-#ifdef __WINDOWS__
-		std::string cmdArgs(OSUtils::jsonString(_latestMeta[ZT_SOFTWARE_UPDATE_JSON_UPDATE_EXEC_ARGS], ""));
-		if (cmdArgs.length() > 0) {
-			updatePath.push_back(' ');
-			updatePath.append(cmdArgs);
-		}
-		STARTUPINFOA si;
-		PROCESS_INFORMATION pi;
-		memset(&si, 0, sizeof(si));
-		memset(&pi, 0, sizeof(pi));
-		CreateProcessA(NULL, const_cast<LPSTR>(updatePath.c_str()), NULL, NULL, FALSE, CREATE_NO_WINDOW | CREATE_NEW_PROCESS_GROUP, NULL, NULL, &si, &pi);
-		// Windows doesn't exit here -- updater will stop the service during update, etc. -- but we do want to stop multiple runs from happening
-		_latestMeta = nlohmann::json();
-		_latestValid = false;
-#else
-		char* argv[256];
-		unsigned long ac = 0;
-		argv[ac++] = const_cast<char*>(updatePath.c_str());
-		const std::vector<std::string> argsSplit(OSUtils::split(OSUtils::jsonString(_latestMeta[ZT_SOFTWARE_UPDATE_JSON_UPDATE_EXEC_ARGS], "").c_str(), " ", "\\", "\""));
-		for (std::vector<std::string>::const_iterator a(argsSplit.begin()); a != argsSplit.end(); ++a) {
-			argv[ac] = const_cast<char*>(a->c_str());
-			if (++ac == 255)
-				break;
-		}
-		argv[ac] = (char*)0;
-		chmod(updatePath.c_str(), 0700);
-
-		// Close all open file descriptors except stdout/stderr/etc.
-		int minMyFd = STDIN_FILENO;
-		if (STDOUT_FILENO > minMyFd)
-			minMyFd = STDOUT_FILENO;
-		if (STDERR_FILENO > minMyFd)
-			minMyFd = STDERR_FILENO;
-		++minMyFd;
-#ifdef _SC_OPEN_MAX
-		int maxMyFd = (int)sysconf(_SC_OPEN_MAX);
-		if (maxMyFd <= minMyFd)
-			maxMyFd = 65536;
-#else
-		int maxMyFd = 65536;
-#endif
-		while (minMyFd < maxMyFd)
-			close(minMyFd++);
-
-		execv(updatePath.c_str(), argv);
-		fprintf(stderr, "FATAL: unable to execute software update binary at %s\n", updatePath.c_str());
-		exit(1);
-#endif
-	}
-}
-
-}	// namespace ZeroTier
diff --git a/service/SoftwareUpdater.hpp b/service/SoftwareUpdater.hpp
deleted file mode 100644
index 18539af44..000000000
--- a/service/SoftwareUpdater.hpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c)2019 ZeroTier, Inc.
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
- *
- * Change Date: 2026-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
- */
-/****/
-
-#ifndef ZT_SOFTWAREUPDATER_HPP
-#define ZT_SOFTWAREUPDATER_HPP
-
-#include "../include/ZeroTierOne.h"
-#include "../node/Identity.hpp"
-#include "../node/Packet.hpp"
-
-#include <array>
-#include <map>
-#include <nlohmann/json.hpp>
-#include <stdint.h>
-#include <stdio.h>
-#include <string>
-#include <vector>
-
-/**
- * VERB_USER_MESSAGE type ID for software update messages
- */
-#define ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE 100
-
-/**
- * ZeroTier address of node that provides software updates
- */
-#define ZT_SOFTWARE_UPDATE_SERVICE 0xb1d366e81fULL
-
-/**
- * ZeroTier identity that must be used to sign software updates
- *
- * df24360f3e - update-signing-key-0010 generated Fri Jan 13th, 2017 at 4:05pm PST
- */
-#define ZT_SOFTWARE_UPDATE_SIGNING_AUTHORITY "df24360f3e:0:06072642959c8dfb68312904d74d90197c8a7692697caa1b3fd769eca714f4370fab462fcee6ebcb5fffb63bc5af81f28a2514b2cd68daabb42f7352c06f21db"
-
-/**
- * Chunk size for in-band downloads (can be changed, designed to always fit in one UDP packet easily)
- */
-#define ZT_SOFTWARE_UPDATE_CHUNK_SIZE (ZT_PROTO_MAX_PACKET_LENGTH - 128)
-
-/**
- * Sanity limit for the size of an update binary image
- */
-#define ZT_SOFTWARE_UPDATE_MAX_SIZE (1024 * 1024 * 256)
-
-/**
- * How often (ms) do we check?
- */
-#define ZT_SOFTWARE_UPDATE_CHECK_PERIOD (60 * 10 * 1000)
-
-/**
- * Default update channel
- */
-#define ZT_SOFTWARE_UPDATE_DEFAULT_CHANNEL "release"
-
-/**
- * Filename for latest update's binary image
- */
-#define ZT_SOFTWARE_UPDATE_BIN_FILENAME "latest-update.exe"
-
-#define ZT_SOFTWARE_UPDATE_JSON_VERSION_MAJOR	 "vMajor"
-#define ZT_SOFTWARE_UPDATE_JSON_VERSION_MINOR	 "vMinor"
-#define ZT_SOFTWARE_UPDATE_JSON_VERSION_REVISION "vRev"
-#define ZT_SOFTWARE_UPDATE_JSON_VERSION_BUILD	 "vBuild"
-#define ZT_SOFTWARE_UPDATE_JSON_PLATFORM		 "platform"
-#define ZT_SOFTWARE_UPDATE_JSON_ARCHITECTURE	 "arch"
-#define ZT_SOFTWARE_UPDATE_JSON_VENDOR			 "vendor"
-#define ZT_SOFTWARE_UPDATE_JSON_CHANNEL			 "channel"
-#define ZT_SOFTWARE_UPDATE_JSON_EXPECT_SIGNED_BY "expectedSigner"
-#define ZT_SOFTWARE_UPDATE_JSON_UPDATE_SIGNED_BY "signer"
-#define ZT_SOFTWARE_UPDATE_JSON_UPDATE_SIGNATURE "signature"
-#define ZT_SOFTWARE_UPDATE_JSON_UPDATE_HASH		 "hash"
-#define ZT_SOFTWARE_UPDATE_JSON_UPDATE_SIZE		 "size"
-#define ZT_SOFTWARE_UPDATE_JSON_UPDATE_EXEC_ARGS "execArgs"
-#define ZT_SOFTWARE_UPDATE_JSON_UPDATE_URL		 "url"
-
-namespace ZeroTier {
-
-class Node;
-
-/**
- * This class handles retrieving and executing updates, or serving them
- */
-class SoftwareUpdater {
-  public:
-	/**
-	 * Each message begins with an 8-bit message verb
-	 */
-	enum MessageVerb {
-		/**
-		 * Payload: JSON containing current system platform, version, etc.
-		 */
-		VERB_GET_LATEST = 1,
-
-		/**
-		 * Payload: JSON describing latest update for this target. (No response is sent if there is none.)
-		 */
-		VERB_LATEST = 2,
-
-		/**
-		 * Payload:
-		 *   <[16] first 128 bits of hash of data object>
-		 *   <[4] 32-bit index of chunk to get>
-		 */
-		VERB_GET_DATA = 3,
-
-		/**
-		 * Payload:
-		 *   <[16] first 128 bits of hash of data object>
-		 *   <[4] 32-bit index of chunk>
-		 *   <[...] chunk data>
-		 */
-		VERB_DATA = 4
-	};
-
-	SoftwareUpdater(Node& node, const std::string& homePath);
-	~SoftwareUpdater();
-
-	/**
-	 * Set whether or not we will distribute updates
-	 *
-	 * @param distribute If true, scan update-dist.d now and distribute updates found there -- if false, clear and stop distributing
-	 */
-	void setUpdateDistribution(bool distribute);
-
-	/**
-	 * Handle a software update user message
-	 *
-	 * @param origin ZeroTier address of message origin
-	 * @param data Message payload
-	 * @param len Length of message
-	 */
-	void handleSoftwareUpdateUserMessage(uint64_t origin, const void* data, unsigned int len);
-
-	/**
-	 * Check for updates and do other update-related housekeeping
-	 *
-	 * It should be called about every 10 seconds.
-	 *
-	 * @return True if we've downloaded and verified an update
-	 */
-	bool check(const int64_t now);
-
-	/**
-	 * @return Meta-data for downloaded update or NULL if none
-	 */
-	inline const nlohmann::json& pending() const
-	{
-		return _latestMeta;
-	}
-
-	/**
-	 * Apply any ready update now
-	 *
-	 * Depending on the platform this function may never return and may forcibly
-	 * exit the process. It does nothing if no update is ready.
-	 */
-	void apply();
-
-	/**
-	 * Set software update channel
-	 *
-	 * @param channel 'release', 'beta', etc.
-	 */
-	inline void setChannel(const std::string& channel)
-	{
-		_channel = channel;
-	}
-
-  private:
-	Node& _node;
-	uint64_t _lastCheckTime;
-	std::string _homePath;
-	std::string _channel;
-	FILE* _distLog;
-
-	// Offered software updates if we are an update host (we have update-dist.d and update hosting is enabled)
-	struct _D {
-		nlohmann::json meta;
-		std::string bin;
-	};
-	std::map<std::array<uint8_t, 16>, _D> _dist;   // key is first 16 bytes of hash
-
-	nlohmann::json _latestMeta;
-	bool _latestValid;
-
-	std::string _download;
-	std::array<uint8_t, 16> _downloadHashPrefix;
-	unsigned long _downloadLength;
-};
-
-}	// namespace ZeroTier
-
-#endif
diff --git a/tcp-proxy/Makefile b/tcp-proxy/Makefile
index c14ce2728..af4e71e3a 100644
--- a/tcp-proxy/Makefile
+++ b/tcp-proxy/Makefile
@@ -1,9 +1,7 @@
 CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)
 
-INCLUDES?=-I../ext/prometheus-cpp-lite-1.0/core/include  -I../ext/prometheus-cpp-lite-1.0/simpleapi/include
-
 all:
-	$(CXX) -O3 -fno-rtti $(INCLUDES) -std=c++11 -pthread -frtti  -o tcp-proxy tcp-proxy.cpp ../node/Metrics.cpp
+	$(CXX) -O3 -fno-rtti -o tcp-proxy tcp-proxy.cpp
 
 clean:
 	rm -f *.o tcp-proxy *.dSYM
diff --git a/tcp-proxy/README.md b/tcp-proxy/README.md
index a19bc0067..6f347d640 100644
--- a/tcp-proxy/README.md
+++ b/tcp-proxy/README.md
@@ -1,39 +1,4 @@
 TCP Proxy Server
 ======
 
-This is the TCP proxy server we run for TCP tunneling from peers behind difficult NATs. Regular users won't have much use for this.
-
-## How to run your own
-Currently you must build it and distribute it to your server manually. 
-
-To reduce latency, the tcp-relay should be as close as possible to the nodes it is serving. A datacenter in the same city or the LAN would be ideal.
-
-
-### Build
-`cd tcp-relay`
-`make`
-
-### Point your node at it
- The default tcp relay is at `204.80.128.1/443` -an anycast address.
-
-#### Option 1 - local.conf configuration
-See [Service docs](https://github.com/zerotier/ZeroTierOne/blob/e0acccc3c918b59678033e585b31eb000c68fdf2/service/README.md) for more info on local.conf
-`{ "settings": { "tcpFallbackRelay": "198.51.100.123/443", "forceTcpRelay": true  } }`
-
-
-In this example, `forceTcpRelay` is enabled. This is helpful for testing or if you know you'll need tcp relay. It takes a few minutes for zerotier-one to realize it needs to relay otherwise. 
-
-
-
-#### Option 2 - redirect 204.80.128.1 to your own IP
-
-If you are the admin of the network that is blocking ZeroTier UDP, you can transparently redirect 204.80.128.1 to one of your IP addresses. Users won't need to edit their local client configuration.
-
-Configuring this in your Enterprise Firewall is left as an exercise to the reader.
-
-Here is an iptables example for illustrative purposes:
-
-``` shell
--A PREROUTING -p tcp -d 204.80.128.1 --dport 443 -j DNAT --to-destination 198.51.100.123
--A POSTROUTING -p tcp -d 198.51.100.123 --dport 443 -j SNAT --to-source 204.80.128.1
-```
+This is the TCP proxy server we run for TCP tunneling from peers behind fascist NATs. Regular users won't have much use for this.
diff --git a/tcp-proxy/tcp-proxy.cpp b/tcp-proxy/tcp-proxy.cpp
index f763306d6..2fe500d18 100644
--- a/tcp-proxy/tcp-proxy.cpp
+++ b/tcp-proxy/tcp-proxy.cpp
@@ -19,32 +19,32 @@
 // HACK! Will eventually use epoll() or something in Phy<> instead of select().
 // Also be sure to change ulimit -n and fs.file-max in /etc/sysctl.conf on relays.
 #if defined(__linux__) || defined(__LINUX__) || defined(__LINUX) || defined(LINUX)
-#include <bits/types.h>
 #include <linux/posix_types.h>
+#include <bits/types.h>
 #undef __FD_SETSIZE
 #define __FD_SETSIZE 1048576
 #undef FD_SETSIZE
 #define FD_SETSIZE 1048576
 #endif
 
-#include "../node/Metrics.hpp"
-#include "../osdep/Phy.hpp"
-
-#include <algorithm>
-#include <map>
-#include <set>
-#include <signal.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
 #include <time.h>
+#include <stdint.h>
 #include <unistd.h>
+#include <signal.h>
+
+#include <map>
+#include <set>
+#include <string>
+#include <algorithm>
 #include <vector>
 
+#include "../osdep/Phy.hpp"
+
 #define ZT_TCP_PROXY_CONNECTION_TIMEOUT_SECONDS 300
-#define ZT_TCP_PROXY_TCP_PORT					443
+#define ZT_TCP_PROXY_TCP_PORT 443
 
 using namespace ZeroTier;
 
@@ -86,229 +86,227 @@ using namespace ZeroTier;
  */
 
 struct TcpProxyService;
-struct TcpProxyService {
-	Phy<TcpProxyService*>* phy;
+struct TcpProxyService
+{
+	Phy<TcpProxyService *> *phy;
 	int udpPortCounter;
-	struct Client {
+	struct Client
+	{
 		char tcpReadBuf[131072];
 		char tcpWriteBuf[131072];
 		unsigned long tcpWritePtr;
 		unsigned long tcpReadPtr;
-		PhySocket* tcp;
-		PhySocket* udp;
+		PhySocket *tcp;
+		PhySocket *udp;
 		time_t lastActivity;
 		bool newVersion;
 	};
-	std::map<PhySocket*, Client> clients;
+	std::map< PhySocket *,Client > clients;
 
-	PhySocket* getUnusedUdp(void* uptr)
+	PhySocket *getUnusedUdp(void *uptr)
 	{
-		for (int i = 0; i < 65535; ++i) {
+		for(int i=0;i<65535;++i) {
 			++udpPortCounter;
 			if (udpPortCounter > 0xfffe)
 				udpPortCounter = 1024;
 			struct sockaddr_in laddr;
-			memset(&laddr, 0, sizeof(struct sockaddr_in));
+			memset(&laddr,0,sizeof(struct sockaddr_in));
 			laddr.sin_family = AF_INET;
 			laddr.sin_port = htons((uint16_t)udpPortCounter);
-			PhySocket* udp = phy->udpBind(reinterpret_cast<struct sockaddr*>(&laddr), uptr);
+			PhySocket *udp = phy->udpBind(reinterpret_cast<struct sockaddr *>(&laddr),uptr);
 			if (udp)
 				return udp;
 		}
-		return (PhySocket*)0;
+		return (PhySocket *)0;
 	}
 
-	void phyOnDatagram(PhySocket* sock, void** uptr, const struct sockaddr* localAddr, const struct sockaddr* from, void* data, unsigned long len)
+	void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len)
 	{
-		if (! *uptr)
+		if (!*uptr)
 			return;
-		if ((from->sa_family == AF_INET) && (len >= 16) && (len < 2048)) {
-			Client& c = *((Client*)*uptr);
-			c.lastActivity = time((time_t*)0);
+		if ((from->sa_family == AF_INET)&&(len >= 16)&&(len < 2048)) {
+			Client &c = *((Client *)*uptr);
+			c.lastActivity = time((time_t *)0);
 
 			unsigned long mlen = len;
 			if (c.newVersion)
-				mlen += 7;	 // new clients get IP info
+				mlen += 7; // new clients get IP info
 
 			if ((c.tcpWritePtr + 5 + mlen) <= sizeof(c.tcpWriteBuf)) {
-				if (! c.tcpWritePtr)
-					phy->setNotifyWritable(c.tcp, true);
+				if (!c.tcpWritePtr)
+					phy->tcpSetNotifyWritable(c.tcp,true);
 
-				c.tcpWriteBuf[c.tcpWritePtr++] = 0x17;	 // look like TLS data
-				c.tcpWriteBuf[c.tcpWritePtr++] = 0x03;	 // look like TLS 1.2
-				c.tcpWriteBuf[c.tcpWritePtr++] = 0x03;	 // look like TLS 1.2
+				c.tcpWriteBuf[c.tcpWritePtr++] = 0x17; // look like TLS data
+				c.tcpWriteBuf[c.tcpWritePtr++] = 0x03; // look like TLS 1.2
+				c.tcpWriteBuf[c.tcpWritePtr++] = 0x03; // look like TLS 1.2
 
 				c.tcpWriteBuf[c.tcpWritePtr++] = (char)((mlen >> 8) & 0xff);
 				c.tcpWriteBuf[c.tcpWritePtr++] = (char)(mlen & 0xff);
 
 				if (c.newVersion) {
-					c.tcpWriteBuf[c.tcpWritePtr++] = (char)4;	// IPv4
-					*((uint32_t*)(c.tcpWriteBuf + c.tcpWritePtr)) = ((const struct sockaddr_in*)from)->sin_addr.s_addr;
+					c.tcpWriteBuf[c.tcpWritePtr++] = (char)4; // IPv4
+					*((uint32_t *)(c.tcpWriteBuf + c.tcpWritePtr)) = ((const struct sockaddr_in *)from)->sin_addr.s_addr;
 					c.tcpWritePtr += 4;
-					*((uint16_t*)(c.tcpWriteBuf + c.tcpWritePtr)) = ((const struct sockaddr_in*)from)->sin_port;
+					*((uint16_t *)(c.tcpWriteBuf + c.tcpWritePtr)) = ((const struct sockaddr_in *)from)->sin_port;
 					c.tcpWritePtr += 2;
 				}
 
-				for (unsigned long i = 0; i < len; ++i)
-					c.tcpWriteBuf[c.tcpWritePtr++] = ((const char*)data)[i];
+				for(unsigned long i=0;i<len;++i)
+					c.tcpWriteBuf[c.tcpWritePtr++] = ((const char *)data)[i];
 			}
 
-			printf("<< UDP %s:%d -> %.16llx\n", inet_ntoa(reinterpret_cast<const struct sockaddr_in*>(from)->sin_addr), (int)ntohs(reinterpret_cast<const struct sockaddr_in*>(from)->sin_port), (unsigned long long)&c);
+			//printf("<< UDP %s:%d -> %.16llx\n",inet_ntoa(reinterpret_cast<const struct sockaddr_in *>(from)->sin_addr),(int)ntohs(reinterpret_cast<const struct sockaddr_in *>(from)->sin_port),(unsigned long long)&c);
 		}
 	}
 
-	void phyOnTcpConnect(PhySocket* sock, void** uptr, bool success)
+	void phyOnTcpConnect(PhySocket *sock,void **uptr,bool success)
 	{
 		// unused, we don't initiate outbound connections
 	}
 
-	void phyOnTcpAccept(PhySocket* sockL, PhySocket* sockN, void** uptrL, void** uptrN, const struct sockaddr* from)
+	void phyOnTcpAccept(PhySocket *sockL,PhySocket *sockN,void **uptrL,void **uptrN,const struct sockaddr *from)
 	{
-		Client& c = clients[sockN];
-		PhySocket* udp = getUnusedUdp((void*)&c);
-		if (! udp) {
+		Client &c = clients[sockN];
+		PhySocket *udp = getUnusedUdp((void *)&c);
+		if (!udp) {
 			phy->close(sockN);
 			clients.erase(sockN);
-			printf("** TCP rejected, no more UDP ports to assign\n");
+			//printf("** TCP rejected, no more UDP ports to assign\n");
 			return;
 		}
 		c.tcpWritePtr = 0;
 		c.tcpReadPtr = 0;
 		c.tcp = sockN;
 		c.udp = udp;
-		c.lastActivity = time((time_t*)0);
+		c.lastActivity = time((time_t *)0);
 		c.newVersion = false;
-		*uptrN = (void*)&c;
-		printf("<< TCP from %s -> %.16llx\n", inet_ntoa(reinterpret_cast<const struct sockaddr_in*>(from)->sin_addr), (unsigned long long)&c);
+		*uptrN = (void *)&c;
+		//printf("<< TCP from %s -> %.16llx\n",inet_ntoa(reinterpret_cast<const struct sockaddr_in *>(from)->sin_addr),(unsigned long long)&c);
 	}
 
-	void phyOnTcpClose(PhySocket* sock, void** uptr)
+	void phyOnTcpClose(PhySocket *sock,void **uptr)
 	{
-		if (! *uptr)
+		if (!*uptr)
 			return;
-		Client& c = *((Client*)*uptr);
+		Client &c = *((Client *)*uptr);
 		phy->close(c.udp);
 		clients.erase(sock);
-		printf("** TCP %.16llx closed\n", (unsigned long long)*uptr);
+		//printf("** TCP %.16llx closed\n",(unsigned long long)*uptr);
 	}
 
-	void phyOnTcpData(PhySocket* sock, void** uptr, void* data, unsigned long len)
+	void phyOnTcpData(PhySocket *sock,void **uptr,void *data,unsigned long len)
 	{
-		Client& c = *((Client*)*uptr);
-		c.lastActivity = time((time_t*)0);
+		Client &c = *((Client *)*uptr);
+		c.lastActivity = time((time_t *)0);
 
-		for (unsigned long i = 0; i < len; ++i) {
+		for(unsigned long i=0;i<len;++i) {
 			if (c.tcpReadPtr >= sizeof(c.tcpReadBuf)) {
 				phy->close(sock);
 				return;
 			}
-			c.tcpReadBuf[c.tcpReadPtr++] = ((const char*)data)[i];
+			c.tcpReadBuf[c.tcpReadPtr++] = ((const char *)data)[i];
 
 			if (c.tcpReadPtr >= 5) {
-				unsigned long mlen = (((((unsigned long)c.tcpReadBuf[3]) & 0xff) << 8) | (((unsigned long)c.tcpReadBuf[4]) & 0xff));
+				unsigned long mlen = ( ((((unsigned long)c.tcpReadBuf[3]) & 0xff) << 8) | (((unsigned long)c.tcpReadBuf[4]) & 0xff) );
 				if (c.tcpReadPtr >= (mlen + 5)) {
 					if (mlen == 4) {
 						// Right now just sending this means the client is 'new enough' for the IP header
 						c.newVersion = true;
-						printf("<< TCP %.16llx HELLO\n", (unsigned long long)*uptr);
-					}
-					else if (mlen >= 7) {
-						char* payload = c.tcpReadBuf + 5;
+						//printf("<< TCP %.16llx HELLO\n",(unsigned long long)*uptr);
+					} else if (mlen >= 7) {
+						char *payload = c.tcpReadBuf + 5;
 						unsigned long payloadLen = mlen;
 
 						struct sockaddr_in dest;
-						memset(&dest, 0, sizeof(dest));
+						memset(&dest,0,sizeof(dest));
 						if (c.newVersion) {
 							if (*payload == (char)4) {
 								// New clients tell us where their packets go.
 								++payload;
 								dest.sin_family = AF_INET;
-								dest.sin_addr.s_addr = *((uint32_t*)payload);
+								dest.sin_addr.s_addr = *((uint32_t *)payload);
 								payload += 4;
-								dest.sin_port = *((uint16_t*)payload);	 // will be in network byte order already
+								dest.sin_port = *((uint16_t *)payload); // will be in network byte order already
 								payload += 2;
 								payloadLen -= 7;
 							}
-						}
-						else {
+						} else {
 							// For old clients we will just proxy everything to a local ZT instance. The
 							// fact that this will come from 127.0.0.1 will in turn prevent that instance
 							// from doing unite() with us. It'll just forward. There will not be many of
 							// these.
 							dest.sin_family = AF_INET;
-							dest.sin_addr.s_addr = htonl(0x7f000001);	// 127.0.0.1
+							dest.sin_addr.s_addr = htonl(0x7f000001); // 127.0.0.1
 							dest.sin_port = htons(9993);
 						}
 
 						// Note: we do not relay to privileged ports... just an abuse prevention rule.
-						if ((ntohs(dest.sin_port) > 1024) && (payloadLen >= 16)) {
-							phy->udpSend(c.udp, (const struct sockaddr*)&dest, payload, payloadLen);
-							printf(">> TCP %.16llx to %s:%d\n", (unsigned long long)*uptr, inet_ntoa(dest.sin_addr), (int)ntohs(dest.sin_port));
+						if ((ntohs(dest.sin_port) > 1024)&&(payloadLen >= 16)) {
+							phy->udpSend(c.udp,(const struct sockaddr *)&dest,payload,payloadLen);
+							//printf(">> TCP %.16llx to %s:%d\n",(unsigned long long)*uptr,inet_ntoa(dest.sin_addr),(int)ntohs(dest.sin_port));
 						}
 					}
 
-					memmove(c.tcpReadBuf, c.tcpReadBuf + (mlen + 5), c.tcpReadPtr -= (mlen + 5));
+					memmove(c.tcpReadBuf,c.tcpReadBuf + (mlen + 5),c.tcpReadPtr -= (mlen + 5));
 				}
 			}
 		}
 	}
 
-	void phyOnTcpWritable(PhySocket* sock, void** uptr)
+	void phyOnTcpWritable(PhySocket *sock,void **uptr)
 	{
-		Client& c = *((Client*)*uptr);
+		Client &c = *((Client *)*uptr);
 		if (c.tcpWritePtr) {
-			long n = phy->streamSend(sock, c.tcpWriteBuf, c.tcpWritePtr);
+			long n = phy->tcpSend(sock,c.tcpWriteBuf,c.tcpWritePtr);
 			if (n > 0) {
-				memmove(c.tcpWriteBuf, c.tcpWriteBuf + n, c.tcpWritePtr -= (unsigned long)n);
-				if (! c.tcpWritePtr)
-					phy->setNotifyWritable(sock, false);
+				memmove(c.tcpWriteBuf,c.tcpWriteBuf + n,c.tcpWritePtr -= (unsigned long)n);
+				if (!c.tcpWritePtr)
+					phy->tcpSetNotifyWritable(sock,false);
 			}
-		}
-		else
-			phy->setNotifyWritable(sock, false);
+		} else phy->tcpSetNotifyWritable(sock,false);
 	}
 
 	void doHousekeeping()
 	{
-		std::vector<PhySocket*> toClose;
-		time_t now = time((time_t*)0);
-		for (std::map<PhySocket*, Client>::iterator c(clients.begin()); c != clients.end(); ++c) {
+		std::vector<PhySocket *> toClose;
+		time_t now = time((time_t *)0);
+		for(std::map< PhySocket *,Client >::iterator c(clients.begin());c!=clients.end();++c) {
 			if ((now - c->second.lastActivity) >= ZT_TCP_PROXY_CONNECTION_TIMEOUT_SECONDS) {
 				toClose.push_back(c->first);
 				toClose.push_back(c->second.udp);
 			}
 		}
-		for (std::vector<PhySocket*>::iterator s(toClose.begin()); s != toClose.end(); ++s)
+		for(std::vector<PhySocket *>::iterator s(toClose.begin());s!=toClose.end();++s)
 			phy->close(*s);
 	}
 };
 
-int main(int argc, char** argv)
+int main(int argc,char **argv)
 {
-	signal(SIGPIPE, SIG_IGN);
-	signal(SIGHUP, SIG_IGN);
-	srand(time((time_t*)0));
+	signal(SIGPIPE,SIG_IGN);
+	signal(SIGHUP,SIG_IGN);
+	srand(time((time_t *)0));
 
 	TcpProxyService svc;
-	Phy<TcpProxyService*> phy(&svc, false, true);
+	Phy<TcpProxyService *> phy(&svc,false,true);
 	svc.phy = &phy;
 	svc.udpPortCounter = 1023;
 
 	{
 		struct sockaddr_in laddr;
-		memset(&laddr, 0, sizeof(laddr));
+		memset(&laddr,0,sizeof(laddr));
 		laddr.sin_family = AF_INET;
 		laddr.sin_port = htons(ZT_TCP_PROXY_TCP_PORT);
-		if (! phy.tcpListen((const struct sockaddr*)&laddr)) {
-			fprintf(stderr, "%s: fatal error: unable to bind TCP port %d\n", argv[0], ZT_TCP_PROXY_TCP_PORT);
+		if (!phy.tcpListen((const struct sockaddr *)&laddr)) {
+			fprintf(stderr,"%s: fatal error: unable to bind TCP port %d\n",argv[0],ZT_TCP_PROXY_TCP_PORT);
 			return 1;
 		}
 	}
 
-	time_t lastDidHousekeeping = time((time_t*)0);
-	for (;;) {
+	time_t lastDidHousekeeping = time((time_t *)0);
+	for(;;) {
 		phy.poll(120000);
-		time_t now = time((time_t*)0);
+		time_t now = time((time_t *)0);
 		if ((now - lastDidHousekeeping) > 120) {
 			lastDidHousekeeping = now;
 			svc.doHousekeeping();
diff --git a/tcp-proxy/zerotier-proxy.service b/tcp-proxy/zerotier-proxy.service
deleted file mode 100644
index 2c4a2ebb2..000000000
--- a/tcp-proxy/zerotier-proxy.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=ZeroTier TCP Proxy sample unit
-
-[Service]
-ExecStart=/var/lib/zerotier-one/tcp-proxy
-Restart=on-failure
-
-# The zerotier-one install script creates this user/group
-User=zerotier-one
-Group=zerotier-one
-
-
-[Install]
-WantedBy=multi-user.target
diff --git a/ui/Makefile b/ui/Makefile
new file mode 100644
index 000000000..4be03228b
--- /dev/null
+++ b/ui/Makefile
@@ -0,0 +1,6 @@
+all:
+	mkdir -p build
+	jsx --target es3 -x jsx . ./build
+	rm -f ztui.min.js
+	minify build/*.js >>ztui.min.js
+	rm -rf build
diff --git a/ui/README.md b/ui/README.md
new file mode 100644
index 000000000..bd5eddb63
--- /dev/null
+++ b/ui/README.md
@@ -0,0 +1,10 @@
+ZeroTier HTML5 UI
+======
+
+This is the new (as of 1.0.3) ZeroTier One UI. It's implemented in HTML5 and React.
+
+If you make changes to the .jsx files, type 'make'. You will need NodeJS, react-tools, and minify installed and available in your path.
+
+For this to work, these files must be installed in the 'ui' subfolder of the ZeroTier home path. For development it's nice to symlink this to the 'ui' folder in your working directory. If the 'ui' subfolder is not present, the UI static files will not be served by the embedded web server.
+
+Packaging for Mac and Windows is accomplished by way of the wrappers in ext/. For Mac this is done with a modified version of MacGap. Windows uses a custom project that embeds a web view.
diff --git a/ui/ZeroTierNetwork.jsx b/ui/ZeroTierNetwork.jsx
new file mode 100644
index 000000000..f842d7587
--- /dev/null
+++ b/ui/ZeroTierNetwork.jsx
@@ -0,0 +1,74 @@
+var ZeroTierNetwork = React.createClass({
+	getInitialState: function() {
+		return {};
+	},
+
+	leaveNetwork: function(event) {
+		Ajax.call({
+			url: 'network/'+this.props.nwid+'?auth='+this.props.authToken,
+			cache: false,
+			type: 'DELETE',
+			success: function(data) {
+				if (this.props.onNetworkDeleted)
+					this.props.onNetworkDeleted(this.props.nwid);
+			}.bind(this),
+			error: function(error) {
+			}.bind(this)
+		});
+		event.preventDefault();
+	},
+
+	render: function() {
+		return (
+			<div className="zeroTierNetwork">
+				<div className="networkInfo">
+					<span className="networkId">{this.props.nwid}</span>&nbsp;
+					<span className="networkName">{this.props.name}</span>
+				</div>
+				<div className="networkProps">
+					<div className="row">
+						<div className="name">Status</div>
+						<div className="value">{this.props['status']}</div>
+					</div>
+					<div className="row">
+						<div className="name">Type</div>
+						<div className="value">{this.props['type']}</div>
+					</div>
+					<div className="row">
+						<div className="name">MAC</div>
+						<div className="value zeroTierAddress">{this.props['mac']}</div>
+					</div>
+					<div className="row">
+						<div className="name">MTU</div>
+						<div className="value">{this.props['mtu']}</div>
+					</div>
+					<div className="row">
+						<div className="name">Broadcast</div>
+						<div className="value">{(this.props['broadcastEnabled']) ? 'ENABLED' : 'DISABLED'}</div>
+					</div>
+					<div className="row">
+						<div className="name">Bridging</div>
+						<div className="value">{(this.props['bridge']) ? 'ACTIVE' : 'DISABLED'}</div>
+					</div>
+					<div className="row">
+						<div className="name">Device</div>
+						<div className="value">{(this.props['portDeviceName']) ? this.props['portDeviceName'] : '(none)'}</div>
+					</div>
+					<div className="row">
+						<div className="name">Managed&nbsp;IPs</div>
+						<div className="value ipList">
+							{
+								this.props['assignedAddresses'].map(function(ipAssignment) {
+									return (
+										<div key={ipAssignment} className="ipAddress">{ipAssignment}</div>
+									);
+								})
+							}
+						</div>
+					</div>
+				</div>
+				<button type="button" className="leaveNetworkButton" onClick={this.leaveNetwork}>Leave&nbsp;Network</button>
+			</div>
+		);
+	}
+});
diff --git a/ui/ZeroTierNode.jsx b/ui/ZeroTierNode.jsx
new file mode 100644
index 000000000..b4c292203
--- /dev/null
+++ b/ui/ZeroTierNode.jsx
@@ -0,0 +1,158 @@
+var ZeroTierNode = React.createClass({
+	getInitialState: function() {
+		return {
+			address: '----------',
+			online: false,
+			version: '_._._',
+			_networks: [],
+			_peers: []
+		};
+	},
+
+	ago: function(ms) {
+		if (ms > 0) {
+			var tmp = Math.round((Date.now() - ms) / 1000);
+			return ((tmp > 0) ? tmp : 0);
+		} else return 0;
+	},
+
+	updatePeers: function() {
+		Ajax.call({
+			url: 'peer?auth='+this.props.authToken,
+			cache: false,
+			type: 'GET',
+			success: function(data) {
+				if (data) {
+					var pl = JSON.parse(data);
+					if (Array.isArray(pl)) {
+						this.setState({_peers: pl});
+					}
+				}
+			}.bind(this),
+			error: function() {
+			}.bind(this)
+		});
+	},
+	updateNetworks: function() {
+		Ajax.call({
+			url: 'network?auth='+this.props.authToken,
+			cache: false,
+			type: 'GET',
+			success: function(data) {
+				if (data) {
+					var nwl = JSON.parse(data);
+					if (Array.isArray(nwl)) {
+						this.setState({_networks: nwl});
+					}
+				}
+			}.bind(this),
+			error: function() {
+			}.bind(this)
+		});
+	},
+	updateAll: function() {
+		Ajax.call({
+			url: 'status?auth='+this.props.authToken,
+			cache: false,
+			type: 'GET',
+			success: function(data) {
+				this.alertedToFailure = false;
+				if (data) {
+					var status = JSON.parse(data);
+					this.setState(status);
+					document.title = 'ZeroTier One [' + status.address + ']';
+				}
+				this.updateNetworks();
+				this.updatePeers();
+			}.bind(this),
+			error: function() {
+				this.setState(this.getInitialState());
+				if (!this.alertedToFailure) {
+					this.alertedToFailure = true;
+					alert('Authorization token invalid or ZeroTier One service not running.');
+				}
+			}.bind(this)
+		});
+	},
+	joinNetwork: function(event) {
+		event.preventDefault();
+		if ((this.networkToJoin)&&(this.networkToJoin.length === 16)) {
+			Ajax.call({
+				url: 'network/'+this.networkToJoin+'?auth='+this.props.authToken,
+				cache: false,
+				type: 'POST',
+				success: function(data) {
+					this.networkToJoin = '';
+					if (this.networkInputElement)
+						this.networkInputElement.value = '';
+					this.updateNetworks();
+				}.bind(this),
+				error: function() {
+				}.bind(this)
+			});
+		} else {
+			alert('To join a network, enter its 16-digit network ID.');
+		}
+	},
+	handleNetworkIdEntry: function(event) {
+		this.networkInputElement = event.target;
+		var nid = this.networkInputElement.value;
+		if (nid) {
+			nid = nid.toLowerCase();
+			var nnid = '';
+			for(var i=0;((i<nid.length)&&(i<16));++i) {
+				if ("0123456789abcdef".indexOf(nid.charAt(i)) >= 0)
+					nnid += nid.charAt(i);
+			}
+			this.networkToJoin = nnid;
+			this.networkInputElement.value = nnid;
+		} else {
+			this.networkToJoin = '';
+			this.networkInputElement.value = '';
+		}
+	},
+
+	handleNetworkDelete: function(nwid) {
+		var networks = [];
+		for(var i=0;i<this.state._networks.length;++i) {
+			if (this.state._networks[i].nwid !== nwid)
+				networks.push(this.state._networks[i]);
+		}
+		this.setState({_networks: networks});
+	},
+
+	componentDidMount: function() {
+		this.updateAll();
+		this.updateIntervalId = setInterval(this.updateAll,2500);
+	},
+	componentWillUnmount: function() {
+		clearInterval(this.updateIntervalId);
+	},
+	render: function() {
+		return (
+			<div className="zeroTierNode">
+				<div className="middle"><div className="middleCell">
+					<div className="middleScroll">
+						<div className="networks" key="_networks">
+							{
+								this.state._networks.map(function(network) {
+									network['authToken'] = this.props.authToken;
+									network['onNetworkDeleted'] = this.handleNetworkDelete;
+									return React.createElement('div',{className: 'network',key: network.nwid},React.createElement(ZeroTierNetwork,network));
+								}.bind(this))
+							}
+						</div>
+					</div>
+				</div></div>
+				<div className="bottom">
+					<div className="left">
+						<span className="statusLine"><span className="zeroTierAddress">{this.state.address}</span>&nbsp;&nbsp;{this.state.online ? (this.state.tcpFallbackActive ? 'TUNNELED' : 'ONLINE') : 'OFFLINE'}&nbsp;&nbsp;{this.state.version}</span>
+					</div>
+					<div className="right">
+						<form onSubmit={this.joinNetwork}><input type="text" maxlength="16" placeholder="[ Network ID ]" onChange={this.handleNetworkIdEntry} size="16"/><button type="button" onClick={this.joinNetwork}>Join</button></form>
+					</div>
+				</div>
+			</div>
+		);
+	}
+});
diff --git a/ui/index.html b/ui/index.html
new file mode 100644
index 000000000..44edb399f
--- /dev/null
+++ b/ui/index.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>ZeroTier One</title>
+	<link rel="stylesheet" href="zerotier.css">
+	<script src="simpleajax.min.js"></script>
+	<!-- <script src="https://fb.me/react-0.13.2.js"></script> -->
+	<script src="react.min.js"></script>
+	<script src="ztui.min.js"></script>
+</head>
+<body><div style="width: 100%; height: 100%;" id="main"></div></body>
+<script src="main.js"></script>
+<script>
+/* Windows hacks */
+function isIE() {
+	var myNav = navigator.userAgent.toLowerCase();
+	return (myNav.indexOf('msie') != -1) ? parseInt(myNav.split('msie')[1]) : false;
+}
+var ieVersion = isIE();
+function resizeMiddleScrollClasses() {
+	var elems = document.getElementsByTagName('*'), i;
+	for (i in elems) {
+		if ((' ' + elems[i].className + ' ').indexOf(' middleScroll ') > -1) {
+			elems[i].style.height = (document.body.clientHeight - (elems[i].parentNode.parentNode.previousElementSibling.clientHeight + elems[i].parentNode.parentNode.nextElementSibling.clientHeight)) + "px";
+		}
+	}
+}
+if (ieVersion !== false) {
+	if (ieVersion < 7) {
+		alert("Upgrade Internet Explorer on your system to use this interface. (detected version: " + ieVersion + ")");
+	} else {
+		resizeMiddleScrollClasses();
+		window.onresize = resizeMiddleScrollClasses;
+	}
+}
+
+/* MacGap hacks */
+if (typeof macgap !== 'undefined') {
+	if (macgap.menu) {
+		var tmp = macgap.menu.getItem("Help");
+		if (tmp)
+			tmp.remove();
+		tmp = macgap.menu.getItem("Format");
+		if (tmp)
+			tmp.remove();
+		tmp = macgap.menu.getItem("View");
+		if (tmp)
+			tmp.remove();
+		tmp = macgap.menu.getItem("File");
+		if (tmp)
+			tmp.remove();
+	}
+}
+</script>
+</html>
diff --git a/ui/main.js b/ui/main.js
new file mode 100644
index 000000000..a1647127b
--- /dev/null
+++ b/ui/main.js
@@ -0,0 +1,51 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+function getUrlParameter(parameter)
+{
+	var currLocation = window.location.search;
+	if (currLocation.indexOf('?') < 0)
+		return '';
+	var parArr = currLocation.split("?")[1].split("&");
+	for(var i = 0; i < parArr.length; i++){
+		parr = parArr[i].split("=");
+		if (parr[0] == parameter) {
+			return decodeURIComponent(parr[1]);
+		}
+	}
+	return '';
+}
+
+var ztAuthToken = getUrlParameter('authToken');
+if ((!ztAuthToken)||(ztAuthToken.length <= 0)) {
+	ztAuthToken = prompt('No authToken specified in URL. Enter token from\nauthtoken.secret to authorize.');
+}
+
+React.render(
+	React.createElement(ZeroTierNode, {authToken: ztAuthToken}),
+	document.getElementById('main')
+);
diff --git a/ui/react.min.js b/ui/react.min.js
new file mode 100644
index 000000000..9040c970f
--- /dev/null
+++ b/ui/react.min.js
@@ -0,0 +1,15 @@
+/**
+ * React v0.13.2
+ *
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.React=e()}}(function(){return function e(t,n,r){function o(a,u){if(!n[a]){if(!t[a]){var s="function"==typeof require&&require;if(!u&&s)return s(a,!0);if(i)return i(a,!0);var l=new Error("Cannot find module '"+a+"'");throw l.code="MODULE_NOT_FOUND",l}var c=n[a]={exports:{}};t[a][0].call(c.exports,function(e){var n=t[a][1][e];return o(n?n:e)},c,c.exports,e,t,n,r)}return n[a].exports}for(var i="function"==typeof require&&require,a=0;a<r.length;a++)o(r[a]);return o}({1:[function(e,t,n){"use strict";var r=e(19),o=e(32),i=e(34),a=e(33),u=e(38),s=e(39),l=e(55),c=(e(56),e(40)),p=e(51),d=e(54),f=e(64),h=e(68),m=e(73),v=e(76),g=e(79),y=e(82),C=e(27),E=e(115),b=e(142);d.inject();var _=l.createElement,x=l.createFactory,D=l.cloneElement,M=m.measure("React","render",h.render),N={Children:{map:o.map,forEach:o.forEach,count:o.count,only:b},Component:i,DOM:c,PropTypes:v,initializeTouchEvents:function(e){r.useTouchEvents=e},createClass:a.createClass,createElement:_,cloneElement:D,createFactory:x,createMixin:function(e){return e},constructAndRenderComponent:h.constructAndRenderComponent,constructAndRenderComponentByID:h.constructAndRenderComponentByID,findDOMNode:E,render:M,renderToString:y.renderToString,renderToStaticMarkup:y.renderToStaticMarkup,unmountComponentAtNode:h.unmountComponentAtNode,isValidElement:l.isValidElement,withContext:u.withContext,__spread:C};"undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject&&__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({CurrentOwner:s,InstanceHandles:f,Mount:h,Reconciler:g,TextComponent:p});N.version="0.13.2",t.exports=N},{115:115,142:142,19:19,27:27,32:32,33:33,34:34,38:38,39:39,40:40,51:51,54:54,55:55,56:56,64:64,68:68,73:73,76:76,79:79,82:82}],2:[function(e,t,n){"use strict";var r=e(117),o={componentDidMount:function(){this.props.autoFocus&&r(this.getDOMNode())}};t.exports=o},{117:117}],3:[function(e,t,n){"use strict";function r(){var e=window.opera;return"object"==typeof e&&"function"==typeof e.version&&parseInt(e.version(),10)<=12}function o(e){return(e.ctrlKey||e.altKey||e.metaKey)&&!(e.ctrlKey&&e.altKey)}function i(e){switch(e){case T.topCompositionStart:return R.compositionStart;case T.topCompositionEnd:return R.compositionEnd;case T.topCompositionUpdate:return R.compositionUpdate}}function a(e,t){return e===T.topKeyDown&&t.keyCode===b}function u(e,t){switch(e){case T.topKeyUp:return-1!==E.indexOf(t.keyCode);case T.topKeyDown:return t.keyCode!==b;case T.topKeyPress:case T.topMouseDown:case T.topBlur:return!0;default:return!1}}function s(e){var t=e.detail;return"object"==typeof t&&"data"in t?t.data:null}function l(e,t,n,r){var o,l;if(_?o=i(e):w?u(e,r)&&(o=R.compositionEnd):a(e,r)&&(o=R.compositionStart),!o)return null;M&&(w||o!==R.compositionStart?o===R.compositionEnd&&w&&(l=w.getData()):w=v.getPooled(t));var c=g.getPooled(o,n,r);if(l)c.data=l;else{var p=s(r);null!==p&&(c.data=p)}return h.accumulateTwoPhaseDispatches(c),c}function c(e,t){switch(e){case T.topCompositionEnd:return s(t);case T.topKeyPress:var n=t.which;return n!==N?null:(P=!0,I);case T.topTextInput:var r=t.data;return r===I&&P?null:r;default:return null}}function p(e,t){if(w){if(e===T.topCompositionEnd||u(e,t)){var n=w.getData();return v.release(w),w=null,n}return null}switch(e){case T.topPaste:return null;case T.topKeyPress:return t.which&&!o(t)?String.fromCharCode(t.which):null;case T.topCompositionEnd:return M?null:t.data;default:return null}}function d(e,t,n,r){var o;if(o=D?c(e,r):p(e,r),!o)return null;var i=y.getPooled(R.beforeInput,n,r);return i.data=o,h.accumulateTwoPhaseDispatches(i),i}var f=e(15),h=e(20),m=e(21),v=e(22),g=e(91),y=e(95),C=e(139),E=[9,13,27,32],b=229,_=m.canUseDOM&&"CompositionEvent"in window,x=null;m.canUseDOM&&"documentMode"in document&&(x=document.documentMode);var D=m.canUseDOM&&"TextEvent"in window&&!x&&!r(),M=m.canUseDOM&&(!_||x&&x>8&&11>=x),N=32,I=String.fromCharCode(N),T=f.topLevelTypes,R={beforeInput:{phasedRegistrationNames:{bubbled:C({onBeforeInput:null}),captured:C({onBeforeInputCapture:null})},dependencies:[T.topCompositionEnd,T.topKeyPress,T.topTextInput,T.topPaste]},compositionEnd:{phasedRegistrationNames:{bubbled:C({onCompositionEnd:null}),captured:C({onCompositionEndCapture:null})},dependencies:[T.topBlur,T.topCompositionEnd,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]},compositionStart:{phasedRegistrationNames:{bubbled:C({onCompositionStart:null}),captured:C({onCompositionStartCapture:null})},dependencies:[T.topBlur,T.topCompositionStart,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]},compositionUpdate:{phasedRegistrationNames:{bubbled:C({onCompositionUpdate:null}),captured:C({onCompositionUpdateCapture:null})},dependencies:[T.topBlur,T.topCompositionUpdate,T.topKeyDown,T.topKeyPress,T.topKeyUp,T.topMouseDown]}},P=!1,w=null,O={eventTypes:R,extractEvents:function(e,t,n,r){return[l(e,t,n,r),d(e,t,n,r)]}};t.exports=O},{139:139,15:15,20:20,21:21,22:22,91:91,95:95}],4:[function(e,t,n){"use strict";function r(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var o={boxFlex:!0,boxFlexGroup:!0,columnCount:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,strokeDashoffset:!0,strokeOpacity:!0,strokeWidth:!0},i=["Webkit","ms","Moz","O"];Object.keys(o).forEach(function(e){i.forEach(function(t){o[r(t,e)]=o[e]})});var a={background:{backgroundImage:!0,backgroundPosition:!0,backgroundRepeat:!0,backgroundColor:!0},border:{borderWidth:!0,borderStyle:!0,borderColor:!0},borderBottom:{borderBottomWidth:!0,borderBottomStyle:!0,borderBottomColor:!0},borderLeft:{borderLeftWidth:!0,borderLeftStyle:!0,borderLeftColor:!0},borderRight:{borderRightWidth:!0,borderRightStyle:!0,borderRightColor:!0},borderTop:{borderTopWidth:!0,borderTopStyle:!0,borderTopColor:!0},font:{fontStyle:!0,fontVariant:!0,fontWeight:!0,fontSize:!0,lineHeight:!0,fontFamily:!0}},u={isUnitlessNumber:o,shorthandPropertyExpansions:a};t.exports=u},{}],5:[function(e,t,n){"use strict";var r=e(4),o=e(21),i=(e(106),e(111)),a=e(131),u=e(141),s=(e(150),u(function(e){return a(e)})),l="cssFloat";o.canUseDOM&&void 0===document.documentElement.style.cssFloat&&(l="styleFloat");var c={createMarkupForStyles:function(e){var t="";for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];null!=r&&(t+=s(n)+":",t+=i(n,r)+";")}return t||null},setValueForStyles:function(e,t){var n=e.style;for(var o in t)if(t.hasOwnProperty(o)){var a=i(o,t[o]);if("float"===o&&(o=l),a)n[o]=a;else{var u=r.shorthandPropertyExpansions[o];if(u)for(var s in u)n[s]="";else n[o]=""}}}};t.exports=c},{106:106,111:111,131:131,141:141,150:150,21:21,4:4}],6:[function(e,t,n){"use strict";function r(){this._callbacks=null,this._contexts=null}var o=e(28),i=e(27),a=e(133);i(r.prototype,{enqueue:function(e,t){this._callbacks=this._callbacks||[],this._contexts=this._contexts||[],this._callbacks.push(e),this._contexts.push(t)},notifyAll:function(){var e=this._callbacks,t=this._contexts;if(e){a(e.length===t.length),this._callbacks=null,this._contexts=null;for(var n=0,r=e.length;r>n;n++)e[n].call(t[n]);e.length=0,t.length=0}},reset:function(){this._callbacks=null,this._contexts=null},destructor:function(){this.reset()}}),o.addPoolingTo(r),t.exports=r},{133:133,27:27,28:28}],7:[function(e,t,n){"use strict";function r(e){return"SELECT"===e.nodeName||"INPUT"===e.nodeName&&"file"===e.type}function o(e){var t=x.getPooled(T.change,P,e);E.accumulateTwoPhaseDispatches(t),_.batchedUpdates(i,t)}function i(e){C.enqueueEvents(e),C.processEventQueue()}function a(e,t){R=e,P=t,R.attachEvent("onchange",o)}function u(){R&&(R.detachEvent("onchange",o),R=null,P=null)}function s(e,t,n){return e===I.topChange?n:void 0}function l(e,t,n){e===I.topFocus?(u(),a(t,n)):e===I.topBlur&&u()}function c(e,t){R=e,P=t,w=e.value,O=Object.getOwnPropertyDescriptor(e.constructor.prototype,"value"),Object.defineProperty(R,"value",k),R.attachEvent("onpropertychange",d)}function p(){R&&(delete R.value,R.detachEvent("onpropertychange",d),R=null,P=null,w=null,O=null)}function d(e){if("value"===e.propertyName){var t=e.srcElement.value;t!==w&&(w=t,o(e))}}function f(e,t,n){return e===I.topInput?n:void 0}function h(e,t,n){e===I.topFocus?(p(),c(t,n)):e===I.topBlur&&p()}function m(e,t,n){return e!==I.topSelectionChange&&e!==I.topKeyUp&&e!==I.topKeyDown||!R||R.value===w?void 0:(w=R.value,P)}function v(e){return"INPUT"===e.nodeName&&("checkbox"===e.type||"radio"===e.type)}function g(e,t,n){return e===I.topClick?n:void 0}var y=e(15),C=e(17),E=e(20),b=e(21),_=e(85),x=e(93),D=e(134),M=e(136),N=e(139),I=y.topLevelTypes,T={change:{phasedRegistrationNames:{bubbled:N({onChange:null}),captured:N({onChangeCapture:null})},dependencies:[I.topBlur,I.topChange,I.topClick,I.topFocus,I.topInput,I.topKeyDown,I.topKeyUp,I.topSelectionChange]}},R=null,P=null,w=null,O=null,S=!1;b.canUseDOM&&(S=D("change")&&(!("documentMode"in document)||document.documentMode>8));var A=!1;b.canUseDOM&&(A=D("input")&&(!("documentMode"in document)||document.documentMode>9));var k={get:function(){return O.get.call(this)},set:function(e){w=""+e,O.set.call(this,e)}},L={eventTypes:T,extractEvents:function(e,t,n,o){var i,a;if(r(t)?S?i=s:a=l:M(t)?A?i=f:(i=m,a=h):v(t)&&(i=g),i){var u=i(e,t,n);if(u){var c=x.getPooled(T.change,u,o);return E.accumulateTwoPhaseDispatches(c),c}}a&&a(e,t,n)}};t.exports=L},{134:134,136:136,139:139,15:15,17:17,20:20,21:21,85:85,93:93}],8:[function(e,t,n){"use strict";var r=0,o={createReactRootIndex:function(){return r++}};t.exports=o},{}],9:[function(e,t,n){"use strict";function r(e,t,n){e.insertBefore(t,e.childNodes[n]||null)}var o=e(12),i=e(70),a=e(145),u=e(133),s={dangerouslyReplaceNodeWithMarkup:o.dangerouslyReplaceNodeWithMarkup,updateTextContent:a,processUpdates:function(e,t){for(var n,s=null,l=null,c=0;c<e.length;c++)if(n=e[c],n.type===i.MOVE_EXISTING||n.type===i.REMOVE_NODE){var p=n.fromIndex,d=n.parentNode.childNodes[p],f=n.parentID;u(d),s=s||{},s[f]=s[f]||[],s[f][p]=d,l=l||[],l.push(d)}var h=o.dangerouslyRenderMarkup(t);if(l)for(var m=0;m<l.length;m++)l[m].parentNode.removeChild(l[m]);for(var v=0;v<e.length;v++)switch(n=e[v],n.type){case i.INSERT_MARKUP:r(n.parentNode,h[n.markupIndex],n.toIndex);break;case i.MOVE_EXISTING:r(n.parentNode,s[n.parentID][n.fromIndex],n.toIndex);break;case i.TEXT_CONTENT:a(n.parentNode,n.textContent);break;case i.REMOVE_NODE:}}};t.exports=s},{12:12,133:133,145:145,70:70}],10:[function(e,t,n){"use strict";function r(e,t){return(e&t)===t}var o=e(133),i={MUST_USE_ATTRIBUTE:1,MUST_USE_PROPERTY:2,HAS_SIDE_EFFECTS:4,HAS_BOOLEAN_VALUE:8,HAS_NUMERIC_VALUE:16,HAS_POSITIVE_NUMERIC_VALUE:48,HAS_OVERLOADED_BOOLEAN_VALUE:64,injectDOMPropertyConfig:function(e){var t=e.Properties||{},n=e.DOMAttributeNames||{},a=e.DOMPropertyNames||{},s=e.DOMMutationMethods||{};e.isCustomAttribute&&u._isCustomAttributeFunctions.push(e.isCustomAttribute);for(var l in t){o(!u.isStandardName.hasOwnProperty(l)),u.isStandardName[l]=!0;var c=l.toLowerCase();if(u.getPossibleStandardName[c]=l,n.hasOwnProperty(l)){var p=n[l];u.getPossibleStandardName[p]=l,u.getAttributeName[l]=p}else u.getAttributeName[l]=c;u.getPropertyName[l]=a.hasOwnProperty(l)?a[l]:l,s.hasOwnProperty(l)?u.getMutationMethod[l]=s[l]:u.getMutationMethod[l]=null;var d=t[l];u.mustUseAttribute[l]=r(d,i.MUST_USE_ATTRIBUTE),u.mustUseProperty[l]=r(d,i.MUST_USE_PROPERTY),u.hasSideEffects[l]=r(d,i.HAS_SIDE_EFFECTS),u.hasBooleanValue[l]=r(d,i.HAS_BOOLEAN_VALUE),u.hasNumericValue[l]=r(d,i.HAS_NUMERIC_VALUE),u.hasPositiveNumericValue[l]=r(d,i.HAS_POSITIVE_NUMERIC_VALUE),u.hasOverloadedBooleanValue[l]=r(d,i.HAS_OVERLOADED_BOOLEAN_VALUE),o(!u.mustUseAttribute[l]||!u.mustUseProperty[l]),o(u.mustUseProperty[l]||!u.hasSideEffects[l]),o(!!u.hasBooleanValue[l]+!!u.hasNumericValue[l]+!!u.hasOverloadedBooleanValue[l]<=1)}}},a={},u={ID_ATTRIBUTE_NAME:"data-reactid",isStandardName:{},getPossibleStandardName:{},getAttributeName:{},getPropertyName:{},getMutationMethod:{},mustUseAttribute:{},mustUseProperty:{},hasSideEffects:{},hasBooleanValue:{},hasNumericValue:{},hasPositiveNumericValue:{},hasOverloadedBooleanValue:{},_isCustomAttributeFunctions:[],isCustomAttribute:function(e){for(var t=0;t<u._isCustomAttributeFunctions.length;t++){var n=u._isCustomAttributeFunctions[t];if(n(e))return!0}return!1},getDefaultValueForProperty:function(e,t){var n,r=a[e];return r||(a[e]=r={}),t in r||(n=document.createElement(e),r[t]=n[t]),r[t]},injection:i};t.exports=u},{133:133}],11:[function(e,t,n){"use strict";function r(e,t){return null==t||o.hasBooleanValue[e]&&!t||o.hasNumericValue[e]&&isNaN(t)||o.hasPositiveNumericValue[e]&&1>t||o.hasOverloadedBooleanValue[e]&&t===!1}var o=e(10),i=e(143),a=(e(150),{createMarkupForID:function(e){return o.ID_ATTRIBUTE_NAME+"="+i(e)},createMarkupForProperty:function(e,t){if(o.isStandardName.hasOwnProperty(e)&&o.isStandardName[e]){if(r(e,t))return"";var n=o.getAttributeName[e];return o.hasBooleanValue[e]||o.hasOverloadedBooleanValue[e]&&t===!0?n:n+"="+i(t)}return o.isCustomAttribute(e)?null==t?"":e+"="+i(t):null},setValueForProperty:function(e,t,n){if(o.isStandardName.hasOwnProperty(t)&&o.isStandardName[t]){var i=o.getMutationMethod[t];if(i)i(e,n);else if(r(t,n))this.deleteValueForProperty(e,t);else if(o.mustUseAttribute[t])e.setAttribute(o.getAttributeName[t],""+n);else{var a=o.getPropertyName[t];o.hasSideEffects[t]&&""+e[a]==""+n||(e[a]=n)}}else o.isCustomAttribute(t)&&(null==n?e.removeAttribute(t):e.setAttribute(t,""+n))},deleteValueForProperty:function(e,t){if(o.isStandardName.hasOwnProperty(t)&&o.isStandardName[t]){var n=o.getMutationMethod[t];if(n)n(e,void 0);else if(o.mustUseAttribute[t])e.removeAttribute(o.getAttributeName[t]);else{var r=o.getPropertyName[t],i=o.getDefaultValueForProperty(e.nodeName,r);o.hasSideEffects[t]&&""+e[r]===i||(e[r]=i)}}else o.isCustomAttribute(t)&&e.removeAttribute(t)}});t.exports=a},{10:10,143:143,150:150}],12:[function(e,t,n){"use strict";function r(e){return e.substring(1,e.indexOf(" "))}var o=e(21),i=e(110),a=e(112),u=e(125),s=e(133),l=/^(<[^ \/>]+)/,c="data-danger-index",p={dangerouslyRenderMarkup:function(e){s(o.canUseDOM);for(var t,n={},p=0;p<e.length;p++)s(e[p]),t=r(e[p]),t=u(t)?t:"*",n[t]=n[t]||[],n[t][p]=e[p];var d=[],f=0;for(t in n)if(n.hasOwnProperty(t)){var h,m=n[t];for(h in m)if(m.hasOwnProperty(h)){var v=m[h];m[h]=v.replace(l,"$1 "+c+'="'+h+'" ')}for(var g=i(m.join(""),a),y=0;y<g.length;++y){var C=g[y];C.hasAttribute&&C.hasAttribute(c)&&(h=+C.getAttribute(c),C.removeAttribute(c),s(!d.hasOwnProperty(h)),d[h]=C,f+=1)}}return s(f===d.length),s(d.length===e.length),d},dangerouslyReplaceNodeWithMarkup:function(e,t){s(o.canUseDOM),s(t),s("html"!==e.tagName.toLowerCase());var n=i(t,a)[0];e.parentNode.replaceChild(n,e)}};t.exports=p},{110:110,112:112,125:125,133:133,21:21}],13:[function(e,t,n){"use strict";var r=e(139),o=[r({ResponderEventPlugin:null}),r({SimpleEventPlugin:null}),r({TapEventPlugin:null}),r({EnterLeaveEventPlugin:null}),r({ChangeEventPlugin:null}),r({SelectEventPlugin:null}),r({BeforeInputEventPlugin:null}),r({AnalyticsEventPlugin:null}),r({MobileSafariClickEventPlugin:null})];t.exports=o},{139:139}],14:[function(e,t,n){"use strict";var r=e(15),o=e(20),i=e(97),a=e(68),u=e(139),s=r.topLevelTypes,l=a.getFirstReactDOM,c={mouseEnter:{registrationName:u({onMouseEnter:null}),dependencies:[s.topMouseOut,s.topMouseOver]},mouseLeave:{registrationName:u({onMouseLeave:null}),dependencies:[s.topMouseOut,s.topMouseOver]}},p=[null,null],d={eventTypes:c,extractEvents:function(e,t,n,r){if(e===s.topMouseOver&&(r.relatedTarget||r.fromElement))return null;if(e!==s.topMouseOut&&e!==s.topMouseOver)return null;var u;if(t.window===t)u=t;else{var d=t.ownerDocument;u=d?d.defaultView||d.parentWindow:window}var f,h;if(e===s.topMouseOut?(f=t,h=l(r.relatedTarget||r.toElement)||u):(f=u,h=t),f===h)return null;var m=f?a.getID(f):"",v=h?a.getID(h):"",g=i.getPooled(c.mouseLeave,m,r);g.type="mouseleave",g.target=f,g.relatedTarget=h;var y=i.getPooled(c.mouseEnter,v,r);return y.type="mouseenter",y.target=h,y.relatedTarget=f,o.accumulateEnterLeaveDispatches(g,y,m,v),p[0]=g,p[1]=y,p}};t.exports=d},{139:139,15:15,20:20,68:68,97:97}],15:[function(e,t,n){"use strict";var r=e(138),o=r({bubbled:null,captured:null}),i=r({topBlur:null,topChange:null,topClick:null,topCompositionEnd:null,topCompositionStart:null,topCompositionUpdate:null,topContextMenu:null,topCopy:null,topCut:null,topDoubleClick:null,topDrag:null,topDragEnd:null,topDragEnter:null,topDragExit:null,topDragLeave:null,topDragOver:null,topDragStart:null,topDrop:null,topError:null,topFocus:null,topInput:null,topKeyDown:null,topKeyPress:null,topKeyUp:null,topLoad:null,topMouseDown:null,topMouseMove:null,topMouseOut:null,topMouseOver:null,topMouseUp:null,topPaste:null,topReset:null,topScroll:null,topSelectionChange:null,topSubmit:null,topTextInput:null,topTouchCancel:null,topTouchEnd:null,topTouchMove:null,topTouchStart:null,topWheel:null}),a={topLevelTypes:i,PropagationPhases:o};t.exports=a},{138:138}],16:[function(e,t,n){var r=e(112),o={listen:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!1),{remove:function(){e.removeEventListener(t,n,!1)}}):e.attachEvent?(e.attachEvent("on"+t,n),{remove:function(){e.detachEvent("on"+t,n)}}):void 0},capture:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!0),{remove:function(){e.removeEventListener(t,n,!0)}}):{remove:r}},registerDefault:function(){}};t.exports=o},{112:112}],17:[function(e,t,n){"use strict";var r=e(18),o=e(19),i=e(103),a=e(118),u=e(133),s={},l=null,c=function(e){if(e){var t=o.executeDispatch,n=r.getPluginModuleForEvent(e);n&&n.executeDispatch&&(t=n.executeDispatch),o.executeDispatchesInOrder(e,t),e.isPersistent()||e.constructor.release(e)}},p=null,d={injection:{injectMount:o.injection.injectMount,injectInstanceHandle:function(e){p=e},getInstanceHandle:function(){return p},injectEventPluginOrder:r.injectEventPluginOrder,injectEventPluginsByName:r.injectEventPluginsByName},eventNameDispatchConfigs:r.eventNameDispatchConfigs,registrationNameModules:r.registrationNameModules,putListener:function(e,t,n){u(!n||"function"==typeof n);var r=s[t]||(s[t]={});r[e]=n},getListener:function(e,t){var n=s[t];return n&&n[e]},deleteListener:function(e,t){var n=s[t];n&&delete n[e]},deleteAllListeners:function(e){for(var t in s)delete s[t][e]},extractEvents:function(e,t,n,o){for(var a,u=r.plugins,s=0,l=u.length;l>s;s++){var c=u[s];if(c){var p=c.extractEvents(e,t,n,o);p&&(a=i(a,p))}}return a},enqueueEvents:function(e){e&&(l=i(l,e))},processEventQueue:function(){var e=l;l=null,a(e,c),u(!l)},__purge:function(){s={}},__getListenerBank:function(){return s}};t.exports=d},{103:103,118:118,133:133,18:18,19:19}],18:[function(e,t,n){"use strict";function r(){if(u)for(var e in s){var t=s[e],n=u.indexOf(e);if(a(n>-1),!l.plugins[n]){a(t.extractEvents),l.plugins[n]=t;var r=t.eventTypes;for(var i in r)a(o(r[i],t,i))}}}function o(e,t,n){a(!l.eventNameDispatchConfigs.hasOwnProperty(n)),l.eventNameDispatchConfigs[n]=e;var r=e.phasedRegistrationNames;if(r){for(var o in r)if(r.hasOwnProperty(o)){var u=r[o];i(u,t,n)}return!0}return e.registrationName?(i(e.registrationName,t,n),!0):!1}function i(e,t,n){a(!l.registrationNameModules[e]),l.registrationNameModules[e]=t,l.registrationNameDependencies[e]=t.eventTypes[n].dependencies}var a=e(133),u=null,s={},l={plugins:[],eventNameDispatchConfigs:{},registrationNameModules:{},registrationNameDependencies:{},injectEventPluginOrder:function(e){a(!u),u=Array.prototype.slice.call(e),r()},injectEventPluginsByName:function(e){var t=!1;for(var n in e)if(e.hasOwnProperty(n)){var o=e[n];s.hasOwnProperty(n)&&s[n]===o||(a(!s[n]),s[n]=o,t=!0)}t&&r()},getPluginModuleForEvent:function(e){var t=e.dispatchConfig;if(t.registrationName)return l.registrationNameModules[t.registrationName]||null;for(var n in t.phasedRegistrationNames)if(t.phasedRegistrationNames.hasOwnProperty(n)){var r=l.registrationNameModules[t.phasedRegistrationNames[n]];if(r)return r}return null},_resetEventPlugins:function(){u=null;for(var e in s)s.hasOwnProperty(e)&&delete s[e];l.plugins.length=0;var t=l.eventNameDispatchConfigs;for(var n in t)t.hasOwnProperty(n)&&delete t[n];var r=l.registrationNameModules;for(var o in r)r.hasOwnProperty(o)&&delete r[o]}};t.exports=l},{133:133}],19:[function(e,t,n){"use strict";function r(e){return e===v.topMouseUp||e===v.topTouchEnd||e===v.topTouchCancel}function o(e){return e===v.topMouseMove||e===v.topTouchMove}function i(e){return e===v.topMouseDown||e===v.topTouchStart}function a(e,t){var n=e._dispatchListeners,r=e._dispatchIDs;if(Array.isArray(n))for(var o=0;o<n.length&&!e.isPropagationStopped();o++)t(e,n[o],r[o]);else n&&t(e,n,r)}function u(e,t,n){e.currentTarget=m.Mount.getNode(n);var r=t(e,n);return e.currentTarget=null,r}function s(e,t){a(e,t),e._dispatchListeners=null,e._dispatchIDs=null}function l(e){var t=e._dispatchListeners,n=e._dispatchIDs;if(Array.isArray(t)){for(var r=0;r<t.length&&!e.isPropagationStopped();r++)if(t[r](e,n[r]))return n[r]}else if(t&&t(e,n))return n;return null}function c(e){var t=l(e);return e._dispatchIDs=null,e._dispatchListeners=null,t}function p(e){var t=e._dispatchListeners,n=e._dispatchIDs;h(!Array.isArray(t));var r=t?t(e,n):null;return e._dispatchListeners=null,e._dispatchIDs=null,r}function d(e){return!!e._dispatchListeners}var f=e(15),h=e(133),m={Mount:null,injectMount:function(e){m.Mount=e}},v=f.topLevelTypes,g={isEndish:r,isMoveish:o,isStartish:i,executeDirectDispatch:p,executeDispatch:u,executeDispatchesInOrder:s,executeDispatchesInOrderStopAtTrue:c,hasDispatches:d,injection:m,useTouchEvents:!1};t.exports=g},{133:133,15:15}],20:[function(e,t,n){"use strict";function r(e,t,n){var r=t.dispatchConfig.phasedRegistrationNames[n];return v(e,r)}function o(e,t,n){var o=t?m.bubbled:m.captured,i=r(e,n,o);i&&(n._dispatchListeners=f(n._dispatchListeners,i),n._dispatchIDs=f(n._dispatchIDs,e))}function i(e){e&&e.dispatchConfig.phasedRegistrationNames&&d.injection.getInstanceHandle().traverseTwoPhase(e.dispatchMarker,o,e)}function a(e,t,n){if(n&&n.dispatchConfig.registrationName){var r=n.dispatchConfig.registrationName,o=v(e,r);o&&(n._dispatchListeners=f(n._dispatchListeners,o),n._dispatchIDs=f(n._dispatchIDs,e))}}function u(e){e&&e.dispatchConfig.registrationName&&a(e.dispatchMarker,null,e)}function s(e){h(e,i)}function l(e,t,n,r){d.injection.getInstanceHandle().traverseEnterLeave(n,r,a,e,t)}function c(e){h(e,u)}var p=e(15),d=e(17),f=e(103),h=e(118),m=p.PropagationPhases,v=d.getListener,g={accumulateTwoPhaseDispatches:s,accumulateDirectDispatches:c,accumulateEnterLeaveDispatches:l};t.exports=g},{103:103,118:118,15:15,17:17}],21:[function(e,t,n){"use strict";var r=!("undefined"==typeof window||!window.document||!window.document.createElement),o={canUseDOM:r,canUseWorkers:"undefined"!=typeof Worker,canUseEventListeners:r&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:r&&!!window.screen,isInWorker:!r};t.exports=o},{}],22:[function(e,t,n){"use strict";function r(e){this._root=e,this._startText=this.getText(),this._fallbackText=null}var o=e(28),i=e(27),a=e(128);i(r.prototype,{getText:function(){return"value"in this._root?this._root.value:this._root[a()]},getData:function(){if(this._fallbackText)return this._fallbackText;var e,t,n=this._startText,r=n.length,o=this.getText(),i=o.length;for(e=0;r>e&&n[e]===o[e];e++);var a=r-e;for(t=1;a>=t&&n[r-t]===o[i-t];t++);var u=t>1?1-t:void 0;return this._fallbackText=o.slice(e,u),this._fallbackText}}),o.addPoolingTo(r),t.exports=r},{128:128,27:27,28:28}],23:[function(e,t,n){"use strict";var r,o=e(10),i=e(21),a=o.injection.MUST_USE_ATTRIBUTE,u=o.injection.MUST_USE_PROPERTY,s=o.injection.HAS_BOOLEAN_VALUE,l=o.injection.HAS_SIDE_EFFECTS,c=o.injection.HAS_NUMERIC_VALUE,p=o.injection.HAS_POSITIVE_NUMERIC_VALUE,d=o.injection.HAS_OVERLOADED_BOOLEAN_VALUE;if(i.canUseDOM){var f=document.implementation;r=f&&f.hasFeature&&f.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")}var h={isCustomAttribute:RegExp.prototype.test.bind(/^(data|aria)-[a-z_][a-z\d_.\-]*$/),Properties:{accept:null,acceptCharset:null,accessKey:null,action:null,allowFullScreen:a|s,allowTransparency:a,alt:null,async:s,autoComplete:null,autoPlay:s,cellPadding:null,cellSpacing:null,charSet:a,checked:u|s,classID:a,className:r?a:u,cols:a|p,colSpan:null,content:null,contentEditable:null,contextMenu:a,controls:u|s,coords:null,crossOrigin:null,data:null,dateTime:a,defer:s,dir:null,disabled:a|s,download:d,draggable:null,encType:null,form:a,formAction:a,formEncType:a,formMethod:a,formNoValidate:s,formTarget:a,frameBorder:a,headers:null,height:a,hidden:a|s,high:null,href:null,hrefLang:null,htmlFor:null,httpEquiv:null,icon:null,id:u,label:null,lang:null,list:a,loop:u|s,low:null,manifest:a,marginHeight:null,marginWidth:null,max:null,maxLength:a,media:a,mediaGroup:null,method:null,min:null,multiple:u|s,muted:u|s,name:null,noValidate:s,open:s,optimum:null,pattern:null,placeholder:null,poster:null,preload:null,radioGroup:null,readOnly:u|s,rel:null,required:s,role:a,rows:a|p,rowSpan:null,sandbox:null,scope:null,scoped:s,scrolling:null,seamless:a|s,selected:u|s,shape:null,size:a|p,sizes:a,span:p,spellCheck:null,src:null,srcDoc:u,srcSet:a,start:c,step:null,style:null,tabIndex:null,target:null,title:null,type:null,useMap:null,value:u|l,width:a,wmode:a,autoCapitalize:null,autoCorrect:null,itemProp:a,itemScope:a|s,itemType:a,itemID:a,itemRef:a,property:null,unselectable:a},DOMAttributeNames:{acceptCharset:"accept-charset",className:"class",htmlFor:"for",httpEquiv:"http-equiv"},DOMPropertyNames:{autoCapitalize:"autocapitalize",autoComplete:"autocomplete",autoCorrect:"autocorrect",autoFocus:"autofocus",autoPlay:"autoplay",encType:"encoding",hrefLang:"hreflang",radioGroup:"radiogroup",spellCheck:"spellcheck",srcDoc:"srcdoc",srcSet:"srcset"}};t.exports=h},{10:10,21:21}],24:[function(e,t,n){"use strict";function r(e){l(null==e.props.checkedLink||null==e.props.valueLink)}function o(e){r(e),l(null==e.props.value&&null==e.props.onChange)}function i(e){r(e),l(null==e.props.checked&&null==e.props.onChange)}function a(e){this.props.valueLink.requestChange(e.target.value)}function u(e){this.props.checkedLink.requestChange(e.target.checked)}var s=e(76),l=e(133),c={button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0},p={Mixin:{propTypes:{value:function(e,t,n){return!e[t]||c[e.type]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`.")},checked:function(e,t,n){return!e[t]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.")},onChange:s.func}},getValue:function(e){return e.props.valueLink?(o(e),e.props.valueLink.value):e.props.value},getChecked:function(e){return e.props.checkedLink?(i(e),e.props.checkedLink.value):e.props.checked},getOnChange:function(e){return e.props.valueLink?(o(e),a):e.props.checkedLink?(i(e),u):e.props.onChange}};t.exports=p},{133:133,76:76}],25:[function(e,t,n){"use strict";function r(e){e.remove()}var o=e(30),i=e(103),a=e(118),u=e(133),s={trapBubbledEvent:function(e,t){u(this.isMounted());var n=this.getDOMNode();u(n);var r=o.trapBubbledEvent(e,t,n);this._localEventListeners=i(this._localEventListeners,r)},componentWillUnmount:function(){this._localEventListeners&&a(this._localEventListeners,r)}};t.exports=s},{103:103,118:118,133:133,30:30}],26:[function(e,t,n){"use strict";var r=e(15),o=e(112),i=r.topLevelTypes,a={eventTypes:null,extractEvents:function(e,t,n,r){if(e===i.topTouchStart){var a=r.target;a&&!a.onclick&&(a.onclick=o)}}};t.exports=a},{112:112,15:15}],27:[function(e,t,n){"use strict";function r(e,t){if(null==e)throw new TypeError("Object.assign target cannot be null or undefined");for(var n=Object(e),r=Object.prototype.hasOwnProperty,o=1;o<arguments.length;o++){var i=arguments[o];if(null!=i){var a=Object(i);for(var u in a)r.call(a,u)&&(n[u]=a[u])}}return n}t.exports=r},{}],28:[function(e,t,n){"use strict";var r=e(133),o=function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)},i=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},a=function(e,t,n){var r=this;if(r.instancePool.length){var o=r.instancePool.pop();return r.call(o,e,t,n),o}return new r(e,t,n)},u=function(e,t,n,r,o){var i=this;if(i.instancePool.length){var a=i.instancePool.pop();return i.call(a,e,t,n,r,o),a}return new i(e,t,n,r,o)},s=function(e){var t=this;r(e instanceof t),e.destructor&&e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},l=10,c=o,p=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||c,n.poolSize||(n.poolSize=l),n.release=s,n},d={addPoolingTo:p,oneArgumentPooler:o,twoArgumentPooler:i,threeArgumentPooler:a,fiveArgumentPooler:u};t.exports=d},{133:133}],29:[function(e,t,n){"use strict";var r=e(115),o={getDOMNode:function(){return r(this)}};t.exports=o},{115:115}],30:[function(e,t,n){"use strict";function r(e){return Object.prototype.hasOwnProperty.call(e,m)||(e[m]=f++,p[e[m]]={}),p[e[m]]}var o=e(15),i=e(17),a=e(18),u=e(59),s=e(102),l=e(27),c=e(134),p={},d=!1,f=0,h={topBlur:"blur",topChange:"change",topClick:"click",topCompositionEnd:"compositionend",topCompositionStart:"compositionstart",topCompositionUpdate:"compositionupdate",topContextMenu:"contextmenu",topCopy:"copy",topCut:"cut",topDoubleClick:"dblclick",topDrag:"drag",topDragEnd:"dragend",topDragEnter:"dragenter",topDragExit:"dragexit",topDragLeave:"dragleave",topDragOver:"dragover",topDragStart:"dragstart",topDrop:"drop",topFocus:"focus",topInput:"input",topKeyDown:"keydown",topKeyPress:"keypress",topKeyUp:"keyup",topMouseDown:"mousedown",topMouseMove:"mousemove",topMouseOut:"mouseout",topMouseOver:"mouseover",topMouseUp:"mouseup",topPaste:"paste",topScroll:"scroll",topSelectionChange:"selectionchange",topTextInput:"textInput",topTouchCancel:"touchcancel",topTouchEnd:"touchend",topTouchMove:"touchmove",topTouchStart:"touchstart",topWheel:"wheel"},m="_reactListenersID"+String(Math.random()).slice(2),v=l({},u,{ReactEventListener:null,injection:{injectReactEventListener:function(e){e.setHandleTopLevel(v.handleTopLevel),v.ReactEventListener=e}},setEnabled:function(e){v.ReactEventListener&&v.ReactEventListener.setEnabled(e)},isEnabled:function(){return!(!v.ReactEventListener||!v.ReactEventListener.isEnabled())},listenTo:function(e,t){for(var n=t,i=r(n),u=a.registrationNameDependencies[e],s=o.topLevelTypes,l=0,p=u.length;p>l;l++){var d=u[l];i.hasOwnProperty(d)&&i[d]||(d===s.topWheel?c("wheel")?v.ReactEventListener.trapBubbledEvent(s.topWheel,"wheel",n):c("mousewheel")?v.ReactEventListener.trapBubbledEvent(s.topWheel,"mousewheel",n):v.ReactEventListener.trapBubbledEvent(s.topWheel,"DOMMouseScroll",n):d===s.topScroll?c("scroll",!0)?v.ReactEventListener.trapCapturedEvent(s.topScroll,"scroll",n):v.ReactEventListener.trapBubbledEvent(s.topScroll,"scroll",v.ReactEventListener.WINDOW_HANDLE):d===s.topFocus||d===s.topBlur?(c("focus",!0)?(v.ReactEventListener.trapCapturedEvent(s.topFocus,"focus",n),v.ReactEventListener.trapCapturedEvent(s.topBlur,"blur",n)):c("focusin")&&(v.ReactEventListener.trapBubbledEvent(s.topFocus,"focusin",n),v.ReactEventListener.trapBubbledEvent(s.topBlur,"focusout",n)),i[s.topBlur]=!0,i[s.topFocus]=!0):h.hasOwnProperty(d)&&v.ReactEventListener.trapBubbledEvent(d,h[d],n),i[d]=!0)}},trapBubbledEvent:function(e,t,n){
+return v.ReactEventListener.trapBubbledEvent(e,t,n)},trapCapturedEvent:function(e,t,n){return v.ReactEventListener.trapCapturedEvent(e,t,n)},ensureScrollValueMonitoring:function(){if(!d){var e=s.refreshScrollValues;v.ReactEventListener.monitorScrollValue(e),d=!0}},eventNameDispatchConfigs:i.eventNameDispatchConfigs,registrationNameModules:i.registrationNameModules,putListener:i.putListener,getListener:i.getListener,deleteListener:i.deleteListener,deleteAllListeners:i.deleteAllListeners});t.exports=v},{102:102,134:134,15:15,17:17,18:18,27:27,59:59}],31:[function(e,t,n){"use strict";var r=e(79),o=e(116),i=e(132),a=e(147),u={instantiateChildren:function(e,t,n){var r=o(e);for(var a in r)if(r.hasOwnProperty(a)){var u=r[a],s=i(u,null);r[a]=s}return r},updateChildren:function(e,t,n,u){var s=o(t);if(!s&&!e)return null;var l;for(l in s)if(s.hasOwnProperty(l)){var c=e&&e[l],p=c&&c._currentElement,d=s[l];if(a(p,d))r.receiveComponent(c,d,n,u),s[l]=c;else{c&&r.unmountComponent(c,l);var f=i(d,null);s[l]=f}}for(l in e)!e.hasOwnProperty(l)||s&&s.hasOwnProperty(l)||r.unmountComponent(e[l]);return s},unmountChildren:function(e){for(var t in e){var n=e[t];r.unmountComponent(n)}}};t.exports=u},{116:116,132:132,147:147,79:79}],32:[function(e,t,n){"use strict";function r(e,t){this.forEachFunction=e,this.forEachContext=t}function o(e,t,n,r){var o=e;o.forEachFunction.call(o.forEachContext,t,r)}function i(e,t,n){if(null==e)return e;var i=r.getPooled(t,n);f(e,o,i),r.release(i)}function a(e,t,n){this.mapResult=e,this.mapFunction=t,this.mapContext=n}function u(e,t,n,r){var o=e,i=o.mapResult,a=!i.hasOwnProperty(n);if(a){var u=o.mapFunction.call(o.mapContext,t,r);i[n]=u}}function s(e,t,n){if(null==e)return e;var r={},o=a.getPooled(r,t,n);return f(e,u,o),a.release(o),d.create(r)}function l(e,t,n,r){return null}function c(e,t){return f(e,l,null)}var p=e(28),d=e(61),f=e(149),h=(e(150),p.twoArgumentPooler),m=p.threeArgumentPooler;p.addPoolingTo(r,h),p.addPoolingTo(a,m);var v={forEach:i,map:s,count:c};t.exports=v},{149:149,150:150,28:28,61:61}],33:[function(e,t,n){"use strict";function r(e,t){var n=D.hasOwnProperty(t)?D[t]:null;N.hasOwnProperty(t)&&y(n===_.OVERRIDE_BASE),e.hasOwnProperty(t)&&y(n===_.DEFINE_MANY||n===_.DEFINE_MANY_MERGED)}function o(e,t){if(t){y("function"!=typeof t),y(!d.isValidElement(t));var n=e.prototype;t.hasOwnProperty(b)&&M.mixins(e,t.mixins);for(var o in t)if(t.hasOwnProperty(o)&&o!==b){var i=t[o];if(r(n,o),M.hasOwnProperty(o))M[o](e,i);else{var a=D.hasOwnProperty(o),l=n.hasOwnProperty(o),c=i&&i.__reactDontBind,p="function"==typeof i,f=p&&!a&&!l&&!c;if(f)n.__reactAutoBindMap||(n.__reactAutoBindMap={}),n.__reactAutoBindMap[o]=i,n[o]=i;else if(l){var h=D[o];y(a&&(h===_.DEFINE_MANY_MERGED||h===_.DEFINE_MANY)),h===_.DEFINE_MANY_MERGED?n[o]=u(n[o],i):h===_.DEFINE_MANY&&(n[o]=s(n[o],i))}else n[o]=i}}}}function i(e,t){if(t)for(var n in t){var r=t[n];if(t.hasOwnProperty(n)){var o=n in M;y(!o);var i=n in e;y(!i),e[n]=r}}}function a(e,t){y(e&&t&&"object"==typeof e&&"object"==typeof t);for(var n in t)t.hasOwnProperty(n)&&(y(void 0===e[n]),e[n]=t[n]);return e}function u(e,t){return function(){var n=e.apply(this,arguments),r=t.apply(this,arguments);if(null==n)return r;if(null==r)return n;var o={};return a(o,n),a(o,r),o}}function s(e,t){return function(){e.apply(this,arguments),t.apply(this,arguments)}}function l(e,t){var n=t.bind(e);return n}function c(e){for(var t in e.__reactAutoBindMap)if(e.__reactAutoBindMap.hasOwnProperty(t)){var n=e.__reactAutoBindMap[t];e[t]=l(e,f.guard(n,e.constructor.displayName+"."+t))}}var p=e(34),d=(e(39),e(55)),f=e(58),h=e(65),m=e(66),v=(e(75),e(74),e(84)),g=e(27),y=e(133),C=e(138),E=e(139),b=(e(150),E({mixins:null})),_=C({DEFINE_ONCE:null,DEFINE_MANY:null,OVERRIDE_BASE:null,DEFINE_MANY_MERGED:null}),x=[],D={mixins:_.DEFINE_MANY,statics:_.DEFINE_MANY,propTypes:_.DEFINE_MANY,contextTypes:_.DEFINE_MANY,childContextTypes:_.DEFINE_MANY,getDefaultProps:_.DEFINE_MANY_MERGED,getInitialState:_.DEFINE_MANY_MERGED,getChildContext:_.DEFINE_MANY_MERGED,render:_.DEFINE_ONCE,componentWillMount:_.DEFINE_MANY,componentDidMount:_.DEFINE_MANY,componentWillReceiveProps:_.DEFINE_MANY,shouldComponentUpdate:_.DEFINE_ONCE,componentWillUpdate:_.DEFINE_MANY,componentDidUpdate:_.DEFINE_MANY,componentWillUnmount:_.DEFINE_MANY,updateComponent:_.OVERRIDE_BASE},M={displayName:function(e,t){e.displayName=t},mixins:function(e,t){if(t)for(var n=0;n<t.length;n++)o(e,t[n])},childContextTypes:function(e,t){e.childContextTypes=g({},e.childContextTypes,t)},contextTypes:function(e,t){e.contextTypes=g({},e.contextTypes,t)},getDefaultProps:function(e,t){e.getDefaultProps?e.getDefaultProps=u(e.getDefaultProps,t):e.getDefaultProps=t},propTypes:function(e,t){e.propTypes=g({},e.propTypes,t)},statics:function(e,t){i(e,t)}},N={replaceState:function(e,t){v.enqueueReplaceState(this,e),t&&v.enqueueCallback(this,t)},isMounted:function(){var e=h.get(this);return e&&e!==m.currentlyMountingInstance},setProps:function(e,t){v.enqueueSetProps(this,e),t&&v.enqueueCallback(this,t)},replaceProps:function(e,t){v.enqueueReplaceProps(this,e),t&&v.enqueueCallback(this,t)}},I=function(){};g(I.prototype,p.prototype,N);var T={createClass:function(e){var t=function(e,t){this.__reactAutoBindMap&&c(this),this.props=e,this.context=t,this.state=null;var n=this.getInitialState?this.getInitialState():null;y("object"==typeof n&&!Array.isArray(n)),this.state=n};t.prototype=new I,t.prototype.constructor=t,x.forEach(o.bind(null,t)),o(t,e),t.getDefaultProps&&(t.defaultProps=t.getDefaultProps()),y(t.prototype.render);for(var n in D)t.prototype[n]||(t.prototype[n]=null);return t.type=t,t},injection:{injectMixin:function(e){x.push(e)}}};t.exports=T},{133:133,138:138,139:139,150:150,27:27,34:34,39:39,55:55,58:58,65:65,66:66,74:74,75:75,84:84}],34:[function(e,t,n){"use strict";function r(e,t){this.props=e,this.context=t}{var o=e(84),i=e(133);e(150)}r.prototype.setState=function(e,t){i("object"==typeof e||"function"==typeof e||null==e),o.enqueueSetState(this,e),t&&o.enqueueCallback(this,t)},r.prototype.forceUpdate=function(e){o.enqueueForceUpdate(this),e&&o.enqueueCallback(this,e)};t.exports=r},{133:133,150:150,84:84}],35:[function(e,t,n){"use strict";var r=e(44),o=e(68),i={processChildrenUpdates:r.dangerouslyProcessChildrenUpdates,replaceNodeWithMarkupByID:r.dangerouslyReplaceNodeWithMarkupByID,unmountIDFromEnvironment:function(e){o.purgeID(e)}};t.exports=i},{44:44,68:68}],36:[function(e,t,n){"use strict";var r=e(133),o=!1,i={unmountIDFromEnvironment:null,replaceNodeWithMarkupByID:null,processChildrenUpdates:null,injection:{injectEnvironment:function(e){r(!o),i.unmountIDFromEnvironment=e.unmountIDFromEnvironment,i.replaceNodeWithMarkupByID=e.replaceNodeWithMarkupByID,i.processChildrenUpdates=e.processChildrenUpdates,o=!0}}};t.exports=i},{133:133}],37:[function(e,t,n){"use strict";function r(e){var t=e._currentElement._owner||null;if(t){var n=t.getName();if(n)return" Check the render method of `"+n+"`."}return""}var o=e(36),i=e(38),a=e(39),u=e(55),s=(e(56),e(65)),l=e(66),c=e(71),p=e(73),d=e(75),f=(e(74),e(79)),h=e(85),m=e(27),v=e(113),g=e(133),y=e(147),C=(e(150),1),E={construct:function(e){this._currentElement=e,this._rootNodeID=null,this._instance=null,this._pendingElement=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._renderedComponent=null,this._context=null,this._mountOrder=0,this._isTopLevel=!1,this._pendingCallbacks=null},mountComponent:function(e,t,n){this._context=n,this._mountOrder=C++,this._rootNodeID=e;var r=this._processProps(this._currentElement.props),o=this._processContext(this._currentElement._context),i=c.getComponentClassForElement(this._currentElement),a=new i(r,o);a.props=r,a.context=o,a.refs=v,this._instance=a,s.set(a,this);var u=a.state;void 0===u&&(a.state=u=null),g("object"==typeof u&&!Array.isArray(u)),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1;var p,d=l.currentlyMountingInstance;l.currentlyMountingInstance=this;try{a.componentWillMount&&(a.componentWillMount(),this._pendingStateQueue&&(a.state=this._processPendingState(a.props,a.context))),p=this._renderValidatedComponent()}finally{l.currentlyMountingInstance=d}this._renderedComponent=this._instantiateReactComponent(p,this._currentElement.type);var h=f.mountComponent(this._renderedComponent,e,t,this._processChildContext(n));return a.componentDidMount&&t.getReactMountReady().enqueue(a.componentDidMount,a),h},unmountComponent:function(){var e=this._instance;if(e.componentWillUnmount){var t=l.currentlyUnmountingInstance;l.currentlyUnmountingInstance=this;try{e.componentWillUnmount()}finally{l.currentlyUnmountingInstance=t}}f.unmountComponent(this._renderedComponent),this._renderedComponent=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._pendingCallbacks=null,this._pendingElement=null,this._context=null,this._rootNodeID=null,s.remove(e)},_setPropsInternal:function(e,t){var n=this._pendingElement||this._currentElement;this._pendingElement=u.cloneAndReplaceProps(n,m({},n.props,e)),h.enqueueUpdate(this,t)},_maskContext:function(e){var t=null;if("string"==typeof this._currentElement.type)return v;var n=this._currentElement.type.contextTypes;if(!n)return v;t={};for(var r in n)t[r]=e[r];return t},_processContext:function(e){var t=this._maskContext(e);return t},_processChildContext:function(e){var t=this._instance,n=t.getChildContext&&t.getChildContext();if(n){g("object"==typeof t.constructor.childContextTypes);for(var r in n)g(r in t.constructor.childContextTypes);return m({},e,n)}return e},_processProps:function(e){return e},_checkPropTypes:function(e,t,n){var o=this.getName();for(var i in e)if(e.hasOwnProperty(i)){var a;try{g("function"==typeof e[i]),a=e[i](t,i,o,n)}catch(u){a=u}a instanceof Error&&(r(this),n===d.prop)}},receiveComponent:function(e,t,n){var r=this._currentElement,o=this._context;this._pendingElement=null,this.updateComponent(t,r,e,o,n)},performUpdateIfNecessary:function(e){null!=this._pendingElement&&f.receiveComponent(this,this._pendingElement||this._currentElement,e,this._context),(null!==this._pendingStateQueue||this._pendingForceUpdate)&&this.updateComponent(e,this._currentElement,this._currentElement,this._context,this._context)},_warnIfContextsDiffer:function(e,t){e=this._maskContext(e),t=this._maskContext(t);for(var n=Object.keys(t).sort(),r=(this.getName()||"ReactCompositeComponent",0);r<n.length;r++)n[r]},updateComponent:function(e,t,n,r,o){var i=this._instance,a=i.context,u=i.props;t!==n&&(a=this._processContext(n._context),u=this._processProps(n.props),i.componentWillReceiveProps&&i.componentWillReceiveProps(u,a));var s=this._processPendingState(u,a),l=this._pendingForceUpdate||!i.shouldComponentUpdate||i.shouldComponentUpdate(u,s,a);l?(this._pendingForceUpdate=!1,this._performComponentUpdate(n,u,s,a,e,o)):(this._currentElement=n,this._context=o,i.props=u,i.state=s,i.context=a)},_processPendingState:function(e,t){var n=this._instance,r=this._pendingStateQueue,o=this._pendingReplaceState;if(this._pendingReplaceState=!1,this._pendingStateQueue=null,!r)return n.state;for(var i=m({},o?r[0]:n.state),a=o?1:0;a<r.length;a++){var u=r[a];m(i,"function"==typeof u?u.call(n,i,e,t):u)}return i},_performComponentUpdate:function(e,t,n,r,o,i){var a=this._instance,u=a.props,s=a.state,l=a.context;a.componentWillUpdate&&a.componentWillUpdate(t,n,r),this._currentElement=e,this._context=i,a.props=t,a.state=n,a.context=r,this._updateRenderedComponent(o,i),a.componentDidUpdate&&o.getReactMountReady().enqueue(a.componentDidUpdate.bind(a,u,s,l),a)},_updateRenderedComponent:function(e,t){var n=this._renderedComponent,r=n._currentElement,o=this._renderValidatedComponent();if(y(r,o))f.receiveComponent(n,o,e,this._processChildContext(t));else{var i=this._rootNodeID,a=n._rootNodeID;f.unmountComponent(n),this._renderedComponent=this._instantiateReactComponent(o,this._currentElement.type);var u=f.mountComponent(this._renderedComponent,i,e,this._processChildContext(t));this._replaceNodeWithMarkupByID(a,u)}},_replaceNodeWithMarkupByID:function(e,t){o.replaceNodeWithMarkupByID(e,t)},_renderValidatedComponentWithoutOwnerOrContext:function(){var e=this._instance,t=e.render();return t},_renderValidatedComponent:function(){var e,t=i.current;i.current=this._processChildContext(this._currentElement._context),a.current=this;try{e=this._renderValidatedComponentWithoutOwnerOrContext()}finally{i.current=t,a.current=null}return g(null===e||e===!1||u.isValidElement(e)),e},attachRef:function(e,t){var n=this.getPublicInstance(),r=n.refs===v?n.refs={}:n.refs;r[e]=t.getPublicInstance()},detachRef:function(e){var t=this.getPublicInstance().refs;delete t[e]},getName:function(){var e=this._currentElement.type,t=this._instance&&this._instance.constructor;return e.displayName||t&&t.displayName||e.name||t&&t.name||null},getPublicInstance:function(){return this._instance},_instantiateReactComponent:null};p.measureMethods(E,"ReactCompositeComponent",{mountComponent:"mountComponent",updateComponent:"updateComponent",_renderValidatedComponent:"_renderValidatedComponent"});var b={Mixin:E};t.exports=b},{113:113,133:133,147:147,150:150,27:27,36:36,38:38,39:39,55:55,56:56,65:65,66:66,71:71,73:73,74:74,75:75,79:79,85:85}],38:[function(e,t,n){"use strict";var r=e(27),o=e(113),i=(e(150),{current:o,withContext:function(e,t){var n,o=i.current;i.current=r({},o,e);try{n=t()}finally{i.current=o}return n}});t.exports=i},{113:113,150:150,27:27}],39:[function(e,t,n){"use strict";var r={current:null};t.exports=r},{}],40:[function(e,t,n){"use strict";function r(e){return o.createFactory(e)}var o=e(55),i=(e(56),e(140)),a=i({a:"a",abbr:"abbr",address:"address",area:"area",article:"article",aside:"aside",audio:"audio",b:"b",base:"base",bdi:"bdi",bdo:"bdo",big:"big",blockquote:"blockquote",body:"body",br:"br",button:"button",canvas:"canvas",caption:"caption",cite:"cite",code:"code",col:"col",colgroup:"colgroup",data:"data",datalist:"datalist",dd:"dd",del:"del",details:"details",dfn:"dfn",dialog:"dialog",div:"div",dl:"dl",dt:"dt",em:"em",embed:"embed",fieldset:"fieldset",figcaption:"figcaption",figure:"figure",footer:"footer",form:"form",h1:"h1",h2:"h2",h3:"h3",h4:"h4",h5:"h5",h6:"h6",head:"head",header:"header",hr:"hr",html:"html",i:"i",iframe:"iframe",img:"img",input:"input",ins:"ins",kbd:"kbd",keygen:"keygen",label:"label",legend:"legend",li:"li",link:"link",main:"main",map:"map",mark:"mark",menu:"menu",menuitem:"menuitem",meta:"meta",meter:"meter",nav:"nav",noscript:"noscript",object:"object",ol:"ol",optgroup:"optgroup",option:"option",output:"output",p:"p",param:"param",picture:"picture",pre:"pre",progress:"progress",q:"q",rp:"rp",rt:"rt",ruby:"ruby",s:"s",samp:"samp",script:"script",section:"section",select:"select",small:"small",source:"source",span:"span",strong:"strong",style:"style",sub:"sub",summary:"summary",sup:"sup",table:"table",tbody:"tbody",td:"td",textarea:"textarea",tfoot:"tfoot",th:"th",thead:"thead",time:"time",title:"title",tr:"tr",track:"track",u:"u",ul:"ul","var":"var",video:"video",wbr:"wbr",circle:"circle",defs:"defs",ellipse:"ellipse",g:"g",line:"line",linearGradient:"linearGradient",mask:"mask",path:"path",pattern:"pattern",polygon:"polygon",polyline:"polyline",radialGradient:"radialGradient",rect:"rect",stop:"stop",svg:"svg",text:"text",tspan:"tspan"},r);t.exports=a},{140:140,55:55,56:56}],41:[function(e,t,n){"use strict";var r=e(2),o=e(29),i=e(33),a=e(55),u=e(138),s=a.createFactory("button"),l=u({onClick:!0,onDoubleClick:!0,onMouseDown:!0,onMouseMove:!0,onMouseUp:!0,onClickCapture:!0,onDoubleClickCapture:!0,onMouseDownCapture:!0,onMouseMoveCapture:!0,onMouseUpCapture:!0}),c=i.createClass({displayName:"ReactDOMButton",tagName:"BUTTON",mixins:[r,o],render:function(){var e={};for(var t in this.props)!this.props.hasOwnProperty(t)||this.props.disabled&&l[t]||(e[t]=this.props[t]);return s(e,this.props.children)}});t.exports=c},{138:138,2:2,29:29,33:33,55:55}],42:[function(e,t,n){"use strict";function r(e){e&&(null!=e.dangerouslySetInnerHTML&&(g(null==e.children),g(null!=e.dangerouslySetInnerHTML.__html)),g(null==e.style||"object"==typeof e.style))}function o(e,t,n,r){var o=d.findReactContainerForID(e);if(o){var i=o.nodeType===D?o.ownerDocument:o;E(t,i)}r.getPutListenerQueue().enqueuePutListener(e,t,n)}function i(e){R.call(T,e)||(g(I.test(e)),T[e]=!0)}function a(e){i(e),this._tag=e,this._renderedChildren=null,this._previousStyleCopy=null,this._rootNodeID=null}var u=e(5),s=e(10),l=e(11),c=e(30),p=e(35),d=e(68),f=e(69),h=e(73),m=e(27),v=e(114),g=e(133),y=(e(134),e(139)),C=(e(150),c.deleteListener),E=c.listenTo,b=c.registrationNameModules,_={string:!0,number:!0},x=y({style:null}),D=1,M=null,N={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},I=/^[a-zA-Z][a-zA-Z:_\.\-\d]*$/,T={},R={}.hasOwnProperty;a.displayName="ReactDOMComponent",a.Mixin={construct:function(e){this._currentElement=e},mountComponent:function(e,t,n){this._rootNodeID=e,r(this._currentElement.props);var o=N[this._tag]?"":"</"+this._tag+">";return this._createOpenTagMarkupAndPutListeners(t)+this._createContentMarkup(t,n)+o},_createOpenTagMarkupAndPutListeners:function(e){var t=this._currentElement.props,n="<"+this._tag;for(var r in t)if(t.hasOwnProperty(r)){var i=t[r];if(null!=i)if(b.hasOwnProperty(r))o(this._rootNodeID,r,i,e);else{r===x&&(i&&(i=this._previousStyleCopy=m({},t.style)),i=u.createMarkupForStyles(i));var a=l.createMarkupForProperty(r,i);a&&(n+=" "+a)}}if(e.renderToStaticMarkup)return n+">";var s=l.createMarkupForID(this._rootNodeID);return n+" "+s+">"},_createContentMarkup:function(e,t){var n="";("listing"===this._tag||"pre"===this._tag||"textarea"===this._tag)&&(n="\n");var r=this._currentElement.props,o=r.dangerouslySetInnerHTML;if(null!=o){if(null!=o.__html)return n+o.__html}else{var i=_[typeof r.children]?r.children:null,a=null!=i?null:r.children;if(null!=i)return n+v(i);if(null!=a){var u=this.mountChildren(a,e,t);return n+u.join("")}}return n},receiveComponent:function(e,t,n){var r=this._currentElement;this._currentElement=e,this.updateComponent(t,r,e,n)},updateComponent:function(e,t,n,o){r(this._currentElement.props),this._updateDOMProperties(t.props,e),this._updateDOMChildren(t.props,e,o)},_updateDOMProperties:function(e,t){var n,r,i,a=this._currentElement.props;for(n in e)if(!a.hasOwnProperty(n)&&e.hasOwnProperty(n))if(n===x){var u=this._previousStyleCopy;for(r in u)u.hasOwnProperty(r)&&(i=i||{},i[r]="");this._previousStyleCopy=null}else b.hasOwnProperty(n)?C(this._rootNodeID,n):(s.isStandardName[n]||s.isCustomAttribute(n))&&M.deletePropertyByID(this._rootNodeID,n);for(n in a){var l=a[n],c=n===x?this._previousStyleCopy:e[n];if(a.hasOwnProperty(n)&&l!==c)if(n===x)if(l?l=this._previousStyleCopy=m({},l):this._previousStyleCopy=null,c){for(r in c)!c.hasOwnProperty(r)||l&&l.hasOwnProperty(r)||(i=i||{},i[r]="");for(r in l)l.hasOwnProperty(r)&&c[r]!==l[r]&&(i=i||{},i[r]=l[r])}else i=l;else b.hasOwnProperty(n)?o(this._rootNodeID,n,l,t):(s.isStandardName[n]||s.isCustomAttribute(n))&&M.updatePropertyByID(this._rootNodeID,n,l)}i&&M.updateStylesByID(this._rootNodeID,i)},_updateDOMChildren:function(e,t,n){var r=this._currentElement.props,o=_[typeof e.children]?e.children:null,i=_[typeof r.children]?r.children:null,a=e.dangerouslySetInnerHTML&&e.dangerouslySetInnerHTML.__html,u=r.dangerouslySetInnerHTML&&r.dangerouslySetInnerHTML.__html,s=null!=o?null:e.children,l=null!=i?null:r.children,c=null!=o||null!=a,p=null!=i||null!=u;null!=s&&null==l?this.updateChildren(null,t,n):c&&!p&&this.updateTextContent(""),null!=i?o!==i&&this.updateTextContent(""+i):null!=u?a!==u&&M.updateInnerHTMLByID(this._rootNodeID,u):null!=l&&this.updateChildren(l,t,n)},unmountComponent:function(){this.unmountChildren(),c.deleteAllListeners(this._rootNodeID),p.unmountIDFromEnvironment(this._rootNodeID),this._rootNodeID=null}},h.measureMethods(a,"ReactDOMComponent",{mountComponent:"mountComponent",updateComponent:"updateComponent"}),m(a.prototype,a.Mixin,f.Mixin),a.injection={injectIDOperations:function(e){a.BackendIDOperations=M=e}},t.exports=a},{10:10,11:11,114:114,133:133,134:134,139:139,150:150,27:27,30:30,35:35,5:5,68:68,69:69,73:73}],43:[function(e,t,n){"use strict";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory("form"),l=a.createClass({displayName:"ReactDOMForm",tagName:"FORM",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topReset,"reset"),this.trapBubbledEvent(r.topLevelTypes.topSubmit,"submit")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],44:[function(e,t,n){"use strict";var r=e(5),o=e(9),i=e(11),a=e(68),u=e(73),s=e(133),l=e(144),c={dangerouslySetInnerHTML:"`dangerouslySetInnerHTML` must be set using `updateInnerHTMLByID()`.",style:"`style` must be set using `updateStylesByID()`."},p={updatePropertyByID:function(e,t,n){var r=a.getNode(e);s(!c.hasOwnProperty(t)),null!=n?i.setValueForProperty(r,t,n):i.deleteValueForProperty(r,t)},deletePropertyByID:function(e,t,n){var r=a.getNode(e);s(!c.hasOwnProperty(t)),i.deleteValueForProperty(r,t,n)},updateStylesByID:function(e,t){var n=a.getNode(e);r.setValueForStyles(n,t)},updateInnerHTMLByID:function(e,t){var n=a.getNode(e);l(n,t)},updateTextContentByID:function(e,t){var n=a.getNode(e);o.updateTextContent(n,t)},dangerouslyReplaceNodeWithMarkupByID:function(e,t){var n=a.getNode(e);o.dangerouslyReplaceNodeWithMarkup(n,t)},dangerouslyProcessChildrenUpdates:function(e,t){for(var n=0;n<e.length;n++)e[n].parentNode=a.getNode(e[n].parentID);o.processUpdates(e,t)}};u.measureMethods(p,"ReactDOMIDOperations",{updatePropertyByID:"updatePropertyByID",deletePropertyByID:"deletePropertyByID",updateStylesByID:"updateStylesByID",updateInnerHTMLByID:"updateInnerHTMLByID",updateTextContentByID:"updateTextContentByID",dangerouslyReplaceNodeWithMarkupByID:"dangerouslyReplaceNodeWithMarkupByID",dangerouslyProcessChildrenUpdates:"dangerouslyProcessChildrenUpdates"}),t.exports=p},{11:11,133:133,144:144,5:5,68:68,73:73,9:9}],45:[function(e,t,n){"use strict";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory("iframe"),l=a.createClass({displayName:"ReactDOMIframe",tagName:"IFRAME",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topLoad,"load")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],46:[function(e,t,n){"use strict";var r=e(15),o=e(25),i=e(29),a=e(33),u=e(55),s=u.createFactory("img"),l=a.createClass({displayName:"ReactDOMImg",tagName:"IMG",mixins:[i,o],render:function(){return s(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topLoad,"load"),this.trapBubbledEvent(r.topLevelTypes.topError,"error")}});t.exports=l},{15:15,25:25,29:29,33:33,55:55}],47:[function(e,t,n){"use strict";function r(){this.isMounted()&&this.forceUpdate()}var o=e(2),i=e(11),a=e(24),u=e(29),s=e(33),l=e(55),c=e(68),p=e(85),d=e(27),f=e(133),h=l.createFactory("input"),m={},v=s.createClass({displayName:"ReactDOMInput",tagName:"INPUT",mixins:[o,a.Mixin,u],getInitialState:function(){var e=this.props.defaultValue;return{initialChecked:this.props.defaultChecked||!1,initialValue:null!=e?e:null}},render:function(){var e=d({},this.props);e.defaultChecked=null,e.defaultValue=null;var t=a.getValue(this);e.value=null!=t?t:this.state.initialValue;var n=a.getChecked(this);return e.checked=null!=n?n:this.state.initialChecked,e.onChange=this._handleChange,h(e,this.props.children)},componentDidMount:function(){var e=c.getID(this.getDOMNode());m[e]=this},componentWillUnmount:function(){var e=this.getDOMNode(),t=c.getID(e);delete m[t]},componentDidUpdate:function(e,t,n){var r=this.getDOMNode();null!=this.props.checked&&i.setValueForProperty(r,"checked",this.props.checked||!1);var o=a.getValue(this);null!=o&&i.setValueForProperty(r,"value",""+o)},_handleChange:function(e){var t,n=a.getOnChange(this);n&&(t=n.call(this,e)),p.asap(r,this);var o=this.props.name;if("radio"===this.props.type&&null!=o){for(var i=this.getDOMNode(),u=i;u.parentNode;)u=u.parentNode;for(var s=u.querySelectorAll("input[name="+JSON.stringify(""+o)+'][type="radio"]'),l=0,d=s.length;d>l;l++){var h=s[l];if(h!==i&&h.form===i.form){var v=c.getID(h);f(v);var g=m[v];f(g),p.asap(r,g)}}}return t}});t.exports=v},{11:11,133:133,2:2,24:24,27:27,29:29,33:33,55:55,68:68,85:85}],48:[function(e,t,n){"use strict";var r=e(29),o=e(33),i=e(55),a=(e(150),i.createFactory("option")),u=o.createClass({displayName:"ReactDOMOption",tagName:"OPTION",mixins:[r],componentWillMount:function(){},render:function(){return a(this.props,this.props.children)}});t.exports=u},{150:150,29:29,33:33,55:55}],49:[function(e,t,n){"use strict";function r(){if(this._pendingUpdate){this._pendingUpdate=!1;var e=u.getValue(this);null!=e&&this.isMounted()&&i(this,e)}}function o(e,t,n){if(null==e[t])return null;if(e.multiple){if(!Array.isArray(e[t]))return new Error("The `"+t+"` prop supplied to <select> must be an array if `multiple` is true.")}else if(Array.isArray(e[t]))return new Error("The `"+t+"` prop supplied to <select> must be a scalar value if `multiple` is false.")}function i(e,t){var n,r,o,i=e.getDOMNode().options;if(e.props.multiple){for(n={},r=0,o=t.length;o>r;r++)n[""+t[r]]=!0;for(r=0,o=i.length;o>r;r++){var a=n.hasOwnProperty(i[r].value);i[r].selected!==a&&(i[r].selected=a)}}else{for(n=""+t,r=0,o=i.length;o>r;r++)if(i[r].value===n)return void(i[r].selected=!0);i.length&&(i[0].selected=!0)}}var a=e(2),u=e(24),s=e(29),l=e(33),c=e(55),p=e(85),d=e(27),f=c.createFactory("select"),h=l.createClass({displayName:"ReactDOMSelect",tagName:"SELECT",mixins:[a,u.Mixin,s],propTypes:{defaultValue:o,value:o},render:function(){var e=d({},this.props);return e.onChange=this._handleChange,e.value=null,f(e,this.props.children)},componentWillMount:function(){this._pendingUpdate=!1},componentDidMount:function(){var e=u.getValue(this);null!=e?i(this,e):null!=this.props.defaultValue&&i(this,this.props.defaultValue)},componentDidUpdate:function(e){var t=u.getValue(this);null!=t?(this._pendingUpdate=!1,i(this,t)):!e.multiple!=!this.props.multiple&&(null!=this.props.defaultValue?i(this,this.props.defaultValue):i(this,this.props.multiple?[]:""))},_handleChange:function(e){var t,n=u.getOnChange(this);return n&&(t=n.call(this,e)),this._pendingUpdate=!0,p.asap(r,this),t}});t.exports=h},{2:2,24:24,27:27,29:29,33:33,55:55,85:85}],50:[function(e,t,n){"use strict";function r(e,t,n,r){return e===n&&t===r}function o(e){var t=document.selection,n=t.createRange(),r=n.text.length,o=n.duplicate();o.moveToElementText(e),o.setEndPoint("EndToStart",n);var i=o.text.length,a=i+r;return{start:i,end:a}}function i(e){var t=window.getSelection&&window.getSelection();if(!t||0===t.rangeCount)return null;var n=t.anchorNode,o=t.anchorOffset,i=t.focusNode,a=t.focusOffset,u=t.getRangeAt(0),s=r(t.anchorNode,t.anchorOffset,t.focusNode,t.focusOffset),l=s?0:u.toString().length,c=u.cloneRange();c.selectNodeContents(e),c.setEnd(u.startContainer,u.startOffset);var p=r(c.startContainer,c.startOffset,c.endContainer,c.endOffset),d=p?0:c.toString().length,f=d+l,h=document.createRange();h.setStart(n,o),h.setEnd(i,a);var m=h.collapsed;return{start:m?f:d,end:m?d:f}}function a(e,t){var n,r,o=document.selection.createRange().duplicate();"undefined"==typeof t.end?(n=t.start,r=n):t.start>t.end?(n=t.end,r=t.start):(n=t.start,r=t.end),o.moveToElementText(e),o.moveStart("character",n),o.setEndPoint("EndToStart",o),o.moveEnd("character",r-n),o.select()}function u(e,t){if(window.getSelection){var n=window.getSelection(),r=e[c()].length,o=Math.min(t.start,r),i="undefined"==typeof t.end?o:Math.min(t.end,r);if(!n.extend&&o>i){var a=i;i=o,o=a}var u=l(e,o),s=l(e,i);if(u&&s){var p=document.createRange();p.setStart(u.node,u.offset),n.removeAllRanges(),o>i?(n.addRange(p),n.extend(s.node,s.offset)):(p.setEnd(s.node,s.offset),n.addRange(p))}}}var s=e(21),l=e(126),c=e(128),p=s.canUseDOM&&"selection"in document&&!("getSelection"in window),d={getOffsets:p?o:i,setOffsets:p?a:u};t.exports=d},{126:126,128:128,21:21}],51:[function(e,t,n){"use strict";var r=e(11),o=e(35),i=e(42),a=e(27),u=e(114),s=function(e){};a(s.prototype,{construct:function(e){this._currentElement=e,this._stringText=""+e,this._rootNodeID=null,this._mountIndex=0},mountComponent:function(e,t,n){this._rootNodeID=e;var o=u(this._stringText);return t.renderToStaticMarkup?o:"<span "+r.createMarkupForID(e)+">"+o+"</span>"},receiveComponent:function(e,t){if(e!==this._currentElement){this._currentElement=e;var n=""+e;n!==this._stringText&&(this._stringText=n,i.BackendIDOperations.updateTextContentByID(this._rootNodeID,n))}},unmountComponent:function(){o.unmountIDFromEnvironment(this._rootNodeID)}}),t.exports=s},{11:11,114:114,27:27,35:35,42:42}],52:[function(e,t,n){"use strict";function r(){this.isMounted()&&this.forceUpdate()}var o=e(2),i=e(11),a=e(24),u=e(29),s=e(33),l=e(55),c=e(85),p=e(27),d=e(133),f=(e(150),l.createFactory("textarea")),h=s.createClass({displayName:"ReactDOMTextarea",tagName:"TEXTAREA",mixins:[o,a.Mixin,u],getInitialState:function(){var e=this.props.defaultValue,t=this.props.children;null!=t&&(d(null==e),Array.isArray(t)&&(d(t.length<=1),t=t[0]),e=""+t),null==e&&(e="");var n=a.getValue(this);return{initialValue:""+(null!=n?n:e)}},render:function(){var e=p({},this.props);return d(null==e.dangerouslySetInnerHTML),e.defaultValue=null,e.value=null,e.onChange=this._handleChange,f(e,this.state.initialValue)},componentDidUpdate:function(e,t,n){var r=a.getValue(this);if(null!=r){var o=this.getDOMNode();i.setValueForProperty(o,"value",""+r)}},_handleChange:function(e){var t,n=a.getOnChange(this);return n&&(t=n.call(this,e)),c.asap(r,this),t}});t.exports=h},{11:11,133:133,150:150,2:2,24:24,27:27,29:29,33:33,55:55,85:85}],53:[function(e,t,n){"use strict";function r(){this.reinitializeTransaction()}var o=e(85),i=e(101),a=e(27),u=e(112),s={initialize:u,close:function(){d.isBatchingUpdates=!1}},l={initialize:u,close:o.flushBatchedUpdates.bind(o)},c=[l,s];a(r.prototype,i.Mixin,{getTransactionWrappers:function(){return c}});var p=new r,d={isBatchingUpdates:!1,batchedUpdates:function(e,t,n,r,o){var i=d.isBatchingUpdates;d.isBatchingUpdates=!0,i?e(t,n,r,o):p.perform(e,null,t,n,r,o)}};t.exports=d},{101:101,112:112,27:27,85:85}],54:[function(e,t,n){"use strict";function r(e){return h.createClass({tagName:e.toUpperCase(),render:function(){return new T(e,null,null,null,null,this.props)}})}function o(){P.EventEmitter.injectReactEventListener(R),P.EventPluginHub.injectEventPluginOrder(s),P.EventPluginHub.injectInstanceHandle(w),P.EventPluginHub.injectMount(O),P.EventPluginHub.injectEventPluginsByName({SimpleEventPlugin:L,EnterLeaveEventPlugin:l,ChangeEventPlugin:a,MobileSafariClickEventPlugin:d,SelectEventPlugin:A,BeforeInputEventPlugin:i}),P.NativeComponent.injectGenericComponentClass(g),P.NativeComponent.injectTextComponentClass(I),P.NativeComponent.injectAutoWrapper(r),P.Class.injectMixin(f),P.NativeComponent.injectComponentClasses({button:y,form:C,iframe:_,img:E,input:x,option:D,select:M,textarea:N,html:F("html"),head:F("head"),body:F("body")}),P.DOMProperty.injectDOMPropertyConfig(p),P.DOMProperty.injectDOMPropertyConfig(U),P.EmptyComponent.injectEmptyComponent("noscript"),P.Updates.injectReconcileTransaction(S),P.Updates.injectBatchingStrategy(v),P.RootIndex.injectCreateReactRootIndex(c.canUseDOM?u.createReactRootIndex:k.createReactRootIndex),P.Component.injectEnvironment(m),P.DOMComponent.injectIDOperations(b)}var i=e(3),a=e(7),u=e(8),s=e(13),l=e(14),c=e(21),p=e(23),d=e(26),f=e(29),h=e(33),m=e(35),v=e(53),g=e(42),y=e(41),C=e(43),E=e(46),b=e(44),_=e(45),x=e(47),D=e(48),M=e(49),N=e(52),I=e(51),T=e(55),R=e(60),P=e(62),w=e(64),O=e(68),S=e(78),A=e(87),k=e(88),L=e(89),U=e(86),F=e(109);t.exports={inject:o}},{109:109,13:13,14:14,21:21,23:23,26:26,29:29,3:3,33:33,35:35,41:41,42:42,43:43,44:44,45:45,46:46,47:47,48:48,49:49,51:51,52:52,53:53,55:55,60:60,62:62,64:64,68:68,7:7,78:78,8:8,86:86,87:87,88:88,
+89:89}],55:[function(e,t,n){"use strict";var r=e(38),o=e(39),i=e(27),a=(e(150),{key:!0,ref:!0}),u=function(e,t,n,r,o,i){this.type=e,this.key=t,this.ref=n,this._owner=r,this._context=o,this.props=i};u.prototype={_isReactElement:!0},u.createElement=function(e,t,n){var i,s={},l=null,c=null;if(null!=t){c=void 0===t.ref?null:t.ref,l=void 0===t.key?null:""+t.key;for(i in t)t.hasOwnProperty(i)&&!a.hasOwnProperty(i)&&(s[i]=t[i])}var p=arguments.length-2;if(1===p)s.children=n;else if(p>1){for(var d=Array(p),f=0;p>f;f++)d[f]=arguments[f+2];s.children=d}if(e&&e.defaultProps){var h=e.defaultProps;for(i in h)"undefined"==typeof s[i]&&(s[i]=h[i])}return new u(e,l,c,o.current,r.current,s)},u.createFactory=function(e){var t=u.createElement.bind(null,e);return t.type=e,t},u.cloneAndReplaceProps=function(e,t){var n=new u(e.type,e.key,e.ref,e._owner,e._context,t);return n},u.cloneElement=function(e,t,n){var r,s=i({},e.props),l=e.key,c=e.ref,p=e._owner;if(null!=t){void 0!==t.ref&&(c=t.ref,p=o.current),void 0!==t.key&&(l=""+t.key);for(r in t)t.hasOwnProperty(r)&&!a.hasOwnProperty(r)&&(s[r]=t[r])}var d=arguments.length-2;if(1===d)s.children=n;else if(d>1){for(var f=Array(d),h=0;d>h;h++)f[h]=arguments[h+2];s.children=f}return new u(e.type,l,c,p,e._context,s)},u.isValidElement=function(e){var t=!(!e||!e._isReactElement);return t},t.exports=u},{150:150,27:27,38:38,39:39}],56:[function(e,t,n){"use strict";function r(){if(y.current){var e=y.current.getName();if(e)return" Check the render method of `"+e+"`."}return""}function o(e){var t=e&&e.getPublicInstance();if(!t)return void 0;var n=t.constructor;return n?n.displayName||n.name||void 0:void 0}function i(){var e=y.current;return e&&o(e)||void 0}function a(e,t){e._store.validated||null!=e.key||(e._store.validated=!0,s('Each child in an array or iterator should have a unique "key" prop.',e,t))}function u(e,t,n){D.test(e)&&s("Child objects should have non-numeric keys so ordering is preserved.",t,n)}function s(e,t,n){var r=i(),a="string"==typeof n?n:n.displayName||n.name,u=r||a,s=_[e]||(_[e]={});if(!s.hasOwnProperty(u)){s[u]=!0;var l="";if(t&&t._owner&&t._owner!==y.current){var c=o(t._owner);l=" It was passed a child from "+c+"."}}}function l(e,t){if(Array.isArray(e))for(var n=0;n<e.length;n++){var r=e[n];m.isValidElement(r)&&a(r,t)}else if(m.isValidElement(e))e._store.validated=!0;else if(e){var o=E(e);if(o){if(o!==e.entries)for(var i,s=o.call(e);!(i=s.next()).done;)m.isValidElement(i.value)&&a(i.value,t)}else if("object"==typeof e){var l=v.extractIfFragment(e);for(var c in l)l.hasOwnProperty(c)&&u(c,l[c],t)}}}function c(e,t,n,o){for(var i in t)if(t.hasOwnProperty(i)){var a;try{b("function"==typeof t[i]),a=t[i](n,i,e,o)}catch(u){a=u}a instanceof Error&&!(a.message in x)&&(x[a.message]=!0,r(this))}}function p(e,t){var n=t.type,r="string"==typeof n?n:n.displayName,o=t._owner?t._owner.getPublicInstance().constructor.displayName:null,i=e+"|"+r+"|"+o;if(!M.hasOwnProperty(i)){M[i]=!0;var a="";r&&(a=" <"+r+" />");var u="";o&&(u=" The element was created by "+o+".")}}function d(e,t){return e!==e?t!==t:0===e&&0===t?1/e===1/t:e===t}function f(e){if(e._store){var t=e._store.originalProps,n=e.props;for(var r in n)n.hasOwnProperty(r)&&(t.hasOwnProperty(r)&&d(t[r],n[r])||(p(r,e),t[r]=n[r]))}}function h(e){if(null!=e.type){var t=C.getComponentClassForElement(e),n=t.displayName||t.name;t.propTypes&&c(n,t.propTypes,e.props,g.prop),"function"==typeof t.getDefaultProps}}var m=e(55),v=e(61),g=e(75),y=(e(74),e(39)),C=e(71),E=e(124),b=e(133),_=(e(150),{}),x={},D=/^\d+$/,M={},N={checkAndWarnForMutatedProps:f,createElement:function(e,t,n){var r=m.createElement.apply(this,arguments);if(null==r)return r;for(var o=2;o<arguments.length;o++)l(arguments[o],e);return h(r),r},createFactory:function(e){var t=N.createElement.bind(null,e);return t.type=e,t},cloneElement:function(e,t,n){for(var r=m.cloneElement.apply(this,arguments),o=2;o<arguments.length;o++)l(arguments[o],r.type);return h(r),r}};t.exports=N},{124:124,133:133,150:150,39:39,55:55,61:61,71:71,74:74,75:75}],57:[function(e,t,n){"use strict";function r(e){c[e]=!0}function o(e){delete c[e]}function i(e){return!!c[e]}var a,u=e(55),s=e(65),l=e(133),c={},p={injectEmptyComponent:function(e){a=u.createFactory(e)}},d=function(){};d.prototype.componentDidMount=function(){var e=s.get(this);e&&r(e._rootNodeID)},d.prototype.componentWillUnmount=function(){var e=s.get(this);e&&o(e._rootNodeID)},d.prototype.render=function(){return l(a),a()};var f=u.createElement(d),h={emptyElement:f,injection:p,isNullComponentID:i};t.exports=h},{133:133,55:55,65:65}],58:[function(e,t,n){"use strict";var r={guard:function(e,t){return e}};t.exports=r},{}],59:[function(e,t,n){"use strict";function r(e){o.enqueueEvents(e),o.processEventQueue()}var o=e(17),i={handleTopLevel:function(e,t,n,i){var a=o.extractEvents(e,t,n,i);r(a)}};t.exports=i},{17:17}],60:[function(e,t,n){"use strict";function r(e){var t=p.getID(e),n=c.getReactRootIDFromNodeID(t),r=p.findReactContainerForID(n),o=p.getFirstReactDOM(r);return o}function o(e,t){this.topLevelType=e,this.nativeEvent=t,this.ancestors=[]}function i(e){for(var t=p.getFirstReactDOM(h(e.nativeEvent))||window,n=t;n;)e.ancestors.push(n),n=r(n);for(var o=0,i=e.ancestors.length;i>o;o++){t=e.ancestors[o];var a=p.getID(t)||"";v._handleTopLevel(e.topLevelType,t,a,e.nativeEvent)}}function a(e){var t=m(window);e(t)}var u=e(16),s=e(21),l=e(28),c=e(64),p=e(68),d=e(85),f=e(27),h=e(123),m=e(129);f(o.prototype,{destructor:function(){this.topLevelType=null,this.nativeEvent=null,this.ancestors.length=0}}),l.addPoolingTo(o,l.twoArgumentPooler);var v={_enabled:!0,_handleTopLevel:null,WINDOW_HANDLE:s.canUseDOM?window:null,setHandleTopLevel:function(e){v._handleTopLevel=e},setEnabled:function(e){v._enabled=!!e},isEnabled:function(){return v._enabled},trapBubbledEvent:function(e,t,n){var r=n;return r?u.listen(r,t,v.dispatchEvent.bind(null,e)):null},trapCapturedEvent:function(e,t,n){var r=n;return r?u.capture(r,t,v.dispatchEvent.bind(null,e)):null},monitorScrollValue:function(e){var t=a.bind(null,e);u.listen(window,"scroll",t)},dispatchEvent:function(e,t){if(v._enabled){var n=o.getPooled(e,t);try{d.batchedUpdates(i,n)}finally{o.release(n)}}}};t.exports=v},{123:123,129:129,16:16,21:21,27:27,28:28,64:64,68:68,85:85}],61:[function(e,t,n){"use strict";var r=(e(55),e(150),{create:function(e){return e},extract:function(e){return e},extractIfFragment:function(e){return e}});t.exports=r},{150:150,55:55}],62:[function(e,t,n){"use strict";var r=e(10),o=e(17),i=e(36),a=e(33),u=e(57),s=e(30),l=e(71),c=e(42),p=e(73),d=e(81),f=e(85),h={Component:i.injection,Class:a.injection,DOMComponent:c.injection,DOMProperty:r.injection,EmptyComponent:u.injection,EventPluginHub:o.injection,EventEmitter:s.injection,NativeComponent:l.injection,Perf:p.injection,RootIndex:d.injection,Updates:f.injection};t.exports=h},{10:10,17:17,30:30,33:33,36:36,42:42,57:57,71:71,73:73,81:81,85:85}],63:[function(e,t,n){"use strict";function r(e){return i(document.documentElement,e)}var o=e(50),i=e(107),a=e(117),u=e(119),s={hasSelectionCapabilities:function(e){return e&&("INPUT"===e.nodeName&&"text"===e.type||"TEXTAREA"===e.nodeName||"true"===e.contentEditable)},getSelectionInformation:function(){var e=u();return{focusedElem:e,selectionRange:s.hasSelectionCapabilities(e)?s.getSelection(e):null}},restoreSelection:function(e){var t=u(),n=e.focusedElem,o=e.selectionRange;t!==n&&r(n)&&(s.hasSelectionCapabilities(n)&&s.setSelection(n,o),a(n))},getSelection:function(e){var t;if("selectionStart"in e)t={start:e.selectionStart,end:e.selectionEnd};else if(document.selection&&"INPUT"===e.nodeName){var n=document.selection.createRange();n.parentElement()===e&&(t={start:-n.moveStart("character",-e.value.length),end:-n.moveEnd("character",-e.value.length)})}else t=o.getOffsets(e);return t||{start:0,end:0}},setSelection:function(e,t){var n=t.start,r=t.end;if("undefined"==typeof r&&(r=n),"selectionStart"in e)e.selectionStart=n,e.selectionEnd=Math.min(r,e.value.length);else if(document.selection&&"INPUT"===e.nodeName){var i=e.createTextRange();i.collapse(!0),i.moveStart("character",n),i.moveEnd("character",r-n),i.select()}else o.setOffsets(e,t)}};t.exports=s},{107:107,117:117,119:119,50:50}],64:[function(e,t,n){"use strict";function r(e){return f+e.toString(36)}function o(e,t){return e.charAt(t)===f||t===e.length}function i(e){return""===e||e.charAt(0)===f&&e.charAt(e.length-1)!==f}function a(e,t){return 0===t.indexOf(e)&&o(t,e.length)}function u(e){return e?e.substr(0,e.lastIndexOf(f)):""}function s(e,t){if(d(i(e)&&i(t)),d(a(e,t)),e===t)return e;var n,r=e.length+h;for(n=r;n<t.length&&!o(t,n);n++);return t.substr(0,n)}function l(e,t){var n=Math.min(e.length,t.length);if(0===n)return"";for(var r=0,a=0;n>=a;a++)if(o(e,a)&&o(t,a))r=a;else if(e.charAt(a)!==t.charAt(a))break;var u=e.substr(0,r);return d(i(u)),u}function c(e,t,n,r,o,i){e=e||"",t=t||"",d(e!==t);var l=a(t,e);d(l||a(e,t));for(var c=0,p=l?u:s,f=e;;f=p(f,t)){var h;if(o&&f===e||i&&f===t||(h=n(f,l,r)),h===!1||f===t)break;d(c++<m)}}var p=e(81),d=e(133),f=".",h=f.length,m=100,v={createReactRootID:function(){return r(p.createReactRootIndex())},createReactID:function(e,t){return e+t},getReactRootIDFromNodeID:function(e){if(e&&e.charAt(0)===f&&e.length>1){var t=e.indexOf(f,1);return t>-1?e.substr(0,t):e}return null},traverseEnterLeave:function(e,t,n,r,o){var i=l(e,t);i!==e&&c(e,i,n,r,!1,!0),i!==t&&c(i,t,n,o,!0,!1)},traverseTwoPhase:function(e,t,n){e&&(c("",e,t,n,!0,!1),c(e,"",t,n,!1,!0))},traverseAncestors:function(e,t,n){c("",e,t,n,!0,!1)},_getFirstCommonAncestorID:l,_getNextDescendantID:s,isAncestorIDOf:a,SEPARATOR:f};t.exports=v},{133:133,81:81}],65:[function(e,t,n){"use strict";var r={remove:function(e){e._reactInternalInstance=void 0},get:function(e){return e._reactInternalInstance},has:function(e){return void 0!==e._reactInternalInstance},set:function(e,t){e._reactInternalInstance=t}};t.exports=r},{}],66:[function(e,t,n){"use strict";var r={currentlyMountingInstance:null,currentlyUnmountingInstance:null};t.exports=r},{}],67:[function(e,t,n){"use strict";var r=e(104),o={CHECKSUM_ATTR_NAME:"data-react-checksum",addChecksumToMarkup:function(e){var t=r(e);return e.replace(">"," "+o.CHECKSUM_ATTR_NAME+'="'+t+'">')},canReuseMarkup:function(e,t){var n=t.getAttribute(o.CHECKSUM_ATTR_NAME);n=n&&parseInt(n,10);var i=r(e);return i===n}};t.exports=o},{104:104}],68:[function(e,t,n){"use strict";function r(e,t){for(var n=Math.min(e.length,t.length),r=0;n>r;r++)if(e.charAt(r)!==t.charAt(r))return r;return e.length===t.length?-1:n}function o(e){var t=R(e);return t&&K.getID(t)}function i(e){var t=a(e);if(t)if(L.hasOwnProperty(t)){var n=L[t];n!==e&&(w(!c(n,t)),L[t]=e)}else L[t]=e;return t}function a(e){return e&&e.getAttribute&&e.getAttribute(k)||""}function u(e,t){var n=a(e);n!==t&&delete L[n],e.setAttribute(k,t),L[t]=e}function s(e){return L.hasOwnProperty(e)&&c(L[e],e)||(L[e]=K.findReactNodeByID(e)),L[e]}function l(e){var t=b.get(e)._rootNodeID;return C.isNullComponentID(t)?null:(L.hasOwnProperty(t)&&c(L[t],t)||(L[t]=K.findReactNodeByID(t)),L[t])}function c(e,t){if(e){w(a(e)===t);var n=K.findReactContainerForID(t);if(n&&T(n,e))return!0}return!1}function p(e){delete L[e]}function d(e){var t=L[e];return t&&c(t,e)?void(W=t):!1}function f(e){W=null,E.traverseAncestors(e,d);var t=W;return W=null,t}function h(e,t,n,r,o){var i=D.mountComponent(e,t,r,I);e._isTopLevel=!0,K._mountImageIntoNode(i,n,o)}function m(e,t,n,r){var o=N.ReactReconcileTransaction.getPooled();o.perform(h,null,e,t,n,o,r),N.ReactReconcileTransaction.release(o)}var v=e(10),g=e(30),y=(e(39),e(55)),C=(e(56),e(57)),E=e(64),b=e(65),_=e(67),x=e(73),D=e(79),M=e(84),N=e(85),I=e(113),T=e(107),R=e(127),P=e(132),w=e(133),O=e(144),S=e(147),A=(e(150),E.SEPARATOR),k=v.ID_ATTRIBUTE_NAME,L={},U=1,F=9,B={},V={},j=[],W=null,K={_instancesByReactRootID:B,scrollMonitor:function(e,t){t()},_updateRootComponent:function(e,t,n,r){return K.scrollMonitor(n,function(){M.enqueueElementInternal(e,t),r&&M.enqueueCallbackInternal(e,r)}),e},_registerComponent:function(e,t){w(t&&(t.nodeType===U||t.nodeType===F)),g.ensureScrollValueMonitoring();var n=K.registerContainer(t);return B[n]=e,n},_renderNewRootComponent:function(e,t,n){var r=P(e,null),o=K._registerComponent(r,t);return N.batchedUpdates(m,r,o,t,n),r},render:function(e,t,n){w(y.isValidElement(e));var r=B[o(t)];if(r){var i=r._currentElement;if(S(i,e))return K._updateRootComponent(r,e,t,n).getPublicInstance();K.unmountComponentAtNode(t)}var a=R(t),u=a&&K.isRenderedByReact(a),s=u&&!r,l=K._renderNewRootComponent(e,t,s).getPublicInstance();return n&&n.call(l),l},constructAndRenderComponent:function(e,t,n){var r=y.createElement(e,t);return K.render(r,n)},constructAndRenderComponentByID:function(e,t,n){var r=document.getElementById(n);return w(r),K.constructAndRenderComponent(e,t,r)},registerContainer:function(e){var t=o(e);return t&&(t=E.getReactRootIDFromNodeID(t)),t||(t=E.createReactRootID()),V[t]=e,t},unmountComponentAtNode:function(e){w(e&&(e.nodeType===U||e.nodeType===F));var t=o(e),n=B[t];return n?(K.unmountComponentFromNode(n,e),delete B[t],delete V[t],!0):!1},unmountComponentFromNode:function(e,t){for(D.unmountComponent(e),t.nodeType===F&&(t=t.documentElement);t.lastChild;)t.removeChild(t.lastChild)},findReactContainerForID:function(e){var t=E.getReactRootIDFromNodeID(e),n=V[t];return n},findReactNodeByID:function(e){var t=K.findReactContainerForID(e);return K.findComponentRoot(t,e)},isRenderedByReact:function(e){if(1!==e.nodeType)return!1;var t=K.getID(e);return t?t.charAt(0)===A:!1},getFirstReactDOM:function(e){for(var t=e;t&&t.parentNode!==t;){if(K.isRenderedByReact(t))return t;t=t.parentNode}return null},findComponentRoot:function(e,t){var n=j,r=0,o=f(t)||e;for(n[0]=o.firstChild,n.length=1;r<n.length;){for(var i,a=n[r++];a;){var u=K.getID(a);u?t===u?i=a:E.isAncestorIDOf(u,t)&&(n.length=r=0,n.push(a.firstChild)):n.push(a.firstChild),a=a.nextSibling}if(i)return n.length=0,i}n.length=0,w(!1)},_mountImageIntoNode:function(e,t,n){if(w(t&&(t.nodeType===U||t.nodeType===F)),n){var o=R(t);if(_.canReuseMarkup(e,o))return;var i=o.getAttribute(_.CHECKSUM_ATTR_NAME);o.removeAttribute(_.CHECKSUM_ATTR_NAME);var a=o.outerHTML;o.setAttribute(_.CHECKSUM_ATTR_NAME,i);var u=r(e,a);" (client) "+e.substring(u-20,u+20)+"\n (server) "+a.substring(u-20,u+20),w(t.nodeType!==F)}w(t.nodeType!==F),O(t,e)},getReactRootID:o,getID:i,setID:u,getNode:s,getNodeFromInstance:l,purgeID:p};x.measureMethods(K,"ReactMount",{_renderNewRootComponent:"_renderNewRootComponent",_mountImageIntoNode:"_mountImageIntoNode"}),t.exports=K},{10:10,107:107,113:113,127:127,132:132,133:133,144:144,147:147,150:150,30:30,39:39,55:55,56:56,57:57,64:64,65:65,67:67,73:73,79:79,84:84,85:85}],69:[function(e,t,n){"use strict";function r(e,t,n){h.push({parentID:e,parentNode:null,type:c.INSERT_MARKUP,markupIndex:m.push(t)-1,textContent:null,fromIndex:null,toIndex:n})}function o(e,t,n){h.push({parentID:e,parentNode:null,type:c.MOVE_EXISTING,markupIndex:null,textContent:null,fromIndex:t,toIndex:n})}function i(e,t){h.push({parentID:e,parentNode:null,type:c.REMOVE_NODE,markupIndex:null,textContent:null,fromIndex:t,toIndex:null})}function a(e,t){h.push({parentID:e,parentNode:null,type:c.TEXT_CONTENT,markupIndex:null,textContent:t,fromIndex:null,toIndex:null})}function u(){h.length&&(l.processChildrenUpdates(h,m),s())}function s(){h.length=0,m.length=0}var l=e(36),c=e(70),p=e(79),d=e(31),f=0,h=[],m=[],v={Mixin:{mountChildren:function(e,t,n){var r=d.instantiateChildren(e,t,n);this._renderedChildren=r;var o=[],i=0;for(var a in r)if(r.hasOwnProperty(a)){var u=r[a],s=this._rootNodeID+a,l=p.mountComponent(u,s,t,n);u._mountIndex=i,o.push(l),i++}return o},updateTextContent:function(e){f++;var t=!0;try{var n=this._renderedChildren;d.unmountChildren(n);for(var r in n)n.hasOwnProperty(r)&&this._unmountChildByName(n[r],r);this.setTextContent(e),t=!1}finally{f--,f||(t?s():u())}},updateChildren:function(e,t,n){f++;var r=!0;try{this._updateChildren(e,t,n),r=!1}finally{f--,f||(r?s():u())}},_updateChildren:function(e,t,n){var r=this._renderedChildren,o=d.updateChildren(r,e,t,n);if(this._renderedChildren=o,o||r){var i,a=0,u=0;for(i in o)if(o.hasOwnProperty(i)){var s=r&&r[i],l=o[i];s===l?(this.moveChild(s,u,a),a=Math.max(s._mountIndex,a),s._mountIndex=u):(s&&(a=Math.max(s._mountIndex,a),this._unmountChildByName(s,i)),this._mountChildByNameAtIndex(l,i,u,t,n)),u++}for(i in r)!r.hasOwnProperty(i)||o&&o.hasOwnProperty(i)||this._unmountChildByName(r[i],i)}},unmountChildren:function(){var e=this._renderedChildren;d.unmountChildren(e),this._renderedChildren=null},moveChild:function(e,t,n){e._mountIndex<n&&o(this._rootNodeID,e._mountIndex,t)},createChild:function(e,t){r(this._rootNodeID,t,e._mountIndex)},removeChild:function(e){i(this._rootNodeID,e._mountIndex)},setTextContent:function(e){a(this._rootNodeID,e)},_mountChildByNameAtIndex:function(e,t,n,r,o){var i=this._rootNodeID+t,a=p.mountComponent(e,i,r,o);e._mountIndex=n,this.createChild(e,a)},_unmountChildByName:function(e,t){this.removeChild(e),e._mountIndex=null}}};t.exports=v},{31:31,36:36,70:70,79:79}],70:[function(e,t,n){"use strict";var r=e(138),o=r({INSERT_MARKUP:null,MOVE_EXISTING:null,REMOVE_NODE:null,TEXT_CONTENT:null});t.exports=o},{138:138}],71:[function(e,t,n){"use strict";function r(e){if("function"==typeof e.type)return e.type;var t=e.type,n=p[t];return null==n&&(p[t]=n=l(t)),n}function o(e){return s(c),new c(e.type,e.props)}function i(e){return new d(e)}function a(e){return e instanceof d}var u=e(27),s=e(133),l=null,c=null,p={},d=null,f={injectGenericComponentClass:function(e){c=e},injectTextComponentClass:function(e){d=e},injectComponentClasses:function(e){u(p,e)},injectAutoWrapper:function(e){l=e}},h={getComponentClassForElement:r,createInternalComponent:o,createInstanceForText:i,isTextComponent:a,injection:f};t.exports=h},{133:133,27:27}],72:[function(e,t,n){"use strict";var r=e(133),o={isValidOwner:function(e){return!(!e||"function"!=typeof e.attachRef||"function"!=typeof e.detachRef)},addComponentAsRefTo:function(e,t,n){r(o.isValidOwner(n)),n.attachRef(t,e)},removeComponentAsRefFrom:function(e,t,n){r(o.isValidOwner(n)),n.getPublicInstance().refs[t]===e.getPublicInstance()&&n.detachRef(t)}};t.exports=o},{133:133}],73:[function(e,t,n){"use strict";function r(e,t,n){return n}var o={enableMeasure:!1,storedMeasure:r,measureMethods:function(e,t,n){},measure:function(e,t,n){return n},injection:{injectMeasure:function(e){o.storedMeasure=e}}};t.exports=o},{}],74:[function(e,t,n){"use strict";var r={};t.exports=r},{}],75:[function(e,t,n){"use strict";var r=e(138),o=r({prop:null,context:null,childContext:null});t.exports=o},{138:138}],76:[function(e,t,n){"use strict";function r(e){function t(t,n,r,o,i){if(o=o||b,null==n[r]){var a=C[i];return t?new Error("Required "+a+" `"+r+"` was not specified in "+("`"+o+"`.")):null}return e(n,r,o,i)}var n=t.bind(null,!1);return n.isRequired=t.bind(null,!0),n}function o(e){function t(t,n,r,o){var i=t[n],a=m(i);if(a!==e){var u=C[o],s=v(i);return new Error("Invalid "+u+" `"+n+"` of type `"+s+"` "+("supplied to `"+r+"`, expected `"+e+"`."))}return null}return r(t)}function i(){return r(E.thatReturns(null))}function a(e){function t(t,n,r,o){var i=t[n];if(!Array.isArray(i)){var a=C[o],u=m(i);return new Error("Invalid "+a+" `"+n+"` of type "+("`"+u+"` supplied to `"+r+"`, expected an array."))}for(var s=0;s<i.length;s++){var l=e(i,s,r,o);if(l instanceof Error)return l}return null}return r(t)}function u(){function e(e,t,n,r){if(!g.isValidElement(e[t])){var o=C[r];return new Error("Invalid "+o+" `"+t+"` supplied to "+("`"+n+"`, expected a ReactElement."))}return null}return r(e)}function s(e){function t(t,n,r,o){if(!(t[n]instanceof e)){var i=C[o],a=e.name||b;return new Error("Invalid "+i+" `"+n+"` supplied to "+("`"+r+"`, expected instance of `"+a+"`."))}return null}return r(t)}function l(e){function t(t,n,r,o){for(var i=t[n],a=0;a<e.length;a++)if(i===e[a])return null;var u=C[o],s=JSON.stringify(e);return new Error("Invalid "+u+" `"+n+"` of value `"+i+"` "+("supplied to `"+r+"`, expected one of "+s+"."))}return r(t)}function c(e){function t(t,n,r,o){var i=t[n],a=m(i);if("object"!==a){var u=C[o];return new Error("Invalid "+u+" `"+n+"` of type "+("`"+a+"` supplied to `"+r+"`, expected an object."))}for(var s in i)if(i.hasOwnProperty(s)){var l=e(i,s,r,o);if(l instanceof Error)return l}return null}return r(t)}function p(e){function t(t,n,r,o){for(var i=0;i<e.length;i++){var a=e[i];if(null==a(t,n,r,o))return null}var u=C[o];return new Error("Invalid "+u+" `"+n+"` supplied to "+("`"+r+"`."))}return r(t)}function d(){function e(e,t,n,r){if(!h(e[t])){var o=C[r];return new Error("Invalid "+o+" `"+t+"` supplied to "+("`"+n+"`, expected a ReactNode."))}return null}return r(e)}function f(e){function t(t,n,r,o){var i=t[n],a=m(i);if("object"!==a){var u=C[o];return new Error("Invalid "+u+" `"+n+"` of type `"+a+"` "+("supplied to `"+r+"`, expected `object`."))}for(var s in e){var l=e[s];if(l){var c=l(i,s,r,o);if(c)return c}}return null}return r(t)}function h(e){switch(typeof e){case"number":case"string":case"undefined":return!0;case"boolean":return!e;case"object":if(Array.isArray(e))return e.every(h);if(null===e||g.isValidElement(e))return!0;e=y.extractIfFragment(e);for(var t in e)if(!h(e[t]))return!1;return!0;default:return!1}}function m(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":t}function v(e){var t=m(e);if("object"===t){if(e instanceof Date)return"date";if(e instanceof RegExp)return"regexp"}return t}var g=e(55),y=e(61),C=e(74),E=e(112),b="<<anonymous>>",_=u(),x=d(),D={array:o("array"),bool:o("boolean"),func:o("function"),number:o("number"),object:o("object"),string:o("string"),any:i(),arrayOf:a,element:_,instanceOf:s,node:x,objectOf:c,oneOf:l,oneOfType:p,shape:f};t.exports=D},{112:112,55:55,61:61,74:74}],77:[function(e,t,n){"use strict";function r(){this.listenersToPut=[]}var o=e(28),i=e(30),a=e(27);a(r.prototype,{enqueuePutListener:function(e,t,n){this.listenersToPut.push({rootNodeID:e,propKey:t,propValue:n})},putListeners:function(){for(var e=0;e<this.listenersToPut.length;e++){var t=this.listenersToPut[e];i.putListener(t.rootNodeID,t.propKey,t.propValue)}},reset:function(){this.listenersToPut.length=0},destructor:function(){this.reset()}}),o.addPoolingTo(r),t.exports=r},{27:27,28:28,30:30}],78:[function(e,t,n){"use strict";function r(){this.reinitializeTransaction(),this.renderToStaticMarkup=!1,this.reactMountReady=o.getPooled(null),this.putListenerQueue=s.getPooled()}var o=e(6),i=e(28),a=e(30),u=e(63),s=e(77),l=e(101),c=e(27),p={initialize:u.getSelectionInformation,close:u.restoreSelection},d={initialize:function(){var e=a.isEnabled();return a.setEnabled(!1),e},close:function(e){a.setEnabled(e)}},f={initialize:function(){this.reactMountReady.reset()},close:function(){this.reactMountReady.notifyAll()}},h={initialize:function(){this.putListenerQueue.reset()},close:function(){this.putListenerQueue.putListeners()}},m=[h,p,d,f],v={getTransactionWrappers:function(){return m},getReactMountReady:function(){return this.reactMountReady},getPutListenerQueue:function(){return this.putListenerQueue},destructor:function(){o.release(this.reactMountReady),this.reactMountReady=null,s.release(this.putListenerQueue),this.putListenerQueue=null}};c(r.prototype,l.Mixin,v),i.addPoolingTo(r),t.exports=r},{101:101,27:27,28:28,30:30,6:6,63:63,77:77}],79:[function(e,t,n){"use strict";function r(){o.attachRefs(this,this._currentElement)}var o=e(80),i=(e(56),{mountComponent:function(e,t,n,o){var i=e.mountComponent(t,n,o);return n.getReactMountReady().enqueue(r,e),i},unmountComponent:function(e){o.detachRefs(e,e._currentElement),e.unmountComponent()},receiveComponent:function(e,t,n,i){var a=e._currentElement;if(t!==a||null==t._owner){var u=o.shouldUpdateRefs(a,t);u&&o.detachRefs(e,a),e.receiveComponent(t,n,i),u&&n.getReactMountReady().enqueue(r,e)}},performUpdateIfNecessary:function(e,t){e.performUpdateIfNecessary(t)}});t.exports=i},{56:56,80:80}],80:[function(e,t,n){"use strict";function r(e,t,n){"function"==typeof e?e(t.getPublicInstance()):i.addComponentAsRefTo(t,e,n)}function o(e,t,n){"function"==typeof e?e(null):i.removeComponentAsRefFrom(t,e,n)}var i=e(72),a={};a.attachRefs=function(e,t){var n=t.ref;null!=n&&r(n,e,t._owner)},a.shouldUpdateRefs=function(e,t){return t._owner!==e._owner||t.ref!==e.ref},a.detachRefs=function(e,t){var n=t.ref;null!=n&&o(n,e,t._owner)},t.exports=a},{72:72}],81:[function(e,t,n){"use strict";var r={injectCreateReactRootIndex:function(e){o.createReactRootIndex=e}},o={createReactRootIndex:null,injection:r};t.exports=o},{}],82:[function(e,t,n){"use strict";function r(e){p(i.isValidElement(e));var t;try{var n=a.createReactRootID();return t=s.getPooled(!1),t.perform(function(){var r=c(e,null),o=r.mountComponent(n,t,l);return u.addChecksumToMarkup(o)},null)}finally{s.release(t)}}function o(e){p(i.isValidElement(e));var t;try{var n=a.createReactRootID();return t=s.getPooled(!0),t.perform(function(){var r=c(e,null);return r.mountComponent(n,t,l)},null)}finally{s.release(t)}}var i=e(55),a=e(64),u=e(67),s=e(83),l=e(113),c=e(132),p=e(133);t.exports={renderToString:r,renderToStaticMarkup:o}},{113:113,132:132,133:133,55:55,64:64,67:67,83:83}],83:[function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=e,this.reactMountReady=i.getPooled(null),this.putListenerQueue=a.getPooled()}var o=e(28),i=e(6),a=e(77),u=e(101),s=e(27),l=e(112),c={initialize:function(){this.reactMountReady.reset()},close:l},p={initialize:function(){this.putListenerQueue.reset()},close:l},d=[p,c],f={getTransactionWrappers:function(){return d},getReactMountReady:function(){return this.reactMountReady},getPutListenerQueue:function(){return this.putListenerQueue},destructor:function(){i.release(this.reactMountReady),this.reactMountReady=null,a.release(this.putListenerQueue),this.putListenerQueue=null}};s(r.prototype,u.Mixin,f),o.addPoolingTo(r),t.exports=r},{101:101,112:112,27:27,28:28,6:6,77:77}],84:[function(e,t,n){"use strict";function r(e){e!==i.currentlyMountingInstance&&l.enqueueUpdate(e)}function o(e,t){p(null==a.current);var n=s.get(e);return n?n===i.currentlyUnmountingInstance?null:n:null}var i=e(66),a=e(39),u=e(55),s=e(65),l=e(85),c=e(27),p=e(133),d=(e(150),{enqueueCallback:function(e,t){p("function"==typeof t);var n=o(e);return n&&n!==i.currentlyMountingInstance?(n._pendingCallbacks?n._pendingCallbacks.push(t):n._pendingCallbacks=[t],void r(n)):null},enqueueCallbackInternal:function(e,t){p("function"==typeof t),e._pendingCallbacks?e._pendingCallbacks.push(t):e._pendingCallbacks=[t],r(e)},enqueueForceUpdate:function(e){var t=o(e,"forceUpdate");t&&(t._pendingForceUpdate=!0,r(t))},enqueueReplaceState:function(e,t){var n=o(e,"replaceState");n&&(n._pendingStateQueue=[t],n._pendingReplaceState=!0,r(n))},enqueueSetState:function(e,t){var n=o(e,"setState");if(n){var i=n._pendingStateQueue||(n._pendingStateQueue=[]);i.push(t),r(n)}},enqueueSetProps:function(e,t){var n=o(e,"setProps");if(n){p(n._isTopLevel);var i=n._pendingElement||n._currentElement,a=c({},i.props,t);n._pendingElement=u.cloneAndReplaceProps(i,a),r(n)}},enqueueReplaceProps:function(e,t){var n=o(e,"replaceProps");if(n){p(n._isTopLevel);var i=n._pendingElement||n._currentElement;n._pendingElement=u.cloneAndReplaceProps(i,t),r(n)}},enqueueElementInternal:function(e,t){e._pendingElement=t,r(e)}});t.exports=d},{133:133,150:150,27:27,39:39,55:55,65:65,66:66,85:85}],85:[function(e,t,n){"use strict";function r(){v(N.ReactReconcileTransaction&&E)}function o(){this.reinitializeTransaction(),this.dirtyComponentsLength=null,this.callbackQueue=c.getPooled(),this.reconcileTransaction=N.ReactReconcileTransaction.getPooled()}function i(e,t,n,o,i){r(),E.batchedUpdates(e,t,n,o,i)}function a(e,t){return e._mountOrder-t._mountOrder}function u(e){var t=e.dirtyComponentsLength;v(t===g.length),g.sort(a);for(var n=0;t>n;n++){var r=g[n],o=r._pendingCallbacks;if(r._pendingCallbacks=null,f.performUpdateIfNecessary(r,e.reconcileTransaction),o)for(var i=0;i<o.length;i++)e.callbackQueue.enqueue(o[i],r.getPublicInstance())}}function s(e){return r(),E.isBatchingUpdates?void g.push(e):void E.batchedUpdates(s,e)}function l(e,t){v(E.isBatchingUpdates),y.enqueue(e,t),C=!0}var c=e(6),p=e(28),d=(e(39),e(73)),f=e(79),h=e(101),m=e(27),v=e(133),g=(e(150),[]),y=c.getPooled(),C=!1,E=null,b={initialize:function(){this.dirtyComponentsLength=g.length},close:function(){this.dirtyComponentsLength!==g.length?(g.splice(0,this.dirtyComponentsLength),D()):g.length=0}},_={initialize:function(){this.callbackQueue.reset()},close:function(){this.callbackQueue.notifyAll()}},x=[b,_];m(o.prototype,h.Mixin,{getTransactionWrappers:function(){return x},destructor:function(){this.dirtyComponentsLength=null,c.release(this.callbackQueue),this.callbackQueue=null,N.ReactReconcileTransaction.release(this.reconcileTransaction),this.reconcileTransaction=null},perform:function(e,t,n){return h.Mixin.perform.call(this,this.reconcileTransaction.perform,this.reconcileTransaction,e,t,n)}}),p.addPoolingTo(o);var D=function(){for(;g.length||C;){if(g.length){var e=o.getPooled();e.perform(u,null,e),o.release(e)}if(C){C=!1;var t=y;y=c.getPooled(),t.notifyAll(),c.release(t)}}};D=d.measure("ReactUpdates","flushBatchedUpdates",D);var M={injectReconcileTransaction:function(e){v(e),N.ReactReconcileTransaction=e},injectBatchingStrategy:function(e){v(e),v("function"==typeof e.batchedUpdates),v("boolean"==typeof e.isBatchingUpdates),E=e}},N={ReactReconcileTransaction:null,batchedUpdates:i,enqueueUpdate:s,flushBatchedUpdates:D,injection:M,asap:l};t.exports=N},{101:101,133:133,150:150,27:27,28:28,39:39,6:6,73:73,79:79}],86:[function(e,t,n){"use strict";var r=e(10),o=r.injection.MUST_USE_ATTRIBUTE,i={Properties:{cx:o,cy:o,d:o,dx:o,dy:o,fill:o,fillOpacity:o,fontFamily:o,fontSize:o,fx:o,fy:o,gradientTransform:o,gradientUnits:o,markerEnd:o,markerMid:o,markerStart:o,offset:o,opacity:o,patternContentUnits:o,patternUnits:o,points:o,preserveAspectRatio:o,r:o,rx:o,ry:o,spreadMethod:o,stopColor:o,stopOpacity:o,stroke:o,strokeDasharray:o,strokeLinecap:o,strokeOpacity:o,strokeWidth:o,textAnchor:o,transform:o,version:o,viewBox:o,x1:o,x2:o,x:o,y1:o,y2:o,y:o},DOMAttributeNames:{fillOpacity:"fill-opacity",fontFamily:"font-family",fontSize:"font-size",gradientTransform:"gradientTransform",gradientUnits:"gradientUnits",markerEnd:"marker-end",markerMid:"marker-mid",markerStart:"marker-start",patternContentUnits:"patternContentUnits",patternUnits:"patternUnits",preserveAspectRatio:"preserveAspectRatio",spreadMethod:"spreadMethod",stopColor:"stop-color",stopOpacity:"stop-opacity",strokeDasharray:"stroke-dasharray",strokeLinecap:"stroke-linecap",strokeOpacity:"stroke-opacity",strokeWidth:"stroke-width",textAnchor:"text-anchor",viewBox:"viewBox"}};t.exports=i},{10:10}],87:[function(e,t,n){"use strict";function r(e){if("selectionStart"in e&&u.hasSelectionCapabilities(e))return{start:e.selectionStart,end:e.selectionEnd};if(window.getSelection){var t=window.getSelection();return{anchorNode:t.anchorNode,anchorOffset:t.anchorOffset,focusNode:t.focusNode,focusOffset:t.focusOffset}}if(document.selection){var n=document.selection.createRange();return{parentElement:n.parentElement(),text:n.text,top:n.boundingTop,left:n.boundingLeft}}}function o(e){if(y||null==m||m!==l())return null;var t=r(m);if(!g||!d(g,t)){g=t;var n=s.getPooled(h.select,v,e);return n.type="select",n.target=m,a.accumulateTwoPhaseDispatches(n),n}}var i=e(15),a=e(20),u=e(63),s=e(93),l=e(119),c=e(136),p=e(139),d=e(146),f=i.topLevelTypes,h={select:{phasedRegistrationNames:{bubbled:p({onSelect:null}),captured:p({onSelectCapture:null})},dependencies:[f.topBlur,f.topContextMenu,f.topFocus,f.topKeyDown,f.topMouseDown,f.topMouseUp,f.topSelectionChange]}},m=null,v=null,g=null,y=!1,C={eventTypes:h,extractEvents:function(e,t,n,r){switch(e){case f.topFocus:(c(t)||"true"===t.contentEditable)&&(m=t,v=n,g=null);break;case f.topBlur:m=null,v=null,g=null;break;case f.topMouseDown:
+y=!0;break;case f.topContextMenu:case f.topMouseUp:return y=!1,o(r);case f.topSelectionChange:case f.topKeyDown:case f.topKeyUp:return o(r)}}};t.exports=C},{119:119,136:136,139:139,146:146,15:15,20:20,63:63,93:93}],88:[function(e,t,n){"use strict";var r=Math.pow(2,53),o={createReactRootIndex:function(){return Math.ceil(Math.random()*r)}};t.exports=o},{}],89:[function(e,t,n){"use strict";var r=e(15),o=e(19),i=e(20),a=e(90),u=e(93),s=e(94),l=e(96),c=e(97),p=e(92),d=e(98),f=e(99),h=e(100),m=e(120),v=e(133),g=e(139),y=(e(150),r.topLevelTypes),C={blur:{phasedRegistrationNames:{bubbled:g({onBlur:!0}),captured:g({onBlurCapture:!0})}},click:{phasedRegistrationNames:{bubbled:g({onClick:!0}),captured:g({onClickCapture:!0})}},contextMenu:{phasedRegistrationNames:{bubbled:g({onContextMenu:!0}),captured:g({onContextMenuCapture:!0})}},copy:{phasedRegistrationNames:{bubbled:g({onCopy:!0}),captured:g({onCopyCapture:!0})}},cut:{phasedRegistrationNames:{bubbled:g({onCut:!0}),captured:g({onCutCapture:!0})}},doubleClick:{phasedRegistrationNames:{bubbled:g({onDoubleClick:!0}),captured:g({onDoubleClickCapture:!0})}},drag:{phasedRegistrationNames:{bubbled:g({onDrag:!0}),captured:g({onDragCapture:!0})}},dragEnd:{phasedRegistrationNames:{bubbled:g({onDragEnd:!0}),captured:g({onDragEndCapture:!0})}},dragEnter:{phasedRegistrationNames:{bubbled:g({onDragEnter:!0}),captured:g({onDragEnterCapture:!0})}},dragExit:{phasedRegistrationNames:{bubbled:g({onDragExit:!0}),captured:g({onDragExitCapture:!0})}},dragLeave:{phasedRegistrationNames:{bubbled:g({onDragLeave:!0}),captured:g({onDragLeaveCapture:!0})}},dragOver:{phasedRegistrationNames:{bubbled:g({onDragOver:!0}),captured:g({onDragOverCapture:!0})}},dragStart:{phasedRegistrationNames:{bubbled:g({onDragStart:!0}),captured:g({onDragStartCapture:!0})}},drop:{phasedRegistrationNames:{bubbled:g({onDrop:!0}),captured:g({onDropCapture:!0})}},focus:{phasedRegistrationNames:{bubbled:g({onFocus:!0}),captured:g({onFocusCapture:!0})}},input:{phasedRegistrationNames:{bubbled:g({onInput:!0}),captured:g({onInputCapture:!0})}},keyDown:{phasedRegistrationNames:{bubbled:g({onKeyDown:!0}),captured:g({onKeyDownCapture:!0})}},keyPress:{phasedRegistrationNames:{bubbled:g({onKeyPress:!0}),captured:g({onKeyPressCapture:!0})}},keyUp:{phasedRegistrationNames:{bubbled:g({onKeyUp:!0}),captured:g({onKeyUpCapture:!0})}},load:{phasedRegistrationNames:{bubbled:g({onLoad:!0}),captured:g({onLoadCapture:!0})}},error:{phasedRegistrationNames:{bubbled:g({onError:!0}),captured:g({onErrorCapture:!0})}},mouseDown:{phasedRegistrationNames:{bubbled:g({onMouseDown:!0}),captured:g({onMouseDownCapture:!0})}},mouseMove:{phasedRegistrationNames:{bubbled:g({onMouseMove:!0}),captured:g({onMouseMoveCapture:!0})}},mouseOut:{phasedRegistrationNames:{bubbled:g({onMouseOut:!0}),captured:g({onMouseOutCapture:!0})}},mouseOver:{phasedRegistrationNames:{bubbled:g({onMouseOver:!0}),captured:g({onMouseOverCapture:!0})}},mouseUp:{phasedRegistrationNames:{bubbled:g({onMouseUp:!0}),captured:g({onMouseUpCapture:!0})}},paste:{phasedRegistrationNames:{bubbled:g({onPaste:!0}),captured:g({onPasteCapture:!0})}},reset:{phasedRegistrationNames:{bubbled:g({onReset:!0}),captured:g({onResetCapture:!0})}},scroll:{phasedRegistrationNames:{bubbled:g({onScroll:!0}),captured:g({onScrollCapture:!0})}},submit:{phasedRegistrationNames:{bubbled:g({onSubmit:!0}),captured:g({onSubmitCapture:!0})}},touchCancel:{phasedRegistrationNames:{bubbled:g({onTouchCancel:!0}),captured:g({onTouchCancelCapture:!0})}},touchEnd:{phasedRegistrationNames:{bubbled:g({onTouchEnd:!0}),captured:g({onTouchEndCapture:!0})}},touchMove:{phasedRegistrationNames:{bubbled:g({onTouchMove:!0}),captured:g({onTouchMoveCapture:!0})}},touchStart:{phasedRegistrationNames:{bubbled:g({onTouchStart:!0}),captured:g({onTouchStartCapture:!0})}},wheel:{phasedRegistrationNames:{bubbled:g({onWheel:!0}),captured:g({onWheelCapture:!0})}}},E={topBlur:C.blur,topClick:C.click,topContextMenu:C.contextMenu,topCopy:C.copy,topCut:C.cut,topDoubleClick:C.doubleClick,topDrag:C.drag,topDragEnd:C.dragEnd,topDragEnter:C.dragEnter,topDragExit:C.dragExit,topDragLeave:C.dragLeave,topDragOver:C.dragOver,topDragStart:C.dragStart,topDrop:C.drop,topError:C.error,topFocus:C.focus,topInput:C.input,topKeyDown:C.keyDown,topKeyPress:C.keyPress,topKeyUp:C.keyUp,topLoad:C.load,topMouseDown:C.mouseDown,topMouseMove:C.mouseMove,topMouseOut:C.mouseOut,topMouseOver:C.mouseOver,topMouseUp:C.mouseUp,topPaste:C.paste,topReset:C.reset,topScroll:C.scroll,topSubmit:C.submit,topTouchCancel:C.touchCancel,topTouchEnd:C.touchEnd,topTouchMove:C.touchMove,topTouchStart:C.touchStart,topWheel:C.wheel};for(var b in E)E[b].dependencies=[b];var _={eventTypes:C,executeDispatch:function(e,t,n){var r=o.executeDispatch(e,t,n);r===!1&&(e.stopPropagation(),e.preventDefault())},extractEvents:function(e,t,n,r){var o=E[e];if(!o)return null;var g;switch(e){case y.topInput:case y.topLoad:case y.topError:case y.topReset:case y.topSubmit:g=u;break;case y.topKeyPress:if(0===m(r))return null;case y.topKeyDown:case y.topKeyUp:g=l;break;case y.topBlur:case y.topFocus:g=s;break;case y.topClick:if(2===r.button)return null;case y.topContextMenu:case y.topDoubleClick:case y.topMouseDown:case y.topMouseMove:case y.topMouseOut:case y.topMouseOver:case y.topMouseUp:g=c;break;case y.topDrag:case y.topDragEnd:case y.topDragEnter:case y.topDragExit:case y.topDragLeave:case y.topDragOver:case y.topDragStart:case y.topDrop:g=p;break;case y.topTouchCancel:case y.topTouchEnd:case y.topTouchMove:case y.topTouchStart:g=d;break;case y.topScroll:g=f;break;case y.topWheel:g=h;break;case y.topCopy:case y.topCut:case y.topPaste:g=a}v(g);var C=g.getPooled(o,n,r);return i.accumulateTwoPhaseDispatches(C),C}};t.exports=_},{100:100,120:120,133:133,139:139,15:15,150:150,19:19,20:20,90:90,92:92,93:93,94:94,96:96,97:97,98:98,99:99}],90:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}};o.augmentClass(r,i),t.exports=r},{93:93}],91:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={data:null};o.augmentClass(r,i),t.exports=r},{93:93}],92:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(97),i={dataTransfer:null};o.augmentClass(r,i),t.exports=r},{97:97}],93:[function(e,t,n){"use strict";function r(e,t,n){this.dispatchConfig=e,this.dispatchMarker=t,this.nativeEvent=n;var r=this.constructor.Interface;for(var o in r)if(r.hasOwnProperty(o)){var i=r[o];i?this[o]=i(n):this[o]=n[o]}var u=null!=n.defaultPrevented?n.defaultPrevented:n.returnValue===!1;u?this.isDefaultPrevented=a.thatReturnsTrue:this.isDefaultPrevented=a.thatReturnsFalse,this.isPropagationStopped=a.thatReturnsFalse}var o=e(28),i=e(27),a=e(112),u=e(123),s={type:null,target:u,currentTarget:a.thatReturnsNull,eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null};i(r.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e.preventDefault?e.preventDefault():e.returnValue=!1,this.isDefaultPrevented=a.thatReturnsTrue},stopPropagation:function(){var e=this.nativeEvent;e.stopPropagation?e.stopPropagation():e.cancelBubble=!0,this.isPropagationStopped=a.thatReturnsTrue},persist:function(){this.isPersistent=a.thatReturnsTrue},isPersistent:a.thatReturnsFalse,destructor:function(){var e=this.constructor.Interface;for(var t in e)this[t]=null;this.dispatchConfig=null,this.dispatchMarker=null,this.nativeEvent=null}}),r.Interface=s,r.augmentClass=function(e,t){var n=this,r=Object.create(n.prototype);i(r,e.prototype),e.prototype=r,e.prototype.constructor=e,e.Interface=i({},n.Interface,t),e.augmentClass=n.augmentClass,o.addPoolingTo(e,o.threeArgumentPooler)},o.addPoolingTo(r,o.threeArgumentPooler),t.exports=r},{112:112,123:123,27:27,28:28}],94:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i={relatedTarget:null};o.augmentClass(r,i),t.exports=r},{99:99}],95:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i={data:null};o.augmentClass(r,i),t.exports=r},{93:93}],96:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(120),a=e(121),u=e(122),s={key:a,location:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,repeat:null,locale:null,getModifierState:u,charCode:function(e){return"keypress"===e.type?i(e):0},keyCode:function(e){return"keydown"===e.type||"keyup"===e.type?e.keyCode:0},which:function(e){return"keypress"===e.type?i(e):"keydown"===e.type||"keyup"===e.type?e.keyCode:0}};o.augmentClass(r,s),t.exports=r},{120:120,121:121,122:122,99:99}],97:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(102),a=e(122),u={screenX:null,screenY:null,clientX:null,clientY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:a,button:function(e){var t=e.button;return"which"in e?t:2===t?2:4===t?1:0},buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},pageX:function(e){return"pageX"in e?e.pageX:e.clientX+i.currentScrollLeft},pageY:function(e){return"pageY"in e?e.pageY:e.clientY+i.currentScrollTop}};o.augmentClass(r,u),t.exports=r},{102:102,122:122,99:99}],98:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(99),i=e(122),a={touches:null,targetTouches:null,changedTouches:null,altKey:null,metaKey:null,ctrlKey:null,shiftKey:null,getModifierState:i};o.augmentClass(r,a),t.exports=r},{122:122,99:99}],99:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(93),i=e(123),a={view:function(e){if(e.view)return e.view;var t=i(e);if(null!=t&&t.window===t)return t;var n=t.ownerDocument;return n?n.defaultView||n.parentWindow:window},detail:function(e){return e.detail||0}};o.augmentClass(r,a),t.exports=r},{123:123,93:93}],100:[function(e,t,n){"use strict";function r(e,t,n){o.call(this,e,t,n)}var o=e(97),i={deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:null,deltaMode:null};o.augmentClass(r,i),t.exports=r},{97:97}],101:[function(e,t,n){"use strict";var r=e(133),o={reinitializeTransaction:function(){this.transactionWrappers=this.getTransactionWrappers(),this.wrapperInitData?this.wrapperInitData.length=0:this.wrapperInitData=[],this._isInTransaction=!1},_isInTransaction:!1,getTransactionWrappers:null,isInTransaction:function(){return!!this._isInTransaction},perform:function(e,t,n,o,i,a,u,s){r(!this.isInTransaction());var l,c;try{this._isInTransaction=!0,l=!0,this.initializeAll(0),c=e.call(t,n,o,i,a,u,s),l=!1}finally{try{if(l)try{this.closeAll(0)}catch(p){}else this.closeAll(0)}finally{this._isInTransaction=!1}}return c},initializeAll:function(e){for(var t=this.transactionWrappers,n=e;n<t.length;n++){var r=t[n];try{this.wrapperInitData[n]=i.OBSERVED_ERROR,this.wrapperInitData[n]=r.initialize?r.initialize.call(this):null}finally{if(this.wrapperInitData[n]===i.OBSERVED_ERROR)try{this.initializeAll(n+1)}catch(o){}}}},closeAll:function(e){r(this.isInTransaction());for(var t=this.transactionWrappers,n=e;n<t.length;n++){var o,a=t[n],u=this.wrapperInitData[n];try{o=!0,u!==i.OBSERVED_ERROR&&a.close&&a.close.call(this,u),o=!1}finally{if(o)try{this.closeAll(n+1)}catch(s){}}}this.wrapperInitData.length=0}},i={Mixin:o,OBSERVED_ERROR:{}};t.exports=i},{133:133}],102:[function(e,t,n){"use strict";var r={currentScrollLeft:0,currentScrollTop:0,refreshScrollValues:function(e){r.currentScrollLeft=e.x,r.currentScrollTop=e.y}};t.exports=r},{}],103:[function(e,t,n){"use strict";function r(e,t){if(o(null!=t),null==e)return t;var n=Array.isArray(e),r=Array.isArray(t);return n&&r?(e.push.apply(e,t),e):n?(e.push(t),e):r?[e].concat(t):[e,t]}var o=e(133);t.exports=r},{133:133}],104:[function(e,t,n){"use strict";function r(e){for(var t=1,n=0,r=0;r<e.length;r++)t=(t+e.charCodeAt(r))%o,n=(n+t)%o;return t|n<<16}var o=65521;t.exports=r},{}],105:[function(e,t,n){function r(e){return e.replace(o,function(e,t){return t.toUpperCase()})}var o=/-(.)/g;t.exports=r},{}],106:[function(e,t,n){"use strict";function r(e){return o(e.replace(i,"ms-"))}var o=e(105),i=/^-ms-/;t.exports=r},{105:105}],107:[function(e,t,n){function r(e,t){return e&&t?e===t?!0:o(e)?!1:o(t)?r(e,t.parentNode):e.contains?e.contains(t):e.compareDocumentPosition?!!(16&e.compareDocumentPosition(t)):!1:!1}var o=e(137);t.exports=r},{137:137}],108:[function(e,t,n){function r(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"length"in e&&!("setInterval"in e)&&"number"!=typeof e.nodeType&&(Array.isArray(e)||"callee"in e||"item"in e)}function o(e){return r(e)?Array.isArray(e)?e.slice():i(e):[e]}var i=e(148);t.exports=o},{148:148}],109:[function(e,t,n){"use strict";function r(e){var t=i.createFactory(e),n=o.createClass({tagName:e.toUpperCase(),displayName:"ReactFullPageComponent"+e,componentWillUnmount:function(){a(!1)},render:function(){return t(this.props)}});return n}var o=e(33),i=e(55),a=e(133);t.exports=r},{133:133,33:33,55:55}],110:[function(e,t,n){function r(e){var t=e.match(c);return t&&t[1].toLowerCase()}function o(e,t){var n=l;s(!!l);var o=r(e),i=o&&u(o);if(i){n.innerHTML=i[1]+e+i[2];for(var c=i[0];c--;)n=n.lastChild}else n.innerHTML=e;var p=n.getElementsByTagName("script");p.length&&(s(t),a(p).forEach(t));for(var d=a(n.childNodes);n.lastChild;)n.removeChild(n.lastChild);return d}var i=e(21),a=e(108),u=e(125),s=e(133),l=i.canUseDOM?document.createElement("div"):null,c=/^\s*<(\w+)/;t.exports=o},{108:108,125:125,133:133,21:21}],111:[function(e,t,n){"use strict";function r(e,t){var n=null==t||"boolean"==typeof t||""===t;if(n)return"";var r=isNaN(t);return r||0===t||i.hasOwnProperty(e)&&i[e]?""+t:("string"==typeof t&&(t=t.trim()),t+"px")}var o=e(4),i=o.isUnitlessNumber;t.exports=r},{4:4}],112:[function(e,t,n){function r(e){return function(){return e}}function o(){}o.thatReturns=r,o.thatReturnsFalse=r(!1),o.thatReturnsTrue=r(!0),o.thatReturnsNull=r(null),o.thatReturnsThis=function(){return this},o.thatReturnsArgument=function(e){return e},t.exports=o},{}],113:[function(e,t,n){"use strict";var r={};t.exports=r},{}],114:[function(e,t,n){"use strict";function r(e){return i[e]}function o(e){return(""+e).replace(a,r)}var i={"&":"&amp;",">":"&gt;","<":"&lt;",'"':"&quot;","'":"&#x27;"},a=/[&><"']/g;t.exports=o},{}],115:[function(e,t,n){"use strict";function r(e){return null==e?null:u(e)?e:o.has(e)?i.getNodeFromInstance(e):(a(null==e.render||"function"!=typeof e.render),void a(!1))}{var o=(e(39),e(65)),i=e(68),a=e(133),u=e(135);e(150)}t.exports=r},{133:133,135:135,150:150,39:39,65:65,68:68}],116:[function(e,t,n){"use strict";function r(e,t,n){var r=e,o=!r.hasOwnProperty(n);o&&null!=t&&(r[n]=t)}function o(e){if(null==e)return e;var t={};return i(e,r,t),t}{var i=e(149);e(150)}t.exports=o},{149:149,150:150}],117:[function(e,t,n){"use strict";function r(e){try{e.focus()}catch(t){}}t.exports=r},{}],118:[function(e,t,n){"use strict";var r=function(e,t,n){Array.isArray(e)?e.forEach(t,n):e&&t.call(n,e)};t.exports=r},{}],119:[function(e,t,n){function r(){try{return document.activeElement||document.body}catch(e){return document.body}}t.exports=r},{}],120:[function(e,t,n){"use strict";function r(e){var t,n=e.keyCode;return"charCode"in e?(t=e.charCode,0===t&&13===n&&(t=13)):t=n,t>=32||13===t?t:0}t.exports=r},{}],121:[function(e,t,n){"use strict";function r(e){if(e.key){var t=i[e.key]||e.key;if("Unidentified"!==t)return t}if("keypress"===e.type){var n=o(e);return 13===n?"Enter":String.fromCharCode(n)}return"keydown"===e.type||"keyup"===e.type?a[e.keyCode]||"Unidentified":""}var o=e(120),i={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},a={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"};t.exports=r},{120:120}],122:[function(e,t,n){"use strict";function r(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=i[e];return r?!!n[r]:!1}function o(e){return r}var i={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};t.exports=o},{}],123:[function(e,t,n){"use strict";function r(e){var t=e.target||e.srcElement||window;return 3===t.nodeType?t.parentNode:t}t.exports=r},{}],124:[function(e,t,n){"use strict";function r(e){var t=e&&(o&&e[o]||e[i]);return"function"==typeof t?t:void 0}var o="function"==typeof Symbol&&Symbol.iterator,i="@@iterator";t.exports=r},{}],125:[function(e,t,n){function r(e){return i(!!a),d.hasOwnProperty(e)||(e="*"),u.hasOwnProperty(e)||("*"===e?a.innerHTML="<link />":a.innerHTML="<"+e+"></"+e+">",u[e]=!a.firstChild),u[e]?d[e]:null}var o=e(21),i=e(133),a=o.canUseDOM?document.createElement("div"):null,u={circle:!0,defs:!0,ellipse:!0,g:!0,line:!0,linearGradient:!0,path:!0,polygon:!0,polyline:!0,radialGradient:!0,rect:!0,stop:!0,text:!0},s=[1,'<select multiple="true">',"</select>"],l=[1,"<table>","</table>"],c=[3,"<table><tbody><tr>","</tr></tbody></table>"],p=[1,"<svg>","</svg>"],d={"*":[1,"?<div>","</div>"],area:[1,"<map>","</map>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],legend:[1,"<fieldset>","</fieldset>"],param:[1,"<object>","</object>"],tr:[2,"<table><tbody>","</tbody></table>"],optgroup:s,option:s,caption:l,colgroup:l,tbody:l,tfoot:l,thead:l,td:c,th:c,circle:p,defs:p,ellipse:p,g:p,line:p,linearGradient:p,path:p,polygon:p,polyline:p,radialGradient:p,rect:p,stop:p,text:p};t.exports=r},{133:133,21:21}],126:[function(e,t,n){"use strict";function r(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function o(e){for(;e;){if(e.nextSibling)return e.nextSibling;e=e.parentNode}}function i(e,t){for(var n=r(e),i=0,a=0;n;){if(3===n.nodeType){if(a=i+n.textContent.length,t>=i&&a>=t)return{node:n,offset:t-i};i=a}n=r(o(n))}}t.exports=i},{}],127:[function(e,t,n){"use strict";function r(e){return e?e.nodeType===o?e.documentElement:e.firstChild:null}var o=9;t.exports=r},{}],128:[function(e,t,n){"use strict";function r(){return!i&&o.canUseDOM&&(i="textContent"in document.documentElement?"textContent":"innerText"),i}var o=e(21),i=null;t.exports=r},{21:21}],129:[function(e,t,n){"use strict";function r(e){return e===window?{x:window.pageXOffset||document.documentElement.scrollLeft,y:window.pageYOffset||document.documentElement.scrollTop}:{x:e.scrollLeft,y:e.scrollTop}}t.exports=r},{}],130:[function(e,t,n){function r(e){return e.replace(o,"-$1").toLowerCase()}var o=/([A-Z])/g;t.exports=r},{}],131:[function(e,t,n){"use strict";function r(e){return o(e).replace(i,"-ms-")}var o=e(130),i=/^ms-/;t.exports=r},{130:130}],132:[function(e,t,n){"use strict";function r(e){return"function"==typeof e&&"undefined"!=typeof e.prototype&&"function"==typeof e.prototype.mountComponent&&"function"==typeof e.prototype.receiveComponent}function o(e,t){var n;if((null===e||e===!1)&&(e=a.emptyElement),"object"==typeof e){var o=e;n=t===o.type&&"string"==typeof o.type?u.createInternalComponent(o):r(o.type)?new o.type(o):new c}else"string"==typeof e||"number"==typeof e?n=u.createInstanceForText(e):l(!1);return n.construct(e),n._mountIndex=0,n._mountImage=null,n}var i=e(37),a=e(57),u=e(71),s=e(27),l=e(133),c=(e(150),function(){});s(c.prototype,i.Mixin,{_instantiateReactComponent:o}),t.exports=o},{133:133,150:150,27:27,37:37,57:57,71:71}],133:[function(e,t,n){"use strict";var r=function(e,t,n,r,o,i,a,u){if(!e){var s;if(void 0===t)s=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var l=[n,r,o,i,a,u],c=0;s=new Error("Invariant Violation: "+t.replace(/%s/g,function(){return l[c++]}))}throw s.framesToPop=1,s}};t.exports=r},{}],134:[function(e,t,n){"use strict";function r(e,t){if(!i.canUseDOM||t&&!("addEventListener"in document))return!1;var n="on"+e,r=n in document;if(!r){var a=document.createElement("div");a.setAttribute(n,"return;"),r="function"==typeof a[n]}return!r&&o&&"wheel"===e&&(r=document.implementation.hasFeature("Events.wheel","3.0")),r}var o,i=e(21);i.canUseDOM&&(o=document.implementation&&document.implementation.hasFeature&&document.implementation.hasFeature("","")!==!0),t.exports=r},{21:21}],135:[function(e,t,n){function r(e){return!(!e||!("function"==typeof Node?e instanceof Node:"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName))}t.exports=r},{}],136:[function(e,t,n){"use strict";function r(e){return e&&("INPUT"===e.nodeName&&o[e.type]||"TEXTAREA"===e.nodeName)}var o={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};t.exports=r},{}],137:[function(e,t,n){function r(e){return o(e)&&3==e.nodeType}var o=e(135);t.exports=r},{135:135}],138:[function(e,t,n){"use strict";var r=e(133),o=function(e){var t,n={};r(e instanceof Object&&!Array.isArray(e));for(t in e)e.hasOwnProperty(t)&&(n[t]=t);return n};t.exports=o},{133:133}],139:[function(e,t,n){var r=function(e){var t;for(t in e)if(e.hasOwnProperty(t))return t;return null};t.exports=r},{}],140:[function(e,t,n){"use strict";function r(e,t,n){if(!e)return null;var r={};for(var i in e)o.call(e,i)&&(r[i]=t.call(n,e[i],i,e));return r}var o=Object.prototype.hasOwnProperty;t.exports=r},{}],141:[function(e,t,n){"use strict";function r(e){var t={};return function(n){return t.hasOwnProperty(n)||(t[n]=e.call(this,n)),t[n]}}t.exports=r},{}],142:[function(e,t,n){"use strict";function r(e){return i(o.isValidElement(e)),e}var o=e(55),i=e(133);t.exports=r},{133:133,55:55}],143:[function(e,t,n){"use strict";function r(e){return'"'+o(e)+'"'}var o=e(114);t.exports=r},{114:114}],144:[function(e,t,n){"use strict";var r=e(21),o=/^[ \r\n\t\f]/,i=/<(!--|link|noscript|meta|script|style)[ \r\n\t\f\/>]/,a=function(e,t){e.innerHTML=t};if("undefined"!=typeof MSApp&&MSApp.execUnsafeLocalFunction&&(a=function(e,t){MSApp.execUnsafeLocalFunction(function(){e.innerHTML=t})}),r.canUseDOM){var u=document.createElement("div");u.innerHTML=" ",""===u.innerHTML&&(a=function(e,t){if(e.parentNode&&e.parentNode.replaceChild(e,e),o.test(t)||"<"===t[0]&&i.test(t)){e.innerHTML="\ufeff"+t;var n=e.firstChild;1===n.data.length?e.removeChild(n):n.deleteData(0,1)}else e.innerHTML=t})}t.exports=a},{21:21}],145:[function(e,t,n){"use strict";var r=e(21),o=e(114),i=e(144),a=function(e,t){e.textContent=t};r.canUseDOM&&("textContent"in document.documentElement||(a=function(e,t){i(e,o(t))})),t.exports=a},{114:114,144:144,21:21}],146:[function(e,t,n){"use strict";function r(e,t){if(e===t)return!0;var n;for(n in e)if(e.hasOwnProperty(n)&&(!t.hasOwnProperty(n)||e[n]!==t[n]))return!1;for(n in t)if(t.hasOwnProperty(n)&&!e.hasOwnProperty(n))return!1;return!0}t.exports=r},{}],147:[function(e,t,n){"use strict";function r(e,t){if(null!=e&&null!=t){var n=typeof e,r=typeof t;if("string"===n||"number"===n)return"string"===r||"number"===r;if("object"===r&&e.type===t.type&&e.key===t.key){var o=e._owner===t._owner;return o}}return!1}e(150);t.exports=r},{150:150}],148:[function(e,t,n){function r(e){var t=e.length;if(o(!Array.isArray(e)&&("object"==typeof e||"function"==typeof e)),o("number"==typeof t),o(0===t||t-1 in e),e.hasOwnProperty)try{return Array.prototype.slice.call(e)}catch(n){}for(var r=Array(t),i=0;t>i;i++)r[i]=e[i];return r}var o=e(133);t.exports=r},{133:133}],149:[function(e,t,n){"use strict";function r(e){return v[e]}function o(e,t){return e&&null!=e.key?a(e.key):t.toString(36)}function i(e){return(""+e).replace(g,r)}function a(e){return"$"+i(e)}function u(e,t,n,r,i){var s=typeof e;if(("undefined"===s||"boolean"===s)&&(e=null),null===e||"string"===s||"number"===s||l.isValidElement(e))return r(i,e,""===t?h+o(e,0):t,n),1;var p,v,g,y=0;if(Array.isArray(e))for(var C=0;C<e.length;C++)p=e[C],v=(""!==t?t+m:h)+o(p,C),g=n+y,y+=u(p,v,g,r,i);else{var E=d(e);if(E){var b,_=E.call(e);if(E!==e.entries)for(var x=0;!(b=_.next()).done;)p=b.value,v=(""!==t?t+m:h)+o(p,x++),g=n+y,y+=u(p,v,g,r,i);else for(;!(b=_.next()).done;){var D=b.value;D&&(p=D[1],v=(""!==t?t+m:h)+a(D[0])+m+o(p,0),g=n+y,y+=u(p,v,g,r,i))}}else if("object"===s){f(1!==e.nodeType);var M=c.extract(e);for(var N in M)M.hasOwnProperty(N)&&(p=M[N],v=(""!==t?t+m:h)+a(N)+m+o(p,0),g=n+y,y+=u(p,v,g,r,i))}}return y}function s(e,t,n){return null==e?0:u(e,"",0,t,n)}var l=e(55),c=e(61),p=e(64),d=e(124),f=e(133),h=(e(150),p.SEPARATOR),m=":",v={"=":"=0",".":"=1",":":"=2"},g=/[=.:]/g;t.exports=s},{124:124,133:133,150:150,55:55,61:61,64:64}],150:[function(e,t,n){"use strict";var r=e(112),o=r;t.exports=o},{112:112}]},{},[1])(1)});
\ No newline at end of file
diff --git a/ui/simpleajax.min.js b/ui/simpleajax.min.js
new file mode 100644
index 000000000..bd15dbdd4
--- /dev/null
+++ b/ui/simpleajax.min.js
@@ -0,0 +1,2 @@
+/** SimpleAjax v1.0.1 - MIT license - https://github.com/freelancephp/SimpleAjax */
+(function(window){var SimpleAjax=window.SimpleAjax={xhr:null,settings:{url:"",type:"GET",dataType:"text",async:true,cache:true,data:null,contentType:"application/x-www-form-urlencoded",success:null,error:null,complete:null,accepts:{text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"}},call:function(a){var b=this,c=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP"),d=function(a,b){var c={};for(var d in a)c[d]=typeof b[d]=="undefined"?a[d]:b[d];return c}(this.settings,a),e=function(){if(c.readyState==4){if(c.status>=200&&c.status<300||c.status===304){var a=d.dataType=="xml"?c.responseXML:c.responseText;if(d.dataType=="json")a=b.parseJSON(a);if(b.isFunction(d.success))d.success.call(d,a,c.status,c)}else{if(b.isFunction(d.error))d.error.call(d,c,c.status)}if(b.isFunction(d.complete))d.complete.call(d,c,c.status)}};this.xhr=c;if(!d.cache)d.url+=(d.url.indexOf("?")>-1?"&":"?")+"_nocache="+(new Date).getTime();if(d.data){if(d.type=="GET"){d.url+=(d.url.indexOf("?")>-1?"&":"?")+this.param(d.data);d.data=null}else{d.data=this.param(d.data)}}c.open(d.type,d.url,d.async);c.setRequestHeader("Content-type",d.contentType);if(d.dataType&&d.accepts[d.dataType])c.setRequestHeader("Accept",d.accepts[d.dataType]);if(d.async){c.onreadystatechange=e;c.send(d.data)}else{c.send(d.data);e()}return this},get:function(a,b,c){if(this.isFunction(b)){c=b;b=null}return this.call({url:a,type:"GET",data:b,success:c})},post:function(a,b,c){if(this.isFunction(b)){c=b;b=null}return this.call({url:a,type:"POST",data:b,success:c})},load:function(a,b,c,d){if(typeof a=="string")a=document.getElementById(a);return this.call({url:b,type:c?"POST":"GET",data:c||null,complete:d||null,success:function(b){try{a.innerHTML=b}catch(c){var d=document.createElement("div");d.innerHTML=b;while(a.firstChild)a.removeChild(a.firstChild);for(var e=0,f=d.childNodes.length;e<f;e++)a.appendChild(d.childNodes[e])}}})},param:function(a){var b=[];for(var c in a){b.push(encodeURIComponent(c)+"="+encodeURIComponent(a[c]))}return b.join("&")},parseJSON:function(data){if(typeof data!=="string"||!data)return null;return eval("("+this.trim(data)+")")},trim:function(a){return a.replace(/^\s+/,"").replace(/\s+$/,"")},isFunction:function(a){return Object.prototype.toString.call(a)==="[object Function]"}};if(!window.Ajax){window.Ajax=SimpleAjax}})(window)
\ No newline at end of file
diff --git a/ui/zerotier.css b/ui/zerotier.css
new file mode 100644
index 000000000..9f72024ac
--- /dev/null
+++ b/ui/zerotier.css
@@ -0,0 +1,199 @@
+/* Dark blue-grey: #234447
+ * Light blue-grey: #91a2a3
+ * Light yellow: #ffffcc
+ * Orange: #ffb354 */
+
+html,body {
+	font-family: "Helvetica Neue","Lucida Sans Unicode",sans-serif;
+	font-size: 12pt;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+}
+
+.zeroTierAddress {
+	font-family: monospace;
+}
+
+.zeroTierNode {
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	margin: 0;
+	display: table;
+}
+
+.zeroTierNode > .middle {
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	margin: 0;
+	overflow: hidden;
+	display: table-row;
+}
+.zeroTierNode > .middle > .middleCell {
+	width: 100%;
+	height: 100%;
+	display: table-cell;
+	border-bottom: 1px solid #cfcfcf;
+}
+.zeroTierNode > .middle > .middleCell > .middleScroll {
+	display: block;
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	margin: 0;
+	overflow: scroll;
+	overflow-x: hidden;
+	overflow-y: scroll;
+	background: #dddddd;
+}
+.zeroTierNode > .middle > .middleCell > .middleScroll > .networks {
+	display: block;
+	width: 100%;
+	padding: 0 0 0.25rem 0;
+	margin: 0;
+	border: 0;
+	text-align: left;
+	border-collapse: collapse;
+}
+.zeroTierNode > .middle > .middleCell > .middleScroll > .networks > .network {
+	display: block;
+	border-top: 0.12rem solid #dddddd;
+	border-bottom: 0.12rem solid #dddddd;
+	padding: 0.25rem;
+	background: #ffffff;
+}
+
+.zeroTierNode > .bottom {
+	font-size: 12pt;
+	width: 100%;
+	overflow: hidden;
+	display: table-row;
+	color: #000000;
+	background: #dfdfdf;
+}
+.zeroTierNode > .bottom > .left {
+	text-align: left;
+	white-space: nowrap;
+	float: left;
+	padding: 0 0 0 0.5rem;
+	font-size: 12pt;
+	height: 100%;
+}
+.zeroTierNode > .bottom > .left > .statusLine {
+	font-family: monospace;
+	white-space: nowrap;
+	font-size: 11pt;
+	height: 100%;
+}
+.zeroTierNode > .bottom > .right {
+	text-align: right;
+	height: 100%;
+	white-space: nowrap;
+	float: right;
+	font-size: 12pt;
+	background: #ffffff;
+}
+.zeroTierNode > .bottom > .right form {
+	height: 100%;
+}
+.zeroTierNode > .bottom > .right input {
+	font-family: monospace;
+	font-size: 12pt;
+	background: #ffffff;
+	color: #000000;
+	outline: none;
+	outline-style: none;
+	box-shadow: 0;
+	border: 0;
+	margin: 0;
+	padding: 0 0.25rem 0 0.25rem;
+	display: inline;
+	height: 100%;
+}
+.zeroTierNode > .bottom > .right button {
+	display: inline-block;
+	font-size: 12pt;
+	background: #ffb354;
+	border: 1px solid #ffb354;
+	color: #000000;
+	margin: 0;
+	padding: 0.05rem 0.75rem 0.05rem 0.75rem;
+	outline: none;
+	outline-style: none;
+	height: 100%;
+}
+.zeroTierNode > .bottom > .right button:hover {
+	cursor: pointer;
+	outline: none;
+	outline-style: none;
+	border: 1px solid #000000;
+}
+
+.zeroTierNetwork {
+	padding: 0;
+	margin: 0;
+	display: inline-block;
+	text-align: right;
+	width: 100%;
+	position: relative;
+}
+.zeroTierNetwork .networkInfo {
+	padding: 0 0 0.25rem 0;
+	text-align: left;
+	font-size: 12pt;
+}
+.zeroTierNetwork .networkInfo .networkId {
+	font-size: 11pt;
+	font-family: monospace;
+	color: #000000;
+}
+.zeroTierNetwork .networkInfo .networkName {
+	padding: 0 0 0 1rem;
+	float: right;
+	font-size: 12pt;
+}
+.zeroTierNetwork .networkProps {
+	width: 100%;
+	display: table;
+	padding: 0;
+	margin: 0 auto 0 auto;
+	border-top: 1px solid #999999;
+	border-bottom: 1px solid #999999;
+}
+.zeroTierNetwork .networkProps > .row {
+	display: table-row;
+}
+.zeroTierNetwork .networkProps > .row > .name {
+	display: table-cell;
+	font-size: 10pt;
+	padding: 0.1rem 0.5rem 0.1rem 0.5rem;
+}
+.zeroTierNetwork .networkProps > .row > .value {
+	font-size: 10pt;
+	display: table-cell;
+	padding: 0.1rem 0.5rem 0.1rem 0.5rem;
+	background: #eeeeee;
+}
+.zeroTierNetwork .ipList {
+}
+.zeroTierNetwork .ipAddress {
+	font-family: monospace;
+	font-size: 10pt;
+}
+.zeroTierNetwork .leaveNetworkButton {
+	padding: 0.25rem 0.5rem 0.25rem 0.5rem;
+	margin: 0.25rem 0 0 0;
+	font-size: 9pt;
+	background: #ffffff;
+	outline: none;
+	background: #ffb354;
+	border: 1px solid #ffb354;
+	cursor: pointer;
+}
+.zeroTierNetwork .leaveNetworkButton:hover {
+	border: 1px solid #000000;
+}
diff --git a/ui/ztui.min.js b/ui/ztui.min.js
new file mode 100644
index 000000000..17982839e
--- /dev/null
+++ b/ui/ztui.min.js
@@ -0,0 +1 @@
+var ZeroTierNetwork=React.createClass({displayName:"ZeroTierNetwork",getInitialState:function(){return{}},leaveNetwork:function(e){Ajax.call({url:"network/"+this.props.nwid+"?auth="+this.props.authToken,cache:!1,type:"DELETE",success:function(e){this.props.onNetworkDeleted&&this.props.onNetworkDeleted(this.props.nwid)}.bind(this),error:function(e){}.bind(this)}),e.preventDefault()},render:function(){return React.createElement("div",{className:"zeroTierNetwork"},React.createElement("div",{className:"networkInfo"},React.createElement("span",{className:"networkId"},this.props.nwid)," ",React.createElement("span",{className:"networkName"},this.props.name)),React.createElement("div",{className:"networkProps"},React.createElement("div",{className:"row"},React.createElement("div",{className:"name"},"Status"),React.createElement("div",{className:"value"},this.props.status)),React.createElement("div",{className:"row"},React.createElement("div",{className:"name"},"Type"),React.createElement("div",{className:"value"},this.props.type)),React.createElement("div",{className:"row"},React.createElement("div",{className:"name"},"MAC"),React.createElement("div",{className:"value zeroTierAddress"},this.props.mac)),React.createElement("div",{className:"row"},React.createElement("div",{className:"name"},"MTU"),React.createElement("div",{className:"value"},this.props.mtu)),React.createElement("div",{className:"row"},React.createElement("div",{className:"name"},"Broadcast"),React.createElement("div",{className:"value"},this.props.broadcastEnabled?"ENABLED":"DISABLED")),React.createElement("div",{className:"row"},React.createElement("div",{className:"name"},"Bridging"),React.createElement("div",{className:"value"},this.props.bridge?"ACTIVE":"DISABLED")),React.createElement("div",{className:"row"},React.createElement("div",{className:"name"},"Device"),React.createElement("div",{className:"value"},this.props.portDeviceName?this.props.portDeviceName:"(none)")),React.createElement("div",{className:"row"},React.createElement("div",{className:"name"},"Managed IPs"),React.createElement("div",{className:"value ipList"},this.props.assignedAddresses.map(function(e){return React.createElement("div",{key:e,className:"ipAddress"},e)})))),React.createElement("button",{type:"button",className:"leaveNetworkButton",onClick:this.leaveNetwork},"Leave Network"))}}); var ZeroTierNode=React.createClass({displayName:"ZeroTierNode",getInitialState:function(){return{address:"----------",online:!1,version:"_._._",_networks:[],_peers:[]}},ago:function(e){if(e>0){var t=Math.round((Date.now()-e)/1e3);return t>0?t:0}return 0},updatePeers:function(){Ajax.call({url:"peer?auth="+this.props.authToken,cache:!1,type:"GET",success:function(e){if(e){var t=JSON.parse(e);Array.isArray(t)&&this.setState({_peers:t})}}.bind(this),error:function(){}.bind(this)})},updateNetworks:function(){Ajax.call({url:"network?auth="+this.props.authToken,cache:!1,type:"GET",success:function(e){if(e){var t=JSON.parse(e);Array.isArray(t)&&this.setState({_networks:t})}}.bind(this),error:function(){}.bind(this)})},updateAll:function(){Ajax.call({url:"status?auth="+this.props.authToken,cache:!1,type:"GET",success:function(e){if(this.alertedToFailure=!1,e){var t=JSON.parse(e);this.setState(t),document.title="ZeroTier One ["+t.address+"]"}this.updateNetworks(),this.updatePeers()}.bind(this),error:function(){this.setState(this.getInitialState()),this.alertedToFailure||(this.alertedToFailure=!0,alert("Authorization token invalid or ZeroTier One service not running."))}.bind(this)})},joinNetwork:function(e){e.preventDefault(),this.networkToJoin&&16===this.networkToJoin.length?Ajax.call({url:"network/"+this.networkToJoin+"?auth="+this.props.authToken,cache:!1,type:"POST",success:function(e){this.networkToJoin="",this.networkInputElement&&(this.networkInputElement.value=""),this.updateNetworks()}.bind(this),error:function(){}.bind(this)}):alert("To join a network, enter its 16-digit network ID.")},handleNetworkIdEntry:function(e){this.networkInputElement=e.target;var t=this.networkInputElement.value;if(t){t=t.toLowerCase();for(var n="",a=0;a<t.length&&16>a;++a)"0123456789abcdef".indexOf(t.charAt(a))>=0&&(n+=t.charAt(a));this.networkToJoin=n,this.networkInputElement.value=n}else this.networkToJoin="",this.networkInputElement.value=""},handleNetworkDelete:function(e){for(var t=[],n=0;n<this.state._networks.length;++n)this.state._networks[n].nwid!==e&&t.push(this.state._networks[n]);this.setState({_networks:t})},componentDidMount:function(){this.updateAll(),this.updateIntervalId=setInterval(this.updateAll,2500)},componentWillUnmount:function(){clearInterval(this.updateIntervalId)},render:function(){return React.createElement("div",{className:"zeroTierNode"},React.createElement("div",{className:"middle"},React.createElement("div",{className:"middleCell"},React.createElement("div",{className:"middleScroll"},React.createElement("div",{className:"networks",key:"_networks"},this.state._networks.map(function(e){return e.authToken=this.props.authToken,e.onNetworkDeleted=this.handleNetworkDelete,React.createElement("div",{className:"network",key:e.nwid},React.createElement(ZeroTierNetwork,e))}.bind(this)))))),React.createElement("div",{className:"bottom"},React.createElement("div",{className:"left"},React.createElement("span",{className:"statusLine"},React.createElement("span",{className:"zeroTierAddress"},this.state.address),"  ",this.state.online?this.state.tcpFallbackActive?"TUNNELED":"ONLINE":"OFFLINE","  ",this.state.version)),React.createElement("div",{className:"right"},React.createElement("form",{onSubmit:this.joinNetwork},React.createElement("input",{type:"text",maxlength:"16",placeholder:"[ Network ID ]",onChange:this.handleNetworkIdEntry,size:"16"}),React.createElement("button",{type:"button",onClick:this.joinNetwork},"Join")))))}});
diff --git a/update_controllers.sh b/update_controllers.sh
deleted file mode 100755
index ad3f95a39..000000000
--- a/update_controllers.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ]
-then
-    echo "Usage: $0 <docker_tag> <k8s_namespace>"
-    echo "    k8s_namesapce is set to default if not specified"
-    exit 1
-fi
-
-if [ -z "$2" ]
-then
-    NAMESPACE=default
-else
-    NAMESPACE=$2
-fi
-
-TAG=$1
-
-CONTROLLERS=`kubectl get pods -o=name --namespace=${NAMESPACE} | grep controller | sed "s/^.\{4\}//" | cut -d '-' -f 2`
-
-for c in ${CONTROLLERS[@]}
-do
-    kubectl set image deployment --namespace=${NAMESPACE} controller-${c} ztcentral-controller=docker.zerotier.com/zerotier-central/ztcentral-controller:${TAG}
-    echo "Sleeping for 1 minute"
-    sleep 60
-done
diff --git a/version.h b/version.h
index 9c417f5b7..62045ed81 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,20 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #ifndef _ZT_VERSION_H
 #define _ZT_VERSION_H
@@ -22,32 +27,11 @@
 /**
  * Minor version
  */
-#define ZEROTIER_ONE_VERSION_MINOR 15
+#define ZEROTIER_ONE_VERSION_MINOR 1
 
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 2
-
-/**
- * Build version
- *
- * This starts at 0 for each major.minor.rev tuple and can be incremented
- * to force a minor update without an actual version number change. It's
- * not part of the actual release version number.
- */
-#define ZEROTIER_ONE_VERSION_BUILD 0
-
-#ifndef ZT_BUILD_ARCHITECTURE
-#define ZT_BUILD_ARCHITECTURE 0
-#endif
-#ifndef ZT_BUILD_PLATFORM
-#define ZT_BUILD_PLATFORM 0
-#endif
-
-#define _ZT_STR_HELPER(x)		 #x
-#define _ZT_STR(x)				 _ZT_STR_HELPER(x)
-#define ZEROTIER_ONE_VERSION_STR _ZT_STR(ZEROTIER_ONE_VERSION_MAJOR) "." _ZT_STR(ZEROTIER_ONE_VERSION_MINOR) "." _ZT_STR(ZEROTIER_ONE_VERSION_REVISION)
-#define ZEROTIER_ONE_NAME		 "zerotier-one"
+#define ZEROTIER_ONE_VERSION_REVISION 5
 
 #endif
diff --git a/windows-clean.bat b/windows-clean.bat
deleted file mode 100644
index 96bc563a5..000000000
--- a/windows-clean.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-DEL "ZeroTier One.msi"
-DEL zt1_update*.exe
-RMDIR /Q /S windows\Build
-RMDIR /Q /S windows\x64
-RMDIR /Q /S windows\ARM64
-RMDIR /Q /S windows\Release
-RMDIR /Q /S windows\copyutil\bin
-RMDIR /Q /S windows\copyutil\obj
-RMDIR /Q /S windows\ZeroTierOne\Release
-RMDIR /Q /S windows\ZeroTierOne\x64
-RMDIR /Q /S zeroidc\x64
-RMDIR /Q /S zeroidc\target
diff --git a/windows/README.md b/windows/README.md
index 16bfde0d1..9f3f48bb6 100644
--- a/windows/README.md
+++ b/windows/README.md
@@ -1,29 +1,3 @@
 This folder contains the Windows driver code, Windows-specific service code, and the Microsoft Visual Studio projects and "solution" for doing Windows builds.
 
 This code may also build with MinGW but this hasn't been tested.
-
-## Building
-
-```
-MSBuild ZeroTierOne.sln /property:Configuration=Release /property:Platform=ARM64
-```
-
-(substitute e.g. `Debug`, `x64`, etc. as needed above, or use Visual Studio to select a target)
-
-## Testing
-
-PowerShell admin session #1 inside `<PROJECT_DIR>\windows\Build\<ARCH>\<TARGET>`:
-
-```
-PS C:\Users\<USER>\ZeroTierOne\windows\Build\ARM64\Release> .\zerotier-one_arm64.exe -p9994 -C C:\<SOME_TEMP_DIR>\
-Starting Control Plane...
-Starting V6 Control Plane...                                             
-```
-
-Session #2:
-```
-PS C:\Users\<USER>\ZeroTierOne\windows\Build\ARM64\Release> zerotier-cli.bat -p9994 -D"\Users\rcode\scratch\zt1_home\" info
-info c3e46fa070 1.12.2 ONLINE
-PS C:\Users\<USER>\code\ZeroTierOne\windows\Build\ARM64\Release> zerotier-cli.bat -p9994 -D"\Users\<SOME_TEMP_DIR>\scratch\zt1_home\" join ebe7fbd4458bde97
-200 join OK                                                                                                             PS C:\Users\<USER>\code\ZeroTierOne\windows\Build\ARM64\Release>   
-```
diff --git a/windows/TapDriver6/TapDriver6.vcxproj b/windows/TapDriver6/TapDriver6.vcxproj
index 75e25f241..b1f9ae189 100644
--- a/windows/TapDriver6/TapDriver6.vcxproj
+++ b/windows/TapDriver6/TapDriver6.vcxproj
@@ -1,253 +1,375 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Win8 Debug|ARM64">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|Win32">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|ARM64">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|Win32">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|x64">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|x64">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}</ProjectGuid>
-    <TemplateGuid>{1bc93793-694f-48fe-9372-81e2b05556fd}</TemplateGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <Configuration>Win8 Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-  </PropertyGroup>
-  <PropertyGroup Label="Globals">
-    <RootNamespace>TapDriver6</RootNamespace>
-    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VisualStudioVersion)' == '11.0'">$(VCTargetsPath11)</VCTargetsPath>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>KMDF</DriverType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <Driver_SpectreMitigation>false</Driver_SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <Driver_SpectreMitigation>false</Driver_SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
-    <Driver_SpectreMitigation>false</Driver_SpectreMitigation>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
-    <TargetName>zttap300</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
-    <TargetName>zttap300</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
-    <TargetName>zttap300</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">
-    <TargetName>zttap300</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
-    <TargetName>zttap300</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">
-    <TargetName>zttap300</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WppEnabled>false</WppEnabled>
-      <WppScanConfigurationData Condition="'%(ClCompile. ScanConfigurationData)'  == ''">trace.h</WppScanConfigurationData>
-      <WppKernelMode>false</WppKernelMode>
-      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</WppMinimalRebuildFromTracking>
-      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</WppMinimalRebuildFromTracking>
-      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</WppMinimalRebuildFromTracking>
-      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">false</WppMinimalRebuildFromTracking>
-      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</WppMinimalRebuildFromTracking>
-      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">false</WppMinimalRebuildFromTracking>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">Level1</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">Level1</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">Level1</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">Level1</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">Level1</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">Level1</WarningLevel>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">Default</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">Default</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">Default</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">Default</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">Default</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">Default</CompileAs>
-      <BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</BufferSecurityCheck>
-      <BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">false</BufferSecurityCheck>
-      <ControlFlowGuard Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</ControlFlowGuard>
-      <ControlFlowGuard Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">false</ControlFlowGuard>
-      <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</FunctionLevelLinking>
-      <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">false</FunctionLevelLinking>
-      <BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</BufferSecurityCheck>
-      <ControlFlowGuard Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</ControlFlowGuard>
-      <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</FunctionLevelLinking>
-    </ClCompile>
-    <Link />
-    <Link>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">C:\WinDDK\7600.16385.1\lib\win7\amd64\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">C:\WinDDK\7600.16385.1\lib\win7\amd64\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link />
-    <Link />
-    <Link />
-    <Link>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x64\ndis.lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x64\ntstrsafe.lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x64\ndis.lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x64\ntstrsafe.lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link />
-    <Link>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">C:\WinDDK\7600.16385.1\lib\win7\i386\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link />
-    <Link />
-    <Link />
-    <Link>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x86\ndis.lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x86\ntstrsafe.lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\km\x86\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Inf />
-    <Inf>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">3.00.00.0</TimeStamp>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</SpecifyDriverVerDirectiveVersion>
-      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</SpecifyDriverVerDirectiveDate>
-    </Inf>
-    <Inf />
-    <Inf />
-    <Inf />
-    <Inf>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">3.00.00.0</TimeStamp>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</SpecifyDriverVerDirectiveVersion>
-      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</SpecifyDriverVerDirectiveDate>
-    </Inf>
-    <Inf />
-    <Inf>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">3.00.00.0</TimeStamp>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">3.00.00.0</TimeStamp>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</SpecifyDriverVerDirectiveVersion>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">false</SpecifyDriverVerDirectiveVersion>
-      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</SpecifyDriverVerDirectiveDate>
-      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">false</SpecifyDriverVerDirectiveDate>
-    </Inf>
-    <Inf />
-    <Inf />
-    <Inf />
-    <Inf>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">3.00.00.0</TimeStamp>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">3.00.00.0</TimeStamp>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</SpecifyDriverVerDirectiveVersion>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">false</SpecifyDriverVerDirectiveVersion>
-      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</SpecifyDriverVerDirectiveDate>
-      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">false</SpecifyDriverVerDirectiveDate>
-    </Inf>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(TargetPath)" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="adapter.c" />
-    <ClCompile Include="device.c" />
-    <ClCompile Include="error.c" />
-    <ClCompile Include="macinfo.c" />
-    <ClCompile Include="mem.c" />
-    <ClCompile Include="oidrequest.c" />
-    <ClCompile Include="rxpath.c" />
-    <ClCompile Include="tapdrvr.c" />
-    <ClCompile Include="txpath.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="adapter.h" />
-    <ClInclude Include="config.h" />
-    <ClInclude Include="constants.h" />
-    <ClInclude Include="device.h" />
-    <ClInclude Include="endian.h" />
-    <ClInclude Include="error.h" />
-    <ClInclude Include="hexdump.h" />
-    <ClInclude Include="lock.h" />
-    <ClInclude Include="macinfo.h" />
-    <ClInclude Include="mem.h" />
-    <ClInclude Include="proto.h" />
-    <ClInclude Include="prototypes.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="tap-windows.h" />
-    <ClInclude Include="tap.h" />
-    <ClInclude Include="types.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Inf Include="zttap300.inf">
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</SpecifyDriverVerDirectiveVersion>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">3.00.00.0</TimeStamp>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</SpecifyDriverVerDirectiveVersion>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">3.00.00.0</TimeStamp>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</SpecifyDriverVerDirectiveVersion>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">false</SpecifyDriverVerDirectiveVersion>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">3.00.00.0</TimeStamp>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|ARM64'">3.00.00.0</TimeStamp>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</SpecifyDriverVerDirectiveVersion>
-      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">false</SpecifyDriverVerDirectiveVersion>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">3.00.00.0</TimeStamp>
-      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|ARM64'">3.00.00.0</TimeStamp>
-    </Inf>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Win8 Debug|Win32">
+      <Configuration>Win8 Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win8 Release|Win32">
+      <Configuration>Win8 Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win7 Debug|Win32">
+      <Configuration>Win7 Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win7 Release|Win32">
+      <Configuration>Win7 Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Vista Debug|Win32">
+      <Configuration>Vista Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Vista Release|Win32">
+      <Configuration>Vista Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win8 Debug|x64">
+      <Configuration>Win8 Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win8 Release|x64">
+      <Configuration>Win8 Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win7 Debug|x64">
+      <Configuration>Win7 Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win7 Release|x64">
+      <Configuration>Win7 Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Vista Debug|x64">
+      <Configuration>Vista Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Vista Release|x64">
+      <Configuration>Vista Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}</ProjectGuid>
+    <TemplateGuid>{1bc93793-694f-48fe-9372-81e2b05556fd}</TemplateGuid>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <Configuration>Win8 Debug</Configuration>
+    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
+  </PropertyGroup>
+  <PropertyGroup Label="Globals">
+    <RootNamespace>TapDriver6</RootNamespace>
+    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VisualStudioVersion)' == '11.0'">$(VCTargetsPath11)</VCTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Label="PropertySheets">
+    <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+    <DriverType>KMDF</DriverType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'" Label="Configuration">
+    <TargetVersion>Windows8</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'" Label="Configuration">
+    <TargetVersion>Windows8</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'" Label="Configuration">
+    <TargetVersion>Windows7</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'" Label="Configuration">
+    <TargetVersion>Windows7</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'" Label="Configuration">
+    <TargetVersion>Vista</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'" Label="Configuration">
+    <TargetVersion>Vista</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
+    <KMDF_VERSION_MINOR>7</KMDF_VERSION_MINOR>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'" Label="Configuration">
+    <TargetVersion>Windows8</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'" Label="Configuration">
+    <TargetVersion>Windows8</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'" Label="Configuration">
+    <TargetVersion>Windows7</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'" Label="Configuration">
+    <TargetVersion>Windows7</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'" Label="Configuration">
+    <TargetVersion>Vista</TargetVersion>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'" Label="Configuration">
+    <TargetVersion>Vista</TargetVersion>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
+    <KMDF_VERSION_MINOR>7</KMDF_VERSION_MINOR>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
+    <TargetName>zttap300</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WppEnabled>false</WppEnabled>
+      <WppScanConfigurationData Condition="'%(ClCompile. ScanConfigurationData)'  == ''">trace.h</WppScanConfigurationData>
+      <WppKernelMode>false</WppKernelMode>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">false</WppMinimalRebuildFromTracking>
+      <WppMinimalRebuildFromTracking Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</WppMinimalRebuildFromTracking>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">Level1</WarningLevel>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">Default</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">Default</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">C:\WinDDK\7600.16385.1\lib\win7\amd64\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">C:\WinDDK\7600.16385.1\lib\win7\amd64\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">C:\WinDDK\7600.16385.1\lib\win7\amd64\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">C:\WinDDK\7600.16385.1\lib\win7\amd64\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">C:\WinDDK\7600.16385.1\lib\win7\amd64\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">C:\WinDDK\7600.16385.1\lib\win7\amd64\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\amd64\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">C:\WinDDK\7600.16385.1\lib\win7\i386\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">C:\WinDDK\7600.16385.1\lib\win7\i386\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">C:\WinDDK\7600.16385.1\lib\win7\i386\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">C:\WinDDK\7600.16385.1\lib\win7\i386\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">C:\WinDDK\7600.16385.1\lib\win7\i386\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">C:\WinDDK\7600.16385.1\lib\win7\i386\ndis.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\ntstrsafe.lib;C:\WinDDK\7600.16385.1\lib\win7\i386\wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+    <Inf>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveDate Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</SpecifyDriverVerDirectiveDate>
+    </Inf>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <FilesToPackage Include="$(TargetPath)" />
+    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="adapter.c" />
+    <ClCompile Include="device.c" />
+    <ClCompile Include="error.c" />
+    <ClCompile Include="macinfo.c" />
+    <ClCompile Include="mem.c" />
+    <ClCompile Include="oidrequest.c" />
+    <ClCompile Include="rxpath.c" />
+    <ClCompile Include="tapdrvr.c" />
+    <ClCompile Include="txpath.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="adapter.h" />
+    <ClInclude Include="config.h" />
+    <ClInclude Include="constants.h" />
+    <ClInclude Include="device.h" />
+    <ClInclude Include="endian.h" />
+    <ClInclude Include="error.h" />
+    <ClInclude Include="hexdump.h" />
+    <ClInclude Include="lock.h" />
+    <ClInclude Include="macinfo.h" />
+    <ClInclude Include="mem.h" />
+    <ClInclude Include="proto.h" />
+    <ClInclude Include="prototypes.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="tap-windows.h" />
+    <ClInclude Include="tap.h" />
+    <ClInclude Include="types.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="resource.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Include="zttap300.inf">
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">3.00.00.0</TimeStamp>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <SpecifyDriverVerDirectiveVersion Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">false</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">3.00.00.0</TimeStamp>
+    </Inf>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/TapDriver6/adapter.c b/windows/TapDriver6/adapter.c
index c170e2215..7ce4b310c 100644
--- a/windows/TapDriver6/adapter.c
+++ b/windows/TapDriver6/adapter.c
@@ -272,8 +272,7 @@ tapReadConfiguration(
 
         if (status == NDIS_STATUS_SUCCESS)
         {
-            if (configParameter->ParameterType == NdisParameterString
-                && configParameter->ParameterData.StringData.Length <= sizeof(Adapter->NetCfgInstanceIdBuffer) - sizeof(WCHAR))
+            if (configParameter->ParameterType == NdisParameterString)
             {
                 DEBUGP (("[TAP] NdisReadConfiguration (NetCfgInstanceId=%wZ)\n",
                     &configParameter->ParameterData.StringData ));
diff --git a/windows/TapDriver6/config.h b/windows/TapDriver6/config.h
index 30ea62108..4d36c5a13 100644
--- a/windows/TapDriver6/config.h
+++ b/windows/TapDriver6/config.h
@@ -1,9 +1,9 @@
-#define PRODUCT_NAME			"ZeroTier Virtual Port"
+#define PRODUCT_NAME			"ZeroTier One Virtual Port"
 #define PRODUCT_VERSION			"3.0.0"
 #define PRODUCT_VERSION_RESOURCE	3,0,0,1
 #define PRODUCT_TAP_WIN_COMPONENT_ID	"zttap300"
 #define PRODUCT_TAP_WIN_MAJOR		3
 #define PRODUCT_TAP_WIN_MINOR		0
-#define PRODUCT_TAP_WIN_PROVIDER		"ZeroTier"
+#define PRODUCT_TAP_WIN_PROVIDER		"ZeroTier Networks"
 #define PRODUCT_TAP_WIN_DEVICE_DESCRIPTION	PRODUCT_NAME
-#define PRODUCT_TAP_WIN_RELDATE		"11/24/2020"
+#define PRODUCT_TAP_WIN_RELDATE		"04/25/2015"
diff --git a/windows/TapDriver6/tap-windows.h b/windows/TapDriver6/tap-windows.h
index fd41a7981..7e01846df 100644
--- a/windows/TapDriver6/tap-windows.h
+++ b/windows/TapDriver6/tap-windows.h
@@ -42,9 +42,7 @@
 //#define TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT TAP_WIN_CONTROL_CODE (5, METHOD_BUFFERED)
 #define TAP_WIN_IOCTL_SET_MEDIA_STATUS      TAP_WIN_CONTROL_CODE (6, METHOD_BUFFERED)
 //#define TAP_WIN_IOCTL_CONFIG_DHCP_MASQ      TAP_WIN_CONTROL_CODE (7, METHOD_BUFFERED)
-#if DBG
-#define TAP_WIN_IOCTL_GET_LOG_LINE          TAP_WIN_CONTROL_CODE (8, METHOD_BUFFERED)
-#endif
+//#define TAP_WIN_IOCTL_GET_LOG_LINE          TAP_WIN_CONTROL_CODE (8, METHOD_BUFFERED)
 //#define TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT   TAP_WIN_CONTROL_CODE (9, METHOD_BUFFERED)
 
 /* Added in 8.2 */
diff --git a/windows/TapDriver6/tap.h b/windows/TapDriver6/tap.h
index f241d80e3..079b279f3 100644
--- a/windows/TapDriver6/tap.h
+++ b/windows/TapDriver6/tap.h
@@ -25,11 +25,10 @@
 #define __TAP_H
 
 #ifndef NDIS_SUPPORT_NDIS6
-#define NDIS_MINIPORT_DRIVER 1
-#define NDIS_SUPPORT_NDIS6	 1
-#define NDIS_SUPPORT_NDIS630 1
-#define NDIS_WDM1			 1
-#define NDIS630_MINIPORT	 1
+#define NDIS_SUPPORT_NDIS6 1
+#define NDIS_SUPPORT_NDIS61 1
+#define NDIS_WDM1 1
+#define NDIS61_MINIPORT 1
 #endif
 
 #include <ntifs.h>
@@ -64,7 +63,7 @@
 // Duplicates the functionality of OpenVPN's
 // --allow-nonadmin directive.
 //========================================================
-#define ENABLE_NONADMIN 0
+#define ENABLE_NONADMIN 1
 
 //
 // The driver has exactly one instance of the TAP_GLOBAL structure.  NDIS keeps
diff --git a/windows/TapDriver6/zttap300.inf b/windows/TapDriver6/zttap300.inf
index 8e74daab1..f901b130d 100644
--- a/windows/TapDriver6/zttap300.inf
+++ b/windows/TapDriver6/zttap300.inf
@@ -1,15 +1,10 @@
-;
-; ****************************************************************************
-; * Copyright (C) 2002-2014 OpenVPN Technologies, Inc.                       *
-; *  This program is free software; you can redistribute it and/or modify    *
-; *  it under the terms of the GNU General Public License version 2          *
-; *  as published by the Free Software Foundation.                           *
-; ****************************************************************************
-;
-
 ;
 ; ZeroTier One Virtual Network Port NDIS6 Driver
 ;
+; Based on the OpenVPN tap-windows6 driver version 9.21.1 git
+; commit 48f027cfca52b16b5fd23d82e6016ed8a91fc4d3.
+; See: https://github.com/OpenVPN/tap-windows6
+;
 ; Modified by ZeroTier, Inc. - https://www.zerotier.com/
 ;
 ; (1) Comment out 'tun' functionality and related features such as DHCP
@@ -20,6 +15,14 @@
 ; (5) Rename/rebrand driver as ZeroTier network port driver.
 ;
 ; Original copyright below. Modifications released under GPLv2 as well.
+;
+; ****************************************************************************
+; * Copyright (C) 2002-2014 OpenVPN Technologies, Inc.                       *
+; *  This program is free software; you can redistribute it and/or modify    *
+; *  it under the terms of the GNU General Public License version 2          *
+; *  as published by the Free Software Foundation.                           *
+; ****************************************************************************
+;
 
 [Version]
 Signature = "$Windows NT$"
@@ -27,18 +30,17 @@ CatalogFile = zttap300.cat
 ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318}
 Provider = %Provider%
 Class = Net
-DriverVer=11/24/2020,3.00.00.1
+DriverVer=04/25/2015,3.00.00.0
 
 [Strings]
-DeviceDescription = "ZeroTier Virtual Port"
-Provider = "ZeroTier"
+DeviceDescription = "ZeroTier One Virtual Port"
+Provider = "ZeroTier Networks LLC" ; We're ZeroTier, Inc. now but kernel mode certs are $300+ so fuqdat.
 
+; To build for x86, take NTamd64 off this and off the named section manually, build, then put it back!
 [Manufacturer]
-%Provider%=zttap300,NTx86
 %Provider%=zttap300,NTamd64
-%Provider%=zttap300,NTarm64
 
-[zttap300.NTx86]
+[zttap300]
 %DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
 %DeviceDescription% = zttap300.ndi, zttap300      ; Legacy
 
@@ -46,10 +48,6 @@ Provider = "ZeroTier"
 %DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
 %DeviceDescription% = zttap300.ndi, zttap300      ; Legacy
 
-[zttap300.NTarm64]
-%DeviceDescription% = zttap300.ndi, root\zttap300 ; Root enumerated
-%DeviceDescription% = zttap300.ndi, zttap300      ; Legacy
-
 ;----------------- Characteristics ------------
 ;    NCF_PHYSICAL = 0x04
 ;    NCF_VIRTUAL = 0x01
diff --git a/windows/WinUI/APIHandler.cs b/windows/WinUI/APIHandler.cs
new file mode 100644
index 000000000..92b830215
--- /dev/null
+++ b/windows/WinUI/APIHandler.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Net;
+using System.IO;
+using System.Windows;
+using Newtonsoft.Json;
+
+namespace WinUI
+{
+    
+
+    public class APIHandler
+    {
+        private string authtoken;
+
+        private string url = null;
+
+        public APIHandler()
+        {
+            url = "http://127.0.0.1:9993";
+        }
+
+        public APIHandler(int port, string authtoken)
+        {
+            url = "http://localhost:" + port;
+            this.authtoken = authtoken;
+        }
+
+        public ZeroTierStatus GetStatus()
+        {
+            var request = WebRequest.Create(url + "/status" + "?auth=" + authtoken) as HttpWebRequest;
+            if (request != null)
+            {
+                request.Method = "GET";
+                request.ContentType = "application/json";
+            }
+
+            try
+            {
+                var httpResponse = (HttpWebResponse)request.GetResponse();
+                using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
+                {
+                    var responseText = streamReader.ReadToEnd();
+
+                    ZeroTierStatus status = null;
+                    try
+                    {
+                        status = JsonConvert.DeserializeObject<ZeroTierStatus>(responseText);
+                    }
+                    catch (JsonReaderException e)
+                    {
+                        Console.WriteLine(e.ToString());
+                    }
+                    return status;
+                }
+            }
+            catch (System.Net.Sockets.SocketException)
+            {
+                return null;
+            }
+            catch (System.Net.WebException)
+            {
+                return null;
+            }
+        }
+
+        public List<ZeroTierNetwork> GetNetworks()
+        {
+            var request = WebRequest.Create(url + "/network" + "?auth=" + authtoken) as HttpWebRequest;
+            if (request == null)
+            {
+                return null;
+            }
+
+            request.Method = "GET";
+            request.ContentType = "application/json";
+
+            try
+            {
+                var httpResponse = (HttpWebResponse)request.GetResponse();
+                using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
+                {
+                    var responseText = streamReader.ReadToEnd();
+
+                    List<ZeroTierNetwork> networkList = null;
+                    try
+                    {
+                        networkList = JsonConvert.DeserializeObject<List<ZeroTierNetwork>>(responseText);
+                    }
+                    catch (JsonReaderException e)
+                    {
+                        Console.WriteLine(e.ToString());
+                    }
+                    return networkList;
+                }
+            }
+            catch (System.Net.Sockets.SocketException)
+            {
+                return null;
+            }
+            catch (System.Net.WebException)
+            {
+                return null;
+            }
+        }
+
+        public void JoinNetwork(string nwid)
+        {
+            var request = WebRequest.Create(url + "/network/" + nwid + "?auth=" + authtoken) as HttpWebRequest;
+            if (request == null)
+            {
+                return;
+            }
+
+            request.Method = "POST";
+
+            try
+            {
+                var httpResponse = (HttpWebResponse)request.GetResponse();
+
+                if (httpResponse.StatusCode != HttpStatusCode.OK)
+                {
+                    Console.WriteLine("Error sending join network message");
+                }
+            }
+            catch (System.Net.Sockets.SocketException)
+            {
+                MessageBox.Show("Error Joining Network: Cannot connect to ZeroTier service.");
+            }
+            catch (System.Net.WebException)
+            {
+                MessageBox.Show("Error Joining Network: Cannot connect to ZeroTier service.");
+            }
+        }
+
+        public void LeaveNetwork(string nwid)
+        {
+            var request = WebRequest.Create(url + "/network/" + nwid + "?auth=" + authtoken) as HttpWebRequest;
+            if (request == null)
+            {
+                return;
+            }
+
+            request.Method = "DELETE";
+
+            try
+            {
+                var httpResponse = (HttpWebResponse)request.GetResponse();
+
+                if (httpResponse.StatusCode != HttpStatusCode.OK)
+                {
+                    Console.WriteLine("Error sending leave network message");
+                }
+            }
+            catch (System.Net.Sockets.SocketException)
+            {
+                MessageBox.Show("Error Leaving Network: Cannot connect to ZeroTier service.");
+            }
+            catch (System.Net.WebException)
+            {
+                MessageBox.Show("Error Leaving Network: Cannot connect to ZeroTier service.");
+            }
+        }
+
+        public List<ZeroTierPeer> GetPeers()
+        {
+            var request = WebRequest.Create(url + "/peer" + "?auth=" + authtoken) as HttpWebRequest;
+            if (request == null)
+            {
+                return null;
+            }
+
+            request.Method = "GET";
+            request.ContentType = "application/json";
+
+            try
+            {
+                var httpResponse = (HttpWebResponse)request.GetResponse();
+                using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
+                {
+                    var responseText = streamReader.ReadToEnd();
+                    //Console.WriteLine(responseText);
+                    List<ZeroTierPeer> peerList = null;
+                    try
+                    {
+                        peerList = JsonConvert.DeserializeObject<List<ZeroTierPeer>>(responseText);
+                    }
+                    catch (JsonReaderException e)
+                    {
+                        Console.WriteLine(e.ToString());
+                    }
+                    return peerList;
+                }
+            }
+            catch (System.Net.Sockets.SocketException)
+            {
+                return null;
+            }
+            catch (System.Net.WebException)
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/windows/WinUI/App.config b/windows/WinUI/App.config
new file mode 100644
index 000000000..8e1564635
--- /dev/null
+++ b/windows/WinUI/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/windows/WinUI/App.xaml b/windows/WinUI/App.xaml
new file mode 100644
index 000000000..08b9b7921
--- /dev/null
+++ b/windows/WinUI/App.xaml
@@ -0,0 +1,14 @@
+<Application x:Class="WinUI.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    	<ResourceDictionary>
+    		<ResourceDictionary.MergedDictionaries>
+    			<ResourceDictionary Source="Simple Styles.xaml"/>
+    		</ResourceDictionary.MergedDictionaries>
+    	</ResourceDictionary>
+         
+    </Application.Resources>
+</Application>
diff --git a/windows/WinUI/App.xaml.cs b/windows/WinUI/App.xaml.cs
new file mode 100644
index 000000000..a97edde74
--- /dev/null
+++ b/windows/WinUI/App.xaml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace WinUI
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/windows/WinUI/Fonts/segoeui.ttf b/windows/WinUI/Fonts/segoeui.ttf
new file mode 100644
index 000000000..fc18ebd0a
Binary files /dev/null and b/windows/WinUI/Fonts/segoeui.ttf differ
diff --git a/windows/WinUI/Fonts/segoeuib.ttf b/windows/WinUI/Fonts/segoeuib.ttf
new file mode 100644
index 000000000..5f31e0ca6
Binary files /dev/null and b/windows/WinUI/Fonts/segoeuib.ttf differ
diff --git a/windows/WinUI/Fonts/segoeuii.ttf b/windows/WinUI/Fonts/segoeuii.ttf
new file mode 100644
index 000000000..7efb70d60
Binary files /dev/null and b/windows/WinUI/Fonts/segoeuii.ttf differ
diff --git a/windows/WinUI/Fonts/segoeuiz.ttf b/windows/WinUI/Fonts/segoeuiz.ttf
new file mode 100644
index 000000000..d7bb186b3
Binary files /dev/null and b/windows/WinUI/Fonts/segoeuiz.ttf differ
diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
new file mode 100644
index 000000000..d71a90df0
--- /dev/null
+++ b/windows/WinUI/MainWindow.xaml
@@ -0,0 +1,132 @@
+<Window
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        xmlns:local="clr-namespace:WinUI"
+        mc:Ignorable="d" x:Class="WinUI.MainWindow"
+        Title="ZeroTier One" Height="500" Width="425" Icon="ZeroTierIcon.ico">
+	
+    <Window.Resources>
+        <SolidColorBrush x:Key="GreenBrush" Color="#ff91a2a3"/>
+
+        <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+
+        <SolidColorBrush x:Key="GreenDisabledBrush" Color="#FF234447" />
+
+        <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE" />
+
+        <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+
+        <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
+        
+        <Style TargetType="{x:Type DataGrid}">
+            <Setter Property="Background" Value="#FFF" />
+            <Setter Property="AlternationCount" Value="2" />
+        </Style>
+
+        <Style TargetType="{x:Type DataGridRow}">
+            <Style.Triggers>
+                <Trigger Property="ItemsControl.AlternationIndex" Value="0">
+                    <Setter Property="Background" Value="#EEE"></Setter>
+                </Trigger>
+                <Trigger Property="ItemsControl.AlternationIndex" Value="1">
+                    <Setter Property="Background" Value="#FFF"></Setter>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+        
+        <Style TargetType="{x:Type TabItem}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TabItem}">
+                        <Grid>
+                            <Border 
+                                Name="Border"
+                                Margin="0,0,-4,0" 
+                                Background="{StaticResource GreenBrush}"
+                                BorderBrush="{StaticResource  SolidBorderBrush}" 
+                                BorderThickness="1,1,1,1" 
+                                CornerRadius="2,12,0,0" >
+                                <ContentPresenter x:Name="ContentSite"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    ContentSource="Header"
+                                    Margin="12,2,12,2"
+                                    RecognizesAccessKey="True"/>
+                            </Border>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Panel.ZIndex" Value="100" />
+                                <Setter TargetName="Border" Property="Background" Value="{StaticResource GreenDisabledBrush}" />
+                                <Setter TargetName="Border" Property="BorderThickness" Value="1,1,1,0" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="Border" Property="Background" Value="{StaticResource DisabledBackgroundBrush}" />
+                                <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource DisabledBorderBrush}" />
+                                <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    
+    <DockPanel>
+		<StatusBar DockPanel.Dock="Bottom" Height="26" Background="#FF234447" Margin="0">
+			<StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+							<ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+			<StatusBarItem Grid.Column="0" x:Name="networkId" Content="deadbeef00" Foreground="White" FontFamily="Lucida Console"/>
+            <StatusBarItem Grid.Column="1" x:Name="onlineStatus" Content="ONLINE" Foreground="White" FontFamily="Lucida Console"/>
+            <StatusBarItem Grid.Column="2" x:Name="versionString" Content="1.0.5" Foreground="White" FontFamily="Lucida Console"/>
+			<StatusBarItem Grid.Column="3" x:Name="blank" Content="" Height="43" Foreground="White"/>
+			<StatusBarItem Grid.Column="4">
+				<TextBox x:Name="joinNetworkID" TextWrapping="Wrap" Width="140" HorizontalAlignment="Right" ToolTip="Enter Network ID" PreviewTextInput="OnNetworkEntered" MaxLength="16" FontFamily="Lucida Console" FontSize="12" BorderThickness="1"/>
+			</StatusBarItem>
+			<StatusBarItem Grid.Column="5" x:Name="statusBarButton" Foreground="White" RenderTransformOrigin="0.789,0.442">
+				<Button x:Name="joinButton" Content="Join" Background="#FFFFB354" Width="76" Click="joinButton_Click"/>
+			</StatusBarItem>
+		</StatusBar>
+		<!--<TabControl Margin="0,0,0,0">
+            <TabItem x:Name="Networks" Header="Networks" Foreground="White" IsSelected="True" IsManipulationEnabled="True">-->
+                <Grid Background="LightGray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <local:NetworksPage x:Name="networksPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="0" Margin="0,0,0,0"/>
+                </Grid>
+            <!--</TabItem>-->
+            <!--<TabItem x:Name="Peers" Header="Peers" Foreground="White">
+                <Grid Background="#FFE5E5E5" HorizontalAlignment="Left" VerticalAlignment="Top">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <local:PeersPage x:Name="peersPage" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.Row="0"/>
+                </Grid>
+            </TabItem>-->
+		<!--</TabControl>-->
+	</DockPanel>
+</Window>
diff --git a/windows/WinUI/MainWindow.xaml.cs b/windows/WinUI/MainWindow.xaml.cs
new file mode 100644
index 000000000..47f00bfe1
--- /dev/null
+++ b/windows/WinUI/MainWindow.xaml.cs
@@ -0,0 +1,195 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Timers;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace WinUI
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        APIHandler handler;
+        Regex charRegex = new Regex("[0-9a-fxA-FX]");
+        Regex wholeStringRegex = new Regex("^[0-9a-fxA-FX]+$");
+
+        Timer timer = new Timer();
+
+        bool connected = false;
+
+        public MainWindow()
+        {
+            InitializeComponent();
+
+            if (InitAPIHandler())
+            {
+                networksPage.SetAPIHandler(handler);
+
+                updateStatus();
+                if (!connected)
+                {
+                    MessageBox.Show("Unable to connect to ZeroTier Service.");
+                }
+
+                updateNetworks();
+                //updatePeers();
+
+                DataObject.AddPastingHandler(joinNetworkID, OnPaste);
+
+                timer.Elapsed += new ElapsedEventHandler(OnUpdateTimer);
+                timer.Interval = 2000;
+                timer.Enabled = true;
+            }
+        }
+
+        private bool InitAPIHandler()
+        {
+            String ztDir = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\ZeroTier\\One";
+            String authToken = "";
+            Int32 port = 9993;
+            try
+            {
+                byte[] tmp = File.ReadAllBytes(ztDir + "\\authtoken.secret");
+                authToken = System.Text.Encoding.ASCII.GetString(tmp).Trim();
+            }
+            catch
+            {
+                MessageBox.Show("Unable to read ZeroTier One authtoken.secret from:\r\n" + ztDir, "ZeroTier One");
+                this.Close();
+                return false;
+            }
+
+            if ((authToken == null) || (authToken.Length <= 0))
+            {
+                MessageBox.Show("Unable to read ZeroTier One authtoken.secret from:\r\n" + ztDir, "ZeroTier One");
+                this.Close();
+                return false;
+            }
+            try
+            {
+                byte[] tmp = File.ReadAllBytes(ztDir + "\\zerotier-one.port");
+                port = Int32.Parse(System.Text.Encoding.ASCII.GetString(tmp).Trim());
+                if ((port <= 0) || (port > 65535))
+                    port = 9993;
+            }
+            catch
+            {
+            }
+
+            handler = new APIHandler(port, authToken);
+            return true;
+        }
+
+        private void updateStatus()
+        {
+            var status = handler.GetStatus();
+
+            if (status != null)
+            {
+                connected = true;
+
+                networkId.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    this.networkId.Content = status.Address;
+                }));
+                versionString.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    this.versionString.Content = status.Version;
+                }));
+                onlineStatus.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    this.onlineStatus.Content = (status.Online ? "ONLINE" : "OFFLINE");
+                }));
+            }
+            else
+            {
+                connected = false;
+
+                networkId.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    this.networkId.Content = "";
+                }));
+                versionString.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    this.versionString.Content = "0";
+                }));
+                onlineStatus.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    this.onlineStatus.Content = "OFFLINE";
+                }));
+            }
+        }
+
+        private void updateNetworks()
+        {
+            var networks = handler.GetNetworks();
+
+            networksPage.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+            {
+                networksPage.setNetworks(networks);
+            }));
+        }
+
+        private void updatePeers()
+        {
+            //var peers = handler.GetPeers();
+
+            //peersPage.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+            //{
+            //    peersPage.SetPeers(peers);
+            //}));
+        }
+
+        private void OnUpdateTimer(object source, ElapsedEventArgs e)
+        {
+            updateStatus();
+            updateNetworks();
+            //updatePeers();
+        }
+
+        private void joinButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (joinNetworkID.Text.Length < 16)
+            {
+                MessageBox.Show("Invalid Network ID");
+            }
+            else
+            {
+                handler.JoinNetwork(joinNetworkID.Text);
+            }
+        }
+
+        private void OnNetworkEntered(object sender, TextCompositionEventArgs e)
+        {
+            e.Handled = !charRegex.IsMatch(e.Text);
+        }
+
+        private void OnPaste(object sender, DataObjectPastingEventArgs e)
+        {
+            var isText = e.SourceDataObject.GetDataPresent(DataFormats.UnicodeText, true);
+            if (!isText) return;
+
+            var text = e.SourceDataObject.GetData(DataFormats.UnicodeText) as string;
+
+            if (!wholeStringRegex.IsMatch(text))
+            {
+                e.CancelCommand();
+            }
+        }
+    }
+}
diff --git a/windows/WinUI/NetworkInfoView.xaml b/windows/WinUI/NetworkInfoView.xaml
new file mode 100644
index 000000000..54ff03753
--- /dev/null
+++ b/windows/WinUI/NetworkInfoView.xaml
@@ -0,0 +1,73 @@
+<UserControl Background="LightGray" x:Class="WinUI.NetworkInfoView"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      mc:Ignorable="d"
+	>
+    
+    <Border Background="GhostWhite" BorderBrush="Gainsboro" BorderThickness="1" CornerRadius="8,8,8,8">
+        <Grid Background="GhostWhite" Margin="10,10,10,10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="auto"/>
+                <ColumnDefinition Width="10"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBox x:Name="networkId" Text="8056c2e21c000001" HorizontalAlignment="Left" Grid.Column="0" Foreground="#FF91A2A3" FontFamily="Lucida Console" BorderThickness="0" IsReadOnly="true" Background="Transparent"/>
+                <TextBox x:Name="networkName" Text="earth.zerotier.net" HorizontalAlignment="Right" Grid.Column="1" Foreground="#FF000000" BorderThickness="0" IsReadOnly="true" Background="Transparent"/>
+            </Grid>
+            
+            <Separator Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"/>
+            
+            <TextBlock TextWrapping="Wrap" Text="Status" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="2" Foreground="#FF000000"/>
+            <TextBlock TextWrapping="Wrap" Text="Type" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="3" Foreground="#FF000000"/>
+            <TextBlock TextWrapping="Wrap" Text="MAC" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="4" Foreground="#FF000000"/>
+            <TextBlock TextWrapping="Wrap" Text="MTU" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="5" Foreground="#FF000000"/>
+            <TextBlock TextWrapping="Wrap" Text="Broadcast" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="6" Foreground="#FF000000"/>
+            <TextBlock TextWrapping="Wrap" Text="Bridging" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="7" Foreground="#FF000000"/>
+            <TextBlock TextWrapping="Wrap" Text="Device" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="8" Foreground="#FF000000"/>
+            <TextBlock TextWrapping="Wrap" Text="Managed IPs" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="9" Foreground="#FF000000"/>
+            
+            <Rectangle Grid.Column="2" Grid.Row="2" Grid.RowSpan="8" Fill="#FFEEEEEE"/>
+
+            <TextBlock x:Name="networkStatus" FontFamily="Lucida Console" TextWrapping="Wrap" HorizontalAlignment="Right" Text="OK" TextAlignment="Right"  Grid.Column="2" Grid.Row="2" Foreground="#FF000000"/>
+            <TextBlock x:Name="networkType" FontFamily="Lucida Console" TextWrapping="Wrap" Text="PUBLIC" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="3" Foreground="#FF000000"/>
+            <TextBlock x:Name="macAddress" FontFamily="Lucida Console" TextWrapping="Wrap" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="4" Foreground="#FF000000"><Span><Run Text="02:83:4a:1e:4b:3a"/></Span></TextBlock>
+            <TextBlock x:Name="mtu" FontFamily="Lucida Console" TextWrapping="Wrap" Text="2800" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="5" Foreground="#FF000000"/>
+            <TextBlock x:Name="broadcastEnabled" FontFamily="Lucida Console" TextWrapping="Wrap" Text="ENABLED" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="6" Foreground="#FF000000"/>
+            <TextBlock x:Name="bridgingEnabled" FontFamily="Lucida Console" TextWrapping="Wrap" Text="DISABLED" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="7" Background="#FFEEEEEE" Foreground="#FF000000"/>
+            <TextBlock x:Name="deviceName" FontFamily="Lucida Console" TextWrapping="Wrap" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="8" Foreground="#FF000000"><Span><Run Text="ethernet_32771"/></Span></TextBlock>
+            <TextBlock x:Name="managedIps" TextWrapping="Wrap" FontFamily="Lucida Console" HorizontalAlignment="Right" TextAlignment="Right"  Grid.Column="2" Grid.Row="9" Foreground="#FF000000"><Span><Run Text="28.2.169.248/7 "/></Span><LineBreak/><Span><Run Text="fd80:56c2:e21c:0000:0199:9383:4a02:a9f8/88"/></Span></TextBlock>
+
+            <Separator Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3"/>
+            
+            <Grid Grid.Column="0" Grid.Row="11" Grid.ColumnSpan="3" Background="GhostWhite">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Button x:Name="leaveButton" Content="Leave" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="75" Background="#FFFFB354" Click="leaveButton_Click"/>
+            </Grid>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/windows/WinUI/NetworkInfoView.xaml.cs b/windows/WinUI/NetworkInfoView.xaml.cs
new file mode 100644
index 000000000..ccdec2884
--- /dev/null
+++ b/windows/WinUI/NetworkInfoView.xaml.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WinUI
+{
+    /// <summary>
+    /// Interaction logic for NetworkInfoView.xaml
+    /// </summary>
+    public partial class NetworkInfoView : UserControl
+    {
+        private APIHandler handler;
+        private ZeroTierNetwork network;
+
+        public NetworkInfoView(APIHandler handler, ZeroTierNetwork network)
+        {
+            InitializeComponent();
+
+            this.handler = handler;
+            this.network = network;
+
+            UpdateNetworkData();
+        }
+
+        private void UpdateNetworkData()
+        {
+            this.networkId.Text = network.NetworkId;
+            this.networkName.Text = network.NetworkName;
+            this.networkStatus.Text = network.NetworkStatus;
+            this.networkType.Text = network.NetworkType;
+            this.macAddress.Text = network.MacAddress;
+            this.mtu.Text = network.MTU.ToString();
+            this.broadcastEnabled.Text = (network.BroadcastEnabled ? "ENABLED" : "DISABLED");
+            this.bridgingEnabled.Text = (network.Bridge ? "ENABLED" : "DISABLED");
+            this.deviceName.Text = network.DeviceName;
+
+            string iplist = "";
+            for (int i = 0; i < network.AssignedAddresses.Length; ++i)
+            {
+                iplist += network.AssignedAddresses[i];
+                if (i < (network.AssignedAddresses.Length - 1))
+                    iplist += "\n";
+            }
+
+            this.managedIps.Text = iplist;
+        }
+
+        public bool HasNetwork(ZeroTierNetwork network)
+        {
+            if (this.network.NetworkId.Equals(network.NetworkId))
+                return true;
+
+            return false;
+        }
+
+        private void leaveButton_Click(object sender, RoutedEventArgs e)
+        {
+            handler.LeaveNetwork(network.NetworkId);
+        }
+    }
+}
diff --git a/windows/WinUI/NetworksPage.xaml b/windows/WinUI/NetworksPage.xaml
new file mode 100644
index 000000000..6f95bc052
--- /dev/null
+++ b/windows/WinUI/NetworksPage.xaml
@@ -0,0 +1,13 @@
+<UserControl x:Class="WinUI.NetworksPage"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <ScrollViewer x:Name="MyScrollViewer" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <UniformGrid x:Name="wrapPanel" Background="#FFDDDDDD"  HorizontalAlignment="Stretch" VerticalAlignment="Top" Columns="1">
+
+        </UniformGrid>
+    </ScrollViewer>
+</UserControl>
diff --git a/windows/WinUI/NetworksPage.xaml.cs b/windows/WinUI/NetworksPage.xaml.cs
new file mode 100644
index 000000000..5a0dc19dc
--- /dev/null
+++ b/windows/WinUI/NetworksPage.xaml.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WinUI
+{
+    /// <summary>
+    /// Interaction logic for NetworksPage.xaml
+    /// </summary>
+    public partial class NetworksPage : UserControl
+    {
+        private APIHandler handler;
+
+        public NetworksPage()
+        {
+            InitializeComponent();
+        }
+
+        public void SetAPIHandler(APIHandler handler)
+        {
+            this.handler = handler;
+        }
+
+        public void setNetworks(List<ZeroTierNetwork> networks)
+        {
+            this.wrapPanel.Children.Clear();
+            if (networks == null)
+            {
+                return;
+            }
+
+            for (int i = 0; i < networks.Count; ++i)
+            {
+                this.wrapPanel.Children.Add(
+                    new NetworkInfoView(
+                        handler,
+                        networks.ElementAt<ZeroTierNetwork>(i)));
+            }
+        }
+    }
+}
diff --git a/windows/WinUI/PeersPage.xaml b/windows/WinUI/PeersPage.xaml
new file mode 100644
index 000000000..57b11edf8
--- /dev/null
+++ b/windows/WinUI/PeersPage.xaml
@@ -0,0 +1,26 @@
+<UserControl x:Class="WinUI.PeersPage"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300" Background="White" Foreground="Black">
+
+    <DataGrid x:Name="dataGrid" GridLinesVisibility="None" AutoGenerateColumns="False" CanUserResizeColumns="True" Margin="0,0,0,0" CanUserReorderColumns="False" HorizontalAlignment="Stretch" VerticalScrollBarVisibility="Auto" CanUserSortColumns="False">
+        <DataGrid.CellStyle>
+            <Style TargetType="DataGridCell">
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            </Style>
+        </DataGrid.CellStyle>
+        <DataGrid.Columns>
+            <DataGridTextColumn Header="Address" Binding="{Binding Address}"/>
+            <DataGridTextColumn Header="Version" Binding="{Binding VersionString}"/>
+            <DataGridTextColumn Header="Latency" Binding="{Binding Latency}"/>
+            <DataGridTextColumn Header="Data Paths" Binding="{Binding DataPaths}"/>
+            <DataGridTextColumn Header="Last Unicast" Binding="{Binding LastUnicastFrame}"/>
+            <DataGridTextColumn Header="Last Multicast" Binding="{Binding LastMulticastFrame}"/>
+            <DataGridTextColumn Width="*" Header="Role" Binding="{Binding Role}"/>
+        </DataGrid.Columns>
+    </DataGrid>
+</UserControl>
diff --git a/windows/WinUI/PeersPage.xaml.cs b/windows/WinUI/PeersPage.xaml.cs
new file mode 100644
index 000000000..fac22a49d
--- /dev/null
+++ b/windows/WinUI/PeersPage.xaml.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WinUI
+{
+    /// <summary>
+    /// Interaction logic for PeersPage.xaml
+    /// </summary>
+    public partial class PeersPage : UserControl
+    {
+        private List<ZeroTierPeer> peersList = new List<ZeroTierPeer>();
+
+        public PeersPage()
+        {
+            InitializeComponent();
+
+            dataGrid.ItemsSource = peersList;
+        }
+
+        public void SetPeers(List<ZeroTierPeer> list)
+        {
+            if (list == null)
+                return;
+
+            
+            foreach(ZeroTierPeer p in list)
+            {
+                ZeroTierPeer curPeer = peersList.Find(peer => peer.Equals(p));
+                if (curPeer == null)
+                {
+                    peersList.Add(p);                    
+                }
+                else
+                {
+                    curPeer.Update(p);
+                }
+            }
+
+            dataGrid.Items.Refresh();
+        }
+    }
+}
diff --git a/windows/WinUI/Properties/AssemblyInfo.cs b/windows/WinUI/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..9c7cd1339
--- /dev/null
+++ b/windows/WinUI/Properties/AssemblyInfo.cs
@@ -0,0 +1,56 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ZeroTier One")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("ZeroTier, Inc")]
+[assembly: AssemblyProduct("ZeroTier One")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/windows/WinUI/Properties/Resources.Designer.cs b/windows/WinUI/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..57a56f7d0
--- /dev/null
+++ b/windows/WinUI/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WinUI.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WinUI.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/windows/WinUI/Properties/Resources.resx b/windows/WinUI/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/windows/WinUI/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/windows/WinUI/Properties/Settings.Designer.cs b/windows/WinUI/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..6812cccd6
--- /dev/null
+++ b/windows/WinUI/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WinUI.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/windows/WinUI/Properties/Settings.settings b/windows/WinUI/Properties/Settings.settings
new file mode 100644
index 000000000..033d7a5e9
--- /dev/null
+++ b/windows/WinUI/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/windows/WinUI/Simple Styles.xaml b/windows/WinUI/Simple Styles.xaml
new file mode 100644
index 000000000..f2ddedf9b
--- /dev/null
+++ b/windows/WinUI/Simple Styles.xaml	
@@ -0,0 +1,1121 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/interactivedesigner/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
+	
+	<!-- SimpleStyles.XAML defines a set of control styles which are simplified starting points for creating your own controls -->
+	
+	<!-- Brushes : These are used to define the color for background, foreground, selection, enabled etc of all controls
+	If you want to change the color of a control you can just chnage the brush; if you want to add a new shape or change arrangement then also edit the template -->
+	
+	<!-- NormalBrush is used as the Background for SimpleButton, SimpleRepeatButton -->
+	<LinearGradientBrush x:Key="NormalBrush" EndPoint="0,1" StartPoint="0,0">
+		<GradientStop Color="#EEE" Offset="0.0"/>
+		<GradientStop Color="#CCC" Offset="1.0"/>
+	</LinearGradientBrush>
+	<LinearGradientBrush x:Key="NormalBorderBrush" EndPoint="0,1" StartPoint="0,0">
+		<GradientStop Color="#CCC" Offset="0.0"/>
+		<GradientStop Color="#444" Offset="1.0"/>
+	</LinearGradientBrush>
+	
+	<!-- LightBrush is used for content areas such as Menu, Tab Control background -->
+	<LinearGradientBrush x:Key="LightBrush" EndPoint="0,1" StartPoint="0,0">
+		<GradientStop Color="#FFF" Offset="0.0"/>
+		<GradientStop Color="#EEE" Offset="1.0"/>
+	</LinearGradientBrush>
+	
+	<!-- MouseOverBrush is used for MouseOver in Button, Radio Button, CheckBox -->
+	<LinearGradientBrush x:Key="MouseOverBrush" EndPoint="0,1" StartPoint="0,0">
+		<GradientStop Color="#FFF" Offset="0.0"/>
+		<GradientStop Color="#AAA" Offset="1.0"/>
+	</LinearGradientBrush>
+	
+	<!-- PressedBrush is used for Pressed in Button, Radio Button, CheckBox -->
+	<LinearGradientBrush x:Key="PressedBrush" EndPoint="0,1" StartPoint="0,0">
+		<GradientStop Color="#BBB" Offset="0.0"/>
+		<GradientStop Color="#EEE" Offset="0.1"/>
+		<GradientStop Color="#EEE" Offset="0.9"/>
+		<GradientStop Color="#FFF" Offset="1.0"/>
+	</LinearGradientBrush>
+	<LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+		<GradientStop Color="#444" Offset="0.0"/>
+		<GradientStop Color="#888" Offset="1.0"/>
+	</LinearGradientBrush>
+
+	<!-- SelectedBackgroundBrush is used for the Selected item in ListBoxItem, ComboBoxItem-->
+	<SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#DDD"/>	
+
+	<!-- Disabled Brushes are used for the Disabled look of each control -->
+	<SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888"/>
+	<SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#EEE"/>
+	<SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA"/>
+
+	<!-- Used for background of ScrollViewer, TreeView, ListBox, Expander, TextBox, Tab Control -->
+	<SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFF"/>
+	
+	<!-- DefaultedBorderBrush is used to show KeyBoardFocus -->
+	<LinearGradientBrush x:Key="DefaultedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+		<GradientStop Color="#777" Offset="0.0"/>
+		<GradientStop Color="#000" Offset="1.0"/>
+	</LinearGradientBrush>
+
+	<SolidColorBrush x:Key="SolidBorderBrush" Color="#888"/>
+	<SolidColorBrush x:Key="LightBorderBrush" Color="#AAA"/>
+	<SolidColorBrush x:Key="LightColorBrush" Color="#DDD"/>
+	
+	<!-- Used for Checkmark, Radio button, TreeViewItem, Expander ToggleButton glyphs -->
+	<SolidColorBrush x:Key="GlyphBrush" Color="#444"/>
+	
+	
+	<!-- Style and Template pairs are used to define each control Part -->
+	<!-- The Style provides default values on the control; the Template gives the elements for each control -->
+	
+	<!-- SimpleButtonFocusVisual is used to show keyboard focus around a SimpleButton control -->
+	<Style x:Key="SimpleButtonFocusVisual">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Border>
+						<Rectangle Margin="2" Stroke="#60000000" StrokeThickness="1" StrokeDashArray="1 2"/>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple Button - This control sets brushes on each state. Note that these brushes must be listed above since they are static resources -->
+	<Style x:Key="SimpleButton" TargetType="{x:Type Button}" BasedOn="{x:Null}">
+		<Setter Property="FocusVisualStyle" Value="{DynamicResource SimpleButtonFocusVisual}"/>
+		<Setter Property="Background" Value="{DynamicResource NormalBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Button}">
+					
+					<!-- We use Grid as a root because it is easy to add more elements to customize the button -->
+					<Grid x:Name="Grid">
+						<Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}"/>
+						
+						<!-- Content Presenter is where the text content etc is placed by the control -->
+						<!-- The bindings are useful so that the control can be parameterized without editing the template -->
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True"/>
+					</Grid>
+					
+					<!--Each state sets a brush on the Border in the template -->
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsKeyboardFocused" Value="true">
+							<Setter Property="BorderBrush" Value="{DynamicResource DefaultedBorderBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Background" Value="{DynamicResource MouseOverBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsPressed" Value="true">
+							<Setter Property="Background" Value="{DynamicResource PressedBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource PressedBorderBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="true"/>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<Style x:Key="RadioButtonFocusVisual">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Border>
+						<Rectangle Margin="15,0,0,0" Stroke="#60000000" StrokeThickness="1" StrokeDashArray="1 2"/>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<Style x:Key="CheckBoxFocusVisual">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Border>
+						<Rectangle Margin="15,0,0,0" Stroke="#60000000" StrokeThickness="1" StrokeDashArray="1 2"/>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple CheckBox -->
+	<Style x:Key="SimpleCheckBox" TargetType="{x:Type CheckBox}">
+		<Setter Property="SnapsToDevicePixels" Value="true"/>
+		<Setter Property="FocusVisualStyle" Value="{DynamicResource CheckBoxFocusVisual}"/>
+		<Setter Property="Background" Value="{DynamicResource NormalBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type CheckBox}">
+					
+					<!-- BulletDecorator is used to provide baseline alignment between the checkmark and the Content -->
+					<BulletDecorator Background="Transparent">
+						<BulletDecorator.Bullet>
+							<Grid Width="13" Height="13">
+								<Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+								<Path x:Name="CheckMark" Stroke="{DynamicResource GlyphBrush}" StrokeThickness="2" SnapsToDevicePixels="False" Data="M 0 0 L 13 13 M 0 13 L 13 0"/>
+							</Grid>
+						</BulletDecorator.Bullet>
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True"/>
+					</BulletDecorator>
+					
+					<!-- This uses Visibility to hide and show the CheckMark on IsChecked -->
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="false">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="CheckMark"/>
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Background" Value="{DynamicResource MouseOverBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsPressed" Value="true">
+							<Setter Property="Background" Value="{DynamicResource PressedBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource PressedBorderBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+					
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple Radio Button -->
+	<Style x:Key="SimpleRadioButton" TargetType="{x:Type RadioButton}">
+		<Setter Property="SnapsToDevicePixels" Value="true"/>
+		<Setter Property="FocusVisualStyle" Value="{DynamicResource RadioButtonFocusVisual}"/>
+		<Setter Property="Background" Value="{DynamicResource NormalBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type RadioButton}">
+				
+					<!-- BulletDecorator is used to provide baseline alignment between the checkmark and the Content -->
+					<BulletDecorator Background="Transparent">
+						<BulletDecorator.Bullet>
+							<Grid Width="13" Height="13">
+								<Ellipse x:Name="Ellipse_Border" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1"/>
+								<Ellipse Margin="4" x:Name="CheckMark" Fill="{DynamicResource GlyphBrush}"/>
+							</Grid>
+						</BulletDecorator.Bullet>
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True"/>
+					</BulletDecorator>
+					
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="false">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="CheckMark"/>
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Fill" Value="{DynamicResource MouseOverBrush}" TargetName="Ellipse_Border"/>
+						</Trigger>
+						<Trigger Property="IsPressed" Value="true">
+							<Setter Property="Fill" Value="{DynamicResource PressedBrush}" TargetName="Ellipse_Border"/>
+							<Setter Property="Stroke" Value="{DynamicResource GlyphBrush}" TargetName="Ellipse_Border"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Fill" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Ellipse_Border"/>
+							<Setter Property="Stroke" Value="#40000000" TargetName="Ellipse_Border"/>
+							<Setter Property="Foreground" Value="#80000000"/>
+						</Trigger>
+						
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple Repeat Button - This is used by Simple ScrollBar for the up and down buttons -->
+	<Style x:Key="SimpleRepeatButton" d:IsControlPart="True" TargetType="{x:Type RepeatButton}" BasedOn="{x:Null}">
+		<Setter Property="Background" Value="{DynamicResource NormalBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type RepeatButton}">
+					<Grid>
+						<Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+						<ContentPresenter HorizontalAlignment="Center" x:Name="ContentPresenter" VerticalAlignment="Center" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsKeyboardFocused" Value="true">
+							<Setter Property="BorderBrush" Value="{DynamicResource DefaultedBorderBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Background" Value="{DynamicResource MouseOverBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsPressed" Value="true">
+							<Setter Property="Background" Value="{DynamicResource PressedBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource PressedBorderBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple Thumb - The Thumb is the draggable part of the Scrollbar -->
+	<Style x:Key="SimpleThumbStyle" d:IsControlPart="True" TargetType="{x:Type Thumb}" BasedOn="{x:Null}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Thumb}">
+					<Grid Margin="0,0,0,0" x:Name="Grid">
+						<Rectangle HorizontalAlignment="Stretch" x:Name="Rectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="2" RadiusY="2" Fill="{DynamicResource NormalBrush}" Stroke="{DynamicResource NormalBorderBrush}"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsFocused" Value="True"/>
+						<Trigger Property="IsMouseOver" Value="True"/>
+						<Trigger Property="IsEnabled" Value="False"/>
+						<Trigger Property="IsDragging" Value="True"/>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple ScrollRepeatButton Style - This RepeatButton is used above and below the Thumb in the Scrollbar. They are set to transparent si that they do not show over the scrollbar -->
+	<Style x:Key="SimpleScrollRepeatButtonStyle" d:IsControlPart="True" TargetType="{x:Type RepeatButton}">
+		<Setter Property="Background" Value="Transparent"/>
+		<Setter Property="BorderBrush" Value="Transparent"/>
+		<Setter Property="IsTabStop" Value="false"/>
+		<Setter Property="Focusable" Value="false"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type RepeatButton}">
+					<Grid>
+						<Rectangle Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}"/>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple ScrollBar  This makes use of SimpleThumb, SimpleRepeatButton and SimpleScrollRepeatButton -->
+	
+	<Style x:Key="SimpleScrollBar" TargetType="{x:Type ScrollBar}">
+		<Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
+		<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ScrollBar}">
+					<Grid x:Name="GridRoot" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Background="{TemplateBinding Background}">
+						<Grid.RowDefinitions>
+							<RowDefinition MaxHeight="18"/>
+							<RowDefinition Height="0.00001*"/>
+							<RowDefinition MaxHeight="18"/>
+						</Grid.RowDefinitions>
+						
+						<RepeatButton x:Name="DecreaseRepeat" Style="{DynamicResource SimpleRepeatButton}" Command="ScrollBar.LineUpCommand">
+							<Grid>
+								<Path x:Name="DecreaseArrow" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" Data="M 0 4 L 8 4 L 4 0 Z"/>
+							</Grid>
+						</RepeatButton>
+						
+						<!-- Track is a special layout container which sizes the thumb and the repeat button which do jump scrolling either side of it -->
+						<Track Grid.Row="1" x:Name="PART_Track" Orientation="Vertical" IsDirectionReversed="true">
+							<Track.Thumb>
+								<Thumb Style="{DynamicResource SimpleThumbStyle}"/>
+							</Track.Thumb>
+							<Track.IncreaseRepeatButton>
+								<RepeatButton x:Name="PageUp" Style="{DynamicResource SimpleScrollRepeatButtonStyle}" Command="ScrollBar.PageDownCommand"/>
+							</Track.IncreaseRepeatButton>
+							<Track.DecreaseRepeatButton>
+								<RepeatButton x:Name="PageDown" Style="{DynamicResource SimpleScrollRepeatButtonStyle}" Command="ScrollBar.PageUpCommand"/>
+							</Track.DecreaseRepeatButton>
+						</Track>
+						
+						<RepeatButton Grid.Row="2" x:Name="IncreaseRepeat" Style="{DynamicResource SimpleRepeatButton}" Command="ScrollBar.LineDownCommand">
+							<Grid>
+								<Path x:Name="IncreaseArrow" Stroke="{TemplateBinding Foreground}" StrokeThickness="1" Data="M 0 0 L 4 4 L 8 0 Z"/>
+							</Grid>
+						</RepeatButton>
+					</Grid>
+					
+					<!-- This uses a single template for ScrollBar and rotate it to be Horizontal
+					It also changes the commands so that the it does Left and Right instead of Up and Down Commands -->
+					<ControlTemplate.Triggers>
+						<Trigger Property="Orientation" Value="Horizontal">
+
+							<!-- Rotate the ScrollBar from Vertical to Horizontal -->
+							<Setter Property="LayoutTransform" TargetName="GridRoot">
+								<Setter.Value>
+									<RotateTransform Angle="-90"/>
+								</Setter.Value>
+							</Setter>
+							
+							<!-- Track is bound to Orientation internally, so we need to rotate it back to Vertical -->
+							<Setter TargetName="PART_Track" Property="Orientation" Value="Vertical"/>
+					
+							<!-- Change the commands to do Horizontal commands -->
+							<Setter Property="Command" Value="ScrollBar.LineLeftCommand" TargetName="DecreaseRepeat"/>
+							<Setter Property="Command" Value="ScrollBar.LineRightCommand" TargetName="IncreaseRepeat"/>
+							<Setter Property="Command" Value="ScrollBar.PageLeftCommand" TargetName="PageDown"/>
+							<Setter Property="Command" Value="ScrollBar.PageRightCommand" TargetName="PageUp"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple ScrollViewer 
+	ScrollViewer is a Grid control which has a ContentPresenter and a Horizontal and Vertical ScrollBar 
+	It is used by ListBox, MenuItem, ComboBox, and TreeView -->
+	<Style x:Key="SimpleScrollViewer" TargetType="{x:Type ScrollViewer}" BasedOn="{x:Null}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ScrollViewer}">
+					<Grid Background="{TemplateBinding Background}">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="*"/>
+							<ColumnDefinition Width="Auto"/>
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="*"/>
+							<RowDefinition Height="Auto"/>
+						</Grid.RowDefinitions>
+						<ScrollContentPresenter Grid.Column="0" Grid.Row="0" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" CanContentScroll="{TemplateBinding CanContentScroll}"/>
+						
+						<!-- The visibility of the ScrollBars is controlled by the implementation fo the control -->
+						<ScrollBar Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Grid.Column="0" Grid.Row="1" x:Name="PART_HorizontalScrollBar" Style="{DynamicResource SimpleScrollBar}" Orientation="Horizontal" Value="{Binding Path=HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Minimum="0" Maximum="{TemplateBinding ScrollableWidth}" />
+						<ScrollBar Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Grid.Column="1" Grid.Row="0" x:Name="PART_VerticalScrollBar" Style="{DynamicResource SimpleScrollBar}" Orientation="Vertical" Value="{Binding Path=VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Minimum="0" Maximum="{TemplateBinding ScrollableHeight}" />
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple ListBox - This uses SimpleScrollViewer to allow items to be scrolled and SimpleListBoxItem to define the look of each item -->
+	<Style x:Key="SimpleListBox" TargetType="{x:Type ListBox}">
+		<Setter Property="SnapsToDevicePixels" Value="true"/>
+		<Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource SolidBorderBrush}"/>
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+		<Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ListBox}">
+					<Grid>
+						<Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+						<ScrollViewer Margin="1" Style="{DynamicResource SimpleScrollViewer}" Focusable="false" Background="{TemplateBinding Background}">
+							
+							<!-- The StackPanel is used to display the children by setting IsItemsHost to be Trus -->
+							<StackPanel Margin="2" IsItemsHost="true"/>
+							
+						</ScrollViewer>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsGrouping" Value="true">
+							<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple ListBoxItem - This is used for each Item in a ListBox. The item's content is placed in the ContentPresenter -->
+	
+	<Style x:Key="SimpleListBoxItem" d:IsControlPart="True" TargetType="{x:Type ListBoxItem}">
+		<Setter Property="SnapsToDevicePixels" Value="true"/>
+		<Setter Property="OverridesDefaultStyle" Value="true"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ListBoxItem}">
+					<Grid SnapsToDevicePixels="true">
+						<Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						
+						<!-- Change IsSelected SelectedBackgroundBrush to set the selection color for the items -->
+						<Trigger Property="IsSelected" Value="true">
+							<Setter Property="Background" Value="{DynamicResource SelectedBackgroundBrush}" TargetName="Border"/>
+						</Trigger>
+						
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple Expander ToggleButton - This Button is used by the Expander control. When it is toggled it switches visibility on the Up_Arrow and Down_Arrow -->
+	<ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+		<Grid>
+			<Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" Stroke="{DynamicResource NormalBorderBrush}"/>
+			<Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z"/>
+			<Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z"/>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="Fill" Value="{DynamicResource MouseOverBrush}" TargetName="Rectangle"/>
+			</Trigger>
+			<Trigger Property="IsPressed" Value="true">
+				<Setter Property="Fill" Value="{DynamicResource PressedBrush}" TargetName="Rectangle"/>
+			</Trigger>
+			<Trigger Property="IsChecked" Value="true">
+				<Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow"/>
+				<Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow"/>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Fill" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Rectangle"/>
+				<Setter Property="Stroke" Value="{DynamicResource DisabledBorderBrush}" TargetName="Rectangle"/>
+				<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+				<Setter Property="Fill" Value="{DynamicResource DisabledForegroundBrush}" TargetName="Up_Arrow"/>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	
+	<!-- Simple Expander 
+	 This uses the Simpler ExpanderToggleButton. It sets Visibility on the ContentPresenter to expand
+	 Limitations : The Simple Expander only expands down -->
+	<Style x:Key="SimpleExpander" TargetType="{x:Type Expander}">
+		<Setter Property="Background" Value="{DynamicResource LightBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Expander}">
+					<Grid>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto"/>
+							<RowDefinition Height="*" x:Name="ContentRow"/>
+						</Grid.RowDefinitions>
+						<Border Grid.Row="0" x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,0,0">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="20"/>
+									<ColumnDefinition Width="*"/>
+								</Grid.ColumnDefinitions>
+								<ToggleButton Template="{DynamicResource ExpanderToggleButton}" Background="{DynamicResource NormalBrush}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True"/>
+								<ContentPresenter Grid.Column="1" Margin="4" RecognizesAccessKey="True" ContentSource="Header"/>
+							</Grid>
+						</Border>
+						<Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="{DynamicResource WindowBackgroundBrush}" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1,0,1,1" CornerRadius="0,0,2,2">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false"/>
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsExpanded" Value="True">
+							<Setter Property="Visibility" Value="Visible" TargetName="ExpandSite"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple ComboBox Toggle Button - This is used in ComboBox to expand and collapse the ComboBox Popup-->
+	<ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition/>
+				<ColumnDefinition Width="20"/>
+			</Grid.ColumnDefinitions>
+			<Rectangle Grid.ColumnSpan="2" HorizontalAlignment="Stretch" x:Name="Rectangle" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="5" RadiusY="5" Fill="{DynamicResource NormalBrush}" Stroke="{DynamicResource NormalBorderBrush}"/>
+			<Rectangle Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="Auto" Height="Auto" RadiusX="5" RadiusY="5" Fill="{DynamicResource WindowBackgroundBrush}" Stroke="{DynamicResource NormalBorderBrush}"/>
+			<Path Grid.Column="1" HorizontalAlignment="Center" x:Name="Arrow" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z"/>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="Fill" Value="{DynamicResource MouseOverBrush}" TargetName="Rectangle"/>
+			</Trigger>
+			<Trigger Property="IsChecked" Value="true">
+				<Setter Property="Fill" Value="{DynamicResource PressedBrush}" TargetName="Rectangle"/>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Fill" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Rectangle"/>
+				<Setter Property="Stroke" Value="{DynamicResource DisabledBorderBrush}" TargetName="Rectangle"/>
+				<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+				<Setter Property="Fill" Value="{DynamicResource DisabledForegroundBrush}" TargetName="Arrow"/>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	
+	<!-- This is the area which contains the selected item in the ComboBox -->
+	
+	<ControlTemplate x:Key="ComboBoxTextBox" TargetType="{x:Type TextBox}">
+		<!-- This must be named as PART_ContentHost -->
+		<Border x:Name="PART_ContentHost" Focusable="False" Background="{TemplateBinding Background}"/>
+	</ControlTemplate>
+	
+	<!-- Simple ComboBox 
+	This uses the ComboBoxToggleButton to expand and collapse a Popup control
+	SimpleScrollViewer to allow items to be scrolled and SimpleComboBoxItem to define the look of each item 
+	The Popup shows a list of items in a StackPanel-->
+	
+	<Style x:Key="SimpleComboBox" TargetType="{x:Type ComboBox}">
+		<Setter Property="SnapsToDevicePixels" Value="true"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ComboBox}">
+					<Grid>
+						<!-- The ToggleButton is databound to the ComboBox itself to toggle IsDropDownOpen -->
+						<ToggleButton Grid.Column="2" Template="{DynamicResource ComboBoxToggleButton}" x:Name="ToggleButton" Focusable="false" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press"/>
+						<ContentPresenter HorizontalAlignment="Left" Margin="3,3,23,3" x:Name="ContentSite" VerticalAlignment="Center" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" IsHitTestVisible="False"/>
+						
+						<!-- The TextBox must be named PART_EditableTextBox or ComboBox will not recognize it -->
+						<TextBox Visibility="Hidden" Template="{DynamicResource ComboBoxTextBox}" HorizontalAlignment="Left" Margin="3,3,23,3" x:Name="PART_EditableTextBox" Style="{x:Null}" VerticalAlignment="Center" Focusable="True" Background="Transparent" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+						
+						<!-- The Popup shows the list of items in the ComboBox. IsOpen is databound to IsDropDownOpen which is toggled via the ComboBoxToggleButton -->
+						<Popup IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" x:Name="Popup" Focusable="False" AllowsTransparency="True" PopupAnimation="Slide">
+							<Grid MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{TemplateBinding ActualWidth}" x:Name="DropDown" SnapsToDevicePixels="True">
+								<Border x:Name="DropDownBorder" Background="{DynamicResource WindowBackgroundBrush}" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1"/>
+								<ScrollViewer Margin="4,6,4,6" Style="{DynamicResource SimpleScrollViewer}" SnapsToDevicePixels="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" CanContentScroll="True">
+							
+									<!-- The StackPanel is used to display the children by setting IsItemsHost to be True -->
+									<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+								
+								</ScrollViewer>
+							</Grid>
+						</Popup>
+					</Grid>
+					<ControlTemplate.Triggers>						
+						<!-- This forces the DropDown to have a minimum size if it is empty -->
+						<Trigger Property="HasItems" Value="false">
+							<Setter Property="MinHeight" Value="95" TargetName="DropDownBorder"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+						</Trigger>
+						<Trigger Property="IsGrouping" Value="true">
+							<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+						</Trigger>
+						<Trigger Property="AllowsTransparency" SourceName="Popup" Value="true">
+							<Setter Property="CornerRadius" Value="4" TargetName="DropDownBorder"/>
+							<Setter Property="Margin" Value="0,2,0,0" TargetName="DropDownBorder"/>
+						</Trigger>
+						<Trigger Property="IsEditable" Value="true">
+							<Setter Property="IsTabStop" Value="false"/>
+							<Setter Property="Visibility" Value="Visible" TargetName="PART_EditableTextBox"/>
+							<Setter Property="Visibility" Value="Hidden" TargetName="ContentSite"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple ComboBoxItem - This is used for each item inside of the ComboBox. You can change the selected color of each item below-->
+	<Style x:Key="SimpleComboBoxItem" d:IsControlPart="True" TargetType="{x:Type ComboBoxItem}">
+		<Setter Property="SnapsToDevicePixels" Value="true"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ComboBoxItem}">
+					<Grid SnapsToDevicePixels="true">
+						<Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+					
+						<!-- Change IsHighlighted SelectedBackgroundBrush to set the selection color for the items -->
+						<Trigger Property="IsHighlighted" Value="true">
+							<Setter Property="Background" Value="{DynamicResource SelectedBackgroundBrush}" TargetName="Border"/>
+						</Trigger>
+						
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple SimpleProgressBar
+	 The template uses two Border controls to show the Track and Progress 
+	 Limitations : It only supports a horizontal orientated ProgressBar -->
+	<Style x:Key="SimpleProgressBar" TargetType="{x:Type ProgressBar}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ProgressBar}">
+					<Grid>
+					
+						<!-- This Border is the track. It must be named PART_Track -->
+						<Border x:Name="PART_Track" Background="{DynamicResource PressedBrush}" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1" CornerRadius="2"/>
+						
+						<!-- This Border shows progress. It must be named PART_Indicator for the control to function -->
+						<Border HorizontalAlignment="Left" x:Name="PART_Indicator" Background="{DynamicResource MouseOverBrush}" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" CornerRadius="2"/>
+					
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple TextBox -->
+	<Style x:Key="SimpleTextBox" TargetType="{x:Type TextBox}">
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
+		<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+		<Setter Property="AllowDrop" Value="true"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type TextBox}">
+					<Grid>
+						<Border x:Name="Border" Background="{DynamicResource WindowBackgroundBrush}" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1" Padding="2" CornerRadius="2">
+							
+							<!-- The implementation places the Content into the ScrollViewer. It must be named PART_ContentHost for the control to function -->
+							<ScrollViewer Margin="0" x:Name="PART_ContentHost" Style="{DynamicResource SimpleScrollViewer}" Background="{TemplateBinding Background}"/>
+						
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple Label - This template is just a ContentPresenter that shows the content of the Label -->
+	<Style x:Key="SimpleLabel" TargetType="{x:Type Label}">
+		<Setter Property="HorizontalContentAlignment" Value="Left"/>
+		<Setter Property="VerticalContentAlignment" Value="Top"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Label}">
+					<Grid>
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false"/>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple Menu - This template uses a StackPanel to layout MenuItems --> 
+	<Style x:Key="SimpleMenu" TargetType="{x:Type Menu}">
+		<Setter Property="Background" Value="{DynamicResource LightBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}"/>
+		<Setter Property="SnapsToDevicePixels" Value="True"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Menu}">
+					<Grid>
+						<Border Margin="1" x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+						<StackPanel Background="{TemplateBinding Background}" IsItemsHost="True" ClipToBounds="True" Orientation="Horizontal"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- This BitmapEffect is used by the Simple MenuItem -->
+	<DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15"/>
+	
+	<!-- Simple MenuItem - The template uses triggers to provide four different arrangements of menu item which are set via the Role property --> 
+	<Style x:Key="SimpleMenuItem" TargetType="{x:Type MenuItem}">
+		<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+		<Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+		<Setter Property="Background" Value="Transparent"/>
+		<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type MenuItem}">
+					<Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid>
+							
+							<!-- The Grid is used to hold together columns for an Icon, Content, Glyph checkmark and Arrow to show the next level
+							 Size sharing is used in Grid so that the Icon, Content, Arrow for each MenuItem align together -->
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition MinWidth="17" Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup"/>
+								<ColumnDefinition Width="*"/>
+								<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGTColumnGroup"/>
+								<ColumnDefinition Width="14"/>
+							</Grid.ColumnDefinitions>
+							
+							<!-- ContentPresenter to show an Icon if needed -->
+							<ContentPresenter Margin="4,0,6,0" x:Name="Icon" VerticalAlignment="Center" ContentSource="Icon"/>
+							
+							<!-- Glyph is a checkmark if needed for a checkable menu -->
+							<Grid Visibility="Hidden" Margin="4,0,6,0" x:Name="GlyphPanel" VerticalAlignment="Center">
+								<Path x:Name="GlyphPanelpath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,2 L0,4.8 L2.5,7.4 L7.1,2.8 L7.1,0 L2.5,4.6 z" FlowDirection="LeftToRight"/>
+							</Grid>
+							
+							<!-- Content for the menu text etc -->
+							<ContentPresenter Grid.Column="1" Margin="{TemplateBinding Padding}" x:Name="HeaderHost" RecognizesAccessKey="True" ContentSource="Header"/>
+							
+							<!-- Arrow drawn path which points to the next level of the menu -->
+							<Grid Grid.Column="3" Margin="4,0,6,0" x:Name="ArrowPanel" VerticalAlignment="Center">
+								<Path x:Name="ArrowPanelPath" VerticalAlignment="Center" Fill="{TemplateBinding Foreground}" Data="M0,0 L0,8 L4,4 z"/>
+							</Grid>
+							
+							<!-- The Popup is the body of the menu which expands down or across depending on the level of the item -->
+							<Popup IsOpen="{Binding Path=IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" x:Name="SubMenuPopup" Focusable="false" AllowsTransparency="true" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}" VerticalOffset="-3">
+								<Grid x:Name="SubMenu">
+									<Border x:Name="SubMenuBorder" Background="{DynamicResource WindowBackgroundBrush}" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1"/>
+									
+									<!-- StackPanel holds children of the menu. This is set bu IsItemsHost=True -->
+									<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle"/>
+								</Grid>
+							</Popup>
+							
+						</Grid>
+					</Border>
+					
+					<!-- These triggers re-configure the four arrangements of MenuItem to show different levels of menu via Role -->
+					<ControlTemplate.Triggers>
+					
+						<!-- Role = TopLevelHeader : this is the root menu item in a menu; the Popup expands down -->
+						<Trigger Property="Role" Value="TopLevelHeader">
+							<Setter Property="Margin" Value="0,1,0,1"/>
+							<Setter Property="Padding" Value="6,3,6,3"/>
+							<Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+							<Setter Property="Placement" Value="Bottom" TargetName="SubMenuPopup"/>
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel"/>
+						</Trigger>
+						
+						<!-- Role = TopLevelItem :  this is a child menu item from the top level without any child items-->
+						<Trigger Property="Role" Value="TopLevelItem">
+							<Setter Property="Margin" Value="0,1,0,1"/>
+							<Setter Property="Padding" Value="6,3,6,3"/>
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel"/>
+						</Trigger>
+						
+						<!-- Role = SubMenuHeader : this is a child menu item which does not have children -->
+						<Trigger Property="Role" Value="SubmenuHeader">
+							<Setter Property="DockPanel.Dock" Value="Top"/>
+							<Setter Property="Padding" Value="0,2,0,2"/>
+							<Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+						</Trigger>
+						
+						<!-- Role = SubMenuItem : this is a child menu item which has children-->
+						<Trigger Property="Role" Value="SubmenuItem">
+							<Setter Property="DockPanel.Dock" Value="Top"/>
+							<Setter Property="Padding" Value="0,2,0,2"/>
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ArrowPanel"/>
+						</Trigger>
+						<Trigger Property="IsSuspendingPopupAnimation" Value="true">
+							<Setter Property="PopupAnimation" Value="None" TargetName="SubMenuPopup"/>
+						</Trigger>
+						
+						<!-- If no Icon is present the we collapse the Icon Content -->
+						<Trigger Property="Icon" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="Icon"/>
+						</Trigger>
+						
+						<!-- The GlyphPanel contains the CheckMark -->
+						<Trigger Property="IsChecked" Value="true">
+							<Setter Property="Visibility" Value="Visible" TargetName="GlyphPanel"/>
+							<Setter Property="Visibility" Value="Collapsed" TargetName="Icon"/>
+						</Trigger>
+						
+						<Trigger Property="AllowsTransparency" SourceName="SubMenuPopup" Value="true">
+							<Setter Property="Margin" Value="0,0,3,3" TargetName="SubMenu"/>
+							<Setter Property="SnapsToDevicePixels" Value="true" TargetName="SubMenu"/>
+							<Setter Property="BitmapEffect" Value="{DynamicResource PopupDropShadow}" TargetName="SubMenuBorder"/>
+						</Trigger>
+						
+						<!-- Using the system colors for the Menu Highlight and IsEnabled-->
+						<Trigger Property="IsHighlighted" Value="true">
+							<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" TargetName="Border"/>
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!-- Simple Separator - This template is used for a Separator in a menu --> 
+	<Style x:Key="SimpleSeparator" TargetType="{x:Type Separator}">
+		<Setter Property="Height" Value="1"/>
+		<Setter Property="Margin" Value="0,2,0,2"/>
+		<Setter Property="Focusable" Value="false"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Separator}">
+					<Border BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1"/>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<!-- Simple TabControl 
+	This template uses Simple TabItem for each Tab. The TabItems are placed in the TabPanel
+	Limitations : The Simple TabControl only allow the Tabs to be shown at the top of the Tab control. You can re-position the TabPanel to change this-->
+	
+	<Style x:Key="SimpleTabControl" TargetType="{x:Type TabControl}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type TabControl}">
+					<Grid KeyboardNavigation.TabNavigation="Local">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto"/>
+							<RowDefinition Height="*"/>
+						</Grid.RowDefinitions>
+						
+						<!-- TabPanel is a layout container which allows the TabItems to wrap and re-order when selected
+						The implementation knows to use this control because it is marked IsItemsHost = True -->
+						<TabPanel Grid.Row="0" Margin="0,0,4,-1" x:Name="HeaderPanel" Background="Transparent" IsItemsHost="True" Panel.ZIndex="1" KeyboardNavigation.TabIndex="1"/>
+						
+						<Border Grid.Row="1" x:Name="Border" Background="{DynamicResource WindowBackgroundBrush}" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1" CornerRadius="2" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="2">
+							
+							<!-- The implementation switches the content. This control must be named PART_SelectedContentHost -->
+							<ContentPresenter Margin="4" x:Name="PART_SelectedContentHost" ContentSource="SelectedContent"/>
+							
+						</Border>
+					</Grid>
+					
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!--Simple TabItem -->
+	<Style x:Key="SimpleTabItem" d:IsControlPart="True" TargetType="{x:Type TabItem}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type TabItem}">
+					<Grid>
+						<Border Margin="0,0,-4,0" x:Name="Border" Background="{DynamicResource LightBrush}" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1,1,1,1" CornerRadius="2,12,0,0">
+							<ContentPresenter HorizontalAlignment="Center" Margin="12,2,12,2" x:Name="ContentSite" VerticalAlignment="Center" RecognizesAccessKey="True" ContentSource="Header"/>
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter Property="Panel.ZIndex" Value="100"/>
+							<Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderThickness" Value="1,1,1,0" TargetName="Border"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+							<Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!--Simple Simple SliderThumb - The Thumb is the draggable part of a Slider-->
+	<Style x:Key="SimpleSliderThumb" d:IsControlPart="True" TargetType="{x:Type Thumb}">
+		<Setter Property="SnapsToDevicePixels" Value="true"/>
+		<Setter Property="Height" Value="14"/>
+		<Setter Property="Width" Value="14"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Thumb}">
+					<Grid>
+						<Ellipse x:Name="Ellipse" Fill="{DynamicResource NormalBrush}" Stroke="{DynamicResource NormalBorderBrush}" StrokeThickness="1"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Fill" Value="{DynamicResource MouseOverBrush}" TargetName="Ellipse"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Fill" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Ellipse"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!--Simple Simple Slider
+	Similiar to ScrollBar this template uses Track to layout the draggable Thumb which has an up and down repeat button
+	It uses Simple SliderThumb and SimpleScrollRepeatButtonStyle for the page up and down repeat buttons -->
+	<Style x:Key="SimpleSlider" TargetType="{x:Type Slider}">
+		<Setter Property="Background" Value="{DynamicResource LightBrush}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Slider}">
+					<Grid x:Name="GridRoot">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto"/>
+							<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/>
+							<RowDefinition Height="Auto"/>
+						</Grid.RowDefinitions>
+						
+						<!-- TickBar shows the ticks for Slider -->
+						<TickBar Visibility="Collapsed" x:Name="TopTick" Height="4" SnapsToDevicePixels="True" Placement="Top" Fill="{DynamicResource GlyphBrush}"/>
+						<Border Grid.Row="1" Margin="0" x:Name="Border" Height="4" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
+						
+						<!-- The Track lays out the repeat buttons and thumb -->
+						<Track Grid.Row="1" x:Name="PART_Track">
+							<Track.Thumb>
+								<Thumb Style="{DynamicResource SimpleSliderThumb}"/>
+							</Track.Thumb>
+							<Track.IncreaseRepeatButton>
+								<RepeatButton Style="{DynamicResource SimpleScrollRepeatButtonStyle}" Command="Slider.IncreaseLarge"/>
+							</Track.IncreaseRepeatButton>
+							<Track.DecreaseRepeatButton>
+								<RepeatButton Style="{DynamicResource SimpleScrollRepeatButtonStyle}" Command="Slider.DecreaseLarge"/>
+							</Track.DecreaseRepeatButton>
+						</Track>
+						
+						<TickBar Visibility="Collapsed" Grid.Row="2" x:Name="BottomTick" Height="4" SnapsToDevicePixels="True" Placement="Bottom" Fill="{TemplateBinding Foreground}"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="TickPlacement" Value="TopLeft">
+							<Setter Property="Visibility" Value="Visible" TargetName="TopTick"/>
+						</Trigger>
+						<Trigger Property="TickPlacement" Value="BottomRight">
+							<Setter Property="Visibility" Value="Visible" TargetName="BottomTick"/>
+						</Trigger>
+						<Trigger Property="TickPlacement" Value="Both">
+							<Setter Property="Visibility" Value="Visible" TargetName="TopTick"/>
+							<Setter Property="Visibility" Value="Visible" TargetName="BottomTick"/>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Background" Value="{DynamicResource DisabledBackgroundBrush}" TargetName="Border"/>
+							<Setter Property="BorderBrush" Value="{DynamicResource DisabledBorderBrush}" TargetName="Border"/>
+						</Trigger>
+						
+						<!-- Use a rotation to create a Vertical Slider form the default Horizontal -->
+						<Trigger Property="Orientation" Value="Vertical">
+							<Setter Property="LayoutTransform" TargetName="GridRoot">
+								<Setter.Value>
+									<RotateTransform Angle="-90"/>
+								</Setter.Value>
+							</Setter>
+							<!-- Track rotates itself based on orientation so need to force it back -->
+							<Setter TargetName="PART_Track" Property="Orientation" Value="Horizontal"/>
+						</Trigger>
+						
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!--Simple Tree View - This lays out TreeViewItems within a ScrollViewer -->
+	<Style x:Key="SimpleTreeView" TargetType="{x:Type TreeView}">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type TreeView}">
+					<Grid>
+						<Border x:Name="Border" Background="{DynamicResource WindowBackgroundBrush}" BorderBrush="{DynamicResource SolidBorderBrush}" BorderThickness="1" CornerRadius="1">
+							<ScrollViewer Style="{DynamicResource SimpleScrollViewer}" Focusable="False" Background="{TemplateBinding Background}" Padding="4" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" CanContentScroll="False">
+								<ItemsPresenter/>
+							</ScrollViewer>
+						</Border>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!--Simple TreeViewItem ToggleButton - + and - button to expand and collapse a TreeViewItem -->
+	<Style x:Key="SimpleTreeViewItemToggleButton" d:IsControlPart="True" TargetType="{x:Type ToggleButton}">
+		<Setter Property="Focusable" Value="False"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ToggleButton}">
+					<Grid Width="15" Height="13" Background="Transparent">
+						<Path Visibility="Collapsed" HorizontalAlignment="Left" Margin="1,1,1,1" x:Name="IsExpandedPath" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 0 4 L 8 4 L 4 8 Z"/>
+						<Path HorizontalAlignment="Left" Margin="1,1,1,1" x:Name="ExpandPath" VerticalAlignment="Center" Fill="{DynamicResource GlyphBrush}" Data="M 4 0 L 8 4 L 4 8 Z"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Visibility" Value="Visible" TargetName="IsExpandedPath"/>
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ExpandPath"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	
+	<!--Simple TreeViewItem - The TreeViewItem template has a header which shows the Item and a Body which is an ItemsHost control which expands to show child items-->
+	<Style x:Key="SimpleTreeViewItem" d:IsControlPart="True" TargetType="{x:Type TreeViewItem}">
+		<Setter Property="Background" Value="Transparent"/>
+		<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+		<Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+		<Setter Property="Padding" Value="1,0,0,0"/>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type TreeViewItem}">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition MinWidth="19" Width="Auto"/>
+							<ColumnDefinition Width="Auto"/>
+							<ColumnDefinition Width="*"/>
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto"/>
+							<RowDefinition/>
+						</Grid.RowDefinitions>
+						<ToggleButton x:Name="Expander" Style="{DynamicResource SimpleTreeViewItemToggleButton}" IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press"/>
+						<Border Grid.Column="1" x:Name="Selection_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_Header" ContentSource="Header"/>
+						</Border>
+						<ItemsPresenter Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1" x:Name="ItemsHost"/>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsExpanded" Value="false">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ItemsHost"/>
+						</Trigger>
+						<Trigger Property="HasItems" Value="false">
+							<Setter Property="Visibility" Value="Hidden" TargetName="Expander"/>
+						</Trigger>
+						<Trigger Property="IsSelected" Value="true">
+							<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" TargetName="Selection_Border"/>
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsSelected" Value="true"/>
+								<Condition Property="IsSelectionActive" Value="false"/>
+							</MultiTrigger.Conditions>
+							<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" TargetName="Selection_Border"/>
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+						</MultiTrigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+</ResourceDictionary>
diff --git a/windows/WinUI/Themes/Generic.xaml b/windows/WinUI/Themes/Generic.xaml
new file mode 100644
index 000000000..2b47588d0
--- /dev/null
+++ b/windows/WinUI/Themes/Generic.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:WinUI">
+
+
+</ResourceDictionary>
diff --git a/windows/WinUI/WinUI.csproj b/windows/WinUI/WinUI.csproj
new file mode 100644
index 000000000..c3eeaba4e
--- /dev/null
+++ b/windows/WinUI/WinUI.csproj
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WinUI</RootNamespace>
+    <AssemblyName>ZeroTier One</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <ExpressionBlendVersion>5.0.40218.0</ExpressionBlendVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <AutorunEnabled>true</AutorunEnabled>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.0</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>WinUI.App</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>ZeroTierIcon.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>false</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Accessibility" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="ReachFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Printing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="NetworksPage.xaml.cs">
+      <DependentUpon>NetworksPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PeersPage.xaml.cs">
+      <DependentUpon>PeersPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ZeroTierPeerPhysicalPath.cs" />
+    <Compile Include="ZeroTierPeer.cs" />
+    <Compile Include="ZeroTierNetwork.cs" />
+    <Compile Include="ZeroTierStatus.cs" />
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="APIHandler.cs" />
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="NetworkInfoView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NetworksPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PeersPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Simple Styles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="NetworkInfoView.xaml.cs">
+      <DependentUpon>NetworkInfoView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="app.manifest" />
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <BlendEmbeddedFont Include="Fonts\segoeui.ttf">
+      <IsSystemFont>True</IsSystemFont>
+      <All>True</All>
+      <AutoFill>True</AutoFill>
+    </BlendEmbeddedFont>
+    <BlendEmbeddedFont Include="Fonts\segoeuib.ttf">
+      <IsSystemFont>True</IsSystemFont>
+      <All>True</All>
+      <AutoFill>True</AutoFill>
+    </BlendEmbeddedFont>
+    <BlendEmbeddedFont Include="Fonts\segoeuii.ttf">
+      <IsSystemFont>True</IsSystemFont>
+      <All>True</All>
+      <AutoFill>True</AutoFill>
+    </BlendEmbeddedFont>
+    <BlendEmbeddedFont Include="Fonts\segoeuiz.ttf">
+      <IsSystemFont>True</IsSystemFont>
+      <All>True</All>
+      <AutoFill>True</AutoFill>
+    </BlendEmbeddedFont>
+    <Resource Include="ZeroTierIcon.ico" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Expression\Blend\.NETFramework\v4.5\Microsoft.Expression.Blend.WPF.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/windows/WinUI/ZeroTierIcon.ico b/windows/WinUI/ZeroTierIcon.ico
new file mode 100644
index 000000000..2d190c474
Binary files /dev/null and b/windows/WinUI/ZeroTierIcon.ico differ
diff --git a/windows/WinUI/ZeroTierNetwork.cs b/windows/WinUI/ZeroTierNetwork.cs
new file mode 100644
index 000000000..cce654418
--- /dev/null
+++ b/windows/WinUI/ZeroTierNetwork.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace WinUI
+{
+    public class ZeroTierNetwork
+    {
+        [JsonProperty("nwid")]
+        public string NetworkId { get; set; }
+
+        [JsonProperty("mac")]
+        public string MacAddress { get; set; }
+
+        [JsonProperty("name")]
+        public string NetworkName { get; set; }
+
+        [JsonProperty("status")]
+        public string NetworkStatus { get; set; }
+
+        [JsonProperty("type")]
+        public string NetworkType { get; set; }
+
+        [JsonProperty("mtu")]
+        public int MTU { get; set; }
+
+        [JsonProperty("dhcp")]
+        public bool DHCP { get; set; }
+
+        [JsonProperty("bridge")]
+        public bool Bridge { get; set ; }
+
+        [JsonProperty("broadcastEnabled")]
+        public bool BroadcastEnabled { get ; set; }
+
+        [JsonProperty("portError")]
+        public int PortError { get; set; }
+
+        [JsonProperty("netconfRevision")]
+        public int NetconfRevision { get; set; }
+
+        [JsonProperty("multicastSubscriptions")]
+        public string[] MulticastSubscriptions { get; set; }
+
+        [JsonProperty("assignedAddresses")]
+        public string[] AssignedAddresses { get; set; }
+
+        [JsonProperty("portDeviceName")]
+        public string DeviceName { get; set; }
+    }
+}
diff --git a/windows/WinUI/ZeroTierPeer.cs b/windows/WinUI/ZeroTierPeer.cs
new file mode 100644
index 000000000..1597cf2dc
--- /dev/null
+++ b/windows/WinUI/ZeroTierPeer.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace WinUI
+{
+    public class ZeroTierPeer : IEquatable<ZeroTierPeer>
+    {
+        [JsonProperty("address")]
+        public string Address { get; set; }
+
+        private Int64 _lastUnicast;
+        [JsonProperty("lastUnicastFrame")]
+        public Int64 LastUnicastFrame
+        {
+            get
+            {
+                if (_lastUnicast == 0)
+                    return 0;
+
+                TimeSpan t = DateTime.UtcNow - new DateTime(1970, 1, 1);
+                Int64 millisecondsSinceEpoch = (Int64)t.TotalMilliseconds;
+                return (millisecondsSinceEpoch - _lastUnicast) / 1000;
+            }
+            set
+            {
+                _lastUnicast = value;
+            }
+        }
+
+        private Int64 _lastMulticast;
+        [JsonProperty("lastMulticastFrame")]
+        public Int64 LastMulticastFrame 
+        {
+            get
+            {
+                if (_lastMulticast == 0)
+                    return 0;
+
+                TimeSpan t = DateTime.UtcNow - new DateTime(1970, 1, 1);
+                Int64 millisecondsSinceEpoch = (Int64)t.TotalMilliseconds;
+                return (millisecondsSinceEpoch - _lastMulticast) / 1000;
+            }
+            set
+            {
+                _lastMulticast = value;
+            }
+        }
+
+        [JsonProperty("versionMajor")]
+        public int VersionMajor { get; set; }
+
+        [JsonProperty("versionMinor")]
+        public int VersionMinor { get; set; }
+
+        [JsonProperty("versionRev")]
+        public int VersionRev { get; set; }
+
+        [JsonProperty("version")]
+        public string Version { get; set; }
+
+        public string VersionString
+        {
+            get
+            {
+                if (Version == "-1.-1.-1")
+                    return "-";
+                else
+                    return Version;
+            }
+        }
+
+        [JsonProperty("latency")]
+        public string Latency { get; set; }
+
+        [JsonProperty("role")]
+        public string Role { get; set; }
+
+        [JsonProperty("paths")]
+        public List<ZeroTierPeerPhysicalPath> Paths { get; set; }
+
+        public string DataPaths
+        {
+            get
+            {
+                string pathStr = "";
+                foreach(ZeroTierPeerPhysicalPath path in Paths)
+                {
+                    pathStr += path.Address + "\n";
+                }
+                return pathStr;
+            }
+        }
+
+        public bool Equals(ZeroTierPeer other)
+        {
+            return this.Address.Equals(other.Address, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        public void Update(ZeroTierPeer other)
+        {
+            _lastUnicast = other._lastUnicast;
+            _lastMulticast = other._lastMulticast;
+            VersionMajor = other.VersionMajor;
+            VersionMinor = other.VersionMinor;
+            VersionRev = other.VersionRev;
+            Version = other.Version;
+            Latency = other.Latency;
+            Role = other.Role;
+            Paths = other.Paths;
+        }
+    }
+}
diff --git a/windows/WinUI/ZeroTierPeerPhysicalPath.cs b/windows/WinUI/ZeroTierPeerPhysicalPath.cs
new file mode 100644
index 000000000..3eaa80266
--- /dev/null
+++ b/windows/WinUI/ZeroTierPeerPhysicalPath.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace WinUI
+{
+    public class ZeroTierPeerPhysicalPath
+    {
+        [JsonProperty("address")]
+        public string Address { get; set; }
+
+        [JsonProperty("lastSend")]
+        public UInt64 LastSend { get; set; }
+
+        [JsonProperty("lastReceive")]
+        public UInt64 LastReceive { get; set; }
+
+        [JsonProperty("fixed")]
+        public bool Fixed { get; set; }
+
+        [JsonProperty("preferred")]
+        public bool Preferred { get; set; }
+    }
+}
diff --git a/windows/WinUI/ZeroTierStatus.cs b/windows/WinUI/ZeroTierStatus.cs
new file mode 100644
index 000000000..2851d0178
--- /dev/null
+++ b/windows/WinUI/ZeroTierStatus.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace WinUI
+{
+    public class ZeroTierStatus
+    {
+        [JsonProperty("address")]
+        public string Address { get; set; }
+
+        [JsonProperty("publicIdentity")]
+        public string PublicIdentity { get; set; }
+
+        [JsonProperty("online")]
+        public bool Online { get; set; }
+
+        [JsonProperty("tcpFallbackActive")]
+        public bool TcpFallbackActive { get; set; }
+
+        [JsonProperty("versionMajor")]
+        public int VersionMajor { get; set; }
+
+        [JsonProperty("versionMinor")]
+        public int VersionMinor { get; set; }
+
+        [JsonProperty("versionRev")]
+        public int VersionRev { get; set; }
+
+        [JsonProperty("version")]
+        public string Version { get; set; }
+
+        [JsonProperty("clock")]
+        public UInt64 Clock { get; set; }
+    }
+}
diff --git a/windows/WinUI/app.manifest b/windows/WinUI/app.manifest
new file mode 100644
index 000000000..b537bf491
--- /dev/null
+++ b/windows/WinUI/app.manifest
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel node will disable file and registry virtualization.
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. 
+      Windows will automatically select the most compatible environment.-->
+
+      <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>-->
+
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
+
+      <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->
+
+    </application>
+  </compatibility>
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!-- <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>-->
+
+</asmv1:assembly>
diff --git a/windows/WinUI/packages.config b/windows/WinUI/packages.config
new file mode 100644
index 000000000..505e58836
--- /dev/null
+++ b/windows/WinUI/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/windows/ZeroTierOne.sln b/windows/ZeroTierOne.sln
index 17bae2645..68596187a 100644
--- a/windows/ZeroTierOne.sln
+++ b/windows/ZeroTierOne.sln
@@ -1,133 +1,421 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.9.34622.214
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{175C340F-F5BA-4CB1-88AD-533B102E3799} = {175C340F-F5BA-4CB1-88AD-533B102E3799}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver6", "TapDriver6\TapDriver6.vcxproj", "{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zeroidc", "..\rustybits\zeroidc.vcxproj", "{175C340F-F5BA-4CB1-88AD-533B102E3799}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|ARM64 = Debug|ARM64
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Profile|Any CPU = Profile|Any CPU
-		Profile|ARM = Profile|ARM
-		Profile|ARM64 = Profile|ARM64
-		Profile|Mixed Platforms = Profile|Mixed Platforms
-		Profile|Win32 = Profile|Win32
-		Profile|x64 = Profile|x64
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|ARM64 = Release|ARM64
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|ARM.ActiveCfg = Debug|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Mixed Platforms.Deploy.0 = Debug|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Win32.Build.0 = Debug|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Win32.Deploy.0 = Debug|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|x64.ActiveCfg = Debug|x64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|x64.Build.0 = Debug|x64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|Any CPU.ActiveCfg = Profile|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|ARM.ActiveCfg = Profile|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|ARM64.ActiveCfg = Profile|ARM64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|Mixed Platforms.ActiveCfg = Profile|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|Mixed Platforms.Build.0 = Profile|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|Win32.ActiveCfg = Profile|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|Win32.Build.0 = Profile|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|x64.ActiveCfg = Profile|x64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Profile|x64.Build.0 = Profile|x64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Any CPU.ActiveCfg = Release|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|ARM.ActiveCfg = Release|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|ARM64.Build.0 = Release|ARM64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Mixed Platforms.Deploy.0 = Release|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Win32.ActiveCfg = Release|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Win32.Build.0 = Release|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Win32.Deploy.0 = Release|Win32
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|x64.ActiveCfg = Release|x64
-		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|x64.Build.0 = Release|x64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Any CPU.ActiveCfg = Win8 Debug|ARM64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|ARM.ActiveCfg = Win8 Debug|ARM64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|ARM64.ActiveCfg = Win8 Debug|ARM64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Mixed Platforms.ActiveCfg = Win8 Debug|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Win32.ActiveCfg = Win8 Debug|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|x64.ActiveCfg = Win8 Debug|x64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Profile|Any CPU.ActiveCfg = Win8 Debug|x64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Profile|ARM.ActiveCfg = Win8 Debug|ARM64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Profile|ARM64.ActiveCfg = Win8 Debug|ARM64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Profile|Mixed Platforms.ActiveCfg = Win8 Debug|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Profile|Win32.ActiveCfg = Win8 Debug|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Profile|x64.ActiveCfg = Win8 Debug|x64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Any CPU.ActiveCfg = Win8 Release|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|ARM.ActiveCfg = Win8 Debug|ARM64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|ARM64.ActiveCfg = Win8 Release|ARM64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Mixed Platforms.ActiveCfg = Win8 Release|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Mixed Platforms.Build.0 = Win8 Release|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Mixed Platforms.Deploy.0 = Win8 Release|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Win32.ActiveCfg = Win8 Release|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Win32.Build.0 = Win8 Release|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Win32.Deploy.0 = Win8 Release|Win32
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x64.ActiveCfg = Win8 Release|x64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x64.Build.0 = Win8 Release|x64
-		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x64.Deploy.0 = Win8 Release|x64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|ARM.ActiveCfg = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|ARM64.Build.0 = Debug|ARM64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|Win32.ActiveCfg = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|Win32.Build.0 = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|x64.ActiveCfg = Debug|x64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Debug|x64.Build.0 = Debug|x64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|Any CPU.ActiveCfg = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|Any CPU.Build.0 = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|ARM.ActiveCfg = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|ARM.Build.0 = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|ARM64.ActiveCfg = Debug|ARM64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|ARM64.Build.0 = Debug|ARM64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|Mixed Platforms.ActiveCfg = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|Mixed Platforms.Build.0 = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|Win32.ActiveCfg = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|Win32.Build.0 = Debug|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|x64.ActiveCfg = Debug|x64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Profile|x64.Build.0 = Debug|x64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|Any CPU.ActiveCfg = Release|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|ARM.ActiveCfg = Release|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|ARM64.ActiveCfg = Release|ARM64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|ARM64.Build.0 = Release|ARM64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|Win32.ActiveCfg = Release|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|Win32.Build.0 = Release|Win32
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|x64.ActiveCfg = Release|x64
-		{175C340F-F5BA-4CB1-88AD-533B102E3799}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AD00A172-C020-4874-B00A-C396AAC893FC}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver6", "TapDriver6\TapDriver6.vcxproj", "{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI", "WinUI\WinUI.csproj", "{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		CD_ROM|Any CPU = CD_ROM|Any CPU
+		CD_ROM|Mixed Platforms = CD_ROM|Mixed Platforms
+		CD_ROM|Win32 = CD_ROM|Win32
+		CD_ROM|x64 = CD_ROM|x64
+		CD_ROM|x86 = CD_ROM|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		DVD-5|Any CPU = DVD-5|Any CPU
+		DVD-5|Mixed Platforms = DVD-5|Mixed Platforms
+		DVD-5|Win32 = DVD-5|Win32
+		DVD-5|x64 = DVD-5|x64
+		DVD-5|x86 = DVD-5|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		SingleImage|Any CPU = SingleImage|Any CPU
+		SingleImage|Mixed Platforms = SingleImage|Mixed Platforms
+		SingleImage|Win32 = SingleImage|Win32
+		SingleImage|x64 = SingleImage|x64
+		SingleImage|x86 = SingleImage|x86
+		Vista Debug|Any CPU = Vista Debug|Any CPU
+		Vista Debug|Mixed Platforms = Vista Debug|Mixed Platforms
+		Vista Debug|Win32 = Vista Debug|Win32
+		Vista Debug|x64 = Vista Debug|x64
+		Vista Debug|x86 = Vista Debug|x86
+		Vista Release|Any CPU = Vista Release|Any CPU
+		Vista Release|Mixed Platforms = Vista Release|Mixed Platforms
+		Vista Release|Win32 = Vista Release|Win32
+		Vista Release|x64 = Vista Release|x64
+		Vista Release|x86 = Vista Release|x86
+		Win7 Debug|Any CPU = Win7 Debug|Any CPU
+		Win7 Debug|Mixed Platforms = Win7 Debug|Mixed Platforms
+		Win7 Debug|Win32 = Win7 Debug|Win32
+		Win7 Debug|x64 = Win7 Debug|x64
+		Win7 Debug|x86 = Win7 Debug|x86
+		Win7 Release|Any CPU = Win7 Release|Any CPU
+		Win7 Release|Mixed Platforms = Win7 Release|Mixed Platforms
+		Win7 Release|Win32 = Win7 Release|Win32
+		Win7 Release|x64 = Win7 Release|x64
+		Win7 Release|x86 = Win7 Release|x86
+		Win8 Debug|Any CPU = Win8 Debug|Any CPU
+		Win8 Debug|Mixed Platforms = Win8 Debug|Mixed Platforms
+		Win8 Debug|Win32 = Win8 Debug|Win32
+		Win8 Debug|x64 = Win8 Debug|x64
+		Win8 Debug|x86 = Win8 Debug|x86
+		Win8 Release|Any CPU = Win8 Release|Any CPU
+		Win8 Release|Mixed Platforms = Win8 Release|Mixed Platforms
+		Win8 Release|Win32 = Win8 Release|Win32
+		Win8 Release|x64 = Win8 Release|x64
+		Win8 Release|x86 = Win8 Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|Any CPU.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|Mixed Platforms.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|Mixed Platforms.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|Win32.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|Win32.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|Win32.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|x64.ActiveCfg = Release|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|x64.Build.0 = Release|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|x64.Deploy.0 = Release|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|x86.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|x86.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.CD_ROM|x86.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Mixed Platforms.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Win32.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|Win32.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|x64.ActiveCfg = Debug|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|x64.Build.0 = Debug|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|x86.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|x86.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Debug|x86.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|Any CPU.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|Mixed Platforms.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|Mixed Platforms.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|Win32.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|Win32.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|Win32.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|x64.ActiveCfg = Debug|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|x64.Build.0 = Debug|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|x64.Deploy.0 = Debug|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|x86.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|x86.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.DVD-5|x86.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Any CPU.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Mixed Platforms.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Win32.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Win32.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|Win32.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|x64.ActiveCfg = Release|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|x86.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|x86.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Release|x86.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|Any CPU.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|Mixed Platforms.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|Mixed Platforms.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|Mixed Platforms.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|Win32.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|Win32.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|Win32.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|x64.ActiveCfg = Release|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|x64.Build.0 = Release|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|x64.Deploy.0 = Release|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|x86.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|x86.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.SingleImage|x86.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|Any CPU.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|Mixed Platforms.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|Win32.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|Win32.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|Win32.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|x64.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|x86.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|x86.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Debug|x86.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|Any CPU.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|Mixed Platforms.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|Mixed Platforms.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|Win32.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|Win32.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|Win32.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|x64.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|x86.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|x86.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Vista Release|x86.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|Any CPU.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|Mixed Platforms.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|Win32.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|Win32.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|Win32.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|x64.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|x86.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|x86.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Debug|x86.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|Any CPU.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|Mixed Platforms.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|Mixed Platforms.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|Win32.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|Win32.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|Win32.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|x64.ActiveCfg = Release|x64
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|x86.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|x86.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win7 Release|x86.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|Any CPU.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|Mixed Platforms.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|Win32.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|Win32.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|Win32.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|x64.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|x86.ActiveCfg = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|x86.Build.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Debug|x86.Deploy.0 = Debug|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Any CPU.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Mixed Platforms.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Mixed Platforms.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Win32.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Win32.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|Win32.Deploy.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|x64.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|x86.ActiveCfg = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|x86.Build.0 = Release|Win32
+		{B00A4957-5977-4AC1-9EF4-571DC27EADA2}.Win8 Release|x86.Deploy.0 = Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|Any CPU.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|Mixed Platforms.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|Mixed Platforms.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|Mixed Platforms.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|Win32.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|Win32.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|Win32.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|x64.ActiveCfg = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|x64.Build.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|x64.Deploy.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|x86.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|x86.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.CD_ROM|x86.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Any CPU.ActiveCfg = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Mixed Platforms.ActiveCfg = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Mixed Platforms.Build.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Mixed Platforms.Deploy.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Win32.ActiveCfg = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Win32.Build.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|Win32.Deploy.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|x64.ActiveCfg = Win7 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|x64.Build.0 = Win7 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|x64.Deploy.0 = Win7 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|x86.ActiveCfg = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|x86.Build.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Debug|x86.Deploy.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|Any CPU.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|Mixed Platforms.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|Mixed Platforms.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|Mixed Platforms.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|Win32.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|Win32.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|Win32.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|x64.ActiveCfg = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|x64.Build.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|x64.Deploy.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|x86.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|x86.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.DVD-5|x86.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Any CPU.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Mixed Platforms.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Mixed Platforms.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Mixed Platforms.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Win32.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Win32.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|Win32.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x64.ActiveCfg = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x64.Build.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x64.Deploy.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x86.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x86.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Release|x86.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|Any CPU.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|Mixed Platforms.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|Mixed Platforms.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|Mixed Platforms.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|Win32.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|Win32.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|Win32.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|x64.ActiveCfg = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|x64.Build.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|x64.Deploy.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|x86.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|x86.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.SingleImage|x86.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|Any CPU.ActiveCfg = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|Mixed Platforms.ActiveCfg = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|Mixed Platforms.Build.0 = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|Mixed Platforms.Deploy.0 = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|Win32.ActiveCfg = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|Win32.Build.0 = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|Win32.Deploy.0 = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|x64.ActiveCfg = Vista Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|x64.Build.0 = Vista Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|x64.Deploy.0 = Vista Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|x86.ActiveCfg = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|x86.Build.0 = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Debug|x86.Deploy.0 = Vista Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|Any CPU.ActiveCfg = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|Mixed Platforms.ActiveCfg = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|Mixed Platforms.Build.0 = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|Mixed Platforms.Deploy.0 = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|Win32.ActiveCfg = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|Win32.Build.0 = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|Win32.Deploy.0 = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|x64.ActiveCfg = Vista Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|x64.Build.0 = Vista Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|x64.Deploy.0 = Vista Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|x86.ActiveCfg = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|x86.Build.0 = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Vista Release|x86.Deploy.0 = Vista Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|Any CPU.ActiveCfg = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|Mixed Platforms.ActiveCfg = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|Mixed Platforms.Build.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|Mixed Platforms.Deploy.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|Win32.ActiveCfg = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|Win32.Build.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|Win32.Deploy.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|x64.ActiveCfg = Win7 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|x64.Build.0 = Win7 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|x64.Deploy.0 = Win7 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|x86.ActiveCfg = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|x86.Build.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Debug|x86.Deploy.0 = Win7 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|Any CPU.ActiveCfg = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|Mixed Platforms.ActiveCfg = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|Mixed Platforms.Build.0 = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|Mixed Platforms.Deploy.0 = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|Win32.ActiveCfg = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|Win32.Build.0 = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|Win32.Deploy.0 = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|x64.ActiveCfg = Win7 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|x64.Build.0 = Win7 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|x64.Deploy.0 = Win7 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|x86.ActiveCfg = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|x86.Build.0 = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win7 Release|x86.Deploy.0 = Win7 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|Any CPU.ActiveCfg = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|Mixed Platforms.ActiveCfg = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|Mixed Platforms.Build.0 = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|Mixed Platforms.Deploy.0 = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|Win32.ActiveCfg = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|Win32.Build.0 = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|Win32.Deploy.0 = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|x64.ActiveCfg = Win8 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|x64.Build.0 = Win8 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|x64.Deploy.0 = Win8 Debug|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|x86.ActiveCfg = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|x86.Build.0 = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Debug|x86.Deploy.0 = Win8 Debug|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|Any CPU.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|Mixed Platforms.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|Mixed Platforms.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|Mixed Platforms.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|Win32.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|Win32.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|Win32.Deploy.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.ActiveCfg = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.Build.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x64.Deploy.0 = Win8 Release|x64
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x86.ActiveCfg = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x86.Build.0 = Win8 Release|Win32
+		{43BA7584-D4DB-4F7C-90FC-E2B18A68A213}.Win8 Release|x86.Deploy.0 = Win8 Release|Win32
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Mixed Platforms.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|Win32.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|x64.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.CD_ROM|x86.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|Win32.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|x64.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.DVD-5|x86.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|Win32.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|x64.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Any CPU.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|Win32.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|x64.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.SingleImage|x86.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|Win32.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Any CPU.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|Win32.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|x64.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Vista Release|x86.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|Win32.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Any CPU.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|Win32.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|x64.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win7 Release|x86.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|Win32.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Any CPU.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|Win32.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|x64.ActiveCfg = Release|Any CPU
+		{4CCA6B98-5E64-45BF-AC34-19B3E2570DB1}.Win8 Release|x86.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/windows/ZeroTierOne/ServiceBase.h b/windows/ZeroTierOne/ServiceBase.h
index cb276ff10..6d62b1f81 100644
--- a/windows/ZeroTierOne/ServiceBase.h
+++ b/windows/ZeroTierOne/ServiceBase.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <winsock2.h>
+#include <WinSock2.h>
 #include <windows.h>
 
 class CServiceBase
diff --git a/windows/ZeroTierOne/ServiceInstaller.cpp b/windows/ZeroTierOne/ServiceInstaller.cpp
index 39a0519f8..d302d9f62 100644
--- a/windows/ZeroTierOne/ServiceInstaller.cpp
+++ b/windows/ZeroTierOne/ServiceInstaller.cpp
@@ -49,34 +49,26 @@ std::string InstallService(PSTR pszServiceName,
                     PSTR pszAccount, 
                     PSTR pszPassword)
 {
-    std::string ret;
-    std::string path(0x7FFF, '\0');
-
+	std::string ret;
+    char szPathTmp[MAX_PATH],szPath[MAX_PATH];
     SC_HANDLE schSCManager = NULL;
     SC_HANDLE schService = NULL;
-    SERVICE_DESCRIPTION sd;
-    LPTSTR szDesc = TEXT("ZeroTier network virtualization service.");
 
-    DWORD dwCharacters = GetModuleFileName(NULL, path.data(), path.size());
-
-    if (dwCharacters == 0)
+    if (GetModuleFileName(NULL, szPathTmp, ARRAYSIZE(szPath)) == 0)
     {
-        ret = "GetModuleFileName failed, unable to get path to self";
+		ret = "GetModuleFileName failed, unable to get path to self";
         goto Cleanup;
     }
 
-    // Trim excess nulls which the returned size does not include
-    path.resize(dwCharacters);
-
-    // Quote path in case it contains spaces
-    path = '"' + path + '"';
+	// Quote path in case it contains spaces
+	_snprintf_s(szPath,sizeof(szPath),"\"%s\"",szPathTmp);
 
     // Open the local default service control manager database
     schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT | 
         SC_MANAGER_CREATE_SERVICE);
     if (schSCManager == NULL)
     {
-        ret = "OpenSCManager failed";
+		ret = "OpenSCManager failed";
         goto Cleanup;
     }
 
@@ -85,11 +77,11 @@ std::string InstallService(PSTR pszServiceName,
         schSCManager,                   // SCManager database
         pszServiceName,                 // Name of service
         pszDisplayName,                 // Name to display
-        SERVICE_ALL_ACCESS,             // Desired access
+        SERVICE_QUERY_STATUS,           // Desired access
         SERVICE_WIN32_OWN_PROCESS,      // Service type
         dwStartType,                    // Service start type
         SERVICE_ERROR_NORMAL,           // Error control type
-        path.c_str(),                   // Service's binary
+        szPath,                         // Service's binary
         NULL,                           // No load ordering group
         NULL,                           // No tag identifier
         pszDependencies,                // Dependencies
@@ -98,13 +90,10 @@ std::string InstallService(PSTR pszServiceName,
         );
     if (schService == NULL)
     {
-        ret = "CreateService failed";
+		ret = "CreateService failed";
         goto Cleanup;
     }
 
-    // Setup service description
-    sd.lpDescription = szDesc;
-    ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &sd);
 Cleanup:
     // Centralized cleanup for all allocated resources.
     if (schSCManager)
@@ -118,7 +107,7 @@ Cleanup:
         schService = NULL;
     }
 
-    return ret;
+	return ret;
 }
 
 
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index fcf3e012a..ca9103727 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@@ -1,653 +1,328 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|ARM64">
-      <Configuration>Profile</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|Win32">
-      <Configuration>Profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|x64">
-      <Configuration>Profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\controller\DB.cpp" />
-    <ClCompile Include="..\..\controller\DBMirrorSet.cpp" />
-    <ClCompile Include="..\..\controller\EmbeddedNetworkController.cpp" />
-    <ClCompile Include="..\..\controller\FileDB.cpp" />
-    <ClCompile Include="..\..\controller\LFDB.cpp" />
-    <ClCompile Include="..\..\controller\PostgreSQL.cpp" />
-    <ClCompile Include="..\..\ext\http-parser\http_parser.c" />
-    <ClCompile Include="..\..\ext\libnatpmp\getgateway.c" />
-    <ClCompile Include="..\..\ext\libnatpmp\natpmp.c" />
-    <ClCompile Include="..\..\ext\libnatpmp\wingettimeofday.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\connecthostport.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\igd_desc_parse.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\minisoap.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\minissdpc.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\miniupnpc.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\miniwget.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\minixml.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\portlistingparse.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\receivedata.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\upnpcommands.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\upnpdev.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\upnperrors.c" />
-    <ClCompile Include="..\..\ext\miniupnpc\upnpreplyparse.c" />
-    <ClCompile Include="..\..\node\AES.cpp" />
-    <ClCompile Include="..\..\node\AES_aesni.cpp" />
-    <ClCompile Include="..\..\node\AES_armcrypto.cpp" />
-    <ClCompile Include="..\..\node\Bond.cpp" />
-    <ClCompile Include="..\..\node\Capability.cpp" />
-    <ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
-    <ClCompile Include="..\..\node\CertificateOfOwnership.cpp" />
-    <ClCompile Include="..\..\node\ECC.cpp" />
-    <ClCompile Include="..\..\node\Identity.cpp" />
-    <ClCompile Include="..\..\node\IncomingPacket.cpp" />
-    <ClCompile Include="..\..\node\InetAddress.cpp" />
-    <ClCompile Include="..\..\node\Membership.cpp" />
-    <ClCompile Include="..\..\node\Metrics.cpp" />
-    <ClCompile Include="..\..\node\Multicaster.cpp" />
-    <ClCompile Include="..\..\node\Network.cpp" />
-    <ClCompile Include="..\..\node\NetworkConfig.cpp" />
-    <ClCompile Include="..\..\node\Node.cpp" />
-    <ClCompile Include="..\..\node\OutboundMulticast.cpp" />
-    <ClCompile Include="..\..\node\Packet.cpp" />
-    <ClCompile Include="..\..\node\PacketMultiplexer.cpp" />
-    <ClCompile Include="..\..\node\Path.cpp" />
-    <ClCompile Include="..\..\node\Peer.cpp" />
-    <ClCompile Include="..\..\node\Poly1305.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">MaxSpeed</Optimization>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Default</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Default</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Default</BasicRuntimeChecks>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Revocation.cpp" />
-    <ClCompile Include="..\..\node\Salsa20.cpp" />
-    <ClCompile Include="..\..\node\SelfAwareness.cpp" />
-    <ClCompile Include="..\..\node\SHA512.cpp" />
-    <ClCompile Include="..\..\node\Switch.cpp" />
-    <ClCompile Include="..\..\node\Tag.cpp" />
-    <ClCompile Include="..\..\node\Topology.cpp" />
-    <ClCompile Include="..\..\node\Trace.cpp" />
-    <ClCompile Include="..\..\node\Utils.cpp" />
-    <ClCompile Include="..\..\one.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|ARM64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\EthernetTap.cpp" />
-    <ClCompile Include="..\..\osdep\Http.cpp" />
-    <ClCompile Include="..\..\osdep\ManagedRoute.cpp" />
-    <ClCompile Include="..\..\osdep\OSUtils.cpp" />
-    <ClCompile Include="..\..\osdep\PortMapper.cpp" />
-    <ClCompile Include="..\..\osdep\WinDNSHelper.cpp" />
-    <ClCompile Include="..\..\osdep\WindowsEthernetTap.cpp" />
-    <ClCompile Include="..\..\osdep\WinFWHelper.cpp" />
-    <ClCompile Include="..\..\selftest.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|ARM64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\service\OneService.cpp" />
-    <ClCompile Include="..\..\service\SoftwareUpdater.cpp" />
-    <ClCompile Include="ServiceBase.cpp" />
-    <ClCompile Include="ServiceInstaller.cpp" />
-    <ClCompile Include="ZeroTierOneService.cpp">
-      <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</FunctionLevelLinking>
-      <EnableParallelCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EnableParallelCodeGeneration>
-      <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</FunctionLevelLinking>
-      <FunctionLevelLinking Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</FunctionLevelLinking>
-      <EnableParallelCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EnableParallelCodeGeneration>
-      <EnableParallelCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</EnableParallelCodeGeneration>
-      <EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NoExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointExceptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</FloatingPointExceptions>
-      <CreateHotpatchableImage Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CreateHotpatchableImage>
-      <FloatingPointExceptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</FloatingPointExceptions>
-      <FloatingPointExceptions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</FloatingPointExceptions>
-      <CreateHotpatchableImage Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CreateHotpatchableImage>
-      <CreateHotpatchableImage Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</CreateHotpatchableImage>
-      <EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NoExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\controller\DB.hpp" />
-    <ClInclude Include="..\..\controller\DBMirrorSet.hpp" />
-    <ClInclude Include="..\..\controller\EmbeddedNetworkController.hpp" />
-    <ClInclude Include="..\..\controller\FileDB.hpp" />
-    <ClInclude Include="..\..\controller\LFDB.hpp" />
-    <ClInclude Include="..\..\controller\PostgreSQL.hpp" />
-    <ClInclude Include="..\..\controller\Redis.hpp" />
-    <ClInclude Include="..\..\ext\cpp-httplib\httplib.h" />
-    <ClInclude Include="..\..\ext\http-parser\http_parser.h" />
-    <ClInclude Include="..\..\ext\json\json.hpp" />
-    <ClInclude Include="..\..\ext\libnatpmp\getgateway.h" />
-    <ClInclude Include="..\..\ext\libnatpmp\natpmp.h" />
-    <ClInclude Include="..\..\ext\libnatpmp\wingettimeofday.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\codelength.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\connecthostport.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\igd_desc_parse.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\minisoap.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\minissdpc.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\miniupnpc.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\miniupnpctypes.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\miniupnpc_declspec.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\miniwget.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\minixml.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\portlistingparse.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\receivedata.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\upnpcommands.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\upnpdev.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\upnperrors.h" />
-    <ClInclude Include="..\..\ext\miniupnpc\upnpreplyparse.h" />
-    <ClInclude Include="..\..\ext\x64-salsa2012-asm\salsa2012.h" />
-    <ClInclude Include="..\..\include\ZeroTierOne.h" />
-    <ClInclude Include="..\..\node\Address.hpp" />
-    <ClInclude Include="..\..\node\AtomicCounter.hpp" />
-    <ClInclude Include="..\..\node\Bond.hpp" />
-    <ClInclude Include="..\..\node\BondController.hpp" />
-    <ClInclude Include="..\..\node\Buffer.hpp" />
-    <ClInclude Include="..\..\node\ECC.hpp" />
-    <ClInclude Include="..\..\node\CertificateOfMembership.hpp" />
-    <ClInclude Include="..\..\node\CertificateOfOwnership.hpp" />
-    <ClInclude Include="..\..\node\Constants.hpp" />
-    <ClInclude Include="..\..\node\Credential.hpp" />
-    <ClInclude Include="..\..\node\Dictionary.hpp" />
-    <ClInclude Include="..\..\node\Hashtable.hpp" />
-    <ClInclude Include="..\..\node\Identity.hpp" />
-    <ClInclude Include="..\..\node\IncomingPacket.hpp" />
-    <ClInclude Include="..\..\node\InetAddress.hpp" />
-    <ClInclude Include="..\..\node\MAC.hpp" />
-    <ClInclude Include="..\..\node\Membership.hpp" />
-    <ClInclude Include="..\..\node\Metrics.hpp" />
-    <ClInclude Include="..\..\node\Multicaster.hpp" />
-    <ClInclude Include="..\..\node\MulticastGroup.hpp" />
-    <ClInclude Include="..\..\node\Mutex.hpp" />
-    <ClInclude Include="..\..\node\Network.hpp" />
-    <ClInclude Include="..\..\node\NetworkConfig.hpp" />
-    <ClInclude Include="..\..\node\NetworkController.hpp" />
-    <ClInclude Include="..\..\node\Node.hpp" />
-    <ClInclude Include="..\..\node\OutboundMulticast.hpp" />
-    <ClInclude Include="..\..\node\Packet.hpp" />
-    <ClInclude Include="..\..\node\Path.hpp" />
-    <ClInclude Include="..\..\node\Peer.hpp" />
-    <ClInclude Include="..\..\node\Poly1305.hpp" />
-    <ClInclude Include="..\..\node\RuntimeEnvironment.hpp" />
-    <ClInclude Include="..\..\node\Salsa20.hpp" />
-    <ClInclude Include="..\..\node\SelfAwareness.hpp" />
-    <ClInclude Include="..\..\node\SHA512.hpp" />
-    <ClInclude Include="..\..\node\SharedPtr.hpp" />
-    <ClInclude Include="..\..\node\Switch.hpp" />
-    <ClInclude Include="..\..\node\Topology.hpp" />
-    <ClInclude Include="..\..\node\Trace.hpp" />
-    <ClInclude Include="..\..\node\Utils.hpp" />
-    <ClInclude Include="..\..\node\World.hpp" />
-    <ClInclude Include="..\..\osdep\Binder.hpp" />
-    <ClInclude Include="..\..\osdep\EthernetTap.hpp" />
-    <ClInclude Include="..\..\osdep\Http.hpp" />
-    <ClInclude Include="..\..\osdep\ManagedRoute.hpp" />
-    <ClInclude Include="..\..\osdep\OSUtils.hpp" />
-    <ClInclude Include="..\..\osdep\Phy.hpp" />
-    <ClInclude Include="..\..\osdep\PortMapper.hpp" />
-    <ClInclude Include="..\..\osdep\Thread.hpp" />
-    <ClInclude Include="..\..\osdep\WinDNSHelper.hpp" />
-    <ClInclude Include="..\..\osdep\WindowsEthernetTap.hpp" />
-    <ClInclude Include="..\..\osdep\WinFWHelper.hpp" />
-    <ClInclude Include="..\..\service\OneService.hpp" />
-    <ClInclude Include="..\..\service\SoftwareUpdater.hpp" />
-    <ClInclude Include="..\..\version.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="ServiceBase.h" />
-    <ClInclude Include="ServiceInstaller.h" />
-    <ClInclude Include="ZeroTierOneService.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ZeroTierOne.rc" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B00A4957-5977-4AC1-9EF4-571DC27EADA2}</ProjectGuid>
-    <RootNamespace>ZeroTierOne</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>Static</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>Static</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>Static</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_x86</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_x86</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_x86</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_x64</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_arm64</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_x64</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|ARM64'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_arm64</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_x64</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <TargetExt>.exe</TargetExt>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>zerotier-one_arm64</TargetName>
-    <IntDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>${SolutionDir)\..\ext\opentelemetry-cpp-api-only;$(SolutionDir)\..\ext;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\core\include;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\simpleapi\include;$(SolutionDir)\..\rustybits\target;$(SolutionDir)\..\ext\opentelemetry-cpp-api-only\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_SSO_ENABLED=1;ZT_EXPORT;FD_SETSIZE=1024;NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;zeroidc.lib;bcrypt.lib;userenv.lib;crypt32.lib;secur32.lib;ncrypt.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalLibraryDirectories>$(SolutionDir)\..\rustybits\target\i686-pc-windows-msvc\debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\ext;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\core\include;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\simpleapi\include;$(SolutionDir)\..\rustybits\target;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_SSO_ENABLED=1;ZT_EXPORT;FD_SETSIZE=1024;NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>${SolutionDir)\..\ext\opentelemetry-cpp-api-only;$(SolutionDir)\..\ext;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\core\include;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\simpleapi\include;$(SolutionDir)\..\rustybits\target;$(SolutionDir)\..\ext\opentelemetry-cpp-api-only\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_SSO_ENABLED=1;ZT_EXPORT;FD_SETSIZE=1024;NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_RULES_ENGINE_DEBUGGING;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wbemuuid.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;zeroidc.lib;bcrypt.lib;userenv.lib;crypt32.lib;secur32.lib;ncrypt.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalOptions>"notelemetry.obj" %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\rustybits\target\x86_64-pc-windows-msvc\debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\ext;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\core\include;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\simpleapi\include;$(SolutionDir)\..\rustybits\target;$(SolutionDir)\..\ext\opentelemetry-cpp-api-only\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_EXPORT;FD_SETSIZE=1024;NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_RULES_ENGINE_DEBUGGING;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wbemuuid.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;zeroidc.lib;bcrypt.lib;userenv.lib;crypt32.lib;secur32.lib;ncrypt.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\rustybits\target\aarch64-pc-windows-msvc\debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\ext;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\core\include;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\simpleapi\include;$(SolutionDir)\..\rustybits\target;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_SSO_ENABLED=1;ZT_EXPORT;FD_SETSIZE=1024;NOMINMAX;STATICLIB;WIN32;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalOptions>"notelemetry.obj" %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|ARM64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\ext;$(SolutionDir)\..\rustybits\target;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_EXPORT;FD_SETSIZE=1024;NOMINMAX;STATICLIB;WIN32;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalOptions>"notelemetry.obj" %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level1</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\ext;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\core\include;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\simpleapi\include;$(SolutionDir)\..\rustybits\target;$(SolutionDir)\..\ext\opentelemetry-cpp-api-only\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_SSO_ENABLED=1;ZT_EXPORT;FD_SETSIZE=1024;STATICLIB;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;ZT_SOFTWARE_UPDATE_DEFAULT="apply";ZT_BUILD_PLATFORM=2;ZT_BUILD_ARCHITECTURE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <StringPooling>true</StringPooling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <CompileAsManaged>false</CompileAsManaged>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;zeroidc.lib;bcrypt.lib;userenv.lib;crypt32.lib;secur32.lib;ncrypt.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\rustybits\target\i686-pc-windows-msvc\release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level1</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\ext;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\core\include;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\simpleapi\include;$(SolutionDir)\..\rustybits\target;$(SolutionDir)\..\ext\opentelemetry-cpp-api-only\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_SSO_ENABLED=1;ZT_EXPORT;FD_SETSIZE=1024;STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="apply";ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;ZT_BUILD_PLATFORM=2;ZT_BUILD_ARCHITECTURE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <StringPooling>true</StringPooling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>
-      <CallingConvention>Cdecl</CallingConvention>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <CompileAsManaged>false</CompileAsManaged>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>wbemuuid.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;zeroidc.lib;bcrypt.lib;userenv.lib;crypt32.lib;secur32.lib;ncrypt.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\rustybits\target\x86_64-pc-windows-msvc\release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <ClCompile>
-      <WarningLevel>Level1</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\ext;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\core\include;$(SolutionDir)\..\ext\prometheus-cpp-lite-1.0\simpleapi\include;$(SolutionDir)\..\rustybits\target;$(SolutionDir)\..\ext\opentelemetry-cpp-api-only\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZT_SSO_ENABLED=1;ZT_EXPORT;FD_SETSIZE=1024;STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="apply";ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;ZT_BUILD_PLATFORM=2;ZT_BUILD_ARCHITECTURE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <StringPooling>true</StringPooling>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>
-      <CallingConvention>Cdecl</CallingConvention>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <CompileAsManaged>false</CompileAsManaged>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <CreateHotpatchableImage>false</CreateHotpatchableImage>
-      <GuardEHContMetadata>false</GuardEHContMetadata>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>wbemuuid.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;zeroidc.lib;bcrypt.lib;userenv.lib;crypt32.lib;secur32.lib;ncrypt.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\rustybits\target\aarch64-pc-windows-msvc\release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ext\http-parser\http_parser.c" />
+    <ClCompile Include="..\..\ext\json-parser\json.c" />
+    <ClCompile Include="..\..\ext\libnatpmp\getgateway.c" />
+    <ClCompile Include="..\..\ext\libnatpmp\natpmp.c" />
+    <ClCompile Include="..\..\ext\libnatpmp\wingettimeofday.c" />
+    <ClCompile Include="..\..\ext\lz4\lz4.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\connecthostport.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\igd_desc_parse.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\minisoap.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\minissdpc.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\miniupnpc.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\miniwget.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\minixml.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\portlistingparse.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\receivedata.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\upnpcommands.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\upnpdev.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\upnperrors.c" />
+    <ClCompile Include="..\..\ext\miniupnpc\upnpreplyparse.c" />
+    <ClCompile Include="..\..\node\C25519.cpp" />
+    <ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
+    <ClCompile Include="..\..\node\Cluster.cpp" />
+    <ClCompile Include="..\..\node\DeferredPackets.cpp" />
+    <ClCompile Include="..\..\node\Dictionary.cpp" />
+    <ClCompile Include="..\..\node\Identity.cpp" />
+    <ClCompile Include="..\..\node\IncomingPacket.cpp" />
+    <ClCompile Include="..\..\node\InetAddress.cpp" />
+    <ClCompile Include="..\..\node\Multicaster.cpp" />
+    <ClCompile Include="..\..\node\Network.cpp" />
+    <ClCompile Include="..\..\node\NetworkConfig.cpp" />
+    <ClCompile Include="..\..\node\Node.cpp" />
+    <ClCompile Include="..\..\node\OutboundMulticast.cpp" />
+    <ClCompile Include="..\..\node\Packet.cpp" />
+    <ClCompile Include="..\..\node\Path.cpp" />
+    <ClCompile Include="..\..\node\Peer.cpp" />
+    <ClCompile Include="..\..\node\Poly1305.cpp" />
+    <ClCompile Include="..\..\node\Salsa20.cpp" />
+    <ClCompile Include="..\..\node\SelfAwareness.cpp" />
+    <ClCompile Include="..\..\node\SHA512.cpp" />
+    <ClCompile Include="..\..\node\Switch.cpp" />
+    <ClCompile Include="..\..\node\Topology.cpp" />
+    <ClCompile Include="..\..\node\Utils.cpp" />
+    <ClCompile Include="..\..\one.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\osdep\BackgroundResolver.cpp" />
+    <ClCompile Include="..\..\osdep\Http.cpp" />
+    <ClCompile Include="..\..\osdep\OSUtils.cpp" />
+    <ClCompile Include="..\..\osdep\PortMapper.cpp" />
+    <ClCompile Include="..\..\osdep\WindowsEthernetTap.cpp" />
+    <ClCompile Include="..\..\service\ControlPlane.cpp" />
+    <ClCompile Include="..\..\service\OneService.cpp" />
+    <ClCompile Include="ServiceBase.cpp" />
+    <ClCompile Include="ServiceInstaller.cpp" />
+    <ClCompile Include="ZeroTierOneService.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\codelength.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\connecthostport.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\igd_desc_parse.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minisoap.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minissdpc.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpc.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpcstrings.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpctypes.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpc_declspec.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniwget.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minixml.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\portlistingparse.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\receivedata.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpcommands.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnperrors.h" />
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpreplyparse.h" />
+    <ClInclude Include="..\..\ext\http-parser\http_parser.h" />
+    <ClInclude Include="..\..\ext\json-parser\json.h" />
+    <ClInclude Include="..\..\ext\libnatpmp\getgateway.h" />
+    <ClInclude Include="..\..\ext\libnatpmp\natpmp.h" />
+    <ClInclude Include="..\..\ext\libnatpmp\wingettimeofday.h" />
+    <ClInclude Include="..\..\ext\lz4\lz4.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\codelength.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\connecthostport.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\igd_desc_parse.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\minisoap.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\minissdpc.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\miniupnpc.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\miniupnpctypes.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\miniupnpc_declspec.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\miniwget.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\minixml.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\portlistingparse.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\receivedata.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\upnpcommands.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\upnpdev.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\upnperrors.h" />
+    <ClInclude Include="..\..\ext\miniupnpc\upnpreplyparse.h" />
+    <ClInclude Include="..\..\include\ZeroTierOne.h" />
+    <ClInclude Include="..\..\node\Address.hpp" />
+    <ClInclude Include="..\..\node\Array.hpp" />
+    <ClInclude Include="..\..\node\AtomicCounter.hpp" />
+    <ClInclude Include="..\..\node\BandwidthAccount.hpp" />
+    <ClInclude Include="..\..\node\BinarySemaphore.hpp" />
+    <ClInclude Include="..\..\node\Buffer.hpp" />
+    <ClInclude Include="..\..\node\C25519.hpp" />
+    <ClInclude Include="..\..\node\CertificateOfMembership.hpp" />
+    <ClInclude Include="..\..\node\Cluster.hpp" />
+    <ClInclude Include="..\..\node\CMWC4096.hpp" />
+    <ClInclude Include="..\..\node\Constants.hpp" />
+    <ClInclude Include="..\..\node\DeferredPackets.hpp" />
+    <ClInclude Include="..\..\node\Dictionary.hpp" />
+    <ClInclude Include="..\..\node\Hashtable.hpp" />
+    <ClInclude Include="..\..\node\Identity.hpp" />
+    <ClInclude Include="..\..\node\IncomingPacket.hpp" />
+    <ClInclude Include="..\..\node\InetAddress.hpp" />
+    <ClInclude Include="..\..\node\MAC.hpp" />
+    <ClInclude Include="..\..\node\Multicaster.hpp" />
+    <ClInclude Include="..\..\node\MulticastGroup.hpp" />
+    <ClInclude Include="..\..\node\Mutex.hpp" />
+    <ClInclude Include="..\..\node\Network.hpp" />
+    <ClInclude Include="..\..\node\NetworkConfig.hpp" />
+    <ClInclude Include="..\..\node\NetworkController.hpp" />
+    <ClInclude Include="..\..\node\Node.hpp" />
+    <ClInclude Include="..\..\node\NonCopyable.hpp" />
+    <ClInclude Include="..\..\node\OutboundMulticast.hpp" />
+    <ClInclude Include="..\..\node\Packet.hpp" />
+    <ClInclude Include="..\..\node\Path.hpp" />
+    <ClInclude Include="..\..\node\Peer.hpp" />
+    <ClInclude Include="..\..\node\Poly1305.hpp" />
+    <ClInclude Include="..\..\node\RuntimeEnvironment.hpp" />
+    <ClInclude Include="..\..\node\Salsa20.hpp" />
+    <ClInclude Include="..\..\node\SelfAwareness.hpp" />
+    <ClInclude Include="..\..\node\SHA512.hpp" />
+    <ClInclude Include="..\..\node\SharedPtr.hpp" />
+    <ClInclude Include="..\..\node\Switch.hpp" />
+    <ClInclude Include="..\..\node\Topology.hpp" />
+    <ClInclude Include="..\..\node\Utils.hpp" />
+    <ClInclude Include="..\..\node\World.hpp" />
+    <ClInclude Include="..\..\osdep\BackgroundResolver.hpp" />
+    <ClInclude Include="..\..\osdep\Http.hpp" />
+    <ClInclude Include="..\..\osdep\OSUtils.hpp" />
+    <ClInclude Include="..\..\osdep\Phy.hpp" />
+    <ClInclude Include="..\..\osdep\PortMapper.hpp" />
+    <ClInclude Include="..\..\osdep\Thread.hpp" />
+    <ClInclude Include="..\..\osdep\WindowsEthernetTap.hpp" />
+    <ClInclude Include="..\..\service\ControlPlane.hpp" />
+    <ClInclude Include="..\..\service\ControlPlaneSubsystem.hpp" />
+    <ClInclude Include="..\..\service\OneService.hpp" />
+    <ClInclude Include="..\..\version.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="ServiceBase.h" />
+    <ClInclude Include="ServiceInstaller.h" />
+    <ClInclude Include="ZeroTierOneService.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ZeroTierOne.rc" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B00A4957-5977-4AC1-9EF4-571DC27EADA2}</ProjectGuid>
+    <RootNamespace>ZeroTierOne</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetExt>.exe</TargetExt>
+    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>zerotier-one_x86</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetExt>.exe</TargetExt>
+    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>zerotier-one_x86</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetExt>.exe</TargetExt>
+    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>zerotier-one_x64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetExt>.exe</TargetExt>
+    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>zerotier-one_x64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NOMINMAX;STATICLIB;WIN32;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>STATICLIB;ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <StringPooling>true</StringPooling>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>STATICLIB;ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <StringPooling>true</StringPooling>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>wsock32.lib;ws2_32.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
index 9f05b729a..ed1e941e7 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
@@ -1,575 +1,545 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\node">
-      <UniqueIdentifier>{67b1c0f8-b018-4169-9c14-7032ed12c786}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\include">
-      <UniqueIdentifier>{40761a4c-e8db-4a91-9cab-7afef332f4a8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\node">
-      <UniqueIdentifier>{da3b8126-840c-45db-8abe-9d7e7976f8be}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\osdep">
-      <UniqueIdentifier>{6054dfae-4ed2-4d69-8cf5-d6f27646f2d7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\service">
-      <UniqueIdentifier>{9944293a-4a1a-40e9-b92a-eff31fe87e2c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\osdep">
-      <UniqueIdentifier>{ca21bd6b-ff4e-4f9e-bedd-c9f603d2d0d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\service">
-      <UniqueIdentifier>{e1743b3c-1d18-47f1-ab5a-f5703c19f1df}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext">
-      <UniqueIdentifier>{71865460-d693-4c73-84f6-dbff42f49df6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\http-parser">
-      <UniqueIdentifier>{17ae9a01-d39f-4c6d-a800-8f2cd0804c96}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ext">
-      <UniqueIdentifier>{7784af31-5b60-4300-b07e-44cf864c54db}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ext\http-parser">
-      <UniqueIdentifier>{f8a1c208-15b8-4d85-a4cb-11d2b82f2d1e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\windows">
-      <UniqueIdentifier>{43f75f84-c70d-4d44-a0ef-28a7a399abd4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\windows\ZeroTierOne">
-      <UniqueIdentifier>{0da07a2f-8922-4827-ac51-29ca3f30f881}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\windows">
-      <UniqueIdentifier>{b74916eb-bb6c-4449-a2a2-fa0b17f60121}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\windows\ZeroTierOne">
-      <UniqueIdentifier>{bf604491-14c4-4a74-81a6-6105d07c5c7c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\miniupnpc">
-      <UniqueIdentifier>{5423fb64-896b-432e-a19d-88d4467f89f9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ext\miniupnpc">
-      <UniqueIdentifier>{56cc3ab8-3336-4a22-9471-c267ee46cd54}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\libnatpmp">
-      <UniqueIdentifier>{d7292d0d-72a0-4ed6-b717-21debb120737}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\ext\libnatpmp">
-      <UniqueIdentifier>{409ec37e-ff36-4c13-b18d-52d6052e0ca2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\controller">
-      <UniqueIdentifier>{3cad34c8-c436-43ae-8323-57803637c832}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\json">
-      <UniqueIdentifier>{ff20532b-d9a2-440d-a7b4-b49e26a9b2f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\x64-salsa2012-asm">
-      <UniqueIdentifier>{05d9cde8-03ae-4e37-b9f7-7417de98cbe9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\controller">
-      <UniqueIdentifier>{7dc22e9c-f869-41e7-b43d-f07f5b94f6fb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\cpp-httplib">
-      <UniqueIdentifier>{4dfde4c7-2950-40ee-92f2-05e0916d36c5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\service\OneService.cpp">
-      <Filter>Source Files\service</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\Http.cpp">
-      <Filter>Source Files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\OSUtils.cpp">
-      <Filter>Source Files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\CertificateOfMembership.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Identity.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\IncomingPacket.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\InetAddress.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Multicaster.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Network.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\NetworkConfig.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Node.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\OutboundMulticast.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Packet.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Peer.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Poly1305.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Salsa20.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\SelfAwareness.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\SHA512.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Switch.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Topology.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Utils.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\http-parser\http_parser.c">
-      <Filter>Source Files\ext\http-parser</Filter>
-    </ClCompile>
-    <ClCompile Include="ServiceBase.cpp">
-      <Filter>Source Files\windows\ZeroTierOne</Filter>
-    </ClCompile>
-    <ClCompile Include="ServiceInstaller.cpp">
-      <Filter>Source Files\windows\ZeroTierOne</Filter>
-    </ClCompile>
-    <ClCompile Include="ZeroTierOneService.cpp">
-      <Filter>Source Files\windows\ZeroTierOne</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Path.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\connecthostport.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\igd_desc_parse.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\minisoap.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\minissdpc.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\miniupnpc.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\miniwget.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\minixml.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\portlistingparse.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\receivedata.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\upnpcommands.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\upnpdev.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\upnperrors.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\miniupnpc\upnpreplyparse.c">
-      <Filter>Source Files\ext\miniupnpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\PortMapper.cpp">
-      <Filter>Source Files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\libnatpmp\getgateway.c">
-      <Filter>Source Files\ext\libnatpmp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\libnatpmp\natpmp.c">
-      <Filter>Source Files\ext\libnatpmp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\libnatpmp\wingettimeofday.c">
-      <Filter>Source Files\ext\libnatpmp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\ManagedRoute.cpp">
-      <Filter>Source Files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Membership.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Capability.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Revocation.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Tag.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\controller\EmbeddedNetworkController.cpp">
-      <Filter>Source Files\controller</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\service\SoftwareUpdater.cpp">
-      <Filter>Source Files\service</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\CertificateOfOwnership.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\one.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\selftest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Trace.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\controller\DB.cpp">
-      <Filter>Source Files\controller</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\controller\FileDB.cpp">
-      <Filter>Source Files\controller</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\controller\PostgreSQL.cpp">
-      <Filter>Source Files\controller</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\controller\LFDB.cpp">
-      <Filter>Source Files\controller</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\controller\DBMirrorSet.cpp">
-      <Filter>Source Files\controller</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\EthernetTap.cpp">
-      <Filter>Source Files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Bond.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\WinDNSHelper.cpp">
-      <Filter>Source Files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\WindowsEthernetTap.cpp">
-      <Filter>Source Files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\AES.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\AES_aesni.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\AES_armcrypto.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\osdep\WinFWHelper.cpp">
-      <Filter>Source Files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Metrics.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\PacketMultiplexer.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\ECC.cpp">
-      <Filter>Source Files\node</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ZeroTierOne.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\Http.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\OSUtils.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\Phy.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\Thread.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\WindowsEthernetTap.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\service\OneService.hpp">
-      <Filter>Header Files\service</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Address.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\AtomicCounter.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Buffer.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\ECC.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\CertificateOfMembership.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Constants.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Dictionary.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Identity.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\IncomingPacket.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\InetAddress.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\MAC.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Multicaster.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\MulticastGroup.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Mutex.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Network.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\NetworkConfig.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\NetworkController.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Node.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\OutboundMulticast.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Packet.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Path.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Peer.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Poly1305.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\RuntimeEnvironment.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Salsa20.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SelfAwareness.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SHA512.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SharedPtr.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Switch.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Topology.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Utils.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\http-parser\http_parser.h">
-      <Filter>Header Files\ext\http-parser</Filter>
-    </ClInclude>
-    <ClInclude Include="ServiceBase.h">
-      <Filter>Header Files\windows\ZeroTierOne</Filter>
-    </ClInclude>
-    <ClInclude Include="ServiceInstaller.h">
-      <Filter>Header Files\windows\ZeroTierOne</Filter>
-    </ClInclude>
-    <ClInclude Include="ZeroTierOneService.h">
-      <Filter>Header Files\windows\ZeroTierOne</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Hashtable.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\World.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\codelength.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\connecthostport.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\igd_desc_parse.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\minisoap.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\minissdpc.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\miniupnpc.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\miniupnpc_declspec.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\miniupnpctypes.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\miniwget.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\minixml.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\portlistingparse.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\receivedata.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\upnpcommands.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\upnpdev.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\upnperrors.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\miniupnpc\upnpreplyparse.h">
-      <Filter>Header Files\ext\miniupnpc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\PortMapper.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\libnatpmp\getgateway.h">
-      <Filter>Header Files\ext\libnatpmp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\libnatpmp\natpmp.h">
-      <Filter>Header Files\ext\libnatpmp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\libnatpmp\wingettimeofday.h">
-      <Filter>Header Files\ext\libnatpmp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\Binder.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\ManagedRoute.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\service\SoftwareUpdater.hpp">
-      <Filter>Header Files\service</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\json\json.hpp">
-      <Filter>Header Files\ext\json</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\CertificateOfOwnership.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Credential.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\x64-salsa2012-asm\salsa2012.h">
-      <Filter>Header Files\ext\x64-salsa2012-asm</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\controller\EmbeddedNetworkController.hpp">
-      <Filter>Header Files\controller</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Trace.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\controller\DB.hpp">
-      <Filter>Header Files\controller</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\controller\FileDB.hpp">
-      <Filter>Header Files\controller</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Membership.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\controller\PostgreSQL.hpp">
-      <Filter>Header Files\controller</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\controller\LFDB.hpp">
-      <Filter>Header Files\controller</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\cpp-httplib\httplib.h">
-      <Filter>Header Files\ext\cpp-httplib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\controller\DBMirrorSet.hpp">
-      <Filter>Header Files\controller</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\EthernetTap.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Bond.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\BondController.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\controller\Redis.hpp">
-      <Filter>Header Files\controller</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\WinDNSHelper.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\osdep\WinFWHelper.hpp">
-      <Filter>Header Files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Metrics.hpp">
-      <Filter>Header Files\node</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ZeroTierOne.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\node">
+      <UniqueIdentifier>{67b1c0f8-b018-4169-9c14-7032ed12c786}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\include">
+      <UniqueIdentifier>{40761a4c-e8db-4a91-9cab-7afef332f4a8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\node">
+      <UniqueIdentifier>{da3b8126-840c-45db-8abe-9d7e7976f8be}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\osdep">
+      <UniqueIdentifier>{6054dfae-4ed2-4d69-8cf5-d6f27646f2d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\service">
+      <UniqueIdentifier>{9944293a-4a1a-40e9-b92a-eff31fe87e2c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\osdep">
+      <UniqueIdentifier>{ca21bd6b-ff4e-4f9e-bedd-c9f603d2d0d6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\service">
+      <UniqueIdentifier>{e1743b3c-1d18-47f1-ab5a-f5703c19f1df}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext">
+      <UniqueIdentifier>{71865460-d693-4c73-84f6-dbff42f49df6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext\http-parser">
+      <UniqueIdentifier>{17ae9a01-d39f-4c6d-a800-8f2cd0804c96}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext\json-parser">
+      <UniqueIdentifier>{736aad7f-8d95-4602-88df-3bb970869c6f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext\lz4">
+      <UniqueIdentifier>{3636527c-bc03-4852-bd3c-20ee25e56d82}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ext">
+      <UniqueIdentifier>{7784af31-5b60-4300-b07e-44cf864c54db}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ext\lz4">
+      <UniqueIdentifier>{29164186-10fc-45f5-b253-6d03f0ddd4db}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ext\http-parser">
+      <UniqueIdentifier>{f8a1c208-15b8-4d85-a4cb-11d2b82f2d1e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ext\json-parser">
+      <UniqueIdentifier>{da28e961-1761-41d8-9a59-65b00dfb1302}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\windows">
+      <UniqueIdentifier>{43f75f84-c70d-4d44-a0ef-28a7a399abd4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\windows\ZeroTierOne">
+      <UniqueIdentifier>{0da07a2f-8922-4827-ac51-29ca3f30f881}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\windows">
+      <UniqueIdentifier>{b74916eb-bb6c-4449-a2a2-fa0b17f60121}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\windows\ZeroTierOne">
+      <UniqueIdentifier>{bf604491-14c4-4a74-81a6-6105d07c5c7c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext\bin">
+      <UniqueIdentifier>{5939db69-ab17-47c6-97fb-185e2c678737}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext\bin\miniupnpc">
+      <UniqueIdentifier>{3666f510-b6da-47cb-8039-56441f2dac3e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext\bin\miniupnpc\include">
+      <UniqueIdentifier>{1a47071e-e51b-4535-89ae-858946f03118}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext\miniupnpc">
+      <UniqueIdentifier>{5423fb64-896b-432e-a19d-88d4467f89f9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ext\miniupnpc">
+      <UniqueIdentifier>{56cc3ab8-3336-4a22-9471-c267ee46cd54}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ext\libnatpmp">
+      <UniqueIdentifier>{d7292d0d-72a0-4ed6-b717-21debb120737}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ext\libnatpmp">
+      <UniqueIdentifier>{409ec37e-ff36-4c13-b18d-52d6052e0ca2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\service\ControlPlane.cpp">
+      <Filter>Source Files\service</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\service\OneService.cpp">
+      <Filter>Source Files\service</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\osdep\WindowsEthernetTap.cpp">
+      <Filter>Source Files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\osdep\Http.cpp">
+      <Filter>Source Files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\osdep\OSUtils.cpp">
+      <Filter>Source Files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\C25519.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\CertificateOfMembership.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Dictionary.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Identity.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\IncomingPacket.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\InetAddress.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Multicaster.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Network.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\NetworkConfig.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Node.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\OutboundMulticast.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Packet.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Peer.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Poly1305.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Salsa20.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\SelfAwareness.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\SHA512.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Switch.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Topology.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Utils.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\lz4\lz4.c">
+      <Filter>Source Files\ext\lz4</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\http-parser\http_parser.c">
+      <Filter>Source Files\ext\http-parser</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\json-parser\json.c">
+      <Filter>Source Files\ext\json-parser</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\one.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ServiceBase.cpp">
+      <Filter>Source Files\windows\ZeroTierOne</Filter>
+    </ClCompile>
+    <ClCompile Include="ServiceInstaller.cpp">
+      <Filter>Source Files\windows\ZeroTierOne</Filter>
+    </ClCompile>
+    <ClCompile Include="ZeroTierOneService.cpp">
+      <Filter>Source Files\windows\ZeroTierOne</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\osdep\BackgroundResolver.cpp">
+      <Filter>Source Files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Path.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\DeferredPackets.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\node\Cluster.cpp">
+      <Filter>Source Files\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\connecthostport.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\igd_desc_parse.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\minisoap.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\minissdpc.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\miniupnpc.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\miniwget.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\minixml.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\portlistingparse.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\receivedata.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\upnpcommands.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\upnpdev.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\upnperrors.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\miniupnpc\upnpreplyparse.c">
+      <Filter>Source Files\ext\miniupnpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\osdep\PortMapper.cpp">
+      <Filter>Source Files\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libnatpmp\getgateway.c">
+      <Filter>Source Files\ext\libnatpmp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libnatpmp\natpmp.c">
+      <Filter>Source Files\ext\libnatpmp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ext\libnatpmp\wingettimeofday.c">
+      <Filter>Source Files\ext\libnatpmp</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\ZeroTierOne.h">
+      <Filter>Header Files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\osdep\Http.hpp">
+      <Filter>Header Files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\osdep\OSUtils.hpp">
+      <Filter>Header Files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\osdep\Phy.hpp">
+      <Filter>Header Files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\osdep\Thread.hpp">
+      <Filter>Header Files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\osdep\WindowsEthernetTap.hpp">
+      <Filter>Header Files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\service\ControlPlane.hpp">
+      <Filter>Header Files\service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\service\ControlPlaneSubsystem.hpp">
+      <Filter>Header Files\service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\service\OneService.hpp">
+      <Filter>Header Files\service</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Address.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Array.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\AtomicCounter.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\BandwidthAccount.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Buffer.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\C25519.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\CertificateOfMembership.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\CMWC4096.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Constants.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Dictionary.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Identity.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\IncomingPacket.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\InetAddress.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\MAC.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Multicaster.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\MulticastGroup.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Mutex.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Network.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\NetworkConfig.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\NetworkController.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Node.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\NonCopyable.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\OutboundMulticast.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Packet.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Path.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Peer.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Poly1305.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\RuntimeEnvironment.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Salsa20.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\SelfAwareness.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\SHA512.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\SharedPtr.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Switch.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Topology.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Utils.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\lz4\lz4.h">
+      <Filter>Header Files\ext\lz4</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\json-parser\json.h">
+      <Filter>Header Files\ext\json-parser</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\http-parser\http_parser.h">
+      <Filter>Header Files\ext\http-parser</Filter>
+    </ClInclude>
+    <ClInclude Include="ServiceBase.h">
+      <Filter>Header Files\windows\ZeroTierOne</Filter>
+    </ClInclude>
+    <ClInclude Include="ServiceInstaller.h">
+      <Filter>Header Files\windows\ZeroTierOne</Filter>
+    </ClInclude>
+    <ClInclude Include="ZeroTierOneService.h">
+      <Filter>Header Files\windows\ZeroTierOne</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\osdep\BackgroundResolver.hpp">
+      <Filter>Header Files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\codelength.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\connecthostport.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\igd_desc_parse.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minisoap.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minissdpc.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpc.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpc_declspec.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpcstrings.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpctypes.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniwget.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minixml.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\portlistingparse.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\receivedata.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpcommands.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnperrors.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpreplyparse.h">
+      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\BinarySemaphore.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Cluster.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\Hashtable.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\DeferredPackets.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\node\World.hpp">
+      <Filter>Header Files\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\codelength.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\connecthostport.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\igd_desc_parse.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\minisoap.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\minissdpc.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\miniupnpc.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\miniupnpc_declspec.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\miniupnpctypes.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\miniwget.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\minixml.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\portlistingparse.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\receivedata.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\upnpcommands.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\upnpdev.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\upnperrors.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\miniupnpc\upnpreplyparse.h">
+      <Filter>Header Files\ext\miniupnpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\osdep\PortMapper.hpp">
+      <Filter>Header Files\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libnatpmp\getgateway.h">
+      <Filter>Header Files\ext\libnatpmp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libnatpmp\natpmp.h">
+      <Filter>Header Files\ext\libnatpmp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ext\libnatpmp\wingettimeofday.h">
+      <Filter>Header Files\ext\libnatpmp</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ZeroTierOne.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/ZeroTierOne/ZeroTierOneService.cpp b/windows/ZeroTierOne/ZeroTierOneService.cpp
index 033a9d219..8e0b9c34f 100644
--- a/windows/ZeroTierOne/ZeroTierOneService.cpp
+++ b/windows/ZeroTierOne/ZeroTierOneService.cpp
@@ -1,22 +1,25 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #pragma region Includes
 
-#if defined(_WIN32) || defined(_WIN64)
-
-#include <winsock2.h>
-#include <windows.h>
+#include <WinSock2.h>
+#include <Windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -76,7 +79,9 @@ restart_node:
 			ZeroTier::Mutex::Lock _l(_lock);
 			delete _service;
 			_service = (ZeroTier::OneService *)0; // in case newInstance() fails
-			_service = ZeroTier::OneService::newInstance(_path.c_str(), ZT_DEFAULT_PORT);
+			_service = ZeroTier::OneService::newInstance(
+				ZeroTier::OneService::platformDefaultHomePath().c_str(),
+				ZT_DEFAULT_PORT);
 		}
 		switch(_service->run()) {
 			case ZeroTier::OneService::ONE_UNRECOVERABLE_ERROR: {
@@ -118,16 +123,10 @@ restart_node:
 	}
 }
 
-void ZeroTierOneService::OnStart(DWORD dwArgc, PSTR *lpszArgv)
+void ZeroTierOneService::OnStart(DWORD dwArgc, LPSTR *lpszArgv)
 {
 	ZT_SVCDBG("ZeroTierOneService::OnStart()\r\n");
 
-	if ((dwArgc > 1)&&(lpszArgv[1])&&(strlen(lpszArgv[1]) > 0)) {
-		this->_path = lpszArgv[1];
-	} else {
-		this->_path = ZeroTier::OneService::platformDefaultHomePath();
-	}
-
 	try {
 		_thread = ZeroTier::Thread::start(this);
 	} catch ( ... ) {
@@ -156,5 +155,3 @@ void ZeroTierOneService::OnShutdown()
 	// stop thread on system shutdown (if it hasn't happened already)
 	OnStop();
 }
-
-#endif
diff --git a/windows/ZeroTierOne/ZeroTierOneService.h b/windows/ZeroTierOne/ZeroTierOneService.h
index 8fe20996a..9c23d0f5f 100644
--- a/windows/ZeroTierOne/ZeroTierOneService.h
+++ b/windows/ZeroTierOne/ZeroTierOneService.h
@@ -1,20 +1,23 @@
 /*
- * Copyright (c)2019 ZeroTier, Inc.
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
  *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file in the project's root directory.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * Change Date: 2026-01-01
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2.0 of the Apache License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/****/
 
 #pragma once
 
-#if defined(_WIN32) || defined(_WIN64)
-
 #include <stdio.h>
 
 #include "ServiceBase.h"
@@ -57,15 +60,12 @@ public:
 		throw();
 
 protected:
-	virtual void OnStart(DWORD dwArgc, PSTR *pszArgv);
-	virtual void OnStop();
+    virtual void OnStart(DWORD dwArgc, PSTR *pszArgv);
+    virtual void OnStop();
 	virtual void OnShutdown();
 
 private:
-	std::string _path;
 	ZeroTier::OneService *volatile _service;
 	ZeroTier::Mutex _lock;
 	ZeroTier::Thread _thread;
 };
-
-#endif
diff --git a/windows/ZeroTierOneSDK.sln b/windows/ZeroTierOneSDK.sln
deleted file mode 100644
index 3c5c077ae..000000000
--- a/windows/ZeroTierOneSDK.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOneSDK", "ZeroTierOneSDK\ZeroTierOneSDK.vcxproj", "{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}.Debug|x64.ActiveCfg = Debug|x64
-		{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}.Debug|x64.Build.0 = Debug|x64
-		{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}.Debug|x86.ActiveCfg = Debug|Win32
-		{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}.Debug|x86.Build.0 = Debug|Win32
-		{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}.Release|x64.ActiveCfg = Release|x64
-		{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}.Release|x64.Build.0 = Release|x64
-		{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}.Release|x86.ActiveCfg = Release|Win32
-		{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj b/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj
deleted file mode 100644
index 9e3a12707..000000000
--- a/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{05E8E6B2-4067-4660-AD85-C8F6130FAFC5}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ZeroTierOneSDK</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ZeroTierOne_x86d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>ZeroTierOne_x64d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>ZeroTierOne_x86</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>ZeroTierOne_x64</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX;ZT_EXPORT;ZT_TRACE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImportLibrary>$(SolutionDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WIN32;NOMINMAX;ZT_EXPORT;ZT_TRACE;ZT_RULES_ENGINE_DEBUGGING_NO;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="disable";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImportLibrary>$(SolutionDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ZT_EXPORT;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;ZT_SOFTWARE_UPDATE_DEFAULT="apply";ZT_BUILD_PLATFORM=2;ZT_BUILD_ARCHITECTURE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImportLibrary>$(SolutionDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;ZT_EXPORT;ZT_SOFTWARE_UPDATE_DEFAULT="apply";ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;NOMINMAX;ZT_BUILD_PLATFORM=2;ZT_BUILD_ARCHITECTURE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImportLibrary>$(SolutionDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\ZeroTierOne.h" />
-    <ClInclude Include="..\..\node\Address.hpp" />
-    <ClInclude Include="..\..\node\Array.hpp" />
-    <ClInclude Include="..\..\node\AtomicCounter.hpp" />
-    <ClInclude Include="..\..\node\Buffer.hpp" />
-    <ClInclude Include="..\..\node\ECC.hpp" />
-    <ClInclude Include="..\..\node\Capability.hpp" />
-    <ClInclude Include="..\..\node\CertificateOfMembership.hpp" />
-    <ClInclude Include="..\..\node\CertificateOfOwnership.hpp" />
-    <ClInclude Include="..\..\node\CertificateOfRepresentation.hpp" />
-    <ClInclude Include="..\..\node\Cluster.hpp" />
-    <ClInclude Include="..\..\node\Constants.hpp" />
-    <ClInclude Include="..\..\node\Credential.hpp" />
-    <ClInclude Include="..\..\node\Dictionary.hpp" />
-    <ClInclude Include="..\..\node\Hashtable.hpp" />
-    <ClInclude Include="..\..\node\Identity.hpp" />
-    <ClInclude Include="..\..\node\IncomingPacket.hpp" />
-    <ClInclude Include="..\..\node\InetAddress.hpp" />
-    <ClInclude Include="..\..\node\MAC.hpp" />
-    <ClInclude Include="..\..\node\Membership.hpp" />
-    <ClInclude Include="..\..\node\Multicaster.hpp" />
-    <ClInclude Include="..\..\node\MulticastGroup.hpp" />
-    <ClInclude Include="..\..\node\Mutex.hpp" />
-    <ClInclude Include="..\..\node\Network.hpp" />
-    <ClInclude Include="..\..\node\NetworkConfig.hpp" />
-    <ClInclude Include="..\..\node\NetworkController.hpp" />
-    <ClInclude Include="..\..\node\Node.hpp" />
-    <ClInclude Include="..\..\node\NonCopyable.hpp" />
-    <ClInclude Include="..\..\node\OutboundMulticast.hpp" />
-    <ClInclude Include="..\..\node\Packet.hpp" />
-    <ClInclude Include="..\..\node\Path.hpp" />
-    <ClInclude Include="..\..\node\Peer.hpp" />
-    <ClInclude Include="..\..\node\Poly1305.hpp" />
-    <ClInclude Include="..\..\node\Revocation.hpp" />
-    <ClInclude Include="..\..\node\RuntimeEnvironment.hpp" />
-    <ClInclude Include="..\..\node\Salsa20.hpp" />
-    <ClInclude Include="..\..\node\SelfAwareness.hpp" />
-    <ClInclude Include="..\..\node\SHA512.hpp" />
-    <ClInclude Include="..\..\node\SharedPtr.hpp" />
-    <ClInclude Include="..\..\node\Switch.hpp" />
-    <ClInclude Include="..\..\node\Tag.hpp" />
-    <ClInclude Include="..\..\node\Topology.hpp" />
-    <ClInclude Include="..\..\node\Utils.hpp" />
-    <ClInclude Include="..\..\node\World.hpp" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\node\C25519.cpp" />
-    <ClCompile Include="..\..\node\Capability.cpp" />
-    <ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
-    <ClCompile Include="..\..\node\CertificateOfOwnership.cpp" />
-    <ClCompile Include="..\..\node\Cluster.cpp" />
-    <ClCompile Include="..\..\node\Identity.cpp" />
-    <ClCompile Include="..\..\node\IncomingPacket.cpp" />
-    <ClCompile Include="..\..\node\InetAddress.cpp" />
-    <ClCompile Include="..\..\node\Membership.cpp" />
-    <ClCompile Include="..\..\node\Multicaster.cpp" />
-    <ClCompile Include="..\..\node\Network.cpp" />
-    <ClCompile Include="..\..\node\NetworkConfig.cpp" />
-    <ClCompile Include="..\..\node\Node.cpp" />
-    <ClCompile Include="..\..\node\OutboundMulticast.cpp" />
-    <ClCompile Include="..\..\node\Packet.cpp" />
-    <ClCompile Include="..\..\node\Path.cpp" />
-    <ClCompile Include="..\..\node\Peer.cpp" />
-    <ClCompile Include="..\..\node\Poly1305.cpp" />
-    <ClCompile Include="..\..\node\Revocation.cpp" />
-    <ClCompile Include="..\..\node\Salsa20.cpp" />
-    <ClCompile Include="..\..\node\SelfAwareness.cpp" />
-    <ClCompile Include="..\..\node\SHA512.cpp" />
-    <ClCompile Include="..\..\node\Switch.cpp" />
-    <ClCompile Include="..\..\node\Tag.cpp" />
-    <ClCompile Include="..\..\node\Topology.cpp" />
-    <ClCompile Include="..\..\node\Utils.cpp" />
-    <ClCompile Include="dllmain.cpp">
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj.filters b/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj.filters
deleted file mode 100644
index 7276ba315..000000000
--- a/windows/ZeroTierOneSDK/ZeroTierOneSDK.vcxproj.filters
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\ZeroTierOne.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Node.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Utils.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Address.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Array.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\AtomicCounter.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Buffer.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\ECC.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Capability.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\CertificateOfMembership.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\CertificateOfOwnership.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\CertificateOfRepresentation.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Cluster.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Constants.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Credential.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Dictionary.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Hashtable.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Identity.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\IncomingPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\InetAddress.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\MAC.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Membership.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Multicaster.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\MulticastGroup.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Mutex.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Network.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\NetworkConfig.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\NetworkController.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\NonCopyable.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\OutboundMulticast.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Packet.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Path.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Peer.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Poly1305.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Revocation.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\RuntimeEnvironment.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Salsa20.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SelfAwareness.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SHA512.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SharedPtr.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Switch.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Tag.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Topology.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\World.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Node.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\C25519.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Capability.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\CertificateOfMembership.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\CertificateOfOwnership.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Cluster.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Identity.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\IncomingPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\InetAddress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Membership.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Multicaster.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Network.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\NetworkConfig.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\OutboundMulticast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Packet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Path.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Peer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Poly1305.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Revocation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Salsa20.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\SelfAwareness.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\SHA512.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Switch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Tag.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Topology.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/windows/ZeroTierOneSDK/dllmain.cpp b/windows/ZeroTierOneSDK/dllmain.cpp
deleted file mode 100644
index e263848d9..000000000
--- a/windows/ZeroTierOneSDK/dllmain.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// dllmain.cpp : Defines the entry point for the DLL application.
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-#include "targetver.h"
-
-BOOL APIENTRY DllMain( HMODULE hModule,
-                       DWORD  ul_reason_for_call,
-                       LPVOID lpReserved
-					 )
-{
-	switch (ul_reason_for_call)
-	{
-	case DLL_PROCESS_ATTACH:
-	case DLL_THREAD_ATTACH:
-	case DLL_THREAD_DETACH:
-	case DLL_PROCESS_DETACH:
-		break;
-	}
-	return TRUE;
-}
-
diff --git a/windows/ZeroTierOneSDK/targetver.h b/windows/ZeroTierOneSDK/targetver.h
deleted file mode 100644
index 90e767bfc..000000000
--- a/windows/ZeroTierOneSDK/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
diff --git a/attic/world/README.md b/world/README.md
similarity index 100%
rename from attic/world/README.md
rename to world/README.md
diff --git a/world/build.sh b/world/build.sh
new file mode 100755
index 000000000..b783702c3
--- /dev/null
+++ b/world/build.sh
@@ -0,0 +1 @@
+c++ -I.. -o mkworld ../node/C25519.cpp ../node/Salsa20.cpp ../node/SHA512.cpp ../node/Identity.cpp ../node/Utils.cpp ../node/InetAddress.cpp ../osdep/OSUtils.cpp mkworld.cpp
diff --git a/world/earth-2016-01-13.bin b/world/earth-2016-01-13.bin
new file mode 100644
index 000000000..5dea4d215
Binary files /dev/null and b/world/earth-2016-01-13.bin differ
diff --git a/world/mkworld.cpp b/world/mkworld.cpp
new file mode 100644
index 000000000..061d63418
--- /dev/null
+++ b/world/mkworld.cpp
@@ -0,0 +1,168 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This utility makes the World from the configuration specified below.
+ * It probably won't be much use to anyone outside ZeroTier, Inc. except
+ * for testing and experimentation purposes.
+ *
+ * If you want to make your own World you must edit this file.
+ *
+ * When run, it expects two files in the current directory:
+ *
+ * previous.c25519 - key pair to sign this world (key from previous world)
+ * current.c25519 - key pair whose public key should be embedded in this world
+ *
+ * If these files do not exist, they are both created with the same key pair
+ * and a self-signed initial World is born.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include <string>
+#include <vector>
+#include <algorithm>
+
+#include <node/Constants.hpp>
+#include <node/World.hpp>
+#include <node/C25519.hpp>
+#include <node/Identity.hpp>
+#include <node/InetAddress.hpp>
+#include <osdep/OSUtils.hpp>
+
+using namespace ZeroTier;
+
+class WorldMaker : public World
+{
+public:
+	static inline World make(uint64_t id,uint64_t ts,const C25519::Public &sk,const std::vector<World::Root> &roots,const C25519::Pair &signWith)
+	{
+		WorldMaker w;
+		w._id = id;
+		w._ts = ts;
+		w._updateSigningKey = sk;
+		w._roots = roots;
+
+		Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> tmp;
+		w.serialize(tmp,true);
+		w._signature = C25519::sign(signWith,tmp.data(),tmp.size());
+
+		return w;
+	}
+};
+
+int main(int argc,char **argv)
+{
+	std::string previous,current;
+	if ((!OSUtils::readFile("previous.c25519",previous))||(!OSUtils::readFile("current.c25519",current))) {
+		C25519::Pair np(C25519::generate());
+		previous = std::string();
+		previous.append((const char *)np.pub.data,ZT_C25519_PUBLIC_KEY_LEN);
+		previous.append((const char *)np.priv.data,ZT_C25519_PRIVATE_KEY_LEN);
+		current = previous;
+		OSUtils::writeFile("previous.c25519",previous);
+		OSUtils::writeFile("current.c25519",current);
+		fprintf(stderr,"INFO: created initial world keys: previous.c25519 and current.c25519 (both initially the same)"ZT_EOL_S);
+	}
+
+	if ((previous.length() != (ZT_C25519_PUBLIC_KEY_LEN + ZT_C25519_PRIVATE_KEY_LEN))||(current.length() != (ZT_C25519_PUBLIC_KEY_LEN + ZT_C25519_PRIVATE_KEY_LEN))) {
+		fprintf(stderr,"FATAL: previous.c25519 or current.c25519 empty or invalid"ZT_EOL_S);
+		return 1;
+	}
+	C25519::Pair previousKP;
+	memcpy(previousKP.pub.data,previous.data(),ZT_C25519_PUBLIC_KEY_LEN);
+	memcpy(previousKP.priv.data,previous.data() + ZT_C25519_PUBLIC_KEY_LEN,ZT_C25519_PRIVATE_KEY_LEN);
+	C25519::Pair currentKP;
+	memcpy(currentKP.pub.data,current.data(),ZT_C25519_PUBLIC_KEY_LEN);
+	memcpy(currentKP.priv.data,current.data() + ZT_C25519_PUBLIC_KEY_LEN,ZT_C25519_PRIVATE_KEY_LEN);
+
+	// =========================================================================
+	// EDIT BELOW HERE
+
+	std::vector<World::Root> roots;
+
+	const uint64_t id = ZT_WORLD_ID_EARTH;
+	const uint64_t ts = 1452708876314ULL; // January 13th, 2016
+
+	// Alice
+	roots.push_back(World::Root());
+	roots.back().identity = Identity("9d219039f3:0:01f0922a98e3b34ebcbff333269dc265d7a020aab69d72be4d4acc9c8c9294785771256cd1d942a90d1bd1d2dca3ea84ef7d85afe6611fb43ff0b74126d90a6e");
+	roots.back().stableEndpoints.push_back(InetAddress("188.166.94.177/9993")); // Amsterdam
+	roots.back().stableEndpoints.push_back(InetAddress("2a03:b0c0:2:d0::7d:1/9993")); // Amsterdam
+	roots.back().stableEndpoints.push_back(InetAddress("154.66.197.33/9993")); // Johannesburg
+	roots.back().stableEndpoints.push_back(InetAddress("2c0f:f850:154:197::33/9993")); // Johannesburg
+	roots.back().stableEndpoints.push_back(InetAddress("159.203.97.171/9993")); // New York
+	roots.back().stableEndpoints.push_back(InetAddress("2604:a880:800:a1::54:6001/9993")); // New York
+	roots.back().stableEndpoints.push_back(InetAddress("169.57.143.104/9993")); // Sao Paolo
+	roots.back().stableEndpoints.push_back(InetAddress("2607:f0d0:1d01:57::2/9993")); // Sao Paolo
+	roots.back().stableEndpoints.push_back(InetAddress("107.170.197.14/9993")); // San Francisco
+	roots.back().stableEndpoints.push_back(InetAddress("2604:a880:1:20::200:e001/9993")); // San Francisco
+	roots.back().stableEndpoints.push_back(InetAddress("128.199.197.217/9993")); // Singapore
+	roots.back().stableEndpoints.push_back(InetAddress("2400:6180:0:d0::b7:4001/9993")); // Singapore
+
+	// Bob
+	roots.push_back(World::Root());
+	roots.back().identity = Identity("8841408a2e:0:bb1d31f2c323e264e9e64172c1a74f77899555ed10751cd56e86405cde118d02dffe555d462ccf6a85b5631c12350c8d5dc409ba10b9025d0f445cf449d92b1c");
+	roots.back().stableEndpoints.push_back(InetAddress("45.32.198.130/9993")); // Dallas
+	roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:6400:81c3:5400:00ff:fe18:1d61/9993")); // Dallas
+	roots.back().stableEndpoints.push_back(InetAddress("46.101.160.249/9993")); // Frankfurt
+	roots.back().stableEndpoints.push_back(InetAddress("2a03:b0c0:3:d0::6a:3001/9993")); // Frankfurt
+	roots.back().stableEndpoints.push_back(InetAddress("107.191.46.210/9993")); // Paris
+	roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:6800:83a4::64/9993")); // Paris
+	roots.back().stableEndpoints.push_back(InetAddress("45.32.246.179/9993")); // Sydney
+	roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:5800:8bf8:5400:ff:fe15:b39a/9993")); // Sydney
+	roots.back().stableEndpoints.push_back(InetAddress("45.32.248.87/9993")); // Tokyo
+	roots.back().stableEndpoints.push_back(InetAddress("2001:19f0:7000:9bc9:5400:00ff:fe15:c4f5/9993")); // Tokyo
+	roots.back().stableEndpoints.push_back(InetAddress("159.203.2.154/9993")); // Toronto
+	roots.back().stableEndpoints.push_back(InetAddress("2604:a880:cad:d0::26:7001/9993")); // Toronto
+
+	// END WORLD DEFINITION
+	// =========================================================================
+
+	fprintf(stderr,"INFO: generating and signing id==%llu ts==%llu"ZT_EOL_S,(unsigned long long)id,(unsigned long long)ts);
+
+	World nw = WorldMaker::make(id,ts,currentKP.pub,roots,previousKP);
+
+	Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> outtmp;
+	nw.serialize(outtmp,false);
+	World testw;
+	testw.deserialize(outtmp,0);
+	if (testw != nw) {
+		fprintf(stderr,"FATAL: serialization test failed!"ZT_EOL_S);
+		return 1;
+	}
+
+	OSUtils::writeFile("world.bin",std::string((const char *)outtmp.data(),outtmp.size()));
+	fprintf(stderr,"INFO: world.bin written with %u bytes of binary world data."ZT_EOL_S,outtmp.size());
+
+	fprintf(stdout,ZT_EOL_S);
+	fprintf(stdout,"#define ZT_DEFAULT_WORLD_LENGTH %u"ZT_EOL_S,outtmp.size());
+	fprintf(stdout,"static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {");
+	for(unsigned int i=0;i<outtmp.size();++i) {
+		const unsigned char *d = (const unsigned char *)outtmp.data();
+		if (i > 0)
+			fprintf(stdout,",");
+		fprintf(stdout,"0x%.2x",(unsigned int)d[i]);
+	}
+	fprintf(stdout,"};"ZT_EOL_S);
+
+	return 0;
+}
diff --git a/world/old/earth-2015-11-16.bin b/world/old/earth-2015-11-16.bin
new file mode 100644
index 000000000..910ff1440
Binary files /dev/null and b/world/old/earth-2015-11-16.bin differ
diff --git a/world/old/earth-2015-11-20.bin b/world/old/earth-2015-11-20.bin
new file mode 100644
index 000000000..198682e58
Binary files /dev/null and b/world/old/earth-2015-11-20.bin differ
diff --git a/world/old/earth-2015-12-17.bin b/world/old/earth-2015-12-17.bin
new file mode 100644
index 000000000..20fadb56b
Binary files /dev/null and b/world/old/earth-2015-12-17.bin differ
diff --git a/zerotier-cli-completion.bash b/zerotier-cli-completion.bash
deleted file mode 100644
index cd6da0d9a..000000000
--- a/zerotier-cli-completion.bash
+++ /dev/null
@@ -1,57 +0,0 @@
-#compdef zerotier-cli
-#autoload
-
-
-_get_network_ids ()
-{
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        COMPREPLY=($(compgen -W "$(ls -1 /Library/Application\ Support/ZeroTier/One/networks.d | cut -c 1-16)" -- ${cur}))
-    else
-        COMPREPLY=($(compgen -W "$(ls -1 /var/lib/zerotier-one/networks.d | cut -c 1-16)" -- ${cur}))
-    fi
-}
-
-_get_network_ids_from_history ()
-{
-    COMPREPLY=($(compgen -W "$(fc -l -1000 -1 | sed -n 's/.*\([[:xdigit:]]\{16\}\).*/\1/p')" -- ${cur}))
-}
-
-_zerotier-cli_completions()
-{
-    local cur prev
-
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-
-    case ${COMP_CWORD} in
-        1)
-            COMPREPLY=($(compgen -W "info listpeers peers listnetworks join leave set get listmoons orbit deorbit" -- ${cur}))
-            ;;
-        2)
-            case ${prev} in
-                leave)
-                    _get_network_ids
-                    ;;
-                join)
-                    _get_network_ids_from_history
-                    ;;
-                set)
-                    _get_network_ids
-                    ;;
-                get)
-                    _get_network_ids
-                    ;;
-                *)
-                    COMPREPLY=()
-                    ;;
-            esac
-            ;;
-        *)
-            COMPREPLY=()
-            ;;
-    esac
-}
-
-complete -F _zerotier-cli_completions zerotier-cli
-
-
diff --git a/zerotier-one.spec b/zerotier-one.spec
deleted file mode 100644
index 655068bf6..000000000
--- a/zerotier-one.spec
+++ /dev/null
@@ -1,282 +0,0 @@
-Name:           zerotier-one
-Version:        1.14.2
-Release:        1%{?dist}
-Summary:        ZeroTier network virtualization service
-
-License:        ZeroTier BUSL 1.1
-URL:            https://www.zerotier.com
-
-# Fedora
-
-%if "%{?dist}" == ".fc35"
-BuildRequires: systemd clang openssl openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".fc36"
-BuildRequires: systemd clang openssl openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".fc37"
-BuildRequires: systemd clang openssl openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".fc38"
-BuildRequires: systemd clang openssl openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".fc39"
-BuildRequires: systemd clang openssl openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".fc40"
-BuildRequires: systemd clang openssl openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-# RHEL
-
-%if "%{?dist}" == ".el6"
-Requires: chkconfig
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".el7"
-BuildRequires: systemd openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".el8"
-BuildRequires: systemd openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".el9"
-BuildRequires: systemd openssl-devel
-Requires:      systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-# Amazon
-
-%if "%{?dist}" == ".amzn2"
-BuildRequires:  systemd openssl-devel
-Requires:       systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%if "%{?dist}" == ".amzn2022"
-BuildRequires:  systemd openssl-devel
-Requires:       systemd openssl
-Requires(pre): /usr/sbin/useradd, /usr/bin/getent
-%endif
-
-%description
-ZeroTier is a software defined networking layer for Earth.
-
-It can be used for on-premise network virtualization, as a peer to peer VPN
-for mobile teams, for hybrid or multi-data-center cloud deployments, or just
-about anywhere else secure software defined virtual networking is useful.
-
-This is our OS-level client service. It allows Mac, Linux, Windows,
-FreeBSD, and soon other types of clients to join ZeroTier virtual networks
-like conventional VPNs or VLANs. It can run on native systems, VMs, or
-containers (Docker, OpenVZ, etc.).
-
-%prep
-%if "%{?dist}" != ".el6"
-rm -rf BUILD BUILDROOT RPMS SRPMS SOURCES
-ln -s %{getenv:PWD} %{name}-%{version}
-mkdir -p SOURCES
-tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}/*
-rm -f %{name}-%{version}
-# cp -a %{getenv:PWD}/* .
-%endif
-
-%build
-%if "%{?dist}" != ".el6"
-make ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one
-%endif
-
-%pre
-/usr/bin/getent passwd zerotier-one || /usr/sbin/useradd -r -d /var/lib/zerotier-one -s /sbin/nologin zerotier-one
-
-%install
-%if "%{?dist}" != ".el6"
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-cp %{getenv:PWD}/debian/zerotier-one.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
-%else
-rm -rf $RPM_BUILD_ROOT
-pushd %{getenv:PWD}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-cp %{getenv:PWD}/ext/installfiles/linux/zerotier-one.init.rhel6 $RPM_BUILD_ROOT/etc/init.d/zerotier-one
-chmod 0755 $RPM_BUILD_ROOT/etc/init.d/zerotier-one
-%endif
-
-%files
-%{_sbindir}/*
-%{_mandir}/*
-%{_localstatedir}/*
-
-%if 0%{?rhel} && 0%{?rhel} <= 6
-/etc/init.d/zerotier-one
-%else
-%{_unitdir}/%{name}.service
-%endif
-
-%post
-%if ! 0%{?rhel} && 0%{?rhel} <= 6
-%systemd_post zerotier-one.service
-%endif
-
-%preun
-%if ! 0%{?rhel} && 0%{?rhel} <= 6
-%systemd_preun zerotier-one.service
-%endif
-
-%postun
-%if ! 0%{?rhel} && 0%{?rhel} <= 6
-%systemd_postun_with_restart zerotier-one.service
-%endif
-
-%changelog
-* Wed Oct 23 2024 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.14.2
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue Mar 19 2024 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.14.0
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue Sep 12 2023 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.12.2
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Fri Aug 25 2023 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.12.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Thu Aug 17 2023 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.12.0
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue Mar 21 2023 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.10.6
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Fri Mar 10 2023 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.10.5
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Mar 06 2023 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.10.4
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Sat Jan 21 2023 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.10.3
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Thu Oct 13 2022 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.10.2
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Jun 27 2022 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.10.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Fri Jun 03 2022 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.10.0
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue May 10 2022 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.10
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Apr 25 2022 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.9
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Apr 11 2022 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.8
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Mar 21 2022 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.7
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Mar 07 2022 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.6
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Fri Dec 17 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.5
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue Nov 23 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.4
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Nov 15 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.3
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Nov 08 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.2
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Wed Oct 20 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Wed Sep 15 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.0
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue Apr 13 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.5
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Feb 15 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.4
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Nov 30 2020 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.2-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue Nov 24 2020 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.1-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Thu Nov 19 2020 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.0-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Oct 05 2020 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.0-beta1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Fri Aug 23 2019 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.4.4-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Jul 29 2019 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.4.0-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue May 08 2018 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.2.10-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Thu May 03 2018 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.2.8-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Mon Apr 24 2017 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.2.2-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Fri Mar 17 2017 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.2.2-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue Mar 14 2017 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.2.0-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Tue Jul 12 2016 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.1.10-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Fri Jul 08 2016 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.1.8-0.1
-- see https://github.com/zerotier/ZeroTierOne for release notes
-
-* Sat Jun 25 2016 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.1.6-0.1
-- now builds on CentOS 6 as well as newer distros, and some cleanup
-
-* Wed Jun 08 2016 François Kooman <fkooman@tuxed.net> - 1.1.5-0.3
-- include systemd unit file
-
-* Wed Jun 08 2016 François Kooman <fkooman@tuxed.net> - 1.1.5-0.2
-- add libnatpmp as (build)dependency
-
-* Wed Jun 08 2016 François Kooman <fkooman@tuxed.net> - 1.1.5-0.1
-- initial package